diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index a8e816a84..000000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 2022,
-    "sourceType": "module"
-  },
-  "plugins": ["@typescript-eslint"],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
-  ],
-  "rules": {
-    "@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
-    "@typescript-eslint/no-explicit-any": "warn",
-    "@typescript-eslint/explicit-module-boundary-types": "off"
-  },
-  "env": {
-    "node": true,
-    "es2022": true
-  }
-}
diff --git a/apps/airiscode-cli/__tests__/utils.spec.ts b/apps/airiscode-cli/__tests__/utils.spec.ts
index 3daa8f6cc..dd1ae9df3 100644
--- a/apps/airiscode-cli/__tests__/utils.spec.ts
+++ b/apps/airiscode-cli/__tests__/utils.spec.ts
@@ -1,13 +1,13 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 vi.mock("node:os", () => ({
-  homedir: () => "/mock/home"
+  homedir: () => "/mock/home",
 }));
 
 import { loadConfig, saveConfig } from "../src/utils/config.js";
-import { saveSession, listSessions, loadSession } from "../src/utils/session.js";
+import { listSessions, loadSession, saveSession } from "../src/utils/session.js";
 
 vi.mock("node:fs/promises");
 
@@ -26,7 +26,7 @@ describe("CLI Utilities", () => {
     it("should save and merge config", async () => {
       vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify({ plannerModel: "new-model" }));
       const updated = await saveConfig({ coderModel: "coder-9b" });
-      
+
       expect(updated.plannerModel).toBe("new-model");
       expect(updated.coderModel).toBe("coder-9b");
       expect(fs.writeFile).toHaveBeenCalled();
@@ -35,7 +35,11 @@ describe("CLI Utilities", () => {
 
   describe("Session Utility", () => {
     it("should list sessions", async () => {
-      vi.mocked(fs.readdir).mockResolvedValue(["session-1.json", "session-2.json", "other.txt"] as any);
+      vi.mocked(fs.readdir).mockResolvedValue([
+        "session-1.json",
+        "session-2.json",
+        "other.txt",
+      ] as any);
       const sessions = await listSessions();
       expect(sessions).toHaveLength(2);
       expect(sessions[0]).toBe("session-2.json"); // Sorted reverse
diff --git a/apps/airiscode-cli/package.json b/apps/airiscode-cli/package.json
index bd8f2ab02..5a5fb1303 100644
--- a/apps/airiscode-cli/package.json
+++ b/apps/airiscode-cli/package.json
@@ -15,7 +15,7 @@
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",
     "start": "node dist/index.js",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "biome check .",
     "format": "prettier --write .",
     "test": "vitest run"
   },
diff --git a/apps/airiscode-cli/src/commands/auth.ts b/apps/airiscode-cli/src/commands/auth.ts
index 97444d3a9..0850f4cce 100644
--- a/apps/airiscode-cli/src/commands/auth.ts
+++ b/apps/airiscode-cli/src/commands/auth.ts
@@ -4,58 +4,52 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule, Argv } from 'yargs';
-import {
-  handleQwenAuth,
-  runInteractiveAuth,
-  showAuthStatus,
-} from './auth/handler.js';
-import { t } from '../i18n/index.js';
+import type { Argv, CommandModule } from "yargs";
+import { t } from "../i18n/index.js";
+import { handleQwenAuth, runInteractiveAuth, showAuthStatus } from "./auth/handler.js";
 
 // Qwen OAuth subcommand removed - use coding-plan or interactive auth instead.
 
 const codePlanCommand = {
-  command: 'coding-plan',
-  describe: t('Authenticate using Alibaba Cloud Coding Plan'),
+  command: "coding-plan",
+  describe: t("Authenticate using Alibaba Cloud Coding Plan"),
   builder: (yargs: Argv) =>
     yargs
-      .option('region', {
-        alias: 'r',
-        describe: t('Region for Coding Plan (china/global)'),
-        type: 'string',
+      .option("region", {
+        alias: "r",
+        describe: t("Region for Coding Plan (china/global)"),
+        type: "string",
       })
-      .option('key', {
-        alias: 'k',
-        describe: t('API key for Coding Plan'),
-        type: 'string',
+      .option("key", {
+        alias: "k",
+        describe: t("API key for Coding Plan"),
+        type: "string",
       }),
   handler: async (argv: { region?: string; key?: string }) => {
-    const region = argv['region'] as string | undefined;
-    const key = argv['key'] as string | undefined;
+    const region = argv["region"] as string | undefined;
+    const key = argv["key"] as string | undefined;
 
     // If region and key are provided, use them directly
     if (region && key) {
-      await handleQwenAuth('coding-plan', { region, key });
+      await handleQwenAuth("coding-plan", { region, key });
     } else {
       // Otherwise, prompt interactively
-      await handleQwenAuth('coding-plan', {});
+      await handleQwenAuth("coding-plan", {});
     }
   },
 };
 
 const statusCommand = {
-  command: 'status',
-  describe: t('Show current authentication status'),
+  command: "status",
+  describe: t("Show current authentication status"),
   handler: async () => {
     await showAuthStatus();
   },
 };
 
 export const authCommand: CommandModule = {
-  command: 'auth',
-  describe: t(
-    'Configure authentication information with Alibaba Cloud Coding Plan',
-  ),
+  command: "auth",
+  describe: t("Configure authentication information with Alibaba Cloud Coding Plan"),
   builder: (yargs: Argv) =>
     yargs
       .command(codePlanCommand)
diff --git a/apps/airiscode-cli/src/commands/auth/handler.ts b/apps/airiscode-cli/src/commands/auth/handler.ts
index e38674e41..227a7f9fb 100644
--- a/apps/airiscode-cli/src/commands/auth/handler.ts
+++ b/apps/airiscode-cli/src/commands/auth/handler.ts
@@ -6,24 +6,24 @@
 
 import {
   AuthType,
-  getErrorMessage,
   type Config,
+  getErrorMessage,
   type ProviderModelConfig as ModelConfig,
-} from '@airiscode/core';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import { t } from '../../i18n/index.js';
+} from "@airiscode/core";
+import type { CliArgs } from "../../config/config.js";
+import { loadCliConfig } from "../../config/config.js";
+import { getPersistScopeForModelSelection } from "../../config/modelProvidersScope.js";
+import { type LoadedSettings, loadSettings } from "../../config/settings.js";
 import {
+  CODING_PLAN_ENV_KEY,
+  CodingPlanRegion,
   getCodingPlanConfig,
   isCodingPlanConfig,
-  CodingPlanRegion,
-  CODING_PLAN_ENV_KEY,
-} from '../../constants/codingPlan.js';
-import { getPersistScopeForModelSelection } from '../../config/modelProvidersScope.js';
-import { backupSettingsFile } from '../../utils/settingsUtils.js';
-import { loadSettings, type LoadedSettings } from '../../config/settings.js';
-import { loadCliConfig } from '../../config/config.js';
-import type { CliArgs } from '../../config/config.js';
-import { InteractiveSelector } from './interactiveSelector.js';
+} from "../../constants/codingPlan.js";
+import { t } from "../../i18n/index.js";
+import { backupSettingsFile } from "../../utils/settingsUtils.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { InteractiveSelector } from "./interactiveSelector.js";
 
 interface QwenAuthOptions {
   region?: string;
@@ -52,10 +52,7 @@ interface MergedSettingsWithCodingPlan {
 /**
  * Handles the authentication process based on the specified command and options
  */
-export async function handleQwenAuth(
-  command: 'coding-plan',
-  options: QwenAuthOptions,
-) {
+export async function handleQwenAuth(command: "coding-plan", options: QwenAuthOptions) {
   try {
     const settings = loadSettings();
 
@@ -119,12 +116,12 @@ export async function handleQwenAuth(
       [], // No extensions for auth command
     );
 
-    if (command === 'coding-plan') {
+    if (command === "coding-plan") {
       await handleCodePlanAuth(config, settings, options);
     }
 
     // Exit after authentication is complete
-    writeStdoutLine(t('Authentication completed successfully.'));
+    writeStdoutLine(t("Authentication completed successfully."));
     process.exit(0);
   } catch (error) {
     writeStderrLine(getErrorMessage(error));
@@ -148,9 +145,7 @@ async function handleCodePlanAuth(
   // If region and key are provided as options, use them
   if (region && key) {
     selectedRegion =
-      region.toLowerCase() === 'global'
-        ? CodingPlanRegion.GLOBAL
-        : CodingPlanRegion.CHINA;
+      region.toLowerCase() === "global" ? CodingPlanRegion.GLOBAL : CodingPlanRegion.CHINA;
     selectedKey = key;
   } else {
     // Otherwise, prompt interactively
@@ -158,7 +153,7 @@ async function handleCodePlanAuth(
     selectedKey = await promptForKey();
   }
 
-  writeStdoutLine(t('Processing Alibaba Cloud Coding Plan authentication...'));
+  writeStdoutLine(t("Processing Alibaba Cloud Coding Plan authentication..."));
 
   try {
     // Get configuration based on region
@@ -185,9 +180,8 @@ async function handleCodePlanAuth(
 
     // Get existing configs
     const existingConfigs =
-      (settings.merged.modelProviders as Record<string, ModelConfig[]>)?.[
-        AuthType.USE_OPENAI
-      ] || [];
+      (settings.merged.modelProviders as Record<string, ModelConfig[]>)?.[AuthType.USE_OPENAI] ||
+      [];
 
     // Filter out all existing Coding Plan configs (mutually exclusive)
     const nonCodingPlanConfigs = existingConfigs.filter(
@@ -198,43 +192,29 @@ async function handleCodePlanAuth(
     const updatedConfigs = [...newConfigs, ...nonCodingPlanConfigs];
 
     // Persist to modelProviders
-    settings.setValue(
-      authTypeScope,
-      `modelProviders.${AuthType.USE_OPENAI}`,
-      updatedConfigs,
-    );
+    settings.setValue(authTypeScope, `modelProviders.${AuthType.USE_OPENAI}`, updatedConfigs);
 
     // Also persist authType
-    settings.setValue(
-      authTypeScope,
-      'security.auth.selectedType',
-      AuthType.USE_OPENAI,
-    );
+    settings.setValue(authTypeScope, "security.auth.selectedType", AuthType.USE_OPENAI);
 
     // Persist coding plan region
-    settings.setValue(authTypeScope, 'codingPlan.region', selectedRegion);
+    settings.setValue(authTypeScope, "codingPlan.region", selectedRegion);
 
     // Persist coding plan version (single field for backward compatibility)
-    settings.setValue(authTypeScope, 'codingPlan.version', version);
+    settings.setValue(authTypeScope, "codingPlan.version", version);
 
     // If there are configs, use the first one as the model
     if (updatedConfigs.length > 0 && updatedConfigs[0]?.id) {
-      settings.setValue(
-        authTypeScope,
-        'model.name',
-        (updatedConfigs[0] as ModelConfig).id,
-      );
+      settings.setValue(authTypeScope, "model.name", (updatedConfigs[0] as ModelConfig).id);
     }
 
     // Refresh auth with the new configuration
     await config.refreshAuth(AuthType.USE_OPENAI);
 
-    writeStdoutLine(
-      t('Successfully authenticated with Alibaba Cloud Coding Plan.'),
-    );
+    writeStdoutLine(t("Successfully authenticated with Alibaba Cloud Coding Plan."));
   } catch (error) {
     writeStderrLine(
-      t('Failed to authenticate with Coding Plan: {{error}}', {
+      t("Failed to authenticate with Coding Plan: {{error}}", {
         error: getErrorMessage(error),
       }),
     );
@@ -250,16 +230,16 @@ async function promptForRegion(): Promise<CodingPlanRegion> {
     [
       {
         value: CodingPlanRegion.CHINA,
-        label: t('中国 (China)'),
-        description: t('阿里云百炼 (aliyun.com)'),
+        label: t("中国 (China)"),
+        description: t("阿里云百炼 (aliyun.com)"),
       },
       {
         value: CodingPlanRegion.GLOBAL,
-        label: t('Global'),
-        description: t('Alibaba Cloud (alibabacloud.com)'),
+        label: t("Global"),
+        description: t("Alibaba Cloud (alibabacloud.com)"),
       },
     ],
-    t('Select region for Coding Plan:'),
+    t("Select region for Coding Plan:"),
   );
 
   return await selector.select();
@@ -273,7 +253,7 @@ async function promptForKey(): Promise<string> {
   const stdin = process.stdin;
   const stdout = process.stdout;
 
-  stdout.write(t('Enter your Coding Plan API key: '));
+  stdout.write(t("Enter your Coding Plan API key: "));
 
   // Set raw mode to capture keystrokes
   const wasRaw = stdin.isRaw;
@@ -283,47 +263,47 @@ async function promptForKey(): Promise<string> {
   stdin.resume();
 
   return new Promise<string>((resolve, reject) => {
-    let input = '';
+    let input = "";
 
     const onData = (chunk: string) => {
       for (const char of chunk) {
         switch (char) {
-          case '\r': // Enter
-          case '\n':
-            stdin.removeListener('data', onData);
+          case "\r": // Enter
+          case "\n":
+            stdin.removeListener("data", onData);
             if (stdin.setRawMode) {
               stdin.setRawMode(wasRaw);
             }
-            stdout.write('\n'); // New line after input
+            stdout.write("\n"); // New line after input
             resolve(input);
             return;
-          case '\x03': // Ctrl+C
-            stdin.removeListener('data', onData);
+          case "\x03": // Ctrl+C
+            stdin.removeListener("data", onData);
             if (stdin.setRawMode) {
               stdin.setRawMode(wasRaw);
             }
-            stdout.write('^C\n');
-            reject(new Error('Interrupted'));
+            stdout.write("^C\n");
+            reject(new Error("Interrupted"));
             return;
-          case '\x08': // Backspace
-          case '\x7F': // Delete
+          case "\x08": // Backspace
+          case "\x7F": // Delete
             if (input.length > 0) {
               input = input.slice(0, -1);
               // Move cursor back, print space, move back again
-              stdout.write('\x1B[D \x1B[D');
+              stdout.write("\x1B[D \x1B[D");
             }
             break;
           default:
             // Add character to input
             input += char;
             // Print asterisk instead of the actual character for security
-            stdout.write('*');
+            stdout.write("*");
             break;
         }
       }
     };
 
-    stdin.on('data', onData);
+    stdin.on("data", onData);
   });
 }
 
@@ -334,20 +314,18 @@ export async function runInteractiveAuth() {
   const selector = new InteractiveSelector(
     [
       {
-        value: 'coding-plan' as const,
-        label: t('Alibaba Cloud Coding Plan'),
-        description: t(
-          'Paid · Up to 6,000 requests/5 hrs · All Alibaba Cloud Coding Plan Models',
-        ),
+        value: "coding-plan" as const,
+        label: t("Alibaba Cloud Coding Plan"),
+        description: t("Paid · Up to 6,000 requests/5 hrs · All Alibaba Cloud Coding Plan Models"),
       },
     ],
-    t('Select authentication method:'),
+    t("Select authentication method:"),
   );
 
   const choice = await selector.select();
 
-  if (choice === 'coding-plan') {
-    await handleQwenAuth('coding-plan', {});
+  if (choice === "coding-plan") {
+    await handleQwenAuth("coding-plan", {});
   }
 }
 
@@ -359,23 +337,19 @@ export async function showAuthStatus(): Promise<void> {
     const settings = loadSettings();
     const mergedSettings = settings.merged as MergedSettingsWithCodingPlan;
 
-    writeStdoutLine(t('\n=== Authentication Status ===\n'));
+    writeStdoutLine(t("\n=== Authentication Status ===\n"));
 
     // Check for selected auth type
     const selectedType = mergedSettings.security?.auth?.selectedType;
 
     if (!selectedType) {
-      writeStdoutLine(t('⚠️  No authentication method configured.\n'));
-      writeStdoutLine(t('Run one of the following commands to get started:\n'));
-      writeStdoutLine(
-        t(
-          '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n',
-        ),
-      );
-      writeStdoutLine(t('Or simply run:'));
+      writeStdoutLine(t("⚠️  No authentication method configured.\n"));
+      writeStdoutLine(t("Run one of the following commands to get started:\n"));
       writeStdoutLine(
-        t('  qwen auth                - Interactive authentication setup\n'),
+        t("  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n"),
       );
+      writeStdoutLine(t("Or simply run:"));
+      writeStdoutLine(t("  qwen auth                - Interactive authentication setup\n"));
       process.exit(0);
     }
 
@@ -388,58 +362,45 @@ export async function showAuthStatus(): Promise<void> {
 
       // Check if API key is set in environment
       const hasApiKey =
-        !!process.env[CODING_PLAN_ENV_KEY] ||
-        !!mergedSettings.env?.[CODING_PLAN_ENV_KEY];
+        !!process.env[CODING_PLAN_ENV_KEY] || !!mergedSettings.env?.[CODING_PLAN_ENV_KEY];
 
       if (hasApiKey) {
-        writeStdoutLine(
-          t('✓ Authentication Method: Alibaba Cloud Coding Plan'),
-        );
+        writeStdoutLine(t("✓ Authentication Method: Alibaba Cloud Coding Plan"));
 
         if (codingPlanRegion) {
           const regionDisplay =
             codingPlanRegion === CodingPlanRegion.CHINA
-              ? t('中国 (China) - 阿里云百炼')
-              : t('Global - Alibaba Cloud');
-          writeStdoutLine(t('  Region: {{region}}', { region: regionDisplay }));
+              ? t("中国 (China) - 阿里云百炼")
+              : t("Global - Alibaba Cloud");
+          writeStdoutLine(t("  Region: {{region}}", { region: regionDisplay }));
         }
 
         if (modelName) {
-          writeStdoutLine(
-            t('  Current Model: {{model}}', { model: modelName }),
-          );
+          writeStdoutLine(t("  Current Model: {{model}}", { model: modelName }));
         }
 
         if (codingPlanVersion) {
           writeStdoutLine(
-            t('  Config Version: {{version}}', {
-              version: codingPlanVersion.substring(0, 8) + '...',
+            t("  Config Version: {{version}}", {
+              version: codingPlanVersion.substring(0, 8) + "...",
             }),
           );
         }
 
-        writeStdoutLine(t('  Status: API key configured\n'));
+        writeStdoutLine(t("  Status: API key configured\n"));
       } else {
-        writeStdoutLine(
-          t(
-            '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)',
-          ),
-        );
-        writeStdoutLine(
-          t('  Issue: API key not found in environment or settings\n'),
-        );
-        writeStdoutLine(t('  Run `qwen auth coding-plan` to re-configure.\n'));
+        writeStdoutLine(t("⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)"));
+        writeStdoutLine(t("  Issue: API key not found in environment or settings\n"));
+        writeStdoutLine(t("  Run `qwen auth coding-plan` to re-configure.\n"));
       }
     } else {
-      writeStdoutLine(
-        t('✓ Authentication Method: {{type}}', { type: selectedType }),
-      );
-      writeStdoutLine(t('  Status: Configured\n'));
+      writeStdoutLine(t("✓ Authentication Method: {{type}}", { type: selectedType }));
+      writeStdoutLine(t("  Status: Configured\n"));
     }
     process.exit(0);
   } catch (error) {
     writeStderrLine(
-      t('Failed to check authentication status: {{error}}', {
+      t("Failed to check authentication status: {{error}}", {
         error: getErrorMessage(error),
       }),
     );
diff --git a/apps/airiscode-cli/src/commands/auth/interactiveSelector.ts b/apps/airiscode-cli/src/commands/auth/interactiveSelector.ts
index 84b9c9f0d..7536b60ad 100644
--- a/apps/airiscode-cli/src/commands/auth/interactiveSelector.ts
+++ b/apps/airiscode-cli/src/commands/auth/interactiveSelector.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { stdin, stdout } from 'node:process';
-import { t } from '../../i18n/index.js';
+import { stdin, stdout } from "node:process";
+import { t } from "../../i18n/index.js";
 
 /**
  * Represents an option in the interactive selector
@@ -25,7 +25,7 @@ export class InteractiveSelector<T> {
 
   constructor(
     private options: Array<Option<T>>,
-    private prompt: string = t('Select an option:'),
+    private prompt: string = t("Select an option:"),
   ) {}
 
   /**
@@ -41,36 +41,32 @@ export class InteractiveSelector<T> {
       // Check if stdin supports raw mode
       if (!stdin.setRawMode) {
         // Fallback to readline if raw mode is not available (e.g., when piped)
-        reject(
-          new Error(
-            t('Raw mode not available. Please run in an interactive terminal.'),
-          ),
-        );
+        reject(new Error(t("Raw mode not available. Please run in an interactive terminal.")));
         return;
       }
 
       const wasRaw = stdin.isRaw;
       stdin.setRawMode(true);
       stdin.resume();
-      stdin.setEncoding('utf8');
+      stdin.setEncoding("utf8");
 
       const onData = (chunk: string) => {
         if (!this.isListening) return;
 
         for (const char of chunk) {
           switch (char) {
-            case '\x03': // Ctrl+C
-              stdin.removeListener('data', onData);
+            case "\x03": // Ctrl+C
+              stdin.removeListener("data", onData);
               stdin.setRawMode(wasRaw);
-              reject(new Error('Interrupted'));
+              reject(new Error("Interrupted"));
               return;
-            case '\r': // Enter
-            case '\n': // Newline
-              stdin.removeListener('data', onData);
+            case "\r": // Enter
+            case "\n": // Newline
+              stdin.removeListener("data", onData);
               stdin.setRawMode(wasRaw);
               resolve(this.options[this.selectedIndex].value);
               return;
-            case '\x1B': // ESC sequence
+            case "\x1B": // ESC sequence
               // Next character will be [, then A, B, C, or D
               break;
             default:
@@ -80,24 +76,24 @@ export class InteractiveSelector<T> {
         }
 
         // Handle escape sequences
-        if (chunk.startsWith('\x1B')) {
-          if (chunk === '\x1B[A') {
+        if (chunk.startsWith("\x1B")) {
+          if (chunk === "\x1B[A") {
             // Arrow up
             this.moveUp();
-          } else if (chunk === '\x1B[B') {
+          } else if (chunk === "\x1B[B") {
             // Arrow down
             this.moveDown();
-          } else if (chunk === '\x1B[C') {
+          } else if (chunk === "\x1B[C") {
             // Arrow right
             // Do nothing for now
-          } else if (chunk === '\x1B[D') {
+          } else if (chunk === "\x1B[D") {
             // Arrow left
             // Do nothing for now
           }
         }
       };
 
-      stdin.on('data', onData);
+      stdin.on("data", onData);
     });
   }
 
@@ -119,9 +115,9 @@ export class InteractiveSelector<T> {
     // Write each option - combine label and description on same line
     this.options.forEach((option, index) => {
       const isSelected = index === this.selectedIndex;
-      const indicator = isSelected ? '> ' : '  ';
-      const color = isSelected ? '\x1B[36m' : '\x1B[0m'; // Cyan for selected, default for others
-      const reset = '\x1B[0m';
+      const indicator = isSelected ? "> " : "  ";
+      const color = isSelected ? "\x1B[36m" : "\x1B[0m"; // Cyan for selected, default for others
+      const reset = "\x1B[0m";
 
       // Combine label and description in one line
       let line = `${indicator}${color}${option.label}`;
@@ -134,9 +130,7 @@ export class InteractiveSelector<T> {
     });
 
     // Add instructions
-    stdout.write(
-      `\n${t('(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n')}`,
-    );
+    stdout.write(`\n${t("(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n")}`);
   }
 
   /**
@@ -151,8 +145,7 @@ export class InteractiveSelector<T> {
    * Moves selection up
    */
   private moveUp(): void {
-    this.selectedIndex =
-      (this.selectedIndex - 1 + this.options.length) % this.options.length;
+    this.selectedIndex = (this.selectedIndex - 1 + this.options.length) % this.options.length;
     this.renderMenu();
   }
 
diff --git a/apps/airiscode-cli/src/commands/channel.ts b/apps/airiscode-cli/src/commands/channel.ts
index f54249a36..8f0a208bb 100644
--- a/apps/airiscode-cli/src/commands/channel.ts
+++ b/apps/airiscode-cli/src/commands/channel.ts
@@ -1,6 +1,8 @@
 // Channel commands removed - not needed for AIRIS Code
 export const channelCommand = {
-  command: 'channel',
-  describe: 'Channel commands (not available)',
-  handler: () => { console.log('Channel commands are not available in AIRIS Code'); },
+  command: "channel",
+  describe: "Channel commands (not available)",
+  handler: () => {
+    console.log("Channel commands are not available in AIRIS Code");
+  },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions.tsx b/apps/airiscode-cli/src/commands/extensions.tsx
index d02aec31f..ea4a00077 100644
--- a/apps/airiscode-cli/src/commands/extensions.tsx
+++ b/apps/airiscode-cli/src/commands/extensions.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { installCommand } from './extensions/install.js';
-import { uninstallCommand } from './extensions/uninstall.js';
-import { listCommand } from './extensions/list.js';
-import { updateCommand } from './extensions/update.js';
-import { disableCommand } from './extensions/disable.js';
-import { enableCommand } from './extensions/enable.js';
-import { linkCommand } from './extensions/link.js';
-import { newCommand } from './extensions/new.js';
-import { settingsCommand } from './extensions/settings.js';
+import type { CommandModule } from "yargs";
+import { disableCommand } from "./extensions/disable.js";
+import { enableCommand } from "./extensions/enable.js";
+import { installCommand } from "./extensions/install.js";
+import { linkCommand } from "./extensions/link.js";
+import { listCommand } from "./extensions/list.js";
+import { newCommand } from "./extensions/new.js";
+import { settingsCommand } from "./extensions/settings.js";
+import { uninstallCommand } from "./extensions/uninstall.js";
+import { updateCommand } from "./extensions/update.js";
 
 export const extensionsCommand: CommandModule = {
-  command: 'extensions <command>',
-  describe: 'Manage AIRIS Code extensions.',
+  command: "extensions <command>",
+  describe: "Manage AIRIS Code extensions.",
   builder: (yargs) =>
     yargs
       .command(installCommand)
@@ -29,7 +29,7 @@ export const extensionsCommand: CommandModule = {
       .command(linkCommand)
       .command(newCommand)
       .command(settingsCommand)
-      .demandCommand(1, 'You need at least one command before continuing.')
+      .demandCommand(1, "You need at least one command before continuing.")
       .version(false),
   handler: () => {
     // This handler is not called when a subcommand is provided.
diff --git a/apps/airiscode-cli/src/commands/extensions/consent.ts b/apps/airiscode-cli/src/commands/extensions/consent.ts
index 262422ea6..e38fc0578 100644
--- a/apps/airiscode-cli/src/commands/extensions/consent.ts
+++ b/apps/airiscode-cli/src/commands/extensions/consent.ts
@@ -4,12 +4,12 @@ import type {
   ExtensionRequestOptions,
   SkillConfig,
   SubagentConfig,
-} from '@airiscode/core';
-import type { ConfirmationRequest } from '../../ui/types.js';
-import chalk from 'chalk';
-import prompts from 'prompts';
-import { t } from '../../i18n/index.js';
-import { writeStdoutLine } from '../../utils/stdioHelpers.js';
+} from "@airiscode/core";
+import chalk from "chalk";
+import prompts from "prompts";
+import { t } from "../../i18n/index.js";
+import type { ConfirmationRequest } from "../../ui/types.js";
+import { writeStdoutLine } from "../../utils/stdioHelpers.js";
 
 /**
  * Requests consent from the user to perform an action, by reading a Y/n
@@ -20,13 +20,9 @@ import { writeStdoutLine } from '../../utils/stdioHelpers.js';
  * @param consentDescription The description of the thing they will be consenting to.
  * @returns boolean, whether they consented or not.
  */
-export async function requestConsentNonInteractive(
-  consentDescription: string,
-): Promise<boolean> {
+export async function requestConsentNonInteractive(consentDescription: string): Promise<boolean> {
   writeStdoutLine(consentDescription);
-  const result = await promptForConsentNonInteractive(
-    t('Do you want to continue? [Y/n]: '),
-  );
+  const result = await promptForConsentNonInteractive(t("Do you want to continue? [Y/n]: "));
   return result;
 }
 
@@ -45,7 +41,7 @@ export async function requestChoicePluginNonInteractive(
   const plugins = marketplace.plugins;
 
   if (plugins.length === 0) {
-    throw new Error(t('No plugins available in this marketplace.'));
+    throw new Error(t("No plugins available in this marketplace."));
   }
 
   // Build choices for prompts select
@@ -56,8 +52,8 @@ export async function requestChoicePluginNonInteractive(
   }));
 
   const response = await prompts({
-    type: 'select',
-    name: 'plugin',
+    type: "select",
+    name: "plugin",
     message: t('Select a plugin to install from marketplace "{{name}}":', {
       name: marketplace.name,
     }),
@@ -67,7 +63,7 @@ export async function requestChoicePluginNonInteractive(
 
   // Handle cancellation (Ctrl+C)
   if (response.plugin === undefined) {
-    throw new Error(t('Plugin selection cancelled.'));
+    throw new Error(t("Plugin selection cancelled."));
   }
 
   return response.plugin;
@@ -87,7 +83,7 @@ export async function requestConsentInteractive(
   addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
 ): Promise<boolean> {
   return promptForConsentInteractive(
-    consentDescription + '\n\n' + t('Do you want to continue?'),
+    consentDescription + "\n\n" + t("Do you want to continue?"),
     addExtensionUpdateConfirmationRequest,
   );
 }
@@ -100,10 +96,8 @@ export async function requestConsentInteractive(
  * @param prompt A yes/no prompt to ask the user
  * @returns Whether or not the user answers 'y' (yes). Defaults to 'yes' on enter.
  */
-async function promptForConsentNonInteractive(
-  prompt: string,
-): Promise<boolean> {
-  const readline = await import('node:readline');
+async function promptForConsentNonInteractive(prompt: string): Promise<boolean> {
+  const readline = await import("node:readline");
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -112,7 +106,7 @@ async function promptForConsentNonInteractive(
   return new Promise((resolve) => {
     rl.question(prompt, (answer) => {
       rl.close();
-      resolve(['y', ''].includes(answer.trim().toLowerCase()));
+      resolve(["y", ""].includes(answer.trim().toLowerCase()));
     });
   });
 }
@@ -149,70 +143,65 @@ export function extensionConsentString(
   commands: string[] = [],
   skills: SkillConfig[] = [],
   subagents: SubagentConfig[] = [],
-  originSource: string = 'AirisCode',
+  originSource: string = "AirisCode",
 ): string {
   const output: string[] = [];
-  if (originSource !== 'AirisCode') {
+  if (originSource !== "AirisCode") {
     output.push(
       t(
-        'You are installing an extension from {{originSource}}. Some features may not work perfectly with AIRIS Code.',
+        "You are installing an extension from {{originSource}}. Some features may not work perfectly with AIRIS Code.",
         { originSource },
       ),
     );
   }
   const mcpServerEntries = Object.entries(extensionConfig.mcpServers || {});
-  output.push(
-    t('Installing extension "{{name}}".', { name: extensionConfig.name }),
-  );
+  output.push(t('Installing extension "{{name}}".', { name: extensionConfig.name }));
   output.push(
     t(
-      '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**',
+      "**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**",
     ),
   );
 
   if (mcpServerEntries.length) {
-    output.push(t('This extension will run the following MCP servers:'));
+    output.push(t("This extension will run the following MCP servers:"));
     for (const [key, mcpServer] of mcpServerEntries) {
       const isLocal = !!mcpServer.command;
       const source =
         mcpServer.httpUrl ??
-        `${mcpServer.command || ''}${mcpServer.args ? ' ' + mcpServer.args.join(' ') : ''}`;
-      output.push(
-        `  * ${key} (${isLocal ? t('local') : t('remote')}): ${source}`,
-      );
+        `${mcpServer.command || ""}${mcpServer.args ? " " + mcpServer.args.join(" ") : ""}`;
+      output.push(`  * ${key} (${isLocal ? t("local") : t("remote")}): ${source}`);
     }
   }
   if (commands && commands.length > 0) {
     output.push(
-      t('This extension will add the following commands: {{commands}}.', {
-        commands: commands.join(', '),
+      t("This extension will add the following commands: {{commands}}.", {
+        commands: commands.join(", "),
       }),
     );
   }
   if (extensionConfig.contextFileName) {
     const fileName = Array.isArray(extensionConfig.contextFileName)
-      ? extensionConfig.contextFileName.join(', ')
+      ? extensionConfig.contextFileName.join(", ")
       : extensionConfig.contextFileName;
     output.push(
-      t(
-        'This extension will append info to your AIRISCODE.md context using {{fileName}}',
-        { fileName },
-      ),
+      t("This extension will append info to your AIRISCODE.md context using {{fileName}}", {
+        fileName,
+      }),
     );
   }
   if (skills.length > 0) {
-    output.push(t('This extension will install the following skills:'));
+    output.push(t("This extension will install the following skills:"));
     for (const skill of skills) {
       output.push(`  * ${chalk.bold(skill.name)}: ${skill.description}`);
     }
   }
   if (subagents.length > 0) {
-    output.push(t('This extension will install the following subagents:'));
+    output.push(t("This extension will install the following subagents:"));
     for (const subagent of subagents) {
       output.push(`  * ${chalk.bold(subagent.name)}: ${subagent.description}`);
     }
   }
-  return output.join('\n');
+  return output.join("\n");
 }
 
 /**
@@ -231,7 +220,7 @@ export const requestConsentOrFail = async (
   if (!options) return;
   const {
     extensionConfig,
-    originSource = 'AirisCode',
+    originSource = "AirisCode",
     commands = [],
     skills = [],
     subagents = [],
diff --git a/apps/airiscode-cli/src/commands/extensions/disable.ts b/apps/airiscode-cli/src/commands/extensions/disable.ts
index f13e3f550..16429f1d1 100644
--- a/apps/airiscode-cli/src/commands/extensions/disable.ts
+++ b/apps/airiscode-cli/src/commands/extensions/disable.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type CommandModule } from 'yargs';
-import { SettingScope } from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import { getExtensionManager } from './utils.js';
-import { t } from '../../i18n/index.js';
+import { type CommandModule } from "yargs";
+import { SettingScope } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { getExtensionManager } from "./utils.js";
 
 interface DisableArgs {
   name: string;
@@ -19,7 +19,7 @@ interface DisableArgs {
 export async function handleDisable(args: DisableArgs) {
   const extensionManager = await getExtensionManager();
   try {
-    if (args.scope?.toLowerCase() === 'workspace') {
+    if (args.scope?.toLowerCase() === "workspace") {
       extensionManager.disableExtension(args.name, SettingScope.Workspace);
     } else {
       extensionManager.disableExtension(args.name, SettingScope.User);
@@ -37,17 +37,17 @@ export async function handleDisable(args: DisableArgs) {
 }
 
 export const disableCommand: CommandModule = {
-  command: 'disable [--scope] <name>',
-  describe: t('Disables an extension.'),
+  command: "disable [--scope] <name>",
+  describe: t("Disables an extension."),
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: t('The name of the extension to disable.'),
-        type: 'string',
+      .positional("name", {
+        describe: t("The name of the extension to disable."),
+        type: "string",
       })
-      .option('scope', {
-        describe: t('The scope to disable the extenison in.'),
-        type: 'string',
+      .option("scope", {
+        describe: t("The scope to disable the extenison in."),
+        type: "string",
         default: SettingScope.User,
       })
       .check((argv) => {
@@ -58,11 +58,11 @@ export const disableCommand: CommandModule = {
             .includes((argv.scope as string).toLowerCase())
         ) {
           throw new Error(
-            t('Invalid scope: {{scope}}. Please use one of {{scopes}}.', {
+            t("Invalid scope: {{scope}}. Please use one of {{scopes}}.", {
               scope: argv.scope as string,
               scopes: Object.values(SettingScope)
                 .map((s) => s.toLowerCase())
-                .join(', '),
+                .join(", "),
             }),
           );
         }
@@ -70,8 +70,8 @@ export const disableCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleDisable({
-      name: argv['name'] as string,
-      scope: argv['scope'] as string,
+      name: argv["name"] as string,
+      scope: argv["scope"] as string,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions/enable.ts b/apps/airiscode-cli/src/commands/extensions/enable.ts
index 33e8bfba9..9e1747335 100644
--- a/apps/airiscode-cli/src/commands/extensions/enable.ts
+++ b/apps/airiscode-cli/src/commands/extensions/enable.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type CommandModule } from 'yargs';
-import { FatalConfigError, getErrorMessage } from '@airiscode/core';
-import { SettingScope } from '../../config/settings.js';
-import { writeStdoutLine } from '../../utils/stdioHelpers.js';
-import { getExtensionManager } from './utils.js';
-import { t } from '../../i18n/index.js';
+import { FatalConfigError, getErrorMessage } from "@airiscode/core";
+import { type CommandModule } from "yargs";
+import { SettingScope } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
+import { writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { getExtensionManager } from "./utils.js";
 
 interface EnableArgs {
   name: string;
@@ -20,7 +20,7 @@ export async function handleEnable(args: EnableArgs) {
   const extensionManager = await getExtensionManager();
 
   try {
-    if (args.scope?.toLowerCase() === 'workspace') {
+    if (args.scope?.toLowerCase() === "workspace") {
       extensionManager.enableExtension(args.name, SettingScope.Workspace);
     } else {
       extensionManager.enableExtension(args.name, SettingScope.User);
@@ -45,19 +45,19 @@ export async function handleEnable(args: EnableArgs) {
 }
 
 export const enableCommand: CommandModule = {
-  command: 'enable [--scope] <name>',
-  describe: t('Enables an extension.'),
+  command: "enable [--scope] <name>",
+  describe: t("Enables an extension."),
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: t('The name of the extension to enable.'),
-        type: 'string',
+      .positional("name", {
+        describe: t("The name of the extension to enable."),
+        type: "string",
       })
-      .option('scope', {
+      .option("scope", {
         describe: t(
-          'The scope to enable the extenison in. If not set, will be enabled in all scopes.',
+          "The scope to enable the extenison in. If not set, will be enabled in all scopes.",
         ),
-        type: 'string',
+        type: "string",
       })
       .check((argv) => {
         if (
@@ -67,11 +67,11 @@ export const enableCommand: CommandModule = {
             .includes((argv.scope as string).toLowerCase())
         ) {
           throw new Error(
-            t('Invalid scope: {{scope}}. Please use one of {{scopes}}.', {
+            t("Invalid scope: {{scope}}. Please use one of {{scopes}}.", {
               scope: argv.scope as string,
               scopes: Object.values(SettingScope)
                 .map((s) => s.toLowerCase())
-                .join(', '),
+                .join(", "),
             }),
           );
         }
@@ -79,8 +79,8 @@ export const enableCommand: CommandModule = {
       }),
   handler: async (argv) => {
     await handleEnable({
-      name: argv['name'] as string,
-      scope: argv['scope'] as string,
+      name: argv["name"] as string,
+      scope: argv["scope"] as string,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions/examples/mcp-server/example.ts b/apps/airiscode-cli/src/commands/extensions/examples/mcp-server/example.ts
index 21e01e17c..c946453e6 100644
--- a/apps/airiscode-cli/src/commands/extensions/examples/mcp-server/example.ts
+++ b/apps/airiscode-cli/src/commands/extensions/examples/mcp-server/example.ts
@@ -4,31 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { z } from 'zod';
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { z } from "zod";
 
 const server = new McpServer({
-  name: 'prompt-server',
-  version: '1.0.0',
+  name: "prompt-server",
+  version: "1.0.0",
 });
 
 server.registerTool(
-  'fetch_posts',
+  "fetch_posts",
   {
-    description: 'Fetches a list of posts from a public API.',
+    description: "Fetches a list of posts from a public API.",
     inputSchema: z.object({}).shape,
   },
   async () => {
-    const apiResponse = await fetch(
-      'https://jsonplaceholder.typicode.com/posts',
-    );
+    const apiResponse = await fetch("https://jsonplaceholder.typicode.com/posts");
     const posts = await apiResponse.json();
     const response = { posts: posts.slice(0, 5) };
     return {
       content: [
         {
-          type: 'text',
+          type: "text",
           text: JSON.stringify(response),
         },
       ],
@@ -37,19 +35,19 @@ server.registerTool(
 );
 
 server.registerPrompt(
-  'poem-writer',
+  "poem-writer",
   {
-    title: 'Poem Writer',
-    description: 'Write a nice haiku',
+    title: "Poem Writer",
+    description: "Write a nice haiku",
     argsSchema: { title: z.string(), mood: z.string().optional() },
   },
   ({ title, mood }) => ({
     messages: [
       {
-        role: 'user',
+        role: "user",
         content: {
-          type: 'text',
-          text: `Write a haiku${mood ? ` with the mood ${mood}` : ''} called ${title}. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables `,
+          type: "text",
+          text: `Write a haiku${mood ? ` with the mood ${mood}` : ""} called ${title}. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables `,
         },
       },
     ],
diff --git a/apps/airiscode-cli/src/commands/extensions/install.ts b/apps/airiscode-cli/src/commands/extensions/install.ts
index bfffce698..3087f70a7 100644
--- a/apps/airiscode-cli/src/commands/extensions/install.ts
+++ b/apps/airiscode-cli/src/commands/extensions/install.ts
@@ -4,22 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-
-import {
-  ExtensionManager,
-  parseInstallSource,
-} from '@airiscode/core';
-import { getErrorMessage } from '../../utils/errors.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-import { loadSettings } from '../../config/settings.js';
+import { ExtensionManager, parseInstallSource } from "@airiscode/core";
+import type { CommandModule } from "yargs";
+import { loadSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted } from "../../config/trustedFolders.js";
+import { t } from "../../i18n/index.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
 import {
-  requestConsentOrFail,
-  requestConsentNonInteractive,
   requestChoicePluginNonInteractive,
-} from './consent.js';
-import { t } from '../../i18n/index.js';
+  requestConsentNonInteractive,
+  requestConsentOrFail,
+} from "./consent.js";
 
 interface InstallArgs {
   source: string;
@@ -35,32 +31,30 @@ export async function handleInstall(args: InstallArgs) {
     const installMetadata = await parseInstallSource(args.source);
 
     if (
-      installMetadata.type !== 'git' &&
-      installMetadata.type !== 'github-release' &&
-      installMetadata.type !== 'npm'
+      installMetadata.type !== "git" &&
+      installMetadata.type !== "github-release" &&
+      installMetadata.type !== "npm"
     ) {
       if (args.ref || args.autoUpdate) {
         throw new Error(
-          t(
-            '--ref and --auto-update are not applicable for marketplace extensions.',
-          ),
+          t("--ref and --auto-update are not applicable for marketplace extensions."),
         );
       }
     }
 
-    if (installMetadata.type === 'npm' && args.ref) {
+    if (installMetadata.type === "npm" && args.ref) {
       throw new Error(
         t(
-          '--ref is not applicable for npm extensions. Use @version suffix instead (e.g. @scope/package@1.2.0).',
+          "--ref is not applicable for npm extensions. Use @version suffix instead (e.g. @scope/package@1.2.0).",
         ),
       );
     }
 
-    if (installMetadata.type !== 'npm' && args.registry) {
-      throw new Error(t('--registry is only applicable for npm extensions.'));
+    if (installMetadata.type !== "npm" && args.registry) {
+      throw new Error(t("--registry is only applicable for npm extensions."));
     }
 
-    if (installMetadata.type === 'npm' && args.registry) {
+    if (installMetadata.type === "npm" && args.registry) {
       installMetadata.registryUrl = args.registry;
     }
 
@@ -70,9 +64,7 @@ export async function handleInstall(args: InstallArgs) {
     const workspaceDir = process.cwd();
     const extensionManager = new ExtensionManager({
       workspaceDir,
-      isWorkspaceTrusted: !!isWorkspaceTrusted(
-        loadSettings(workspaceDir).merged,
-      ),
+      isWorkspaceTrusted: !!isWorkspaceTrusted(loadSettings(workspaceDir).merged),
       requestConsent,
       requestChoicePlugin: requestChoicePluginNonInteractive,
     });
@@ -99,56 +91,56 @@ export async function handleInstall(args: InstallArgs) {
 }
 
 export const installCommand: CommandModule = {
-  command: 'install <source>',
+  command: "install <source>",
   describe: t(
-    'Installs an extension from a git repository URL, local path, scoped npm package (@scope/name), or claude marketplace (marketplace-url:plugin-name).',
+    "Installs an extension from a git repository URL, local path, scoped npm package (@scope/name), or claude marketplace (marketplace-url:plugin-name).",
   ),
   builder: (yargs) =>
     yargs
-      .positional('source', {
+      .positional("source", {
         describe: t(
-          'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.',
+          "The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.",
         ),
-        type: 'string',
+        type: "string",
         demandOption: true,
       })
-      .option('ref', {
-        describe: t('The git ref to install from.'),
-        type: 'string',
+      .option("ref", {
+        describe: t("The git ref to install from."),
+        type: "string",
       })
-      .option('auto-update', {
-        describe: t('Enable auto-update for this extension.'),
-        type: 'boolean',
+      .option("auto-update", {
+        describe: t("Enable auto-update for this extension."),
+        type: "boolean",
       })
-      .option('pre-release', {
-        describe: t('Enable pre-release versions for this extension.'),
-        type: 'boolean',
+      .option("pre-release", {
+        describe: t("Enable pre-release versions for this extension."),
+        type: "boolean",
       })
-      .option('registry', {
-        describe: t('Custom npm registry URL (only for npm extensions).'),
-        type: 'string',
+      .option("registry", {
+        describe: t("Custom npm registry URL (only for npm extensions)."),
+        type: "string",
       })
-      .option('consent', {
+      .option("consent", {
         describe: t(
-          'Acknowledge the security risks of installing an extension and skip the confirmation prompt.',
+          "Acknowledge the security risks of installing an extension and skip the confirmation prompt.",
         ),
-        type: 'boolean',
+        type: "boolean",
         default: false,
       })
       .check((argv) => {
         if (!argv.source) {
-          throw new Error(t('The source argument must be provided.'));
+          throw new Error(t("The source argument must be provided."));
         }
         return true;
       }),
   handler: async (argv) => {
     await handleInstall({
-      source: argv['source'] as string,
-      ref: argv['ref'] as string | undefined,
-      autoUpdate: argv['auto-update'] as boolean | undefined,
-      allowPreRelease: argv['pre-release'] as boolean | undefined,
-      consent: argv['consent'] as boolean | undefined,
-      registry: argv['registry'] as string | undefined,
+      source: argv["source"] as string,
+      ref: argv["ref"] as string | undefined,
+      autoUpdate: argv["auto-update"] as boolean | undefined,
+      allowPreRelease: argv["pre-release"] as boolean | undefined,
+      consent: argv["consent"] as boolean | undefined,
+      registry: argv["registry"] as string | undefined,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions/link.ts b/apps/airiscode-cli/src/commands/extensions/link.ts
index 484812b0a..cc65178c5 100644
--- a/apps/airiscode-cli/src/commands/extensions/link.ts
+++ b/apps/airiscode-cli/src/commands/extensions/link.ts
@@ -4,16 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { type ExtensionInstallMetadata } from '@airiscode/core';
-import { getErrorMessage } from '../../utils/errors.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import {
-  requestConsentNonInteractive,
-  requestConsentOrFail,
-} from './consent.js';
-import { getExtensionManager } from './utils.js';
-import { t } from '../../i18n/index.js';
+import { type ExtensionInstallMetadata } from "@airiscode/core";
+import type { CommandModule } from "yargs";
+import { t } from "../../i18n/index.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { requestConsentNonInteractive, requestConsentOrFail } from "./consent.js";
+import { getExtensionManager } from "./utils.js";
 
 interface InstallArgs {
   path: string;
@@ -23,7 +20,7 @@ export async function handleLink(args: InstallArgs) {
   try {
     const installMetadata: ExtensionInstallMetadata = {
       source: args.path,
-      type: 'link',
+      type: "link",
     };
     const extensionManager = await getExtensionManager();
 
@@ -32,7 +29,7 @@ export async function handleLink(args: InstallArgs) {
       requestConsentOrFail.bind(null, requestConsentNonInteractive),
     );
     if (!extension) {
-      writeStdoutLine(t('Link extension failed to install.'));
+      writeStdoutLine(t("Link extension failed to install."));
       return;
     }
     writeStdoutLine(
@@ -47,20 +44,20 @@ export async function handleLink(args: InstallArgs) {
 }
 
 export const linkCommand: CommandModule = {
-  command: 'link <path>',
+  command: "link <path>",
   describe: t(
-    'Links an extension from a local path. Updates made to the local path will always be reflected.',
+    "Links an extension from a local path. Updates made to the local path will always be reflected.",
   ),
   builder: (yargs) =>
     yargs
-      .positional('path', {
-        describe: t('The name of the extension to link.'),
-        type: 'string',
+      .positional("path", {
+        describe: t("The name of the extension to link."),
+        type: "string",
       })
       .check((_) => true),
   handler: async (argv) => {
     await handleLink({
-      path: argv['path'] as string,
+      path: argv["path"] as string,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions/list.ts b/apps/airiscode-cli/src/commands/extensions/list.ts
index 4444fba67..657b5fb54 100644
--- a/apps/airiscode-cli/src/commands/extensions/list.ts
+++ b/apps/airiscode-cli/src/commands/extensions/list.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { getErrorMessage } from '../../utils/errors.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import { extensionToOutputString, getExtensionManager } from './utils.js';
-import { t } from '../../i18n/index.js';
+import type { CommandModule } from "yargs";
+import { t } from "../../i18n/index.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { extensionToOutputString, getExtensionManager } from "./utils.js";
 
 export async function handleList() {
   try {
@@ -16,7 +16,7 @@ export async function handleList() {
     const extensions = extensionManager.getLoadedExtensions();
 
     if (!extensions || extensions.length === 0) {
-      writeStdoutLine(t('No extensions installed.'));
+      writeStdoutLine(t("No extensions installed."));
       return;
     }
     writeStdoutLine(
@@ -24,7 +24,7 @@ export async function handleList() {
         .map((extension, _): string =>
           extensionToOutputString(extension, extensionManager, process.cwd()),
         )
-        .join('\n\n'),
+        .join("\n\n"),
     );
   } catch (error) {
     writeStderrLine(getErrorMessage(error));
@@ -33,8 +33,8 @@ export async function handleList() {
 }
 
 export const listCommand: CommandModule = {
-  command: 'list',
-  describe: t('Lists installed extensions.'),
+  command: "list",
+  describe: t("Lists installed extensions."),
   builder: (yargs) => yargs,
   handler: async () => {
     await handleList();
diff --git a/apps/airiscode-cli/src/commands/extensions/new.ts b/apps/airiscode-cli/src/commands/extensions/new.ts
index f47648ab9..b70157e73 100644
--- a/apps/airiscode-cli/src/commands/extensions/new.ts
+++ b/apps/airiscode-cli/src/commands/extensions/new.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { access, cp, mkdir, readdir, writeFile } from 'node:fs/promises';
-import { join, dirname, basename } from 'node:path';
-import type { CommandModule } from 'yargs';
-import { fileURLToPath } from 'node:url';
-import { getErrorMessage } from '../../utils/errors.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
+import { access, cp, mkdir, readdir, writeFile } from "node:fs/promises";
+import { basename, dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import type { CommandModule } from "yargs";
+import { getErrorMessage } from "../../utils/errors.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
 
 interface NewArgs {
   path: string;
@@ -19,7 +19,7 @@ interface NewArgs {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-const EXAMPLES_PATH = join(__dirname, 'examples');
+const EXAMPLES_PATH = join(__dirname, "examples");
 
 async function pathExists(path: string) {
   try {
@@ -61,12 +61,9 @@ async function handleNew(args: NewArgs) {
       const extensionName = basename(args.path);
       const manifest = {
         name: extensionName,
-        version: '1.0.0',
+        version: "1.0.0",
       };
-      await writeFile(
-        join(args.path, 'qwen-extension.json'),
-        JSON.stringify(manifest, null, 2),
-      );
+      await writeFile(join(args.path, "qwen-extension.json"), JSON.stringify(manifest, null, 2));
       writeStdoutLine(`Successfully created new extension at ${args.path}.`);
     }
     writeStdoutLine(
@@ -80,31 +77,29 @@ async function handleNew(args: NewArgs) {
 
 async function getBoilerplateChoices() {
   const entries = await readdir(EXAMPLES_PATH, { withFileTypes: true });
-  return entries
-    .filter((entry) => entry.isDirectory())
-    .map((entry) => entry.name);
+  return entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name);
 }
 
 export const newCommand: CommandModule = {
-  command: 'new <path> [template]',
-  describe: 'Create a new extension from a boilerplate example.',
+  command: "new <path> [template]",
+  describe: "Create a new extension from a boilerplate example.",
   builder: async (yargs) => {
     const choices = await getBoilerplateChoices();
     return yargs
-      .positional('path', {
-        describe: 'The path to create the extension in.',
-        type: 'string',
+      .positional("path", {
+        describe: "The path to create the extension in.",
+        type: "string",
       })
-      .positional('template', {
-        describe: 'The boilerplate template to use.',
-        type: 'string',
+      .positional("template", {
+        describe: "The boilerplate template to use.",
+        type: "string",
         choices,
       });
   },
   handler: async (args) => {
     await handleNew({
-      path: args['path'] as string,
-      template: args['template'] as string | undefined,
+      path: args["path"] as string,
+      template: args["template"] as string | undefined,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions/settings.ts b/apps/airiscode-cli/src/commands/extensions/settings.ts
index bbc22b2f2..abb3ada75 100644
--- a/apps/airiscode-cli/src/commands/extensions/settings.ts
+++ b/apps/airiscode-cli/src/commands/extensions/settings.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { getExtensionManager } from './utils.js';
 import {
   ExtensionSettingScope,
   getScopedEnvContents,
   promptForSetting,
   updateSetting,
-} from '@airiscode/core';
-import { t } from '../../i18n/index.js';
-import { writeStdoutLine } from '../../utils/stdioHelpers.js';
+} from "@airiscode/core";
+import type { CommandModule } from "yargs";
+import { t } from "../../i18n/index.js";
+import { writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { getExtensionManager } from "./utils.js";
 
 // --- SET COMMAND ---
 interface SetArgs {
@@ -23,25 +23,25 @@ interface SetArgs {
 }
 
 const setCommand: CommandModule<object, SetArgs> = {
-  command: 'set [--scope] <name> <setting>',
-  describe: t('Set a specific setting for an extension.'),
+  command: "set [--scope] <name> <setting>",
+  describe: t("Set a specific setting for an extension."),
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: t('Name of the extension to configure.'),
-        type: 'string',
+      .positional("name", {
+        describe: t("Name of the extension to configure."),
+        type: "string",
         demandOption: true,
       })
-      .positional('setting', {
-        describe: t('The setting to configure (name or env var).'),
-        type: 'string',
+      .positional("setting", {
+        describe: t("The setting to configure (name or env var)."),
+        type: "string",
         demandOption: true,
       })
-      .option('scope', {
-        describe: t('The scope to set the setting in.'),
-        type: 'string',
-        choices: ['user', 'workspace'],
-        default: 'user',
+      .option("scope", {
+        describe: t("The scope to set the setting in."),
+        type: "string",
+        choices: ["user", "workspace"],
+        default: "user",
       }),
   handler: async (args) => {
     const { name, setting, scope } = args;
@@ -70,12 +70,12 @@ interface ListArgs {
 }
 
 const listCommand: CommandModule<object, ListArgs> = {
-  command: 'list <name>',
-  describe: t('List all settings for an extension.'),
+  command: "list <name>",
+  describe: t("List all settings for an extension."),
   builder: (yargs) =>
-    yargs.positional('name', {
-      describe: t('Name of the extension.'),
-      type: 'string',
+    yargs.positional("name", {
+      describe: t("Name of the extension."),
+      type: "string",
       demandOption: true,
     }),
   handler: async (args) => {
@@ -90,9 +90,7 @@ const listCommand: CommandModule<object, ListArgs> = {
       return;
     }
     if (!extension || !extension.settings || extension.settings.length === 0) {
-      writeStdoutLine(
-        t('Extension "{{name}}" has no settings to configure.', { name }),
-      );
+      writeStdoutLine(t('Extension "{{name}}" has no settings to configure.', { name }));
       return;
     }
 
@@ -112,38 +110,38 @@ const listCommand: CommandModule<object, ListArgs> = {
     for (const setting of extension.settings) {
       const value = mergedSettings[setting.envVar];
       let displayValue: string;
-      let scopeInfo = '';
+      let scopeInfo = "";
 
       if (workspaceSettings[setting.envVar] !== undefined) {
-        scopeInfo = ' ' + t('(workspace)');
+        scopeInfo = " " + t("(workspace)");
       } else if (userSettings[setting.envVar] !== undefined) {
-        scopeInfo = ' ' + t('(user)');
+        scopeInfo = " " + t("(user)");
       }
 
       if (value === undefined) {
-        displayValue = t('[not set]');
+        displayValue = t("[not set]");
       } else if (setting.sensitive) {
-        displayValue = t('[value stored in keychain]');
+        displayValue = t("[value stored in keychain]");
       } else {
         displayValue = value;
       }
       writeStdoutLine(`
 - ${setting.name} (${setting.envVar})`);
-      writeStdoutLine(`  ${t('Description:')} ${setting.description}`);
-      writeStdoutLine(`  ${t('Value:')} ${displayValue}${scopeInfo}`);
+      writeStdoutLine(`  ${t("Description:")} ${setting.description}`);
+      writeStdoutLine(`  ${t("Value:")} ${displayValue}${scopeInfo}`);
     }
   },
 };
 
 // --- SETTINGS COMMAND ---
 export const settingsCommand: CommandModule = {
-  command: 'settings <command>',
-  describe: t('Manage extension settings.'),
+  command: "settings <command>",
+  describe: t("Manage extension settings."),
   builder: (yargs) =>
     yargs
       .command(setCommand)
       .command(listCommand)
-      .demandCommand(1, t('You need to specify a command (set or list).'))
+      .demandCommand(1, t("You need to specify a command (set or list)."))
       .version(false),
   handler: () => {
     // This handler is not called when a subcommand is provided.
diff --git a/apps/airiscode-cli/src/commands/extensions/uninstall.ts b/apps/airiscode-cli/src/commands/extensions/uninstall.ts
index 0450f4d69..fb385be66 100644
--- a/apps/airiscode-cli/src/commands/extensions/uninstall.ts
+++ b/apps/airiscode-cli/src/commands/extensions/uninstall.ts
@@ -4,17 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { getErrorMessage } from '../../utils/errors.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import { ExtensionManager } from '@airiscode/core';
-import {
-  requestConsentNonInteractive,
-  requestConsentOrFail,
-} from './consent.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-import { loadSettings } from '../../config/settings.js';
-import { t } from '../../i18n/index.js';
+import { ExtensionManager } from "@airiscode/core";
+import type { CommandModule } from "yargs";
+import { loadSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted } from "../../config/trustedFolders.js";
+import { t } from "../../i18n/index.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { requestConsentNonInteractive, requestConsentOrFail } from "./consent.js";
 
 interface UninstallArgs {
   name: string; // can be extension name or source URL.
@@ -25,19 +22,12 @@ export async function handleUninstall(args: UninstallArgs) {
     const workspaceDir = process.cwd();
     const extensionManager = new ExtensionManager({
       workspaceDir,
-      requestConsent: requestConsentOrFail.bind(
-        null,
-        requestConsentNonInteractive,
-      ),
-      isWorkspaceTrusted: !!isWorkspaceTrusted(
-        loadSettings(workspaceDir).merged,
-      ),
+      requestConsent: requestConsentOrFail.bind(null, requestConsentNonInteractive),
+      isWorkspaceTrusted: !!isWorkspaceTrusted(loadSettings(workspaceDir).merged),
     });
     await extensionManager.refreshCache();
     await extensionManager.uninstallExtension(args.name, false);
-    writeStdoutLine(
-      t('Extension "{{name}}" successfully uninstalled.', { name: args.name }),
-    );
+    writeStdoutLine(t('Extension "{{name}}" successfully uninstalled.', { name: args.name }));
   } catch (error) {
     writeStderrLine(getErrorMessage(error));
     process.exit(1);
@@ -45,27 +35,25 @@ export async function handleUninstall(args: UninstallArgs) {
 }
 
 export const uninstallCommand: CommandModule = {
-  command: 'uninstall <name>',
-  describe: t('Uninstalls an extension.'),
+  command: "uninstall <name>",
+  describe: t("Uninstalls an extension."),
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: t('The name or source path of the extension to uninstall.'),
-        type: 'string',
+      .positional("name", {
+        describe: t("The name or source path of the extension to uninstall."),
+        type: "string",
       })
       .check((argv) => {
         if (!argv.name) {
           throw new Error(
-            t(
-              'Please include the name of the extension to uninstall as a positional argument.',
-            ),
+            t("Please include the name of the extension to uninstall as a positional argument."),
           );
         }
         return true;
       }),
   handler: async (argv) => {
     await handleUninstall({
-      name: argv['name'] as string,
+      name: argv["name"] as string,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions/update.ts b/apps/airiscode-cli/src/commands/extensions/update.ts
index 17d5a1585..8f7ad88fb 100644
--- a/apps/airiscode-cli/src/commands/extensions/update.ts
+++ b/apps/airiscode-cli/src/commands/extensions/update.ts
@@ -4,16 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { getErrorMessage } from '../../utils/errors.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import { ExtensionUpdateState } from '../../ui/state/extensions.js';
-import {
-  checkForExtensionUpdate,
-  type ExtensionUpdateInfo,
-} from '@airiscode/core';
-import { getExtensionManager } from './utils.js';
-import { t } from '../../i18n/index.js';
+import { checkForExtensionUpdate, type ExtensionUpdateInfo } from "@airiscode/core";
+import type { CommandModule } from "yargs";
+import { t } from "../../i18n/index.js";
+import { ExtensionUpdateState } from "../../ui/state/extensions.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { getExtensionManager } from "./utils.js";
 
 interface UpdateArgs {
   name?: string;
@@ -21,14 +18,11 @@ interface UpdateArgs {
 }
 
 const updateOutput = (info: ExtensionUpdateInfo) =>
-  t(
-    'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.',
-    {
-      name: info.name,
-      oldVersion: info.originalVersion,
-      newVersion: info.updatedVersion,
-    },
-  );
+  t('Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.', {
+    name: info.name,
+    oldVersion: info.originalVersion,
+    newVersion: info.updatedVersion,
+  });
 
 export async function handleUpdate(args: UpdateArgs) {
   const extensionManager = await getExtensionManager();
@@ -36,32 +30,22 @@ export async function handleUpdate(args: UpdateArgs) {
 
   if (args.name) {
     try {
-      const extension = extensions.find(
-        (extension) => extension.name === args.name,
-      );
+      const extension = extensions.find((extension) => extension.name === args.name);
       if (!extension) {
-        writeStdoutLine(
-          t('Extension "{{name}}" not found.', { name: args.name }),
-        );
+        writeStdoutLine(t('Extension "{{name}}" not found.', { name: args.name }));
         return;
       }
       if (!extension.installMetadata) {
         writeStdoutLine(
-          t(
-            'Unable to install extension "{{name}}" due to missing install metadata',
-            { name: args.name },
-          ),
+          t('Unable to install extension "{{name}}" due to missing install metadata', {
+            name: args.name,
+          }),
         );
         return;
       }
-      const updateState = await checkForExtensionUpdate(
-        extension,
-        extensionManager,
-      );
+      const updateState = await checkForExtensionUpdate(extension, extensionManager);
       if (updateState !== ExtensionUpdateState.UPDATE_AVAILABLE) {
-        writeStdoutLine(
-          t('Extension "{{name}}" is already up to date.', { name: args.name }),
-        );
+        writeStdoutLine(t('Extension "{{name}}" is already up to date.', { name: args.name }));
         return;
       }
       // TODO(chrstnb): we should list extensions if the requested extension is not installed.
@@ -70,24 +54,16 @@ export async function handleUpdate(args: UpdateArgs) {
         updateState,
         () => {},
       ))!;
-      if (
-        updatedExtensionInfo.originalVersion !==
-        updatedExtensionInfo.updatedVersion
-      ) {
+      if (updatedExtensionInfo.originalVersion !== updatedExtensionInfo.updatedVersion) {
         writeStdoutLine(
-          t(
-            'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.',
-            {
-              name: args.name,
-              oldVersion: updatedExtensionInfo.originalVersion,
-              newVersion: updatedExtensionInfo.updatedVersion,
-            },
-          ),
+          t('Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.', {
+            name: args.name,
+            oldVersion: updatedExtensionInfo.originalVersion,
+            newVersion: updatedExtensionInfo.updatedVersion,
+          }),
         );
       } else {
-        writeStdoutLine(
-          t('Extension "{{name}}" is already up to date.', { name: args.name }),
-        );
+        writeStdoutLine(t('Extension "{{name}}" is already up to date.', { name: args.name }));
       }
     } catch (error) {
       writeStderrLine(getErrorMessage(error));
@@ -96,26 +72,22 @@ export async function handleUpdate(args: UpdateArgs) {
   if (args.all) {
     try {
       const extensionState = new Map();
-      await extensionManager.checkForAllExtensionUpdates(
-        (extensionName, state) => {
-          extensionState.set(extensionName, {
-            status: state,
-            processed: true, // No need to process as we will force the update.
-          });
-        },
-      );
+      await extensionManager.checkForAllExtensionUpdates((extensionName, state) => {
+        extensionState.set(extensionName, {
+          status: state,
+          processed: true, // No need to process as we will force the update.
+        });
+      });
       let updateInfos = await extensionManager.updateAllUpdatableExtensions(
         extensionState,
         () => {},
       );
-      updateInfos = updateInfos.filter(
-        (info) => info.originalVersion !== info.updatedVersion,
-      );
+      updateInfos = updateInfos.filter((info) => info.originalVersion !== info.updatedVersion);
       if (updateInfos.length === 0) {
-        writeStdoutLine(t('No extensions to update.'));
+        writeStdoutLine(t("No extensions to update."));
         return;
       }
-      writeStdoutLine(updateInfos.map((info) => updateOutput(info)).join('\n'));
+      writeStdoutLine(updateInfos.map((info) => updateOutput(info)).join("\n"));
     } catch (error) {
       writeStderrLine(getErrorMessage(error));
     }
@@ -123,33 +95,29 @@ export async function handleUpdate(args: UpdateArgs) {
 }
 
 export const updateCommand: CommandModule = {
-  command: 'update [<name>] [--all]',
-  describe: t(
-    'Updates all extensions or a named extension to the latest version.',
-  ),
+  command: "update [<name>] [--all]",
+  describe: t("Updates all extensions or a named extension to the latest version."),
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: t('The name of the extension to update.'),
-        type: 'string',
+      .positional("name", {
+        describe: t("The name of the extension to update."),
+        type: "string",
       })
-      .option('all', {
-        describe: t('Update all extensions.'),
-        type: 'boolean',
+      .option("all", {
+        describe: t("Update all extensions."),
+        type: "boolean",
       })
-      .conflicts('name', 'all')
+      .conflicts("name", "all")
       .check((argv) => {
         if (!argv.all && !argv.name) {
-          throw new Error(
-            t('Either an extension name or --all must be provided'),
-          );
+          throw new Error(t("Either an extension name or --all must be provided"));
         }
         return true;
       }),
   handler: async (argv) => {
     await handleUpdate({
-      name: argv['name'] as string | undefined,
-      all: argv['all'] as boolean | undefined,
+      name: argv["name"] as string | undefined,
+      all: argv["all"] as boolean | undefined,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/commands/extensions/utils.ts b/apps/airiscode-cli/src/commands/extensions/utils.ts
index 7b80908d3..8b67cfe60 100644
--- a/apps/airiscode-cli/src/commands/extensions/utils.ts
+++ b/apps/airiscode-cli/src/commands/extensions/utils.ts
@@ -4,26 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ExtensionManager, type Extension } from '@airiscode/core';
-import { loadSettings } from '../../config/settings.js';
+import * as os from "node:os";
+import { type Extension, ExtensionManager } from "@airiscode/core";
+import chalk from "chalk";
+import { loadSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted } from "../../config/trustedFolders.js";
+import { t } from "../../i18n/index.js";
 import {
-  requestConsentOrFail,
-  requestConsentNonInteractive,
   requestChoicePluginNonInteractive,
-} from './consent.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-import * as os from 'node:os';
-import chalk from 'chalk';
-import { t } from '../../i18n/index.js';
+  requestConsentNonInteractive,
+  requestConsentOrFail,
+} from "./consent.js";
 
 export async function getExtensionManager(): Promise<ExtensionManager> {
   const workspaceDir = process.cwd();
   const extensionManager = new ExtensionManager({
     workspaceDir,
-    requestConsent: requestConsentOrFail.bind(
-      null,
-      requestConsentNonInteractive,
-    ),
+    requestConsent: requestConsentOrFail.bind(null, requestConsentNonInteractive),
     requestChoicePlugin: requestChoicePluginNonInteractive,
     isWorkspaceTrusted: !!isWorkspaceTrusted(loadSettings(workspaceDir).merged),
   });
@@ -38,55 +35,49 @@ export function extensionToOutputString(
   inline = false,
 ): string {
   const cwd = workspaceDir;
-  const userEnabled = extensionManager.isEnabled(
-    extension.config.name,
-    os.homedir(),
-  );
-  const workspaceEnabled = extensionManager.isEnabled(
-    extension.config.name,
-    cwd,
-  );
+  const userEnabled = extensionManager.isEnabled(extension.config.name, os.homedir());
+  const workspaceEnabled = extensionManager.isEnabled(extension.config.name, cwd);
 
-  const status = workspaceEnabled ? chalk.green('✓') : chalk.red('✗');
-  let output = `${inline ? '' : status} ${extension.config.name} (${extension.config.version})`;
-  output += `\n ${t('Path:')} ${extension.path}`;
+  const status = workspaceEnabled ? chalk.green("✓") : chalk.red("✗");
+  let output = `${inline ? "" : status} ${extension.config.name} (${extension.config.version})`;
+  output += `\n ${t("Path:")} ${extension.path}`;
   if (extension.installMetadata) {
-    output += `\n ${t('Source:')} ${extension.installMetadata.source} (${t('Type:')} ${extension.installMetadata.type})`;
+    output += `\n ${t("Source:")} ${extension.installMetadata.source} (${t("Type:")} ${extension.installMetadata.type})`;
     if (extension.installMetadata.ref) {
-      output += `\n ${t('Ref:')} ${extension.installMetadata.ref}`;
+      output += `\n ${t("Ref:")} ${extension.installMetadata.ref}`;
     }
     if (extension.installMetadata.releaseTag) {
-      output += `\n ${t('Release tag:')} ${extension.installMetadata.releaseTag}`;
+      output += `\n ${t("Release tag:")} ${extension.installMetadata.releaseTag}`;
     }
   }
-  output += `\n ${t('Enabled (User):')} ${userEnabled}`;
-  output += `\n ${t('Enabled (Workspace):')} ${workspaceEnabled}`;
+  output += `\n ${t("Enabled (User):")} ${userEnabled}`;
+  output += `\n ${t("Enabled (Workspace):")} ${workspaceEnabled}`;
   if (extension.contextFiles.length > 0) {
-    output += `\n ${t('Context files:')}`;
+    output += `\n ${t("Context files:")}`;
     extension.contextFiles.forEach((contextFile) => {
       output += `\n  ${contextFile}`;
     });
   }
   if (extension.commands && extension.commands.length > 0) {
-    output += `\n ${t('Commands:')}`;
+    output += `\n ${t("Commands:")}`;
     extension.commands.forEach((command) => {
       output += `\n  /${command}`;
     });
   }
   if (extension.skills && extension.skills.length > 0) {
-    output += `\n ${t('Skills:')}`;
+    output += `\n ${t("Skills:")}`;
     extension.skills.forEach((skill) => {
       output += `\n  ${skill.name}`;
     });
   }
   if (extension.agents && extension.agents.length > 0) {
-    output += `\n ${t('Agents:')}`;
+    output += `\n ${t("Agents:")}`;
     extension.agents.forEach((agent) => {
       output += `\n  ${agent.name}`;
     });
   }
   if (extension.config.mcpServers) {
-    output += `\n ${t('MCP servers:')}`;
+    output += `\n ${t("MCP servers:")}`;
     Object.keys(extension.config.mcpServers).forEach((key) => {
       output += `\n  ${key}`;
     });
diff --git a/apps/airiscode-cli/src/commands/hooks.tsx b/apps/airiscode-cli/src/commands/hooks.tsx
index 7dc64ee7a..1e525956e 100644
--- a/apps/airiscode-cli/src/commands/hooks.tsx
+++ b/apps/airiscode-cli/src/commands/hooks.tsx
@@ -4,22 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import type { CommandModule } from "yargs";
 
-const debugLogger = createDebugLogger('HOOKS_UI');
+const debugLogger = createDebugLogger("HOOKS_UI");
 
 export const hooksCommand: CommandModule = {
-  command: 'hooks',
-  aliases: ['hook'],
-  describe: 'Manage AIRIS Code hooks (use /hooks in interactive mode).',
+  command: "hooks",
+  aliases: ["hook"],
+  describe: "Manage AIRIS Code hooks (use /hooks in interactive mode).",
   builder: (yargs) => yargs.version(false).help(false),
   handler: () => {
     // In CLI mode, this command is not interactive.
     // Users should use /hooks in interactive mode for the full UI experience.
-    debugLogger.debug(
-      'Use /hooks in interactive mode to manage hooks with the UI.',
-    );
+    debugLogger.debug("Use /hooks in interactive mode to manage hooks with the UI.");
     process.exit(0);
   },
 };
diff --git a/apps/airiscode-cli/src/commands/mcp.ts b/apps/airiscode-cli/src/commands/mcp.ts
index 1bb9e0314..30cba5a49 100644
--- a/apps/airiscode-cli/src/commands/mcp.ts
+++ b/apps/airiscode-cli/src/commands/mcp.ts
@@ -5,22 +5,22 @@
  */
 
 // File for 'gemini mcp' command
-import type { CommandModule, Argv } from 'yargs';
-import { addCommand } from './mcp/add.js';
-import { removeCommand } from './mcp/remove.js';
-import { listCommand } from './mcp/list.js';
-import { reconnectCommand } from './mcp/reconnect.js';
+import type { Argv, CommandModule } from "yargs";
+import { addCommand } from "./mcp/add.js";
+import { listCommand } from "./mcp/list.js";
+import { reconnectCommand } from "./mcp/reconnect.js";
+import { removeCommand } from "./mcp/remove.js";
 
 export const mcpCommand: CommandModule = {
-  command: 'mcp',
-  describe: 'Manage MCP servers',
+  command: "mcp",
+  describe: "Manage MCP servers",
   builder: (yargs: Argv) =>
     yargs
       .command(addCommand)
       .command(removeCommand)
       .command(listCommand)
       .command(reconnectCommand)
-      .demandCommand(1, 'You need at least one command before continuing.')
+      .demandCommand(1, "You need at least one command before continuing.")
       .version(false),
   handler: () => {
     // yargs will automatically show help if no subcommand is provided
diff --git a/apps/airiscode-cli/src/commands/mcp/add.ts b/apps/airiscode-cli/src/commands/mcp/add.ts
index 0f2c6d303..6f1b278e1 100644
--- a/apps/airiscode-cli/src/commands/mcp/add.ts
+++ b/apps/airiscode-cli/src/commands/mcp/add.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { MCPServerConfig } from "@airiscode/core";
 // File for 'qwen mcp add' command
-import type { CommandModule } from 'yargs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import type { MCPServerConfig } from '@airiscode/core';
+import type { CommandModule } from "yargs";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
 
 async function addMcpServer(
   name: string,
@@ -26,37 +26,25 @@ async function addMcpServer(
     excludeTools?: string[];
   },
 ) {
-  const {
-    scope,
-    transport,
-    env,
-    header,
-    timeout,
-    trust,
-    description,
-    includeTools,
-    excludeTools,
-  } = options;
+  const { scope, transport, env, header, timeout, trust, description, includeTools, excludeTools } =
+    options;
 
   const settings = loadSettings(process.cwd());
   const inHome = settings.workspace.path === settings.user.path;
 
-  if (scope === 'project' && inHome) {
-    writeStderrLine(
-      'Error: Please use --scope user to edit settings in the home directory.',
-    );
+  if (scope === "project" && inHome) {
+    writeStderrLine("Error: Please use --scope user to edit settings in the home directory.");
     process.exit(1);
   }
 
-  const settingsScope =
-    scope === 'user' ? SettingScope.User : SettingScope.Workspace;
+  const settingsScope = scope === "user" ? SettingScope.User : SettingScope.Workspace;
 
   let newServer: Partial<MCPServerConfig> = {};
 
   const headers = header?.reduce(
     (acc, curr) => {
-      const [key, ...valueParts] = curr.split(':');
-      const value = valueParts.join(':').trim();
+      const [key, ...valueParts] = curr.split(":");
+      const value = valueParts.join(":").trim();
       if (key.trim() && value) {
         acc[key.trim()] = value;
       }
@@ -66,7 +54,7 @@ async function addMcpServer(
   );
 
   switch (transport) {
-    case 'sse':
+    case "sse":
       newServer = {
         url: commandOrUrl,
         headers,
@@ -77,7 +65,7 @@ async function addMcpServer(
         excludeTools,
       };
       break;
-    case 'http':
+    case "http":
       newServer = {
         httpUrl: commandOrUrl,
         headers,
@@ -88,14 +76,14 @@ async function addMcpServer(
         excludeTools,
       };
       break;
-    case 'stdio':
+    case "stdio":
     default:
       newServer = {
         command: commandOrUrl,
         args: args?.map(String),
         env: env?.reduce(
           (acc, curr) => {
-            const [key, value] = curr.split('=');
+            const [key, value] = curr.split("=");
             if (key && value) {
               acc[key] = value;
             }
@@ -117,132 +105,125 @@ async function addMcpServer(
 
   const isExistingServer = !!mcpServers[name];
   if (isExistingServer) {
-    writeStdoutLine(
-      `MCP server "${name}" is already configured within ${scope} settings.`,
-    );
+    writeStdoutLine(`MCP server "${name}" is already configured within ${scope} settings.`);
   }
 
   mcpServers[name] = newServer as MCPServerConfig;
 
-  settings.setValue(settingsScope, 'mcpServers', mcpServers);
+  settings.setValue(settingsScope, "mcpServers", mcpServers);
 
   if (isExistingServer) {
     writeStdoutLine(`MCP server "${name}" updated in ${scope} settings.`);
   } else {
-    writeStdoutLine(
-      `MCP server "${name}" added to ${scope} settings. (${transport})`,
-    );
+    writeStdoutLine(`MCP server "${name}" added to ${scope} settings. (${transport})`);
   }
 }
 
 export const addCommand: CommandModule = {
-  command: 'add <name> <commandOrUrl> [args...]',
-  describe: 'Add a server',
+  command: "add <name> <commandOrUrl> [args...]",
+  describe: "Add a server",
   builder: (yargs) =>
     yargs
-      .usage('Usage: qwen mcp add [options] <name> <commandOrUrl> [args...]')
+      .usage("Usage: qwen mcp add [options] <name> <commandOrUrl> [args...]")
       .parserConfiguration({
-        'unknown-options-as-args': true, // Pass unknown options as server args
-        'populate--': true, // Populate server args after -- separator
+        "unknown-options-as-args": true, // Pass unknown options as server args
+        "populate--": true, // Populate server args after -- separator
       })
-      .positional('name', {
-        describe: 'Name of the server',
-        type: 'string',
+      .positional("name", {
+        describe: "Name of the server",
+        type: "string",
         demandOption: true,
       })
-      .positional('commandOrUrl', {
-        describe: 'Command (stdio) or URL (sse, http)',
-        type: 'string',
+      .positional("commandOrUrl", {
+        describe: "Command (stdio) or URL (sse, http)",
+        type: "string",
         demandOption: true,
       })
-      .option('scope', {
-        alias: 's',
-        describe: 'Configuration scope (user or project)',
-        type: 'string',
-        default: 'user',
-        choices: ['user', 'project'],
+      .option("scope", {
+        alias: "s",
+        describe: "Configuration scope (user or project)",
+        type: "string",
+        default: "user",
+        choices: ["user", "project"],
       })
-      .option('transport', {
-        alias: 't',
-        describe:
-          'Transport type (stdio, sse, http). Auto-detected from URL if not specified.',
-        type: 'string',
-        choices: ['stdio', 'sse', 'http'],
+      .option("transport", {
+        alias: "t",
+        describe: "Transport type (stdio, sse, http). Auto-detected from URL if not specified.",
+        type: "string",
+        choices: ["stdio", "sse", "http"],
       })
-      .option('env', {
-        alias: 'e',
-        describe: 'Set environment variables (e.g. -e KEY=value)',
-        type: 'array',
+      .option("env", {
+        alias: "e",
+        describe: "Set environment variables (e.g. -e KEY=value)",
+        type: "array",
         string: true,
         nargs: 1,
       })
-      .option('header', {
-        alias: 'H',
+      .option("header", {
+        alias: "H",
         describe:
           'Set HTTP headers for SSE and HTTP transports (e.g. -H "X-Api-Key: abc123" -H "Authorization: Bearer abc123")',
-        type: 'array',
+        type: "array",
         string: true,
         nargs: 1,
       })
-      .option('timeout', {
-        describe: 'Set connection timeout in milliseconds',
-        type: 'number',
+      .option("timeout", {
+        describe: "Set connection timeout in milliseconds",
+        type: "number",
       })
-      .option('trust', {
-        describe:
-          'Trust the server (bypass all tool call confirmation prompts)',
-        type: 'boolean',
+      .option("trust", {
+        describe: "Trust the server (bypass all tool call confirmation prompts)",
+        type: "boolean",
       })
-      .option('description', {
-        describe: 'Set the description for the server',
-        type: 'string',
+      .option("description", {
+        describe: "Set the description for the server",
+        type: "string",
       })
-      .option('include-tools', {
-        describe: 'A comma-separated list of tools to include',
-        type: 'array',
+      .option("include-tools", {
+        describe: "A comma-separated list of tools to include",
+        type: "array",
         string: true,
       })
-      .option('exclude-tools', {
-        describe: 'A comma-separated list of tools to exclude',
-        type: 'array',
+      .option("exclude-tools", {
+        describe: "A comma-separated list of tools to exclude",
+        type: "array",
         string: true,
       })
       .middleware((argv) => {
         // Handle -- separator args as server args if present
-        if (argv['--']) {
-          const existingArgs = (argv['args'] as Array<string | number>) || [];
-          argv['args'] = [...existingArgs, ...(argv['--'] as string[])];
+        if (argv["--"]) {
+          const existingArgs = (argv["args"] as Array<string | number>) || [];
+          argv["args"] = [...existingArgs, ...(argv["--"] as string[])];
         }
 
         // Auto-detect transport from URL if not explicitly specified
-        if (!argv['transport']) {
-          const commandOrUrl = argv['commandOrUrl'] as string;
+        if (!argv["transport"]) {
+          const commandOrUrl = argv["commandOrUrl"] as string;
           if (
             commandOrUrl &&
-            (commandOrUrl.startsWith('http://') ||
-              commandOrUrl.startsWith('https://'))
+            (commandOrUrl.startsWith("http://") || commandOrUrl.startsWith("https://"))
           ) {
-            argv['transport'] = 'http';
+            argv["transport"] = "http";
           } else {
-            argv['transport'] = 'stdio';
+            argv["transport"] = "stdio";
           }
         }
       }),
   handler: async (argv) => {
     await addMcpServer(
-      argv['name'] as string,
-      argv['commandOrUrl'] as string,
-      argv['args'] as Array<string | number>,
+      argv["name"] as string,
+      argv["commandOrUrl"] as string,
+      argv["args"] as Array<string | number>,
       {
-        scope: argv['scope'] as string,
-        transport: argv['transport'] as string,
-        env: argv['env'] as string[],
-        header: argv['header'] as string[],
-        timeout: argv['timeout'] as number | undefined,
-        trust: argv['trust'] as boolean | undefined,
-        description: argv['description'] as string | undefined,
-        includeTools: argv['includeTools'] as string[] | undefined,
-        excludeTools: argv['excludeTools'] as string[] | undefined,
+        scope: argv["scope"] as string,
+        transport: argv["transport"] as string,
+        env: argv["env"] as string[],
+        header: argv["header"] as string[],
+        timeout: argv["timeout"] as number | undefined,
+        trust: argv["trust"] as boolean | undefined,
+        description: argv["description"] as string | undefined,
+        includeTools: argv["includeTools"] as string[] | undefined,
+        excludeTools: argv["excludeTools"] as string[] | undefined,
       },
     );
   },
diff --git a/apps/airiscode-cli/src/commands/mcp/list.ts b/apps/airiscode-cli/src/commands/mcp/list.ts
index 26aef2545..b11ccb6f6 100644
--- a/apps/airiscode-cli/src/commands/mcp/list.ts
+++ b/apps/airiscode-cli/src/commands/mcp/list.ts
@@ -4,27 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { MCPServerConfig } from "@airiscode/core";
+import { createTransport, ExtensionManager, MCPServerStatus } from "@airiscode/core";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 // File for 'qwen mcp list' command
-import type { CommandModule } from 'yargs';
-import { loadSettings } from '../../config/settings.js';
-import { writeStdoutLine } from '../../utils/stdioHelpers.js';
-import type { MCPServerConfig } from '@airiscode/core';
-import {
-  MCPServerStatus,
-  createTransport,
-  ExtensionManager,
-} from '@airiscode/core';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-
-const COLOR_GREEN = '\u001b[32m';
-const COLOR_YELLOW = '\u001b[33m';
-const COLOR_RED = '\u001b[31m';
-const RESET_COLOR = '\u001b[0m';
-
-async function getMcpServersFromConfig(): Promise<
-  Record<string, MCPServerConfig>
-> {
+import type { CommandModule } from "yargs";
+import { loadSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted } from "../../config/trustedFolders.js";
+import { writeStdoutLine } from "../../utils/stdioHelpers.js";
+
+const COLOR_GREEN = "\u001b[32m";
+const COLOR_YELLOW = "\u001b[33m";
+const COLOR_RED = "\u001b[31m";
+const RESET_COLOR = "\u001b[0m";
+
+async function getMcpServersFromConfig(): Promise<Record<string, MCPServerConfig>> {
   const settings = loadSettings();
   const extensionManager = new ExtensionManager({
     isWorkspaceTrusted: !!isWorkspaceTrusted(settings.merged),
@@ -35,17 +29,15 @@ async function getMcpServersFromConfig(): Promise<
   const mcpServers = { ...(settings.merged.mcpServers || {}) };
   for (const extension of extensions) {
     if (extension.isActive) {
-      Object.entries(extension.config.mcpServers || {}).forEach(
-        ([key, server]) => {
-          if (mcpServers[key]) {
-            return;
-          }
-          mcpServers[key] = {
-            ...server,
-            extensionName: extension.config.name,
-          };
-        },
-      );
+      Object.entries(extension.config.mcpServers || {}).forEach(([key, server]) => {
+        if (mcpServers[key]) {
+          return;
+        }
+        mcpServers[key] = {
+          ...server,
+          extensionName: extension.config.name,
+        };
+      });
     }
   }
   return mcpServers;
@@ -56,8 +48,8 @@ async function testMCPConnection(
   config: MCPServerConfig,
 ): Promise<MCPServerStatus> {
   const client = new Client({
-    name: 'mcp-test-client',
-    version: '0.0.1',
+    name: "mcp-test-client",
+    version: "0.0.1",
   });
 
   let transport;
@@ -97,32 +89,32 @@ export async function listMcpServers(): Promise<void> {
   const serverNames = Object.keys(mcpServers);
 
   if (serverNames.length === 0) {
-    writeStdoutLine('No MCP servers configured.');
+    writeStdoutLine("No MCP servers configured.");
     return;
   }
 
-  writeStdoutLine('Configured MCP servers:\n');
+  writeStdoutLine("Configured MCP servers:\n");
 
   for (const serverName of serverNames) {
     const server = mcpServers[serverName];
 
     const status = await getServerStatus(serverName, server);
 
-    let statusIndicator = '';
-    let statusText = '';
+    let statusIndicator = "";
+    let statusText = "";
     switch (status) {
       case MCPServerStatus.CONNECTED:
-        statusIndicator = COLOR_GREEN + '✓' + RESET_COLOR;
-        statusText = 'Connected';
+        statusIndicator = COLOR_GREEN + "✓" + RESET_COLOR;
+        statusText = "Connected";
         break;
       case MCPServerStatus.CONNECTING:
-        statusIndicator = COLOR_YELLOW + '…' + RESET_COLOR;
-        statusText = 'Connecting';
+        statusIndicator = COLOR_YELLOW + "…" + RESET_COLOR;
+        statusText = "Connecting";
         break;
       case MCPServerStatus.DISCONNECTED:
       default:
-        statusIndicator = COLOR_RED + '✗' + RESET_COLOR;
-        statusText = 'Disconnected';
+        statusIndicator = COLOR_RED + "✗" + RESET_COLOR;
+        statusText = "Disconnected";
         break;
     }
 
@@ -132,7 +124,7 @@ export async function listMcpServers(): Promise<void> {
     } else if (server.url) {
       serverInfo += `${server.url} (sse)`;
     } else if (server.command) {
-      serverInfo += `${server.command} ${server.args?.join(' ') || ''} (stdio)`;
+      serverInfo += `${server.command} ${server.args?.join(" ") || ""} (stdio)`;
     }
 
     writeStdoutLine(`${statusIndicator} ${serverInfo} - ${statusText}`);
@@ -140,8 +132,8 @@ export async function listMcpServers(): Promise<void> {
 }
 
 export const listCommand: CommandModule = {
-  command: 'list',
-  describe: 'List all configured MCP servers',
+  command: "list",
+  describe: "List all configured MCP servers",
   handler: async () => {
     await listMcpServers();
   },
diff --git a/apps/airiscode-cli/src/commands/mcp/reconnect.ts b/apps/airiscode-cli/src/commands/mcp/reconnect.ts
index 98ac6566c..9c6ebe727 100644
--- a/apps/airiscode-cli/src/commands/mcp/reconnect.ts
+++ b/apps/airiscode-cli/src/commands/mcp/reconnect.ts
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { loadSettings } from '../../config/settings.js';
-import { writeStdoutLine, writeStderrLine } from '../../utils/stdioHelpers.js';
-import {
-  Config,
-  FileDiscoveryService,
-  ExtensionManager,
-} from '@airiscode/core';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-import type { MCPServerConfig } from '@airiscode/core';
+import type { MCPServerConfig } from "@airiscode/core";
+import { Config, ExtensionManager, FileDiscoveryService } from "@airiscode/core";
+import type { CommandModule } from "yargs";
+import { loadSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted } from "../../config/trustedFolders.js";
+import { writeStderrLine, writeStdoutLine } from "../../utils/stdioHelpers.js";
 
 async function getMcpServersFromConfig(
   extensionManager?: ExtensionManager,
@@ -33,17 +29,15 @@ async function getMcpServersFromConfig(
   const mcpServers = { ...(settings.merged.mcpServers || {}) };
   for (const extension of extensions) {
     if (extension.isActive) {
-      Object.entries(extension.config.mcpServers || {}).forEach(
-        ([key, server]) => {
-          if (mcpServers[key]) {
-            return;
-          }
-          mcpServers[key] = {
-            ...server,
-            extensionName: extension.config.name,
-          };
-        },
-      );
+      Object.entries(extension.config.mcpServers || {}).forEach(([key, server]) => {
+        if (mcpServers[key]) {
+          return;
+        }
+        mcpServers[key] = {
+          ...server,
+          extensionName: extension.config.name,
+        };
+      });
     }
   }
   return mcpServers;
@@ -55,7 +49,7 @@ async function createMinimalConfig(): Promise<Config> {
   const fileService = new FileDiscoveryService(cwd);
 
   const config = new Config({
-    sessionId: 'mcp-reconnect',
+    sessionId: "mcp-reconnect",
     targetDir: cwd,
     cwd,
     debugMode: false,
@@ -73,10 +67,7 @@ interface ReconnectError extends Error {
   exitCode: number;
 }
 
-function createReconnectError(
-  message: string,
-  exitCode: number = 1,
-): ReconnectError {
+function createReconnectError(message: string, exitCode: number = 1): ReconnectError {
   const error = new Error(message) as ReconnectError;
   error.exitCode = exitCode;
   return error;
@@ -86,9 +77,7 @@ async function reconnectMcpServer(serverName: string): Promise<void> {
   const mcpServers = await getMcpServersFromConfig();
 
   if (!mcpServers[serverName]) {
-    throw createReconnectError(
-      `Error: Server "${serverName}" not found in configuration.`,
-    );
+    throw createReconnectError(`Error: Server "${serverName}" not found in configuration.`);
   }
 
   writeStdoutLine(`Reconnecting to server "${serverName}"...`);
@@ -101,9 +90,7 @@ async function reconnectMcpServer(serverName: string): Promise<void> {
     await config.shutdown();
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    throw createReconnectError(
-      `Failed to reconnect to server "${serverName}": ${message}`,
-    );
+    throw createReconnectError(`Failed to reconnect to server "${serverName}": ${message}`);
   }
 }
 
@@ -119,11 +106,11 @@ async function reconnectAllMcpServers(): Promise<void> {
   const serverNames = Object.keys(mcpServers);
 
   if (serverNames.length === 0) {
-    writeStdoutLine('No MCP servers configured.');
+    writeStdoutLine("No MCP servers configured.");
     return;
   }
 
-  writeStdoutLine('Reconnecting to all MCP servers...\n');
+  writeStdoutLine("Reconnecting to all MCP servers...\n");
 
   let config: Config | undefined;
   try {
@@ -147,35 +134,33 @@ async function reconnectAllMcpServers(): Promise<void> {
 }
 
 export const reconnectCommand: CommandModule = {
-  command: 'reconnect [server-name]',
-  describe: 'Reconnect MCP server(s)',
+  command: "reconnect [server-name]",
+  describe: "Reconnect MCP server(s)",
   builder: (yargs) =>
     yargs
-      .usage('Usage: qwen mcp reconnect [options] [server-name]')
-      .positional('server-name', {
-        describe: 'Name of the server to reconnect',
-        type: 'string',
+      .usage("Usage: qwen mcp reconnect [options] [server-name]")
+      .positional("server-name", {
+        describe: "Name of the server to reconnect",
+        type: "string",
       })
-      .option('all', {
-        alias: 'a',
-        describe: 'Reconnect all configured servers',
-        type: 'boolean',
+      .option("all", {
+        alias: "a",
+        describe: "Reconnect all configured servers",
+        type: "boolean",
         default: false,
       })
-      .conflicts('server-name', 'all')
+      .conflicts("server-name", "all")
       .check((argv) => {
-        const serverName = argv['server-name'];
-        const all = argv['all'];
+        const serverName = argv["server-name"];
+        const all = argv["all"];
         if (!serverName && !all) {
-          throw new Error(
-            'Please specify a server name or use --all to reconnect all servers.',
-          );
+          throw new Error("Please specify a server name or use --all to reconnect all servers.");
         }
         return true;
       }),
   handler: async (argv) => {
-    const serverName = argv['server-name'] as string | undefined;
-    const all = argv['all'] as boolean;
+    const serverName = argv["server-name"] as string | undefined;
+    const all = argv["all"] as boolean;
 
     try {
       if (all) {
diff --git a/apps/airiscode-cli/src/commands/mcp/remove.ts b/apps/airiscode-cli/src/commands/mcp/remove.ts
index c794ca9e6..30b285e29 100644
--- a/apps/airiscode-cli/src/commands/mcp/remove.ts
+++ b/apps/airiscode-cli/src/commands/mcp/remove.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { MCPOAuthTokenStorage } from "@airiscode/core";
 // File for 'qwen mcp remove' command
-import type { CommandModule } from 'yargs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { writeStdoutLine } from '../../utils/stdioHelpers.js';
-import { MCPOAuthTokenStorage } from '@airiscode/core';
+import type { CommandModule } from "yargs";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { writeStdoutLine } from "../../utils/stdioHelpers.js";
 
 async function removeMcpServer(
   name: string,
@@ -17,8 +17,7 @@ async function removeMcpServer(
   },
 ) {
   const { scope } = options;
-  const settingsScope =
-    scope === 'user' ? SettingScope.User : SettingScope.Workspace;
+  const settingsScope = scope === "user" ? SettingScope.User : SettingScope.Workspace;
   const settings = loadSettings();
 
   const existingSettings = settings.forScope(settingsScope).settings;
@@ -31,7 +30,7 @@ async function removeMcpServer(
 
   delete mcpServers[name];
 
-  settings.setValue(settingsScope, 'mcpServers', mcpServers);
+  settings.setValue(settingsScope, "mcpServers", mcpServers);
 
   // Clean up any stored OAuth tokens for this server
   try {
@@ -45,26 +44,26 @@ async function removeMcpServer(
 }
 
 export const removeCommand: CommandModule = {
-  command: 'remove <name>',
-  describe: 'Remove a server',
+  command: "remove <name>",
+  describe: "Remove a server",
   builder: (yargs) =>
     yargs
-      .usage('Usage: qwen mcp remove [options] <name>')
-      .positional('name', {
-        describe: 'Name of the server',
-        type: 'string',
+      .usage("Usage: qwen mcp remove [options] <name>")
+      .positional("name", {
+        describe: "Name of the server",
+        type: "string",
         demandOption: true,
       })
-      .option('scope', {
-        alias: 's',
-        describe: 'Configuration scope (user or project)',
-        type: 'string',
-        default: 'user',
-        choices: ['user', 'project'],
+      .option("scope", {
+        alias: "s",
+        describe: "Configuration scope (user or project)",
+        type: "string",
+        default: "user",
+        choices: ["user", "project"],
       }),
   handler: async (argv) => {
-    await removeMcpServer(argv['name'] as string, {
-      scope: argv['scope'] as string,
+    await removeMcpServer(argv["name"] as string, {
+      scope: argv["scope"] as string,
     });
   },
 };
diff --git a/apps/airiscode-cli/src/config/auth.ts b/apps/airiscode-cli/src/config/auth.ts
index 5445bdb40..ea1f04afd 100644
--- a/apps/airiscode-cli/src/config/auth.ts
+++ b/apps/airiscode-cli/src/config/auth.ts
@@ -9,17 +9,17 @@ import {
   type Config,
   type ModelProvidersConfig,
   type ProviderModelConfig,
-} from '@airiscode/core';
-import { loadEnvironment, loadSettings, type Settings } from './settings.js';
-import { t } from '../i18n/index.js';
+} from "@airiscode/core";
+import { t } from "../i18n/index.js";
+import { loadEnvironment, loadSettings, type Settings } from "./settings.js";
 
 /**
  * Default environment variable names for each auth type
  */
 const DEFAULT_ENV_KEYS: Record<string, string> = {
-  [AuthType.USE_OPENAI]: 'OPENAI_API_KEY',
-  [AuthType.USE_OLLAMA]: '',
-  [AuthType.USE_ANTHROPIC]: 'ANTHROPIC_API_KEY',
+  [AuthType.USE_OPENAI]: "OPENAI_API_KEY",
+  [AuthType.USE_OLLAMA]: "",
+  [AuthType.USE_ANTHROPIC]: "ANTHROPIC_API_KEY",
 };
 
 /**
@@ -55,9 +55,7 @@ function hasApiKeyForAuth(
   checkedEnvKey: string | undefined;
   isExplicitEnvKey: boolean;
 } {
-  const modelProviders = settings.modelProviders as
-    | ModelProvidersConfig
-    | undefined;
+  const modelProviders = settings.modelProviders as ModelProvidersConfig | undefined;
 
   // Use config.getModelsConfig().getModel() if available for accurate model ID resolution
   // that accounts for CLI args, env vars, and settings. Fall back to settings.model.name.
@@ -104,11 +102,7 @@ function hasApiKeyForAuth(
  * Generate API key error message based on auth check result.
  * Returns null if API key is present, otherwise returns the appropriate error message.
  */
-function getApiKeyError(
-  authMethod: string,
-  settings: Settings,
-  config?: Config,
-): string | null {
+function getApiKeyError(authMethod: string, settings: Settings, config?: Config): string | null {
   const { hasKey, checkedEnvKey, isExplicitEnvKey } = hasApiKeyForAuth(
     authMethod,
     settings,
@@ -121,12 +115,12 @@ function getApiKeyError(
   const envKeyHint = checkedEnvKey || DEFAULT_ENV_KEYS[authMethod];
   if (isExplicitEnvKey) {
     return t(
-      '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.',
+      "{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.",
       { envKeyHint },
     );
   }
   return t(
-    '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.',
+    "{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.",
     { envKeyHint },
   );
 }
@@ -134,10 +128,7 @@ function getApiKeyError(
 /**
  * Validate that the required credentials and configuration exist for the given auth method.
  */
-export function validateAuthMethod(
-  authMethod: string,
-  config?: Config,
-): string | null {
+export function validateAuthMethod(authMethod: string, config?: Config): string | null {
   const settings = loadSettings();
   loadEnvironment(settings.merged);
 
@@ -148,19 +139,17 @@ export function validateAuthMethod(
       config,
     );
     if (!hasKey) {
-      const envKeyHint = checkedEnvKey
-        ? `'${checkedEnvKey}'`
-        : "'OPENAI_API_KEY'";
+      const envKeyHint = checkedEnvKey ? `'${checkedEnvKey}'` : "'OPENAI_API_KEY'";
       if (isExplicitEnvKey) {
         // Explicit envKey configured - only suggest setting the env var
         return t(
-          'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.',
+          "Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.",
           { envKeyHint },
         );
       }
       // Default env key - can use either apiKey or env var
       return t(
-        'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.',
+        "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.",
         { envKeyHint },
       );
     }
@@ -174,21 +163,16 @@ export function validateAuthMethod(
     }
 
     // Check baseUrl - can come from modelProviders or environment
-    const modelProviders = settings.merged.modelProviders as
-      | ModelProvidersConfig
-      | undefined;
+    const modelProviders = settings.merged.modelProviders as ModelProvidersConfig | undefined;
     // Use config.getModelsConfig().getModel() if available for accurate model ID
-    const modelId =
-      config?.getModelsConfig().getModel() ?? settings.merged.model?.name;
+    const modelId = config?.getModelsConfig().getModel() ?? settings.merged.model?.name;
     const modelConfig = findModelConfig(modelProviders, authMethod, modelId);
 
     if (modelConfig && !modelConfig.baseUrl) {
-      return t(
-        'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.',
-      );
+      return t("Anthropic provider missing required baseUrl in modelProviders[].baseUrl.");
     }
-    if (!modelConfig && !process.env['ANTHROPIC_BASE_URL']) {
-      return t('ANTHROPIC_BASE_URL environment variable not found.');
+    if (!modelConfig && !process.env["ANTHROPIC_BASE_URL"]) {
+      return t("ANTHROPIC_BASE_URL environment variable not found.");
     }
 
     return null;
@@ -202,5 +186,5 @@ export function validateAuthMethod(
     return null;
   }
 
-  return t('Invalid auth method selected.');
+  return t("Invalid auth method selected.");
 }
diff --git a/apps/airiscode-cli/src/config/config.ts b/apps/airiscode-cli/src/config/config.ts
index 8e59563e0..6eeb0d5d3 100755
--- a/apps/airiscode-cli/src/config/config.ts
+++ b/apps/airiscode-cli/src/config/config.ts
@@ -4,54 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs";
+import { homedir } from "node:os";
+import * as path from "node:path";
 import {
   ApprovalMode,
   AuthType,
   Config,
+  createDebugLogger,
   DEFAULT_QWEN_EMBEDDING_MODEL,
+  EditTool,
+  FatalConfigError,
   FileDiscoveryService,
   getAllGeminiMdFilenames,
-  loadServerHierarchicalMemory,
-  setGeminiMdFilename as setServerGeminiMdFilename,
-  resolveTelemetrySettings,
-  FatalConfigError,
-  Storage,
   InputFormat,
-  OutputFormat,
-  SessionService,
   ideContextStore,
-  type ResumedSessionData,
+  isToolEnabled,
   type LspClient,
-  type ToolName,
-  EditTool,
-  ShellTool,
-  WriteFileTool,
+  loadServerHierarchicalMemory,
   NativeLspClient,
-  createDebugLogger,
   NativeLspService,
-  isToolEnabled,
-} from '@airiscode/core';
-import { extensionsCommand } from '../commands/extensions.js';
-import { hooksCommand } from '../commands/hooks.js';
-import type { Settings } from './settings.js';
-import { loadSettings, SettingScope } from './settings.js';
-import { authCommand } from '../commands/auth.js';
-import {
-  resolveCliGenerationConfig,
-  getAuthTypeFromEnv,
-} from '../utils/modelConfigUtils.js';
-import yargs, { type Argv } from 'yargs';
-import { hideBin } from 'yargs/helpers';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { homedir } from 'node:os';
-
-import { resolvePath } from '../utils/resolvePath.js';
-import { getCliVersion } from '../utils/version.js';
-import { loadSandboxConfig } from './sandboxConfig.js';
-import { appEvents } from '../utils/events.js';
-import { mcpCommand } from '../commands/mcp.js';
-import { channelCommand } from '../commands/channel.js';
+  OutputFormat,
+  type ResumedSessionData,
+  resolveTelemetrySettings,
+  SessionService,
+  ShellTool,
+  Storage,
+  setGeminiMdFilename as setServerGeminiMdFilename,
+  type ToolName,
+  WriteFileTool,
+} from "@airiscode/core";
+import yargs, { type Argv } from "yargs";
+import { hideBin } from "yargs/helpers";
+import { authCommand } from "../commands/auth.js";
+import { channelCommand } from "../commands/channel.js";
+import { extensionsCommand } from "../commands/extensions.js";
+import { hooksCommand } from "../commands/hooks.js";
+import { mcpCommand } from "../commands/mcp.js";
+import { appEvents } from "../utils/events.js";
+import { getAuthTypeFromEnv, resolveCliGenerationConfig } from "../utils/modelConfigUtils.js";
+import { resolvePath } from "../utils/resolvePath.js";
+import { getCliVersion } from "../utils/version.js";
+import { loadSandboxConfig } from "./sandboxConfig.js";
+import type { Settings } from "./settings.js";
+import { loadSettings, SettingScope } from "./settings.js";
 
 // UUID v4 regex pattern for validation
 const SESSION_ID_REGEX =
@@ -66,39 +62,32 @@ function isValidSessionId(value: string): boolean {
   return SESSION_ID_REGEX.test(value);
 }
 
-import { isWorkspaceTrusted } from './trustedFolders.js';
-import { buildWebSearchConfig } from './webSearch.js';
-import { writeStderrLine } from '../utils/stdioHelpers.js';
+import { writeStderrLine } from "../utils/stdioHelpers.js";
+import { isWorkspaceTrusted } from "./trustedFolders.js";
+import { buildWebSearchConfig } from "./webSearch.js";
 
-const debugLogger = createDebugLogger('CONFIG');
+const debugLogger = createDebugLogger("CONFIG");
 
-const VALID_APPROVAL_MODE_VALUES = [
-  'plan',
-  'default',
-  'auto-edit',
-  'yolo',
-] as const;
+const VALID_APPROVAL_MODE_VALUES = ["plan", "default", "auto-edit", "yolo"] as const;
 
 function formatApprovalModeError(value: string): Error {
   return new Error(
-    `Invalid approval mode: ${value}. Valid values are: ${VALID_APPROVAL_MODE_VALUES.join(
-      ', ',
-    )}`,
+    `Invalid approval mode: ${value}. Valid values are: ${VALID_APPROVAL_MODE_VALUES.join(", ")}`,
   );
 }
 
 function parseApprovalModeValue(value: string): ApprovalMode {
   const normalized = value.trim().toLowerCase();
   switch (normalized) {
-    case 'plan':
+    case "plan":
       return ApprovalMode.PLAN;
-    case 'default':
+    case "default":
       return ApprovalMode.DEFAULT;
-    case 'yolo':
+    case "yolo":
       return ApprovalMode.YOLO;
-    case 'auto_edit':
-    case 'autoedit':
-    case 'auto-edit':
+    case "auto_edit":
+    case "autoedit":
+    case "auto-edit":
       return ApprovalMode.AUTO_EDIT;
     default:
       throw formatApprovalModeError(value);
@@ -172,7 +161,7 @@ function normalizeOutputFormat(
   if (format === OutputFormat.STREAM_JSON) {
     return OutputFormat.STREAM_JSON;
   }
-  if (format === 'json' || format === OutputFormat.JSON) {
+  if (format === "json" || format === OutputFormat.JSON) {
     return OutputFormat.JSON;
   }
   return OutputFormat.TEXT;
@@ -184,393 +173,368 @@ export async function parseArguments(): Promise<CliArgs> {
   // hack: if the first argument is the CLI entry point, remove it
   if (
     rawArgv.length > 0 &&
-    (rawArgv[0].endsWith('/dist/qwen-cli/cli.js') ||
-      rawArgv[0].endsWith('/dist/cli.js') ||
-      rawArgv[0].endsWith('/dist/cli/cli.js'))
+    (rawArgv[0].endsWith("/dist/qwen-cli/cli.js") ||
+      rawArgv[0].endsWith("/dist/cli.js") ||
+      rawArgv[0].endsWith("/dist/cli/cli.js"))
   ) {
     rawArgv = rawArgv.slice(1);
   }
 
   const yargsInstance = yargs(rawArgv)
-    .locale('en')
-    .scriptName('airiscode')
+    .locale("en")
+    .scriptName("airiscode")
     .usage(
-      'Usage: qwen [options] [command]\n\nAIRIS Code - Launch an interactive CLI, use -p/--prompt for non-interactive mode',
+      "Usage: qwen [options] [command]\n\nAIRIS Code - Launch an interactive CLI, use -p/--prompt for non-interactive mode",
     )
-    .option('telemetry', {
-      type: 'boolean',
+    .option("telemetry", {
+      type: "boolean",
       description:
-        'Enable telemetry? This flag specifically controls if telemetry is sent. Other --telemetry-* flags set specific values but do not enable telemetry on their own.',
+        "Enable telemetry? This flag specifically controls if telemetry is sent. Other --telemetry-* flags set specific values but do not enable telemetry on their own.",
     })
-    .option('telemetry-target', {
-      type: 'string',
-      choices: ['local', 'gcp'],
-      description:
-        'Set the telemetry target (local or gcp). Overrides settings files.',
+    .option("telemetry-target", {
+      type: "string",
+      choices: ["local", "gcp"],
+      description: "Set the telemetry target (local or gcp). Overrides settings files.",
     })
-    .option('telemetry-otlp-endpoint', {
-      type: 'string',
+    .option("telemetry-otlp-endpoint", {
+      type: "string",
       description:
-        'Set the OTLP endpoint for telemetry. Overrides environment variables and settings files.',
+        "Set the OTLP endpoint for telemetry. Overrides environment variables and settings files.",
     })
-    .option('telemetry-otlp-protocol', {
-      type: 'string',
-      choices: ['grpc', 'http'],
-      description:
-        'Set the OTLP protocol for telemetry (grpc or http). Overrides settings files.',
+    .option("telemetry-otlp-protocol", {
+      type: "string",
+      choices: ["grpc", "http"],
+      description: "Set the OTLP protocol for telemetry (grpc or http). Overrides settings files.",
     })
-    .option('telemetry-log-prompts', {
-      type: 'boolean',
+    .option("telemetry-log-prompts", {
+      type: "boolean",
       description:
-        'Enable or disable logging of user prompts for telemetry. Overrides settings files.',
+        "Enable or disable logging of user prompts for telemetry. Overrides settings files.",
     })
-    .option('telemetry-outfile', {
-      type: 'string',
-      description: 'Redirect all telemetry output to the specified file.',
+    .option("telemetry-outfile", {
+      type: "string",
+      description: "Redirect all telemetry output to the specified file.",
     })
     .deprecateOption(
-      'telemetry',
+      "telemetry",
       'Use the "telemetry.enabled" setting in settings.json instead. This flag will be removed in a future version.',
     )
     .deprecateOption(
-      'telemetry-target',
+      "telemetry-target",
       'Use the "telemetry.target" setting in settings.json instead. This flag will be removed in a future version.',
     )
     .deprecateOption(
-      'telemetry-otlp-endpoint',
+      "telemetry-otlp-endpoint",
       'Use the "telemetry.otlpEndpoint" setting in settings.json instead. This flag will be removed in a future version.',
     )
     .deprecateOption(
-      'telemetry-otlp-protocol',
+      "telemetry-otlp-protocol",
       'Use the "telemetry.otlpProtocol" setting in settings.json instead. This flag will be removed in a future version.',
     )
     .deprecateOption(
-      'telemetry-log-prompts',
+      "telemetry-log-prompts",
       'Use the "telemetry.logPrompts" setting in settings.json instead. This flag will be removed in a future version.',
     )
     .deprecateOption(
-      'telemetry-outfile',
+      "telemetry-outfile",
       'Use the "telemetry.outfile" setting in settings.json instead. This flag will be removed in a future version.',
     )
-    .option('debug', {
-      alias: 'd',
-      type: 'boolean',
-      description: 'Run in debug mode?',
+    .option("debug", {
+      alias: "d",
+      type: "boolean",
+      description: "Run in debug mode?",
       default: false,
     })
-    .option('proxy', {
-      type: 'string',
-      description: 'Proxy for AIRIS Code, like schema://user:password@host:port',
+    .option("proxy", {
+      type: "string",
+      description: "Proxy for AIRIS Code, like schema://user:password@host:port",
     })
     .deprecateOption(
-      'proxy',
+      "proxy",
       'Use the "proxy" setting in settings.json instead. This flag will be removed in a future version.',
     )
-    .option('chat-recording', {
-      type: 'boolean',
+    .option("chat-recording", {
+      type: "boolean",
       description:
-        'Enable chat recording to disk. If false, chat history is not saved and --continue/--resume will not work.',
+        "Enable chat recording to disk. If false, chat history is not saved and --continue/--resume will not work.",
     })
-    .command('$0 [query..]', 'Launch AIRIS Code CLI', (yargsInstance: Argv) =>
+    .command("$0 [query..]", "Launch AIRIS Code CLI", (yargsInstance: Argv) =>
       yargsInstance
-        .positional('query', {
+        .positional("query", {
           description:
-            'Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive.',
+            "Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive.",
         })
-        .option('model', {
-          alias: 'm',
-          type: 'string',
+        .option("model", {
+          alias: "m",
+          type: "string",
           description: `Model`,
         })
-        .option('prompt', {
-          alias: 'p',
-          type: 'string',
-          description: 'Prompt. Appended to input on stdin (if any).',
+        .option("prompt", {
+          alias: "p",
+          type: "string",
+          description: "Prompt. Appended to input on stdin (if any).",
         })
-        .option('prompt-interactive', {
-          alias: 'i',
-          type: 'string',
-          description:
-            'Execute the provided prompt and continue in interactive mode',
+        .option("prompt-interactive", {
+          alias: "i",
+          type: "string",
+          description: "Execute the provided prompt and continue in interactive mode",
         })
-        .option('system-prompt', {
-          type: 'string',
+        .option("system-prompt", {
+          type: "string",
           description:
-            'Override the main session system prompt for this run. Can be combined with --append-system-prompt.',
+            "Override the main session system prompt for this run. Can be combined with --append-system-prompt.",
         })
-        .option('append-system-prompt', {
-          type: 'string',
+        .option("append-system-prompt", {
+          type: "string",
           description:
-            'Append instructions to the main session system prompt for this run. Can be combined with --system-prompt.',
+            "Append instructions to the main session system prompt for this run. Can be combined with --system-prompt.",
         })
-        .option('sandbox', {
-          alias: 's',
-          type: 'boolean',
-          description: 'Run in sandbox?',
+        .option("sandbox", {
+          alias: "s",
+          type: "boolean",
+          description: "Run in sandbox?",
         })
-        .option('sandbox-image', {
-          type: 'string',
-          description: 'Sandbox image URI.',
+        .option("sandbox-image", {
+          type: "string",
+          description: "Sandbox image URI.",
         })
-        .option('yolo', {
-          alias: 'y',
-          type: 'boolean',
+        .option("yolo", {
+          alias: "y",
+          type: "boolean",
           description:
-            'Automatically accept all actions (aka YOLO mode, see https://www.youtube.com/watch?v=xvFZjo5PgG0 for more details)?',
+            "Automatically accept all actions (aka YOLO mode, see https://www.youtube.com/watch?v=xvFZjo5PgG0 for more details)?",
           default: false,
         })
-        .option('approval-mode', {
-          type: 'string',
-          choices: ['plan', 'default', 'auto-edit', 'yolo'],
+        .option("approval-mode", {
+          type: "string",
+          choices: ["plan", "default", "auto-edit", "yolo"],
           description:
-            'Set the approval mode: plan (plan only), default (prompt for approval), auto-edit (auto-approve edit tools), yolo (auto-approve all tools)',
+            "Set the approval mode: plan (plan only), default (prompt for approval), auto-edit (auto-approve edit tools), yolo (auto-approve all tools)",
         })
-        .option('checkpointing', {
-          type: 'boolean',
-          description: 'Enables checkpointing of file edits',
+        .option("checkpointing", {
+          type: "boolean",
+          description: "Enables checkpointing of file edits",
           default: false,
         })
-        .option('acp', {
-          type: 'boolean',
-          description: 'Starts the agent in ACP mode',
+        .option("acp", {
+          type: "boolean",
+          description: "Starts the agent in ACP mode",
         })
-        .option('experimental-acp', {
-          type: 'boolean',
-          description:
-            'Starts the agent in ACP mode (deprecated, use --acp instead)',
+        .option("experimental-acp", {
+          type: "boolean",
+          description: "Starts the agent in ACP mode (deprecated, use --acp instead)",
           hidden: true,
         })
-        .option('experimental-skills', {
-          type: 'boolean',
-          description:
-            'Deprecated: Skills are now enabled by default. This flag is ignored.',
+        .option("experimental-skills", {
+          type: "boolean",
+          description: "Deprecated: Skills are now enabled by default. This flag is ignored.",
           hidden: true,
         })
-        .option('experimental-lsp', {
-          type: 'boolean',
+        .option("experimental-lsp", {
+          type: "boolean",
           description:
-            'Enable experimental LSP (Language Server Protocol) feature for code intelligence',
+            "Enable experimental LSP (Language Server Protocol) feature for code intelligence",
           default: false,
         })
-        .option('channel', {
-          type: 'string',
-          choices: ['VSCode', 'ACP', 'SDK', 'CI'],
-          description: 'Channel identifier (VSCode, ACP, SDK, CI)',
+        .option("channel", {
+          type: "string",
+          choices: ["VSCode", "ACP", "SDK", "CI"],
+          description: "Channel identifier (VSCode, ACP, SDK, CI)",
         })
-        .option('allowed-mcp-server-names', {
-          type: 'array',
+        .option("allowed-mcp-server-names", {
+          type: "array",
           string: true,
-          description: 'Allowed MCP server names',
+          description: "Allowed MCP server names",
           coerce: (mcpServerNames: string[]) =>
             // Handle comma-separated values
             mcpServerNames.flatMap((mcpServerName) =>
-              mcpServerName.split(',').map((m) => m.trim()),
+              mcpServerName.split(",").map((m) => m.trim()),
             ),
         })
-        .option('allowed-tools', {
-          type: 'array',
+        .option("allowed-tools", {
+          type: "array",
           string: true,
-          description: 'Tools that are allowed to run without confirmation',
+          description: "Tools that are allowed to run without confirmation",
           coerce: (tools: string[]) =>
             // Handle comma-separated values
-            tools.flatMap((tool) => tool.split(',').map((t) => t.trim())),
+            tools.flatMap((tool) => tool.split(",").map((t) => t.trim())),
         })
-        .option('extensions', {
-          alias: 'e',
-          type: 'array',
+        .option("extensions", {
+          alias: "e",
+          type: "array",
           string: true,
-          description:
-            'A list of extensions to use. If not provided, all extensions are used.',
+          description: "A list of extensions to use. If not provided, all extensions are used.",
           coerce: (extensions: string[]) =>
             // Handle comma-separated values
-            extensions.flatMap((extension) =>
-              extension.split(',').map((e) => e.trim()),
-            ),
+            extensions.flatMap((extension) => extension.split(",").map((e) => e.trim())),
         })
-        .option('list-extensions', {
-          alias: 'l',
-          type: 'boolean',
-          description: 'List all available extensions and exit.',
+        .option("list-extensions", {
+          alias: "l",
+          type: "boolean",
+          description: "List all available extensions and exit.",
         })
-        .option('include-directories', {
-          alias: 'add-dir',
-          type: 'array',
+        .option("include-directories", {
+          alias: "add-dir",
+          type: "array",
           string: true,
           description:
-            'Additional directories to include in the workspace (comma-separated or multiple --include-directories)',
+            "Additional directories to include in the workspace (comma-separated or multiple --include-directories)",
           coerce: (dirs: string[]) =>
             // Handle comma-separated values
-            dirs.flatMap((dir) => dir.split(',').map((d) => d.trim())),
+            dirs.flatMap((dir) => dir.split(",").map((d) => d.trim())),
         })
-        .option('openai-logging', {
-          type: 'boolean',
-          description:
-            'Enable logging of OpenAI API calls for debugging and analysis',
+        .option("openai-logging", {
+          type: "boolean",
+          description: "Enable logging of OpenAI API calls for debugging and analysis",
         })
-        .option('openai-logging-dir', {
-          type: 'string',
-          description:
-            'Custom directory path for OpenAI API logs. Overrides settings files.',
+        .option("openai-logging-dir", {
+          type: "string",
+          description: "Custom directory path for OpenAI API logs. Overrides settings files.",
         })
-        .option('openai-api-key', {
-          type: 'string',
-          description: 'OpenAI API key to use for authentication',
+        .option("openai-api-key", {
+          type: "string",
+          description: "OpenAI API key to use for authentication",
         })
-        .option('openai-base-url', {
-          type: 'string',
-          description: 'OpenAI base URL (for custom endpoints)',
+        .option("openai-base-url", {
+          type: "string",
+          description: "OpenAI base URL (for custom endpoints)",
         })
-        .option('tavily-api-key', {
-          type: 'string',
-          description: 'Tavily API key for web search',
+        .option("tavily-api-key", {
+          type: "string",
+          description: "Tavily API key for web search",
         })
-        .option('google-api-key', {
-          type: 'string',
-          description: 'Google Custom Search API key',
+        .option("google-api-key", {
+          type: "string",
+          description: "Google Custom Search API key",
         })
-        .option('google-search-engine-id', {
-          type: 'string',
-          description: 'Google Custom Search Engine ID',
+        .option("google-search-engine-id", {
+          type: "string",
+          description: "Google Custom Search Engine ID",
         })
-        .option('web-search-default', {
-          type: 'string',
-          description:
-            'Default web search provider (dashscope, tavily, google)',
+        .option("web-search-default", {
+          type: "string",
+          description: "Default web search provider (dashscope, tavily, google)",
         })
-        .option('screen-reader', {
-          type: 'boolean',
-          description: 'Enable screen reader mode for accessibility.',
+        .option("screen-reader", {
+          type: "boolean",
+          description: "Enable screen reader mode for accessibility.",
         })
-        .option('input-format', {
-          type: 'string',
-          choices: ['text', 'stream-json'],
-          description: 'The format consumed from standard input.',
-          default: 'text',
+        .option("input-format", {
+          type: "string",
+          choices: ["text", "stream-json"],
+          description: "The format consumed from standard input.",
+          default: "text",
         })
-        .option('output-format', {
-          alias: 'o',
-          type: 'string',
-          description: 'The format of the CLI output.',
-          choices: ['text', 'json', 'stream-json'],
+        .option("output-format", {
+          alias: "o",
+          type: "string",
+          description: "The format of the CLI output.",
+          choices: ["text", "json", "stream-json"],
         })
-        .option('include-partial-messages', {
-          type: 'boolean',
-          description:
-            'Include partial assistant messages when using stream-json output.',
+        .option("include-partial-messages", {
+          type: "boolean",
+          description: "Include partial assistant messages when using stream-json output.",
           default: false,
         })
-        .option('continue', {
-          alias: 'c',
-          type: 'boolean',
-          description:
-            'Resume the most recent session for the current project.',
+        .option("continue", {
+          alias: "c",
+          type: "boolean",
+          description: "Resume the most recent session for the current project.",
           default: false,
         })
-        .option('resume', {
-          alias: 'r',
-          type: 'string',
+        .option("resume", {
+          alias: "r",
+          type: "string",
           description:
-            'Resume a specific session by its ID. Use without an ID to show session picker.',
+            "Resume a specific session by its ID. Use without an ID to show session picker.",
         })
-        .option('session-id', {
-          type: 'string',
-          description: 'Specify a session ID for this run.',
+        .option("session-id", {
+          type: "string",
+          description: "Specify a session ID for this run.",
         })
-        .option('max-session-turns', {
-          type: 'number',
-          description: 'Maximum number of session turns',
+        .option("max-session-turns", {
+          type: "number",
+          description: "Maximum number of session turns",
         })
-        .option('core-tools', {
-          type: 'array',
+        .option("core-tools", {
+          type: "array",
           string: true,
-          description: 'Core tool paths',
+          description: "Core tool paths",
           coerce: (tools: string[]) =>
-            tools.flatMap((tool) => tool.split(',').map((t) => t.trim())),
+            tools.flatMap((tool) => tool.split(",").map((t) => t.trim())),
         })
-        .option('exclude-tools', {
-          type: 'array',
+        .option("exclude-tools", {
+          type: "array",
           string: true,
-          description: 'Tools to exclude',
+          description: "Tools to exclude",
           coerce: (tools: string[]) =>
-            tools.flatMap((tool) => tool.split(',').map((t) => t.trim())),
+            tools.flatMap((tool) => tool.split(",").map((t) => t.trim())),
         })
-        .option('allowed-tools', {
-          type: 'array',
+        .option("allowed-tools", {
+          type: "array",
           string: true,
-          description: 'Tools to allow, will bypass confirmation',
+          description: "Tools to allow, will bypass confirmation",
           coerce: (tools: string[]) =>
-            tools.flatMap((tool) => tool.split(',').map((t) => t.trim())),
+            tools.flatMap((tool) => tool.split(",").map((t) => t.trim())),
         })
-        .option('auth-type', {
-          type: 'string',
-          choices: [
-            AuthType.USE_OPENAI,
-            AuthType.USE_ANTHROPIC,
-            AuthType.USE_OLLAMA,
-          ],
-          description: 'Authentication type',
+        .option("auth-type", {
+          type: "string",
+          choices: [AuthType.USE_OPENAI, AuthType.USE_ANTHROPIC, AuthType.USE_OLLAMA],
+          description: "Authentication type",
         })
         .deprecateOption(
-          'sandbox-image',
+          "sandbox-image",
           'Use the "tools.sandbox" setting in settings.json instead. This flag will be removed in a future version.',
         )
         .deprecateOption(
-          'checkpointing',
+          "checkpointing",
           'Use the "general.checkpointing.enabled" setting in settings.json instead. This flag will be removed in a future version.',
         )
         .deprecateOption(
-          'prompt',
-          'Use the positional prompt instead. This flag will be removed in a future version.',
+          "prompt",
+          "Use the positional prompt instead. This flag will be removed in a future version.",
         )
         // Ensure validation flows through .fail() for clean UX
         .fail((msg: string, err: Error | undefined, yargs: Argv) => {
-          writeStderrLine(msg || err?.message || 'Unknown error');
+          writeStderrLine(msg || err?.message || "Unknown error");
           yargs.showHelp();
           process.exit(1);
         })
         .check((argv: { [x: string]: unknown }) => {
           // The 'query' positional can be a string (for one arg) or string[] (for multiple).
           // This guard safely checks if any positional argument was provided.
-          const query = argv['query'] as string | string[] | undefined;
-          const hasPositionalQuery = Array.isArray(query)
-            ? query.length > 0
-            : !!query;
+          const query = argv["query"] as string | string[] | undefined;
+          const hasPositionalQuery = Array.isArray(query) ? query.length > 0 : !!query;
 
-          if (argv['prompt'] && hasPositionalQuery) {
-            return 'Cannot use both a positional prompt and the --prompt (-p) flag together';
+          if (argv["prompt"] && hasPositionalQuery) {
+            return "Cannot use both a positional prompt and the --prompt (-p) flag together";
           }
-          if (argv['prompt'] && argv['promptInteractive']) {
-            return 'Cannot use both --prompt (-p) and --prompt-interactive (-i) together';
+          if (argv["prompt"] && argv["promptInteractive"]) {
+            return "Cannot use both --prompt (-p) and --prompt-interactive (-i) together";
           }
-          if (argv['yolo'] && argv['approvalMode']) {
-            return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
+          if (argv["yolo"] && argv["approvalMode"]) {
+            return "Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.";
           }
-          if (
-            argv['includePartialMessages'] &&
-            argv['outputFormat'] !== OutputFormat.STREAM_JSON
-          ) {
-            return '--include-partial-messages requires --output-format stream-json';
+          if (argv["includePartialMessages"] && argv["outputFormat"] !== OutputFormat.STREAM_JSON) {
+            return "--include-partial-messages requires --output-format stream-json";
           }
           if (
-            argv['inputFormat'] === 'stream-json' &&
-            argv['outputFormat'] !== OutputFormat.STREAM_JSON
+            argv["inputFormat"] === "stream-json" &&
+            argv["outputFormat"] !== OutputFormat.STREAM_JSON
           ) {
-            return '--input-format stream-json requires --output-format stream-json';
+            return "--input-format stream-json requires --output-format stream-json";
           }
-          if (argv['continue'] && argv['resume']) {
-            return 'Cannot use both --continue and --resume together. Use --continue to resume the latest session, or --resume <sessionId> to resume a specific session.';
+          if (argv["continue"] && argv["resume"]) {
+            return "Cannot use both --continue and --resume together. Use --continue to resume the latest session, or --resume <sessionId> to resume a specific session.";
           }
-          if (argv['sessionId'] && (argv['continue'] || argv['resume'])) {
-            return 'Cannot use --session-id with --continue or --resume. Use --session-id to start a new session with a specific ID, or use --continue/--resume to resume an existing session.';
+          if (argv["sessionId"] && (argv["continue"] || argv["resume"])) {
+            return "Cannot use --session-id with --continue or --resume. Use --session-id to start a new session with a specific ID, or use --continue/--resume to resume an existing session.";
           }
-          if (
-            argv['sessionId'] &&
-            !isValidSessionId(argv['sessionId'] as string)
-          ) {
-            return `Invalid --session-id: "${argv['sessionId']}". Must be a valid UUID (e.g., "123e4567-e89b-12d3-a456-426614174000").`;
+          if (argv["sessionId"] && !isValidSessionId(argv["sessionId"] as string)) {
+            return `Invalid --session-id: "${argv["sessionId"]}". Must be a valid UUID (e.g., "123e4567-e89b-12d3-a456-426614174000").`;
           }
-          if (argv['resume'] && !isValidSessionId(argv['resume'] as string)) {
-            return `Invalid --resume: "${argv['resume']}". Must be a valid UUID (e.g., "123e4567-e89b-12d3-a456-426614174000").`;
+          if (argv["resume"] && !isValidSessionId(argv["resume"] as string)) {
+            return `Invalid --resume: "${argv["resume"]}". Must be a valid UUID (e.g., "123e4567-e89b-12d3-a456-426614174000").`;
           }
           return true;
         }),
@@ -588,9 +552,9 @@ export async function parseArguments(): Promise<CliArgs> {
 
   yargsInstance
     .version(await getCliVersion()) // This will enable the --version flag based on package.json
-    .alias('v', 'version')
+    .alias("v", "version")
     .help()
-    .alias('h', 'help')
+    .alias("h", "help")
     .strict()
     .demandCommand(0, 0); // Allow base command to run with no subcommands
 
@@ -603,10 +567,10 @@ export async function parseArguments(): Promise<CliArgs> {
   // and not return to main CLI logic
   if (
     result._.length > 0 &&
-    (result._[0] === 'mcp' ||
-      result._[0] === 'extensions' ||
-      result._[0] === 'hooks' ||
-      result._[0] === 'channel')
+    (result._[0] === "mcp" ||
+      result._[0] === "extensions" ||
+      result._[0] === "hooks" ||
+      result._[0] === "channel")
   ) {
     // MCP/Extensions/Hooks commands handle their own execution and process exit
     process.exit(0);
@@ -614,41 +578,39 @@ export async function parseArguments(): Promise<CliArgs> {
 
   // Normalize query args: handle both quoted "@path file" and unquoted @path file
   const queryArg = (result as { query?: string | string[] | undefined }).query;
-  const q: string | undefined = Array.isArray(queryArg)
-    ? queryArg.join(' ')
-    : queryArg;
+  const q: string | undefined = Array.isArray(queryArg) ? queryArg.join(" ") : queryArg;
 
   // Route positional args: explicit -i flag -> interactive; else -> one-shot (even for @commands)
-  if (q && !result['prompt']) {
+  if (q && !result["prompt"]) {
     const hasExplicitInteractive =
-      result['promptInteractive'] === '' || !!result['promptInteractive'];
+      result["promptInteractive"] === "" || !!result["promptInteractive"];
     if (hasExplicitInteractive) {
-      result['promptInteractive'] = q;
+      result["promptInteractive"] = q;
     } else {
-      result['prompt'] = q;
+      result["prompt"] = q;
     }
   }
 
   // Keep CliArgs.query as a string for downstream typing
-  (result as Record<string, unknown>)['query'] = q || undefined;
+  (result as Record<string, unknown>)["query"] = q || undefined;
 
   // The import format is now only controlled by settings.memoryImportFormat
   // We no longer accept it as a CLI argument
 
   // Handle deprecated --experimental-acp flag
-  if (result['experimentalAcp']) {
+  if (result["experimentalAcp"]) {
     writeStderrLine(
-      '\x1b[33m⚠ Warning: --experimental-acp is deprecated and will be removed in a future release. Please use --acp instead.\x1b[0m',
+      "\x1b[33m⚠ Warning: --experimental-acp is deprecated and will be removed in a future release. Please use --acp instead.\x1b[0m",
     );
     // Map experimental-acp to acp if acp is not explicitly set
-    if (!result['acp']) {
-      (result as Record<string, unknown>)['acp'] = true;
+    if (!result["acp"]) {
+      (result as Record<string, unknown>)["acp"] = true;
     }
   }
 
   // Apply ACP fallback: if acp or experimental-acp is present but no explicit --channel, treat as ACP
-  if ((result['acp'] || result['experimentalAcp']) && !result['channel']) {
-    (result as Record<string, unknown>)['channel'] = 'ACP';
+  if ((result["acp"] || result["experimentalAcp"]) && !result["channel"]) {
+    (result as Record<string, unknown>)["channel"] = "ACP";
   }
 
   return result as unknown as CliArgs;
@@ -663,7 +625,7 @@ export async function loadHierarchicalGeminiMemory(
   fileService: FileDiscoveryService,
   extensionContextFilePaths: string[] = [],
   folderTrust: boolean,
-  memoryImportFormat: 'flat' | 'tree' = 'tree',
+  memoryImportFormat: "flat" | "tree" = "tree",
 ): Promise<{ memoryContent: string; fileCount: number }> {
   // FIX: Use real, canonical paths for a reliable comparison to handle symlinks.
   const realCwd = fs.realpathSync(path.resolve(currentWorkingDirectory));
@@ -672,7 +634,7 @@ export async function loadHierarchicalGeminiMemory(
 
   // If it is the home directory, pass an empty string to the core memory
   // function to signal that it should skip the workspace search.
-  const effectiveCwd = isHomeDirectory ? '' : currentWorkingDirectory;
+  const effectiveCwd = isHomeDirectory ? "" : currentWorkingDirectory;
 
   // Directly call the server function with the corrected path.
   return loadServerHierarchicalMemory(
@@ -688,9 +650,7 @@ export async function loadHierarchicalGeminiMemory(
 export function isDebugMode(argv: CliArgs): boolean {
   return (
     argv.debug ||
-    [process.env['DEBUG'], process.env['DEBUG_MODE']].some(
-      (v) => v === 'true' || v === '1',
-    )
+    [process.env["DEBUG"], process.env["DEBUG_MODE"]].some((v) => v === "true" || v === "1")
   );
 }
 
@@ -725,14 +685,8 @@ export async function loadCliConfig(
 
   // Automatically load output-language.md if it exists
   const projectStorage = new Storage(cwd);
-  const projectOutputLanguagePath = path.join(
-    projectStorage.getQwenDir(),
-    'output-language.md',
-  );
-  const globalOutputLanguagePath = path.join(
-    Storage.getGlobalQwenDir(),
-    'output-language.md',
-  );
+  const projectOutputLanguagePath = path.join(projectStorage.getQwenDir(), "output-language.md");
+  const globalOutputLanguagePath = path.join(Storage.getGlobalQwenDir(), "output-language.md");
 
   let outputLanguageFilePath: string | undefined;
   if (fs.existsSync(projectOutputLanguagePath)) {
@@ -750,19 +704,17 @@ export async function loadCliConfig(
   // LSP configuration: enabled only via --experimental-lsp flag
   const lspEnabled = argv.experimentalLsp === true;
   let lspClient: LspClient | undefined;
-  const question = argv.promptInteractive || argv.prompt || '';
+  const question = argv.promptInteractive || argv.prompt || "";
   const inputFormat: InputFormat =
     (argv.inputFormat as InputFormat | undefined) ?? InputFormat.TEXT;
   const argvOutputFormat = normalizeOutputFormat(
     argv.outputFormat as string | OutputFormat | undefined,
   );
   const settingsOutputFormat = normalizeOutputFormat(settings.output?.format);
-  const outputFormat =
-    argvOutputFormat ?? settingsOutputFormat ?? OutputFormat.TEXT;
+  const outputFormat = argvOutputFormat ?? settingsOutputFormat ?? OutputFormat.TEXT;
   const outputSettingsFormat: OutputFormat =
     outputFormat === OutputFormat.STREAM_JSON
-      ? settingsOutputFormat &&
-        settingsOutputFormat !== OutputFormat.STREAM_JSON
+      ? settingsOutputFormat && settingsOutputFormat !== OutputFormat.STREAM_JSON
         ? settingsOutputFormat
         : OutputFormat.TEXT
       : (outputFormat as OutputFormat);
@@ -801,9 +753,7 @@ export async function loadCliConfig(
     });
   } catch (err) {
     if (err instanceof FatalConfigError) {
-      throw new FatalConfigError(
-        `Invalid telemetry configuration: ${err.message}.`,
-      );
+      throw new FatalConfigError(`Invalid telemetry configuration: ${err.message}.`);
     }
     throw err;
   }
@@ -819,8 +769,7 @@ export async function loadCliConfig(
     // Priority 1: Explicit -i flag means interactive
     interactive = true;
   } else if (
-    (outputFormat === OutputFormat.STREAM_JSON ||
-      outputFormat === OutputFormat.JSON) &&
+    (outputFormat === OutputFormat.STREAM_JSON || outputFormat === OutputFormat.JSON) &&
     (hasQuery || hasPrompt)
   ) {
     // Priority 2: JSON/stream-json output with query/prompt means non-interactive
@@ -851,10 +800,7 @@ export async function loadCliConfig(
   // mergedAllow — they have whitelist semantics (only listed tools are registered),
   // not auto-approve semantics. They are passed via the `coreTools` Config param
   // and handled by PermissionManager.coreToolsAllowList.
-  const resolvedCoreTools: string[] = [
-    ...(argv.coreTools ?? []),
-    ...(settings.tools?.core ?? []),
-  ];
+  const resolvedCoreTools: string[] = [...(argv.coreTools ?? []), ...(settings.tools?.core ?? [])];
   const mergedAllow: string[] = [
     ...(settings.permissions?.allow ?? []),
     ...(settings.tools?.allowed ?? []),
@@ -884,9 +830,8 @@ export async function loadCliConfig(
     // 1. Check permissions.allow / allowedTools rules.
     if (
       mergedAllow.some((rule) => {
-        const openParen = rule.indexOf('(');
-        const ruleName =
-          openParen === -1 ? rule.trim() : rule.substring(0, openParen).trim();
+        const openParen = rule.indexOf("(");
+        const ruleName = openParen === -1 ? rule.trim() : rule.substring(0, openParen).trim();
         return ruleName === name;
       })
     ) {
@@ -996,17 +941,17 @@ export async function loadCliConfig(
         process.exit(1);
       }
     }
-  } else if (argv['sessionId']) {
+  } else if (argv["sessionId"]) {
     // Use provided session ID without session resumption
     // Check if session ID is already in use
     const sessionService = new SessionService(cwd);
-    const exists = await sessionService.sessionExists(argv['sessionId']);
+    const exists = await sessionService.sessionExists(argv["sessionId"]);
     if (exists) {
-      const message = `Error: Session Id ${argv['sessionId']} is already in use.`;
+      const message = `Error: Session Id ${argv["sessionId"]} is already in use.`;
       writeStderrLine(message);
       process.exit(1);
     }
-    sessionId = argv['sessionId'];
+    sessionId = argv["sessionId"];
   }
 
   const modelProvidersConfig = settings.modelProviders;
@@ -1018,9 +963,8 @@ export async function loadCliConfig(
     sandbox: sandboxConfig,
     targetDir: cwd,
     includeDirectories,
-    loadMemoryFromIncludeDirectories:
-      settings.context?.loadFromIncludeDirectories || false,
-    importFormat: settings.context?.importFormat || 'tree',
+    loadMemoryFromIncludeDirectories: settings.context?.loadFromIncludeDirectories || false,
+    importFormat: settings.context?.importFormat || "tree",
     debugMode,
     question,
     systemPrompt: argv.systemPrompt,
@@ -1038,13 +982,10 @@ export async function loadCliConfig(
     // Permission rule persistence callback (writes to settings files).
     onPersistPermissionRule: async (scope, ruleType, rule) => {
       const currentSettings = loadSettings(cwd);
-      const settingScope =
-        scope === 'project' ? SettingScope.Workspace : SettingScope.User;
+      const settingScope = scope === "project" ? SettingScope.Workspace : SettingScope.User;
       const key = `permissions.${ruleType}`;
       const currentRules: string[] =
-        currentSettings.forScope(settingScope).settings.permissions?.[
-          ruleType
-        ] ?? [];
+        currentSettings.forScope(settingScope).settings.permissions?.[ruleType] ?? [];
       if (!currentRules.includes(rule)) {
         currentSettings.setValue(settingScope, key, [...currentRules, rule]);
       }
@@ -1053,12 +994,8 @@ export async function loadCliConfig(
     toolCallCommand: settings.tools?.callCommand,
     mcpServerCommand: settings.mcp?.serverCommand,
     mcpServers: settings.mcpServers || {},
-    allowedMcpServers: allowedMcpServers
-      ? Array.from(allowedMcpServers)
-      : undefined,
-    excludedMcpServers: excludedMcpServers
-      ? Array.from(excludedMcpServers)
-      : undefined,
+    allowedMcpServers: allowedMcpServers ? Array.from(allowedMcpServers) : undefined,
+    excludedMcpServers: excludedMcpServers ? Array.from(excludedMcpServers) : undefined,
     approvalMode,
     accessibility: {
       ...settings.ui?.accessibility,
@@ -1068,27 +1005,25 @@ export async function loadCliConfig(
     usageStatisticsEnabled: settings.privacy?.usageStatisticsEnabled ?? true,
     fileFiltering: settings.context?.fileFiltering,
     thinkingIdleThresholdMinutes: settings.context?.gapThresholdMinutes,
-    checkpointing:
-      argv.checkpointing || settings.general?.checkpointing?.enabled,
+    checkpointing: argv.checkpointing || settings.general?.checkpointing?.enabled,
     proxy:
       argv.proxy ||
-      process.env['HTTPS_PROXY'] ||
-      process.env['https_proxy'] ||
-      process.env['HTTP_PROXY'] ||
-      process.env['http_proxy'],
+      process.env["HTTPS_PROXY"] ||
+      process.env["https_proxy"] ||
+      process.env["HTTP_PROXY"] ||
+      process.env["http_proxy"],
     cwd,
     fileDiscoveryService: fileService,
     bugCommand: settings.advanced?.bugCommand,
     model: resolvedModel,
     outputLanguageFilePath,
     sessionTokenLimit: settings.model?.sessionTokenLimit ?? -1,
-    maxSessionTurns:
-      argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1,
+    maxSessionTurns: argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1,
     experimentalZedIntegration: argv.acp || argv.experimentalAcp || false,
     cronEnabled: settings.experimental?.cron ?? false,
     listExtensions: argv.listExtensions || false,
     overrideExtensions: overrideExtensions || argv.extensions,
-    noBrowser: !!process.env['NO_BROWSER'],
+    noBrowser: !!process.env["NO_BROWSER"],
     authType: selectedAuthType,
     inputFormat,
     outputFormat,
@@ -1123,8 +1058,7 @@ export async function loadCliConfig(
     // Precedence: explicit CLI flag > settings file > default(true).
     // NOTE: do NOT set a yargs default for `chat-recording`, otherwise argv will
     // always be true and the settings file can never disable recording.
-    chatRecording:
-      argv.chatRecording ?? settings.general?.chatRecording ?? true,
+    chatRecording: argv.chatRecording ?? settings.general?.chatRecording ?? true,
     defaultFileEncoding: settings.general?.defaultFileEncoding,
     lsp: {
       enabled: lspEnabled,
@@ -1135,8 +1069,7 @@ export async function loadCliConfig(
           arena: settings.agents.arena
             ? {
                 worktreeBaseDir: settings.agents.arena.worktreeBaseDir,
-                preserveArtifacts:
-                  settings.agents.arena.preserveArtifacts ?? false,
+                preserveArtifacts: settings.agents.arena.preserveArtifacts ?? false,
               }
             : undefined,
         }
@@ -1161,7 +1094,7 @@ export async function loadCliConfig(
       lspClient = new NativeLspClient(lspService);
       config.setLspClient(lspClient);
     } catch (err) {
-      debugLogger.warn('Failed to initialize native LSP service:', err);
+      debugLogger.warn("Failed to initialize native LSP service:", err);
     }
   }
 
diff --git a/apps/airiscode-cli/src/config/keyBindings.ts b/apps/airiscode-cli/src/config/keyBindings.ts
index b13da27fa..e10383d68 100644
--- a/apps/airiscode-cli/src/config/keyBindings.ts
+++ b/apps/airiscode-cli/src/config/keyBindings.ts
@@ -9,59 +9,59 @@
  */
 export enum Command {
   // Basic bindings
-  RETURN = 'return',
-  ESCAPE = 'escape',
+  RETURN = "return",
+  ESCAPE = "escape",
 
   // Cursor movement
-  HOME = 'home',
-  END = 'end',
+  HOME = "home",
+  END = "end",
 
   // Text deletion
-  KILL_LINE_RIGHT = 'killLineRight',
-  KILL_LINE_LEFT = 'killLineLeft',
-  CLEAR_INPUT = 'clearInput',
-  DELETE_WORD_BACKWARD = 'deleteWordBackward',
+  KILL_LINE_RIGHT = "killLineRight",
+  KILL_LINE_LEFT = "killLineLeft",
+  CLEAR_INPUT = "clearInput",
+  DELETE_WORD_BACKWARD = "deleteWordBackward",
 
   // Screen control
-  CLEAR_SCREEN = 'clearScreen',
+  CLEAR_SCREEN = "clearScreen",
 
   // History navigation
-  HISTORY_UP = 'historyUp',
-  HISTORY_DOWN = 'historyDown',
-  NAVIGATION_UP = 'navigationUp',
-  NAVIGATION_DOWN = 'navigationDown',
+  HISTORY_UP = "historyUp",
+  HISTORY_DOWN = "historyDown",
+  NAVIGATION_UP = "navigationUp",
+  NAVIGATION_DOWN = "navigationDown",
 
   // Auto-completion
-  ACCEPT_SUGGESTION = 'acceptSuggestion',
-  COMPLETION_UP = 'completionUp',
-  COMPLETION_DOWN = 'completionDown',
+  ACCEPT_SUGGESTION = "acceptSuggestion",
+  COMPLETION_UP = "completionUp",
+  COMPLETION_DOWN = "completionDown",
 
   // Text input
-  SUBMIT = 'submit',
-  NEWLINE = 'newline',
+  SUBMIT = "submit",
+  NEWLINE = "newline",
 
   // External tools
-  OPEN_EXTERNAL_EDITOR = 'openExternalEditor',
-  PASTE_CLIPBOARD_IMAGE = 'pasteClipboardImage',
+  OPEN_EXTERNAL_EDITOR = "openExternalEditor",
+  PASTE_CLIPBOARD_IMAGE = "pasteClipboardImage",
 
   // App level bindings
-  TOGGLE_TOOL_DESCRIPTIONS = 'toggleToolDescriptions',
-  TOGGLE_IDE_CONTEXT_DETAIL = 'toggleIDEContextDetail',
-  QUIT = 'quit',
-  EXIT = 'exit',
-  SHOW_MORE_LINES = 'showMoreLines',
-  RETRY_LAST = 'retryLast',
-  TOGGLE_VERBOSE_MODE = 'toggleVerboseMode',
+  TOGGLE_TOOL_DESCRIPTIONS = "toggleToolDescriptions",
+  TOGGLE_IDE_CONTEXT_DETAIL = "toggleIDEContextDetail",
+  QUIT = "quit",
+  EXIT = "exit",
+  SHOW_MORE_LINES = "showMoreLines",
+  RETRY_LAST = "retryLast",
+  TOGGLE_VERBOSE_MODE = "toggleVerboseMode",
 
   // Shell commands
-  REVERSE_SEARCH = 'reverseSearch',
-  SUBMIT_REVERSE_SEARCH = 'submitReverseSearch',
-  ACCEPT_SUGGESTION_REVERSE_SEARCH = 'acceptSuggestionReverseSearch',
-  TOGGLE_SHELL_INPUT_FOCUS = 'toggleShellInputFocus',
+  REVERSE_SEARCH = "reverseSearch",
+  SUBMIT_REVERSE_SEARCH = "submitReverseSearch",
+  ACCEPT_SUGGESTION_REVERSE_SEARCH = "acceptSuggestionReverseSearch",
+  TOGGLE_SHELL_INPUT_FOCUS = "toggleShellInputFocus",
 
   // Suggestion expansion
-  EXPAND_SUGGESTION = 'expandSuggestion',
-  COLLAPSE_SUGGESTION = 'collapseSuggestion',
+  EXPAND_SUGGESTION = "expandSuggestion",
+  COLLAPSE_SUGGESTION = "collapseSuggestion",
 }
 
 /**
@@ -96,44 +96,44 @@ export type KeyBindingConfig = {
  */
 export const defaultKeyBindings: KeyBindingConfig = {
   // Basic bindings
-  [Command.RETURN]: [{ key: 'return' }],
-  [Command.ESCAPE]: [{ key: 'escape' }],
+  [Command.RETURN]: [{ key: "return" }],
+  [Command.ESCAPE]: [{ key: "escape" }],
 
   // Cursor movement
-  [Command.HOME]: [{ key: 'a', ctrl: true }],
-  [Command.END]: [{ key: 'e', ctrl: true }],
+  [Command.HOME]: [{ key: "a", ctrl: true }],
+  [Command.END]: [{ key: "e", ctrl: true }],
 
   // Text deletion
-  [Command.KILL_LINE_RIGHT]: [{ key: 'k', ctrl: true }],
-  [Command.KILL_LINE_LEFT]: [{ key: 'u', ctrl: true }],
-  [Command.CLEAR_INPUT]: [{ key: 'c', ctrl: true }],
+  [Command.KILL_LINE_RIGHT]: [{ key: "k", ctrl: true }],
+  [Command.KILL_LINE_LEFT]: [{ key: "u", ctrl: true }],
+  [Command.CLEAR_INPUT]: [{ key: "c", ctrl: true }],
   // Added command (meta/alt/option) for mac compatibility
   [Command.DELETE_WORD_BACKWARD]: [
-    { key: 'backspace', ctrl: true },
-    { key: 'backspace', command: true },
+    { key: "backspace", ctrl: true },
+    { key: "backspace", command: true },
   ],
 
   // Screen control
-  [Command.CLEAR_SCREEN]: [{ key: 'l', ctrl: true }],
+  [Command.CLEAR_SCREEN]: [{ key: "l", ctrl: true }],
 
   // History navigation
-  [Command.HISTORY_UP]: [{ key: 'p', ctrl: true }],
-  [Command.HISTORY_DOWN]: [{ key: 'n', ctrl: true }],
-  [Command.NAVIGATION_UP]: [{ key: 'up' }],
-  [Command.NAVIGATION_DOWN]: [{ key: 'down' }],
+  [Command.HISTORY_UP]: [{ key: "p", ctrl: true }],
+  [Command.HISTORY_DOWN]: [{ key: "n", ctrl: true }],
+  [Command.NAVIGATION_UP]: [{ key: "up" }],
+  [Command.NAVIGATION_DOWN]: [{ key: "down" }],
 
   // Auto-completion
-  [Command.ACCEPT_SUGGESTION]: [{ key: 'tab' }, { key: 'return', ctrl: false }],
+  [Command.ACCEPT_SUGGESTION]: [{ key: "tab" }, { key: "return", ctrl: false }],
   // Completion navigation uses only arrow keys
   // Ctrl+P/N are reserved for history navigation (HISTORY_UP/DOWN)
-  [Command.COMPLETION_UP]: [{ key: 'up' }],
-  [Command.COMPLETION_DOWN]: [{ key: 'down' }],
+  [Command.COMPLETION_UP]: [{ key: "up" }],
+  [Command.COMPLETION_DOWN]: [{ key: "down" }],
 
   // Text input
   // Must also exclude shift to allow shift+enter for newline
   [Command.SUBMIT]: [
     {
-      key: 'return',
+      key: "return",
       ctrl: false,
       command: false,
       paste: false,
@@ -143,46 +143,46 @@ export const defaultKeyBindings: KeyBindingConfig = {
   // Split into multiple data-driven bindings
   // Now also includes shift+enter for multi-line input
   [Command.NEWLINE]: [
-    { key: 'return', ctrl: true },
-    { key: 'return', command: true },
-    { key: 'return', paste: true },
-    { key: 'return', shift: true },
-    { key: 'j', ctrl: true },
+    { key: "return", ctrl: true },
+    { key: "return", command: true },
+    { key: "return", paste: true },
+    { key: "return", shift: true },
+    { key: "j", ctrl: true },
   ],
 
   // External tools
   [Command.OPEN_EXTERNAL_EDITOR]: [
-    { key: 'x', ctrl: true },
-    { sequence: '\x18', ctrl: true },
+    { key: "x", ctrl: true },
+    { sequence: "\x18", ctrl: true },
   ],
   [Command.PASTE_CLIPBOARD_IMAGE]:
-    process.platform === 'win32'
+    process.platform === "win32"
       ? [
-          { key: 'v', command: true },
-          { key: 'v', meta: true },
+          { key: "v", command: true },
+          { key: "v", meta: true },
         ]
       : [
-          { key: 'v', ctrl: true },
-          { key: 'v', command: true },
+          { key: "v", ctrl: true },
+          { key: "v", command: true },
         ],
 
   // App level bindings
-  [Command.TOGGLE_TOOL_DESCRIPTIONS]: [{ key: 't', ctrl: true }],
-  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: [{ key: 'g', ctrl: true }],
-  [Command.QUIT]: [{ key: 'c', ctrl: true }],
-  [Command.EXIT]: [{ key: 'd', ctrl: true }],
-  [Command.SHOW_MORE_LINES]: [{ key: 's', ctrl: true }],
-  [Command.RETRY_LAST]: [{ key: 'y', ctrl: true }],
-  [Command.TOGGLE_VERBOSE_MODE]: [{ key: 'o', ctrl: true }],
+  [Command.TOGGLE_TOOL_DESCRIPTIONS]: [{ key: "t", ctrl: true }],
+  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: [{ key: "g", ctrl: true }],
+  [Command.QUIT]: [{ key: "c", ctrl: true }],
+  [Command.EXIT]: [{ key: "d", ctrl: true }],
+  [Command.SHOW_MORE_LINES]: [{ key: "s", ctrl: true }],
+  [Command.RETRY_LAST]: [{ key: "y", ctrl: true }],
+  [Command.TOGGLE_VERBOSE_MODE]: [{ key: "o", ctrl: true }],
 
   // Shell commands
-  [Command.REVERSE_SEARCH]: [{ key: 'r', ctrl: true }],
+  [Command.REVERSE_SEARCH]: [{ key: "r", ctrl: true }],
   // Note: original logic ONLY checked ctrl=false, ignored meta/shift/paste
-  [Command.SUBMIT_REVERSE_SEARCH]: [{ key: 'return', ctrl: false }],
-  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: 'tab' }],
-  [Command.TOGGLE_SHELL_INPUT_FOCUS]: [{ key: 'f', ctrl: true }],
+  [Command.SUBMIT_REVERSE_SEARCH]: [{ key: "return", ctrl: false }],
+  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: "tab" }],
+  [Command.TOGGLE_SHELL_INPUT_FOCUS]: [{ key: "f", ctrl: true }],
 
   // Suggestion expansion
-  [Command.EXPAND_SUGGESTION]: [{ key: 'right' }],
-  [Command.COLLAPSE_SUGGESTION]: [{ key: 'left' }],
+  [Command.EXPAND_SUGGESTION]: [{ key: "right" }],
+  [Command.COLLAPSE_SUGGESTION]: [{ key: "left" }],
 };
diff --git a/apps/airiscode-cli/src/config/migration/index.ts b/apps/airiscode-cli/src/config/migration/index.ts
index 40d176cbe..580d05bd9 100644
--- a/apps/airiscode-cli/src/config/migration/index.ts
+++ b/apps/airiscode-cli/src/config/migration/index.ts
@@ -4,26 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Export types
-export type { SettingsMigration, MigrationResult } from './types.js';
-
 // Export scheduler
-export { MigrationScheduler } from './scheduler.js';
+export { MigrationScheduler } from "./scheduler.js";
+// Export types
+export type { MigrationResult, SettingsMigration } from "./types.js";
 
 // Export migrations
-export { v1ToV2Migration, V1ToV2Migration } from './versions/v1-to-v2.js';
-export { v2ToV3Migration, V2ToV3Migration } from './versions/v2-to-v3.js';
+export { V1ToV2Migration, v1ToV2Migration } from "./versions/v1-to-v2.js";
+export { V2ToV3Migration, v2ToV3Migration } from "./versions/v2-to-v3.js";
 
 // Import settings version from single source of truth
-import { SETTINGS_VERSION } from '../settings.js';
-
+import { SETTINGS_VERSION } from "../settings.js";
+import { MigrationScheduler } from "./scheduler.js";
+import type { MigrationResult } from "./types.js";
 // Ordered array of all migrations for use with MigrationScheduler
 // Each migration handles one version transition (N → N+1)
 // Order matters: migrations must be sorted by ascending version
-import { v1ToV2Migration } from './versions/v1-to-v2.js';
-import { v2ToV3Migration } from './versions/v2-to-v3.js';
-import { MigrationScheduler } from './scheduler.js';
-import type { MigrationResult } from './types.js';
+import { v1ToV2Migration } from "./versions/v1-to-v2.js";
+import { v2ToV3Migration } from "./versions/v2-to-v3.js";
 
 /**
  * Ordered array of all settings migrations.
@@ -53,10 +51,7 @@ export const ALL_MIGRATIONS = [v1ToV2Migration, v2ToV3Migration] as const;
  * }
  * ```
  */
-export function runMigrations(
-  settings: unknown,
-  scope: string,
-): MigrationResult {
+export function runMigrations(settings: unknown, scope: string): MigrationResult {
   const scheduler = new MigrationScheduler([...ALL_MIGRATIONS], scope);
   return scheduler.migrate(settings);
 }
@@ -81,18 +76,18 @@ export function runMigrations(
  * @returns true if migration is needed, false otherwise
  */
 export function needsMigration(settings: unknown): boolean {
-  if (typeof settings !== 'object' || settings === null) {
+  if (typeof settings !== "object" || settings === null) {
     return false;
   }
 
   const s = settings as Record<string, unknown>;
-  const version = s['$version'];
+  const version = s["$version"];
   const hasApplicableMigration = ALL_MIGRATIONS.some((migration) =>
     migration.shouldMigrate(settings),
   );
 
   // If $version is a valid number, use version comparison
-  if (typeof version === 'number') {
+  if (typeof version === "number") {
     if (version >= SETTINGS_VERSION) {
       return false;
     }
diff --git a/apps/airiscode-cli/src/config/migration/scheduler.ts b/apps/airiscode-cli/src/config/migration/scheduler.ts
index 8cdbe8214..9b586e01f 100644
--- a/apps/airiscode-cli/src/config/migration/scheduler.ts
+++ b/apps/airiscode-cli/src/config/migration/scheduler.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createDebugLogger } from '@airiscode/core';
-import type { SettingsMigration, MigrationResult } from './types.js';
+import { createDebugLogger } from "@airiscode/core";
+import type { MigrationResult, SettingsMigration } from "./types.js";
 
-const debugLogger = createDebugLogger('SETTINGS_MIGRATION');
+const debugLogger = createDebugLogger("SETTINGS_MIGRATION");
 
 /**
  * Formats a SettingScope enum value to a human-readable string.
@@ -15,8 +15,8 @@ const debugLogger = createDebugLogger('SETTINGS_MIGRATION');
  * - Special case: 'SystemDefaults' -> 'system default'
  */
 export function formatScope(scope: string): string {
-  if (scope === 'SystemDefaults') {
-    return 'system default';
+  if (scope === "SystemDefaults") {
+    return "system default";
   }
   return scope.toLowerCase();
 }
@@ -61,7 +61,7 @@ export class MigrationScheduler {
    * @returns MigrationResult containing the final settings, version, and execution log
    */
   migrate(settings: unknown): MigrationResult {
-    debugLogger.debug('MigrationScheduler: Starting migration chain');
+    debugLogger.debug("MigrationScheduler: Starting migration chain");
 
     let current = settings;
     const executed: Array<{ fromVersion: number; toVersion: number }> = [];
@@ -98,8 +98,7 @@ export class MigrationScheduler {
     }
 
     // Determine final version from the settings object
-    const finalVersion =
-      ((current as Record<string, unknown>)['$version'] as number) ?? 1;
+    const finalVersion = ((current as Record<string, unknown>)["$version"] as number) ?? 1;
 
     debugLogger.debug(
       `MigrationScheduler: Migration chain complete. Final version: ${finalVersion}, Executed: ${executed.length} migrations`,
diff --git a/apps/airiscode-cli/src/config/migration/types.ts b/apps/airiscode-cli/src/config/migration/types.ts
index ca1e23aaf..f87bdc27e 100644
--- a/apps/airiscode-cli/src/config/migration/types.ts
+++ b/apps/airiscode-cli/src/config/migration/types.ts
@@ -34,10 +34,7 @@ export interface SettingsMigration {
    * @returns The migrated settings object of version N+1 with optional warnings
    * @throws Error if the migration fails
    */
-  migrate(
-    settings: unknown,
-    scope: string,
-  ): { settings: unknown; warnings: string[] };
+  migrate(settings: unknown, scope: string): { settings: unknown; warnings: string[] };
 }
 
 /**
diff --git a/apps/airiscode-cli/src/config/migration/versions/v1-to-v2-shared.ts b/apps/airiscode-cli/src/config/migration/versions/v1-to-v2-shared.ts
index c63979f35..550bf5401 100644
--- a/apps/airiscode-cli/src/config/migration/versions/v1-to-v2-shared.ts
+++ b/apps/airiscode-cli/src/config/migration/versions/v1-to-v2-shared.ts
@@ -12,65 +12,65 @@
  * - warnings for residual legacy keys in latest-version settings files
  */
 export const V1_TO_V2_MIGRATION_MAP: Record<string, string> = {
-  accessibility: 'ui.accessibility',
-  allowedTools: 'tools.allowed',
-  allowMCPServers: 'mcp.allowed',
-  autoAccept: 'tools.autoAccept',
-  autoConfigureMaxOldSpaceSize: 'advanced.autoConfigureMemory',
-  bugCommand: 'advanced.bugCommand',
-  chatCompression: 'model.chatCompression',
-  checkpointing: 'general.checkpointing',
-  coreTools: 'tools.core',
-  contextFileName: 'context.fileName',
-  customThemes: 'ui.customThemes',
-  customWittyPhrases: 'ui.customWittyPhrases',
-  debugKeystrokeLogging: 'general.debugKeystrokeLogging',
-  dnsResolutionOrder: 'advanced.dnsResolutionOrder',
-  enforcedAuthType: 'security.auth.enforcedType',
-  excludeTools: 'tools.exclude',
-  excludeMCPServers: 'mcp.excluded',
-  excludedProjectEnvVars: 'advanced.excludedEnvVars',
-  extensions: 'extensions',
-  fileFiltering: 'context.fileFiltering',
-  folderTrustFeature: 'security.folderTrust.featureEnabled',
-  folderTrust: 'security.folderTrust.enabled',
-  hasSeenIdeIntegrationNudge: 'ide.hasSeenNudge',
-  hideWindowTitle: 'ui.hideWindowTitle',
-  showStatusInTitle: 'ui.showStatusInTitle',
-  hideTips: 'ui.hideTips',
-  showLineNumbers: 'ui.showLineNumbers',
-  showCitations: 'ui.showCitations',
-  ideMode: 'ide.enabled',
-  includeDirectories: 'context.includeDirectories',
-  loadMemoryFromIncludeDirectories: 'context.loadFromIncludeDirectories',
-  maxSessionTurns: 'model.maxSessionTurns',
-  mcpServers: 'mcpServers',
-  mcpServerCommand: 'mcp.serverCommand',
-  memoryImportFormat: 'context.importFormat',
-  model: 'model.name',
-  preferredEditor: 'general.preferredEditor',
-  sandbox: 'tools.sandbox',
-  selectedAuthType: 'security.auth.selectedType',
-  shouldUseNodePtyShell: 'tools.shell.enableInteractiveShell',
-  shellPager: 'tools.shell.pager',
-  shellShowColor: 'tools.shell.showColor',
-  skipNextSpeakerCheck: 'model.skipNextSpeakerCheck',
-  telemetry: 'telemetry',
-  theme: 'ui.theme',
-  toolDiscoveryCommand: 'tools.discoveryCommand',
-  toolCallCommand: 'tools.callCommand',
-  usageStatisticsEnabled: 'privacy.usageStatisticsEnabled',
-  useExternalAuth: 'security.auth.useExternal',
-  useRipgrep: 'tools.useRipgrep',
-  vimMode: 'general.vimMode',
-  enableWelcomeBack: 'ui.enableWelcomeBack',
-  approvalMode: 'tools.approvalMode',
-  sessionTokenLimit: 'model.sessionTokenLimit',
-  contentGenerator: 'model.generationConfig',
-  skipLoopDetection: 'model.skipLoopDetection',
-  skipStartupContext: 'model.skipStartupContext',
-  enableOpenAILogging: 'model.enableOpenAILogging',
-  tavilyApiKey: 'advanced.tavilyApiKey',
+  accessibility: "ui.accessibility",
+  allowedTools: "tools.allowed",
+  allowMCPServers: "mcp.allowed",
+  autoAccept: "tools.autoAccept",
+  autoConfigureMaxOldSpaceSize: "advanced.autoConfigureMemory",
+  bugCommand: "advanced.bugCommand",
+  chatCompression: "model.chatCompression",
+  checkpointing: "general.checkpointing",
+  coreTools: "tools.core",
+  contextFileName: "context.fileName",
+  customThemes: "ui.customThemes",
+  customWittyPhrases: "ui.customWittyPhrases",
+  debugKeystrokeLogging: "general.debugKeystrokeLogging",
+  dnsResolutionOrder: "advanced.dnsResolutionOrder",
+  enforcedAuthType: "security.auth.enforcedType",
+  excludeTools: "tools.exclude",
+  excludeMCPServers: "mcp.excluded",
+  excludedProjectEnvVars: "advanced.excludedEnvVars",
+  extensions: "extensions",
+  fileFiltering: "context.fileFiltering",
+  folderTrustFeature: "security.folderTrust.featureEnabled",
+  folderTrust: "security.folderTrust.enabled",
+  hasSeenIdeIntegrationNudge: "ide.hasSeenNudge",
+  hideWindowTitle: "ui.hideWindowTitle",
+  showStatusInTitle: "ui.showStatusInTitle",
+  hideTips: "ui.hideTips",
+  showLineNumbers: "ui.showLineNumbers",
+  showCitations: "ui.showCitations",
+  ideMode: "ide.enabled",
+  includeDirectories: "context.includeDirectories",
+  loadMemoryFromIncludeDirectories: "context.loadFromIncludeDirectories",
+  maxSessionTurns: "model.maxSessionTurns",
+  mcpServers: "mcpServers",
+  mcpServerCommand: "mcp.serverCommand",
+  memoryImportFormat: "context.importFormat",
+  model: "model.name",
+  preferredEditor: "general.preferredEditor",
+  sandbox: "tools.sandbox",
+  selectedAuthType: "security.auth.selectedType",
+  shouldUseNodePtyShell: "tools.shell.enableInteractiveShell",
+  shellPager: "tools.shell.pager",
+  shellShowColor: "tools.shell.showColor",
+  skipNextSpeakerCheck: "model.skipNextSpeakerCheck",
+  telemetry: "telemetry",
+  theme: "ui.theme",
+  toolDiscoveryCommand: "tools.discoveryCommand",
+  toolCallCommand: "tools.callCommand",
+  usageStatisticsEnabled: "privacy.usageStatisticsEnabled",
+  useExternalAuth: "security.auth.useExternal",
+  useRipgrep: "tools.useRipgrep",
+  vimMode: "general.vimMode",
+  enableWelcomeBack: "ui.enableWelcomeBack",
+  approvalMode: "tools.approvalMode",
+  sessionTokenLimit: "model.sessionTokenLimit",
+  contentGenerator: "model.generationConfig",
+  skipLoopDetection: "model.skipLoopDetection",
+  skipStartupContext: "model.skipStartupContext",
+  enableOpenAILogging: "model.enableOpenAILogging",
+  tavilyApiKey: "advanced.tavilyApiKey",
 };
 
 /**
@@ -78,101 +78,98 @@ export const V1_TO_V2_MIGRATION_MAP: Record<string, string> = {
  * If one of these keys already has object value, treat it as latest-format data.
  */
 export const V2_CONTAINER_KEYS = new Set([
-  'ui',
-  'tools',
-  'mcp',
-  'advanced',
-  'model',
-  'general',
-  'context',
-  'security',
-  'ide',
-  'privacy',
-  'telemetry',
-  'extensions',
+  "ui",
+  "tools",
+  "mcp",
+  "advanced",
+  "model",
+  "general",
+  "context",
+  "security",
+  "ide",
+  "privacy",
+  "telemetry",
+  "extensions",
 ]);
 
 /**
  * Legacy disable* keys that remain in disable* form for V2.
  */
 export const V1_TO_V2_PRESERVE_DISABLE_MAP: Record<string, string> = {
-  disableAutoUpdate: 'general.disableAutoUpdate',
-  disableUpdateNag: 'general.disableUpdateNag',
-  disableLoadingPhrases: 'ui.accessibility.disableLoadingPhrases',
-  disableFuzzySearch: 'context.fileFiltering.disableFuzzySearch',
-  disableCacheControl: 'model.generationConfig.disableCacheControl',
+  disableAutoUpdate: "general.disableAutoUpdate",
+  disableUpdateNag: "general.disableUpdateNag",
+  disableLoadingPhrases: "ui.accessibility.disableLoadingPhrases",
+  disableFuzzySearch: "context.fileFiltering.disableFuzzySearch",
+  disableCacheControl: "model.generationConfig.disableCacheControl",
 };
 
-export const CONSOLIDATED_DISABLE_KEYS = new Set([
-  'disableAutoUpdate',
-  'disableUpdateNag',
-]);
+export const CONSOLIDATED_DISABLE_KEYS = new Set(["disableAutoUpdate", "disableUpdateNag"]);
 
 /**
  * Keys that indicate V1-like top-level structure when holding primitive values.
  */
 export const V1_INDICATOR_KEYS = [
   // From V1_TO_V2_MIGRATION_MAP - keys that map to different paths in V2
-  'theme',
-  'model',
-  'autoAccept',
-  'hideTips',
-  'vimMode',
-  'checkpointing',
-  'accessibility',
-  'allowedTools',
-  'allowMCPServers',
-  'autoConfigureMaxOldSpaceSize',
-  'bugCommand',
-  'chatCompression',
-  'coreTools',
-  'contextFileName',
-  'customThemes',
-  'customWittyPhrases',
-  'debugKeystrokeLogging',
-  'dnsResolutionOrder',
-  'enforcedAuthType',
-  'excludeTools',
-  'excludeMCPServers',
-  'excludedProjectEnvVars',
-  'fileFiltering',
-  'folderTrustFeature',
-  'folderTrust',
-  'hasSeenIdeIntegrationNudge',
-  'hideWindowTitle',
-  'showStatusInTitle',
-  'showLineNumbers',
-  'showCitations',
-  'ideMode',
-  'includeDirectories',
-  'loadMemoryFromIncludeDirectories',
-  'maxSessionTurns',
-  'mcpServerCommand',
-  'memoryImportFormat',
-  'preferredEditor',
-  'sandbox',
-  'selectedAuthType',
-  'shouldUseNodePtyShell',
-  'shellPager',
-  'shellShowColor',
-  'skipNextSpeakerCheck',
-  'toolDiscoveryCommand',
-  'toolCallCommand',
-  'usageStatisticsEnabled',
-  'useExternalAuth',
-  'useRipgrep',
-  'enableWelcomeBack',
-  'approvalMode',
-  'sessionTokenLimit',
-  'contentGenerator',
-  'skipLoopDetection',
-  'skipStartupContext',
-  'enableOpenAILogging',
-  'tavilyApiKey',
+  "theme",
+  "model",
+  "autoAccept",
+  "hideTips",
+  "vimMode",
+  "checkpointing",
+  "accessibility",
+  "allowedTools",
+  "allowMCPServers",
+  "autoConfigureMaxOldSpaceSize",
+  "bugCommand",
+  "chatCompression",
+  "coreTools",
+  "contextFileName",
+  "customThemes",
+  "customWittyPhrases",
+  "debugKeystrokeLogging",
+  "dnsResolutionOrder",
+  "enforcedAuthType",
+  "excludeTools",
+  "excludeMCPServers",
+  "excludedProjectEnvVars",
+  "fileFiltering",
+  "folderTrustFeature",
+  "folderTrust",
+  "hasSeenIdeIntegrationNudge",
+  "hideWindowTitle",
+  "showStatusInTitle",
+  "showLineNumbers",
+  "showCitations",
+  "ideMode",
+  "includeDirectories",
+  "loadMemoryFromIncludeDirectories",
+  "maxSessionTurns",
+  "mcpServerCommand",
+  "memoryImportFormat",
+  "preferredEditor",
+  "sandbox",
+  "selectedAuthType",
+  "shouldUseNodePtyShell",
+  "shellPager",
+  "shellShowColor",
+  "skipNextSpeakerCheck",
+  "toolDiscoveryCommand",
+  "toolCallCommand",
+  "usageStatisticsEnabled",
+  "useExternalAuth",
+  "useRipgrep",
+  "enableWelcomeBack",
+  "approvalMode",
+  "sessionTokenLimit",
+  "contentGenerator",
+  "skipLoopDetection",
+  "skipStartupContext",
+  "enableOpenAILogging",
+  "tavilyApiKey",
   // From V1_TO_V2_PRESERVE_DISABLE_MAP - disable* keys that get nested in V2
-  'disableAutoUpdate',
-  'disableUpdateNag',
-  'disableLoadingPhrases',
-  'disableFuzzySearch',
-  'disableCacheControl',
+  "disableAutoUpdate",
+  "disableUpdateNag",
+  "disableLoadingPhrases",
+  "disableFuzzySearch",
+  "disableCacheControl",
 ];
diff --git a/apps/airiscode-cli/src/config/migration/versions/v1-to-v2.ts b/apps/airiscode-cli/src/config/migration/versions/v1-to-v2.ts
index 4dceffe44..fc5f5c518 100644
--- a/apps/airiscode-cli/src/config/migration/versions/v1-to-v2.ts
+++ b/apps/airiscode-cli/src/config/migration/versions/v1-to-v2.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SettingsMigration } from '../types.js';
+import { setNestedPropertySafe } from "../../../utils/settingsUtils.js";
+import type { SettingsMigration } from "../types.js";
 import {
   CONSOLIDATED_DISABLE_KEYS,
   V1_INDICATOR_KEYS,
   V1_TO_V2_MIGRATION_MAP,
   V1_TO_V2_PRESERVE_DISABLE_MAP,
   V2_CONTAINER_KEYS,
-} from './v1-to-v2-shared.js';
-import { setNestedPropertySafe } from '../../../utils/settingsUtils.js';
+} from "./v1-to-v2-shared.js";
 
 /**
  * Heuristic indicators for deciding whether an object is "V1-like".
@@ -64,15 +64,15 @@ export class V1ToV2Migration implements SettingsMigration {
    *   are ignored while legacy-shaped indicators can still trigger migration.
    */
   shouldMigrate(settings: unknown): boolean {
-    if (typeof settings !== 'object' || settings === null) {
+    if (typeof settings !== "object" || settings === null) {
       return false;
     }
 
     const s = settings as Record<string, unknown>;
 
     // If $version exists and is a number >= 2, it's not V1
-    const version = s['$version'];
-    if (typeof version === 'number' && version >= 2) {
+    const version = s["$version"];
+    if (typeof version === "number" && version >= 2) {
       return false;
     }
 
@@ -87,11 +87,7 @@ export class V1ToV2Migration implements SettingsMigration {
       const value = s[key];
       // Skip keys with object values - they may already be in V2 nested format
       // But don't let them block migration of other keys
-      if (
-        typeof value === 'object' &&
-        value !== null &&
-        !Array.isArray(value)
-      ) {
+      if (typeof value === "object" && value !== null && !Array.isArray(value)) {
         // This key appears to be in V2 format, skip it but continue
         // checking other keys
         return false;
@@ -121,12 +117,9 @@ export class V1ToV2Migration implements SettingsMigration {
    *
    * The method is pure with respect to input mutation.
    */
-  migrate(
-    settings: unknown,
-    _scope: string,
-  ): { settings: unknown; warnings: string[] } {
-    if (typeof settings !== 'object' || settings === null) {
-      throw new Error('Settings must be an object');
+  migrate(settings: unknown, _scope: string): { settings: unknown; warnings: string[] } {
+    if (typeof settings !== "object" || settings === null) {
+      throw new Error("Settings must be an object");
     }
 
     const source = settings as Record<string, unknown>;
@@ -144,7 +137,7 @@ export class V1ToV2Migration implements SettingsMigration {
         // to prevent double-nesting (e.g., model.name.name).
         if (
           V2_CONTAINER_KEYS.has(v1Key) &&
-          typeof value === 'object' &&
+          typeof value === "object" &&
           value !== null &&
           !Array.isArray(value)
         ) {
@@ -157,18 +150,14 @@ export class V1ToV2Migration implements SettingsMigration {
         // If value is already an object and the path matches the key,
         // it might be a partial V2 structure. Merge its contents.
         if (
-          typeof value === 'object' &&
+          typeof value === "object" &&
           value !== null &&
           !Array.isArray(value) &&
-          v2Path.startsWith(v1Key + '.')
+          v2Path.startsWith(v1Key + ".")
         ) {
           // Merge nested properties from this partial V2 structure
           for (const [nestedKey, nestedValue] of Object.entries(value)) {
-            setNestedPropertySafe(
-              result,
-              `${v2Path}.${nestedKey}`,
-              nestedValue,
-            );
+            setNestedPropertySafe(result, `${v2Path}.${nestedKey}`, nestedValue);
           }
         } else {
           setNestedPropertySafe(result, v2Path, value);
@@ -178,16 +167,14 @@ export class V1ToV2Migration implements SettingsMigration {
     }
 
     // Step 2: Map V1 disable* keys to V2 nested disable* paths
-    for (const [v1Key, v2Path] of Object.entries(
-      V1_TO_V2_PRESERVE_DISABLE_MAP,
-    )) {
+    for (const [v1Key, v2Path] of Object.entries(V1_TO_V2_PRESERVE_DISABLE_MAP)) {
       if (v1Key in source) {
         const value = source[v1Key];
         if (CONSOLIDATED_DISABLE_KEYS.has(v1Key)) {
           // Preserve stable behavior: consolidated keys use presence semantics.
           // Only literal true remains true; all other present values become false.
           setNestedPropertySafe(result, v2Path, value === true);
-        } else if (typeof value === 'boolean') {
+        } else if (typeof value === "boolean") {
           // Non-consolidated disable* keys only migrate when explicitly boolean.
           setNestedPropertySafe(result, v2Path, value);
         }
@@ -196,9 +183,9 @@ export class V1ToV2Migration implements SettingsMigration {
     }
 
     // Step 3: Preserve mcpServers at the top level
-    if ('mcpServers' in source) {
-      result['mcpServers'] = source['mcpServers'];
-      processedKeys.add('mcpServers');
+    if ("mcpServers" in source) {
+      result["mcpServers"] = source["mcpServers"];
+      processedKeys.add("mcpServers");
     }
 
     // Step 4: Carry over any unrecognized keys (including unknown nested objects)
@@ -207,40 +194,33 @@ export class V1ToV2Migration implements SettingsMigration {
     for (const key of Object.keys(source)) {
       if (!processedKeys.has(key)) {
         // Check if this key is a parent of any already-migrated path
-        const isParentOfMigratedPath = Array.from(processedKeys).some(
-          (processedKey) => {
-            // Get the v2 path for this processed key
-            const v2Path =
-              V1_TO_V2_MIGRATION_MAP[processedKey] ||
-              V1_TO_V2_PRESERVE_DISABLE_MAP[processedKey];
-            if (!v2Path) return false;
-            // Check if the v2 path starts with this key + '.'
-            return v2Path.startsWith(key + '.');
-          },
-        );
+        const isParentOfMigratedPath = Array.from(processedKeys).some((processedKey) => {
+          // Get the v2 path for this processed key
+          const v2Path =
+            V1_TO_V2_MIGRATION_MAP[processedKey] || V1_TO_V2_PRESERVE_DISABLE_MAP[processedKey];
+          if (!v2Path) return false;
+          // Check if the v2 path starts with this key + '.'
+          return v2Path.startsWith(key + ".");
+        });
 
         if (isParentOfMigratedPath) {
           // This key is a parent of an already-migrated path
           // Merge its unprocessed children instead of overwriting
           const existingValue = source[key];
           if (
-            typeof existingValue === 'object' &&
+            typeof existingValue === "object" &&
             existingValue !== null &&
             !Array.isArray(existingValue)
           ) {
-            for (const [nestedKey, nestedValue] of Object.entries(
-              existingValue,
-            )) {
+            for (const [nestedKey, nestedValue] of Object.entries(existingValue)) {
               // Only merge if this nested key wasn't already processed
               const fullNestedPath = `${key}.${nestedKey}`;
-              const wasProcessed = Array.from(processedKeys).some(
-                (processedKey) => {
-                  const v2Path =
-                    V1_TO_V2_MIGRATION_MAP[processedKey] ||
-                    V1_TO_V2_PRESERVE_DISABLE_MAP[processedKey];
-                  return v2Path === fullNestedPath;
-                },
-              );
+              const wasProcessed = Array.from(processedKeys).some((processedKey) => {
+                const v2Path =
+                  V1_TO_V2_MIGRATION_MAP[processedKey] ||
+                  V1_TO_V2_PRESERVE_DISABLE_MAP[processedKey];
+                return v2Path === fullNestedPath;
+              });
               if (!wasProcessed) {
                 setNestedPropertySafe(result, fullNestedPath, nestedValue);
               }
@@ -257,7 +237,7 @@ export class V1ToV2Migration implements SettingsMigration {
     }
 
     // Step 5: Set version to 2
-    result['$version'] = 2;
+    result["$version"] = 2;
 
     return { settings: result, warnings };
   }
diff --git a/apps/airiscode-cli/src/config/migration/versions/v2-to-v3.ts b/apps/airiscode-cli/src/config/migration/versions/v2-to-v3.ts
index 6c0133443..f75810306 100644
--- a/apps/airiscode-cli/src/config/migration/versions/v2-to-v3.ts
+++ b/apps/airiscode-cli/src/config/migration/versions/v2-to-v3.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SettingsMigration } from '../types.js';
 import {
   deleteNestedPropertySafe,
   getNestedProperty,
   setNestedPropertySafe,
-} from '../../../utils/settingsUtils.js';
+} from "../../../utils/settingsUtils.js";
+import type { SettingsMigration } from "../types.js";
 
 /**
  * Path mapping for boolean polarity migration (V2 disable* -> V3 enable*).
@@ -24,14 +24,11 @@ import {
  * - Invalid values do not create enable* keys and produce warnings.
  */
 const V2_TO_V3_BOOLEAN_MAP: Record<string, string> = {
-  'general.disableAutoUpdate': 'general.enableAutoUpdate',
-  'general.disableUpdateNag': 'general.enableAutoUpdate',
-  'ui.accessibility.disableLoadingPhrases':
-    'ui.accessibility.enableLoadingPhrases',
-  'context.fileFiltering.disableFuzzySearch':
-    'context.fileFiltering.enableFuzzySearch',
-  'model.generationConfig.disableCacheControl':
-    'model.generationConfig.enableCacheControl',
+  "general.disableAutoUpdate": "general.enableAutoUpdate",
+  "general.disableUpdateNag": "general.enableAutoUpdate",
+  "ui.accessibility.disableLoadingPhrases": "ui.accessibility.enableLoadingPhrases",
+  "context.fileFiltering.disableFuzzySearch": "context.fileFiltering.enableFuzzySearch",
+  "model.generationConfig.disableCacheControl": "model.generationConfig.enableCacheControl",
 };
 
 /**
@@ -45,10 +42,7 @@ const V2_TO_V3_BOOLEAN_MAP: Record<string, string> = {
  * - Invalid present values are removed and warned, and do not contribute to target calculation.
  */
 const CONSOLIDATED_V2_PATHS: Record<string, string[]> = {
-  'general.enableAutoUpdate': [
-    'general.disableAutoUpdate',
-    'general.disableUpdateNag',
-  ],
+  "general.enableAutoUpdate": ["general.disableAutoUpdate", "general.disableUpdateNag"],
 };
 
 /**
@@ -67,15 +61,15 @@ function normalizeDisableValue(value: unknown): {
   if (value === undefined) {
     return { isPresent: false, isValid: false };
   }
-  if (typeof value === 'boolean') {
+  if (typeof value === "boolean") {
     return { isPresent: true, isValid: true, booleanValue: value };
   }
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     const normalized = value.trim().toLowerCase();
-    if (normalized === 'true') {
+    if (normalized === "true") {
       return { isPresent: true, isValid: true, booleanValue: true };
     }
-    if (normalized === 'false') {
+    if (normalized === "false") {
       return { isPresent: true, isValid: true, booleanValue: false };
     }
   }
@@ -108,14 +102,14 @@ export class V2ToV3Migration implements SettingsMigration {
    * metadata still advances to 3.
    */
   shouldMigrate(settings: unknown): boolean {
-    if (typeof settings !== 'object' || settings === null) {
+    if (typeof settings !== "object" || settings === null) {
       return false;
     }
 
     const s = settings as Record<string, unknown>;
 
     // Migrate if $version is 2
-    return s['$version'] === 2;
+    return s["$version"] === 2;
   }
 
   /**
@@ -141,12 +135,9 @@ export class V2ToV3Migration implements SettingsMigration {
    * - Valid migration and invalid cleanup are deterministic.
    * - Deprecated disable* keys are not retained after migration.
    */
-  migrate(
-    settings: unknown,
-    scope: string,
-  ): { settings: unknown; warnings: string[] } {
-    if (typeof settings !== 'object' || settings === null) {
-      throw new Error('Settings must be an object');
+  migrate(settings: unknown, scope: string): { settings: unknown; warnings: string[] } {
+    if (typeof settings !== "object" || settings === null) {
+      throw new Error("Settings must be an object");
     }
 
     // Deep clone to avoid mutating input
@@ -212,7 +203,7 @@ export class V2ToV3Migration implements SettingsMigration {
     }
 
     // Step 3: Always update version to 3
-    result['$version'] = 3;
+    result["$version"] = 3;
 
     return { settings: result, warnings };
   }
diff --git a/apps/airiscode-cli/src/config/modelProvidersScope.ts b/apps/airiscode-cli/src/config/modelProvidersScope.ts
index 136141103..2d3ee6af0 100644
--- a/apps/airiscode-cli/src/config/modelProvidersScope.ts
+++ b/apps/airiscode-cli/src/config/modelProvidersScope.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SettingScope, type LoadedSettings } from './settings.js';
+import { type LoadedSettings, SettingScope } from "./settings.js";
 
 function hasOwnModelProviders(settingsObj: unknown): boolean {
-  if (!settingsObj || typeof settingsObj !== 'object') {
+  if (!settingsObj || typeof settingsObj !== "object") {
     return false;
   }
   const obj = settingsObj as Record<string, unknown>;
   // Treat an explicitly configured empty object (modelProviders: {}) as "owned"
   // by this scope, which is important when mergeStrategy is REPLACE.
-  return Object.prototype.hasOwnProperty.call(obj, 'modelProviders');
+  return Object.hasOwn(obj, "modelProviders");
 }
 
 /**
@@ -22,9 +22,7 @@ function hasOwnModelProviders(settingsObj: unknown): boolean {
  *
  * Note: Workspace scope is only considered when the workspace is trusted.
  */
-export function getModelProvidersOwnerScope(
-  settings: LoadedSettings,
-): SettingScope | undefined {
+export function getModelProvidersOwnerScope(settings: LoadedSettings): SettingScope | undefined {
   if (settings.isTrusted && hasOwnModelProviders(settings.workspace.settings)) {
     return SettingScope.Workspace;
   }
@@ -41,8 +39,6 @@ export function getModelProvidersOwnerScope(
  * Prefer persisting back to the scope that contains the effective modelProviders
  * config, otherwise fall back to the legacy trust-based heuristic.
  */
-export function getPersistScopeForModelSelection(
-  settings: LoadedSettings,
-): SettingScope {
+export function getPersistScopeForModelSelection(settings: LoadedSettings): SettingScope {
   return getModelProvidersOwnerScope(settings) ?? SettingScope.User;
 }
diff --git a/apps/airiscode-cli/src/config/sandboxConfig.ts b/apps/airiscode-cli/src/config/sandboxConfig.ts
index bc5248a41..eadef8b61 100644
--- a/apps/airiscode-cli/src/config/sandboxConfig.ts
+++ b/apps/airiscode-cli/src/config/sandboxConfig.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SandboxConfig } from '@airiscode/core';
-import { FatalSandboxError } from '@airiscode/core';
-import commandExists from 'command-exists';
-import * as os from 'node:os';
-import { getPackageJson } from '../utils/package.js';
-import type { Settings } from './settings.js';
+import * as os from "node:os";
+import type { SandboxConfig } from "@airiscode/core";
+import { FatalSandboxError } from "@airiscode/core";
+import commandExists from "command-exists";
+import { getPackageJson } from "../utils/package.js";
+import type { Settings } from "./settings.js";
 
 // This is a stripped-down version of the CliArgs interface from config.ts
 // to avoid circular dependencies.
@@ -18,74 +18,64 @@ interface SandboxCliArgs {
   sandboxImage?: string;
 }
 
-const VALID_SANDBOX_COMMANDS: ReadonlyArray<SandboxConfig['command']> = [
-  'docker',
-  'podman',
-  'sandbox-exec',
+const VALID_SANDBOX_COMMANDS: ReadonlyArray<SandboxConfig["command"]> = [
+  "docker",
+  "podman",
+  "sandbox-exec",
 ];
 
-function isSandboxCommand(value: string): value is SandboxConfig['command'] {
+function isSandboxCommand(value: string): value is SandboxConfig["command"] {
   return (VALID_SANDBOX_COMMANDS as readonly string[]).includes(value);
 }
 
-function getSandboxCommand(
-  sandbox?: boolean | string,
-): SandboxConfig['command'] | '' {
+function getSandboxCommand(sandbox?: boolean | string): SandboxConfig["command"] | "" {
   // If the SANDBOX env var is set, we're already inside the sandbox.
-  if (process.env['SANDBOX']) {
-    return '';
+  if (process.env["SANDBOX"]) {
+    return "";
   }
 
   // note environment variable takes precedence over argument (from command line or settings)
-  const environmentConfiguredSandbox =
-    process.env['AIRISCODE_SANDBOX']?.toLowerCase().trim() ?? '';
-  sandbox =
-    environmentConfiguredSandbox?.length > 0
-      ? environmentConfiguredSandbox
-      : sandbox;
-  if (sandbox === '1' || sandbox === 'true') sandbox = true;
-  else if (sandbox === '0' || sandbox === 'false' || !sandbox) sandbox = false;
+  const environmentConfiguredSandbox = process.env["AIRISCODE_SANDBOX"]?.toLowerCase().trim() ?? "";
+  sandbox = environmentConfiguredSandbox?.length > 0 ? environmentConfiguredSandbox : sandbox;
+  if (sandbox === "1" || sandbox === "true") sandbox = true;
+  else if (sandbox === "0" || sandbox === "false" || !sandbox) sandbox = false;
 
   if (sandbox === false) {
-    return '';
+    return "";
   }
 
-  if (typeof sandbox === 'string' && sandbox) {
+  if (typeof sandbox === "string" && sandbox) {
     if (!isSandboxCommand(sandbox)) {
       throw new FatalSandboxError(
-        `Invalid sandbox command '${sandbox}'. Must be one of ${VALID_SANDBOX_COMMANDS.join(
-          ', ',
-        )}`,
+        `Invalid sandbox command '${sandbox}'. Must be one of ${VALID_SANDBOX_COMMANDS.join(", ")}`,
       );
     }
     // confirm that specified command exists
     if (commandExists.sync(sandbox)) {
       return sandbox;
     }
-    throw new FatalSandboxError(
-      `Missing sandbox command '${sandbox}' (from AIRISCODE_SANDBOX)`,
-    );
+    throw new FatalSandboxError(`Missing sandbox command '${sandbox}' (from AIRISCODE_SANDBOX)`);
   }
 
   // look for seatbelt, docker, or podman, in that order
   // for container-based sandboxing, require sandbox to be enabled explicitly
-  if (os.platform() === 'darwin' && commandExists.sync('sandbox-exec')) {
-    return 'sandbox-exec';
-  } else if (commandExists.sync('docker') && sandbox === true) {
-    return 'docker';
-  } else if (commandExists.sync('podman') && sandbox === true) {
-    return 'podman';
+  if (os.platform() === "darwin" && commandExists.sync("sandbox-exec")) {
+    return "sandbox-exec";
+  } else if (commandExists.sync("docker") && sandbox === true) {
+    return "docker";
+  } else if (commandExists.sync("podman") && sandbox === true) {
+    return "podman";
   }
 
   // throw an error if user requested sandbox but no command was found
   if (sandbox === true) {
     throw new FatalSandboxError(
-      'AIRISCODE_SANDBOX is true but failed to determine command for sandbox; ' +
-        'install docker or podman or specify command in AIRISCODE_SANDBOX',
+      "AIRISCODE_SANDBOX is true but failed to determine command for sandbox; " +
+        "install docker or podman or specify command in AIRISCODE_SANDBOX",
     );
   }
 
-  return '';
+  return "";
 }
 
 export async function loadSandboxConfig(
@@ -98,7 +88,7 @@ export async function loadSandboxConfig(
   const packageJson = await getPackageJson();
   const image =
     argv.sandboxImage ??
-    process.env['AIRISCODE_SANDBOX_IMAGE'] ??
+    process.env["AIRISCODE_SANDBOX_IMAGE"] ??
     packageJson?.config?.sandboxImageUri;
 
   return command && image ? { command, image } : undefined;
diff --git a/apps/airiscode-cli/src/config/settings.ts b/apps/airiscode-cli/src/config/settings.ts
index 06f33f480..364e69722 100644
--- a/apps/airiscode-cli/src/config/settings.ts
+++ b/apps/airiscode-cli/src/config/settings.ts
@@ -4,42 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { homedir, platform } from 'node:os';
-import * as dotenv from 'dotenv';
-import process from 'node:process';
+import * as fs from "node:fs";
+import { homedir, platform } from "node:os";
+import * as path from "node:path";
+import process from "node:process";
 import {
-  FatalConfigError,
   AIRISCODE_DIR,
+  createDebugLogger,
+  FatalConfigError,
   getErrorMessage,
   Storage,
-  createDebugLogger,
-} from '@airiscode/core';
-import stripJsonComments from 'strip-json-comments';
-import { DefaultLight } from '../ui/themes/default-light.js';
-import { DefaultDark } from '../ui/themes/default.js';
-import { isWorkspaceTrusted } from './trustedFolders.js';
+} from "@airiscode/core";
+import * as dotenv from "dotenv";
+import stripJsonComments from "strip-json-comments";
+import { DefaultDark } from "../ui/themes/default.js";
+import { DefaultLight } from "../ui/themes/default-light.js";
+import { updateSettingsFilePreservingFormat } from "../utils/commentJson.js";
+import { customDeepMerge } from "../utils/deepMerge.js";
+import { resolveEnvVarsInObject } from "../utils/envVarResolver.js";
+import { setNestedPropertySafe } from "../utils/settingsUtils.js";
+import { writeWithBackupSync } from "../utils/writeWithBackup.js";
+import { needsMigration, runMigrations } from "./migration/index.js";
+import { V1_TO_V2_MIGRATION_MAP, V2_CONTAINER_KEYS } from "./migration/versions/v1-to-v2-shared.js";
 import {
-  type Settings,
+  getSettingsSchema,
   type MemoryImportFormat,
   type MergeStrategy,
-  type SettingsSchema,
   type SettingDefinition,
-  getSettingsSchema,
-} from './settingsSchema.js';
-import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
-import { setNestedPropertySafe } from '../utils/settingsUtils.js';
-import { customDeepMerge } from '../utils/deepMerge.js';
-import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js';
-import { runMigrations, needsMigration } from './migration/index.js';
-import {
-  V1_TO_V2_MIGRATION_MAP,
-  V2_CONTAINER_KEYS,
-} from './migration/versions/v1-to-v2-shared.js';
-import { writeWithBackupSync } from '../utils/writeWithBackup.js';
+  type Settings,
+  type SettingsSchema,
+} from "./settingsSchema.js";
+import { isWorkspaceTrusted } from "./trustedFolders.js";
 
-const debugLogger = createDebugLogger('SETTINGS');
+const debugLogger = createDebugLogger("SETTINGS");
 
 function getMergeStrategyForPath(path: string[]): MergeStrategy | undefined {
   let current: SettingDefinition | undefined = undefined;
@@ -56,16 +53,16 @@ function getMergeStrategyForPath(path: string[]): MergeStrategy | undefined {
   return current?.mergeStrategy;
 }
 
-export type { Settings, MemoryImportFormat };
+export type { MemoryImportFormat, Settings };
 
-export const SETTINGS_DIRECTORY_NAME = '.airiscode';
+export const SETTINGS_DIRECTORY_NAME = ".airiscode";
 export const USER_SETTINGS_PATH = Storage.getGlobalSettingsPath();
 export const USER_SETTINGS_DIR = path.dirname(USER_SETTINGS_PATH);
-export const DEFAULT_EXCLUDED_ENV_VARS = ['DEBUG', 'DEBUG_MODE'];
+export const DEFAULT_EXCLUDED_ENV_VARS = ["DEBUG", "DEBUG_MODE"];
 
 // Settings version to track migration state
 export const SETTINGS_VERSION = 3;
-export const SETTINGS_VERSION_KEY = '$version';
+export const SETTINGS_VERSION_KEY = "$version";
 
 /**
  * Migrate legacy tool permission settings (tools.core / tools.allowed / tools.exclude)
@@ -82,39 +79,37 @@ export const SETTINGS_VERSION_KEY = '$version';
 export function migrateLegacyPermissions(
   settings: Record<string, unknown>,
 ): Record<string, unknown> | null {
-  const tools = settings['tools'] as Record<string, unknown> | undefined;
+  const tools = settings["tools"] as Record<string, unknown> | undefined;
   if (!tools) return null;
 
   const hasLegacy =
-    Array.isArray(tools['core']) ||
-    Array.isArray(tools['allowed']) ||
-    Array.isArray(tools['exclude']);
+    Array.isArray(tools["core"]) ||
+    Array.isArray(tools["allowed"]) ||
+    Array.isArray(tools["exclude"]);
 
   if (!hasLegacy) return null;
 
   const result = structuredClone(settings) as Record<string, unknown>;
-  const resultTools = result['tools'] as Record<string, unknown>;
-  const permissions = (result['permissions'] as Record<string, unknown>) ?? {};
-  result['permissions'] = permissions;
+  const resultTools = result["tools"] as Record<string, unknown>;
+  const permissions = (result["permissions"] as Record<string, unknown>) ?? {};
+  result["permissions"] = permissions;
 
   const mergeInto = (key: string, items: string[]) => {
-    const existing = Array.isArray(permissions[key])
-      ? (permissions[key] as string[])
-      : [];
+    const existing = Array.isArray(permissions[key]) ? (permissions[key] as string[]) : [];
     const merged = Array.from(new Set([...existing, ...items]));
     permissions[key] = merged;
   };
 
   // tools.allowed → permissions.allow
-  if (Array.isArray(resultTools['allowed'])) {
-    mergeInto('allow', resultTools['allowed'] as string[]);
-    delete resultTools['allowed'];
+  if (Array.isArray(resultTools["allowed"])) {
+    mergeInto("allow", resultTools["allowed"] as string[]);
+    delete resultTools["allowed"];
   }
 
   // tools.exclude → permissions.deny
-  if (Array.isArray(resultTools['exclude'])) {
-    mergeInto('deny', resultTools['exclude'] as string[]);
-    delete resultTools['exclude'];
+  if (Array.isArray(resultTools["exclude"])) {
+    mergeInto("deny", resultTools["exclude"] as string[]);
+    delete resultTools["exclude"];
   }
 
   // tools.core → permissions.allow (explicit enables)
@@ -127,44 +122,41 @@ export function migrateLegacyPermissions(
   // Instead we just migrate to allow (auto-approve) and let the coreTools
   // semantics continue to work through the Config.getCoreTools() path until
   // the old API is fully removed.
-  if (Array.isArray(resultTools['core'])) {
-    mergeInto('allow', resultTools['core'] as string[]);
-    delete resultTools['core'];
+  if (Array.isArray(resultTools["core"])) {
+    mergeInto("allow", resultTools["core"] as string[]);
+    delete resultTools["core"];
   }
 
   return result;
 }
 
 export function getSystemSettingsPath(): string {
-  if (process.env['AIRISCODE_SYSTEM_SETTINGS_PATH']) {
-    return process.env['AIRISCODE_SYSTEM_SETTINGS_PATH'];
+  if (process.env["AIRISCODE_SYSTEM_SETTINGS_PATH"]) {
+    return process.env["AIRISCODE_SYSTEM_SETTINGS_PATH"];
   }
-  if (platform() === 'darwin') {
-    return '/Library/Application Support/AirisCode/settings.json';
-  } else if (platform() === 'win32') {
-    return 'C:\\ProgramData\\airiscode\\settings.json';
+  if (platform() === "darwin") {
+    return "/Library/Application Support/AirisCode/settings.json";
+  } else if (platform() === "win32") {
+    return "C:\\ProgramData\\airiscode\\settings.json";
   } else {
-    return '/etc/airiscode/settings.json';
+    return "/etc/airiscode/settings.json";
   }
 }
 
 export function getSystemDefaultsPath(): string {
-  if (process.env['AIRISCODE_SYSTEM_DEFAULTS_PATH']) {
-    return process.env['AIRISCODE_SYSTEM_DEFAULTS_PATH'];
+  if (process.env["AIRISCODE_SYSTEM_DEFAULTS_PATH"]) {
+    return process.env["AIRISCODE_SYSTEM_DEFAULTS_PATH"];
   }
-  return path.join(
-    path.dirname(getSystemSettingsPath()),
-    'system-defaults.json',
-  );
+  return path.join(path.dirname(getSystemSettingsPath()), "system-defaults.json");
 }
 
-export type { DnsResolutionOrder } from './settingsSchema.js';
+export type { DnsResolutionOrder } from "./settingsSchema.js";
 
 export enum SettingScope {
-  User = 'User',
-  Workspace = 'Workspace',
-  System = 'System',
-  SystemDefaults = 'SystemDefaults',
+  User = "User",
+  Workspace = "Workspace",
+  System = "System",
+  SystemDefaults = "SystemDefaults",
 }
 
 export interface CheckpointingSettings {
@@ -193,7 +185,7 @@ function getSettingsFileKeyWarnings(
   settingsFilePath: string,
 ): string[] {
   const version = settings[SETTINGS_VERSION_KEY];
-  if (typeof version !== 'number' || version < SETTINGS_VERSION) {
+  if (typeof version !== "number" || version < SETTINGS_VERSION) {
     return [];
   }
 
@@ -215,7 +207,7 @@ function getSettingsFileKeyWarnings(
     // it's likely already in V2 format. Don't warn.
     if (
       V2_CONTAINER_KEYS.has(oldKey) &&
-      typeof oldValue === 'object' &&
+      typeof oldValue === "object" &&
       oldValue !== null &&
       !Array.isArray(oldValue)
     ) {
@@ -241,9 +233,7 @@ function getSettingsFileKeyWarnings(
       continue;
     }
 
-    debugLogger.warn(
-      `Unknown setting '${key}' will be ignored in ${settingsFilePath}.`,
-    );
+    debugLogger.warn(`Unknown setting '${key}' will be ignored in ${settingsFilePath}.`);
   }
 
   return warnings;
@@ -270,15 +260,9 @@ export function getSettingsWarnings(loadedSettings: LoadedSettings): string[] {
       continue;
       // File not present / not loaded.
     }
-    const settingsObject = settingsFile.originalSettings as unknown as Record<
-      string,
-      unknown
-    >;
-
-    for (const warning of getSettingsFileKeyWarnings(
-      settingsObject,
-      settingsFile.path,
-    )) {
+    const settingsObject = settingsFile.originalSettings as unknown as Record<string, unknown>;
+
+    for (const warning of getSettingsFileKeyWarnings(settingsObject, settingsFile.path)) {
       warningSet.add(warning);
     }
   }
@@ -385,10 +369,10 @@ export class LoadedSettings {
  */
 export function createMinimalSettings(): LoadedSettings {
   const emptySettingsFile: SettingsFile = {
-    path: '',
+    path: "",
     settings: {},
     originalSettings: {},
-    rawJson: '{}',
+    rawJson: "{}",
   };
   return new LoadedSettings(
     emptySettingsFile,
@@ -414,8 +398,8 @@ function findEnvFile(settings: Settings, startDir: string): string | null {
 
   // Pre-compute user-level .env paths for fast comparison
   const userLevelPaths = new Set([
-    path.normalize(path.join(homeDir, '.env')),
-    path.normalize(path.join(homeDir, AIRISCODE_DIR, '.env')),
+    path.normalize(path.join(homeDir, ".env")),
+    path.normalize(path.join(homeDir, AIRISCODE_DIR, ".env")),
   ]);
 
   // Determine if we can use this .env file based on trust settings
@@ -425,12 +409,12 @@ function findEnvFile(settings: Settings, startDir: string): string | null {
   let currentDir = path.resolve(startDir);
   while (true) {
     // Prefer gemini-specific .env under AIRISCODE_DIR
-    const geminiEnvPath = path.join(currentDir, AIRISCODE_DIR, '.env');
+    const geminiEnvPath = path.join(currentDir, AIRISCODE_DIR, ".env");
     if (fs.existsSync(geminiEnvPath) && canUseEnvFile(geminiEnvPath)) {
       return geminiEnvPath;
     }
 
-    const envPath = path.join(currentDir, '.env');
+    const envPath = path.join(currentDir, ".env");
     if (fs.existsSync(envPath) && canUseEnvFile(envPath)) {
       return envPath;
     }
@@ -438,11 +422,11 @@ function findEnvFile(settings: Settings, startDir: string): string | null {
     const parentDir = path.dirname(currentDir);
     if (parentDir === currentDir || !parentDir) {
       // At home directory - check fallback .env files
-      const homeGeminiEnvPath = path.join(homeDir, AIRISCODE_DIR, '.env');
+      const homeGeminiEnvPath = path.join(homeDir, AIRISCODE_DIR, ".env");
       if (fs.existsSync(homeGeminiEnvPath)) {
         return homeGeminiEnvPath;
       }
-      const homeEnvPath = path.join(homeDir, '.env');
+      const homeEnvPath = path.join(homeDir, ".env");
       if (fs.existsSync(homeEnvPath)) {
         return homeEnvPath;
       }
@@ -461,16 +445,16 @@ export function setUpCloudShellEnvironment(envFilePath: string | null): void {
   if (envFilePath && fs.existsSync(envFilePath)) {
     const envFileContent = fs.readFileSync(envFilePath);
     const parsedEnv = dotenv.parse(envFileContent);
-    if (parsedEnv['GOOGLE_CLOUD_PROJECT']) {
+    if (parsedEnv["GOOGLE_CLOUD_PROJECT"]) {
       // .env file takes precedence in Cloud Shell
-      process.env['GOOGLE_CLOUD_PROJECT'] = parsedEnv['GOOGLE_CLOUD_PROJECT'];
+      process.env["GOOGLE_CLOUD_PROJECT"] = parsedEnv["GOOGLE_CLOUD_PROJECT"];
     } else {
       // If not in .env, set to default and override global
-      process.env['GOOGLE_CLOUD_PROJECT'] = 'cloudshell-gca';
+      process.env["GOOGLE_CLOUD_PROJECT"] = "cloudshell-gca";
     }
   } else {
     // If no .env file, set to default and override global
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'cloudshell-gca';
+    process.env["GOOGLE_CLOUD_PROJECT"] = "cloudshell-gca";
   }
 }
 /**
@@ -487,7 +471,7 @@ export function loadEnvironment(settings: Settings): void {
   const envFilePath = findEnvFile(settings, process.cwd());
 
   // Cloud Shell environment variable handling
-  if (process.env['CLOUD_SHELL'] === 'true') {
+  if (process.env["CLOUD_SHELL"] === "true") {
     setUpCloudShellEnvironment(envFilePath);
   }
 
@@ -495,11 +479,10 @@ export function loadEnvironment(settings: Settings): void {
   // Only set if not already present in process.env (no-override mode)
   if (envFilePath) {
     try {
-      const envFileContent = fs.readFileSync(envFilePath, 'utf-8');
+      const envFileContent = fs.readFileSync(envFilePath, "utf-8");
       const parsedEnv = dotenv.parse(envFileContent);
 
-      const excludedVars =
-        settings?.advanced?.excludedEnvVars || DEFAULT_EXCLUDED_ENV_VARS;
+      const excludedVars = settings?.advanced?.excludedEnvVars || DEFAULT_EXCLUDED_ENV_VARS;
       const isProjectEnvFile = !envFilePath.includes(AIRISCODE_DIR);
 
       for (const key in parsedEnv) {
@@ -524,7 +507,7 @@ export function loadEnvironment(settings: Settings): void {
   // Only set if not already present (no-override, after .env is loaded)
   if (settings.env) {
     for (const [key, value] of Object.entries(settings.env)) {
-      if (!Object.hasOwn(process.env, key) && typeof value === 'string') {
+      if (!Object.hasOwn(process.env, key) && typeof value === "string") {
         process.env[key] = value;
       }
     }
@@ -535,9 +518,7 @@ export function loadEnvironment(settings: Settings): void {
  * Loads settings from user and workspace directories.
  * Project settings override user settings.
  */
-export function loadSettings(
-  workspaceDir: string = process.cwd(),
-): LoadedSettings {
+export function loadSettings(workspaceDir: string = process.cwd()): LoadedSettings {
   let systemSettings: Settings = {};
   let systemDefaultSettings: Settings = {};
   let userSettings: Settings = {};
@@ -562,9 +543,7 @@ export function loadSettings(
   // We expect homedir to always exist and be resolvable.
   const realHomeDir = fs.realpathSync(resolvedHomeDir);
 
-  const workspaceSettingsPath = new Storage(
-    workspaceDir,
-  ).getWorkspaceSettingsPath();
+  const workspaceSettingsPath = new Storage(workspaceDir).getWorkspaceSettingsPath();
 
   const loadAndMigrate = (
     filePath: string,
@@ -572,16 +551,12 @@ export function loadSettings(
   ): { settings: Settings; rawJson?: string; migrationWarnings?: string[] } => {
     try {
       if (fs.existsSync(filePath)) {
-        const content = fs.readFileSync(filePath, 'utf-8');
+        const content = fs.readFileSync(filePath, "utf-8");
         const rawSettings: unknown = JSON.parse(stripJsonComments(content));
 
-        if (
-          typeof rawSettings !== 'object' ||
-          rawSettings === null ||
-          Array.isArray(rawSettings)
-        ) {
+        if (typeof rawSettings !== "object" || rawSettings === null || Array.isArray(rawSettings)) {
           settingsErrors.push({
-            message: 'Settings file is not a valid JSON object.',
+            message: "Settings file is not a valid JSON object.",
             path: filePath,
           });
           return { settings: {} };
@@ -590,18 +565,14 @@ export function loadSettings(
         let settingsObject = rawSettings as Record<string, unknown>;
         const hasVersionKey = SETTINGS_VERSION_KEY in settingsObject;
         const versionValue = settingsObject[SETTINGS_VERSION_KEY];
-        const hasInvalidVersion =
-          hasVersionKey && typeof versionValue !== 'number';
+        const hasInvalidVersion = hasVersionKey && typeof versionValue !== "number";
         const hasLegacyNumericVersion =
-          typeof versionValue === 'number' && versionValue < SETTINGS_VERSION;
+          typeof versionValue === "number" && versionValue < SETTINGS_VERSION;
         let migrationWarnings: string[] | undefined;
 
         const persistSettingsObject = (warningPrefix: string) => {
           try {
-            writeWithBackupSync(
-              filePath,
-              JSON.stringify(settingsObject, null, 2),
-            );
+            writeWithBackupSync(filePath, JSON.stringify(settingsObject, null, 2));
           } catch (e) {
             debugLogger.error(`${warningPrefix}: ${getErrorMessage(e)}`);
           }
@@ -610,12 +581,9 @@ export function loadSettings(
         if (needsMigration(settingsObject)) {
           const migrationResult = runMigrations(settingsObject, scope);
           if (migrationResult.executedMigrations.length > 0) {
-            settingsObject = migrationResult.settings as Record<
-              string,
-              unknown
-            >;
+            settingsObject = migrationResult.settings as Record<string, unknown>;
             migrationWarnings = migrationResult.warnings;
-            persistSettingsObject('Error migrating settings file on disk');
+            persistSettingsObject("Error migrating settings file on disk");
           } else if (hasLegacyNumericVersion || hasInvalidVersion) {
             // Migration was deemed needed but nothing executed. Normalize version metadata
             // to avoid repeated no-op checks on startup.
@@ -623,17 +591,13 @@ export function loadSettings(
             debugLogger.warn(
               `Settings version metadata in ${filePath} could not be migrated by any registered migration. Normalizing ${SETTINGS_VERSION_KEY} to ${SETTINGS_VERSION}.`,
             );
-            persistSettingsObject('Error normalizing settings version on disk');
+            persistSettingsObject("Error normalizing settings version on disk");
           }
-        } else if (
-          !hasVersionKey ||
-          hasInvalidVersion ||
-          hasLegacyNumericVersion
-        ) {
+        } else if (!hasVersionKey || hasInvalidVersion || hasLegacyNumericVersion) {
           // No migration needed/executable, but version metadata is missing or invalid.
           // Normalize it to current version to avoid repeated startup work.
           settingsObject[SETTINGS_VERSION_KEY] = SETTINGS_VERSION;
-          persistSettingsObject('Error normalizing settings version on disk');
+          persistSettingsObject("Error normalizing settings version on disk");
         }
 
         return {
@@ -652,10 +616,7 @@ export function loadSettings(
   };
 
   const systemResult = loadAndMigrate(systemSettingsPath, SettingScope.System);
-  const systemDefaultsResult = loadAndMigrate(
-    systemDefaultsPath,
-    SettingScope.SystemDefaults,
-  );
+  const systemDefaultsResult = loadAndMigrate(systemDefaultsPath, SettingScope.SystemDefaults);
   const userResult = loadAndMigrate(USER_SETTINGS_PATH, SettingScope.User);
 
   let workspaceResult: {
@@ -667,25 +628,19 @@ export function loadSettings(
     rawJson: undefined,
   };
   if (realWorkspaceDir !== realHomeDir) {
-    workspaceResult = loadAndMigrate(
-      workspaceSettingsPath,
-      SettingScope.Workspace,
-    );
+    workspaceResult = loadAndMigrate(workspaceSettingsPath, SettingScope.Workspace);
   }
 
   // Load workspace-local settings (.airiscode/settings.local.json)
   // This file is gitignored and has higher priority than workspace settings
   let workspaceLocalSettings: Settings = {};
   if (realWorkspaceDir !== realHomeDir) {
-    const localSettingsPath = path.join(
-      path.dirname(workspaceSettingsPath),
-      'settings.local.json',
-    );
+    const localSettingsPath = path.join(path.dirname(workspaceSettingsPath), "settings.local.json");
     try {
       if (fs.existsSync(localSettingsPath)) {
-        const content = fs.readFileSync(localSettingsPath, 'utf-8');
+        const content = fs.readFileSync(localSettingsPath, "utf-8");
         const parsed = JSON.parse(stripJsonComments(content));
-        if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed)) {
+        if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
           workspaceLocalSettings = parsed as Settings;
           debugLogger.debug(`Loaded local settings from ${localSettingsPath}`);
         }
@@ -696,9 +651,7 @@ export function loadSettings(
   }
 
   const systemOriginalSettings = structuredClone(systemResult.settings);
-  const systemDefaultsOriginalSettings = structuredClone(
-    systemDefaultsResult.settings,
-  );
+  const systemDefaultsOriginalSettings = structuredClone(systemDefaultsResult.settings);
   const userOriginalSettings = structuredClone(userResult.settings);
   const workspaceOriginalSettings = structuredClone(workspaceResult.settings);
 
@@ -718,14 +671,14 @@ export function loadSettings(
   }
 
   // Support legacy theme names
-  if (userSettings.ui?.theme === 'VS') {
+  if (userSettings.ui?.theme === "VS") {
     userSettings.ui.theme = DefaultLight.name;
-  } else if (userSettings.ui?.theme === 'VS2015') {
+  } else if (userSettings.ui?.theme === "VS2015") {
     userSettings.ui.theme = DefaultDark.name;
   }
-  if (workspaceSettings.ui?.theme === 'VS') {
+  if (workspaceSettings.ui?.theme === "VS") {
     workspaceSettings.ui.theme = DefaultLight.name;
-  } else if (workspaceSettings.ui?.theme === 'VS2015') {
+  } else if (workspaceSettings.ui?.theme === "VS2015") {
     workspaceSettings.ui.theme = DefaultDark.name;
   }
 
@@ -736,8 +689,7 @@ export function loadSettings(
     systemSettings,
     userSettings,
   );
-  const isTrusted =
-    isWorkspaceTrusted(initialTrustCheckSettings as Settings).isTrusted ?? true;
+  const isTrusted = isWorkspaceTrusted(initialTrustCheckSettings as Settings).isTrusted ?? true;
 
   // Create a temporary merged settings object to pass to loadEnvironment.
   const tempMergedSettings = mergeSettings(
@@ -755,11 +707,9 @@ export function loadSettings(
   // Create LoadedSettings first
 
   if (settingsErrors.length > 0) {
-    const errorMessages = settingsErrors.map(
-      (error) => `Error in ${error.path}: ${error.message}`,
-    );
+    const errorMessages = settingsErrors.map((error) => `Error in ${error.path}: ${error.message}`);
     throw new FatalConfigError(
-      `${errorMessages.join('\n')}\nPlease fix the configuration file(s) and try again.`,
+      `${errorMessages.join("\n")}\nPlease fix the configuration file(s) and try again.`,
     );
   }
 
@@ -802,10 +752,7 @@ export function loadSettings(
   );
 }
 
-function createSettingsUpdate(
-  key: string,
-  value: unknown,
-): Record<string, unknown> {
+function createSettingsUpdate(key: string, value: unknown): Record<string, unknown> {
   const root: Record<string, unknown> = {};
   setNestedPropertySafe(root, key, value);
   return root;
@@ -813,10 +760,7 @@ function createSettingsUpdate(
 
 export function saveSettings(
   settingsFile: SettingsFile,
-  updates: Record<string, unknown> = settingsFile.originalSettings as Record<
-    string,
-    unknown
-  >,
+  updates: Record<string, unknown> = settingsFile.originalSettings as Record<string, unknown>,
 ): void {
   try {
     // Ensure the directory exists
@@ -828,7 +772,7 @@ export function saveSettings(
     // Use the format-preserving update function
     updateSettingsFilePreservingFormat(settingsFile.path, updates);
   } catch (error) {
-    debugLogger.error('Error saving user settings file.');
+    debugLogger.error("Error saving user settings file.");
     debugLogger.error(error instanceof Error ? error.message : String(error));
     throw error;
   }
diff --git a/apps/airiscode-cli/src/config/settingsSchema.ts b/apps/airiscode-cli/src/config/settingsSchema.ts
index c67ad25ea..685401e89 100644
--- a/apps/airiscode-cli/src/config/settingsSchema.ts
+++ b/apps/airiscode-cli/src/config/settingsSchema.ts
@@ -5,46 +5,31 @@
  */
 
 import type {
-  MCPServerConfig,
-  BugCommandSettings,
-  TelemetrySettings,
   AuthType,
+  BugCommandSettings,
   ChatCompressionSettings,
+  MCPServerConfig,
   ModelProvidersConfig,
-} from '@airiscode/core';
+  TelemetrySettings,
+} from "@airiscode/core";
 import {
   ApprovalMode,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-} from '@airiscode/core';
-import type { CustomTheme } from '../ui/themes/theme.js';
-import { getLanguageSettingsOptions } from '../i18n/languages.js';
+} from "@airiscode/core";
+import { getLanguageSettingsOptions } from "../i18n/languages.js";
+import type { CustomTheme } from "../ui/themes/theme.js";
 
-export type SettingsType =
-  | 'boolean'
-  | 'string'
-  | 'number'
-  | 'array'
-  | 'object'
-  | 'enum';
+export type SettingsType = "boolean" | "string" | "number" | "array" | "object" | "enum";
 
-export type SettingsValue =
-  | boolean
-  | string
-  | number
-  | string[]
-  | object
-  | undefined;
+export type SettingsValue = boolean | string | number | string[] | object | undefined;
 
 /**
  * Setting datatypes that "toggle" through a fixed list of options
  * (e.g. an enum or true/false) rather than allowing for free form input
  * (like a number or string).
  */
-export const TOGGLE_TYPES: ReadonlySet<SettingsType | undefined> = new Set([
-  'boolean',
-  'enum',
-]);
+export const TOGGLE_TYPES: ReadonlySet<SettingsType | undefined> = new Set(["boolean", "enum"]);
 
 export interface SettingEnumOption {
   value: string | number;
@@ -53,13 +38,13 @@ export interface SettingEnumOption {
 
 export enum MergeStrategy {
   // Replace the old value with the new value. This is the default.
-  REPLACE = 'replace',
+  REPLACE = "replace",
   // Concatenate arrays.
-  CONCAT = 'concat',
+  CONCAT = "concat",
   // Merge arrays, ensuring unique values.
-  UNION = 'union',
+  UNION = "union",
   // Shallow merge objects.
-  SHALLOW_MERGE = 'shallow_merge',
+  SHALLOW_MERGE = "shallow_merge",
 }
 
 export interface SettingDefinition {
@@ -85,7 +70,7 @@ export interface SettingDefinition {
  * Supports simple types (string, number, boolean) and complex object types.
  */
 export interface SettingItemDefinition {
-  type: 'string' | 'number' | 'boolean' | 'object' | 'array';
+  type: "string" | "number" | "boolean" | "object" | "array";
   properties?: Record<
     string,
     SettingItemDefinition & {
@@ -110,57 +95,52 @@ export interface SettingsSchema {
  * Used by all hook event types in the hooks configuration.
  */
 const HOOK_DEFINITION_ITEMS: SettingItemDefinition = {
-  type: 'object',
-  description:
-    'A hook definition with an optional matcher and a list of hook configurations.',
+  type: "object",
+  description: "A hook definition with an optional matcher and a list of hook configurations.",
   properties: {
     matcher: {
-      type: 'string',
-      description:
-        'An optional matcher pattern to filter when this hook definition applies.',
+      type: "string",
+      description: "An optional matcher pattern to filter when this hook definition applies.",
     },
     sequential: {
-      type: 'boolean',
-      description:
-        'Whether the hooks should be executed sequentially instead of in parallel.',
+      type: "boolean",
+      description: "Whether the hooks should be executed sequentially instead of in parallel.",
     },
     hooks: {
-      type: 'array',
-      description: 'The list of hook configurations to execute.',
+      type: "array",
+      description: "The list of hook configurations to execute.",
       required: true,
       items: {
-        type: 'object',
-        description:
-          'A hook configuration entry that defines a command to execute.',
+        type: "object",
+        description: "A hook configuration entry that defines a command to execute.",
         properties: {
           type: {
-            type: 'string',
-            description: 'The type of hook.',
-            enum: ['command'],
+            type: "string",
+            description: "The type of hook.",
+            enum: ["command"],
             required: true,
           },
           command: {
-            type: 'string',
-            description: 'The command to execute when the hook is triggered.',
+            type: "string",
+            description: "The command to execute when the hook is triggered.",
             required: true,
           },
           name: {
-            type: 'string',
-            description: 'An optional name for the hook.',
+            type: "string",
+            description: "An optional name for the hook.",
           },
           description: {
-            type: 'string',
-            description: 'An optional description of what the hook does.',
+            type: "string",
+            description: "An optional description of what the hook does.",
           },
           timeout: {
-            type: 'number',
-            description: 'Timeout in milliseconds for the hook execution.',
+            type: "number",
+            description: "Timeout in milliseconds for the hook execution.",
           },
           env: {
-            type: 'object',
-            description:
-              'Environment variables to set when executing the hook command.',
-            additionalProperties: { type: 'string' },
+            type: "object",
+            description: "Environment variables to set when executing the hook command.",
+            additionalProperties: { type: "string" },
           },
         },
       },
@@ -168,8 +148,8 @@ const HOOK_DEFINITION_ITEMS: SettingItemDefinition = {
   },
 };
 
-export type MemoryImportFormat = 'tree' | 'flat';
-export type DnsResolutionOrder = 'ipv4first' | 'verbatim';
+export type MemoryImportFormat = "tree" | "flat";
+export type DnsResolutionOrder = "ipv4first" | "verbatim";
 
 /**
  * The canonical schema for all settings.
@@ -179,59 +159,58 @@ export type DnsResolutionOrder = 'ipv4first' | 'verbatim';
 const SETTINGS_SCHEMA = {
   // Maintained for compatibility/criticality
   mcpServers: {
-    type: 'object',
-    label: 'MCP Servers',
-    category: 'Advanced',
+    type: "object",
+    label: "MCP Servers",
+    category: "Advanced",
     requiresRestart: true,
     default: {} as Record<string, MCPServerConfig>,
-    description: 'Configuration for MCP servers.',
+    description: "Configuration for MCP servers.",
     showInDialog: false,
     mergeStrategy: MergeStrategy.SHALLOW_MERGE,
   },
 
   // Channels configuration (Telegram, Discord, etc.)
   channels: {
-    type: 'object',
-    label: 'Channels',
-    category: 'Advanced',
+    type: "object",
+    label: "Channels",
+    category: "Advanced",
     requiresRestart: true,
     default: {} as Record<string, Record<string, unknown>>,
-    description: 'Configuration for messaging channels.',
+    description: "Configuration for messaging channels.",
     showInDialog: false,
     mergeStrategy: MergeStrategy.SHALLOW_MERGE,
   },
 
   // Model providers configuration grouped by authType
   modelProviders: {
-    type: 'object',
-    label: 'Model Providers',
-    category: 'Model',
+    type: "object",
+    label: "Model Providers",
+    category: "Model",
     requiresRestart: false,
     default: {} as ModelProvidersConfig,
     description:
-      'Model providers configuration grouped by authType. Each authType contains an array of model configurations.',
+      "Model providers configuration grouped by authType. Each authType contains an array of model configurations.",
     showInDialog: false,
     mergeStrategy: MergeStrategy.REPLACE,
   },
 
   // Coding Plan configuration
   codingPlan: {
-    type: 'object',
-    label: 'Coding Plan',
-    category: 'Model',
+    type: "object",
+    label: "Coding Plan",
+    category: "Model",
     requiresRestart: false,
     default: {},
-    description: 'Coding Plan template version tracking and configuration.',
+    description: "Coding Plan template version tracking and configuration.",
     showInDialog: false,
     properties: {
       version: {
-        type: 'string',
-        label: 'Coding Plan Template Version',
-        category: 'Model',
+        type: "string",
+        label: "Coding Plan Template Version",
+        category: "Model",
         requiresRestart: false,
         default: undefined as string | undefined,
-        description:
-          'SHA256 hash of the Coding Plan template. Used to detect template updates.',
+        description: "SHA256 hash of the Coding Plan template. Used to detect template updates.",
         showInDialog: false,
       },
     },
@@ -239,599 +218,594 @@ const SETTINGS_SCHEMA = {
 
   // Environment variables fallback
   env: {
-    type: 'object',
-    label: 'Environment Variables',
-    category: 'Advanced',
+    type: "object",
+    label: "Environment Variables",
+    category: "Advanced",
     requiresRestart: true,
     default: {} as Record<string, string>,
     description:
-      'Environment variables to set as fallback defaults. These are loaded with the lowest priority: system environment variables > .env files > settings.json env field.',
+      "Environment variables to set as fallback defaults. These are loaded with the lowest priority: system environment variables > .env files > settings.json env field.",
     showInDialog: false,
     mergeStrategy: MergeStrategy.SHALLOW_MERGE,
   },
 
   general: {
-    type: 'object',
-    label: 'General',
-    category: 'General',
+    type: "object",
+    label: "General",
+    category: "General",
     requiresRestart: false,
     default: {},
-    description: 'General application settings.',
+    description: "General application settings.",
     showInDialog: false,
     properties: {
       preferredEditor: {
-        type: 'string',
-        label: 'Preferred Editor',
-        category: 'General',
+        type: "string",
+        label: "Preferred Editor",
+        category: "General",
         requiresRestart: false,
         default: undefined as string | undefined,
-        description: 'The preferred editor to open files in.',
+        description: "The preferred editor to open files in.",
         showInDialog: true,
       },
       vimMode: {
-        type: 'boolean',
-        label: 'Vim Mode',
-        category: 'General',
+        type: "boolean",
+        label: "Vim Mode",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description: 'Enable Vim keybindings',
+        description: "Enable Vim keybindings",
         showInDialog: true,
       },
       enableAutoUpdate: {
-        type: 'boolean',
-        label: 'Enable Auto Update',
-        category: 'General',
+        type: "boolean",
+        label: "Enable Auto Update",
+        category: "General",
         requiresRestart: false,
         default: true,
-        description:
-          'Enable automatic update checks and installations on startup.',
+        description: "Enable automatic update checks and installations on startup.",
         showInDialog: true,
       },
       gitCoAuthor: {
-        type: 'boolean',
-        label: 'Attribution: commit',
-        category: 'General',
+        type: "boolean",
+        label: "Attribution: commit",
+        category: "General",
         requiresRestart: false,
         default: true,
         description:
-          'Automatically add a Co-authored-by trailer to git commit messages when commits are made through AIRIS Code.',
+          "Automatically add a Co-authored-by trailer to git commit messages when commits are made through AIRIS Code.",
         showInDialog: true,
       },
       checkpointing: {
-        type: 'object',
-        label: 'Checkpointing',
-        category: 'General',
+        type: "object",
+        label: "Checkpointing",
+        category: "General",
         requiresRestart: true,
         default: {},
-        description: 'Session checkpointing settings.',
+        description: "Session checkpointing settings.",
         showInDialog: false,
         properties: {
           enabled: {
-            type: 'boolean',
-            label: 'Enable Checkpointing',
-            category: 'General',
+            type: "boolean",
+            label: "Enable Checkpointing",
+            category: "General",
             requiresRestart: true,
             default: false,
-            description: 'Enable session checkpointing for recovery',
+            description: "Enable session checkpointing for recovery",
             showInDialog: false,
           },
         },
       },
       debugKeystrokeLogging: {
-        type: 'boolean',
-        label: 'Debug Keystroke Logging',
-        category: 'General',
+        type: "boolean",
+        label: "Debug Keystroke Logging",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description: 'Enable debug logging of keystrokes to the console.',
+        description: "Enable debug logging of keystrokes to the console.",
         showInDialog: false,
       },
       language: {
-        type: 'enum',
-        label: 'Language: UI',
-        category: 'General',
+        type: "enum",
+        label: "Language: UI",
+        category: "General",
         requiresRestart: true,
-        default: 'auto',
+        default: "auto",
         description:
           'The language for the user interface. Use "auto" to detect from system settings. ' +
           'You can also use custom language codes (e.g., "es", "fr") by placing JS language files ' +
-          'in ~/.airiscode/locales/ (e.g., ~/.airiscode/locales/es.js).',
+          "in ~/.airiscode/locales/ (e.g., ~/.airiscode/locales/es.js).",
         showInDialog: true,
         options: [] as readonly SettingEnumOption[],
       },
       outputLanguage: {
-        type: 'string',
-        label: 'Language: Model',
-        category: 'General',
+        type: "string",
+        label: "Language: Model",
+        category: "General",
         requiresRestart: true,
-        default: 'auto',
+        default: "auto",
         description:
           'The language for LLM output. Use "auto" to detect from system settings, ' +
-          'or set a specific language.',
+          "or set a specific language.",
         showInDialog: true,
       },
       terminalBell: {
-        type: 'boolean',
-        label: 'Terminal Bell Notification',
-        category: 'General',
+        type: "boolean",
+        label: "Terminal Bell Notification",
+        category: "General",
         requiresRestart: false,
         default: true,
-        description:
-          'Play terminal bell sound when response completes or needs approval.',
+        description: "Play terminal bell sound when response completes or needs approval.",
         showInDialog: true,
       },
       chatRecording: {
-        type: 'boolean',
-        label: 'Chat Recording',
-        category: 'General',
+        type: "boolean",
+        label: "Chat Recording",
+        category: "General",
         requiresRestart: true,
         default: true,
         description:
-          'Enable saving chat history to disk. Disabling this will also prevent --continue and --resume from working.',
+          "Enable saving chat history to disk. Disabling this will also prevent --continue and --resume from working.",
         showInDialog: false,
       },
       defaultFileEncoding: {
-        type: 'enum',
-        label: 'Default File Encoding',
-        category: 'General',
+        type: "enum",
+        label: "Default File Encoding",
+        category: "General",
         requiresRestart: false,
-        default: 'utf-8',
+        default: "utf-8",
         description:
           'Default encoding for new files. Use "utf-8" (default) for UTF-8 without BOM, or "utf-8-bom" for UTF-8 with BOM. Only change this if your project specifically requires BOM.',
         showInDialog: false,
         options: [
-          { value: 'utf-8', label: 'UTF-8 (without BOM)' },
-          { value: 'utf-8-bom', label: 'UTF-8 with BOM' },
+          { value: "utf-8", label: "UTF-8 (without BOM)" },
+          { value: "utf-8-bom", label: "UTF-8 with BOM" },
         ],
       },
     },
   },
   output: {
-    type: 'object',
-    label: 'Output',
-    category: 'General',
+    type: "object",
+    label: "Output",
+    category: "General",
     requiresRestart: false,
     default: {},
-    description: 'Settings for the CLI output.',
+    description: "Settings for the CLI output.",
     showInDialog: false,
     properties: {
       format: {
-        type: 'enum',
-        label: 'Output Format',
-        category: 'General',
+        type: "enum",
+        label: "Output Format",
+        category: "General",
         requiresRestart: false,
-        default: 'text',
-        description: 'The format of the CLI output.',
+        default: "text",
+        description: "The format of the CLI output.",
         showInDialog: false,
         options: [
-          { value: 'text', label: 'Text' },
-          { value: 'json', label: 'JSON' },
+          { value: "text", label: "Text" },
+          { value: "json", label: "JSON" },
         ],
       },
     },
   },
 
   ui: {
-    type: 'object',
-    label: 'UI',
-    category: 'UI',
+    type: "object",
+    label: "UI",
+    category: "UI",
     requiresRestart: false,
     default: {},
-    description: 'User interface settings.',
+    description: "User interface settings.",
     showInDialog: false,
     properties: {
       theme: {
-        type: 'string',
-        label: 'Theme',
-        category: 'UI',
+        type: "string",
+        label: "Theme",
+        category: "UI",
         requiresRestart: false,
-        default: 'Qwen Dark' as string,
-        description: 'The color theme for the UI.',
+        default: "Qwen Dark" as string,
+        description: "The color theme for the UI.",
         showInDialog: true,
       },
       statusLine: {
-        type: 'object',
-        label: 'Status Line',
-        category: 'UI',
+        type: "object",
+        label: "Status Line",
+        category: "UI",
         requiresRestart: false,
-        default: undefined as { type: 'command'; command: string } | undefined,
-        description: 'Custom status line display configuration.',
+        default: undefined as { type: "command"; command: string } | undefined,
+        description: "Custom status line display configuration.",
         showInDialog: false,
       },
       customThemes: {
-        type: 'object',
-        label: 'Custom Themes',
-        category: 'UI',
+        type: "object",
+        label: "Custom Themes",
+        category: "UI",
         requiresRestart: false,
         default: {} as Record<string, CustomTheme>,
-        description: 'Custom theme definitions.',
+        description: "Custom theme definitions.",
         showInDialog: false,
       },
       hideWindowTitle: {
-        type: 'boolean',
-        label: 'Hide Window Title',
-        category: 'UI',
+        type: "boolean",
+        label: "Hide Window Title",
+        category: "UI",
         requiresRestart: true,
         default: false,
-        description: 'Hide the window title bar',
+        description: "Hide the window title bar",
         showInDialog: false,
       },
       showStatusInTitle: {
-        type: 'boolean',
-        label: 'Show Status in Title',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Status in Title",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description:
-          'Show AIRIS Code status and thoughts in the terminal window title',
+        description: "Show AIRIS Code status and thoughts in the terminal window title",
         showInDialog: false,
       },
       hideTips: {
-        type: 'boolean',
-        label: 'Hide Tips',
-        category: 'UI',
+        type: "boolean",
+        label: "Hide Tips",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Hide helpful tips in the UI',
+        description: "Hide helpful tips in the UI",
         showInDialog: true,
       },
       showLineNumbers: {
-        type: 'boolean',
-        label: 'Show Line Numbers in Code',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Line Numbers in Code",
+        category: "UI",
         requiresRestart: false,
         default: true,
-        description: 'Show line numbers in the code output.',
+        description: "Show line numbers in the code output.",
         showInDialog: true,
       },
       showCitations: {
-        type: 'boolean',
-        label: 'Show Citations',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Citations",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Show citations for generated text in the chat.',
+        description: "Show citations for generated text in the chat.",
         showInDialog: false,
       },
       customWittyPhrases: {
-        type: 'array',
-        label: 'Custom Witty Phrases',
-        category: 'UI',
+        type: "array",
+        label: "Custom Witty Phrases",
+        category: "UI",
         requiresRestart: false,
         default: [] as string[],
-        description: 'Custom witty phrases to display during loading.',
+        description: "Custom witty phrases to display during loading.",
         showInDialog: false,
       },
       enableWelcomeBack: {
-        type: 'boolean',
-        label: 'Show Welcome Back Dialog',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Welcome Back Dialog",
+        category: "UI",
         requiresRestart: false,
         default: true,
         description:
-          'Show welcome back dialog when returning to a project with conversation history.',
+          "Show welcome back dialog when returning to a project with conversation history.",
         showInDialog: true,
       },
       enableUserFeedback: {
-        type: 'boolean',
-        label: 'Enable User Feedback',
-        category: 'UI',
+        type: "boolean",
+        label: "Enable User Feedback",
+        category: "UI",
         requiresRestart: false,
         default: true,
         description:
-          'Show optional feedback dialog after conversations to help improve Qwen performance.',
+          "Show optional feedback dialog after conversations to help improve Qwen performance.",
         showInDialog: true,
       },
       enableFollowupSuggestions: {
-        type: 'boolean',
-        label: 'Enable Follow-up Suggestions',
-        category: 'UI',
+        type: "boolean",
+        label: "Enable Follow-up Suggestions",
+        category: "UI",
         requiresRestart: false,
         default: false,
         description:
-          'Show context-aware follow-up suggestions after task completion. Press Tab or Right Arrow to accept, Enter to accept and submit.',
+          "Show context-aware follow-up suggestions after task completion. Press Tab or Right Arrow to accept, Enter to accept and submit.",
         showInDialog: true,
       },
       enableCacheSharing: {
-        type: 'boolean',
-        label: 'Enable Cache Sharing for Suggestions',
-        category: 'UI',
+        type: "boolean",
+        label: "Enable Cache Sharing for Suggestions",
+        category: "UI",
         requiresRestart: false,
         default: true,
         description:
-          'Use cache-aware forked queries for suggestion generation. Reduces cost on providers that support prefix caching (experimental).',
+          "Use cache-aware forked queries for suggestion generation. Reduces cost on providers that support prefix caching (experimental).",
         showInDialog: false,
       },
       enableSpeculation: {
-        type: 'boolean',
-        label: 'Enable Speculative Execution',
-        category: 'UI',
+        type: "boolean",
+        label: "Enable Speculative Execution",
+        category: "UI",
         requiresRestart: false,
         default: false,
         description:
-          'Speculatively execute accepted suggestions before submission. Results appear instantly when you accept (experimental).',
+          "Speculatively execute accepted suggestions before submission. Results appear instantly when you accept (experimental).",
         showInDialog: false,
       },
       accessibility: {
-        type: 'object',
-        label: 'Accessibility',
-        category: 'UI',
+        type: "object",
+        label: "Accessibility",
+        category: "UI",
         requiresRestart: true,
         default: {},
-        description: 'Accessibility settings.',
+        description: "Accessibility settings.",
         showInDialog: false,
         properties: {
           enableLoadingPhrases: {
-            type: 'boolean',
-            label: 'Enable Loading Phrases',
-            category: 'UI',
+            type: "boolean",
+            label: "Enable Loading Phrases",
+            category: "UI",
             requiresRestart: true,
             default: true,
-            description: 'Enable loading phrases (disable for accessibility)',
+            description: "Enable loading phrases (disable for accessibility)",
             showInDialog: true,
           },
           screenReader: {
-            type: 'boolean',
-            label: 'Screen Reader Mode',
-            category: 'UI',
+            type: "boolean",
+            label: "Screen Reader Mode",
+            category: "UI",
             requiresRestart: true,
             default: undefined as boolean | undefined,
-            description:
-              'Render output in plain-text to be more screen reader accessible',
+            description: "Render output in plain-text to be more screen reader accessible",
             showInDialog: false,
           },
         },
       },
       feedbackLastShownTimestamp: {
-        type: 'number',
-        label: 'Feedback Last Shown Timestamp',
-        category: 'UI',
+        type: "number",
+        label: "Feedback Last Shown Timestamp",
+        category: "UI",
         requiresRestart: false,
         default: 0,
-        description: 'The last time the feedback dialog was shown.',
+        description: "The last time the feedback dialog was shown.",
         showInDialog: false,
       },
       verboseMode: {
-        type: 'boolean',
-        label: 'Verbose Mode',
-        category: 'UI',
+        type: "boolean",
+        label: "Verbose Mode",
+        category: "UI",
         requiresRestart: false,
         default: true,
-        description:
-          'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).',
+        description: "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).",
         showInDialog: false,
       },
     },
   },
 
   ide: {
-    type: 'object',
-    label: 'IDE',
-    category: 'IDE',
+    type: "object",
+    label: "IDE",
+    category: "IDE",
     requiresRestart: true,
     default: {},
-    description: 'IDE integration settings.',
+    description: "IDE integration settings.",
     showInDialog: false,
     properties: {
       enabled: {
-        type: 'boolean',
-        label: 'Auto-connect to IDE',
-        category: 'IDE',
+        type: "boolean",
+        label: "Auto-connect to IDE",
+        category: "IDE",
         requiresRestart: true,
         default: false,
-        description: 'Enable IDE integration mode',
+        description: "Enable IDE integration mode",
         showInDialog: true,
       },
       hasSeenNudge: {
-        type: 'boolean',
-        label: 'Has Seen IDE Integration Nudge',
-        category: 'IDE',
+        type: "boolean",
+        label: "Has Seen IDE Integration Nudge",
+        category: "IDE",
         requiresRestart: false,
         default: false,
-        description: 'Whether the user has seen the IDE integration nudge.',
+        description: "Whether the user has seen the IDE integration nudge.",
         showInDialog: false,
       },
     },
   },
 
   privacy: {
-    type: 'object',
-    label: 'Privacy',
-    category: 'Privacy',
+    type: "object",
+    label: "Privacy",
+    category: "Privacy",
     requiresRestart: true,
     default: {},
-    description: 'Privacy-related settings.',
+    description: "Privacy-related settings.",
     showInDialog: false,
     properties: {
       usageStatisticsEnabled: {
-        type: 'boolean',
-        label: 'Enable Usage Statistics',
-        category: 'Privacy',
+        type: "boolean",
+        label: "Enable Usage Statistics",
+        category: "Privacy",
         requiresRestart: true,
         default: true,
-        description: 'Enable collection of usage statistics',
+        description: "Enable collection of usage statistics",
         showInDialog: true,
       },
     },
   },
 
   telemetry: {
-    type: 'object',
-    label: 'Telemetry',
-    category: 'Advanced',
+    type: "object",
+    label: "Telemetry",
+    category: "Advanced",
     requiresRestart: true,
     default: undefined as TelemetrySettings | undefined,
-    description: 'Telemetry configuration.',
+    description: "Telemetry configuration.",
     showInDialog: false,
   },
 
   fastModel: {
-    type: 'string',
-    label: 'Fast Model',
-    category: 'Model',
+    type: "string",
+    label: "Fast Model",
+    category: "Model",
     requiresRestart: false,
-    default: '',
+    default: "",
     description:
-      'Model for background tasks (suggestion generation, speculation). Leave empty to use the main model. A smaller/faster model (e.g., qwen3.5-flash) reduces latency and cost.',
+      "Model for background tasks (suggestion generation, speculation). Leave empty to use the main model. A smaller/faster model (e.g., qwen3.5-flash) reduces latency and cost.",
     showInDialog: true,
   },
 
   model: {
-    type: 'object',
-    label: 'Model',
-    category: 'Model',
+    type: "object",
+    label: "Model",
+    category: "Model",
     requiresRestart: false,
     default: {},
-    description: 'Settings related to the generative model.',
+    description: "Settings related to the generative model.",
     showInDialog: false,
     properties: {
       name: {
-        type: 'string',
-        label: 'Model',
-        category: 'Model',
+        type: "string",
+        label: "Model",
+        category: "Model",
         requiresRestart: false,
         default: undefined as string | undefined,
-        description: 'The model to use for conversations.',
+        description: "The model to use for conversations.",
         showInDialog: false,
       },
       maxSessionTurns: {
-        type: 'number',
-        label: 'Max Session Turns',
-        category: 'Model',
+        type: "number",
+        label: "Max Session Turns",
+        category: "Model",
         requiresRestart: false,
         default: -1,
         description:
-          'Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.',
+          "Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.",
         showInDialog: false,
       },
       chatCompression: {
-        type: 'object',
-        label: 'Chat Compression',
-        category: 'Model',
+        type: "object",
+        label: "Chat Compression",
+        category: "Model",
         requiresRestart: false,
         default: undefined as ChatCompressionSettings | undefined,
-        description: 'Chat compression settings.',
+        description: "Chat compression settings.",
         showInDialog: false,
       },
       sessionTokenLimit: {
-        type: 'number',
-        label: 'Session Token Limit',
-        category: 'Model',
+        type: "number",
+        label: "Session Token Limit",
+        category: "Model",
         requiresRestart: false,
         default: undefined as number | undefined,
-        description: 'The maximum number of tokens allowed in a session.',
+        description: "The maximum number of tokens allowed in a session.",
         showInDialog: false,
       },
       skipNextSpeakerCheck: {
-        type: 'boolean',
-        label: 'Skip Next Speaker Check',
-        category: 'Model',
+        type: "boolean",
+        label: "Skip Next Speaker Check",
+        category: "Model",
         requiresRestart: false,
         default: true,
-        description: 'Skip the next speaker check.',
+        description: "Skip the next speaker check.",
         showInDialog: false,
       },
       skipLoopDetection: {
-        type: 'boolean',
-        label: 'Skip Loop Detection',
-        category: 'Model',
+        type: "boolean",
+        label: "Skip Loop Detection",
+        category: "Model",
         requiresRestart: false,
         default: true,
-        description: 'Disable all loop detection checks (streaming and LLM).',
+        description: "Disable all loop detection checks (streaming and LLM).",
         showInDialog: false,
       },
       skipStartupContext: {
-        type: 'boolean',
-        label: 'Skip Startup Context',
-        category: 'Model',
+        type: "boolean",
+        label: "Skip Startup Context",
+        category: "Model",
         requiresRestart: true,
         default: false,
         description:
-          'Avoid sending the workspace startup context at the beginning of each session.',
+          "Avoid sending the workspace startup context at the beginning of each session.",
         showInDialog: false,
       },
       enableOpenAILogging: {
-        type: 'boolean',
-        label: 'Enable OpenAI Logging',
-        category: 'Model',
+        type: "boolean",
+        label: "Enable OpenAI Logging",
+        category: "Model",
         requiresRestart: false,
         default: false,
-        description: 'Enable OpenAI logging.',
+        description: "Enable OpenAI logging.",
         showInDialog: false,
       },
       openAILoggingDir: {
-        type: 'string',
-        label: 'OpenAI Logging Directory',
-        category: 'Model',
+        type: "string",
+        label: "OpenAI Logging Directory",
+        category: "Model",
         requiresRestart: false,
         default: undefined as string | undefined,
         description:
-          'Custom directory path for OpenAI API logs. If not specified, defaults to logs/openai in the current working directory.',
+          "Custom directory path for OpenAI API logs. If not specified, defaults to logs/openai in the current working directory.",
         showInDialog: false,
       },
       generationConfig: {
-        type: 'object',
-        label: 'Generation Configuration',
-        category: 'Model',
+        type: "object",
+        label: "Generation Configuration",
+        category: "Model",
         requiresRestart: false,
         default: undefined as Record<string, unknown> | undefined,
-        description: 'Generation configuration settings.',
+        description: "Generation configuration settings.",
         showInDialog: false,
         properties: {
           timeout: {
-            type: 'number',
-            label: 'Timeout',
-            category: 'Generation Configuration',
+            type: "number",
+            label: "Timeout",
+            category: "Generation Configuration",
             requiresRestart: false,
             default: undefined as number | undefined,
-            description: 'Request timeout in milliseconds.',
-            parentKey: 'generationConfig',
+            description: "Request timeout in milliseconds.",
+            parentKey: "generationConfig",
             showInDialog: false,
           },
           maxRetries: {
-            type: 'number',
-            label: 'Max Retries',
-            category: 'Generation Configuration',
+            type: "number",
+            label: "Max Retries",
+            category: "Generation Configuration",
             requiresRestart: false,
             default: undefined as number | undefined,
-            description: 'Maximum number of retries for failed requests.',
-            parentKey: 'generationConfig',
+            description: "Maximum number of retries for failed requests.",
+            parentKey: "generationConfig",
             showInDialog: false,
           },
           enableCacheControl: {
-            type: 'boolean',
-            label: 'Enable Cache Control',
-            category: 'Generation Configuration',
+            type: "boolean",
+            label: "Enable Cache Control",
+            category: "Generation Configuration",
             requiresRestart: false,
             default: true,
-            description: 'Enable cache control for DashScope providers.',
-            parentKey: 'generationConfig',
+            description: "Enable cache control for DashScope providers.",
+            parentKey: "generationConfig",
             showInDialog: false,
           },
           schemaCompliance: {
-            type: 'enum',
-            label: 'Tool Schema Compliance',
-            category: 'Generation Configuration',
+            type: "enum",
+            label: "Tool Schema Compliance",
+            category: "Generation Configuration",
             requiresRestart: false,
-            default: 'auto',
+            default: "auto",
             description:
               'The compliance mode for tool schemas sent to the model. Use "openapi_30" for strict OpenAPI 3.0 compatibility (e.g., for Gemini).',
-            parentKey: 'generationConfig',
+            parentKey: "generationConfig",
             showInDialog: false,
             options: [
-              { value: 'auto', label: 'Auto (Default)' },
-              { value: 'openapi_30', label: 'OpenAPI 3.0 Strict' },
+              { value: "auto", label: "Auto (Default)" },
+              { value: "openapi_30", label: "OpenAPI 3.0 Strict" },
             ],
           },
           contextWindowSize: {
-            type: 'number',
-            label: 'Context Window Size',
-            category: 'Generation Configuration',
+            type: "number",
+            label: "Context Window Size",
+            category: "Generation Configuration",
             requiresRestart: false,
             default: undefined,
             description:
               "Overrides the default context window size for the selected model. Use this setting when a provider's effective context limit differs from AIRIS Code's default. This value defines the model's assumed maximum context capacity, not a per-request token limit.",
-            parentKey: 'generationConfig',
+            parentKey: "generationConfig",
             showInDialog: false,
           },
         },
@@ -840,154 +814,154 @@ const SETTINGS_SCHEMA = {
   },
 
   context: {
-    type: 'object',
-    label: 'Context',
-    category: 'Context',
+    type: "object",
+    label: "Context",
+    category: "Context",
     requiresRestart: false,
     default: {},
-    description: 'Settings for managing context provided to the model.',
+    description: "Settings for managing context provided to the model.",
     showInDialog: false,
     properties: {
       fileName: {
-        type: 'object',
-        label: 'Context File Name',
-        category: 'Context',
+        type: "object",
+        label: "Context File Name",
+        category: "Context",
         requiresRestart: false,
         default: undefined as string | string[] | undefined,
-        description: 'The name of the context file.',
+        description: "The name of the context file.",
         showInDialog: false,
       },
       importFormat: {
-        type: 'string',
-        label: 'Memory Import Format',
-        category: 'Context',
+        type: "string",
+        label: "Memory Import Format",
+        category: "Context",
         requiresRestart: false,
         default: undefined as MemoryImportFormat | undefined,
-        description: 'The format to use when importing memory.',
+        description: "The format to use when importing memory.",
         showInDialog: false,
       },
       includeDirectories: {
-        type: 'array',
-        label: 'Include Directories',
-        category: 'Context',
+        type: "array",
+        label: "Include Directories",
+        category: "Context",
         requiresRestart: false,
         default: [] as string[],
         description:
-          'Additional directories to include in the workspace context. Missing directories will be skipped with a warning.',
+          "Additional directories to include in the workspace context. Missing directories will be skipped with a warning.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
       },
       loadFromIncludeDirectories: {
-        type: 'boolean',
-        label: 'Load Memory From Include Directories',
-        category: 'Context',
+        type: "boolean",
+        label: "Load Memory From Include Directories",
+        category: "Context",
         requiresRestart: false,
         default: false,
-        description: 'Whether to load memory files from include directories.',
+        description: "Whether to load memory files from include directories.",
         showInDialog: false,
       },
       fileFiltering: {
-        type: 'object',
-        label: 'File Filtering',
-        category: 'Context',
+        type: "object",
+        label: "File Filtering",
+        category: "Context",
         requiresRestart: true,
         default: {},
-        description: 'Settings for git-aware file filtering.',
+        description: "Settings for git-aware file filtering.",
         showInDialog: false,
         properties: {
           respectGitIgnore: {
-            type: 'boolean',
-            label: 'Respect .gitignore',
-            category: 'Context',
+            type: "boolean",
+            label: "Respect .gitignore",
+            category: "Context",
             requiresRestart: true,
             default: true,
-            description: 'Respect .gitignore files when searching',
+            description: "Respect .gitignore files when searching",
             showInDialog: true,
           },
           respectAiriscodeIgnore: {
-            type: 'boolean',
-            label: 'Respect .airiscodeigenore',
-            category: 'Context',
+            type: "boolean",
+            label: "Respect .airiscodeigenore",
+            category: "Context",
             requiresRestart: true,
             default: true,
-            description: 'Respect .airiscodeigenore files when searching',
+            description: "Respect .airiscodeigenore files when searching",
             showInDialog: true,
           },
           enableRecursiveFileSearch: {
-            type: 'boolean',
-            label: 'Enable Recursive File Search',
-            category: 'Context',
+            type: "boolean",
+            label: "Enable Recursive File Search",
+            category: "Context",
             requiresRestart: true,
             default: true,
-            description: 'Enable recursive file search functionality',
+            description: "Enable recursive file search functionality",
             showInDialog: false,
           },
           enableFuzzySearch: {
-            type: 'boolean',
-            label: 'Enable Fuzzy Search',
-            category: 'Context',
+            type: "boolean",
+            label: "Enable Fuzzy Search",
+            category: "Context",
             requiresRestart: true,
             default: true,
-            description: 'Enable fuzzy search when searching for files.',
+            description: "Enable fuzzy search when searching for files.",
             showInDialog: true,
           },
         },
       },
       gapThresholdMinutes: {
-        type: 'number',
-        label: 'Thinking Block Idle Threshold (minutes)',
-        category: 'Context',
+        type: "number",
+        label: "Thinking Block Idle Threshold (minutes)",
+        category: "Context",
         requiresRestart: false,
         default: 5,
         description:
-          'Minutes of inactivity after which retained thinking blocks are cleared to free context tokens. Aligns with provider prompt-cache TTL.',
+          "Minutes of inactivity after which retained thinking blocks are cleared to free context tokens. Aligns with provider prompt-cache TTL.",
         showInDialog: false,
       },
     },
   },
 
   permissions: {
-    type: 'object',
-    label: 'Permissions',
-    category: 'Tools',
+    type: "object",
+    label: "Permissions",
+    category: "Tools",
     requiresRestart: true,
     default: {},
     description:
-      'Permission rules controlling tool usage. Rules are evaluated in priority order: deny > ask > allow.',
+      "Permission rules controlling tool usage. Rules are evaluated in priority order: deny > ask > allow.",
     showInDialog: false,
     properties: {
       allow: {
-        type: 'array',
-        label: 'Allow Rules',
-        category: 'Tools',
+        type: "array",
+        label: "Allow Rules",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string[] | undefined,
         description:
-          'Tools or commands that are auto-approved without confirmation. ' +
+          "Tools or commands that are auto-approved without confirmation. " +
           'Examples: "ShellTool", "Bash(git *)", "ReadFileTool".',
         showInDialog: false,
         mergeStrategy: MergeStrategy.UNION,
       },
       ask: {
-        type: 'array',
-        label: 'Ask Rules',
-        category: 'Tools',
+        type: "array",
+        label: "Ask Rules",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string[] | undefined,
         description:
-          'Tools or commands that always require user confirmation. ' +
-          'Takes precedence over allow rules.',
+          "Tools or commands that always require user confirmation. " +
+          "Takes precedence over allow rules.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.UNION,
       },
       deny: {
-        type: 'array',
-        label: 'Deny Rules',
-        category: 'Tools',
+        type: "array",
+        label: "Deny Rules",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string[] | undefined,
         description:
-          'Tools or commands that are always blocked. Highest priority rule. ' +
+          "Tools or commands that are always blocked. Highest priority rule. " +
           'Examples: "ShellTool", "Bash(rm -rf *)".',
         showInDialog: false,
         mergeStrategy: MergeStrategy.UNION,
@@ -996,60 +970,58 @@ const SETTINGS_SCHEMA = {
   },
 
   tools: {
-    type: 'object',
-    label: 'Tools',
-    category: 'Tools',
+    type: "object",
+    label: "Tools",
+    category: "Tools",
     requiresRestart: true,
     default: {},
-    description: 'Settings for built-in and custom tools.',
+    description: "Settings for built-in and custom tools.",
     showInDialog: false,
     properties: {
       sandbox: {
-        type: 'object',
-        label: 'Sandbox',
-        category: 'Tools',
+        type: "object",
+        label: "Sandbox",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as boolean | string | undefined,
-        description:
-          'Sandbox execution environment (can be a boolean or a path string).',
+        description: "Sandbox execution environment (can be a boolean or a path string).",
         showInDialog: false,
       },
       shell: {
-        type: 'object',
-        label: 'Shell',
-        category: 'Tools',
+        type: "object",
+        label: "Shell",
+        category: "Tools",
         requiresRestart: false,
         default: {},
-        description: 'Settings for shell execution.',
+        description: "Settings for shell execution.",
         showInDialog: false,
         properties: {
           enableInteractiveShell: {
-            type: 'boolean',
-            label: 'Interactive Shell (PTY)',
-            category: 'Tools',
+            type: "boolean",
+            label: "Interactive Shell (PTY)",
+            category: "Tools",
             requiresRestart: true,
             default: true,
             description:
-              'Use node-pty for an interactive shell experience. Falls back to child_process if PTY is unavailable.',
+              "Use node-pty for an interactive shell experience. Falls back to child_process if PTY is unavailable.",
             showInDialog: true,
           },
           pager: {
-            type: 'string',
-            label: 'Pager',
-            category: 'Tools',
+            type: "string",
+            label: "Pager",
+            category: "Tools",
             requiresRestart: false,
-            default: 'cat' as string | undefined,
-            description:
-              'The pager command to use for shell output. Defaults to `cat`.',
+            default: "cat" as string | undefined,
+            description: "The pager command to use for shell output. Defaults to `cat`.",
             showInDialog: false,
           },
           showColor: {
-            type: 'boolean',
-            label: 'Show Color',
-            category: 'Tools',
+            type: "boolean",
+            label: "Show Color",
+            category: "Tools",
             requiresRestart: false,
             default: false,
-            description: 'Show color in shell output.',
+            description: "Show color in shell output.",
             showInDialog: false,
           },
         },
@@ -1057,91 +1029,91 @@ const SETTINGS_SCHEMA = {
       // Legacy tool permission fields – kept for backward compatibility.
       // Use permissions.{allow,ask,deny} instead.
       core: {
-        type: 'array',
-        label: 'Core Tools (deprecated)',
-        category: 'Tools',
+        type: "array",
+        label: "Core Tools (deprecated)",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'Deprecated. Use permissions.allow instead.',
+        description: "Deprecated. Use permissions.allow instead.",
         showInDialog: false,
       },
       allowed: {
-        type: 'array',
-        label: 'Allowed Tools (deprecated)',
-        category: 'Advanced',
+        type: "array",
+        label: "Allowed Tools (deprecated)",
+        category: "Advanced",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'Deprecated. Use permissions.allow instead.',
+        description: "Deprecated. Use permissions.allow instead.",
         showInDialog: false,
       },
       exclude: {
-        type: 'array',
-        label: 'Exclude Tools (deprecated)',
-        category: 'Tools',
+        type: "array",
+        label: "Exclude Tools (deprecated)",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'Deprecated. Use permissions.deny instead.',
+        description: "Deprecated. Use permissions.deny instead.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.UNION,
       },
       approvalMode: {
-        type: 'enum',
-        label: 'Tool Approval Mode',
-        category: 'Tools',
+        type: "enum",
+        label: "Tool Approval Mode",
+        category: "Tools",
         requiresRestart: false,
         default: ApprovalMode.DEFAULT,
         description:
-          'Approval mode for tool usage. Controls how tools are approved before execution.',
+          "Approval mode for tool usage. Controls how tools are approved before execution.",
         showInDialog: true,
         options: [
-          { value: ApprovalMode.PLAN, label: 'Plan' },
-          { value: ApprovalMode.DEFAULT, label: 'Default' },
-          { value: ApprovalMode.AUTO_EDIT, label: 'Auto Edit' },
-          { value: ApprovalMode.YOLO, label: 'YOLO' },
+          { value: ApprovalMode.PLAN, label: "Plan" },
+          { value: ApprovalMode.DEFAULT, label: "Default" },
+          { value: ApprovalMode.AUTO_EDIT, label: "Auto Edit" },
+          { value: ApprovalMode.YOLO, label: "YOLO" },
         ],
       },
       autoAccept: {
-        type: 'boolean',
-        label: 'Auto Accept',
-        category: 'Tools',
+        type: "boolean",
+        label: "Auto Accept",
+        category: "Tools",
         requiresRestart: false,
         default: false,
         description:
-          'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation.',
+          "Automatically accept and execute tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation.",
         showInDialog: false,
       },
       discoveryCommand: {
-        type: 'string',
-        label: 'Tool Discovery Command',
-        category: 'Tools',
+        type: "string",
+        label: "Tool Discovery Command",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string | undefined,
-        description: 'Command to run for tool discovery.',
+        description: "Command to run for tool discovery.",
         showInDialog: false,
       },
       callCommand: {
-        type: 'string',
-        label: 'Tool Call Command',
-        category: 'Tools',
+        type: "string",
+        label: "Tool Call Command",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string | undefined,
-        description: 'Command to run for tool calls.',
+        description: "Command to run for tool calls.",
         showInDialog: false,
       },
       useRipgrep: {
-        type: 'boolean',
-        label: 'Use Ripgrep',
-        category: 'Tools',
+        type: "boolean",
+        label: "Use Ripgrep",
+        category: "Tools",
         requiresRestart: false,
         default: true,
         description:
-          'Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.',
+          "Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.",
         showInDialog: false,
       },
       useBuiltinRipgrep: {
-        type: 'boolean',
-        label: 'Use Builtin Ripgrep',
-        category: 'Tools',
+        type: "boolean",
+        label: "Use Builtin Ripgrep",
+        category: "Tools",
         requiresRestart: false,
         default: true,
         description:
@@ -1149,149 +1121,149 @@ const SETTINGS_SCHEMA = {
         showInDialog: false,
       },
       truncateToolOutputThreshold: {
-        type: 'number',
-        label: 'Tool Output Truncation Threshold',
-        category: 'General',
+        type: "number",
+        label: "Tool Output Truncation Threshold",
+        category: "General",
         requiresRestart: true,
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
         description:
-          'Truncate tool output if it is larger than this many characters. Set to -1 to disable.',
+          "Truncate tool output if it is larger than this many characters. Set to -1 to disable.",
         showInDialog: false,
       },
       truncateToolOutputLines: {
-        type: 'number',
-        label: 'Tool Output Truncation Lines',
-        category: 'General',
+        type: "number",
+        label: "Tool Output Truncation Lines",
+        category: "General",
         requiresRestart: true,
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-        description: 'The number of lines to keep when truncating tool output.',
+        description: "The number of lines to keep when truncating tool output.",
         showInDialog: false,
       },
     },
   },
 
   mcp: {
-    type: 'object',
-    label: 'MCP',
-    category: 'MCP',
+    type: "object",
+    label: "MCP",
+    category: "MCP",
     requiresRestart: true,
     default: {},
-    description: 'Settings for Model Context Protocol (MCP) servers.',
+    description: "Settings for Model Context Protocol (MCP) servers.",
     showInDialog: false,
     properties: {
       serverCommand: {
-        type: 'string',
-        label: 'MCP Server Command',
-        category: 'MCP',
+        type: "string",
+        label: "MCP Server Command",
+        category: "MCP",
         requiresRestart: true,
         default: undefined as string | undefined,
-        description: 'Command to start an MCP server.',
+        description: "Command to start an MCP server.",
         showInDialog: false,
       },
       allowed: {
-        type: 'array',
-        label: 'Allow MCP Servers',
-        category: 'MCP',
+        type: "array",
+        label: "Allow MCP Servers",
+        category: "MCP",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'A list of MCP servers to allow.',
+        description: "A list of MCP servers to allow.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
       },
       excluded: {
-        type: 'array',
-        label: 'Exclude MCP Servers',
-        category: 'MCP',
+        type: "array",
+        label: "Exclude MCP Servers",
+        category: "MCP",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'A list of MCP servers to exclude.',
+        description: "A list of MCP servers to exclude.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
       },
     },
   },
   security: {
-    type: 'object',
-    label: 'Security',
-    category: 'Security',
+    type: "object",
+    label: "Security",
+    category: "Security",
     requiresRestart: true,
     default: {},
-    description: 'Security-related settings.',
+    description: "Security-related settings.",
     showInDialog: false,
     properties: {
       folderTrust: {
-        type: 'object',
-        label: 'Folder Trust',
-        category: 'Security',
+        type: "object",
+        label: "Folder Trust",
+        category: "Security",
         requiresRestart: false,
         default: {},
-        description: 'Settings for folder trust.',
+        description: "Settings for folder trust.",
         showInDialog: false,
         properties: {
           enabled: {
-            type: 'boolean',
-            label: 'Folder Trust',
-            category: 'Security',
+            type: "boolean",
+            label: "Folder Trust",
+            category: "Security",
             requiresRestart: true,
             default: false,
-            description: 'Setting to track whether Folder trust is enabled.',
+            description: "Setting to track whether Folder trust is enabled.",
             showInDialog: false,
           },
         },
       },
       auth: {
-        type: 'object',
-        label: 'Authentication',
-        category: 'Security',
+        type: "object",
+        label: "Authentication",
+        category: "Security",
         requiresRestart: true,
         default: {},
-        description: 'Authentication settings.',
+        description: "Authentication settings.",
         showInDialog: false,
         properties: {
           selectedType: {
-            type: 'string',
-            label: 'Selected Auth Type',
-            category: 'Security',
+            type: "string",
+            label: "Selected Auth Type",
+            category: "Security",
             requiresRestart: true,
             default: undefined as AuthType | undefined,
-            description: 'The currently selected authentication type.',
+            description: "The currently selected authentication type.",
             showInDialog: false,
           },
           enforcedType: {
-            type: 'string',
-            label: 'Enforced Auth Type',
-            category: 'Advanced',
+            type: "string",
+            label: "Enforced Auth Type",
+            category: "Advanced",
             requiresRestart: true,
             default: undefined as AuthType | undefined,
             description:
-              'The required auth type. If this does not match the selected auth type, the user will be prompted to re-authenticate.',
+              "The required auth type. If this does not match the selected auth type, the user will be prompted to re-authenticate.",
             showInDialog: false,
           },
           useExternal: {
-            type: 'boolean',
-            label: 'Use External Auth',
-            category: 'Security',
+            type: "boolean",
+            label: "Use External Auth",
+            category: "Security",
             requiresRestart: true,
             default: undefined as boolean | undefined,
-            description: 'Whether to use an external authentication flow.',
+            description: "Whether to use an external authentication flow.",
             showInDialog: false,
           },
           apiKey: {
-            type: 'string',
-            label: 'API Key',
-            category: 'Security',
+            type: "string",
+            label: "API Key",
+            category: "Security",
             requiresRestart: true,
             default: undefined as string | undefined,
-            description: 'API key for OpenAI compatible authentication.',
+            description: "API key for OpenAI compatible authentication.",
             showInDialog: false,
           },
           baseUrl: {
-            type: 'string',
-            label: 'Base URL',
-            category: 'Security',
+            type: "string",
+            label: "Base URL",
+            category: "Security",
             requiresRestart: true,
             default: undefined as string | undefined,
-            description: 'Base URL for OpenAI compatible API.',
+            description: "Base URL for OpenAI compatible API.",
             showInDialog: false,
           },
         },
@@ -1300,346 +1272,342 @@ const SETTINGS_SCHEMA = {
   },
 
   advanced: {
-    type: 'object',
-    label: 'Advanced',
-    category: 'Advanced',
+    type: "object",
+    label: "Advanced",
+    category: "Advanced",
     requiresRestart: true,
     default: {},
-    description: 'Advanced settings for power users.',
+    description: "Advanced settings for power users.",
     showInDialog: false,
     properties: {
       autoConfigureMemory: {
-        type: 'boolean',
-        label: 'Auto Configure Max Old Space Size',
-        category: 'Advanced',
+        type: "boolean",
+        label: "Auto Configure Max Old Space Size",
+        category: "Advanced",
         requiresRestart: true,
         default: false,
-        description: 'Automatically configure Node.js memory limits',
+        description: "Automatically configure Node.js memory limits",
         showInDialog: false,
       },
       dnsResolutionOrder: {
-        type: 'string',
-        label: 'DNS Resolution Order',
-        category: 'Advanced',
+        type: "string",
+        label: "DNS Resolution Order",
+        category: "Advanced",
         requiresRestart: true,
         default: undefined as DnsResolutionOrder | undefined,
-        description: 'The DNS resolution order.',
+        description: "The DNS resolution order.",
         showInDialog: false,
       },
       excludedEnvVars: {
-        type: 'array',
-        label: 'Excluded Project Environment Variables',
-        category: 'Advanced',
+        type: "array",
+        label: "Excluded Project Environment Variables",
+        category: "Advanced",
         requiresRestart: false,
-        default: ['DEBUG', 'DEBUG_MODE'] as string[],
-        description: 'Environment variables to exclude from project context.',
+        default: ["DEBUG", "DEBUG_MODE"] as string[],
+        description: "Environment variables to exclude from project context.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.UNION,
       },
       bugCommand: {
-        type: 'object',
-        label: 'Bug Command',
-        category: 'Advanced',
+        type: "object",
+        label: "Bug Command",
+        category: "Advanced",
         requiresRestart: false,
         default: undefined as BugCommandSettings | undefined,
-        description: 'Configuration for the bug report command.',
+        description: "Configuration for the bug report command.",
         showInDialog: false,
       },
       runtimeOutputDir: {
-        type: 'string',
-        label: 'Runtime Output Directory',
-        category: 'Advanced',
+        type: "string",
+        label: "Runtime Output Directory",
+        category: "Advanced",
         requiresRestart: true,
         default: undefined as string | undefined,
         description:
-          'Custom directory for runtime output (temp files, debug logs, session data, todos, etc.). ' +
-          'Config files remain at ~/.qwen. Env var QWEN_RUNTIME_DIR takes priority.',
+          "Custom directory for runtime output (temp files, debug logs, session data, todos, etc.). " +
+          "Config files remain at ~/.qwen. Env var QWEN_RUNTIME_DIR takes priority.",
         showInDialog: false,
       },
       tavilyApiKey: {
-        type: 'string',
-        label: 'Tavily API Key (Deprecated)',
-        category: 'Advanced',
+        type: "string",
+        label: "Tavily API Key (Deprecated)",
+        category: "Advanced",
         requiresRestart: false,
         default: undefined as string | undefined,
         description:
-          '⚠️ DEPRECATED: Please use webSearch.provider configuration instead. Legacy API key for the Tavily API.',
+          "⚠️ DEPRECATED: Please use webSearch.provider configuration instead. Legacy API key for the Tavily API.",
         showInDialog: false,
       },
     },
   },
 
   webSearch: {
-    type: 'object',
-    label: 'Web Search',
-    category: 'Advanced',
+    type: "object",
+    label: "Web Search",
+    category: "Advanced",
     requiresRestart: true,
     default: undefined as
       | {
           provider: Array<{
-            type: 'tavily' | 'google' | 'dashscope';
+            type: "tavily" | "google" | "dashscope";
             apiKey?: string;
             searchEngineId?: string;
           }>;
           default: string;
         }
       | undefined,
-    description: 'Configuration for web search providers.',
+    description: "Configuration for web search providers.",
     showInDialog: false,
   },
   agents: {
-    type: 'object',
-    label: 'Agents',
-    category: 'Advanced',
+    type: "object",
+    label: "Agents",
+    category: "Advanced",
     requiresRestart: false,
     default: {},
-    description:
-      'Settings for multi-agent collaboration features (Arena, Team, Swarm).',
+    description: "Settings for multi-agent collaboration features (Arena, Team, Swarm).",
     showInDialog: false,
     properties: {
       displayMode: {
-        type: 'enum',
-        label: 'Display Mode',
-        category: 'Advanced',
+        type: "enum",
+        label: "Display Mode",
+        category: "Advanced",
         requiresRestart: false,
         default: undefined as string | undefined,
         description:
           'Display mode for multi-agent sessions. Currently only "in-process" is supported.',
         showInDialog: false,
         options: [
-          { value: 'in-process', label: 'In-process' },
+          { value: "in-process", label: "In-process" },
           // { value: 'tmux', label: 'tmux' },
           // { value: 'iterm2', label: 'iTerm2' },
         ],
       },
       arena: {
-        type: 'object',
-        label: 'Arena',
-        category: 'Advanced',
+        type: "object",
+        label: "Arena",
+        category: "Advanced",
         requiresRestart: false,
         default: {},
-        description: 'Settings for Arena (multi-model competitive execution).',
+        description: "Settings for Arena (multi-model competitive execution).",
         showInDialog: false,
         properties: {
           worktreeBaseDir: {
-            type: 'string',
-            label: 'Worktree Base Directory',
-            category: 'Advanced',
+            type: "string",
+            label: "Worktree Base Directory",
+            category: "Advanced",
             requiresRestart: true,
             default: undefined as string | undefined,
             description:
-              'Custom base directory for Arena worktrees. Defaults to ~/.airiscode/arena.',
+              "Custom base directory for Arena worktrees. Defaults to ~/.airiscode/arena.",
             showInDialog: false,
           },
           preserveArtifacts: {
-            type: 'boolean',
-            label: 'Preserve Arena Artifacts',
-            category: 'Advanced',
+            type: "boolean",
+            label: "Preserve Arena Artifacts",
+            category: "Advanced",
             requiresRestart: false,
             default: false,
             description:
-              'When enabled, Arena worktrees and session state files are preserved after the session ends or the main agent exits.',
+              "When enabled, Arena worktrees and session state files are preserved after the session ends or the main agent exits.",
             showInDialog: true,
           },
           maxRoundsPerAgent: {
-            type: 'number',
-            label: 'Max Rounds Per Agent',
-            category: 'Advanced',
+            type: "number",
+            label: "Max Rounds Per Agent",
+            category: "Advanced",
             requiresRestart: false,
             default: undefined as number | undefined,
             description:
-              'Maximum number of rounds (turns) each agent can execute. No limit if unset.',
+              "Maximum number of rounds (turns) each agent can execute. No limit if unset.",
             showInDialog: false,
           },
           timeoutSeconds: {
-            type: 'number',
-            label: 'Timeout (seconds)',
-            category: 'Advanced',
+            type: "number",
+            label: "Timeout (seconds)",
+            category: "Advanced",
             requiresRestart: false,
             default: undefined as number | undefined,
-            description:
-              'Total timeout in seconds for the Arena session. No limit if unset.',
+            description: "Total timeout in seconds for the Arena session. No limit if unset.",
             showInDialog: false,
           },
         },
       },
       team: {
-        type: 'object',
-        label: 'Team',
-        category: 'Advanced',
+        type: "object",
+        label: "Team",
+        category: "Advanced",
         requiresRestart: false,
         default: {},
         description:
-          'Settings for Agent Team (role-based collaborative execution). Reserved for future use.',
+          "Settings for Agent Team (role-based collaborative execution). Reserved for future use.",
         showInDialog: false,
       },
       swarm: {
-        type: 'object',
-        label: 'Swarm',
-        category: 'Advanced',
+        type: "object",
+        label: "Swarm",
+        category: "Advanced",
         requiresRestart: false,
         default: {},
         description:
-          'Settings for Agent Swarm (parallel sub-agent execution). Reserved for future use.',
+          "Settings for Agent Swarm (parallel sub-agent execution). Reserved for future use.",
         showInDialog: false,
       },
     },
   },
 
   disableAllHooks: {
-    type: 'boolean',
-    label: 'Disable All Hooks',
-    category: 'Advanced',
+    type: "boolean",
+    label: "Disable All Hooks",
+    category: "Advanced",
     requiresRestart: true, // Future enhancement: consider supporting mid-session toggle for better UX
     default: false,
     description:
-      'Temporarily disable all hooks without deleting configurations. Default is false (hooks enabled).',
+      "Temporarily disable all hooks without deleting configurations. Default is false (hooks enabled).",
     showInDialog: false,
   },
 
   hooks: {
-    type: 'object',
-    label: 'Hooks',
-    category: 'Advanced',
+    type: "object",
+    label: "Hooks",
+    category: "Advanced",
     requiresRestart: false,
     default: {},
     description:
-      'Hook event configurations for extending CLI behavior at various lifecycle points.',
+      "Hook event configurations for extending CLI behavior at various lifecycle points.",
     showInDialog: false,
     properties: {
       UserPromptSubmit: {
-        type: 'array',
-        label: 'Before Agent Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Before Agent Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute before agent processing. Can modify prompts or inject context.',
+          "Hooks that execute before agent processing. Can modify prompts or inject context.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       Stop: {
-        type: 'array',
-        label: 'After Agent Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "After Agent Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute after agent processing. Can post-process responses or log interactions.',
+          "Hooks that execute after agent processing. Can post-process responses or log interactions.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       Notification: {
-        type: 'array',
-        label: 'Notification Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Notification Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description: 'Hooks that execute when notifications are sent.',
+        description: "Hooks that execute when notifications are sent.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       PreToolUse: {
-        type: 'array',
-        label: 'Pre Tool Use Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Pre Tool Use Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description: 'Hooks that execute before tool execution.',
+        description: "Hooks that execute before tool execution.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       PostToolUse: {
-        type: 'array',
-        label: 'Post Tool Use Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Post Tool Use Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description: 'Hooks that execute after successful tool execution.',
+        description: "Hooks that execute after successful tool execution.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       PostToolUseFailure: {
-        type: 'array',
-        label: 'Post Tool Use Failure Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Post Tool Use Failure Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description: 'Hooks that execute when tool execution fails. ',
+        description: "Hooks that execute when tool execution fails. ",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       SessionStart: {
-        type: 'array',
-        label: 'Session Start Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Session Start Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description: 'Hooks that execute when a new session starts or resumes.',
+        description: "Hooks that execute when a new session starts or resumes.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       SessionEnd: {
-        type: 'array',
-        label: 'Session End Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Session End Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description: 'Hooks that execute when a session ends.',
+        description: "Hooks that execute when a session ends.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       PreCompact: {
-        type: 'array',
-        label: 'Pre Compact Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Pre Compact Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description: 'Hooks that execute before conversation compaction.',
+        description: "Hooks that execute before conversation compaction.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       SubagentStart: {
-        type: 'array',
-        label: 'Subagent Start Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Subagent Start Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description:
-          'Hooks that execute when a subagent (Task tool call) is started.',
+        description: "Hooks that execute when a subagent (Task tool call) is started.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       SubagentStop: {
-        type: 'array',
-        label: 'Subagent Stop Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Subagent Stop Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute right before a subagent (Task tool call) concludes its response.',
+          "Hooks that execute right before a subagent (Task tool call) concludes its response.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
       },
       PermissionRequest: {
-        type: 'array',
-        label: 'Permission Request Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Permission Request Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
-        description:
-          'Hooks that execute when a permission dialog is displayed.',
+        description: "Hooks that execute when a permission dialog is displayed.",
         showInDialog: false,
         mergeStrategy: MergeStrategy.CONCAT,
         items: HOOK_DEFINITION_ITEMS,
@@ -1648,22 +1616,22 @@ const SETTINGS_SCHEMA = {
   },
 
   experimental: {
-    type: 'object',
-    label: 'Experimental',
-    category: 'Experimental',
+    type: "object",
+    label: "Experimental",
+    category: "Experimental",
     requiresRestart: true,
     default: {},
-    description: 'Settings to enable experimental features.',
+    description: "Settings to enable experimental features.",
     showInDialog: false,
     properties: {
       cron: {
-        type: 'boolean',
-        label: 'Enable Cron/Loop Tools',
-        category: 'Experimental',
+        type: "boolean",
+        label: "Enable Cron/Loop Tools",
+        category: "Experimental",
         requiresRestart: true,
         default: false,
         description:
-          'Enable in-session cron/loop tools (experimental). When enabled, the model can create recurring prompts using cron_create, cron_list, and cron_delete tools. Can also be enabled via AIRISCODE_ENABLE_CRON=1 environment variable.',
+          "Enable in-session cron/loop tools (experimental). When enabled, the model can create recurring prompts using cron_create, cron_list, and cron_delete tools. Can also be enabled via AIRISCODE_ENABLE_CRON=1 environment variable.",
         showInDialog: true,
       },
     },
@@ -1675,9 +1643,9 @@ export type SettingsSchemaType = typeof SETTINGS_SCHEMA;
 export function getSettingsSchema(): SettingsSchemaType {
   // Inject dynamic language options
   const schema = SETTINGS_SCHEMA as unknown as SettingsSchema;
-  if (schema['general']?.properties?.['language']) {
+  if (schema["general"]?.properties?.["language"]) {
     (
-      schema['general'].properties['language'] as unknown as {
+      schema["general"].properties["language"] as unknown as {
         options?: SettingEnumOption[];
       }
     ).options = getLanguageSettingsOptions();
@@ -1687,14 +1655,14 @@ export function getSettingsSchema(): SettingsSchemaType {
 
 type InferSettings<T extends SettingsSchema> = {
   -readonly [K in keyof T]?: T[K] extends { properties: SettingsSchema }
-    ? InferSettings<T[K]['properties']>
-    : T[K]['type'] extends 'enum'
-      ? T[K]['options'] extends readonly SettingEnumOption[]
-        ? T[K]['options'][number]['value']
-        : T[K]['default']
-      : T[K]['default'] extends boolean
+    ? InferSettings<T[K]["properties"]>
+    : T[K]["type"] extends "enum"
+      ? T[K]["options"] extends readonly SettingEnumOption[]
+        ? T[K]["options"][number]["value"]
+        : T[K]["default"]
+      : T[K]["default"] extends boolean
         ? boolean
-        : T[K]['default'];
+        : T[K]["default"];
 };
 
 export type Settings = InferSettings<SettingsSchemaType>;
diff --git a/apps/airiscode-cli/src/config/trustedFolders.ts b/apps/airiscode-cli/src/config/trustedFolders.ts
index d03c87c43..d1f12982b 100644
--- a/apps/airiscode-cli/src/config/trustedFolders.ts
+++ b/apps/airiscode-cli/src/config/trustedFolders.ts
@@ -4,34 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { homedir } from 'node:os';
-import {
-  FatalConfigError,
-  getErrorMessage,
-  isWithinRoot,
-  ideContextStore,
-} from '@airiscode/core';
-import type { Settings } from './settings.js';
-import stripJsonComments from 'strip-json-comments';
-import { writeStderrLine } from '../utils/stdioHelpers.js';
-
-export const TRUSTED_FOLDERS_FILENAME = 'trustedFolders.json';
-export const SETTINGS_DIRECTORY_NAME = '.airiscode';
+import * as fs from "node:fs";
+import { homedir } from "node:os";
+import * as path from "node:path";
+import { FatalConfigError, getErrorMessage, ideContextStore, isWithinRoot } from "@airiscode/core";
+import stripJsonComments from "strip-json-comments";
+import { writeStderrLine } from "../utils/stdioHelpers.js";
+import type { Settings } from "./settings.js";
+
+export const TRUSTED_FOLDERS_FILENAME = "trustedFolders.json";
+export const SETTINGS_DIRECTORY_NAME = ".airiscode";
 export const USER_SETTINGS_DIR = path.join(homedir(), SETTINGS_DIRECTORY_NAME);
 
 export function getTrustedFoldersPath(): string {
-  if (process.env['AIRISCODE_TRUSTED_FOLDERS_PATH']) {
-    return process.env['AIRISCODE_TRUSTED_FOLDERS_PATH'];
+  if (process.env["AIRISCODE_TRUSTED_FOLDERS_PATH"]) {
+    return process.env["AIRISCODE_TRUSTED_FOLDERS_PATH"];
   }
   return path.join(USER_SETTINGS_DIR, TRUSTED_FOLDERS_FILENAME);
 }
 
 export enum TrustLevel {
-  TRUST_FOLDER = 'TRUST_FOLDER',
-  TRUST_PARENT = 'TRUST_PARENT',
-  DO_NOT_TRUST = 'DO_NOT_TRUST',
+  TRUST_FOLDER = "TRUST_FOLDER",
+  TRUST_PARENT = "TRUST_PARENT",
+  DO_NOT_TRUST = "DO_NOT_TRUST",
 }
 
 export interface TrustRule {
@@ -51,7 +46,7 @@ export interface TrustedFoldersFile {
 
 export interface TrustResult {
   isTrusted: boolean | undefined;
-  source: 'ide' | 'file' | undefined;
+  source: "ide" | "file" | undefined;
 }
 
 export class LoadedTrustedFolders {
@@ -139,16 +134,12 @@ export function loadTrustedFolders(): LoadedTrustedFolders {
   // Load user trusted folders
   try {
     if (fs.existsSync(userPath)) {
-      const content = fs.readFileSync(userPath, 'utf-8');
+      const content = fs.readFileSync(userPath, "utf-8");
       const parsed: unknown = JSON.parse(stripJsonComments(content));
 
-      if (
-        typeof parsed !== 'object' ||
-        parsed === null ||
-        Array.isArray(parsed)
-      ) {
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
         errors.push({
-          message: 'Trusted folders file is not a valid JSON object.',
+          message: "Trusted folders file is not a valid JSON object.",
           path: userPath,
         });
       } else {
@@ -162,16 +153,11 @@ export function loadTrustedFolders(): LoadedTrustedFolders {
     });
   }
 
-  loadedTrustedFolders = new LoadedTrustedFolders(
-    { path: userPath, config: userConfig },
-    errors,
-  );
+  loadedTrustedFolders = new LoadedTrustedFolders({ path: userPath, config: userConfig }, errors);
   return loadedTrustedFolders;
 }
 
-export function saveTrustedFolders(
-  trustedFoldersFile: TrustedFoldersFile,
-): void {
+export function saveTrustedFolders(trustedFoldersFile: TrustedFoldersFile): void {
   try {
     // Ensure the directory exists
     const dirPath = path.dirname(trustedFoldersFile.path);
@@ -179,13 +165,12 @@ export function saveTrustedFolders(
       fs.mkdirSync(dirPath, { recursive: true });
     }
 
-    fs.writeFileSync(
-      trustedFoldersFile.path,
-      JSON.stringify(trustedFoldersFile.config, null, 2),
-      { encoding: 'utf-8', mode: 0o600 },
-    );
+    fs.writeFileSync(trustedFoldersFile.path, JSON.stringify(trustedFoldersFile.config, null, 2), {
+      encoding: "utf-8",
+      mode: 0o600,
+    });
   } catch (error) {
-    writeStderrLine('Error saving trusted folders file.');
+    writeStderrLine("Error saving trusted folders file.");
     writeStderrLine(error instanceof Error ? error.message : String(error));
   }
 }
@@ -196,9 +181,7 @@ export function isFolderTrustEnabled(settings: Settings): boolean {
   return folderTrustSetting;
 }
 
-function getWorkspaceTrustFromLocalConfig(
-  trustConfig?: Record<string, TrustLevel>,
-): TrustResult {
+function getWorkspaceTrustFromLocalConfig(trustConfig?: Record<string, TrustLevel>): TrustResult {
   const folders = loadTrustedFolders();
 
   if (trustConfig) {
@@ -206,18 +189,16 @@ function getWorkspaceTrustFromLocalConfig(
   }
 
   if (folders.errors.length > 0) {
-    const errorMessages = folders.errors.map(
-      (error) => `Error in ${error.path}: ${error.message}`,
-    );
+    const errorMessages = folders.errors.map((error) => `Error in ${error.path}: ${error.message}`);
     throw new FatalConfigError(
-      `${errorMessages.join('\n')}\nPlease fix the configuration file and try again.`,
+      `${errorMessages.join("\n")}\nPlease fix the configuration file and try again.`,
     );
   }
 
   const isTrusted = folders.isPathTrusted(process.cwd());
   return {
     isTrusted,
-    source: isTrusted !== undefined ? 'file' : undefined,
+    source: isTrusted !== undefined ? "file" : undefined,
   };
 }
 
@@ -231,7 +212,7 @@ export function isWorkspaceTrusted(
 
   const ideTrust = ideContextStore.get()?.workspaceState?.isTrusted;
   if (ideTrust !== undefined) {
-    return { isTrusted: ideTrust, source: 'ide' };
+    return { isTrusted: ideTrust, source: "ide" };
   }
 
   // Fall back to the local user configuration
diff --git a/apps/airiscode-cli/src/config/webSearch.ts b/apps/airiscode-cli/src/config/webSearch.ts
index 4d6eb4d95..9e98b8d33 100644
--- a/apps/airiscode-cli/src/config/webSearch.ts
+++ b/apps/airiscode-cli/src/config/webSearch.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { WebSearchProviderConfig } from '@airiscode/core';
-import type { Settings } from './settings.js';
+import type { WebSearchProviderConfig } from "@airiscode/core";
+import type { Settings } from "./settings.js";
 
 /**
  * CLI arguments related to web search configuration
@@ -52,22 +52,19 @@ export function buildWebSearchConfig(
   } else {
     // Build providers from command line args and environment variables
     const tavilyKey =
-      argv.tavilyApiKey ||
-      settings.advanced?.tavilyApiKey ||
-      process.env['TAVILY_API_KEY'];
+      argv.tavilyApiKey || settings.advanced?.tavilyApiKey || process.env["TAVILY_API_KEY"];
     if (tavilyKey) {
       providers.push({
-        type: 'tavily',
+        type: "tavily",
         apiKey: tavilyKey,
       } as WebSearchProviderConfig);
     }
 
-    const googleKey = argv.googleApiKey || process.env['GOOGLE_API_KEY'];
-    const googleEngineId =
-      argv.googleSearchEngineId || process.env['GOOGLE_SEARCH_ENGINE_ID'];
+    const googleKey = argv.googleApiKey || process.env["GOOGLE_API_KEY"];
+    const googleEngineId = argv.googleSearchEngineId || process.env["GOOGLE_SEARCH_ENGINE_ID"];
     if (googleKey && googleEngineId) {
       providers.push({
-        type: 'google',
+        type: "google",
         apiKey: googleKey,
         searchEngineId: googleEngineId,
       } as WebSearchProviderConfig);
@@ -81,10 +78,10 @@ export function buildWebSearchConfig(
 
   // Step 4: Determine default provider
   // Priority: user explicit config > CLI arg > first available provider (tavily > google > dashscope)
-  const providerPriority: Array<'tavily' | 'google' | 'dashscope'> = [
-    'tavily',
-    'google',
-    'dashscope',
+  const providerPriority: Array<"tavily" | "google" | "dashscope"> = [
+    "tavily",
+    "google",
+    "dashscope",
   ];
 
   // Determine default provider based on availability
@@ -99,7 +96,7 @@ export function buildWebSearchConfig(
     }
     // Fallback to first available provider if none found in priority list
     if (!defaultProvider) {
-      defaultProvider = providers[0]?.type || 'dashscope';
+      defaultProvider = providers[0]?.type || "dashscope";
     }
   }
 
diff --git a/apps/airiscode-cli/src/constants/alibabaStandardApiKey.ts b/apps/airiscode-cli/src/constants/alibabaStandardApiKey.ts
index cb1c6170c..d48dd5a29 100644
--- a/apps/airiscode-cli/src/constants/alibabaStandardApiKey.ts
+++ b/apps/airiscode-cli/src/constants/alibabaStandardApiKey.ts
@@ -4,21 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export type AlibabaStandardRegion =
-  | 'cn-beijing'
-  | 'sg-singapore'
-  | 'us-virginia'
-  | 'cn-hongkong';
+export type AlibabaStandardRegion = "cn-beijing" | "sg-singapore" | "us-virginia" | "cn-hongkong";
 
-export const DASHSCOPE_STANDARD_API_KEY_ENV_KEY = 'DASHSCOPE_API_KEY';
+export const DASHSCOPE_STANDARD_API_KEY_ENV_KEY = "DASHSCOPE_API_KEY";
 
-export const ALIBABA_STANDARD_API_KEY_ENDPOINTS: Record<
-  AlibabaStandardRegion,
-  string
-> = {
-  'cn-beijing': 'https://dashscope.aliyuncs.com/compatible-mode/v1',
-  'sg-singapore': 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1',
-  'us-virginia': 'https://dashscope-us.aliyuncs.com/compatible-mode/v1',
-  'cn-hongkong':
-    'https://cn-hongkong.dashscope.aliyuncs.com/compatible-mode/v1',
+export const ALIBABA_STANDARD_API_KEY_ENDPOINTS: Record<AlibabaStandardRegion, string> = {
+  "cn-beijing": "https://dashscope.aliyuncs.com/compatible-mode/v1",
+  "sg-singapore": "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
+  "us-virginia": "https://dashscope-us.aliyuncs.com/compatible-mode/v1",
+  "cn-hongkong": "https://cn-hongkong.dashscope.aliyuncs.com/compatible-mode/v1",
 };
diff --git a/apps/airiscode-cli/src/constants/codingPlan.ts b/apps/airiscode-cli/src/constants/codingPlan.ts
index fb207a0b5..538cd1479 100644
--- a/apps/airiscode-cli/src/constants/codingPlan.ts
+++ b/apps/airiscode-cli/src/constants/codingPlan.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createHash } from 'node:crypto';
-import type { ProviderModelConfig as ModelConfig } from '@airiscode/core';
+import { createHash } from "node:crypto";
+import type { ProviderModelConfig as ModelConfig } from "@airiscode/core";
 
 /**
  * Coding plan regions
  */
 export enum CodingPlanRegion {
-  CHINA = 'china',
-  GLOBAL = 'global',
+  CHINA = "china",
+  GLOBAL = "global",
 }
 
 /**
@@ -25,7 +25,7 @@ export type CodingPlanTemplate = ModelConfig[];
  * Environment variable key for storing the coding plan API key.
  * Unified key for both regions since they are mutually exclusive.
  */
-export const CODING_PLAN_ENV_KEY = 'BAILIAN_CODING_PLAN_API_KEY';
+export const CODING_PLAN_ENV_KEY = "BAILIAN_CODING_PLAN_API_KEY";
 
 /**
  * Computes the version hash for the coding plan template.
@@ -35,7 +35,7 @@ export const CODING_PLAN_ENV_KEY = 'BAILIAN_CODING_PLAN_API_KEY';
  */
 export function computeCodingPlanVersion(template: CodingPlanTemplate): string {
   const templateString = JSON.stringify(template);
-  return createHash('sha256').update(templateString).digest('hex');
+  return createHash("sha256").update(templateString).digest("hex");
 }
 
 /**
@@ -45,17 +45,15 @@ export function computeCodingPlanVersion(template: CodingPlanTemplate): string {
  * @param region - The region to generate template for
  * @returns Complete model configuration array for the region
  */
-export function generateCodingPlanTemplate(
-  region: CodingPlanRegion,
-): CodingPlanTemplate {
+export function generateCodingPlanTemplate(region: CodingPlanRegion): CodingPlanTemplate {
   if (region === CodingPlanRegion.CHINA) {
     // China region uses legacy fields to maintain backward compatibility
     // This ensures existing users don't get prompted for unnecessary updates
     return [
       {
-        id: 'qwen3.6-plus',
-        name: '[ModelStudio Coding Plan] qwen3.6-plus',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "qwen3.6-plus",
+        name: "[ModelStudio Coding Plan] qwen3.6-plus",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           extra_body: {
@@ -65,9 +63,9 @@ export function generateCodingPlanTemplate(
         },
       },
       {
-        id: 'qwen3.5-plus',
-        name: '[ModelStudio Coding Plan] qwen3.5-plus',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "qwen3.5-plus",
+        name: "[ModelStudio Coding Plan] qwen3.5-plus",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           extra_body: {
@@ -77,9 +75,9 @@ export function generateCodingPlanTemplate(
         },
       },
       {
-        id: 'glm-5',
-        name: '[ModelStudio Coding Plan] glm-5',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "glm-5",
+        name: "[ModelStudio Coding Plan] glm-5",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           extra_body: {
@@ -89,9 +87,9 @@ export function generateCodingPlanTemplate(
         },
       },
       {
-        id: 'kimi-k2.5',
-        name: '[ModelStudio Coding Plan] kimi-k2.5',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "kimi-k2.5",
+        name: "[ModelStudio Coding Plan] kimi-k2.5",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           extra_body: {
@@ -101,9 +99,9 @@ export function generateCodingPlanTemplate(
         },
       },
       {
-        id: 'MiniMax-M2.5',
-        name: '[ModelStudio Coding Plan] MiniMax-M2.5',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "MiniMax-M2.5",
+        name: "[ModelStudio Coding Plan] MiniMax-M2.5",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           extra_body: {
@@ -113,27 +111,27 @@ export function generateCodingPlanTemplate(
         },
       },
       {
-        id: 'qwen3-coder-plus',
-        name: '[ModelStudio Coding Plan] qwen3-coder-plus',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "qwen3-coder-plus",
+        name: "[ModelStudio Coding Plan] qwen3-coder-plus",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           contextWindowSize: 1000000,
         },
       },
       {
-        id: 'qwen3-coder-next',
-        name: '[ModelStudio Coding Plan] qwen3-coder-next',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "qwen3-coder-next",
+        name: "[ModelStudio Coding Plan] qwen3-coder-next",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           contextWindowSize: 262144,
         },
       },
       {
-        id: 'qwen3-max-2026-01-23',
-        name: '[ModelStudio Coding Plan] qwen3-max-2026-01-23',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "qwen3-max-2026-01-23",
+        name: "[ModelStudio Coding Plan] qwen3-max-2026-01-23",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           extra_body: {
@@ -143,9 +141,9 @@ export function generateCodingPlanTemplate(
         },
       },
       {
-        id: 'glm-4.7',
-        name: '[ModelStudio Coding Plan] glm-4.7',
-        baseUrl: 'https://coding.dashscope.aliyuncs.com/v1',
+        id: "glm-4.7",
+        name: "[ModelStudio Coding Plan] glm-4.7",
+        baseUrl: "https://coding.dashscope.aliyuncs.com/v1",
         envKey: CODING_PLAN_ENV_KEY,
         generationConfig: {
           extra_body: {
@@ -160,9 +158,9 @@ export function generateCodingPlanTemplate(
   // Global region uses ModelStudio Coding Plan branding for Global/Intl
   return [
     {
-      id: 'qwen3.6-plus',
-      name: '[ModelStudio Coding Plan for Global/Intl] qwen3.6-plus',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "qwen3.6-plus",
+      name: "[ModelStudio Coding Plan for Global/Intl] qwen3.6-plus",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         extra_body: {
@@ -172,9 +170,9 @@ export function generateCodingPlanTemplate(
       },
     },
     {
-      id: 'qwen3.5-plus',
-      name: '[ModelStudio Coding Plan for Global/Intl] qwen3.5-plus',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "qwen3.5-plus",
+      name: "[ModelStudio Coding Plan for Global/Intl] qwen3.5-plus",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         extra_body: {
@@ -184,27 +182,27 @@ export function generateCodingPlanTemplate(
       },
     },
     {
-      id: 'qwen3-coder-plus',
-      name: '[ModelStudio Coding Plan for Global/Intl] qwen3-coder-plus',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "qwen3-coder-plus",
+      name: "[ModelStudio Coding Plan for Global/Intl] qwen3-coder-plus",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         contextWindowSize: 1000000,
       },
     },
     {
-      id: 'qwen3-coder-next',
-      name: '[ModelStudio Coding Plan for Global/Intl] qwen3-coder-next',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "qwen3-coder-next",
+      name: "[ModelStudio Coding Plan for Global/Intl] qwen3-coder-next",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         contextWindowSize: 262144,
       },
     },
     {
-      id: 'qwen3-max-2026-01-23',
-      name: '[ModelStudio Coding Plan for Global/Intl] qwen3-max-2026-01-23',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "qwen3-max-2026-01-23",
+      name: "[ModelStudio Coding Plan for Global/Intl] qwen3-max-2026-01-23",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         extra_body: {
@@ -214,9 +212,9 @@ export function generateCodingPlanTemplate(
       },
     },
     {
-      id: 'glm-4.7',
-      name: '[ModelStudio Coding Plan for Global/Intl] glm-4.7',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "glm-4.7",
+      name: "[ModelStudio Coding Plan for Global/Intl] glm-4.7",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         extra_body: {
@@ -226,9 +224,9 @@ export function generateCodingPlanTemplate(
       },
     },
     {
-      id: 'glm-5',
-      name: '[ModelStudio Coding Plan for Global/Intl] glm-5',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "glm-5",
+      name: "[ModelStudio Coding Plan for Global/Intl] glm-5",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         extra_body: {
@@ -238,9 +236,9 @@ export function generateCodingPlanTemplate(
       },
     },
     {
-      id: 'MiniMax-M2.5',
-      name: '[ModelStudio Coding Plan for Global/Intl] MiniMax-M2.5',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "MiniMax-M2.5",
+      name: "[ModelStudio Coding Plan for Global/Intl] MiniMax-M2.5",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         extra_body: {
@@ -250,9 +248,9 @@ export function generateCodingPlanTemplate(
       },
     },
     {
-      id: 'kimi-k2.5',
-      name: '[ModelStudio Coding Plan for Global/Intl] kimi-k2.5',
-      baseUrl: 'https://coding-intl.dashscope.aliyuncs.com/v1',
+      id: "kimi-k2.5",
+      name: "[ModelStudio Coding Plan for Global/Intl] kimi-k2.5",
+      baseUrl: "https://coding-intl.dashscope.aliyuncs.com/v1",
       envKey: CODING_PLAN_ENV_KEY,
       generationConfig: {
         extra_body: {
@@ -273,8 +271,8 @@ export function getCodingPlanConfig(region: CodingPlanRegion) {
   const template = generateCodingPlanTemplate(region);
   const baseUrl =
     region === CodingPlanRegion.CHINA
-      ? 'https://coding.dashscope.aliyuncs.com/v1'
-      : 'https://coding-intl.dashscope.aliyuncs.com/v1';
+      ? "https://coding.dashscope.aliyuncs.com/v1"
+      : "https://coding-intl.dashscope.aliyuncs.com/v1";
   return {
     template,
     baseUrl,
@@ -288,8 +286,8 @@ export function getCodingPlanConfig(region: CodingPlanRegion) {
  */
 export function getCodingPlanBaseUrls(): string[] {
   return [
-    'https://coding.dashscope.aliyuncs.com/v1',
-    'https://coding-intl.dashscope.aliyuncs.com/v1',
+    "https://coding.dashscope.aliyuncs.com/v1",
+    "https://coding-intl.dashscope.aliyuncs.com/v1",
   ];
 }
 
@@ -314,10 +312,10 @@ export function isCodingPlanConfig(
   }
 
   // Check which region's baseUrl matches
-  if (baseUrl === 'https://coding.dashscope.aliyuncs.com/v1') {
+  if (baseUrl === "https://coding.dashscope.aliyuncs.com/v1") {
     return CodingPlanRegion.CHINA;
   }
-  if (baseUrl === 'https://coding-intl.dashscope.aliyuncs.com/v1') {
+  if (baseUrl === "https://coding-intl.dashscope.aliyuncs.com/v1") {
     return CodingPlanRegion.GLOBAL;
   }
 
@@ -329,15 +327,13 @@ export function isCodingPlanConfig(
  * @param baseUrl - The baseUrl to check
  * @returns The region if matched, null otherwise
  */
-export function getRegionFromBaseUrl(
-  baseUrl: string | undefined,
-): CodingPlanRegion | null {
+export function getRegionFromBaseUrl(baseUrl: string | undefined): CodingPlanRegion | null {
   if (!baseUrl) return null;
 
-  if (baseUrl === 'https://coding.dashscope.aliyuncs.com/v1') {
+  if (baseUrl === "https://coding.dashscope.aliyuncs.com/v1") {
     return CodingPlanRegion.CHINA;
   }
-  if (baseUrl === 'https://coding-intl.dashscope.aliyuncs.com/v1') {
+  if (baseUrl === "https://coding-intl.dashscope.aliyuncs.com/v1") {
     return CodingPlanRegion.GLOBAL;
   }
 
diff --git a/apps/airiscode-cli/src/core/auth.ts b/apps/airiscode-cli/src/core/auth.ts
index 9c1a8bd94..009428461 100644
--- a/apps/airiscode-cli/src/core/auth.ts
+++ b/apps/airiscode-cli/src/core/auth.ts
@@ -4,13 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  type AuthType,
-  type Config,
-  getErrorMessage,
-  logAuth,
-  AuthEvent,
-} from '@airiscode/core';
+import { AuthEvent, type AuthType, type Config, getErrorMessage, logAuth } from "@airiscode/core";
 
 /**
  * Handles the initial authentication flow.
@@ -32,13 +26,13 @@ export async function performInitialAuth(
     // We can add a dedicated startup message later if needed.
 
     // Log authentication success
-    const authEvent = new AuthEvent(authType, 'auto', 'success');
+    const authEvent = new AuthEvent(authType, "auto", "success");
     logAuth(config, authEvent);
   } catch (e) {
     const errorMessage = `Failed to login. Message: ${getErrorMessage(e)}`;
 
     // Log authentication failure
-    const authEvent = new AuthEvent(authType, 'auto', 'error', errorMessage);
+    const authEvent = new AuthEvent(authType, "auto", "error", errorMessage);
     logAuth(config, authEvent);
 
     return errorMessage;
diff --git a/apps/airiscode-cli/src/core/initializer.ts b/apps/airiscode-cli/src/core/initializer.ts
index bc08e61d7..5e54d3058 100644
--- a/apps/airiscode-cli/src/core/initializer.ts
+++ b/apps/airiscode-cli/src/core/initializer.ts
@@ -5,16 +5,16 @@
  */
 
 import {
+  type Config,
   IdeClient,
   IdeConnectionEvent,
   IdeConnectionType,
   logIdeConnection,
-  type Config,
-} from '@airiscode/core';
-import { type LoadedSettings } from '../config/settings.js';
-import { performInitialAuth } from './auth.js';
-import { validateTheme } from './theme.js';
-import { initializeI18n, type SupportedLanguage } from '../i18n/index.js';
+} from "@airiscode/core";
+import { type LoadedSettings } from "../config/settings.js";
+import { initializeI18n, type SupportedLanguage } from "../i18n/index.js";
+import { performInitialAuth } from "./auth.js";
+import { validateTheme } from "./theme.js";
 
 export interface InitializationResult {
   authError: string | null;
@@ -36,10 +36,8 @@ export async function initializeApp(
 ): Promise<InitializationResult> {
   // Initialize i18n system
   const languageSetting =
-    process.env['AIRISCODE_LANG'] ||
-    (settings.merged.general?.language as string) ||
-    'auto';
-  await initializeI18n(languageSetting as SupportedLanguage | 'auto');
+    process.env["AIRISCODE_LANG"] || (settings.merged.general?.language as string) || "auto";
+  await initializeI18n(languageSetting as SupportedLanguage | "auto");
 
   // Use authType from modelsConfig which respects CLI --auth-type argument
   // over settings.security.auth.selectedType
diff --git a/apps/airiscode-cli/src/core/theme.ts b/apps/airiscode-cli/src/core/theme.ts
index 7acb4abd2..d618f1862 100644
--- a/apps/airiscode-cli/src/core/theme.ts
+++ b/apps/airiscode-cli/src/core/theme.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { themeManager } from '../ui/themes/theme-manager.js';
-import { type LoadedSettings } from '../config/settings.js';
-import { t } from '../i18n/index.js';
+import { type LoadedSettings } from "../config/settings.js";
+import { t } from "../i18n/index.js";
+import { themeManager } from "../ui/themes/theme-manager.js";
 
 /**
  * Validates the configured theme.
diff --git a/apps/airiscode-cli/src/gemini.tsx b/apps/airiscode-cli/src/gemini.tsx
index d41745bb4..0cb46cd07 100644
--- a/apps/airiscode-cli/src/gemini.tsx
+++ b/apps/airiscode-cli/src/gemini.tsx
@@ -4,74 +4,62 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import dns from "node:dns";
+import os from "node:os";
+import { basename } from "node:path";
+import v8 from "node:v8";
 import {
+  type Config,
+  createDebugLogger,
   InputFormat,
   isDebugLoggingDegraded,
   logUserPrompt,
   Storage,
-  type Config,
-  createDebugLogger,
-} from '@airiscode/core';
-import { render } from 'ink';
-import dns from 'node:dns';
-import os from 'node:os';
-import { basename } from 'node:path';
-import v8 from 'node:v8';
-import React from 'react';
-import { validateAuthMethod } from './config/auth.js';
-import * as cliConfig from './config/config.js';
-import { loadCliConfig, parseArguments } from './config/config.js';
-import type { DnsResolutionOrder, LoadedSettings } from './config/settings.js';
-import { getSettingsWarnings, loadSettings } from './config/settings.js';
-import {
-  initializeApp,
-  type InitializationResult,
-} from './core/initializer.js';
-import { runNonInteractive } from './nonInteractiveCli.js';
-import { runNonInteractiveStreamJson } from './nonInteractive/session.js';
-import { AppContainer } from './ui/AppContainer.js';
-import { setMaxSizedBoxDebugging } from './ui/components/shared/MaxSizedBox.js';
-import { KeypressProvider } from './ui/contexts/KeypressContext.js';
-import { SessionStatsProvider } from './ui/contexts/SessionContext.js';
-import { SettingsContext } from './ui/contexts/SettingsContext.js';
-import { VimModeProvider } from './ui/contexts/VimModeContext.js';
-import { AgentViewProvider } from './ui/contexts/AgentViewContext.js';
-import { useKittyKeyboardProtocol } from './ui/hooks/useKittyKeyboardProtocol.js';
-import { themeManager } from './ui/themes/theme-manager.js';
-import { detectAndEnableKittyProtocol } from './ui/utils/kittyProtocolDetector.js';
-import { checkForUpdates } from './ui/utils/updateCheck.js';
-import {
-  cleanupCheckpoints,
-  registerCleanup,
-  runExitCleanup,
-} from './utils/cleanup.js';
-import { AppEvent, appEvents } from './utils/events.js';
-import { handleAutoUpdate } from './utils/handleAutoUpdate.js';
-import { readStdin } from './utils/readStdin.js';
-import {
-  relaunchAppInChildProcess,
-  relaunchOnExitCode,
-} from './utils/relaunch.js';
-import { start_sandbox } from './utils/sandbox.js';
-import { getStartupWarnings } from './utils/startupWarnings.js';
-import { getUserStartupWarnings } from './utils/userStartupWarnings.js';
-import { getCliVersion } from './utils/version.js';
-import { writeStderrLine } from './utils/stdioHelpers.js';
-import { computeWindowTitle } from './utils/windowTitle.js';
-import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
-import { showResumeSessionPicker } from './ui/components/StandaloneSessionPicker.js';
-import { initializeLlmOutputLanguage } from './utils/languageUtils.js';
-
-const debugLogger = createDebugLogger('STARTUP');
-
-export function validateDnsResolutionOrder(
-  order: string | undefined,
-): DnsResolutionOrder {
-  const defaultValue: DnsResolutionOrder = 'ipv4first';
+} from "@airiscode/core";
+import { render } from "ink";
+import React from "react";
+import { validateAuthMethod } from "./config/auth.js";
+import * as cliConfig from "./config/config.js";
+import { loadCliConfig, parseArguments } from "./config/config.js";
+import type { DnsResolutionOrder, LoadedSettings } from "./config/settings.js";
+import { getSettingsWarnings, loadSettings } from "./config/settings.js";
+import { type InitializationResult, initializeApp } from "./core/initializer.js";
+import { runNonInteractiveStreamJson } from "./nonInteractive/session.js";
+import { runNonInteractive } from "./nonInteractiveCli.js";
+import { AppContainer } from "./ui/AppContainer.js";
+import { showResumeSessionPicker } from "./ui/components/StandaloneSessionPicker.js";
+import { setMaxSizedBoxDebugging } from "./ui/components/shared/MaxSizedBox.js";
+import { AgentViewProvider } from "./ui/contexts/AgentViewContext.js";
+import { KeypressProvider } from "./ui/contexts/KeypressContext.js";
+import { SessionStatsProvider } from "./ui/contexts/SessionContext.js";
+import { SettingsContext } from "./ui/contexts/SettingsContext.js";
+import { VimModeProvider } from "./ui/contexts/VimModeContext.js";
+import { useKittyKeyboardProtocol } from "./ui/hooks/useKittyKeyboardProtocol.js";
+import { themeManager } from "./ui/themes/theme-manager.js";
+import { detectAndEnableKittyProtocol } from "./ui/utils/kittyProtocolDetector.js";
+import { checkForUpdates } from "./ui/utils/updateCheck.js";
+import { cleanupCheckpoints, registerCleanup, runExitCleanup } from "./utils/cleanup.js";
+import { AppEvent, appEvents } from "./utils/events.js";
+import { handleAutoUpdate } from "./utils/handleAutoUpdate.js";
+import { initializeLlmOutputLanguage } from "./utils/languageUtils.js";
+import { readStdin } from "./utils/readStdin.js";
+import { relaunchAppInChildProcess, relaunchOnExitCode } from "./utils/relaunch.js";
+import { start_sandbox } from "./utils/sandbox.js";
+import { getStartupWarnings } from "./utils/startupWarnings.js";
+import { writeStderrLine } from "./utils/stdioHelpers.js";
+import { getUserStartupWarnings } from "./utils/userStartupWarnings.js";
+import { getCliVersion } from "./utils/version.js";
+import { computeWindowTitle } from "./utils/windowTitle.js";
+import { validateNonInteractiveAuth } from "./validateNonInterActiveAuth.js";
+
+const debugLogger = createDebugLogger("STARTUP");
+
+export function validateDnsResolutionOrder(order: string | undefined): DnsResolutionOrder {
+  const defaultValue: DnsResolutionOrder = "ipv4first";
   if (order === undefined) {
     return defaultValue;
   }
-  if (order === 'ipv4first' || order === 'verbatim') {
+  if (order === "ipv4first" || order === "verbatim") {
     return order;
   }
   // We don't want to throw here, just warn and use the default.
@@ -84,19 +72,15 @@ export function validateDnsResolutionOrder(
 function getNodeMemoryArgs(isDebugMode: boolean): string[] {
   const totalMemoryMB = os.totalmem() / (1024 * 1024);
   const heapStats = v8.getHeapStatistics();
-  const currentMaxOldSpaceSizeMb = Math.floor(
-    heapStats.heap_size_limit / 1024 / 1024,
-  );
+  const currentMaxOldSpaceSizeMb = Math.floor(heapStats.heap_size_limit / 1024 / 1024);
 
   // Set target to 50% of total memory
   const targetMaxOldSpaceSizeInMB = Math.floor(totalMemoryMB * 0.5);
   if (isDebugMode) {
-    writeStderrLine(
-      `Current heap size ${currentMaxOldSpaceSizeMb.toFixed(2)} MB`,
-    );
+    writeStderrLine(`Current heap size ${currentMaxOldSpaceSizeMb.toFixed(2)} MB`);
   }
 
-  if (process.env['AIRISCODE_NO_RELAUNCH']) {
+  if (process.env["AIRISCODE_NO_RELAUNCH"]) {
     return [];
   }
 
@@ -112,12 +96,13 @@ function getNodeMemoryArgs(isDebugMode: boolean): string[] {
   return [];
 }
 
-import { loadSandboxConfig } from './config/sandboxConfig.js';
+import { loadSandboxConfig } from "./config/sandboxConfig.js";
+
 const runAcpAgent = null as any;
 
 export function setupUnhandledRejectionHandler() {
   let unhandledRejectionOccurred = false;
-  process.on('unhandledRejection', (reason, _promise) => {
+  process.on("unhandledRejection", (reason, _promise) => {
     const errorMessage = `=========================================
 This is an unexpected error. Please file a bug report using the /bug tool.
 CRITICAL: Unhandled Promise Rejection!
@@ -127,7 +112,7 @@ Reason: ${reason}${
         ? `
 Stack trace:
 ${reason.stack}`
-        : ''
+        : ""
     }`;
     appEvents.emit(AppEvent.LogError, errorMessage);
     if (!unhandledRejectionOccurred) {
@@ -150,16 +135,14 @@ export async function startInteractiveUI(
   // Create wrapper component to use hooks inside render
   const AppWrapper = () => {
     const kittyProtocolStatus = useKittyKeyboardProtocol();
-    const nodeMajorVersion = parseInt(process.versions.node.split('.')[0], 10);
+    const nodeMajorVersion = parseInt(process.versions.node.split(".")[0], 10);
     return (
       <SettingsContext.Provider value={settings}>
         <KeypressProvider
           kittyProtocolEnabled={kittyProtocolStatus.enabled}
           config={config}
           debugKeystrokeLogging={settings.merged.general?.debugKeystrokeLogging}
-          pasteWorkaround={
-            process.platform === 'win32' || nodeMajorVersion < 20
-          }
+          pasteWorkaround={process.platform === "win32" || nodeMajorVersion < 20}
         >
           <SessionStatsProvider sessionId={config.getSessionId()}>
             <VimModeProvider settings={settings}>
@@ -180,7 +163,7 @@ export async function startInteractiveUI(
   };
 
   const instance = render(
-    process.env['DEBUG'] ? (
+    process.env["DEBUG"] ? (
       <React.StrictMode>
         <AppWrapper />
       </React.StrictMode>
@@ -219,7 +202,7 @@ export async function main() {
   // Check for invalid input combinations early to prevent crashes
   if (argv.promptInteractive && !process.stdin.isTTY) {
     writeStderrLine(
-      'Error: The --prompt-interactive flag cannot be used when input is piped from stdin.',
+      "Error: The --prompt-interactive flag cannot be used when input is piped from stdin.",
     );
     process.exit(1);
   }
@@ -237,14 +220,12 @@ export async function main() {
     if (!themeManager.setActiveTheme(settings.merged.ui?.theme)) {
       // If the theme is not found during initial load, log a warning and continue.
       // The useThemeCommand hook in AppContainer.tsx will handle opening the dialog.
-      writeStderrLine(
-        `Warning: Theme "${settings.merged.ui?.theme}" not found.`,
-      );
+      writeStderrLine(`Warning: Theme "${settings.merged.ui?.theme}" not found.`);
     }
   }
 
   // hop into sandbox if we are outside and sandboxing is enabled
-  if (!process.env['SANDBOX']) {
+  if (!process.env["SANDBOX"]) {
     const memoryArgs = settings.merged.advanced?.autoConfigureMemory
       ? getNodeMemoryArgs(isDebugMode)
       : [];
@@ -256,12 +237,7 @@ export async function main() {
     // another way to decouple refreshAuth from requiring a config.
 
     if (sandboxConfig) {
-      const partialConfig = await loadCliConfig(
-        settings.merged,
-        argv,
-        undefined,
-        [],
-      );
+      const partialConfig = await loadCliConfig(settings.merged, argv, undefined, []);
 
       if (!settings.merged.security?.auth?.useExternal) {
         // Validate authentication here because the sandbox will interfere with the Oauth2 web redirect.
@@ -287,29 +263,23 @@ export async function main() {
       // intact via stdio: 'inherit'.
       const inputFormat = argv.inputFormat as string | undefined;
       const isAcpMode = argv.acp || argv.experimentalAcp;
-      let stdinData = '';
-      if (!process.stdin.isTTY && inputFormat !== 'stream-json' && !isAcpMode) {
+      let stdinData = "";
+      if (!process.stdin.isTTY && inputFormat !== "stream-json" && !isAcpMode) {
         stdinData = await readStdin();
       }
 
       // This function is a copy of the one from sandbox.ts
       // It is moved here to decouple sandbox.ts from the CLI's argument structure.
-      const injectStdinIntoArgs = (
-        args: string[],
-        stdinData?: string,
-      ): string[] => {
+      const injectStdinIntoArgs = (args: string[], stdinData?: string): string[] => {
         const finalArgs = [...args];
         if (stdinData) {
-          const promptIndex = finalArgs.findIndex(
-            (arg) => arg === '--prompt' || arg === '-p',
-          );
+          const promptIndex = finalArgs.findIndex((arg) => arg === "--prompt" || arg === "-p");
           if (promptIndex > -1 && finalArgs.length > promptIndex + 1) {
             // If there's a prompt argument, prepend stdin to it
-            finalArgs[promptIndex + 1] =
-              `${stdinData}\n\n${finalArgs[promptIndex + 1]}`;
+            finalArgs[promptIndex + 1] = `${stdinData}\n\n${finalArgs[promptIndex + 1]}`;
           } else {
             // If there's no prompt argument, add stdin as the prompt
-            finalArgs.push('--prompt', stdinData);
+            finalArgs.push("--prompt", stdinData);
           }
         }
         return finalArgs;
@@ -332,11 +302,8 @@ export async function main() {
   // Set the runtime output dir early so the picker can find sessions stored
   // under a custom runtimeOutputDir (setRuntimeBaseDir is idempotent and will
   // be called again inside loadCliConfig).
-  if (argv.resume === '') {
-    Storage.setRuntimeBaseDir(
-      settings.merged.advanced?.runtimeOutputDir,
-      process.cwd(),
-    );
+  if (argv.resume === "") {
+    Storage.setRuntimeBaseDir(settings.merged.advanced?.runtimeOutputDir, process.cwd());
     const selectedSessionId = await showResumeSessionPicker();
     if (!selectedSessionId) {
       // User cancelled or no sessions available
@@ -355,12 +322,7 @@ export async function main() {
   initializeLlmOutputLanguage(settings.merged.general?.outputLanguage);
 
   {
-    const config = await loadCliConfig(
-      settings.merged,
-      argv,
-      process.cwd(),
-      argv.extensions,
-    );
+    const config = await loadCliConfig(settings.merged, argv, process.cwd(), argv.extensions);
 
     // Register cleanup for MCP clients as early as possible
     // This ensures MCP server subprocesses are properly terminated on exit
@@ -383,10 +345,10 @@ export async function main() {
       process.stdin.setRawMode(true);
 
       // This cleanup isn't strictly needed but may help in certain situations.
-      process.on('SIGTERM', () => {
+      process.on("SIGTERM", () => {
         process.stdin.setRawMode(wasRaw);
       });
-      process.on('SIGINT', () => {
+      process.on("SIGINT", () => {
         process.stdin.setRawMode(wasRaw);
       });
 
@@ -400,7 +362,7 @@ export async function main() {
     // In TTY mode, ignore stream-json input format to prevent process from hanging
     const inputFormat = process.stdin.isTTY
       ? InputFormat.TEXT
-      : typeof config.getInputFormat === 'function'
+      : typeof config.getInputFormat === "function"
         ? config.getInputFormat()
         : InputFormat.TEXT;
 
@@ -445,14 +407,10 @@ export async function main() {
 
     // Print debug mode notice to stderr for non-interactive mode
     if (config.getDebugMode()) {
-      writeStderrLine('Debug mode enabled');
-      writeStderrLine(
-        `Logging to: ${Storage.getDebugLogPath(config.getSessionId())}`,
-      );
+      writeStderrLine("Debug mode enabled");
+      writeStderrLine(`Logging to: ${Storage.getDebugLogPath(config.getSessionId())}`);
       if (isDebugLoggingDegraded()) {
-        writeStderrLine(
-          'Warning: Debug logging is degraded (write failures occurred)',
-        );
+        writeStderrLine("Warning: Debug logging is degraded (write failures occurred)");
       }
     }
 
@@ -480,11 +438,11 @@ export async function main() {
     const prompt_id = Math.random().toString(16).slice(2);
 
     if (inputFormat === InputFormat.STREAM_JSON) {
-      const trimmedInput = (input ?? '').trim();
+      const trimmedInput = (input ?? "").trim();
 
       await runNonInteractiveStreamJson(
         nonInteractiveConfig,
-        trimmedInput.length > 0 ? trimmedInput : '',
+        trimmedInput.length > 0 ? trimmedInput : "",
       );
       await runExitCleanup();
       process.exit(0);
@@ -498,8 +456,8 @@ export async function main() {
     }
 
     logUserPrompt(config, {
-      'event.name': 'user_prompt',
-      'event.timestamp': new Date().toISOString(),
+      "event.name": "user_prompt",
+      "event.timestamp": new Date().toISOString(),
       prompt: input,
       prompt_id,
       auth_type: config.getContentGeneratorConfig()?.authType,
@@ -520,7 +478,7 @@ function setWindowTitle(title: string, settings: LoadedSettings) {
     const windowTitle = computeWindowTitle(title);
     process.stdout.write(`\x1b]2;${windowTitle}\x07`);
 
-    process.on('exit', () => {
+    process.on("exit", () => {
       process.stdout.write(`\x1b]2;\x07`);
     });
   }
diff --git a/apps/airiscode-cli/src/i18n/index.ts b/apps/airiscode-cli/src/i18n/index.ts
index 4436b9b52..bd535c87d 100644
--- a/apps/airiscode-cli/src/i18n/index.ts
+++ b/apps/airiscode-cli/src/i18n/index.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { homedir } from 'node:os';
-import { writeStderrLine } from '../utils/stdioHelpers.js';
+import * as fs from "node:fs";
+import { homedir } from "node:os";
+import * as path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { writeStderrLine } from "../utils/stdioHelpers.js";
 import {
-  type SupportedLanguage,
-  SUPPORTED_LANGUAGES,
   getLanguageNameFromLocale,
-} from './languages.js';
+  SUPPORTED_LANGUAGES,
+  type SupportedLanguage,
+} from "./languages.js";
 
 export type { SupportedLanguage };
 export { getLanguageNameFromLocale };
 
 // State
-let currentLanguage: SupportedLanguage = 'en';
+let currentLanguage: SupportedLanguage = "en";
 let translations: Record<string, string | string[]> = {};
 
 // Cache
@@ -30,11 +30,10 @@ const loadingPromises: Record<string, Promise<TranslationDict>> = {};
 // Path helpers
 const getBuiltinLocalesDir = (): string => {
   const __filename = fileURLToPath(import.meta.url);
-  return path.join(path.dirname(__filename), 'locales');
+  return path.join(path.dirname(__filename), "locales");
 };
 
-const getUserLocalesDir = (): string =>
-  path.join(homedir(), '.airiscode', 'locales');
+const getUserLocalesDir = (): string => path.join(homedir(), ".airiscode", "locales");
 
 /**
  * Get the path to the user's custom locales directory.
@@ -45,17 +44,14 @@ export function getUserLocalesDirectory(): string {
   return getUserLocalesDir();
 }
 
-const getLocalePath = (
-  lang: SupportedLanguage,
-  useUserDir: boolean = false,
-): string => {
+const getLocalePath = (lang: SupportedLanguage, useUserDir: boolean = false): string => {
   const baseDir = useUserDir ? getUserLocalesDir() : getBuiltinLocalesDir();
   return path.join(baseDir, `${lang}.js`);
 };
 
 // Language detection
 export function detectSystemLanguage(): SupportedLanguage {
-  const envLang = process.env['AIRISCODE_LANG'] || process.env['LANG'];
+  const envLang = process.env["AIRISCODE_LANG"] || process.env["LANG"];
   if (envLang) {
     for (const lang of SUPPORTED_LANGUAGES) {
       if (envLang.startsWith(lang.code)) return lang.code;
@@ -71,13 +67,11 @@ export function detectSystemLanguage(): SupportedLanguage {
     // Fallback to default
   }
 
-  return 'en';
+  return "en";
 }
 
 // Translation loading
-async function loadTranslationsAsync(
-  lang: SupportedLanguage,
-): Promise<TranslationDict> {
+async function loadTranslationsAsync(lang: SupportedLanguage): Promise<TranslationDict> {
   if (translationCache[lang]) {
     return translationCache[lang];
   }
@@ -111,15 +105,11 @@ async function loadTranslationsAsync(
         try {
           const module = await import(fileUrl);
           const result = module.default || module;
-          if (
-            result &&
-            typeof result === 'object' &&
-            Object.keys(result).length > 0
-          ) {
+          if (result && typeof result === "object" && Object.keys(result).length > 0) {
             translationCache[lang] = result;
             return result;
           } else {
-            throw new Error('Module loaded but result is empty or invalid');
+            throw new Error("Module loaded but result is empty or invalid");
           }
         } catch {
           // For builtin locales, try alternative import method (relative path)
@@ -127,11 +117,7 @@ async function loadTranslationsAsync(
             try {
               const module = await import(`./locales/${lang}.js`);
               const result = module.default || module;
-              if (
-                result &&
-                typeof result === 'object' &&
-                Object.keys(result).length > 0
-              ) {
+              if (result && typeof result === "object" && Object.keys(result).length > 0) {
                 translationCache[lang] = result;
                 return result;
               }
@@ -180,24 +166,18 @@ function loadTranslations(lang: SupportedLanguage): TranslationDict {
 }
 
 // String interpolation
-function interpolate(
-  template: string,
-  params?: Record<string, string>,
-): string {
+function interpolate(template: string, params?: Record<string, string>): string {
   if (!params) return template;
-  return template.replace(
-    /\{\{(\w+)\}\}/g,
-    (match, key) => params[key] ?? match,
-  );
+  return template.replace(/\{\{(\w+)\}\}/g, (match, key) => params[key] ?? match);
 }
 
 // Language setting helpers
-function resolveLanguage(lang: SupportedLanguage | 'auto'): SupportedLanguage {
-  return lang === 'auto' ? detectSystemLanguage() : lang;
+function resolveLanguage(lang: SupportedLanguage | "auto"): SupportedLanguage {
+  return lang === "auto" ? detectSystemLanguage() : lang;
 }
 
 // Public API
-export function setLanguage(lang: SupportedLanguage | 'auto'): void {
+export function setLanguage(lang: SupportedLanguage | "auto"): void {
   const resolvedLang = resolveLanguage(lang);
   currentLanguage = resolvedLang;
 
@@ -218,9 +198,7 @@ export function setLanguage(lang: SupportedLanguage | 'auto'): void {
   }
 }
 
-export async function setLanguageAsync(
-  lang: SupportedLanguage | 'auto',
-): Promise<void> {
+export async function setLanguageAsync(lang: SupportedLanguage | "auto"): Promise<void> {
   currentLanguage = resolveLanguage(lang);
   translations = await loadTranslationsAsync(currentLanguage);
 }
@@ -250,8 +228,6 @@ export function ta(key: string): string[] {
   return [];
 }
 
-export async function initializeI18n(
-  lang?: SupportedLanguage | 'auto',
-): Promise<void> {
-  await setLanguageAsync(lang ?? 'auto');
+export async function initializeI18n(lang?: SupportedLanguage | "auto"): Promise<void> {
+  await setLanguageAsync(lang ?? "auto");
 }
diff --git a/apps/airiscode-cli/src/i18n/languages.ts b/apps/airiscode-cli/src/i18n/languages.ts
index 733f11863..e28e0b309 100644
--- a/apps/airiscode-cli/src/i18n/languages.ts
+++ b/apps/airiscode-cli/src/i18n/languages.ts
@@ -4,14 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export type SupportedLanguage =
-  | 'en'
-  | 'zh'
-  | 'ru'
-  | 'de'
-  | 'ja'
-  | 'pt'
-  | string;
+export type SupportedLanguage = "en" | "zh" | "ru" | "de" | "ja" | "pt" | string;
 
 export interface LanguageDefinition {
   /** The internal locale code used by the i18n system (e.g., 'en', 'zh'). */
@@ -26,40 +19,40 @@ export interface LanguageDefinition {
 
 export const SUPPORTED_LANGUAGES: readonly LanguageDefinition[] = [
   {
-    code: 'en',
-    id: 'en-US',
-    fullName: 'English',
-    nativeName: 'English',
+    code: "en",
+    id: "en-US",
+    fullName: "English",
+    nativeName: "English",
   },
   {
-    code: 'zh',
-    id: 'zh-CN',
-    fullName: 'Chinese',
-    nativeName: '中文',
+    code: "zh",
+    id: "zh-CN",
+    fullName: "Chinese",
+    nativeName: "中文",
   },
   {
-    code: 'ru',
-    id: 'ru-RU',
-    fullName: 'Russian',
-    nativeName: 'Русский',
+    code: "ru",
+    id: "ru-RU",
+    fullName: "Russian",
+    nativeName: "Русский",
   },
   {
-    code: 'de',
-    id: 'de-DE',
-    fullName: 'German',
-    nativeName: 'Deutsch',
+    code: "de",
+    id: "de-DE",
+    fullName: "German",
+    nativeName: "Deutsch",
   },
   {
-    code: 'ja',
-    id: 'ja-JP',
-    fullName: 'Japanese',
-    nativeName: '日本語',
+    code: "ja",
+    id: "ja-JP",
+    fullName: "Japanese",
+    nativeName: "日本語",
   },
   {
-    code: 'pt',
-    id: 'pt-BR',
-    fullName: 'Portuguese',
-    nativeName: 'Português',
+    code: "pt",
+    id: "pt-BR",
+    fullName: "Portuguese",
+    nativeName: "Português",
   },
 ];
 
@@ -69,7 +62,7 @@ export const SUPPORTED_LANGUAGES: readonly LanguageDefinition[] = [
  */
 export function getLanguageNameFromLocale(locale: SupportedLanguage): string {
   const lang = SUPPORTED_LANGUAGES.find((l) => l.code === locale);
-  return lang?.fullName || 'English';
+  return lang?.fullName || "English";
 }
 
 /**
@@ -80,12 +73,10 @@ export function getLanguageSettingsOptions(): Array<{
   label: string;
 }> {
   return [
-    { value: 'auto', label: 'Auto (detect from system)' },
+    { value: "auto", label: "Auto (detect from system)" },
     ...SUPPORTED_LANGUAGES.map((l) => ({
       value: l.code,
-      label: l.nativeName
-        ? `${l.nativeName} (${l.fullName})`
-        : `${l.fullName} (${l.id})`,
+      label: l.nativeName ? `${l.nativeName} (${l.fullName})` : `${l.fullName} (${l.id})`,
     })),
   ];
 }
@@ -93,6 +84,6 @@ export function getLanguageSettingsOptions(): Array<{
 /**
  * Gets a string containing all supported language IDs (e.g., "en-US|zh-CN").
  */
-export function getSupportedLanguageIds(separator = '|'): string {
+export function getSupportedLanguageIds(separator = "|"): string {
   return SUPPORTED_LANGUAGES.map((l) => l.id).join(separator);
 }
diff --git a/apps/airiscode-cli/src/i18n/locales/de.js b/apps/airiscode-cli/src/i18n/locales/de.js
index 6d45ba4ea..97404bf17 100644
--- a/apps/airiscode-cli/src/i18n/locales/de.js
+++ b/apps/airiscode-cli/src/i18n/locales/de.js
@@ -12,1186 +12,1096 @@ export default {
   // Help / UI Components
   // ============================================================================
   // Attachment hints
-  '↑ to manage attachments': '↑ Anhänge verwalten',
-  '← → select, Delete to remove, ↓ to exit':
-    '← → auswählen, Entf zum Löschen, ↓ beenden',
-  'Attachments: ': 'Anhänge: ',
+  "↑ to manage attachments": "↑ Anhänge verwalten",
+  "← → select, Delete to remove, ↓ to exit": "← → auswählen, Entf zum Löschen, ↓ beenden",
+  "Attachments: ": "Anhänge: ",
 
-  'Basics:': 'Grundlagen:',
-  'Add context': 'Kontext hinzufügen',
-  'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.':
-    'Verwenden Sie {{symbol}}, um Dateien als Kontext anzugeben (z.B. {{example}}), um bestimmte Dateien oder Ordner auszuwählen.',
-  '@': '@',
-  '@src/myFile.ts': '@src/myFile.ts',
-  'Shell mode': 'Shell-Modus',
-  'YOLO mode': 'YOLO-Modus',
-  'plan mode': 'Planungsmodus',
-  'auto-accept edits': 'Änderungen automatisch akzeptieren',
-  'Accepting edits': 'Änderungen werden akzeptiert',
-  '(shift + tab to cycle)': '(Umschalt + Tab zum Wechseln)',
-  '(tab to cycle)': '(Tab zum Wechseln)',
-  'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).':
-    'Shell-Befehle über {{symbol}} ausführen (z.B. {{example1}}) oder natürliche Sprache verwenden (z.B. {{example2}}).',
-  '!': '!',
-  '!npm run start': '!npm run start',
-  'start server': 'Server starten',
-  'Commands:': 'Befehle:',
-  'shell command': 'Shell-Befehl',
-  'Model Context Protocol command (from external servers)':
-    'Model Context Protocol Befehl (von externen Servern)',
-  'Keyboard Shortcuts:': 'Tastenkürzel:',
-  'Jump through words in the input': 'Wörter in der Eingabe überspringen',
-  'Close dialogs, cancel requests, or quit application':
-    'Dialoge schließen, Anfragen abbrechen oder Anwendung beenden',
-  'New line': 'Neue Zeile',
-  'New line (Alt+Enter works for certain linux distros)':
-    'Neue Zeile (Alt+Enter funktioniert bei bestimmten Linux-Distributionen)',
-  'Clear the screen': 'Bildschirm löschen',
-  'Open input in external editor': 'Eingabe in externem Editor öffnen',
-  'Send message': 'Nachricht senden',
-  'Initializing...': 'Initialisierung...',
-  'Connecting to MCP servers... ({{connected}}/{{total}})':
-    'Verbindung zu MCP-Servern wird hergestellt... ({{connected}}/{{total}})',
-  'Type your message or @path/to/file':
-    'Nachricht eingeben oder @Pfad/zur/Datei',
+  "Basics:": "Grundlagen:",
+  "Add context": "Kontext hinzufügen",
+  "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.":
+    "Verwenden Sie {{symbol}}, um Dateien als Kontext anzugeben (z.B. {{example}}), um bestimmte Dateien oder Ordner auszuwählen.",
+  "@": "@",
+  "@src/myFile.ts": "@src/myFile.ts",
+  "Shell mode": "Shell-Modus",
+  "YOLO mode": "YOLO-Modus",
+  "plan mode": "Planungsmodus",
+  "auto-accept edits": "Änderungen automatisch akzeptieren",
+  "Accepting edits": "Änderungen werden akzeptiert",
+  "(shift + tab to cycle)": "(Umschalt + Tab zum Wechseln)",
+  "(tab to cycle)": "(Tab zum Wechseln)",
+  "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).":
+    "Shell-Befehle über {{symbol}} ausführen (z.B. {{example1}}) oder natürliche Sprache verwenden (z.B. {{example2}}).",
+  "!": "!",
+  "!npm run start": "!npm run start",
+  "start server": "Server starten",
+  "Commands:": "Befehle:",
+  "shell command": "Shell-Befehl",
+  "Model Context Protocol command (from external servers)":
+    "Model Context Protocol Befehl (von externen Servern)",
+  "Keyboard Shortcuts:": "Tastenkürzel:",
+  "Jump through words in the input": "Wörter in der Eingabe überspringen",
+  "Close dialogs, cancel requests, or quit application":
+    "Dialoge schließen, Anfragen abbrechen oder Anwendung beenden",
+  "New line": "Neue Zeile",
+  "New line (Alt+Enter works for certain linux distros)":
+    "Neue Zeile (Alt+Enter funktioniert bei bestimmten Linux-Distributionen)",
+  "Clear the screen": "Bildschirm löschen",
+  "Open input in external editor": "Eingabe in externem Editor öffnen",
+  "Send message": "Nachricht senden",
+  "Initializing...": "Initialisierung...",
+  "Connecting to MCP servers... ({{connected}}/{{total}})":
+    "Verbindung zu MCP-Servern wird hergestellt... ({{connected}}/{{total}})",
+  "Type your message or @path/to/file": "Nachricht eingeben oder @Pfad/zur/Datei",
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Drücken Sie 'i' für den EINFÜGE-Modus und 'Esc' für den NORMAL-Modus.",
-  'Cancel operation / Clear input (double press)':
-    'Vorgang abbrechen / Eingabe löschen (doppelt drücken)',
-  'Cycle approval modes': 'Genehmigungsmodi durchschalten',
-  'Cycle through your prompt history': 'Eingabeverlauf durchblättern',
-  'For a full list of shortcuts, see {{docPath}}':
-    'Eine vollständige Liste der Tastenkürzel finden Sie unter {{docPath}}',
-  'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md',
-  'for help on Qwen Code': 'für Hilfe zu Qwen Code',
-  'show version info': 'Versionsinformationen anzeigen',
-  'submit a bug report': 'Fehlerbericht einreichen',
-  'About Qwen Code': 'Über Qwen Code',
-  Status: 'Status',
+  "Cancel operation / Clear input (double press)":
+    "Vorgang abbrechen / Eingabe löschen (doppelt drücken)",
+  "Cycle approval modes": "Genehmigungsmodi durchschalten",
+  "Cycle through your prompt history": "Eingabeverlauf durchblättern",
+  "For a full list of shortcuts, see {{docPath}}":
+    "Eine vollständige Liste der Tastenkürzel finden Sie unter {{docPath}}",
+  "docs/keyboard-shortcuts.md": "docs/keyboard-shortcuts.md",
+  "for help on Qwen Code": "für Hilfe zu Qwen Code",
+  "show version info": "Versionsinformationen anzeigen",
+  "submit a bug report": "Fehlerbericht einreichen",
+  "About Qwen Code": "Über Qwen Code",
+  Status: "Status",
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
-  'Qwen Code': 'Qwen Code',
-  Runtime: 'Laufzeit',
-  OS: 'Betriebssystem',
-  Auth: 'Authentifizierung',
-  'CLI Version': 'CLI-Version',
-  'Git Commit': 'Git-Commit',
-  Model: 'Modell',
-  'Fast Model': 'Schnelles Modell',
-  Sandbox: 'Sandbox',
-  'OS Platform': 'Betriebssystem',
-  'OS Arch': 'OS-Architektur',
-  'OS Release': 'OS-Version',
-  'Node.js Version': 'Node.js-Version',
-  'NPM Version': 'NPM-Version',
-  'Session ID': 'Sitzungs-ID',
-  'Auth Method': 'Authentifizierungsmethode',
-  'Base URL': 'Basis-URL',
-  Proxy: 'Proxy',
-  'Memory Usage': 'Speichernutzung',
-  'IDE Client': 'IDE-Client',
+  "Qwen Code": "Qwen Code",
+  Runtime: "Laufzeit",
+  OS: "Betriebssystem",
+  Auth: "Authentifizierung",
+  "CLI Version": "CLI-Version",
+  "Git Commit": "Git-Commit",
+  Model: "Modell",
+  "Fast Model": "Schnelles Modell",
+  Sandbox: "Sandbox",
+  "OS Platform": "Betriebssystem",
+  "OS Arch": "OS-Architektur",
+  "OS Release": "OS-Version",
+  "Node.js Version": "Node.js-Version",
+  "NPM Version": "NPM-Version",
+  "Session ID": "Sitzungs-ID",
+  "Auth Method": "Authentifizierungsmethode",
+  "Base URL": "Basis-URL",
+  Proxy: "Proxy",
+  "Memory Usage": "Speichernutzung",
+  "IDE Client": "IDE-Client",
 
   // ============================================================================
   // Commands - General
   // ============================================================================
-  'Analyzes the project and creates a tailored QWEN.md file.':
-    'Analysiert das Projekt und erstellt eine maßgeschneiderte QWEN.md-Datei.',
-  'List available Qwen Code tools. Usage: /tools [desc]':
-    'Verfügbare Qwen Code Werkzeuge auflisten. Verwendung: /tools [desc]',
-  'List available skills.': 'Verfügbare Skills auflisten.',
-  'Available Qwen Code CLI tools:': 'Verfügbare Qwen Code CLI-Werkzeuge:',
-  'No tools available': 'Keine Werkzeuge verfügbar',
-  'View or change the approval mode for tool usage':
-    'Genehmigungsmodus für Werkzeugnutzung anzeigen oder ändern',
-  'View or change the language setting':
-    'Spracheinstellung anzeigen oder ändern',
-  'change the theme': 'Design ändern',
-  'Select Theme': 'Design auswählen',
-  Preview: 'Vorschau',
-  '(Use Enter to select, Tab to configure scope)':
-    '(Enter zum Auswählen, Tab zum Konfigurieren des Bereichs)',
-  '(Use Enter to apply scope, Tab to go back)':
-    '(Enter zum Anwenden des Bereichs, Tab zum Zurückgehen)',
-  'Theme configuration unavailable due to NO_COLOR env variable.':
-    'Design-Konfiguration aufgrund der NO_COLOR-Umgebungsvariable nicht verfügbar.',
+  "Analyzes the project and creates a tailored QWEN.md file.":
+    "Analysiert das Projekt und erstellt eine maßgeschneiderte QWEN.md-Datei.",
+  "List available Qwen Code tools. Usage: /tools [desc]":
+    "Verfügbare Qwen Code Werkzeuge auflisten. Verwendung: /tools [desc]",
+  "List available skills.": "Verfügbare Skills auflisten.",
+  "Available Qwen Code CLI tools:": "Verfügbare Qwen Code CLI-Werkzeuge:",
+  "No tools available": "Keine Werkzeuge verfügbar",
+  "View or change the approval mode for tool usage":
+    "Genehmigungsmodus für Werkzeugnutzung anzeigen oder ändern",
+  "View or change the language setting": "Spracheinstellung anzeigen oder ändern",
+  "change the theme": "Design ändern",
+  "Select Theme": "Design auswählen",
+  Preview: "Vorschau",
+  "(Use Enter to select, Tab to configure scope)":
+    "(Enter zum Auswählen, Tab zum Konfigurieren des Bereichs)",
+  "(Use Enter to apply scope, Tab to go back)":
+    "(Enter zum Anwenden des Bereichs, Tab zum Zurückgehen)",
+  "Theme configuration unavailable due to NO_COLOR env variable.":
+    "Design-Konfiguration aufgrund der NO_COLOR-Umgebungsvariable nicht verfügbar.",
   'Theme "{{themeName}}" not found.': 'Design "{{themeName}}" nicht gefunden.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Design "{{themeName}}" im ausgewählten Bereich nicht gefunden.',
-  'Clear conversation history and free up context':
-    'Gesprächsverlauf löschen und Kontext freigeben',
-  'Compresses the context by replacing it with a summary.':
-    'Komprimiert den Kontext durch Ersetzen mit einer Zusammenfassung.',
-  'open full Qwen Code documentation in your browser':
-    'Vollständige Qwen Code Dokumentation im Browser öffnen',
-  'Configuration not available.': 'Konfiguration nicht verfügbar.',
-  'change the auth method': 'Authentifizierungsmethode ändern',
-  'Configure authentication information for login':
-    'Authentifizierungsinformationen für die Anmeldung konfigurieren',
-  'Copy the last result or code snippet to clipboard':
-    'Letztes Ergebnis oder Codeausschnitt in die Zwischenablage kopieren',
+  "Clear conversation history and free up context":
+    "Gesprächsverlauf löschen und Kontext freigeben",
+  "Compresses the context by replacing it with a summary.":
+    "Komprimiert den Kontext durch Ersetzen mit einer Zusammenfassung.",
+  "open full Qwen Code documentation in your browser":
+    "Vollständige Qwen Code Dokumentation im Browser öffnen",
+  "Configuration not available.": "Konfiguration nicht verfügbar.",
+  "change the auth method": "Authentifizierungsmethode ändern",
+  "Configure authentication information for login":
+    "Authentifizierungsinformationen für die Anmeldung konfigurieren",
+  "Copy the last result or code snippet to clipboard":
+    "Letztes Ergebnis oder Codeausschnitt in die Zwischenablage kopieren",
 
   // ============================================================================
   // Commands - Agents
   // ============================================================================
-  'Manage subagents for specialized task delegation.':
-    'Unteragenten für spezialisierte Aufgabendelegation verwalten.',
-  'Manage existing subagents (view, edit, delete).':
-    'Bestehende Unteragenten verwalten (anzeigen, bearbeiten, löschen).',
-  'Create a new subagent with guided setup.':
-    'Neuen Unteragenten mit geführter Einrichtung erstellen.',
+  "Manage subagents for specialized task delegation.":
+    "Unteragenten für spezialisierte Aufgabendelegation verwalten.",
+  "Manage existing subagents (view, edit, delete).":
+    "Bestehende Unteragenten verwalten (anzeigen, bearbeiten, löschen).",
+  "Create a new subagent with guided setup.":
+    "Neuen Unteragenten mit geführter Einrichtung erstellen.",
 
   // ============================================================================
   // Agents - Management Dialog
   // ============================================================================
-  Agents: 'Agenten',
-  'Choose Action': 'Aktion wählen',
-  'Edit {{name}}': '{{name}} bearbeiten',
-  'Edit Tools: {{name}}': 'Werkzeuge bearbeiten: {{name}}',
-  'Edit Color: {{name}}': 'Farbe bearbeiten: {{name}}',
-  'Delete {{name}}': '{{name}} löschen',
-  'Unknown Step': 'Unbekannter Schritt',
-  'Esc to close': 'Esc zum Schließen',
-  'Enter to select, ↑↓ to navigate, Esc to close':
-    'Enter zum Auswählen, ↑↓ zum Navigieren, Esc zum Schließen',
-  'Esc to go back': 'Esc zum Zurückgehen',
-  'Enter to confirm, Esc to cancel': 'Enter zum Bestätigen, Esc zum Abbrechen',
-  'Enter to select, ↑↓ to navigate, Esc to go back':
-    'Enter zum Auswählen, ↑↓ zum Navigieren, Esc zum Zurückgehen',
-  'Enter to submit, Esc to go back': 'Enter zum Absenden, Esc zum Zurückgehen',
-  'Invalid step: {{step}}': 'Ungültiger Schritt: {{step}}',
-  'No subagents found.': 'Keine Unteragenten gefunden.',
+  Agents: "Agenten",
+  "Choose Action": "Aktion wählen",
+  "Edit {{name}}": "{{name}} bearbeiten",
+  "Edit Tools: {{name}}": "Werkzeuge bearbeiten: {{name}}",
+  "Edit Color: {{name}}": "Farbe bearbeiten: {{name}}",
+  "Delete {{name}}": "{{name}} löschen",
+  "Unknown Step": "Unbekannter Schritt",
+  "Esc to close": "Esc zum Schließen",
+  "Enter to select, ↑↓ to navigate, Esc to close":
+    "Enter zum Auswählen, ↑↓ zum Navigieren, Esc zum Schließen",
+  "Esc to go back": "Esc zum Zurückgehen",
+  "Enter to confirm, Esc to cancel": "Enter zum Bestätigen, Esc zum Abbrechen",
+  "Enter to select, ↑↓ to navigate, Esc to go back":
+    "Enter zum Auswählen, ↑↓ zum Navigieren, Esc zum Zurückgehen",
+  "Enter to submit, Esc to go back": "Enter zum Absenden, Esc zum Zurückgehen",
+  "Invalid step: {{step}}": "Ungültiger Schritt: {{step}}",
+  "No subagents found.": "Keine Unteragenten gefunden.",
   "Use '/agents create' to create your first subagent.":
     "Verwenden Sie '/agents create', um Ihren ersten Unteragenten zu erstellen.",
-  '(built-in)': '(integriert)',
-  '(overridden by project level agent)': '(überschrieben durch Projektagent)',
-  'Project Level ({{path}})': 'Projektebene ({{path}})',
-  'User Level ({{path}})': 'Benutzerebene ({{path}})',
-  'Built-in Agents': 'Integrierte Agenten',
-  'Extension Agents': 'Erweiterungs-Agenten',
-  'Using: {{count}} agents': 'Verwendet: {{count}} Agenten',
-  'View Agent': 'Agent anzeigen',
-  'Edit Agent': 'Agent bearbeiten',
-  'Delete Agent': 'Agent löschen',
-  Back: 'Zurück',
-  'No agent selected': 'Kein Agent ausgewählt',
-  'File Path: ': 'Dateipfad: ',
-  'Tools: ': 'Werkzeuge: ',
-  'Color: ': 'Farbe: ',
-  'Description:': 'Beschreibung:',
-  'System Prompt:': 'System-Prompt:',
-  'Open in editor': 'Im Editor öffnen',
-  'Edit tools': 'Werkzeuge bearbeiten',
-  'Edit color': 'Farbe bearbeiten',
-  '❌ Error:': '❌ Fehler:',
+  "(built-in)": "(integriert)",
+  "(overridden by project level agent)": "(überschrieben durch Projektagent)",
+  "Project Level ({{path}})": "Projektebene ({{path}})",
+  "User Level ({{path}})": "Benutzerebene ({{path}})",
+  "Built-in Agents": "Integrierte Agenten",
+  "Extension Agents": "Erweiterungs-Agenten",
+  "Using: {{count}} agents": "Verwendet: {{count}} Agenten",
+  "View Agent": "Agent anzeigen",
+  "Edit Agent": "Agent bearbeiten",
+  "Delete Agent": "Agent löschen",
+  Back: "Zurück",
+  "No agent selected": "Kein Agent ausgewählt",
+  "File Path: ": "Dateipfad: ",
+  "Tools: ": "Werkzeuge: ",
+  "Color: ": "Farbe: ",
+  "Description:": "Beschreibung:",
+  "System Prompt:": "System-Prompt:",
+  "Open in editor": "Im Editor öffnen",
+  "Edit tools": "Werkzeuge bearbeiten",
+  "Edit color": "Farbe bearbeiten",
+  "❌ Error:": "❌ Fehler:",
   'Are you sure you want to delete agent "{{name}}"?':
     'Sind Sie sicher, dass Sie den Agenten "{{name}}" löschen möchten?',
   // ============================================================================
   // Agents - Creation Wizard
   // ============================================================================
-  'Project Level (.qwen/agents/)': 'Projektebene (.qwen/agents/)',
-  'User Level (~/.qwen/agents/)': 'Benutzerebene (~/.qwen/agents/)',
-  '✅ Subagent Created Successfully!': '✅ Unteragent erfolgreich erstellt!',
+  "Project Level (.qwen/agents/)": "Projektebene (.qwen/agents/)",
+  "User Level (~/.qwen/agents/)": "Benutzerebene (~/.qwen/agents/)",
+  "✅ Subagent Created Successfully!": "✅ Unteragent erfolgreich erstellt!",
   'Subagent "{{name}}" has been saved to {{level}} level.':
     'Unteragent "{{name}}" wurde auf {{level}}-Ebene gespeichert.',
-  'Name: ': 'Name: ',
-  'Location: ': 'Speicherort: ',
-  '❌ Error saving subagent:': '❌ Fehler beim Speichern des Unteragenten:',
-  'Warnings:': 'Warnungen:',
+  "Name: ": "Name: ",
+  "Location: ": "Speicherort: ",
+  "❌ Error saving subagent:": "❌ Fehler beim Speichern des Unteragenten:",
+  "Warnings:": "Warnungen:",
   'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent':
     'Name "{{name}}" existiert bereits auf {{level}}-Ebene - bestehender Unteragent wird überschrieben',
   'Name "{{name}}" exists at user level - project level will take precedence':
     'Name "{{name}}" existiert auf Benutzerebene - Projektebene hat Vorrang',
   'Name "{{name}}" exists at project level - existing subagent will take precedence':
     'Name "{{name}}" existiert auf Projektebene - bestehender Unteragent hat Vorrang',
-  'Description is over {{length}} characters':
-    'Beschreibung ist über {{length}} Zeichen',
-  'System prompt is over {{length}} characters':
-    'System-Prompt ist über {{length}} Zeichen',
+  "Description is over {{length}} characters": "Beschreibung ist über {{length}} Zeichen",
+  "System prompt is over {{length}} characters": "System-Prompt ist über {{length}} Zeichen",
   // Agents - Creation Wizard Steps
-  'Step {{n}}: Choose Location': 'Schritt {{n}}: Speicherort wählen',
-  'Step {{n}}: Choose Generation Method':
-    'Schritt {{n}}: Generierungsmethode wählen',
-  'Generate with Qwen Code (Recommended)':
-    'Mit Qwen Code generieren (Empfohlen)',
-  'Manual Creation': 'Manuelle Erstellung',
-  'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)':
-    'Beschreiben Sie, was dieser Unteragent tun soll und wann er verwendet werden soll. (Ausführliche Beschreibung für beste Ergebnisse)',
-  'e.g., Expert code reviewer that reviews code based on best practices...':
-    'z.B. Experte für Code-Reviews, der Code nach Best Practices überprüft...',
-  'Generating subagent configuration...':
-    'Unteragent-Konfiguration wird generiert...',
-  'Failed to generate subagent: {{error}}':
-    'Fehler beim Generieren des Unteragenten: {{error}}',
-  'Step {{n}}: Describe Your Subagent': 'Schritt {{n}}: Unteragent beschreiben',
-  'Step {{n}}: Enter Subagent Name': 'Schritt {{n}}: Unteragent-Name eingeben',
-  'Step {{n}}: Enter System Prompt': 'Schritt {{n}}: System-Prompt eingeben',
-  'Step {{n}}: Enter Description': 'Schritt {{n}}: Beschreibung eingeben',
+  "Step {{n}}: Choose Location": "Schritt {{n}}: Speicherort wählen",
+  "Step {{n}}: Choose Generation Method": "Schritt {{n}}: Generierungsmethode wählen",
+  "Generate with Qwen Code (Recommended)": "Mit Qwen Code generieren (Empfohlen)",
+  "Manual Creation": "Manuelle Erstellung",
+  "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)":
+    "Beschreiben Sie, was dieser Unteragent tun soll und wann er verwendet werden soll. (Ausführliche Beschreibung für beste Ergebnisse)",
+  "e.g., Expert code reviewer that reviews code based on best practices...":
+    "z.B. Experte für Code-Reviews, der Code nach Best Practices überprüft...",
+  "Generating subagent configuration...": "Unteragent-Konfiguration wird generiert...",
+  "Failed to generate subagent: {{error}}": "Fehler beim Generieren des Unteragenten: {{error}}",
+  "Step {{n}}: Describe Your Subagent": "Schritt {{n}}: Unteragent beschreiben",
+  "Step {{n}}: Enter Subagent Name": "Schritt {{n}}: Unteragent-Name eingeben",
+  "Step {{n}}: Enter System Prompt": "Schritt {{n}}: System-Prompt eingeben",
+  "Step {{n}}: Enter Description": "Schritt {{n}}: Beschreibung eingeben",
   // Agents - Tool Selection
-  'Step {{n}}: Select Tools': 'Schritt {{n}}: Werkzeuge auswählen',
-  'All Tools (Default)': 'Alle Werkzeuge (Standard)',
-  'All Tools': 'Alle Werkzeuge',
-  'Read-only Tools': 'Nur-Lese-Werkzeuge',
-  'Read & Edit Tools': 'Lese- und Bearbeitungswerkzeuge',
-  'Read & Edit & Execution Tools':
-    'Lese-, Bearbeitungs- und Ausführungswerkzeuge',
-  'All tools selected, including MCP tools':
-    'Alle Werkzeuge ausgewählt, einschließlich MCP-Werkzeuge',
-  'Selected tools:': 'Ausgewählte Werkzeuge:',
-  'Read-only tools:': 'Nur-Lese-Werkzeuge:',
-  'Edit tools:': 'Bearbeitungswerkzeuge:',
-  'Execution tools:': 'Ausführungswerkzeuge:',
-  'Step {{n}}: Choose Background Color':
-    'Schritt {{n}}: Hintergrundfarbe wählen',
-  'Step {{n}}: Confirm and Save': 'Schritt {{n}}: Bestätigen und Speichern',
+  "Step {{n}}: Select Tools": "Schritt {{n}}: Werkzeuge auswählen",
+  "All Tools (Default)": "Alle Werkzeuge (Standard)",
+  "All Tools": "Alle Werkzeuge",
+  "Read-only Tools": "Nur-Lese-Werkzeuge",
+  "Read & Edit Tools": "Lese- und Bearbeitungswerkzeuge",
+  "Read & Edit & Execution Tools": "Lese-, Bearbeitungs- und Ausführungswerkzeuge",
+  "All tools selected, including MCP tools":
+    "Alle Werkzeuge ausgewählt, einschließlich MCP-Werkzeuge",
+  "Selected tools:": "Ausgewählte Werkzeuge:",
+  "Read-only tools:": "Nur-Lese-Werkzeuge:",
+  "Edit tools:": "Bearbeitungswerkzeuge:",
+  "Execution tools:": "Ausführungswerkzeuge:",
+  "Step {{n}}: Choose Background Color": "Schritt {{n}}: Hintergrundfarbe wählen",
+  "Step {{n}}: Confirm and Save": "Schritt {{n}}: Bestätigen und Speichern",
   // Agents - Navigation & Instructions
-  'Esc to cancel': 'Esc zum Abbrechen',
-  'Press Enter to save, e to save and edit, Esc to go back':
-    'Enter zum Speichern, e zum Speichern und Bearbeiten, Esc zum Zurückgehen',
-  'Press Enter to continue, {{navigation}}Esc to {{action}}':
-    'Enter zum Fortfahren, {{navigation}}Esc zum {{action}}',
-  cancel: 'Abbrechen',
-  'go back': 'Zurückgehen',
-  '↑↓ to navigate, ': '↑↓ zum Navigieren, ',
-  'Enter a clear, unique name for this subagent.':
-    'Geben Sie einen eindeutigen Namen für diesen Unteragenten ein.',
-  'e.g., Code Reviewer': 'z.B. Code-Reviewer',
-  'Name cannot be empty.': 'Name darf nicht leer sein.',
+  "Esc to cancel": "Esc zum Abbrechen",
+  "Press Enter to save, e to save and edit, Esc to go back":
+    "Enter zum Speichern, e zum Speichern und Bearbeiten, Esc zum Zurückgehen",
+  "Press Enter to continue, {{navigation}}Esc to {{action}}":
+    "Enter zum Fortfahren, {{navigation}}Esc zum {{action}}",
+  cancel: "Abbrechen",
+  "go back": "Zurückgehen",
+  "↑↓ to navigate, ": "↑↓ zum Navigieren, ",
+  "Enter a clear, unique name for this subagent.":
+    "Geben Sie einen eindeutigen Namen für diesen Unteragenten ein.",
+  "e.g., Code Reviewer": "z.B. Code-Reviewer",
+  "Name cannot be empty.": "Name darf nicht leer sein.",
   "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.":
-    'Schreiben Sie den System-Prompt, der das Verhalten dieses Unteragenten definiert. Ausführlich für beste Ergebnisse.',
-  'e.g., You are an expert code reviewer...':
-    'z.B. Sie sind ein Experte für Code-Reviews...',
-  'System prompt cannot be empty.': 'System-Prompt darf nicht leer sein.',
-  'Describe when and how this subagent should be used.':
-    'Beschreiben Sie, wann und wie dieser Unteragent verwendet werden soll.',
-  'e.g., Reviews code for best practices and potential bugs.':
-    'z.B. Überprüft Code auf Best Practices und mögliche Fehler.',
-  'Description cannot be empty.': 'Beschreibung darf nicht leer sein.',
-  'Failed to launch editor: {{error}}':
-    'Fehler beim Starten des Editors: {{error}}',
-  'Failed to save and edit subagent: {{error}}':
-    'Fehler beim Speichern und Bearbeiten des Unteragenten: {{error}}',
+    "Schreiben Sie den System-Prompt, der das Verhalten dieses Unteragenten definiert. Ausführlich für beste Ergebnisse.",
+  "e.g., You are an expert code reviewer...": "z.B. Sie sind ein Experte für Code-Reviews...",
+  "System prompt cannot be empty.": "System-Prompt darf nicht leer sein.",
+  "Describe when and how this subagent should be used.":
+    "Beschreiben Sie, wann und wie dieser Unteragent verwendet werden soll.",
+  "e.g., Reviews code for best practices and potential bugs.":
+    "z.B. Überprüft Code auf Best Practices und mögliche Fehler.",
+  "Description cannot be empty.": "Beschreibung darf nicht leer sein.",
+  "Failed to launch editor: {{error}}": "Fehler beim Starten des Editors: {{error}}",
+  "Failed to save and edit subagent: {{error}}":
+    "Fehler beim Speichern und Bearbeiten des Unteragenten: {{error}}",
 
   // ============================================================================
   // Commands - General (continued)
   // ============================================================================
-  'View and edit Qwen Code settings':
-    'Qwen Code Einstellungen anzeigen und bearbeiten',
-  Settings: 'Einstellungen',
-  'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
-    'Um Änderungen zu sehen, muss Qwen Code neu gestartet werden. Drücken Sie r, um jetzt zu beenden und Änderungen anzuwenden.',
+  "View and edit Qwen Code settings": "Qwen Code Einstellungen anzeigen und bearbeiten",
+  Settings: "Einstellungen",
+  "To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.":
+    "Um Änderungen zu sehen, muss Qwen Code neu gestartet werden. Drücken Sie r, um jetzt zu beenden und Änderungen anzuwenden.",
   'The command "/{{command}}" is not supported in non-interactive mode.':
     'Der Befehl "/{{command}}" wird im nicht-interaktiven Modus nicht unterstützt.',
   // ============================================================================
   // Settings Labels
   // ============================================================================
-  'Vim Mode': 'Vim-Modus',
-  'Disable Auto Update': 'Automatische Updates deaktivieren',
-  'Attribution: commit': 'Attribution: Commit',
-  'Terminal Bell Notification': 'Terminal-Signalton',
-  'Enable Usage Statistics': 'Nutzungsstatistiken aktivieren',
-  Theme: 'Farbschema',
-  'Preferred Editor': 'Bevorzugter Editor',
-  'Auto-connect to IDE': 'Automatische Verbindung zur IDE',
-  'Enable Prompt Completion': 'Eingabevervollständigung aktivieren',
-  'Debug Keystroke Logging': 'Debug-Protokollierung von Tastatureingaben',
-  'Language: UI': 'Sprache: Benutzeroberfläche',
-  'Language: Model': 'Sprache: Modell',
-  'Output Format': 'Ausgabeformat',
-  'Hide Window Title': 'Fenstertitel ausblenden',
-  'Show Status in Title': 'Status im Titel anzeigen',
-  'Hide Tips': 'Tipps ausblenden',
-  'Show Line Numbers in Code': 'Zeilennummern im Code anzeigen',
-  'Show Citations': 'Quellenangaben anzeigen',
-  'Custom Witty Phrases': 'Benutzerdefinierte Witzige Sprüche',
-  'Show Welcome Back Dialog': 'Willkommen-zurück-Dialog anzeigen',
-  'Enable User Feedback': 'Benutzerfeedback aktivieren',
-  'How is Qwen doing this session? (optional)':
-    'Wie macht sich Qwen in dieser Sitzung? (optional)',
-  Bad: 'Schlecht',
-  Fine: 'In Ordnung',
-  Good: 'Gut',
-  Dismiss: 'Ignorieren',
-  'Not Sure Yet': 'Noch nicht sicher',
-  'Any other key': 'Beliebige andere Taste',
-  'Disable Loading Phrases': 'Ladesprüche deaktivieren',
-  'Screen Reader Mode': 'Bildschirmleser-Modus',
-  'IDE Mode': 'IDE-Modus',
-  'Max Session Turns': 'Maximale Sitzungsrunden',
-  'Skip Next Speaker Check': 'Nächste-Sprecher-Prüfung überspringen',
-  'Skip Loop Detection': 'Schleifenerkennung überspringen',
-  'Skip Startup Context': 'Startkontext überspringen',
-  'Enable OpenAI Logging': 'OpenAI-Protokollierung aktivieren',
-  'OpenAI Logging Directory': 'OpenAI-Protokollierungsverzeichnis',
-  Timeout: 'Zeitlimit',
-  'Max Retries': 'Maximale Wiederholungen',
-  'Disable Cache Control': 'Cache-Steuerung deaktivieren',
-  'Memory Discovery Max Dirs': 'Maximale Verzeichnisse für Speichererkennung',
-  'Load Memory From Include Directories':
-    'Speicher aus Include-Verzeichnissen laden',
-  'Respect .gitignore': '.gitignore beachten',
-  'Respect .qwenignore': '.qwenignore beachten',
-  'Enable Recursive File Search': 'Rekursive Dateisuche aktivieren',
-  'Disable Fuzzy Search': 'Unscharfe Suche deaktivieren',
-  'Interactive Shell (PTY)': 'Interaktive Shell (PTY)',
-  'Show Color': 'Farbe anzeigen',
-  'Auto Accept': 'Automatisch akzeptieren',
-  'Use Ripgrep': 'Ripgrep verwenden',
-  'Use Builtin Ripgrep': 'Integriertes Ripgrep verwenden',
-  'Enable Tool Output Truncation': 'Werkzeugausgabe-Kürzung aktivieren',
-  'Tool Output Truncation Threshold':
-    'Schwellenwert für Werkzeugausgabe-Kürzung',
-  'Tool Output Truncation Lines': 'Zeilen für Werkzeugausgabe-Kürzung',
-  'Folder Trust': 'Ordnervertrauen',
-  'Vision Model Preview': 'Vision-Modell-Vorschau',
-  'Tool Schema Compliance': 'Werkzeug-Schema-Konformität',
+  "Vim Mode": "Vim-Modus",
+  "Disable Auto Update": "Automatische Updates deaktivieren",
+  "Attribution: commit": "Attribution: Commit",
+  "Terminal Bell Notification": "Terminal-Signalton",
+  "Enable Usage Statistics": "Nutzungsstatistiken aktivieren",
+  Theme: "Farbschema",
+  "Preferred Editor": "Bevorzugter Editor",
+  "Auto-connect to IDE": "Automatische Verbindung zur IDE",
+  "Enable Prompt Completion": "Eingabevervollständigung aktivieren",
+  "Debug Keystroke Logging": "Debug-Protokollierung von Tastatureingaben",
+  "Language: UI": "Sprache: Benutzeroberfläche",
+  "Language: Model": "Sprache: Modell",
+  "Output Format": "Ausgabeformat",
+  "Hide Window Title": "Fenstertitel ausblenden",
+  "Show Status in Title": "Status im Titel anzeigen",
+  "Hide Tips": "Tipps ausblenden",
+  "Show Line Numbers in Code": "Zeilennummern im Code anzeigen",
+  "Show Citations": "Quellenangaben anzeigen",
+  "Custom Witty Phrases": "Benutzerdefinierte Witzige Sprüche",
+  "Show Welcome Back Dialog": "Willkommen-zurück-Dialog anzeigen",
+  "Enable User Feedback": "Benutzerfeedback aktivieren",
+  "How is Qwen doing this session? (optional)": "Wie macht sich Qwen in dieser Sitzung? (optional)",
+  Bad: "Schlecht",
+  Fine: "In Ordnung",
+  Good: "Gut",
+  Dismiss: "Ignorieren",
+  "Not Sure Yet": "Noch nicht sicher",
+  "Any other key": "Beliebige andere Taste",
+  "Disable Loading Phrases": "Ladesprüche deaktivieren",
+  "Screen Reader Mode": "Bildschirmleser-Modus",
+  "IDE Mode": "IDE-Modus",
+  "Max Session Turns": "Maximale Sitzungsrunden",
+  "Skip Next Speaker Check": "Nächste-Sprecher-Prüfung überspringen",
+  "Skip Loop Detection": "Schleifenerkennung überspringen",
+  "Skip Startup Context": "Startkontext überspringen",
+  "Enable OpenAI Logging": "OpenAI-Protokollierung aktivieren",
+  "OpenAI Logging Directory": "OpenAI-Protokollierungsverzeichnis",
+  Timeout: "Zeitlimit",
+  "Max Retries": "Maximale Wiederholungen",
+  "Disable Cache Control": "Cache-Steuerung deaktivieren",
+  "Memory Discovery Max Dirs": "Maximale Verzeichnisse für Speichererkennung",
+  "Load Memory From Include Directories": "Speicher aus Include-Verzeichnissen laden",
+  "Respect .gitignore": ".gitignore beachten",
+  "Respect .qwenignore": ".qwenignore beachten",
+  "Enable Recursive File Search": "Rekursive Dateisuche aktivieren",
+  "Disable Fuzzy Search": "Unscharfe Suche deaktivieren",
+  "Interactive Shell (PTY)": "Interaktive Shell (PTY)",
+  "Show Color": "Farbe anzeigen",
+  "Auto Accept": "Automatisch akzeptieren",
+  "Use Ripgrep": "Ripgrep verwenden",
+  "Use Builtin Ripgrep": "Integriertes Ripgrep verwenden",
+  "Enable Tool Output Truncation": "Werkzeugausgabe-Kürzung aktivieren",
+  "Tool Output Truncation Threshold": "Schwellenwert für Werkzeugausgabe-Kürzung",
+  "Tool Output Truncation Lines": "Zeilen für Werkzeugausgabe-Kürzung",
+  "Folder Trust": "Ordnervertrauen",
+  "Vision Model Preview": "Vision-Modell-Vorschau",
+  "Tool Schema Compliance": "Werkzeug-Schema-Konformität",
   // Settings enum options
-  'Auto (detect from system)': 'Automatisch (vom System erkennen)',
-  Text: 'Text',
-  JSON: 'JSON',
-  Plan: 'Plan',
-  Default: 'Standard',
-  'Auto Edit': 'Automatisch bearbeiten',
-  YOLO: 'YOLO',
-  'toggle vim mode on/off': 'Vim-Modus ein-/ausschalten',
-  'check session stats. Usage: /stats [model|tools]':
-    'Sitzungsstatistiken prüfen. Verwendung: /stats [model|tools]',
-  'Show model-specific usage statistics.':
-    'Modellspezifische Nutzungsstatistiken anzeigen.',
-  'Show tool-specific usage statistics.':
-    'Werkzeugspezifische Nutzungsstatistiken anzeigen.',
-  'exit the cli': 'CLI beenden',
-  'Open MCP management dialog, or authenticate with OAuth-enabled servers':
-    'MCP-Verwaltungsdialog öffnen oder mit OAuth-fähigem Server authentifizieren',
-  'List configured MCP servers and tools, or authenticate with OAuth-enabled servers':
-    'Konfigurierte MCP-Server und Werkzeuge auflisten oder mit OAuth-fähigen Servern authentifizieren',
-  'Manage workspace directories': 'Arbeitsbereichsverzeichnisse verwalten',
-  'Add directories to the workspace. Use comma to separate multiple paths':
-    'Verzeichnisse zum Arbeitsbereich hinzufügen. Komma zum Trennen mehrerer Pfade verwenden',
-  'Show all directories in the workspace':
-    'Alle Verzeichnisse im Arbeitsbereich anzeigen',
-  'set external editor preference': 'Externen Editor festlegen',
-  'Select Editor': 'Editor auswählen',
-  'Editor Preference': 'Editor-Einstellung',
-  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
-    'Diese Editoren werden derzeit unterstützt. Bitte beachten Sie, dass einige Editoren nicht im Sandbox-Modus verwendet werden können.',
-  'Your preferred editor is:': 'Ihr bevorzugter Editor ist:',
-  'Manage extensions': 'Erweiterungen verwalten',
-  'Manage installed extensions': 'Installierte Erweiterungen verwalten',
-  'List active extensions': 'Aktive Erweiterungen auflisten',
-  'Update extensions. Usage: update <extension-names>|--all':
-    'Erweiterungen aktualisieren. Verwendung: update <Erweiterungsnamen>|--all',
-  'Disable an extension': 'Erweiterung deaktivieren',
-  'Enable an extension': 'Erweiterung aktivieren',
-  'Install an extension from a git repo or local path':
-    'Erweiterung aus Git-Repository oder lokalem Pfad installieren',
-  'Uninstall an extension': 'Erweiterung deinstallieren',
-  'No extensions installed.': 'Keine Erweiterungen installiert.',
-  'Usage: /extensions update <extension-names>|--all':
-    'Verwendung: /extensions update <Erweiterungsnamen>|--all',
+  "Auto (detect from system)": "Automatisch (vom System erkennen)",
+  Text: "Text",
+  JSON: "JSON",
+  Plan: "Plan",
+  Default: "Standard",
+  "Auto Edit": "Automatisch bearbeiten",
+  YOLO: "YOLO",
+  "toggle vim mode on/off": "Vim-Modus ein-/ausschalten",
+  "check session stats. Usage: /stats [model|tools]":
+    "Sitzungsstatistiken prüfen. Verwendung: /stats [model|tools]",
+  "Show model-specific usage statistics.": "Modellspezifische Nutzungsstatistiken anzeigen.",
+  "Show tool-specific usage statistics.": "Werkzeugspezifische Nutzungsstatistiken anzeigen.",
+  "exit the cli": "CLI beenden",
+  "Open MCP management dialog, or authenticate with OAuth-enabled servers":
+    "MCP-Verwaltungsdialog öffnen oder mit OAuth-fähigem Server authentifizieren",
+  "List configured MCP servers and tools, or authenticate with OAuth-enabled servers":
+    "Konfigurierte MCP-Server und Werkzeuge auflisten oder mit OAuth-fähigen Servern authentifizieren",
+  "Manage workspace directories": "Arbeitsbereichsverzeichnisse verwalten",
+  "Add directories to the workspace. Use comma to separate multiple paths":
+    "Verzeichnisse zum Arbeitsbereich hinzufügen. Komma zum Trennen mehrerer Pfade verwenden",
+  "Show all directories in the workspace": "Alle Verzeichnisse im Arbeitsbereich anzeigen",
+  "set external editor preference": "Externen Editor festlegen",
+  "Select Editor": "Editor auswählen",
+  "Editor Preference": "Editor-Einstellung",
+  "These editors are currently supported. Please note that some editors cannot be used in sandbox mode.":
+    "Diese Editoren werden derzeit unterstützt. Bitte beachten Sie, dass einige Editoren nicht im Sandbox-Modus verwendet werden können.",
+  "Your preferred editor is:": "Ihr bevorzugter Editor ist:",
+  "Manage extensions": "Erweiterungen verwalten",
+  "Manage installed extensions": "Installierte Erweiterungen verwalten",
+  "List active extensions": "Aktive Erweiterungen auflisten",
+  "Update extensions. Usage: update <extension-names>|--all":
+    "Erweiterungen aktualisieren. Verwendung: update <Erweiterungsnamen>|--all",
+  "Disable an extension": "Erweiterung deaktivieren",
+  "Enable an extension": "Erweiterung aktivieren",
+  "Install an extension from a git repo or local path":
+    "Erweiterung aus Git-Repository oder lokalem Pfad installieren",
+  "Uninstall an extension": "Erweiterung deinstallieren",
+  "No extensions installed.": "Keine Erweiterungen installiert.",
+  "Usage: /extensions update <extension-names>|--all":
+    "Verwendung: /extensions update <Erweiterungsnamen>|--all",
   'Extension "{{name}}" not found.': 'Erweiterung "{{name}}" nicht gefunden.',
-  'No extensions to update.': 'Keine Erweiterungen zum Aktualisieren.',
-  'Usage: /extensions install <source>':
-    'Verwendung: /extensions install <Quelle>',
-  'Installing extension from "{{source}}"...':
-    'Installiere Erweiterung von "{{source}}"...',
-  'Extension "{{name}}" installed successfully.':
-    'Erweiterung "{{name}}" erfolgreich installiert.',
+  "No extensions to update.": "Keine Erweiterungen zum Aktualisieren.",
+  "Usage: /extensions install <source>": "Verwendung: /extensions install <Quelle>",
+  'Installing extension from "{{source}}"...': 'Installiere Erweiterung von "{{source}}"...',
+  'Extension "{{name}}" installed successfully.': 'Erweiterung "{{name}}" erfolgreich installiert.',
   'Failed to install extension from "{{source}}": {{error}}':
     'Fehler beim Installieren der Erweiterung von "{{source}}": {{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    'Verwendung: /extensions uninstall <Erweiterungsname>',
-  'Uninstalling extension "{{name}}"...':
-    'Deinstalliere Erweiterung "{{name}}"...',
+  "Usage: /extensions uninstall <extension-name>":
+    "Verwendung: /extensions uninstall <Erweiterungsname>",
+  'Uninstalling extension "{{name}}"...': 'Deinstalliere Erweiterung "{{name}}"...',
   'Extension "{{name}}" uninstalled successfully.':
     'Erweiterung "{{name}}" erfolgreich deinstalliert.',
   'Failed to uninstall extension "{{name}}": {{error}}':
     'Fehler beim Deinstallieren der Erweiterung "{{name}}": {{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    'Verwendung: /extensions {{command}} <Erweiterung> [--scope=<user|workspace>]',
+  "Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]":
+    "Verwendung: /extensions {{command}} <Erweiterung> [--scope=<user|workspace>]",
   'Unsupported scope "{{scope}}", should be one of "user" or "workspace"':
     'Nicht unterstützter Bereich "{{scope}}", sollte "user" oder "workspace" sein',
   'Extension "{{name}}" disabled for scope "{{scope}}"':
     'Erweiterung "{{name}}" für Bereich "{{scope}}" deaktiviert',
   'Extension "{{name}}" enabled for scope "{{scope}}"':
     'Erweiterung "{{name}}" für Bereich "{{scope}}" aktiviert',
-  'Do you want to continue? [Y/n]: ': 'Möchten Sie fortfahren? [Y/n]: ',
-  'Do you want to continue?': 'Möchten Sie fortfahren?',
-  'Installing extension "{{name}}".':
-    'Erweiterung "{{name}}" wird installiert.',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**Erweiterungen können unerwartetes Verhalten verursachen. Stellen Sie sicher, dass Sie die Erweiterungsquelle untersucht haben und dem Autor vertrauen.**',
-  'This extension will run the following MCP servers:':
-    'Diese Erweiterung wird folgende MCP-Server ausführen:',
-  local: 'lokal',
-  remote: 'remote',
-  'This extension will add the following commands: {{commands}}.':
-    'Diese Erweiterung wird folgende Befehle hinzufügen: {{commands}}.',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    'Diese Erweiterung wird Informationen zu Ihrem QWEN.md-Kontext mit {{fileName}} hinzufügen',
-  'This extension will exclude the following core tools: {{tools}}':
-    'Diese Erweiterung wird folgende Kernwerkzeuge ausschließen: {{tools}}',
-  'This extension will install the following skills:':
-    'Diese Erweiterung wird folgende Fähigkeiten installieren:',
-  'This extension will install the following subagents:':
-    'Diese Erweiterung wird folgende Unteragenten installieren:',
-  'Installation cancelled for "{{name}}".':
-    'Installation von "{{name}}" abgebrochen.',
-  'You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.':
-    'Sie installieren eine Erweiterung von {{originSource}}. Einige Funktionen funktionieren möglicherweise nicht perfekt mit Qwen Code.',
-  '--ref and --auto-update are not applicable for marketplace extensions.':
-    '--ref und --auto-update sind nicht anwendbar für Marketplace-Erweiterungen.',
+  "Do you want to continue? [Y/n]: ": "Möchten Sie fortfahren? [Y/n]: ",
+  "Do you want to continue?": "Möchten Sie fortfahren?",
+  'Installing extension "{{name}}".': 'Erweiterung "{{name}}" wird installiert.',
+  "**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**":
+    "**Erweiterungen können unerwartetes Verhalten verursachen. Stellen Sie sicher, dass Sie die Erweiterungsquelle untersucht haben und dem Autor vertrauen.**",
+  "This extension will run the following MCP servers:":
+    "Diese Erweiterung wird folgende MCP-Server ausführen:",
+  local: "lokal",
+  remote: "remote",
+  "This extension will add the following commands: {{commands}}.":
+    "Diese Erweiterung wird folgende Befehle hinzufügen: {{commands}}.",
+  "This extension will append info to your QWEN.md context using {{fileName}}":
+    "Diese Erweiterung wird Informationen zu Ihrem QWEN.md-Kontext mit {{fileName}} hinzufügen",
+  "This extension will exclude the following core tools: {{tools}}":
+    "Diese Erweiterung wird folgende Kernwerkzeuge ausschließen: {{tools}}",
+  "This extension will install the following skills:":
+    "Diese Erweiterung wird folgende Fähigkeiten installieren:",
+  "This extension will install the following subagents:":
+    "Diese Erweiterung wird folgende Unteragenten installieren:",
+  'Installation cancelled for "{{name}}".': 'Installation von "{{name}}" abgebrochen.',
+  "You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.":
+    "Sie installieren eine Erweiterung von {{originSource}}. Einige Funktionen funktionieren möglicherweise nicht perfekt mit Qwen Code.",
+  "--ref and --auto-update are not applicable for marketplace extensions.":
+    "--ref und --auto-update sind nicht anwendbar für Marketplace-Erweiterungen.",
   'Extension "{{name}}" installed successfully and enabled.':
     'Erweiterung "{{name}}" erfolgreich installiert und aktiviert.',
-  'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).':
-    'Installiert eine Erweiterung von einer Git-Repository-URL, einem lokalen Pfad oder dem Claude-Marketplace (marketplace-url:plugin-name).',
-  'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.':
-    'Die GitHub-URL, der lokale Pfad oder die Marketplace-Quelle (marketplace-url:plugin-name) der zu installierenden Erweiterung.',
-  'The git ref to install from.': 'Die Git-Referenz für die Installation.',
-  'Enable auto-update for this extension.':
-    'Automatisches Update für diese Erweiterung aktivieren.',
-  'Enable pre-release versions for this extension.':
-    'Pre-Release-Versionen für diese Erweiterung aktivieren.',
-  'Acknowledge the security risks of installing an extension and skip the confirmation prompt.':
-    'Sicherheitsrisiken der Erweiterungsinstallation bestätigen und Bestätigungsaufforderung überspringen.',
-  'The source argument must be provided.':
-    'Das Quellargument muss angegeben werden.',
+  "Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).":
+    "Installiert eine Erweiterung von einer Git-Repository-URL, einem lokalen Pfad oder dem Claude-Marketplace (marketplace-url:plugin-name).",
+  "The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.":
+    "Die GitHub-URL, der lokale Pfad oder die Marketplace-Quelle (marketplace-url:plugin-name) der zu installierenden Erweiterung.",
+  "The git ref to install from.": "Die Git-Referenz für die Installation.",
+  "Enable auto-update for this extension.":
+    "Automatisches Update für diese Erweiterung aktivieren.",
+  "Enable pre-release versions for this extension.":
+    "Pre-Release-Versionen für diese Erweiterung aktivieren.",
+  "Acknowledge the security risks of installing an extension and skip the confirmation prompt.":
+    "Sicherheitsrisiken der Erweiterungsinstallation bestätigen und Bestätigungsaufforderung überspringen.",
+  "The source argument must be provided.": "Das Quellargument muss angegeben werden.",
   'Extension "{{name}}" successfully uninstalled.':
     'Erweiterung "{{name}}" erfolgreich deinstalliert.',
-  'Uninstalls an extension.': 'Deinstalliert eine Erweiterung.',
-  'The name or source path of the extension to uninstall.':
-    'Der Name oder Quellpfad der zu deinstallierenden Erweiterung.',
-  'Please include the name of the extension to uninstall as a positional argument.':
-    'Bitte geben Sie den Namen der zu deinstallierenden Erweiterung als Positionsargument an.',
-  'Enables an extension.': 'Aktiviert eine Erweiterung.',
-  'The name of the extension to enable.':
-    'Der Name der zu aktivierenden Erweiterung.',
-  'The scope to enable the extenison in. If not set, will be enabled in all scopes.':
-    'Der Bereich, in dem die Erweiterung aktiviert werden soll. Wenn nicht gesetzt, wird sie in allen Bereichen aktiviert.',
+  "Uninstalls an extension.": "Deinstalliert eine Erweiterung.",
+  "The name or source path of the extension to uninstall.":
+    "Der Name oder Quellpfad der zu deinstallierenden Erweiterung.",
+  "Please include the name of the extension to uninstall as a positional argument.":
+    "Bitte geben Sie den Namen der zu deinstallierenden Erweiterung als Positionsargument an.",
+  "Enables an extension.": "Aktiviert eine Erweiterung.",
+  "The name of the extension to enable.": "Der Name der zu aktivierenden Erweiterung.",
+  "The scope to enable the extenison in. If not set, will be enabled in all scopes.":
+    "Der Bereich, in dem die Erweiterung aktiviert werden soll. Wenn nicht gesetzt, wird sie in allen Bereichen aktiviert.",
   'Extension "{{name}}" successfully enabled for scope "{{scope}}".':
     'Erweiterung "{{name}}" erfolgreich für Bereich "{{scope}}" aktiviert.',
   'Extension "{{name}}" successfully enabled in all scopes.':
     'Erweiterung "{{name}}" erfolgreich in allen Bereichen aktiviert.',
-  'Invalid scope: {{scope}}. Please use one of {{scopes}}.':
-    'Ungültiger Bereich: {{scope}}. Bitte verwenden Sie einen von {{scopes}}.',
-  'Disables an extension.': 'Deaktiviert eine Erweiterung.',
-  'The name of the extension to disable.':
-    'Der Name der zu deaktivierenden Erweiterung.',
-  'The scope to disable the extenison in.':
-    'Der Bereich, in dem die Erweiterung deaktiviert werden soll.',
+  "Invalid scope: {{scope}}. Please use one of {{scopes}}.":
+    "Ungültiger Bereich: {{scope}}. Bitte verwenden Sie einen von {{scopes}}.",
+  "Disables an extension.": "Deaktiviert eine Erweiterung.",
+  "The name of the extension to disable.": "Der Name der zu deaktivierenden Erweiterung.",
+  "The scope to disable the extenison in.":
+    "Der Bereich, in dem die Erweiterung deaktiviert werden soll.",
   'Extension "{{name}}" successfully disabled for scope "{{scope}}".':
     'Erweiterung "{{name}}" erfolgreich für Bereich "{{scope}}" deaktiviert.',
   'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.':
     'Erweiterung "{{name}}" erfolgreich aktualisiert: {{oldVersion}} → {{newVersion}}.',
   'Unable to install extension "{{name}}" due to missing install metadata':
     'Erweiterung "{{name}}" kann aufgrund fehlender Installationsmetadaten nicht installiert werden',
-  'Extension "{{name}}" is already up to date.':
-    'Erweiterung "{{name}}" ist bereits aktuell.',
-  'Updates all extensions or a named extension to the latest version.':
-    'Aktualisiert alle Erweiterungen oder eine benannte Erweiterung auf die neueste Version.',
-  'The name of the extension to update.':
-    'Der Name der zu aktualisierenden Erweiterung.',
-  'Update all extensions.': 'Alle Erweiterungen aktualisieren.',
-  'Either an extension name or --all must be provided':
-    'Entweder ein Erweiterungsname oder --all muss angegeben werden',
-  'Lists installed extensions.': 'Listet installierte Erweiterungen auf.',
-  'Path:': 'Pfad:',
-  'Source:': 'Quelle:',
-  'Type:': 'Typ:',
-  'Ref:': 'Ref:',
-  'Release tag:': 'Release-Tag:',
-  'Enabled (User):': 'Aktiviert (Benutzer):',
-  'Enabled (Workspace):': 'Aktiviert (Arbeitsbereich):',
-  'Context files:': 'Kontextdateien:',
-  'Skills:': 'Skills:',
-  'Agents:': 'Agents:',
-  'MCP servers:': 'MCP-Server:',
-  'Link extension failed to install.':
-    'Verknüpfte Erweiterung konnte nicht installiert werden.',
+  'Extension "{{name}}" is already up to date.': 'Erweiterung "{{name}}" ist bereits aktuell.',
+  "Updates all extensions or a named extension to the latest version.":
+    "Aktualisiert alle Erweiterungen oder eine benannte Erweiterung auf die neueste Version.",
+  "The name of the extension to update.": "Der Name der zu aktualisierenden Erweiterung.",
+  "Update all extensions.": "Alle Erweiterungen aktualisieren.",
+  "Either an extension name or --all must be provided":
+    "Entweder ein Erweiterungsname oder --all muss angegeben werden",
+  "Lists installed extensions.": "Listet installierte Erweiterungen auf.",
+  "Path:": "Pfad:",
+  "Source:": "Quelle:",
+  "Type:": "Typ:",
+  "Ref:": "Ref:",
+  "Release tag:": "Release-Tag:",
+  "Enabled (User):": "Aktiviert (Benutzer):",
+  "Enabled (Workspace):": "Aktiviert (Arbeitsbereich):",
+  "Context files:": "Kontextdateien:",
+  "Skills:": "Skills:",
+  "Agents:": "Agents:",
+  "MCP servers:": "MCP-Server:",
+  "Link extension failed to install.": "Verknüpfte Erweiterung konnte nicht installiert werden.",
   'Extension "{{name}}" linked successfully and enabled.':
     'Erweiterung "{{name}}" erfolgreich verknüpft und aktiviert.',
-  'Links an extension from a local path. Updates made to the local path will always be reflected.':
-    'Verknüpft eine Erweiterung von einem lokalen Pfad. Änderungen am lokalen Pfad werden immer widergespiegelt.',
-  'The name of the extension to link.':
-    'Der Name der zu verknüpfenden Erweiterung.',
-  'Set a specific setting for an extension.':
-    'Legt eine bestimmte Einstellung für eine Erweiterung fest.',
-  'Name of the extension to configure.':
-    'Name der zu konfigurierenden Erweiterung.',
-  'The setting to configure (name or env var).':
-    'Die zu konfigurierende Einstellung (Name oder Umgebungsvariable).',
-  'The scope to set the setting in.':
-    'Der Bereich, in dem die Einstellung gesetzt werden soll.',
-  'List all settings for an extension.':
-    'Listet alle Einstellungen einer Erweiterung auf.',
-  'Name of the extension.': 'Name der Erweiterung.',
+  "Links an extension from a local path. Updates made to the local path will always be reflected.":
+    "Verknüpft eine Erweiterung von einem lokalen Pfad. Änderungen am lokalen Pfad werden immer widergespiegelt.",
+  "The name of the extension to link.": "Der Name der zu verknüpfenden Erweiterung.",
+  "Set a specific setting for an extension.":
+    "Legt eine bestimmte Einstellung für eine Erweiterung fest.",
+  "Name of the extension to configure.": "Name der zu konfigurierenden Erweiterung.",
+  "The setting to configure (name or env var).":
+    "Die zu konfigurierende Einstellung (Name oder Umgebungsvariable).",
+  "The scope to set the setting in.": "Der Bereich, in dem die Einstellung gesetzt werden soll.",
+  "List all settings for an extension.": "Listet alle Einstellungen einer Erweiterung auf.",
+  "Name of the extension.": "Name der Erweiterung.",
   'Extension "{{name}}" has no settings to configure.':
     'Erweiterung "{{name}}" hat keine zu konfigurierenden Einstellungen.',
   'Settings for "{{name}}":': 'Einstellungen für "{{name}}":',
-  '(workspace)': '(Arbeitsbereich)',
-  '(user)': '(Benutzer)',
-  '[not set]': '[nicht gesetzt]',
-  '[value stored in keychain]': '[Wert in Schlüsselbund gespeichert]',
-  'Manage extension settings.': 'Erweiterungseinstellungen verwalten.',
-  'You need to specify a command (set or list).':
-    'Sie müssen einen Befehl angeben (set oder list).',
+  "(workspace)": "(Arbeitsbereich)",
+  "(user)": "(Benutzer)",
+  "[not set]": "[nicht gesetzt]",
+  "[value stored in keychain]": "[Wert in Schlüsselbund gespeichert]",
+  "Manage extension settings.": "Erweiterungseinstellungen verwalten.",
+  "You need to specify a command (set or list).":
+    "Sie müssen einen Befehl angeben (set oder list).",
   // ============================================================================
   // Plugin Choice / Marketplace
   // ============================================================================
-  'No plugins available in this marketplace.':
-    'In diesem Marktplatz sind keine Plugins verfügbar.',
+  "No plugins available in this marketplace.": "In diesem Marktplatz sind keine Plugins verfügbar.",
   'Select a plugin to install from marketplace "{{name}}":':
     'Wählen Sie ein Plugin zur Installation aus Marktplatz "{{name}}":',
-  'Plugin selection cancelled.': 'Plugin-Auswahl abgebrochen.',
+  "Plugin selection cancelled.": "Plugin-Auswahl abgebrochen.",
   'Select a plugin from "{{name}}"': 'Plugin aus "{{name}}" auswählen',
-  'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel':
-    'Verwenden Sie ↑↓ oder j/k zum Navigieren, Enter zum Auswählen, Escape zum Abbrechen',
-  '{{count}} more above': '{{count}} weitere oben',
-  '{{count}} more below': '{{count}} weitere unten',
-  'manage IDE integration': 'IDE-Integration verwalten',
-  'check status of IDE integration': 'Status der IDE-Integration prüfen',
-  'install required IDE companion for {{ideName}}':
-    'Erforderlichen IDE-Begleiter für {{ideName}} installieren',
-  'enable IDE integration': 'IDE-Integration aktivieren',
-  'disable IDE integration': 'IDE-Integration deaktivieren',
-  'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.':
-    'IDE-Integration wird in Ihrer aktuellen Umgebung nicht unterstützt. Um diese Funktion zu nutzen, führen Sie Qwen Code in einer dieser unterstützten IDEs aus: VS Code oder VS Code-Forks.',
-  'Set up GitHub Actions': 'GitHub Actions einrichten',
-  'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)':
-    'Terminal-Tastenbelegungen für mehrzeilige Eingabe konfigurieren (VS Code, Cursor, Windsurf, Trae)',
-  'Please restart your terminal for the changes to take effect.':
-    'Bitte starten Sie Ihr Terminal neu, damit die Änderungen wirksam werden.',
-  'Failed to configure terminal: {{error}}':
-    'Fehler beim Konfigurieren des Terminals: {{error}}',
-  'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.':
-    'Konnte {{terminalName}}-Konfigurationspfad unter Windows nicht ermitteln: APPDATA-Umgebungsvariable ist nicht gesetzt.',
-  '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.':
-    '{{terminalName}} keybindings.json existiert, ist aber kein gültiges JSON-Array. Bitte korrigieren Sie die Datei manuell oder löschen Sie sie, um automatische Konfiguration zu ermöglichen.',
-  'File: {{file}}': 'Datei: {{file}}',
-  'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.':
-    'Fehler beim Parsen von {{terminalName}} keybindings.json. Die Datei enthält ungültiges JSON. Bitte korrigieren Sie die Datei manuell oder löschen Sie sie, um automatische Konfiguration zu ermöglichen.',
-  'Error: {{error}}': 'Fehler: {{error}}',
-  'Shift+Enter binding already exists':
-    'Umschalt+Enter-Belegung existiert bereits',
-  'Ctrl+Enter binding already exists': 'Strg+Enter-Belegung existiert bereits',
-  'Existing keybindings detected. Will not modify to avoid conflicts.':
-    'Bestehende Tastenbelegungen erkannt. Keine Änderungen, um Konflikte zu vermeiden.',
-  'Please check and modify manually if needed: {{file}}':
-    'Bitte prüfen und bei Bedarf manuell ändern: {{file}}',
-  'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.':
-    'Umschalt+Enter und Strg+Enter Tastenbelegungen zu {{terminalName}} hinzugefügt.',
-  'Modified: {{file}}': 'Geändert: {{file}}',
-  '{{terminalName}} keybindings already configured.':
-    '{{terminalName}}-Tastenbelegungen bereits konfiguriert.',
-  'Failed to configure {{terminalName}}.':
-    'Fehler beim Konfigurieren von {{terminalName}}.',
-  'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).':
-    'Ihr Terminal ist bereits für optimale Erfahrung mit mehrzeiliger Eingabe konfiguriert (Umschalt+Enter und Strg+Enter).',
+  "Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel":
+    "Verwenden Sie ↑↓ oder j/k zum Navigieren, Enter zum Auswählen, Escape zum Abbrechen",
+  "{{count}} more above": "{{count}} weitere oben",
+  "{{count}} more below": "{{count}} weitere unten",
+  "manage IDE integration": "IDE-Integration verwalten",
+  "check status of IDE integration": "Status der IDE-Integration prüfen",
+  "install required IDE companion for {{ideName}}":
+    "Erforderlichen IDE-Begleiter für {{ideName}} installieren",
+  "enable IDE integration": "IDE-Integration aktivieren",
+  "disable IDE integration": "IDE-Integration deaktivieren",
+  "IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.":
+    "IDE-Integration wird in Ihrer aktuellen Umgebung nicht unterstützt. Um diese Funktion zu nutzen, führen Sie Qwen Code in einer dieser unterstützten IDEs aus: VS Code oder VS Code-Forks.",
+  "Set up GitHub Actions": "GitHub Actions einrichten",
+  "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)":
+    "Terminal-Tastenbelegungen für mehrzeilige Eingabe konfigurieren (VS Code, Cursor, Windsurf, Trae)",
+  "Please restart your terminal for the changes to take effect.":
+    "Bitte starten Sie Ihr Terminal neu, damit die Änderungen wirksam werden.",
+  "Failed to configure terminal: {{error}}": "Fehler beim Konfigurieren des Terminals: {{error}}",
+  "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.":
+    "Konnte {{terminalName}}-Konfigurationspfad unter Windows nicht ermitteln: APPDATA-Umgebungsvariable ist nicht gesetzt.",
+  "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.":
+    "{{terminalName}} keybindings.json existiert, ist aber kein gültiges JSON-Array. Bitte korrigieren Sie die Datei manuell oder löschen Sie sie, um automatische Konfiguration zu ermöglichen.",
+  "File: {{file}}": "Datei: {{file}}",
+  "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.":
+    "Fehler beim Parsen von {{terminalName}} keybindings.json. Die Datei enthält ungültiges JSON. Bitte korrigieren Sie die Datei manuell oder löschen Sie sie, um automatische Konfiguration zu ermöglichen.",
+  "Error: {{error}}": "Fehler: {{error}}",
+  "Shift+Enter binding already exists": "Umschalt+Enter-Belegung existiert bereits",
+  "Ctrl+Enter binding already exists": "Strg+Enter-Belegung existiert bereits",
+  "Existing keybindings detected. Will not modify to avoid conflicts.":
+    "Bestehende Tastenbelegungen erkannt. Keine Änderungen, um Konflikte zu vermeiden.",
+  "Please check and modify manually if needed: {{file}}":
+    "Bitte prüfen und bei Bedarf manuell ändern: {{file}}",
+  "Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.":
+    "Umschalt+Enter und Strg+Enter Tastenbelegungen zu {{terminalName}} hinzugefügt.",
+  "Modified: {{file}}": "Geändert: {{file}}",
+  "{{terminalName}} keybindings already configured.":
+    "{{terminalName}}-Tastenbelegungen bereits konfiguriert.",
+  "Failed to configure {{terminalName}}.": "Fehler beim Konfigurieren von {{terminalName}}.",
+  "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).":
+    "Ihr Terminal ist bereits für optimale Erfahrung mit mehrzeiliger Eingabe konfiguriert (Umschalt+Enter und Strg+Enter).",
   // ============================================================================
   // Commands - Hooks
   // ============================================================================
-  'Manage Qwen Code hooks': 'Qwen Code-Hooks verwalten',
-  'List all configured hooks': 'Alle konfigurierten Hooks auflisten',
-  'Enable a disabled hook': 'Einen deaktivierten Hook aktivieren',
-  'Disable an active hook': 'Einen aktiven Hook deaktivieren',
+  "Manage Qwen Code hooks": "Qwen Code-Hooks verwalten",
+  "List all configured hooks": "Alle konfigurierten Hooks auflisten",
+  "Enable a disabled hook": "Einen deaktivierten Hook aktivieren",
+  "Disable an active hook": "Einen aktiven Hook deaktivieren",
   // Hooks - Dialog
-  Hooks: 'Hooks',
-  'Loading hooks...': 'Hooks werden geladen...',
-  'Error loading hooks:': 'Fehler beim Laden der Hooks:',
-  'Press Escape to close': 'Escape zum Schließen drücken',
-  'Press Escape, Ctrl+C, or Ctrl+D to cancel':
-    'Escape, Ctrl+C oder Ctrl+D zum Abbrechen',
-  'Press Space, Enter, or Escape to dismiss':
-    'Leertaste, Enter oder Escape zum Schließen',
-  'No hook selected': 'Kein Hook ausgewählt',
+  Hooks: "Hooks",
+  "Loading hooks...": "Hooks werden geladen...",
+  "Error loading hooks:": "Fehler beim Laden der Hooks:",
+  "Press Escape to close": "Escape zum Schließen drücken",
+  "Press Escape, Ctrl+C, or Ctrl+D to cancel": "Escape, Ctrl+C oder Ctrl+D zum Abbrechen",
+  "Press Space, Enter, or Escape to dismiss": "Leertaste, Enter oder Escape zum Schließen",
+  "No hook selected": "Kein Hook ausgewählt",
   // Hooks - List Step
-  'No hook events found.': 'Keine Hook-Ereignisse gefunden.',
-  '{{count}} hook configured': '{{count}} Hook konfiguriert',
-  '{{count}} hooks configured': '{{count}} Hooks konfiguriert',
-  'This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.':
-    'Dieses Menü ist schreibgeschützt. Um Hooks hinzuzufügen oder zu ändern, bearbeiten Sie settings.json direkt oder fragen Sie Qwen Code.',
-  'Enter to select · Esc to cancel': 'Enter zum Auswählen · Esc zum Abbrechen',
+  "No hook events found.": "Keine Hook-Ereignisse gefunden.",
+  "{{count}} hook configured": "{{count}} Hook konfiguriert",
+  "{{count}} hooks configured": "{{count}} Hooks konfiguriert",
+  "This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.":
+    "Dieses Menü ist schreibgeschützt. Um Hooks hinzuzufügen oder zu ändern, bearbeiten Sie settings.json direkt oder fragen Sie Qwen Code.",
+  "Enter to select · Esc to cancel": "Enter zum Auswählen · Esc zum Abbrechen",
   // Hooks - Detail Step
-  'Exit codes:': 'Exit-Codes:',
-  'Configured hooks:': 'Konfigurierte Hooks:',
-  'No hooks configured for this event.':
-    'Für dieses Ereignis sind keine Hooks konfiguriert.',
-  'To add hooks, edit settings.json directly or ask Qwen.':
-    'Um Hooks hinzuzufügen, bearbeiten Sie settings.json direkt oder fragen Sie Qwen.',
-  'Enter to select · Esc to go back': 'Enter zum Auswählen · Esc zum Zurück',
+  "Exit codes:": "Exit-Codes:",
+  "Configured hooks:": "Konfigurierte Hooks:",
+  "No hooks configured for this event.": "Für dieses Ereignis sind keine Hooks konfiguriert.",
+  "To add hooks, edit settings.json directly or ask Qwen.":
+    "Um Hooks hinzuzufügen, bearbeiten Sie settings.json direkt oder fragen Sie Qwen.",
+  "Enter to select · Esc to go back": "Enter zum Auswählen · Esc zum Zurück",
   // Hooks - Config Detail Step
-  'Hook details': 'Hook-Details',
-  'Event:': 'Ereignis:',
-  'Extension:': 'Erweiterung:',
-  'Desc:': 'Beschreibung:',
-  'No hook config selected': 'Keine Hook-Konfiguration ausgewählt',
-  'To modify or remove this hook, edit settings.json directly or ask Qwen to help.':
-    'Um diesen Hook zu ändern oder zu entfernen, bearbeiten Sie settings.json direkt oder fragen Sie Qwen.',
+  "Hook details": "Hook-Details",
+  "Event:": "Ereignis:",
+  "Extension:": "Erweiterung:",
+  "Desc:": "Beschreibung:",
+  "No hook config selected": "Keine Hook-Konfiguration ausgewählt",
+  "To modify or remove this hook, edit settings.json directly or ask Qwen to help.":
+    "Um diesen Hook zu ändern oder zu entfernen, bearbeiten Sie settings.json direkt oder fragen Sie Qwen.",
   // Hooks - Disabled Step
-  'Hook Configuration - Disabled': 'Hook-Konfiguration - Deaktiviert',
-  'All hooks are currently disabled. You have {{count}} that are not running.':
-    'Alle Hooks sind derzeit deaktiviert. Sie haben {{count}} die nicht ausgeführt werden.',
-  '{{count}} configured hook': '{{count}} konfigurierter Hook',
-  '{{count}} configured hooks': '{{count}} konfigurierte Hooks',
-  'When hooks are disabled:': 'Wenn Hooks deaktiviert sind:',
-  'No hook commands will execute': 'Keine Hook-Befehle werden ausgeführt',
-  'StatusLine will not be displayed': 'StatusLine wird nicht angezeigt',
-  'Tool operations will proceed without hook validation':
-    'Tool-Operationen werden ohne Hook-Validierung fortgesetzt',
+  "Hook Configuration - Disabled": "Hook-Konfiguration - Deaktiviert",
+  "All hooks are currently disabled. You have {{count}} that are not running.":
+    "Alle Hooks sind derzeit deaktiviert. Sie haben {{count}} die nicht ausgeführt werden.",
+  "{{count}} configured hook": "{{count}} konfigurierter Hook",
+  "{{count}} configured hooks": "{{count}} konfigurierte Hooks",
+  "When hooks are disabled:": "Wenn Hooks deaktiviert sind:",
+  "No hook commands will execute": "Keine Hook-Befehle werden ausgeführt",
+  "StatusLine will not be displayed": "StatusLine wird nicht angezeigt",
+  "Tool operations will proceed without hook validation":
+    "Tool-Operationen werden ohne Hook-Validierung fortgesetzt",
   'To re-enable hooks, remove "disableAllHooks" from settings.json or ask Qwen Code.':
     'Um Hooks wieder zu aktivieren, entfernen Sie "disableAllHooks" aus settings.json oder fragen Sie Qwen Code.',
   // Hooks - Source
-  Project: 'Projekt',
-  User: 'Benutzer',
-  System: 'System',
-  Extension: 'Erweiterung',
-  'Local Settings': 'Lokale Einstellungen',
-  'User Settings': 'Benutzereinstellungen',
-  'System Settings': 'Systemeinstellungen',
-  Extensions: 'Erweiterungen',
+  Project: "Projekt",
+  User: "Benutzer",
+  System: "System",
+  Extension: "Erweiterung",
+  "Local Settings": "Lokale Einstellungen",
+  "User Settings": "Benutzereinstellungen",
+  "System Settings": "Systemeinstellungen",
+  Extensions: "Erweiterungen",
   // Hooks - Status
-  '✓ Enabled': '✓ Aktiviert',
-  '✗ Disabled': '✗ Deaktiviert',
+  "✓ Enabled": "✓ Aktiviert",
+  "✗ Disabled": "✗ Deaktiviert",
   // Hooks - Event Descriptions (short)
-  'Before tool execution': 'Vor der Tool-Ausführung',
-  'After tool execution': 'Nach der Tool-Ausführung',
-  'After tool execution fails': 'Wenn die Tool-Ausführung fehlschlägt',
-  'When notifications are sent': 'Wenn Benachrichtigungen gesendet werden',
-  'When the user submits a prompt': 'Wenn der Benutzer einen Prompt absendet',
-  'When a new session is started': 'Wenn eine neue Sitzung gestartet wird',
-  'Right before Qwen Code concludes its response':
-    'Direkt bevor Qwen Code seine Antwort abschließt',
-  'When a subagent (Agent tool call) is started':
-    'Wenn ein Subagent (Agent-Tool-Aufruf) gestartet wird',
-  'Right before a subagent concludes its response':
-    'Direkt bevor ein Subagent seine Antwort abschließt',
-  'Before conversation compaction': 'Vor der Gesprächskomprimierung',
-  'When a session is ending': 'Wenn eine Sitzung endet',
-  'When a permission dialog is displayed':
-    'Wenn ein Berechtigungsdialog angezeigt wird',
+  "Before tool execution": "Vor der Tool-Ausführung",
+  "After tool execution": "Nach der Tool-Ausführung",
+  "After tool execution fails": "Wenn die Tool-Ausführung fehlschlägt",
+  "When notifications are sent": "Wenn Benachrichtigungen gesendet werden",
+  "When the user submits a prompt": "Wenn der Benutzer einen Prompt absendet",
+  "When a new session is started": "Wenn eine neue Sitzung gestartet wird",
+  "Right before Qwen Code concludes its response":
+    "Direkt bevor Qwen Code seine Antwort abschließt",
+  "When a subagent (Agent tool call) is started":
+    "Wenn ein Subagent (Agent-Tool-Aufruf) gestartet wird",
+  "Right before a subagent concludes its response":
+    "Direkt bevor ein Subagent seine Antwort abschließt",
+  "Before conversation compaction": "Vor der Gesprächskomprimierung",
+  "When a session is ending": "Wenn eine Sitzung endet",
+  "When a permission dialog is displayed": "Wenn ein Berechtigungsdialog angezeigt wird",
   // Hooks - Event Descriptions (detailed)
-  'Input to command is JSON of tool call arguments.':
-    'Die Eingabe an den Befehl ist JSON der Tool-Aufruf-Argumente.',
+  "Input to command is JSON of tool call arguments.":
+    "Die Eingabe an den Befehl ist JSON der Tool-Aufruf-Argumente.",
   'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).':
     'Die Eingabe an den Befehl ist JSON mit den Feldern "inputs" (Tool-Aufruf-Argumente) und "response" (Tool-Aufruf-Antwort).',
-  'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.':
-    'Die Eingabe an den Befehl ist JSON mit tool_name, tool_input, tool_use_id, error, error_type, is_interrupt und is_timeout.',
-  'Input to command is JSON with notification message and type.':
-    'Die Eingabe an den Befehl ist JSON mit Benachrichtigungsnachricht und -typ.',
-  'Input to command is JSON with original user prompt text.':
-    'Die Eingabe an den Befehl ist JSON mit dem ursprünglichen Benutzer-Prompt-Text.',
-  'Input to command is JSON with session start source.':
-    'Die Eingabe an den Befehl ist JSON mit der Sitzungsstart-Quelle.',
-  'Input to command is JSON with session end reason.':
-    'Die Eingabe an den Befehl ist JSON mit dem Sitzungsende-Grund.',
-  'Input to command is JSON with agent_id and agent_type.':
-    'Die Eingabe an den Befehl ist JSON mit agent_id und agent_type.',
-  'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.':
-    'Die Eingabe an den Befehl ist JSON mit agent_id, agent_type und agent_transcript_path.',
-  'Input to command is JSON with compaction details.':
-    'Die Eingabe an den Befehl ist JSON mit Komprimierungsdetails.',
-  'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.':
-    'Die Eingabe an den Befehl ist JSON mit tool_name, tool_input und tool_use_id. Ausgabe ist JSON mit hookSpecificOutput, das die Entscheidung zum Zulassen oder Ablehnen enthält.',
+  "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.":
+    "Die Eingabe an den Befehl ist JSON mit tool_name, tool_input, tool_use_id, error, error_type, is_interrupt und is_timeout.",
+  "Input to command is JSON with notification message and type.":
+    "Die Eingabe an den Befehl ist JSON mit Benachrichtigungsnachricht und -typ.",
+  "Input to command is JSON with original user prompt text.":
+    "Die Eingabe an den Befehl ist JSON mit dem ursprünglichen Benutzer-Prompt-Text.",
+  "Input to command is JSON with session start source.":
+    "Die Eingabe an den Befehl ist JSON mit der Sitzungsstart-Quelle.",
+  "Input to command is JSON with session end reason.":
+    "Die Eingabe an den Befehl ist JSON mit dem Sitzungsende-Grund.",
+  "Input to command is JSON with agent_id and agent_type.":
+    "Die Eingabe an den Befehl ist JSON mit agent_id und agent_type.",
+  "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.":
+    "Die Eingabe an den Befehl ist JSON mit agent_id, agent_type und agent_transcript_path.",
+  "Input to command is JSON with compaction details.":
+    "Die Eingabe an den Befehl ist JSON mit Komprimierungsdetails.",
+  "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.":
+    "Die Eingabe an den Befehl ist JSON mit tool_name, tool_input und tool_use_id. Ausgabe ist JSON mit hookSpecificOutput, das die Entscheidung zum Zulassen oder Ablehnen enthält.",
   // Hooks - Exit Code Descriptions
-  'stdout/stderr not shown': 'stdout/stderr nicht angezeigt',
-  'show stderr to model and continue conversation':
-    'stderr dem Modell anzeigen und Konversation fortsetzen',
-  'show stderr to user only': 'stderr nur dem Benutzer anzeigen',
-  'stdout shown in transcript mode (ctrl+o)':
-    'stdout im Transkriptmodus angezeigt (ctrl+o)',
-  'show stderr to model immediately': 'stderr sofort dem Modell anzeigen',
-  'show stderr to user only but continue with tool call':
-    'stderr nur dem Benutzer anzeigen, aber mit Tool-Aufruf fortfahren',
-  'block processing, erase original prompt, and show stderr to user only':
-    'Verarbeitung blockieren, ursprünglichen Prompt löschen und stderr nur dem Benutzer anzeigen',
-  'stdout shown to Qwen': 'stdout dem Qwen anzeigen',
-  'show stderr to user only (blocking errors ignored)':
-    'stderr nur dem Benutzer anzeigen (Blockierungsfehler ignoriert)',
-  'command completes successfully': 'Befehl erfolgreich abgeschlossen',
-  'stdout shown to subagent': 'stdout dem Subagenten anzeigen',
-  'show stderr to subagent and continue having it run':
-    'stderr dem Subagenten anzeigen und ihn weiterlaufen lassen',
-  'stdout appended as custom compact instructions':
-    'stdout als benutzerdefinierte Komprimierungsanweisungen angehängt',
-  'block compaction': 'Komprimierung blockieren',
-  'show stderr to user only but continue with compaction':
-    'stderr nur dem Benutzer anzeigen, aber mit Komprimierung fortfahren',
-  'use hook decision if provided':
-    'Hook-Entscheidung verwenden, falls bereitgestellt',
+  "stdout/stderr not shown": "stdout/stderr nicht angezeigt",
+  "show stderr to model and continue conversation":
+    "stderr dem Modell anzeigen und Konversation fortsetzen",
+  "show stderr to user only": "stderr nur dem Benutzer anzeigen",
+  "stdout shown in transcript mode (ctrl+o)": "stdout im Transkriptmodus angezeigt (ctrl+o)",
+  "show stderr to model immediately": "stderr sofort dem Modell anzeigen",
+  "show stderr to user only but continue with tool call":
+    "stderr nur dem Benutzer anzeigen, aber mit Tool-Aufruf fortfahren",
+  "block processing, erase original prompt, and show stderr to user only":
+    "Verarbeitung blockieren, ursprünglichen Prompt löschen und stderr nur dem Benutzer anzeigen",
+  "stdout shown to Qwen": "stdout dem Qwen anzeigen",
+  "show stderr to user only (blocking errors ignored)":
+    "stderr nur dem Benutzer anzeigen (Blockierungsfehler ignoriert)",
+  "command completes successfully": "Befehl erfolgreich abgeschlossen",
+  "stdout shown to subagent": "stdout dem Subagenten anzeigen",
+  "show stderr to subagent and continue having it run":
+    "stderr dem Subagenten anzeigen und ihn weiterlaufen lassen",
+  "stdout appended as custom compact instructions":
+    "stdout als benutzerdefinierte Komprimierungsanweisungen angehängt",
+  "block compaction": "Komprimierung blockieren",
+  "show stderr to user only but continue with compaction":
+    "stderr nur dem Benutzer anzeigen, aber mit Komprimierung fortfahren",
+  "use hook decision if provided": "Hook-Entscheidung verwenden, falls bereitgestellt",
   // Hooks - Messages
-  'Config not loaded.': 'Konfiguration nicht geladen.',
-  'Hooks are not enabled. Enable hooks in settings to use this feature.':
-    'Hooks sind nicht aktiviert. Aktivieren Sie Hooks in den Einstellungen, um diese Funktion zu nutzen.',
-  'No hooks configured. Add hooks in your settings.json file.':
-    'Keine Hooks konfiguriert. Fügen Sie Hooks in Ihrer settings.json-Datei hinzu.',
-  'Configured Hooks ({{count}} total)':
-    'Konfigurierte Hooks ({{count}} insgesamt)',
+  "Config not loaded.": "Konfiguration nicht geladen.",
+  "Hooks are not enabled. Enable hooks in settings to use this feature.":
+    "Hooks sind nicht aktiviert. Aktivieren Sie Hooks in den Einstellungen, um diese Funktion zu nutzen.",
+  "No hooks configured. Add hooks in your settings.json file.":
+    "Keine Hooks konfiguriert. Fügen Sie Hooks in Ihrer settings.json-Datei hinzu.",
+  "Configured Hooks ({{count}} total)": "Konfigurierte Hooks ({{count}} insgesamt)",
 
   // ============================================================================
   // Commands - Session Export
   // ============================================================================
-  'Export current session message history to a file':
-    'Den Nachrichtenverlauf der aktuellen Sitzung in eine Datei exportieren',
-  'Export session to HTML format': 'Sitzung in das HTML-Format exportieren',
-  'Export session to JSON format': 'Sitzung in das JSON-Format exportieren',
-  'Export session to JSONL format (one message per line)':
-    'Sitzung in das JSONL-Format exportieren (eine Nachricht pro Zeile)',
-  'Export session to markdown format':
-    'Sitzung in das Markdown-Format exportieren',
+  "Export current session message history to a file":
+    "Den Nachrichtenverlauf der aktuellen Sitzung in eine Datei exportieren",
+  "Export session to HTML format": "Sitzung in das HTML-Format exportieren",
+  "Export session to JSON format": "Sitzung in das JSON-Format exportieren",
+  "Export session to JSONL format (one message per line)":
+    "Sitzung in das JSONL-Format exportieren (eine Nachricht pro Zeile)",
+  "Export session to markdown format": "Sitzung in das Markdown-Format exportieren",
 
   // ============================================================================
   // Commands - Insights
   // ============================================================================
-  'generate personalized programming insights from your chat history':
-    'Personalisierte Programmier-Einblicke aus Ihrem Chatverlauf generieren',
+  "generate personalized programming insights from your chat history":
+    "Personalisierte Programmier-Einblicke aus Ihrem Chatverlauf generieren",
 
   // ============================================================================
   // Commands - Session History
   // ============================================================================
-  'Resume a previous session': 'Eine vorherige Sitzung fortsetzen',
-  'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested':
-    'Einen Tool-Aufruf wiederherstellen. Dadurch werden Konversations- und Dateiverlauf auf den Zustand zurückgesetzt, in dem der Tool-Aufruf vorgeschlagen wurde',
-  'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.':
-    'Terminal-Typ konnte nicht erkannt werden. Unterstützte Terminals: VS Code, Cursor, Windsurf und Trae.',
+  "Resume a previous session": "Eine vorherige Sitzung fortsetzen",
+  "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested":
+    "Einen Tool-Aufruf wiederherstellen. Dadurch werden Konversations- und Dateiverlauf auf den Zustand zurückgesetzt, in dem der Tool-Aufruf vorgeschlagen wurde",
+  "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.":
+    "Terminal-Typ konnte nicht erkannt werden. Unterstützte Terminals: VS Code, Cursor, Windsurf und Trae.",
   'Terminal "{{terminal}}" is not supported yet.':
     'Terminal "{{terminal}}" wird noch nicht unterstützt.',
 
   // ============================================================================
   // Commands - Language
   // ============================================================================
-  'Invalid language. Available: {{options}}':
-    'Ungültige Sprache. Verfügbar: {{options}}',
-  'Language subcommands do not accept additional arguments.':
-    'Sprach-Unterbefehle akzeptieren keine zusätzlichen Argumente.',
-  'Current UI language: {{lang}}': 'Aktuelle UI-Sprache: {{lang}}',
-  'Current LLM output language: {{lang}}':
-    'Aktuelle LLM-Ausgabesprache: {{lang}}',
-  'LLM output language not set': 'LLM-Ausgabesprache nicht festgelegt',
-  'Set UI language': 'UI-Sprache festlegen',
-  'Set LLM output language': 'LLM-Ausgabesprache festlegen',
-  'Usage: /language ui [{{options}}]': 'Verwendung: /language ui [{{options}}]',
-  'Usage: /language output <language>':
-    'Verwendung: /language output <Sprache>',
-  'Example: /language output 中文': 'Beispiel: /language output Deutsch',
-  'Example: /language output English': 'Beispiel: /language output Englisch',
-  'Example: /language output 日本語': 'Beispiel: /language output Japanisch',
-  'Example: /language output Português':
-    'Beispiel: /language output Portugiesisch',
-  'UI language changed to {{lang}}': 'UI-Sprache geändert zu {{lang}}',
-  'LLM output language set to {{lang}}':
-    'LLM-Ausgabesprache auf {{lang}} gesetzt',
-  'LLM output language rule file generated at {{path}}':
-    'LLM-Ausgabesprach-Regeldatei generiert unter {{path}}',
-  'Please restart the application for the changes to take effect.':
-    'Bitte starten Sie die Anwendung neu, damit die Änderungen wirksam werden.',
-  'Failed to generate LLM output language rule file: {{error}}':
-    'Fehler beim Generieren der LLM-Ausgabesprach-Regeldatei: {{error}}',
-  'Invalid command. Available subcommands:':
-    'Ungültiger Befehl. Verfügbare Unterbefehle:',
-  'Available subcommands:': 'Verfügbare Unterbefehle:',
-  'To request additional UI language packs, please open an issue on GitHub.':
-    'Um zusätzliche UI-Sprachpakete anzufordern, öffnen Sie bitte ein Issue auf GitHub.',
-  'Available options:': 'Verfügbare Optionen:',
-  'Set UI language to {{name}}': 'UI-Sprache auf {{name}} setzen',
+  "Invalid language. Available: {{options}}": "Ungültige Sprache. Verfügbar: {{options}}",
+  "Language subcommands do not accept additional arguments.":
+    "Sprach-Unterbefehle akzeptieren keine zusätzlichen Argumente.",
+  "Current UI language: {{lang}}": "Aktuelle UI-Sprache: {{lang}}",
+  "Current LLM output language: {{lang}}": "Aktuelle LLM-Ausgabesprache: {{lang}}",
+  "LLM output language not set": "LLM-Ausgabesprache nicht festgelegt",
+  "Set UI language": "UI-Sprache festlegen",
+  "Set LLM output language": "LLM-Ausgabesprache festlegen",
+  "Usage: /language ui [{{options}}]": "Verwendung: /language ui [{{options}}]",
+  "Usage: /language output <language>": "Verwendung: /language output <Sprache>",
+  "Example: /language output 中文": "Beispiel: /language output Deutsch",
+  "Example: /language output English": "Beispiel: /language output Englisch",
+  "Example: /language output 日本語": "Beispiel: /language output Japanisch",
+  "Example: /language output Português": "Beispiel: /language output Portugiesisch",
+  "UI language changed to {{lang}}": "UI-Sprache geändert zu {{lang}}",
+  "LLM output language set to {{lang}}": "LLM-Ausgabesprache auf {{lang}} gesetzt",
+  "LLM output language rule file generated at {{path}}":
+    "LLM-Ausgabesprach-Regeldatei generiert unter {{path}}",
+  "Please restart the application for the changes to take effect.":
+    "Bitte starten Sie die Anwendung neu, damit die Änderungen wirksam werden.",
+  "Failed to generate LLM output language rule file: {{error}}":
+    "Fehler beim Generieren der LLM-Ausgabesprach-Regeldatei: {{error}}",
+  "Invalid command. Available subcommands:": "Ungültiger Befehl. Verfügbare Unterbefehle:",
+  "Available subcommands:": "Verfügbare Unterbefehle:",
+  "To request additional UI language packs, please open an issue on GitHub.":
+    "Um zusätzliche UI-Sprachpakete anzufordern, öffnen Sie bitte ein Issue auf GitHub.",
+  "Available options:": "Verfügbare Optionen:",
+  "Set UI language to {{name}}": "UI-Sprache auf {{name}} setzen",
 
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Tool Approval Mode': 'Werkzeug-Genehmigungsmodus',
-  'Current approval mode: {{mode}}': 'Aktueller Genehmigungsmodus: {{mode}}',
-  'Available approval modes:': 'Verfügbare Genehmigungsmodi:',
-  'Approval mode changed to: {{mode}}':
-    'Genehmigungsmodus geändert zu: {{mode}}',
-  'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
-    'Genehmigungsmodus geändert zu: {{mode}} (gespeichert in {{scope}} Einstellungen{{location}})',
-  'Usage: /approval-mode <mode> [--session|--user|--project]':
-    'Verwendung: /approval-mode <Modus> [--session|--user|--project]',
+  "Tool Approval Mode": "Werkzeug-Genehmigungsmodus",
+  "Current approval mode: {{mode}}": "Aktueller Genehmigungsmodus: {{mode}}",
+  "Available approval modes:": "Verfügbare Genehmigungsmodi:",
+  "Approval mode changed to: {{mode}}": "Genehmigungsmodus geändert zu: {{mode}}",
+  "Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})":
+    "Genehmigungsmodus geändert zu: {{mode}} (gespeichert in {{scope}} Einstellungen{{location}})",
+  "Usage: /approval-mode <mode> [--session|--user|--project]":
+    "Verwendung: /approval-mode <Modus> [--session|--user|--project]",
 
-  'Scope subcommands do not accept additional arguments.':
-    'Bereichs-Unterbefehle akzeptieren keine zusätzlichen Argumente.',
-  'Plan mode - Analyze only, do not modify files or execute commands':
-    'Planungsmodus - Nur analysieren, keine Dateien ändern oder Befehle ausführen',
-  'Default mode - Require approval for file edits or shell commands':
-    'Standardmodus - Genehmigung für Dateibearbeitungen oder Shell-Befehle erforderlich',
-  'Auto-edit mode - Automatically approve file edits':
-    'Automatischer Bearbeitungsmodus - Dateibearbeitungen automatisch genehmigen',
-  'YOLO mode - Automatically approve all tools':
-    'YOLO-Modus - Alle Werkzeuge automatisch genehmigen',
-  '{{mode}} mode': '{{mode}}-Modus',
-  'Settings service is not available; unable to persist the approval mode.':
-    'Einstellungsdienst nicht verfügbar; Genehmigungsmodus kann nicht gespeichert werden.',
-  'Failed to save approval mode: {{error}}':
-    'Fehler beim Speichern des Genehmigungsmodus: {{error}}',
-  'Failed to change approval mode: {{error}}':
-    'Fehler beim Ändern des Genehmigungsmodus: {{error}}',
-  'Apply to current session only (temporary)':
-    'Nur auf aktuelle Sitzung anwenden (temporär)',
-  'Persist for this project/workspace':
-    'Für dieses Projekt/Arbeitsbereich speichern',
-  'Persist for this user on this machine':
-    'Für diesen Benutzer auf diesem Computer speichern',
-  'Analyze only, do not modify files or execute commands':
-    'Nur analysieren, keine Dateien ändern oder Befehle ausführen',
-  'Require approval for file edits or shell commands':
-    'Genehmigung für Dateibearbeitungen oder Shell-Befehle erforderlich',
-  'Automatically approve file edits':
-    'Dateibearbeitungen automatisch genehmigen',
-  'Automatically approve all tools': 'Alle Werkzeuge automatisch genehmigen',
-  'Workspace approval mode exists and takes priority. User-level change will have no effect.':
-    'Arbeitsbereich-Genehmigungsmodus existiert und hat Vorrang. Benutzerebene-Änderung hat keine Wirkung.',
-  'Apply To': 'Anwenden auf',
-  'Workspace Settings': 'Arbeitsbereich-Einstellungen',
+  "Scope subcommands do not accept additional arguments.":
+    "Bereichs-Unterbefehle akzeptieren keine zusätzlichen Argumente.",
+  "Plan mode - Analyze only, do not modify files or execute commands":
+    "Planungsmodus - Nur analysieren, keine Dateien ändern oder Befehle ausführen",
+  "Default mode - Require approval for file edits or shell commands":
+    "Standardmodus - Genehmigung für Dateibearbeitungen oder Shell-Befehle erforderlich",
+  "Auto-edit mode - Automatically approve file edits":
+    "Automatischer Bearbeitungsmodus - Dateibearbeitungen automatisch genehmigen",
+  "YOLO mode - Automatically approve all tools":
+    "YOLO-Modus - Alle Werkzeuge automatisch genehmigen",
+  "{{mode}} mode": "{{mode}}-Modus",
+  "Settings service is not available; unable to persist the approval mode.":
+    "Einstellungsdienst nicht verfügbar; Genehmigungsmodus kann nicht gespeichert werden.",
+  "Failed to save approval mode: {{error}}":
+    "Fehler beim Speichern des Genehmigungsmodus: {{error}}",
+  "Failed to change approval mode: {{error}}":
+    "Fehler beim Ändern des Genehmigungsmodus: {{error}}",
+  "Apply to current session only (temporary)": "Nur auf aktuelle Sitzung anwenden (temporär)",
+  "Persist for this project/workspace": "Für dieses Projekt/Arbeitsbereich speichern",
+  "Persist for this user on this machine": "Für diesen Benutzer auf diesem Computer speichern",
+  "Analyze only, do not modify files or execute commands":
+    "Nur analysieren, keine Dateien ändern oder Befehle ausführen",
+  "Require approval for file edits or shell commands":
+    "Genehmigung für Dateibearbeitungen oder Shell-Befehle erforderlich",
+  "Automatically approve file edits": "Dateibearbeitungen automatisch genehmigen",
+  "Automatically approve all tools": "Alle Werkzeuge automatisch genehmigen",
+  "Workspace approval mode exists and takes priority. User-level change will have no effect.":
+    "Arbeitsbereich-Genehmigungsmodus existiert und hat Vorrang. Benutzerebene-Änderung hat keine Wirkung.",
+  "Apply To": "Anwenden auf",
+  "Workspace Settings": "Arbeitsbereich-Einstellungen",
 
   // ============================================================================
   // Commands - Memory
   // ============================================================================
-  'Commands for interacting with memory.':
-    'Befehle für die Interaktion mit dem Speicher.',
-  'Show the current memory contents.': 'Aktuellen Speicherinhalt anzeigen.',
-  'Show project-level memory contents.':
-    'Projektebene-Speicherinhalt anzeigen.',
-  'Show global memory contents.': 'Globalen Speicherinhalt anzeigen.',
-  'Add content to project-level memory.':
-    'Inhalt zum Projektebene-Speicher hinzufügen.',
-  'Add content to global memory.': 'Inhalt zum globalen Speicher hinzufügen.',
-  'Refresh the memory from the source.':
-    'Speicher aus der Quelle aktualisieren.',
-  'Usage: /memory add --project <text to remember>':
-    'Verwendung: /memory add --project <zu merkender Text>',
-  'Usage: /memory add --global <text to remember>':
-    'Verwendung: /memory add --global <zu merkender Text>',
+  "Commands for interacting with memory.": "Befehle für die Interaktion mit dem Speicher.",
+  "Show the current memory contents.": "Aktuellen Speicherinhalt anzeigen.",
+  "Show project-level memory contents.": "Projektebene-Speicherinhalt anzeigen.",
+  "Show global memory contents.": "Globalen Speicherinhalt anzeigen.",
+  "Add content to project-level memory.": "Inhalt zum Projektebene-Speicher hinzufügen.",
+  "Add content to global memory.": "Inhalt zum globalen Speicher hinzufügen.",
+  "Refresh the memory from the source.": "Speicher aus der Quelle aktualisieren.",
+  "Usage: /memory add --project <text to remember>":
+    "Verwendung: /memory add --project <zu merkender Text>",
+  "Usage: /memory add --global <text to remember>":
+    "Verwendung: /memory add --global <zu merkender Text>",
   'Attempting to save to project memory: "{{text}}"':
     'Versuche im Projektspeicher zu speichern: "{{text}}"',
   'Attempting to save to global memory: "{{text}}"':
     'Versuche im globalen Speicher zu speichern: "{{text}}"',
-  'Current memory content from {{count}} file(s):':
-    'Aktueller Speicherinhalt aus {{count}} Datei(en):',
-  'Memory is currently empty.': 'Speicher ist derzeit leer.',
-  'Project memory file not found or is currently empty.':
-    'Projektspeicherdatei nicht gefunden oder derzeit leer.',
-  'Global memory file not found or is currently empty.':
-    'Globale Speicherdatei nicht gefunden oder derzeit leer.',
-  'Global memory is currently empty.': 'Globaler Speicher ist derzeit leer.',
-  'Global memory content:\n\n---\n{{content}}\n---':
-    'Globaler Speicherinhalt:\n\n---\n{{content}}\n---',
-  'Project memory content from {{path}}:\n\n---\n{{content}}\n---':
-    'Projektspeicherinhalt von {{path}}:\n\n---\n{{content}}\n---',
-  'Project memory is currently empty.': 'Projektspeicher ist derzeit leer.',
-  'Refreshing memory from source files...':
-    'Speicher wird aus Quelldateien aktualisiert...',
-  'Add content to the memory. Use --global for global memory or --project for project memory.':
-    'Inhalt zum Speicher hinzufügen. --global für globalen Speicher oder --project für Projektspeicher verwenden.',
-  'Usage: /memory add [--global|--project] <text to remember>':
-    'Verwendung: /memory add [--global|--project] <zu merkender Text>',
+  "Current memory content from {{count}} file(s):":
+    "Aktueller Speicherinhalt aus {{count}} Datei(en):",
+  "Memory is currently empty.": "Speicher ist derzeit leer.",
+  "Project memory file not found or is currently empty.":
+    "Projektspeicherdatei nicht gefunden oder derzeit leer.",
+  "Global memory file not found or is currently empty.":
+    "Globale Speicherdatei nicht gefunden oder derzeit leer.",
+  "Global memory is currently empty.": "Globaler Speicher ist derzeit leer.",
+  "Global memory content:\n\n---\n{{content}}\n---":
+    "Globaler Speicherinhalt:\n\n---\n{{content}}\n---",
+  "Project memory content from {{path}}:\n\n---\n{{content}}\n---":
+    "Projektspeicherinhalt von {{path}}:\n\n---\n{{content}}\n---",
+  "Project memory is currently empty.": "Projektspeicher ist derzeit leer.",
+  "Refreshing memory from source files...": "Speicher wird aus Quelldateien aktualisiert...",
+  "Add content to the memory. Use --global for global memory or --project for project memory.":
+    "Inhalt zum Speicher hinzufügen. --global für globalen Speicher oder --project für Projektspeicher verwenden.",
+  "Usage: /memory add [--global|--project] <text to remember>":
+    "Verwendung: /memory add [--global|--project] <zu merkender Text>",
   'Attempting to save to memory {{scope}}: "{{fact}}"':
     'Versuche im Speicher {{scope}} zu speichern: "{{fact}}"',
 
   // ============================================================================
   // Commands - MCP
   // ============================================================================
-  'Authenticate with an OAuth-enabled MCP server':
-    'Mit einem OAuth-fähigen MCP-Server authentifizieren',
-  'List configured MCP servers and tools':
-    'Konfigurierte MCP-Server und Werkzeuge auflisten',
-  'Restarts MCP servers.': 'MCP-Server neu starten.',
-  'Could not retrieve tool registry.':
-    'Werkzeugregister konnte nicht abgerufen werden.',
-  'No MCP servers configured with OAuth authentication.':
-    'Keine MCP-Server mit OAuth-Authentifizierung konfiguriert.',
-  'MCP servers with OAuth authentication:':
-    'MCP-Server mit OAuth-Authentifizierung:',
-  'Use /mcp auth <server-name> to authenticate.':
-    'Verwenden Sie /mcp auth <Servername> zur Authentifizierung.',
+  "Authenticate with an OAuth-enabled MCP server":
+    "Mit einem OAuth-fähigen MCP-Server authentifizieren",
+  "List configured MCP servers and tools": "Konfigurierte MCP-Server und Werkzeuge auflisten",
+  "Restarts MCP servers.": "MCP-Server neu starten.",
+  "Could not retrieve tool registry.": "Werkzeugregister konnte nicht abgerufen werden.",
+  "No MCP servers configured with OAuth authentication.":
+    "Keine MCP-Server mit OAuth-Authentifizierung konfiguriert.",
+  "MCP servers with OAuth authentication:": "MCP-Server mit OAuth-Authentifizierung:",
+  "Use /mcp auth <server-name> to authenticate.":
+    "Verwenden Sie /mcp auth <Servername> zur Authentifizierung.",
   "MCP server '{{name}}' not found.": "MCP-Server '{{name}}' nicht gefunden.",
   "Successfully authenticated and refreshed tools for '{{name}}'.":
     "Erfolgreich authentifiziert und Werkzeuge für '{{name}}' aktualisiert.",
   "Failed to authenticate with MCP server '{{name}}': {{error}}":
     "Authentifizierung mit MCP-Server '{{name}}' fehlgeschlagen: {{error}}",
-  "Re-discovering tools from '{{name}}'...":
-    "Werkzeuge von '{{name}}' werden neu erkannt...",
-  "Discovered {{count}} tool(s) from '{{name}}'.":
-    "{{count}} Werkzeug(e) von '{{name}}' entdeckt.",
-  'Authentication complete. Returning to server details...':
-    'Authentifizierung abgeschlossen. Zurück zu den Serverdetails...',
-  'Authentication successful.': 'Authentifizierung erfolgreich.',
-  'If the browser does not open, copy and paste this URL into your browser:':
-    'Falls der Browser sich nicht öffnet, kopieren Sie diese URL und fügen Sie sie in Ihren Browser ein:',
-  'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.':
-    '⚠️  Stellen Sie sicher, dass Sie die VOLLSTÄNDIGE URL kopieren – sie kann über mehrere Zeilen gehen.',
+  "Re-discovering tools from '{{name}}'...": "Werkzeuge von '{{name}}' werden neu erkannt...",
+  "Discovered {{count}} tool(s) from '{{name}}'.": "{{count}} Werkzeug(e) von '{{name}}' entdeckt.",
+  "Authentication complete. Returning to server details...":
+    "Authentifizierung abgeschlossen. Zurück zu den Serverdetails...",
+  "Authentication successful.": "Authentifizierung erfolgreich.",
+  "If the browser does not open, copy and paste this URL into your browser:":
+    "Falls der Browser sich nicht öffnet, kopieren Sie diese URL und fügen Sie sie in Ihren Browser ein:",
+  "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.":
+    "⚠️  Stellen Sie sicher, dass Sie die VOLLSTÄNDIGE URL kopieren – sie kann über mehrere Zeilen gehen.",
 
   // ============================================================================
   // Commands - Chat
   // ============================================================================
-  'Manage conversation history.': 'Gesprächsverlauf verwalten.',
-  'List saved conversation checkpoints':
-    'Gespeicherte Gesprächsprüfpunkte auflisten',
-  'No saved conversation checkpoints found.':
-    'Keine gespeicherten Gesprächsprüfpunkte gefunden.',
-  'List of saved conversations:': 'Liste gespeicherter Gespräche:',
-  'Note: Newest last, oldest first': 'Hinweis: Neueste zuletzt, älteste zuerst',
-  'Save the current conversation as a checkpoint. Usage: /chat save <tag>':
-    'Aktuelles Gespräch als Prüfpunkt speichern. Verwendung: /chat save <Tag>',
-  'Missing tag. Usage: /chat save <tag>':
-    'Tag fehlt. Verwendung: /chat save <Tag>',
-  'Delete a conversation checkpoint. Usage: /chat delete <tag>':
-    'Gesprächsprüfpunkt löschen. Verwendung: /chat delete <Tag>',
-  'Missing tag. Usage: /chat delete <tag>':
-    'Tag fehlt. Verwendung: /chat delete <Tag>',
+  "Manage conversation history.": "Gesprächsverlauf verwalten.",
+  "List saved conversation checkpoints": "Gespeicherte Gesprächsprüfpunkte auflisten",
+  "No saved conversation checkpoints found.": "Keine gespeicherten Gesprächsprüfpunkte gefunden.",
+  "List of saved conversations:": "Liste gespeicherter Gespräche:",
+  "Note: Newest last, oldest first": "Hinweis: Neueste zuletzt, älteste zuerst",
+  "Save the current conversation as a checkpoint. Usage: /chat save <tag>":
+    "Aktuelles Gespräch als Prüfpunkt speichern. Verwendung: /chat save <Tag>",
+  "Missing tag. Usage: /chat save <tag>": "Tag fehlt. Verwendung: /chat save <Tag>",
+  "Delete a conversation checkpoint. Usage: /chat delete <tag>":
+    "Gesprächsprüfpunkt löschen. Verwendung: /chat delete <Tag>",
+  "Missing tag. Usage: /chat delete <tag>": "Tag fehlt. Verwendung: /chat delete <Tag>",
   "Conversation checkpoint '{{tag}}' has been deleted.":
     "Gesprächsprüfpunkt '{{tag}}' wurde gelöscht.",
   "Error: No checkpoint found with tag '{{tag}}'.":
     "Fehler: Kein Prüfpunkt mit Tag '{{tag}}' gefunden.",
-  'Resume a conversation from a checkpoint. Usage: /chat resume <tag>':
-    'Gespräch von einem Prüfpunkt fortsetzen. Verwendung: /chat resume <Tag>',
-  'Missing tag. Usage: /chat resume <tag>':
-    'Tag fehlt. Verwendung: /chat resume <Tag>',
-  'No saved checkpoint found with tag: {{tag}}.':
-    'Kein gespeicherter Prüfpunkt mit Tag gefunden: {{tag}}.',
-  'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?':
-    'Ein Prüfpunkt mit dem Tag {{tag}} existiert bereits. Möchten Sie ihn überschreiben?',
-  'No chat client available to save conversation.':
-    'Kein Chat-Client verfügbar, um Gespräch zu speichern.',
-  'Conversation checkpoint saved with tag: {{tag}}.':
-    'Gesprächsprüfpunkt gespeichert mit Tag: {{tag}}.',
-  'No conversation found to save.': 'Kein Gespräch zum Speichern gefunden.',
-  'No chat client available to share conversation.':
-    'Kein Chat-Client verfügbar, um Gespräch zu teilen.',
-  'Invalid file format. Only .md and .json are supported.':
-    'Ungültiges Dateiformat. Nur .md und .json werden unterstützt.',
-  'Error sharing conversation: {{error}}':
-    'Fehler beim Teilen des Gesprächs: {{error}}',
-  'Conversation shared to {{filePath}}': 'Gespräch geteilt nach {{filePath}}',
-  'No conversation found to share.': 'Kein Gespräch zum Teilen gefunden.',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
-    'Aktuelles Gespräch in eine Markdown- oder JSON-Datei teilen. Verwendung: /chat share <Datei>',
+  "Resume a conversation from a checkpoint. Usage: /chat resume <tag>":
+    "Gespräch von einem Prüfpunkt fortsetzen. Verwendung: /chat resume <Tag>",
+  "Missing tag. Usage: /chat resume <tag>": "Tag fehlt. Verwendung: /chat resume <Tag>",
+  "No saved checkpoint found with tag: {{tag}}.":
+    "Kein gespeicherter Prüfpunkt mit Tag gefunden: {{tag}}.",
+  "A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?":
+    "Ein Prüfpunkt mit dem Tag {{tag}} existiert bereits. Möchten Sie ihn überschreiben?",
+  "No chat client available to save conversation.":
+    "Kein Chat-Client verfügbar, um Gespräch zu speichern.",
+  "Conversation checkpoint saved with tag: {{tag}}.":
+    "Gesprächsprüfpunkt gespeichert mit Tag: {{tag}}.",
+  "No conversation found to save.": "Kein Gespräch zum Speichern gefunden.",
+  "No chat client available to share conversation.":
+    "Kein Chat-Client verfügbar, um Gespräch zu teilen.",
+  "Invalid file format. Only .md and .json are supported.":
+    "Ungültiges Dateiformat. Nur .md und .json werden unterstützt.",
+  "Error sharing conversation: {{error}}": "Fehler beim Teilen des Gesprächs: {{error}}",
+  "Conversation shared to {{filePath}}": "Gespräch geteilt nach {{filePath}}",
+  "No conversation found to share.": "Kein Gespräch zum Teilen gefunden.",
+  "Share the current conversation to a markdown or json file. Usage: /chat share <file>":
+    "Aktuelles Gespräch in eine Markdown- oder JSON-Datei teilen. Verwendung: /chat share <Datei>",
 
   // ============================================================================
   // Commands - Summary
   // ============================================================================
-  'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md':
-    'Projektzusammenfassung generieren und in .qwen/PROJECT_SUMMARY.md speichern',
-  'No chat client available to generate summary.':
-    'Kein Chat-Client verfügbar, um Zusammenfassung zu generieren.',
-  'Already generating summary, wait for previous request to complete':
-    'Zusammenfassung wird bereits generiert, warten Sie auf Abschluss der vorherigen Anfrage',
-  'No conversation found to summarize.':
-    'Kein Gespräch zum Zusammenfassen gefunden.',
-  'Failed to generate project context summary: {{error}}':
-    'Fehler beim Generieren der Projektkontextzusammenfassung: {{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    'Projektzusammenfassung gespeichert unter {{filePathForDisplay}}.',
-  'Saving project summary...': 'Projektzusammenfassung wird gespeichert...',
-  'Generating project summary...': 'Projektzusammenfassung wird generiert...',
-  'Failed to generate summary - no text content received from LLM response':
-    'Fehler beim Generieren der Zusammenfassung - kein Textinhalt von LLM-Antwort erhalten',
+  "Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md":
+    "Projektzusammenfassung generieren und in .qwen/PROJECT_SUMMARY.md speichern",
+  "No chat client available to generate summary.":
+    "Kein Chat-Client verfügbar, um Zusammenfassung zu generieren.",
+  "Already generating summary, wait for previous request to complete":
+    "Zusammenfassung wird bereits generiert, warten Sie auf Abschluss der vorherigen Anfrage",
+  "No conversation found to summarize.": "Kein Gespräch zum Zusammenfassen gefunden.",
+  "Failed to generate project context summary: {{error}}":
+    "Fehler beim Generieren der Projektkontextzusammenfassung: {{error}}",
+  "Saved project summary to {{filePathForDisplay}}.":
+    "Projektzusammenfassung gespeichert unter {{filePathForDisplay}}.",
+  "Saving project summary...": "Projektzusammenfassung wird gespeichert...",
+  "Generating project summary...": "Projektzusammenfassung wird generiert...",
+  "Failed to generate summary - no text content received from LLM response":
+    "Fehler beim Generieren der Zusammenfassung - kein Textinhalt von LLM-Antwort erhalten",
 
   // ============================================================================
   // Commands - Model
   // ============================================================================
-  'Switch the model for this session': 'Modell für diese Sitzung wechseln',
-  'Set fast model for background tasks':
-    'Schnelles Modell für Hintergrundaufgaben festlegen',
-  'Content generator configuration not available.':
-    'Inhaltsgenerator-Konfiguration nicht verfügbar.',
-  'Authentication type not available.':
-    'Authentifizierungstyp nicht verfügbar.',
-  'No models available for the current authentication type ({{authType}}).':
-    'Keine Modelle für den aktuellen Authentifizierungstyp ({{authType}}) verfügbar.',
+  "Switch the model for this session": "Modell für diese Sitzung wechseln",
+  "Set fast model for background tasks": "Schnelles Modell für Hintergrundaufgaben festlegen",
+  "Content generator configuration not available.":
+    "Inhaltsgenerator-Konfiguration nicht verfügbar.",
+  "Authentication type not available.": "Authentifizierungstyp nicht verfügbar.",
+  "No models available for the current authentication type ({{authType}}).":
+    "Keine Modelle für den aktuellen Authentifizierungstyp ({{authType}}) verfügbar.",
 
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    'Neue Sitzung wird gestartet, Chat wird zurückgesetzt und Terminal wird gelöscht.',
-  'Starting a new session and clearing.':
-    'Neue Sitzung wird gestartet und gelöscht.',
+  "Starting a new session, resetting chat, and clearing terminal.":
+    "Neue Sitzung wird gestartet, Chat wird zurückgesetzt und Terminal wird gelöscht.",
+  "Starting a new session and clearing.": "Neue Sitzung wird gestartet und gelöscht.",
 
   // ============================================================================
   // Commands - Compress
   // ============================================================================
-  'Already compressing, wait for previous request to complete':
-    'Komprimierung läuft bereits, warten Sie auf Abschluss der vorherigen Anfrage',
-  'Failed to compress chat history.':
-    'Fehler beim Komprimieren des Chatverlaufs.',
-  'Failed to compress chat history: {{error}}':
-    'Fehler beim Komprimieren des Chatverlaufs: {{error}}',
-  'Compressing chat history': 'Chatverlauf wird komprimiert',
-  'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.':
-    'Chatverlauf komprimiert von {{originalTokens}} auf {{newTokens}} Token.',
-  'Compression was not beneficial for this history size.':
-    'Komprimierung war für diese Verlaufsgröße nicht vorteilhaft.',
-  'Chat history compression did not reduce size. This may indicate issues with the compression prompt.':
-    'Chatverlauf-Komprimierung hat die Größe nicht reduziert. Dies kann auf Probleme mit dem Komprimierungs-Prompt hindeuten.',
-  'Could not compress chat history due to a token counting error.':
-    'Chatverlauf konnte aufgrund eines Token-Zählfehlers nicht komprimiert werden.',
-  'Chat history is already compressed.': 'Chatverlauf ist bereits komprimiert.',
+  "Already compressing, wait for previous request to complete":
+    "Komprimierung läuft bereits, warten Sie auf Abschluss der vorherigen Anfrage",
+  "Failed to compress chat history.": "Fehler beim Komprimieren des Chatverlaufs.",
+  "Failed to compress chat history: {{error}}":
+    "Fehler beim Komprimieren des Chatverlaufs: {{error}}",
+  "Compressing chat history": "Chatverlauf wird komprimiert",
+  "Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.":
+    "Chatverlauf komprimiert von {{originalTokens}} auf {{newTokens}} Token.",
+  "Compression was not beneficial for this history size.":
+    "Komprimierung war für diese Verlaufsgröße nicht vorteilhaft.",
+  "Chat history compression did not reduce size. This may indicate issues with the compression prompt.":
+    "Chatverlauf-Komprimierung hat die Größe nicht reduziert. Dies kann auf Probleme mit dem Komprimierungs-Prompt hindeuten.",
+  "Could not compress chat history due to a token counting error.":
+    "Chatverlauf konnte aufgrund eines Token-Zählfehlers nicht komprimiert werden.",
+  "Chat history is already compressed.": "Chatverlauf ist bereits komprimiert.",
 
   // ============================================================================
   // Commands - Directory
   // ============================================================================
-  'Configuration is not available.': 'Konfiguration ist nicht verfügbar.',
-  'Please provide at least one path to add.':
-    'Bitte geben Sie mindestens einen Pfad zum Hinzufügen an.',
-  'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.':
-    'Der Befehl /directory add wird in restriktiven Sandbox-Profilen nicht unterstützt. Bitte verwenden Sie --include-directories beim Starten der Sitzung.',
-  "Error adding '{{path}}': {{error}}":
-    "Fehler beim Hinzufügen von '{{path}}': {{error}}",
-  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
-    'QWEN.md-Dateien aus folgenden Verzeichnissen erfolgreich hinzugefügt, falls vorhanden:\n- {{directories}}',
-  'Error refreshing memory: {{error}}':
-    'Fehler beim Aktualisieren des Speichers: {{error}}',
-  'Successfully added directories:\n- {{directories}}':
-    'Verzeichnisse erfolgreich hinzugefügt:\n- {{directories}}',
-  'Current workspace directories:\n{{directories}}':
-    'Aktuelle Arbeitsbereichsverzeichnisse:\n{{directories}}',
+  "Configuration is not available.": "Konfiguration ist nicht verfügbar.",
+  "Please provide at least one path to add.":
+    "Bitte geben Sie mindestens einen Pfad zum Hinzufügen an.",
+  "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.":
+    "Der Befehl /directory add wird in restriktiven Sandbox-Profilen nicht unterstützt. Bitte verwenden Sie --include-directories beim Starten der Sitzung.",
+  "Error adding '{{path}}': {{error}}": "Fehler beim Hinzufügen von '{{path}}': {{error}}",
+  "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}":
+    "QWEN.md-Dateien aus folgenden Verzeichnissen erfolgreich hinzugefügt, falls vorhanden:\n- {{directories}}",
+  "Error refreshing memory: {{error}}": "Fehler beim Aktualisieren des Speichers: {{error}}",
+  "Successfully added directories:\n- {{directories}}":
+    "Verzeichnisse erfolgreich hinzugefügt:\n- {{directories}}",
+  "Current workspace directories:\n{{directories}}":
+    "Aktuelle Arbeitsbereichsverzeichnisse:\n{{directories}}",
 
   // ============================================================================
   // Commands - Docs
   // ============================================================================
-  'Please open the following URL in your browser to view the documentation:\n{{url}}':
-    'Bitte öffnen Sie folgende URL in Ihrem Browser, um die Dokumentation anzusehen:\n{{url}}',
-  'Opening documentation in your browser: {{url}}':
-    'Dokumentation wird in Ihrem Browser geöffnet: {{url}}',
+  "Please open the following URL in your browser to view the documentation:\n{{url}}":
+    "Bitte öffnen Sie folgende URL in Ihrem Browser, um die Dokumentation anzusehen:\n{{url}}",
+  "Opening documentation in your browser: {{url}}":
+    "Dokumentation wird in Ihrem Browser geöffnet: {{url}}",
 
   // ============================================================================
   // Dialogs - Tool Confirmation
   // ============================================================================
-  'Do you want to proceed?': 'Möchten Sie fortfahren?',
-  'Yes, allow once': 'Ja, einmal erlauben',
-  'Allow always': 'Immer erlauben',
-  Yes: 'Ja',
-  No: 'Nein',
-  'No (esc)': 'Nein (Esc)',
-  'Yes, allow always for this session': 'Ja, für diese Sitzung immer erlauben',
+  "Do you want to proceed?": "Möchten Sie fortfahren?",
+  "Yes, allow once": "Ja, einmal erlauben",
+  "Allow always": "Immer erlauben",
+  Yes: "Ja",
+  No: "Nein",
+  "No (esc)": "Nein (Esc)",
+  "Yes, allow always for this session": "Ja, für diese Sitzung immer erlauben",
 
   // MCP Management Dialog (translations for MCP UI components)
-  'Manage MCP servers': 'MCP-Server verwalten',
-  'Server Detail': 'Serverdetails',
-  'Disable Server': 'Server deaktivieren',
-  Tools: 'Werkzeuge',
-  'Tool Detail': 'Werkzeugdetails',
-  'MCP Management': 'MCP-Verwaltung',
-  'Loading...': 'Lädt...',
-  'Unknown step': 'Unbekannter Schritt',
-  'Esc to back': 'Esc zurück',
-  '↑↓ to navigate · Enter to select · Esc to close':
-    '↑↓ navigieren · Enter auswählen · Esc schließen',
-  '↑↓ to navigate · Enter to select · Esc to back':
-    '↑↓ navigieren · Enter auswählen · Esc zurück',
-  '↑↓ to navigate · Enter to confirm · Esc to back':
-    '↑↓ navigieren · Enter bestätigen · Esc zurück',
-  'User Settings (global)': 'Benutzereinstellungen (global)',
-  'Workspace Settings (project-specific)':
-    'Arbeitsbereichseinstellungen (projektspezifisch)',
-  'Disable server:': 'Server deaktivieren:',
-  'Select where to add the server to the exclude list:':
-    'Wählen Sie, wo der Server zur Ausschlussliste hinzugefügt werden soll:',
-  'Press Enter to confirm, Esc to cancel':
-    'Enter zum Bestätigen, Esc zum Abbrechen',
-  Disable: 'Deaktivieren',
-  Enable: 'Aktivieren',
-  Authenticate: 'Authentifizieren',
-  'Re-authenticate': 'Erneut authentifizieren',
-  'Clear Authentication': 'Authentifizierung löschen',
-  disabled: 'deaktiviert',
-  'Server:': 'Server:',
-  Reconnect: 'Neu verbinden',
-  'View tools': 'Werkzeuge anzeigen',
-  'Status:': 'Status:',
-  'Command:': 'Befehl:',
-  'Working Directory:': 'Arbeitsverzeichnis:',
-  'Capabilities:': 'Fähigkeiten:',
-  'No server selected': 'Kein Server ausgewählt',
-  '(disabled)': '(deaktiviert)',
-  'Error:': 'Fehler:',
-  tool: 'Werkzeug',
-  tools: 'Werkzeuge',
-  connected: 'verbunden',
-  connecting: 'verbindet',
-  disconnected: 'getrennt',
-  error: 'Fehler',
+  "Manage MCP servers": "MCP-Server verwalten",
+  "Server Detail": "Serverdetails",
+  "Disable Server": "Server deaktivieren",
+  Tools: "Werkzeuge",
+  "Tool Detail": "Werkzeugdetails",
+  "MCP Management": "MCP-Verwaltung",
+  "Loading...": "Lädt...",
+  "Unknown step": "Unbekannter Schritt",
+  "Esc to back": "Esc zurück",
+  "↑↓ to navigate · Enter to select · Esc to close":
+    "↑↓ navigieren · Enter auswählen · Esc schließen",
+  "↑↓ to navigate · Enter to select · Esc to back": "↑↓ navigieren · Enter auswählen · Esc zurück",
+  "↑↓ to navigate · Enter to confirm · Esc to back":
+    "↑↓ navigieren · Enter bestätigen · Esc zurück",
+  "User Settings (global)": "Benutzereinstellungen (global)",
+  "Workspace Settings (project-specific)": "Arbeitsbereichseinstellungen (projektspezifisch)",
+  "Disable server:": "Server deaktivieren:",
+  "Select where to add the server to the exclude list:":
+    "Wählen Sie, wo der Server zur Ausschlussliste hinzugefügt werden soll:",
+  "Press Enter to confirm, Esc to cancel": "Enter zum Bestätigen, Esc zum Abbrechen",
+  Disable: "Deaktivieren",
+  Enable: "Aktivieren",
+  Authenticate: "Authentifizieren",
+  "Re-authenticate": "Erneut authentifizieren",
+  "Clear Authentication": "Authentifizierung löschen",
+  disabled: "deaktiviert",
+  "Server:": "Server:",
+  Reconnect: "Neu verbinden",
+  "View tools": "Werkzeuge anzeigen",
+  "Status:": "Status:",
+  "Command:": "Befehl:",
+  "Working Directory:": "Arbeitsverzeichnis:",
+  "Capabilities:": "Fähigkeiten:",
+  "No server selected": "Kein Server ausgewählt",
+  "(disabled)": "(deaktiviert)",
+  "Error:": "Fehler:",
+  tool: "Werkzeug",
+  tools: "Werkzeuge",
+  connected: "verbunden",
+  connecting: "verbindet",
+  disconnected: "getrennt",
+  error: "Fehler",
 
   // MCP Server List
-  'User MCPs': 'Benutzer-MCPs',
-  'Project MCPs': 'Projekt-MCPs',
-  'Extension MCPs': 'Erweiterungs-MCPs',
-  server: 'Server',
-  servers: 'Server',
-  'Add MCP servers to your settings to get started.':
-    'Fügen Sie MCP-Server zu Ihren Einstellungen hinzu, um zu beginnen.',
-  'Run qwen --debug to see error logs':
-    'Führen Sie qwen --debug aus, um Fehlerprotokolle anzuzeigen',
+  "User MCPs": "Benutzer-MCPs",
+  "Project MCPs": "Projekt-MCPs",
+  "Extension MCPs": "Erweiterungs-MCPs",
+  server: "Server",
+  servers: "Server",
+  "Add MCP servers to your settings to get started.":
+    "Fügen Sie MCP-Server zu Ihren Einstellungen hinzu, um zu beginnen.",
+  "Run qwen --debug to see error logs":
+    "Führen Sie qwen --debug aus, um Fehlerprotokolle anzuzeigen",
 
   // MCP OAuth Authentication
-  'OAuth Authentication': 'OAuth-Authentifizierung',
-  'Press Enter to start authentication, Esc to go back':
-    'Drücken Sie Enter, um die Authentifizierung zu starten, Esc zum Zurückgehen',
-  'Authenticating... Please complete the login in your browser.':
-    'Authentifizierung läuft... Bitte schließen Sie die Anmeldung in Ihrem Browser ab.',
-  'Press Enter or Esc to go back': 'Drücken Sie Enter oder Esc zum Zurückgehen',
+  "OAuth Authentication": "OAuth-Authentifizierung",
+  "Press Enter to start authentication, Esc to go back":
+    "Drücken Sie Enter, um die Authentifizierung zu starten, Esc zum Zurückgehen",
+  "Authenticating... Please complete the login in your browser.":
+    "Authentifizierung läuft... Bitte schließen Sie die Anmeldung in Ihrem Browser ab.",
+  "Press Enter or Esc to go back": "Drücken Sie Enter oder Esc zum Zurückgehen",
 
   // MCP Tool List
-  'No tools available for this server.':
-    'Keine Werkzeuge für diesen Server verfügbar.',
-  destructive: 'destruktiv',
-  'read-only': 'schreibgeschützt',
-  'open-world': 'offene Welt',
-  idempotent: 'idempotent',
-  'Tools for {{name}}': 'Werkzeuge für {{name}}',
-  'Tools for {{serverName}}': 'Werkzeuge für {{serverName}}',
-  '{{current}}/{{total}}': '{{current}}/{{total}}',
+  "No tools available for this server.": "Keine Werkzeuge für diesen Server verfügbar.",
+  destructive: "destruktiv",
+  "read-only": "schreibgeschützt",
+  "open-world": "offene Welt",
+  idempotent: "idempotent",
+  "Tools for {{name}}": "Werkzeuge für {{name}}",
+  "Tools for {{serverName}}": "Werkzeuge für {{serverName}}",
+  "{{current}}/{{total}}": "{{current}}/{{total}}",
 
   // MCP Tool Detail
-  required: 'erforderlich',
-  Type: 'Typ',
-  Enum: 'Aufzählung',
-  Parameters: 'Parameter',
-  'No tool selected': 'Kein Werkzeug ausgewählt',
-  Annotations: 'Anmerkungen',
-  Title: 'Titel',
-  'Read Only': 'Schreibgeschützt',
-  Destructive: 'Destruktiv',
-  Idempotent: 'Idempotent',
-  'Open World': 'Offene Welt',
-  Server: 'Server',
+  required: "erforderlich",
+  Type: "Typ",
+  Enum: "Aufzählung",
+  Parameters: "Parameter",
+  "No tool selected": "Kein Werkzeug ausgewählt",
+  Annotations: "Anmerkungen",
+  Title: "Titel",
+  "Read Only": "Schreibgeschützt",
+  Destructive: "Destruktiv",
+  Idempotent: "Idempotent",
+  "Open World": "Offene Welt",
+  Server: "Server",
 
   // Invalid tool related translations
-  '{{count}} invalid tools': '{{count}} ungültige Werkzeuge',
-  invalid: 'ungültig',
-  'invalid: {{reason}}': 'ungültig: {{reason}}',
-  'missing name': 'Name fehlt',
-  'missing description': 'Beschreibung fehlt',
-  '(unnamed)': '(unbenannt)',
-  'Warning: This tool cannot be called by the LLM':
-    'Warnung: Dieses Werkzeug kann nicht vom LLM aufgerufen werden',
-  Reason: 'Grund',
-  'Tools must have both name and description to be used by the LLM.':
-    'Werkzeuge müssen sowohl einen Namen als auch eine Beschreibung haben, um vom LLM verwendet zu werden.',
-  'Modify in progress:': 'Änderung in Bearbeitung:',
-  'Save and close external editor to continue':
-    'Speichern und externen Editor schließen, um fortzufahren',
-  'Apply this change?': 'Diese Änderung anwenden?',
-  'Yes, allow always': 'Ja, immer erlauben',
-  'Modify with external editor': 'Mit externem Editor bearbeiten',
-  'No, suggest changes (esc)': 'Nein, Änderungen vorschlagen (Esc)',
-  "Allow execution of: '{{command}}'?":
-    "Ausführung erlauben von: '{{command}}'?",
-  'Yes, allow always ...': 'Ja, immer erlauben ...',
-  'Always allow in this project': 'In diesem Projekt immer erlauben',
-  'Always allow {{action}} in this project':
-    '{{action}} in diesem Projekt immer erlauben',
-  'Always allow for this user': 'Für diesen Benutzer immer erlauben',
-  'Always allow {{action}} for this user':
-    '{{action}} für diesen Benutzer immer erlauben',
-  'Yes, restore previous mode ({{mode}})':
-    'Ja, vorherigen Modus wiederherstellen ({{mode}})',
-  'Yes, and auto-accept edits': 'Ja, und Änderungen automatisch akzeptieren',
-  'Yes, and manually approve edits': 'Ja, und Änderungen manuell genehmigen',
-  'No, keep planning (esc)': 'Nein, weiter planen (Esc)',
-  'URLs to fetch:': 'Abzurufende URLs:',
-  'MCP Server: {{server}}': 'MCP-Server: {{server}}',
-  'Tool: {{tool}}': 'Werkzeug: {{tool}}',
+  "{{count}} invalid tools": "{{count}} ungültige Werkzeuge",
+  invalid: "ungültig",
+  "invalid: {{reason}}": "ungültig: {{reason}}",
+  "missing name": "Name fehlt",
+  "missing description": "Beschreibung fehlt",
+  "(unnamed)": "(unbenannt)",
+  "Warning: This tool cannot be called by the LLM":
+    "Warnung: Dieses Werkzeug kann nicht vom LLM aufgerufen werden",
+  Reason: "Grund",
+  "Tools must have both name and description to be used by the LLM.":
+    "Werkzeuge müssen sowohl einen Namen als auch eine Beschreibung haben, um vom LLM verwendet zu werden.",
+  "Modify in progress:": "Änderung in Bearbeitung:",
+  "Save and close external editor to continue":
+    "Speichern und externen Editor schließen, um fortzufahren",
+  "Apply this change?": "Diese Änderung anwenden?",
+  "Yes, allow always": "Ja, immer erlauben",
+  "Modify with external editor": "Mit externem Editor bearbeiten",
+  "No, suggest changes (esc)": "Nein, Änderungen vorschlagen (Esc)",
+  "Allow execution of: '{{command}}'?": "Ausführung erlauben von: '{{command}}'?",
+  "Yes, allow always ...": "Ja, immer erlauben ...",
+  "Always allow in this project": "In diesem Projekt immer erlauben",
+  "Always allow {{action}} in this project": "{{action}} in diesem Projekt immer erlauben",
+  "Always allow for this user": "Für diesen Benutzer immer erlauben",
+  "Always allow {{action}} for this user": "{{action}} für diesen Benutzer immer erlauben",
+  "Yes, restore previous mode ({{mode}})": "Ja, vorherigen Modus wiederherstellen ({{mode}})",
+  "Yes, and auto-accept edits": "Ja, und Änderungen automatisch akzeptieren",
+  "Yes, and manually approve edits": "Ja, und Änderungen manuell genehmigen",
+  "No, keep planning (esc)": "Nein, weiter planen (Esc)",
+  "URLs to fetch:": "Abzurufende URLs:",
+  "MCP Server: {{server}}": "MCP-Server: {{server}}",
+  "Tool: {{tool}}": "Werkzeug: {{tool}}",
   'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?':
     'Ausführung des MCP-Werkzeugs "{{tool}}" von Server "{{server}}" erlauben?',
   'Yes, always allow tool "{{tool}}" from server "{{server}}"':
@@ -1202,752 +1112,714 @@ export default {
   // ============================================================================
   // Dialogs - Shell Confirmation
   // ============================================================================
-  'Shell Command Execution': 'Shell-Befehlsausführung',
-  'A custom command wants to run the following shell commands:':
-    'Ein benutzerdefinierter Befehl möchte folgende Shell-Befehle ausführen:',
+  "Shell Command Execution": "Shell-Befehlsausführung",
+  "A custom command wants to run the following shell commands:":
+    "Ein benutzerdefinierter Befehl möchte folgende Shell-Befehle ausführen:",
 
   // ============================================================================
   // Dialogs - Pro Quota
   // ============================================================================
-  'Pro quota limit reached for {{model}}.':
-    'Pro-Kontingentlimit für {{model}} erreicht.',
-  'Change auth (executes the /auth command)':
-    'Authentifizierung ändern (führt den /auth-Befehl aus)',
-  'Continue with {{model}}': 'Mit {{model}} fortfahren',
+  "Pro quota limit reached for {{model}}.": "Pro-Kontingentlimit für {{model}} erreicht.",
+  "Change auth (executes the /auth command)":
+    "Authentifizierung ändern (führt den /auth-Befehl aus)",
+  "Continue with {{model}}": "Mit {{model}} fortfahren",
 
   // ============================================================================
   // Dialogs - Welcome Back
   // ============================================================================
-  'Current Plan:': 'Aktueller Plan:',
-  'Progress: {{done}}/{{total}} tasks completed':
-    'Fortschritt: {{done}}/{{total}} Aufgaben abgeschlossen',
-  ', {{inProgress}} in progress': ', {{inProgress}} in Bearbeitung',
-  'Pending Tasks:': 'Ausstehende Aufgaben:',
-  'What would you like to do?': 'Was möchten Sie tun?',
-  'Choose how to proceed with your session:':
-    'Wählen Sie, wie Sie mit Ihrer Sitzung fortfahren möchten:',
-  'Start new chat session': 'Neue Chat-Sitzung starten',
-  'Continue previous conversation': 'Vorheriges Gespräch fortsetzen',
-  '👋 Welcome back! (Last updated: {{timeAgo}})':
-    '👋 Willkommen zurück! (Zuletzt aktualisiert: {{timeAgo}})',
-  '🎯 Overall Goal:': '🎯 Gesamtziel:',
+  "Current Plan:": "Aktueller Plan:",
+  "Progress: {{done}}/{{total}} tasks completed":
+    "Fortschritt: {{done}}/{{total}} Aufgaben abgeschlossen",
+  ", {{inProgress}} in progress": ", {{inProgress}} in Bearbeitung",
+  "Pending Tasks:": "Ausstehende Aufgaben:",
+  "What would you like to do?": "Was möchten Sie tun?",
+  "Choose how to proceed with your session:":
+    "Wählen Sie, wie Sie mit Ihrer Sitzung fortfahren möchten:",
+  "Start new chat session": "Neue Chat-Sitzung starten",
+  "Continue previous conversation": "Vorheriges Gespräch fortsetzen",
+  "👋 Welcome back! (Last updated: {{timeAgo}})":
+    "👋 Willkommen zurück! (Zuletzt aktualisiert: {{timeAgo}})",
+  "🎯 Overall Goal:": "🎯 Gesamtziel:",
 
   // ============================================================================
   // Dialogs - Auth
   // ============================================================================
-  'Get started': 'Loslegen',
-  'Select Authentication Method': 'Authentifizierungsmethode auswählen',
-  'OpenAI API key is required to use OpenAI authentication.':
-    'OpenAI API-Schlüssel ist für die OpenAI-Authentifizierung erforderlich.',
-  'You must select an auth method to proceed. Press Ctrl+C again to exit.':
-    'Sie müssen eine Authentifizierungsmethode wählen, um fortzufahren. Drücken Sie erneut Strg+C zum Beenden.',
-  'Terms of Services and Privacy Notice':
-    'Nutzungsbedingungen und Datenschutzhinweis',
-  'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models':
-    'Kostenpflichtig \u00B7 Bis zu 6.000 Anfragen/5 Std. \u00B7 Alle Alibaba Cloud Coding Plan Modelle',
-  'Alibaba Cloud Coding Plan': 'Alibaba Cloud Coding Plan',
-  'Bring your own API key': 'Eigenen API-Schlüssel verwenden',
-  'API-KEY': 'API-KEY',
-  'Use coding plan credentials or your own api-keys/providers.':
-    'Verwenden Sie Coding Plan-Anmeldedaten oder Ihre eigenen API-Schlüssel/Anbieter.',
-  OpenAI: 'OpenAI',
-  'Failed to login. Message: {{message}}':
-    'Anmeldung fehlgeschlagen. Meldung: {{message}}',
-  'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.':
-    'Authentifizierung ist auf {{enforcedType}} festgelegt, aber Sie verwenden derzeit {{currentType}}.',
-  'Please visit this URL to authorize:':
-    'Bitte besuchen Sie diese URL zur Autorisierung:',
-  'Or scan the QR code below:': 'Oder scannen Sie den QR-Code unten:',
-  'Waiting for authorization': 'Warten auf Autorisierung',
-  'Time remaining:': 'Verbleibende Zeit:',
-  '(Press ESC or CTRL+C to cancel)': '(ESC oder STRG+C zum Abbrechen drücken)',
-  'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.':
-    'OAuth-Token abgelaufen (über {{seconds}} Sekunden). Bitte wählen Sie erneut eine Authentifizierungsmethode.',
-  'Press any key to return to authentication type selection.':
-    'Drücken Sie eine beliebige Taste, um zur Authentifizierungstypauswahl zurückzukehren.',
-  'Authentication timed out. Please try again.':
-    'Authentifizierung abgelaufen. Bitte versuchen Sie es erneut.',
-  'Waiting for auth... (Press ESC or CTRL+C to cancel)':
-    'Warten auf Authentifizierung... (ESC oder STRG+C zum Abbrechen drücken)',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    'API-Schlüssel für OpenAI-kompatible Authentifizierung fehlt. Setzen Sie settings.security.auth.apiKey oder die Umgebungsvariable {{envKeyHint}}.',
-  '{{envKeyHint}} environment variable not found.':
-    'Umgebungsvariable {{envKeyHint}} wurde nicht gefunden.',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    'Umgebungsvariable {{envKeyHint}} wurde nicht gefunden. Bitte legen Sie sie in Ihrer .env-Datei oder den Systemumgebungsvariablen fest.',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    'Umgebungsvariable {{envKeyHint}} wurde nicht gefunden (oder setzen Sie settings.security.auth.apiKey). Bitte legen Sie sie in Ihrer .env-Datei oder den Systemumgebungsvariablen fest.',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    'API-Schlüssel für OpenAI-kompatible Authentifizierung fehlt. Setzen Sie die Umgebungsvariable {{envKeyHint}}.',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'Anthropic-Anbieter fehlt erforderliche baseUrl in modelProviders[].baseUrl.',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    'Umgebungsvariable ANTHROPIC_BASE_URL wurde nicht gefunden.',
-  'Invalid auth method selected.':
-    'Ungültige Authentifizierungsmethode ausgewählt.',
-  'Failed to authenticate. Message: {{message}}':
-    'Authentifizierung fehlgeschlagen. Meldung: {{message}}',
-  'Authenticated successfully with {{authType}} credentials.':
-    'Erfolgreich mit {{authType}}-Anmeldedaten authentifiziert.',
+  "Get started": "Loslegen",
+  "Select Authentication Method": "Authentifizierungsmethode auswählen",
+  "OpenAI API key is required to use OpenAI authentication.":
+    "OpenAI API-Schlüssel ist für die OpenAI-Authentifizierung erforderlich.",
+  "You must select an auth method to proceed. Press Ctrl+C again to exit.":
+    "Sie müssen eine Authentifizierungsmethode wählen, um fortzufahren. Drücken Sie erneut Strg+C zum Beenden.",
+  "Terms of Services and Privacy Notice": "Nutzungsbedingungen und Datenschutzhinweis",
+  "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models":
+    "Kostenpflichtig \u00B7 Bis zu 6.000 Anfragen/5 Std. \u00B7 Alle Alibaba Cloud Coding Plan Modelle",
+  "Alibaba Cloud Coding Plan": "Alibaba Cloud Coding Plan",
+  "Bring your own API key": "Eigenen API-Schlüssel verwenden",
+  "API-KEY": "API-KEY",
+  "Use coding plan credentials or your own api-keys/providers.":
+    "Verwenden Sie Coding Plan-Anmeldedaten oder Ihre eigenen API-Schlüssel/Anbieter.",
+  OpenAI: "OpenAI",
+  "Failed to login. Message: {{message}}": "Anmeldung fehlgeschlagen. Meldung: {{message}}",
+  "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.":
+    "Authentifizierung ist auf {{enforcedType}} festgelegt, aber Sie verwenden derzeit {{currentType}}.",
+  "Please visit this URL to authorize:": "Bitte besuchen Sie diese URL zur Autorisierung:",
+  "Or scan the QR code below:": "Oder scannen Sie den QR-Code unten:",
+  "Waiting for authorization": "Warten auf Autorisierung",
+  "Time remaining:": "Verbleibende Zeit:",
+  "(Press ESC or CTRL+C to cancel)": "(ESC oder STRG+C zum Abbrechen drücken)",
+  "OAuth token expired (over {{seconds}} seconds). Please select authentication method again.":
+    "OAuth-Token abgelaufen (über {{seconds}} Sekunden). Bitte wählen Sie erneut eine Authentifizierungsmethode.",
+  "Press any key to return to authentication type selection.":
+    "Drücken Sie eine beliebige Taste, um zur Authentifizierungstypauswahl zurückzukehren.",
+  "Authentication timed out. Please try again.":
+    "Authentifizierung abgelaufen. Bitte versuchen Sie es erneut.",
+  "Waiting for auth... (Press ESC or CTRL+C to cancel)":
+    "Warten auf Authentifizierung... (ESC oder STRG+C zum Abbrechen drücken)",
+  "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.":
+    "API-Schlüssel für OpenAI-kompatible Authentifizierung fehlt. Setzen Sie settings.security.auth.apiKey oder die Umgebungsvariable {{envKeyHint}}.",
+  "{{envKeyHint}} environment variable not found.":
+    "Umgebungsvariable {{envKeyHint}} wurde nicht gefunden.",
+  "{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.":
+    "Umgebungsvariable {{envKeyHint}} wurde nicht gefunden. Bitte legen Sie sie in Ihrer .env-Datei oder den Systemumgebungsvariablen fest.",
+  "{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.":
+    "Umgebungsvariable {{envKeyHint}} wurde nicht gefunden (oder setzen Sie settings.security.auth.apiKey). Bitte legen Sie sie in Ihrer .env-Datei oder den Systemumgebungsvariablen fest.",
+  "Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.":
+    "API-Schlüssel für OpenAI-kompatible Authentifizierung fehlt. Setzen Sie die Umgebungsvariable {{envKeyHint}}.",
+  "Anthropic provider missing required baseUrl in modelProviders[].baseUrl.":
+    "Anthropic-Anbieter fehlt erforderliche baseUrl in modelProviders[].baseUrl.",
+  "ANTHROPIC_BASE_URL environment variable not found.":
+    "Umgebungsvariable ANTHROPIC_BASE_URL wurde nicht gefunden.",
+  "Invalid auth method selected.": "Ungültige Authentifizierungsmethode ausgewählt.",
+  "Failed to authenticate. Message: {{message}}":
+    "Authentifizierung fehlgeschlagen. Meldung: {{message}}",
+  "Authenticated successfully with {{authType}} credentials.":
+    "Erfolgreich mit {{authType}}-Anmeldedaten authentifiziert.",
   'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}':
     'Ungültiger QWEN_DEFAULT_AUTH_TYPE-Wert: "{{value}}". Gültige Werte sind: {{validValues}}',
-  'OpenAI Configuration Required': 'OpenAI-Konfiguration erforderlich',
-  'Please enter your OpenAI configuration. You can get an API key from':
-    'Bitte geben Sie Ihre OpenAI-Konfiguration ein. Sie können einen API-Schlüssel erhalten von',
-  'API Key:': 'API-Schlüssel:',
-  'Invalid credentials: {{errorMessage}}':
-    'Ungültige Anmeldedaten: {{errorMessage}}',
-  'Failed to validate credentials':
-    'Anmeldedaten konnten nicht validiert werden',
-  'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel':
-    'Enter zum Fortfahren, Tab/↑↓ zum Navigieren, Esc zum Abbrechen',
+  "OpenAI Configuration Required": "OpenAI-Konfiguration erforderlich",
+  "Please enter your OpenAI configuration. You can get an API key from":
+    "Bitte geben Sie Ihre OpenAI-Konfiguration ein. Sie können einen API-Schlüssel erhalten von",
+  "API Key:": "API-Schlüssel:",
+  "Invalid credentials: {{errorMessage}}": "Ungültige Anmeldedaten: {{errorMessage}}",
+  "Failed to validate credentials": "Anmeldedaten konnten nicht validiert werden",
+  "Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel":
+    "Enter zum Fortfahren, Tab/↑↓ zum Navigieren, Esc zum Abbrechen",
 
   // ============================================================================
   // Dialogs - Model
   // ============================================================================
-  'Select Model': 'Modell auswählen',
-  '(Press Esc to close)': '(Esc zum Schließen drücken)',
-  'Current (effective) configuration': 'Aktuelle (wirksame) Konfiguration',
-  AuthType: 'Authentifizierungstyp',
-  'API Key': 'API-Schlüssel',
-  unset: 'nicht gesetzt',
-  '(default)': '(Standard)',
-  '(set)': '(gesetzt)',
-  '(not set)': '(nicht gesetzt)',
-  Modality: 'Modalität',
-  'Context Window': 'Kontextfenster',
-  text: 'Text',
-  'text-only': 'nur Text',
-  image: 'Bild',
-  pdf: 'PDF',
-  audio: 'Audio',
-  video: 'Video',
-  'not set': 'nicht gesetzt',
-  none: 'keine',
-  unknown: 'unbekannt',
+  "Select Model": "Modell auswählen",
+  "(Press Esc to close)": "(Esc zum Schließen drücken)",
+  "Current (effective) configuration": "Aktuelle (wirksame) Konfiguration",
+  AuthType: "Authentifizierungstyp",
+  "API Key": "API-Schlüssel",
+  unset: "nicht gesetzt",
+  "(default)": "(Standard)",
+  "(set)": "(gesetzt)",
+  "(not set)": "(nicht gesetzt)",
+  Modality: "Modalität",
+  "Context Window": "Kontextfenster",
+  text: "Text",
+  "text-only": "nur Text",
+  image: "Bild",
+  pdf: "PDF",
+  audio: "Audio",
+  video: "Video",
+  "not set": "nicht gesetzt",
+  none: "keine",
+  unknown: "unbekannt",
   "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
     "Modell konnte nicht auf '{{modelId}}' umgestellt werden.\n\n{{error}}",
-  'Qwen 3.6 Plus — efficient hybrid model with leading coding performance':
-    'Qwen 3.6 Plus — effizientes Hybridmodell mit führender Programmierleistung',
-  'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
-    'Das neueste Qwen Vision Modell von Alibaba Cloud ModelStudio (Version: qwen3-vl-plus-2025-09-23)',
+  "Qwen 3.6 Plus — efficient hybrid model with leading coding performance":
+    "Qwen 3.6 Plus — effizientes Hybridmodell mit führender Programmierleistung",
+  "The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)":
+    "Das neueste Qwen Vision Modell von Alibaba Cloud ModelStudio (Version: qwen3-vl-plus-2025-09-23)",
 
   // ============================================================================
   // Dialogs - Permissions
   // ============================================================================
-  'Manage folder trust settings': 'Ordnervertrauenseinstellungen verwalten',
-  'Manage permission rules': 'Berechtigungsregeln verwalten',
-  Allow: 'Erlauben',
-  Ask: 'Fragen',
-  Deny: 'Verweigern',
-  Workspace: 'Arbeitsbereich',
+  "Manage folder trust settings": "Ordnervertrauenseinstellungen verwalten",
+  "Manage permission rules": "Berechtigungsregeln verwalten",
+  Allow: "Erlauben",
+  Ask: "Fragen",
+  Deny: "Verweigern",
+  Workspace: "Arbeitsbereich",
   "Qwen Code won't ask before using allowed tools.":
-    'Qwen Code fragt nicht, bevor erlaubte Tools verwendet werden.',
-  'Qwen Code will ask before using these tools.':
-    'Qwen Code fragt, bevor diese Tools verwendet werden.',
-  'Qwen Code is not allowed to use denied tools.':
-    'Qwen Code darf verweigerte Tools nicht verwenden.',
-  'Manage trusted directories for this workspace.':
-    'Vertrauenswürdige Verzeichnisse für diesen Arbeitsbereich verwalten.',
-  'Any use of the {{tool}} tool': 'Jede Verwendung des {{tool}}-Tools',
-  "{{tool}} commands matching '{{pattern}}'":
-    "{{tool}}-Befehle, die '{{pattern}}' entsprechen",
-  'From user settings': 'Aus Benutzereinstellungen',
-  'From project settings': 'Aus Projekteinstellungen',
-  'From session': 'Aus Sitzung',
-  'Project settings (local)': 'Projekteinstellungen (lokal)',
-  'Saved in .qwen/settings.local.json':
-    'Gespeichert in .qwen/settings.local.json',
-  'Project settings': 'Projekteinstellungen',
-  'Checked in at .qwen/settings.json': 'Eingecheckt in .qwen/settings.json',
-  'User settings': 'Benutzereinstellungen',
-  'Saved in at ~/.qwen/settings.json': 'Gespeichert in ~/.qwen/settings.json',
-  'Add a new rule…': 'Neue Regel hinzufügen…',
-  'Add {{type}} permission rule': '{{type}}-Berechtigungsregel hinzufügen',
-  'Permission rules are a tool name, optionally followed by a specifier in parentheses.':
-    'Berechtigungsregeln sind ein Toolname, optional gefolgt von einem Bezeichner in Klammern.',
-  'e.g.,': 'z.B.',
-  or: 'oder',
-  'Enter permission rule…': 'Berechtigungsregel eingeben…',
-  'Enter to submit · Esc to cancel': 'Enter zum Absenden · Esc zum Abbrechen',
-  'Where should this rule be saved?': 'Wo soll diese Regel gespeichert werden?',
-  'Enter to confirm · Esc to cancel':
-    'Enter zum Bestätigen · Esc zum Abbrechen',
-  'Delete {{type}} rule?': '{{type}}-Regel löschen?',
-  'Are you sure you want to delete this permission rule?':
-    'Sind Sie sicher, dass Sie diese Berechtigungsregel löschen möchten?',
-  'Permissions:': 'Berechtigungen:',
-  '(←/→ or tab to cycle)': '(←/→ oder Tab zum Wechseln)',
-  'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel':
-    '↑↓ navigieren · Enter auswählen · Tippen suchen · Esc abbrechen',
-  'Search…': 'Suche…',
-  'Use /trust to manage folder trust settings for this workspace.':
-    'Verwenden Sie /trust, um die Ordnervertrauenseinstellungen für diesen Arbeitsbereich zu verwalten.',
+    "Qwen Code fragt nicht, bevor erlaubte Tools verwendet werden.",
+  "Qwen Code will ask before using these tools.":
+    "Qwen Code fragt, bevor diese Tools verwendet werden.",
+  "Qwen Code is not allowed to use denied tools.":
+    "Qwen Code darf verweigerte Tools nicht verwenden.",
+  "Manage trusted directories for this workspace.":
+    "Vertrauenswürdige Verzeichnisse für diesen Arbeitsbereich verwalten.",
+  "Any use of the {{tool}} tool": "Jede Verwendung des {{tool}}-Tools",
+  "{{tool}} commands matching '{{pattern}}'": "{{tool}}-Befehle, die '{{pattern}}' entsprechen",
+  "From user settings": "Aus Benutzereinstellungen",
+  "From project settings": "Aus Projekteinstellungen",
+  "From session": "Aus Sitzung",
+  "Project settings (local)": "Projekteinstellungen (lokal)",
+  "Saved in .qwen/settings.local.json": "Gespeichert in .qwen/settings.local.json",
+  "Project settings": "Projekteinstellungen",
+  "Checked in at .qwen/settings.json": "Eingecheckt in .qwen/settings.json",
+  "User settings": "Benutzereinstellungen",
+  "Saved in at ~/.qwen/settings.json": "Gespeichert in ~/.qwen/settings.json",
+  "Add a new rule…": "Neue Regel hinzufügen…",
+  "Add {{type}} permission rule": "{{type}}-Berechtigungsregel hinzufügen",
+  "Permission rules are a tool name, optionally followed by a specifier in parentheses.":
+    "Berechtigungsregeln sind ein Toolname, optional gefolgt von einem Bezeichner in Klammern.",
+  "e.g.,": "z.B.",
+  or: "oder",
+  "Enter permission rule…": "Berechtigungsregel eingeben…",
+  "Enter to submit · Esc to cancel": "Enter zum Absenden · Esc zum Abbrechen",
+  "Where should this rule be saved?": "Wo soll diese Regel gespeichert werden?",
+  "Enter to confirm · Esc to cancel": "Enter zum Bestätigen · Esc zum Abbrechen",
+  "Delete {{type}} rule?": "{{type}}-Regel löschen?",
+  "Are you sure you want to delete this permission rule?":
+    "Sind Sie sicher, dass Sie diese Berechtigungsregel löschen möchten?",
+  "Permissions:": "Berechtigungen:",
+  "(←/→ or tab to cycle)": "(←/→ oder Tab zum Wechseln)",
+  "Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel":
+    "↑↓ navigieren · Enter auswählen · Tippen suchen · Esc abbrechen",
+  "Search…": "Suche…",
+  "Use /trust to manage folder trust settings for this workspace.":
+    "Verwenden Sie /trust, um die Ordnervertrauenseinstellungen für diesen Arbeitsbereich zu verwalten.",
   // Workspace directory management
-  'Add directory…': 'Verzeichnis hinzufügen…',
-  'Add directory to workspace': 'Verzeichnis zum Arbeitsbereich hinzufügen',
-  'Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.':
-    'Qwen Code kann Dateien im Arbeitsbereich lesen und Bearbeitungen vornehmen, wenn die automatische Akzeptierung aktiviert ist.',
-  'Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.':
-    'Qwen Code kann Dateien in diesem Verzeichnis lesen und Bearbeitungen vornehmen, wenn die automatische Akzeptierung aktiviert ist.',
-  'Enter the path to the directory:': 'Pfad zum Verzeichnis eingeben:',
-  'Enter directory path…': 'Verzeichnispfad eingeben…',
-  'Tab to complete · Enter to add · Esc to cancel':
-    'Tab zum Vervollständigen · Enter zum Hinzufügen · Esc zum Abbrechen',
-  'Remove directory?': 'Verzeichnis entfernen?',
-  'Are you sure you want to remove this directory from the workspace?':
-    'Möchten Sie dieses Verzeichnis wirklich aus dem Arbeitsbereich entfernen?',
-  '  (Original working directory)': '  (Ursprüngliches Arbeitsverzeichnis)',
-  '  (from settings)': '  (aus Einstellungen)',
-  'Directory does not exist.': 'Verzeichnis existiert nicht.',
-  'Path is not a directory.': 'Pfad ist kein Verzeichnis.',
-  'This directory is already in the workspace.':
-    'Dieses Verzeichnis ist bereits im Arbeitsbereich.',
-  'Already covered by existing directory: {{dir}}':
-    'Bereits durch vorhandenes Verzeichnis abgedeckt: {{dir}}',
+  "Add directory…": "Verzeichnis hinzufügen…",
+  "Add directory to workspace": "Verzeichnis zum Arbeitsbereich hinzufügen",
+  "Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.":
+    "Qwen Code kann Dateien im Arbeitsbereich lesen und Bearbeitungen vornehmen, wenn die automatische Akzeptierung aktiviert ist.",
+  "Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.":
+    "Qwen Code kann Dateien in diesem Verzeichnis lesen und Bearbeitungen vornehmen, wenn die automatische Akzeptierung aktiviert ist.",
+  "Enter the path to the directory:": "Pfad zum Verzeichnis eingeben:",
+  "Enter directory path…": "Verzeichnispfad eingeben…",
+  "Tab to complete · Enter to add · Esc to cancel":
+    "Tab zum Vervollständigen · Enter zum Hinzufügen · Esc zum Abbrechen",
+  "Remove directory?": "Verzeichnis entfernen?",
+  "Are you sure you want to remove this directory from the workspace?":
+    "Möchten Sie dieses Verzeichnis wirklich aus dem Arbeitsbereich entfernen?",
+  "  (Original working directory)": "  (Ursprüngliches Arbeitsverzeichnis)",
+  "  (from settings)": "  (aus Einstellungen)",
+  "Directory does not exist.": "Verzeichnis existiert nicht.",
+  "Path is not a directory.": "Pfad ist kein Verzeichnis.",
+  "This directory is already in the workspace.":
+    "Dieses Verzeichnis ist bereits im Arbeitsbereich.",
+  "Already covered by existing directory: {{dir}}":
+    "Bereits durch vorhandenes Verzeichnis abgedeckt: {{dir}}",
 
   // ============================================================================
   // Status Bar
   // ============================================================================
-  'Using:': 'Verwendet:',
-  '{{count}} open file': '{{count}} geöffnete Datei',
-  '{{count}} open files': '{{count}} geöffnete Dateien',
-  '(ctrl+g to view)': '(Strg+G zum Anzeigen)',
-  '{{count}} {{name}} file': '{{count}} {{name}}-Datei',
-  '{{count}} {{name}} files': '{{count}} {{name}}-Dateien',
-  '{{count}} MCP server': '{{count}} MCP-Server',
-  '{{count}} MCP servers': '{{count}} MCP-Server',
-  '{{count}} Blocked': '{{count}} blockiert',
-  '(ctrl+t to view)': '(Strg+T zum Anzeigen)',
-  '(ctrl+t to toggle)': '(Strg+T zum Umschalten)',
-  'Press Ctrl+C again to exit.': 'Drücken Sie erneut Strg+C zum Beenden.',
-  'Press Ctrl+D again to exit.': 'Drücken Sie erneut Strg+D zum Beenden.',
-  'Press Esc again to clear.': 'Drücken Sie erneut Esc zum Löschen.',
+  "Using:": "Verwendet:",
+  "{{count}} open file": "{{count}} geöffnete Datei",
+  "{{count}} open files": "{{count}} geöffnete Dateien",
+  "(ctrl+g to view)": "(Strg+G zum Anzeigen)",
+  "{{count}} {{name}} file": "{{count}} {{name}}-Datei",
+  "{{count}} {{name}} files": "{{count}} {{name}}-Dateien",
+  "{{count}} MCP server": "{{count}} MCP-Server",
+  "{{count}} MCP servers": "{{count}} MCP-Server",
+  "{{count}} Blocked": "{{count}} blockiert",
+  "(ctrl+t to view)": "(Strg+T zum Anzeigen)",
+  "(ctrl+t to toggle)": "(Strg+T zum Umschalten)",
+  "Press Ctrl+C again to exit.": "Drücken Sie erneut Strg+C zum Beenden.",
+  "Press Ctrl+D again to exit.": "Drücken Sie erneut Strg+D zum Beenden.",
+  "Press Esc again to clear.": "Drücken Sie erneut Esc zum Löschen.",
 
   // ============================================================================
   // MCP Status
   // ============================================================================
-  'No MCP servers configured.': 'Keine MCP-Server konfiguriert.',
-  '⏳ MCP servers are starting up ({{count}} initializing)...':
-    '⏳ MCP-Server werden gestartet ({{count}} werden initialisiert)...',
-  'Note: First startup may take longer. Tool availability will update automatically.':
-    'Hinweis: Der erste Start kann länger dauern. Werkzeugverfügbarkeit wird automatisch aktualisiert.',
-  'Configured MCP servers:': 'Konfigurierte MCP-Server:',
-  Ready: 'Bereit',
-  'Starting... (first startup may take longer)':
-    'Wird gestartet... (erster Start kann länger dauern)',
-  Disconnected: 'Getrennt',
-  '{{count}} tool': '{{count}} Werkzeug',
-  '{{count}} tools': '{{count}} Werkzeuge',
-  '{{count}} prompt': '{{count}} Prompt',
-  '{{count}} prompts': '{{count}} Prompts',
-  '(from {{extensionName}})': '(von {{extensionName}})',
-  OAuth: 'OAuth',
-  'OAuth expired': 'OAuth abgelaufen',
-  'OAuth not authenticated': 'OAuth nicht authentifiziert',
-  'tools and prompts will appear when ready':
-    'Werkzeuge und Prompts werden angezeigt, wenn bereit',
-  '{{count}} tools cached': '{{count}} Werkzeuge zwischengespeichert',
-  'Tools:': 'Werkzeuge:',
-  'Parameters:': 'Parameter:',
-  'Prompts:': 'Prompts:',
-  Blocked: 'Blockiert',
-  '💡 Tips:': '💡 Tipps:',
-  Use: 'Verwenden',
-  'to show server and tool descriptions':
-    'um Server- und Werkzeugbeschreibungen anzuzeigen',
-  'to show tool parameter schemas': 'um Werkzeug-Parameter-Schemas anzuzeigen',
-  'to hide descriptions': 'um Beschreibungen auszublenden',
-  'to authenticate with OAuth-enabled servers':
-    'um sich bei OAuth-fähigen Servern zu authentifizieren',
-  Press: 'Drücken Sie',
-  'to toggle tool descriptions on/off':
-    'um Werkzeugbeschreibungen ein-/auszuschalten',
+  "No MCP servers configured.": "Keine MCP-Server konfiguriert.",
+  "⏳ MCP servers are starting up ({{count}} initializing)...":
+    "⏳ MCP-Server werden gestartet ({{count}} werden initialisiert)...",
+  "Note: First startup may take longer. Tool availability will update automatically.":
+    "Hinweis: Der erste Start kann länger dauern. Werkzeugverfügbarkeit wird automatisch aktualisiert.",
+  "Configured MCP servers:": "Konfigurierte MCP-Server:",
+  Ready: "Bereit",
+  "Starting... (first startup may take longer)":
+    "Wird gestartet... (erster Start kann länger dauern)",
+  Disconnected: "Getrennt",
+  "{{count}} tool": "{{count}} Werkzeug",
+  "{{count}} tools": "{{count}} Werkzeuge",
+  "{{count}} prompt": "{{count}} Prompt",
+  "{{count}} prompts": "{{count}} Prompts",
+  "(from {{extensionName}})": "(von {{extensionName}})",
+  OAuth: "OAuth",
+  "OAuth expired": "OAuth abgelaufen",
+  "OAuth not authenticated": "OAuth nicht authentifiziert",
+  "tools and prompts will appear when ready": "Werkzeuge und Prompts werden angezeigt, wenn bereit",
+  "{{count}} tools cached": "{{count}} Werkzeuge zwischengespeichert",
+  "Tools:": "Werkzeuge:",
+  "Parameters:": "Parameter:",
+  "Prompts:": "Prompts:",
+  Blocked: "Blockiert",
+  "💡 Tips:": "💡 Tipps:",
+  Use: "Verwenden",
+  "to show server and tool descriptions": "um Server- und Werkzeugbeschreibungen anzuzeigen",
+  "to show tool parameter schemas": "um Werkzeug-Parameter-Schemas anzuzeigen",
+  "to hide descriptions": "um Beschreibungen auszublenden",
+  "to authenticate with OAuth-enabled servers":
+    "um sich bei OAuth-fähigen Servern zu authentifizieren",
+  Press: "Drücken Sie",
+  "to toggle tool descriptions on/off": "um Werkzeugbeschreibungen ein-/auszuschalten",
   "Starting OAuth authentication for MCP server '{{name}}'...":
     "OAuth-Authentifizierung für MCP-Server '{{name}}' wird gestartet...",
-  'Restarting MCP servers...': 'MCP-Server werden neu gestartet...',
+  "Restarting MCP servers...": "MCP-Server werden neu gestartet...",
 
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips for getting started:': 'Tipps zum Einstieg:',
-  '1. Ask questions, edit files, or run commands.':
-    '1. Stellen Sie Fragen, bearbeiten Sie Dateien oder führen Sie Befehle aus.',
-  '2. Be specific for the best results.':
-    '2. Seien Sie spezifisch für die besten Ergebnisse.',
-  'files to customize your interactions with Qwen Code.':
-    'Dateien, um Ihre Interaktionen mit Qwen Code anzupassen.',
-  'for more information.': 'für weitere Informationen.',
+  "Tips for getting started:": "Tipps zum Einstieg:",
+  "1. Ask questions, edit files, or run commands.":
+    "1. Stellen Sie Fragen, bearbeiten Sie Dateien oder führen Sie Befehle aus.",
+  "2. Be specific for the best results.": "2. Seien Sie spezifisch für die besten Ergebnisse.",
+  "files to customize your interactions with Qwen Code.":
+    "Dateien, um Ihre Interaktionen mit Qwen Code anzupassen.",
+  "for more information.": "für weitere Informationen.",
 
   // ============================================================================
   // Exit Screen / Stats
   // ============================================================================
-  'Agent powering down. Goodbye!':
-    'Agent wird heruntergefahren. Auf Wiedersehen!',
-  'To continue this session, run':
-    'Um diese Sitzung fortzusetzen, führen Sie aus',
-  'Interaction Summary': 'Interaktionszusammenfassung',
-  'Session ID:': 'Sitzungs-ID:',
-  'Tool Calls:': 'Werkzeugaufrufe:',
-  'Success Rate:': 'Erfolgsrate:',
-  'User Agreement:': 'Benutzerzustimmung:',
-  reviewed: 'überprüft',
-  'Code Changes:': 'Codeänderungen:',
-  Performance: 'Leistung',
-  'Wall Time:': 'Gesamtzeit:',
-  'Agent Active:': 'Agent aktiv:',
-  'API Time:': 'API-Zeit:',
-  'Tool Time:': 'Werkzeugzeit:',
-  'Session Stats': 'Sitzungsstatistiken',
-  'Model Usage': 'Modellnutzung',
-  Reqs: 'Anfragen',
-  'Input Tokens': 'Eingabe-Token',
-  'Output Tokens': 'Ausgabe-Token',
-  'Savings Highlight:': 'Einsparungen:',
-  'of input tokens were served from the cache, reducing costs.':
-    'der Eingabe-Token wurden aus dem Cache bedient, was die Kosten reduziert.',
-  'Tip: For a full token breakdown, run `/stats model`.':
-    'Tipp: Für eine vollständige Token-Aufschlüsselung führen Sie `/stats model` aus.',
-  'Model Stats For Nerds': 'Modellstatistiken für Nerds',
-  'Tool Stats For Nerds': 'Werkzeugstatistiken für Nerds',
-  Metric: 'Metrik',
-  API: 'API',
-  Requests: 'Anfragen',
-  Errors: 'Fehler',
-  'Avg Latency': 'Durchschn. Latenz',
-  Tokens: 'Token',
-  Total: 'Gesamt',
-  Prompt: 'Prompt',
-  Cached: 'Zwischengespeichert',
-  Thoughts: 'Gedanken',
-  Tool: 'Werkzeug',
-  Output: 'Ausgabe',
-  'No API calls have been made in this session.':
-    'In dieser Sitzung wurden keine API-Aufrufe gemacht.',
-  'Tool Name': 'Werkzeugname',
-  Calls: 'Aufrufe',
-  'Success Rate': 'Erfolgsrate',
-  'Avg Duration': 'Durchschn. Dauer',
-  'User Decision Summary': 'Benutzerentscheidungs-Zusammenfassung',
-  'Total Reviewed Suggestions:': 'Insgesamt überprüfter Vorschläge:',
-  ' » Accepted:': ' » Akzeptiert:',
-  ' » Rejected:': ' » Abgelehnt:',
-  ' » Modified:': ' » Geändert:',
-  ' Overall Agreement Rate:': ' Gesamtzustimmungsrate:',
-  'No tool calls have been made in this session.':
-    'In dieser Sitzung wurden keine Werkzeugaufrufe gemacht.',
-  'Session start time is unavailable, cannot calculate stats.':
-    'Sitzungsstartzeit nicht verfügbar, Statistiken können nicht berechnet werden.',
+  "Agent powering down. Goodbye!": "Agent wird heruntergefahren. Auf Wiedersehen!",
+  "To continue this session, run": "Um diese Sitzung fortzusetzen, führen Sie aus",
+  "Interaction Summary": "Interaktionszusammenfassung",
+  "Session ID:": "Sitzungs-ID:",
+  "Tool Calls:": "Werkzeugaufrufe:",
+  "Success Rate:": "Erfolgsrate:",
+  "User Agreement:": "Benutzerzustimmung:",
+  reviewed: "überprüft",
+  "Code Changes:": "Codeänderungen:",
+  Performance: "Leistung",
+  "Wall Time:": "Gesamtzeit:",
+  "Agent Active:": "Agent aktiv:",
+  "API Time:": "API-Zeit:",
+  "Tool Time:": "Werkzeugzeit:",
+  "Session Stats": "Sitzungsstatistiken",
+  "Model Usage": "Modellnutzung",
+  Reqs: "Anfragen",
+  "Input Tokens": "Eingabe-Token",
+  "Output Tokens": "Ausgabe-Token",
+  "Savings Highlight:": "Einsparungen:",
+  "of input tokens were served from the cache, reducing costs.":
+    "der Eingabe-Token wurden aus dem Cache bedient, was die Kosten reduziert.",
+  "Tip: For a full token breakdown, run `/stats model`.":
+    "Tipp: Für eine vollständige Token-Aufschlüsselung führen Sie `/stats model` aus.",
+  "Model Stats For Nerds": "Modellstatistiken für Nerds",
+  "Tool Stats For Nerds": "Werkzeugstatistiken für Nerds",
+  Metric: "Metrik",
+  API: "API",
+  Requests: "Anfragen",
+  Errors: "Fehler",
+  "Avg Latency": "Durchschn. Latenz",
+  Tokens: "Token",
+  Total: "Gesamt",
+  Prompt: "Prompt",
+  Cached: "Zwischengespeichert",
+  Thoughts: "Gedanken",
+  Tool: "Werkzeug",
+  Output: "Ausgabe",
+  "No API calls have been made in this session.":
+    "In dieser Sitzung wurden keine API-Aufrufe gemacht.",
+  "Tool Name": "Werkzeugname",
+  Calls: "Aufrufe",
+  "Success Rate": "Erfolgsrate",
+  "Avg Duration": "Durchschn. Dauer",
+  "User Decision Summary": "Benutzerentscheidungs-Zusammenfassung",
+  "Total Reviewed Suggestions:": "Insgesamt überprüfter Vorschläge:",
+  " » Accepted:": " » Akzeptiert:",
+  " » Rejected:": " » Abgelehnt:",
+  " » Modified:": " » Geändert:",
+  " Overall Agreement Rate:": " Gesamtzustimmungsrate:",
+  "No tool calls have been made in this session.":
+    "In dieser Sitzung wurden keine Werkzeugaufrufe gemacht.",
+  "Session start time is unavailable, cannot calculate stats.":
+    "Sitzungsstartzeit nicht verfügbar, Statistiken können nicht berechnet werden.",
 
   // ============================================================================
   // Command Format Migration
   // ============================================================================
-  'Command Format Migration': 'Befehlsformat-Migration',
-  'Found {{count}} TOML command file:': '{{count}} TOML-Befehlsdatei gefunden:',
-  'Found {{count}} TOML command files:':
-    '{{count}} TOML-Befehlsdateien gefunden:',
-  '... and {{count}} more': '... und {{count}} weitere',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'Das TOML-Format ist veraltet. Möchten Sie sie ins Markdown-Format migrieren?',
-  '(Backups will be created and original files will be preserved)':
-    '(Backups werden erstellt und Originaldateien werden beibehalten)',
+  "Command Format Migration": "Befehlsformat-Migration",
+  "Found {{count}} TOML command file:": "{{count}} TOML-Befehlsdatei gefunden:",
+  "Found {{count}} TOML command files:": "{{count}} TOML-Befehlsdateien gefunden:",
+  "... and {{count}} more": "... und {{count}} weitere",
+  "The TOML format is deprecated. Would you like to migrate them to Markdown format?":
+    "Das TOML-Format ist veraltet. Möchten Sie sie ins Markdown-Format migrieren?",
+  "(Backups will be created and original files will be preserved)":
+    "(Backups werden erstellt und Originaldateien werden beibehalten)",
 
   // ============================================================================
   // Loading Phrases
   // ============================================================================
-  'Waiting for user confirmation...': 'Warten auf Benutzerbestätigung...',
-  '(esc to cancel, {{time}})': '(Esc zum Abbrechen, {{time}})',
+  "Waiting for user confirmation...": "Warten auf Benutzerbestätigung...",
+  "(esc to cancel, {{time}})": "(Esc zum Abbrechen, {{time}})",
 
   // ============================================================================
   // Loading Phrases
   // ============================================================================
   WITTY_LOADING_PHRASES: [
-    'Auf gut Glück!',
-    'Genialität wird ausgeliefert...',
-    'Die Serifen werden aufgemalt...',
-    'Durch den Schleimpilz navigieren...',
-    'Die digitalen Geister werden befragt...',
-    'Splines werden retikuliert...',
-    'Die KI-Hamster werden aufgewärmt...',
-    'Die Zaubermuschel wird befragt...',
-    'Witzige Erwiderung wird generiert...',
-    'Die Algorithmen werden poliert...',
-    'Perfektion braucht Zeit (mein Code auch)...',
-    'Frische Bytes werden gebrüht...',
-    'Elektronen werden gezählt...',
-    'Kognitive Prozessoren werden aktiviert...',
-    'Auf Syntaxfehler im Universum wird geprüft...',
-    'Einen Moment, Humor wird optimiert...',
-    'Pointen werden gemischt...',
-    'Neuronale Netze werden entwirrt...',
-    'Brillanz wird kompiliert...',
-    'wit.exe wird geladen...',
-    'Die Wolke der Weisheit wird beschworen...',
-    'Eine witzige Antwort wird vorbereitet...',
-    'Einen Moment, ich debugge die Realität...',
-    'Die Optionen werden verwirrt...',
-    'Kosmische Frequenzen werden eingestellt...',
-    'Eine Antwort wird erstellt, die Ihrer Geduld würdig ist...',
-    'Die Einsen und Nullen werden kompiliert...',
-    'Abhängigkeiten werden aufgelöst... und existenzielle Krisen...',
-    'Erinnerungen werden defragmentiert... sowohl RAM als auch persönliche...',
-    'Das Humor-Modul wird neu gestartet...',
-    'Das Wesentliche wird zwischengespeichert (hauptsächlich Katzen-Memes)...',
-    'Für lächerliche Geschwindigkeit wird optimiert',
-    'Bits werden getauscht... sagen Sie es nicht den Bytes...',
-    'Garbage Collection läuft... bin gleich zurück...',
-    'Das Internet wird zusammengebaut...',
-    'Kaffee wird in Code umgewandelt...',
-    'Die Syntax der Realität wird aktualisiert...',
-    'Die Synapsen werden neu verdrahtet...',
-    'Ein verlegtes Semikolon wird gesucht...',
-    'Die Zahnräder werden geschmiert...',
-    'Die Server werden vorgeheizt...',
-    'Der Fluxkompensator wird kalibriert...',
-    'Der Unwahrscheinlichkeitsantrieb wird aktiviert...',
-    'Die Macht wird kanalisiert...',
-    'Die Sterne werden für optimale Antwort ausgerichtet...',
-    'So sagen wir alle...',
-    'Die nächste große Idee wird geladen...',
-    'Einen Moment, ich bin in der Zone...',
-    'Bereite mich vor, Sie mit Brillanz zu blenden...',
-    'Einen Augenblick, ich poliere meinen Witz...',
-    'Halten Sie durch, ich erschaffe ein Meisterwerk...',
-    'Einen Moment, ich debugge das Universum...',
-    'Einen Moment, ich richte die Pixel aus...',
-    'Einen Moment, ich optimiere den Humor...',
-    'Einen Moment, ich tune die Algorithmen...',
-    'Warp-Geschwindigkeit aktiviert...',
-    'Mehr Dilithium-Kristalle werden gesucht...',
-    'Keine Panik...',
-    'Dem weißen Kaninchen wird gefolgt...',
-    'Die Wahrheit ist hier drin... irgendwo...',
-    'Auf die Kassette wird gepustet...',
-    'Ladevorgang... Machen Sie eine Fassrolle!',
-    'Auf den Respawn wird gewartet...',
-    'Der Kessel-Flug wird in weniger als 12 Parsec beendet...',
-    'Der Kuchen ist keine Lüge, er lädt nur noch...',
-    'Am Charaktererstellungsbildschirm wird herumgefummelt...',
-    'Einen Moment, ich suche das richtige Meme...',
+    "Auf gut Glück!",
+    "Genialität wird ausgeliefert...",
+    "Die Serifen werden aufgemalt...",
+    "Durch den Schleimpilz navigieren...",
+    "Die digitalen Geister werden befragt...",
+    "Splines werden retikuliert...",
+    "Die KI-Hamster werden aufgewärmt...",
+    "Die Zaubermuschel wird befragt...",
+    "Witzige Erwiderung wird generiert...",
+    "Die Algorithmen werden poliert...",
+    "Perfektion braucht Zeit (mein Code auch)...",
+    "Frische Bytes werden gebrüht...",
+    "Elektronen werden gezählt...",
+    "Kognitive Prozessoren werden aktiviert...",
+    "Auf Syntaxfehler im Universum wird geprüft...",
+    "Einen Moment, Humor wird optimiert...",
+    "Pointen werden gemischt...",
+    "Neuronale Netze werden entwirrt...",
+    "Brillanz wird kompiliert...",
+    "wit.exe wird geladen...",
+    "Die Wolke der Weisheit wird beschworen...",
+    "Eine witzige Antwort wird vorbereitet...",
+    "Einen Moment, ich debugge die Realität...",
+    "Die Optionen werden verwirrt...",
+    "Kosmische Frequenzen werden eingestellt...",
+    "Eine Antwort wird erstellt, die Ihrer Geduld würdig ist...",
+    "Die Einsen und Nullen werden kompiliert...",
+    "Abhängigkeiten werden aufgelöst... und existenzielle Krisen...",
+    "Erinnerungen werden defragmentiert... sowohl RAM als auch persönliche...",
+    "Das Humor-Modul wird neu gestartet...",
+    "Das Wesentliche wird zwischengespeichert (hauptsächlich Katzen-Memes)...",
+    "Für lächerliche Geschwindigkeit wird optimiert",
+    "Bits werden getauscht... sagen Sie es nicht den Bytes...",
+    "Garbage Collection läuft... bin gleich zurück...",
+    "Das Internet wird zusammengebaut...",
+    "Kaffee wird in Code umgewandelt...",
+    "Die Syntax der Realität wird aktualisiert...",
+    "Die Synapsen werden neu verdrahtet...",
+    "Ein verlegtes Semikolon wird gesucht...",
+    "Die Zahnräder werden geschmiert...",
+    "Die Server werden vorgeheizt...",
+    "Der Fluxkompensator wird kalibriert...",
+    "Der Unwahrscheinlichkeitsantrieb wird aktiviert...",
+    "Die Macht wird kanalisiert...",
+    "Die Sterne werden für optimale Antwort ausgerichtet...",
+    "So sagen wir alle...",
+    "Die nächste große Idee wird geladen...",
+    "Einen Moment, ich bin in der Zone...",
+    "Bereite mich vor, Sie mit Brillanz zu blenden...",
+    "Einen Augenblick, ich poliere meinen Witz...",
+    "Halten Sie durch, ich erschaffe ein Meisterwerk...",
+    "Einen Moment, ich debugge das Universum...",
+    "Einen Moment, ich richte die Pixel aus...",
+    "Einen Moment, ich optimiere den Humor...",
+    "Einen Moment, ich tune die Algorithmen...",
+    "Warp-Geschwindigkeit aktiviert...",
+    "Mehr Dilithium-Kristalle werden gesucht...",
+    "Keine Panik...",
+    "Dem weißen Kaninchen wird gefolgt...",
+    "Die Wahrheit ist hier drin... irgendwo...",
+    "Auf die Kassette wird gepustet...",
+    "Ladevorgang... Machen Sie eine Fassrolle!",
+    "Auf den Respawn wird gewartet...",
+    "Der Kessel-Flug wird in weniger als 12 Parsec beendet...",
+    "Der Kuchen ist keine Lüge, er lädt nur noch...",
+    "Am Charaktererstellungsbildschirm wird herumgefummelt...",
+    "Einen Moment, ich suche das richtige Meme...",
     "'A' wird zum Fortfahren gedrückt...",
-    'Digitale Katzen werden gehütet...',
-    'Die Pixel werden poliert...',
-    'Ein passender Ladebildschirm-Witz wird gesucht...',
-    'Ich lenke Sie mit diesem witzigen Spruch ab...',
-    'Fast da... wahrscheinlich...',
-    'Unsere Hamster arbeiten so schnell sie können...',
-    'Cloudy wird am Kopf gestreichelt...',
-    'Die Katze wird gestreichelt...',
-    'Meinen Chef rickrollen...',
-    'Never gonna give you up, never gonna let you down...',
-    'Auf den Bass wird geschlagen...',
-    'Die Schnozbeeren werden probiert...',
+    "Digitale Katzen werden gehütet...",
+    "Die Pixel werden poliert...",
+    "Ein passender Ladebildschirm-Witz wird gesucht...",
+    "Ich lenke Sie mit diesem witzigen Spruch ab...",
+    "Fast da... wahrscheinlich...",
+    "Unsere Hamster arbeiten so schnell sie können...",
+    "Cloudy wird am Kopf gestreichelt...",
+    "Die Katze wird gestreichelt...",
+    "Meinen Chef rickrollen...",
+    "Never gonna give you up, never gonna let you down...",
+    "Auf den Bass wird geschlagen...",
+    "Die Schnozbeeren werden probiert...",
     "I'm going the distance, I'm going for speed...",
-    'Ist dies das wahre Leben? Ist dies nur Fantasie?...',
-    'Ich habe ein gutes Gefühl dabei...',
-    'Den Bären wird gestupst...',
-    'Recherche zu den neuesten Memes...',
-    'Überlege, wie ich das witziger machen kann...',
-    'Hmmm... lassen Sie mich nachdenken...',
-    'Wie nennt man einen Fisch ohne Augen? Ein Fsh...',
-    'Warum ging der Computer zur Therapie? Er hatte zu viele Bytes...',
-    'Warum mögen Programmierer keine Natur? Sie hat zu viele Bugs...',
-    'Warum bevorzugen Programmierer den Dunkelmodus? Weil Licht Bugs anzieht...',
-    'Warum ging der Entwickler pleite? Er hat seinen ganzen Cache aufgebraucht...',
-    'Was kann man mit einem kaputten Bleistift machen? Nichts, er ist sinnlos...',
-    'Perkussive Wartung wird angewendet...',
-    'Die richtige USB-Ausrichtung wird gesucht...',
-    'Es wird sichergestellt, dass der magische Rauch in den Kabeln bleibt...',
-    'Versuche Vim zu beenden...',
-    'Das Hamsterrad wird angeworfen...',
-    'Das ist kein Bug, das ist ein undokumentiertes Feature...',
-    'Engage.',
-    'Ich komme wieder... mit einer Antwort.',
-    'Mein anderer Prozess ist eine TARDIS...',
-    'Mit dem Maschinengeist wird kommuniziert...',
-    'Die Gedanken marinieren lassen...',
-    'Gerade erinnert, wo ich meine Schlüssel hingelegt habe...',
-    'Über die Kugel wird nachgedacht...',
-    'Ich habe Dinge gesehen, die Sie nicht glauben würden... wie einen Benutzer, der Lademeldungen liest.',
-    'Nachdenklicher Blick wird initiiert...',
-    'Was ist der Lieblingssnack eines Computers? Mikrochips.',
-    'Warum tragen Java-Entwickler Brillen? Weil sie nicht C#.',
-    'Der Laser wird aufgeladen... pew pew!',
-    'Durch Null wird geteilt... nur Spaß!',
-    'Suche nach einem erwachsenen Aufseh... ich meine, Verarbeitung.',
-    'Es piept und boopt.',
-    'Pufferung... weil auch KIs einen Moment brauchen.',
-    'Quantenteilchen werden für schnellere Antwort verschränkt...',
-    'Das Chrom wird poliert... an den Algorithmen.',
-    'Sind Sie nicht unterhalten? (Arbeite daran!)',
-    'Die Code-Gremlins werden beschworen... zum Helfen, natürlich.',
-    'Warte nur auf das Einwahlton-Ende...',
-    'Das Humor-O-Meter wird neu kalibriert.',
-    'Mein anderer Ladebildschirm ist noch lustiger.',
-    'Ziemlich sicher, dass irgendwo eine Katze über die Tastatur läuft...',
-    'Verbessern... Verbessern... Lädt noch.',
-    'Das ist kein Bug, das ist ein Feature... dieses Ladebildschirms.',
-    'Haben Sie versucht, es aus- und wieder einzuschalten? (Den Ladebildschirm, nicht mich.)',
-    'Zusätzliche Pylonen werden gebaut...',
+    "Ist dies das wahre Leben? Ist dies nur Fantasie?...",
+    "Ich habe ein gutes Gefühl dabei...",
+    "Den Bären wird gestupst...",
+    "Recherche zu den neuesten Memes...",
+    "Überlege, wie ich das witziger machen kann...",
+    "Hmmm... lassen Sie mich nachdenken...",
+    "Wie nennt man einen Fisch ohne Augen? Ein Fsh...",
+    "Warum ging der Computer zur Therapie? Er hatte zu viele Bytes...",
+    "Warum mögen Programmierer keine Natur? Sie hat zu viele Bugs...",
+    "Warum bevorzugen Programmierer den Dunkelmodus? Weil Licht Bugs anzieht...",
+    "Warum ging der Entwickler pleite? Er hat seinen ganzen Cache aufgebraucht...",
+    "Was kann man mit einem kaputten Bleistift machen? Nichts, er ist sinnlos...",
+    "Perkussive Wartung wird angewendet...",
+    "Die richtige USB-Ausrichtung wird gesucht...",
+    "Es wird sichergestellt, dass der magische Rauch in den Kabeln bleibt...",
+    "Versuche Vim zu beenden...",
+    "Das Hamsterrad wird angeworfen...",
+    "Das ist kein Bug, das ist ein undokumentiertes Feature...",
+    "Engage.",
+    "Ich komme wieder... mit einer Antwort.",
+    "Mein anderer Prozess ist eine TARDIS...",
+    "Mit dem Maschinengeist wird kommuniziert...",
+    "Die Gedanken marinieren lassen...",
+    "Gerade erinnert, wo ich meine Schlüssel hingelegt habe...",
+    "Über die Kugel wird nachgedacht...",
+    "Ich habe Dinge gesehen, die Sie nicht glauben würden... wie einen Benutzer, der Lademeldungen liest.",
+    "Nachdenklicher Blick wird initiiert...",
+    "Was ist der Lieblingssnack eines Computers? Mikrochips.",
+    "Warum tragen Java-Entwickler Brillen? Weil sie nicht C#.",
+    "Der Laser wird aufgeladen... pew pew!",
+    "Durch Null wird geteilt... nur Spaß!",
+    "Suche nach einem erwachsenen Aufseh... ich meine, Verarbeitung.",
+    "Es piept und boopt.",
+    "Pufferung... weil auch KIs einen Moment brauchen.",
+    "Quantenteilchen werden für schnellere Antwort verschränkt...",
+    "Das Chrom wird poliert... an den Algorithmen.",
+    "Sind Sie nicht unterhalten? (Arbeite daran!)",
+    "Die Code-Gremlins werden beschworen... zum Helfen, natürlich.",
+    "Warte nur auf das Einwahlton-Ende...",
+    "Das Humor-O-Meter wird neu kalibriert.",
+    "Mein anderer Ladebildschirm ist noch lustiger.",
+    "Ziemlich sicher, dass irgendwo eine Katze über die Tastatur läuft...",
+    "Verbessern... Verbessern... Lädt noch.",
+    "Das ist kein Bug, das ist ein Feature... dieses Ladebildschirms.",
+    "Haben Sie versucht, es aus- und wieder einzuschalten? (Den Ladebildschirm, nicht mich.)",
+    "Zusätzliche Pylonen werden gebaut...",
   ],
 
   // ============================================================================
   // Extension Settings Input
   // ============================================================================
-  'Enter value...': 'Wert eingeben...',
-  'Enter sensitive value...': 'Sensiblen Wert eingeben...',
-  'Press Enter to submit, Escape to cancel':
-    'Enter zum Absenden, Escape zum Abbrechen drücken',
+  "Enter value...": "Wert eingeben...",
+  "Enter sensitive value...": "Sensiblen Wert eingeben...",
+  "Press Enter to submit, Escape to cancel": "Enter zum Absenden, Escape zum Abbrechen drücken",
 
   // ============================================================================
   // Command Migration Tool
   // ============================================================================
-  'Markdown file already exists: {{filename}}':
-    'Markdown-Datei existiert bereits: {{filename}}',
-  'TOML Command Format Deprecation Notice':
-    'TOML-Befehlsformat Veraltet-Hinweis',
-  'Found {{count}} command file(s) in TOML format:':
-    '{{count}} Befehlsdatei(en) im TOML-Format gefunden:',
-  'The TOML format for commands is being deprecated in favor of Markdown format.':
-    'Das TOML-Format für Befehle wird zugunsten des Markdown-Formats eingestellt.',
-  'Markdown format is more readable and easier to edit.':
-    'Das Markdown-Format ist lesbarer und einfacher zu bearbeiten.',
-  'You can migrate these files automatically using:':
-    'Sie können diese Dateien automatisch migrieren mit:',
-  'Or manually convert each file:': 'Oder jede Datei manuell konvertieren:',
-  'TOML: prompt = "..." / description = "..."':
-    'TOML: prompt = "..." / description = "..."',
-  'Markdown: YAML frontmatter + content': 'Markdown: YAML-Frontmatter + Inhalt',
-  'The migration tool will:': 'Das Migrationstool wird:',
-  'Convert TOML files to Markdown': 'TOML-Dateien in Markdown konvertieren',
-  'Create backups of original files':
-    'Sicherungen der Originaldateien erstellen',
-  'Preserve all command functionality': 'Alle Befehlsfunktionen beibehalten',
-  'TOML format will continue to work for now, but migration is recommended.':
-    'Das TOML-Format funktioniert vorerst weiter, aber eine Migration wird empfohlen.',
+  "Markdown file already exists: {{filename}}": "Markdown-Datei existiert bereits: {{filename}}",
+  "TOML Command Format Deprecation Notice": "TOML-Befehlsformat Veraltet-Hinweis",
+  "Found {{count}} command file(s) in TOML format:":
+    "{{count}} Befehlsdatei(en) im TOML-Format gefunden:",
+  "The TOML format for commands is being deprecated in favor of Markdown format.":
+    "Das TOML-Format für Befehle wird zugunsten des Markdown-Formats eingestellt.",
+  "Markdown format is more readable and easier to edit.":
+    "Das Markdown-Format ist lesbarer und einfacher zu bearbeiten.",
+  "You can migrate these files automatically using:":
+    "Sie können diese Dateien automatisch migrieren mit:",
+  "Or manually convert each file:": "Oder jede Datei manuell konvertieren:",
+  'TOML: prompt = "..." / description = "..."': 'TOML: prompt = "..." / description = "..."',
+  "Markdown: YAML frontmatter + content": "Markdown: YAML-Frontmatter + Inhalt",
+  "The migration tool will:": "Das Migrationstool wird:",
+  "Convert TOML files to Markdown": "TOML-Dateien in Markdown konvertieren",
+  "Create backups of original files": "Sicherungen der Originaldateien erstellen",
+  "Preserve all command functionality": "Alle Befehlsfunktionen beibehalten",
+  "TOML format will continue to work for now, but migration is recommended.":
+    "Das TOML-Format funktioniert vorerst weiter, aber eine Migration wird empfohlen.",
 
   // ============================================================================
   // Extensions - Explore Command
   // ============================================================================
-  'Open extensions page in your browser': 'Erweiterungsseite im Browser öffnen',
-  'Unknown extensions source: {{source}}.':
-    'Unbekannte Erweiterungsquelle: {{source}}.',
-  'Would open extensions page in your browser: {{url}} (skipped in test environment)':
-    'Würde Erweiterungsseite im Browser öffnen: {{url}} (übersprungen in Testumgebung)',
-  'View available extensions at {{url}}':
-    'Verfügbare Erweiterungen ansehen unter {{url}}',
-  'Opening extensions page in your browser: {{url}}':
-    'Erweiterungsseite wird im Browser geöffnet: {{url}}',
-  'Failed to open browser. Check out the extensions gallery at {{url}}':
-    'Browser konnte nicht geöffnet werden. Besuchen Sie die Erweiterungsgalerie unter {{url}}',
-  'Use /compress when the conversation gets long to summarize history and free up context.':
-    'Verwenden Sie /compress, wenn die Unterhaltung lang wird, um den Verlauf zusammenzufassen und Kontext freizugeben.',
-  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
-    'Starten Sie eine neue Idee mit /clear oder /new; die vorherige Sitzung bleibt im Verlauf verfügbar.',
-  'Use /bug to submit issues to the maintainers when something goes off.':
-    'Verwenden Sie /bug, um Probleme an die Betreuer zu melden, wenn etwas schiefgeht.',
-  'Switch auth type quickly with /auth.':
-    'Wechseln Sie den Authentifizierungstyp schnell mit /auth.',
-  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
-    'Sie können beliebige Shell-Befehle in Qwen Code mit ! ausführen (z. B. !ls).',
-  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
-    'Geben Sie / ein, um das Befehlsmenü zu öffnen; Tab vervollständigt Slash-Befehle und gespeicherte Prompts.',
-  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
-    'Sie können eine frühere Unterhaltung mit qwen --continue oder qwen --resume fortsetzen.',
-  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
-    'Sie können den Berechtigungsmodus schnell mit Shift+Tab oder /approval-mode wechseln.',
-  'You can switch permission mode quickly with Tab or /approval-mode.':
-    'Sie können den Berechtigungsmodus schnell mit Tab oder /approval-mode wechseln.',
-  'Try /insight to generate personalized insights from your chat history.':
-    'Probieren Sie /insight, um personalisierte Erkenntnisse aus Ihrem Chatverlauf zu erstellen.',
+  "Open extensions page in your browser": "Erweiterungsseite im Browser öffnen",
+  "Unknown extensions source: {{source}}.": "Unbekannte Erweiterungsquelle: {{source}}.",
+  "Would open extensions page in your browser: {{url}} (skipped in test environment)":
+    "Würde Erweiterungsseite im Browser öffnen: {{url}} (übersprungen in Testumgebung)",
+  "View available extensions at {{url}}": "Verfügbare Erweiterungen ansehen unter {{url}}",
+  "Opening extensions page in your browser: {{url}}":
+    "Erweiterungsseite wird im Browser geöffnet: {{url}}",
+  "Failed to open browser. Check out the extensions gallery at {{url}}":
+    "Browser konnte nicht geöffnet werden. Besuchen Sie die Erweiterungsgalerie unter {{url}}",
+  "Use /compress when the conversation gets long to summarize history and free up context.":
+    "Verwenden Sie /compress, wenn die Unterhaltung lang wird, um den Verlauf zusammenzufassen und Kontext freizugeben.",
+  "Start a fresh idea with /clear or /new; the previous session stays available in history.":
+    "Starten Sie eine neue Idee mit /clear oder /new; die vorherige Sitzung bleibt im Verlauf verfügbar.",
+  "Use /bug to submit issues to the maintainers when something goes off.":
+    "Verwenden Sie /bug, um Probleme an die Betreuer zu melden, wenn etwas schiefgeht.",
+  "Switch auth type quickly with /auth.":
+    "Wechseln Sie den Authentifizierungstyp schnell mit /auth.",
+  "You can run any shell commands from Qwen Code using ! (e.g. !ls).":
+    "Sie können beliebige Shell-Befehle in Qwen Code mit ! ausführen (z. B. !ls).",
+  "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.":
+    "Geben Sie / ein, um das Befehlsmenü zu öffnen; Tab vervollständigt Slash-Befehle und gespeicherte Prompts.",
+  "You can resume a previous conversation by running qwen --continue or qwen --resume.":
+    "Sie können eine frühere Unterhaltung mit qwen --continue oder qwen --resume fortsetzen.",
+  "You can switch permission mode quickly with Shift+Tab or /approval-mode.":
+    "Sie können den Berechtigungsmodus schnell mit Shift+Tab oder /approval-mode wechseln.",
+  "You can switch permission mode quickly with Tab or /approval-mode.":
+    "Sie können den Berechtigungsmodus schnell mit Tab oder /approval-mode wechseln.",
+  "Try /insight to generate personalized insights from your chat history.":
+    "Probieren Sie /insight, um personalisierte Erkenntnisse aus Ihrem Chatverlauf zu erstellen.",
 
   // ============================================================================
   // Custom API Key Configuration
   // ============================================================================
-  'You can configure your API key and models in settings.json':
-    'Sie können Ihren API-Schlüssel und Modelle in settings.json konfigurieren',
-  'Refer to the documentation for setup instructions':
-    'Einrichtungsanweisungen finden Sie in der Dokumentation',
+  "You can configure your API key and models in settings.json":
+    "Sie können Ihren API-Schlüssel und Modelle in settings.json konfigurieren",
+  "Refer to the documentation for setup instructions":
+    "Einrichtungsanweisungen finden Sie in der Dokumentation",
 
   // ============================================================================
   // Coding Plan Authentication
   // ============================================================================
-  'API key cannot be empty.': 'API-Schlüssel darf nicht leer sein.',
-  'You can get your Coding Plan API key here':
-    'Sie können Ihren Coding-Plan-API-Schlüssel hier erhalten',
-  'New model configurations are available for Alibaba Cloud Coding Plan. Update now?':
-    'Neue Modellkonfigurationen sind für Alibaba Cloud Coding Plan verfügbar. Jetzt aktualisieren?',
-  'Coding Plan configuration updated successfully. New models are now available.':
-    'Coding Plan-Konfiguration erfolgreich aktualisiert. Neue Modelle sind jetzt verfügbar.',
-  'Coding Plan API key not found. Please re-authenticate with Coding Plan.':
-    'Coding Plan API-Schlüssel nicht gefunden. Bitte authentifizieren Sie sich erneut mit Coding Plan.',
-  'Failed to update Coding Plan configuration: {{message}}':
-    'Fehler beim Aktualisieren der Coding Plan-Konfiguration: {{message}}',
+  "API key cannot be empty.": "API-Schlüssel darf nicht leer sein.",
+  "You can get your Coding Plan API key here":
+    "Sie können Ihren Coding-Plan-API-Schlüssel hier erhalten",
+  "New model configurations are available for Alibaba Cloud Coding Plan. Update now?":
+    "Neue Modellkonfigurationen sind für Alibaba Cloud Coding Plan verfügbar. Jetzt aktualisieren?",
+  "Coding Plan configuration updated successfully. New models are now available.":
+    "Coding Plan-Konfiguration erfolgreich aktualisiert. Neue Modelle sind jetzt verfügbar.",
+  "Coding Plan API key not found. Please re-authenticate with Coding Plan.":
+    "Coding Plan API-Schlüssel nicht gefunden. Bitte authentifizieren Sie sich erneut mit Coding Plan.",
+  "Failed to update Coding Plan configuration: {{message}}":
+    "Fehler beim Aktualisieren der Coding Plan-Konfiguration: {{message}}",
 
   // ============================================================================
   // Auth Dialog - View Titles and Labels
   // ============================================================================
-  'Coding Plan': 'Coding Plan',
+  "Coding Plan": "Coding Plan",
   "Paste your api key of ModelStudio Coding Plan and you're all set!":
-    'Fügen Sie Ihren ModelStudio Coding Plan API-Schlüssel ein und Sie sind bereit!',
-  Custom: 'Benutzerdefiniert',
-  'More instructions about configuring `modelProviders` manually.':
-    'Weitere Anweisungen zur manuellen Konfiguration von `modelProviders`.',
-  'Select API-KEY configuration mode:':
-    'API-KEY-Konfigurationsmodus auswählen:',
-  '(Press Escape to go back)': '(Escape drücken zum Zurückgehen)',
-  '(Press Enter to submit, Escape to cancel)':
-    '(Enter zum Absenden, Escape zum Abbrechen)',
-  'More instructions please check:': 'Weitere Anweisungen finden Sie unter:',
-  'Select Region for Coding Plan': 'Region für Coding Plan auswählen',
-  'Choose based on where your account is registered':
-    'Wählen Sie basierend auf dem Registrierungsort Ihres Kontos',
-  'Enter Coding Plan API Key': 'Coding-Plan-API-Schlüssel eingeben',
+    "Fügen Sie Ihren ModelStudio Coding Plan API-Schlüssel ein und Sie sind bereit!",
+  Custom: "Benutzerdefiniert",
+  "More instructions about configuring `modelProviders` manually.":
+    "Weitere Anweisungen zur manuellen Konfiguration von `modelProviders`.",
+  "Select API-KEY configuration mode:": "API-KEY-Konfigurationsmodus auswählen:",
+  "(Press Escape to go back)": "(Escape drücken zum Zurückgehen)",
+  "(Press Enter to submit, Escape to cancel)": "(Enter zum Absenden, Escape zum Abbrechen)",
+  "More instructions please check:": "Weitere Anweisungen finden Sie unter:",
+  "Select Region for Coding Plan": "Region für Coding Plan auswählen",
+  "Choose based on where your account is registered":
+    "Wählen Sie basierend auf dem Registrierungsort Ihres Kontos",
+  "Enter Coding Plan API Key": "Coding-Plan-API-Schlüssel eingeben",
 
   // ============================================================================
   // Coding Plan International Updates
   // ============================================================================
-  'New model configurations are available for {{region}}. Update now?':
-    'Neue Modellkonfigurationen sind für {{region}} verfügbar. Jetzt aktualisieren?',
+  "New model configurations are available for {{region}}. Update now?":
+    "Neue Modellkonfigurationen sind für {{region}} verfügbar. Jetzt aktualisieren?",
   '{{region}} configuration updated successfully. Model switched to "{{model}}".':
     '{{region}}-Konfiguration erfolgreich aktualisiert. Modell auf "{{model}}" umgeschaltet.',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).':
-    'Erfolgreich mit {{region}} authentifiziert. API-Schlüssel und Modellkonfigurationen wurden in settings.json gespeichert (gesichert).',
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).":
+    "Erfolgreich mit {{region}} authentifiziert. API-Schlüssel und Modellkonfigurationen wurden in settings.json gespeichert (gesichert).",
 
   // ============================================================================
   // Context Usage Component
   // ============================================================================
-  'Context Usage': 'Kontextnutzung',
-  'No API response yet. Send a message to see actual usage.':
-    'Noch keine API-Antwort. Senden Sie eine Nachricht, um die tatsächliche Nutzung anzuzeigen.',
-  'Estimated pre-conversation overhead':
-    'Geschätzte Vorabkosten vor der Unterhaltung',
-  'Context window': 'Kontextfenster',
-  tokens: 'Tokens',
-  Used: 'Verwendet',
-  Free: 'Frei',
-  'Autocompact buffer': 'Autokomprimierungs-Puffer',
-  'Usage by category': 'Verwendung nach Kategorie',
-  'System prompt': 'System-Prompt',
-  'Built-in tools': 'Integrierte Tools',
-  'MCP tools': 'MCP-Tools',
-  'Memory files': 'Speicherdateien',
-  Skills: 'Fähigkeiten',
-  Messages: 'Nachrichten',
-  'Show context window usage breakdown.':
-    'Zeigt die Aufschlüsselung der Kontextfenster-Nutzung an.',
-  'Run /context detail for per-item breakdown.':
-    'Führen Sie /context detail für eine Aufschlüsselung nach Elementen aus.',
-  active: 'aktiv',
-  'body loaded': 'Inhalt geladen',
-  memory: 'Speicher',
-  '{{region}} configuration updated successfully.':
-    '{{region}}-Konfiguration erfolgreich aktualisiert.',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.':
-    'Erfolgreich mit {{region}} authentifiziert. API-Schlüssel und Modellkonfigurationen wurden in settings.json gespeichert.',
-  'Tip: Use /model to switch between available Coding Plan models.':
-    'Tipp: Verwenden Sie /model, um zwischen verfügbaren Coding Plan-Modellen zu wechseln.',
+  "Context Usage": "Kontextnutzung",
+  "No API response yet. Send a message to see actual usage.":
+    "Noch keine API-Antwort. Senden Sie eine Nachricht, um die tatsächliche Nutzung anzuzeigen.",
+  "Estimated pre-conversation overhead": "Geschätzte Vorabkosten vor der Unterhaltung",
+  "Context window": "Kontextfenster",
+  tokens: "Tokens",
+  Used: "Verwendet",
+  Free: "Frei",
+  "Autocompact buffer": "Autokomprimierungs-Puffer",
+  "Usage by category": "Verwendung nach Kategorie",
+  "System prompt": "System-Prompt",
+  "Built-in tools": "Integrierte Tools",
+  "MCP tools": "MCP-Tools",
+  "Memory files": "Speicherdateien",
+  Skills: "Fähigkeiten",
+  Messages: "Nachrichten",
+  "Show context window usage breakdown.":
+    "Zeigt die Aufschlüsselung der Kontextfenster-Nutzung an.",
+  "Run /context detail for per-item breakdown.":
+    "Führen Sie /context detail für eine Aufschlüsselung nach Elementen aus.",
+  active: "aktiv",
+  "body loaded": "Inhalt geladen",
+  memory: "Speicher",
+  "{{region}} configuration updated successfully.":
+    "{{region}}-Konfiguration erfolgreich aktualisiert.",
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.":
+    "Erfolgreich mit {{region}} authentifiziert. API-Schlüssel und Modellkonfigurationen wurden in settings.json gespeichert.",
+  "Tip: Use /model to switch between available Coding Plan models.":
+    "Tipp: Verwenden Sie /model, um zwischen verfügbaren Coding Plan-Modellen zu wechseln.",
 
   // ============================================================================
   // Ask User Question Tool
   // ============================================================================
-  'Please answer the following question(s):':
-    'Bitte beantworten Sie die folgende(n) Frage(n):',
-  'Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.':
-    'Benutzerfragen können im nicht-interaktiven Modus nicht gestellt werden. Bitte führen Sie das Tool im interaktiven Modus aus.',
-  'User declined to answer the questions.':
-    'Benutzer hat die Beantwortung der Fragen abgelehnt.',
-  'User has provided the following answers:':
-    'Benutzer hat die folgenden Antworten bereitgestellt:',
-  'Failed to process user answers:':
-    'Fehler beim Verarbeiten der Benutzerantworten:',
-  'Type something...': 'Etwas eingeben...',
-  Submit: 'Senden',
-  'Submit answers': 'Antworten senden',
-  Cancel: 'Abbrechen',
-  'Your answers:': 'Ihre Antworten:',
-  '(not answered)': '(nicht beantwortet)',
-  'Ready to submit your answers?': 'Bereit, Ihre Antworten zu senden?',
-  '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select':
-    '↑/↓: Navigieren | ←/→: Tabs wechseln | Enter: Auswählen',
-  '↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Navigieren | ←/→: Tabs wechseln | Space/Enter: Umschalten | Esc: Abbrechen',
-  '↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Navigieren | Space/Enter: Umschalten | Esc: Abbrechen',
-  '↑/↓: Navigate | Enter: Select | Esc: Cancel':
-    '↑/↓: Navigieren | Enter: Auswählen | Esc: Abbrechen',
+  "Please answer the following question(s):": "Bitte beantworten Sie die folgende(n) Frage(n):",
+  "Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.":
+    "Benutzerfragen können im nicht-interaktiven Modus nicht gestellt werden. Bitte führen Sie das Tool im interaktiven Modus aus.",
+  "User declined to answer the questions.": "Benutzer hat die Beantwortung der Fragen abgelehnt.",
+  "User has provided the following answers:":
+    "Benutzer hat die folgenden Antworten bereitgestellt:",
+  "Failed to process user answers:": "Fehler beim Verarbeiten der Benutzerantworten:",
+  "Type something...": "Etwas eingeben...",
+  Submit: "Senden",
+  "Submit answers": "Antworten senden",
+  Cancel: "Abbrechen",
+  "Your answers:": "Ihre Antworten:",
+  "(not answered)": "(nicht beantwortet)",
+  "Ready to submit your answers?": "Bereit, Ihre Antworten zu senden?",
+  "↑/↓: Navigate | ←/→: Switch tabs | Enter: Select":
+    "↑/↓: Navigieren | ←/→: Tabs wechseln | Enter: Auswählen",
+  "↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Navigieren | ←/→: Tabs wechseln | Space/Enter: Umschalten | Esc: Abbrechen",
+  "↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Navigieren | Space/Enter: Umschalten | Esc: Abbrechen",
+  "↑/↓: Navigate | Enter: Select | Esc: Cancel":
+    "↑/↓: Navigieren | Enter: Auswählen | Esc: Abbrechen",
 
   // ============================================================================
   // Commands - Auth
   // ============================================================================
-  'Authenticate using Alibaba Cloud Coding Plan':
-    'Mit Alibaba Cloud Coding Plan authentifizieren',
-  'Region for Coding Plan (china/global)':
-    'Region für Coding Plan (china/global)',
-  'API key for Coding Plan': 'API-Schlüssel für Coding Plan',
-  'Show current authentication status':
-    'Aktuellen Authentifizierungsstatus anzeigen',
-  'Authentication completed successfully.':
-    'Authentifizierung erfolgreich abgeschlossen.',
-  'Processing Alibaba Cloud Coding Plan authentication...':
-    'Alibaba Cloud Coding Plan-Authentifizierung wird verarbeitet...',
-  'Successfully authenticated with Alibaba Cloud Coding Plan.':
-    'Erfolgreich mit Alibaba Cloud Coding Plan authentifiziert.',
-  'Failed to authenticate with Coding Plan: {{error}}':
-    'Authentifizierung mit Coding Plan fehlgeschlagen: {{error}}',
-  '中国 (China)': '中国 (China)',
-  '阿里云百炼 (aliyun.com)': '阿里云百炼 (aliyun.com)',
-  Global: 'Global',
-  'Alibaba Cloud (alibabacloud.com)': 'Alibaba Cloud (alibabacloud.com)',
-  'Select region for Coding Plan:': 'Region für Coding Plan auswählen:',
-  'Enter your Coding Plan API key: ':
-    'Geben Sie Ihren Coding Plan API-Schlüssel ein: ',
-  'Select authentication method:': 'Authentifizierungsmethode auswählen:',
-  '\n=== Authentication Status ===\n': '\n=== Authentifizierungsstatus ===\n',
-  '⚠️  No authentication method configured.\n':
-    '⚠️  Keine Authentifizierungsmethode konfiguriert.\n',
-  'Run one of the following commands to get started:\n':
-    'Führen Sie einen der folgenden Befehle aus, um zu beginnen:\n',
-  '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n':
-    '  qwen auth coding-plan      - Mit Alibaba Cloud Coding Plan authentifizieren\n',
-  'Or simply run:': 'Oder einfach ausführen:',
-  '  qwen auth                - Interactive authentication setup\n':
-    '  qwen auth                - Interaktive Authentifizierungseinrichtung\n',
-  '✓ Authentication Method: Alibaba Cloud Coding Plan':
-    '✓ Authentifizierungsmethode: Alibaba Cloud Coding Plan',
-  '中国 (China) - 阿里云百炼': '中国 (China) - 阿里云百炼',
-  'Global - Alibaba Cloud': 'Global - Alibaba Cloud',
-  '  Region: {{region}}': '  Region: {{region}}',
-  '  Current Model: {{model}}': '  Aktuelles Modell: {{model}}',
-  '  Config Version: {{version}}': '  Konfigurationsversion: {{version}}',
-  '  Status: API key configured\n': '  Status: API-Schlüssel konfiguriert\n',
-  '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)':
-    '⚠️  Authentifizierungsmethode: Alibaba Cloud Coding Plan (Unvollständig)',
-  '  Issue: API key not found in environment or settings\n':
-    '  Problem: API-Schlüssel nicht in Umgebung oder Einstellungen gefunden\n',
-  '  Run `qwen auth coding-plan` to re-configure.\n':
-    '  Führen Sie `qwen auth coding-plan` aus, um neu zu konfigurieren.\n',
-  '✓ Authentication Method: {{type}}': '✓ Authentifizierungsmethode: {{type}}',
-  '  Status: Configured\n': '  Status: Konfiguriert\n',
-  'Failed to check authentication status: {{error}}':
-    'Authentifizierungsstatus konnte nicht überprüft werden: {{error}}',
-  'Select an option:': 'Option auswählen:',
-  'Raw mode not available. Please run in an interactive terminal.':
-    'Raw-Modus nicht verfügbar. Bitte in einem interaktiven Terminal ausführen.',
-  '(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n':
-    '(↑ ↓ Pfeiltasten zum Navigieren, Enter zum Auswählen, Strg+C zum Beenden)\n',
-  verbose: 'ausführlich',
-  'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).':
-    'Vollständige Tool-Ausgabe und Denkprozess im ausführlichen Modus anzeigen (mit Strg+O umschalten).',
-  'Press Ctrl+O to show full tool output':
-    'Strg+O für vollständige Tool-Ausgabe drücken',
+  "Authenticate using Alibaba Cloud Coding Plan": "Mit Alibaba Cloud Coding Plan authentifizieren",
+  "Region for Coding Plan (china/global)": "Region für Coding Plan (china/global)",
+  "API key for Coding Plan": "API-Schlüssel für Coding Plan",
+  "Show current authentication status": "Aktuellen Authentifizierungsstatus anzeigen",
+  "Authentication completed successfully.": "Authentifizierung erfolgreich abgeschlossen.",
+  "Processing Alibaba Cloud Coding Plan authentication...":
+    "Alibaba Cloud Coding Plan-Authentifizierung wird verarbeitet...",
+  "Successfully authenticated with Alibaba Cloud Coding Plan.":
+    "Erfolgreich mit Alibaba Cloud Coding Plan authentifiziert.",
+  "Failed to authenticate with Coding Plan: {{error}}":
+    "Authentifizierung mit Coding Plan fehlgeschlagen: {{error}}",
+  "中国 (China)": "中国 (China)",
+  "阿里云百炼 (aliyun.com)": "阿里云百炼 (aliyun.com)",
+  Global: "Global",
+  "Alibaba Cloud (alibabacloud.com)": "Alibaba Cloud (alibabacloud.com)",
+  "Select region for Coding Plan:": "Region für Coding Plan auswählen:",
+  "Enter your Coding Plan API key: ": "Geben Sie Ihren Coding Plan API-Schlüssel ein: ",
+  "Select authentication method:": "Authentifizierungsmethode auswählen:",
+  "\n=== Authentication Status ===\n": "\n=== Authentifizierungsstatus ===\n",
+  "⚠️  No authentication method configured.\n": "⚠️  Keine Authentifizierungsmethode konfiguriert.\n",
+  "Run one of the following commands to get started:\n":
+    "Führen Sie einen der folgenden Befehle aus, um zu beginnen:\n",
+  "  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n":
+    "  qwen auth coding-plan      - Mit Alibaba Cloud Coding Plan authentifizieren\n",
+  "Or simply run:": "Oder einfach ausführen:",
+  "  qwen auth                - Interactive authentication setup\n":
+    "  qwen auth                - Interaktive Authentifizierungseinrichtung\n",
+  "✓ Authentication Method: Alibaba Cloud Coding Plan":
+    "✓ Authentifizierungsmethode: Alibaba Cloud Coding Plan",
+  "中国 (China) - 阿里云百炼": "中国 (China) - 阿里云百炼",
+  "Global - Alibaba Cloud": "Global - Alibaba Cloud",
+  "  Region: {{region}}": "  Region: {{region}}",
+  "  Current Model: {{model}}": "  Aktuelles Modell: {{model}}",
+  "  Config Version: {{version}}": "  Konfigurationsversion: {{version}}",
+  "  Status: API key configured\n": "  Status: API-Schlüssel konfiguriert\n",
+  "⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)":
+    "⚠️  Authentifizierungsmethode: Alibaba Cloud Coding Plan (Unvollständig)",
+  "  Issue: API key not found in environment or settings\n":
+    "  Problem: API-Schlüssel nicht in Umgebung oder Einstellungen gefunden\n",
+  "  Run `qwen auth coding-plan` to re-configure.\n":
+    "  Führen Sie `qwen auth coding-plan` aus, um neu zu konfigurieren.\n",
+  "✓ Authentication Method: {{type}}": "✓ Authentifizierungsmethode: {{type}}",
+  "  Status: Configured\n": "  Status: Konfiguriert\n",
+  "Failed to check authentication status: {{error}}":
+    "Authentifizierungsstatus konnte nicht überprüft werden: {{error}}",
+  "Select an option:": "Option auswählen:",
+  "Raw mode not available. Please run in an interactive terminal.":
+    "Raw-Modus nicht verfügbar. Bitte in einem interaktiven Terminal ausführen.",
+  "(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n":
+    "(↑ ↓ Pfeiltasten zum Navigieren, Enter zum Auswählen, Strg+C zum Beenden)\n",
+  verbose: "ausführlich",
+  "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).":
+    "Vollständige Tool-Ausgabe und Denkprozess im ausführlichen Modus anzeigen (mit Strg+O umschalten).",
+  "Press Ctrl+O to show full tool output": "Strg+O für vollständige Tool-Ausgabe drücken",
 
-  'Switch to plan mode or exit plan mode':
-    'Switch to plan mode or exit plan mode',
-  'Exited plan mode. Previous approval mode restored.':
-    'Exited plan mode. Previous approval mode restored.',
-  'Enabled plan mode. The agent will analyze and plan without executing tools.':
-    'Enabled plan mode. The agent will analyze and plan without executing tools.',
+  "Switch to plan mode or exit plan mode": "Switch to plan mode or exit plan mode",
+  "Exited plan mode. Previous approval mode restored.":
+    "Exited plan mode. Previous approval mode restored.",
+  "Enabled plan mode. The agent will analyze and plan without executing tools.":
+    "Enabled plan mode. The agent will analyze and plan without executing tools.",
   'Already in plan mode. Use "/plan exit" to exit plan mode.':
     'Already in plan mode. Use "/plan exit" to exit plan mode.',
   'Not in plan mode. Use "/plan" to enter plan mode first.':
diff --git a/apps/airiscode-cli/src/i18n/locales/en.js b/apps/airiscode-cli/src/i18n/locales/en.js
index a256c3a65..25af8c825 100644
--- a/apps/airiscode-cli/src/i18n/locales/en.js
+++ b/apps/airiscode-cli/src/i18n/locales/en.js
@@ -12,1238 +12,1154 @@ export default {
   // Help / UI Components
   // ============================================================================
   // Attachment hints
-  '↑ to manage attachments': '↑ to manage attachments',
-  '← → select, Delete to remove, ↓ to exit':
-    '← → select, Delete to remove, ↓ to exit',
-  'Attachments: ': 'Attachments: ',
+  "↑ to manage attachments": "↑ to manage attachments",
+  "← → select, Delete to remove, ↓ to exit": "← → select, Delete to remove, ↓ to exit",
+  "Attachments: ": "Attachments: ",
 
-  'Basics:': 'Basics:',
-  'Add context': 'Add context',
-  'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.':
-    'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.',
-  '@': '@',
-  '@src/myFile.ts': '@src/myFile.ts',
-  'Shell mode': 'Shell mode',
-  'YOLO mode': 'YOLO mode',
-  'plan mode': 'plan mode',
-  'auto-accept edits': 'auto-accept edits',
-  'Accepting edits': 'Accepting edits',
-  '(shift + tab to cycle)': '(shift + tab to cycle)',
-  '(tab to cycle)': '(tab to cycle)',
-  'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).':
-    'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).',
-  '!': '!',
-  '!npm run start': '!npm run start',
-  'start server': 'start server',
-  'Commands:': 'Commands:',
-  'shell command': 'shell command',
-  'Model Context Protocol command (from external servers)':
-    'Model Context Protocol command (from external servers)',
-  'Keyboard Shortcuts:': 'Keyboard Shortcuts:',
-  'Toggle this help display': 'Toggle this help display',
-  'Toggle shell mode': 'Toggle shell mode',
-  'Open command menu': 'Open command menu',
-  'Add file context': 'Add file context',
-  'Accept suggestion / Autocomplete': 'Accept suggestion / Autocomplete',
-  'Reverse search history': 'Reverse search history',
-  'Press ? again to close': 'Press ? again to close',
+  "Basics:": "Basics:",
+  "Add context": "Add context",
+  "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.":
+    "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.",
+  "@": "@",
+  "@src/myFile.ts": "@src/myFile.ts",
+  "Shell mode": "Shell mode",
+  "YOLO mode": "YOLO mode",
+  "plan mode": "plan mode",
+  "auto-accept edits": "auto-accept edits",
+  "Accepting edits": "Accepting edits",
+  "(shift + tab to cycle)": "(shift + tab to cycle)",
+  "(tab to cycle)": "(tab to cycle)",
+  "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).":
+    "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).",
+  "!": "!",
+  "!npm run start": "!npm run start",
+  "start server": "start server",
+  "Commands:": "Commands:",
+  "shell command": "shell command",
+  "Model Context Protocol command (from external servers)":
+    "Model Context Protocol command (from external servers)",
+  "Keyboard Shortcuts:": "Keyboard Shortcuts:",
+  "Toggle this help display": "Toggle this help display",
+  "Toggle shell mode": "Toggle shell mode",
+  "Open command menu": "Open command menu",
+  "Add file context": "Add file context",
+  "Accept suggestion / Autocomplete": "Accept suggestion / Autocomplete",
+  "Reverse search history": "Reverse search history",
+  "Press ? again to close": "Press ? again to close",
   // Keyboard shortcuts panel descriptions
-  'for shell mode': 'for shell mode',
-  'for commands': 'for commands',
-  'for file paths': 'for file paths',
-  'to clear input': 'to clear input',
-  'to cycle approvals': 'to cycle approvals',
-  'to quit': 'to quit',
-  'for newline': 'for newline',
-  'to clear screen': 'to clear screen',
-  'to search history': 'to search history',
-  'to paste images': 'to paste images',
-  'for external editor': 'for external editor',
-  'Jump through words in the input': 'Jump through words in the input',
-  'Close dialogs, cancel requests, or quit application':
-    'Close dialogs, cancel requests, or quit application',
-  'New line': 'New line',
-  'New line (Alt+Enter works for certain linux distros)':
-    'New line (Alt+Enter works for certain linux distros)',
-  'Clear the screen': 'Clear the screen',
-  'Open input in external editor': 'Open input in external editor',
-  'Send message': 'Send message',
-  'Initializing...': 'Initializing...',
-  'Connecting to MCP servers... ({{connected}}/{{total}})':
-    'Connecting to MCP servers... ({{connected}}/{{total}})',
-  'Type your message or @path/to/file': 'Type your message or @path/to/file',
-  '? for shortcuts': '? for shortcuts',
+  "for shell mode": "for shell mode",
+  "for commands": "for commands",
+  "for file paths": "for file paths",
+  "to clear input": "to clear input",
+  "to cycle approvals": "to cycle approvals",
+  "to quit": "to quit",
+  "for newline": "for newline",
+  "to clear screen": "to clear screen",
+  "to search history": "to search history",
+  "to paste images": "to paste images",
+  "for external editor": "for external editor",
+  "Jump through words in the input": "Jump through words in the input",
+  "Close dialogs, cancel requests, or quit application":
+    "Close dialogs, cancel requests, or quit application",
+  "New line": "New line",
+  "New line (Alt+Enter works for certain linux distros)":
+    "New line (Alt+Enter works for certain linux distros)",
+  "Clear the screen": "Clear the screen",
+  "Open input in external editor": "Open input in external editor",
+  "Send message": "Send message",
+  "Initializing...": "Initializing...",
+  "Connecting to MCP servers... ({{connected}}/{{total}})":
+    "Connecting to MCP servers... ({{connected}}/{{total}})",
+  "Type your message or @path/to/file": "Type your message or @path/to/file",
+  "? for shortcuts": "? for shortcuts",
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.",
-  'Cancel operation / Clear input (double press)':
-    'Cancel operation / Clear input (double press)',
-  'Cycle approval modes': 'Cycle approval modes',
-  'Cycle through your prompt history': 'Cycle through your prompt history',
-  'For a full list of shortcuts, see {{docPath}}':
-    'For a full list of shortcuts, see {{docPath}}',
-  'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md',
-  'for help on Qwen Code': 'for help on Qwen Code',
-  'show version info': 'show version info',
-  'submit a bug report': 'submit a bug report',
-  'About Qwen Code': 'About Qwen Code',
-  Status: 'Status',
+  "Cancel operation / Clear input (double press)": "Cancel operation / Clear input (double press)",
+  "Cycle approval modes": "Cycle approval modes",
+  "Cycle through your prompt history": "Cycle through your prompt history",
+  "For a full list of shortcuts, see {{docPath}}": "For a full list of shortcuts, see {{docPath}}",
+  "docs/keyboard-shortcuts.md": "docs/keyboard-shortcuts.md",
+  "for help on Qwen Code": "for help on Qwen Code",
+  "show version info": "show version info",
+  "submit a bug report": "submit a bug report",
+  "About Qwen Code": "About Qwen Code",
+  Status: "Status",
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
-  'Qwen Code': 'Qwen Code',
-  Runtime: 'Runtime',
-  OS: 'OS',
-  Auth: 'Auth',
-  'CLI Version': 'CLI Version',
-  'Git Commit': 'Git Commit',
-  Model: 'Model',
-  'Fast Model': 'Fast Model',
-  Sandbox: 'Sandbox',
-  'OS Platform': 'OS Platform',
-  'OS Arch': 'OS Arch',
-  'OS Release': 'OS Release',
-  'Node.js Version': 'Node.js Version',
-  'NPM Version': 'NPM Version',
-  'Session ID': 'Session ID',
-  'Auth Method': 'Auth Method',
-  'Base URL': 'Base URL',
-  Proxy: 'Proxy',
-  'Memory Usage': 'Memory Usage',
-  'IDE Client': 'IDE Client',
+  "Qwen Code": "Qwen Code",
+  Runtime: "Runtime",
+  OS: "OS",
+  Auth: "Auth",
+  "CLI Version": "CLI Version",
+  "Git Commit": "Git Commit",
+  Model: "Model",
+  "Fast Model": "Fast Model",
+  Sandbox: "Sandbox",
+  "OS Platform": "OS Platform",
+  "OS Arch": "OS Arch",
+  "OS Release": "OS Release",
+  "Node.js Version": "Node.js Version",
+  "NPM Version": "NPM Version",
+  "Session ID": "Session ID",
+  "Auth Method": "Auth Method",
+  "Base URL": "Base URL",
+  Proxy: "Proxy",
+  "Memory Usage": "Memory Usage",
+  "IDE Client": "IDE Client",
 
   // ============================================================================
   // Commands - General
   // ============================================================================
-  'Analyzes the project and creates a tailored QWEN.md file.':
-    'Analyzes the project and creates a tailored QWEN.md file.',
-  'List available Qwen Code tools. Usage: /tools [desc]':
-    'List available Qwen Code tools. Usage: /tools [desc]',
-  'List available skills.': 'List available skills.',
-  'Available Qwen Code CLI tools:': 'Available Qwen Code CLI tools:',
-  'No tools available': 'No tools available',
-  'View or change the approval mode for tool usage':
-    'View or change the approval mode for tool usage',
+  "Analyzes the project and creates a tailored QWEN.md file.":
+    "Analyzes the project and creates a tailored QWEN.md file.",
+  "List available Qwen Code tools. Usage: /tools [desc]":
+    "List available Qwen Code tools. Usage: /tools [desc]",
+  "List available skills.": "List available skills.",
+  "Available Qwen Code CLI tools:": "Available Qwen Code CLI tools:",
+  "No tools available": "No tools available",
+  "View or change the approval mode for tool usage":
+    "View or change the approval mode for tool usage",
   'Invalid approval mode "{{arg}}". Valid modes: {{modes}}':
     'Invalid approval mode "{{arg}}". Valid modes: {{modes}}',
   'Approval mode set to "{{mode}}"': 'Approval mode set to "{{mode}}"',
-  'View or change the language setting': 'View or change the language setting',
-  'change the theme': 'change the theme',
-  'Select Theme': 'Select Theme',
-  Preview: 'Preview',
-  '(Use Enter to select, Tab to configure scope)':
-    '(Use Enter to select, Tab to configure scope)',
-  '(Use Enter to apply scope, Tab to go back)':
-    '(Use Enter to apply scope, Tab to go back)',
-  'Theme configuration unavailable due to NO_COLOR env variable.':
-    'Theme configuration unavailable due to NO_COLOR env variable.',
+  "View or change the language setting": "View or change the language setting",
+  "change the theme": "change the theme",
+  "Select Theme": "Select Theme",
+  Preview: "Preview",
+  "(Use Enter to select, Tab to configure scope)": "(Use Enter to select, Tab to configure scope)",
+  "(Use Enter to apply scope, Tab to go back)": "(Use Enter to apply scope, Tab to go back)",
+  "Theme configuration unavailable due to NO_COLOR env variable.":
+    "Theme configuration unavailable due to NO_COLOR env variable.",
   'Theme "{{themeName}}" not found.': 'Theme "{{themeName}}" not found.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Theme "{{themeName}}" not found in selected scope.',
-  'Clear conversation history and free up context':
-    'Clear conversation history and free up context',
-  'Compresses the context by replacing it with a summary.':
-    'Compresses the context by replacing it with a summary.',
-  'open full Qwen Code documentation in your browser':
-    'open full Qwen Code documentation in your browser',
-  'Configuration not available.': 'Configuration not available.',
-  'change the auth method': 'change the auth method',
-  'Configure authentication information for login':
-    'Configure authentication information for login',
-  'Copy the last result or code snippet to clipboard':
-    'Copy the last result or code snippet to clipboard',
+  "Clear conversation history and free up context":
+    "Clear conversation history and free up context",
+  "Compresses the context by replacing it with a summary.":
+    "Compresses the context by replacing it with a summary.",
+  "open full Qwen Code documentation in your browser":
+    "open full Qwen Code documentation in your browser",
+  "Configuration not available.": "Configuration not available.",
+  "change the auth method": "change the auth method",
+  "Configure authentication information for login":
+    "Configure authentication information for login",
+  "Copy the last result or code snippet to clipboard":
+    "Copy the last result or code snippet to clipboard",
 
   // ============================================================================
   // Commands - Agents
   // ============================================================================
-  'Manage subagents for specialized task delegation.':
-    'Manage subagents for specialized task delegation.',
-  'Manage existing subagents (view, edit, delete).':
-    'Manage existing subagents (view, edit, delete).',
-  'Create a new subagent with guided setup.':
-    'Create a new subagent with guided setup.',
+  "Manage subagents for specialized task delegation.":
+    "Manage subagents for specialized task delegation.",
+  "Manage existing subagents (view, edit, delete).":
+    "Manage existing subagents (view, edit, delete).",
+  "Create a new subagent with guided setup.": "Create a new subagent with guided setup.",
 
   // ============================================================================
   // Agents - Management Dialog
   // ============================================================================
-  Agents: 'Agents',
-  'Choose Action': 'Choose Action',
-  'Edit {{name}}': 'Edit {{name}}',
-  'Edit Tools: {{name}}': 'Edit Tools: {{name}}',
-  'Edit Color: {{name}}': 'Edit Color: {{name}}',
-  'Delete {{name}}': 'Delete {{name}}',
-  'Unknown Step': 'Unknown Step',
-  'Esc to close': 'Esc to close',
-  'Enter to select, ↑↓ to navigate, Esc to close':
-    'Enter to select, ↑↓ to navigate, Esc to close',
-  'Esc to go back': 'Esc to go back',
-  'Enter to confirm, Esc to cancel': 'Enter to confirm, Esc to cancel',
-  'Enter to select, ↑↓ to navigate, Esc to go back':
-    'Enter to select, ↑↓ to navigate, Esc to go back',
-  'Enter to submit, Esc to go back': 'Enter to submit, Esc to go back',
-  'Invalid step: {{step}}': 'Invalid step: {{step}}',
-  'No subagents found.': 'No subagents found.',
+  Agents: "Agents",
+  "Choose Action": "Choose Action",
+  "Edit {{name}}": "Edit {{name}}",
+  "Edit Tools: {{name}}": "Edit Tools: {{name}}",
+  "Edit Color: {{name}}": "Edit Color: {{name}}",
+  "Delete {{name}}": "Delete {{name}}",
+  "Unknown Step": "Unknown Step",
+  "Esc to close": "Esc to close",
+  "Enter to select, ↑↓ to navigate, Esc to close": "Enter to select, ↑↓ to navigate, Esc to close",
+  "Esc to go back": "Esc to go back",
+  "Enter to confirm, Esc to cancel": "Enter to confirm, Esc to cancel",
+  "Enter to select, ↑↓ to navigate, Esc to go back":
+    "Enter to select, ↑↓ to navigate, Esc to go back",
+  "Enter to submit, Esc to go back": "Enter to submit, Esc to go back",
+  "Invalid step: {{step}}": "Invalid step: {{step}}",
+  "No subagents found.": "No subagents found.",
   "Use '/agents create' to create your first subagent.":
     "Use '/agents create' to create your first subagent.",
-  '(built-in)': '(built-in)',
-  '(overridden by project level agent)': '(overridden by project level agent)',
-  'Project Level ({{path}})': 'Project Level ({{path}})',
-  'User Level ({{path}})': 'User Level ({{path}})',
-  'Built-in Agents': 'Built-in Agents',
-  'Extension Agents': 'Extension Agents',
-  'Using: {{count}} agents': 'Using: {{count}} agents',
-  'View Agent': 'View Agent',
-  'Edit Agent': 'Edit Agent',
-  'Delete Agent': 'Delete Agent',
-  Back: 'Back',
-  'No agent selected': 'No agent selected',
-  'File Path: ': 'File Path: ',
-  'Tools: ': 'Tools: ',
-  'Color: ': 'Color: ',
-  'Description:': 'Description:',
-  'System Prompt:': 'System Prompt:',
-  'Open in editor': 'Open in editor',
-  'Edit tools': 'Edit tools',
-  'Edit color': 'Edit color',
-  '❌ Error:': '❌ Error:',
+  "(built-in)": "(built-in)",
+  "(overridden by project level agent)": "(overridden by project level agent)",
+  "Project Level ({{path}})": "Project Level ({{path}})",
+  "User Level ({{path}})": "User Level ({{path}})",
+  "Built-in Agents": "Built-in Agents",
+  "Extension Agents": "Extension Agents",
+  "Using: {{count}} agents": "Using: {{count}} agents",
+  "View Agent": "View Agent",
+  "Edit Agent": "Edit Agent",
+  "Delete Agent": "Delete Agent",
+  Back: "Back",
+  "No agent selected": "No agent selected",
+  "File Path: ": "File Path: ",
+  "Tools: ": "Tools: ",
+  "Color: ": "Color: ",
+  "Description:": "Description:",
+  "System Prompt:": "System Prompt:",
+  "Open in editor": "Open in editor",
+  "Edit tools": "Edit tools",
+  "Edit color": "Edit color",
+  "❌ Error:": "❌ Error:",
   'Are you sure you want to delete agent "{{name}}"?':
     'Are you sure you want to delete agent "{{name}}"?',
   // ============================================================================
   // Agents - Creation Wizard
   // ============================================================================
-  'Project Level (.qwen/agents/)': 'Project Level (.qwen/agents/)',
-  'User Level (~/.qwen/agents/)': 'User Level (~/.qwen/agents/)',
-  '✅ Subagent Created Successfully!': '✅ Subagent Created Successfully!',
+  "Project Level (.qwen/agents/)": "Project Level (.qwen/agents/)",
+  "User Level (~/.qwen/agents/)": "User Level (~/.qwen/agents/)",
+  "✅ Subagent Created Successfully!": "✅ Subagent Created Successfully!",
   'Subagent "{{name}}" has been saved to {{level}} level.':
     'Subagent "{{name}}" has been saved to {{level}} level.',
-  'Name: ': 'Name: ',
-  'Location: ': 'Location: ',
-  '❌ Error saving subagent:': '❌ Error saving subagent:',
-  'Warnings:': 'Warnings:',
+  "Name: ": "Name: ",
+  "Location: ": "Location: ",
+  "❌ Error saving subagent:": "❌ Error saving subagent:",
+  "Warnings:": "Warnings:",
   'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent':
     'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent',
   'Name "{{name}}" exists at user level - project level will take precedence':
     'Name "{{name}}" exists at user level - project level will take precedence',
   'Name "{{name}}" exists at project level - existing subagent will take precedence':
     'Name "{{name}}" exists at project level - existing subagent will take precedence',
-  'Description is over {{length}} characters':
-    'Description is over {{length}} characters',
-  'System prompt is over {{length}} characters':
-    'System prompt is over {{length}} characters',
+  "Description is over {{length}} characters": "Description is over {{length}} characters",
+  "System prompt is over {{length}} characters": "System prompt is over {{length}} characters",
   // Agents - Creation Wizard Steps
-  'Step {{n}}: Choose Location': 'Step {{n}}: Choose Location',
-  'Step {{n}}: Choose Generation Method':
-    'Step {{n}}: Choose Generation Method',
-  'Generate with Qwen Code (Recommended)':
-    'Generate with Qwen Code (Recommended)',
-  'Manual Creation': 'Manual Creation',
-  'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)':
-    'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)',
-  'e.g., Expert code reviewer that reviews code based on best practices...':
-    'e.g., Expert code reviewer that reviews code based on best practices...',
-  'Generating subagent configuration...':
-    'Generating subagent configuration...',
-  'Failed to generate subagent: {{error}}':
-    'Failed to generate subagent: {{error}}',
-  'Step {{n}}: Describe Your Subagent': 'Step {{n}}: Describe Your Subagent',
-  'Step {{n}}: Enter Subagent Name': 'Step {{n}}: Enter Subagent Name',
-  'Step {{n}}: Enter System Prompt': 'Step {{n}}: Enter System Prompt',
-  'Step {{n}}: Enter Description': 'Step {{n}}: Enter Description',
+  "Step {{n}}: Choose Location": "Step {{n}}: Choose Location",
+  "Step {{n}}: Choose Generation Method": "Step {{n}}: Choose Generation Method",
+  "Generate with Qwen Code (Recommended)": "Generate with Qwen Code (Recommended)",
+  "Manual Creation": "Manual Creation",
+  "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)":
+    "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)",
+  "e.g., Expert code reviewer that reviews code based on best practices...":
+    "e.g., Expert code reviewer that reviews code based on best practices...",
+  "Generating subagent configuration...": "Generating subagent configuration...",
+  "Failed to generate subagent: {{error}}": "Failed to generate subagent: {{error}}",
+  "Step {{n}}: Describe Your Subagent": "Step {{n}}: Describe Your Subagent",
+  "Step {{n}}: Enter Subagent Name": "Step {{n}}: Enter Subagent Name",
+  "Step {{n}}: Enter System Prompt": "Step {{n}}: Enter System Prompt",
+  "Step {{n}}: Enter Description": "Step {{n}}: Enter Description",
   // Agents - Tool Selection
-  'Step {{n}}: Select Tools': 'Step {{n}}: Select Tools',
-  'All Tools (Default)': 'All Tools (Default)',
-  'All Tools': 'All Tools',
-  'Read-only Tools': 'Read-only Tools',
-  'Read & Edit Tools': 'Read & Edit Tools',
-  'Read & Edit & Execution Tools': 'Read & Edit & Execution Tools',
-  'All tools selected, including MCP tools':
-    'All tools selected, including MCP tools',
-  'Selected tools:': 'Selected tools:',
-  'Read-only tools:': 'Read-only tools:',
-  'Edit tools:': 'Edit tools:',
-  'Execution tools:': 'Execution tools:',
-  'Step {{n}}: Choose Background Color': 'Step {{n}}: Choose Background Color',
-  'Step {{n}}: Confirm and Save': 'Step {{n}}: Confirm and Save',
+  "Step {{n}}: Select Tools": "Step {{n}}: Select Tools",
+  "All Tools (Default)": "All Tools (Default)",
+  "All Tools": "All Tools",
+  "Read-only Tools": "Read-only Tools",
+  "Read & Edit Tools": "Read & Edit Tools",
+  "Read & Edit & Execution Tools": "Read & Edit & Execution Tools",
+  "All tools selected, including MCP tools": "All tools selected, including MCP tools",
+  "Selected tools:": "Selected tools:",
+  "Read-only tools:": "Read-only tools:",
+  "Edit tools:": "Edit tools:",
+  "Execution tools:": "Execution tools:",
+  "Step {{n}}: Choose Background Color": "Step {{n}}: Choose Background Color",
+  "Step {{n}}: Confirm and Save": "Step {{n}}: Confirm and Save",
   // Agents - Navigation & Instructions
-  'Esc to cancel': 'Esc to cancel',
-  'Press Enter to save, e to save and edit, Esc to go back':
-    'Press Enter to save, e to save and edit, Esc to go back',
-  'Press Enter to continue, {{navigation}}Esc to {{action}}':
-    'Press Enter to continue, {{navigation}}Esc to {{action}}',
-  cancel: 'cancel',
-  'go back': 'go back',
-  '↑↓ to navigate, ': '↑↓ to navigate, ',
-  'Enter a clear, unique name for this subagent.':
-    'Enter a clear, unique name for this subagent.',
-  'e.g., Code Reviewer': 'e.g., Code Reviewer',
-  'Name cannot be empty.': 'Name cannot be empty.',
+  "Esc to cancel": "Esc to cancel",
+  "Press Enter to save, e to save and edit, Esc to go back":
+    "Press Enter to save, e to save and edit, Esc to go back",
+  "Press Enter to continue, {{navigation}}Esc to {{action}}":
+    "Press Enter to continue, {{navigation}}Esc to {{action}}",
+  cancel: "cancel",
+  "go back": "go back",
+  "↑↓ to navigate, ": "↑↓ to navigate, ",
+  "Enter a clear, unique name for this subagent.": "Enter a clear, unique name for this subagent.",
+  "e.g., Code Reviewer": "e.g., Code Reviewer",
+  "Name cannot be empty.": "Name cannot be empty.",
   "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.":
     "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.",
-  'e.g., You are an expert code reviewer...':
-    'e.g., You are an expert code reviewer...',
-  'System prompt cannot be empty.': 'System prompt cannot be empty.',
-  'Describe when and how this subagent should be used.':
-    'Describe when and how this subagent should be used.',
-  'e.g., Reviews code for best practices and potential bugs.':
-    'e.g., Reviews code for best practices and potential bugs.',
-  'Description cannot be empty.': 'Description cannot be empty.',
-  'Failed to launch editor: {{error}}': 'Failed to launch editor: {{error}}',
-  'Failed to save and edit subagent: {{error}}':
-    'Failed to save and edit subagent: {{error}}',
+  "e.g., You are an expert code reviewer...": "e.g., You are an expert code reviewer...",
+  "System prompt cannot be empty.": "System prompt cannot be empty.",
+  "Describe when and how this subagent should be used.":
+    "Describe when and how this subagent should be used.",
+  "e.g., Reviews code for best practices and potential bugs.":
+    "e.g., Reviews code for best practices and potential bugs.",
+  "Description cannot be empty.": "Description cannot be empty.",
+  "Failed to launch editor: {{error}}": "Failed to launch editor: {{error}}",
+  "Failed to save and edit subagent: {{error}}": "Failed to save and edit subagent: {{error}}",
 
   // ============================================================================
   // Extensions - Management Dialog
   // ============================================================================
-  'Manage Extensions': 'Manage Extensions',
-  'Extension Details': 'Extension Details',
-  'View Extension': 'View Extension',
-  'Update Extension': 'Update Extension',
-  'Disable Extension': 'Disable Extension',
-  'Enable Extension': 'Enable Extension',
-  'Uninstall Extension': 'Uninstall Extension',
-  'Select Scope': 'Select Scope',
-  'User Scope': 'User Scope',
-  'Workspace Scope': 'Workspace Scope',
-  'No extensions found.': 'No extensions found.',
-  Active: 'Active',
-  Disabled: 'Disabled',
-  'Update available': 'Update available',
-  'Up to date': 'Up to date',
-  'Checking...': 'Checking...',
-  'Updating...': 'Updating...',
-  Unknown: 'Unknown',
-  Error: 'Error',
-  'Version:': 'Version:',
-  'Status:': 'Status:',
+  "Manage Extensions": "Manage Extensions",
+  "Extension Details": "Extension Details",
+  "View Extension": "View Extension",
+  "Update Extension": "Update Extension",
+  "Disable Extension": "Disable Extension",
+  "Enable Extension": "Enable Extension",
+  "Uninstall Extension": "Uninstall Extension",
+  "Select Scope": "Select Scope",
+  "User Scope": "User Scope",
+  "Workspace Scope": "Workspace Scope",
+  "No extensions found.": "No extensions found.",
+  Active: "Active",
+  Disabled: "Disabled",
+  "Update available": "Update available",
+  "Up to date": "Up to date",
+  "Checking...": "Checking...",
+  "Updating...": "Updating...",
+  Unknown: "Unknown",
+  Error: "Error",
+  "Version:": "Version:",
+  "Status:": "Status:",
   'Are you sure you want to uninstall extension "{{name}}"?':
     'Are you sure you want to uninstall extension "{{name}}"?',
-  'This action cannot be undone.': 'This action cannot be undone.',
-  'Extension "{{name}}" disabled successfully.':
-    'Extension "{{name}}" disabled successfully.',
-  'Extension "{{name}}" enabled successfully.':
-    'Extension "{{name}}" enabled successfully.',
-  'Extension "{{name}}" updated successfully.':
-    'Extension "{{name}}" updated successfully.',
+  "This action cannot be undone.": "This action cannot be undone.",
+  'Extension "{{name}}" disabled successfully.': 'Extension "{{name}}" disabled successfully.',
+  'Extension "{{name}}" enabled successfully.': 'Extension "{{name}}" enabled successfully.',
+  'Extension "{{name}}" updated successfully.': 'Extension "{{name}}" updated successfully.',
   'Failed to update extension "{{name}}": {{error}}':
     'Failed to update extension "{{name}}": {{error}}',
-  'Select the scope for this action:': 'Select the scope for this action:',
-  'User - Applies to all projects': 'User - Applies to all projects',
-  'Workspace - Applies to current project only':
-    'Workspace - Applies to current project only',
+  "Select the scope for this action:": "Select the scope for this action:",
+  "User - Applies to all projects": "User - Applies to all projects",
+  "Workspace - Applies to current project only": "Workspace - Applies to current project only",
   // Extension dialog - missing keys
-  'Name:': 'Name:',
-  'MCP Servers:': 'MCP Servers:',
-  'Settings:': 'Settings:',
-  active: 'active',
-  disabled: 'disabled',
-  'View Details': 'View Details',
-  'Update failed:': 'Update failed:',
-  'Updating {{name}}...': 'Updating {{name}}...',
-  'Update complete!': 'Update complete!',
-  'User (global)': 'User (global)',
-  'Workspace (project-specific)': 'Workspace (project-specific)',
+  "Name:": "Name:",
+  "MCP Servers:": "MCP Servers:",
+  "Settings:": "Settings:",
+  active: "active",
+  disabled: "disabled",
+  "View Details": "View Details",
+  "Update failed:": "Update failed:",
+  "Updating {{name}}...": "Updating {{name}}...",
+  "Update complete!": "Update complete!",
+  "User (global)": "User (global)",
+  "Workspace (project-specific)": "Workspace (project-specific)",
   'Disable "{{name}}" - Select Scope': 'Disable "{{name}}" - Select Scope',
   'Enable "{{name}}" - Select Scope': 'Enable "{{name}}" - Select Scope',
-  'No extension selected': 'No extension selected',
-  'Press Y/Enter to confirm, N/Esc to cancel':
-    'Press Y/Enter to confirm, N/Esc to cancel',
-  'Y/Enter to confirm, N/Esc to cancel': 'Y/Enter to confirm, N/Esc to cancel',
-  '{{count}} extensions installed': '{{count}} extensions installed',
+  "No extension selected": "No extension selected",
+  "Press Y/Enter to confirm, N/Esc to cancel": "Press Y/Enter to confirm, N/Esc to cancel",
+  "Y/Enter to confirm, N/Esc to cancel": "Y/Enter to confirm, N/Esc to cancel",
+  "{{count}} extensions installed": "{{count}} extensions installed",
   "Use '/extensions install' to install your first extension.":
     "Use '/extensions install' to install your first extension.",
   // Update status values
-  'up to date': 'up to date',
-  'update available': 'update available',
-  'checking...': 'checking...',
-  'not updatable': 'not updatable',
-  error: 'error',
+  "up to date": "up to date",
+  "update available": "update available",
+  "checking...": "checking...",
+  "not updatable": "not updatable",
+  error: "error",
 
   // ============================================================================
   // Commands - General (continued)
   // ============================================================================
-  'View and edit Qwen Code settings': 'View and edit Qwen Code settings',
-  Settings: 'Settings',
-  'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
-    'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.',
+  "View and edit Qwen Code settings": "View and edit Qwen Code settings",
+  Settings: "Settings",
+  "To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.":
+    "To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.",
   'The command "/{{command}}" is not supported in non-interactive mode.':
     'The command "/{{command}}" is not supported in non-interactive mode.',
   // ============================================================================
   // Settings Labels
   // ============================================================================
-  'Vim Mode': 'Vim Mode',
-  'Disable Auto Update': 'Disable Auto Update',
-  'Attribution: commit': 'Attribution: commit',
-  'Terminal Bell Notification': 'Terminal Bell Notification',
-  'Enable Usage Statistics': 'Enable Usage Statistics',
-  Theme: 'Theme',
-  'Preferred Editor': 'Preferred Editor',
-  'Auto-connect to IDE': 'Auto-connect to IDE',
-  'Enable Prompt Completion': 'Enable Prompt Completion',
-  'Debug Keystroke Logging': 'Debug Keystroke Logging',
-  'Language: UI': 'Language: UI',
-  'Language: Model': 'Language: Model',
-  'Output Format': 'Output Format',
-  'Hide Window Title': 'Hide Window Title',
-  'Show Status in Title': 'Show Status in Title',
-  'Hide Tips': 'Hide Tips',
-  'Show Line Numbers in Code': 'Show Line Numbers in Code',
-  'Show Citations': 'Show Citations',
-  'Custom Witty Phrases': 'Custom Witty Phrases',
-  'Show Welcome Back Dialog': 'Show Welcome Back Dialog',
-  'Enable User Feedback': 'Enable User Feedback',
-  'How is Qwen doing this session? (optional)':
-    'How is Qwen doing this session? (optional)',
-  Bad: 'Bad',
-  Fine: 'Fine',
-  Good: 'Good',
-  Dismiss: 'Dismiss',
-  'Not Sure Yet': 'Not Sure Yet',
-  'Any other key': 'Any other key',
-  'Disable Loading Phrases': 'Disable Loading Phrases',
-  'Screen Reader Mode': 'Screen Reader Mode',
-  'IDE Mode': 'IDE Mode',
-  'Max Session Turns': 'Max Session Turns',
-  'Skip Next Speaker Check': 'Skip Next Speaker Check',
-  'Skip Loop Detection': 'Skip Loop Detection',
-  'Skip Startup Context': 'Skip Startup Context',
-  'Enable OpenAI Logging': 'Enable OpenAI Logging',
-  'OpenAI Logging Directory': 'OpenAI Logging Directory',
-  Timeout: 'Timeout',
-  'Max Retries': 'Max Retries',
-  'Disable Cache Control': 'Disable Cache Control',
-  'Memory Discovery Max Dirs': 'Memory Discovery Max Dirs',
-  'Load Memory From Include Directories':
-    'Load Memory From Include Directories',
-  'Respect .gitignore': 'Respect .gitignore',
-  'Respect .qwenignore': 'Respect .qwenignore',
-  'Enable Recursive File Search': 'Enable Recursive File Search',
-  'Disable Fuzzy Search': 'Disable Fuzzy Search',
-  'Interactive Shell (PTY)': 'Interactive Shell (PTY)',
-  'Show Color': 'Show Color',
-  'Auto Accept': 'Auto Accept',
-  'Use Ripgrep': 'Use Ripgrep',
-  'Use Builtin Ripgrep': 'Use Builtin Ripgrep',
-  'Enable Tool Output Truncation': 'Enable Tool Output Truncation',
-  'Tool Output Truncation Threshold': 'Tool Output Truncation Threshold',
-  'Tool Output Truncation Lines': 'Tool Output Truncation Lines',
-  'Folder Trust': 'Folder Trust',
-  'Vision Model Preview': 'Vision Model Preview',
-  'Tool Schema Compliance': 'Tool Schema Compliance',
+  "Vim Mode": "Vim Mode",
+  "Disable Auto Update": "Disable Auto Update",
+  "Attribution: commit": "Attribution: commit",
+  "Terminal Bell Notification": "Terminal Bell Notification",
+  "Enable Usage Statistics": "Enable Usage Statistics",
+  Theme: "Theme",
+  "Preferred Editor": "Preferred Editor",
+  "Auto-connect to IDE": "Auto-connect to IDE",
+  "Enable Prompt Completion": "Enable Prompt Completion",
+  "Debug Keystroke Logging": "Debug Keystroke Logging",
+  "Language: UI": "Language: UI",
+  "Language: Model": "Language: Model",
+  "Output Format": "Output Format",
+  "Hide Window Title": "Hide Window Title",
+  "Show Status in Title": "Show Status in Title",
+  "Hide Tips": "Hide Tips",
+  "Show Line Numbers in Code": "Show Line Numbers in Code",
+  "Show Citations": "Show Citations",
+  "Custom Witty Phrases": "Custom Witty Phrases",
+  "Show Welcome Back Dialog": "Show Welcome Back Dialog",
+  "Enable User Feedback": "Enable User Feedback",
+  "How is Qwen doing this session? (optional)": "How is Qwen doing this session? (optional)",
+  Bad: "Bad",
+  Fine: "Fine",
+  Good: "Good",
+  Dismiss: "Dismiss",
+  "Not Sure Yet": "Not Sure Yet",
+  "Any other key": "Any other key",
+  "Disable Loading Phrases": "Disable Loading Phrases",
+  "Screen Reader Mode": "Screen Reader Mode",
+  "IDE Mode": "IDE Mode",
+  "Max Session Turns": "Max Session Turns",
+  "Skip Next Speaker Check": "Skip Next Speaker Check",
+  "Skip Loop Detection": "Skip Loop Detection",
+  "Skip Startup Context": "Skip Startup Context",
+  "Enable OpenAI Logging": "Enable OpenAI Logging",
+  "OpenAI Logging Directory": "OpenAI Logging Directory",
+  Timeout: "Timeout",
+  "Max Retries": "Max Retries",
+  "Disable Cache Control": "Disable Cache Control",
+  "Memory Discovery Max Dirs": "Memory Discovery Max Dirs",
+  "Load Memory From Include Directories": "Load Memory From Include Directories",
+  "Respect .gitignore": "Respect .gitignore",
+  "Respect .qwenignore": "Respect .qwenignore",
+  "Enable Recursive File Search": "Enable Recursive File Search",
+  "Disable Fuzzy Search": "Disable Fuzzy Search",
+  "Interactive Shell (PTY)": "Interactive Shell (PTY)",
+  "Show Color": "Show Color",
+  "Auto Accept": "Auto Accept",
+  "Use Ripgrep": "Use Ripgrep",
+  "Use Builtin Ripgrep": "Use Builtin Ripgrep",
+  "Enable Tool Output Truncation": "Enable Tool Output Truncation",
+  "Tool Output Truncation Threshold": "Tool Output Truncation Threshold",
+  "Tool Output Truncation Lines": "Tool Output Truncation Lines",
+  "Folder Trust": "Folder Trust",
+  "Vision Model Preview": "Vision Model Preview",
+  "Tool Schema Compliance": "Tool Schema Compliance",
   // Settings enum options
-  'Auto (detect from system)': 'Auto (detect from system)',
-  Text: 'Text',
-  JSON: 'JSON',
-  Plan: 'Plan',
-  Default: 'Default',
-  'Auto Edit': 'Auto Edit',
-  YOLO: 'YOLO',
-  'toggle vim mode on/off': 'toggle vim mode on/off',
-  'check session stats. Usage: /stats [model|tools]':
-    'check session stats. Usage: /stats [model|tools]',
-  'Show model-specific usage statistics.':
-    'Show model-specific usage statistics.',
-  'Show tool-specific usage statistics.':
-    'Show tool-specific usage statistics.',
-  'exit the cli': 'exit the cli',
-  'Open MCP management dialog, or authenticate with OAuth-enabled servers':
-    'Open MCP management dialog, or authenticate with OAuth-enabled servers',
-  'List configured MCP servers and tools, or authenticate with OAuth-enabled servers':
-    'List configured MCP servers and tools, or authenticate with OAuth-enabled servers',
-  'Manage workspace directories': 'Manage workspace directories',
-  'Add directories to the workspace. Use comma to separate multiple paths':
-    'Add directories to the workspace. Use comma to separate multiple paths',
-  'Show all directories in the workspace':
-    'Show all directories in the workspace',
-  'set external editor preference': 'set external editor preference',
-  'Select Editor': 'Select Editor',
-  'Editor Preference': 'Editor Preference',
-  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
-    'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.',
-  'Your preferred editor is:': 'Your preferred editor is:',
-  'Manage extensions': 'Manage extensions',
-  'Manage installed extensions': 'Manage installed extensions',
-  'List active extensions': 'List active extensions',
-  'Update extensions. Usage: update <extension-names>|--all':
-    'Update extensions. Usage: update <extension-names>|--all',
-  'Disable an extension': 'Disable an extension',
-  'Enable an extension': 'Enable an extension',
-  'Install an extension from a git repo or local path':
-    'Install an extension from a git repo or local path',
-  'Uninstall an extension': 'Uninstall an extension',
-  'No extensions installed.': 'No extensions installed.',
-  'Usage: /extensions update <extension-names>|--all':
-    'Usage: /extensions update <extension-names>|--all',
+  "Auto (detect from system)": "Auto (detect from system)",
+  Text: "Text",
+  JSON: "JSON",
+  Plan: "Plan",
+  Default: "Default",
+  "Auto Edit": "Auto Edit",
+  YOLO: "YOLO",
+  "toggle vim mode on/off": "toggle vim mode on/off",
+  "check session stats. Usage: /stats [model|tools]":
+    "check session stats. Usage: /stats [model|tools]",
+  "Show model-specific usage statistics.": "Show model-specific usage statistics.",
+  "Show tool-specific usage statistics.": "Show tool-specific usage statistics.",
+  "exit the cli": "exit the cli",
+  "Open MCP management dialog, or authenticate with OAuth-enabled servers":
+    "Open MCP management dialog, or authenticate with OAuth-enabled servers",
+  "List configured MCP servers and tools, or authenticate with OAuth-enabled servers":
+    "List configured MCP servers and tools, or authenticate with OAuth-enabled servers",
+  "Manage workspace directories": "Manage workspace directories",
+  "Add directories to the workspace. Use comma to separate multiple paths":
+    "Add directories to the workspace. Use comma to separate multiple paths",
+  "Show all directories in the workspace": "Show all directories in the workspace",
+  "set external editor preference": "set external editor preference",
+  "Select Editor": "Select Editor",
+  "Editor Preference": "Editor Preference",
+  "These editors are currently supported. Please note that some editors cannot be used in sandbox mode.":
+    "These editors are currently supported. Please note that some editors cannot be used in sandbox mode.",
+  "Your preferred editor is:": "Your preferred editor is:",
+  "Manage extensions": "Manage extensions",
+  "Manage installed extensions": "Manage installed extensions",
+  "List active extensions": "List active extensions",
+  "Update extensions. Usage: update <extension-names>|--all":
+    "Update extensions. Usage: update <extension-names>|--all",
+  "Disable an extension": "Disable an extension",
+  "Enable an extension": "Enable an extension",
+  "Install an extension from a git repo or local path":
+    "Install an extension from a git repo or local path",
+  "Uninstall an extension": "Uninstall an extension",
+  "No extensions installed.": "No extensions installed.",
+  "Usage: /extensions update <extension-names>|--all":
+    "Usage: /extensions update <extension-names>|--all",
   'Extension "{{name}}" not found.': 'Extension "{{name}}" not found.',
-  'No extensions to update.': 'No extensions to update.',
-  'Usage: /extensions install <source>': 'Usage: /extensions install <source>',
-  'Installing extension from "{{source}}"...':
-    'Installing extension from "{{source}}"...',
-  'Extension "{{name}}" installed successfully.':
-    'Extension "{{name}}" installed successfully.',
+  "No extensions to update.": "No extensions to update.",
+  "Usage: /extensions install <source>": "Usage: /extensions install <source>",
+  'Installing extension from "{{source}}"...': 'Installing extension from "{{source}}"...',
+  'Extension "{{name}}" installed successfully.': 'Extension "{{name}}" installed successfully.',
   'Failed to install extension from "{{source}}": {{error}}':
     'Failed to install extension from "{{source}}": {{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    'Usage: /extensions uninstall <extension-name>',
-  'Uninstalling extension "{{name}}"...':
-    'Uninstalling extension "{{name}}"...',
+  "Usage: /extensions uninstall <extension-name>": "Usage: /extensions uninstall <extension-name>",
+  'Uninstalling extension "{{name}}"...': 'Uninstalling extension "{{name}}"...',
   'Extension "{{name}}" uninstalled successfully.':
     'Extension "{{name}}" uninstalled successfully.',
   'Failed to uninstall extension "{{name}}": {{error}}':
     'Failed to uninstall extension "{{name}}": {{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]',
+  "Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]":
+    "Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]",
   'Unsupported scope "{{scope}}", should be one of "user" or "workspace"':
     'Unsupported scope "{{scope}}", should be one of "user" or "workspace"',
   'Extension "{{name}}" disabled for scope "{{scope}}"':
     'Extension "{{name}}" disabled for scope "{{scope}}"',
   'Extension "{{name}}" enabled for scope "{{scope}}"':
     'Extension "{{name}}" enabled for scope "{{scope}}"',
-  'Do you want to continue? [Y/n]: ': 'Do you want to continue? [Y/n]: ',
-  'Do you want to continue?': 'Do you want to continue?',
+  "Do you want to continue? [Y/n]: ": "Do you want to continue? [Y/n]: ",
+  "Do you want to continue?": "Do you want to continue?",
   'Installing extension "{{name}}".': 'Installing extension "{{name}}".',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**',
-  'This extension will run the following MCP servers:':
-    'This extension will run the following MCP servers:',
-  local: 'local',
-  remote: 'remote',
-  'This extension will add the following commands: {{commands}}.':
-    'This extension will add the following commands: {{commands}}.',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    'This extension will append info to your QWEN.md context using {{fileName}}',
-  'This extension will exclude the following core tools: {{tools}}':
-    'This extension will exclude the following core tools: {{tools}}',
-  'This extension will install the following skills:':
-    'This extension will install the following skills:',
-  'This extension will install the following subagents:':
-    'This extension will install the following subagents:',
-  'Installation cancelled for "{{name}}".':
-    'Installation cancelled for "{{name}}".',
-  'You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.':
-    'You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.',
-  '--ref and --auto-update are not applicable for marketplace extensions.':
-    '--ref and --auto-update are not applicable for marketplace extensions.',
+  "**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**":
+    "**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**",
+  "This extension will run the following MCP servers:":
+    "This extension will run the following MCP servers:",
+  local: "local",
+  remote: "remote",
+  "This extension will add the following commands: {{commands}}.":
+    "This extension will add the following commands: {{commands}}.",
+  "This extension will append info to your QWEN.md context using {{fileName}}":
+    "This extension will append info to your QWEN.md context using {{fileName}}",
+  "This extension will exclude the following core tools: {{tools}}":
+    "This extension will exclude the following core tools: {{tools}}",
+  "This extension will install the following skills:":
+    "This extension will install the following skills:",
+  "This extension will install the following subagents:":
+    "This extension will install the following subagents:",
+  'Installation cancelled for "{{name}}".': 'Installation cancelled for "{{name}}".',
+  "You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.":
+    "You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.",
+  "--ref and --auto-update are not applicable for marketplace extensions.":
+    "--ref and --auto-update are not applicable for marketplace extensions.",
   'Extension "{{name}}" installed successfully and enabled.':
     'Extension "{{name}}" installed successfully and enabled.',
-  'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).':
-    'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).',
-  'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.':
-    'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.',
-  'The git ref to install from.': 'The git ref to install from.',
-  'Enable auto-update for this extension.':
-    'Enable auto-update for this extension.',
-  'Enable pre-release versions for this extension.':
-    'Enable pre-release versions for this extension.',
-  'Acknowledge the security risks of installing an extension and skip the confirmation prompt.':
-    'Acknowledge the security risks of installing an extension and skip the confirmation prompt.',
-  'The source argument must be provided.':
-    'The source argument must be provided.',
+  "Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).":
+    "Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).",
+  "The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.":
+    "The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.",
+  "The git ref to install from.": "The git ref to install from.",
+  "Enable auto-update for this extension.": "Enable auto-update for this extension.",
+  "Enable pre-release versions for this extension.":
+    "Enable pre-release versions for this extension.",
+  "Acknowledge the security risks of installing an extension and skip the confirmation prompt.":
+    "Acknowledge the security risks of installing an extension and skip the confirmation prompt.",
+  "The source argument must be provided.": "The source argument must be provided.",
   'Extension "{{name}}" successfully uninstalled.':
     'Extension "{{name}}" successfully uninstalled.',
-  'Uninstalls an extension.': 'Uninstalls an extension.',
-  'The name or source path of the extension to uninstall.':
-    'The name or source path of the extension to uninstall.',
-  'Please include the name of the extension to uninstall as a positional argument.':
-    'Please include the name of the extension to uninstall as a positional argument.',
-  'Enables an extension.': 'Enables an extension.',
-  'The name of the extension to enable.':
-    'The name of the extension to enable.',
-  'The scope to enable the extenison in. If not set, will be enabled in all scopes.':
-    'The scope to enable the extenison in. If not set, will be enabled in all scopes.',
+  "Uninstalls an extension.": "Uninstalls an extension.",
+  "The name or source path of the extension to uninstall.":
+    "The name or source path of the extension to uninstall.",
+  "Please include the name of the extension to uninstall as a positional argument.":
+    "Please include the name of the extension to uninstall as a positional argument.",
+  "Enables an extension.": "Enables an extension.",
+  "The name of the extension to enable.": "The name of the extension to enable.",
+  "The scope to enable the extenison in. If not set, will be enabled in all scopes.":
+    "The scope to enable the extenison in. If not set, will be enabled in all scopes.",
   'Extension "{{name}}" successfully enabled for scope "{{scope}}".':
     'Extension "{{name}}" successfully enabled for scope "{{scope}}".',
   'Extension "{{name}}" successfully enabled in all scopes.':
     'Extension "{{name}}" successfully enabled in all scopes.',
-  'Invalid scope: {{scope}}. Please use one of {{scopes}}.':
-    'Invalid scope: {{scope}}. Please use one of {{scopes}}.',
-  'Disables an extension.': 'Disables an extension.',
-  'The name of the extension to disable.':
-    'The name of the extension to disable.',
-  'The scope to disable the extenison in.':
-    'The scope to disable the extenison in.',
+  "Invalid scope: {{scope}}. Please use one of {{scopes}}.":
+    "Invalid scope: {{scope}}. Please use one of {{scopes}}.",
+  "Disables an extension.": "Disables an extension.",
+  "The name of the extension to disable.": "The name of the extension to disable.",
+  "The scope to disable the extenison in.": "The scope to disable the extenison in.",
   'Extension "{{name}}" successfully disabled for scope "{{scope}}".':
     'Extension "{{name}}" successfully disabled for scope "{{scope}}".',
   'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.':
     'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.',
   'Unable to install extension "{{name}}" due to missing install metadata':
     'Unable to install extension "{{name}}" due to missing install metadata',
-  'Extension "{{name}}" is already up to date.':
-    'Extension "{{name}}" is already up to date.',
-  'Updates all extensions or a named extension to the latest version.':
-    'Updates all extensions or a named extension to the latest version.',
-  'Update all extensions.': 'Update all extensions.',
-  'Either an extension name or --all must be provided':
-    'Either an extension name or --all must be provided',
-  'Lists installed extensions.': 'Lists installed extensions.',
-  'Path:': 'Path:',
-  'Source:': 'Source:',
-  'Type:': 'Type:',
-  'Ref:': 'Ref:',
-  'Release tag:': 'Release tag:',
-  'Enabled (User):': 'Enabled (User):',
-  'Enabled (Workspace):': 'Enabled (Workspace):',
-  'Context files:': 'Context files:',
-  'Skills:': 'Skills:',
-  'Agents:': 'Agents:',
-  'MCP servers:': 'MCP servers:',
-  'Link extension failed to install.': 'Link extension failed to install.',
+  'Extension "{{name}}" is already up to date.': 'Extension "{{name}}" is already up to date.',
+  "Updates all extensions or a named extension to the latest version.":
+    "Updates all extensions or a named extension to the latest version.",
+  "Update all extensions.": "Update all extensions.",
+  "Either an extension name or --all must be provided":
+    "Either an extension name or --all must be provided",
+  "Lists installed extensions.": "Lists installed extensions.",
+  "Path:": "Path:",
+  "Source:": "Source:",
+  "Type:": "Type:",
+  "Ref:": "Ref:",
+  "Release tag:": "Release tag:",
+  "Enabled (User):": "Enabled (User):",
+  "Enabled (Workspace):": "Enabled (Workspace):",
+  "Context files:": "Context files:",
+  "Skills:": "Skills:",
+  "Agents:": "Agents:",
+  "MCP servers:": "MCP servers:",
+  "Link extension failed to install.": "Link extension failed to install.",
   'Extension "{{name}}" linked successfully and enabled.':
     'Extension "{{name}}" linked successfully and enabled.',
-  'Links an extension from a local path. Updates made to the local path will always be reflected.':
-    'Links an extension from a local path. Updates made to the local path will always be reflected.',
-  'The name of the extension to link.': 'The name of the extension to link.',
-  'Set a specific setting for an extension.':
-    'Set a specific setting for an extension.',
-  'Name of the extension to configure.': 'Name of the extension to configure.',
-  'The setting to configure (name or env var).':
-    'The setting to configure (name or env var).',
-  'The scope to set the setting in.': 'The scope to set the setting in.',
-  'List all settings for an extension.': 'List all settings for an extension.',
-  'Name of the extension.': 'Name of the extension.',
+  "Links an extension from a local path. Updates made to the local path will always be reflected.":
+    "Links an extension from a local path. Updates made to the local path will always be reflected.",
+  "The name of the extension to link.": "The name of the extension to link.",
+  "Set a specific setting for an extension.": "Set a specific setting for an extension.",
+  "Name of the extension to configure.": "Name of the extension to configure.",
+  "The setting to configure (name or env var).": "The setting to configure (name or env var).",
+  "The scope to set the setting in.": "The scope to set the setting in.",
+  "List all settings for an extension.": "List all settings for an extension.",
+  "Name of the extension.": "Name of the extension.",
   'Extension "{{name}}" has no settings to configure.':
     'Extension "{{name}}" has no settings to configure.',
   'Settings for "{{name}}":': 'Settings for "{{name}}":',
-  '(workspace)': '(workspace)',
-  '(user)': '(user)',
-  '[not set]': '[not set]',
-  '[value stored in keychain]': '[value stored in keychain]',
-  'Value:': 'Value:',
-  'Manage extension settings.': 'Manage extension settings.',
-  'You need to specify a command (set or list).':
-    'You need to specify a command (set or list).',
+  "(workspace)": "(workspace)",
+  "(user)": "(user)",
+  "[not set]": "[not set]",
+  "[value stored in keychain]": "[value stored in keychain]",
+  "Value:": "Value:",
+  "Manage extension settings.": "Manage extension settings.",
+  "You need to specify a command (set or list).": "You need to specify a command (set or list).",
   // ============================================================================
   // Plugin Choice / Marketplace
   // ============================================================================
-  'No plugins available in this marketplace.':
-    'No plugins available in this marketplace.',
+  "No plugins available in this marketplace.": "No plugins available in this marketplace.",
   'Select a plugin to install from marketplace "{{name}}":':
     'Select a plugin to install from marketplace "{{name}}":',
-  'Plugin selection cancelled.': 'Plugin selection cancelled.',
+  "Plugin selection cancelled.": "Plugin selection cancelled.",
   'Select a plugin from "{{name}}"': 'Select a plugin from "{{name}}"',
-  'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel':
-    'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel',
-  '{{count}} more above': '{{count}} more above',
-  '{{count}} more below': '{{count}} more below',
-  'manage IDE integration': 'manage IDE integration',
-  'check status of IDE integration': 'check status of IDE integration',
-  'install required IDE companion for {{ideName}}':
-    'install required IDE companion for {{ideName}}',
-  'enable IDE integration': 'enable IDE integration',
-  'disable IDE integration': 'disable IDE integration',
-  'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.':
-    'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.',
-  'Set up GitHub Actions': 'Set up GitHub Actions',
-  'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)':
-    'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)',
-  'Please restart your terminal for the changes to take effect.':
-    'Please restart your terminal for the changes to take effect.',
-  'Failed to configure terminal: {{error}}':
-    'Failed to configure terminal: {{error}}',
-  'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.':
-    'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.',
-  '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.':
-    '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.',
-  'File: {{file}}': 'File: {{file}}',
-  'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.':
-    'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.',
-  'Error: {{error}}': 'Error: {{error}}',
-  'Shift+Enter binding already exists': 'Shift+Enter binding already exists',
-  'Ctrl+Enter binding already exists': 'Ctrl+Enter binding already exists',
-  'Existing keybindings detected. Will not modify to avoid conflicts.':
-    'Existing keybindings detected. Will not modify to avoid conflicts.',
-  'Please check and modify manually if needed: {{file}}':
-    'Please check and modify manually if needed: {{file}}',
-  'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.':
-    'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.',
-  'Modified: {{file}}': 'Modified: {{file}}',
-  '{{terminalName}} keybindings already configured.':
-    '{{terminalName}} keybindings already configured.',
-  'Failed to configure {{terminalName}}.':
-    'Failed to configure {{terminalName}}.',
-  'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).':
-    'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).',
+  "Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel":
+    "Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel",
+  "{{count}} more above": "{{count}} more above",
+  "{{count}} more below": "{{count}} more below",
+  "manage IDE integration": "manage IDE integration",
+  "check status of IDE integration": "check status of IDE integration",
+  "install required IDE companion for {{ideName}}":
+    "install required IDE companion for {{ideName}}",
+  "enable IDE integration": "enable IDE integration",
+  "disable IDE integration": "disable IDE integration",
+  "IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.":
+    "IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.",
+  "Set up GitHub Actions": "Set up GitHub Actions",
+  "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)":
+    "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)",
+  "Please restart your terminal for the changes to take effect.":
+    "Please restart your terminal for the changes to take effect.",
+  "Failed to configure terminal: {{error}}": "Failed to configure terminal: {{error}}",
+  "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.":
+    "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.",
+  "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.":
+    "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.",
+  "File: {{file}}": "File: {{file}}",
+  "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.":
+    "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.",
+  "Error: {{error}}": "Error: {{error}}",
+  "Shift+Enter binding already exists": "Shift+Enter binding already exists",
+  "Ctrl+Enter binding already exists": "Ctrl+Enter binding already exists",
+  "Existing keybindings detected. Will not modify to avoid conflicts.":
+    "Existing keybindings detected. Will not modify to avoid conflicts.",
+  "Please check and modify manually if needed: {{file}}":
+    "Please check and modify manually if needed: {{file}}",
+  "Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.":
+    "Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.",
+  "Modified: {{file}}": "Modified: {{file}}",
+  "{{terminalName}} keybindings already configured.":
+    "{{terminalName}} keybindings already configured.",
+  "Failed to configure {{terminalName}}.": "Failed to configure {{terminalName}}.",
+  "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).":
+    "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).",
   // ============================================================================
   // Commands - Hooks
   // ============================================================================
-  'Manage Qwen Code hooks': 'Manage Qwen Code hooks',
-  'List all configured hooks': 'List all configured hooks',
-  'Enable a disabled hook': 'Enable a disabled hook',
-  'Disable an active hook': 'Disable an active hook',
+  "Manage Qwen Code hooks": "Manage Qwen Code hooks",
+  "List all configured hooks": "List all configured hooks",
+  "Enable a disabled hook": "Enable a disabled hook",
+  "Disable an active hook": "Disable an active hook",
   // Hooks - Dialog
-  Hooks: 'Hooks',
-  'Loading hooks...': 'Loading hooks...',
-  'Error loading hooks:': 'Error loading hooks:',
-  'Press Escape to close': 'Press Escape to close',
-  'Press Escape, Ctrl+C, or Ctrl+D to cancel':
-    'Press Escape, Ctrl+C, or Ctrl+D to cancel',
-  'Press Space, Enter, or Escape to dismiss':
-    'Press Space, Enter, or Escape to dismiss',
-  'No hook selected': 'No hook selected',
+  Hooks: "Hooks",
+  "Loading hooks...": "Loading hooks...",
+  "Error loading hooks:": "Error loading hooks:",
+  "Press Escape to close": "Press Escape to close",
+  "Press Escape, Ctrl+C, or Ctrl+D to cancel": "Press Escape, Ctrl+C, or Ctrl+D to cancel",
+  "Press Space, Enter, or Escape to dismiss": "Press Space, Enter, or Escape to dismiss",
+  "No hook selected": "No hook selected",
   // Hooks - List Step
-  'No hook events found.': 'No hook events found.',
-  '{{count}} hook configured': '{{count}} hook configured',
-  '{{count}} hooks configured': '{{count}} hooks configured',
-  'This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.':
-    'This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.',
-  'Enter to select · Esc to cancel': 'Enter to select · Esc to cancel',
+  "No hook events found.": "No hook events found.",
+  "{{count}} hook configured": "{{count}} hook configured",
+  "{{count}} hooks configured": "{{count}} hooks configured",
+  "This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.":
+    "This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.",
+  "Enter to select · Esc to cancel": "Enter to select · Esc to cancel",
   // Hooks - Detail Step
-  'Exit codes:': 'Exit codes:',
-  'Configured hooks:': 'Configured hooks:',
-  'No hooks configured for this event.': 'No hooks configured for this event.',
-  'To add hooks, edit settings.json directly or ask Qwen.':
-    'To add hooks, edit settings.json directly or ask Qwen.',
-  'Enter to select · Esc to go back': 'Enter to select · Esc to go back',
+  "Exit codes:": "Exit codes:",
+  "Configured hooks:": "Configured hooks:",
+  "No hooks configured for this event.": "No hooks configured for this event.",
+  "To add hooks, edit settings.json directly or ask Qwen.":
+    "To add hooks, edit settings.json directly or ask Qwen.",
+  "Enter to select · Esc to go back": "Enter to select · Esc to go back",
   // Hooks - Config Detail Step
-  'Hook details': 'Hook details',
-  'Event:': 'Event:',
-  'Extension:': 'Extension:',
-  'Desc:': 'Desc:',
-  'No hook config selected': 'No hook config selected',
-  'To modify or remove this hook, edit settings.json directly or ask Qwen to help.':
-    'To modify or remove this hook, edit settings.json directly or ask Qwen to help.',
+  "Hook details": "Hook details",
+  "Event:": "Event:",
+  "Extension:": "Extension:",
+  "Desc:": "Desc:",
+  "No hook config selected": "No hook config selected",
+  "To modify or remove this hook, edit settings.json directly or ask Qwen to help.":
+    "To modify or remove this hook, edit settings.json directly or ask Qwen to help.",
   // Hooks - Disabled Step
-  'Hook Configuration - Disabled': 'Hook Configuration - Disabled',
-  'All hooks are currently disabled. You have {{count}} that are not running.':
-    'All hooks are currently disabled. You have {{count}} that are not running.',
-  '{{count}} configured hook': '{{count}} configured hook',
-  '{{count}} configured hooks': '{{count}} configured hooks',
-  'When hooks are disabled:': 'When hooks are disabled:',
-  'No hook commands will execute': 'No hook commands will execute',
-  'StatusLine will not be displayed': 'StatusLine will not be displayed',
-  'Tool operations will proceed without hook validation':
-    'Tool operations will proceed without hook validation',
+  "Hook Configuration - Disabled": "Hook Configuration - Disabled",
+  "All hooks are currently disabled. You have {{count}} that are not running.":
+    "All hooks are currently disabled. You have {{count}} that are not running.",
+  "{{count}} configured hook": "{{count}} configured hook",
+  "{{count}} configured hooks": "{{count}} configured hooks",
+  "When hooks are disabled:": "When hooks are disabled:",
+  "No hook commands will execute": "No hook commands will execute",
+  "StatusLine will not be displayed": "StatusLine will not be displayed",
+  "Tool operations will proceed without hook validation":
+    "Tool operations will proceed without hook validation",
   'To re-enable hooks, remove "disableAllHooks" from settings.json or ask Qwen Code.':
     'To re-enable hooks, remove "disableAllHooks" from settings.json or ask Qwen Code.',
   // Hooks - Source
-  Project: 'Project',
-  User: 'User',
-  System: 'System',
-  Extension: 'Extension',
-  'Local Settings': 'Local Settings',
-  'User Settings': 'User Settings',
-  'System Settings': 'System Settings',
-  Extensions: 'Extensions',
+  Project: "Project",
+  User: "User",
+  System: "System",
+  Extension: "Extension",
+  "Local Settings": "Local Settings",
+  "User Settings": "User Settings",
+  "System Settings": "System Settings",
+  Extensions: "Extensions",
   // Hooks - Status
-  '✓ Enabled': '✓ Enabled',
-  '✗ Disabled': '✗ Disabled',
+  "✓ Enabled": "✓ Enabled",
+  "✗ Disabled": "✗ Disabled",
   // Hooks - Event Descriptions (short)
-  'Before tool execution': 'Before tool execution',
-  'After tool execution': 'After tool execution',
-  'After tool execution fails': 'After tool execution fails',
-  'When notifications are sent': 'When notifications are sent',
-  'When the user submits a prompt': 'When the user submits a prompt',
-  'When a new session is started': 'When a new session is started',
-  'Right before Qwen Code concludes its response':
-    'Right before Qwen Code concludes its response',
-  'When a subagent (Agent tool call) is started':
-    'When a subagent (Agent tool call) is started',
-  'Right before a subagent concludes its response':
-    'Right before a subagent concludes its response',
-  'Before conversation compaction': 'Before conversation compaction',
-  'When a session is ending': 'When a session is ending',
-  'When a permission dialog is displayed':
-    'When a permission dialog is displayed',
+  "Before tool execution": "Before tool execution",
+  "After tool execution": "After tool execution",
+  "After tool execution fails": "After tool execution fails",
+  "When notifications are sent": "When notifications are sent",
+  "When the user submits a prompt": "When the user submits a prompt",
+  "When a new session is started": "When a new session is started",
+  "Right before Qwen Code concludes its response": "Right before Qwen Code concludes its response",
+  "When a subagent (Agent tool call) is started": "When a subagent (Agent tool call) is started",
+  "Right before a subagent concludes its response":
+    "Right before a subagent concludes its response",
+  "Before conversation compaction": "Before conversation compaction",
+  "When a session is ending": "When a session is ending",
+  "When a permission dialog is displayed": "When a permission dialog is displayed",
   // Hooks - Event Descriptions (detailed)
-  'Input to command is JSON of tool call arguments.':
-    'Input to command is JSON of tool call arguments.',
+  "Input to command is JSON of tool call arguments.":
+    "Input to command is JSON of tool call arguments.",
   'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).':
     'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).',
-  'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.':
-    'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.',
-  'Input to command is JSON with notification message and type.':
-    'Input to command is JSON with notification message and type.',
-  'Input to command is JSON with original user prompt text.':
-    'Input to command is JSON with original user prompt text.',
-  'Input to command is JSON with session start source.':
-    'Input to command is JSON with session start source.',
-  'Input to command is JSON with session end reason.':
-    'Input to command is JSON with session end reason.',
-  'Input to command is JSON with agent_id and agent_type.':
-    'Input to command is JSON with agent_id and agent_type.',
-  'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.':
-    'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.',
-  'Input to command is JSON with compaction details.':
-    'Input to command is JSON with compaction details.',
-  'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.':
-    'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.',
+  "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.":
+    "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.",
+  "Input to command is JSON with notification message and type.":
+    "Input to command is JSON with notification message and type.",
+  "Input to command is JSON with original user prompt text.":
+    "Input to command is JSON with original user prompt text.",
+  "Input to command is JSON with session start source.":
+    "Input to command is JSON with session start source.",
+  "Input to command is JSON with session end reason.":
+    "Input to command is JSON with session end reason.",
+  "Input to command is JSON with agent_id and agent_type.":
+    "Input to command is JSON with agent_id and agent_type.",
+  "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.":
+    "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.",
+  "Input to command is JSON with compaction details.":
+    "Input to command is JSON with compaction details.",
+  "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.":
+    "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.",
   // Hooks - Exit Code Descriptions
-  'stdout/stderr not shown': 'stdout/stderr not shown',
-  'show stderr to model and continue conversation':
-    'show stderr to model and continue conversation',
-  'show stderr to user only': 'show stderr to user only',
-  'stdout shown in transcript mode (ctrl+o)':
-    'stdout shown in transcript mode (ctrl+o)',
-  'show stderr to model immediately': 'show stderr to model immediately',
-  'show stderr to user only but continue with tool call':
-    'show stderr to user only but continue with tool call',
-  'block processing, erase original prompt, and show stderr to user only':
-    'block processing, erase original prompt, and show stderr to user only',
-  'stdout shown to Qwen': 'stdout shown to Qwen',
-  'show stderr to user only (blocking errors ignored)':
-    'show stderr to user only (blocking errors ignored)',
-  'command completes successfully': 'command completes successfully',
-  'stdout shown to subagent': 'stdout shown to subagent',
-  'show stderr to subagent and continue having it run':
-    'show stderr to subagent and continue having it run',
-  'stdout appended as custom compact instructions':
-    'stdout appended as custom compact instructions',
-  'block compaction': 'block compaction',
-  'show stderr to user only but continue with compaction':
-    'show stderr to user only but continue with compaction',
-  'use hook decision if provided': 'use hook decision if provided',
+  "stdout/stderr not shown": "stdout/stderr not shown",
+  "show stderr to model and continue conversation":
+    "show stderr to model and continue conversation",
+  "show stderr to user only": "show stderr to user only",
+  "stdout shown in transcript mode (ctrl+o)": "stdout shown in transcript mode (ctrl+o)",
+  "show stderr to model immediately": "show stderr to model immediately",
+  "show stderr to user only but continue with tool call":
+    "show stderr to user only but continue with tool call",
+  "block processing, erase original prompt, and show stderr to user only":
+    "block processing, erase original prompt, and show stderr to user only",
+  "stdout shown to Qwen": "stdout shown to Qwen",
+  "show stderr to user only (blocking errors ignored)":
+    "show stderr to user only (blocking errors ignored)",
+  "command completes successfully": "command completes successfully",
+  "stdout shown to subagent": "stdout shown to subagent",
+  "show stderr to subagent and continue having it run":
+    "show stderr to subagent and continue having it run",
+  "stdout appended as custom compact instructions":
+    "stdout appended as custom compact instructions",
+  "block compaction": "block compaction",
+  "show stderr to user only but continue with compaction":
+    "show stderr to user only but continue with compaction",
+  "use hook decision if provided": "use hook decision if provided",
   // Hooks - Messages
-  'Config not loaded.': 'Config not loaded.',
-  'Hooks are not enabled. Enable hooks in settings to use this feature.':
-    'Hooks are not enabled. Enable hooks in settings to use this feature.',
-  'No hooks configured. Add hooks in your settings.json file.':
-    'No hooks configured. Add hooks in your settings.json file.',
-  'Configured Hooks ({{count}} total)': 'Configured Hooks ({{count}} total)',
+  "Config not loaded.": "Config not loaded.",
+  "Hooks are not enabled. Enable hooks in settings to use this feature.":
+    "Hooks are not enabled. Enable hooks in settings to use this feature.",
+  "No hooks configured. Add hooks in your settings.json file.":
+    "No hooks configured. Add hooks in your settings.json file.",
+  "Configured Hooks ({{count}} total)": "Configured Hooks ({{count}} total)",
 
   // ============================================================================
   // Commands - Session Export
   // ============================================================================
-  'Export current session message history to a file':
-    'Export current session message history to a file',
-  'Export session to HTML format': 'Export session to HTML format',
-  'Export session to JSON format': 'Export session to JSON format',
-  'Export session to JSONL format (one message per line)':
-    'Export session to JSONL format (one message per line)',
-  'Export session to markdown format': 'Export session to markdown format',
+  "Export current session message history to a file":
+    "Export current session message history to a file",
+  "Export session to HTML format": "Export session to HTML format",
+  "Export session to JSON format": "Export session to JSON format",
+  "Export session to JSONL format (one message per line)":
+    "Export session to JSONL format (one message per line)",
+  "Export session to markdown format": "Export session to markdown format",
 
   // ============================================================================
   // Commands - Insights
   // ============================================================================
-  'generate personalized programming insights from your chat history':
-    'generate personalized programming insights from your chat history',
+  "generate personalized programming insights from your chat history":
+    "generate personalized programming insights from your chat history",
 
   // ============================================================================
   // Commands - Session History
   // ============================================================================
-  'Resume a previous session': 'Resume a previous session',
-  'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested':
-    'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested',
-  'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.':
-    'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.',
-  'Terminal "{{terminal}}" is not supported yet.':
-    'Terminal "{{terminal}}" is not supported yet.',
+  "Resume a previous session": "Resume a previous session",
+  "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested":
+    "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested",
+  "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.":
+    "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.",
+  'Terminal "{{terminal}}" is not supported yet.': 'Terminal "{{terminal}}" is not supported yet.',
 
   // ============================================================================
   // Commands - Language
   // ============================================================================
-  'Invalid language. Available: {{options}}':
-    'Invalid language. Available: {{options}}',
-  'Language subcommands do not accept additional arguments.':
-    'Language subcommands do not accept additional arguments.',
-  'Current UI language: {{lang}}': 'Current UI language: {{lang}}',
-  'Current LLM output language: {{lang}}':
-    'Current LLM output language: {{lang}}',
-  'LLM output language not set': 'LLM output language not set',
-  'Set UI language': 'Set UI language',
-  'Set LLM output language': 'Set LLM output language',
-  'Usage: /language ui [{{options}}]': 'Usage: /language ui [{{options}}]',
-  'Usage: /language output <language>': 'Usage: /language output <language>',
-  'Example: /language output 中文': 'Example: /language output 中文',
-  'Example: /language output English': 'Example: /language output English',
-  'Example: /language output 日本語': 'Example: /language output 日本語',
-  'Example: /language output Português': 'Example: /language output Português',
-  'UI language changed to {{lang}}': 'UI language changed to {{lang}}',
-  'LLM output language set to {{lang}}': 'LLM output language set to {{lang}}',
-  'LLM output language rule file generated at {{path}}':
-    'LLM output language rule file generated at {{path}}',
-  'Please restart the application for the changes to take effect.':
-    'Please restart the application for the changes to take effect.',
-  'Failed to generate LLM output language rule file: {{error}}':
-    'Failed to generate LLM output language rule file: {{error}}',
-  'Invalid command. Available subcommands:':
-    'Invalid command. Available subcommands:',
-  'Available subcommands:': 'Available subcommands:',
-  'To request additional UI language packs, please open an issue on GitHub.':
-    'To request additional UI language packs, please open an issue on GitHub.',
-  'Available options:': 'Available options:',
-  'Set UI language to {{name}}': 'Set UI language to {{name}}',
+  "Invalid language. Available: {{options}}": "Invalid language. Available: {{options}}",
+  "Language subcommands do not accept additional arguments.":
+    "Language subcommands do not accept additional arguments.",
+  "Current UI language: {{lang}}": "Current UI language: {{lang}}",
+  "Current LLM output language: {{lang}}": "Current LLM output language: {{lang}}",
+  "LLM output language not set": "LLM output language not set",
+  "Set UI language": "Set UI language",
+  "Set LLM output language": "Set LLM output language",
+  "Usage: /language ui [{{options}}]": "Usage: /language ui [{{options}}]",
+  "Usage: /language output <language>": "Usage: /language output <language>",
+  "Example: /language output 中文": "Example: /language output 中文",
+  "Example: /language output English": "Example: /language output English",
+  "Example: /language output 日本語": "Example: /language output 日本語",
+  "Example: /language output Português": "Example: /language output Português",
+  "UI language changed to {{lang}}": "UI language changed to {{lang}}",
+  "LLM output language set to {{lang}}": "LLM output language set to {{lang}}",
+  "LLM output language rule file generated at {{path}}":
+    "LLM output language rule file generated at {{path}}",
+  "Please restart the application for the changes to take effect.":
+    "Please restart the application for the changes to take effect.",
+  "Failed to generate LLM output language rule file: {{error}}":
+    "Failed to generate LLM output language rule file: {{error}}",
+  "Invalid command. Available subcommands:": "Invalid command. Available subcommands:",
+  "Available subcommands:": "Available subcommands:",
+  "To request additional UI language packs, please open an issue on GitHub.":
+    "To request additional UI language packs, please open an issue on GitHub.",
+  "Available options:": "Available options:",
+  "Set UI language to {{name}}": "Set UI language to {{name}}",
 
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Tool Approval Mode': 'Tool Approval Mode',
-  'Current approval mode: {{mode}}': 'Current approval mode: {{mode}}',
-  'Available approval modes:': 'Available approval modes:',
-  'Approval mode changed to: {{mode}}': 'Approval mode changed to: {{mode}}',
-  'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
-    'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})',
-  'Usage: /approval-mode <mode> [--session|--user|--project]':
-    'Usage: /approval-mode <mode> [--session|--user|--project]',
+  "Tool Approval Mode": "Tool Approval Mode",
+  "Current approval mode: {{mode}}": "Current approval mode: {{mode}}",
+  "Available approval modes:": "Available approval modes:",
+  "Approval mode changed to: {{mode}}": "Approval mode changed to: {{mode}}",
+  "Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})":
+    "Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})",
+  "Usage: /approval-mode <mode> [--session|--user|--project]":
+    "Usage: /approval-mode <mode> [--session|--user|--project]",
 
-  'Scope subcommands do not accept additional arguments.':
-    'Scope subcommands do not accept additional arguments.',
-  'Plan mode - Analyze only, do not modify files or execute commands':
-    'Plan mode - Analyze only, do not modify files or execute commands',
-  'Default mode - Require approval for file edits or shell commands':
-    'Default mode - Require approval for file edits or shell commands',
-  'Auto-edit mode - Automatically approve file edits':
-    'Auto-edit mode - Automatically approve file edits',
-  'YOLO mode - Automatically approve all tools':
-    'YOLO mode - Automatically approve all tools',
-  '{{mode}} mode': '{{mode}} mode',
-  'Settings service is not available; unable to persist the approval mode.':
-    'Settings service is not available; unable to persist the approval mode.',
-  'Failed to save approval mode: {{error}}':
-    'Failed to save approval mode: {{error}}',
-  'Failed to change approval mode: {{error}}':
-    'Failed to change approval mode: {{error}}',
-  'Apply to current session only (temporary)':
-    'Apply to current session only (temporary)',
-  'Persist for this project/workspace': 'Persist for this project/workspace',
-  'Persist for this user on this machine':
-    'Persist for this user on this machine',
-  'Analyze only, do not modify files or execute commands':
-    'Analyze only, do not modify files or execute commands',
-  'Require approval for file edits or shell commands':
-    'Require approval for file edits or shell commands',
-  'Automatically approve file edits': 'Automatically approve file edits',
-  'Automatically approve all tools': 'Automatically approve all tools',
-  'Workspace approval mode exists and takes priority. User-level change will have no effect.':
-    'Workspace approval mode exists and takes priority. User-level change will have no effect.',
-  'Apply To': 'Apply To',
-  'Workspace Settings': 'Workspace Settings',
+  "Scope subcommands do not accept additional arguments.":
+    "Scope subcommands do not accept additional arguments.",
+  "Plan mode - Analyze only, do not modify files or execute commands":
+    "Plan mode - Analyze only, do not modify files or execute commands",
+  "Default mode - Require approval for file edits or shell commands":
+    "Default mode - Require approval for file edits or shell commands",
+  "Auto-edit mode - Automatically approve file edits":
+    "Auto-edit mode - Automatically approve file edits",
+  "YOLO mode - Automatically approve all tools": "YOLO mode - Automatically approve all tools",
+  "{{mode}} mode": "{{mode}} mode",
+  "Settings service is not available; unable to persist the approval mode.":
+    "Settings service is not available; unable to persist the approval mode.",
+  "Failed to save approval mode: {{error}}": "Failed to save approval mode: {{error}}",
+  "Failed to change approval mode: {{error}}": "Failed to change approval mode: {{error}}",
+  "Apply to current session only (temporary)": "Apply to current session only (temporary)",
+  "Persist for this project/workspace": "Persist for this project/workspace",
+  "Persist for this user on this machine": "Persist for this user on this machine",
+  "Analyze only, do not modify files or execute commands":
+    "Analyze only, do not modify files or execute commands",
+  "Require approval for file edits or shell commands":
+    "Require approval for file edits or shell commands",
+  "Automatically approve file edits": "Automatically approve file edits",
+  "Automatically approve all tools": "Automatically approve all tools",
+  "Workspace approval mode exists and takes priority. User-level change will have no effect.":
+    "Workspace approval mode exists and takes priority. User-level change will have no effect.",
+  "Apply To": "Apply To",
+  "Workspace Settings": "Workspace Settings",
 
   // ============================================================================
   // Commands - Memory
   // ============================================================================
-  'Commands for interacting with memory.':
-    'Commands for interacting with memory.',
-  'Show the current memory contents.': 'Show the current memory contents.',
-  'Show project-level memory contents.': 'Show project-level memory contents.',
-  'Show global memory contents.': 'Show global memory contents.',
-  'Add content to project-level memory.':
-    'Add content to project-level memory.',
-  'Add content to global memory.': 'Add content to global memory.',
-  'Refresh the memory from the source.': 'Refresh the memory from the source.',
-  'Usage: /memory add --project <text to remember>':
-    'Usage: /memory add --project <text to remember>',
-  'Usage: /memory add --global <text to remember>':
-    'Usage: /memory add --global <text to remember>',
+  "Commands for interacting with memory.": "Commands for interacting with memory.",
+  "Show the current memory contents.": "Show the current memory contents.",
+  "Show project-level memory contents.": "Show project-level memory contents.",
+  "Show global memory contents.": "Show global memory contents.",
+  "Add content to project-level memory.": "Add content to project-level memory.",
+  "Add content to global memory.": "Add content to global memory.",
+  "Refresh the memory from the source.": "Refresh the memory from the source.",
+  "Usage: /memory add --project <text to remember>":
+    "Usage: /memory add --project <text to remember>",
+  "Usage: /memory add --global <text to remember>":
+    "Usage: /memory add --global <text to remember>",
   'Attempting to save to project memory: "{{text}}"':
     'Attempting to save to project memory: "{{text}}"',
   'Attempting to save to global memory: "{{text}}"':
     'Attempting to save to global memory: "{{text}}"',
-  'Current memory content from {{count}} file(s):':
-    'Current memory content from {{count}} file(s):',
-  'Memory is currently empty.': 'Memory is currently empty.',
-  'Project memory file not found or is currently empty.':
-    'Project memory file not found or is currently empty.',
-  'Global memory file not found or is currently empty.':
-    'Global memory file not found or is currently empty.',
-  'Global memory is currently empty.': 'Global memory is currently empty.',
-  'Global memory content:\n\n---\n{{content}}\n---':
-    'Global memory content:\n\n---\n{{content}}\n---',
-  'Project memory content from {{path}}:\n\n---\n{{content}}\n---':
-    'Project memory content from {{path}}:\n\n---\n{{content}}\n---',
-  'Project memory is currently empty.': 'Project memory is currently empty.',
-  'Refreshing memory from source files...':
-    'Refreshing memory from source files...',
-  'Add content to the memory. Use --global for global memory or --project for project memory.':
-    'Add content to the memory. Use --global for global memory or --project for project memory.',
-  'Usage: /memory add [--global|--project] <text to remember>':
-    'Usage: /memory add [--global|--project] <text to remember>',
+  "Current memory content from {{count}} file(s):":
+    "Current memory content from {{count}} file(s):",
+  "Memory is currently empty.": "Memory is currently empty.",
+  "Project memory file not found or is currently empty.":
+    "Project memory file not found or is currently empty.",
+  "Global memory file not found or is currently empty.":
+    "Global memory file not found or is currently empty.",
+  "Global memory is currently empty.": "Global memory is currently empty.",
+  "Global memory content:\n\n---\n{{content}}\n---":
+    "Global memory content:\n\n---\n{{content}}\n---",
+  "Project memory content from {{path}}:\n\n---\n{{content}}\n---":
+    "Project memory content from {{path}}:\n\n---\n{{content}}\n---",
+  "Project memory is currently empty.": "Project memory is currently empty.",
+  "Refreshing memory from source files...": "Refreshing memory from source files...",
+  "Add content to the memory. Use --global for global memory or --project for project memory.":
+    "Add content to the memory. Use --global for global memory or --project for project memory.",
+  "Usage: /memory add [--global|--project] <text to remember>":
+    "Usage: /memory add [--global|--project] <text to remember>",
   'Attempting to save to memory {{scope}}: "{{fact}}"':
     'Attempting to save to memory {{scope}}: "{{fact}}"',
 
   // ============================================================================
   // Commands - MCP
   // ============================================================================
-  'Authenticate with an OAuth-enabled MCP server':
-    'Authenticate with an OAuth-enabled MCP server',
-  'List configured MCP servers and tools':
-    'List configured MCP servers and tools',
-  'Restarts MCP servers.': 'Restarts MCP servers.',
-  'Open MCP management dialog': 'Open MCP management dialog',
-  'Could not retrieve tool registry.': 'Could not retrieve tool registry.',
-  'No MCP servers configured with OAuth authentication.':
-    'No MCP servers configured with OAuth authentication.',
-  'MCP servers with OAuth authentication:':
-    'MCP servers with OAuth authentication:',
-  'Use /mcp auth <server-name> to authenticate.':
-    'Use /mcp auth <server-name> to authenticate.',
+  "Authenticate with an OAuth-enabled MCP server": "Authenticate with an OAuth-enabled MCP server",
+  "List configured MCP servers and tools": "List configured MCP servers and tools",
+  "Restarts MCP servers.": "Restarts MCP servers.",
+  "Open MCP management dialog": "Open MCP management dialog",
+  "Could not retrieve tool registry.": "Could not retrieve tool registry.",
+  "No MCP servers configured with OAuth authentication.":
+    "No MCP servers configured with OAuth authentication.",
+  "MCP servers with OAuth authentication:": "MCP servers with OAuth authentication:",
+  "Use /mcp auth <server-name> to authenticate.": "Use /mcp auth <server-name> to authenticate.",
   "MCP server '{{name}}' not found.": "MCP server '{{name}}' not found.",
   "Successfully authenticated and refreshed tools for '{{name}}'.":
     "Successfully authenticated and refreshed tools for '{{name}}'.",
   "Failed to authenticate with MCP server '{{name}}': {{error}}":
     "Failed to authenticate with MCP server '{{name}}': {{error}}",
-  "Re-discovering tools from '{{name}}'...":
-    "Re-discovering tools from '{{name}}'...",
-  "Discovered {{count}} tool(s) from '{{name}}'.":
-    "Discovered {{count}} tool(s) from '{{name}}'.",
-  'Authentication complete. Returning to server details...':
-    'Authentication complete. Returning to server details...',
-  'Authentication successful.': 'Authentication successful.',
-  'If the browser does not open, copy and paste this URL into your browser:':
-    'If the browser does not open, copy and paste this URL into your browser:',
-  'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.':
-    'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.',
+  "Re-discovering tools from '{{name}}'...": "Re-discovering tools from '{{name}}'...",
+  "Discovered {{count}} tool(s) from '{{name}}'.": "Discovered {{count}} tool(s) from '{{name}}'.",
+  "Authentication complete. Returning to server details...":
+    "Authentication complete. Returning to server details...",
+  "Authentication successful.": "Authentication successful.",
+  "If the browser does not open, copy and paste this URL into your browser:":
+    "If the browser does not open, copy and paste this URL into your browser:",
+  "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.":
+    "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.",
 
   // ============================================================================
   // MCP Management Dialog
   // ============================================================================
-  'Manage MCP servers': 'Manage MCP servers',
-  'Server Detail': 'Server Detail',
-  'Disable Server': 'Disable Server',
-  Tools: 'Tools',
-  'Tool Detail': 'Tool Detail',
-  'MCP Management': 'MCP Management',
-  'Loading...': 'Loading...',
-  'Unknown step': 'Unknown step',
-  'Esc to back': 'Esc to back',
-  '↑↓ to navigate · Enter to select · Esc to close':
-    '↑↓ to navigate · Enter to select · Esc to close',
-  '↑↓ to navigate · Enter to select · Esc to back':
-    '↑↓ to navigate · Enter to select · Esc to back',
-  '↑↓ to navigate · Enter to confirm · Esc to back':
-    '↑↓ to navigate · Enter to confirm · Esc to back',
-  'User Settings (global)': 'User Settings (global)',
-  'Workspace Settings (project-specific)':
-    'Workspace Settings (project-specific)',
-  'Disable server:': 'Disable server:',
-  'Select where to add the server to the exclude list:':
-    'Select where to add the server to the exclude list:',
-  'Press Enter to confirm, Esc to cancel':
-    'Press Enter to confirm, Esc to cancel',
-  'View tools': 'View tools',
-  Reconnect: 'Reconnect',
-  Enable: 'Enable',
-  Disable: 'Disable',
-  Authenticate: 'Authenticate',
-  'Re-authenticate': 'Re-authenticate',
-  'Clear Authentication': 'Clear Authentication',
-  'Server:': 'Server:',
-  'Command:': 'Command:',
-  'Working Directory:': 'Working Directory:',
-  'Capabilities:': 'Capabilities:',
-  'No server selected': 'No server selected',
-  prompts: 'prompts',
-  '(disabled)': '(disabled)',
-  'Error:': 'Error:',
-  tool: 'tool',
-  tools: 'tools',
-  connected: 'connected',
-  connecting: 'connecting',
-  disconnected: 'disconnected',
+  "Manage MCP servers": "Manage MCP servers",
+  "Server Detail": "Server Detail",
+  "Disable Server": "Disable Server",
+  Tools: "Tools",
+  "Tool Detail": "Tool Detail",
+  "MCP Management": "MCP Management",
+  "Loading...": "Loading...",
+  "Unknown step": "Unknown step",
+  "Esc to back": "Esc to back",
+  "↑↓ to navigate · Enter to select · Esc to close":
+    "↑↓ to navigate · Enter to select · Esc to close",
+  "↑↓ to navigate · Enter to select · Esc to back":
+    "↑↓ to navigate · Enter to select · Esc to back",
+  "↑↓ to navigate · Enter to confirm · Esc to back":
+    "↑↓ to navigate · Enter to confirm · Esc to back",
+  "User Settings (global)": "User Settings (global)",
+  "Workspace Settings (project-specific)": "Workspace Settings (project-specific)",
+  "Disable server:": "Disable server:",
+  "Select where to add the server to the exclude list:":
+    "Select where to add the server to the exclude list:",
+  "Press Enter to confirm, Esc to cancel": "Press Enter to confirm, Esc to cancel",
+  "View tools": "View tools",
+  Reconnect: "Reconnect",
+  Enable: "Enable",
+  Disable: "Disable",
+  Authenticate: "Authenticate",
+  "Re-authenticate": "Re-authenticate",
+  "Clear Authentication": "Clear Authentication",
+  "Server:": "Server:",
+  "Command:": "Command:",
+  "Working Directory:": "Working Directory:",
+  "Capabilities:": "Capabilities:",
+  "No server selected": "No server selected",
+  prompts: "prompts",
+  "(disabled)": "(disabled)",
+  "Error:": "Error:",
+  tool: "tool",
+  tools: "tools",
+  connected: "connected",
+  connecting: "connecting",
+  disconnected: "disconnected",
 
   // MCP Server List
-  'User MCPs': 'User MCPs',
-  'Project MCPs': 'Project MCPs',
-  'Extension MCPs': 'Extension MCPs',
-  server: 'server',
-  servers: 'servers',
-  'Add MCP servers to your settings to get started.':
-    'Add MCP servers to your settings to get started.',
-  'Run qwen --debug to see error logs': 'Run qwen --debug to see error logs',
+  "User MCPs": "User MCPs",
+  "Project MCPs": "Project MCPs",
+  "Extension MCPs": "Extension MCPs",
+  server: "server",
+  servers: "servers",
+  "Add MCP servers to your settings to get started.":
+    "Add MCP servers to your settings to get started.",
+  "Run qwen --debug to see error logs": "Run qwen --debug to see error logs",
 
   // MCP OAuth Authentication
-  'OAuth Authentication': 'OAuth Authentication',
-  'Press Enter to start authentication, Esc to go back':
-    'Press Enter to start authentication, Esc to go back',
-  'Authenticating... Please complete the login in your browser.':
-    'Authenticating... Please complete the login in your browser.',
-  'Press Enter or Esc to go back': 'Press Enter or Esc to go back',
+  "OAuth Authentication": "OAuth Authentication",
+  "Press Enter to start authentication, Esc to go back":
+    "Press Enter to start authentication, Esc to go back",
+  "Authenticating... Please complete the login in your browser.":
+    "Authenticating... Please complete the login in your browser.",
+  "Press Enter or Esc to go back": "Press Enter or Esc to go back",
 
   // MCP Tool List
-  'No tools available for this server.': 'No tools available for this server.',
-  destructive: 'destructive',
-  'read-only': 'read-only',
-  'open-world': 'open-world',
-  idempotent: 'idempotent',
-  'Tools for {{name}}': 'Tools for {{name}}',
-  'Tools for {{serverName}}': 'Tools for {{serverName}}',
-  '{{current}}/{{total}}': '{{current}}/{{total}}',
+  "No tools available for this server.": "No tools available for this server.",
+  destructive: "destructive",
+  "read-only": "read-only",
+  "open-world": "open-world",
+  idempotent: "idempotent",
+  "Tools for {{name}}": "Tools for {{name}}",
+  "Tools for {{serverName}}": "Tools for {{serverName}}",
+  "{{current}}/{{total}}": "{{current}}/{{total}}",
 
   // MCP Tool Detail
-  required: 'required',
-  Type: 'Type',
-  Enum: 'Enum',
-  Parameters: 'Parameters',
-  'No tool selected': 'No tool selected',
-  Annotations: 'Annotations',
-  Title: 'Title',
-  'Read Only': 'Read Only',
-  Destructive: 'Destructive',
-  Idempotent: 'Idempotent',
-  'Open World': 'Open World',
-  Server: 'Server',
+  required: "required",
+  Type: "Type",
+  Enum: "Enum",
+  Parameters: "Parameters",
+  "No tool selected": "No tool selected",
+  Annotations: "Annotations",
+  Title: "Title",
+  "Read Only": "Read Only",
+  Destructive: "Destructive",
+  Idempotent: "Idempotent",
+  "Open World": "Open World",
+  Server: "Server",
 
   // Invalid tool related translations
-  '{{count}} invalid tools': '{{count}} invalid tools',
-  invalid: 'invalid',
-  'invalid: {{reason}}': 'invalid: {{reason}}',
-  'missing name': 'missing name',
-  'missing description': 'missing description',
-  '(unnamed)': '(unnamed)',
-  'Warning: This tool cannot be called by the LLM':
-    'Warning: This tool cannot be called by the LLM',
-  Reason: 'Reason',
-  'Tools must have both name and description to be used by the LLM.':
-    'Tools must have both name and description to be used by the LLM.',
+  "{{count}} invalid tools": "{{count}} invalid tools",
+  invalid: "invalid",
+  "invalid: {{reason}}": "invalid: {{reason}}",
+  "missing name": "missing name",
+  "missing description": "missing description",
+  "(unnamed)": "(unnamed)",
+  "Warning: This tool cannot be called by the LLM":
+    "Warning: This tool cannot be called by the LLM",
+  Reason: "Reason",
+  "Tools must have both name and description to be used by the LLM.":
+    "Tools must have both name and description to be used by the LLM.",
 
   // ============================================================================
   // Commands - Chat
   // ============================================================================
-  'Manage conversation history.': 'Manage conversation history.',
-  'List saved conversation checkpoints': 'List saved conversation checkpoints',
-  'No saved conversation checkpoints found.':
-    'No saved conversation checkpoints found.',
-  'List of saved conversations:': 'List of saved conversations:',
-  'Note: Newest last, oldest first': 'Note: Newest last, oldest first',
-  'Save the current conversation as a checkpoint. Usage: /chat save <tag>':
-    'Save the current conversation as a checkpoint. Usage: /chat save <tag>',
-  'Missing tag. Usage: /chat save <tag>':
-    'Missing tag. Usage: /chat save <tag>',
-  'Delete a conversation checkpoint. Usage: /chat delete <tag>':
-    'Delete a conversation checkpoint. Usage: /chat delete <tag>',
-  'Missing tag. Usage: /chat delete <tag>':
-    'Missing tag. Usage: /chat delete <tag>',
+  "Manage conversation history.": "Manage conversation history.",
+  "List saved conversation checkpoints": "List saved conversation checkpoints",
+  "No saved conversation checkpoints found.": "No saved conversation checkpoints found.",
+  "List of saved conversations:": "List of saved conversations:",
+  "Note: Newest last, oldest first": "Note: Newest last, oldest first",
+  "Save the current conversation as a checkpoint. Usage: /chat save <tag>":
+    "Save the current conversation as a checkpoint. Usage: /chat save <tag>",
+  "Missing tag. Usage: /chat save <tag>": "Missing tag. Usage: /chat save <tag>",
+  "Delete a conversation checkpoint. Usage: /chat delete <tag>":
+    "Delete a conversation checkpoint. Usage: /chat delete <tag>",
+  "Missing tag. Usage: /chat delete <tag>": "Missing tag. Usage: /chat delete <tag>",
   "Conversation checkpoint '{{tag}}' has been deleted.":
     "Conversation checkpoint '{{tag}}' has been deleted.",
   "Error: No checkpoint found with tag '{{tag}}'.":
     "Error: No checkpoint found with tag '{{tag}}'.",
-  'Resume a conversation from a checkpoint. Usage: /chat resume <tag>':
-    'Resume a conversation from a checkpoint. Usage: /chat resume <tag>',
-  'Missing tag. Usage: /chat resume <tag>':
-    'Missing tag. Usage: /chat resume <tag>',
-  'No saved checkpoint found with tag: {{tag}}.':
-    'No saved checkpoint found with tag: {{tag}}.',
-  'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?':
-    'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?',
-  'No chat client available to save conversation.':
-    'No chat client available to save conversation.',
-  'Conversation checkpoint saved with tag: {{tag}}.':
-    'Conversation checkpoint saved with tag: {{tag}}.',
-  'No conversation found to save.': 'No conversation found to save.',
-  'No chat client available to share conversation.':
-    'No chat client available to share conversation.',
-  'Invalid file format. Only .md and .json are supported.':
-    'Invalid file format. Only .md and .json are supported.',
-  'Error sharing conversation: {{error}}':
-    'Error sharing conversation: {{error}}',
-  'Conversation shared to {{filePath}}': 'Conversation shared to {{filePath}}',
-  'No conversation found to share.': 'No conversation found to share.',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
-    'Share the current conversation to a markdown or json file. Usage: /chat share <file>',
+  "Resume a conversation from a checkpoint. Usage: /chat resume <tag>":
+    "Resume a conversation from a checkpoint. Usage: /chat resume <tag>",
+  "Missing tag. Usage: /chat resume <tag>": "Missing tag. Usage: /chat resume <tag>",
+  "No saved checkpoint found with tag: {{tag}}.": "No saved checkpoint found with tag: {{tag}}.",
+  "A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?":
+    "A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?",
+  "No chat client available to save conversation.":
+    "No chat client available to save conversation.",
+  "Conversation checkpoint saved with tag: {{tag}}.":
+    "Conversation checkpoint saved with tag: {{tag}}.",
+  "No conversation found to save.": "No conversation found to save.",
+  "No chat client available to share conversation.":
+    "No chat client available to share conversation.",
+  "Invalid file format. Only .md and .json are supported.":
+    "Invalid file format. Only .md and .json are supported.",
+  "Error sharing conversation: {{error}}": "Error sharing conversation: {{error}}",
+  "Conversation shared to {{filePath}}": "Conversation shared to {{filePath}}",
+  "No conversation found to share.": "No conversation found to share.",
+  "Share the current conversation to a markdown or json file. Usage: /chat share <file>":
+    "Share the current conversation to a markdown or json file. Usage: /chat share <file>",
 
   // ============================================================================
   // Commands - Summary
   // ============================================================================
-  'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md':
-    'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md',
-  'No chat client available to generate summary.':
-    'No chat client available to generate summary.',
-  'Already generating summary, wait for previous request to complete':
-    'Already generating summary, wait for previous request to complete',
-  'No conversation found to summarize.': 'No conversation found to summarize.',
-  'Failed to generate project context summary: {{error}}':
-    'Failed to generate project context summary: {{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    'Saved project summary to {{filePathForDisplay}}.',
-  'Saving project summary...': 'Saving project summary...',
-  'Generating project summary...': 'Generating project summary...',
-  'Failed to generate summary - no text content received from LLM response':
-    'Failed to generate summary - no text content received from LLM response',
+  "Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md":
+    "Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md",
+  "No chat client available to generate summary.": "No chat client available to generate summary.",
+  "Already generating summary, wait for previous request to complete":
+    "Already generating summary, wait for previous request to complete",
+  "No conversation found to summarize.": "No conversation found to summarize.",
+  "Failed to generate project context summary: {{error}}":
+    "Failed to generate project context summary: {{error}}",
+  "Saved project summary to {{filePathForDisplay}}.":
+    "Saved project summary to {{filePathForDisplay}}.",
+  "Saving project summary...": "Saving project summary...",
+  "Generating project summary...": "Generating project summary...",
+  "Failed to generate summary - no text content received from LLM response":
+    "Failed to generate summary - no text content received from LLM response",
 
   // ============================================================================
   // Commands - Model
   // ============================================================================
-  'Switch the model for this session': 'Switch the model for this session',
-  'Set fast model for background tasks': 'Set fast model for background tasks',
-  'Content generator configuration not available.':
-    'Content generator configuration not available.',
-  'Authentication type not available.': 'Authentication type not available.',
-  'No models available for the current authentication type ({{authType}}).':
-    'No models available for the current authentication type ({{authType}}).',
+  "Switch the model for this session": "Switch the model for this session",
+  "Set fast model for background tasks": "Set fast model for background tasks",
+  "Content generator configuration not available.":
+    "Content generator configuration not available.",
+  "Authentication type not available.": "Authentication type not available.",
+  "No models available for the current authentication type ({{authType}}).":
+    "No models available for the current authentication type ({{authType}}).",
 
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    'Starting a new session, resetting chat, and clearing terminal.',
-  'Starting a new session and clearing.':
-    'Starting a new session and clearing.',
+  "Starting a new session, resetting chat, and clearing terminal.":
+    "Starting a new session, resetting chat, and clearing terminal.",
+  "Starting a new session and clearing.": "Starting a new session and clearing.",
 
   // ============================================================================
   // Commands - Compress
   // ============================================================================
-  'Already compressing, wait for previous request to complete':
-    'Already compressing, wait for previous request to complete',
-  'Failed to compress chat history.': 'Failed to compress chat history.',
-  'Failed to compress chat history: {{error}}':
-    'Failed to compress chat history: {{error}}',
-  'Compressing chat history': 'Compressing chat history',
-  'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.':
-    'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.',
-  'Compression was not beneficial for this history size.':
-    'Compression was not beneficial for this history size.',
-  'Chat history compression did not reduce size. This may indicate issues with the compression prompt.':
-    'Chat history compression did not reduce size. This may indicate issues with the compression prompt.',
-  'Could not compress chat history due to a token counting error.':
-    'Could not compress chat history due to a token counting error.',
-  'Chat history is already compressed.': 'Chat history is already compressed.',
+  "Already compressing, wait for previous request to complete":
+    "Already compressing, wait for previous request to complete",
+  "Failed to compress chat history.": "Failed to compress chat history.",
+  "Failed to compress chat history: {{error}}": "Failed to compress chat history: {{error}}",
+  "Compressing chat history": "Compressing chat history",
+  "Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.":
+    "Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.",
+  "Compression was not beneficial for this history size.":
+    "Compression was not beneficial for this history size.",
+  "Chat history compression did not reduce size. This may indicate issues with the compression prompt.":
+    "Chat history compression did not reduce size. This may indicate issues with the compression prompt.",
+  "Could not compress chat history due to a token counting error.":
+    "Could not compress chat history due to a token counting error.",
+  "Chat history is already compressed.": "Chat history is already compressed.",
 
   // ============================================================================
   // Commands - Directory
   // ============================================================================
-  'Configuration is not available.': 'Configuration is not available.',
-  'Please provide at least one path to add.':
-    'Please provide at least one path to add.',
-  'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.':
-    'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.',
+  "Configuration is not available.": "Configuration is not available.",
+  "Please provide at least one path to add.": "Please provide at least one path to add.",
+  "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.":
+    "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.",
   "Error adding '{{path}}': {{error}}": "Error adding '{{path}}': {{error}}",
-  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
-    'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}',
-  'Error refreshing memory: {{error}}': 'Error refreshing memory: {{error}}',
-  'Successfully added directories:\n- {{directories}}':
-    'Successfully added directories:\n- {{directories}}',
-  'Current workspace directories:\n{{directories}}':
-    'Current workspace directories:\n{{directories}}',
+  "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}":
+    "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}",
+  "Error refreshing memory: {{error}}": "Error refreshing memory: {{error}}",
+  "Successfully added directories:\n- {{directories}}":
+    "Successfully added directories:\n- {{directories}}",
+  "Current workspace directories:\n{{directories}}":
+    "Current workspace directories:\n{{directories}}",
 
   // ============================================================================
   // Commands - Docs
   // ============================================================================
-  'Please open the following URL in your browser to view the documentation:\n{{url}}':
-    'Please open the following URL in your browser to view the documentation:\n{{url}}',
-  'Opening documentation in your browser: {{url}}':
-    'Opening documentation in your browser: {{url}}',
+  "Please open the following URL in your browser to view the documentation:\n{{url}}":
+    "Please open the following URL in your browser to view the documentation:\n{{url}}",
+  "Opening documentation in your browser: {{url}}":
+    "Opening documentation in your browser: {{url}}",
 
   // ============================================================================
   // Dialogs - Tool Confirmation
   // ============================================================================
-  'Do you want to proceed?': 'Do you want to proceed?',
-  'Yes, allow once': 'Yes, allow once',
-  'Allow always': 'Allow always',
-  Yes: 'Yes',
-  No: 'No',
-  'No (esc)': 'No (esc)',
-  'Yes, allow always for this session': 'Yes, allow always for this session',
-  'Modify in progress:': 'Modify in progress:',
-  'Save and close external editor to continue':
-    'Save and close external editor to continue',
-  'Apply this change?': 'Apply this change?',
-  'Yes, allow always': 'Yes, allow always',
-  'Modify with external editor': 'Modify with external editor',
-  'No, suggest changes (esc)': 'No, suggest changes (esc)',
+  "Do you want to proceed?": "Do you want to proceed?",
+  "Yes, allow once": "Yes, allow once",
+  "Allow always": "Allow always",
+  Yes: "Yes",
+  No: "No",
+  "No (esc)": "No (esc)",
+  "Yes, allow always for this session": "Yes, allow always for this session",
+  "Modify in progress:": "Modify in progress:",
+  "Save and close external editor to continue": "Save and close external editor to continue",
+  "Apply this change?": "Apply this change?",
+  "Yes, allow always": "Yes, allow always",
+  "Modify with external editor": "Modify with external editor",
+  "No, suggest changes (esc)": "No, suggest changes (esc)",
   "Allow execution of: '{{command}}'?": "Allow execution of: '{{command}}'?",
-  'Yes, allow always ...': 'Yes, allow always ...',
-  'Always allow in this project': 'Always allow in this project',
-  'Always allow {{action}} in this project':
-    'Always allow {{action}} in this project',
-  'Always allow for this user': 'Always allow for this user',
-  'Always allow {{action}} for this user':
-    'Always allow {{action}} for this user',
-  'Yes, restore previous mode ({{mode}})':
-    'Yes, restore previous mode ({{mode}})',
-  'Yes, and auto-accept edits': 'Yes, and auto-accept edits',
-  'Yes, and manually approve edits': 'Yes, and manually approve edits',
-  'No, keep planning (esc)': 'No, keep planning (esc)',
-  'URLs to fetch:': 'URLs to fetch:',
-  'MCP Server: {{server}}': 'MCP Server: {{server}}',
-  'Tool: {{tool}}': 'Tool: {{tool}}',
+  "Yes, allow always ...": "Yes, allow always ...",
+  "Always allow in this project": "Always allow in this project",
+  "Always allow {{action}} in this project": "Always allow {{action}} in this project",
+  "Always allow for this user": "Always allow for this user",
+  "Always allow {{action}} for this user": "Always allow {{action}} for this user",
+  "Yes, restore previous mode ({{mode}})": "Yes, restore previous mode ({{mode}})",
+  "Yes, and auto-accept edits": "Yes, and auto-accept edits",
+  "Yes, and manually approve edits": "Yes, and manually approve edits",
+  "No, keep planning (esc)": "No, keep planning (esc)",
+  "URLs to fetch:": "URLs to fetch:",
+  "MCP Server: {{server}}": "MCP Server: {{server}}",
+  "Tool: {{tool}}": "Tool: {{tool}}",
   'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?':
     'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?',
   'Yes, always allow tool "{{tool}}" from server "{{server}}"':
@@ -1254,742 +1170,699 @@ export default {
   // ============================================================================
   // Dialogs - Shell Confirmation
   // ============================================================================
-  'Shell Command Execution': 'Shell Command Execution',
-  'A custom command wants to run the following shell commands:':
-    'A custom command wants to run the following shell commands:',
+  "Shell Command Execution": "Shell Command Execution",
+  "A custom command wants to run the following shell commands:":
+    "A custom command wants to run the following shell commands:",
 
   // ============================================================================
   // Dialogs - Pro Quota
   // ============================================================================
-  'Pro quota limit reached for {{model}}.':
-    'Pro quota limit reached for {{model}}.',
-  'Change auth (executes the /auth command)':
-    'Change auth (executes the /auth command)',
-  'Continue with {{model}}': 'Continue with {{model}}',
+  "Pro quota limit reached for {{model}}.": "Pro quota limit reached for {{model}}.",
+  "Change auth (executes the /auth command)": "Change auth (executes the /auth command)",
+  "Continue with {{model}}": "Continue with {{model}}",
 
   // ============================================================================
   // Dialogs - Welcome Back
   // ============================================================================
-  'Current Plan:': 'Current Plan:',
-  'Progress: {{done}}/{{total}} tasks completed':
-    'Progress: {{done}}/{{total}} tasks completed',
-  ', {{inProgress}} in progress': ', {{inProgress}} in progress',
-  'Pending Tasks:': 'Pending Tasks:',
-  'What would you like to do?': 'What would you like to do?',
-  'Choose how to proceed with your session:':
-    'Choose how to proceed with your session:',
-  'Start new chat session': 'Start new chat session',
-  'Continue previous conversation': 'Continue previous conversation',
-  '👋 Welcome back! (Last updated: {{timeAgo}})':
-    '👋 Welcome back! (Last updated: {{timeAgo}})',
-  '🎯 Overall Goal:': '🎯 Overall Goal:',
+  "Current Plan:": "Current Plan:",
+  "Progress: {{done}}/{{total}} tasks completed": "Progress: {{done}}/{{total}} tasks completed",
+  ", {{inProgress}} in progress": ", {{inProgress}} in progress",
+  "Pending Tasks:": "Pending Tasks:",
+  "What would you like to do?": "What would you like to do?",
+  "Choose how to proceed with your session:": "Choose how to proceed with your session:",
+  "Start new chat session": "Start new chat session",
+  "Continue previous conversation": "Continue previous conversation",
+  "👋 Welcome back! (Last updated: {{timeAgo}})": "👋 Welcome back! (Last updated: {{timeAgo}})",
+  "🎯 Overall Goal:": "🎯 Overall Goal:",
 
   // ============================================================================
   // Dialogs - Auth
   // ============================================================================
-  'Get started': 'Get started',
-  'Select Authentication Method': 'Select Authentication Method',
-  'OpenAI API key is required to use OpenAI authentication.':
-    'OpenAI API key is required to use OpenAI authentication.',
-  'You must select an auth method to proceed. Press Ctrl+C again to exit.':
-    'You must select an auth method to proceed. Press Ctrl+C again to exit.',
-  'Terms of Services and Privacy Notice':
-    'Terms of Services and Privacy Notice',
-  'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models':
-    'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models',
-  'Alibaba Cloud Coding Plan': 'Alibaba Cloud Coding Plan',
-  'Bring your own API key': 'Bring your own API key',
-  'API-KEY': 'API-KEY',
-  'Use coding plan credentials or your own api-keys/providers.':
-    'Use coding plan credentials or your own api-keys/providers.',
-  OpenAI: 'OpenAI',
-  'Failed to login. Message: {{message}}':
-    'Failed to login. Message: {{message}}',
-  'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.':
-    'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.',
-  'Please visit this URL to authorize:': 'Please visit this URL to authorize:',
-  'Or scan the QR code below:': 'Or scan the QR code below:',
-  'Waiting for authorization': 'Waiting for authorization',
-  'Time remaining:': 'Time remaining:',
-  '(Press ESC or CTRL+C to cancel)': '(Press ESC or CTRL+C to cancel)',
-  'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.':
-    'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.',
-  'Press any key to return to authentication type selection.':
-    'Press any key to return to authentication type selection.',
-  'Authentication timed out. Please try again.':
-    'Authentication timed out. Please try again.',
-  'Waiting for auth... (Press ESC or CTRL+C to cancel)':
-    'Waiting for auth... (Press ESC or CTRL+C to cancel)',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.',
-  '{{envKeyHint}} environment variable not found.':
-    '{{envKeyHint}} environment variable not found.',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    'ANTHROPIC_BASE_URL environment variable not found.',
-  'Invalid auth method selected.': 'Invalid auth method selected.',
-  'Failed to authenticate. Message: {{message}}':
-    'Failed to authenticate. Message: {{message}}',
-  'Authenticated successfully with {{authType}} credentials.':
-    'Authenticated successfully with {{authType}} credentials.',
+  "Get started": "Get started",
+  "Select Authentication Method": "Select Authentication Method",
+  "OpenAI API key is required to use OpenAI authentication.":
+    "OpenAI API key is required to use OpenAI authentication.",
+  "You must select an auth method to proceed. Press Ctrl+C again to exit.":
+    "You must select an auth method to proceed. Press Ctrl+C again to exit.",
+  "Terms of Services and Privacy Notice": "Terms of Services and Privacy Notice",
+  "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models":
+    "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models",
+  "Alibaba Cloud Coding Plan": "Alibaba Cloud Coding Plan",
+  "Bring your own API key": "Bring your own API key",
+  "API-KEY": "API-KEY",
+  "Use coding plan credentials or your own api-keys/providers.":
+    "Use coding plan credentials or your own api-keys/providers.",
+  OpenAI: "OpenAI",
+  "Failed to login. Message: {{message}}": "Failed to login. Message: {{message}}",
+  "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.":
+    "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.",
+  "Please visit this URL to authorize:": "Please visit this URL to authorize:",
+  "Or scan the QR code below:": "Or scan the QR code below:",
+  "Waiting for authorization": "Waiting for authorization",
+  "Time remaining:": "Time remaining:",
+  "(Press ESC or CTRL+C to cancel)": "(Press ESC or CTRL+C to cancel)",
+  "OAuth token expired (over {{seconds}} seconds). Please select authentication method again.":
+    "OAuth token expired (over {{seconds}} seconds). Please select authentication method again.",
+  "Press any key to return to authentication type selection.":
+    "Press any key to return to authentication type selection.",
+  "Authentication timed out. Please try again.": "Authentication timed out. Please try again.",
+  "Waiting for auth... (Press ESC or CTRL+C to cancel)":
+    "Waiting for auth... (Press ESC or CTRL+C to cancel)",
+  "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.":
+    "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.",
+  "{{envKeyHint}} environment variable not found.":
+    "{{envKeyHint}} environment variable not found.",
+  "{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.":
+    "{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.",
+  "{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.":
+    "{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.",
+  "Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.":
+    "Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.",
+  "Anthropic provider missing required baseUrl in modelProviders[].baseUrl.":
+    "Anthropic provider missing required baseUrl in modelProviders[].baseUrl.",
+  "ANTHROPIC_BASE_URL environment variable not found.":
+    "ANTHROPIC_BASE_URL environment variable not found.",
+  "Invalid auth method selected.": "Invalid auth method selected.",
+  "Failed to authenticate. Message: {{message}}": "Failed to authenticate. Message: {{message}}",
+  "Authenticated successfully with {{authType}} credentials.":
+    "Authenticated successfully with {{authType}} credentials.",
   'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}':
     'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}',
-  'OpenAI Configuration Required': 'OpenAI Configuration Required',
-  'Please enter your OpenAI configuration. You can get an API key from':
-    'Please enter your OpenAI configuration. You can get an API key from',
-  'API Key:': 'API Key:',
-  'Invalid credentials: {{errorMessage}}':
-    'Invalid credentials: {{errorMessage}}',
-  'Failed to validate credentials': 'Failed to validate credentials',
-  'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel':
-    'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel',
+  "OpenAI Configuration Required": "OpenAI Configuration Required",
+  "Please enter your OpenAI configuration. You can get an API key from":
+    "Please enter your OpenAI configuration. You can get an API key from",
+  "API Key:": "API Key:",
+  "Invalid credentials: {{errorMessage}}": "Invalid credentials: {{errorMessage}}",
+  "Failed to validate credentials": "Failed to validate credentials",
+  "Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel":
+    "Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel",
 
   // ============================================================================
   // Dialogs - Model
   // ============================================================================
-  'Select Model': 'Select Model',
-  '(Press Esc to close)': '(Press Esc to close)',
-  'Current (effective) configuration': 'Current (effective) configuration',
-  AuthType: 'AuthType',
-  'API Key': 'API Key',
-  unset: 'unset',
-  '(default)': '(default)',
-  '(set)': '(set)',
-  '(not set)': '(not set)',
-  Modality: 'Modality',
-  'Context Window': 'Context Window',
-  text: 'text',
-  'text-only': 'text-only',
-  image: 'image',
-  pdf: 'pdf',
-  audio: 'audio',
-  video: 'video',
-  'not set': 'not set',
-  none: 'none',
-  unknown: 'unknown',
+  "Select Model": "Select Model",
+  "(Press Esc to close)": "(Press Esc to close)",
+  "Current (effective) configuration": "Current (effective) configuration",
+  AuthType: "AuthType",
+  "API Key": "API Key",
+  unset: "unset",
+  "(default)": "(default)",
+  "(set)": "(set)",
+  "(not set)": "(not set)",
+  Modality: "Modality",
+  "Context Window": "Context Window",
+  text: "text",
+  "text-only": "text-only",
+  image: "image",
+  pdf: "pdf",
+  audio: "audio",
+  video: "video",
+  "not set": "not set",
+  none: "none",
+  unknown: "unknown",
   "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
     "Failed to switch model to '{{modelId}}'.\n\n{{error}}",
-  'Qwen 3.6 Plus — efficient hybrid model with leading coding performance':
-    'Qwen 3.6 Plus — efficient hybrid model with leading coding performance',
-  'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
-    'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)',
+  "Qwen 3.6 Plus — efficient hybrid model with leading coding performance":
+    "Qwen 3.6 Plus — efficient hybrid model with leading coding performance",
+  "The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)":
+    "The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)",
 
   // ============================================================================
   // Dialogs - Permissions
   // ============================================================================
-  'Manage folder trust settings': 'Manage folder trust settings',
-  'Manage permission rules': 'Manage permission rules',
-  Allow: 'Allow',
-  Ask: 'Ask',
-  Deny: 'Deny',
-  Workspace: 'Workspace',
+  "Manage folder trust settings": "Manage folder trust settings",
+  "Manage permission rules": "Manage permission rules",
+  Allow: "Allow",
+  Ask: "Ask",
+  Deny: "Deny",
+  Workspace: "Workspace",
   "Qwen Code won't ask before using allowed tools.":
     "Qwen Code won't ask before using allowed tools.",
-  'Qwen Code will ask before using these tools.':
-    'Qwen Code will ask before using these tools.',
-  'Qwen Code is not allowed to use denied tools.':
-    'Qwen Code is not allowed to use denied tools.',
-  'Manage trusted directories for this workspace.':
-    'Manage trusted directories for this workspace.',
-  'Any use of the {{tool}} tool': 'Any use of the {{tool}} tool',
-  "{{tool}} commands matching '{{pattern}}'":
-    "{{tool}} commands matching '{{pattern}}'",
-  'From user settings': 'From user settings',
-  'From project settings': 'From project settings',
-  'From session': 'From session',
-  'Project settings (local)': 'Project settings (local)',
-  'Saved in .qwen/settings.local.json': 'Saved in .qwen/settings.local.json',
-  'Project settings': 'Project settings',
-  'Checked in at .qwen/settings.json': 'Checked in at .qwen/settings.json',
-  'User settings': 'User settings',
-  'Saved in at ~/.qwen/settings.json': 'Saved in at ~/.qwen/settings.json',
-  'Add a new rule…': 'Add a new rule…',
-  'Add {{type}} permission rule': 'Add {{type}} permission rule',
-  'Permission rules are a tool name, optionally followed by a specifier in parentheses.':
-    'Permission rules are a tool name, optionally followed by a specifier in parentheses.',
-  'e.g.,': 'e.g.,',
-  or: 'or',
-  'Enter permission rule…': 'Enter permission rule…',
-  'Enter to submit · Esc to cancel': 'Enter to submit · Esc to cancel',
-  'Where should this rule be saved?': 'Where should this rule be saved?',
-  'Enter to confirm · Esc to cancel': 'Enter to confirm · Esc to cancel',
-  'Delete {{type}} rule?': 'Delete {{type}} rule?',
-  'Are you sure you want to delete this permission rule?':
-    'Are you sure you want to delete this permission rule?',
-  'Permissions:': 'Permissions:',
-  '(←/→ or tab to cycle)': '(←/→ or tab to cycle)',
-  'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel':
-    'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel',
-  'Search…': 'Search…',
-  'Use /trust to manage folder trust settings for this workspace.':
-    'Use /trust to manage folder trust settings for this workspace.',
+  "Qwen Code will ask before using these tools.": "Qwen Code will ask before using these tools.",
+  "Qwen Code is not allowed to use denied tools.": "Qwen Code is not allowed to use denied tools.",
+  "Manage trusted directories for this workspace.":
+    "Manage trusted directories for this workspace.",
+  "Any use of the {{tool}} tool": "Any use of the {{tool}} tool",
+  "{{tool}} commands matching '{{pattern}}'": "{{tool}} commands matching '{{pattern}}'",
+  "From user settings": "From user settings",
+  "From project settings": "From project settings",
+  "From session": "From session",
+  "Project settings (local)": "Project settings (local)",
+  "Saved in .qwen/settings.local.json": "Saved in .qwen/settings.local.json",
+  "Project settings": "Project settings",
+  "Checked in at .qwen/settings.json": "Checked in at .qwen/settings.json",
+  "User settings": "User settings",
+  "Saved in at ~/.qwen/settings.json": "Saved in at ~/.qwen/settings.json",
+  "Add a new rule…": "Add a new rule…",
+  "Add {{type}} permission rule": "Add {{type}} permission rule",
+  "Permission rules are a tool name, optionally followed by a specifier in parentheses.":
+    "Permission rules are a tool name, optionally followed by a specifier in parentheses.",
+  "e.g.,": "e.g.,",
+  or: "or",
+  "Enter permission rule…": "Enter permission rule…",
+  "Enter to submit · Esc to cancel": "Enter to submit · Esc to cancel",
+  "Where should this rule be saved?": "Where should this rule be saved?",
+  "Enter to confirm · Esc to cancel": "Enter to confirm · Esc to cancel",
+  "Delete {{type}} rule?": "Delete {{type}} rule?",
+  "Are you sure you want to delete this permission rule?":
+    "Are you sure you want to delete this permission rule?",
+  "Permissions:": "Permissions:",
+  "(←/→ or tab to cycle)": "(←/→ or tab to cycle)",
+  "Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel":
+    "Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel",
+  "Search…": "Search…",
+  "Use /trust to manage folder trust settings for this workspace.":
+    "Use /trust to manage folder trust settings for this workspace.",
   // Workspace directory management
-  'Add directory…': 'Add directory…',
-  'Add directory to workspace': 'Add directory to workspace',
-  'Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.':
-    'Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.',
-  'Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.':
-    'Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.',
-  'Enter the path to the directory:': 'Enter the path to the directory:',
-  'Enter directory path…': 'Enter directory path…',
-  'Tab to complete · Enter to add · Esc to cancel':
-    'Tab to complete · Enter to add · Esc to cancel',
-  'Remove directory?': 'Remove directory?',
-  'Are you sure you want to remove this directory from the workspace?':
-    'Are you sure you want to remove this directory from the workspace?',
-  '  (Original working directory)': '  (Original working directory)',
-  '  (from settings)': '  (from settings)',
-  'Directory does not exist.': 'Directory does not exist.',
-  'Path is not a directory.': 'Path is not a directory.',
-  'This directory is already in the workspace.':
-    'This directory is already in the workspace.',
-  'Already covered by existing directory: {{dir}}':
-    'Already covered by existing directory: {{dir}}',
+  "Add directory…": "Add directory…",
+  "Add directory to workspace": "Add directory to workspace",
+  "Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.":
+    "Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.",
+  "Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.":
+    "Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.",
+  "Enter the path to the directory:": "Enter the path to the directory:",
+  "Enter directory path…": "Enter directory path…",
+  "Tab to complete · Enter to add · Esc to cancel":
+    "Tab to complete · Enter to add · Esc to cancel",
+  "Remove directory?": "Remove directory?",
+  "Are you sure you want to remove this directory from the workspace?":
+    "Are you sure you want to remove this directory from the workspace?",
+  "  (Original working directory)": "  (Original working directory)",
+  "  (from settings)": "  (from settings)",
+  "Directory does not exist.": "Directory does not exist.",
+  "Path is not a directory.": "Path is not a directory.",
+  "This directory is already in the workspace.": "This directory is already in the workspace.",
+  "Already covered by existing directory: {{dir}}":
+    "Already covered by existing directory: {{dir}}",
 
   // ============================================================================
   // Status Bar
   // ============================================================================
-  'Using:': 'Using:',
-  '{{count}} open file': '{{count}} open file',
-  '{{count}} open files': '{{count}} open files',
-  '(ctrl+g to view)': '(ctrl+g to view)',
-  '{{count}} {{name}} file': '{{count}} {{name}} file',
-  '{{count}} {{name}} files': '{{count}} {{name}} files',
-  '{{count}} MCP server': '{{count}} MCP server',
-  '{{count}} MCP servers': '{{count}} MCP servers',
-  '{{count}} Blocked': '{{count}} Blocked',
-  '(ctrl+t to view)': '(ctrl+t to view)',
-  '(ctrl+t to toggle)': '(ctrl+t to toggle)',
-  'Press Ctrl+C again to exit.': 'Press Ctrl+C again to exit.',
-  'Press Ctrl+D again to exit.': 'Press Ctrl+D again to exit.',
-  'Press Esc again to clear.': 'Press Esc again to clear.',
+  "Using:": "Using:",
+  "{{count}} open file": "{{count}} open file",
+  "{{count}} open files": "{{count}} open files",
+  "(ctrl+g to view)": "(ctrl+g to view)",
+  "{{count}} {{name}} file": "{{count}} {{name}} file",
+  "{{count}} {{name}} files": "{{count}} {{name}} files",
+  "{{count}} MCP server": "{{count}} MCP server",
+  "{{count}} MCP servers": "{{count}} MCP servers",
+  "{{count}} Blocked": "{{count}} Blocked",
+  "(ctrl+t to view)": "(ctrl+t to view)",
+  "(ctrl+t to toggle)": "(ctrl+t to toggle)",
+  "Press Ctrl+C again to exit.": "Press Ctrl+C again to exit.",
+  "Press Ctrl+D again to exit.": "Press Ctrl+D again to exit.",
+  "Press Esc again to clear.": "Press Esc again to clear.",
 
   // ============================================================================
   // MCP Status
   // ============================================================================
-  'No MCP servers configured.': 'No MCP servers configured.',
-  '⏳ MCP servers are starting up ({{count}} initializing)...':
-    '⏳ MCP servers are starting up ({{count}} initializing)...',
-  'Note: First startup may take longer. Tool availability will update automatically.':
-    'Note: First startup may take longer. Tool availability will update automatically.',
-  'Configured MCP servers:': 'Configured MCP servers:',
-  Ready: 'Ready',
-  'Starting... (first startup may take longer)':
-    'Starting... (first startup may take longer)',
-  Disconnected: 'Disconnected',
-  '{{count}} tool': '{{count}} tool',
-  '{{count}} tools': '{{count}} tools',
-  '{{count}} prompt': '{{count}} prompt',
-  '{{count}} prompts': '{{count}} prompts',
-  '(from {{extensionName}})': '(from {{extensionName}})',
-  OAuth: 'OAuth',
-  'OAuth expired': 'OAuth expired',
-  'OAuth not authenticated': 'OAuth not authenticated',
-  'tools and prompts will appear when ready':
-    'tools and prompts will appear when ready',
-  '{{count}} tools cached': '{{count}} tools cached',
-  'Tools:': 'Tools:',
-  'Parameters:': 'Parameters:',
-  'Prompts:': 'Prompts:',
-  Blocked: 'Blocked',
-  '💡 Tips:': '💡 Tips:',
-  Use: 'Use',
-  'to show server and tool descriptions':
-    'to show server and tool descriptions',
-  'to show tool parameter schemas': 'to show tool parameter schemas',
-  'to hide descriptions': 'to hide descriptions',
-  'to authenticate with OAuth-enabled servers':
-    'to authenticate with OAuth-enabled servers',
-  Press: 'Press',
-  'to toggle tool descriptions on/off': 'to toggle tool descriptions on/off',
+  "No MCP servers configured.": "No MCP servers configured.",
+  "⏳ MCP servers are starting up ({{count}} initializing)...":
+    "⏳ MCP servers are starting up ({{count}} initializing)...",
+  "Note: First startup may take longer. Tool availability will update automatically.":
+    "Note: First startup may take longer. Tool availability will update automatically.",
+  "Configured MCP servers:": "Configured MCP servers:",
+  Ready: "Ready",
+  "Starting... (first startup may take longer)": "Starting... (first startup may take longer)",
+  Disconnected: "Disconnected",
+  "{{count}} tool": "{{count}} tool",
+  "{{count}} tools": "{{count}} tools",
+  "{{count}} prompt": "{{count}} prompt",
+  "{{count}} prompts": "{{count}} prompts",
+  "(from {{extensionName}})": "(from {{extensionName}})",
+  OAuth: "OAuth",
+  "OAuth expired": "OAuth expired",
+  "OAuth not authenticated": "OAuth not authenticated",
+  "tools and prompts will appear when ready": "tools and prompts will appear when ready",
+  "{{count}} tools cached": "{{count}} tools cached",
+  "Tools:": "Tools:",
+  "Parameters:": "Parameters:",
+  "Prompts:": "Prompts:",
+  Blocked: "Blocked",
+  "💡 Tips:": "💡 Tips:",
+  Use: "Use",
+  "to show server and tool descriptions": "to show server and tool descriptions",
+  "to show tool parameter schemas": "to show tool parameter schemas",
+  "to hide descriptions": "to hide descriptions",
+  "to authenticate with OAuth-enabled servers": "to authenticate with OAuth-enabled servers",
+  Press: "Press",
+  "to toggle tool descriptions on/off": "to toggle tool descriptions on/off",
   "Starting OAuth authentication for MCP server '{{name}}'...":
     "Starting OAuth authentication for MCP server '{{name}}'...",
-  'Restarting MCP servers...': 'Restarting MCP servers...',
+  "Restarting MCP servers...": "Restarting MCP servers...",
 
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips:': 'Tips:',
-  'Use /compress when the conversation gets long to summarize history and free up context.':
-    'Use /compress when the conversation gets long to summarize history and free up context.',
-  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
-    'Start a fresh idea with /clear or /new; the previous session stays available in history.',
-  'Use /bug to submit issues to the maintainers when something goes off.':
-    'Use /bug to submit issues to the maintainers when something goes off.',
-  'Switch auth type quickly with /auth.':
-    'Switch auth type quickly with /auth.',
-  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
-    'You can run any shell commands from Qwen Code using ! (e.g. !ls).',
-  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
-    'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.',
-  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
-    'You can resume a previous conversation by running qwen --continue or qwen --resume.',
-  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
-    'You can switch permission mode quickly with Shift+Tab or /approval-mode.',
-  'You can switch permission mode quickly with Tab or /approval-mode.':
-    'You can switch permission mode quickly with Tab or /approval-mode.',
-  'Try /insight to generate personalized insights from your chat history.':
-    'Try /insight to generate personalized insights from your chat history.',
+  "Tips:": "Tips:",
+  "Use /compress when the conversation gets long to summarize history and free up context.":
+    "Use /compress when the conversation gets long to summarize history and free up context.",
+  "Start a fresh idea with /clear or /new; the previous session stays available in history.":
+    "Start a fresh idea with /clear or /new; the previous session stays available in history.",
+  "Use /bug to submit issues to the maintainers when something goes off.":
+    "Use /bug to submit issues to the maintainers when something goes off.",
+  "Switch auth type quickly with /auth.": "Switch auth type quickly with /auth.",
+  "You can run any shell commands from Qwen Code using ! (e.g. !ls).":
+    "You can run any shell commands from Qwen Code using ! (e.g. !ls).",
+  "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.":
+    "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.",
+  "You can resume a previous conversation by running qwen --continue or qwen --resume.":
+    "You can resume a previous conversation by running qwen --continue or qwen --resume.",
+  "You can switch permission mode quickly with Shift+Tab or /approval-mode.":
+    "You can switch permission mode quickly with Shift+Tab or /approval-mode.",
+  "You can switch permission mode quickly with Tab or /approval-mode.":
+    "You can switch permission mode quickly with Tab or /approval-mode.",
+  "Try /insight to generate personalized insights from your chat history.":
+    "Try /insight to generate personalized insights from your chat history.",
 
   // ============================================================================
   // Exit Screen / Stats
   // ============================================================================
-  'Agent powering down. Goodbye!': 'Agent powering down. Goodbye!',
-  'To continue this session, run': 'To continue this session, run',
-  'Interaction Summary': 'Interaction Summary',
-  'Session ID:': 'Session ID:',
-  'Tool Calls:': 'Tool Calls:',
-  'Success Rate:': 'Success Rate:',
-  'User Agreement:': 'User Agreement:',
-  reviewed: 'reviewed',
-  'Code Changes:': 'Code Changes:',
-  Performance: 'Performance',
-  'Wall Time:': 'Wall Time:',
-  'Agent Active:': 'Agent Active:',
-  'API Time:': 'API Time:',
-  'Tool Time:': 'Tool Time:',
-  'Session Stats': 'Session Stats',
-  'Model Usage': 'Model Usage',
-  Reqs: 'Reqs',
-  'Input Tokens': 'Input Tokens',
-  'Output Tokens': 'Output Tokens',
-  'Savings Highlight:': 'Savings Highlight:',
-  'of input tokens were served from the cache, reducing costs.':
-    'of input tokens were served from the cache, reducing costs.',
-  'Tip: For a full token breakdown, run `/stats model`.':
-    'Tip: For a full token breakdown, run `/stats model`.',
-  'Model Stats For Nerds': 'Model Stats For Nerds',
-  'Tool Stats For Nerds': 'Tool Stats For Nerds',
-  Metric: 'Metric',
-  API: 'API',
-  Requests: 'Requests',
-  Errors: 'Errors',
-  'Avg Latency': 'Avg Latency',
-  Tokens: 'Tokens',
-  Total: 'Total',
-  Prompt: 'Prompt',
-  Cached: 'Cached',
-  Thoughts: 'Thoughts',
-  Tool: 'Tool',
-  Output: 'Output',
-  'No API calls have been made in this session.':
-    'No API calls have been made in this session.',
-  'Tool Name': 'Tool Name',
-  Calls: 'Calls',
-  'Success Rate': 'Success Rate',
-  'Avg Duration': 'Avg Duration',
-  'User Decision Summary': 'User Decision Summary',
-  'Total Reviewed Suggestions:': 'Total Reviewed Suggestions:',
-  ' » Accepted:': ' » Accepted:',
-  ' » Rejected:': ' » Rejected:',
-  ' » Modified:': ' » Modified:',
-  ' Overall Agreement Rate:': ' Overall Agreement Rate:',
-  'No tool calls have been made in this session.':
-    'No tool calls have been made in this session.',
-  'Session start time is unavailable, cannot calculate stats.':
-    'Session start time is unavailable, cannot calculate stats.',
+  "Agent powering down. Goodbye!": "Agent powering down. Goodbye!",
+  "To continue this session, run": "To continue this session, run",
+  "Interaction Summary": "Interaction Summary",
+  "Session ID:": "Session ID:",
+  "Tool Calls:": "Tool Calls:",
+  "Success Rate:": "Success Rate:",
+  "User Agreement:": "User Agreement:",
+  reviewed: "reviewed",
+  "Code Changes:": "Code Changes:",
+  Performance: "Performance",
+  "Wall Time:": "Wall Time:",
+  "Agent Active:": "Agent Active:",
+  "API Time:": "API Time:",
+  "Tool Time:": "Tool Time:",
+  "Session Stats": "Session Stats",
+  "Model Usage": "Model Usage",
+  Reqs: "Reqs",
+  "Input Tokens": "Input Tokens",
+  "Output Tokens": "Output Tokens",
+  "Savings Highlight:": "Savings Highlight:",
+  "of input tokens were served from the cache, reducing costs.":
+    "of input tokens were served from the cache, reducing costs.",
+  "Tip: For a full token breakdown, run `/stats model`.":
+    "Tip: For a full token breakdown, run `/stats model`.",
+  "Model Stats For Nerds": "Model Stats For Nerds",
+  "Tool Stats For Nerds": "Tool Stats For Nerds",
+  Metric: "Metric",
+  API: "API",
+  Requests: "Requests",
+  Errors: "Errors",
+  "Avg Latency": "Avg Latency",
+  Tokens: "Tokens",
+  Total: "Total",
+  Prompt: "Prompt",
+  Cached: "Cached",
+  Thoughts: "Thoughts",
+  Tool: "Tool",
+  Output: "Output",
+  "No API calls have been made in this session.": "No API calls have been made in this session.",
+  "Tool Name": "Tool Name",
+  Calls: "Calls",
+  "Success Rate": "Success Rate",
+  "Avg Duration": "Avg Duration",
+  "User Decision Summary": "User Decision Summary",
+  "Total Reviewed Suggestions:": "Total Reviewed Suggestions:",
+  " » Accepted:": " » Accepted:",
+  " » Rejected:": " » Rejected:",
+  " » Modified:": " » Modified:",
+  " Overall Agreement Rate:": " Overall Agreement Rate:",
+  "No tool calls have been made in this session.": "No tool calls have been made in this session.",
+  "Session start time is unavailable, cannot calculate stats.":
+    "Session start time is unavailable, cannot calculate stats.",
 
   // ============================================================================
   // Command Format Migration
   // ============================================================================
-  'Command Format Migration': 'Command Format Migration',
-  'Found {{count}} TOML command file:': 'Found {{count}} TOML command file:',
-  'Found {{count}} TOML command files:': 'Found {{count}} TOML command files:',
-  '... and {{count}} more': '... and {{count}} more',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'The TOML format is deprecated. Would you like to migrate them to Markdown format?',
-  '(Backups will be created and original files will be preserved)':
-    '(Backups will be created and original files will be preserved)',
+  "Command Format Migration": "Command Format Migration",
+  "Found {{count}} TOML command file:": "Found {{count}} TOML command file:",
+  "Found {{count}} TOML command files:": "Found {{count}} TOML command files:",
+  "... and {{count}} more": "... and {{count}} more",
+  "The TOML format is deprecated. Would you like to migrate them to Markdown format?":
+    "The TOML format is deprecated. Would you like to migrate them to Markdown format?",
+  "(Backups will be created and original files will be preserved)":
+    "(Backups will be created and original files will be preserved)",
 
   // ============================================================================
   // Loading Phrases
   // ============================================================================
-  'Waiting for user confirmation...': 'Waiting for user confirmation...',
-  '(esc to cancel, {{time}})': '(esc to cancel, {{time}})',
+  "Waiting for user confirmation...": "Waiting for user confirmation...",
+  "(esc to cancel, {{time}})": "(esc to cancel, {{time}})",
 
   // ============================================================================
   // Loading Phrases
   // ============================================================================
   WITTY_LOADING_PHRASES: [
     "I'm Feeling Lucky",
-    'Shipping awesomeness... ',
-    'Painting the serifs back on...',
-    'Navigating the slime mold...',
-    'Consulting the digital spirits...',
-    'Reticulating splines...',
-    'Warming up the AI hamsters...',
-    'Asking the magic conch shell...',
-    'Generating witty retort...',
-    'Polishing the algorithms...',
+    "Shipping awesomeness... ",
+    "Painting the serifs back on...",
+    "Navigating the slime mold...",
+    "Consulting the digital spirits...",
+    "Reticulating splines...",
+    "Warming up the AI hamsters...",
+    "Asking the magic conch shell...",
+    "Generating witty retort...",
+    "Polishing the algorithms...",
     "Don't rush perfection (or my code)...",
-    'Brewing fresh bytes...',
-    'Counting electrons...',
-    'Engaging cognitive processors...',
-    'Checking for syntax errors in the universe...',
-    'One moment, optimizing humor...',
-    'Shuffling punchlines...',
-    'Untangling neural nets...',
-    'Compiling brilliance...',
-    'Loading wit.exe...',
-    'Summoning the cloud of wisdom...',
-    'Preparing a witty response...',
+    "Brewing fresh bytes...",
+    "Counting electrons...",
+    "Engaging cognitive processors...",
+    "Checking for syntax errors in the universe...",
+    "One moment, optimizing humor...",
+    "Shuffling punchlines...",
+    "Untangling neural nets...",
+    "Compiling brilliance...",
+    "Loading wit.exe...",
+    "Summoning the cloud of wisdom...",
+    "Preparing a witty response...",
     "Just a sec, I'm debugging reality...",
-    'Confuzzling the options...',
-    'Tuning the cosmic frequencies...',
-    'Crafting a response worthy of your patience...',
-    'Compiling the 1s and 0s...',
-    'Resolving dependencies... and existential crises...',
-    'Defragmenting memories... both RAM and personal...',
-    'Rebooting the humor module...',
-    'Caching the essentials (mostly cat memes)...',
-    'Optimizing for ludicrous speed',
+    "Confuzzling the options...",
+    "Tuning the cosmic frequencies...",
+    "Crafting a response worthy of your patience...",
+    "Compiling the 1s and 0s...",
+    "Resolving dependencies... and existential crises...",
+    "Defragmenting memories... both RAM and personal...",
+    "Rebooting the humor module...",
+    "Caching the essentials (mostly cat memes)...",
+    "Optimizing for ludicrous speed",
     "Swapping bits... don't tell the bytes...",
-    'Garbage collecting... be right back...',
-    'Assembling the interwebs...',
-    'Converting coffee into code...',
-    'Updating the syntax for reality...',
-    'Rewiring the synapses...',
-    'Looking for a misplaced semicolon...',
+    "Garbage collecting... be right back...",
+    "Assembling the interwebs...",
+    "Converting coffee into code...",
+    "Updating the syntax for reality...",
+    "Rewiring the synapses...",
+    "Looking for a misplaced semicolon...",
     "Greasin' the cogs of the machine...",
-    'Pre-heating the servers...',
-    'Calibrating the flux capacitor...',
-    'Engaging the improbability drive...',
-    'Channeling the Force...',
-    'Aligning the stars for optimal response...',
-    'So say we all...',
-    'Loading the next great idea...',
+    "Pre-heating the servers...",
+    "Calibrating the flux capacitor...",
+    "Engaging the improbability drive...",
+    "Channeling the Force...",
+    "Aligning the stars for optimal response...",
+    "So say we all...",
+    "Loading the next great idea...",
     "Just a moment, I'm in the zone...",
-    'Preparing to dazzle you with brilliance...',
+    "Preparing to dazzle you with brilliance...",
     "Just a tick, I'm polishing my wit...",
     "Hold tight, I'm crafting a masterpiece...",
     "Just a jiffy, I'm debugging the universe...",
     "Just a moment, I'm aligning the pixels...",
     "Just a sec, I'm optimizing the humor...",
     "Just a moment, I'm tuning the algorithms...",
-    'Warp speed engaged...',
-    'Mining for more Dilithium crystals...',
+    "Warp speed engaged...",
+    "Mining for more Dilithium crystals...",
     "Don't panic...",
-    'Following the white rabbit...',
-    'The truth is in here... somewhere...',
-    'Blowing on the cartridge...',
-    'Loading... Do a barrel roll!',
-    'Waiting for the respawn...',
-    'Finishing the Kessel Run in less than 12 parsecs...',
+    "Following the white rabbit...",
+    "The truth is in here... somewhere...",
+    "Blowing on the cartridge...",
+    "Loading... Do a barrel roll!",
+    "Waiting for the respawn...",
+    "Finishing the Kessel Run in less than 12 parsecs...",
     "The cake is not a lie, it's just still loading...",
-    'Fiddling with the character creation screen...',
+    "Fiddling with the character creation screen...",
     "Just a moment, I'm finding the right meme...",
     "Pressing 'A' to continue...",
-    'Herding digital cats...',
-    'Polishing the pixels...',
-    'Finding a suitable loading screen pun...',
-    'Distracting you with this witty phrase...',
-    'Almost there... probably...',
-    'Our hamsters are working as fast as they can...',
-    'Giving Cloudy a pat on the head...',
-    'Petting the cat...',
-    'Rickrolling my boss...',
-    'Never gonna give you up, never gonna let you down...',
-    'Slapping the bass...',
-    'Tasting the snozberries...',
+    "Herding digital cats...",
+    "Polishing the pixels...",
+    "Finding a suitable loading screen pun...",
+    "Distracting you with this witty phrase...",
+    "Almost there... probably...",
+    "Our hamsters are working as fast as they can...",
+    "Giving Cloudy a pat on the head...",
+    "Petting the cat...",
+    "Rickrolling my boss...",
+    "Never gonna give you up, never gonna let you down...",
+    "Slapping the bass...",
+    "Tasting the snozberries...",
     "I'm going the distance, I'm going for speed...",
-    'Is this the real life? Is this just fantasy?...',
+    "Is this the real life? Is this just fantasy?...",
     "I've got a good feeling about this...",
-    'Poking the bear...',
-    'Doing research on the latest memes...',
-    'Figuring out how to make this more witty...',
-    'Hmmm... let me think...',
-    'What do you call a fish with no eyes? A fsh...',
-    'Why did the computer go to therapy? It had too many bytes...',
+    "Poking the bear...",
+    "Doing research on the latest memes...",
+    "Figuring out how to make this more witty...",
+    "Hmmm... let me think...",
+    "What do you call a fish with no eyes? A fsh...",
+    "Why did the computer go to therapy? It had too many bytes...",
     "Why don't programmers like nature? It has too many bugs...",
-    'Why do programmers prefer dark mode? Because light attracts bugs...',
-    'Why did the developer go broke? Because they used up all their cache...',
+    "Why do programmers prefer dark mode? Because light attracts bugs...",
+    "Why did the developer go broke? Because they used up all their cache...",
     "What can you do with a broken pencil? Nothing, it's pointless...",
-    'Applying percussive maintenance...',
-    'Searching for the correct USB orientation...',
-    'Ensuring the magic smoke stays inside the wires...',
-    'Trying to exit Vim...',
-    'Spinning up the hamster wheel...',
+    "Applying percussive maintenance...",
+    "Searching for the correct USB orientation...",
+    "Ensuring the magic smoke stays inside the wires...",
+    "Trying to exit Vim...",
+    "Spinning up the hamster wheel...",
     "That's not a bug, it's an undocumented feature...",
-    'Engage.',
+    "Engage.",
     "I'll be back... with an answer.",
-    'My other process is a TARDIS...',
-    'Communing with the machine spirit...',
-    'Letting the thoughts marinate...',
-    'Just remembered where I put my keys...',
-    'Pondering the orb...',
+    "My other process is a TARDIS...",
+    "Communing with the machine spirit...",
+    "Letting the thoughts marinate...",
+    "Just remembered where I put my keys...",
+    "Pondering the orb...",
     "I've seen things you people wouldn't believe... like a user who reads loading messages.",
-    'Initiating thoughtful gaze...',
+    "Initiating thoughtful gaze...",
     "What's a computer's favorite snack? Microchips.",
     "Why do Java developers wear glasses? Because they don't C#.",
-    'Charging the laser... pew pew!',
-    'Dividing by zero... just kidding!',
-    'Looking for an adult superviso... I mean, processing.',
-    'Making it go beep boop.',
-    'Buffering... because even AIs need a moment.',
-    'Entangling quantum particles for a faster response...',
-    'Polishing the chrome... on the algorithms.',
-    'Are you not entertained? (Working on it!)',
-    'Summoning the code gremlins... to help, of course.',
-    'Just waiting for the dial-up tone to finish...',
-    'Recalibrating the humor-o-meter.',
-    'My other loading screen is even funnier.',
+    "Charging the laser... pew pew!",
+    "Dividing by zero... just kidding!",
+    "Looking for an adult superviso... I mean, processing.",
+    "Making it go beep boop.",
+    "Buffering... because even AIs need a moment.",
+    "Entangling quantum particles for a faster response...",
+    "Polishing the chrome... on the algorithms.",
+    "Are you not entertained? (Working on it!)",
+    "Summoning the code gremlins... to help, of course.",
+    "Just waiting for the dial-up tone to finish...",
+    "Recalibrating the humor-o-meter.",
+    "My other loading screen is even funnier.",
     "Pretty sure there's a cat walking on the keyboard somewhere...",
-    'Enhancing... Enhancing... Still loading.',
+    "Enhancing... Enhancing... Still loading.",
     "It's not a bug, it's a feature... of this loading screen.",
-    'Have you tried turning it off and on again? (The loading screen, not me.)',
-    'Constructing additional pylons...',
+    "Have you tried turning it off and on again? (The loading screen, not me.)",
+    "Constructing additional pylons...",
   ],
 
   // ============================================================================
   // Extension Settings Input
   // ============================================================================
-  'Enter value...': 'Enter value...',
-  'Enter sensitive value...': 'Enter sensitive value...',
-  'Press Enter to submit, Escape to cancel':
-    'Press Enter to submit, Escape to cancel',
+  "Enter value...": "Enter value...",
+  "Enter sensitive value...": "Enter sensitive value...",
+  "Press Enter to submit, Escape to cancel": "Press Enter to submit, Escape to cancel",
 
   // ============================================================================
   // Command Migration Tool
   // ============================================================================
-  'Markdown file already exists: {{filename}}':
-    'Markdown file already exists: {{filename}}',
-  'TOML Command Format Deprecation Notice':
-    'TOML Command Format Deprecation Notice',
-  'Found {{count}} command file(s) in TOML format:':
-    'Found {{count}} command file(s) in TOML format:',
-  'The TOML format for commands is being deprecated in favor of Markdown format.':
-    'The TOML format for commands is being deprecated in favor of Markdown format.',
-  'Markdown format is more readable and easier to edit.':
-    'Markdown format is more readable and easier to edit.',
-  'You can migrate these files automatically using:':
-    'You can migrate these files automatically using:',
-  'Or manually convert each file:': 'Or manually convert each file:',
-  'TOML: prompt = "..." / description = "..."':
-    'TOML: prompt = "..." / description = "..."',
-  'Markdown: YAML frontmatter + content':
-    'Markdown: YAML frontmatter + content',
-  'The migration tool will:': 'The migration tool will:',
-  'Convert TOML files to Markdown': 'Convert TOML files to Markdown',
-  'Create backups of original files': 'Create backups of original files',
-  'Preserve all command functionality': 'Preserve all command functionality',
-  'TOML format will continue to work for now, but migration is recommended.':
-    'TOML format will continue to work for now, but migration is recommended.',
+  "Markdown file already exists: {{filename}}": "Markdown file already exists: {{filename}}",
+  "TOML Command Format Deprecation Notice": "TOML Command Format Deprecation Notice",
+  "Found {{count}} command file(s) in TOML format:":
+    "Found {{count}} command file(s) in TOML format:",
+  "The TOML format for commands is being deprecated in favor of Markdown format.":
+    "The TOML format for commands is being deprecated in favor of Markdown format.",
+  "Markdown format is more readable and easier to edit.":
+    "Markdown format is more readable and easier to edit.",
+  "You can migrate these files automatically using:":
+    "You can migrate these files automatically using:",
+  "Or manually convert each file:": "Or manually convert each file:",
+  'TOML: prompt = "..." / description = "..."': 'TOML: prompt = "..." / description = "..."',
+  "Markdown: YAML frontmatter + content": "Markdown: YAML frontmatter + content",
+  "The migration tool will:": "The migration tool will:",
+  "Convert TOML files to Markdown": "Convert TOML files to Markdown",
+  "Create backups of original files": "Create backups of original files",
+  "Preserve all command functionality": "Preserve all command functionality",
+  "TOML format will continue to work for now, but migration is recommended.":
+    "TOML format will continue to work for now, but migration is recommended.",
 
   // ============================================================================
   // Extensions - Explore Command
   // ============================================================================
-  'Open extensions page in your browser':
-    'Open extensions page in your browser',
-  'Unknown extensions source: {{source}}.':
-    'Unknown extensions source: {{source}}.',
-  'Would open extensions page in your browser: {{url}} (skipped in test environment)':
-    'Would open extensions page in your browser: {{url}} (skipped in test environment)',
-  'View available extensions at {{url}}':
-    'View available extensions at {{url}}',
-  'Opening extensions page in your browser: {{url}}':
-    'Opening extensions page in your browser: {{url}}',
-  'Failed to open browser. Check out the extensions gallery at {{url}}':
-    'Failed to open browser. Check out the extensions gallery at {{url}}',
+  "Open extensions page in your browser": "Open extensions page in your browser",
+  "Unknown extensions source: {{source}}.": "Unknown extensions source: {{source}}.",
+  "Would open extensions page in your browser: {{url}} (skipped in test environment)":
+    "Would open extensions page in your browser: {{url}} (skipped in test environment)",
+  "View available extensions at {{url}}": "View available extensions at {{url}}",
+  "Opening extensions page in your browser: {{url}}":
+    "Opening extensions page in your browser: {{url}}",
+  "Failed to open browser. Check out the extensions gallery at {{url}}":
+    "Failed to open browser. Check out the extensions gallery at {{url}}",
 
   // ============================================================================
   // Retry / Rate Limit
   // ============================================================================
-  'Rate limit error: {{reason}}': 'Rate limit error: {{reason}}',
-  'Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})':
-    'Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})',
-  'Press Ctrl+Y to retry': 'Press Ctrl+Y to retry',
-  'No failed request to retry.': 'No failed request to retry.',
-  'to retry last request': 'to retry last request',
+  "Rate limit error: {{reason}}": "Rate limit error: {{reason}}",
+  "Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})":
+    "Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})",
+  "Press Ctrl+Y to retry": "Press Ctrl+Y to retry",
+  "No failed request to retry.": "No failed request to retry.",
+  "to retry last request": "to retry last request",
 
   // ============================================================================
   // Coding Plan Authentication
   // ============================================================================
-  'API key cannot be empty.': 'API key cannot be empty.',
-  'You can get your Coding Plan API key here':
-    'You can get your Coding Plan API key here',
-  'API key is stored in settings.env. You can migrate it to a .env file for better security.':
-    'API key is stored in settings.env. You can migrate it to a .env file for better security.',
-  'New model configurations are available for Alibaba Cloud Coding Plan. Update now?':
-    'New model configurations are available for Alibaba Cloud Coding Plan. Update now?',
-  'Coding Plan configuration updated successfully. New models are now available.':
-    'Coding Plan configuration updated successfully. New models are now available.',
-  'Coding Plan API key not found. Please re-authenticate with Coding Plan.':
-    'Coding Plan API key not found. Please re-authenticate with Coding Plan.',
-  'Failed to update Coding Plan configuration: {{message}}':
-    'Failed to update Coding Plan configuration: {{message}}',
+  "API key cannot be empty.": "API key cannot be empty.",
+  "You can get your Coding Plan API key here": "You can get your Coding Plan API key here",
+  "API key is stored in settings.env. You can migrate it to a .env file for better security.":
+    "API key is stored in settings.env. You can migrate it to a .env file for better security.",
+  "New model configurations are available for Alibaba Cloud Coding Plan. Update now?":
+    "New model configurations are available for Alibaba Cloud Coding Plan. Update now?",
+  "Coding Plan configuration updated successfully. New models are now available.":
+    "Coding Plan configuration updated successfully. New models are now available.",
+  "Coding Plan API key not found. Please re-authenticate with Coding Plan.":
+    "Coding Plan API key not found. Please re-authenticate with Coding Plan.",
+  "Failed to update Coding Plan configuration: {{message}}":
+    "Failed to update Coding Plan configuration: {{message}}",
 
   // ============================================================================
   // Custom API Key Configuration
   // ============================================================================
-  'You can configure your API key and models in settings.json':
-    'You can configure your API key and models in settings.json',
-  'Refer to the documentation for setup instructions':
-    'Refer to the documentation for setup instructions',
+  "You can configure your API key and models in settings.json":
+    "You can configure your API key and models in settings.json",
+  "Refer to the documentation for setup instructions":
+    "Refer to the documentation for setup instructions",
 
   // ============================================================================
   // Auth Dialog - View Titles and Labels
   // ============================================================================
-  'Coding Plan': 'Coding Plan',
+  "Coding Plan": "Coding Plan",
   "Paste your api key of ModelStudio Coding Plan and you're all set!":
     "Paste your api key of ModelStudio Coding Plan and you're all set!",
-  Custom: 'Custom',
-  'More instructions about configuring `modelProviders` manually.':
-    'More instructions about configuring `modelProviders` manually.',
-  'Select API-KEY configuration mode:': 'Select API-KEY configuration mode:',
-  '(Press Escape to go back)': '(Press Escape to go back)',
-  '(Press Enter to submit, Escape to cancel)':
-    '(Press Enter to submit, Escape to cancel)',
-  'Select Region for Coding Plan': 'Select Region for Coding Plan',
-  'Choose based on where your account is registered':
-    'Choose based on where your account is registered',
-  'Enter Coding Plan API Key': 'Enter Coding Plan API Key',
+  Custom: "Custom",
+  "More instructions about configuring `modelProviders` manually.":
+    "More instructions about configuring `modelProviders` manually.",
+  "Select API-KEY configuration mode:": "Select API-KEY configuration mode:",
+  "(Press Escape to go back)": "(Press Escape to go back)",
+  "(Press Enter to submit, Escape to cancel)": "(Press Enter to submit, Escape to cancel)",
+  "Select Region for Coding Plan": "Select Region for Coding Plan",
+  "Choose based on where your account is registered":
+    "Choose based on where your account is registered",
+  "Enter Coding Plan API Key": "Enter Coding Plan API Key",
 
   // ============================================================================
   // Coding Plan International Updates
   // ============================================================================
-  'New model configurations are available for {{region}}. Update now?':
-    'New model configurations are available for {{region}}. Update now?',
+  "New model configurations are available for {{region}}. Update now?":
+    "New model configurations are available for {{region}}. Update now?",
   '{{region}} configuration updated successfully. Model switched to "{{model}}".':
     '{{region}} configuration updated successfully. Model switched to "{{model}}".',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).':
-    'Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).',
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).":
+    "Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).",
 
   // ============================================================================
   // Context Usage Component
   // ============================================================================
-  'Context Usage': 'Context Usage',
-  'No API response yet. Send a message to see actual usage.':
-    'No API response yet. Send a message to see actual usage.',
-  'Estimated pre-conversation overhead': 'Estimated pre-conversation overhead',
-  'Context window': 'Context window',
-  tokens: 'tokens',
-  Used: 'Used',
-  Free: 'Free',
-  'Autocompact buffer': 'Autocompact buffer',
-  'Usage by category': 'Usage by category',
-  'System prompt': 'System prompt',
-  'Built-in tools': 'Built-in tools',
-  'MCP tools': 'MCP tools',
-  'Memory files': 'Memory files',
-  Skills: 'Skills',
-  Messages: 'Messages',
-  'Show context window usage breakdown.':
-    'Show context window usage breakdown.',
-  'Run /context detail for per-item breakdown.':
-    'Run /context detail for per-item breakdown.',
-  'body loaded': 'body loaded',
-  memory: 'memory',
-  '{{region}} configuration updated successfully.':
-    '{{region}} configuration updated successfully.',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.':
-    'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.',
-  'Tip: Use /model to switch between available Coding Plan models.':
-    'Tip: Use /model to switch between available Coding Plan models.',
+  "Context Usage": "Context Usage",
+  "No API response yet. Send a message to see actual usage.":
+    "No API response yet. Send a message to see actual usage.",
+  "Estimated pre-conversation overhead": "Estimated pre-conversation overhead",
+  "Context window": "Context window",
+  tokens: "tokens",
+  Used: "Used",
+  Free: "Free",
+  "Autocompact buffer": "Autocompact buffer",
+  "Usage by category": "Usage by category",
+  "System prompt": "System prompt",
+  "Built-in tools": "Built-in tools",
+  "MCP tools": "MCP tools",
+  "Memory files": "Memory files",
+  Skills: "Skills",
+  Messages: "Messages",
+  "Show context window usage breakdown.": "Show context window usage breakdown.",
+  "Run /context detail for per-item breakdown.": "Run /context detail for per-item breakdown.",
+  "body loaded": "body loaded",
+  memory: "memory",
+  "{{region}} configuration updated successfully.":
+    "{{region}} configuration updated successfully.",
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.":
+    "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.",
+  "Tip: Use /model to switch between available Coding Plan models.":
+    "Tip: Use /model to switch between available Coding Plan models.",
 
   // ============================================================================
   // Ask User Question Tool
   // ============================================================================
-  'Please answer the following question(s):':
-    'Please answer the following question(s):',
-  'Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.':
-    'Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.',
-  'User declined to answer the questions.':
-    'User declined to answer the questions.',
-  'User has provided the following answers:':
-    'User has provided the following answers:',
-  'Failed to process user answers:': 'Failed to process user answers:',
-  'Type something...': 'Type something...',
-  Submit: 'Submit',
-  'Submit answers': 'Submit answers',
-  Cancel: 'Cancel',
-  'Your answers:': 'Your answers:',
-  '(not answered)': '(not answered)',
-  'Ready to submit your answers?': 'Ready to submit your answers?',
-  '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select':
-    '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select',
-  '↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel',
-  '↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel',
-  '↑/↓: Navigate | Enter: Select | Esc: Cancel':
-    '↑/↓: Navigate | Enter: Select | Esc: Cancel',
+  "Please answer the following question(s):": "Please answer the following question(s):",
+  "Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.":
+    "Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.",
+  "User declined to answer the questions.": "User declined to answer the questions.",
+  "User has provided the following answers:": "User has provided the following answers:",
+  "Failed to process user answers:": "Failed to process user answers:",
+  "Type something...": "Type something...",
+  Submit: "Submit",
+  "Submit answers": "Submit answers",
+  Cancel: "Cancel",
+  "Your answers:": "Your answers:",
+  "(not answered)": "(not answered)",
+  "Ready to submit your answers?": "Ready to submit your answers?",
+  "↑/↓: Navigate | ←/→: Switch tabs | Enter: Select":
+    "↑/↓: Navigate | ←/→: Switch tabs | Enter: Select",
+  "↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel",
+  "↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel",
+  "↑/↓: Navigate | Enter: Select | Esc: Cancel": "↑/↓: Navigate | Enter: Select | Esc: Cancel",
 
   // ============================================================================
   // Commands - Auth
   // ============================================================================
-  'Authenticate using Alibaba Cloud Coding Plan':
-    'Authenticate using Alibaba Cloud Coding Plan',
-  'Region for Coding Plan (china/global)':
-    'Region for Coding Plan (china/global)',
-  'API key for Coding Plan': 'API key for Coding Plan',
-  'Show current authentication status': 'Show current authentication status',
-  'Authentication completed successfully.':
-    'Authentication completed successfully.',
-  'Processing Alibaba Cloud Coding Plan authentication...':
-    'Processing Alibaba Cloud Coding Plan authentication...',
-  'Successfully authenticated with Alibaba Cloud Coding Plan.':
-    'Successfully authenticated with Alibaba Cloud Coding Plan.',
-  'Failed to authenticate with Coding Plan: {{error}}':
-    'Failed to authenticate with Coding Plan: {{error}}',
-  '中国 (China)': '中国 (China)',
-  '阿里云百炼 (aliyun.com)': '阿里云百炼 (aliyun.com)',
-  Global: 'Global',
-  'Alibaba Cloud (alibabacloud.com)': 'Alibaba Cloud (alibabacloud.com)',
-  'Select region for Coding Plan:': 'Select region for Coding Plan:',
-  'Enter your Coding Plan API key: ': 'Enter your Coding Plan API key: ',
-  'Select authentication method:': 'Select authentication method:',
-  '\n=== Authentication Status ===\n': '\n=== Authentication Status ===\n',
-  '⚠️  No authentication method configured.\n':
-    '⚠️  No authentication method configured.\n',
-  'Run one of the following commands to get started:\n':
-    'Run one of the following commands to get started:\n',
-  '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n':
-    '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n',
-  'Or simply run:': 'Or simply run:',
-  '  qwen auth                - Interactive authentication setup\n':
-    '  qwen auth                - Interactive authentication setup\n',
-  '✓ Authentication Method: Alibaba Cloud Coding Plan':
-    '✓ Authentication Method: Alibaba Cloud Coding Plan',
-  '中国 (China) - 阿里云百炼': '中国 (China) - 阿里云百炼',
-  'Global - Alibaba Cloud': 'Global - Alibaba Cloud',
-  '  Region: {{region}}': '  Region: {{region}}',
-  '  Current Model: {{model}}': '  Current Model: {{model}}',
-  '  Config Version: {{version}}': '  Config Version: {{version}}',
-  '  Status: API key configured\n': '  Status: API key configured\n',
-  '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)':
-    '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)',
-  '  Issue: API key not found in environment or settings\n':
-    '  Issue: API key not found in environment or settings\n',
-  '  Run `qwen auth coding-plan` to re-configure.\n':
-    '  Run `qwen auth coding-plan` to re-configure.\n',
-  '✓ Authentication Method: {{type}}': '✓ Authentication Method: {{type}}',
-  '  Status: Configured\n': '  Status: Configured\n',
-  'Failed to check authentication status: {{error}}':
-    'Failed to check authentication status: {{error}}',
-  'Select an option:': 'Select an option:',
-  'Raw mode not available. Please run in an interactive terminal.':
-    'Raw mode not available. Please run in an interactive terminal.',
-  '(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n':
-    '(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n',
-  verbose: 'verbose',
-  'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).':
-    'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).',
-  'Press Ctrl+O to show full tool output':
-    'Press Ctrl+O to show full tool output',
+  "Authenticate using Alibaba Cloud Coding Plan": "Authenticate using Alibaba Cloud Coding Plan",
+  "Region for Coding Plan (china/global)": "Region for Coding Plan (china/global)",
+  "API key for Coding Plan": "API key for Coding Plan",
+  "Show current authentication status": "Show current authentication status",
+  "Authentication completed successfully.": "Authentication completed successfully.",
+  "Processing Alibaba Cloud Coding Plan authentication...":
+    "Processing Alibaba Cloud Coding Plan authentication...",
+  "Successfully authenticated with Alibaba Cloud Coding Plan.":
+    "Successfully authenticated with Alibaba Cloud Coding Plan.",
+  "Failed to authenticate with Coding Plan: {{error}}":
+    "Failed to authenticate with Coding Plan: {{error}}",
+  "中国 (China)": "中国 (China)",
+  "阿里云百炼 (aliyun.com)": "阿里云百炼 (aliyun.com)",
+  Global: "Global",
+  "Alibaba Cloud (alibabacloud.com)": "Alibaba Cloud (alibabacloud.com)",
+  "Select region for Coding Plan:": "Select region for Coding Plan:",
+  "Enter your Coding Plan API key: ": "Enter your Coding Plan API key: ",
+  "Select authentication method:": "Select authentication method:",
+  "\n=== Authentication Status ===\n": "\n=== Authentication Status ===\n",
+  "⚠️  No authentication method configured.\n": "⚠️  No authentication method configured.\n",
+  "Run one of the following commands to get started:\n":
+    "Run one of the following commands to get started:\n",
+  "  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n":
+    "  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n",
+  "Or simply run:": "Or simply run:",
+  "  qwen auth                - Interactive authentication setup\n":
+    "  qwen auth                - Interactive authentication setup\n",
+  "✓ Authentication Method: Alibaba Cloud Coding Plan":
+    "✓ Authentication Method: Alibaba Cloud Coding Plan",
+  "中国 (China) - 阿里云百炼": "中国 (China) - 阿里云百炼",
+  "Global - Alibaba Cloud": "Global - Alibaba Cloud",
+  "  Region: {{region}}": "  Region: {{region}}",
+  "  Current Model: {{model}}": "  Current Model: {{model}}",
+  "  Config Version: {{version}}": "  Config Version: {{version}}",
+  "  Status: API key configured\n": "  Status: API key configured\n",
+  "⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)":
+    "⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)",
+  "  Issue: API key not found in environment or settings\n":
+    "  Issue: API key not found in environment or settings\n",
+  "  Run `qwen auth coding-plan` to re-configure.\n":
+    "  Run `qwen auth coding-plan` to re-configure.\n",
+  "✓ Authentication Method: {{type}}": "✓ Authentication Method: {{type}}",
+  "  Status: Configured\n": "  Status: Configured\n",
+  "Failed to check authentication status: {{error}}":
+    "Failed to check authentication status: {{error}}",
+  "Select an option:": "Select an option:",
+  "Raw mode not available. Please run in an interactive terminal.":
+    "Raw mode not available. Please run in an interactive terminal.",
+  "(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n":
+    "(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n",
+  verbose: "verbose",
+  "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).":
+    "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).",
+  "Press Ctrl+O to show full tool output": "Press Ctrl+O to show full tool output",
 
-  'Switch to plan mode or exit plan mode':
-    'Switch to plan mode or exit plan mode',
-  'Exited plan mode. Previous approval mode restored.':
-    'Exited plan mode. Previous approval mode restored.',
-  'Enabled plan mode. The agent will analyze and plan without executing tools.':
-    'Enabled plan mode. The agent will analyze and plan without executing tools.',
+  "Switch to plan mode or exit plan mode": "Switch to plan mode or exit plan mode",
+  "Exited plan mode. Previous approval mode restored.":
+    "Exited plan mode. Previous approval mode restored.",
+  "Enabled plan mode. The agent will analyze and plan without executing tools.":
+    "Enabled plan mode. The agent will analyze and plan without executing tools.",
   'Already in plan mode. Use "/plan exit" to exit plan mode.':
     'Already in plan mode. Use "/plan exit" to exit plan mode.',
   'Not in plan mode. Use "/plan" to enter plan mode first.':
diff --git a/apps/airiscode-cli/src/i18n/locales/ja.js b/apps/airiscode-cli/src/i18n/locales/ja.js
index 136ccc843..5bfaf9403 100644
--- a/apps/airiscode-cli/src/i18n/locales/ja.js
+++ b/apps/airiscode-cli/src/i18n/locales/ja.js
@@ -10,922 +10,848 @@ export default {
   // ============================================================================
   // Help / UI Components
   // ============================================================================
-  'Basics:': '基本操作:',
-  'Add context': 'コンテキストを追加',
-  'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.':
-    '{{symbol}} を使用してコンテキスト用のファイルを指定します(例: {{example}}) また、特定のファイルやフォルダを対象にできます',
-  '@': '@',
-  '@src/myFile.ts': '@src/myFile.ts',
-  'Shell mode': 'シェルモード',
-  'YOLO mode': 'YOLOモード',
-  'plan mode': 'プランモード',
-  'auto-accept edits': '編集を自動承認',
-  'Accepting edits': '編集を承認中',
-  '(shift + tab to cycle)': '(Shift + Tab で切り替え)',
-  'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).':
-    '{{symbol}} でシェルコマンドを実行(例: {{example1}})、または自然言語で入力(例: {{example2}})',
-  '!': '!',
-  '!npm run start': '!npm run start',
-  'start server': 'サーバーを起動',
-  'Commands:': 'コマンド:',
-  'shell command': 'シェルコマンド',
-  'Model Context Protocol command (from external servers)':
-    'Model Context Protocol コマンド(外部サーバーから)',
-  'Keyboard Shortcuts:': 'キーボードショートカット:',
-  'Jump through words in the input': '入力欄の単語間を移動',
-  'Close dialogs, cancel requests, or quit application':
-    'ダイアログを閉じる、リクエストをキャンセル、またはアプリを終了',
-  'New line': '改行',
-  'New line (Alt+Enter works for certain linux distros)':
-    '改行(一部のLinuxディストリビューションではAlt+Enterが有効)',
-  'Clear the screen': '画面をクリア',
-  'Open input in external editor': '外部エディタで入力を開く',
-  'Send message': 'メッセージを送信',
-  'Initializing...': '初期化中...',
-  'Connecting to MCP servers... ({{connected}}/{{total}})':
-    'MCPサーバーに接続中... ({{connected}}/{{total}})',
-  'Type your message or @path/to/file':
-    'メッセージを入力、@パス/ファイルでファイルを添付(D&D対応)',
+  "Basics:": "基本操作:",
+  "Add context": "コンテキストを追加",
+  "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.":
+    "{{symbol}} を使用してコンテキスト用のファイルを指定します(例: {{example}}) また、特定のファイルやフォルダを対象にできます",
+  "@": "@",
+  "@src/myFile.ts": "@src/myFile.ts",
+  "Shell mode": "シェルモード",
+  "YOLO mode": "YOLOモード",
+  "plan mode": "プランモード",
+  "auto-accept edits": "編集を自動承認",
+  "Accepting edits": "編集を承認中",
+  "(shift + tab to cycle)": "(Shift + Tab で切り替え)",
+  "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).":
+    "{{symbol}} でシェルコマンドを実行(例: {{example1}})、または自然言語で入力(例: {{example2}})",
+  "!": "!",
+  "!npm run start": "!npm run start",
+  "start server": "サーバーを起動",
+  "Commands:": "コマンド:",
+  "shell command": "シェルコマンド",
+  "Model Context Protocol command (from external servers)":
+    "Model Context Protocol コマンド(外部サーバーから)",
+  "Keyboard Shortcuts:": "キーボードショートカット:",
+  "Jump through words in the input": "入力欄の単語間を移動",
+  "Close dialogs, cancel requests, or quit application":
+    "ダイアログを閉じる、リクエストをキャンセル、またはアプリを終了",
+  "New line": "改行",
+  "New line (Alt+Enter works for certain linux distros)":
+    "改行(一部のLinuxディストリビューションではAlt+Enterが有効)",
+  "Clear the screen": "画面をクリア",
+  "Open input in external editor": "外部エディタで入力を開く",
+  "Send message": "メッセージを送信",
+  "Initializing...": "初期化中...",
+  "Connecting to MCP servers... ({{connected}}/{{total}})":
+    "MCPサーバーに接続中... ({{connected}}/{{total}})",
+  "Type your message or @path/to/file": "メッセージを入力、@パス/ファイルでファイルを添付(D&D対応)",
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "'i' でINSERTモード、'Esc' でNORMALモード",
-  'Cancel operation / Clear input (double press)':
-    '操作をキャンセル / 入力をクリア(2回押し)',
-  'Cycle approval modes': '承認モードを切り替え',
-  'Cycle through your prompt history': 'プロンプト履歴を順に表示',
-  'For a full list of shortcuts, see {{docPath}}':
-    'ショートカットの完全なリストは {{docPath}} を参照',
-  'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md',
-  'for help on Qwen Code': 'Qwen Code のヘルプ',
-  'show version info': 'バージョン情報を表示',
-  'submit a bug report': 'バグレポートを送信',
-  'About Qwen Code': 'Qwen Code について',
+  "Cancel operation / Clear input (double press)": "操作をキャンセル / 入力をクリア(2回押し)",
+  "Cycle approval modes": "承認モードを切り替え",
+  "Cycle through your prompt history": "プロンプト履歴を順に表示",
+  "For a full list of shortcuts, see {{docPath}}":
+    "ショートカットの完全なリストは {{docPath}} を参照",
+  "docs/keyboard-shortcuts.md": "docs/keyboard-shortcuts.md",
+  "for help on Qwen Code": "Qwen Code のヘルプ",
+  "show version info": "バージョン情報を表示",
+  "submit a bug report": "バグレポートを送信",
+  "About Qwen Code": "Qwen Code について",
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
-  'CLI Version': 'CLIバージョン',
-  'Git Commit': 'Gitコミット',
-  Model: 'モデル',
-  'Fast Model': '高速モデル',
-  Sandbox: 'サンドボックス',
-  'OS Platform': 'OSプラットフォーム',
-  'OS Arch': 'OSアーキテクチャ',
-  'OS Release': 'OSリリース',
-  'Node.js Version': 'Node.js バージョン',
-  'NPM Version': 'NPM バージョン',
-  'Session ID': 'セッションID',
-  'Auth Method': '認証方式',
-  'Base URL': 'ベースURL',
-  'Memory Usage': 'メモリ使用量',
-  'IDE Client': 'IDEクライアント',
+  "CLI Version": "CLIバージョン",
+  "Git Commit": "Gitコミット",
+  Model: "モデル",
+  "Fast Model": "高速モデル",
+  Sandbox: "サンドボックス",
+  "OS Platform": "OSプラットフォーム",
+  "OS Arch": "OSアーキテクチャ",
+  "OS Release": "OSリリース",
+  "Node.js Version": "Node.js バージョン",
+  "NPM Version": "NPM バージョン",
+  "Session ID": "セッションID",
+  "Auth Method": "認証方式",
+  "Base URL": "ベースURL",
+  "Memory Usage": "メモリ使用量",
+  "IDE Client": "IDEクライアント",
 
   // ============================================================================
   // Commands - General
   // ============================================================================
-  'Analyzes the project and creates a tailored QWEN.md file.':
-    'プロジェクトを分析し、カスタマイズされた QWEN.md ファイルを作成',
-  'List available Qwen Code tools. Usage: /tools [desc]':
-    '利用可能な Qwen Code ツールを一覧表示。使い方: /tools [desc]',
-  'List available skills.': '利用可能なスキルを一覧表示する。',
-  'Available Qwen Code CLI tools:': '利用可能な Qwen Code CLI ツール:',
-  'No tools available': '利用可能なツールはありません',
-  'View or change the approval mode for tool usage':
-    'ツール使用の承認モードを表示または変更',
-  'View or change the language setting': '言語設定を表示または変更',
-  'change the theme': 'テーマを変更',
-  'Select Theme': 'テーマを選択',
-  Preview: 'プレビュー',
-  '(Use Enter to select, Tab to configure scope)':
-    '(Enter で選択、Tab でスコープを設定)',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '(Enter でスコープを適用、Tab でテーマを選択)',
-  'Theme configuration unavailable due to NO_COLOR env variable.':
-    'NO_COLOR 環境変数のためテーマ設定は利用できません',
+  "Analyzes the project and creates a tailored QWEN.md file.":
+    "プロジェクトを分析し、カスタマイズされた QWEN.md ファイルを作成",
+  "List available Qwen Code tools. Usage: /tools [desc]":
+    "利用可能な Qwen Code ツールを一覧表示。使い方: /tools [desc]",
+  "List available skills.": "利用可能なスキルを一覧表示する。",
+  "Available Qwen Code CLI tools:": "利用可能な Qwen Code CLI ツール:",
+  "No tools available": "利用可能なツールはありません",
+  "View or change the approval mode for tool usage": "ツール使用の承認モードを表示または変更",
+  "View or change the language setting": "言語設定を表示または変更",
+  "change the theme": "テーマを変更",
+  "Select Theme": "テーマを選択",
+  Preview: "プレビュー",
+  "(Use Enter to select, Tab to configure scope)": "(Enter で選択、Tab でスコープを設定)",
+  "(Use Enter to apply scope, Tab to select theme)": "(Enter でスコープを適用、Tab でテーマを選択)",
+  "Theme configuration unavailable due to NO_COLOR env variable.":
+    "NO_COLOR 環境変数のためテーマ設定は利用できません",
   'Theme "{{themeName}}" not found.': 'テーマ "{{themeName}}" が見つかりません',
   'Theme "{{themeName}}" not found in selected scope.':
     '選択したスコープにテーマ "{{themeName}}" が見つかりません',
-  'Clear conversation history and free up context':
-    '会話履歴をクリアしてコンテキストを解放',
-  'Compresses the context by replacing it with a summary.':
-    'コンテキストを要約に置き換えて圧縮',
-  'open full Qwen Code documentation in your browser':
-    'ブラウザで Qwen Code のドキュメントを開く',
-  'Configuration not available.': '設定が利用できません',
-  'change the auth method': '認証方式を変更',
-  'Configure authentication information for login':
-    'ログイン用の認証情報を設定',
-  'Copy the last result or code snippet to clipboard':
-    '最後の結果またはコードスニペットをクリップボードにコピー',
+  "Clear conversation history and free up context": "会話履歴をクリアしてコンテキストを解放",
+  "Compresses the context by replacing it with a summary.": "コンテキストを要約に置き換えて圧縮",
+  "open full Qwen Code documentation in your browser": "ブラウザで Qwen Code のドキュメントを開く",
+  "Configuration not available.": "設定が利用できません",
+  "change the auth method": "認証方式を変更",
+  "Configure authentication information for login": "ログイン用の認証情報を設定",
+  "Copy the last result or code snippet to clipboard":
+    "最後の結果またはコードスニペットをクリップボードにコピー",
 
   // ============================================================================
   // Commands - Agents
   // ============================================================================
-  'Manage subagents for specialized task delegation.':
-    '専門タスクを委任するサブエージェントを管理',
-  'Manage existing subagents (view, edit, delete).':
-    '既存のサブエージェントを管理(表示、編集、削除)',
-  'Create a new subagent with guided setup.':
-    'ガイド付きセットアップで新しいサブエージェントを作成',
+  "Manage subagents for specialized task delegation.": "専門タスクを委任するサブエージェントを管理",
+  "Manage existing subagents (view, edit, delete).":
+    "既存のサブエージェントを管理(表示、編集、削除)",
+  "Create a new subagent with guided setup.":
+    "ガイド付きセットアップで新しいサブエージェントを作成",
 
   // ============================================================================
   // Agents - Management Dialog
   // ============================================================================
-  Agents: 'エージェント',
-  'Choose Action': 'アクションを選択',
-  'Edit {{name}}': '{{name}} を編集',
-  'Edit Tools: {{name}}': 'ツールを編集: {{name}}',
-  'Edit Color: {{name}}': '色を編集: {{name}}',
-  'Delete {{name}}': '{{name}} を削除',
-  'Unknown Step': '不明なステップ',
-  'Esc to close': 'Esc で閉じる',
-  'Enter to select, ↑↓ to navigate, Esc to close':
-    'Enter で選択、↑↓ で移動、Esc で閉じる',
-  'Esc to go back': 'Esc で戻る',
-  'Enter to confirm, Esc to cancel': 'Enter で確定、Esc でキャンセル',
-  'Enter to select, ↑↓ to navigate, Esc to go back':
-    'Enter で選択、↑↓ で移動、Esc で戻る',
-  'Enter to submit, Esc to go back': 'Enter で送信、Esc で戻る',
-  'Invalid step: {{step}}': '無効なステップ: {{step}}',
-  'No subagents found.': 'サブエージェントが見つかりません',
+  Agents: "エージェント",
+  "Choose Action": "アクションを選択",
+  "Edit {{name}}": "{{name}} を編集",
+  "Edit Tools: {{name}}": "ツールを編集: {{name}}",
+  "Edit Color: {{name}}": "色を編集: {{name}}",
+  "Delete {{name}}": "{{name}} を削除",
+  "Unknown Step": "不明なステップ",
+  "Esc to close": "Esc で閉じる",
+  "Enter to select, ↑↓ to navigate, Esc to close": "Enter で選択、↑↓ で移動、Esc で閉じる",
+  "Esc to go back": "Esc で戻る",
+  "Enter to confirm, Esc to cancel": "Enter で確定、Esc でキャンセル",
+  "Enter to select, ↑↓ to navigate, Esc to go back": "Enter で選択、↑↓ で移動、Esc で戻る",
+  "Enter to submit, Esc to go back": "Enter で送信、Esc で戻る",
+  "Invalid step: {{step}}": "無効なステップ: {{step}}",
+  "No subagents found.": "サブエージェントが見つかりません",
   "Use '/agents create' to create your first subagent.":
     "'/agents create' で最初のサブエージェントを作成してください",
-  '(built-in)': '(組み込み)',
-  '(overridden by project level agent)':
-    '(プロジェクトレベルのエージェントで上書き)',
-  'Project Level ({{path}})': 'プロジェクトレベル ({{path}})',
-  'User Level ({{path}})': 'ユーザーレベル ({{path}})',
-  'Built-in Agents': '組み込みエージェント',
-  'Using: {{count}} agents': '使用中: {{count}} エージェント',
-  'View Agent': 'エージェントを表示',
-  'Edit Agent': 'エージェントを編集',
-  'Delete Agent': 'エージェントを削除',
-  Back: '戻る',
-  'No agent selected': 'エージェントが選択されていません',
-  'File Path: ': 'ファイルパス: ',
-  'Tools: ': 'ツール: ',
-  'Color: ': '色: ',
-  'Description:': '説明:',
-  'System Prompt:': 'システムプロンプト:',
-  'Open in editor': 'エディタで開く',
-  'Edit tools': 'ツールを編集',
-  'Edit color': '色を編集',
-  '❌ Error:': '❌ エラー:',
+  "(built-in)": "(組み込み)",
+  "(overridden by project level agent)": "(プロジェクトレベルのエージェントで上書き)",
+  "Project Level ({{path}})": "プロジェクトレベル ({{path}})",
+  "User Level ({{path}})": "ユーザーレベル ({{path}})",
+  "Built-in Agents": "組み込みエージェント",
+  "Using: {{count}} agents": "使用中: {{count}} エージェント",
+  "View Agent": "エージェントを表示",
+  "Edit Agent": "エージェントを編集",
+  "Delete Agent": "エージェントを削除",
+  Back: "戻る",
+  "No agent selected": "エージェントが選択されていません",
+  "File Path: ": "ファイルパス: ",
+  "Tools: ": "ツール: ",
+  "Color: ": "色: ",
+  "Description:": "説明:",
+  "System Prompt:": "システムプロンプト:",
+  "Open in editor": "エディタで開く",
+  "Edit tools": "ツールを編集",
+  "Edit color": "色を編集",
+  "❌ Error:": "❌ エラー:",
   'Are you sure you want to delete agent "{{name}}"?':
     'エージェント "{{name}}" を削除してもよろしいですか?',
-  'Project Level (.qwen/agents/)': 'プロジェクトレベル (.qwen/agents/)',
-  'User Level (~/.qwen/agents/)': 'ユーザーレベル (~/.qwen/agents/)',
-  '✅ Subagent Created Successfully!':
-    '✅ サブエージェントの作成に成功しました!',
+  "Project Level (.qwen/agents/)": "プロジェクトレベル (.qwen/agents/)",
+  "User Level (~/.qwen/agents/)": "ユーザーレベル (~/.qwen/agents/)",
+  "✅ Subagent Created Successfully!": "✅ サブエージェントの作成に成功しました!",
   'Subagent "{{name}}" has been saved to {{level}} level.':
     'サブエージェント "{{name}}" を {{level}} に保存しました',
-  'Name: ': '名前: ',
-  'Location: ': '場所: ',
-  '❌ Error saving subagent:': '❌ サブエージェント保存エラー:',
-  'Warnings:': '警告:',
-  'Step {{n}}: Choose Location': 'ステップ {{n}}: 場所を選択',
-  'Step {{n}}: Choose Generation Method': 'ステップ {{n}}: 作成方法を選択',
-  'Generate with Qwen Code (Recommended)': 'Qwen Code で生成(推奨)',
-  'Manual Creation': '手動作成',
-  'Generating subagent configuration...': 'サブエージェント設定を生成中...',
-  'Failed to generate subagent: {{error}}':
-    'サブエージェントの生成に失敗: {{error}}',
-  'Step {{n}}: Describe Your Subagent':
-    'ステップ {{n}}: サブエージェントを説明',
-  'Step {{n}}: Enter Subagent Name': 'ステップ {{n}}: サブエージェント名を入力',
-  'Step {{n}}: Enter System Prompt': 'ステップ {{n}}: システムプロンプトを入力',
-  'Step {{n}}: Enter Description': 'ステップ {{n}}: 説明を入力',
-  'Step {{n}}: Select Tools': 'ステップ {{n}}: ツールを選択',
-  'All Tools (Default)': '全ツール(デフォルト)',
-  'All Tools': '全ツール',
-  'Read-only Tools': '読み取り専用ツール',
-  'Read & Edit Tools': '読み取り＆編集ツール',
-  'Read & Edit & Execution Tools': '読み取り＆編集＆実行ツール',
-  'Selected tools:': '選択されたツール:',
-  'Step {{n}}: Choose Background Color': 'ステップ {{n}}: 背景色を選択',
-  'Step {{n}}: Confirm and Save': 'ステップ {{n}}: 確認して保存',
-  'Esc to cancel': 'Esc でキャンセル',
-  cancel: 'キャンセル',
-  'go back': '戻る',
-  '↑↓ to navigate, ': '↑↓ で移動、',
-  'Name cannot be empty.': '名前は空にできません',
-  'System prompt cannot be empty.': 'システムプロンプトは空にできません',
-  'Description cannot be empty.': '説明は空にできません',
-  'Failed to launch editor: {{error}}': 'エディタの起動に失敗: {{error}}',
-  'Failed to save and edit subagent: {{error}}':
-    'サブエージェントの保存と編集に失敗: {{error}}',
+  "Name: ": "名前: ",
+  "Location: ": "場所: ",
+  "❌ Error saving subagent:": "❌ サブエージェント保存エラー:",
+  "Warnings:": "警告:",
+  "Step {{n}}: Choose Location": "ステップ {{n}}: 場所を選択",
+  "Step {{n}}: Choose Generation Method": "ステップ {{n}}: 作成方法を選択",
+  "Generate with Qwen Code (Recommended)": "Qwen Code で生成(推奨)",
+  "Manual Creation": "手動作成",
+  "Generating subagent configuration...": "サブエージェント設定を生成中...",
+  "Failed to generate subagent: {{error}}": "サブエージェントの生成に失敗: {{error}}",
+  "Step {{n}}: Describe Your Subagent": "ステップ {{n}}: サブエージェントを説明",
+  "Step {{n}}: Enter Subagent Name": "ステップ {{n}}: サブエージェント名を入力",
+  "Step {{n}}: Enter System Prompt": "ステップ {{n}}: システムプロンプトを入力",
+  "Step {{n}}: Enter Description": "ステップ {{n}}: 説明を入力",
+  "Step {{n}}: Select Tools": "ステップ {{n}}: ツールを選択",
+  "All Tools (Default)": "全ツール(デフォルト)",
+  "All Tools": "全ツール",
+  "Read-only Tools": "読み取り専用ツール",
+  "Read & Edit Tools": "読み取り＆編集ツール",
+  "Read & Edit & Execution Tools": "読み取り＆編集＆実行ツール",
+  "Selected tools:": "選択されたツール:",
+  "Step {{n}}: Choose Background Color": "ステップ {{n}}: 背景色を選択",
+  "Step {{n}}: Confirm and Save": "ステップ {{n}}: 確認して保存",
+  "Esc to cancel": "Esc でキャンセル",
+  cancel: "キャンセル",
+  "go back": "戻る",
+  "↑↓ to navigate, ": "↑↓ で移動、",
+  "Name cannot be empty.": "名前は空にできません",
+  "System prompt cannot be empty.": "システムプロンプトは空にできません",
+  "Description cannot be empty.": "説明は空にできません",
+  "Failed to launch editor: {{error}}": "エディタの起動に失敗: {{error}}",
+  "Failed to save and edit subagent: {{error}}": "サブエージェントの保存と編集に失敗: {{error}}",
   'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent':
     '"{{name}}" は {{level}} に既に存在します - 既存のサブエージェントを上書きします',
   'Name "{{name}}" exists at user level - project level will take precedence':
     '"{{name}}" はユーザーレベルに存在します - プロジェクトレベルが優先されます',
   'Name "{{name}}" exists at project level - existing subagent will take precedence':
     '"{{name}}" はプロジェクトレベルに存在します - 既存のサブエージェントが優先されます',
-  'Description is over {{length}} characters':
-    '説明が {{length}} 文字を超えています',
-  'System prompt is over {{length}} characters':
-    'システムプロンプトが {{length}} 文字を超えています',
-  'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)':
-    'このサブエージェントの役割と使用タイミングを説明してください(詳細に記述するほど良い結果が得られます)',
-  'e.g., Expert code reviewer that reviews code based on best practices...':
-    '例: ベストプラクティスに基づいてコードをレビューするエキスパートレビュアー...',
-  'All tools selected, including MCP tools':
-    'MCPツールを含むすべてのツールを選択',
-  'Read-only tools:': '読み取り専用ツール:',
-  'Edit tools:': '編集ツール:',
-  'Execution tools:': '実行ツール:',
-  'Press Enter to save, e to save and edit, Esc to go back':
-    'Enter で保存、e で保存して編集、Esc で戻る',
-  'Press Enter to continue, {{navigation}}Esc to {{action}}':
-    'Enter で続行、{{navigation}}Esc で{{action}}',
-  'Enter a clear, unique name for this subagent.':
-    'このサブエージェントの明確で一意な名前を入力してください',
-  'e.g., Code Reviewer': '例: コードレビュアー',
+  "Description is over {{length}} characters": "説明が {{length}} 文字を超えています",
+  "System prompt is over {{length}} characters":
+    "システムプロンプトが {{length}} 文字を超えています",
+  "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)":
+    "このサブエージェントの役割と使用タイミングを説明してください(詳細に記述するほど良い結果が得られます)",
+  "e.g., Expert code reviewer that reviews code based on best practices...":
+    "例: ベストプラクティスに基づいてコードをレビューするエキスパートレビュアー...",
+  "All tools selected, including MCP tools": "MCPツールを含むすべてのツールを選択",
+  "Read-only tools:": "読み取り専用ツール:",
+  "Edit tools:": "編集ツール:",
+  "Execution tools:": "実行ツール:",
+  "Press Enter to save, e to save and edit, Esc to go back":
+    "Enter で保存、e で保存して編集、Esc で戻る",
+  "Press Enter to continue, {{navigation}}Esc to {{action}}":
+    "Enter で続行、{{navigation}}Esc で{{action}}",
+  "Enter a clear, unique name for this subagent.":
+    "このサブエージェントの明確で一意な名前を入力してください",
+  "e.g., Code Reviewer": "例: コードレビュアー",
   "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.":
-    'このサブエージェントの動作を定義するシステムプロンプトを記述してください (詳細に書くほど良い結果が得られます)',
-  'e.g., You are an expert code reviewer...':
-    '例: あなたはエキスパートコードレビュアーです...',
-  'Describe when and how this subagent should be used.':
-    'このサブエージェントをいつどのように使用するかを説明してください',
-  'e.g., Reviews code for best practices and potential bugs.':
-    '例: ベストプラクティスと潜在的なバグについてコードをレビューします。',
+    "このサブエージェントの動作を定義するシステムプロンプトを記述してください (詳細に書くほど良い結果が得られます)",
+  "e.g., You are an expert code reviewer...": "例: あなたはエキスパートコードレビュアーです...",
+  "Describe when and how this subagent should be used.":
+    "このサブエージェントをいつどのように使用するかを説明してください",
+  "e.g., Reviews code for best practices and potential bugs.":
+    "例: ベストプラクティスと潜在的なバグについてコードをレビューします。",
   // Commands - General (continued)
-  '(Use Enter to select{{tabText}})': '(Enter で選択{{tabText}})',
-  ', Tab to change focus': '、Tab でフォーカス変更',
-  'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
-    '変更を確認するには Qwen Code を再起動する必要があります。 r を押して終了し、変更を適用してください',
+  "(Use Enter to select{{tabText}})": "(Enter で選択{{tabText}})",
+  ", Tab to change focus": "、Tab でフォーカス変更",
+  "To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.":
+    "変更を確認するには Qwen Code を再起動する必要があります。 r を押して終了し、変更を適用してください",
   'The command "/{{command}}" is not supported in non-interactive mode.':
     'コマンド "/{{command}}" は非対話モードではサポートされていません',
-  'View and edit Qwen Code settings': 'Qwen Code の設定を表示・編集',
-  Settings: '設定',
-  'Vim Mode': 'Vim モード',
-  'Disable Auto Update': '自動更新を無効化',
-  Language: '言語',
-  'Output Format': '出力形式',
-  'Hide Tips': 'ヒントを非表示',
-  'Hide Banner': 'バナーを非表示',
-  'Show Memory Usage': 'メモリ使用量を表示',
-  'Show Line Numbers': '行番号を表示',
-  Text: 'テキスト',
-  JSON: 'JSON',
-  Plan: 'プラン',
-  Default: 'デフォルト',
-  'Auto Edit': '自動編集',
-  YOLO: 'YOLO',
-  'toggle vim mode on/off': 'Vim モードのオン/オフを切り替え',
-  'exit the cli': 'CLIを終了',
-  Timeout: 'タイムアウト',
-  'Max Retries': '最大リトライ回数',
-  'Auto Accept': '自動承認',
-  'Folder Trust': 'フォルダの信頼',
-  'Enable Prompt Completion': 'プロンプト補完を有効化',
-  'Debug Keystroke Logging': 'キーストロークのデバッグログ',
-  'Hide Window Title': 'ウィンドウタイトルを非表示',
-  'Show Status in Title': 'タイトルにステータスを表示',
-  'Hide Context Summary': 'コンテキスト要約を非表示',
-  'Hide CWD': '作業ディレクトリを非表示',
-  'Hide Sandbox Status': 'サンドボックス状態を非表示',
-  'Hide Model Info': 'モデル情報を非表示',
-  'Hide Footer': 'フッターを非表示',
-  'Show Citations': '引用を表示',
-  'Custom Witty Phrases': 'カスタムウィットフレーズ',
-  'Enable Welcome Back': 'ウェルカムバック機能を有効化',
-  'Disable Loading Phrases': 'ローディングフレーズを無効化',
-  'Screen Reader Mode': 'スクリーンリーダーモード',
-  'IDE Mode': 'IDEモード',
-  'Max Session Turns': '最大セッションターン数',
-  'Skip Next Speaker Check': '次の発言者チェックをスキップ',
-  'Skip Loop Detection': 'ループ検出をスキップ',
-  'Skip Startup Context': '起動時コンテキストをスキップ',
-  'Enable OpenAI Logging': 'OpenAI ログを有効化',
-  'OpenAI Logging Directory': 'OpenAI ログディレクトリ',
-  'Disable Cache Control': 'キャッシュ制御を無効化',
-  'Memory Discovery Max Dirs': 'メモリ検出の最大ディレクトリ数',
-  'Load Memory From Include Directories':
-    'インクルードディレクトリからメモリを読み込み',
-  'Respect .gitignore': '.gitignore を優先',
-  'Respect .qwenignore': '.qwenignore を優先',
-  'Enable Recursive File Search': '再帰的ファイル検索を有効化',
-  'Disable Fuzzy Search': 'ファジー検索を無効化',
-  'Enable Interactive Shell': '対話型シェルを有効化',
-  'Show Color': '色を表示',
-  'Use Ripgrep': 'Ripgrep を使用',
-  'Use Builtin Ripgrep': '組み込み Ripgrep を使用',
-  'Enable Tool Output Truncation': 'ツール出力の切り詰めを有効化',
-  'Tool Output Truncation Threshold': 'ツール出力切り詰めのしきい値',
-  'Tool Output Truncation Lines': 'ツール出力の切り詰め行数',
-  'Vision Model Preview': 'ビジョンモデルプレビュー',
-  'Tool Schema Compliance': 'ツールスキーマ準拠',
-  'Auto (detect from system)': '自動(システムから検出)',
-  'check session stats. Usage: /stats [model|tools]':
-    'セッション統計を確認。使い方: /stats [model|tools]',
-  'Show model-specific usage statistics.': 'モデル別の使用統計を表示',
-  'Show tool-specific usage statistics.': 'ツール別の使用統計を表示',
-  'Open MCP management dialog, or authenticate with OAuth-enabled servers':
-    'MCP管理ダイアログを開く、またはOAuth対応サーバーで認証',
-  'List configured MCP servers and tools, or authenticate with OAuth-enabled servers':
-    '設定済みのMCPサーバーとツールを一覧表示、またはOAuth対応サーバーで認証',
-  'Manage workspace directories': 'ワークスペースディレクトリを管理',
-  'Add directories to the workspace. Use comma to separate multiple paths':
-    'ワークスペースにディレクトリを追加。複数パスはカンマで区切ってください',
-  'Show all directories in the workspace':
-    'ワークスペース内のすべてのディレクトリを表示',
-  'set external editor preference': '外部エディタの設定',
-  'Manage extensions': '拡張機能を管理',
-  'Manage installed extensions': 'インストール済みの拡張機能を管理する',
-  'List active extensions': '有効な拡張機能を一覧表示',
-  'Update extensions. Usage: update <extension-names>|--all':
-    '拡張機能を更新。使い方: update <拡張機能名>|--all',
-  'You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.':
-    '{{originSource}} から拡張機能をインストールしています。一部の機能は Qwen Code で完全に動作しない可能性があります。',
-  'manage IDE integration': 'IDE連携を管理',
-  'check status of IDE integration': 'IDE連携の状態を確認',
-  'install required IDE companion for {{ideName}}':
-    '{{ideName}} 用の必要なIDEコンパニオンをインストール',
-  'enable IDE integration': 'IDE連携を有効化',
-  'disable IDE integration': 'IDE連携を無効化',
-  'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.':
-    '現在の環境ではIDE連携はサポートされていません。この機能を使用するには、VS Code または VS Code 派生エディタで Qwen Code を実行してください',
-  'Set up GitHub Actions': 'GitHub Actions を設定',
-  'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)':
-    '複数行入力用のターミナルキーバインドを設定(VS Code、Cursor、Windsurf、Trae)',
-  'Please restart your terminal for the changes to take effect.':
-    '変更を有効にするにはターミナルを再起動してください',
-  'Failed to configure terminal: {{error}}':
-    'ターミナルの設定に失敗: {{error}}',
-  'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.':
-    'Windows で {{terminalName}} の設定パスを特定できません: APPDATA 環境変数が設定されていません',
-  '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.':
-    '{{terminalName}} の keybindings.json は存在しますが、有効なJSON配列ではありません。ファイルを手動で修正するか、削除して自動設定を許可してください',
-  'File: {{file}}': 'ファイル: {{file}}',
-  'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.':
-    '{{terminalName}} の keybindings.json の解析に失敗しました。ファイルに無効なJSONが含まれています。手動で修正するか、削除して自動設定を許可してください',
-  'Error: {{error}}': 'エラー: {{error}}',
-  'Shift+Enter binding already exists': 'Shift+Enter バインドは既に存在します',
-  'Ctrl+Enter binding already exists': 'Ctrl+Enter バインドは既に存在します',
-  'Existing keybindings detected. Will not modify to avoid conflicts.':
-    '既存のキーバインドが検出されました。競合を避けるため変更をしません',
-  'Please check and modify manually if needed: {{file}}':
-    '必要に応じて手動で確認・変更してください: {{file}}',
-  'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.':
-    '{{terminalName}} に Shift+Enter と Ctrl+Enter のキーバインドを追加しました',
-  'Modified: {{file}}': '変更済み: {{file}}',
-  '{{terminalName}} keybindings already configured.':
-    '{{terminalName}} のキーバインドは既に設定されています',
-  'Failed to configure {{terminalName}}.':
-    '{{terminalName}} の設定に失敗しました',
-  'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).':
-    'ターミナルは複数行入力(Shift+Enter と Ctrl+Enter)に最適化されています',
+  "View and edit Qwen Code settings": "Qwen Code の設定を表示・編集",
+  Settings: "設定",
+  "Vim Mode": "Vim モード",
+  "Disable Auto Update": "自動更新を無効化",
+  Language: "言語",
+  "Output Format": "出力形式",
+  "Hide Tips": "ヒントを非表示",
+  "Hide Banner": "バナーを非表示",
+  "Show Memory Usage": "メモリ使用量を表示",
+  "Show Line Numbers": "行番号を表示",
+  Text: "テキスト",
+  JSON: "JSON",
+  Plan: "プラン",
+  Default: "デフォルト",
+  "Auto Edit": "自動編集",
+  YOLO: "YOLO",
+  "toggle vim mode on/off": "Vim モードのオン/オフを切り替え",
+  "exit the cli": "CLIを終了",
+  Timeout: "タイムアウト",
+  "Max Retries": "最大リトライ回数",
+  "Auto Accept": "自動承認",
+  "Folder Trust": "フォルダの信頼",
+  "Enable Prompt Completion": "プロンプト補完を有効化",
+  "Debug Keystroke Logging": "キーストロークのデバッグログ",
+  "Hide Window Title": "ウィンドウタイトルを非表示",
+  "Show Status in Title": "タイトルにステータスを表示",
+  "Hide Context Summary": "コンテキスト要約を非表示",
+  "Hide CWD": "作業ディレクトリを非表示",
+  "Hide Sandbox Status": "サンドボックス状態を非表示",
+  "Hide Model Info": "モデル情報を非表示",
+  "Hide Footer": "フッターを非表示",
+  "Show Citations": "引用を表示",
+  "Custom Witty Phrases": "カスタムウィットフレーズ",
+  "Enable Welcome Back": "ウェルカムバック機能を有効化",
+  "Disable Loading Phrases": "ローディングフレーズを無効化",
+  "Screen Reader Mode": "スクリーンリーダーモード",
+  "IDE Mode": "IDEモード",
+  "Max Session Turns": "最大セッションターン数",
+  "Skip Next Speaker Check": "次の発言者チェックをスキップ",
+  "Skip Loop Detection": "ループ検出をスキップ",
+  "Skip Startup Context": "起動時コンテキストをスキップ",
+  "Enable OpenAI Logging": "OpenAI ログを有効化",
+  "OpenAI Logging Directory": "OpenAI ログディレクトリ",
+  "Disable Cache Control": "キャッシュ制御を無効化",
+  "Memory Discovery Max Dirs": "メモリ検出の最大ディレクトリ数",
+  "Load Memory From Include Directories": "インクルードディレクトリからメモリを読み込み",
+  "Respect .gitignore": ".gitignore を優先",
+  "Respect .qwenignore": ".qwenignore を優先",
+  "Enable Recursive File Search": "再帰的ファイル検索を有効化",
+  "Disable Fuzzy Search": "ファジー検索を無効化",
+  "Enable Interactive Shell": "対話型シェルを有効化",
+  "Show Color": "色を表示",
+  "Use Ripgrep": "Ripgrep を使用",
+  "Use Builtin Ripgrep": "組み込み Ripgrep を使用",
+  "Enable Tool Output Truncation": "ツール出力の切り詰めを有効化",
+  "Tool Output Truncation Threshold": "ツール出力切り詰めのしきい値",
+  "Tool Output Truncation Lines": "ツール出力の切り詰め行数",
+  "Vision Model Preview": "ビジョンモデルプレビュー",
+  "Tool Schema Compliance": "ツールスキーマ準拠",
+  "Auto (detect from system)": "自動(システムから検出)",
+  "check session stats. Usage: /stats [model|tools]":
+    "セッション統計を確認。使い方: /stats [model|tools]",
+  "Show model-specific usage statistics.": "モデル別の使用統計を表示",
+  "Show tool-specific usage statistics.": "ツール別の使用統計を表示",
+  "Open MCP management dialog, or authenticate with OAuth-enabled servers":
+    "MCP管理ダイアログを開く、またはOAuth対応サーバーで認証",
+  "List configured MCP servers and tools, or authenticate with OAuth-enabled servers":
+    "設定済みのMCPサーバーとツールを一覧表示、またはOAuth対応サーバーで認証",
+  "Manage workspace directories": "ワークスペースディレクトリを管理",
+  "Add directories to the workspace. Use comma to separate multiple paths":
+    "ワークスペースにディレクトリを追加。複数パスはカンマで区切ってください",
+  "Show all directories in the workspace": "ワークスペース内のすべてのディレクトリを表示",
+  "set external editor preference": "外部エディタの設定",
+  "Manage extensions": "拡張機能を管理",
+  "Manage installed extensions": "インストール済みの拡張機能を管理する",
+  "List active extensions": "有効な拡張機能を一覧表示",
+  "Update extensions. Usage: update <extension-names>|--all":
+    "拡張機能を更新。使い方: update <拡張機能名>|--all",
+  "You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.":
+    "{{originSource}} から拡張機能をインストールしています。一部の機能は Qwen Code で完全に動作しない可能性があります。",
+  "manage IDE integration": "IDE連携を管理",
+  "check status of IDE integration": "IDE連携の状態を確認",
+  "install required IDE companion for {{ideName}}":
+    "{{ideName}} 用の必要なIDEコンパニオンをインストール",
+  "enable IDE integration": "IDE連携を有効化",
+  "disable IDE integration": "IDE連携を無効化",
+  "IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.":
+    "現在の環境ではIDE連携はサポートされていません。この機能を使用するには、VS Code または VS Code 派生エディタで Qwen Code を実行してください",
+  "Set up GitHub Actions": "GitHub Actions を設定",
+  "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)":
+    "複数行入力用のターミナルキーバインドを設定(VS Code、Cursor、Windsurf、Trae)",
+  "Please restart your terminal for the changes to take effect.":
+    "変更を有効にするにはターミナルを再起動してください",
+  "Failed to configure terminal: {{error}}": "ターミナルの設定に失敗: {{error}}",
+  "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.":
+    "Windows で {{terminalName}} の設定パスを特定できません: APPDATA 環境変数が設定されていません",
+  "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.":
+    "{{terminalName}} の keybindings.json は存在しますが、有効なJSON配列ではありません。ファイルを手動で修正するか、削除して自動設定を許可してください",
+  "File: {{file}}": "ファイル: {{file}}",
+  "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.":
+    "{{terminalName}} の keybindings.json の解析に失敗しました。ファイルに無効なJSONが含まれています。手動で修正するか、削除して自動設定を許可してください",
+  "Error: {{error}}": "エラー: {{error}}",
+  "Shift+Enter binding already exists": "Shift+Enter バインドは既に存在します",
+  "Ctrl+Enter binding already exists": "Ctrl+Enter バインドは既に存在します",
+  "Existing keybindings detected. Will not modify to avoid conflicts.":
+    "既存のキーバインドが検出されました。競合を避けるため変更をしません",
+  "Please check and modify manually if needed: {{file}}":
+    "必要に応じて手動で確認・変更してください: {{file}}",
+  "Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.":
+    "{{terminalName}} に Shift+Enter と Ctrl+Enter のキーバインドを追加しました",
+  "Modified: {{file}}": "変更済み: {{file}}",
+  "{{terminalName}} keybindings already configured.":
+    "{{terminalName}} のキーバインドは既に設定されています",
+  "Failed to configure {{terminalName}}.": "{{terminalName}} の設定に失敗しました",
+  "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).":
+    "ターミナルは複数行入力(Shift+Enter と Ctrl+Enter)に最適化されています",
   // ============================================================================
   // Commands - Hooks
   // ============================================================================
-  'Manage Qwen Code hooks': 'Qwen Code のフックを管理する',
-  'List all configured hooks': '設定済みのフックをすべて表示する',
-  'Enable a disabled hook': '無効なフックを有効にする',
-  'Disable an active hook': '有効なフックを無効にする',
+  "Manage Qwen Code hooks": "Qwen Code のフックを管理する",
+  "List all configured hooks": "設定済みのフックをすべて表示する",
+  "Enable a disabled hook": "無効なフックを有効にする",
+  "Disable an active hook": "有効なフックを無効にする",
   // Hooks - Dialog
-  Hooks: 'フック',
-  'Loading hooks...': 'フックを読み込んでいます...',
-  'Error loading hooks:': 'フックの読み込みエラー：',
-  'Press Escape to close': 'Escape キーで閉じる',
-  'Press Escape, Ctrl+C, or Ctrl+D to cancel':
-    'Escape、Ctrl+C、Ctrl+D でキャンセル',
-  'Press Space, Enter, or Escape to dismiss': 'Space、Enter、Escape で閉じる',
-  'No hook selected': 'フックが選択されていません',
+  Hooks: "フック",
+  "Loading hooks...": "フックを読み込んでいます...",
+  "Error loading hooks:": "フックの読み込みエラー：",
+  "Press Escape to close": "Escape キーで閉じる",
+  "Press Escape, Ctrl+C, or Ctrl+D to cancel": "Escape、Ctrl+C、Ctrl+D でキャンセル",
+  "Press Space, Enter, or Escape to dismiss": "Space、Enter、Escape で閉じる",
+  "No hook selected": "フックが選択されていません",
   // Hooks - List Step
-  'No hook events found.': 'フックイベントが見つかりません。',
-  '{{count}} hook configured': '{{count}} 件のフックが設定されています',
-  '{{count}} hooks configured': '{{count}} 件のフックが設定されています',
-  'This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.':
-    'このメニューは読み取り専用です。フックを追加または変更するには、settings.json を直接編集するか、Qwen Code に尋ねてください。',
-  'Enter to select · Esc to cancel': 'Enter で選択 · Esc でキャンセル',
+  "No hook events found.": "フックイベントが見つかりません。",
+  "{{count}} hook configured": "{{count}} 件のフックが設定されています",
+  "{{count}} hooks configured": "{{count}} 件のフックが設定されています",
+  "This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.":
+    "このメニューは読み取り専用です。フックを追加または変更するには、settings.json を直接編集するか、Qwen Code に尋ねてください。",
+  "Enter to select · Esc to cancel": "Enter で選択 · Esc でキャンセル",
   // Hooks - Detail Step
-  'Exit codes:': '終了コード：',
-  'Configured hooks:': '設定済みのフック：',
-  'No hooks configured for this event.':
-    'このイベントにはフックが設定されていません。',
-  'To add hooks, edit settings.json directly or ask Qwen.':
-    'フックを追加するには、settings.json を直接編集するか、Qwen に尋ねてください。',
-  'Enter to select · Esc to go back': 'Enter で選択 · Esc で戻る',
+  "Exit codes:": "終了コード：",
+  "Configured hooks:": "設定済みのフック：",
+  "No hooks configured for this event.": "このイベントにはフックが設定されていません。",
+  "To add hooks, edit settings.json directly or ask Qwen.":
+    "フックを追加するには、settings.json を直接編集するか、Qwen に尋ねてください。",
+  "Enter to select · Esc to go back": "Enter で選択 · Esc で戻る",
   // Hooks - Config Detail Step
-  'Hook details': 'フック詳細',
-  'Event:': 'イベント：',
-  'Extension:': '拡張機能：',
-  'Desc:': '説明：',
-  'No hook config selected': 'フック設定が選択されていません',
-  'To modify or remove this hook, edit settings.json directly or ask Qwen to help.':
-    'このフックを変更または削除するには、settings.json を直接編集するか、Qwen に尋ねてください。',
+  "Hook details": "フック詳細",
+  "Event:": "イベント：",
+  "Extension:": "拡張機能：",
+  "Desc:": "説明：",
+  "No hook config selected": "フック設定が選択されていません",
+  "To modify or remove this hook, edit settings.json directly or ask Qwen to help.":
+    "このフックを変更または削除するには、settings.json を直接編集するか、Qwen に尋ねてください。",
   // Hooks - Disabled Step
-  'Hook Configuration - Disabled': 'フック設定 - 無効',
-  'All hooks are currently disabled. You have {{count}} that are not running.':
-    'すべてのフックは現在無効です。{{count}} が実行されていません。',
-  '{{count}} configured hook': '{{count}} 個の設定されたフック',
-  '{{count}} configured hooks': '{{count}} 個の設定されたフック',
-  'When hooks are disabled:': 'フックが無効な場合：',
-  'No hook commands will execute': 'フックコマンドは実行されません',
-  'StatusLine will not be displayed': 'StatusLine は表示されません',
-  'Tool operations will proceed without hook validation':
-    'ツール操作はフック検証なしで続行されます',
+  "Hook Configuration - Disabled": "フック設定 - 無効",
+  "All hooks are currently disabled. You have {{count}} that are not running.":
+    "すべてのフックは現在無効です。{{count}} が実行されていません。",
+  "{{count}} configured hook": "{{count}} 個の設定されたフック",
+  "{{count}} configured hooks": "{{count}} 個の設定されたフック",
+  "When hooks are disabled:": "フックが無効な場合：",
+  "No hook commands will execute": "フックコマンドは実行されません",
+  "StatusLine will not be displayed": "StatusLine は表示されません",
+  "Tool operations will proceed without hook validation":
+    "ツール操作はフック検証なしで続行されます",
   'To re-enable hooks, remove "disableAllHooks" from settings.json or ask Qwen Code.':
     'フックを再有効化するには、settings.json から "disableAllHooks" を削除するか、Qwen Code に尋ねてください。',
   // Hooks - Source
-  Project: 'プロジェクト',
-  User: 'ユーザー',
-  System: 'システム',
-  Extension: '拡張機能',
-  'Local Settings': 'ローカル設定',
-  'User Settings': 'ユーザー設定',
-  'System Settings': 'システム設定',
-  Extensions: '拡張機能',
+  Project: "プロジェクト",
+  User: "ユーザー",
+  System: "システム",
+  Extension: "拡張機能",
+  "Local Settings": "ローカル設定",
+  "User Settings": "ユーザー設定",
+  "System Settings": "システム設定",
+  Extensions: "拡張機能",
   // Hooks - Status
-  '✓ Enabled': '✓ 有効',
-  '✗ Disabled': '✗ 無効',
+  "✓ Enabled": "✓ 有効",
+  "✗ Disabled": "✗ 無効",
   // Hooks - Event Descriptions (short)
-  'Before tool execution': 'ツール実行前',
-  'After tool execution': 'ツール実行後',
-  'After tool execution fails': 'ツール実行失敗時',
-  'When notifications are sent': '通知送信時',
-  'When the user submits a prompt': 'ユーザーがプロンプトを送信した時',
-  'When a new session is started': '新しいセッションが開始された時',
-  'Right before Qwen Code concludes its response':
-    'Qwen Code が応答を終了する直前',
-  'When a subagent (Agent tool call) is started':
-    'サブエージェント（Agent ツール呼び出し）が開始された時',
-  'Right before a subagent concludes its response':
-    'サブエージェントが応答を終了する直前',
-  'Before conversation compaction': '会話圧縮前',
-  'When a session is ending': 'セッション終了時',
-  'When a permission dialog is displayed': '権限ダイアログ表示時',
+  "Before tool execution": "ツール実行前",
+  "After tool execution": "ツール実行後",
+  "After tool execution fails": "ツール実行失敗時",
+  "When notifications are sent": "通知送信時",
+  "When the user submits a prompt": "ユーザーがプロンプトを送信した時",
+  "When a new session is started": "新しいセッションが開始された時",
+  "Right before Qwen Code concludes its response": "Qwen Code が応答を終了する直前",
+  "When a subagent (Agent tool call) is started":
+    "サブエージェント（Agent ツール呼び出し）が開始された時",
+  "Right before a subagent concludes its response": "サブエージェントが応答を終了する直前",
+  "Before conversation compaction": "会話圧縮前",
+  "When a session is ending": "セッション終了時",
+  "When a permission dialog is displayed": "権限ダイアログ表示時",
   // Hooks - Event Descriptions (detailed)
-  'Input to command is JSON of tool call arguments.':
-    'コマンドへの入力はツール呼び出し引数の JSON です。',
+  "Input to command is JSON of tool call arguments.":
+    "コマンドへの入力はツール呼び出し引数の JSON です。",
   'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).':
     'コマンドへの入力は "inputs"（ツール呼び出し引数）と "response"（ツール呼び出し応答）フィールドを持つ JSON です。',
-  'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.':
-    'コマンドへの入力は tool_name、tool_input、tool_use_id、error、error_type、is_interrupt、is_timeout を持つ JSON です。',
-  'Input to command is JSON with notification message and type.':
-    'コマンドへの入力は通知メッセージとタイプを持つ JSON です。',
-  'Input to command is JSON with original user prompt text.':
-    'コマンドへの入力は元のユーザープロンプトテキストを持つ JSON です。',
-  'Input to command is JSON with session start source.':
-    'コマンドへの入力はセッション開始ソースを持つ JSON です。',
-  'Input to command is JSON with session end reason.':
-    'コマンドへの入力はセッション終了理由を持つ JSON です。',
-  'Input to command is JSON with agent_id and agent_type.':
-    'コマンドへの入力は agent_id と agent_type を持つ JSON です。',
-  'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.':
-    'コマンドへの入力は agent_id、agent_type、agent_transcript_path を持つ JSON です。',
-  'Input to command is JSON with compaction details.':
-    'コマンドへの入力は圧縮詳細を持つ JSON です。',
-  'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.':
-    'コマンドへの入力は tool_name、tool_input、tool_use_id を持つ JSON です。許可または拒否の決定を含む hookSpecificOutput を持つ JSON を出力します。',
+  "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.":
+    "コマンドへの入力は tool_name、tool_input、tool_use_id、error、error_type、is_interrupt、is_timeout を持つ JSON です。",
+  "Input to command is JSON with notification message and type.":
+    "コマンドへの入力は通知メッセージとタイプを持つ JSON です。",
+  "Input to command is JSON with original user prompt text.":
+    "コマンドへの入力は元のユーザープロンプトテキストを持つ JSON です。",
+  "Input to command is JSON with session start source.":
+    "コマンドへの入力はセッション開始ソースを持つ JSON です。",
+  "Input to command is JSON with session end reason.":
+    "コマンドへの入力はセッション終了理由を持つ JSON です。",
+  "Input to command is JSON with agent_id and agent_type.":
+    "コマンドへの入力は agent_id と agent_type を持つ JSON です。",
+  "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.":
+    "コマンドへの入力は agent_id、agent_type、agent_transcript_path を持つ JSON です。",
+  "Input to command is JSON with compaction details.":
+    "コマンドへの入力は圧縮詳細を持つ JSON です。",
+  "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.":
+    "コマンドへの入力は tool_name、tool_input、tool_use_id を持つ JSON です。許可または拒否の決定を含む hookSpecificOutput を持つ JSON を出力します。",
   // Hooks - Exit Code Descriptions
-  'stdout/stderr not shown': 'stdout/stderr は表示されません',
-  'show stderr to model and continue conversation':
-    'stderr をモデルに表示し、会話を続ける',
-  'show stderr to user only': 'stderr をユーザーのみに表示',
-  'stdout shown in transcript mode (ctrl+o)':
-    'stdout はトランスクリプトモードで表示 (ctrl+o)',
-  'show stderr to model immediately': 'stderr をモデルに即座に表示',
-  'show stderr to user only but continue with tool call':
-    'stderr をユーザーのみに表示し、ツール呼び出しを続ける',
-  'block processing, erase original prompt, and show stderr to user only':
-    '処理をブロックし、元のプロンプトを消去し、stderr をユーザーのみに表示',
-  'stdout shown to Qwen': 'stdout をモデルに表示',
-  'show stderr to user only (blocking errors ignored)':
-    'stderr をユーザーのみに表示（ブロッキングエラーは無視）',
-  'command completes successfully': 'コマンドが正常に完了',
-  'stdout shown to subagent': 'stdout をサブエージェントに表示',
-  'show stderr to subagent and continue having it run':
-    'stderr をサブエージェントに表示し、実行を続ける',
-  'stdout appended as custom compact instructions':
-    'stdout をカスタム圧縮指示として追加',
-  'block compaction': '圧縮をブロック',
-  'show stderr to user only but continue with compaction':
-    'stderr をユーザーのみに表示し、圧縮を続ける',
-  'use hook decision if provided': '提供されている場合はフックの決定を使用',
+  "stdout/stderr not shown": "stdout/stderr は表示されません",
+  "show stderr to model and continue conversation": "stderr をモデルに表示し、会話を続ける",
+  "show stderr to user only": "stderr をユーザーのみに表示",
+  "stdout shown in transcript mode (ctrl+o)": "stdout はトランスクリプトモードで表示 (ctrl+o)",
+  "show stderr to model immediately": "stderr をモデルに即座に表示",
+  "show stderr to user only but continue with tool call":
+    "stderr をユーザーのみに表示し、ツール呼び出しを続ける",
+  "block processing, erase original prompt, and show stderr to user only":
+    "処理をブロックし、元のプロンプトを消去し、stderr をユーザーのみに表示",
+  "stdout shown to Qwen": "stdout をモデルに表示",
+  "show stderr to user only (blocking errors ignored)":
+    "stderr をユーザーのみに表示（ブロッキングエラーは無視）",
+  "command completes successfully": "コマンドが正常に完了",
+  "stdout shown to subagent": "stdout をサブエージェントに表示",
+  "show stderr to subagent and continue having it run":
+    "stderr をサブエージェントに表示し、実行を続ける",
+  "stdout appended as custom compact instructions": "stdout をカスタム圧縮指示として追加",
+  "block compaction": "圧縮をブロック",
+  "show stderr to user only but continue with compaction":
+    "stderr をユーザーのみに表示し、圧縮を続ける",
+  "use hook decision if provided": "提供されている場合はフックの決定を使用",
   // Hooks - Messages
-  'Config not loaded.': '設定が読み込まれていません。',
-  'Hooks are not enabled. Enable hooks in settings to use this feature.':
-    'フックが有効になっていません。この機能を使用するには設定でフックを有効にしてください。',
-  'No hooks configured. Add hooks in your settings.json file.':
-    'フックが設定されていません。settings.json ファイルにフックを追加してください。',
-  'Configured Hooks ({{count}} total)': '設定済みのフック（合計 {{count}} 件）',
+  "Config not loaded.": "設定が読み込まれていません。",
+  "Hooks are not enabled. Enable hooks in settings to use this feature.":
+    "フックが有効になっていません。この機能を使用するには設定でフックを有効にしてください。",
+  "No hooks configured. Add hooks in your settings.json file.":
+    "フックが設定されていません。settings.json ファイルにフックを追加してください。",
+  "Configured Hooks ({{count}} total)": "設定済みのフック（合計 {{count}} 件）",
 
   // ============================================================================
   // Commands - Session Export
   // ============================================================================
-  'Export current session message history to a file':
-    '現在のセッションのメッセージ履歴をファイルにエクスポートする',
-  'Export session to HTML format': 'セッションを HTML 形式でエクスポートする',
-  'Export session to JSON format': 'セッションを JSON 形式でエクスポートする',
-  'Export session to JSONL format (one message per line)':
-    'セッションを JSONL 形式でエクスポートする（1 行に 1 メッセージ）',
-  'Export session to markdown format':
-    'セッションを Markdown 形式でエクスポートする',
+  "Export current session message history to a file":
+    "現在のセッションのメッセージ履歴をファイルにエクスポートする",
+  "Export session to HTML format": "セッションを HTML 形式でエクスポートする",
+  "Export session to JSON format": "セッションを JSON 形式でエクスポートする",
+  "Export session to JSONL format (one message per line)":
+    "セッションを JSONL 形式でエクスポートする（1 行に 1 メッセージ）",
+  "Export session to markdown format": "セッションを Markdown 形式でエクスポートする",
 
   // ============================================================================
   // Commands - Insights
   // ============================================================================
-  'generate personalized programming insights from your chat history':
-    'チャット履歴からパーソナライズされたプログラミングインサイトを生成する',
+  "generate personalized programming insights from your chat history":
+    "チャット履歴からパーソナライズされたプログラミングインサイトを生成する",
 
   // ============================================================================
   // Commands - Session History
   // ============================================================================
-  'Resume a previous session': '前のセッションを再開する',
-  'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested':
-    'ツール呼び出しを復元します。これにより、会話とファイルの履歴はそのツール呼び出しが提案された時点の状態に戻ります',
-  'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.':
-    'ターミナルの種類を検出できませんでした。サポートされているターミナル: VS Code、Cursor、Windsurf、Trae',
+  "Resume a previous session": "前のセッションを再開する",
+  "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested":
+    "ツール呼び出しを復元します。これにより、会話とファイルの履歴はそのツール呼び出しが提案された時点の状態に戻ります",
+  "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.":
+    "ターミナルの種類を検出できませんでした。サポートされているターミナル: VS Code、Cursor、Windsurf、Trae",
   'Terminal "{{terminal}}" is not supported yet.':
     'ターミナル "{{terminal}}" はまだサポートされていません',
   // Commands - Language
-  'Invalid language. Available: {{options}}':
-    '無効な言語です。使用可能: {{options}}',
-  'Language subcommands do not accept additional arguments.':
-    '言語サブコマンドは追加の引数を受け付けません',
-  'Current UI language: {{lang}}': '現在のUI言語: {{lang}}',
-  'Current LLM output language: {{lang}}': '現在のLLM出力言語: {{lang}}',
-  'LLM output language not set': 'LLM出力言語が設定されていません',
-  'Set UI language': 'UI言語を設定',
-  'Set LLM output language': 'LLM出力言語を設定',
-  'Usage: /language ui [{{options}}]': '使い方: /language ui [{{options}}]',
-  'Usage: /language output <language>': '使い方: /language output <言語>',
-  'Example: /language output 中文': '例: /language output 中文',
-  'Example: /language output English': '例: /language output English',
-  'Example: /language output 日本語': '例: /language output 日本語',
-  'Example: /language output Português': '例: /language output Português',
-  'UI language changed to {{lang}}': 'UI言語を {{lang}} に変更しました',
-  'LLM output language rule file generated at {{path}}':
-    'LLM出力言語ルールファイルを {{path}} に生成しました',
-  'Please restart the application for the changes to take effect.':
-    '変更を有効にするにはアプリケーションを再起動してください',
-  'Failed to generate LLM output language rule file: {{error}}':
-    'LLM出力言語ルールファイルの生成に失敗: {{error}}',
-  'Invalid command. Available subcommands:':
-    '無効なコマンドです。使用可能なサブコマンド:',
-  'Available subcommands:': '使用可能なサブコマンド:',
-  'To request additional UI language packs, please open an issue on GitHub.':
-    '追加のUI言語パックをリクエストするには、GitHub で Issue を作成してください',
-  'Available options:': '使用可能なオプション:',
-  'Set UI language to {{name}}': 'UI言語を {{name}} に設定',
+  "Invalid language. Available: {{options}}": "無効な言語です。使用可能: {{options}}",
+  "Language subcommands do not accept additional arguments.":
+    "言語サブコマンドは追加の引数を受け付けません",
+  "Current UI language: {{lang}}": "現在のUI言語: {{lang}}",
+  "Current LLM output language: {{lang}}": "現在のLLM出力言語: {{lang}}",
+  "LLM output language not set": "LLM出力言語が設定されていません",
+  "Set UI language": "UI言語を設定",
+  "Set LLM output language": "LLM出力言語を設定",
+  "Usage: /language ui [{{options}}]": "使い方: /language ui [{{options}}]",
+  "Usage: /language output <language>": "使い方: /language output <言語>",
+  "Example: /language output 中文": "例: /language output 中文",
+  "Example: /language output English": "例: /language output English",
+  "Example: /language output 日本語": "例: /language output 日本語",
+  "Example: /language output Português": "例: /language output Português",
+  "UI language changed to {{lang}}": "UI言語を {{lang}} に変更しました",
+  "LLM output language rule file generated at {{path}}":
+    "LLM出力言語ルールファイルを {{path}} に生成しました",
+  "Please restart the application for the changes to take effect.":
+    "変更を有効にするにはアプリケーションを再起動してください",
+  "Failed to generate LLM output language rule file: {{error}}":
+    "LLM出力言語ルールファイルの生成に失敗: {{error}}",
+  "Invalid command. Available subcommands:": "無効なコマンドです。使用可能なサブコマンド:",
+  "Available subcommands:": "使用可能なサブコマンド:",
+  "To request additional UI language packs, please open an issue on GitHub.":
+    "追加のUI言語パックをリクエストするには、GitHub で Issue を作成してください",
+  "Available options:": "使用可能なオプション:",
+  "Set UI language to {{name}}": "UI言語を {{name}} に設定",
   // Approval Mode
-  'Approval Mode': '承認モード',
-  'Current approval mode: {{mode}}': '現在の承認モード: {{mode}}',
-  'Available approval modes:': '利用可能な承認モード:',
-  'Approval mode changed to: {{mode}}': '承認モードを変更しました: {{mode}}',
-  'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
-    '承認モードを {{mode}} に変更しました({{scope}} 設定{{location}}に保存)',
-  'Usage: /approval-mode <mode> [--session|--user|--project]':
-    '使い方: /approval-mode <モード> [--session|--user|--project]',
-  'Scope subcommands do not accept additional arguments.':
-    'スコープサブコマンドは追加の引数を受け付けません',
-  'Plan mode - Analyze only, do not modify files or execute commands':
-    'プランモード - 分析のみ、ファイルの変更やコマンドの実行はしません',
-  'Default mode - Require approval for file edits or shell commands':
-    'デフォルトモード - ファイル編集やシェルコマンドには承認が必要',
-  'Auto-edit mode - Automatically approve file edits':
-    '自動編集モード - ファイル編集を自動承認',
-  'YOLO mode - Automatically approve all tools':
-    'YOLOモード - すべてのツールを自動承認',
-  '{{mode}} mode': '{{mode}}モード',
-  'Settings service is not available; unable to persist the approval mode.':
-    '設定サービスが利用できません。承認モードを保存できません',
-  'Failed to save approval mode: {{error}}':
-    '承認モードの保存に失敗: {{error}}',
-  'Failed to change approval mode: {{error}}':
-    '承認モードの変更に失敗: {{error}}',
-  'Apply to current session only (temporary)':
-    '現在のセッションのみに適用(一時的)',
-  'Persist for this project/workspace': 'このプロジェクト/ワークスペースに保存',
-  'Persist for this user on this machine': 'このマシンのこのユーザーに保存',
-  'Analyze only, do not modify files or execute commands':
-    '分析のみ、ファイルの変更やコマンドの実行はしません',
-  'Require approval for file edits or shell commands':
-    'ファイル編集やシェルコマンドには承認が必要',
-  'Automatically approve file edits': 'ファイル編集を自動承認',
-  'Automatically approve all tools': 'すべてのツールを自動承認',
-  'Workspace approval mode exists and takes priority. User-level change will have no effect.':
-    'ワークスペースの承認モードが存在し、優先されます。ユーザーレベルの変更は効果がありません',
-  '(Use Enter to select, Tab to change focus)':
-    '(Enter で選択、Tab でフォーカス変更)',
-  'Apply To': '適用先',
-  'Workspace Settings': 'ワークスペース設定',
+  "Approval Mode": "承認モード",
+  "Current approval mode: {{mode}}": "現在の承認モード: {{mode}}",
+  "Available approval modes:": "利用可能な承認モード:",
+  "Approval mode changed to: {{mode}}": "承認モードを変更しました: {{mode}}",
+  "Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})":
+    "承認モードを {{mode}} に変更しました({{scope}} 設定{{location}}に保存)",
+  "Usage: /approval-mode <mode> [--session|--user|--project]":
+    "使い方: /approval-mode <モード> [--session|--user|--project]",
+  "Scope subcommands do not accept additional arguments.":
+    "スコープサブコマンドは追加の引数を受け付けません",
+  "Plan mode - Analyze only, do not modify files or execute commands":
+    "プランモード - 分析のみ、ファイルの変更やコマンドの実行はしません",
+  "Default mode - Require approval for file edits or shell commands":
+    "デフォルトモード - ファイル編集やシェルコマンドには承認が必要",
+  "Auto-edit mode - Automatically approve file edits": "自動編集モード - ファイル編集を自動承認",
+  "YOLO mode - Automatically approve all tools": "YOLOモード - すべてのツールを自動承認",
+  "{{mode}} mode": "{{mode}}モード",
+  "Settings service is not available; unable to persist the approval mode.":
+    "設定サービスが利用できません。承認モードを保存できません",
+  "Failed to save approval mode: {{error}}": "承認モードの保存に失敗: {{error}}",
+  "Failed to change approval mode: {{error}}": "承認モードの変更に失敗: {{error}}",
+  "Apply to current session only (temporary)": "現在のセッションのみに適用(一時的)",
+  "Persist for this project/workspace": "このプロジェクト/ワークスペースに保存",
+  "Persist for this user on this machine": "このマシンのこのユーザーに保存",
+  "Analyze only, do not modify files or execute commands":
+    "分析のみ、ファイルの変更やコマンドの実行はしません",
+  "Require approval for file edits or shell commands": "ファイル編集やシェルコマンドには承認が必要",
+  "Automatically approve file edits": "ファイル編集を自動承認",
+  "Automatically approve all tools": "すべてのツールを自動承認",
+  "Workspace approval mode exists and takes priority. User-level change will have no effect.":
+    "ワークスペースの承認モードが存在し、優先されます。ユーザーレベルの変更は効果がありません",
+  "(Use Enter to select, Tab to change focus)": "(Enter で選択、Tab でフォーカス変更)",
+  "Apply To": "適用先",
+  "Workspace Settings": "ワークスペース設定",
   // Memory
-  'Commands for interacting with memory.': 'メモリ操作のコマンド',
-  'Show the current memory contents.': '現在のメモリ内容を表示',
-  'Show project-level memory contents.': 'プロジェクトレベルのメモリ内容を表示',
-  'Show global memory contents.': 'グローバルメモリ内容を表示',
-  'Add content to project-level memory.':
-    'プロジェクトレベルのメモリにコンテンツを追加',
-  'Add content to global memory.': 'グローバルメモリにコンテンツを追加',
-  'Refresh the memory from the source.': 'ソースからメモリを更新',
-  'Usage: /memory add --project <text to remember>':
-    '使い方: /memory add --project <記憶するテキスト>',
-  'Usage: /memory add --global <text to remember>':
-    '使い方: /memory add --global <記憶するテキスト>',
+  "Commands for interacting with memory.": "メモリ操作のコマンド",
+  "Show the current memory contents.": "現在のメモリ内容を表示",
+  "Show project-level memory contents.": "プロジェクトレベルのメモリ内容を表示",
+  "Show global memory contents.": "グローバルメモリ内容を表示",
+  "Add content to project-level memory.": "プロジェクトレベルのメモリにコンテンツを追加",
+  "Add content to global memory.": "グローバルメモリにコンテンツを追加",
+  "Refresh the memory from the source.": "ソースからメモリを更新",
+  "Usage: /memory add --project <text to remember>":
+    "使い方: /memory add --project <記憶するテキスト>",
+  "Usage: /memory add --global <text to remember>":
+    "使い方: /memory add --global <記憶するテキスト>",
   'Attempting to save to project memory: "{{text}}"':
     'プロジェクトメモリへの保存を試行中: "{{text}}"',
-  'Attempting to save to global memory: "{{text}}"':
-    'グローバルメモリへの保存を試行中: "{{text}}"',
-  'Current memory content from {{count}} file(s):':
-    '{{count}} 個のファイルからの現在のメモリ内容:',
-  'Memory is currently empty.': 'メモリは現在空です',
-  'Project memory file not found or is currently empty.':
-    'プロジェクトメモリファイルが見つからないか、現在空です',
-  'Global memory file not found or is currently empty.':
-    'グローバルメモリファイルが見つからないか、現在空です',
-  'Global memory is currently empty.': 'グローバルメモリは現在空です',
-  'Global memory content:\n\n---\n{{content}}\n---':
-    'グローバルメモリ内容:\n\n---\n{{content}}\n---',
-  'Project memory content from {{path}}:\n\n---\n{{content}}\n---':
-    '{{path}} からのプロジェクトメモリ内容:\n\n---\n{{content}}\n---',
-  'Project memory is currently empty.': 'プロジェクトメモリは現在空です',
-  'Refreshing memory from source files...':
-    'ソースファイルからメモリを更新中...',
-  'Add content to the memory. Use --global for global memory or --project for project memory.':
-    'メモリにコンテンツを追加。グローバルメモリには --global、プロジェクトメモリには --project を使用',
-  'Usage: /memory add [--global|--project] <text to remember>':
-    '使い方: /memory add [--global|--project] <記憶するテキスト>',
+  'Attempting to save to global memory: "{{text}}"': 'グローバルメモリへの保存を試行中: "{{text}}"',
+  "Current memory content from {{count}} file(s):": "{{count}} 個のファイルからの現在のメモリ内容:",
+  "Memory is currently empty.": "メモリは現在空です",
+  "Project memory file not found or is currently empty.":
+    "プロジェクトメモリファイルが見つからないか、現在空です",
+  "Global memory file not found or is currently empty.":
+    "グローバルメモリファイルが見つからないか、現在空です",
+  "Global memory is currently empty.": "グローバルメモリは現在空です",
+  "Global memory content:\n\n---\n{{content}}\n---":
+    "グローバルメモリ内容:\n\n---\n{{content}}\n---",
+  "Project memory content from {{path}}:\n\n---\n{{content}}\n---":
+    "{{path}} からのプロジェクトメモリ内容:\n\n---\n{{content}}\n---",
+  "Project memory is currently empty.": "プロジェクトメモリは現在空です",
+  "Refreshing memory from source files...": "ソースファイルからメモリを更新中...",
+  "Add content to the memory. Use --global for global memory or --project for project memory.":
+    "メモリにコンテンツを追加。グローバルメモリには --global、プロジェクトメモリには --project を使用",
+  "Usage: /memory add [--global|--project] <text to remember>":
+    "使い方: /memory add [--global|--project] <記憶するテキスト>",
   'Attempting to save to memory {{scope}}: "{{fact}}"':
     'メモリ {{scope}} への保存を試行中: "{{fact}}"',
   // MCP
-  'Authenticate with an OAuth-enabled MCP server':
-    'OAuth対応のMCPサーバーで認証',
-  'List configured MCP servers and tools':
-    '設定済みのMCPサーバーとツールを一覧表示',
-  'No MCP servers configured.': 'MCPサーバーが設定されていません',
-  'Restarts MCP servers.': 'MCPサーバーを再起動します',
-  'Could not retrieve tool registry.': 'ツールレジストリを取得できませんでした',
-  'No MCP servers configured with OAuth authentication.':
-    'OAuth認証が設定されたMCPサーバーはありません',
-  'MCP servers with OAuth authentication:': 'OAuth認証のMCPサーバー:',
-  'Use /mcp auth <server-name> to authenticate.':
-    '認証するには /mcp auth <サーバー名> を使用',
+  "Authenticate with an OAuth-enabled MCP server": "OAuth対応のMCPサーバーで認証",
+  "List configured MCP servers and tools": "設定済みのMCPサーバーとツールを一覧表示",
+  "No MCP servers configured.": "MCPサーバーが設定されていません",
+  "Restarts MCP servers.": "MCPサーバーを再起動します",
+  "Could not retrieve tool registry.": "ツールレジストリを取得できませんでした",
+  "No MCP servers configured with OAuth authentication.":
+    "OAuth認証が設定されたMCPサーバーはありません",
+  "MCP servers with OAuth authentication:": "OAuth認証のMCPサーバー:",
+  "Use /mcp auth <server-name> to authenticate.": "認証するには /mcp auth <サーバー名> を使用",
   "MCP server '{{name}}' not found.": "MCPサーバー '{{name}}' が見つかりません",
   "Successfully authenticated and refreshed tools for '{{name}}'.":
     "'{{name}}' の認証とツール更新に成功しました",
   "Failed to authenticate with MCP server '{{name}}': {{error}}":
     "MCPサーバー '{{name}}' での認証に失敗: {{error}}",
-  "Re-discovering tools from '{{name}}'...":
-    "'{{name}}' からツールを再検出中...",
+  "Re-discovering tools from '{{name}}'...": "'{{name}}' からツールを再検出中...",
   "Discovered {{count}} tool(s) from '{{name}}'.":
     "'{{name}}' から {{count}} 個のツールを検出しました。",
-  'Authentication complete. Returning to server details...':
-    '認証完了。サーバー詳細に戻ります...',
-  'Authentication successful.': '認証成功。',
-  'If the browser does not open, copy and paste this URL into your browser:':
-    'ブラウザが開かない場合は、このURLをコピーしてブラウザに貼り付けてください：',
-  'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.':
-    '⚠️  URL全体をコピーしてください——複数行にまたがる場合があります。',
-  'Configured MCP servers:': '設定済みMCPサーバー:',
-  Ready: '準備完了',
-  Disconnected: '切断',
-  '{{count}} tool': '{{count}} ツール',
-  '{{count}} tools': '{{count}} ツール',
-  'Restarting MCP servers...': 'MCPサーバーを再起動中...',
+  "Authentication complete. Returning to server details...": "認証完了。サーバー詳細に戻ります...",
+  "Authentication successful.": "認証成功。",
+  "If the browser does not open, copy and paste this URL into your browser:":
+    "ブラウザが開かない場合は、このURLをコピーしてブラウザに貼り付けてください：",
+  "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.":
+    "⚠️  URL全体をコピーしてください——複数行にまたがる場合があります。",
+  "Configured MCP servers:": "設定済みMCPサーバー:",
+  Ready: "準備完了",
+  Disconnected: "切断",
+  "{{count}} tool": "{{count}} ツール",
+  "{{count}} tools": "{{count}} ツール",
+  "Restarting MCP servers...": "MCPサーバーを再起動中...",
   // Chat
-  'Manage conversation history.': '会話履歴を管理します',
-  'List saved conversation checkpoints':
-    '保存された会話チェックポイントを一覧表示',
-  'No saved conversation checkpoints found.':
-    '保存された会話チェックポイントが見つかりません',
-  'List of saved conversations:': '保存された会話の一覧:',
-  'Note: Newest last, oldest first':
-    '注: 最新のものが下にあり、過去のものが上にあります',
-  'Save the current conversation as a checkpoint. Usage: /chat save <tag>':
-    '現在の会話をチェックポイントとして保存。使い方: /chat save <タグ>',
-  'Missing tag. Usage: /chat save <tag>':
-    'タグが不足しています。使い方: /chat save <タグ>',
-  'Delete a conversation checkpoint. Usage: /chat delete <tag>':
-    '会話チェックポイントを削除。使い方: /chat delete <タグ>',
-  'Missing tag. Usage: /chat delete <tag>':
-    'タグが不足しています。使い方: /chat delete <タグ>',
+  "Manage conversation history.": "会話履歴を管理します",
+  "List saved conversation checkpoints": "保存された会話チェックポイントを一覧表示",
+  "No saved conversation checkpoints found.": "保存された会話チェックポイントが見つかりません",
+  "List of saved conversations:": "保存された会話の一覧:",
+  "Note: Newest last, oldest first": "注: 最新のものが下にあり、過去のものが上にあります",
+  "Save the current conversation as a checkpoint. Usage: /chat save <tag>":
+    "現在の会話をチェックポイントとして保存。使い方: /chat save <タグ>",
+  "Missing tag. Usage: /chat save <tag>": "タグが不足しています。使い方: /chat save <タグ>",
+  "Delete a conversation checkpoint. Usage: /chat delete <tag>":
+    "会話チェックポイントを削除。使い方: /chat delete <タグ>",
+  "Missing tag. Usage: /chat delete <tag>": "タグが不足しています。使い方: /chat delete <タグ>",
   "Conversation checkpoint '{{tag}}' has been deleted.":
     "会話チェックポイント '{{tag}}' を削除しました",
   "Error: No checkpoint found with tag '{{tag}}'.":
     "エラー: タグ '{{tag}}' のチェックポイントが見つかりません",
-  'Resume a conversation from a checkpoint. Usage: /chat resume <tag>':
-    'チェックポイントから会話を再開。使い方: /chat resume <タグ>',
-  'Missing tag. Usage: /chat resume <tag>':
-    'タグが不足しています。使い方: /chat resume <タグ>',
-  'No saved checkpoint found with tag: {{tag}}.':
-    'タグ {{tag}} のチェックポイントが見つかりません',
-  'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?':
-    'タグ {{tag}} のチェックポイントは既に存在します。上書きしますか?',
-  'No chat client available to save conversation.':
-    '会話を保存するためのチャットクライアントがありません',
-  'Conversation checkpoint saved with tag: {{tag}}.':
-    'タグ {{tag}} で会話チェックポイントを保存しました',
-  'No conversation found to save.': '保存する会話が見つかりません',
-  'No chat client available to share conversation.':
-    '会話を共有するためのチャットクライアントがありません',
-  'Invalid file format. Only .md and .json are supported.':
-    '無効なファイル形式です。.md と .json のみサポートされています',
-  'Error sharing conversation: {{error}}': '会話の共有中にエラー: {{error}}',
-  'Conversation shared to {{filePath}}': '会話を {{filePath}} に共有しました',
-  'No conversation found to share.': '共有する会話が見つかりません',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
-    '現在の会話をmarkdownまたはjsonファイルに共有。使い方: /chat share <ファイル>',
+  "Resume a conversation from a checkpoint. Usage: /chat resume <tag>":
+    "チェックポイントから会話を再開。使い方: /chat resume <タグ>",
+  "Missing tag. Usage: /chat resume <tag>": "タグが不足しています。使い方: /chat resume <タグ>",
+  "No saved checkpoint found with tag: {{tag}}.": "タグ {{tag}} のチェックポイントが見つかりません",
+  "A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?":
+    "タグ {{tag}} のチェックポイントは既に存在します。上書きしますか?",
+  "No chat client available to save conversation.":
+    "会話を保存するためのチャットクライアントがありません",
+  "Conversation checkpoint saved with tag: {{tag}}.":
+    "タグ {{tag}} で会話チェックポイントを保存しました",
+  "No conversation found to save.": "保存する会話が見つかりません",
+  "No chat client available to share conversation.":
+    "会話を共有するためのチャットクライアントがありません",
+  "Invalid file format. Only .md and .json are supported.":
+    "無効なファイル形式です。.md と .json のみサポートされています",
+  "Error sharing conversation: {{error}}": "会話の共有中にエラー: {{error}}",
+  "Conversation shared to {{filePath}}": "会話を {{filePath}} に共有しました",
+  "No conversation found to share.": "共有する会話が見つかりません",
+  "Share the current conversation to a markdown or json file. Usage: /chat share <file>":
+    "現在の会話をmarkdownまたはjsonファイルに共有。使い方: /chat share <ファイル>",
   // Summary
-  'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md':
-    'プロジェクトサマリーを生成し、.qwen/PROJECT_SUMMARY.md に保存',
-  'No chat client available to generate summary.':
-    'サマリーを生成するためのチャットクライアントがありません',
-  'Already generating summary, wait for previous request to complete':
-    'サマリー生成中です。前のリクエストの完了をお待ちください',
-  'No conversation found to summarize.': '要約する会話が見つかりません',
-  'Failed to generate project context summary: {{error}}':
-    'プロジェクトコンテキストサマリーの生成に失敗: {{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    'プロジェクトサマリーを {{filePathForDisplay}} に保存しました',
-  'Saving project summary...': 'プロジェクトサマリーを保存中...',
-  'Generating project summary...': 'プロジェクトサマリーを生成中...',
-  'Failed to generate summary - no text content received from LLM response':
-    'サマリーの生成に失敗 - LLMレスポンスからテキストコンテンツを受信できませんでした',
+  "Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md":
+    "プロジェクトサマリーを生成し、.qwen/PROJECT_SUMMARY.md に保存",
+  "No chat client available to generate summary.":
+    "サマリーを生成するためのチャットクライアントがありません",
+  "Already generating summary, wait for previous request to complete":
+    "サマリー生成中です。前のリクエストの完了をお待ちください",
+  "No conversation found to summarize.": "要約する会話が見つかりません",
+  "Failed to generate project context summary: {{error}}":
+    "プロジェクトコンテキストサマリーの生成に失敗: {{error}}",
+  "Saved project summary to {{filePathForDisplay}}.":
+    "プロジェクトサマリーを {{filePathForDisplay}} に保存しました",
+  "Saving project summary...": "プロジェクトサマリーを保存中...",
+  "Generating project summary...": "プロジェクトサマリーを生成中...",
+  "Failed to generate summary - no text content received from LLM response":
+    "サマリーの生成に失敗 - LLMレスポンスからテキストコンテンツを受信できませんでした",
   // Model
-  'Switch the model for this session': 'このセッションのモデルを切り替え',
-  'Set fast model for background tasks':
-    'バックグラウンドタスク用の高速モデルを設定',
-  'Content generator configuration not available.':
-    'コンテンツジェネレーター設定が利用できません',
-  'Authentication type not available.': '認証タイプが利用できません',
-  'No models available for the current authentication type ({{authType}}).':
-    '現在の認証タイプ({{authType}})で利用可能なモデルはありません',
+  "Switch the model for this session": "このセッションのモデルを切り替え",
+  "Set fast model for background tasks": "バックグラウンドタスク用の高速モデルを設定",
+  "Content generator configuration not available.": "コンテンツジェネレーター設定が利用できません",
+  "Authentication type not available.": "認証タイプが利用できません",
+  "No models available for the current authentication type ({{authType}}).":
+    "現在の認証タイプ({{authType}})で利用可能なモデルはありません",
   // Clear
-  'Starting a new session, resetting chat, and clearing terminal.':
-    '新しいセッションを開始し、チャットをリセットし、ターミナルをクリアしています',
-  'Starting a new session and clearing.':
-    '新しいセッションを開始してクリアしています',
+  "Starting a new session, resetting chat, and clearing terminal.":
+    "新しいセッションを開始し、チャットをリセットし、ターミナルをクリアしています",
+  "Starting a new session and clearing.": "新しいセッションを開始してクリアしています",
   // Compress
-  'Already compressing, wait for previous request to complete':
-    '圧縮中です。前のリクエストの完了をお待ちください',
-  'Failed to compress chat history.': 'チャット履歴の圧縮に失敗しました',
-  'Failed to compress chat history: {{error}}':
-    'チャット履歴の圧縮に失敗: {{error}}',
-  'Compressing chat history': 'チャット履歴を圧縮中',
-  'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.':
-    'チャット履歴を {{originalTokens}} トークンから {{newTokens}} トークンに圧縮しました',
-  'Compression was not beneficial for this history size.':
-    'この履歴サイズには圧縮の効果がありませんでした',
-  'Chat history compression did not reduce size. This may indicate issues with the compression prompt.':
-    'チャット履歴の圧縮でサイズが減少しませんでした。圧縮プロンプトに問題がある可能性があります',
-  'Could not compress chat history due to a token counting error.':
-    'トークンカウントエラーのため、チャット履歴を圧縮できませんでした',
-  'Chat history is already compressed.': 'チャット履歴は既に圧縮されています',
+  "Already compressing, wait for previous request to complete":
+    "圧縮中です。前のリクエストの完了をお待ちください",
+  "Failed to compress chat history.": "チャット履歴の圧縮に失敗しました",
+  "Failed to compress chat history: {{error}}": "チャット履歴の圧縮に失敗: {{error}}",
+  "Compressing chat history": "チャット履歴を圧縮中",
+  "Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.":
+    "チャット履歴を {{originalTokens}} トークンから {{newTokens}} トークンに圧縮しました",
+  "Compression was not beneficial for this history size.":
+    "この履歴サイズには圧縮の効果がありませんでした",
+  "Chat history compression did not reduce size. This may indicate issues with the compression prompt.":
+    "チャット履歴の圧縮でサイズが減少しませんでした。圧縮プロンプトに問題がある可能性があります",
+  "Could not compress chat history due to a token counting error.":
+    "トークンカウントエラーのため、チャット履歴を圧縮できませんでした",
+  "Chat history is already compressed.": "チャット履歴は既に圧縮されています",
   // Directory
-  'Configuration is not available.': '設定が利用できません',
-  'Please provide at least one path to add.':
-    '追加するパスを少なくとも1つ指定してください',
-  'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.':
-    '制限的なサンドボックスプロファイルでは /directory add コマンドはサポートされていません。代わりにセッション開始時に --include-directories を使用してください',
-  "Error adding '{{path}}': {{error}}":
-    "'{{path}}' の追加中にエラー: {{error}}",
-  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
-    '以下のディレクトリから QWEN.md ファイルを追加しました(存在する場合):\n- {{directories}}',
-  'Error refreshing memory: {{error}}': 'メモリの更新中にエラー: {{error}}',
-  'Successfully added directories:\n- {{directories}}':
-    'ディレクトリを正常に追加しました:\n- {{directories}}',
-  'Current workspace directories:\n{{directories}}':
-    '現在のワークスペースディレクトリ:\n{{directories}}',
+  "Configuration is not available.": "設定が利用できません",
+  "Please provide at least one path to add.": "追加するパスを少なくとも1つ指定してください",
+  "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.":
+    "制限的なサンドボックスプロファイルでは /directory add コマンドはサポートされていません。代わりにセッション開始時に --include-directories を使用してください",
+  "Error adding '{{path}}': {{error}}": "'{{path}}' の追加中にエラー: {{error}}",
+  "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}":
+    "以下のディレクトリから QWEN.md ファイルを追加しました(存在する場合):\n- {{directories}}",
+  "Error refreshing memory: {{error}}": "メモリの更新中にエラー: {{error}}",
+  "Successfully added directories:\n- {{directories}}":
+    "ディレクトリを正常に追加しました:\n- {{directories}}",
+  "Current workspace directories:\n{{directories}}":
+    "現在のワークスペースディレクトリ:\n{{directories}}",
   // Docs
-  'Please open the following URL in your browser to view the documentation:\n{{url}}':
-    'ドキュメントを表示するには、ブラウザで以下のURLを開いてください:\n{{url}}',
-  'Opening documentation in your browser: {{url}}':
-    '  ブラウザでドキュメントを開きました: {{url}}',
+  "Please open the following URL in your browser to view the documentation:\n{{url}}":
+    "ドキュメントを表示するには、ブラウザで以下のURLを開いてください:\n{{url}}",
+  "Opening documentation in your browser: {{url}}": "  ブラウザでドキュメントを開きました: {{url}}",
   // Dialogs - Tool Confirmation
-  'Do you want to proceed?': '続行しますか?',
-  'Yes, allow once': 'はい(今回のみ許可)',
-  'Allow always': '常に許可する',
-  Yes: 'はい',
-  No: 'いいえ',
-  'No (esc)': 'いいえ (Esc)',
-  'Yes, allow always for this session': 'はい、このセッションで常に許可',
+  "Do you want to proceed?": "続行しますか?",
+  "Yes, allow once": "はい(今回のみ許可)",
+  "Allow always": "常に許可する",
+  Yes: "はい",
+  No: "いいえ",
+  "No (esc)": "いいえ (Esc)",
+  "Yes, allow always for this session": "はい、このセッションで常に許可",
 
   // MCP Management - Core translations
-  'Manage MCP servers': 'MCPサーバーを管理',
-  'Server Detail': 'サーバー詳細',
-  'Disable Server': 'サーバーを無効化',
-  Tools: 'ツール',
-  'Tool Detail': 'ツール詳細',
-  'MCP Management': 'MCP管理',
-  'Loading...': '読み込み中...',
-  'Unknown step': '不明なステップ',
-  'Esc to back': 'Esc 戻る',
-  '↑↓ to navigate · Enter to select · Esc to close':
-    '↑↓ ナビゲート · Enter 選択 · Esc 閉じる',
-  '↑↓ to navigate · Enter to select · Esc to back':
-    '↑↓ ナビゲート · Enter 選択 · Esc 戻る',
-  '↑↓ to navigate · Enter to confirm · Esc to back':
-    '↑↓ ナビゲート · Enter 確認 · Esc 戻る',
-  'User Settings (global)': 'ユーザー設定（グローバル）',
-  'Workspace Settings (project-specific)':
-    'ワークスペース設定（プロジェクト固有）',
-  'Disable server:': 'サーバーを無効化:',
-  'Select where to add the server to the exclude list:':
-    'サーバーを除外リストに追加する場所を選択してください:',
-  'Press Enter to confirm, Esc to cancel': 'Enter で確認、Esc でキャンセル',
-  Disable: '無効化',
-  Enable: '有効化',
-  Authenticate: '認証',
-  'Re-authenticate': '再認証',
-  'Clear Authentication': '認証をクリア',
-  disabled: '無効',
-  'Server:': 'サーバー:',
-  Reconnect: '再接続',
-  'View tools': 'ツールを表示',
-  'Status:': 'ステータス:',
-  'Source:': 'ソース:',
-  'Command:': 'コマンド:',
-  'Working Directory:': '作業ディレクトリ:',
-  'Capabilities:': '機能:',
-  'No server selected': 'サーバーが選択されていません',
-  '(disabled)': '(無効)',
-  'Error:': 'エラー:',
-  tool: 'ツール',
-  tools: 'ツール',
-  connected: '接続済み',
-  connecting: '接続中',
-  disconnected: '切断済み',
-  error: 'エラー',
+  "Manage MCP servers": "MCPサーバーを管理",
+  "Server Detail": "サーバー詳細",
+  "Disable Server": "サーバーを無効化",
+  Tools: "ツール",
+  "Tool Detail": "ツール詳細",
+  "MCP Management": "MCP管理",
+  "Loading...": "読み込み中...",
+  "Unknown step": "不明なステップ",
+  "Esc to back": "Esc 戻る",
+  "↑↓ to navigate · Enter to select · Esc to close": "↑↓ ナビゲート · Enter 選択 · Esc 閉じる",
+  "↑↓ to navigate · Enter to select · Esc to back": "↑↓ ナビゲート · Enter 選択 · Esc 戻る",
+  "↑↓ to navigate · Enter to confirm · Esc to back": "↑↓ ナビゲート · Enter 確認 · Esc 戻る",
+  "User Settings (global)": "ユーザー設定（グローバル）",
+  "Workspace Settings (project-specific)": "ワークスペース設定（プロジェクト固有）",
+  "Disable server:": "サーバーを無効化:",
+  "Select where to add the server to the exclude list:":
+    "サーバーを除外リストに追加する場所を選択してください:",
+  "Press Enter to confirm, Esc to cancel": "Enter で確認、Esc でキャンセル",
+  Disable: "無効化",
+  Enable: "有効化",
+  Authenticate: "認証",
+  "Re-authenticate": "再認証",
+  "Clear Authentication": "認証をクリア",
+  disabled: "無効",
+  "Server:": "サーバー:",
+  Reconnect: "再接続",
+  "View tools": "ツールを表示",
+  "Status:": "ステータス:",
+  "Source:": "ソース:",
+  "Command:": "コマンド:",
+  "Working Directory:": "作業ディレクトリ:",
+  "Capabilities:": "機能:",
+  "No server selected": "サーバーが選択されていません",
+  "(disabled)": "(無効)",
+  "Error:": "エラー:",
+  tool: "ツール",
+  tools: "ツール",
+  connected: "接続済み",
+  connecting: "接続中",
+  disconnected: "切断済み",
+  error: "エラー",
 
   // MCP Server List
-  'User MCPs': 'ユーザーMCP',
-  'Project MCPs': 'プロジェクトMCP',
-  'Extension MCPs': '拡張機能MCP',
-  server: 'サーバー',
-  servers: 'サーバー',
-  'Add MCP servers to your settings to get started.':
-    '設定にMCPサーバーを追加して開始してください。',
-  'Run qwen --debug to see error logs':
-    'qwen --debug を実行してエラーログを確認してください',
+  "User MCPs": "ユーザーMCP",
+  "Project MCPs": "プロジェクトMCP",
+  "Extension MCPs": "拡張機能MCP",
+  server: "サーバー",
+  servers: "サーバー",
+  "Add MCP servers to your settings to get started.":
+    "設定にMCPサーバーを追加して開始してください。",
+  "Run qwen --debug to see error logs": "qwen --debug を実行してエラーログを確認してください",
 
   // MCP OAuth Authentication
-  'OAuth Authentication': 'OAuth 認証',
-  'Press Enter to start authentication, Esc to go back':
-    'Enter で認証開始、Esc で戻る',
-  'Authenticating... Please complete the login in your browser.':
-    '認証中... ブラウザでログインを完了してください。',
-  'Press Enter or Esc to go back': 'Enter または Esc で戻る',
+  "OAuth Authentication": "OAuth 認証",
+  "Press Enter to start authentication, Esc to go back": "Enter で認証開始、Esc で戻る",
+  "Authenticating... Please complete the login in your browser.":
+    "認証中... ブラウザでログインを完了してください。",
+  "Press Enter or Esc to go back": "Enter または Esc で戻る",
 
   // MCP Tool List
-  'No tools available for this server.':
-    'このサーバーには使用可能なツールがありません。',
-  destructive: '破壊的',
-  'read-only': '読み取り専用',
-  'open-world': 'オープンワールド',
-  idempotent: '冪等',
-  'Tools for {{name}}': '{{name}} のツール',
-  'Tools for {{serverName}}': '{{serverName}} のツール',
-  '{{current}}/{{total}}': '{{current}}/{{total}}',
+  "No tools available for this server.": "このサーバーには使用可能なツールがありません。",
+  destructive: "破壊的",
+  "read-only": "読み取り専用",
+  "open-world": "オープンワールド",
+  idempotent: "冪等",
+  "Tools for {{name}}": "{{name}} のツール",
+  "Tools for {{serverName}}": "{{serverName}} のツール",
+  "{{current}}/{{total}}": "{{current}}/{{total}}",
 
   // MCP Tool Detail
-  required: '必須',
-  Type: '型',
-  Enum: '列挙',
-  Parameters: 'パラメータ',
-  'No tool selected': 'ツールが選択されていません',
-  Annotations: '注釈',
-  Title: 'タイトル',
-  'Read Only': '読み取り専用',
-  Destructive: '破壊的',
-  Idempotent: '冪等',
-  'Open World': 'オープンワールド',
-  Server: 'サーバー',
+  required: "必須",
+  Type: "型",
+  Enum: "列挙",
+  Parameters: "パラメータ",
+  "No tool selected": "ツールが選択されていません",
+  Annotations: "注釈",
+  Title: "タイトル",
+  "Read Only": "読み取り専用",
+  Destructive: "破壊的",
+  Idempotent: "冪等",
+  "Open World": "オープンワールド",
+  Server: "サーバー",
 
   // Invalid tool related translations
-  '{{count}} invalid tools': '{{count}} 個の無効なツール',
-  invalid: '無効',
-  'invalid: {{reason}}': '無効: {{reason}}',
-  'missing name': '名前なし',
-  'missing description': '説明なし',
-  '(unnamed)': '(名前なし)',
-  'Warning: This tool cannot be called by the LLM':
-    '警告: このツールはLLMによって呼び出すことができません',
-  Reason: '理由',
-  'Tools must have both name and description to be used by the LLM.':
-    'ツールはLLMによって使用されるには名前と説明の両方が必要です。',
-  'Modify in progress:': '変更中:',
-  'Save and close external editor to continue':
-    '続行するには外部エディタを保存して閉じてください',
-  'Apply this change?': 'この変更を適用しますか?',
-  'Yes, allow always': 'はい、常に許可',
-  'Modify with external editor': '外部エディタで編集',
-  'No, suggest changes (esc)': 'いいえ、変更を提案 (Esc)',
+  "{{count}} invalid tools": "{{count}} 個の無効なツール",
+  invalid: "無効",
+  "invalid: {{reason}}": "無効: {{reason}}",
+  "missing name": "名前なし",
+  "missing description": "説明なし",
+  "(unnamed)": "(名前なし)",
+  "Warning: This tool cannot be called by the LLM":
+    "警告: このツールはLLMによって呼び出すことができません",
+  Reason: "理由",
+  "Tools must have both name and description to be used by the LLM.":
+    "ツールはLLMによって使用されるには名前と説明の両方が必要です。",
+  "Modify in progress:": "変更中:",
+  "Save and close external editor to continue": "続行するには外部エディタを保存して閉じてください",
+  "Apply this change?": "この変更を適用しますか?",
+  "Yes, allow always": "はい、常に許可",
+  "Modify with external editor": "外部エディタで編集",
+  "No, suggest changes (esc)": "いいえ、変更を提案 (Esc)",
   "Allow execution of: '{{command}}'?": "'{{command}}' の実行を許可しますか?",
-  'Yes, allow always ...': 'はい、常に許可...',
-  'Always allow in this project': 'このプロジェクトで常に許可',
-  'Always allow {{action}} in this project':
-    'このプロジェクトで{{action}}を常に許可',
-  'Always allow for this user': 'このユーザーに常に許可',
-  'Always allow {{action}} for this user': 'このユーザーに{{action}}を常に許可',
-  'Yes, restore previous mode ({{mode}})':
-    'はい、以前のモードに戻す ({{mode}})',
-  'Yes, and auto-accept edits': 'はい、編集を自動承認',
-  'Yes, and manually approve edits': 'はい、編集を手動承認',
-  'No, keep planning (esc)': 'いいえ、計画を続ける (Esc)',
-  'URLs to fetch:': '取得するURL:',
-  'MCP Server: {{server}}': 'MCPサーバー: {{server}}',
-  'Tool: {{tool}}': 'ツール: {{tool}}',
+  "Yes, allow always ...": "はい、常に許可...",
+  "Always allow in this project": "このプロジェクトで常に許可",
+  "Always allow {{action}} in this project": "このプロジェクトで{{action}}を常に許可",
+  "Always allow for this user": "このユーザーに常に許可",
+  "Always allow {{action}} for this user": "このユーザーに{{action}}を常に許可",
+  "Yes, restore previous mode ({{mode}})": "はい、以前のモードに戻す ({{mode}})",
+  "Yes, and auto-accept edits": "はい、編集を自動承認",
+  "Yes, and manually approve edits": "はい、編集を手動承認",
+  "No, keep planning (esc)": "いいえ、計画を続ける (Esc)",
+  "URLs to fetch:": "取得するURL:",
+  "MCP Server: {{server}}": "MCPサーバー: {{server}}",
+  "Tool: {{tool}}": "ツール: {{tool}}",
   'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?':
     'サーバー "{{server}}" からの MCPツール "{{tool}}" の実行を許可しますか?',
   'Yes, always allow tool "{{tool}}" from server "{{server}}"':
@@ -933,516 +859,486 @@ export default {
   'Yes, always allow all tools from server "{{server}}"':
     'はい、サーバー "{{server}}" からのすべてのツールを常に許可',
   // Dialogs - Shell Confirmation
-  'Shell Command Execution': 'シェルコマンド実行',
-  'A custom command wants to run the following shell commands:':
-    'カスタムコマンドが以下のシェルコマンドを実行しようとしています:',
+  "Shell Command Execution": "シェルコマンド実行",
+  "A custom command wants to run the following shell commands:":
+    "カスタムコマンドが以下のシェルコマンドを実行しようとしています:",
   // Dialogs - Pro Quota
-  'Pro quota limit reached for {{model}}.':
-    '{{model}} のProクォータ上限に達しました',
-  'Change auth (executes the /auth command)':
-    '認証を変更(/auth コマンドを実行)',
-  'Continue with {{model}}': '{{model}} で続行',
+  "Pro quota limit reached for {{model}}.": "{{model}} のProクォータ上限に達しました",
+  "Change auth (executes the /auth command)": "認証を変更(/auth コマンドを実行)",
+  "Continue with {{model}}": "{{model}} で続行",
   // Dialogs - Welcome Back
-  'Current Plan:': '現在のプラン:',
-  'Progress: {{done}}/{{total}} tasks completed':
-    '進捗: {{done}}/{{total}} タスク完了',
-  ', {{inProgress}} in progress': '、{{inProgress}} 進行中',
-  'Pending Tasks:': '保留中のタスク:',
-  'What would you like to do?': '何をしますか?',
-  'Choose how to proceed with your session:':
-    'セッションの続行方法を選択してください:',
-  'Start new chat session': '新しいチャットセッションを開始',
-  'Continue previous conversation': '前回の会話を続行',
-  '👋 Welcome back! (Last updated: {{timeAgo}})':
-    '👋 おかえりなさい!(最終更新: {{timeAgo}})',
-  '🎯 Overall Goal:': '🎯 全体目標:',
+  "Current Plan:": "現在のプラン:",
+  "Progress: {{done}}/{{total}} tasks completed": "進捗: {{done}}/{{total}} タスク完了",
+  ", {{inProgress}} in progress": "、{{inProgress}} 進行中",
+  "Pending Tasks:": "保留中のタスク:",
+  "What would you like to do?": "何をしますか?",
+  "Choose how to proceed with your session:": "セッションの続行方法を選択してください:",
+  "Start new chat session": "新しいチャットセッションを開始",
+  "Continue previous conversation": "前回の会話を続行",
+  "👋 Welcome back! (Last updated: {{timeAgo}})": "👋 おかえりなさい!(最終更新: {{timeAgo}})",
+  "🎯 Overall Goal:": "🎯 全体目標:",
   // Dialogs - Auth
-  'Get started': '始める',
-  'Select Authentication Method': '認証方法を選択',
-  'OpenAI API key is required to use OpenAI authentication.':
-    'OpenAI認証を使用するには OpenAI APIキーが必要です',
-  'You must select an auth method to proceed. Press Ctrl+C again to exit.':
-    '続行するには認証方法を選択してください。Ctrl+C をもう一度押すと終了します',
-  'Terms of Services and Privacy Notice': '利用規約とプライバシー通知',
-  'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models':
-    '有料 \u00B7 5時間最大6,000リクエスト \u00B7 すべての Alibaba Cloud Coding Plan モデル',
-  'Alibaba Cloud Coding Plan': 'Alibaba Cloud Coding Plan',
-  'Bring your own API key': '自分のAPIキーを使用',
-  'API-KEY': 'API-KEY',
-  'Use coding plan credentials or your own api-keys/providers.':
-    'Coding Planの認証情報またはご自身のAPIキー/プロバイダーをご利用ください。',
-  OpenAI: 'OpenAI',
-  'Failed to login. Message: {{message}}':
-    'ログインに失敗しました。メッセージ: {{message}}',
-  'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.':
-    '認証は {{enforcedType}} に強制されていますが、現在 {{currentType}} を使用しています',
-  'Please visit this URL to authorize:':
-    '認証するには以下のURLにアクセスしてください:',
-  'Or scan the QR code below:': 'または以下のQRコードをスキャン:',
-  'Waiting for authorization': '認証を待っています',
-  'Time remaining:': '残り時間:',
-  '(Press ESC or CTRL+C to cancel)': '(ESC または CTRL+C でキャンセル)',
-  'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.':
-    'OAuthトークンが期限切れです({{seconds}}秒以上)。認証方法を再度選択してください',
-  'Press any key to return to authentication type selection.':
-    '認証タイプ選択に戻るには任意のキーを押してください',
-  'Authentication timed out. Please try again.':
-    '認証がタイムアウトしました。再度お試しください',
-  'Waiting for auth... (Press ESC or CTRL+C to cancel)':
-    '認証を待っています... (ESC または CTRL+C でキャンセル)',
-  'Failed to authenticate. Message: {{message}}':
-    '認証に失敗しました。メッセージ: {{message}}',
-  'Authenticated successfully with {{authType}} credentials.':
-    '{{authType}} 認証情報で正常に認証されました',
+  "Get started": "始める",
+  "Select Authentication Method": "認証方法を選択",
+  "OpenAI API key is required to use OpenAI authentication.":
+    "OpenAI認証を使用するには OpenAI APIキーが必要です",
+  "You must select an auth method to proceed. Press Ctrl+C again to exit.":
+    "続行するには認証方法を選択してください。Ctrl+C をもう一度押すと終了します",
+  "Terms of Services and Privacy Notice": "利用規約とプライバシー通知",
+  "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models":
+    "有料 \u00B7 5時間最大6,000リクエスト \u00B7 すべての Alibaba Cloud Coding Plan モデル",
+  "Alibaba Cloud Coding Plan": "Alibaba Cloud Coding Plan",
+  "Bring your own API key": "自分のAPIキーを使用",
+  "API-KEY": "API-KEY",
+  "Use coding plan credentials or your own api-keys/providers.":
+    "Coding Planの認証情報またはご自身のAPIキー/プロバイダーをご利用ください。",
+  OpenAI: "OpenAI",
+  "Failed to login. Message: {{message}}": "ログインに失敗しました。メッセージ: {{message}}",
+  "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.":
+    "認証は {{enforcedType}} に強制されていますが、現在 {{currentType}} を使用しています",
+  "Please visit this URL to authorize:": "認証するには以下のURLにアクセスしてください:",
+  "Or scan the QR code below:": "または以下のQRコードをスキャン:",
+  "Waiting for authorization": "認証を待っています",
+  "Time remaining:": "残り時間:",
+  "(Press ESC or CTRL+C to cancel)": "(ESC または CTRL+C でキャンセル)",
+  "OAuth token expired (over {{seconds}} seconds). Please select authentication method again.":
+    "OAuthトークンが期限切れです({{seconds}}秒以上)。認証方法を再度選択してください",
+  "Press any key to return to authentication type selection.":
+    "認証タイプ選択に戻るには任意のキーを押してください",
+  "Authentication timed out. Please try again.": "認証がタイムアウトしました。再度お試しください",
+  "Waiting for auth... (Press ESC or CTRL+C to cancel)":
+    "認証を待っています... (ESC または CTRL+C でキャンセル)",
+  "Failed to authenticate. Message: {{message}}": "認証に失敗しました。メッセージ: {{message}}",
+  "Authenticated successfully with {{authType}} credentials.":
+    "{{authType}} 認証情報で正常に認証されました",
   'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}':
     '無効な QWEN_DEFAULT_AUTH_TYPE 値: "{{value}}"。有効な値: {{validValues}}',
-  'OpenAI Configuration Required': 'OpenAI設定が必要です',
-  'Please enter your OpenAI configuration. You can get an API key from':
-    'OpenAI設定を入力してください。APIキーは以下から取得できます',
-  'API Key:': 'APIキー:',
-  'Invalid credentials: {{errorMessage}}': '無効な認証情報: {{errorMessage}}',
-  'Failed to validate credentials': '認証情報の検証に失敗しました',
-  'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel':
-    'Enter で続行、Tab/↑↓ で移動、Esc でキャンセル',
+  "OpenAI Configuration Required": "OpenAI設定が必要です",
+  "Please enter your OpenAI configuration. You can get an API key from":
+    "OpenAI設定を入力してください。APIキーは以下から取得できます",
+  "API Key:": "APIキー:",
+  "Invalid credentials: {{errorMessage}}": "無効な認証情報: {{errorMessage}}",
+  "Failed to validate credentials": "認証情報の検証に失敗しました",
+  "Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel":
+    "Enter で続行、Tab/↑↓ で移動、Esc でキャンセル",
   // Dialogs - Model
-  'Select Model': 'モデルを選択',
-  '(Press Esc to close)': '(Esc で閉じる)',
-  Modality: 'モダリティ',
-  'Context Window': 'コンテキストウィンドウ',
-  text: 'テキスト',
-  'text-only': 'テキストのみ',
-  image: '画像',
-  pdf: 'PDF',
-  audio: '音声',
-  video: '動画',
-  'not set': '未設定',
-  none: 'なし',
-  unknown: '不明',
-  'Qwen 3.6 Plus — efficient hybrid model with leading coding performance':
-    'Qwen 3.6 Plus — 効率的なハイブリッドモデル、業界トップクラスのコーディング性能',
-  'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
-    'Alibaba Cloud ModelStudioの最新Qwen Visionモデル(バージョン: qwen3-vl-plus-2025-09-23)',
+  "Select Model": "モデルを選択",
+  "(Press Esc to close)": "(Esc で閉じる)",
+  Modality: "モダリティ",
+  "Context Window": "コンテキストウィンドウ",
+  text: "テキスト",
+  "text-only": "テキストのみ",
+  image: "画像",
+  pdf: "PDF",
+  audio: "音声",
+  video: "動画",
+  "not set": "未設定",
+  none: "なし",
+  unknown: "不明",
+  "Qwen 3.6 Plus — efficient hybrid model with leading coding performance":
+    "Qwen 3.6 Plus — 効率的なハイブリッドモデル、業界トップクラスのコーディング性能",
+  "The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)":
+    "Alibaba Cloud ModelStudioの最新Qwen Visionモデル(バージョン: qwen3-vl-plus-2025-09-23)",
   // Dialogs - Permissions
-  'Manage folder trust settings': 'フォルダ信頼設定を管理',
-  'Manage permission rules': '権限ルールを管理',
-  Allow: '許可',
-  Ask: '確認',
-  Deny: '拒否',
-  Workspace: 'ワークスペース',
+  "Manage folder trust settings": "フォルダ信頼設定を管理",
+  "Manage permission rules": "権限ルールを管理",
+  Allow: "許可",
+  Ask: "確認",
+  Deny: "拒否",
+  Workspace: "ワークスペース",
   "Qwen Code won't ask before using allowed tools.":
-    'Qwen Code は許可されたツールを使用する前に確認しません。',
-  'Qwen Code will ask before using these tools.':
-    'Qwen Code はこれらのツールを使用する前に確認します。',
-  'Qwen Code is not allowed to use denied tools.':
-    'Qwen Code は拒否されたツールを使用できません。',
-  'Manage trusted directories for this workspace.':
-    'このワークスペースの信頼済みディレクトリを管理します。',
-  'Any use of the {{tool}} tool': '{{tool}} ツールのすべての使用',
-  "{{tool}} commands matching '{{pattern}}'":
-    "'{{pattern}}' に一致する {{tool}} コマンド",
-  'From user settings': 'ユーザー設定から',
-  'From project settings': 'プロジェクト設定から',
-  'From session': 'セッションから',
-  'Project settings (local)': 'プロジェクト設定（ローカル）',
-  'Saved in .qwen/settings.local.json': '.qwen/settings.local.json に保存',
-  'Project settings': 'プロジェクト設定',
-  'Checked in at .qwen/settings.json': '.qwen/settings.json にチェックイン',
-  'User settings': 'ユーザー設定',
-  'Saved in at ~/.qwen/settings.json': '~/.qwen/settings.json に保存',
-  'Add a new rule…': '新しいルールを追加…',
-  'Add {{type}} permission rule': '{{type}}権限ルールを追加',
-  'Permission rules are a tool name, optionally followed by a specifier in parentheses.':
-    '権限ルールはツール名で、オプションで括弧内に指定子を付けます。',
-  'e.g.,': '例：',
-  or: 'または',
-  'Enter permission rule…': '権限ルールを入力…',
-  'Enter to submit · Esc to cancel': 'Enter で送信 · Esc でキャンセル',
-  'Where should this rule be saved?': 'このルールをどこに保存しますか？',
-  'Enter to confirm · Esc to cancel': 'Enter で確認 · Esc でキャンセル',
-  'Delete {{type}} rule?': '{{type}}ルールを削除しますか？',
-  'Are you sure you want to delete this permission rule?':
-    'この権限ルールを削除してもよろしいですか？',
-  'Permissions:': '権限：',
-  '(←/→ or tab to cycle)': '（←/→ または Tab で切替）',
-  'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel':
-    '↑↓ でナビゲート · Enter で選択 · 入力で検索 · Esc でキャンセル',
-  'Search…': '検索…',
-  'Use /trust to manage folder trust settings for this workspace.':
-    '/trust を使用してこのワークスペースのフォルダ信頼設定を管理します。',
+    "Qwen Code は許可されたツールを使用する前に確認しません。",
+  "Qwen Code will ask before using these tools.":
+    "Qwen Code はこれらのツールを使用する前に確認します。",
+  "Qwen Code is not allowed to use denied tools.": "Qwen Code は拒否されたツールを使用できません。",
+  "Manage trusted directories for this workspace.":
+    "このワークスペースの信頼済みディレクトリを管理します。",
+  "Any use of the {{tool}} tool": "{{tool}} ツールのすべての使用",
+  "{{tool}} commands matching '{{pattern}}'": "'{{pattern}}' に一致する {{tool}} コマンド",
+  "From user settings": "ユーザー設定から",
+  "From project settings": "プロジェクト設定から",
+  "From session": "セッションから",
+  "Project settings (local)": "プロジェクト設定（ローカル）",
+  "Saved in .qwen/settings.local.json": ".qwen/settings.local.json に保存",
+  "Project settings": "プロジェクト設定",
+  "Checked in at .qwen/settings.json": ".qwen/settings.json にチェックイン",
+  "User settings": "ユーザー設定",
+  "Saved in at ~/.qwen/settings.json": "~/.qwen/settings.json に保存",
+  "Add a new rule…": "新しいルールを追加…",
+  "Add {{type}} permission rule": "{{type}}権限ルールを追加",
+  "Permission rules are a tool name, optionally followed by a specifier in parentheses.":
+    "権限ルールはツール名で、オプションで括弧内に指定子を付けます。",
+  "e.g.,": "例：",
+  or: "または",
+  "Enter permission rule…": "権限ルールを入力…",
+  "Enter to submit · Esc to cancel": "Enter で送信 · Esc でキャンセル",
+  "Where should this rule be saved?": "このルールをどこに保存しますか？",
+  "Enter to confirm · Esc to cancel": "Enter で確認 · Esc でキャンセル",
+  "Delete {{type}} rule?": "{{type}}ルールを削除しますか？",
+  "Are you sure you want to delete this permission rule?":
+    "この権限ルールを削除してもよろしいですか？",
+  "Permissions:": "権限：",
+  "(←/→ or tab to cycle)": "（←/→ または Tab で切替）",
+  "Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel":
+    "↑↓ でナビゲート · Enter で選択 · 入力で検索 · Esc でキャンセル",
+  "Search…": "検索…",
+  "Use /trust to manage folder trust settings for this workspace.":
+    "/trust を使用してこのワークスペースのフォルダ信頼設定を管理します。",
   // Workspace directory management
-  'Add directory…': 'ディレクトリを追加…',
-  'Add directory to workspace': 'ワークスペースにディレクトリを追加',
-  'Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.':
-    'Qwen Code はワークスペース内のファイルを読み取り、自動編集承認が有効な場合は編集を行えます。',
-  'Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.':
-    'Qwen Code はこのディレクトリ内のファイルを読み取り、自動編集承認が有効な場合は編集を行えます。',
-  'Enter the path to the directory:': 'ディレクトリのパスを入力してください:',
-  'Enter directory path…': 'ディレクトリパスを入力…',
-  'Tab to complete · Enter to add · Esc to cancel':
-    'Tab で補完 · Enter で追加 · Esc でキャンセル',
-  'Remove directory?': 'ディレクトリを削除しますか？',
-  'Are you sure you want to remove this directory from the workspace?':
-    'このディレクトリをワークスペースから削除してもよろしいですか？',
-  '  (Original working directory)': '  （元の作業ディレクトリ）',
-  '  (from settings)': '  （設定より）',
-  'Directory does not exist.': 'ディレクトリが存在しません。',
-  'Path is not a directory.': 'パスはディレクトリではありません。',
-  'This directory is already in the workspace.':
-    'このディレクトリはすでにワークスペースに含まれています。',
-  'Already covered by existing directory: {{dir}}':
-    '既存のディレクトリによって既にカバーされています: {{dir}}',
+  "Add directory…": "ディレクトリを追加…",
+  "Add directory to workspace": "ワークスペースにディレクトリを追加",
+  "Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.":
+    "Qwen Code はワークスペース内のファイルを読み取り、自動編集承認が有効な場合は編集を行えます。",
+  "Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.":
+    "Qwen Code はこのディレクトリ内のファイルを読み取り、自動編集承認が有効な場合は編集を行えます。",
+  "Enter the path to the directory:": "ディレクトリのパスを入力してください:",
+  "Enter directory path…": "ディレクトリパスを入力…",
+  "Tab to complete · Enter to add · Esc to cancel": "Tab で補完 · Enter で追加 · Esc でキャンセル",
+  "Remove directory?": "ディレクトリを削除しますか？",
+  "Are you sure you want to remove this directory from the workspace?":
+    "このディレクトリをワークスペースから削除してもよろしいですか？",
+  "  (Original working directory)": "  （元の作業ディレクトリ）",
+  "  (from settings)": "  （設定より）",
+  "Directory does not exist.": "ディレクトリが存在しません。",
+  "Path is not a directory.": "パスはディレクトリではありません。",
+  "This directory is already in the workspace.":
+    "このディレクトリはすでにワークスペースに含まれています。",
+  "Already covered by existing directory: {{dir}}":
+    "既存のディレクトリによって既にカバーされています: {{dir}}",
   // Status Bar
-  'Using:': '使用中:',
-  '{{count}} open file': '{{count}} 個のファイルを開いています',
-  '{{count}} open files': '{{count}} 個のファイルを開いています',
-  '(ctrl+g to view)': '(Ctrl+G で表示)',
-  '{{count}} {{name}} file': '{{count}} {{name}} ファイル',
-  '{{count}} {{name}} files': '{{count}} {{name}} ファイル',
-  '{{count}} MCP server': '{{count}} MCPサーバー',
-  '{{count}} MCP servers': '{{count}} MCPサーバー',
-  '{{count}} Blocked': '{{count}} ブロック',
-  '(ctrl+t to view)': '(Ctrl+T で表示)',
-  '(ctrl+t to toggle)': '(Ctrl+T で切り替え)',
-  'Press Ctrl+C again to exit.': 'Ctrl+C をもう一度押すと終了します',
-  'Press Ctrl+D again to exit.': 'Ctrl+D をもう一度押すと終了します',
-  'Press Esc again to clear.': 'Esc をもう一度押すとクリアします',
+  "Using:": "使用中:",
+  "{{count}} open file": "{{count}} 個のファイルを開いています",
+  "{{count}} open files": "{{count}} 個のファイルを開いています",
+  "(ctrl+g to view)": "(Ctrl+G で表示)",
+  "{{count}} {{name}} file": "{{count}} {{name}} ファイル",
+  "{{count}} {{name}} files": "{{count}} {{name}} ファイル",
+  "{{count}} MCP server": "{{count}} MCPサーバー",
+  "{{count}} MCP servers": "{{count}} MCPサーバー",
+  "{{count}} Blocked": "{{count}} ブロック",
+  "(ctrl+t to view)": "(Ctrl+T で表示)",
+  "(ctrl+t to toggle)": "(Ctrl+T で切り替え)",
+  "Press Ctrl+C again to exit.": "Ctrl+C をもう一度押すと終了します",
+  "Press Ctrl+D again to exit.": "Ctrl+D をもう一度押すと終了します",
+  "Press Esc again to clear.": "Esc をもう一度押すとクリアします",
   // MCP Status
-  '⏳ MCP servers are starting up ({{count}} initializing)...':
-    '⏳ MCPサーバーを起動中({{count}} 初期化中)...',
-  'Note: First startup may take longer. Tool availability will update automatically.':
-    '注: 初回起動には時間がかかる場合があります。ツールの利用可能状況は自動的に更新されます',
-  'Starting... (first startup may take longer)':
-    '起動中...(初回起動には時間がかかる場合があります)',
-  '{{count}} prompt': '{{count}} プロンプト',
-  '{{count}} prompts': '{{count}} プロンプト',
-  '(from {{extensionName}})': '({{extensionName}} から)',
-  OAuth: 'OAuth',
-  'OAuth expired': 'OAuth 期限切れ',
-  'OAuth not authenticated': 'OAuth 未認証',
-  'tools and prompts will appear when ready':
-    'ツールとプロンプトは準備完了後に表示されます',
-  '{{count}} tools cached': '{{count}} ツール(キャッシュ済み)',
-  'Tools:': 'ツール:',
-  'Parameters:': 'パラメータ:',
-  'Prompts:': 'プロンプト:',
-  Blocked: 'ブロック',
-  '💡 Tips:': '💡 ヒント:',
-  Use: '使用',
-  'to show server and tool descriptions': 'サーバーとツールの説明を表示',
-  'to show tool parameter schemas': 'ツールパラメータスキーマを表示',
-  'to hide descriptions': '説明を非表示',
-  'to authenticate with OAuth-enabled servers': 'OAuth対応サーバーで認証',
-  Press: '押す',
-  'to toggle tool descriptions on/off': 'ツール説明の表示/非表示を切り替え',
+  "⏳ MCP servers are starting up ({{count}} initializing)...":
+    "⏳ MCPサーバーを起動中({{count}} 初期化中)...",
+  "Note: First startup may take longer. Tool availability will update automatically.":
+    "注: 初回起動には時間がかかる場合があります。ツールの利用可能状況は自動的に更新されます",
+  "Starting... (first startup may take longer)":
+    "起動中...(初回起動には時間がかかる場合があります)",
+  "{{count}} prompt": "{{count}} プロンプト",
+  "{{count}} prompts": "{{count}} プロンプト",
+  "(from {{extensionName}})": "({{extensionName}} から)",
+  OAuth: "OAuth",
+  "OAuth expired": "OAuth 期限切れ",
+  "OAuth not authenticated": "OAuth 未認証",
+  "tools and prompts will appear when ready": "ツールとプロンプトは準備完了後に表示されます",
+  "{{count}} tools cached": "{{count}} ツール(キャッシュ済み)",
+  "Tools:": "ツール:",
+  "Parameters:": "パラメータ:",
+  "Prompts:": "プロンプト:",
+  Blocked: "ブロック",
+  "💡 Tips:": "💡 ヒント:",
+  Use: "使用",
+  "to show server and tool descriptions": "サーバーとツールの説明を表示",
+  "to show tool parameter schemas": "ツールパラメータスキーマを表示",
+  "to hide descriptions": "説明を非表示",
+  "to authenticate with OAuth-enabled servers": "OAuth対応サーバーで認証",
+  Press: "押す",
+  "to toggle tool descriptions on/off": "ツール説明の表示/非表示を切り替え",
   "Starting OAuth authentication for MCP server '{{name}}'...":
     "MCPサーバー '{{name}}' のOAuth認証を開始中...",
   // Startup Tips
-  'Tips:': 'ヒント：',
-  'Use /compress when the conversation gets long to summarize history and free up context.':
-    '会話が長くなったら /compress で履歴を要約し、コンテキストを解放できます。',
-  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
-    '/clear または /new で新しいアイデアを始められます。前のセッションは履歴に残ります。',
-  'Use /bug to submit issues to the maintainers when something goes off.':
-    '問題が発生したら /bug でメンテナーに報告できます。',
-  'Switch auth type quickly with /auth.':
-    '/auth で認証タイプをすばやく切り替えられます。',
-  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
-    'Qwen Code から ! を使って任意のシェルコマンドを実行できます（例: !ls）。',
-  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
-    '/ を入力してコマンドポップアップを開きます。Tab でスラッシュコマンドと保存済みプロンプトを補完できます。',
-  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
-    'qwen --continue または qwen --resume で前の会話を再開できます。',
-  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
-    'Shift+Tab または /approval-mode で権限モードをすばやく切り替えられます。',
-  'You can switch permission mode quickly with Tab or /approval-mode.':
-    'Tab または /approval-mode で権限モードをすばやく切り替えられます。',
-  'Try /insight to generate personalized insights from your chat history.':
-    '/insight でチャット履歴からパーソナライズされたインサイトを生成できます。',
-  'Tips for getting started:': '始めるためのヒント:',
-  '1. Ask questions, edit files, or run commands.':
-    '1. 質問したり、ファイルを編集したり、コマンドを実行したりできます',
-  '2. Be specific for the best results.':
-    '2. 具体的に指示すると最良の結果が得られます',
-  'files to customize your interactions with Qwen Code.':
-    'Qwen Code との対話をカスタマイズするためのファイル',
-  'for more information.': '詳細情報を確認できます',
+  "Tips:": "ヒント：",
+  "Use /compress when the conversation gets long to summarize history and free up context.":
+    "会話が長くなったら /compress で履歴を要約し、コンテキストを解放できます。",
+  "Start a fresh idea with /clear or /new; the previous session stays available in history.":
+    "/clear または /new で新しいアイデアを始められます。前のセッションは履歴に残ります。",
+  "Use /bug to submit issues to the maintainers when something goes off.":
+    "問題が発生したら /bug でメンテナーに報告できます。",
+  "Switch auth type quickly with /auth.": "/auth で認証タイプをすばやく切り替えられます。",
+  "You can run any shell commands from Qwen Code using ! (e.g. !ls).":
+    "Qwen Code から ! を使って任意のシェルコマンドを実行できます（例: !ls）。",
+  "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.":
+    "/ を入力してコマンドポップアップを開きます。Tab でスラッシュコマンドと保存済みプロンプトを補完できます。",
+  "You can resume a previous conversation by running qwen --continue or qwen --resume.":
+    "qwen --continue または qwen --resume で前の会話を再開できます。",
+  "You can switch permission mode quickly with Shift+Tab or /approval-mode.":
+    "Shift+Tab または /approval-mode で権限モードをすばやく切り替えられます。",
+  "You can switch permission mode quickly with Tab or /approval-mode.":
+    "Tab または /approval-mode で権限モードをすばやく切り替えられます。",
+  "Try /insight to generate personalized insights from your chat history.":
+    "/insight でチャット履歴からパーソナライズされたインサイトを生成できます。",
+  "Tips for getting started:": "始めるためのヒント:",
+  "1. Ask questions, edit files, or run commands.":
+    "1. 質問したり、ファイルを編集したり、コマンドを実行したりできます",
+  "2. Be specific for the best results.": "2. 具体的に指示すると最良の結果が得られます",
+  "files to customize your interactions with Qwen Code.":
+    "Qwen Code との対話をカスタマイズするためのファイル",
+  "for more information.": "詳細情報を確認できます",
   // Exit Screen / Stats
-  'Agent powering down. Goodbye!': 'エージェントを終了します。さようなら!',
-  'To continue this session, run': 'このセッションを続行するには、次を実行:',
-  'Interaction Summary': 'インタラクション概要',
-  'Session ID:': 'セッションID:',
-  'Tool Calls:': 'ツール呼び出し:',
-  'Success Rate:': '成功率:',
-  'User Agreement:': 'ユーザー同意:',
-  reviewed: 'レビュー済み',
-  'Code Changes:': 'コード変更:',
-  Performance: 'パフォーマンス',
-  'Wall Time:': '経過時間:',
-  'Agent Active:': 'エージェント稼働時間:',
-  'API Time:': 'API時間:',
-  'Tool Time:': 'ツール時間:',
-  'Session Stats': 'セッション統計',
-  'Model Usage': 'モデル使用量',
-  Reqs: 'リクエスト',
-  'Input Tokens': '入力トークン',
-  'Output Tokens': '出力トークン',
-  'Savings Highlight:': '節約ハイライト:',
-  'of input tokens were served from the cache, reducing costs.':
-    '入力トークンがキャッシュから提供され、コストを削減しました',
-  'Tip: For a full token breakdown, run `/stats model`.':
-    'ヒント: トークンの詳細な内訳は `/stats model` を実行してください',
-  'Model Stats For Nerds': 'マニア向けモデル統計',
-  'Tool Stats For Nerds': 'マニア向けツール統計',
-  Metric: 'メトリック',
-  API: 'API',
-  Requests: 'リクエスト',
-  Errors: 'エラー',
-  'Avg Latency': '平均レイテンシ',
-  Tokens: 'トークン',
-  Total: '合計',
-  Prompt: 'プロンプト',
-  Cached: 'キャッシュ',
-  Thoughts: '思考',
-  Tool: 'ツール',
-  Output: '出力',
-  'No API calls have been made in this session.':
-    'このセッションではAPI呼び出しが行われていません',
-  'Tool Name': 'ツール名',
-  Calls: '呼び出し',
-  'Success Rate': '成功率',
-  'Avg Duration': '平均時間',
-  'User Decision Summary': 'ユーザー決定サマリー',
-  'Total Reviewed Suggestions:': '総レビュー提案数:',
-  ' » Accepted:': ' » 承認:',
-  ' » Rejected:': ' » 却下:',
-  ' » Modified:': ' » 変更:',
-  ' Overall Agreement Rate:': ' 全体承認率:',
-  'No tool calls have been made in this session.':
-    'このセッションではツール呼び出しが行われていません',
-  'Session start time is unavailable, cannot calculate stats.':
-    'セッション開始時刻が利用できないため、統計を計算できません',
+  "Agent powering down. Goodbye!": "エージェントを終了します。さようなら!",
+  "To continue this session, run": "このセッションを続行するには、次を実行:",
+  "Interaction Summary": "インタラクション概要",
+  "Session ID:": "セッションID:",
+  "Tool Calls:": "ツール呼び出し:",
+  "Success Rate:": "成功率:",
+  "User Agreement:": "ユーザー同意:",
+  reviewed: "レビュー済み",
+  "Code Changes:": "コード変更:",
+  Performance: "パフォーマンス",
+  "Wall Time:": "経過時間:",
+  "Agent Active:": "エージェント稼働時間:",
+  "API Time:": "API時間:",
+  "Tool Time:": "ツール時間:",
+  "Session Stats": "セッション統計",
+  "Model Usage": "モデル使用量",
+  Reqs: "リクエスト",
+  "Input Tokens": "入力トークン",
+  "Output Tokens": "出力トークン",
+  "Savings Highlight:": "節約ハイライト:",
+  "of input tokens were served from the cache, reducing costs.":
+    "入力トークンがキャッシュから提供され、コストを削減しました",
+  "Tip: For a full token breakdown, run `/stats model`.":
+    "ヒント: トークンの詳細な内訳は `/stats model` を実行してください",
+  "Model Stats For Nerds": "マニア向けモデル統計",
+  "Tool Stats For Nerds": "マニア向けツール統計",
+  Metric: "メトリック",
+  API: "API",
+  Requests: "リクエスト",
+  Errors: "エラー",
+  "Avg Latency": "平均レイテンシ",
+  Tokens: "トークン",
+  Total: "合計",
+  Prompt: "プロンプト",
+  Cached: "キャッシュ",
+  Thoughts: "思考",
+  Tool: "ツール",
+  Output: "出力",
+  "No API calls have been made in this session.": "このセッションではAPI呼び出しが行われていません",
+  "Tool Name": "ツール名",
+  Calls: "呼び出し",
+  "Success Rate": "成功率",
+  "Avg Duration": "平均時間",
+  "User Decision Summary": "ユーザー決定サマリー",
+  "Total Reviewed Suggestions:": "総レビュー提案数:",
+  " » Accepted:": " » 承認:",
+  " » Rejected:": " » 却下:",
+  " » Modified:": " » 変更:",
+  " Overall Agreement Rate:": " 全体承認率:",
+  "No tool calls have been made in this session.":
+    "このセッションではツール呼び出しが行われていません",
+  "Session start time is unavailable, cannot calculate stats.":
+    "セッション開始時刻が利用できないため、統計を計算できません",
   // Loading
-  'Waiting for user confirmation...': 'ユーザーの確認を待っています...',
-  '(esc to cancel, {{time}})': '(Esc でキャンセル、{{time}})',
+  "Waiting for user confirmation...": "ユーザーの確認を待っています...",
+  "(esc to cancel, {{time}})": "(Esc でキャンセル、{{time}})",
   // Witty Loading Phrases
   WITTY_LOADING_PHRASES: [
-    '運任せで検索中...',
-    '中の人がタイピング中...',
-    'ロジックを最適化中...',
-    '電子の数を確認中...',
-    '宇宙のバグをチェック中...',
-    '大量の0と1をコンパイル中...',
-    'HDDと思い出をデフラグ中...',
-    'ビットをこっそり入れ替え中...',
-    'ニューロンの接続を再構築中...',
-    'どこかに行ったセミコロンを捜索中...',
-    'フラックスキャパシタを調整中...',
-    'フォースと交感中...',
-    'アルゴリズムをチューニング中...',
-    '白いウサギを追跡中...',
-    'カセットフーフー中...',
-    'ローディングメッセージを考え中...',
-    'ほぼ完了...多分...',
-    '最新のミームについて調査中...',
-    'この表示を改善するアイデアを思索中...',
-    'この問題を考え中...',
-    'それはバグでなく誰も知らない新機能だよ',
-    'ダイヤルアップ接続音が終わるのを待機中...',
-    'コードに油を追加中...',
+    "運任せで検索中...",
+    "中の人がタイピング中...",
+    "ロジックを最適化中...",
+    "電子の数を確認中...",
+    "宇宙のバグをチェック中...",
+    "大量の0と1をコンパイル中...",
+    "HDDと思い出をデフラグ中...",
+    "ビットをこっそり入れ替え中...",
+    "ニューロンの接続を再構築中...",
+    "どこかに行ったセミコロンを捜索中...",
+    "フラックスキャパシタを調整中...",
+    "フォースと交感中...",
+    "アルゴリズムをチューニング中...",
+    "白いウサギを追跡中...",
+    "カセットフーフー中...",
+    "ローディングメッセージを考え中...",
+    "ほぼ完了...多分...",
+    "最新のミームについて調査中...",
+    "この表示を改善するアイデアを思索中...",
+    "この問題を考え中...",
+    "それはバグでなく誰も知らない新機能だよ",
+    "ダイヤルアップ接続音が終わるのを待機中...",
+    "コードに油を追加中...",
 
     // かなり意訳が入ってるもの
-    'イヤホンをほどき中...',
-    'カフェインをコードに変換中...',
-    '天動説を地動説に書き換え中...',
-    'プールで時計の完成を待機中...',
-    '笑撃的な回答を用意中...',
-    '適切なミームを記述中...',
-    'Aボタンを押して次へ...',
-    'コードにリックロールを仕込み中...',
-    'プログラマーが貧乏なのはキャッシュを使いすぎるから...',
-    'プログラマーがダークモードなのはバグを見たくないから...',
-    'コードが壊れた?叩けば治るさ',
-    'USBの差し込みに挑戦中...',
+    "イヤホンをほどき中...",
+    "カフェインをコードに変換中...",
+    "天動説を地動説に書き換え中...",
+    "プールで時計の完成を待機中...",
+    "笑撃的な回答を用意中...",
+    "適切なミームを記述中...",
+    "Aボタンを押して次へ...",
+    "コードにリックロールを仕込み中...",
+    "プログラマーが貧乏なのはキャッシュを使いすぎるから...",
+    "プログラマーがダークモードなのはバグを見たくないから...",
+    "コードが壊れた?叩けば治るさ",
+    "USBの差し込みに挑戦中...",
   ],
 
   // ============================================================================
   // Custom API Key Configuration
   // ============================================================================
-  'You can configure your API key and models in settings.json':
-    'settings.json で API キーとモデルを設定できます',
-  'Refer to the documentation for setup instructions':
-    'セットアップ手順はドキュメントを参照してください',
+  "You can configure your API key and models in settings.json":
+    "settings.json で API キーとモデルを設定できます",
+  "Refer to the documentation for setup instructions":
+    "セットアップ手順はドキュメントを参照してください",
 
   // ============================================================================
   // Coding Plan Authentication
   // ============================================================================
-  'API key cannot be empty.': 'APIキーは空にできません。',
-  'You can get your Coding Plan API key here':
-    'Coding Plan APIキーはこちらで取得できます',
-  'Coding Plan configuration updated successfully. New models are now available.':
-    'Coding Plan の設定が正常に更新されました。新しいモデルが利用可能になりました。',
-  'Coding Plan API key not found. Please re-authenticate with Coding Plan.':
-    'Coding Plan の API キーが見つかりません。Coding Plan で再認証してください。',
-  'Failed to update Coding Plan configuration: {{message}}':
-    'Coding Plan の設定更新に失敗しました: {{message}}',
+  "API key cannot be empty.": "APIキーは空にできません。",
+  "You can get your Coding Plan API key here": "Coding Plan APIキーはこちらで取得できます",
+  "Coding Plan configuration updated successfully. New models are now available.":
+    "Coding Plan の設定が正常に更新されました。新しいモデルが利用可能になりました。",
+  "Coding Plan API key not found. Please re-authenticate with Coding Plan.":
+    "Coding Plan の API キーが見つかりません。Coding Plan で再認証してください。",
+  "Failed to update Coding Plan configuration: {{message}}":
+    "Coding Plan の設定更新に失敗しました: {{message}}",
 
   // ============================================================================
   // Auth Dialog - View Titles and Labels
   // ============================================================================
-  'Coding Plan': 'Coding Plan',
+  "Coding Plan": "Coding Plan",
   "Paste your api key of ModelStudio Coding Plan and you're all set!":
-    'ModelStudio Coding PlanのAPIキーを貼り付けるだけで準備完了です！',
-  Custom: 'カスタム',
-  'More instructions about configuring `modelProviders` manually.':
-    '`modelProviders`を手動で設定する方法の詳細はこちら。',
-  'Select API-KEY configuration mode:': 'API-KEY設定モードを選択してください：',
-  '(Press Escape to go back)': '(Escapeキーで戻る)',
-  '(Press Enter to submit, Escape to cancel)':
-    '(Enterで送信、Escapeでキャンセル)',
-  'More instructions please check:': '詳細な手順はこちらをご確認ください：',
-  'Select Region for Coding Plan': 'Coding Planのリージョンを選択',
-  'Choose based on where your account is registered':
-    'アカウントの登録先に応じて選択してください',
-  'Enter Coding Plan API Key': 'Coding Plan APIキーを入力',
+    "ModelStudio Coding PlanのAPIキーを貼り付けるだけで準備完了です！",
+  Custom: "カスタム",
+  "More instructions about configuring `modelProviders` manually.":
+    "`modelProviders`を手動で設定する方法の詳細はこちら。",
+  "Select API-KEY configuration mode:": "API-KEY設定モードを選択してください：",
+  "(Press Escape to go back)": "(Escapeキーで戻る)",
+  "(Press Enter to submit, Escape to cancel)": "(Enterで送信、Escapeでキャンセル)",
+  "More instructions please check:": "詳細な手順はこちらをご確認ください：",
+  "Select Region for Coding Plan": "Coding Planのリージョンを選択",
+  "Choose based on where your account is registered": "アカウントの登録先に応じて選択してください",
+  "Enter Coding Plan API Key": "Coding Plan APIキーを入力",
 
   // ============================================================================
   // Coding Plan International Updates
   // ============================================================================
-  'New model configurations are available for {{region}}. Update now?':
-    '{{region}} の新しいモデル設定が利用可能です。今すぐ更新しますか？',
+  "New model configurations are available for {{region}}. Update now?":
+    "{{region}} の新しいモデル設定が利用可能です。今すぐ更新しますか？",
   '{{region}} configuration updated successfully. Model switched to "{{model}}".':
     '{{region}} の設定が正常に更新されました。モデルが "{{model}}" に切り替わりました。',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).':
-    '{{region}} での認証に成功しました。API キーとモデル設定が settings.json に保存されました（バックアップ済み）。',
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).":
+    "{{region}} での認証に成功しました。API キーとモデル設定が settings.json に保存されました（バックアップ済み）。",
 
   // ============================================================================
   // Context Usage Component
   // ============================================================================
-  'Context Usage': 'コンテキスト使用量',
-  'No API response yet. Send a message to see actual usage.':
-    'API応答はありません。メッセージを送信して実際の使用量を確認してください。',
-  'Estimated pre-conversation overhead': '推定事前会話オーバーヘッド',
-  'Context window': 'コンテキストウィンドウ',
-  tokens: 'トークン',
-  Used: '使用済み',
-  Free: '空き',
-  'Autocompact buffer': '自動圧縮バッファ',
-  'Usage by category': 'カテゴリ別の使用量',
-  'System prompt': 'システムプロンプト',
-  'Built-in tools': '組み込みツール',
-  'MCP tools': 'MCPツール',
-  'Memory files': 'メモリファイル',
-  Skills: 'スキル',
-  Messages: 'メッセージ',
-  'Show context window usage breakdown.':
-    'コンテキストウィンドウの使用状況を表示します。',
-  'Run /context detail for per-item breakdown.':
-    '/context detail を実行すると項目ごとの内訳を表示します。',
-  active: '有効',
-  'body loaded': '本文読み込み済み',
-  memory: 'メモリ',
-  '{{region}} configuration updated successfully.':
-    '{{region}} の設定が正常に更新されました。',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.':
-    '{{region}} での認証に成功しました。APIキーとモデル設定が settings.json に保存されました。',
-  'Tip: Use /model to switch between available Coding Plan models.':
-    'ヒント: /model で利用可能な Coding Plan モデルを切り替えられます。',
+  "Context Usage": "コンテキスト使用量",
+  "No API response yet. Send a message to see actual usage.":
+    "API応答はありません。メッセージを送信して実際の使用量を確認してください。",
+  "Estimated pre-conversation overhead": "推定事前会話オーバーヘッド",
+  "Context window": "コンテキストウィンドウ",
+  tokens: "トークン",
+  Used: "使用済み",
+  Free: "空き",
+  "Autocompact buffer": "自動圧縮バッファ",
+  "Usage by category": "カテゴリ別の使用量",
+  "System prompt": "システムプロンプト",
+  "Built-in tools": "組み込みツール",
+  "MCP tools": "MCPツール",
+  "Memory files": "メモリファイル",
+  Skills: "スキル",
+  Messages: "メッセージ",
+  "Show context window usage breakdown.": "コンテキストウィンドウの使用状況を表示します。",
+  "Run /context detail for per-item breakdown.":
+    "/context detail を実行すると項目ごとの内訳を表示します。",
+  active: "有効",
+  "body loaded": "本文読み込み済み",
+  memory: "メモリ",
+  "{{region}} configuration updated successfully.": "{{region}} の設定が正常に更新されました。",
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.":
+    "{{region}} での認証に成功しました。APIキーとモデル設定が settings.json に保存されました。",
+  "Tip: Use /model to switch between available Coding Plan models.":
+    "ヒント: /model で利用可能な Coding Plan モデルを切り替えられます。",
 
   // ============================================================================
   // Ask User Question Tool
   // ============================================================================
-  'Please answer the following question(s):': '以下の質問に答えてください：',
-  'Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.':
-    '非対話モードではユーザーに質問できません。このツールを使用するには対話モードで実行してください。',
-  'User declined to answer the questions.':
-    'ユーザーは質問への回答を拒否しました。',
-  'User has provided the following answers:':
-    'ユーザーは以下の回答を提供しました：',
-  'Failed to process user answers:': 'ユーザー回答の処理に失敗しました：',
-  'Type something...': '何か入力...',
-  Submit: '送信',
-  'Submit answers': '回答を送信',
-  Cancel: 'キャンセル',
-  'Your answers:': 'あなたの回答：',
-  '(not answered)': '(未回答)',
-  'Ready to submit your answers?': '回答を送信しますか？',
-  '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select':
-    '↑/↓: ナビゲート | ←/→: タブ切り替え | Enter: 選択',
-  '↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: ナビゲート | ←/→: タブ切り替え | Space/Enter: 切り替え | Esc: キャンセル',
-  '↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: ナビゲート | Space/Enter: 切り替え | Esc: キャンセル',
-  '↑/↓: Navigate | Enter: Select | Esc: Cancel':
-    '↑/↓: ナビゲート | Enter: 選択 | Esc: キャンセル',
+  "Please answer the following question(s):": "以下の質問に答えてください：",
+  "Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.":
+    "非対話モードではユーザーに質問できません。このツールを使用するには対話モードで実行してください。",
+  "User declined to answer the questions.": "ユーザーは質問への回答を拒否しました。",
+  "User has provided the following answers:": "ユーザーは以下の回答を提供しました：",
+  "Failed to process user answers:": "ユーザー回答の処理に失敗しました：",
+  "Type something...": "何か入力...",
+  Submit: "送信",
+  "Submit answers": "回答を送信",
+  Cancel: "キャンセル",
+  "Your answers:": "あなたの回答：",
+  "(not answered)": "(未回答)",
+  "Ready to submit your answers?": "回答を送信しますか？",
+  "↑/↓: Navigate | ←/→: Switch tabs | Enter: Select":
+    "↑/↓: ナビゲート | ←/→: タブ切り替え | Enter: 選択",
+  "↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: ナビゲート | ←/→: タブ切り替え | Space/Enter: 切り替え | Esc: キャンセル",
+  "↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: ナビゲート | Space/Enter: 切り替え | Esc: キャンセル",
+  "↑/↓: Navigate | Enter: Select | Esc: Cancel": "↑/↓: ナビゲート | Enter: 選択 | Esc: キャンセル",
 
   // ============================================================================
   // Commands - Auth
   // ============================================================================
-  'Authenticate using Alibaba Cloud Coding Plan':
-    'Alibaba Cloud Coding Plan で認証する',
-  'Region for Coding Plan (china/global)':
-    'Coding Plan のリージョン (china/global)',
-  'API key for Coding Plan': 'Coding Plan の API キー',
-  'Show current authentication status': '現在の認証ステータスを表示',
-  'Authentication completed successfully.': '認証が正常に完了しました。',
-  'Processing Alibaba Cloud Coding Plan authentication...':
-    'Alibaba Cloud Coding Plan 認証を処理しています...',
-  'Successfully authenticated with Alibaba Cloud Coding Plan.':
-    'Alibaba Cloud Coding Plan での認証に成功しました。',
-  'Failed to authenticate with Coding Plan: {{error}}':
-    'Coding Plan での認証に失敗しました: {{error}}',
-  '中国 (China)': '中国 (China)',
-  '阿里云百炼 (aliyun.com)': '阿里云百炼 (aliyun.com)',
-  Global: 'グローバル',
-  'Alibaba Cloud (alibabacloud.com)': 'Alibaba Cloud (alibabacloud.com)',
-  'Select region for Coding Plan:': 'Coding Plan のリージョンを選択:',
-  'Enter your Coding Plan API key: ':
-    'Coding Plan の API キーを入力してください: ',
-  'Select authentication method:': '認証方法を選択:',
-  '\n=== Authentication Status ===\n': '\n=== 認証ステータス ===\n',
-  '⚠️  No authentication method configured.\n':
-    '⚠️  認証方法が設定されていません。\n',
-  'Run one of the following commands to get started:\n':
-    '以下のコマンドのいずれかを実行して開始してください:\n',
-  '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n':
-    '  qwen auth coding-plan      - Alibaba Cloud Coding Plan で認証\n',
-  'Or simply run:': 'または以下を実行:',
-  '  qwen auth                - Interactive authentication setup\n':
-    '  qwen auth                - インタラクティブ認証セットアップ\n',
-  '✓ Authentication Method: Alibaba Cloud Coding Plan':
-    '✓ 認証方法: Alibaba Cloud Coding Plan',
-  '中国 (China) - 阿里云百炼': '中国 (China) - 阿里云百炼',
-  'Global - Alibaba Cloud': 'グローバル - Alibaba Cloud',
-  '  Region: {{region}}': '  リージョン: {{region}}',
-  '  Current Model: {{model}}': '  現在のモデル: {{model}}',
-  '  Config Version: {{version}}': '  設定バージョン: {{version}}',
-  '  Status: API key configured\n': '  ステータス: APIキー設定済み\n',
-  '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)':
-    '⚠️  認証方法: Alibaba Cloud Coding Plan（不完全）',
-  '  Issue: API key not found in environment or settings\n':
-    '  問題: 環境変数または設定にAPIキーが見つかりません\n',
-  '  Run `qwen auth coding-plan` to re-configure.\n':
-    '  `qwen auth coding-plan` を実行して再設定してください。\n',
-  '✓ Authentication Method: {{type}}': '✓ 認証方法: {{type}}',
-  '  Status: Configured\n': '  ステータス: 設定済み\n',
-  'Failed to check authentication status: {{error}}':
-    '認証ステータスの確認に失敗しました: {{error}}',
-  'Select an option:': 'オプションを選択:',
-  'Raw mode not available. Please run in an interactive terminal.':
-    'Rawモードが利用できません。インタラクティブターミナルで実行してください。',
-  '(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n':
-    '(↑ ↓ 矢印キーで移動、Enter で選択、Ctrl+C で終了)\n',
-  verbose: '詳細',
-  'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).':
-    '詳細モードで完全なツール出力と思考を表示します（Ctrl+O で切り替え）。',
-  'Press Ctrl+O to show full tool output': 'Ctrl+O で完全なツール出力を表示',
+  "Authenticate using Alibaba Cloud Coding Plan": "Alibaba Cloud Coding Plan で認証する",
+  "Region for Coding Plan (china/global)": "Coding Plan のリージョン (china/global)",
+  "API key for Coding Plan": "Coding Plan の API キー",
+  "Show current authentication status": "現在の認証ステータスを表示",
+  "Authentication completed successfully.": "認証が正常に完了しました。",
+  "Processing Alibaba Cloud Coding Plan authentication...":
+    "Alibaba Cloud Coding Plan 認証を処理しています...",
+  "Successfully authenticated with Alibaba Cloud Coding Plan.":
+    "Alibaba Cloud Coding Plan での認証に成功しました。",
+  "Failed to authenticate with Coding Plan: {{error}}":
+    "Coding Plan での認証に失敗しました: {{error}}",
+  "中国 (China)": "中国 (China)",
+  "阿里云百炼 (aliyun.com)": "阿里云百炼 (aliyun.com)",
+  Global: "グローバル",
+  "Alibaba Cloud (alibabacloud.com)": "Alibaba Cloud (alibabacloud.com)",
+  "Select region for Coding Plan:": "Coding Plan のリージョンを選択:",
+  "Enter your Coding Plan API key: ": "Coding Plan の API キーを入力してください: ",
+  "Select authentication method:": "認証方法を選択:",
+  "\n=== Authentication Status ===\n": "\n=== 認証ステータス ===\n",
+  "⚠️  No authentication method configured.\n": "⚠️  認証方法が設定されていません。\n",
+  "Run one of the following commands to get started:\n":
+    "以下のコマンドのいずれかを実行して開始してください:\n",
+  "  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n":
+    "  qwen auth coding-plan      - Alibaba Cloud Coding Plan で認証\n",
+  "Or simply run:": "または以下を実行:",
+  "  qwen auth                - Interactive authentication setup\n":
+    "  qwen auth                - インタラクティブ認証セットアップ\n",
+  "✓ Authentication Method: Alibaba Cloud Coding Plan": "✓ 認証方法: Alibaba Cloud Coding Plan",
+  "中国 (China) - 阿里云百炼": "中国 (China) - 阿里云百炼",
+  "Global - Alibaba Cloud": "グローバル - Alibaba Cloud",
+  "  Region: {{region}}": "  リージョン: {{region}}",
+  "  Current Model: {{model}}": "  現在のモデル: {{model}}",
+  "  Config Version: {{version}}": "  設定バージョン: {{version}}",
+  "  Status: API key configured\n": "  ステータス: APIキー設定済み\n",
+  "⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)":
+    "⚠️  認証方法: Alibaba Cloud Coding Plan（不完全）",
+  "  Issue: API key not found in environment or settings\n":
+    "  問題: 環境変数または設定にAPIキーが見つかりません\n",
+  "  Run `qwen auth coding-plan` to re-configure.\n":
+    "  `qwen auth coding-plan` を実行して再設定してください。\n",
+  "✓ Authentication Method: {{type}}": "✓ 認証方法: {{type}}",
+  "  Status: Configured\n": "  ステータス: 設定済み\n",
+  "Failed to check authentication status: {{error}}":
+    "認証ステータスの確認に失敗しました: {{error}}",
+  "Select an option:": "オプションを選択:",
+  "Raw mode not available. Please run in an interactive terminal.":
+    "Rawモードが利用できません。インタラクティブターミナルで実行してください。",
+  "(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n":
+    "(↑ ↓ 矢印キーで移動、Enter で選択、Ctrl+C で終了)\n",
+  verbose: "詳細",
+  "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).":
+    "詳細モードで完全なツール出力と思考を表示します（Ctrl+O で切り替え）。",
+  "Press Ctrl+O to show full tool output": "Ctrl+O で完全なツール出力を表示",
 
-  'Switch to plan mode or exit plan mode':
-    'Switch to plan mode or exit plan mode',
-  'Exited plan mode. Previous approval mode restored.':
-    'Exited plan mode. Previous approval mode restored.',
-  'Enabled plan mode. The agent will analyze and plan without executing tools.':
-    'Enabled plan mode. The agent will analyze and plan without executing tools.',
+  "Switch to plan mode or exit plan mode": "Switch to plan mode or exit plan mode",
+  "Exited plan mode. Previous approval mode restored.":
+    "Exited plan mode. Previous approval mode restored.",
+  "Enabled plan mode. The agent will analyze and plan without executing tools.":
+    "Enabled plan mode. The agent will analyze and plan without executing tools.",
   'Already in plan mode. Use "/plan exit" to exit plan mode.':
     'Already in plan mode. Use "/plan exit" to exit plan mode.',
   'Not in plan mode. Use "/plan" to enter plan mode first.':
diff --git a/apps/airiscode-cli/src/i18n/locales/pt.js b/apps/airiscode-cli/src/i18n/locales/pt.js
index 3f72b072b..c523ae839 100644
--- a/apps/airiscode-cli/src/i18n/locales/pt.js
+++ b/apps/airiscode-cli/src/i18n/locales/pt.js
@@ -10,1194 +10,1103 @@ export default {
   // ============================================================================
   // Help / UI Components
   // ============================================================================
-  'Basics:': 'Noções básicas:',
-  'Add context': 'Adicionar contexto',
-  'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.':
-    'Use {{symbol}} para especificar arquivos para o contexto (ex: {{example}}) para atingir arquivos ou pastas específicos.',
-  '@': '@',
-  '@src/myFile.ts': '@src/myFile.ts',
-  'Shell mode': 'Modo shell',
-  'YOLO mode': 'Modo YOLO',
-  'plan mode': 'modo planejamento',
-  'auto-accept edits': 'aceitar edições automaticamente',
-  'Accepting edits': 'Aceitando edições',
-  '(shift + tab to cycle)': '(shift + tab para alternar)',
-  'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).':
-    'Execute comandos shell via {{symbol}} (ex: {{example1}}) ou use linguagem natural (ex: {{example2}}).',
-  '!': '!',
-  '!npm run start': '!npm run start',
-  'start server': 'iniciar servidor',
-  'Commands:': 'Comandos:',
-  'shell command': 'comando shell',
-  'Model Context Protocol command (from external servers)':
-    'Comando Model Context Protocol (de servidores externos)',
-  'Keyboard Shortcuts:': 'Atalhos de teclado:',
-  'Toggle this help display': 'Alternar exibição desta ajuda',
-  'Toggle shell mode': 'Alternar modo shell',
-  'Open command menu': 'Abrir menu de comandos',
-  'Add file context': 'Adicionar contexto de arquivo',
-  'Accept suggestion / Autocomplete': 'Aceitar sugestão / Autocompletar',
-  'Reverse search history': 'Pesquisa reversa no histórico',
-  'Press ? again to close': 'Pressione ? novamente para fechar',
+  "Basics:": "Noções básicas:",
+  "Add context": "Adicionar contexto",
+  "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.":
+    "Use {{symbol}} para especificar arquivos para o contexto (ex: {{example}}) para atingir arquivos ou pastas específicos.",
+  "@": "@",
+  "@src/myFile.ts": "@src/myFile.ts",
+  "Shell mode": "Modo shell",
+  "YOLO mode": "Modo YOLO",
+  "plan mode": "modo planejamento",
+  "auto-accept edits": "aceitar edições automaticamente",
+  "Accepting edits": "Aceitando edições",
+  "(shift + tab to cycle)": "(shift + tab para alternar)",
+  "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).":
+    "Execute comandos shell via {{symbol}} (ex: {{example1}}) ou use linguagem natural (ex: {{example2}}).",
+  "!": "!",
+  "!npm run start": "!npm run start",
+  "start server": "iniciar servidor",
+  "Commands:": "Comandos:",
+  "shell command": "comando shell",
+  "Model Context Protocol command (from external servers)":
+    "Comando Model Context Protocol (de servidores externos)",
+  "Keyboard Shortcuts:": "Atalhos de teclado:",
+  "Toggle this help display": "Alternar exibição desta ajuda",
+  "Toggle shell mode": "Alternar modo shell",
+  "Open command menu": "Abrir menu de comandos",
+  "Add file context": "Adicionar contexto de arquivo",
+  "Accept suggestion / Autocomplete": "Aceitar sugestão / Autocompletar",
+  "Reverse search history": "Pesquisa reversa no histórico",
+  "Press ? again to close": "Pressione ? novamente para fechar",
   // Keyboard shortcuts panel descriptions
-  'for shell mode': 'para modo shell',
-  'for commands': 'para comandos',
-  'for file paths': 'para caminhos de arquivo',
-  'to clear input': 'para limpar entrada',
-  'to cycle approvals': 'para alternar aprovações',
-  'to quit': 'para sair',
-  'for newline': 'para nova linha',
-  'to clear screen': 'para limpar a tela',
-  'to search history': 'para pesquisar no histórico',
-  'to paste images': 'para colar imagens',
-  'for external editor': 'para editor externo',
-  'Jump through words in the input': 'Pular palavras na entrada',
-  'Close dialogs, cancel requests, or quit application':
-    'Fechar diálogos, cancelar solicitações ou sair do aplicativo',
-  'New line': 'Nova linha',
-  'New line (Alt+Enter works for certain linux distros)':
-    'Nova linha (Alt+Enter funciona em certas distros linux)',
-  'Clear the screen': 'Limpar a tela',
-  'Open input in external editor': 'Abrir entrada no editor externo',
-  'Send message': 'Enviar mensagem',
-  'Initializing...': 'Inicializando...',
-  'Connecting to MCP servers... ({{connected}}/{{total}})':
-    'Conectando aos servidores MCP... ({{connected}}/{{total}})',
-  'Type your message or @path/to/file':
-    'Digite sua mensagem ou @caminho/do/arquivo',
-  '? for shortcuts': '? para atalhos',
+  "for shell mode": "para modo shell",
+  "for commands": "para comandos",
+  "for file paths": "para caminhos de arquivo",
+  "to clear input": "para limpar entrada",
+  "to cycle approvals": "para alternar aprovações",
+  "to quit": "para sair",
+  "for newline": "para nova linha",
+  "to clear screen": "para limpar a tela",
+  "to search history": "para pesquisar no histórico",
+  "to paste images": "para colar imagens",
+  "for external editor": "para editor externo",
+  "Jump through words in the input": "Pular palavras na entrada",
+  "Close dialogs, cancel requests, or quit application":
+    "Fechar diálogos, cancelar solicitações ou sair do aplicativo",
+  "New line": "Nova linha",
+  "New line (Alt+Enter works for certain linux distros)":
+    "Nova linha (Alt+Enter funciona em certas distros linux)",
+  "Clear the screen": "Limpar a tela",
+  "Open input in external editor": "Abrir entrada no editor externo",
+  "Send message": "Enviar mensagem",
+  "Initializing...": "Inicializando...",
+  "Connecting to MCP servers... ({{connected}}/{{total}})":
+    "Conectando aos servidores MCP... ({{connected}}/{{total}})",
+  "Type your message or @path/to/file": "Digite sua mensagem ou @caminho/do/arquivo",
+  "? for shortcuts": "? para atalhos",
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Pressione 'i' para modo INSERÇÃO e 'Esc' para modo NORMAL.",
-  'Cancel operation / Clear input (double press)':
-    'Cancelar operação / Limpar entrada (pressionar duas vezes)',
-  'Cycle approval modes': 'Alternar modos de aprovação',
-  'Cycle through your prompt history': 'Alternar histórico de prompts',
-  'For a full list of shortcuts, see {{docPath}}':
-    'Para uma lista completa de atalhos, consulte {{docPath}}',
-  'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md',
-  'for help on Qwen Code': 'para ajuda sobre o Qwen Code',
-  'show version info': 'mostrar informações de versão',
-  'submit a bug report': 'enviar um relatório de erro',
-  'About Qwen Code': 'Sobre o Qwen Code',
-  Status: 'Status',
+  "Cancel operation / Clear input (double press)":
+    "Cancelar operação / Limpar entrada (pressionar duas vezes)",
+  "Cycle approval modes": "Alternar modos de aprovação",
+  "Cycle through your prompt history": "Alternar histórico de prompts",
+  "For a full list of shortcuts, see {{docPath}}":
+    "Para uma lista completa de atalhos, consulte {{docPath}}",
+  "docs/keyboard-shortcuts.md": "docs/keyboard-shortcuts.md",
+  "for help on Qwen Code": "para ajuda sobre o Qwen Code",
+  "show version info": "mostrar informações de versão",
+  "submit a bug report": "enviar um relatório de erro",
+  "About Qwen Code": "Sobre o Qwen Code",
+  Status: "Status",
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
-  'Qwen Code': 'Qwen Code',
-  Runtime: 'Runtime',
-  OS: 'SO',
-  Auth: 'Autenticação',
-  'CLI Version': 'Versão da CLI',
-  'Git Commit': 'Commit do Git',
-  Model: 'Modelo',
-  'Fast Model': 'Modelo Rápido',
-  Sandbox: 'Sandbox',
-  'OS Platform': 'Plataforma do SO',
-  'OS Arch': 'Arquitetura do SO',
-  'OS Release': 'Versão do SO',
-  'Node.js Version': 'Versão do Node.js',
-  'NPM Version': 'Versão do NPM',
-  'Session ID': 'ID da Sessão',
-  'Auth Method': 'Método de Autenticação',
-  'Base URL': 'URL Base',
-  Proxy: 'Proxy',
-  'Memory Usage': 'Uso de Memória',
-  'IDE Client': 'Cliente IDE',
+  "Qwen Code": "Qwen Code",
+  Runtime: "Runtime",
+  OS: "SO",
+  Auth: "Autenticação",
+  "CLI Version": "Versão da CLI",
+  "Git Commit": "Commit do Git",
+  Model: "Modelo",
+  "Fast Model": "Modelo Rápido",
+  Sandbox: "Sandbox",
+  "OS Platform": "Plataforma do SO",
+  "OS Arch": "Arquitetura do SO",
+  "OS Release": "Versão do SO",
+  "Node.js Version": "Versão do Node.js",
+  "NPM Version": "Versão do NPM",
+  "Session ID": "ID da Sessão",
+  "Auth Method": "Método de Autenticação",
+  "Base URL": "URL Base",
+  Proxy: "Proxy",
+  "Memory Usage": "Uso de Memória",
+  "IDE Client": "Cliente IDE",
 
   // ============================================================================
   // Commands - General
   // ============================================================================
-  'Analyzes the project and creates a tailored QWEN.md file.':
-    'Analisa o projeto e cria um arquivo QWEN.md personalizado.',
-  'List available Qwen Code tools. Usage: /tools [desc]':
-    'Listar ferramentas Qwen Code disponíveis. Uso: /tools [desc]',
-  'List available skills.': 'Listar habilidades disponíveis.',
-  'Available Qwen Code CLI tools:': 'Ferramentas CLI do Qwen Code disponíveis:',
-  'No tools available': 'Nenhuma ferramenta disponível',
-  'View or change the approval mode for tool usage':
-    'Ver ou alterar o modo de aprovação para uso de ferramentas',
+  "Analyzes the project and creates a tailored QWEN.md file.":
+    "Analisa o projeto e cria um arquivo QWEN.md personalizado.",
+  "List available Qwen Code tools. Usage: /tools [desc]":
+    "Listar ferramentas Qwen Code disponíveis. Uso: /tools [desc]",
+  "List available skills.": "Listar habilidades disponíveis.",
+  "Available Qwen Code CLI tools:": "Ferramentas CLI do Qwen Code disponíveis:",
+  "No tools available": "Nenhuma ferramenta disponível",
+  "View or change the approval mode for tool usage":
+    "Ver ou alterar o modo de aprovação para uso de ferramentas",
   'Invalid approval mode "{{arg}}". Valid modes: {{modes}}':
     'Modo de aprovação inválido "{{arg}}". Modos válidos: {{modes}}',
-  'Approval mode set to "{{mode}}"':
-    'Modo de aprovação definido como "{{mode}}"',
-  'View or change the language setting':
-    'Ver ou alterar a configuração de idioma',
-  'change the theme': 'alterar o tema',
-  'Select Theme': 'Selecionar Tema',
-  Preview: 'Visualizar',
-  '(Use Enter to select, Tab to configure scope)':
-    '(Use Enter para selecionar, Tab para configurar o escopo)',
-  '(Use Enter to apply scope, Tab to go back)':
-    '(Use Enter para aplicar o escopo, Tab para voltar)',
-  'Theme configuration unavailable due to NO_COLOR env variable.':
-    'Configuração de tema indisponível devido à variável de ambiente NO_COLOR.',
+  'Approval mode set to "{{mode}}"': 'Modo de aprovação definido como "{{mode}}"',
+  "View or change the language setting": "Ver ou alterar a configuração de idioma",
+  "change the theme": "alterar o tema",
+  "Select Theme": "Selecionar Tema",
+  Preview: "Visualizar",
+  "(Use Enter to select, Tab to configure scope)":
+    "(Use Enter para selecionar, Tab para configurar o escopo)",
+  "(Use Enter to apply scope, Tab to go back)":
+    "(Use Enter para aplicar o escopo, Tab para voltar)",
+  "Theme configuration unavailable due to NO_COLOR env variable.":
+    "Configuração de tema indisponível devido à variável de ambiente NO_COLOR.",
   'Theme "{{themeName}}" not found.': 'Tema "{{themeName}}" não encontrado.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Tema "{{themeName}}" não encontrado no escopo selecionado.',
-  'Clear conversation history and free up context':
-    'Limpar histórico de conversa e liberar contexto',
-  'Compresses the context by replacing it with a summary.':
-    'Comprime o contexto substituindo-o por um resumo.',
-  'open full Qwen Code documentation in your browser':
-    'abrir documentação completa do Qwen Code no seu navegador',
-  'Configuration not available.': 'Configuração não disponível.',
-  'change the auth method': 'alterar o método de autenticação',
-  'Configure authentication information for login':
-    'Configurar informações de autenticação para login',
-  'Copy the last result or code snippet to clipboard':
-    'Copiar o último resultado ou trecho de código para a área de transferência',
+  "Clear conversation history and free up context":
+    "Limpar histórico de conversa e liberar contexto",
+  "Compresses the context by replacing it with a summary.":
+    "Comprime o contexto substituindo-o por um resumo.",
+  "open full Qwen Code documentation in your browser":
+    "abrir documentação completa do Qwen Code no seu navegador",
+  "Configuration not available.": "Configuração não disponível.",
+  "change the auth method": "alterar o método de autenticação",
+  "Configure authentication information for login":
+    "Configurar informações de autenticação para login",
+  "Copy the last result or code snippet to clipboard":
+    "Copiar o último resultado ou trecho de código para a área de transferência",
 
   // ============================================================================
   // Commands - Agents
   // ============================================================================
-  'Manage subagents for specialized task delegation.':
-    'Gerenciar subagentes para delegação de tarefas especializadas.',
-  'Manage existing subagents (view, edit, delete).':
-    'Gerenciar subagentes existentes (ver, editar, excluir).',
-  'Create a new subagent with guided setup.':
-    'Criar um novo subagente com configuração guiada.',
+  "Manage subagents for specialized task delegation.":
+    "Gerenciar subagentes para delegação de tarefas especializadas.",
+  "Manage existing subagents (view, edit, delete).":
+    "Gerenciar subagentes existentes (ver, editar, excluir).",
+  "Create a new subagent with guided setup.": "Criar um novo subagente com configuração guiada.",
 
   // ============================================================================
   // Agents - Management Dialog
   // ============================================================================
-  Agents: 'Agentes',
-  'Choose Action': 'Escolher Ação',
-  'Edit {{name}}': 'Editar {{name}}',
-  'Edit Tools: {{name}}': 'Editar Ferramentas: {{name}}',
-  'Edit Color: {{name}}': 'Editar Cor: {{name}}',
-  'Delete {{name}}': 'Excluir {{name}}',
-  'Unknown Step': 'Etapa Desconhecida',
-  'Esc to close': 'Esc para fechar',
-  'Enter to select, ↑↓ to navigate, Esc to close':
-    'Enter para selecionar, ↑↓ para navegar, Esc para fechar',
-  'Esc to go back': 'Esc para voltar',
-  'Enter to confirm, Esc to cancel': 'Enter para confirmar, Esc para cancelar',
-  'Enter to select, ↑↓ to navigate, Esc to go back':
-    'Enter para selecionar, ↑↓ para navegar, Esc para voltar',
-  'Enter to submit, Esc to go back': 'Enter para enviar, Esc para voltar',
-  'Invalid step: {{step}}': 'Etapa inválida: {{step}}',
-  'No subagents found.': 'Nenhum subagente encontrado.',
+  Agents: "Agentes",
+  "Choose Action": "Escolher Ação",
+  "Edit {{name}}": "Editar {{name}}",
+  "Edit Tools: {{name}}": "Editar Ferramentas: {{name}}",
+  "Edit Color: {{name}}": "Editar Cor: {{name}}",
+  "Delete {{name}}": "Excluir {{name}}",
+  "Unknown Step": "Etapa Desconhecida",
+  "Esc to close": "Esc para fechar",
+  "Enter to select, ↑↓ to navigate, Esc to close":
+    "Enter para selecionar, ↑↓ para navegar, Esc para fechar",
+  "Esc to go back": "Esc para voltar",
+  "Enter to confirm, Esc to cancel": "Enter para confirmar, Esc para cancelar",
+  "Enter to select, ↑↓ to navigate, Esc to go back":
+    "Enter para selecionar, ↑↓ para navegar, Esc para voltar",
+  "Enter to submit, Esc to go back": "Enter para enviar, Esc para voltar",
+  "Invalid step: {{step}}": "Etapa inválida: {{step}}",
+  "No subagents found.": "Nenhum subagente encontrado.",
   "Use '/agents create' to create your first subagent.":
     "Use '/agents create' para criar seu primeiro subagente.",
-  '(built-in)': '(integrado)',
-  '(overridden by project level agent)':
-    '(substituído por agente de nível de projeto)',
-  'Project Level ({{path}})': 'Nível de Projeto ({{path}})',
-  'User Level ({{path}})': 'Nível de Usuário ({{path}})',
-  'Built-in Agents': 'Agentes Integrados',
-  'Extension Agents': 'Agentes de Extensão',
-  'Using: {{count}} agents': 'Usando: {{count}} agentes',
-  'View Agent': 'Ver Agente',
-  'Edit Agent': 'Editar Agente',
-  'Delete Agent': 'Excluir Agente',
-  Back: 'Voltar',
-  'No agent selected': 'Nenhum agente selecionado',
-  'File Path: ': 'Caminho do Arquivo: ',
-  'Tools: ': 'Ferramentas: ',
-  'Color: ': 'Cor: ',
-  'Description:': 'Descrição:',
-  'System Prompt:': 'Prompt do Sistema:',
-  'Open in editor': 'Abrir no editor',
-  'Edit tools': 'Editar ferramentas',
-  'Edit color': 'Editar cor',
-  '❌ Error:': '❌ Erro:',
+  "(built-in)": "(integrado)",
+  "(overridden by project level agent)": "(substituído por agente de nível de projeto)",
+  "Project Level ({{path}})": "Nível de Projeto ({{path}})",
+  "User Level ({{path}})": "Nível de Usuário ({{path}})",
+  "Built-in Agents": "Agentes Integrados",
+  "Extension Agents": "Agentes de Extensão",
+  "Using: {{count}} agents": "Usando: {{count}} agentes",
+  "View Agent": "Ver Agente",
+  "Edit Agent": "Editar Agente",
+  "Delete Agent": "Excluir Agente",
+  Back: "Voltar",
+  "No agent selected": "Nenhum agente selecionado",
+  "File Path: ": "Caminho do Arquivo: ",
+  "Tools: ": "Ferramentas: ",
+  "Color: ": "Cor: ",
+  "Description:": "Descrição:",
+  "System Prompt:": "Prompt do Sistema:",
+  "Open in editor": "Abrir no editor",
+  "Edit tools": "Editar ferramentas",
+  "Edit color": "Editar cor",
+  "❌ Error:": "❌ Erro:",
   'Are you sure you want to delete agent "{{name}}"?':
     'Tem certeza que deseja excluir o agente "{{name}}"?',
 
   // ============================================================================
   // Agents - Creation Wizard
   // ============================================================================
-  'Project Level (.qwen/agents/)': 'Nível de Projeto (.qwen/agents/)',
-  'User Level (~/.qwen/agents/)': 'Nível de Usuário (~/.qwen/agents/)',
-  '✅ Subagent Created Successfully!': '✅ Subagente criado com sucesso!',
+  "Project Level (.qwen/agents/)": "Nível de Projeto (.qwen/agents/)",
+  "User Level (~/.qwen/agents/)": "Nível de Usuário (~/.qwen/agents/)",
+  "✅ Subagent Created Successfully!": "✅ Subagente criado com sucesso!",
   'Subagent "{{name}}" has been saved to {{level}} level.':
     'O subagente "{{name}}" foi salvo no nível {{level}}.',
-  'Name: ': 'Nome: ',
-  'Location: ': 'Localização: ',
-  '❌ Error saving subagent:': '❌ Erro ao salvar subagente:',
-  'Warnings:': 'Avisos:',
+  "Name: ": "Nome: ",
+  "Location: ": "Localização: ",
+  "❌ Error saving subagent:": "❌ Erro ao salvar subagente:",
+  "Warnings:": "Avisos:",
   'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent':
     'O nome "{{name}}" já existe no nível {{level}} - o subagente existente será substituído',
   'Name "{{name}}" exists at user level - project level will take precedence':
     'O nome "{{name}}" existe no nível de usuário - o nível de projeto terá precedência',
   'Name "{{name}}" exists at project level - existing subagent will take precedence':
     'O nome "{{name}}" existe no nível de projeto - o subagente existente terá precedência',
-  'Description is over {{length}} characters':
-    'A descrição tem mais de {{length}} caracteres',
-  'System prompt is over {{length}} characters':
-    'O prompt do sistema tem mais de {{length}} caracteres',
+  "Description is over {{length}} characters": "A descrição tem mais de {{length}} caracteres",
+  "System prompt is over {{length}} characters":
+    "O prompt do sistema tem mais de {{length}} caracteres",
 
   // ============================================================================
   // Agents - Creation Wizard Steps
   // ============================================================================
-  'Step {{n}}: Choose Location': 'Etapa {{n}}: Escolher Localização',
-  'Step {{n}}: Choose Generation Method':
-    'Etapa {{n}}: Escolher Método de Geração',
-  'Generate with Qwen Code (Recommended)': 'Gerar com Qwen Code (Recomendado)',
-  'Manual Creation': 'Criação Manual',
-  'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)':
-    'Descreva o que este subagente deve fazer e quando deve ser usado. (Seja abrangente para melhores resultados)',
-  'e.g., Expert code reviewer that reviews code based on best practices...':
-    'ex: Revisor de código especialista que revisa código com base em melhores práticas...',
-  'Generating subagent configuration...':
-    'Gerando configuração do subagente...',
-  'Failed to generate subagent: {{error}}':
-    'Falha ao gerar subagente: {{error}}',
-  'Step {{n}}: Describe Your Subagent': 'Etapa {{n}}: Descreva Seu Subagente',
-  'Step {{n}}: Enter Subagent Name': 'Etapa {{n}}: Digite o Nome do Subagente',
-  'Step {{n}}: Enter System Prompt': 'Etapa {{n}}: Digite o Prompt do Sistema',
-  'Step {{n}}: Enter Description': 'Etapa {{n}}: Digite a Descrição',
+  "Step {{n}}: Choose Location": "Etapa {{n}}: Escolher Localização",
+  "Step {{n}}: Choose Generation Method": "Etapa {{n}}: Escolher Método de Geração",
+  "Generate with Qwen Code (Recommended)": "Gerar com Qwen Code (Recomendado)",
+  "Manual Creation": "Criação Manual",
+  "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)":
+    "Descreva o que este subagente deve fazer e quando deve ser usado. (Seja abrangente para melhores resultados)",
+  "e.g., Expert code reviewer that reviews code based on best practices...":
+    "ex: Revisor de código especialista que revisa código com base em melhores práticas...",
+  "Generating subagent configuration...": "Gerando configuração do subagente...",
+  "Failed to generate subagent: {{error}}": "Falha ao gerar subagente: {{error}}",
+  "Step {{n}}: Describe Your Subagent": "Etapa {{n}}: Descreva Seu Subagente",
+  "Step {{n}}: Enter Subagent Name": "Etapa {{n}}: Digite o Nome do Subagente",
+  "Step {{n}}: Enter System Prompt": "Etapa {{n}}: Digite o Prompt do Sistema",
+  "Step {{n}}: Enter Description": "Etapa {{n}}: Digite a Descrição",
 
   // ============================================================================
   // Agents - Tool Selection
   // ============================================================================
-  'Step {{n}}: Select Tools': 'Etapa {{n}}: Selecionar Ferramentas',
-  'All Tools (Default)': 'Todas as Ferramentas (Padrão)',
-  'All Tools': 'Todas as Ferramentas',
-  'Read-only Tools': 'Ferramentas de Somente Leitura',
-  'Read & Edit Tools': 'Ferramentas de Leitura e Edição',
-  'Read & Edit & Execution Tools': 'Ferramentas de Leitura, Edição e Execução',
-  'All tools selected, including MCP tools':
-    'Todas as ferramentas selecionadas, incluindo ferramentas MCP',
-  'Selected tools:': 'Ferramentas selecionadas:',
-  'Read-only tools:': 'Ferramentas de somente leitura:',
-  'Edit tools:': 'Ferramentas de edição:',
-  'Execution tools:': 'Ferramentas de execução:',
-  'Step {{n}}: Choose Background Color': 'Etapa {{n}}: Escolher Cor de Fundo',
-  'Step {{n}}: Confirm and Save': 'Etapa {{n}}: Confirmar e Salvar',
+  "Step {{n}}: Select Tools": "Etapa {{n}}: Selecionar Ferramentas",
+  "All Tools (Default)": "Todas as Ferramentas (Padrão)",
+  "All Tools": "Todas as Ferramentas",
+  "Read-only Tools": "Ferramentas de Somente Leitura",
+  "Read & Edit Tools": "Ferramentas de Leitura e Edição",
+  "Read & Edit & Execution Tools": "Ferramentas de Leitura, Edição e Execução",
+  "All tools selected, including MCP tools":
+    "Todas as ferramentas selecionadas, incluindo ferramentas MCP",
+  "Selected tools:": "Ferramentas selecionadas:",
+  "Read-only tools:": "Ferramentas de somente leitura:",
+  "Edit tools:": "Ferramentas de edição:",
+  "Execution tools:": "Ferramentas de execução:",
+  "Step {{n}}: Choose Background Color": "Etapa {{n}}: Escolher Cor de Fundo",
+  "Step {{n}}: Confirm and Save": "Etapa {{n}}: Confirmar e Salvar",
 
   // ============================================================================
   // Agents - Navigation & Instructions
   // ============================================================================
-  'Esc to cancel': 'Esc para cancelar',
-  'Press Enter to save, e to save and edit, Esc to go back':
-    'Pressione Enter para salvar, e para salvar e editar, Esc para voltar',
-  'Press Enter to continue, {{navigation}}Esc to {{action}}':
-    'Pressione Enter para continuar, {{navigation}}Esc para {{action}}',
-  cancel: 'cancelar',
-  'go back': 'voltar',
-  '↑↓ to navigate, ': '↑↓ para navegar, ',
-  'Enter a clear, unique name for this subagent.':
-    'Digite um nome claro e único para este subagente.',
-  'e.g., Code Reviewer': 'ex: Revisor de Código',
-  'Name cannot be empty.': 'O nome não pode estar vazio.',
+  "Esc to cancel": "Esc para cancelar",
+  "Press Enter to save, e to save and edit, Esc to go back":
+    "Pressione Enter para salvar, e para salvar e editar, Esc para voltar",
+  "Press Enter to continue, {{navigation}}Esc to {{action}}":
+    "Pressione Enter para continuar, {{navigation}}Esc para {{action}}",
+  cancel: "cancelar",
+  "go back": "voltar",
+  "↑↓ to navigate, ": "↑↓ para navegar, ",
+  "Enter a clear, unique name for this subagent.":
+    "Digite um nome claro e único para este subagente.",
+  "e.g., Code Reviewer": "ex: Revisor de Código",
+  "Name cannot be empty.": "O nome não pode estar vazio.",
   "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.":
-    'Escreva o prompt do sistema que define o comportamento deste subagente. Seja abrangente para melhores resultados.',
-  'e.g., You are an expert code reviewer...':
-    'ex: Você é um revisor de código especialista...',
-  'System prompt cannot be empty.': 'O prompt do sistema não pode estar vazio.',
-  'Describe when and how this subagent should be used.':
-    'Descreva quando e como este subagente deve ser usado.',
-  'e.g., Reviews code for best practices and potential bugs.':
-    'ex: Revisa o código em busca de melhores práticas e erros potenciais.',
-  'Description cannot be empty.': 'A descrição não pode estar vazia.',
-  'Failed to launch editor: {{error}}': 'Falha ao iniciar editor: {{error}}',
-  'Failed to save and edit subagent: {{error}}':
-    'Falha ao salvar e editar subagente: {{error}}',
+    "Escreva o prompt do sistema que define o comportamento deste subagente. Seja abrangente para melhores resultados.",
+  "e.g., You are an expert code reviewer...": "ex: Você é um revisor de código especialista...",
+  "System prompt cannot be empty.": "O prompt do sistema não pode estar vazio.",
+  "Describe when and how this subagent should be used.":
+    "Descreva quando e como este subagente deve ser usado.",
+  "e.g., Reviews code for best practices and potential bugs.":
+    "ex: Revisa o código em busca de melhores práticas e erros potenciais.",
+  "Description cannot be empty.": "A descrição não pode estar vazia.",
+  "Failed to launch editor: {{error}}": "Falha ao iniciar editor: {{error}}",
+  "Failed to save and edit subagent: {{error}}": "Falha ao salvar e editar subagente: {{error}}",
 
   // ============================================================================
   // Commands - General (continued)
   // ============================================================================
-  'View and edit Qwen Code settings': 'Ver e editar configurações do Qwen Code',
-  Settings: 'Configurações',
-  'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
-    'Para ver as alterações, o Qwen Code deve ser reiniciado. Pressione r para sair e aplicar as alterações agora.',
+  "View and edit Qwen Code settings": "Ver e editar configurações do Qwen Code",
+  Settings: "Configurações",
+  "To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.":
+    "Para ver as alterações, o Qwen Code deve ser reiniciado. Pressione r para sair e aplicar as alterações agora.",
   'The command "/{{command}}" is not supported in non-interactive mode.':
     'O comando "/{{command}}" não é suportado no modo não interativo.',
 
   // ============================================================================
   // Settings Labels
   // ============================================================================
-  'Vim Mode': 'Modo Vim',
-  'Disable Auto Update': 'Desativar Atualização Automática',
-  'Attribution: commit': 'Atribuição: commit',
-  'Terminal Bell Notification': 'Notificação Sonora do Terminal',
-  'Enable Usage Statistics': 'Ativar Estatísticas de Uso',
-  Theme: 'Tema',
-  'Preferred Editor': 'Editor Preferido',
-  'Auto-connect to IDE': 'Conexão Automática com IDE',
-  'Enable Prompt Completion': 'Ativar Autocompletar de Prompts',
-  'Debug Keystroke Logging': 'Log de Depuração de Teclas',
-  'Language: UI': 'Idioma: Interface',
-  'Language: Model': 'Idioma: Modelo',
-  'Output Format': 'Formato de Saída',
-  'Hide Window Title': 'Ocultar Título da Janela',
-  'Show Status in Title': 'Mostrar Status no Título',
-  'Hide Tips': 'Ocultar Dicas',
-  'Show Line Numbers in Code': 'Mostrar Números de Linhas no Código',
-  'Show Citations': 'Mostrar Citações',
-  'Custom Witty Phrases': 'Frases de Efeito Personalizadas',
-  'Show Welcome Back Dialog': 'Mostrar Diálogo de Bem-vindo de Volta',
-  'Enable User Feedback': 'Ativar Feedback do Usuário',
-  'How is Qwen doing this session? (optional)':
-    'Como o Qwen está se saindo nesta sessão? (opcional)',
-  Bad: 'Ruim',
-  Fine: 'Bom',
-  Good: 'Ótimo',
-  Dismiss: 'Ignorar',
-  'Not Sure Yet': 'Não tenho certeza ainda',
-  'Any other key': 'Qualquer outra tecla',
-  'Disable Loading Phrases': 'Desativar Frases de Carregamento',
-  'Screen Reader Mode': 'Modo de Leitor de Tela',
-  'IDE Mode': 'Modo IDE',
-  'Max Session Turns': 'Máximo de Turnos da Sessão',
-  'Skip Next Speaker Check': 'Pular Verificação do Próximo Falante',
-  'Skip Loop Detection': 'Pular Detecção de Loop',
-  'Skip Startup Context': 'Pular Contexto de Inicialização',
-  'Enable OpenAI Logging': 'Ativar Log do OpenAI',
-  'OpenAI Logging Directory': 'Diretório de Log do OpenAI',
-  Timeout: 'Tempo Limite',
-  'Max Retries': 'Máximo de Tentativas',
-  'Disable Cache Control': 'Desativar Controle de Cache',
-  'Memory Discovery Max Dirs': 'Descoberta de Memória Máx. Diretorios',
-  'Load Memory From Include Directories':
-    'Carregar Memória de Diretórios Incluídos',
-  'Respect .gitignore': 'Respeitar .gitignore',
-  'Respect .qwenignore': 'Respeitar .qwenignore',
-  'Enable Recursive File Search': 'Ativar Pesquisa Recursiva de Arquivos',
-  'Disable Fuzzy Search': 'Desativar Pesquisa Difusa',
-  'Interactive Shell (PTY)': 'Shell Interativo (PTY)',
-  'Show Color': 'Mostrar Cores',
-  'Auto Accept': 'Aceitar Automaticamente',
-  'Use Ripgrep': 'Usar Ripgrep',
-  'Use Builtin Ripgrep': 'Usar Ripgrep Integrado',
-  'Enable Tool Output Truncation': 'Ativar Truncamento de Saída de Ferramenta',
-  'Tool Output Truncation Threshold':
-    'Limite de Truncamento de Saída de Ferramenta',
-  'Tool Output Truncation Lines':
-    'Linhas de Truncamento de Saída de Ferramenta',
-  'Folder Trust': 'Confiança de Pasta',
-  'Vision Model Preview': 'Visualização de Modelo de Visão',
-  'Tool Schema Compliance': 'Conformidade de Esquema de Ferramenta',
+  "Vim Mode": "Modo Vim",
+  "Disable Auto Update": "Desativar Atualização Automática",
+  "Attribution: commit": "Atribuição: commit",
+  "Terminal Bell Notification": "Notificação Sonora do Terminal",
+  "Enable Usage Statistics": "Ativar Estatísticas de Uso",
+  Theme: "Tema",
+  "Preferred Editor": "Editor Preferido",
+  "Auto-connect to IDE": "Conexão Automática com IDE",
+  "Enable Prompt Completion": "Ativar Autocompletar de Prompts",
+  "Debug Keystroke Logging": "Log de Depuração de Teclas",
+  "Language: UI": "Idioma: Interface",
+  "Language: Model": "Idioma: Modelo",
+  "Output Format": "Formato de Saída",
+  "Hide Window Title": "Ocultar Título da Janela",
+  "Show Status in Title": "Mostrar Status no Título",
+  "Hide Tips": "Ocultar Dicas",
+  "Show Line Numbers in Code": "Mostrar Números de Linhas no Código",
+  "Show Citations": "Mostrar Citações",
+  "Custom Witty Phrases": "Frases de Efeito Personalizadas",
+  "Show Welcome Back Dialog": "Mostrar Diálogo de Bem-vindo de Volta",
+  "Enable User Feedback": "Ativar Feedback do Usuário",
+  "How is Qwen doing this session? (optional)":
+    "Como o Qwen está se saindo nesta sessão? (opcional)",
+  Bad: "Ruim",
+  Fine: "Bom",
+  Good: "Ótimo",
+  Dismiss: "Ignorar",
+  "Not Sure Yet": "Não tenho certeza ainda",
+  "Any other key": "Qualquer outra tecla",
+  "Disable Loading Phrases": "Desativar Frases de Carregamento",
+  "Screen Reader Mode": "Modo de Leitor de Tela",
+  "IDE Mode": "Modo IDE",
+  "Max Session Turns": "Máximo de Turnos da Sessão",
+  "Skip Next Speaker Check": "Pular Verificação do Próximo Falante",
+  "Skip Loop Detection": "Pular Detecção de Loop",
+  "Skip Startup Context": "Pular Contexto de Inicialização",
+  "Enable OpenAI Logging": "Ativar Log do OpenAI",
+  "OpenAI Logging Directory": "Diretório de Log do OpenAI",
+  Timeout: "Tempo Limite",
+  "Max Retries": "Máximo de Tentativas",
+  "Disable Cache Control": "Desativar Controle de Cache",
+  "Memory Discovery Max Dirs": "Descoberta de Memória Máx. Diretorios",
+  "Load Memory From Include Directories": "Carregar Memória de Diretórios Incluídos",
+  "Respect .gitignore": "Respeitar .gitignore",
+  "Respect .qwenignore": "Respeitar .qwenignore",
+  "Enable Recursive File Search": "Ativar Pesquisa Recursiva de Arquivos",
+  "Disable Fuzzy Search": "Desativar Pesquisa Difusa",
+  "Interactive Shell (PTY)": "Shell Interativo (PTY)",
+  "Show Color": "Mostrar Cores",
+  "Auto Accept": "Aceitar Automaticamente",
+  "Use Ripgrep": "Usar Ripgrep",
+  "Use Builtin Ripgrep": "Usar Ripgrep Integrado",
+  "Enable Tool Output Truncation": "Ativar Truncamento de Saída de Ferramenta",
+  "Tool Output Truncation Threshold": "Limite de Truncamento de Saída de Ferramenta",
+  "Tool Output Truncation Lines": "Linhas de Truncamento de Saída de Ferramenta",
+  "Folder Trust": "Confiança de Pasta",
+  "Vision Model Preview": "Visualização de Modelo de Visão",
+  "Tool Schema Compliance": "Conformidade de Esquema de Ferramenta",
 
   // Settings enum options
-  'Auto (detect from system)': 'Automático (detectar do sistema)',
-  Text: 'Texto',
-  JSON: 'JSON',
-  Plan: 'Planejamento',
-  Default: 'Padrão',
-  'Auto Edit': 'Edição Automática',
-  YOLO: 'YOLO',
-  'toggle vim mode on/off': 'alternar modo vim ligado/desligado',
-  'check session stats. Usage: /stats [model|tools]':
-    'verificar estatísticas da sessão. Uso: /stats [model|tools]',
-  'Show model-specific usage statistics.':
-    'Mostrar estatísticas de uso específicas do modelo.',
-  'Show tool-specific usage statistics.':
-    'Mostrar estatísticas de uso específicas da ferramenta.',
-  'exit the cli': 'sair da cli',
-  'Open MCP management dialog, or authenticate with OAuth-enabled servers':
-    'Abrir diálogo de gerenciamento MCP ou autenticar com servidor habilitado para OAuth',
-  'List configured MCP servers and tools, or authenticate with OAuth-enabled servers':
-    'Listar servidores e ferramentas MCP configurados, ou autenticar com servidores habilitados para OAuth',
-  'Manage workspace directories': 'Gerenciar diretórios do workspace',
-  'Add directories to the workspace. Use comma to separate multiple paths':
-    'Adicionar diretórios ao workspace. Use vírgula para separar vários caminhos',
-  'Show all directories in the workspace':
-    'Mostrar todos os diretórios no workspace',
-  'set external editor preference': 'definir preferência de editor externo',
-  'Select Editor': 'Selecionar Editor',
-  'Editor Preference': 'Preferência de Editor',
-  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
-    'Estes editores são suportados atualmente. Note que alguns editores não podem ser usados no modo sandbox.',
-  'Your preferred editor is:': 'Seu editor preferido é:',
-  'Manage extensions': 'Gerenciar extensões',
-  'Manage installed extensions': 'Gerenciar extensões instaladas',
-  'List active extensions': 'Listar extensões ativas',
-  'Update extensions. Usage: update <extension-names>|--all':
-    'Atualizar extensões. Uso: update <nomes-das-extensoes>|--all',
-  'Disable an extension': 'Desativar uma extensão',
-  'Enable an extension': 'Ativar uma extensão',
-  'Install an extension from a git repo or local path':
-    'Instalar uma extensão de um repositório git ou caminho local',
-  'Uninstall an extension': 'Desinstalar uma extensão',
-  'No extensions installed.': 'Nenhuma extensão instalada.',
-  'Usage: /extensions update <extension-names>|--all':
-    'Uso: /extensions update <nomes-das-extensoes>|--all',
+  "Auto (detect from system)": "Automático (detectar do sistema)",
+  Text: "Texto",
+  JSON: "JSON",
+  Plan: "Planejamento",
+  Default: "Padrão",
+  "Auto Edit": "Edição Automática",
+  YOLO: "YOLO",
+  "toggle vim mode on/off": "alternar modo vim ligado/desligado",
+  "check session stats. Usage: /stats [model|tools]":
+    "verificar estatísticas da sessão. Uso: /stats [model|tools]",
+  "Show model-specific usage statistics.": "Mostrar estatísticas de uso específicas do modelo.",
+  "Show tool-specific usage statistics.": "Mostrar estatísticas de uso específicas da ferramenta.",
+  "exit the cli": "sair da cli",
+  "Open MCP management dialog, or authenticate with OAuth-enabled servers":
+    "Abrir diálogo de gerenciamento MCP ou autenticar com servidor habilitado para OAuth",
+  "List configured MCP servers and tools, or authenticate with OAuth-enabled servers":
+    "Listar servidores e ferramentas MCP configurados, ou autenticar com servidores habilitados para OAuth",
+  "Manage workspace directories": "Gerenciar diretórios do workspace",
+  "Add directories to the workspace. Use comma to separate multiple paths":
+    "Adicionar diretórios ao workspace. Use vírgula para separar vários caminhos",
+  "Show all directories in the workspace": "Mostrar todos os diretórios no workspace",
+  "set external editor preference": "definir preferência de editor externo",
+  "Select Editor": "Selecionar Editor",
+  "Editor Preference": "Preferência de Editor",
+  "These editors are currently supported. Please note that some editors cannot be used in sandbox mode.":
+    "Estes editores são suportados atualmente. Note que alguns editores não podem ser usados no modo sandbox.",
+  "Your preferred editor is:": "Seu editor preferido é:",
+  "Manage extensions": "Gerenciar extensões",
+  "Manage installed extensions": "Gerenciar extensões instaladas",
+  "List active extensions": "Listar extensões ativas",
+  "Update extensions. Usage: update <extension-names>|--all":
+    "Atualizar extensões. Uso: update <nomes-das-extensoes>|--all",
+  "Disable an extension": "Desativar uma extensão",
+  "Enable an extension": "Ativar uma extensão",
+  "Install an extension from a git repo or local path":
+    "Instalar uma extensão de um repositório git ou caminho local",
+  "Uninstall an extension": "Desinstalar uma extensão",
+  "No extensions installed.": "Nenhuma extensão instalada.",
+  "Usage: /extensions update <extension-names>|--all":
+    "Uso: /extensions update <nomes-das-extensoes>|--all",
   'Extension "{{name}}" not found.': 'Extensão "{{name}}" não encontrada.',
-  'No extensions to update.': 'Nenhuma extensão para atualizar.',
-  'Usage: /extensions install <source>': 'Uso: /extensions install <fonte>',
-  'Installing extension from "{{source}}"...':
-    'Instalando extensão de "{{source}}"...',
-  'Extension "{{name}}" installed successfully.':
-    'Extensão "{{name}}" instalada com sucesso.',
+  "No extensions to update.": "Nenhuma extensão para atualizar.",
+  "Usage: /extensions install <source>": "Uso: /extensions install <fonte>",
+  'Installing extension from "{{source}}"...': 'Instalando extensão de "{{source}}"...',
+  'Extension "{{name}}" installed successfully.': 'Extensão "{{name}}" instalada com sucesso.',
   'Failed to install extension from "{{source}}": {{error}}':
     'Falha ao instalar extensão de "{{source}}": {{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    'Uso: /extensions uninstall <nome-da-extensao>',
-  'Uninstalling extension "{{name}}"...':
-    'Desinstalando extensão "{{name}}"...',
-  'Extension "{{name}}" uninstalled successfully.':
-    'Extensão "{{name}}" desinstalada com sucesso.',
+  "Usage: /extensions uninstall <extension-name>": "Uso: /extensions uninstall <nome-da-extensao>",
+  'Uninstalling extension "{{name}}"...': 'Desinstalando extensão "{{name}}"...',
+  'Extension "{{name}}" uninstalled successfully.': 'Extensão "{{name}}" desinstalada com sucesso.',
   'Failed to uninstall extension "{{name}}": {{error}}':
     'Falha ao desinstalar extensão "{{name}}": {{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    'Uso: /extensions {{command}} <extensao> [--scope=<user|workspace>]',
+  "Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]":
+    "Uso: /extensions {{command}} <extensao> [--scope=<user|workspace>]",
   'Unsupported scope "{{scope}}", deve ser um de "user" ou "workspace"':
     'Escopo não suportado "{{scope}}", deve ser um de "user" ou "workspace"',
   'Extension "{{name}}" disabled for scope "{{scope}}"':
     'Extensão "{{name}}" desativada para o escopo "{{scope}}"',
   'Extension "{{name}}" enabled for scope "{{scope}}"':
     'Extensão "{{name}}" ativada para o escopo "{{scope}}"',
-  'Do you want to continue? [Y/n]: ': 'Você deseja continuar? [Y/n]: ',
-  'Do you want to continue?': 'Você deseja continuar?',
+  "Do you want to continue? [Y/n]: ": "Você deseja continuar? [Y/n]: ",
+  "Do you want to continue?": "Você deseja continuar?",
   'Installing extension "{{name}}".': 'Instalando extensão "{{name}}".',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**As extensões podem introduzir comportamentos inesperados. Certifique-se de ter investigado a fonte da extensão e confie no autor.**',
-  'This extension will run the following MCP servers:':
-    'Esta extensão executará os seguintes servidores MCP:',
-  local: 'local',
-  remote: 'remoto',
-  'This extension will add the following commands: {{commands}}.':
-    'Esta extensão adicionará os seguintes comandos: {{commands}}.',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    'Esta extensão anexará informações ao seu contexto QWEN.md usando {{fileName}}',
-  'This extension will exclude the following core tools: {{tools}}':
-    'Esta extensão excluirá as seguintes ferramentas principais: {{tools}}',
-  'This extension will install the following skills:':
-    'Esta extensão instalará as seguintes habilidades:',
-  'This extension will install the following subagents:':
-    'Esta extensão instalará os seguintes subagentes:',
-  'Installation cancelled for "{{name}}".':
-    'Instalação cancelada para "{{name}}".',
-  'You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.':
-    'Você está instalando uma extensão de {{originSource}}. Alguns recursos podem não funcionar perfeitamente com o Qwen Code.',
-  '--ref and --auto-update are not applicable for marketplace extensions.':
-    '--ref e --auto-update não são aplicáveis para extensões de marketplace.',
+  "**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**":
+    "**As extensões podem introduzir comportamentos inesperados. Certifique-se de ter investigado a fonte da extensão e confie no autor.**",
+  "This extension will run the following MCP servers:":
+    "Esta extensão executará os seguintes servidores MCP:",
+  local: "local",
+  remote: "remoto",
+  "This extension will add the following commands: {{commands}}.":
+    "Esta extensão adicionará os seguintes comandos: {{commands}}.",
+  "This extension will append info to your QWEN.md context using {{fileName}}":
+    "Esta extensão anexará informações ao seu contexto QWEN.md usando {{fileName}}",
+  "This extension will exclude the following core tools: {{tools}}":
+    "Esta extensão excluirá as seguintes ferramentas principais: {{tools}}",
+  "This extension will install the following skills:":
+    "Esta extensão instalará as seguintes habilidades:",
+  "This extension will install the following subagents:":
+    "Esta extensão instalará os seguintes subagentes:",
+  'Installation cancelled for "{{name}}".': 'Instalação cancelada para "{{name}}".',
+  "You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.":
+    "Você está instalando uma extensão de {{originSource}}. Alguns recursos podem não funcionar perfeitamente com o Qwen Code.",
+  "--ref and --auto-update are not applicable for marketplace extensions.":
+    "--ref e --auto-update não são aplicáveis para extensões de marketplace.",
   'Extension "{{name}}" installed successfully and enabled.':
     'Extensão "{{name}}" instalada com sucesso e ativada.',
-  'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).':
-    'Instala uma extensão de uma URL de repositório git, caminho local ou marketplace do claude (marketplace-url:plugin-name).',
-  'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.':
-    'A URL do github, caminho local ou fonte do marketplace (marketplace-url:plugin-name) da extensão para instalar.',
-  'The git ref to install from.': 'A referência git para instalar.',
-  'Enable auto-update for this extension.':
-    'Ativar atualização automática para esta extensão.',
-  'Enable pre-release versions for this extension.':
-    'Ativar versões de pré-lançamento para esta extensão.',
-  'Acknowledge the security risks of installing an extension and skip the confirmation prompt.':
-    'Reconhecer os riscos de segurança de instalar uma extensão e pular o prompt de confirmação.',
-  'The source argument must be provided.':
-    'O argumento fonte deve ser fornecido.',
-  'Extension "{{name}}" successfully uninstalled.':
-    'Extensão "{{name}}" desinstalada com sucesso.',
-  'Uninstalls an extension.': 'Desinstala uma extensão.',
-  'The name or source path of the extension to uninstall.':
-    'O nome ou caminho da fonte da extensão para desinstalar.',
-  'Please include the name of the extension to uninstall as a positional argument.':
-    'Inclua o nome da extensão para desinstalar como um argumento posicional.',
-  'Enables an extension.': 'Ativa uma extensão.',
-  'The name of the extension to enable.': 'O nome da extensão para ativar.',
-  'The scope to enable the extenison in. If not set, will be enabled in all scopes.':
-    'O escopo para ativar a extensão. Se não definido, será ativada em todos os escopos.',
+  "Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).":
+    "Instala uma extensão de uma URL de repositório git, caminho local ou marketplace do claude (marketplace-url:plugin-name).",
+  "The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.":
+    "A URL do github, caminho local ou fonte do marketplace (marketplace-url:plugin-name) da extensão para instalar.",
+  "The git ref to install from.": "A referência git para instalar.",
+  "Enable auto-update for this extension.": "Ativar atualização automática para esta extensão.",
+  "Enable pre-release versions for this extension.":
+    "Ativar versões de pré-lançamento para esta extensão.",
+  "Acknowledge the security risks of installing an extension and skip the confirmation prompt.":
+    "Reconhecer os riscos de segurança de instalar uma extensão e pular o prompt de confirmação.",
+  "The source argument must be provided.": "O argumento fonte deve ser fornecido.",
+  'Extension "{{name}}" successfully uninstalled.': 'Extensão "{{name}}" desinstalada com sucesso.',
+  "Uninstalls an extension.": "Desinstala uma extensão.",
+  "The name or source path of the extension to uninstall.":
+    "O nome ou caminho da fonte da extensão para desinstalar.",
+  "Please include the name of the extension to uninstall as a positional argument.":
+    "Inclua o nome da extensão para desinstalar como um argumento posicional.",
+  "Enables an extension.": "Ativa uma extensão.",
+  "The name of the extension to enable.": "O nome da extensão para ativar.",
+  "The scope to enable the extenison in. If not set, will be enabled in all scopes.":
+    "O escopo para ativar a extensão. Se não definido, será ativada em todos os escopos.",
   'Extension "{{name}}" successfully enabled for scope "{{scope}}".':
     'Extensão "{{name}}" ativada com sucesso para o escopo "{{scope}}".',
   'Extension "{{name}}" successfully enabled in all scopes.':
     'Extensão "{{name}}" ativada com sucesso em todos os escopos.',
-  'Invalid scope: {{scope}}. Please use one of {{scopes}}.':
-    'Escopo inválido: {{scope}}. Use um de {{scopes}}.',
-  'Disables an extension.': 'Desativa uma extensão.',
-  'The name of the extension to disable.': 'O nome da extensão para desativar.',
-  'The scope to disable the extenison in.':
-    'O escopo para desativar a extensão.',
+  "Invalid scope: {{scope}}. Please use one of {{scopes}}.":
+    "Escopo inválido: {{scope}}. Use um de {{scopes}}.",
+  "Disables an extension.": "Desativa uma extensão.",
+  "The name of the extension to disable.": "O nome da extensão para desativar.",
+  "The scope to disable the extenison in.": "O escopo para desativar a extensão.",
   'Extension "{{name}}" successfully disabled for scope "{{scope}}".':
     'Extensão "{{name}}" desativada com sucesso para o escopo "{{scope}}".',
   'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.':
     'Extensão "{{name}}" atualizada com sucesso: {{oldVersion}} → {{newVersion}}.',
   'Unable to install extension "{{name}}" due to missing install metadata':
     'Não foi possível instalar a extensão "{{name}}" devido à falta de metadados de instalação',
-  'Extension "{{name}}" is already up to date.':
-    'A extensão "{{name}}" já está atualizada.',
-  'Updates all extensions or a named extension to the latest version.':
-    'Atualiza todas as extensões ou uma extensão nomeada para a última versão.',
-  'Update all extensions.': 'Atualizar todas as extensões.',
-  'Either an extension name or --all must be provided':
-    'Um nome de extensão ou --all deve ser fornecido',
-  'Lists installed extensions.': 'Lista as extensões instaladas.',
-  'Link extension failed to install.': 'Falha ao instalar link da extensão.',
+  'Extension "{{name}}" is already up to date.': 'A extensão "{{name}}" já está atualizada.',
+  "Updates all extensions or a named extension to the latest version.":
+    "Atualiza todas as extensões ou uma extensão nomeada para a última versão.",
+  "Update all extensions.": "Atualizar todas as extensões.",
+  "Either an extension name or --all must be provided":
+    "Um nome de extensão ou --all deve ser fornecido",
+  "Lists installed extensions.": "Lista as extensões instaladas.",
+  "Link extension failed to install.": "Falha ao instalar link da extensão.",
   'Extension "{{name}}" linked successfully and enabled.':
     'Extensão "{{name}}" vinculada com sucesso e ativada.',
-  'Links an extension from a local path. Updates made to the local path will always be reflected.':
-    'Vincula uma extensão de um caminho local. Atualizações feitas no caminho local sempre serão refletidas.',
-  'The name of the extension to link.': 'O nome da extensão para vincular.',
-  'Set a specific setting for an extension.':
-    'Define uma configuração específica para uma extensão.',
-  'Name of the extension to configure.': 'Nome da extensão para configurar.',
-  'The setting to configure (name or env var).':
-    'A configuração para configurar (nome ou var env).',
-  'The scope to set the setting in.': 'O escopo para definir a configuração.',
-  'List all settings for an extension.':
-    'Listar todas as configurações de uma extensão.',
-  'Name of the extension.': 'Nome da extensão.',
+  "Links an extension from a local path. Updates made to the local path will always be reflected.":
+    "Vincula uma extensão de um caminho local. Atualizações feitas no caminho local sempre serão refletidas.",
+  "The name of the extension to link.": "O nome da extensão para vincular.",
+  "Set a specific setting for an extension.":
+    "Define uma configuração específica para uma extensão.",
+  "Name of the extension to configure.": "Nome da extensão para configurar.",
+  "The setting to configure (name or env var).":
+    "A configuração para configurar (nome ou var env).",
+  "The scope to set the setting in.": "O escopo para definir a configuração.",
+  "List all settings for an extension.": "Listar todas as configurações de uma extensão.",
+  "Name of the extension.": "Nome da extensão.",
   'Extension "{{name}}" has no settings to configure.':
     'A extensão "{{name}}" não tem configurações para configurar.',
   'Settings for "{{name}}":': 'Configurações para "{{name}}":',
-  '(workspace)': '(workspace)',
-  '(user)': '(usuário)',
-  '[not set]': '[não definido]',
-  '[value stored in keychain]': '[valor armazenado no chaveiro]',
-  'Value:': 'Valor:',
-  'Manage extension settings.': 'Gerenciar configurações de extensão.',
-  'You need to specify a command (set or list).':
-    'Você precisa especificar um comando (set ou list).',
+  "(workspace)": "(workspace)",
+  "(user)": "(usuário)",
+  "[not set]": "[não definido]",
+  "[value stored in keychain]": "[valor armazenado no chaveiro]",
+  "Value:": "Valor:",
+  "Manage extension settings.": "Gerenciar configurações de extensão.",
+  "You need to specify a command (set or list).":
+    "Você precisa especificar um comando (set ou list).",
 
   // ============================================================================
   // Plugin Choice / Marketplace
   // ============================================================================
-  'No plugins available in this marketplace.':
-    'Nenhum plugin disponível neste marketplace.',
+  "No plugins available in this marketplace.": "Nenhum plugin disponível neste marketplace.",
   'Select a plugin to install from marketplace "{{name}}":':
     'Selecione um plugin para instalar do marketplace "{{name}}":',
-  'Plugin selection cancelled.': 'Seleção de plugin cancelada.',
+  "Plugin selection cancelled.": "Seleção de plugin cancelada.",
   'Select a plugin from "{{name}}"': 'Selecione um plugin de "{{name}}"',
-  'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel':
-    'Use ↑↓ ou j/k para navegar, Enter para selecionar, Escape para cancelar',
-  '{{count}} more above': '{{count}} mais acima',
-  '{{count}} more below': '{{count}} mais abaixo',
-  'manage IDE integration': 'gerenciar integração com IDE',
-  'check status of IDE integration': 'verificar status da integração com IDE',
-  'install required IDE companion for {{ideName}}':
-    'instalar companion IDE necessário para {{ideName}}',
-  'enable IDE integration': 'ativar integração com IDE',
-  'disable IDE integration': 'desativar integração com IDE',
-  'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.':
-    'A integração com IDE não é suportada no seu ambiente atual. Para usar este recurso, execute o Qwen Code em um destes IDEs suportados: VS Code ou forks do VS Code.',
-  'Set up GitHub Actions': 'Configurar GitHub Actions',
-  'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)':
-    'Configurar atalhos de terminal para entrada multilinhas (VS Code, Cursor, Windsurf, Trae)',
-  'Please restart your terminal for the changes to take effect.':
-    'Reinicie seu terminal para que as alterações tenham efeito.',
-  'Failed to configure terminal: {{error}}':
-    'Falha ao configurar terminal: {{error}}',
-  'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.':
-    'Não foi possível determinar o caminho de configuração de {{terminalName}} no Windows: variável de ambiente APPDATA não está definida.',
-  '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.':
-    '{{terminalName}} keybindings.json existe mas não é um array JSON válido. Corrija o arquivo manualmente ou exclua-o para permitir a configuração automática.',
-  'File: {{file}}': 'Arquivo: {{file}}',
-  'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.':
-    'Falha ao analisar {{terminalName}} keybindings.json. O arquivo contém JSON inválido. Corrija o arquivo manualmente ou exclua-o para permitir a configuração automática.',
-  'Error: {{error}}': 'Erro: {{error}}',
-  'Shift+Enter binding already exists': 'Atalho Shift+Enter já existe',
-  'Ctrl+Enter binding already exists': 'Atalho Ctrl+Enter já existe',
-  'Existing keybindings detected. Will not modify to avoid conflicts.':
-    'Atalhos existentes detectados. Não serão modificados para evitar conflitos.',
-  'Please check and modify manually if needed: {{file}}':
-    'Verifique e modifique manualmente se necessário: {{file}}',
-  'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.':
-    'Adicionados atalhos Shift+Enter e Ctrl+Enter para {{terminalName}}.',
-  'Modified: {{file}}': 'Modificado: {{file}}',
-  '{{terminalName}} keybindings already configured.':
-    'Atalhos de {{terminalName}} já configurados.',
-  'Failed to configure {{terminalName}}.':
-    'Falha ao configurar {{terminalName}}.',
-  'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).':
-    'Seu terminal já está configurado para uma experiência ideal com entrada multilinhas (Shift+Enter e Ctrl+Enter).',
+  "Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel":
+    "Use ↑↓ ou j/k para navegar, Enter para selecionar, Escape para cancelar",
+  "{{count}} more above": "{{count}} mais acima",
+  "{{count}} more below": "{{count}} mais abaixo",
+  "manage IDE integration": "gerenciar integração com IDE",
+  "check status of IDE integration": "verificar status da integração com IDE",
+  "install required IDE companion for {{ideName}}":
+    "instalar companion IDE necessário para {{ideName}}",
+  "enable IDE integration": "ativar integração com IDE",
+  "disable IDE integration": "desativar integração com IDE",
+  "IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.":
+    "A integração com IDE não é suportada no seu ambiente atual. Para usar este recurso, execute o Qwen Code em um destes IDEs suportados: VS Code ou forks do VS Code.",
+  "Set up GitHub Actions": "Configurar GitHub Actions",
+  "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)":
+    "Configurar atalhos de terminal para entrada multilinhas (VS Code, Cursor, Windsurf, Trae)",
+  "Please restart your terminal for the changes to take effect.":
+    "Reinicie seu terminal para que as alterações tenham efeito.",
+  "Failed to configure terminal: {{error}}": "Falha ao configurar terminal: {{error}}",
+  "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.":
+    "Não foi possível determinar o caminho de configuração de {{terminalName}} no Windows: variável de ambiente APPDATA não está definida.",
+  "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.":
+    "{{terminalName}} keybindings.json existe mas não é um array JSON válido. Corrija o arquivo manualmente ou exclua-o para permitir a configuração automática.",
+  "File: {{file}}": "Arquivo: {{file}}",
+  "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.":
+    "Falha ao analisar {{terminalName}} keybindings.json. O arquivo contém JSON inválido. Corrija o arquivo manualmente ou exclua-o para permitir a configuração automática.",
+  "Error: {{error}}": "Erro: {{error}}",
+  "Shift+Enter binding already exists": "Atalho Shift+Enter já existe",
+  "Ctrl+Enter binding already exists": "Atalho Ctrl+Enter já existe",
+  "Existing keybindings detected. Will not modify to avoid conflicts.":
+    "Atalhos existentes detectados. Não serão modificados para evitar conflitos.",
+  "Please check and modify manually if needed: {{file}}":
+    "Verifique e modifique manualmente se necessário: {{file}}",
+  "Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.":
+    "Adicionados atalhos Shift+Enter e Ctrl+Enter para {{terminalName}}.",
+  "Modified: {{file}}": "Modificado: {{file}}",
+  "{{terminalName}} keybindings already configured.":
+    "Atalhos de {{terminalName}} já configurados.",
+  "Failed to configure {{terminalName}}.": "Falha ao configurar {{terminalName}}.",
+  "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).":
+    "Seu terminal já está configurado para uma experiência ideal com entrada multilinhas (Shift+Enter e Ctrl+Enter).",
   // ============================================================================
   // Commands - Hooks
   // ============================================================================
-  'Manage Qwen Code hooks': 'Gerenciar hooks do Qwen Code',
-  'List all configured hooks': 'Listar todos os hooks configurados',
-  'Enable a disabled hook': 'Ativar um hook desativado',
-  'Disable an active hook': 'Desativar um hook ativo',
+  "Manage Qwen Code hooks": "Gerenciar hooks do Qwen Code",
+  "List all configured hooks": "Listar todos os hooks configurados",
+  "Enable a disabled hook": "Ativar um hook desativado",
+  "Disable an active hook": "Desativar um hook ativo",
   // Hooks - Dialog
-  Hooks: 'Hooks',
-  'Loading hooks...': 'Carregando hooks...',
-  'Error loading hooks:': 'Erro ao carregar hooks:',
-  'Press Escape to close': 'Pressione Escape para fechar',
-  'Press Escape, Ctrl+C, or Ctrl+D to cancel':
-    'Pressione Escape, Ctrl+C ou Ctrl+D para cancelar',
-  'Press Space, Enter, or Escape to dismiss':
-    'Pressione Espaço, Enter ou Escape para dispensar',
-  'No hook selected': 'Nenhum hook selecionado',
+  Hooks: "Hooks",
+  "Loading hooks...": "Carregando hooks...",
+  "Error loading hooks:": "Erro ao carregar hooks:",
+  "Press Escape to close": "Pressione Escape para fechar",
+  "Press Escape, Ctrl+C, or Ctrl+D to cancel": "Pressione Escape, Ctrl+C ou Ctrl+D para cancelar",
+  "Press Space, Enter, or Escape to dismiss": "Pressione Espaço, Enter ou Escape para dispensar",
+  "No hook selected": "Nenhum hook selecionado",
   // Hooks - List Step
-  'No hook events found.': 'Nenhum evento de hook encontrado.',
-  '{{count}} hook configured': '{{count}} hook configurado',
-  '{{count}} hooks configured': '{{count}} hooks configurados',
-  'This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.':
-    'Este menu é somente leitura. Para adicionar ou modificar hooks, edite settings.json diretamente ou pergunte ao Qwen Code.',
-  'Enter to select · Esc to cancel':
-    'Enter para selecionar · Esc para cancelar',
+  "No hook events found.": "Nenhum evento de hook encontrado.",
+  "{{count}} hook configured": "{{count}} hook configurado",
+  "{{count}} hooks configured": "{{count}} hooks configurados",
+  "This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.":
+    "Este menu é somente leitura. Para adicionar ou modificar hooks, edite settings.json diretamente ou pergunte ao Qwen Code.",
+  "Enter to select · Esc to cancel": "Enter para selecionar · Esc para cancelar",
   // Hooks - Detail Step
-  'Exit codes:': 'Códigos de saída:',
-  'Configured hooks:': 'Hooks configurados:',
-  'No hooks configured for this event.':
-    'Nenhum hook configurado para este evento.',
-  'To add hooks, edit settings.json directly or ask Qwen.':
-    'Para adicionar hooks, edite settings.json diretamente ou pergunte ao Qwen.',
-  'Enter to select · Esc to go back': 'Enter para selecionar · Esc para voltar',
+  "Exit codes:": "Códigos de saída:",
+  "Configured hooks:": "Hooks configurados:",
+  "No hooks configured for this event.": "Nenhum hook configurado para este evento.",
+  "To add hooks, edit settings.json directly or ask Qwen.":
+    "Para adicionar hooks, edite settings.json diretamente ou pergunte ao Qwen.",
+  "Enter to select · Esc to go back": "Enter para selecionar · Esc para voltar",
   // Hooks - Config Detail Step
-  'Hook details': 'Detalhes do Hook',
-  'Event:': 'Evento:',
-  'Extension:': 'Extensão:',
-  'Desc:': 'Descrição:',
-  'No hook config selected': 'Nenhuma configuração de hook selecionada',
-  'To modify or remove this hook, edit settings.json directly or ask Qwen to help.':
-    'Para modificar ou remover este hook, edite settings.json diretamente ou pergunte ao Qwen.',
+  "Hook details": "Detalhes do Hook",
+  "Event:": "Evento:",
+  "Extension:": "Extensão:",
+  "Desc:": "Descrição:",
+  "No hook config selected": "Nenhuma configuração de hook selecionada",
+  "To modify or remove this hook, edit settings.json directly or ask Qwen to help.":
+    "Para modificar ou remover este hook, edite settings.json diretamente ou pergunte ao Qwen.",
   // Hooks - Disabled Step
-  'Hook Configuration - Disabled': 'Configuração de Hook - Desativado',
-  'All hooks are currently disabled. You have {{count}} that are not running.':
-    'Todos os hooks estão desativados. Você tem {{count}} que não estão em execução.',
-  '{{count}} configured hook': '{{count}} hook configurado',
-  '{{count}} configured hooks': '{{count}} hooks configurados',
-  'When hooks are disabled:': 'Quando os hooks estão desativados:',
-  'No hook commands will execute': 'Nenhum comando de hook será executado',
-  'StatusLine will not be displayed': 'StatusLine não será exibido',
-  'Tool operations will proceed without hook validation':
-    'As operações de ferramentas prosseguirão sem validação de hook',
+  "Hook Configuration - Disabled": "Configuração de Hook - Desativado",
+  "All hooks are currently disabled. You have {{count}} that are not running.":
+    "Todos os hooks estão desativados. Você tem {{count}} que não estão em execução.",
+  "{{count}} configured hook": "{{count}} hook configurado",
+  "{{count}} configured hooks": "{{count}} hooks configurados",
+  "When hooks are disabled:": "Quando os hooks estão desativados:",
+  "No hook commands will execute": "Nenhum comando de hook será executado",
+  "StatusLine will not be displayed": "StatusLine não será exibido",
+  "Tool operations will proceed without hook validation":
+    "As operações de ferramentas prosseguirão sem validação de hook",
   'To re-enable hooks, remove "disableAllHooks" from settings.json or ask Qwen Code.':
     'Para reativar os hooks, remova "disableAllHooks" do settings.json ou pergunte ao Qwen Code.',
   // Hooks - Source
-  Project: 'Projeto',
-  User: 'Usuário',
-  System: 'Sistema',
-  Extension: 'Extensão',
-  'Local Settings': 'Configurações Locais',
-  'User Settings': 'Configurações do Usuário',
-  'System Settings': 'Configurações do Sistema',
-  Extensions: 'Extensões',
+  Project: "Projeto",
+  User: "Usuário",
+  System: "Sistema",
+  Extension: "Extensão",
+  "Local Settings": "Configurações Locais",
+  "User Settings": "Configurações do Usuário",
+  "System Settings": "Configurações do Sistema",
+  Extensions: "Extensões",
   // Hooks - Status
-  '✓ Enabled': '✓ Ativado',
-  '✗ Disabled': '✗ Desativado',
+  "✓ Enabled": "✓ Ativado",
+  "✗ Disabled": "✗ Desativado",
   // Hooks - Event Descriptions (short)
-  'Before tool execution': 'Antes da execução da ferramenta',
-  'After tool execution': 'Após a execução da ferramenta',
-  'After tool execution fails': 'Após a falha da execução da ferramenta',
-  'When notifications are sent': 'Quando notificações são enviadas',
-  'When the user submits a prompt': 'Quando o usuário envia um prompt',
-  'When a new session is started': 'Quando uma nova sessão é iniciada',
-  'Right before Qwen Code concludes its response':
-    'Logo antes do Qwen Code concluir sua resposta',
-  'When a subagent (Agent tool call) is started':
-    'Quando um subagente (chamada de ferramenta Agent) é iniciado',
-  'Right before a subagent concludes its response':
-    'Logo antes de um subagente concluir sua resposta',
-  'Before conversation compaction': 'Antes da compactação da conversa',
-  'When a session is ending': 'Quando uma sessão está terminando',
-  'When a permission dialog is displayed':
-    'Quando um diálogo de permissão é exibido',
+  "Before tool execution": "Antes da execução da ferramenta",
+  "After tool execution": "Após a execução da ferramenta",
+  "After tool execution fails": "Após a falha da execução da ferramenta",
+  "When notifications are sent": "Quando notificações são enviadas",
+  "When the user submits a prompt": "Quando o usuário envia um prompt",
+  "When a new session is started": "Quando uma nova sessão é iniciada",
+  "Right before Qwen Code concludes its response": "Logo antes do Qwen Code concluir sua resposta",
+  "When a subagent (Agent tool call) is started":
+    "Quando um subagente (chamada de ferramenta Agent) é iniciado",
+  "Right before a subagent concludes its response":
+    "Logo antes de um subagente concluir sua resposta",
+  "Before conversation compaction": "Antes da compactação da conversa",
+  "When a session is ending": "Quando uma sessão está terminando",
+  "When a permission dialog is displayed": "Quando um diálogo de permissão é exibido",
   // Hooks - Event Descriptions (detailed)
-  'Input to command is JSON of tool call arguments.':
-    'A entrada para o comando é JSON dos argumentos da chamada da ferramenta.',
+  "Input to command is JSON of tool call arguments.":
+    "A entrada para o comando é JSON dos argumentos da chamada da ferramenta.",
   'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).':
     'A entrada para o comando é JSON com campos "inputs" (argumentos da chamada da ferramenta) e "response" (resposta da chamada da ferramenta).',
-  'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.':
-    'A entrada para o comando é JSON com tool_name, tool_input, tool_use_id, error, error_type, is_interrupt e is_timeout.',
-  'Input to command is JSON with notification message and type.':
-    'A entrada para o comando é JSON com mensagem e tipo de notificação.',
-  'Input to command is JSON with original user prompt text.':
-    'A entrada para o comando é JSON com o texto original do prompt do usuário.',
-  'Input to command is JSON with session start source.':
-    'A entrada para o comando é JSON com a fonte de início da sessão.',
-  'Input to command is JSON with session end reason.':
-    'A entrada para o comando é JSON com o motivo do fim da sessão.',
-  'Input to command is JSON with agent_id and agent_type.':
-    'A entrada para o comando é JSON com agent_id e agent_type.',
-  'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.':
-    'A entrada para o comando é JSON com agent_id, agent_type e agent_transcript_path.',
-  'Input to command is JSON with compaction details.':
-    'A entrada para o comando é JSON com detalhes da compactação.',
-  'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.':
-    'A entrada para o comando é JSON com tool_name, tool_input e tool_use_id. Saída é JSON com hookSpecificOutput contendo decisão de permitir ou negar.',
+  "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.":
+    "A entrada para o comando é JSON com tool_name, tool_input, tool_use_id, error, error_type, is_interrupt e is_timeout.",
+  "Input to command is JSON with notification message and type.":
+    "A entrada para o comando é JSON com mensagem e tipo de notificação.",
+  "Input to command is JSON with original user prompt text.":
+    "A entrada para o comando é JSON com o texto original do prompt do usuário.",
+  "Input to command is JSON with session start source.":
+    "A entrada para o comando é JSON com a fonte de início da sessão.",
+  "Input to command is JSON with session end reason.":
+    "A entrada para o comando é JSON com o motivo do fim da sessão.",
+  "Input to command is JSON with agent_id and agent_type.":
+    "A entrada para o comando é JSON com agent_id e agent_type.",
+  "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.":
+    "A entrada para o comando é JSON com agent_id, agent_type e agent_transcript_path.",
+  "Input to command is JSON with compaction details.":
+    "A entrada para o comando é JSON com detalhes da compactação.",
+  "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.":
+    "A entrada para o comando é JSON com tool_name, tool_input e tool_use_id. Saída é JSON com hookSpecificOutput contendo decisão de permitir ou negar.",
   // Hooks - Exit Code Descriptions
-  'stdout/stderr not shown': 'stdout/stderr não exibido',
-  'show stderr to model and continue conversation':
-    'mostrar stderr ao modelo e continuar conversa',
-  'show stderr to user only': 'mostrar stderr apenas ao usuário',
-  'stdout shown in transcript mode (ctrl+o)':
-    'stdout exibido no modo transcrição (ctrl+o)',
-  'show stderr to model immediately': 'mostrar stderr ao modelo imediatamente',
-  'show stderr to user only but continue with tool call':
-    'mostrar stderr apenas ao usuário mas continuar com chamada de ferramenta',
-  'block processing, erase original prompt, and show stderr to user only':
-    'bloquear processamento, apagar prompt original e mostrar stderr apenas ao usuário',
-  'stdout shown to Qwen': 'stdout mostrado ao Qwen',
-  'show stderr to user only (blocking errors ignored)':
-    'mostrar stderr apenas ao usuário (erros de bloqueio ignorados)',
-  'command completes successfully': 'comando concluído com sucesso',
-  'stdout shown to subagent': 'stdout mostrado ao subagente',
-  'show stderr to subagent and continue having it run':
-    'mostrar stderr ao subagente e continuar executando',
-  'stdout appended as custom compact instructions':
-    'stdout anexado como instruções de compactação personalizadas',
-  'block compaction': 'bloquear compactação',
-  'show stderr to user only but continue with compaction':
-    'mostrar stderr apenas ao usuário mas continuar com compactação',
-  'use hook decision if provided': 'usar decisão do hook se fornecida',
+  "stdout/stderr not shown": "stdout/stderr não exibido",
+  "show stderr to model and continue conversation": "mostrar stderr ao modelo e continuar conversa",
+  "show stderr to user only": "mostrar stderr apenas ao usuário",
+  "stdout shown in transcript mode (ctrl+o)": "stdout exibido no modo transcrição (ctrl+o)",
+  "show stderr to model immediately": "mostrar stderr ao modelo imediatamente",
+  "show stderr to user only but continue with tool call":
+    "mostrar stderr apenas ao usuário mas continuar com chamada de ferramenta",
+  "block processing, erase original prompt, and show stderr to user only":
+    "bloquear processamento, apagar prompt original e mostrar stderr apenas ao usuário",
+  "stdout shown to Qwen": "stdout mostrado ao Qwen",
+  "show stderr to user only (blocking errors ignored)":
+    "mostrar stderr apenas ao usuário (erros de bloqueio ignorados)",
+  "command completes successfully": "comando concluído com sucesso",
+  "stdout shown to subagent": "stdout mostrado ao subagente",
+  "show stderr to subagent and continue having it run":
+    "mostrar stderr ao subagente e continuar executando",
+  "stdout appended as custom compact instructions":
+    "stdout anexado como instruções de compactação personalizadas",
+  "block compaction": "bloquear compactação",
+  "show stderr to user only but continue with compaction":
+    "mostrar stderr apenas ao usuário mas continuar com compactação",
+  "use hook decision if provided": "usar decisão do hook se fornecida",
   // Hooks - Messages
-  'Config not loaded.': 'Configuração não carregada.',
-  'Hooks are not enabled. Enable hooks in settings to use this feature.':
-    'Hooks não estão ativados. Ative hooks nas configurações para usar este recurso.',
-  'No hooks configured. Add hooks in your settings.json file.':
-    'Nenhum hook configurado. Adicione hooks no seu arquivo settings.json.',
-  'Configured Hooks ({{count}} total)': 'Hooks Configurados ({{count}} total)',
+  "Config not loaded.": "Configuração não carregada.",
+  "Hooks are not enabled. Enable hooks in settings to use this feature.":
+    "Hooks não estão ativados. Ative hooks nas configurações para usar este recurso.",
+  "No hooks configured. Add hooks in your settings.json file.":
+    "Nenhum hook configurado. Adicione hooks no seu arquivo settings.json.",
+  "Configured Hooks ({{count}} total)": "Hooks Configurados ({{count}} total)",
 
   // ============================================================================
   // Commands - Session Export
   // ============================================================================
-  'Export current session message history to a file':
-    'Exportar o histórico de mensagens da sessão atual para um arquivo',
-  'Export session to HTML format': 'Exportar a sessão para o formato HTML',
-  'Export session to JSON format': 'Exportar a sessão para o formato JSON',
-  'Export session to JSONL format (one message per line)':
-    'Exportar a sessão para o formato JSONL (uma mensagem por linha)',
-  'Export session to markdown format':
-    'Exportar a sessão para o formato Markdown',
+  "Export current session message history to a file":
+    "Exportar o histórico de mensagens da sessão atual para um arquivo",
+  "Export session to HTML format": "Exportar a sessão para o formato HTML",
+  "Export session to JSON format": "Exportar a sessão para o formato JSON",
+  "Export session to JSONL format (one message per line)":
+    "Exportar a sessão para o formato JSONL (uma mensagem por linha)",
+  "Export session to markdown format": "Exportar a sessão para o formato Markdown",
 
   // ============================================================================
   // Commands - Insights
   // ============================================================================
-  'generate personalized programming insights from your chat history':
-    'Gerar insights personalizados de programação a partir do seu histórico de chat',
+  "generate personalized programming insights from your chat history":
+    "Gerar insights personalizados de programação a partir do seu histórico de chat",
 
   // ============================================================================
   // Commands - Session History
   // ============================================================================
-  'Resume a previous session': 'Retomar uma sessão anterior',
-  'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested':
-    'Restaurar uma chamada de ferramenta. Isso redefinirá o histórico da conversa e dos arquivos para o estado em que a chamada da ferramenta foi sugerida',
-  'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.':
-    'Não foi possível detectar o tipo de terminal. Terminais suportados: VS Code, Cursor, Windsurf e Trae.',
+  "Resume a previous session": "Retomar uma sessão anterior",
+  "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested":
+    "Restaurar uma chamada de ferramenta. Isso redefinirá o histórico da conversa e dos arquivos para o estado em que a chamada da ferramenta foi sugerida",
+  "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.":
+    "Não foi possível detectar o tipo de terminal. Terminais suportados: VS Code, Cursor, Windsurf e Trae.",
   'Terminal "{{terminal}}" is not supported yet.':
     'O terminal "{{terminal}}" ainda não é suportado.',
 
   // ============================================================================
   // Commands - Language
   // ============================================================================
-  'Invalid language. Available: {{options}}':
-    'Idioma inválido. Disponíveis: {{options}}',
-  'Language subcommands do not accept additional arguments.':
-    'Subcomandos de idioma não aceitam argumentos adicionais.',
-  'Current UI language: {{lang}}': 'Idioma atual da interface: {{lang}}',
-  'Current LLM output language: {{lang}}':
-    'Idioma atual da saída do LLM: {{lang}}',
-  'LLM output language not set': 'Idioma de saída do LLM não definido',
-  'Set UI language': 'Definir idioma da interface',
-  'Set LLM output language': 'Definir idioma de saída do LLM',
-  'Usage: /language ui [{{options}}]': 'Uso: /language ui [{{options}}]',
-  'Usage: /language output <language>': 'Uso: /language output <idioma>',
-  'Example: /language output 中文': 'Exemplo: /language output Português',
-  'Example: /language output English': 'Exemplo: /language output Inglês',
-  'Example: /language output 日本語': 'Exemplo: /language output Japonês',
-  'Example: /language output Português': 'Exemplo: /language output Português',
-  'UI language changed to {{lang}}':
-    'Idioma da interface alterado para {{lang}}',
-  'LLM output language set to {{lang}}':
-    'Idioma de saída do LLM definido para {{lang}}',
-  'LLM output language rule file generated at {{path}}':
-    'Arquivo de regra de idioma de saída do LLM gerado em {{path}}',
-  'Please restart the application for the changes to take effect.':
-    'Reinicie o aplicativo para que as alterações tenham efeito.',
-  'Failed to generate LLM output language rule file: {{error}}':
-    'Falha ao gerar arquivo de regra de idioma de saída do LLM: {{error}}',
-  'Invalid command. Available subcommands:':
-    'Comando inválido. Subcomandos disponíveis:',
-  'Available subcommands:': 'Subcomandos disponíveis:',
-  'To request additional UI language packs, please open an issue on GitHub.':
-    'Para solicitar pacotes de idiomas de interface adicionais, abra um problema no GitHub.',
-  'Available options:': 'Opções disponíveis:',
-  'Set UI language to {{name}}': 'Definir idioma da interface para {{name}}',
+  "Invalid language. Available: {{options}}": "Idioma inválido. Disponíveis: {{options}}",
+  "Language subcommands do not accept additional arguments.":
+    "Subcomandos de idioma não aceitam argumentos adicionais.",
+  "Current UI language: {{lang}}": "Idioma atual da interface: {{lang}}",
+  "Current LLM output language: {{lang}}": "Idioma atual da saída do LLM: {{lang}}",
+  "LLM output language not set": "Idioma de saída do LLM não definido",
+  "Set UI language": "Definir idioma da interface",
+  "Set LLM output language": "Definir idioma de saída do LLM",
+  "Usage: /language ui [{{options}}]": "Uso: /language ui [{{options}}]",
+  "Usage: /language output <language>": "Uso: /language output <idioma>",
+  "Example: /language output 中文": "Exemplo: /language output Português",
+  "Example: /language output English": "Exemplo: /language output Inglês",
+  "Example: /language output 日本語": "Exemplo: /language output Japonês",
+  "Example: /language output Português": "Exemplo: /language output Português",
+  "UI language changed to {{lang}}": "Idioma da interface alterado para {{lang}}",
+  "LLM output language set to {{lang}}": "Idioma de saída do LLM definido para {{lang}}",
+  "LLM output language rule file generated at {{path}}":
+    "Arquivo de regra de idioma de saída do LLM gerado em {{path}}",
+  "Please restart the application for the changes to take effect.":
+    "Reinicie o aplicativo para que as alterações tenham efeito.",
+  "Failed to generate LLM output language rule file: {{error}}":
+    "Falha ao gerar arquivo de regra de idioma de saída do LLM: {{error}}",
+  "Invalid command. Available subcommands:": "Comando inválido. Subcomandos disponíveis:",
+  "Available subcommands:": "Subcomandos disponíveis:",
+  "To request additional UI language packs, please open an issue on GitHub.":
+    "Para solicitar pacotes de idiomas de interface adicionais, abra um problema no GitHub.",
+  "Available options:": "Opções disponíveis:",
+  "Set UI language to {{name}}": "Definir idioma da interface para {{name}}",
 
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Tool Approval Mode': 'Modo de Aprovação de Ferramenta',
-  'Current approval mode: {{mode}}': 'Modo de aprovação atual: {{mode}}',
-  'Available approval modes:': 'Modos de aprovação disponíveis:',
-  'Approval mode changed to: {{mode}}':
-    'Modo de aprovação alterado para: {{mode}}',
-  'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
-    'Modo de aprovação alterado para: {{mode}} (salvo nas configurações de {{scope}}{{location}})',
-  'Usage: /approval-mode <mode> [--session|--user|--project]':
-    'Uso: /approval-mode <mode> [--session|--user|--project]',
+  "Tool Approval Mode": "Modo de Aprovação de Ferramenta",
+  "Current approval mode: {{mode}}": "Modo de aprovação atual: {{mode}}",
+  "Available approval modes:": "Modos de aprovação disponíveis:",
+  "Approval mode changed to: {{mode}}": "Modo de aprovação alterado para: {{mode}}",
+  "Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})":
+    "Modo de aprovação alterado para: {{mode}} (salvo nas configurações de {{scope}}{{location}})",
+  "Usage: /approval-mode <mode> [--session|--user|--project]":
+    "Uso: /approval-mode <mode> [--session|--user|--project]",
 
-  'Scope subcommands do not accept additional arguments.':
-    'Subcomandos de escopo não aceitam argumentos adicionais.',
-  'Plan mode - Analyze only, do not modify files or execute commands':
-    'Modo planejamento - Apenas analisa, não modifica arquivos nem executa comandos',
-  'Default mode - Require approval for file edits or shell commands':
-    'Modo padrão - Exige aprovação para edições de arquivos ou comandos shell',
-  'Auto-edit mode - Automatically approve file edits':
-    'Modo auto-edição - Aprova automaticamente edições de arquivos',
-  'YOLO mode - Automatically approve all tools':
-    'Modo YOLO - Aprova automaticamente todas as ferramentas',
-  '{{mode}} mode': 'Modo {{mode}}',
-  'Settings service is not available; unable to persist the approval mode.':
-    'Serviço de configurações não disponível; não foi possível persistir o modo de aprovação.',
-  'Failed to save approval mode: {{error}}':
-    'Falha ao salvar modo de aprovação: {{error}}',
-  'Failed to change approval mode: {{error}}':
-    'Falha ao alterar modo de aprovação: {{error}}',
-  'Apply to current session only (temporary)':
-    'Aplicar apenas à sessão atual (temporário)',
-  'Persist for this project/workspace': 'Persistir para este projeto/workspace',
-  'Persist for this user on this machine':
-    'Persistir para este usuário nesta máquina',
-  'Analyze only, do not modify files or execute commands':
-    'Apenas analisar, não modificar arquivos nem executar comandos',
-  'Require approval for file edits or shell commands':
-    'Exigir aprovação para edições de arquivos ou comandos shell',
-  'Automatically approve file edits':
-    'Aprovar automaticamente edições de arquivos',
-  'Automatically approve all tools':
-    'Aprovar automaticamente todas as ferramentas',
-  'Workspace approval mode exists and takes priority. User-level change will have no effect.':
-    'O modo de aprovação do workspace existe e tem prioridade. A alteração no nível do usuário não terá efeito.',
-  'Apply To': 'Aplicar A',
-  'Workspace Settings': 'Configurações do Workspace',
+  "Scope subcommands do not accept additional arguments.":
+    "Subcomandos de escopo não aceitam argumentos adicionais.",
+  "Plan mode - Analyze only, do not modify files or execute commands":
+    "Modo planejamento - Apenas analisa, não modifica arquivos nem executa comandos",
+  "Default mode - Require approval for file edits or shell commands":
+    "Modo padrão - Exige aprovação para edições de arquivos ou comandos shell",
+  "Auto-edit mode - Automatically approve file edits":
+    "Modo auto-edição - Aprova automaticamente edições de arquivos",
+  "YOLO mode - Automatically approve all tools":
+    "Modo YOLO - Aprova automaticamente todas as ferramentas",
+  "{{mode}} mode": "Modo {{mode}}",
+  "Settings service is not available; unable to persist the approval mode.":
+    "Serviço de configurações não disponível; não foi possível persistir o modo de aprovação.",
+  "Failed to save approval mode: {{error}}": "Falha ao salvar modo de aprovação: {{error}}",
+  "Failed to change approval mode: {{error}}": "Falha ao alterar modo de aprovação: {{error}}",
+  "Apply to current session only (temporary)": "Aplicar apenas à sessão atual (temporário)",
+  "Persist for this project/workspace": "Persistir para este projeto/workspace",
+  "Persist for this user on this machine": "Persistir para este usuário nesta máquina",
+  "Analyze only, do not modify files or execute commands":
+    "Apenas analisar, não modificar arquivos nem executar comandos",
+  "Require approval for file edits or shell commands":
+    "Exigir aprovação para edições de arquivos ou comandos shell",
+  "Automatically approve file edits": "Aprovar automaticamente edições de arquivos",
+  "Automatically approve all tools": "Aprovar automaticamente todas as ferramentas",
+  "Workspace approval mode exists and takes priority. User-level change will have no effect.":
+    "O modo de aprovação do workspace existe e tem prioridade. A alteração no nível do usuário não terá efeito.",
+  "Apply To": "Aplicar A",
+  "Workspace Settings": "Configurações do Workspace",
 
   // ============================================================================
   // Commands - Memory
   // ============================================================================
-  'Commands for interacting with memory.':
-    'Comandos para interagir com a memória.',
-  'Show the current memory contents.':
-    'Mostrar os conteúdos atuais da memória.',
-  'Show project-level memory contents.':
-    'Mostrar conteúdos da memória de nível de projeto.',
-  'Show global memory contents.': 'Mostrar conteúdos da memória global.',
-  'Add content to project-level memory.':
-    'Adicionar conteúdo à memória de nível de projeto.',
-  'Add content to global memory.': 'Adicionar conteúdo à memória global.',
-  'Refresh the memory from the source.': 'Atualizar a memória da fonte.',
-  'Usage: /memory add --project <text to remember>':
-    'Uso: /memory add --project <texto para lembrar>',
-  'Usage: /memory add --global <text to remember>':
-    'Uso: /memory add --global <texto para lembrar>',
+  "Commands for interacting with memory.": "Comandos para interagir com a memória.",
+  "Show the current memory contents.": "Mostrar os conteúdos atuais da memória.",
+  "Show project-level memory contents.": "Mostrar conteúdos da memória de nível de projeto.",
+  "Show global memory contents.": "Mostrar conteúdos da memória global.",
+  "Add content to project-level memory.": "Adicionar conteúdo à memória de nível de projeto.",
+  "Add content to global memory.": "Adicionar conteúdo à memória global.",
+  "Refresh the memory from the source.": "Atualizar a memória da fonte.",
+  "Usage: /memory add --project <text to remember>":
+    "Uso: /memory add --project <texto para lembrar>",
+  "Usage: /memory add --global <text to remember>":
+    "Uso: /memory add --global <texto para lembrar>",
   'Attempting to save to project memory: "{{text}}"':
     'Tentando salvar na memória do projeto: "{{text}}"',
   'Attempting to save to global memory: "{{text}}"':
     'Tentando salvar na memória global: "{{text}}"',
-  'Current memory content from {{count}} file(s):':
-    'Conteúdo da memória atual de {{count}} arquivo(s):',
-  'Memory is currently empty.': 'A memória está vazia no momento.',
-  'Project memory file not found or is currently empty.':
-    'Arquivo de memória do projeto não encontrado ou está vazio.',
-  'Global memory file not found or is currently empty.':
-    'Arquivo de memória global não encontrado ou está vazio.',
-  'Global memory is currently empty.':
-    'A memória global está vazia no momento.',
-  'Global memory content:\n\n---\n{{content}}\n---':
-    'Conteúdo da memória global:\n\n---\n{{content}}\n---',
-  'Project memory content from {{path}}:\n\n---\n{{content}}\n---':
-    'Conteúdo da memória do projeto de {{path}}:\n\n---\n{{content}}\n---',
-  'Project memory is currently empty.':
-    'A memória do projeto está vazia no momento.',
-  'Refreshing memory from source files...':
-    'Atualizando memória dos arquivos fonte...',
-  'Add content to the memory. Use --global for global memory or --project for project memory.':
-    'Adicionar conteúdo à memória. Use --global para memória global ou --project para memória do projeto.',
-  'Usage: /memory add [--global|--project] <text to remember>':
-    'Uso: /memory add [--global|--project] <texto para lembrar>',
+  "Current memory content from {{count}} file(s):":
+    "Conteúdo da memória atual de {{count}} arquivo(s):",
+  "Memory is currently empty.": "A memória está vazia no momento.",
+  "Project memory file not found or is currently empty.":
+    "Arquivo de memória do projeto não encontrado ou está vazio.",
+  "Global memory file not found or is currently empty.":
+    "Arquivo de memória global não encontrado ou está vazio.",
+  "Global memory is currently empty.": "A memória global está vazia no momento.",
+  "Global memory content:\n\n---\n{{content}}\n---":
+    "Conteúdo da memória global:\n\n---\n{{content}}\n---",
+  "Project memory content from {{path}}:\n\n---\n{{content}}\n---":
+    "Conteúdo da memória do projeto de {{path}}:\n\n---\n{{content}}\n---",
+  "Project memory is currently empty.": "A memória do projeto está vazia no momento.",
+  "Refreshing memory from source files...": "Atualizando memória dos arquivos fonte...",
+  "Add content to the memory. Use --global for global memory or --project for project memory.":
+    "Adicionar conteúdo à memória. Use --global para memória global ou --project para memória do projeto.",
+  "Usage: /memory add [--global|--project] <text to remember>":
+    "Uso: /memory add [--global|--project] <texto para lembrar>",
   'Attempting to save to memory {{scope}}: "{{fact}}"':
     'Tentando salvar na memória {{scope}}: "{{fact}}"',
 
   // ============================================================================
   // Commands - MCP
   // ============================================================================
-  'Authenticate with an OAuth-enabled MCP server':
-    'Autenticar com um servidor MCP habilitado para OAuth',
-  'List configured MCP servers and tools':
-    'Listar servidores e ferramentas MCP configurados',
-  'Restarts MCP servers.': 'Reinicia os servidores MCP.',
-  'Could not retrieve tool registry.':
-    'Não foi possível recuperar o registro de ferramentas.',
-  'No MCP servers configured with OAuth authentication.':
-    'Nenhum servidor MCP configurado com autenticação OAuth.',
-  'MCP servers with OAuth authentication:':
-    'Servidores MCP com autenticação OAuth:',
-  'Use /mcp auth <server-name> to authenticate.':
-    'Use /mcp auth <nome-do-servidor> para autenticar.',
+  "Authenticate with an OAuth-enabled MCP server":
+    "Autenticar com um servidor MCP habilitado para OAuth",
+  "List configured MCP servers and tools": "Listar servidores e ferramentas MCP configurados",
+  "Restarts MCP servers.": "Reinicia os servidores MCP.",
+  "Could not retrieve tool registry.": "Não foi possível recuperar o registro de ferramentas.",
+  "No MCP servers configured with OAuth authentication.":
+    "Nenhum servidor MCP configurado com autenticação OAuth.",
+  "MCP servers with OAuth authentication:": "Servidores MCP com autenticação OAuth:",
+  "Use /mcp auth <server-name> to authenticate.":
+    "Use /mcp auth <nome-do-servidor> para autenticar.",
   "MCP server '{{name}}' not found.": "Servidor MCP '{{name}}' não encontrado.",
   "Successfully authenticated and refreshed tools for '{{name}}'.":
     "Autenticado com sucesso e ferramentas atualizadas para '{{name}}'.",
   "Failed to authenticate with MCP server '{{name}}': {{error}}":
     "Falha ao autenticar com o servidor MCP '{{name}}': {{error}}",
-  "Re-discovering tools from '{{name}}'...":
-    "Redescobrindo ferramentas de '{{name}}'...",
+  "Re-discovering tools from '{{name}}'...": "Redescobrindo ferramentas de '{{name}}'...",
   "Discovered {{count}} tool(s) from '{{name}}'.":
     "{{count}} ferramenta(s) descoberta(s) de '{{name}}'.",
-  'Authentication complete. Returning to server details...':
-    'Autenticação concluída. Retornando aos detalhes do servidor...',
-  'Authentication successful.': 'Autenticação bem-sucedida.',
-  'If the browser does not open, copy and paste this URL into your browser:':
-    'Se o navegador não abrir, copie e cole esta URL no seu navegador:',
-  'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.':
-    '⚠️  Certifique-se de copiar a URL COMPLETA – ela pode ocupar várias linhas.',
+  "Authentication complete. Returning to server details...":
+    "Autenticação concluída. Retornando aos detalhes do servidor...",
+  "Authentication successful.": "Autenticação bem-sucedida.",
+  "If the browser does not open, copy and paste this URL into your browser:":
+    "Se o navegador não abrir, copie e cole esta URL no seu navegador:",
+  "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.":
+    "⚠️  Certifique-se de copiar a URL COMPLETA – ela pode ocupar várias linhas.",
 
   // ============================================================================
   // Commands - Chat
   // ============================================================================
-  'Manage conversation history.': 'Gerenciar histórico de conversas.',
-  'List saved conversation checkpoints':
-    'Listar checkpoints de conversa salvos',
-  'No saved conversation checkpoints found.':
-    'Nenhum checkpoint de conversa salvo encontrado.',
-  'List of saved conversations:': 'Lista de conversas salvas:',
-  'Note: Newest last, oldest first':
-    'Nota: Mais novos por último, mais antigos primeiro',
-  'Save the current conversation as a checkpoint. Usage: /chat save <tag>':
-    'Salvar a conversa atual como um checkpoint. Uso: /chat save <tag>',
-  'Missing tag. Usage: /chat save <tag>': 'Tag ausente. Uso: /chat save <tag>',
-  'Delete a conversation checkpoint. Usage: /chat delete <tag>':
-    'Excluir um checkpoint de conversa. Uso: /chat delete <tag>',
-  'Missing tag. Usage: /chat delete <tag>':
-    'Tag ausente. Uso: /chat delete <tag>',
+  "Manage conversation history.": "Gerenciar histórico de conversas.",
+  "List saved conversation checkpoints": "Listar checkpoints de conversa salvos",
+  "No saved conversation checkpoints found.": "Nenhum checkpoint de conversa salvo encontrado.",
+  "List of saved conversations:": "Lista de conversas salvas:",
+  "Note: Newest last, oldest first": "Nota: Mais novos por último, mais antigos primeiro",
+  "Save the current conversation as a checkpoint. Usage: /chat save <tag>":
+    "Salvar a conversa atual como um checkpoint. Uso: /chat save <tag>",
+  "Missing tag. Usage: /chat save <tag>": "Tag ausente. Uso: /chat save <tag>",
+  "Delete a conversation checkpoint. Usage: /chat delete <tag>":
+    "Excluir um checkpoint de conversa. Uso: /chat delete <tag>",
+  "Missing tag. Usage: /chat delete <tag>": "Tag ausente. Uso: /chat delete <tag>",
   "Conversation checkpoint '{{tag}}' has been deleted.":
     "O checkpoint de conversa '{{tag}}' foi excluído.",
   "Error: No checkpoint found with tag '{{tag}}'.":
     "Erro: Nenhum checkpoint encontrado com a tag '{{tag}}'.",
-  'Resume a conversation from a checkpoint. Usage: /chat resume <tag>':
-    'Retomar uma conversa de um checkpoint. Uso: /chat resume <tag>',
-  'Missing tag. Usage: /chat resume <tag>':
-    'Tag ausente. Uso: /chat resume <tag>',
-  'No saved checkpoint found with tag: {{tag}}.':
-    'Nenhum checkpoint salvo encontrado com a tag: {{tag}}.',
-  'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?':
-    'Um checkpoint com a tag {{tag}} já existe. Você deseja substituí-lo?',
-  'No chat client available to save conversation.':
-    'Nenhum cliente de chat disponível para salvar a conversa.',
-  'Conversation checkpoint saved with tag: {{tag}}.':
-    'Checkpoint de conversa salvo com a tag: {{tag}}.',
-  'No conversation found to save.': 'Nenhuma conversa encontrada para salvar.',
-  'No chat client available to share conversation.':
-    'Nenhum cliente de chat disponível para compartilhar a conversa.',
-  'Invalid file format. Only .md and .json are supported.':
-    'Formato de arquivo inválido. Apenas .md e .json são suportados.',
-  'Error sharing conversation: {{error}}':
-    'Erro ao compartilhar conversa: {{error}}',
-  'Conversation shared to {{filePath}}':
-    'Conversa compartilhada em {{filePath}}',
-  'No conversation found to share.':
-    'Nenhuma conversa encontrada para compartilhar.',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
-    'Compartilhar a conversa atual para um arquivo markdown ou json. Uso: /chat share <arquivo>',
+  "Resume a conversation from a checkpoint. Usage: /chat resume <tag>":
+    "Retomar uma conversa de um checkpoint. Uso: /chat resume <tag>",
+  "Missing tag. Usage: /chat resume <tag>": "Tag ausente. Uso: /chat resume <tag>",
+  "No saved checkpoint found with tag: {{tag}}.":
+    "Nenhum checkpoint salvo encontrado com a tag: {{tag}}.",
+  "A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?":
+    "Um checkpoint com a tag {{tag}} já existe. Você deseja substituí-lo?",
+  "No chat client available to save conversation.":
+    "Nenhum cliente de chat disponível para salvar a conversa.",
+  "Conversation checkpoint saved with tag: {{tag}}.":
+    "Checkpoint de conversa salvo com a tag: {{tag}}.",
+  "No conversation found to save.": "Nenhuma conversa encontrada para salvar.",
+  "No chat client available to share conversation.":
+    "Nenhum cliente de chat disponível para compartilhar a conversa.",
+  "Invalid file format. Only .md and .json are supported.":
+    "Formato de arquivo inválido. Apenas .md e .json são suportados.",
+  "Error sharing conversation: {{error}}": "Erro ao compartilhar conversa: {{error}}",
+  "Conversation shared to {{filePath}}": "Conversa compartilhada em {{filePath}}",
+  "No conversation found to share.": "Nenhuma conversa encontrada para compartilhar.",
+  "Share the current conversation to a markdown or json file. Usage: /chat share <file>":
+    "Compartilhar a conversa atual para um arquivo markdown ou json. Uso: /chat share <arquivo>",
 
   // ============================================================================
   // Commands - Summary
   // ============================================================================
-  'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md':
-    'Gerar um resumo do projeto e salvá-lo em .qwen/PROJECT_SUMMARY.md',
-  'No chat client available to generate summary.':
-    'Nenhum cliente de chat disponível para gerar o resumo.',
-  'Already generating summary, wait for previous request to complete':
-    'Já gerando resumo, aguarde a conclusão da solicitação anterior',
-  'No conversation found to summarize.':
-    'Nenhuma conversa encontrada para resumir.',
-  'Failed to generate project context summary: {{error}}':
-    'Falha ao gerar resumo do contexto do projeto: {{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    'Resumo do projeto salvo em {{filePathForDisplay}}.',
-  'Saving project summary...': 'Salvando resumo do projeto...',
-  'Generating project summary...': 'Gerando resumo do projeto...',
-  'Failed to generate summary - no text content received from LLM response':
-    'Falha ao gerar resumo - nenhum conteúdo de texto recebido da resposta do LLM',
+  "Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md":
+    "Gerar um resumo do projeto e salvá-lo em .qwen/PROJECT_SUMMARY.md",
+  "No chat client available to generate summary.":
+    "Nenhum cliente de chat disponível para gerar o resumo.",
+  "Already generating summary, wait for previous request to complete":
+    "Já gerando resumo, aguarde a conclusão da solicitação anterior",
+  "No conversation found to summarize.": "Nenhuma conversa encontrada para resumir.",
+  "Failed to generate project context summary: {{error}}":
+    "Falha ao gerar resumo do contexto do projeto: {{error}}",
+  "Saved project summary to {{filePathForDisplay}}.":
+    "Resumo do projeto salvo em {{filePathForDisplay}}.",
+  "Saving project summary...": "Salvando resumo do projeto...",
+  "Generating project summary...": "Gerando resumo do projeto...",
+  "Failed to generate summary - no text content received from LLM response":
+    "Falha ao gerar resumo - nenhum conteúdo de texto recebido da resposta do LLM",
 
   // ============================================================================
   // Commands - Model
   // ============================================================================
-  'Switch the model for this session': 'Trocar o modelo para esta sessão',
-  'Set fast model for background tasks':
-    'Definir modelo rápido para tarefas em segundo plano',
-  'Content generator configuration not available.':
-    'Configuração do gerador de conteúdo não disponível.',
-  'Authentication type not available.': 'Tipo de autenticação não disponível.',
-  'No models available for the current authentication type ({{authType}}).':
-    'Nenhum modelo disponível para o tipo de autenticação atual ({{authType}}).',
+  "Switch the model for this session": "Trocar o modelo para esta sessão",
+  "Set fast model for background tasks": "Definir modelo rápido para tarefas em segundo plano",
+  "Content generator configuration not available.":
+    "Configuração do gerador de conteúdo não disponível.",
+  "Authentication type not available.": "Tipo de autenticação não disponível.",
+  "No models available for the current authentication type ({{authType}}).":
+    "Nenhum modelo disponível para o tipo de autenticação atual ({{authType}}).",
 
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    'Iniciando uma nova sessão, resetando o chat e limpando o terminal.',
-  'Starting a new session and clearing.':
-    'Iniciando uma nova sessão e limpando.',
+  "Starting a new session, resetting chat, and clearing terminal.":
+    "Iniciando uma nova sessão, resetando o chat e limpando o terminal.",
+  "Starting a new session and clearing.": "Iniciando uma nova sessão e limpando.",
 
   // ============================================================================
   // Commands - Compress
   // ============================================================================
-  'Already compressing, wait for previous request to complete':
-    'Já comprimindo, aguarde a conclusão da solicitação anterior',
-  'Failed to compress chat history.': 'Falha ao comprimir histórico do chat.',
-  'Failed to compress chat history: {{error}}':
-    'Falha ao comprimir histórico do chat: {{error}}',
-  'Compressing chat history': 'Comprimindo histórico do chat',
-  'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.':
-    'Histórico do chat comprimido de {{originalTokens}} para {{newTokens}} tokens.',
-  'Compression was not beneficial for this history size.':
-    'A compressão não foi benéfica para este tamanho de histórico.',
-  'Chat history compression did not reduce size. This may indicate issues with the compression prompt.':
-    'A compressão do histórico do chat não reduziu o tamanho. Isso pode indicar problemas com o prompt de compressão.',
-  'Could not compress chat history due to a token counting error.':
-    'Não foi possível comprimir o histórico do chat devido a um erro de contagem de tokens.',
-  'Chat history is already compressed.':
-    'O histórico do chat já está comprimido.',
+  "Already compressing, wait for previous request to complete":
+    "Já comprimindo, aguarde a conclusão da solicitação anterior",
+  "Failed to compress chat history.": "Falha ao comprimir histórico do chat.",
+  "Failed to compress chat history: {{error}}": "Falha ao comprimir histórico do chat: {{error}}",
+  "Compressing chat history": "Comprimindo histórico do chat",
+  "Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.":
+    "Histórico do chat comprimido de {{originalTokens}} para {{newTokens}} tokens.",
+  "Compression was not beneficial for this history size.":
+    "A compressão não foi benéfica para este tamanho de histórico.",
+  "Chat history compression did not reduce size. This may indicate issues with the compression prompt.":
+    "A compressão do histórico do chat não reduziu o tamanho. Isso pode indicar problemas com o prompt de compressão.",
+  "Could not compress chat history due to a token counting error.":
+    "Não foi possível comprimir o histórico do chat devido a um erro de contagem de tokens.",
+  "Chat history is already compressed.": "O histórico do chat já está comprimido.",
 
   // ============================================================================
   // Commands - Directory
   // ============================================================================
-  'Configuration is not available.': 'A configuração não está disponível.',
-  'Please provide at least one path to add.':
-    'Forneça pelo menos um caminho para adicionar.',
-  'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.':
-    'O comando /directory add não é suportado em perfis de sandbox restritivos. Use --include-directories ao iniciar a sessão.',
-  "Error adding '{{path}}': {{error}}":
-    "Erro ao adicionar '{{path}}': {{error}}",
-  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
-    'Arquivos QWEN.md adicionados com sucesso dos seguintes diretórios, se houverem:\n- {{directories}}',
-  'Error refreshing memory: {{error}}': 'Erro ao atualizar memória: {{error}}',
-  'Successfully added directories:\n- {{directories}}':
-    'Diretórios adicionados com sucesso:\n- {{directories}}',
-  'Current workspace directories:\n{{directories}}':
-    'Diretórios atuais do workspace:\n{{directories}}',
+  "Configuration is not available.": "A configuração não está disponível.",
+  "Please provide at least one path to add.": "Forneça pelo menos um caminho para adicionar.",
+  "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.":
+    "O comando /directory add não é suportado em perfis de sandbox restritivos. Use --include-directories ao iniciar a sessão.",
+  "Error adding '{{path}}': {{error}}": "Erro ao adicionar '{{path}}': {{error}}",
+  "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}":
+    "Arquivos QWEN.md adicionados com sucesso dos seguintes diretórios, se houverem:\n- {{directories}}",
+  "Error refreshing memory: {{error}}": "Erro ao atualizar memória: {{error}}",
+  "Successfully added directories:\n- {{directories}}":
+    "Diretórios adicionados com sucesso:\n- {{directories}}",
+  "Current workspace directories:\n{{directories}}":
+    "Diretórios atuais do workspace:\n{{directories}}",
 
   // ============================================================================
   // Commands - Docs
   // ============================================================================
-  'Please open the following URL in your browser to view the documentation:\n{{url}}':
-    'Abra a seguinte URL no seu navegador para ver a documentação:\n{{url}}',
-  'Opening documentation in your browser: {{url}}':
-    'Abrindo documentação no seu navegador: {{url}}',
+  "Please open the following URL in your browser to view the documentation:\n{{url}}":
+    "Abra a seguinte URL no seu navegador para ver a documentação:\n{{url}}",
+  "Opening documentation in your browser: {{url}}":
+    "Abrindo documentação no seu navegador: {{url}}",
 
   // ============================================================================
   // Dialogs - Tool Confirmation
   // ============================================================================
-  'Do you want to proceed?': 'Você deseja prosseguir?',
-  'Yes, allow once': 'Sim, permitir uma vez',
-  'Allow always': 'Permitir sempre',
-  Yes: 'Sim',
-  No: 'Não',
-  'No (esc)': 'Não (esc)',
-  'Yes, allow always for this session': 'Sim, permitir sempre para esta sessão',
+  "Do you want to proceed?": "Você deseja prosseguir?",
+  "Yes, allow once": "Sim, permitir uma vez",
+  "Allow always": "Permitir sempre",
+  Yes: "Sim",
+  No: "Não",
+  "No (esc)": "Não (esc)",
+  "Yes, allow always for this session": "Sim, permitir sempre para esta sessão",
 
   // MCP Management - Core translations
-  'Manage MCP servers': 'Gerenciar servidores MCP',
-  'Server Detail': 'Detalhes do servidor',
-  'Disable Server': 'Desativar servidor',
-  Tools: 'Ferramentas',
-  'Tool Detail': 'Detalhes da ferramenta',
-  'MCP Management': 'Gerenciamento MCP',
-  'Loading...': 'Carregando...',
-  'Unknown step': 'Etapa desconhecida',
-  'Esc to back': 'Esc para voltar',
-  '↑↓ to navigate · Enter to select · Esc to close':
-    '↑↓ navegar · Enter selecionar · Esc fechar',
-  '↑↓ to navigate · Enter to select · Esc to back':
-    '↑↓ navegar · Enter selecionar · Esc voltar',
-  '↑↓ to navigate · Enter to confirm · Esc to back':
-    '↑↓ navegar · Enter confirmar · Esc voltar',
-  'User Settings (global)': 'Configurações do usuário (global)',
-  'Workspace Settings (project-specific)':
-    'Configurações do workspace (específico do projeto)',
-  'Disable server:': 'Desativar servidor:',
-  'Select where to add the server to the exclude list:':
-    'Selecione onde adicionar o servidor à lista de exclusão:',
-  'Press Enter to confirm, Esc to cancel':
-    'Enter para confirmar, Esc para cancelar',
-  Disable: 'Desativar',
-  Enable: 'Ativar',
-  Authenticate: 'Autenticar',
-  'Re-authenticate': 'Reautenticar',
-  'Clear Authentication': 'Limpar autenticação',
-  disabled: 'desativado',
-  'Server:': 'Servidor:',
-  Reconnect: 'Reconectar',
-  'View tools': 'Ver ferramentas',
-  'Status:': 'Status:',
-  'Source:': 'Fonte:',
-  'Command:': 'Comando:',
-  'Working Directory:': 'Diretório de trabalho:',
-  'Capabilities:': 'Capacidades:',
-  'No server selected': 'Nenhum servidor selecionado',
-  '(disabled)': '(desativado)',
-  'Error:': 'Erro:',
-  tool: 'ferramenta',
-  tools: 'ferramentas',
-  connected: 'conectado',
-  connecting: 'conectando',
-  disconnected: 'desconectado',
-  error: 'erro',
+  "Manage MCP servers": "Gerenciar servidores MCP",
+  "Server Detail": "Detalhes do servidor",
+  "Disable Server": "Desativar servidor",
+  Tools: "Ferramentas",
+  "Tool Detail": "Detalhes da ferramenta",
+  "MCP Management": "Gerenciamento MCP",
+  "Loading...": "Carregando...",
+  "Unknown step": "Etapa desconhecida",
+  "Esc to back": "Esc para voltar",
+  "↑↓ to navigate · Enter to select · Esc to close": "↑↓ navegar · Enter selecionar · Esc fechar",
+  "↑↓ to navigate · Enter to select · Esc to back": "↑↓ navegar · Enter selecionar · Esc voltar",
+  "↑↓ to navigate · Enter to confirm · Esc to back": "↑↓ navegar · Enter confirmar · Esc voltar",
+  "User Settings (global)": "Configurações do usuário (global)",
+  "Workspace Settings (project-specific)": "Configurações do workspace (específico do projeto)",
+  "Disable server:": "Desativar servidor:",
+  "Select where to add the server to the exclude list:":
+    "Selecione onde adicionar o servidor à lista de exclusão:",
+  "Press Enter to confirm, Esc to cancel": "Enter para confirmar, Esc para cancelar",
+  Disable: "Desativar",
+  Enable: "Ativar",
+  Authenticate: "Autenticar",
+  "Re-authenticate": "Reautenticar",
+  "Clear Authentication": "Limpar autenticação",
+  disabled: "desativado",
+  "Server:": "Servidor:",
+  Reconnect: "Reconectar",
+  "View tools": "Ver ferramentas",
+  "Status:": "Status:",
+  "Source:": "Fonte:",
+  "Command:": "Comando:",
+  "Working Directory:": "Diretório de trabalho:",
+  "Capabilities:": "Capacidades:",
+  "No server selected": "Nenhum servidor selecionado",
+  "(disabled)": "(desativado)",
+  "Error:": "Erro:",
+  tool: "ferramenta",
+  tools: "ferramentas",
+  connected: "conectado",
+  connecting: "conectando",
+  disconnected: "desconectado",
+  error: "erro",
 
   // MCP Server List
-  'User MCPs': 'MCPs do usuário',
-  'Project MCPs': 'MCPs do projeto',
-  'Extension MCPs': 'MCPs de extensão',
-  server: 'servidor',
-  servers: 'servidores',
-  'Add MCP servers to your settings to get started.':
-    'Adicione servidores MCP às suas configurações para começar.',
-  'Run qwen --debug to see error logs':
-    'Execute qwen --debug para ver os logs de erro',
+  "User MCPs": "MCPs do usuário",
+  "Project MCPs": "MCPs do projeto",
+  "Extension MCPs": "MCPs de extensão",
+  server: "servidor",
+  servers: "servidores",
+  "Add MCP servers to your settings to get started.":
+    "Adicione servidores MCP às suas configurações para começar.",
+  "Run qwen --debug to see error logs": "Execute qwen --debug para ver os logs de erro",
 
   // MCP OAuth Authentication
-  'OAuth Authentication': 'Autenticação OAuth',
-  'Press Enter to start authentication, Esc to go back':
-    'Pressione Enter para iniciar a autenticação, Esc para voltar',
-  'Authenticating... Please complete the login in your browser.':
-    'Autenticando... Por favor, conclua o login no seu navegador.',
-  'Press Enter or Esc to go back': 'Pressione Enter ou Esc para voltar',
+  "OAuth Authentication": "Autenticação OAuth",
+  "Press Enter to start authentication, Esc to go back":
+    "Pressione Enter para iniciar a autenticação, Esc para voltar",
+  "Authenticating... Please complete the login in your browser.":
+    "Autenticando... Por favor, conclua o login no seu navegador.",
+  "Press Enter or Esc to go back": "Pressione Enter ou Esc para voltar",
 
   // MCP Tool List
-  'No tools available for this server.':
-    'Nenhuma ferramenta disponível para este servidor.',
-  destructive: 'destrutivo',
-  'read-only': 'somente leitura',
-  'open-world': 'mundo aberto',
-  idempotent: 'idempotente',
-  'Tools for {{name}}': 'Ferramentas para {{name}}',
-  'Tools for {{serverName}}': 'Ferramentas para {{serverName}}',
-  '{{current}}/{{total}}': '{{current}}/{{total}}',
+  "No tools available for this server.": "Nenhuma ferramenta disponível para este servidor.",
+  destructive: "destrutivo",
+  "read-only": "somente leitura",
+  "open-world": "mundo aberto",
+  idempotent: "idempotente",
+  "Tools for {{name}}": "Ferramentas para {{name}}",
+  "Tools for {{serverName}}": "Ferramentas para {{serverName}}",
+  "{{current}}/{{total}}": "{{current}}/{{total}}",
 
   // MCP Tool Detail
-  required: 'obrigatório',
-  Type: 'Tipo',
-  Enum: 'Enumeração',
-  Parameters: 'Parâmetros',
-  'No tool selected': 'Nenhuma ferramenta selecionada',
-  Annotations: 'Anotações',
-  Title: 'Título',
-  'Read Only': 'Somente leitura',
-  Destructive: 'Destrutivo',
-  Idempotent: 'Idempotente',
-  'Open World': 'Mundo aberto',
-  Server: 'Servidor',
+  required: "obrigatório",
+  Type: "Tipo",
+  Enum: "Enumeração",
+  Parameters: "Parâmetros",
+  "No tool selected": "Nenhuma ferramenta selecionada",
+  Annotations: "Anotações",
+  Title: "Título",
+  "Read Only": "Somente leitura",
+  Destructive: "Destrutivo",
+  Idempotent: "Idempotente",
+  "Open World": "Mundo aberto",
+  Server: "Servidor",
 
   // Invalid tool related translations
-  '{{count}} invalid tools': '{{count}} ferramentas inválidas',
-  invalid: 'inválido',
-  'invalid: {{reason}}': 'inválido: {{reason}}',
-  'missing name': 'nome ausente',
-  'missing description': 'descrição ausente',
-  '(unnamed)': '(sem nome)',
-  'Warning: This tool cannot be called by the LLM':
-    'Aviso: Esta ferramenta não pode ser chamada pelo LLM',
-  Reason: 'Motivo',
-  'Tools must have both name and description to be used by the LLM.':
-    'As ferramentas devem ter tanto nome quanto descrição para serem usadas pelo LLM.',
-  'Modify in progress:': 'Modificação em progresso:',
-  'Save and close external editor to continue':
-    'Salve e feche o editor externo para continuar',
-  'Apply this change?': 'Aplicar esta alteração?',
-  'Yes, allow always': 'Sim, permitir sempre',
-  'Modify with external editor': 'Modificar com editor externo',
-  'No, suggest changes (esc)': 'Não, sugerir alterações (esc)',
-  "Allow execution of: '{{command}}'?":
-    "Permitir a execução de: '{{command}}'?",
-  'Yes, allow always ...': 'Sim, permitir sempre ...',
-  'Always allow in this project': 'Sempre permitir neste projeto',
-  'Always allow {{action}} in this project':
-    'Sempre permitir {{action}} neste projeto',
-  'Always allow for this user': 'Sempre permitir para este usuário',
-  'Always allow {{action}} for this user':
-    'Sempre permitir {{action}} para este usuário',
-  'Yes, restore previous mode ({{mode}})':
-    'Sim, restaurar modo anterior ({{mode}})',
-  'Yes, and auto-accept edits': 'Sim, e aceitar edições automaticamente',
-  'Yes, and manually approve edits': 'Sim, e aprovar edições manualmente',
-  'No, keep planning (esc)': 'Não, continuar planejando (esc)',
-  'URLs to fetch:': 'URLs para buscar:',
-  'MCP Server: {{server}}': 'Servidor MCP: {{server}}',
-  'Tool: {{tool}}': 'Ferramenta: {{tool}}',
+  "{{count}} invalid tools": "{{count}} ferramentas inválidas",
+  invalid: "inválido",
+  "invalid: {{reason}}": "inválido: {{reason}}",
+  "missing name": "nome ausente",
+  "missing description": "descrição ausente",
+  "(unnamed)": "(sem nome)",
+  "Warning: This tool cannot be called by the LLM":
+    "Aviso: Esta ferramenta não pode ser chamada pelo LLM",
+  Reason: "Motivo",
+  "Tools must have both name and description to be used by the LLM.":
+    "As ferramentas devem ter tanto nome quanto descrição para serem usadas pelo LLM.",
+  "Modify in progress:": "Modificação em progresso:",
+  "Save and close external editor to continue": "Salve e feche o editor externo para continuar",
+  "Apply this change?": "Aplicar esta alteração?",
+  "Yes, allow always": "Sim, permitir sempre",
+  "Modify with external editor": "Modificar com editor externo",
+  "No, suggest changes (esc)": "Não, sugerir alterações (esc)",
+  "Allow execution of: '{{command}}'?": "Permitir a execução de: '{{command}}'?",
+  "Yes, allow always ...": "Sim, permitir sempre ...",
+  "Always allow in this project": "Sempre permitir neste projeto",
+  "Always allow {{action}} in this project": "Sempre permitir {{action}} neste projeto",
+  "Always allow for this user": "Sempre permitir para este usuário",
+  "Always allow {{action}} for this user": "Sempre permitir {{action}} para este usuário",
+  "Yes, restore previous mode ({{mode}})": "Sim, restaurar modo anterior ({{mode}})",
+  "Yes, and auto-accept edits": "Sim, e aceitar edições automaticamente",
+  "Yes, and manually approve edits": "Sim, e aprovar edições manualmente",
+  "No, keep planning (esc)": "Não, continuar planejando (esc)",
+  "URLs to fetch:": "URLs para buscar:",
+  "MCP Server: {{server}}": "Servidor MCP: {{server}}",
+  "Tool: {{tool}}": "Ferramenta: {{tool}}",
   'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?':
     'Permitir a execução da ferramenta MCP "{{tool}}" do servidor "{{server}}"?',
   'Yes, always allow tool "{{tool}}" from server "{{server}}"':
@@ -1208,738 +1117,696 @@ export default {
   // ============================================================================
   // Dialogs - Shell Confirmation
   // ============================================================================
-  'Shell Command Execution': 'Execução de Comando Shell',
-  'A custom command wants to run the following shell commands:':
-    'Um comando personalizado deseja executar os seguintes comandos shell:',
+  "Shell Command Execution": "Execução de Comando Shell",
+  "A custom command wants to run the following shell commands:":
+    "Um comando personalizado deseja executar os seguintes comandos shell:",
 
   // ============================================================================
   // Dialogs - Pro Quota
   // ============================================================================
-  'Pro quota limit reached for {{model}}.':
-    'Limite de cota Pro atingido para {{model}}.',
-  'Change auth (executes the /auth command)':
-    'Alterar autenticação (executa o comando /auth)',
-  'Continue with {{model}}': 'Continuar com {{model}}',
+  "Pro quota limit reached for {{model}}.": "Limite de cota Pro atingido para {{model}}.",
+  "Change auth (executes the /auth command)": "Alterar autenticação (executa o comando /auth)",
+  "Continue with {{model}}": "Continuar com {{model}}",
 
   // ============================================================================
   // Dialogs - Welcome Back
   // ============================================================================
-  'Current Plan:': 'Plano Atual:',
-  'Progress: {{done}}/{{total}} tasks completed':
-    'Progresso: {{done}}/{{total}} tarefas concluídas',
-  ', {{inProgress}} in progress': ', {{inProgress}} em progresso',
-  'Pending Tasks:': 'Tarefas Pendentes:',
-  'What would you like to do?': 'O que você gostaria de fazer?',
-  'Choose how to proceed with your session:':
-    'Escolha como proceder com sua sessão:',
-  'Start new chat session': 'Iniciar nova sessão de chat',
-  'Continue previous conversation': 'Continuar conversa anterior',
-  '👋 Welcome back! (Last updated: {{timeAgo}})':
-    '👋 Bem-vindo de volta! (Última atualização: {{timeAgo}})',
-  '🎯 Overall Goal:': '🎯 Objetivo Geral:',
+  "Current Plan:": "Plano Atual:",
+  "Progress: {{done}}/{{total}} tasks completed":
+    "Progresso: {{done}}/{{total}} tarefas concluídas",
+  ", {{inProgress}} in progress": ", {{inProgress}} em progresso",
+  "Pending Tasks:": "Tarefas Pendentes:",
+  "What would you like to do?": "O que você gostaria de fazer?",
+  "Choose how to proceed with your session:": "Escolha como proceder com sua sessão:",
+  "Start new chat session": "Iniciar nova sessão de chat",
+  "Continue previous conversation": "Continuar conversa anterior",
+  "👋 Welcome back! (Last updated: {{timeAgo}})":
+    "👋 Bem-vindo de volta! (Última atualização: {{timeAgo}})",
+  "🎯 Overall Goal:": "🎯 Objetivo Geral:",
 
   // ============================================================================
   // Dialogs - Auth
   // ============================================================================
-  'Get started': 'Começar',
-  'Select Authentication Method': 'Selecionar Método de Autenticação',
-  'OpenAI API key is required to use OpenAI authentication.':
-    'A chave da API do OpenAI é necessária para usar a autenticação do OpenAI.',
-  'You must select an auth method to proceed. Press Ctrl+C again to exit.':
-    'Você deve selecionar um método de autenticação para prosseguir. Pressione Ctrl+C novamente para sair.',
-  'Terms of Services and Privacy Notice':
-    'Termos de Serviço e Aviso de Privacidade',
-  'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models':
-    'Pago \u00B7 Até 6.000 solicitações/5 hrs \u00B7 Todos os modelos Alibaba Cloud Coding Plan',
-  'Alibaba Cloud Coding Plan': 'Alibaba Cloud Coding Plan',
-  'Bring your own API key': 'Traga sua própria chave API',
-  'API-KEY': 'API-KEY',
-  'Use coding plan credentials or your own api-keys/providers.':
-    'Use credenciais do Coding Plan ou suas próprias chaves API/provedores.',
-  OpenAI: 'OpenAI',
-  'Failed to login. Message: {{message}}':
-    'Falha ao fazer login. Mensagem: {{message}}',
-  'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.':
-    'A autenticação é forçada para {{enforcedType}}, mas você está usando {{currentType}} no momento.',
-  'Please visit this URL to authorize:': 'Visite esta URL para autorizar:',
-  'Or scan the QR code below:': 'Ou escaneie o código QR abaixo:',
-  'Waiting for authorization': 'Aguardando autorização',
-  'Time remaining:': 'Tempo restante:',
-  '(Press ESC or CTRL+C to cancel)': '(Pressione ESC ou CTRL+C para cancelar)',
-  'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.':
-    'Token OAuth expirado (mais de {{seconds}} segundos). Selecione o método de autenticação novamente.',
-  'Press any key to return to authentication type selection.':
-    'Pressione qualquer tecla para retornar à seleção do tipo de autenticação.',
-  'Authentication timed out. Please try again.':
-    'A autenticação expirou. Tente novamente.',
-  'Waiting for auth... (Press ESC or CTRL+C to cancel)':
-    'Aguardando autenticação... (Pressione ESC ou CTRL+C para cancelar)',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    'Chave de API ausente para autenticação compatível com OpenAI. Defina settings.security.auth.apiKey ou a variável de ambiente {{envKeyHint}}.',
-  '{{envKeyHint}} environment variable not found.':
-    'Variável de ambiente {{envKeyHint}} não encontrada.',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    'Variável de ambiente {{envKeyHint}} não encontrada. Defina-a no seu arquivo .env ou variáveis de ambiente.',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    'Variável de ambiente {{envKeyHint}} não encontrada (ou defina settings.security.auth.apiKey). Defina-a no seu arquivo .env ou variáveis de ambiente.',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    'Chave de API ausente para autenticação compatível com OpenAI. Defina a variável de ambiente {{envKeyHint}}.',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'Provedor Anthropic sem a baseUrl necessária em modelProviders[].baseUrl.',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    'Variável de ambiente ANTHROPIC_BASE_URL não encontrada.',
-  'Invalid auth method selected.':
-    'Método de autenticação inválido selecionado.',
-  'Failed to authenticate. Message: {{message}}':
-    'Falha ao autenticar. Mensagem: {{message}}',
-  'Authenticated successfully with {{authType}} credentials.':
-    'Autenticado com sucesso com credenciais {{authType}}.',
+  "Get started": "Começar",
+  "Select Authentication Method": "Selecionar Método de Autenticação",
+  "OpenAI API key is required to use OpenAI authentication.":
+    "A chave da API do OpenAI é necessária para usar a autenticação do OpenAI.",
+  "You must select an auth method to proceed. Press Ctrl+C again to exit.":
+    "Você deve selecionar um método de autenticação para prosseguir. Pressione Ctrl+C novamente para sair.",
+  "Terms of Services and Privacy Notice": "Termos de Serviço e Aviso de Privacidade",
+  "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models":
+    "Pago \u00B7 Até 6.000 solicitações/5 hrs \u00B7 Todos os modelos Alibaba Cloud Coding Plan",
+  "Alibaba Cloud Coding Plan": "Alibaba Cloud Coding Plan",
+  "Bring your own API key": "Traga sua própria chave API",
+  "API-KEY": "API-KEY",
+  "Use coding plan credentials or your own api-keys/providers.":
+    "Use credenciais do Coding Plan ou suas próprias chaves API/provedores.",
+  OpenAI: "OpenAI",
+  "Failed to login. Message: {{message}}": "Falha ao fazer login. Mensagem: {{message}}",
+  "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.":
+    "A autenticação é forçada para {{enforcedType}}, mas você está usando {{currentType}} no momento.",
+  "Please visit this URL to authorize:": "Visite esta URL para autorizar:",
+  "Or scan the QR code below:": "Ou escaneie o código QR abaixo:",
+  "Waiting for authorization": "Aguardando autorização",
+  "Time remaining:": "Tempo restante:",
+  "(Press ESC or CTRL+C to cancel)": "(Pressione ESC ou CTRL+C para cancelar)",
+  "OAuth token expired (over {{seconds}} seconds). Please select authentication method again.":
+    "Token OAuth expirado (mais de {{seconds}} segundos). Selecione o método de autenticação novamente.",
+  "Press any key to return to authentication type selection.":
+    "Pressione qualquer tecla para retornar à seleção do tipo de autenticação.",
+  "Authentication timed out. Please try again.": "A autenticação expirou. Tente novamente.",
+  "Waiting for auth... (Press ESC or CTRL+C to cancel)":
+    "Aguardando autenticação... (Pressione ESC ou CTRL+C para cancelar)",
+  "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.":
+    "Chave de API ausente para autenticação compatível com OpenAI. Defina settings.security.auth.apiKey ou a variável de ambiente {{envKeyHint}}.",
+  "{{envKeyHint}} environment variable not found.":
+    "Variável de ambiente {{envKeyHint}} não encontrada.",
+  "{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.":
+    "Variável de ambiente {{envKeyHint}} não encontrada. Defina-a no seu arquivo .env ou variáveis de ambiente.",
+  "{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.":
+    "Variável de ambiente {{envKeyHint}} não encontrada (ou defina settings.security.auth.apiKey). Defina-a no seu arquivo .env ou variáveis de ambiente.",
+  "Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.":
+    "Chave de API ausente para autenticação compatível com OpenAI. Defina a variável de ambiente {{envKeyHint}}.",
+  "Anthropic provider missing required baseUrl in modelProviders[].baseUrl.":
+    "Provedor Anthropic sem a baseUrl necessária em modelProviders[].baseUrl.",
+  "ANTHROPIC_BASE_URL environment variable not found.":
+    "Variável de ambiente ANTHROPIC_BASE_URL não encontrada.",
+  "Invalid auth method selected.": "Método de autenticação inválido selecionado.",
+  "Failed to authenticate. Message: {{message}}": "Falha ao autenticar. Mensagem: {{message}}",
+  "Authenticated successfully with {{authType}} credentials.":
+    "Autenticado com sucesso com credenciais {{authType}}.",
   'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}':
     'Valor QWEN_DEFAULT_AUTH_TYPE inválido: "{{value}}". Valores válidos são: {{validValues}}',
-  'OpenAI Configuration Required': 'Configuração do OpenAI Necessária',
-  'Please enter your OpenAI configuration. You can get an API key from':
-    'Insira sua configuração do OpenAI. Você pode obter uma chave de API de',
-  'API Key:': 'Chave da API:',
-  'Invalid credentials: {{errorMessage}}':
-    'Credenciais inválidas: {{errorMessage}}',
-  'Failed to validate credentials': 'Falha ao validar credenciais',
-  'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel':
-    'Pressione Enter para continuar, Tab/↑↓ para navegar, Esc para cancelar',
+  "OpenAI Configuration Required": "Configuração do OpenAI Necessária",
+  "Please enter your OpenAI configuration. You can get an API key from":
+    "Insira sua configuração do OpenAI. Você pode obter uma chave de API de",
+  "API Key:": "Chave da API:",
+  "Invalid credentials: {{errorMessage}}": "Credenciais inválidas: {{errorMessage}}",
+  "Failed to validate credentials": "Falha ao validar credenciais",
+  "Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel":
+    "Pressione Enter para continuar, Tab/↑↓ para navegar, Esc para cancelar",
 
   // ============================================================================
   // Dialogs - Model
   // ============================================================================
-  'Select Model': 'Selecionar Modelo',
-  '(Press Esc to close)': '(Pressione Esc para fechar)',
-  'Current (effective) configuration': 'Configuração atual (efetiva)',
-  AuthType: 'AuthType',
-  'API Key': 'Chave da API',
-  unset: 'não definido',
-  '(default)': '(padrão)',
-  '(set)': '(definido)',
-  '(not set)': '(não definido)',
-  Modality: 'Modalidade',
-  'Context Window': 'Janela de Contexto',
-  text: 'texto',
-  'text-only': 'somente texto',
-  image: 'imagem',
-  pdf: 'PDF',
-  audio: 'áudio',
-  video: 'vídeo',
-  'not set': 'não definido',
-  none: 'nenhum',
-  unknown: 'desconhecido',
+  "Select Model": "Selecionar Modelo",
+  "(Press Esc to close)": "(Pressione Esc para fechar)",
+  "Current (effective) configuration": "Configuração atual (efetiva)",
+  AuthType: "AuthType",
+  "API Key": "Chave da API",
+  unset: "não definido",
+  "(default)": "(padrão)",
+  "(set)": "(definido)",
+  "(not set)": "(não definido)",
+  Modality: "Modalidade",
+  "Context Window": "Janela de Contexto",
+  text: "texto",
+  "text-only": "somente texto",
+  image: "imagem",
+  pdf: "PDF",
+  audio: "áudio",
+  video: "vídeo",
+  "not set": "não definido",
+  none: "nenhum",
+  unknown: "desconhecido",
   "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
     "Falha ao trocar o modelo para '{{modelId}}'.\n\n{{error}}",
-  'Qwen 3.6 Plus — efficient hybrid model with leading coding performance':
-    'Qwen 3.6 Plus — modelo híbrido eficiente com desempenho líder em programação',
-  'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
-    'O modelo Qwen Vision mais recente do Alibaba Cloud ModelStudio (versão: qwen3-vl-plus-2025-09-23)',
+  "Qwen 3.6 Plus — efficient hybrid model with leading coding performance":
+    "Qwen 3.6 Plus — modelo híbrido eficiente com desempenho líder em programação",
+  "The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)":
+    "O modelo Qwen Vision mais recente do Alibaba Cloud ModelStudio (versão: qwen3-vl-plus-2025-09-23)",
 
   // ============================================================================
   // Dialogs - Permissions
   // ============================================================================
-  'Manage folder trust settings':
-    'Gerenciar configurações de confiança de pasta',
-  'Manage permission rules': 'Gerenciar regras de permissão',
-  Allow: 'Permitir',
-  Ask: 'Perguntar',
-  Deny: 'Negar',
-  Workspace: 'Área de trabalho',
+  "Manage folder trust settings": "Gerenciar configurações de confiança de pasta",
+  "Manage permission rules": "Gerenciar regras de permissão",
+  Allow: "Permitir",
+  Ask: "Perguntar",
+  Deny: "Negar",
+  Workspace: "Área de trabalho",
   "Qwen Code won't ask before using allowed tools.":
-    'O Qwen Code não perguntará antes de usar ferramentas permitidas.',
-  'Qwen Code will ask before using these tools.':
-    'O Qwen Code perguntará antes de usar essas ferramentas.',
-  'Qwen Code is not allowed to use denied tools.':
-    'O Qwen Code não tem permissão para usar ferramentas negadas.',
-  'Manage trusted directories for this workspace.':
-    'Gerenciar diretórios confiáveis para esta área de trabalho.',
-  'Any use of the {{tool}} tool': 'Qualquer uso da ferramenta {{tool}}',
-  "{{tool}} commands matching '{{pattern}}'":
-    "Comandos {{tool}} correspondentes a '{{pattern}}'",
-  'From user settings': 'Das configurações do usuário',
-  'From project settings': 'Das configurações do projeto',
-  'From session': 'Da sessão',
-  'Project settings (local)': 'Configurações do projeto (local)',
-  'Saved in .qwen/settings.local.json': 'Salvo em .qwen/settings.local.json',
-  'Project settings': 'Configurações do projeto',
-  'Checked in at .qwen/settings.json': 'Registrado em .qwen/settings.json',
-  'User settings': 'Configurações do usuário',
-  'Saved in at ~/.qwen/settings.json': 'Salvo em ~/.qwen/settings.json',
-  'Add a new rule…': 'Adicionar nova regra…',
-  'Add {{type}} permission rule': 'Adicionar regra de permissão {{type}}',
-  'Permission rules are a tool name, optionally followed by a specifier in parentheses.':
-    'Regras de permissão são um nome de ferramenta, opcionalmente seguido por um especificador entre parênteses.',
-  'e.g.,': 'ex.',
-  or: 'ou',
-  'Enter permission rule…': 'Insira a regra de permissão…',
-  'Enter to submit · Esc to cancel': 'Enter para enviar · Esc para cancelar',
-  'Where should this rule be saved?': 'Onde esta regra deve ser salva?',
-  'Enter to confirm · Esc to cancel':
-    'Enter para confirmar · Esc para cancelar',
-  'Delete {{type}} rule?': 'Excluir regra {{type}}?',
-  'Are you sure you want to delete this permission rule?':
-    'Tem certeza de que deseja excluir esta regra de permissão?',
-  'Permissions:': 'Permissões:',
-  '(←/→ or tab to cycle)': '(←/→ ou Tab para alternar)',
-  'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel':
-    '↑↓ para navegar · Enter para selecionar · Digite para pesquisar · Esc para cancelar',
-  'Search…': 'Pesquisar…',
-  'Use /trust to manage folder trust settings for this workspace.':
-    'Use /trust para gerenciar as configurações de confiança de pasta desta área de trabalho.',
+    "O Qwen Code não perguntará antes de usar ferramentas permitidas.",
+  "Qwen Code will ask before using these tools.":
+    "O Qwen Code perguntará antes de usar essas ferramentas.",
+  "Qwen Code is not allowed to use denied tools.":
+    "O Qwen Code não tem permissão para usar ferramentas negadas.",
+  "Manage trusted directories for this workspace.":
+    "Gerenciar diretórios confiáveis para esta área de trabalho.",
+  "Any use of the {{tool}} tool": "Qualquer uso da ferramenta {{tool}}",
+  "{{tool}} commands matching '{{pattern}}'": "Comandos {{tool}} correspondentes a '{{pattern}}'",
+  "From user settings": "Das configurações do usuário",
+  "From project settings": "Das configurações do projeto",
+  "From session": "Da sessão",
+  "Project settings (local)": "Configurações do projeto (local)",
+  "Saved in .qwen/settings.local.json": "Salvo em .qwen/settings.local.json",
+  "Project settings": "Configurações do projeto",
+  "Checked in at .qwen/settings.json": "Registrado em .qwen/settings.json",
+  "User settings": "Configurações do usuário",
+  "Saved in at ~/.qwen/settings.json": "Salvo em ~/.qwen/settings.json",
+  "Add a new rule…": "Adicionar nova regra…",
+  "Add {{type}} permission rule": "Adicionar regra de permissão {{type}}",
+  "Permission rules are a tool name, optionally followed by a specifier in parentheses.":
+    "Regras de permissão são um nome de ferramenta, opcionalmente seguido por um especificador entre parênteses.",
+  "e.g.,": "ex.",
+  or: "ou",
+  "Enter permission rule…": "Insira a regra de permissão…",
+  "Enter to submit · Esc to cancel": "Enter para enviar · Esc para cancelar",
+  "Where should this rule be saved?": "Onde esta regra deve ser salva?",
+  "Enter to confirm · Esc to cancel": "Enter para confirmar · Esc para cancelar",
+  "Delete {{type}} rule?": "Excluir regra {{type}}?",
+  "Are you sure you want to delete this permission rule?":
+    "Tem certeza de que deseja excluir esta regra de permissão?",
+  "Permissions:": "Permissões:",
+  "(←/→ or tab to cycle)": "(←/→ ou Tab para alternar)",
+  "Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel":
+    "↑↓ para navegar · Enter para selecionar · Digite para pesquisar · Esc para cancelar",
+  "Search…": "Pesquisar…",
+  "Use /trust to manage folder trust settings for this workspace.":
+    "Use /trust para gerenciar as configurações de confiança de pasta desta área de trabalho.",
   // Workspace directory management
-  'Add directory…': 'Adicionar diretório…',
-  'Add directory to workspace': 'Adicionar diretório à área de trabalho',
-  'Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.':
-    'O Qwen Code pode ler arquivos na área de trabalho e fazer edições quando a aceitação automática está ativada.',
-  'Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.':
-    'O Qwen Code poderá ler arquivos neste diretório e fazer edições quando a aceitação automática está ativada.',
-  'Enter the path to the directory:': 'Insira o caminho do diretório:',
-  'Enter directory path…': 'Insira o caminho do diretório…',
-  'Tab to complete · Enter to add · Esc to cancel':
-    'Tab para completar · Enter para adicionar · Esc para cancelar',
-  'Remove directory?': 'Remover diretório?',
-  'Are you sure you want to remove this directory from the workspace?':
-    'Tem certeza de que deseja remover este diretório da área de trabalho?',
-  '  (Original working directory)': '  (Diretório de trabalho original)',
-  '  (from settings)': '  (das configurações)',
-  'Directory does not exist.': 'O diretório não existe.',
-  'Path is not a directory.': 'O caminho não é um diretório.',
-  'This directory is already in the workspace.':
-    'Este diretório já está na área de trabalho.',
-  'Already covered by existing directory: {{dir}}':
-    'Já coberto pelo diretório existente: {{dir}}',
+  "Add directory…": "Adicionar diretório…",
+  "Add directory to workspace": "Adicionar diretório à área de trabalho",
+  "Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.":
+    "O Qwen Code pode ler arquivos na área de trabalho e fazer edições quando a aceitação automática está ativada.",
+  "Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.":
+    "O Qwen Code poderá ler arquivos neste diretório e fazer edições quando a aceitação automática está ativada.",
+  "Enter the path to the directory:": "Insira o caminho do diretório:",
+  "Enter directory path…": "Insira o caminho do diretório…",
+  "Tab to complete · Enter to add · Esc to cancel":
+    "Tab para completar · Enter para adicionar · Esc para cancelar",
+  "Remove directory?": "Remover diretório?",
+  "Are you sure you want to remove this directory from the workspace?":
+    "Tem certeza de que deseja remover este diretório da área de trabalho?",
+  "  (Original working directory)": "  (Diretório de trabalho original)",
+  "  (from settings)": "  (das configurações)",
+  "Directory does not exist.": "O diretório não existe.",
+  "Path is not a directory.": "O caminho não é um diretório.",
+  "This directory is already in the workspace.": "Este diretório já está na área de trabalho.",
+  "Already covered by existing directory: {{dir}}": "Já coberto pelo diretório existente: {{dir}}",
 
   // ============================================================================
   // Status Bar
   // ============================================================================
-  'Using:': 'Usando:',
-  '{{count}} open file': '{{count}} arquivo aberto',
-  '{{count}} open files': '{{count}} arquivos abertos',
-  '(ctrl+g to view)': '(ctrl+g para ver)',
-  '{{count}} {{name}} file': '{{count}} arquivo {{name}}',
-  '{{count}} {{name}} files': '{{count}} arquivos {{name}}',
-  '{{count}} MCP server': '{{count}} servidor MCP',
-  '{{count}} MCP servers': '{{count}} servidores MCP',
-  '{{count}} Blocked': '{{count}} Bloqueados',
-  '(ctrl+t to view)': '(ctrl+t para ver)',
-  '(ctrl+t to toggle)': '(ctrl+t para alternar)',
-  'Press Ctrl+C again to exit.': 'Pressione Ctrl+C novamente para sair.',
-  'Press Ctrl+D again to exit.': 'Pressione Ctrl+D novamente para sair.',
-  'Press Esc again to clear.': 'Pressione Esc novamente para limpar.',
+  "Using:": "Usando:",
+  "{{count}} open file": "{{count}} arquivo aberto",
+  "{{count}} open files": "{{count}} arquivos abertos",
+  "(ctrl+g to view)": "(ctrl+g para ver)",
+  "{{count}} {{name}} file": "{{count}} arquivo {{name}}",
+  "{{count}} {{name}} files": "{{count}} arquivos {{name}}",
+  "{{count}} MCP server": "{{count}} servidor MCP",
+  "{{count}} MCP servers": "{{count}} servidores MCP",
+  "{{count}} Blocked": "{{count}} Bloqueados",
+  "(ctrl+t to view)": "(ctrl+t para ver)",
+  "(ctrl+t to toggle)": "(ctrl+t para alternar)",
+  "Press Ctrl+C again to exit.": "Pressione Ctrl+C novamente para sair.",
+  "Press Ctrl+D again to exit.": "Pressione Ctrl+D novamente para sair.",
+  "Press Esc again to clear.": "Pressione Esc novamente para limpar.",
 
   // ============================================================================
   // MCP Status
   // ============================================================================
-  'No MCP servers configured.': 'Nenhum servidor MCP configurado.',
-  '⏳ MCP servers are starting up ({{count}} initializing)...':
-    '⏳ Servidores MCP estão iniciando ({{count}} inicializando)...',
-  'Note: First startup may take longer. Tool availability will update automatically.':
-    'Nota: A primeira inicialização pode demorar mais. A disponibilidade da ferramenta será atualizada automaticamente.',
-  'Configured MCP servers:': 'Servidores MCP configurados:',
-  Ready: 'Pronto',
-  'Starting... (first startup may take longer)':
-    'Iniciando... (a primeira inicialização pode demorar mais)',
-  Disconnected: 'Desconectado',
-  '{{count}} tool': '{{count}} ferramenta',
-  '{{count}} tools': '{{count}} ferramentas',
-  '{{count}} prompt': '{{count}} prompt',
-  '{{count}} prompts': '{{count}} prompts',
-  '(from {{extensionName}})': '(de {{extensionName}})',
-  OAuth: 'OAuth',
-  'OAuth expired': 'OAuth expirado',
-  'OAuth not authenticated': 'OAuth não autenticado',
-  'tools and prompts will appear when ready':
-    'ferramentas e prompts aparecerão quando estiverem prontos',
-  '{{count}} tools cached': '{{count}} ferramentas em cache',
-  'Tools:': 'Ferramentas:',
-  'Parameters:': 'Parâmetros:',
-  'Prompts:': 'Prompts:',
-  Blocked: 'Bloqueado',
-  '💡 Tips:': '💡 Dicas:',
-  Use: 'Use',
-  'to show server and tool descriptions':
-    'para mostrar descrições de servidores e ferramentas',
-  'to show tool parameter schemas':
-    'para mostrar esquemas de parâmetros de ferramentas',
-  'to hide descriptions': 'para ocultar descrições',
-  'to authenticate with OAuth-enabled servers':
-    'para autenticar com servidores habilitados para OAuth',
-  Press: 'Pressione',
-  'to toggle tool descriptions on/off':
-    'para alternar descrições de ferramentas ligadas/desligadas',
+  "No MCP servers configured.": "Nenhum servidor MCP configurado.",
+  "⏳ MCP servers are starting up ({{count}} initializing)...":
+    "⏳ Servidores MCP estão iniciando ({{count}} inicializando)...",
+  "Note: First startup may take longer. Tool availability will update automatically.":
+    "Nota: A primeira inicialização pode demorar mais. A disponibilidade da ferramenta será atualizada automaticamente.",
+  "Configured MCP servers:": "Servidores MCP configurados:",
+  Ready: "Pronto",
+  "Starting... (first startup may take longer)":
+    "Iniciando... (a primeira inicialização pode demorar mais)",
+  Disconnected: "Desconectado",
+  "{{count}} tool": "{{count}} ferramenta",
+  "{{count}} tools": "{{count}} ferramentas",
+  "{{count}} prompt": "{{count}} prompt",
+  "{{count}} prompts": "{{count}} prompts",
+  "(from {{extensionName}})": "(de {{extensionName}})",
+  OAuth: "OAuth",
+  "OAuth expired": "OAuth expirado",
+  "OAuth not authenticated": "OAuth não autenticado",
+  "tools and prompts will appear when ready":
+    "ferramentas e prompts aparecerão quando estiverem prontos",
+  "{{count}} tools cached": "{{count}} ferramentas em cache",
+  "Tools:": "Ferramentas:",
+  "Parameters:": "Parâmetros:",
+  "Prompts:": "Prompts:",
+  Blocked: "Bloqueado",
+  "💡 Tips:": "💡 Dicas:",
+  Use: "Use",
+  "to show server and tool descriptions": "para mostrar descrições de servidores e ferramentas",
+  "to show tool parameter schemas": "para mostrar esquemas de parâmetros de ferramentas",
+  "to hide descriptions": "para ocultar descrições",
+  "to authenticate with OAuth-enabled servers":
+    "para autenticar com servidores habilitados para OAuth",
+  Press: "Pressione",
+  "to toggle tool descriptions on/off":
+    "para alternar descrições de ferramentas ligadas/desligadas",
   "Starting OAuth authentication for MCP server '{{name}}'...":
     "Iniciando autenticação OAuth para servidor MCP '{{name}}'...",
-  'Restarting MCP servers...': 'Reiniciando servidores MCP...',
+  "Restarting MCP servers...": "Reiniciando servidores MCP...",
 
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips:': 'Dicas:',
-  'Use /compress when the conversation gets long to summarize history and free up context.':
-    'Use /compress quando a conversa ficar longa para resumir o histórico e liberar contexto.',
-  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
-    'Comece uma nova ideia com /clear ou /new; a sessão anterior permanece disponível no histórico.',
-  'Use /bug to submit issues to the maintainers when something goes off.':
-    'Use /bug para enviar problemas aos mantenedores quando algo der errado.',
-  'Switch auth type quickly with /auth.':
-    'Troque o tipo de autenticação rapidamente com /auth.',
-  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
-    'Você pode executar quaisquer comandos shell do Qwen Code usando ! (ex: !ls).',
-  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
-    'Digite / para abrir o popup de comandos; Tab autocompleta comandos de barra e prompts salvos.',
-  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
-    'Você pode retomar uma conversa anterior executando qwen --continue ou qwen --resume.',
-  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
-    'Você pode alternar o modo de permissão rapidamente com Shift+Tab ou /approval-mode.',
-  'Try /insight to generate personalized insights from your chat history.':
-    'Experimente /insight para gerar insights personalizados do seu histórico de conversas.',
+  "Tips:": "Dicas:",
+  "Use /compress when the conversation gets long to summarize history and free up context.":
+    "Use /compress quando a conversa ficar longa para resumir o histórico e liberar contexto.",
+  "Start a fresh idea with /clear or /new; the previous session stays available in history.":
+    "Comece uma nova ideia com /clear ou /new; a sessão anterior permanece disponível no histórico.",
+  "Use /bug to submit issues to the maintainers when something goes off.":
+    "Use /bug para enviar problemas aos mantenedores quando algo der errado.",
+  "Switch auth type quickly with /auth.": "Troque o tipo de autenticação rapidamente com /auth.",
+  "You can run any shell commands from Qwen Code using ! (e.g. !ls).":
+    "Você pode executar quaisquer comandos shell do Qwen Code usando ! (ex: !ls).",
+  "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.":
+    "Digite / para abrir o popup de comandos; Tab autocompleta comandos de barra e prompts salvos.",
+  "You can resume a previous conversation by running qwen --continue or qwen --resume.":
+    "Você pode retomar uma conversa anterior executando qwen --continue ou qwen --resume.",
+  "You can switch permission mode quickly with Shift+Tab or /approval-mode.":
+    "Você pode alternar o modo de permissão rapidamente com Shift+Tab ou /approval-mode.",
+  "Try /insight to generate personalized insights from your chat history.":
+    "Experimente /insight para gerar insights personalizados do seu histórico de conversas.",
 
   // ============================================================================
   // Exit Screen / Stats
   // ============================================================================
-  'Agent powering down. Goodbye!': 'Agente desligando. Adeus!',
-  'To continue this session, run': 'Para continuar esta sessão, execute',
-  'Interaction Summary': 'Resumo da Interação',
-  'Session ID:': 'ID da Sessão:',
-  'Tool Calls:': 'Chamadas de Ferramenta:',
-  'Success Rate:': 'Taxa de Sucesso:',
-  'User Agreement:': 'Acordo do Usuário:',
-  reviewed: 'revisado',
-  'Code Changes:': 'Alterações de Código:',
-  Performance: 'Desempenho',
-  'Wall Time:': 'Tempo Total:',
-  'Agent Active:': 'Agente Ativo:',
-  'API Time:': 'Tempo de API:',
-  'Tool Time:': 'Tempo de Ferramenta:',
-  'Session Stats': 'Estatísticas da Sessão',
-  'Model Usage': 'Uso do Modelo',
-  Reqs: 'Reqs',
-  'Input Tokens': 'Tokens de Entrada',
-  'Output Tokens': 'Tokens de Saída',
-  'Savings Highlight:': 'Destaque de Economia:',
-  'of input tokens were served from the cache, reducing costs.':
-    'de tokens de entrada foram servidos do cache, reduzindo custos.',
-  'Tip: For a full token breakdown, run `/stats model`.':
-    'Dica: Para um detalhamento completo de tokens, execute `/stats model`.',
-  'Model Stats For Nerds': 'Estatísticas de Modelo Para Nerds',
-  'Tool Stats For Nerds': 'Estatísticas de Ferramenta Para Nerds',
-  Metric: 'Métrica',
-  API: 'API',
-  Requests: 'Solicitações',
-  Errors: 'Erros',
-  'Avg Latency': 'Latência Média',
-  Tokens: 'Tokens',
-  Total: 'Total',
-  Prompt: 'Prompt',
-  Cached: 'Cacheado',
-  Thoughts: 'Pensamentos',
-  Tool: 'Ferramenta',
-  Output: 'Saída',
-  'No API calls have been made in this session.':
-    'Nenhuma chamada de API foi feita nesta sessão.',
-  'Tool Name': 'Nome da Ferramenta',
-  Calls: 'Chamadas',
-  'Success Rate': 'Taxa de Sucesso',
-  'Avg Duration': 'Duração Média',
-  'User Decision Summary': 'Resumo de Decisão do Usuário',
-  'Total Reviewed Suggestions:': 'Total de Sugestões Revisadas:',
-  ' » Accepted:': ' » Aceitas:',
-  ' » Rejected:': ' » Rejeitadas:',
-  ' » Modified:': ' » Modificadas:',
-  ' Overall Agreement Rate:': ' Taxa Geral de Acordo:',
-  'No tool calls have been made in this session.':
-    'Nenhuma chamada de ferramenta foi feita nesta sessão.',
-  'Session start time is unavailable, cannot calculate stats.':
-    'Hora de início da sessão indisponível, não é possível calcular estatísticas.',
+  "Agent powering down. Goodbye!": "Agente desligando. Adeus!",
+  "To continue this session, run": "Para continuar esta sessão, execute",
+  "Interaction Summary": "Resumo da Interação",
+  "Session ID:": "ID da Sessão:",
+  "Tool Calls:": "Chamadas de Ferramenta:",
+  "Success Rate:": "Taxa de Sucesso:",
+  "User Agreement:": "Acordo do Usuário:",
+  reviewed: "revisado",
+  "Code Changes:": "Alterações de Código:",
+  Performance: "Desempenho",
+  "Wall Time:": "Tempo Total:",
+  "Agent Active:": "Agente Ativo:",
+  "API Time:": "Tempo de API:",
+  "Tool Time:": "Tempo de Ferramenta:",
+  "Session Stats": "Estatísticas da Sessão",
+  "Model Usage": "Uso do Modelo",
+  Reqs: "Reqs",
+  "Input Tokens": "Tokens de Entrada",
+  "Output Tokens": "Tokens de Saída",
+  "Savings Highlight:": "Destaque de Economia:",
+  "of input tokens were served from the cache, reducing costs.":
+    "de tokens de entrada foram servidos do cache, reduzindo custos.",
+  "Tip: For a full token breakdown, run `/stats model`.":
+    "Dica: Para um detalhamento completo de tokens, execute `/stats model`.",
+  "Model Stats For Nerds": "Estatísticas de Modelo Para Nerds",
+  "Tool Stats For Nerds": "Estatísticas de Ferramenta Para Nerds",
+  Metric: "Métrica",
+  API: "API",
+  Requests: "Solicitações",
+  Errors: "Erros",
+  "Avg Latency": "Latência Média",
+  Tokens: "Tokens",
+  Total: "Total",
+  Prompt: "Prompt",
+  Cached: "Cacheado",
+  Thoughts: "Pensamentos",
+  Tool: "Ferramenta",
+  Output: "Saída",
+  "No API calls have been made in this session.": "Nenhuma chamada de API foi feita nesta sessão.",
+  "Tool Name": "Nome da Ferramenta",
+  Calls: "Chamadas",
+  "Success Rate": "Taxa de Sucesso",
+  "Avg Duration": "Duração Média",
+  "User Decision Summary": "Resumo de Decisão do Usuário",
+  "Total Reviewed Suggestions:": "Total de Sugestões Revisadas:",
+  " » Accepted:": " » Aceitas:",
+  " » Rejected:": " » Rejeitadas:",
+  " » Modified:": " » Modificadas:",
+  " Overall Agreement Rate:": " Taxa Geral de Acordo:",
+  "No tool calls have been made in this session.":
+    "Nenhuma chamada de ferramenta foi feita nesta sessão.",
+  "Session start time is unavailable, cannot calculate stats.":
+    "Hora de início da sessão indisponível, não é possível calcular estatísticas.",
 
   // ============================================================================
   // Command Format Migration
   // ============================================================================
-  'Command Format Migration': 'Migração de Formato de Comando',
-  'Found {{count}} TOML command file:':
-    'Encontrado {{count}} arquivo de comando TOML:',
-  'Found {{count}} TOML command files:':
-    'Encontrados {{count}} arquivos de comando TOML:',
-  '... and {{count}} more': '... e mais {{count}}',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'O formato TOML está obsoleto. Você gostaria de migrá-los para o formato Markdown?',
-  '(Backups will be created and original files will be preserved)':
-    '(Backups serão criados e arquivos originais serão preservados)',
+  "Command Format Migration": "Migração de Formato de Comando",
+  "Found {{count}} TOML command file:": "Encontrado {{count}} arquivo de comando TOML:",
+  "Found {{count}} TOML command files:": "Encontrados {{count}} arquivos de comando TOML:",
+  "... and {{count}} more": "... e mais {{count}}",
+  "The TOML format is deprecated. Would you like to migrate them to Markdown format?":
+    "O formato TOML está obsoleto. Você gostaria de migrá-los para o formato Markdown?",
+  "(Backups will be created and original files will be preserved)":
+    "(Backups serão criados e arquivos originais serão preservados)",
 
   // ============================================================================
   // Loading Phrases
   // ============================================================================
-  'Waiting for user confirmation...': 'Aguardando confirmação do usuário...',
-  '(esc to cancel, {{time}})': '(esc para cancelar, {{time}})',
+  "Waiting for user confirmation...": "Aguardando confirmação do usuário...",
+  "(esc to cancel, {{time}})": "(esc para cancelar, {{time}})",
 
   WITTY_LOADING_PHRASES: [
-    'Estou com sorte',
-    'Enviando maravilhas...',
-    'Pintando os serifos de volta...',
-    'Navegando pelo mofo limoso...',
-    'Consultando os espíritos digitais...',
-    'Reticulando splines...',
-    'Aquecendo os hamsters da IA...',
-    'Perguntando à concha mágica...',
-    'Gerando réplica espirituosa...',
-    'Polindo os algoritmos...',
-    'Não apresse a perfeição (ou meu código)...',
-    'Preparando bytes frescos...',
-    'Contando elétrons...',
-    'Engajando processadores cognitivos...',
-    'Verificando erros de sintaxe no universo...',
-    'Um momento, otimizando o humor...',
-    'Embaralhando piadas...',
-    'Desembaraçando redes neurais...',
-    'Compilando brilhantismo...',
-    'Carregando humor.exe...',
-    'Invocando a nuvem da sabedoria...',
-    'Preparando uma resposta espirituosa...',
-    'Só um segundo, estou depurando a realidade...',
-    'Confundindo as opções...',
-    'Sintonizando as frequências cósmicas...',
-    'Criando uma resposta digna da sua paciência...',
-    'Compilando os 1s e 0s...',
-    'Resolvendo dependências... e crises existenciais...',
-    'Desfragmentando memórias... tanto RAM quanto pessoais...',
-    'Reiniciando o módulo de humor...',
-    'Fazendo cache do essencial (principalmente memes de gatos)...',
-    'Otimizando para velocidade absurda',
-    'Trocando bits... não conte para os bytes...',
-    'Coletando lixo... volto já...',
-    'Montando a internet...',
-    'Convertendo café em código...',
-    'Atualizando a sintaxe da realidade...',
-    'Reconectando as sinapses...',
-    'Procurando um ponto e vírgula perdido...',
-    'Lubrificando as engrenagens da máquina...',
-    'Pré-aquecendo os servidores...',
-    'Calibrando o capacitor de fluxo...',
-    'Engajando o motor de improbabilidade...',
-    'Canalizando a Força...',
-    'Alinhando as estrelas para uma resposta ideal...',
-    'Assim dizemos todos...',
-    'Carregando a próxima grande ideia...',
-    'Só um momento, estou na zona...',
-    'Preparando para deslumbrá-lo com brilhantismo...',
-    'Só um tique, estou polindo minha inteligência...',
-    'Segure firme, estou criando uma obra-prima...',
-    'Só um instante, estou depurando o universo...',
-    'Só um momento, estou alinhando os pixels...',
-    'Só um segundo, estou otimizando o humor...',
-    'Só um momento, estou ajustando os algoritmos...',
-    'Velocidade de dobra engajada...',
-    'Minerando mais cristais de Dilithium...',
-    'Não entre em pânico...',
-    'Seguindo o coelho branco...',
-    'A verdade está lá fora... em algum lugar...',
-    'Soprando o cartucho...',
-    'Carregando... Faça um barrel roll!',
-    'Aguardando o respawn...',
-    'Terminando a Kessel Run em menos de 12 parsecs...',
-    'O bolo não é uma mentira, só ainda está carregando...',
-    'Mexendo na tela de criação de personagem...',
-    'Só um momento, estou encontrando o meme certo...',
+    "Estou com sorte",
+    "Enviando maravilhas...",
+    "Pintando os serifos de volta...",
+    "Navegando pelo mofo limoso...",
+    "Consultando os espíritos digitais...",
+    "Reticulando splines...",
+    "Aquecendo os hamsters da IA...",
+    "Perguntando à concha mágica...",
+    "Gerando réplica espirituosa...",
+    "Polindo os algoritmos...",
+    "Não apresse a perfeição (ou meu código)...",
+    "Preparando bytes frescos...",
+    "Contando elétrons...",
+    "Engajando processadores cognitivos...",
+    "Verificando erros de sintaxe no universo...",
+    "Um momento, otimizando o humor...",
+    "Embaralhando piadas...",
+    "Desembaraçando redes neurais...",
+    "Compilando brilhantismo...",
+    "Carregando humor.exe...",
+    "Invocando a nuvem da sabedoria...",
+    "Preparando uma resposta espirituosa...",
+    "Só um segundo, estou depurando a realidade...",
+    "Confundindo as opções...",
+    "Sintonizando as frequências cósmicas...",
+    "Criando uma resposta digna da sua paciência...",
+    "Compilando os 1s e 0s...",
+    "Resolvendo dependências... e crises existenciais...",
+    "Desfragmentando memórias... tanto RAM quanto pessoais...",
+    "Reiniciando o módulo de humor...",
+    "Fazendo cache do essencial (principalmente memes de gatos)...",
+    "Otimizando para velocidade absurda",
+    "Trocando bits... não conte para os bytes...",
+    "Coletando lixo... volto já...",
+    "Montando a internet...",
+    "Convertendo café em código...",
+    "Atualizando a sintaxe da realidade...",
+    "Reconectando as sinapses...",
+    "Procurando um ponto e vírgula perdido...",
+    "Lubrificando as engrenagens da máquina...",
+    "Pré-aquecendo os servidores...",
+    "Calibrando o capacitor de fluxo...",
+    "Engajando o motor de improbabilidade...",
+    "Canalizando a Força...",
+    "Alinhando as estrelas para uma resposta ideal...",
+    "Assim dizemos todos...",
+    "Carregando a próxima grande ideia...",
+    "Só um momento, estou na zona...",
+    "Preparando para deslumbrá-lo com brilhantismo...",
+    "Só um tique, estou polindo minha inteligência...",
+    "Segure firme, estou criando uma obra-prima...",
+    "Só um instante, estou depurando o universo...",
+    "Só um momento, estou alinhando os pixels...",
+    "Só um segundo, estou otimizando o humor...",
+    "Só um momento, estou ajustando os algoritmos...",
+    "Velocidade de dobra engajada...",
+    "Minerando mais cristais de Dilithium...",
+    "Não entre em pânico...",
+    "Seguindo o coelho branco...",
+    "A verdade está lá fora... em algum lugar...",
+    "Soprando o cartucho...",
+    "Carregando... Faça um barrel roll!",
+    "Aguardando o respawn...",
+    "Terminando a Kessel Run em menos de 12 parsecs...",
+    "O bolo não é uma mentira, só ainda está carregando...",
+    "Mexendo na tela de criação de personagem...",
+    "Só um momento, estou encontrando o meme certo...",
     "Pressionando 'A' para continuar...",
-    'Pastoreando gatos digitais...',
-    'Polindo os pixels...',
-    'Encontrando um trocadilho adequado para a tela de carregamento...',
-    'Distraindo você com esta frase espirituosa...',
-    'Quase lá... provavelmente...',
-    'Nossos hamsters estão trabalhando o mais rápido que podem...',
-    'Dando um tapinha na cabeça do Cloudy...',
-    'Acariciando o gato...',
-    'Dando um Rickroll no meu chefe...',
-    'Never gonna give you up, never gonna let you down...',
-    'Tocando o baixo...',
-    'Provando as amoras...',
-    'Estou indo longe, estou indo pela velocidade...',
-    'Isso é vida real? Ou é apenas fantasia?...',
-    'Tenho um bom pressentimento sobre isso...',
-    'Cutucando o urso...',
-    'Fazendo pesquisa sobre os últimos memes...',
-    'Descobrindo como tornar isso mais espirituoso...',
-    'Hmmm... deixe-me pensar...',
-    'O que você chama de um peixe sem olhos? Um pxe...',
-    'Por que o computador foi à terapia? Porque tinha muitos bytes...',
-    'Por que programadores não gostam da natureza? Porque tem muitos bugs...',
-    'Por que programadores preferem o modo escuro? Porque a luz atrai bugs...',
-    'Por que o desenvolvedor faliu? Porque usou todo o seu cache...',
-    'O que você pode fazer com um lápis quebrado? Nada, ele não tem ponta...',
-    'Aplicando manutenção percussiva...',
-    'Procurando a orientação correta do USB...',
-    'Garantindo que a fumaça mágica permaneça dentro dos fios...',
-    'Tentando sair do Vim...',
-    'Girando a roda do hamster...',
-    'Isso não é um bug, é um recurso não documentado...',
-    'Engajar.',
-    'Eu voltarei... com uma resposta.',
-    'Meu outro processo é uma TARDIS...',
-    'Comungando com o espírito da máquina...',
-    'Deixando os pensamentos marinarem...',
-    'Lembrei agora onde coloquei minhas chaves...',
-    'Ponderando a orbe...',
-    'Eu vi coisas que vocês não acreditariam... como um usuário que lê mensagens de carregamento.',
-    'Iniciando olhar pensativo...',
-    'Qual é o lanche favorito de um computador? Microchips.',
-    'Por que desenvolvedores Java usam óculos? Porque eles não C#.',
-    'Carregando o laser... pew pew!',
-    'Dividindo por zero... só brincando!',
-    'Procurando por um supervisor adulto... digo, processando.',
-    'Fazendo bip boop.',
-    'Buffering... porque até as IAs precisam de um momento.',
-    'Entrelaçando partículas quânticas para uma resposta mais rápida...',
-    'Polindo o cromo... nos algoritmos.',
-    'Você não está entretido? (Trabalhando nisso!)',
-    'Invocando os gremlins do código... para ajudar, é claro.',
-    'Só esperando o som da conexão discada terminar...',
-    'Recalibrando o humorômetro.',
-    'Minha outra tela de carregamento é ainda mais engraçada.',
-    'Tenho quase certeza que tem um gato andando no teclado em algum lugar...',
-    'Aumentando... Aumentando... Ainda carregando.',
-    'Não é um bug, é um recurso... desta tela de carregamento.',
-    'Você já tentou desligar e ligar de novo? (A tela de carregamento, não eu.)',
-    'Construindo pilares adicionais...',
+    "Pastoreando gatos digitais...",
+    "Polindo os pixels...",
+    "Encontrando um trocadilho adequado para a tela de carregamento...",
+    "Distraindo você com esta frase espirituosa...",
+    "Quase lá... provavelmente...",
+    "Nossos hamsters estão trabalhando o mais rápido que podem...",
+    "Dando um tapinha na cabeça do Cloudy...",
+    "Acariciando o gato...",
+    "Dando um Rickroll no meu chefe...",
+    "Never gonna give you up, never gonna let you down...",
+    "Tocando o baixo...",
+    "Provando as amoras...",
+    "Estou indo longe, estou indo pela velocidade...",
+    "Isso é vida real? Ou é apenas fantasia?...",
+    "Tenho um bom pressentimento sobre isso...",
+    "Cutucando o urso...",
+    "Fazendo pesquisa sobre os últimos memes...",
+    "Descobrindo como tornar isso mais espirituoso...",
+    "Hmmm... deixe-me pensar...",
+    "O que você chama de um peixe sem olhos? Um pxe...",
+    "Por que o computador foi à terapia? Porque tinha muitos bytes...",
+    "Por que programadores não gostam da natureza? Porque tem muitos bugs...",
+    "Por que programadores preferem o modo escuro? Porque a luz atrai bugs...",
+    "Por que o desenvolvedor faliu? Porque usou todo o seu cache...",
+    "O que você pode fazer com um lápis quebrado? Nada, ele não tem ponta...",
+    "Aplicando manutenção percussiva...",
+    "Procurando a orientação correta do USB...",
+    "Garantindo que a fumaça mágica permaneça dentro dos fios...",
+    "Tentando sair do Vim...",
+    "Girando a roda do hamster...",
+    "Isso não é um bug, é um recurso não documentado...",
+    "Engajar.",
+    "Eu voltarei... com uma resposta.",
+    "Meu outro processo é uma TARDIS...",
+    "Comungando com o espírito da máquina...",
+    "Deixando os pensamentos marinarem...",
+    "Lembrei agora onde coloquei minhas chaves...",
+    "Ponderando a orbe...",
+    "Eu vi coisas que vocês não acreditariam... como um usuário que lê mensagens de carregamento.",
+    "Iniciando olhar pensativo...",
+    "Qual é o lanche favorito de um computador? Microchips.",
+    "Por que desenvolvedores Java usam óculos? Porque eles não C#.",
+    "Carregando o laser... pew pew!",
+    "Dividindo por zero... só brincando!",
+    "Procurando por um supervisor adulto... digo, processando.",
+    "Fazendo bip boop.",
+    "Buffering... porque até as IAs precisam de um momento.",
+    "Entrelaçando partículas quânticas para uma resposta mais rápida...",
+    "Polindo o cromo... nos algoritmos.",
+    "Você não está entretido? (Trabalhando nisso!)",
+    "Invocando os gremlins do código... para ajudar, é claro.",
+    "Só esperando o som da conexão discada terminar...",
+    "Recalibrando o humorômetro.",
+    "Minha outra tela de carregamento é ainda mais engraçada.",
+    "Tenho quase certeza que tem um gato andando no teclado em algum lugar...",
+    "Aumentando... Aumentando... Ainda carregando.",
+    "Não é um bug, é um recurso... desta tela de carregamento.",
+    "Você já tentou desligar e ligar de novo? (A tela de carregamento, não eu.)",
+    "Construindo pilares adicionais...",
   ],
 
   // ============================================================================
   // Extension Settings Input
   // ============================================================================
-  'Enter value...': 'Digite o valor...',
-  'Enter sensitive value...': 'Digite o valor sensível...',
-  'Press Enter to submit, Escape to cancel':
-    'Pressione Enter para enviar, Escape para cancelar',
+  "Enter value...": "Digite o valor...",
+  "Enter sensitive value...": "Digite o valor sensível...",
+  "Press Enter to submit, Escape to cancel": "Pressione Enter para enviar, Escape para cancelar",
 
   // ============================================================================
   // Command Migration Tool
   // ============================================================================
-  'Markdown file already exists: {{filename}}':
-    'Arquivo Markdown já existe: {{filename}}',
-  'TOML Command Format Deprecation Notice':
-    'Aviso de Obsolescência do Formato de Comando TOML',
-  'Found {{count}} command file(s) in TOML format:':
-    'Encontrado(s) {{count}} arquivo(s) de comando no formato TOML:',
-  'The TOML format for commands is being deprecated in favor of Markdown format.':
-    'O formato TOML para comandos está sendo descontinuado em favor do formato Markdown.',
-  'Markdown format is more readable and easier to edit.':
-    'O formato Markdown é mais legível e fácil de editar.',
-  'You can migrate these files automatically using:':
-    'Você pode migrar esses arquivos automaticamente usando:',
-  'Or manually convert each file:': 'Ou converter manualmente cada arquivo:',
-  'TOML: prompt = "..." / description = "..."':
-    'TOML: prompt = "..." / description = "..."',
-  'Markdown: YAML frontmatter + content':
-    'Markdown: YAML frontmatter + conteúdo',
-  'The migration tool will:': 'A ferramenta de migração irá:',
-  'Convert TOML files to Markdown': 'Converter arquivos TOML para Markdown',
-  'Create backups of original files': 'Criar backups dos arquivos originais',
-  'Preserve all command functionality':
-    'Preservar toda a funcionalidade do comando',
-  'TOML format will continue to work for now, but migration is recommended.':
-    'O formato TOML continuará a funcionar por enquanto, mas a migração é recomendada.',
+  "Markdown file already exists: {{filename}}": "Arquivo Markdown já existe: {{filename}}",
+  "TOML Command Format Deprecation Notice": "Aviso de Obsolescência do Formato de Comando TOML",
+  "Found {{count}} command file(s) in TOML format:":
+    "Encontrado(s) {{count}} arquivo(s) de comando no formato TOML:",
+  "The TOML format for commands is being deprecated in favor of Markdown format.":
+    "O formato TOML para comandos está sendo descontinuado em favor do formato Markdown.",
+  "Markdown format is more readable and easier to edit.":
+    "O formato Markdown é mais legível e fácil de editar.",
+  "You can migrate these files automatically using:":
+    "Você pode migrar esses arquivos automaticamente usando:",
+  "Or manually convert each file:": "Ou converter manualmente cada arquivo:",
+  'TOML: prompt = "..." / description = "..."': 'TOML: prompt = "..." / description = "..."',
+  "Markdown: YAML frontmatter + content": "Markdown: YAML frontmatter + conteúdo",
+  "The migration tool will:": "A ferramenta de migração irá:",
+  "Convert TOML files to Markdown": "Converter arquivos TOML para Markdown",
+  "Create backups of original files": "Criar backups dos arquivos originais",
+  "Preserve all command functionality": "Preservar toda a funcionalidade do comando",
+  "TOML format will continue to work for now, but migration is recommended.":
+    "O formato TOML continuará a funcionar por enquanto, mas a migração é recomendada.",
 
   // ============================================================================
   // Extensions - Explore Command
   // ============================================================================
-  'Open extensions page in your browser':
-    'Abrir página de extensões no seu navegador',
-  'Unknown extensions source: {{source}}.':
-    'Fonte de extensões desconhecida: {{source}}.',
-  'Would open extensions page in your browser: {{url}} (skipped in test environment)':
-    'Abriria a página de extensões no seu navegador: {{url}} (pulado no ambiente de teste)',
-  'View available extensions at {{url}}':
-    'Ver extensões disponíveis em {{url}}',
-  'Opening extensions page in your browser: {{url}}':
-    'Abrindo página de extensões no seu navegador: {{url}}',
-  'Failed to open browser. Check out the extensions gallery at {{url}}':
-    'Falha ao abrir o navegador. Confira a galeria de extensões em {{url}}',
+  "Open extensions page in your browser": "Abrir página de extensões no seu navegador",
+  "Unknown extensions source: {{source}}.": "Fonte de extensões desconhecida: {{source}}.",
+  "Would open extensions page in your browser: {{url}} (skipped in test environment)":
+    "Abriria a página de extensões no seu navegador: {{url}} (pulado no ambiente de teste)",
+  "View available extensions at {{url}}": "Ver extensões disponíveis em {{url}}",
+  "Opening extensions page in your browser: {{url}}":
+    "Abrindo página de extensões no seu navegador: {{url}}",
+  "Failed to open browser. Check out the extensions gallery at {{url}}":
+    "Falha ao abrir o navegador. Confira a galeria de extensões em {{url}}",
 
   // ============================================================================
   // Custom API Key Configuration
   // ============================================================================
-  'You can configure your API key and models in settings.json':
-    'Você pode configurar sua chave de API e modelos em settings.json',
-  'Refer to the documentation for setup instructions':
-    'Consulte a documentação para instruções de configuração',
+  "You can configure your API key and models in settings.json":
+    "Você pode configurar sua chave de API e modelos em settings.json",
+  "Refer to the documentation for setup instructions":
+    "Consulte a documentação para instruções de configuração",
 
   // ============================================================================
   // Coding Plan Authentication
   // ============================================================================
-  'API key cannot be empty.': 'A chave de API não pode estar vazia.',
-  'You can get your Coding Plan API key here':
-    'Você pode obter sua chave de API do Coding Plan aqui',
-  'New model configurations are available for Alibaba Cloud Coding Plan. Update now?':
-    'Novas configurações de modelo estão disponíveis para o Alibaba Cloud Coding Plan. Atualizar agora?',
-  'Coding Plan configuration updated successfully. New models are now available.':
-    'Configuração do Coding Plan atualizada com sucesso. Novos modelos agora estão disponíveis.',
-  'Coding Plan API key not found. Please re-authenticate with Coding Plan.':
-    'Chave de API do Coding Plan não encontrada. Por favor, re-autentique com o Coding Plan.',
-  'Failed to update Coding Plan configuration: {{message}}':
-    'Falha ao atualizar a configuração do Coding Plan: {{message}}',
+  "API key cannot be empty.": "A chave de API não pode estar vazia.",
+  "You can get your Coding Plan API key here":
+    "Você pode obter sua chave de API do Coding Plan aqui",
+  "New model configurations are available for Alibaba Cloud Coding Plan. Update now?":
+    "Novas configurações de modelo estão disponíveis para o Alibaba Cloud Coding Plan. Atualizar agora?",
+  "Coding Plan configuration updated successfully. New models are now available.":
+    "Configuração do Coding Plan atualizada com sucesso. Novos modelos agora estão disponíveis.",
+  "Coding Plan API key not found. Please re-authenticate with Coding Plan.":
+    "Chave de API do Coding Plan não encontrada. Por favor, re-autentique com o Coding Plan.",
+  "Failed to update Coding Plan configuration: {{message}}":
+    "Falha ao atualizar a configuração do Coding Plan: {{message}}",
 
   // ============================================================================
   // Auth Dialog - View Titles and Labels
   // ============================================================================
-  'Coding Plan': 'Coding Plan',
+  "Coding Plan": "Coding Plan",
   "Paste your api key of ModelStudio Coding Plan and you're all set!":
-    'Cole sua chave de API do ModelStudio Coding Plan e pronto!',
-  Custom: 'Personalizado',
-  'More instructions about configuring `modelProviders` manually.':
-    'Mais instruções sobre como configurar `modelProviders` manualmente.',
-  'Select API-KEY configuration mode:':
-    'Selecione o modo de configuração da API-KEY:',
-  '(Press Escape to go back)': '(Pressione Escape para voltar)',
-  '(Press Enter to submit, Escape to cancel)':
-    '(Pressione Enter para enviar, Escape para cancelar)',
-  'More instructions please check:': 'Mais instruções, consulte:',
-  'Select Region for Coding Plan': 'Selecionar região do Coding Plan',
-  'Choose based on where your account is registered':
-    'Escolha com base em onde sua conta está registrada',
-  'Enter Coding Plan API Key': 'Inserir chave de API do Coding Plan',
+    "Cole sua chave de API do ModelStudio Coding Plan e pronto!",
+  Custom: "Personalizado",
+  "More instructions about configuring `modelProviders` manually.":
+    "Mais instruções sobre como configurar `modelProviders` manualmente.",
+  "Select API-KEY configuration mode:": "Selecione o modo de configuração da API-KEY:",
+  "(Press Escape to go back)": "(Pressione Escape para voltar)",
+  "(Press Enter to submit, Escape to cancel)":
+    "(Pressione Enter para enviar, Escape para cancelar)",
+  "More instructions please check:": "Mais instruções, consulte:",
+  "Select Region for Coding Plan": "Selecionar região do Coding Plan",
+  "Choose based on where your account is registered":
+    "Escolha com base em onde sua conta está registrada",
+  "Enter Coding Plan API Key": "Inserir chave de API do Coding Plan",
 
   // ============================================================================
   // Coding Plan International Updates
   // ============================================================================
-  'New model configurations are available for {{region}}. Update now?':
-    'Novas configurações de modelo estão disponíveis para o {{region}}. Atualizar agora?',
+  "New model configurations are available for {{region}}. Update now?":
+    "Novas configurações de modelo estão disponíveis para o {{region}}. Atualizar agora?",
   '{{region}} configuration updated successfully. Model switched to "{{model}}".':
     'Configuração do {{region}} atualizada com sucesso. Modelo alterado para "{{model}}".',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).':
-    'Autenticado com sucesso com {{region}}. Chave de API e configurações de modelo salvas em settings.json (com backup).',
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).":
+    "Autenticado com sucesso com {{region}}. Chave de API e configurações de modelo salvas em settings.json (com backup).",
 
   // ============================================================================
   // Context Usage Component
   // ============================================================================
-  'Context Usage': 'Uso do Contexto',
-  'No API response yet. Send a message to see actual usage.':
-    'Ainda não há resposta da API. Envie uma mensagem para ver o uso real.',
-  'Estimated pre-conversation overhead': 'Sobrecarga estimada pré-conversa',
-  'Context window': 'Janela de Contexto',
-  tokens: 'tokens',
-  Used: 'Usado',
-  Free: 'Livre',
-  'Autocompact buffer': 'Buffer de autocompactação',
-  'Usage by category': 'Uso por categoria',
-  'System prompt': 'Prompt do sistema',
-  'Built-in tools': 'Ferramentas integradas',
-  'MCP tools': 'Ferramentas MCP',
-  'Memory files': 'Arquivos de memória',
-  Skills: 'Habilidades',
-  Messages: 'Mensagens',
-  'Show context window usage breakdown.':
-    'Exibe a divisão de uso da janela de contexto.',
-  'Run /context detail for per-item breakdown.':
-    'Execute /context detail para detalhamento por item.',
-  active: 'ativo',
-  'body loaded': 'conteúdo carregado',
-  memory: 'memória',
-  '{{region}} configuration updated successfully.':
-    'Configuração do {{region}} atualizada com sucesso.',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.':
-    'Autenticado com sucesso com {{region}}. Chave de API e configurações de modelo salvas em settings.json.',
-  'Tip: Use /model to switch between available Coding Plan models.':
-    'Dica: Use /model para alternar entre os modelos disponíveis do Coding Plan.',
+  "Context Usage": "Uso do Contexto",
+  "No API response yet. Send a message to see actual usage.":
+    "Ainda não há resposta da API. Envie uma mensagem para ver o uso real.",
+  "Estimated pre-conversation overhead": "Sobrecarga estimada pré-conversa",
+  "Context window": "Janela de Contexto",
+  tokens: "tokens",
+  Used: "Usado",
+  Free: "Livre",
+  "Autocompact buffer": "Buffer de autocompactação",
+  "Usage by category": "Uso por categoria",
+  "System prompt": "Prompt do sistema",
+  "Built-in tools": "Ferramentas integradas",
+  "MCP tools": "Ferramentas MCP",
+  "Memory files": "Arquivos de memória",
+  Skills: "Habilidades",
+  Messages: "Mensagens",
+  "Show context window usage breakdown.": "Exibe a divisão de uso da janela de contexto.",
+  "Run /context detail for per-item breakdown.":
+    "Execute /context detail para detalhamento por item.",
+  active: "ativo",
+  "body loaded": "conteúdo carregado",
+  memory: "memória",
+  "{{region}} configuration updated successfully.":
+    "Configuração do {{region}} atualizada com sucesso.",
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.":
+    "Autenticado com sucesso com {{region}}. Chave de API e configurações de modelo salvas em settings.json.",
+  "Tip: Use /model to switch between available Coding Plan models.":
+    "Dica: Use /model para alternar entre os modelos disponíveis do Coding Plan.",
 
   // ============================================================================
   // Ask User Question Tool
   // ============================================================================
-  'Please answer the following question(s):':
-    'Por favor, responda à(s) seguinte(s) pergunta(s):',
-  'Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.':
-    'Não é possível fazer perguntas ao usuário no modo não interativo. Por favor, execute no modo interativo para usar esta ferramenta.',
-  'User declined to answer the questions.':
-    'O usuário recusou responder às perguntas.',
-  'User has provided the following answers:':
-    'O usuário forneceu as seguintes respostas:',
-  'Failed to process user answers:':
-    'Falha ao processar as respostas do usuário:',
-  'Type something...': 'Digite algo...',
-  Submit: 'Enviar',
-  'Submit answers': 'Enviar respostas',
-  Cancel: 'Cancelar',
-  'Your answers:': 'Suas respostas:',
-  '(not answered)': '(não respondido)',
-  'Ready to submit your answers?': 'Pronto para enviar suas respostas?',
-  '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select':
-    '↑/↓: Navegar | ←/→: Alternar abas | Enter: Selecionar',
-  '↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Navegar | ←/→: Alternar abas | Space/Enter: Alternar | Esc: Cancelar',
-  '↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Navegar | Space/Enter: Alternar | Esc: Cancelar',
-  '↑/↓: Navigate | Enter: Select | Esc: Cancel':
-    '↑/↓: Navegar | Enter: Selecionar | Esc: Cancelar',
+  "Please answer the following question(s):": "Por favor, responda à(s) seguinte(s) pergunta(s):",
+  "Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.":
+    "Não é possível fazer perguntas ao usuário no modo não interativo. Por favor, execute no modo interativo para usar esta ferramenta.",
+  "User declined to answer the questions.": "O usuário recusou responder às perguntas.",
+  "User has provided the following answers:": "O usuário forneceu as seguintes respostas:",
+  "Failed to process user answers:": "Falha ao processar as respostas do usuário:",
+  "Type something...": "Digite algo...",
+  Submit: "Enviar",
+  "Submit answers": "Enviar respostas",
+  Cancel: "Cancelar",
+  "Your answers:": "Suas respostas:",
+  "(not answered)": "(não respondido)",
+  "Ready to submit your answers?": "Pronto para enviar suas respostas?",
+  "↑/↓: Navigate | ←/→: Switch tabs | Enter: Select":
+    "↑/↓: Navegar | ←/→: Alternar abas | Enter: Selecionar",
+  "↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Navegar | ←/→: Alternar abas | Space/Enter: Alternar | Esc: Cancelar",
+  "↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Navegar | Space/Enter: Alternar | Esc: Cancelar",
+  "↑/↓: Navigate | Enter: Select | Esc: Cancel": "↑/↓: Navegar | Enter: Selecionar | Esc: Cancelar",
 
   // ============================================================================
   // Commands - Auth
   // ============================================================================
-  'Authenticate using Alibaba Cloud Coding Plan':
-    'Autenticar usando Alibaba Cloud Coding Plan',
-  'Region for Coding Plan (china/global)':
-    'Região para Coding Plan (china/global)',
-  'API key for Coding Plan': 'Chave de API para Coding Plan',
-  'Show current authentication status': 'Mostrar status atual de autenticação',
-  'Authentication completed successfully.':
-    'Autenticação concluída com sucesso.',
-  'Processing Alibaba Cloud Coding Plan authentication...':
-    'Processando autenticação Alibaba Cloud Coding Plan...',
-  'Successfully authenticated with Alibaba Cloud Coding Plan.':
-    'Autenticado com sucesso via Alibaba Cloud Coding Plan.',
-  'Failed to authenticate with Coding Plan: {{error}}':
-    'Falha ao autenticar com Coding Plan: {{error}}',
-  '中国 (China)': '中国 (China)',
-  '阿里云百炼 (aliyun.com)': '阿里云百炼 (aliyun.com)',
-  Global: 'Global',
-  'Alibaba Cloud (alibabacloud.com)': 'Alibaba Cloud (alibabacloud.com)',
-  'Select region for Coding Plan:': 'Selecione a região para Coding Plan:',
-  'Enter your Coding Plan API key: ':
-    'Insira sua chave de API do Coding Plan: ',
-  'Select authentication method:': 'Selecione o método de autenticação:',
-  '\n=== Authentication Status ===\n': '\n=== Status de Autenticação ===\n',
-  '⚠️  No authentication method configured.\n':
-    '⚠️  Nenhum método de autenticação configurado.\n',
-  'Run one of the following commands to get started:\n':
-    'Execute um dos seguintes comandos para começar:\n',
-  '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n':
-    '  qwen auth coding-plan      - Autenticar com Alibaba Cloud Coding Plan\n',
-  'Or simply run:': 'Ou simplesmente execute:',
-  '  qwen auth                - Interactive authentication setup\n':
-    '  qwen auth                - Configuração interativa de autenticação\n',
-  '✓ Authentication Method: Alibaba Cloud Coding Plan':
-    '✓ Método de autenticação: Alibaba Cloud Coding Plan',
-  '中国 (China) - 阿里云百炼': '中国 (China) - 阿里云百炼',
-  'Global - Alibaba Cloud': 'Global - Alibaba Cloud',
-  '  Region: {{region}}': '  Região: {{region}}',
-  '  Current Model: {{model}}': '  Modelo atual: {{model}}',
-  '  Config Version: {{version}}': '  Versão da configuração: {{version}}',
-  '  Status: API key configured\n': '  Status: Chave de API configurada\n',
-  '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)':
-    '⚠️  Método de autenticação: Alibaba Cloud Coding Plan (Incompleto)',
-  '  Issue: API key not found in environment or settings\n':
-    '  Problema: Chave de API não encontrada no ambiente ou configurações\n',
-  '  Run `qwen auth coding-plan` to re-configure.\n':
-    '  Execute `qwen auth coding-plan` para reconfigurar.\n',
-  '✓ Authentication Method: {{type}}': '✓ Método de autenticação: {{type}}',
-  '  Status: Configured\n': '  Status: Configurado\n',
-  'Failed to check authentication status: {{error}}':
-    'Falha ao verificar status de autenticação: {{error}}',
-  'Select an option:': 'Selecione uma opção:',
-  'Raw mode not available. Please run in an interactive terminal.':
-    'Modo raw não disponível. Execute em um terminal interativo.',
-  '(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n':
-    '(Use ↑ ↓ para navegar, Enter para selecionar, Ctrl+C para sair)\n',
-  verbose: 'detalhado',
-  'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).':
-    'Mostrar saída completa da ferramenta e raciocínio no modo detalhado (alternar com Ctrl+O).',
-  'Press Ctrl+O to show full tool output':
-    'Pressione Ctrl+O para exibir a saída completa da ferramenta',
+  "Authenticate using Alibaba Cloud Coding Plan": "Autenticar usando Alibaba Cloud Coding Plan",
+  "Region for Coding Plan (china/global)": "Região para Coding Plan (china/global)",
+  "API key for Coding Plan": "Chave de API para Coding Plan",
+  "Show current authentication status": "Mostrar status atual de autenticação",
+  "Authentication completed successfully.": "Autenticação concluída com sucesso.",
+  "Processing Alibaba Cloud Coding Plan authentication...":
+    "Processando autenticação Alibaba Cloud Coding Plan...",
+  "Successfully authenticated with Alibaba Cloud Coding Plan.":
+    "Autenticado com sucesso via Alibaba Cloud Coding Plan.",
+  "Failed to authenticate with Coding Plan: {{error}}":
+    "Falha ao autenticar com Coding Plan: {{error}}",
+  "中国 (China)": "中国 (China)",
+  "阿里云百炼 (aliyun.com)": "阿里云百炼 (aliyun.com)",
+  Global: "Global",
+  "Alibaba Cloud (alibabacloud.com)": "Alibaba Cloud (alibabacloud.com)",
+  "Select region for Coding Plan:": "Selecione a região para Coding Plan:",
+  "Enter your Coding Plan API key: ": "Insira sua chave de API do Coding Plan: ",
+  "Select authentication method:": "Selecione o método de autenticação:",
+  "\n=== Authentication Status ===\n": "\n=== Status de Autenticação ===\n",
+  "⚠️  No authentication method configured.\n": "⚠️  Nenhum método de autenticação configurado.\n",
+  "Run one of the following commands to get started:\n":
+    "Execute um dos seguintes comandos para começar:\n",
+  "  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n":
+    "  qwen auth coding-plan      - Autenticar com Alibaba Cloud Coding Plan\n",
+  "Or simply run:": "Ou simplesmente execute:",
+  "  qwen auth                - Interactive authentication setup\n":
+    "  qwen auth                - Configuração interativa de autenticação\n",
+  "✓ Authentication Method: Alibaba Cloud Coding Plan":
+    "✓ Método de autenticação: Alibaba Cloud Coding Plan",
+  "中国 (China) - 阿里云百炼": "中国 (China) - 阿里云百炼",
+  "Global - Alibaba Cloud": "Global - Alibaba Cloud",
+  "  Region: {{region}}": "  Região: {{region}}",
+  "  Current Model: {{model}}": "  Modelo atual: {{model}}",
+  "  Config Version: {{version}}": "  Versão da configuração: {{version}}",
+  "  Status: API key configured\n": "  Status: Chave de API configurada\n",
+  "⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)":
+    "⚠️  Método de autenticação: Alibaba Cloud Coding Plan (Incompleto)",
+  "  Issue: API key not found in environment or settings\n":
+    "  Problema: Chave de API não encontrada no ambiente ou configurações\n",
+  "  Run `qwen auth coding-plan` to re-configure.\n":
+    "  Execute `qwen auth coding-plan` para reconfigurar.\n",
+  "✓ Authentication Method: {{type}}": "✓ Método de autenticação: {{type}}",
+  "  Status: Configured\n": "  Status: Configurado\n",
+  "Failed to check authentication status: {{error}}":
+    "Falha ao verificar status de autenticação: {{error}}",
+  "Select an option:": "Selecione uma opção:",
+  "Raw mode not available. Please run in an interactive terminal.":
+    "Modo raw não disponível. Execute em um terminal interativo.",
+  "(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n":
+    "(Use ↑ ↓ para navegar, Enter para selecionar, Ctrl+C para sair)\n",
+  verbose: "detalhado",
+  "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).":
+    "Mostrar saída completa da ferramenta e raciocínio no modo detalhado (alternar com Ctrl+O).",
+  "Press Ctrl+O to show full tool output":
+    "Pressione Ctrl+O para exibir a saída completa da ferramenta",
 
-  'Switch to plan mode or exit plan mode':
-    'Switch to plan mode or exit plan mode',
-  'Exited plan mode. Previous approval mode restored.':
-    'Exited plan mode. Previous approval mode restored.',
-  'Enabled plan mode. The agent will analyze and plan without executing tools.':
-    'Enabled plan mode. The agent will analyze and plan without executing tools.',
+  "Switch to plan mode or exit plan mode": "Switch to plan mode or exit plan mode",
+  "Exited plan mode. Previous approval mode restored.":
+    "Exited plan mode. Previous approval mode restored.",
+  "Enabled plan mode. The agent will analyze and plan without executing tools.":
+    "Enabled plan mode. The agent will analyze and plan without executing tools.",
   'Already in plan mode. Use "/plan exit" to exit plan mode.':
     'Already in plan mode. Use "/plan exit" to exit plan mode.',
   'Not in plan mode. Use "/plan" to enter plan mode first.':
diff --git a/apps/airiscode-cli/src/i18n/locales/ru.js b/apps/airiscode-cli/src/i18n/locales/ru.js
index 9fec3ec25..05e182a41 100644
--- a/apps/airiscode-cli/src/i18n/locales/ru.js
+++ b/apps/airiscode-cli/src/i18n/locales/ru.js
@@ -12,1116 +12,1032 @@ export default {
   // Справка / Компоненты интерфейса
   // ============================================================================
   // Attachment hints
-  '↑ to manage attachments': '↑ управление вложениями',
-  '← → select, Delete to remove, ↓ to exit':
-    '← → выбрать, Delete удалить, ↓ выйти',
-  'Attachments: ': 'Вложения: ',
+  "↑ to manage attachments": "↑ управление вложениями",
+  "← → select, Delete to remove, ↓ to exit": "← → выбрать, Delete удалить, ↓ выйти",
+  "Attachments: ": "Вложения: ",
 
-  'Basics:': 'Основы:',
-  'Add context': 'Добавить контекст',
-  'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.':
-    'Используйте {{symbol}} для добавления файлов в контекст (например, {{example}}) для выбора конкретных файлов или папок).',
-  '@': '@',
-  '@src/myFile.ts': '@src/myFile.ts',
-  'Shell mode': 'Режим терминала',
-  'YOLO mode': 'Режим YOLO',
-  'plan mode': 'Режим планирования',
-  'auto-accept edits': 'Режим принятия правок',
-  'Accepting edits': 'Принятие правок',
-  '(shift + tab to cycle)': '(shift + tab для переключения)',
-  '(tab to cycle)': '(Tab для переключения)',
-  'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).':
-    'Выполняйте команды терминала через {{symbol}} (например, {{example1}}) или используйте естественный язык (например, {{example2}}).',
-  '!': '!',
-  '!npm run start': '!npm run start',
-  'start server': 'start server',
-  'Commands:': 'Команды:',
-  'shell command': 'команда терминала',
-  'Model Context Protocol command (from external servers)':
-    'Команда Model Context Protocol (из внешних серверов)',
-  'Keyboard Shortcuts:': 'Горячие клавиши:',
-  'Toggle this help display': 'Показать/скрыть эту справку',
-  'Toggle shell mode': 'Переключить режим оболочки',
-  'Open command menu': 'Открыть меню команд',
-  'Add file context': 'Добавить файл в контекст',
-  'Accept suggestion / Autocomplete': 'Принять подсказку / Автодополнение',
-  'Reverse search history': 'Обратный поиск по истории',
-  'Press ? again to close': 'Нажмите ? ещё раз, чтобы закрыть',
-  'Jump through words in the input': 'Переход по словам во вводе',
-  'Close dialogs, cancel requests, or quit application':
-    'Закрыть диалоги, отменить запросы или выйти из приложения',
-  'New line': 'Новая строка',
-  'New line (Alt+Enter works for certain linux distros)':
-    'Новая строка (Alt+Enter работает только в некоторых дистрибутивах Linux)',
-  'Clear the screen': 'Очистить экран',
-  'Open input in external editor': 'Открыть ввод во внешнем редакторе',
-  'Send message': 'Отправить сообщение',
-  'Initializing...': 'Инициализация...',
-  'Connecting to MCP servers... ({{connected}}/{{total}})':
-    'Подключение к MCP-серверам... ({{connected}}/{{total}})',
-  'Type your message or @path/to/file': 'Введите сообщение или @путь/к/файлу',
-  '? for shortcuts': '? — горячие клавиши',
+  "Basics:": "Основы:",
+  "Add context": "Добавить контекст",
+  "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.":
+    "Используйте {{symbol}} для добавления файлов в контекст (например, {{example}}) для выбора конкретных файлов или папок).",
+  "@": "@",
+  "@src/myFile.ts": "@src/myFile.ts",
+  "Shell mode": "Режим терминала",
+  "YOLO mode": "Режим YOLO",
+  "plan mode": "Режим планирования",
+  "auto-accept edits": "Режим принятия правок",
+  "Accepting edits": "Принятие правок",
+  "(shift + tab to cycle)": "(shift + tab для переключения)",
+  "(tab to cycle)": "(Tab для переключения)",
+  "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).":
+    "Выполняйте команды терминала через {{symbol}} (например, {{example1}}) или используйте естественный язык (например, {{example2}}).",
+  "!": "!",
+  "!npm run start": "!npm run start",
+  "start server": "start server",
+  "Commands:": "Команды:",
+  "shell command": "команда терминала",
+  "Model Context Protocol command (from external servers)":
+    "Команда Model Context Protocol (из внешних серверов)",
+  "Keyboard Shortcuts:": "Горячие клавиши:",
+  "Toggle this help display": "Показать/скрыть эту справку",
+  "Toggle shell mode": "Переключить режим оболочки",
+  "Open command menu": "Открыть меню команд",
+  "Add file context": "Добавить файл в контекст",
+  "Accept suggestion / Autocomplete": "Принять подсказку / Автодополнение",
+  "Reverse search history": "Обратный поиск по истории",
+  "Press ? again to close": "Нажмите ? ещё раз, чтобы закрыть",
+  "Jump through words in the input": "Переход по словам во вводе",
+  "Close dialogs, cancel requests, or quit application":
+    "Закрыть диалоги, отменить запросы или выйти из приложения",
+  "New line": "Новая строка",
+  "New line (Alt+Enter works for certain linux distros)":
+    "Новая строка (Alt+Enter работает только в некоторых дистрибутивах Linux)",
+  "Clear the screen": "Очистить экран",
+  "Open input in external editor": "Открыть ввод во внешнем редакторе",
+  "Send message": "Отправить сообщение",
+  "Initializing...": "Инициализация...",
+  "Connecting to MCP servers... ({{connected}}/{{total}})":
+    "Подключение к MCP-серверам... ({{connected}}/{{total}})",
+  "Type your message or @path/to/file": "Введите сообщение или @путь/к/файлу",
+  "? for shortcuts": "? — горячие клавиши",
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Нажмите 'i' для режима ВСТАВКА и 'Esc' для ОБЫЧНОГО режима.",
-  'Cancel operation / Clear input (double press)':
-    'Отменить операцию / Очистить ввод (двойное нажатие)',
-  'Cycle approval modes': 'Переключение режимов подтверждения',
-  'Cycle through your prompt history': 'Пролистать историю запросов',
-  'For a full list of shortcuts, see {{docPath}}':
-    'Полный список горячих клавиш см. в {{docPath}}',
-  'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md',
-  'for help on Qwen Code': 'Справка по Qwen Code',
-  'show version info': 'Просмотр информации о версии',
-  'submit a bug report': 'Отправка отчёта об ошибке',
-  'About Qwen Code': 'Об Qwen Code',
-  Status: 'Статус',
+  "Cancel operation / Clear input (double press)":
+    "Отменить операцию / Очистить ввод (двойное нажатие)",
+  "Cycle approval modes": "Переключение режимов подтверждения",
+  "Cycle through your prompt history": "Пролистать историю запросов",
+  "For a full list of shortcuts, see {{docPath}}": "Полный список горячих клавиш см. в {{docPath}}",
+  "docs/keyboard-shortcuts.md": "docs/keyboard-shortcuts.md",
+  "for help on Qwen Code": "Справка по Qwen Code",
+  "show version info": "Просмотр информации о версии",
+  "submit a bug report": "Отправка отчёта об ошибке",
+  "About Qwen Code": "Об Qwen Code",
+  Status: "Статус",
 
   // Keyboard shortcuts panel descriptions
-  'for shell mode': 'режим оболочки',
-  'for commands': 'меню команд',
-  'for file paths': 'пути к файлам',
-  'to clear input': 'очистить ввод',
-  'to cycle approvals': 'переключить режим',
-  'to quit': 'выход',
-  'for newline': 'новая строка',
-  'to clear screen': 'очистить экран',
-  'to search history': 'поиск в истории',
-  'to paste images': 'вставить изображения',
-  'for external editor': 'внешний редактор',
+  "for shell mode": "режим оболочки",
+  "for commands": "меню команд",
+  "for file paths": "пути к файлам",
+  "to clear input": "очистить ввод",
+  "to cycle approvals": "переключить режим",
+  "to quit": "выход",
+  "for newline": "новая строка",
+  "to clear screen": "очистить экран",
+  "to search history": "поиск в истории",
+  "to paste images": "вставить изображения",
+  "for external editor": "внешний редактор",
 
   // ============================================================================
   // Поля системной информации
   // ============================================================================
-  'Qwen Code': 'Qwen Code',
-  Runtime: 'Среда выполнения',
-  OS: 'ОС',
-  Auth: 'Аутентификация',
-  'CLI Version': 'Версия CLI',
-  'Git Commit': 'Git-коммит',
-  Model: 'Модель',
-  'Fast Model': 'Быстрая модель',
-  Sandbox: 'Песочница',
-  'OS Platform': 'Платформа ОС',
-  'OS Arch': 'Архитектура ОС',
-  'OS Release': 'Версия ОС',
-  'Node.js Version': 'Версия Node.js',
-  'NPM Version': 'Версия NPM',
-  'Session ID': 'ID сессии',
-  'Auth Method': 'Метод авторизации',
-  'Base URL': 'Базовый URL',
-  Proxy: 'Прокси',
-  'Memory Usage': 'Использование памяти',
-  'IDE Client': 'Клиент IDE',
+  "Qwen Code": "Qwen Code",
+  Runtime: "Среда выполнения",
+  OS: "ОС",
+  Auth: "Аутентификация",
+  "CLI Version": "Версия CLI",
+  "Git Commit": "Git-коммит",
+  Model: "Модель",
+  "Fast Model": "Быстрая модель",
+  Sandbox: "Песочница",
+  "OS Platform": "Платформа ОС",
+  "OS Arch": "Архитектура ОС",
+  "OS Release": "Версия ОС",
+  "Node.js Version": "Версия Node.js",
+  "NPM Version": "Версия NPM",
+  "Session ID": "ID сессии",
+  "Auth Method": "Метод авторизации",
+  "Base URL": "Базовый URL",
+  Proxy: "Прокси",
+  "Memory Usage": "Использование памяти",
+  "IDE Client": "Клиент IDE",
 
   // ============================================================================
   // Команды - Общие
   // ============================================================================
-  'Analyzes the project and creates a tailored QWEN.md file.':
-    'Анализ проекта и создание адаптированного файла QWEN.md',
-  'List available Qwen Code tools. Usage: /tools [desc]':
-    'Просмотр доступных инструментов Qwen Code. Использование: /tools [desc]',
-  'List available skills.': 'Показать доступные навыки.',
-  'Available Qwen Code CLI tools:': 'Доступные инструменты Qwen Code CLI:',
-  'No tools available': 'Нет доступных инструментов',
-  'View or change the approval mode for tool usage':
-    'Просмотр или изменение режима подтверждения для использования инструментов',
+  "Analyzes the project and creates a tailored QWEN.md file.":
+    "Анализ проекта и создание адаптированного файла QWEN.md",
+  "List available Qwen Code tools. Usage: /tools [desc]":
+    "Просмотр доступных инструментов Qwen Code. Использование: /tools [desc]",
+  "List available skills.": "Показать доступные навыки.",
+  "Available Qwen Code CLI tools:": "Доступные инструменты Qwen Code CLI:",
+  "No tools available": "Нет доступных инструментов",
+  "View or change the approval mode for tool usage":
+    "Просмотр или изменение режима подтверждения для использования инструментов",
   'Invalid approval mode "{{arg}}". Valid modes: {{modes}}':
     'Недопустимый режим подтверждения "{{arg}}". Допустимые режимы: {{modes}}',
-  'Approval mode set to "{{mode}}"':
-    'Режим подтверждения установлен на "{{mode}}"',
-  'View or change the language setting':
-    'Просмотр или изменение настроек языка',
-  'change the theme': 'Изменение темы',
-  'Select Theme': 'Выбор темы',
-  Preview: 'Предпросмотр',
-  '(Use Enter to select, Tab to configure scope)':
-    '(Enter для выбора, Tab для настройки области)',
-  '(Use Enter to apply scope, Tab to go back)':
-    '(Enter для применения области, Tab для возврата)',
-  'Theme configuration unavailable due to NO_COLOR env variable.':
-    'Настройка темы недоступна из-за переменной окружения NO_COLOR.',
+  'Approval mode set to "{{mode}}"': 'Режим подтверждения установлен на "{{mode}}"',
+  "View or change the language setting": "Просмотр или изменение настроек языка",
+  "change the theme": "Изменение темы",
+  "Select Theme": "Выбор темы",
+  Preview: "Предпросмотр",
+  "(Use Enter to select, Tab to configure scope)": "(Enter для выбора, Tab для настройки области)",
+  "(Use Enter to apply scope, Tab to go back)": "(Enter для применения области, Tab для возврата)",
+  "Theme configuration unavailable due to NO_COLOR env variable.":
+    "Настройка темы недоступна из-за переменной окружения NO_COLOR.",
   'Theme "{{themeName}}" not found.': 'Тема "{{themeName}}" не найдена.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Тема "{{themeName}}" не найдена в выбранной области.',
-  'Clear conversation history and free up context':
-    'Очистить историю диалога и освободить контекст',
-  'Compresses the context by replacing it with a summary.':
-    'Сжатие контекста заменой на краткую сводку',
-  'open full Qwen Code documentation in your browser':
-    'Открытие полной документации Qwen Code в браузере',
-  'Configuration not available.': 'Конфигурация недоступна.',
-  'change the auth method': 'Изменение метода авторизации',
-  'Configure authentication information for login':
-    'Настройка аутентификационной информации для входа',
-  'Copy the last result or code snippet to clipboard':
-    'Копирование последнего результата или фрагмента кода в буфер обмена',
+  "Clear conversation history and free up context":
+    "Очистить историю диалога и освободить контекст",
+  "Compresses the context by replacing it with a summary.":
+    "Сжатие контекста заменой на краткую сводку",
+  "open full Qwen Code documentation in your browser":
+    "Открытие полной документации Qwen Code в браузере",
+  "Configuration not available.": "Конфигурация недоступна.",
+  "change the auth method": "Изменение метода авторизации",
+  "Configure authentication information for login":
+    "Настройка аутентификационной информации для входа",
+  "Copy the last result or code snippet to clipboard":
+    "Копирование последнего результата или фрагмента кода в буфер обмена",
 
   // ============================================================================
   // Команды - Агенты
   // ============================================================================
-  'Manage subagents for specialized task delegation.':
-    'Управление подагентами для делегирования специализированных задач',
-  'Manage existing subagents (view, edit, delete).':
-    'Управление существующими подагентами (просмотр, правка, удаление)',
-  'Create a new subagent with guided setup.':
-    'Создание нового подагента с пошаговой настройкой',
+  "Manage subagents for specialized task delegation.":
+    "Управление подагентами для делегирования специализированных задач",
+  "Manage existing subagents (view, edit, delete).":
+    "Управление существующими подагентами (просмотр, правка, удаление)",
+  "Create a new subagent with guided setup.": "Создание нового подагента с пошаговой настройкой",
 
   // ============================================================================
   // Агенты - Диалог управления
   // ============================================================================
-  Agents: 'Агенты',
-  'Choose Action': 'Выберите действие',
-  'Edit {{name}}': 'Редактировать {{name}}',
-  'Edit Tools: {{name}}': 'Редактировать инструменты: {{name}}',
-  'Edit Color: {{name}}': 'Редактировать цвет: {{name}}',
-  'Delete {{name}}': 'Удалить {{name}}',
-  'Unknown Step': 'Неизвестный шаг',
-  'Esc to close': 'Esc для закрытия',
-  'Enter to select, ↑↓ to navigate, Esc to close':
-    'Enter для выбора, ↑↓ для навигации, Esc для закрытия',
-  'Esc to go back': 'Esc для возврата',
-  'Enter to confirm, Esc to cancel': 'Enter для подтверждения, Esc для отмены',
-  'Enter to select, ↑↓ to navigate, Esc to go back':
-    'Enter для выбора, ↑↓ для навигации, Esc для возврата',
-  'Enter to submit, Esc to go back': 'Enter для отправки, Esc для возврата',
-  'Invalid step: {{step}}': 'Неверный шаг: {{step}}',
-  'No subagents found.': 'Подагенты не найдены.',
+  Agents: "Агенты",
+  "Choose Action": "Выберите действие",
+  "Edit {{name}}": "Редактировать {{name}}",
+  "Edit Tools: {{name}}": "Редактировать инструменты: {{name}}",
+  "Edit Color: {{name}}": "Редактировать цвет: {{name}}",
+  "Delete {{name}}": "Удалить {{name}}",
+  "Unknown Step": "Неизвестный шаг",
+  "Esc to close": "Esc для закрытия",
+  "Enter to select, ↑↓ to navigate, Esc to close":
+    "Enter для выбора, ↑↓ для навигации, Esc для закрытия",
+  "Esc to go back": "Esc для возврата",
+  "Enter to confirm, Esc to cancel": "Enter для подтверждения, Esc для отмены",
+  "Enter to select, ↑↓ to navigate, Esc to go back":
+    "Enter для выбора, ↑↓ для навигации, Esc для возврата",
+  "Enter to submit, Esc to go back": "Enter для отправки, Esc для возврата",
+  "Invalid step: {{step}}": "Неверный шаг: {{step}}",
+  "No subagents found.": "Подагенты не найдены.",
   "Use '/agents create' to create your first subagent.":
     "Используйте '/agents create' для создания первого подагента.",
-  '(built-in)': '(встроенный)',
-  '(overridden by project level agent)':
-    '(переопределен агентом уровня проекта)',
-  'Project Level ({{path}})': 'Уровень проекта ({{path}})',
-  'User Level ({{path}})': 'Уровень пользователя ({{path}})',
-  'Built-in Agents': 'Встроенные агенты',
-  'Extension Agents': 'Агенты расширений',
-  'Using: {{count}} agents': 'Используется: {{count}} агент(ов)',
-  'View Agent': 'Просмотреть агента',
-  'Edit Agent': 'Редактировать агента',
-  'Delete Agent': 'Удалить агента',
-  Back: 'Назад',
-  'No agent selected': 'Агент не выбран',
-  'File Path: ': 'Путь к файлу: ',
-  'Tools: ': 'Инструменты: ',
-  'Color: ': 'Цвет: ',
-  'Description:': 'Описание:',
-  'System Prompt:': 'Системный промпт:',
-  'Open in editor': 'Открыть в редакторе',
-  'Edit tools': 'Редактировать инструменты',
-  'Edit color': 'Редактировать цвет',
-  '❌ Error:': '❌ Ошибка:',
+  "(built-in)": "(встроенный)",
+  "(overridden by project level agent)": "(переопределен агентом уровня проекта)",
+  "Project Level ({{path}})": "Уровень проекта ({{path}})",
+  "User Level ({{path}})": "Уровень пользователя ({{path}})",
+  "Built-in Agents": "Встроенные агенты",
+  "Extension Agents": "Агенты расширений",
+  "Using: {{count}} agents": "Используется: {{count}} агент(ов)",
+  "View Agent": "Просмотреть агента",
+  "Edit Agent": "Редактировать агента",
+  "Delete Agent": "Удалить агента",
+  Back: "Назад",
+  "No agent selected": "Агент не выбран",
+  "File Path: ": "Путь к файлу: ",
+  "Tools: ": "Инструменты: ",
+  "Color: ": "Цвет: ",
+  "Description:": "Описание:",
+  "System Prompt:": "Системный промпт:",
+  "Open in editor": "Открыть в редакторе",
+  "Edit tools": "Редактировать инструменты",
+  "Edit color": "Редактировать цвет",
+  "❌ Error:": "❌ Ошибка:",
   'Are you sure you want to delete agent "{{name}}"?':
     'Вы уверены, что хотите удалить агента "{{name}}"?',
   // ============================================================================
   // Агенты - Мастер создания
   // ============================================================================
-  'Project Level (.qwen/agents/)': 'Уровень проекта (.qwen/agents/)',
-  'User Level (~/.qwen/agents/)': 'Уровень пользователя (~/.qwen/agents/)',
-  '✅ Subagent Created Successfully!': '✅ Подагент успешно создан!',
+  "Project Level (.qwen/agents/)": "Уровень проекта (.qwen/agents/)",
+  "User Level (~/.qwen/agents/)": "Уровень пользователя (~/.qwen/agents/)",
+  "✅ Subagent Created Successfully!": "✅ Подагент успешно создан!",
   'Subagent "{{name}}" has been saved to {{level}} level.':
     'Подагент "{{name}}" сохранен на уровне {{level}}.',
-  'Name: ': 'Имя: ',
-  'Location: ': 'Расположение: ',
-  '❌ Error saving subagent:': '❌ Ошибка сохранения подагента:',
-  'Warnings:': 'Предупреждения:',
+  "Name: ": "Имя: ",
+  "Location: ": "Расположение: ",
+  "❌ Error saving subagent:": "❌ Ошибка сохранения подагента:",
+  "Warnings:": "Предупреждения:",
   'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent':
     'Имя "{{name}}" уже существует на уровне {{level}} - существующий подагент будет перезаписан',
   'Name "{{name}}" exists at user level - project level will take precedence':
     'Имя "{{name}}" существует на уровне пользователя - уровень проекта будет иметь приоритет',
   'Name "{{name}}" exists at project level - existing subagent will take precedence':
     'Имя "{{name}}" существует на уровне проекта - существующий подагент будет иметь приоритет',
-  'Description is over {{length}} characters':
-    'Описание превышает {{length}} символов',
-  'System prompt is over {{length}} characters':
-    'Системный промпт превышает {{length}} символов',
+  "Description is over {{length}} characters": "Описание превышает {{length}} символов",
+  "System prompt is over {{length}} characters": "Системный промпт превышает {{length}} символов",
   // Агенты - Шаги мастера создания
-  'Step {{n}}: Choose Location': 'Шаг {{n}}: Выберите расположение',
-  'Step {{n}}: Choose Generation Method': 'Шаг {{n}}: Выберите метод генерации',
-  'Generate with Qwen Code (Recommended)':
-    'Сгенерировать с помощью Qwen Code (Рекомендуется)',
-  'Manual Creation': 'Ручное создание',
-  'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)':
-    'Опишите, что должен делать этот подагент и когда его следует использовать. (Будьте подробны для лучших результатов)',
-  'e.g., Expert code reviewer that reviews code based on best practices...':
-    'например, Экспертный ревьювер кода, проверяющий код на соответствие лучшим практикам...',
-  'Generating subagent configuration...': 'Генерация конфигурации подагента...',
-  'Failed to generate subagent: {{error}}':
-    'Не удалось сгенерировать подагента: {{error}}',
-  'Step {{n}}: Describe Your Subagent': 'Шаг {{n}}: Опишите подагента',
-  'Step {{n}}: Enter Subagent Name': 'Шаг {{n}}: Введите имя подагента',
-  'Step {{n}}: Enter System Prompt': 'Шаг {{n}}: Введите системный промпт',
-  'Step {{n}}: Enter Description': 'Шаг {{n}}: Введите описание',
+  "Step {{n}}: Choose Location": "Шаг {{n}}: Выберите расположение",
+  "Step {{n}}: Choose Generation Method": "Шаг {{n}}: Выберите метод генерации",
+  "Generate with Qwen Code (Recommended)": "Сгенерировать с помощью Qwen Code (Рекомендуется)",
+  "Manual Creation": "Ручное создание",
+  "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)":
+    "Опишите, что должен делать этот подагент и когда его следует использовать. (Будьте подробны для лучших результатов)",
+  "e.g., Expert code reviewer that reviews code based on best practices...":
+    "например, Экспертный ревьювер кода, проверяющий код на соответствие лучшим практикам...",
+  "Generating subagent configuration...": "Генерация конфигурации подагента...",
+  "Failed to generate subagent: {{error}}": "Не удалось сгенерировать подагента: {{error}}",
+  "Step {{n}}: Describe Your Subagent": "Шаг {{n}}: Опишите подагента",
+  "Step {{n}}: Enter Subagent Name": "Шаг {{n}}: Введите имя подагента",
+  "Step {{n}}: Enter System Prompt": "Шаг {{n}}: Введите системный промпт",
+  "Step {{n}}: Enter Description": "Шаг {{n}}: Введите описание",
   // Агенты - Выбор инструментов
-  'Step {{n}}: Select Tools': 'Шаг {{n}}: Выберите инструменты',
-  'All Tools (Default)': 'Все инструменты (по умолчанию)',
-  'All Tools': 'Все инструменты',
-  'Read-only Tools': 'Инструменты только для чтения',
-  'Read & Edit Tools': 'Инструменты для чтения и редактирования',
-  'Read & Edit & Execution Tools':
-    'Инструменты для чтения, редактирования и выполнения',
-  'All tools selected, including MCP tools':
-    'Все инструменты выбраны, включая инструменты MCP',
-  'Selected tools:': 'Выбранные инструменты:',
-  'Read-only tools:': 'Инструменты только для чтения:',
-  'Edit tools:': 'Инструменты редактирования:',
-  'Execution tools:': 'Инструменты выполнения:',
-  'Step {{n}}: Choose Background Color': 'Шаг {{n}}: Выберите цвет фона',
-  'Step {{n}}: Confirm and Save': 'Шаг {{n}}: Подтвердите и сохраните',
+  "Step {{n}}: Select Tools": "Шаг {{n}}: Выберите инструменты",
+  "All Tools (Default)": "Все инструменты (по умолчанию)",
+  "All Tools": "Все инструменты",
+  "Read-only Tools": "Инструменты только для чтения",
+  "Read & Edit Tools": "Инструменты для чтения и редактирования",
+  "Read & Edit & Execution Tools": "Инструменты для чтения, редактирования и выполнения",
+  "All tools selected, including MCP tools": "Все инструменты выбраны, включая инструменты MCP",
+  "Selected tools:": "Выбранные инструменты:",
+  "Read-only tools:": "Инструменты только для чтения:",
+  "Edit tools:": "Инструменты редактирования:",
+  "Execution tools:": "Инструменты выполнения:",
+  "Step {{n}}: Choose Background Color": "Шаг {{n}}: Выберите цвет фона",
+  "Step {{n}}: Confirm and Save": "Шаг {{n}}: Подтвердите и сохраните",
   // Агенты - Навигация и инструкции
-  'Esc to cancel': 'Esc для отмены',
-  'Press Enter to save, e to save and edit, Esc to go back':
-    'Enter для сохранения, e для сохранения и редактирования, Esc для возврата',
-  'Press Enter to continue, {{navigation}}Esc to {{action}}':
-    'Enter для продолжения, {{navigation}}Esc для {{action}}',
-  cancel: 'отмены',
-  'go back': 'возврата',
-  '↑↓ to navigate, ': '↑↓ для навигации, ',
-  'Enter a clear, unique name for this subagent.':
-    'Введите четкое, уникальное имя для этого подагента.',
-  'e.g., Code Reviewer': 'например, Ревьювер кода',
-  'Name cannot be empty.': 'Имя не может быть пустым.',
+  "Esc to cancel": "Esc для отмены",
+  "Press Enter to save, e to save and edit, Esc to go back":
+    "Enter для сохранения, e для сохранения и редактирования, Esc для возврата",
+  "Press Enter to continue, {{navigation}}Esc to {{action}}":
+    "Enter для продолжения, {{navigation}}Esc для {{action}}",
+  cancel: "отмены",
+  "go back": "возврата",
+  "↑↓ to navigate, ": "↑↓ для навигации, ",
+  "Enter a clear, unique name for this subagent.":
+    "Введите четкое, уникальное имя для этого подагента.",
+  "e.g., Code Reviewer": "например, Ревьювер кода",
+  "Name cannot be empty.": "Имя не может быть пустым.",
   "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.":
-    'Напишите системный промпт, определяющий поведение подагента. Будьте подробны для лучших результатов.',
-  'e.g., You are an expert code reviewer...':
-    'например, Вы экспертный ревьювер кода...',
-  'System prompt cannot be empty.': 'Системный промпт не может быть пустым.',
-  'Describe when and how this subagent should be used.':
-    'Опишите, когда и как следует использовать этого подагента.',
-  'e.g., Reviews code for best practices and potential bugs.':
-    'например, Проверяет код на соответствие лучшим практикам и потенциальные ошибки.',
-  'Description cannot be empty.': 'Описание не может быть пустым.',
-  'Failed to launch editor: {{error}}':
-    'Не удалось запустить редактор: {{error}}',
-  'Failed to save and edit subagent: {{error}}':
-    'Не удалось сохранить и отредактировать подагента: {{error}}',
+    "Напишите системный промпт, определяющий поведение подагента. Будьте подробны для лучших результатов.",
+  "e.g., You are an expert code reviewer...": "например, Вы экспертный ревьювер кода...",
+  "System prompt cannot be empty.": "Системный промпт не может быть пустым.",
+  "Describe when and how this subagent should be used.":
+    "Опишите, когда и как следует использовать этого подагента.",
+  "e.g., Reviews code for best practices and potential bugs.":
+    "например, Проверяет код на соответствие лучшим практикам и потенциальные ошибки.",
+  "Description cannot be empty.": "Описание не может быть пустым.",
+  "Failed to launch editor: {{error}}": "Не удалось запустить редактор: {{error}}",
+  "Failed to save and edit subagent: {{error}}":
+    "Не удалось сохранить и отредактировать подагента: {{error}}",
 
   // ============================================================================
   // Команды - Общие (продолжение)
   // ============================================================================
-  'View and edit Qwen Code settings': 'Просмотр и изменение настроек Qwen Code',
-  Settings: 'Настройки',
-  'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
-    'Для применения изменений необходимо перезапустить Qwen Code. Нажмите r для выхода и применения изменений.',
+  "View and edit Qwen Code settings": "Просмотр и изменение настроек Qwen Code",
+  Settings: "Настройки",
+  "To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.":
+    "Для применения изменений необходимо перезапустить Qwen Code. Нажмите r для выхода и применения изменений.",
   'The command "/{{command}}" is not supported in non-interactive mode.':
     'Команда "/{{command}}" не поддерживается в неинтерактивном режиме.',
   // ============================================================================
   // Метки настроек
   // ============================================================================
-  'Vim Mode': 'Режим Vim',
-  'Disable Auto Update': 'Отключить автообновление',
-  'Attribution: commit': 'Атрибуция: коммит',
-  'Terminal Bell Notification': 'Звуковое уведомление терминала',
-  'Enable Usage Statistics': 'Включить сбор статистики использования',
-  Theme: 'Тема',
-  'Preferred Editor': 'Предпочтительный редактор',
-  'Auto-connect to IDE': 'Автоподключение к IDE',
-  'Enable Prompt Completion': 'Включить автодополнение промптов',
-  'Debug Keystroke Logging': 'Логирование нажатий клавиш для отладки',
-  'Language: UI': 'Язык: интерфейс',
-  'Language: Model': 'Язык: модель',
-  'Output Format': 'Формат вывода',
-  'Hide Window Title': 'Скрыть заголовок окна',
-  'Show Status in Title': 'Показывать статус в заголовке',
-  'Hide Tips': 'Скрыть подсказки',
-  'Show Line Numbers in Code': 'Показывать номера строк в коде',
-  'Show Citations': 'Показывать цитаты',
-  'Custom Witty Phrases': 'Пользовательские остроумные фразы',
-  'Show Welcome Back Dialog': 'Показывать диалог приветствия',
-  'Enable User Feedback': 'Включить отзывы пользователей',
-  'How is Qwen doing this session? (optional)':
-    'Как дела у Qwen в этой сессии? (необязательно)',
-  Bad: 'Плохо',
-  Fine: 'Нормально',
-  Good: 'Хорошо',
-  Dismiss: 'Отклонить',
-  'Not Sure Yet': 'Пока не уверен',
-  'Any other key': 'Любая другая клавиша',
-  'Disable Loading Phrases': 'Отключить фразы при загрузке',
-  'Screen Reader Mode': 'Режим программы чтения с экрана',
-  'IDE Mode': 'Режим IDE',
-  'Max Session Turns': 'Макс. количество ходов сессии',
-  'Skip Next Speaker Check': 'Пропустить проверку следующего говорящего',
-  'Skip Loop Detection': 'Пропустить обнаружение циклов',
-  'Skip Startup Context': 'Пропустить начальный контекст',
-  'Enable OpenAI Logging': 'Включить логирование OpenAI',
-  'OpenAI Logging Directory': 'Директория логов OpenAI',
-  Timeout: 'Таймаут',
-  'Max Retries': 'Макс. количество попыток',
-  'Disable Cache Control': 'Отключить управление кэшем',
-  'Memory Discovery Max Dirs': 'Макс. директорий для поиска в памяти',
-  'Load Memory From Include Directories':
-    'Загружать память из включенных директорий',
-  'Respect .gitignore': 'Учитывать .gitignore',
-  'Respect .qwenignore': 'Учитывать .qwenignore',
-  'Enable Recursive File Search': 'Включить рекурсивный поиск файлов',
-  'Disable Fuzzy Search': 'Отключить нечеткий поиск',
-  'Interactive Shell (PTY)': 'Интерактивный терминал (PTY)',
-  'Show Color': 'Показывать цвета',
-  'Auto Accept': 'Автоподтверждение',
-  'Use Ripgrep': 'Использовать Ripgrep',
-  'Use Builtin Ripgrep': 'Использовать встроенный Ripgrep',
-  'Enable Tool Output Truncation': 'Включить обрезку вывода инструментов',
-  'Tool Output Truncation Threshold': 'Порог обрезки вывода инструментов',
-  'Tool Output Truncation Lines': 'Лимит строк вывода инструментов',
-  'Folder Trust': 'Доверие к папке',
-  'Vision Model Preview': 'Визуальная модель (предпросмотр)',
-  'Tool Schema Compliance': 'Соответствие схеме инструмента',
+  "Vim Mode": "Режим Vim",
+  "Disable Auto Update": "Отключить автообновление",
+  "Attribution: commit": "Атрибуция: коммит",
+  "Terminal Bell Notification": "Звуковое уведомление терминала",
+  "Enable Usage Statistics": "Включить сбор статистики использования",
+  Theme: "Тема",
+  "Preferred Editor": "Предпочтительный редактор",
+  "Auto-connect to IDE": "Автоподключение к IDE",
+  "Enable Prompt Completion": "Включить автодополнение промптов",
+  "Debug Keystroke Logging": "Логирование нажатий клавиш для отладки",
+  "Language: UI": "Язык: интерфейс",
+  "Language: Model": "Язык: модель",
+  "Output Format": "Формат вывода",
+  "Hide Window Title": "Скрыть заголовок окна",
+  "Show Status in Title": "Показывать статус в заголовке",
+  "Hide Tips": "Скрыть подсказки",
+  "Show Line Numbers in Code": "Показывать номера строк в коде",
+  "Show Citations": "Показывать цитаты",
+  "Custom Witty Phrases": "Пользовательские остроумные фразы",
+  "Show Welcome Back Dialog": "Показывать диалог приветствия",
+  "Enable User Feedback": "Включить отзывы пользователей",
+  "How is Qwen doing this session? (optional)": "Как дела у Qwen в этой сессии? (необязательно)",
+  Bad: "Плохо",
+  Fine: "Нормально",
+  Good: "Хорошо",
+  Dismiss: "Отклонить",
+  "Not Sure Yet": "Пока не уверен",
+  "Any other key": "Любая другая клавиша",
+  "Disable Loading Phrases": "Отключить фразы при загрузке",
+  "Screen Reader Mode": "Режим программы чтения с экрана",
+  "IDE Mode": "Режим IDE",
+  "Max Session Turns": "Макс. количество ходов сессии",
+  "Skip Next Speaker Check": "Пропустить проверку следующего говорящего",
+  "Skip Loop Detection": "Пропустить обнаружение циклов",
+  "Skip Startup Context": "Пропустить начальный контекст",
+  "Enable OpenAI Logging": "Включить логирование OpenAI",
+  "OpenAI Logging Directory": "Директория логов OpenAI",
+  Timeout: "Таймаут",
+  "Max Retries": "Макс. количество попыток",
+  "Disable Cache Control": "Отключить управление кэшем",
+  "Memory Discovery Max Dirs": "Макс. директорий для поиска в памяти",
+  "Load Memory From Include Directories": "Загружать память из включенных директорий",
+  "Respect .gitignore": "Учитывать .gitignore",
+  "Respect .qwenignore": "Учитывать .qwenignore",
+  "Enable Recursive File Search": "Включить рекурсивный поиск файлов",
+  "Disable Fuzzy Search": "Отключить нечеткий поиск",
+  "Interactive Shell (PTY)": "Интерактивный терминал (PTY)",
+  "Show Color": "Показывать цвета",
+  "Auto Accept": "Автоподтверждение",
+  "Use Ripgrep": "Использовать Ripgrep",
+  "Use Builtin Ripgrep": "Использовать встроенный Ripgrep",
+  "Enable Tool Output Truncation": "Включить обрезку вывода инструментов",
+  "Tool Output Truncation Threshold": "Порог обрезки вывода инструментов",
+  "Tool Output Truncation Lines": "Лимит строк вывода инструментов",
+  "Folder Trust": "Доверие к папке",
+  "Vision Model Preview": "Визуальная модель (предпросмотр)",
+  "Tool Schema Compliance": "Соответствие схеме инструмента",
   // Варианты перечислений настроек
-  'Auto (detect from system)': 'Авто (определить из системы)',
-  Text: 'Текст',
-  JSON: 'JSON',
-  Plan: 'План',
-  Default: 'По умолчанию',
-  'Auto Edit': 'Авторедактирование',
-  YOLO: 'YOLO',
-  'toggle vim mode on/off': 'Включение/выключение режима vim',
-  'check session stats. Usage: /stats [model|tools]':
-    'Просмотр статистики сессии. Использование: /stats [model|tools]',
-  'Show model-specific usage statistics.':
-    'Показать статистику использования модели.',
-  'Show tool-specific usage statistics.':
-    'Показать статистику использования инструментов.',
-  'exit the cli': 'Выход из CLI',
-  'Open MCP management dialog, or authenticate with OAuth-enabled servers':
-    'Открыть диалог управления MCP или авторизоваться на сервере с поддержкой OAuth',
-  'List configured MCP servers and tools, or authenticate with OAuth-enabled servers':
-    'Показать настроенные MCP-серверы и инструменты, или авторизоваться на серверах с поддержкой OAuth',
-  'Manage workspace directories':
-    'Управление директориями рабочего пространства',
-  'Add directories to the workspace. Use comma to separate multiple paths':
-    'Добавить директории в рабочее пространство. Используйте запятую для разделения путей',
-  'Show all directories in the workspace':
-    'Показать все директории в рабочем пространстве',
-  'set external editor preference':
-    'Установка предпочитаемого внешнего редактора',
-  'Select Editor': 'Выбрать редактор',
-  'Editor Preference': 'Настройка редактора',
-  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
-    'В настоящее время поддерживаются следующие редакторы. Обратите внимание, что некоторые редакторы нельзя использовать в режиме песочницы.',
-  'Your preferred editor is:': 'Ваш предпочитаемый редактор:',
-  'Manage extensions': 'Управление расширениями',
-  'Manage installed extensions': 'Управлять установленными расширениями',
-  'List active extensions': 'Показать активные расширения',
-  'Update extensions. Usage: update <extension-names>|--all':
-    'Обновить расширения. Использование: update <extension-names>|--all',
-  'Disable an extension': 'Отключить расширение',
-  'Enable an extension': 'Включить расширение',
-  'Install an extension from a git repo or local path':
-    'Установить расширение из Git-репозитория или локального пути',
-  'Uninstall an extension': 'Удалить расширение',
-  'No extensions installed.': 'Расширения не установлены.',
-  'Usage: /extensions update <extension-names>|--all':
-    'Использование: /extensions update <имена-расширений>|--all',
+  "Auto (detect from system)": "Авто (определить из системы)",
+  Text: "Текст",
+  JSON: "JSON",
+  Plan: "План",
+  Default: "По умолчанию",
+  "Auto Edit": "Авторедактирование",
+  YOLO: "YOLO",
+  "toggle vim mode on/off": "Включение/выключение режима vim",
+  "check session stats. Usage: /stats [model|tools]":
+    "Просмотр статистики сессии. Использование: /stats [model|tools]",
+  "Show model-specific usage statistics.": "Показать статистику использования модели.",
+  "Show tool-specific usage statistics.": "Показать статистику использования инструментов.",
+  "exit the cli": "Выход из CLI",
+  "Open MCP management dialog, or authenticate with OAuth-enabled servers":
+    "Открыть диалог управления MCP или авторизоваться на сервере с поддержкой OAuth",
+  "List configured MCP servers and tools, or authenticate with OAuth-enabled servers":
+    "Показать настроенные MCP-серверы и инструменты, или авторизоваться на серверах с поддержкой OAuth",
+  "Manage workspace directories": "Управление директориями рабочего пространства",
+  "Add directories to the workspace. Use comma to separate multiple paths":
+    "Добавить директории в рабочее пространство. Используйте запятую для разделения путей",
+  "Show all directories in the workspace": "Показать все директории в рабочем пространстве",
+  "set external editor preference": "Установка предпочитаемого внешнего редактора",
+  "Select Editor": "Выбрать редактор",
+  "Editor Preference": "Настройка редактора",
+  "These editors are currently supported. Please note that some editors cannot be used in sandbox mode.":
+    "В настоящее время поддерживаются следующие редакторы. Обратите внимание, что некоторые редакторы нельзя использовать в режиме песочницы.",
+  "Your preferred editor is:": "Ваш предпочитаемый редактор:",
+  "Manage extensions": "Управление расширениями",
+  "Manage installed extensions": "Управлять установленными расширениями",
+  "List active extensions": "Показать активные расширения",
+  "Update extensions. Usage: update <extension-names>|--all":
+    "Обновить расширения. Использование: update <extension-names>|--all",
+  "Disable an extension": "Отключить расширение",
+  "Enable an extension": "Включить расширение",
+  "Install an extension from a git repo or local path":
+    "Установить расширение из Git-репозитория или локального пути",
+  "Uninstall an extension": "Удалить расширение",
+  "No extensions installed.": "Расширения не установлены.",
+  "Usage: /extensions update <extension-names>|--all":
+    "Использование: /extensions update <имена-расширений>|--all",
   'Extension "{{name}}" not found.': 'Расширение "{{name}}" не найдено.',
-  'No extensions to update.': 'Нет расширений для обновления.',
-  'Usage: /extensions install <source>':
-    'Использование: /extensions install <источник>',
-  'Installing extension from "{{source}}"...':
-    'Установка расширения из "{{source}}"...',
-  'Extension "{{name}}" installed successfully.':
-    'Расширение "{{name}}" успешно установлено.',
+  "No extensions to update.": "Нет расширений для обновления.",
+  "Usage: /extensions install <source>": "Использование: /extensions install <источник>",
+  'Installing extension from "{{source}}"...': 'Установка расширения из "{{source}}"...',
+  'Extension "{{name}}" installed successfully.': 'Расширение "{{name}}" успешно установлено.',
   'Failed to install extension from "{{source}}": {{error}}':
     'Не удалось установить расширение из "{{source}}": {{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    'Использование: /extensions uninstall <имя-расширения>',
+  "Usage: /extensions uninstall <extension-name>":
+    "Использование: /extensions uninstall <имя-расширения>",
   'Uninstalling extension "{{name}}"...': 'Удаление расширения "{{name}}"...',
-  'Extension "{{name}}" uninstalled successfully.':
-    'Расширение "{{name}}" успешно удалено.',
+  'Extension "{{name}}" uninstalled successfully.': 'Расширение "{{name}}" успешно удалено.',
   'Failed to uninstall extension "{{name}}": {{error}}':
     'Не удалось удалить расширение "{{name}}": {{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    'Использование: /extensions {{command}} <расширение> [--scope=<user|workspace>]',
+  "Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]":
+    "Использование: /extensions {{command}} <расширение> [--scope=<user|workspace>]",
   'Unsupported scope "{{scope}}", should be one of "user" or "workspace"':
     'Неподдерживаемая область "{{scope}}", должна быть "user" или "workspace"',
   'Extension "{{name}}" disabled for scope "{{scope}}"':
     'Расширение "{{name}}" отключено для области "{{scope}}"',
   'Extension "{{name}}" enabled for scope "{{scope}}"':
     'Расширение "{{name}}" включено для области "{{scope}}"',
-  'Do you want to continue? [Y/n]: ': 'Хотите продолжить? [Y/n]: ',
-  'Do you want to continue?': 'Хотите продолжить?',
+  "Do you want to continue? [Y/n]: ": "Хотите продолжить? [Y/n]: ",
+  "Do you want to continue?": "Хотите продолжить?",
   'Installing extension "{{name}}".': 'Установка расширения "{{name}}".',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**Расширения могут вызывать неожиданное поведение. Убедитесь, что вы изучили источник расширения и доверяете автору.**',
-  'This extension will run the following MCP servers:':
-    'Это расширение запустит следующие MCP-серверы:',
-  local: 'локальный',
-  remote: 'удалённый',
-  'This extension will add the following commands: {{commands}}.':
-    'Это расширение добавит следующие команды: {{commands}}.',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    'Это расширение добавит информацию в ваш контекст QWEN.md с помощью {{fileName}}',
-  'This extension will exclude the following core tools: {{tools}}':
-    'Это расширение исключит следующие основные инструменты: {{tools}}',
-  'This extension will install the following skills:':
-    'Это расширение установит следующие навыки:',
-  'This extension will install the following subagents:':
-    'Это расширение установит следующие подагенты:',
+  "**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**":
+    "**Расширения могут вызывать неожиданное поведение. Убедитесь, что вы изучили источник расширения и доверяете автору.**",
+  "This extension will run the following MCP servers:":
+    "Это расширение запустит следующие MCP-серверы:",
+  local: "локальный",
+  remote: "удалённый",
+  "This extension will add the following commands: {{commands}}.":
+    "Это расширение добавит следующие команды: {{commands}}.",
+  "This extension will append info to your QWEN.md context using {{fileName}}":
+    "Это расширение добавит информацию в ваш контекст QWEN.md с помощью {{fileName}}",
+  "This extension will exclude the following core tools: {{tools}}":
+    "Это расширение исключит следующие основные инструменты: {{tools}}",
+  "This extension will install the following skills:": "Это расширение установит следующие навыки:",
+  "This extension will install the following subagents:":
+    "Это расширение установит следующие подагенты:",
   'Installation cancelled for "{{name}}".': 'Установка "{{name}}" отменена.',
-  'You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.':
-    'Вы устанавливаете расширение от {{originSource}}. Некоторые функции могут работать не идеально с Qwen Code.',
-  '--ref and --auto-update are not applicable for marketplace extensions.':
-    '--ref и --auto-update неприменимы для расширений из маркетплейса.',
+  "You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.":
+    "Вы устанавливаете расширение от {{originSource}}. Некоторые функции могут работать не идеально с Qwen Code.",
+  "--ref and --auto-update are not applicable for marketplace extensions.":
+    "--ref и --auto-update неприменимы для расширений из маркетплейса.",
   'Extension "{{name}}" installed successfully and enabled.':
     'Расширение "{{name}}" успешно установлено и включено.',
-  'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).':
-    'Устанавливает расширение из URL Git-репозитория, локального пути или маркетплейса Claude (marketplace-url:plugin-name).',
-  'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.':
-    'URL GitHub, локальный путь или источник в маркетплейсе (marketplace-url:plugin-name) устанавливаемого расширения.',
-  'The git ref to install from.': 'Git-ссылка для установки.',
-  'Enable auto-update for this extension.':
-    'Включить автообновление для этого расширения.',
-  'Enable pre-release versions for this extension.':
-    'Включить пре-релизные версии для этого расширения.',
-  'Acknowledge the security risks of installing an extension and skip the confirmation prompt.':
-    'Подтвердить риски безопасности установки расширения и пропустить запрос подтверждения.',
-  'The source argument must be provided.':
-    'Необходимо указать аргумент источника.',
-  'Extension "{{name}}" successfully uninstalled.':
-    'Расширение "{{name}}" успешно удалено.',
-  'Uninstalls an extension.': 'Удаляет расширение.',
-  'The name or source path of the extension to uninstall.':
-    'Имя или путь к источнику удаляемого расширения.',
-  'Please include the name of the extension to uninstall as a positional argument.':
-    'Пожалуйста, укажите имя удаляемого расширения как позиционный аргумент.',
-  'Enables an extension.': 'Включает расширение.',
-  'The name of the extension to enable.': 'Имя включаемого расширения.',
-  'The scope to enable the extenison in. If not set, will be enabled in all scopes.':
-    'Область для включения расширения. Если не задана, будет включено во всех областях.',
+  "Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).":
+    "Устанавливает расширение из URL Git-репозитория, локального пути или маркетплейса Claude (marketplace-url:plugin-name).",
+  "The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.":
+    "URL GitHub, локальный путь или источник в маркетплейсе (marketplace-url:plugin-name) устанавливаемого расширения.",
+  "The git ref to install from.": "Git-ссылка для установки.",
+  "Enable auto-update for this extension.": "Включить автообновление для этого расширения.",
+  "Enable pre-release versions for this extension.":
+    "Включить пре-релизные версии для этого расширения.",
+  "Acknowledge the security risks of installing an extension and skip the confirmation prompt.":
+    "Подтвердить риски безопасности установки расширения и пропустить запрос подтверждения.",
+  "The source argument must be provided.": "Необходимо указать аргумент источника.",
+  'Extension "{{name}}" successfully uninstalled.': 'Расширение "{{name}}" успешно удалено.',
+  "Uninstalls an extension.": "Удаляет расширение.",
+  "The name or source path of the extension to uninstall.":
+    "Имя или путь к источнику удаляемого расширения.",
+  "Please include the name of the extension to uninstall as a positional argument.":
+    "Пожалуйста, укажите имя удаляемого расширения как позиционный аргумент.",
+  "Enables an extension.": "Включает расширение.",
+  "The name of the extension to enable.": "Имя включаемого расширения.",
+  "The scope to enable the extenison in. If not set, will be enabled in all scopes.":
+    "Область для включения расширения. Если не задана, будет включено во всех областях.",
   'Extension "{{name}}" successfully enabled for scope "{{scope}}".':
     'Расширение "{{name}}" успешно включено для области "{{scope}}".',
   'Extension "{{name}}" successfully enabled in all scopes.':
     'Расширение "{{name}}" успешно включено во всех областях.',
-  'Invalid scope: {{scope}}. Please use one of {{scopes}}.':
-    'Недопустимая область: {{scope}}. Пожалуйста, используйте одну из {{scopes}}.',
-  'Disables an extension.': 'Отключает расширение.',
-  'The name of the extension to disable.': 'Имя отключаемого расширения.',
-  'The scope to disable the extenison in.':
-    'Область для отключения расширения.',
+  "Invalid scope: {{scope}}. Please use one of {{scopes}}.":
+    "Недопустимая область: {{scope}}. Пожалуйста, используйте одну из {{scopes}}.",
+  "Disables an extension.": "Отключает расширение.",
+  "The name of the extension to disable.": "Имя отключаемого расширения.",
+  "The scope to disable the extenison in.": "Область для отключения расширения.",
   'Extension "{{name}}" successfully disabled for scope "{{scope}}".':
     'Расширение "{{name}}" успешно отключено для области "{{scope}}".',
   'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.':
     'Расширение "{{name}}" успешно обновлено: {{oldVersion}} → {{newVersion}}.',
   'Unable to install extension "{{name}}" due to missing install metadata':
     'Невозможно установить расширение "{{name}}" из-за отсутствия метаданных установки',
-  'Extension "{{name}}" is already up to date.':
-    'Расширение "{{name}}" уже актуально.',
-  'Updates all extensions or a named extension to the latest version.':
-    'Обновляет все расширения или указанное расширение до последней версии.',
-  'The name of the extension to update.': 'Имя обновляемого расширения.',
-  'Update all extensions.': 'Обновить все расширения.',
-  'Either an extension name or --all must be provided':
-    'Необходимо указать имя расширения или --all',
-  'Lists installed extensions.': 'Показывает установленные расширения.',
-  'Path:': 'Путь:',
-  'Source:': 'Источник:',
-  'Type:': 'Тип:',
-  'Ref:': 'Ссылка:',
-  'Release tag:': 'Тег релиза:',
-  'Enabled (User):': 'Включено (Пользователь):',
-  'Enabled (Workspace):': 'Включено (Рабочее пространство):',
-  'Context files:': 'Контекстные файлы:',
-  'Skills:': 'Навыки:',
-  'Agents:': 'Агенты:',
-  'MCP servers:': 'MCP-серверы:',
-  'Link extension failed to install.':
-    'Не удалось установить связанное расширение.',
+  'Extension "{{name}}" is already up to date.': 'Расширение "{{name}}" уже актуально.',
+  "Updates all extensions or a named extension to the latest version.":
+    "Обновляет все расширения или указанное расширение до последней версии.",
+  "The name of the extension to update.": "Имя обновляемого расширения.",
+  "Update all extensions.": "Обновить все расширения.",
+  "Either an extension name or --all must be provided":
+    "Необходимо указать имя расширения или --all",
+  "Lists installed extensions.": "Показывает установленные расширения.",
+  "Path:": "Путь:",
+  "Source:": "Источник:",
+  "Type:": "Тип:",
+  "Ref:": "Ссылка:",
+  "Release tag:": "Тег релиза:",
+  "Enabled (User):": "Включено (Пользователь):",
+  "Enabled (Workspace):": "Включено (Рабочее пространство):",
+  "Context files:": "Контекстные файлы:",
+  "Skills:": "Навыки:",
+  "Agents:": "Агенты:",
+  "MCP servers:": "MCP-серверы:",
+  "Link extension failed to install.": "Не удалось установить связанное расширение.",
   'Extension "{{name}}" linked successfully and enabled.':
     'Расширение "{{name}}" успешно связано и включено.',
-  'Links an extension from a local path. Updates made to the local path will always be reflected.':
-    'Связывает расширение из локального пути. Изменения в локальном пути будут всегда отражаться.',
-  'The name of the extension to link.': 'Имя связываемого расширения.',
-  'Set a specific setting for an extension.':
-    'Установить конкретную настройку для расширения.',
-  'Name of the extension to configure.': 'Имя настраиваемого расширения.',
-  'The setting to configure (name or env var).':
-    'Настройка для конфигурирования (имя или переменная окружения).',
-  'The scope to set the setting in.': 'Область для установки настройки.',
-  'List all settings for an extension.': 'Показать все настройки расширения.',
-  'Name of the extension.': 'Имя расширения.',
+  "Links an extension from a local path. Updates made to the local path will always be reflected.":
+    "Связывает расширение из локального пути. Изменения в локальном пути будут всегда отражаться.",
+  "The name of the extension to link.": "Имя связываемого расширения.",
+  "Set a specific setting for an extension.": "Установить конкретную настройку для расширения.",
+  "Name of the extension to configure.": "Имя настраиваемого расширения.",
+  "The setting to configure (name or env var).":
+    "Настройка для конфигурирования (имя или переменная окружения).",
+  "The scope to set the setting in.": "Область для установки настройки.",
+  "List all settings for an extension.": "Показать все настройки расширения.",
+  "Name of the extension.": "Имя расширения.",
   'Extension "{{name}}" has no settings to configure.':
     'Расширение "{{name}}" не имеет настроек для конфигурирования.',
   'Settings for "{{name}}":': 'Настройки для "{{name}}":',
-  '(workspace)': '(рабочее пространство)',
-  '(user)': '(пользователь)',
-  '[not set]': '[не задано]',
-  '[value stored in keychain]': '[значение хранится в связке ключей]',
-  'Manage extension settings.': 'Управление настройками расширений.',
-  'You need to specify a command (set or list).':
-    'Необходимо указать команду (set или list).',
+  "(workspace)": "(рабочее пространство)",
+  "(user)": "(пользователь)",
+  "[not set]": "[не задано]",
+  "[value stored in keychain]": "[значение хранится в связке ключей]",
+  "Manage extension settings.": "Управление настройками расширений.",
+  "You need to specify a command (set or list).": "Необходимо указать команду (set или list).",
   // ============================================================================
   // Plugin Choice / Marketplace
   // ============================================================================
-  'No plugins available in this marketplace.':
-    'В этом маркетплейсе нет доступных плагинов.',
+  "No plugins available in this marketplace.": "В этом маркетплейсе нет доступных плагинов.",
   'Select a plugin to install from marketplace "{{name}}":':
     'Выберите плагин для установки из маркетплейса "{{name}}":',
-  'Plugin selection cancelled.': 'Выбор плагина отменён.',
+  "Plugin selection cancelled.": "Выбор плагина отменён.",
   'Select a plugin from "{{name}}"': 'Выберите плагин из "{{name}}"',
-  'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel':
-    'Используйте ↑↓ или j/k для навигации, Enter для выбора, Escape для отмены',
-  '{{count}} more above': 'ещё {{count}} выше',
-  '{{count}} more below': 'ещё {{count}} ниже',
-  'manage IDE integration': 'Управление интеграцией с IDE',
-  'check status of IDE integration': 'Проверить статус интеграции с IDE',
-  'install required IDE companion for {{ideName}}':
-    'Установить необходимый компаньон IDE для {{ideName}}',
-  'enable IDE integration': 'Включение интеграции с IDE',
-  'disable IDE integration': 'Отключение интеграции с IDE',
-  'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.':
-    'Интеграция с IDE не поддерживается в вашем окружении. Для использования этой функции запустите Qwen Code в одной из поддерживаемых IDE: VS Code или форках VS Code.',
-  'Set up GitHub Actions': 'Настройка GitHub Actions',
-  'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)':
-    'Настройка привязки клавиш терминала для многострочного ввода (VS Code, Cursor, Windsurf, Trae)',
-  'Please restart your terminal for the changes to take effect.':
-    'Пожалуйста, перезапустите терминал для применения изменений.',
-  'Failed to configure terminal: {{error}}':
-    'Не удалось настроить терминал: {{error}}',
-  'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.':
-    'Не удалось определить путь конфигурации {{terminalName}} в Windows: переменная окружения APPDATA не установлена.',
-  '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.':
-    '{{terminalName}} keybindings.json существует, но не является корректным массивом JSON. Пожалуйста, исправьте файл вручную или удалите его для автоматической настройки.',
-  'File: {{file}}': 'Файл: {{file}}',
-  'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.':
-    'Не удалось разобрать {{terminalName}} keybindings.json. Файл содержит некорректный JSON. Пожалуйста, исправьте файл вручную или удалите его для автоматической настройки.',
-  'Error: {{error}}': 'Ошибка: {{error}}',
-  'Shift+Enter binding already exists': 'Привязка Shift+Enter уже существует',
-  'Ctrl+Enter binding already exists': 'Привязка Ctrl+Enter уже существует',
-  'Existing keybindings detected. Will not modify to avoid conflicts.':
-    'Обнаружены существующие привязки клавиш. Не будут изменены во избежание конфликтов.',
-  'Please check and modify manually if needed: {{file}}':
-    'Пожалуйста, проверьте и измените вручную при необходимости: {{file}}',
-  'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.':
-    'Добавлены привязки Shift+Enter и Ctrl+Enter для {{terminalName}}.',
-  'Modified: {{file}}': 'Изменено: {{file}}',
-  '{{terminalName}} keybindings already configured.':
-    'Привязки клавиш {{terminalName}} уже настроены.',
-  'Failed to configure {{terminalName}}.':
-    'Не удалось настроить {{terminalName}}.',
-  'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).':
-    'Ваш терминал уже настроен для оптимальной работы с многострочным вводом (Shift+Enter и Ctrl+Enter).',
+  "Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel":
+    "Используйте ↑↓ или j/k для навигации, Enter для выбора, Escape для отмены",
+  "{{count}} more above": "ещё {{count}} выше",
+  "{{count}} more below": "ещё {{count}} ниже",
+  "manage IDE integration": "Управление интеграцией с IDE",
+  "check status of IDE integration": "Проверить статус интеграции с IDE",
+  "install required IDE companion for {{ideName}}":
+    "Установить необходимый компаньон IDE для {{ideName}}",
+  "enable IDE integration": "Включение интеграции с IDE",
+  "disable IDE integration": "Отключение интеграции с IDE",
+  "IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.":
+    "Интеграция с IDE не поддерживается в вашем окружении. Для использования этой функции запустите Qwen Code в одной из поддерживаемых IDE: VS Code или форках VS Code.",
+  "Set up GitHub Actions": "Настройка GitHub Actions",
+  "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)":
+    "Настройка привязки клавиш терминала для многострочного ввода (VS Code, Cursor, Windsurf, Trae)",
+  "Please restart your terminal for the changes to take effect.":
+    "Пожалуйста, перезапустите терминал для применения изменений.",
+  "Failed to configure terminal: {{error}}": "Не удалось настроить терминал: {{error}}",
+  "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.":
+    "Не удалось определить путь конфигурации {{terminalName}} в Windows: переменная окружения APPDATA не установлена.",
+  "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.":
+    "{{terminalName}} keybindings.json существует, но не является корректным массивом JSON. Пожалуйста, исправьте файл вручную или удалите его для автоматической настройки.",
+  "File: {{file}}": "Файл: {{file}}",
+  "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.":
+    "Не удалось разобрать {{terminalName}} keybindings.json. Файл содержит некорректный JSON. Пожалуйста, исправьте файл вручную или удалите его для автоматической настройки.",
+  "Error: {{error}}": "Ошибка: {{error}}",
+  "Shift+Enter binding already exists": "Привязка Shift+Enter уже существует",
+  "Ctrl+Enter binding already exists": "Привязка Ctrl+Enter уже существует",
+  "Existing keybindings detected. Will not modify to avoid conflicts.":
+    "Обнаружены существующие привязки клавиш. Не будут изменены во избежание конфликтов.",
+  "Please check and modify manually if needed: {{file}}":
+    "Пожалуйста, проверьте и измените вручную при необходимости: {{file}}",
+  "Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.":
+    "Добавлены привязки Shift+Enter и Ctrl+Enter для {{terminalName}}.",
+  "Modified: {{file}}": "Изменено: {{file}}",
+  "{{terminalName}} keybindings already configured.":
+    "Привязки клавиш {{terminalName}} уже настроены.",
+  "Failed to configure {{terminalName}}.": "Не удалось настроить {{terminalName}}.",
+  "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).":
+    "Ваш терминал уже настроен для оптимальной работы с многострочным вводом (Shift+Enter и Ctrl+Enter).",
   // ============================================================================
   // Commands - Hooks
   // ============================================================================
-  'Manage Qwen Code hooks': 'Управлять хуками Qwen Code',
-  'List all configured hooks': 'Показать все настроенные хуки',
-  'Enable a disabled hook': 'Включить отключенный хук',
-  'Disable an active hook': 'Отключить активный хук',
+  "Manage Qwen Code hooks": "Управлять хуками Qwen Code",
+  "List all configured hooks": "Показать все настроенные хуки",
+  "Enable a disabled hook": "Включить отключенный хук",
+  "Disable an active hook": "Отключить активный хук",
   // Hooks - Dialog
-  Hooks: 'Хуки',
-  'Loading hooks...': 'Загрузка хуков...',
-  'Error loading hooks:': 'Ошибка загрузки хуков:',
-  'Press Escape to close': 'Нажмите Escape для закрытия',
-  'Press Escape, Ctrl+C, or Ctrl+D to cancel':
-    'Нажмите Escape, Ctrl+C или Ctrl+D для отмены',
-  'Press Space, Enter, or Escape to dismiss':
-    'Нажмите Пробел, Enter или Escape для закрытия',
-  'No hook selected': 'Хук не выбран',
+  Hooks: "Хуки",
+  "Loading hooks...": "Загрузка хуков...",
+  "Error loading hooks:": "Ошибка загрузки хуков:",
+  "Press Escape to close": "Нажмите Escape для закрытия",
+  "Press Escape, Ctrl+C, or Ctrl+D to cancel": "Нажмите Escape, Ctrl+C или Ctrl+D для отмены",
+  "Press Space, Enter, or Escape to dismiss": "Нажмите Пробел, Enter или Escape для закрытия",
+  "No hook selected": "Хук не выбран",
   // Hooks - List Step
-  'No hook events found.': 'События хуков не найдены.',
-  '{{count}} hook configured': '{{count}} хук настроен',
-  '{{count}} hooks configured': '{{count}} хуков настроено',
-  'This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.':
-    'Это меню только для чтения. Чтобы добавить или изменить хуки, отредактируйте settings.json напрямую или спросите Qwen Code.',
-  'Enter to select · Esc to cancel': 'Enter для выбора · Esc для отмены',
+  "No hook events found.": "События хуков не найдены.",
+  "{{count}} hook configured": "{{count}} хук настроен",
+  "{{count}} hooks configured": "{{count}} хуков настроено",
+  "This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.":
+    "Это меню только для чтения. Чтобы добавить или изменить хуки, отредактируйте settings.json напрямую или спросите Qwen Code.",
+  "Enter to select · Esc to cancel": "Enter для выбора · Esc для отмены",
   // Hooks - Detail Step
-  'Exit codes:': 'Коды выхода:',
-  'Configured hooks:': 'Настроенные хуки:',
-  'No hooks configured for this event.':
-    'Для этого события нет настроенных хуков.',
-  'To add hooks, edit settings.json directly or ask Qwen.':
-    'Чтобы добавить хуки, отредактируйте settings.json напрямую или спросите Qwen.',
-  'Enter to select · Esc to go back': 'Enter для выбора · Esc для возврата',
+  "Exit codes:": "Коды выхода:",
+  "Configured hooks:": "Настроенные хуки:",
+  "No hooks configured for this event.": "Для этого события нет настроенных хуков.",
+  "To add hooks, edit settings.json directly or ask Qwen.":
+    "Чтобы добавить хуки, отредактируйте settings.json напрямую или спросите Qwen.",
+  "Enter to select · Esc to go back": "Enter для выбора · Esc для возврата",
   // Hooks - Config Detail Step
-  'Hook details': 'Детали хука',
-  'Event:': 'Событие:',
-  'Extension:': 'Расширение:',
-  'Desc:': 'Описание:',
-  'No hook config selected': 'Конфигурация хука не выбрана',
-  'To modify or remove this hook, edit settings.json directly or ask Qwen to help.':
-    'Чтобы изменить или удалить этот хук, отредактируйте settings.json напрямую или спросите Qwen.',
+  "Hook details": "Детали хука",
+  "Event:": "Событие:",
+  "Extension:": "Расширение:",
+  "Desc:": "Описание:",
+  "No hook config selected": "Конфигурация хука не выбрана",
+  "To modify or remove this hook, edit settings.json directly or ask Qwen to help.":
+    "Чтобы изменить или удалить этот хук, отредактируйте settings.json напрямую или спросите Qwen.",
   // Hooks - Disabled Step
-  'Hook Configuration - Disabled': 'Конфигурация хуков - Отключено',
-  'All hooks are currently disabled. You have {{count}} that are not running.':
-    'Все хуки в данный момент отключены. У вас {{count}} не выполняются.',
-  '{{count}} configured hook': '{{count}} настроенный хук',
-  '{{count}} configured hooks': '{{count}} настроенных хуков',
-  'When hooks are disabled:': 'Когда хуки отключены:',
-  'No hook commands will execute': 'Никакие команды хуков не будут выполняться',
-  'StatusLine will not be displayed': 'StatusLine не будет отображаться',
-  'Tool operations will proceed without hook validation':
-    'Операции инструментов будут выполняться без проверки хуков',
+  "Hook Configuration - Disabled": "Конфигурация хуков - Отключено",
+  "All hooks are currently disabled. You have {{count}} that are not running.":
+    "Все хуки в данный момент отключены. У вас {{count}} не выполняются.",
+  "{{count}} configured hook": "{{count}} настроенный хук",
+  "{{count}} configured hooks": "{{count}} настроенных хуков",
+  "When hooks are disabled:": "Когда хуки отключены:",
+  "No hook commands will execute": "Никакие команды хуков не будут выполняться",
+  "StatusLine will not be displayed": "StatusLine не будет отображаться",
+  "Tool operations will proceed without hook validation":
+    "Операции инструментов будут выполняться без проверки хуков",
   'To re-enable hooks, remove "disableAllHooks" from settings.json or ask Qwen Code.':
     'Чтобы снова включить хуки, удалите "disableAllHooks" из settings.json или спросите Qwen Code.',
   // Hooks - Source
-  Project: 'Проект',
-  User: 'Пользователь',
-  System: 'Система',
-  Extension: 'Расширение',
-  'Local Settings': 'Локальные настройки',
-  'User Settings': 'Пользовательские настройки',
-  'System Settings': 'Системные настройки',
-  Extensions: 'Расширения',
+  Project: "Проект",
+  User: "Пользователь",
+  System: "Система",
+  Extension: "Расширение",
+  "Local Settings": "Локальные настройки",
+  "User Settings": "Пользовательские настройки",
+  "System Settings": "Системные настройки",
+  Extensions: "Расширения",
   // Hooks - Status
-  '✓ Enabled': '✓ Включен',
-  '✗ Disabled': '✗ Отключен',
+  "✓ Enabled": "✓ Включен",
+  "✗ Disabled": "✗ Отключен",
   // Hooks - Event Descriptions (short)
-  'Before tool execution': 'Перед выполнением инструмента',
-  'After tool execution': 'После выполнения инструмента',
-  'After tool execution fails': 'При неудачном выполнении инструмента',
-  'When notifications are sent': 'При отправке уведомлений',
-  'When the user submits a prompt': 'Когда пользователь отправляет промпт',
-  'When a new session is started': 'При запуске новой сессии',
-  'Right before Qwen Code concludes its response':
-    'Непосредственно перед завершением ответа Qwen Code',
-  'When a subagent (Agent tool call) is started':
-    'При запуске субагента (вызов инструмента Agent)',
-  'Right before a subagent concludes its response':
-    'Непосредственно перед завершением ответа субагента',
-  'Before conversation compaction': 'Перед сжатием разговора',
-  'When a session is ending': 'При завершении сессии',
-  'When a permission dialog is displayed': 'При отображении диалога разрешений',
+  "Before tool execution": "Перед выполнением инструмента",
+  "After tool execution": "После выполнения инструмента",
+  "After tool execution fails": "При неудачном выполнении инструмента",
+  "When notifications are sent": "При отправке уведомлений",
+  "When the user submits a prompt": "Когда пользователь отправляет промпт",
+  "When a new session is started": "При запуске новой сессии",
+  "Right before Qwen Code concludes its response":
+    "Непосредственно перед завершением ответа Qwen Code",
+  "When a subagent (Agent tool call) is started": "При запуске субагента (вызов инструмента Agent)",
+  "Right before a subagent concludes its response":
+    "Непосредственно перед завершением ответа субагента",
+  "Before conversation compaction": "Перед сжатием разговора",
+  "When a session is ending": "При завершении сессии",
+  "When a permission dialog is displayed": "При отображении диалога разрешений",
   // Hooks - Event Descriptions (detailed)
-  'Input to command is JSON of tool call arguments.':
-    'Ввод в команду — это JSON аргументов вызова инструмента.',
+  "Input to command is JSON of tool call arguments.":
+    "Ввод в команду — это JSON аргументов вызова инструмента.",
   'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).':
     'Ввод в команду — это JSON с полями "inputs" (аргументы вызова инструмента) и "response" (ответ вызова инструмента).',
-  'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.':
-    'Ввод в команду — это JSON с tool_name, tool_input, tool_use_id, error, error_type, is_interrupt и is_timeout.',
-  'Input to command is JSON with notification message and type.':
-    'Ввод в команду — это JSON с сообщением уведомления и типом.',
-  'Input to command is JSON with original user prompt text.':
-    'Ввод в команду — это JSON с исходным текстом промпта пользователя.',
-  'Input to command is JSON with session start source.':
-    'Ввод в команду — это JSON с источником запуска сессии.',
-  'Input to command is JSON with session end reason.':
-    'Ввод в команду — это JSON с причиной завершения сессии.',
-  'Input to command is JSON with agent_id and agent_type.':
-    'Ввод в команду — это JSON с agent_id и agent_type.',
-  'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.':
-    'Ввод в команду — это JSON с agent_id, agent_type и agent_transcript_path.',
-  'Input to command is JSON with compaction details.':
-    'Ввод в команду — это JSON с деталями сжатия.',
-  'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.':
-    'Ввод в команду — это JSON с tool_name, tool_input и tool_use_id. Вывод — JSON с hookSpecificOutput, содержащим решение о разрешении или отказе.',
+  "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.":
+    "Ввод в команду — это JSON с tool_name, tool_input, tool_use_id, error, error_type, is_interrupt и is_timeout.",
+  "Input to command is JSON with notification message and type.":
+    "Ввод в команду — это JSON с сообщением уведомления и типом.",
+  "Input to command is JSON with original user prompt text.":
+    "Ввод в команду — это JSON с исходным текстом промпта пользователя.",
+  "Input to command is JSON with session start source.":
+    "Ввод в команду — это JSON с источником запуска сессии.",
+  "Input to command is JSON with session end reason.":
+    "Ввод в команду — это JSON с причиной завершения сессии.",
+  "Input to command is JSON with agent_id and agent_type.":
+    "Ввод в команду — это JSON с agent_id и agent_type.",
+  "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.":
+    "Ввод в команду — это JSON с agent_id, agent_type и agent_transcript_path.",
+  "Input to command is JSON with compaction details.":
+    "Ввод в команду — это JSON с деталями сжатия.",
+  "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.":
+    "Ввод в команду — это JSON с tool_name, tool_input и tool_use_id. Вывод — JSON с hookSpecificOutput, содержащим решение о разрешении или отказе.",
   // Hooks - Exit Code Descriptions
-  'stdout/stderr not shown': 'stdout/stderr не отображаются',
-  'show stderr to model and continue conversation':
-    'показать stderr модели и продолжить разговор',
-  'show stderr to user only': 'показать stderr только пользователю',
-  'stdout shown in transcript mode (ctrl+o)':
-    'stdout отображается в режиме транскрипции (ctrl+o)',
-  'show stderr to model immediately': 'показать stderr модели немедленно',
-  'show stderr to user only but continue with tool call':
-    'показать stderr только пользователю, но продолжить вызов инструмента',
-  'block processing, erase original prompt, and show stderr to user only':
-    'заблокировать обработку, стереть исходный промпт и показать stderr только пользователю',
-  'stdout shown to Qwen': 'stdout показан Qwen',
-  'show stderr to user only (blocking errors ignored)':
-    'показать stderr только пользователю (блокирующие ошибки игнорируются)',
-  'command completes successfully': 'команда успешно завершена',
-  'stdout shown to subagent': 'stdout показан субагенту',
-  'show stderr to subagent and continue having it run':
-    'показать stderr субагенту и продолжить его выполнение',
-  'stdout appended as custom compact instructions':
-    'stdout добавлен как пользовательские инструкции сжатия',
-  'block compaction': 'заблокировать сжатие',
-  'show stderr to user only but continue with compaction':
-    'показать stderr только пользователю, но продолжить сжатие',
-  'use hook decision if provided':
-    'использовать решение хука, если предоставлено',
+  "stdout/stderr not shown": "stdout/stderr не отображаются",
+  "show stderr to model and continue conversation": "показать stderr модели и продолжить разговор",
+  "show stderr to user only": "показать stderr только пользователю",
+  "stdout shown in transcript mode (ctrl+o)": "stdout отображается в режиме транскрипции (ctrl+o)",
+  "show stderr to model immediately": "показать stderr модели немедленно",
+  "show stderr to user only but continue with tool call":
+    "показать stderr только пользователю, но продолжить вызов инструмента",
+  "block processing, erase original prompt, and show stderr to user only":
+    "заблокировать обработку, стереть исходный промпт и показать stderr только пользователю",
+  "stdout shown to Qwen": "stdout показан Qwen",
+  "show stderr to user only (blocking errors ignored)":
+    "показать stderr только пользователю (блокирующие ошибки игнорируются)",
+  "command completes successfully": "команда успешно завершена",
+  "stdout shown to subagent": "stdout показан субагенту",
+  "show stderr to subagent and continue having it run":
+    "показать stderr субагенту и продолжить его выполнение",
+  "stdout appended as custom compact instructions":
+    "stdout добавлен как пользовательские инструкции сжатия",
+  "block compaction": "заблокировать сжатие",
+  "show stderr to user only but continue with compaction":
+    "показать stderr только пользователю, но продолжить сжатие",
+  "use hook decision if provided": "использовать решение хука, если предоставлено",
   // Hooks - Messages
-  'Config not loaded.': 'Конфигурация не загружена.',
-  'Hooks are not enabled. Enable hooks in settings to use this feature.':
-    'Хуки не включены. Включите хуки в настройках, чтобы использовать эту функцию.',
-  'No hooks configured. Add hooks in your settings.json file.':
-    'Хуки не настроены. Добавьте хуки в файл settings.json.',
-  'Configured Hooks ({{count}} total)': 'Настроенные хуки (всего {{count}})',
+  "Config not loaded.": "Конфигурация не загружена.",
+  "Hooks are not enabled. Enable hooks in settings to use this feature.":
+    "Хуки не включены. Включите хуки в настройках, чтобы использовать эту функцию.",
+  "No hooks configured. Add hooks in your settings.json file.":
+    "Хуки не настроены. Добавьте хуки в файл settings.json.",
+  "Configured Hooks ({{count}} total)": "Настроенные хуки (всего {{count}})",
 
   // ============================================================================
   // Commands - Session Export
   // ============================================================================
-  'Export current session message history to a file':
-    'Экспортировать историю сообщений текущей сессии в файл',
-  'Export session to HTML format': 'Экспортировать сессию в формат HTML',
-  'Export session to JSON format': 'Экспортировать сессию в формат JSON',
-  'Export session to JSONL format (one message per line)':
-    'Экспортировать сессию в формат JSONL (одно сообщение на строку)',
-  'Export session to markdown format':
-    'Экспортировать сессию в формат Markdown',
+  "Export current session message history to a file":
+    "Экспортировать историю сообщений текущей сессии в файл",
+  "Export session to HTML format": "Экспортировать сессию в формат HTML",
+  "Export session to JSON format": "Экспортировать сессию в формат JSON",
+  "Export session to JSONL format (one message per line)":
+    "Экспортировать сессию в формат JSONL (одно сообщение на строку)",
+  "Export session to markdown format": "Экспортировать сессию в формат Markdown",
 
   // ============================================================================
   // Commands - Insights
   // ============================================================================
-  'generate personalized programming insights from your chat history':
-    'Создать персонализированные инсайты по программированию на основе истории чата',
+  "generate personalized programming insights from your chat history":
+    "Создать персонализированные инсайты по программированию на основе истории чата",
 
   // ============================================================================
   // Commands - Session History
   // ============================================================================
-  'Resume a previous session': 'Продолжить предыдущую сессию',
-  'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested':
-    'Восстановить вызов инструмента. Это вернет историю разговора и файлов к состоянию на момент, когда был предложен этот вызов инструмента',
-  'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.':
-    'Не удалось определить тип терминала. Поддерживаемые терминалы: VS Code, Cursor, Windsurf и Trae.',
-  'Terminal "{{terminal}}" is not supported yet.':
-    'Терминал "{{terminal}}" еще не поддерживается.',
+  "Resume a previous session": "Продолжить предыдущую сессию",
+  "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested":
+    "Восстановить вызов инструмента. Это вернет историю разговора и файлов к состоянию на момент, когда был предложен этот вызов инструмента",
+  "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.":
+    "Не удалось определить тип терминала. Поддерживаемые терминалы: VS Code, Cursor, Windsurf и Trae.",
+  'Terminal "{{terminal}}" is not supported yet.': 'Терминал "{{terminal}}" еще не поддерживается.',
 
   // ============================================================================
   // Команды - Язык
   // ============================================================================
-  'Invalid language. Available: {{options}}':
-    'Недопустимый язык. Доступны: {{options}}',
-  'Language subcommands do not accept additional arguments.':
-    'Подкоманды языка не принимают дополнительных аргументов.',
-  'Current UI language: {{lang}}': 'Текущий язык интерфейса: {{lang}}',
-  'Current LLM output language: {{lang}}': 'Текущий язык вывода LLM: {{lang}}',
-  'LLM output language not set': 'Язык вывода LLM не установлен',
-  'Set UI language': 'Установка языка интерфейса',
-  'Set LLM output language': 'Установка языка вывода LLM',
-  'Usage: /language ui [{{options}}]':
-    'Использование: /language ui [{{options}}]',
-  'Usage: /language output <language>':
-    'Использование: /language output <language>',
-  'Example: /language output 中文': 'Пример: /language output 中文',
-  'Example: /language output English': 'Пример: /language output English',
-  'Example: /language output 日本語': 'Пример: /language output 日本語',
-  'Example: /language output Português': 'Пример: /language output Português',
-  'UI language changed to {{lang}}': 'Язык интерфейса изменен на {{lang}}',
-  'LLM output language set to {{lang}}':
-    'Язык вывода LLM установлен на {{lang}}',
-  'LLM output language rule file generated at {{path}}':
-    'Файл правил языка вывода LLM создан в {{path}}',
-  'Please restart the application for the changes to take effect.':
-    'Пожалуйста, перезапустите приложение для применения изменений.',
-  'Failed to generate LLM output language rule file: {{error}}':
-    'Не удалось создать файл правил языка вывода LLM: {{error}}',
-  'Invalid command. Available subcommands:':
-    'Неверная команда. Доступные подкоманды:',
-  'Available subcommands:': 'Доступные подкоманды:',
-  'To request additional UI language packs, please open an issue on GitHub.':
-    'Для запроса дополнительных языковых пакетов интерфейса, пожалуйста, создайте обращение на GitHub.',
-  'Available options:': 'Доступные варианты:',
-  'Set UI language to {{name}}': 'Установить язык интерфейса на {{name}}',
+  "Invalid language. Available: {{options}}": "Недопустимый язык. Доступны: {{options}}",
+  "Language subcommands do not accept additional arguments.":
+    "Подкоманды языка не принимают дополнительных аргументов.",
+  "Current UI language: {{lang}}": "Текущий язык интерфейса: {{lang}}",
+  "Current LLM output language: {{lang}}": "Текущий язык вывода LLM: {{lang}}",
+  "LLM output language not set": "Язык вывода LLM не установлен",
+  "Set UI language": "Установка языка интерфейса",
+  "Set LLM output language": "Установка языка вывода LLM",
+  "Usage: /language ui [{{options}}]": "Использование: /language ui [{{options}}]",
+  "Usage: /language output <language>": "Использование: /language output <language>",
+  "Example: /language output 中文": "Пример: /language output 中文",
+  "Example: /language output English": "Пример: /language output English",
+  "Example: /language output 日本語": "Пример: /language output 日本語",
+  "Example: /language output Português": "Пример: /language output Português",
+  "UI language changed to {{lang}}": "Язык интерфейса изменен на {{lang}}",
+  "LLM output language set to {{lang}}": "Язык вывода LLM установлен на {{lang}}",
+  "LLM output language rule file generated at {{path}}":
+    "Файл правил языка вывода LLM создан в {{path}}",
+  "Please restart the application for the changes to take effect.":
+    "Пожалуйста, перезапустите приложение для применения изменений.",
+  "Failed to generate LLM output language rule file: {{error}}":
+    "Не удалось создать файл правил языка вывода LLM: {{error}}",
+  "Invalid command. Available subcommands:": "Неверная команда. Доступные подкоманды:",
+  "Available subcommands:": "Доступные подкоманды:",
+  "To request additional UI language packs, please open an issue on GitHub.":
+    "Для запроса дополнительных языковых пакетов интерфейса, пожалуйста, создайте обращение на GitHub.",
+  "Available options:": "Доступные варианты:",
+  "Set UI language to {{name}}": "Установить язык интерфейса на {{name}}",
 
   // ============================================================================
   // Команды - Режим подтверждения
   // ============================================================================
-  'Tool Approval Mode': 'Режим подтверждения инструментов',
-  'Current approval mode: {{mode}}': 'Текущий режим подтверждения: {{mode}}',
-  'Available approval modes:': 'Доступные режимы подтверждения:',
-  'Approval mode changed to: {{mode}}':
-    'Режим подтверждения изменен на: {{mode}}',
-  'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
-    'Режим подтверждения изменен на: {{mode}} (сохранено в настройках {{scope}}{{location}})',
-  'Usage: /approval-mode <mode> [--session|--user|--project]':
-    'Использование: /approval-mode <mode> [--session|--user|--project]',
-  'Scope subcommands do not accept additional arguments.':
-    'Подкоманды области не принимают дополнительных аргументов.',
-  'Plan mode - Analyze only, do not modify files or execute commands':
-    'Режим планирования - только анализ, без изменения файлов или выполнения команд',
-  'Default mode - Require approval for file edits or shell commands':
-    'Режим по умолчанию - требуется подтверждение для редактирования файлов или команд терминала',
-  'Auto-edit mode - Automatically approve file edits':
-    'Режим авторедактирования - автоматическое подтверждение изменений файлов',
-  'YOLO mode - Automatically approve all tools':
-    'Режим YOLO - автоматическое подтверждение всех инструментов',
-  '{{mode}} mode': 'Режим {{mode}}',
-  'Settings service is not available; unable to persist the approval mode.':
-    'Служба настроек недоступна; невозможно сохранить режим подтверждения.',
-  'Failed to save approval mode: {{error}}':
-    'Не удалось сохранить режим подтверждения: {{error}}',
-  'Failed to change approval mode: {{error}}':
-    'Не удалось изменить режим подтверждения: {{error}}',
-  'Apply to current session only (temporary)':
-    'Применить только к текущей сессии (временно)',
-  'Persist for this project/workspace':
-    'Сохранить для этого проекта/рабочего пространства',
-  'Persist for this user on this machine':
-    'Сохранить для этого пользователя на этой машине',
-  'Analyze only, do not modify files or execute commands':
-    'Только анализ, без изменения файлов или выполнения команд',
-  'Require approval for file edits or shell commands':
-    'Требуется подтверждение для редактирования файлов или команд терминала',
-  'Automatically approve file edits':
-    'Автоматически подтверждать изменения файлов',
-  'Automatically approve all tools':
-    'Автоматически подтверждать все инструменты',
-  'Workspace approval mode exists and takes priority. User-level change will have no effect.':
-    'Режим подтверждения рабочего пространства существует и имеет приоритет. Изменение на уровне пользователя не будет иметь эффекта.',
-  'Apply To': 'Применить к',
-  'Workspace Settings': 'Настройки рабочего пространства',
+  "Tool Approval Mode": "Режим подтверждения инструментов",
+  "Current approval mode: {{mode}}": "Текущий режим подтверждения: {{mode}}",
+  "Available approval modes:": "Доступные режимы подтверждения:",
+  "Approval mode changed to: {{mode}}": "Режим подтверждения изменен на: {{mode}}",
+  "Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})":
+    "Режим подтверждения изменен на: {{mode}} (сохранено в настройках {{scope}}{{location}})",
+  "Usage: /approval-mode <mode> [--session|--user|--project]":
+    "Использование: /approval-mode <mode> [--session|--user|--project]",
+  "Scope subcommands do not accept additional arguments.":
+    "Подкоманды области не принимают дополнительных аргументов.",
+  "Plan mode - Analyze only, do not modify files or execute commands":
+    "Режим планирования - только анализ, без изменения файлов или выполнения команд",
+  "Default mode - Require approval for file edits or shell commands":
+    "Режим по умолчанию - требуется подтверждение для редактирования файлов или команд терминала",
+  "Auto-edit mode - Automatically approve file edits":
+    "Режим авторедактирования - автоматическое подтверждение изменений файлов",
+  "YOLO mode - Automatically approve all tools":
+    "Режим YOLO - автоматическое подтверждение всех инструментов",
+  "{{mode}} mode": "Режим {{mode}}",
+  "Settings service is not available; unable to persist the approval mode.":
+    "Служба настроек недоступна; невозможно сохранить режим подтверждения.",
+  "Failed to save approval mode: {{error}}": "Не удалось сохранить режим подтверждения: {{error}}",
+  "Failed to change approval mode: {{error}}": "Не удалось изменить режим подтверждения: {{error}}",
+  "Apply to current session only (temporary)": "Применить только к текущей сессии (временно)",
+  "Persist for this project/workspace": "Сохранить для этого проекта/рабочего пространства",
+  "Persist for this user on this machine": "Сохранить для этого пользователя на этой машине",
+  "Analyze only, do not modify files or execute commands":
+    "Только анализ, без изменения файлов или выполнения команд",
+  "Require approval for file edits or shell commands":
+    "Требуется подтверждение для редактирования файлов или команд терминала",
+  "Automatically approve file edits": "Автоматически подтверждать изменения файлов",
+  "Automatically approve all tools": "Автоматически подтверждать все инструменты",
+  "Workspace approval mode exists and takes priority. User-level change will have no effect.":
+    "Режим подтверждения рабочего пространства существует и имеет приоритет. Изменение на уровне пользователя не будет иметь эффекта.",
+  "Apply To": "Применить к",
+  "Workspace Settings": "Настройки рабочего пространства",
 
   // ============================================================================
   // Команды - Память
   // ============================================================================
-  'Commands for interacting with memory.':
-    'Команды для взаимодействия с памятью',
-  'Show the current memory contents.': 'Показать текущее содержимое памяти.',
-  'Show project-level memory contents.': 'Показать память уровня проекта.',
-  'Show global memory contents.': 'Показать глобальную память.',
-  'Add content to project-level memory.':
-    'Добавить содержимое в память уровня проекта.',
-  'Add content to global memory.': 'Добавить содержимое в глобальную память.',
-  'Refresh the memory from the source.': 'Обновить память из источника.',
-  'Usage: /memory add --project <text to remember>':
-    'Использование: /memory add --project <текст для запоминания>',
-  'Usage: /memory add --global <text to remember>':
-    'Использование: /memory add --global <текст для запоминания>',
+  "Commands for interacting with memory.": "Команды для взаимодействия с памятью",
+  "Show the current memory contents.": "Показать текущее содержимое памяти.",
+  "Show project-level memory contents.": "Показать память уровня проекта.",
+  "Show global memory contents.": "Показать глобальную память.",
+  "Add content to project-level memory.": "Добавить содержимое в память уровня проекта.",
+  "Add content to global memory.": "Добавить содержимое в глобальную память.",
+  "Refresh the memory from the source.": "Обновить память из источника.",
+  "Usage: /memory add --project <text to remember>":
+    "Использование: /memory add --project <текст для запоминания>",
+  "Usage: /memory add --global <text to remember>":
+    "Использование: /memory add --global <текст для запоминания>",
   'Attempting to save to project memory: "{{text}}"':
     'Попытка сохранить в память проекта: "{{text}}"',
   'Attempting to save to global memory: "{{text}}"':
     'Попытка сохранить в глобальную память: "{{text}}"',
-  'Current memory content from {{count}} file(s):':
-    'Текущее содержимое памяти из {{count}} файла(ов):',
-  'Memory is currently empty.': 'Память в настоящее время пуста.',
-  'Project memory file not found or is currently empty.':
-    'Файл памяти проекта не найден или в настоящее время пуст.',
-  'Global memory file not found or is currently empty.':
-    'Файл глобальной памяти не найден или в настоящее время пуст.',
-  'Global memory is currently empty.':
-    'Глобальная память в настоящее время пуста.',
-  'Global memory content:\n\n---\n{{content}}\n---':
-    'Содержимое глобальной памяти:\n\n---\n{{content}}\n---',
-  'Project memory content from {{path}}:\n\n---\n{{content}}\n---':
-    'Содержимое памяти проекта из {{path}}:\n\n---\n{{content}}\n---',
-  'Project memory is currently empty.':
-    'Память проекта в настоящее время пуста.',
-  'Refreshing memory from source files...':
-    'Обновление памяти из исходных файлов...',
-  'Add content to the memory. Use --global for global memory or --project for project memory.':
-    'Добавить содержимое в память. Используйте --global для глобальной памяти или --project для памяти проекта.',
-  'Usage: /memory add [--global|--project] <text to remember>':
-    'Использование: /memory add [--global|--project] <текст для запоминания>',
+  "Current memory content from {{count}} file(s):":
+    "Текущее содержимое памяти из {{count}} файла(ов):",
+  "Memory is currently empty.": "Память в настоящее время пуста.",
+  "Project memory file not found or is currently empty.":
+    "Файл памяти проекта не найден или в настоящее время пуст.",
+  "Global memory file not found or is currently empty.":
+    "Файл глобальной памяти не найден или в настоящее время пуст.",
+  "Global memory is currently empty.": "Глобальная память в настоящее время пуста.",
+  "Global memory content:\n\n---\n{{content}}\n---":
+    "Содержимое глобальной памяти:\n\n---\n{{content}}\n---",
+  "Project memory content from {{path}}:\n\n---\n{{content}}\n---":
+    "Содержимое памяти проекта из {{path}}:\n\n---\n{{content}}\n---",
+  "Project memory is currently empty.": "Память проекта в настоящее время пуста.",
+  "Refreshing memory from source files...": "Обновление памяти из исходных файлов...",
+  "Add content to the memory. Use --global for global memory or --project for project memory.":
+    "Добавить содержимое в память. Используйте --global для глобальной памяти или --project для памяти проекта.",
+  "Usage: /memory add [--global|--project] <text to remember>":
+    "Использование: /memory add [--global|--project] <текст для запоминания>",
   'Attempting to save to memory {{scope}}: "{{fact}}"':
     'Попытка сохранить в память {{scope}}: "{{fact}}"',
 
   // ============================================================================
   // Команды - MCP
   // ============================================================================
-  'Authenticate with an OAuth-enabled MCP server':
-    'Авторизоваться на MCP-сервере с поддержкой OAuth',
-  'List configured MCP servers and tools':
-    'Просмотр настроенных MCP-серверов и инструментов',
-  'Restarts MCP servers.': 'Перезапустить MCP-серверы.',
-  'Could not retrieve tool registry.':
-    'Не удалось получить реестр инструментов.',
-  'No MCP servers configured with OAuth authentication.':
-    'Нет MCP-серверов, настроенных с авторизацией OAuth.',
-  'MCP servers with OAuth authentication:': 'MCP-серверы с авторизацией OAuth:',
-  'Use /mcp auth <server-name> to authenticate.':
-    'Используйте /mcp auth <имя-сервера> для авторизации.',
+  "Authenticate with an OAuth-enabled MCP server":
+    "Авторизоваться на MCP-сервере с поддержкой OAuth",
+  "List configured MCP servers and tools": "Просмотр настроенных MCP-серверов и инструментов",
+  "Restarts MCP servers.": "Перезапустить MCP-серверы.",
+  "Could not retrieve tool registry.": "Не удалось получить реестр инструментов.",
+  "No MCP servers configured with OAuth authentication.":
+    "Нет MCP-серверов, настроенных с авторизацией OAuth.",
+  "MCP servers with OAuth authentication:": "MCP-серверы с авторизацией OAuth:",
+  "Use /mcp auth <server-name> to authenticate.":
+    "Используйте /mcp auth <имя-сервера> для авторизации.",
   "MCP server '{{name}}' not found.": "MCP-сервер '{{name}}' не найден.",
   "Successfully authenticated and refreshed tools for '{{name}}'.":
     "Успешно авторизовано и обновлены инструменты для '{{name}}'.",
   "Failed to authenticate with MCP server '{{name}}': {{error}}":
     "Не удалось авторизоваться на MCP-сервере '{{name}}': {{error}}",
-  "Re-discovering tools from '{{name}}'...":
-    "Повторное обнаружение инструментов от '{{name}}'...",
+  "Re-discovering tools from '{{name}}'...": "Повторное обнаружение инструментов от '{{name}}'...",
   "Discovered {{count}} tool(s) from '{{name}}'.":
     "Обнаружено {{count}} инструмент(ов) от '{{name}}'.",
-  'Authentication complete. Returning to server details...':
-    'Аутентификация завершена. Возврат к деталям сервера...',
-  'Authentication successful.': 'Аутентификация успешна.',
-  'If the browser does not open, copy and paste this URL into your browser:':
-    'Если браузер не открылся, скопируйте этот URL и вставьте его в браузер:',
-  'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.':
-    '⚠️  Убедитесь, что скопировали ПОЛНЫЙ URL — он может занимать несколько строк.',
+  "Authentication complete. Returning to server details...":
+    "Аутентификация завершена. Возврат к деталям сервера...",
+  "Authentication successful.": "Аутентификация успешна.",
+  "If the browser does not open, copy and paste this URL into your browser:":
+    "Если браузер не открылся, скопируйте этот URL и вставьте его в браузер:",
+  "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.":
+    "⚠️  Убедитесь, что скопировали ПОЛНЫЙ URL — он может занимать несколько строк.",
 
   // ============================================================================
   // Команды - Чат
   // ============================================================================
-  'Manage conversation history.': 'Управление историей диалогов.',
-  'List saved conversation checkpoints':
-    'Показать сохраненные точки восстановления диалога',
-  'No saved conversation checkpoints found.':
-    'Не найдено сохраненных точек восстановления диалога.',
-  'List of saved conversations:': 'Список сохраненных диалогов:',
-  'Note: Newest last, oldest first':
-    'Примечание: новые последними, старые первыми',
-  'Save the current conversation as a checkpoint. Usage: /chat save <tag>':
-    'Сохранить текущий диалог как точку восстановления. Использование: /chat save <тег>',
-  'Missing tag. Usage: /chat save <tag>':
-    'Отсутствует тег. Использование: /chat save <тег>',
-  'Delete a conversation checkpoint. Usage: /chat delete <tag>':
-    'Удалить точку восстановления диалога. Использование: /chat delete <тег>',
-  'Missing tag. Usage: /chat delete <tag>':
-    'Отсутствует тег. Использование: /chat delete <тег>',
+  "Manage conversation history.": "Управление историей диалогов.",
+  "List saved conversation checkpoints": "Показать сохраненные точки восстановления диалога",
+  "No saved conversation checkpoints found.":
+    "Не найдено сохраненных точек восстановления диалога.",
+  "List of saved conversations:": "Список сохраненных диалогов:",
+  "Note: Newest last, oldest first": "Примечание: новые последними, старые первыми",
+  "Save the current conversation as a checkpoint. Usage: /chat save <tag>":
+    "Сохранить текущий диалог как точку восстановления. Использование: /chat save <тег>",
+  "Missing tag. Usage: /chat save <tag>": "Отсутствует тег. Использование: /chat save <тег>",
+  "Delete a conversation checkpoint. Usage: /chat delete <tag>":
+    "Удалить точку восстановления диалога. Использование: /chat delete <тег>",
+  "Missing tag. Usage: /chat delete <tag>": "Отсутствует тег. Использование: /chat delete <тег>",
   "Conversation checkpoint '{{tag}}' has been deleted.":
     "Точка восстановления диалога '{{tag}}' удалена.",
   "Error: No checkpoint found with tag '{{tag}}'.":
     "Ошибка: точка восстановления с тегом '{{tag}}' не найдена.",
-  'Resume a conversation from a checkpoint. Usage: /chat resume <tag>':
-    'Возобновить диалог из точки восстановления. Использование: /chat resume <тег>',
-  'Missing tag. Usage: /chat resume <tag>':
-    'Отсутствует тег. Использование: /chat resume <тег>',
-  'No saved checkpoint found with tag: {{tag}}.':
-    'Не найдена сохраненная точка восстановления с тегом: {{tag}}.',
-  'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?':
-    'Точка восстановления с тегом {{tag}} уже существует. Перезаписать?',
-  'No chat client available to save conversation.':
-    'Нет доступного клиента чата для сохранения диалога.',
-  'Conversation checkpoint saved with tag: {{tag}}.':
-    'Точка восстановления диалога сохранена с тегом: {{tag}}.',
-  'No conversation found to save.': 'Нет диалога для сохранения.',
-  'No chat client available to share conversation.':
-    'Нет доступного клиента чата для экспорта диалога.',
-  'Invalid file format. Only .md and .json are supported.':
-    'Неверный формат файла. Поддерживаются только .md и .json.',
-  'Error sharing conversation: {{error}}':
-    'Ошибка при экспорте диалога: {{error}}',
-  'Conversation shared to {{filePath}}': 'Диалог экспортирован в {{filePath}}',
-  'No conversation found to share.': 'Нет диалога для экспорта.',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
-    'Экспортировать текущий диалог в markdown или json файл. Использование: /chat share <файл>',
+  "Resume a conversation from a checkpoint. Usage: /chat resume <tag>":
+    "Возобновить диалог из точки восстановления. Использование: /chat resume <тег>",
+  "Missing tag. Usage: /chat resume <tag>": "Отсутствует тег. Использование: /chat resume <тег>",
+  "No saved checkpoint found with tag: {{tag}}.":
+    "Не найдена сохраненная точка восстановления с тегом: {{tag}}.",
+  "A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?":
+    "Точка восстановления с тегом {{tag}} уже существует. Перезаписать?",
+  "No chat client available to save conversation.":
+    "Нет доступного клиента чата для сохранения диалога.",
+  "Conversation checkpoint saved with tag: {{tag}}.":
+    "Точка восстановления диалога сохранена с тегом: {{tag}}.",
+  "No conversation found to save.": "Нет диалога для сохранения.",
+  "No chat client available to share conversation.":
+    "Нет доступного клиента чата для экспорта диалога.",
+  "Invalid file format. Only .md and .json are supported.":
+    "Неверный формат файла. Поддерживаются только .md и .json.",
+  "Error sharing conversation: {{error}}": "Ошибка при экспорте диалога: {{error}}",
+  "Conversation shared to {{filePath}}": "Диалог экспортирован в {{filePath}}",
+  "No conversation found to share.": "Нет диалога для экспорта.",
+  "Share the current conversation to a markdown or json file. Usage: /chat share <file>":
+    "Экспортировать текущий диалог в markdown или json файл. Использование: /chat share <файл>",
 
   // ============================================================================
   // Команды - Резюме
   // ============================================================================
-  'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md':
-    'Сгенерировать сводку проекта и сохранить её в .qwen/PROJECT_SUMMARY.md',
-  'No chat client available to generate summary.':
-    'Нет доступного чат-клиента для генерации сводки.',
-  'Already generating summary, wait for previous request to complete':
-    'Генерация сводки уже выполняется, дождитесь завершения предыдущего запроса',
-  'No conversation found to summarize.':
-    'Не найдено диалогов для создания сводки.',
-  'Failed to generate project context summary: {{error}}':
-    'Не удалось сгенерировать сводку контекста проекта: {{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    'Сводка проекта сохранена в {{filePathForDisplay}}',
-  'Saving project summary...': 'Сохранение сводки проекта...',
-  'Generating project summary...': 'Генерация сводки проекта...',
-  'Failed to generate summary - no text content received from LLM response':
-    'Не удалось сгенерировать сводку - не получен текстовый контент из ответа LLM',
+  "Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md":
+    "Сгенерировать сводку проекта и сохранить её в .qwen/PROJECT_SUMMARY.md",
+  "No chat client available to generate summary.":
+    "Нет доступного чат-клиента для генерации сводки.",
+  "Already generating summary, wait for previous request to complete":
+    "Генерация сводки уже выполняется, дождитесь завершения предыдущего запроса",
+  "No conversation found to summarize.": "Не найдено диалогов для создания сводки.",
+  "Failed to generate project context summary: {{error}}":
+    "Не удалось сгенерировать сводку контекста проекта: {{error}}",
+  "Saved project summary to {{filePathForDisplay}}.":
+    "Сводка проекта сохранена в {{filePathForDisplay}}",
+  "Saving project summary...": "Сохранение сводки проекта...",
+  "Generating project summary...": "Генерация сводки проекта...",
+  "Failed to generate summary - no text content received from LLM response":
+    "Не удалось сгенерировать сводку - не получен текстовый контент из ответа LLM",
 
   // ============================================================================
   // Команды - Модель
   // ============================================================================
-  'Switch the model for this session': 'Переключение модели для этой сессии',
-  'Set fast model for background tasks':
-    'Установить быструю модель для фоновых задач',
-  'Content generator configuration not available.':
-    'Конфигурация генератора содержимого недоступна.',
-  'Authentication type not available.': 'Тип авторизации недоступен.',
-  'No models available for the current authentication type ({{authType}}).':
-    'Нет доступных моделей для текущего типа авторизации ({{authType}}).',
+  "Switch the model for this session": "Переключение модели для этой сессии",
+  "Set fast model for background tasks": "Установить быструю модель для фоновых задач",
+  "Content generator configuration not available.":
+    "Конфигурация генератора содержимого недоступна.",
+  "Authentication type not available.": "Тип авторизации недоступен.",
+  "No models available for the current authentication type ({{authType}}).":
+    "Нет доступных моделей для текущего типа авторизации ({{authType}}).",
 
   // ============================================================================
   // Команды - Очистка
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    'Начало новой сессии, сброс чата и очистка терминала.',
-  'Starting a new session and clearing.': 'Начало новой сессии и очистка.',
+  "Starting a new session, resetting chat, and clearing terminal.":
+    "Начало новой сессии, сброс чата и очистка терминала.",
+  "Starting a new session and clearing.": "Начало новой сессии и очистка.",
 
   // ============================================================================
   // Команды - Сжатие
   // ============================================================================
-  'Already compressing, wait for previous request to complete':
-    'Уже выполняется сжатие, дождитесь завершения предыдущего запроса',
-  'Failed to compress chat history.': 'Не удалось сжать историю чата.',
-  'Failed to compress chat history: {{error}}':
-    'Не удалось сжать историю чата: {{error}}',
-  'Compressing chat history': 'Сжатие истории чата',
-  'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.':
-    'История чата сжата с {{originalTokens}} до {{newTokens}} токенов.',
-  'Compression was not beneficial for this history size.':
-    'Сжатие не было полезным для этого размера истории.',
-  'Chat history compression did not reduce size. This may indicate issues with the compression prompt.':
-    'Сжатие истории чата не уменьшило размер. Это может указывать на проблемы с промптом сжатия.',
-  'Could not compress chat history due to a token counting error.':
-    'Не удалось сжать историю чата из-за ошибки подсчета токенов.',
-  'Chat history is already compressed.': 'История чата уже сжата.',
+  "Already compressing, wait for previous request to complete":
+    "Уже выполняется сжатие, дождитесь завершения предыдущего запроса",
+  "Failed to compress chat history.": "Не удалось сжать историю чата.",
+  "Failed to compress chat history: {{error}}": "Не удалось сжать историю чата: {{error}}",
+  "Compressing chat history": "Сжатие истории чата",
+  "Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.":
+    "История чата сжата с {{originalTokens}} до {{newTokens}} токенов.",
+  "Compression was not beneficial for this history size.":
+    "Сжатие не было полезным для этого размера истории.",
+  "Chat history compression did not reduce size. This may indicate issues with the compression prompt.":
+    "Сжатие истории чата не уменьшило размер. Это может указывать на проблемы с промптом сжатия.",
+  "Could not compress chat history due to a token counting error.":
+    "Не удалось сжать историю чата из-за ошибки подсчета токенов.",
+  "Chat history is already compressed.": "История чата уже сжата.",
 
   // ============================================================================
   // Команды - Директория
   // ============================================================================
-  'Configuration is not available.': 'Конфигурация недоступна.',
-  'Please provide at least one path to add.':
-    'Пожалуйста, укажите хотя бы один путь для добавления.',
-  'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.':
-    'Команда /directory add не поддерживается в ограничительных профилях песочницы. Пожалуйста, используйте --include-directories при запуске сессии.',
-  "Error adding '{{path}}': {{error}}":
-    "Ошибка при добавлении '{{path}}': {{error}}",
-  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
-    'Успешно добавлены файлы QWEN.md из следующих директорий (если они есть):\n- {{directories}}',
-  'Error refreshing memory: {{error}}':
-    'Ошибка при обновлении памяти: {{error}}',
-  'Successfully added directories:\n- {{directories}}':
-    'Успешно добавлены директории:\n- {{directories}}',
-  'Current workspace directories:\n{{directories}}':
-    'Текущие директории рабочего пространства:\n{{directories}}',
+  "Configuration is not available.": "Конфигурация недоступна.",
+  "Please provide at least one path to add.":
+    "Пожалуйста, укажите хотя бы один путь для добавления.",
+  "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.":
+    "Команда /directory add не поддерживается в ограничительных профилях песочницы. Пожалуйста, используйте --include-directories при запуске сессии.",
+  "Error adding '{{path}}': {{error}}": "Ошибка при добавлении '{{path}}': {{error}}",
+  "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}":
+    "Успешно добавлены файлы QWEN.md из следующих директорий (если они есть):\n- {{directories}}",
+  "Error refreshing memory: {{error}}": "Ошибка при обновлении памяти: {{error}}",
+  "Successfully added directories:\n- {{directories}}":
+    "Успешно добавлены директории:\n- {{directories}}",
+  "Current workspace directories:\n{{directories}}":
+    "Текущие директории рабочего пространства:\n{{directories}}",
 
   // ============================================================================
   // Команды - Документация
   // ============================================================================
-  'Please open the following URL in your browser to view the documentation:\n{{url}}':
-    'Пожалуйста, откройте следующий URL в браузере для просмотра документации:\n{{url}}',
-  'Opening documentation in your browser: {{url}}':
-    'Открытие документации в браузере: {{url}}',
+  "Please open the following URL in your browser to view the documentation:\n{{url}}":
+    "Пожалуйста, откройте следующий URL в браузере для просмотра документации:\n{{url}}",
+  "Opening documentation in your browser: {{url}}": "Открытие документации в браузере: {{url}}",
 
   // ============================================================================
   // Диалоги - Подтверждение инструментов
   // ============================================================================
-  'Do you want to proceed?': 'Вы хотите продолжить?',
-  'Yes, allow once': 'Да, разрешить один раз',
-  'Allow always': 'Всегда разрешать',
-  Yes: 'Да',
-  No: 'Нет',
-  'No (esc)': 'Нет (esc)',
-  'Yes, allow always for this session': 'Да, всегда разрешать для этой сессии',
+  "Do you want to proceed?": "Вы хотите продолжить?",
+  "Yes, allow once": "Да, разрешить один раз",
+  "Allow always": "Всегда разрешать",
+  Yes: "Да",
+  No: "Нет",
+  "No (esc)": "Нет (esc)",
+  "Yes, allow always for this session": "Да, всегда разрешать для этой сессии",
 
   // MCP Management - Core translations
-  Disable: 'Отключить',
-  Enable: 'Включить',
-  Authenticate: 'Аутентификация',
-  'Re-authenticate': 'Повторная аутентификация',
-  'Clear Authentication': 'Очистить аутентификацию',
-  disabled: 'отключен',
-  'Server:': 'Сервер:',
-  Reconnect: 'Переподключить',
-  'View tools': 'Просмотреть инструменты',
-  '(disabled)': '(отключен)',
-  'Error:': 'Ошибка:',
-  tool: 'инструмент',
-  connected: 'подключен',
-  connecting: 'подключение',
-  disconnected: 'отключен',
-  error: 'ошибка',
+  Disable: "Отключить",
+  Enable: "Включить",
+  Authenticate: "Аутентификация",
+  "Re-authenticate": "Повторная аутентификация",
+  "Clear Authentication": "Очистить аутентификацию",
+  disabled: "отключен",
+  "Server:": "Сервер:",
+  Reconnect: "Переподключить",
+  "View tools": "Просмотреть инструменты",
+  "(disabled)": "(отключен)",
+  "Error:": "Ошибка:",
+  tool: "инструмент",
+  connected: "подключен",
+  connecting: "подключение",
+  disconnected: "отключен",
+  error: "ошибка",
   // Invalid tool related translations
-  '{{count}} invalid tools': '{{count}} недействительных инструментов',
-  invalid: 'недействительный',
-  'invalid: {{reason}}': 'недействительно: {{reason}}',
-  'missing name': 'отсутствует имя',
-  'missing description': 'отсутствует описание',
-  '(unnamed)': '(без имени)',
-  'Warning: This tool cannot be called by the LLM':
-    'Предупреждение: Этот инструмент не может быть вызван LLM',
-  Reason: 'Причина',
-  'Tools must have both name and description to be used by the LLM.':
-    'Инструменты должны иметь как имя, так и описание, чтобы использоваться LLM.',
-  'Modify in progress:': 'Идет изменение:',
-  'Save and close external editor to continue':
-    'Сохраните и закройте внешний редактор для продолжения',
-  'Apply this change?': 'Применить это изменение?',
-  'Yes, allow always': 'Да, всегда разрешать',
-  'Modify with external editor': 'Изменить во внешнем редакторе',
-  'No, suggest changes (esc)': 'Нет, предложить изменения (esc)',
+  "{{count}} invalid tools": "{{count}} недействительных инструментов",
+  invalid: "недействительный",
+  "invalid: {{reason}}": "недействительно: {{reason}}",
+  "missing name": "отсутствует имя",
+  "missing description": "отсутствует описание",
+  "(unnamed)": "(без имени)",
+  "Warning: This tool cannot be called by the LLM":
+    "Предупреждение: Этот инструмент не может быть вызван LLM",
+  Reason: "Причина",
+  "Tools must have both name and description to be used by the LLM.":
+    "Инструменты должны иметь как имя, так и описание, чтобы использоваться LLM.",
+  "Modify in progress:": "Идет изменение:",
+  "Save and close external editor to continue":
+    "Сохраните и закройте внешний редактор для продолжения",
+  "Apply this change?": "Применить это изменение?",
+  "Yes, allow always": "Да, всегда разрешать",
+  "Modify with external editor": "Изменить во внешнем редакторе",
+  "No, suggest changes (esc)": "Нет, предложить изменения (esc)",
   "Allow execution of: '{{command}}'?": "Разрешить выполнение: '{{command}}'?",
-  'Yes, allow always ...': 'Да, всегда разрешать ...',
-  'Always allow in this project': 'Всегда разрешать в этом проекте',
-  'Always allow {{action}} in this project':
-    'Всегда разрешать {{action}} в этом проекте',
-  'Always allow for this user': 'Всегда разрешать для этого пользователя',
-  'Always allow {{action}} for this user':
-    'Всегда разрешать {{action}} для этого пользователя',
-  'Yes, restore previous mode ({{mode}})':
-    'Да, восстановить предыдущий режим ({{mode}})',
-  'Yes, and auto-accept edits': 'Да, и автоматически принимать правки',
-  'Yes, and manually approve edits': 'Да, и вручную подтверждать правки',
-  'No, keep planning (esc)': 'Нет, продолжить планирование (esc)',
-  'URLs to fetch:': 'URL для загрузки:',
-  'MCP Server: {{server}}': 'MCP-сервер: {{server}}',
-  'Tool: {{tool}}': 'Инструмент: {{tool}}',
+  "Yes, allow always ...": "Да, всегда разрешать ...",
+  "Always allow in this project": "Всегда разрешать в этом проекте",
+  "Always allow {{action}} in this project": "Всегда разрешать {{action}} в этом проекте",
+  "Always allow for this user": "Всегда разрешать для этого пользователя",
+  "Always allow {{action}} for this user": "Всегда разрешать {{action}} для этого пользователя",
+  "Yes, restore previous mode ({{mode}})": "Да, восстановить предыдущий режим ({{mode}})",
+  "Yes, and auto-accept edits": "Да, и автоматически принимать правки",
+  "Yes, and manually approve edits": "Да, и вручную подтверждать правки",
+  "No, keep planning (esc)": "Нет, продолжить планирование (esc)",
+  "URLs to fetch:": "URL для загрузки:",
+  "MCP Server: {{server}}": "MCP-сервер: {{server}}",
+  "Tool: {{tool}}": "Инструмент: {{tool}}",
   'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?':
     'Разрешить выполнение инструмента MCP "{{tool}}" с сервера "{{server}}"?',
   'Yes, always allow tool "{{tool}}" from server "{{server}}"':
@@ -1132,357 +1048,336 @@ export default {
   // ============================================================================
   // Диалоги - Подтверждение оболочки
   // ============================================================================
-  'Shell Command Execution': 'Выполнение команды терминала',
-  'A custom command wants to run the following shell commands:':
-    'Пользовательская команда хочет выполнить следующие команды терминала:',
+  "Shell Command Execution": "Выполнение команды терминала",
+  "A custom command wants to run the following shell commands:":
+    "Пользовательская команда хочет выполнить следующие команды терминала:",
 
   // ============================================================================
   // Диалоги - Квота подписки Pro
   // ============================================================================
-  'Pro quota limit reached for {{model}}.':
-    'Исчерпана квота подписки Pro для {{model}}.',
-  'Change auth (executes the /auth command)':
-    'Изменить авторизацию (выполняет команду /auth)',
-  'Continue with {{model}}': 'Продолжить с {{model}}',
+  "Pro quota limit reached for {{model}}.": "Исчерпана квота подписки Pro для {{model}}.",
+  "Change auth (executes the /auth command)": "Изменить авторизацию (выполняет команду /auth)",
+  "Continue with {{model}}": "Продолжить с {{model}}",
 
   // ============================================================================
   // Диалоги - Приветствие при возвращении
   // ============================================================================
-  'Current Plan:': 'Текущий план:',
-  'Progress: {{done}}/{{total}} tasks completed':
-    'Прогресс: {{done}}/{{total}} задач выполнено',
-  ', {{inProgress}} in progress': ', {{inProgress}} в процессе',
-  'Pending Tasks:': 'Ожидающие задачи:',
-  'What would you like to do?': 'Что вы хотите сделать?',
-  'Choose how to proceed with your session:':
-    'Выберите, как продолжить сессию:',
-  'Start new chat session': 'Начать новую сессию чата',
-  'Continue previous conversation': 'Продолжить предыдущий диалог',
-  '👋 Welcome back! (Last updated: {{timeAgo}})':
-    '👋 С возвращением! (Последнее обновление: {{timeAgo}})',
-  '🎯 Overall Goal:': '🎯 Общая цель:',
+  "Current Plan:": "Текущий план:",
+  "Progress: {{done}}/{{total}} tasks completed": "Прогресс: {{done}}/{{total}} задач выполнено",
+  ", {{inProgress}} in progress": ", {{inProgress}} в процессе",
+  "Pending Tasks:": "Ожидающие задачи:",
+  "What would you like to do?": "Что вы хотите сделать?",
+  "Choose how to proceed with your session:": "Выберите, как продолжить сессию:",
+  "Start new chat session": "Начать новую сессию чата",
+  "Continue previous conversation": "Продолжить предыдущий диалог",
+  "👋 Welcome back! (Last updated: {{timeAgo}})":
+    "👋 С возвращением! (Последнее обновление: {{timeAgo}})",
+  "🎯 Overall Goal:": "🎯 Общая цель:",
 
   // ============================================================================
   // Диалоги - Авторизация
   // ============================================================================
-  'Get started': 'Начать',
-  'Select Authentication Method': 'Выберите метод авторизации',
-  'OpenAI API key is required to use OpenAI authentication.':
-    'Для использования авторизации OpenAI требуется ключ API OpenAI.',
-  'You must select an auth method to proceed. Press Ctrl+C again to exit.':
-    'Вы должны выбрать метод авторизации для продолжения. Нажмите Ctrl+C снова для выхода.',
-  'Terms of Services and Privacy Notice':
-    'Условия обслуживания и уведомление о конфиденциальности',
-  'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models':
-    'Платно \u00B7 До 6 000 запросов/5 часов \u00B7 Все модели Alibaba Cloud Coding Plan',
-  'Alibaba Cloud Coding Plan': 'Alibaba Cloud Coding Plan',
-  'Bring your own API key': 'Используйте свой API-ключ',
-  'API-KEY': 'API-KEY',
-  'Use coding plan credentials or your own api-keys/providers.':
-    'Используйте учетные данные Coding Plan или свои собственные API-ключи/провайдеры.',
-  OpenAI: 'OpenAI',
-  'Failed to login. Message: {{message}}':
-    'Не удалось войти. Сообщение: {{message}}',
-  'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.':
-    'Авторизация должна быть {{enforcedType}}, но вы сейчас используете {{currentType}}.',
-  'Please visit this URL to authorize:':
-    'Пожалуйста, посетите этот URL для авторизации:',
-  'Or scan the QR code below:': 'Или отсканируйте QR-код ниже:',
-  'Waiting for authorization': 'Ожидание авторизации',
-  'Time remaining:': 'Осталось времени:',
-  '(Press ESC or CTRL+C to cancel)': '(Нажмите ESC или CTRL+C для отмены)',
-  'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.':
-    'Токен OAuth истек (более {{seconds}} секунд). Пожалуйста, выберите метод авторизации снова.',
-  'Press any key to return to authentication type selection.':
-    'Нажмите любую клавишу для возврата к выбору типа авторизации.',
-  'Authentication timed out. Please try again.':
-    'Время ожидания авторизации истекло. Пожалуйста, попробуйте снова.',
-  'Waiting for auth... (Press ESC or CTRL+C to cancel)':
-    'Ожидание авторизации... (Нажмите ESC или CTRL+C для отмены)',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    'Отсутствует API-ключ для аутентификации, совместимой с OpenAI. Укажите settings.security.auth.apiKey или переменную окружения {{envKeyHint}}.',
-  '{{envKeyHint}} environment variable not found.':
-    'Переменная окружения {{envKeyHint}} не найдена.',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    'Переменная окружения {{envKeyHint}} не найдена. Укажите её в файле .env или среди системных переменных.',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    'Переменная окружения {{envKeyHint}} не найдена (или установите settings.security.auth.apiKey). Укажите её в файле .env или среди системных переменных.',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    'Отсутствует API-ключ для аутентификации, совместимой с OpenAI. Установите переменную окружения {{envKeyHint}}.',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'У провайдера Anthropic отсутствует обязательный baseUrl в modelProviders[].baseUrl.',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    'Переменная окружения ANTHROPIC_BASE_URL не найдена.',
-  'Invalid auth method selected.': 'Выбран недопустимый метод авторизации.',
-  'Failed to authenticate. Message: {{message}}':
-    'Не удалось авторизоваться. Сообщение: {{message}}',
-  'Authenticated successfully with {{authType}} credentials.':
-    'Успешно авторизовано с учетными данными {{authType}}.',
+  "Get started": "Начать",
+  "Select Authentication Method": "Выберите метод авторизации",
+  "OpenAI API key is required to use OpenAI authentication.":
+    "Для использования авторизации OpenAI требуется ключ API OpenAI.",
+  "You must select an auth method to proceed. Press Ctrl+C again to exit.":
+    "Вы должны выбрать метод авторизации для продолжения. Нажмите Ctrl+C снова для выхода.",
+  "Terms of Services and Privacy Notice": "Условия обслуживания и уведомление о конфиденциальности",
+  "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models":
+    "Платно \u00B7 До 6 000 запросов/5 часов \u00B7 Все модели Alibaba Cloud Coding Plan",
+  "Alibaba Cloud Coding Plan": "Alibaba Cloud Coding Plan",
+  "Bring your own API key": "Используйте свой API-ключ",
+  "API-KEY": "API-KEY",
+  "Use coding plan credentials or your own api-keys/providers.":
+    "Используйте учетные данные Coding Plan или свои собственные API-ключи/провайдеры.",
+  OpenAI: "OpenAI",
+  "Failed to login. Message: {{message}}": "Не удалось войти. Сообщение: {{message}}",
+  "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.":
+    "Авторизация должна быть {{enforcedType}}, но вы сейчас используете {{currentType}}.",
+  "Please visit this URL to authorize:": "Пожалуйста, посетите этот URL для авторизации:",
+  "Or scan the QR code below:": "Или отсканируйте QR-код ниже:",
+  "Waiting for authorization": "Ожидание авторизации",
+  "Time remaining:": "Осталось времени:",
+  "(Press ESC or CTRL+C to cancel)": "(Нажмите ESC или CTRL+C для отмены)",
+  "OAuth token expired (over {{seconds}} seconds). Please select authentication method again.":
+    "Токен OAuth истек (более {{seconds}} секунд). Пожалуйста, выберите метод авторизации снова.",
+  "Press any key to return to authentication type selection.":
+    "Нажмите любую клавишу для возврата к выбору типа авторизации.",
+  "Authentication timed out. Please try again.":
+    "Время ожидания авторизации истекло. Пожалуйста, попробуйте снова.",
+  "Waiting for auth... (Press ESC or CTRL+C to cancel)":
+    "Ожидание авторизации... (Нажмите ESC или CTRL+C для отмены)",
+  "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.":
+    "Отсутствует API-ключ для аутентификации, совместимой с OpenAI. Укажите settings.security.auth.apiKey или переменную окружения {{envKeyHint}}.",
+  "{{envKeyHint}} environment variable not found.":
+    "Переменная окружения {{envKeyHint}} не найдена.",
+  "{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.":
+    "Переменная окружения {{envKeyHint}} не найдена. Укажите её в файле .env или среди системных переменных.",
+  "{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.":
+    "Переменная окружения {{envKeyHint}} не найдена (или установите settings.security.auth.apiKey). Укажите её в файле .env или среди системных переменных.",
+  "Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.":
+    "Отсутствует API-ключ для аутентификации, совместимой с OpenAI. Установите переменную окружения {{envKeyHint}}.",
+  "Anthropic provider missing required baseUrl in modelProviders[].baseUrl.":
+    "У провайдера Anthropic отсутствует обязательный baseUrl в modelProviders[].baseUrl.",
+  "ANTHROPIC_BASE_URL environment variable not found.":
+    "Переменная окружения ANTHROPIC_BASE_URL не найдена.",
+  "Invalid auth method selected.": "Выбран недопустимый метод авторизации.",
+  "Failed to authenticate. Message: {{message}}":
+    "Не удалось авторизоваться. Сообщение: {{message}}",
+  "Authenticated successfully with {{authType}} credentials.":
+    "Успешно авторизовано с учетными данными {{authType}}.",
   'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}':
     'Неверное значение QWEN_DEFAULT_AUTH_TYPE: "{{value}}". Допустимые значения: {{validValues}}',
-  'OpenAI Configuration Required': 'Требуется конфигурация OpenAI',
-  'Please enter your OpenAI configuration. You can get an API key from':
-    'Пожалуйста, введите конфигурацию OpenAI. Вы можете получить ключ API на',
-  'API Key:': 'Ключ API:',
-  'Invalid credentials: {{errorMessage}}':
-    'Неверные учетные данные: {{errorMessage}}',
-  'Failed to validate credentials': 'Не удалось проверить учетные данные',
-  'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel':
-    'Enter для продолжения, Tab/↑↓ для навигации, Esc для отмены',
+  "OpenAI Configuration Required": "Требуется конфигурация OpenAI",
+  "Please enter your OpenAI configuration. You can get an API key from":
+    "Пожалуйста, введите конфигурацию OpenAI. Вы можете получить ключ API на",
+  "API Key:": "Ключ API:",
+  "Invalid credentials: {{errorMessage}}": "Неверные учетные данные: {{errorMessage}}",
+  "Failed to validate credentials": "Не удалось проверить учетные данные",
+  "Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel":
+    "Enter для продолжения, Tab/↑↓ для навигации, Esc для отмены",
 
   // ============================================================================
   // Диалоги - Модель
   // ============================================================================
-  'Select Model': 'Выбрать модель',
-  '(Press Esc to close)': '(Нажмите Esc для закрытия)',
-  'Current (effective) configuration': 'Текущая (фактическая) конфигурация',
-  AuthType: 'Тип авторизации',
-  'API Key': 'API-ключ',
-  unset: 'не задано',
-  '(default)': '(по умолчанию)',
-  '(set)': '(установлено)',
-  '(not set)': '(не задано)',
-  Modality: 'Модальность',
-  'Context Window': 'Контекстное окно',
-  text: 'текст',
-  'text-only': 'только текст',
-  image: 'изображение',
-  pdf: 'PDF',
-  audio: 'аудио',
-  video: 'видео',
-  'not set': 'не задано',
-  none: 'нет',
-  unknown: 'неизвестно',
+  "Select Model": "Выбрать модель",
+  "(Press Esc to close)": "(Нажмите Esc для закрытия)",
+  "Current (effective) configuration": "Текущая (фактическая) конфигурация",
+  AuthType: "Тип авторизации",
+  "API Key": "API-ключ",
+  unset: "не задано",
+  "(default)": "(по умолчанию)",
+  "(set)": "(установлено)",
+  "(not set)": "(не задано)",
+  Modality: "Модальность",
+  "Context Window": "Контекстное окно",
+  text: "текст",
+  "text-only": "только текст",
+  image: "изображение",
+  pdf: "PDF",
+  audio: "аудио",
+  video: "видео",
+  "not set": "не задано",
+  none: "нет",
+  unknown: "неизвестно",
   "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
     "Не удалось переключиться на модель '{{modelId}}'.\n\n{{error}}",
-  'Qwen 3.6 Plus — efficient hybrid model with leading coding performance':
-    'Qwen 3.6 Plus — эффективная гибридная модель с лидирующей производительностью в программировании',
-  'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
-    'Последняя модель Qwen Vision от Alibaba Cloud ModelStudio (версия: qwen3-vl-plus-2025-09-23)',
+  "Qwen 3.6 Plus — efficient hybrid model with leading coding performance":
+    "Qwen 3.6 Plus — эффективная гибридная модель с лидирующей производительностью в программировании",
+  "The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)":
+    "Последняя модель Qwen Vision от Alibaba Cloud ModelStudio (версия: qwen3-vl-plus-2025-09-23)",
 
   // ============================================================================
   // Диалоги - Разрешения
   // ============================================================================
-  'Manage folder trust settings': 'Управление настройками доверия к папкам',
-  'Manage permission rules': 'Управление правилами разрешений',
-  Allow: 'Разрешить',
-  Ask: 'Спросить',
-  Deny: 'Запретить',
-  Workspace: 'Рабочая область',
+  "Manage folder trust settings": "Управление настройками доверия к папкам",
+  "Manage permission rules": "Управление правилами разрешений",
+  Allow: "Разрешить",
+  Ask: "Спросить",
+  Deny: "Запретить",
+  Workspace: "Рабочая область",
   "Qwen Code won't ask before using allowed tools.":
-    'Qwen Code не будет спрашивать перед использованием разрешённых инструментов.',
-  'Qwen Code will ask before using these tools.':
-    'Qwen Code спросит перед использованием этих инструментов.',
-  'Qwen Code is not allowed to use denied tools.':
-    'Qwen Code не может использовать запрещённые инструменты.',
-  'Manage trusted directories for this workspace.':
-    'Управление доверенными каталогами для этой рабочей области.',
-  'Any use of the {{tool}} tool': 'Любое использование инструмента {{tool}}',
-  "{{tool}} commands matching '{{pattern}}'":
-    "Команды {{tool}}, соответствующие '{{pattern}}'",
-  'From user settings': 'Из пользовательских настроек',
-  'From project settings': 'Из настроек проекта',
-  'From session': 'Из сессии',
-  'Project settings (local)': 'Настройки проекта (локальные)',
-  'Saved in .qwen/settings.local.json': 'Сохранено в .qwen/settings.local.json',
-  'Project settings': 'Настройки проекта',
-  'Checked in at .qwen/settings.json': 'Зафиксировано в .qwen/settings.json',
-  'User settings': 'Пользовательские настройки',
-  'Saved in at ~/.qwen/settings.json': 'Сохранено в ~/.qwen/settings.json',
-  'Add a new rule…': 'Добавить новое правило…',
-  'Add {{type}} permission rule': 'Добавить правило разрешения {{type}}',
-  'Permission rules are a tool name, optionally followed by a specifier in parentheses.':
-    'Правила разрешений — это имя инструмента, за которым может следовать спецификатор в скобках.',
-  'e.g.,': 'напр.',
-  or: 'или',
-  'Enter permission rule…': 'Введите правило разрешения…',
-  'Enter to submit · Esc to cancel': 'Enter для отправки · Esc для отмены',
-  'Where should this rule be saved?': 'Где сохранить это правило?',
-  'Enter to confirm · Esc to cancel':
-    'Enter для подтверждения · Esc для отмены',
-  'Delete {{type}} rule?': 'Удалить правило {{type}}?',
-  'Are you sure you want to delete this permission rule?':
-    'Вы уверены, что хотите удалить это правило разрешения?',
-  'Permissions:': 'Разрешения:',
-  '(←/→ or tab to cycle)': '(←/→ или Tab для переключения)',
-  'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel':
-    '↑↓ навигация · Enter выбор · Ввод для поиска · Esc отмена',
-  'Search…': 'Поиск…',
-  'Use /trust to manage folder trust settings for this workspace.':
-    'Используйте /trust для управления настройками доверия к папкам этой рабочей области.',
+    "Qwen Code не будет спрашивать перед использованием разрешённых инструментов.",
+  "Qwen Code will ask before using these tools.":
+    "Qwen Code спросит перед использованием этих инструментов.",
+  "Qwen Code is not allowed to use denied tools.":
+    "Qwen Code не может использовать запрещённые инструменты.",
+  "Manage trusted directories for this workspace.":
+    "Управление доверенными каталогами для этой рабочей области.",
+  "Any use of the {{tool}} tool": "Любое использование инструмента {{tool}}",
+  "{{tool}} commands matching '{{pattern}}'": "Команды {{tool}}, соответствующие '{{pattern}}'",
+  "From user settings": "Из пользовательских настроек",
+  "From project settings": "Из настроек проекта",
+  "From session": "Из сессии",
+  "Project settings (local)": "Настройки проекта (локальные)",
+  "Saved in .qwen/settings.local.json": "Сохранено в .qwen/settings.local.json",
+  "Project settings": "Настройки проекта",
+  "Checked in at .qwen/settings.json": "Зафиксировано в .qwen/settings.json",
+  "User settings": "Пользовательские настройки",
+  "Saved in at ~/.qwen/settings.json": "Сохранено в ~/.qwen/settings.json",
+  "Add a new rule…": "Добавить новое правило…",
+  "Add {{type}} permission rule": "Добавить правило разрешения {{type}}",
+  "Permission rules are a tool name, optionally followed by a specifier in parentheses.":
+    "Правила разрешений — это имя инструмента, за которым может следовать спецификатор в скобках.",
+  "e.g.,": "напр.",
+  or: "или",
+  "Enter permission rule…": "Введите правило разрешения…",
+  "Enter to submit · Esc to cancel": "Enter для отправки · Esc для отмены",
+  "Where should this rule be saved?": "Где сохранить это правило?",
+  "Enter to confirm · Esc to cancel": "Enter для подтверждения · Esc для отмены",
+  "Delete {{type}} rule?": "Удалить правило {{type}}?",
+  "Are you sure you want to delete this permission rule?":
+    "Вы уверены, что хотите удалить это правило разрешения?",
+  "Permissions:": "Разрешения:",
+  "(←/→ or tab to cycle)": "(←/→ или Tab для переключения)",
+  "Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel":
+    "↑↓ навигация · Enter выбор · Ввод для поиска · Esc отмена",
+  "Search…": "Поиск…",
+  "Use /trust to manage folder trust settings for this workspace.":
+    "Используйте /trust для управления настройками доверия к папкам этой рабочей области.",
   // Workspace directory management
-  'Add directory…': 'Добавить каталог…',
-  'Add directory to workspace': 'Добавить каталог в рабочую область',
-  'Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.':
-    'Qwen Code может читать файлы в рабочей области и вносить правки, когда автоприём правок включён.',
-  'Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.':
-    'Qwen Code сможет читать файлы в этом каталоге и вносить правки, когда автоприём правок включён.',
-  'Enter the path to the directory:': 'Введите путь к каталогу:',
-  'Enter directory path…': 'Введите путь к каталогу…',
-  'Tab to complete · Enter to add · Esc to cancel':
-    'Tab для завершения · Enter для добавления · Esc для отмены',
-  'Remove directory?': 'Удалить каталог?',
-  'Are you sure you want to remove this directory from the workspace?':
-    'Вы уверены, что хотите удалить этот каталог из рабочей области?',
-  '  (Original working directory)': '  (Исходный рабочий каталог)',
-  '  (from settings)': '  (из настроек)',
-  'Directory does not exist.': 'Каталог не существует.',
-  'Path is not a directory.': 'Путь не является каталогом.',
-  'This directory is already in the workspace.':
-    'Этот каталог уже есть в рабочей области.',
-  'Already covered by existing directory: {{dir}}':
-    'Уже охвачен существующим каталогом: {{dir}}',
+  "Add directory…": "Добавить каталог…",
+  "Add directory to workspace": "Добавить каталог в рабочую область",
+  "Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.":
+    "Qwen Code может читать файлы в рабочей области и вносить правки, когда автоприём правок включён.",
+  "Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.":
+    "Qwen Code сможет читать файлы в этом каталоге и вносить правки, когда автоприём правок включён.",
+  "Enter the path to the directory:": "Введите путь к каталогу:",
+  "Enter directory path…": "Введите путь к каталогу…",
+  "Tab to complete · Enter to add · Esc to cancel":
+    "Tab для завершения · Enter для добавления · Esc для отмены",
+  "Remove directory?": "Удалить каталог?",
+  "Are you sure you want to remove this directory from the workspace?":
+    "Вы уверены, что хотите удалить этот каталог из рабочей области?",
+  "  (Original working directory)": "  (Исходный рабочий каталог)",
+  "  (from settings)": "  (из настроек)",
+  "Directory does not exist.": "Каталог не существует.",
+  "Path is not a directory.": "Путь не является каталогом.",
+  "This directory is already in the workspace.": "Этот каталог уже есть в рабочей области.",
+  "Already covered by existing directory: {{dir}}": "Уже охвачен существующим каталогом: {{dir}}",
 
   // ============================================================================
   // Строка состояния
   // ============================================================================
-  'Using:': 'Используется:',
-  '{{count}} open file': '{{count}} открытый файл',
-  '{{count}} open files': '{{count}} открытых файла(ов)',
-  '(ctrl+g to view)': '(ctrl+g для просмотра)',
-  '{{count}} {{name}} file': '{{count}} файл {{name}}',
-  '{{count}} {{name}} files': '{{count}} файла(ов) {{name}}',
-  '{{count}} MCP server': '{{count}} MCP-сервер',
-  '{{count}} MCP servers': '{{count}} MCP-сервера(ов)',
-  '{{count}} Blocked': '{{count}} заблокирован(о)',
-  '(ctrl+t to view)': '(ctrl+t для просмотра)',
-  '(ctrl+t to toggle)': '(ctrl+t для переключения)',
-  'Press Ctrl+C again to exit.': 'Нажмите Ctrl+C снова для выхода.',
-  'Press Ctrl+D again to exit.': 'Нажмите Ctrl+D снова для выхода.',
-  'Press Esc again to clear.': 'Нажмите Esc снова для очистки.',
+  "Using:": "Используется:",
+  "{{count}} open file": "{{count}} открытый файл",
+  "{{count}} open files": "{{count}} открытых файла(ов)",
+  "(ctrl+g to view)": "(ctrl+g для просмотра)",
+  "{{count}} {{name}} file": "{{count}} файл {{name}}",
+  "{{count}} {{name}} files": "{{count}} файла(ов) {{name}}",
+  "{{count}} MCP server": "{{count}} MCP-сервер",
+  "{{count}} MCP servers": "{{count}} MCP-сервера(ов)",
+  "{{count}} Blocked": "{{count}} заблокирован(о)",
+  "(ctrl+t to view)": "(ctrl+t для просмотра)",
+  "(ctrl+t to toggle)": "(ctrl+t для переключения)",
+  "Press Ctrl+C again to exit.": "Нажмите Ctrl+C снова для выхода.",
+  "Press Ctrl+D again to exit.": "Нажмите Ctrl+D снова для выхода.",
+  "Press Esc again to clear.": "Нажмите Esc снова для очистки.",
 
   // ============================================================================
   // Статус MCP
   // ============================================================================
-  'No MCP servers configured.': 'Не настроено MCP-серверов.',
-  '⏳ MCP servers are starting up ({{count}} initializing)...':
-    '⏳ MCP-серверы запускаются ({{count}} инициализируется)...',
-  'Note: First startup may take longer. Tool availability will update automatically.':
-    'Примечание: Первый запуск может занять больше времени. Доступность инструментов обновится автоматически.',
-  'Configured MCP servers:': 'Настроенные MCP-серверы:',
-  Ready: 'Готов',
-  'Starting... (first startup may take longer)':
-    'Запуск... (первый запуск может занять больше времени)',
-  Disconnected: 'Отключен',
-  '{{count}} tool': '{{count}} инструмент',
-  '{{count}} tools': '{{count}} инструмента(ов)',
-  '{{count}} prompt': '{{count}} промпт',
-  '{{count}} prompts': '{{count}} промпта(ов)',
-  '(from {{extensionName}})': '(от {{extensionName}})',
-  OAuth: 'OAuth',
-  'OAuth expired': 'OAuth истек',
-  'OAuth not authenticated': 'OAuth не авторизован',
-  'tools and prompts will appear when ready':
-    'инструменты и промпты появятся, когда будут готовы',
-  '{{count}} tools cached': '{{count}} инструмента(ов) в кэше',
-  'Tools:': 'Инструменты:',
-  'Parameters:': 'Параметры:',
-  'Prompts:': 'Промпты:',
-  Blocked: 'Заблокировано',
-  '💡 Tips:': '💡 Подсказки:',
-  Use: 'Используйте',
-  'to show server and tool descriptions':
-    'для показа описаний сервера и инструментов',
-  'to show tool parameter schemas': 'для показа схем параметров инструментов',
-  'to hide descriptions': 'для скрытия описаний',
-  'to authenticate with OAuth-enabled servers':
-    'для авторизации на серверах с поддержкой OAuth',
-  Press: 'Нажмите',
-  'to toggle tool descriptions on/off':
-    'для переключения описаний инструментов',
+  "No MCP servers configured.": "Не настроено MCP-серверов.",
+  "⏳ MCP servers are starting up ({{count}} initializing)...":
+    "⏳ MCP-серверы запускаются ({{count}} инициализируется)...",
+  "Note: First startup may take longer. Tool availability will update automatically.":
+    "Примечание: Первый запуск может занять больше времени. Доступность инструментов обновится автоматически.",
+  "Configured MCP servers:": "Настроенные MCP-серверы:",
+  Ready: "Готов",
+  "Starting... (first startup may take longer)":
+    "Запуск... (первый запуск может занять больше времени)",
+  Disconnected: "Отключен",
+  "{{count}} tool": "{{count}} инструмент",
+  "{{count}} tools": "{{count}} инструмента(ов)",
+  "{{count}} prompt": "{{count}} промпт",
+  "{{count}} prompts": "{{count}} промпта(ов)",
+  "(from {{extensionName}})": "(от {{extensionName}})",
+  OAuth: "OAuth",
+  "OAuth expired": "OAuth истек",
+  "OAuth not authenticated": "OAuth не авторизован",
+  "tools and prompts will appear when ready": "инструменты и промпты появятся, когда будут готовы",
+  "{{count}} tools cached": "{{count}} инструмента(ов) в кэше",
+  "Tools:": "Инструменты:",
+  "Parameters:": "Параметры:",
+  "Prompts:": "Промпты:",
+  Blocked: "Заблокировано",
+  "💡 Tips:": "💡 Подсказки:",
+  Use: "Используйте",
+  "to show server and tool descriptions": "для показа описаний сервера и инструментов",
+  "to show tool parameter schemas": "для показа схем параметров инструментов",
+  "to hide descriptions": "для скрытия описаний",
+  "to authenticate with OAuth-enabled servers": "для авторизации на серверах с поддержкой OAuth",
+  Press: "Нажмите",
+  "to toggle tool descriptions on/off": "для переключения описаний инструментов",
   "Starting OAuth authentication for MCP server '{{name}}'...":
     "Начало авторизации OAuth для MCP-сервера '{{name}}'...",
-  'Restarting MCP servers...': 'Перезапуск MCP-серверов...',
+  "Restarting MCP servers...": "Перезапуск MCP-серверов...",
 
   // ============================================================================
   // Подсказки при запуске
   // ============================================================================
-  'Tips for getting started:': 'Подсказки для начала работы:',
-  '1. Ask questions, edit files, or run commands.':
-    '1. Задавайте вопросы, редактируйте файлы или выполняйте команды.',
-  '2. Be specific for the best results.':
-    '2. Будьте конкретны для лучших результатов.',
-  'files to customize your interactions with Qwen Code.':
-    'файлы для настройки взаимодействия с Qwen Code.',
-  'for more information.': 'для получения дополнительной информации.',
+  "Tips for getting started:": "Подсказки для начала работы:",
+  "1. Ask questions, edit files, or run commands.":
+    "1. Задавайте вопросы, редактируйте файлы или выполняйте команды.",
+  "2. Be specific for the best results.": "2. Будьте конкретны для лучших результатов.",
+  "files to customize your interactions with Qwen Code.":
+    "файлы для настройки взаимодействия с Qwen Code.",
+  "for more information.": "для получения дополнительной информации.",
 
   // ============================================================================
   // Экран выхода / Статистика
   // ============================================================================
-  'Agent powering down. Goodbye!': 'Агент завершает работу. До свидания!',
-  'To continue this session, run': 'Для продолжения этой сессии, выполните',
-  'Interaction Summary': 'Сводка взаимодействия',
-  'Session ID:': 'ID сессии:',
-  'Tool Calls:': 'Вызовы инструментов:',
-  'Success Rate:': 'Процент успеха:',
-  'User Agreement:': 'Согласие пользователя:',
-  reviewed: 'проверено',
-  'Code Changes:': 'Изменения кода:',
-  Performance: 'Производительность',
-  'Wall Time:': 'Общее время:',
-  'Agent Active:': 'Активность агента:',
-  'API Time:': 'Время API:',
-  'Tool Time:': 'Время инструментов:',
-  'Session Stats': 'Статистика сессии',
-  'Model Usage': 'Использование модели',
-  Reqs: 'Запросов',
-  'Input Tokens': 'Входных токенов',
-  'Output Tokens': 'Выходных токенов',
-  'Savings Highlight:': 'Экономия:',
-  'of input tokens were served from the cache, reducing costs.':
-    'входных токенов обслужено из кэша, снижая затраты.',
-  'Tip: For a full token breakdown, run `/stats model`.':
-    'Подсказка: Для полной разбивки токенов выполните `/stats model`.',
-  'Model Stats For Nerds': 'Статистика модели для гиков',
-  'Tool Stats For Nerds': 'Статистика инструментов для гиков',
-  Metric: 'Метрика',
-  API: 'API',
-  Requests: 'Запросы',
-  Errors: 'Ошибки',
-  'Avg Latency': 'Средняя задержка',
-  Tokens: 'Токены',
-  Total: 'Всего',
-  Prompt: 'Промпт',
-  Cached: 'Кэшировано',
-  Thoughts: 'Размышления',
-  Tool: 'Инструмент',
-  Output: 'Вывод',
-  'No API calls have been made in this session.':
-    'В этой сессии не было вызовов API.',
-  'Tool Name': 'Имя инструмента',
-  Calls: 'Вызовы',
-  'Success Rate': 'Процент успеха',
-  'Avg Duration': 'Средняя длительность',
-  'User Decision Summary': 'Сводка решений пользователя',
-  'Total Reviewed Suggestions:': 'Всего проверено предложений:',
-  ' » Accepted:': ' » Принято:',
-  ' » Rejected:': ' » Отклонено:',
-  ' » Modified:': ' » Изменено:',
-  ' Overall Agreement Rate:': ' Общий процент согласия:',
-  'No tool calls have been made in this session.':
-    'В этой сессии не было вызовов инструментов.',
-  'Session start time is unavailable, cannot calculate stats.':
-    'Время начала сессии недоступно, невозможно рассчитать статистику.',
+  "Agent powering down. Goodbye!": "Агент завершает работу. До свидания!",
+  "To continue this session, run": "Для продолжения этой сессии, выполните",
+  "Interaction Summary": "Сводка взаимодействия",
+  "Session ID:": "ID сессии:",
+  "Tool Calls:": "Вызовы инструментов:",
+  "Success Rate:": "Процент успеха:",
+  "User Agreement:": "Согласие пользователя:",
+  reviewed: "проверено",
+  "Code Changes:": "Изменения кода:",
+  Performance: "Производительность",
+  "Wall Time:": "Общее время:",
+  "Agent Active:": "Активность агента:",
+  "API Time:": "Время API:",
+  "Tool Time:": "Время инструментов:",
+  "Session Stats": "Статистика сессии",
+  "Model Usage": "Использование модели",
+  Reqs: "Запросов",
+  "Input Tokens": "Входных токенов",
+  "Output Tokens": "Выходных токенов",
+  "Savings Highlight:": "Экономия:",
+  "of input tokens were served from the cache, reducing costs.":
+    "входных токенов обслужено из кэша, снижая затраты.",
+  "Tip: For a full token breakdown, run `/stats model`.":
+    "Подсказка: Для полной разбивки токенов выполните `/stats model`.",
+  "Model Stats For Nerds": "Статистика модели для гиков",
+  "Tool Stats For Nerds": "Статистика инструментов для гиков",
+  Metric: "Метрика",
+  API: "API",
+  Requests: "Запросы",
+  Errors: "Ошибки",
+  "Avg Latency": "Средняя задержка",
+  Tokens: "Токены",
+  Total: "Всего",
+  Prompt: "Промпт",
+  Cached: "Кэшировано",
+  Thoughts: "Размышления",
+  Tool: "Инструмент",
+  Output: "Вывод",
+  "No API calls have been made in this session.": "В этой сессии не было вызовов API.",
+  "Tool Name": "Имя инструмента",
+  Calls: "Вызовы",
+  "Success Rate": "Процент успеха",
+  "Avg Duration": "Средняя длительность",
+  "User Decision Summary": "Сводка решений пользователя",
+  "Total Reviewed Suggestions:": "Всего проверено предложений:",
+  " » Accepted:": " » Принято:",
+  " » Rejected:": " » Отклонено:",
+  " » Modified:": " » Изменено:",
+  " Overall Agreement Rate:": " Общий процент согласия:",
+  "No tool calls have been made in this session.": "В этой сессии не было вызовов инструментов.",
+  "Session start time is unavailable, cannot calculate stats.":
+    "Время начала сессии недоступно, невозможно рассчитать статистику.",
 
   // ============================================================================
   // Command Format Migration
   // ============================================================================
-  'Command Format Migration': 'Миграция формата команд',
-  'Found {{count}} TOML command file:': 'Найден {{count}} файл команд TOML:',
-  'Found {{count}} TOML command files:':
-    'Найдено {{count}} файлов команд TOML:',
-  '... and {{count}} more': '... и ещё {{count}}',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'Формат TOML устарел. Хотите перенести их в формат Markdown?',
-  '(Backups will be created and original files will be preserved)':
-    '(Будут созданы резервные копии, исходные файлы будут сохранены)',
+  "Command Format Migration": "Миграция формата команд",
+  "Found {{count}} TOML command file:": "Найден {{count}} файл команд TOML:",
+  "Found {{count}} TOML command files:": "Найдено {{count}} файлов команд TOML:",
+  "... and {{count}} more": "... и ещё {{count}}",
+  "The TOML format is deprecated. Would you like to migrate them to Markdown format?":
+    "Формат TOML устарел. Хотите перенести их в формат Markdown?",
+  "(Backups will be created and original files will be preserved)":
+    "(Будут созданы резервные копии, исходные файлы будут сохранены)",
 
   // ============================================================================
   // Loading Phrases
   // ============================================================================
-  'Waiting for user confirmation...':
-    'Ожидание подтверждения от пользователя...',
-  '(esc to cancel, {{time}})': '(esc для отмены, {{time}})',
+  "Waiting for user confirmation...": "Ожидание подтверждения от пользователя...",
+  "(esc to cancel, {{time}})": "(esc для отмены, {{time}})",
 
   // ============================================================================
 
@@ -1490,464 +1385,431 @@ export default {
   // Loading Phrases
   // ============================================================================
   WITTY_LOADING_PHRASES: [
-    'Мне повезёт!',
-    'Доставляем крутизну... ',
-    'Рисуем засечки на буквах...',
-    'Пробираемся через слизевиков..',
-    'Советуемся с цифровыми духами...',
-    'Сглаживание сплайнов...',
-    'Разогреваем ИИ-хомячков...',
-    'Спрашиваем волшебную ракушку...',
-    'Генерируем остроумный ответ...',
-    'Полируем алгоритмы...',
-    'Не торопите совершенство (или мой код)...',
-    'Завариваем свежие байты...',
-    'Пересчитываем электроны...',
-    'Задействуем когнитивные процессоры...',
-    'Ищем синтаксические ошибки во вселенной...',
-    'Секундочку, оптимизируем юмор...',
-    'Перетасовываем панчлайны...',
-    'Распутаваем нейросети...',
-    'Компилируем гениальность...',
-    'Загружаем yumor.exe...',
-    'Призываем облако мудрости...',
-    'Готовим остроумный ответ...',
-    'Секунду, идёт отладка реальности...',
-    'Запутываем варианты...',
-    'Настраиваем космические частоты...',
-    'Создаем ответ, достойный вашего терпения...',
-    'Компилируем единички и нолики...',
-    'Разрешаем зависимости... и экзистенциальные кризисы...',
-    'Дефрагментация памяти... и оперативной, и личной...',
-    'Перезагрузка модуля юмора...',
-    'Кэшируем самое важное (в основном мемы с котиками)...',
-    'Оптимизация для безумной скорости',
-    'Меняем биты... только байтам не говорите...',
-    'Сборка мусора... скоро вернусь...',
-    'Сборка интернетов...',
-    'Превращаем кофе в код...',
-    'Обновляем синтаксис реальности...',
-    'Переподключаем синапсы...',
-    'Ищем лишнюю точку с запятой...',
-    'Смазываем шестерёнки машины...',
-    'Разогреваем серверы...',
-    'Калибруем потоковый накопитель...',
-    'Включаем двигатель невероятности...',
-    'Направляем Силу...',
-    'Выравниваем звёзды для оптимального ответа...',
-    'Так скажем мы все...',
-    'Загрузка следующей великой идеи...',
-    'Минутку, я в потоке...',
-    'Готовлюсь ослепить вас гениальностью...',
-    'Секунду, полирую остроумие...',
-    'Держитесь, создаю шедевр...',
-    'Мигом, отлаживаю вселенную...',
-    'Момент, выравниваю пиксели...',
-    'Секунду, оптимизирую юмор...',
-    'Момент, настраиваю алгоритмы...',
-    'Варп-прыжок активирован...',
-    'Добываем кристаллы дилития...',
-    'Без паники...',
-    'Следуем за белым кроликом...',
-    'Истина где-то здесь... внутри...',
-    'Продуваем картридж...',
-    'Загрузка... Сделай бочку!',
-    'Ждем респауна...',
-    'Делаем Дугу Кесселя менее чем за 12 парсеков...',
-    'Тортик — не ложь, он просто ещё грузится...',
-    'Возимся с экраном создания персонажа...',
-    'Минутку, ищу подходящий мем...',
+    "Мне повезёт!",
+    "Доставляем крутизну... ",
+    "Рисуем засечки на буквах...",
+    "Пробираемся через слизевиков..",
+    "Советуемся с цифровыми духами...",
+    "Сглаживание сплайнов...",
+    "Разогреваем ИИ-хомячков...",
+    "Спрашиваем волшебную ракушку...",
+    "Генерируем остроумный ответ...",
+    "Полируем алгоритмы...",
+    "Не торопите совершенство (или мой код)...",
+    "Завариваем свежие байты...",
+    "Пересчитываем электроны...",
+    "Задействуем когнитивные процессоры...",
+    "Ищем синтаксические ошибки во вселенной...",
+    "Секундочку, оптимизируем юмор...",
+    "Перетасовываем панчлайны...",
+    "Распутаваем нейросети...",
+    "Компилируем гениальность...",
+    "Загружаем yumor.exe...",
+    "Призываем облако мудрости...",
+    "Готовим остроумный ответ...",
+    "Секунду, идёт отладка реальности...",
+    "Запутываем варианты...",
+    "Настраиваем космические частоты...",
+    "Создаем ответ, достойный вашего терпения...",
+    "Компилируем единички и нолики...",
+    "Разрешаем зависимости... и экзистенциальные кризисы...",
+    "Дефрагментация памяти... и оперативной, и личной...",
+    "Перезагрузка модуля юмора...",
+    "Кэшируем самое важное (в основном мемы с котиками)...",
+    "Оптимизация для безумной скорости",
+    "Меняем биты... только байтам не говорите...",
+    "Сборка мусора... скоро вернусь...",
+    "Сборка интернетов...",
+    "Превращаем кофе в код...",
+    "Обновляем синтаксис реальности...",
+    "Переподключаем синапсы...",
+    "Ищем лишнюю точку с запятой...",
+    "Смазываем шестерёнки машины...",
+    "Разогреваем серверы...",
+    "Калибруем потоковый накопитель...",
+    "Включаем двигатель невероятности...",
+    "Направляем Силу...",
+    "Выравниваем звёзды для оптимального ответа...",
+    "Так скажем мы все...",
+    "Загрузка следующей великой идеи...",
+    "Минутку, я в потоке...",
+    "Готовлюсь ослепить вас гениальностью...",
+    "Секунду, полирую остроумие...",
+    "Держитесь, создаю шедевр...",
+    "Мигом, отлаживаю вселенную...",
+    "Момент, выравниваю пиксели...",
+    "Секунду, оптимизирую юмор...",
+    "Момент, настраиваю алгоритмы...",
+    "Варп-прыжок активирован...",
+    "Добываем кристаллы дилития...",
+    "Без паники...",
+    "Следуем за белым кроликом...",
+    "Истина где-то здесь... внутри...",
+    "Продуваем картридж...",
+    "Загрузка... Сделай бочку!",
+    "Ждем респауна...",
+    "Делаем Дугу Кесселя менее чем за 12 парсеков...",
+    "Тортик — не ложь, он просто ещё грузится...",
+    "Возимся с экраном создания персонажа...",
+    "Минутку, ищу подходящий мем...",
     "Нажимаем 'A' для продолжения...",
-    'Пасём цифровых котов...',
-    'Полируем пиксели...',
-    'Ищем подходящий каламбур для экрана загрузки...',
-    'Отвлекаем вас этой остроумной фразой...',
-    'Почти готово... вроде...',
-    'Наши хомячки работают изо всех сил...',
-    'Гладим Облачко по голове...',
-    'Гладим кота...',
-    'Рикроллим начальника...',
-    'Never gonna give you up, never gonna let you down...',
-    'Лабаем бас-гитару...',
-    'Пробуем снузберри на вкус...',
-    'Иду до конца, иду на скорость...',
-    'Is this the real life? Is this just fantasy?...',
-    'У меня хорошее предчувствие...',
-    'Дразним медведя... (Не лезь...)',
-    'Изучаем свежие мемы...',
-    'Думаем, как сделать это остроумнее...',
-    'Хмм... дайте подумать...',
-    'Как называется бумеранг, который не возвращается? Палка...',
-    'Почему компьютер простудился? Потому что оставил окна открытыми...',
-    'Почему программисты не любят гулять на улице? Там среда не настроена...',
-    'Почему программисты предпочитают тёмную тему? Потому что в темноте не видно багов...',
-    'Почему разработчик разорился? Потому что потратил весь свой кэш...',
-    'Что можно делать со сломанным карандашом? Ничего — он тупой...',
-    'Провожу настройку методом тыка...',
-    'Ищем, какой стороной вставлять флешку...',
-    'Следим, чтобы волшебный дым не вышел из проводов...',
-    'Пытаемся выйти из Vim...',
-    'Раскручиваем колесо для хомяка...',
-    'Это не баг, а фича...',
-    'Поехали!',
-    'Я вернусь... с ответом.',
-    'Мой другой процесс — это ТАРДИС...',
-    'Общаемся с духом машины...',
-    'Даем мыслям замариноваться...',
-    'Только что вспомнил, куда положил ключи...',
-    'Размышляю над сферой...',
-    'Я видел такое, что вам, людям, и не снилось... пользователя, читающего эти сообщения.',
-    'Инициируем задумчивый взгляд...',
-    'Что сервер заказывает в баре? Пинг-коладу.',
-    'Почему Java-разработчики не убираются дома? Они ждут сборщик мусора...',
-    'Заряжаем лазер... пиу-пиу!',
-    'Делим на ноль... шучу!',
-    'Ищу взрослых для присмот... в смысле, обрабатываю.',
-    'Делаем бип-буп.',
-    'Буферизация... даже ИИ нужно время подумать.',
-    'Запутываем квантовые частицы для быстрого ответа...',
-    'Полируем хром... на алгоритмах.',
-    'Вы ещё не развлеклись?! Разве вы не за этим сюда пришли?!',
-    'Призываем гремлинов кода... для помощи, конечно же.',
-    'Ждем, пока закончится звук dial-up модема...',
-    'Перекалибровка юморометра.',
-    'Мой другой экран загрузки ещё смешнее.',
-    'Кажется, где-то по клавиатуре гуляет кот...',
-    'Улучшаем... Ещё улучшаем... Всё ещё грузится.',
-    'Это не баг, это фича... экрана загрузки.',
-    'Пробовали выключить и включить снова? (Экран загрузки, не меня!)',
-    'Нужно построить больше пилонов...',
+    "Пасём цифровых котов...",
+    "Полируем пиксели...",
+    "Ищем подходящий каламбур для экрана загрузки...",
+    "Отвлекаем вас этой остроумной фразой...",
+    "Почти готово... вроде...",
+    "Наши хомячки работают изо всех сил...",
+    "Гладим Облачко по голове...",
+    "Гладим кота...",
+    "Рикроллим начальника...",
+    "Never gonna give you up, never gonna let you down...",
+    "Лабаем бас-гитару...",
+    "Пробуем снузберри на вкус...",
+    "Иду до конца, иду на скорость...",
+    "Is this the real life? Is this just fantasy?...",
+    "У меня хорошее предчувствие...",
+    "Дразним медведя... (Не лезь...)",
+    "Изучаем свежие мемы...",
+    "Думаем, как сделать это остроумнее...",
+    "Хмм... дайте подумать...",
+    "Как называется бумеранг, который не возвращается? Палка...",
+    "Почему компьютер простудился? Потому что оставил окна открытыми...",
+    "Почему программисты не любят гулять на улице? Там среда не настроена...",
+    "Почему программисты предпочитают тёмную тему? Потому что в темноте не видно багов...",
+    "Почему разработчик разорился? Потому что потратил весь свой кэш...",
+    "Что можно делать со сломанным карандашом? Ничего — он тупой...",
+    "Провожу настройку методом тыка...",
+    "Ищем, какой стороной вставлять флешку...",
+    "Следим, чтобы волшебный дым не вышел из проводов...",
+    "Пытаемся выйти из Vim...",
+    "Раскручиваем колесо для хомяка...",
+    "Это не баг, а фича...",
+    "Поехали!",
+    "Я вернусь... с ответом.",
+    "Мой другой процесс — это ТАРДИС...",
+    "Общаемся с духом машины...",
+    "Даем мыслям замариноваться...",
+    "Только что вспомнил, куда положил ключи...",
+    "Размышляю над сферой...",
+    "Я видел такое, что вам, людям, и не снилось... пользователя, читающего эти сообщения.",
+    "Инициируем задумчивый взгляд...",
+    "Что сервер заказывает в баре? Пинг-коладу.",
+    "Почему Java-разработчики не убираются дома? Они ждут сборщик мусора...",
+    "Заряжаем лазер... пиу-пиу!",
+    "Делим на ноль... шучу!",
+    "Ищу взрослых для присмот... в смысле, обрабатываю.",
+    "Делаем бип-буп.",
+    "Буферизация... даже ИИ нужно время подумать.",
+    "Запутываем квантовые частицы для быстрого ответа...",
+    "Полируем хром... на алгоритмах.",
+    "Вы ещё не развлеклись?! Разве вы не за этим сюда пришли?!",
+    "Призываем гремлинов кода... для помощи, конечно же.",
+    "Ждем, пока закончится звук dial-up модема...",
+    "Перекалибровка юморометра.",
+    "Мой другой экран загрузки ещё смешнее.",
+    "Кажется, где-то по клавиатуре гуляет кот...",
+    "Улучшаем... Ещё улучшаем... Всё ещё грузится.",
+    "Это не баг, это фича... экрана загрузки.",
+    "Пробовали выключить и включить снова? (Экран загрузки, не меня!)",
+    "Нужно построить больше пилонов...",
   ],
 
   // ============================================================================
   // Extension Settings Input
   // ============================================================================
-  'Enter value...': 'Введите значение...',
-  'Enter sensitive value...': 'Введите секретное значение...',
-  'Press Enter to submit, Escape to cancel':
-    'Нажмите Enter для отправки, Escape для отмены',
+  "Enter value...": "Введите значение...",
+  "Enter sensitive value...": "Введите секретное значение...",
+  "Press Enter to submit, Escape to cancel": "Нажмите Enter для отправки, Escape для отмены",
 
   // ============================================================================
   // Command Migration Tool
   // ============================================================================
-  'Markdown file already exists: {{filename}}':
-    'Markdown-файл уже существует: {{filename}}',
-  'TOML Command Format Deprecation Notice':
-    'Уведомление об устаревании формата TOML',
-  'Found {{count}} command file(s) in TOML format:':
-    'Найдено {{count}} файл(ов) команд в формате TOML:',
-  'The TOML format for commands is being deprecated in favor of Markdown format.':
-    'Формат TOML для команд устаревает в пользу формата Markdown.',
-  'Markdown format is more readable and easier to edit.':
-    'Формат Markdown более читаемый и простой для редактирования.',
-  'You can migrate these files automatically using:':
-    'Вы можете автоматически мигрировать эти файлы с помощью:',
-  'Or manually convert each file:': 'Или вручную конвертировать каждый файл:',
-  'TOML: prompt = "..." / description = "..."':
-    'TOML: prompt = "..." / description = "..."',
-  'Markdown: YAML frontmatter + content':
-    'Markdown: YAML frontmatter + содержимое',
-  'The migration tool will:': 'Инструмент миграции:',
-  'Convert TOML files to Markdown': 'Конвертирует TOML-файлы в Markdown',
-  'Create backups of original files': 'Создаёт резервные копии исходных файлов',
-  'Preserve all command functionality': 'Сохраняет всю функциональность команд',
-  'TOML format will continue to work for now, but migration is recommended.':
-    'Формат TOML пока продолжит работать, но миграция рекомендуется.',
+  "Markdown file already exists: {{filename}}": "Markdown-файл уже существует: {{filename}}",
+  "TOML Command Format Deprecation Notice": "Уведомление об устаревании формата TOML",
+  "Found {{count}} command file(s) in TOML format:":
+    "Найдено {{count}} файл(ов) команд в формате TOML:",
+  "The TOML format for commands is being deprecated in favor of Markdown format.":
+    "Формат TOML для команд устаревает в пользу формата Markdown.",
+  "Markdown format is more readable and easier to edit.":
+    "Формат Markdown более читаемый и простой для редактирования.",
+  "You can migrate these files automatically using:":
+    "Вы можете автоматически мигрировать эти файлы с помощью:",
+  "Or manually convert each file:": "Или вручную конвертировать каждый файл:",
+  'TOML: prompt = "..." / description = "..."': 'TOML: prompt = "..." / description = "..."',
+  "Markdown: YAML frontmatter + content": "Markdown: YAML frontmatter + содержимое",
+  "The migration tool will:": "Инструмент миграции:",
+  "Convert TOML files to Markdown": "Конвертирует TOML-файлы в Markdown",
+  "Create backups of original files": "Создаёт резервные копии исходных файлов",
+  "Preserve all command functionality": "Сохраняет всю функциональность команд",
+  "TOML format will continue to work for now, but migration is recommended.":
+    "Формат TOML пока продолжит работать, но миграция рекомендуется.",
 
   // ============================================================================
   // Extensions - Explore Command
   // ============================================================================
-  'Open extensions page in your browser':
-    'Открыть страницу расширений в браузере',
-  'Unknown extensions source: {{source}}.':
-    'Неизвестный источник расширений: {{source}}.',
-  'Would open extensions page in your browser: {{url}} (skipped in test environment)':
-    'Страница расширений была бы открыта в браузере: {{url}} (пропущено в тестовой среде)',
-  'View available extensions at {{url}}':
-    'Посмотреть доступные расширения на {{url}}',
-  'Opening extensions page in your browser: {{url}}':
-    'Открываем страницу расширений в браузере: {{url}}',
-  'Failed to open browser. Check out the extensions gallery at {{url}}':
-    'Не удалось открыть браузер. Посетите галерею расширений по адресу {{url}}',
-  'Use /compress when the conversation gets long to summarize history and free up context.':
-    'Используйте /compress, когда разговор становится длинным, чтобы подвести итог и освободить контекст.',
-  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
-    'Начните новую идею с /clear или /new; предыдущая сессия останется в истории.',
-  'Use /bug to submit issues to the maintainers when something goes off.':
-    'Используйте /bug, чтобы сообщить о проблемах разработчикам.',
-  'Switch auth type quickly with /auth.':
-    'Быстро переключите тип аутентификации с помощью /auth.',
-  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
-    'Вы можете выполнять любые shell-команды в Qwen Code с помощью ! (например, !ls).',
-  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
-    'Введите /, чтобы открыть меню команд; Tab автодополняет слэш-команды и сохранённые промпты.',
-  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
-    'Вы можете продолжить предыдущий разговор, запустив qwen --continue или qwen --resume.',
-  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
-    'Вы можете быстро переключать режим разрешений с помощью Shift+Tab или /approval-mode.',
-  'You can switch permission mode quickly with Tab or /approval-mode.':
-    'Вы можете быстро переключать режим разрешений с помощью Tab или /approval-mode.',
-  'Try /insight to generate personalized insights from your chat history.':
-    'Попробуйте /insight, чтобы получить персонализированные выводы из истории чатов.',
+  "Open extensions page in your browser": "Открыть страницу расширений в браузере",
+  "Unknown extensions source: {{source}}.": "Неизвестный источник расширений: {{source}}.",
+  "Would open extensions page in your browser: {{url}} (skipped in test environment)":
+    "Страница расширений была бы открыта в браузере: {{url}} (пропущено в тестовой среде)",
+  "View available extensions at {{url}}": "Посмотреть доступные расширения на {{url}}",
+  "Opening extensions page in your browser: {{url}}":
+    "Открываем страницу расширений в браузере: {{url}}",
+  "Failed to open browser. Check out the extensions gallery at {{url}}":
+    "Не удалось открыть браузер. Посетите галерею расширений по адресу {{url}}",
+  "Use /compress when the conversation gets long to summarize history and free up context.":
+    "Используйте /compress, когда разговор становится длинным, чтобы подвести итог и освободить контекст.",
+  "Start a fresh idea with /clear or /new; the previous session stays available in history.":
+    "Начните новую идею с /clear или /new; предыдущая сессия останется в истории.",
+  "Use /bug to submit issues to the maintainers when something goes off.":
+    "Используйте /bug, чтобы сообщить о проблемах разработчикам.",
+  "Switch auth type quickly with /auth.": "Быстро переключите тип аутентификации с помощью /auth.",
+  "You can run any shell commands from Qwen Code using ! (e.g. !ls).":
+    "Вы можете выполнять любые shell-команды в Qwen Code с помощью ! (например, !ls).",
+  "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.":
+    "Введите /, чтобы открыть меню команд; Tab автодополняет слэш-команды и сохранённые промпты.",
+  "You can resume a previous conversation by running qwen --continue or qwen --resume.":
+    "Вы можете продолжить предыдущий разговор, запустив qwen --continue или qwen --resume.",
+  "You can switch permission mode quickly with Shift+Tab or /approval-mode.":
+    "Вы можете быстро переключать режим разрешений с помощью Shift+Tab или /approval-mode.",
+  "You can switch permission mode quickly with Tab or /approval-mode.":
+    "Вы можете быстро переключать режим разрешений с помощью Tab или /approval-mode.",
+  "Try /insight to generate personalized insights from your chat history.":
+    "Попробуйте /insight, чтобы получить персонализированные выводы из истории чатов.",
 
   // ============================================================================
   // Custom API Key Configuration
   // ============================================================================
-  'You can configure your API key and models in settings.json':
-    'Вы можете настроить API-ключ и модели в settings.json',
-  'Refer to the documentation for setup instructions':
-    'Инструкции по настройке см. в документации',
+  "You can configure your API key and models in settings.json":
+    "Вы можете настроить API-ключ и модели в settings.json",
+  "Refer to the documentation for setup instructions": "Инструкции по настройке см. в документации",
 
   // ============================================================================
   // Coding Plan Authentication
   // ============================================================================
-  'API key cannot be empty.': 'API-ключ не может быть пустым.',
-  'You can get your Coding Plan API key here':
-    'Вы можете получить API-ключ Coding Plan здесь',
-  'New model configurations are available for Alibaba Cloud Coding Plan. Update now?':
-    'Доступны новые конфигурации моделей для Alibaba Cloud Coding Plan. Обновить сейчас?',
-  'Coding Plan configuration updated successfully. New models are now available.':
-    'Конфигурация Coding Plan успешно обновлена. Новые модели теперь доступны.',
-  'Coding Plan API key not found. Please re-authenticate with Coding Plan.':
-    'API-ключ Coding Plan не найден. Пожалуйста, повторно авторизуйтесь с Coding Plan.',
-  'Failed to update Coding Plan configuration: {{message}}':
-    'Не удалось обновить конфигурацию Coding Plan: {{message}}',
+  "API key cannot be empty.": "API-ключ не может быть пустым.",
+  "You can get your Coding Plan API key here": "Вы можете получить API-ключ Coding Plan здесь",
+  "New model configurations are available for Alibaba Cloud Coding Plan. Update now?":
+    "Доступны новые конфигурации моделей для Alibaba Cloud Coding Plan. Обновить сейчас?",
+  "Coding Plan configuration updated successfully. New models are now available.":
+    "Конфигурация Coding Plan успешно обновлена. Новые модели теперь доступны.",
+  "Coding Plan API key not found. Please re-authenticate with Coding Plan.":
+    "API-ключ Coding Plan не найден. Пожалуйста, повторно авторизуйтесь с Coding Plan.",
+  "Failed to update Coding Plan configuration: {{message}}":
+    "Не удалось обновить конфигурацию Coding Plan: {{message}}",
 
   // ============================================================================
   // Auth Dialog - View Titles and Labels
   // ============================================================================
-  'Coding Plan': 'Coding Plan',
+  "Coding Plan": "Coding Plan",
   "Paste your api key of ModelStudio Coding Plan and you're all set!":
-    'Вставьте ваш API-ключ ModelStudio Coding Plan и всё готово!',
-  Custom: 'Пользовательский',
-  'More instructions about configuring `modelProviders` manually.':
-    'Дополнительные инструкции по ручной настройке `modelProviders`.',
-  'Select API-KEY configuration mode:': 'Выберите режим конфигурации API-KEY:',
-  '(Press Escape to go back)': '(Нажмите Escape для возврата)',
-  '(Press Enter to submit, Escape to cancel)':
-    '(Нажмите Enter для отправки, Escape для отмены)',
-  'More instructions please check:': 'Дополнительные инструкции см.:',
-  'Select Region for Coding Plan': 'Выберите регион Coding Plan',
-  'Choose based on where your account is registered':
-    'Выберите в зависимости от места регистрации вашего аккаунта',
-  'Enter Coding Plan API Key': 'Введите API-ключ Coding Plan',
+    "Вставьте ваш API-ключ ModelStudio Coding Plan и всё готово!",
+  Custom: "Пользовательский",
+  "More instructions about configuring `modelProviders` manually.":
+    "Дополнительные инструкции по ручной настройке `modelProviders`.",
+  "Select API-KEY configuration mode:": "Выберите режим конфигурации API-KEY:",
+  "(Press Escape to go back)": "(Нажмите Escape для возврата)",
+  "(Press Enter to submit, Escape to cancel)": "(Нажмите Enter для отправки, Escape для отмены)",
+  "More instructions please check:": "Дополнительные инструкции см.:",
+  "Select Region for Coding Plan": "Выберите регион Coding Plan",
+  "Choose based on where your account is registered":
+    "Выберите в зависимости от места регистрации вашего аккаунта",
+  "Enter Coding Plan API Key": "Введите API-ключ Coding Plan",
 
   // ============================================================================
   // Coding Plan International Updates
   // ============================================================================
-  'New model configurations are available for {{region}}. Update now?':
-    'Доступны новые конфигурации моделей для {{region}}. Обновить сейчас?',
+  "New model configurations are available for {{region}}. Update now?":
+    "Доступны новые конфигурации моделей для {{region}}. Обновить сейчас?",
   '{{region}} configuration updated successfully. Model switched to "{{model}}".':
     'Конфигурация {{region}} успешно обновлена. Модель переключена на "{{model}}".',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).':
-    'Успешная аутентификация с {{region}}. API-ключ и конфигурации моделей сохранены в settings.json (резервная копия создана).',
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).":
+    "Успешная аутентификация с {{region}}. API-ключ и конфигурации моделей сохранены в settings.json (резервная копия создана).",
 
   // ============================================================================
   // Context Usage Component
   // ============================================================================
-  'Context Usage': 'Использование контекста',
-  'No API response yet. Send a message to see actual usage.':
-    'Пока нет ответа от API. Отправьте сообщение, чтобы увидеть фактическое использование.',
-  'Estimated pre-conversation overhead':
-    'Оценочные накладные расходы перед беседой',
-  'Context window': 'Контекстное окно',
-  tokens: 'токенов',
-  Used: 'Использовано',
-  Free: 'Свободно',
-  'Autocompact buffer': 'Буфер автоупаковки',
-  'Usage by category': 'Использование по категориям',
-  'System prompt': 'Системная подсказка',
-  'Built-in tools': 'Встроенные инструменты',
-  'MCP tools': 'Инструменты MCP',
-  'Memory files': 'Файлы памяти',
-  Skills: 'Навыки',
-  Messages: 'Сообщения',
-  'Show context window usage breakdown.':
-    'Показать разбивку использования контекстного окна.',
-  'Run /context detail for per-item breakdown.':
-    'Выполните /context detail для детализации по элементам.',
-  active: 'активно',
-  'body loaded': 'содержимое загружено',
-  memory: 'память',
+  "Context Usage": "Использование контекста",
+  "No API response yet. Send a message to see actual usage.":
+    "Пока нет ответа от API. Отправьте сообщение, чтобы увидеть фактическое использование.",
+  "Estimated pre-conversation overhead": "Оценочные накладные расходы перед беседой",
+  "Context window": "Контекстное окно",
+  tokens: "токенов",
+  Used: "Использовано",
+  Free: "Свободно",
+  "Autocompact buffer": "Буфер автоупаковки",
+  "Usage by category": "Использование по категориям",
+  "System prompt": "Системная подсказка",
+  "Built-in tools": "Встроенные инструменты",
+  "MCP tools": "Инструменты MCP",
+  "Memory files": "Файлы памяти",
+  Skills: "Навыки",
+  Messages: "Сообщения",
+  "Show context window usage breakdown.": "Показать разбивку использования контекстного окна.",
+  "Run /context detail for per-item breakdown.":
+    "Выполните /context detail для детализации по элементам.",
+  active: "активно",
+  "body loaded": "содержимое загружено",
+  memory: "память",
   // MCP Management Dialog
   // ============================================================================
-  'MCP Management': 'Управление MCP',
-  'Server List': 'Список серверов',
-  'Server Detail': 'Детали сервера',
-  'Disable Server': 'Отключить сервер',
-  'Tool List': 'Список инструментов',
-  'Tool Detail': 'Детали инструмента',
-  'Loading...': 'Загрузка...',
-  'Unknown step': 'Неизвестный шаг',
-  'Esc to back': 'Esc для возврата',
-  '↑↓ to navigate · Enter to select · Esc to close':
-    '↑↓ навигация · Enter выбрать · Esc закрыть',
-  '↑↓ to navigate · Enter to select · Esc to back':
-    '↑↓ навигация · Enter выбрать · Esc назад',
-  '↑↓ to navigate · Enter to confirm · Esc to back':
-    '↑↓ навигация · Enter подтвердить · Esc назад',
-  'User Settings (global)': 'Настройки пользователя (глобальные)',
-  'Workspace Settings (project-specific)':
-    'Настройки рабочего пространства (проектные)',
-  'Disable server:': 'Отключить сервер:',
-  'Select where to add the server to the exclude list:':
-    'Выберите, где добавить сервер в список исключений:',
-  'Press Enter to confirm, Esc to cancel':
-    'Enter для подтверждения, Esc для отмены',
-  'Status:': 'Статус:',
-  'Command:': 'Команда:',
-  'Working Directory:': 'Рабочий каталог:',
-  'Capabilities:': 'Возможности:',
-  'No server selected': 'Сервер не выбран',
+  "MCP Management": "Управление MCP",
+  "Server List": "Список серверов",
+  "Server Detail": "Детали сервера",
+  "Disable Server": "Отключить сервер",
+  "Tool List": "Список инструментов",
+  "Tool Detail": "Детали инструмента",
+  "Loading...": "Загрузка...",
+  "Unknown step": "Неизвестный шаг",
+  "Esc to back": "Esc для возврата",
+  "↑↓ to navigate · Enter to select · Esc to close": "↑↓ навигация · Enter выбрать · Esc закрыть",
+  "↑↓ to navigate · Enter to select · Esc to back": "↑↓ навигация · Enter выбрать · Esc назад",
+  "↑↓ to navigate · Enter to confirm · Esc to back": "↑↓ навигация · Enter подтвердить · Esc назад",
+  "User Settings (global)": "Настройки пользователя (глобальные)",
+  "Workspace Settings (project-specific)": "Настройки рабочего пространства (проектные)",
+  "Disable server:": "Отключить сервер:",
+  "Select where to add the server to the exclude list:":
+    "Выберите, где добавить сервер в список исключений:",
+  "Press Enter to confirm, Esc to cancel": "Enter для подтверждения, Esc для отмены",
+  "Status:": "Статус:",
+  "Command:": "Команда:",
+  "Working Directory:": "Рабочий каталог:",
+  "Capabilities:": "Возможности:",
+  "No server selected": "Сервер не выбран",
 
   // MCP Server List
-  'User MCPs': 'MCP пользователя',
-  'Project MCPs': 'MCP проекта',
-  'Extension MCPs': 'MCP расширений',
-  server: 'сервер',
-  servers: 'серверов',
-  'Add MCP servers to your settings to get started.':
-    'Добавьте серверы MCP в настройки, чтобы начать.',
-  'Run qwen --debug to see error logs':
-    'Запустите qwen --debug для просмотра журналов ошибок',
+  "User MCPs": "MCP пользователя",
+  "Project MCPs": "MCP проекта",
+  "Extension MCPs": "MCP расширений",
+  server: "сервер",
+  servers: "серверов",
+  "Add MCP servers to your settings to get started.":
+    "Добавьте серверы MCP в настройки, чтобы начать.",
+  "Run qwen --debug to see error logs": "Запустите qwen --debug для просмотра журналов ошибок",
 
   // MCP OAuth Authentication
-  'OAuth Authentication': 'OAuth-аутентификация',
-  'Press Enter to start authentication, Esc to go back':
-    'Нажмите Enter для начала аутентификации, Esc для возврата',
-  'Authenticating... Please complete the login in your browser.':
-    'Аутентификация... Пожалуйста, завершите вход в браузере.',
-  'Press Enter or Esc to go back': 'Нажмите Enter или Esc для возврата',
+  "OAuth Authentication": "OAuth-аутентификация",
+  "Press Enter to start authentication, Esc to go back":
+    "Нажмите Enter для начала аутентификации, Esc для возврата",
+  "Authenticating... Please complete the login in your browser.":
+    "Аутентификация... Пожалуйста, завершите вход в браузере.",
+  "Press Enter or Esc to go back": "Нажмите Enter или Esc для возврата",
 
   // MCP Tool List
-  'No tools available for this server.':
-    'Для этого сервера нет доступных инструментов.',
-  destructive: 'деструктивный',
-  'read-only': 'только чтение',
-  'open-world': 'открытый мир',
-  idempotent: 'идемпотентный',
-  'Tools for {{name}}': 'Инструменты для {{name}}',
-  'Tools for {{serverName}}': 'Инструменты для {{serverName}}',
-  '{{current}}/{{total}}': '{{current}}/{{total}}',
+  "No tools available for this server.": "Для этого сервера нет доступных инструментов.",
+  destructive: "деструктивный",
+  "read-only": "только чтение",
+  "open-world": "открытый мир",
+  idempotent: "идемпотентный",
+  "Tools for {{name}}": "Инструменты для {{name}}",
+  "Tools for {{serverName}}": "Инструменты для {{serverName}}",
+  "{{current}}/{{total}}": "{{current}}/{{total}}",
 
   // MCP Tool Detail
-  required: 'обязательный',
-  Type: 'Тип',
-  Enum: 'Перечисление',
-  Parameters: 'Параметры',
-  'No tool selected': 'Инструмент не выбран',
-  Annotations: 'Аннотации',
-  Title: 'Заголовок',
-  'Read Only': 'Только чтение',
-  Destructive: 'Деструктивный',
-  Idempotent: 'Идемпотентный',
-  'Open World': 'Открытый мир',
-  Server: 'Сервер',
-  '{{region}} configuration updated successfully.':
-    'Конфигурация {{region}} успешно обновлена.',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.':
-    'Успешная аутентификация с {{region}}. API-ключ и конфигурации моделей сохранены в settings.json.',
-  'Tip: Use /model to switch between available Coding Plan models.':
-    'Совет: Используйте /model для переключения между доступными моделями Coding Plan.',
+  required: "обязательный",
+  Type: "Тип",
+  Enum: "Перечисление",
+  Parameters: "Параметры",
+  "No tool selected": "Инструмент не выбран",
+  Annotations: "Аннотации",
+  Title: "Заголовок",
+  "Read Only": "Только чтение",
+  Destructive: "Деструктивный",
+  Idempotent: "Идемпотентный",
+  "Open World": "Открытый мир",
+  Server: "Сервер",
+  "{{region}} configuration updated successfully.": "Конфигурация {{region}} успешно обновлена.",
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.":
+    "Успешная аутентификация с {{region}}. API-ключ и конфигурации моделей сохранены в settings.json.",
+  "Tip: Use /model to switch between available Coding Plan models.":
+    "Совет: Используйте /model для переключения между доступными моделями Coding Plan.",
 
   // ============================================================================
   // Ask User Question Tool
   // ============================================================================
-  'Please answer the following question(s):':
-    'Пожалуйста, ответьте на следующий(ие) вопрос(ы):',
-  'Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.':
-    'Невозможно задавать вопросы пользователю в неинтерактивном режиме. Пожалуйста, запустите в интерактивном режиме для использования этого инструмента.',
-  'User declined to answer the questions.':
-    'Пользователь отказался отвечать на вопросы.',
-  'User has provided the following answers:':
-    'Пользователь предоставил следующие ответы:',
-  'Failed to process user answers:':
-    'Не удалось обработать ответы пользователя:',
-  'Type something...': 'Введите что-то...',
-  Submit: 'Отправить',
-  'Submit answers': 'Отправить ответы',
-  Cancel: 'Отмена',
-  'Your answers:': 'Ваши ответы:',
-  '(not answered)': '(не отвечено)',
-  'Ready to submit your answers?': 'Готовы отправить свои ответы?',
-  '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select':
-    '↑/↓: Навигация | ←/→: Переключение вкладок | Enter: Выбор',
-  '↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Навигация | ←/→: Переключение вкладок | Space/Enter: Переключить | Esc: Отмена',
-  '↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: Навигация | Space/Enter: Переключить | Esc: Отмена',
-  '↑/↓: Navigate | Enter: Select | Esc: Cancel':
-    '↑/↓: Навигация | Enter: Выбор | Esc: Отмена',
+  "Please answer the following question(s):": "Пожалуйста, ответьте на следующий(ие) вопрос(ы):",
+  "Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.":
+    "Невозможно задавать вопросы пользователю в неинтерактивном режиме. Пожалуйста, запустите в интерактивном режиме для использования этого инструмента.",
+  "User declined to answer the questions.": "Пользователь отказался отвечать на вопросы.",
+  "User has provided the following answers:": "Пользователь предоставил следующие ответы:",
+  "Failed to process user answers:": "Не удалось обработать ответы пользователя:",
+  "Type something...": "Введите что-то...",
+  Submit: "Отправить",
+  "Submit answers": "Отправить ответы",
+  Cancel: "Отмена",
+  "Your answers:": "Ваши ответы:",
+  "(not answered)": "(не отвечено)",
+  "Ready to submit your answers?": "Готовы отправить свои ответы?",
+  "↑/↓: Navigate | ←/→: Switch tabs | Enter: Select":
+    "↑/↓: Навигация | ←/→: Переключение вкладок | Enter: Выбор",
+  "↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Навигация | ←/→: Переключение вкладок | Space/Enter: Переключить | Esc: Отмена",
+  "↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: Навигация | Space/Enter: Переключить | Esc: Отмена",
+  "↑/↓: Navigate | Enter: Select | Esc: Cancel": "↑/↓: Навигация | Enter: Выбор | Esc: Отмена",
 
   // ============================================================================
   // Commands - Auth
   // ============================================================================
-  'Authenticate using Alibaba Cloud Coding Plan':
-    'Аутентификация через Alibaba Cloud Coding Plan',
-  'Region for Coding Plan (china/global)':
-    'Регион для Coding Plan (china/global)',
-  'API key for Coding Plan': 'API-ключ для Coding Plan',
-  'Show current authentication status':
-    'Показать текущий статус аутентификации',
-  'Authentication completed successfully.': 'Аутентификация успешно завершена.',
-  'Processing Alibaba Cloud Coding Plan authentication...':
-    'Обработка аутентификации Alibaba Cloud Coding Plan...',
-  'Successfully authenticated with Alibaba Cloud Coding Plan.':
-    'Успешная аутентификация через Alibaba Cloud Coding Plan.',
-  'Failed to authenticate with Coding Plan: {{error}}':
-    'Ошибка аутентификации через Coding Plan: {{error}}',
-  '中国 (China)': '中国 (China)',
-  '阿里云百炼 (aliyun.com)': '阿里云百炼 (aliyun.com)',
-  Global: 'Глобальный',
-  'Alibaba Cloud (alibabacloud.com)': 'Alibaba Cloud (alibabacloud.com)',
-  'Select region for Coding Plan:': 'Выберите регион для Coding Plan:',
-  'Enter your Coding Plan API key: ': 'Введите ваш API-ключ Coding Plan: ',
-  'Select authentication method:': 'Выберите метод аутентификации:',
-  '\n=== Authentication Status ===\n': '\n=== Статус аутентификации ===\n',
-  '⚠️  No authentication method configured.\n':
-    '⚠️  Метод аутентификации не настроен.\n',
-  'Run one of the following commands to get started:\n':
-    'Выполните одну из следующих команд для начала:\n',
-  '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n':
-    '  qwen auth coding-plan      - Аутентификация через Alibaba Cloud Coding Plan\n',
-  'Or simply run:': 'Или просто выполните:',
-  '  qwen auth                - Interactive authentication setup\n':
-    '  qwen auth                - Интерактивная настройка аутентификации\n',
-  '✓ Authentication Method: Alibaba Cloud Coding Plan':
-    '✓ Метод аутентификации: Alibaba Cloud Coding Plan',
-  '中国 (China) - 阿里云百炼': '中国 (China) - 阿里云百炼',
-  'Global - Alibaba Cloud': 'Глобальный - Alibaba Cloud',
-  '  Region: {{region}}': '  Регион: {{region}}',
-  '  Current Model: {{model}}': '  Текущая модель: {{model}}',
-  '  Config Version: {{version}}': '  Версия конфигурации: {{version}}',
-  '  Status: API key configured\n': '  Статус: API-ключ настроен\n',
-  '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)':
-    '⚠️  Метод аутентификации: Alibaba Cloud Coding Plan (Не завершён)',
-  '  Issue: API key not found in environment or settings\n':
-    '  Проблема: API-ключ не найден в окружении или настройках\n',
-  '  Run `qwen auth coding-plan` to re-configure.\n':
-    '  Выполните `qwen auth coding-plan` для повторной настройки.\n',
-  '✓ Authentication Method: {{type}}': '✓ Метод аутентификации: {{type}}',
-  '  Status: Configured\n': '  Статус: Настроено\n',
-  'Failed to check authentication status: {{error}}':
-    'Не удалось проверить статус аутентификации: {{error}}',
-  'Select an option:': 'Выберите вариант:',
-  'Raw mode not available. Please run in an interactive terminal.':
-    'Raw-режим недоступен. Пожалуйста, запустите в интерактивном терминале.',
-  '(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n':
-    '(↑ ↓ стрелки для навигации, Enter для выбора, Ctrl+C для выхода)\n',
-  verbose: 'подробный',
-  'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).':
-    'Показывать полный вывод инструментов и процесс рассуждений в подробном режиме (переключить с помощью Ctrl+O).',
-  'Press Ctrl+O to show full tool output':
-    'Нажмите Ctrl+O для показа полного вывода инструментов',
+  "Authenticate using Alibaba Cloud Coding Plan": "Аутентификация через Alibaba Cloud Coding Plan",
+  "Region for Coding Plan (china/global)": "Регион для Coding Plan (china/global)",
+  "API key for Coding Plan": "API-ключ для Coding Plan",
+  "Show current authentication status": "Показать текущий статус аутентификации",
+  "Authentication completed successfully.": "Аутентификация успешно завершена.",
+  "Processing Alibaba Cloud Coding Plan authentication...":
+    "Обработка аутентификации Alibaba Cloud Coding Plan...",
+  "Successfully authenticated with Alibaba Cloud Coding Plan.":
+    "Успешная аутентификация через Alibaba Cloud Coding Plan.",
+  "Failed to authenticate with Coding Plan: {{error}}":
+    "Ошибка аутентификации через Coding Plan: {{error}}",
+  "中国 (China)": "中国 (China)",
+  "阿里云百炼 (aliyun.com)": "阿里云百炼 (aliyun.com)",
+  Global: "Глобальный",
+  "Alibaba Cloud (alibabacloud.com)": "Alibaba Cloud (alibabacloud.com)",
+  "Select region for Coding Plan:": "Выберите регион для Coding Plan:",
+  "Enter your Coding Plan API key: ": "Введите ваш API-ключ Coding Plan: ",
+  "Select authentication method:": "Выберите метод аутентификации:",
+  "\n=== Authentication Status ===\n": "\n=== Статус аутентификации ===\n",
+  "⚠️  No authentication method configured.\n": "⚠️  Метод аутентификации не настроен.\n",
+  "Run one of the following commands to get started:\n":
+    "Выполните одну из следующих команд для начала:\n",
+  "  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n":
+    "  qwen auth coding-plan      - Аутентификация через Alibaba Cloud Coding Plan\n",
+  "Or simply run:": "Или просто выполните:",
+  "  qwen auth                - Interactive authentication setup\n":
+    "  qwen auth                - Интерактивная настройка аутентификации\n",
+  "✓ Authentication Method: Alibaba Cloud Coding Plan":
+    "✓ Метод аутентификации: Alibaba Cloud Coding Plan",
+  "中国 (China) - 阿里云百炼": "中国 (China) - 阿里云百炼",
+  "Global - Alibaba Cloud": "Глобальный - Alibaba Cloud",
+  "  Region: {{region}}": "  Регион: {{region}}",
+  "  Current Model: {{model}}": "  Текущая модель: {{model}}",
+  "  Config Version: {{version}}": "  Версия конфигурации: {{version}}",
+  "  Status: API key configured\n": "  Статус: API-ключ настроен\n",
+  "⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)":
+    "⚠️  Метод аутентификации: Alibaba Cloud Coding Plan (Не завершён)",
+  "  Issue: API key not found in environment or settings\n":
+    "  Проблема: API-ключ не найден в окружении или настройках\n",
+  "  Run `qwen auth coding-plan` to re-configure.\n":
+    "  Выполните `qwen auth coding-plan` для повторной настройки.\n",
+  "✓ Authentication Method: {{type}}": "✓ Метод аутентификации: {{type}}",
+  "  Status: Configured\n": "  Статус: Настроено\n",
+  "Failed to check authentication status: {{error}}":
+    "Не удалось проверить статус аутентификации: {{error}}",
+  "Select an option:": "Выберите вариант:",
+  "Raw mode not available. Please run in an interactive terminal.":
+    "Raw-режим недоступен. Пожалуйста, запустите в интерактивном терминале.",
+  "(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n":
+    "(↑ ↓ стрелки для навигации, Enter для выбора, Ctrl+C для выхода)\n",
+  verbose: "подробный",
+  "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).":
+    "Показывать полный вывод инструментов и процесс рассуждений в подробном режиме (переключить с помощью Ctrl+O).",
+  "Press Ctrl+O to show full tool output": "Нажмите Ctrl+O для показа полного вывода инструментов",
 
-  'Switch to plan mode or exit plan mode':
-    'Switch to plan mode or exit plan mode',
-  'Exited plan mode. Previous approval mode restored.':
-    'Exited plan mode. Previous approval mode restored.',
-  'Enabled plan mode. The agent will analyze and plan without executing tools.':
-    'Enabled plan mode. The agent will analyze and plan without executing tools.',
+  "Switch to plan mode or exit plan mode": "Switch to plan mode or exit plan mode",
+  "Exited plan mode. Previous approval mode restored.":
+    "Exited plan mode. Previous approval mode restored.",
+  "Enabled plan mode. The agent will analyze and plan without executing tools.":
+    "Enabled plan mode. The agent will analyze and plan without executing tools.",
   'Already in plan mode. Use "/plan exit" to exit plan mode.':
     'Already in plan mode. Use "/plan exit" to exit plan mode.',
   'Not in plan mode. Use "/plan" to enter plan mode first.':
diff --git a/apps/airiscode-cli/src/i18n/locales/zh.js b/apps/airiscode-cli/src/i18n/locales/zh.js
index a73f686bd..5413d1231 100644
--- a/apps/airiscode-cli/src/i18n/locales/zh.js
+++ b/apps/airiscode-cli/src/i18n/locales/zh.js
@@ -11,1172 +11,1066 @@ export default {
   // Help / UI Components
   // ============================================================================
   // Attachment hints
-  '↑ to manage attachments': '↑ 管理附件',
-  '← → select, Delete to remove, ↓ to exit': '← → 选择，Delete 删除，↓ 退出',
-  'Attachments: ': '附件：',
+  "↑ to manage attachments": "↑ 管理附件",
+  "← → select, Delete to remove, ↓ to exit": "← → 选择，Delete 删除，↓ 退出",
+  "Attachments: ": "附件：",
 
-  'Basics:': '基础功能：',
-  'Add context': '添加上下文',
-  'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.':
-    '使用 {{symbol}} 指定文件作为上下文（例如，{{example}}），用于定位特定文件或文件夹',
-  '@': '@',
-  '@src/myFile.ts': '@src/myFile.ts',
-  'Shell mode': 'Shell 模式',
-  'YOLO mode': 'YOLO 模式',
-  'plan mode': '规划模式',
-  'auto-accept edits': '自动接受编辑',
-  'Accepting edits': '接受编辑',
-  '(shift + tab to cycle)': '(shift + tab 切换)',
-  '(tab to cycle)': '(按 tab 切换)',
-  'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).':
-    '通过 {{symbol}} 执行 shell 命令（例如，{{example1}}）或使用自然语言（例如，{{example2}}）',
-  '!': '!',
-  '!npm run start': '!npm run start',
-  'start server': 'start server',
-  'Commands:': '命令：',
-  'shell command': 'shell 命令',
-  'Model Context Protocol command (from external servers)':
-    '模型上下文协议命令（来自外部服务器）',
-  'Keyboard Shortcuts:': '键盘快捷键：',
-  'Toggle this help display': '切换此帮助显示',
-  'Toggle shell mode': '切换命令行模式',
-  'Open command menu': '打开命令菜单',
-  'Add file context': '添加文件上下文',
-  'Accept suggestion / Autocomplete': '接受建议 / 自动补全',
-  'Reverse search history': '反向搜索历史',
-  'Press ? again to close': '再次按 ? 关闭',
+  "Basics:": "基础功能：",
+  "Add context": "添加上下文",
+  "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.":
+    "使用 {{symbol}} 指定文件作为上下文（例如，{{example}}），用于定位特定文件或文件夹",
+  "@": "@",
+  "@src/myFile.ts": "@src/myFile.ts",
+  "Shell mode": "Shell 模式",
+  "YOLO mode": "YOLO 模式",
+  "plan mode": "规划模式",
+  "auto-accept edits": "自动接受编辑",
+  "Accepting edits": "接受编辑",
+  "(shift + tab to cycle)": "(shift + tab 切换)",
+  "(tab to cycle)": "(按 tab 切换)",
+  "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).":
+    "通过 {{symbol}} 执行 shell 命令（例如，{{example1}}）或使用自然语言（例如，{{example2}}）",
+  "!": "!",
+  "!npm run start": "!npm run start",
+  "start server": "start server",
+  "Commands:": "命令：",
+  "shell command": "shell 命令",
+  "Model Context Protocol command (from external servers)": "模型上下文协议命令（来自外部服务器）",
+  "Keyboard Shortcuts:": "键盘快捷键：",
+  "Toggle this help display": "切换此帮助显示",
+  "Toggle shell mode": "切换命令行模式",
+  "Open command menu": "打开命令菜单",
+  "Add file context": "添加文件上下文",
+  "Accept suggestion / Autocomplete": "接受建议 / 自动补全",
+  "Reverse search history": "反向搜索历史",
+  "Press ? again to close": "再次按 ? 关闭",
   // Keyboard shortcuts panel descriptions
-  'for shell mode': '命令行模式',
-  'for commands': '命令菜单',
-  'for file paths': '文件路径',
-  'to clear input': '清空输入',
-  'to cycle approvals': '切换审批模式',
-  'to quit': '退出',
-  'for newline': '换行',
-  'to clear screen': '清屏',
-  'to search history': '搜索历史',
-  'to paste images': '粘贴图片',
-  'for external editor': '外部编辑器',
-  'Jump through words in the input': '在输入中按单词跳转',
-  'Close dialogs, cancel requests, or quit application':
-    '关闭对话框、取消请求或退出应用程序',
-  'New line': '换行',
-  'New line (Alt+Enter works for certain linux distros)':
-    '换行（某些 Linux 发行版支持 Alt+Enter）',
-  'Clear the screen': '清屏',
-  'Open input in external editor': '在外部编辑器中打开输入',
-  'Send message': '发送消息',
-  'Initializing...': '正在初始化...',
-  'Connecting to MCP servers... ({{connected}}/{{total}})':
-    '正在连接到 MCP 服务器... ({{connected}}/{{total}})',
-  'Type your message or @path/to/file': '输入您的消息或 @ 文件路径',
-  '? for shortcuts': '按 ? 查看快捷键',
+  "for shell mode": "命令行模式",
+  "for commands": "命令菜单",
+  "for file paths": "文件路径",
+  "to clear input": "清空输入",
+  "to cycle approvals": "切换审批模式",
+  "to quit": "退出",
+  "for newline": "换行",
+  "to clear screen": "清屏",
+  "to search history": "搜索历史",
+  "to paste images": "粘贴图片",
+  "for external editor": "外部编辑器",
+  "Jump through words in the input": "在输入中按单词跳转",
+  "Close dialogs, cancel requests, or quit application": "关闭对话框、取消请求或退出应用程序",
+  "New line": "换行",
+  "New line (Alt+Enter works for certain linux distros)": "换行（某些 Linux 发行版支持 Alt+Enter）",
+  "Clear the screen": "清屏",
+  "Open input in external editor": "在外部编辑器中打开输入",
+  "Send message": "发送消息",
+  "Initializing...": "正在初始化...",
+  "Connecting to MCP servers... ({{connected}}/{{total}})":
+    "正在连接到 MCP 服务器... ({{connected}}/{{total}})",
+  "Type your message or @path/to/file": "输入您的消息或 @ 文件路径",
+  "? for shortcuts": "按 ? 查看快捷键",
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "按 'i' 进入插入模式，按 'Esc' 进入普通模式",
-  'Cancel operation / Clear input (double press)':
-    '取消操作 / 清空输入（双击）',
-  'Cycle approval modes': '循环切换审批模式',
-  'Cycle through your prompt history': '循环浏览提示历史',
-  'For a full list of shortcuts, see {{docPath}}':
-    '完整快捷键列表，请参阅 {{docPath}}',
-  'docs/keyboard-shortcuts.md': 'docs/keyboard-shortcuts.md',
-  'for help on Qwen Code': '获取 Qwen Code 帮助',
-  'show version info': '显示版本信息',
-  'submit a bug report': '提交错误报告',
-  'About Qwen Code': '关于 Qwen Code',
-  Status: '状态',
+  "Cancel operation / Clear input (double press)": "取消操作 / 清空输入（双击）",
+  "Cycle approval modes": "循环切换审批模式",
+  "Cycle through your prompt history": "循环浏览提示历史",
+  "For a full list of shortcuts, see {{docPath}}": "完整快捷键列表，请参阅 {{docPath}}",
+  "docs/keyboard-shortcuts.md": "docs/keyboard-shortcuts.md",
+  "for help on Qwen Code": "获取 Qwen Code 帮助",
+  "show version info": "显示版本信息",
+  "submit a bug report": "提交错误报告",
+  "About Qwen Code": "关于 Qwen Code",
+  Status: "状态",
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
-  'Qwen Code': 'Qwen Code',
-  Runtime: '运行环境',
-  OS: '操作系统',
-  Auth: '认证',
-  'CLI Version': 'CLI 版本',
-  'Git Commit': 'Git 提交',
-  Model: '模型',
-  'Fast Model': '快速模型',
-  Sandbox: '沙箱',
-  'OS Platform': '操作系统平台',
-  'OS Arch': '操作系统架构',
-  'OS Release': '操作系统版本',
-  'Node.js Version': 'Node.js 版本',
-  'NPM Version': 'NPM 版本',
-  'Session ID': '会话 ID',
-  'Auth Method': '认证方式',
-  'Base URL': '基础 URL',
-  Proxy: '代理',
-  'Memory Usage': '内存使用',
-  'IDE Client': 'IDE 客户端',
+  "Qwen Code": "Qwen Code",
+  Runtime: "运行环境",
+  OS: "操作系统",
+  Auth: "认证",
+  "CLI Version": "CLI 版本",
+  "Git Commit": "Git 提交",
+  Model: "模型",
+  "Fast Model": "快速模型",
+  Sandbox: "沙箱",
+  "OS Platform": "操作系统平台",
+  "OS Arch": "操作系统架构",
+  "OS Release": "操作系统版本",
+  "Node.js Version": "Node.js 版本",
+  "NPM Version": "NPM 版本",
+  "Session ID": "会话 ID",
+  "Auth Method": "认证方式",
+  "Base URL": "基础 URL",
+  Proxy: "代理",
+  "Memory Usage": "内存使用",
+  "IDE Client": "IDE 客户端",
 
   // ============================================================================
   // Commands - General
   // ============================================================================
-  'Analyzes the project and creates a tailored QWEN.md file.':
-    '分析项目并创建定制的 QWEN.md 文件',
-  'List available Qwen Code tools. Usage: /tools [desc]':
-    '列出可用的 Qwen Code 工具。用法：/tools [desc]',
-  'List available skills.': '列出可用技能。',
-  'Available Qwen Code CLI tools:': '可用的 Qwen Code CLI 工具：',
-  'No tools available': '没有可用工具',
-  'View or change the approval mode for tool usage':
-    '查看或更改工具使用的审批模式',
+  "Analyzes the project and creates a tailored QWEN.md file.": "分析项目并创建定制的 QWEN.md 文件",
+  "List available Qwen Code tools. Usage: /tools [desc]":
+    "列出可用的 Qwen Code 工具。用法：/tools [desc]",
+  "List available skills.": "列出可用技能。",
+  "Available Qwen Code CLI tools:": "可用的 Qwen Code CLI 工具：",
+  "No tools available": "没有可用工具",
+  "View or change the approval mode for tool usage": "查看或更改工具使用的审批模式",
   'Invalid approval mode "{{arg}}". Valid modes: {{modes}}':
     '无效的审批模式 "{{arg}}"。有效模式：{{modes}}',
   'Approval mode set to "{{mode}}"': '审批模式已设置为 "{{mode}}"',
-  'View or change the language setting': '查看或更改语言设置',
-  'change the theme': '更改主题',
-  'Select Theme': '选择主题',
-  Preview: '预览',
-  '(Use Enter to select, Tab to configure scope)':
-    '（使用 Enter 选择，Tab 配置作用域）',
-  '(Use Enter to apply scope, Tab to go back)':
-    '（使用 Enter 应用作用域，Tab 返回）',
-  'Theme configuration unavailable due to NO_COLOR env variable.':
-    '由于 NO_COLOR 环境变量，主题配置不可用。',
+  "View or change the language setting": "查看或更改语言设置",
+  "change the theme": "更改主题",
+  "Select Theme": "选择主题",
+  Preview: "预览",
+  "(Use Enter to select, Tab to configure scope)": "（使用 Enter 选择，Tab 配置作用域）",
+  "(Use Enter to apply scope, Tab to go back)": "（使用 Enter 应用作用域，Tab 返回）",
+  "Theme configuration unavailable due to NO_COLOR env variable.":
+    "由于 NO_COLOR 环境变量，主题配置不可用。",
   'Theme "{{themeName}}" not found.': '未找到主题 "{{themeName}}"。',
   'Theme "{{themeName}}" not found in selected scope.':
     '在所选作用域中未找到主题 "{{themeName}}"。',
-  'Clear conversation history and free up context': '清除对话历史并释放上下文',
-  'Compresses the context by replacing it with a summary.':
-    '通过摘要替换来压缩上下文',
-  'open full Qwen Code documentation in your browser':
-    '在浏览器中打开完整的 Qwen Code 文档',
-  'Configuration not available.': '配置不可用',
-  'change the auth method': '更改认证方法',
-  'Configure authentication information for login': '配置登录认证信息',
-  'Copy the last result or code snippet to clipboard':
-    '将最后的结果或代码片段复制到剪贴板',
+  "Clear conversation history and free up context": "清除对话历史并释放上下文",
+  "Compresses the context by replacing it with a summary.": "通过摘要替换来压缩上下文",
+  "open full Qwen Code documentation in your browser": "在浏览器中打开完整的 Qwen Code 文档",
+  "Configuration not available.": "配置不可用",
+  "change the auth method": "更改认证方法",
+  "Configure authentication information for login": "配置登录认证信息",
+  "Copy the last result or code snippet to clipboard": "将最后的结果或代码片段复制到剪贴板",
 
   // ============================================================================
   // Commands - Agents
   // ============================================================================
-  'Manage subagents for specialized task delegation.':
-    '管理用于专门任务委派的子智能体',
-  'Manage existing subagents (view, edit, delete).':
-    '管理现有子智能体（查看、编辑、删除）',
-  'Create a new subagent with guided setup.': '通过引导式设置创建新的子智能体',
+  "Manage subagents for specialized task delegation.": "管理用于专门任务委派的子智能体",
+  "Manage existing subagents (view, edit, delete).": "管理现有子智能体（查看、编辑、删除）",
+  "Create a new subagent with guided setup.": "通过引导式设置创建新的子智能体",
 
   // ============================================================================
   // Agents - Management Dialog
   // ============================================================================
-  Agents: '智能体',
-  'Choose Action': '选择操作',
-  'Edit {{name}}': '编辑 {{name}}',
-  'Edit Tools: {{name}}': '编辑工具: {{name}}',
-  'Edit Color: {{name}}': '编辑颜色: {{name}}',
-  'Delete {{name}}': '删除 {{name}}',
-  'Unknown Step': '未知步骤',
-  'Esc to close': '按 Esc 关闭',
-  'Enter to select, ↑↓ to navigate, Esc to close':
-    'Enter 选择，↑↓ 导航，Esc 关闭',
-  'Esc to go back': '按 Esc 返回',
-  'Enter to confirm, Esc to cancel': 'Enter 确认，Esc 取消',
-  'Enter to select, ↑↓ to navigate, Esc to go back':
-    'Enter 选择，↑↓ 导航，Esc 返回',
-  'Enter to submit, Esc to go back': 'Enter 提交，Esc 返回',
-  'Invalid step: {{step}}': '无效步骤: {{step}}',
-  'No subagents found.': '未找到子智能体。',
+  Agents: "智能体",
+  "Choose Action": "选择操作",
+  "Edit {{name}}": "编辑 {{name}}",
+  "Edit Tools: {{name}}": "编辑工具: {{name}}",
+  "Edit Color: {{name}}": "编辑颜色: {{name}}",
+  "Delete {{name}}": "删除 {{name}}",
+  "Unknown Step": "未知步骤",
+  "Esc to close": "按 Esc 关闭",
+  "Enter to select, ↑↓ to navigate, Esc to close": "Enter 选择，↑↓ 导航，Esc 关闭",
+  "Esc to go back": "按 Esc 返回",
+  "Enter to confirm, Esc to cancel": "Enter 确认，Esc 取消",
+  "Enter to select, ↑↓ to navigate, Esc to go back": "Enter 选择，↑↓ 导航，Esc 返回",
+  "Enter to submit, Esc to go back": "Enter 提交，Esc 返回",
+  "Invalid step: {{step}}": "无效步骤: {{step}}",
+  "No subagents found.": "未找到子智能体。",
   "Use '/agents create' to create your first subagent.":
     "使用 '/agents create' 创建您的第一个子智能体。",
-  '(built-in)': '（内置）',
-  '(overridden by project level agent)': '（已被项目级智能体覆盖）',
-  'Project Level ({{path}})': '项目级 ({{path}})',
-  'User Level ({{path}})': '用户级 ({{path}})',
-  'Built-in Agents': '内置智能体',
-  'Extension Agents': '扩展智能体',
-  'Using: {{count}} agents': '使用中: {{count}} 个智能体',
-  'View Agent': '查看智能体',
-  'Edit Agent': '编辑智能体',
-  'Delete Agent': '删除智能体',
-  Back: '返回',
-  'No agent selected': '未选择智能体',
-  'File Path: ': '文件路径: ',
-  'Tools: ': '工具: ',
-  'Color: ': '颜色: ',
-  'Description:': '描述:',
-  'System Prompt:': '系统提示:',
-  'Open in editor': '在编辑器中打开',
-  'Edit tools': '编辑工具',
-  'Edit color': '编辑颜色',
-  '❌ Error:': '❌ 错误:',
-  'Are you sure you want to delete agent "{{name}}"?':
-    '您确定要删除智能体 "{{name}}" 吗？',
+  "(built-in)": "（内置）",
+  "(overridden by project level agent)": "（已被项目级智能体覆盖）",
+  "Project Level ({{path}})": "项目级 ({{path}})",
+  "User Level ({{path}})": "用户级 ({{path}})",
+  "Built-in Agents": "内置智能体",
+  "Extension Agents": "扩展智能体",
+  "Using: {{count}} agents": "使用中: {{count}} 个智能体",
+  "View Agent": "查看智能体",
+  "Edit Agent": "编辑智能体",
+  "Delete Agent": "删除智能体",
+  Back: "返回",
+  "No agent selected": "未选择智能体",
+  "File Path: ": "文件路径: ",
+  "Tools: ": "工具: ",
+  "Color: ": "颜色: ",
+  "Description:": "描述:",
+  "System Prompt:": "系统提示:",
+  "Open in editor": "在编辑器中打开",
+  "Edit tools": "编辑工具",
+  "Edit color": "编辑颜色",
+  "❌ Error:": "❌ 错误:",
+  'Are you sure you want to delete agent "{{name}}"?': '您确定要删除智能体 "{{name}}" 吗？',
   // ============================================================================
   // Agents - Creation Wizard
   // ============================================================================
-  'Project Level (.qwen/agents/)': '项目级 (.qwen/agents/)',
-  'User Level (~/.qwen/agents/)': '用户级 (~/.qwen/agents/)',
-  '✅ Subagent Created Successfully!': '✅ 子智能体创建成功！',
+  "Project Level (.qwen/agents/)": "项目级 (.qwen/agents/)",
+  "User Level (~/.qwen/agents/)": "用户级 (~/.qwen/agents/)",
+  "✅ Subagent Created Successfully!": "✅ 子智能体创建成功！",
   'Subagent "{{name}}" has been saved to {{level}} level.':
     '子智能体 "{{name}}" 已保存到 {{level}} 级别。',
-  'Name: ': '名称: ',
-  'Location: ': '位置: ',
-  '❌ Error saving subagent:': '❌ 保存子智能体时出错:',
-  'Warnings:': '警告:',
+  "Name: ": "名称: ",
+  "Location: ": "位置: ",
+  "❌ Error saving subagent:": "❌ 保存子智能体时出错:",
+  "Warnings:": "警告:",
   'Name "{{name}}" already exists at {{level}} level - will overwrite existing subagent':
     '名称 "{{name}}" 在 {{level}} 级别已存在 - 将覆盖现有子智能体',
   'Name "{{name}}" exists at user level - project level will take precedence':
     '名称 "{{name}}" 在用户级别存在 - 项目级别将优先',
   'Name "{{name}}" exists at project level - existing subagent will take precedence':
     '名称 "{{name}}" 在项目级别存在 - 现有子智能体将优先',
-  'Description is over {{length}} characters': '描述超过 {{length}} 个字符',
-  'System prompt is over {{length}} characters':
-    '系统提示超过 {{length}} 个字符',
+  "Description is over {{length}} characters": "描述超过 {{length}} 个字符",
+  "System prompt is over {{length}} characters": "系统提示超过 {{length}} 个字符",
   // Agents - Creation Wizard Steps
-  'Step {{n}}: Choose Location': '步骤 {{n}}: 选择位置',
-  'Step {{n}}: Choose Generation Method': '步骤 {{n}}: 选择生成方式',
-  'Generate with Qwen Code (Recommended)': '使用 Qwen Code 生成（推荐）',
-  'Manual Creation': '手动创建',
-  'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)':
-    '描述此子智能体应该做什么以及何时使用它。（为了获得最佳效果，请全面描述）',
-  'e.g., Expert code reviewer that reviews code based on best practices...':
-    '例如：专业的代码审查员，根据最佳实践审查代码...',
-  'Generating subagent configuration...': '正在生成子智能体配置...',
-  'Failed to generate subagent: {{error}}': '生成子智能体失败: {{error}}',
-  'Step {{n}}: Describe Your Subagent': '步骤 {{n}}: 描述您的子智能体',
-  'Step {{n}}: Enter Subagent Name': '步骤 {{n}}: 输入子智能体名称',
-  'Step {{n}}: Enter System Prompt': '步骤 {{n}}: 输入系统提示',
-  'Step {{n}}: Enter Description': '步骤 {{n}}: 输入描述',
+  "Step {{n}}: Choose Location": "步骤 {{n}}: 选择位置",
+  "Step {{n}}: Choose Generation Method": "步骤 {{n}}: 选择生成方式",
+  "Generate with Qwen Code (Recommended)": "使用 Qwen Code 生成（推荐）",
+  "Manual Creation": "手动创建",
+  "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)":
+    "描述此子智能体应该做什么以及何时使用它。（为了获得最佳效果，请全面描述）",
+  "e.g., Expert code reviewer that reviews code based on best practices...":
+    "例如：专业的代码审查员，根据最佳实践审查代码...",
+  "Generating subagent configuration...": "正在生成子智能体配置...",
+  "Failed to generate subagent: {{error}}": "生成子智能体失败: {{error}}",
+  "Step {{n}}: Describe Your Subagent": "步骤 {{n}}: 描述您的子智能体",
+  "Step {{n}}: Enter Subagent Name": "步骤 {{n}}: 输入子智能体名称",
+  "Step {{n}}: Enter System Prompt": "步骤 {{n}}: 输入系统提示",
+  "Step {{n}}: Enter Description": "步骤 {{n}}: 输入描述",
   // Agents - Tool Selection
-  'Step {{n}}: Select Tools': '步骤 {{n}}: 选择工具',
-  'All Tools (Default)': '所有工具（默认）',
-  'All Tools': '所有工具',
-  'Read-only Tools': '只读工具',
-  'Read & Edit Tools': '读取和编辑工具',
-  'Read & Edit & Execution Tools': '读取、编辑和执行工具',
-  'All tools selected, including MCP tools': '已选择所有工具，包括 MCP 工具',
-  'Selected tools:': '已选择的工具:',
-  'Read-only tools:': '只读工具:',
-  'Edit tools:': '编辑工具:',
-  'Execution tools:': '执行工具:',
-  'Step {{n}}: Choose Background Color': '步骤 {{n}}: 选择背景颜色',
-  'Step {{n}}: Confirm and Save': '步骤 {{n}}: 确认并保存',
+  "Step {{n}}: Select Tools": "步骤 {{n}}: 选择工具",
+  "All Tools (Default)": "所有工具（默认）",
+  "All Tools": "所有工具",
+  "Read-only Tools": "只读工具",
+  "Read & Edit Tools": "读取和编辑工具",
+  "Read & Edit & Execution Tools": "读取、编辑和执行工具",
+  "All tools selected, including MCP tools": "已选择所有工具，包括 MCP 工具",
+  "Selected tools:": "已选择的工具:",
+  "Read-only tools:": "只读工具:",
+  "Edit tools:": "编辑工具:",
+  "Execution tools:": "执行工具:",
+  "Step {{n}}: Choose Background Color": "步骤 {{n}}: 选择背景颜色",
+  "Step {{n}}: Confirm and Save": "步骤 {{n}}: 确认并保存",
   // Agents - Navigation & Instructions
-  'Esc to cancel': '按 Esc 取消',
-  'Press Enter to save, e to save and edit, Esc to go back':
-    '按 Enter 保存，e 保存并编辑，Esc 返回',
-  'Press Enter to continue, {{navigation}}Esc to {{action}}':
-    '按 Enter 继续，{{navigation}}Esc {{action}}',
-  cancel: '取消',
-  'go back': '返回',
-  '↑↓ to navigate, ': '↑↓ 导航，',
-  'Enter a clear, unique name for this subagent.':
-    '为此子智能体输入一个清晰、唯一的名称。',
-  'e.g., Code Reviewer': '例如：代码审查员',
-  'Name cannot be empty.': '名称不能为空。',
+  "Esc to cancel": "按 Esc 取消",
+  "Press Enter to save, e to save and edit, Esc to go back":
+    "按 Enter 保存，e 保存并编辑，Esc 返回",
+  "Press Enter to continue, {{navigation}}Esc to {{action}}":
+    "按 Enter 继续，{{navigation}}Esc {{action}}",
+  cancel: "取消",
+  "go back": "返回",
+  "↑↓ to navigate, ": "↑↓ 导航，",
+  "Enter a clear, unique name for this subagent.": "为此子智能体输入一个清晰、唯一的名称。",
+  "e.g., Code Reviewer": "例如：代码审查员",
+  "Name cannot be empty.": "名称不能为空。",
   "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.":
-    '编写定义此子智能体行为的系统提示。为了获得最佳效果，请全面描述。',
-  'e.g., You are an expert code reviewer...':
-    '例如：您是一位专业的代码审查员...',
-  'System prompt cannot be empty.': '系统提示不能为空。',
-  'Describe when and how this subagent should be used.':
-    '描述何时以及如何使用此子智能体。',
-  'e.g., Reviews code for best practices and potential bugs.':
-    '例如：审查代码以查找最佳实践和潜在错误。',
-  'Description cannot be empty.': '描述不能为空。',
-  'Failed to launch editor: {{error}}': '启动编辑器失败: {{error}}',
-  'Failed to save and edit subagent: {{error}}':
-    '保存并编辑子智能体失败: {{error}}',
+    "编写定义此子智能体行为的系统提示。为了获得最佳效果，请全面描述。",
+  "e.g., You are an expert code reviewer...": "例如：您是一位专业的代码审查员...",
+  "System prompt cannot be empty.": "系统提示不能为空。",
+  "Describe when and how this subagent should be used.": "描述何时以及如何使用此子智能体。",
+  "e.g., Reviews code for best practices and potential bugs.":
+    "例如：审查代码以查找最佳实践和潜在错误。",
+  "Description cannot be empty.": "描述不能为空。",
+  "Failed to launch editor: {{error}}": "启动编辑器失败: {{error}}",
+  "Failed to save and edit subagent: {{error}}": "保存并编辑子智能体失败: {{error}}",
 
   // ============================================================================
   // Extensions - Management Dialog
   // ============================================================================
-  'Manage Extensions': '管理扩展',
-  'Extension Details': '扩展详情',
-  'View Extension': '查看扩展',
-  'Update Extension': '更新扩展',
-  'Disable Extension': '禁用扩展',
-  'Enable Extension': '启用扩展',
-  'Uninstall Extension': '卸载扩展',
-  'Select Scope': '选择作用域',
-  'User Scope': '用户作用域',
-  'Workspace Scope': '工作区作用域',
-  'No extensions found.': '未找到扩展。',
-  Active: '已启用',
-  Disabled: '已禁用',
-  'Update available': '有可用更新',
-  'Up to date': '已是最新',
-  'Checking...': '检查中...',
-  'Updating...': '更新中...',
-  Unknown: '未知',
-  Error: '错误',
-  'Version:': '版本：',
-  'Status:': '状态：',
-  'Are you sure you want to uninstall extension "{{name}}"?':
-    '确定要卸载扩展 "{{name}}" 吗？',
-  'This action cannot be undone.': '此操作无法撤销。',
+  "Manage Extensions": "管理扩展",
+  "Extension Details": "扩展详情",
+  "View Extension": "查看扩展",
+  "Update Extension": "更新扩展",
+  "Disable Extension": "禁用扩展",
+  "Enable Extension": "启用扩展",
+  "Uninstall Extension": "卸载扩展",
+  "Select Scope": "选择作用域",
+  "User Scope": "用户作用域",
+  "Workspace Scope": "工作区作用域",
+  "No extensions found.": "未找到扩展。",
+  Active: "已启用",
+  Disabled: "已禁用",
+  "Update available": "有可用更新",
+  "Up to date": "已是最新",
+  "Checking...": "检查中...",
+  "Updating...": "更新中...",
+  Unknown: "未知",
+  Error: "错误",
+  "Version:": "版本：",
+  "Status:": "状态：",
+  'Are you sure you want to uninstall extension "{{name}}"?': '确定要卸载扩展 "{{name}}" 吗？',
+  "This action cannot be undone.": "此操作无法撤销。",
   'Extension "{{name}}" disabled successfully.': '扩展 "{{name}}" 禁用成功。',
   'Extension "{{name}}" enabled successfully.': '扩展 "{{name}}" 启用成功。',
   'Extension "{{name}}" updated successfully.': '扩展 "{{name}}" 更新成功。',
-  'Failed to update extension "{{name}}": {{error}}':
-    '更新扩展 "{{name}}" 失败：{{error}}',
-  'Select the scope for this action:': '选择此操作的作用域：',
-  'User - Applies to all projects': '用户 - 应用于所有项目',
-  'Workspace - Applies to current project only': '工作区 - 仅应用于当前项目',
+  'Failed to update extension "{{name}}": {{error}}': '更新扩展 "{{name}}" 失败：{{error}}',
+  "Select the scope for this action:": "选择此操作的作用域：",
+  "User - Applies to all projects": "用户 - 应用于所有项目",
+  "Workspace - Applies to current project only": "工作区 - 仅应用于当前项目",
   // Extension dialog - missing keys
-  'Name:': '名称：',
-  'MCP Servers:': 'MCP 服务器：',
-  'Settings:': '设置：',
-  active: '已启用',
-  'View Details': '查看详情',
-  'Update failed:': '更新失败：',
-  'Updating {{name}}...': '正在更新 {{name}}...',
-  'Update complete!': '更新完成！',
-  'User (global)': '用户（全局）',
-  'Workspace (project-specific)': '工作区（项目特定）',
+  "Name:": "名称：",
+  "MCP Servers:": "MCP 服务器：",
+  "Settings:": "设置：",
+  active: "已启用",
+  "View Details": "查看详情",
+  "Update failed:": "更新失败：",
+  "Updating {{name}}...": "正在更新 {{name}}...",
+  "Update complete!": "更新完成！",
+  "User (global)": "用户（全局）",
+  "Workspace (project-specific)": "工作区（项目特定）",
   'Disable "{{name}}" - Select Scope': '禁用 "{{name}}" - 选择作用域',
   'Enable "{{name}}" - Select Scope': '启用 "{{name}}" - 选择作用域',
-  'No extension selected': '未选择扩展',
-  'Press Y/Enter to confirm, N/Esc to cancel': '按 Y/Enter 确认，N/Esc 取消',
-  'Y/Enter to confirm, N/Esc to cancel': 'Y/Enter 确认，N/Esc 取消',
-  '{{count}} extensions installed': '已安装 {{count}} 个扩展',
+  "No extension selected": "未选择扩展",
+  "Press Y/Enter to confirm, N/Esc to cancel": "按 Y/Enter 确认，N/Esc 取消",
+  "Y/Enter to confirm, N/Esc to cancel": "Y/Enter 确认，N/Esc 取消",
+  "{{count}} extensions installed": "已安装 {{count}} 个扩展",
   "Use '/extensions install' to install your first extension.":
     "使用 '/extensions install' 安装您的第一个扩展。",
   // Update status values
-  'up to date': '已是最新',
-  'update available': '有可用更新',
-  'checking...': '检查中...',
-  'not updatable': '不可更新',
-  error: '错误',
+  "up to date": "已是最新",
+  "update available": "有可用更新",
+  "checking...": "检查中...",
+  "not updatable": "不可更新",
+  error: "错误",
 
   // ============================================================================
   // Commands - General (continued)
   // ============================================================================
-  'View and edit Qwen Code settings': '查看和编辑 Qwen Code 设置',
-  Settings: '设置',
-  'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
-    '要查看更改，必须重启 Qwen Code。按 r 退出并立即应用更改。',
+  "View and edit Qwen Code settings": "查看和编辑 Qwen Code 设置",
+  Settings: "设置",
+  "To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.":
+    "要查看更改，必须重启 Qwen Code。按 r 退出并立即应用更改。",
   'The command "/{{command}}" is not supported in non-interactive mode.':
     '不支持在非交互模式下使用命令 "/{{command}}"。',
   // ============================================================================
   // Settings Labels
   // ============================================================================
-  'Vim Mode': 'Vim 模式',
-  'Disable Auto Update': '禁用自动更新',
-  'Attribution: commit': '署名：提交',
-  'Terminal Bell Notification': '终端响铃通知',
-  'Enable Usage Statistics': '启用使用统计',
-  Theme: '主题',
-  'Preferred Editor': '首选编辑器',
-  'Auto-connect to IDE': '自动连接到 IDE',
-  'Enable Prompt Completion': '启用提示补全',
-  'Debug Keystroke Logging': '调试按键记录',
-  'Language: UI': '语言：界面',
-  'Language: Model': '语言：模型',
-  'Output Format': '输出格式',
-  'Hide Window Title': '隐藏窗口标题',
-  'Show Status in Title': '在标题中显示状态',
-  'Hide Tips': '隐藏提示',
-  'Show Line Numbers in Code': '在代码中显示行号',
-  'Show Citations': '显示引用',
-  'Custom Witty Phrases': '自定义诙谐短语',
-  'Show Welcome Back Dialog': '显示欢迎回来对话框',
-  'Enable User Feedback': '启用用户反馈',
-  'How is Qwen doing this session? (optional)': 'Qwen 这次表现如何？（可选）',
-  Bad: '不满意',
-  Fine: '还行',
-  Good: '满意',
-  Dismiss: '忽略',
-  'Not Sure Yet': '暂不评价',
-  'Any other key': '任意其他键',
-  'Disable Loading Phrases': '禁用加载短语',
-  'Screen Reader Mode': '屏幕阅读器模式',
-  'IDE Mode': 'IDE 模式',
-  'Max Session Turns': '最大会话轮次',
-  'Skip Next Speaker Check': '跳过下一个说话者检查',
-  'Skip Loop Detection': '跳过循环检测',
-  'Skip Startup Context': '跳过启动上下文',
-  'Enable OpenAI Logging': '启用 OpenAI 日志',
-  'OpenAI Logging Directory': 'OpenAI 日志目录',
-  Timeout: '超时',
-  'Max Retries': '最大重试次数',
-  'Disable Cache Control': '禁用缓存控制',
-  'Memory Discovery Max Dirs': '内存发现最大目录数',
-  'Load Memory From Include Directories': '从包含目录加载内存',
-  'Respect .gitignore': '遵守 .gitignore',
-  'Respect .qwenignore': '遵守 .qwenignore',
-  'Enable Recursive File Search': '启用递归文件搜索',
-  'Disable Fuzzy Search': '禁用模糊搜索',
-  'Interactive Shell (PTY)': '交互式 Shell (PTY)',
-  'Show Color': '显示颜色',
-  'Auto Accept': '自动接受',
-  'Use Ripgrep': '使用 Ripgrep',
-  'Use Builtin Ripgrep': '使用内置 Ripgrep',
-  'Enable Tool Output Truncation': '启用工具输出截断',
-  'Tool Output Truncation Threshold': '工具输出截断阈值',
-  'Tool Output Truncation Lines': '工具输出截断行数',
-  'Folder Trust': '文件夹信任',
-  'Vision Model Preview': '视觉模型预览',
-  'Tool Schema Compliance': '工具 Schema 兼容性',
+  "Vim Mode": "Vim 模式",
+  "Disable Auto Update": "禁用自动更新",
+  "Attribution: commit": "署名：提交",
+  "Terminal Bell Notification": "终端响铃通知",
+  "Enable Usage Statistics": "启用使用统计",
+  Theme: "主题",
+  "Preferred Editor": "首选编辑器",
+  "Auto-connect to IDE": "自动连接到 IDE",
+  "Enable Prompt Completion": "启用提示补全",
+  "Debug Keystroke Logging": "调试按键记录",
+  "Language: UI": "语言：界面",
+  "Language: Model": "语言：模型",
+  "Output Format": "输出格式",
+  "Hide Window Title": "隐藏窗口标题",
+  "Show Status in Title": "在标题中显示状态",
+  "Hide Tips": "隐藏提示",
+  "Show Line Numbers in Code": "在代码中显示行号",
+  "Show Citations": "显示引用",
+  "Custom Witty Phrases": "自定义诙谐短语",
+  "Show Welcome Back Dialog": "显示欢迎回来对话框",
+  "Enable User Feedback": "启用用户反馈",
+  "How is Qwen doing this session? (optional)": "Qwen 这次表现如何？（可选）",
+  Bad: "不满意",
+  Fine: "还行",
+  Good: "满意",
+  Dismiss: "忽略",
+  "Not Sure Yet": "暂不评价",
+  "Any other key": "任意其他键",
+  "Disable Loading Phrases": "禁用加载短语",
+  "Screen Reader Mode": "屏幕阅读器模式",
+  "IDE Mode": "IDE 模式",
+  "Max Session Turns": "最大会话轮次",
+  "Skip Next Speaker Check": "跳过下一个说话者检查",
+  "Skip Loop Detection": "跳过循环检测",
+  "Skip Startup Context": "跳过启动上下文",
+  "Enable OpenAI Logging": "启用 OpenAI 日志",
+  "OpenAI Logging Directory": "OpenAI 日志目录",
+  Timeout: "超时",
+  "Max Retries": "最大重试次数",
+  "Disable Cache Control": "禁用缓存控制",
+  "Memory Discovery Max Dirs": "内存发现最大目录数",
+  "Load Memory From Include Directories": "从包含目录加载内存",
+  "Respect .gitignore": "遵守 .gitignore",
+  "Respect .qwenignore": "遵守 .qwenignore",
+  "Enable Recursive File Search": "启用递归文件搜索",
+  "Disable Fuzzy Search": "禁用模糊搜索",
+  "Interactive Shell (PTY)": "交互式 Shell (PTY)",
+  "Show Color": "显示颜色",
+  "Auto Accept": "自动接受",
+  "Use Ripgrep": "使用 Ripgrep",
+  "Use Builtin Ripgrep": "使用内置 Ripgrep",
+  "Enable Tool Output Truncation": "启用工具输出截断",
+  "Tool Output Truncation Threshold": "工具输出截断阈值",
+  "Tool Output Truncation Lines": "工具输出截断行数",
+  "Folder Trust": "文件夹信任",
+  "Vision Model Preview": "视觉模型预览",
+  "Tool Schema Compliance": "工具 Schema 兼容性",
   // Settings enum options
-  'Auto (detect from system)': '自动（从系统检测）',
-  Text: '文本',
-  JSON: 'JSON',
-  Plan: '规划',
-  Default: '默认',
-  'Auto Edit': '自动编辑',
-  YOLO: 'YOLO',
-  'toggle vim mode on/off': '切换 vim 模式开关',
-  'check session stats. Usage: /stats [model|tools]':
-    '检查会话统计信息。用法：/stats [model|tools]',
-  'Show model-specific usage statistics.': '显示模型相关的使用统计信息',
-  'Show tool-specific usage statistics.': '显示工具相关的使用统计信息',
-  'exit the cli': '退出命令行界面',
-  'Open MCP management dialog, or authenticate with OAuth-enabled servers':
-    '打开 MCP 管理对话框，或在支持 OAuth 的服务器上进行身份验证',
-  'List configured MCP servers and tools, or authenticate with OAuth-enabled servers':
-    '列出已配置的 MCP 服务器和工具，或使用支持 OAuth 的服务器进行身份验证',
-  'Manage workspace directories': '管理工作区目录',
-  'Add directories to the workspace. Use comma to separate multiple paths':
-    '将目录添加到工作区。使用逗号分隔多个路径',
-  'Show all directories in the workspace': '显示工作区中的所有目录',
-  'set external editor preference': '设置外部编辑器首选项',
-  'Select Editor': '选择编辑器',
-  'Editor Preference': '编辑器首选项',
-  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
-    '当前支持以下编辑器。请注意，某些编辑器无法在沙箱模式下使用。',
-  'Your preferred editor is:': '您的首选编辑器是：',
-  'Manage extensions': '管理扩展',
-  'Manage installed extensions': '管理已安装的扩展',
-  'List active extensions': '列出活动扩展',
-  'Update extensions. Usage: update <extension-names>|--all':
-    '更新扩展。用法：update <extension-names>|--all',
-  'Disable an extension': '禁用扩展',
-  'Enable an extension': '启用扩展',
-  'Install an extension from a git repo or local path':
-    '从 Git 仓库或本地路径安装扩展',
-  'Uninstall an extension': '卸载扩展',
-  'No extensions installed.': '未安装扩展。',
-  'Usage: /extensions update <extension-names>|--all':
-    '用法：/extensions update <扩展名>|--all',
+  "Auto (detect from system)": "自动（从系统检测）",
+  Text: "文本",
+  JSON: "JSON",
+  Plan: "规划",
+  Default: "默认",
+  "Auto Edit": "自动编辑",
+  YOLO: "YOLO",
+  "toggle vim mode on/off": "切换 vim 模式开关",
+  "check session stats. Usage: /stats [model|tools]":
+    "检查会话统计信息。用法：/stats [model|tools]",
+  "Show model-specific usage statistics.": "显示模型相关的使用统计信息",
+  "Show tool-specific usage statistics.": "显示工具相关的使用统计信息",
+  "exit the cli": "退出命令行界面",
+  "Open MCP management dialog, or authenticate with OAuth-enabled servers":
+    "打开 MCP 管理对话框，或在支持 OAuth 的服务器上进行身份验证",
+  "List configured MCP servers and tools, or authenticate with OAuth-enabled servers":
+    "列出已配置的 MCP 服务器和工具，或使用支持 OAuth 的服务器进行身份验证",
+  "Manage workspace directories": "管理工作区目录",
+  "Add directories to the workspace. Use comma to separate multiple paths":
+    "将目录添加到工作区。使用逗号分隔多个路径",
+  "Show all directories in the workspace": "显示工作区中的所有目录",
+  "set external editor preference": "设置外部编辑器首选项",
+  "Select Editor": "选择编辑器",
+  "Editor Preference": "编辑器首选项",
+  "These editors are currently supported. Please note that some editors cannot be used in sandbox mode.":
+    "当前支持以下编辑器。请注意，某些编辑器无法在沙箱模式下使用。",
+  "Your preferred editor is:": "您的首选编辑器是：",
+  "Manage extensions": "管理扩展",
+  "Manage installed extensions": "管理已安装的扩展",
+  "List active extensions": "列出活动扩展",
+  "Update extensions. Usage: update <extension-names>|--all":
+    "更新扩展。用法：update <extension-names>|--all",
+  "Disable an extension": "禁用扩展",
+  "Enable an extension": "启用扩展",
+  "Install an extension from a git repo or local path": "从 Git 仓库或本地路径安装扩展",
+  "Uninstall an extension": "卸载扩展",
+  "No extensions installed.": "未安装扩展。",
+  "Usage: /extensions update <extension-names>|--all": "用法：/extensions update <扩展名>|--all",
   'Extension "{{name}}" not found.': '未找到扩展 "{{name}}"。',
-  'No extensions to update.': '没有可更新的扩展。',
-  'Usage: /extensions install <source>': '用法：/extensions install <来源>',
-  'Installing extension from "{{source}}"...':
-    '正在从 "{{source}}" 安装扩展...',
+  "No extensions to update.": "没有可更新的扩展。",
+  "Usage: /extensions install <source>": "用法：/extensions install <来源>",
+  'Installing extension from "{{source}}"...': '正在从 "{{source}}" 安装扩展...',
   'Extension "{{name}}" installed successfully.': '扩展 "{{name}}" 安装成功。',
   'Failed to install extension from "{{source}}": {{error}}':
     '从 "{{source}}" 安装扩展失败：{{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    '用法：/extensions uninstall <扩展名>',
+  "Usage: /extensions uninstall <extension-name>": "用法：/extensions uninstall <扩展名>",
   'Uninstalling extension "{{name}}"...': '正在卸载扩展 "{{name}}"...',
-  'Extension "{{name}}" uninstalled successfully.':
-    '扩展 "{{name}}" 卸载成功。',
-  'Failed to uninstall extension "{{name}}": {{error}}':
-    '卸载扩展 "{{name}}" 失败：{{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    '用法：/extensions {{command}} <扩展> [--scope=<user|workspace>]',
+  'Extension "{{name}}" uninstalled successfully.': '扩展 "{{name}}" 卸载成功。',
+  'Failed to uninstall extension "{{name}}": {{error}}': '卸载扩展 "{{name}}" 失败：{{error}}',
+  "Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]":
+    "用法：/extensions {{command}} <扩展> [--scope=<user|workspace>]",
   'Unsupported scope "{{scope}}", should be one of "user" or "workspace"':
     '不支持的作用域 "{{scope}}"，应为 "user" 或 "workspace"',
   'Extension "{{name}}" disabled for scope "{{scope}}"':
     '扩展 "{{name}}" 已在作用域 "{{scope}}" 中禁用',
   'Extension "{{name}}" enabled for scope "{{scope}}"':
     '扩展 "{{name}}" 已在作用域 "{{scope}}" 中启用',
-  'Do you want to continue? [Y/n]: ': '是否继续？[Y/n]：',
-  'Do you want to continue?': '是否继续？',
+  "Do you want to continue? [Y/n]: ": "是否继续？[Y/n]：",
+  "Do you want to continue?": "是否继续？",
   'Installing extension "{{name}}".': '正在安装扩展 "{{name}}"。',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**扩展可能会引入意外行为。请确保您已调查过扩展源并信任作者。**',
-  'This extension will run the following MCP servers:':
-    '此扩展将运行以下 MCP 服务器：',
-  local: '本地',
-  remote: '远程',
-  'This extension will add the following commands: {{commands}}.':
-    '此扩展将添加以下命令：{{commands}}。',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    '此扩展将使用 {{fileName}} 向您的 QWEN.md 上下文追加信息',
-  'This extension will exclude the following core tools: {{tools}}':
-    '此扩展将排除以下核心工具：{{tools}}',
-  'This extension will install the following skills:': '此扩展将安装以下技能：',
-  'This extension will install the following subagents:':
-    '此扩展将安装以下子智能体：',
+  "**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**":
+    "**扩展可能会引入意外行为。请确保您已调查过扩展源并信任作者。**",
+  "This extension will run the following MCP servers:": "此扩展将运行以下 MCP 服务器：",
+  local: "本地",
+  remote: "远程",
+  "This extension will add the following commands: {{commands}}.":
+    "此扩展将添加以下命令：{{commands}}。",
+  "This extension will append info to your QWEN.md context using {{fileName}}":
+    "此扩展将使用 {{fileName}} 向您的 QWEN.md 上下文追加信息",
+  "This extension will exclude the following core tools: {{tools}}":
+    "此扩展将排除以下核心工具：{{tools}}",
+  "This extension will install the following skills:": "此扩展将安装以下技能：",
+  "This extension will install the following subagents:": "此扩展将安装以下子智能体：",
   'Installation cancelled for "{{name}}".': '已取消安装 "{{name}}"。',
-  'You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.':
-    '您正在安装来自 {{originSource}} 的扩展。某些功能可能无法完美兼容 Qwen Code。',
-  '--ref and --auto-update are not applicable for marketplace extensions.':
-    '--ref 和 --auto-update 不适用于市场扩展。',
-  'Extension "{{name}}" installed successfully and enabled.':
-    '扩展 "{{name}}" 安装成功并已启用。',
-  'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).':
-    '从 Git 仓库 URL、本地路径或 Claude 市场（marketplace-url:plugin-name）安装扩展。',
-  'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.':
-    '要安装的扩展的 GitHub URL、本地路径或市场源（marketplace-url:plugin-name）。',
-  'The git ref to install from.': '要安装的 Git 引用。',
-  'Enable auto-update for this extension.': '为此扩展启用自动更新。',
-  'Enable pre-release versions for this extension.': '为此扩展启用预发布版本。',
-  'Acknowledge the security risks of installing an extension and skip the confirmation prompt.':
-    '确认安装扩展的安全风险并跳过确认提示。',
-  'The source argument must be provided.': '必须提供来源参数。',
-  'Extension "{{name}}" successfully uninstalled.':
-    '扩展 "{{name}}" 卸载成功。',
-  'Uninstalls an extension.': '卸载扩展。',
-  'The name or source path of the extension to uninstall.':
-    '要卸载的扩展的名称或源路径。',
-  'Please include the name of the extension to uninstall as a positional argument.':
-    '请将要卸载的扩展名称作为位置参数。',
-  'Enables an extension.': '启用扩展。',
-  'The name of the extension to enable.': '要启用的扩展名称。',
-  'The scope to enable the extenison in. If not set, will be enabled in all scopes.':
-    '启用扩展的作用域。如果未设置，将在所有作用域中启用。',
+  "You are installing an extension from {{originSource}}. Some features may not work perfectly with Qwen Code.":
+    "您正在安装来自 {{originSource}} 的扩展。某些功能可能无法完美兼容 Qwen Code。",
+  "--ref and --auto-update are not applicable for marketplace extensions.":
+    "--ref 和 --auto-update 不适用于市场扩展。",
+  'Extension "{{name}}" installed successfully and enabled.': '扩展 "{{name}}" 安装成功并已启用。',
+  "Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).":
+    "从 Git 仓库 URL、本地路径或 Claude 市场（marketplace-url:plugin-name）安装扩展。",
+  "The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.":
+    "要安装的扩展的 GitHub URL、本地路径或市场源（marketplace-url:plugin-name）。",
+  "The git ref to install from.": "要安装的 Git 引用。",
+  "Enable auto-update for this extension.": "为此扩展启用自动更新。",
+  "Enable pre-release versions for this extension.": "为此扩展启用预发布版本。",
+  "Acknowledge the security risks of installing an extension and skip the confirmation prompt.":
+    "确认安装扩展的安全风险并跳过确认提示。",
+  "The source argument must be provided.": "必须提供来源参数。",
+  'Extension "{{name}}" successfully uninstalled.': '扩展 "{{name}}" 卸载成功。',
+  "Uninstalls an extension.": "卸载扩展。",
+  "The name or source path of the extension to uninstall.": "要卸载的扩展的名称或源路径。",
+  "Please include the name of the extension to uninstall as a positional argument.":
+    "请将要卸载的扩展名称作为位置参数。",
+  "Enables an extension.": "启用扩展。",
+  "The name of the extension to enable.": "要启用的扩展名称。",
+  "The scope to enable the extenison in. If not set, will be enabled in all scopes.":
+    "启用扩展的作用域。如果未设置，将在所有作用域中启用。",
   'Extension "{{name}}" successfully enabled for scope "{{scope}}".':
     '扩展 "{{name}}" 已在作用域 "{{scope}}" 中启用。',
   'Extension "{{name}}" successfully enabled in all scopes.':
     '扩展 "{{name}}" 已在所有作用域中启用。',
-  'Invalid scope: {{scope}}. Please use one of {{scopes}}.':
-    '无效的作用域：{{scope}}。请使用 {{scopes}} 之一。',
-  'Disables an extension.': '禁用扩展。',
-  'The name of the extension to disable.': '要禁用的扩展名称。',
-  'The scope to disable the extenison in.': '禁用扩展的作用域。',
+  "Invalid scope: {{scope}}. Please use one of {{scopes}}.":
+    "无效的作用域：{{scope}}。请使用 {{scopes}} 之一。",
+  "Disables an extension.": "禁用扩展。",
+  "The name of the extension to disable.": "要禁用的扩展名称。",
+  "The scope to disable the extenison in.": "禁用扩展的作用域。",
   'Extension "{{name}}" successfully disabled for scope "{{scope}}".':
     '扩展 "{{name}}" 已在作用域 "{{scope}}" 中禁用。',
   'Extension "{{name}}" successfully updated: {{oldVersion}} → {{newVersion}}.':
     '扩展 "{{name}}" 更新成功：{{oldVersion}} → {{newVersion}}。',
   'Unable to install extension "{{name}}" due to missing install metadata':
     '由于缺少安装元数据，无法安装扩展 "{{name}}"',
-  'Extension "{{name}}" is already up to date.':
-    '扩展 "{{name}}" 已是最新版本。',
-  'Updates all extensions or a named extension to the latest version.':
-    '将所有扩展或指定扩展更新到最新版本。',
-  'The name of the extension to update.': '要更新的扩展名称。',
-  'Update all extensions.': '更新所有扩展。',
-  'Either an extension name or --all must be provided':
-    '必须提供扩展名称或 --all',
-  'Lists installed extensions.': '列出已安装的扩展。',
-  'Path:': '路径：',
-  'Source:': '来源：',
-  'Type:': '类型：',
-  'Ref:': '引用：',
-  'Release tag:': '发布标签：',
-  'Enabled (User):': '已启用（用户）：',
-  'Enabled (Workspace):': '已启用（工作区）：',
-  'Context files:': '上下文文件：',
-  'Skills:': '技能：',
-  'Agents:': '智能体：',
-  'MCP servers:': 'MCP 服务器：',
-  'Link extension failed to install.': '链接扩展安装失败。',
-  'Extension "{{name}}" linked successfully and enabled.':
-    '扩展 "{{name}}" 链接成功并已启用。',
-  'Links an extension from a local path. Updates made to the local path will always be reflected.':
-    '从本地路径链接扩展。对本地路径的更新将始终反映。',
-  'The name of the extension to link.': '要链接的扩展名称。',
-  'Set a specific setting for an extension.': '为扩展设置特定配置。',
-  'Name of the extension to configure.': '要配置的扩展名称。',
-  'The setting to configure (name or env var).':
-    '要配置的设置（名称或环境变量）。',
-  'The scope to set the setting in.': '设置配置的作用域。',
-  'List all settings for an extension.': '列出扩展的所有设置。',
-  'Name of the extension.': '扩展名称。',
-  'Extension "{{name}}" has no settings to configure.':
-    '扩展 "{{name}}" 没有可配置的设置。',
+  'Extension "{{name}}" is already up to date.': '扩展 "{{name}}" 已是最新版本。',
+  "Updates all extensions or a named extension to the latest version.":
+    "将所有扩展或指定扩展更新到最新版本。",
+  "The name of the extension to update.": "要更新的扩展名称。",
+  "Update all extensions.": "更新所有扩展。",
+  "Either an extension name or --all must be provided": "必须提供扩展名称或 --all",
+  "Lists installed extensions.": "列出已安装的扩展。",
+  "Path:": "路径：",
+  "Source:": "来源：",
+  "Type:": "类型：",
+  "Ref:": "引用：",
+  "Release tag:": "发布标签：",
+  "Enabled (User):": "已启用（用户）：",
+  "Enabled (Workspace):": "已启用（工作区）：",
+  "Context files:": "上下文文件：",
+  "Skills:": "技能：",
+  "Agents:": "智能体：",
+  "MCP servers:": "MCP 服务器：",
+  "Link extension failed to install.": "链接扩展安装失败。",
+  'Extension "{{name}}" linked successfully and enabled.': '扩展 "{{name}}" 链接成功并已启用。',
+  "Links an extension from a local path. Updates made to the local path will always be reflected.":
+    "从本地路径链接扩展。对本地路径的更新将始终反映。",
+  "The name of the extension to link.": "要链接的扩展名称。",
+  "Set a specific setting for an extension.": "为扩展设置特定配置。",
+  "Name of the extension to configure.": "要配置的扩展名称。",
+  "The setting to configure (name or env var).": "要配置的设置（名称或环境变量）。",
+  "The scope to set the setting in.": "设置配置的作用域。",
+  "List all settings for an extension.": "列出扩展的所有设置。",
+  "Name of the extension.": "扩展名称。",
+  'Extension "{{name}}" has no settings to configure.': '扩展 "{{name}}" 没有可配置的设置。',
   'Settings for "{{name}}":': '"{{name}}" 的设置：',
-  '(workspace)': '（工作区）',
-  '(user)': '（用户）',
-  '[not set]': '［未设置］',
-  '[value stored in keychain]': '［值存储在钥匙串中］',
-  'Manage extension settings.': '管理扩展设置。',
-  'You need to specify a command (set or list).':
-    '您需要指定命令（set 或 list）。',
+  "(workspace)": "（工作区）",
+  "(user)": "（用户）",
+  "[not set]": "［未设置］",
+  "[value stored in keychain]": "［值存储在钥匙串中］",
+  "Manage extension settings.": "管理扩展设置。",
+  "You need to specify a command (set or list).": "您需要指定命令（set 或 list）。",
   // ============================================================================
   // Plugin Choice / Marketplace
   // ============================================================================
-  'No plugins available in this marketplace.': '此市场中没有可用的插件。',
+  "No plugins available in this marketplace.": "此市场中没有可用的插件。",
   'Select a plugin to install from marketplace "{{name}}":':
     '从市场 "{{name}}" 中选择要安装的插件：',
-  'Plugin selection cancelled.': '插件选择已取消。',
+  "Plugin selection cancelled.": "插件选择已取消。",
   'Select a plugin from "{{name}}"': '从 "{{name}}" 中选择插件',
-  'Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel':
-    '使用 ↑↓ 或 j/k 导航，回车选择，Esc 取消',
-  '{{count}} more above': '上方还有 {{count}} 项',
-  '{{count}} more below': '下方还有 {{count}} 项',
-  'manage IDE integration': '管理 IDE 集成',
-  'check status of IDE integration': '检查 IDE 集成状态',
-  'install required IDE companion for {{ideName}}':
-    '安装 {{ideName}} 所需的 IDE 配套工具',
-  'enable IDE integration': '启用 IDE 集成',
-  'disable IDE integration': '禁用 IDE 集成',
-  'IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.':
-    '您当前环境不支持 IDE 集成。要使用此功能，请在以下支持的 IDE 之一中运行 Qwen Code：VS Code 或 VS Code 分支版本。',
-  'Set up GitHub Actions': '设置 GitHub Actions',
-  'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)':
-    '配置终端按键绑定以支持多行输入（VS Code、Cursor、Windsurf、Trae）',
-  'Please restart your terminal for the changes to take effect.':
-    '请重启终端以使更改生效。',
-  'Failed to configure terminal: {{error}}': '配置终端失败：{{error}}',
-  'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.':
-    '无法确定 {{terminalName}} 在 Windows 上的配置路径：未设置 APPDATA 环境变量。',
-  '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.':
-    '{{terminalName}} keybindings.json 存在但不是有效的 JSON 数组。请手动修复文件或删除它以允许自动配置。',
-  'File: {{file}}': '文件：{{file}}',
-  'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.':
-    '解析 {{terminalName}} keybindings.json 失败。文件包含无效的 JSON。请手动修复文件或删除它以允许自动配置。',
-  'Error: {{error}}': '错误：{{error}}',
-  'Shift+Enter binding already exists': 'Shift+Enter 绑定已存在',
-  'Ctrl+Enter binding already exists': 'Ctrl+Enter 绑定已存在',
-  'Existing keybindings detected. Will not modify to avoid conflicts.':
-    '检测到现有按键绑定。为避免冲突，不会修改。',
-  'Please check and modify manually if needed: {{file}}':
-    '如有需要，请手动检查并修改：{{file}}',
-  'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.':
-    '已为 {{terminalName}} 添加 Shift+Enter 和 Ctrl+Enter 按键绑定。',
-  'Modified: {{file}}': '已修改：{{file}}',
-  '{{terminalName}} keybindings already configured.':
-    '{{terminalName}} 按键绑定已配置。',
-  'Failed to configure {{terminalName}}.': '配置 {{terminalName}} 失败。',
-  'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).':
-    '您的终端已配置为支持多行输入（Shift+Enter 和 Ctrl+Enter）的最佳体验。',
+  "Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel":
+    "使用 ↑↓ 或 j/k 导航，回车选择，Esc 取消",
+  "{{count}} more above": "上方还有 {{count}} 项",
+  "{{count}} more below": "下方还有 {{count}} 项",
+  "manage IDE integration": "管理 IDE 集成",
+  "check status of IDE integration": "检查 IDE 集成状态",
+  "install required IDE companion for {{ideName}}": "安装 {{ideName}} 所需的 IDE 配套工具",
+  "enable IDE integration": "启用 IDE 集成",
+  "disable IDE integration": "禁用 IDE 集成",
+  "IDE integration is not supported in your current environment. To use this feature, run Qwen Code in one of these supported IDEs: VS Code or VS Code forks.":
+    "您当前环境不支持 IDE 集成。要使用此功能，请在以下支持的 IDE 之一中运行 Qwen Code：VS Code 或 VS Code 分支版本。",
+  "Set up GitHub Actions": "设置 GitHub Actions",
+  "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)":
+    "配置终端按键绑定以支持多行输入（VS Code、Cursor、Windsurf、Trae）",
+  "Please restart your terminal for the changes to take effect.": "请重启终端以使更改生效。",
+  "Failed to configure terminal: {{error}}": "配置终端失败：{{error}}",
+  "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.":
+    "无法确定 {{terminalName}} 在 Windows 上的配置路径：未设置 APPDATA 环境变量。",
+  "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.":
+    "{{terminalName}} keybindings.json 存在但不是有效的 JSON 数组。请手动修复文件或删除它以允许自动配置。",
+  "File: {{file}}": "文件：{{file}}",
+  "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.":
+    "解析 {{terminalName}} keybindings.json 失败。文件包含无效的 JSON。请手动修复文件或删除它以允许自动配置。",
+  "Error: {{error}}": "错误：{{error}}",
+  "Shift+Enter binding already exists": "Shift+Enter 绑定已存在",
+  "Ctrl+Enter binding already exists": "Ctrl+Enter 绑定已存在",
+  "Existing keybindings detected. Will not modify to avoid conflicts.":
+    "检测到现有按键绑定。为避免冲突，不会修改。",
+  "Please check and modify manually if needed: {{file}}": "如有需要，请手动检查并修改：{{file}}",
+  "Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.":
+    "已为 {{terminalName}} 添加 Shift+Enter 和 Ctrl+Enter 按键绑定。",
+  "Modified: {{file}}": "已修改：{{file}}",
+  "{{terminalName}} keybindings already configured.": "{{terminalName}} 按键绑定已配置。",
+  "Failed to configure {{terminalName}}.": "配置 {{terminalName}} 失败。",
+  "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).":
+    "您的终端已配置为支持多行输入（Shift+Enter 和 Ctrl+Enter）的最佳体验。",
   // ============================================================================
   // Commands - Hooks
   // ============================================================================
-  'Manage Qwen Code hooks': '管理 Qwen Code Hook',
-  'List all configured hooks': '列出所有已配置的 Hook',
-  'Enable a disabled hook': '启用已禁用的 Hook',
-  'Disable an active hook': '禁用已启用的 Hook',
+  "Manage Qwen Code hooks": "管理 Qwen Code Hook",
+  "List all configured hooks": "列出所有已配置的 Hook",
+  "Enable a disabled hook": "启用已禁用的 Hook",
+  "Disable an active hook": "禁用已启用的 Hook",
   // Hooks - Dialog
-  Hooks: 'Hook',
-  'Loading hooks...': '正在加载 Hook...',
-  'Error loading hooks:': '加载 Hook 出错：',
-  'Press Escape to close': '按 Escape 关闭',
-  'Press Escape, Ctrl+C, or Ctrl+D to cancel':
-    '按 Escape、Ctrl+C 或 Ctrl+D 取消',
-  'Press Space, Enter, or Escape to dismiss': '按空格、回车或 Escape 关闭',
-  'No hook selected': '未选择 Hook',
+  Hooks: "Hook",
+  "Loading hooks...": "正在加载 Hook...",
+  "Error loading hooks:": "加载 Hook 出错：",
+  "Press Escape to close": "按 Escape 关闭",
+  "Press Escape, Ctrl+C, or Ctrl+D to cancel": "按 Escape、Ctrl+C 或 Ctrl+D 取消",
+  "Press Space, Enter, or Escape to dismiss": "按空格、回车或 Escape 关闭",
+  "No hook selected": "未选择 Hook",
   // Hooks - List Step
-  'No hook events found.': '未找到 Hook 事件。',
-  '{{count}} hook configured': '{{count}} 个 Hook 已配置',
-  '{{count}} hooks configured': '{{count}} 个 Hook 已配置',
-  'This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.':
-    '此菜单为只读。要添加或修改 Hook，请直接编辑 settings.json 或询问 Qwen Code。',
-  'Enter to select · Esc to cancel': 'Enter 选择 · Esc 取消',
+  "No hook events found.": "未找到 Hook 事件。",
+  "{{count}} hook configured": "{{count}} 个 Hook 已配置",
+  "{{count}} hooks configured": "{{count}} 个 Hook 已配置",
+  "This menu is read-only. To add or modify hooks, edit settings.json directly or ask Qwen Code.":
+    "此菜单为只读。要添加或修改 Hook，请直接编辑 settings.json 或询问 Qwen Code。",
+  "Enter to select · Esc to cancel": "Enter 选择 · Esc 取消",
   // Hooks - Detail Step
-  'Exit codes:': '退出码：',
-  'Configured hooks:': '已配置的 Hook：',
-  'No hooks configured for this event.': '此事件未配置 Hook。',
-  'To add hooks, edit settings.json directly or ask Qwen.':
-    '要添加 Hook，请直接编辑 settings.json 或询问 Qwen。',
-  'Enter to select · Esc to go back': 'Enter 选择 · Esc 返回',
+  "Exit codes:": "退出码：",
+  "Configured hooks:": "已配置的 Hook：",
+  "No hooks configured for this event.": "此事件未配置 Hook。",
+  "To add hooks, edit settings.json directly or ask Qwen.":
+    "要添加 Hook，请直接编辑 settings.json 或询问 Qwen。",
+  "Enter to select · Esc to go back": "Enter 选择 · Esc 返回",
   // Hooks - Config Detail Step
-  'Hook details': 'Hook 详情',
-  'Event:': '事件：',
-  'Extension:': '扩展：',
-  'Desc:': '描述：',
-  'No hook config selected': '未选择 Hook 配置',
-  'To modify or remove this hook, edit settings.json directly or ask Qwen to help.':
-    '要修改或删除此 Hook，请直接编辑 settings.json 或询问 Qwen。',
+  "Hook details": "Hook 详情",
+  "Event:": "事件：",
+  "Extension:": "扩展：",
+  "Desc:": "描述：",
+  "No hook config selected": "未选择 Hook 配置",
+  "To modify or remove this hook, edit settings.json directly or ask Qwen to help.":
+    "要修改或删除此 Hook，请直接编辑 settings.json 或询问 Qwen。",
   // Hooks - Disabled Step
-  'Hook Configuration - Disabled': 'Hook 配置 - 已禁用',
-  'All hooks are currently disabled. You have {{count}} that are not running.':
-    '所有 Hook 当前已禁用。您有 {{count}} 未运行。',
-  '{{count}} configured hook': '{{count}} 个已配置的 Hook',
-  '{{count}} configured hooks': '{{count}} 个已配置的 Hook',
-  'When hooks are disabled:': '当 Hook 被禁用时：',
-  'No hook commands will execute': '不会执行任何 Hook 命令',
-  'StatusLine will not be displayed': '不会显示状态栏',
-  'Tool operations will proceed without hook validation':
-    '工具操作将在没有 Hook 验证的情况下继续',
+  "Hook Configuration - Disabled": "Hook 配置 - 已禁用",
+  "All hooks are currently disabled. You have {{count}} that are not running.":
+    "所有 Hook 当前已禁用。您有 {{count}} 未运行。",
+  "{{count}} configured hook": "{{count}} 个已配置的 Hook",
+  "{{count}} configured hooks": "{{count}} 个已配置的 Hook",
+  "When hooks are disabled:": "当 Hook 被禁用时：",
+  "No hook commands will execute": "不会执行任何 Hook 命令",
+  "StatusLine will not be displayed": "不会显示状态栏",
+  "Tool operations will proceed without hook validation": "工具操作将在没有 Hook 验证的情况下继续",
   'To re-enable hooks, remove "disableAllHooks" from settings.json or ask Qwen Code.':
     '要重新启用 Hook，请从 settings.json 中删除 "disableAllHooks" 或询问 Qwen Code。',
   // Hooks - Source
-  Project: '项目',
-  User: '用户',
-  System: '系统',
-  Extension: '扩展',
-  'Local Settings': '本地设置',
-  'User Settings': '用户设置',
-  'System Settings': '系统设置',
-  Extensions: '扩展',
+  Project: "项目",
+  User: "用户",
+  System: "系统",
+  Extension: "扩展",
+  "Local Settings": "本地设置",
+  "User Settings": "用户设置",
+  "System Settings": "系统设置",
+  Extensions: "扩展",
   // Hooks - Status
-  '✓ Enabled': '✓ 已启用',
-  '✗ Disabled': '✗ 已禁用',
+  "✓ Enabled": "✓ 已启用",
+  "✗ Disabled": "✗ 已禁用",
   // Hooks - Event Descriptions (short)
-  'Before tool execution': '工具执行前',
-  'After tool execution': '工具执行后',
-  'After tool execution fails': '工具执行失败后',
-  'When notifications are sent': '发送通知时',
-  'When the user submits a prompt': '用户提交提示时',
-  'When a new session is started': '新会话开始时',
-  'Right before Qwen Code concludes its response': 'Qwen Code 结束响应之前',
-  'When a subagent (Agent tool call) is started':
-    '子智能体（Agent 工具调用）启动时',
-  'Right before a subagent concludes its response': '子智能体结束响应之前',
-  'Before conversation compaction': '对话压缩前',
-  'When a session is ending': '会话结束时',
-  'When a permission dialog is displayed': '显示权限对话框时',
+  "Before tool execution": "工具执行前",
+  "After tool execution": "工具执行后",
+  "After tool execution fails": "工具执行失败后",
+  "When notifications are sent": "发送通知时",
+  "When the user submits a prompt": "用户提交提示时",
+  "When a new session is started": "新会话开始时",
+  "Right before Qwen Code concludes its response": "Qwen Code 结束响应之前",
+  "When a subagent (Agent tool call) is started": "子智能体（Agent 工具调用）启动时",
+  "Right before a subagent concludes its response": "子智能体结束响应之前",
+  "Before conversation compaction": "对话压缩前",
+  "When a session is ending": "会话结束时",
+  "When a permission dialog is displayed": "显示权限对话框时",
   // Hooks - Event Descriptions (detailed)
-  'Input to command is JSON of tool call arguments.':
-    '命令输入为工具调用参数的 JSON。',
+  "Input to command is JSON of tool call arguments.": "命令输入为工具调用参数的 JSON。",
   'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).':
     '命令输入为包含 "inputs"（工具调用参数）和 "response"（工具调用响应）字段的 JSON。',
-  'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.':
-    '命令输入为包含 tool_name、tool_input、tool_use_id、error、error_type、is_interrupt 和 is_timeout 的 JSON。',
-  'Input to command is JSON with notification message and type.':
-    '命令输入为包含通知消息和类型的 JSON。',
-  'Input to command is JSON with original user prompt text.':
-    '命令输入为包含原始用户提示文本的 JSON。',
-  'Input to command is JSON with session start source.':
-    '命令输入为包含会话启动来源的 JSON。',
-  'Input to command is JSON with session end reason.':
-    '命令输入为包含会话结束原因的 JSON。',
-  'Input to command is JSON with agent_id and agent_type.':
-    '命令输入为包含 agent_id 和 agent_type 的 JSON。',
-  'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.':
-    '命令输入为包含 agent_id、agent_type 和 agent_transcript_path 的 JSON。',
-  'Input to command is JSON with compaction details.':
-    '命令输入为包含压缩详情的 JSON。',
-  'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.':
-    '命令输入为包含 tool_name、tool_input 和 tool_use_id 的 JSON。输出包含 hookSpecificOutput 的 JSON，其中包含允许或拒绝的决定。',
+  "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.":
+    "命令输入为包含 tool_name、tool_input、tool_use_id、error、error_type、is_interrupt 和 is_timeout 的 JSON。",
+  "Input to command is JSON with notification message and type.":
+    "命令输入为包含通知消息和类型的 JSON。",
+  "Input to command is JSON with original user prompt text.":
+    "命令输入为包含原始用户提示文本的 JSON。",
+  "Input to command is JSON with session start source.": "命令输入为包含会话启动来源的 JSON。",
+  "Input to command is JSON with session end reason.": "命令输入为包含会话结束原因的 JSON。",
+  "Input to command is JSON with agent_id and agent_type.":
+    "命令输入为包含 agent_id 和 agent_type 的 JSON。",
+  "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.":
+    "命令输入为包含 agent_id、agent_type 和 agent_transcript_path 的 JSON。",
+  "Input to command is JSON with compaction details.": "命令输入为包含压缩详情的 JSON。",
+  "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.":
+    "命令输入为包含 tool_name、tool_input 和 tool_use_id 的 JSON。输出包含 hookSpecificOutput 的 JSON，其中包含允许或拒绝的决定。",
   // Hooks - Exit Code Descriptions
-  'stdout/stderr not shown': 'stdout/stderr 不显示',
-  'show stderr to model and continue conversation':
-    '向模型显示 stderr 并继续对话',
-  'show stderr to user only': '仅向用户显示 stderr',
-  'stdout shown in transcript mode (ctrl+o)': 'stdout 以转录模式显示 (ctrl+o)',
-  'show stderr to model immediately': '立即向模型显示 stderr',
-  'show stderr to user only but continue with tool call':
-    '仅向用户显示 stderr 但继续工具调用',
-  'block processing, erase original prompt, and show stderr to user only':
-    '阻止处理，擦除原始提示，仅向用户显示 stderr',
-  'stdout shown to Qwen': '向 Qwen 显示 stdout',
-  'show stderr to user only (blocking errors ignored)':
-    '仅向用户显示 stderr（忽略阻塞错误）',
-  'command completes successfully': '命令成功完成',
-  'stdout shown to subagent': '向子智能体显示 stdout',
-  'show stderr to subagent and continue having it run':
-    '向子智能体显示 stderr 并继续运行',
-  'stdout appended as custom compact instructions':
-    'stdout 作为自定义压缩指令追加',
-  'block compaction': '阻止压缩',
-  'show stderr to user only but continue with compaction':
-    '仅向用户显示 stderr 但继续压缩',
-  'use hook decision if provided': '如果提供则使用 Hook 决定',
+  "stdout/stderr not shown": "stdout/stderr 不显示",
+  "show stderr to model and continue conversation": "向模型显示 stderr 并继续对话",
+  "show stderr to user only": "仅向用户显示 stderr",
+  "stdout shown in transcript mode (ctrl+o)": "stdout 以转录模式显示 (ctrl+o)",
+  "show stderr to model immediately": "立即向模型显示 stderr",
+  "show stderr to user only but continue with tool call": "仅向用户显示 stderr 但继续工具调用",
+  "block processing, erase original prompt, and show stderr to user only":
+    "阻止处理，擦除原始提示，仅向用户显示 stderr",
+  "stdout shown to Qwen": "向 Qwen 显示 stdout",
+  "show stderr to user only (blocking errors ignored)": "仅向用户显示 stderr（忽略阻塞错误）",
+  "command completes successfully": "命令成功完成",
+  "stdout shown to subagent": "向子智能体显示 stdout",
+  "show stderr to subagent and continue having it run": "向子智能体显示 stderr 并继续运行",
+  "stdout appended as custom compact instructions": "stdout 作为自定义压缩指令追加",
+  "block compaction": "阻止压缩",
+  "show stderr to user only but continue with compaction": "仅向用户显示 stderr 但继续压缩",
+  "use hook decision if provided": "如果提供则使用 Hook 决定",
   // Hooks - Messages
-  'Config not loaded.': '配置未加载。',
-  'Hooks are not enabled. Enable hooks in settings to use this feature.':
-    'Hook 未启用。请在设置中启用 Hook 以使用此功能。',
-  'No hooks configured. Add hooks in your settings.json file.':
-    '未配置 Hook。请在 settings.json 文件中添加 Hook。',
-  'Configured Hooks ({{count}} total)': '已配置的 Hook（共 {{count}} 个）',
+  "Config not loaded.": "配置未加载。",
+  "Hooks are not enabled. Enable hooks in settings to use this feature.":
+    "Hook 未启用。请在设置中启用 Hook 以使用此功能。",
+  "No hooks configured. Add hooks in your settings.json file.":
+    "未配置 Hook。请在 settings.json 文件中添加 Hook。",
+  "Configured Hooks ({{count}} total)": "已配置的 Hook（共 {{count}} 个）",
 
   // ============================================================================
   // Commands - Session Export
   // ============================================================================
-  'Export current session message history to a file':
-    '将当前会话的消息记录导出到文件',
-  'Export session to HTML format': '将会话导出为 HTML 文件',
-  'Export session to JSON format': '将会话导出为 JSON 文件',
-  'Export session to JSONL format (one message per line)':
-    '将会话导出为 JSONL 文件（每行一条消息）',
-  'Export session to markdown format': '将会话导出为 Markdown 文件',
+  "Export current session message history to a file": "将当前会话的消息记录导出到文件",
+  "Export session to HTML format": "将会话导出为 HTML 文件",
+  "Export session to JSON format": "将会话导出为 JSON 文件",
+  "Export session to JSONL format (one message per line)":
+    "将会话导出为 JSONL 文件（每行一条消息）",
+  "Export session to markdown format": "将会话导出为 Markdown 文件",
 
   // ============================================================================
   // Commands - Insights
   // ============================================================================
-  'generate personalized programming insights from your chat history':
-    '根据你的聊天记录生成个性化编程洞察',
+  "generate personalized programming insights from your chat history":
+    "根据你的聊天记录生成个性化编程洞察",
 
   // ============================================================================
   // Commands - Session History
   // ============================================================================
-  'Resume a previous session': '恢复先前会话',
-  'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested':
-    '恢复某次工具调用。这将把对话与文件历史重置到提出该工具调用建议时的状态',
-  'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.':
-    '无法检测终端类型。支持的终端：VS Code、Cursor、Windsurf 和 Trae。',
-  'Terminal "{{terminal}}" is not supported yet.':
-    '终端 "{{terminal}}" 尚未支持。',
+  "Resume a previous session": "恢复先前会话",
+  "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested":
+    "恢复某次工具调用。这将把对话与文件历史重置到提出该工具调用建议时的状态",
+  "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.":
+    "无法检测终端类型。支持的终端：VS Code、Cursor、Windsurf 和 Trae。",
+  'Terminal "{{terminal}}" is not supported yet.': '终端 "{{terminal}}" 尚未支持。',
 
   // ============================================================================
   // Commands - Language
   // ============================================================================
-  'Invalid language. Available: {{options}}':
-    '无效的语言。可用选项：{{options}}',
-  'Language subcommands do not accept additional arguments.':
-    '语言子命令不接受额外参数',
-  'Current UI language: {{lang}}': '当前 UI 语言：{{lang}}',
-  'Current LLM output language: {{lang}}': '当前 LLM 输出语言：{{lang}}',
-  'LLM output language not set': '未设置 LLM 输出语言',
-  'Set UI language': '设置 UI 语言',
-  'Set LLM output language': '设置 LLM 输出语言',
-  'Usage: /language ui [{{options}}]': '用法：/language ui [{{options}}]',
-  'Usage: /language output <language>': '用法：/language output <语言>',
-  'Example: /language output 中文': '示例：/language output 中文',
-  'Example: /language output English': '示例：/language output English',
-  'Example: /language output 日本語': '示例：/language output 日本語',
-  'Example: /language output Português': '示例：/language output Português',
-  'UI language changed to {{lang}}': 'UI 语言已更改为 {{lang}}',
-  'LLM output language set to {{lang}}': 'LLM 输出语言已设置为 {{lang}}',
-  'LLM output language rule file generated at {{path}}':
-    'LLM 输出语言规则文件已生成于 {{path}}',
-  'Please restart the application for the changes to take effect.':
-    '请重启应用程序以使更改生效。',
-  'Failed to generate LLM output language rule file: {{error}}':
-    '生成 LLM 输出语言规则文件失败：{{error}}',
-  'Invalid command. Available subcommands:': '无效的命令。可用的子命令：',
-  'Available subcommands:': '可用的子命令：',
-  'To request additional UI language packs, please open an issue on GitHub.':
-    '如需请求其他 UI 语言包，请在 GitHub 上提交 issue',
-  'Available options:': '可用选项：',
-  'Set UI language to {{name}}': '将 UI 语言设置为 {{name}}',
+  "Invalid language. Available: {{options}}": "无效的语言。可用选项：{{options}}",
+  "Language subcommands do not accept additional arguments.": "语言子命令不接受额外参数",
+  "Current UI language: {{lang}}": "当前 UI 语言：{{lang}}",
+  "Current LLM output language: {{lang}}": "当前 LLM 输出语言：{{lang}}",
+  "LLM output language not set": "未设置 LLM 输出语言",
+  "Set UI language": "设置 UI 语言",
+  "Set LLM output language": "设置 LLM 输出语言",
+  "Usage: /language ui [{{options}}]": "用法：/language ui [{{options}}]",
+  "Usage: /language output <language>": "用法：/language output <语言>",
+  "Example: /language output 中文": "示例：/language output 中文",
+  "Example: /language output English": "示例：/language output English",
+  "Example: /language output 日本語": "示例：/language output 日本語",
+  "Example: /language output Português": "示例：/language output Português",
+  "UI language changed to {{lang}}": "UI 语言已更改为 {{lang}}",
+  "LLM output language set to {{lang}}": "LLM 输出语言已设置为 {{lang}}",
+  "LLM output language rule file generated at {{path}}": "LLM 输出语言规则文件已生成于 {{path}}",
+  "Please restart the application for the changes to take effect.": "请重启应用程序以使更改生效。",
+  "Failed to generate LLM output language rule file: {{error}}":
+    "生成 LLM 输出语言规则文件失败：{{error}}",
+  "Invalid command. Available subcommands:": "无效的命令。可用的子命令：",
+  "Available subcommands:": "可用的子命令：",
+  "To request additional UI language packs, please open an issue on GitHub.":
+    "如需请求其他 UI 语言包，请在 GitHub 上提交 issue",
+  "Available options:": "可用选项：",
+  "Set UI language to {{name}}": "将 UI 语言设置为 {{name}}",
 
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Tool Approval Mode': '工具审批模式',
-  'Current approval mode: {{mode}}': '当前审批模式：{{mode}}',
-  'Available approval modes:': '可用的审批模式：',
-  'Approval mode changed to: {{mode}}': '审批模式已更改为：{{mode}}',
-  'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
-    '审批模式已更改为：{{mode}}（已保存到{{scope}}设置{{location}}）',
-  'Usage: /approval-mode <mode> [--session|--user|--project]':
-    '用法：/approval-mode <mode> [--session|--user|--project]',
+  "Tool Approval Mode": "工具审批模式",
+  "Current approval mode: {{mode}}": "当前审批模式：{{mode}}",
+  "Available approval modes:": "可用的审批模式：",
+  "Approval mode changed to: {{mode}}": "审批模式已更改为：{{mode}}",
+  "Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})":
+    "审批模式已更改为：{{mode}}（已保存到{{scope}}设置{{location}}）",
+  "Usage: /approval-mode <mode> [--session|--user|--project]":
+    "用法：/approval-mode <mode> [--session|--user|--project]",
 
-  'Scope subcommands do not accept additional arguments.':
-    '作用域子命令不接受额外参数',
-  'Plan mode - Analyze only, do not modify files or execute commands':
-    '规划模式 - 仅分析，不修改文件或执行命令',
-  'Default mode - Require approval for file edits or shell commands':
-    '默认模式 - 需要批准文件编辑或 shell 命令',
-  'Auto-edit mode - Automatically approve file edits':
-    '自动编辑模式 - 自动批准文件编辑',
-  'YOLO mode - Automatically approve all tools': 'YOLO 模式 - 自动批准所有工具',
-  '{{mode}} mode': '{{mode}} 模式',
-  'Settings service is not available; unable to persist the approval mode.':
-    '设置服务不可用；无法持久化审批模式。',
-  'Failed to save approval mode: {{error}}': '保存审批模式失败：{{error}}',
-  'Failed to change approval mode: {{error}}': '更改审批模式失败：{{error}}',
-  'Apply to current session only (temporary)': '仅应用于当前会话（临时）',
-  'Persist for this project/workspace': '持久化到此项目/工作区',
-  'Persist for this user on this machine': '持久化到此机器上的此用户',
-  'Analyze only, do not modify files or execute commands':
-    '仅分析，不修改文件或执行命令',
-  'Require approval for file edits or shell commands':
-    '需要批准文件编辑或 shell 命令',
-  'Automatically approve file edits': '自动批准文件编辑',
-  'Automatically approve all tools': '自动批准所有工具',
-  'Workspace approval mode exists and takes priority. User-level change will have no effect.':
-    '工作区审批模式已存在并具有优先级。用户级别的更改将无效。',
-  'Apply To': '应用于',
-  'Workspace Settings': '工作区设置',
+  "Scope subcommands do not accept additional arguments.": "作用域子命令不接受额外参数",
+  "Plan mode - Analyze only, do not modify files or execute commands":
+    "规划模式 - 仅分析，不修改文件或执行命令",
+  "Default mode - Require approval for file edits or shell commands":
+    "默认模式 - 需要批准文件编辑或 shell 命令",
+  "Auto-edit mode - Automatically approve file edits": "自动编辑模式 - 自动批准文件编辑",
+  "YOLO mode - Automatically approve all tools": "YOLO 模式 - 自动批准所有工具",
+  "{{mode}} mode": "{{mode}} 模式",
+  "Settings service is not available; unable to persist the approval mode.":
+    "设置服务不可用；无法持久化审批模式。",
+  "Failed to save approval mode: {{error}}": "保存审批模式失败：{{error}}",
+  "Failed to change approval mode: {{error}}": "更改审批模式失败：{{error}}",
+  "Apply to current session only (temporary)": "仅应用于当前会话（临时）",
+  "Persist for this project/workspace": "持久化到此项目/工作区",
+  "Persist for this user on this machine": "持久化到此机器上的此用户",
+  "Analyze only, do not modify files or execute commands": "仅分析，不修改文件或执行命令",
+  "Require approval for file edits or shell commands": "需要批准文件编辑或 shell 命令",
+  "Automatically approve file edits": "自动批准文件编辑",
+  "Automatically approve all tools": "自动批准所有工具",
+  "Workspace approval mode exists and takes priority. User-level change will have no effect.":
+    "工作区审批模式已存在并具有优先级。用户级别的更改将无效。",
+  "Apply To": "应用于",
+  "Workspace Settings": "工作区设置",
 
   // ============================================================================
   // Commands - Memory
   // ============================================================================
-  'Commands for interacting with memory.': '用于与记忆交互的命令',
-  'Show the current memory contents.': '显示当前记忆内容',
-  'Show project-level memory contents.': '显示项目级记忆内容',
-  'Show global memory contents.': '显示全局记忆内容',
-  'Add content to project-level memory.': '添加内容到项目级记忆',
-  'Add content to global memory.': '添加内容到全局记忆',
-  'Refresh the memory from the source.': '从源刷新记忆',
-  'Usage: /memory add --project <text to remember>':
-    '用法：/memory add --project <要记住的文本>',
-  'Usage: /memory add --global <text to remember>':
-    '用法：/memory add --global <要记住的文本>',
-  'Attempting to save to project memory: "{{text}}"':
-    '正在尝试保存到项目记忆："{{text}}"',
-  'Attempting to save to global memory: "{{text}}"':
-    '正在尝试保存到全局记忆："{{text}}"',
-  'Current memory content from {{count}} file(s):':
-    '来自 {{count}} 个文件的当前记忆内容：',
-  'Memory is currently empty.': '记忆当前为空',
-  'Project memory file not found or is currently empty.':
-    '项目记忆文件未找到或当前为空',
-  'Global memory file not found or is currently empty.':
-    '全局记忆文件未找到或当前为空',
-  'Global memory is currently empty.': '全局记忆当前为空',
-  'Global memory content:\n\n---\n{{content}}\n---':
-    '全局记忆内容：\n\n---\n{{content}}\n---',
-  'Project memory content from {{path}}:\n\n---\n{{content}}\n---':
-    '项目记忆内容来自 {{path}}：\n\n---\n{{content}}\n---',
-  'Project memory is currently empty.': '项目记忆当前为空',
-  'Refreshing memory from source files...': '正在从源文件刷新记忆...',
-  'Add content to the memory. Use --global for global memory or --project for project memory.':
-    '添加内容到记忆。使用 --global 表示全局记忆，使用 --project 表示项目记忆',
-  'Usage: /memory add [--global|--project] <text to remember>':
-    '用法：/memory add [--global|--project] <要记住的文本>',
-  'Attempting to save to memory {{scope}}: "{{fact}}"':
-    '正在尝试保存到记忆 {{scope}}："{{fact}}"',
+  "Commands for interacting with memory.": "用于与记忆交互的命令",
+  "Show the current memory contents.": "显示当前记忆内容",
+  "Show project-level memory contents.": "显示项目级记忆内容",
+  "Show global memory contents.": "显示全局记忆内容",
+  "Add content to project-level memory.": "添加内容到项目级记忆",
+  "Add content to global memory.": "添加内容到全局记忆",
+  "Refresh the memory from the source.": "从源刷新记忆",
+  "Usage: /memory add --project <text to remember>": "用法：/memory add --project <要记住的文本>",
+  "Usage: /memory add --global <text to remember>": "用法：/memory add --global <要记住的文本>",
+  'Attempting to save to project memory: "{{text}}"': '正在尝试保存到项目记忆："{{text}}"',
+  'Attempting to save to global memory: "{{text}}"': '正在尝试保存到全局记忆："{{text}}"',
+  "Current memory content from {{count}} file(s):": "来自 {{count}} 个文件的当前记忆内容：",
+  "Memory is currently empty.": "记忆当前为空",
+  "Project memory file not found or is currently empty.": "项目记忆文件未找到或当前为空",
+  "Global memory file not found or is currently empty.": "全局记忆文件未找到或当前为空",
+  "Global memory is currently empty.": "全局记忆当前为空",
+  "Global memory content:\n\n---\n{{content}}\n---": "全局记忆内容：\n\n---\n{{content}}\n---",
+  "Project memory content from {{path}}:\n\n---\n{{content}}\n---":
+    "项目记忆内容来自 {{path}}：\n\n---\n{{content}}\n---",
+  "Project memory is currently empty.": "项目记忆当前为空",
+  "Refreshing memory from source files...": "正在从源文件刷新记忆...",
+  "Add content to the memory. Use --global for global memory or --project for project memory.":
+    "添加内容到记忆。使用 --global 表示全局记忆，使用 --project 表示项目记忆",
+  "Usage: /memory add [--global|--project] <text to remember>":
+    "用法：/memory add [--global|--project] <要记住的文本>",
+  'Attempting to save to memory {{scope}}: "{{fact}}"': '正在尝试保存到记忆 {{scope}}："{{fact}}"',
 
   // ============================================================================
   // Commands - MCP
   // ============================================================================
-  'Authenticate with an OAuth-enabled MCP server':
-    '使用支持 OAuth 的 MCP 服务器进行认证',
-  'List configured MCP servers and tools': '列出已配置的 MCP 服务器和工具',
-  'Restarts MCP servers.': '重启 MCP 服务器',
-  'Open MCP management dialog': '打开 MCP 管理对话框',
-  'Could not retrieve tool registry.': '无法检索工具注册表',
-  'No MCP servers configured with OAuth authentication.':
-    '未配置支持 OAuth 认证的 MCP 服务器',
-  'MCP servers with OAuth authentication:': '支持 OAuth 认证的 MCP 服务器：',
-  'Use /mcp auth <server-name> to authenticate.':
-    '使用 /mcp auth <server-name> 进行认证',
+  "Authenticate with an OAuth-enabled MCP server": "使用支持 OAuth 的 MCP 服务器进行认证",
+  "List configured MCP servers and tools": "列出已配置的 MCP 服务器和工具",
+  "Restarts MCP servers.": "重启 MCP 服务器",
+  "Open MCP management dialog": "打开 MCP 管理对话框",
+  "Could not retrieve tool registry.": "无法检索工具注册表",
+  "No MCP servers configured with OAuth authentication.": "未配置支持 OAuth 认证的 MCP 服务器",
+  "MCP servers with OAuth authentication:": "支持 OAuth 认证的 MCP 服务器：",
+  "Use /mcp auth <server-name> to authenticate.": "使用 /mcp auth <server-name> 进行认证",
   "MCP server '{{name}}' not found.": "未找到 MCP 服务器 '{{name}}'",
   "Successfully authenticated and refreshed tools for '{{name}}'.":
     "成功认证并刷新了 '{{name}}' 的工具",
   "Failed to authenticate with MCP server '{{name}}': {{error}}":
     "认证 MCP 服务器 '{{name}}' 失败：{{error}}",
-  "Re-discovering tools from '{{name}}'...":
-    "正在重新发现 '{{name}}' 的工具...",
-  "Discovered {{count}} tool(s) from '{{name}}'.":
-    "从 '{{name}}' 发现了 {{count}} 个工具。",
-  'Authentication complete. Returning to server details...':
-    '认证完成，正在返回服务器详情...',
-  'Authentication successful.': '认证成功。',
-  'If the browser does not open, copy and paste this URL into your browser:':
-    '如果浏览器未自动打开，请复制以下 URL 并粘贴到浏览器中：',
-  'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.':
-    '⚠️  请确保复制完整的 URL —— 它可能跨越多行。',
+  "Re-discovering tools from '{{name}}'...": "正在重新发现 '{{name}}' 的工具...",
+  "Discovered {{count}} tool(s) from '{{name}}'.": "从 '{{name}}' 发现了 {{count}} 个工具。",
+  "Authentication complete. Returning to server details...": "认证完成，正在返回服务器详情...",
+  "Authentication successful.": "认证成功。",
+  "If the browser does not open, copy and paste this URL into your browser:":
+    "如果浏览器未自动打开，请复制以下 URL 并粘贴到浏览器中：",
+  "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.":
+    "⚠️  请确保复制完整的 URL —— 它可能跨越多行。",
 
   // ============================================================================
   // MCP Management Dialog
   // ============================================================================
-  'Manage MCP servers': '管理 MCP 服务器',
-  'Server Detail': '服务器详情',
-  'Disable Server': '禁用服务器',
-  Tools: '工具',
-  'Tool Detail': '工具详情',
-  'MCP Management': 'MCP 管理',
-  'Loading...': '加载中...',
-  'Unknown step': '未知步骤',
-  'Esc to back': 'Esc 返回',
-  '↑↓ to navigate · Enter to select · Esc to close':
-    '↑↓ 导航 · Enter 选择 · Esc 关闭',
-  '↑↓ to navigate · Enter to select · Esc to back':
-    '↑↓ 导航 · Enter 选择 · Esc 返回',
-  '↑↓ to navigate · Enter to confirm · Esc to back':
-    '↑↓ 导航 · Enter 确认 · Esc 返回',
-  'User Settings (global)': '用户设置（全局）',
-  'Workspace Settings (project-specific)': '工作区设置（项目级）',
-  'Disable server:': '禁用服务器：',
-  'Select where to add the server to the exclude list:':
-    '选择将服务器添加到排除列表的位置：',
-  'Press Enter to confirm, Esc to cancel': '按 Enter 确认，Esc 取消',
-  'View tools': '查看工具',
-  Reconnect: '重新连接',
-  Enable: '启用',
-  Disable: '禁用',
-  Authenticate: '认证',
-  'Re-authenticate': '重新认证',
-  'Clear Authentication': '清空认证',
-  disabled: '已禁用',
-  'Server:': '服务器：',
-  '(disabled)': '(已禁用)',
-  'Error:': '错误：',
-  tool: '工具',
-  tools: '个工具',
-  connected: '已连接',
-  connecting: '连接中',
-  disconnected: '已断开',
+  "Manage MCP servers": "管理 MCP 服务器",
+  "Server Detail": "服务器详情",
+  "Disable Server": "禁用服务器",
+  Tools: "工具",
+  "Tool Detail": "工具详情",
+  "MCP Management": "MCP 管理",
+  "Loading...": "加载中...",
+  "Unknown step": "未知步骤",
+  "Esc to back": "Esc 返回",
+  "↑↓ to navigate · Enter to select · Esc to close": "↑↓ 导航 · Enter 选择 · Esc 关闭",
+  "↑↓ to navigate · Enter to select · Esc to back": "↑↓ 导航 · Enter 选择 · Esc 返回",
+  "↑↓ to navigate · Enter to confirm · Esc to back": "↑↓ 导航 · Enter 确认 · Esc 返回",
+  "User Settings (global)": "用户设置（全局）",
+  "Workspace Settings (project-specific)": "工作区设置（项目级）",
+  "Disable server:": "禁用服务器：",
+  "Select where to add the server to the exclude list:": "选择将服务器添加到排除列表的位置：",
+  "Press Enter to confirm, Esc to cancel": "按 Enter 确认，Esc 取消",
+  "View tools": "查看工具",
+  Reconnect: "重新连接",
+  Enable: "启用",
+  Disable: "禁用",
+  Authenticate: "认证",
+  "Re-authenticate": "重新认证",
+  "Clear Authentication": "清空认证",
+  disabled: "已禁用",
+  "Server:": "服务器：",
+  "(disabled)": "(已禁用)",
+  "Error:": "错误：",
+  tool: "工具",
+  tools: "个工具",
+  connected: "已连接",
+  connecting: "连接中",
+  disconnected: "已断开",
 
   // MCP Server List
-  'User MCPs': '用户 MCP',
-  'Project MCPs': '项目 MCP',
-  'Extension MCPs': '扩展 MCP',
-  server: '个服务器',
-  servers: '个服务器',
-  'Add MCP servers to your settings to get started.':
-    '请在设置中添加 MCP 服务器以开始使用。',
-  'Run qwen --debug to see error logs': '运行 qwen --debug 查看错误日志',
+  "User MCPs": "用户 MCP",
+  "Project MCPs": "项目 MCP",
+  "Extension MCPs": "扩展 MCP",
+  server: "个服务器",
+  servers: "个服务器",
+  "Add MCP servers to your settings to get started.": "请在设置中添加 MCP 服务器以开始使用。",
+  "Run qwen --debug to see error logs": "运行 qwen --debug 查看错误日志",
 
   // MCP OAuth Authentication
-  'OAuth Authentication': 'OAuth 认证',
-  'Press Enter to start authentication, Esc to go back':
-    '按 Enter 开始认证，Esc 返回',
-  'Authenticating... Please complete the login in your browser.':
-    '认证中... 请在浏览器中完成登录。',
-  'Press Enter or Esc to go back': '按 Enter 或 Esc 返回',
+  "OAuth Authentication": "OAuth 认证",
+  "Press Enter to start authentication, Esc to go back": "按 Enter 开始认证，Esc 返回",
+  "Authenticating... Please complete the login in your browser.":
+    "认证中... 请在浏览器中完成登录。",
+  "Press Enter or Esc to go back": "按 Enter 或 Esc 返回",
 
   // MCP Server Detail
-  'Command:': '命令：',
-  'Working Directory:': '工作目录：',
-  'Capabilities:': '功能：',
+  "Command:": "命令：",
+  "Working Directory:": "工作目录：",
+  "Capabilities:": "功能：",
 
   // MCP Tool List
-  'No tools available for this server.': '此服务器没有可用工具。',
-  destructive: '破坏性',
-  'read-only': '只读',
-  'open-world': '开放世界',
-  idempotent: '幂等',
-  'Tools for {{name}}': '{{name}} 的工具',
-  'Tools for {{serverName}}': '{{serverName}} 的工具',
-  '{{current}}/{{total}}': '{{current}}/{{total}}',
+  "No tools available for this server.": "此服务器没有可用工具。",
+  destructive: "破坏性",
+  "read-only": "只读",
+  "open-world": "开放世界",
+  idempotent: "幂等",
+  "Tools for {{name}}": "{{name}} 的工具",
+  "Tools for {{serverName}}": "{{serverName}} 的工具",
+  "{{current}}/{{total}}": "{{current}}/{{total}}",
 
   // MCP Tool Detail
-  Type: '类型',
-  Parameters: '参数',
-  'No tool selected': '未选择工具',
-  Annotations: '注解',
-  Title: '标题',
-  'Read Only': '只读',
-  Destructive: '破坏性',
-  Idempotent: '幂等',
-  'Open World': '开放世界',
-  Server: '服务器',
+  Type: "类型",
+  Parameters: "参数",
+  "No tool selected": "未选择工具",
+  Annotations: "注解",
+  Title: "标题",
+  "Read Only": "只读",
+  Destructive: "破坏性",
+  Idempotent: "幂等",
+  "Open World": "开放世界",
+  Server: "服务器",
 
   // Invalid tool related translations
-  '{{count}} invalid tools': '{{count}} 个无效工具',
-  invalid: '无效',
-  'invalid: {{reason}}': '无效：{{reason}}',
-  'missing name': '缺少名称',
-  'missing description': '缺少描述',
-  '(unnamed)': '(未命名)',
-  'Warning: This tool cannot be called by the LLM':
-    '警告：此工具无法被 LLM 调用',
-  Reason: '原因',
-  'Tools must have both name and description to be used by the LLM.':
-    '工具必须同时具有名称和描述才能被 LLM 使用。',
+  "{{count}} invalid tools": "{{count}} 个无效工具",
+  invalid: "无效",
+  "invalid: {{reason}}": "无效：{{reason}}",
+  "missing name": "缺少名称",
+  "missing description": "缺少描述",
+  "(unnamed)": "(未命名)",
+  "Warning: This tool cannot be called by the LLM": "警告：此工具无法被 LLM 调用",
+  Reason: "原因",
+  "Tools must have both name and description to be used by the LLM.":
+    "工具必须同时具有名称和描述才能被 LLM 使用。",
 
   // ============================================================================
   // Commands - Chat
   // ============================================================================
-  'Manage conversation history.': '管理对话历史',
-  'List saved conversation checkpoints': '列出已保存的对话检查点',
-  'No saved conversation checkpoints found.': '未找到已保存的对话检查点',
-  'List of saved conversations:': '已保存的对话列表：',
-  'Note: Newest last, oldest first': '注意：最新的在最后，最旧的在最前',
-  'Save the current conversation as a checkpoint. Usage: /chat save <tag>':
-    '将当前对话保存为检查点。用法：/chat save <tag>',
-  'Missing tag. Usage: /chat save <tag>': '缺少标签。用法：/chat save <tag>',
-  'Delete a conversation checkpoint. Usage: /chat delete <tag>':
-    '删除对话检查点。用法：/chat delete <tag>',
-  'Missing tag. Usage: /chat delete <tag>':
-    '缺少标签。用法：/chat delete <tag>',
-  "Conversation checkpoint '{{tag}}' has been deleted.":
-    "对话检查点 '{{tag}}' 已删除",
-  "Error: No checkpoint found with tag '{{tag}}'.":
-    "错误：未找到标签为 '{{tag}}' 的检查点",
-  'Resume a conversation from a checkpoint. Usage: /chat resume <tag>':
-    '从检查点恢复对话。用法：/chat resume <tag>',
-  'Missing tag. Usage: /chat resume <tag>':
-    '缺少标签。用法：/chat resume <tag>',
-  'No saved checkpoint found with tag: {{tag}}.':
-    '未找到标签为 {{tag}} 的已保存检查点',
-  'A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?':
-    '标签为 {{tag}} 的检查点已存在。您要覆盖它吗？',
-  'No chat client available to save conversation.':
-    '没有可用的聊天客户端来保存对话',
-  'Conversation checkpoint saved with tag: {{tag}}.':
-    '对话检查点已保存，标签：{{tag}}',
-  'No conversation found to save.': '未找到要保存的对话',
-  'No chat client available to share conversation.':
-    '没有可用的聊天客户端来分享对话',
-  'Invalid file format. Only .md and .json are supported.':
-    '无效的文件格式。仅支持 .md 和 .json 文件',
-  'Error sharing conversation: {{error}}': '分享对话时出错：{{error}}',
-  'Conversation shared to {{filePath}}': '对话已分享到 {{filePath}}',
-  'No conversation found to share.': '未找到要分享的对话',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
-    '将当前对话分享到 markdown 或 json 文件。用法：/chat share <file>',
+  "Manage conversation history.": "管理对话历史",
+  "List saved conversation checkpoints": "列出已保存的对话检查点",
+  "No saved conversation checkpoints found.": "未找到已保存的对话检查点",
+  "List of saved conversations:": "已保存的对话列表：",
+  "Note: Newest last, oldest first": "注意：最新的在最后，最旧的在最前",
+  "Save the current conversation as a checkpoint. Usage: /chat save <tag>":
+    "将当前对话保存为检查点。用法：/chat save <tag>",
+  "Missing tag. Usage: /chat save <tag>": "缺少标签。用法：/chat save <tag>",
+  "Delete a conversation checkpoint. Usage: /chat delete <tag>":
+    "删除对话检查点。用法：/chat delete <tag>",
+  "Missing tag. Usage: /chat delete <tag>": "缺少标签。用法：/chat delete <tag>",
+  "Conversation checkpoint '{{tag}}' has been deleted.": "对话检查点 '{{tag}}' 已删除",
+  "Error: No checkpoint found with tag '{{tag}}'.": "错误：未找到标签为 '{{tag}}' 的检查点",
+  "Resume a conversation from a checkpoint. Usage: /chat resume <tag>":
+    "从检查点恢复对话。用法：/chat resume <tag>",
+  "Missing tag. Usage: /chat resume <tag>": "缺少标签。用法：/chat resume <tag>",
+  "No saved checkpoint found with tag: {{tag}}.": "未找到标签为 {{tag}} 的已保存检查点",
+  "A checkpoint with the tag {{tag}} already exists. Do you want to overwrite it?":
+    "标签为 {{tag}} 的检查点已存在。您要覆盖它吗？",
+  "No chat client available to save conversation.": "没有可用的聊天客户端来保存对话",
+  "Conversation checkpoint saved with tag: {{tag}}.": "对话检查点已保存，标签：{{tag}}",
+  "No conversation found to save.": "未找到要保存的对话",
+  "No chat client available to share conversation.": "没有可用的聊天客户端来分享对话",
+  "Invalid file format. Only .md and .json are supported.":
+    "无效的文件格式。仅支持 .md 和 .json 文件",
+  "Error sharing conversation: {{error}}": "分享对话时出错：{{error}}",
+  "Conversation shared to {{filePath}}": "对话已分享到 {{filePath}}",
+  "No conversation found to share.": "未找到要分享的对话",
+  "Share the current conversation to a markdown or json file. Usage: /chat share <file>":
+    "将当前对话分享到 markdown 或 json 文件。用法：/chat share <file>",
 
   // ============================================================================
   // Commands - Summary
   // ============================================================================
-  'Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md':
-    '生成项目摘要并保存到 .qwen/PROJECT_SUMMARY.md',
-  'No chat client available to generate summary.':
-    '没有可用的聊天客户端来生成摘要',
-  'Already generating summary, wait for previous request to complete':
-    '正在生成摘要，请等待上一个请求完成',
-  'No conversation found to summarize.': '未找到要总结的对话',
-  'Failed to generate project context summary: {{error}}':
-    '生成项目上下文摘要失败：{{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    '项目摘要已保存到 {{filePathForDisplay}}',
-  'Saving project summary...': '正在保存项目摘要...',
-  'Generating project summary...': '正在生成项目摘要...',
-  'Failed to generate summary - no text content received from LLM response':
-    '生成摘要失败 - 未从 LLM 响应中接收到文本内容',
+  "Generate a project summary and save it to .qwen/PROJECT_SUMMARY.md":
+    "生成项目摘要并保存到 .qwen/PROJECT_SUMMARY.md",
+  "No chat client available to generate summary.": "没有可用的聊天客户端来生成摘要",
+  "Already generating summary, wait for previous request to complete":
+    "正在生成摘要，请等待上一个请求完成",
+  "No conversation found to summarize.": "未找到要总结的对话",
+  "Failed to generate project context summary: {{error}}": "生成项目上下文摘要失败：{{error}}",
+  "Saved project summary to {{filePathForDisplay}}.": "项目摘要已保存到 {{filePathForDisplay}}",
+  "Saving project summary...": "正在保存项目摘要...",
+  "Generating project summary...": "正在生成项目摘要...",
+  "Failed to generate summary - no text content received from LLM response":
+    "生成摘要失败 - 未从 LLM 响应中接收到文本内容",
 
   // ============================================================================
   // Commands - Model
   // ============================================================================
-  'Switch the model for this session': '切换此会话的模型',
-  'Set fast model for background tasks': '设置后台任务的快速模型',
-  'Content generator configuration not available.': '内容生成器配置不可用',
-  'Authentication type not available.': '认证类型不可用',
-  'No models available for the current authentication type ({{authType}}).':
-    '当前认证类型 ({{authType}}) 没有可用的模型',
+  "Switch the model for this session": "切换此会话的模型",
+  "Set fast model for background tasks": "设置后台任务的快速模型",
+  "Content generator configuration not available.": "内容生成器配置不可用",
+  "Authentication type not available.": "认证类型不可用",
+  "No models available for the current authentication type ({{authType}}).":
+    "当前认证类型 ({{authType}}) 没有可用的模型",
 
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    '正在开始新会话，重置聊天并清屏。',
-  'Starting a new session and clearing.': '正在开始新会话并清屏。',
+  "Starting a new session, resetting chat, and clearing terminal.":
+    "正在开始新会话，重置聊天并清屏。",
+  "Starting a new session and clearing.": "正在开始新会话并清屏。",
 
   // ============================================================================
   // Commands - Compress
   // ============================================================================
-  'Already compressing, wait for previous request to complete':
-    '正在压缩中，请等待上一个请求完成',
-  'Failed to compress chat history.': '压缩聊天历史失败',
-  'Failed to compress chat history: {{error}}': '压缩聊天历史失败：{{error}}',
-  'Compressing chat history': '正在压缩聊天历史',
-  'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.':
-    '聊天历史已从 {{originalTokens}} 个 token 压缩到 {{newTokens}} 个 token。',
-  'Compression was not beneficial for this history size.':
-    '对于此历史记录大小，压缩没有益处。',
-  'Chat history compression did not reduce size. This may indicate issues with the compression prompt.':
-    '聊天历史压缩未能减小大小。这可能表明压缩提示存在问题。',
-  'Could not compress chat history due to a token counting error.':
-    '由于 token 计数错误，无法压缩聊天历史。',
-  'Chat history is already compressed.': '聊天历史已经压缩。',
+  "Already compressing, wait for previous request to complete": "正在压缩中，请等待上一个请求完成",
+  "Failed to compress chat history.": "压缩聊天历史失败",
+  "Failed to compress chat history: {{error}}": "压缩聊天历史失败：{{error}}",
+  "Compressing chat history": "正在压缩聊天历史",
+  "Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.":
+    "聊天历史已从 {{originalTokens}} 个 token 压缩到 {{newTokens}} 个 token。",
+  "Compression was not beneficial for this history size.": "对于此历史记录大小，压缩没有益处。",
+  "Chat history compression did not reduce size. This may indicate issues with the compression prompt.":
+    "聊天历史压缩未能减小大小。这可能表明压缩提示存在问题。",
+  "Could not compress chat history due to a token counting error.":
+    "由于 token 计数错误，无法压缩聊天历史。",
+  "Chat history is already compressed.": "聊天历史已经压缩。",
 
   // ============================================================================
   // Commands - Directory
   // ============================================================================
-  'Configuration is not available.': '配置不可用。',
-  'Please provide at least one path to add.': '请提供至少一个要添加的路径。',
-  'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.':
-    '/directory add 命令在限制性沙箱配置文件中不受支持。请改为在启动会话时使用 --include-directories。',
+  "Configuration is not available.": "配置不可用。",
+  "Please provide at least one path to add.": "请提供至少一个要添加的路径。",
+  "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.":
+    "/directory add 命令在限制性沙箱配置文件中不受支持。请改为在启动会话时使用 --include-directories。",
   "Error adding '{{path}}': {{error}}": "添加 '{{path}}' 时出错：{{error}}",
-  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
-    '如果存在，已成功从以下目录添加 QWEN.md 文件：\n- {{directories}}',
-  'Error refreshing memory: {{error}}': '刷新内存时出错：{{error}}',
-  'Successfully added directories:\n- {{directories}}':
-    '成功添加目录：\n- {{directories}}',
-  'Current workspace directories:\n{{directories}}':
-    '当前工作区目录：\n{{directories}}',
+  "Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}":
+    "如果存在，已成功从以下目录添加 QWEN.md 文件：\n- {{directories}}",
+  "Error refreshing memory: {{error}}": "刷新内存时出错：{{error}}",
+  "Successfully added directories:\n- {{directories}}": "成功添加目录：\n- {{directories}}",
+  "Current workspace directories:\n{{directories}}": "当前工作区目录：\n{{directories}}",
 
   // ============================================================================
   // Commands - Docs
   // ============================================================================
-  'Please open the following URL in your browser to view the documentation:\n{{url}}':
-    '请在浏览器中打开以下 URL 以查看文档：\n{{url}}',
-  'Opening documentation in your browser: {{url}}':
-    '正在浏览器中打开文档：{{url}}',
+  "Please open the following URL in your browser to view the documentation:\n{{url}}":
+    "请在浏览器中打开以下 URL 以查看文档：\n{{url}}",
+  "Opening documentation in your browser: {{url}}": "正在浏览器中打开文档：{{url}}",
 
   // ============================================================================
   // Dialogs - Tool Confirmation
   // ============================================================================
-  'Do you want to proceed?': '是否继续？',
-  'Yes, allow once': '是，允许一次',
-  'Allow always': '总是允许',
-  Yes: '是',
-  No: '否',
-  'No (esc)': '否 (esc)',
-  'Yes, allow always for this session': '是，本次会话总是允许',
-  'Modify in progress:': '正在修改：',
-  'Save and close external editor to continue': '保存并关闭外部编辑器以继续',
-  'Apply this change?': '是否应用此更改？',
-  'Yes, allow always': '是，总是允许',
-  'Modify with external editor': '使用外部编辑器修改',
-  'No, suggest changes (esc)': '否，建议更改 (esc)',
+  "Do you want to proceed?": "是否继续？",
+  "Yes, allow once": "是，允许一次",
+  "Allow always": "总是允许",
+  Yes: "是",
+  No: "否",
+  "No (esc)": "否 (esc)",
+  "Yes, allow always for this session": "是，本次会话总是允许",
+  "Modify in progress:": "正在修改：",
+  "Save and close external editor to continue": "保存并关闭外部编辑器以继续",
+  "Apply this change?": "是否应用此更改？",
+  "Yes, allow always": "是，总是允许",
+  "Modify with external editor": "使用外部编辑器修改",
+  "No, suggest changes (esc)": "否，建议更改 (esc)",
   "Allow execution of: '{{command}}'?": "允许执行：'{{command}}'？",
-  'Yes, allow always ...': '是，总是允许 ...',
-  'Always allow in this project': '在本项目中总是允许',
-  'Always allow {{action}} in this project': '在本项目中总是允许{{action}}',
-  'Always allow for this user': '对该用户总是允许',
-  'Always allow {{action}} for this user': '对该用户总是允许{{action}}',
-  'Yes, restore previous mode ({{mode}})': '是，恢复之前的模式 ({{mode}})',
-  'Yes, and auto-accept edits': '是，并自动接受编辑',
-  'Yes, and manually approve edits': '是，并手动批准编辑',
-  'No, keep planning (esc)': '否，继续规划 (esc)',
-  'URLs to fetch:': '要获取的 URL：',
-  'MCP Server: {{server}}': 'MCP 服务器：{{server}}',
-  'Tool: {{tool}}': '工具：{{tool}}',
+  "Yes, allow always ...": "是，总是允许 ...",
+  "Always allow in this project": "在本项目中总是允许",
+  "Always allow {{action}} in this project": "在本项目中总是允许{{action}}",
+  "Always allow for this user": "对该用户总是允许",
+  "Always allow {{action}} for this user": "对该用户总是允许{{action}}",
+  "Yes, restore previous mode ({{mode}})": "是，恢复之前的模式 ({{mode}})",
+  "Yes, and auto-accept edits": "是，并自动接受编辑",
+  "Yes, and manually approve edits": "是，并手动批准编辑",
+  "No, keep planning (esc)": "否，继续规划 (esc)",
+  "URLs to fetch:": "要获取的 URL：",
+  "MCP Server: {{server}}": "MCP 服务器：{{server}}",
+  "Tool: {{tool}}": "工具：{{tool}}",
   'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?':
     '允许执行来自服务器 "{{server}}" 的 MCP 工具 "{{tool}}"？',
   'Yes, always allow tool "{{tool}}" from server "{{server}}"':
@@ -1187,619 +1081,581 @@ export default {
   // ============================================================================
   // Dialogs - Shell Confirmation
   // ============================================================================
-  'Shell Command Execution': 'Shell 命令执行',
-  'A custom command wants to run the following shell commands:':
-    '自定义命令想要运行以下 shell 命令：',
+  "Shell Command Execution": "Shell 命令执行",
+  "A custom command wants to run the following shell commands:":
+    "自定义命令想要运行以下 shell 命令：",
 
   // ============================================================================
   // Dialogs - Pro Quota
   // ============================================================================
-  'Pro quota limit reached for {{model}}.': '{{model}} 的 Pro 配额已达到上限',
-  'Change auth (executes the /auth command)': '更改认证（执行 /auth 命令）',
-  'Continue with {{model}}': '使用 {{model}} 继续',
+  "Pro quota limit reached for {{model}}.": "{{model}} 的 Pro 配额已达到上限",
+  "Change auth (executes the /auth command)": "更改认证（执行 /auth 命令）",
+  "Continue with {{model}}": "使用 {{model}} 继续",
 
   // ============================================================================
   // Dialogs - Welcome Back
   // ============================================================================
-  'Current Plan:': '当前计划：',
-  'Progress: {{done}}/{{total}} tasks completed':
-    '进度：已完成 {{done}}/{{total}} 个任务',
-  ', {{inProgress}} in progress': '，{{inProgress}} 个进行中',
-  'Pending Tasks:': '待处理任务：',
-  'What would you like to do?': '您想要做什么？',
-  'Choose how to proceed with your session:': '选择如何继续您的会话：',
-  'Start new chat session': '开始新的聊天会话',
-  'Continue previous conversation': '继续之前的对话',
-  '👋 Welcome back! (Last updated: {{timeAgo}})':
-    '👋 欢迎回来！（最后更新：{{timeAgo}}）',
-  '🎯 Overall Goal:': '🎯 总体目标：',
+  "Current Plan:": "当前计划：",
+  "Progress: {{done}}/{{total}} tasks completed": "进度：已完成 {{done}}/{{total}} 个任务",
+  ", {{inProgress}} in progress": "，{{inProgress}} 个进行中",
+  "Pending Tasks:": "待处理任务：",
+  "What would you like to do?": "您想要做什么？",
+  "Choose how to proceed with your session:": "选择如何继续您的会话：",
+  "Start new chat session": "开始新的聊天会话",
+  "Continue previous conversation": "继续之前的对话",
+  "👋 Welcome back! (Last updated: {{timeAgo}})": "👋 欢迎回来！（最后更新：{{timeAgo}}）",
+  "🎯 Overall Goal:": "🎯 总体目标：",
 
   // ============================================================================
   // Dialogs - Auth
   // ============================================================================
-  'Get started': '开始使用',
-  'Select Authentication Method': '选择认证方式',
-  'OpenAI API key is required to use OpenAI authentication.':
-    '使用 OpenAI 认证需要 OpenAI API 密钥',
-  'You must select an auth method to proceed. Press Ctrl+C again to exit.':
-    '您必须选择认证方法才能继续。再次按 Ctrl+C 退出',
-  'Terms of Services and Privacy Notice': '服务条款和隐私声明',
-  'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models':
-    '付费 \u00B7 每 5 小时最多 6,000 次请求 \u00B7 支持阿里云百炼 Coding Plan 全部模型',
-  'Alibaba Cloud Coding Plan': '阿里云百炼 Coding Plan',
-  'Bring your own API key': '使用自己的 API 密钥',
-  'Use coding plan credentials or your own api-keys/providers.':
-    '使用 Coding Plan 凭证或您自己的 API 密钥/提供商。',
-  OpenAI: 'OpenAI',
-  'Failed to login. Message: {{message}}': '登录失败。消息：{{message}}',
-  'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.':
-    '认证方式被强制设置为 {{enforcedType}}，但您当前使用的是 {{currentType}}',
-  'Please visit this URL to authorize:': '请访问此 URL 进行授权：',
-  'Or scan the QR code below:': '或扫描下方的二维码：',
-  'Waiting for authorization': '等待授权中',
-  'Time remaining:': '剩余时间：',
-  '(Press ESC or CTRL+C to cancel)': '（按 ESC 或 CTRL+C 取消）',
-  'OAuth token expired (over {{seconds}} seconds). Please select authentication method again.':
-    'OAuth 令牌已过期（超过 {{seconds}} 秒）。请重新选择认证方法',
-  'Press any key to return to authentication type selection.':
-    '按任意键返回认证类型选择',
-  'Authentication timed out. Please try again.': '认证超时。请重试。',
-  'Waiting for auth... (Press ESC or CTRL+C to cancel)':
-    '正在等待认证...（按 ESC 或 CTRL+C 取消）',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    '缺少 OpenAI 兼容认证的 API 密钥。请设置 settings.security.auth.apiKey 或设置 {{envKeyHint}} 环境变量。',
-  '{{envKeyHint}} environment variable not found.':
-    '未找到 {{envKeyHint}} 环境变量。',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    '未找到 {{envKeyHint}} 环境变量。请在 .env 文件或系统环境变量中进行设置。',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    '未找到 {{envKeyHint}} 环境变量（或设置 settings.security.auth.apiKey）。请在 .env 文件或系统环境变量中进行设置。',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    '缺少 OpenAI 兼容认证的 API 密钥。请设置 {{envKeyHint}} 环境变量。',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'Anthropic 提供商缺少必需的 baseUrl，请在 modelProviders[].baseUrl 中配置。',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    '未找到 ANTHROPIC_BASE_URL 环境变量。',
-  'Invalid auth method selected.': '选择了无效的认证方式。',
-  'Failed to authenticate. Message: {{message}}': '认证失败。消息：{{message}}',
-  'Authenticated successfully with {{authType}} credentials.':
-    '使用 {{authType}} 凭据成功认证。',
+  "Get started": "开始使用",
+  "Select Authentication Method": "选择认证方式",
+  "OpenAI API key is required to use OpenAI authentication.":
+    "使用 OpenAI 认证需要 OpenAI API 密钥",
+  "You must select an auth method to proceed. Press Ctrl+C again to exit.":
+    "您必须选择认证方法才能继续。再次按 Ctrl+C 退出",
+  "Terms of Services and Privacy Notice": "服务条款和隐私声明",
+  "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models":
+    "付费 \u00B7 每 5 小时最多 6,000 次请求 \u00B7 支持阿里云百炼 Coding Plan 全部模型",
+  "Alibaba Cloud Coding Plan": "阿里云百炼 Coding Plan",
+  "Bring your own API key": "使用自己的 API 密钥",
+  "Use coding plan credentials or your own api-keys/providers.":
+    "使用 Coding Plan 凭证或您自己的 API 密钥/提供商。",
+  OpenAI: "OpenAI",
+  "Failed to login. Message: {{message}}": "登录失败。消息：{{message}}",
+  "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.":
+    "认证方式被强制设置为 {{enforcedType}}，但您当前使用的是 {{currentType}}",
+  "Please visit this URL to authorize:": "请访问此 URL 进行授权：",
+  "Or scan the QR code below:": "或扫描下方的二维码：",
+  "Waiting for authorization": "等待授权中",
+  "Time remaining:": "剩余时间：",
+  "(Press ESC or CTRL+C to cancel)": "（按 ESC 或 CTRL+C 取消）",
+  "OAuth token expired (over {{seconds}} seconds). Please select authentication method again.":
+    "OAuth 令牌已过期（超过 {{seconds}} 秒）。请重新选择认证方法",
+  "Press any key to return to authentication type selection.": "按任意键返回认证类型选择",
+  "Authentication timed out. Please try again.": "认证超时。请重试。",
+  "Waiting for auth... (Press ESC or CTRL+C to cancel)": "正在等待认证...（按 ESC 或 CTRL+C 取消）",
+  "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.":
+    "缺少 OpenAI 兼容认证的 API 密钥。请设置 settings.security.auth.apiKey 或设置 {{envKeyHint}} 环境变量。",
+  "{{envKeyHint}} environment variable not found.": "未找到 {{envKeyHint}} 环境变量。",
+  "{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.":
+    "未找到 {{envKeyHint}} 环境变量。请在 .env 文件或系统环境变量中进行设置。",
+  "{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.":
+    "未找到 {{envKeyHint}} 环境变量（或设置 settings.security.auth.apiKey）。请在 .env 文件或系统环境变量中进行设置。",
+  "Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.":
+    "缺少 OpenAI 兼容认证的 API 密钥。请设置 {{envKeyHint}} 环境变量。",
+  "Anthropic provider missing required baseUrl in modelProviders[].baseUrl.":
+    "Anthropic 提供商缺少必需的 baseUrl，请在 modelProviders[].baseUrl 中配置。",
+  "ANTHROPIC_BASE_URL environment variable not found.": "未找到 ANTHROPIC_BASE_URL 环境变量。",
+  "Invalid auth method selected.": "选择了无效的认证方式。",
+  "Failed to authenticate. Message: {{message}}": "认证失败。消息：{{message}}",
+  "Authenticated successfully with {{authType}} credentials.": "使用 {{authType}} 凭据成功认证。",
   'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}':
     '无效的 QWEN_DEFAULT_AUTH_TYPE 值："{{value}}"。有效值为：{{validValues}}',
-  'OpenAI Configuration Required': '需要配置 OpenAI',
-  'Please enter your OpenAI configuration. You can get an API key from':
-    '请输入您的 OpenAI 配置。您可以从以下地址获取 API 密钥：',
-  'API Key:': 'API 密钥：',
-  'Invalid credentials: {{errorMessage}}': '凭据无效：{{errorMessage}}',
-  'Failed to validate credentials': '验证凭据失败',
-  'Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel':
-    '按 Enter 继续，Tab/↑↓ 导航，Esc 取消',
+  "OpenAI Configuration Required": "需要配置 OpenAI",
+  "Please enter your OpenAI configuration. You can get an API key from":
+    "请输入您的 OpenAI 配置。您可以从以下地址获取 API 密钥：",
+  "API Key:": "API 密钥：",
+  "Invalid credentials: {{errorMessage}}": "凭据无效：{{errorMessage}}",
+  "Failed to validate credentials": "验证凭据失败",
+  "Press Enter to continue, Tab/↑↓ to navigate, Esc to cancel":
+    "按 Enter 继续，Tab/↑↓ 导航，Esc 取消",
 
   // ============================================================================
   // Dialogs - Model
   // ============================================================================
-  'Select Model': '选择模型',
-  '(Press Esc to close)': '（按 Esc 关闭）',
-  'Current (effective) configuration': '当前（实际生效）配置',
-  AuthType: '认证方式',
-  'API Key': 'API 密钥',
-  unset: '未设置',
-  '(default)': '(默认)',
-  '(set)': '(已设置)',
-  '(not set)': '(未设置)',
-  Modality: '模态',
-  'Context Window': '上下文窗口',
-  text: '文本',
-  'text-only': '纯文本',
-  image: '图像',
-  pdf: 'PDF',
-  audio: '音频',
-  video: '视频',
-  'not set': '未设置',
-  none: '无',
-  unknown: '未知',
+  "Select Model": "选择模型",
+  "(Press Esc to close)": "（按 Esc 关闭）",
+  "Current (effective) configuration": "当前（实际生效）配置",
+  AuthType: "认证方式",
+  "API Key": "API 密钥",
+  unset: "未设置",
+  "(default)": "(默认)",
+  "(set)": "(已设置)",
+  "(not set)": "(未设置)",
+  Modality: "模态",
+  "Context Window": "上下文窗口",
+  text: "文本",
+  "text-only": "纯文本",
+  image: "图像",
+  pdf: "PDF",
+  audio: "音频",
+  video: "视频",
+  "not set": "未设置",
+  none: "无",
+  unknown: "未知",
   "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
     "无法切换到模型 '{{modelId}}'.\n\n{{error}}",
-  'Qwen 3.6 Plus — efficient hybrid model with leading coding performance':
-    'Qwen 3.6 Plus — 高效混合架构，编程性能业界领先',
-  'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
-    '来自阿里云 ModelStudio 的最新 Qwen Vision 模型（版本：qwen3-vl-plus-2025-09-23）',
+  "Qwen 3.6 Plus — efficient hybrid model with leading coding performance":
+    "Qwen 3.6 Plus — 高效混合架构，编程性能业界领先",
+  "The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)":
+    "来自阿里云 ModelStudio 的最新 Qwen Vision 模型（版本：qwen3-vl-plus-2025-09-23）",
 
   // ============================================================================
   // Dialogs - Permissions
   // ============================================================================
-  'Manage folder trust settings': '管理文件夹信任设置',
-  'Manage permission rules': '管理权限规则',
-  Allow: '允许',
-  Ask: '询问',
-  Deny: '拒绝',
-  Workspace: '工作区',
-  "Qwen Code won't ask before using allowed tools.":
-    'Qwen Code 使用已允许的工具前不会询问。',
-  'Qwen Code will ask before using these tools.':
-    'Qwen Code 使用这些工具前会先询问。',
-  'Qwen Code is not allowed to use denied tools.':
-    'Qwen Code 不允许使用被拒绝的工具。',
-  'Manage trusted directories for this workspace.':
-    '管理此工作区的受信任目录。',
-  'Any use of the {{tool}} tool': '{{tool}} 工具的任何使用',
-  "{{tool}} commands matching '{{pattern}}'":
-    "匹配 '{{pattern}}' 的 {{tool}} 命令",
-  'From user settings': '来自用户设置',
-  'From project settings': '来自项目设置',
-  'From session': '来自会话',
-  'Project settings (local)': '项目设置（本地）',
-  'Saved in .qwen/settings.local.json': '保存在 .qwen/settings.local.json',
-  'Project settings': '项目设置',
-  'Checked in at .qwen/settings.json': '保存在 .qwen/settings.json',
-  'User settings': '用户设置',
-  'Saved in at ~/.qwen/settings.json': '保存在 ~/.qwen/settings.json',
-  'Add a new rule…': '添加新规则…',
-  'Add {{type}} permission rule': '添加{{type}}权限规则',
-  'Permission rules are a tool name, optionally followed by a specifier in parentheses.':
-    '权限规则是一个工具名称，可选地后跟括号中的限定符。',
-  'e.g.,': '例如',
-  or: '或',
-  'Enter permission rule…': '输入权限规则…',
-  'Enter to submit · Esc to cancel': '回车提交 · Esc 取消',
-  'Where should this rule be saved?': '此规则应保存在哪里？',
-  'Enter to confirm · Esc to cancel': '回车确认 · Esc 取消',
-  'Delete {{type}} rule?': '删除{{type}}规则？',
-  'Are you sure you want to delete this permission rule?':
-    '确定要删除此权限规则吗？',
-  'Permissions:': '权限：',
-  '(←/→ or tab to cycle)': '（←/→ 或 tab 切换）',
-  'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel':
-    '按 ↑↓ 导航 · 回车选择 · 输入搜索 · Esc 取消',
-  'Search…': '搜索…',
-  'Use /trust to manage folder trust settings for this workspace.':
-    '使用 /trust 管理此工作区的文件夹信任设置。',
+  "Manage folder trust settings": "管理文件夹信任设置",
+  "Manage permission rules": "管理权限规则",
+  Allow: "允许",
+  Ask: "询问",
+  Deny: "拒绝",
+  Workspace: "工作区",
+  "Qwen Code won't ask before using allowed tools.": "Qwen Code 使用已允许的工具前不会询问。",
+  "Qwen Code will ask before using these tools.": "Qwen Code 使用这些工具前会先询问。",
+  "Qwen Code is not allowed to use denied tools.": "Qwen Code 不允许使用被拒绝的工具。",
+  "Manage trusted directories for this workspace.": "管理此工作区的受信任目录。",
+  "Any use of the {{tool}} tool": "{{tool}} 工具的任何使用",
+  "{{tool}} commands matching '{{pattern}}'": "匹配 '{{pattern}}' 的 {{tool}} 命令",
+  "From user settings": "来自用户设置",
+  "From project settings": "来自项目设置",
+  "From session": "来自会话",
+  "Project settings (local)": "项目设置（本地）",
+  "Saved in .qwen/settings.local.json": "保存在 .qwen/settings.local.json",
+  "Project settings": "项目设置",
+  "Checked in at .qwen/settings.json": "保存在 .qwen/settings.json",
+  "User settings": "用户设置",
+  "Saved in at ~/.qwen/settings.json": "保存在 ~/.qwen/settings.json",
+  "Add a new rule…": "添加新规则…",
+  "Add {{type}} permission rule": "添加{{type}}权限规则",
+  "Permission rules are a tool name, optionally followed by a specifier in parentheses.":
+    "权限规则是一个工具名称，可选地后跟括号中的限定符。",
+  "e.g.,": "例如",
+  or: "或",
+  "Enter permission rule…": "输入权限规则…",
+  "Enter to submit · Esc to cancel": "回车提交 · Esc 取消",
+  "Where should this rule be saved?": "此规则应保存在哪里？",
+  "Enter to confirm · Esc to cancel": "回车确认 · Esc 取消",
+  "Delete {{type}} rule?": "删除{{type}}规则？",
+  "Are you sure you want to delete this permission rule?": "确定要删除此权限规则吗？",
+  "Permissions:": "权限：",
+  "(←/→ or tab to cycle)": "（←/→ 或 tab 切换）",
+  "Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel":
+    "按 ↑↓ 导航 · 回车选择 · 输入搜索 · Esc 取消",
+  "Search…": "搜索…",
+  "Use /trust to manage folder trust settings for this workspace.":
+    "使用 /trust 管理此工作区的文件夹信任设置。",
   // Workspace directory management
-  'Add directory…': '添加目录…',
-  'Add directory to workspace': '添加工作区目录',
-  'Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.':
-    'Qwen Code 可以读取工作区中的文件，并在自动接受编辑模式开启时进行编辑。',
-  'Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.':
-    'Qwen Code 将能够读取此目录中的文件，并在自动接受编辑模式开启时进行编辑。',
-  'Enter the path to the directory:': '输入目录路径：',
-  'Enter directory path…': '输入目录路径…',
-  'Tab to complete · Enter to add · Esc to cancel':
-    'Tab 补全 · 回车添加 · Esc 取消',
-  'Remove directory?': '删除目录？',
-  'Are you sure you want to remove this directory from the workspace?':
-    '确定要将此目录从工作区中移除吗？',
-  '  (Original working directory)': '  （原始工作目录）',
-  '  (from settings)': '  （来自设置）',
-  'Directory does not exist.': '目录不存在。',
-  'Path is not a directory.': '路径不是目录。',
-  'This directory is already in the workspace.': '此目录已在工作区中。',
-  'Already covered by existing directory: {{dir}}': '已被现有目录覆盖：{{dir}}',
+  "Add directory…": "添加目录…",
+  "Add directory to workspace": "添加工作区目录",
+  "Qwen Code can read files in the workspace, and make edits when auto-accept edits is on.":
+    "Qwen Code 可以读取工作区中的文件，并在自动接受编辑模式开启时进行编辑。",
+  "Qwen Code will be able to read files in this directory and make edits when auto-accept edits is on.":
+    "Qwen Code 将能够读取此目录中的文件，并在自动接受编辑模式开启时进行编辑。",
+  "Enter the path to the directory:": "输入目录路径：",
+  "Enter directory path…": "输入目录路径…",
+  "Tab to complete · Enter to add · Esc to cancel": "Tab 补全 · 回车添加 · Esc 取消",
+  "Remove directory?": "删除目录？",
+  "Are you sure you want to remove this directory from the workspace?":
+    "确定要将此目录从工作区中移除吗？",
+  "  (Original working directory)": "  （原始工作目录）",
+  "  (from settings)": "  （来自设置）",
+  "Directory does not exist.": "目录不存在。",
+  "Path is not a directory.": "路径不是目录。",
+  "This directory is already in the workspace.": "此目录已在工作区中。",
+  "Already covered by existing directory: {{dir}}": "已被现有目录覆盖：{{dir}}",
 
   // ============================================================================
   // Status Bar
   // ============================================================================
-  'Using:': '已加载: ',
-  '{{count}} open file': '{{count}} 个打开的文件',
-  '{{count}} open files': '{{count}} 个打开的文件',
-  '(ctrl+g to view)': '（按 ctrl+g 查看）',
-  '{{count}} {{name}} file': '{{count}} 个 {{name}} 文件',
-  '{{count}} {{name}} files': '{{count}} 个 {{name}} 文件',
-  '{{count}} MCP server': '{{count}} 个 MCP 服务器',
-  '{{count}} MCP servers': '{{count}} 个 MCP 服务器',
-  '{{count}} Blocked': '{{count}} 个已阻止',
-  '(ctrl+t to view)': '（按 ctrl+t 查看）',
-  '(ctrl+t to toggle)': '（按 ctrl+t 切换）',
-  'Press Ctrl+C again to exit.': '再次按 Ctrl+C 退出',
-  'Press Ctrl+D again to exit.': '再次按 Ctrl+D 退出',
-  'Press Esc again to clear.': '再次按 Esc 清除',
+  "Using:": "已加载: ",
+  "{{count}} open file": "{{count}} 个打开的文件",
+  "{{count}} open files": "{{count}} 个打开的文件",
+  "(ctrl+g to view)": "（按 ctrl+g 查看）",
+  "{{count}} {{name}} file": "{{count}} 个 {{name}} 文件",
+  "{{count}} {{name}} files": "{{count}} 个 {{name}} 文件",
+  "{{count}} MCP server": "{{count}} 个 MCP 服务器",
+  "{{count}} MCP servers": "{{count}} 个 MCP 服务器",
+  "{{count}} Blocked": "{{count}} 个已阻止",
+  "(ctrl+t to view)": "（按 ctrl+t 查看）",
+  "(ctrl+t to toggle)": "（按 ctrl+t 切换）",
+  "Press Ctrl+C again to exit.": "再次按 Ctrl+C 退出",
+  "Press Ctrl+D again to exit.": "再次按 Ctrl+D 退出",
+  "Press Esc again to clear.": "再次按 Esc 清除",
 
   // ============================================================================
   // MCP Status
   // ============================================================================
-  'No MCP servers configured.': '未配置 MCP 服务器',
-  '⏳ MCP servers are starting up ({{count}} initializing)...':
-    '⏳ MCP 服务器正在启动（{{count}} 个正在初始化）...',
-  'Note: First startup may take longer. Tool availability will update automatically.':
-    '注意：首次启动可能需要更长时间。工具可用性将自动更新',
-  'Configured MCP servers:': '已配置的 MCP 服务器：',
-  Ready: '就绪',
-  'Starting... (first startup may take longer)':
-    '正在启动...（首次启动可能需要更长时间）',
-  Disconnected: '已断开连接',
-  '{{count}} tool': '{{count}} 个工具',
-  '{{count}} tools': '{{count}} 个工具',
-  '{{count}} prompt': '{{count}} 个提示',
-  '{{count}} prompts': '{{count}} 个提示',
-  '(from {{extensionName}})': '（来自 {{extensionName}}）',
-  OAuth: 'OAuth',
-  'OAuth expired': 'OAuth 已过期',
-  'OAuth not authenticated': 'OAuth 未认证',
-  'tools and prompts will appear when ready': '工具和提示将在就绪时显示',
-  '{{count}} tools cached': '{{count}} 个工具已缓存',
-  'Tools:': '工具：',
-  'Parameters:': '参数：',
-  'Prompts:': '提示：',
-  Blocked: '已阻止',
-  '💡 Tips:': '💡 提示：',
-  Use: '使用',
-  'to show server and tool descriptions': '显示服务器和工具描述',
-  'to show tool parameter schemas': '显示工具参数架构',
-  'to hide descriptions': '隐藏描述',
-  'to authenticate with OAuth-enabled servers':
-    '使用支持 OAuth 的服务器进行认证',
-  Press: '按',
-  'to toggle tool descriptions on/off': '切换工具描述开关',
+  "No MCP servers configured.": "未配置 MCP 服务器",
+  "⏳ MCP servers are starting up ({{count}} initializing)...":
+    "⏳ MCP 服务器正在启动（{{count}} 个正在初始化）...",
+  "Note: First startup may take longer. Tool availability will update automatically.":
+    "注意：首次启动可能需要更长时间。工具可用性将自动更新",
+  "Configured MCP servers:": "已配置的 MCP 服务器：",
+  Ready: "就绪",
+  "Starting... (first startup may take longer)": "正在启动...（首次启动可能需要更长时间）",
+  Disconnected: "已断开连接",
+  "{{count}} tool": "{{count}} 个工具",
+  "{{count}} tools": "{{count}} 个工具",
+  "{{count}} prompt": "{{count}} 个提示",
+  "{{count}} prompts": "{{count}} 个提示",
+  "(from {{extensionName}})": "（来自 {{extensionName}}）",
+  OAuth: "OAuth",
+  "OAuth expired": "OAuth 已过期",
+  "OAuth not authenticated": "OAuth 未认证",
+  "tools and prompts will appear when ready": "工具和提示将在就绪时显示",
+  "{{count}} tools cached": "{{count}} 个工具已缓存",
+  "Tools:": "工具：",
+  "Parameters:": "参数：",
+  "Prompts:": "提示：",
+  Blocked: "已阻止",
+  "💡 Tips:": "💡 提示：",
+  Use: "使用",
+  "to show server and tool descriptions": "显示服务器和工具描述",
+  "to show tool parameter schemas": "显示工具参数架构",
+  "to hide descriptions": "隐藏描述",
+  "to authenticate with OAuth-enabled servers": "使用支持 OAuth 的服务器进行认证",
+  Press: "按",
+  "to toggle tool descriptions on/off": "切换工具描述开关",
   "Starting OAuth authentication for MCP server '{{name}}'...":
     "正在为 MCP 服务器 '{{name}}' 启动 OAuth 认证...",
-  'Restarting MCP servers...': '正在重启 MCP 服务器...',
+  "Restarting MCP servers...": "正在重启 MCP 服务器...",
 
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips:': '提示：',
-  'Use /compress when the conversation gets long to summarize history and free up context.':
-    '对话变长时用 /compress，总结历史并释放上下文。',
-  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
-    '用 /clear 或 /new 开启新思路；之前的会话会保留在历史记录中。',
-  'Use /bug to submit issues to the maintainers when something goes off.':
-    '遇到问题时，用 /bug 将问题提交给维护者。',
-  'Switch auth type quickly with /auth.': '用 /auth 快速切换认证方式。',
-  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
-    '在 Qwen Code 中使用 ! 可运行任意 shell 命令（例如 !ls）。',
-  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
-    '输入 / 打开命令弹窗；按 Tab 自动补全斜杠命令和保存的提示词。',
-  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
-    '运行 qwen --continue 或 qwen --resume 可继续之前的会话。',
-  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
-    '按 Shift+Tab 或输入 /approval-mode 可快速切换权限模式。',
-  'You can switch permission mode quickly with Tab or /approval-mode.':
-    '按 Tab 或输入 /approval-mode 可快速切换权限模式。',
-  'Try /insight to generate personalized insights from your chat history.':
-    '试试 /insight，从聊天记录中生成个性化洞察。',
+  "Tips:": "提示：",
+  "Use /compress when the conversation gets long to summarize history and free up context.":
+    "对话变长时用 /compress，总结历史并释放上下文。",
+  "Start a fresh idea with /clear or /new; the previous session stays available in history.":
+    "用 /clear 或 /new 开启新思路；之前的会话会保留在历史记录中。",
+  "Use /bug to submit issues to the maintainers when something goes off.":
+    "遇到问题时，用 /bug 将问题提交给维护者。",
+  "Switch auth type quickly with /auth.": "用 /auth 快速切换认证方式。",
+  "You can run any shell commands from Qwen Code using ! (e.g. !ls).":
+    "在 Qwen Code 中使用 ! 可运行任意 shell 命令（例如 !ls）。",
+  "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.":
+    "输入 / 打开命令弹窗；按 Tab 自动补全斜杠命令和保存的提示词。",
+  "You can resume a previous conversation by running qwen --continue or qwen --resume.":
+    "运行 qwen --continue 或 qwen --resume 可继续之前的会话。",
+  "You can switch permission mode quickly with Shift+Tab or /approval-mode.":
+    "按 Shift+Tab 或输入 /approval-mode 可快速切换权限模式。",
+  "You can switch permission mode quickly with Tab or /approval-mode.":
+    "按 Tab 或输入 /approval-mode 可快速切换权限模式。",
+  "Try /insight to generate personalized insights from your chat history.":
+    "试试 /insight，从聊天记录中生成个性化洞察。",
 
   // ============================================================================
   // Exit Screen / Stats
   // ============================================================================
-  'Agent powering down. Goodbye!': 'Qwen Code 正在关闭，再见！',
-  'To continue this session, run': '要继续此会话，请运行',
-  'Interaction Summary': '交互摘要',
-  'Session ID:': '会话 ID：',
-  'Tool Calls:': '工具调用：',
-  'Success Rate:': '成功率：',
-  'User Agreement:': '用户同意率：',
-  reviewed: '已审核',
-  'Code Changes:': '代码变更：',
-  Performance: '性能',
-  'Wall Time:': '总耗时：',
-  'Agent Active:': '智能体活跃时间：',
-  'API Time:': 'API 时间：',
-  'Tool Time:': '工具时间：',
-  'Session Stats': '会话统计',
-  'Model Usage': '模型使用情况',
-  Reqs: '请求数',
-  'Input Tokens': '输入 token 数',
-  'Output Tokens': '输出 token 数',
-  'Savings Highlight:': '节省亮点：',
-  'of input tokens were served from the cache, reducing costs.':
-    '从缓存载入 token ，降低了成本',
-  'Tip: For a full token breakdown, run `/stats model`.':
-    '提示：要查看完整的令牌明细，请运行 `/stats model`',
-  'Model Stats For Nerds': '模型统计（技术细节）',
-  'Tool Stats For Nerds': '工具统计（技术细节）',
-  Metric: '指标',
-  API: 'API',
-  Requests: '请求数',
-  Errors: '错误数',
-  'Avg Latency': '平均延迟',
-  Tokens: '令牌',
-  Total: '总计',
-  Prompt: '提示',
-  Cached: '缓存',
-  Thoughts: '思考',
-  Tool: '工具',
-  Output: '输出',
-  'No API calls have been made in this session.':
-    '本次会话中未进行任何 API 调用',
-  'Tool Name': '工具名称',
-  Calls: '调用次数',
-  'Success Rate': '成功率',
-  'Avg Duration': '平均耗时',
-  'User Decision Summary': '用户决策摘要',
-  'Total Reviewed Suggestions:': '已审核建议总数：',
-  ' » Accepted:': ' » 已接受：',
-  ' » Rejected:': ' » 已拒绝：',
-  ' » Modified:': ' » 已修改：',
-  ' Overall Agreement Rate:': ' 总体同意率：',
-  'No tool calls have been made in this session.':
-    '本次会话中未进行任何工具调用',
-  'Session start time is unavailable, cannot calculate stats.':
-    '会话开始时间不可用，无法计算统计信息',
+  "Agent powering down. Goodbye!": "Qwen Code 正在关闭，再见！",
+  "To continue this session, run": "要继续此会话，请运行",
+  "Interaction Summary": "交互摘要",
+  "Session ID:": "会话 ID：",
+  "Tool Calls:": "工具调用：",
+  "Success Rate:": "成功率：",
+  "User Agreement:": "用户同意率：",
+  reviewed: "已审核",
+  "Code Changes:": "代码变更：",
+  Performance: "性能",
+  "Wall Time:": "总耗时：",
+  "Agent Active:": "智能体活跃时间：",
+  "API Time:": "API 时间：",
+  "Tool Time:": "工具时间：",
+  "Session Stats": "会话统计",
+  "Model Usage": "模型使用情况",
+  Reqs: "请求数",
+  "Input Tokens": "输入 token 数",
+  "Output Tokens": "输出 token 数",
+  "Savings Highlight:": "节省亮点：",
+  "of input tokens were served from the cache, reducing costs.": "从缓存载入 token ，降低了成本",
+  "Tip: For a full token breakdown, run `/stats model`.":
+    "提示：要查看完整的令牌明细，请运行 `/stats model`",
+  "Model Stats For Nerds": "模型统计（技术细节）",
+  "Tool Stats For Nerds": "工具统计（技术细节）",
+  Metric: "指标",
+  API: "API",
+  Requests: "请求数",
+  Errors: "错误数",
+  "Avg Latency": "平均延迟",
+  Tokens: "令牌",
+  Total: "总计",
+  Prompt: "提示",
+  Cached: "缓存",
+  Thoughts: "思考",
+  Tool: "工具",
+  Output: "输出",
+  "No API calls have been made in this session.": "本次会话中未进行任何 API 调用",
+  "Tool Name": "工具名称",
+  Calls: "调用次数",
+  "Success Rate": "成功率",
+  "Avg Duration": "平均耗时",
+  "User Decision Summary": "用户决策摘要",
+  "Total Reviewed Suggestions:": "已审核建议总数：",
+  " » Accepted:": " » 已接受：",
+  " » Rejected:": " » 已拒绝：",
+  " » Modified:": " » 已修改：",
+  " Overall Agreement Rate:": " 总体同意率：",
+  "No tool calls have been made in this session.": "本次会话中未进行任何工具调用",
+  "Session start time is unavailable, cannot calculate stats.":
+    "会话开始时间不可用，无法计算统计信息",
 
   // ============================================================================
   // Command Format Migration
   // ============================================================================
-  'Command Format Migration': '命令格式迁移',
-  'Found {{count}} TOML command file:': '发现 {{count}} 个 TOML 命令文件：',
-  'Found {{count}} TOML command files:': '发现 {{count}} 个 TOML 命令文件：',
-  '... and {{count}} more': '... 以及其他 {{count}} 个',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'TOML 格式已弃用。是否将它们迁移到 Markdown 格式？',
-  '(Backups will be created and original files will be preserved)':
-    '（将创建备份，原始文件将保留）',
+  "Command Format Migration": "命令格式迁移",
+  "Found {{count}} TOML command file:": "发现 {{count}} 个 TOML 命令文件：",
+  "Found {{count}} TOML command files:": "发现 {{count}} 个 TOML 命令文件：",
+  "... and {{count}} more": "... 以及其他 {{count}} 个",
+  "The TOML format is deprecated. Would you like to migrate them to Markdown format?":
+    "TOML 格式已弃用。是否将它们迁移到 Markdown 格式？",
+  "(Backups will be created and original files will be preserved)":
+    "（将创建备份，原始文件将保留）",
 
   // ============================================================================
   // Loading Phrases
   // ============================================================================
-  'Waiting for user confirmation...': '等待用户确认...',
-  '(esc to cancel, {{time}})': '（按 esc 取消，{{time}}）',
+  "Waiting for user confirmation...": "等待用户确认...",
+  "(esc to cancel, {{time}})": "（按 esc 取消，{{time}}）",
   WITTY_LOADING_PHRASES: [
     // --- 职场搬砖系列 ---
-    '正在努力搬砖，请稍候...',
-    '老板在身后，快加载啊！',
-    '头发掉光前，一定能加载完...',
-    '服务器正在深呼吸，准备放大招...',
-    '正在向服务器投喂咖啡...',
+    "正在努力搬砖，请稍候...",
+    "老板在身后，快加载啊！",
+    "头发掉光前，一定能加载完...",
+    "服务器正在深呼吸，准备放大招...",
+    "正在向服务器投喂咖啡...",
 
     // --- 大厂黑话系列 ---
-    '正在赋能全链路，寻找关键抓手...',
-    '正在降本增效，优化加载路径...',
-    '正在打破部门壁垒，沉淀方法论...',
-    '正在拥抱变化，迭代核心价值...',
-    '正在对齐颗粒度，打磨底层逻辑...',
-    '大力出奇迹，正在强行加载...',
+    "正在赋能全链路，寻找关键抓手...",
+    "正在降本增效，优化加载路径...",
+    "正在打破部门壁垒，沉淀方法论...",
+    "正在拥抱变化，迭代核心价值...",
+    "正在对齐颗粒度，打磨底层逻辑...",
+    "大力出奇迹，正在强行加载...",
 
     // --- 程序员自嘲系列 ---
-    '只要我不写代码，代码就没有 Bug...',
-    '正在把 Bug 转化为 Feature...',
-    '只要我不尴尬，Bug 就追不上我...',
-    '正在试图理解去年的自己写了什么...',
-    '正在猿力觉醒中，请耐心等待...',
+    "只要我不写代码，代码就没有 Bug...",
+    "正在把 Bug 转化为 Feature...",
+    "只要我不尴尬，Bug 就追不上我...",
+    "正在试图理解去年的自己写了什么...",
+    "正在猿力觉醒中，请耐心等待...",
 
     // --- 合作愉快系列 ---
-    '正在询问产品经理：这需求是真的吗？',
-    '正在给产品经理画饼，请稍等...',
+    "正在询问产品经理：这需求是真的吗？",
+    "正在给产品经理画饼，请稍等...",
 
     // --- 温暖治愈系列 ---
-    '每一行代码，都在努力让世界变得更好一点点...',
-    '每一个伟大的想法，都值得这份耐心的等待...',
-    '别急，美好的事物总是需要一点时间去酝酿...',
-    '愿你的代码永无 Bug，愿你的梦想终将成真...',
-    '哪怕只有 0.1% 的进度，也是在向目标靠近...',
-    '加载的是字节，承载的是对技术的热爱...',
+    "每一行代码，都在努力让世界变得更好一点点...",
+    "每一个伟大的想法，都值得这份耐心的等待...",
+    "别急，美好的事物总是需要一点时间去酝酿...",
+    "愿你的代码永无 Bug，愿你的梦想终将成真...",
+    "哪怕只有 0.1% 的进度，也是在向目标靠近...",
+    "加载的是字节，承载的是对技术的热爱...",
   ],
 
   // ============================================================================
   // Extension Settings Input
   // ============================================================================
-  'Enter value...': '请输入值...',
-  'Enter sensitive value...': '请输入敏感值...',
-  'Press Enter to submit, Escape to cancel': '按 Enter 提交，Escape 取消',
+  "Enter value...": "请输入值...",
+  "Enter sensitive value...": "请输入敏感值...",
+  "Press Enter to submit, Escape to cancel": "按 Enter 提交，Escape 取消",
 
   // ============================================================================
   // Command Migration Tool
   // ============================================================================
-  'Markdown file already exists: {{filename}}':
-    'Markdown 文件已存在：{{filename}}',
-  'TOML Command Format Deprecation Notice': 'TOML 命令格式弃用通知',
-  'Found {{count}} command file(s) in TOML format:':
-    '发现 {{count}} 个 TOML 格式的命令文件：',
-  'The TOML format for commands is being deprecated in favor of Markdown format.':
-    '命令的 TOML 格式正在被弃用，推荐使用 Markdown 格式。',
-  'Markdown format is more readable and easier to edit.':
-    'Markdown 格式更易读、更易编辑。',
-  'You can migrate these files automatically using:':
-    '您可以使用以下命令自动迁移这些文件：',
-  'Or manually convert each file:': '或手动转换每个文件：',
-  'TOML: prompt = "..." / description = "..."':
-    'TOML：prompt = "..." / description = "..."',
-  'Markdown: YAML frontmatter + content': 'Markdown：YAML frontmatter + 内容',
-  'The migration tool will:': '迁移工具将：',
-  'Convert TOML files to Markdown': '将 TOML 文件转换为 Markdown',
-  'Create backups of original files': '创建原始文件的备份',
-  'Preserve all command functionality': '保留所有命令功能',
-  'TOML format will continue to work for now, but migration is recommended.':
-    'TOML 格式目前仍可使用，但建议迁移。',
+  "Markdown file already exists: {{filename}}": "Markdown 文件已存在：{{filename}}",
+  "TOML Command Format Deprecation Notice": "TOML 命令格式弃用通知",
+  "Found {{count}} command file(s) in TOML format:": "发现 {{count}} 个 TOML 格式的命令文件：",
+  "The TOML format for commands is being deprecated in favor of Markdown format.":
+    "命令的 TOML 格式正在被弃用，推荐使用 Markdown 格式。",
+  "Markdown format is more readable and easier to edit.": "Markdown 格式更易读、更易编辑。",
+  "You can migrate these files automatically using:": "您可以使用以下命令自动迁移这些文件：",
+  "Or manually convert each file:": "或手动转换每个文件：",
+  'TOML: prompt = "..." / description = "..."': 'TOML：prompt = "..." / description = "..."',
+  "Markdown: YAML frontmatter + content": "Markdown：YAML frontmatter + 内容",
+  "The migration tool will:": "迁移工具将：",
+  "Convert TOML files to Markdown": "将 TOML 文件转换为 Markdown",
+  "Create backups of original files": "创建原始文件的备份",
+  "Preserve all command functionality": "保留所有命令功能",
+  "TOML format will continue to work for now, but migration is recommended.":
+    "TOML 格式目前仍可使用，但建议迁移。",
 
   // ============================================================================
   // Extensions - Explore Command
   // ============================================================================
-  'Open extensions page in your browser': '在浏览器中打开扩展市场页面',
-  'Unknown extensions source: {{source}}.': '未知的扩展来源：{{source}}。',
-  'Would open extensions page in your browser: {{url}} (skipped in test environment)':
-    '将在浏览器中打开扩展页面：{{url}}（测试环境中已跳过）',
-  'View available extensions at {{url}}': '在 {{url}} 查看可用扩展',
-  'Opening extensions page in your browser: {{url}}':
-    '正在浏览器中打开扩展页面：{{url}}',
-  'Failed to open browser. Check out the extensions gallery at {{url}}':
-    '打开浏览器失败。请访问扩展市场：{{url}}',
+  "Open extensions page in your browser": "在浏览器中打开扩展市场页面",
+  "Unknown extensions source: {{source}}.": "未知的扩展来源：{{source}}。",
+  "Would open extensions page in your browser: {{url}} (skipped in test environment)":
+    "将在浏览器中打开扩展页面：{{url}}（测试环境中已跳过）",
+  "View available extensions at {{url}}": "在 {{url}} 查看可用扩展",
+  "Opening extensions page in your browser: {{url}}": "正在浏览器中打开扩展页面：{{url}}",
+  "Failed to open browser. Check out the extensions gallery at {{url}}":
+    "打开浏览器失败。请访问扩展市场：{{url}}",
 
   // ============================================================================
   // Retry / Rate Limit
   // ============================================================================
-  'Rate limit error: {{reason}}': '触发限流：{{reason}}',
-  'Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})':
-    '将于 {{seconds}} 秒后重试…（第 {{attempt}}/{{maxRetries}} 次）',
-  'Press Ctrl+Y to retry': '按 Ctrl+Y 重试。',
-  'No failed request to retry.': '没有可重试的失败请求。',
-  'to retry last request': '重试上一次请求',
+  "Rate limit error: {{reason}}": "触发限流：{{reason}}",
+  "Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})":
+    "将于 {{seconds}} 秒后重试…（第 {{attempt}}/{{maxRetries}} 次）",
+  "Press Ctrl+Y to retry": "按 Ctrl+Y 重试。",
+  "No failed request to retry.": "没有可重试的失败请求。",
+  "to retry last request": "重试上一次请求",
 
   // ============================================================================
   // Coding Plan Authentication
   // ============================================================================
-  'API key cannot be empty.': 'API Key 不能为空。',
+  "API key cannot be empty.": "API Key 不能为空。",
   'Invalid API key. Coding Plan API keys start with "sk-sp-". Please check.':
     '无效的 API Key，Coding Plan API Key 均以 "sk-sp-" 开头，请检查',
-  'You can get your Coding Plan API key here':
-    '您可以在这里获取 Coding Plan API Key',
-  'API key is stored in settings.env. You can migrate it to a .env file for better security.':
-    'API Key 已存储在 settings.env 中。您可以将其迁移到 .env 文件以获得更好的安全性。',
-  'New model configurations are available for Alibaba Cloud Coding Plan. Update now?':
-    '阿里云百炼 Coding Plan 有新模型配置可用。是否立即更新？',
-  'Coding Plan configuration updated successfully. New models are now available.':
-    'Coding Plan 配置更新成功。新模型现已可用。',
-  'Coding Plan API key not found. Please re-authenticate with Coding Plan.':
-    '未找到 Coding Plan API Key。请重新通过 Coding Plan 认证。',
-  'Failed to update Coding Plan configuration: {{message}}':
-    '更新 Coding Plan 配置失败：{{message}}',
+  "You can get your Coding Plan API key here": "您可以在这里获取 Coding Plan API Key",
+  "API key is stored in settings.env. You can migrate it to a .env file for better security.":
+    "API Key 已存储在 settings.env 中。您可以将其迁移到 .env 文件以获得更好的安全性。",
+  "New model configurations are available for Alibaba Cloud Coding Plan. Update now?":
+    "阿里云百炼 Coding Plan 有新模型配置可用。是否立即更新？",
+  "Coding Plan configuration updated successfully. New models are now available.":
+    "Coding Plan 配置更新成功。新模型现已可用。",
+  "Coding Plan API key not found. Please re-authenticate with Coding Plan.":
+    "未找到 Coding Plan API Key。请重新通过 Coding Plan 认证。",
+  "Failed to update Coding Plan configuration: {{message}}":
+    "更新 Coding Plan 配置失败：{{message}}",
 
   // ============================================================================
   // Custom API Key Configuration
   // ============================================================================
-  'You can configure your API key and models in settings.json':
-    '您可以在 settings.json 中配置 API Key 和模型',
-  'Refer to the documentation for setup instructions': '请参考文档了解配置说明',
+  "You can configure your API key and models in settings.json":
+    "您可以在 settings.json 中配置 API Key 和模型",
+  "Refer to the documentation for setup instructions": "请参考文档了解配置说明",
 
   // ============================================================================
   // Auth Dialog - View Titles and Labels
   // ============================================================================
-  'API-KEY': 'API-KEY',
-  'Coding Plan': 'Coding Plan',
+  "API-KEY": "API-KEY",
+  "Coding Plan": "Coding Plan",
   "Paste your api key of ModelStudio Coding Plan and you're all set!":
-    '粘贴您的百炼 Coding Plan API Key，即可完成设置！',
-  Custom: '自定义',
-  'More instructions about configuring `modelProviders` manually.':
-    '关于手动配置 `modelProviders` 的更多说明。',
-  'Select API-KEY configuration mode:': '选择 API-KEY 配置模式：',
-  '(Press Escape to go back)': '(按 Escape 键返回)',
-  '(Press Enter to submit, Escape to cancel)': '(按 Enter 提交，Escape 取消)',
-  'Select Region for Coding Plan': '选择 Coding Plan 区域',
-  'Choose based on where your account is registered':
-    '请根据您的账号注册地区选择',
-  'Enter Coding Plan API Key': '输入 Coding Plan API Key',
+    "粘贴您的百炼 Coding Plan API Key，即可完成设置！",
+  Custom: "自定义",
+  "More instructions about configuring `modelProviders` manually.":
+    "关于手动配置 `modelProviders` 的更多说明。",
+  "Select API-KEY configuration mode:": "选择 API-KEY 配置模式：",
+  "(Press Escape to go back)": "(按 Escape 键返回)",
+  "(Press Enter to submit, Escape to cancel)": "(按 Enter 提交，Escape 取消)",
+  "Select Region for Coding Plan": "选择 Coding Plan 区域",
+  "Choose based on where your account is registered": "请根据您的账号注册地区选择",
+  "Enter Coding Plan API Key": "输入 Coding Plan API Key",
 
   // ============================================================================
   // Coding Plan International Updates
   // ============================================================================
-  'New model configurations are available for {{region}}. Update now?':
-    '{{region}} 有新的模型配置可用。是否立即更新？',
+  "New model configurations are available for {{region}}. Update now?":
+    "{{region}} 有新的模型配置可用。是否立即更新？",
   '{{region}} configuration updated successfully. Model switched to "{{model}}".':
     '{{region}} 配置更新成功。模型已切换至 "{{model}}"。',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).':
-    '成功通过 {{region}} 认证。API Key 和模型配置已保存至 settings.json（已备份）。',
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json (backed up).":
+    "成功通过 {{region}} 认证。API Key 和模型配置已保存至 settings.json（已备份）。",
 
   // ============================================================================
   // Context Usage
   // ============================================================================
-  'Context Usage': '上下文使用情况',
-  'Context window': '上下文窗口',
-  Used: '已用',
-  Free: '空闲',
-  'Autocompact buffer': '自动压缩缓冲区',
-  'Usage by category': '分类用量',
-  'System prompt': '系统提示',
-  'Built-in tools': '内置工具',
-  'MCP tools': 'MCP 工具',
-  'Memory files': '记忆文件',
-  Skills: '技能',
-  Messages: '消息',
-  tokens: 'tokens',
-  'Estimated pre-conversation overhead': '预估对话前开销',
-  'No API response yet. Send a message to see actual usage.':
-    '暂无 API 响应。发送消息以查看实际使用情况。',
-  'Show context window usage breakdown.': '显示上下文窗口使用情况分解。',
-  'Run /context detail for per-item breakdown.':
-    '运行 /context detail 查看详细分解。',
-  'body loaded': '内容已加载',
-  memory: '记忆',
-  '{{region}} configuration updated successfully.': '{{region}} 配置更新成功。',
-  'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.':
-    '成功通过 {{region}} 认证。API Key 和模型配置已保存至 settings.json。',
-  'Tip: Use /model to switch between available Coding Plan models.':
-    '提示：使用 /model 切换可用的 Coding Plan 模型。',
+  "Context Usage": "上下文使用情况",
+  "Context window": "上下文窗口",
+  Used: "已用",
+  Free: "空闲",
+  "Autocompact buffer": "自动压缩缓冲区",
+  "Usage by category": "分类用量",
+  "System prompt": "系统提示",
+  "Built-in tools": "内置工具",
+  "MCP tools": "MCP 工具",
+  "Memory files": "记忆文件",
+  Skills: "技能",
+  Messages: "消息",
+  tokens: "tokens",
+  "Estimated pre-conversation overhead": "预估对话前开销",
+  "No API response yet. Send a message to see actual usage.":
+    "暂无 API 响应。发送消息以查看实际使用情况。",
+  "Show context window usage breakdown.": "显示上下文窗口使用情况分解。",
+  "Run /context detail for per-item breakdown.": "运行 /context detail 查看详细分解。",
+  "body loaded": "内容已加载",
+  memory: "记忆",
+  "{{region}} configuration updated successfully.": "{{region}} 配置更新成功。",
+  "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.":
+    "成功通过 {{region}} 认证。API Key 和模型配置已保存至 settings.json。",
+  "Tip: Use /model to switch between available Coding Plan models.":
+    "提示：使用 /model 切换可用的 Coding Plan 模型。",
 
   // ============================================================================
   // Ask User Question Tool
   // ============================================================================
-  'Please answer the following question(s):': '请回答以下问题：',
-  'Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.':
-    '无法在非交互模式下询问用户问题。请在交互模式下运行以使用此工具。',
-  'User declined to answer the questions.': '用户拒绝回答问题。',
-  'User has provided the following answers:': '用户提供了以下答案：',
-  'Failed to process user answers:': '处理用户答案失败：',
-  'Type something...': '输入内容...',
-  Submit: '提交',
-  'Submit answers': '提交答案',
-  Cancel: '取消',
-  'Your answers:': '您的答案：',
-  '(not answered)': '(未回答)',
-  'Ready to submit your answers?': '准备好提交您的答案了吗？',
-  '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select':
-    '↑/↓: 导航 | ←/→: 切换标签页 | Enter: 选择',
-  '↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: 导航 | ←/→: 切换标签页 | Space/Enter: 切换 | Esc: 取消',
-  '↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel':
-    '↑/↓: 导航 | Space/Enter: 切换 | Esc: 取消',
-  '↑/↓: Navigate | Enter: Select | Esc: Cancel':
-    '↑/↓: 导航 | Enter: 选择 | Esc: 取消',
+  "Please answer the following question(s):": "请回答以下问题：",
+  "Cannot ask user questions in non-interactive mode. Please run in interactive mode to use this tool.":
+    "无法在非交互模式下询问用户问题。请在交互模式下运行以使用此工具。",
+  "User declined to answer the questions.": "用户拒绝回答问题。",
+  "User has provided the following answers:": "用户提供了以下答案：",
+  "Failed to process user answers:": "处理用户答案失败：",
+  "Type something...": "输入内容...",
+  Submit: "提交",
+  "Submit answers": "提交答案",
+  Cancel: "取消",
+  "Your answers:": "您的答案：",
+  "(not answered)": "(未回答)",
+  "Ready to submit your answers?": "准备好提交您的答案了吗？",
+  "↑/↓: Navigate | ←/→: Switch tabs | Enter: Select": "↑/↓: 导航 | ←/→: 切换标签页 | Enter: 选择",
+  "↑/↓: Navigate | ←/→: Switch tabs | Space/Enter: Toggle | Esc: Cancel":
+    "↑/↓: 导航 | ←/→: 切换标签页 | Space/Enter: 切换 | Esc: 取消",
+  "↑/↓: Navigate | Space/Enter: Toggle | Esc: Cancel": "↑/↓: 导航 | Space/Enter: 切换 | Esc: 取消",
+  "↑/↓: Navigate | Enter: Select | Esc: Cancel": "↑/↓: 导航 | Enter: 选择 | Esc: 取消",
 
   // ============================================================================
   // Commands - Auth
   // ============================================================================
-  'Authenticate using Alibaba Cloud Coding Plan':
-    '使用阿里云百炼 Coding Plan 进行认证',
-  'Region for Coding Plan (china/global)': 'Coding Plan 区域 (china/global)',
-  'API key for Coding Plan': 'Coding Plan 的 API 密钥',
-  'Show current authentication status': '显示当前认证状态',
-  'Authentication completed successfully.': '认证完成。',
-  'Processing Alibaba Cloud Coding Plan authentication...':
-    '正在处理阿里云百炼 Coding Plan 认证...',
-  'Successfully authenticated with Alibaba Cloud Coding Plan.':
-    '已成功通过阿里云百炼 Coding Plan 认证。',
-  'Failed to authenticate with Coding Plan: {{error}}':
-    'Coding Plan 认证失败：{{error}}',
-  '中国 (China)': '中国 (China)',
-  '阿里云百炼 (aliyun.com)': '阿里云百炼 (aliyun.com)',
-  Global: '全球',
-  'Alibaba Cloud (alibabacloud.com)': 'Alibaba Cloud (alibabacloud.com)',
-  'Select region for Coding Plan:': '选择 Coding Plan 区域：',
-  'Enter your Coding Plan API key: ': '请输入您的 Coding Plan API 密钥：',
-  'Select authentication method:': '选择认证方式：',
-  '\n=== Authentication Status ===\n': '\n=== 认证状态 ===\n',
-  '⚠️  No authentication method configured.\n': '⚠️  未配置认证方式。\n',
-  'Run one of the following commands to get started:\n':
-    '运行以下命令之一开始配置：\n',
-  '  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n':
-    '  qwen auth coding-plan      - 使用阿里云百炼 Coding Plan 认证\n',
-  'Or simply run:': '或者直接运行：',
-  '  qwen auth                - Interactive authentication setup\n':
-    '  qwen auth                - 交互式认证配置\n',
-  '✓ Authentication Method: Alibaba Cloud Coding Plan':
-    '✓ 认证方式：阿里云百炼 Coding Plan',
-  '中国 (China) - 阿里云百炼': '中国 (China) - 阿里云百炼',
-  'Global - Alibaba Cloud': '全球 - Alibaba Cloud',
-  '  Region: {{region}}': '  区域：{{region}}',
-  '  Current Model: {{model}}': '  当前模型：{{model}}',
-  '  Config Version: {{version}}': '  配置版本：{{version}}',
-  '  Status: API key configured\n': '  状态：API 密钥已配置\n',
-  '⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)':
-    '⚠️  认证方式：阿里云百炼 Coding Plan（不完整）',
-  '  Issue: API key not found in environment or settings\n':
-    '  问题：在环境变量或设置中未找到 API 密钥\n',
-  '  Run `qwen auth coding-plan` to re-configure.\n':
-    '  运行 `qwen auth coding-plan` 重新配置。\n',
-  '✓ Authentication Method: {{type}}': '✓ 认证方式：{{type}}',
-  '  Status: Configured\n': '  状态：已配置\n',
-  'Failed to check authentication status: {{error}}':
-    '检查认证状态失败：{{error}}',
-  'Select an option:': '请选择：',
-  'Raw mode not available. Please run in an interactive terminal.':
-    '原始模式不可用。请在交互式终端中运行。',
-  '(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n':
-    '(使用 ↑ ↓ 箭头导航，Enter 选择，Ctrl+C 退出)\n',
-  verbose: '详细',
-  'Show full tool output and thinking in verbose mode (toggle with Ctrl+O).':
-    '详细模式下显示完整工具输出和思考过程（Ctrl+O 切换）。',
-  'Press Ctrl+O to show full tool output': '按 Ctrl+O 查看详细工具调用结果',
+  "Authenticate using Alibaba Cloud Coding Plan": "使用阿里云百炼 Coding Plan 进行认证",
+  "Region for Coding Plan (china/global)": "Coding Plan 区域 (china/global)",
+  "API key for Coding Plan": "Coding Plan 的 API 密钥",
+  "Show current authentication status": "显示当前认证状态",
+  "Authentication completed successfully.": "认证完成。",
+  "Processing Alibaba Cloud Coding Plan authentication...":
+    "正在处理阿里云百炼 Coding Plan 认证...",
+  "Successfully authenticated with Alibaba Cloud Coding Plan.":
+    "已成功通过阿里云百炼 Coding Plan 认证。",
+  "Failed to authenticate with Coding Plan: {{error}}": "Coding Plan 认证失败：{{error}}",
+  "中国 (China)": "中国 (China)",
+  "阿里云百炼 (aliyun.com)": "阿里云百炼 (aliyun.com)",
+  Global: "全球",
+  "Alibaba Cloud (alibabacloud.com)": "Alibaba Cloud (alibabacloud.com)",
+  "Select region for Coding Plan:": "选择 Coding Plan 区域：",
+  "Enter your Coding Plan API key: ": "请输入您的 Coding Plan API 密钥：",
+  "Select authentication method:": "选择认证方式：",
+  "\n=== Authentication Status ===\n": "\n=== 认证状态 ===\n",
+  "⚠️  No authentication method configured.\n": "⚠️  未配置认证方式。\n",
+  "Run one of the following commands to get started:\n": "运行以下命令之一开始配置：\n",
+  "  qwen auth coding-plan      - Authenticate with Alibaba Cloud Coding Plan\n":
+    "  qwen auth coding-plan      - 使用阿里云百炼 Coding Plan 认证\n",
+  "Or simply run:": "或者直接运行：",
+  "  qwen auth                - Interactive authentication setup\n":
+    "  qwen auth                - 交互式认证配置\n",
+  "✓ Authentication Method: Alibaba Cloud Coding Plan": "✓ 认证方式：阿里云百炼 Coding Plan",
+  "中国 (China) - 阿里云百炼": "中国 (China) - 阿里云百炼",
+  "Global - Alibaba Cloud": "全球 - Alibaba Cloud",
+  "  Region: {{region}}": "  区域：{{region}}",
+  "  Current Model: {{model}}": "  当前模型：{{model}}",
+  "  Config Version: {{version}}": "  配置版本：{{version}}",
+  "  Status: API key configured\n": "  状态：API 密钥已配置\n",
+  "⚠️  Authentication Method: Alibaba Cloud Coding Plan (Incomplete)":
+    "⚠️  认证方式：阿里云百炼 Coding Plan（不完整）",
+  "  Issue: API key not found in environment or settings\n":
+    "  问题：在环境变量或设置中未找到 API 密钥\n",
+  "  Run `qwen auth coding-plan` to re-configure.\n": "  运行 `qwen auth coding-plan` 重新配置。\n",
+  "✓ Authentication Method: {{type}}": "✓ 认证方式：{{type}}",
+  "  Status: Configured\n": "  状态：已配置\n",
+  "Failed to check authentication status: {{error}}": "检查认证状态失败：{{error}}",
+  "Select an option:": "请选择：",
+  "Raw mode not available. Please run in an interactive terminal.":
+    "原始模式不可用。请在交互式终端中运行。",
+  "(Use ↑ ↓ arrows to navigate, Enter to select, Ctrl+C to exit)\n":
+    "(使用 ↑ ↓ 箭头导航，Enter 选择，Ctrl+C 退出)\n",
+  verbose: "详细",
+  "Show full tool output and thinking in verbose mode (toggle with Ctrl+O).":
+    "详细模式下显示完整工具输出和思考过程（Ctrl+O 切换）。",
+  "Press Ctrl+O to show full tool output": "按 Ctrl+O 查看详细工具调用结果",
 
-  'Switch to plan mode or exit plan mode': '切换到计划模式或退出计划模式',
-  'Exited plan mode. Previous approval mode restored.':
-    '已退出计划模式，已恢复之前的审批模式。',
-  'Enabled plan mode. The agent will analyze and plan without executing tools.':
-    '启用计划模式。智能体将只分析和规划，而不执行工具。',
+  "Switch to plan mode or exit plan mode": "切换到计划模式或退出计划模式",
+  "Exited plan mode. Previous approval mode restored.": "已退出计划模式，已恢复之前的审批模式。",
+  "Enabled plan mode. The agent will analyze and plan without executing tools.":
+    "启用计划模式。智能体将只分析和规划，而不执行工具。",
   'Already in plan mode. Use "/plan exit" to exit plan mode.':
     '已处于计划模式。使用 "/plan exit" 退出计划模式。',
   'Not in plan mode. Use "/plan" to enter plan mode first.':
     '未处于计划模式。请先使用 "/plan" 进入计划模式。',
 
-  "Set up Qwen Code's status line UI": '配置 Qwen Code 的状态栏',
+  "Set up Qwen Code's status line UI": "配置 Qwen Code 的状态栏",
 };
diff --git a/apps/airiscode-cli/src/index.ts b/apps/airiscode-cli/src/index.ts
index be8e4f0e6..4992ab429 100644
--- a/apps/airiscode-cli/src/index.ts
+++ b/apps/airiscode-cli/src/index.ts
@@ -6,10 +6,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import './gemini.js';
-import { main } from './gemini.js';
-import { FatalError } from '@airiscode/core';
-import { writeStderrLine } from './utils/stdioHelpers.js';
+import "./gemini.js";
+import { FatalError } from "@airiscode/core";
+import { main } from "./gemini.js";
+import { writeStderrLine } from "./utils/stdioHelpers.js";
 
 // --- Global Entry Point ---
 
@@ -22,11 +22,11 @@ import { writeStderrLine } from './utils/stdioHelpers.js';
 // - https://github.com/microsoft/node-pty/issues/178 (EIO on macOS/Linux)
 // - https://github.com/microsoft/node-pty/issues/827 (resize on Windows)
 const getErrnoCode = (error: unknown): string | undefined => {
-  if (!error || typeof error !== 'object') {
+  if (!error || typeof error !== "object") {
     return undefined;
   }
   const code = (error as { code?: unknown }).code;
-  return typeof code === 'string' ? code : undefined;
+  return typeof code === "string" ? code : undefined;
 };
 
 const isExpectedPtyRaceError = (error: unknown): boolean => {
@@ -37,16 +37,13 @@ const isExpectedPtyRaceError = (error: unknown): boolean => {
   const message = error.message;
   const code = getErrnoCode(error);
 
-  if (
-    (code === 'EIO' && message.includes('read')) ||
-    message.includes('read EIO')
-  ) {
+  if ((code === "EIO" && message.includes("read")) || message.includes("read EIO")) {
     return true;
   }
 
   if (
-    message.includes('ioctl(2) failed, EBADF') ||
-    message.includes('Cannot resize a pty that has already exited')
+    message.includes("ioctl(2) failed, EBADF") ||
+    message.includes("Cannot resize a pty that has already exited")
   ) {
     return true;
   }
@@ -54,7 +51,7 @@ const isExpectedPtyRaceError = (error: unknown): boolean => {
   return false;
 };
 
-process.on('uncaughtException', (error) => {
+process.on("uncaughtException", (error) => {
   if (isExpectedPtyRaceError(error)) {
     return;
   }
@@ -70,13 +67,13 @@ process.on('uncaughtException', (error) => {
 main().catch((error) => {
   if (error instanceof FatalError) {
     let errorMessage = error.message;
-    if (!process.env['NO_COLOR']) {
+    if (!process.env["NO_COLOR"]) {
       errorMessage = `\x1b[31m${errorMessage}\x1b[0m`;
     }
     console.error(errorMessage);
     process.exit(error.exitCode);
   }
-  console.error('An unexpected critical error occurred:');
+  console.error("An unexpected critical error occurred:");
   if (error instanceof Error) {
     console.error(error.stack);
   } else {
diff --git a/apps/airiscode-cli/src/nonInteractive/control/ControlContext.ts b/apps/airiscode-cli/src/nonInteractive/control/ControlContext.ts
index bc284f70e..c35b20a6f 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/ControlContext.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/ControlContext.ts
@@ -13,10 +13,10 @@
  * runtime state (e.g. permission mode, active MCP clients).
  */
 
-import type { Config, MCPServerConfig } from '@airiscode/core';
-import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { StreamJsonOutputAdapter } from '../io/StreamJsonOutputAdapter.js';
-import type { PermissionMode } from '../types.js';
+import type { Config, MCPServerConfig } from "@airiscode/core";
+import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { StreamJsonOutputAdapter } from "../io/StreamJsonOutputAdapter.js";
+import type { PermissionMode } from "../types.js";
 
 /**
  * Control Context interface
@@ -70,7 +70,7 @@ export class ControlContext implements IControlContext {
     this.sessionId = options.sessionId;
     this.abortSignal = options.abortSignal;
     this.debugMode = options.config.getDebugMode();
-    this.permissionMode = options.permissionMode || 'default';
+    this.permissionMode = options.permissionMode || "default";
     this.sdkMcpServers = new Set();
     this.mcpClients = new Map();
     this.inputClosed = false;
diff --git a/apps/airiscode-cli/src/nonInteractive/control/ControlDispatcher.ts b/apps/airiscode-cli/src/nonInteractive/control/ControlDispatcher.ts
index 7b579e3e1..63580e731 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/ControlDispatcher.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/ControlDispatcher.ts
@@ -26,21 +26,21 @@
  * enum in packages/sdk/typescript/src/types/controlRequests.ts
  */
 
-import type { IControlContext } from './ControlContext.js';
-import type { IPendingRequestRegistry } from './controllers/baseController.js';
-import { SystemController } from './controllers/systemController.js';
-import { PermissionController } from './controllers/permissionController.js';
-import { SdkMcpController } from './controllers/sdkMcpController.js';
+import { createDebugLogger } from "@airiscode/core";
 // import { HookController } from './controllers/hookController.js';
 import type {
   CLIControlRequest,
   CLIControlResponse,
-  ControlResponse,
   ControlRequestPayload,
-} from '../types.js';
-import { createDebugLogger } from '@airiscode/core';
+  ControlResponse,
+} from "../types.js";
+import type { IControlContext } from "./ControlContext.js";
+import type { IPendingRequestRegistry } from "./controllers/baseController.js";
+import { PermissionController } from "./controllers/permissionController.js";
+import { SdkMcpController } from "./controllers/sdkMcpController.js";
+import { SystemController } from "./controllers/systemController.js";
 
-const debugLogger = createDebugLogger('CONTROL_DISPATCHER');
+const debugLogger = createDebugLogger("CONTROL_DISPATCHER");
 
 /**
  * Tracks an incoming request from SDK awaiting CLI response
@@ -75,10 +75,8 @@ export class ControlDispatcher implements IPendingRequestRegistry {
   // readonly hookController: HookController;
 
   // Central pending request registries
-  private pendingIncomingRequests: Map<string, PendingIncomingRequest> =
-    new Map();
-  private pendingOutgoingRequests: Map<string, PendingOutgoingRequest> =
-    new Map();
+  private pendingIncomingRequests: Map<string, PendingIncomingRequest> = new Map();
+  private pendingOutgoingRequests: Map<string, PendingOutgoingRequest> = new Map();
 
   private abortHandler: (() => void) | null = null;
 
@@ -86,28 +84,16 @@ export class ControlDispatcher implements IPendingRequestRegistry {
     this.context = context;
 
     // Create domain controllers with context and registry
-    this.systemController = new SystemController(
-      context,
-      this,
-      'SystemController',
-    );
-    this.permissionController = new PermissionController(
-      context,
-      this,
-      'PermissionController',
-    );
-    this.sdkMcpController = new SdkMcpController(
-      context,
-      this,
-      'SdkMcpController',
-    );
+    this.systemController = new SystemController(context, this, "SystemController");
+    this.permissionController = new PermissionController(context, this, "PermissionController");
+    this.sdkMcpController = new SdkMcpController(context, this, "SdkMcpController");
     // this.hookController = new HookController(context, this, 'HookController');
 
     // Listen for main abort signal
     this.abortHandler = () => {
       this.shutdown();
     };
-    this.context.abortSignal.addEventListener('abort', this.abortHandler);
+    this.context.abortSignal.addEventListener("abort", this.abortHandler);
   }
 
   /**
@@ -125,8 +111,7 @@ export class ControlDispatcher implements IPendingRequestRegistry {
       this.sendSuccessResponse(request_id, response);
     } catch (error) {
       // Send error response
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       this.sendErrorResponse(request_id, errorMessage);
     }
   }
@@ -141,9 +126,7 @@ export class ControlDispatcher implements IPendingRequestRegistry {
     const pending = this.pendingOutgoingRequests.get(requestId);
     if (!pending) {
       // No pending request found - may have timed out or been cancelled
-      debugLogger.debug(
-        `[ControlDispatcher] No pending outgoing request for: ${requestId}`,
-      );
+      debugLogger.debug(`[ControlDispatcher] No pending outgoing request for: ${requestId}`);
       return;
     }
 
@@ -151,13 +134,13 @@ export class ControlDispatcher implements IPendingRequestRegistry {
     this.deregisterOutgoingRequest(requestId);
 
     // Resolve or reject based on response type
-    if (responsePayload.subtype === 'success') {
+    if (responsePayload.subtype === "success") {
       pending.resolve(responsePayload);
     } else {
       const errorMessage =
-        typeof responsePayload.error === 'string'
+        typeof responsePayload.error === "string"
           ? responsePayload.error
-          : (responsePayload.error?.message ?? 'Unknown error');
+          : (responsePayload.error?.message ?? "Unknown error");
       pending.reject(new Error(errorMessage));
     }
   }
@@ -183,11 +166,9 @@ export class ControlDispatcher implements IPendingRequestRegistry {
       if (pending) {
         pending.abortController.abort();
         this.deregisterIncomingRequest(requestId);
-        this.sendErrorResponse(requestId, 'Request cancelled');
+        this.sendErrorResponse(requestId, "Request cancelled");
 
-        debugLogger.debug(
-          `[ControlDispatcher] Cancelled incoming request: ${requestId}`,
-        );
+        debugLogger.debug(`[ControlDispatcher] Cancelled incoming request: ${requestId}`);
       }
     } else {
       // Cancel ALL pending incoming requests
@@ -197,7 +178,7 @@ export class ControlDispatcher implements IPendingRequestRegistry {
         if (pending) {
           pending.abortController.abort();
           this.deregisterIncomingRequest(id);
-          this.sendErrorResponse(id, 'All requests cancelled');
+          this.sendErrorResponse(id, "All requests cancelled");
         }
       }
 
@@ -232,7 +213,7 @@ export class ControlDispatcher implements IPendingRequestRegistry {
       const pending = this.pendingOutgoingRequests.get(id);
       if (pending) {
         this.deregisterOutgoingRequest(id);
-        pending.reject(new Error('Input closed'));
+        pending.reject(new Error("Input closed"));
       }
     }
   }
@@ -241,31 +222,25 @@ export class ControlDispatcher implements IPendingRequestRegistry {
    * Stops all pending requests and cleans up all controllers
    */
   shutdown(): void {
-    debugLogger.debug('[ControlDispatcher] Shutting down');
+    debugLogger.debug("[ControlDispatcher] Shutting down");
 
     // Remove abort listener to prevent memory leak
     if (this.abortHandler) {
-      this.context.abortSignal.removeEventListener('abort', this.abortHandler);
+      this.context.abortSignal.removeEventListener("abort", this.abortHandler);
       this.abortHandler = null;
     }
 
     // Cancel all incoming requests
-    for (const [
-      _requestId,
-      pending,
-    ] of this.pendingIncomingRequests.entries()) {
+    for (const [_requestId, pending] of this.pendingIncomingRequests.entries()) {
       pending.abortController.abort();
       clearTimeout(pending.timeoutId);
     }
     this.pendingIncomingRequests.clear();
 
     // Cancel all outgoing requests
-    for (const [
-      _requestId,
-      pending,
-    ] of this.pendingOutgoingRequests.entries()) {
+    for (const [_requestId, pending] of this.pendingOutgoingRequests.entries()) {
       clearTimeout(pending.timeoutId);
-      pending.reject(new Error('Dispatcher shutdown'));
+      pending.reject(new Error("Dispatcher shutdown"));
     }
     this.pendingOutgoingRequests.clear();
 
@@ -367,7 +342,7 @@ export class ControlDispatcher implements IPendingRequestRegistry {
     }
 
     if (this.pendingIncomingRequests.size === 0) {
-      debugLogger.debug('[ControlDispatcher] All incoming requests completed');
+      debugLogger.debug("[ControlDispatcher] All incoming requests completed");
     }
   }
 
@@ -376,17 +351,17 @@ export class ControlDispatcher implements IPendingRequestRegistry {
    */
   private getControllerForRequest(subtype: string) {
     switch (subtype) {
-      case 'initialize':
-      case 'interrupt':
-      case 'set_model':
-      case 'supported_commands':
+      case "initialize":
+      case "interrupt":
+      case "set_model":
+      case "supported_commands":
         return this.systemController;
 
-      case 'can_use_tool':
-      case 'set_permission_mode':
+      case "can_use_tool":
+      case "set_permission_mode":
         return this.permissionController;
 
-      case 'mcp_server_status':
+      case "mcp_server_status":
         return this.sdkMcpController;
 
       // case 'hook_callback':
@@ -400,14 +375,11 @@ export class ControlDispatcher implements IPendingRequestRegistry {
   /**
    * Sends a success response back to SDK
    */
-  private sendSuccessResponse(
-    requestId: string,
-    response: Record<string, unknown>,
-  ): void {
+  private sendSuccessResponse(requestId: string, response: Record<string, unknown>): void {
     const controlResponse: CLIControlResponse = {
-      type: 'control_response',
+      type: "control_response",
       response: {
-        subtype: 'success',
+        subtype: "success",
         request_id: requestId,
         response,
       },
@@ -420,9 +392,9 @@ export class ControlDispatcher implements IPendingRequestRegistry {
    */
   private sendErrorResponse(requestId: string, error: string): void {
     const controlResponse: CLIControlResponse = {
-      type: 'control_response',
+      type: "control_response",
       response: {
-        subtype: 'error',
+        subtype: "error",
         request_id: requestId,
         error,
       },
diff --git a/apps/airiscode-cli/src/nonInteractive/control/ControlService.ts b/apps/airiscode-cli/src/nonInteractive/control/ControlService.ts
index 671a18530..8f584cf31 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/ControlService.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/ControlService.ts
@@ -26,14 +26,14 @@
  * plane exclusively through ControlService.
  */
 
-import type { IControlContext } from './ControlContext.js';
-import type { ControlDispatcher } from './ControlDispatcher.js';
+import type { IControlContext } from "./ControlContext.js";
+import type { ControlDispatcher } from "./ControlDispatcher.js";
 import type {
   PermissionServiceAPI,
   SystemServiceAPI,
   // McpServiceAPI,
   // HookServiceAPI,
-} from './types/serviceAPIs.js';
+} from "./types/serviceAPIs.js";
 
 /**
  * Control Service
@@ -72,8 +72,7 @@ export class ControlService {
        * @param confirmationDetails - Tool confirmation details
        * @returns Array of permission suggestions or null
        */
-      buildPermissionSuggestions:
-        controller.buildPermissionSuggestions.bind(controller),
+      buildPermissionSuggestions: controller.buildPermissionSuggestions.bind(controller),
 
       /**
        * Get callback for monitoring tool call status updates
@@ -82,8 +81,7 @@ export class ControlService {
        *
        * @returns Callback function for tool call updates
        */
-      getToolCallUpdateCallback:
-        controller.getToolCallUpdateCallback.bind(controller),
+      getToolCallUpdateCallback: controller.getToolCallUpdateCallback.bind(controller),
     };
   }
 
diff --git a/apps/airiscode-cli/src/nonInteractive/control/controllers/baseController.ts b/apps/airiscode-cli/src/nonInteractive/control/controllers/baseController.ts
index 4f9ee462c..9a47bdae4 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/controllers/baseController.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/controllers/baseController.ts
@@ -15,15 +15,11 @@
  * - Integration with central pending request registry
  */
 
-import { randomUUID } from 'node:crypto';
-import type { DebugLogger } from '@airiscode/core';
-import { createDebugLogger } from '@airiscode/core';
-import type { IControlContext } from '../ControlContext.js';
-import type {
-  ControlRequestPayload,
-  ControlResponse,
-  CLIControlRequest,
-} from '../../types.js';
+import { randomUUID } from "node:crypto";
+import type { DebugLogger } from "@airiscode/core";
+import { createDebugLogger } from "@airiscode/core";
+import type { CLIControlRequest, ControlRequestPayload, ControlResponse } from "../../types.js";
+import type { IControlContext } from "../ControlContext.js";
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 30000; // 30 seconds
 
@@ -61,11 +57,7 @@ export abstract class BaseController {
   protected controllerName: string;
   protected debugLogger: DebugLogger;
 
-  constructor(
-    context: IControlContext,
-    registry: IPendingRequestRegistry,
-    controllerName: string,
-  ) {
+  constructor(context: IControlContext, registry: IPendingRequestRegistry, controllerName: string) {
     this.context = context;
     this.registry = registry;
     this.controllerName = controllerName;
@@ -87,9 +79,7 @@ export abstract class BaseController {
     const timeoutId = setTimeout(() => {
       requestAbortController.abort();
       this.registry.deregisterIncomingRequest(requestId);
-      this.debugLogger.warn(
-        `[${this.controllerName}] Request timeout: ${requestId}`,
-      );
+      this.debugLogger.warn(`[${this.controllerName}] Request timeout: ${requestId}`);
     }, DEFAULT_REQUEST_TIMEOUT_MS);
 
     // Register with central registry
@@ -101,10 +91,7 @@ export abstract class BaseController {
     );
 
     try {
-      const response = await this.handleRequestPayload(
-        payload,
-        requestAbortController.signal,
-      );
+      const response = await this.handleRequestPayload(payload, requestAbortController.signal);
 
       // Success - deregister
       this.registry.deregisterIncomingRequest(requestId);
@@ -130,12 +117,12 @@ export abstract class BaseController {
   ): Promise<ControlResponse> {
     // Check if stream is closed
     if (this.context.inputClosed) {
-      throw new Error('Input closed');
+      throw new Error("Input closed");
     }
 
     // Check if already aborted
     if (signal?.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     const requestId = randomUUID();
@@ -144,39 +131,35 @@ export abstract class BaseController {
       // Setup abort handler
       const abortHandler = () => {
         this.registry.deregisterOutgoingRequest(requestId);
-        reject(new Error('Request aborted'));
-        this.debugLogger.warn(
-          `[${this.controllerName}] Outgoing request aborted: ${requestId}`,
-        );
+        reject(new Error("Request aborted"));
+        this.debugLogger.warn(`[${this.controllerName}] Outgoing request aborted: ${requestId}`);
       };
 
       if (signal) {
-        signal.addEventListener('abort', abortHandler, { once: true });
+        signal.addEventListener("abort", abortHandler, { once: true });
       }
 
       // Setup timeout
       const timeoutId = setTimeout(() => {
         if (signal) {
-          signal.removeEventListener('abort', abortHandler);
+          signal.removeEventListener("abort", abortHandler);
         }
         this.registry.deregisterOutgoingRequest(requestId);
-        reject(new Error('Control request timeout'));
-        this.debugLogger.warn(
-          `[${this.controllerName}] Outgoing request timeout: ${requestId}`,
-        );
+        reject(new Error("Control request timeout"));
+        this.debugLogger.warn(`[${this.controllerName}] Outgoing request timeout: ${requestId}`);
       }, timeoutMs);
 
       // Wrap resolve/reject to clean up abort listener
       const wrappedResolve = (response: ControlResponse) => {
         if (signal) {
-          signal.removeEventListener('abort', abortHandler);
+          signal.removeEventListener("abort", abortHandler);
         }
         resolve(response);
       };
 
       const wrappedReject = (error: Error) => {
         if (signal) {
-          signal.removeEventListener('abort', abortHandler);
+          signal.removeEventListener("abort", abortHandler);
         }
         reject(error);
       };
@@ -192,7 +175,7 @@ export abstract class BaseController {
 
       // Send control request
       const request: CLIControlRequest = {
-        type: 'control_request',
+        type: "control_request",
         request_id: requestId,
         request: payload,
       };
@@ -201,7 +184,7 @@ export abstract class BaseController {
         this.context.streamJson.send(request);
       } catch (error) {
         if (signal) {
-          signal.removeEventListener('abort', abortHandler);
+          signal.removeEventListener("abort", abortHandler);
         }
         this.registry.deregisterOutgoingRequest(requestId);
         reject(error);
diff --git a/apps/airiscode-cli/src/nonInteractive/control/controllers/hookController.ts b/apps/airiscode-cli/src/nonInteractive/control/controllers/hookController.ts
index df6eb4c0e..c48979e6c 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/controllers/hookController.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/controllers/hookController.ts
@@ -11,11 +11,8 @@
  * - hook_callback: Process hook callbacks (placeholder for future)
  */
 
-import { BaseController } from './baseController.js';
-import type {
-  ControlRequestPayload,
-  CLIHookCallbackRequest,
-} from '../../types.js';
+import type { CLIHookCallbackRequest, ControlRequestPayload } from "../../types.js";
+import { BaseController } from "./baseController.js";
 
 export class HookController extends BaseController {
   /**
@@ -26,7 +23,7 @@ export class HookController extends BaseController {
     _signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     switch (payload.subtype) {
-      case 'hook_callback':
+      case "hook_callback":
         return this.handleHookCallback(payload as CLIHookCallbackRequest);
 
       default:
@@ -42,13 +39,11 @@ export class HookController extends BaseController {
   private async handleHookCallback(
     payload: CLIHookCallbackRequest,
   ): Promise<Record<string, unknown>> {
-    this.debugLogger.debug(
-      `[HookController] Hook callback: ${payload.callback_id}`,
-    );
+    this.debugLogger.debug(`[HookController] Hook callback: ${payload.callback_id}`);
 
     // Hook callback processing not yet implemented
     return {
-      result: 'Hook callback processing not yet implemented',
+      result: "Hook callback processing not yet implemented",
       callback_id: payload.callback_id,
       tool_use_id: payload.tool_use_id,
     };
diff --git a/apps/airiscode-cli/src/nonInteractive/control/controllers/permissionController.ts b/apps/airiscode-cli/src/nonInteractive/control/controllers/permissionController.ts
index 4296d4ae3..7c0232736 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/controllers/permissionController.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/controllers/permissionController.ts
@@ -15,26 +15,23 @@
  */
 
 import type {
-  WaitingToolCall,
+  ApprovalMode,
   ToolExecuteConfirmationDetails,
   ToolMcpConfirmationDetails,
-  ApprovalMode,
-} from '@airiscode/core';
-import {
-  InputFormat,
-  ToolConfirmationOutcome,
-} from '@airiscode/core';
+  WaitingToolCall,
+} from "@airiscode/core";
+import { InputFormat, ToolConfirmationOutcome } from "@airiscode/core";
 import type {
   CLIControlPermissionRequest,
   CLIControlSetPermissionModeRequest,
   ControlRequestPayload,
   PermissionMode,
   PermissionSuggestion,
-} from '../../types.js';
-import { BaseController } from './baseController.js';
+} from "../../types.js";
+import { BaseController } from "./baseController.js";
 
 // Import ToolCallConfirmationDetails types for type alignment
-type ToolConfirmationType = 'edit' | 'exec' | 'mcp' | 'info' | 'plan';
+type ToolConfirmationType = "edit" | "exec" | "mcp" | "info" | "plan";
 
 export class PermissionController extends BaseController {
   private pendingOutgoingRequests = new Set<string>();
@@ -47,21 +44,15 @@ export class PermissionController extends BaseController {
     signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     switch (payload.subtype) {
-      case 'can_use_tool':
-        return this.handleCanUseTool(
-          payload as CLIControlPermissionRequest,
-          signal,
-        );
+      case "can_use_tool":
+        return this.handleCanUseTool(payload as CLIControlPermissionRequest, signal);
 
-      case 'set_permission_mode':
-        return this.handleSetPermissionMode(
-          payload as CLIControlSetPermissionModeRequest,
-          signal,
-        );
+      case "set_permission_mode":
+        return this.handleSetPermissionMode(payload as CLIControlSetPermissionModeRequest, signal);
 
       default:
         throw new Error(`Unsupported request subtype in PermissionController`);
@@ -81,56 +72,52 @@ export class PermissionController extends BaseController {
     signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     const toolName = payload.tool_name;
-    if (
-      !toolName ||
-      typeof toolName !== 'string' ||
-      toolName.trim().length === 0
-    ) {
+    if (!toolName || typeof toolName !== "string" || toolName.trim().length === 0) {
       return {
-        subtype: 'can_use_tool',
-        behavior: 'deny',
-        message: 'Missing or invalid tool_name in can_use_tool request',
+        subtype: "can_use_tool",
+        behavior: "deny",
+        message: "Missing or invalid tool_name in can_use_tool request",
       };
     }
 
-    let behavior: 'allow' | 'deny' = 'allow';
+    let behavior: "allow" | "deny" = "allow";
     let message: string | undefined;
 
     try {
       // Check permission mode first
       const permissionResult = this.checkPermissionMode();
       if (!permissionResult.allowed) {
-        behavior = 'deny';
+        behavior = "deny";
         message = permissionResult.message;
       }
 
       // Check tool registry if permission mode allows
-      if (behavior === 'allow') {
+      if (behavior === "allow") {
         const registryResult = this.checkToolRegistry(toolName);
         if (!registryResult.allowed) {
-          behavior = 'deny';
+          behavior = "deny";
           message = registryResult.message;
         }
       }
     } catch (error) {
-      behavior = 'deny';
+      behavior = "deny";
       message =
         error instanceof Error
           ? `Failed to evaluate tool permission: ${error.message}`
-          : 'Failed to evaluate tool permission';
+          : "Failed to evaluate tool permission";
     }
 
     const response: Record<string, unknown> = {
-      subtype: 'can_use_tool',
+      subtype: "can_use_tool",
       behavior,
     };
 
     if (message) {
-      response['message'] = message;
+      response["message"] = message;
     }
 
     return response;
@@ -144,17 +131,17 @@ export class PermissionController extends BaseController {
 
     // Map permission modes to approval logic (aligned with VALID_APPROVAL_MODE_VALUES)
     switch (mode) {
-      case 'yolo': // Allow all tools
-      case 'auto-edit': // Auto-approve edit operations
-      case 'plan': // Auto-approve planning operations
+      case "yolo": // Allow all tools
+      case "auto-edit": // Auto-approve edit operations
+      case "plan": // Auto-approve planning operations
         return { allowed: true };
 
-      case 'default': // TODO: allow all tools for test
+      case "default": // TODO: allow all tools for test
       default:
         return {
           allowed: false,
           message:
-            'Tool execution requires manual approval. Update permission mode or approve via host.',
+            "Tool execution requires manual approval. Update permission mode or approve via host.",
         };
     }
   }
@@ -175,13 +162,9 @@ export class PermissionController extends BaseController {
         };
       };
 
-      if (typeof registryProvider.getToolRegistry === 'function') {
+      if (typeof registryProvider.getToolRegistry === "function") {
         const registry = registryProvider.getToolRegistry();
-        if (
-          registry &&
-          typeof registry.getTool === 'function' &&
-          !registry.getTool(toolName)
-        ) {
+        if (registry && typeof registry.getTool === "function" && !registry.getTool(toolName)) {
           return {
             allowed: false,
             message: `Tool "${toolName}" is not registered.`,
@@ -193,7 +176,7 @@ export class PermissionController extends BaseController {
     } catch (error) {
       return {
         allowed: false,
-        message: `Failed to check tool registry: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        message: `Failed to check tool registry: ${error instanceof Error ? error.message : "Unknown error"}`,
       };
     }
   }
@@ -208,31 +191,24 @@ export class PermissionController extends BaseController {
     signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     const mode = payload.mode;
-    const validModes: PermissionMode[] = [
-      'default',
-      'plan',
-      'auto-edit',
-      'yolo',
-    ];
+    const validModes: PermissionMode[] = ["default", "plan", "auto-edit", "yolo"];
 
     if (!validModes.includes(mode)) {
       throw new Error(
-        `Invalid permission mode: ${mode}. Valid values are: ${validModes.join(', ')}`,
+        `Invalid permission mode: ${mode}. Valid values are: ${validModes.join(", ")}`,
       );
     }
 
     this.context.permissionMode = mode;
     this.context.config.setApprovalMode(mode as ApprovalMode);
 
-    this.debugLogger.info(
-      `[PermissionController] Permission mode updated to: ${mode}`,
-    );
+    this.debugLogger.info(`[PermissionController] Permission mode updated to: ${mode}`);
 
-    return { status: 'updated', mode };
+    return { status: "updated", mode };
   }
 
   /**
@@ -241,98 +217,95 @@ export class PermissionController extends BaseController {
    * This method creates UI suggestions based on tool confirmation details,
    * helping the host application present appropriate permission options.
    */
-  buildPermissionSuggestions(
-    confirmationDetails: unknown,
-  ): PermissionSuggestion[] | null {
+  buildPermissionSuggestions(confirmationDetails: unknown): PermissionSuggestion[] | null {
     if (
       !confirmationDetails ||
-      typeof confirmationDetails !== 'object' ||
-      !('type' in confirmationDetails)
+      typeof confirmationDetails !== "object" ||
+      !("type" in confirmationDetails)
     ) {
       return null;
     }
 
     const details = confirmationDetails as Record<string, unknown>;
-    const type = String(details['type'] ?? '');
-    const title =
-      typeof details['title'] === 'string' ? details['title'] : undefined;
+    const type = String(details["type"] ?? "");
+    const title = typeof details["title"] === "string" ? details["title"] : undefined;
 
     // Ensure type matches ToolCallConfirmationDetails union
     const confirmationType = type as ToolConfirmationType;
 
     switch (confirmationType) {
-      case 'exec': // ToolExecuteConfirmationDetails
+      case "exec": // ToolExecuteConfirmationDetails
         return [
           {
-            type: 'allow',
-            label: 'Allow Command',
-            description: `Execute: ${details['command']}`,
+            type: "allow",
+            label: "Allow Command",
+            description: `Execute: ${details["command"]}`,
           },
           {
-            type: 'deny',
-            label: 'Deny',
-            description: 'Block this command execution',
+            type: "deny",
+            label: "Deny",
+            description: "Block this command execution",
           },
         ];
 
-      case 'edit': // ToolEditConfirmationDetails
+      case "edit": // ToolEditConfirmationDetails
         return [
           {
-            type: 'allow',
-            label: 'Allow Edit',
-            description: `Edit file: ${details['fileName']}`,
+            type: "allow",
+            label: "Allow Edit",
+            description: `Edit file: ${details["fileName"]}`,
           },
           {
-            type: 'deny',
-            label: 'Deny',
-            description: 'Block this file edit',
+            type: "deny",
+            label: "Deny",
+            description: "Block this file edit",
           },
           {
-            type: 'modify',
-            label: 'Review Changes',
-            description: 'Review the proposed changes before applying',
+            type: "modify",
+            label: "Review Changes",
+            description: "Review the proposed changes before applying",
           },
         ];
 
-      case 'plan': // ToolPlanConfirmationDetails
+      case "plan": // ToolPlanConfirmationDetails
         return [
           {
-            type: 'allow',
-            label: 'Approve Plan',
-            description: title || 'Execute the proposed plan',
+            type: "allow",
+            label: "Approve Plan",
+            description: title || "Execute the proposed plan",
           },
           {
-            type: 'deny',
-            label: 'Reject Plan',
-            description: 'Do not execute this plan',
+            type: "deny",
+            label: "Reject Plan",
+            description: "Do not execute this plan",
           },
         ];
 
-      case 'mcp': // ToolMcpConfirmationDetails
+      case "mcp": // ToolMcpConfirmationDetails
         return [
           {
-            type: 'allow',
-            label: 'Allow MCP Call',
-            description: `${details['serverName']}: ${details['toolName']}`,
+            type: "allow",
+            label: "Allow MCP Call",
+            description: `${details["serverName"]}: ${details["toolName"]}`,
           },
           {
-            type: 'deny',
-            label: 'Deny',
-            description: 'Block this MCP server call',
+            type: "deny",
+            label: "Deny",
+            description: "Block this MCP server call",
           },
         ];
 
-      case 'info': // ToolInfoConfirmationDetails
+      case "info": // ToolInfoConfirmationDetails
         return [
           {
-            type: 'allow',
-            label: 'Allow Info Request',
-            description: title || 'Allow information request',
+            type: "allow",
+            label: "Allow Info Request",
+            description: title || "Allow information request",
           },
           {
-            type: 'deny',
-            label: 'Deny',
-            description: 'Block this information request',
+            type: "deny",
+            label: "Deny",
+            description: "Block this information request",
           },
         ];
 
@@ -340,13 +313,13 @@ export class PermissionController extends BaseController {
         // Fallback for unknown types
         return [
           {
-            type: 'allow',
-            label: 'Allow',
+            type: "allow",
+            label: "Allow",
             description: title || `Allow ${type} operation`,
           },
           {
-            type: 'deny',
-            label: 'Deny',
+            type: "deny",
+            label: "Deny",
             description: `Block ${type} operation`,
           },
         ];
@@ -362,12 +335,12 @@ export class PermissionController extends BaseController {
       for (const call of toolCalls) {
         if (
           call &&
-          typeof call === 'object' &&
-          (call as { status?: string }).status === 'awaiting_approval'
+          typeof call === "object" &&
+          (call as { status?: string }).status === "awaiting_approval"
         ) {
           const awaiting = call as WaitingToolCall;
           if (
-            typeof awaiting.confirmationDetails?.onConfirm === 'function' &&
+            typeof awaiting.confirmationDetails?.onConfirm === "function" &&
             !this.pendingOutgoingRequests.has(awaiting.request.callId)
           ) {
             this.pendingOutgoingRequests.add(awaiting.request.callId);
@@ -385,15 +358,11 @@ export class PermissionController extends BaseController {
    * - stream-json mode: Send can_use_tool to SDK and await response
    * - Other modes: Check local approval mode and decide immediately
    */
-  private async handleOutgoingPermissionRequest(
-    toolCall: WaitingToolCall,
-  ): Promise<void> {
+  private async handleOutgoingPermissionRequest(toolCall: WaitingToolCall): Promise<void> {
     try {
       // Check if already aborted
       if (this.context.abortSignal?.aborted) {
-        await toolCall.confirmationDetails.onConfirm(
-          ToolConfirmationOutcome.Cancel,
-        );
+        await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
         return;
       }
 
@@ -412,13 +381,11 @@ export class PermissionController extends BaseController {
       }
 
       // Stream-json mode: ask SDK for permission
-      const permissionSuggestions = this.buildPermissionSuggestions(
-        toolCall.confirmationDetails,
-      );
+      const permissionSuggestions = this.buildPermissionSuggestions(toolCall.confirmationDetails);
 
       const response = await this.sendControlRequest(
         {
-          subtype: 'can_use_tool',
+          subtype: "can_use_tool",
           tool_name: toolCall.request.name,
           tool_use_id: toolCall.request.callId,
           input: toolCall.request.args,
@@ -429,31 +396,25 @@ export class PermissionController extends BaseController {
         this.context.abortSignal,
       );
 
-      if (response.subtype !== 'success') {
-        await toolCall.confirmationDetails.onConfirm(
-          ToolConfirmationOutcome.Cancel,
-        );
+      if (response.subtype !== "success") {
+        await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
         return;
       }
 
       const payload = (response.response || {}) as Record<string, unknown>;
-      const behavior = String(payload['behavior'] || '').toLowerCase();
+      const behavior = String(payload["behavior"] || "").toLowerCase();
 
-      if (behavior === 'allow') {
+      if (behavior === "allow") {
         // Handle updated input if provided
-        const updatedInput = payload['updatedInput'];
-        if (updatedInput && typeof updatedInput === 'object') {
+        const updatedInput = payload["updatedInput"];
+        if (updatedInput && typeof updatedInput === "object") {
           toolCall.request.args = updatedInput as Record<string, unknown>;
         }
-        await toolCall.confirmationDetails.onConfirm(
-          ToolConfirmationOutcome.ProceedOnce,
-        );
+        await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
       } else {
         // Extract cancel message from response if available
         const cancelMessage =
-          typeof payload['message'] === 'string'
-            ? payload['message']
-            : undefined;
+          typeof payload["message"] === "string" ? payload["message"] : undefined;
 
         await toolCall.confirmationDetails.onConfirm(
           ToolConfirmationOutcome.Cancel,
@@ -461,19 +422,15 @@ export class PermissionController extends BaseController {
         );
       }
     } catch (error) {
-      this.debugLogger.error(
-        '[PermissionController] Outgoing permission failed:',
-        error,
-      );
+      this.debugLogger.error("[PermissionController] Outgoing permission failed:", error);
 
       // Extract error message
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
 
       // On error, pass error message as cancel message
       // Only pass payload for exec and mcp types that support it
       const confirmationType = toolCall.confirmationDetails.type;
-      if (['edit', 'exec', 'mcp'].includes(confirmationType)) {
+      if (["edit", "exec", "mcp"].includes(confirmationType)) {
         const execOrMcpDetails = toolCall.confirmationDetails as
           | ToolExecuteConfirmationDetails
           | ToolMcpConfirmationDetails;
@@ -481,12 +438,9 @@ export class PermissionController extends BaseController {
           cancelMessage: `Error: ${errorMessage}`,
         });
       } else {
-        await toolCall.confirmationDetails.onConfirm(
-          ToolConfirmationOutcome.Cancel,
-          {
-            cancelMessage: `Error: ${errorMessage}`,
-          },
-        );
+        await toolCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel, {
+          cancelMessage: `Error: ${errorMessage}`,
+        });
       }
     } finally {
       this.pendingOutgoingRequests.delete(toolCall.request.callId);
diff --git a/apps/airiscode-cli/src/nonInteractive/control/controllers/sdkMcpController.ts b/apps/airiscode-cli/src/nonInteractive/control/controllers/sdkMcpController.ts
index 058226c09..ff920aedf 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/controllers/sdkMcpController.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/controllers/sdkMcpController.ts
@@ -17,12 +17,9 @@
  * SDK MCP Server processes → control_response → CLI MCP Client
  */
 
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
-import { BaseController } from './baseController.js';
-import type {
-  ControlRequestPayload,
-  CLIControlMcpMessageRequest,
-} from '../../types.js';
+import type { JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js";
+import type { CLIControlMcpMessageRequest, ControlRequestPayload } from "../../types.js";
+import { BaseController } from "./baseController.js";
 
 const MCP_REQUEST_TIMEOUT = 30_000; // 30 seconds
 
@@ -39,11 +36,11 @@ export class SdkMcpController extends BaseController {
     signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     switch (payload.subtype) {
-      case 'mcp_server_status':
+      case "mcp_server_status":
         return this.handleMcpStatus();
 
       default:
@@ -62,11 +59,11 @@ export class SdkMcpController extends BaseController {
 
     for (const serverName of this.context.sdkMcpServers) {
       // SDK MCP servers are "connected" once registered since they run in SDK process
-      status[serverName] = 'connected';
+      status[serverName] = "connected";
     }
 
     return {
-      subtype: 'mcp_server_status',
+      subtype: "mcp_server_status",
       status,
     };
   }
@@ -90,9 +87,9 @@ export class SdkMcpController extends BaseController {
     // Send control request to SDK with the MCP message
     const response = await this.sendControlRequest(
       {
-        subtype: 'mcp_message',
+        subtype: "mcp_message",
         server_name: serverName,
-        message: message as CLIControlMcpMessageRequest['message'],
+        message: message as CLIControlMcpMessageRequest["message"],
       },
       MCP_REQUEST_TIMEOUT,
       this.context.abortSignal,
@@ -100,12 +97,10 @@ export class SdkMcpController extends BaseController {
 
     // Extract MCP response from control response
     const responsePayload = response.response as Record<string, unknown>;
-    const mcpResponse = responsePayload?.['mcp_response'] as JSONRPCMessage;
+    const mcpResponse = responsePayload?.["mcp_response"] as JSONRPCMessage;
 
     if (!mcpResponse) {
-      throw new Error(
-        `Invalid MCP response from SDK for server '${serverName}'`,
-      );
+      throw new Error(`Invalid MCP response from SDK for server '${serverName}'`);
     }
 
     this.debugLogger.debug(
diff --git a/apps/airiscode-cli/src/nonInteractive/control/controllers/systemController.ts b/apps/airiscode-cli/src/nonInteractive/control/controllers/systemController.ts
index d9cde131e..ebae5a833 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/controllers/systemController.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/controllers/systemController.ts
@@ -13,22 +13,22 @@
  * - set_model: Switch model (placeholder)
  */
 
-import { BaseController } from './baseController.js';
+import {
+  AuthProviderType,
+  createDebugLogger,
+  type MCPOAuthConfig,
+  MCPServerConfig,
+} from "@airiscode/core";
+import { getAvailableCommands } from "../../../nonInteractiveCliCommands.js";
 import type {
-  ControlRequestPayload,
   CLIControlInitializeRequest,
   CLIControlSetModelRequest,
   CLIMcpServerConfig,
-} from '../../types.js';
-import { getAvailableCommands } from '../../../nonInteractiveCliCommands.js';
-import {
-  createDebugLogger,
-  MCPServerConfig,
-  AuthProviderType,
-  type MCPOAuthConfig,
-} from '@airiscode/core';
+  ControlRequestPayload,
+} from "../../types.js";
+import { BaseController } from "./baseController.js";
 
-const debugLogger = createDebugLogger('SYSTEM_CONTROLLER');
+const debugLogger = createDebugLogger("SYSTEM_CONTROLLER");
 
 export class SystemController extends BaseController {
   /**
@@ -39,26 +39,20 @@ export class SystemController extends BaseController {
     signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     switch (payload.subtype) {
-      case 'initialize':
-        return this.handleInitialize(
-          payload as CLIControlInitializeRequest,
-          signal,
-        );
+      case "initialize":
+        return this.handleInitialize(payload as CLIControlInitializeRequest, signal);
 
-      case 'interrupt':
+      case "interrupt":
         return this.handleInterrupt();
 
-      case 'set_model':
-        return this.handleSetModel(
-          payload as CLIControlSetModelRequest,
-          signal,
-        );
+      case "set_model":
+        return this.handleSetModel(payload as CLIControlSetModelRequest, signal);
 
-      case 'supported_commands':
+      case "supported_commands":
         return this.handleSupportedCommands(signal);
 
       default:
@@ -79,7 +73,7 @@ export class SystemController extends BaseController {
     signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     this.context.config.setSdkMode(true);
@@ -87,13 +81,13 @@ export class SystemController extends BaseController {
     // Process SDK MCP servers
     if (
       payload.sdkMcpServers &&
-      typeof payload.sdkMcpServers === 'object' &&
+      typeof payload.sdkMcpServers === "object" &&
       payload.sdkMcpServers !== null
     ) {
       const sdkServers: Record<string, MCPServerConfig> = {};
       for (const [key, wireConfig] of Object.entries(payload.sdkMcpServers)) {
         const name =
-          typeof wireConfig?.name === 'string' && wireConfig.name.trim().length
+          typeof wireConfig?.name === "string" && wireConfig.name.trim().length
             ? wireConfig.name
             : key;
 
@@ -117,7 +111,7 @@ export class SystemController extends BaseController {
           undefined, // authProviderType
           undefined, // targetAudience
           undefined, // targetServiceAccount
-          'sdk', // type
+          "sdk", // type
         );
       }
 
@@ -125,21 +119,16 @@ export class SystemController extends BaseController {
       if (sdkServerCount > 0) {
         try {
           this.context.config.addMcpServers(sdkServers);
-          debugLogger.debug(
-            `[SystemController] Added ${sdkServerCount} SDK MCP servers to config`,
-          );
+          debugLogger.debug(`[SystemController] Added ${sdkServerCount} SDK MCP servers to config`);
         } catch (error) {
-          debugLogger.error(
-            '[SystemController] Failed to add SDK MCP servers:',
-            error,
-          );
+          debugLogger.error("[SystemController] Failed to add SDK MCP servers:", error);
         }
       }
     }
 
     if (
       payload.mcpServers &&
-      typeof payload.mcpServers === 'object' &&
+      typeof payload.mcpServers === "object" &&
       payload.mcpServers !== null
     ) {
       const externalServers: Record<string, MCPServerConfig> = {};
@@ -161,10 +150,7 @@ export class SystemController extends BaseController {
             `[SystemController] Added ${externalCount} external MCP servers to config`,
           );
         } catch (error) {
-          debugLogger.error(
-            '[SystemController] Failed to add external MCP servers:',
-            error,
-          );
+          debugLogger.error("[SystemController] Failed to add external MCP servers:", error);
         }
       }
     }
@@ -177,10 +163,7 @@ export class SystemController extends BaseController {
           `[SystemController] Added ${payload.agents.length} session subagents to config`,
         );
       } catch (error) {
-        debugLogger.error(
-          '[SystemController] Failed to add session subagents:',
-          error,
-        );
+        debugLogger.error("[SystemController] Failed to add session subagents:", error);
       }
     }
 
@@ -192,7 +175,7 @@ export class SystemController extends BaseController {
     );
 
     return {
-      subtype: 'initialize',
+      subtype: "initialize",
       session_id: this.context.config.getSessionId(),
       capabilities,
     };
@@ -209,9 +192,8 @@ export class SystemController extends BaseController {
     const capabilities: Record<string, unknown> = {
       can_handle_can_use_tool: true,
       can_handle_hook_callback: false,
-      can_set_permission_mode:
-        typeof this.context.config.setApprovalMode === 'function',
-      can_set_model: typeof this.context.config.setModel === 'function',
+      can_set_permission_mode: typeof this.context.config.setApprovalMode === "function",
+      can_set_model: typeof this.context.config.setModel === "function",
       // SDK MCP servers are supported - messages routed through control plane
       can_handle_mcp_message: true,
     };
@@ -223,16 +205,12 @@ export class SystemController extends BaseController {
     serverName: string,
     config?: CLIMcpServerConfig,
   ): MCPServerConfig | null {
-    if (!config || typeof config !== 'object') {
-      debugLogger.warn(
-        `[SystemController] Ignoring invalid MCP server config for '${serverName}'`,
-      );
+    if (!config || typeof config !== "object") {
+      debugLogger.warn(`[SystemController] Ignoring invalid MCP server config for '${serverName}'`);
       return null;
     }
 
-    const authProvider = this.normalizeAuthProviderType(
-      config.authProviderType,
-    );
+    const authProvider = this.normalizeAuthProviderType(config.authProviderType);
     const oauthConfig = this.normalizeOAuthConfig(config.oauth);
 
     return new MCPServerConfig(
@@ -257,9 +235,7 @@ export class SystemController extends BaseController {
     );
   }
 
-  private normalizeAuthProviderType(
-    value?: string,
-  ): AuthProviderType | undefined {
+  private normalizeAuthProviderType(value?: string): AuthProviderType | undefined {
     if (!value) {
       return undefined;
     }
@@ -268,16 +244,12 @@ export class SystemController extends BaseController {
       case AuthProviderType.DYNAMIC_DISCOVERY:
         return value as AuthProviderType;
       default:
-        debugLogger.warn(
-          `[SystemController] Unsupported authProviderType '${value}', skipping`,
-        );
+        debugLogger.warn(`[SystemController] Unsupported authProviderType '${value}', skipping`);
         return undefined;
     }
   }
 
-  private normalizeOAuthConfig(
-    oauth?: CLIMcpServerConfig['oauth'],
-  ): MCPOAuthConfig | undefined {
+  private normalizeOAuthConfig(oauth?: CLIMcpServerConfig["oauth"]): MCPOAuthConfig | undefined {
     if (!oauth) {
       return undefined;
     }
@@ -310,12 +282,12 @@ export class SystemController extends BaseController {
     // Abort the main signal to cancel ongoing operations
     if (this.context.abortSignal && !this.context.abortSignal.aborted) {
       // Note: We can't directly abort the signal, but the onInterrupt callback should handle this
-      debugLogger.debug('[SystemController] Interrupt signal triggered');
+      debugLogger.debug("[SystemController] Interrupt signal triggered");
     }
 
-    debugLogger.debug('[SystemController] Interrupt handled');
+    debugLogger.debug("[SystemController] Interrupt handled");
 
-    return { subtype: 'interrupt' };
+    return { subtype: "interrupt" };
   }
 
   /**
@@ -328,14 +300,14 @@ export class SystemController extends BaseController {
     signal: AbortSignal,
   ): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     const model = payload.model;
 
     // Validate model parameter
-    if (typeof model !== 'string' || model.trim() === '') {
-      throw new Error('Invalid model specified for set_model request');
+    if (typeof model !== "string" || model.trim() === "") {
+      throw new Error("Invalid model specified for set_model request");
     }
 
     try {
@@ -345,17 +317,13 @@ export class SystemController extends BaseController {
       debugLogger.info(`[SystemController] Model switched to: ${model}`);
 
       return {
-        subtype: 'set_model',
+        subtype: "set_model",
         model,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : 'Failed to set model';
+      const errorMessage = error instanceof Error ? error.message : "Failed to set model";
 
-      debugLogger.error(
-        `[SystemController] Failed to set model ${model}:`,
-        error,
-      );
+      debugLogger.error(`[SystemController] Failed to set model ${model}:`, error);
 
       throw new Error(errorMessage);
     }
@@ -366,17 +334,15 @@ export class SystemController extends BaseController {
    *
    * Returns list of supported slash commands loaded dynamically
    */
-  private async handleSupportedCommands(
-    signal: AbortSignal,
-  ): Promise<Record<string, unknown>> {
+  private async handleSupportedCommands(signal: AbortSignal): Promise<Record<string, unknown>> {
     if (signal.aborted) {
-      throw new Error('Request aborted');
+      throw new Error("Request aborted");
     }
 
     const slashCommands = await this.loadSlashCommandNames(signal);
 
     return {
-      subtype: 'supported_commands',
+      subtype: "supported_commands",
       commands: slashCommands,
     };
   }
@@ -407,10 +373,7 @@ export class SystemController extends BaseController {
         return [];
       }
 
-      debugLogger.error(
-        '[SystemController] Failed to load slash commands:',
-        error,
-      );
+      debugLogger.error("[SystemController] Failed to load slash commands:", error);
       return [];
     }
   }
diff --git a/apps/airiscode-cli/src/nonInteractive/control/types/serviceAPIs.ts b/apps/airiscode-cli/src/nonInteractive/control/types/serviceAPIs.ts
index 3e0b83084..45717f977 100644
--- a/apps/airiscode-cli/src/nonInteractive/control/types/serviceAPIs.ts
+++ b/apps/airiscode-cli/src/nonInteractive/control/types/serviceAPIs.ts
@@ -12,9 +12,9 @@
  * for internal CLI code (nonInteractiveCli, session managers, etc.).
  */
 
-import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { MCPServerConfig } from '@airiscode/core';
-import type { PermissionSuggestion } from '../../types.js';
+import type { MCPServerConfig } from "@airiscode/core";
+import type { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { PermissionSuggestion } from "../../types.js";
 
 /**
  * Permission Service API
@@ -32,9 +32,7 @@ export interface PermissionServiceAPI {
    * @param confirmationDetails - Tool confirmation details (type, title, metadata)
    * @returns Array of permission suggestions or null if details are invalid
    */
-  buildPermissionSuggestions(
-    confirmationDetails: unknown,
-  ): PermissionSuggestion[] | null;
+  buildPermissionSuggestions(confirmationDetails: unknown): PermissionSuggestion[] | null;
 
   /**
    * Get callback for monitoring tool call status updates
diff --git a/apps/airiscode-cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts b/apps/airiscode-cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts
index 57fb5212b..63119ef07 100644
--- a/apps/airiscode-cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts
+++ b/apps/airiscode-cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts
@@ -4,22 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
 import type {
+  AgentResultDisplay,
   Config,
+  GenerateContentResponseUsageMetadata,
+  McpToolProgressData,
+  Part,
+  ServerGeminiStreamEvent,
+  SessionMetrics,
   ToolCallRequestInfo,
   ToolCallResponseInfo,
-  SessionMetrics,
-  ServerGeminiStreamEvent,
-  AgentResultDisplay,
-  McpToolProgressData,
-} from '@airiscode/core';
-import {
-  GeminiEventType,
-  ToolErrorType,
-  parseAndFormatApiError,
-} from '@airiscode/core';
-import type { Part, GenerateContentResponseUsageMetadata } from '@airiscode/core';
+} from "@airiscode/core";
+import { GeminiEventType, parseAndFormatApiError, ToolErrorType } from "@airiscode/core";
+import { functionResponsePartsToString } from "../../utils/nonInteractiveHelpers.js";
 import type {
   CLIAssistantMessage,
   CLIMessage,
@@ -35,8 +33,7 @@ import type {
   ToolResultBlock,
   ToolUseBlock,
   Usage,
-} from '../types.js';
-import { functionResponsePartsToString } from '../../utils/nonInteractiveHelpers.js';
+} from "../types.js";
 
 /**
  * Internal state for managing a single message context (main agent or subagent).
@@ -48,7 +45,7 @@ export interface MessageState {
   usage: Usage;
   messageStarted: boolean;
   finalized: boolean;
-  currentBlockType: ContentBlock['type'] | null;
+  currentBlockType: ContentBlock["type"] | null;
 }
 
 /**
@@ -91,10 +88,7 @@ export interface MessageEmitter {
    * @param request - Tool call request info
    * @param progress - Structured MCP progress data
    */
-  emitToolProgress(
-    request: ToolCallRequestInfo,
-    progress: McpToolProgressData,
-  ): void;
+  emitToolProgress(request: ToolCallRequestInfo, progress: McpToolProgressData): void;
 }
 
 /**
@@ -110,17 +104,11 @@ export interface JsonOutputAdapterInterface extends MessageEmitter {
 
   startSubagentAssistantMessage?(parentToolUseId: string): void;
   processSubagentToolCall?(
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
-    parentToolUseId: string,
-  ): void;
-  finalizeSubagentAssistantMessage?(
-    parentToolUseId: string,
-  ): CLIAssistantMessage;
-  emitSubagentErrorResult?(
-    errorMessage: string,
-    numTurns: number,
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
     parentToolUseId: string,
   ): void;
+  finalizeSubagentAssistantMessage?(parentToolUseId: string): CLIAssistantMessage;
+  emitSubagentErrorResult?(errorMessage: string, numTurns: number, parentToolUseId: string): void;
 
   getSessionId(): string;
   getModel(): string;
@@ -190,9 +178,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param metadata - Optional usage metadata from Gemini API
    * @returns Usage object
    */
-  protected createUsage(
-    metadata?: GenerateContentResponseUsageMetadata | null,
-  ): Usage {
+  protected createUsage(metadata?: GenerateContentResponseUsageMetadata | null): Usage {
     const usage: Usage = {
       input_tokens: 0,
       output_tokens: 0,
@@ -202,16 +188,16 @@ export abstract class BaseJsonOutputAdapter {
       return usage;
     }
 
-    if (typeof metadata.promptTokenCount === 'number') {
+    if (typeof metadata.promptTokenCount === "number") {
       usage.input_tokens = metadata.promptTokenCount;
     }
-    if (typeof metadata.candidatesTokenCount === 'number') {
+    if (typeof metadata.candidatesTokenCount === "number") {
       usage.output_tokens = metadata.candidatesTokenCount;
     }
-    if (typeof metadata.cachedContentTokenCount === 'number') {
+    if (typeof metadata.cachedContentTokenCount === "number") {
       usage.cache_read_input_tokens = metadata.cachedContentTokenCount;
     }
-    if (typeof metadata.totalTokenCount === 'number') {
+    if (typeof metadata.totalTokenCount === "number") {
       usage.total_tokens = metadata.totalTokenCount;
     }
 
@@ -228,7 +214,7 @@ export abstract class BaseJsonOutputAdapter {
     const state = this.getMessageState(parentToolUseId);
 
     if (!state.messageId) {
-      throw new Error('Message not started');
+      throw new Error("Message not started");
     }
 
     // Enforce constraint: assistant message must contain only a single type of ContentBlock
@@ -236,7 +222,7 @@ export abstract class BaseJsonOutputAdapter {
       const blockTypes = new Set(state.blocks.map((block) => block.type));
       if (blockTypes.size > 1) {
         throw new Error(
-          `Assistant message must contain only one type of ContentBlock, found: ${Array.from(blockTypes).join(', ')}`,
+          `Assistant message must contain only one type of ContentBlock, found: ${Array.from(blockTypes).join(", ")}`,
         );
       }
     }
@@ -244,20 +230,19 @@ export abstract class BaseJsonOutputAdapter {
     // Determine stop_reason based on content block types
     // If the message contains only tool_use blocks, set stop_reason to 'tool_use'
     const stopReason =
-      state.blocks.length > 0 &&
-      state.blocks.every((block) => block.type === 'tool_use')
-        ? 'tool_use'
+      state.blocks.length > 0 && state.blocks.every((block) => block.type === "tool_use")
+        ? "tool_use"
         : null;
 
     return {
-      type: 'assistant',
+      type: "assistant",
       uuid: state.messageId,
       session_id: this.config.getSessionId(),
       parent_tool_use_id: parentToolUseId,
       message: {
         id: state.messageId,
-        type: 'message',
-        role: 'assistant',
+        type: "message",
+        role: "assistant",
         model: this.config.getModel(),
         content: state.blocks,
         stop_reason: stopReason,
@@ -272,10 +257,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param state - Message state to finalize blocks for
    * @param parentToolUseId - null for main agent, string for subagent (optional, defaults to null)
    */
-  protected finalizePendingBlocks(
-    state: MessageState,
-    parentToolUseId?: string | null,
-  ): void {
+  protected finalizePendingBlocks(state: MessageState, parentToolUseId?: string | null): void {
     const actualParentToolUseId = parentToolUseId ?? null;
     const lastBlock = state.blocks[state.blocks.length - 1];
     if (!lastBlock) {
@@ -287,7 +269,7 @@ export abstract class BaseJsonOutputAdapter {
       return;
     }
 
-    if (lastBlock.type === 'text' || lastBlock.type === 'thinking') {
+    if (lastBlock.type === "text" || lastBlock.type === "thinking") {
       this.onBlockClosed(state, index, actualParentToolUseId);
       this.closeBlock(state, index);
     }
@@ -300,11 +282,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param index - Block index
    * @param _block - Content block
    */
-  protected openBlock(
-    state: MessageState,
-    index: number,
-    _block: ContentBlock,
-  ): void {
+  protected openBlock(state: MessageState, index: number, _block: ContentBlock): void {
     state.openBlocks.add(index);
   }
 
@@ -333,7 +311,7 @@ export abstract class BaseJsonOutputAdapter {
    */
   protected ensureBlockTypeConsistency(
     state: MessageState,
-    targetType: ContentBlock['type'],
+    targetType: ContentBlock["type"],
     parentToolUseId: string | null,
   ): void {
     if (state.currentBlockType === targetType) {
@@ -383,9 +361,7 @@ export abstract class BaseJsonOutputAdapter {
     state.finalized = true;
 
     this.finalizePendingBlocks(state, parentToolUseId);
-    const orderedOpenBlocks = Array.from(state.openBlocks).sort(
-      (a, b) => a - b,
-    );
+    const orderedOpenBlocks = Array.from(state.openBlocks).sort((a, b) => a - b);
     for (const index of orderedOpenBlocks) {
       this.onBlockClosed(state, index, parentToolUseId);
       this.closeBlock(state, index);
@@ -546,10 +522,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param state - Message state
    * @param parentToolUseId - null for main agent, string for subagent
    */
-  protected onEnsureMessageStarted(
-    _state: MessageState,
-    _parentToolUseId: string | null,
-  ): void {
+  protected onEnsureMessageStarted(_state: MessageState, _parentToolUseId: string | null): void {
     // Default implementation does nothing
   }
 
@@ -598,17 +571,12 @@ export abstract class BaseJsonOutputAdapter {
         this.appendText(state, event.value, null);
         break;
       case GeminiEventType.Citation:
-        if (typeof event.value === 'string') {
+        if (typeof event.value === "string") {
           this.appendText(state, `\n${event.value}`, null);
         }
         break;
       case GeminiEventType.Thought:
-        this.appendThinking(
-          state,
-          event.value.subject,
-          event.value.description,
-          null,
-        );
+        this.appendThinking(state, event.value.subject, event.value.description, null);
         break;
       case GeminiEventType.ToolCallRequest:
         this.appendToolUse(state, event.value, null);
@@ -654,9 +622,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param parentToolUseId - Parent tool use ID
    * @returns CLIAssistantMessage
    */
-  finalizeSubagentAssistantMessage(
-    parentToolUseId: string,
-  ): CLIAssistantMessage {
+  finalizeSubagentAssistantMessage(parentToolUseId: string): CLIAssistantMessage {
     const state = this.getMessageState(parentToolUseId);
     return this.finalizeAssistantMessageInternal(state, parentToolUseId);
   }
@@ -669,11 +635,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param numTurns - Number of turns
    * @param parentToolUseId - Parent tool use ID
    */
-  emitSubagentErrorResult(
-    errorMessage: string,
-    numTurns: number,
-    parentToolUseId: string,
-  ): void {
+  emitSubagentErrorResult(errorMessage: string, numTurns: number, parentToolUseId: string): void {
     const state = this.getMessageState(parentToolUseId);
     // Finalize any pending assistant message
     if (state.messageStarted && !state.finalized) {
@@ -693,15 +655,15 @@ export abstract class BaseJsonOutputAdapter {
    * @param parentToolUseId - Parent tool use ID
    */
   processSubagentToolCall(
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
     parentToolUseId: string,
   ): void {
     const state = this.getMessageState(parentToolUseId);
 
     // Finalize any pending text message before starting tool_use
     const hasText =
-      state.blocks.some((b) => b.type === 'text') ||
-      (state.currentBlockType === 'text' && state.blocks.length > 0);
+      state.blocks.some((b) => b.type === "text") ||
+      (state.currentBlockType === "text" && state.blocks.length > 0);
     if (hasText) {
       this.finalizeSubagentAssistantMessage(parentToolUseId);
       this.startSubagentAssistantMessage(parentToolUseId);
@@ -712,15 +674,11 @@ export abstract class BaseJsonOutputAdapter {
       this.startAssistantMessageInternal(state);
     }
 
-    this.ensureBlockTypeConsistency(state, 'tool_use', parentToolUseId);
+    this.ensureBlockTypeConsistency(state, "tool_use", parentToolUseId);
     this.ensureMessageStarted(state, parentToolUseId);
     this.finalizePendingBlocks(state, parentToolUseId);
 
-    const { index } = this.createSubagentToolUseBlock(
-      state,
-      toolCall,
-      parentToolUseId,
-    );
+    const { index } = this.createSubagentToolUseBlock(state, toolCall, parentToolUseId);
 
     // Process tool use block creation and closure
     // Subclasses can override hook methods to emit stream events
@@ -744,12 +702,12 @@ export abstract class BaseJsonOutputAdapter {
   protected processSubagentToolUseBlock(
     state: MessageState,
     index: number,
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
     parentToolUseId: string,
   ): void {
     // Emit tool_use block creation event (with empty input)
     const startBlock: ToolUseBlock = {
-      type: 'tool_use',
+      type: "tool_use",
       id: toolCall.callId,
       name: toolCall.name,
       input: {},
@@ -789,15 +747,13 @@ export abstract class BaseJsonOutputAdapter {
       return;
     }
 
-    this.ensureBlockTypeConsistency(state, 'text', parentToolUseId);
+    this.ensureBlockTypeConsistency(state, "text", parentToolUseId);
     this.ensureMessageStarted(state, parentToolUseId);
 
-    let current = state.blocks[state.blocks.length - 1] as
-      | TextBlock
-      | undefined;
-    const isNewBlock = !current || current.type !== 'text';
+    let current = state.blocks[state.blocks.length - 1] as TextBlock | undefined;
+    const isNewBlock = !current || current.type !== "text";
     if (isNewBlock) {
-      current = { type: 'text', text: '' } satisfies TextBlock;
+      current = { type: "text", text: "" } satisfies TextBlock;
       const index = state.blocks.length;
       state.blocks.push(current);
       this.openBlock(state, index, current);
@@ -837,22 +793,20 @@ export abstract class BaseJsonOutputAdapter {
       parts.push(description);
     }
 
-    const fragment = parts.join(': ');
+    const fragment = parts.join(": ");
     if (!fragment) {
       return;
     }
 
-    this.ensureBlockTypeConsistency(state, 'thinking', actualParentToolUseId);
+    this.ensureBlockTypeConsistency(state, "thinking", actualParentToolUseId);
     this.ensureMessageStarted(state, actualParentToolUseId);
 
-    let current = state.blocks[state.blocks.length - 1] as
-      | ThinkingBlock
-      | undefined;
-    const isNewBlock = !current || current.type !== 'thinking';
+    let current = state.blocks[state.blocks.length - 1] as ThinkingBlock | undefined;
+    const isNewBlock = !current || current.type !== "thinking";
     if (isNewBlock) {
       current = {
-        type: 'thinking',
-        thinking: '',
+        type: "thinking",
+        thinking: "",
         signature: subject,
       } satisfies ThinkingBlock;
       const index = state.blocks.length;
@@ -862,7 +816,7 @@ export abstract class BaseJsonOutputAdapter {
     }
 
     // current is guaranteed to be defined here (either existing or newly created)
-    current!.thinking = `${current!.thinking ?? ''}${fragment}`;
+    current!.thinking = `${current!.thinking ?? ""}${fragment}`;
     const index = state.blocks.length - 1;
     this.onThinkingAppended(state, index, fragment, actualParentToolUseId);
   }
@@ -880,13 +834,13 @@ export abstract class BaseJsonOutputAdapter {
     request: ToolCallRequestInfo,
     parentToolUseId: string | null,
   ): void {
-    this.ensureBlockTypeConsistency(state, 'tool_use', parentToolUseId);
+    this.ensureBlockTypeConsistency(state, "tool_use", parentToolUseId);
     this.ensureMessageStarted(state, parentToolUseId);
     this.finalizePendingBlocks(state, parentToolUseId);
 
     const index = state.blocks.length;
     const block: ToolUseBlock = {
-      type: 'tool_use',
+      type: "tool_use",
       id: request.callId,
       name: request.name,
       input: request.args,
@@ -896,7 +850,7 @@ export abstract class BaseJsonOutputAdapter {
 
     // Emit tool_use block creation event (with empty input)
     const startBlock: ToolUseBlock = {
-      type: 'tool_use',
+      type: "tool_use",
       id: request.callId,
       name: request.name,
       input: {},
@@ -915,10 +869,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param state - Message state
    * @param parentToolUseId - null for main agent, string for subagent
    */
-  protected ensureMessageStarted(
-    state: MessageState,
-    parentToolUseId: string | null,
-  ): void {
+  protected ensureMessageStarted(state: MessageState, parentToolUseId: string | null): void {
     if (state.messageStarted) {
       return;
     }
@@ -937,12 +888,12 @@ export abstract class BaseJsonOutputAdapter {
    */
   protected createSubagentToolUseBlock(
     state: MessageState,
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
     _parentToolUseId: string,
   ): { block: ToolUseBlock; index: number } {
     const index = state.blocks.length;
     const block: ToolUseBlock = {
-      type: 'tool_use',
+      type: "tool_use",
       id: toolCall.callId,
       name: toolCall.name,
       input: toolCall.args || {},
@@ -960,12 +911,12 @@ export abstract class BaseJsonOutputAdapter {
   emitUserMessage(parts: Part[], parentToolUseId?: string | null): void {
     const content = partsToContentBlock(parts);
     const message: CLIUserMessage = {
-      type: 'user',
+      type: "user",
       uuid: randomUUID(),
       session_id: this.getSessionId(),
       parent_tool_use_id: parentToolUseId ?? null,
       message: {
-        role: 'user',
+        role: "user",
         content,
       },
     };
@@ -979,9 +930,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param responseParts - Array of Part objects
    * @returns Error message if found, undefined otherwise
    */
-  private checkResponsePartsForError(
-    responseParts: Part[] | undefined,
-  ): string | undefined {
+  private checkResponsePartsForError(responseParts: Part[] | undefined): string | undefined {
     // Use the shared helper function defined at file level
     return checkResponsePartsForError(responseParts);
   }
@@ -1001,18 +950,13 @@ export abstract class BaseJsonOutputAdapter {
     parentToolUseId: string | null = null,
   ): void {
     // Check for errors in responseParts (e.g., cancelled responses)
-    const responsePartsError = this.checkResponsePartsForError(
-      response.responseParts,
-    );
+    const responsePartsError = this.checkResponsePartsForError(response.responseParts);
 
     // Determine if this is an error response
     const hasError = Boolean(response.error) || Boolean(responsePartsError);
 
     // Track permission denials (execution denied errors)
-    if (
-      response.error &&
-      response.errorType === ToolErrorType.EXECUTION_DENIED
-    ) {
+    if (response.error && response.errorType === ToolErrorType.EXECUTION_DENIED) {
       const denial: CLIPermissionDenial = {
         tool_name: request.name,
         tool_use_id: request.callId,
@@ -1022,7 +966,7 @@ export abstract class BaseJsonOutputAdapter {
     }
 
     const block: ToolResultBlock = {
-      type: 'tool_result',
+      type: "tool_result",
       tool_use_id: request.callId,
       is_error: hasError,
     };
@@ -1032,12 +976,12 @@ export abstract class BaseJsonOutputAdapter {
     }
 
     const message: CLIUserMessage = {
-      type: 'user',
+      type: "user",
       uuid: randomUUID(),
       session_id: this.getSessionId(),
       parent_tool_use_id: parentToolUseId,
       message: {
-        role: 'user',
+        role: "user",
         content: [block],
       },
     };
@@ -1051,7 +995,7 @@ export abstract class BaseJsonOutputAdapter {
    */
   emitSystemMessage(subtype: string, data?: unknown): void {
     const systemMessage = {
-      type: 'system',
+      type: "system",
       subtype,
       uuid: randomUUID(),
       session_id: this.getSessionId(),
@@ -1069,10 +1013,7 @@ export abstract class BaseJsonOutputAdapter {
    * @param _request - Tool call request info
    * @param _progress - Structured MCP progress data
    */
-  emitToolProgress(
-    _request: ToolCallRequestInfo,
-    _progress: McpToolProgressData,
-  ): void {
+  emitToolProgress(_request: ToolCallRequestInfo, _progress: McpToolProgressData): void {
     // No-op in base class. Only StreamJsonOutputAdapter emits tool progress
     // as stream events when includePartialMessages is enabled.
   }
@@ -1092,20 +1033,16 @@ export abstract class BaseJsonOutputAdapter {
     const usage = options.usage ?? createExtendedUsage();
     const resultText =
       options.summary ??
-      (lastAssistantMessage
-        ? extractTextFromBlocks(lastAssistantMessage.message.content)
-        : '');
+      (lastAssistantMessage ? extractTextFromBlocks(lastAssistantMessage.message.content) : "");
 
     const baseUuid = randomUUID();
     const baseSessionId = this.getSessionId();
 
     if (options.isError) {
-      const errorMessage = options.errorMessage ?? 'Unknown error';
+      const errorMessage = options.errorMessage ?? "Unknown error";
       return {
-        type: 'result',
-        subtype:
-          (options.subtype as CLIResultMessageError['subtype']) ??
-          'error_during_execution',
+        type: "result",
+        subtype: (options.subtype as CLIResultMessageError["subtype"]) ?? "error_during_execution",
         uuid: baseUuid,
         session_id: baseSessionId,
         is_error: true,
@@ -1118,9 +1055,8 @@ export abstract class BaseJsonOutputAdapter {
       };
     } else {
       const success: CLIResultMessageSuccess & { stats?: SessionMetrics } = {
-        type: 'result',
-        subtype:
-          (options.subtype as CLIResultMessageSuccess['subtype']) ?? 'success',
+        type: "result",
+        subtype: (options.subtype as CLIResultMessageSuccess["subtype"]) ?? "success",
         uuid: baseUuid,
         session_id: baseSessionId,
         is_error: false,
@@ -1159,8 +1095,8 @@ export abstract class BaseJsonOutputAdapter {
     };
 
     return {
-      type: 'result',
-      subtype: 'error_during_execution',
+      type: "result",
+      subtype: "error_during_execution",
       uuid: randomUUID(),
       session_id: this.getSessionId(),
       is_error: true,
@@ -1191,17 +1127,16 @@ export function partsToContentBlock(parts: Part[]): ContentBlock[] {
     let textContent: string | null = null;
 
     // Handle text parts
-    if ('text' in part && typeof part.text === 'string') {
+    if ("text" in part && typeof part.text === "string") {
       textContent = part.text;
     }
     // Handle functionResponse parts - extract output content
-    else if ('functionResponse' in part && part.functionResponse) {
+    else if ("functionResponse" in part && part.functionResponse) {
       const output =
-        part.functionResponse.response?.['output'] ??
-        part.functionResponse.response?.['content'] ??
-        '';
-      textContent =
-        typeof output === 'string' ? output : JSON.stringify(output);
+        part.functionResponse.response?.["output"] ??
+        part.functionResponse.response?.["content"] ??
+        "";
+      textContent = typeof output === "string" ? output : JSON.stringify(output);
     }
     // Handle other part types - convert to JSON string
     else {
@@ -1212,7 +1147,7 @@ export function partsToContentBlock(parts: Part[]): ContentBlock[] {
     if (textContent !== null && textContent.length > 0) {
       if (currentTextBlock === null) {
         currentTextBlock = {
-          type: 'text',
+          type: "text",
           text: textContent,
         };
         blocks.push(currentTextBlock);
@@ -1238,12 +1173,12 @@ export function partsToContentBlock(parts: Part[]): ContentBlock[] {
 export function partsToString(parts: Part[]): string {
   return parts
     .map((part) => {
-      if ('text' in part && typeof part.text === 'string') {
+      if ("text" in part && typeof part.text === "string") {
         return part.text;
       }
       return JSON.stringify(part);
     })
-    .join('');
+    .join("");
 }
 
 /**
@@ -1252,23 +1187,21 @@ export function partsToString(parts: Part[]): string {
  * @param responseParts - Array of Part objects
  * @returns Error message if found, undefined otherwise
  */
-function checkResponsePartsForError(
-  responseParts: Part[] | undefined,
-): string | undefined {
+function checkResponsePartsForError(responseParts: Part[] | undefined): string | undefined {
   if (!responseParts || responseParts.length === 0) {
     return undefined;
   }
 
   for (const part of responseParts) {
     if (
-      'functionResponse' in part &&
+      "functionResponse" in part &&
       part.functionResponse?.response &&
-      typeof part.functionResponse.response === 'object' &&
-      'error' in part.functionResponse.response &&
-      part.functionResponse.response['error']
+      typeof part.functionResponse.response === "object" &&
+      "error" in part.functionResponse.response &&
+      part.functionResponse.response["error"]
     ) {
-      const error = part.functionResponse.response['error'];
-      return typeof error === 'string' ? error : String(error);
+      const error = part.functionResponse.response["error"];
+      return typeof error === "string" ? error : String(error);
     }
   }
 
@@ -1285,9 +1218,7 @@ function checkResponsePartsForError(
  * @param response - Tool call response
  * @returns String content or undefined
  */
-export function toolResultContent(
-  response: ToolCallResponseInfo,
-): string | undefined {
+export function toolResultContent(response: ToolCallResponseInfo): string | undefined {
   if (response.error) {
     return response.error.message;
   }
@@ -1296,10 +1227,7 @@ export function toolResultContent(
   if (responsePartsError) {
     return responsePartsError;
   }
-  if (
-    typeof response.resultDisplay === 'string' &&
-    response.resultDisplay.trim().length > 0
-  ) {
+  if (typeof response.resultDisplay === "string" && response.resultDisplay.trim().length > 0) {
     return response.resultDisplay;
   }
   if (response.responseParts && response.responseParts.length > 0) {
@@ -1318,9 +1246,9 @@ export function toolResultContent(
  */
 export function extractTextFromBlocks(blocks: ContentBlock[]): string {
   return blocks
-    .filter((block) => block.type === 'text')
-    .map((block) => (block.type === 'text' ? block.text : ''))
-    .join('');
+    .filter((block) => block.type === "text")
+    .map((block) => (block.type === "text" ? block.text : ""))
+    .join("");
 }
 
 /**
diff --git a/apps/airiscode-cli/src/nonInteractive/io/JsonOutputAdapter.ts b/apps/airiscode-cli/src/nonInteractive/io/JsonOutputAdapter.ts
index 8ba836d74..1985475e4 100644
--- a/apps/airiscode-cli/src/nonInteractive/io/JsonOutputAdapter.ts
+++ b/apps/airiscode-cli/src/nonInteractive/io/JsonOutputAdapter.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/core';
-import type { CLIAssistantMessage, CLIMessage } from '../types.js';
+import type { Config } from "@airiscode/core";
+import type { CLIAssistantMessage, CLIMessage } from "../types.js";
 import {
   BaseJsonOutputAdapter,
   type JsonOutputAdapterInterface,
   type ResultOptions,
-} from './BaseJsonOutputAdapter.js';
+} from "./BaseJsonOutputAdapter.js";
 
 /**
  * JSON output adapter that collects all messages and emits them
  * as a single JSON array at the end of the turn.
  * Supports both main agent and subagent messages through distinct APIs.
  */
-export class JsonOutputAdapter
-  extends BaseJsonOutputAdapter
-  implements JsonOutputAdapterInterface
-{
+export class JsonOutputAdapter extends BaseJsonOutputAdapter implements JsonOutputAdapterInterface {
   private readonly messages: CLIMessage[] = [];
 
   constructor(config: Config) {
@@ -35,10 +32,10 @@ export class JsonOutputAdapter
     this.messages.push(message);
     // Track assistant messages for result generation
     if (
-      typeof message === 'object' &&
+      typeof message === "object" &&
       message !== null &&
-      'type' in message &&
-      message.type === 'assistant'
+      "type" in message &&
+      message.type === "assistant"
     ) {
       this.updateLastAssistantMessage(message as CLIAssistantMessage);
     }
@@ -52,22 +49,16 @@ export class JsonOutputAdapter
   }
 
   finalizeAssistantMessage(): CLIAssistantMessage {
-    return this.finalizeAssistantMessageInternal(
-      this.mainAgentMessageState,
-      null,
-    );
+    return this.finalizeAssistantMessageInternal(this.mainAgentMessageState, null);
   }
 
   emitResult(options: ResultOptions): void {
-    const resultMessage = this.buildResultMessage(
-      options,
-      this.lastAssistantMessage,
-    );
+    const resultMessage = this.buildResultMessage(options, this.lastAssistantMessage);
     this.messages.push(resultMessage);
 
-    if (this.config.getOutputFormat() === 'text') {
+    if (this.config.getOutputFormat() === "text") {
       if (resultMessage.is_error) {
-        process.stderr.write(`${resultMessage.error?.message || ''}`);
+        process.stderr.write(`${resultMessage.error?.message || ""}`);
       } else {
         process.stdout.write(`${resultMessage.result}`);
       }
diff --git a/apps/airiscode-cli/src/nonInteractive/io/StreamJsonInputReader.ts b/apps/airiscode-cli/src/nonInteractive/io/StreamJsonInputReader.ts
index f297d7415..dc1df6bdc 100644
--- a/apps/airiscode-cli/src/nonInteractive/io/StreamJsonInputReader.ts
+++ b/apps/airiscode-cli/src/nonInteractive/io/StreamJsonInputReader.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createInterface } from 'node:readline/promises';
-import type { Readable } from 'node:stream';
-import process from 'node:process';
+import process from "node:process";
+import { createInterface } from "node:readline/promises";
+import type { Readable } from "node:stream";
 import type {
   CLIControlRequest,
   CLIControlResponse,
   CLIMessage,
   ControlCancelRequest,
-} from '../types.js';
+} from "../types.js";
 
 export type StreamJsonInputMessage =
   | CLIMessage
@@ -53,10 +53,10 @@ export class StreamJsonInputReader {
   private parse(line: string): StreamJsonInputMessage {
     try {
       const parsed = JSON.parse(line) as StreamJsonInputMessage;
-      if (!parsed || typeof parsed !== 'object') {
-        throw new StreamJsonParseError('Parsed value is not an object');
+      if (!parsed || typeof parsed !== "object") {
+        throw new StreamJsonParseError("Parsed value is not an object");
       }
-      if (!('type' in parsed) || typeof parsed.type !== 'string') {
+      if (!("type" in parsed) || typeof parsed.type !== "string") {
         throw new StreamJsonParseError('Missing required "type" field');
       }
       return parsed;
@@ -65,9 +65,7 @@ export class StreamJsonInputReader {
         throw error;
       }
       const reason = error instanceof Error ? error.message : String(error);
-      throw new StreamJsonParseError(
-        `Failed to parse stream-json line: ${reason}`,
-      );
+      throw new StreamJsonParseError(`Failed to parse stream-json line: ${reason}`);
     }
   }
 }
diff --git a/apps/airiscode-cli/src/nonInteractive/io/StreamJsonOutputAdapter.ts b/apps/airiscode-cli/src/nonInteractive/io/StreamJsonOutputAdapter.ts
index b06e8e0df..537c254af 100644
--- a/apps/airiscode-cli/src/nonInteractive/io/StreamJsonOutputAdapter.ts
+++ b/apps/airiscode-cli/src/nonInteractive/io/StreamJsonOutputAdapter.ts
@@ -4,12 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { randomUUID } from 'node:crypto';
-import type {
-  Config,
-  ToolCallRequestInfo,
-  McpToolProgressData,
-} from '@airiscode/core';
+import { randomUUID } from "node:crypto";
+import type { Config, McpToolProgressData, ToolCallRequestInfo } from "@airiscode/core";
 import type {
   CLIAssistantMessage,
   CLIMessage,
@@ -19,13 +15,13 @@ import type {
   TextBlock,
   ThinkingBlock,
   ToolUseBlock,
-} from '../types.js';
+} from "../types.js";
 import {
   BaseJsonOutputAdapter,
+  type JsonOutputAdapterInterface,
   type MessageState,
   type ResultOptions,
-  type JsonOutputAdapterInterface,
-} from './BaseJsonOutputAdapter.js';
+} from "./BaseJsonOutputAdapter.js";
 
 /**
  * Stream JSON output adapter that emits messages immediately
@@ -51,10 +47,10 @@ export class StreamJsonOutputAdapter
   protected emitMessageImpl(message: CLIMessage | ControlMessage): void {
     // Track assistant messages for result generation
     if (
-      typeof message === 'object' &&
+      typeof message === "object" &&
       message !== null &&
-      'type' in message &&
-      message.type === 'assistant'
+      "type" in message &&
+      message.type === "assistant"
     ) {
       this.updateLastAssistantMessage(message as CLIAssistantMessage);
     }
@@ -76,17 +72,14 @@ export class StreamJsonOutputAdapter
   }
 
   finalizeAssistantMessage(): CLIAssistantMessage {
-    const message = this.finalizeAssistantMessageInternal(
-      this.mainAgentMessageState,
-      null,
-    );
+    const message = this.finalizeAssistantMessageInternal(this.mainAgentMessageState, null);
     if (this.mainTurnMessageStartEmitted && this.includePartialMessages) {
       const partial: CLIPartialAssistantMessage = {
-        type: 'stream_event',
+        type: "stream_event",
         uuid: randomUUID(),
         session_id: this.getSessionId(),
         parent_tool_use_id: null,
-        event: { type: 'message_stop' },
+        event: { type: "message_stop" },
       };
       this.emitMessageImpl(partial);
     }
@@ -95,10 +88,7 @@ export class StreamJsonOutputAdapter
   }
 
   emitResult(options: ResultOptions): void {
-    const resultMessage = this.buildResultMessage(
-      options,
-      this.lastAssistantMessage,
-    );
+    const resultMessage = this.buildResultMessage(options, this.lastAssistantMessage);
     this.emitMessageImpl(resultMessage);
   }
 
@@ -122,7 +112,7 @@ export class StreamJsonOutputAdapter
   ): void {
     this.emitStreamEventIfEnabled(
       {
-        type: 'content_block_start',
+        type: "content_block_start",
         index,
         content_block: block,
       },
@@ -141,9 +131,9 @@ export class StreamJsonOutputAdapter
   ): void {
     this.emitStreamEventIfEnabled(
       {
-        type: 'content_block_delta',
+        type: "content_block_delta",
         index,
-        delta: { type: 'text_delta', text: fragment },
+        delta: { type: "text_delta", text: fragment },
       },
       parentToolUseId,
     );
@@ -160,7 +150,7 @@ export class StreamJsonOutputAdapter
   ): void {
     this.emitStreamEventIfEnabled(
       {
-        type: 'content_block_start',
+        type: "content_block_start",
         index,
         content_block: block,
       },
@@ -179,9 +169,9 @@ export class StreamJsonOutputAdapter
   ): void {
     this.emitStreamEventIfEnabled(
       {
-        type: 'content_block_delta',
+        type: "content_block_delta",
         index,
-        delta: { type: 'thinking_delta', thinking: fragment },
+        delta: { type: "thinking_delta", thinking: fragment },
       },
       parentToolUseId,
     );
@@ -198,7 +188,7 @@ export class StreamJsonOutputAdapter
   ): void {
     this.emitStreamEventIfEnabled(
       {
-        type: 'content_block_start',
+        type: "content_block_start",
         index,
         content_block: block,
       },
@@ -217,10 +207,10 @@ export class StreamJsonOutputAdapter
   ): void {
     this.emitStreamEventIfEnabled(
       {
-        type: 'content_block_delta',
+        type: "content_block_delta",
         index,
         delta: {
-          type: 'input_json_delta',
+          type: "input_json_delta",
           partial_json: JSON.stringify(input),
         },
       },
@@ -239,7 +229,7 @@ export class StreamJsonOutputAdapter
     if (this.includePartialMessages) {
       this.emitStreamEventIfEnabled(
         {
-          type: 'content_block_stop',
+          type: "content_block_stop",
           index,
         },
         parentToolUseId,
@@ -260,10 +250,10 @@ export class StreamJsonOutputAdapter
       this.mainTurnMessageStartEmitted = true;
       this.emitStreamEventIfEnabled(
         {
-          type: 'message_start',
+          type: "message_start",
           message: {
             id: state.messageId!,
-            role: 'assistant',
+            role: "assistant",
             model: this.config.getModel(),
             content: [],
           },
@@ -277,21 +267,18 @@ export class StreamJsonOutputAdapter
    * Emits a tool progress stream event when partial messages are enabled.
    * This overrides the no-op in BaseJsonOutputAdapter.
    */
-  override emitToolProgress(
-    request: ToolCallRequestInfo,
-    progress: McpToolProgressData,
-  ): void {
+  override emitToolProgress(request: ToolCallRequestInfo, progress: McpToolProgressData): void {
     if (!this.includePartialMessages) {
       return;
     }
 
     const partial: CLIPartialAssistantMessage = {
-      type: 'stream_event',
+      type: "stream_event",
       uuid: randomUUID(),
       session_id: this.getSessionId(),
       parent_tool_use_id: null,
       event: {
-        type: 'tool_progress',
+        type: "tool_progress",
         tool_use_id: request.callId,
         content: progress,
       },
@@ -305,16 +292,13 @@ export class StreamJsonOutputAdapter
    * @param event - Stream event to emit
    * @param parentToolUseId - null for main agent, string for subagent
    */
-  private emitStreamEventIfEnabled(
-    event: StreamEvent,
-    parentToolUseId: string | null,
-  ): void {
+  private emitStreamEventIfEnabled(event: StreamEvent, parentToolUseId: string | null): void {
     if (!this.includePartialMessages) {
       return;
     }
 
     const partial: CLIPartialAssistantMessage = {
-      type: 'stream_event',
+      type: "stream_event",
       uuid: randomUUID(),
       session_id: this.getSessionId(),
       parent_tool_use_id: parentToolUseId,
diff --git a/apps/airiscode-cli/src/nonInteractive/session.ts b/apps/airiscode-cli/src/nonInteractive/session.ts
index 837ef2f1a..44086e01c 100644
--- a/apps/airiscode-cli/src/nonInteractive/session.ts
+++ b/apps/airiscode-cli/src/nonInteractive/session.ts
@@ -4,37 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { Config, ConfigInitializeOptions } from "@airiscode/core";
+import { createDebugLogger } from "@airiscode/core";
+import { createMinimalSettings } from "../config/settings.js";
+import { runNonInteractive } from "../nonInteractiveCli.js";
+import { ControlContext } from "./control/ControlContext.js";
+import { ControlDispatcher } from "./control/ControlDispatcher.js";
+import { ControlService } from "./control/ControlService.js";
+import { StreamJsonInputReader } from "./io/StreamJsonInputReader.js";
+import { StreamJsonOutputAdapter } from "./io/StreamJsonOutputAdapter.js";
 import type {
-  Config,
-  ConfigInitializeOptions,
-} from '@airiscode/core';
-import { createDebugLogger } from '@airiscode/core';
-import { StreamJsonInputReader } from './io/StreamJsonInputReader.js';
-import { StreamJsonOutputAdapter } from './io/StreamJsonOutputAdapter.js';
-import { ControlContext } from './control/ControlContext.js';
-import { ControlDispatcher } from './control/ControlDispatcher.js';
-import { ControlService } from './control/ControlService.js';
-import type {
-  CLIMessage,
-  CLIUserMessage,
   CLIControlRequest,
   CLIControlResponse,
+  CLIMessage,
+  CLIUserMessage,
   ControlCancelRequest,
-} from './types.js';
+} from "./types.js";
 import {
-  isCLIUserMessage,
   isCLIAssistantMessage,
-  isCLISystemMessage,
-  isCLIResultMessage,
   isCLIPartialAssistantMessage,
+  isCLIResultMessage,
+  isCLISystemMessage,
+  isCLIUserMessage,
+  isControlCancel,
   isControlRequest,
   isControlResponse,
-  isControlCancel,
-} from './types.js';
-import { createMinimalSettings } from '../config/settings.js';
-import { runNonInteractive } from '../nonInteractiveCli.js';
+} from "./types.js";
 
-const debugLogger = createDebugLogger('NON_INTERACTIVE_SESSION');
+const debugLogger = createDebugLogger("NON_INTERACTIVE_SESSION");
 
 class Session {
   private userMessageQueue: CLIUserMessage[] = [];
@@ -67,10 +64,7 @@ class Session {
     this.initialPrompt = initialPrompt ?? null;
 
     this.inputReader = new StreamJsonInputReader();
-    this.outputAdapter = new StreamJsonOutputAdapter(
-      config,
-      config.getIncludePartialMessages(),
-    );
+    this.outputAdapter = new StreamJsonOutputAdapter(config, config.getIncludePartialMessages());
 
     this.setupSignalHandlers();
   }
@@ -98,20 +92,18 @@ class Session {
     return `${this.sessionId}########${this.promptIdCounter}`;
   }
 
-  private async ensureConfigInitialized(
-    options?: ConfigInitializeOptions,
-  ): Promise<void> {
+  private async ensureConfigInitialized(options?: ConfigInitializeOptions): Promise<void> {
     if (this.configInitialized) {
       return;
     }
 
-    debugLogger.debug('[Session] Initializing config');
+    debugLogger.debug("[Session] Initializing config");
 
     try {
       await this.config.initialize(options);
       this.configInitialized = true;
     } catch (error) {
-      debugLogger.error('[Session] Failed to initialize config:', error);
+      debugLogger.error("[Session] Failed to initialize config:", error);
       throw error;
     }
   }
@@ -121,7 +113,7 @@ class Session {
    */
   private completeInitialization(): void {
     if (this.initializationResolve) {
-      debugLogger.debug('[Session] Initialization complete');
+      debugLogger.debug("[Session] Initialization complete");
       this.initializationResolve();
       this.initializationResolve = null;
       this.initializationReject = null;
@@ -133,7 +125,7 @@ class Session {
    */
   private failInitialization(error: Error): void {
     if (this.initializationReject) {
-      debugLogger.error('[Session] Initialization failed:', error);
+      debugLogger.error("[Session] Initialization failed:", error);
       this.initializationReject(error);
       this.initializationResolve = null;
       this.initializationReject = null;
@@ -163,10 +155,7 @@ class Session {
       onInterrupt: () => this.handleInterrupt(),
     });
     this.dispatcher = new ControlDispatcher(this.controlContext);
-    this.controlService = new ControlService(
-      this.controlContext,
-      this.dispatcher,
-    );
+    this.controlService = new ControlService(this.controlContext, this.dispatcher);
   }
 
   private getDispatcher(): ControlDispatcher | null {
@@ -188,26 +177,20 @@ class Session {
    * when ready for user messages.
    */
   private handleFirstMessage(
-    message:
-      | CLIMessage
-      | CLIControlRequest
-      | CLIControlResponse
-      | ControlCancelRequest,
+    message: CLIMessage | CLIControlRequest | CLIControlResponse | ControlCancelRequest,
   ): void {
     if (isControlRequest(message)) {
       const request = message as CLIControlRequest;
       this.controlSystemEnabled = true;
       this.ensureControlSystem();
 
-      if (request.request.subtype === 'initialize') {
+      if (request.request.subtype === "initialize") {
         // Start SDK mode initialization (fire-and-forget from loop perspective)
         void this.initializeSdkMode(request);
         return;
       }
 
-      debugLogger.debug(
-        '[Session] Ignoring non-initialize control request during initialization',
-      );
+      debugLogger.debug("[Session] Ignoring non-initialize control request during initialization");
       return;
     }
 
@@ -235,8 +218,7 @@ class Session {
       // Get sendSdkMcpMessage callback from SdkMcpController
       // This callback is used by McpClientManager to send MCP messages
       // from CLI MCP clients to SDK MCP servers via the control plane
-      const sendSdkMcpMessage =
-        this.dispatcher?.sdkMcpController.createSendSdkMcpMessage();
+      const sendSdkMcpMessage = this.dispatcher?.sdkMcpController.createSendSdkMcpMessage();
 
       // Initialize config with SDK MCP message support
       await this.ensureConfigInitialized({ sendSdkMcpMessage });
@@ -244,10 +226,8 @@ class Session {
       // Initialization complete!
       this.completeInitialization();
     } catch (error) {
-      debugLogger.error('[Session] SDK mode initialization failed:', error);
-      this.failInitialization(
-        error instanceof Error ? error : new Error(String(error)),
-      );
+      debugLogger.error("[Session] SDK mode initialization failed:", error);
+      this.failInitialization(error instanceof Error ? error : new Error(String(error)));
     }
   }
 
@@ -255,9 +235,7 @@ class Session {
    * Direct mode initialization flow
    * Initializes config and enqueues the first user message
    */
-  private async initializeDirectMode(
-    userMessage: CLIUserMessage,
-  ): Promise<void> {
+  private async initializeDirectMode(userMessage: CLIUserMessage): Promise<void> {
     this.ensureInitializationPromise();
     try {
       // Initialize config
@@ -269,10 +247,8 @@ class Session {
       // Enqueue the first user message for processing
       this.enqueueUserMessage(userMessage);
     } catch (error) {
-      debugLogger.error('[Session] Direct mode initialization failed:', error);
-      this.failInitialization(
-        error instanceof Error ? error : new Error(String(error)),
-      );
+      debugLogger.error("[Session] Direct mode initialization failed:", error);
+      this.failInitialization(error instanceof Error ? error : new Error(String(error)));
     }
   }
 
@@ -283,14 +259,14 @@ class Session {
   private handleControlRequestAsync(request: CLIControlRequest): void {
     const dispatcher = this.getDispatcher();
     if (!dispatcher) {
-      debugLogger.warn('[Session] Control system not enabled');
+      debugLogger.warn("[Session] Control system not enabled");
       return;
     }
 
     // Fire-and-forget: dispatch runs concurrently
     // The dispatcher's pendingIncomingRequests tracks completion
     void dispatcher.dispatch(request).catch((error) => {
-      debugLogger.error('[Session] Control request dispatch error:', error);
+      debugLogger.error("[Session] Control request dispatch error:", error);
       // Error response is already sent by dispatcher.dispatch()
     });
   }
@@ -320,7 +296,7 @@ class Session {
   private async processUserMessage(userMessage: CLIUserMessage): Promise<void> {
     const input = extractUserMessageText(userMessage);
     if (!input) {
-      debugLogger.debug('[Session] No text content in user message');
+      debugLogger.debug("[Session] No text content in user message");
       return;
     }
 
@@ -330,19 +306,13 @@ class Session {
     const promptId = this.getNextPromptId();
 
     try {
-      await runNonInteractive(
-        this.config,
-        createMinimalSettings(),
-        input,
-        promptId,
-        {
-          abortController: this.abortController,
-          adapter: this.outputAdapter,
-          controlService: this.controlService ?? undefined,
-        },
-      );
+      await runNonInteractive(this.config, createMinimalSettings(), input, promptId, {
+        abortController: this.abortController,
+        adapter: this.outputAdapter,
+        controlService: this.controlService ?? undefined,
+      });
     } catch (error) {
-      debugLogger.error('[Session] Query execution error:', error);
+      debugLogger.error("[Session] Query execution error:", error);
     }
   }
 
@@ -360,7 +330,7 @@ class Session {
       try {
         await this.processUserMessage(userMessage);
       } catch (error) {
-        debugLogger.error('[Session] Error processing user message:', error);
+        debugLogger.error("[Session] Error processing user message:", error);
         this.emitErrorResult(error);
       }
     }
@@ -406,7 +376,7 @@ class Session {
   }
 
   private handleInterrupt(): void {
-    debugLogger.info('[Session] Interrupt requested');
+    debugLogger.info("[Session] Interrupt requested");
     this.abortController.abort();
     // Do not create a new AbortController to prevent listener leaks.
     // Subsequent queries will check signal.aborted and fail immediately.
@@ -414,13 +384,13 @@ class Session {
 
   private setupSignalHandlers(): void {
     this.shutdownHandler = () => {
-      debugLogger.info('[Session] Shutdown signal received');
+      debugLogger.info("[Session] Shutdown signal received");
       this.isShuttingDown = true;
       this.abortController.abort();
     };
 
-    process.on('SIGINT', this.shutdownHandler);
-    process.on('SIGTERM', this.shutdownHandler);
+    process.on("SIGINT", this.shutdownHandler);
+    process.on("SIGTERM", this.shutdownHandler);
   }
 
   /**
@@ -431,36 +401,31 @@ class Session {
     try {
       await this.waitForInitialization();
     } catch (error) {
-      debugLogger.error(
-        '[Session] Initialization error during shutdown:',
-        error,
-      );
+      debugLogger.error("[Session] Initialization error during shutdown:", error);
     }
 
     // 2. Wait for all control request handlers using dispatcher's tracking
     if (this.dispatcher) {
       const pendingCount = this.dispatcher.getPendingIncomingRequestCount();
       if (pendingCount > 0) {
-        debugLogger.debug(
-          `[Session] Waiting for ${pendingCount} pending control request handlers`,
-        );
+        debugLogger.debug(`[Session] Waiting for ${pendingCount} pending control request handlers`);
       }
       await this.dispatcher.waitForPendingIncomingRequests();
     }
 
     // 3. Wait for user message processing queue
     while (this.processingPromise) {
-      debugLogger.debug('[Session] Waiting for user message processing');
+      debugLogger.debug("[Session] Waiting for user message processing");
       try {
         await this.processingPromise;
       } catch (error) {
-        debugLogger.error('[Session] Error in user message processing:', error);
+        debugLogger.error("[Session] Error in user message processing:", error);
       }
     }
   }
 
   private async shutdown(): Promise<void> {
-    debugLogger.debug('[Session] Shutting down');
+    debugLogger.debug("[Session] Shutting down");
 
     this.isShuttingDown = true;
 
@@ -473,8 +438,8 @@ class Session {
 
   private cleanupSignalHandlers(): void {
     if (this.shutdownHandler) {
-      process.removeListener('SIGINT', this.shutdownHandler);
-      process.removeListener('SIGTERM', this.shutdownHandler);
+      process.removeListener("SIGINT", this.shutdownHandler);
+      process.removeListener("SIGTERM", this.shutdownHandler);
       this.shutdownHandler = null;
     }
   }
@@ -496,7 +461,7 @@ class Session {
    */
   async run(): Promise<void> {
     try {
-      debugLogger.info('[Session] Starting session', this.sessionId);
+      debugLogger.info("[Session] Starting session", this.sessionId);
 
       // Handle initial prompt if provided (fire-and-forget)
       if (this.initialPrompt !== null) {
@@ -543,10 +508,7 @@ class Session {
             !isCLIResultMessage(message) &&
             !isCLIPartialAssistantMessage(message)
           ) {
-            debugLogger.warn(
-              '[Session] Unknown message type:',
-              JSON.stringify(message, null, 2),
-            );
+            debugLogger.warn("[Session] Unknown message type:", JSON.stringify(message, null, 2));
           }
 
           if (this.isShuttingDown) {
@@ -554,7 +516,7 @@ class Session {
           }
         }
       } catch (streamError) {
-        debugLogger.error('[Session] Stream reading error:', streamError);
+        debugLogger.error("[Session] Stream reading error:", streamError);
         throw streamError;
       }
 
@@ -569,7 +531,7 @@ class Session {
       await this.waitForAllPendingWork();
       await this.shutdown();
     } catch (error) {
-      debugLogger.error('[Session] Error:', error);
+      debugLogger.error("[Session] Error:", error);
       await this.shutdown();
       throw error;
     } finally {
@@ -580,41 +542,38 @@ class Session {
 
 function extractUserMessageText(message: CLIUserMessage): string | null {
   const content = message.message.content;
-  if (typeof content === 'string') {
+  if (typeof content === "string") {
     return content;
   }
 
   if (Array.isArray(content)) {
     const parts = content
       .map((block) => {
-        if (!block || typeof block !== 'object') {
-          return '';
+        if (!block || typeof block !== "object") {
+          return "";
         }
-        if ('type' in block && block.type === 'text' && 'text' in block) {
-          return typeof block.text === 'string' ? block.text : '';
+        if ("type" in block && block.type === "text" && "text" in block) {
+          return typeof block.text === "string" ? block.text : "";
         }
         return JSON.stringify(block);
       })
       .filter((part) => part.length > 0);
 
-    return parts.length > 0 ? parts.join('\n') : null;
+    return parts.length > 0 ? parts.join("\n") : null;
   }
 
   return null;
 }
 
-export async function runNonInteractiveStreamJson(
-  config: Config,
-  input: string,
-): Promise<void> {
+export async function runNonInteractiveStreamJson(config: Config, input: string): Promise<void> {
   let initialPrompt: CLIUserMessage | undefined = undefined;
   if (input && input.trim().length > 0) {
     const sessionId = config.getSessionId();
     initialPrompt = {
-      type: 'user',
+      type: "user",
       session_id: sessionId,
       message: {
-        role: 'user',
+        role: "user",
         content: input.trim(),
       },
       parent_tool_use_id: null,
diff --git a/apps/airiscode-cli/src/nonInteractive/types.ts b/apps/airiscode-cli/src/nonInteractive/types.ts
index abaaae898..866d5178a 100644
--- a/apps/airiscode-cli/src/nonInteractive/types.ts
+++ b/apps/airiscode-cli/src/nonInteractive/types.ts
@@ -1,8 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type {
-  SubagentConfig,
-  McpToolProgressData,
-} from '@airiscode/core';
+import type { McpToolProgressData, SubagentConfig } from "@airiscode/core";
 
 /**
  * Annotation for attaching metadata to content blocks
@@ -56,20 +53,20 @@ export interface CLIPermissionDenial {
  * Content block types from Anthropic SDK
  */
 export interface TextBlock {
-  type: 'text';
+  type: "text";
   text: string;
   annotations?: Annotation[];
 }
 
 export interface ThinkingBlock {
-  type: 'thinking';
+  type: "thinking";
   thinking: string;
   signature?: string;
   annotations?: Annotation[];
 }
 
 export interface ToolUseBlock {
-  type: 'tool_use';
+  type: "tool_use";
   id: string;
   name: string;
   input: unknown;
@@ -77,31 +74,27 @@ export interface ToolUseBlock {
 }
 
 export interface ToolResultBlock {
-  type: 'tool_result';
+  type: "tool_result";
   tool_use_id: string;
   content?: string | ContentBlock[];
   is_error?: boolean;
   annotations?: Annotation[];
 }
 
-export type ContentBlock =
-  | TextBlock
-  | ThinkingBlock
-  | ToolUseBlock
-  | ToolResultBlock;
+export type ContentBlock = TextBlock | ThinkingBlock | ToolUseBlock | ToolResultBlock;
 
 /**
  * Anthropic SDK Message types
  */
 export interface APIUserMessage {
-  role: 'user';
+  role: "user";
   content: string | ContentBlock[];
 }
 
 export interface APIAssistantMessage {
   id: string;
-  type: 'message';
-  role: 'assistant';
+  type: "message";
+  role: "assistant";
   model: string;
   content: ContentBlock[];
   stop_reason?: string | null;
@@ -112,7 +105,7 @@ export interface APIAssistantMessage {
  * CLI Message wrapper types
  */
 export interface CLIUserMessage {
-  type: 'user';
+  type: "user";
   uuid?: string;
   session_id: string;
   message: APIUserMessage;
@@ -121,7 +114,7 @@ export interface CLIUserMessage {
 }
 
 export interface CLIAssistantMessage {
-  type: 'assistant';
+  type: "assistant";
   uuid: string;
   session_id: string;
   message: APIAssistantMessage;
@@ -129,7 +122,7 @@ export interface CLIAssistantMessage {
 }
 
 export interface CLISystemMessage {
-  type: 'system';
+  type: "system";
   subtype: string;
   uuid: string;
   session_id: string;
@@ -149,14 +142,14 @@ export interface CLISystemMessage {
   skills?: string[];
   capabilities?: Record<string, unknown>;
   compact_metadata?: {
-    trigger: 'manual' | 'auto';
+    trigger: "manual" | "auto";
     pre_tokens: number;
   };
 }
 
 export interface CLIResultMessageSuccess {
-  type: 'result';
-  subtype: 'success';
+  type: "result";
+  subtype: "success";
   uuid: string;
   session_id: string;
   is_error: false;
@@ -171,8 +164,8 @@ export interface CLIResultMessageSuccess {
 }
 
 export interface CLIResultMessageError {
-  type: 'result';
-  subtype: 'error_max_turns' | 'error_during_execution';
+  type: "result";
+  subtype: "error_max_turns" | "error_during_execution";
   uuid: string;
   session_id: string;
   is_error: true;
@@ -196,52 +189,52 @@ export type CLIResultMessage = CLIResultMessageSuccess | CLIResultMessageError;
  * Stream event types for real-time message updates
  */
 export interface MessageStartStreamEvent {
-  type: 'message_start';
+  type: "message_start";
   message: {
     id: string;
-    role: 'assistant';
+    role: "assistant";
     model: string;
     content: [];
   };
 }
 
 export interface ContentBlockStartEvent {
-  type: 'content_block_start';
+  type: "content_block_start";
   index: number;
   content_block: ContentBlock;
 }
 
 export type ContentBlockDelta =
   | {
-      type: 'text_delta';
+      type: "text_delta";
       text: string;
     }
   | {
-      type: 'thinking_delta';
+      type: "thinking_delta";
       thinking: string;
     }
   | {
-      type: 'input_json_delta';
+      type: "input_json_delta";
       partial_json: string;
     };
 
 export interface ContentBlockDeltaEvent {
-  type: 'content_block_delta';
+  type: "content_block_delta";
   index: number;
   delta: ContentBlockDelta;
 }
 
 export interface ContentBlockStopEvent {
-  type: 'content_block_stop';
+  type: "content_block_stop";
   index: number;
 }
 
 export interface MessageStopStreamEvent {
-  type: 'message_stop';
+  type: "message_stop";
 }
 
 export interface ToolProgressStreamEvent {
-  type: 'tool_progress';
+  type: "tool_progress";
   tool_use_id: string;
   content: McpToolProgressData;
 }
@@ -255,21 +248,21 @@ export type StreamEvent =
   | ToolProgressStreamEvent;
 
 export interface CLIPartialAssistantMessage {
-  type: 'stream_event';
+  type: "stream_event";
   uuid: string;
   session_id: string;
   event: StreamEvent;
   parent_tool_use_id: string | null;
 }
 
-export type PermissionMode = 'default' | 'plan' | 'auto-edit' | 'yolo';
+export type PermissionMode = "default" | "plan" | "auto-edit" | "yolo";
 
 /**
  * Permission suggestion for tool use requests
  * TODO: Align with `ToolCallConfirmationDetails`
  */
 export interface PermissionSuggestion {
-  type: 'allow' | 'deny' | 'modify';
+  type: "allow" | "deny" | "modify";
   label: string;
   description?: string;
   modifiedInput?: unknown;
@@ -294,11 +287,11 @@ export interface HookCallbackResult {
 }
 
 export interface CLIControlInterruptRequest {
-  subtype: 'interrupt';
+  subtype: "interrupt";
 }
 
 export interface CLIControlPermissionRequest {
-  subtype: 'can_use_tool';
+  subtype: "can_use_tool";
   tool_name: string;
   tool_use_id: string;
   input: unknown;
@@ -311,7 +304,7 @@ export interface CLIControlPermissionRequest {
  * The actual Server instance stays in the SDK process.
  */
 export interface SDKMcpServerConfig {
-  type: 'sdk';
+  type: "sdk";
   name: string;
 }
 
@@ -346,23 +339,20 @@ export interface CLIMcpServerConfig {
     tokenParamName?: string;
     registrationUrl?: string;
   };
-  authProviderType?:
-    | 'dynamic_discovery'
-    | 'google_credentials'
-    | 'service_account_impersonation';
+  authProviderType?: "dynamic_discovery" | "google_credentials" | "service_account_impersonation";
   targetAudience?: string;
   targetServiceAccount?: string;
 }
 
 export interface CLIControlInitializeRequest {
-  subtype: 'initialize';
+  subtype: "initialize";
   hooks?: HookRegistration[] | null;
   /**
    * SDK MCP servers config
    * These are MCP servers running in the SDK process, connected via control plane.
    * External MCP servers are configured separately in settings, not via initialization.
    */
-  sdkMcpServers?: Record<string, Omit<SDKMcpServerConfig, 'instance'>>;
+  sdkMcpServers?: Record<string, Omit<SDKMcpServerConfig, "instance">>;
   /**
    * External MCP servers that the SDK wants the CLI to manage.
    * These run outside the SDK process and require CLI-side transport setup.
@@ -372,19 +362,19 @@ export interface CLIControlInitializeRequest {
 }
 
 export interface CLIControlSetPermissionModeRequest {
-  subtype: 'set_permission_mode';
+  subtype: "set_permission_mode";
   mode: PermissionMode;
 }
 
 export interface CLIHookCallbackRequest {
-  subtype: 'hook_callback';
+  subtype: "hook_callback";
   callback_id: string;
   input: unknown;
   tool_use_id: string | null;
 }
 
 export interface CLIControlMcpMessageRequest {
-  subtype: 'mcp_message';
+  subtype: "mcp_message";
   server_name: string;
   message: {
     jsonrpc?: string;
@@ -395,16 +385,16 @@ export interface CLIControlMcpMessageRequest {
 }
 
 export interface CLIControlSetModelRequest {
-  subtype: 'set_model';
+  subtype: "set_model";
   model: string;
 }
 
 export interface CLIControlMcpStatusRequest {
-  subtype: 'mcp_server_status';
+  subtype: "mcp_server_status";
 }
 
 export interface CLIControlSupportedCommandsRequest {
-  subtype: 'supported_commands';
+  subtype: "supported_commands";
 }
 
 export type ControlRequestPayload =
@@ -419,7 +409,7 @@ export type ControlRequestPayload =
   | CLIControlSupportedCommandsRequest;
 
 export interface CLIControlRequest {
-  type: 'control_request';
+  type: "control_request";
   request_id: string;
   request: ControlRequestPayload;
 }
@@ -434,31 +424,28 @@ export interface PermissionApproval {
 }
 
 export interface ControlResponse {
-  subtype: 'success';
+  subtype: "success";
   request_id: string;
   response: unknown;
 }
 
 export interface ControlErrorResponse {
-  subtype: 'error';
+  subtype: "error";
   request_id: string;
   error: string | { message: string; [key: string]: unknown };
 }
 
 export interface CLIControlResponse {
-  type: 'control_response';
+  type: "control_response";
   response: ControlResponse | ControlErrorResponse;
 }
 
 export interface ControlCancelRequest {
-  type: 'control_cancel_request';
+  type: "control_cancel_request";
   request_id?: string;
 }
 
-export type ControlMessage =
-  | CLIControlRequest
-  | CLIControlResponse
-  | ControlCancelRequest;
+export type ControlMessage = CLIControlRequest | CLIControlResponse | ControlCancelRequest;
 
 /**
  * Union of all CLI message types
@@ -475,86 +462,74 @@ export type CLIMessage =
  */
 
 export function isCLIUserMessage(msg: any): msg is CLIUserMessage {
-  return (
-    msg && typeof msg === 'object' && msg.type === 'user' && 'message' in msg
-  );
+  return msg && typeof msg === "object" && msg.type === "user" && "message" in msg;
 }
 
 export function isCLIAssistantMessage(msg: any): msg is CLIAssistantMessage {
   return (
     msg &&
-    typeof msg === 'object' &&
-    msg.type === 'assistant' &&
-    'uuid' in msg &&
-    'message' in msg &&
-    'session_id' in msg &&
-    'parent_tool_use_id' in msg
+    typeof msg === "object" &&
+    msg.type === "assistant" &&
+    "uuid" in msg &&
+    "message" in msg &&
+    "session_id" in msg &&
+    "parent_tool_use_id" in msg
   );
 }
 
 export function isCLISystemMessage(msg: any): msg is CLISystemMessage {
   return (
     msg &&
-    typeof msg === 'object' &&
-    msg.type === 'system' &&
-    'subtype' in msg &&
-    'uuid' in msg &&
-    'session_id' in msg
+    typeof msg === "object" &&
+    msg.type === "system" &&
+    "subtype" in msg &&
+    "uuid" in msg &&
+    "session_id" in msg
   );
 }
 
 export function isCLIResultMessage(msg: any): msg is CLIResultMessage {
   return (
     msg &&
-    typeof msg === 'object' &&
-    msg.type === 'result' &&
-    'subtype' in msg &&
-    'duration_ms' in msg &&
-    'is_error' in msg &&
-    'uuid' in msg &&
-    'session_id' in msg
+    typeof msg === "object" &&
+    msg.type === "result" &&
+    "subtype" in msg &&
+    "duration_ms" in msg &&
+    "is_error" in msg &&
+    "uuid" in msg &&
+    "session_id" in msg
   );
 }
 
-export function isCLIPartialAssistantMessage(
-  msg: any,
-): msg is CLIPartialAssistantMessage {
+export function isCLIPartialAssistantMessage(msg: any): msg is CLIPartialAssistantMessage {
   return (
     msg &&
-    typeof msg === 'object' &&
-    msg.type === 'stream_event' &&
-    'uuid' in msg &&
-    'session_id' in msg &&
-    'event' in msg &&
-    'parent_tool_use_id' in msg
+    typeof msg === "object" &&
+    msg.type === "stream_event" &&
+    "uuid" in msg &&
+    "session_id" in msg &&
+    "event" in msg &&
+    "parent_tool_use_id" in msg
   );
 }
 
 export function isControlRequest(msg: any): msg is CLIControlRequest {
   return (
     msg &&
-    typeof msg === 'object' &&
-    msg.type === 'control_request' &&
-    'request_id' in msg &&
-    'request' in msg
+    typeof msg === "object" &&
+    msg.type === "control_request" &&
+    "request_id" in msg &&
+    "request" in msg
   );
 }
 
 export function isControlResponse(msg: any): msg is CLIControlResponse {
-  return (
-    msg &&
-    typeof msg === 'object' &&
-    msg.type === 'control_response' &&
-    'response' in msg
-  );
+  return msg && typeof msg === "object" && msg.type === "control_response" && "response" in msg;
 }
 
 export function isControlCancel(msg: any): msg is ControlCancelRequest {
   return (
-    msg &&
-    typeof msg === 'object' &&
-    msg.type === 'control_cancel_request' &&
-    'request_id' in msg
+    msg && typeof msg === "object" && msg.type === "control_cancel_request" && "request_id" in msg
   );
 }
 
@@ -563,17 +538,17 @@ export function isControlCancel(msg: any): msg is ControlCancelRequest {
  */
 
 export function isTextBlock(block: any): block is TextBlock {
-  return block && typeof block === 'object' && block.type === 'text';
+  return block && typeof block === "object" && block.type === "text";
 }
 
 export function isThinkingBlock(block: any): block is ThinkingBlock {
-  return block && typeof block === 'object' && block.type === 'thinking';
+  return block && typeof block === "object" && block.type === "thinking";
 }
 
 export function isToolUseBlock(block: any): block is ToolUseBlock {
-  return block && typeof block === 'object' && block.type === 'tool_use';
+  return block && typeof block === "object" && block.type === "tool_use";
 }
 
 export function isToolResultBlock(block: any): block is ToolResultBlock {
-  return block && typeof block === 'object' && block.type === 'tool_result';
+  return block && typeof block === "object" && block.type === "tool_result";
 }
diff --git a/apps/airiscode-cli/src/nonInteractiveCli.ts b/apps/airiscode-cli/src/nonInteractiveCli.ts
index f8ebe03ea..705593df2 100644
--- a/apps/airiscode-cli/src/nonInteractiveCli.ts
+++ b/apps/airiscode-cli/src/nonInteractiveCli.ts
@@ -4,48 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config, ToolCallRequestInfo } from '@airiscode/core';
-import { isSlashCommand } from './ui/utils/commandUtils.js';
-import type { LoadedSettings } from './config/settings.js';
+import type { Config, Content, Part, PartListUnion, ToolCallRequestInfo } from "@airiscode/core";
 import {
+  createDebugLogger,
   executeToolCall,
-  shutdownTelemetry,
-  isTelemetrySdkInitialized,
-  GeminiEventType,
   FatalInputError,
-  promptIdContext,
-  OutputFormat,
+  GeminiEventType,
   InputFormat,
-  uiTelemetryService,
+  isTelemetrySdkInitialized,
+  OutputFormat,
   parseAndFormatApiError,
-  createDebugLogger,
+  promptIdContext,
   SendMessageType,
-} from '@airiscode/core';
-import type { Content, Part, PartListUnion } from '@airiscode/core';
-import type { CLIUserMessage, PermissionMode } from './nonInteractive/types.js';
-import type { JsonOutputAdapterInterface } from './nonInteractive/io/BaseJsonOutputAdapter.js';
-import { JsonOutputAdapter } from './nonInteractive/io/JsonOutputAdapter.js';
-import { StreamJsonOutputAdapter } from './nonInteractive/io/StreamJsonOutputAdapter.js';
-import type { ControlService } from './nonInteractive/control/ControlService.js';
-
-import { handleSlashCommand } from './nonInteractiveCliCommands.js';
-import { handleAtCommand } from './ui/hooks/atCommandProcessor.js';
+  shutdownTelemetry,
+  uiTelemetryService,
+} from "@airiscode/core";
+import type { LoadedSettings } from "./config/settings.js";
+import type { ControlService } from "./nonInteractive/control/ControlService.js";
+import type { JsonOutputAdapterInterface } from "./nonInteractive/io/BaseJsonOutputAdapter.js";
+import { JsonOutputAdapter } from "./nonInteractive/io/JsonOutputAdapter.js";
+import { StreamJsonOutputAdapter } from "./nonInteractive/io/StreamJsonOutputAdapter.js";
+import type { CLIUserMessage, PermissionMode } from "./nonInteractive/types.js";
+import { handleSlashCommand } from "./nonInteractiveCliCommands.js";
+import { handleAtCommand } from "./ui/hooks/atCommandProcessor.js";
+import { isSlashCommand } from "./ui/utils/commandUtils.js";
 import {
-  handleError,
-  handleToolError,
   handleCancellationError,
+  handleError,
   handleMaxTurnsExceededError,
-} from './utils/errors.js';
+  handleToolError,
+} from "./utils/errors.js";
+
+const debugLogger = createDebugLogger("NON_INTERACTIVE_CLI");
 
-const debugLogger = createDebugLogger('NON_INTERACTIVE_CLI');
 import {
-  normalizePartList,
-  extractPartsFromUserMessage,
   buildSystemMessage,
-  createToolProgressHandler,
-  createAgentToolProgressHandler,
   computeUsageFromMetrics,
-} from './utils/nonInteractiveHelpers.js';
+  createAgentToolProgressHandler,
+  createToolProgressHandler,
+  extractPartsFromUserMessage,
+  normalizePartList,
+} from "./utils/nonInteractiveHelpers.js";
 
 /**
  * Emits a final message for slash command results.
@@ -66,16 +65,13 @@ async function emitNonInteractiveFinalMessage(params: {
   adapter.processEvent({
     type: GeminiEventType.Content,
     value: message,
-  } as unknown as Parameters<JsonOutputAdapterInterface['processEvent']>[0]);
+  } as unknown as Parameters<JsonOutputAdapterInterface["processEvent"]>[0]);
   adapter.finalizeAssistantMessage();
 
   const metrics = uiTelemetryService.getMetrics();
   const usage = computeUsageFromMetrics(metrics);
   const outputFormat = config.getOutputFormat();
-  const stats =
-    outputFormat === OutputFormat.JSON
-      ? uiTelemetryService.getMetrics()
-      : undefined;
+  const stats = outputFormat === OutputFormat.JSON ? uiTelemetryService.getMetrics() : undefined;
 
   adapter.emitResult({
     isError,
@@ -122,10 +118,7 @@ export async function runNonInteractive(
     if (options.adapter) {
       adapter = options.adapter;
     } else if (outputFormat === OutputFormat.STREAM_JSON) {
-      adapter = new StreamJsonOutputAdapter(
-        config,
-        config.getIncludePartialMessages(),
-      );
+      adapter = new StreamJsonOutputAdapter(config, config.getIncludePartialMessages());
     } else {
       adapter = new JsonOutputAdapter(config);
     }
@@ -139,8 +132,8 @@ export async function runNonInteractive(
     const startTime = Date.now();
 
     const stdoutErrorHandler = (err: NodeJS.ErrnoException) => {
-      if (err.code === 'EPIPE') {
-        process.stdout.removeListener('error', stdoutErrorHandler);
+      if (err.code === "EPIPE") {
+        process.stdout.removeListener("error", stdoutErrorHandler);
         process.exit(0);
       }
     };
@@ -150,27 +143,21 @@ export async function runNonInteractive(
 
     // Setup signal handlers for graceful shutdown
     const shutdownHandler = () => {
-      debugLogger.debug('[runNonInteractive] Shutdown signal received');
+      debugLogger.debug("[runNonInteractive] Shutdown signal received");
       abortController.abort();
     };
 
     try {
-      process.stdout.on('error', stdoutErrorHandler);
+      process.stdout.on("error", stdoutErrorHandler);
 
-      process.on('SIGINT', shutdownHandler);
-      process.on('SIGTERM', shutdownHandler);
+      process.on("SIGINT", shutdownHandler);
+      process.on("SIGTERM", shutdownHandler);
 
       // Emit systemMessage first (always the first message in JSON mode)
-      const systemMessage = await buildSystemMessage(
-        config,
-        sessionId,
-        permissionMode,
-      );
+      const systemMessage = await buildSystemMessage(config, sessionId, permissionMode);
       adapter.emitMessage(systemMessage);
 
-      let initialPartList: PartListUnion | null = extractPartsFromUserMessage(
-        options.userMessage,
-      );
+      let initialPartList: PartListUnion | null = extractPartsFromUserMessage(options.userMessage);
 
       if (!initialPartList) {
         let slashHandled = false;
@@ -182,27 +169,27 @@ export async function runNonInteractive(
             settings,
           );
           switch (slashCommandResult.type) {
-            case 'submit_prompt':
+            case "submit_prompt":
               // A slash command can replace the prompt entirely; fall back to @-command processing otherwise.
               initialPartList = slashCommandResult.content;
               slashHandled = true;
               break;
-            case 'message': {
+            case "message": {
               // systemMessage already emitted above
               await emitNonInteractiveFinalMessage({
                 message: slashCommandResult.content,
-                isError: slashCommandResult.messageType === 'error',
+                isError: slashCommandResult.messageType === "error",
                 adapter,
                 config,
                 startTimeMs: startTime,
               });
               return;
             }
-            case 'stream_messages':
+            case "stream_messages":
               throw new FatalInputError(
-                'Stream messages mode is not supported in non-interactive CLI',
+                "Stream messages mode is not supported in non-interactive CLI",
               );
-            case 'unsupported': {
+            case "unsupported": {
               await emitNonInteractiveFinalMessage({
                 message: slashCommandResult.reason,
                 isError: true,
@@ -212,7 +199,7 @@ export async function runNonInteractive(
               });
               return;
             }
-            case 'no_command':
+            case "no_command":
               break;
             default: {
               const _exhaustive: never = slashCommandResult;
@@ -235,9 +222,7 @@ export async function runNonInteractive(
           if (!shouldProceed || !processedQuery) {
             // An error occurred during @include processing (e.g., file not found).
             // The error message is already logged by handleAtCommand.
-            throw new FatalInputError(
-              'Exiting due to an error processing the @ command.',
-            );
+            throw new FatalInputError("Exiting due to an error processing the @ command.");
           }
           initialPartList = processedQuery as PartListUnion;
         }
@@ -248,15 +233,12 @@ export async function runNonInteractive(
       }
 
       const initialParts = normalizePartList(initialPartList);
-      let currentMessages: Content[] = [{ role: 'user', parts: initialParts }];
+      let currentMessages: Content[] = [{ role: "user", parts: initialParts }];
 
       let isFirstTurn = true;
       while (true) {
         turnCount++;
-        if (
-          config.getMaxSessionTurns() >= 0 &&
-          turnCount > config.getMaxSessionTurns()
-        ) {
+        if (config.getMaxSessionTurns() >= 0 && turnCount > config.getMaxSessionTurns()) {
           handleMaxTurnsExceededError(config);
         }
 
@@ -267,9 +249,7 @@ export async function runNonInteractive(
           abortController.signal,
           prompt_id,
           {
-            type: isFirstTurn
-              ? SendMessageType.UserQuery
-              : SendMessageType.ToolResult,
+            type: isFirstTurn ? SendMessageType.UserQuery : SendMessageType.ToolResult,
           },
         );
         isFirstTurn = false;
@@ -286,10 +266,7 @@ export async function runNonInteractive(
           if (event.type === GeminiEventType.ToolCallRequest) {
             toolCallRequests.push(event.value);
           }
-          if (
-            outputFormat === OutputFormat.TEXT &&
-            event.type === GeminiEventType.Error
-          ) {
+          if (outputFormat === OutputFormat.TEXT && event.type === GeminiEventType.Error) {
             const errorText = parseAndFormatApiError(
               event.value.error,
               config.getContentGeneratorConfig()?.authType,
@@ -311,7 +288,7 @@ export async function runNonInteractive(
             const finalRequestInfo = requestInfo;
 
             const inputFormat =
-              typeof config.getInputFormat === 'function'
+              typeof config.getInputFormat === "function"
                 ? config.getInputFormat()
                 : InputFormat.TEXT;
             const toolCallUpdateCallback =
@@ -323,13 +300,9 @@ export async function runNonInteractive(
             // Agent tool has its own complex handler (subagent messages).
             // All other tools with canUpdateOutput=true (e.g., MCP tools)
             // get a generic handler that emits progress via the adapter.
-            const isAgentTool = finalRequestInfo.name === 'agent';
+            const isAgentTool = finalRequestInfo.name === "agent";
             const { handler: outputUpdateHandler } = isAgentTool
-              ? createAgentToolProgressHandler(
-                  config,
-                  finalRequestInfo.callId,
-                  adapter,
-                )
+              ? createAgentToolProgressHandler(config, finalRequestInfo.callId, adapter)
               : createToolProgressHandler(finalRequestInfo, adapter);
 
             const toolResponse = await executeToolCall(
@@ -356,8 +329,8 @@ export async function runNonInteractive(
                 finalRequestInfo.name,
                 toolResponse.error,
                 config,
-                toolResponse.errorType || 'TOOL_EXECUTION_ERROR',
-                typeof toolResponse.resultDisplay === 'string'
+                toolResponse.errorType || "TOOL_EXECUTION_ERROR",
+                typeof toolResponse.resultDisplay === "string"
                   ? toolResponse.resultDisplay
                   : undefined,
               );
@@ -369,12 +342,10 @@ export async function runNonInteractive(
               toolResponseParts.push(...toolResponse.responseParts);
             }
           }
-          currentMessages = [{ role: 'user', parts: toolResponseParts }];
+          currentMessages = [{ role: "user", parts: toolResponseParts }];
         } else {
           // No more tool calls — check if cron jobs are keeping us alive
-          const scheduler = !config.isCronEnabled()
-            ? null
-            : config.getCronScheduler();
+          const scheduler = !config.isCronEnabled() ? null : config.getCronScheduler();
           if (scheduler && scheduler.size > 0) {
             // Start the scheduler and wait for all jobs to complete or be deleted.
             // Each fired prompt is processed as a new turn through the same loop.
@@ -396,9 +367,7 @@ export async function runNonInteractive(
                   while (cronQueue.length > 0) {
                     const cronPrompt = cronQueue.shift()!;
                     turnCount++;
-                    let cronMessages: Content[] = [
-                      { role: 'user', parts: [{ text: cronPrompt }] },
-                    ];
+                    let cronMessages: Content[] = [{ role: "user", parts: [{ text: cronPrompt }] }];
                     let cronIsFirstTurn = true;
 
                     while (true) {
@@ -409,9 +378,7 @@ export async function runNonInteractive(
                         abortController.signal,
                         prompt_id,
                         {
-                          type: cronIsFirstTurn
-                            ? SendMessageType.Cron
-                            : SendMessageType.ToolResult,
+                          type: cronIsFirstTurn ? SendMessageType.Cron : SendMessageType.ToolResult,
                         },
                       );
                       cronIsFirstTurn = false;
@@ -423,7 +390,7 @@ export async function runNonInteractive(
                           const summary = scheduler.getExitSummary();
                           scheduler.stop();
                           if (summary) {
-                            process.stderr.write(summary + '\n');
+                            process.stderr.write(summary + "\n");
                           }
                           resolve();
                           return;
@@ -441,13 +408,9 @@ export async function runNonInteractive(
                         const cronToolResponseParts: Part[] = [];
 
                         for (const requestInfo of cronToolCallRequests) {
-                          const isAgentTool = requestInfo.name === 'agent';
+                          const isAgentTool = requestInfo.name === "agent";
                           const { handler: outputUpdateHandler } = isAgentTool
-                            ? createAgentToolProgressHandler(
-                                config,
-                                requestInfo.callId,
-                                adapter,
-                              )
+                            ? createAgentToolProgressHandler(config, requestInfo.callId, adapter)
                             : createToolProgressHandler(requestInfo, adapter);
 
                           const toolResponse = await executeToolCall(
@@ -462,8 +425,8 @@ export async function runNonInteractive(
                               requestInfo.name,
                               toolResponse.error,
                               config,
-                              toolResponse.errorType || 'TOOL_EXECUTION_ERROR',
-                              typeof toolResponse.resultDisplay === 'string'
+                              toolResponse.errorType || "TOOL_EXECUTION_ERROR",
+                              typeof toolResponse.resultDisplay === "string"
                                 ? toolResponse.resultDisplay
                                 : undefined,
                             );
@@ -472,21 +435,17 @@ export async function runNonInteractive(
                           adapter.emitToolResult(requestInfo, toolResponse);
 
                           if (toolResponse.responseParts) {
-                            cronToolResponseParts.push(
-                              ...toolResponse.responseParts,
-                            );
+                            cronToolResponseParts.push(...toolResponse.responseParts);
                           }
                         }
-                        cronMessages = [
-                          { role: 'user', parts: cronToolResponseParts },
-                        ];
+                        cronMessages = [{ role: "user", parts: cronToolResponseParts }];
                       } else {
                         break;
                       }
                     }
                   }
                 } catch (error) {
-                  debugLogger.error('Error processing cron prompt:', error);
+                  debugLogger.error("Error processing cron prompt:", error);
                 } finally {
                   processing = false;
                   checkDone();
@@ -507,9 +466,7 @@ export async function runNonInteractive(
           const usage = computeUsageFromMetrics(metrics);
           // Get stats for JSON format output
           const stats =
-            outputFormat === OutputFormat.JSON
-              ? uiTelemetryService.getMetrics()
-              : undefined;
+            outputFormat === OutputFormat.JSON ? uiTelemetryService.getMetrics() : undefined;
           adapter.emitResult({
             isError: false,
             durationMs: Date.now() - startTime,
@@ -538,9 +495,7 @@ export async function runNonInteractive(
       const usage = computeUsageFromMetrics(metrics);
       // Get stats for JSON format output
       const stats =
-        outputFormat === OutputFormat.JSON
-          ? uiTelemetryService.getMetrics()
-          : undefined;
+        outputFormat === OutputFormat.JSON ? uiTelemetryService.getMetrics() : undefined;
       adapter.emitResult({
         isError: true,
         durationMs: Date.now() - startTime,
@@ -552,10 +507,10 @@ export async function runNonInteractive(
       });
       handleError(error, config);
     } finally {
-      process.stdout.removeListener('error', stdoutErrorHandler);
+      process.stdout.removeListener("error", stdoutErrorHandler);
       // Cleanup signal handlers
-      process.removeListener('SIGINT', shutdownHandler);
-      process.removeListener('SIGTERM', shutdownHandler);
+      process.removeListener("SIGINT", shutdownHandler);
+      process.removeListener("SIGTERM", shutdownHandler);
       if (isTelemetrySdkInitialized()) {
         await shutdownTelemetry();
       }
diff --git a/apps/airiscode-cli/src/nonInteractiveCliCommands.ts b/apps/airiscode-cli/src/nonInteractiveCliCommands.ts
index 4215cec92..7faacbcef 100644
--- a/apps/airiscode-cli/src/nonInteractiveCliCommands.ts
+++ b/apps/airiscode-cli/src/nonInteractiveCliCommands.ts
@@ -4,30 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { PartListUnion } from '@airiscode/core';
-import { parseSlashCommand } from './utils/commands.js';
+import type { PartListUnion } from "@airiscode/core";
+import { type Config, createDebugLogger, Logger, uiTelemetryService } from "@airiscode/core";
+import type { LoadedSettings } from "./config/settings.js";
+import { t } from "./i18n/index.js";
+import { BuiltinCommandLoader } from "./services/BuiltinCommandLoader.js";
+import { BundledSkillLoader } from "./services/BundledSkillLoader.js";
+import { CommandService } from "./services/CommandService.js";
+import { FileCommandLoader } from "./services/FileCommandLoader.js";
 import {
-  Logger,
-  uiTelemetryService,
-  type Config,
-  createDebugLogger,
-} from '@airiscode/core';
-import { CommandService } from './services/CommandService.js';
-import { BuiltinCommandLoader } from './services/BuiltinCommandLoader.js';
-import { BundledSkillLoader } from './services/BundledSkillLoader.js';
-import { FileCommandLoader } from './services/FileCommandLoader.js';
-import {
-  CommandKind,
   type CommandContext,
+  CommandKind,
   type SlashCommand,
   type SlashCommandActionReturn,
-} from './ui/commands/types.js';
-import { createNonInteractiveUI } from './ui/noninteractive/nonInteractiveUi.js';
-import type { LoadedSettings } from './config/settings.js';
-import type { SessionStatsState } from './ui/contexts/SessionContext.js';
-import { t } from './i18n/index.js';
+} from "./ui/commands/types.js";
+import type { SessionStatsState } from "./ui/contexts/SessionContext.js";
+import { createNonInteractiveUI } from "./ui/noninteractive/nonInteractiveUi.js";
+import { parseSlashCommand } from "./utils/commands.js";
 
-const debugLogger = createDebugLogger('NON_INTERACTIVE_COMMANDS');
+const debugLogger = createDebugLogger("NON_INTERACTIVE_COMMANDS");
 
 /**
  * Built-in commands that are allowed in non-interactive modes (CLI and ACP).
@@ -39,11 +34,11 @@ const debugLogger = createDebugLogger('NON_INTERACTIVE_COMMANDS');
  * - compress: Compress conversation history
  */
 export const ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE = [
-  'init',
-  'summary',
-  'compress',
-  'btw',
-  'bug',
+  "init",
+  "summary",
+  "compress",
+  "btw",
+  "bug",
 ] as const;
 
 /**
@@ -58,29 +53,25 @@ export const ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE = [
  */
 export type NonInteractiveSlashCommandResult =
   | {
-      type: 'submit_prompt';
+      type: "submit_prompt";
       content: PartListUnion;
     }
   | {
-      type: 'message';
-      messageType: 'info' | 'error';
+      type: "message";
+      messageType: "info" | "error";
       content: string;
     }
   | {
-      type: 'stream_messages';
-      messages: AsyncGenerator<
-        { messageType: 'info' | 'error'; content: string },
-        void,
-        unknown
-      >;
+      type: "stream_messages";
+      messages: AsyncGenerator<{ messageType: "info" | "error"; content: string }, void, unknown>;
     }
   | {
-      type: 'unsupported';
+      type: "unsupported";
       reason: string;
       originalType: string;
     }
   | {
-      type: 'no_command';
+      type: "no_command";
     };
 
 /**
@@ -96,26 +87,24 @@ export type NonInteractiveSlashCommandResult =
  * @param result The result from executing a slash command action
  * @returns A NonInteractiveSlashCommandResult describing the outcome
  */
-function handleCommandResult(
-  result: SlashCommandActionReturn,
-): NonInteractiveSlashCommandResult {
+function handleCommandResult(result: SlashCommandActionReturn): NonInteractiveSlashCommandResult {
   switch (result.type) {
-    case 'submit_prompt':
+    case "submit_prompt":
       return {
-        type: 'submit_prompt',
+        type: "submit_prompt",
         content: result.content,
       };
 
-    case 'message':
+    case "message":
       return {
-        type: 'message',
+        type: "message",
         messageType: result.messageType,
         content: result.content,
       };
 
-    case 'stream_messages':
+    case "stream_messages":
       return {
-        type: 'stream_messages',
+        type: "stream_messages",
         messages: result.messages,
       };
 
@@ -124,60 +113,59 @@ function handleCommandResult(
      * whitelist of allowed slash commands in ACP and non-interactive mode.
      * We'll try to add more supported return types in the future.
      */
-    case 'tool':
+    case "tool":
       return {
-        type: 'unsupported',
-        reason:
-          'Tool execution from slash commands is not supported in non-interactive mode.',
-        originalType: 'tool',
+        type: "unsupported",
+        reason: "Tool execution from slash commands is not supported in non-interactive mode.",
+        originalType: "tool",
       };
 
-    case 'quit':
+    case "quit":
       return {
-        type: 'unsupported',
+        type: "unsupported",
         reason:
-          'Quit command is not supported in non-interactive mode. The process will exit naturally after completion.',
-        originalType: 'quit',
+          "Quit command is not supported in non-interactive mode. The process will exit naturally after completion.",
+        originalType: "quit",
       };
 
-    case 'dialog':
+    case "dialog":
       return {
-        type: 'unsupported',
+        type: "unsupported",
         reason: `Dialog '${result.dialog}' cannot be opened in non-interactive mode.`,
-        originalType: 'dialog',
+        originalType: "dialog",
       };
 
-    case 'load_history':
+    case "load_history":
       return {
-        type: 'unsupported',
+        type: "unsupported",
         reason:
-          'Loading history is not supported in non-interactive mode. Each invocation starts with a fresh context.',
-        originalType: 'load_history',
+          "Loading history is not supported in non-interactive mode. Each invocation starts with a fresh context.",
+        originalType: "load_history",
       };
 
-    case 'confirm_shell_commands':
+    case "confirm_shell_commands":
       return {
-        type: 'unsupported',
+        type: "unsupported",
         reason:
-          'Shell command confirmation is not supported in non-interactive mode. Use YOLO mode or pre-approve commands.',
-        originalType: 'confirm_shell_commands',
+          "Shell command confirmation is not supported in non-interactive mode. Use YOLO mode or pre-approve commands.",
+        originalType: "confirm_shell_commands",
       };
 
-    case 'confirm_action':
+    case "confirm_action":
       return {
-        type: 'unsupported',
+        type: "unsupported",
         reason:
-          'Action confirmation is not supported in non-interactive mode. Commands requiring confirmation cannot be executed.',
-        originalType: 'confirm_action',
+          "Action confirmation is not supported in non-interactive mode. Commands requiring confirmation cannot be executed.",
+        originalType: "confirm_action",
       };
 
     default: {
       // Exhaustiveness check
       const _exhaustive: never = result;
       return {
-        type: 'unsupported',
+        type: "unsupported",
         reason: `Unknown command result type: ${(_exhaustive as SlashCommandActionReturn).type}`,
-        originalType: 'unknown',
+        originalType: "unknown",
       };
     }
   }
@@ -231,23 +219,17 @@ export const handleSlashCommand = async (
   abortController: AbortController,
   config: Config,
   settings: LoadedSettings,
-  allowedBuiltinCommandNames: string[] = [
-    ...ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE,
-  ],
+  allowedBuiltinCommandNames: string[] = [...ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE],
 ): Promise<NonInteractiveSlashCommandResult> => {
   const trimmed = rawQuery.trim();
-  if (!trimmed.startsWith('/')) {
-    return { type: 'no_command' };
+  if (!trimmed.startsWith("/")) {
+    return { type: "no_command" };
   }
 
   const isAcpMode = config.getExperimentalZedIntegration();
   const isInteractive = config.isInteractive();
 
-  const executionMode = isAcpMode
-    ? 'acp'
-    : isInteractive
-      ? 'interactive'
-      : 'non_interactive';
+  const executionMode = isAcpMode ? "acp" : isInteractive ? "interactive" : "non_interactive";
 
   const allowedBuiltinSet = new Set(allowedBuiltinCommandNames ?? []);
 
@@ -258,46 +240,33 @@ export const handleSlashCommand = async (
     new FileCommandLoader(config),
   ];
 
-  const commandService = await CommandService.create(
-    allLoaders,
-    abortController.signal,
-  );
+  const commandService = await CommandService.create(allLoaders, abortController.signal);
   const allCommands = commandService.getCommands();
-  const filteredCommands = filterCommandsForNonInteractive(
-    allCommands,
-    allowedBuiltinSet,
-  );
+  const filteredCommands = filterCommandsForNonInteractive(allCommands, allowedBuiltinSet);
 
   // First, try to parse with filtered commands
-  const { commandToExecute, args } = parseSlashCommand(
-    rawQuery,
-    filteredCommands,
-  );
+  const { commandToExecute, args } = parseSlashCommand(rawQuery, filteredCommands);
 
   if (!commandToExecute) {
     // Check if this is a known command that's just not allowed
-    const { commandToExecute: knownCommand } = parseSlashCommand(
-      rawQuery,
-      allCommands,
-    );
+    const { commandToExecute: knownCommand } = parseSlashCommand(rawQuery, allCommands);
 
     if (knownCommand) {
       // Command exists but is not allowed in non-interactive mode
       return {
-        type: 'unsupported',
-        reason: t(
-          'The command "/{{command}}" is not supported in non-interactive mode.',
-          { command: knownCommand.name },
-        ),
-        originalType: 'filtered_command',
+        type: "unsupported",
+        reason: t('The command "/{{command}}" is not supported in non-interactive mode.', {
+          command: knownCommand.name,
+        }),
+        originalType: "filtered_command",
       };
     }
 
-    return { type: 'no_command' };
+    return { type: "no_command" };
   }
 
   if (!commandToExecute.action) {
-    return { type: 'no_command' };
+    return { type: "no_command" };
   }
 
   // Not used by custom commands but may be in the future.
@@ -309,7 +278,7 @@ export const handleSlashCommand = async (
     promptCount: 1,
   };
 
-  const logger = new Logger(config?.getSessionId() || '', config?.storage);
+  const logger = new Logger(config?.getSessionId() || "", config?.storage);
 
   const context: CommandContext = {
     executionMode,
@@ -336,9 +305,9 @@ export const handleSlashCommand = async (
   if (!result) {
     // Command executed but returned no result (e.g., void return)
     return {
-      type: 'message',
-      messageType: 'info',
-      content: 'Command executed successfully.',
+      type: "message",
+      messageType: "info",
+      content: "Command executed successfully.",
     };
   }
 
@@ -359,9 +328,7 @@ export const handleSlashCommand = async (
 export const getAvailableCommands = async (
   config: Config,
   abortSignal: AbortSignal,
-  allowedBuiltinCommandNames: string[] = [
-    ...ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE,
-  ],
+  allowedBuiltinCommandNames: string[] = [...ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE],
 ): Promise<SlashCommand[]> => {
   try {
     const allowedBuiltinSet = new Set(allowedBuiltinCommandNames ?? []);
@@ -378,16 +345,13 @@ export const getAvailableCommands = async (
 
     const commandService = await CommandService.create(loaders, abortSignal);
     const commands = commandService.getCommands();
-    const filteredCommands = filterCommandsForNonInteractive(
-      commands,
-      allowedBuiltinSet,
-    );
+    const filteredCommands = filterCommandsForNonInteractive(commands, allowedBuiltinSet);
 
     // Filter out hidden commands
     return filteredCommands.filter((cmd) => !cmd.hidden);
   } catch (error) {
     // Handle errors gracefully - log and return empty array
-    debugLogger.error('Error loading available commands:', error);
+    debugLogger.error("Error loading available commands:", error);
     return [];
   }
 };
diff --git a/apps/airiscode-cli/src/services/BuiltinCommandLoader.ts b/apps/airiscode-cli/src/services/BuiltinCommandLoader.ts
index 78c143ef9..676c9ba79 100644
--- a/apps/airiscode-cli/src/services/BuiltinCommandLoader.ts
+++ b/apps/airiscode-cli/src/services/BuiltinCommandLoader.ts
@@ -4,53 +4,53 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ICommandLoader } from './types.js';
-import type { SlashCommand } from '../ui/commands/types.js';
-import type { Config } from '@airiscode/core';
-import { aboutCommand } from '../ui/commands/aboutCommand.js';
-import { agentsCommand } from '../ui/commands/agentsCommand.js';
-import { arenaCommand } from '../ui/commands/arenaCommand.js';
-import { approvalModeCommand } from '../ui/commands/approvalModeCommand.js';
-import { authCommand } from '../ui/commands/authCommand.js';
-import { btwCommand } from '../ui/commands/btwCommand.js';
-import { bugCommand } from '../ui/commands/bugCommand.js';
-import { clearCommand } from '../ui/commands/clearCommand.js';
-import { compressCommand } from '../ui/commands/compressCommand.js';
-import { contextCommand } from '../ui/commands/contextCommand.js';
-import { copyCommand } from '../ui/commands/copyCommand.js';
-import { docsCommand } from '../ui/commands/docsCommand.js';
-import { directoryCommand } from '../ui/commands/directoryCommand.js';
-import { editorCommand } from '../ui/commands/editorCommand.js';
-import { exportCommand } from '../ui/commands/exportCommand.js';
-import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
-import { helpCommand } from '../ui/commands/helpCommand.js';
-import { hooksCommand } from '../ui/commands/hooksCommand.js';
-import { ideCommand } from '../ui/commands/ideCommand.js';
-import { createDebugLogger } from '@airiscode/core';
-import { initCommand } from '../ui/commands/initCommand.js';
-import { languageCommand } from '../ui/commands/languageCommand.js';
-import { mcpCommand } from '../ui/commands/mcpCommand.js';
-import { memoryCommand } from '../ui/commands/memoryCommand.js';
-import { modelCommand } from '../ui/commands/modelCommand.js';
-import { planCommand } from '../ui/commands/planCommand.js';
-import { permissionsCommand } from '../ui/commands/permissionsCommand.js';
-import { trustCommand } from '../ui/commands/trustCommand.js';
-import { quitCommand } from '../ui/commands/quitCommand.js';
-import { restoreCommand } from '../ui/commands/restoreCommand.js';
-import { resumeCommand } from '../ui/commands/resumeCommand.js';
-import { settingsCommand } from '../ui/commands/settingsCommand.js';
-import { skillsCommand } from '../ui/commands/skillsCommand.js';
-import { statsCommand } from '../ui/commands/statsCommand.js';
-import { summaryCommand } from '../ui/commands/summaryCommand.js';
-import { terminalSetupCommand } from '../ui/commands/terminalSetupCommand.js';
-import { themeCommand } from '../ui/commands/themeCommand.js';
-import { toolsCommand } from '../ui/commands/toolsCommand.js';
-import { vimCommand } from '../ui/commands/vimCommand.js';
-import { setupGithubCommand } from '../ui/commands/setupGithubCommand.js';
-import { insightCommand } from '../ui/commands/insightCommand.js';
-import { statuslineCommand } from '../ui/commands/statuslineCommand.js';
+import type { Config } from "@airiscode/core";
+import { createDebugLogger } from "@airiscode/core";
+import { aboutCommand } from "../ui/commands/aboutCommand.js";
+import { agentsCommand } from "../ui/commands/agentsCommand.js";
+import { approvalModeCommand } from "../ui/commands/approvalModeCommand.js";
+import { arenaCommand } from "../ui/commands/arenaCommand.js";
+import { authCommand } from "../ui/commands/authCommand.js";
+import { btwCommand } from "../ui/commands/btwCommand.js";
+import { bugCommand } from "../ui/commands/bugCommand.js";
+import { clearCommand } from "../ui/commands/clearCommand.js";
+import { compressCommand } from "../ui/commands/compressCommand.js";
+import { contextCommand } from "../ui/commands/contextCommand.js";
+import { copyCommand } from "../ui/commands/copyCommand.js";
+import { directoryCommand } from "../ui/commands/directoryCommand.js";
+import { docsCommand } from "../ui/commands/docsCommand.js";
+import { editorCommand } from "../ui/commands/editorCommand.js";
+import { exportCommand } from "../ui/commands/exportCommand.js";
+import { extensionsCommand } from "../ui/commands/extensionsCommand.js";
+import { helpCommand } from "../ui/commands/helpCommand.js";
+import { hooksCommand } from "../ui/commands/hooksCommand.js";
+import { ideCommand } from "../ui/commands/ideCommand.js";
+import { initCommand } from "../ui/commands/initCommand.js";
+import { insightCommand } from "../ui/commands/insightCommand.js";
+import { languageCommand } from "../ui/commands/languageCommand.js";
+import { mcpCommand } from "../ui/commands/mcpCommand.js";
+import { memoryCommand } from "../ui/commands/memoryCommand.js";
+import { modelCommand } from "../ui/commands/modelCommand.js";
+import { permissionsCommand } from "../ui/commands/permissionsCommand.js";
+import { planCommand } from "../ui/commands/planCommand.js";
+import { quitCommand } from "../ui/commands/quitCommand.js";
+import { restoreCommand } from "../ui/commands/restoreCommand.js";
+import { resumeCommand } from "../ui/commands/resumeCommand.js";
+import { settingsCommand } from "../ui/commands/settingsCommand.js";
+import { setupGithubCommand } from "../ui/commands/setupGithubCommand.js";
+import { skillsCommand } from "../ui/commands/skillsCommand.js";
+import { statsCommand } from "../ui/commands/statsCommand.js";
+import { statuslineCommand } from "../ui/commands/statuslineCommand.js";
+import { summaryCommand } from "../ui/commands/summaryCommand.js";
+import { terminalSetupCommand } from "../ui/commands/terminalSetupCommand.js";
+import { themeCommand } from "../ui/commands/themeCommand.js";
+import { toolsCommand } from "../ui/commands/toolsCommand.js";
+import { trustCommand } from "../ui/commands/trustCommand.js";
+import type { SlashCommand } from "../ui/commands/types.js";
+import { vimCommand } from "../ui/commands/vimCommand.js";
+import type { ICommandLoader } from "./types.js";
 
-const builtinDebugLogger = createDebugLogger('BUILTIN_COMMAND_LOADER');
+const builtinDebugLogger = createDebugLogger("BUILTIN_COMMAND_LOADER");
 
 /**
  * Loads the core, hard-coded slash commands that are an integral part
@@ -75,7 +75,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
       resolvedIdeCommand = await ideCommand();
     } catch (error) {
       builtinDebugLogger.warn(
-        'Failed to load IDE command:',
+        "Failed to load IDE command:",
         error instanceof Error ? error.message : String(error),
       );
     }
diff --git a/apps/airiscode-cli/src/services/BundledSkillLoader.ts b/apps/airiscode-cli/src/services/BundledSkillLoader.ts
index c0673f032..06848f8bd 100644
--- a/apps/airiscode-cli/src/services/BundledSkillLoader.ts
+++ b/apps/airiscode-cli/src/services/BundledSkillLoader.ts
@@ -4,19 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/core';
-import {
-  createDebugLogger,
-  appendToLastTextPart,
-} from '@airiscode/core';
-import type { ICommandLoader } from './types.js';
-import type {
-  SlashCommand,
-  SlashCommandActionReturn,
-} from '../ui/commands/types.js';
-import { CommandKind } from '../ui/commands/types.js';
+import type { Config } from "@airiscode/core";
+import { appendToLastTextPart, createDebugLogger } from "@airiscode/core";
+import type { SlashCommand, SlashCommandActionReturn } from "../ui/commands/types.js";
+import { CommandKind } from "../ui/commands/types.js";
+import type { ICommandLoader } from "./types.js";
 
-const debugLogger = createDebugLogger('BUNDLED_SKILL_LOADER');
+const debugLogger = createDebugLogger("BUNDLED_SKILL_LOADER");
 
 /**
  * Loads bundled skills as slash commands, making them directly invocable
@@ -28,31 +22,24 @@ export class BundledSkillLoader implements ICommandLoader {
   async loadCommands(_signal: AbortSignal): Promise<SlashCommand[]> {
     const skillManager = this.config?.getSkillManager();
     if (!skillManager) {
-      debugLogger.debug('SkillManager not available, skipping bundled skills');
+      debugLogger.debug("SkillManager not available, skipping bundled skills");
       return [];
     }
 
     try {
-      const allSkills = await skillManager.listSkills({ level: 'bundled' });
+      const allSkills = await skillManager.listSkills({ level: "bundled" });
 
       // Hide skills whose allowedTools require cron when cron is disabled
       const cronEnabled = this.config?.isCronEnabled() ?? false;
       const skills = allSkills.filter((skill) => {
-        if (
-          !cronEnabled &&
-          skill.allowedTools?.some((t) => t.startsWith('cron_'))
-        ) {
-          debugLogger.debug(
-            `Hiding skill "${skill.name}" because cron is not enabled`,
-          );
+        if (!cronEnabled && skill.allowedTools?.some((t) => t.startsWith("cron_"))) {
+          debugLogger.debug(`Hiding skill "${skill.name}" because cron is not enabled`);
           return false;
         }
         return true;
       });
 
-      debugLogger.debug(
-        `Loaded ${skills.length} bundled skill(s) as slash commands`,
-      );
+      debugLogger.debug(`Loaded ${skills.length} bundled skill(s) as slash commands`);
 
       return skills.map((skill) => ({
         name: skill.name,
@@ -61,10 +48,10 @@ export class BundledSkillLoader implements ICommandLoader {
         action: async (context, _args): Promise<SlashCommandActionReturn> => {
           // Resolve template variables in skill body
           let body = skill.body;
-          const modelId = this.config?.getModel()?.trim() || '';
-          if (body.includes('{{model}}') || body.includes('YOUR_MODEL_ID')) {
-            body = body.replaceAll('{{model}}', modelId);
-            body = body.replaceAll('YOUR_MODEL_ID', modelId);
+          const modelId = this.config?.getModel()?.trim() || "";
+          if (body.includes("{{model}}") || body.includes("YOUR_MODEL_ID")) {
+            body = body.replaceAll("{{model}}", modelId);
+            body = body.replaceAll("YOUR_MODEL_ID", modelId);
             // Prepend model identity as a top-level declaration so the LLM
             // cannot miss it even if it doesn't copy the template exactly.
             if (modelId) {
@@ -77,13 +64,13 @@ export class BundledSkillLoader implements ICommandLoader {
             : [{ text: body }];
 
           return {
-            type: 'submit_prompt',
+            type: "submit_prompt",
             content,
           };
         },
       }));
     } catch (error) {
-      debugLogger.error('Failed to load bundled skills:', error);
+      debugLogger.error("Failed to load bundled skills:", error);
       return [];
     }
   }
diff --git a/apps/airiscode-cli/src/services/CommandService.ts b/apps/airiscode-cli/src/services/CommandService.ts
index 349e63b9f..136790ec8 100644
--- a/apps/airiscode-cli/src/services/CommandService.ts
+++ b/apps/airiscode-cli/src/services/CommandService.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from '../ui/commands/types.js';
-import type { ICommandLoader } from './types.js';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import type { SlashCommand } from "../ui/commands/types.js";
+import type { ICommandLoader } from "./types.js";
 
-const debugLogger = createDebugLogger('CLI_COMMANDS');
+const debugLogger = createDebugLogger("CLI_COMMANDS");
 
 /**
  * Orchestrates the discovery and loading of all slash commands for the CLI.
@@ -47,20 +47,15 @@ export class CommandService {
    * @param signal An AbortSignal to cancel the loading process.
    * @returns A promise that resolves to a new, fully initialized `CommandService` instance.
    */
-  static async create(
-    loaders: ICommandLoader[],
-    signal: AbortSignal,
-  ): Promise<CommandService> {
-    const results = await Promise.allSettled(
-      loaders.map((loader) => loader.loadCommands(signal)),
-    );
+  static async create(loaders: ICommandLoader[], signal: AbortSignal): Promise<CommandService> {
+    const results = await Promise.allSettled(loaders.map((loader) => loader.loadCommands(signal)));
 
     const allCommands: SlashCommand[] = [];
     for (const result of results) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         allCommands.push(...result.value);
       } else {
-        debugLogger.debug('A command loader failed:', result.reason);
+        debugLogger.debug("A command loader failed:", result.reason);
       }
     }
 
diff --git a/apps/airiscode-cli/src/services/FileCommandLoader.ts b/apps/airiscode-cli/src/services/FileCommandLoader.ts
index 5bcd82717..9415f707a 100644
--- a/apps/airiscode-cli/src/services/FileCommandLoader.ts
+++ b/apps/airiscode-cli/src/services/FileCommandLoader.ts
@@ -4,35 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import * as fsSync from 'node:fs';
-import path from 'node:path';
-import toml from '@iarna/toml';
-import { glob } from 'glob';
-import { z } from 'zod';
-import type { Config } from '@airiscode/core';
-import {
-  createDebugLogger,
-  EXTENSIONS_CONFIG_FILENAME,
-  Storage,
-} from '@airiscode/core';
-import type { ICommandLoader } from './types.js';
-import {
-  parseMarkdownCommand,
-  MarkdownCommandDefSchema,
-} from './markdown-command-parser.js';
-import {
-  createSlashCommandFromDefinition,
-  type CommandDefinition,
-} from './command-factory.js';
-import type { SlashCommand } from '../ui/commands/types.js';
+import * as fsSync from "node:fs";
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import type { Config } from "@airiscode/core";
+import { createDebugLogger, EXTENSIONS_CONFIG_FILENAME, Storage } from "@airiscode/core";
+import toml from "@iarna/toml";
+import { glob } from "glob";
+import { z } from "zod";
+import type { SlashCommand } from "../ui/commands/types.js";
+import { type CommandDefinition, createSlashCommandFromDefinition } from "./command-factory.js";
+import { MarkdownCommandDefSchema, parseMarkdownCommand } from "./markdown-command-parser.js";
+import type { ICommandLoader } from "./types.js";
 
 interface CommandDirectory {
   path: string;
   extensionName?: string;
 }
 
-const debugLogger = createDebugLogger('FILE_COMMAND_LOADER');
+const debugLogger = createDebugLogger("FILE_COMMAND_LOADER");
 
 /**
  * Defines the Zod schema for a command definition file. This serves as the
@@ -92,11 +82,11 @@ export class FileCommandLoader implements ICommandLoader {
     for (const dirInfo of commandDirs) {
       try {
         // Scan both .toml and .md files
-        const tomlFiles = await glob('**/*.toml', {
+        const tomlFiles = await glob("**/*.toml", {
           ...globOptions,
           cwd: dirInfo.path,
         });
-        const mdFiles = await glob('**/*.md', {
+        const mdFiles = await glob("**/*.md", {
           ...globOptions,
           cwd: dirInfo.path,
         });
@@ -123,17 +113,16 @@ export class FileCommandLoader implements ICommandLoader {
           ),
         );
 
-        const commands = (
-          await Promise.all([...tomlCommandPromises, ...mdCommandPromises])
-        ).filter((cmd): cmd is SlashCommand => cmd !== null);
+        const commands = (await Promise.all([...tomlCommandPromises, ...mdCommandPromises])).filter(
+          (cmd): cmd is SlashCommand => cmd !== null,
+        );
 
         // Add all commands without deduplication
         allCommands.push(...commands);
       } catch (error) {
         // Ignore ENOENT (directory doesn't exist) and AbortError (operation was cancelled)
-        const isEnoent = (error as NodeJS.ErrnoException).code === 'ENOENT';
-        const isAbortError =
-          error instanceof Error && error.name === 'AbortError';
+        const isEnoent = (error as NodeJS.ErrnoException).code === "ENOENT";
+        const isAbortError = error instanceof Error && error.name === "AbortError";
         if (!isEnoent && !isAbortError) {
           debugLogger.error(
             `[FileCommandLoader] Error loading commands from ${dirInfo.path}:`,
@@ -190,15 +179,12 @@ export class FileCommandLoader implements ICommandLoader {
    * Get commands paths from an extension.
    * Returns paths from config.commands if specified, otherwise defaults to 'commands' directory.
    */
-  private getExtensionCommandsPaths(ext: {
-    path: string;
-    name: string;
-  }): string[] {
+  private getExtensionCommandsPaths(ext: { path: string; name: string }): string[] {
     // Try to get extension config
     try {
       const configPath = path.join(ext.path, EXTENSIONS_CONFIG_FILENAME);
       if (fsSync.existsSync(configPath)) {
-        const configContent = fsSync.readFileSync(configPath, 'utf-8');
+        const configContent = fsSync.readFileSync(configPath, "utf-8");
         const config = JSON.parse(configContent);
 
         if (config.commands) {
@@ -220,14 +206,11 @@ export class FileCommandLoader implements ICommandLoader {
         }
       }
     } catch (error) {
-      debugLogger.warn(
-        `Failed to read extension config for ${ext.name}:`,
-        error,
-      );
+      debugLogger.warn(`Failed to read extension config for ${ext.name}:`, error);
     }
 
     // Default fallback: use 'commands' directory
-    const defaultPath = path.join(ext.path, 'commands');
+    const defaultPath = path.join(ext.path, "commands");
     try {
       if (fsSync.existsSync(defaultPath)) {
         return [defaultPath];
@@ -253,7 +236,7 @@ export class FileCommandLoader implements ICommandLoader {
   ): Promise<SlashCommand | null> {
     let fileContent: string;
     try {
-      fileContent = await fs.readFile(filePath, 'utf-8');
+      fileContent = await fs.readFile(filePath, "utf-8");
     } catch (error: unknown) {
       debugLogger.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
@@ -291,7 +274,7 @@ export class FileCommandLoader implements ICommandLoader {
       baseDir,
       validDef as any,
       extensionName,
-      '.toml',
+      ".toml",
     );
   }
 
@@ -309,7 +292,7 @@ export class FileCommandLoader implements ICommandLoader {
   ): Promise<SlashCommand | null> {
     let fileContent: string;
     try {
-      fileContent = await fs.readFile(filePath, 'utf-8');
+      fileContent = await fs.readFile(filePath, "utf-8");
     } catch (error: unknown) {
       debugLogger.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
@@ -345,19 +328,12 @@ export class FileCommandLoader implements ICommandLoader {
     const definition: CommandDefinition = {
       prompt: validDef.prompt,
       description:
-        validDef.frontmatter?.description &&
-        typeof validDef.frontmatter.description === 'string'
+        validDef.frontmatter?.description && typeof validDef.frontmatter.description === "string"
           ? validDef.frontmatter.description
           : undefined,
     };
 
     // Use factory to create command
-    return createSlashCommandFromDefinition(
-      filePath,
-      baseDir,
-      definition,
-      extensionName,
-      '.md',
-    );
+    return createSlashCommandFromDefinition(filePath, baseDir, definition, extensionName, ".md");
   }
 }
diff --git a/apps/airiscode-cli/src/services/McpPromptLoader.ts b/apps/airiscode-cli/src/services/McpPromptLoader.ts
index 71f10737e..2ad2c8f2f 100644
--- a/apps/airiscode-cli/src/services/McpPromptLoader.ts
+++ b/apps/airiscode-cli/src/services/McpPromptLoader.ts
@@ -4,19 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/core';
-import {
-  getErrorMessage,
-  getMCPServerPrompts,
-} from '@airiscode/core';
+import type { Config } from "@airiscode/core";
+import { getErrorMessage, getMCPServerPrompts } from "@airiscode/core";
+import type { PromptArgument } from "@modelcontextprotocol/sdk/types.js";
 import type {
   CommandContext,
   SlashCommand,
   SlashCommandActionReturn,
-} from '../ui/commands/types.js';
-import { CommandKind } from '../ui/commands/types.js';
-import type { ICommandLoader } from './types.js';
-import type { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
+} from "../ui/commands/types.js";
+import { CommandKind } from "../ui/commands/types.js";
+import type { ICommandLoader } from "./types.js";
 
 /**
  * Discovers and loads executable slash commands from prompts exposed by
@@ -48,14 +45,14 @@ export class McpPromptLoader implements ICommandLoader {
           kind: CommandKind.MCP_PROMPT,
           subCommands: [
             {
-              name: 'help',
-              description: 'Show help for this prompt',
+              name: "help",
+              description: "Show help for this prompt",
               kind: CommandKind.MCP_PROMPT,
               action: async (): Promise<SlashCommandActionReturn> => {
                 if (!prompt.arguments || prompt.arguments.length === 0) {
                   return {
-                    type: 'message',
-                    messageType: 'info',
+                    type: "message",
+                    messageType: "info",
                     content: `Prompt "${prompt.name}" has no arguments.`,
                   };
                 }
@@ -70,13 +67,11 @@ export class McpPromptLoader implements ICommandLoader {
                   if (arg.description) {
                     helpMessage += `    ${arg.description}\n`;
                   }
-                  helpMessage += `    (required: ${
-                    arg.required ? 'yes' : 'no'
-                  })\n\n`;
+                  helpMessage += `    (required: ${arg.required ? "yes" : "no"})\n\n`;
                 }
                 return {
-                  type: 'message',
-                  messageType: 'info',
+                  type: "message",
+                  messageType: "info",
                   content: helpMessage,
                 };
               },
@@ -88,17 +83,17 @@ export class McpPromptLoader implements ICommandLoader {
           ): Promise<SlashCommandActionReturn> => {
             if (!this.config) {
               return {
-                type: 'message',
-                messageType: 'error',
-                content: 'Config not loaded.',
+                type: "message",
+                messageType: "error",
+                content: "Config not loaded.",
               };
             }
 
             const promptInputs = this.parseArgs(args, prompt.arguments);
             if (promptInputs instanceof Error) {
               return {
-                type: 'message',
-                messageType: 'error',
+                type: "message",
+                messageType: "error",
                 content: promptInputs.message,
               };
             }
@@ -108,61 +103,54 @@ export class McpPromptLoader implements ICommandLoader {
               const mcpServerConfig = mcpServers[serverName];
               if (!mcpServerConfig) {
                 return {
-                  type: 'message',
-                  messageType: 'error',
+                  type: "message",
+                  messageType: "error",
                   content: `MCP server config not found for '${serverName}'.`,
                 };
               }
               const result = await prompt.invoke(promptInputs);
 
-              if (result['error']) {
+              if (result["error"]) {
                 return {
-                  type: 'message',
-                  messageType: 'error',
-                  content: `Error invoking prompt: ${result['error']}`,
+                  type: "message",
+                  messageType: "error",
+                  content: `Error invoking prompt: ${result["error"]}`,
                 };
               }
 
               const firstMessage = result.messages?.[0];
               const content = firstMessage?.content;
 
-              if (content?.type !== 'text') {
+              if (content?.type !== "text") {
                 return {
-                  type: 'message',
-                  messageType: 'error',
-                  content:
-                    'Received an empty or invalid prompt response from the server.',
+                  type: "message",
+                  messageType: "error",
+                  content: "Received an empty or invalid prompt response from the server.",
                 };
               }
 
               return {
-                type: 'submit_prompt',
+                type: "submit_prompt",
                 content: JSON.stringify(content.text),
               };
             } catch (error) {
               return {
-                type: 'message',
-                messageType: 'error',
+                type: "message",
+                messageType: "error",
                 content: `Error: ${getErrorMessage(error)}`,
               };
             }
           },
-          completion: async (
-            commandContext: CommandContext,
-            partialArg: string,
-          ) => {
+          completion: async (commandContext: CommandContext, partialArg: string) => {
             const invocation = commandContext.invocation;
             if (!prompt || !prompt.arguments || !invocation) {
               return [];
             }
-            const indexOfFirstSpace = invocation.raw.indexOf(' ') + 1;
+            const indexOfFirstSpace = invocation.raw.indexOf(" ") + 1;
             let promptInputs =
               indexOfFirstSpace === 0
                 ? {}
-                : this.parseArgs(
-                    invocation.raw.substring(indexOfFirstSpace),
-                    prompt.arguments,
-                  );
+                : this.parseArgs(invocation.raw.substring(indexOfFirstSpace), prompt.arguments);
             if (promptInputs instanceof Error) {
               promptInputs = {};
             }
@@ -243,7 +231,7 @@ export class McpPromptLoader implements ICommandLoader {
     while ((match = namedArgRegex.exec(userArgs)) !== null) {
       const key = match[1];
       // Extract the quoted or unquoted argument and remove escape chars.
-      const value = (match[2] ?? match[3]).replace(/\\(.)/g, '$1');
+      const value = (match[2] ?? match[3]).replace(/\\(.)/g, "$1");
       argValues[key] = value;
       // Capture text between matches as potential positional args
       if (match.index > lastIndex) {
@@ -257,13 +245,13 @@ export class McpPromptLoader implements ICommandLoader {
       positionalParts.push(userArgs.substring(lastIndex));
     }
 
-    const positionalArgsString = positionalParts.join('').trim();
+    const positionalArgsString = positionalParts.join("").trim();
     // extracts either quoted strings or non-quoted sequences of non-space characters.
     const positionalArgRegex = /(?:"((?:\\.|[^"\\])*)"|([^ ]+))/g;
     const positionalArgs: string[] = [];
     while ((match = positionalArgRegex.exec(positionalArgsString)) !== null) {
       // Extract the quoted or unquoted argument and remove escape chars.
-      positionalArgs.push((match[1] ?? match[2]).replace(/\\(.)/g, '$1'));
+      positionalArgs.push((match[1] ?? match[2]).replace(/\\(.)/g, "$1"));
     }
 
     if (!promptArgs) {
@@ -275,14 +263,12 @@ export class McpPromptLoader implements ICommandLoader {
       }
     }
 
-    const unfilledArgs = promptArgs.filter(
-      (arg) => arg.required && !promptInputs[arg.name],
-    );
+    const unfilledArgs = promptArgs.filter((arg) => arg.required && !promptInputs[arg.name]);
 
     if (unfilledArgs.length === 1) {
       // If we have only one unfilled arg, we don't require quotes we just
       // join all the given arguments together as if they were quoted.
-      promptInputs[unfilledArgs[0].name] = positionalArgs.join(' ');
+      promptInputs[unfilledArgs[0].name] = positionalArgs.join(" ");
     } else {
       const missingArgs: string[] = [];
       for (let i = 0; i < unfilledArgs.length; i++) {
@@ -293,9 +279,7 @@ export class McpPromptLoader implements ICommandLoader {
         }
       }
       if (missingArgs.length > 0) {
-        const missingArgNames = missingArgs
-          .map((name) => `--${name}`)
-          .join(', ');
+        const missingArgNames = missingArgs.map((name) => `--${name}`).join(", ");
         return new Error(`Missing required argument(s): ${missingArgNames}`);
       }
     }
diff --git a/apps/airiscode-cli/src/services/command-factory.ts b/apps/airiscode-cli/src/services/command-factory.ts
index 70c52650a..9e4298a3c 100644
--- a/apps/airiscode-cli/src/services/command-factory.ts
+++ b/apps/airiscode-cli/src/services/command-factory.ts
@@ -9,36 +9,30 @@
  * objects from parsed command definitions (TOML or Markdown).
  */
 
-import path from 'node:path';
-import { createDebugLogger } from '@airiscode/core';
+import path from "node:path";
+import { createDebugLogger } from "@airiscode/core";
 import type {
   CommandContext,
   SlashCommand,
   SlashCommandActionReturn,
-} from '../ui/commands/types.js';
-import { CommandKind } from '../ui/commands/types.js';
-import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
-import type {
-  IPromptProcessor,
-  PromptPipelineContent,
-} from './prompt-processors/types.js';
+} from "../ui/commands/types.js";
+import { CommandKind } from "../ui/commands/types.js";
+import { DefaultArgumentProcessor } from "./prompt-processors/argumentProcessor.js";
+import { AtFileProcessor } from "./prompt-processors/atFileProcessor.js";
+import { ConfirmationRequiredError, ShellProcessor } from "./prompt-processors/shellProcessor.js";
+import type { IPromptProcessor, PromptPipelineContent } from "./prompt-processors/types.js";
 import {
-  SHORTHAND_ARGS_PLACEHOLDER,
-  SHELL_INJECTION_TRIGGER,
   AT_FILE_INJECTION_TRIGGER,
-} from './prompt-processors/types.js';
-import {
-  ConfirmationRequiredError,
-  ShellProcessor,
-} from './prompt-processors/shellProcessor.js';
-import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
+  SHELL_INJECTION_TRIGGER,
+  SHORTHAND_ARGS_PLACEHOLDER,
+} from "./prompt-processors/types.js";
 
 export interface CommandDefinition {
   prompt: string;
   description?: string;
 }
 
-const debugLogger = createDebugLogger('COMMAND_FACTORY');
+const debugLogger = createDebugLogger("COMMAND_FACTORY");
 
 /**
  * Creates a SlashCommand from a parsed command definition.
@@ -68,8 +62,8 @@ export function createSlashCommandFromDefinition(
     // Sanitize each path segment to prevent ambiguity. Since ':' is our
     // namespace separator, we replace any literal colons in filenames
     // with underscores to avoid naming conflicts.
-    .map((segment) => segment.replaceAll(':', '_'))
-    .join(':');
+    .map((segment) => segment.replaceAll(":", "_"))
+    .join(":");
 
   // Add extension name tag for extension commands
   const defaultDescription = `Custom command from ${path.basename(filePath)}`;
@@ -80,12 +74,8 @@ export function createSlashCommandFromDefinition(
 
   const processors: IPromptProcessor[] = [];
   const usesArgs = definition.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER);
-  const usesShellInjection = definition.prompt.includes(
-    SHELL_INJECTION_TRIGGER,
-  );
-  const usesAtFileInjection = definition.prompt.includes(
-    AT_FILE_INJECTION_TRIGGER,
-  );
+  const usesShellInjection = definition.prompt.includes(SHELL_INJECTION_TRIGGER);
+  const usesAtFileInjection = definition.prompt.includes(AT_FILE_INJECTION_TRIGGER);
 
   // 1. @-File Injection (Security First).
   // This runs first to ensure we're not executing shell commands that
@@ -111,30 +101,25 @@ export function createSlashCommandFromDefinition(
     description,
     kind: CommandKind.FILE,
     extensionName,
-    action: async (
-      context: CommandContext,
-      _args: string,
-    ): Promise<SlashCommandActionReturn> => {
+    action: async (context: CommandContext, _args: string): Promise<SlashCommandActionReturn> => {
       if (!context.invocation) {
         debugLogger.error(
           `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`,
         );
         return {
-          type: 'submit_prompt',
+          type: "submit_prompt",
           content: [{ text: definition.prompt }], // Fallback to unprocessed prompt
         };
       }
 
       try {
-        let processedContent: PromptPipelineContent = [
-          { text: definition.prompt },
-        ];
+        let processedContent: PromptPipelineContent = [{ text: definition.prompt }];
         for (const processor of processors) {
           processedContent = await processor.process(processedContent, context);
         }
 
         return {
-          type: 'submit_prompt',
+          type: "submit_prompt",
           content: processedContent,
         };
       } catch (e) {
@@ -142,7 +127,7 @@ export function createSlashCommandFromDefinition(
         if (e instanceof ConfirmationRequiredError) {
           // Halt and request confirmation from the UI layer.
           return {
-            type: 'confirm_shell_commands',
+            type: "confirm_shell_commands",
             commandsToConfirm: e.commandsToConfirm,
             originalInvocation: {
               raw: context.invocation.raw,
diff --git a/apps/airiscode-cli/src/services/command-migration-tool.ts b/apps/airiscode-cli/src/services/command-migration-tool.ts
index 706b9575e..df786a1f0 100644
--- a/apps/airiscode-cli/src/services/command-migration-tool.ts
+++ b/apps/airiscode-cli/src/services/command-migration-tool.ts
@@ -8,11 +8,11 @@
  * Tool for migrating TOML commands to Markdown format.
  */
 
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { glob } from 'glob';
-import { convertTomlToMarkdown } from '@airiscode/core';
-import { t } from '../i18n/index.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import { convertTomlToMarkdown } from "@airiscode/core";
+import { glob } from "glob";
+import { t } from "../i18n/index.js";
 
 export interface MigrationResult {
   success: boolean;
@@ -34,9 +34,7 @@ export interface MigrationOptions {
  * @param commandDir Directory to scan
  * @returns Array of TOML file paths (relative to commandDir)
  */
-export async function detectTomlCommands(
-  commandDir: string,
-): Promise<string[]> {
+export async function detectTomlCommands(commandDir: string): Promise<string[]> {
   try {
     await fs.access(commandDir);
   } catch {
@@ -44,7 +42,7 @@ export async function detectTomlCommands(
     return [];
   }
 
-  const tomlFiles = await glob('**/*.toml', {
+  const tomlFiles = await glob("**/*.toml", {
     cwd: commandDir,
     nodir: true,
     dot: false,
@@ -58,9 +56,7 @@ export async function detectTomlCommands(
  * @param options Migration options
  * @returns Migration result with details
  */
-export async function migrateTomlCommands(
-  options: MigrationOptions,
-): Promise<MigrationResult> {
+export async function migrateTomlCommands(options: MigrationOptions): Promise<MigrationResult> {
   const { commandDir, createBackup = true, deleteOriginal = false } = options;
 
   const result: MigrationResult = {
@@ -82,31 +78,31 @@ export async function migrateTomlCommands(
 
     try {
       // Read TOML file
-      const tomlContent = await fs.readFile(tomlPath, 'utf-8');
+      const tomlContent = await fs.readFile(tomlPath, "utf-8");
 
       // Convert to Markdown
       const markdownContent = convertTomlToMarkdown(tomlContent);
 
       // Generate Markdown file path (same location, .md extension)
-      const markdownPath = tomlPath.replace(/\.toml$/, '.md');
+      const markdownPath = tomlPath.replace(/\.toml$/, ".md");
 
       // Check if Markdown file already exists
       try {
         await fs.access(markdownPath);
         throw new Error(
-          t('Markdown file already exists: {{filename}}', {
+          t("Markdown file already exists: {{filename}}", {
             filename: path.basename(markdownPath),
           }),
         );
       } catch (error) {
-        if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+        if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
           throw error;
         }
         // File doesn't exist, continue
       }
 
       // Write Markdown file
-      await fs.writeFile(markdownPath, markdownContent, 'utf-8');
+      await fs.writeFile(markdownPath, markdownContent, "utf-8");
 
       // Backup original if requested (rename to .toml.backup)
       if (createBackup) {
@@ -137,37 +133,37 @@ export async function migrateTomlCommands(
  */
 export function generateMigrationPrompt(tomlFiles: string[]): string {
   if (tomlFiles.length === 0) {
-    return '';
+    return "";
   }
 
   const count = tomlFiles.length;
   const moreCount = tomlFiles.length - 3;
   const fileList =
     tomlFiles.length <= 5
-      ? tomlFiles.map((f) => `  - ${f}`).join('\n')
-      : `  - ${tomlFiles.slice(0, 3).join('\n  - ')}\n  - ${t('... and {{count}} more', { count: String(moreCount) })}`;
+      ? tomlFiles.map((f) => `  - ${f}`).join("\n")
+      : `  - ${tomlFiles.slice(0, 3).join("\n  - ")}\n  - ${t("... and {{count}} more", { count: String(moreCount) })}`;
 
   return `
-⚠️  ${t('TOML Command Format Deprecation Notice')}
+⚠️  ${t("TOML Command Format Deprecation Notice")}
 
-${t('Found {{count}} command file(s) in TOML format:', { count: String(count) })}
+${t("Found {{count}} command file(s) in TOML format:", { count: String(count) })}
 ${fileList}
 
-${t('The TOML format for commands is being deprecated in favor of Markdown format.')}
-${t('Markdown format is more readable and easier to edit.')}
+${t("The TOML format for commands is being deprecated in favor of Markdown format.")}
+${t("Markdown format is more readable and easier to edit.")}
 
-${t('You can migrate these files automatically using:')}
+${t("You can migrate these files automatically using:")}
   airiscode migrate-commands
 
-${t('Or manually convert each file:')}
+${t("Or manually convert each file:")}
   - ${t('TOML: prompt = "..." / description = "..."')}
-  - ${t('Markdown: YAML frontmatter + content')}
+  - ${t("Markdown: YAML frontmatter + content")}
 
-${t('The migration tool will:')}
-  ✓ ${t('Convert TOML files to Markdown')}
-  ✓ ${t('Create backups of original files')}
-  ✓ ${t('Preserve all command functionality')}
+${t("The migration tool will:")}
+  ✓ ${t("Convert TOML files to Markdown")}
+  ✓ ${t("Create backups of original files")}
+  ✓ ${t("Preserve all command functionality")}
 
-${t('TOML format will continue to work for now, but migration is recommended.')}
+${t("TOML format will continue to work for now, but migration is recommended.")}
 `.trim();
 }
diff --git a/apps/airiscode-cli/src/services/insight/generators/DataProcessor.ts b/apps/airiscode-cli/src/services/insight/generators/DataProcessor.ts
index 6cd5db1b3..49ed6487c 100644
--- a/apps/airiscode-cli/src/services/insight/generators/DataProcessor.ts
+++ b/apps/airiscode-cli/src/services/insight/generators/DataProcessor.ts
@@ -4,38 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'fs/promises';
-import path from 'path';
 import {
-  read as readJsonlFile,
+  type ChatRecord,
+  type Config,
   createDebugLogger,
-} from '@airiscode/core';
-import pLimit from 'p-limit';
-import type {
-  InsightData,
-  HeatMapData,
-  StreakData,
-  SessionFacets,
-  InsightProgressCallback,
-} from '../types/StaticInsightTypes.js';
+  getInsightPrompt,
+  read as readJsonlFile,
+} from "@airiscode/core";
+import fs from "fs/promises";
+import pLimit from "p-limit";
+import path from "path";
 import type {
-  QualitativeInsights,
-  InsightImpressiveWorkflows,
-  InsightProjectAreas,
-  InsightFutureOpportunities,
+  InsightAtAGlance,
   InsightFrictionPoints,
-  InsightMemorableMoment,
+  InsightFutureOpportunities,
+  InsightImpressiveWorkflows,
   InsightImprovements,
   InsightInteractionStyle,
-  InsightAtAGlance,
-} from '../types/QualitativeInsightTypes.js';
-import {
-  getInsightPrompt,
-  type Config,
-  type ChatRecord,
-} from '@airiscode/core';
+  InsightMemorableMoment,
+  InsightProjectAreas,
+  QualitativeInsights,
+} from "../types/QualitativeInsightTypes.js";
+import type {
+  HeatMapData,
+  InsightData,
+  InsightProgressCallback,
+  SessionFacets,
+  StreakData,
+} from "../types/StaticInsightTypes.js";
 
-const logger = createDebugLogger('DataProcessor');
+const logger = createDebugLogger("DataProcessor");
 
 const CONCURRENCY_LIMIT = 4;
 
@@ -44,32 +42,28 @@ export class DataProcessor {
 
   // Helper function to format date as YYYY-MM-DD
   private formatDate(date: Date): string {
-    return date.toISOString().split('T')[0];
+    return date.toISOString().split("T")[0];
   }
 
   // Format chat records for LLM analysis
   private formatRecordsForAnalysis(records: ChatRecord[]): string {
-    let output = '';
-    const sessionStart =
-      records.length > 0 ? new Date(records[0].timestamp) : new Date();
+    let output = "";
+    const sessionStart = records.length > 0 ? new Date(records[0].timestamp) : new Date();
 
-    output += `Session: ${records[0]?.sessionId || 'unknown'}\n`;
+    output += `Session: ${records[0]?.sessionId || "unknown"}\n`;
     output += `Date: ${sessionStart.toISOString()}\n`;
     output += `Duration: ${records.length} turns\n\n`;
 
     for (const record of records) {
-      if (record.type === 'user') {
-        const text =
-          record.message?.parts
-            ?.map((p) => ('text' in p ? p.text : ''))
-            .join('') || '';
+      if (record.type === "user") {
+        const text = record.message?.parts?.map((p) => ("text" in p ? p.text : "")).join("") || "";
         output += `[User]: ${text}\n`;
-      } else if (record.type === 'assistant') {
+      } else if (record.type === "assistant") {
         if (record.message?.parts) {
           for (const part of record.message.parts) {
-            if ('text' in part && part.text) {
+            if ("text" in part && part.text) {
               output += `[Assistant]: ${part.text}\n`;
-            } else if ('functionCall' in part) {
+            } else if ("functionCall" in part) {
               const call = part.functionCall;
               if (call) {
                 output += `[Tool: ${call.name}]\n`;
@@ -88,9 +82,9 @@ export class DataProcessor {
     let hasAssistant = false;
 
     for (const record of records) {
-      if (record.type === 'user') {
+      if (record.type === "user") {
         hasUser = true;
-      } else if (record.type === 'assistant') {
+      } else if (record.type === "assistant") {
         hasAssistant = true;
       }
 
@@ -103,103 +97,101 @@ export class DataProcessor {
   }
 
   // Analyze a single session using LLM
-  private async analyzeSession(
-    records: ChatRecord[],
-  ): Promise<SessionFacets | null> {
+  private async analyzeSession(records: ChatRecord[]): Promise<SessionFacets | null> {
     if (records.length === 0) return null;
 
     const INSIGHT_SCHEMA = {
-      type: 'object',
+      type: "object",
       properties: {
         underlying_goal: {
-          type: 'string',
-          description: 'What the user fundamentally wanted to achieve',
+          type: "string",
+          description: "What the user fundamentally wanted to achieve",
         },
         goal_categories: {
-          type: 'object',
-          additionalProperties: { type: 'number' },
+          type: "object",
+          additionalProperties: { type: "number" },
         },
         outcome: {
-          type: 'string',
+          type: "string",
           enum: [
-            'fully_achieved',
-            'mostly_achieved',
-            'partially_achieved',
-            'not_achieved',
-            'unclear_from_transcript',
+            "fully_achieved",
+            "mostly_achieved",
+            "partially_achieved",
+            "not_achieved",
+            "unclear_from_transcript",
           ],
         },
         user_satisfaction_counts: {
-          type: 'object',
-          additionalProperties: { type: 'number' },
+          type: "object",
+          additionalProperties: { type: "number" },
         },
         Qwen_helpfulness: {
-          type: 'string',
+          type: "string",
           enum: [
-            'unhelpful',
-            'slightly_helpful',
-            'moderately_helpful',
-            'very_helpful',
-            'essential',
+            "unhelpful",
+            "slightly_helpful",
+            "moderately_helpful",
+            "very_helpful",
+            "essential",
           ],
         },
         session_type: {
-          type: 'string',
+          type: "string",
           enum: [
-            'single_task',
-            'multi_task',
-            'iterative_refinement',
-            'exploration',
-            'quick_question',
+            "single_task",
+            "multi_task",
+            "iterative_refinement",
+            "exploration",
+            "quick_question",
           ],
         },
         friction_counts: {
-          type: 'object',
-          additionalProperties: { type: 'number' },
+          type: "object",
+          additionalProperties: { type: "number" },
         },
         friction_detail: {
-          type: 'string',
-          description: 'One sentence describing friction or empty',
+          type: "string",
+          description: "One sentence describing friction or empty",
         },
         primary_success: {
-          type: 'string',
+          type: "string",
           enum: [
-            'none',
-            'fast_accurate_search',
-            'correct_code_edits',
-            'good_explanations',
-            'proactive_help',
-            'multi_file_changes',
-            'good_debugging',
+            "none",
+            "fast_accurate_search",
+            "correct_code_edits",
+            "good_explanations",
+            "proactive_help",
+            "multi_file_changes",
+            "good_debugging",
           ],
         },
         brief_summary: {
-          type: 'string',
-          description: 'One sentence: what user wanted and whether they got it',
+          type: "string",
+          description: "One sentence: what user wanted and whether they got it",
         },
       },
       required: [
-        'underlying_goal',
-        'goal_categories',
-        'outcome',
-        'user_satisfaction_counts',
-        'Qwen_helpfulness',
-        'session_type',
-        'friction_counts',
-        'friction_detail',
-        'primary_success',
-        'brief_summary',
+        "underlying_goal",
+        "goal_categories",
+        "outcome",
+        "user_satisfaction_counts",
+        "Qwen_helpfulness",
+        "session_type",
+        "friction_counts",
+        "friction_detail",
+        "primary_success",
+        "brief_summary",
       ],
     };
 
     const sessionText = this.formatRecordsForAnalysis(records);
-    const prompt = `${getInsightPrompt('analysis')}\n\nSESSION:\n${sessionText}`;
+    const prompt = `${getInsightPrompt("analysis")}\n\nSESSION:\n${sessionText}`;
 
     try {
       const result = await this.config.getBaseLlmClient().generateJson({
         // Use the configured model
         model: this.config.getModel(),
-        contents: [{ role: 'user', parts: [{ text: prompt }] }],
+        contents: [{ role: "user", parts: [{ text: prompt }] }],
         schema: INSIGHT_SCHEMA,
         abortSignal: AbortSignal.timeout(600000), // 10 minute timeout per session
       });
@@ -213,10 +205,7 @@ export class DataProcessor {
         session_id: records[0].sessionId,
       };
     } catch (error) {
-      logger.error(
-        `Failed to analyze session ${records[0]?.sessionId}:`,
-        error,
-      );
+      logger.error(`Failed to analyze session ${records[0]?.sessionId}:`, error);
       return null;
     }
   }
@@ -284,32 +273,23 @@ export class DataProcessor {
     facetsOutputDir?: string,
     onProgress?: InsightProgressCallback,
   ): Promise<InsightData> {
-    if (onProgress) onProgress('Scanning chat history...', 0);
+    if (onProgress) onProgress("Scanning chat history...", 0);
     const allChatFiles = await this.scanChatFiles(baseDir);
 
-    if (onProgress) onProgress('Crunching the numbers', 10);
+    if (onProgress) onProgress("Crunching the numbers", 10);
     const metrics = await this.generateMetrics(allChatFiles, onProgress);
 
-    if (onProgress) onProgress('Preparing sessions...', 20);
-    const facets = await this.generateFacets(
-      allChatFiles,
-      facetsOutputDir,
-      onProgress,
-    );
+    if (onProgress) onProgress("Preparing sessions...", 20);
+    const facets = await this.generateFacets(allChatFiles, facetsOutputDir, onProgress);
 
-    if (onProgress) onProgress('Generating personalized insights...', 80);
+    if (onProgress) onProgress("Generating personalized insights...", 80);
     const qualitative = await this.generateQualitativeInsights(metrics, facets);
 
     // Aggregate satisfaction, friction, success and outcome data from facets
-    const {
-      satisfactionAgg,
-      frictionAgg,
-      primarySuccessAgg,
-      outcomesAgg,
-      goalsAgg,
-    } = this.aggregateFacetsData(facets);
+    const { satisfactionAgg, frictionAgg, primarySuccessAgg, outcomesAgg, goalsAgg } =
+      this.aggregateFacetsData(facets);
 
-    if (onProgress) onProgress('Assembling report...', 100);
+    if (onProgress) onProgress("Assembling report...", 100);
 
     return {
       ...metrics,
@@ -348,7 +328,7 @@ export class DataProcessor {
       });
 
       // Aggregate primary success
-      if (facet.primary_success && facet.primary_success !== 'none') {
+      if (facet.primary_success && facet.primary_success !== "none") {
         primarySuccessAgg[facet.primary_success] =
           (primarySuccessAgg[facet.primary_success] || 0) + 1;
       }
@@ -374,14 +354,14 @@ export class DataProcessor {
   }
 
   private async generateQualitativeInsights(
-    metrics: Omit<InsightData, 'facets' | 'qualitative'>,
+    metrics: Omit<InsightData, "facets" | "qualitative">,
     facets: SessionFacets[],
   ): Promise<QualitativeInsights | undefined> {
     if (facets.length === 0) {
       return undefined;
     }
 
-    logger.info('Generating qualitative insights...');
+    logger.info("Generating qualitative insights...");
 
     const commonData = this.prepareCommonPromptData(metrics, facets);
 
@@ -393,13 +373,13 @@ export class DataProcessor {
       try {
         const result = await this.config.getBaseLlmClient().generateJson({
           model: this.config.getModel(),
-          contents: [{ role: 'user', parts: [{ text: prompt }] }],
+          contents: [{ role: "user", parts: [{ text: prompt }] }],
           schema,
           abortSignal: AbortSignal.timeout(600000),
         });
         return result as T;
       } catch (error) {
-        logger.error('Failed to generate insight:', error);
+        logger.error("Failed to generate insight:", error);
         return undefined;
       }
     };
@@ -410,173 +390,163 @@ export class DataProcessor {
 
     // 1. Impressive Workflows
     const schemaImpressiveWorkflows = {
-      type: 'object',
+      type: "object",
       properties: {
-        intro: { type: 'string' },
+        intro: { type: "string" },
         impressive_workflows: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              title: { type: 'string' },
-              description: { type: 'string' },
+              title: { type: "string" },
+              description: { type: "string" },
             },
-            required: ['title', 'description'],
+            required: ["title", "description"],
           },
         },
       },
-      required: ['intro', 'impressive_workflows'],
+      required: ["intro", "impressive_workflows"],
     };
 
     // 2. Project Areas
     const schemaProjectAreas = {
-      type: 'object',
+      type: "object",
       properties: {
         areas: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              name: { type: 'string' },
-              session_count: { type: 'number' },
-              description: { type: 'string' },
+              name: { type: "string" },
+              session_count: { type: "number" },
+              description: { type: "string" },
             },
-            required: ['name', 'session_count', 'description'],
+            required: ["name", "session_count", "description"],
           },
         },
       },
-      required: ['areas'],
+      required: ["areas"],
     };
 
     // 3. Future Opportunities
     const schemaFutureOpportunities = {
-      type: 'object',
+      type: "object",
       properties: {
-        intro: { type: 'string' },
+        intro: { type: "string" },
         opportunities: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              title: { type: 'string' },
-              whats_possible: { type: 'string' },
-              how_to_try: { type: 'string' },
-              copyable_prompt: { type: 'string' },
+              title: { type: "string" },
+              whats_possible: { type: "string" },
+              how_to_try: { type: "string" },
+              copyable_prompt: { type: "string" },
             },
-            required: [
-              'title',
-              'whats_possible',
-              'how_to_try',
-              'copyable_prompt',
-            ],
+            required: ["title", "whats_possible", "how_to_try", "copyable_prompt"],
           },
         },
       },
-      required: ['intro', 'opportunities'],
+      required: ["intro", "opportunities"],
     };
 
     // 4. Friction Points
     const schemaFrictionPoints = {
-      type: 'object',
+      type: "object",
       properties: {
-        intro: { type: 'string' },
+        intro: { type: "string" },
         categories: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              category: { type: 'string' },
-              description: { type: 'string' },
-              examples: { type: 'array', items: { type: 'string' } },
+              category: { type: "string" },
+              description: { type: "string" },
+              examples: { type: "array", items: { type: "string" } },
             },
-            required: ['category', 'description', 'examples'],
+            required: ["category", "description", "examples"],
           },
         },
       },
-      required: ['intro', 'categories'],
+      required: ["intro", "categories"],
     };
 
     // 5. Memorable Moment
     const schemaMemorableMoment = {
-      type: 'object',
+      type: "object",
       properties: {
-        headline: { type: 'string' },
-        detail: { type: 'string' },
+        headline: { type: "string" },
+        detail: { type: "string" },
       },
-      required: ['headline', 'detail'],
+      required: ["headline", "detail"],
     };
 
     // 6. Improvements
     const schemaImprovements = {
-      type: 'object',
+      type: "object",
       properties: {
         Qwen_md_additions: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              addition: { type: 'string' },
-              why: { type: 'string' },
-              prompt_scaffold: { type: 'string' },
+              addition: { type: "string" },
+              why: { type: "string" },
+              prompt_scaffold: { type: "string" },
             },
-            required: ['addition', 'why', 'prompt_scaffold'],
+            required: ["addition", "why", "prompt_scaffold"],
           },
         },
         features_to_try: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              feature: { type: 'string' },
-              one_liner: { type: 'string' },
-              why_for_you: { type: 'string' },
-              example_code: { type: 'string' },
+              feature: { type: "string" },
+              one_liner: { type: "string" },
+              why_for_you: { type: "string" },
+              example_code: { type: "string" },
             },
-            required: ['feature', 'one_liner', 'why_for_you', 'example_code'],
+            required: ["feature", "one_liner", "why_for_you", "example_code"],
           },
         },
         usage_patterns: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              title: { type: 'string' },
-              suggestion: { type: 'string' },
-              detail: { type: 'string' },
-              copyable_prompt: { type: 'string' },
+              title: { type: "string" },
+              suggestion: { type: "string" },
+              detail: { type: "string" },
+              copyable_prompt: { type: "string" },
             },
-            required: ['title', 'suggestion', 'detail', 'copyable_prompt'],
+            required: ["title", "suggestion", "detail", "copyable_prompt"],
           },
         },
       },
-      required: ['Qwen_md_additions', 'features_to_try', 'usage_patterns'],
+      required: ["Qwen_md_additions", "features_to_try", "usage_patterns"],
     };
 
     // 7. Interaction Style
     const schemaInteractionStyle = {
-      type: 'object',
+      type: "object",
       properties: {
-        narrative: { type: 'string' },
-        key_pattern: { type: 'string' },
+        narrative: { type: "string" },
+        key_pattern: { type: "string" },
       },
-      required: ['narrative', 'key_pattern'],
+      required: ["narrative", "key_pattern"],
     };
 
     // 8. At A Glance
     const schemaAtAGlance = {
-      type: 'object',
+      type: "object",
       properties: {
-        whats_working: { type: 'string' },
-        whats_hindering: { type: 'string' },
-        quick_wins: { type: 'string' },
-        ambitious_workflows: { type: 'string' },
+        whats_working: { type: "string" },
+        whats_hindering: { type: "string" },
+        quick_wins: { type: "string" },
+        ambitious_workflows: { type: "string" },
       },
-      required: [
-        'whats_working',
-        'whats_hindering',
-        'quick_wins',
-        'ambitious_workflows',
-      ],
+      required: ["whats_working", "whats_hindering", "quick_wins", "ambitious_workflows"],
     };
 
     const limit = pLimit(CONCURRENCY_LIMIT);
@@ -594,52 +564,41 @@ export class DataProcessor {
       ] = await Promise.all([
         limit(() =>
           generate<InsightImpressiveWorkflows>(
-            getInsightPrompt('impressive_workflows'),
+            getInsightPrompt("impressive_workflows"),
             schemaImpressiveWorkflows,
           ),
         ),
         limit(() =>
-          generate<InsightProjectAreas>(
-            getInsightPrompt('project_areas'),
-            schemaProjectAreas,
-          ),
+          generate<InsightProjectAreas>(getInsightPrompt("project_areas"), schemaProjectAreas),
         ),
         limit(() =>
           generate<InsightFutureOpportunities>(
-            getInsightPrompt('future_opportunities'),
+            getInsightPrompt("future_opportunities"),
             schemaFutureOpportunities,
           ),
         ),
         limit(() =>
           generate<InsightFrictionPoints>(
-            getInsightPrompt('friction_points'),
+            getInsightPrompt("friction_points"),
             schemaFrictionPoints,
           ),
         ),
         limit(() =>
           generate<InsightMemorableMoment>(
-            getInsightPrompt('memorable_moment'),
+            getInsightPrompt("memorable_moment"),
             schemaMemorableMoment,
           ),
         ),
         limit(() =>
-          generate<InsightImprovements>(
-            getInsightPrompt('improvements'),
-            schemaImprovements,
-          ),
+          generate<InsightImprovements>(getInsightPrompt("improvements"), schemaImprovements),
         ),
         limit(() =>
           generate<InsightInteractionStyle>(
-            getInsightPrompt('interaction_style'),
+            getInsightPrompt("interaction_style"),
             schemaInteractionStyle,
           ),
         ),
-        limit(() =>
-          generate<InsightAtAGlance>(
-            getInsightPrompt('at_a_glance'),
-            schemaAtAGlance,
-          ),
-        ),
+        limit(() => generate<InsightAtAGlance>(getInsightPrompt("at_a_glance"), schemaAtAGlance)),
       ]);
 
       logger.debug(
@@ -670,13 +629,13 @@ export class DataProcessor {
         atAGlance,
       };
     } catch (e) {
-      logger.error('Error generating qualitative insights:', e);
+      logger.error("Error generating qualitative insights:", e);
       return undefined;
     }
   }
 
   private prepareCommonPromptData(
-    metrics: Omit<InsightData, 'facets' | 'qualitative'>,
+    metrics: Omit<InsightData, "facets" | "qualitative">,
     facets: SessionFacets[],
   ): string {
     // 1. DATA section
@@ -706,9 +665,8 @@ export class DataProcessor {
       });
 
       // Aggregate success (primary_success)
-      if (facet.primary_success && facet.primary_success !== 'none') {
-        successAgg[facet.primary_success] =
-          (successAgg[facet.primary_success] || 0) + 1;
+      if (facet.primary_success && facet.primary_success !== "none") {
+        successAgg[facet.primary_success] = (successAgg[facet.primary_success] || 0) + 1;
       }
     });
 
@@ -720,8 +678,8 @@ export class DataProcessor {
       sessions: metrics.totalSessions || facets.length,
       analyzed: facets.length,
       date_range: {
-        start: Object.keys(metrics.heatmap).sort()[0] || 'N/A',
-        end: Object.keys(metrics.heatmap).sort().pop() || 'N/A',
+        start: Object.keys(metrics.heatmap).sort()[0] || "N/A",
+        end: Object.keys(metrics.heatmap).sort().pop() || "N/A",
       },
       messages: metrics.totalMessages || 0,
       hours: metrics.totalHours || 0,
@@ -735,15 +693,13 @@ export class DataProcessor {
     };
 
     // 2. SESSION SUMMARIES section
-    const sessionSummaries = facets
-      .map((f) => `- ${f.brief_summary}`)
-      .join('\n');
+    const sessionSummaries = facets.map((f) => `- ${f.brief_summary}`).join("\n");
 
     // 3. FRICTION DETAILS section
     const frictionDetails = facets
       .filter((f) => f.friction_detail && f.friction_detail.trim().length > 0)
       .map((f) => `- ${f.friction_detail}`)
-      .join('\n');
+      .join("\n");
 
     return `DATA:
 ${JSON.stringify(dataObj, null, 2)}
@@ -758,9 +714,7 @@ USER INSTRUCTIONS TO Qwen:
 None captured`;
   }
 
-  private async scanChatFiles(
-    baseDir: string,
-  ): Promise<Array<{ path: string; mtime: number }>> {
+  private async scanChatFiles(baseDir: string): Promise<Array<{ path: string; mtime: number }>> {
     const allChatFiles: Array<{ path: string; mtime: number }> = [];
 
     try {
@@ -774,12 +728,12 @@ None captured`;
 
         // Only process if it's a directory
         if (stats.isDirectory()) {
-          const chatsDir = path.join(projectPath, 'chats');
+          const chatsDir = path.join(projectPath, "chats");
 
           try {
             // Get all chat files in the chats directory
             const files = await fs.readdir(chatsDir);
-            const chatFiles = files.filter((file) => file.endsWith('.jsonl'));
+            const chatFiles = files.filter((file) => file.endsWith(".jsonl"));
 
             for (const file of chatFiles) {
               const filePath = path.join(chatsDir, file);
@@ -793,10 +747,8 @@ None captured`;
               }
             }
           } catch (error) {
-            if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-              logger.error(
-                `Error reading chats directory for project ${projectDir}: ${error}`,
-              );
+            if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+              logger.error(`Error reading chats directory for project ${projectDir}: ${error}`);
             }
             // Continue to next project if chats directory doesn't exist
             continue;
@@ -804,7 +756,7 @@ None captured`;
         }
       }
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") {
         // Base directory doesn't exist, return empty
         logger.info(`Base directory does not exist: ${baseDir}`);
       } else {
@@ -818,7 +770,7 @@ None captured`;
   private async generateMetrics(
     files: Array<{ path: string; mtime: number }>,
     onProgress?: InsightProgressCallback,
-  ): Promise<Omit<InsightData, 'facets' | 'qualitative'>> {
+  ): Promise<Omit<InsightData, "facets" | "qualitative">> {
     // Initialize data structures
     const heatmap: HeatMapData = {};
     const activeHours: { [hour: number]: number } = {};
@@ -850,9 +802,8 @@ None captured`;
             const hour = timestamp.getHours();
 
             // Count user messages and slash commands (actual user interactions)
-            const isUserMessage = record.type === 'user';
-            const isSlashCommand =
-              record.type === 'system' && record.subtype === 'slash_command';
+            const isUserMessage = record.type === "user";
+            const isSlashCommand = record.type === "system" && record.subtype === "slash_command";
             if (isUserMessage || isSlashCommand) {
               totalMessages++;
 
@@ -870,9 +821,9 @@ None captured`;
             sessionEndTimes[record.sessionId] = timestamp;
 
             // Track tool usage
-            if (record.type === 'assistant' && record.message?.parts) {
+            if (record.type === "assistant" && record.message?.parts) {
               for (const part of record.message.parts) {
-                if ('functionCall' in part) {
+                if ("functionCall" in part) {
                   const name = part.functionCall!.name!;
                   toolUsage[name] = (toolUsage[name] || 0) + 1;
                 }
@@ -880,17 +831,10 @@ None captured`;
             }
 
             // Track lines and files from tool results
-            if (
-              record.type === 'tool_result' &&
-              record.toolCallResult?.resultDisplay
-            ) {
+            if (record.type === "tool_result" && record.toolCallResult?.resultDisplay) {
               const display = record.toolCallResult.resultDisplay;
               // Check if it matches FileDiff shape
-              if (
-                typeof display === 'object' &&
-                display !== null &&
-                'fileName' in display
-              ) {
+              if (typeof display === "object" && display !== null && "fileName" in display) {
                 // Cast to any to avoid importing FileDiff type which might not be available here
                 const diff = display as {
                   fileName: unknown;
@@ -899,7 +843,7 @@ None captured`;
                     model_removed_lines?: number;
                   };
                 };
-                if (typeof diff.fileName === 'string') {
+                if (typeof diff.fileName === "string") {
                   uniqueFiles.add(diff.fileName);
                 }
 
@@ -911,10 +855,7 @@ None captured`;
             }
           }
         } catch (error) {
-          logger.error(
-            `Failed to process metrics for file ${fileInfo.path}:`,
-            error,
-          );
+          logger.error(`Failed to process metrics for file ${fileInfo.path}:`, error);
           // Continue to next file
         }
       }
@@ -923,10 +864,7 @@ None captured`;
       if (onProgress) {
         const percentComplete = batchEnd / totalFiles;
         const overallProgress = 10 + Math.round(percentComplete * 10);
-        onProgress(
-          `Crunching the numbers (${batchEnd}/${totalFiles})`,
-          overallProgress,
-        );
+        onProgress(`Crunching the numbers (${batchEnd}/${totalFiles})`, overallProgress);
       }
 
       // Yield to event loop to allow GC and UI updates
@@ -968,8 +906,8 @@ None captured`;
       if (date > latestTimestamp) {
         latestTimestamp = date;
         latestActiveTime = date.toLocaleTimeString([], {
-          hour: '2-digit',
-          minute: '2-digit',
+          hour: "2-digit",
+          minute: "2-digit",
         });
       }
     }
@@ -1024,16 +962,11 @@ None captured`;
         }
         eligibleSessions.push({ fileInfo, records });
       } catch (e) {
-        logger.error(
-          `Error reading session file ${fileInfo.path} for facet eligibility:`,
-          e,
-        );
+        logger.error(`Error reading session file ${fileInfo.path} for facet eligibility:`, e);
       }
     }
 
-    logger.info(
-      `Analyzing ${eligibleSessions.length} eligible recent sessions with LLM...`,
-    );
+    logger.info(`Analyzing ${eligibleSessions.length} eligible recent sessions with LLM...`);
 
     // Create a limit function with concurrency of 4 to avoid 429 errors
     const limit = pLimit(CONCURRENCY_LIMIT);
@@ -1049,30 +982,20 @@ None captured`;
           if (records.length > 0 && facetsOutputDir) {
             const sessionId = records[0].sessionId;
             if (sessionId) {
-              const existingFacetPath = path.join(
-                facetsOutputDir,
-                `${sessionId}.json`,
-              );
+              const existingFacetPath = path.join(facetsOutputDir, `${sessionId}.json`);
               try {
                 // Check if file exists and is readable
-                const existingData = await fs.readFile(
-                  existingFacetPath,
-                  'utf-8',
-                );
+                const existingData = await fs.readFile(existingFacetPath, "utf-8");
                 const existingFacet = JSON.parse(existingData);
                 completed++;
                 if (onProgress) {
                   const percent = 20 + Math.round((completed / total) * 60);
-                  onProgress(
-                    'Analyzing sessions',
-                    percent,
-                    `${completed}/${total}`,
-                  );
+                  onProgress("Analyzing sessions", percent, `${completed}/${total}`);
                 }
                 return existingFacet;
               } catch (readError) {
                 // File doesn't exist or is invalid, proceed to analyze
-                if ((readError as NodeJS.ErrnoException).code !== 'ENOENT') {
+                if ((readError as NodeJS.ErrnoException).code !== "ENOENT") {
                   logger.warn(
                     `Failed to read existing facet for ${sessionId}, regenerating:`,
                     readError,
@@ -1086,15 +1009,8 @@ None captured`;
 
           if (facet && facetsOutputDir) {
             try {
-              const facetPath = path.join(
-                facetsOutputDir,
-                `${facet.session_id}.json`,
-              );
-              await fs.writeFile(
-                facetPath,
-                JSON.stringify(facet, null, 2),
-                'utf-8',
-              );
+              const facetPath = path.join(facetsOutputDir, `${facet.session_id}.json`);
+              await fs.writeFile(facetPath, JSON.stringify(facet, null, 2), "utf-8");
             } catch (writeError) {
               logger.error(
                 `Failed to write facet file for session ${facet.session_id}:`,
@@ -1106,7 +1022,7 @@ None captured`;
           completed++;
           if (onProgress) {
             const percent = 20 + Math.round((completed / total) * 60);
-            onProgress('Analyzing sessions', percent, `${completed}/${total}`);
+            onProgress("Analyzing sessions", percent, `${completed}/${total}`);
           }
 
           return facet;
@@ -1115,7 +1031,7 @@ None captured`;
           completed++;
           if (onProgress) {
             const percent = 20 + Math.round((completed / total) * 60);
-            onProgress('Analyzing sessions', percent, `${completed}/${total}`);
+            onProgress("Analyzing sessions", percent, `${completed}/${total}`);
           }
           return null;
         }
@@ -1123,9 +1039,7 @@ None captured`;
     );
 
     const sessionFacetsWithNulls = await Promise.all(analysisPromises);
-    const facets = sessionFacetsWithNulls.filter(
-      (f): f is SessionFacets => f !== null,
-    );
+    const facets = sessionFacetsWithNulls.filter((f): f is SessionFacets => f !== null);
     return facets;
   }
 }
diff --git a/apps/airiscode-cli/src/services/insight/generators/StaticInsightGenerator.ts b/apps/airiscode-cli/src/services/insight/generators/StaticInsightGenerator.ts
index 371c72369..b430580cf 100644
--- a/apps/airiscode-cli/src/services/insight/generators/StaticInsightGenerator.ts
+++ b/apps/airiscode-cli/src/services/insight/generators/StaticInsightGenerator.ts
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'fs/promises';
-import path from 'path';
-import { DataProcessor } from './DataProcessor.js';
-import { TemplateRenderer } from './TemplateRenderer.js';
-import type {
-  InsightData,
-  InsightProgressCallback,
-} from '../types/StaticInsightTypes.js';
-
-import { updateSymlink, Storage, type Config } from '@airiscode/core';
+import { type Config, Storage, updateSymlink } from "@airiscode/core";
+import fs from "fs/promises";
+import path from "path";
+import type { InsightData, InsightProgressCallback } from "../types/StaticInsightTypes.js";
+import { DataProcessor } from "./DataProcessor.js";
+import { TemplateRenderer } from "./TemplateRenderer.js";
 
 export class StaticInsightGenerator {
   private dataProcessor: DataProcessor;
@@ -26,7 +22,7 @@ export class StaticInsightGenerator {
 
   // Ensure the output directory exists
   private async ensureOutputDirectory(): Promise<string> {
-    const outputDir = path.join(Storage.getRuntimeBaseDir(), 'insights');
+    const outputDir = path.join(Storage.getRuntimeBaseDir(), "insights");
     await fs.mkdir(outputDir, { recursive: true });
     return outputDir;
   }
@@ -34,8 +30,8 @@ export class StaticInsightGenerator {
   // Generate timestamped filename with collision detection
   private async generateOutputPath(outputDir: string): Promise<string> {
     const now = new Date();
-    const date = now.toISOString().split('T')[0]; // YYYY-MM-DD
-    const time = now.toTimeString().slice(0, 8).replace(/:/g, ''); // HHMMSS
+    const date = now.toISOString().split("T")[0]; // YYYY-MM-DD
+    const time = now.toTimeString().slice(0, 8).replace(/:/g, ""); // HHMMSS
 
     let outputPath = path.join(outputDir, `insight-${date}.html`);
 
@@ -51,11 +47,8 @@ export class StaticInsightGenerator {
     return outputPath;
   }
 
-  private async updateInsightSymlink(
-    outputDir: string,
-    targetPath: string,
-  ): Promise<void> {
-    const latestPath = path.join(outputDir, 'insight.html');
+  private async updateInsightSymlink(outputDir: string, targetPath: string): Promise<void> {
+    const latestPath = path.join(outputDir, "insight.html");
     await updateSymlink(latestPath, targetPath);
   }
 
@@ -66,7 +59,7 @@ export class StaticInsightGenerator {
   ): Promise<string> {
     // Ensure output directory exists
     const outputDir = await this.ensureOutputDirectory();
-    const facetsDir = path.join(outputDir, 'facets');
+    const facetsDir = path.join(outputDir, "facets");
     await fs.mkdir(facetsDir, { recursive: true });
 
     // Process data
@@ -83,7 +76,7 @@ export class StaticInsightGenerator {
     const outputPath = await this.generateOutputPath(outputDir);
 
     // Write the HTML file
-    await fs.writeFile(outputPath, html, 'utf-8');
+    await fs.writeFile(outputPath, html, "utf-8");
 
     await this.updateInsightSymlink(outputDir, outputPath);
 
diff --git a/apps/airiscode-cli/src/services/insight/generators/TemplateRenderer.ts b/apps/airiscode-cli/src/services/insight/generators/TemplateRenderer.ts
index d516d19d7..fb19af926 100644
--- a/apps/airiscode-cli/src/services/insight/generators/TemplateRenderer.ts
+++ b/apps/airiscode-cli/src/services/insight/generators/TemplateRenderer.ts
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const INSIGHT_JS = '';
-const INSIGHT_CSS = '';
-import type { InsightData } from '../types/StaticInsightTypes.js';
+const INSIGHT_JS = "";
+const INSIGHT_CSS = "";
+
+import type { InsightData } from "../types/StaticInsightTypes.js";
 
 export class TemplateRenderer {
   // Render the complete HTML file
diff --git a/apps/airiscode-cli/src/services/insight/types/StaticInsightTypes.ts b/apps/airiscode-cli/src/services/insight/types/StaticInsightTypes.ts
index f1cee1b36..d23b9cfcd 100644
--- a/apps/airiscode-cli/src/services/insight/types/StaticInsightTypes.ts
+++ b/apps/airiscode-cli/src/services/insight/types/StaticInsightTypes.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { QualitativeInsights } from './QualitativeInsightTypes.js';
+import type { QualitativeInsights } from "./QualitativeInsightTypes.js";
 
 export interface HeatMapData {
   [date: string]: number;
@@ -44,34 +44,34 @@ export interface SessionFacets {
   underlying_goal: string;
   goal_categories: Record<string, number>;
   outcome:
-    | 'fully_achieved'
-    | 'mostly_achieved'
-    | 'partially_achieved'
-    | 'not_achieved'
-    | 'unclear_from_transcript';
+    | "fully_achieved"
+    | "mostly_achieved"
+    | "partially_achieved"
+    | "not_achieved"
+    | "unclear_from_transcript";
   user_satisfaction_counts: Record<string, number>;
   Qwen_helpfulness:
-    | 'unhelpful'
-    | 'slightly_helpful'
-    | 'moderately_helpful'
-    | 'very_helpful'
-    | 'essential';
+    | "unhelpful"
+    | "slightly_helpful"
+    | "moderately_helpful"
+    | "very_helpful"
+    | "essential";
   session_type:
-    | 'single_task'
-    | 'multi_task'
-    | 'iterative_refinement'
-    | 'exploration'
-    | 'quick_question';
+    | "single_task"
+    | "multi_task"
+    | "iterative_refinement"
+    | "exploration"
+    | "quick_question";
   friction_counts: Record<string, number>;
   friction_detail: string;
   primary_success:
-    | 'none'
-    | 'fast_accurate_search'
-    | 'correct_code_edits'
-    | 'good_explanations'
-    | 'proactive_help'
-    | 'multi_file_changes'
-    | 'good_debugging';
+    | "none"
+    | "fast_accurate_search"
+    | "correct_code_edits"
+    | "good_explanations"
+    | "proactive_help"
+    | "multi_file_changes"
+    | "good_debugging";
   brief_summary: string;
 }
 
@@ -83,8 +83,4 @@ export interface StaticInsightTemplateData {
   generatedTime: string;
 }
 
-export type InsightProgressCallback = (
-  stage: string,
-  progress: number,
-  detail?: string,
-) => void;
+export type InsightProgressCallback = (stage: string, progress: number, detail?: string) => void;
diff --git a/apps/airiscode-cli/src/services/markdown-command-parser.ts b/apps/airiscode-cli/src/services/markdown-command-parser.ts
index 5fe1a3c04..a74ebbf69 100644
--- a/apps/airiscode-cli/src/services/markdown-command-parser.ts
+++ b/apps/airiscode-cli/src/services/markdown-command-parser.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
-import {
-  parse as parseYaml,
-  normalizeContent,
-} from '@airiscode/core';
+import { normalizeContent, parse as parseYaml } from "@airiscode/core";
+import { z } from "zod";
 
 /**
  * Defines the Zod schema for a Markdown command definition file.
@@ -21,8 +18,8 @@ export const MarkdownCommandDefSchema = z.object({
     })
     .optional(),
   prompt: z.string({
-    required_error: 'The prompt content is required.',
-    invalid_type_error: 'The prompt content must be a string.',
+    required_error: "The prompt content is required.",
+    invalid_type_error: "The prompt content must be a string.",
   }),
 });
 
@@ -48,7 +45,7 @@ export function parseMarkdownCommand(content: string): MarkdownCommandDef {
     };
   }
 
-  const [, frontmatterYaml = '', body] = match;
+  const [, frontmatterYaml = "", body] = match;
 
   // Parse YAML frontmatter if not empty
   let frontmatter: Record<string, unknown> | undefined;
diff --git a/apps/airiscode-cli/src/services/prompt-processors/argumentProcessor.ts b/apps/airiscode-cli/src/services/prompt-processors/argumentProcessor.ts
index fa848ccce..4e45e315f 100644
--- a/apps/airiscode-cli/src/services/prompt-processors/argumentProcessor.ts
+++ b/apps/airiscode-cli/src/services/prompt-processors/argumentProcessor.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { appendToLastTextPart } from '@airiscode/core';
-import type { IPromptProcessor, PromptPipelineContent } from './types.js';
-import type { CommandContext } from '../../ui/commands/types.js';
+import { appendToLastTextPart } from "@airiscode/core";
+import type { CommandContext } from "../../ui/commands/types.js";
+import type { IPromptProcessor, PromptPipelineContent } from "./types.js";
 
 /**
  * Appends the user's full command invocation to the prompt if arguments are
diff --git a/apps/airiscode-cli/src/services/prompt-processors/atFileProcessor.ts b/apps/airiscode-cli/src/services/prompt-processors/atFileProcessor.ts
index d77221a77..2c321423d 100644
--- a/apps/airiscode-cli/src/services/prompt-processors/atFileProcessor.ts
+++ b/apps/airiscode-cli/src/services/prompt-processors/atFileProcessor.ts
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  flatMapTextParts,
-  readPathFromWorkspace,
-  createDebugLogger,
-} from '@airiscode/core';
-import type { CommandContext } from '../../ui/commands/types.js';
-import { MessageType } from '../../ui/types.js';
+import { createDebugLogger, flatMapTextParts, readPathFromWorkspace } from "@airiscode/core";
+import type { CommandContext } from "../../ui/commands/types.js";
+import { MessageType } from "../../ui/types.js";
+import { extractInjections } from "./injectionParser.js";
 import {
   AT_FILE_INJECTION_TRIGGER,
   type IPromptProcessor,
   type PromptPipelineContent,
-} from './types.js';
-import { extractInjections } from './injectionParser.js';
+} from "./types.js";
 
-const debugLogger = createDebugLogger('AT_FILE_PROCESSOR');
+const debugLogger = createDebugLogger("AT_FILE_PROCESSOR");
 
 export class AtFileProcessor implements IPromptProcessor {
   constructor(private readonly commandName?: string) {}
@@ -37,11 +33,7 @@ export class AtFileProcessor implements IPromptProcessor {
         return [{ text }];
       }
 
-      const injections = extractInjections(
-        text,
-        AT_FILE_INJECTION_TRIGGER,
-        this.commandName,
-      );
+      const injections = extractInjections(text, AT_FILE_INJECTION_TRIGGER, this.commandName);
       if (injections.length === 0) {
         return [{ text }];
       }
@@ -60,29 +52,17 @@ export class AtFileProcessor implements IPromptProcessor {
           const fileContentParts = await readPathFromWorkspace(pathStr, config);
           if (fileContentParts.length === 0) {
             const uiMessage = `File '@{${pathStr}}' was ignored by .gitignore or .airiscodeigenore and was not included in the prompt.`;
-            context.ui.addItem(
-              { type: MessageType.INFO, text: uiMessage },
-              Date.now(),
-            );
+            context.ui.addItem({ type: MessageType.INFO, text: uiMessage }, Date.now());
           }
           output.push(...fileContentParts);
         } catch (error) {
-          const message =
-            error instanceof Error ? error.message : String(error);
+          const message = error instanceof Error ? error.message : String(error);
           const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message}`;
 
-          debugLogger.error(
-            `[AtFileProcessor] ${uiMessage}. Leaving placeholder in prompt.`,
-          );
-          context.ui.addItem(
-            { type: MessageType.ERROR, text: uiMessage },
-            Date.now(),
-          );
+          debugLogger.error(`[AtFileProcessor] ${uiMessage}. Leaving placeholder in prompt.`);
+          context.ui.addItem({ type: MessageType.ERROR, text: uiMessage }, Date.now());
 
-          const placeholder = text.substring(
-            injection.startIndex,
-            injection.endIndex,
-          );
+          const placeholder = text.substring(injection.startIndex, injection.endIndex);
           output.push({ text: placeholder });
         }
         lastIndex = injection.endIndex;
diff --git a/apps/airiscode-cli/src/services/prompt-processors/injectionParser.ts b/apps/airiscode-cli/src/services/prompt-processors/injectionParser.ts
index 52d3226db..b31e9f7c3 100644
--- a/apps/airiscode-cli/src/services/prompt-processors/injectionParser.ts
+++ b/apps/airiscode-cli/src/services/prompt-processors/injectionParser.ts
@@ -50,15 +50,12 @@ export function extractInjections(
     while (currentIndex < prompt.length) {
       const char = prompt[currentIndex];
 
-      if (char === '{') {
+      if (char === "{") {
         braceCount++;
-      } else if (char === '}') {
+      } else if (char === "}") {
         braceCount--;
         if (braceCount === 0) {
-          const injectionContent = prompt.substring(
-            startIndex + trigger.length,
-            currentIndex,
-          );
+          const injectionContent = prompt.substring(startIndex + trigger.length, currentIndex);
           const endIndex = currentIndex + 1;
 
           injections.push({
@@ -77,7 +74,7 @@ export function extractInjections(
 
     // Check if the inner loop finished without finding the closing brace.
     if (!foundEnd) {
-      const contextInfo = contextName ? ` in command '${contextName}'` : '';
+      const contextInfo = contextName ? ` in command '${contextName}'` : "";
       // Enforce strict parsing (Comment 1) and clarify limitations (Comment 2).
       throw new Error(
         `Invalid syntax${contextInfo}: Unclosed injection starting at index ${startIndex} ('${trigger}'). Ensure braces are balanced. Paths or commands with unbalanced braces are not supported directly.`,
diff --git a/apps/airiscode-cli/src/services/prompt-processors/shellProcessor.ts b/apps/airiscode-cli/src/services/prompt-processors/shellProcessor.ts
index e7788e991..166b071ed 100644
--- a/apps/airiscode-cli/src/services/prompt-processors/shellProcessor.ts
+++ b/apps/airiscode-cli/src/services/prompt-processors/shellProcessor.ts
@@ -6,22 +6,19 @@
 
 import {
   ApprovalMode,
+  checkArgumentSafety,
   checkCommandPermissions,
   escapeShellArg,
+  flatMapTextParts,
   getShellConfiguration,
   ShellExecutionService,
-  flatMapTextParts,
-  checkArgumentSafety,
-} from '@airiscode/core';
+} from "@airiscode/core";
 
-import type { CommandContext } from '../../ui/commands/types.js';
-import type { IPromptProcessor, PromptPipelineContent } from './types.js';
-import {
-  SHELL_INJECTION_TRIGGER,
-  SHORTHAND_ARGS_PLACEHOLDER,
-} from './types.js';
-import { extractInjections, type Injection } from './injectionParser.js';
-import { themeManager } from '../../ui/themes/theme-manager.js';
+import type { CommandContext } from "../../ui/commands/types.js";
+import { themeManager } from "../../ui/themes/theme-manager.js";
+import { extractInjections, type Injection } from "./injectionParser.js";
+import type { IPromptProcessor, PromptPipelineContent } from "./types.js";
+import { SHELL_INJECTION_TRIGGER, SHORTHAND_ARGS_PLACEHOLDER } from "./types.js";
 
 export class ConfirmationRequiredError extends Error {
   constructor(
@@ -29,7 +26,7 @@ export class ConfirmationRequiredError extends Error {
     public commandsToConfirm: string[],
   ) {
     super(message);
-    this.name = 'ConfirmationRequiredError';
+    this.name = "ConfirmationRequiredError";
   }
 }
 
@@ -59,21 +56,17 @@ export class ShellProcessor implements IPromptProcessor {
     prompt: PromptPipelineContent,
     context: CommandContext,
   ): Promise<PromptPipelineContent> {
-    return flatMapTextParts(prompt, (text) =>
-      this.processString(text, context),
-    );
+    return flatMapTextParts(prompt, (text) => this.processString(text, context));
   }
 
   private async processString(
     prompt: string,
     context: CommandContext,
   ): Promise<PromptPipelineContent> {
-    const userArgsRaw = context.invocation?.args || '';
+    const userArgsRaw = context.invocation?.args || "";
 
     if (!prompt.includes(SHELL_INJECTION_TRIGGER)) {
-      return [
-        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) },
-      ];
+      return [{ text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }];
     }
 
     const config = context.services.config;
@@ -84,46 +77,35 @@ export class ShellProcessor implements IPromptProcessor {
     }
     const { sessionShellAllowlist } = context.session;
 
-    const injections = extractInjections(
-      prompt,
-      SHELL_INJECTION_TRIGGER,
-      this.commandName,
-    );
+    const injections = extractInjections(prompt, SHELL_INJECTION_TRIGGER, this.commandName);
 
     // If extractInjections found no closed blocks (and didn't throw), treat as raw.
     if (injections.length === 0) {
-      return [
-        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) },
-      ];
+      return [{ text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }];
     }
 
     const { shell } = getShellConfiguration();
     const userArgsEscaped = escapeShellArg(userArgsRaw, shell);
 
     // Check safety of the value that will be used for $ARGUMENTS (after removing outer quotes)
-    let userArgsForArgumentsPlaceholder = userArgsRaw.replace(
-      /^'([\s\S]*?)'$/,
-      '$1',
-    );
+    let userArgsForArgumentsPlaceholder = userArgsRaw.replace(/^'([\s\S]*?)'$/, "$1");
     const argumentSafety = checkArgumentSafety(userArgsForArgumentsPlaceholder);
     if (!argumentSafety.isSafe) {
       userArgsForArgumentsPlaceholder = userArgsEscaped;
     }
 
-    const resolvedInjections: ResolvedShellInjection[] = injections.map(
-      (injection) => {
-        const command = injection.content;
+    const resolvedInjections: ResolvedShellInjection[] = injections.map((injection) => {
+      const command = injection.content;
 
-        if (command === '') {
-          return { ...injection, resolvedCommand: undefined };
-        }
+      if (command === "") {
+        return { ...injection, resolvedCommand: undefined };
+      }
 
-        const resolvedCommand = command
-          .replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsEscaped) // Replace {{args}}
-          .replaceAll('$ARGUMENTS', userArgsForArgumentsPlaceholder);
-        return { ...injection, resolvedCommand };
-      },
-    );
+      const resolvedCommand = command
+        .replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsEscaped) // Replace {{args}}
+        .replaceAll("$ARGUMENTS", userArgsForArgumentsPlaceholder);
+      return { ...injection, resolvedCommand };
+    });
 
     const commandsToConfirm = new Set<string>();
     for (const injection of resolvedInjections) {
@@ -137,14 +119,12 @@ export class ShellProcessor implements IPromptProcessor {
 
       // Determine if this command is explicitly auto-approved via PermissionManager
       const pm = config.getPermissionManager?.();
-      const isAllowedBySettings = pm
-        ? (await pm.isCommandAllowed(command)) === 'allow'
-        : false;
+      const isAllowedBySettings = pm ? (await pm.isCommandAllowed(command)) === "allow" : false;
 
       if (!allAllowed) {
         if (isHardDenial) {
           throw new Error(
-            `${this.commandName} cannot be run. Blocked command: "${command}". Reason: ${blockReason || 'Blocked by configuration.'}`,
+            `${this.commandName} cannot be run. Blocked command: "${command}". Reason: ${blockReason || "Blocked by configuration."}`,
           );
         }
 
@@ -165,21 +145,18 @@ export class ShellProcessor implements IPromptProcessor {
     // Handle confirmation requirements.
     if (commandsToConfirm.size > 0) {
       throw new ConfirmationRequiredError(
-        'Shell command confirmation required',
+        "Shell command confirmation required",
         Array.from(commandsToConfirm),
       );
     }
 
-    let processedPrompt = '';
+    let processedPrompt = "";
     let lastIndex = 0;
 
     for (const injection of resolvedInjections) {
       // Append the text segment BEFORE the injection, substituting {{args}} with RAW input.
       const segment = prompt.substring(lastIndex, injection.startIndex);
-      processedPrompt += segment.replaceAll(
-        SHORTHAND_ARGS_PLACEHOLDER,
-        userArgsRaw,
-      );
+      processedPrompt += segment.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
 
       // Execute the resolved command (which already has ESCAPED input).
       if (injection.resolvedCommand) {
@@ -213,10 +190,7 @@ export class ShellProcessor implements IPromptProcessor {
         // Append a status message if the command did not succeed.
         if (executionResult.aborted) {
           processedPrompt += `\n[Shell command '${injection.resolvedCommand}' aborted]`;
-        } else if (
-          executionResult.exitCode !== 0 &&
-          executionResult.exitCode !== null
-        ) {
+        } else if (executionResult.exitCode !== 0 && executionResult.exitCode !== null) {
           processedPrompt += `\n[Shell command '${injection.resolvedCommand}' exited with code ${executionResult.exitCode}]`;
         } else if (executionResult.signal !== null) {
           processedPrompt += `\n[Shell command '${injection.resolvedCommand}' terminated by signal ${executionResult.signal}]`;
@@ -228,10 +202,7 @@ export class ShellProcessor implements IPromptProcessor {
 
     // Append the remaining text AFTER the last injection, substituting {{args}} with RAW input.
     const finalSegment = prompt.substring(lastIndex);
-    processedPrompt += finalSegment.replaceAll(
-      SHORTHAND_ARGS_PLACEHOLDER,
-      userArgsRaw,
-    );
+    processedPrompt += finalSegment.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
 
     return [{ text: processedPrompt }];
   }
diff --git a/apps/airiscode-cli/src/services/prompt-processors/types.ts b/apps/airiscode-cli/src/services/prompt-processors/types.ts
index 9e67396ff..207a7b47e 100644
--- a/apps/airiscode-cli/src/services/prompt-processors/types.ts
+++ b/apps/airiscode-cli/src/services/prompt-processors/types.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandContext } from '../../ui/commands/types.js';
-import type { PartUnion } from '@airiscode/core';
+import type { PartUnion } from "@airiscode/core";
+import type { CommandContext } from "../../ui/commands/types.js";
 
 /**
  * Defines the input/output type for prompt processors.
@@ -30,10 +30,7 @@ export interface IPromptProcessor {
    * @returns A promise that resolves to the transformed prompt string, which
    *   will be passed to the next processor or, if it's the last one, sent to the model.
    */
-  process(
-    prompt: PromptPipelineContent,
-    context: CommandContext,
-  ): Promise<PromptPipelineContent>;
+  process(prompt: PromptPipelineContent, context: CommandContext): Promise<PromptPipelineContent>;
 }
 
 /**
@@ -41,14 +38,14 @@ export interface IPromptProcessor {
  * When used outside of !{...}, arguments are injected raw.
  * When used inside !{...}, arguments are shell-escaped.
  */
-export const SHORTHAND_ARGS_PLACEHOLDER = '{{args}}';
+export const SHORTHAND_ARGS_PLACEHOLDER = "{{args}}";
 
 /**
  * The trigger string for shell command injection in custom commands.
  */
-export const SHELL_INJECTION_TRIGGER = '!{';
+export const SHELL_INJECTION_TRIGGER = "!{";
 
 /**
  * The trigger string for at file injection in custom commands.
  */
-export const AT_FILE_INJECTION_TRIGGER = '@{';
+export const AT_FILE_INJECTION_TRIGGER = "@{";
diff --git a/apps/airiscode-cli/src/services/types.ts b/apps/airiscode-cli/src/services/types.ts
index 13a87687e..824d8e7e0 100644
--- a/apps/airiscode-cli/src/services/types.ts
+++ b/apps/airiscode-cli/src/services/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from '../ui/commands/types.js';
+import type { SlashCommand } from "../ui/commands/types.js";
 
 /**
  * Defines the contract for any class that can load and provide slash commands.
diff --git a/apps/airiscode-cli/src/test-utils/customMatchers.ts b/apps/airiscode-cli/src/test-utils/customMatchers.ts
index 2a1b275ad..8e1d54784 100644
--- a/apps/airiscode-cli/src/test-utils/customMatchers.ts
+++ b/apps/airiscode-cli/src/test-utils/customMatchers.ts
@@ -12,9 +12,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Assertion } from 'vitest';
-import { expect } from 'vitest';
-import type { TextBuffer } from '../ui/components/shared/text-buffer.js';
+import type { Assertion } from "vitest";
+import { expect } from "vitest";
+import type { TextBuffer } from "../ui/components/shared/text-buffer.js";
 
 // RegExp to detect invalid characters: backspace, and ANSI escape codes
 // eslint-disable-next-line no-control-regex
@@ -28,7 +28,7 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
 
   for (let i = 0; i < buffer.lines.length; i++) {
     const line = buffer.lines[i];
-    if (line.includes('\n')) {
+    if (line.includes("\n")) {
       pass = false;
       invalidLines.push({ line: i, content: line });
       break; // Fail fast on newlines
@@ -42,11 +42,11 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
   return {
     pass,
     message: () =>
-      `Expected buffer ${isNot ? 'not ' : ''}to have only valid characters, but found invalid characters in lines:\n${invalidLines
+      `Expected buffer ${isNot ? "not " : ""}to have only valid characters, but found invalid characters in lines:\n${invalidLines
         .map((l) => `  [${l.line}]: "${l.content}"`) /* This line was changed */
-        .join('\n')}`,
+        .join("\n")}`,
     actual: buffer.lines,
-    expected: 'Lines with no line breaks, backspaces, or escape codes.',
+    expected: "Lines with no line breaks, backspaces, or escape codes.",
   };
 }
 
@@ -56,7 +56,7 @@ expect.extend({
 } as any);
 
 // Extend Vitest's `expect` interface with the custom matcher's type definition.
-declare module 'vitest' {
+declare module "vitest" {
   interface Assertion<T> {
     toHaveOnlyValidCharacters(): T;
   }
diff --git a/apps/airiscode-cli/src/test-utils/mockCommandContext.ts b/apps/airiscode-cli/src/test-utils/mockCommandContext.ts
index 4901aa121..daa55f46b 100644
--- a/apps/airiscode-cli/src/test-utils/mockCommandContext.ts
+++ b/apps/airiscode-cli/src/test-utils/mockCommandContext.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import type { CommandContext } from '../ui/commands/types.js';
-import type { LoadedSettings } from '../config/settings.js';
-import type { GitService } from '@airiscode/core';
-import type { SessionStatsState } from '../ui/contexts/SessionContext.js';
-import { ToolCallDecision } from '../ui/contexts/SessionContext.js';
+import type { GitService } from "@airiscode/core";
+import { vi } from "vitest";
+import type { LoadedSettings } from "../config/settings.js";
+import type { CommandContext } from "../ui/commands/types.js";
+import type { SessionStatsState } from "../ui/contexts/SessionContext.js";
+import { ToolCallDecision } from "../ui/contexts/SessionContext.js";
 
 // A utility type to make all properties of an object, and its nested objects, partial.
 type DeepPartial<T> = T extends object
@@ -30,9 +30,9 @@ export const createMockCommandContext = (
 ): CommandContext => {
   const defaultMocks: CommandContext = {
     invocation: {
-      raw: '',
-      name: '',
-      args: '',
+      raw: "",
+      name: "",
+      args: "",
     },
     services: {
       config: null,
@@ -70,7 +70,7 @@ export const createMockCommandContext = (
       sessionShellAllowlist: new Set<string>(),
       startNewSession: vi.fn(),
       stats: {
-        sessionId: '',
+        sessionId: "",
         sessionStartTime: new Date(),
         lastPromptTokenCount: 0,
         metrics: {
@@ -100,14 +100,14 @@ export const createMockCommandContext = (
     const output = { ...target };
 
     for (const key in source) {
-      if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (Object.hasOwn(source, key)) {
         const sourceValue = source[key];
         const targetValue = output[key];
 
         if (
           // We only want to recursivlty merge plain objects
-          Object.prototype.toString.call(sourceValue) === '[object Object]' &&
-          Object.prototype.toString.call(targetValue) === '[object Object]'
+          Object.prototype.toString.call(sourceValue) === "[object Object]" &&
+          Object.prototype.toString.call(targetValue) === "[object Object]"
         ) {
           output[key] = merge(targetValue, sourceValue);
         } else {
diff --git a/apps/airiscode-cli/src/test-utils/render.tsx b/apps/airiscode-cli/src/test-utils/render.tsx
index a827a9590..ef48b882e 100644
--- a/apps/airiscode-cli/src/test-utils/render.tsx
+++ b/apps/airiscode-cli/src/test-utils/render.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from 'ink-testing-library';
-import type React from 'react';
-import type { Config } from '@airiscode/core';
-import { LoadedSettings } from '../config/settings.js';
-import { KeypressProvider } from '../ui/contexts/KeypressContext.js';
-import { SettingsContext } from '../ui/contexts/SettingsContext.js';
-import { ShellFocusContext } from '../ui/contexts/ShellFocusContext.js';
-import { ConfigContext } from '../ui/contexts/ConfigContext.js';
+import type { Config } from "@airiscode/core";
+import { render } from "ink-testing-library";
+import type React from "react";
+import { LoadedSettings } from "../config/settings.js";
+import { ConfigContext } from "../ui/contexts/ConfigContext.js";
+import { KeypressProvider } from "../ui/contexts/KeypressContext.js";
+import { SettingsContext } from "../ui/contexts/SettingsContext.js";
+import { ShellFocusContext } from "../ui/contexts/ShellFocusContext.js";
 
 const mockSettings = new LoadedSettings(
-  { path: '', settings: {}, originalSettings: {} },
-  { path: '', settings: {}, originalSettings: {} },
-  { path: '', settings: {}, originalSettings: {} },
-  { path: '', settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
   true,
   new Set(),
 );
@@ -38,9 +38,7 @@ export const renderWithProviders = (
     <SettingsContext.Provider value={settings}>
       <ConfigContext.Provider value={config}>
         <ShellFocusContext.Provider value={shellFocus}>
-          <KeypressProvider kittyProtocolEnabled={true}>
-            {component}
-          </KeypressProvider>
+          <KeypressProvider kittyProtocolEnabled={true}>{component}</KeypressProvider>
         </ShellFocusContext.Provider>
       </ConfigContext.Provider>
     </SettingsContext.Provider>,
diff --git a/apps/airiscode-cli/src/ui/App.tsx b/apps/airiscode-cli/src/ui/App.tsx
index 54684a8c2..d010818b7 100644
--- a/apps/airiscode-cli/src/ui/App.tsx
+++ b/apps/airiscode-cli/src/ui/App.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useIsScreenReaderEnabled } from 'ink';
-import { useUIState } from './contexts/UIStateContext.js';
-import { StreamingContext } from './contexts/StreamingContext.js';
-import { QuittingDisplay } from './components/QuittingDisplay.js';
-import { ScreenReaderAppLayout } from './layouts/ScreenReaderAppLayout.js';
-import { DefaultAppLayout } from './layouts/DefaultAppLayout.js';
+import { useIsScreenReaderEnabled } from "ink";
+import { QuittingDisplay } from "./components/QuittingDisplay.js";
+import { StreamingContext } from "./contexts/StreamingContext.js";
+import { useUIState } from "./contexts/UIStateContext.js";
+import { DefaultAppLayout } from "./layouts/DefaultAppLayout.js";
+import { ScreenReaderAppLayout } from "./layouts/ScreenReaderAppLayout.js";
 
 export const App = () => {
   const uiState = useUIState();
diff --git a/apps/airiscode-cli/src/ui/AppContainer.tsx b/apps/airiscode-cli/src/ui/AppContainer.tsx
index f10642b12..0ccea3c21 100644
--- a/apps/airiscode-cli/src/ui/AppContainer.tsx
+++ b/apps/airiscode-cli/src/ui/AppContainer.tsx
@@ -4,146 +4,130 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import process from "node:process";
 import {
-  useMemo,
-  useState,
-  useCallback,
-  useEffect,
-  useRef,
-  useLayoutEffect,
-} from 'react';
-import { type DOMElement, measureElement } from 'ink';
-import { App } from './App.js';
-import { AppContext } from './contexts/AppContext.js';
-import { UIStateContext, type UIState } from './contexts/UIStateContext.js';
-import {
-  UIActionsContext,
-  type UIActions,
-} from './contexts/UIActionsContext.js';
-import { ConfigContext } from './contexts/ConfigContext.js';
-import {
-  type HistoryItem,
-  ToolCallStatus,
-  type HistoryItemWithoutId,
-} from './types.js';
-import { MessageType, StreamingState } from './types.js';
-import {
-  type EditorType,
+  ApprovalMode,
+  abortSpeculation,
+  acceptSpeculation,
   type Config,
-  type IdeInfo,
-  type IdeContext,
-  IdeClient,
-  ideContextStore,
   createDebugLogger,
-  getErrorMessage,
-  getAllGeminiMdFilenames,
-  ShellExecutionService,
-  Storage,
-  SessionEndReason,
-  SessionStartSource,
+  type EditorType,
   generatePromptSuggestion,
+  getAllGeminiMdFilenames,
+  getErrorMessage,
+  IDLE_SPECULATION,
+  IdeClient,
+  type IdeContext,
+  type IdeInfo,
+  ideContextStore,
   logPromptSuggestion,
-  PromptSuggestionEvent,
   logSpeculation,
+  type PermissionMode,
+  PromptSuggestionEvent,
+  SessionEndReason,
+  SessionStartSource,
+  ShellExecutionService,
   SpeculationEvent,
-  startSpeculation,
-  acceptSpeculation,
-  abortSpeculation,
   type SpeculationState,
-  IDLE_SPECULATION,
-  ApprovalMode,
-  type PermissionMode,
-} from '@airiscode/core';
-import { buildResumedHistoryItems } from './utils/resumeHistoryUtils.js';
-import { validateAuthMethod } from '../config/auth.js';
-import { loadHierarchicalGeminiMemory } from '../config/config.js';
-import process from 'node:process';
-import { useHistory } from './hooks/useHistoryManager.js';
-import { useMemoryMonitor } from './hooks/useMemoryMonitor.js';
-import { useThemeCommand } from './hooks/useThemeCommand.js';
-import { useFeedbackDialog } from './hooks/useFeedbackDialog.js';
-import { useAuthCommand } from './auth/useAuth.js';
-import { useEditorSettings } from './hooks/useEditorSettings.js';
-import { useSettingsCommand } from './hooks/useSettingsCommand.js';
-import { useModelCommand } from './hooks/useModelCommand.js';
-import { useArenaCommand } from './hooks/useArenaCommand.js';
-import { useApprovalModeCommand } from './hooks/useApprovalModeCommand.js';
-import { useResumeCommand } from './hooks/useResumeCommand.js';
-import { useSlashCommandProcessor } from './hooks/slashCommandProcessor.js';
-import { useVimMode } from './contexts/VimModeContext.js';
-import { VerboseModeProvider } from './contexts/VerboseModeContext.js';
-import { useTerminalSize } from './hooks/useTerminalSize.js';
-import { calculatePromptWidths } from './components/InputPrompt.js';
-import { useStdin, useStdout } from 'ink';
+  Storage,
+  startSpeculation,
+} from "@airiscode/core";
+import { type DOMElement, measureElement, useStdin, useStdout } from "ink";
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { validateAuthMethod } from "../config/auth.js";
+import { loadHierarchicalGeminiMemory } from "../config/config.js";
+import { App } from "./App.js";
+import { useAuthCommand } from "./auth/useAuth.js";
+import { calculatePromptWidths } from "./components/InputPrompt.js";
+import { AppContext } from "./contexts/AppContext.js";
+import { ConfigContext } from "./contexts/ConfigContext.js";
+import { type UIActions, UIActionsContext } from "./contexts/UIActionsContext.js";
+import { type UIState, UIStateContext } from "./contexts/UIStateContext.js";
+import { VerboseModeProvider } from "./contexts/VerboseModeContext.js";
+import { useVimMode } from "./contexts/VimModeContext.js";
+import { useSlashCommandProcessor } from "./hooks/slashCommandProcessor.js";
+import { useApprovalModeCommand } from "./hooks/useApprovalModeCommand.js";
+import { useArenaCommand } from "./hooks/useArenaCommand.js";
+import { useEditorSettings } from "./hooks/useEditorSettings.js";
+import { useFeedbackDialog } from "./hooks/useFeedbackDialog.js";
+import { useHistory } from "./hooks/useHistoryManager.js";
+import { useMemoryMonitor } from "./hooks/useMemoryMonitor.js";
+import { useModelCommand } from "./hooks/useModelCommand.js";
+import { useResumeCommand } from "./hooks/useResumeCommand.js";
+import { useSettingsCommand } from "./hooks/useSettingsCommand.js";
+import { useTerminalSize } from "./hooks/useTerminalSize.js";
+import { useThemeCommand } from "./hooks/useThemeCommand.js";
+import {
+  type HistoryItem,
+  type HistoryItemWithoutId,
+  MessageType,
+  StreamingState,
+  ToolCallStatus,
+} from "./types.js";
+import { buildResumedHistoryItems } from "./utils/resumeHistoryUtils.js";
+
 // Minimal ansi-escapes replacement (only clearTerminal used)
 const ansiEscapes = {
-  clearTerminal:
-    process.platform === 'win32'
-      ? '\x1b[2J\x1b[0f'
-      : '\x1b[2J\x1b[3J\x1b[H',
+  clearTerminal: process.platform === "win32" ? "\x1b[2J\x1b[0f" : "\x1b[2J\x1b[3J\x1b[H",
 };
-import * as fs from 'node:fs';
-import { basename } from 'node:path';
-import { computeWindowTitle } from '../utils/windowTitle.js';
-import { clearScreen } from '../utils/stdioHelpers.js';
-import { useTextBuffer } from './components/shared/text-buffer.js';
-import { useLogger } from './hooks/useLogger.js';
-import { useGeminiStream } from './hooks/useGeminiStream.js';
-import { useVim } from './hooks/vim.js';
-import { isBtwCommand } from './utils/commandUtils.js';
-import { type LoadedSettings, SettingScope } from '../config/settings.js';
-import { type InitializationResult } from '../core/initializer.js';
-import { useFocus } from './hooks/useFocus.js';
-import { useBracketedPaste } from './hooks/useBracketedPaste.js';
-import { useKeypress, type Key } from './hooks/useKeypress.js';
-import { keyMatchers, Command } from './keyMatchers.js';
-import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
-import { useFolderTrust } from './hooks/useFolderTrust.js';
-import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
-import { type IdeIntegrationNudgeResult } from './IdeIntegrationNudge.js';
-import { type CommandMigrationNudgeResult } from './CommandFormatMigrationNudge.js';
-import { useCommandMigration } from './hooks/useCommandMigration.js';
-import { migrateTomlCommands } from '../services/command-migration-tool.js';
-import { type UpdateObject } from './utils/updateCheck.js';
-import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
-import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
-import { useMessageQueue } from './hooks/useMessageQueue.js';
-import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
-import { useSessionStats } from './contexts/SessionContext.js';
-import { useGitBranchName } from './hooks/useGitBranchName.js';
+
+import * as fs from "node:fs";
+import { basename } from "node:path";
+import { requestConsentInteractive, requestConsentOrFail } from "../commands/extensions/consent.js";
+import { type LoadedSettings, SettingScope } from "../config/settings.js";
+import { type InitializationResult } from "../core/initializer.js";
+import { t } from "../i18n/index.js";
+import { migrateTomlCommands } from "../services/command-migration-tool.js";
+import { registerCleanup, runExitCleanup } from "../utils/cleanup.js";
+import { setUpdateHandler } from "../utils/handleAutoUpdate.js";
+import { clearScreen } from "../utils/stdioHelpers.js";
+import { computeWindowTitle } from "../utils/windowTitle.js";
+import { type CommandMigrationNudgeResult } from "./CommandFormatMigrationNudge.js";
+import { useTextBuffer } from "./components/shared/text-buffer.js";
+import { useAgentViewState } from "./contexts/AgentViewContext.js";
+import { useSessionStats } from "./contexts/SessionContext.js";
+import { ShellFocusContext } from "./contexts/ShellFocusContext.js";
+import { useAgentsManagerDialog } from "./hooks/useAgentsManagerDialog.js";
+import { useAttentionNotifications } from "./hooks/useAttentionNotifications.js";
+import { useAutoAcceptIndicator } from "./hooks/useAutoAcceptIndicator.js";
+import { useBracketedPaste } from "./hooks/useBracketedPaste.js";
+import { useCodingPlanUpdates } from "./hooks/useCodingPlanUpdates.js";
+import { useCommandMigration } from "./hooks/useCommandMigration.js";
+import { useDialogClose } from "./hooks/useDialogClose.js";
+import { useExtensionsManagerDialog } from "./hooks/useExtensionsManagerDialog.js";
 import {
-  useExtensionUpdates,
   useConfirmUpdateRequests,
-  useSettingInputRequests,
+  useExtensionUpdates,
   usePluginChoiceRequests,
-} from './hooks/useExtensionUpdates.js';
-import { useCodingPlanUpdates } from './hooks/useCodingPlanUpdates.js';
-import { ShellFocusContext } from './contexts/ShellFocusContext.js';
-import { useAgentViewState } from './contexts/AgentViewContext.js';
-import { t } from '../i18n/index.js';
-import { useWelcomeBack } from './hooks/useWelcomeBack.js';
-import { useDialogClose } from './hooks/useDialogClose.js';
-import { useInitializationAuthError } from './hooks/useInitializationAuthError.js';
-import { useSubagentCreateDialog } from './hooks/useSubagentCreateDialog.js';
-import { useAgentsManagerDialog } from './hooks/useAgentsManagerDialog.js';
-import { useExtensionsManagerDialog } from './hooks/useExtensionsManagerDialog.js';
-import { useMcpDialog } from './hooks/useMcpDialog.js';
-import { useHooksDialog } from './hooks/useHooksDialog.js';
-import { useAttentionNotifications } from './hooks/useAttentionNotifications.js';
-import {
-  requestConsentInteractive,
-  requestConsentOrFail,
-} from '../commands/extensions/consent.js';
+  useSettingInputRequests,
+} from "./hooks/useExtensionUpdates.js";
+import { useFocus } from "./hooks/useFocus.js";
+import { useFolderTrust } from "./hooks/useFolderTrust.js";
+import { useGeminiStream } from "./hooks/useGeminiStream.js";
+import { useGitBranchName } from "./hooks/useGitBranchName.js";
+import { useHooksDialog } from "./hooks/useHooksDialog.js";
+import { useIdeTrustListener } from "./hooks/useIdeTrustListener.js";
+import { useInitializationAuthError } from "./hooks/useInitializationAuthError.js";
+import { type Key, useKeypress } from "./hooks/useKeypress.js";
+import { useLoadingIndicator } from "./hooks/useLoadingIndicator.js";
+import { useLogger } from "./hooks/useLogger.js";
+import { useMcpDialog } from "./hooks/useMcpDialog.js";
+import { useMessageQueue } from "./hooks/useMessageQueue.js";
+import { useSubagentCreateDialog } from "./hooks/useSubagentCreateDialog.js";
+import { useWelcomeBack } from "./hooks/useWelcomeBack.js";
+import { useVim } from "./hooks/vim.js";
+import { type IdeIntegrationNudgeResult } from "./IdeIntegrationNudge.js";
+import { Command, keyMatchers } from "./keyMatchers.js";
+import { isBtwCommand } from "./utils/commandUtils.js";
+import { type UpdateObject } from "./utils/updateCheck.js";
 
 const CTRL_EXIT_PROMPT_DURATION_MS = 1000;
-const debugLogger = createDebugLogger('APP_CONTAINER');
+const debugLogger = createDebugLogger("APP_CONTAINER");
 
 function isToolExecuting(pendingHistoryItems: HistoryItemWithoutId[]) {
   return pendingHistoryItems.some((item) => {
-    if (item && item.type === 'tool_group') {
-      return item.tools.some(
-        (tool) => ToolCallStatus.Executing === tool.status,
-      );
+    if (item && item.type === "tool_group") {
+      return item.tools.some((tool) => ToolCallStatus.Executing === tool.status);
     }
     return false;
   });
@@ -173,13 +157,9 @@ export const AppContainer = (props: AppContainerProps) => {
   const { settings, config, initializationResult } = props;
   const historyManager = useHistory();
   useMemoryMonitor(historyManager);
-  const [debugMessage, setDebugMessage] = useState<string>('');
-  const [quittingMessages, setQuittingMessages] = useState<
-    HistoryItem[] | null
-  >(null);
-  const [themeError, setThemeError] = useState<string | null>(
-    initializationResult.themeError,
-  );
+  const [debugMessage, setDebugMessage] = useState<string>("");
+  const [quittingMessages, setQuittingMessages] = useState<HistoryItem[] | null>(null);
+  const [themeError, setThemeError] = useState<string | null>(initializationResult.themeError);
   const [isProcessing, setIsProcessing] = useState<boolean>(false);
   const [embeddedShellFocused, setEmbeddedShellFocused] = useState(false);
 
@@ -187,8 +167,7 @@ export const AppContainer = (props: AppContainerProps) => {
     initializationResult.geminiMdFileCount,
   );
   const [shellModeActive, setShellModeActive] = useState(false);
-  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] =
-    useState<boolean>(false);
+  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = useState<boolean>(false);
   const [historyRemountKey, setHistoryRemountKey] = useState(0);
   const [updateInfo, setUpdateInfo] = useState<UpdateObject | null>(null);
   const [isTrustedFolder, setIsTrustedFolder] = useState<boolean | undefined>(
@@ -200,11 +179,9 @@ export const AppContainer = (props: AppContainerProps) => {
   const { addConfirmUpdateExtensionRequest, confirmUpdateExtensionRequests } =
     useConfirmUpdateRequests();
 
-  const { addSettingInputRequest, settingInputRequests } =
-    useSettingInputRequests();
+  const { addSettingInputRequest, settingInputRequests } = useSettingInputRequests();
 
-  const { addPluginChoiceRequest, pluginChoiceRequests } =
-    usePluginChoiceRequests();
+  const { addPluginChoiceRequest, pluginChoiceRequests } = usePluginChoiceRequests();
 
   extensionManager.setRequestConsent(
     requestConsentOrFail.bind(null, (description) =>
@@ -225,7 +202,7 @@ export const AppContainer = (props: AppContainerProps) => {
             resolve(pluginName);
           },
           onCancel: () => {
-            reject(new Error('Plugin selection cancelled'));
+            reject(new Error("Plugin selection cancelled"));
           },
         });
       }),
@@ -242,38 +219,28 @@ export const AppContainer = (props: AppContainerProps) => {
             resolve(value);
           },
           onCancel: () => {
-            reject(new Error('Setting input cancelled'));
+            reject(new Error("Setting input cancelled"));
           },
         });
       }),
   );
 
-  const {
-    extensionsUpdateState,
-    extensionsUpdateStateInternal,
-    dispatchExtensionStateUpdate,
-  } = useExtensionUpdates(
-    extensionManager,
+  const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate } =
+    useExtensionUpdates(extensionManager, historyManager.addItem, config.getWorkingDir());
+
+  const { codingPlanUpdateRequest, dismissCodingPlanUpdate } = useCodingPlanUpdates(
+    settings,
+    config,
     historyManager.addItem,
-    config.getWorkingDir(),
   );
 
-  const { codingPlanUpdateRequest, dismissCodingPlanUpdate } =
-    useCodingPlanUpdates(settings, config, historyManager.addItem);
-
   const [isTrustDialogOpen, setTrustDialogOpen] = useState(false);
   const openTrustDialog = useCallback(() => setTrustDialogOpen(true), []);
   const closeTrustDialog = useCallback(() => setTrustDialogOpen(false), []);
 
   const [isPermissionsDialogOpen, setPermissionsDialogOpen] = useState(false);
-  const openPermissionsDialog = useCallback(
-    () => setPermissionsDialogOpen(true),
-    [],
-  );
-  const closePermissionsDialog = useCallback(
-    () => setPermissionsDialogOpen(false),
-    [],
-  );
+  const openPermissionsDialog = useCallback(() => setPermissionsDialogOpen(true), []);
+  const closePermissionsDialog = useCallback(() => setPermissionsDialogOpen(false), []);
 
   // Helper to determine the current model (polled, since Config has no model-change event).
   const getCurrentModel = useCallback(() => config.getModel(), [config]);
@@ -295,9 +262,7 @@ export const AppContainer = (props: AppContainerProps) => {
   const branchName = useGitBranchName(config.getTargetDir());
   // Layout measurements
   const mainControlsRef = useRef<DOMElement>(null);
-  const originalTitleRef = useRef(
-    computeWindowTitle(basename(config.getTargetDir())),
-  );
+  const originalTitleRef = useRef(computeWindowTitle(basename(config.getTargetDir())));
   const lastTitleRef = useRef<string | null>(null);
   const staticExtraHeight = 3;
 
@@ -311,10 +276,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
       const resumedSessionData = config.getResumedSessionData();
       if (resumedSessionData) {
-        const historyItems = buildResumedHistoryItems(
-          resumedSessionData,
-          config,
-        );
+        const historyItems = buildResumedHistoryItems(resumedSessionData, config);
         historyManager.loadHistory(historyItems);
       }
 
@@ -329,29 +291,25 @@ export const AppContainer = (props: AppContainerProps) => {
         hookSystem
           .fireSessionStartEvent(
             sessionStartSource,
-            config.getModel() ?? '',
+            config.getModel() ?? "",
             String(config.getApprovalMode()) as PermissionMode,
           )
           .then(() => {
-            debugLogger.debug('SessionStart event completed successfully');
+            debugLogger.debug("SessionStart event completed successfully");
           })
           .catch((err) => {
             debugLogger.warn(`SessionStart hook failed: ${err}`);
           });
       } else {
-        debugLogger.debug(
-          'SessionStart: HookSystem not available, skipping event',
-        );
+        debugLogger.debug("SessionStart: HookSystem not available, skipping event");
       }
     })();
 
     // Register SessionEnd cleanup for process exit
     registerCleanup(async () => {
       try {
-        await config
-          .getHookSystem()
-          ?.fireSessionEndEvent(SessionEndReason.PromptInputExit);
-        debugLogger.debug('SessionEnd event completed successfully!!!');
+        await config.getHookSystem()?.fireSessionEndEvent(SessionEndReason.PromptInputExit);
+        debugLogger.debug("SessionEnd event completed successfully!!!");
       } catch (err) {
         debugLogger.error(`SessionEnd hook failed: ${err}`);
       }
@@ -386,8 +344,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
   // Derive widths for InputPrompt using shared helper
   const { inputWidth, suggestionsWidth } = useMemo(() => {
-    const { inputWidth, suggestionsWidth } =
-      calculatePromptWidths(terminalWidth);
+    const { inputWidth, suggestionsWidth } = calculatePromptWidths(terminalWidth);
     return { inputWidth, suggestionsWidth };
   }, [terminalWidth]);
   // Uniform width for bordered box components: accounts for margins and caps at 100
@@ -403,7 +360,7 @@ export const AppContainer = (props: AppContainerProps) => {
   }, []);
 
   const buffer = useTextBuffer({
-    initialText: '',
+    initialText: "",
     viewport: { height: 10, width: inputWidth },
     stdin,
     setRawMode,
@@ -416,17 +373,12 @@ export const AppContainer = (props: AppContainerProps) => {
       const pastMessagesRaw = (await logger?.getPreviousUserMessages()) || [];
       const currentSessionUserMessages = historyManager.history
         .filter(
-          (item): item is HistoryItem & { type: 'user'; text: string } =>
-            item.type === 'user' &&
-            typeof item.text === 'string' &&
-            item.text.trim() !== '',
+          (item): item is HistoryItem & { type: "user"; text: string } =>
+            item.type === "user" && typeof item.text === "string" && item.text.trim() !== "",
         )
         .map((item) => item.text)
         .reverse();
-      const combinedMessages = [
-        ...currentSessionUserMessages,
-        ...pastMessagesRaw,
-      ];
+      const combinedMessages = [...currentSessionUserMessages, ...pastMessagesRaw];
       const deduplicatedMessages: string[] = [];
       if (combinedMessages.length > 0) {
         deduplicatedMessages.push(combinedMessages[0]);
@@ -446,23 +398,16 @@ export const AppContainer = (props: AppContainerProps) => {
     setHistoryRemountKey((prev) => prev + 1);
   }, [setHistoryRemountKey, stdout]);
 
-  const {
-    isThemeDialogOpen,
-    openThemeDialog,
-    handleThemeSelect,
-    handleThemeHighlight,
-  } = useThemeCommand(
-    settings,
-    setThemeError,
-    historyManager.addItem,
-    initializationResult.themeError,
-  );
+  const { isThemeDialogOpen, openThemeDialog, handleThemeSelect, handleThemeHighlight } =
+    useThemeCommand(
+      settings,
+      setThemeError,
+      historyManager.addItem,
+      initializationResult.themeError,
+    );
 
-  const {
-    isApprovalModeDialogOpen,
-    openApprovalModeDialog,
-    handleApprovalModeSelect,
-  } = useApprovalModeCommand(settings, config);
+  const { isApprovalModeDialogOpen, openApprovalModeDialog, handleApprovalModeSelect } =
+    useApprovalModeCommand(settings, config);
 
   const {
     setAuthState,
@@ -501,7 +446,7 @@ export const AppContainer = (props: AppContainerProps) => {
     ) {
       onAuthError(
         t(
-          'Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.',
+          "Authentication is enforced to be {{enforcedType}}, but you are currently using {{currentType}}.",
           {
             enforcedType: String(settings.merged.security?.auth.enforcedType),
             currentType: String(currentAuthType),
@@ -526,57 +471,36 @@ export const AppContainer = (props: AppContainerProps) => {
   ]);
 
   const [editorError, setEditorError] = useState<string | null>(null);
-  const {
-    isEditorDialogOpen,
-    openEditorDialog,
-    handleEditorSelect,
-    exitEditorDialog,
-  } = useEditorSettings(settings, setEditorError, historyManager.addItem);
+  const { isEditorDialogOpen, openEditorDialog, handleEditorSelect, exitEditorDialog } =
+    useEditorSettings(settings, setEditorError, historyManager.addItem);
 
-  const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } =
-    useSettingsCommand();
+  const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
 
-  const {
-    isModelDialogOpen,
-    isFastModelMode,
-    openModelDialog,
-    closeModelDialog,
-  } = useModelCommand();
-  const { activeArenaDialog, openArenaDialog, closeArenaDialog } =
-    useArenaCommand();
+  const { isModelDialogOpen, isFastModelMode, openModelDialog, closeModelDialog } =
+    useModelCommand();
+  const { activeArenaDialog, openArenaDialog, closeArenaDialog } = useArenaCommand();
 
-  const {
-    isResumeDialogOpen,
-    openResumeDialog,
-    closeResumeDialog,
-    handleResume,
-  } = useResumeCommand({
-    config,
-    historyManager,
-    startNewSession,
-    remount: refreshStatic,
-  });
+  const { isResumeDialogOpen, openResumeDialog, closeResumeDialog, handleResume } =
+    useResumeCommand({
+      config,
+      historyManager,
+      startNewSession,
+      remount: refreshStatic,
+    });
 
   const { toggleVimEnabled } = useVimMode();
 
-  const {
-    isSubagentCreateDialogOpen,
-    openSubagentCreateDialog,
-    closeSubagentCreateDialog,
-  } = useSubagentCreateDialog();
-  const {
-    isAgentsManagerDialogOpen,
-    openAgentsManagerDialog,
-    closeAgentsManagerDialog,
-  } = useAgentsManagerDialog();
+  const { isSubagentCreateDialogOpen, openSubagentCreateDialog, closeSubagentCreateDialog } =
+    useSubagentCreateDialog();
+  const { isAgentsManagerDialogOpen, openAgentsManagerDialog, closeAgentsManagerDialog } =
+    useAgentsManagerDialog();
   const {
     isExtensionsManagerDialogOpen,
     openExtensionsManagerDialog,
     closeExtensionsManagerDialog,
   } = useExtensionsManagerDialog();
   const { isMcpDialogOpen, openMcpDialog, closeMcpDialog } = useMcpDialog();
-  const { isHooksDialogOpen, openHooksDialog, closeHooksDialog } =
-    useHooksDialog();
+  const { isHooksDialogOpen, openHooksDialog, closeHooksDialog } = useHooksDialog();
 
   const slashCommandActions = useMemo(
     () => ({
@@ -667,7 +591,7 @@ export const AppContainer = (props: AppContainerProps) => {
     historyManager.addItem(
       {
         type: MessageType.INFO,
-        text: 'Refreshing hierarchical memory (AIRISCODE.md or other context files)...',
+        text: "Refreshing hierarchical memory (AIRISCODE.md or other context files)...",
       },
       Date.now(),
     );
@@ -680,7 +604,7 @@ export const AppContainer = (props: AppContainerProps) => {
         config.getFileService(),
         config.getExtensionContextFilePaths(),
         config.isTrustedFolder(),
-        settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
+        settings.merged.context?.importFormat || "tree", // Use setting or default to 'tree'
       );
 
       config.setUserMemory(memoryContent);
@@ -693,16 +617,13 @@ export const AppContainer = (props: AppContainerProps) => {
           text: `Memory refreshed successfully. ${
             memoryContent.length > 0
               ? `Loaded ${memoryContent.length} characters from ${fileCount} file(s).`
-              : 'No memory content found.'
+              : "No memory content found."
           }`,
         },
         Date.now(),
       );
       debugLogger.debug(
-        `[DEBUG] Refreshed memory content in config: ${memoryContent.substring(
-          0,
-          200,
-        )}...`,
+        `[DEBUG] Refreshed memory content in config: ${memoryContent.substring(0, 200)}...`,
       );
     } catch (error) {
       const errorMessage = getErrorMessage(error);
@@ -713,7 +634,7 @@ export const AppContainer = (props: AppContainerProps) => {
         },
         Date.now(),
       );
-      debugLogger.error('Error refreshing memory:', error);
+      debugLogger.error("Error refreshing memory:", error);
     }
   }, [config, historyManager, settings.merged]);
 
@@ -779,20 +700,15 @@ export const AppContainer = (props: AppContainerProps) => {
     addItem: historyManager.addItem,
     onApprovalModeChange: handleApprovalModeChange,
     shouldBlockTab: () => hasSuggestionsVisible,
-    disabled: agentViewState.activeView !== 'main',
+    disabled: agentViewState.activeView !== "main",
   });
 
-  const {
-    messageQueue,
-    addMessage,
-    clearQueue,
-    getQueuedMessagesText,
-    drainQueue,
-  } = useMessageQueue({
-    isConfigInitialized,
-    streamingState,
-    submitQuery,
-  });
+  const { messageQueue, addMessage, clearQueue, getQueuedMessagesText, drainQueue } =
+    useMessageQueue({
+      isConfigInitialized,
+      streamingState,
+      submitQuery,
+    });
 
   // Bridge message queue to mid-turn drain via ref.
   // drainQueue reads from the synchronous queueRef inside useMessageQueue,
@@ -803,17 +719,14 @@ export const AppContainer = (props: AppContainerProps) => {
   const handleFinalSubmit = useCallback(
     (submittedValue: string) => {
       // Route to active in-process agent if viewing a sub-agent tab.
-      if (agentViewState.activeView !== 'main') {
+      if (agentViewState.activeView !== "main") {
         const agent = agentViewState.agents.get(agentViewState.activeView);
         if (agent) {
           agent.interactiveAgent.enqueueMessage(submittedValue.trim());
           return;
         }
       }
-      if (
-        streamingState === StreamingState.Responding &&
-        isBtwCommand(submittedValue)
-      ) {
+      if (streamingState === StreamingState.Responding && isBtwCommand(submittedValue)) {
         void submitQuery(submittedValue);
         return;
       }
@@ -821,9 +734,9 @@ export const AppContainer = (props: AppContainerProps) => {
       // Check if speculation has results for this submission
       const spec = speculationRef.current;
       if (
-        spec.status !== 'idle' &&
+        spec.status !== "idle" &&
         spec.suggestion === submittedValue &&
-        spec.status === 'completed'
+        spec.status === "completed"
       ) {
         // Accept completed speculation: inject messages and apply files
         acceptSpeculation(spec, geminiClient)
@@ -831,9 +744,8 @@ export const AppContainer = (props: AppContainerProps) => {
             logSpeculation(
               config,
               new SpeculationEvent({
-                outcome: 'accepted',
-                turns_used: spec.messages.filter((m) => m.role === 'model')
-                  .length,
+                outcome: "accepted",
+                turns_used: spec.messages.filter((m) => m.role === "model").length,
                 files_written: result.filesApplied.length,
                 tool_use_count: spec.toolUseCount,
                 duration_ms: Date.now() - spec.startTime,
@@ -848,61 +760,51 @@ export const AppContainer = (props: AppContainerProps) => {
               // Render each speculated message as the appropriate HistoryItem
               for (let mi = 0; mi < result.messages.length; mi++) {
                 const msg = result.messages[mi];
-                if (msg.role === 'user' && msg.parts) {
+                if (msg.role === "user" && msg.parts) {
                   // Check if this is a tool result (functionResponse) or user text
-                  const hasText = msg.parts.some(
-                    (p) => p.text && !p.functionResponse,
-                  );
+                  const hasText = msg.parts.some((p) => p.text && !p.functionResponse);
                   if (hasText) {
                     const text = msg.parts
-                      .map((p) => p.text ?? '')
+                      .map((p) => p.text ?? "")
                       .filter(Boolean)
-                      .join('');
+                      .join("");
                     if (text) {
-                      historyManager.addItem(
-                        { type: 'user' as const, text },
-                        now,
-                      );
+                      historyManager.addItem({ type: "user" as const, text }, now);
                     }
                   }
                   // functionResponse parts are rendered as part of the tool_group below
-                } else if (msg.role === 'model' && msg.parts) {
+                } else if (msg.role === "model" && msg.parts) {
                   // Extract text and tool calls separately
                   const textParts = msg.parts
                     .filter((p) => p.text && !p.functionCall)
                     .map((p) => p.text!)
-                    .join('');
+                    .join("");
                   const toolCalls = msg.parts.filter((p) => p.functionCall);
 
                   if (textParts) {
-                    historyManager.addItem(
-                      { type: 'gemini' as const, text: textParts },
-                      now,
-                    );
+                    historyManager.addItem({ type: "gemini" as const, text: textParts }, now);
                   }
 
                   if (toolCalls.length > 0) {
                     // Find matching tool results from the next message
                     const nextMsg = result.messages[mi + 1];
-                    const toolResults =
-                      nextMsg?.parts?.filter((p) => p.functionResponse) ?? [];
+                    const toolResults = nextMsg?.parts?.filter((p) => p.functionResponse) ?? [];
 
                     const tools = toolCalls.map((tc, i) => {
-                      const name = tc.functionCall?.name ?? 'unknown';
+                      const name = tc.functionCall?.name ?? "unknown";
                       const args = tc.functionCall?.args ?? {};
                       const resp = toolResults[i]?.functionResponse?.response;
                       const resultText =
-                        typeof resp === 'object' && resp
-                          ? ((resp as Record<string, unknown>)['output'] ??
-                            JSON.stringify(resp))
-                          : String(resp ?? '');
+                        typeof resp === "object" && resp
+                          ? ((resp as Record<string, unknown>)["output"] ?? JSON.stringify(resp))
+                          : String(resp ?? "");
                       return {
                         callId: `spec-${name}-${i}`,
                         name,
                         description:
                           Object.entries(args)
                             .map(([k, v]) => `${k}: ${String(v).slice(0, 80)}`)
-                            .join(', ') || name,
+                            .join(", ") || name,
                         resultDisplay: String(resultText).slice(0, 500),
                         status: ToolCallStatus.Success,
                         confirmationDetails: undefined,
@@ -910,7 +812,7 @@ export const AppContainer = (props: AppContainerProps) => {
                     });
 
                     const toolGroupItem: HistoryItemWithoutId = {
-                      type: 'tool_group' as const,
+                      type: "tool_group" as const,
                       tools,
                     };
                     historyManager.addItem(toolGroupItem, now);
@@ -931,27 +833,19 @@ export const AppContainer = (props: AppContainerProps) => {
       }
 
       // Abort any running speculation since we're submitting something different
-      if (spec.status === 'running') {
+      if (spec.status === "running") {
         abortSpeculation(spec).catch(() => {});
         speculationRef.current = IDLE_SPECULATION;
       }
 
       addMessage(submittedValue);
     },
-    [
-      addMessage,
-      agentViewState,
-      streamingState,
-      submitQuery,
-      config,
-      geminiClient,
-      historyManager,
-    ],
+    [addMessage, agentViewState, streamingState, submitQuery, config, geminiClient, historyManager],
   );
 
   const handleArenaModelsSelected = useCallback(
     (models: string[]) => {
-      const value = models.join(',');
+      const value = models.join(",");
       buffer.setText(`/arena start --models ${value} `);
       closeArenaDialog();
     },
@@ -973,17 +867,14 @@ export const AppContainer = (props: AppContainerProps) => {
   );
 
   cancelHandlerRef.current = useCallback(() => {
-    const pendingHistoryItems = [
-      ...pendingSlashCommandHistoryItems,
-      ...pendingGeminiHistoryItems,
-    ];
+    const pendingHistoryItems = [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems];
     if (isToolExecuting(pendingHistoryItems)) {
-      buffer.setText(''); // Just clear the prompt
+      buffer.setText(""); // Just clear the prompt
       return;
     }
 
     const lastUserMessage = userMessages.at(-1);
-    let textToSet = lastUserMessage || '';
+    let textToSet = lastUserMessage || "";
 
     const queuedText = getQueuedMessagesText();
     if (queuedText) {
@@ -1022,8 +913,7 @@ export const AppContainer = (props: AppContainerProps) => {
   const isInputActive =
     !initError &&
     !isProcessing &&
-    (streamingState === StreamingState.Idle ||
-      streamingState === StreamingState.Responding);
+    (streamingState === StreamingState.Idle || streamingState === StreamingState.Responding);
 
   const [controlsHeight, setControlsHeight] = useState(0);
 
@@ -1051,10 +941,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
   config.setShellExecutionConfig({
     terminalWidth: Math.floor(terminalWidth * SHELL_WIDTH_FRACTION),
-    terminalHeight: Math.max(
-      Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING),
-      1,
-    ),
+    terminalHeight: Math.max(Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING), 1),
     pager: settings.merged.tools?.shell?.pager,
     showColor: settings.merged.tools?.shell?.showColor,
   });
@@ -1095,7 +982,7 @@ export const AppContainer = (props: AppContainerProps) => {
       !isThemeDialogOpen &&
       !isEditorDialogOpen &&
       !showWelcomeBackDialog &&
-      welcomeBackChoice !== 'restart' &&
+      welcomeBackChoice !== "restart" &&
       geminiClient?.isInitialized?.()
     ) {
       handleFinalSubmit(initialPrompt);
@@ -1115,15 +1002,14 @@ export const AppContainer = (props: AppContainerProps) => {
   ]);
 
   // Generate prompt suggestions when streaming completes
-  const followupSuggestionsEnabled =
-    settings.merged.ui?.enableFollowupSuggestions === true;
+  const followupSuggestionsEnabled = settings.merged.ui?.enableFollowupSuggestions === true;
 
   useEffect(() => {
     // Clear suggestion when feature is disabled at runtime
     if (!followupSuggestionsEnabled) {
       suggestionAbortRef.current?.abort();
       setPromptSuggestion(null);
-      if (speculationRef.current.status === 'running') {
+      if (speculationRef.current.status === "running") {
         abortSpeculation(speculationRef.current).catch(() => {});
         speculationRef.current = IDLE_SPECULATION;
       }
@@ -1136,7 +1022,7 @@ export const AppContainer = (props: AppContainerProps) => {
     ) {
       suggestionAbortRef.current?.abort();
       setPromptSuggestion(null);
-      if (speculationRef.current.status !== 'idle') {
+      if (speculationRef.current.status !== "idle") {
         abortSpeculation(speculationRef.current).catch(() => {});
         speculationRef.current = IDLE_SPECULATION;
       }
@@ -1152,9 +1038,8 @@ export const AppContainer = (props: AppContainerProps) => {
       streamingState === StreamingState.Idle &&
       // Check both committed history and pending items for errors
       // (API errors go to pendingGeminiHistoryItems, not historyManager.history)
-      historyManager.history[historyManager.history.length - 1]?.type !==
-        'error' &&
-      !pendingGeminiHistoryItems.some((item) => item.type === 'error') &&
+      historyManager.history[historyManager.history.length - 1]?.type !== "error" &&
+      !pendingGeminiHistoryItems.some((item) => item.type === "error") &&
       !shellConfirmationRequest &&
       !confirmationRequest &&
       !loopDetectionConfirmationRequest &&
@@ -1167,8 +1052,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
       // Use curated history to avoid invalid/empty entries causing API errors
       const fullHistory = geminiClient.getChat().getHistory(true);
-      const conversationHistory =
-        fullHistory.length > 40 ? fullHistory.slice(-40) : fullHistory;
+      const conversationHistory = fullHistory.length > 40 ? fullHistory.slice(-40) : fullHistory;
       generatePromptSuggestion(config, conversationHistory, ac.signal, {
         enableCacheSharing: settings.merged.ui?.enableCacheSharing === true,
         model: settings.merged.fastModel || undefined,
@@ -1194,7 +1078,7 @@ export const AppContainer = (props: AppContainerProps) => {
             logPromptSuggestion(
               config,
               new PromptSuggestionEvent({
-                outcome: 'suppressed',
+                outcome: "suppressed",
                 reason: result.filterReason,
               }),
             );
@@ -1214,7 +1098,7 @@ export const AppContainer = (props: AppContainerProps) => {
     return () => {
       suggestionAbortRef.current?.abort();
       // Cleanup speculation on unmount (#21)
-      if (speculationRef.current.status !== 'idle') {
+      if (speculationRef.current.status !== "idle") {
         abortSpeculation(speculationRef.current).catch(() => {});
         speculationRef.current = IDLE_SPECULATION;
       }
@@ -1234,7 +1118,7 @@ export const AppContainer = (props: AppContainerProps) => {
   // user-initiated dismiss via typing/paste). InputPrompt calls onPromptSuggestionDismiss
   // on user input, which clears promptSuggestion, triggering this effect to abort speculation.
   useEffect(() => {
-    if (!promptSuggestion && speculationRef.current.status !== 'idle') {
+    if (!promptSuggestion && speculationRef.current.status !== "idle") {
       abortSpeculation(speculationRef.current).catch(() => {});
       speculationRef.current = IDLE_SPECULATION;
     }
@@ -1252,10 +1136,7 @@ export const AppContainer = (props: AppContainerProps) => {
     getIde();
   }, []);
   const shouldShowIdePrompt = Boolean(
-    currentIDE &&
-      !config.getIdeMode() &&
-      !settings.merged.ide?.hasSeenNudge &&
-      !idePromptAnswered,
+    currentIDE && !config.getIdeMode() && !settings.merged.ide?.hasSeenNudge && !idePromptAnswered,
   );
 
   // Command migration nudge
@@ -1265,15 +1146,10 @@ export const AppContainer = (props: AppContainerProps) => {
     setShowMigrationNudge: setShowCommandMigrationNudge,
   } = useCommandMigration(settings, config.storage);
 
-  const [showToolDescriptions, setShowToolDescriptions] =
-    useState<boolean>(false);
+  const [showToolDescriptions, setShowToolDescriptions] = useState<boolean>(false);
 
-  const [verboseMode, setVerboseMode] = useState<boolean>(
-    settings.merged.ui?.verboseMode ?? true,
-  );
-  const [frozenSnapshot, setFrozenSnapshot] = useState<
-    HistoryItemWithoutId[] | null
-  >(null);
+  const [verboseMode, setVerboseMode] = useState<boolean>(settings.merged.ui?.verboseMode ?? true);
+  const [frozenSnapshot, setFrozenSnapshot] = useState<HistoryItemWithoutId[] | null>(null);
 
   const [ctrlCPressedOnce, setCtrlCPressedOnce] = useState(false);
   const ctrlCTimerRef = useRef<NodeJS.Timeout | null>(null);
@@ -1283,9 +1159,7 @@ export const AppContainer = (props: AppContainerProps) => {
   const escapeTimerRef = useRef<NodeJS.Timeout | null>(null);
   const dialogsVisibleRef = useRef(false);
   const [constrainHeight, setConstrainHeight] = useState<boolean>(true);
-  const [ideContextState, setIdeContextState] = useState<
-    IdeContext | undefined
-  >();
+  const [ideContextState, setIdeContextState] = useState<IdeContext | undefined>();
   const [showEscapePrompt, setShowEscapePrompt] = useState(false);
   const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
 
@@ -1301,12 +1175,12 @@ export const AppContainer = (props: AppContainerProps) => {
     }
   }, [streamingState]);
 
-  const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } =
-    useFolderTrust(settings, setIsTrustedFolder);
-  const {
-    needsRestart: ideNeedsRestart,
-    restartReason: ideTrustRestartReason,
-  } = useIdeTrustListener();
+  const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(
+    settings,
+    setIsTrustedFolder,
+  );
+  const { needsRestart: ideNeedsRestart, restartReason: ideTrustRestartReason } =
+    useIdeTrustListener();
   const isInitialMount = useRef(true);
 
   useEffect(() => {
@@ -1343,16 +1217,16 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const handleIdePromptComplete = useCallback(
     (result: IdeIntegrationNudgeResult) => {
-      if (result.userSelection === 'yes') {
+      if (result.userSelection === "yes") {
         // Check whether the extension has been pre-installed
         if (result.isExtensionPreInstalled) {
-          handleSlashCommand('/ide enable');
+          handleSlashCommand("/ide enable");
         } else {
-          handleSlashCommand('/ide install');
+          handleSlashCommand("/ide install");
         }
-        settings.setValue(SettingScope.User, 'ide.hasSeenNudge', true);
-      } else if (result.userSelection === 'dismiss') {
-        settings.setValue(SettingScope.User, 'ide.hasSeenNudge', true);
+        settings.setValue(SettingScope.User, "ide.hasSeenNudge", true);
+      } else if (result.userSelection === "dismiss") {
+        settings.setValue(SettingScope.User, "ide.hasSeenNudge", true);
       }
       setIdePromptAnswered(true);
     },
@@ -1363,7 +1237,7 @@ export const AppContainer = (props: AppContainerProps) => {
     async (result: CommandMigrationNudgeResult) => {
       setShowCommandMigrationNudge(false);
 
-      if (result.userSelection === 'yes') {
+      if (result.userSelection === "yes") {
         // Perform migration for both workspace and user levels
         try {
           const results = [];
@@ -1375,11 +1249,8 @@ export const AppContainer = (props: AppContainerProps) => {
             createBackup: true,
             deleteOriginal: false,
           });
-          if (
-            workspaceResult.convertedFiles.length > 0 ||
-            workspaceResult.failedFiles.length > 0
-          ) {
-            results.push({ level: 'workspace', result: workspaceResult });
+          if (workspaceResult.convertedFiles.length > 0 || workspaceResult.failedFiles.length > 0) {
+            results.push({ level: "workspace", result: workspaceResult });
           }
 
           // Migrate user commands
@@ -1389,23 +1260,17 @@ export const AppContainer = (props: AppContainerProps) => {
             createBackup: true,
             deleteOriginal: false,
           });
-          if (
-            userResult.convertedFiles.length > 0 ||
-            userResult.failedFiles.length > 0
-          ) {
-            results.push({ level: 'user', result: userResult });
+          if (userResult.convertedFiles.length > 0 || userResult.failedFiles.length > 0) {
+            results.push({ level: "user", result: userResult });
           }
 
           // Report results
           for (const { level, result: migrationResult } of results) {
-            if (
-              migrationResult.success &&
-              migrationResult.convertedFiles.length > 0
-            ) {
+            if (migrationResult.success && migrationResult.convertedFiles.length > 0) {
               historyManager.addItem(
                 {
                   type: MessageType.INFO,
-                  text: `[${level}] Successfully migrated ${migrationResult.convertedFiles.length} command file${migrationResult.convertedFiles.length > 1 ? 's' : ''} to Markdown format. Original files backed up as .toml.backup`,
+                  text: `[${level}] Successfully migrated ${migrationResult.convertedFiles.length} command file${migrationResult.convertedFiles.length > 1 ? "s" : ""} to Markdown format. Original files backed up as .toml.backup`,
                 },
                 Date.now(),
               );
@@ -1415,7 +1280,7 @@ export const AppContainer = (props: AppContainerProps) => {
               historyManager.addItem(
                 {
                   type: MessageType.ERROR,
-                  text: `[${level}] Failed to migrate ${migrationResult.failedFiles.length} file${migrationResult.failedFiles.length > 1 ? 's' : ''}:\n${migrationResult.failedFiles.map((f) => `  • ${f.file}: ${f.error}`).join('\n')}`,
+                  text: `[${level}] Failed to migrate ${migrationResult.failedFiles.length} file${migrationResult.failedFiles.length > 1 ? "s" : ""}:\n${migrationResult.failedFiles.map((f) => `  • ${f.file}: ${f.error}`).join("\n")}`,
                 },
                 Date.now(),
               );
@@ -1426,7 +1291,7 @@ export const AppContainer = (props: AppContainerProps) => {
             historyManager.addItem(
               {
                 type: MessageType.INFO,
-                text: 'No TOML files found to migrate.',
+                text: "No TOML files found to migrate.",
               },
               Date.now(),
             );
@@ -1445,16 +1310,16 @@ export const AppContainer = (props: AppContainerProps) => {
     [historyManager, setShowCommandMigrationNudge, config.storage],
   );
 
-  const currentCandidatesTokens = Object.values(
-    sessionStats.metrics?.models ?? {},
-  ).reduce((acc, model) => acc + (model.tokens?.candidates ?? 0), 0);
+  const currentCandidatesTokens = Object.values(sessionStats.metrics?.models ?? {}).reduce(
+    (acc, model) => acc + (model.tokens?.candidates ?? 0),
+    0,
+  );
 
-  const { elapsedTime, currentLoadingPhrase, taskStartTokens } =
-    useLoadingIndicator(
-      streamingState,
-      settings.merged.ui?.customWittyPhrases,
-      currentCandidatesTokens,
-    );
+  const { elapsedTime, currentLoadingPhrase, taskStartTokens } = useLoadingIndicator(
+    streamingState,
+    settings.merged.ui?.customWittyPhrases,
+    currentCandidatesTokens,
+  );
 
   useAttentionNotifications({
     isFocused,
@@ -1496,7 +1361,7 @@ export const AppContainer = (props: AppContainerProps) => {
           clearTimeout(timerRef.current);
         }
         // Exit directly
-        handleSlashCommand('/quit');
+        handleSlashCommand("/quit");
         return;
       }
 
@@ -1535,7 +1400,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
       // 5. Clear input buffer (if has content)
       if (buffer.text.length > 0) {
-        buffer.setText('');
+        buffer.setText("");
         return; // Input cleared, end processing
       }
 
@@ -1561,7 +1426,7 @@ export const AppContainer = (props: AppContainerProps) => {
     (key: Key) => {
       // Debug log keystrokes if enabled
       if (settings.merged.general?.debugKeystrokeLogging) {
-        debugLogger.debug('[DEBUG] Keystroke:', JSON.stringify(key));
+        debugLogger.debug("[DEBUG] Keystroke:", JSON.stringify(key));
       }
 
       if (keyMatchers[Command.QUIT](key)) {
@@ -1609,7 +1474,7 @@ export const AppContainer = (props: AppContainerProps) => {
         if (buffer.text.length > 0) {
           if (escapePressedOnce) {
             // Second press: clear input, keep the flag to allow immediate cancel
-            buffer.setText('');
+            buffer.setText("");
             return;
           }
           // First press: set flag and show prompt
@@ -1649,7 +1514,7 @@ export const AppContainer = (props: AppContainerProps) => {
         !dialogsVisibleRef.current &&
         buffer.text.length === 0
       ) {
-        if (key.name === 'return' || key.sequence === ' ') {
+        if (key.name === "return" || key.sequence === " ") {
           setBtwItem(null);
           return;
         }
@@ -1670,18 +1535,15 @@ export const AppContainer = (props: AppContainerProps) => {
 
         const mcpServers = config.getMcpServers();
         if (Object.keys(mcpServers || {}).length > 0) {
-          handleSlashCommand(newValue ? '/mcp desc' : '/mcp nodesc');
+          handleSlashCommand(newValue ? "/mcp desc" : "/mcp nodesc");
         }
       } else if (
         keyMatchers[Command.TOGGLE_IDE_CONTEXT_DETAIL](key) &&
         config.getIdeMode() &&
         ideContextState
       ) {
-        handleSlashCommand('/ide status');
-      } else if (
-        keyMatchers[Command.SHOW_MORE_LINES](key) &&
-        !enteringConstrainHeightMode
-      ) {
+        handleSlashCommand("/ide status");
+      } else if (keyMatchers[Command.SHOW_MORE_LINES](key) && !enteringConstrainHeightMode) {
         setConstrainHeight(false);
       } else if (keyMatchers[Command.TOGGLE_SHELL_INPUT_FOCUS](key)) {
         if (activePtyId || embeddedShellFocused) {
@@ -1690,7 +1552,7 @@ export const AppContainer = (props: AppContainerProps) => {
       } else if (keyMatchers[Command.TOGGLE_VERBOSE_MODE](key)) {
         const newValue = !verboseMode;
         setVerboseMode(newValue);
-        void settings.setValue(SettingScope.User, 'ui.verboseMode', newValue);
+        void settings.setValue(SettingScope.User, "ui.verboseMode", newValue);
         refreshStatic();
         // Only freeze during the actual responding phase. WaitingForConfirmation
         // must keep focus so the user can approve/cancel tool confirmation UI.
@@ -1745,24 +1607,18 @@ export const AppContainer = (props: AppContainerProps) => {
   // Update terminal title with AIRIS Code status and thoughts
   useEffect(() => {
     // Respect both showStatusInTitle and hideWindowTitle settings
-    if (
-      !settings.merged.ui?.showStatusInTitle ||
-      settings.merged.ui?.hideWindowTitle
-    )
-      return;
+    if (!settings.merged.ui?.showStatusInTitle || settings.merged.ui?.hideWindowTitle) return;
 
     let title;
     if (streamingState === StreamingState.Idle) {
       title = originalTitleRef.current;
     } else {
-      const statusText = thought?.subject
-        ?.replace(/[\r\n]+/g, ' ')
-        .substring(0, 80);
+      const statusText = thought?.subject?.replace(/[\r\n]+/g, " ").substring(0, 80);
       title = statusText || originalTitleRef.current;
     }
 
     // Pad the title to a fixed width to prevent taskbar icon resizing.
-    const paddedTitle = title.padEnd(80, ' ');
+    const paddedTitle = title.padEnd(80, " ");
 
     // Only update the title if it's different from the last value we set
     if (lastTitleRef.current !== paddedTitle) {
@@ -1778,7 +1634,7 @@ export const AppContainer = (props: AppContainerProps) => {
     stdout,
   ]);
 
-  const nightly = props.version.includes('nightly');
+  const nightly = props.version.includes("nightly");
 
   const dialogsVisible =
     showWelcomeBackDialog ||
diff --git a/apps/airiscode-cli/src/ui/CommandFormatMigrationNudge.tsx b/apps/airiscode-cli/src/ui/CommandFormatMigrationNudge.tsx
index 5e1070e86..07ae913ae 100644
--- a/apps/airiscode-cli/src/ui/CommandFormatMigrationNudge.tsx
+++ b/apps/airiscode-cli/src/ui/CommandFormatMigrationNudge.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type { RadioSelectItem } from './components/shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './components/shared/RadioButtonSelect.js';
-import { useKeypress } from './hooks/useKeypress.js';
-import { theme } from './semantic-colors.js';
-import { t } from '../i18n/index.js';
+import { Box, Text } from "ink";
+import { t } from "../i18n/index.js";
+import type { RadioSelectItem } from "./components/shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./components/shared/RadioButtonSelect.js";
+import { useKeypress } from "./hooks/useKeypress.js";
+import { theme } from "./semantic-colors.js";
 
 export type CommandMigrationNudgeResult = {
-  userSelection: 'yes' | 'no';
+  userSelection: "yes" | "no";
 };
 
 interface CommandFormatMigrationNudgeProps {
@@ -26,9 +26,9 @@ export function CommandFormatMigrationNudge({
 }: CommandFormatMigrationNudgeProps) {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onComplete({
-          userSelection: 'no',
+          userSelection: "no",
         });
       }
     },
@@ -37,26 +37,26 @@ export function CommandFormatMigrationNudge({
 
   const OPTIONS: Array<RadioSelectItem<CommandMigrationNudgeResult>> = [
     {
-      label: t('Yes'),
+      label: t("Yes"),
       value: {
-        userSelection: 'yes',
+        userSelection: "yes",
       },
-      key: 'Yes',
+      key: "Yes",
     },
     {
-      label: t('No (esc)'),
+      label: t("No (esc)"),
       value: {
-        userSelection: 'no',
+        userSelection: "no",
       },
-      key: 'No (esc)',
+      key: "No (esc)",
     },
   ];
 
   const count = tomlFiles.length;
   const fileList =
     count <= 3
-      ? tomlFiles.map((f) => `  • ${f}`).join('\n')
-      : `  • ${tomlFiles.slice(0, 2).join('\n  • ')}\n  • ${t('... and {{count}} more', { count: String(count - 2) })}`;
+      ? tomlFiles.map((f) => `  • ${f}`).join("\n")
+      : `  • ${tomlFiles.slice(0, 2).join("\n  • ")}\n  • ${t("... and {{count}} more", { count: String(count - 2) })}`;
 
   return (
     <Box
@@ -69,23 +69,21 @@ export function CommandFormatMigrationNudge({
     >
       <Box marginBottom={1} flexDirection="column">
         <Text>
-          <Text color={theme.status.warning}>{'⚠️  '}</Text>
-          <Text bold>{t('Command Format Migration')}</Text>
+          <Text color={theme.status.warning}>{"⚠️  "}</Text>
+          <Text bold>{t("Command Format Migration")}</Text>
         </Text>
         <Text color={theme.text.secondary}>
           {count > 1
-            ? t('Found {{count}} TOML command files:', { count: String(count) })
-            : t('Found {{count}} TOML command file:', { count: String(count) })}
+            ? t("Found {{count}} TOML command files:", { count: String(count) })
+            : t("Found {{count}} TOML command file:", { count: String(count) })}
         </Text>
         <Text color={theme.text.secondary}>{fileList}</Text>
-        <Text>{''}</Text>
+        <Text>{""}</Text>
         <Text color={theme.text.secondary}>
-          {t(
-            'The TOML format is deprecated. Would you like to migrate them to Markdown format?',
-          )}
+          {t("The TOML format is deprecated. Would you like to migrate them to Markdown format?")}
         </Text>
         <Text color={theme.text.secondary}>
-          {t('(Backups will be created and original files will be preserved)')}
+          {t("(Backups will be created and original files will be preserved)")}
         </Text>
       </Box>
       <RadioButtonSelect items={OPTIONS} onSelect={onComplete} />
diff --git a/apps/airiscode-cli/src/ui/FeedbackDialog.tsx b/apps/airiscode-cli/src/ui/FeedbackDialog.tsx
index 6482e1592..19c7c9a49 100644
--- a/apps/airiscode-cli/src/ui/FeedbackDialog.tsx
+++ b/apps/airiscode-cli/src/ui/FeedbackDialog.tsx
@@ -1,9 +1,9 @@
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { t } from '../i18n/index.js';
-import { useUIActions } from './contexts/UIActionsContext.js';
-import { useUIState } from './contexts/UIStateContext.js';
-import { useKeypress } from './hooks/useKeypress.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../i18n/index.js";
+import { useUIActions } from "./contexts/UIActionsContext.js";
+import { useUIState } from "./contexts/UIStateContext.js";
+import { useKeypress } from "./hooks/useKeypress.js";
 
 export const FEEDBACK_OPTIONS = {
   GOOD: 1,
@@ -13,13 +13,13 @@ export const FEEDBACK_OPTIONS = {
 } as const;
 
 const FEEDBACK_OPTION_KEYS = {
-  [FEEDBACK_OPTIONS.GOOD]: '1',
-  [FEEDBACK_OPTIONS.BAD]: '2',
-  [FEEDBACK_OPTIONS.FINE]: '3',
-  [FEEDBACK_OPTIONS.DISMISS]: '0',
+  [FEEDBACK_OPTIONS.GOOD]: "1",
+  [FEEDBACK_OPTIONS.BAD]: "2",
+  [FEEDBACK_OPTIONS.FINE]: "3",
+  [FEEDBACK_OPTIONS.DISMISS]: "0",
 } as const;
 
-export const FEEDBACK_DIALOG_KEYS = ['1', '2', '3', '0'] as const;
+export const FEEDBACK_DIALOG_KEYS = ["1", "2", "3", "0"] as const;
 
 export const FeedbackDialog: React.FC = () => {
   const uiState = useUIState();
@@ -48,26 +48,20 @@ export const FeedbackDialog: React.FC = () => {
     <Box flexDirection="column" marginY={1}>
       <Box>
         <Text color="cyan">● </Text>
-        <Text bold>{t('How is Qwen doing this session? (optional)')}</Text>
+        <Text bold>{t("How is Qwen doing this session? (optional)")}</Text>
       </Box>
       <Box marginTop={1}>
-        <Text color="cyan">
-          {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]}:{' '}
-        </Text>
-        <Text>{t('Good')}</Text>
+        <Text color="cyan">{FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]}: </Text>
+        <Text>{t("Good")}</Text>
         <Text> </Text>
         <Text color="cyan">{FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]}: </Text>
-        <Text>{t('Bad')}</Text>
+        <Text>{t("Bad")}</Text>
         <Text> </Text>
-        <Text color="cyan">
-          {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.FINE]}:{' '}
-        </Text>
-        <Text>{t('Fine')}</Text>
+        <Text color="cyan">{FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.FINE]}: </Text>
+        <Text>{t("Fine")}</Text>
         <Text> </Text>
-        <Text color="cyan">
-          {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.DISMISS]}:{' '}
-        </Text>
-        <Text>{t('Dismiss')}</Text>
+        <Text color="cyan">{FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.DISMISS]}: </Text>
+        <Text>{t("Dismiss")}</Text>
         <Text> </Text>
       </Box>
     </Box>
diff --git a/apps/airiscode-cli/src/ui/IdeIntegrationNudge.tsx b/apps/airiscode-cli/src/ui/IdeIntegrationNudge.tsx
index 2d758fbea..1416a37f9 100644
--- a/apps/airiscode-cli/src/ui/IdeIntegrationNudge.tsx
+++ b/apps/airiscode-cli/src/ui/IdeIntegrationNudge.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { IdeInfo } from '@airiscode/core';
-import { Box, Text } from 'ink';
-import type { RadioSelectItem } from './components/shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './components/shared/RadioButtonSelect.js';
-import { useKeypress } from './hooks/useKeypress.js';
-import { theme } from './semantic-colors.js';
+import type { IdeInfo } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type { RadioSelectItem } from "./components/shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./components/shared/RadioButtonSelect.js";
+import { useKeypress } from "./hooks/useKeypress.js";
+import { theme } from "./semantic-colors.js";
 
 export type IdeIntegrationNudgeResult = {
-  userSelection: 'yes' | 'no' | 'dismiss';
+  userSelection: "yes" | "no" | "dismiss";
   isExtensionPreInstalled: boolean;
 };
 
@@ -21,15 +21,12 @@ interface IdeIntegrationNudgeProps {
   onComplete: (result: IdeIntegrationNudgeResult) => void;
 }
 
-export function IdeIntegrationNudge({
-  ide,
-  onComplete,
-}: IdeIntegrationNudgeProps) {
+export function IdeIntegrationNudge({ ide, onComplete }: IdeIntegrationNudgeProps) {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onComplete({
-          userSelection: 'no',
+          userSelection: "no",
           isExtensionPreInstalled: false,
         });
       }
@@ -38,33 +35,32 @@ export function IdeIntegrationNudge({
   );
 
   const { displayName: ideName } = ide;
-  const isInSandbox = !!process.env['SANDBOX'];
+  const isInSandbox = !!process.env["SANDBOX"];
   // Assume extension is already installed if the env variables are set.
   const isExtensionPreInstalled =
-    !!process.env['AIRISCODE_IDE_SERVER_PORT'] &&
-    !!process.env['AIRISCODE_IDE_WORKSPACE_PATH'];
+    !!process.env["AIRISCODE_IDE_SERVER_PORT"] && !!process.env["AIRISCODE_IDE_WORKSPACE_PATH"];
 
   const OPTIONS: Array<RadioSelectItem<IdeIntegrationNudgeResult>> = [
     {
-      label: 'Yes',
+      label: "Yes",
       value: {
-        userSelection: 'yes',
+        userSelection: "yes",
         isExtensionPreInstalled,
       },
-      key: 'Yes',
+      key: "Yes",
     },
     {
-      label: 'No (esc)',
+      label: "No (esc)",
       value: {
-        userSelection: 'no',
+        userSelection: "no",
         isExtensionPreInstalled,
       },
-      key: 'No (esc)',
+      key: "No (esc)",
     },
     {
       label: "No, don't ask again",
       value: {
-        userSelection: 'dismiss',
+        userSelection: "dismiss",
         isExtensionPreInstalled,
       },
       key: "No, don't ask again",
@@ -75,10 +71,10 @@ export function IdeIntegrationNudge({
     ? `Note: In sandbox environments, IDE integration requires manual setup on the host system. If you select Yes, you'll receive instructions on how to set this up.`
     : isExtensionPreInstalled
       ? `If you select Yes, the CLI will connect to your ${
-          ideName ?? 'editor'
+          ideName ?? "editor"
         } and have access to your open files and display diffs directly.`
       : `If you select Yes, we'll install an extension that allows the CLI to access your open files and display diffs directly in ${
-          ideName ?? 'your editor'
+          ideName ?? "your editor"
         }.`;
 
   return (
@@ -92,8 +88,8 @@ export function IdeIntegrationNudge({
     >
       <Box marginBottom={1} flexDirection="column">
         <Text>
-          <Text color={theme.status.warning}>{'> '}</Text>
-          {`Do you want to connect ${ideName ?? 'your editor'} to AIRIS Code?`}
+          <Text color={theme.status.warning}>{"> "}</Text>
+          {`Do you want to connect ${ideName ?? "your editor"} to AIRIS Code?`}
         </Text>
         <Text color={theme.text.secondary}>{installText}</Text>
       </Box>
diff --git a/apps/airiscode-cli/src/ui/auth/AuthDialog.tsx b/apps/airiscode-cli/src/ui/auth/AuthDialog.tsx
index b8fe44574..94528c799 100644
--- a/apps/airiscode-cli/src/ui/auth/AuthDialog.tsx
+++ b/apps/airiscode-cli/src/ui/auth/AuthDialog.tsx
@@ -4,71 +4,60 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState } from 'react';
-import { AuthType } from '@airiscode/core';
-import { Box, Text } from 'ink';
-import Link from 'ink-link';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { DescriptiveRadioButtonSelect } from '../components/shared/DescriptiveRadioButtonSelect.js';
-import { ApiKeyInput } from '../components/ApiKeyInput.js';
-import { TextInput } from '../components/shared/TextInput.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { t } from '../../i18n/index.js';
-import {
-  CodingPlanRegion,
-  isCodingPlanConfig,
-} from '../../constants/codingPlan.js';
+import { AuthType } from "@airiscode/core";
+import { Box, Text } from "ink";
+import Link from "ink-link";
+import type React from "react";
+import { useState } from "react";
 import {
   ALIBABA_STANDARD_API_KEY_ENDPOINTS,
   type AlibabaStandardRegion,
-} from '../../constants/alibabaStandardApiKey.js';
+} from "../../constants/alibabaStandardApiKey.js";
+import { CodingPlanRegion, isCodingPlanConfig } from "../../constants/codingPlan.js";
+import { t } from "../../i18n/index.js";
+import { ApiKeyInput } from "../components/ApiKeyInput.js";
+import { DescriptiveRadioButtonSelect } from "../components/shared/DescriptiveRadioButtonSelect.js";
+import { TextInput } from "../components/shared/TextInput.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 const MODEL_PROVIDERS_DOCUMENTATION_URL =
-  'https://qwenlm.github.io/airiscode-docs/en/users/configuration/model-providers/';
-
-function parseDefaultAuthType(
-  defaultAuthType: string | undefined,
-): AuthType | null {
-  if (
-    defaultAuthType &&
-    Object.values(AuthType).includes(defaultAuthType as AuthType)
-  ) {
+  "https://qwenlm.github.io/airiscode-docs/en/users/configuration/model-providers/";
+
+function parseDefaultAuthType(defaultAuthType: string | undefined): AuthType | null {
+  if (defaultAuthType && Object.values(AuthType).includes(defaultAuthType as AuthType)) {
     return defaultAuthType as AuthType;
   }
   return null;
 }
 
 // Main menu option type
-type MainOption = 'CODING_PLAN' | 'API_KEY';
-type ApiKeyOption = 'ALIBABA_STANDARD_API_KEY' | 'CUSTOM_API_KEY';
+type MainOption = "CODING_PLAN" | "API_KEY";
+type ApiKeyOption = "ALIBABA_STANDARD_API_KEY" | "CUSTOM_API_KEY";
 
 // View level for navigation
 type ViewLevel =
-  | 'main'
-  | 'region-select'
-  | 'api-key-input'
-  | 'api-key-type-select'
-  | 'alibaba-standard-region-select'
-  | 'alibaba-standard-api-key-input'
-  | 'alibaba-standard-model-id-input'
-  | 'custom-info';
-
-const ALIBABA_STANDARD_MODEL_IDS_PLACEHOLDER = 'qwen3.5-plus,glm-5,kimi-k2.5';
-const ALIBABA_STANDARD_API_DOCUMENTATION_URLS: Record<
-  AlibabaStandardRegion,
-  string
-> = {
-  'cn-beijing': 'https://bailian.console.aliyun.com/cn-beijing?tab=api#/api',
-  'sg-singapore':
-    'https://modelstudio.console.alibabacloud.com/ap-southeast-1?tab=api#/api/?type=model&url=2712195',
-  'us-virginia':
-    'https://modelstudio.console.alibabacloud.com/us-east-1?tab=api#/api/?type=model&url=2712195',
-  'cn-hongkong':
-    'https://modelstudio.console.alibabacloud.com/cn-hongkong?tab=api#/api/?type=model&url=2712195',
+  | "main"
+  | "region-select"
+  | "api-key-input"
+  | "api-key-type-select"
+  | "alibaba-standard-region-select"
+  | "alibaba-standard-api-key-input"
+  | "alibaba-standard-model-id-input"
+  | "custom-info";
+
+const ALIBABA_STANDARD_MODEL_IDS_PLACEHOLDER = "qwen3.5-plus,glm-5,kimi-k2.5";
+const ALIBABA_STANDARD_API_DOCUMENTATION_URLS: Record<AlibabaStandardRegion, string> = {
+  "cn-beijing": "https://bailian.console.aliyun.com/cn-beijing?tab=api#/api",
+  "sg-singapore":
+    "https://modelstudio.console.alibabacloud.com/ap-southeast-1?tab=api#/api/?type=model&url=2712195",
+  "us-virginia":
+    "https://modelstudio.console.alibabacloud.com/us-east-1?tab=api#/api/?type=model&url=2712195",
+  "cn-hongkong":
+    "https://modelstudio.console.alibabacloud.com/cn-hongkong?tab=api#/api/?type=model&url=2712195",
 };
 
 export function AuthDialog(): React.JSX.Element {
@@ -82,55 +71,48 @@ export function AuthDialog(): React.JSX.Element {
   const config = useConfig();
 
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [viewLevel, setViewLevel] = useState<ViewLevel>('main');
+  const [viewLevel, setViewLevel] = useState<ViewLevel>("main");
   const [regionIndex, setRegionIndex] = useState<number>(0);
-  const [region, setRegion] = useState<CodingPlanRegion>(
-    CodingPlanRegion.CHINA,
-  );
-  const [alibabaStandardRegionIndex, setAlibabaStandardRegionIndex] =
-    useState<number>(0);
+  const [region, setRegion] = useState<CodingPlanRegion>(CodingPlanRegion.CHINA);
+  const [alibabaStandardRegionIndex, setAlibabaStandardRegionIndex] = useState<number>(0);
   const [apiKeyTypeIndex, setApiKeyTypeIndex] = useState<number>(0);
   const [alibabaStandardRegion, setAlibabaStandardRegion] =
-    useState<AlibabaStandardRegion>('cn-beijing');
-  const [alibabaStandardApiKey, setAlibabaStandardApiKey] = useState('');
-  const [alibabaStandardApiKeyError, setAlibabaStandardApiKeyError] = useState<
-    string | null
-  >(null);
-  const [alibabaStandardModelId, setAlibabaStandardModelId] = useState('');
-  const [alibabaStandardModelIdError, setAlibabaStandardModelIdError] =
-    useState<string | null>(null);
+    useState<AlibabaStandardRegion>("cn-beijing");
+  const [alibabaStandardApiKey, setAlibabaStandardApiKey] = useState("");
+  const [alibabaStandardApiKeyError, setAlibabaStandardApiKeyError] = useState<string | null>(null);
+  const [alibabaStandardModelId, setAlibabaStandardModelId] = useState("");
+  const [alibabaStandardModelIdError, setAlibabaStandardModelIdError] = useState<string | null>(
+    null,
+  );
 
   // Main authentication entries (flat layout)
   const mainItems = [
     {
-      key: 'CODING_PLAN',
-      title: t('Alibaba Cloud Coding Plan'),
-      label: t('Alibaba Cloud Coding Plan'),
+      key: "CODING_PLAN",
+      title: t("Alibaba Cloud Coding Plan"),
+      label: t("Alibaba Cloud Coding Plan"),
       description: t(
-        'Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models',
+        "Paid \u00B7 Up to 6,000 requests/5 hrs \u00B7 All Alibaba Cloud Coding Plan Models",
       ),
-      value: 'CODING_PLAN' as MainOption,
+      value: "CODING_PLAN" as MainOption,
     },
     {
-      key: 'API_KEY',
-      title: t('API Key'),
-      label: t('API Key'),
-      description: t('Bring your own API key'),
-      value: 'API_KEY' as MainOption,
+      key: "API_KEY",
+      title: t("API Key"),
+      label: t("API Key"),
+      description: t("Bring your own API key"),
+      value: "API_KEY" as MainOption,
     },
   ];
 
   // Region selection entries (shown after selecting Alibaba Cloud Coding Plan)
   const regionItems = [
     {
-      key: 'china',
-      title: '阿里云百炼 (aliyun.com)',
-      label: '阿里云百炼 (aliyun.com)',
+      key: "china",
+      title: "阿里云百炼 (aliyun.com)",
+      label: "阿里云百炼 (aliyun.com)",
       description: (
-        <Link
-          url="https://help.aliyun.com/zh/model-studio/coding-plan"
-          fallback={false}
-        >
+        <Link url="https://help.aliyun.com/zh/model-studio/coding-plan" fallback={false}>
           <Text color={theme.text.secondary}>
             https://help.aliyun.com/zh/model-studio/coding-plan
           </Text>
@@ -139,14 +121,11 @@ export function AuthDialog(): React.JSX.Element {
       value: CodingPlanRegion.CHINA,
     },
     {
-      key: 'global',
-      title: 'Alibaba Cloud (alibabacloud.com)',
-      label: 'Alibaba Cloud (alibabacloud.com)',
+      key: "global",
+      title: "Alibaba Cloud (alibabacloud.com)",
+      label: "Alibaba Cloud (alibabacloud.com)",
       description: (
-        <Link
-          url="https://www.alibabacloud.com/help/en/model-studio/coding-plan"
-          fallback={false}
-        >
+        <Link url="https://www.alibabacloud.com/help/en/model-studio/coding-plan" fallback={false}>
           <Text color={theme.text.secondary}>
             https://www.alibabacloud.com/help/en/model-studio/coding-plan
           </Text>
@@ -158,67 +137,65 @@ export function AuthDialog(): React.JSX.Element {
 
   const alibabaStandardRegionItems = [
     {
-      key: 'cn-beijing',
-      title: t('China (Beijing)'),
-      label: t('China (Beijing)'),
+      key: "cn-beijing",
+      title: t("China (Beijing)"),
+      label: t("China (Beijing)"),
       description: (
         <Text color={theme.text.secondary}>
-          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS['cn-beijing']}
+          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS["cn-beijing"]}
         </Text>
       ),
-      value: 'cn-beijing' as AlibabaStandardRegion,
+      value: "cn-beijing" as AlibabaStandardRegion,
     },
     {
-      key: 'sg-singapore',
-      title: t('Singapore'),
-      label: t('Singapore'),
+      key: "sg-singapore",
+      title: t("Singapore"),
+      label: t("Singapore"),
       description: (
         <Text color={theme.text.secondary}>
-          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS['sg-singapore']}
+          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS["sg-singapore"]}
         </Text>
       ),
-      value: 'sg-singapore' as AlibabaStandardRegion,
+      value: "sg-singapore" as AlibabaStandardRegion,
     },
     {
-      key: 'us-virginia',
-      title: t('US (Virginia)'),
-      label: t('US (Virginia)'),
+      key: "us-virginia",
+      title: t("US (Virginia)"),
+      label: t("US (Virginia)"),
       description: (
         <Text color={theme.text.secondary}>
-          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS['us-virginia']}
+          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS["us-virginia"]}
         </Text>
       ),
-      value: 'us-virginia' as AlibabaStandardRegion,
+      value: "us-virginia" as AlibabaStandardRegion,
     },
     {
-      key: 'cn-hongkong',
-      title: t('China (Hong Kong)'),
-      label: t('China (Hong Kong)'),
+      key: "cn-hongkong",
+      title: t("China (Hong Kong)"),
+      label: t("China (Hong Kong)"),
       description: (
         <Text color={theme.text.secondary}>
-          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS['cn-hongkong']}
+          Endpoint: {ALIBABA_STANDARD_API_KEY_ENDPOINTS["cn-hongkong"]}
         </Text>
       ),
-      value: 'cn-hongkong' as AlibabaStandardRegion,
+      value: "cn-hongkong" as AlibabaStandardRegion,
     },
   ];
 
   const apiKeyTypeItems = [
     {
-      key: 'ALIBABA_STANDARD_API_KEY',
-      title: t('Alibaba Cloud ModelStudio Standard API Key'),
-      label: t('Alibaba Cloud ModelStudio Standard API Key'),
-      description: t('Quick setup for Model Studio (China/International)'),
-      value: 'ALIBABA_STANDARD_API_KEY' as ApiKeyOption,
+      key: "ALIBABA_STANDARD_API_KEY",
+      title: t("Alibaba Cloud ModelStudio Standard API Key"),
+      label: t("Alibaba Cloud ModelStudio Standard API Key"),
+      description: t("Quick setup for Model Studio (China/International)"),
+      value: "ALIBABA_STANDARD_API_KEY" as ApiKeyOption,
     },
     {
-      key: 'CUSTOM_API_KEY',
-      title: t('Custom API Key'),
-      label: t('Custom API Key'),
-      description: t(
-        'For other OpenAI / Anthropic / Gemini-compatible providers',
-      ),
-      value: 'CUSTOM_API_KEY' as ApiKeyOption,
+      key: "CUSTOM_API_KEY",
+      title: t("Custom API Key"),
+      label: t("Custom API Key"),
+      description: t("For other OpenAI / Anthropic / Gemini-compatible providers"),
+      value: "CUSTOM_API_KEY" as ApiKeyOption,
     },
   ];
 
@@ -228,15 +205,12 @@ export function AuthDialog(): React.JSX.Element {
   // - API_KEY for other OpenAI / Anthropic / Gemini-compatible configs
   const contentGenConfig = config.getContentGeneratorConfig();
   const isCurrentlyCodingPlan =
-    isCodingPlanConfig(
-      contentGenConfig?.baseUrl,
-      contentGenConfig?.apiKeyEnvKey,
-    ) !== false;
+    isCodingPlanConfig(contentGenConfig?.baseUrl, contentGenConfig?.apiKeyEnvKey) !== false;
   const authTypeToMainOption = (authType: AuthType): MainOption => {
     if (authType === AuthType.USE_OPENAI && isCurrentlyCodingPlan) {
-      return 'CODING_PLAN';
+      return "CODING_PLAN";
     }
-    return 'API_KEY';
+    return "API_KEY";
   };
 
   const initialAuthIndex = Math.max(
@@ -254,15 +228,13 @@ export function AuthDialog(): React.JSX.Element {
       }
 
       // Priority 3: QWEN_DEFAULT_AUTH_TYPE env var
-      const defaultAuthType = parseDefaultAuthType(
-        process.env['QWEN_DEFAULT_AUTH_TYPE'],
-      );
+      const defaultAuthType = parseDefaultAuthType(process.env["QWEN_DEFAULT_AUTH_TYPE"]);
       if (defaultAuthType) {
         return item.value === authTypeToMainOption(defaultAuthType);
       }
 
       // Priority 4: default to API_KEY
-      return item.value === 'API_KEY';
+      return item.value === "API_KEY";
     }),
   );
 
@@ -270,14 +242,14 @@ export function AuthDialog(): React.JSX.Element {
     setErrorMessage(null);
     onAuthError(null);
 
-    if (value === 'CODING_PLAN') {
+    if (value === "CODING_PLAN") {
       // Navigate to region selection
-      setViewLevel('region-select');
+      setViewLevel("region-select");
       return;
     }
 
-    if (value === 'API_KEY') {
-      setViewLevel('api-key-type-select');
+    if (value === "API_KEY") {
+      setViewLevel("api-key-type-select");
       return;
     }
   };
@@ -286,39 +258,37 @@ export function AuthDialog(): React.JSX.Element {
     setErrorMessage(null);
     onAuthError(null);
 
-    if (value === 'ALIBABA_STANDARD_API_KEY') {
+    if (value === "ALIBABA_STANDARD_API_KEY") {
       setAlibabaStandardModelIdError(null);
       setAlibabaStandardApiKeyError(null);
-      setViewLevel('alibaba-standard-region-select');
+      setViewLevel("alibaba-standard-region-select");
       return;
     }
 
-    setViewLevel('custom-info');
+    setViewLevel("custom-info");
   };
 
   const handleRegionSelect = async (selectedRegion: CodingPlanRegion) => {
     setErrorMessage(null);
     onAuthError(null);
     setRegion(selectedRegion);
-    setViewLevel('api-key-input');
+    setViewLevel("api-key-input");
   };
 
-  const handleAlibabaStandardRegionSelect = async (
-    selectedRegion: AlibabaStandardRegion,
-  ) => {
+  const handleAlibabaStandardRegionSelect = async (selectedRegion: AlibabaStandardRegion) => {
     setErrorMessage(null);
     onAuthError(null);
     setAlibabaStandardApiKeyError(null);
     setAlibabaStandardModelIdError(null);
     setAlibabaStandardRegion(selectedRegion);
-    setViewLevel('alibaba-standard-api-key-input');
+    setViewLevel("alibaba-standard-api-key-input");
   };
 
   const handleApiKeyInputSubmit = async (apiKey: string) => {
     setErrorMessage(null);
 
     if (!apiKey.trim()) {
-      setErrorMessage(t('API key cannot be empty.'));
+      setErrorMessage(t("API key cannot be empty."));
       return;
     }
 
@@ -329,7 +299,7 @@ export function AuthDialog(): React.JSX.Element {
   const handleAlibabaStandardApiKeySubmit = () => {
     const trimmedKey = alibabaStandardApiKey.trim();
     if (!trimmedKey) {
-      setAlibabaStandardApiKeyError(t('API key cannot be empty.'));
+      setAlibabaStandardApiKeyError(t("API key cannot be empty."));
       return;
     }
 
@@ -337,69 +307,65 @@ export function AuthDialog(): React.JSX.Element {
     if (!alibabaStandardModelId.trim()) {
       setAlibabaStandardModelId(ALIBABA_STANDARD_MODEL_IDS_PLACEHOLDER);
     }
-    setViewLevel('alibaba-standard-model-id-input');
+    setViewLevel("alibaba-standard-model-id-input");
   };
 
   const handleAlibabaStandardModelSubmit = () => {
     const trimmedApiKey = alibabaStandardApiKey.trim();
     const trimmedModelIds = alibabaStandardModelId.trim();
     if (!trimmedApiKey) {
-      setAlibabaStandardApiKeyError(t('API key cannot be empty.'));
-      setViewLevel('alibaba-standard-api-key-input');
+      setAlibabaStandardApiKeyError(t("API key cannot be empty."));
+      setViewLevel("alibaba-standard-api-key-input");
       return;
     }
     if (!trimmedModelIds) {
-      setAlibabaStandardModelIdError(t('Model IDs cannot be empty.'));
+      setAlibabaStandardModelIdError(t("Model IDs cannot be empty."));
       return;
     }
 
     setAlibabaStandardModelIdError(null);
-    void handleAlibabaStandardSubmit(
-      trimmedApiKey,
-      alibabaStandardRegion,
-      trimmedModelIds,
-    );
+    void handleAlibabaStandardSubmit(trimmedApiKey, alibabaStandardRegion, trimmedModelIds);
   };
 
   const handleGoBack = () => {
     setErrorMessage(null);
     onAuthError(null);
 
-    if (viewLevel === 'region-select') {
-      setViewLevel('main');
-    } else if (viewLevel === 'api-key-input') {
-      setViewLevel('region-select');
-    } else if (viewLevel === 'api-key-type-select') {
-      setViewLevel('main');
-    } else if (viewLevel === 'custom-info') {
-      setViewLevel('api-key-type-select');
-    } else if (viewLevel === 'alibaba-standard-region-select') {
-      setViewLevel('api-key-type-select');
-    } else if (viewLevel === 'alibaba-standard-api-key-input') {
-      setViewLevel('alibaba-standard-region-select');
-    } else if (viewLevel === 'alibaba-standard-model-id-input') {
-      setViewLevel('alibaba-standard-api-key-input');
+    if (viewLevel === "region-select") {
+      setViewLevel("main");
+    } else if (viewLevel === "api-key-input") {
+      setViewLevel("region-select");
+    } else if (viewLevel === "api-key-type-select") {
+      setViewLevel("main");
+    } else if (viewLevel === "custom-info") {
+      setViewLevel("api-key-type-select");
+    } else if (viewLevel === "alibaba-standard-region-select") {
+      setViewLevel("api-key-type-select");
+    } else if (viewLevel === "alibaba-standard-api-key-input") {
+      setViewLevel("alibaba-standard-region-select");
+    } else if (viewLevel === "alibaba-standard-model-id-input") {
+      setViewLevel("alibaba-standard-api-key-input");
     }
   };
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         // Handle Escape based on current view level
-        if (viewLevel === 'region-select') {
+        if (viewLevel === "region-select") {
           handleGoBack();
           return;
         }
 
-        if (viewLevel === 'api-key-input' || viewLevel === 'custom-info') {
+        if (viewLevel === "api-key-input" || viewLevel === "custom-info") {
           handleGoBack();
           return;
         }
         if (
-          viewLevel === 'api-key-type-select' ||
-          viewLevel === 'alibaba-standard-region-select' ||
-          viewLevel === 'alibaba-standard-api-key-input' ||
-          viewLevel === 'alibaba-standard-model-id-input'
+          viewLevel === "api-key-type-select" ||
+          viewLevel === "alibaba-standard-region-select" ||
+          viewLevel === "alibaba-standard-api-key-input" ||
+          viewLevel === "alibaba-standard-model-id-input"
         ) {
           handleGoBack();
           return;
@@ -411,9 +377,7 @@ export function AuthDialog(): React.JSX.Element {
         }
         if (config.getAuthType() === undefined) {
           setErrorMessage(
-            t(
-              'You must select an auth method to proceed. Press Ctrl+C again to exit.',
-            ),
+            t("You must select an auth method to proceed. Press Ctrl+C again to exit."),
           );
           return;
         }
@@ -442,7 +406,7 @@ export function AuthDialog(): React.JSX.Element {
     <>
       <Box marginTop={1}>
         <Text color={theme.text.primary}>
-          {t('Choose based on where your account is registered')}
+          {t("Choose based on where your account is registered")}
         </Text>
       </Box>
       <Box marginTop={1}>
@@ -459,7 +423,7 @@ export function AuthDialog(): React.JSX.Element {
       </Box>
       <Box marginTop={1}>
         <Text color={theme?.text?.secondary}>
-          {t('Enter to select, ↑↓ to navigate, Esc to go back')}
+          {t("Enter to select, ↑↓ to navigate, Esc to go back")}
         </Text>
       </Box>
     </>
@@ -468,11 +432,7 @@ export function AuthDialog(): React.JSX.Element {
   // Render API key input for coding-plan mode
   const renderApiKeyInputView = () => (
     <Box marginTop={1}>
-      <ApiKeyInput
-        onSubmit={handleApiKeyInputSubmit}
-        onCancel={handleGoBack}
-        region={region}
-      />
+      <ApiKeyInput onSubmit={handleApiKeyInputSubmit} onCancel={handleGoBack} region={region} />
     </Box>
   );
 
@@ -484,9 +444,7 @@ export function AuthDialog(): React.JSX.Element {
           initialIndex={apiKeyTypeIndex}
           onSelect={handleApiKeyTypeSelect}
           onHighlight={(value) => {
-            const index = apiKeyTypeItems.findIndex(
-              (item) => item.value === value,
-            );
+            const index = apiKeyTypeItems.findIndex((item) => item.value === value);
             setApiKeyTypeIndex(index);
           }}
           itemGap={1}
@@ -494,7 +452,7 @@ export function AuthDialog(): React.JSX.Element {
       </Box>
       <Box marginTop={1}>
         <Text color={theme?.text?.secondary}>
-          {t('Enter to select, ↑↓ to navigate, Esc to go back')}
+          {t("Enter to select, ↑↓ to navigate, Esc to go back")}
         </Text>
       </Box>
     </>
@@ -508,9 +466,7 @@ export function AuthDialog(): React.JSX.Element {
           initialIndex={alibabaStandardRegionIndex}
           onSelect={handleAlibabaStandardRegionSelect}
           onHighlight={(value) => {
-            const index = alibabaStandardRegionItems.findIndex(
-              (item) => item.value === value,
-            );
+            const index = alibabaStandardRegionItems.findIndex((item) => item.value === value);
             setAlibabaStandardRegionIndex(index);
           }}
           itemGap={1}
@@ -518,7 +474,7 @@ export function AuthDialog(): React.JSX.Element {
       </Box>
       <Box marginTop={1}>
         <Text color={theme?.text?.secondary}>
-          {t('Enter to select, ↑↓ to navigate, Esc to go back')}
+          {t("Enter to select, ↑↓ to navigate, Esc to go back")}
         </Text>
       </Box>
     </>
@@ -532,13 +488,10 @@ export function AuthDialog(): React.JSX.Element {
         </Text>
       </Box>
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>{t('Documentation')}:</Text>
+        <Text color={theme.text.secondary}>{t("Documentation")}:</Text>
       </Box>
       <Box marginTop={0}>
-        <Link
-          url={ALIBABA_STANDARD_API_DOCUMENTATION_URLS[alibabaStandardRegion]}
-          fallback={false}
-        >
+        <Link url={ALIBABA_STANDARD_API_DOCUMENTATION_URLS[alibabaStandardRegion]} fallback={false}>
           <Text color={theme.text.link}>
             {ALIBABA_STANDARD_API_DOCUMENTATION_URLS[alibabaStandardRegion]}
           </Text>
@@ -563,9 +516,7 @@ export function AuthDialog(): React.JSX.Element {
         </Box>
       )}
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          {t('Enter to submit, Esc to go back')}
-        </Text>
+        <Text color={theme.text.secondary}>{t("Enter to submit, Esc to go back")}</Text>
       </Box>
     </Box>
   );
@@ -575,7 +526,7 @@ export function AuthDialog(): React.JSX.Element {
       <Box marginTop={1}>
         <Text color={theme.text.secondary}>
           {t(
-            'You can enter multiple model IDs, separated by commas. Examples: qwen3.5-plus,glm-5,kimi-k2.5',
+            "You can enter multiple model IDs, separated by commas. Examples: qwen3.5-plus,glm-5,kimi-k2.5",
           )}
         </Text>
       </Box>
@@ -598,9 +549,7 @@ export function AuthDialog(): React.JSX.Element {
         </Box>
       )}
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          {t('Enter to submit, Esc to go back')}
-        </Text>
+        <Text color={theme.text.secondary}>{t("Enter to submit, Esc to go back")}</Text>
       </Box>
     </Box>
   );
@@ -610,47 +559,43 @@ export function AuthDialog(): React.JSX.Element {
     <>
       <Box marginTop={1}>
         <Text color={theme.text.primary}>
-          {t('You can configure your API key and models in settings.json')}
+          {t("You can configure your API key and models in settings.json")}
         </Text>
       </Box>
       <Box marginTop={1}>
-        <Text>{t('Refer to the documentation for setup instructions')}</Text>
+        <Text>{t("Refer to the documentation for setup instructions")}</Text>
       </Box>
       <Box marginTop={0}>
         <Link url={MODEL_PROVIDERS_DOCUMENTATION_URL} fallback={false}>
-          <Text color={theme.text.link}>
-            {MODEL_PROVIDERS_DOCUMENTATION_URL}
-          </Text>
+          <Text color={theme.text.link}>{MODEL_PROVIDERS_DOCUMENTATION_URL}</Text>
         </Link>
       </Box>
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>{t('Esc to go back')}</Text>
+        <Text color={theme.text.secondary}>{t("Esc to go back")}</Text>
       </Box>
     </>
   );
 
   const getViewTitle = () => {
     switch (viewLevel) {
-      case 'main':
-        return t('Select Authentication Method');
-      case 'region-select':
-        return t('Select Region for Coding Plan');
-      case 'api-key-input':
-        return t('Enter Coding Plan API Key');
-      case 'api-key-type-select':
-        return t('Select API Key Type');
-      case 'custom-info':
-        return t('Custom Configuration');
-      case 'alibaba-standard-region-select':
-        return t(
-          'Select Region for Alibaba Cloud ModelStudio Standard API Key',
-        );
-      case 'alibaba-standard-api-key-input':
-        return t('Enter Alibaba Cloud ModelStudio Standard API Key');
-      case 'alibaba-standard-model-id-input':
-        return t('Enter Model IDs');
+      case "main":
+        return t("Select Authentication Method");
+      case "region-select":
+        return t("Select Region for Coding Plan");
+      case "api-key-input":
+        return t("Enter Coding Plan API Key");
+      case "api-key-type-select":
+        return t("Select API Key Type");
+      case "custom-info":
+        return t("Custom Configuration");
+      case "alibaba-standard-region-select":
+        return t("Select Region for Alibaba Cloud ModelStudio Standard API Key");
+      case "alibaba-standard-api-key-input":
+        return t("Enter Alibaba Cloud ModelStudio Standard API Key");
+      case "alibaba-standard-model-id-input":
+        return t("Enter Model IDs");
       default:
-        return t('Select Authentication Method');
+        return t("Select Authentication Method");
     }
   };
 
@@ -664,17 +609,14 @@ export function AuthDialog(): React.JSX.Element {
     >
       <Text bold>{getViewTitle()}</Text>
 
-      {viewLevel === 'main' && renderMainView()}
-      {viewLevel === 'region-select' && renderRegionSelectView()}
-      {viewLevel === 'api-key-input' && renderApiKeyInputView()}
-      {viewLevel === 'api-key-type-select' && renderApiKeyTypeSelectView()}
-      {viewLevel === 'alibaba-standard-region-select' &&
-        renderAlibabaStandardRegionSelectView()}
-      {viewLevel === 'alibaba-standard-api-key-input' &&
-        renderAlibabaStandardApiKeyInputView()}
-      {viewLevel === 'alibaba-standard-model-id-input' &&
-        renderAlibabaStandardModelIdInputView()}
-      {viewLevel === 'custom-info' && renderCustomInfoView()}
+      {viewLevel === "main" && renderMainView()}
+      {viewLevel === "region-select" && renderRegionSelectView()}
+      {viewLevel === "api-key-input" && renderApiKeyInputView()}
+      {viewLevel === "api-key-type-select" && renderApiKeyTypeSelectView()}
+      {viewLevel === "alibaba-standard-region-select" && renderAlibabaStandardRegionSelectView()}
+      {viewLevel === "alibaba-standard-api-key-input" && renderAlibabaStandardApiKeyInputView()}
+      {viewLevel === "alibaba-standard-model-id-input" && renderAlibabaStandardModelIdInputView()}
+      {viewLevel === "custom-info" && renderCustomInfoView()}
 
       {(authError || errorMessage) && (
         <Box marginTop={1}>
@@ -682,7 +624,7 @@ export function AuthDialog(): React.JSX.Element {
         </Box>
       )}
 
-      {viewLevel === 'main' && (
+      {viewLevel === "main" && (
         <>
           {/* <Box marginTop={1}>
             <Text color={theme.text.secondary}>
@@ -690,12 +632,10 @@ export function AuthDialog(): React.JSX.Element {
             </Text>
           </Box> */}
           <Box marginY={1}>
-            <Text color={theme.border.default}>{'\u2500'.repeat(80)}</Text>
+            <Text color={theme.border.default}>{"\u2500".repeat(80)}</Text>
           </Box>
           <Box>
-            <Text color={theme.text.primary}>
-              {t('Terms of Services and Privacy Notice')}:
-            </Text>
+            <Text color={theme.text.primary}>{t("Terms of Services and Privacy Notice")}:</Text>
           </Box>
           <Box>
             <Link
diff --git a/apps/airiscode-cli/src/ui/auth/AuthInProgress.tsx b/apps/airiscode-cli/src/ui/auth/AuthInProgress.tsx
index 69a0eca3b..e8abb43ac 100644
--- a/apps/airiscode-cli/src/ui/auth/AuthInProgress.tsx
+++ b/apps/airiscode-cli/src/ui/auth/AuthInProgress.tsx
@@ -4,26 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import Spinner from 'ink-spinner';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { t } from '../../i18n/index.js';
+import { Box, Text } from "ink";
+import Spinner from "ink-spinner";
+import type React from "react";
+import { useEffect, useState } from "react";
+import { t } from "../../i18n/index.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 interface AuthInProgressProps {
   onTimeout: () => void;
 }
 
-export function AuthInProgress({
-  onTimeout,
-}: AuthInProgressProps): React.JSX.Element {
+export function AuthInProgress({ onTimeout }: AuthInProgressProps): React.JSX.Element {
   const [timedOut, setTimedOut] = useState(false);
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+      if (key.name === "escape" || (key.ctrl && key.name === "c")) {
         onTimeout();
       }
     },
@@ -48,14 +46,11 @@ export function AuthInProgress({
       width="100%"
     >
       {timedOut ? (
-        <Text color={theme.status.error}>
-          {t('Authentication timed out. Please try again.')}
-        </Text>
+        <Text color={theme.status.error}>{t("Authentication timed out. Please try again.")}</Text>
       ) : (
         <Box>
           <Text>
-            <Spinner type="dots" />{' '}
-            {t('Waiting for auth... (Press ESC or CTRL+C to cancel)')}
+            <Spinner type="dots" /> {t("Waiting for auth... (Press ESC or CTRL+C to cancel)")}
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/auth/useAuth.ts b/apps/airiscode-cli/src/ui/auth/useAuth.ts
index ee42463c1..b2d77534b 100644
--- a/apps/airiscode-cli/src/ui/auth/useAuth.ts
+++ b/apps/airiscode-cli/src/ui/auth/useAuth.ts
@@ -9,45 +9,41 @@ import type {
   ContentGeneratorConfig,
   ModelProvidersConfig,
   ProviderModelConfig,
-} from '@airiscode/core';
-import {
-  AuthEvent,
-  AuthType,
-  getErrorMessage,
-  logAuth,
-} from '@airiscode/core';
-import { useCallback, useEffect, useState } from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
-import { getPersistScopeForModelSelection } from '../../config/modelProvidersScope.js';
+} from "@airiscode/core";
+import { AuthEvent, AuthType, getErrorMessage, logAuth } from "@airiscode/core";
+import { useCallback, useEffect, useState } from "react";
+import { getPersistScopeForModelSelection } from "../../config/modelProvidersScope.js";
+import type { LoadedSettings } from "../../config/settings.js";
 // OpenAICredentials type (previously imported from OpenAIKeyPrompt)
 export interface OpenAICredentials {
   apiKey: string;
   baseUrl?: string;
   model?: string;
 }
-import { AuthState, MessageType } from '../types.js';
-import type { HistoryItem } from '../types.js';
-import { t } from '../../i18n/index.js';
-import {
-  getCodingPlanConfig,
-  isCodingPlanConfig,
-  CodingPlanRegion,
-  CODING_PLAN_ENV_KEY,
-} from '../../constants/codingPlan.js';
-import { backupSettingsFile } from '../../utils/settingsUtils.js';
+
 import {
   ALIBABA_STANDARD_API_KEY_ENDPOINTS,
-  DASHSCOPE_STANDARD_API_KEY_ENV_KEY,
   type AlibabaStandardRegion,
-} from '../../constants/alibabaStandardApiKey.js';
+  DASHSCOPE_STANDARD_API_KEY_ENV_KEY,
+} from "../../constants/alibabaStandardApiKey.js";
+import {
+  CODING_PLAN_ENV_KEY,
+  CodingPlanRegion,
+  getCodingPlanConfig,
+  isCodingPlanConfig,
+} from "../../constants/codingPlan.js";
+import { t } from "../../i18n/index.js";
+import { backupSettingsFile } from "../../utils/settingsUtils.js";
+import type { HistoryItem } from "../types.js";
+import { AuthState, MessageType } from "../types.js";
 
 // Qwen OAuth removed - keep type alias for downstream compatibility
-export type QwenAuthState = 'idle' | 'authenticating' | 'authenticated' | 'error';
+export type QwenAuthState = "idle" | "authenticating" | "authenticated" | "error";
 
 export const useAuthCommand = (
   settings: LoadedSettings,
   config: Config,
-  addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void,
+  addItem: (item: Omit<HistoryItem, "id">, timestamp: number) => void,
   onAuthChange?: () => void,
 ) => {
   const unAuthenticated = config.getAuthType() === undefined;
@@ -60,12 +56,10 @@ export const useAuthCommand = (
 
   const [isAuthenticating, setIsAuthenticating] = useState(false);
   const [isAuthDialogOpen, setIsAuthDialogOpen] = useState(unAuthenticated);
-  const [pendingAuthType, setPendingAuthType] = useState<AuthType | undefined>(
-    undefined,
-  );
+  const [pendingAuthType, setPendingAuthType] = useState<AuthType | undefined>(undefined);
 
   // Qwen OAuth removed - stub state value
-  const qwenAuthState: QwenAuthState = 'idle';
+  const qwenAuthState: QwenAuthState = "idle";
 
   const onAuthError = useCallback(
     (error: string | null) => {
@@ -81,19 +75,14 @@ export const useAuthCommand = (
   const handleAuthFailure = useCallback(
     (error: unknown) => {
       setIsAuthenticating(false);
-      const errorMessage = t('Failed to authenticate. Message: {{message}}', {
+      const errorMessage = t("Failed to authenticate. Message: {{message}}", {
         message: getErrorMessage(error),
       });
       onAuthError(errorMessage);
 
       // Log authentication failure
       if (pendingAuthType) {
-        const authEvent = new AuthEvent(
-          pendingAuthType,
-          'manual',
-          'error',
-          errorMessage,
-        );
+        const authEvent = new AuthEvent(pendingAuthType, "manual", "error", errorMessage);
         logAuth(config, authEvent);
       }
     },
@@ -106,39 +95,23 @@ export const useAuthCommand = (
         const authTypeScope = getPersistScopeForModelSelection(settings);
 
         // Persist authType
-        settings.setValue(
-          authTypeScope,
-          'security.auth.selectedType',
-          authType,
-        );
+        settings.setValue(authTypeScope, "security.auth.selectedType", authType);
 
         // Persist model from ContentGenerator config (handles fallback cases)
         // This ensures that when syncAfterAuthRefresh falls back to default model,
         // it gets persisted to settings.json
         const contentGeneratorConfig = config.getContentGeneratorConfig();
         if (contentGeneratorConfig?.model) {
-          settings.setValue(
-            authTypeScope,
-            'model.name',
-            contentGeneratorConfig.model,
-          );
+          settings.setValue(authTypeScope, "model.name", contentGeneratorConfig.model);
         }
 
         // Persist credentials when provided
         if (credentials) {
           if (credentials?.apiKey != null) {
-            settings.setValue(
-              authTypeScope,
-              'security.auth.apiKey',
-              credentials.apiKey,
-            );
+            settings.setValue(authTypeScope, "security.auth.apiKey", credentials.apiKey);
           }
           if (credentials?.baseUrl != null) {
-            settings.setValue(
-              authTypeScope,
-              'security.auth.baseUrl',
-              credentials.baseUrl,
-            );
+            settings.setValue(authTypeScope, "security.auth.baseUrl", credentials.baseUrl);
           }
         }
       } catch (error) {
@@ -159,7 +132,7 @@ export const useAuthCommand = (
       addItem(
         {
           type: MessageType.INFO,
-          text: t('Authenticated successfully with {{authType}} credentials.', {
+          text: t("Authenticated successfully with {{authType}} credentials.", {
             authType,
           }),
         },
@@ -167,7 +140,7 @@ export const useAuthCommand = (
       );
 
       // Log authentication success
-      const authEvent = new AuthEvent(authType, 'manual', 'success');
+      const authEvent = new AuthEvent(authType, "manual", "success");
       logAuth(config, authEvent);
     },
     [settings, handleAuthFailure, config, addItem, onAuthChange],
@@ -191,9 +164,7 @@ export const useAuthCommand = (
         return false;
       }
 
-      const modelProviders = settings.merged.modelProviders as
-        | ModelProvidersConfig
-        | undefined;
+      const modelProviders = settings.merged.modelProviders as ModelProvidersConfig | undefined;
       if (!modelProviders) {
         return false;
       }
@@ -201,9 +172,7 @@ export const useAuthCommand = (
       if (!Array.isArray(providerModels)) {
         return false;
       }
-      return providerModels.some(
-        (providerModel) => providerModel.id === modelId,
-      );
+      return providerModels.some((providerModel) => providerModel.id === modelId);
     },
     [settings],
   );
@@ -240,8 +209,9 @@ export const useAuthCommand = (
           // Pass settings.model.generationConfig to updateCredentials so it can be merged
           // after clearing provider-sourced config. This ensures settings.json generationConfig
           // fields (e.g., samplingParams, timeout) are preserved.
-          const settingsGenerationConfig = settings.merged.model
-            ?.generationConfig as Partial<ContentGeneratorConfig> | undefined;
+          const settingsGenerationConfig = settings.merged.model?.generationConfig as
+            | Partial<ContentGeneratorConfig>
+            | undefined;
           config.updateCredentials(
             {
               apiKey: credentials.apiKey,
@@ -273,7 +243,7 @@ export const useAuthCommand = (
   const cancelAuthentication = useCallback(() => {
     // Log authentication cancellation
     if (isAuthenticating && pendingAuthType) {
-      const authEvent = new AuthEvent(pendingAuthType, 'manual', 'cancelled');
+      const authEvent = new AuthEvent(pendingAuthType, "manual", "cancelled");
       logAuth(config, authEvent);
     }
 
@@ -289,10 +259,7 @@ export const useAuthCommand = (
    * @param region - The region to use (default: CHINA)
    */
   const handleCodingPlanSubmit = useCallback(
-    async (
-      apiKey: string,
-      region: CodingPlanRegion = CodingPlanRegion.CHINA,
-    ) => {
+    async (apiKey: string, region: CodingPlanRegion = CodingPlanRegion.CHINA) => {
       try {
         setIsAuthenticating(true);
         setAuthError(null);
@@ -314,18 +281,16 @@ export const useAuthCommand = (
         process.env[CODING_PLAN_ENV_KEY] = apiKey;
 
         // Generate model configs from template
-        const newConfigs: ProviderModelConfig[] = template.map(
-          (templateConfig) => ({
-            ...templateConfig,
-            envKey: CODING_PLAN_ENV_KEY,
-          }),
-        );
+        const newConfigs: ProviderModelConfig[] = template.map((templateConfig) => ({
+          ...templateConfig,
+          envKey: CODING_PLAN_ENV_KEY,
+        }));
 
         // Get existing configs
         const existingConfigs =
-          (
-            settings.merged.modelProviders as ModelProvidersConfig | undefined
-          )?.[AuthType.USE_OPENAI] || [];
+          (settings.merged.modelProviders as ModelProvidersConfig | undefined)?.[
+            AuthType.USE_OPENAI
+          ] || [];
 
         // Filter out all existing Coding Plan configs (mutually exclusive)
         const nonCodingPlanConfigs = existingConfigs.filter(
@@ -336,36 +301,26 @@ export const useAuthCommand = (
         const updatedConfigs = [...newConfigs, ...nonCodingPlanConfigs];
 
         // Persist to modelProviders
-        settings.setValue(
-          persistScope,
-          `modelProviders.${AuthType.USE_OPENAI}`,
-          updatedConfigs,
-        );
+        settings.setValue(persistScope, `modelProviders.${AuthType.USE_OPENAI}`, updatedConfigs);
 
         // Also persist authType
-        settings.setValue(
-          persistScope,
-          'security.auth.selectedType',
-          AuthType.USE_OPENAI,
-        );
+        settings.setValue(persistScope, "security.auth.selectedType", AuthType.USE_OPENAI);
 
         // Persist coding plan region
-        settings.setValue(persistScope, 'codingPlan.region', region);
+        settings.setValue(persistScope, "codingPlan.region", region);
 
         // Persist coding plan version (single field for backward compatibility)
-        settings.setValue(persistScope, 'codingPlan.version', version);
+        settings.setValue(persistScope, "codingPlan.version", version);
 
         // If there are configs, use the first one as the model
         if (updatedConfigs.length > 0 && updatedConfigs[0]?.id) {
-          settings.setValue(persistScope, 'model.name', updatedConfigs[0].id);
+          settings.setValue(persistScope, "model.name", updatedConfigs[0].id);
         }
 
         // Hot-reload model providers configuration before refreshAuth
         // This ensures ModelsConfig has the latest configuration from settings.json
         const updatedModelProviders: ModelProvidersConfig = {
-          ...(settings.merged.modelProviders as
-            | ModelProvidersConfig
-            | undefined),
+          ...(settings.merged.modelProviders as ModelProvidersConfig | undefined),
           [AuthType.USE_OPENAI]: updatedConfigs,
         };
         config.reloadModelProvidersConfig(updatedModelProviders);
@@ -387,8 +342,8 @@ export const useAuthCommand = (
           {
             type: MessageType.INFO,
             text: t(
-              'Authenticated successfully with {{region}}. API key and model configs saved to settings.json.',
-              { region: t('Alibaba Cloud Coding Plan') },
+              "Authenticated successfully with {{region}}. API key and model configs saved to settings.json.",
+              { region: t("Alibaba Cloud Coding Plan") },
             ),
           },
           Date.now(),
@@ -398,19 +353,13 @@ export const useAuthCommand = (
         addItem(
           {
             type: MessageType.INFO,
-            text: t(
-              'Tip: Use /model to switch between available Coding Plan models.',
-            ),
+            text: t("Tip: Use /model to switch between available Coding Plan models."),
           },
           Date.now(),
         );
 
         // Log success
-        const authEvent = new AuthEvent(
-          AuthType.USE_OPENAI,
-          'coding-plan',
-          'success',
-        );
+        const authEvent = new AuthEvent(AuthType.USE_OPENAI, "coding-plan", "success");
         logAuth(config, authEvent);
       } catch (error) {
         handleAuthFailure(error);
@@ -424,27 +373,21 @@ export const useAuthCommand = (
    * Persists key to env.DASHSCOPE_API_KEY and creates a modelProviders.openai entry.
    */
   const handleAlibabaStandardSubmit = useCallback(
-    async (
-      apiKey: string,
-      region: AlibabaStandardRegion,
-      modelIdsInput: string,
-    ) => {
+    async (apiKey: string, region: AlibabaStandardRegion, modelIdsInput: string) => {
       try {
         setIsAuthenticating(true);
         setAuthError(null);
 
         const trimmedApiKey = apiKey.trim();
         const modelIds = modelIdsInput
-          .split(',')
+          .split(",")
           .map((id) => id.trim())
-          .filter(
-            (id, index, array) => id.length > 0 && array.indexOf(id) === index,
-          );
+          .filter((id, index, array) => id.length > 0 && array.indexOf(id) === index);
         if (!trimmedApiKey) {
-          throw new Error(t('API key cannot be empty.'));
+          throw new Error(t("API key cannot be empty."));
         }
         if (modelIds.length === 0) {
-          throw new Error(t('Model IDs cannot be empty.'));
+          throw new Error(t("Model IDs cannot be empty."));
         }
 
         const baseUrl = ALIBABA_STANDARD_API_KEY_ENDPOINTS[region];
@@ -453,11 +396,7 @@ export const useAuthCommand = (
         const settingsFile = settings.forScope(persistScope);
         backupSettingsFile(settingsFile.path);
 
-        settings.setValue(
-          persistScope,
-          `env.${DASHSCOPE_STANDARD_API_KEY_ENV_KEY}`,
-          trimmedApiKey,
-        );
+        settings.setValue(persistScope, `env.${DASHSCOPE_STANDARD_API_KEY_ENV_KEY}`, trimmedApiKey);
         process.env[DASHSCOPE_STANDARD_API_KEY_ENV_KEY] = trimmedApiKey;
 
         const newConfigs: ProviderModelConfig[] = modelIds.map((modelId) => ({
@@ -468,39 +407,27 @@ export const useAuthCommand = (
         }));
 
         const existingConfigs =
-          (
-            settings.merged.modelProviders as ModelProvidersConfig | undefined
-          )?.[AuthType.USE_OPENAI] || [];
+          (settings.merged.modelProviders as ModelProvidersConfig | undefined)?.[
+            AuthType.USE_OPENAI
+          ] || [];
 
         const nonAlibabaStandardConfigs = existingConfigs.filter(
           (existing) =>
             !(
               existing.envKey === DASHSCOPE_STANDARD_API_KEY_ENV_KEY &&
-              typeof existing.baseUrl === 'string' &&
-              Object.values(ALIBABA_STANDARD_API_KEY_ENDPOINTS).includes(
-                existing.baseUrl,
-              )
+              typeof existing.baseUrl === "string" &&
+              Object.values(ALIBABA_STANDARD_API_KEY_ENDPOINTS).includes(existing.baseUrl)
             ),
         );
 
         const updatedConfigs = [...newConfigs, ...nonAlibabaStandardConfigs];
 
-        settings.setValue(
-          persistScope,
-          `modelProviders.${AuthType.USE_OPENAI}`,
-          updatedConfigs,
-        );
-        settings.setValue(
-          persistScope,
-          'security.auth.selectedType',
-          AuthType.USE_OPENAI,
-        );
-        settings.setValue(persistScope, 'model.name', modelIds[0]);
+        settings.setValue(persistScope, `modelProviders.${AuthType.USE_OPENAI}`, updatedConfigs);
+        settings.setValue(persistScope, "security.auth.selectedType", AuthType.USE_OPENAI);
+        settings.setValue(persistScope, "model.name", modelIds[0]);
 
         const updatedModelProviders: ModelProvidersConfig = {
-          ...(settings.merged.modelProviders as
-            | ModelProvidersConfig
-            | undefined),
+          ...(settings.merged.modelProviders as ModelProvidersConfig | undefined),
           [AuthType.USE_OPENAI]: updatedConfigs,
         };
         config.reloadModelProvidersConfig(updatedModelProviders);
@@ -517,7 +444,7 @@ export const useAuthCommand = (
           {
             type: MessageType.INFO,
             text: t(
-              'Alibaba Cloud ModelStudio Standard API Key successfully entered. Settings updated with env.DASHSCOPE_API_KEY and {{modelCount}} model(s).',
+              "Alibaba Cloud ModelStudio Standard API Key successfully entered. Settings updated with env.DASHSCOPE_API_KEY and {{modelCount}} model(s).",
               { modelCount: String(modelIds.length) },
             ),
           },
@@ -528,17 +455,13 @@ export const useAuthCommand = (
           {
             type: MessageType.INFO,
             text: t(
-              'You can use /model to see new ModelStudio Standard models and switch between them.',
+              "You can use /model to see new ModelStudio Standard models and switch between them.",
             ),
           },
           Date.now(),
         );
 
-        const authEvent = new AuthEvent(
-          AuthType.USE_OPENAI,
-          'manual',
-          'success',
-        );
+        const authEvent = new AuthEvent(AuthType.USE_OPENAI, "manual", "success");
         logAuth(config, authEvent);
       } catch (error) {
         handleAuthFailure(error);
@@ -558,27 +481,20 @@ export const useAuthCommand = (
     * or broken authentication cycles.
     */
   useEffect(() => {
-    const defaultAuthType = process.env['QWEN_DEFAULT_AUTH_TYPE'];
+    const defaultAuthType = process.env["QWEN_DEFAULT_AUTH_TYPE"];
     if (
       defaultAuthType &&
-      ![
-        AuthType.USE_OPENAI,
-        AuthType.USE_ANTHROPIC,
-        AuthType.USE_OLLAMA,
-      ].includes(defaultAuthType as AuthType)
+      ![AuthType.USE_OPENAI, AuthType.USE_ANTHROPIC, AuthType.USE_OLLAMA].includes(
+        defaultAuthType as AuthType,
+      )
     ) {
       onAuthError(
-        t(
-          'Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}',
-          {
-            value: defaultAuthType,
-            validValues: [
-              AuthType.USE_OPENAI,
-              AuthType.USE_ANTHROPIC,
-              AuthType.USE_OLLAMA,
-            ].join(', '),
-          },
-        ),
+        t('Invalid QWEN_DEFAULT_AUTH_TYPE value: "{{value}}". Valid values are: {{validValues}}', {
+          value: defaultAuthType,
+          validValues: [AuthType.USE_OPENAI, AuthType.USE_ANTHROPIC, AuthType.USE_OLLAMA].join(
+            ", ",
+          ),
+        }),
       );
     }
   }, [onAuthError]);
diff --git a/apps/airiscode-cli/src/ui/colors.ts b/apps/airiscode-cli/src/ui/colors.ts
index 0fb75a358..a0f55e73e 100644
--- a/apps/airiscode-cli/src/ui/colors.ts
+++ b/apps/airiscode-cli/src/ui/colors.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { themeManager } from './themes/theme-manager.js';
-import type { ColorsTheme } from './themes/theme.js';
+import type { ColorsTheme } from "./themes/theme.js";
+import { themeManager } from "./themes/theme-manager.js";
 
 export const Colors: ColorsTheme = {
   get type() {
diff --git a/apps/airiscode-cli/src/ui/commands/aboutCommand.ts b/apps/airiscode-cli/src/ui/commands/aboutCommand.ts
index 1570b9e3d..8410d9194 100644
--- a/apps/airiscode-cli/src/ui/commands/aboutCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/aboutCommand.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType, type HistoryItemAbout } from '../types.js';
-import { getExtendedSystemInfo } from '../../utils/systemInfo.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { getExtendedSystemInfo } from "../../utils/systemInfo.js";
+import { type HistoryItemAbout, MessageType } from "../types.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const aboutCommand: SlashCommand = {
-  name: 'status',
-  altNames: ['about'],
+  name: "status",
+  altNames: ["about"],
   get description() {
-    return t('show version info');
+    return t("show version info");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context) => {
     const systemInfo = await getExtendedSystemInfo(context);
 
-    const aboutItem: Omit<HistoryItemAbout, 'id'> = {
+    const aboutItem: Omit<HistoryItemAbout, "id"> = {
       type: MessageType.ABOUT,
       systemInfo,
     };
diff --git a/apps/airiscode-cli/src/ui/commands/agentsCommand.ts b/apps/airiscode-cli/src/ui/commands/agentsCommand.ts
index 02fed007b..f27554846 100644
--- a/apps/airiscode-cli/src/ui/commands/agentsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/agentsCommand.ts
@@ -4,40 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  CommandKind,
-  type SlashCommand,
-  type OpenDialogActionReturn,
-} from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { CommandKind, type OpenDialogActionReturn, type SlashCommand } from "./types.js";
 
 export const agentsCommand: SlashCommand = {
-  name: 'agents',
+  name: "agents",
   get description() {
-    return t('Manage subagents for specialized task delegation.');
+    return t("Manage subagents for specialized task delegation.");
   },
   kind: CommandKind.BUILT_IN,
   subCommands: [
     {
-      name: 'manage',
+      name: "manage",
       get description() {
-        return t('Manage existing subagents (view, edit, delete).');
+        return t("Manage existing subagents (view, edit, delete).");
       },
       kind: CommandKind.BUILT_IN,
       action: (): OpenDialogActionReturn => ({
-        type: 'dialog',
-        dialog: 'subagent_list',
+        type: "dialog",
+        dialog: "subagent_list",
       }),
     },
     {
-      name: 'create',
+      name: "create",
       get description() {
-        return t('Create a new subagent with guided setup.');
+        return t("Create a new subagent with guided setup.");
       },
       kind: CommandKind.BUILT_IN,
       action: (): OpenDialogActionReturn => ({
-        type: 'dialog',
-        dialog: 'subagent_create',
+        type: "dialog",
+        dialog: "subagent_create",
       }),
     },
   ],
diff --git a/apps/airiscode-cli/src/ui/commands/approvalModeCommand.ts b/apps/airiscode-cli/src/ui/commands/approvalModeCommand.ts
index a1caf09bc..3fe204e94 100644
--- a/apps/airiscode-cli/src/ui/commands/approvalModeCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/approvalModeCommand.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { ApprovalMode } from "@airiscode/core";
+import { APPROVAL_MODES } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
 import type {
-  SlashCommand,
   CommandContext,
-  OpenDialogActionReturn,
   MessageActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
-import type { ApprovalMode } from '@airiscode/core';
-import { APPROVAL_MODES } from '@airiscode/core';
+  OpenDialogActionReturn,
+  SlashCommand,
+} from "./types.js";
+import { CommandKind } from "./types.js";
 
 /**
  * Parses the argument string and returns the corresponding ApprovalMode if valid.
@@ -29,9 +29,9 @@ function parseApprovalModeArg(arg: string): ApprovalMode | undefined {
 }
 
 export const approvalModeCommand: SlashCommand = {
-  name: 'approval-mode',
+  name: "approval-mode",
   get description() {
-    return t('View or change the approval mode for tool usage');
+    return t("View or change the approval mode for tool usage");
   },
   kind: CommandKind.BUILT_IN,
   action: async (
@@ -43,19 +43,19 @@ export const approvalModeCommand: SlashCommand = {
     // If no argument provided, open the dialog
     if (!args.trim()) {
       return {
-        type: 'dialog',
-        dialog: 'approval-mode',
+        type: "dialog",
+        dialog: "approval-mode",
       };
     }
 
     // If invalid argument, return error message with valid options
     if (!mode) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: t('Invalid approval mode "{{arg}}". Valid modes: {{modes}}', {
           arg: args.trim(),
-          modes: APPROVAL_MODES.join(', '),
+          modes: APPROVAL_MODES.join(", "),
         }),
       };
     }
@@ -67,16 +67,16 @@ export const approvalModeCommand: SlashCommand = {
         config.setApprovalMode(mode);
       } catch (e) {
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: (e as Error).message,
         };
       }
     }
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: t('Approval mode set to "{{mode}}"', { mode }),
     };
   },
diff --git a/apps/airiscode-cli/src/ui/commands/arenaCommand.ts b/apps/airiscode-cli/src/ui/commands/arenaCommand.ts
index 053e86685..9dce632c8 100644
--- a/apps/airiscode-cli/src/ui/commands/arenaCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/arenaCommand.ts
@@ -4,39 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  SlashCommand,
-  CommandContext,
-  ConfirmActionReturn,
-  MessageActionReturn,
-  OpenDialogActionReturn,
-  SlashCommandActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
 import {
-  ArenaManager,
-  ArenaEventType,
-  isTerminalStatus,
-  isSuccessStatus,
-  ArenaSessionStatus,
-  AuthType,
-  createDebugLogger,
-  stripStartupContext,
-  type Config,
-  type ArenaModelConfig,
-  type ArenaAgentErrorEvent,
   type ArenaAgentCompleteEvent,
+  type ArenaAgentErrorEvent,
   type ArenaAgentStartEvent,
+  ArenaEventType,
+  ArenaManager,
+  type ArenaModelConfig,
   type ArenaSessionCompleteEvent,
   type ArenaSessionErrorEvent,
   type ArenaSessionStartEvent,
+  ArenaSessionStatus,
   type ArenaSessionUpdateEvent,
-} from '@airiscode/core';
-import {
-  MessageType,
-  type ArenaAgentCardData,
-  type HistoryItemWithoutId,
-} from '../types.js';
+  AuthType,
+  type Config,
+  createDebugLogger,
+  isSuccessStatus,
+  isTerminalStatus,
+  stripStartupContext,
+} from "@airiscode/core";
+import { type ArenaAgentCardData, type HistoryItemWithoutId, MessageType } from "../types.js";
+import type {
+  CommandContext,
+  ConfirmActionReturn,
+  MessageActionReturn,
+  OpenDialogActionReturn,
+  SlashCommand,
+  SlashCommandActionReturn,
+} from "./types.js";
+import { CommandKind } from "./types.js";
 
 /**
  * Parsed model entry with optional auth type.
@@ -67,10 +63,10 @@ function parseArenaArgs(args: string): {
   let task = args;
 
   if (modelsMatch) {
-    const modelStrings = modelsMatch[1]!.split(',').filter(Boolean);
+    const modelStrings = modelsMatch[1]!.split(",").filter(Boolean);
     models = modelStrings.map((str) => {
       // Check for authType:modelId format
-      const colonIndex = str.indexOf(':');
+      const colonIndex = str.indexOf(":");
       if (colonIndex > 0) {
         return {
           authType: str.substring(0, colonIndex),
@@ -79,16 +75,16 @@ function parseArenaArgs(args: string): {
       }
       return { modelId: str };
     });
-    task = task.replace(/--models\s+\S+/, '').trim();
+    task = task.replace(/--models\s+\S+/, "").trim();
   }
 
   // Strip surrounding quotes from task
-  task = task.replace(/^["']|["']$/g, '').trim();
+  task = task.replace(/^["']|["']$/g, "").trim();
 
   return { models, task };
 }
 
-const debugLogger = createDebugLogger('ARENA_COMMAND');
+const debugLogger = createDebugLogger("ARENA_COMMAND");
 
 interface ArenaExecutionInput {
   task: string;
@@ -102,17 +98,17 @@ function buildArenaExecutionInput(
 ): ArenaExecutionInput | MessageActionReturn {
   if (!parsed.task) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content:
-        'Usage: /arena start --models model1,model2 <task>\n' +
-        '\n' +
-        'Options:\n' +
-        '  --models [authType:]model1,[authType:]model2\n' +
-        '                            Models to compete (required, at least 2)\n' +
-        '                            Format: authType:modelId or just modelId\n' +
-        '\n' +
-        'Examples:\n' +
+        "Usage: /arena start --models model1,model2 <task>\n" +
+        "\n" +
+        "Options:\n" +
+        "  --models [authType:]model1,[authType:]model2\n" +
+        "                            Models to compete (required, at least 2)\n" +
+        "                            Format: authType:modelId or just modelId\n" +
+        "\n" +
+        "Examples:\n" +
         '  /arena start --models openai:gpt-4o,anthropic:claude-3 "implement sorting"\n' +
         '  /arena start --models airiscoder-plus,kimi-for-coding "fix the bug"',
     };
@@ -120,25 +116,23 @@ function buildArenaExecutionInput(
 
   if (parsed.models.length < 2) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content:
-        'Arena requires at least 2 models. Use --models model1,model2 to specify.\n' +
-        'Format: [authType:]modelId (e.g., openai:gpt-4o or just gpt-4o)',
+        "Arena requires at least 2 models. Use --models model1,model2 to specify.\n" +
+        "Format: [authType:]modelId (e.g., openai:gpt-4o or just gpt-4o)",
     };
   }
 
   // Get the current auth type as default for models without explicit auth type
   const contentGeneratorConfig = config.getContentGeneratorConfig();
-  const defaultAuthType =
-    contentGeneratorConfig?.authType ?? AuthType.USE_OPENAI;
+  const defaultAuthType = contentGeneratorConfig?.authType ?? AuthType.USE_OPENAI;
 
   // Build ArenaModelConfig for each model, resolving display names from
   // the model registry when available.
   const modelsConfig = config.getModelsConfig();
   const models: ArenaModelConfig[] = parsed.models.map((parsedModel) => {
-    const authType =
-      (parsedModel.authType as AuthType | undefined) ?? defaultAuthType;
+    const authType = (parsedModel.authType as AuthType | undefined) ?? defaultAuthType;
     const registryModels = modelsConfig.getAvailableModelsForAuthType(authType);
     const resolved = registryModels.find((m) => m.id === parsedModel.modelId);
     return {
@@ -166,18 +160,18 @@ function recordArenaItem(config: Config, item: HistoryItemWithoutId): void {
     const chatRecorder = config.getChatRecordingService();
     if (!chatRecorder) return;
     chatRecorder.recordSlashCommand({
-      phase: 'result',
-      rawCommand: '/arena',
+      phase: "result",
+      rawCommand: "/arena",
       outputHistoryItems: [{ ...item } as Record<string, unknown>],
     });
   } catch {
-    debugLogger.error('Failed to record arena history item');
+    debugLogger.error("Failed to record arena history item");
   }
 }
 
 function executeArenaCommand(
   config: Config,
-  ui: CommandContext['ui'],
+  ui: CommandContext["ui"],
   input: ArenaExecutionInput,
 ): void {
   // Capture the main session's chat history so arena agents start with
@@ -189,7 +183,7 @@ function executeArenaCommand(
     const fullHistory = config.getGeminiClient().getHistory();
     chatHistory = stripStartupContext(fullHistory);
   } catch {
-    debugLogger.debug('Could not retrieve chat history for arena agents');
+    debugLogger.debug("Could not retrieve chat history for arena agents");
   }
 
   const manager = new ArenaManager(config);
@@ -197,15 +191,12 @@ function executeArenaCommand(
   const detachListeners: Array<() => void> = [];
   const agentLabels = new Map<string, string>();
 
-  const addArenaMessage = (
-    type: 'info' | 'warning' | 'error' | 'success',
-    text: string,
-  ) => {
+  const addArenaMessage = (type: "info" | "warning" | "error" | "success", text: string) => {
     ui.addItem({ type, text }, Date.now());
   };
 
   const addAndRecordArenaMessage = (
-    type: 'info' | 'warning' | 'error' | 'success',
+    type: "info" | "warning" | "error" | "success",
     text: string,
   ) => {
     const item: HistoryItemWithoutId = { type, text };
@@ -216,7 +207,7 @@ function executeArenaCommand(
   const handleSessionStart = (event: ArenaSessionStartEvent) => {
     const modelList = event.models
       .map((model, index) => `  ${index + 1}. ${model.modelId}`)
-      .join('\n');
+      .join("\n");
     // SESSION_START fires synchronously before the first await in
     // ArenaManager.start(), so the slash command processor's finally
     // block already captures this item — no extra recording needed.
@@ -228,13 +219,11 @@ function executeArenaCommand(
 
   const handleAgentStart = (event: ArenaAgentStartEvent) => {
     agentLabels.set(event.agentId, event.model.modelId);
-    debugLogger.debug(
-      `Arena agent started: ${event.model.modelId} (${event.agentId})`,
-    );
+    debugLogger.debug(`Arena agent started: ${event.model.modelId} (${event.agentId})`);
   };
 
   const handleSessionUpdate = (event: ArenaSessionUpdateEvent) => {
-    const attachHintPrefix = 'To view agent panes, run: ';
+    const attachHintPrefix = "To view agent panes, run: ";
     if (event.message.startsWith(attachHintPrefix)) {
       const command = event.message.slice(attachHintPrefix.length).trim();
       addAndRecordArenaMessage(
@@ -244,9 +233,9 @@ function executeArenaCommand(
       return;
     }
 
-    if (event.type === 'success') {
+    if (event.type === "success") {
       addAndRecordArenaMessage(MessageType.SUCCESS, event.message);
-    } else if (event.type === 'info') {
+    } else if (event.type === "info") {
       addAndRecordArenaMessage(MessageType.INFO, event.message);
     } else {
       addAndRecordArenaMessage(MessageType.WARNING, event.message);
@@ -255,15 +244,10 @@ function executeArenaCommand(
 
   const handleAgentError = (event: ArenaAgentErrorEvent) => {
     const label = agentLabels.get(event.agentId) || event.agentId;
-    addAndRecordArenaMessage(
-      MessageType.ERROR,
-      `[${label}] failed: ${event.error}`,
-    );
+    addAndRecordArenaMessage(MessageType.ERROR, `[${label}] failed: ${event.error}`);
   };
 
-  const buildAgentCardData = (
-    result: ArenaAgentCompleteEvent['result'],
-  ): ArenaAgentCardData => ({
+  const buildAgentCardData = (result: ArenaAgentCompleteEvent["result"]): ArenaAgentCardData => ({
     label: result.model.modelId,
     status: result.status,
     durationMs: result.stats.durationMs,
@@ -285,7 +269,7 @@ function executeArenaCommand(
 
     const agent = buildAgentCardData(event.result);
     const item = {
-      type: 'arena_agent_complete',
+      type: "arena_agent_complete",
       agent,
     } as HistoryItemWithoutId;
     ui.addItem(item, Date.now());
@@ -298,7 +282,7 @@ function executeArenaCommand(
 
   const handleSessionComplete = (event: ArenaSessionCompleteEvent) => {
     const item = {
-      type: 'arena_session_complete',
+      type: "arena_session_complete",
       sessionStatus: event.result.status,
       task: event.result.task,
       totalDurationMs: event.result.totalDurationMs ?? 0,
@@ -309,33 +293,19 @@ function executeArenaCommand(
   };
 
   emitter.on(ArenaEventType.SESSION_START, handleSessionStart);
-  detachListeners.push(() =>
-    emitter.off(ArenaEventType.SESSION_START, handleSessionStart),
-  );
+  detachListeners.push(() => emitter.off(ArenaEventType.SESSION_START, handleSessionStart));
   emitter.on(ArenaEventType.AGENT_START, handleAgentStart);
-  detachListeners.push(() =>
-    emitter.off(ArenaEventType.AGENT_START, handleAgentStart),
-  );
+  detachListeners.push(() => emitter.off(ArenaEventType.AGENT_START, handleAgentStart));
   emitter.on(ArenaEventType.SESSION_UPDATE, handleSessionUpdate);
-  detachListeners.push(() =>
-    emitter.off(ArenaEventType.SESSION_UPDATE, handleSessionUpdate),
-  );
+  detachListeners.push(() => emitter.off(ArenaEventType.SESSION_UPDATE, handleSessionUpdate));
   emitter.on(ArenaEventType.AGENT_ERROR, handleAgentError);
-  detachListeners.push(() =>
-    emitter.off(ArenaEventType.AGENT_ERROR, handleAgentError),
-  );
+  detachListeners.push(() => emitter.off(ArenaEventType.AGENT_ERROR, handleAgentError));
   emitter.on(ArenaEventType.AGENT_COMPLETE, handleAgentComplete);
-  detachListeners.push(() =>
-    emitter.off(ArenaEventType.AGENT_COMPLETE, handleAgentComplete),
-  );
+  detachListeners.push(() => emitter.off(ArenaEventType.AGENT_COMPLETE, handleAgentComplete));
   emitter.on(ArenaEventType.SESSION_ERROR, handleSessionError);
-  detachListeners.push(() =>
-    emitter.off(ArenaEventType.SESSION_ERROR, handleSessionError),
-  );
+  detachListeners.push(() => emitter.off(ArenaEventType.SESSION_ERROR, handleSessionError));
   emitter.on(ArenaEventType.SESSION_COMPLETE, handleSessionComplete);
-  detachListeners.push(() =>
-    emitter.off(ArenaEventType.SESSION_COMPLETE, handleSessionComplete),
-  );
+  detachListeners.push(() => emitter.off(ArenaEventType.SESSION_COMPLETE, handleSessionComplete));
 
   config.setArenaManager(manager);
 
@@ -353,12 +323,12 @@ function executeArenaCommand(
     })
     .then(
       () => {
-        debugLogger.debug('Arena agents settled');
+        debugLogger.debug("Arena agents settled");
       },
       (error) => {
         const message = error instanceof Error ? error.message : String(error);
         addAndRecordArenaMessage(MessageType.ERROR, `${message}`);
-        debugLogger.error('Arena session failed:', error);
+        debugLogger.error("Arena session failed:", error);
 
         // Clear the stored manager so subsequent /arena start calls
         // are not blocked by the stale reference after a startup failure.
@@ -381,26 +351,25 @@ function executeArenaCommand(
 }
 
 export const arenaCommand: SlashCommand = {
-  name: 'arena',
-  description: 'Manage Arena sessions',
+  name: "arena",
+  description: "Manage Arena sessions",
   kind: CommandKind.BUILT_IN,
   subCommands: [
     {
-      name: 'start',
-      description:
-        'Start an Arena session with multiple models competing on the same task',
+      name: "start",
+      description: "Start an Arena session with multiple models competing on the same task",
       kind: CommandKind.BUILT_IN,
       action: async (
         context: CommandContext,
         args: string,
       ): Promise<void | MessageActionReturn | OpenDialogActionReturn> => {
-        const executionMode = context.executionMode ?? 'interactive';
-        if (executionMode !== 'interactive') {
+        const executionMode = context.executionMode ?? "interactive";
+        if (executionMode !== "interactive") {
           return {
-            type: 'message',
-            messageType: 'error',
+            type: "message",
+            messageType: "error",
             content:
-              'Arena is not supported in non-interactive mode. Use interactive mode to start an Arena session.',
+              "Arena is not supported in non-interactive mode. Use interactive mode to start an Arena session.",
           };
         }
 
@@ -409,9 +378,9 @@ export const arenaCommand: SlashCommand = {
 
         if (!config) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Configuration not available.',
+            type: "message",
+            messageType: "error",
+            content: "Configuration not available.",
           };
         }
 
@@ -419,23 +388,23 @@ export const arenaCommand: SlashCommand = {
         const existingManager = config.getArenaManager();
         if (existingManager) {
           return {
-            type: 'message',
-            messageType: 'error',
+            type: "message",
+            messageType: "error",
             content:
-              'An Arena session exists. Use /arena stop or /arena select to end it before starting a new one.',
+              "An Arena session exists. Use /arena stop or /arena select to end it before starting a new one.",
           };
         }
 
         const parsed = parseArenaArgs(args);
         if (parsed.models.length === 0) {
           return {
-            type: 'dialog',
-            dialog: 'arena_start',
+            type: "dialog",
+            dialog: "arena_start",
           };
         }
 
         const executionInput = buildArenaExecutionInput(parsed, config);
-        if ('type' in executionInput) {
+        if ("type" in executionInput) {
           return executionInput;
         }
 
@@ -443,116 +412,106 @@ export const arenaCommand: SlashCommand = {
       },
     },
     {
-      name: 'stop',
-      description: 'Stop the current Arena session',
+      name: "stop",
+      description: "Stop the current Arena session",
       kind: CommandKind.BUILT_IN,
-      action: async (
-        context: CommandContext,
-      ): Promise<void | SlashCommandActionReturn> => {
-        const executionMode = context.executionMode ?? 'interactive';
-        if (executionMode !== 'interactive') {
+      action: async (context: CommandContext): Promise<void | SlashCommandActionReturn> => {
+        const executionMode = context.executionMode ?? "interactive";
+        if (executionMode !== "interactive") {
           return {
-            type: 'message',
-            messageType: 'error',
+            type: "message",
+            messageType: "error",
             content:
-              'Arena is not supported in non-interactive mode. Use interactive mode to stop an Arena session.',
+              "Arena is not supported in non-interactive mode. Use interactive mode to stop an Arena session.",
           };
         }
 
         const { config } = context.services;
         if (!config) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Configuration not available.',
+            type: "message",
+            messageType: "error",
+            content: "Configuration not available.",
           };
         }
 
         const manager = config.getArenaManager();
         if (!manager) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'No running Arena session found.',
+            type: "message",
+            messageType: "error",
+            content: "No running Arena session found.",
           };
         }
 
         return {
-          type: 'dialog',
-          dialog: 'arena_stop',
+          type: "dialog",
+          dialog: "arena_stop",
         };
       },
     },
     {
-      name: 'status',
-      description: 'Show the current Arena session status',
+      name: "status",
+      description: "Show the current Arena session status",
       kind: CommandKind.BUILT_IN,
-      action: async (
-        context: CommandContext,
-      ): Promise<void | SlashCommandActionReturn> => {
-        const executionMode = context.executionMode ?? 'interactive';
-        if (executionMode !== 'interactive') {
+      action: async (context: CommandContext): Promise<void | SlashCommandActionReturn> => {
+        const executionMode = context.executionMode ?? "interactive";
+        if (executionMode !== "interactive") {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Arena is not supported in non-interactive mode.',
+            type: "message",
+            messageType: "error",
+            content: "Arena is not supported in non-interactive mode.",
           };
         }
 
         const { config } = context.services;
         if (!config) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Configuration not available.',
+            type: "message",
+            messageType: "error",
+            content: "Configuration not available.",
           };
         }
 
         const manager = config.getArenaManager();
         if (!manager) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'No Arena session found. Start one with /arena start.',
+            type: "message",
+            messageType: "error",
+            content: "No Arena session found. Start one with /arena start.",
           };
         }
 
         return {
-          type: 'dialog',
-          dialog: 'arena_status',
+          type: "dialog",
+          dialog: "arena_status",
         };
       },
     },
     {
-      name: 'select',
-      altNames: ['choose'],
-      description:
-        'Select a model result and merge its diff into the current workspace',
+      name: "select",
+      altNames: ["choose"],
+      description: "Select a model result and merge its diff into the current workspace",
       kind: CommandKind.BUILT_IN,
       action: async (
         context: CommandContext,
         args: string,
-      ): Promise<
-        | void
-        | MessageActionReturn
-        | OpenDialogActionReturn
-        | ConfirmActionReturn
-      > => {
-        const executionMode = context.executionMode ?? 'interactive';
-        if (executionMode !== 'interactive') {
+      ): Promise<void | MessageActionReturn | OpenDialogActionReturn | ConfirmActionReturn> => {
+        const executionMode = context.executionMode ?? "interactive";
+        if (executionMode !== "interactive") {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Arena is not supported in non-interactive mode.',
+            type: "message",
+            messageType: "error",
+            content: "Arena is not supported in non-interactive mode.",
           };
         }
 
         const { config } = context.services;
         if (!config) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Configuration not available.',
+            type: "message",
+            messageType: "error",
+            content: "Configuration not available.",
           };
         }
 
@@ -560,9 +519,9 @@ export const arenaCommand: SlashCommand = {
 
         if (!manager) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'No arena session found. Start one with /arena start.',
+            type: "message",
+            messageType: "error",
+            content: "No arena session found. Start one with /arena start.",
           };
         }
 
@@ -572,32 +531,32 @@ export const arenaCommand: SlashCommand = {
           sessionStatus === ArenaSessionStatus.INITIALIZING
         ) {
           return {
-            type: 'message',
-            messageType: 'error',
+            type: "message",
+            messageType: "error",
             content:
-              'Arena session is still running. Wait for it to complete or use /arena stop first.',
+              "Arena session is still running. Wait for it to complete or use /arena stop first.",
           };
         }
 
         // Handle --discard flag before checking for successful agents,
         // so users can clean up worktrees even when all agents failed.
         const trimmedArgs = args.trim();
-        if (trimmedArgs === '--discard') {
+        if (trimmedArgs === "--discard") {
           if (!context.overwriteConfirmed) {
             return {
-              type: 'confirm_action',
-              prompt: 'Discard all Arena results and clean up worktrees?',
+              type: "confirm_action",
+              prompt: "Discard all Arena results and clean up worktrees?",
               originalInvocation: {
-                raw: context.invocation?.raw || '/arena select --discard',
+                raw: context.invocation?.raw || "/arena select --discard",
               },
             };
           }
 
           await config.cleanupArenaRuntime(true);
           return {
-            type: 'message',
-            messageType: 'info',
-            content: 'Arena results discarded. All worktrees cleaned up.',
+            type: "message",
+            messageType: "info",
+            content: "Arena results discarded. All worktrees cleaned up.",
           };
         }
 
@@ -606,11 +565,11 @@ export const arenaCommand: SlashCommand = {
 
         if (!hasSuccessful) {
           return {
-            type: 'message',
-            messageType: 'error',
+            type: "message",
+            messageType: "error",
             content:
-              'No successful agent results to select from. All agents failed or were cancelled.\n' +
-              'Use /arena stop to end the session.',
+              "No successful agent results to select from. All agents failed or were cancelled.\n" +
+              "Use /arena stop to end the session.",
           };
         }
 
@@ -624,8 +583,8 @@ export const arenaCommand: SlashCommand = {
 
           if (!matchingAgent) {
             return {
-              type: 'message',
-              messageType: 'error',
+              type: "message",
+              messageType: "error",
               content: `No idle agent found matching "${trimmedArgs}".`,
             };
           }
@@ -634,24 +593,24 @@ export const arenaCommand: SlashCommand = {
           const result = await manager.applyAgentResult(matchingAgent.agentId);
           if (!result.success) {
             return {
-              type: 'message',
-              messageType: 'error',
+              type: "message",
+              messageType: "error",
               content: `Failed to apply changes from ${label}: ${result.error}`,
             };
           }
 
           await config.cleanupArenaRuntime(true);
           return {
-            type: 'message',
-            messageType: 'info',
+            type: "message",
+            messageType: "info",
             content: `Applied changes from ${label} to workspace. Arena session complete.`,
           };
         }
 
         // No args → open the select dialog
         return {
-          type: 'dialog',
-          dialog: 'arena_select',
+          type: "dialog",
+          dialog: "arena_select",
         };
       },
     },
diff --git a/apps/airiscode-cli/src/ui/commands/authCommand.ts b/apps/airiscode-cli/src/ui/commands/authCommand.ts
index 83ab454b0..353d0f490 100644
--- a/apps/airiscode-cli/src/ui/commands/authCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/authCommand.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const authCommand: SlashCommand = {
-  name: 'auth',
-  altNames: ['login'],
+  name: "auth",
+  altNames: ["login"],
   get description() {
-    return t('Configure authentication information for login');
+    return t("Configure authentication information for login");
   },
   kind: CommandKind.BUILT_IN,
   action: (_context, _args): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'auth',
+    type: "dialog",
+    dialog: "auth",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/btwCommand.ts b/apps/airiscode-cli/src/ui/commands/btwCommand.ts
index 8aa323b99..79fdcb131 100644
--- a/apps/airiscode-cli/src/ui/commands/btwCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/btwCommand.ts
@@ -4,26 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  CommandContext,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType } from '../types.js';
-import type { HistoryItemBtw } from '../types.js';
-import { t } from '../../i18n/index.js';
-import type { GeminiClient } from '@airiscode/core';
-import type { Content } from '@airiscode/core';
+import type { Content, GeminiClient } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
+import type { HistoryItemBtw } from "../types.js";
+import { MessageType } from "../types.js";
+import type { CommandContext, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 function makeBtwPromptId(sessionId: string): string {
   return `${sessionId}########btw-${Date.now()}`;
 }
 
 function formatBtwError(error: unknown): string {
-  return t('Failed to answer btw question: {{error}}', {
-    error:
-      error instanceof Error ? error.message : String(error || 'Unknown error'),
+  return t("Failed to answer btw question: {{error}}", {
+    error: error instanceof Error ? error.message : String(error || "Unknown error"),
   });
 }
 
@@ -39,7 +33,7 @@ function trimHistory(history: Content[]): Content[] {
   // Slice from the end, ensuring we start on a 'user' message so the
   // alternating user/model pattern is preserved.
   const sliced = history.slice(-MAX_BTW_HISTORY_MESSAGES);
-  if (sliced[0]?.role === 'model' && sliced.length > 1) {
+  if (sliced[0]?.role === "model" && sliced.length > 1) {
     return sliced.slice(1);
   }
   return sliced;
@@ -67,7 +61,7 @@ async function askBtw(
     [
       ...history,
       {
-        role: 'user',
+        role: "user",
         parts: [
           {
             text: `[This is a side question - answer directly and concisely.
@@ -101,17 +95,15 @@ ${question}`,
   return (
     parts
       ?.map((part) => part.text)
-      .filter((text): text is string => typeof text === 'string')
-      .join('') || t('No response received.')
+      .filter((text): text is string => typeof text === "string")
+      .join("") || t("No response received.")
   );
 }
 
 export const btwCommand: SlashCommand = {
-  name: 'btw',
+  name: "btw",
   get description() {
-    return t(
-      'Ask a quick side question without affecting the main conversation',
-    );
+    return t("Ask a quick side question without affecting the main conversation");
   },
   kind: CommandKind.BUILT_IN,
   action: async (
@@ -119,14 +111,14 @@ export const btwCommand: SlashCommand = {
     args: string,
   ): Promise<void | SlashCommandActionReturn> => {
     const question = args.trim();
-    const executionMode = context.executionMode ?? 'interactive';
+    const executionMode = context.executionMode ?? "interactive";
     const abortSignal = context.abortSignal ?? new AbortController().signal;
 
     if (!question) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Please provide a question. Usage: /btw <your question>'),
+        type: "message",
+        messageType: "error",
+        content: t("Please provide a question. Usage: /btw <your question>"),
       };
     }
 
@@ -135,9 +127,9 @@ export const btwCommand: SlashCommand = {
 
     if (!config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Config not loaded.'),
+        type: "message",
+        messageType: "error",
+        content: t("Config not loaded."),
       };
     }
 
@@ -147,65 +139,53 @@ export const btwCommand: SlashCommand = {
 
     if (!model) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('No model configured.'),
+        type: "message",
+        messageType: "error",
+        content: t("No model configured."),
       };
     }
 
     // ACP mode: return a stream_messages async generator
-    if (executionMode === 'acp') {
+    if (executionMode === "acp") {
       const btwPromptId = makeBtwPromptId(sessionId);
       const messages = async function* () {
         try {
           yield {
-            messageType: 'info' as const,
-            content: t('Thinking...'),
+            messageType: "info" as const,
+            content: t("Thinking..."),
           };
 
-          const answer = await askBtw(
-            geminiClient,
-            model,
-            question,
-            abortSignal,
-            btwPromptId,
-          );
+          const answer = await askBtw(geminiClient, model, question, abortSignal, btwPromptId);
 
           yield {
-            messageType: 'info' as const,
+            messageType: "info" as const,
             content: `btw> ${question}\n${answer}`,
           };
         } catch (error) {
           yield {
-            messageType: 'error' as const,
+            messageType: "error" as const,
             content: formatBtwError(error),
           };
         }
       };
 
-      return { type: 'stream_messages', messages: messages() };
+      return { type: "stream_messages", messages: messages() };
     }
 
     // Non-interactive mode: return a simple message result
-    if (executionMode === 'non_interactive') {
+    if (executionMode === "non_interactive") {
       try {
         const btwPromptId = makeBtwPromptId(sessionId);
-        const answer = await askBtw(
-          geminiClient,
-          model,
-          question,
-          abortSignal,
-          btwPromptId,
-        );
+        const answer = await askBtw(geminiClient, model, question, abortSignal, btwPromptId);
         return {
-          type: 'message',
-          messageType: 'info',
+          type: "message",
+          messageType: "info",
           content: `btw> ${question}\n${answer}`,
         };
       } catch (error) {
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: formatBtwError(error),
         };
       }
@@ -225,7 +205,7 @@ export const btwCommand: SlashCommand = {
       type: MessageType.BTW,
       btw: {
         question,
-        answer: '',
+        answer: "",
         isPending: true,
       },
     };
diff --git a/apps/airiscode-cli/src/ui/commands/bugCommand.ts b/apps/airiscode-cli/src/ui/commands/bugCommand.ts
index 0b40c5639..38b4834ab 100644
--- a/apps/airiscode-cli/src/ui/commands/bugCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/bugCommand.ts
@@ -4,35 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import open from 'open';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { MessageType } from '../types.js';
-import { getExtendedSystemInfo } from '../../utils/systemInfo.js';
-import { getSystemInfoFields } from '../../utils/systemInfoFields.js';
-import { t } from '../../i18n/index.js';
+import open from "open";
+import { t } from "../../i18n/index.js";
+import { getExtendedSystemInfo } from "../../utils/systemInfo.js";
+import { getSystemInfoFields } from "../../utils/systemInfoFields.js";
+import { MessageType } from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 export const bugCommand: SlashCommand = {
-  name: 'bug',
+  name: "bug",
   get description() {
-    return t('submit a bug report');
+    return t("submit a bug report");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context: CommandContext, args?: string): Promise<void> => {
-    const bugDescription = (args || '').trim();
+    const bugDescription = (args || "").trim();
     const systemInfo = await getExtendedSystemInfo(context);
 
     const fields = getSystemInfoFields(systemInfo);
 
-    const info = fields
-      .map((field) => `${field.label}: ${field.value}`)
-      .join('\n');
+    const info = fields.map((field) => `${field.label}: ${field.value}`).join("\n");
 
     let bugReportUrl =
-      'https://github.com/QwenLM/airiscode/issues/new?template=bug_report.yml&title={title}&info={info}';
+      "https://github.com/QwenLM/airiscode/issues/new?template=bug_report.yml&title={title}&info={info}";
 
     const bugCommandSettings = context.services.config?.getBugCommand();
     if (bugCommandSettings?.urlTemplate) {
@@ -40,8 +34,8 @@ export const bugCommand: SlashCommand = {
     }
 
     bugReportUrl = bugReportUrl
-      .replace('{title}', encodeURIComponent(bugDescription))
-      .replace('{info}', encodeURIComponent(`\n${info}\n`));
+      .replace("{title}", encodeURIComponent(bugDescription))
+      .replace("{info}", encodeURIComponent(`\n${info}\n`));
 
     context.ui.addItem(
       {
@@ -54,8 +48,7 @@ export const bugCommand: SlashCommand = {
     try {
       await open(bugReportUrl);
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       context.ui.addItem(
         {
           type: MessageType.ERROR,
diff --git a/apps/airiscode-cli/src/ui/commands/clearCommand.ts b/apps/airiscode-cli/src/ui/commands/clearCommand.ts
index 28af33226..421a1d22d 100644
--- a/apps/airiscode-cli/src/ui/commands/clearCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/clearCommand.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
 import {
-  uiTelemetryService,
+  type PermissionMode,
   SessionEndReason,
   SessionStartSource,
-  ToolNames,
   SkillTool,
-  type PermissionMode,
-} from '@airiscode/core';
+  ToolNames,
+  uiTelemetryService,
+} from "@airiscode/core";
+import { t } from "../../i18n/index.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const clearCommand: SlashCommand = {
-  name: 'clear',
-  altNames: ['reset', 'new'],
+  name: "clear",
+  altNames: ["reset", "new"],
   get description() {
-    return t('Clear conversation history and free up context');
+    return t("Clear conversation history and free up context");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context, _args) => {
@@ -59,13 +59,13 @@ export const clearCommand: SlashCommand = {
       const geminiClient = config.getGeminiClient();
       if (geminiClient) {
         context.ui.setDebugMessage(
-          t('Starting a new session, resetting chat, and clearing terminal.'),
+          t("Starting a new session, resetting chat, and clearing terminal."),
         );
         // If resetChat fails, the exception will propagate and halt the command,
         // which is the correct behavior to signal a failure to the user.
         await geminiClient.resetChat();
       } else {
-        context.ui.setDebugMessage(t('Starting a new session and clearing.'));
+        context.ui.setDebugMessage(t("Starting a new session and clearing."));
       }
 
       // Fire SessionStart event (non-blocking to avoid UI lag)
@@ -73,14 +73,14 @@ export const clearCommand: SlashCommand = {
         .getHookSystem()
         ?.fireSessionStartEvent(
           SessionStartSource.Clear,
-          config.getModel() ?? '',
+          config.getModel() ?? "",
           String(config.getApprovalMode()) as PermissionMode,
         )
         .catch((err) => {
           config.getDebugLogger().warn(`SessionStart hook failed: ${err}`);
         });
     } else {
-      context.ui.setDebugMessage(t('Starting a new session and clearing.'));
+      context.ui.setDebugMessage(t("Starting a new session and clearing."));
       context.ui.clear();
     }
   },
diff --git a/apps/airiscode-cli/src/ui/commands/compressCommand.ts b/apps/airiscode-cli/src/ui/commands/compressCommand.ts
index cdd07d45d..3fc90f9b5 100644
--- a/apps/airiscode-cli/src/ui/commands/compressCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/compressCommand.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HistoryItemCompression } from '../types.js';
-import { MessageType } from '../types.js';
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { HistoryItemCompression } from "../types.js";
+import { MessageType } from "../types.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const compressCommand: SlashCommand = {
-  name: 'compress',
-  altNames: ['summarize'],
+  name: "compress",
+  altNames: ["summarize"],
   get description() {
-    return t('Compresses the context by replacing it with a summary.');
+    return t("Compresses the context by replacing it with a summary.");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context) => {
     const { ui } = context;
-    const executionMode = context.executionMode ?? 'interactive';
+    const executionMode = context.executionMode ?? "interactive";
     const abortSignal = context.abortSignal;
 
-    if (executionMode === 'interactive' && ui.pendingItem) {
+    if (executionMode === "interactive" && ui.pendingItem) {
       ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t('Already compressing, wait for previous request to complete'),
+          text: t("Already compressing, wait for previous request to complete"),
         },
         Date.now(),
       );
@@ -47,9 +47,9 @@ export const compressCommand: SlashCommand = {
     const geminiClient = config?.getGeminiClient();
     if (!config || !geminiClient) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Config not loaded.'),
+        type: "message",
+        messageType: "error",
+        content: t("Config not loaded."),
       };
     }
 
@@ -58,40 +58,40 @@ export const compressCommand: SlashCommand = {
       return await geminiClient.tryCompressChat(promptId, true);
     };
 
-    if (executionMode === 'acp') {
+    if (executionMode === "acp") {
       const messages = async function* () {
         try {
           yield {
-            messageType: 'info' as const,
-            content: 'Compressing context...',
+            messageType: "info" as const,
+            content: "Compressing context...",
           };
           const compressed = await doCompress();
           if (!compressed) {
             yield {
-              messageType: 'error' as const,
-              content: t('Failed to compress chat history.'),
+              messageType: "error" as const,
+              content: t("Failed to compress chat history."),
             };
             return;
           }
           yield {
-            messageType: 'info' as const,
+            messageType: "info" as const,
             content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`,
           };
         } catch (e) {
           yield {
-            messageType: 'error' as const,
-            content: t('Failed to compress chat history: {{error}}', {
+            messageType: "error" as const,
+            content: t("Failed to compress chat history: {{error}}", {
               error: e instanceof Error ? e.message : String(e),
             }),
           };
         }
       };
 
-      return { type: 'stream_messages', messages: messages() };
+      return { type: "stream_messages", messages: messages() };
     }
 
     try {
-      if (executionMode === 'interactive') {
+      if (executionMode === "interactive") {
         ui.setPendingItem(pendingMessage);
       }
 
@@ -102,11 +102,11 @@ export const compressCommand: SlashCommand = {
       }
 
       if (!compressed) {
-        if (executionMode === 'interactive') {
+        if (executionMode === "interactive") {
           ui.addItem(
             {
               type: MessageType.ERROR,
-              text: t('Failed to compress chat history.'),
+              text: t("Failed to compress chat history."),
             },
             Date.now(),
           );
@@ -114,13 +114,13 @@ export const compressCommand: SlashCommand = {
         }
 
         return {
-          type: 'message',
-          messageType: 'error',
-          content: t('Failed to compress chat history.'),
+          type: "message",
+          messageType: "error",
+          content: t("Failed to compress chat history."),
         };
       }
 
-      if (executionMode === 'interactive') {
+      if (executionMode === "interactive") {
         ui.addItem(
           {
             type: MessageType.COMPRESSION,
@@ -137,8 +137,8 @@ export const compressCommand: SlashCommand = {
       }
 
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`,
       };
     } catch (e) {
@@ -146,11 +146,11 @@ export const compressCommand: SlashCommand = {
       if (abortSignal?.aborted) {
         return;
       }
-      if (executionMode === 'interactive') {
+      if (executionMode === "interactive") {
         ui.addItem(
           {
             type: MessageType.ERROR,
-            text: t('Failed to compress chat history: {{error}}', {
+            text: t("Failed to compress chat history: {{error}}", {
               error: e instanceof Error ? e.message : String(e),
             }),
           },
@@ -160,14 +160,14 @@ export const compressCommand: SlashCommand = {
       }
 
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Failed to compress chat history: {{error}}', {
+        type: "message",
+        messageType: "error",
+        content: t("Failed to compress chat history: {{error}}", {
           error: e instanceof Error ? e.message : String(e),
         }),
       };
     } finally {
-      if (executionMode === 'interactive') {
+      if (executionMode === "interactive") {
         ui.setPendingItem(null);
       }
     }
diff --git a/apps/airiscode-cli/src/ui/commands/contextCommand.ts b/apps/airiscode-cli/src/ui/commands/contextCommand.ts
index b8185e54e..d01ea9313 100644
--- a/apps/airiscode-cli/src/ui/commands/contextCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/contextCommand.ts
@@ -5,28 +5,24 @@
  */
 
 import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
+  buildSkillLlmContent,
+  DEFAULT_TOKEN_LIMIT,
+  DiscoveredMCPTool,
+  getCoreSystemPrompt,
+  SkillTool,
+  ToolNames,
+  uiTelemetryService,
+} from "@airiscode/core";
+import { t } from "../../i18n/index.js";
 import {
-  MessageType,
-  type HistoryItemContextUsage,
   type ContextCategoryBreakdown,
-  type ContextToolDetail,
   type ContextMemoryDetail,
   type ContextSkillDetail,
-} from '../types.js';
-import {
-  DiscoveredMCPTool,
-  uiTelemetryService,
-  getCoreSystemPrompt,
-  DEFAULT_TOKEN_LIMIT,
-  ToolNames,
-  SkillTool,
-  buildSkillLlmContent,
-} from '@airiscode/core';
-import { t } from '../../i18n/index.js';
+  type ContextToolDetail,
+  type HistoryItemContextUsage,
+  MessageType,
+} from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 /**
  * Default compression token threshold (triggers compression at 70% usage).
@@ -63,8 +59,7 @@ function parseMemoryFiles(memoryContent: string): ContextMemoryDetail[] {
 
   const results: ContextMemoryDetail[] = [];
   // Use backreference (\1) to ensure start/end path markers match
-  const regex =
-    /--- Context from: (.+?) ---\n([\s\S]*?)--- End of Context from: \1 ---/g;
+  const regex = /--- Context from: (.+?) ---\n([\s\S]*?)--- End of Context from: \1 ---/g;
   let match: RegExpExecArray | null;
 
   while ((match = regex.exec(memoryContent)) !== null) {
@@ -79,7 +74,7 @@ function parseMemoryFiles(memoryContent: string): ContextMemoryDetail[] {
   // If no structured markers found, treat as a single memory block
   if (results.length === 0 && memoryContent.trim().length > 0) {
     results.push({
-      path: t('memory'),
+      path: t("memory"),
       tokens: estimateTokens(memoryContent),
     });
   }
@@ -88,23 +83,20 @@ function parseMemoryFiles(memoryContent: string): ContextMemoryDetail[] {
 }
 
 export const contextCommand: SlashCommand = {
-  name: 'context',
+  name: "context",
   get description() {
-    return t(
-      'Show context window usage breakdown. Use "/context detail" for per-item breakdown.',
-    );
+    return t('Show context window usage breakdown. Use "/context detail" for per-item breakdown.');
   },
   kind: CommandKind.BUILT_IN,
   action: async (context: CommandContext, args?: string) => {
     const showDetails =
-      args?.trim().toLowerCase() === 'detail' ||
-      args?.trim().toLowerCase() === '-d';
+      args?.trim().toLowerCase() === "detail" || args?.trim().toLowerCase() === "-d";
     const { config } = context.services;
     if (!config) {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t('Config not loaded.'),
+          text: t("Config not loaded."),
         },
         Date.now(),
       );
@@ -113,10 +105,9 @@ export const contextCommand: SlashCommand = {
 
     // --- Gather data ---
 
-    const modelName = config.getModel() || 'unknown';
+    const modelName = config.getModel() || "unknown";
     const contentGeneratorConfig = config.getContentGeneratorConfig();
-    const contextWindowSize =
-      contentGeneratorConfig.contextWindowSize ?? DEFAULT_TOKEN_LIMIT;
+    const contextWindowSize = contentGeneratorConfig.contextWindowSize ?? DEFAULT_TOKEN_LIMIT;
 
     // Total prompt token count from API (most accurate)
     const apiTotalTokens = uiTelemetryService.getLastPromptTokenCount();
@@ -132,9 +123,7 @@ export const contextCommand: SlashCommand = {
     // 2. Tool declarations tokens (includes ALL tools: built-in, MCP, skill tool)
     const toolRegistry = config.getToolRegistry();
     const allTools = toolRegistry ? toolRegistry.getAllTools() : [];
-    const toolDeclarations = toolRegistry
-      ? toolRegistry.getFunctionDeclarations()
-      : [];
+    const toolDeclarations = toolRegistry ? toolRegistry.getFunctionDeclarations() : [];
     const toolsJsonStr = JSON.stringify(toolDeclarations);
     const allToolsTokens = estimateTokens(toolsJsonStr);
 
@@ -178,9 +167,7 @@ export const contextCommand: SlashCommand = {
 
     // Determine which skills have been loaded in this session
     const loadedSkillNames: ReadonlySet<string> =
-      skillTool instanceof SkillTool
-        ? skillTool.getLoadedSkillNames()
-        : new Set();
+      skillTool instanceof SkillTool ? skillTool.getLoadedSkillNames() : new Set();
 
     // Per-skill breakdown: listing cost + body cost for loaded skills
     const skillManager = config.getSkillManager();
@@ -193,9 +180,7 @@ export const contextCommand: SlashCommand = {
       const isLoaded = loadedSkillNames.has(skill.name);
       let bodyTokens: number | undefined;
       if (isLoaded && skill.body) {
-        const baseDir = skill.filePath
-          ? skill.filePath.replace(/\/[^/]+$/, '')
-          : '';
+        const baseDir = skill.filePath ? skill.filePath.replace(/\/[^/]+$/, "") : "";
         bodyTokens = estimateTokens(buildSkillLlmContent(baseDir, skill.body));
         loadedBodiesTokens += bodyTokens;
       }
@@ -212,30 +197,21 @@ export const contextCommand: SlashCommand = {
 
     // 6. Autocompact buffer
     const compressionThreshold =
-      config.getChatCompression()?.contextPercentageThreshold ??
-      DEFAULT_COMPRESSION_THRESHOLD;
+      config.getChatCompression()?.contextPercentageThreshold ?? DEFAULT_COMPRESSION_THRESHOLD;
     const autocompactBuffer =
-      compressionThreshold > 0
-        ? Math.round((1 - compressionThreshold) * contextWindowSize)
-        : 0;
+      compressionThreshold > 0 ? Math.round((1 - compressionThreshold) * contextWindowSize) : 0;
 
     // 7. Calculate raw overhead
     //    allToolsTokens includes the skill tool definition; loadedBodiesTokens
     //    covers the on-demand skill bodies now attributed to Skills.
     const rawOverhead =
-      systemPromptTokens +
-      allToolsTokens +
-      memoryFilesTokens +
-      loadedBodiesTokens;
+      systemPromptTokens + allToolsTokens + memoryFilesTokens + loadedBodiesTokens;
 
     // 8. Determine total tokens and build breakdown
     const isEstimated = apiTotalTokens === 0;
 
     // Sum of MCP tool tokens for category-level display
-    const mcpToolsTotalTokens = mcpTools.reduce(
-      (sum, tool) => sum + tool.tokens,
-      0,
-    );
+    const mcpToolsTotalTokens = mcpTools.reduce((sum, tool) => sum + tool.tokens, 0);
 
     let totalTokens: number;
     let displaySystemPrompt: number;
@@ -268,10 +244,7 @@ export const contextCommand: SlashCommand = {
       displayMemoryFiles = memoryFilesTokens;
       messagesTokens = 0;
       // Free space accounts for the estimated overhead
-      freeSpace = Math.max(
-        0,
-        contextWindowSize - rawOverhead - autocompactBuffer,
-      );
+      freeSpace = Math.max(0, contextWindowSize - rawOverhead - autocompactBuffer);
       detailBuiltinTools = builtinTools;
       detailMcpTools = mcpTools;
       detailMemoryFiles = memoryFiles;
@@ -282,8 +255,7 @@ export const contextCommand: SlashCommand = {
 
       // When estimates overshoot API total, scale down proportionally
       // so the breakdown categories add up to totalTokens.
-      const overheadScale =
-        rawOverhead > totalTokens ? totalTokens / rawOverhead : 1;
+      const overheadScale = rawOverhead > totalTokens ? totalTokens / rawOverhead : 1;
 
       displaySystemPrompt = Math.round(systemPromptTokens * overheadScale);
       const scaledAllTools = Math.round(allToolsTokens * overheadScale);
@@ -293,13 +265,8 @@ export const contextCommand: SlashCommand = {
       const scaledMcpTotal = Math.round(mcpToolsTotalTokens * overheadScale);
       displayMcpTools = scaledMcpTotal;
       // builtinTools = allTools minus skill-definition minus mcpTools
-      const scaledSkillDefinition = Math.round(
-        skillToolDefinitionTokens * overheadScale,
-      );
-      displayBuiltinTools = Math.max(
-        0,
-        scaledAllTools - scaledSkillDefinition - scaledMcpTotal,
-      );
+      const scaledSkillDefinition = Math.round(skillToolDefinitionTokens * overheadScale);
+      displayBuiltinTools = Math.max(0, scaledAllTools - scaledSkillDefinition - scaledMcpTotal);
 
       const scaledOverhead =
         displaySystemPrompt +
@@ -317,10 +284,7 @@ export const contextCommand: SlashCommand = {
         messagesTokens = Math.max(0, totalTokens - scaledOverhead);
       }
 
-      freeSpace = Math.max(
-        0,
-        contextWindowSize - totalTokens - autocompactBuffer,
-      );
+      freeSpace = Math.max(0, contextWindowSize - totalTokens - autocompactBuffer);
 
       // Scale detail items to match their parent categories
       const scaleDetail = <T extends { tokens: number }>(items: T[]): T[] =>
@@ -339,9 +303,7 @@ export const contextCommand: SlashCommand = {
           ? skills.map((item) => ({
               ...item,
               tokens: Math.round(item.tokens * overheadScale),
-              bodyTokens: item.bodyTokens
-                ? Math.round(item.bodyTokens * overheadScale)
-                : undefined,
+              bodyTokens: item.bodyTokens ? Math.round(item.bodyTokens * overheadScale) : undefined,
             }))
           : skills;
     }
diff --git a/apps/airiscode-cli/src/ui/commands/copyCommand.ts b/apps/airiscode-cli/src/ui/commands/copyCommand.ts
index 421b0323b..18a70591f 100644
--- a/apps/airiscode-cli/src/ui/commands/copyCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/copyCommand.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { copyToClipboard } from '../utils/commandUtils.js';
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { copyToClipboard } from "../utils/commandUtils.js";
+import type { SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const copyCommand: SlashCommand = {
-  name: 'copy',
+  name: "copy",
   get description() {
-    return t('Copy the last result or code snippet to clipboard');
+    return t("Copy the last result or code snippet to clipboard");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context, _args): Promise<SlashCommandActionReturn | void> => {
@@ -21,46 +21,46 @@ export const copyCommand: SlashCommand = {
 
     // Get the last message from the AI (model role)
     const lastAiMessage = history
-      ? history.filter((item) => item.role === 'model').pop()
+      ? history.filter((item) => item.role === "model").pop()
       : undefined;
 
     if (!lastAiMessage) {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: 'No output in history',
+        type: "message",
+        messageType: "info",
+        content: "No output in history",
       };
     }
     // Extract text from the parts
     const lastAiOutput = lastAiMessage.parts
       ?.filter((part) => part.text)
       .map((part) => part.text)
-      .join('');
+      .join("");
 
     if (lastAiOutput) {
       try {
         await copyToClipboard(lastAiOutput);
 
         return {
-          type: 'message',
-          messageType: 'info',
-          content: 'Last output copied to the clipboard',
+          type: "message",
+          messageType: "info",
+          content: "Last output copied to the clipboard",
         };
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         context.services.config?.getDebugLogger().debug(message);
 
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: `Failed to copy to the clipboard. ${message}`,
         };
       }
     } else {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: 'Last AI output contains no text to copy.',
+        type: "message",
+        messageType: "info",
+        content: "Last AI output contains no text to copy.",
       };
     }
   },
diff --git a/apps/airiscode-cli/src/ui/commands/directoryCommand.tsx b/apps/airiscode-cli/src/ui/commands/directoryCommand.tsx
index 5046e0ae3..663876cdb 100644
--- a/apps/airiscode-cli/src/ui/commands/directoryCommand.tsx
+++ b/apps/airiscode-cli/src/ui/commands/directoryCommand.tsx
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand, CommandContext } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType } from '../types.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { loadServerHierarchicalMemory } from '@airiscode/core';
-import { t } from '../../i18n/index.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { loadServerHierarchicalMemory } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
+import { MessageType } from "../types.js";
+import type { CommandContext, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export function expandHomeDir(p: string): string {
   if (!p) {
-    return '';
+    return "";
   }
   let expandedPath = p;
-  if (p.toLowerCase().startsWith('%userprofile%')) {
-    expandedPath = os.homedir() + p.substring('%userprofile%'.length);
-  } else if (p === '~' || p.startsWith('~/')) {
+  if (p.toLowerCase().startsWith("%userprofile%")) {
+    expandedPath = os.homedir() + p.substring("%userprofile%".length);
+  } else if (p === "~" || p.startsWith("~/")) {
     expandedPath = os.homedir() + p.substring(1);
   }
   return path.normalize(expandedPath);
@@ -31,32 +31,22 @@ export function expandHomeDir(p: string): string {
  * Supports comma-separated paths by completing only the last segment.
  */
 export function getDirPathCompletions(partialArg: string): string[] {
-  const lastComma = partialArg.lastIndexOf(',');
-  const prefix = lastComma >= 0 ? partialArg.substring(0, lastComma + 1) : '';
-  const partial =
-    lastComma >= 0
-      ? partialArg.substring(lastComma + 1).trimStart()
-      : partialArg;
+  const lastComma = partialArg.lastIndexOf(",");
+  const prefix = lastComma >= 0 ? partialArg.substring(0, lastComma + 1) : "";
+  const partial = lastComma >= 0 ? partialArg.substring(lastComma + 1).trimStart() : partialArg;
 
   const trimmed = partial.trim();
   if (!trimmed) return [];
 
-  const expanded = trimmed.startsWith('~')
-    ? trimmed.replace(/^~/, os.homedir())
-    : trimmed;
-  const endsWithSep = expanded.endsWith('/') || expanded.endsWith(path.sep);
+  const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os.homedir()) : trimmed;
+  const endsWithSep = expanded.endsWith("/") || expanded.endsWith(path.sep);
   const searchDir = endsWithSep ? expanded : path.dirname(expanded);
-  const namePrefix = endsWithSep ? '' : path.basename(expanded);
+  const namePrefix = endsWithSep ? "" : path.basename(expanded);
 
   try {
     return fs
       .readdirSync(searchDir, { withFileTypes: true })
-      .filter(
-        (e) =>
-          e.isDirectory() &&
-          e.name.startsWith(namePrefix) &&
-          !e.name.startsWith('.'),
-      )
+      .filter((e) => e.isDirectory() && e.name.startsWith(namePrefix) && !e.name.startsWith("."))
       .map((e) => prefix + path.join(searchDir, e.name))
       .slice(0, 8);
   } catch {
@@ -65,19 +55,17 @@ export function getDirPathCompletions(partialArg: string): string[] {
 }
 
 export const directoryCommand: SlashCommand = {
-  name: 'directory',
-  altNames: ['dir'],
+  name: "directory",
+  altNames: ["dir"],
   get description() {
-    return t('Manage workspace directories');
+    return t("Manage workspace directories");
   },
   kind: CommandKind.BUILT_IN,
   subCommands: [
     {
-      name: 'add',
+      name: "add",
       get description() {
-        return t(
-          'Add directories to the workspace. Use comma to separate multiple paths',
-        );
+        return t("Add directories to the workspace. Use comma to separate multiple paths");
       },
       kind: CommandKind.BUILT_IN,
       completion: async (_context: CommandContext, partialArg: string) =>
@@ -87,13 +75,13 @@ export const directoryCommand: SlashCommand = {
           ui: { addItem },
           services: { config },
         } = context;
-        const [...rest] = args.split(' ');
+        const [...rest] = args.split(" ");
 
         if (!config) {
           addItem(
             {
               type: MessageType.ERROR,
-              text: t('Configuration is not available.'),
+              text: t("Configuration is not available."),
             },
             Date.now(),
           );
@@ -103,14 +91,14 @@ export const directoryCommand: SlashCommand = {
         const workspaceContext = config.getWorkspaceContext();
 
         const pathsToAdd = rest
-          .join(' ')
-          .split(',')
+          .join(" ")
+          .split(",")
           .filter((p) => p);
         if (pathsToAdd.length === 0) {
           addItem(
             {
               type: MessageType.ERROR,
-              text: t('Please provide at least one path to add.'),
+              text: t("Please provide at least one path to add."),
             },
             Date.now(),
           );
@@ -119,10 +107,10 @@ export const directoryCommand: SlashCommand = {
 
         if (config.isRestrictiveSandbox()) {
           return {
-            type: 'message' as const,
-            messageType: 'error' as const,
+            type: "message" as const,
+            messageType: "error" as const,
             content: t(
-              'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.',
+              "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.",
             ),
           };
         }
@@ -147,19 +135,14 @@ export const directoryCommand: SlashCommand = {
 
         try {
           if (config.shouldLoadMemoryFromIncludeDirectories()) {
-            const { memoryContent, fileCount } =
-              await loadServerHierarchicalMemory(
-                config.getWorkingDir(),
-                [
-                  ...config.getWorkspaceContext().getDirectories(),
-                  ...pathsToAdd,
-                ],
-                config.getFileService(),
-                config.getExtensionContextFilePaths(),
-                config.getFolderTrust(),
-                context.services.settings.merged.context?.importFormat ||
-                  'tree', // Use setting or default to 'tree'
-              );
+            const { memoryContent, fileCount } = await loadServerHierarchicalMemory(
+              config.getWorkingDir(),
+              [...config.getWorkspaceContext().getDirectories(), ...pathsToAdd],
+              config.getFileService(),
+              config.getExtensionContextFilePaths(),
+              config.getFolderTrust(),
+              context.services.settings.merged.context?.importFormat || "tree", // Use setting or default to 'tree'
+            );
             config.setUserMemory(memoryContent);
             config.setGeminiMdFileCount(fileCount);
             context.ui.setGeminiMdFileCount(fileCount);
@@ -168,9 +151,9 @@ export const directoryCommand: SlashCommand = {
             {
               type: MessageType.INFO,
               text: t(
-                'Successfully added AIRISCODE.md files from the following directories if there are:\n- {{directories}}',
+                "Successfully added AIRISCODE.md files from the following directories if there are:\n- {{directories}}",
                 {
-                  directories: added.join('\n- '),
+                  directories: added.join("\n- "),
                 },
               ),
             },
@@ -178,7 +161,7 @@ export const directoryCommand: SlashCommand = {
           );
         } catch (error) {
           errors.push(
-            t('Error refreshing memory: {{error}}', {
+            t("Error refreshing memory: {{error}}", {
               error: (error as Error).message,
             }),
           );
@@ -192,8 +175,8 @@ export const directoryCommand: SlashCommand = {
           addItem(
             {
               type: MessageType.INFO,
-              text: t('Successfully added directories:\n- {{directories}}', {
-                directories: added.join('\n- '),
+              text: t("Successfully added directories:\n- {{directories}}", {
+                directories: added.join("\n- "),
               }),
             },
             Date.now(),
@@ -201,18 +184,15 @@ export const directoryCommand: SlashCommand = {
         }
 
         if (errors.length > 0) {
-          addItem(
-            { type: MessageType.ERROR, text: errors.join('\n') },
-            Date.now(),
-          );
+          addItem({ type: MessageType.ERROR, text: errors.join("\n") }, Date.now());
         }
         return;
       },
     },
     {
-      name: 'show',
+      name: "show",
       get description() {
-        return t('Show all directories in the workspace');
+        return t("Show all directories in the workspace");
       },
       kind: CommandKind.BUILT_IN,
       action: async (context: CommandContext) => {
@@ -224,7 +204,7 @@ export const directoryCommand: SlashCommand = {
           addItem(
             {
               type: MessageType.ERROR,
-              text: t('Configuration is not available.'),
+              text: t("Configuration is not available."),
             },
             Date.now(),
           );
@@ -232,11 +212,11 @@ export const directoryCommand: SlashCommand = {
         }
         const workspaceContext = config.getWorkspaceContext();
         const directories = workspaceContext.getDirectories();
-        const directoryList = directories.map((dir) => `- ${dir}`).join('\n');
+        const directoryList = directories.map((dir) => `- ${dir}`).join("\n");
         addItem(
           {
             type: MessageType.INFO,
-            text: t('Current workspace directories:\n{{directories}}', {
+            text: t("Current workspace directories:\n{{directories}}", {
               directories: directoryList,
             }),
           },
diff --git a/apps/airiscode-cli/src/ui/commands/docsCommand.ts b/apps/airiscode-cli/src/ui/commands/docsCommand.ts
index e03f2d399..a94f89a82 100644
--- a/apps/airiscode-cli/src/ui/commands/docsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/docsCommand.ts
@@ -4,32 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import open from 'open';
-import process from 'node:process';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { MessageType } from '../types.js';
-import { t, getCurrentLanguage } from '../../i18n/index.js';
+import process from "node:process";
+import open from "open";
+import { getCurrentLanguage, t } from "../../i18n/index.js";
+import { MessageType } from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 export const docsCommand: SlashCommand = {
-  name: 'docs',
+  name: "docs",
   get description() {
-    return t('open full AIRIS Code documentation in your browser');
+    return t("open full AIRIS Code documentation in your browser");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context: CommandContext): Promise<void> => {
-    const langPath = getCurrentLanguage()?.startsWith('zh') ? 'zh' : 'en';
+    const langPath = getCurrentLanguage()?.startsWith("zh") ? "zh" : "en";
     const docsUrl = `https://qwenlm.github.io/airiscode-docs/${langPath}`;
 
-    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
+    if (process.env["SANDBOX"] && process.env["SANDBOX"] !== "sandbox-exec") {
       context.ui.addItem(
         {
           type: MessageType.INFO,
           text: t(
-            'Please open the following URL in your browser to view the documentation:\n{{url}}',
+            "Please open the following URL in your browser to view the documentation:\n{{url}}",
             {
               url: docsUrl,
             },
@@ -41,7 +37,7 @@ export const docsCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.INFO,
-          text: t('Opening documentation in your browser: {{url}}', {
+          text: t("Opening documentation in your browser: {{url}}", {
             url: docsUrl,
           }),
         },
diff --git a/apps/airiscode-cli/src/ui/commands/editorCommand.ts b/apps/airiscode-cli/src/ui/commands/editorCommand.ts
index f39cbdbca..59441b02a 100644
--- a/apps/airiscode-cli/src/ui/commands/editorCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/editorCommand.ts
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  CommandKind,
-  type OpenDialogActionReturn,
-  type SlashCommand,
-} from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { CommandKind, type OpenDialogActionReturn, type SlashCommand } from "./types.js";
 
 export const editorCommand: SlashCommand = {
-  name: 'editor',
+  name: "editor",
   get description() {
-    return t('set external editor preference');
+    return t("set external editor preference");
   },
   kind: CommandKind.BUILT_IN,
   action: (): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'editor',
+    type: "dialog",
+    dialog: "editor",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/exportCommand.ts b/apps/airiscode-cli/src/ui/commands/exportCommand.ts
index e77e722bd..2e664e93d 100644
--- a/apps/airiscode-cli/src/ui/commands/exportCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/exportCommand.ts
@@ -4,49 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import {
-  type CommandContext,
-  type SlashCommand,
-  type MessageActionReturn,
-  CommandKind,
-} from './types.js';
-import { SessionService } from '@airiscode/core';
+import * as fs from "node:fs/promises";
+import path from "node:path";
+import { SessionService } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
 import {
   collectSessionData,
+  generateExportFilename,
   normalizeSessionData,
-  toMarkdown,
   toHtml,
   toJson,
   toJsonl,
-  generateExportFilename,
-} from '../utils/export/index.js';
-import { t } from '../../i18n/index.js';
+  toMarkdown,
+} from "../utils/export/index.js";
+import {
+  type CommandContext,
+  CommandKind,
+  type MessageActionReturn,
+  type SlashCommand,
+} from "./types.js";
 
 /**
  * Action for the 'md' subcommand - exports session to markdown.
  */
-async function exportMarkdownAction(
-  context: CommandContext,
-): Promise<MessageActionReturn> {
+async function exportMarkdownAction(context: CommandContext): Promise<MessageActionReturn> {
   const { services } = context;
   const { config } = services;
 
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Configuration not available.',
+      type: "message",
+      messageType: "error",
+      content: "Configuration not available.",
     };
   }
 
   const cwd = config.getWorkingDir() || config.getProjectRoot();
   if (!cwd) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Could not determine current working directory.',
+      type: "message",
+      messageType: "error",
+      content: "Could not determine current working directory.",
     };
   }
 
@@ -58,9 +56,9 @@ async function exportMarkdownAction(
 
     if (!sessionData) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'No active session found to export.',
+        type: "message",
+        messageType: "error",
+        content: "No active session found to export.",
       };
     }
 
@@ -68,30 +66,26 @@ async function exportMarkdownAction(
 
     // Collect and normalize export data (SSOT)
     const exportData = await collectSessionData(conversation, config);
-    const normalizedData = normalizeSessionData(
-      exportData,
-      conversation.messages,
-      config,
-    );
+    const normalizedData = normalizeSessionData(exportData, conversation.messages, config);
 
     // Generate markdown from SSOT
     const markdown = toMarkdown(normalizedData);
 
-    const filename = generateExportFilename('md');
+    const filename = generateExportFilename("md");
     const filepath = path.join(cwd, filename);
 
     // Write to file
-    await fs.writeFile(filepath, markdown, 'utf-8');
+    await fs.writeFile(filepath, markdown, "utf-8");
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: `Session exported to markdown: ${filename}`,
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Failed to export session: ${error instanceof Error ? error.message : String(error)}`,
     };
   }
@@ -100,26 +94,24 @@ async function exportMarkdownAction(
 /**
  * Action for the 'html' subcommand - exports session to HTML.
  */
-async function exportHtmlAction(
-  context: CommandContext,
-): Promise<MessageActionReturn> {
+async function exportHtmlAction(context: CommandContext): Promise<MessageActionReturn> {
   const { services } = context;
   const { config } = services;
 
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Configuration not available.',
+      type: "message",
+      messageType: "error",
+      content: "Configuration not available.",
     };
   }
 
   const cwd = config.getWorkingDir() || config.getProjectRoot();
   if (!cwd) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Could not determine current working directory.',
+      type: "message",
+      messageType: "error",
+      content: "Could not determine current working directory.",
     };
   }
 
@@ -131,9 +123,9 @@ async function exportHtmlAction(
 
     if (!sessionData) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'No active session found to export.',
+        type: "message",
+        messageType: "error",
+        content: "No active session found to export.",
       };
     }
 
@@ -141,30 +133,26 @@ async function exportHtmlAction(
 
     // Collect and normalize export data (SSOT)
     const exportData = await collectSessionData(conversation, config);
-    const normalizedData = normalizeSessionData(
-      exportData,
-      conversation.messages,
-      config,
-    );
+    const normalizedData = normalizeSessionData(exportData, conversation.messages, config);
 
     // Generate HTML from SSOT
     const html = toHtml(normalizedData);
 
-    const filename = generateExportFilename('html');
+    const filename = generateExportFilename("html");
     const filepath = path.join(cwd, filename);
 
     // Write to file
-    await fs.writeFile(filepath, html, 'utf-8');
+    await fs.writeFile(filepath, html, "utf-8");
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: `Session exported to HTML: ${filename}`,
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Failed to export session: ${error instanceof Error ? error.message : String(error)}`,
     };
   }
@@ -173,26 +161,24 @@ async function exportHtmlAction(
 /**
  * Action for the 'json' subcommand - exports session to JSON.
  */
-async function exportJsonAction(
-  context: CommandContext,
-): Promise<MessageActionReturn> {
+async function exportJsonAction(context: CommandContext): Promise<MessageActionReturn> {
   const { services } = context;
   const { config } = services;
 
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Configuration not available.',
+      type: "message",
+      messageType: "error",
+      content: "Configuration not available.",
     };
   }
 
   const cwd = config.getWorkingDir() || config.getProjectRoot();
   if (!cwd) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Could not determine current working directory.',
+      type: "message",
+      messageType: "error",
+      content: "Could not determine current working directory.",
     };
   }
 
@@ -204,9 +190,9 @@ async function exportJsonAction(
 
     if (!sessionData) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'No active session found to export.',
+        type: "message",
+        messageType: "error",
+        content: "No active session found to export.",
       };
     }
 
@@ -214,30 +200,26 @@ async function exportJsonAction(
 
     // Collect and normalize export data (SSOT)
     const exportData = await collectSessionData(conversation, config);
-    const normalizedData = normalizeSessionData(
-      exportData,
-      conversation.messages,
-      config,
-    );
+    const normalizedData = normalizeSessionData(exportData, conversation.messages, config);
 
     // Generate JSON from SSOT
     const json = toJson(normalizedData);
 
-    const filename = generateExportFilename('json');
+    const filename = generateExportFilename("json");
     const filepath = path.join(cwd, filename);
 
     // Write to file
-    await fs.writeFile(filepath, json, 'utf-8');
+    await fs.writeFile(filepath, json, "utf-8");
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: `Session exported to JSON: ${filename}`,
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Failed to export session: ${error instanceof Error ? error.message : String(error)}`,
     };
   }
@@ -246,26 +228,24 @@ async function exportJsonAction(
 /**
  * Action for the 'jsonl' subcommand - exports session to JSONL.
  */
-async function exportJsonlAction(
-  context: CommandContext,
-): Promise<MessageActionReturn> {
+async function exportJsonlAction(context: CommandContext): Promise<MessageActionReturn> {
   const { services } = context;
   const { config } = services;
 
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Configuration not available.',
+      type: "message",
+      messageType: "error",
+      content: "Configuration not available.",
     };
   }
 
   const cwd = config.getWorkingDir() || config.getProjectRoot();
   if (!cwd) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Could not determine current working directory.',
+      type: "message",
+      messageType: "error",
+      content: "Could not determine current working directory.",
     };
   }
 
@@ -277,9 +257,9 @@ async function exportJsonlAction(
 
     if (!sessionData) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'No active session found to export.',
+        type: "message",
+        messageType: "error",
+        content: "No active session found to export.",
       };
     }
 
@@ -287,30 +267,26 @@ async function exportJsonlAction(
 
     // Collect and normalize export data (SSOT)
     const exportData = await collectSessionData(conversation, config);
-    const normalizedData = normalizeSessionData(
-      exportData,
-      conversation.messages,
-      config,
-    );
+    const normalizedData = normalizeSessionData(exportData, conversation.messages, config);
 
     // Generate JSONL from SSOT
     const jsonl = toJsonl(normalizedData);
 
-    const filename = generateExportFilename('jsonl');
+    const filename = generateExportFilename("jsonl");
     const filepath = path.join(cwd, filename);
 
     // Write to file
-    await fs.writeFile(filepath, jsonl, 'utf-8');
+    await fs.writeFile(filepath, jsonl, "utf-8");
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: `Session exported to JSONL: ${filename}`,
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Failed to export session: ${error instanceof Error ? error.message : String(error)}`,
     };
   }
@@ -320,40 +296,40 @@ async function exportJsonlAction(
  * Main export command with subcommands.
  */
 export const exportCommand: SlashCommand = {
-  name: 'export',
+  name: "export",
   get description() {
-    return t('Export current session message history to a file');
+    return t("Export current session message history to a file");
   },
   kind: CommandKind.BUILT_IN,
   subCommands: [
     {
-      name: 'html',
+      name: "html",
       get description() {
-        return t('Export session to HTML format');
+        return t("Export session to HTML format");
       },
       kind: CommandKind.BUILT_IN,
       action: exportHtmlAction,
     },
     {
-      name: 'md',
+      name: "md",
       get description() {
-        return t('Export session to markdown format');
+        return t("Export session to markdown format");
       },
       kind: CommandKind.BUILT_IN,
       action: exportMarkdownAction,
     },
     {
-      name: 'json',
+      name: "json",
       get description() {
-        return t('Export session to JSON format');
+        return t("Export session to JSON format");
       },
       kind: CommandKind.BUILT_IN,
       action: exportJsonAction,
     },
     {
-      name: 'jsonl',
+      name: "jsonl",
       get description() {
-        return t('Export session to JSONL format (one message per line)');
+        return t("Export session to JSONL format (one message per line)");
       },
       kind: CommandKind.BUILT_IN,
       action: exportJsonlAction,
diff --git a/apps/airiscode-cli/src/ui/commands/extensionsCommand.ts b/apps/airiscode-cli/src/ui/commands/extensionsCommand.ts
index 42f40d080..bb17779e2 100644
--- a/apps/airiscode-cli/src/ui/commands/extensionsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/extensionsCommand.ts
@@ -4,64 +4,51 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getErrorMessage } from '../../utils/errors.js';
-import { MessageType } from '../types.js';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { t } from '../../i18n/index.js';
-import {
-  ExtensionManager,
-  parseInstallSource,
-  createDebugLogger,
-} from '@airiscode/core';
-import open from 'open';
-
-const debugLogger = createDebugLogger('EXTENSIONS_COMMAND');
+import { createDebugLogger, ExtensionManager, parseInstallSource } from "@airiscode/core";
+import open from "open";
+import { t } from "../../i18n/index.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { MessageType } from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
+
+const debugLogger = createDebugLogger("EXTENSIONS_COMMAND");
 const EXTENSION_EXPLORE_URL = {
-  Gemini: 'https://geminicli.com/extensions/',
-  ClaudeCode: 'https://claudemarketplaces.com/',
+  Gemini: "https://geminicli.com/extensions/",
+  ClaudeCode: "https://claudemarketplaces.com/",
 } as const;
 
 type ExtensionExploreSource = keyof typeof EXTENSION_EXPLORE_URL;
 
 async function exploreAction(context: CommandContext, args: string) {
   const source = args.trim();
-  const extensionsUrl = source
-    ? EXTENSION_EXPLORE_URL[source as ExtensionExploreSource]
-    : '';
+  const extensionsUrl = source ? EXTENSION_EXPLORE_URL[source as ExtensionExploreSource] : "";
   if (!extensionsUrl) {
     context.ui.addItem(
       {
         type: MessageType.ERROR,
-        text: t('Unknown extensions source: {{source}}.', { source }),
+        text: t("Unknown extensions source: {{source}}.", { source }),
       },
       Date.now(),
     );
     return;
   }
   // Only check for NODE_ENV for explicit test mode, not for unit test framework
-  if (process.env['NODE_ENV'] === 'test') {
+  if (process.env["NODE_ENV"] === "test") {
     context.ui.addItem(
       {
         type: MessageType.INFO,
         text: t(
-          'Would open extensions page in your browser: {{url}} (skipped in test environment)',
+          "Would open extensions page in your browser: {{url}} (skipped in test environment)",
           { url: extensionsUrl },
         ),
       },
       Date.now(),
     );
-  } else if (
-    process.env['SANDBOX'] &&
-    process.env['SANDBOX'] !== 'sandbox-exec'
-  ) {
+  } else if (process.env["SANDBOX"] && process.env["SANDBOX"] !== "sandbox-exec") {
     context.ui.addItem(
       {
         type: MessageType.INFO,
-        text: t('View available extensions at {{url}}', { url: extensionsUrl }),
+        text: t("View available extensions at {{url}}", { url: extensionsUrl }),
       },
       Date.now(),
     );
@@ -69,7 +56,7 @@ async function exploreAction(context: CommandContext, args: string) {
     context.ui.addItem(
       {
         type: MessageType.INFO,
-        text: t('Opening extensions page in your browser: {{url}}', {
+        text: t("Opening extensions page in your browser: {{url}}", {
           url: extensionsUrl,
         }),
       },
@@ -81,10 +68,9 @@ async function exploreAction(context: CommandContext, args: string) {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t(
-            'Failed to open browser. Check out the extensions gallery at {{url}}',
-            { url: extensionsUrl },
-          ),
+          text: t("Failed to open browser. Check out the extensions gallery at {{url}}", {
+            url: extensionsUrl,
+          }),
         },
         Date.now(),
       );
@@ -94,17 +80,15 @@ async function exploreAction(context: CommandContext, args: string) {
 
 async function listAction(_context: CommandContext, _args: string) {
   return {
-    type: 'dialog' as const,
-    dialog: 'extensions_manage' as const,
+    type: "dialog" as const,
+    dialog: "extensions_manage" as const,
   };
 }
 
 async function installAction(context: CommandContext, args: string) {
   const extensionManager = context.services.config?.getExtensionManager();
   if (!(extensionManager instanceof ExtensionManager)) {
-    debugLogger.error(
-      `Cannot ${context.invocation?.name} extensions in this environment`,
-    );
+    debugLogger.error(`Cannot ${context.invocation?.name} extensions in this environment`);
     return;
   }
 
@@ -113,7 +97,7 @@ async function installAction(context: CommandContext, args: string) {
     context.ui.addItem(
       {
         type: MessageType.ERROR,
-        text: t('Usage: /extensions install <source>'),
+        text: t("Usage: /extensions install <source>"),
       },
       Date.now(),
     );
@@ -156,53 +140,33 @@ async function installAction(context: CommandContext, args: string) {
   }
 }
 
-export async function completeExtensions(
-  context: CommandContext,
-  partialArg: string,
-) {
+export async function completeExtensions(context: CommandContext, partialArg: string) {
   let extensions = context.services.config?.getExtensions() ?? [];
 
-  if (context.invocation?.name === 'enable') {
+  if (context.invocation?.name === "enable") {
     extensions = extensions.filter((ext) => !ext.isActive);
   }
-  if (
-    context.invocation?.name === 'disable' ||
-    context.invocation?.name === 'restart'
-  ) {
+  if (context.invocation?.name === "disable" || context.invocation?.name === "restart") {
     extensions = extensions.filter((ext) => ext.isActive);
   }
   const extensionNames = extensions.map((ext) => ext.name);
-  const suggestions = extensionNames.filter((name) =>
-    name.startsWith(partialArg),
-  );
+  const suggestions = extensionNames.filter((name) => name.startsWith(partialArg));
 
-  if (
-    context.invocation?.name !== 'uninstall' &&
-    context.invocation?.name !== 'detail'
-  ) {
-    if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) {
-      suggestions.unshift('--all');
+  if (context.invocation?.name !== "uninstall" && context.invocation?.name !== "detail") {
+    if ("--all".startsWith(partialArg) || "all".startsWith(partialArg)) {
+      suggestions.unshift("--all");
     }
   }
 
   return suggestions;
 }
 
-export async function completeExtensionsAndScopes(
-  context: CommandContext,
-  partialArg: string,
-) {
+export async function completeExtensionsAndScopes(context: CommandContext, partialArg: string) {
   const completions = await completeExtensions(context, partialArg);
-  return completions.flatMap((s) => [
-    `${s} --scope user`,
-    `${s} --scope workspace`,
-  ]);
+  return completions.flatMap((s) => [`${s} --scope user`, `${s} --scope workspace`]);
 }
 
-export async function completeExtensionsExplore(
-  context: CommandContext,
-  partialArg: string,
-) {
+export async function completeExtensionsExplore(context: CommandContext, partialArg: string) {
   const suggestions = Object.keys(EXTENSION_EXPLORE_URL).filter((name) =>
     name.startsWith(partialArg),
   );
@@ -211,9 +175,9 @@ export async function completeExtensionsExplore(
 }
 
 const exploreExtensionsCommand: SlashCommand = {
-  name: 'explore',
+  name: "explore",
   get description() {
-    return t('Open extensions page in your browser');
+    return t("Open extensions page in your browser");
   },
   kind: CommandKind.BUILT_IN,
   action: exploreAction,
@@ -221,34 +185,30 @@ const exploreExtensionsCommand: SlashCommand = {
 };
 
 const manageExtensionsCommand: SlashCommand = {
-  name: 'manage',
+  name: "manage",
   get description() {
-    return t('Manage installed extensions');
+    return t("Manage installed extensions");
   },
   kind: CommandKind.BUILT_IN,
   action: listAction,
 };
 
 const installCommand: SlashCommand = {
-  name: 'install',
+  name: "install",
   get description() {
-    return t('Install an extension from a git repo or local path');
+    return t("Install an extension from a git repo or local path");
   },
   kind: CommandKind.BUILT_IN,
   action: installAction,
 };
 
 export const extensionsCommand: SlashCommand = {
-  name: 'extensions',
+  name: "extensions",
   get description() {
-    return t('Manage extensions');
+    return t("Manage extensions");
   },
   kind: CommandKind.BUILT_IN,
-  subCommands: [
-    manageExtensionsCommand,
-    installCommand,
-    exploreExtensionsCommand,
-  ],
+  subCommands: [manageExtensionsCommand, installCommand, exploreExtensionsCommand],
   action: async (context, args) =>
     // Default to list if no subcommand is provided
     manageExtensionsCommand.action!(context, args),
diff --git a/apps/airiscode-cli/src/ui/commands/helpCommand.ts b/apps/airiscode-cli/src/ui/commands/helpCommand.ts
index 5bc3587c2..0ca0b9874 100644
--- a/apps/airiscode-cli/src/ui/commands/helpCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/helpCommand.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType, type HistoryItemHelp } from '../types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { type HistoryItemHelp, MessageType } from "../types.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const helpCommand: SlashCommand = {
-  name: 'help',
-  altNames: ['?'],
+  name: "help",
+  altNames: ["?"],
   kind: CommandKind.BUILT_IN,
   get description() {
-    return t('for help on AIRIS Code');
+    return t("for help on AIRIS Code");
   },
   action: async (context) => {
-    const helpItem: Omit<HistoryItemHelp, 'id'> = {
+    const helpItem: Omit<HistoryItemHelp, "id"> = {
       type: MessageType.HELP,
       timestamp: new Date(),
     };
diff --git a/apps/airiscode-cli/src/ui/commands/hooksCommand.ts b/apps/airiscode-cli/src/ui/commands/hooksCommand.ts
index 56d3531b4..3f706f129 100644
--- a/apps/airiscode-cli/src/ui/commands/hooksCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/hooksCommand.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { HookRegistryEntry } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
 import type {
-  SlashCommand,
-  SlashCommandActionReturn,
   CommandContext,
   MessageActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
-import type { HookRegistryEntry } from '@airiscode/core';
+  SlashCommand,
+  SlashCommandActionReturn,
+} from "./types.js";
+import { CommandKind } from "./types.js";
 
 /**
  * Format hook source for display
  */
 function formatHookSource(source: string): string {
   switch (source) {
-    case 'project':
-      return t('Project');
-    case 'user':
-      return t('User');
-    case 'system':
-      return t('System');
-    case 'extensions':
-      return t('Extension');
+    case "project":
+      return t("Project");
+    case "user":
+      return t("User");
+    case "system":
+      return t("System");
+    case "extensions":
+      return t("Extension");
     default:
       return source;
   }
@@ -36,36 +36,31 @@ function formatHookSource(source: string): string {
  * Format hook status for display
  */
 function formatHookStatus(enabled: boolean): string {
-  return enabled ? t('✓ Enabled') : t('✗ Disabled');
+  return enabled ? t("✓ Enabled") : t("✗ Disabled");
 }
 
 const listCommand: SlashCommand = {
-  name: 'list',
+  name: "list",
   get description() {
-    return t('List all configured hooks');
+    return t("List all configured hooks");
   },
   kind: CommandKind.BUILT_IN,
-  action: async (
-    context: CommandContext,
-    _args: string,
-  ): Promise<MessageActionReturn> => {
+  action: async (context: CommandContext, _args: string): Promise<MessageActionReturn> => {
     const { config } = context.services;
     if (!config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Config not loaded.'),
+        type: "message",
+        messageType: "error",
+        content: t("Config not loaded."),
       };
     }
 
     const hookSystem = config.getHookSystem();
     if (!hookSystem) {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: t(
-          'Hooks are not enabled. Enable hooks in settings to use this feature.',
-        ),
+        type: "message",
+        messageType: "info",
+        content: t("Hooks are not enabled. Enable hooks in settings to use this feature."),
       };
     }
 
@@ -74,11 +69,9 @@ const listCommand: SlashCommand = {
 
     if (allHooks.length === 0) {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: t(
-          'No hooks configured. Add hooks in your settings.json file.',
-        ),
+        type: "message",
+        messageType: "info",
+        content: t("No hooks configured. Add hooks in your settings.json file."),
       };
     }
 
@@ -97,44 +90,46 @@ const listCommand: SlashCommand = {
     for (const [eventName, hooks] of hooksByEvent) {
       output += `### ${eventName}\n`;
       for (const hook of hooks) {
-        const name = hook.config.name || ('command' in hook.config ? hook.config.command : 'inject') || 'unnamed';
+        const name =
+          hook.config.name ||
+          ("command" in hook.config ? hook.config.command : "inject") ||
+          "unnamed";
         const source = formatHookSource(hook.source);
         const status = formatHookStatus(hook.enabled);
-        const matcher = hook.matcher ? ` (matcher: ${hook.matcher})` : '';
+        const matcher = hook.matcher ? ` (matcher: ${hook.matcher})` : "";
         output += `- **${name}** [${source}] ${status}${matcher}\n`;
       }
-      output += '\n';
+      output += "\n";
     }
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: output,
     };
   },
 };
 
 export const hooksCommand: SlashCommand = {
-  name: 'hooks',
+  name: "hooks",
   get description() {
-    return t('Manage AIRIS Code hooks');
+    return t("Manage AIRIS Code hooks");
   },
   kind: CommandKind.BUILT_IN,
-  action: async (
-    context: CommandContext,
-    args: string,
-  ): Promise<SlashCommandActionReturn> => {
+  action: async (context: CommandContext, args: string): Promise<SlashCommandActionReturn> => {
     // In interactive mode, open the hooks dialog
-    const executionMode = context.executionMode ?? 'interactive';
-    if (executionMode === 'interactive') {
+    const executionMode = context.executionMode ?? "interactive";
+    if (executionMode === "interactive") {
       return {
-        type: 'dialog',
-        dialog: 'hooks',
+        type: "dialog",
+        dialog: "hooks",
       };
     }
 
     // In non-interactive mode, list hooks
-    const result = await listCommand.action?.(context, args) as SlashCommandActionReturn | undefined;
-    return result ?? { type: 'message', messageType: 'info', content: '' };
+    const result = (await listCommand.action?.(context, args)) as
+      | SlashCommandActionReturn
+      | undefined;
+    return result ?? { type: "message", messageType: "info", content: "" };
   },
 };
diff --git a/apps/airiscode-cli/src/ui/commands/ideCommand.ts b/apps/airiscode-cli/src/ui/commands/ideCommand.ts
index 77132e15d..3b812d7a1 100644
--- a/apps/airiscode-cli/src/ui/commands/ideCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/ideCommand.ts
@@ -4,44 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import path from "node:path";
 import {
+  AIRISCODE_COMPANION_EXTENSION_NAME,
   type Config,
-  IdeClient,
   type File,
-  logIdeConnection,
-  IdeConnectionEvent,
-  IdeConnectionType,
-} from '@airiscode/core';
-import {
-  AIRISCODE_COMPANION_EXTENSION_NAME,
   getIdeInstaller,
   IDEConnectionStatus,
+  IdeClient,
+  IdeConnectionEvent,
+  IdeConnectionType,
   ideContextStore,
-} from '@airiscode/core';
-import path from 'node:path';
-import type {
-  CommandContext,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import { SettingScope } from '../../config/settings.js';
-import { t } from '../../i18n/index.js';
+  logIdeConnection,
+} from "@airiscode/core";
+import { SettingScope } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
+import type { CommandContext, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 function getIdeStatusMessage(ideClient: IdeClient): {
-  messageType: 'info' | 'error';
+  messageType: "info" | "error";
   content: string;
 } {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
     case IDEConnectionStatus.Connected:
       return {
-        messageType: 'info',
+        messageType: "info",
         content: `🟢 Connected to ${ideClient.getDetectedIdeDisplayName()}`,
       };
     case IDEConnectionStatus.Connecting:
       return {
-        messageType: 'info',
+        messageType: "info",
         content: `🟡 Connecting...`,
       };
     default: {
@@ -50,7 +44,7 @@ function getIdeStatusMessage(ideClient: IdeClient): {
         content += `: ${connection.details}`;
       }
       return {
-        messageType: 'error',
+        messageType: "error",
         content,
       };
     }
@@ -69,13 +63,11 @@ function formatFileList(openFiles: File[]): string {
       const basename = path.basename(file.path);
       const isDuplicate = (basenameCounts.get(basename) || 0) > 1;
       const parentDir = path.basename(path.dirname(file.path));
-      const displayName = isDuplicate
-        ? `${basename} (/${parentDir})`
-        : basename;
+      const displayName = isDuplicate ? `${basename} (/${parentDir})` : basename;
 
-      return `  - ${displayName}${file.isActive ? ' (active)' : ''}`;
+      return `  - ${displayName}${file.isActive ? " (active)" : ""}`;
     })
-    .join('\n');
+    .join("\n");
 
   const infoMessage = `
 (Note: The file list is limited to a number of recently accessed files within your workspace and only includes local files on disk)`;
@@ -84,7 +76,7 @@ function formatFileList(openFiles: File[]): string {
 }
 
 async function getIdeStatusMessageWithFiles(ideClient: IdeClient): Promise<{
-  messageType: 'info' | 'error';
+  messageType: "info" | "error";
   content: string;
 }> {
   const connection = ideClient.getConnectionStatus();
@@ -97,13 +89,13 @@ async function getIdeStatusMessageWithFiles(ideClient: IdeClient): Promise<{
         content += formatFileList(openFiles);
       }
       return {
-        messageType: 'info',
+        messageType: "info",
         content,
       };
     }
     case IDEConnectionStatus.Connecting:
       return {
-        messageType: 'info',
+        messageType: "info",
         content: `🟡 Connecting...`,
       };
     default: {
@@ -112,17 +104,14 @@ async function getIdeStatusMessageWithFiles(ideClient: IdeClient): Promise<{
         content += `: ${connection.details}`;
       }
       return {
-        messageType: 'error',
+        messageType: "error",
         content,
       };
     }
   }
 }
 
-async function setIdeModeAndSyncConnection(
-  config: Config,
-  value: boolean,
-): Promise<void> {
+async function setIdeModeAndSyncConnection(config: Config, value: boolean): Promise<void> {
   config.setIdeMode(value);
   const ideClient = await IdeClient.getInstance();
   if (value) {
@@ -138,42 +127,41 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   const currentIDE = ideClient.getCurrentIde();
   if (!currentIDE) {
     return {
-      name: 'ide',
+      name: "ide",
       get description() {
-        return t('manage IDE integration');
+        return t("manage IDE integration");
       },
       kind: CommandKind.BUILT_IN,
       action: (): SlashCommandActionReturn =>
         ({
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: t(
-            'IDE integration is not supported in your current environment. To use this feature, run AIRIS Code in one of these supported IDEs: VS Code or VS Code forks.',
+            "IDE integration is not supported in your current environment. To use this feature, run AIRIS Code in one of these supported IDEs: VS Code or VS Code forks.",
           ),
         }) as const,
     };
   }
 
   const ideSlashCommand: SlashCommand = {
-    name: 'ide',
+    name: "ide",
     get description() {
-      return t('manage IDE integration');
+      return t("manage IDE integration");
     },
     kind: CommandKind.BUILT_IN,
     subCommands: [],
   };
 
   const statusCommand: SlashCommand = {
-    name: 'status',
+    name: "status",
     get description() {
-      return t('check status of IDE integration');
+      return t("check status of IDE integration");
     },
     kind: CommandKind.BUILT_IN,
     action: async (): Promise<SlashCommandActionReturn> => {
-      const { messageType, content } =
-        await getIdeStatusMessageWithFiles(ideClient);
+      const { messageType, content } = await getIdeStatusMessageWithFiles(ideClient);
       return {
-        type: 'message',
+        type: "message",
         messageType,
         content,
       } as const;
@@ -181,21 +169,21 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   };
 
   const installCommand: SlashCommand = {
-    name: 'install',
+    name: "install",
     get description() {
-      const ideName = ideClient.getDetectedIdeDisplayName() ?? 'IDE';
-      return t('install required IDE companion for {{ideName}}', {
+      const ideName = ideClient.getDetectedIdeDisplayName() ?? "IDE";
+      return t("install required IDE companion for {{ideName}}", {
         ideName,
       });
     },
     kind: CommandKind.BUILT_IN,
     action: async (context) => {
       const installer = getIdeInstaller(currentIDE);
-      const isSandBox = !!process.env['SANDBOX'];
+      const isSandBox = !!process.env["SANDBOX"];
       if (isSandBox) {
         context.ui.addItem(
           {
-            type: 'info',
+            type: "info",
             text: `IDE integration needs to be installed on the host. If you have already installed it, you can directly connect the ide`,
           },
           Date.now(),
@@ -206,7 +194,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
         const ideName = ideClient.getDetectedIdeDisplayName();
         context.ui.addItem(
           {
-            type: 'error',
+            type: "error",
             text: `Automatic installation is not supported for ${ideName}. Please install the '${AIRISCODE_COMPANION_EXTENSION_NAME}' extension manually from the marketplace.`,
           },
           Date.now(),
@@ -216,7 +204,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
 
       context.ui.addItem(
         {
-          type: 'info',
+          type: "info",
           text: `Installing IDE companion...`,
         },
         Date.now(),
@@ -225,31 +213,24 @@ export const ideCommand = async (): Promise<SlashCommand> => {
       const result = await installer.install();
       context.ui.addItem(
         {
-          type: result.success ? 'info' : 'error',
+          type: result.success ? "info" : "error",
           text: result.message,
         },
         Date.now(),
       );
       if (result.success) {
-        context.services.settings.setValue(
-          SettingScope.User,
-          'ide.enabled',
-          true,
-        );
+        context.services.settings.setValue(SettingScope.User, "ide.enabled", true);
         // Poll for up to 5 seconds for the extension to activate.
         for (let i = 0; i < 10; i++) {
           await setIdeModeAndSyncConnection(context.services.config!, true);
-          if (
-            ideClient.getConnectionStatus().status ===
-            IDEConnectionStatus.Connected
-          ) {
+          if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
             break;
           }
           await new Promise((resolve) => setTimeout(resolve, 500));
         }
 
         const { messageType, content } = getIdeStatusMessage(ideClient);
-        if (messageType === 'error') {
+        if (messageType === "error") {
           context.ui.addItem(
             {
               type: messageType,
@@ -271,17 +252,13 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   };
 
   const enableCommand: SlashCommand = {
-    name: 'enable',
+    name: "enable",
     get description() {
-      return t('enable IDE integration');
+      return t("enable IDE integration");
     },
     kind: CommandKind.BUILT_IN,
     action: async (context: CommandContext) => {
-      context.services.settings.setValue(
-        SettingScope.User,
-        'ide.enabled',
-        true,
-      );
+      context.services.settings.setValue(SettingScope.User, "ide.enabled", true);
       await setIdeModeAndSyncConnection(context.services.config!, true);
       const { messageType, content } = getIdeStatusMessage(ideClient);
       context.ui.addItem(
@@ -295,17 +272,13 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   };
 
   const disableCommand: SlashCommand = {
-    name: 'disable',
+    name: "disable",
     get description() {
-      return t('disable IDE integration');
+      return t("disable IDE integration");
     },
     kind: CommandKind.BUILT_IN,
     action: async (context: CommandContext) => {
-      context.services.settings.setValue(
-        SettingScope.User,
-        'ide.enabled',
-        false,
-      );
+      context.services.settings.setValue(SettingScope.User, "ide.enabled", false);
       await setIdeModeAndSyncConnection(context.services.config!, false);
       const { messageType, content } = getIdeStatusMessage(ideClient);
       context.ui.addItem(
@@ -324,11 +297,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   if (isConnected) {
     ideSlashCommand.subCommands = [statusCommand, disableCommand];
   } else {
-    ideSlashCommand.subCommands = [
-      enableCommand,
-      statusCommand,
-      installCommand,
-    ];
+    ideSlashCommand.subCommands = [enableCommand, statusCommand, installCommand];
   }
 
   return ideSlashCommand;
diff --git a/apps/airiscode-cli/src/ui/commands/initCommand.ts b/apps/airiscode-cli/src/ui/commands/initCommand.ts
index 4daa1a8c8..4272e1631 100644
--- a/apps/airiscode-cli/src/ui/commands/initCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/initCommand.ts
@@ -4,34 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import type {
-  CommandContext,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from './types.js';
-import { getCurrentGeminiMdFilename } from '@airiscode/core';
-import { CommandKind } from './types.js';
-import { Text } from 'ink';
-import React from 'react';
-import { t } from '../../i18n/index.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { getCurrentGeminiMdFilename } from "@airiscode/core";
+import { Text } from "ink";
+import React from "react";
+import { t } from "../../i18n/index.js";
+import type { CommandContext, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const initCommand: SlashCommand = {
-  name: 'init',
+  name: "init",
   get description() {
-    return t('Analyzes the project and creates a tailored AIRISCODE.md file.');
+    return t("Analyzes the project and creates a tailored AIRISCODE.md file.");
   },
   kind: CommandKind.BUILT_IN,
-  action: async (
-    context: CommandContext,
-    _args: string,
-  ): Promise<SlashCommandActionReturn> => {
+  action: async (context: CommandContext, _args: string): Promise<SlashCommandActionReturn> => {
     if (!context.services.config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Configuration not available.'),
+        type: "message",
+        messageType: "error",
+        content: t("Configuration not available."),
       };
     }
     const targetDir = context.services.config.getTargetDir();
@@ -42,12 +35,12 @@ export const initCommand: SlashCommand = {
       if (fs.existsSync(contextFilePath)) {
         // If file exists but is empty (or whitespace), continue to initialize
         try {
-          const existing = fs.readFileSync(contextFilePath, 'utf8');
+          const existing = fs.readFileSync(contextFilePath, "utf8");
           if (existing && existing.trim().length > 0) {
             // File exists and has content - ask for confirmation to overwrite
             if (!context.overwriteConfirmed) {
               return {
-                type: 'confirm_action',
+                type: "confirm_action",
                 // TODO: Move to .tsx file to use JSX syntax instead of React.createElement
                 // For now, using React.createElement to maintain .ts compatibility for PR review
                 prompt: React.createElement(
@@ -56,7 +49,7 @@ export const initCommand: SlashCommand = {
                   `A ${contextFileName} file already exists in this directory. Do you want to regenerate it?`,
                 ),
                 originalInvocation: {
-                  raw: context.invocation?.raw || '/init',
+                  raw: context.invocation?.raw || "/init",
                 },
               };
             }
@@ -69,31 +62,31 @@ export const initCommand: SlashCommand = {
 
       // Ensure an empty context file exists before prompting the model to populate it
       try {
-        fs.writeFileSync(contextFilePath, '', 'utf8');
+        fs.writeFileSync(contextFilePath, "", "utf8");
         context.ui.addItem(
           {
-            type: 'info',
+            type: "info",
             text: `Empty ${contextFileName} created. Now analyzing the project to populate it.`,
           },
           Date.now(),
         );
       } catch (err) {
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: `Failed to create ${contextFileName}: ${err instanceof Error ? err.message : String(err)}`,
         };
       }
     } catch (error) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Unexpected error preparing ${contextFileName}: ${error instanceof Error ? error.message : String(error)}`,
       };
     }
 
     return {
-      type: 'submit_prompt',
+      type: "submit_prompt",
       content: `
 You are AIRIS Code, an interactive CLI agent. Analyze the current directory and generate a comprehensive ${contextFileName} file to be used as instructional context for future interactions.
 
diff --git a/apps/airiscode-cli/src/ui/commands/insightCommand.ts b/apps/airiscode-cli/src/ui/commands/insightCommand.ts
index fdfed82ba..58d1d8031 100644
--- a/apps/airiscode-cli/src/ui/commands/insightCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/insightCommand.ts
@@ -4,43 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandContext, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType } from '../types.js';
-import type { HistoryItemInsightProgress } from '../types.js';
-import { t } from '../../i18n/index.js';
-import { join } from 'path';
-import { StaticInsightGenerator } from '../../services/insight/generators/StaticInsightGenerator.js';
-import { createDebugLogger, Storage } from '@airiscode/core';
-import open from 'open';
-
-const logger = createDebugLogger('DataProcessor');
+import { createDebugLogger, Storage } from "@airiscode/core";
+import open from "open";
+import { join } from "path";
+import { t } from "../../i18n/index.js";
+import { StaticInsightGenerator } from "../../services/insight/generators/StaticInsightGenerator.js";
+import type { HistoryItemInsightProgress } from "../types.js";
+import { MessageType } from "../types.js";
+import type { CommandContext, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
+
+const logger = createDebugLogger("DataProcessor");
 
 export const insightCommand: SlashCommand = {
-  name: 'insight',
+  name: "insight",
   get description() {
-    return t(
-      'generate personalized programming insights from your chat history',
-    );
+    return t("generate personalized programming insights from your chat history");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context: CommandContext) => {
     try {
-      context.ui.setDebugMessage(t('Generating insights...'));
+      context.ui.setDebugMessage(t("Generating insights..."));
 
-      const projectsDir = join(Storage.getRuntimeBaseDir(), 'projects');
+      const projectsDir = join(Storage.getRuntimeBaseDir(), "projects");
       if (!context.services.config) {
-        throw new Error('Config service is not available');
+        throw new Error("Config service is not available");
       }
-      const insightGenerator = new StaticInsightGenerator(
-        context.services.config,
-      );
+      const insightGenerator = new StaticInsightGenerator(context.services.config);
 
-      const updateProgress = (
-        stage: string,
-        progress: number,
-        detail?: string,
-      ) => {
+      const updateProgress = (stage: string, progress: number, detail?: string) => {
         const progressItem: HistoryItemInsightProgress = {
           type: MessageType.INSIGHT_PROGRESS,
           progress: {
@@ -55,19 +47,16 @@ export const insightCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.INFO,
-          text: t('This may take a couple minutes. Sit tight!'),
+          text: t("This may take a couple minutes. Sit tight!"),
         },
         Date.now(),
       );
 
       // Initial progress
-      updateProgress(t('Starting insight generation...'), 0);
+      updateProgress(t("Starting insight generation..."), 0);
 
       // Generate the static insight HTML file
-      const outputPath = await insightGenerator.generateStaticInsight(
-        projectsDir,
-        updateProgress,
-      );
+      const outputPath = await insightGenerator.generateStaticInsight(projectsDir, updateProgress);
 
       // Clear pending item
       context.ui.setPendingItem(null);
@@ -75,7 +64,7 @@ export const insightCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.INFO,
-          text: t('Insight report generated successfully!'),
+          text: t("Insight report generated successfully!"),
         },
         Date.now(),
       );
@@ -87,30 +76,27 @@ export const insightCommand: SlashCommand = {
         context.ui.addItem(
           {
             type: MessageType.INFO,
-            text: t('Opening insights in your browser: {{path}}', {
+            text: t("Opening insights in your browser: {{path}}", {
               path: outputPath,
             }),
           },
           Date.now(),
         );
       } catch (browserError) {
-        logger.error('Failed to open browser automatically:', browserError);
+        logger.error("Failed to open browser automatically:", browserError);
 
         context.ui.addItem(
           {
             type: MessageType.INFO,
-            text: t(
-              'Insights generated at: {{path}}. Please open this file in your browser.',
-              {
-                path: outputPath,
-              },
-            ),
+            text: t("Insights generated at: {{path}}. Please open this file in your browser.", {
+              path: outputPath,
+            }),
           },
           Date.now(),
         );
       }
 
-      context.ui.setDebugMessage(t('Insights ready.'));
+      context.ui.setDebugMessage(t("Insights ready."));
     } catch (error) {
       // Clear pending item on error
       context.ui.setPendingItem(null);
@@ -118,14 +104,14 @@ export const insightCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t('Failed to generate insights: {{error}}', {
+          text: t("Failed to generate insights: {{error}}", {
             error: (error as Error).message,
           }),
         },
         Date.now(),
       );
 
-      logger.error('Insight generation error:', error);
+      logger.error("Insight generation error:", error);
     }
   },
 };
diff --git a/apps/airiscode-cli/src/ui/commands/languageCommand.ts b/apps/airiscode-cli/src/ui/commands/languageCommand.ts
index e21f046aa..f939bf519 100644
--- a/apps/airiscode-cli/src/ui/commands/languageCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/languageCommand.ts
@@ -4,33 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  SlashCommand,
-  CommandContext,
-  SlashCommandActionReturn,
-  MessageActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import { SettingScope } from '../../config/settings.js';
+import { createDebugLogger } from "@airiscode/core";
+import { SettingScope } from "../../config/settings.js";
 import {
-  setLanguageAsync,
   getCurrentLanguage,
   type SupportedLanguage,
+  setLanguageAsync,
   t,
-} from '../../i18n/index.js';
+} from "../../i18n/index.js";
+import { getSupportedLanguageIds, SUPPORTED_LANGUAGES } from "../../i18n/languages.js";
 import {
-  SUPPORTED_LANGUAGES,
-  getSupportedLanguageIds,
-} from '../../i18n/languages.js';
-import {
-  OUTPUT_LANGUAGE_AUTO,
   isAutoLanguage,
+  OUTPUT_LANGUAGE_AUTO,
   resolveOutputLanguage,
   updateOutputLanguageFile,
-} from '../../utils/languageUtils.js';
-import { createDebugLogger } from '@airiscode/core';
+} from "../../utils/languageUtils.js";
+import type {
+  CommandContext,
+  MessageActionReturn,
+  SlashCommand,
+  SlashCommandActionReturn,
+} from "./types.js";
+import { CommandKind } from "./types.js";
 
-const debugLogger = createDebugLogger('LANGUAGE_COMMAND');
+const debugLogger = createDebugLogger("LANGUAGE_COMMAND");
 
 /**
  * Gets the current LLM output language setting and its resolved value.
@@ -41,8 +38,7 @@ function getCurrentOutputLanguage(context?: CommandContext): {
   resolved: string;
 } {
   const settingValue =
-    context?.services?.settings?.merged?.general?.outputLanguage ||
-    OUTPUT_LANGUAGE_AUTO;
+    context?.services?.settings?.merged?.general?.outputLanguage || OUTPUT_LANGUAGE_AUTO;
   const resolved = resolveOutputLanguage(settingValue);
   return { setting: settingValue, resolved };
 }
@@ -89,9 +85,9 @@ async function setUiLanguage(
 
   if (!services.config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: t('Configuration not available.'),
+      type: "message",
+      messageType: "error",
+      content: t("Configuration not available."),
     };
   }
 
@@ -101,9 +97,9 @@ async function setUiLanguage(
   // Persist to settings
   if (services.settings?.setValue) {
     try {
-      services.settings.setValue(SettingScope.User, 'general.language', lang);
+      services.settings.setValue(SettingScope.User, "general.language", lang);
     } catch (error) {
-      debugLogger.warn('Failed to save language setting:', error);
+      debugLogger.warn("Failed to save language setting:", error);
     }
   }
 
@@ -111,9 +107,9 @@ async function setUiLanguage(
   context.ui.reloadCommands();
 
   return {
-    type: 'message',
-    messageType: 'info',
-    content: t('UI language changed to {{lang}}', {
+    type: "message",
+    messageType: "info",
+    content: t("UI language changed to {{lang}}", {
       lang: formatUiLanguageDisplay(lang),
     }),
   };
@@ -141,58 +137,50 @@ async function setOutputLanguage(
       try {
         context.services.settings.setValue(
           SettingScope.User,
-          'general.outputLanguage',
+          "general.outputLanguage",
           settingValue,
         );
       } catch (error) {
-        debugLogger.warn('Failed to save output language setting:', error);
+        debugLogger.warn("Failed to save output language setting:", error);
       }
     }
 
     // Format display message
-    const displayLang = isAuto
-      ? `${t('Auto (detect from system)')} → ${resolved}`
-      : resolved;
+    const displayLang = isAuto ? `${t("Auto (detect from system)")} → ${resolved}` : resolved;
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: [
-        t('LLM output language set to {{lang}}', { lang: displayLang }),
-        '',
-        t('Please restart the application for the changes to take effect.'),
-      ].join('\n'),
+        t("LLM output language set to {{lang}}", { lang: displayLang }),
+        "",
+        t("Please restart the application for the changes to take effect."),
+      ].join("\n"),
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: t(
-        'Failed to generate LLM output language rule file: {{error}}',
-        {
-          error: error instanceof Error ? error.message : String(error),
-        },
-      ),
+      type: "message",
+      messageType: "error",
+      content: t("Failed to generate LLM output language rule file: {{error}}", {
+        error: error instanceof Error ? error.message : String(error),
+      }),
     };
   }
 }
 
 export const languageCommand: SlashCommand = {
-  name: 'language',
+  name: "language",
   get description() {
-    return t('View or change the language setting');
+    return t("View or change the language setting");
   },
   kind: CommandKind.BUILT_IN,
 
-  action: async (
-    context: CommandContext,
-    args: string,
-  ): Promise<SlashCommandActionReturn> => {
+  action: async (context: CommandContext, args: string): Promise<SlashCommandActionReturn> => {
     if (!context.services.config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Configuration not available.'),
+        type: "message",
+        messageType: "error",
+        content: t("Configuration not available."),
       };
     }
 
@@ -202,17 +190,12 @@ export const languageCommand: SlashCommand = {
     if (trimmedArgs) {
       const [firstArg, ...rest] = trimmedArgs.split(/\s+/);
       const subCommandName = firstArg.toLowerCase();
-      const subArgs = rest.join(' ');
+      const subArgs = rest.join(" ");
 
-      if (subCommandName === 'ui' || subCommandName === 'output') {
-        const subCommand = languageCommand.subCommands?.find(
-          (s) => s.name === subCommandName,
-        );
+      if (subCommandName === "ui" || subCommandName === "output") {
+        const subCommand = languageCommand.subCommands?.find((s) => s.name === subCommandName);
         if (subCommand?.action) {
-          return subCommand.action(
-            context,
-            subArgs,
-          ) as Promise<SlashCommandActionReturn>;
+          return subCommand.action(context, subArgs) as Promise<SlashCommandActionReturn>;
         }
       }
 
@@ -224,87 +207,79 @@ export const languageCommand: SlashCommand = {
 
       // Unknown argument
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: [
-          t('Invalid command. Available subcommands:'),
-          `  - /language ui [${getSupportedLanguageIds()}] - ${t('Set UI language')}`,
-          `  - /language output <language> - ${t('Set LLM output language')}`,
-        ].join('\n'),
+          t("Invalid command. Available subcommands:"),
+          `  - /language ui [${getSupportedLanguageIds()}] - ${t("Set UI language")}`,
+          `  - /language output <language> - ${t("Set LLM output language")}`,
+        ].join("\n"),
       };
     }
 
     // No arguments: show current status
     const currentUiLang = getCurrentLanguage();
-    const { setting: outputSetting, resolved: outputResolved } =
-      getCurrentOutputLanguage(context);
+    const { setting: outputSetting, resolved: outputResolved } = getCurrentOutputLanguage(context);
 
     // Format output language display: show "Auto → English" or just "English"
     const outputLangDisplay = isAutoLanguage(outputSetting)
-      ? `${t('Auto (detect from system)')} → ${outputResolved}`
+      ? `${t("Auto (detect from system)")} → ${outputResolved}`
       : outputResolved;
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: [
-        t('Current UI language: {{lang}}', {
+        t("Current UI language: {{lang}}", {
           lang: formatUiLanguageDisplay(currentUiLang as SupportedLanguage),
         }),
-        t('Current LLM output language: {{lang}}', { lang: outputLangDisplay }),
-        '',
-        t('Available subcommands:'),
-        `  /language ui [${getSupportedLanguageIds()}] - ${t('Set UI language')}`,
-        `  /language output <language> - ${t('Set LLM output language')}`,
-      ].join('\n'),
+        t("Current LLM output language: {{lang}}", { lang: outputLangDisplay }),
+        "",
+        t("Available subcommands:"),
+        `  /language ui [${getSupportedLanguageIds()}] - ${t("Set UI language")}`,
+        `  /language output <language> - ${t("Set LLM output language")}`,
+      ].join("\n"),
     };
   },
 
   subCommands: [
     // /language ui subcommand
     {
-      name: 'ui',
+      name: "ui",
       get description() {
-        return t('Set UI language');
+        return t("Set UI language");
       },
       kind: CommandKind.BUILT_IN,
 
-      action: async (
-        context: CommandContext,
-        args: string,
-      ): Promise<MessageActionReturn> => {
+      action: async (context: CommandContext, args: string): Promise<MessageActionReturn> => {
         const trimmedArgs = args.trim();
 
         if (!trimmedArgs) {
           return {
-            type: 'message',
-            messageType: 'info',
+            type: "message",
+            messageType: "info",
             content: [
-              t('Set UI language'),
-              '',
-              t('Usage: /language ui [{{options}}]', {
+              t("Set UI language"),
+              "",
+              t("Usage: /language ui [{{options}}]", {
                 options: getSupportedLanguageIds(),
               }),
-              '',
-              t('Available options:'),
-              ...SUPPORTED_LANGUAGES.map(
-                (o) => `  - ${o.id}: ${o.nativeName || o.fullName}`,
-              ),
-              '',
-              t(
-                'To request additional UI language packs, please open an issue on GitHub.',
-              ),
-            ].join('\n'),
+              "",
+              t("Available options:"),
+              ...SUPPORTED_LANGUAGES.map((o) => `  - ${o.id}: ${o.nativeName || o.fullName}`),
+              "",
+              t("To request additional UI language packs, please open an issue on GitHub."),
+            ].join("\n"),
           };
         }
 
         const targetLang = parseUiLanguageArg(trimmedArgs);
         if (!targetLang) {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: t('Invalid language. Available: {{options}}', {
-              options: getSupportedLanguageIds(','),
+            type: "message",
+            messageType: "error",
+            content: t("Invalid language. Available: {{options}}", {
+              options: getSupportedLanguageIds(","),
             }),
           };
         }
@@ -317,7 +292,7 @@ export const languageCommand: SlashCommand = {
         (lang): SlashCommand => ({
           name: lang.id,
           get description() {
-            return t('Set UI language to {{name}}', {
+            return t("Set UI language to {{name}}", {
               name: lang.nativeName || lang.fullName,
             });
           },
@@ -325,11 +300,9 @@ export const languageCommand: SlashCommand = {
           action: async (context, args) => {
             if (args.trim()) {
               return {
-                type: 'message',
-                messageType: 'error',
-                content: t(
-                  'Language subcommands do not accept additional arguments.',
-                ),
+                type: "message",
+                messageType: "error",
+                content: t("Language subcommands do not accept additional arguments."),
               };
             }
             return setUiLanguage(context, lang.code);
@@ -340,30 +313,27 @@ export const languageCommand: SlashCommand = {
 
     // /language output subcommand
     {
-      name: 'output',
+      name: "output",
       get description() {
-        return t('Set LLM output language');
+        return t("Set LLM output language");
       },
       kind: CommandKind.BUILT_IN,
 
-      action: async (
-        context: CommandContext,
-        args: string,
-      ): Promise<MessageActionReturn> => {
+      action: async (context: CommandContext, args: string): Promise<MessageActionReturn> => {
         const trimmedArgs = args.trim();
 
         if (!trimmedArgs) {
           return {
-            type: 'message',
-            messageType: 'info',
+            type: "message",
+            messageType: "info",
             content: [
-              t('Set LLM output language'),
-              '',
-              t('Usage: /language output <language>'),
-              `  ${t('Example: /language output 中文')}`,
-              `  ${t('Example: /language output English')}`,
-              `  ${t('Example: /language output 日本語')}`,
-            ].join('\n'),
+              t("Set LLM output language"),
+              "",
+              t("Usage: /language output <language>"),
+              `  ${t("Example: /language output 中文")}`,
+              `  ${t("Example: /language output English")}`,
+              `  ${t("Example: /language output 日本語")}`,
+            ].join("\n"),
           };
         }
 
diff --git a/apps/airiscode-cli/src/ui/commands/mcpCommand.ts b/apps/airiscode-cli/src/ui/commands/mcpCommand.ts
index 4ca165e35..0e4798b74 100644
--- a/apps/airiscode-cli/src/ui/commands/mcpCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/mcpCommand.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand, OpenDialogActionReturn } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const mcpCommand: SlashCommand = {
-  name: 'mcp',
+  name: "mcp",
   get description() {
-    return t('Open MCP management dialog');
+    return t("Open MCP management dialog");
   },
   kind: CommandKind.BUILT_IN,
   action: async (): Promise<OpenDialogActionReturn> => ({
-    type: 'dialog',
-    dialog: 'mcp',
+    type: "dialog",
+    dialog: "mcp",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/memoryCommand.ts b/apps/airiscode-cli/src/ui/commands/memoryCommand.ts
index 8ec1cfcc5..cb0a7e172 100644
--- a/apps/airiscode-cli/src/ui/commands/memoryCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/memoryCommand.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
 import {
-  getErrorMessage,
+  AIRISCODE_DIR,
   getAllGeminiMdFilenames,
+  getErrorMessage,
   loadServerHierarchicalMemory,
-  AIRISCODE_DIR,
-} from '@airiscode/core';
-import path from 'node:path';
-import os from 'node:os';
-import fs from 'node:fs/promises';
-import { MessageType } from '../types.js';
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+} from "@airiscode/core";
+import { t } from "../../i18n/index.js";
+import { MessageType } from "../types.js";
+import type { SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 /**
  * Read all existing memory files from the configured filenames in a directory.
@@ -29,7 +29,7 @@ async function findAllExistingMemoryFiles(
   for (const filename of getAllGeminiMdFilenames()) {
     const filePath = path.join(dir, filename);
     try {
-      const content = await fs.readFile(filePath, 'utf-8');
+      const content = await fs.readFile(filePath, "utf-8");
       if (content.trim().length > 0) {
         results.push({ filePath, content });
       }
@@ -41,26 +41,26 @@ async function findAllExistingMemoryFiles(
 }
 
 export const memoryCommand: SlashCommand = {
-  name: 'memory',
+  name: "memory",
   get description() {
-    return t('Commands for interacting with memory.');
+    return t("Commands for interacting with memory.");
   },
   kind: CommandKind.BUILT_IN,
   subCommands: [
     {
-      name: 'show',
+      name: "show",
       get description() {
-        return t('Show the current memory contents.');
+        return t("Show the current memory contents.");
       },
       kind: CommandKind.BUILT_IN,
       action: async (context) => {
-        const memoryContent = context.services.config?.getUserMemory() || '';
+        const memoryContent = context.services.config?.getUserMemory() || "";
         const fileCount = context.services.config?.getGeminiMdFileCount() || 0;
 
         const messageContent =
           memoryContent.length > 0
-            ? `${t('Current memory content from {{count}} file(s):', { count: String(fileCount) })}\n\n---\n${memoryContent}\n---`
-            : t('Memory is currently empty.');
+            ? `${t("Current memory content from {{count}} file(s):", { count: String(fileCount) })}\n\n---\n${memoryContent}\n---`
+            : t("Memory is currently empty.");
 
         context.ui.addItem(
           {
@@ -72,25 +72,24 @@ export const memoryCommand: SlashCommand = {
       },
       subCommands: [
         {
-          name: '--project',
+          name: "--project",
           get description() {
-            return t('Show project-level memory contents.');
+            return t("Show project-level memory contents.");
           },
           kind: CommandKind.BUILT_IN,
           action: async (context) => {
-            const workingDir =
-              context.services.config?.getWorkingDir?.() ?? process.cwd();
+            const workingDir = context.services.config?.getWorkingDir?.() ?? process.cwd();
             const results = await findAllExistingMemoryFiles(workingDir);
 
             if (results.length > 0) {
               const combined = results
                 .map((r) =>
-                  t(
-                    'Project memory content from {{path}}:\n\n---\n{{content}}\n---',
-                    { path: r.filePath, content: r.content },
-                  ),
+                  t("Project memory content from {{path}}:\n\n---\n{{content}}\n---", {
+                    path: r.filePath,
+                    content: r.content,
+                  }),
                 )
-                .join('\n\n');
+                .join("\n\n");
               context.ui.addItem(
                 {
                   type: MessageType.INFO,
@@ -102,9 +101,7 @@ export const memoryCommand: SlashCommand = {
               context.ui.addItem(
                 {
                   type: MessageType.INFO,
-                  text: t(
-                    'Project memory file not found or is currently empty.',
-                  ),
+                  text: t("Project memory file not found or is currently empty."),
                 },
                 Date.now(),
               );
@@ -112,9 +109,9 @@ export const memoryCommand: SlashCommand = {
           },
         },
         {
-          name: '--global',
+          name: "--global",
           get description() {
-            return t('Show global memory contents.');
+            return t("Show global memory contents.");
           },
           kind: CommandKind.BUILT_IN,
           action: async (context) => {
@@ -124,11 +121,11 @@ export const memoryCommand: SlashCommand = {
             if (results.length > 0) {
               const combined = results
                 .map((r) =>
-                  t('Global memory content:\n\n---\n{{content}}\n---', {
+                  t("Global memory content:\n\n---\n{{content}}\n---", {
                     content: r.content,
                   }),
                 )
-                .join('\n\n');
+                .join("\n\n");
               context.ui.addItem(
                 {
                   type: MessageType.INFO,
@@ -140,9 +137,7 @@ export const memoryCommand: SlashCommand = {
               context.ui.addItem(
                 {
                   type: MessageType.INFO,
-                  text: t(
-                    'Global memory file not found or is currently empty.',
-                  ),
+                  text: t("Global memory file not found or is currently empty."),
                 },
                 Date.now(),
               );
@@ -152,60 +147,54 @@ export const memoryCommand: SlashCommand = {
       ],
     },
     {
-      name: 'add',
+      name: "add",
       get description() {
         return t(
-          'Add content to the memory. Use --global for global memory or --project for project memory.',
+          "Add content to the memory. Use --global for global memory or --project for project memory.",
         );
       },
       kind: CommandKind.BUILT_IN,
       action: (context, args): SlashCommandActionReturn | void => {
-        if (!args || args.trim() === '') {
+        if (!args || args.trim() === "") {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: t(
-              'Usage: /memory add [--global|--project] <text to remember>',
-            ),
+            type: "message",
+            messageType: "error",
+            content: t("Usage: /memory add [--global|--project] <text to remember>"),
           };
         }
 
         const trimmedArgs = args.trim();
-        let scope: 'global' | 'project' | undefined;
+        let scope: "global" | "project" | undefined;
         let fact: string;
 
         // Check for scope flags
-        if (trimmedArgs.startsWith('--global ')) {
-          scope = 'global';
-          fact = trimmedArgs.substring('--global '.length).trim();
-        } else if (trimmedArgs.startsWith('--project ')) {
-          scope = 'project';
-          fact = trimmedArgs.substring('--project '.length).trim();
-        } else if (trimmedArgs === '--global' || trimmedArgs === '--project') {
+        if (trimmedArgs.startsWith("--global ")) {
+          scope = "global";
+          fact = trimmedArgs.substring("--global ".length).trim();
+        } else if (trimmedArgs.startsWith("--project ")) {
+          scope = "project";
+          fact = trimmedArgs.substring("--project ".length).trim();
+        } else if (trimmedArgs === "--global" || trimmedArgs === "--project") {
           // Flag provided but no text after it
           return {
-            type: 'message',
-            messageType: 'error',
-            content: t(
-              'Usage: /memory add [--global|--project] <text to remember>',
-            ),
+            type: "message",
+            messageType: "error",
+            content: t("Usage: /memory add [--global|--project] <text to remember>"),
           };
         } else {
           // No scope specified, will be handled by the tool
           fact = trimmedArgs;
         }
 
-        if (!fact || fact.trim() === '') {
+        if (!fact || fact.trim() === "") {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: t(
-              'Usage: /memory add [--global|--project] <text to remember>',
-            ),
+            type: "message",
+            messageType: "error",
+            content: t("Usage: /memory add [--global|--project] <text to remember>"),
           };
         }
 
-        const scopeText = scope ? `(${scope})` : '';
+        const scopeText = scope ? `(${scope})` : "";
         context.ui.addItem(
           {
             type: MessageType.INFO,
@@ -218,24 +207,24 @@ export const memoryCommand: SlashCommand = {
         );
 
         return {
-          type: 'tool',
-          toolName: 'save_memory',
+          type: "tool",
+          toolName: "save_memory",
           toolArgs: scope ? { fact, scope } : { fact },
         };
       },
       subCommands: [
         {
-          name: '--project',
+          name: "--project",
           get description() {
-            return t('Add content to project-level memory.');
+            return t("Add content to project-level memory.");
           },
           kind: CommandKind.BUILT_IN,
           action: (context, args): SlashCommandActionReturn | void => {
-            if (!args || args.trim() === '') {
+            if (!args || args.trim() === "") {
               return {
-                type: 'message',
-                messageType: 'error',
-                content: t('Usage: /memory add --project <text to remember>'),
+                type: "message",
+                messageType: "error",
+                content: t("Usage: /memory add --project <text to remember>"),
               };
             }
 
@@ -250,24 +239,24 @@ export const memoryCommand: SlashCommand = {
             );
 
             return {
-              type: 'tool',
-              toolName: 'save_memory',
-              toolArgs: { fact: args.trim(), scope: 'project' },
+              type: "tool",
+              toolName: "save_memory",
+              toolArgs: { fact: args.trim(), scope: "project" },
             };
           },
         },
         {
-          name: '--global',
+          name: "--global",
           get description() {
-            return t('Add content to global memory.');
+            return t("Add content to global memory.");
           },
           kind: CommandKind.BUILT_IN,
           action: (context, args): SlashCommandActionReturn | void => {
-            if (!args || args.trim() === '') {
+            if (!args || args.trim() === "") {
               return {
-                type: 'message',
-                messageType: 'error',
-                content: t('Usage: /memory add --global <text to remember>'),
+                type: "message",
+                messageType: "error",
+                content: t("Usage: /memory add --global <text to remember>"),
               };
             }
 
@@ -282,25 +271,25 @@ export const memoryCommand: SlashCommand = {
             );
 
             return {
-              type: 'tool',
-              toolName: 'save_memory',
-              toolArgs: { fact: args.trim(), scope: 'global' },
+              type: "tool",
+              toolName: "save_memory",
+              toolArgs: { fact: args.trim(), scope: "global" },
             };
           },
         },
       ],
     },
     {
-      name: 'refresh',
+      name: "refresh",
       get description() {
-        return t('Refresh the memory from the source.');
+        return t("Refresh the memory from the source.");
       },
       kind: CommandKind.BUILT_IN,
       action: async (context) => {
         context.ui.addItem(
           {
             type: MessageType.INFO,
-            text: t('Refreshing memory from source files...'),
+            text: t("Refreshing memory from source files..."),
           },
           Date.now(),
         );
@@ -308,25 +297,23 @@ export const memoryCommand: SlashCommand = {
         try {
           const config = context.services.config;
           if (config) {
-            const { memoryContent, fileCount } =
-              await loadServerHierarchicalMemory(
-                config.getWorkingDir(),
-                config.shouldLoadMemoryFromIncludeDirectories()
-                  ? config.getWorkspaceContext().getDirectories()
-                  : [],
-                config.getFileService(),
-                config.getExtensionContextFilePaths(),
-                config.getFolderTrust(),
-                context.services.settings.merged.context?.importFormat ||
-                  'tree', // Use setting or default to 'tree'
-              );
+            const { memoryContent, fileCount } = await loadServerHierarchicalMemory(
+              config.getWorkingDir(),
+              config.shouldLoadMemoryFromIncludeDirectories()
+                ? config.getWorkspaceContext().getDirectories()
+                : [],
+              config.getFileService(),
+              config.getExtensionContextFilePaths(),
+              config.getFolderTrust(),
+              context.services.settings.merged.context?.importFormat || "tree", // Use setting or default to 'tree'
+            );
             config.setUserMemory(memoryContent);
             config.setGeminiMdFileCount(fileCount);
 
             const successMessage =
               memoryContent.length > 0
                 ? `Memory refreshed successfully. Loaded ${memoryContent.length} characters from ${fileCount} file(s).`
-                : 'Memory refreshed successfully. No memory content found.';
+                : "Memory refreshed successfully. No memory content found.";
 
             context.ui.addItem(
               {
diff --git a/apps/airiscode-cli/src/ui/commands/modelCommand.ts b/apps/airiscode-cli/src/ui/commands/modelCommand.ts
index 2ccbda323..8020e21bd 100644
--- a/apps/airiscode-cli/src/ui/commands/modelCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/modelCommand.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { getPersistScopeForModelSelection } from "../../config/modelProvidersScope.js";
+import { t } from "../../i18n/index.js";
 import type {
-  SlashCommand,
   CommandContext,
-  OpenDialogActionReturn,
   MessageActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
-import { getPersistScopeForModelSelection } from '../../config/modelProvidersScope.js';
+  OpenDialogActionReturn,
+  SlashCommand,
+} from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const modelCommand: SlashCommand = {
-  name: 'model',
+  name: "model",
   get description() {
-    return t('Switch the model for this session');
+    return t("Switch the model for this session");
   },
   kind: CommandKind.BUILT_IN,
   completion: async (_context, partialArg) => {
-    if ('--fast'.startsWith(partialArg)) {
+    if ("--fast".startsWith(partialArg)) {
       return [
         {
-          value: '--fast',
-          description: t('Set fast model for background tasks'),
+          value: "--fast",
+          description: t("Set fast model for background tasks"),
         },
       ];
     }
@@ -39,64 +39,60 @@ export const modelCommand: SlashCommand = {
 
     if (!config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Configuration not available.'),
+        type: "message",
+        messageType: "error",
+        content: t("Configuration not available."),
       };
     }
 
     // Handle --fast flag: /model --fast <modelName>
-    const args = context.invocation?.args?.trim() ?? '';
-    if (args.startsWith('--fast')) {
-      const modelName = args.replace('--fast', '').trim();
+    const args = context.invocation?.args?.trim() ?? "";
+    if (args.startsWith("--fast")) {
+      const modelName = args.replace("--fast", "").trim();
       if (!modelName) {
         // Open model dialog in fast-model mode
         return {
-          type: 'dialog',
-          dialog: 'fast-model',
+          type: "dialog",
+          dialog: "fast-model",
         };
       }
       // Set fast model
       if (!settings) {
         return {
-          type: 'message',
-          messageType: 'error',
-          content: t('Settings service not available.'),
+          type: "message",
+          messageType: "error",
+          content: t("Settings service not available."),
         };
       }
-      settings.setValue(
-        getPersistScopeForModelSelection(settings),
-        'fastModel',
-        modelName,
-      );
+      settings.setValue(getPersistScopeForModelSelection(settings), "fastModel", modelName);
       return {
-        type: 'message',
-        messageType: 'info',
-        content: t('Fast Model') + ': ' + modelName,
+        type: "message",
+        messageType: "info",
+        content: t("Fast Model") + ": " + modelName,
       };
     }
 
     const contentGeneratorConfig = config.getContentGeneratorConfig();
     if (!contentGeneratorConfig) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Content generator configuration not available.'),
+        type: "message",
+        messageType: "error",
+        content: t("Content generator configuration not available."),
       };
     }
 
     const authType = contentGeneratorConfig.authType;
     if (!authType) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Authentication type not available.'),
+        type: "message",
+        messageType: "error",
+        content: t("Authentication type not available."),
       };
     }
 
     return {
-      type: 'dialog',
-      dialog: 'model',
+      type: "dialog",
+      dialog: "model",
     };
   },
 };
diff --git a/apps/airiscode-cli/src/ui/commands/permissionsCommand.ts b/apps/airiscode-cli/src/ui/commands/permissionsCommand.ts
index 034fec843..140511a6b 100644
--- a/apps/airiscode-cli/src/ui/commands/permissionsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/permissionsCommand.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const permissionsCommand: SlashCommand = {
-  name: 'permissions',
+  name: "permissions",
   get description() {
-    return t('Manage permission rules');
+    return t("Manage permission rules");
   },
   kind: CommandKind.BUILT_IN,
   action: (): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'permissions',
+    type: "dialog",
+    dialog: "permissions",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/planCommand.ts b/apps/airiscode-cli/src/ui/commands/planCommand.ts
index 0b2098401..9f63db84e 100644
--- a/apps/airiscode-cli/src/ui/commands/planCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/planCommand.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { ApprovalMode } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
 import {
   type CommandContext,
   CommandKind,
-  type SlashCommand,
   type MessageActionReturn,
+  type SlashCommand,
   type SubmitPromptActionReturn,
-} from './types.js';
-import { t } from '../../i18n/index.js';
-import { ApprovalMode } from '@airiscode/core';
+} from "./types.js";
 
 export const planCommand: SlashCommand = {
-  name: 'plan',
+  name: "plan",
   get description() {
-    return t('Switch to plan mode or exit plan mode');
+    return t("Switch to plan mode or exit plan mode");
   },
   kind: CommandKind.BUILT_IN,
   action: async (
@@ -27,20 +27,20 @@ export const planCommand: SlashCommand = {
     const { config } = context.services;
     if (!config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Configuration is not available.'),
+        type: "message",
+        messageType: "error",
+        content: t("Configuration is not available."),
       };
     }
 
     const trimmedArgs = args.trim();
     const currentMode = config.getApprovalMode();
 
-    if (trimmedArgs === 'exit') {
+    if (trimmedArgs === "exit") {
       if (currentMode !== ApprovalMode.PLAN) {
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: t('Not in plan mode. Use "/plan" to enter plan mode first.'),
         };
       }
@@ -48,15 +48,15 @@ export const planCommand: SlashCommand = {
         config.setApprovalMode(config.getPrePlanMode());
       } catch (e) {
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: (e as Error).message,
         };
       }
       return {
-        type: 'message',
-        messageType: 'info',
-        content: t('Exited plan mode. Previous approval mode restored.'),
+        type: "message",
+        messageType: "info",
+        content: t("Exited plan mode. Previous approval mode restored."),
       };
     }
 
@@ -65,39 +65,37 @@ export const planCommand: SlashCommand = {
         config.setApprovalMode(ApprovalMode.PLAN);
       } catch (e) {
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: (e as Error).message,
         };
       }
 
       if (trimmedArgs) {
         return {
-          type: 'submit_prompt',
+          type: "submit_prompt",
           content: [{ text: trimmedArgs }],
         };
       }
 
       return {
-        type: 'message',
-        messageType: 'info',
-        content: t(
-          'Enabled plan mode. The agent will analyze and plan without executing tools.',
-        ),
+        type: "message",
+        messageType: "info",
+        content: t("Enabled plan mode. The agent will analyze and plan without executing tools."),
       };
     }
 
     // Already in plan mode
     if (trimmedArgs) {
       return {
-        type: 'submit_prompt',
+        type: "submit_prompt",
         content: [{ text: trimmedArgs }],
       };
     }
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: t('Already in plan mode. Use "/plan exit" to exit plan mode.'),
     };
   },
diff --git a/apps/airiscode-cli/src/ui/commands/quitCommand.ts b/apps/airiscode-cli/src/ui/commands/quitCommand.ts
index 4e9da3a0c..3073a446c 100644
--- a/apps/airiscode-cli/src/ui/commands/quitCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/quitCommand.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { formatDuration } from '../utils/formatters.js';
-import { CommandKind, type SlashCommand } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { formatDuration } from "../utils/formatters.js";
+import { CommandKind, type SlashCommand } from "./types.js";
 
 export const quitCommand: SlashCommand = {
-  name: 'quit',
-  altNames: ['exit'],
+  name: "quit",
+  altNames: ["exit"],
   get description() {
-    return t('exit the cli');
+    return t("exit the cli");
   },
   kind: CommandKind.BUILT_IN,
   action: (context) => {
@@ -21,15 +21,15 @@ export const quitCommand: SlashCommand = {
     const wallDuration = now - sessionStartTime.getTime();
 
     return {
-      type: 'quit',
+      type: "quit",
       messages: [
         {
-          type: 'user',
+          type: "user",
           text: `/quit`, // Keep it consistent, even if /exit was used
           id: now - 1,
         },
         {
-          type: 'quit',
+          type: "quit",
           duration: formatDuration(wallDuration),
           id: now,
         },
diff --git a/apps/airiscode-cli/src/ui/commands/restoreCommand.ts b/apps/airiscode-cli/src/ui/commands/restoreCommand.ts
index e505cffa1..8cf93699f 100644
--- a/apps/airiscode-cli/src/ui/commands/restoreCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/restoreCommand.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
+import * as fs from "node:fs/promises";
+import path from "node:path";
+import type { Config } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
 import {
   type CommandContext,
+  CommandKind,
   type SlashCommand,
   type SlashCommandActionReturn,
-  CommandKind,
-} from './types.js';
-import type { Config } from '@airiscode/core';
-import { t } from '../../i18n/index.js';
+} from "./types.js";
 
 async function restoreAction(
   context: CommandContext,
@@ -27,9 +27,9 @@ async function restoreAction(
 
   if (!checkpointDir) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Could not determine the .qwen directory path.',
+      type: "message",
+      messageType: "error",
+      content: "Could not determine the .qwen directory path.",
     };
   }
 
@@ -37,53 +37,53 @@ async function restoreAction(
     // Ensure the directory exists before trying to read it.
     await fs.mkdir(checkpointDir, { recursive: true });
     const files = await fs.readdir(checkpointDir);
-    const jsonFiles = files.filter((file) => file.endsWith('.json'));
+    const jsonFiles = files.filter((file) => file.endsWith(".json"));
 
     if (!args) {
       if (jsonFiles.length === 0) {
         return {
-          type: 'message',
-          messageType: 'info',
-          content: 'No restorable tool calls found.',
+          type: "message",
+          messageType: "info",
+          content: "No restorable tool calls found.",
         };
       }
       const truncatedFiles = jsonFiles.map((file) => {
-        const components = file.split('.');
+        const components = file.split(".");
         if (components.length <= 1) {
           return file;
         }
         components.pop();
-        return components.join('.');
+        return components.join(".");
       });
-      const fileList = truncatedFiles.join('\n');
+      const fileList = truncatedFiles.join("\n");
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Available tool calls to restore:\n\n${fileList}`,
       };
     }
 
-    const selectedFile = args.endsWith('.json') ? args : `${args}.json`;
+    const selectedFile = args.endsWith(".json") ? args : `${args}.json`;
 
     if (!jsonFiles.includes(selectedFile)) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `File not found: ${selectedFile}`,
       };
     }
 
     const filePath = path.join(checkpointDir, selectedFile);
-    const data = await fs.readFile(filePath, 'utf-8');
+    const data = await fs.readFile(filePath, "utf-8");
     const toolCallData = JSON.parse(data);
 
     if (toolCallData.history) {
       if (!loadHistory) {
         // This should not happen
         return {
-          type: 'message',
-          messageType: 'error',
-          content: 'loadHistory function is not available.',
+          type: "message",
+          messageType: "error",
+          content: "loadHistory function is not available.",
         };
       }
       loadHistory(toolCallData.history);
@@ -97,31 +97,28 @@ async function restoreAction(
       await gitService?.restoreProjectFromSnapshot(toolCallData.commitHash);
       addItem(
         {
-          type: 'info',
-          text: 'Restored project to the state before the tool call.',
+          type: "info",
+          text: "Restored project to the state before the tool call.",
         },
         Date.now(),
       );
     }
 
     return {
-      type: 'tool',
+      type: "tool",
       toolName: toolCallData.toolCall.name,
       toolArgs: toolCallData.toolCall.args,
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Could not read restorable tool calls. This is the error: ${error}`,
     };
   }
 }
 
-async function completion(
-  context: CommandContext,
-  _partialArg: string,
-): Promise<string[]> {
+async function completion(context: CommandContext, _partialArg: string): Promise<string[]> {
   const { services } = context;
   const { config } = services;
   const checkpointDir = config?.storage.getProjectTempCheckpointsDir();
@@ -130,9 +127,7 @@ async function completion(
   }
   try {
     const files = await fs.readdir(checkpointDir);
-    return files
-      .filter((file) => file.endsWith('.json'))
-      .map((file) => file.replace('.json', ''));
+    return files.filter((file) => file.endsWith(".json")).map((file) => file.replace(".json", ""));
   } catch (_err) {
     return [];
   }
@@ -144,10 +139,10 @@ export const restoreCommand = (config: Config | null): SlashCommand | null => {
   }
 
   return {
-    name: 'restore',
+    name: "restore",
     get description() {
       return t(
-        'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested',
+        "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested",
       );
     },
     kind: CommandKind.BUILT_IN,
diff --git a/apps/airiscode-cli/src/ui/commands/resumeCommand.ts b/apps/airiscode-cli/src/ui/commands/resumeCommand.ts
index ece068afc..40aacd8c0 100644
--- a/apps/airiscode-cli/src/ui/commands/resumeCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/resumeCommand.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const resumeCommand: SlashCommand = {
-  name: 'resume',
+  name: "resume",
   kind: CommandKind.BUILT_IN,
   get description() {
-    return t('Resume a previous session');
+    return t("Resume a previous session");
   },
   action: async (): Promise<SlashCommandActionReturn> => ({
-    type: 'dialog',
-    dialog: 'resume',
+    type: "dialog",
+    dialog: "resume",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/settingsCommand.ts b/apps/airiscode-cli/src/ui/commands/settingsCommand.ts
index 762977086..7e5760782 100644
--- a/apps/airiscode-cli/src/ui/commands/settingsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/settingsCommand.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const settingsCommand: SlashCommand = {
-  name: 'settings',
+  name: "settings",
   get description() {
-    return t('View and edit AIRIS Code settings');
+    return t("View and edit AIRIS Code settings");
   },
   kind: CommandKind.BUILT_IN,
   action: (_context, _args): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'settings',
+    type: "dialog",
+    dialog: "settings",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/setupGithubCommand.ts b/apps/airiscode-cli/src/ui/commands/setupGithubCommand.ts
index 3bc46c6a8..95e9a476d 100644
--- a/apps/airiscode-cli/src/ui/commands/setupGithubCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/setupGithubCommand.ts
@@ -4,33 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import * as fs from 'node:fs';
-import { Writable } from 'node:stream';
-import { ProxyAgent } from 'undici';
-
-import type { CommandContext } from '../../ui/commands/types.js';
+import * as fs from "node:fs";
+import path from "node:path";
+import { Writable } from "node:stream";
+import { createDebugLogger } from "@airiscode/core";
+import { ProxyAgent } from "undici";
+import { t } from "../../i18n/index.js";
+import type { CommandContext } from "../../ui/commands/types.js";
+import { getUrlOpenCommand } from "../../ui/utils/commandUtils.js";
 import {
+  getGitHubRepoInfo,
   getGitRepoRoot,
   getLatestGitHubRelease,
   isGitHubRepository,
-  getGitHubRepoInfo,
-} from '../../utils/gitUtils.js';
+} from "../../utils/gitUtils.js";
+import type { SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
-import { getUrlOpenCommand } from '../../ui/utils/commandUtils.js';
-import { t } from '../../i18n/index.js';
-import { createDebugLogger } from '@airiscode/core';
-
-const debugLogger = createDebugLogger('SETUP_GITHUB');
+const debugLogger = createDebugLogger("SETUP_GITHUB");
 
 export const GITHUB_WORKFLOW_PATHS = [
-  'qwen-dispatch/qwen-dispatch.yml',
-  'qwen-assistant/qwen-invoke.yml',
-  'issue-triage/qwen-triage.yml',
-  'issue-triage/qwen-scheduled-triage.yml',
-  'pr-review/qwen-review.yml',
+  "qwen-dispatch/qwen-dispatch.yml",
+  "qwen-assistant/qwen-invoke.yml",
+  "issue-triage/qwen-triage.yml",
+  "issue-triage/qwen-scheduled-triage.yml",
+  "pr-review/qwen-review.yml",
 ];
 
 // Generate OS-specific commands to open the GitHub pages needed for setup.
@@ -55,15 +53,15 @@ function getOpenUrlsCommands(readmeUrl: string): string[] {
 
 // Add AIRIS Code specific entries to .gitignore file
 export async function updateGitignore(gitRepoRoot: string): Promise<void> {
-  const gitignoreEntries = ['.airiscode/', 'gha-creds-*.json'];
+  const gitignoreEntries = [".airiscode/", "gha-creds-*.json"];
 
-  const gitignorePath = path.join(gitRepoRoot, '.gitignore');
+  const gitignorePath = path.join(gitRepoRoot, ".gitignore");
   try {
     // Check if .gitignore exists and read its content
-    let existingContent = '';
+    let existingContent = "";
     let fileExists = true;
     try {
-      existingContent = await fs.promises.readFile(gitignorePath, 'utf8');
+      existingContent = await fs.promises.readFile(gitignorePath, "utf8");
     } catch (_error) {
       // File doesn't exist
       fileExists = false;
@@ -71,51 +69,43 @@ export async function updateGitignore(gitRepoRoot: string): Promise<void> {
 
     if (!fileExists) {
       // Create new .gitignore file with the entries
-      const contentToWrite = gitignoreEntries.join('\n') + '\n';
+      const contentToWrite = gitignoreEntries.join("\n") + "\n";
       await fs.promises.writeFile(gitignorePath, contentToWrite);
     } else {
       // Check which entries are missing
       const missingEntries = gitignoreEntries.filter(
         (entry) =>
-          !existingContent
-            .split(/\r?\n/)
-            .some((line) => line.split('#')[0].trim() === entry),
+          !existingContent.split(/\r?\n/).some((line) => line.split("#")[0].trim() === entry),
       );
 
       if (missingEntries.length > 0) {
-        const contentToAdd = '\n' + missingEntries.join('\n') + '\n';
+        const contentToAdd = "\n" + missingEntries.join("\n") + "\n";
         await fs.promises.appendFile(gitignorePath, contentToAdd);
       }
     }
   } catch (error) {
-    debugLogger.debug('Failed to update .gitignore:', error);
+    debugLogger.debug("Failed to update .gitignore:", error);
     // Continue without failing the whole command
   }
 }
 
 export const setupGithubCommand: SlashCommand = {
-  name: 'setup-github',
+  name: "setup-github",
   get description() {
-    return t('Set up GitHub Actions');
+    return t("Set up GitHub Actions");
   },
   kind: CommandKind.BUILT_IN,
-  action: async (
-    context: CommandContext,
-  ): Promise<SlashCommandActionReturn> => {
+  action: async (context: CommandContext): Promise<SlashCommandActionReturn> => {
     const abortController = new AbortController();
 
     // If we have a context abort signal (from ESC cancellation), link it to our controller
     if (context.abortSignal) {
-      context.abortSignal.addEventListener(
-        'abort',
-        () => abortController.abort(),
-        { once: true },
-      );
+      context.abortSignal.addEventListener("abort", () => abortController.abort(), { once: true });
     }
 
     if (!isGitHubRepository()) {
       throw new Error(
-        'Unable to determine the GitHub repository. /setup-github must be run from a git repository.',
+        "Unable to determine the GitHub repository. /setup-github must be run from a git repository.",
       );
     }
 
@@ -126,7 +116,7 @@ export const setupGithubCommand: SlashCommand = {
     } catch (_error) {
       debugLogger.debug(`Failed to get git repo root:`, _error);
       throw new Error(
-        'Unable to determine the GitHub repository. /setup-github must be run from a git repository.',
+        "Unable to determine the GitHub repository. /setup-github must be run from a git repository.",
       );
     }
 
@@ -136,14 +126,11 @@ export const setupGithubCommand: SlashCommand = {
     const readmeUrl = `https://github.com/QwenLM/airiscode-action/blob/${releaseTag}/README.md#quick-start`;
 
     // Create the .github/workflows directory to download the files into
-    const githubWorkflowsDir = path.join(gitRepoRoot, '.github', 'workflows');
+    const githubWorkflowsDir = path.join(gitRepoRoot, ".github", "workflows");
     try {
       await fs.promises.mkdir(githubWorkflowsDir, { recursive: true });
     } catch (_error) {
-      debugLogger.debug(
-        `Failed to create ${githubWorkflowsDir} directory:`,
-        _error,
-      );
+      debugLogger.debug(`Failed to create ${githubWorkflowsDir} directory:`, _error);
       throw new Error(
         `Unable to create ${githubWorkflowsDir} directory. Do you have file permissions in the current directory?`,
       );
@@ -157,12 +144,9 @@ export const setupGithubCommand: SlashCommand = {
         (async () => {
           const endpoint = `https://raw.githubusercontent.com/QwenLM/airiscode-action/refs/tags/${releaseTag}/examples/workflows/${workflow}`;
           const response = await fetch(endpoint, {
-            method: 'GET',
+            method: "GET",
             dispatcher: proxy ? new ProxyAgent(proxy) : undefined,
-            signal: AbortSignal.any([
-              AbortSignal.timeout(30_000),
-              abortController.signal,
-            ]),
+            signal: AbortSignal.any([AbortSignal.timeout(30_000), abortController.signal]),
           } as RequestInit);
 
           if (!response.ok) {
@@ -177,14 +161,11 @@ export const setupGithubCommand: SlashCommand = {
             );
           }
 
-          const destination = path.resolve(
-            githubWorkflowsDir,
-            path.basename(workflow),
-          );
+          const destination = path.resolve(githubWorkflowsDir, path.basename(workflow));
 
           const fileStream = fs.createWriteStream(destination, {
             mode: 0o644, // -rw-r--r--, user(rw), group(r), other(r)
-            flags: 'w', // write and overwrite
+            flags: "w", // write and overwrite
             flush: true,
           });
 
@@ -204,19 +185,18 @@ export const setupGithubCommand: SlashCommand = {
 
     // Print out a message
     const commands = [];
-    commands.push('set -eEuo pipefail');
+    commands.push("set -eEuo pipefail");
     commands.push(
       `echo "Successfully downloaded ${GITHUB_WORKFLOW_PATHS.length} workflows and updated .gitignore. Follow the steps in ${readmeUrl} (skipping the /setup-github step) to complete setup."`,
     );
     commands.push(...getOpenUrlsCommands(readmeUrl));
 
-    const command = `(${commands.join(' && ')})`;
+    const command = `(${commands.join(" && ")})`;
     return {
-      type: 'tool',
-      toolName: 'run_shell_command',
+      type: "tool",
+      toolName: "run_shell_command",
       toolArgs: {
-        description:
-          'Setting up GitHub Actions to triage issues and review PRs with Qwen.',
+        description: "Setting up GitHub Actions to triage issues and review PRs with Qwen.",
         command,
         is_background: false,
       },
diff --git a/apps/airiscode-cli/src/ui/commands/skillsCommand.ts b/apps/airiscode-cli/src/ui/commands/skillsCommand.ts
index 1eb5b55bc..aa1b4fb0b 100644
--- a/apps/airiscode-cli/src/ui/commands/skillsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/skillsCommand.ts
@@ -4,36 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { SkillConfig } from "@airiscode/core";
+import { createDebugLogger } from "@airiscode/core";
+import { AsyncFzf } from "fzf";
+import { t } from "../../i18n/index.js";
+import { type HistoryItemSkillsList, MessageType } from "../types.js";
 import {
-  CommandKind,
   type CommandCompletionItem,
   type CommandContext,
+  CommandKind,
   type SlashCommand,
-} from './types.js';
-import { MessageType, type HistoryItemSkillsList } from '../types.js';
-import { t } from '../../i18n/index.js';
-import { AsyncFzf } from 'fzf';
-import type { SkillConfig } from '@airiscode/core';
-import { createDebugLogger } from '@airiscode/core';
+} from "./types.js";
 
-const debugLogger = createDebugLogger('SKILLS_COMMAND');
+const debugLogger = createDebugLogger("SKILLS_COMMAND");
 
 export const skillsCommand: SlashCommand = {
-  name: 'skills',
+  name: "skills",
   get description() {
-    return t('List available skills.');
+    return t("List available skills.");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context: CommandContext, args?: string) => {
-    const rawArgs = args?.trim() ?? '';
-    const [skillName = ''] = rawArgs.split(/\s+/);
+    const rawArgs = args?.trim() ?? "";
+    const [skillName = ""] = rawArgs.split(/\s+/);
 
     const skillManager = context.services.config?.getSkillManager();
     if (!skillManager) {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t('Could not retrieve skill manager.'),
+          text: t("Could not retrieve skill manager."),
         },
         Date.now(),
       );
@@ -45,7 +45,7 @@ export const skillsCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.INFO,
-          text: t('No skills are currently available.'),
+          text: t("No skills are currently available."),
         },
         Date.now(),
       );
@@ -53,9 +53,7 @@ export const skillsCommand: SlashCommand = {
     }
 
     if (!skillName) {
-      const sortedSkills = [...skills].sort((left, right) =>
-        left.name.localeCompare(right.name),
-      );
+      const sortedSkills = [...skills].sort((left, right) => left.name.localeCompare(right.name));
       const skillsListItem: HistoryItemSkillsList = {
         type: MessageType.SKILLS_LIST,
         skills: sortedSkills.map((skill) => ({ name: skill.name })),
@@ -64,15 +62,13 @@ export const skillsCommand: SlashCommand = {
       return;
     }
     const normalizedName = skillName.toLowerCase();
-    const hasSkill = skills.some(
-      (skill) => skill.name.toLowerCase() === normalizedName,
-    );
+    const hasSkill = skills.some((skill) => skill.name.toLowerCase() === normalizedName);
 
     if (!hasSkill) {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t('Unknown skill: {{name}}', { name: skillName }),
+          text: t("Unknown skill: {{name}}", { name: skillName }),
         },
         Date.now(),
       );
@@ -81,7 +77,7 @@ export const skillsCommand: SlashCommand = {
 
     const rawInput = context.invocation?.raw ?? `/skills ${rawArgs}`;
     return {
-      type: 'submit_prompt',
+      type: "submit_prompt",
       content: [{ text: rawInput }],
     };
   },
@@ -105,10 +101,7 @@ export const skillsCommand: SlashCommand = {
   },
 };
 
-async function getSkillMatches(
-  skills: SkillConfig[],
-  query: string,
-): Promise<SkillConfig[]> {
+async function getSkillMatches(skills: SkillConfig[], query: string): Promise<SkillConfig[]> {
   if (!query) {
     return skills;
   }
@@ -118,18 +111,16 @@ async function getSkillMatches(
 
   try {
     const fzf = new AsyncFzf(names, {
-      fuzzy: 'v2',
-      casing: 'case-insensitive',
+      fuzzy: "v2",
+      casing: "case-insensitive",
     });
     const results = (await fzf.find(query)) as Array<{ item: string }>;
     return results
       .map((result) => skillMap.get(result.item))
       .filter((skill): skill is SkillConfig => !!skill);
   } catch (error) {
-    debugLogger.error('[skillsCommand] Fuzzy match failed:', error);
+    debugLogger.error("[skillsCommand] Fuzzy match failed:", error);
     const lowerQuery = query.toLowerCase();
-    return skills.filter((skill) =>
-      skill.name.toLowerCase().startsWith(lowerQuery),
-    );
+    return skills.filter((skill) => skill.name.toLowerCase().startsWith(lowerQuery));
   }
 }
diff --git a/apps/airiscode-cli/src/ui/commands/statsCommand.ts b/apps/airiscode-cli/src/ui/commands/statsCommand.ts
index cb4a3f512..29b037c2a 100644
--- a/apps/airiscode-cli/src/ui/commands/statsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/statsCommand.ts
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HistoryItemStats } from '../types.js';
-import { MessageType } from '../types.js';
-import { formatDuration } from '../utils/formatters.js';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { HistoryItemStats } from "../types.js";
+import { MessageType } from "../types.js";
+import { formatDuration } from "../utils/formatters.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 export const statsCommand: SlashCommand = {
-  name: 'stats',
-  altNames: ['usage'],
+  name: "stats",
+  altNames: ["usage"],
   get description() {
-    return t('check session stats. Usage: /stats [model|tools]');
+    return t("check session stats. Usage: /stats [model|tools]");
   },
   kind: CommandKind.BUILT_IN,
   action: (context: CommandContext) => {
@@ -28,7 +24,7 @@ export const statsCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t('Session start time is unavailable, cannot calculate stats.'),
+          text: t("Session start time is unavailable, cannot calculate stats."),
         },
         Date.now(),
       );
@@ -45,9 +41,9 @@ export const statsCommand: SlashCommand = {
   },
   subCommands: [
     {
-      name: 'model',
+      name: "model",
       get description() {
-        return t('Show model-specific usage statistics.');
+        return t("Show model-specific usage statistics.");
       },
       kind: CommandKind.BUILT_IN,
       action: (context: CommandContext) => {
@@ -60,9 +56,9 @@ export const statsCommand: SlashCommand = {
       },
     },
     {
-      name: 'tools',
+      name: "tools",
       get description() {
-        return t('Show tool-specific usage statistics.');
+        return t("Show tool-specific usage statistics.");
       },
       kind: CommandKind.BUILT_IN,
       action: (context: CommandContext) => {
diff --git a/apps/airiscode-cli/src/ui/commands/statuslineCommand.ts b/apps/airiscode-cli/src/ui/commands/statuslineCommand.ts
index fa26d4ae7..6807e1251 100644
--- a/apps/airiscode-cli/src/ui/commands/statuslineCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/statuslineCommand.ts
@@ -4,21 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand, SubmitPromptActionReturn } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { SlashCommand, SubmitPromptActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const statuslineCommand: SlashCommand = {
-  name: 'statusline',
+  name: "statusline",
   get description() {
     return t("Set up AIRIS Code's status line UI");
   },
   kind: CommandKind.BUILT_IN,
   action: (_context, args): SubmitPromptActionReturn => {
-    const prompt =
-      args.trim() || 'Configure my statusLine from my shell PS1 configuration';
+    const prompt = args.trim() || "Configure my statusLine from my shell PS1 configuration";
     return {
-      type: 'submit_prompt',
+      type: "submit_prompt",
       content: [
         {
           text: `Use the Agent tool with subagent_type: "statusline-setup" and this prompt:\n\n${prompt}`,
diff --git a/apps/airiscode-cli/src/ui/commands/summaryCommand.ts b/apps/airiscode-cli/src/ui/commands/summaryCommand.ts
index b03ef79c5..fa68ef9b4 100644
--- a/apps/airiscode-cli/src/ui/commands/summaryCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/summaryCommand.ts
@@ -4,65 +4,55 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fsPromises from 'fs/promises';
-import path from 'path';
-import {
-  type SlashCommand,
-  CommandKind,
-  type SlashCommandActionReturn,
-} from './types.js';
-import { getProjectSummaryPrompt } from '@airiscode/core';
-import type { HistoryItemSummary } from '../types.js';
-import { t } from '../../i18n/index.js';
+import { getProjectSummaryPrompt } from "@airiscode/core";
+import * as fsPromises from "fs/promises";
+import path from "path";
+import { t } from "../../i18n/index.js";
+import type { HistoryItemSummary } from "../types.js";
+import { CommandKind, type SlashCommand, type SlashCommandActionReturn } from "./types.js";
 
 export const summaryCommand: SlashCommand = {
-  name: 'summary',
+  name: "summary",
   get description() {
-    return t(
-      'Generate a project summary and save it to .airiscode/PROJECT_SUMMARY.md',
-    );
+    return t("Generate a project summary and save it to .airiscode/PROJECT_SUMMARY.md");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context): Promise<SlashCommandActionReturn> => {
     const { config } = context.services;
     const { ui } = context;
-    const executionMode = context.executionMode ?? 'interactive';
+    const executionMode = context.executionMode ?? "interactive";
     const abortSignal = context.abortSignal;
 
     if (!config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Config not loaded.'),
+        type: "message",
+        messageType: "error",
+        content: t("Config not loaded."),
       };
     }
 
     const geminiClient = config.getGeminiClient();
     if (!geminiClient) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t('No chat client available to generate summary.'),
+        type: "message",
+        messageType: "error",
+        content: t("No chat client available to generate summary."),
       };
     }
 
     // Check if already generating summary (interactive UI only)
-    if (executionMode === 'interactive' && ui.pendingItem) {
+    if (executionMode === "interactive" && ui.pendingItem) {
       ui.addItem(
         {
-          type: 'error' as const,
-          text: t(
-            'Already generating summary, wait for previous request to complete',
-          ),
+          type: "error" as const,
+          text: t("Already generating summary, wait for previous request to complete"),
         },
         Date.now(),
       );
       return {
-        type: 'message',
-        messageType: 'error',
-        content: t(
-          'Already generating summary, wait for previous request to complete',
-        ),
+        type: "message",
+        messageType: "error",
+        content: t("Already generating summary, wait for previous request to complete"),
       };
     }
 
@@ -71,11 +61,9 @@ export const summaryCommand: SlashCommand = {
       return chat.getHistory();
     };
 
-    const validateChatHistory = (
-      history: ReturnType<typeof getChatHistory>,
-    ) => {
+    const validateChatHistory = (history: ReturnType<typeof getChatHistory>) => {
       if (history.length <= 2) {
-        throw new Error(t('No conversation found to summarize.'));
+        throw new Error(t("No conversation found to summarize."));
       }
     };
 
@@ -93,7 +81,7 @@ export const summaryCommand: SlashCommand = {
         [
           ...conversationContext,
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
                 text: getProjectSummaryPrompt(),
@@ -112,14 +100,12 @@ export const summaryCommand: SlashCommand = {
       const markdownSummary =
         parts
           ?.map((part) => part.text)
-          .filter((text): text is string => typeof text === 'string')
-          .join('') || '';
+          .filter((text): text is string => typeof text === "string")
+          .join("") || "";
 
       if (!markdownSummary) {
         throw new Error(
-          t(
-            'Failed to generate summary - no text content received from LLM response',
-          ),
+          t("Failed to generate summary - no text content received from LLM response"),
         );
       }
 
@@ -134,7 +120,7 @@ export const summaryCommand: SlashCommand = {
     }> => {
       // Ensure .qwen directory exists
       const projectRoot = config.getProjectRoot();
-      const qwenDir = path.join(projectRoot, '.airiscode');
+      const qwenDir = path.join(projectRoot, ".airiscode");
       try {
         await fsPromises.mkdir(qwenDir, { recursive: true });
       } catch (_err) {
@@ -142,7 +128,7 @@ export const summaryCommand: SlashCommand = {
       }
 
       // Save the summary to PROJECT_SUMMARY.md
-      const summaryPath = path.join(qwenDir, 'PROJECT_SUMMARY.md');
+      const summaryPath = path.join(qwenDir, "PROJECT_SUMMARY.md");
       const summaryContent = `${markdownSummary}
 
 ---
@@ -151,20 +137,20 @@ export const summaryCommand: SlashCommand = {
 **Update time**: ${new Date().toISOString()} 
 `;
 
-      await fsPromises.writeFile(summaryPath, summaryContent, 'utf8');
+      await fsPromises.writeFile(summaryPath, summaryContent, "utf8");
 
       return {
-        filePathForDisplay: '.airiscode/PROJECT_SUMMARY.md',
+        filePathForDisplay: ".airiscode/PROJECT_SUMMARY.md",
         fullPath: summaryPath,
       };
     };
 
-    const emitInteractivePending = (stage: 'generating' | 'saving') => {
-      if (executionMode !== 'interactive') {
+    const emitInteractivePending = (stage: "generating" | "saving") => {
+      if (executionMode !== "interactive") {
         return;
       }
       const pendingMessage: HistoryItemSummary = {
-        type: 'summary',
+        type: "summary",
         summary: {
           isPending: true,
           stage,
@@ -174,15 +160,15 @@ export const summaryCommand: SlashCommand = {
     };
 
     const completeInteractive = (filePathForDisplay: string) => {
-      if (executionMode !== 'interactive') {
+      if (executionMode !== "interactive") {
         return;
       }
       ui.setPendingItem(null);
       const completedSummaryItem: HistoryItemSummary = {
-        type: 'summary',
+        type: "summary",
         summary: {
           isPending: false,
-          stage: 'completed',
+          stage: "completed",
           filePath: filePathForDisplay,
         },
       };
@@ -190,12 +176,12 @@ export const summaryCommand: SlashCommand = {
     };
 
     const formatErrorMessage = (error: unknown): string =>
-      t('Failed to generate project context summary: {{error}}', {
+      t("Failed to generate project context summary: {{error}}", {
         error: error instanceof Error ? error.message : String(error),
       });
 
     const failInteractive = (error: unknown) => {
-      if (executionMode !== 'interactive') {
+      if (executionMode !== "interactive") {
         return;
       }
       // If cancelled via ESC, don't show error — cancelSlashCommand already handled UI
@@ -205,7 +191,7 @@ export const summaryCommand: SlashCommand = {
       ui.setPendingItem(null);
       ui.addItem(
         {
-          type: 'error' as const,
+          type: "error" as const,
           text: `❌ ${formatErrorMessage(error)}`,
         },
         Date.now(),
@@ -213,27 +199,27 @@ export const summaryCommand: SlashCommand = {
     };
 
     const formatSuccessMessage = (filePathForDisplay: string): string =>
-      t('Saved project summary to {{filePathForDisplay}}.', {
+      t("Saved project summary to {{filePathForDisplay}}.", {
         filePathForDisplay,
       });
 
     const returnNoConversationMessage = (): SlashCommandActionReturn => {
-      const msg = t('No conversation found to summarize.');
-      if (executionMode === 'acp') {
+      const msg = t("No conversation found to summarize.");
+      if (executionMode === "acp") {
         const messages = async function* () {
           yield {
-            messageType: 'info' as const,
+            messageType: "info" as const,
             content: msg,
           };
         };
         return {
-          type: 'stream_messages',
+          type: "stream_messages",
           messages: messages(),
         };
       }
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: msg,
       };
     };
@@ -244,12 +230,12 @@ export const summaryCommand: SlashCommand = {
       markdownSummary: string;
       filePathForDisplay: string;
     }> => {
-      emitInteractivePending('generating');
+      emitInteractivePending("generating");
       const markdownSummary = await generateSummaryMarkdown(history);
       if (abortSignal?.aborted) {
-        throw new DOMException('Summary generation cancelled.', 'AbortError');
+        throw new DOMException("Summary generation cancelled.", "AbortError");
       }
-      emitInteractivePending('saving');
+      emitInteractivePending("saving");
       const { filePathForDisplay } = await saveSummaryToDisk(markdownSummary);
       completeInteractive(filePathForDisplay);
       return { markdownSummary, filePathForDisplay };
@@ -263,32 +249,31 @@ export const summaryCommand: SlashCommand = {
       return returnNoConversationMessage();
     }
 
-    if (executionMode === 'acp') {
+    if (executionMode === "acp") {
       const messages = async function* () {
         try {
           yield {
-            messageType: 'info' as const,
-            content: t('Generating project summary...'),
+            messageType: "info" as const,
+            content: t("Generating project summary..."),
           };
 
-          const { filePathForDisplay } =
-            await executeSummaryGeneration(history);
+          const { filePathForDisplay } = await executeSummaryGeneration(history);
 
           yield {
-            messageType: 'info' as const,
+            messageType: "info" as const,
             content: formatSuccessMessage(filePathForDisplay),
           };
         } catch (error) {
           failInteractive(error);
           yield {
-            messageType: 'error' as const,
+            messageType: "error" as const,
             content: formatErrorMessage(error),
           };
         }
       };
 
       return {
-        type: 'stream_messages',
+        type: "stream_messages",
         messages: messages(),
       };
     }
@@ -296,26 +281,26 @@ export const summaryCommand: SlashCommand = {
     try {
       const { filePathForDisplay } = await executeSummaryGeneration(history);
 
-      if (executionMode === 'non_interactive') {
+      if (executionMode === "non_interactive") {
         return {
-          type: 'message',
-          messageType: 'info',
+          type: "message",
+          messageType: "info",
           content: formatSuccessMessage(filePathForDisplay),
         };
       }
 
       // Interactive mode: UI components already display progress and completion.
       return {
-        type: 'message',
-        messageType: 'info',
-        content: '',
+        type: "message",
+        messageType: "info",
+        content: "",
       };
     } catch (error) {
       failInteractive(error);
 
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: formatErrorMessage(error),
       };
     }
diff --git a/apps/airiscode-cli/src/ui/commands/terminalSetupCommand.ts b/apps/airiscode-cli/src/ui/commands/terminalSetupCommand.ts
index 3fb854466..54b9177cf 100644
--- a/apps/airiscode-cli/src/ui/commands/terminalSetupCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/terminalSetupCommand.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { terminalSetup } from '../utils/terminalSetup.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { terminalSetup } from "../utils/terminalSetup.js";
+import type { MessageActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 /**
  * Command to configure terminal keybindings for multiline input support.
@@ -16,10 +16,10 @@ import { t } from '../../i18n/index.js';
  * to support Shift+Enter and Ctrl+Enter for multiline input.
  */
 export const terminalSetupCommand: SlashCommand = {
-  name: 'terminal-setup',
+  name: "terminal-setup",
   get description() {
     return t(
-      'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)',
+      "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf, Trae)",
     );
   },
   kind: CommandKind.BUILT_IN,
@@ -30,23 +30,21 @@ export const terminalSetupCommand: SlashCommand = {
 
       let content = result.message;
       if (result.requiresRestart) {
-        content +=
-          '\n\n' +
-          t('Please restart your terminal for the changes to take effect.');
+        content += "\n\n" + t("Please restart your terminal for the changes to take effect.");
       }
 
       return {
-        type: 'message',
+        type: "message",
         content,
-        messageType: result.success ? 'info' : 'error',
+        messageType: result.success ? "info" : "error",
       };
     } catch (error) {
       return {
-        type: 'message',
-        content: t('Failed to configure terminal: {{error}}', {
+        type: "message",
+        content: t("Failed to configure terminal: {{error}}", {
           error: String(error),
         }),
-        messageType: 'error',
+        messageType: "error",
       };
     }
   },
diff --git a/apps/airiscode-cli/src/ui/commands/themeCommand.ts b/apps/airiscode-cli/src/ui/commands/themeCommand.ts
index fd366366a..4f99fab7e 100644
--- a/apps/airiscode-cli/src/ui/commands/themeCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/themeCommand.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const themeCommand: SlashCommand = {
-  name: 'theme',
+  name: "theme",
   get description() {
-    return t('change the theme');
+    return t("change the theme");
   },
   kind: CommandKind.BUILT_IN,
   action: (_context, _args): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'theme',
+    type: "dialog",
+    dialog: "theme",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/toolsCommand.ts b/apps/airiscode-cli/src/ui/commands/toolsCommand.ts
index a73403cda..3d6dbe927 100644
--- a/apps/airiscode-cli/src/ui/commands/toolsCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/toolsCommand.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { MessageType, type HistoryItemToolsList } from '../types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import { type HistoryItemToolsList, MessageType } from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 export const toolsCommand: SlashCommand = {
-  name: 'tools',
+  name: "tools",
   get description() {
-    return t('list available AIRIS Code tools. Usage: /tools [desc]');
+    return t("list available AIRIS Code tools. Usage: /tools [desc]");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context: CommandContext, args?: string): Promise<void> => {
@@ -23,7 +19,7 @@ export const toolsCommand: SlashCommand = {
 
     // Default to NOT showing descriptions. The user must opt in with an argument.
     let useShowDescriptions = false;
-    if (subCommand === 'desc' || subCommand === 'descriptions') {
+    if (subCommand === "desc" || subCommand === "descriptions") {
       useShowDescriptions = true;
     }
 
@@ -32,7 +28,7 @@ export const toolsCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: t('Could not retrieve tool registry.'),
+          text: t("Could not retrieve tool registry."),
         },
         Date.now(),
       );
@@ -41,7 +37,7 @@ export const toolsCommand: SlashCommand = {
 
     const tools = toolRegistry.getAllTools();
     // Filter out MCP tools by checking for the absence of a serverName property
-    const geminiTools = tools.filter((tool) => !('serverName' in tool));
+    const geminiTools = tools.filter((tool) => !("serverName" in tool));
 
     const toolsListItem: HistoryItemToolsList = {
       type: MessageType.TOOLS_LIST,
diff --git a/apps/airiscode-cli/src/ui/commands/trustCommand.ts b/apps/airiscode-cli/src/ui/commands/trustCommand.ts
index 9fa566db2..f12467a2d 100644
--- a/apps/airiscode-cli/src/ui/commands/trustCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/trustCommand.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const trustCommand: SlashCommand = {
-  name: 'trust',
+  name: "trust",
   get description() {
-    return t('Manage folder trust settings');
+    return t("Manage folder trust settings");
   },
   kind: CommandKind.BUILT_IN,
   action: (): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'trust',
+    type: "dialog",
+    dialog: "trust",
   }),
 };
diff --git a/apps/airiscode-cli/src/ui/commands/types.ts b/apps/airiscode-cli/src/ui/commands/types.ts
index 28b212b52..5e73587f8 100644
--- a/apps/airiscode-cli/src/ui/commands/types.ts
+++ b/apps/airiscode-cli/src/ui/commands/types.ts
@@ -4,22 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MutableRefObject, ReactNode } from 'react';
-import type { Content, PartListUnion } from '@airiscode/core';
-import type { Config, GitService, Logger } from '@airiscode/core';
+import type { Config, Content, GitService, Logger, PartListUnion } from "@airiscode/core";
+import type { MutableRefObject, ReactNode } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import type { SessionStatsState } from "../contexts/SessionContext.js";
+import type { UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import type { ExtensionUpdateAction, ExtensionUpdateStatus } from "../state/extensions.js";
 import type {
-  HistoryItemWithoutId,
+  ConfirmationRequest,
   HistoryItem,
   HistoryItemBtw,
-  ConfirmationRequest,
-} from '../types.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import type { UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
-import type { SessionStatsState } from '../contexts/SessionContext.js';
-import type {
-  ExtensionUpdateAction,
-  ExtensionUpdateStatus,
-} from '../state/extensions.js';
+  HistoryItemWithoutId,
+} from "../types.js";
 
 // Grouped dependencies for clarity and easier mocking
 export interface CommandContext {
@@ -30,7 +26,7 @@ export interface CommandContext {
    * - non_interactive: non-interactive CLI mode (text/json)
    * - acp: ACP/Zed integration mode
    */
-  executionMode?: 'interactive' | 'non_interactive' | 'acp';
+  executionMode?: "interactive" | "non_interactive" | "acp";
   // Invocation properties for when commands are called.
   invocation?: {
     /** The raw, untrimmed input string from the user. */
@@ -51,7 +47,7 @@ export interface CommandContext {
   // UI state and history management
   ui: {
     /** Adds a new item to the history display. */
-    addItem: UseHistoryManagerReturn['addItem'];
+    addItem: UseHistoryManagerReturn["addItem"];
     /** Clears all history items and the console screen. */
     clear: () => void;
     /**
@@ -80,7 +76,7 @@ export interface CommandContext {
      *
      * @param history The array of history items to load.
      */
-    loadHistory: UseHistoryManagerReturn['loadHistory'];
+    loadHistory: UseHistoryManagerReturn["loadHistory"];
     toggleVimEnabled: () => Promise<boolean>;
     setGeminiMdFileCount: (count: number) => void;
     reloadCommands: () => void;
@@ -106,14 +102,14 @@ export interface CommandContext {
  * The return type for a command action that results in scheduling a tool call.
  */
 export interface ToolActionReturn {
-  type: 'tool';
+  type: "tool";
   toolName: string;
   toolArgs: Record<string, unknown>;
 }
 
 /** The return type for a command action that results in the app quitting. */
 export interface QuitActionReturn {
-  type: 'quit';
+  type: "quit";
   messages: HistoryItem[];
 }
 
@@ -122,8 +118,8 @@ export interface QuitActionReturn {
  * being displayed to the user.
  */
 export interface MessageActionReturn {
-  type: 'message';
-  messageType: 'info' | 'error';
+  type: "message";
+  messageType: "info" | "error";
   content: string;
 }
 
@@ -132,41 +128,37 @@ export interface MessageActionReturn {
  * Used for long-running operations that need to send progress updates.
  */
 export interface StreamMessagesActionReturn {
-  type: 'stream_messages';
-  messages: AsyncGenerator<
-    { messageType: 'info' | 'error'; content: string },
-    void,
-    unknown
-  >;
+  type: "stream_messages";
+  messages: AsyncGenerator<{ messageType: "info" | "error"; content: string }, void, unknown>;
 }
 
 /**
  * The return type for a command action that needs to open a dialog.
  */
 export interface OpenDialogActionReturn {
-  type: 'dialog';
+  type: "dialog";
 
   dialog:
-    | 'help'
-    | 'arena_start'
-    | 'arena_select'
-    | 'arena_stop'
-    | 'arena_status'
-    | 'auth'
-    | 'theme'
-    | 'editor'
-    | 'settings'
-    | 'model'
-    | 'fast-model'
-    | 'subagent_create'
-    | 'subagent_list'
-    | 'trust'
-    | 'permissions'
-    | 'approval-mode'
-    | 'resume'
-    | 'extensions_manage'
-    | 'hooks'
-    | 'mcp';
+    | "help"
+    | "arena_start"
+    | "arena_select"
+    | "arena_stop"
+    | "arena_status"
+    | "auth"
+    | "theme"
+    | "editor"
+    | "settings"
+    | "model"
+    | "fast-model"
+    | "subagent_create"
+    | "subagent_list"
+    | "trust"
+    | "permissions"
+    | "approval-mode"
+    | "resume"
+    | "extensions_manage"
+    | "hooks"
+    | "mcp";
 }
 
 /**
@@ -174,7 +166,7 @@ export interface OpenDialogActionReturn {
  * the entire conversation history.
  */
 export interface LoadHistoryActionReturn {
-  type: 'load_history';
+  type: "load_history";
   history: HistoryItemWithoutId[];
   clientHistory: Content[]; // The history for the generative client
 }
@@ -184,7 +176,7 @@ export interface LoadHistoryActionReturn {
  * content as a prompt to the Gemini model.
  */
 export interface SubmitPromptActionReturn {
-  type: 'submit_prompt';
+  type: "submit_prompt";
   content: PartListUnion;
 }
 
@@ -193,7 +185,7 @@ export interface SubmitPromptActionReturn {
  * confirmation for a set of shell commands before proceeding.
  */
 export interface ConfirmShellCommandsActionReturn {
-  type: 'confirm_shell_commands';
+  type: "confirm_shell_commands";
   /** The list of shell commands that require user confirmation. */
   commandsToConfirm: string[];
   /** The original invocation context to be re-run after confirmation. */
@@ -203,7 +195,7 @@ export interface ConfirmShellCommandsActionReturn {
 }
 
 export interface ConfirmActionReturn {
-  type: 'confirm_action';
+  type: "confirm_action";
   /** The React node to display as the confirmation prompt. */
   prompt: ReactNode;
   /** The original invocation context to be re-run after confirmation. */
@@ -224,10 +216,10 @@ export type SlashCommandActionReturn =
   | ConfirmActionReturn;
 
 export enum CommandKind {
-  BUILT_IN = 'built-in',
-  FILE = 'file',
-  MCP_PROMPT = 'mcp-prompt',
-  SKILL = 'skill',
+  BUILT_IN = "built-in",
+  FILE = "file",
+  MCP_PROMPT = "mcp-prompt",
+  SKILL = "skill",
 }
 
 export interface CommandCompletionItem {
@@ -252,10 +244,7 @@ export interface SlashCommand {
   action?: (
     context: CommandContext,
     args: string, // TODO: Remove args. CommandContext now contains the complete invocation.
-  ) =>
-    | void
-    | SlashCommandActionReturn
-    | Promise<void | SlashCommandActionReturn>;
+  ) => void | SlashCommandActionReturn | Promise<void | SlashCommandActionReturn>;
 
   // Provides argument completion
   completion?: (
diff --git a/apps/airiscode-cli/src/ui/commands/vimCommand.ts b/apps/airiscode-cli/src/ui/commands/vimCommand.ts
index 8f3dc6bd0..aeb4e4786 100644
--- a/apps/airiscode-cli/src/ui/commands/vimCommand.ts
+++ b/apps/airiscode-cli/src/ui/commands/vimCommand.ts
@@ -4,25 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { t } from '../../i18n/index.js';
+import { t } from "../../i18n/index.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const vimCommand: SlashCommand = {
-  name: 'vim',
+  name: "vim",
   get description() {
-    return t('toggle vim mode on/off');
+    return t("toggle vim mode on/off");
   },
   kind: CommandKind.BUILT_IN,
   action: async (context, _args) => {
     const newVimState = await context.ui.toggleVimEnabled();
 
-    const message = newVimState
-      ? 'Entered Vim mode. Run /vim again to exit.'
-      : 'Exited Vim mode.';
+    const message = newVimState ? "Entered Vim mode. Run /vim again to exit." : "Exited Vim mode.";
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: message,
     };
   },
diff --git a/apps/airiscode-cli/src/ui/components/AboutBox.tsx b/apps/airiscode-cli/src/ui/components/AboutBox.tsx
index 70ef13711..6b7ff1cad 100644
--- a/apps/airiscode-cli/src/ui/components/AboutBox.tsx
+++ b/apps/airiscode-cli/src/ui/components/AboutBox.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import type { ExtendedSystemInfo } from '../../utils/systemInfo.js';
-import { getSystemInfoFields } from '../../utils/systemInfoFields.js';
-import { t } from '../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import type { ExtendedSystemInfo } from "../../utils/systemInfo.js";
+import { getSystemInfoFields } from "../../utils/systemInfoFields.js";
+import { theme } from "../semantic-colors.js";
 
 type AboutBoxProps = ExtendedSystemInfo & {
   width?: number;
@@ -28,15 +28,11 @@ export const AboutBox: React.FC<AboutBoxProps> = ({ width, ...props }) => {
     >
       <Box marginBottom={1}>
         <Text bold color={theme.text.accent}>
-          {t('Status')}
+          {t("Status")}
         </Text>
       </Box>
       {fields.map((field) => (
-        <Box
-          key={field.label}
-          flexDirection="row"
-          marginTop={field.label === t('Auth') ? 1 : 0}
-        >
+        <Box key={field.label} flexDirection="row" marginTop={field.label === t("Auth") ? 1 : 0}>
           <Box width="35%">
             <Text bold color={theme.text.link}>
               {field.label}
diff --git a/apps/airiscode-cli/src/ui/components/AnsiOutput.tsx b/apps/airiscode-cli/src/ui/components/AnsiOutput.tsx
index 7541a2eda..f26127177 100644
--- a/apps/airiscode-cli/src/ui/components/AnsiOutput.tsx
+++ b/apps/airiscode-cli/src/ui/components/AnsiOutput.tsx
@@ -4,13 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text } from 'ink';
-import type {
-  AnsiLine,
-  AnsiOutput,
-  AnsiToken,
-} from '@airiscode/core';
+import type { AnsiLine, AnsiOutput, AnsiToken } from "@airiscode/core";
+import { Text } from "ink";
+import type React from "react";
 
 const DEFAULT_HEIGHT = 24;
 
@@ -19,10 +15,7 @@ interface AnsiOutputProps {
   availableTerminalHeight?: number;
 }
 
-export const AnsiOutputText: React.FC<AnsiOutputProps> = ({
-  data,
-  availableTerminalHeight,
-}) => {
+export const AnsiOutputText: React.FC<AnsiOutputProps> = ({ data, availableTerminalHeight }) => {
   const lastLines = data.slice(
     -(availableTerminalHeight && availableTerminalHeight > 0
       ? availableTerminalHeight
diff --git a/apps/airiscode-cli/src/ui/components/ApiKeyInput.tsx b/apps/airiscode-cli/src/ui/components/ApiKeyInput.tsx
index bf885b30d..907c9cf43 100644
--- a/apps/airiscode-cli/src/ui/components/ApiKeyInput.tsx
+++ b/apps/airiscode-cli/src/ui/components/ApiKeyInput.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState } from 'react';
-import { Box, Text } from 'ink';
-import { TextInput } from './shared/TextInput.js';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { t } from '../../i18n/index.js';
-import { CodingPlanRegion } from '../../constants/codingPlan.js';
-import Link from 'ink-link';
+import { Box, Text } from "ink";
+import Link from "ink-link";
+import type React from "react";
+import { useState } from "react";
+import { CodingPlanRegion } from "../../constants/codingPlan.js";
+import { t } from "../../i18n/index.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { TextInput } from "./shared/TextInput.js";
 
 interface ApiKeyInputProps {
   onSubmit: (apiKey: string) => void;
@@ -20,45 +20,35 @@ interface ApiKeyInputProps {
   region?: CodingPlanRegion;
 }
 
-const CODING_PLAN_API_KEY_URL =
-  'https://bailian.console.aliyun.com/?tab=model#/efm/coding_plan';
+const CODING_PLAN_API_KEY_URL = "https://bailian.console.aliyun.com/?tab=model#/efm/coding_plan";
 
 const CODING_PLAN_INTL_API_KEY_URL =
-  'https://modelstudio.console.alibabacloud.com/?tab=dashboard#/efm/coding_plan';
+  "https://modelstudio.console.alibabacloud.com/?tab=dashboard#/efm/coding_plan";
 
 export function ApiKeyInput({
   onSubmit,
   onCancel,
   region = CodingPlanRegion.CHINA,
 }: ApiKeyInputProps): React.JSX.Element {
-  const [apiKey, setApiKey] = useState('');
+  const [apiKey, setApiKey] = useState("");
   const [error, setError] = useState<string | null>(null);
 
   const apiKeyUrl =
-    region === CodingPlanRegion.GLOBAL
-      ? CODING_PLAN_INTL_API_KEY_URL
-      : CODING_PLAN_API_KEY_URL;
+    region === CodingPlanRegion.GLOBAL ? CODING_PLAN_INTL_API_KEY_URL : CODING_PLAN_API_KEY_URL;
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onCancel();
-      } else if (key.name === 'return') {
+      } else if (key.name === "return") {
         const trimmedKey = apiKey.trim();
         if (!trimmedKey) {
-          setError(t('API key cannot be empty.'));
+          setError(t("API key cannot be empty."));
           return;
         }
         // Only validate sk-sp- prefix for China region (aliyun.com)
-        if (
-          region === CodingPlanRegion.CHINA &&
-          !trimmedKey.startsWith('sk-sp-')
-        ) {
-          setError(
-            t(
-              'Invalid API key. Coding Plan API keys start with "sk-sp-". Please check.',
-            ),
-          );
+        if (region === CodingPlanRegion.CHINA && !trimmedKey.startsWith("sk-sp-")) {
+          setError(t('Invalid API key. Coding Plan API keys start with "sk-sp-". Please check.'));
           return;
         }
         onSubmit(trimmedKey);
@@ -76,7 +66,7 @@ export function ApiKeyInput({
         </Box>
       )}
       <Box marginTop={1}>
-        <Text>{t('You can get your Coding Plan API key here')}</Text>
+        <Text>{t("You can get your Coding Plan API key here")}</Text>
       </Box>
       <Box marginTop={0}>
         <Link url={apiKeyUrl} fallback={false}>
@@ -86,9 +76,7 @@ export function ApiKeyInput({
         </Link>
       </Box>
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          {t('Enter to submit, Esc to go back')}
-        </Text>
+        <Text color={theme.text.secondary}>{t("Enter to submit, Esc to go back")}</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/AppHeader.tsx b/apps/airiscode-cli/src/ui/components/AppHeader.tsx
index 8270827fe..57f703257 100644
--- a/apps/airiscode-cli/src/ui/components/AppHeader.tsx
+++ b/apps/airiscode-cli/src/ui/components/AppHeader.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { AuthType } from '@airiscode/core';
-import { Header, AuthDisplayType } from './Header.js';
-import { Tips } from './Tips.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { isCodingPlanConfig } from '../../constants/codingPlan.js';
+import { AuthType } from "@airiscode/core";
+import { Box } from "ink";
+import { isCodingPlanConfig } from "../../constants/codingPlan.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { AuthDisplayType, Header } from "./Header.js";
+import { Tips } from "./Tips.js";
 
 interface AppHeaderProps {
   version: string;
diff --git a/apps/airiscode-cli/src/ui/components/ApprovalModeDialog.tsx b/apps/airiscode-cli/src/ui/components/ApprovalModeDialog.tsx
index 4fea0b557..1e5f5debf 100644
--- a/apps/airiscode-cli/src/ui/components/ApprovalModeDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/ApprovalModeDialog.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { ApprovalMode, APPROVAL_MODES } from '@airiscode/core';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import { getScopeMessageForSetting } from '../../utils/dialogScopeUtils.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { ScopeSelector } from './shared/ScopeSelector.js';
-import { t } from '../../i18n/index.js';
+import { APPROVAL_MODES, ApprovalMode } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
+import { getScopeMessageForSetting } from "../../utils/dialogScopeUtils.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
+import { ScopeSelector } from "./shared/ScopeSelector.js";
 
 interface ApprovalModeDialogProps {
   /** Callback function when an approval mode is selected */
@@ -34,15 +34,15 @@ interface ApprovalModeDialogProps {
 const formatModeDescription = (mode: ApprovalMode): string => {
   switch (mode) {
     case ApprovalMode.PLAN:
-      return t('Analyze only, do not modify files or execute commands');
+      return t("Analyze only, do not modify files or execute commands");
     case ApprovalMode.DEFAULT:
-      return t('Require approval for file edits or shell commands');
+      return t("Require approval for file edits or shell commands");
     case ApprovalMode.AUTO_EDIT:
-      return t('Automatically approve file edits');
+      return t("Automatically approve file edits");
     case ApprovalMode.YOLO:
-      return t('Automatically approve all tools');
+      return t("Automatically approve all tools");
     default:
-      return t('{{mode}} mode', { mode });
+      return t("{{mode}} mode", { mode });
   }
 };
 
@@ -53,9 +53,7 @@ export function ApprovalModeDialog({
   availableTerminalHeight: _availableTerminalHeight,
 }: ApprovalModeDialogProps): React.JSX.Element {
   // Start with User scope by default
-  const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
-  );
+  const [selectedScope, setSelectedScope] = useState<SettingScope>(SettingScope.User);
 
   // Track the currently highlighted approval mode
   const [highlightedMode, setHighlightedMode] = useState<ApprovalMode>(
@@ -70,9 +68,7 @@ export function ApprovalModeDialog({
   }));
 
   // Find the index of the current mode
-  const initialModeIndex = modeItems.findIndex(
-    (item) => item.value === highlightedMode,
-  );
+  const initialModeIndex = modeItems.findIndex((item) => item.value === highlightedMode);
   const safeInitialModeIndex = initialModeIndex >= 0 ? initialModeIndex : 0;
 
   const handleModeSelect = useCallback(
@@ -92,17 +88,17 @@ export function ApprovalModeDialog({
 
   const handleScopeSelect = useCallback((scope: SettingScope) => {
     setSelectedScope(scope);
-    setMode('mode');
+    setMode("mode");
   }, []);
 
-  const [mode, setMode] = useState<'mode' | 'scope'>('mode');
+  const [mode, setMode] = useState<"mode" | "scope">("mode");
 
   useKeypress(
     (key) => {
-      if (key.name === 'tab') {
-        setMode((prev) => (prev === 'mode' ? 'scope' : 'mode'));
+      if (key.name === "tab") {
+        setMode((prev) => (prev === "mode" ? "scope" : "mode"));
       }
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onSelect(undefined, selectedScope);
       }
     },
@@ -111,7 +107,7 @@ export function ApprovalModeDialog({
 
   // Generate scope message for approval mode setting
   const otherScopeModifiedMessage = getScopeMessageForSetting(
-    'tools.approvalMode',
+    "tools.approvalMode",
     selectedScope,
     settings,
   );
@@ -119,7 +115,7 @@ export function ApprovalModeDialog({
   // Check if user scope is selected but workspace has the setting
   const showWorkspacePriorityWarning =
     selectedScope === SettingScope.User &&
-    otherScopeModifiedMessage.toLowerCase().includes('workspace');
+    otherScopeModifiedMessage.toLowerCase().includes("workspace");
 
   return (
     <Box
@@ -129,15 +125,13 @@ export function ApprovalModeDialog({
       padding={1}
       width="100%"
     >
-      {mode === 'mode' ? (
+      {mode === "mode" ? (
         <Box flexDirection="column" flexGrow={1}>
           {/* Approval Mode Selection */}
-          <Text bold={mode === 'mode'} wrap="truncate">
-            {mode === 'mode' ? '> ' : '  '}
-            {t('Approval Mode')}{' '}
-            <Text color={theme.text.secondary}>
-              {otherScopeModifiedMessage}
-            </Text>
+          <Text bold={mode === "mode"} wrap="truncate">
+            {mode === "mode" ? "> " : "  "}
+            {t("Approval Mode")}{" "}
+            <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
           </Text>
           <Box height={1} />
           <RadioButtonSelect
@@ -145,18 +139,18 @@ export function ApprovalModeDialog({
             initialIndex={safeInitialModeIndex}
             onSelect={handleModeSelect}
             onHighlight={handleModeHighlight}
-            isFocused={mode === 'mode'}
+            isFocused={mode === "mode"}
             maxItemsToShow={10}
             showScrollArrows={false}
-            showNumbers={mode === 'mode'}
+            showNumbers={mode === "mode"}
           />
           {/* Warning when workspace setting will override user setting */}
           {showWorkspacePriorityWarning && (
             <Box marginTop={1}>
               <Text color={theme.status.warning} wrap="wrap">
-                ⚠{' '}
+                ⚠{" "}
                 {t(
-                  'Workspace approval mode exists and takes priority. User-level change will have no effect.',
+                  "Workspace approval mode exists and takes priority. User-level change will have no effect.",
                 )}
               </Text>
             </Box>
@@ -166,15 +160,15 @@ export function ApprovalModeDialog({
         <ScopeSelector
           onSelect={handleScopeSelect}
           onHighlight={handleScopeHighlight}
-          isFocused={mode === 'scope'}
+          isFocused={mode === "scope"}
           initialScope={selectedScope}
         />
       )}
       <Box marginTop={1}>
         <Text color={theme.text.secondary} wrap="truncate">
-          {mode === 'mode'
-            ? t('(Use Enter to select, Tab to configure scope)')
-            : t('(Use Enter to apply scope, Tab to go back)')}
+          {mode === "mode"
+            ? t("(Use Enter to select, Tab to configure scope)")
+            : t("(Use Enter to apply scope, Tab to go back)")}
         </Text>
       </Box>
     </Box>
diff --git a/apps/airiscode-cli/src/ui/components/AutoAcceptIndicator.tsx b/apps/airiscode-cli/src/ui/components/AutoAcceptIndicator.tsx
index ec7249625..57adce86e 100644
--- a/apps/airiscode-cli/src/ui/components/AutoAcceptIndicator.tsx
+++ b/apps/airiscode-cli/src/ui/components/AutoAcceptIndicator.tsx
@@ -4,42 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { ApprovalMode } from '@airiscode/core';
-import { t } from '../../i18n/index.js';
+import { ApprovalMode } from "@airiscode/core";
+import { Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { theme } from "../semantic-colors.js";
 
 interface AutoAcceptIndicatorProps {
   approvalMode: ApprovalMode;
 }
 
-export const AutoAcceptIndicator: React.FC<AutoAcceptIndicatorProps> = ({
-  approvalMode,
-}) => {
-  let textColor = '';
-  let textContent = '';
-  let subText = '';
+export const AutoAcceptIndicator: React.FC<AutoAcceptIndicatorProps> = ({ approvalMode }) => {
+  let textColor = "";
+  let textContent = "";
+  let subText = "";
 
   const cycleText =
-    process.platform === 'win32'
-      ? ` ${t('(tab to cycle)')}`
-      : ` ${t('(shift + tab to cycle)')}`;
+    process.platform === "win32" ? ` ${t("(tab to cycle)")}` : ` ${t("(shift + tab to cycle)")}`;
 
   switch (approvalMode) {
     case ApprovalMode.PLAN:
       textColor = theme.status.success;
-      textContent = t('plan mode');
+      textContent = t("plan mode");
       subText = cycleText;
       break;
     case ApprovalMode.AUTO_EDIT:
       textColor = theme.status.warning;
-      textContent = t('auto-accept edits');
+      textContent = t("auto-accept edits");
       subText = cycleText;
       break;
     case ApprovalMode.YOLO:
       textColor = theme.status.error;
-      textContent = t('YOLO mode');
+      textContent = t("YOLO mode");
       subText = cycleText;
       break;
     case ApprovalMode.DEFAULT:
diff --git a/apps/airiscode-cli/src/ui/components/BaseTextInput.tsx b/apps/airiscode-cli/src/ui/components/BaseTextInput.tsx
index 07eb1a693..1c27acc48 100644
--- a/apps/airiscode-cli/src/ui/components/BaseTextInput.tsx
+++ b/apps/airiscode-cli/src/ui/components/BaseTextInput.tsx
@@ -19,16 +19,16 @@
  * and AgentComposer (with minimal customization).
  */
 
-import type React from 'react';
-import { useCallback } from 'react';
-import { Box, Text } from 'ink';
-import chalk from 'chalk';
-import type { TextBuffer } from './shared/text-buffer.js';
-import type { Key } from '../hooks/useKeypress.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { keyMatchers, Command } from '../keyMatchers.js';
-import { cpSlice, cpLen } from '../utils/textUtils.js';
-import { theme } from '../semantic-colors.js';
+import chalk from "chalk";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback } from "react";
+import type { Key } from "../hooks/useKeypress.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { Command, keyMatchers } from "../keyMatchers.js";
+import { theme } from "../semantic-colors.js";
+import { cpLen, cpSlice } from "../utils/textUtils.js";
+import type { TextBuffer } from "./shared/text-buffer.js";
 
 // ─── Types ──────────────────────────────────────────────────
 
@@ -91,7 +91,7 @@ export function defaultRenderLine({
   showCursor,
 }: RenderLineOptions): React.ReactNode {
   if (!isOnCursorLine || !showCursor) {
-    return <Text>{lineText || ' '}</Text>;
+    return <Text>{lineText || " "}</Text>;
   }
 
   const len = cpLen(lineText);
@@ -101,7 +101,7 @@ export function defaultRenderLine({
     return (
       <Text>
         {lineText}
-        {chalk.inverse(' ') + '\u200B'}
+        {chalk.inverse(" ") + "\u200B"}
       </Text>
     );
   }
@@ -147,7 +147,7 @@ export const BaseTextInput: React.FC<BaseTextInputProps> = ({
       if (keyMatchers[Command.SUBMIT](key)) {
         if (buffer.text.trim()) {
           const text = buffer.text;
-          buffer.setText('');
+          buffer.setText("");
           onSubmit(text);
         }
         return;
@@ -162,7 +162,7 @@ export const BaseTextInput: React.FC<BaseTextInputProps> = ({
       // Escape → clear input
       if (keyMatchers[Command.ESCAPE](key)) {
         if (buffer.text.length > 0) {
-          buffer.setText('');
+          buffer.setText("");
         }
         return;
       }
@@ -170,20 +170,20 @@ export const BaseTextInput: React.FC<BaseTextInputProps> = ({
       // Ctrl+C → clear input
       if (keyMatchers[Command.CLEAR_INPUT](key)) {
         if (buffer.text.length > 0) {
-          buffer.setText('');
+          buffer.setText("");
         }
         return;
       }
 
       // Ctrl+A → home
       if (keyMatchers[Command.HOME](key)) {
-        buffer.move('home');
+        buffer.move("home");
         return;
       }
 
       // Ctrl+E → end
       if (keyMatchers[Command.END](key)) {
-        buffer.move('end');
+        buffer.move("end");
         return;
       }
 
@@ -212,11 +212,7 @@ export const BaseTextInput: React.FC<BaseTextInputProps> = ({
       }
 
       // Backspace
-      if (
-        key.name === 'backspace' ||
-        key.sequence === '\x7f' ||
-        (key.ctrl && key.name === 'h')
-      ) {
+      if (key.name === "backspace" || key.sequence === "\x7f" || (key.ctrl && key.name === "h")) {
         buffer.backspace();
         return;
       }
@@ -236,9 +232,7 @@ export const BaseTextInput: React.FC<BaseTextInputProps> = ({
   const scrollVisualRow = buffer.visualScrollRow;
 
   const resolvedBorderColor = borderColor ?? theme.border.focused;
-  const resolvedPrefix = prefix ?? (
-    <Text color={theme.text.accent}>{'> '}</Text>
-  );
+  const resolvedPrefix = prefix ?? <Text color={theme.text.accent}>{"> "}</Text>;
 
   return (
     <Box
diff --git a/apps/airiscode-cli/src/ui/components/Composer.tsx b/apps/airiscode-cli/src/ui/components/Composer.tsx
index 4dca07f0b..23a6ba577 100644
--- a/apps/airiscode-cli/src/ui/components/Composer.tsx
+++ b/apps/airiscode-cli/src/ui/components/Composer.tsx
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, useIsScreenReaderEnabled } from 'ink';
-import { useCallback, useState } from 'react';
-import { LoadingIndicator } from './LoadingIndicator.js';
-import { InputPrompt } from './InputPrompt.js';
-import { Footer } from './Footer.js';
-import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
-import { KeyboardShortcuts } from './KeyboardShortcuts.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { StreamingState } from '../types.js';
-import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js';
-import { FeedbackDialog } from '../FeedbackDialog.js';
-import { t } from '../../i18n/index.js';
+import { Box, useIsScreenReaderEnabled } from "ink";
+import { useCallback, useState } from "react";
+import { t } from "../../i18n/index.js";
+import { ConfigInitDisplay } from "../components/ConfigInitDisplay.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
+import { FeedbackDialog } from "../FeedbackDialog.js";
+import { StreamingState } from "../types.js";
+import { Footer } from "./Footer.js";
+import { InputPrompt } from "./InputPrompt.js";
+import { KeyboardShortcuts } from "./KeyboardShortcuts.js";
+import { LoadingIndicator } from "./LoadingIndicator.js";
+import { QueuedMessageDisplay } from "./QueuedMessageDisplay.js";
 
 export const Composer = () => {
   const config = useConfig();
@@ -107,8 +107,8 @@ export const Composer = () => {
           isEmbeddedShellFocused={uiState.embeddedShellFocused}
           placeholder={
             vimEnabled
-              ? '  ' + t("Press 'i' for INSERT mode and 'Esc' for NORMAL mode.")
-              : '  ' + t('Type your message or @path/to/file')
+              ? "  " + t("Press 'i' for INSERT mode and 'Esc' for NORMAL mode.")
+              : "  " + t("Type your message or @path/to/file")
           }
           promptSuggestion={uiState.promptSuggestion}
           onPromptSuggestionDismiss={uiState.dismissPromptSuggestion}
@@ -119,11 +119,7 @@ export const Composer = () => {
       {/* Hide footer when a confirmation dialog (e.g. ask_user_question) is active */}
       {uiState.isInputActive &&
         !showSuggestions &&
-        (showShortcuts ? (
-          <KeyboardShortcuts />
-        ) : (
-          !isScreenReaderEnabled && <Footer />
-        ))}
+        (showShortcuts ? <KeyboardShortcuts /> : !isScreenReaderEnabled && <Footer />)}
     </Box>
   );
 };
diff --git a/apps/airiscode-cli/src/ui/components/ConfigInitDisplay.tsx b/apps/airiscode-cli/src/ui/components/ConfigInitDisplay.tsx
index 8913d7909..2c8bd6adf 100644
--- a/apps/airiscode-cli/src/ui/components/ConfigInitDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/ConfigInitDisplay.tsx
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useState } from 'react';
-import { appEvents } from './../../utils/events.js';
-import { Box, Text } from 'ink';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { type McpClient, MCPServerStatus } from '@airiscode/core';
-import { GeminiSpinner } from './GeminiRespondingSpinner.js';
-import { theme } from '../semantic-colors.js';
-import { t } from '../../i18n/index.js';
+import { MCPServerStatus, type McpClient } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useEffect, useState } from "react";
+import { t } from "../../i18n/index.js";
+import { appEvents } from "./../../utils/events.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { theme } from "../semantic-colors.js";
+import { GeminiSpinner } from "./GeminiRespondingSpinner.js";
 
 export const ConfigInitDisplay = () => {
   const config = useConfig();
-  const [message, setMessage] = useState(t('Initializing...'));
+  const [message, setMessage] = useState(t("Initializing..."));
 
   useEffect(() => {
     const onChange = (clients?: Map<string, McpClient>) => {
       if (!clients || clients.size === 0) {
-        setMessage(t('Initializing...'));
+        setMessage(t("Initializing..."));
         return;
       }
       let connected = 0;
@@ -30,16 +30,16 @@ export const ConfigInitDisplay = () => {
         }
       }
       setMessage(
-        t('Connecting to MCP servers... ({{connected}}/{{total}})', {
+        t("Connecting to MCP servers... ({{connected}}/{{total}})", {
           connected: String(connected),
           total: String(clients.size),
         }),
       );
     };
 
-    appEvents.on('mcp-client-update', onChange);
+    appEvents.on("mcp-client-update", onChange);
     return () => {
-      appEvents.off('mcp-client-update', onChange);
+      appEvents.off("mcp-client-update", onChange);
     };
   }, [config]);
 
diff --git a/apps/airiscode-cli/src/ui/components/ConsentPrompt.tsx b/apps/airiscode-cli/src/ui/components/ConsentPrompt.tsx
index 0fae2c295..9d1099969 100644
--- a/apps/airiscode-cli/src/ui/components/ConsentPrompt.tsx
+++ b/apps/airiscode-cli/src/ui/components/ConsentPrompt.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { type ReactNode } from 'react';
-import { theme } from '../semantic-colors.js';
-import { MarkdownDisplay } from '../utils/MarkdownDisplay.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { Box } from "ink";
+import { type ReactNode } from "react";
+import { theme } from "../semantic-colors.js";
+import { MarkdownDisplay } from "../utils/MarkdownDisplay.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 type ConsentPromptProps = {
   // If a simple string is given, it will render using markdown by default.
@@ -28,20 +28,16 @@ export const ConsentPrompt = (props: ConsentPromptProps) => {
       paddingY={1}
       paddingX={2}
     >
-      {typeof prompt === 'string' ? (
-        <MarkdownDisplay
-          isPending={true}
-          text={prompt}
-          contentWidth={terminalWidth}
-        />
+      {typeof prompt === "string" ? (
+        <MarkdownDisplay isPending={true} text={prompt} contentWidth={terminalWidth} />
       ) : (
         prompt
       )}
       <Box marginTop={1}>
         <RadioButtonSelect
           items={[
-            { label: 'Yes', value: true, key: 'Yes' },
-            { label: 'No', value: false, key: 'No' },
+            { label: "Yes", value: true, key: "Yes" },
+            { label: "No", value: false, key: "No" },
           ]}
           onSelect={onConfirm}
         />
diff --git a/apps/airiscode-cli/src/ui/components/ContextSummaryDisplay.tsx b/apps/airiscode-cli/src/ui/components/ContextSummaryDisplay.tsx
index 4d9688b40..dc3200fbf 100644
--- a/apps/airiscode-cli/src/ui/components/ContextSummaryDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/ContextSummaryDisplay.tsx
@@ -4,16 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import {
-  type IdeContext,
-  type MCPServerConfig,
-} from '@airiscode/core';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
-import { t } from '../../i18n/index.js';
+import { type IdeContext, type MCPServerConfig } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
+import { isNarrowWidth } from "../utils/isNarrowWidth.js";
 
 interface ContextSummaryDisplayProps {
   geminiMdFileCount: number;
@@ -49,27 +46,27 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
 
   const openFilesText = (() => {
     if (openFileCount === 0) {
-      return '';
+      return "";
     }
     const fileText =
       openFileCount === 1
-        ? t('{{count}} open file', { count: String(openFileCount) })
-        : t('{{count}} open files', { count: String(openFileCount) });
-    return `${fileText} ${t('(ctrl+g to view)')}`;
+        ? t("{{count}} open file", { count: String(openFileCount) })
+        : t("{{count}} open files", { count: String(openFileCount) });
+    return `${fileText} ${t("(ctrl+g to view)")}`;
   })();
 
   const geminiMdText = (() => {
     if (geminiMdFileCount === 0) {
-      return '';
+      return "";
     }
     const allNamesTheSame = new Set(contextFileNames).size < 2;
-    const name = allNamesTheSame ? contextFileNames[0] : 'context';
+    const name = allNamesTheSame ? contextFileNames[0] : "context";
     return geminiMdFileCount === 1
-      ? t('{{count}} {{name}} file', {
+      ? t("{{count}} {{name}} file", {
           count: String(geminiMdFileCount),
           name,
         })
-      : t('{{count}} {{name}} files', {
+      : t("{{count}} {{name}} files", {
           count: String(geminiMdFileCount),
           name,
         });
@@ -77,42 +74,42 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
 
   const mcpText = (() => {
     if (mcpServerCount === 0 && blockedMcpServerCount === 0) {
-      return '';
+      return "";
     }
 
     const parts = [];
     if (mcpServerCount > 0) {
       const serverText =
         mcpServerCount === 1
-          ? t('{{count}} MCP server', { count: String(mcpServerCount) })
-          : t('{{count}} MCP servers', { count: String(mcpServerCount) });
+          ? t("{{count}} MCP server", { count: String(mcpServerCount) })
+          : t("{{count}} MCP servers", { count: String(mcpServerCount) });
       parts.push(serverText);
     }
 
     if (blockedMcpServerCount > 0) {
-      let blockedText = t('{{count}} Blocked', {
+      let blockedText = t("{{count}} Blocked", {
         count: String(blockedMcpServerCount),
       });
       if (mcpServerCount === 0) {
         const serverText =
           blockedMcpServerCount === 1
-            ? t('{{count}} MCP server', {
+            ? t("{{count}} MCP server", {
                 count: String(blockedMcpServerCount),
               })
-            : t('{{count}} MCP servers', {
+            : t("{{count}} MCP servers", {
                 count: String(blockedMcpServerCount),
               });
         blockedText += ` ${serverText}`;
       }
       parts.push(blockedText);
     }
-    let text = parts.join(', ');
+    let text = parts.join(", ");
     // Add ctrl+t hint when MCP servers are available
     if (mcpServers && Object.keys(mcpServers).length > 0) {
       if (showToolDescriptions) {
-        text += ` ${t('(ctrl+t to toggle)')}`;
+        text += ` ${t("(ctrl+t to toggle)")}`;
       } else {
-        text += ` ${t('(ctrl+t to view)')}`;
+        text += ` ${t("(ctrl+t to view)")}`;
       }
     }
     return text;
@@ -123,10 +120,10 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
   if (isNarrow) {
     return (
       <Box flexDirection="column">
-        <Text color={theme.text.secondary}>{t('Using:')}</Text>
+        <Text color={theme.text.secondary}>{t("Using:")}</Text>
         {summaryParts.map((part, index) => (
           <Text key={index} color={theme.text.secondary}>
-            {'  '}- {part}
+            {"  "}- {part}
           </Text>
         ))}
       </Box>
@@ -136,7 +133,7 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
   return (
     <Box>
       <Text color={theme.text.secondary}>
-        {t('Using:')} {summaryParts.join(' | ')}
+        {t("Using:")} {summaryParts.join(" | ")}
       </Text>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/ContextUsageDisplay.tsx b/apps/airiscode-cli/src/ui/components/ContextUsageDisplay.tsx
index dc2e22d7c..ccdf0c644 100644
--- a/apps/airiscode-cli/src/ui/components/ContextUsageDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/ContextUsageDisplay.tsx
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Text } from "ink";
+import { theme } from "../semantic-colors.js";
 
 export const ContextUsageDisplay = ({
   promptTokenCount,
@@ -23,7 +23,7 @@ export const ContextUsageDisplay = ({
   const percentage = promptTokenCount / contextWindowSize;
   const percentageUsed = (percentage * 100).toFixed(1);
 
-  const label = terminalWidth < 100 ? '% used' : '% context used';
+  const label = terminalWidth < 100 ? "% used" : "% context used";
 
   return (
     <Text color={theme.text.secondary}>
diff --git a/apps/airiscode-cli/src/ui/components/DebugModeNotification.tsx b/apps/airiscode-cli/src/ui/components/DebugModeNotification.tsx
index 9763b4f5a..963ae5bb3 100644
--- a/apps/airiscode-cli/src/ui/components/DebugModeNotification.tsx
+++ b/apps/airiscode-cli/src/ui/components/DebugModeNotification.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { Storage, isDebugLoggingDegraded } from '@airiscode/core';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { theme } from '../semantic-colors.js';
+import { isDebugLoggingDegraded, Storage } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { theme } from "../semantic-colors.js";
 
 /**
  * Displays debug mode status and log file path when debug mode is enabled.
@@ -27,9 +27,7 @@ export const DebugModeNotification = () => {
       <Text color={theme.status.warning}>Debug mode enabled</Text>
       <Text dimColor>Logging to: {logPath}</Text>
       {isDegraded && (
-        <Text dimColor>
-          Warning: Debug logging is degraded (write failures occurred)
-        </Text>
+        <Text dimColor>Warning: Debug logging is degraded (write failures occurred)</Text>
       )}
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/DebugProfiler.tsx b/apps/airiscode-cli/src/ui/components/DebugProfiler.tsx
index 4a4d6b4c1..a3c0f5af7 100644
--- a/apps/airiscode-cli/src/ui/components/DebugProfiler.tsx
+++ b/apps/airiscode-cli/src/ui/components/DebugProfiler.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Text } from 'ink';
-import { useEffect, useRef, useState } from 'react';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import { Text } from "ink";
+import { useEffect, useRef, useState } from "react";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 export const DebugProfiler = () => {
   const numRenders = useRef(0);
@@ -19,7 +19,7 @@ export const DebugProfiler = () => {
 
   useKeypress(
     (key) => {
-      if (key.ctrl && key.name === 'b') {
+      if (key.ctrl && key.name === "b") {
         setShowNumRenders((prev) => !prev);
       }
     },
@@ -30,7 +30,5 @@ export const DebugProfiler = () => {
     return null;
   }
 
-  return (
-    <Text color={theme.status.warning}>Renders: {numRenders.current} </Text>
-  );
+  return <Text color={theme.status.warning}>Renders: {numRenders.current} </Text>;
 };
diff --git a/apps/airiscode-cli/src/ui/components/DialogManager.tsx b/apps/airiscode-cli/src/ui/components/DialogManager.tsx
index 5df14f5f0..b8117074f 100644
--- a/apps/airiscode-cli/src/ui/components/DialogManager.tsx
+++ b/apps/airiscode-cli/src/ui/components/DialogManager.tsx
@@ -4,60 +4,56 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { IdeIntegrationNudge } from '../IdeIntegrationNudge.js';
-import { CommandFormatMigrationNudge } from '../CommandFormatMigrationNudge.js';
-import { LoopDetectionConfirmation } from './LoopDetectionConfirmation.js';
-import { FolderTrustDialog } from './FolderTrustDialog.js';
-import { ShellConfirmationDialog } from './ShellConfirmationDialog.js';
-import { ConsentPrompt } from './ConsentPrompt.js';
-import { SettingInputPrompt } from './SettingInputPrompt.js';
-import { PluginChoicePrompt } from './PluginChoicePrompt.js';
-import { ThemeDialog } from './ThemeDialog.js';
-import { SettingsDialog } from './SettingsDialog.js';
-import { AuthDialog } from '../auth/AuthDialog.js';
-import { EditorSettingsDialog } from './EditorSettingsDialog.js';
-import { TrustDialog } from './TrustDialog.js';
-import { PermissionsDialog } from './PermissionsDialog.js';
-import { ModelDialog } from './ModelDialog.js';
-import { ArenaStartDialog } from './arena/ArenaStartDialog.js';
-import { ArenaSelectDialog } from './arena/ArenaSelectDialog.js';
-import { ArenaStopDialog } from './arena/ArenaStopDialog.js';
-import { ArenaStatusDialog } from './arena/ArenaStatusDialog.js';
-import { ApprovalModeDialog } from './ApprovalModeDialog.js';
-import { theme } from '../semantic-colors.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import process from 'node:process';
-import { type UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
-import { IdeTrustChangeDialog } from './IdeTrustChangeDialog.js';
-import { WelcomeBackDialog } from './WelcomeBackDialog.js';
-import { AgentCreationWizard } from './subagents/create/AgentCreationWizard.js';
-import { AgentsManagerDialog } from './subagents/manage/AgentsManagerDialog.js';
-import { ExtensionsManagerDialog } from './extensions/ExtensionsManagerDialog.js';
-import { MCPManagementDialog } from './mcp/MCPManagementDialog.js';
-import { HooksManagementDialog } from './hooks/HooksManagementDialog.js';
-import { SessionPicker } from './SessionPicker.js';
+import process from "node:process";
+import { Box, Text } from "ink";
+import { AuthDialog } from "../auth/AuthDialog.js";
+import { CommandFormatMigrationNudge } from "../CommandFormatMigrationNudge.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { type UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import { IdeIntegrationNudge } from "../IdeIntegrationNudge.js";
+import { theme } from "../semantic-colors.js";
+import { ApprovalModeDialog } from "./ApprovalModeDialog.js";
+import { ArenaSelectDialog } from "./arena/ArenaSelectDialog.js";
+import { ArenaStartDialog } from "./arena/ArenaStartDialog.js";
+import { ArenaStatusDialog } from "./arena/ArenaStatusDialog.js";
+import { ArenaStopDialog } from "./arena/ArenaStopDialog.js";
+import { ConsentPrompt } from "./ConsentPrompt.js";
+import { EditorSettingsDialog } from "./EditorSettingsDialog.js";
+import { ExtensionsManagerDialog } from "./extensions/ExtensionsManagerDialog.js";
+import { FolderTrustDialog } from "./FolderTrustDialog.js";
+import { HooksManagementDialog } from "./hooks/HooksManagementDialog.js";
+import { IdeTrustChangeDialog } from "./IdeTrustChangeDialog.js";
+import { LoopDetectionConfirmation } from "./LoopDetectionConfirmation.js";
+import { ModelDialog } from "./ModelDialog.js";
+import { MCPManagementDialog } from "./mcp/MCPManagementDialog.js";
+import { PermissionsDialog } from "./PermissionsDialog.js";
+import { PluginChoicePrompt } from "./PluginChoicePrompt.js";
+import { SessionPicker } from "./SessionPicker.js";
+import { SettingInputPrompt } from "./SettingInputPrompt.js";
+import { SettingsDialog } from "./SettingsDialog.js";
+import { ShellConfirmationDialog } from "./ShellConfirmationDialog.js";
+import { AgentCreationWizard } from "./subagents/create/AgentCreationWizard.js";
+import { AgentsManagerDialog } from "./subagents/manage/AgentsManagerDialog.js";
+import { ThemeDialog } from "./ThemeDialog.js";
+import { TrustDialog } from "./TrustDialog.js";
+import { WelcomeBackDialog } from "./WelcomeBackDialog.js";
 
 interface DialogManagerProps {
-  addItem: UseHistoryManagerReturn['addItem'];
+  addItem: UseHistoryManagerReturn["addItem"];
   terminalWidth: number;
 }
 
 // Props for DialogManager
-export const DialogManager = ({
-  addItem,
-  terminalWidth,
-}: DialogManagerProps) => {
+export const DialogManager = ({ addItem, terminalWidth }: DialogManagerProps) => {
   const config = useConfig();
   const settings = useSettings();
 
   const uiState = useUIState();
   const uiActions = useUIActions();
-  const { constrainHeight, terminalHeight, staticExtraHeight, mainAreaWidth } =
-    uiState;
+  const { constrainHeight, terminalHeight, staticExtraHeight, mainAreaWidth } = uiState;
 
   if (uiState.showWelcomeBackDialog && uiState.welcomeBackInfo?.hasHistory) {
     return (
@@ -96,15 +92,11 @@ export const DialogManager = ({
     );
   }
   if (uiState.shellConfirmationRequest) {
-    return (
-      <ShellConfirmationDialog request={uiState.shellConfirmationRequest} />
-    );
+    return <ShellConfirmationDialog request={uiState.shellConfirmationRequest} />;
   }
   if (uiState.loopDetectionConfirmationRequest) {
     return (
-      <LoopDetectionConfirmation
-        onComplete={uiState.loopDetectionConfirmationRequest.onComplete}
-      />
+      <LoopDetectionConfirmation onComplete={uiState.loopDetectionConfirmationRequest.onComplete} />
     );
   }
   if (uiState.confirmationRequest) {
@@ -175,9 +167,7 @@ export const DialogManager = ({
           onSelect={uiActions.handleThemeSelect}
           onHighlight={uiActions.handleThemeHighlight}
           settings={settings}
-          availableTerminalHeight={
-            constrainHeight ? terminalHeight - staticExtraHeight : undefined
-          }
+          availableTerminalHeight={constrainHeight ? terminalHeight - staticExtraHeight : undefined}
           terminalWidth={mainAreaWidth}
         />
       </Box>
@@ -205,11 +195,11 @@ export const DialogManager = ({
         <SettingsDialog
           settings={settings}
           onSelect={(settingName) => {
-            if (settingName === 'ui.theme') {
+            if (settingName === "ui.theme") {
               uiActions.openThemeDialog();
               return;
             }
-            if (settingName === 'general.preferredEditor') {
+            if (settingName === "general.preferredEditor") {
               uiActions.openEditorDialog();
               return;
             }
@@ -230,22 +220,17 @@ export const DialogManager = ({
           settings={settings}
           currentMode={currentMode}
           onSelect={uiActions.handleApprovalModeSelect}
-          availableTerminalHeight={
-            constrainHeight ? terminalHeight - staticExtraHeight : undefined
-          }
+          availableTerminalHeight={constrainHeight ? terminalHeight - staticExtraHeight : undefined}
         />
       </Box>
     );
   }
   if (uiState.isModelDialogOpen) {
     return (
-      <ModelDialog
-        onClose={uiActions.closeModelDialog}
-        isFastModelMode={uiState.isFastModelMode}
-      />
+      <ModelDialog onClose={uiActions.closeModelDialog} isFastModelMode={uiState.isFastModelMode} />
     );
   }
-  if (uiState.activeArenaDialog === 'start') {
+  if (uiState.activeArenaDialog === "start") {
     return (
       <ArenaStartDialog
         onClose={() => uiActions.closeArenaDialog()}
@@ -253,7 +238,7 @@ export const DialogManager = ({
       />
     );
   }
-  if (uiState.activeArenaDialog === 'status') {
+  if (uiState.activeArenaDialog === "status") {
     const arenaManager = config.getArenaManager();
     if (arenaManager) {
       return (
@@ -265,7 +250,7 @@ export const DialogManager = ({
       );
     }
   }
-  if (uiState.activeArenaDialog === 'stop') {
+  if (uiState.activeArenaDialog === "stop") {
     return (
       <ArenaStopDialog
         config={config}
@@ -274,7 +259,7 @@ export const DialogManager = ({
       />
     );
   }
-  if (uiState.activeArenaDialog === 'select') {
+  if (uiState.activeArenaDialog === "select") {
     const arenaManager = config.getArenaManager();
     if (arenaManager) {
       return (
@@ -299,9 +284,7 @@ export const DialogManager = ({
   // Qwen OAuth removed; OpenAI authentication now handled through AuthDialog
   // with coding-plan/custom sub-modes
   if (uiState.isTrustDialogOpen) {
-    return (
-      <TrustDialog onExit={uiActions.closeTrustDialog} addItem={addItem} />
-    );
+    return <TrustDialog onExit={uiActions.closeTrustDialog} addItem={addItem} />;
   }
 
   if (uiState.isPermissionsDialogOpen) {
@@ -309,29 +292,16 @@ export const DialogManager = ({
   }
 
   if (uiState.isSubagentCreateDialogOpen) {
-    return (
-      <AgentCreationWizard
-        onClose={uiActions.closeSubagentCreateDialog}
-        config={config}
-      />
-    );
+    return <AgentCreationWizard onClose={uiActions.closeSubagentCreateDialog} config={config} />;
   }
 
   if (uiState.isAgentsManagerDialogOpen) {
-    return (
-      <AgentsManagerDialog
-        onClose={uiActions.closeAgentsManagerDialog}
-        config={config}
-      />
-    );
+    return <AgentsManagerDialog onClose={uiActions.closeAgentsManagerDialog} config={config} />;
   }
 
   if (uiState.isExtensionsManagerDialogOpen) {
     return (
-      <ExtensionsManagerDialog
-        onClose={uiActions.closeExtensionsManagerDialog}
-        config={config}
-      />
+      <ExtensionsManagerDialog onClose={uiActions.closeExtensionsManagerDialog} config={config} />
     );
   }
   if (uiState.isHooksDialogOpen) {
diff --git a/apps/airiscode-cli/src/ui/components/EditorSettingsDialog.tsx b/apps/airiscode-cli/src/ui/components/EditorSettingsDialog.tsx
index 938847089..0d318ec34 100644
--- a/apps/airiscode-cli/src/ui/components/EditorSettingsDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/EditorSettingsDialog.tsx
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import type { EditorType } from "@airiscode/core";
+import { createDebugLogger, isEditorAvailable } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
 import {
   EDITOR_DISPLAY_NAMES,
-  editorSettingsManager,
   type EditorDisplay,
-} from '../editors/editorSettingsManager.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { ScopeSelector } from './shared/ScopeSelector.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import type { EditorType } from '@airiscode/core';
-import {
-  createDebugLogger,
-  isEditorAvailable,
-} from '@airiscode/core';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { t } from '../../i18n/index.js';
+  editorSettingsManager,
+} from "../editors/editorSettingsManager.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
+import { ScopeSelector } from "./shared/ScopeSelector.js";
 
-const debugLogger = createDebugLogger('EDITOR_SETTINGS_DIALOG');
+const debugLogger = createDebugLogger("EDITOR_SETTINGS_DIALOG");
 
 interface EditorDialogProps {
   onSelect: (editorType: EditorType | undefined, scope: SettingScope) => void;
@@ -38,40 +35,34 @@ export function EditorSettingsDialog({
   settings,
   onExit,
 }: EditorDialogProps): React.JSX.Element {
-  const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
-  );
-  const [mode, setMode] = useState<'editor' | 'scope'>('editor');
+  const [selectedScope, setSelectedScope] = useState<SettingScope>(SettingScope.User);
+  const [mode, setMode] = useState<"editor" | "scope">("editor");
 
   useKeypress(
     (key) => {
-      if (key.name === 'tab') {
-        setMode((prev) => (prev === 'editor' ? 'scope' : 'editor'));
+      if (key.name === "tab") {
+        setMode((prev) => (prev === "editor" ? "scope" : "editor"));
       }
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onExit();
       }
     },
     { isActive: true },
   );
 
-  const editorItems: EditorDisplay[] =
-    editorSettingsManager.getAvailableEditorDisplays();
+  const editorItems: EditorDisplay[] = editorSettingsManager.getAvailableEditorDisplays();
 
-  const currentPreference =
-    settings.forScope(selectedScope).settings.general?.preferredEditor;
+  const currentPreference = settings.forScope(selectedScope).settings.general?.preferredEditor;
   let editorIndex = currentPreference
-    ? editorItems.findIndex(
-        (item: EditorDisplay) => item.type === currentPreference,
-      )
+    ? editorItems.findIndex((item: EditorDisplay) => item.type === currentPreference)
     : 0;
   if (editorIndex === -1) {
     debugLogger.error(`Editor is not supported: ${currentPreference}`);
     editorIndex = 0;
   }
 
-  const handleEditorSelect = (editorType: EditorType | 'not_set') => {
-    if (editorType === 'not_set') {
+  const handleEditorSelect = (editorType: EditorType | "not_set") => {
+    if (editorType === "not_set") {
       onSelect(undefined, selectedScope);
       return;
     }
@@ -80,38 +71,29 @@ export function EditorSettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     setSelectedScope(scope);
-    setMode('editor');
+    setMode("editor");
   };
 
   const handleScopeHighlight = (scope: SettingScope) => {
     setSelectedScope(scope);
   };
 
-  let otherScopeModifiedMessage = '';
+  let otherScopeModifiedMessage = "";
   const otherScope =
-    selectedScope === SettingScope.User
-      ? SettingScope.Workspace
-      : SettingScope.User;
-  if (
-    settings.forScope(otherScope).settings.general?.preferredEditor !==
-    undefined
-  ) {
+    selectedScope === SettingScope.User ? SettingScope.Workspace : SettingScope.User;
+  if (settings.forScope(otherScope).settings.general?.preferredEditor !== undefined) {
     otherScopeModifiedMessage =
-      settings.forScope(selectedScope).settings.general?.preferredEditor !==
-      undefined
+      settings.forScope(selectedScope).settings.general?.preferredEditor !== undefined
         ? `(Also modified in ${otherScope})`
         : `(Modified in ${otherScope})`;
   }
 
-  let mergedEditorName = 'None';
+  let mergedEditorName = "None";
   if (
     settings.merged.general?.preferredEditor &&
     isEditorAvailable(settings.merged.general?.preferredEditor)
   ) {
-    mergedEditorName =
-      EDITOR_DISPLAY_NAMES[
-        settings.merged.general?.preferredEditor as EditorType
-      ];
+    mergedEditorName = EDITOR_DISPLAY_NAMES[settings.merged.general?.preferredEditor as EditorType];
   }
 
   return (
@@ -123,14 +105,12 @@ export function EditorSettingsDialog({
       width="100%"
     >
       <Box flexDirection="column" width="45%" paddingRight={2}>
-        {mode === 'editor' ? (
+        {mode === "editor" ? (
           <Box flexDirection="column">
-            <Text bold={mode === 'editor'} wrap="truncate">
-              {mode === 'editor' ? '> ' : '  '}
-              {t('Select Editor')}{' '}
-              <Text color={theme.text.secondary}>
-                {otherScopeModifiedMessage}
-              </Text>
+            <Text bold={mode === "editor"} wrap="truncate">
+              {mode === "editor" ? "> " : "  "}
+              {t("Select Editor")}{" "}
+              <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
             </Text>
             <Box height={1} />
             <RadioButtonSelect
@@ -142,7 +122,7 @@ export function EditorSettingsDialog({
               }))}
               initialIndex={editorIndex}
               onSelect={handleEditorSelect}
-              isFocused={mode === 'editor'}
+              isFocused={mode === "editor"}
               key={selectedScope}
             />
           </Box>
@@ -150,40 +130,33 @@ export function EditorSettingsDialog({
           <ScopeSelector
             onSelect={handleScopeSelect}
             onHighlight={handleScopeHighlight}
-            isFocused={mode === 'scope'}
+            isFocused={mode === "scope"}
             initialScope={selectedScope}
           />
         )}
 
         <Box marginTop={1}>
           <Text color={theme.text.secondary} wrap="truncate">
-            {mode === 'editor'
-              ? t('(Use Enter to select, Tab to configure scope)')
-              : t('(Use Enter to apply scope, Tab to go back)')}
+            {mode === "editor"
+              ? t("(Use Enter to select, Tab to configure scope)")
+              : t("(Use Enter to apply scope, Tab to go back)")}
           </Text>
         </Box>
       </Box>
 
       <Box flexDirection="column" width="55%" paddingLeft={2}>
         <Text bold color={theme.text.primary}>
-          {t('Editor Preference')}
+          {t("Editor Preference")}
         </Text>
         <Box flexDirection="column" gap={1} marginTop={1}>
           <Text color={theme.text.secondary}>
             {t(
-              'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.',
+              "These editors are currently supported. Please note that some editors cannot be used in sandbox mode.",
             )}
           </Text>
           <Text color={theme.text.secondary}>
-            {t('Your preferred editor is:')}{' '}
-            <Text
-              color={
-                mergedEditorName === 'None'
-                  ? theme.status.error
-                  : theme.text.link
-              }
-              bold
-            >
+            {t("Your preferred editor is:")}{" "}
+            <Text color={mergedEditorName === "None" ? theme.status.error : theme.text.link} bold>
               {mergedEditorName}
             </Text>
             .
diff --git a/apps/airiscode-cli/src/ui/components/ExitWarning.tsx b/apps/airiscode-cli/src/ui/components/ExitWarning.tsx
index 598ff2fab..0c9b8485d 100644
--- a/apps/airiscode-cli/src/ui/components/ExitWarning.tsx
+++ b/apps/airiscode-cli/src/ui/components/ExitWarning.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { theme } from "../semantic-colors.js";
 
 export const ExitWarning: React.FC = () => {
   const uiState = useUIState();
diff --git a/apps/airiscode-cli/src/ui/components/FolderTrustDialog.tsx b/apps/airiscode-cli/src/ui/components/FolderTrustDialog.tsx
index f84efae7a..5a5543186 100644
--- a/apps/airiscode-cli/src/ui/components/FolderTrustDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/FolderTrustDialog.tsx
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { useEffect } from 'react';
-import { theme } from '../semantic-colors.js';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import { relaunchApp } from '../../utils/processUtils.js';
+import * as path from "node:path";
+import * as process from "node:process";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect } from "react";
+import { relaunchApp } from "../../utils/processUtils.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import type { RadioSelectItem } from "./shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export enum FolderTrustChoice {
-  TRUST_FOLDER = 'trust_folder',
-  TRUST_PARENT = 'trust_parent',
-  DO_NOT_TRUST = 'do_not_trust',
+  TRUST_FOLDER = "trust_folder",
+  TRUST_PARENT = "trust_parent",
+  DO_NOT_TRUST = "do_not_trust",
 }
 
 interface FolderTrustDialogProps {
@@ -26,10 +26,7 @@ interface FolderTrustDialogProps {
   isRestarting?: boolean;
 }
 
-export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
-  onSelect,
-  isRestarting,
-}) => {
+export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({ onSelect, isRestarting }) => {
   useEffect(() => {
     const doRelaunch = async () => {
       if (isRestarting) {
@@ -43,7 +40,7 @@ export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onSelect(FolderTrustChoice.DO_NOT_TRUST);
       }
     },
@@ -86,17 +83,12 @@ export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
             Do you trust this folder?
           </Text>
           <Text color={theme.text.primary}>
-            Trusting a folder allows AIRIS Code to execute commands it suggests.
-            This is a security feature to prevent accidental execution in
-            untrusted directories.
+            Trusting a folder allows AIRIS Code to execute commands it suggests. This is a security
+            feature to prevent accidental execution in untrusted directories.
           </Text>
         </Box>
 
-        <RadioButtonSelect
-          items={options}
-          onSelect={onSelect}
-          isFocused={!isRestarting}
-        />
+        <RadioButtonSelect items={options} onSelect={onSelect} isFocused={!isRestarting} />
       </Box>
       {isRestarting && (
         <Box marginLeft={1} marginTop={1}>
diff --git a/apps/airiscode-cli/src/ui/components/Footer.tsx b/apps/airiscode-cli/src/ui/components/Footer.tsx
index 22370692f..be035f2a4 100644
--- a/apps/airiscode-cli/src/ui/components/Footer.tsx
+++ b/apps/airiscode-cli/src/ui/components/Footer.tsx
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { ContextUsageDisplay } from './ContextUsageDisplay.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
-import { ShellModeIndicator } from './ShellModeIndicator.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
+import { ApprovalMode } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useVerboseMode } from "../contexts/VerboseModeContext.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
 
-import { useStatusLine } from '../hooks/useStatusLine.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
-import { useVerboseMode } from '../contexts/VerboseModeContext.js';
-import { ApprovalMode } from '@airiscode/core';
-import { t } from '../../i18n/index.js';
+import { useStatusLine } from "../hooks/useStatusLine.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
+import { isNarrowWidth } from "../utils/isNarrowWidth.js";
+import { AutoAcceptIndicator } from "./AutoAcceptIndicator.js";
+import { ContextUsageDisplay } from "./ContextUsageDisplay.js";
+import { ShellModeIndicator } from "./ShellModeIndicator.js";
 
 export const Footer: React.FC = () => {
   const uiState = useUIState();
@@ -37,20 +37,19 @@ export const Footer: React.FC = () => {
   const isNarrow = isNarrowWidth(terminalWidth);
 
   // Determine sandbox info from environment
-  const sandboxEnv = process.env['SANDBOX'];
+  const sandboxEnv = process.env["SANDBOX"];
   const sandboxInfo = sandboxEnv
-    ? sandboxEnv === 'sandbox-exec'
-      ? 'seatbelt'
-      : sandboxEnv.startsWith('airiscode')
-        ? 'docker'
+    ? sandboxEnv === "sandbox-exec"
+      ? "seatbelt"
+      : sandboxEnv.startsWith("airiscode")
+        ? "docker"
         : sandboxEnv
     : null;
 
   // Check if debug mode is enabled
   const debugMode = config.getDebugMode();
 
-  const contextWindowSize =
-    config.getContentGeneratorConfig()?.contextWindowSize;
+  const contextWindowSize = config.getContentGeneratorConfig()?.contextWindowSize;
 
   // Hide "? for shortcuts" when a custom status line is active (it already
   // occupies the top row, so the hint is redundant). Matches upstream behavior.
@@ -58,38 +57,37 @@ export const Footer: React.FC = () => {
 
   // Left bottom row: high-priority messages > approval mode > hint.
   const leftBottomContent = uiState.ctrlCPressedOnce ? (
-    <Text color={theme.status.warning}>{t('Press Ctrl+C again to exit.')}</Text>
+    <Text color={theme.status.warning}>{t("Press Ctrl+C again to exit.")}</Text>
   ) : uiState.ctrlDPressedOnce ? (
-    <Text color={theme.status.warning}>{t('Press Ctrl+D again to exit.')}</Text>
+    <Text color={theme.status.warning}>{t("Press Ctrl+D again to exit.")}</Text>
   ) : uiState.showEscapePrompt ? (
-    <Text color={theme.text.secondary}>{t('Press Esc again to clear.')}</Text>
-  ) : vimEnabled && vimMode === 'INSERT' ? (
+    <Text color={theme.text.secondary}>{t("Press Esc again to clear.")}</Text>
+  ) : vimEnabled && vimMode === "INSERT" ? (
     <Text color={theme.text.secondary}>-- INSERT --</Text>
   ) : uiState.shellModeActive ? (
     <ShellModeIndicator />
-  ) : showAutoAcceptIndicator !== undefined &&
-    showAutoAcceptIndicator !== ApprovalMode.DEFAULT ? (
+  ) : showAutoAcceptIndicator !== undefined && showAutoAcceptIndicator !== ApprovalMode.DEFAULT ? (
     <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
   ) : suppressHint ? null : (
-    <Text color={theme.text.secondary}>{t('? for shortcuts')}</Text>
+    <Text color={theme.text.secondary}>{t("? for shortcuts")}</Text>
   );
 
   const rightItems: Array<{ key: string; node: React.ReactNode }> = [];
   if (sandboxInfo) {
     rightItems.push({
-      key: 'sandbox',
+      key: "sandbox",
       node: <Text color={theme.status.success}>🔒 {sandboxInfo}</Text>,
     });
   }
   if (debugMode) {
     rightItems.push({
-      key: 'debug',
+      key: "debug",
       node: <Text color={theme.status.warning}>Debug Mode</Text>,
     });
   }
   if (promptTokenCount > 0 && contextWindowSize) {
     rightItems.push({
-      key: 'context',
+      key: "context",
       node: (
         <Text color={theme.text.accent}>
           <ContextUsageDisplay
@@ -103,8 +101,8 @@ export const Footer: React.FC = () => {
   }
   if (verboseMode) {
     rightItems.push({
-      key: 'verbose',
-      node: <Text color={theme.text.accent}>{t('verbose')}</Text>,
+      key: "verbose",
+      node: <Text color={theme.text.accent}>{t("verbose")}</Text>,
     });
   }
 
@@ -112,21 +110,19 @@ export const Footer: React.FC = () => {
   // (bottom), right section has indicators. Status line and hints coexist.
   return (
     <Box
-      flexDirection={isNarrow ? 'column' : 'row'}
-      justifyContent={isNarrow ? 'flex-start' : 'space-between'}
+      flexDirection={isNarrow ? "column" : "row"}
+      justifyContent={isNarrow ? "flex-start" : "space-between"}
       width="100%"
       paddingX={2}
       gap={isNarrow ? 0 : 1}
     >
       {/* Left column — status line on top, hints/mode on bottom */}
       <Box flexDirection="column" flexShrink={isNarrow ? 0 : 1}>
-        {statusLineText &&
-          !uiState.ctrlCPressedOnce &&
-          !uiState.ctrlDPressedOnce && (
-            <Text dimColor wrap="truncate">
-              {statusLineText}
-            </Text>
-          )}
+        {statusLineText && !uiState.ctrlCPressedOnce && !uiState.ctrlDPressedOnce && (
+          <Text dimColor wrap="truncate">
+            {statusLineText}
+          </Text>
+        )}
         <Text wrap="truncate">{leftBottomContent}</Text>
       </Box>
 
diff --git a/apps/airiscode-cli/src/ui/components/GeminiRespondingSpinner.tsx b/apps/airiscode-cli/src/ui/components/GeminiRespondingSpinner.tsx
index bd97a7f2c..39a331384 100644
--- a/apps/airiscode-cli/src/ui/components/GeminiRespondingSpinner.tsx
+++ b/apps/airiscode-cli/src/ui/components/GeminiRespondingSpinner.tsx
@@ -4,17 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, useIsScreenReaderEnabled } from 'ink';
-import Spinner from 'ink-spinner';
+import { Text, useIsScreenReaderEnabled } from "ink";
+import Spinner from "ink-spinner";
+import type React from "react";
 // SpinnerName type removed - using any
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
-import {
-  SCREEN_READER_LOADING,
-  SCREEN_READER_RESPONDING,
-} from '../textConstants.js';
-import { theme } from '../semantic-colors.js';
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { theme } from "../semantic-colors.js";
+import { SCREEN_READER_LOADING, SCREEN_READER_RESPONDING } from "../textConstants.js";
+import { StreamingState } from "../types.js";
 
 interface GeminiRespondingSpinnerProps {
   /**
@@ -25,18 +22,14 @@ interface GeminiRespondingSpinnerProps {
   spinnerType?: any;
 }
 
-export const GeminiRespondingSpinner: React.FC<
-  GeminiRespondingSpinnerProps
-> = ({ nonRespondingDisplay, spinnerType = 'dots' }) => {
+export const GeminiRespondingSpinner: React.FC<GeminiRespondingSpinnerProps> = ({
+  nonRespondingDisplay,
+  spinnerType = "dots",
+}) => {
   const streamingState = useStreamingContext();
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
   if (streamingState === StreamingState.Responding) {
-    return (
-      <GeminiSpinner
-        spinnerType={spinnerType}
-        altText={SCREEN_READER_RESPONDING}
-      />
-    );
+    return <GeminiSpinner spinnerType={spinnerType} altText={SCREEN_READER_RESPONDING} />;
   } else if (nonRespondingDisplay) {
     return isScreenReaderEnabled ? (
       <Text>{SCREEN_READER_LOADING}</Text>
@@ -52,10 +45,7 @@ interface GeminiSpinnerProps {
   altText?: string;
 }
 
-export const GeminiSpinner: React.FC<GeminiSpinnerProps> = ({
-  spinnerType = 'dots',
-  altText,
-}) => {
+export const GeminiSpinner: React.FC<GeminiSpinnerProps> = ({ spinnerType = "dots", altText }) => {
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
   return isScreenReaderEnabled ? (
     <Text>{altText}</Text>
diff --git a/apps/airiscode-cli/src/ui/components/Header.tsx b/apps/airiscode-cli/src/ui/components/Header.tsx
index a6006f37b..0a1d0fca0 100644
--- a/apps/airiscode-cli/src/ui/components/Header.tsx
+++ b/apps/airiscode-cli/src/ui/components/Header.tsx
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import Gradient from 'ink-gradient';
-import { shortenPath, tildeifyPath } from '@airiscode/core';
-import { theme } from '../semantic-colors.js';
-import { shortAsciiLogo } from './AsciiArt.js';
-import { getAsciiArtWidth, getCachedStringWidth } from '../utils/textUtils.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { shortenPath, tildeifyPath } from "@airiscode/core";
+import { Box, Text } from "ink";
+import Gradient from "ink-gradient";
+import type React from "react";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
+import { getAsciiArtWidth, getCachedStringWidth } from "../utils/textUtils.js";
+import { shortAsciiLogo } from "./AsciiArt.js";
 
 /**
  * Auth display type for the Header component.
  * Simplified representation of authentication method shown to users.
  */
 export enum AuthDisplayType {
-  CODING_PLAN = 'Coding Plan',
-  API_KEY = 'API Key',
-  UNKNOWN = 'Unknown',
+  CODING_PLAN = "Coding Plan",
+  API_KEY = "API Key",
+  UNKNOWN = "Unknown",
 }
 
 interface HeaderProps {
@@ -54,14 +54,10 @@ export const Header: React.FC<HeaderProps> = ({
   const minPathLength = 40; // Minimum readable path length
   const minInfoPanelWidth = minPathLength + infoPanelChromeWidth;
 
-  const availableTerminalWidth = Math.max(
-    0,
-    terminalWidth - containerMarginX * 2,
-  );
+  const availableTerminalWidth = Math.max(0, terminalWidth - containerMarginX * 2);
 
   // Check if we have enough space for logo + gap + minimum info panel
-  const showLogo =
-    availableTerminalWidth >= logoWidth + logoGap + minInfoPanelWidth;
+  const showLogo = availableTerminalWidth >= logoWidth + logoGap + minInfoPanelWidth;
 
   // Calculate available width for info panel (use all remaining space)
   // Cap at 60 when in two-column layout (with logo)
@@ -71,28 +67,21 @@ export const Header: React.FC<HeaderProps> = ({
     : availableTerminalWidth;
 
   // Calculate max path lengths (subtract padding/borders from available space)
-  const maxPathLength = Math.max(
-    0,
-    availableInfoPanelWidth - infoPanelChromeWidth,
-  );
+  const maxPathLength = Math.max(0, availableInfoPanelWidth - infoPanelChromeWidth);
 
-  const infoPanelContentWidth = Math.max(
-    0,
-    availableInfoPanelWidth - infoPanelChromeWidth,
-  );
+  const infoPanelContentWidth = Math.max(0, availableInfoPanelWidth - infoPanelChromeWidth);
   const authModelText = `${formattedAuthType} | ${model}`;
-  const modelHintText = ' (/model to change)';
+  const modelHintText = " (/model to change)";
   const showModelHint =
     infoPanelContentWidth > 0 &&
-    getCachedStringWidth(authModelText + modelHintText) <=
-      infoPanelContentWidth;
+    getCachedStringWidth(authModelText + modelHintText) <= infoPanelContentWidth;
 
   // Now shorten the path to fit the available space
   const tildeifiedPath = tildeifyPath(workingDirectory);
   const shortenedPath = shortenPath(tildeifiedPath, Math.max(3, maxPathLength));
   const displayPath =
     maxPathLength <= 0
-      ? ''
+      ? ""
       : shortenedPath.length > maxPathLength
         ? shortenedPath.slice(0, maxPathLength)
         : shortenedPath;
@@ -145,9 +134,7 @@ export const Header: React.FC<HeaderProps> = ({
         {/* Auth and Model line */}
         <Text>
           <Text color={theme.text.secondary}>{authModelText}</Text>
-          {showModelHint && (
-            <Text color={theme.text.secondary}>{modelHintText}</Text>
-          )}
+          {showModelHint && <Text color={theme.text.secondary}>{modelHintText}</Text>}
         </Text>
         {/* Directory line */}
         <Text color={theme.text.secondary}>{displayPath}</Text>
diff --git a/apps/airiscode-cli/src/ui/components/Help.tsx b/apps/airiscode-cli/src/ui/components/Help.tsx
index 64c2f7688..fd858e7c5 100644
--- a/apps/airiscode-cli/src/ui/components/Help.tsx
+++ b/apps/airiscode-cli/src/ui/components/Help.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { type SlashCommand, CommandKind } from '../commands/types.js';
-import { t } from '../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { CommandKind, type SlashCommand } from "../commands/types.js";
+import { theme } from "../semantic-colors.js";
 
 interface Help {
   commands: readonly SlashCommand[];
@@ -25,32 +25,32 @@ export const Help: React.FC<Help> = ({ commands, width }) => (
   >
     {/* Basics */}
     <Text bold color={theme.text.primary}>
-      {t('Basics:')}
+      {t("Basics:")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {t('Add context')}
+        {t("Add context")}
       </Text>
-      :{' '}
+      :{" "}
       {t(
-        'Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.',
+        "Use {{symbol}} to specify files for context (e.g., {{example}}) to target specific files or folders.",
         {
-          symbol: t('@'),
-          example: t('@src/myFile.ts'),
+          symbol: t("@"),
+          example: t("@src/myFile.ts"),
         },
       )}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {t('Shell mode')}
+        {t("Shell mode")}
       </Text>
-      :{' '}
+      :{" "}
       {t(
-        'Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).',
+        "Execute shell commands via {{symbol}} (e.g., {{example1}}) or use natural language (e.g., {{example2}}).",
         {
-          symbol: t('!'),
-          example1: t('!npm run start'),
-          example2: t('start server'),
+          symbol: t("!"),
+          example1: t("!npm run start"),
+          example2: t("start server"),
         },
       )}
     </Text>
@@ -59,7 +59,7 @@ export const Help: React.FC<Help> = ({ commands, width }) => (
 
     {/* Commands */}
     <Text bold color={theme.text.primary}>
-      {t('Commands:')}
+      {t("Commands:")}
     </Text>
     {commands
       .filter((command) => command.description && !command.hidden)
@@ -67,13 +67,13 @@ export const Help: React.FC<Help> = ({ commands, width }) => (
         <Box key={command.name} flexDirection="column">
           <Text color={theme.text.primary}>
             <Text bold color={theme.text.accent}>
-              {' '}
-              {formatCommandLabel(command, '/')}
+              {" "}
+              {formatCommandLabel(command, "/")}
             </Text>
             {command.kind === CommandKind.MCP_PROMPT && (
               <Text color={theme.text.secondary}> [MCP]</Text>
             )}
-            {command.description && ' - ' + command.description}
+            {command.description && " - " + command.description}
           </Text>
           {command.subCommands &&
             command.subCommands
@@ -81,93 +81,93 @@ export const Help: React.FC<Help> = ({ commands, width }) => (
               .map((subCommand) => (
                 <Text key={subCommand.name} color={theme.text.primary}>
                   <Text bold color={theme.text.accent}>
-                    {'   '}
+                    {"   "}
                     {formatCommandLabel(subCommand)}
                   </Text>
-                  {subCommand.description && ' - ' + subCommand.description}
+                  {subCommand.description && " - " + subCommand.description}
                 </Text>
               ))}
         </Box>
       ))}
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {' '}
-        !{' '}
+        {" "}
+        !{" "}
       </Text>
-      - {t('shell command')}
+      - {t("shell command")}
     </Text>
     <Text color={theme.text.primary}>
-      <Text color={theme.text.secondary}>[MCP]</Text> -{' '}
-      {t('Model Context Protocol command (from external servers)')}
+      <Text color={theme.text.secondary}>[MCP]</Text> -{" "}
+      {t("Model Context Protocol command (from external servers)")}
     </Text>
 
     <Box height={1} />
 
     {/* Shortcuts */}
     <Text bold color={theme.text.primary}>
-      {t('Keyboard Shortcuts:')}
+      {t("Keyboard Shortcuts:")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Alt+Left/Right
-      </Text>{' '}
-      - {t('Jump through words in the input')}
+      </Text>{" "}
+      - {t("Jump through words in the input")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Ctrl+C
-      </Text>{' '}
-      - {t('Close dialogs, cancel requests, or quit application')}
+      </Text>{" "}
+      - {t("Close dialogs, cancel requests, or quit application")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {process.platform === 'win32' ? 'Ctrl+Enter' : 'Ctrl+J'}
-      </Text>{' '}
-      -{' '}
-      {process.platform === 'linux'
-        ? t('New line (Alt+Enter works for certain linux distros)')
-        : t('New line')}
+        {process.platform === "win32" ? "Ctrl+Enter" : "Ctrl+J"}
+      </Text>{" "}
+      -{" "}
+      {process.platform === "linux"
+        ? t("New line (Alt+Enter works for certain linux distros)")
+        : t("New line")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Ctrl+L
-      </Text>{' '}
-      - {t('Clear the screen')}
+      </Text>{" "}
+      - {t("Clear the screen")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {process.platform === 'darwin' ? 'Ctrl+X / Meta+Enter' : 'Ctrl+X'}
-      </Text>{' '}
-      - {t('Open input in external editor')}
+        {process.platform === "darwin" ? "Ctrl+X / Meta+Enter" : "Ctrl+X"}
+      </Text>{" "}
+      - {t("Open input in external editor")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Enter
-      </Text>{' '}
-      - {t('Send message')}
+      </Text>{" "}
+      - {t("Send message")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Esc
-      </Text>{' '}
-      - {t('Cancel operation / Clear input (double press)')}
+      </Text>{" "}
+      - {t("Cancel operation / Clear input (double press)")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {process.platform === 'win32' ? 'Tab' : 'Shift+Tab'}
-      </Text>{' '}
-      - {t('Cycle approval modes')}
+        {process.platform === "win32" ? "Tab" : "Shift+Tab"}
+      </Text>{" "}
+      - {t("Cycle approval modes")}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Up/Down
-      </Text>{' '}
-      - {t('Cycle through your prompt history')}
+      </Text>{" "}
+      - {t("Cycle through your prompt history")}
     </Text>
     <Box height={1} />
     <Text color={theme.text.primary}>
-      {t('For a full list of shortcuts, see {{docPath}}', {
-        docPath: t('docs/keyboard-shortcuts.md'),
+      {t("For a full list of shortcuts, see {{docPath}}", {
+        docPath: t("docs/keyboard-shortcuts.md"),
       })}
     </Text>
   </Box>
@@ -176,7 +176,7 @@ export const Help: React.FC<Help> = ({ commands, width }) => (
 /**
  * Builds a display label for a slash command, including any alternate names.
  */
-function formatCommandLabel(command: SlashCommand, prefix = ''): string {
+function formatCommandLabel(command: SlashCommand, prefix = ""): string {
   const altNames = command.altNames?.filter(Boolean);
   const baseLabel = `${prefix}${command.name}`;
 
@@ -184,5 +184,5 @@ function formatCommandLabel(command: SlashCommand, prefix = ''): string {
     return baseLabel;
   }
 
-  return `${baseLabel} (${altNames.join(', ')})`;
+  return `${baseLabel} (${altNames.join(", ")})`;
 }
diff --git a/apps/airiscode-cli/src/ui/components/HistoryItemDisplay.tsx b/apps/airiscode-cli/src/ui/components/HistoryItemDisplay.tsx
index 7850b1ec1..864575c80 100644
--- a/apps/airiscode-cli/src/ui/components/HistoryItemDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/HistoryItemDisplay.tsx
@@ -4,51 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useMemo } from 'react';
+import { getMCPServerStatus } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useMemo } from "react";
+import type { SlashCommand } from "../commands/types.js";
+import { useVerboseMode } from "../contexts/VerboseModeContext.js";
+import { theme } from "../semantic-colors.js";
+import type { HistoryItem } from "../types.js";
+import { MarkdownDisplay } from "../utils/MarkdownDisplay.js";
+import { escapeAnsiCtrlCodes, sanitizeSensitiveText } from "../utils/textUtils.js";
+import { AboutBox } from "./AboutBox.js";
+import { ArenaAgentCard, ArenaSessionCard } from "./arena/ArenaCards.js";
+import { Help } from "./Help.js";
+import { ModelStatsDisplay } from "./ModelStatsDisplay.js";
+import { BtwMessage } from "./messages/BtwMessage.js";
+import { CompressionMessage } from "./messages/CompressionMessage.js";
 import {
-  escapeAnsiCtrlCodes,
-  sanitizeSensitiveText,
-} from '../utils/textUtils.js';
-import type { HistoryItem } from '../types.js';
-import {
-  UserMessage,
-  UserShellMessage,
   AssistantMessage,
   AssistantMessageContent,
   ThinkMessage,
   ThinkMessageContent,
-} from './messages/ConversationMessages.js';
-import { ToolGroupMessage } from './messages/ToolGroupMessage.js';
-import { CompressionMessage } from './messages/CompressionMessage.js';
-import { SummaryMessage } from './messages/SummaryMessage.js';
+  UserMessage,
+  UserShellMessage,
+} from "./messages/ConversationMessages.js";
+import { InsightProgressMessage } from "./messages/InsightProgressMessage.js";
 import {
-  InfoMessage,
-  WarningMessage,
   ErrorMessage,
+  InfoMessage,
   RetryCountdownMessage,
   SuccessMessage,
-} from './messages/StatusMessages.js';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { MarkdownDisplay } from '../utils/MarkdownDisplay.js';
-import { AboutBox } from './AboutBox.js';
-import { StatsDisplay } from './StatsDisplay.js';
-import { ModelStatsDisplay } from './ModelStatsDisplay.js';
-import { ToolStatsDisplay } from './ToolStatsDisplay.js';
-import { SessionSummaryDisplay } from './SessionSummaryDisplay.js';
-import { Help } from './Help.js';
-import type { SlashCommand } from '../commands/types.js';
-import { ExtensionsList } from './views/ExtensionsList.js';
-import { getMCPServerStatus } from '@airiscode/core';
-import { SkillsList } from './views/SkillsList.js';
-import { ToolsList } from './views/ToolsList.js';
-import { McpStatus } from './views/McpStatus.js';
-import { ContextUsage } from './views/ContextUsage.js';
-import { ArenaAgentCard, ArenaSessionCard } from './arena/ArenaCards.js';
-import { InsightProgressMessage } from './messages/InsightProgressMessage.js';
-import { BtwMessage } from './messages/BtwMessage.js';
-import { useVerboseMode } from '../contexts/VerboseModeContext.js';
+  WarningMessage,
+} from "./messages/StatusMessages.js";
+import { SummaryMessage } from "./messages/SummaryMessage.js";
+import { ToolGroupMessage } from "./messages/ToolGroupMessage.js";
+import { SessionSummaryDisplay } from "./SessionSummaryDisplay.js";
+import { StatsDisplay } from "./StatsDisplay.js";
+import { ToolStatsDisplay } from "./ToolStatsDisplay.js";
+import { ContextUsage } from "./views/ContextUsage.js";
+import { ExtensionsList } from "./views/ExtensionsList.js";
+import { McpStatus } from "./views/McpStatus.js";
+import { SkillsList } from "./views/SkillsList.js";
+import { ToolsList } from "./views/ToolsList.js";
 
 interface HistoryItemDisplayProps {
   item: HistoryItem;
@@ -76,9 +73,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
   availableTerminalHeightGemini,
 }) => {
   const marginTop =
-    item.type === 'gemini_content' || item.type === 'gemini_thought_content'
-      ? 0
-      : 1;
+    item.type === "gemini_content" || item.type === "gemini_thought_content" ? 0 : 1;
 
   const { verboseMode } = useVerboseMode();
   const itemForDisplay = useMemo(() => escapeAnsiCtrlCodes(item), [item]);
@@ -94,89 +89,62 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
       marginRight={2}
     >
       {/* Render standard message types */}
-      {itemForDisplay.type === 'user' && (
-        <UserMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'user_shell' && (
-        <UserShellMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'gemini' && (
+      {itemForDisplay.type === "user" && <UserMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "user_shell" && <UserShellMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "gemini" && (
         <AssistantMessage
           text={itemForDisplay.text}
           isPending={isPending}
-          availableTerminalHeight={
-            availableTerminalHeightGemini ?? availableTerminalHeight
-          }
+          availableTerminalHeight={availableTerminalHeightGemini ?? availableTerminalHeight}
           contentWidth={contentWidth}
         />
       )}
-      {itemForDisplay.type === 'gemini_content' && (
+      {itemForDisplay.type === "gemini_content" && (
         <AssistantMessageContent
           text={itemForDisplay.text}
           isPending={isPending}
-          availableTerminalHeight={
-            availableTerminalHeightGemini ?? availableTerminalHeight
-          }
+          availableTerminalHeight={availableTerminalHeightGemini ?? availableTerminalHeight}
           contentWidth={contentWidth}
         />
       )}
-      {verboseMode && itemForDisplay.type === 'gemini_thought' && (
+      {verboseMode && itemForDisplay.type === "gemini_thought" && (
         <ThinkMessage
           text={itemForDisplay.text}
           isPending={isPending}
-          availableTerminalHeight={
-            availableTerminalHeightGemini ?? availableTerminalHeight
-          }
+          availableTerminalHeight={availableTerminalHeightGemini ?? availableTerminalHeight}
           contentWidth={contentWidth}
         />
       )}
-      {verboseMode && itemForDisplay.type === 'gemini_thought_content' && (
+      {verboseMode && itemForDisplay.type === "gemini_thought_content" && (
         <ThinkMessageContent
           text={itemForDisplay.text}
           isPending={isPending}
-          availableTerminalHeight={
-            availableTerminalHeightGemini ?? availableTerminalHeight
-          }
+          availableTerminalHeight={availableTerminalHeightGemini ?? availableTerminalHeight}
           contentWidth={contentWidth}
         />
       )}
-      {itemForDisplay.type === 'info' && (
-        <InfoMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'success' && (
-        <SuccessMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'warning' && (
-        <WarningMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'error' && (
+      {itemForDisplay.type === "info" && <InfoMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "success" && <SuccessMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "warning" && <WarningMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "error" && (
         <ErrorMessage text={itemForDisplay.text} hint={itemForDisplay.hint} />
       )}
-      {itemForDisplay.type === 'retry_countdown' && (
+      {itemForDisplay.type === "retry_countdown" && (
         <RetryCountdownMessage text={itemForDisplay.text} />
       )}
-      {itemForDisplay.type === 'about' && (
+      {itemForDisplay.type === "about" && (
         <AboutBox {...itemForDisplay.systemInfo} width={boxWidth} />
       )}
-      {itemForDisplay.type === 'help' && commands && (
-        <Help commands={commands} width={boxWidth} />
-      )}
-      {itemForDisplay.type === 'stats' && (
+      {itemForDisplay.type === "help" && commands && <Help commands={commands} width={boxWidth} />}
+      {itemForDisplay.type === "stats" && (
         <StatsDisplay duration={itemForDisplay.duration} width={boxWidth} />
       )}
-      {itemForDisplay.type === 'model_stats' && (
-        <ModelStatsDisplay width={boxWidth} />
-      )}
-      {itemForDisplay.type === 'tool_stats' && (
-        <ToolStatsDisplay width={boxWidth} />
+      {itemForDisplay.type === "model_stats" && <ModelStatsDisplay width={boxWidth} />}
+      {itemForDisplay.type === "tool_stats" && <ToolStatsDisplay width={boxWidth} />}
+      {itemForDisplay.type === "quit" && (
+        <SessionSummaryDisplay duration={itemForDisplay.duration} width={boxWidth} />
       )}
-      {itemForDisplay.type === 'quit' && (
-        <SessionSummaryDisplay
-          duration={itemForDisplay.duration}
-          width={boxWidth}
-        />
-      )}
-      {itemForDisplay.type === 'tool_group' && (
+      {itemForDisplay.type === "tool_group" && (
         <ToolGroupMessage
           toolCalls={itemForDisplay.tools}
           groupId={itemForDisplay.id}
@@ -188,27 +156,23 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           isUserInitiated={itemForDisplay.isUserInitiated}
         />
       )}
-      {itemForDisplay.type === 'compression' && (
+      {itemForDisplay.type === "compression" && (
         <CompressionMessage compression={itemForDisplay.compression} />
       )}
-      {itemForDisplay.type === 'summary' && (
-        <SummaryMessage summary={itemForDisplay.summary} />
-      )}
-      {itemForDisplay.type === 'extensions_list' && <ExtensionsList />}
-      {itemForDisplay.type === 'tools_list' && (
+      {itemForDisplay.type === "summary" && <SummaryMessage summary={itemForDisplay.summary} />}
+      {itemForDisplay.type === "extensions_list" && <ExtensionsList />}
+      {itemForDisplay.type === "tools_list" && (
         <ToolsList
           contentWidth={contentWidth}
           tools={itemForDisplay.tools}
           showDescriptions={itemForDisplay.showDescriptions}
         />
       )}
-      {itemForDisplay.type === 'skills_list' && (
-        <SkillsList skills={itemForDisplay.skills} />
-      )}
-      {itemForDisplay.type === 'mcp_status' && (
+      {itemForDisplay.type === "skills_list" && <SkillsList skills={itemForDisplay.skills} />}
+      {itemForDisplay.type === "mcp_status" && (
         <McpStatus {...itemForDisplay} serverStatus={getMCPServerStatus} />
       )}
-      {itemForDisplay.type === 'context_usage' && (
+      {itemForDisplay.type === "context_usage" && (
         <ContextUsage
           modelName={itemForDisplay.modelName}
           totalTokens={itemForDisplay.totalTokens}
@@ -222,10 +186,10 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           showDetails={itemForDisplay.showDetails}
         />
       )}
-      {itemForDisplay.type === 'arena_agent_complete' && (
+      {itemForDisplay.type === "arena_agent_complete" && (
         <ArenaAgentCard agent={itemForDisplay.agent} width={boxWidth} />
       )}
-      {itemForDisplay.type === 'arena_session_complete' && (
+      {itemForDisplay.type === "arena_session_complete" && (
         <ArenaSessionCard
           sessionStatus={itemForDisplay.sessionStatus}
           task={itemForDisplay.task}
@@ -234,25 +198,25 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           width={boxWidth}
         />
       )}
-      {itemForDisplay.type === 'insight_progress' && (
+      {itemForDisplay.type === "insight_progress" && (
         <InsightProgressMessage progress={itemForDisplay.progress} />
       )}
-      {itemForDisplay.type === 'btw' && itemForDisplay.btw && (
+      {itemForDisplay.type === "btw" && itemForDisplay.btw && (
         <BtwMessage btw={itemForDisplay.btw} containerWidth={contentWidth} />
       )}
-      {itemForDisplay.type === 'user_prompt_submit_blocked' && (
+      {itemForDisplay.type === "user_prompt_submit_blocked" && (
         <Box flexDirection="column">
           <Text color={theme.status.warning}>
             {`✕ UserPromptSubmit operation blocked by hook:\n${itemForDisplay.reason}\n\nOriginal prompt: ${sanitizeSensitiveText(itemForDisplay.originalPrompt)}`}
           </Text>
         </Box>
       )}
-      {itemForDisplay.type === 'stop_hook_loop' && (
+      {itemForDisplay.type === "stop_hook_loop" && (
         <InfoMessage
           text={`Ran ${itemForDisplay.stopHookCount} stop hooks\n  ⎿  Stop hook error: ${itemForDisplay.reasons[itemForDisplay.reasons.length - 1]}`}
         />
       )}
-      {itemForDisplay.type === 'stop_hook_system_message' && (
+      {itemForDisplay.type === "stop_hook_system_message" && (
         <Box flexDirection="column">
           <Text color={theme.text.primary}> ⎿ Stop says:</Text>
           <Box marginLeft={4} flexDirection="column">
diff --git a/apps/airiscode-cli/src/ui/components/IdeTrustChangeDialog.tsx b/apps/airiscode-cli/src/ui/components/IdeTrustChangeDialog.tsx
index 578d36ae0..5b227dc7e 100644
--- a/apps/airiscode-cli/src/ui/components/IdeTrustChangeDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/IdeTrustChangeDialog.tsx
@@ -4,40 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { relaunchApp } from '../../utils/processUtils.js';
-import { type RestartReason } from '../hooks/useIdeTrustListener.js';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { relaunchApp } from "../../utils/processUtils.js";
+import { type RestartReason } from "../hooks/useIdeTrustListener.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 interface IdeTrustChangeDialogProps {
   reason: RestartReason;
 }
 
-const debugLogger = createDebugLogger('IDE_TRUST_DIALOG');
+const debugLogger = createDebugLogger("IDE_TRUST_DIALOG");
 
 export const IdeTrustChangeDialog = ({ reason }: IdeTrustChangeDialogProps) => {
   useKeypress(
     (key) => {
-      if (key.name === 'r' || key.name === 'R') {
+      if (key.name === "r" || key.name === "R") {
         relaunchApp();
       }
     },
     { isActive: true },
   );
 
-  let message = 'Workspace trust has changed.';
-  if (reason === 'NONE') {
+  let message = "Workspace trust has changed.";
+  if (reason === "NONE") {
     // This should not happen, but provides a fallback and a debug log.
-    debugLogger.error(
-      'IdeTrustChangeDialog rendered with unexpected reason "NONE"',
-    );
-  } else if (reason === 'CONNECTION_CHANGE') {
-    message =
-      'Workspace trust has changed due to a change in the IDE connection.';
-  } else if (reason === 'TRUST_CHANGE') {
-    message = 'Workspace trust has changed due to a change in the IDE trust.';
+    debugLogger.error('IdeTrustChangeDialog rendered with unexpected reason "NONE"');
+  } else if (reason === "CONNECTION_CHANGE") {
+    message = "Workspace trust has changed due to a change in the IDE connection.";
+  } else if (reason === "TRUST_CHANGE") {
+    message = "Workspace trust has changed due to a change in the IDE trust.";
   }
 
   return (
diff --git a/apps/airiscode-cli/src/ui/components/InputPrompt.tsx b/apps/airiscode-cli/src/ui/components/InputPrompt.tsx
index 12b11a05d..88b967b08 100644
--- a/apps/airiscode-cli/src/ui/components/InputPrompt.tsx
+++ b/apps/airiscode-cli/src/ui/components/InputPrompt.tsx
@@ -4,52 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useEffect, useMemo, useState, useRef } from 'react';
-import { Box, Text } from 'ink';
-import { SuggestionsDisplay, MAX_WIDTH } from './SuggestionsDisplay.js';
-import { theme } from '../semantic-colors.js';
-import { useInputHistory } from '../hooks/useInputHistory.js';
-import type { TextBuffer } from './shared/text-buffer.js';
-import { logicalPosToOffset } from './shared/text-buffer.js';
-import { cpSlice, cpLen } from '../utils/textUtils.js';
-import chalk from 'chalk';
-import { useShellHistory } from '../hooks/useShellHistory.js';
-import { useReverseSearchCompletion } from '../hooks/useReverseSearchCompletion.js';
-import { useCommandCompletion } from '../hooks/useCommandCompletion.js';
-import { useFollowupSuggestionsCLI } from '../hooks/useFollowupSuggestions.js';
-import type { Config } from '@airiscode/core';
-import type { Key } from '../hooks/useKeypress.js';
-import { keyMatchers, Command } from '../keyMatchers.js';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import {
-  ApprovalMode,
-  Storage,
-  createDebugLogger,
-} from '@airiscode/core';
-import {
-  parseInputForHighlighting,
-  buildSegmentsForVisualSlice,
-} from '../utils/highlight.js';
-import { t } from '../../i18n/index.js';
+import * as path from "node:path";
+import type { Config } from "@airiscode/core";
+import { ApprovalMode, createDebugLogger, Storage } from "@airiscode/core";
+import chalk from "chalk";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { t } from "../../i18n/index.js";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import { useAgentViewActions, useAgentViewState } from "../contexts/AgentViewContext.js";
+import { useKeypressContext } from "../contexts/KeypressContext.js";
+import { useShellFocusState } from "../contexts/ShellFocusContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { FEEDBACK_DIALOG_KEYS } from "../FeedbackDialog.js";
+import { useCommandCompletion } from "../hooks/useCommandCompletion.js";
+import { useFollowupSuggestionsCLI } from "../hooks/useFollowupSuggestions.js";
+import { useInputHistory } from "../hooks/useInputHistory.js";
+import type { Key } from "../hooks/useKeypress.js";
+import { useReverseSearchCompletion } from "../hooks/useReverseSearchCompletion.js";
+import { useShellHistory } from "../hooks/useShellHistory.js";
+import { Command, keyMatchers } from "../keyMatchers.js";
+import { theme } from "../semantic-colors.js";
+import { SCREEN_READER_USER_PREFIX } from "../textConstants.js";
 import {
+  cleanupOldClipboardImages,
   clipboardHasImage,
   saveClipboardImage,
-  cleanupOldClipboardImages,
-} from '../utils/clipboardUtils.js';
-import * as path from 'node:path';
-import { SCREEN_READER_USER_PREFIX } from '../textConstants.js';
-import { useShellFocusState } from '../contexts/ShellFocusContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
-import { useKeypressContext } from '../contexts/KeypressContext.js';
-import {
-  useAgentViewState,
-  useAgentViewActions,
-} from '../contexts/AgentViewContext.js';
-import { FEEDBACK_DIALOG_KEYS } from '../FeedbackDialog.js';
-import { BaseTextInput } from './BaseTextInput.js';
-import type { RenderLineOptions } from './BaseTextInput.js';
+} from "../utils/clipboardUtils.js";
+import { buildSegmentsForVisualSlice, parseInputForHighlighting } from "../utils/highlight.js";
+import { cpLen, cpSlice } from "../utils/textUtils.js";
+import type { RenderLineOptions } from "./BaseTextInput.js";
+import { BaseTextInput } from "./BaseTextInput.js";
+import { MAX_WIDTH, SuggestionsDisplay } from "./SuggestionsDisplay.js";
+import type { TextBuffer } from "./shared/text-buffer.js";
+import { logicalPosToOffset } from "./shared/text-buffer.js";
 
 /**
  * Represents an attachment (e.g., pasted image) displayed above the input prompt
@@ -60,7 +50,7 @@ export interface Attachment {
   filename: string; // Filename only (for display)
 }
 
-const debugLogger = createDebugLogger('INPUT_PROMPT');
+const debugLogger = createDebugLogger("INPUT_PROMPT");
 export interface InputPromptProps {
   buffer: TextBuffer;
   onSubmit: (value: string) => void;
@@ -89,7 +79,7 @@ export interface InputPromptProps {
 }
 
 // Re-export from shared utils for backwards compatibility
-export { calculatePromptWidths } from '../utils/layoutUtils.js';
+export { calculatePromptWidths } from "../utils/layoutUtils.js";
 
 // Large paste placeholder thresholds
 const LARGE_PASTE_CHAR_THRESHOLD = 1000;
@@ -137,18 +127,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   const [isAttachmentMode, setIsAttachmentMode] = useState(false);
   const [selectedAttachmentIndex, setSelectedAttachmentIndex] = useState(-1);
   // Large paste placeholder handling
-  const [pendingPastes, setPendingPastes] = useState<Map<string, string>>(
-    new Map(),
-  );
+  const [pendingPastes, setPendingPastes] = useState<Map<string, string>>(new Map());
   // Track active placeholder IDs for each charCount to enable reuse
   const activePlaceholderIds = useRef<Map<number, Set<number>>>(new Map());
 
   // Parse placeholder to extract charCount and ID
   const parsePlaceholder = useCallback(
     (placeholder: string): { charCount: number; id: number } | null => {
-      const match = placeholder.match(
-        /^\[Pasted Content (\d+) chars\](?: #(\d+))?$/,
-      );
+      const match = placeholder.match(/^\[Pasted Content (\d+) chars\](?: #(\d+))?$/);
       if (!match) return null;
       const charCount = parseInt(match[1], 10);
       const id = match[2] ? parseInt(match[2], 10) : 1;
@@ -170,12 +156,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
   const [reverseSearchActive, setReverseSearchActive] = useState(false);
   const [commandSearchActive, setCommandSearchActive] = useState(false);
-  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = useState('');
-  const [cursorPosition, setCursorPosition] = useState<[number, number]>([
-    0, 0,
-  ]);
-  const [expandedSuggestionIndex, setExpandedSuggestionIndex] =
-    useState<number>(-1);
+  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = useState("");
+  const [cursorPosition, setCursorPosition] = useState<[number, number]>([0, 0]);
+  const [expandedSuggestionIndex, setExpandedSuggestionIndex] = useState<number>(-1);
   const shellHistory = useShellHistory(config.getProjectRoot());
   const shellHistoryData = shellHistory.history;
 
@@ -196,10 +179,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     reverseSearchActive,
   );
 
-  const commandSearchHistory = useMemo(
-    () => [...userMessages].reverse(),
-    [userMessages],
-  );
+  const commandSearchHistory = useMemo(() => [...userMessages].reverse(), [userMessages]);
 
   const commandSearchCompletion = useReverseSearchCompletion(
     buffer,
@@ -217,13 +197,10 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   });
 
   const resetCompletionState = completion.resetCompletionState;
-  const resetReverseSearchCompletionState =
-    reverseSearchCompletion.resetCompletionState;
-  const resetCommandSearchCompletionState =
-    commandSearchCompletion.resetCompletionState;
+  const resetReverseSearchCompletionState = reverseSearchCompletion.resetCompletionState;
+  const resetCommandSearchCompletionState = commandSearchCompletion.resetCompletionState;
 
-  const showCursor =
-    focus && isShellFocused && !isEmbeddedShellFocused && !agentTabBarFocused;
+  const showCursor = focus && isShellFocused && !isEmbeddedShellFocused && !agentTabBarFocused;
 
   const resetEscapeState = useCallback(() => {
     if (escapeTimerRef.current) {
@@ -278,17 +255,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       // Expand any large paste placeholders to their full content before submitting
       let finalValue = submittedValue;
       if (pendingPastes.size > 0) {
-        const placeholders = Array.from(pendingPastes.keys()).sort(
-          (a, b) => b.length - a.length,
-        );
+        const placeholders = Array.from(pendingPastes.keys()).sort((a, b) => b.length - a.length);
         const escapedPlaceholders = placeholders.map((placeholderValue) =>
-          placeholderValue.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'),
+          placeholderValue.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
         );
-        const placeholderRegex = new RegExp(escapedPlaceholders.join('|'), 'g');
+        const placeholderRegex = new RegExp(escapedPlaceholders.join("|"), "g");
         finalValue = finalValue.replace(
           placeholderRegex,
-          (matchedPlaceholder) =>
-            pendingPastes.get(matchedPlaceholder) ?? matchedPlaceholder,
+          (matchedPlaceholder) => pendingPastes.get(matchedPlaceholder) ?? matchedPlaceholder,
         );
         setPendingPastes(new Map());
         activePlaceholderIds.current.clear();
@@ -301,13 +275,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       if (attachments.length > 0) {
         const attachmentRefs = attachments
           .map((att) => `@${path.relative(config.getTargetDir(), att.path)}`)
-          .join(' ');
+          .join(" ");
         finalValue = `${attachmentRefs}\n\n${finalValue.trim()}`;
       }
 
       // Clear the buffer *before* calling onSubmit to prevent potential re-submission
       // if onSubmit triggers a re-render while the buffer still holds the old value.
-      buffer.setText('');
+      buffer.setText("");
       onSubmit(finalValue);
 
       // Dismiss follow-up suggestion after submit
@@ -405,7 +379,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         }
       }
     } catch (error) {
-      debugLogger.error('Error handling clipboard image:', error);
+      debugLogger.error("Error handling clipboard image:", error);
     }
   }, []);
 
@@ -431,12 +405,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       // appears in the input immediately (the tab bar handler releases
       // focus on the same event).
       if (agentTabBarFocused) {
-        if (
-          key.sequence &&
-          key.sequence.length === 1 &&
-          !key.ctrl &&
-          !key.meta
-        ) {
+        if (key.sequence && key.sequence.length === 1 && !key.ctrl && !key.meta) {
           return false; // let BaseTextInput type the character
         }
         return true; // consume non-printable keys
@@ -472,9 +441,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         }, 500);
 
         // Handle large pastes by showing a placeholder
-        const pasted = key.sequence.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+        const pasted = key.sequence.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
         const charCount = [...pasted].length; // Proper Unicode char count
-        const lineCount = pasted.split('\n').length;
+        const lineCount = pasted.split("\n").length;
 
         // Ensure we never accidentally interpret paste as regular input.
         if (key.pasteImage) {
@@ -515,30 +484,26 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       }
 
       // Reset ESC count and hide prompt on any non-ESC key
-      if (key.name !== 'escape') {
+      if (key.name !== "escape") {
         if (escPressCount > 0 || showEscapePrompt) {
           resetEscapeState();
         }
       }
 
-      if (
-        key.sequence === '!' &&
-        buffer.text === '' &&
-        !completion.showSuggestions
-      ) {
+      if (key.sequence === "!" && buffer.text === "" && !completion.showSuggestions) {
         // Hide shortcuts when toggling shell mode
         if (showShortcuts && onToggleShortcuts) {
           onToggleShortcuts();
         }
         setShellModeActive(!shellModeActive);
-        buffer.setText(''); // Clear the '!' from input
+        buffer.setText(""); // Clear the '!' from input
         return true;
       }
 
       // Toggle keyboard shortcuts display with "?" when buffer is empty
       if (
-        key.sequence === '?' &&
-        buffer.text === '' &&
+        key.sequence === "?" &&
+        buffer.text === "" &&
         !completion.showSuggestions &&
         onToggleShortcuts
       ) {
@@ -559,27 +524,17 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           setActive(false);
           resetCompletion();
           buffer.setText(textBeforeReverseSearch);
-          const offset = logicalPosToOffset(
-            buffer.lines,
-            cursorPosition[0],
-            cursorPosition[1],
-          );
+          const offset = logicalPosToOffset(buffer.lines, cursorPosition[0], cursorPosition[1]);
           buffer.moveToOffset(offset);
           setExpandedSuggestionIndex(-1);
         };
 
         if (reverseSearchActive) {
-          cancelSearch(
-            setReverseSearchActive,
-            reverseSearchCompletion.resetCompletionState,
-          );
+          cancelSearch(setReverseSearchActive, reverseSearchCompletion.resetCompletionState);
           return true;
         }
         if (commandSearchActive) {
-          cancelSearch(
-            setCommandSearchActive,
-            commandSearchCompletion.resetCompletionState,
-          );
+          cancelSearch(setCommandSearchActive, commandSearchCompletion.resetCompletionState);
           return true;
         }
 
@@ -598,7 +553,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
         // Handle double ESC for clearing input
         if (escPressCount === 0) {
-          if (buffer.text === '') {
+          if (buffer.text === "") {
             return true;
           }
           setEscPressCount(1);
@@ -611,7 +566,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           }, 500);
         } else {
           // clear input and immediately reset state
-          buffer.setText('');
+          buffer.setText("");
           resetCompletionState();
           resetEscapeState();
         }
@@ -643,20 +598,11 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       if (reverseSearchActive || commandSearchActive) {
         const isCommandSearch = commandSearchActive;
 
-        const sc = isCommandSearch
-          ? commandSearchCompletion
-          : reverseSearchCompletion;
-
-        const {
-          activeSuggestionIndex,
-          navigateUp,
-          navigateDown,
-          showSuggestions,
-          suggestions,
-        } = sc;
-        const setActive = isCommandSearch
-          ? setCommandSearchActive
-          : setReverseSearchActive;
+        const sc = isCommandSearch ? commandSearchCompletion : reverseSearchCompletion;
+
+        const { activeSuggestionIndex, navigateUp, navigateDown, showSuggestions, suggestions } =
+          sc;
+        const setActive = isCommandSearch ? setCommandSearchActive : setReverseSearchActive;
         const resetState = sc.resetCompletionState;
 
         if (showSuggestions) {
@@ -700,10 +646,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         }
 
         // Prevent up/down from falling through to regular history navigation
-        if (
-          keyMatchers[Command.NAVIGATION_UP](key) ||
-          keyMatchers[Command.NAVIGATION_DOWN](key)
-        ) {
+        if (keyMatchers[Command.NAVIGATION_UP](key) || keyMatchers[Command.NAVIGATION_DOWN](key)) {
           return true;
         }
       }
@@ -718,7 +661,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       // Use explicit key.name === 'tab' instead of ACCEPT_SUGGESTION matcher,
       // because ACCEPT_SUGGESTION also matches Enter which must fall through to SUBMIT.
       if (
-        key.name === 'tab' &&
+        key.name === "tab" &&
         !key.shift &&
         buffer.text.length === 0 &&
         !completion.showSuggestions &&
@@ -727,20 +670,20 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         followup.state.isVisible &&
         followup.state.suggestion
       ) {
-        followup.accept('tab');
+        followup.accept("tab");
         return true;
       }
 
       // Right arrow fills suggestion into input without submitting
       if (
-        key.name === 'right' &&
+        key.name === "right" &&
         !key.ctrl &&
         !key.meta &&
         buffer.text.length === 0 &&
         followup.state.isVisible &&
         followup.state.suggestion
       ) {
-        followup.accept('right');
+        followup.accept("right");
         return true;
       }
 
@@ -775,14 +718,12 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
       // Attachment mode handling - process before history navigation
       if (isAttachmentMode && attachments.length > 0) {
-        if (key.name === 'left') {
+        if (key.name === "left") {
           setSelectedAttachmentIndex((i) => Math.max(0, i - 1));
           return true;
         }
-        if (key.name === 'right') {
-          setSelectedAttachmentIndex((i) =>
-            Math.min(attachments.length - 1, i + 1),
-          );
+        if (key.name === "right") {
+          setSelectedAttachmentIndex((i) => Math.min(attachments.length - 1, i + 1));
           return true;
         }
         if (keyMatchers[Command.NAVIGATION_DOWN](key)) {
@@ -791,11 +732,11 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           setSelectedAttachmentIndex(-1);
           return true;
         }
-        if (key.name === 'backspace' || key.name === 'delete') {
+        if (key.name === "backspace" || key.name === "delete") {
           handleAttachmentDelete(selectedAttachmentIndex);
           return true;
         }
-        if (key.name === 'return' || key.name === 'escape') {
+        if (key.name === "return" || key.name === "escape") {
           setIsAttachmentMode(false);
           setSelectedAttachmentIndex(-1);
           return true;
@@ -877,17 +818,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
       if (keyMatchers[Command.SUBMIT](key)) {
         // Accept and submit prompt suggestion on Enter when input is truly empty
-        if (
-          buffer.text.length === 0 &&
-          followup.state.isVisible &&
-          followup.state.suggestion
-        ) {
+        if (buffer.text.length === 0 && followup.state.isVisible && followup.state.suggestion) {
           const text = followup.state.suggestion;
           // Skip onAccept (buffer.insert) — we pass the text directly to
           // handleSubmitAndClear which clears the buffer synchronously.
           // Without skipOnAccept the microtask in accept() would re-insert
           // the suggestion into the buffer after it was already cleared.
-          followup.accept('enter', { skipOnAccept: true });
+          followup.accept("enter", { skipOnAccept: true });
           handleSubmitAndClear(text);
           return true;
         }
@@ -902,8 +839,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
           const [row, col] = buffer.cursor;
           const line = buffer.lines[row];
-          const charBefore = col > 0 ? cpSlice(line, col - 1, col) : '';
-          if (charBefore === '\\') {
+          const charBefore = col > 0 ? cpSlice(line, col - 1, col) : "";
+          if (charBefore === "\\") {
             buffer.backspace();
             buffer.newline();
           } else {
@@ -922,9 +859,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       // Handle backspace with placeholder-aware deletion
       if (
         pendingPastes.size > 0 &&
-        (key.name === 'backspace' ||
-          key.sequence === '\x7f' ||
-          (key.ctrl && key.name === 'h'))
+        (key.name === "backspace" || key.sequence === "\x7f" || (key.ctrl && key.name === "h"))
       ) {
         const text = buffer.text;
         const [row, col] = buffer.cursor;
@@ -939,12 +874,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         // Check if we're at the end of any placeholder
         for (const placeholder of pendingPastes.keys()) {
           const placeholderStart = offset - placeholder.length;
-          if (
-            placeholderStart >= 0 &&
-            text.slice(placeholderStart, offset) === placeholder
-          ) {
+          if (placeholderStart >= 0 && text.slice(placeholderStart, offset) === placeholder) {
             // Delete the entire placeholder
-            buffer.replaceRangeByOffset(placeholderStart, offset, '');
+            buffer.replaceRangeByOffset(placeholderStart, offset, "");
             // Remove from pendingPastes and free the ID for reuse
             setPendingPastes((prev) => {
               const next = new Map(prev);
@@ -1029,83 +961,69 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     ],
   );
 
-  const renderLineWithHighlighting = useCallback(
-    (opts: RenderLineOptions): React.ReactNode => {
-      const {
-        lineText,
-        isOnCursorLine,
-        cursorCol: cursorVisualColAbsolute,
-        showCursor: showCursorOpt,
-        absoluteVisualIndex,
-        buffer: buf,
-      } = opts;
-      const mapEntry = buf.visualToLogicalMap[absoluteVisualIndex];
-      const [logicalLineIdx, logicalStartCol] = mapEntry;
-      const logicalLine = buf.lines[logicalLineIdx] || '';
-      const tokens = parseInputForHighlighting(logicalLine, logicalLineIdx);
-
-      const visualStart = logicalStartCol;
-      const visualEnd = logicalStartCol + cpLen(lineText);
-      const segments = buildSegmentsForVisualSlice(
-        tokens,
-        visualStart,
-        visualEnd,
-      );
-
-      const renderedLine: React.ReactNode[] = [];
-      let charCount = 0;
-      segments.forEach((seg, segIdx) => {
-        const segLen = cpLen(seg.text);
-        let display = seg.text;
-
-        if (isOnCursorLine) {
-          const segStart = charCount;
-          const segEnd = segStart + segLen;
-          if (
-            cursorVisualColAbsolute >= segStart &&
-            cursorVisualColAbsolute < segEnd
-          ) {
-            const charToHighlight = cpSlice(
-              seg.text,
-              cursorVisualColAbsolute - segStart,
-              cursorVisualColAbsolute - segStart + 1,
-            );
-            const highlighted = showCursorOpt
-              ? chalk.inverse(charToHighlight)
-              : charToHighlight;
-            display =
-              cpSlice(seg.text, 0, cursorVisualColAbsolute - segStart) +
-              highlighted +
-              cpSlice(seg.text, cursorVisualColAbsolute - segStart + 1);
-          }
-          charCount = segEnd;
+  const renderLineWithHighlighting = useCallback((opts: RenderLineOptions): React.ReactNode => {
+    const {
+      lineText,
+      isOnCursorLine,
+      cursorCol: cursorVisualColAbsolute,
+      showCursor: showCursorOpt,
+      absoluteVisualIndex,
+      buffer: buf,
+    } = opts;
+    const mapEntry = buf.visualToLogicalMap[absoluteVisualIndex];
+    const [logicalLineIdx, logicalStartCol] = mapEntry;
+    const logicalLine = buf.lines[logicalLineIdx] || "";
+    const tokens = parseInputForHighlighting(logicalLine, logicalLineIdx);
+
+    const visualStart = logicalStartCol;
+    const visualEnd = logicalStartCol + cpLen(lineText);
+    const segments = buildSegmentsForVisualSlice(tokens, visualStart, visualEnd);
+
+    const renderedLine: React.ReactNode[] = [];
+    let charCount = 0;
+    segments.forEach((seg, segIdx) => {
+      const segLen = cpLen(seg.text);
+      let display = seg.text;
+
+      if (isOnCursorLine) {
+        const segStart = charCount;
+        const segEnd = segStart + segLen;
+        if (cursorVisualColAbsolute >= segStart && cursorVisualColAbsolute < segEnd) {
+          const charToHighlight = cpSlice(
+            seg.text,
+            cursorVisualColAbsolute - segStart,
+            cursorVisualColAbsolute - segStart + 1,
+          );
+          const highlighted = showCursorOpt ? chalk.inverse(charToHighlight) : charToHighlight;
+          display =
+            cpSlice(seg.text, 0, cursorVisualColAbsolute - segStart) +
+            highlighted +
+            cpSlice(seg.text, cursorVisualColAbsolute - segStart + 1);
         }
+        charCount = segEnd;
+      }
 
-        const color =
-          seg.type === 'command' || seg.type === 'file'
-            ? theme.text.accent
-            : theme.text.primary;
+      const color =
+        seg.type === "command" || seg.type === "file" ? theme.text.accent : theme.text.primary;
 
-        renderedLine.push(
-          <Text key={`token-${segIdx}`} color={color}>
-            {display}
-          </Text>,
-        );
-      });
-
-      if (isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText)) {
-        // Add zero-width space after cursor to prevent Ink from trimming trailing whitespace
-        renderedLine.push(
-          <Text key={`cursor-end-${cursorVisualColAbsolute}`}>
-            {showCursorOpt ? chalk.inverse(' ') + '\u200B' : ' \u200B'}
-          </Text>,
-        );
-      }
+      renderedLine.push(
+        <Text key={`token-${segIdx}`} color={color}>
+          {display}
+        </Text>,
+      );
+    });
 
-      return <Text>{renderedLine}</Text>;
-    },
-    [],
-  );
+    if (isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText)) {
+      // Add zero-width space after cursor to prevent Ink from trimming trailing whitespace
+      renderedLine.push(
+        <Text key={`cursor-end-${cursorVisualColAbsolute}`}>
+          {showCursorOpt ? chalk.inverse(" ") + "\u200B" : " \u200B"}
+        </Text>,
+      );
+    }
+
+    return <Text>{renderedLine}</Text>;
+  }, []);
 
   const getActiveCompletion = () => {
     if (commandSearchActive) return commandSearchCompletion;
@@ -1129,22 +1047,20 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps -- only trigger on prop change
   }, [promptSuggestion]);
 
-  const showAutoAcceptStyling =
-    !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
-  const showYoloStyling =
-    !shellModeActive && approvalMode === ApprovalMode.YOLO;
+  const showAutoAcceptStyling = !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
+  const showYoloStyling = !shellModeActive && approvalMode === ApprovalMode.YOLO;
 
   let statusColor: string | undefined;
-  let statusText = '';
+  let statusText = "";
   if (shellModeActive) {
     statusColor = theme.ui.symbol;
-    statusText = t('Shell mode');
+    statusText = t("Shell mode");
   } else if (showYoloStyling) {
     statusColor = theme.status.errorDim;
-    statusText = t('YOLO mode');
+    statusText = t("YOLO mode");
   } else if (showAutoAcceptStyling) {
     statusColor = theme.status.warningDim;
-    statusText = t('Accepting edits');
+    statusText = t("Accepting edits");
   }
 
   const borderColor =
@@ -1153,25 +1069,22 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       : theme.border.default;
 
   const prefixNode = (
-    <Text
-      color={statusColor ?? theme.text.accent}
-      aria-label={statusText || undefined}
-    >
+    <Text color={statusColor ?? theme.text.accent} aria-label={statusText || undefined}>
       {shellModeActive ? (
         reverseSearchActive ? (
           <Text color={theme.text.link} aria-label={SCREEN_READER_USER_PREFIX}>
-            (r:){' '}
+            (r:){" "}
           </Text>
         ) : (
-          '!'
+          "!"
         )
       ) : commandSearchActive ? (
         <Text color={theme.text.accent}>(r:) </Text>
       ) : showYoloStyling ? (
-        '*'
+        "*"
       ) : (
-        '>'
-      )}{' '}
+        ">"
+      )}{" "}
     </Text>
   );
 
@@ -1179,7 +1092,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     <>
       {attachments.length > 0 && (
         <Box marginLeft={2} marginBottom={0}>
-          <Text color={theme.text.secondary}>{t('Attachments: ')}</Text>
+          <Text color={theme.text.secondary}>{t("Attachments: ")}</Text>
           {attachments.map((att, idx) => (
             <Text
               key={att.id}
@@ -1189,7 +1102,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
                   : theme.text.secondary
               }
             >
-              [{att.filename}]{idx < attachments.length - 1 ? ' ' : ''}
+              [{att.filename}]{idx < attachments.length - 1 ? " " : ""}
             </Text>
           ))}
         </Box>
@@ -1219,11 +1132,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
             scrollOffset={activeCompletion.visibleStartIndex}
             userInput={buffer.text}
             mode={
-              buffer.text.startsWith('/') &&
-              !reverseSearchActive &&
-              !commandSearchActive
-                ? 'slash'
-                : 'reverse'
+              buffer.text.startsWith("/") && !reverseSearchActive && !commandSearchActive
+                ? "slash"
+                : "reverse"
             }
             expandedIndex={expandedSuggestionIndex}
           />
@@ -1234,8 +1145,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         <Box marginLeft={2} marginRight={2}>
           <Text color={theme.text.secondary}>
             {isAttachmentMode
-              ? t('← → select, Delete to remove, ↓ to exit')
-              : t('↑ to manage attachments')}
+              ? t("← → select, Delete to remove, ↓ to exit")
+              : t("↑ to manage attachments")}
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/KeyboardShortcuts.tsx b/apps/airiscode-cli/src/ui/components/KeyboardShortcuts.tsx
index df84d0c27..3c1d1c9fd 100644
--- a/apps/airiscode-cli/src/ui/components/KeyboardShortcuts.tsx
+++ b/apps/airiscode-cli/src/ui/components/KeyboardShortcuts.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { t } from '../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
 
 interface Shortcut {
   key: string;
@@ -16,32 +16,30 @@ interface Shortcut {
 }
 
 // Platform-specific key mappings
-const getNewlineKey = () =>
-  process.platform === 'win32' ? 'ctrl+enter' : 'ctrl+j';
+const getNewlineKey = () => (process.platform === "win32" ? "ctrl+enter" : "ctrl+j");
 const getPasteKey = () => {
-  if (process.platform === 'win32') return 'alt+v';
-  return process.platform === 'darwin' ? 'cmd+v' : 'ctrl+v';
+  if (process.platform === "win32") return "alt+v";
+  return process.platform === "darwin" ? "cmd+v" : "ctrl+v";
 };
-const getExternalEditorKey = () =>
-  process.platform === 'darwin' ? 'ctrl+x' : 'ctrl+x';
+const getExternalEditorKey = () => (process.platform === "darwin" ? "ctrl+x" : "ctrl+x");
 
 // Generate shortcuts with translations (called at render time)
 const getShortcuts = (): Shortcut[] => [
-  { key: '!', description: t('for shell mode') },
-  { key: '/', description: t('for commands') },
-  { key: '@', description: t('for file paths') },
-  { key: 'esc esc', description: t('to clear input') },
+  { key: "!", description: t("for shell mode") },
+  { key: "/", description: t("for commands") },
+  { key: "@", description: t("for file paths") },
+  { key: "esc esc", description: t("to clear input") },
   {
-    key: process.platform === 'win32' ? 'tab' : 'shift+tab',
-    description: t('to cycle approvals'),
+    key: process.platform === "win32" ? "tab" : "shift+tab",
+    description: t("to cycle approvals"),
   },
-  { key: 'ctrl+c', description: t('to quit') },
-  { key: getNewlineKey(), description: t('for newline') + ' ⏎' },
-  { key: 'ctrl+l', description: t('to clear screen') },
-  { key: 'ctrl+r', description: t('to search history') },
-  { key: 'ctrl+y', description: t('to retry last request') },
-  { key: getPasteKey(), description: t('to paste images') },
-  { key: getExternalEditorKey(), description: t('for external editor') },
+  { key: "ctrl+c", description: t("to quit") },
+  { key: getNewlineKey(), description: t("for newline") + " ⏎" },
+  { key: "ctrl+l", description: t("to clear screen") },
+  { key: "ctrl+r", description: t("to search history") },
+  { key: "ctrl+y", description: t("to retry last request") },
+  { key: getPasteKey(), description: t("to paste images") },
+  { key: getExternalEditorKey(), description: t("for external editor") },
 ];
 
 const ShortcutItem: React.FC<{ shortcut: Shortcut }> = ({ shortcut }) => (
@@ -90,8 +88,7 @@ export const KeyboardShortcuts: React.FC = () => {
   const width3Col = calculateLayoutWidth(COLUMN_SPLITS[3]);
   const width2Col = calculateLayoutWidth(COLUMN_SPLITS[2]);
 
-  const numColumns =
-    availableWidth >= width3Col ? 3 : availableWidth >= width2Col ? 2 : 1;
+  const numColumns = availableWidth >= width3Col ? 3 : availableWidth >= width2Col ? 2 : 1;
 
   // Split shortcuts into columns using predefined distribution
   const splits = COLUMN_SPLITS[numColumns];
@@ -103,11 +100,7 @@ export const KeyboardShortcuts: React.FC = () => {
   }
 
   return (
-    <Box
-      flexDirection="row"
-      marginLeft={MARGIN_LEFT}
-      marginRight={MARGIN_RIGHT}
-    >
+    <Box flexDirection="row" marginLeft={MARGIN_LEFT} marginRight={MARGIN_RIGHT}>
       {columns.map((column, colIndex) => (
         <Box
           key={colIndex}
diff --git a/apps/airiscode-cli/src/ui/components/LoadingIndicator.tsx b/apps/airiscode-cli/src/ui/components/LoadingIndicator.tsx
index ff36e43f0..894b9abcc 100644
--- a/apps/airiscode-cli/src/ui/components/LoadingIndicator.tsx
+++ b/apps/airiscode-cli/src/ui/components/LoadingIndicator.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ThoughtSummary } from '@airiscode/core';
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
-import { GeminiRespondingSpinner } from './GeminiRespondingSpinner.js';
-import { formatDuration, formatTokenCount } from '../utils/formatters.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
-import { t } from '../../i18n/index.js';
+import type { ThoughtSummary } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
+import { StreamingState } from "../types.js";
+import { formatDuration, formatTokenCount } from "../utils/formatters.js";
+import { isNarrowWidth } from "../utils/isNarrowWidth.js";
+import { GeminiRespondingSpinner } from "./GeminiRespondingSpinner.js";
 
 interface LoadingIndicatorProps {
   currentLoadingPhrase?: string;
@@ -44,16 +44,13 @@ export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({
   const outputTokens = candidatesTokens ?? 0;
   const showTokens = !isNarrow && outputTokens > 0;
 
-  const timeStr =
-    elapsedTime < 60 ? `${elapsedTime}s` : formatDuration(elapsedTime * 1000);
+  const timeStr = elapsedTime < 60 ? `${elapsedTime}s` : formatDuration(elapsedTime * 1000);
 
-  const tokenStr = showTokens
-    ? ` · ↓ ${formatTokenCount(outputTokens)} tokens`
-    : '';
+  const tokenStr = showTokens ? ` · ↓ ${formatTokenCount(outputTokens)} tokens` : "";
 
   const cancelAndTimerContent =
     streamingState !== StreamingState.WaitingForConfirmation
-      ? t('({{time}}{{tokens}} · esc to cancel)', {
+      ? t("({{time}}{{tokens}} · esc to cancel)", {
           time: timeStr,
           tokens: tokenStr,
         })
@@ -64,16 +61,14 @@ export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({
       {/* Main loading line */}
       <Box
         width="100%"
-        flexDirection={isNarrow ? 'column' : 'row'}
-        alignItems={isNarrow ? 'flex-start' : 'center'}
+        flexDirection={isNarrow ? "column" : "row"}
+        alignItems={isNarrow ? "flex-start" : "center"}
       >
         <Box>
           <Box marginRight={1}>
             <GeminiRespondingSpinner
               nonRespondingDisplay={
-                streamingState === StreamingState.WaitingForConfirmation
-                  ? '⠏'
-                  : ''
+                streamingState === StreamingState.WaitingForConfirmation ? "⠏" : ""
               }
             />
           </Box>
diff --git a/apps/airiscode-cli/src/ui/components/LoopDetectionConfirmation.tsx b/apps/airiscode-cli/src/ui/components/LoopDetectionConfirmation.tsx
index 4fce6d638..4063335e8 100644
--- a/apps/airiscode-cli/src/ui/components/LoopDetectionConfirmation.tsx
+++ b/apps/airiscode-cli/src/ui/components/LoopDetectionConfirmation.tsx
@@ -4,28 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import type { RadioSelectItem } from "./shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export type LoopDetectionConfirmationResult = {
-  userSelection: 'disable' | 'keep';
+  userSelection: "disable" | "keep";
 };
 
 interface LoopDetectionConfirmationProps {
   onComplete: (result: LoopDetectionConfirmationResult) => void;
 }
 
-export function LoopDetectionConfirmation({
-  onComplete,
-}: LoopDetectionConfirmationProps) {
+export function LoopDetectionConfirmation({ onComplete }: LoopDetectionConfirmationProps) {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onComplete({
-          userSelection: 'keep',
+          userSelection: "keep",
         });
       }
     },
@@ -34,18 +32,18 @@ export function LoopDetectionConfirmation({
 
   const OPTIONS: Array<RadioSelectItem<LoopDetectionConfirmationResult>> = [
     {
-      label: 'Keep loop detection enabled (esc)',
+      label: "Keep loop detection enabled (esc)",
       value: {
-        userSelection: 'keep',
+        userSelection: "keep",
       },
-      key: 'Keep loop detection enabled (esc)',
+      key: "Keep loop detection enabled (esc)",
     },
     {
-      label: 'Disable loop detection for this session',
+      label: "Disable loop detection for this session",
       value: {
-        userSelection: 'disable',
+        userSelection: "disable",
       },
-      key: 'Disable loop detection for this session',
+      key: "Disable loop detection for this session",
     },
   ];
 
@@ -68,25 +66,23 @@ export function LoopDetectionConfirmation({
             <Text wrap="truncate-end">
               <Text color={theme.text.primary} bold>
                 A potential loop was detected
-              </Text>{' '}
+              </Text>{" "}
             </Text>
           </Box>
         </Box>
         <Box width="100%" marginTop={1}>
           <Box flexDirection="column">
             <Text color={theme.text.secondary}>
-              This can happen due to repetitive tool calls or other model
-              behavior. Do you want to keep loop detection enabled or disable it
-              for this session?
+              This can happen due to repetitive tool calls or other model behavior. Do you want to
+              keep loop detection enabled or disable it for this session?
             </Text>
             <Box marginTop={1}>
               <RadioButtonSelect items={OPTIONS} onSelect={onComplete} />
             </Box>
             <Box marginTop={1}>
               <Text color={theme.text.secondary}>
-                Note: To disable loop detection checks for all future sessions,
-                set &quot;model.skipLoopDetection&quot; to true in your
-                settings.json.
+                Note: To disable loop detection checks for all future sessions, set
+                &quot;model.skipLoopDetection&quot; to true in your settings.json.
               </Text>
             </Box>
           </Box>
diff --git a/apps/airiscode-cli/src/ui/components/MainContent.tsx b/apps/airiscode-cli/src/ui/components/MainContent.tsx
index e38e88e74..73cc2990d 100644
--- a/apps/airiscode-cli/src/ui/components/MainContent.tsx
+++ b/apps/airiscode-cli/src/ui/components/MainContent.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Static } from 'ink';
-import { HistoryItemDisplay } from './HistoryItemDisplay.js';
-import { ShowMoreLines } from './ShowMoreLines.js';
-import { Notifications } from './Notifications.js';
-import { OverflowProvider } from '../contexts/OverflowContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useAppContext } from '../contexts/AppContext.js';
-import { AppHeader } from './AppHeader.js';
-import { DebugModeNotification } from './DebugModeNotification.js';
-import { useVerboseMode } from '../contexts/VerboseModeContext.js';
+import { Box, Static } from "ink";
+import { useAppContext } from "../contexts/AppContext.js";
+import { OverflowProvider } from "../contexts/OverflowContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useVerboseMode } from "../contexts/VerboseModeContext.js";
+import { AppHeader } from "./AppHeader.js";
+import { DebugModeNotification } from "./DebugModeNotification.js";
+import { HistoryItemDisplay } from "./HistoryItemDisplay.js";
+import { Notifications } from "./Notifications.js";
+import { ShowMoreLines } from "./ShowMoreLines.js";
 
 // Limit Gemini messages to a very high number of lines to mitigate performance
 // issues in the worst case if we somehow get an enormous response from Gemini.
@@ -73,9 +73,7 @@ export const MainContent = () => {
                 isPending={true}
                 isFocused={isFrozen ? false : !uiState.isEditorDialogOpen}
                 activeShellPtyId={isFrozen ? undefined : uiState.activePtyId}
-                embeddedShellFocused={
-                  isFrozen ? false : uiState.embeddedShellFocused
-                }
+                embeddedShellFocused={isFrozen ? false : uiState.embeddedShellFocused}
               />
             );
           })}
diff --git a/apps/airiscode-cli/src/ui/components/MemoryUsageDisplay.tsx b/apps/airiscode-cli/src/ui/components/MemoryUsageDisplay.tsx
index 1ea3c1069..32af31e87 100644
--- a/apps/airiscode-cli/src/ui/components/MemoryUsageDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/MemoryUsageDisplay.tsx
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import process from 'node:process';
-import { formatMemoryUsage } from '../utils/formatters.js';
+import process from "node:process";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import { theme } from "../semantic-colors.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
 
 export const MemoryUsageDisplay: React.FC = () => {
-  const [memoryUsage, setMemoryUsage] = useState<string>('');
-  const [memoryUsageColor, setMemoryUsageColor] = useState<string>(
-    theme.text.secondary,
-  );
+  const [memoryUsage, setMemoryUsage] = useState<string>("");
+  const [memoryUsageColor, setMemoryUsageColor] = useState<string>(theme.text.secondary);
 
   useEffect(() => {
     const updateMemory = () => {
       const usage = process.memoryUsage().rss;
       setMemoryUsage(formatMemoryUsage(usage));
       setMemoryUsageColor(
-        usage >= 2 * 1024 * 1024 * 1024
-          ? theme.status.error
-          : theme.text.secondary,
+        usage >= 2 * 1024 * 1024 * 1024 ? theme.status.error : theme.text.secondary,
       );
     };
     const intervalId = setInterval(updateMemory, 2000);
diff --git a/apps/airiscode-cli/src/ui/components/ModelDialog.tsx b/apps/airiscode-cli/src/ui/components/ModelDialog.tsx
index 5eecbe2d5..31b5345fc 100644
--- a/apps/airiscode-cli/src/ui/components/ModelDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/ModelDialog.tsx
@@ -4,36 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useContext, useMemo, useState } from 'react';
-import { Box, Text } from 'ink';
 import {
   AuthType,
-  ModelSlashCommandEvent,
-  logModelSlashCommand,
-  MAINLINE_CODER_MODEL,
-  type AvailableModel as CoreAvailableModel,
   type ContentGeneratorConfig,
+  type AvailableModel as CoreAvailableModel,
   type InputModalities,
-} from '@airiscode/core';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { theme } from '../semantic-colors.js';
-import { DescriptiveRadioButtonSelect } from './shared/DescriptiveRadioButtonSelect.js';
-import { ConfigContext } from '../contexts/ConfigContext.js';
-import { UIStateContext, type UIState } from '../contexts/UIStateContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { getPersistScopeForModelSelection } from '../../config/modelProvidersScope.js';
-import { t } from '../../i18n/index.js';
+  logModelSlashCommand,
+  MAINLINE_CODER_MODEL,
+  ModelSlashCommandEvent,
+} from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useContext, useMemo, useState } from "react";
+import { getPersistScopeForModelSelection } from "../../config/modelProvidersScope.js";
+import { t } from "../../i18n/index.js";
+import { ConfigContext } from "../contexts/ConfigContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { type UIState, UIStateContext } from "../contexts/UIStateContext.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { DescriptiveRadioButtonSelect } from "./shared/DescriptiveRadioButtonSelect.js";
 
 function formatModalities(modalities?: InputModalities): string {
-  if (!modalities) return t('text-only');
+  if (!modalities) return t("text-only");
   const parts: string[] = [];
-  if (modalities.image) parts.push(t('image'));
-  if (modalities.pdf) parts.push(t('pdf'));
-  if (modalities.audio) parts.push(t('audio'));
-  if (modalities.video) parts.push(t('video'));
-  if (parts.length === 0) return t('text-only');
-  return `${t('text')} · ${parts.join(' · ')}`;
+  if (modalities.image) parts.push(t("image"));
+  if (modalities.pdf) parts.push(t("pdf"));
+  if (modalities.audio) parts.push(t("audio"));
+  if (modalities.video) parts.push(t("video"));
+  if (parts.length === 0) return t("text-only");
+  return `${t("text")} · ${parts.join(" · ")}`;
 }
 
 interface ModelDialogProps {
@@ -42,21 +42,18 @@ interface ModelDialogProps {
 }
 
 function maskApiKey(apiKey: string | undefined): string {
-  if (!apiKey) return `(${t('not set')})`;
+  if (!apiKey) return `(${t("not set")})`;
   const trimmed = apiKey.trim();
-  if (trimmed.length === 0) return `(${t('not set')})`;
-  if (trimmed.length <= 6) return '***';
+  if (trimmed.length === 0) return `(${t("not set")})`;
+  if (trimmed.length <= 6) return "***";
   const head = trimmed.slice(0, 3);
   const tail = trimmed.slice(-4);
   return `${head}…${tail}`;
 }
 
-function persistModelSelection(
-  settings: ReturnType<typeof useSettings>,
-  modelId: string,
-): void {
+function persistModelSelection(settings: ReturnType<typeof useSettings>, modelId: string): void {
   const scope = getPersistScopeForModelSelection(settings);
-  settings.setValue(scope, 'model.name', modelId);
+  settings.setValue(scope, "model.name", modelId);
 }
 
 function persistAuthTypeSelection(
@@ -64,7 +61,7 @@ function persistAuthTypeSelection(
   authType: AuthType,
 ): void {
   const scope = getPersistScopeForModelSelection(settings);
-  settings.setValue(scope, 'security.auth.selectedType', authType);
+  settings.setValue(scope, "security.auth.selectedType", authType);
 }
 
 interface HandleModelSwitchSuccessParams {
@@ -89,15 +86,15 @@ function handleModelSwitchSuccess({
     persistAuthTypeSelection(settings, effectiveAuthType);
   }
 
-  const baseUrl = after?.baseUrl ?? t('(default)');
+  const baseUrl = after?.baseUrl ?? t("(default)");
   const maskedKey = maskApiKey(after?.apiKey);
   uiState?.historyManager.addItem(
     {
-      type: 'info',
+      type: "info",
       text:
-        `authType: ${effectiveAuthType ?? `(${t('none')})`}` +
+        `authType: ${effectiveAuthType ?? `(${t("none")})`}` +
         `\n` +
-        `Using ${isRuntime ? 'runtime ' : ''}model: ${effectiveModelId}` +
+        `Using ${isRuntime ? "runtime " : ""}model: ${effectiveModelId}` +
         `\n` +
         `Base URL: ${baseUrl}` +
         `\n` +
@@ -108,17 +105,11 @@ function handleModelSwitchSuccess({
 }
 
 function formatContextWindow(size?: number): string {
-  if (!size) return `(${t('unknown')})`;
-  return `${size.toLocaleString('en-US')} tokens`;
+  if (!size) return `(${t("unknown")})`;
+  return `${size.toLocaleString("en-US")} tokens`;
 }
 
-function DetailRow({
-  label,
-  value,
-}: {
-  label: string;
-  value: React.ReactNode;
-}): React.JSX.Element {
+function DetailRow({ label, value }: { label: string; value: React.ReactNode }): React.JSX.Element {
   return (
     <Box>
       <Box minWidth={16} flexShrink={0}>
@@ -131,10 +122,7 @@ function DetailRow({
   );
 }
 
-export function ModelDialog({
-  onClose,
-  isFastModelMode,
-}: ModelDialogProps): React.JSX.Element {
+export function ModelDialog({ onClose, isFastModelMode }: ModelDialogProps): React.JSX.Element {
   const config = useContext(ConfigContext);
   const uiState = useContext(UIStateContext);
   const settings = useSettings();
@@ -171,9 +159,7 @@ export function ModelDialog({
 
     // Filter to only include authTypes that have registry models and maintain order
     const availableAuthTypes = new Set(modelsByAuthTypeMap.keys());
-    const orderedAuthTypes = authTypeOrder.filter((t) =>
-      availableAuthTypes.has(t),
-    );
+    const orderedAuthTypes = authTypeOrder.filter((t) => availableAuthTypes.has(t));
 
     // Build ordered list: runtime models first, then registry models grouped by authType
     const result: Array<{
@@ -205,43 +191,33 @@ export function ModelDialog({
 
   const MODEL_OPTIONS = useMemo(
     () =>
-      availableModelEntries.map(
-        ({ authType: t2, model, isRuntime, snapshotId }) => {
-          // Runtime models use snapshotId directly (format: $runtime|${authType}|${modelId})
-          const value =
-            isRuntime && snapshotId ? snapshotId : `${t2}::${model.id}`;
-
-          const title = (
-            <Text>
-              <Text
-                bold
-                color={isRuntime ? theme.status.warning : theme.text.accent}
-              >
-                [{t2}]
-              </Text>
-              <Text>{` ${model.label}`}</Text>
-              {isRuntime && (
-                <Text color={theme.status.warning}> (Runtime)</Text>
-              )}
+      availableModelEntries.map(({ authType: t2, model, isRuntime, snapshotId }) => {
+        // Runtime models use snapshotId directly (format: $runtime|${authType}|${modelId})
+        const value = isRuntime && snapshotId ? snapshotId : `${t2}::${model.id}`;
+
+        const title = (
+          <Text>
+            <Text bold color={isRuntime ? theme.status.warning : theme.text.accent}>
+              [{t2}]
             </Text>
-          );
-
-          // Include runtime indicator in description
-          let description = model.description || '';
-          if (isRuntime) {
-            description = description
-              ? `${description} (Runtime)`
-              : 'Runtime model';
-          }
+            <Text>{` ${model.label}`}</Text>
+            {isRuntime && <Text color={theme.status.warning}> (Runtime)</Text>}
+          </Text>
+        );
+
+        // Include runtime indicator in description
+        let description = model.description || "";
+        if (isRuntime) {
+          description = description ? `${description} (Runtime)` : "Runtime model";
+        }
 
-          return {
-            value,
-            title,
-            description,
-            key: value,
-          };
-        },
-      ),
+        return {
+          value,
+          title,
+          description,
+          key: value,
+        };
+      }),
     [availableModelEntries],
   );
 
@@ -260,11 +236,11 @@ export function ModelDialog({
     ? activeRuntimeSnapshot.id
     : authType
       ? `${authType}::${preferredModelId}`
-      : '';
+      : "";
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onClose();
       }
     },
@@ -272,9 +248,7 @@ export function ModelDialog({
   );
 
   const initialIndex = useMemo(() => {
-    const index = MODEL_OPTIONS.findIndex(
-      (option) => option.value === preferredKey,
-    );
+    const index = MODEL_OPTIONS.findIndex((option) => option.value === preferredKey);
     return index === -1 ? 0 : index;
   }, [MODEL_OPTIONS, preferredKey]);
 
@@ -284,12 +258,10 @@ export function ModelDialog({
 
   const highlightedEntry = useMemo(() => {
     const key = highlightedValue ?? preferredKey;
-    return availableModelEntries.find(
-      ({ authType: t2, model, isRuntime, snapshotId }) => {
-        const v = isRuntime && snapshotId ? snapshotId : `${t2}::${model.id}`;
-        return v === key;
-      },
-    );
+    return availableModelEntries.find(({ authType: t2, model, isRuntime, snapshotId }) => {
+      const v = isRuntime && snapshotId ? snapshotId : `${t2}::${model.id}`;
+      return v === key;
+    });
   }, [highlightedValue, preferredKey, availableModelEntries]);
 
   const handleSelect = useCallback(
@@ -300,20 +272,20 @@ export function ModelDialog({
       if (isFastModelMode) {
         // Extract model ID from selection key (format: "authType::modelId" or "$runtime|authType|modelId")
         let modelId: string;
-        if (selected.includes('::')) {
-          modelId = selected.split('::').slice(1).join('::');
-        } else if (selected.startsWith('$runtime|')) {
-          const parts = selected.split('|');
+        if (selected.includes("::")) {
+          modelId = selected.split("::").slice(1).join("::");
+        } else if (selected.startsWith("$runtime|")) {
+          const parts = selected.split("|");
           modelId = parts[2] ?? selected;
         } else {
           modelId = selected;
         }
         const scope = getPersistScopeForModelSelection(settings);
-        settings.setValue(scope, 'fastModel', modelId);
+        settings.setValue(scope, "fastModel", modelId);
         uiState?.historyManager.addItem(
           {
-            type: 'success',
-            text: `${t('Fast Model')}: ${modelId}`,
+            type: "success",
+            text: `${t("Fast Model")}: ${modelId}`,
           },
           Date.now(),
         );
@@ -334,7 +306,7 @@ export function ModelDialog({
       try {
         // Determine if this is a runtime model selection
         // Runtime model format: $runtime|${authType}|${modelId}
-        isRuntime = selected.startsWith('$runtime|');
+        isRuntime = selected.startsWith("$runtime|");
 
         let selectedAuthType: AuthType;
         let modelId: string;
@@ -342,19 +314,17 @@ export function ModelDialog({
         if (isRuntime) {
           // For runtime models, extract authType from the snapshot ID
           // Format: $runtime|${authType}|${modelId}
-          const parts = selected.split('|');
-          if (parts.length >= 2 && parts[0] === '$runtime') {
+          const parts = selected.split("|");
+          if (parts.length >= 2 && parts[0] === "$runtime") {
             selectedAuthType = parts[1] as AuthType;
           } else {
             selectedAuthType = authType as AuthType;
           }
           modelId = selected; // Pass the full snapshot ID to switchModel
         } else {
-          const sep = '::';
+          const sep = "::";
           const idx = selected.indexOf(sep);
-          selectedAuthType = (
-            idx >= 0 ? selected.slice(0, idx) : authType
-          ) as AuthType;
+          selectedAuthType = (idx >= 0 ? selected.slice(0, idx) : authType) as AuthType;
           modelId = idx >= 0 ? selected.slice(idx + sep.length) : selected;
         }
 
@@ -365,15 +335,13 @@ export function ModelDialog({
           logModelSlashCommand(config, event);
         }
 
-        after = config.getContentGeneratorConfig?.() as
-          | ContentGeneratorConfig
-          | undefined;
+        after = config.getContentGeneratorConfig?.() as ContentGeneratorConfig | undefined;
         effectiveAuthType = after?.authType ?? selectedAuthType ?? authType;
         effectiveModelId = after?.model ?? modelId;
       } catch (e) {
         const baseErrorMessage = e instanceof Error ? e.message : String(e);
         const errorPrefix = isRuntime
-          ? 'Failed to switch to runtime model.'
+          ? "Failed to switch to runtime model."
           : `Failed to switch model to '${effectiveModelId ?? selected}'.`;
         setErrorMessage(`${errorPrefix}\n\n${baseErrorMessage}`);
         return;
@@ -389,15 +357,7 @@ export function ModelDialog({
       });
       onClose();
     },
-    [
-      authType,
-      config,
-      onClose,
-      settings,
-      uiState,
-      setErrorMessage,
-      isFastModelMode,
-    ],
+    [authType, config, onClose, settings, uiState, setErrorMessage, isFastModelMode],
   );
 
   const hasModels = MODEL_OPTIONS.length > 0;
@@ -410,22 +370,19 @@ export function ModelDialog({
       padding={1}
       width="100%"
     >
-      <Text bold>{t('Select Model')}</Text>
+      <Text bold>{t("Select Model")}</Text>
 
       {!hasModels ? (
         <Box marginTop={1} flexDirection="column">
           <Text color={theme.status.warning}>
-            {t(
-              'No models available for the current authentication type ({{authType}}).',
-              {
-                authType: authType ? String(authType) : t('(none)'),
-              },
-            )}
+            {t("No models available for the current authentication type ({{authType}}).", {
+              authType: authType ? String(authType) : t("(none)"),
+            })}
           </Text>
           <Box marginTop={1}>
             <Text color={theme.text.secondary}>
               {t(
-                'Please configure models in settings.modelProviders or use environment variables.',
+                "Please configure models in settings.modelProviders or use environment variables.",
               )}
             </Text>
           </Box>
@@ -453,23 +410,15 @@ export function ModelDialog({
             borderColor={theme.border.default}
           />
           <DetailRow
-            label={t('Modality')}
+            label={t("Modality")}
             value={formatModalities(highlightedEntry.model.modalities)}
           />
           <DetailRow
-            label={t('Context Window')}
-            value={formatContextWindow(
-              highlightedEntry.model.contextWindowSize,
-            )}
-          />
-          <DetailRow
-            label="Base URL"
-            value={highlightedEntry.model.baseUrl ?? t('(default)')}
-          />
-          <DetailRow
-            label="API Key"
-            value={highlightedEntry.model.envKey ?? t('(not set)')}
+            label={t("Context Window")}
+            value={formatContextWindow(highlightedEntry.model.contextWindowSize)}
           />
+          <DetailRow label="Base URL" value={highlightedEntry.model.baseUrl ?? t("(default)")} />
+          <DetailRow label="API Key" value={highlightedEntry.model.envKey ?? t("(not set)")} />
         </Box>
       )}
 
@@ -483,7 +432,7 @@ export function ModelDialog({
 
       <Box marginTop={1} flexDirection="column">
         <Text color={theme.text.secondary}>
-          {t('Enter to select, ↑↓ to navigate, Esc to close')}
+          {t("Enter to select, ↑↓ to navigate, Esc to close")}
         </Text>
       </Box>
     </Box>
diff --git a/apps/airiscode-cli/src/ui/components/ModelStatsDisplay.tsx b/apps/airiscode-cli/src/ui/components/ModelStatsDisplay.tsx
index c34905981..f334c0354 100644
--- a/apps/airiscode-cli/src/ui/components/ModelStatsDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/ModelStatsDisplay.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { formatDuration } from '../utils/formatters.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import type { ModelMetrics } from "../contexts/SessionContext.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { theme } from "../semantic-colors.js";
 import {
   calculateAverageLatency,
   calculateCacheHitRate,
   calculateErrorRate,
-} from '../utils/computeStats.js';
-import type { ModelMetrics } from '../contexts/SessionContext.js';
-import { useSessionStats } from '../contexts/SessionContext.js';
-import { t } from '../../i18n/index.js';
+} from "../utils/computeStats.js";
+import { formatDuration } from "../utils/formatters.js";
 
 const METRIC_COL_WIDTH = 28;
 const MODEL_COL_WIDTH = 22;
@@ -35,10 +35,7 @@ const StatRow: React.FC<StatRowProps> = ({
 }) => (
   <Box>
     <Box width={METRIC_COL_WIDTH}>
-      <Text
-        bold={isSection}
-        color={isSection ? theme.text.primary : theme.text.link}
-      >
+      <Text bold={isSection} color={isSection ? theme.text.primary : theme.text.link}>
         {isSubtle ? `  ↳ ${title}` : title}
       </Text>
     </Box>
@@ -54,9 +51,7 @@ interface ModelStatsDisplayProps {
   width?: number;
 }
 
-export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
-  width,
-}) => {
+export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({ width }) => {
   const { stats } = useSessionStats();
   const { models } = stats.metrics;
   const activeModels = Object.entries(models).filter(
@@ -72,26 +67,19 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
         paddingX={2}
         width={width}
       >
-        <Text color={theme.text.primary}>
-          {t('No API calls have been made in this session.')}
-        </Text>
+        <Text color={theme.text.primary}>{t("No API calls have been made in this session.")}</Text>
       </Box>
     );
   }
 
   const modelNames = activeModels.map(([name]) => name);
 
-  const getModelValues = (
-    getter: (metrics: ModelMetrics) => string | React.ReactElement,
-  ) => activeModels.map(([, metrics]) => getter(metrics));
+  const getModelValues = (getter: (metrics: ModelMetrics) => string | React.ReactElement) =>
+    activeModels.map(([, metrics]) => getter(metrics));
 
-  const hasThoughts = activeModels.some(
-    ([, metrics]) => metrics.tokens.thoughts > 0,
-  );
+  const hasThoughts = activeModels.some(([, metrics]) => metrics.tokens.thoughts > 0);
   const hasTool = activeModels.some(([, metrics]) => metrics.tokens.tool > 0);
-  const hasCached = activeModels.some(
-    ([, metrics]) => metrics.tokens.cached > 0,
-  );
+  const hasCached = activeModels.some(([, metrics]) => metrics.tokens.cached > 0);
 
   return (
     <Box
@@ -103,7 +91,7 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
       width={width}
     >
       <Text bold color={theme.text.accent}>
-        {t('Model Stats For Nerds')}
+        {t("Model Stats For Nerds")}
       </Text>
       <Box height={1} />
 
@@ -111,7 +99,7 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
       <Box>
         <Box width={METRIC_COL_WIDTH}>
           <Text bold color={theme.text.primary}>
-            {t('Metric')}
+            {t("Metric")}
           </Text>
         </Box>
         {modelNames.map((name) => (
@@ -134,28 +122,24 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
       />
 
       {/* API Section */}
-      <StatRow title={t('API')} values={[]} isSection />
+      <StatRow title={t("API")} values={[]} isSection />
       <StatRow
-        title={t('Requests')}
+        title={t("Requests")}
         values={getModelValues((m) => m.api.totalRequests.toLocaleString())}
       />
       <StatRow
-        title={t('Errors')}
+        title={t("Errors")}
         values={getModelValues((m) => {
           const errorRate = calculateErrorRate(m);
           return (
-            <Text
-              color={
-                m.api.totalErrors > 0 ? theme.status.error : theme.text.primary
-              }
-            >
+            <Text color={m.api.totalErrors > 0 ? theme.status.error : theme.text.primary}>
               {m.api.totalErrors.toLocaleString()} ({errorRate.toFixed(1)}%)
             </Text>
           );
         })}
       />
       <StatRow
-        title={t('Avg Latency')}
+        title={t("Avg Latency")}
         values={getModelValues((m) => {
           const avgLatency = calculateAverageLatency(m);
           return formatDuration(avgLatency);
@@ -165,23 +149,21 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
       <Box height={1} />
 
       {/* Tokens Section */}
-      <StatRow title={t('Tokens')} values={[]} isSection />
+      <StatRow title={t("Tokens")} values={[]} isSection />
       <StatRow
-        title={t('Total')}
+        title={t("Total")}
         values={getModelValues((m) => (
-          <Text color={theme.status.warning}>
-            {m.tokens.total.toLocaleString()}
-          </Text>
+          <Text color={theme.status.warning}>{m.tokens.total.toLocaleString()}</Text>
         ))}
       />
       <StatRow
-        title={t('Prompt')}
+        title={t("Prompt")}
         isSubtle
         values={getModelValues((m) => m.tokens.prompt.toLocaleString())}
       />
       {hasCached && (
         <StatRow
-          title={t('Cached')}
+          title={t("Cached")}
           isSubtle
           values={getModelValues((m) => {
             const cacheHitRate = calculateCacheHitRate(m);
@@ -195,20 +177,20 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
       )}
       {hasThoughts && (
         <StatRow
-          title={t('Thoughts')}
+          title={t("Thoughts")}
           isSubtle
           values={getModelValues((m) => m.tokens.thoughts.toLocaleString())}
         />
       )}
       {hasTool && (
         <StatRow
-          title={t('Tool')}
+          title={t("Tool")}
           isSubtle
           values={getModelValues((m) => m.tokens.tool.toLocaleString())}
         />
       )}
       <StatRow
-        title={t('Output')}
+        title={t("Output")}
         isSubtle
         values={getModelValues((m) => m.tokens.candidates.toLocaleString())}
       />
diff --git a/apps/airiscode-cli/src/ui/components/Notifications.tsx b/apps/airiscode-cli/src/ui/components/Notifications.tsx
index 59dec3cf8..1c27b0ff6 100644
--- a/apps/airiscode-cli/src/ui/components/Notifications.tsx
+++ b/apps/airiscode-cli/src/ui/components/Notifications.tsx
@@ -4,20 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { useAppContext } from '../contexts/AppContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { theme } from '../semantic-colors.js';
-import { StreamingState } from '../types.js';
-import { UpdateNotification } from './UpdateNotification.js';
+import { Box, Text } from "ink";
+import { useAppContext } from "../contexts/AppContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { theme } from "../semantic-colors.js";
+import { StreamingState } from "../types.js";
+import { UpdateNotification } from "./UpdateNotification.js";
 
 export const Notifications = () => {
   const { startupWarnings } = useAppContext();
   const { initError, streamingState, updateInfo } = useUIState();
 
   const showStartupWarnings = startupWarnings.length > 0;
-  const showInitError =
-    initError && streamingState !== StreamingState.Responding;
+  const showInitError = initError && streamingState !== StreamingState.Responding;
 
   return (
     <>
@@ -38,19 +37,9 @@ export const Notifications = () => {
         </Box>
       )}
       {showInitError && (
-        <Box
-          borderStyle="round"
-          borderColor={theme.status.error}
-          paddingX={1}
-          marginBottom={1}
-        >
-          <Text color={theme.status.error}>
-            Initialization Error: {initError}
-          </Text>
-          <Text color={theme.status.error}>
-            {' '}
-            Please check API key and configuration.
-          </Text>
+        <Box borderStyle="round" borderColor={theme.status.error} paddingX={1} marginBottom={1}>
+          <Text color={theme.status.error}>Initialization Error: {initError}</Text>
+          <Text color={theme.status.error}> Please check API key and configuration.</Text>
         </Box>
       )}
     </>
diff --git a/apps/airiscode-cli/src/ui/components/PermissionsDialog.tsx b/apps/airiscode-cli/src/ui/components/PermissionsDialog.tsx
index f69f2dc9e..4709a7307 100644
--- a/apps/airiscode-cli/src/ui/components/PermissionsDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/PermissionsDialog.tsx
@@ -4,33 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Box, Text } from 'ink';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as nodePath from 'node:path';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { SettingScope } from '../../config/settings.js';
-import { TextInput } from './shared/TextInput.js';
-import { Colors } from '../colors.js';
-import { t } from '../../i18n/index.js';
-import type {
-  PermissionManager,
-  RuleWithSource,
-  RuleType,
-} from '@airiscode/core';
-import { isPathWithinRoot } from '@airiscode/core';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as nodePath from "node:path";
+import type { PermissionManager, RuleType, RuleWithSource } from "@airiscode/core";
+import { isPathWithinRoot } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { SettingScope } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
+import { Colors } from "../colors.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
+import { TextInput } from "./shared/TextInput.js";
 
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
 
-type TabId = 'allow' | 'ask' | 'deny' | 'workspace';
+type TabId = "allow" | "ask" | "deny" | "workspace";
 
 interface Tab {
   id: TabId;
@@ -40,13 +36,13 @@ interface Tab {
 
 /** Internal views for the dialog state machine. */
 type DialogView =
-  | 'rule-list' // main rule list view
-  | 'add-rule-input' // text input for new rule
-  | 'add-rule-scope' // scope selector after entering a rule
-  | 'delete-confirm' // confirm rule deletion
-  | 'ws-dir-list' // workspace directory list
-  | 'ws-add-dir-input' // text input for adding a directory
-  | 'ws-remove-confirm'; // confirm directory removal
+  | "rule-list" // main rule list view
+  | "add-rule-input" // text input for new rule
+  | "add-rule-scope" // scope selector after entering a rule
+  | "delete-confirm" // confirm rule deletion
+  | "ws-dir-list" // workspace directory list
+  | "ws-add-dir-input" // text input for adding a directory
+  | "ws-remove-confirm"; // confirm directory removal
 
 // ---------------------------------------------------------------------------
 // Scope items (matches Claude Code screenshot layout)
@@ -62,16 +58,16 @@ interface PermScopeItem {
 function getPermScopeItems(): PermScopeItem[] {
   return [
     {
-      label: t('Project settings'),
-      description: t('Checked in at .airiscode/settings.json'),
+      label: t("Project settings"),
+      description: t("Checked in at .airiscode/settings.json"),
       value: SettingScope.Workspace,
-      key: 'project',
+      key: "project",
     },
     {
-      label: t('User settings'),
-      description: t('Saved in at ~/.airiscode/settings.json'),
+      label: t("User settings"),
+      description: t("Saved in at ~/.airiscode/settings.json"),
       value: SettingScope.User,
-      key: 'user',
+      key: "user",
     },
   ];
 }
@@ -83,24 +79,24 @@ function getPermScopeItems(): PermScopeItem[] {
 function getTabs(): Tab[] {
   return [
     {
-      id: 'allow',
-      label: t('Allow'),
+      id: "allow",
+      label: t("Allow"),
       description: t("AIRIS Code won't ask before using allowed tools."),
     },
     {
-      id: 'ask',
-      label: t('Ask'),
-      description: t('AIRIS Code will ask before using these tools.'),
+      id: "ask",
+      label: t("Ask"),
+      description: t("AIRIS Code will ask before using these tools."),
     },
     {
-      id: 'deny',
-      label: t('Deny'),
-      description: t('AIRIS Code is not allowed to use denied tools.'),
+      id: "deny",
+      label: t("Deny"),
+      description: t("AIRIS Code is not allowed to use denied tools."),
     },
     {
-      id: 'workspace',
-      label: t('Workspace'),
-      description: t('Manage trusted directories for this workspace.'),
+      id: "workspace",
+      label: t("Workspace"),
+      description: t("Manage trusted directories for this workspace."),
     },
   ];
 }
@@ -111,7 +107,7 @@ function describeRule(raw: string): string {
   const toolName = match[1]!.trim();
   const specifier = match[2]?.trim();
   if (!specifier) {
-    return t('Any use of the {{tool}} tool', { tool: toolName });
+    return t("Any use of the {{tool}} tool", { tool: toolName });
   }
   return t("{{tool}} commands matching '{{pattern}}'", {
     tool: toolName,
@@ -121,12 +117,12 @@ function describeRule(raw: string): string {
 
 function scopeLabel(scope: string): string {
   switch (scope) {
-    case 'user':
-      return t('From user settings');
-    case 'workspace':
-      return t('From project settings');
-    case 'session':
-      return t('From session');
+    case "user":
+      return t("From user settings");
+    case "workspace":
+      return t("From project settings");
+    case "session":
+      return t("From session");
     default:
       return scope;
   }
@@ -144,9 +140,7 @@ interface PermissionsDialogProps {
 // Main component
 // ---------------------------------------------------------------------------
 
-export function PermissionsDialog({
-  onExit,
-}: PermissionsDialogProps): React.JSX.Element {
+export function PermissionsDialog({ onExit }: PermissionsDialogProps): React.JSX.Element {
   const config = useConfig();
   const settings = useSettings();
   const pm = config.getPermissionManager?.() as PermissionManager | null;
@@ -158,19 +152,19 @@ export function PermissionsDialog({
 
   // --- Rule list state ---
   const [allRules, setAllRules] = useState<RuleWithSource[]>([]);
-  const [searchQuery, setSearchQuery] = useState('');
+  const [searchQuery, setSearchQuery] = useState("");
   const [isSearchActive, setIsSearchActive] = useState(false);
 
   // --- Dialog view state machine ---
-  const [view, setView] = useState<DialogView>('rule-list');
-  const [newRuleInput, setNewRuleInput] = useState('');
-  const [pendingRuleText, setPendingRuleText] = useState('');
+  const [view, setView] = useState<DialogView>("rule-list");
+  const [newRuleInput, setNewRuleInput] = useState("");
+  const [pendingRuleText, setPendingRuleText] = useState("");
   const [deleteTarget, setDeleteTarget] = useState<RuleWithSource | null>(null);
 
   // --- Workspace directory state ---
   const workspaceContext = config.getWorkspaceContext();
-  const [newDirInput, setNewDirInput] = useState('');
-  const [dirInputError, setDirInputError] = useState('');
+  const [newDirInput, setNewDirInput] = useState("");
+  const [dirInputError, setDirInputError] = useState("");
   const [dirInputRemountKey, setDirInputRemountKey] = useState(0);
   const [completionIndex, setCompletionIndex] = useState(0);
   const [removeDirTarget, setRemoveDirTarget] = useState<string | null>(null);
@@ -203,22 +197,14 @@ export function PermissionsDialog({
   const dirCompletions = useMemo(() => {
     const trimmed = newDirInput.trim();
     if (!trimmed) return [];
-    const expanded = trimmed.startsWith('~')
-      ? trimmed.replace(/^~/, os.homedir())
-      : trimmed;
-    const endsWithSep =
-      expanded.endsWith('/') || expanded.endsWith(nodePath.sep);
+    const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os.homedir()) : trimmed;
+    const endsWithSep = expanded.endsWith("/") || expanded.endsWith(nodePath.sep);
     const searchDir = endsWithSep ? expanded : nodePath.dirname(expanded);
-    const prefix = endsWithSep ? '' : nodePath.basename(expanded);
+    const prefix = endsWithSep ? "" : nodePath.basename(expanded);
     try {
       return fs
         .readdirSync(searchDir, { withFileTypes: true })
-        .filter(
-          (e) =>
-            e.isDirectory() &&
-            e.name.startsWith(prefix) &&
-            !e.name.startsWith('.'),
-        )
+        .filter((e) => e.isDirectory() && e.name.startsWith(prefix) && !e.name.startsWith("."))
         .map((e) => nodePath.join(searchDir, e.name))
         .slice(0, 6);
     } catch {
@@ -229,7 +215,7 @@ export function PermissionsDialog({
   const handleDirInputChange = useCallback(
     (text: string) => {
       setNewDirInput(text);
-      if (dirInputError) setDirInputError('');
+      if (dirInputError) setDirInputError("");
     },
     [dirInputError],
   );
@@ -242,16 +228,14 @@ export function PermissionsDialog({
   const handleDirTabComplete = useCallback(() => {
     const selected = dirCompletions[completionIndex] ?? dirCompletions[0];
     if (selected) {
-      setNewDirInput(selected + '/');
+      setNewDirInput(selected + "/");
       setDirInputRemountKey((k) => k + 1);
     }
   }, [dirCompletions, completionIndex]);
 
   const handleDirCompletionUp = useCallback(() => {
     if (dirCompletions.length === 0) return;
-    setCompletionIndex(
-      (prev) => (prev - 1 + dirCompletions.length) % dirCompletions.length,
-    );
+    setCompletionIndex((prev) => (prev - 1 + dirCompletions.length) % dirCompletions.length);
   }, [dirCompletions.length]);
 
   const handleDirCompletionDown = useCallback(() => {
@@ -267,9 +251,9 @@ export function PermissionsDialog({
     }> = [];
     // 'Add directory…' always FIRST
     items.push({
-      label: t('Add directory…'),
-      value: '__add_dir__',
-      key: '__add_dir__',
+      label: t("Add directory…"),
+      value: "__add_dir__",
+      key: "__add_dir__",
     });
     // Only show non-initial (runtime-added) directories in the selectable list
     for (const dir of directories) {
@@ -286,15 +270,15 @@ export function PermissionsDialog({
 
   const handleDirListSelect = useCallback(
     (value: string) => {
-      if (value === '__add_dir__') {
-        setNewDirInput('');
-        setView('ws-add-dir-input');
+      if (value === "__add_dir__") {
+        setNewDirInput("");
+        setView("ws-add-dir-input");
         return;
       }
       // Selecting a directory → offer to remove if not initial
       if (!initialDirs.has(value)) {
         setRemoveDirTarget(value);
-        setView('ws-remove-confirm');
+        setView("ws-remove-confirm");
       }
     },
     [initialDirs],
@@ -304,20 +288,16 @@ export function PermissionsDialog({
     const trimmed = newDirInput.trim();
     if (!trimmed) return;
 
-    const expanded = trimmed.startsWith('~')
-      ? trimmed.replace(/^~/, os.homedir())
-      : trimmed;
-    const absoluteExpanded = nodePath.isAbsolute(expanded)
-      ? expanded
-      : nodePath.resolve(expanded);
+    const expanded = trimmed.startsWith("~") ? trimmed.replace(/^~/, os.homedir()) : trimmed;
+    const absoluteExpanded = nodePath.isAbsolute(expanded) ? expanded : nodePath.resolve(expanded);
 
     // Existence & type checks
     if (!fs.existsSync(absoluteExpanded)) {
-      setDirInputError(t('Directory does not exist.'));
+      setDirInputError(t("Directory does not exist."));
       return;
     }
     if (!fs.statSync(absoluteExpanded).isDirectory()) {
-      setDirInputError(t('Path is not a directory.'));
+      setDirInputError(t("Path is not a directory."));
       return;
     }
 
@@ -331,7 +311,7 @@ export function PermissionsDialog({
 
     // Validate: exact duplicate
     if ((directories as string[]).includes(resolved)) {
-      setDirInputError(t('This directory is already in the workspace.'));
+      setDirInputError(t("This directory is already in the workspace."));
       return;
     }
 
@@ -339,7 +319,7 @@ export function PermissionsDialog({
     for (const existingDir of directories) {
       if (isPathWithinRoot(resolved, existingDir)) {
         setDirInputError(
-          t('Already covered by existing directory: {{dir}}', {
+          t("Already covered by existing directory: {{dir}}", {
             dir: existingDir,
           }),
         );
@@ -347,27 +327,24 @@ export function PermissionsDialog({
       }
     }
 
-    setDirInputError('');
+    setDirInputError("");
 
     // Add to workspace context (already validated)
     workspaceContext.addDirectory(resolved);
 
     // Persist directly to project (Workspace) settings
-    const key = 'context.includeDirectories';
-    const currentDirs = (settings.merged as Record<string, unknown>)[
-      'context'
-    ] as Record<string, string[]> | undefined;
-    const existingDirs = currentDirs?.['includeDirectories'] ?? [];
+    const key = "context.includeDirectories";
+    const currentDirs = (settings.merged as Record<string, unknown>)["context"] as
+      | Record<string, string[]>
+      | undefined;
+    const existingDirs = currentDirs?.["includeDirectories"] ?? [];
     if (!existingDirs.includes(resolved)) {
-      settings.setValue(SettingScope.Workspace, key, [
-        ...existingDirs,
-        resolved,
-      ]);
+      settings.setValue(SettingScope.Workspace, key, [...existingDirs, resolved]);
     }
 
     setDirRefreshKey((k) => k + 1);
-    setView('ws-dir-list');
-    setNewDirInput('');
+    setView("ws-dir-list");
+    setNewDirInput("");
   }, [newDirInput, directories, workspaceContext, settings]);
 
   const handleRemoveDirConfirm = useCallback(() => {
@@ -379,25 +356,25 @@ export function PermissionsDialog({
     // Remove from settings (try both scopes)
     for (const scope of [SettingScope.User, SettingScope.Workspace]) {
       const scopeSettings = settings.forScope(scope).settings;
-      const contextSection = (scopeSettings as Record<string, unknown>)[
-        'context'
-      ] as Record<string, string[]> | undefined;
-      const scopeDirs = contextSection?.['includeDirectories'];
+      const contextSection = (scopeSettings as Record<string, unknown>)["context"] as
+        | Record<string, string[]>
+        | undefined;
+      const scopeDirs = contextSection?.["includeDirectories"];
       if (scopeDirs?.includes(removeDirTarget)) {
         const updated = scopeDirs.filter((d: string) => d !== removeDirTarget);
-        settings.setValue(scope, 'context.includeDirectories', updated);
+        settings.setValue(scope, "context.includeDirectories", updated);
         break;
       }
     }
 
     setDirRefreshKey((k) => k + 1);
     setRemoveDirTarget(null);
-    setView('ws-dir-list');
+    setView("ws-dir-list");
   }, [removeDirTarget, workspaceContext, settings]);
 
   // Filter rules for current tab
   const currentTabRules = useMemo(() => {
-    if (activeTab.id === 'workspace') return [];
+    if (activeTab.id === "workspace") return [];
     return allRules.filter((r) => r.type === activeTab.id);
   }, [allRules, activeTab.id]);
 
@@ -406,9 +383,7 @@ export function PermissionsDialog({
     if (!searchQuery.trim()) return currentTabRules;
     const q = searchQuery.toLowerCase();
     return currentTabRules.filter(
-      (r) =>
-        r.rule.raw.toLowerCase().includes(q) ||
-        r.rule.toolName.toLowerCase().includes(q),
+      (r) => r.rule.raw.toLowerCase().includes(q) || r.rule.toolName.toLowerCase().includes(q),
     );
   }, [currentTabRules, searchQuery]);
 
@@ -420,9 +395,9 @@ export function PermissionsDialog({
       key: string;
     }> = [
       {
-        label: t('Add a new rule…'),
-        value: '__add__',
-        key: '__add__',
+        label: t("Add a new rule…"),
+        value: "__add__",
+        key: "__add__",
       },
     ];
     for (const r of filteredRules) {
@@ -441,28 +416,28 @@ export function PermissionsDialog({
     (direction: 1 | -1) => {
       const newIndex = (activeTabIndex + direction + tabs.length) % tabs.length;
       setActiveTabIndex(newIndex);
-      setSearchQuery('');
+      setSearchQuery("");
       setIsSearchActive(false);
-      setDirInputError('');
+      setDirInputError("");
       // Set the appropriate default view for each tab
       const newTab = tabs[newIndex]!;
-      setView(newTab.id === 'workspace' ? 'ws-dir-list' : 'rule-list');
+      setView(newTab.id === "workspace" ? "ws-dir-list" : "rule-list");
     },
     [activeTabIndex, tabs],
   );
 
   const handleListSelect = useCallback(
     (value: string) => {
-      if (value === '__add__') {
-        setNewRuleInput('');
-        setView('add-rule-input');
+      if (value === "__add__") {
+        setNewRuleInput("");
+        setView("add-rule-input");
         return;
       }
       // Selecting an existing rule → offer to delete
       const found = filteredRules.find((r) => r.rule.raw === value);
       if (found) {
         setDeleteTarget(found);
-        setView('delete-confirm');
+        setView("delete-confirm");
       }
     },
     [filteredRules],
@@ -472,12 +447,12 @@ export function PermissionsDialog({
     const trimmed = newRuleInput.trim();
     if (!trimmed) return;
     setPendingRuleText(trimmed);
-    setView('add-rule-scope');
+    setView("add-rule-scope");
   }, [newRuleInput]);
 
   const handleScopeSelect = useCallback(
     (scope: SettingScope) => {
-      if (!pm || activeTab.id === 'workspace') return;
+      if (!pm || activeTab.id === "workspace") return;
       const ruleType = activeTab.id as RuleType;
 
       // Add to PermissionManager in-memory
@@ -485,9 +460,9 @@ export function PermissionsDialog({
 
       // Persist to settings file (with dedup)
       const key = `permissions.${ruleType}`;
-      const perms = (settings.merged as Record<string, unknown>)[
-        'permissions'
-      ] as Record<string, string[]> | undefined;
+      const perms = (settings.merged as Record<string, unknown>)["permissions"] as
+        | Record<string, string[]>
+        | undefined;
       const currentRules = perms?.[ruleType] ?? [];
       if (!currentRules.includes(pendingRuleText)) {
         settings.setValue(scope, key, [...currentRules, pendingRuleText]);
@@ -495,8 +470,8 @@ export function PermissionsDialog({
 
       // Refresh and go back
       refreshRules();
-      setView('rule-list');
-      setPendingRuleText('');
+      setView("rule-list");
+      setPendingRuleText("");
     },
     [pm, activeTab.id, pendingRuleText, settings, refreshRules],
   );
@@ -512,14 +487,12 @@ export function PermissionsDialog({
     // We try both User and Workspace scopes
     for (const scope of [SettingScope.User, SettingScope.Workspace]) {
       const scopeSettings = settings.forScope(scope).settings;
-      const perms = (scopeSettings as Record<string, unknown>)[
-        'permissions'
-      ] as Record<string, string[]> | undefined;
+      const perms = (scopeSettings as Record<string, unknown>)["permissions"] as
+        | Record<string, string[]>
+        | undefined;
       const scopeRules = perms?.[ruleType];
       if (scopeRules?.includes(deleteTarget.rule.raw)) {
-        const updated = scopeRules.filter(
-          (r: string) => r !== deleteTarget.rule.raw,
-        );
+        const updated = scopeRules.filter((r: string) => r !== deleteTarget.rule.raw);
         settings.setValue(scope, `permissions.${ruleType}`, updated);
         break;
       }
@@ -527,33 +500,33 @@ export function PermissionsDialog({
 
     refreshRules();
     setDeleteTarget(null);
-    setView('rule-list');
+    setView("rule-list");
   }, [pm, deleteTarget, settings, refreshRules]);
 
   // --- Keypress handling ---
 
   useKeypress(
     (key) => {
-      if (view === 'rule-list') {
-        if (key.name === 'escape') {
+      if (view === "rule-list") {
+        if (key.name === "escape") {
           if (isSearchActive && searchQuery) {
-            setSearchQuery('');
+            setSearchQuery("");
             setIsSearchActive(false);
           } else {
             onExit();
           }
           return;
         }
-        if (key.name === 'tab') {
+        if (key.name === "tab") {
           handleTabCycle(1);
           return;
         }
-        if (key.name === 'right' || key.name === 'left') {
-          handleTabCycle(key.name === 'right' ? 1 : -1);
+        if (key.name === "right" || key.name === "left") {
+          handleTabCycle(key.name === "right" ? 1 : -1);
           return;
         }
         // Search input: backspace
-        if (key.name === 'backspace' || key.name === 'delete') {
+        if (key.name === "backspace" || key.name === "delete") {
           if (searchQuery.length > 0) {
             setSearchQuery((prev) => prev.slice(0, -1));
           }
@@ -565,65 +538,65 @@ export function PermissionsDialog({
           !key.ctrl &&
           !key.meta &&
           key.sequence.length === 1 &&
-          key.sequence >= ' '
+          key.sequence >= " "
         ) {
           setSearchQuery((prev) => prev + key.sequence);
           setIsSearchActive(true);
           return;
         }
       }
-      if (view === 'add-rule-input') {
-        if (key.name === 'escape') {
-          setView('rule-list');
+      if (view === "add-rule-input") {
+        if (key.name === "escape") {
+          setView("rule-list");
           return;
         }
       }
-      if (view === 'add-rule-scope') {
-        if (key.name === 'escape') {
-          setView('add-rule-input');
+      if (view === "add-rule-scope") {
+        if (key.name === "escape") {
+          setView("add-rule-input");
           return;
         }
       }
-      if (view === 'delete-confirm') {
-        if (key.name === 'escape') {
+      if (view === "delete-confirm") {
+        if (key.name === "escape") {
           setDeleteTarget(null);
-          setView('rule-list');
+          setView("rule-list");
           return;
         }
-        if (key.name === 'return') {
+        if (key.name === "return") {
           handleDeleteConfirm();
           return;
         }
       }
       // Workspace tab views
-      if (view === 'ws-dir-list') {
-        if (key.name === 'escape') {
+      if (view === "ws-dir-list") {
+        if (key.name === "escape") {
           onExit();
           return;
         }
-        if (key.name === 'tab') {
+        if (key.name === "tab") {
           handleTabCycle(1);
           return;
         }
-        if (key.name === 'right' || key.name === 'left') {
-          handleTabCycle(key.name === 'right' ? 1 : -1);
+        if (key.name === "right" || key.name === "left") {
+          handleTabCycle(key.name === "right" ? 1 : -1);
           return;
         }
       }
-      if (view === 'ws-add-dir-input') {
-        if (key.name === 'escape') {
-          setDirInputError('');
-          setView('ws-dir-list');
+      if (view === "ws-add-dir-input") {
+        if (key.name === "escape") {
+          setDirInputError("");
+          setView("ws-dir-list");
           return;
         }
       }
-      if (view === 'ws-remove-confirm') {
-        if (key.name === 'escape') {
+      if (view === "ws-remove-confirm") {
+        if (key.name === "escape") {
           setRemoveDirTarget(null);
-          setView('ws-dir-list');
+          setView("ws-dir-list");
           return;
         }
-        if (key.name === 'return') {
+        if (key.name === "return") {
           handleRemoveDirConfirm();
           return;
         }
@@ -633,20 +606,20 @@ export function PermissionsDialog({
   );
 
   // --- Workspace tab: add directory input ---
-  if (activeTab.id === 'workspace' && view === 'ws-add-dir-input') {
+  if (activeTab.id === "workspace" && view === "ws-add-dir-input") {
     return (
       <Box flexDirection="column">
         <Text bold color={theme.text.accent}>
-          {t('Add directory to workspace')}
+          {t("Add directory to workspace")}
         </Text>
         <Box height={1} />
         <Text color={theme.text.secondary} wrap="wrap">
           {t(
-            'AIRIS Code will be able to read files in this directory and make edits when auto-accept edits is on.',
+            "AIRIS Code will be able to read files in this directory and make edits when auto-accept edits is on.",
           )}
         </Text>
         <Box height={1} />
-        <Text>{t('Enter the path to the directory:')}</Text>
+        <Text>{t("Enter the path to the directory:")}</Text>
         <Box
           borderStyle="round"
           borderColor={theme.border.default}
@@ -661,10 +634,8 @@ export function PermissionsDialog({
             onSubmit={handleAddDirSubmit}
             onTab={dirCompletions.length > 0 ? handleDirTabComplete : undefined}
             onUp={dirCompletions.length > 0 ? handleDirCompletionUp : undefined}
-            onDown={
-              dirCompletions.length > 0 ? handleDirCompletionDown : undefined
-            }
-            placeholder={t('Enter directory path…')}
+            onDown={dirCompletions.length > 0 ? handleDirCompletionDown : undefined}
+            placeholder={t("Enter directory path…")}
             isActive={true}
             validationErrors={dirInputError ? [dirInputError] : []}
           />
@@ -679,9 +650,7 @@ export function PermissionsDialog({
                 <Box key={completion}>
                   <Text
                     bold={isSelected}
-                    color={
-                      isSelected ? theme.text.primary : theme.text.secondary
-                    }
+                    color={isSelected ? theme.text.primary : theme.text.secondary}
                   >
                     {`${name}/`}
                   </Text>
@@ -693,7 +662,7 @@ export function PermissionsDialog({
         )}
         <Box marginTop={1}>
           <Text color={theme.text.secondary}>
-            {t('Tab to complete · Enter to add · Esc to cancel')}
+            {t("Tab to complete · Enter to add · Esc to cancel")}
           </Text>
         </Box>
       </Box>
@@ -701,11 +670,7 @@ export function PermissionsDialog({
   }
 
   // --- Workspace tab: remove directory confirmation ---
-  if (
-    activeTab.id === 'workspace' &&
-    view === 'ws-remove-confirm' &&
-    removeDirTarget
-  ) {
+  if (activeTab.id === "workspace" && view === "ws-remove-confirm" && removeDirTarget) {
     return (
       <Box flexDirection="column">
         <Box
@@ -714,48 +679,40 @@ export function PermissionsDialog({
           flexDirection="column"
           padding={1}
         >
-          <Text bold>{t('Remove directory?')}</Text>
+          <Text bold>{t("Remove directory?")}</Text>
           <Box height={1} />
           <Box marginLeft={2} flexDirection="column">
             <Text bold>{removeDirTarget}</Text>
           </Box>
           <Box height={1} />
-          <Text>
-            {t(
-              'Are you sure you want to remove this directory from the workspace?',
-            )}
-          </Text>
+          <Text>{t("Are you sure you want to remove this directory from the workspace?")}</Text>
         </Box>
         <Box marginTop={1} marginLeft={1}>
-          <Text color={theme.text.secondary}>
-            {t('Enter to confirm · Esc to cancel')}
-          </Text>
+          <Text color={theme.text.secondary}>{t("Enter to confirm · Esc to cancel")}</Text>
         </Box>
       </Box>
     );
   }
 
   // --- Workspace tab: directory list (default) ---
-  if (activeTab.id === 'workspace') {
+  if (activeTab.id === "workspace") {
     const initialDirArray = Array.from(initialDirs);
     return (
       <Box flexDirection="column">
         <TabBar tabs={tabs} activeIndex={activeTabIndex} />
         <Text color={theme.text.secondary} wrap="wrap">
           {t(
-            'AIRIS Code can read files in the workspace, and make edits when auto-accept edits is on.',
+            "AIRIS Code can read files in the workspace, and make edits when auto-accept edits is on.",
           )}
         </Text>
         <Box height={1} />
         {/* Initial (non-removable) dirs: shown inline with dash, same visual level as list */}
         {initialDirArray.map((dir, idx) => (
           <Box key={dir} marginLeft={2}>
-            <Text color={theme.text.secondary}>{'- '}</Text>
+            <Text color={theme.text.secondary}>{"- "}</Text>
             <Text>{dir}</Text>
             <Text color={theme.text.secondary}>
-              {idx === 0
-                ? t('  (Original working directory)')
-                : t('  (from settings)')}
+              {idx === 0 ? t("  (Original working directory)") : t("  (from settings)")}
             </Text>
           </Box>
         ))}
@@ -763,7 +720,7 @@ export function PermissionsDialog({
         <RadioButtonSelect
           items={dirListItems}
           onSelect={handleDirListSelect}
-          isFocused={view === 'ws-dir-list'}
+          isFocused={view === "ws-dir-list"}
           showNumbers={true}
           showScrollArrows={false}
           maxItemsToShow={15}
@@ -775,7 +732,7 @@ export function PermissionsDialog({
 
   // --- Render views ---
 
-  if (view === 'add-rule-input') {
+  if (view === "add-rule-input") {
     return (
       <Box flexDirection="column">
         <Box
@@ -784,18 +741,15 @@ export function PermissionsDialog({
           flexDirection="column"
           padding={1}
         >
-          <Text bold>
-            {t('Add {{type}} permission rule', { type: activeTab.id })}
-          </Text>
+          <Text bold>{t("Add {{type}} permission rule", { type: activeTab.id })}</Text>
           <Box height={1} />
           <Text wrap="wrap">
             {t(
-              'Permission rules are a tool name, optionally followed by a specifier in parentheses.',
+              "Permission rules are a tool name, optionally followed by a specifier in parentheses.",
             )}
           </Text>
           <Text>
-            {t('e.g.,')} <Text bold>WebFetch</Text> {t('or')}{' '}
-            <Text bold>Bash(ls:*)</Text>
+            {t("e.g.,")} <Text bold>WebFetch</Text> {t("or")} <Text bold>Bash(ls:*)</Text>
           </Text>
           <Box height={1} />
           <Box
@@ -808,21 +762,19 @@ export function PermissionsDialog({
               value={newRuleInput}
               onChange={setNewRuleInput}
               onSubmit={handleAddRuleSubmit}
-              placeholder={t('Enter permission rule…')}
+              placeholder={t("Enter permission rule…")}
               isActive={true}
             />
           </Box>
         </Box>
         <Box marginTop={1} marginLeft={1}>
-          <Text color={theme.text.secondary}>
-            {t('Enter to submit · Esc to cancel')}
-          </Text>
+          <Text color={theme.text.secondary}>{t("Enter to submit · Esc to cancel")}</Text>
         </Box>
       </Box>
     );
   }
 
-  if (view === 'add-rule-scope') {
+  if (view === "add-rule-scope") {
     const scopeItems = getPermScopeItems();
     return (
       <Box flexDirection="column">
@@ -832,18 +784,14 @@ export function PermissionsDialog({
           flexDirection="column"
           padding={1}
         >
-          <Text bold>
-            {t('Add {{type}} permission rule', { type: activeTab.id })}
-          </Text>
+          <Text bold>{t("Add {{type}} permission rule", { type: activeTab.id })}</Text>
           <Box height={1} />
           <Box marginLeft={2} flexDirection="column">
             <Text bold>{pendingRuleText}</Text>
-            <Text color={theme.text.secondary}>
-              {describeRule(pendingRuleText)}
-            </Text>
+            <Text color={theme.text.secondary}>{describeRule(pendingRuleText)}</Text>
           </Box>
           <Box height={1} />
-          <Text>{t('Where should this rule be saved?')}</Text>
+          <Text>{t("Where should this rule be saved?")}</Text>
           <RadioButtonSelect
             items={scopeItems.map((s) => ({
               label: `${s.label}    ${s.description}`,
@@ -856,15 +804,13 @@ export function PermissionsDialog({
           />
         </Box>
         <Box marginTop={1} marginLeft={1}>
-          <Text color={theme.text.secondary}>
-            {t('Enter to confirm · Esc to cancel')}
-          </Text>
+          <Text color={theme.text.secondary}>{t("Enter to confirm · Esc to cancel")}</Text>
         </Box>
       </Box>
     );
   }
 
-  if (view === 'delete-confirm' && deleteTarget) {
+  if (view === "delete-confirm" && deleteTarget) {
     return (
       <Box flexDirection="column">
         <Box
@@ -873,28 +819,18 @@ export function PermissionsDialog({
           flexDirection="column"
           padding={1}
         >
-          <Text bold>
-            {t('Delete {{type}} rule?', { type: deleteTarget.type })}
-          </Text>
+          <Text bold>{t("Delete {{type}} rule?", { type: deleteTarget.type })}</Text>
           <Box height={1} />
           <Box marginLeft={2} flexDirection="column">
             <Text bold>{deleteTarget.rule.raw}</Text>
-            <Text color={theme.text.secondary}>
-              {describeRule(deleteTarget.rule.raw)}
-            </Text>
-            <Text color={theme.text.secondary}>
-              {scopeLabel(deleteTarget.scope)}
-            </Text>
+            <Text color={theme.text.secondary}>{describeRule(deleteTarget.rule.raw)}</Text>
+            <Text color={theme.text.secondary}>{scopeLabel(deleteTarget.scope)}</Text>
           </Box>
           <Box height={1} />
-          <Text>
-            {t('Are you sure you want to delete this permission rule?')}
-          </Text>
+          <Text>{t("Are you sure you want to delete this permission rule?")}</Text>
         </Box>
         <Box marginTop={1} marginLeft={1}>
-          <Text color={theme.text.secondary}>
-            {t('Enter to confirm · Esc to cancel')}
-          </Text>
+          <Text color={theme.text.secondary}>{t("Enter to confirm · Esc to cancel")}</Text>
         </Box>
       </Box>
     );
@@ -914,19 +850,15 @@ export function PermissionsDialog({
         paddingRight={1}
         width={60}
       >
-        <Text color={theme.text.accent}>{'> '}</Text>
-        {searchQuery ? (
-          <Text>{searchQuery}</Text>
-        ) : (
-          <Text color={Colors.Gray}>{t('Search…')}</Text>
-        )}
+        <Text color={theme.text.accent}>{"> "}</Text>
+        {searchQuery ? <Text>{searchQuery}</Text> : <Text color={Colors.Gray}>{t("Search…")}</Text>}
       </Box>
       <Box height={1} />
       {/* Rule list */}
       <RadioButtonSelect
         items={listItems}
         onSelect={handleListSelect}
-        isFocused={view === 'rule-list'}
+        isFocused={view === "rule-list"}
         showNumbers={true}
         showScrollArrows={false}
         maxItemsToShow={15}
@@ -940,26 +872,16 @@ export function PermissionsDialog({
 // Sub-components
 // ---------------------------------------------------------------------------
 
-function TabBar({
-  tabs,
-  activeIndex,
-}: {
-  tabs: Tab[];
-  activeIndex: number;
-}): React.JSX.Element {
+function TabBar({ tabs, activeIndex }: { tabs: Tab[]; activeIndex: number }): React.JSX.Element {
   return (
     <Box marginBottom={1}>
       <Text color={theme.text.accent} bold>
-        {t('Permissions:')}{' '}
+        {t("Permissions:")}{" "}
       </Text>
       {tabs.map((tab, i) => (
         <Box key={tab.id} marginRight={2}>
           {i === activeIndex ? (
-            <Text
-              bold
-              backgroundColor={theme.text.accent}
-              color={theme.background.primary}
-            >
+            <Text bold backgroundColor={theme.text.accent} color={theme.background.primary}>
               {` ${tab.label} `}
             </Text>
           ) : (
@@ -967,19 +889,17 @@ function TabBar({
           )}
         </Box>
       ))}
-      <Text color={theme.text.secondary}>{t('(←/→ or tab to cycle)')}</Text>
+      <Text color={theme.text.secondary}>{t("(←/→ or tab to cycle)")}</Text>
     </Box>
   );
 }
 
 function FooterHint({ view }: { view: DialogView }): React.JSX.Element {
-  if (view !== 'rule-list' && view !== 'ws-dir-list') return <></>;
+  if (view !== "rule-list" && view !== "ws-dir-list") return <></>;
   return (
     <Box marginTop={1}>
       <Text color={theme.text.secondary}>
-        {t(
-          'Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel',
-        )}
+        {t("Press ↑↓ to navigate · Enter to select · Type to search · Esc to cancel")}
       </Text>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/PlanSummaryDisplay.tsx b/apps/airiscode-cli/src/ui/components/PlanSummaryDisplay.tsx
index 915da1033..fa02136d5 100644
--- a/apps/airiscode-cli/src/ui/components/PlanSummaryDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/PlanSummaryDisplay.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { MarkdownDisplay } from '../utils/MarkdownDisplay.js';
-import { Colors } from '../colors.js';
-import type { PlanResultDisplay } from '@airiscode/core';
+import type { PlanResultDisplay } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { Colors } from "../colors.js";
+import { MarkdownDisplay } from "../utils/MarkdownDisplay.js";
 
 interface PlanSummaryDisplayProps {
   data: PlanResultDisplay;
diff --git a/apps/airiscode-cli/src/ui/components/PluginChoicePrompt.tsx b/apps/airiscode-cli/src/ui/components/PluginChoicePrompt.tsx
index ef463bacd..d00b97ccf 100644
--- a/apps/airiscode-cli/src/ui/components/PluginChoicePrompt.tsx
+++ b/apps/airiscode-cli/src/ui/components/PluginChoicePrompt.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { useState, useCallback, useMemo } from 'react';
-import { theme } from '../semantic-colors.js';
-import { t } from '../../i18n/index.js';
-import { useKeypress, type Key } from '../hooks/useKeypress.js';
+import { Box, Text } from "ink";
+import { useCallback, useMemo, useState } from "react";
+import { t } from "../../i18n/index.js";
+import { type Key, useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 interface PluginChoice {
   name: string;
@@ -37,12 +37,12 @@ export const PluginChoicePrompt = (props: PluginChoicePromptProps) => {
     (key: Key) => {
       const { name, sequence } = key;
 
-      if (name === 'escape') {
+      if (name === "escape") {
         onCancel();
         return;
       }
 
-      if (name === 'return') {
+      if (name === "return") {
         const plugin = plugins[selectedIndex];
         if (plugin) {
           onSelect(plugin.name);
@@ -51,19 +51,19 @@ export const PluginChoicePrompt = (props: PluginChoicePromptProps) => {
       }
 
       // Navigate up
-      if (name === 'up' || sequence === 'k') {
+      if (name === "up" || sequence === "k") {
         setSelectedIndex((prev) => (prev > 0 ? prev - 1 : plugins.length - 1));
         return;
       }
 
       // Navigate down
-      if (name === 'down' || sequence === 'j') {
+      if (name === "down" || sequence === "j") {
         setSelectedIndex((prev) => (prev < plugins.length - 1 ? prev + 1 : 0));
         return;
       }
 
       // Number shortcuts (1-9)
-      const num = parseInt(sequence || '', 10);
+      const num = parseInt(sequence || "", 10);
       if (!isNaN(num) && num >= 1 && num <= plugins.length && num <= 9) {
         setSelectedIndex(num - 1);
         const plugin = plugins[num - 1];
@@ -131,28 +131,20 @@ export const PluginChoicePrompt = (props: PluginChoicePromptProps) => {
         {/* Show "more items above" indicator */}
         {hasLess && (
           <Box>
-            <Text dimColor>
-              {' '}
-              ↑ {t('{{count}} more above', { count: String(startIndex) })}
-            </Text>
+            <Text dimColor> ↑ {t("{{count}} more above", { count: String(startIndex) })}</Text>
           </Box>
         )}
 
         {visiblePlugins.map((plugin, visibleIndex) => {
           const actualIndex = startIndex + visibleIndex;
           const isSelected = actualIndex === selectedIndex;
-          const prefix = isSelected ? '❯ ' : '  ';
+          const prefix = isSelected ? "❯ " : "  ";
 
           return (
             <Box key={plugin.name} flexDirection="column">
               <Box flexDirection="row">
-                <Text color={isSelected ? theme.text.accent : undefined}>
-                  {prefix}
-                </Text>
-                <Text
-                  bold={isSelected}
-                  color={isSelected ? theme.text.accent : undefined}
-                >
+                <Text color={isSelected ? theme.text.accent : undefined}>{prefix}</Text>
+                <Text bold={isSelected} color={isSelected ? theme.text.accent : undefined}>
                   {plugin.name}
                 </Text>
               </Box>
@@ -170,9 +162,9 @@ export const PluginChoicePrompt = (props: PluginChoicePromptProps) => {
         {hasMore && (
           <Box>
             <Text dimColor>
-              {' '}
-              ↓{' '}
-              {t('{{count}} more below', {
+              {" "}
+              ↓{" "}
+              {t("{{count}} more below", {
                 count: String(plugins.length - startIndex - MAX_VISIBLE_ITEMS),
               })}
             </Text>
@@ -181,9 +173,7 @@ export const PluginChoicePrompt = (props: PluginChoicePromptProps) => {
       </Box>
 
       <Box marginTop={1} flexDirection="row" gap={2}>
-        <Text dimColor>
-          {t('Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel')}
-        </Text>
+        <Text dimColor>{t("Use ↑↓ or j/k to navigate, Enter to select, Escape to cancel")}</Text>
         {plugins.length > MAX_VISIBLE_ITEMS && (
           <Text dimColor>
             ({selectedIndex + 1}/{plugins.length})
diff --git a/apps/airiscode-cli/src/ui/components/PrepareLabel.tsx b/apps/airiscode-cli/src/ui/components/PrepareLabel.tsx
index 759e84b10..a7419bcd1 100644
--- a/apps/airiscode-cli/src/ui/components/PrepareLabel.tsx
+++ b/apps/airiscode-cli/src/ui/components/PrepareLabel.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Text } from "ink";
+import React from "react";
+import { theme } from "../semantic-colors.js";
 
 export const MAX_WIDTH = 150; // Maximum width for the text that is shown
 
@@ -36,7 +36,7 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
     const display = isExpanded
       ? label
       : label.length > MAX_WIDTH
-        ? label.slice(0, MAX_WIDTH) + '...'
+        ? label.slice(0, MAX_WIDTH) + "..."
         : label;
     return (
       <Text wrap="wrap" color={textColor}>
@@ -46,9 +46,9 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
   }
 
   const matchLength = userInput.length;
-  let before = '';
-  let match = '';
-  let after = '';
+  let before = "";
+  let match = "";
+  let after = "";
 
   // Case 1: Show the full string if it's expanded or already fits
   if (isExpanded || label.length <= MAX_WIDTH) {
@@ -58,7 +58,7 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
   }
   // Case 2: The match itself is too long, so we only show a truncated portion of the match
   else if (matchLength >= MAX_WIDTH) {
-    match = label.slice(matchedIndex, matchedIndex + MAX_WIDTH - 1) + '...';
+    match = label.slice(matchedIndex, matchedIndex + MAX_WIDTH - 1) + "...";
   }
   // Case 3: Truncate the string to create a window around the match
   else {
@@ -87,10 +87,10 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
     after = slicedLabel.slice(finalMatchIndex + matchLength);
 
     if (start > 0) {
-      before = before.length >= 3 ? '...' + before.slice(3) : '...';
+      before = before.length >= 3 ? "..." + before.slice(3) : "...";
     }
     if (end < label.length) {
-      after = after.length >= 3 ? after.slice(0, -3) + '...' : '...';
+      after = after.length >= 3 ? after.slice(0, -3) + "..." : "...";
     }
   }
 
diff --git a/apps/airiscode-cli/src/ui/components/QueuedMessageDisplay.tsx b/apps/airiscode-cli/src/ui/components/QueuedMessageDisplay.tsx
index a42e9feab..e4d107fed 100644
--- a/apps/airiscode-cli/src/ui/components/QueuedMessageDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/QueuedMessageDisplay.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
+import { Box, Text } from "ink";
 
 const MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 
@@ -12,28 +12,24 @@ export interface QueuedMessageDisplayProps {
   messageQueue: string[];
 }
 
-export const QueuedMessageDisplay = ({
-  messageQueue,
-}: QueuedMessageDisplayProps) => {
+export const QueuedMessageDisplay = ({ messageQueue }: QueuedMessageDisplayProps) => {
   if (messageQueue.length === 0) {
     return null;
   }
 
   return (
     <Box flexDirection="column" marginTop={1}>
-      {messageQueue
-        .slice(0, MAX_DISPLAYED_QUEUED_MESSAGES)
-        .map((message, index) => {
-          const preview = message.replace(/\s+/g, ' ');
+      {messageQueue.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message, index) => {
+        const preview = message.replace(/\s+/g, " ");
 
-          return (
-            <Box key={index} paddingLeft={2} width="100%">
-              <Text dimColor wrap="truncate">
-                {preview}
-              </Text>
-            </Box>
-          );
-        })}
+        return (
+          <Box key={index} paddingLeft={2} width="100%">
+            <Text dimColor wrap="truncate">
+              {preview}
+            </Text>
+          </Box>
+        );
+      })}
       {messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && (
         <Box paddingLeft={2}>
           <Text dimColor>
diff --git a/apps/airiscode-cli/src/ui/components/QuittingDisplay.tsx b/apps/airiscode-cli/src/ui/components/QuittingDisplay.tsx
index 8295f0533..507bb1b04 100644
--- a/apps/airiscode-cli/src/ui/components/QuittingDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/QuittingDisplay.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { HistoryItemDisplay } from './HistoryItemDisplay.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box } from "ink";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { HistoryItemDisplay } from "./HistoryItemDisplay.js";
 
 export const QuittingDisplay = () => {
   const uiState = useUIState();
@@ -25,9 +25,7 @@ export const QuittingDisplay = () => {
       {uiState.quittingMessages.map((item) => (
         <HistoryItemDisplay
           key={item.id}
-          availableTerminalHeight={
-            uiState.constrainHeight ? availableTerminalHeight : undefined
-          }
+          availableTerminalHeight={uiState.constrainHeight ? availableTerminalHeight : undefined}
           terminalWidth={terminalWidth}
           mainAreaWidth={mainAreaWidth}
           item={item}
diff --git a/apps/airiscode-cli/src/ui/components/SessionPicker.tsx b/apps/airiscode-cli/src/ui/components/SessionPicker.tsx
index d8919b589..bdd218ec1 100644
--- a/apps/airiscode-cli/src/ui/components/SessionPicker.tsx
+++ b/apps/airiscode-cli/src/ui/components/SessionPicker.tsx
@@ -4,20 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type {
-  SessionListItem as SessionData,
-  SessionService,
-} from '@airiscode/core';
-import { theme } from '../semantic-colors.js';
-import { useSessionPicker } from '../hooks/useSessionPicker.js';
-import { formatRelativeTime } from '../utils/formatters.js';
-import {
-  formatMessageCount,
-  truncateText,
-} from '../utils/sessionPickerUtils.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { t } from '../../i18n/index.js';
+import type { SessionListItem as SessionData, SessionService } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../i18n/index.js";
+import { useSessionPicker } from "../hooks/useSessionPicker.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
+import { formatRelativeTime } from "../utils/formatters.js";
+import { formatMessageCount, truncateText } from "../utils/sessionPickerUtils.js";
 
 export interface SessionPickerProps {
   sessionService: SessionService | null;
@@ -33,10 +27,10 @@ export interface SessionPickerProps {
 }
 
 const PREFIX_CHARS = {
-  selected: '› ',
-  scrollUp: '↑ ',
-  scrollDown: '↓ ',
-  normal: '  ',
+  selected: "› ",
+  scrollUp: "↑ ",
+  scrollDown: "↓ ",
+  normal: "  ",
 };
 
 interface SessionListItemViewProps {
@@ -81,7 +75,7 @@ function SessionListItemView({
         ? prefixChars.scrollDown
         : prefixChars.normal;
 
-  const promptText = session.prompt || '(empty prompt)';
+  const promptText = session.prompt || "(empty prompt)";
   const truncatedPrompt = truncateText(promptText, maxPromptWidth);
 
   return (
@@ -99,10 +93,7 @@ function SessionListItemView({
         >
           {prefix}
         </Text>
-        <Text
-          color={isSelected ? theme.text.accent : theme.text.primary}
-          bold={isSelected}
-        >
+        <Text color={isSelected ? theme.text.accent : theme.text.primary} bold={isSelected}>
           {truncatedPrompt}
         </Text>
       </Box>
@@ -117,13 +108,7 @@ function SessionListItemView({
 }
 
 export function SessionPicker(props: SessionPickerProps) {
-  const {
-    sessionService,
-    onSelect,
-    onCancel,
-    currentBranch,
-    centerSelection = true,
-  } = props;
+  const { sessionService, onSelect, onCancel, currentBranch, centerSelection = true } = props;
 
   const { columns: width, rows: height } = useTerminalSize();
 
@@ -134,10 +119,7 @@ export function SessionPicker(props: SessionPickerProps) {
   const reservedLines = 6;
   // Each item takes 2 lines (prompt + metadata) + 1 line margin between items
   const itemHeight = 3;
-  const maxVisibleItems = Math.max(
-    1,
-    Math.floor((height - reservedLines) / itemHeight),
-  );
+  const maxVisibleItems = Math.max(1, Math.floor((height - reservedLines) / itemHeight));
 
   const picker = useSessionPicker({
     sessionService,
@@ -150,12 +132,7 @@ export function SessionPicker(props: SessionPickerProps) {
   });
 
   return (
-    <Box
-      flexDirection="column"
-      width={boxWidth}
-      height={height - 1}
-      overflow="hidden"
-    >
+    <Box flexDirection="column" width={boxWidth} height={height - 1} overflow="hidden">
       <Box
         flexDirection="column"
         borderStyle="round"
@@ -167,37 +144,35 @@ export function SessionPicker(props: SessionPickerProps) {
         {/* Header row */}
         <Box paddingX={1}>
           <Text bold color={theme.text.primary}>
-            {t('Resume Session')}
+            {t("Resume Session")}
           </Text>
           {picker.filterByBranch && currentBranch && (
             <Text color={theme.text.secondary}>
-              {' '}
-              {t('(branch: {{branch}})', { branch: currentBranch })}
+              {" "}
+              {t("(branch: {{branch}})", { branch: currentBranch })}
             </Text>
           )}
         </Box>
 
         {/* Separator */}
         <Box>
-          <Text color={theme.border.default}>{'─'.repeat(boxWidth - 2)}</Text>
+          <Text color={theme.border.default}>{"─".repeat(boxWidth - 2)}</Text>
         </Box>
 
         {/* Session list */}
         <Box flexDirection="column" flexGrow={1} paddingX={1} overflow="hidden">
           {!sessionService || picker.isLoading ? (
             <Box paddingY={1} justifyContent="center">
-              <Text color={theme.text.secondary}>
-                {t('Loading sessions...')}
-              </Text>
+              <Text color={theme.text.secondary}>{t("Loading sessions...")}</Text>
             </Box>
           ) : picker.filteredSessions.length === 0 ? (
             <Box paddingY={1} justifyContent="center">
               <Text color={theme.text.secondary}>
                 {picker.filterByBranch
                   ? t('No sessions found for branch "{{branch}}"', {
-                      branch: currentBranch ?? '',
+                      branch: currentBranch ?? "",
                     })
-                  : t('No sessions found')}
+                  : t("No sessions found")}
               </Text>
             </Box>
           ) : (
@@ -223,7 +198,7 @@ export function SessionPicker(props: SessionPickerProps) {
 
         {/* Separator */}
         <Box>
-          <Text color={theme.border.default}>{'─'.repeat(boxWidth - 2)}</Text>
+          <Text color={theme.border.default}>{"─".repeat(boxWidth - 2)}</Text>
         </Box>
 
         {/* Footer */}
@@ -237,12 +212,10 @@ export function SessionPicker(props: SessionPickerProps) {
                 >
                   B
                 </Text>
-                {t(' to toggle branch')} ·
+                {t(" to toggle branch")} ·
               </Text>
             )}
-            <Text color={theme.text.secondary}>
-              {t('↑↓ to navigate · Esc to cancel')}
-            </Text>
+            <Text color={theme.text.secondary}>{t("↑↓ to navigate · Esc to cancel")}</Text>
           </Box>
         </Box>
       </Box>
diff --git a/apps/airiscode-cli/src/ui/components/SessionSummaryDisplay.tsx b/apps/airiscode-cli/src/ui/components/SessionSummaryDisplay.tsx
index 064375e67..134fbb5ff 100644
--- a/apps/airiscode-cli/src/ui/components/SessionSummaryDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/SessionSummaryDisplay.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { StatsDisplay } from './StatsDisplay.js';
-import { useSessionStats } from '../contexts/SessionContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { theme } from '../semantic-colors.js';
-import { t } from '../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { theme } from "../semantic-colors.js";
+import { StatsDisplay } from "./StatsDisplay.js";
 
 interface SessionSummaryDisplayProps {
   duration: string;
@@ -31,18 +31,12 @@ export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
 
   return (
     <>
-      <StatsDisplay
-        title={t('Agent powering down. Goodbye!')}
-        duration={duration}
-        width={width}
-      />
+      <StatsDisplay title={t("Agent powering down. Goodbye!")} duration={duration} width={width} />
       {hasMessages && canResume && (
         <Box marginTop={1}>
           <Text color={theme.text.secondary}>
-            {t('To continue this session, run')}{' '}
-            <Text color={theme.text.accent}>
-              airiscode --resume {stats.sessionId}
-            </Text>
+            {t("To continue this session, run")}{" "}
+            <Text color={theme.text.accent}>airiscode --resume {stats.sessionId}</Text>
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/SettingInputPrompt.tsx b/apps/airiscode-cli/src/ui/components/SettingInputPrompt.tsx
index 6f4c432ca..4cbdbde18 100644
--- a/apps/airiscode-cli/src/ui/components/SettingInputPrompt.tsx
+++ b/apps/airiscode-cli/src/ui/components/SettingInputPrompt.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { useState } from 'react';
-import { theme } from '../semantic-colors.js';
-import { TextInput } from './shared/TextInput.js';
-import { t } from '../../i18n/index.js';
-import { useKeypress, type Key } from '../hooks/useKeypress.js';
-import chalk from 'chalk';
+import chalk from "chalk";
+import { Box, Text } from "ink";
+import { useState } from "react";
+import { t } from "../../i18n/index.js";
+import { type Key, useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { TextInput } from "./shared/TextInput.js";
 
 type SettingInputPromptProps = {
   settingName: string;
@@ -38,20 +38,20 @@ const PasswordInput = ({
   useKeypress(
     (key: Key) => {
       // Handle submit
-      if (key.name === 'return') {
+      if (key.name === "return") {
         onSubmit();
         return;
       }
 
       // Handle backspace
-      if (key.name === 'backspace' || key.name === 'delete') {
+      if (key.name === "backspace" || key.name === "delete") {
         onChange(value.slice(0, -1));
         return;
       }
 
       // Handle clear (Ctrl+U)
-      if (key.ctrl && key.name === 'u') {
-        onChange('');
+      if (key.ctrl && key.name === "u") {
+        onChange("");
         return;
       }
 
@@ -67,13 +67,13 @@ const PasswordInput = ({
     { isActive: true },
   );
 
-  const maskedValue = '*'.repeat(value.length);
-  const displayValue = maskedValue || '';
-  const cursorChar = chalk.inverse(' ');
+  const maskedValue = "*".repeat(value.length);
+  const displayValue = maskedValue || "";
+  const cursorChar = chalk.inverse(" ");
 
   return (
     <Box>
-      <Text color={theme.text.accent}>{'> '}</Text>
+      <Text color={theme.text.accent}>{"> "}</Text>
       {value.length === 0 ? (
         <Text>
           {cursorChar}
@@ -90,20 +90,13 @@ const PasswordInput = ({
 };
 
 export const SettingInputPrompt = (props: SettingInputPromptProps) => {
-  const {
-    settingName,
-    settingDescription,
-    sensitive,
-    onSubmit,
-    onCancel,
-    terminalWidth,
-  } = props;
+  const { settingName, settingDescription, sensitive, onSubmit, onCancel, terminalWidth } = props;
 
-  const [value, setValue] = useState('');
+  const [value, setValue] = useState("");
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onCancel();
       }
     },
@@ -136,21 +129,21 @@ export const SettingInputPrompt = (props: SettingInputPromptProps) => {
             value={value}
             onChange={setValue}
             onSubmit={handleSubmit}
-            placeholder={t('Enter sensitive value...')}
+            placeholder={t("Enter sensitive value...")}
           />
         ) : (
           <TextInput
             value={value}
             onChange={setValue}
             onSubmit={handleSubmit}
-            placeholder={t('Enter value...')}
+            placeholder={t("Enter value...")}
             inputWidth={Math.min(terminalWidth - 10, 60)}
             isActive={true}
           />
         )}
       </Box>
       <Box marginTop={1}>
-        <Text dimColor>{t('Press Enter to submit, Escape to cancel')}</Text>
+        <Text dimColor>{t("Press Enter to submit, Escape to cancel")}</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/SettingsDialog.tsx b/apps/airiscode-cli/src/ui/components/SettingsDialog.tsx
index d66358bcc..17c1d34aa 100644
--- a/apps/airiscode-cli/src/ui/components/SettingsDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/SettingsDialog.tsx
@@ -4,39 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import type { LoadedSettings, Settings } from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import { getScopeMessageForSetting } from '../../utils/dialogScopeUtils.js';
-import { ScopeSelector } from './shared/ScopeSelector.js';
-import { t } from '../../i18n/index.js';
+import { type Config, createDebugLogger } from "@airiscode/core";
+import chalk from "chalk";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import type { LoadedSettings, Settings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { type SettingsValue, TOGGLE_TYPES } from "../../config/settingsSchema.js";
+import { t } from "../../i18n/index.js";
+import { getScopeMessageForSetting } from "../../utils/dialogScopeUtils.js";
+import { updateOutputLanguageFile } from "../../utils/languageUtils.js";
 import {
+  getDefaultValue,
   getDialogSettingKeys,
-  setPendingSettingValue,
   getDisplayValue,
-  saveModifiedSettings,
+  getEffectiveValue,
+  getNestedValue,
+  getRestartRequiredFromModified,
   getSettingDefinition,
   isDefaultValue,
   requiresRestart,
-  getRestartRequiredFromModified,
-  getDefaultValue,
+  saveModifiedSettings,
+  setPendingSettingValue,
   setPendingSettingValueAny,
-  getNestedValue,
-  getEffectiveValue,
-} from '../../utils/settingsUtils.js';
-import { updateOutputLanguageFile } from '../../utils/languageUtils.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
-import { createDebugLogger, type Config } from '@airiscode/core';
-import { useKeypress } from '../hooks/useKeypress.js';
-import chalk from 'chalk';
-import { cpSlice, cpLen, stripUnsafeCharacters } from '../utils/textUtils.js';
-import {
-  type SettingsValue,
-  TOGGLE_TYPES,
-} from '../../config/settingsSchema.js';
+} from "../../utils/settingsUtils.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { cpLen, cpSlice, stripUnsafeCharacters } from "../utils/textUtils.js";
+import { ScopeSelector } from "./shared/ScopeSelector.js";
 
 interface SettingsDialogProps {
   settings: LoadedSettings;
@@ -46,7 +43,7 @@ interface SettingsDialogProps {
   config?: Config;
 }
 
-const debugLogger = createDebugLogger('SETTINGS_DIALOG');
+const debugLogger = createDebugLogger("SETTINGS_DIALOG");
 
 const maxItemsToShow = 8;
 
@@ -61,11 +58,9 @@ export function SettingsDialog({
   const { vimEnabled, toggleVimEnabled } = useVimMode();
 
   // Mode state: 'settings' or 'scope' (view switching like ThemeDialog)
-  const [mode, setMode] = useState<'settings' | 'scope'>('settings');
+  const [mode, setMode] = useState<"settings" | "scope">("settings");
   // Scope selector state (User by default)
-  const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
-  );
+  const [selectedScope, setSelectedScope] = useState<SettingScope>(SettingScope.User);
   // Active indices
   const [activeSettingIndex, setActiveSettingIndex] = useState(0);
   // Scroll offset for settings
@@ -78,20 +73,16 @@ export function SettingsDialog({
   );
 
   // Track which settings have been modified by the user
-  const [modifiedSettings, setModifiedSettings] = useState<Set<string>>(
-    new Set(),
-  );
+  const [modifiedSettings, setModifiedSettings] = useState<Set<string>>(new Set());
 
   // Preserve pending changes across scope switches
   type PendingValue = boolean | number | string;
-  const [globalPendingChanges, setGlobalPendingChanges] = useState<
-    Map<string, PendingValue>
-  >(new Map());
+  const [globalPendingChanges, setGlobalPendingChanges] = useState<Map<string, PendingValue>>(
+    new Map(),
+  );
 
   // Track restart-required settings across scope changes
-  const [restartRequiredSettings, setRestartRequiredSettings] = useState<
-    Set<string>
-  >(new Set());
+  const [restartRequiredSettings, setRestartRequiredSettings] = useState<Set<string>>(new Set());
 
   const showRestartPrompt = restartRequiredSettings.size > 0;
 
@@ -102,13 +93,12 @@ export function SettingsDialog({
     const newModified = new Set<string>();
     for (const [key, value] of globalPendingChanges.entries()) {
       const def = getSettingDefinition(key);
-      if (def?.type === 'boolean' && typeof value === 'boolean') {
+      if (def?.type === "boolean" && typeof value === "boolean") {
         updated = setPendingSettingValue(key, value, updated);
       } else if (
-        (def?.type === 'number' && typeof value === 'number') ||
-        (def?.type === 'string' && typeof value === 'string') ||
-        (def?.type === 'enum' &&
-          (typeof value === 'string' || typeof value === 'number'))
+        (def?.type === "number" && typeof value === "number") ||
+        (def?.type === "string" && typeof value === "string") ||
+        (def?.type === "enum" && (typeof value === "string" || typeof value === "number"))
       ) {
         updated = setPendingSettingValueAny(key, value, updated);
       }
@@ -125,9 +115,7 @@ export function SettingsDialog({
       const definition = getSettingDefinition(key);
 
       return {
-        label: definition?.label
-          ? t(definition.label) || definition.label
-          : key,
+        label: definition?.label ? t(definition.label) || definition.label : key,
         value: key,
         type: definition?.type,
         toggle: () => {
@@ -136,24 +124,18 @@ export function SettingsDialog({
           }
           const currentValue = getEffectiveValue(key, pendingSettings, {});
           let newValue: SettingsValue;
-          if (definition?.type === 'boolean') {
+          if (definition?.type === "boolean") {
             newValue = !(currentValue as boolean);
-            setPendingSettings((prev) =>
-              setPendingSettingValue(key, newValue as boolean, prev),
-            );
-          } else if (definition?.type === 'enum' && definition.options) {
+            setPendingSettings((prev) => setPendingSettingValue(key, newValue as boolean, prev));
+          } else if (definition?.type === "enum" && definition.options) {
             const options = definition.options;
-            const currentIndex = options?.findIndex(
-              (opt) => opt.value === currentValue,
-            );
+            const currentIndex = options?.findIndex((opt) => opt.value === currentValue);
             if (currentIndex !== -1 && currentIndex < options.length - 1) {
               newValue = options[currentIndex + 1].value;
             } else {
               newValue = options[0].value; // loop back to start.
             }
-            setPendingSettings((prev) =>
-              setPendingSettingValueAny(key, newValue, prev),
-            );
+            setPendingSettings((prev) => setPendingSettingValueAny(key, newValue, prev));
           }
 
           if (!requiresRestart(key)) {
@@ -176,25 +158,19 @@ export function SettingsDialog({
             );
 
             // Special handling for vim mode to sync with VimModeContext
-            if (key === 'general.vimMode' && newValue !== vimEnabled) {
+            if (key === "general.vimMode" && newValue !== vimEnabled) {
               // Call toggleVimEnabled to sync the VimModeContext local state
               toggleVimEnabled().catch((error) => {
-                debugLogger.error('Failed to toggle vim mode:', error);
+                debugLogger.error("Failed to toggle vim mode:", error);
               });
             }
 
             // Special handling for approval mode to apply to current session
-            if (
-              key === 'tools.approvalMode' &&
-              settings.merged.tools?.approvalMode
-            ) {
+            if (key === "tools.approvalMode" && settings.merged.tools?.approvalMode) {
               try {
                 config?.setApprovalMode(settings.merged.tools.approvalMode);
               } catch (error) {
-                debugLogger.error(
-                  'Failed to apply approval mode to current session:',
-                  error,
-                );
+                debugLogger.error("Failed to apply approval mode to current session:", error);
               }
             }
 
@@ -221,9 +197,7 @@ export function SettingsDialog({
             });
 
             // Refresh pending settings from the saved state
-            setPendingSettings(
-              structuredClone(settings.forScope(selectedScope).settings),
-            );
+            setPendingSettings(structuredClone(settings.forScope(selectedScope).settings));
           } else {
             // For restart-required settings, save immediately but show restart prompt
             const immediateSettings = new Set([key]);
@@ -251,7 +225,7 @@ export function SettingsDialog({
 
   // Generic edit state
   const [editingKey, setEditingKey] = useState<string | null>(null);
-  const [editBuffer, setEditBuffer] = useState<string>('');
+  const [editBuffer, setEditBuffer] = useState<string>("");
   const [editCursorPos, setEditCursorPos] = useState<number>(0); // Cursor position within edit buffer
   const [cursorVisible, setCursorVisible] = useState<boolean>(true);
 
@@ -266,7 +240,7 @@ export function SettingsDialog({
 
   const startEditing = (key: string, initial?: string) => {
     setEditingKey(key);
-    const initialValue = initial ?? '';
+    const initialValue = initial ?? "";
     setEditBuffer(initialValue);
     setEditCursorPos(cpLen(initialValue)); // Position cursor at end of initial value
   };
@@ -275,21 +249,21 @@ export function SettingsDialog({
     const definition = getSettingDefinition(key);
     const type = definition?.type;
 
-    if (editBuffer.trim() === '' && type === 'number') {
+    if (editBuffer.trim() === "" && type === "number") {
       // Nothing entered for a number; cancel edit
       setEditingKey(null);
-      setEditBuffer('');
+      setEditBuffer("");
       setEditCursorPos(0);
       return;
     }
 
     let parsed: string | number | undefined;
-    if (type === 'number') {
+    if (type === "number") {
       const numParsed = Number(editBuffer.trim());
       if (Number.isNaN(numParsed)) {
         // Invalid number; cancel edit
         setEditingKey(null);
-        setEditBuffer('');
+        setEditBuffer("");
         setEditCursorPos(0);
         return;
       }
@@ -297,9 +271,9 @@ export function SettingsDialog({
     } else {
       // For strings, use the buffer as is.
       // Special handling for outputLanguage: empty input means 'auto'
-      if (key === 'general.outputLanguage') {
+      if (key === "general.outputLanguage") {
         const trimmed = editBuffer.trim();
-        parsed = trimmed === '' ? 'auto' : trimmed;
+        parsed = trimmed === "" ? "auto" : trimmed;
       } else {
         parsed = editBuffer;
       }
@@ -308,11 +282,7 @@ export function SettingsDialog({
     // Update pending
     setPendingSettings((prev) =>
       parsed === undefined
-        ? setPendingSettingValueAny(
-            key,
-            undefined as unknown as SettingsValue,
-            prev,
-          )
+        ? setPendingSettingValueAny(key, undefined as unknown as SettingsValue, prev)
         : setPendingSettingValueAny(key, parsed, prev),
     );
 
@@ -322,12 +292,7 @@ export function SettingsDialog({
         parsed === undefined
           ? ({} as Settings)
           : setPendingSettingValueAny(key, parsed, {} as Settings);
-      saveModifiedSettings(
-        immediateSettings,
-        immediateSettingsObject,
-        settings,
-        selectedScope,
-      );
+      saveModifiedSettings(immediateSettings, immediateSettingsObject, settings, selectedScope);
 
       // Remove from modified sets if present
       setModifiedSettings((prev) => {
@@ -355,15 +320,10 @@ export function SettingsDialog({
         parsed === undefined
           ? ({} as Settings)
           : setPendingSettingValueAny(key, parsed, {} as Settings);
-      saveModifiedSettings(
-        immediateSettings,
-        immediateSettingsObject,
-        settings,
-        selectedScope,
-      );
+      saveModifiedSettings(immediateSettings, immediateSettingsObject, settings, selectedScope);
 
       // Update output language rule file immediately (no restart needed for LLM effect)
-      if (key === 'general.outputLanguage' && typeof parsed === 'string') {
+      if (key === "general.outputLanguage" && typeof parsed === "string") {
         updateOutputLanguageFile(parsed);
       }
 
@@ -372,7 +332,7 @@ export function SettingsDialog({
     }
 
     setEditingKey(null);
-    setEditBuffer('');
+    setEditBuffer("");
     setEditCursorPos(0);
   };
 
@@ -382,7 +342,7 @@ export function SettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     handleScopeHighlight(scope);
-    setMode('settings');
+    setMode("settings");
   };
 
   // Height constraint calculations similar to ThemeDialog
@@ -392,8 +352,7 @@ export function SettingsDialog({
   const BOTTOM_HELP_TEXT_HEIGHT = 1; // Help text
   const RESTART_PROMPT_HEIGHT = showRestartPrompt ? 1 : 0;
 
-  let currentAvailableTerminalHeight =
-    availableTerminalHeight ?? Number.MAX_SAFE_INTEGER;
+  let currentAvailableTerminalHeight = availableTerminalHeight ?? Number.MAX_SAFE_INTEGER;
   currentAvailableTerminalHeight -= 2; // Top and bottom borders
 
   // Calculate fixed height (scope selection is now in a separate view, not included here)
@@ -405,10 +364,7 @@ export function SettingsDialog({
     RESTART_PROMPT_HEIGHT;
 
   // Calculate how much space we have for settings
-  const availableHeightForSettings = Math.max(
-    1,
-    currentAvailableTerminalHeight - totalFixedHeight,
-  );
+  const availableHeightForSettings = Math.max(1, currentAvailableTerminalHeight - totalFixedHeight);
 
   // Each setting item takes 1 line
   const maxVisibleItems = Math.max(1, availableHeightForSettings);
@@ -419,10 +375,7 @@ export function SettingsDialog({
     : maxItemsToShow;
 
   // Scroll logic for settings
-  const visibleItems = items.slice(
-    scrollOffset,
-    scrollOffset + effectiveMaxItemsToShow,
-  );
+  const visibleItems = items.slice(scrollOffset, scrollOffset + effectiveMaxItemsToShow);
   // Show arrows if there are more items than can be displayed
   const showScrollUp = items.length > effectiveMaxItemsToShow;
   const showScrollDown = items.length > effectiveMaxItemsToShow;
@@ -430,10 +383,10 @@ export function SettingsDialog({
   useKeypress(
     (key) => {
       const { name, ctrl } = key;
-      if (name === 'tab') {
-        setMode((prev) => (prev === 'settings' ? 'scope' : 'settings'));
+      if (name === "tab") {
+        setMode((prev) => (prev === "settings" ? "scope" : "settings"));
       }
-      if (mode === 'settings') {
+      if (mode === "settings") {
         // If editing, capture input and control keys
         if (editingKey) {
           const definition = getSettingDefinition(editingKey);
@@ -441,8 +394,8 @@ export function SettingsDialog({
 
           if (key.paste && key.sequence) {
             let pasted = key.sequence;
-            if (type === 'number') {
-              pasted = key.sequence.replace(/[^0-9\-+.]/g, '');
+            if (type === "number") {
+              pasted = key.sequence.replace(/[^0-9\-+.]/g, "");
             }
             if (pasted) {
               setEditBuffer((b) => {
@@ -454,15 +407,15 @@ export function SettingsDialog({
             }
             return;
           }
-          if (name === 'backspace' || name === 'delete') {
-            if (name === 'backspace' && editCursorPos > 0) {
+          if (name === "backspace" || name === "delete") {
+            if (name === "backspace" && editCursorPos > 0) {
               setEditBuffer((b) => {
                 const before = cpSlice(b, 0, editCursorPos - 1);
                 const after = cpSlice(b, editCursorPos);
                 return before + after;
               });
               setEditCursorPos((pos) => pos - 1);
-            } else if (name === 'delete' && editCursorPos < cpLen(editBuffer)) {
+            } else if (name === "delete" && editCursorPos < cpLen(editBuffer)) {
               setEditBuffer((b) => {
                 const before = cpSlice(b, 0, editCursorPos);
                 const after = cpSlice(b, editCursorPos + 1);
@@ -472,18 +425,18 @@ export function SettingsDialog({
             }
             return;
           }
-          if (name === 'escape') {
+          if (name === "escape") {
             commitEdit(editingKey);
             return;
           }
-          if (name === 'return') {
+          if (name === "return") {
             commitEdit(editingKey);
             return;
           }
 
           let ch = key.sequence;
           let isValidChar = false;
-          if (type === 'number') {
+          if (type === "number") {
             // Allow digits, minus, plus, and dot.
             isValidChar = /[0-9\-+.]/.test(ch);
           } else {
@@ -503,49 +456,45 @@ export function SettingsDialog({
             return;
           }
           // Arrow key navigation
-          if (name === 'left') {
+          if (name === "left") {
             setEditCursorPos((pos) => Math.max(0, pos - 1));
             return;
           }
-          if (name === 'right') {
+          if (name === "right") {
             setEditCursorPos((pos) => Math.min(cpLen(editBuffer), pos + 1));
             return;
           }
           // Home and End keys
-          if (name === 'home') {
+          if (name === "home") {
             setEditCursorPos(0);
             return;
           }
-          if (name === 'end') {
+          if (name === "end") {
             setEditCursorPos(cpLen(editBuffer));
             return;
           }
           // Block other keys while editing
           return;
         }
-        if (name === 'up' || name === 'k') {
+        if (name === "up" || name === "k") {
           // If editing, commit first
           if (editingKey) {
             commitEdit(editingKey);
           }
-          const newIndex =
-            activeSettingIndex > 0 ? activeSettingIndex - 1 : items.length - 1;
+          const newIndex = activeSettingIndex > 0 ? activeSettingIndex - 1 : items.length - 1;
           setActiveSettingIndex(newIndex);
           // Adjust scroll offset for wrap-around
           if (newIndex === items.length - 1) {
-            setScrollOffset(
-              Math.max(0, items.length - effectiveMaxItemsToShow),
-            );
+            setScrollOffset(Math.max(0, items.length - effectiveMaxItemsToShow));
           } else if (newIndex < scrollOffset) {
             setScrollOffset(newIndex);
           }
-        } else if (name === 'down' || name === 'j') {
+        } else if (name === "down" || name === "j") {
           // If editing, commit first
           if (editingKey) {
             commitEdit(editingKey);
           }
-          const newIndex =
-            activeSettingIndex < items.length - 1 ? activeSettingIndex + 1 : 0;
+          const newIndex = activeSettingIndex < items.length - 1 ? activeSettingIndex + 1 : 0;
           setActiveSettingIndex(newIndex);
           // Adjust scroll offset for wrap-around
           if (newIndex === 0) {
@@ -553,64 +502,45 @@ export function SettingsDialog({
           } else if (newIndex >= scrollOffset + effectiveMaxItemsToShow) {
             setScrollOffset(newIndex - effectiveMaxItemsToShow + 1);
           }
-        } else if (name === 'return' || name === 'space') {
+        } else if (name === "return" || name === "space") {
           const currentItem = items[activeSettingIndex];
-          if (currentItem?.value === 'ui.theme') {
-            if (name === 'return') {
-              onSelect('ui.theme', selectedScope);
+          if (currentItem?.value === "ui.theme") {
+            if (name === "return") {
+              onSelect("ui.theme", selectedScope);
             }
             return;
           }
-          if (currentItem?.value === 'general.preferredEditor') {
-            if (name === 'return') {
-              onSelect('general.preferredEditor', selectedScope);
+          if (currentItem?.value === "general.preferredEditor") {
+            if (name === "return") {
+              onSelect("general.preferredEditor", selectedScope);
             }
             return;
           }
-          if (
-            currentItem?.type === 'number' ||
-            currentItem?.type === 'string'
-          ) {
+          if (currentItem?.type === "number" || currentItem?.type === "string") {
             startEditing(currentItem.value);
           } else {
             currentItem?.toggle();
           }
-        } else if (/^[0-9]$/.test(key.sequence || '') && !editingKey) {
+        } else if (/^[0-9]$/.test(key.sequence || "") && !editingKey) {
           const currentItem = items[activeSettingIndex];
-          if (currentItem?.type === 'number') {
+          if (currentItem?.type === "number") {
             startEditing(currentItem.value, key.sequence);
           }
-        } else if (ctrl && (name === 'c' || name === 'l')) {
+        } else if (ctrl && (name === "c" || name === "l")) {
           // Ctrl+C or Ctrl+L: Clear current setting and reset to default
           const currentSetting = items[activeSettingIndex];
           if (currentSetting) {
             const defaultValue = getDefaultValue(currentSetting.value);
             const defType = currentSetting.type;
-            if (defType === 'boolean') {
-              const booleanDefaultValue =
-                typeof defaultValue === 'boolean' ? defaultValue : false;
+            if (defType === "boolean") {
+              const booleanDefaultValue = typeof defaultValue === "boolean" ? defaultValue : false;
               setPendingSettings((prev) =>
-                setPendingSettingValue(
-                  currentSetting.value,
-                  booleanDefaultValue,
-                  prev,
-                ),
+                setPendingSettingValue(currentSetting.value, booleanDefaultValue, prev),
               );
-            } else if (
-              defType === 'number' ||
-              defType === 'string' ||
-              defType === 'enum'
-            ) {
-              if (
-                typeof defaultValue === 'number' ||
-                typeof defaultValue === 'string'
-              ) {
+            } else if (defType === "number" || defType === "string" || defType === "enum") {
+              if (typeof defaultValue === "number" || typeof defaultValue === "string") {
                 setPendingSettings((prev) =>
-                  setPendingSettingValueAny(
-                    currentSetting.value,
-                    defaultValue,
-                    prev,
-                  ),
+                  setPendingSettingValueAny(currentSetting.value, defaultValue, prev),
                 );
               }
             }
@@ -633,21 +563,16 @@ export function SettingsDialog({
             if (!requiresRestart(currentSetting.value)) {
               const immediateSettings = new Set([currentSetting.value]);
               const toSaveValue =
-                currentSetting.type === 'boolean'
-                  ? typeof defaultValue === 'boolean'
+                currentSetting.type === "boolean"
+                  ? typeof defaultValue === "boolean"
                     ? defaultValue
                     : false
-                  : typeof defaultValue === 'number' ||
-                      typeof defaultValue === 'string'
+                  : typeof defaultValue === "number" || typeof defaultValue === "string"
                     ? defaultValue
                     : undefined;
               const immediateSettingsObject =
                 toSaveValue !== undefined
-                  ? setPendingSettingValueAny(
-                      currentSetting.value,
-                      toSaveValue,
-                      {} as Settings,
-                    )
+                  ? setPendingSettingValueAny(currentSetting.value, toSaveValue, {} as Settings)
                   : ({} as Settings);
 
               saveModifiedSettings(
@@ -659,16 +584,13 @@ export function SettingsDialog({
 
               // Special handling for approval mode to apply to current session
               if (
-                currentSetting.value === 'tools.approvalMode' &&
+                currentSetting.value === "tools.approvalMode" &&
                 settings.merged.tools?.approvalMode
               ) {
                 try {
                   config?.setApprovalMode(settings.merged.tools.approvalMode);
                 } catch (error) {
-                  debugLogger.error(
-                    'Failed to apply approval mode to current session:',
-                    error,
-                  );
+                  debugLogger.error("Failed to apply approval mode to current session:", error);
                 }
               }
 
@@ -682,12 +604,9 @@ export function SettingsDialog({
             } else {
               // Track default reset as a pending change if restart required
               if (
-                (currentSetting.type === 'boolean' &&
-                  typeof defaultValue === 'boolean') ||
-                (currentSetting.type === 'number' &&
-                  typeof defaultValue === 'number') ||
-                (currentSetting.type === 'string' &&
-                  typeof defaultValue === 'string')
+                (currentSetting.type === "boolean" && typeof defaultValue === "boolean") ||
+                (currentSetting.type === "number" && typeof defaultValue === "number") ||
+                (currentSetting.type === "string" && typeof defaultValue === "string")
               ) {
                 setGlobalPendingChanges((prev) => {
                   const next = new Map(prev);
@@ -695,26 +614,18 @@ export function SettingsDialog({
                   return next;
                 });
               }
-              setRestartRequiredSettings((prev) =>
-                new Set(prev).add(currentSetting.value),
-              );
+              setRestartRequiredSettings((prev) => new Set(prev).add(currentSetting.value));
             }
           }
         }
       }
-      if (showRestartPrompt && name === 'r') {
+      if (showRestartPrompt && name === "r") {
         // Only save settings that require restart (non-restart settings were already saved immediately)
-        const restartRequiredSettings =
-          getRestartRequiredFromModified(modifiedSettings);
+        const restartRequiredSettings = getRestartRequiredFromModified(modifiedSettings);
         const restartRequiredSet = new Set(restartRequiredSettings);
 
         if (restartRequiredSet.size > 0) {
-          saveModifiedSettings(
-            restartRequiredSet,
-            pendingSettings,
-            settings,
-            selectedScope,
-          );
+          saveModifiedSettings(restartRequiredSet, pendingSettings, settings, selectedScope);
 
           // Remove saved keys from global pending changes
           setGlobalPendingChanges((prev) => {
@@ -730,7 +641,7 @@ export function SettingsDialog({
         setRestartRequiredSettings(new Set()); // Clear restart-required settings
         if (onRestartRequest) onRestartRequest();
       }
-      if (name === 'escape') {
+      if (name === "escape") {
         if (editingKey) {
           commitEdit(editingKey);
         } else {
@@ -749,17 +660,16 @@ export function SettingsDialog({
       padding={1}
       width="100%"
     >
-      {mode === 'settings' ? (
+      {mode === "settings" ? (
         <Box flexDirection="column" flexGrow={1}>
-          <Text bold={mode === 'settings'} wrap="truncate">
-            {mode === 'settings' ? '> ' : '  '}
-            {t('Settings')}
+          <Text bold={mode === "settings"} wrap="truncate">
+            {mode === "settings" ? "> " : "  "}
+            {t("Settings")}
           </Text>
           <Box height={1} />
           {showScrollUp && <Text color={theme.text.secondary}>▲</Text>}
           {visibleItems.map((item, idx) => {
-            const isActive =
-              mode === 'settings' && activeSettingIndex === idx + scrollOffset;
+            const isActive = mode === "settings" && activeSettingIndex === idx + scrollOffset;
 
             const scopeSettings = settings.forScope(selectedScope).settings;
             const mergedSettings = settings.merged;
@@ -770,24 +680,19 @@ export function SettingsDialog({
               if (cursorVisible && editCursorPos < cpLen(editBuffer)) {
                 // Cursor is in the middle or at start of text
                 const beforeCursor = cpSlice(editBuffer, 0, editCursorPos);
-                const atCursor = cpSlice(
-                  editBuffer,
-                  editCursorPos,
-                  editCursorPos + 1,
-                );
+                const atCursor = cpSlice(editBuffer, editCursorPos, editCursorPos + 1);
                 const afterCursor = cpSlice(editBuffer, editCursorPos + 1);
-                displayValue =
-                  beforeCursor + chalk.inverse(atCursor) + afterCursor;
+                displayValue = beforeCursor + chalk.inverse(atCursor) + afterCursor;
               } else if (cursorVisible && editCursorPos >= cpLen(editBuffer)) {
                 // Cursor is at the end - show inverted space
-                displayValue = editBuffer + chalk.inverse(' ');
+                displayValue = editBuffer + chalk.inverse(" ");
               } else {
                 // Cursor not visible
                 displayValue = editBuffer;
               }
-            } else if (item.type === 'number' || item.type === 'string') {
+            } else if (item.type === "number" || item.type === "string") {
               // For numbers/strings, get the actual current value from pending settings
-              const path = item.value.split('.');
+              const path = item.value.split(".");
               const currentValue = getNestedValue(pendingSettings, path);
 
               const defaultValue = getDefaultValue(item.value);
@@ -796,22 +701,17 @@ export function SettingsDialog({
                 displayValue = String(currentValue);
               } else {
                 displayValue =
-                  defaultValue !== undefined && defaultValue !== null
-                    ? String(defaultValue)
-                    : '';
+                  defaultValue !== undefined && defaultValue !== null ? String(defaultValue) : "";
               }
 
               // Add * if value differs from default OR if currently being modified
               const isModified = modifiedSettings.has(item.value);
               const effectiveCurrentValue =
-                currentValue !== undefined && currentValue !== null
-                  ? currentValue
-                  : defaultValue;
-              const isDifferentFromDefault =
-                effectiveCurrentValue !== defaultValue;
+                currentValue !== undefined && currentValue !== null ? currentValue : defaultValue;
+              const isDifferentFromDefault = effectiveCurrentValue !== defaultValue;
 
               if (isDifferentFromDefault || isModified) {
-                displayValue += '*';
+                displayValue += "*";
               }
             } else {
               // For booleans and other types, use existing logic
@@ -826,21 +726,13 @@ export function SettingsDialog({
             const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
 
             // Generate scope message for this setting
-            const scopeMessage = getScopeMessageForSetting(
-              item.value,
-              selectedScope,
-              settings,
-            );
+            const scopeMessage = getScopeMessageForSetting(item.value, selectedScope, settings);
 
             return (
               <Box key={item.value} flexDirection="row" alignItems="center">
                 <Box minWidth={2} flexShrink={0}>
-                  <Text
-                    color={
-                      isActive ? theme.status.success : theme.text.secondary
-                    }
-                  >
-                    {isActive ? '●' : ''}
+                  <Text color={isActive ? theme.status.success : theme.text.secondary}>
+                    {isActive ? "●" : ""}
                   </Text>
                 </Box>
                 <Box flexGrow={1} flexShrink={1}>
@@ -849,9 +741,7 @@ export function SettingsDialog({
                     wrap="truncate"
                   >
                     {item.label}
-                    {scopeMessage && (
-                      <Text color={theme.text.secondary}> {scopeMessage}</Text>
-                    )}
+                    {scopeMessage && <Text color={theme.text.secondary}> {scopeMessage}</Text>}
                   </Text>
                 </Box>
                 <Box marginLeft={1} flexShrink={0}>
@@ -877,21 +767,21 @@ export function SettingsDialog({
         <ScopeSelector
           onSelect={handleScopeSelect}
           onHighlight={handleScopeHighlight}
-          isFocused={mode === 'scope'}
+          isFocused={mode === "scope"}
           initialScope={selectedScope}
         />
       )}
       <Box marginTop={1}>
         <Text color={theme.text.secondary} wrap="truncate">
-          {mode === 'settings'
-            ? t('(Use Enter to select, Tab to configure scope)')
-            : t('(Use Enter to apply scope, Tab to go back)')}
+          {mode === "settings"
+            ? t("(Use Enter to select, Tab to configure scope)")
+            : t("(Use Enter to apply scope, Tab to go back)")}
         </Text>
       </Box>
       {showRestartPrompt && (
         <Text color={theme.status.warning}>
           {t(
-            'To see changes, AIRIS Code must be restarted. Press r to exit and apply changes now.',
+            "To see changes, AIRIS Code must be restarted. Press r to exit and apply changes now.",
           )}
         </Text>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/ShellConfirmationDialog.tsx b/apps/airiscode-cli/src/ui/components/ShellConfirmationDialog.tsx
index 7b0994822..a4d60abb3 100644
--- a/apps/airiscode-cli/src/ui/components/ShellConfirmationDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/ShellConfirmationDialog.tsx
@@ -4,36 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ToolConfirmationOutcome } from '@airiscode/core';
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { theme } from '../semantic-colors.js';
-import { RenderInline } from '../utils/InlineMarkdownRenderer.js';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { t } from '../../i18n/index.js';
+import { ToolConfirmationOutcome } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { RenderInline } from "../utils/InlineMarkdownRenderer.js";
+import type { RadioSelectItem } from "./shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export interface ShellConfirmationRequest {
   commands: string[];
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    approvedCommands?: string[],
-  ) => void;
+  onConfirm: (outcome: ToolConfirmationOutcome, approvedCommands?: string[]) => void;
 }
 
 export interface ShellConfirmationDialogProps {
   request: ShellConfirmationRequest;
 }
 
-export const ShellConfirmationDialog: React.FC<
-  ShellConfirmationDialogProps
-> = ({ request }) => {
+export const ShellConfirmationDialog: React.FC<ShellConfirmationDialogProps> = ({ request }) => {
   const { commands, onConfirm } = request;
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onConfirm(ToolConfirmationOutcome.Cancel);
       }
     },
@@ -52,24 +47,24 @@ export const ShellConfirmationDialog: React.FC<
 
   const options: Array<RadioSelectItem<ToolConfirmationOutcome>> = [
     {
-      label: t('Yes, allow once'),
+      label: t("Yes, allow once"),
       value: ToolConfirmationOutcome.ProceedOnce,
-      key: 'Yes, allow once',
+      key: "Yes, allow once",
     },
     {
-      label: t('Always allow in this project'),
+      label: t("Always allow in this project"),
       value: ToolConfirmationOutcome.ProceedAlwaysProject,
-      key: 'Always allow in this project',
+      key: "Always allow in this project",
     },
     {
-      label: t('Always allow for this user'),
+      label: t("Always allow for this user"),
       value: ToolConfirmationOutcome.ProceedAlwaysUser,
-      key: 'Always allow for this user',
+      key: "Always allow for this user",
     },
     {
-      label: t('No (esc)'),
+      label: t("No (esc)"),
       value: ToolConfirmationOutcome.Cancel,
-      key: 'No (esc)',
+      key: "No (esc)",
     },
   ];
 
@@ -84,10 +79,10 @@ export const ShellConfirmationDialog: React.FC<
     >
       <Box flexDirection="column" marginBottom={1}>
         <Text bold color={theme.text.primary}>
-          {t('Shell Command Execution')}
+          {t("Shell Command Execution")}
         </Text>
         <Text color={theme.text.primary}>
-          {t('A custom command wants to run the following shell commands:')}
+          {t("A custom command wants to run the following shell commands:")}
         </Text>
         <Box
           flexDirection="column"
@@ -105,7 +100,7 @@ export const ShellConfirmationDialog: React.FC<
       </Box>
 
       <Box marginBottom={1}>
-        <Text color={theme.text.primary}>{t('Do you want to proceed?')}</Text>
+        <Text color={theme.text.primary}>{t("Do you want to proceed?")}</Text>
       </Box>
 
       <RadioButtonSelect items={options} onSelect={handleSelect} isFocused />
diff --git a/apps/airiscode-cli/src/ui/components/ShellInputPrompt.tsx b/apps/airiscode-cli/src/ui/components/ShellInputPrompt.tsx
index c70c60e5d..5d538e680 100644
--- a/apps/airiscode-cli/src/ui/components/ShellInputPrompt.tsx
+++ b/apps/airiscode-cli/src/ui/components/ShellInputPrompt.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback } from 'react';
-import type React from 'react';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { ShellExecutionService } from '@airiscode/core';
-import { keyToAnsi, type Key } from '../hooks/keyToAnsi.js';
-import { keyMatchers, Command } from '../keyMatchers.js';
+import { ShellExecutionService } from "@airiscode/core";
+import type React from "react";
+import { useCallback } from "react";
+import { type Key, keyToAnsi } from "../hooks/keyToAnsi.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { Command, keyMatchers } from "../keyMatchers.js";
 
 export interface ShellInputPromptProps {
   activeShellPtyId: number | null;
@@ -39,12 +39,12 @@ export const ShellInputPrompt: React.FC<ShellInputPromptProps> = ({
       if (keyMatchers[Command.TOGGLE_SHELL_INPUT_FOCUS](key)) {
         return;
       }
-      if (key.ctrl && key.shift && key.name === 'up') {
+      if (key.ctrl && key.shift && key.name === "up") {
         ShellExecutionService.scrollPty(activeShellPtyId, -1);
         return;
       }
 
-      if (key.ctrl && key.shift && key.name === 'down') {
+      if (key.ctrl && key.shift && key.name === "down") {
         ShellExecutionService.scrollPty(activeShellPtyId, 1);
         return;
       }
diff --git a/apps/airiscode-cli/src/ui/components/ShellModeIndicator.tsx b/apps/airiscode-cli/src/ui/components/ShellModeIndicator.tsx
index c63843aee..9af7262dc 100644
--- a/apps/airiscode-cli/src/ui/components/ShellModeIndicator.tsx
+++ b/apps/airiscode-cli/src/ui/components/ShellModeIndicator.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Text } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 export const ShellModeIndicator: React.FC = () => (
   <Text color={theme.ui.symbol}>
diff --git a/apps/airiscode-cli/src/ui/components/ShowMoreLines.tsx b/apps/airiscode-cli/src/ui/components/ShowMoreLines.tsx
index 8823eee62..802f8352d 100644
--- a/apps/airiscode-cli/src/ui/components/ShowMoreLines.tsx
+++ b/apps/airiscode-cli/src/ui/components/ShowMoreLines.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { useOverflowState } from '../contexts/OverflowContext.js';
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import { useOverflowState } from "../contexts/OverflowContext.js";
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { theme } from "../semantic-colors.js";
+import { StreamingState } from "../types.js";
 
 interface ShowMoreLinesProps {
   constrainHeight: boolean;
diff --git a/apps/airiscode-cli/src/ui/components/StandaloneSessionPicker.tsx b/apps/airiscode-cli/src/ui/components/StandaloneSessionPicker.tsx
index 409a1e088..f9c4b610c 100644
--- a/apps/airiscode-cli/src/ui/components/StandaloneSessionPicker.tsx
+++ b/apps/airiscode-cli/src/ui/components/StandaloneSessionPicker.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState } from 'react';
-import { render, Box, useApp } from 'ink';
-import { getGitBranch, SessionService } from '@airiscode/core';
-import { KeypressProvider } from '../contexts/KeypressContext.js';
-import { SessionPicker } from './SessionPicker.js';
-import { writeStdoutLine } from '../../utils/stdioHelpers.js';
+import { getGitBranch, SessionService } from "@airiscode/core";
+import { Box, render, useApp } from "ink";
+import { useState } from "react";
+import { writeStdoutLine } from "../../utils/stdioHelpers.js";
+import { KeypressProvider } from "../contexts/KeypressContext.js";
+import { SessionPicker } from "./SessionPicker.js";
 
 interface StandalonePickerScreenProps {
   sessionService: SessionService;
@@ -58,7 +58,7 @@ function StandalonePickerScreen({
  */
 function clearScreen(): void {
   // Move cursor to home position and clear screen
-  process.stdout.write('\x1b[2J\x1b[H');
+  process.stdout.write("\x1b[2J\x1b[H");
 }
 
 /**
@@ -71,7 +71,7 @@ export async function showResumeSessionPicker(
   const sessionService = new SessionService(cwd);
   const hasSession = await sessionService.loadLastSession();
   if (!hasSession) {
-    writeStdoutLine('No sessions found. Start a new session with `qwen`.');
+    writeStdoutLine("No sessions found. Start a new session with `qwen`.");
     return undefined;
   }
 
@@ -91,8 +91,7 @@ export async function showResumeSessionPicker(
       <KeypressProvider
         kittyProtocolEnabled={false}
         pasteWorkaround={
-          process.platform === 'win32' ||
-          parseInt(process.versions.node.split('.')[0], 10) < 20
+          process.platform === "win32" || parseInt(process.versions.node.split(".")[0], 10) < 20
         }
       >
         <StandalonePickerScreen
diff --git a/apps/airiscode-cli/src/ui/components/StatsDisplay.tsx b/apps/airiscode-cli/src/ui/components/StatsDisplay.tsx
index 48ed58f18..e79806536 100644
--- a/apps/airiscode-cli/src/ui/components/StatsDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/StatsDisplay.tsx
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import Gradient from 'ink-gradient';
-import { theme } from '../semantic-colors.js';
-import { formatDuration } from '../utils/formatters.js';
-import type { ModelMetrics } from '../contexts/SessionContext.js';
-import { useSessionStats } from '../contexts/SessionContext.js';
+import { Box, Text } from "ink";
+import Gradient from "ink-gradient";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import type { ModelMetrics } from "../contexts/SessionContext.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { theme } from "../semantic-colors.js";
+import { computeSessionStats } from "../utils/computeStats.js";
 import {
   getStatusColor,
   TOOL_SUCCESS_RATE_HIGH,
   TOOL_SUCCESS_RATE_MEDIUM,
   USER_AGREEMENT_RATE_HIGH,
   USER_AGREEMENT_RATE_MEDIUM,
-} from '../utils/displayUtils.js';
-import { computeSessionStats } from '../utils/computeStats.js';
-import { t } from '../../i18n/index.js';
+} from "../utils/displayUtils.js";
+import { formatDuration } from "../utils/formatters.js";
 
 // A more flexible and powerful StatRow component
 interface StatRowProps {
@@ -86,22 +86,22 @@ const ModelUsageTable: React.FC<{
       <Box>
         <Box width={nameWidth}>
           <Text bold color={theme.text.primary}>
-            {t('Model Usage')}
+            {t("Model Usage")}
           </Text>
         </Box>
         <Box width={requestsWidth} justifyContent="flex-end">
           <Text bold color={theme.text.primary}>
-            {t('Reqs')}
+            {t("Reqs")}
           </Text>
         </Box>
         <Box width={inputTokensWidth} justifyContent="flex-end">
           <Text bold color={theme.text.primary}>
-            {t('Input Tokens')}
+            {t("Input Tokens")}
           </Text>
         </Box>
         <Box width={outputTokensWidth} justifyContent="flex-end">
           <Text bold color={theme.text.primary}>
-            {t('Output Tokens')}
+            {t("Output Tokens")}
           </Text>
         </Box>
       </Box>
@@ -120,17 +120,13 @@ const ModelUsageTable: React.FC<{
       {Object.entries(models).map(([name, modelMetrics]) => (
         <Box key={name}>
           <Box width={nameWidth}>
-            <Text color={theme.text.primary}>{name.replace('-001', '')}</Text>
+            <Text color={theme.text.primary}>{name.replace("-001", "")}</Text>
           </Box>
           <Box width={requestsWidth} justifyContent="flex-end">
-            <Text color={theme.text.primary}>
-              {modelMetrics.api.totalRequests}
-            </Text>
+            <Text color={theme.text.primary}>{modelMetrics.api.totalRequests}</Text>
           </Box>
           <Box width={inputTokensWidth} justifyContent="flex-end">
-            <Text color={theme.status.warning}>
-              {modelMetrics.tokens.prompt.toLocaleString()}
-            </Text>
+            <Text color={theme.status.warning}>{modelMetrics.tokens.prompt.toLocaleString()}</Text>
           </Box>
           <Box width={outputTokensWidth} justifyContent="flex-end">
             <Text color={theme.status.warning}>
@@ -142,14 +138,13 @@ const ModelUsageTable: React.FC<{
       {cacheEfficiency > 0 && (
         <Box flexDirection="column" marginTop={1}>
           <Text color={theme.text.primary}>
-            <Text color={theme.status.success}>{t('Savings Highlight:')}</Text>{' '}
+            <Text color={theme.status.success}>{t("Savings Highlight:")}</Text>{" "}
             {totalCachedTokens.toLocaleString()} ({cacheEfficiency.toFixed(1)}
-            %){' '}
-            {t('of input tokens were served from the cache, reducing costs.')}
+            %) {t("of input tokens were served from the cache, reducing costs.")}
           </Text>
           <Box height={1} />
           <Text color={theme.text.secondary}>
-            » {t('Tip: For a full token breakdown, run `/stats model`.')}
+            » {t("Tip: For a full token breakdown, run `/stats model`.")}
           </Text>
         </Box>
       )}
@@ -163,11 +158,7 @@ interface StatsDisplayProps {
   width?: number;
 }
 
-export const StatsDisplay: React.FC<StatsDisplayProps> = ({
-  duration,
-  title,
-  width,
-}) => {
+export const StatsDisplay: React.FC<StatsDisplayProps> = ({ duration, title, width }) => {
   const { stats } = useSessionStats();
   const { metrics } = stats;
   const { models, tools, files } = metrics;
@@ -182,10 +173,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
     yellow: USER_AGREEMENT_RATE_MEDIUM,
   };
   const successColor = getStatusColor(computed.successRate, successThresholds);
-  const agreementColor = getStatusColor(
-    computed.agreementRate,
-    agreementThresholds,
-  );
+  const agreementColor = getStatusColor(computed.agreementRate, agreementThresholds);
 
   const renderTitle = () => {
     if (title) {
@@ -203,7 +191,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
     }
     return (
       <Text bold color={theme.text.accent}>
-        {t('Session Stats')}
+        {t("Session Stats")}
       </Text>
     );
   };
@@ -220,68 +208,56 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
       {renderTitle()}
       <Box height={1} />
 
-      <Section title={t('Interaction Summary')}>
-        <StatRow title={t('Session ID:')}>
+      <Section title={t("Interaction Summary")}>
+        <StatRow title={t("Session ID:")}>
           <Text color={theme.text.primary}>{stats.sessionId}</Text>
         </StatRow>
-        <StatRow title={t('Tool Calls:')}>
+        <StatRow title={t("Tool Calls:")}>
           <Text color={theme.text.primary}>
-            {tools.totalCalls} ({' '}
-            <Text color={theme.status.success}>✓ {tools.totalSuccess}</Text>{' '}
+            {tools.totalCalls} ( <Text color={theme.status.success}>✓ {tools.totalSuccess}</Text>{" "}
             <Text color={theme.status.error}>x {tools.totalFail}</Text> )
           </Text>
         </StatRow>
-        <StatRow title={t('Success Rate:')}>
+        <StatRow title={t("Success Rate:")}>
           <Text color={successColor}>{computed.successRate.toFixed(1)}%</Text>
         </StatRow>
         {computed.totalDecisions > 0 && (
-          <StatRow title={t('User Agreement:')}>
+          <StatRow title={t("User Agreement:")}>
             <Text color={agreementColor}>
-              {computed.agreementRate.toFixed(1)}%{' '}
+              {computed.agreementRate.toFixed(1)}%{" "}
               <Text color={theme.text.secondary}>
-                ({computed.totalDecisions} {t('reviewed')})
+                ({computed.totalDecisions} {t("reviewed")})
               </Text>
             </Text>
           </StatRow>
         )}
-        {files &&
-          (files.totalLinesAdded > 0 || files.totalLinesRemoved > 0) && (
-            <StatRow title={t('Code Changes:')}>
-              <Text color={theme.text.primary}>
-                <Text color={theme.status.success}>
-                  +{files.totalLinesAdded}
-                </Text>{' '}
-                <Text color={theme.status.error}>
-                  -{files.totalLinesRemoved}
-                </Text>
-              </Text>
-            </StatRow>
-          )}
+        {files && (files.totalLinesAdded > 0 || files.totalLinesRemoved > 0) && (
+          <StatRow title={t("Code Changes:")}>
+            <Text color={theme.text.primary}>
+              <Text color={theme.status.success}>+{files.totalLinesAdded}</Text>{" "}
+              <Text color={theme.status.error}>-{files.totalLinesRemoved}</Text>
+            </Text>
+          </StatRow>
+        )}
       </Section>
 
-      <Section title={t('Performance')}>
-        <StatRow title={t('Wall Time:')}>
+      <Section title={t("Performance")}>
+        <StatRow title={t("Wall Time:")}>
           <Text color={theme.text.primary}>{duration}</Text>
         </StatRow>
-        <StatRow title={t('Agent Active:')}>
-          <Text color={theme.text.primary}>
-            {formatDuration(computed.agentActiveTime)}
-          </Text>
+        <StatRow title={t("Agent Active:")}>
+          <Text color={theme.text.primary}>{formatDuration(computed.agentActiveTime)}</Text>
         </StatRow>
-        <SubStatRow title={t('API Time:')}>
+        <SubStatRow title={t("API Time:")}>
           <Text color={theme.text.primary}>
-            {formatDuration(computed.totalApiTime)}{' '}
-            <Text color={theme.text.secondary}>
-              ({computed.apiTimePercent.toFixed(1)}%)
-            </Text>
+            {formatDuration(computed.totalApiTime)}{" "}
+            <Text color={theme.text.secondary}>({computed.apiTimePercent.toFixed(1)}%)</Text>
           </Text>
         </SubStatRow>
-        <SubStatRow title={t('Tool Time:')}>
+        <SubStatRow title={t("Tool Time:")}>
           <Text color={theme.text.primary}>
-            {formatDuration(computed.totalToolTime)}{' '}
-            <Text color={theme.text.secondary}>
-              ({computed.toolTimePercent.toFixed(1)}%)
-            </Text>
+            {formatDuration(computed.totalToolTime)}{" "}
+            <Text color={theme.text.secondary}>({computed.toolTimePercent.toFixed(1)}%)</Text>
           </Text>
         </SubStatRow>
       </Section>
diff --git a/apps/airiscode-cli/src/ui/components/SuggestionsDisplay.tsx b/apps/airiscode-cli/src/ui/components/SuggestionsDisplay.tsx
index 8b4ba9398..f1d3ac24d 100644
--- a/apps/airiscode-cli/src/ui/components/SuggestionsDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/SuggestionsDisplay.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { PrepareLabel, MAX_WIDTH } from './PrepareLabel.js';
-import { CommandKind } from '../commands/types.js';
-import { Colors } from '../colors.js';
+import { Box, Text } from "ink";
+import { Colors } from "../colors.js";
+import { CommandKind } from "../commands/types.js";
+import { theme } from "../semantic-colors.js";
+import { MAX_WIDTH, PrepareLabel } from "./PrepareLabel.js";
 export interface Suggestion {
   label: string;
   value: string;
@@ -23,7 +23,7 @@ interface SuggestionsDisplayProps {
   width: number;
   scrollOffset: number;
   userInput: string;
-  mode: 'reverse' | 'slash';
+  mode: "reverse" | "slash";
   expandedIndex?: number;
 }
 
@@ -54,20 +54,15 @@ export function SuggestionsDisplay({
 
   // Calculate the visible slice based on scrollOffset
   const startIndex = scrollOffset;
-  const endIndex = Math.min(
-    scrollOffset + MAX_SUGGESTIONS_TO_SHOW,
-    suggestions.length,
-  );
+  const endIndex = Math.min(scrollOffset + MAX_SUGGESTIONS_TO_SHOW, suggestions.length);
   const visibleSuggestions = suggestions.slice(startIndex, endIndex);
 
   const getFullLabel = (s: Suggestion) =>
-    s.label + (s.commandKind === CommandKind.MCP_PROMPT ? ' [MCP]' : '');
+    s.label + (s.commandKind === CommandKind.MCP_PROMPT ? " [MCP]" : "");
 
-  const maxLabelLength = Math.max(
-    ...suggestions.map((s) => getFullLabel(s).length),
-  );
+  const maxLabelLength = Math.max(...suggestions.map((s) => getFullLabel(s).length));
   const commandColumnWidth =
-    mode === 'slash' ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
+    mode === "slash" ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
 
   return (
     <Box flexDirection="column" width={width}>
@@ -93,7 +88,7 @@ export function SuggestionsDisplay({
         return (
           <Box key={`${suggestion.value}-${originalIndex}`} flexDirection="row">
             <Box
-              {...(mode === 'slash'
+              {...(mode === "slash"
                 ? { width: commandColumnWidth, flexShrink: 0 as const }
                 : { flexShrink: 1 as const })}
             >
@@ -114,7 +109,7 @@ export function SuggestionsDisplay({
             )}
             {isActive && isLong && (
               <Box>
-                <Text color={Colors.Gray}>{isExpanded ? ' ← ' : ' → '}</Text>
+                <Text color={Colors.Gray}>{isExpanded ? " ← " : " → "}</Text>
               </Box>
             )}
           </Box>
diff --git a/apps/airiscode-cli/src/ui/components/ThemeDialog.tsx b/apps/airiscode-cli/src/ui/components/ThemeDialog.tsx
index a2ade610b..acf5b6f92 100644
--- a/apps/airiscode-cli/src/ui/components/ThemeDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/ThemeDialog.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { themeManager, DEFAULT_THEME } from '../themes/theme-manager.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { DiffRenderer } from './messages/DiffRenderer.js';
-import { colorizeCode } from '../utils/CodeColorizer.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import { getScopeMessageForSetting } from '../../utils/dialogScopeUtils.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { ScopeSelector } from './shared/ScopeSelector.js';
-import { t } from '../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
+import { getScopeMessageForSetting } from "../../utils/dialogScopeUtils.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { DEFAULT_THEME, themeManager } from "../themes/theme-manager.js";
+import { colorizeCode } from "../utils/CodeColorizer.js";
+import { DiffRenderer } from "./messages/DiffRenderer.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
+import { ScopeSelector } from "./shared/ScopeSelector.js";
 
 interface ThemeDialogProps {
   /** Callback function when a theme is selected */
@@ -38,14 +38,12 @@ export function ThemeDialog({
   availableTerminalHeight,
   terminalWidth,
 }: ThemeDialogProps): React.JSX.Element {
-  const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
-  );
+  const [selectedScope, setSelectedScope] = useState<SettingScope>(SettingScope.User);
 
   // Track the currently highlighted theme name
-  const [highlightedThemeName, setHighlightedThemeName] = useState<
-    string | undefined
-  >(settings.merged.ui?.theme || DEFAULT_THEME.name);
+  const [highlightedThemeName, setHighlightedThemeName] = useState<string | undefined>(
+    settings.merged.ui?.theme || DEFAULT_THEME.name,
+  );
 
   // Generate theme items filtered by selected scope
   const customThemes =
@@ -54,7 +52,7 @@ export function ThemeDialog({
       : settings.merged.ui?.customThemes || {};
   const builtInThemes = themeManager
     .getAvailableThemes()
-    .filter((theme) => theme.type !== 'custom');
+    .filter((theme) => theme.type !== "custom");
   const customThemeNames = Object.keys(customThemes);
   const capitalize = (s: string) => s.charAt(0).toUpperCase() + s.slice(1);
   // Generate theme items
@@ -70,15 +68,13 @@ export function ThemeDialog({
       label: name,
       value: name,
       themeNameDisplay: name,
-      themeTypeDisplay: 'Custom',
+      themeTypeDisplay: "Custom",
       key: name,
     })),
   ];
 
   // Find the index of the selected theme, but only if it exists in the list
-  const initialThemeIndex = themeItems.findIndex(
-    (item) => item.value === highlightedThemeName,
-  );
+  const initialThemeIndex = themeItems.findIndex((item) => item.value === highlightedThemeName);
   // If not found, fall back to the first theme
   const safeInitialThemeIndex = initialThemeIndex >= 0 ? initialThemeIndex : 0;
 
@@ -105,14 +101,14 @@ export function ThemeDialog({
     [onSelect, highlightedThemeName],
   );
 
-  const [mode, setMode] = useState<'theme' | 'scope'>('theme');
+  const [mode, setMode] = useState<"theme" | "scope">("theme");
 
   useKeypress(
     (key) => {
-      if (key.name === 'tab') {
-        setMode((prev) => (prev === 'theme' ? 'scope' : 'theme'));
+      if (key.name === "tab") {
+        setMode((prev) => (prev === "theme" ? "scope" : "theme"));
       }
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onSelect(undefined, selectedScope);
       }
     },
@@ -120,11 +116,7 @@ export function ThemeDialog({
   );
 
   // Generate scope message for theme setting
-  const otherScopeModifiedMessage = getScopeMessageForSetting(
-    'ui.theme',
-    selectedScope,
-    settings,
-  );
+  const otherScopeModifiedMessage = getScopeMessageForSetting("ui.theme", selectedScope, settings);
 
   // Constants for calculating preview pane layout.
   // These values are based on the JSX structure below.
@@ -165,20 +157,12 @@ export function ThemeDialog({
   const PREVIEW_PANE_FIXED_VERTICAL_SPACE = 8;
 
   // The right column doesn't need to ever be shorter than the left column.
-  availableTerminalHeight = Math.max(
-    availableTerminalHeight,
-    totalLeftHandSideHeight,
-  );
+  availableTerminalHeight = Math.max(availableTerminalHeight, totalLeftHandSideHeight);
   const availableTerminalHeightCodeBlock =
-    availableTerminalHeight -
-    PREVIEW_PANE_FIXED_VERTICAL_SPACE -
-    (includePadding ? 2 : 0) * 2;
+    availableTerminalHeight - PREVIEW_PANE_FIXED_VERTICAL_SPACE - (includePadding ? 2 : 0) * 2;
 
   // Subtract margin between code blocks from available height.
-  const availableHeightForPanes = Math.max(
-    0,
-    availableTerminalHeightCodeBlock - 1,
-  );
+  const availableHeightForPanes = Math.max(0, availableTerminalHeightCodeBlock - 1);
 
   // The code block is slightly longer than the diff, so give it more space.
   const codeBlockHeight = Math.ceil(availableHeightForPanes * 0.6);
@@ -194,40 +178,36 @@ export function ThemeDialog({
       paddingRight={1}
       width="100%"
     >
-      {mode === 'theme' ? (
+      {mode === "theme" ? (
         <Box flexDirection="row">
           {/* Left Column: Selection */}
           <Box flexDirection="column" width="45%" paddingRight={2}>
-            <Text bold={mode === 'theme'} wrap="truncate">
-              {mode === 'theme' ? '> ' : '  '}
-              {t('Select Theme')}{' '}
-              <Text color={theme.text.secondary}>
-                {otherScopeModifiedMessage}
-              </Text>
+            <Text bold={mode === "theme"} wrap="truncate">
+              {mode === "theme" ? "> " : "  "}
+              {t("Select Theme")}{" "}
+              <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
             </Text>
             <RadioButtonSelect
               items={themeItems}
               initialIndex={safeInitialThemeIndex}
               onSelect={handleThemeSelect}
               onHighlight={handleThemeHighlight}
-              isFocused={mode === 'theme'}
+              isFocused={mode === "theme"}
               maxItemsToShow={12}
               showScrollArrows={true}
-              showNumbers={mode === 'theme'}
+              showNumbers={mode === "theme"}
             />
           </Box>
 
           {/* Right Column: Preview */}
           <Box flexDirection="column" width="55%" paddingLeft={2}>
             <Text bold color={theme.text.primary}>
-              {t('Preview')}
+              {t("Preview")}
             </Text>
             {/* Get the Theme object for the highlighted theme, fall back to default if not found */}
             {(() => {
               const previewTheme =
-                themeManager.getTheme(
-                  highlightedThemeName || DEFAULT_THEME.name,
-                ) || DEFAULT_THEME;
+                themeManager.getTheme(highlightedThemeName || DEFAULT_THEME.name) || DEFAULT_THEME;
               return (
                 <Box
                   borderStyle="single"
@@ -245,7 +225,7 @@ def fibonacci(n):
     for _ in range(n):
         a, b = b, a + b
     return a`,
-                    'python',
+                    "python",
                     codeBlockHeight,
                     colorizeCodeWidth,
                   )}
@@ -271,15 +251,15 @@ def fibonacci(n):
         <ScopeSelector
           onSelect={handleScopeSelect}
           onHighlight={handleScopeHighlight}
-          isFocused={mode === 'scope'}
+          isFocused={mode === "scope"}
           initialScope={selectedScope}
         />
       )}
       <Box marginTop={1}>
         <Text color={theme.text.secondary} wrap="truncate">
-          {mode === 'theme'
-            ? t('(Use Enter to select, Tab to configure scope)')
-            : t('(Use Enter to apply scope, Tab to go back)')}
+          {mode === "theme"
+            ? t("(Use Enter to select, Tab to configure scope)")
+            : t("(Use Enter to apply scope, Tab to go back)")}
         </Text>
       </Box>
     </Box>
diff --git a/apps/airiscode-cli/src/ui/components/Tips.tsx b/apps/airiscode-cli/src/ui/components/Tips.tsx
index 78cca9956..96074a659 100644
--- a/apps/airiscode-cli/src/ui/components/Tips.tsx
+++ b/apps/airiscode-cli/src/ui/components/Tips.tsx
@@ -4,36 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { t } from '../../i18n/index.js';
+import { Box, Text } from "ink";
+import { useMemo } from "react";
+import { t } from "../../i18n/index.js";
+import { theme } from "../semantic-colors.js";
 
 type Tip = string | { text: string; weight: number };
 
 const startupTips: Tip[] = [
-  'Use /compress when the conversation gets long to summarize history and free up context.',
-  'Start a fresh idea with /clear or /new; the previous session stays available in history.',
-  'Use /bug to submit issues to the maintainers when something goes off.',
-  'Switch auth type quickly with /auth.',
-  'You can run any shell commands from AIRIS Code using ! (e.g. !ls).',
-  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.',
-  'You can resume a previous conversation by running qwen --continue or airiscode --resume.',
-  process.platform === 'win32'
-    ? 'You can switch permission mode quickly with Tab or /approval-mode.'
-    : 'You can switch permission mode quickly with Shift+Tab or /approval-mode.',
+  "Use /compress when the conversation gets long to summarize history and free up context.",
+  "Start a fresh idea with /clear or /new; the previous session stays available in history.",
+  "Use /bug to submit issues to the maintainers when something goes off.",
+  "Switch auth type quickly with /auth.",
+  "You can run any shell commands from AIRIS Code using ! (e.g. !ls).",
+  "Type / to open the command popup; Tab autocompletes slash commands and saved prompts.",
+  "You can resume a previous conversation by running qwen --continue or airiscode --resume.",
+  process.platform === "win32"
+    ? "You can switch permission mode quickly with Tab or /approval-mode."
+    : "You can switch permission mode quickly with Shift+Tab or /approval-mode.",
   {
-    text: 'Try /insight to generate personalized insights from your chat history.',
+    text: "Try /insight to generate personalized insights from your chat history.",
     weight: 3,
   },
 ];
 
 function tipText(tip: Tip): string {
-  return typeof tip === 'string' ? tip : tip.text;
+  return typeof tip === "string" ? tip : tip.text;
 }
 
 function tipWeight(tip: Tip): number {
-  return typeof tip === 'string' ? 1 : tip.weight;
+  return typeof tip === "string" ? 1 : tip.weight;
 }
 
 export function selectWeightedTip(tips: Tip[]): string {
@@ -54,7 +54,7 @@ export const Tips: React.FC = () => {
   return (
     <Box marginLeft={2} marginRight={2}>
       <Text color={theme.text.secondary}>
-        {t('Tips: ')}
+        {t("Tips: ")}
         {t(selectedTip)}
       </Text>
     </Box>
diff --git a/apps/airiscode-cli/src/ui/components/TodoDisplay.tsx b/apps/airiscode-cli/src/ui/components/TodoDisplay.tsx
index f503316fc..360a954fe 100644
--- a/apps/airiscode-cli/src/ui/components/TodoDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/TodoDisplay.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { Colors } from '../colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { Colors } from "../colors.js";
 
 export interface TodoItem {
   id: string;
   content: string;
-  status: 'pending' | 'in_progress' | 'completed';
+  status: "pending" | "in_progress" | "completed";
 }
 
 interface TodoDisplayProps {
@@ -19,9 +19,9 @@ interface TodoDisplayProps {
 }
 
 const STATUS_ICONS = {
-  pending: '○',
-  in_progress: '◐',
-  completed: '●',
+  pending: "○",
+  in_progress: "◐",
+  completed: "●",
 } as const;
 
 export const TodoDisplay: React.FC<TodoDisplayProps> = ({ todos }) => {
@@ -44,8 +44,8 @@ interface TodoItemRowProps {
 
 const TodoItemRow: React.FC<TodoItemRowProps> = ({ todo }) => {
   const statusIcon = STATUS_ICONS[todo.status];
-  const isCompleted = todo.status === 'completed';
-  const isInProgress = todo.status === 'in_progress';
+  const isCompleted = todo.status === "completed";
+  const isInProgress = todo.status === "in_progress";
 
   // Use the same color for both status icon and text, like RadioButtonSelect
   const itemColor = isCompleted
diff --git a/apps/airiscode-cli/src/ui/components/ToolStatsDisplay.tsx b/apps/airiscode-cli/src/ui/components/ToolStatsDisplay.tsx
index a551c9656..4b0a351d1 100644
--- a/apps/airiscode-cli/src/ui/components/ToolStatsDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/ToolStatsDisplay.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { formatDuration } from '../utils/formatters.js';
+import type { ToolCallStats } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../i18n/index.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { theme } from "../semantic-colors.js";
 import {
   getStatusColor,
   TOOL_SUCCESS_RATE_HIGH,
   TOOL_SUCCESS_RATE_MEDIUM,
   USER_AGREEMENT_RATE_HIGH,
   USER_AGREEMENT_RATE_MEDIUM,
-} from '../utils/displayUtils.js';
-import { useSessionStats } from '../contexts/SessionContext.js';
-import type { ToolCallStats } from '@airiscode/core';
-import { t } from '../../i18n/index.js';
+} from "../utils/displayUtils.js";
+import { formatDuration } from "../utils/formatters.js";
 
 const TOOL_NAME_COL_WIDTH = 25;
 const CALLS_COL_WIDTH = 8;
@@ -57,14 +57,10 @@ interface ToolStatsDisplayProps {
   width?: number;
 }
 
-export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
-  width,
-}) => {
+export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({ width }) => {
   const { stats } = useSessionStats();
   const { tools } = stats.metrics;
-  const activeTools = Object.entries(tools.byName).filter(
-    ([, metrics]) => metrics.count > 0,
-  );
+  const activeTools = Object.entries(tools.byName).filter(([, metrics]) => metrics.count > 0);
 
   if (activeTools.length === 0) {
     return (
@@ -75,9 +71,7 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
         paddingX={2}
         width={width}
       >
-        <Text color={theme.text.primary}>
-          {t('No tool calls have been made in this session.')}
-        </Text>
+        <Text color={theme.text.primary}>{t("No tool calls have been made in this session.")}</Text>
       </Box>
     );
   }
@@ -92,10 +86,8 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
     { accept: 0, reject: 0, modify: 0 },
   );
 
-  const totalReviewed =
-    totalDecisions.accept + totalDecisions.reject + totalDecisions.modify;
-  const agreementRate =
-    totalReviewed > 0 ? (totalDecisions.accept / totalReviewed) * 100 : 0;
+  const totalReviewed = totalDecisions.accept + totalDecisions.reject + totalDecisions.modify;
+  const agreementRate = totalReviewed > 0 ? (totalDecisions.accept / totalReviewed) * 100 : 0;
   const agreementColor = getStatusColor(agreementRate, {
     green: USER_AGREEMENT_RATE_HIGH,
     yellow: USER_AGREEMENT_RATE_MEDIUM,
@@ -111,7 +103,7 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
       width={width}
     >
       <Text bold color={theme.text.accent}>
-        {t('Tool Stats For Nerds')}
+        {t("Tool Stats For Nerds")}
       </Text>
       <Box height={1} />
 
@@ -119,22 +111,22 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
       <Box>
         <Box width={TOOL_NAME_COL_WIDTH}>
           <Text bold color={theme.text.primary}>
-            {t('Tool Name')}
+            {t("Tool Name")}
           </Text>
         </Box>
         <Box width={CALLS_COL_WIDTH} justifyContent="flex-end">
           <Text bold color={theme.text.primary}>
-            {t('Calls')}
+            {t("Calls")}
           </Text>
         </Box>
         <Box width={SUCCESS_RATE_COL_WIDTH} justifyContent="flex-end">
           <Text bold color={theme.text.primary}>
-            {t('Success Rate')}
+            {t("Success Rate")}
           </Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
           <Text bold color={theme.text.primary}>
-            {t('Avg Duration')}
+            {t("Avg Duration")}
           </Text>
         </Box>
       </Box>
@@ -159,45 +151,35 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
 
       {/* User Decision Summary */}
       <Text bold color={theme.text.primary}>
-        {t('User Decision Summary')}
+        {t("User Decision Summary")}
       </Text>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
-          <Text color={theme.text.link}>
-            {t('Total Reviewed Suggestions:')}
-          </Text>
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
+          <Text color={theme.text.link}>{t("Total Reviewed Suggestions:")}</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
           <Text color={theme.text.primary}>{totalReviewed}</Text>
         </Box>
       </Box>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
-          <Text color={theme.text.primary}>{t(' » Accepted:')}</Text>
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
+          <Text color={theme.text.primary}>{t(" » Accepted:")}</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
           <Text color={theme.status.success}>{totalDecisions.accept}</Text>
         </Box>
       </Box>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
-          <Text color={theme.text.primary}>{t(' » Rejected:')}</Text>
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
+          <Text color={theme.text.primary}>{t(" » Rejected:")}</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
           <Text color={theme.status.error}>{totalDecisions.reject}</Text>
         </Box>
       </Box>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
-          <Text color={theme.text.primary}>{t(' » Modified:')}</Text>
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
+          <Text color={theme.text.primary}>{t(" » Modified:")}</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
           <Text color={theme.status.warning}>{totalDecisions.modify}</Text>
@@ -216,16 +198,12 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
       />
 
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
-          <Text color={theme.text.primary}>
-            {t(' Overall Agreement Rate:')}
-          </Text>
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
+          <Text color={theme.text.primary}>{t(" Overall Agreement Rate:")}</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
           <Text bold color={totalReviewed > 0 ? agreementColor : undefined}>
-            {totalReviewed > 0 ? `${agreementRate.toFixed(1)}%` : '--'}
+            {totalReviewed > 0 ? `${agreementRate.toFixed(1)}%` : "--"}
           </Text>
         </Box>
       </Box>
diff --git a/apps/airiscode-cli/src/ui/components/TrustDialog.tsx b/apps/airiscode-cli/src/ui/components/TrustDialog.tsx
index 5e4dbe2a0..2e974bd80 100644
--- a/apps/airiscode-cli/src/ui/components/TrustDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/TrustDialog.tsx
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { TrustLevel } from '../../config/trustedFolders.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { useTrustModify } from '../hooks/useTrustModify.js';
-import { theme } from '../semantic-colors.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { relaunchApp } from '../../utils/processUtils.js';
-import { type UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { TrustLevel } from "../../config/trustedFolders.js";
+import { relaunchApp } from "../../utils/processUtils.js";
+import { type UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { useTrustModify } from "../hooks/useTrustModify.js";
+import { theme } from "../semantic-colors.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 interface TrustDialogProps {
   onExit: () => void;
-  addItem: UseHistoryManagerReturn['addItem'];
+  addItem: UseHistoryManagerReturn["addItem"];
 }
 
 const TRUST_LEVEL_ITEMS = [
   {
-    label: 'Trust this folder',
+    label: "Trust this folder",
     value: TrustLevel.TRUST_FOLDER,
     key: TrustLevel.TRUST_FOLDER,
   },
   {
-    label: 'Trust parent folder',
+    label: "Trust parent folder",
     value: TrustLevel.TRUST_PARENT,
     key: TrustLevel.TRUST_PARENT,
   },
@@ -37,10 +37,7 @@ const TRUST_LEVEL_ITEMS = [
   },
 ];
 
-export function TrustDialog({
-  onExit,
-  addItem,
-}: TrustDialogProps): React.JSX.Element {
+export function TrustDialog({ onExit, addItem }: TrustDialogProps): React.JSX.Element {
   const {
     cwd,
     currentTrustLevel,
@@ -53,10 +50,10 @@ export function TrustDialog({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onExit();
       }
-      if (needsRestart && key.name === 'r') {
+      if (needsRestart && key.name === "r") {
         commitTrustLevelChange();
         relaunchApp();
         onExit();
@@ -65,9 +62,7 @@ export function TrustDialog({
     { isActive: true },
   );
 
-  const index = TRUST_LEVEL_ITEMS.findIndex(
-    (item) => item.value === currentTrustLevel,
-  );
+  const index = TRUST_LEVEL_ITEMS.findIndex((item) => item.value === currentTrustLevel);
   const initialIndex = index === -1 ? 0 : index;
 
   return (
@@ -79,25 +74,23 @@ export function TrustDialog({
         padding={1}
       >
         <Box flexDirection="column" paddingBottom={1}>
-          <Text bold>{'> '}Modify Trust Level</Text>
+          <Text bold>{"> "}Modify Trust Level</Text>
           <Box marginTop={1} />
           <Text>Folder: {cwd}</Text>
           <Text>
-            Current Level: <Text bold>{currentTrustLevel || 'Not Set'}</Text>
+            Current Level: <Text bold>{currentTrustLevel || "Not Set"}</Text>
           </Text>
           {isInheritedTrustFromParent && (
             <Text color={theme.text.secondary}>
-              Note: This folder behaves as a trusted folder because one of the
-              parent folders is trusted. It will remain trusted even if you set
-              a different trust level here. To change this, you need to modify
-              the trust setting in the parent folder.
+              Note: This folder behaves as a trusted folder because one of the parent folders is
+              trusted. It will remain trusted even if you set a different trust level here. To
+              change this, you need to modify the trust setting in the parent folder.
             </Text>
           )}
           {isInheritedTrustFromIde && (
             <Text color={theme.text.secondary}>
-              Note: This folder behaves as a trusted folder because the
-              connected IDE workspace is trusted. It will remain trusted even if
-              you set a different trust level here.
+              Note: This folder behaves as a trusted folder because the connected IDE workspace is
+              trusted. It will remain trusted even if you set a different trust level here.
             </Text>
           )}
         </Box>
@@ -115,8 +108,8 @@ export function TrustDialog({
       {needsRestart && (
         <Box marginLeft={1} marginTop={1}>
           <Text color={theme.status.warning}>
-            To apply the trust changes, AIRIS Code must be restarted. Press
-            &apos;r&apos; to restart CLI now.
+            To apply the trust changes, AIRIS Code must be restarted. Press &apos;r&apos; to restart
+            CLI now.
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/UpdateNotification.tsx b/apps/airiscode-cli/src/ui/components/UpdateNotification.tsx
index 8142a2018..afdc955a7 100644
--- a/apps/airiscode-cli/src/ui/components/UpdateNotification.tsx
+++ b/apps/airiscode-cli/src/ui/components/UpdateNotification.tsx
@@ -4,20 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import { theme } from "../semantic-colors.js";
 
 interface UpdateNotificationProps {
   message: string;
 }
 
 export const UpdateNotification = ({ message }: UpdateNotificationProps) => (
-  <Box
-    borderStyle="round"
-    borderColor={theme.status.warning}
-    paddingX={1}
-    marginY={1}
-  >
+  <Box borderStyle="round" borderColor={theme.status.warning} paddingX={1} marginY={1}>
     <Text color={theme.status.warning}>{message}</Text>
   </Box>
 );
diff --git a/apps/airiscode-cli/src/ui/components/WelcomeBackDialog.tsx b/apps/airiscode-cli/src/ui/components/WelcomeBackDialog.tsx
index a5836b82d..ca7ab0cab 100644
--- a/apps/airiscode-cli/src/ui/components/WelcomeBackDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/WelcomeBackDialog.tsx
@@ -4,46 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { Colors } from '../colors.js';
-import { type ProjectSummaryInfo } from '@airiscode/core';
-import {
-  RadioButtonSelect,
-  type RadioSelectItem,
-} from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { t } from '../../i18n/index.js';
+import { type ProjectSummaryInfo } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../i18n/index.js";
+import { Colors } from "../colors.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { RadioButtonSelect, type RadioSelectItem } from "./shared/RadioButtonSelect.js";
 
 interface WelcomeBackDialogProps {
   welcomeBackInfo: ProjectSummaryInfo;
-  onSelect: (choice: 'restart' | 'continue') => void;
+  onSelect: (choice: "restart" | "continue") => void;
   onClose: () => void;
 }
 
-export function WelcomeBackDialog({
-  welcomeBackInfo,
-  onSelect,
-  onClose,
-}: WelcomeBackDialogProps) {
+export function WelcomeBackDialog({ welcomeBackInfo, onSelect, onClose }: WelcomeBackDialogProps) {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onClose();
       }
     },
     { isActive: true },
   );
 
-  const options: Array<RadioSelectItem<'restart' | 'continue'>> = [
+  const options: Array<RadioSelectItem<"restart" | "continue">> = [
     {
-      key: 'restart',
-      label: t('Start new chat session'),
-      value: 'restart',
+      key: "restart",
+      label: t("Start new chat session"),
+      value: "restart",
     },
     {
-      key: 'continue',
-      label: t('Continue previous conversation'),
-      value: 'continue',
+      key: "continue",
+      label: t("Continue previous conversation"),
+      value: "continue",
     },
   ];
 
@@ -68,8 +61,8 @@ export function WelcomeBackDialog({
     >
       <Box flexDirection="column" marginBottom={1}>
         <Text color={Colors.AccentBlue} bold>
-          {t('👋 Welcome back! (Last updated: {{timeAgo}})', {
-            timeAgo: timeAgo || '',
+          {t("👋 Welcome back! (Last updated: {{timeAgo}})", {
+            timeAgo: timeAgo || "",
           })}
         </Text>
       </Box>
@@ -78,7 +71,7 @@ export function WelcomeBackDialog({
       {goalContent && (
         <Box flexDirection="column" marginBottom={1}>
           <Text color={Colors.Foreground} bold>
-            {t('🎯 Overall Goal:')}
+            {t("🎯 Overall Goal:")}
           </Text>
           <Box marginTop={1} paddingLeft={2}>
             <Text color={Colors.Gray}>{goalContent}</Text>
@@ -90,16 +83,16 @@ export function WelcomeBackDialog({
       {totalTasks > 0 && (
         <Box flexDirection="column" marginBottom={1}>
           <Text color={Colors.Foreground} bold>
-            📋 {t('Current Plan:')}
+            📋 {t("Current Plan:")}
           </Text>
           <Box marginTop={1} paddingLeft={2}>
             <Text color={Colors.Gray}>
-              {t('Progress: {{done}}/{{total}} tasks completed', {
+              {t("Progress: {{done}}/{{total}} tasks completed", {
                 done: String(doneCount),
                 total: String(totalTasks),
               })}
               {inProgressCount > 0 &&
-                t(', {{inProgress}} in progress', {
+                t(", {{inProgress}} in progress", {
                   inProgress: String(inProgressCount),
                 })}
             </Text>
@@ -108,7 +101,7 @@ export function WelcomeBackDialog({
           {pendingTasks.length > 0 && (
             <Box flexDirection="column" marginTop={1} paddingLeft={2}>
               <Text color={Colors.Foreground} bold>
-                {t('Pending Tasks:')}
+                {t("Pending Tasks:")}
               </Text>
               {pendingTasks.map((task: string, index: number) => (
                 <Text key={index} color={Colors.Gray}>
@@ -122,8 +115,8 @@ export function WelcomeBackDialog({
 
       {/* Action Selection */}
       <Box flexDirection="column" marginTop={1}>
-        <Text bold>{t('What would you like to do?')}</Text>
-        <Text>{t('Choose how to proceed with your session:')}</Text>
+        <Text bold>{t("What would you like to do?")}</Text>
+        <Text>{t("Choose how to proceed with your session:")}</Text>
       </Box>
 
       <Box marginTop={1}>
diff --git a/apps/airiscode-cli/src/ui/components/agent-view/AgentChatView.tsx b/apps/airiscode-cli/src/ui/components/agent-view/AgentChatView.tsx
index c3ee70eb7..6fcbef601 100644
--- a/apps/airiscode-cli/src/ui/components/agent-view/AgentChatView.tsx
+++ b/apps/airiscode-cli/src/ui/components/agent-view/AgentChatView.tsx
@@ -21,27 +21,24 @@
  * streaming), which avoids per-chunk re-renders and keeps the display simple.
  */
 
-import { Box, Text, Static } from 'ink';
-import { useMemo, useState, useEffect, useCallback, useRef } from 'react';
 import {
-  AgentStatus,
   AgentEventType,
-  getGitBranch,
+  AgentStatus,
   type AgentStatusChangeEvent,
-} from '@airiscode/core';
-import {
-  useAgentViewState,
-  useAgentViewActions,
-} from '../../contexts/AgentViewContext.js';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
-import { HistoryItemDisplay } from '../HistoryItemDisplay.js';
-import { ToolCallStatus } from '../../types.js';
-import { theme } from '../../semantic-colors.js';
-import { GeminiRespondingSpinner } from '../GeminiRespondingSpinner.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { agentMessagesToHistoryItems } from './agentHistoryAdapter.js';
-import { AgentHeader } from './AgentHeader.js';
+  getGitBranch,
+} from "@airiscode/core";
+import { Box, Static, Text } from "ink";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useAgentViewActions, useAgentViewState } from "../../contexts/AgentViewContext.js";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
+import { ToolCallStatus } from "../../types.js";
+import { GeminiRespondingSpinner } from "../GeminiRespondingSpinner.js";
+import { HistoryItemDisplay } from "../HistoryItemDisplay.js";
+import { AgentHeader } from "./AgentHeader.js";
+import { agentMessagesToHistoryItems } from "./agentHistoryAdapter.js";
 
 // ─── Main Component ─────────────────────────────────────────
 
@@ -53,8 +50,7 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
   const { agents } = useAgentViewState();
   const { setAgentShellFocused } = useAgentViewActions();
   const uiState = useUIState();
-  const { historyRemountKey, availableTerminalHeight, constrainHeight } =
-    uiState;
+  const { historyRemountKey, availableTerminalHeight, constrainHeight } = uiState;
   const { columns: terminalWidth } = useTerminalSize();
   const agent = agents.get(agentId);
   const contentWidth = terminalWidth - 4;
@@ -105,15 +101,11 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
   const liveOutputs = interactiveAgent?.getLiveOutputs();
   const shellPids = interactiveAgent?.getShellPids();
   const status = interactiveAgent?.getStatus();
-  const isRunning =
-    status === AgentStatus.RUNNING || status === AgentStatus.INITIALIZING;
+  const isRunning = status === AgentStatus.RUNNING || status === AgentStatus.INITIALIZING;
 
   // Derive the active PTY PID: first shell PID among currently-executing tools.
   // Resets naturally to undefined when the tool finishes (shellPids cleared).
-  const activePtyId =
-    shellPids && shellPids.size > 0
-      ? shellPids.values().next().value
-      : undefined;
+  const activePtyId = shellPids && shellPids.size > 0 ? shellPids.values().next().value : undefined;
 
   // Track whether the user has toggled input focus into the embedded shell.
   // Mirrors the main agent's embeddedShellFocused in AppContainer.
@@ -134,7 +126,7 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
   // Ctrl+F: toggle shell input focus when a PTY is active.
   useKeypress(
     (key) => {
-      if (key.ctrl && key.name === 'f') {
+      if (key.ctrl && key.name === "f") {
         if (activePtyId || embeddedShellFocused) {
           setEmbeddedShellFocusedLocal((prev) => !prev);
         }
@@ -149,12 +141,7 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
   // tool result updates an existing entry in place).
   const allItems = useMemo(
     () =>
-      agentMessagesToHistoryItems(
-        messages,
-        pendingApprovals ?? new Map(),
-        liveOutputs,
-        shellPids,
-      ),
+      agentMessagesToHistoryItems(messages, pendingApprovals ?? new Map(), liveOutputs, shellPids),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
       agentId,
@@ -174,11 +161,9 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
     for (let idx = allItems.length - 1; idx >= 0; idx--) {
       const item = allItems[idx]!;
       if (
-        item.type === 'tool_group' &&
+        item.type === "tool_group" &&
         item.tools.some(
-          (t) =>
-            t.status === ToolCallStatus.Executing ||
-            t.status === ToolCallStatus.Confirming,
+          (t) => t.status === ToolCallStatus.Executing || t.status === ToolCallStatus.Confirming,
         )
       ) {
         return idx;
@@ -191,11 +176,11 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
   const pendingItems = allItems.slice(splitIndex);
 
   const core = interactiveAgent?.getCore();
-  const agentWorkingDir = core?.runtimeContext.getTargetDir() ?? '';
+  const agentWorkingDir = core?.runtimeContext.getTargetDir() ?? "";
   // Cache the branch — it won't change during the agent's lifetime and
   // getGitBranch uses synchronous execSync which blocks the render loop.
   const agentGitBranch = useMemo(
-    () => (agentWorkingDir ? getGitBranch(agentWorkingDir) : ''),
+    () => (agentWorkingDir ? getGitBranch(agentWorkingDir) : ""),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [agentId],
   );
@@ -203,14 +188,12 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
   if (!agent || !interactiveAgent || !core) {
     return (
       <Box marginX={2}>
-        <Text color={theme.status.error}>
-          Agent &quot;{agentId}&quot; not found.
-        </Text>
+        <Text color={theme.status.error}>Agent &quot;{agentId}&quot; not found.</Text>
       </Box>
     );
   }
 
-  const agentModelId = core.modelConfig.model ?? '';
+  const agentModelId = core.modelConfig.model ?? "";
 
   return (
     <Box flexDirection="column">
@@ -252,9 +235,7 @@ export const AgentChatView = ({ agentId }: AgentChatViewProps) => {
           isPending={true}
           terminalWidth={terminalWidth}
           mainAreaWidth={contentWidth}
-          availableTerminalHeight={
-            constrainHeight ? availableTerminalHeight : undefined
-          }
+          availableTerminalHeight={constrainHeight ? availableTerminalHeight : undefined}
           isFocused={true}
           activeShellPtyId={activePtyId ?? null}
           embeddedShellFocused={embeddedShellFocused}
diff --git a/apps/airiscode-cli/src/ui/components/agent-view/AgentComposer.tsx b/apps/airiscode-cli/src/ui/components/agent-view/AgentComposer.tsx
index 96e4e9946..ff10ab3ae 100644
--- a/apps/airiscode-cli/src/ui/components/agent-view/AgentComposer.tsx
+++ b/apps/airiscode-cli/src/ui/components/agent-view/AgentComposer.tsx
@@ -17,33 +17,25 @@
  * agent's derived streaming state instead of the main agent's.
  */
 
-import { Box, Text, useStdin } from 'ink';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import {
-  AgentStatus,
-  isTerminalStatus,
-  ApprovalMode,
-  APPROVAL_MODES,
-} from '@airiscode/core';
-import {
-  useAgentViewState,
-  useAgentViewActions,
-} from '../../contexts/AgentViewContext.js';
-import { useConfig } from '../../contexts/ConfigContext.js';
-import { StreamingContext } from '../../contexts/StreamingContext.js';
-import { StreamingState } from '../../types.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
-import { useAgentStreamingState } from '../../hooks/useAgentStreamingState.js';
-import { useKeypress, type Key } from '../../hooks/useKeypress.js';
-import { useTextBuffer } from '../shared/text-buffer.js';
-import { calculatePromptWidths } from '../../utils/layoutUtils.js';
-import { BaseTextInput } from '../BaseTextInput.js';
-import { LoadingIndicator } from '../LoadingIndicator.js';
-import { QueuedMessageDisplay } from '../QueuedMessageDisplay.js';
-import { AgentFooter } from './AgentFooter.js';
-import { keyMatchers, Command } from '../../keyMatchers.js';
-import { theme } from '../../semantic-colors.js';
-import { t } from '../../../i18n/index.js';
+import { AgentStatus, APPROVAL_MODES, ApprovalMode, isTerminalStatus } from "@airiscode/core";
+import { Box, Text, useStdin } from "ink";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { t } from "../../../i18n/index.js";
+import { useAgentViewActions, useAgentViewState } from "../../contexts/AgentViewContext.js";
+import { useConfig } from "../../contexts/ConfigContext.js";
+import { StreamingContext } from "../../contexts/StreamingContext.js";
+import { useAgentStreamingState } from "../../hooks/useAgentStreamingState.js";
+import { type Key, useKeypress } from "../../hooks/useKeypress.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { Command, keyMatchers } from "../../keyMatchers.js";
+import { theme } from "../../semantic-colors.js";
+import { StreamingState } from "../../types.js";
+import { calculatePromptWidths } from "../../utils/layoutUtils.js";
+import { BaseTextInput } from "../BaseTextInput.js";
+import { LoadingIndicator } from "../LoadingIndicator.js";
+import { QueuedMessageDisplay } from "../QueuedMessageDisplay.js";
+import { useTextBuffer } from "../shared/text-buffer.js";
+import { AgentFooter } from "./AgentFooter.js";
 
 // ─── Types ──────────────────────────────────────────────────
 
@@ -54,13 +46,9 @@ interface AgentComposerProps {
 // ─── Component ──────────────────────────────────────────────
 
 export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
-  const { agents, agentTabBarFocused, agentShellFocused, agentApprovalModes } =
-    useAgentViewState();
-  const {
-    setAgentInputBufferText,
-    setAgentTabBarFocused,
-    setAgentApprovalMode,
-  } = useAgentViewActions();
+  const { agents, agentTabBarFocused, agentShellFocused, agentApprovalModes } = useAgentViewState();
+  const { setAgentInputBufferText, setAgentTabBarFocused, setAgentApprovalMode } =
+    useAgentViewActions();
   const agent = agents.get(agentId);
   const interactiveAgent = agent?.interactiveAgent;
 
@@ -69,48 +57,34 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
   const { inputWidth } = calculatePromptWidths(terminalWidth);
   const { stdin, setRawMode } = useStdin();
 
-  const {
-    status,
-    streamingState,
-    isInputActive,
-    elapsedTime,
-    lastPromptTokenCount,
-  } = useAgentStreamingState(interactiveAgent);
+  const { status, streamingState, isInputActive, elapsedTime, lastPromptTokenCount } =
+    useAgentStreamingState(interactiveAgent);
 
   // ── Escape to cancel the active agent round ──
 
   useKeypress(
     (key) => {
-      if (
-        key.name === 'escape' &&
-        streamingState === StreamingState.Responding
-      ) {
+      if (key.name === "escape" && streamingState === StreamingState.Responding) {
         interactiveAgent?.cancelCurrentRound();
       }
     },
     {
-      isActive:
-        streamingState === StreamingState.Responding && !agentShellFocused,
+      isActive: streamingState === StreamingState.Responding && !agentShellFocused,
     },
   );
 
   // ── Shift+Tab to cycle this agent's approval mode ──
 
-  const agentApprovalMode =
-    agentApprovalModes.get(agentId) ?? ApprovalMode.DEFAULT;
+  const agentApprovalMode = agentApprovalModes.get(agentId) ?? ApprovalMode.DEFAULT;
 
   useKeypress(
     (key) => {
-      const isShiftTab = key.shift && key.name === 'tab';
+      const isShiftTab = key.shift && key.name === "tab";
       const isWindowsTab =
-        process.platform === 'win32' &&
-        key.name === 'tab' &&
-        !key.ctrl &&
-        !key.meta;
+        process.platform === "win32" && key.name === "tab" && !key.ctrl && !key.meta;
       if (isShiftTab || isWindowsTab) {
         const currentIndex = APPROVAL_MODES.indexOf(agentApprovalMode);
-        const nextIndex =
-          currentIndex === -1 ? 0 : (currentIndex + 1) % APPROVAL_MODES.length;
+        const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % APPROVAL_MODES.length;
         setAgentApprovalMode(agentId, APPROVAL_MODES[nextIndex]!);
       }
     },
@@ -122,7 +96,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
   const isValidPath = useCallback((): boolean => false, []);
 
   const buffer = useTextBuffer({
-    initialText: '',
+    initialText: "",
     viewport: { height: 3, width: inputWidth },
     stdin,
     setRawMode,
@@ -132,7 +106,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
   // Sync agent buffer text to context so AgentTabBar can guard tab switching
   useEffect(() => {
     setAgentInputBufferText(buffer.text);
-    return () => setAgentInputBufferText('');
+    return () => setAgentInputBufferText("");
   }, [buffer.text, setAgentInputBufferText]);
 
   // When agent input is not active (agent running, completed, etc.),
@@ -157,12 +131,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
       // BaseTextInput naturally; the tab bar handler releases focus on the
       // same event so the keystroke appears in the input immediately.
       if (agentTabBarFocused) {
-        if (
-          key.sequence &&
-          key.sequence.length === 1 &&
-          !key.ctrl &&
-          !key.meta
-        ) {
+        if (key.sequence && key.sequence.length === 1 && !key.ctrl && !key.meta) {
           return false; // let BaseTextInput type the character
         }
         return true; // consume non-printable keys
@@ -171,7 +140,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
       // Down arrow at the bottom edge (or empty buffer) → focus the tab bar
       if (keyMatchers[Command.NAVIGATION_DOWN](key)) {
         if (
-          buffer.text === '' ||
+          buffer.text === "" ||
           buffer.allVisualLines.length === 1 ||
           buffer.visualCursor[0] === buffer.allVisualLines.length - 1
         ) {
@@ -196,7 +165,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
       status !== undefined &&
       !isTerminalStatus(status)
     ) {
-      const combined = messageQueue.join('\n');
+      const combined = messageQueue.join("\n");
       setMessageQueue([]);
       interactiveAgent?.enqueueMessage(combined);
     }
@@ -220,19 +189,17 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
   const statusLabel = useMemo(() => {
     switch (status) {
       case AgentStatus.COMPLETED:
-        return { text: t('Completed'), color: theme.status.success };
+        return { text: t("Completed"), color: theme.status.success };
       case AgentStatus.FAILED:
         return {
-          text: t('Failed: {{error}}', {
+          text: t("Failed: {{error}}", {
             error:
-              interactiveAgent?.getError() ??
-              interactiveAgent?.getLastRoundError() ??
-              'unknown',
+              interactiveAgent?.getError() ?? interactiveAgent?.getLastRoundError() ?? "unknown",
           }),
           color: theme.status.error,
         };
       case AgentStatus.CANCELLED:
-        return { text: t('Cancelled'), color: theme.text.secondary };
+        return { text: t("Cancelled"), color: theme.text.secondary };
       default:
         return null;
     }
@@ -254,9 +221,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
       ? theme.border.default
       : (statusColor ?? theme.border.focused);
 
-  const prefixNode = (
-    <Text color={statusColor ?? theme.text.accent}>{isYolo ? '*' : '>'} </Text>
-  );
+  const prefixNode = <Text color={statusColor ?? theme.text.accent}>{isYolo ? "*" : ">"} </Text>;
 
   return (
     <StreamingContext.Provider value={streamingState}>
@@ -265,9 +230,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
             streaming state via the overridden StreamingContext. */}
         <LoadingIndicator
           currentLoadingPhrase={
-            streamingState === StreamingState.Responding
-              ? t('Thinking…')
-              : undefined
+            streamingState === StreamingState.Responding ? t("Thinking…") : undefined
           }
           elapsedTime={elapsedTime}
         />
@@ -287,7 +250,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
           onSubmit={handleSubmit}
           onKeypress={handleKeypress}
           showCursor={isInputActive && !agentTabBarFocused}
-          placeholder={'  ' + t('Send a message to this agent')}
+          placeholder={"  " + t("Send a message to this agent")}
           prefix={prefixNode}
           borderColor={inputBorderColor}
           isActive={isInputActive && !agentShellFocused}
@@ -297,9 +260,7 @@ export const AgentComposer: React.FC<AgentComposerProps> = ({ agentId }) => {
         <AgentFooter
           approvalMode={agentApprovalMode}
           promptTokenCount={lastPromptTokenCount}
-          contextWindowSize={
-            config.getContentGeneratorConfig()?.contextWindowSize
-          }
+          contextWindowSize={config.getContentGeneratorConfig()?.contextWindowSize}
           terminalWidth={terminalWidth}
         />
       </Box>
diff --git a/apps/airiscode-cli/src/ui/components/agent-view/AgentFooter.tsx b/apps/airiscode-cli/src/ui/components/agent-view/AgentFooter.tsx
index f1b4604c2..6e065b33f 100644
--- a/apps/airiscode-cli/src/ui/components/agent-view/AgentFooter.tsx
+++ b/apps/airiscode-cli/src/ui/components/agent-view/AgentFooter.tsx
@@ -10,12 +10,12 @@
  * main-agent-specific concerns (vim mode, shell mode, exit prompts, etc.).
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { ApprovalMode } from '@airiscode/core';
-import { AutoAcceptIndicator } from '../AutoAcceptIndicator.js';
-import { ContextUsageDisplay } from '../ContextUsageDisplay.js';
-import { theme } from '../../semantic-colors.js';
+import { ApprovalMode } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import { AutoAcceptIndicator } from "../AutoAcceptIndicator.js";
+import { ContextUsageDisplay } from "../ContextUsageDisplay.js";
 
 interface AgentFooterProps {
   approvalMode: ApprovalMode | undefined;
@@ -30,8 +30,7 @@ export const AgentFooter: React.FC<AgentFooterProps> = ({
   contextWindowSize,
   terminalWidth,
 }) => {
-  const showApproval =
-    approvalMode !== undefined && approvalMode !== ApprovalMode.DEFAULT;
+  const showApproval = approvalMode !== undefined && approvalMode !== ApprovalMode.DEFAULT;
   const showContext = promptTokenCount > 0 && contextWindowSize !== undefined;
 
   if (!showApproval && !showContext) {
@@ -39,16 +38,9 @@ export const AgentFooter: React.FC<AgentFooterProps> = ({
   }
 
   return (
-    <Box
-      justifyContent="space-between"
-      width="100%"
-      flexDirection="row"
-      alignItems="center"
-    >
+    <Box justifyContent="space-between" width="100%" flexDirection="row" alignItems="center">
       <Box marginLeft={2}>
-        {showApproval ? (
-          <AutoAcceptIndicator approvalMode={approvalMode} />
-        ) : null}
+        {showApproval ? <AutoAcceptIndicator approvalMode={approvalMode} /> : null}
       </Box>
       <Box marginRight={2}>
         {showContext && (
diff --git a/apps/airiscode-cli/src/ui/components/agent-view/AgentHeader.tsx b/apps/airiscode-cli/src/ui/components/agent-view/AgentHeader.tsx
index 696e1e6eb..d673d1e2f 100644
--- a/apps/airiscode-cli/src/ui/components/agent-view/AgentHeader.tsx
+++ b/apps/airiscode-cli/src/ui/components/agent-view/AgentHeader.tsx
@@ -10,11 +10,11 @@
  * branch in a bordered info panel.
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { shortenPath, tildeifyPath } from '@airiscode/core';
-import { theme } from '../../semantic-colors.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { shortenPath, tildeifyPath } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
 
 interface AgentHeaderProps {
   modelId: string;
@@ -33,8 +33,7 @@ export const AgentHeader: React.FC<AgentHeaderProps> = ({
   const maxPathLen = Math.max(20, terminalWidth - 12);
   const displayPath = shortenPath(tildeifyPath(workingDirectory), maxPathLen);
 
-  const modelText =
-    modelName && modelName !== modelId ? `${modelId} (${modelName})` : modelId;
+  const modelText = modelName && modelName !== modelId ? `${modelId} (${modelName})` : modelId;
 
   return (
     <Box
@@ -46,16 +45,16 @@ export const AgentHeader: React.FC<AgentHeaderProps> = ({
       paddingX={1}
     >
       <Text>
-        <Text color={theme.text.secondary}>{'Model:  '}</Text>
+        <Text color={theme.text.secondary}>{"Model:  "}</Text>
         <Text color={theme.text.primary}>{modelText}</Text>
       </Text>
       <Text>
-        <Text color={theme.text.secondary}>{'Path:   '}</Text>
+        <Text color={theme.text.secondary}>{"Path:   "}</Text>
         <Text color={theme.text.primary}>{displayPath}</Text>
       </Text>
       {gitBranch && (
         <Text>
-          <Text color={theme.text.secondary}>{'Branch: '}</Text>
+          <Text color={theme.text.secondary}>{"Branch: "}</Text>
           <Text color={theme.text.primary}>{gitBranch}</Text>
         </Text>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/agent-view/AgentTabBar.tsx b/apps/airiscode-cli/src/ui/components/agent-view/AgentTabBar.tsx
index db7872501..2cab07944 100644
--- a/apps/airiscode-cli/src/ui/components/agent-view/AgentTabBar.tsx
+++ b/apps/airiscode-cli/src/ui/components/agent-view/AgentTabBar.tsx
@@ -18,17 +18,17 @@
  * Tab indicators:  running,  idle/completed,  failed,  cancelled
  */
 
-import { Box, Text } from 'ink';
-import { useState, useEffect, useCallback } from 'react';
-import { AgentStatus, AgentEventType } from '@airiscode/core';
+import { AgentEventType, AgentStatus } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useState } from "react";
 import {
-  useAgentViewState,
-  useAgentViewActions,
   type RegisteredAgent,
-} from '../../contexts/AgentViewContext.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { theme } from '../../semantic-colors.js';
+  useAgentViewActions,
+  useAgentViewState,
+} from "../../contexts/AgentViewContext.js";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
 
 // ─── Status Indicators ──────────────────────────────────────
 
@@ -40,27 +40,25 @@ function statusIndicator(agent: RegisteredAgent): {
   switch (status) {
     case AgentStatus.RUNNING:
     case AgentStatus.INITIALIZING:
-      return { symbol: '\u25CF', color: theme.status.warning }; // ● running
+      return { symbol: "\u25CF", color: theme.status.warning }; // ● running
     case AgentStatus.IDLE:
-      return { symbol: '\u25CF', color: theme.status.success }; // ● idle (ready)
+      return { symbol: "\u25CF", color: theme.status.success }; // ● idle (ready)
     case AgentStatus.COMPLETED:
-      return { symbol: '\u2713', color: theme.status.success }; // ✓ completed
+      return { symbol: "\u2713", color: theme.status.success }; // ✓ completed
     case AgentStatus.FAILED:
-      return { symbol: '\u2717', color: theme.status.error }; // ✗ failed
+      return { symbol: "\u2717", color: theme.status.error }; // ✗ failed
     case AgentStatus.CANCELLED:
-      return { symbol: '\u25CB', color: theme.text.secondary }; // ○ cancelled
+      return { symbol: "\u25CB", color: theme.text.secondary }; // ○ cancelled
     default:
-      return { symbol: '\u25CB', color: theme.text.secondary }; // ○ fallback
+      return { symbol: "\u25CB", color: theme.text.secondary }; // ○ fallback
   }
 }
 
 // ─── Component ──────────────────────────────────────────────
 
 export const AgentTabBar: React.FC = () => {
-  const { activeView, agents, agentShellFocused, agentTabBarFocused } =
-    useAgentViewState();
-  const { switchToNext, switchToPrevious, setAgentTabBarFocused } =
-    useAgentViewActions();
+  const { activeView, agents, agentShellFocused, agentTabBarFocused } = useAgentViewState();
+  const { switchToNext, switchToPrevious, setAgentTabBarFocused } = useAgentViewActions();
   const { embeddedShellFocused } = useUIState();
 
   useKeypress(
@@ -68,18 +66,13 @@ export const AgentTabBar: React.FC = () => {
       if (embeddedShellFocused || agentShellFocused) return;
       if (!agentTabBarFocused) return;
 
-      if (key.name === 'left') {
+      if (key.name === "left") {
         switchToPrevious();
-      } else if (key.name === 'right') {
+      } else if (key.name === "right") {
         switchToNext();
-      } else if (key.name === 'up') {
+      } else if (key.name === "up") {
         setAgentTabBarFocused(false);
-      } else if (
-        key.sequence &&
-        key.sequence.length === 1 &&
-        !key.ctrl &&
-        !key.meta
-      ) {
+      } else if (key.sequence && key.sequence.length === 1 && !key.ctrl && !key.meta) {
         // Printable character → return focus to input (key falls through
         // to BaseTextInput's useKeypress and gets typed normally)
         setAgentTabBarFocused(false);
@@ -100,9 +93,7 @@ export const AgentTabBar: React.FC = () => {
       const emitter = agent.interactiveAgent.getEventEmitter();
       if (emitter) {
         emitter.on(AgentEventType.STATUS_CHANGE, forceRender);
-        cleanups.push(() =>
-          emitter.off(AgentEventType.STATUS_CHANGE, forceRender),
-        );
+        cleanups.push(() => emitter.off(AgentEventType.STATUS_CHANGE, forceRender));
       }
     }
     return () => cleanups.forEach((fn) => fn());
@@ -111,29 +102,25 @@ export const AgentTabBar: React.FC = () => {
   const isFocused = agentTabBarFocused;
 
   // Navigation hint varies by context
-  const hint = isFocused ? '\u2190/\u2192 switch  \u2191 input' : '\u2193 tabs';
+  const hint = isFocused ? "\u2190/\u2192 switch  \u2191 input" : "\u2193 tabs";
 
   return (
     <Box flexDirection="row" paddingX={1}>
       {/* Main tab */}
       <Box marginRight={1}>
         <Text
-          bold={activeView === 'main'}
+          bold={activeView === "main"}
           dimColor={!isFocused}
-          backgroundColor={
-            activeView === 'main' ? theme.border.default : undefined
-          }
-          color={
-            activeView === 'main' ? theme.text.primary : theme.text.secondary
-          }
+          backgroundColor={activeView === "main" ? theme.border.default : undefined}
+          color={activeView === "main" ? theme.text.primary : theme.text.secondary}
         >
-          {' Main '}
+          {" Main "}
         </Text>
       </Box>
 
       {/* Separator */}
       <Text dimColor={!isFocused} color={theme.border.default}>
-        {'\u2502'}
+        {"\u2502"}
       </Text>
 
       {/* Agent tabs */}
diff --git a/apps/airiscode-cli/src/ui/components/agent-view/agentHistoryAdapter.ts b/apps/airiscode-cli/src/ui/components/agent-view/agentHistoryAdapter.ts
index 68545940e..d6e10687d 100644
--- a/apps/airiscode-cli/src/ui/components/agent-view/agentHistoryAdapter.ts
+++ b/apps/airiscode-cli/src/ui/components/agent-view/agentHistoryAdapter.ts
@@ -17,13 +17,9 @@
  * requires items never shift or be removed, which this guarantees.
  */
 
-import type {
-  AgentMessage,
-  ToolCallConfirmationDetails,
-  ToolResultDisplay,
-} from '@airiscode/core';
-import type { HistoryItem, IndividualToolCallDisplay } from '../../types.js';
-import { ToolCallStatus } from '../../types.js';
+import type { AgentMessage, ToolCallConfirmationDetails, ToolResultDisplay } from "@airiscode/core";
+import type { HistoryItem, IndividualToolCallDisplay } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
 
 /**
  * Convert AgentMessage[] + pendingApprovals into HistoryItem[].
@@ -50,33 +46,30 @@ export function agentMessagesToHistoryItems(
     const msg = messages[i]!;
 
     // ── user ──────────────────────────────────────────────────
-    if (msg.role === 'user') {
-      items.push({ type: 'user', text: msg.content, id: nextId++ });
+    if (msg.role === "user") {
+      items.push({ type: "user", text: msg.content, id: nextId++ });
       i++;
 
       // ── assistant ─────────────────────────────────────────────
-    } else if (msg.role === 'assistant') {
-      if (msg.metadata?.['error']) {
-        items.push({ type: 'error', text: msg.content, id: nextId++ });
+    } else if (msg.role === "assistant") {
+      if (msg.metadata?.["error"]) {
+        items.push({ type: "error", text: msg.content, id: nextId++ });
       } else if (msg.thought) {
-        items.push({ type: 'gemini_thought', text: msg.content, id: nextId++ });
+        items.push({ type: "gemini_thought", text: msg.content, id: nextId++ });
       } else {
-        items.push({ type: 'gemini', text: msg.content, id: nextId++ });
+        items.push({ type: "gemini", text: msg.content, id: nextId++ });
       }
       i++;
 
       // ── info / warning / success / error ──────────────────────
-    } else if (msg.role === 'info') {
-      const level = msg.metadata?.['level'] as string | undefined;
-      const type =
-        level === 'warning' || level === 'success' || level === 'error'
-          ? level
-          : 'info';
+    } else if (msg.role === "info") {
+      const level = msg.metadata?.["level"] as string | undefined;
+      const type = level === "warning" || level === "success" || level === "error" ? level : "info";
       items.push({ type, text: msg.content, id: nextId++ });
       i++;
 
       // ── tool_call / tool_result → tool_group ──────────────────
-    } else if (msg.role === 'tool_call' || msg.role === 'tool_result') {
+    } else if (msg.role === "tool_call" || msg.role === "tool_result") {
       const groupId = nextId++;
 
       const callMap = new Map<
@@ -95,34 +88,31 @@ export function agentMessagesToHistoryItems(
 
       while (
         i < messages.length &&
-        (messages[i]!.role === 'tool_call' ||
-          messages[i]!.role === 'tool_result')
+        (messages[i]!.role === "tool_call" || messages[i]!.role === "tool_result")
       ) {
         const m = messages[i]!;
-        const callId = (m.metadata?.['callId'] as string) ?? `unknown-${i}`;
+        const callId = (m.metadata?.["callId"] as string) ?? `unknown-${i}`;
 
-        if (m.role === 'tool_call') {
+        if (m.role === "tool_call") {
           if (!callMap.has(callId)) callOrder.push(callId);
           callMap.set(callId, {
             callId,
-            name: (m.metadata?.['toolName'] as string) ?? 'unknown',
-            description: (m.metadata?.['description'] as string) ?? '',
+            name: (m.metadata?.["toolName"] as string) ?? "unknown",
+            description: (m.metadata?.["description"] as string) ?? "",
             resultDisplay: undefined,
             outputFile: undefined,
-            renderOutputAsMarkdown: m.metadata?.['renderOutputAsMarkdown'] as
-              | boolean
-              | undefined,
+            renderOutputAsMarkdown: m.metadata?.["renderOutputAsMarkdown"] as boolean | undefined,
             success: undefined,
           });
         } else {
           // tool_result — attach to existing call entry
           const entry = callMap.get(callId);
-          const resultDisplay = m.metadata?.['resultDisplay'] as
+          const resultDisplay = m.metadata?.["resultDisplay"] as
             | ToolResultDisplay
             | string
             | undefined;
-          const outputFile = m.metadata?.['outputFile'] as string | undefined;
-          const success = m.metadata?.['success'] as boolean;
+          const outputFile = m.metadata?.["outputFile"] as string | undefined;
+          const success = m.metadata?.["success"] as boolean;
 
           if (entry) {
             entry.success = success;
@@ -134,8 +124,8 @@ export function agentMessagesToHistoryItems(
             callOrder.push(callId);
             callMap.set(callId, {
               callId,
-              name: (m.metadata?.['toolName'] as string) ?? 'unknown',
-              description: '',
+              name: (m.metadata?.["toolName"] as string) ?? "unknown",
+              description: "",
               resultDisplay,
               outputFile,
               renderOutputAsMarkdown: undefined,
@@ -176,14 +166,11 @@ export function agentMessagesToHistoryItems(
           renderOutputAsMarkdown: entry.renderOutputAsMarkdown,
           status,
           confirmationDetails: approval,
-          ptyId:
-            status === ToolCallStatus.Executing
-              ? shellPids?.get(callId)
-              : undefined,
+          ptyId: status === ToolCallStatus.Executing ? shellPids?.get(callId) : undefined,
         };
       });
 
-      items.push({ type: 'tool_group', tools, id: groupId });
+      items.push({ type: "tool_group", tools, id: groupId });
     } else {
       // Skip unknown roles
       i++;
diff --git a/apps/airiscode-cli/src/ui/components/agent-view/index.ts b/apps/airiscode-cli/src/ui/components/agent-view/index.ts
index c1e595c22..68e624a2c 100644
--- a/apps/airiscode-cli/src/ui/components/agent-view/index.ts
+++ b/apps/airiscode-cli/src/ui/components/agent-view/index.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { AgentTabBar } from './AgentTabBar.js';
-export { AgentChatView } from './AgentChatView.js';
-export { AgentHeader } from './AgentHeader.js';
-export { AgentComposer } from './AgentComposer.js';
-export { AgentFooter } from './AgentFooter.js';
-export { agentMessagesToHistoryItems } from './agentHistoryAdapter.js';
+export { AgentChatView } from "./AgentChatView.js";
+export { AgentComposer } from "./AgentComposer.js";
+export { AgentFooter } from "./AgentFooter.js";
+export { AgentHeader } from "./AgentHeader.js";
+export { AgentTabBar } from "./AgentTabBar.js";
+export { agentMessagesToHistoryItems } from "./agentHistoryAdapter.js";
diff --git a/apps/airiscode-cli/src/ui/components/arena/ArenaCards.tsx b/apps/airiscode-cli/src/ui/components/arena/ArenaCards.tsx
index 1ad7d8e2a..e28f8532f 100644
--- a/apps/airiscode-cli/src/ui/components/arena/ArenaCards.tsx
+++ b/apps/airiscode-cli/src/ui/components/arena/ArenaCards.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { formatDuration } from '../../utils/formatters.js';
-import { getArenaStatusLabel } from '../../utils/displayUtils.js';
-import type { ArenaAgentCardData } from '../../types.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import type { ArenaAgentCardData } from "../../types.js";
+import { getArenaStatusLabel } from "../../utils/displayUtils.js";
+import { formatDuration } from "../../utils/formatters.js";
 
 // ─── Helpers ────────────────────────────────────────────────
 
@@ -20,10 +20,7 @@ interface ArenaAgentCardProps {
   width?: number;
 }
 
-export const ArenaAgentCard: React.FC<ArenaAgentCardProps> = ({
-  agent,
-  width,
-}) => {
+export const ArenaAgentCard: React.FC<ArenaAgentCardProps> = ({ agent, width }) => {
   const { icon, text, color } = getArenaStatusLabel(agent.status);
   const duration = formatDuration(agent.durationMs);
   const tokens = agent.totalTokens.toLocaleString();
@@ -52,11 +49,8 @@ export const ArenaAgentCard: React.FC<ArenaAgentCardProps> = ({
           Tool Calls: {agent.toolCalls}
           {agent.failedToolCalls > 0 && (
             <>
-              {' '}
-              (
-              <Text color={theme.status.success}>
-                ✓ {agent.successfulToolCalls}
-              </Text>
+              {" "}
+              (<Text color={theme.status.success}>✓ {agent.successfulToolCalls}</Text>
               <Text color={theme.text.secondary}> </Text>
               <Text color={theme.status.error}>✕ {agent.failedToolCalls}</Text>)
             </>
@@ -87,14 +81,10 @@ interface ArenaSessionCardProps {
 /**
  * Pad or truncate a string to a fixed visual width.
  */
-function pad(
-  str: string,
-  len: number,
-  align: 'left' | 'right' = 'left',
-): string {
+function pad(str: string, len: number, align: "left" | "right" = "left"): string {
   if (str.length >= len) return str.slice(0, len);
-  const padding = ' '.repeat(len - str.length);
-  return align === 'right' ? padding + str : str + padding;
+  const padding = " ".repeat(len - str.length);
+  return align === "right" ? padding + str : str + padding;
 }
 
 /**
@@ -102,7 +92,7 @@ function pad(
  */
 function truncate(str: string, maxLen: number): string {
   if (str.length <= maxLen) return str;
-  return str.slice(0, maxLen - 1) + '…';
+  return str.slice(0, maxLen - 1) + "…";
 }
 
 /**
@@ -114,14 +104,14 @@ function getDiffStats(diff: string | undefined): {
   additions: number;
   deletions: number;
 } {
-  if (!diff) return { text: '', additions: 0, deletions: 0 };
-  const lines = diff.split('\n');
+  if (!diff) return { text: "", additions: 0, deletions: 0 };
+  const lines = diff.split("\n");
   let additions = 0;
   let deletions = 0;
   for (const line of lines) {
-    if (line.startsWith('+') && !line.startsWith('+++')) {
+    if (line.startsWith("+") && !line.startsWith("+++")) {
       additions++;
-    } else if (line.startsWith('-') && !line.startsWith('---')) {
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
       deletions++;
     }
   }
@@ -138,8 +128,7 @@ export const ArenaSessionCard: React.FC<ArenaSessionCardProps> = ({
 }) => {
   // Truncate task for display
   const maxTaskLen = 60;
-  const displayTask =
-    task.length > maxTaskLen ? task.slice(0, maxTaskLen - 1) + '…' : task;
+  const displayTask = task.length > maxTaskLen ? task.slice(0, maxTaskLen - 1) + "…" : task;
 
   // Column widths for the agent table (unified with Arena Results)
   const colStatus = 14;
@@ -148,13 +137,13 @@ export const ArenaSessionCard: React.FC<ArenaSessionCardProps> = ({
   const colChanges = 10;
 
   const titleLabel =
-    sessionStatus === 'idle'
-      ? 'Agents Status · Idle'
-      : sessionStatus === 'completed'
-        ? 'Arena Complete'
-        : sessionStatus === 'cancelled'
-          ? 'Arena Cancelled'
-          : 'Arena Failed';
+    sessionStatus === "idle"
+      ? "Agents Status · Idle"
+      : sessionStatus === "completed"
+        ? "Arena Complete"
+        : sessionStatus === "cancelled"
+          ? "Arena Cancelled"
+          : "Arena Failed";
 
   return (
     <Box
@@ -215,9 +204,7 @@ export const ArenaSessionCard: React.FC<ArenaSessionCardProps> = ({
 
       {/* Table separator */}
       <Box>
-        <Text color={theme.border.default}>
-          {'─'.repeat((width ?? 60) - 8)}
-        </Text>
+        <Text color={theme.border.default}>{"─".repeat((width ?? 60) - 8)}</Text>
       </Box>
 
       {/* Agent rows */}
@@ -227,33 +214,25 @@ export const ArenaSessionCard: React.FC<ArenaSessionCardProps> = ({
         return (
           <Box key={agent.label}>
             <Box flexGrow={1}>
-              <Text color={theme.text.primary}>
-                {truncate(agent.label, MAX_MODEL_NAME_LENGTH)}
-              </Text>
+              <Text color={theme.text.primary}>{truncate(agent.label, MAX_MODEL_NAME_LENGTH)}</Text>
             </Box>
             <Box width={colStatus} justifyContent="flex-end">
               <Text color={color}>{statusText}</Text>
             </Box>
             <Box width={colTime} justifyContent="flex-end">
               <Text color={theme.text.primary}>
-                {pad(formatDuration(agent.durationMs), colTime - 1, 'right')}
+                {pad(formatDuration(agent.durationMs), colTime - 1, "right")}
               </Text>
             </Box>
             <Box width={colTokens} justifyContent="flex-end">
               <Text color={theme.text.primary}>
-                {pad(
-                  agent.totalTokens.toLocaleString(),
-                  colTokens - 1,
-                  'right',
-                )}
+                {pad(agent.totalTokens.toLocaleString(), colTokens - 1, "right")}
               </Text>
             </Box>
             <Box width={colChanges} justifyContent="flex-end">
               {diffStats.additions > 0 || diffStats.deletions > 0 ? (
                 <Text>
-                  <Text color={theme.status.success}>
-                    +{diffStats.additions}
-                  </Text>
+                  <Text color={theme.status.success}>+{diffStats.additions}</Text>
                   <Text color={theme.text.secondary}>/</Text>
                   <Text color={theme.status.error}>-{diffStats.deletions}</Text>
                 </Text>
@@ -268,20 +247,18 @@ export const ArenaSessionCard: React.FC<ArenaSessionCardProps> = ({
       <Box height={1} />
 
       {/* Hint */}
-      {sessionStatus === 'idle' && (
+      {sessionStatus === "idle" && (
         <Box flexDirection="column">
           <Text color={theme.text.secondary}>
-            Switch to an agent tab to continue, or{' '}
-            <Text color={theme.text.accent}>/arena select</Text> to pick a
-            winner.
+            Switch to an agent tab to continue, or{" "}
+            <Text color={theme.text.accent}>/arena select</Text> to pick a winner.
           </Text>
         </Box>
       )}
-      {sessionStatus === 'completed' && (
+      {sessionStatus === "completed" && (
         <Box>
           <Text color={theme.text.secondary}>
-            Run <Text color={theme.text.accent}>/arena select</Text> to pick a
-            winner.
+            Run <Text color={theme.text.accent}>/arena select</Text> to pick a winner.
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/arena/ArenaSelectDialog.tsx b/apps/airiscode-cli/src/ui/components/arena/ArenaSelectDialog.tsx
index 7017233d3..c5c3e58d9 100644
--- a/apps/airiscode-cli/src/ui/components/arena/ArenaSelectDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/arena/ArenaSelectDialog.tsx
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import {
-  type ArenaManager,
-  isSuccessStatus,
-  type Config,
-} from '@airiscode/core';
-import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { MessageType, type HistoryItemWithoutId } from '../../types.js';
-import type { UseHistoryManagerReturn } from '../../hooks/useHistoryManager.js';
-import { formatDuration } from '../../utils/formatters.js';
-import { getArenaStatusLabel } from '../../utils/displayUtils.js';
-import { DescriptiveRadioButtonSelect } from '../shared/DescriptiveRadioButtonSelect.js';
-import type { DescriptiveRadioSelectItem } from '../shared/DescriptiveRadioButtonSelect.js';
+import { type ArenaManager, type Config, isSuccessStatus } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useMemo } from "react";
+import type { UseHistoryManagerReturn } from "../../hooks/useHistoryManager.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { type HistoryItemWithoutId, MessageType } from "../../types.js";
+import { getArenaStatusLabel } from "../../utils/displayUtils.js";
+import { formatDuration } from "../../utils/formatters.js";
+import type { DescriptiveRadioSelectItem } from "../shared/DescriptiveRadioButtonSelect.js";
+import { DescriptiveRadioButtonSelect } from "../shared/DescriptiveRadioButtonSelect.js";
 
 interface ArenaSelectDialogProps {
   manager: ArenaManager;
   config: Config;
-  addItem: UseHistoryManagerReturn['addItem'];
+  addItem: UseHistoryManagerReturn["addItem"];
   closeArenaDialog: () => void;
 }
 
@@ -35,10 +31,9 @@ export function ArenaSelectDialog({
   closeArenaDialog,
 }: ArenaSelectDialogProps): React.JSX.Element {
   const pushMessage = useCallback(
-    (result: { messageType: 'info' | 'error'; content: string }) => {
+    (result: { messageType: "info" | "error"; content: string }) => {
       const item: HistoryItemWithoutId = {
-        type:
-          result.messageType === 'info' ? MessageType.INFO : MessageType.ERROR,
+        type: result.messageType === "info" ? MessageType.INFO : MessageType.ERROR,
         text: result.content,
       };
       addItem(item, Date.now());
@@ -46,8 +41,8 @@ export function ArenaSelectDialog({
       try {
         const chatRecorder = config.getChatRecordingService();
         chatRecorder?.recordSlashCommand({
-          phase: 'result',
-          rawCommand: '/arena select',
+          phase: "result",
+          rawCommand: "/arena select",
           outputHistoryItems: [{ ...item } as Record<string, unknown>],
         });
       } catch {
@@ -63,25 +58,24 @@ export function ArenaSelectDialog({
       const mgr = config.getArenaManager();
       if (!mgr) {
         pushMessage({
-          messageType: 'error',
-          content: 'No arena session found. Start one with /arena start.',
+          messageType: "error",
+          content: "No arena session found. Start one with /arena start.",
         });
         return;
       }
 
       const agent =
-        mgr.getAgentState(agentId) ??
-        mgr.getAgentStates().find((item) => item.agentId === agentId);
+        mgr.getAgentState(agentId) ?? mgr.getAgentStates().find((item) => item.agentId === agentId);
       const label = agent?.model.modelId || agentId;
 
       pushMessage({
-        messageType: 'info',
+        messageType: "info",
         content: `Applying changes from ${label}…`,
       });
       const result = await mgr.applyAgentResult(agentId);
       if (!result.success) {
         pushMessage({
-          messageType: 'error',
+          messageType: "error",
           content: `Failed to apply changes from ${label}: ${result.error}`,
         });
         return;
@@ -91,12 +85,12 @@ export function ArenaSelectDialog({
         await config.cleanupArenaRuntime(true);
       } catch (err) {
         pushMessage({
-          messageType: 'error',
+          messageType: "error",
           content: `Warning: failed to clean up arena resources: ${err instanceof Error ? err.message : String(err)}`,
         });
       }
       pushMessage({
-        messageType: 'info',
+        messageType: "info",
         content: `Applied changes from ${label} to workspace. Arena session complete.`,
       });
     },
@@ -108,25 +102,25 @@ export function ArenaSelectDialog({
     const mgr = config.getArenaManager();
     if (!mgr) {
       pushMessage({
-        messageType: 'error',
-        content: 'No arena session found. Start one with /arena start.',
+        messageType: "error",
+        content: "No arena session found. Start one with /arena start.",
       });
       return;
     }
 
     try {
       pushMessage({
-        messageType: 'info',
-        content: 'Discarding Arena results and cleaning up…',
+        messageType: "info",
+        content: "Discarding Arena results and cleaning up…",
       });
       await config.cleanupArenaRuntime(true);
       pushMessage({
-        messageType: 'info',
-        content: 'Arena results discarded. All worktrees cleaned up.',
+        messageType: "info",
+        content: "Arena results discarded. All worktrees cleaned up.",
       });
     } catch (err) {
       pushMessage({
-        messageType: 'error',
+        messageType: "error",
         content: `Failed to clean up arena worktrees: ${err instanceof Error ? err.message : String(err)}`,
       });
     }
@@ -147,15 +141,13 @@ export function ArenaSelectDialog({
         let diffAdditions = 0;
         let diffDeletions = 0;
         if (isSuccessStatus(agent.status) && result) {
-          const agentResult = result.agents.find(
-            (a) => a.agentId === agent.agentId,
-          );
+          const agentResult = result.agents.find((a) => a.agentId === agent.agentId);
           if (agentResult?.diff) {
-            const lines = agentResult.diff.split('\n');
+            const lines = agentResult.diff.split("\n");
             for (const line of lines) {
-              if (line.startsWith('+') && !line.startsWith('+++')) {
+              if (line.startsWith("+") && !line.startsWith("+++")) {
                 diffAdditions++;
-              } else if (line.startsWith('-') && !line.startsWith('---')) {
+              } else if (line.startsWith("-") && !line.startsWith("---")) {
                 diffDeletions++;
               }
             }
@@ -198,17 +190,17 @@ export function ArenaSelectDialog({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         closeArenaDialog();
       }
-      if (key.name === 'd' && !key.ctrl && !key.meta) {
+      if (key.name === "d" && !key.ctrl && !key.meta) {
         onDiscard();
       }
     },
     { isActive: true },
   );
 
-  const task = result?.task || '';
+  const task = result?.task || "";
 
   return (
     <Box
@@ -228,14 +220,12 @@ export function ArenaSelectDialog({
           <Text color={theme.text.secondary}>Task: </Text>
           <Text
             color={theme.text.primary}
-          >{`"${task.length > 60 ? task.slice(0, 59) + '…' : task}"`}</Text>
+          >{`"${task.length > 60 ? task.slice(0, 59) + "…" : task}"`}</Text>
         </Text>
       </Box>
 
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          Select a winner to apply changes:
-        </Text>
+        <Text color={theme.text.secondary}>Select a winner to apply changes:</Text>
       </Box>
 
       <Box marginTop={1} flexDirection="column">
@@ -251,9 +241,7 @@ export function ArenaSelectDialog({
       </Box>
 
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          Enter to select, d to discard all, Esc to cancel
-        </Text>
+        <Text color={theme.text.secondary}>Enter to select, d to discard all, Esc to cancel</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/arena/ArenaStartDialog.tsx b/apps/airiscode-cli/src/ui/components/arena/ArenaStartDialog.tsx
index db22f769e..74a8a6109 100644
--- a/apps/airiscode-cli/src/ui/components/arena/ArenaStartDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/arena/ArenaStartDialog.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useMemo, useState } from 'react';
-import { Box, Text } from 'ink';
-import Link from 'ink-link';
-import { useConfig } from '../../contexts/ConfigContext.js';
-import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { MultiSelect } from '../shared/MultiSelect.js';
-import { t } from '../../../i18n/index.js';
+import { Box, Text } from "ink";
+import Link from "ink-link";
+import type React from "react";
+import { useMemo, useState } from "react";
+import { t } from "../../../i18n/index.js";
+import { useConfig } from "../../contexts/ConfigContext.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { MultiSelect } from "../shared/MultiSelect.js";
 
 interface ArenaStartDialogProps {
   onClose: () => void;
@@ -20,12 +20,9 @@ interface ArenaStartDialogProps {
 }
 
 const MODEL_PROVIDERS_DOCUMENTATION_URL =
-  'https://qwenlm.github.io/airiscode-docs/en/users/configuration/settings/#modelproviders';
+  "https://qwenlm.github.io/airiscode-docs/en/users/configuration/settings/#modelproviders";
 
-export function ArenaStartDialog({
-  onClose,
-  onConfirm,
-}: ArenaStartDialogProps): React.JSX.Element {
+export function ArenaStartDialog({ onClose, onConfirm }: ArenaStartDialogProps): React.JSX.Element {
   const config = useConfig();
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
 
@@ -43,16 +40,13 @@ export function ArenaStartDialog({
       };
     });
   }, [config]);
-  const selectableModelCount = modelItems.filter(
-    (item) => !item.disabled,
-  ).length;
+  const selectableModelCount = modelItems.filter((item) => !item.disabled).length;
   const needsMoreModels = selectableModelCount < 2;
-  const shouldShowMoreModelsHint =
-    selectableModelCount >= 2 && selectableModelCount < 3;
+  const shouldShowMoreModelsHint = selectableModelCount >= 2 && selectableModelCount < 3;
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onClose();
       }
     },
@@ -61,9 +55,7 @@ export function ArenaStartDialog({
 
   const handleConfirm = (values: string[]) => {
     if (values.length < 2) {
-      setErrorMessage(
-        t('Please select at least 2 models to start an Arena session.'),
-      );
+      setErrorMessage(t("Please select at least 2 models to start an Arena session."));
       return;
     }
 
@@ -79,12 +71,12 @@ export function ArenaStartDialog({
       padding={1}
       width="100%"
     >
-      <Text bold>{t('Select Models')}</Text>
+      <Text bold>{t("Select Models")}</Text>
 
       {modelItems.length === 0 ? (
         <Box marginTop={1} flexDirection="column">
           <Text color={theme.status.warning}>
-            {t('No models available. Please configure models first.')}
+            {t("No models available. Please configure models first.")}
           </Text>
         </Box>
       ) : (
@@ -111,15 +103,13 @@ export function ArenaStartDialog({
           {needsMoreModels && (
             <>
               <Text color={theme.status.warning}>
-                {t('Arena requires at least 2 models. To add more:')}
+                {t("Arena requires at least 2 models. To add more:")}
               </Text>
               <Text color={theme.status.warning}>
-                {t(
-                  '  - Run /auth to set up a Coding Plan (includes multiple models)',
-                )}
+                {t("  - Run /auth to set up a Coding Plan (includes multiple models)")}
               </Text>
               <Text color={theme.status.warning}>
-                {t('  - Or configure modelProviders in settings.json')}
+                {t("  - Or configure modelProviders in settings.json")}
               </Text>
             </>
           )}
@@ -130,7 +120,7 @@ export function ArenaStartDialog({
         <>
           <Box marginTop={1}>
             <Text color={theme.text.secondary}>
-              {t('Configure more models with the modelProviders guide:')}
+              {t("Configure more models with the modelProviders guide:")}
             </Text>
           </Box>
           <Box marginTop={0}>
@@ -145,7 +135,7 @@ export function ArenaStartDialog({
 
       <Box marginTop={1} flexDirection="column">
         <Text color={theme.text.secondary}>
-          {t('Space to toggle, Enter to confirm, Esc to cancel')}
+          {t("Space to toggle, Enter to confirm, Esc to cancel")}
         </Text>
       </Box>
     </Box>
diff --git a/apps/airiscode-cli/src/ui/components/arena/ArenaStatusDialog.tsx b/apps/airiscode-cli/src/ui/components/arena/ArenaStatusDialog.tsx
index 5b67ebde5..41177dc97 100644
--- a/apps/airiscode-cli/src/ui/components/arena/ArenaStatusDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/arena/ArenaStatusDialog.tsx
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useMemo, useState } from 'react';
-import { Box, Text } from 'ink';
 import {
-  type ArenaManager,
-  type ArenaAgentState,
-  type InProcessBackend,
   type AgentStatsSummary,
-  isSettledStatus,
+  type ArenaAgentState,
+  type ArenaManager,
   ArenaSessionStatus,
   DISPLAY_MODE,
-} from '@airiscode/core';
-import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { formatDuration } from '../../utils/formatters.js';
-import { getArenaStatusLabel } from '../../utils/displayUtils.js';
+  type InProcessBackend,
+  isSettledStatus,
+} from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useMemo, useState } from "react";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { getArenaStatusLabel } from "../../utils/displayUtils.js";
+import { formatDuration } from "../../utils/formatters.js";
 
 const STATUS_REFRESH_INTERVAL_MS = 2000;
 const IN_PROCESS_REFRESH_INTERVAL_MS = 1000;
@@ -32,17 +32,13 @@ interface ArenaStatusDialogProps {
 
 function truncate(str: string, maxLen: number): string {
   if (str.length <= maxLen) return str;
-  return str.slice(0, maxLen - 1) + '…';
+  return str.slice(0, maxLen - 1) + "…";
 }
 
-function pad(
-  str: string,
-  len: number,
-  align: 'left' | 'right' = 'left',
-): string {
+function pad(str: string, len: number, align: "left" | "right" = "left"): string {
   if (str.length >= len) return str.slice(0, len);
-  const padding = ' '.repeat(len - str.length);
-  return align === 'right' ? padding + str : str + padding;
+  const padding = " ".repeat(len - str.length);
+  return align === "right" ? padding + str : str + padding;
 }
 
 function getElapsedMs(agent: ArenaAgentState): number {
@@ -58,17 +54,17 @@ function getSessionStatusLabel(status: ArenaSessionStatus): {
 } {
   switch (status) {
     case ArenaSessionStatus.RUNNING:
-      return { text: 'Running', color: theme.status.success };
+      return { text: "Running", color: theme.status.success };
     case ArenaSessionStatus.INITIALIZING:
-      return { text: 'Initializing', color: theme.status.warning };
+      return { text: "Initializing", color: theme.status.warning };
     case ArenaSessionStatus.IDLE:
-      return { text: 'Idle', color: theme.status.success };
+      return { text: "Idle", color: theme.status.success };
     case ArenaSessionStatus.COMPLETED:
-      return { text: 'Completed', color: theme.status.success };
+      return { text: "Completed", color: theme.status.success };
     case ArenaSessionStatus.CANCELLED:
-      return { text: 'Cancelled', color: theme.status.warning };
+      return { text: "Cancelled", color: theme.status.warning };
     case ArenaSessionStatus.FAILED:
-      return { text: 'Failed', color: theme.status.error };
+      return { text: "Failed", color: theme.status.error };
     default:
       return { text: String(status), color: theme.text.secondary };
   }
@@ -89,9 +85,7 @@ export function ArenaStatusDialog({
   const inProcessBackend = isInProcess ? (backend as InProcessBackend) : null;
 
   useEffect(() => {
-    const interval = isInProcess
-      ? IN_PROCESS_REFRESH_INTERVAL_MS
-      : STATUS_REFRESH_INTERVAL_MS;
+    const interval = isInProcess ? IN_PROCESS_REFRESH_INTERVAL_MS : STATUS_REFRESH_INTERVAL_MS;
     const timer = setInterval(() => {
       setTick((prev) => prev + 1);
     }, interval);
@@ -104,7 +98,7 @@ export function ArenaStatusDialog({
   const sessionStatus = manager.getSessionStatus();
   const sessionLabel = getSessionStatusLabel(sessionStatus);
   const agents = manager.getAgentStates();
-  const task = manager.getTask() ?? '';
+  const task = manager.getTask() ?? "";
 
   // For in-process mode, read live stats directly from AgentInteractive
   const liveStats = useMemo(() => {
@@ -121,8 +115,7 @@ export function ArenaStatusDialog({
   }, [inProcessBackend, agents, tick]);
 
   const maxTaskLen = 60;
-  const displayTask =
-    task.length > maxTaskLen ? task.slice(0, maxTaskLen - 1) + '…' : task;
+  const displayTask = task.length > maxTaskLen ? task.slice(0, maxTaskLen - 1) + "…" : task;
 
   const colStatus = 14;
   const colTime = 8;
@@ -132,7 +125,7 @@ export function ArenaStatusDialog({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape' || key.name === 'q' || key.name === 'return') {
+      if (key.name === "escape" || key.name === "q" || key.name === "return") {
         closeArenaDialog();
       }
     },
@@ -208,7 +201,7 @@ export function ArenaStatusDialog({
 
       {/* Separator */}
       <Box>
-        <Text color={theme.border.default}>{'─'.repeat(innerWidth)}</Text>
+        <Text color={theme.border.default}>{"─".repeat(innerWidth)}</Text>
       </Box>
 
       {/* Agent rows */}
@@ -223,53 +216,43 @@ export function ArenaStatusDialog({
         const totalTokens = live?.totalTokens ?? agent.stats.totalTokens;
         const rounds = live?.rounds ?? agent.stats.rounds;
         const toolCalls = live?.totalToolCalls ?? agent.stats.toolCalls;
-        const successfulToolCalls =
-          live?.successfulToolCalls ?? agent.stats.successfulToolCalls;
-        const failedToolCalls =
-          live?.failedToolCalls ?? agent.stats.failedToolCalls;
+        const successfulToolCalls = live?.successfulToolCalls ?? agent.stats.successfulToolCalls;
+        const failedToolCalls = live?.failedToolCalls ?? agent.stats.failedToolCalls;
 
         return (
           <Box key={agent.agentId} flexDirection="column">
             <Box>
               <Box flexGrow={1}>
-                <Text color={theme.text.primary}>
-                  {truncate(label, MAX_MODEL_NAME_LENGTH)}
-                </Text>
+                <Text color={theme.text.primary}>{truncate(label, MAX_MODEL_NAME_LENGTH)}</Text>
               </Box>
               <Box width={colStatus} justifyContent="flex-end">
                 <Text color={color}>{statusText}</Text>
               </Box>
               <Box width={colTime} justifyContent="flex-end">
                 <Text color={theme.text.primary}>
-                  {pad(formatDuration(elapsed), colTime - 1, 'right')}
+                  {pad(formatDuration(elapsed), colTime - 1, "right")}
                 </Text>
               </Box>
               <Box width={colTokens} justifyContent="flex-end">
                 <Text color={theme.text.primary}>
-                  {pad(totalTokens.toLocaleString(), colTokens - 1, 'right')}
+                  {pad(totalTokens.toLocaleString(), colTokens - 1, "right")}
                 </Text>
               </Box>
               <Box width={colRounds} justifyContent="flex-end">
                 <Text color={theme.text.primary}>
-                  {pad(String(rounds), colRounds - 1, 'right')}
+                  {pad(String(rounds), colRounds - 1, "right")}
                 </Text>
               </Box>
               <Box width={colTools} justifyContent="flex-end">
                 {failedToolCalls > 0 ? (
                   <Text>
-                    <Text color={theme.status.success}>
-                      {successfulToolCalls}
-                    </Text>
+                    <Text color={theme.status.success}>{successfulToolCalls}</Text>
                     <Text color={theme.text.secondary}>/</Text>
                     <Text color={theme.status.error}>{failedToolCalls}</Text>
                   </Text>
                 ) : (
-                  <Text
-                    color={
-                      toolCalls > 0 ? theme.status.success : theme.text.primary
-                    }
-                  >
-                    {pad(String(toolCalls), colTools - 1, 'right')}
+                  <Text color={toolCalls > 0 ? theme.status.success : theme.text.primary}>
+                    {pad(String(toolCalls), colTools - 1, "right")}
                   </Text>
                 )}
               </Box>
diff --git a/apps/airiscode-cli/src/ui/components/arena/ArenaStopDialog.tsx b/apps/airiscode-cli/src/ui/components/arena/ArenaStopDialog.tsx
index 96275a9d1..46526134a 100644
--- a/apps/airiscode-cli/src/ui/components/arena/ArenaStopDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/arena/ArenaStopDialog.tsx
@@ -4,28 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useMemo, useState } from 'react';
-import { Box, Text } from 'ink';
-import {
-  ArenaSessionStatus,
-  createDebugLogger,
-  type Config,
-} from '@airiscode/core';
-import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { MessageType, type HistoryItemWithoutId } from '../../types.js';
-import type { UseHistoryManagerReturn } from '../../hooks/useHistoryManager.js';
-import { DescriptiveRadioButtonSelect } from '../shared/DescriptiveRadioButtonSelect.js';
-import type { DescriptiveRadioSelectItem } from '../shared/DescriptiveRadioButtonSelect.js';
-
-const debugLogger = createDebugLogger('ARENA_STOP_DIALOG');
-
-type StopAction = 'cleanup' | 'preserve';
+import { ArenaSessionStatus, type Config, createDebugLogger } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useMemo, useState } from "react";
+import type { UseHistoryManagerReturn } from "../../hooks/useHistoryManager.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { type HistoryItemWithoutId, MessageType } from "../../types.js";
+import type { DescriptiveRadioSelectItem } from "../shared/DescriptiveRadioButtonSelect.js";
+import { DescriptiveRadioButtonSelect } from "../shared/DescriptiveRadioButtonSelect.js";
+
+const debugLogger = createDebugLogger("ARENA_STOP_DIALOG");
+
+type StopAction = "cleanup" | "preserve";
 
 interface ArenaStopDialogProps {
   config: Config;
-  addItem: UseHistoryManagerReturn['addItem'];
+  addItem: UseHistoryManagerReturn["addItem"];
   closeArenaDialog: () => void;
 }
 
@@ -37,10 +33,9 @@ export function ArenaStopDialog({
   const [isProcessing, setIsProcessing] = useState(false);
 
   const pushMessage = useCallback(
-    (result: { messageType: 'info' | 'error'; content: string }) => {
+    (result: { messageType: "info" | "error"; content: string }) => {
       const item: HistoryItemWithoutId = {
-        type:
-          result.messageType === 'info' ? MessageType.INFO : MessageType.ERROR,
+        type: result.messageType === "info" ? MessageType.INFO : MessageType.ERROR,
         text: result.content,
       };
       addItem(item, Date.now());
@@ -48,8 +43,8 @@ export function ArenaStopDialog({
       try {
         const chatRecorder = config.getChatRecordingService();
         chatRecorder?.recordSlashCommand({
-          phase: 'result',
-          rawCommand: '/arena stop',
+          phase: "result",
+          rawCommand: "/arena stop",
           outputHistoryItems: [{ ...item } as Record<string, unknown>],
         });
       } catch {
@@ -68,8 +63,8 @@ export function ArenaStopDialog({
       const mgr = config.getArenaManager();
       if (!mgr) {
         pushMessage({
-          messageType: 'error',
-          content: 'No running Arena session found.',
+          messageType: "error",
+          content: "No running Arena session found.",
         });
         return;
       }
@@ -81,43 +76,43 @@ export function ArenaStopDialog({
           sessionStatus === ArenaSessionStatus.INITIALIZING
         ) {
           pushMessage({
-            messageType: 'info',
-            content: 'Stopping Arena agents…',
+            messageType: "info",
+            content: "Stopping Arena agents…",
           });
           await mgr.cancel();
         }
         await mgr.waitForSettled();
         pushMessage({
-          messageType: 'info',
-          content: 'Cleaning up Arena resources…',
+          messageType: "info",
+          content: "Cleaning up Arena resources…",
         });
 
-        if (action === 'preserve') {
+        if (action === "preserve") {
           await mgr.cleanupRuntime();
         } else {
           await mgr.cleanup();
         }
         config.setArenaManager(null);
 
-        if (action === 'preserve') {
+        if (action === "preserve") {
           pushMessage({
-            messageType: 'info',
+            messageType: "info",
             content:
-              'Arena session stopped. Worktrees and session files were preserved. ' +
-              'Use /arena select --discard to manually clean up later.',
+              "Arena session stopped. Worktrees and session files were preserved. " +
+              "Use /arena select --discard to manually clean up later.",
           });
         } else {
           pushMessage({
-            messageType: 'info',
+            messageType: "info",
             content:
-              'Arena session stopped. All Arena resources (including Git worktrees) were cleaned up.',
+              "Arena session stopped. All Arena resources (including Git worktrees) were cleaned up.",
           });
         }
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        debugLogger.error('Failed to stop Arena session:', error);
+        debugLogger.error("Failed to stop Arena session:", error);
         pushMessage({
-          messageType: 'error',
+          messageType: "error",
           content: `Failed to stop Arena session: ${message}`,
         });
       }
@@ -125,24 +120,21 @@ export function ArenaStopDialog({
     [isProcessing, closeArenaDialog, config, pushMessage],
   );
 
-  const configPreserve =
-    config.getAgentsSettings().arena?.preserveArtifacts ?? false;
+  const configPreserve = config.getAgentsSettings().arena?.preserveArtifacts ?? false;
 
   const items: Array<DescriptiveRadioSelectItem<StopAction>> = useMemo(
     () => [
       {
-        key: 'cleanup',
-        value: 'cleanup' as StopAction,
+        key: "cleanup",
+        value: "cleanup" as StopAction,
         title: <Text>Stop and clean up</Text>,
         description: (
-          <Text color={theme.text.secondary}>
-            Remove all worktrees and session files
-          </Text>
+          <Text color={theme.text.secondary}>Remove all worktrees and session files</Text>
         ),
       },
       {
-        key: 'preserve',
-        value: 'preserve' as StopAction,
+        key: "preserve",
+        value: "preserve" as StopAction,
         title: <Text>Stop and preserve artifacts</Text>,
         description: (
           <Text color={theme.text.secondary}>
@@ -158,7 +150,7 @@ export function ArenaStopDialog({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         closeArenaDialog();
       }
     },
@@ -178,9 +170,7 @@ export function ArenaStopDialog({
       </Text>
 
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          Choose what to do with Arena artifacts:
-        </Text>
+        <Text color={theme.text.secondary}>Choose what to do with Arena artifacts:</Text>
       </Box>
 
       <Box marginTop={1} flexDirection="column">
@@ -204,9 +194,7 @@ export function ArenaStopDialog({
       )}
 
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          Enter to confirm, Esc to cancel
-        </Text>
+        <Text color={theme.text.secondary}>Enter to confirm, Esc to cancel</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/extensions/ExtensionsManagerDialog.tsx b/apps/airiscode-cli/src/ui/components/extensions/ExtensionsManagerDialog.tsx
index 99a1cd8ac..a34e7d6f8 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/ExtensionsManagerDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/extensions/ExtensionsManagerDialog.tsx
@@ -4,42 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useMemo, useEffect } from 'react';
-import { Box, Text } from 'ink';
+import type { Config, Extension } from "@airiscode/core";
+import { createDebugLogger, SettingScope } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { t } from "../../../i18n/index.js";
+import { getErrorMessage } from "../../../utils/errors.js";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
+import { ExtensionUpdateState } from "../../state/extensions.js";
 import {
-  ExtensionListStep,
-  ExtensionDetailStep,
   ActionSelectionStep,
-  UninstallConfirmStep,
+  ExtensionDetailStep,
+  ExtensionListStep,
   ScopeSelectStep,
-} from './steps/index.js';
-import { MANAGEMENT_STEPS, type ExtensionAction } from './types.js';
-import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { t } from '../../../i18n/index.js';
-import type { Extension, Config } from '@airiscode/core';
-import { SettingScope, createDebugLogger } from '@airiscode/core';
-import { ExtensionUpdateState } from '../../state/extensions.js';
-import { getErrorMessage } from '../../../utils/errors.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+  UninstallConfirmStep,
+} from "./steps/index.js";
+import { type ExtensionAction, MANAGEMENT_STEPS } from "./types.js";
 
 interface ExtensionsManagerDialogProps {
   onClose: () => void;
   config: Config | null;
 }
 
-const debugLogger = createDebugLogger('EXTENSIONS_MANAGER_DIALOG');
+const debugLogger = createDebugLogger("EXTENSIONS_MANAGER_DIALOG");
 
-export function ExtensionsManagerDialog({
-  onClose,
-  config,
-}: ExtensionsManagerDialogProps) {
+export function ExtensionsManagerDialog({ onClose, config }: ExtensionsManagerDialogProps) {
   const { extensionsUpdateState } = useUIState();
 
   const [extensions, setExtensions] = useState<Extension[]>([]);
-  const [selectedExtensionIndex, setSelectedExtensionIndex] =
-    useState<number>(-1);
+  const [selectedExtensionIndex, setSelectedExtensionIndex] = useState<number>(-1);
   const [navigationStack, setNavigationStack] = useState<string[]>([
     MANAGEMENT_STEPS.EXTENSION_LIST,
   ]);
@@ -56,7 +52,7 @@ export function ExtensionsManagerDialog({
 
     const extensionManager = config.getExtensionManager();
     if (!extensionManager) {
-      debugLogger.error('ExtensionManager not available');
+      debugLogger.error("ExtensionManager not available");
       return;
     }
 
@@ -65,7 +61,7 @@ export function ExtensionsManagerDialog({
       const loadedExtensions = extensionManager.getLoadedExtensions();
       setExtensions(loadedExtensions);
     } catch (error) {
-      debugLogger.error('Failed to load extensions:', error);
+      debugLogger.error("Failed to load extensions:", error);
     }
   }, [config]);
 
@@ -76,8 +72,7 @@ export function ExtensionsManagerDialog({
 
   // Memoized selected extension
   const selectedExtension = useMemo(
-    () =>
-      selectedExtensionIndex >= 0 ? extensions[selectedExtensionIndex] : null,
+    () => (selectedExtensionIndex >= 0 ? extensions[selectedExtensionIndex] : null),
     [extensions, selectedExtensionIndex],
   );
 
@@ -90,9 +85,7 @@ export function ExtensionsManagerDialog({
 
   // Helper to get current step
   const getCurrentStep = useCallback(
-    () =>
-      navigationStack[navigationStack.length - 1] ||
-      MANAGEMENT_STEPS.EXTENSION_LIST,
+    () => navigationStack[navigationStack.length - 1] || MANAGEMENT_STEPS.EXTENSION_LIST,
     [navigationStack],
   );
 
@@ -127,12 +120,12 @@ export function ExtensionsManagerDialog({
     try {
       const extensionManager = config.getExtensionManager();
       if (!extensionManager) {
-        throw new Error('ExtensionManager not available');
+        throw new Error("ExtensionManager not available");
       }
 
       const state = extensionsUpdateState.get(selectedExtension.name);
       if (state !== ExtensionUpdateState.UPDATE_AVAILABLE) {
-        throw new Error('No update available');
+        throw new Error("No update available");
       }
 
       // Use the extension manager to update
@@ -162,38 +155,30 @@ export function ExtensionsManagerDialog({
       // Go back to action selection
       handleNavigateBack();
     } catch (error) {
-      debugLogger.error('Failed to update extension:', error);
-      setUpdateError(
-        error instanceof Error ? error.message : 'Unknown error occurred',
-      );
+      debugLogger.error("Failed to update extension:", error);
+      setUpdateError(error instanceof Error ? error.message : "Unknown error occurred");
     } finally {
       setUpdateInProgress(false);
     }
-  }, [
-    config,
-    selectedExtension,
-    extensionsUpdateState,
-    loadExtensions,
-    handleNavigateBack,
-  ]);
+  }, [config, selectedExtension, extensionsUpdateState, loadExtensions, handleNavigateBack]);
 
   const handleActionSelect = useCallback(
     (action: ExtensionAction) => {
       switch (action) {
-        case 'view':
+        case "view":
           handleNavigateToStep(MANAGEMENT_STEPS.EXTENSION_DETAIL);
           break;
-        case 'update':
+        case "update":
           handleNavigateToStep(MANAGEMENT_STEPS.UPDATE_PROGRESS);
           handleUpdateExtension();
           break;
-        case 'disable':
+        case "disable":
           handleNavigateToStep(MANAGEMENT_STEPS.DISABLE_SCOPE_SELECT);
           break;
-        case 'enable':
+        case "enable":
           handleNavigateToStep(MANAGEMENT_STEPS.ENABLE_SCOPE_SELECT);
           break;
-        case 'uninstall':
+        case "uninstall":
           handleNavigateToStep(MANAGEMENT_STEPS.UNINSTALL_CONFIRMATION);
           break;
         default:
@@ -205,41 +190,32 @@ export function ExtensionsManagerDialog({
 
   // Unified handler for toggling extension state (enable/disable)
   const handleToggleExtensionState = useCallback(
-    async (scope: 'user' | 'workspace', newState: boolean) => {
+    async (scope: "user" | "workspace", newState: boolean) => {
       if (!config || !selectedExtension) return;
 
       try {
         const extensionManager = config.getExtensionManager();
         if (!extensionManager) {
-          throw new Error('ExtensionManager not available');
+          throw new Error("ExtensionManager not available");
         }
 
-        const settingScope =
-          scope === 'user' ? SettingScope.User : SettingScope.Workspace;
+        const settingScope = scope === "user" ? SettingScope.User : SettingScope.Workspace;
 
         if (newState) {
-          await extensionManager.enableExtension(
-            selectedExtension.name,
-            settingScope,
-          );
+          await extensionManager.enableExtension(selectedExtension.name, settingScope);
         } else {
-          await extensionManager.disableExtension(
-            selectedExtension.name,
-            settingScope,
-          );
+          await extensionManager.disableExtension(selectedExtension.name, settingScope);
         }
 
         // Update local state
         setExtensions((prev) =>
           prev.map((ext) =>
-            ext.name === selectedExtension.name
-              ? { ...ext, isActive: newState }
-              : ext,
+            ext.name === selectedExtension.name ? { ...ext, isActive: newState } : ext,
           ),
         );
 
         // Show success message
-        const actionKey = newState ? 'enabled' : 'disabled';
+        const actionKey = newState ? "enabled" : "disabled";
         setSuccessMessage(
           t(`Extension "{{name}}" ${actionKey} successfully.`, {
             name: selectedExtension.name,
@@ -250,13 +226,10 @@ export function ExtensionsManagerDialog({
         // Go back to extension list to show success message
         setNavigationStack([MANAGEMENT_STEPS.EXTENSION_LIST]);
       } catch (error) {
-        debugLogger.error(
-          `Failed to ${newState ? 'enable' : 'disable'} extension:`,
-          error,
-        );
+        debugLogger.error(`Failed to ${newState ? "enable" : "disable"} extension:`, error);
         setErrorMessage(
           t('Failed to {{action}} extension "{{name}}": {{error}}', {
-            action: newState ? 'enable' : 'disable',
+            action: newState ? "enable" : "disable",
             name: selectedExtension.name,
             error: getErrorMessage(error),
           }),
@@ -268,14 +241,14 @@ export function ExtensionsManagerDialog({
   );
 
   const handleDisableExtension = useCallback(
-    async (scope: 'user' | 'workspace') => {
+    async (scope: "user" | "workspace") => {
       await handleToggleExtensionState(scope, false);
     },
     [handleToggleExtensionState],
   );
 
   const handleEnableExtension = useCallback(
-    async (scope: 'user' | 'workspace') => {
+    async (scope: "user" | "workspace") => {
       await handleToggleExtensionState(scope, true);
     },
     [handleToggleExtensionState],
@@ -288,7 +261,7 @@ export function ExtensionsManagerDialog({
       try {
         const extensionManager = config.getExtensionManager();
         if (!extensionManager) {
-          throw new Error('ExtensionManager not available');
+          throw new Error("ExtensionManager not available");
         }
 
         await extensionManager.uninstallExtension(extension.name, false);
@@ -300,7 +273,7 @@ export function ExtensionsManagerDialog({
         setNavigationStack([MANAGEMENT_STEPS.EXTENSION_LIST]);
         setSelectedExtensionIndex(-1);
       } catch (error) {
-        debugLogger.error('Failed to uninstall extension:', error);
+        debugLogger.error("Failed to uninstall extension:", error);
         throw error;
       }
     },
@@ -310,7 +283,7 @@ export function ExtensionsManagerDialog({
   // Centralized ESC key handling
   useKeypress(
     (key) => {
-      if (key.name !== 'escape') {
+      if (key.name !== "escape") {
         return;
       }
 
@@ -334,21 +307,21 @@ export function ExtensionsManagerDialog({
     const getStepHeaderText = () => {
       switch (currentStep) {
         case MANAGEMENT_STEPS.EXTENSION_LIST:
-          return t('Manage Extensions');
+          return t("Manage Extensions");
         case MANAGEMENT_STEPS.ACTION_SELECTION:
-          return selectedExtension?.name || t('Choose Action');
+          return selectedExtension?.name || t("Choose Action");
         case MANAGEMENT_STEPS.EXTENSION_DETAIL:
-          return t('Extension Details');
+          return t("Extension Details");
         case MANAGEMENT_STEPS.DISABLE_SCOPE_SELECT:
-          return t('Disable Extension');
+          return t("Disable Extension");
         case MANAGEMENT_STEPS.ENABLE_SCOPE_SELECT:
-          return t('Enable Extension');
+          return t("Enable Extension");
         case MANAGEMENT_STEPS.UNINSTALL_CONFIRMATION:
-          return t('Uninstall Extension');
+          return t("Uninstall Extension");
         case MANAGEMENT_STEPS.UPDATE_PROGRESS:
-          return t('Update Extension');
+          return t("Update Extension");
         default:
-          return t('Unknown Step');
+          return t("Unknown Step");
       }
     };
 
@@ -366,24 +339,24 @@ export function ExtensionsManagerDialog({
     const getNavigationInstructions = () => {
       if (currentStep === MANAGEMENT_STEPS.EXTENSION_LIST) {
         if (extensions.length === 0 || successMessage) {
-          return t('Esc to close');
+          return t("Esc to close");
         }
-        return t('↑↓ to navigate · Enter to select · Esc to close');
+        return t("↑↓ to navigate · Enter to select · Esc to close");
       }
 
       if (currentStep === MANAGEMENT_STEPS.EXTENSION_DETAIL) {
-        return t('Esc to go back');
+        return t("Esc to go back");
       }
 
       if (currentStep === MANAGEMENT_STEPS.UNINSTALL_CONFIRMATION) {
-        return t('Y/Enter to confirm · N/Esc to cancel');
+        return t("Y/Enter to confirm · N/Esc to cancel");
       }
 
       if (currentStep === MANAGEMENT_STEPS.UPDATE_PROGRESS) {
-        return updateInProgress ? t('Updating...') : '';
+        return updateInProgress ? t("Updating...") : "";
       }
 
-      return t('↑↓ to navigate · Enter to select · Esc to go back');
+      return t("↑↓ to navigate · Enter to select · Esc to go back");
     };
 
     return (
@@ -417,7 +390,7 @@ export function ExtensionsManagerDialog({
     if (updateError && currentStep === MANAGEMENT_STEPS.UPDATE_PROGRESS) {
       return (
         <Box flexDirection="column" gap={1}>
-          <Text color={theme.status.error}>{t('Update failed:')}</Text>
+          <Text color={theme.status.error}>{t("Update failed:")}</Text>
           <Text>{updateError}</Text>
         </Box>
       );
@@ -472,10 +445,10 @@ export function ExtensionsManagerDialog({
           <Box flexDirection="column" gap={1}>
             <Text>
               {updateInProgress
-                ? t('Updating {{name}}...', {
-                    name: selectedExtension?.name || '',
+                ? t("Updating {{name}}...", {
+                    name: selectedExtension?.name || "",
                   })
-                : t('Update complete!')}
+                : t("Update complete!")}
             </Text>
           </Box>
         );
@@ -483,7 +456,7 @@ export function ExtensionsManagerDialog({
         return (
           <Box>
             <Text color={theme.status.error}>
-              {t('Invalid step: {{step}}', { step: currentStep })}
+              {t("Invalid step: {{step}}", { step: currentStep })}
             </Text>
           </Box>
         );
diff --git a/apps/airiscode-cli/src/ui/components/extensions/index.ts b/apps/airiscode-cli/src/ui/components/extensions/index.ts
index e368898af..e02581d7c 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/index.ts
+++ b/apps/airiscode-cli/src/ui/components/extensions/index.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { ExtensionsManagerDialog } from './ExtensionsManagerDialog.js';
-export type { ExtensionsManagerDialogProps } from './types.js';
-export { MANAGEMENT_STEPS } from './types.js';
+export { ExtensionsManagerDialog } from "./ExtensionsManagerDialog.js";
+export type { ExtensionsManagerDialogProps } from "./types.js";
+export { MANAGEMENT_STEPS } from "./types.js";
diff --git a/apps/airiscode-cli/src/ui/components/extensions/steps/ActionSelectionStep.tsx b/apps/airiscode-cli/src/ui/components/extensions/steps/ActionSelectionStep.tsx
index f44adc3c9..af0fd66d9 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/steps/ActionSelectionStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/extensions/steps/ActionSelectionStep.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useMemo } from 'react';
-import { Box } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import { type Extension } from '@airiscode/core';
-import { t } from '../../../../i18n/index.js';
-import { type ExtensionAction } from '../types.js';
+import { type Extension } from "@airiscode/core";
+import { Box } from "ink";
+import { useMemo, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import { type ExtensionAction } from "../types.js";
 
 interface ActionSelectionStepProps {
   selectedExtension: Extension | null;
@@ -23,9 +23,7 @@ export const ActionSelectionStep = ({
   hasUpdateAvailable,
   onActionSelect,
 }: ActionSelectionStepProps) => {
-  const [selectedAction, setSelectedAction] = useState<ExtensionAction | null>(
-    null,
-  );
+  const [selectedAction, setSelectedAction] = useState<ExtensionAction | null>(null);
 
   const isActive = selectedExtension?.isActive ?? false;
 
@@ -33,48 +31,48 @@ export const ActionSelectionStep = ({
   const actions = useMemo(() => {
     const allActions = [
       {
-        key: 'view',
+        key: "view",
         get label() {
-          return t('View Details');
+          return t("View Details");
         },
-        value: 'view' as const,
+        value: "view" as const,
       },
       ...(hasUpdateAvailable
         ? [
             {
-              key: 'update',
+              key: "update",
               get label() {
-                return t('Update Extension');
+                return t("Update Extension");
               },
-              value: 'update' as const,
+              value: "update" as const,
             },
           ]
         : []),
       ...(isActive
         ? [
             {
-              key: 'disable',
+              key: "disable",
               get label() {
-                return t('Disable Extension');
+                return t("Disable Extension");
               },
-              value: 'disable' as const,
+              value: "disable" as const,
             },
           ]
         : [
             {
-              key: 'enable',
+              key: "enable",
               get label() {
-                return t('Enable Extension');
+                return t("Enable Extension");
               },
-              value: 'enable' as const,
+              value: "enable" as const,
             },
           ]),
       {
-        key: 'uninstall',
+        key: "uninstall",
         get label() {
-          return t('Uninstall Extension');
+          return t("Uninstall Extension");
         },
-        value: 'uninstall' as const,
+        value: "uninstall" as const,
       },
     ];
     return allActions;
diff --git a/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionDetailStep.tsx b/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionDetailStep.tsx
index 2d3a8ad05..3e89f1533 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionDetailStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionDetailStep.tsx
@@ -4,22 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { type Extension } from '@airiscode/core';
-import { t } from '../../../../i18n/index.js';
+import { type Extension } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { theme } from "../../../semantic-colors.js";
 
 interface ExtensionDetailStepProps {
   selectedExtension: Extension | null;
 }
 
-export const ExtensionDetailStep = ({
-  selectedExtension,
-}: ExtensionDetailStepProps) => {
+export const ExtensionDetailStep = ({ selectedExtension }: ExtensionDetailStepProps) => {
   if (!selectedExtension) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No extension selected')}</Text>
+        <Text color={theme.status.error}>{t("No extension selected")}</Text>
       </Box>
     );
   }
@@ -27,7 +25,7 @@ export const ExtensionDetailStep = ({
   const ext = selectedExtension;
   const isActive = ext.isActive;
   const activeColor = isActive ? theme.status.success : theme.text.secondary;
-  const activeString = isActive ? t('active') : t('disabled');
+  const activeString = isActive ? t("active") : t("disabled");
 
   // Fixed width for labels to ensure alignment
   const LABEL_WIDTH = 12;
@@ -37,28 +35,28 @@ export const ExtensionDetailStep = ({
       <Box flexDirection="column">
         <Box>
           <Box width={LABEL_WIDTH} flexShrink={0}>
-            <Text color={theme.text.primary}>{t('Name:')}</Text>
+            <Text color={theme.text.primary}>{t("Name:")}</Text>
           </Box>
           <Text>{ext.name}</Text>
         </Box>
 
         <Box>
           <Box width={LABEL_WIDTH} flexShrink={0}>
-            <Text color={theme.text.primary}>{t('Version:')}</Text>
+            <Text color={theme.text.primary}>{t("Version:")}</Text>
           </Box>
           <Text>{ext.version}</Text>
         </Box>
 
         <Box>
           <Box width={LABEL_WIDTH} flexShrink={0}>
-            <Text color={theme.text.primary}>{t('Status:')}</Text>
+            <Text color={theme.text.primary}>{t("Status:")}</Text>
           </Box>
           <Text color={activeColor}>{activeString}</Text>
         </Box>
 
         <Box>
           <Box width={LABEL_WIDTH} flexShrink={0}>
-            <Text color={theme.text.primary}>{t('Path:')}</Text>
+            <Text color={theme.text.primary}>{t("Path:")}</Text>
           </Box>
           <Text>{ext.path}</Text>
         </Box>
@@ -66,7 +64,7 @@ export const ExtensionDetailStep = ({
         {ext.installMetadata && (
           <Box>
             <Box width={LABEL_WIDTH} flexShrink={0}>
-              <Text color={theme.text.primary}>{t('Source:')}</Text>
+              <Text color={theme.text.primary}>{t("Source:")}</Text>
             </Box>
             <Text>{ext.installMetadata.source}</Text>
           </Box>
@@ -75,43 +73,43 @@ export const ExtensionDetailStep = ({
         {ext.mcpServers && Object.keys(ext.mcpServers).length > 0 && (
           <Box>
             <Box width={LABEL_WIDTH} flexShrink={0}>
-              <Text color={theme.text.primary}>{t('MCP Servers:')}</Text>
+              <Text color={theme.text.primary}>{t("MCP Servers:")}</Text>
             </Box>
-            <Text>{Object.keys(ext.mcpServers).join(', ')}</Text>
+            <Text>{Object.keys(ext.mcpServers).join(", ")}</Text>
           </Box>
         )}
 
         {ext.commands && ext.commands.length > 0 && (
           <Box>
             <Box width={LABEL_WIDTH} flexShrink={0}>
-              <Text color={theme.text.primary}>{t('Commands:')}</Text>
+              <Text color={theme.text.primary}>{t("Commands:")}</Text>
             </Box>
-            <Text>{ext.commands.join(', ')}</Text>
+            <Text>{ext.commands.join(", ")}</Text>
           </Box>
         )}
 
         {ext.skills && ext.skills.length > 0 && (
           <Box>
             <Box width={LABEL_WIDTH} flexShrink={0}>
-              <Text color={theme.text.primary}>{t('Skills:')}</Text>
+              <Text color={theme.text.primary}>{t("Skills:")}</Text>
             </Box>
-            <Text>{ext.skills.map((s) => s.name).join(', ')}</Text>
+            <Text>{ext.skills.map((s) => s.name).join(", ")}</Text>
           </Box>
         )}
 
         {ext.agents && ext.agents.length > 0 && (
           <Box>
             <Box width={LABEL_WIDTH} flexShrink={0}>
-              <Text color={theme.text.primary}>{t('Agents:')}</Text>
+              <Text color={theme.text.primary}>{t("Agents:")}</Text>
             </Box>
-            <Text>{ext.agents.map((a) => a.name).join(', ')}</Text>
+            <Text>{ext.agents.map((a) => a.name).join(", ")}</Text>
           </Box>
         )}
 
         {ext.resolvedSettings && ext.resolvedSettings.length > 0 && (
           <Box flexDirection="column" marginTop={1}>
             <Box width={LABEL_WIDTH} flexShrink={0}>
-              <Text color={theme.text.primary}>{t('Settings:')}</Text>
+              <Text color={theme.text.primary}>{t("Settings:")}</Text>
             </Box>
             <Box flexDirection="column" paddingLeft={2}>
               {ext.resolvedSettings.map((setting) => (
diff --git a/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionListStep.tsx b/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionListStep.tsx
index 583bb26ca..ee99385fb 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionListStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/extensions/steps/ExtensionListStep.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { type Extension } from '@airiscode/core';
-import { t } from '../../../../i18n/index.js';
-import { ExtensionUpdateState } from '../../../state/extensions.js';
+import { type Extension } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useEffect, useMemo, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import { ExtensionUpdateState } from "../../../state/extensions.js";
 
 interface ExtensionListStepProps {
   extensions: Extension[];
@@ -33,9 +33,7 @@ export const ExtensionListStep = ({
     for (const ext of extensions) {
       maxName = Math.max(maxName, ext.name.length);
       maxVersion = Math.max(maxVersion, ext.version.length);
-      const statusLength = ext.isActive
-        ? t('active').length
-        : t('disabled').length;
+      const statusLength = ext.isActive ? t("active").length : t("disabled").length;
       maxStatus = Math.max(maxStatus, statusLength);
     }
     return {
@@ -55,15 +53,11 @@ export const ExtensionListStep = ({
   // Keyboard navigation
   useKeypress(
     (key) => {
-      if (key.name === 'up' || key.name === 'k') {
-        setSelectedIndex((prev) =>
-          prev > 0 ? prev - 1 : extensions.length - 1,
-        );
-      } else if (key.name === 'down' || key.name === 'j') {
-        setSelectedIndex((prev) =>
-          prev < extensions.length - 1 ? prev + 1 : 0,
-        );
-      } else if (key.name === 'return' || key.name === 'space') {
+      if (key.name === "up" || key.name === "k") {
+        setSelectedIndex((prev) => (prev > 0 ? prev - 1 : extensions.length - 1));
+      } else if (key.name === "down" || key.name === "j") {
+        setSelectedIndex((prev) => (prev < extensions.length - 1 ? prev + 1 : 0));
+      } else if (key.name === "return" || key.name === "space") {
         if (extensions.length > 0) {
           onExtensionSelect(selectedIndex);
         }
@@ -75,9 +69,7 @@ export const ExtensionListStep = ({
   if (extensions.length === 0) {
     return (
       <Box flexDirection="column">
-        <Text color={theme.text.secondary}>
-          {t('No extensions installed.')}
-        </Text>
+        <Text color={theme.text.secondary}>{t("No extensions installed.")}</Text>
         <Text color={theme.text.secondary}>
           {t("Use '/extensions install' to install your first extension.")}
         </Text>
@@ -107,26 +99,22 @@ export const ExtensionListStep = ({
   };
 
   const getLocalizedUpdateState = (state: string | undefined): string => {
-    if (!state) return '';
+    if (!state) return "";
     // Map internal state values to translation keys
     const stateMap: Record<string, string> = {
-      'up to date': t('up to date'),
-      'update available': t('update available'),
-      'checking...': t('checking...'),
-      'not updatable': t('not updatable'),
-      error: t('error'),
+      "up to date": t("up to date"),
+      "update available": t("update available"),
+      "checking...": t("checking..."),
+      "not updatable": t("not updatable"),
+      error: t("error"),
     };
     return stateMap[state] || state;
   };
 
-  const renderExtensionItem = (
-    extension: Extension,
-    index: number,
-    isSelected: boolean,
-  ) => {
+  const renderExtensionItem = (extension: Extension, index: number, isSelected: boolean) => {
     const isActive = extension.isActive;
     const activeColor = isActive ? theme.status.success : theme.text.secondary;
-    const activeString = isActive ? t('active') : t('disabled');
+    const activeString = isActive ? t("active") : t("disabled");
 
     const updateState = extensionsUpdateState.get(extension.name);
     const stateColor = getUpdateStateColor(updateState);
@@ -136,14 +124,11 @@ export const ExtensionListStep = ({
       <Box key={extension.name} alignItems="center">
         <Box minWidth={2} flexShrink={0}>
           <Text color={isSelected ? theme.text.accent : theme.text.primary}>
-            {isSelected ? '●' : ' '}
+            {isSelected ? "●" : " "}
           </Text>
         </Box>
         <Box width={maxNameWidth} flexShrink={0}>
-          <Text
-            color={isSelected ? theme.text.accent : theme.text.primary}
-            wrap="truncate"
-          >
+          <Text color={isSelected ? theme.text.accent : theme.text.primary} wrap="truncate">
             {extension.name}
           </Text>
         </Box>
@@ -162,7 +147,7 @@ export const ExtensionListStep = ({
     <Box flexDirection="column">
       <Box marginBottom={1}>
         <Text color={theme.text.secondary}>
-          {t('{{count}} extensions installed', {
+          {t("{{count}} extensions installed", {
             count: extensions.length.toString(),
           })}
         </Text>
diff --git a/apps/airiscode-cli/src/ui/components/extensions/steps/ScopeSelectStep.tsx b/apps/airiscode-cli/src/ui/components/extensions/steps/ScopeSelectStep.tsx
index 1f25d9bb7..352b7c176 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/steps/ScopeSelectStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/extensions/steps/ScopeSelectStep.tsx
@@ -4,54 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import { type Extension } from '@airiscode/core';
-import { theme } from '../../../semantic-colors.js';
-import { t } from '../../../../i18n/index.js';
+import { type Extension } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { theme } from "../../../semantic-colors.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
 
 interface ScopeSelectStepProps {
   selectedExtension: Extension | null;
-  mode: 'disable' | 'enable';
-  onScopeSelect: (scope: 'user' | 'workspace') => void;
+  mode: "disable" | "enable";
+  onScopeSelect: (scope: "user" | "workspace") => void;
 }
 
-export function ScopeSelectStep({
-  selectedExtension,
-  mode,
-  onScopeSelect,
-}: ScopeSelectStepProps) {
+export function ScopeSelectStep({ selectedExtension, mode, onScopeSelect }: ScopeSelectStepProps) {
   const scopeItems = [
     {
-      key: 'user',
+      key: "user",
       get label() {
-        return t('User (global)');
+        return t("User (global)");
       },
-      value: 'user' as const,
+      value: "user" as const,
     },
     {
-      key: 'workspace',
+      key: "workspace",
       get label() {
-        return t('Workspace (project-specific)');
+        return t("Workspace (project-specific)");
       },
-      value: 'workspace' as const,
+      value: "workspace" as const,
     },
   ];
 
-  const handleSelect = (value: 'user' | 'workspace') => {
+  const handleSelect = (value: "user" | "workspace") => {
     onScopeSelect(value);
   };
 
   if (!selectedExtension) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No extension selected')}</Text>
+        <Text color={theme.status.error}>{t("No extension selected")}</Text>
       </Box>
     );
   }
 
   const title =
-    mode === 'disable'
+    mode === "disable"
       ? t('Disable "{{name}}" - Select Scope', { name: selectedExtension.name })
       : t('Enable "{{name}}" - Select Scope', { name: selectedExtension.name });
 
@@ -59,11 +55,7 @@ export function ScopeSelectStep({
     <Box flexDirection="column" gap={1}>
       <Text color={theme.text.primary}>{title}</Text>
       <Box>
-        <RadioButtonSelect
-          items={scopeItems}
-          onSelect={handleSelect}
-          showNumbers={false}
-        />
+        <RadioButtonSelect items={scopeItems} onSelect={handleSelect} showNumbers={false} />
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/extensions/steps/UninstallConfirmStep.tsx b/apps/airiscode-cli/src/ui/components/extensions/steps/UninstallConfirmStep.tsx
index f2db6638e..23136e7a3 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/steps/UninstallConfirmStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/extensions/steps/UninstallConfirmStep.tsx
@@ -4,12 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { type Extension } from '@airiscode/core';
-import { createDebugLogger } from '@airiscode/core';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
+import { createDebugLogger, type Extension } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
 
 interface UninstallConfirmStepProps {
   selectedExtension: Extension | null;
@@ -17,7 +16,7 @@ interface UninstallConfirmStepProps {
   onNavigateBack: () => void;
 }
 
-const debugLogger = createDebugLogger('EXTENSION_UNINSTALL_STEP');
+const debugLogger = createDebugLogger("EXTENSION_UNINSTALL_STEP");
 
 export function UninstallConfirmStep({
   selectedExtension,
@@ -28,14 +27,14 @@ export function UninstallConfirmStep({
     async (key) => {
       if (!selectedExtension) return;
 
-      if (key.name === 'y' || key.name === 'return') {
+      if (key.name === "y" || key.name === "return") {
         try {
           await onConfirm(selectedExtension);
           // Navigation will be handled by the parent component after successful uninstall
         } catch (error) {
-          debugLogger.error('Failed to uninstall extension:', error);
+          debugLogger.error("Failed to uninstall extension:", error);
         }
-      } else if (key.name === 'n' || key.name === 'escape') {
+      } else if (key.name === "n" || key.name === "escape") {
         onNavigateBack();
       }
     },
@@ -45,7 +44,7 @@ export function UninstallConfirmStep({
   if (!selectedExtension) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No extension selected')}</Text>
+        <Text color={theme.status.error}>{t("No extension selected")}</Text>
       </Box>
     );
   }
@@ -57,9 +56,7 @@ export function UninstallConfirmStep({
           name: selectedExtension.name,
         })}
       </Text>
-      <Text color={theme.text.secondary}>
-        {t('This action cannot be undone.')}
-      </Text>
+      <Text color={theme.text.secondary}>{t("This action cannot be undone.")}</Text>
     </Box>
   );
 }
diff --git a/apps/airiscode-cli/src/ui/components/extensions/steps/index.ts b/apps/airiscode-cli/src/ui/components/extensions/steps/index.ts
index 45bde6671..4f1916025 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/steps/index.ts
+++ b/apps/airiscode-cli/src/ui/components/extensions/steps/index.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { ExtensionListStep } from './ExtensionListStep.js';
-export { ExtensionDetailStep } from './ExtensionDetailStep.js';
-export { ActionSelectionStep } from './ActionSelectionStep.js';
-export { UninstallConfirmStep } from './UninstallConfirmStep.js';
-export { ScopeSelectStep } from './ScopeSelectStep.js';
+export { ActionSelectionStep } from "./ActionSelectionStep.js";
+export { ExtensionDetailStep } from "./ExtensionDetailStep.js";
+export { ExtensionListStep } from "./ExtensionListStep.js";
+export { ScopeSelectStep } from "./ScopeSelectStep.js";
+export { UninstallConfirmStep } from "./UninstallConfirmStep.js";
diff --git a/apps/airiscode-cli/src/ui/components/extensions/types.ts b/apps/airiscode-cli/src/ui/components/extensions/types.ts
index 25cb8b825..82756d984 100644
--- a/apps/airiscode-cli/src/ui/components/extensions/types.ts
+++ b/apps/airiscode-cli/src/ui/components/extensions/types.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Extension, Config } from '@airiscode/core';
+import type { Config, Extension } from "@airiscode/core";
 
 /**
  * Management steps for the extensions manager dialog.
  */
 export const MANAGEMENT_STEPS = {
-  EXTENSION_LIST: 'extension-list',
-  ACTION_SELECTION: 'action-selection',
-  EXTENSION_DETAIL: 'extension-detail',
-  UNINSTALL_CONFIRMATION: 'uninstall-confirmation',
-  DISABLE_SCOPE_SELECT: 'disable-scope-select',
-  ENABLE_SCOPE_SELECT: 'enable-scope-select',
-  UPDATE_PROGRESS: 'update-progress',
+  EXTENSION_LIST: "extension-list",
+  ACTION_SELECTION: "action-selection",
+  EXTENSION_DETAIL: "extension-detail",
+  UNINSTALL_CONFIRMATION: "uninstall-confirmation",
+  DISABLE_SCOPE_SELECT: "disable-scope-select",
+  ENABLE_SCOPE_SELECT: "enable-scope-select",
+  UPDATE_PROGRESS: "update-progress",
 } as const;
 
 /**
@@ -65,20 +65,14 @@ export interface UninstallConfirmStepProps extends StepNavigationProps {
  */
 export interface ScopeSelectStepProps extends StepNavigationProps {
   selectedExtension: Extension | null;
-  mode: 'disable' | 'enable';
-  onScopeSelect: (scope: 'user' | 'workspace') => void;
+  mode: "disable" | "enable";
+  onScopeSelect: (scope: "user" | "workspace") => void;
 }
 
 /**
  * Available actions for an extension.
  */
-export type ExtensionAction =
-  | 'view'
-  | 'update'
-  | 'disable'
-  | 'enable'
-  | 'uninstall'
-  | 'back';
+export type ExtensionAction = "view" | "update" | "disable" | "enable" | "uninstall" | "back";
 
 /**
  * Props for the ExtensionsManagerDialog component.
diff --git a/apps/airiscode-cli/src/ui/components/hooks/HookConfigDetailStep.tsx b/apps/airiscode-cli/src/ui/components/hooks/HookConfigDetailStep.tsx
index d7938f9b8..ff8bec7df 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/HookConfigDetailStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/hooks/HookConfigDetailStep.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
-import type { HookConfigDisplayInfo, HookEventDisplayInfo } from './types.js';
-import { HooksConfigSource } from '@airiscode/core';
-import { t } from '../../../i18n/index.js';
+import { HooksConfigSource } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../../i18n/index.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
+import type { HookConfigDisplayInfo, HookEventDisplayInfo } from "./types.js";
 
 interface HookConfigDetailStepProps {
   hookEvent: HookEventDisplayInfo;
@@ -26,13 +26,13 @@ export function HookConfigDetailStep({
   const getSourceDisplay = (): string => {
     switch (hookConfig.source) {
       case HooksConfigSource.Project:
-        return t('Local Settings');
+        return t("Local Settings");
       case HooksConfigSource.User:
-        return t('User Settings');
+        return t("User Settings");
       case HooksConfigSource.System:
-        return t('System Settings');
+        return t("System Settings");
       case HooksConfigSource.Extensions:
-        return t('Extensions');
+        return t("Extensions");
       default:
         return hookConfig.source;
     }
@@ -44,8 +44,8 @@ export function HookConfigDetailStep({
   // Get hook type display
   const getHookTypeDisplay = (): string => {
     switch (hookConfig.config.type) {
-      case 'command':
-        return 'command';
+      case "command":
+        return "command";
       default:
         return hookConfig.config.type;
     }
@@ -53,10 +53,10 @@ export function HookConfigDetailStep({
 
   // Get command to display
   const getCommand = (): string => {
-    if (hookConfig.config.type === 'command') {
+    if (hookConfig.config.type === "command") {
       return hookConfig.config.command;
     }
-    return '';
+    return "";
   };
 
   // Calculate box width for command display
@@ -70,14 +70,14 @@ export function HookConfigDetailStep({
       {/* Title */}
       <Box marginBottom={1}>
         <Text bold color={theme.text.primary}>
-          {t('Hook details')}
+          {t("Hook details")}
         </Text>
       </Box>
 
       {/* Event */}
       <Box>
         <Box width={labelWidth}>
-          <Text color={theme.text.secondary}>{t('Event:')}</Text>
+          <Text color={theme.text.secondary}>{t("Event:")}</Text>
         </Box>
         <Text color={theme.text.primary}>{hookEvent.event}</Text>
       </Box>
@@ -85,7 +85,7 @@ export function HookConfigDetailStep({
       {/* Type */}
       <Box>
         <Box width={labelWidth}>
-          <Text color={theme.text.secondary}>{t('Type:')}</Text>
+          <Text color={theme.text.secondary}>{t("Type:")}</Text>
         </Box>
         <Text color={theme.text.primary}>{getHookTypeDisplay()}</Text>
       </Box>
@@ -93,7 +93,7 @@ export function HookConfigDetailStep({
       {/* Source */}
       <Box>
         <Box width={labelWidth}>
-          <Text color={theme.text.secondary}>{t('Source:')}</Text>
+          <Text color={theme.text.secondary}>{t("Source:")}</Text>
         </Box>
         <Text color={theme.text.primary}>{getSourceDisplay()}</Text>
         {hookConfig.sourcePath && (
@@ -105,7 +105,7 @@ export function HookConfigDetailStep({
       {isFromExtension && hookConfig.sourceDisplay && (
         <Box>
           <Box width={labelWidth}>
-            <Text color={theme.text.secondary}>{t('Extension:')}</Text>
+            <Text color={theme.text.secondary}>{t("Extension:")}</Text>
           </Box>
           <Text color={theme.text.primary}>{hookConfig.sourceDisplay}</Text>
         </Box>
@@ -115,7 +115,7 @@ export function HookConfigDetailStep({
       {hookConfig.config.name && (
         <Box>
           <Box width={labelWidth}>
-            <Text color={theme.text.secondary}>{t('Name:')}</Text>
+            <Text color={theme.text.secondary}>{t("Name:")}</Text>
           </Box>
           <Text color={theme.text.primary}>{hookConfig.config.name}</Text>
         </Box>
@@ -125,17 +125,15 @@ export function HookConfigDetailStep({
       {hookConfig.config.description && (
         <Box>
           <Box width={labelWidth}>
-            <Text color={theme.text.secondary}>{t('Desc:')}</Text>
+            <Text color={theme.text.secondary}>{t("Desc:")}</Text>
           </Box>
-          <Text color={theme.text.primary}>
-            {hookConfig.config.description}
-          </Text>
+          <Text color={theme.text.primary}>{hookConfig.config.description}</Text>
         </Box>
       )}
 
       {/* Command */}
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>{t('Command:')}</Text>
+        <Text color={theme.text.secondary}>{t("Command:")}</Text>
       </Box>
 
       {/* Command box */}
@@ -153,14 +151,14 @@ export function HookConfigDetailStep({
       <Box marginTop={1}>
         <Text color={theme.text.secondary}>
           {t(
-            'To modify or remove this hook, edit settings.json directly or ask AIRIS Code to help.',
+            "To modify or remove this hook, edit settings.json directly or ask AIRIS Code to help.",
           )}
         </Text>
       </Box>
 
       {/* Footer hint */}
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>{t('Esc to go back')}</Text>
+        <Text color={theme.text.secondary}>{t("Esc to go back")}</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/hooks/HookDetailStep.tsx b/apps/airiscode-cli/src/ui/components/hooks/HookDetailStep.tsx
index fcdcda928..f450ba5f0 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/HookDetailStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/hooks/HookDetailStep.tsx
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
-import type { HookEventDisplayInfo } from './types.js';
-import { HooksConfigSource } from '@airiscode/core';
-import { getTranslatedSourceDisplayMap } from './constants.js';
-import { t } from '../../../i18n/index.js';
+import { HooksConfigSource } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../../i18n/index.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
+import { getTranslatedSourceDisplayMap } from "./constants.js";
+import type { HookEventDisplayInfo } from "./types.js";
 
 interface HookDetailStepProps {
   hook: HookEventDisplayInfo;
   selectedIndex: number;
 }
 
-export function HookDetailStep({
-  hook,
-  selectedIndex,
-}: HookDetailStepProps): React.JSX.Element {
+export function HookDetailStep({ hook, selectedIndex }: HookDetailStepProps): React.JSX.Element {
   const hasConfigs = hook.configs.length > 0;
   const { columns: terminalWidth } = useTerminalSize();
 
@@ -63,13 +60,11 @@ export function HookDetailStep({
       {hook.exitCodes.length > 0 && (
         <Box flexDirection="column" marginBottom={1}>
           <Text bold color={theme.text.primary}>
-            {t('Exit codes:')}
+            {t("Exit codes:")}
           </Text>
           {hook.exitCodes.map((ec, index) => (
             <Box key={index}>
-              <Text color={theme.text.secondary}>
-                {`  ${ec.code}: ${ec.description}`}
-              </Text>
+              <Text color={theme.text.secondary}>{`  ${ec.code}: ${ec.description}`}</Text>
             </Box>
           ))}
         </Box>
@@ -81,13 +76,12 @@ export function HookDetailStep({
       {hasConfigs ? (
         <>
           <Text bold color={theme.text.primary}>
-            {t('Configured hooks:')}
+            {t("Configured hooks:")}
           </Text>
           {hook.configs.map((config, index) => {
             const isSelected = index === selectedIndex;
             const sourceDisplay = getConfigSourceDisplay(config);
-            const command =
-              config.config.type === 'command' ? config.config.command : '';
+            const command = config.config.type === "command" ? config.config.command : "";
             const hookType = config.config.type;
 
             return (
@@ -95,12 +89,8 @@ export function HookDetailStep({
                 {/* Left column: selector + command */}
                 <Box width={commandWidth}>
                   <Box minWidth={2}>
-                    <Text
-                      color={
-                        isSelected ? theme.text.accent : theme.text.primary
-                      }
-                    >
-                      {isSelected ? '❯' : ' '}
+                    <Text color={isSelected ? theme.text.accent : theme.text.primary}>
+                      {isSelected ? "❯" : " "}
                     </Text>
                   </Box>
                   <Text
@@ -123,25 +113,21 @@ export function HookDetailStep({
             );
           })}
           <Box marginTop={1}>
-            <Text color={theme.text.secondary}>
-              {t('Enter to select · Esc to go back')}
-            </Text>
+            <Text color={theme.text.secondary}>{t("Enter to select · Esc to go back")}</Text>
           </Box>
         </>
       ) : (
         <>
           <Box>
-            <Text color={theme.text.secondary}>
-              {t('No hooks configured for this event.')}
-            </Text>
+            <Text color={theme.text.secondary}>{t("No hooks configured for this event.")}</Text>
           </Box>
           <Box marginTop={1}>
             <Text color={theme.text.secondary}>
-              {t('To add hooks, edit settings.json directly or ask AIRIS Code.')}
+              {t("To add hooks, edit settings.json directly or ask AIRIS Code.")}
             </Text>
           </Box>
           <Box marginTop={1}>
-            <Text color={theme.text.secondary}>{t('Esc to go back')}</Text>
+            <Text color={theme.text.secondary}>{t("Esc to go back")}</Text>
           </Box>
         </>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/hooks/HooksDisabledStep.tsx b/apps/airiscode-cli/src/ui/components/hooks/HooksDisabledStep.tsx
index a8aac6320..5d17acfe9 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/HooksDisabledStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/hooks/HooksDisabledStep.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { t } from '../../../i18n/index.js';
+import { Box, Text } from "ink";
+import { t } from "../../../i18n/index.js";
+import { theme } from "../../semantic-colors.js";
 
 interface HooksDisabledStepProps {
   configuredHooksCount: number;
@@ -20,8 +20,8 @@ export function HooksDisabledStep({
   // based on the count, since the i18n system doesn't support ICU MessageFormat.
   const hooksText =
     configuredHooksCount === 1
-      ? t('{{count}} configured hook', { count: String(configuredHooksCount) })
-      : t('{{count}} configured hooks', {
+      ? t("{{count}} configured hook", { count: String(configuredHooksCount) })
+      : t("{{count}} configured hooks", {
           count: String(configuredHooksCount),
         });
 
@@ -30,43 +30,36 @@ export function HooksDisabledStep({
       {/* Title */}
       <Box marginBottom={1}>
         <Text bold color={theme.status.warning}>
-          {t('Hook Configuration - Disabled')}
+          {t("Hook Configuration - Disabled")}
         </Text>
       </Box>
 
       {/* Main message */}
       <Box marginBottom={1}>
         <Text color={theme.text.primary}>
-          {t(
-            'All hooks are currently disabled. You have {{count}} that are not running.',
-            {
-              count: hooksText,
-            },
-          )}
+          {t("All hooks are currently disabled. You have {{count}} that are not running.", {
+            count: hooksText,
+          })}
         </Text>
       </Box>
 
       {/* Explanation */}
       <Box flexDirection="column" marginBottom={1}>
         <Text bold color={theme.text.primary}>
-          {t('When hooks are disabled:')}
+          {t("When hooks are disabled:")}
         </Text>
         {/* Note: Using middle dot (·) as bullet character. This is consistent with
             other CLI components. If a design system evolves, consider extracting
             to a shared constant or using a BulletList component. */}
         <Box>
-          <Text color={theme.text.secondary}>
-            {`  · ${t('No hook commands will execute')}`}
-          </Text>
+          <Text color={theme.text.secondary}>{`  · ${t("No hook commands will execute")}`}</Text>
         </Box>
         <Box>
-          <Text color={theme.text.secondary}>
-            {`  · ${t('StatusLine will not be displayed')}`}
-          </Text>
+          <Text color={theme.text.secondary}>{`  · ${t("StatusLine will not be displayed")}`}</Text>
         </Box>
         <Box>
           <Text color={theme.text.secondary}>
-            {`  · ${t('Tool operations will proceed without hook validation')}`}
+            {`  · ${t("Tool operations will proceed without hook validation")}`}
           </Text>
         </Box>
       </Box>
@@ -74,15 +67,13 @@ export function HooksDisabledStep({
       {/* How to re-enable */}
       <Box marginBottom={1}>
         <Text color={theme.text.secondary}>
-          {t(
-            'To re-enable hooks, remove "disableAllHooks" from settings.json or ask AIRIS Code.',
-          )}
+          {t('To re-enable hooks, remove "disableAllHooks" from settings.json or ask AIRIS Code.')}
         </Text>
       </Box>
 
       {/* Footer hint */}
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>{t('Esc to close')}</Text>
+        <Text color={theme.text.secondary}>{t("Esc to close")}</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/hooks/HooksListStep.tsx b/apps/airiscode-cli/src/ui/components/hooks/HooksListStep.tsx
index 21164bcd2..d415b88d6 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/HooksListStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/hooks/HooksListStep.tsx
@@ -4,54 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
-import type { HookEventDisplayInfo } from './types.js';
-import { t } from '../../../i18n/index.js';
+import { Box, Text } from "ink";
+import { t } from "../../../i18n/index.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
+import type { HookEventDisplayInfo } from "./types.js";
 
 interface HooksListStepProps {
   hooks: HookEventDisplayInfo[];
   selectedIndex: number;
 }
 
-export function HooksListStep({
-  hooks,
-  selectedIndex,
-}: HooksListStepProps): React.JSX.Element {
+export function HooksListStep({ hooks, selectedIndex }: HooksListStepProps): React.JSX.Element {
   const { columns: terminalWidth } = useTerminalSize();
 
   // Calculate responsive width for hook name column (min 20, max 35)
-  const hookNameWidth = Math.min(
-    35,
-    Math.max(20, Math.floor(terminalWidth * 0.25)),
-  );
+  const hookNameWidth = Math.min(35, Math.max(20, Math.floor(terminalWidth * 0.25)));
 
   if (hooks.length === 0) {
     return (
       <Box flexDirection="column" paddingX={1}>
-        <Text color={theme.text.secondary}>{t('No hook events found.')}</Text>
+        <Text color={theme.text.secondary}>{t("No hook events found.")}</Text>
       </Box>
     );
   }
 
   // Calculate total configured hooks
-  const totalConfigured = hooks.reduce(
-    (sum, hook) => sum + hook.configs.length,
-    0,
-  );
+  const totalConfigured = hooks.reduce((sum, hook) => sum + hook.configs.length, 0);
 
   // Get the correct plural/singular form
   const hooksConfiguredText =
     totalConfigured === 1
-      ? t('{{count}} hook configured', { count: String(totalConfigured) })
-      : t('{{count}} hooks configured', { count: String(totalConfigured) });
+      ? t("{{count}} hook configured", { count: String(totalConfigured) })
+      : t("{{count}} hooks configured", { count: String(totalConfigured) });
 
   return (
     <Box flexDirection="column" paddingX={1}>
       <Box marginBottom={1}>
         <Text bold color={theme.text.primary}>
-          {t('Hooks')}
+          {t("Hooks")}
         </Text>
         <Text color={theme.text.secondary}>{` · ${hooksConfiguredText}`}</Text>
       </Box>
@@ -59,7 +50,7 @@ export function HooksListStep({
       <Box marginBottom={1}>
         <Text color={theme.text.secondary}>
           {t(
-            'This menu is read-only. To add or modify hooks, edit settings.json directly or ask AIRIS Code.',
+            "This menu is read-only. To add or modify hooks, edit settings.json directly or ask AIRIS Code.",
           )}
         </Text>
       </Box>
@@ -74,18 +65,13 @@ export function HooksListStep({
           <Box key={hook.event}>
             <Box minWidth={2}>
               <Text color={isSelected ? theme.text.accent : theme.text.primary}>
-                {isSelected ? '❯' : ' '}
+                {isSelected ? "❯" : " "}
               </Text>
             </Box>
             <Box width={hookNameWidth}>
-              <Text
-                color={isSelected ? theme.text.accent : theme.text.primary}
-                bold={isSelected}
-              >
+              <Text color={isSelected ? theme.text.accent : theme.text.primary} bold={isSelected}>
                 {paddedIndex}. {hook.event}
-                {configCount > 0 && (
-                  <Text color={theme.status.success}> ({configCount})</Text>
-                )}
+                {configCount > 0 && <Text color={theme.status.success}> ({configCount})</Text>}
               </Text>
             </Box>
             <Text color={theme.text.secondary}>{hook.shortDescription}</Text>
@@ -94,9 +80,7 @@ export function HooksListStep({
       })}
 
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          {t('Enter to select · Esc to cancel')}
-        </Text>
+        <Text color={theme.text.secondary}>{t("Enter to select · Esc to cancel")}</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/hooks/HooksManagementDialog.tsx b/apps/airiscode-cli/src/ui/components/hooks/HooksManagementDialog.tsx
index b7078565e..f8352061f 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/HooksManagementDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/hooks/HooksManagementDialog.tsx
@@ -4,48 +4,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useEffect, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { useConfig } from '../../contexts/ConfigContext.js';
-import { loadSettings, SettingScope } from '../../../config/settings.js';
 import {
-  HooksConfigSource,
-  type HookDefinition,
-  type HookConfig,
   createDebugLogger,
   HOOKS_CONFIG_FIELDS,
-} from '@airiscode/core';
-import type {
-  HooksManagementDialogProps,
-  HookEventDisplayInfo,
-} from './types.js';
-import { HOOKS_MANAGEMENT_STEPS } from './types.js';
-import { HooksListStep } from './HooksListStep.js';
-import { HookDetailStep } from './HookDetailStep.js';
-import { HookConfigDetailStep } from './HookConfigDetailStep.js';
-import { HooksDisabledStep } from './HooksDisabledStep.js';
+  type HookConfig,
+  type HookDefinition,
+  HooksConfigSource,
+} from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { loadSettings, SettingScope } from "../../../config/settings.js";
+import { t } from "../../../i18n/index.js";
+import { useConfig } from "../../contexts/ConfigContext.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
 import {
+  createEmptyHookEventInfo,
   DISPLAY_HOOK_EVENTS,
   getTranslatedSourceDisplayMap,
-  createEmptyHookEventInfo,
-} from './constants.js';
-import { t } from '../../../i18n/index.js';
+} from "./constants.js";
+import { HookConfigDetailStep } from "./HookConfigDetailStep.js";
+import { HookDetailStep } from "./HookDetailStep.js";
+import { HooksDisabledStep } from "./HooksDisabledStep.js";
+import { HooksListStep } from "./HooksListStep.js";
+import type { HookEventDisplayInfo, HooksManagementDialogProps } from "./types.js";
+import { HOOKS_MANAGEMENT_STEPS } from "./types.js";
 
-const debugLogger = createDebugLogger('HOOKS_DIALOG');
+const debugLogger = createDebugLogger("HOOKS_DIALOG");
 
 /**
  * Type guard to check if a value is a valid HookConfig
  */
 function isValidHookConfig(config: unknown): config is HookConfig {
   return (
-    typeof config === 'object' &&
+    typeof config === "object" &&
     config !== null &&
-    'type' in config &&
-    'command' in config &&
-    ('command' in (config as any) && typeof (config as any).command === 'string')
+    "type" in config &&
+    "command" in config &&
+    "command" in (config as any) &&
+    typeof (config as any).command === "string"
   );
 }
 
@@ -53,26 +51,26 @@ function isValidHookConfig(config: unknown): config is HookConfig {
  * Type guard to check if a value is a valid HookDefinition
  */
 function isValidHookDefinition(def: unknown): def is HookDefinition {
-  if (typeof def !== 'object' || def === null) {
+  if (typeof def !== "object" || def === null) {
     return false;
   }
   const obj = def as Record<string, unknown>;
   // hooks array is required
-  if (!('hooks' in obj) || !Array.isArray(obj['hooks'])) {
+  if (!("hooks" in obj) || !Array.isArray(obj["hooks"])) {
     return false;
   }
   // Validate each hook config in the array
-  for (const hook of obj['hooks']) {
+  for (const hook of obj["hooks"]) {
     if (!isValidHookConfig(hook)) {
       return false;
     }
   }
   // matcher is optional but must be a string if present
-  if ('matcher' in obj && typeof obj['matcher'] !== 'string') {
+  if ("matcher" in obj && typeof obj["matcher"] !== "string") {
     return false;
   }
   // sequential is optional but must be a boolean if present
-  if ('sequential' in obj && typeof obj['sequential'] !== 'boolean') {
+  if ("sequential" in obj && typeof obj["sequential"] !== "boolean") {
     return false;
   }
   return true;
@@ -81,10 +79,8 @@ function isValidHookDefinition(def: unknown): def is HookDefinition {
 /**
  * Type guard to check if a value is a valid hooks record
  */
-function isValidHooksRecord(
-  hooks: unknown,
-): hooks is Record<string, HookDefinition[]> {
-  if (typeof hooks !== 'object' || hooks === null) {
+function isValidHooksRecord(hooks: unknown): hooks is Record<string, HookDefinition[]> {
+  if (typeof hooks !== "object" || hooks === null) {
     return false;
   }
   const record = hooks as Record<string, unknown>;
@@ -105,9 +101,7 @@ function isValidHooksRecord(
   return true;
 }
 
-export function HooksManagementDialog({
-  onClose,
-}: HooksManagementDialogProps): React.JSX.Element {
+export function HooksManagementDialog({ onClose }: HooksManagementDialogProps): React.JSX.Element {
   const config = useConfig();
   const { columns: width } = useTerminalSize();
   const boxWidth = width - 4;
@@ -120,9 +114,7 @@ export function HooksManagementDialog({
   const disableAllHooks = config?.getDisableAllHooks() ?? false;
 
   const [navigationStack, setNavigationStack] = useState<string[]>([
-    disableAllHooks
-      ? HOOKS_MANAGEMENT_STEPS.HOOKS_DISABLED
-      : HOOKS_MANAGEMENT_STEPS.HOOKS_LIST,
+    disableAllHooks ? HOOKS_MANAGEMENT_STEPS.HOOKS_DISABLED : HOOKS_MANAGEMENT_STEPS.HOOKS_LIST,
   ]);
   const [selectedHookIndex, setSelectedHookIndex] = useState<number>(-1);
   const [selectedConfigIndex, setSelectedConfigIndex] = useState<number>(-1);
@@ -135,8 +127,7 @@ export function HooksManagementDialog({
 
   // Current step
   const currentStep =
-    navigationStack[navigationStack.length - 1] ||
-    HOOKS_MANAGEMENT_STEPS.HOOKS_LIST;
+    navigationStack[navigationStack.length - 1] || HOOKS_MANAGEMENT_STEPS.HOOKS_LIST;
 
   // Selected hook event
   const selectedHook = useMemo(() => {
@@ -151,7 +142,7 @@ export function HooksManagementDialog({
     (key) => {
       if (isLoading || loadError) {
         // Allow Escape to close even during loading/error states
-        if (key.name === 'escape') {
+        if (key.name === "escape") {
           onClose();
         }
         return;
@@ -159,55 +150,45 @@ export function HooksManagementDialog({
 
       switch (currentStep) {
         case HOOKS_MANAGEMENT_STEPS.HOOKS_DISABLED:
-          if (key.name === 'escape') {
+          if (key.name === "escape") {
             onClose();
           }
           break;
 
         case HOOKS_MANAGEMENT_STEPS.HOOKS_LIST:
-          if (key.name === 'up') {
+          if (key.name === "up") {
             setListSelectedIndex((prev) => Math.max(0, prev - 1));
-          } else if (key.name === 'down') {
-            setListSelectedIndex((prev) =>
-              Math.min(hooks.length - 1, prev + 1),
-            );
-          } else if (key.name === 'return') {
+          } else if (key.name === "down") {
+            setListSelectedIndex((prev) => Math.min(hooks.length - 1, prev + 1));
+          } else if (key.name === "return") {
             if (hooks.length > 0 && listSelectedIndex >= 0) {
               setSelectedHookIndex(listSelectedIndex);
               setSelectedConfigIndex(-1);
               setDetailSelectedIndex(0);
-              setNavigationStack((prev) => [
-                ...prev,
-                HOOKS_MANAGEMENT_STEPS.HOOK_DETAIL,
-              ]);
+              setNavigationStack((prev) => [...prev, HOOKS_MANAGEMENT_STEPS.HOOK_DETAIL]);
             }
-          } else if (key.name === 'escape') {
+          } else if (key.name === "escape") {
             onClose();
           }
           break;
 
         case HOOKS_MANAGEMENT_STEPS.HOOK_DETAIL:
-          if (key.name === 'escape') {
+          if (key.name === "escape") {
             handleNavigateBack();
           } else if (selectedHook && selectedHook.configs.length > 0) {
-            if (key.name === 'up') {
+            if (key.name === "up") {
               setDetailSelectedIndex((prev) => Math.max(0, prev - 1));
-            } else if (key.name === 'down') {
-              setDetailSelectedIndex((prev) =>
-                Math.min(selectedHook.configs.length - 1, prev + 1),
-              );
-            } else if (key.name === 'return') {
+            } else if (key.name === "down") {
+              setDetailSelectedIndex((prev) => Math.min(selectedHook.configs.length - 1, prev + 1));
+            } else if (key.name === "return") {
               setSelectedConfigIndex(detailSelectedIndex);
-              setNavigationStack((prev) => [
-                ...prev,
-                HOOKS_MANAGEMENT_STEPS.HOOK_CONFIG_DETAIL,
-              ]);
+              setNavigationStack((prev) => [...prev, HOOKS_MANAGEMENT_STEPS.HOOK_CONFIG_DETAIL]);
             }
           }
           break;
 
         case HOOKS_MANAGEMENT_STEPS.HOOK_CONFIG_DETAIL:
-          if (key.name === 'escape') {
+          if (key.name === "escape") {
             handleNavigateBack();
           }
           break;
@@ -226,9 +207,7 @@ export function HooksManagementDialog({
 
     const settings = loadSettings();
     const userSettings = settings.forScope(SettingScope.User).settings;
-    const workspaceSettings = settings.forScope(
-      SettingScope.Workspace,
-    ).settings;
+    const workspaceSettings = settings.forScope(SettingScope.Workspace).settings;
 
     // Get translated source display map
     const sourceDisplayMap = getTranslatedSourceDisplayMap();
@@ -240,7 +219,7 @@ export function HooksManagementDialog({
 
       // Get hooks from user settings (with type validation)
       const userSettingsRecord = userSettings as Record<string, unknown>;
-      const userHooksRaw = userSettingsRecord?.['hooks'];
+      const userHooksRaw = userSettingsRecord?.["hooks"];
       if (isValidHooksRecord(userHooksRaw) && userHooksRaw[eventName]) {
         for (const def of userHooksRaw[eventName]) {
           for (const hookConfig of def.hooks) {
@@ -255,15 +234,9 @@ export function HooksManagementDialog({
       }
 
       // Get hooks from workspace settings (with type validation)
-      const workspaceSettingsRecord = workspaceSettings as Record<
-        string,
-        unknown
-      >;
-      const workspaceHooksRaw = workspaceSettingsRecord?.['hooks'];
-      if (
-        isValidHooksRecord(workspaceHooksRaw) &&
-        workspaceHooksRaw[eventName]
-      ) {
+      const workspaceSettingsRecord = workspaceSettings as Record<string, unknown>;
+      const workspaceHooksRaw = workspaceSettingsRecord?.["hooks"];
+      if (isValidHooksRecord(workspaceHooksRaw) && workspaceHooksRaw[eventName]) {
         for (const def of workspaceHooksRaw[eventName]) {
           for (const hookConfig of def.hooks) {
             hookInfo.configs.push({
@@ -317,10 +290,8 @@ export function HooksManagementDialog({
       }
     } catch (error) {
       if (!cancelled) {
-        debugLogger.error('Error loading hooks:', error);
-        setLoadError(
-          error instanceof Error ? error.message : 'Failed to load hooks',
-        );
+        debugLogger.error("Error loading hooks:", error);
+        setLoadError(error instanceof Error ? error.message : "Failed to load hooks");
       }
     } finally {
       if (!cancelled) {
@@ -371,7 +342,7 @@ export function HooksManagementDialog({
     if (isLoading) {
       return (
         <Box flexDirection="column" paddingX={1}>
-          <Text color={theme.text.secondary}>{t('Loading hooks...')}</Text>
+          <Text color={theme.text.secondary}>{t("Loading hooks...")}</Text>
         </Box>
       );
     }
@@ -379,12 +350,10 @@ export function HooksManagementDialog({
     if (loadError) {
       return (
         <Box flexDirection="column" paddingX={1}>
-          <Text color={theme.status.error}>{t('Error loading hooks:')}</Text>
+          <Text color={theme.status.error}>{t("Error loading hooks:")}</Text>
           <Text color={theme.text.secondary}>{loadError}</Text>
           <Box marginTop={1}>
-            <Text color={theme.text.secondary}>
-              {t('Press Escape to close')}
-            </Text>
+            <Text color={theme.text.secondary}>{t("Press Escape to close")}</Text>
           </Box>
         </Box>
       );
@@ -392,39 +361,25 @@ export function HooksManagementDialog({
 
     switch (currentStep) {
       case HOOKS_MANAGEMENT_STEPS.HOOKS_LIST:
-        return (
-          <HooksListStep hooks={hooks} selectedIndex={listSelectedIndex} />
-        );
+        return <HooksListStep hooks={hooks} selectedIndex={listSelectedIndex} />;
 
       case HOOKS_MANAGEMENT_STEPS.HOOK_DETAIL:
         if (selectedHook) {
-          return (
-            <HookDetailStep
-              hook={selectedHook}
-              selectedIndex={detailSelectedIndex}
-            />
-          );
+          return <HookDetailStep hook={selectedHook} selectedIndex={detailSelectedIndex} />;
         }
         return (
           <Box flexDirection="column" paddingX={1}>
-            <Text color={theme.text.secondary}>{t('No hook selected')}</Text>
+            <Text color={theme.text.secondary}>{t("No hook selected")}</Text>
           </Box>
         );
 
       case HOOKS_MANAGEMENT_STEPS.HOOK_CONFIG_DETAIL:
         if (selectedHook && selectedConfig) {
-          return (
-            <HookConfigDetailStep
-              hookEvent={selectedHook}
-              hookConfig={selectedConfig}
-            />
-          );
+          return <HookConfigDetailStep hookEvent={selectedHook} hookConfig={selectedConfig} />;
         }
         return (
           <Box flexDirection="column" paddingX={1}>
-            <Text color={theme.text.secondary}>
-              {t('No hook config selected')}
-            </Text>
+            <Text color={theme.text.secondary}>{t("No hook config selected")}</Text>
           </Box>
         );
 
diff --git a/apps/airiscode-cli/src/ui/components/hooks/constants.ts b/apps/airiscode-cli/src/ui/components/hooks/constants.ts
index 081063bf5..6b1747753 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/constants.ts
+++ b/apps/airiscode-cli/src/ui/components/hooks/constants.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { HooksConfigSource, HookEventName } from '@airiscode/core';
-import type { HookExitCode, HookEventDisplayInfo } from './types.js';
-import { t } from '../../../i18n/index.js';
+import { HookEventName, HooksConfigSource } from "@airiscode/core";
+import { t } from "../../../i18n/index.js";
+import type { HookEventDisplayInfo, HookExitCode } from "./types.js";
 
 /**
  * Exit code descriptions for different hook types
@@ -14,85 +14,83 @@ import { t } from '../../../i18n/index.js';
 export function getHookExitCodes(eventName: string): HookExitCode[] {
   const exitCodesMap: Record<string, HookExitCode[]> = {
     [HookEventName.Stop]: [
-      { code: 0, description: t('stdout/stderr not shown') },
+      { code: 0, description: t("stdout/stderr not shown") },
       {
         code: 2,
-        description: t('show stderr to model and continue conversation'),
+        description: t("show stderr to model and continue conversation"),
       },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: "Other", description: t("show stderr to user only") },
     ],
     [HookEventName.PreToolUse]: [
-      { code: 0, description: t('stdout/stderr not shown') },
-      { code: 2, description: t('show stderr to model and block tool call') },
+      { code: 0, description: t("stdout/stderr not shown") },
+      { code: 2, description: t("show stderr to model and block tool call") },
       {
-        code: 'Other',
-        description: t('show stderr to user only but continue with tool call'),
+        code: "Other",
+        description: t("show stderr to user only but continue with tool call"),
       },
     ],
     [HookEventName.PostToolUse]: [
-      { code: 0, description: t('stdout shown in transcript mode (ctrl+o)') },
-      { code: 2, description: t('show stderr to model immediately') },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: 0, description: t("stdout shown in transcript mode (ctrl+o)") },
+      { code: 2, description: t("show stderr to model immediately") },
+      { code: "Other", description: t("show stderr to user only") },
     ],
     [HookEventName.PostToolUseFailure]: [
-      { code: 0, description: t('stdout shown in transcript mode (ctrl+o)') },
-      { code: 2, description: t('show stderr to model immediately') },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: 0, description: t("stdout shown in transcript mode (ctrl+o)") },
+      { code: 2, description: t("show stderr to model immediately") },
+      { code: "Other", description: t("show stderr to user only") },
     ],
     [HookEventName.Notification]: [
-      { code: 0, description: t('stdout/stderr not shown') },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: 0, description: t("stdout/stderr not shown") },
+      { code: "Other", description: t("show stderr to user only") },
     ],
     [HookEventName.UserPromptSubmit]: [
-      { code: 0, description: t('stdout shown to Qwen') },
+      { code: 0, description: t("stdout shown to Qwen") },
       {
         code: 2,
-        description: t(
-          'block processing, erase original prompt, and show stderr to user only',
-        ),
+        description: t("block processing, erase original prompt, and show stderr to user only"),
       },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: "Other", description: t("show stderr to user only") },
     ],
     [HookEventName.SessionStart]: [
-      { code: 0, description: t('stdout shown to Qwen') },
+      { code: 0, description: t("stdout shown to Qwen") },
       {
-        code: 'Other',
-        description: t('show stderr to user only (blocking errors ignored)'),
+        code: "Other",
+        description: t("show stderr to user only (blocking errors ignored)"),
       },
     ],
     [HookEventName.SessionEnd]: [
-      { code: 0, description: t('command completes successfully') },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: 0, description: t("command completes successfully") },
+      { code: "Other", description: t("show stderr to user only") },
     ],
     [HookEventName.SubagentStart]: [
-      { code: 0, description: t('stdout shown to subagent') },
+      { code: 0, description: t("stdout shown to subagent") },
       {
-        code: 'Other',
-        description: t('show stderr to user only (blocking errors ignored)'),
+        code: "Other",
+        description: t("show stderr to user only (blocking errors ignored)"),
       },
     ],
     [HookEventName.SubagentStop]: [
-      { code: 0, description: t('stdout/stderr not shown') },
+      { code: 0, description: t("stdout/stderr not shown") },
       {
         code: 2,
-        description: t('show stderr to subagent and continue having it run'),
+        description: t("show stderr to subagent and continue having it run"),
       },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: "Other", description: t("show stderr to user only") },
     ],
     [HookEventName.PreCompact]: [
       {
         code: 0,
-        description: t('stdout appended as custom compact instructions'),
+        description: t("stdout appended as custom compact instructions"),
       },
-      { code: 2, description: t('block compaction') },
+      { code: 2, description: t("block compaction") },
       {
-        code: 'Other',
-        description: t('show stderr to user only but continue with compaction'),
+        code: "Other",
+        description: t("show stderr to user only but continue with compaction"),
       },
     ],
     [HookEventName.PermissionRequest]: [
-      { code: 0, description: t('use hook decision if provided') },
-      { code: 'Other', description: t('show stderr to user only') },
+      { code: 0, description: t("use hook decision if provided") },
+      { code: "Other", description: t("show stderr to user only") },
     ],
   };
   return exitCodesMap[eventName] || [];
@@ -103,26 +101,20 @@ export function getHookExitCodes(eventName: string): HookExitCode[] {
  */
 export function getHookShortDescription(eventName: string): string {
   const descriptions: Record<string, string> = {
-    [HookEventName.PreToolUse]: t('Before tool execution'),
-    [HookEventName.PostToolUse]: t('After tool execution'),
-    [HookEventName.PostToolUseFailure]: t('After tool execution fails'),
-    [HookEventName.Notification]: t('When notifications are sent'),
-    [HookEventName.UserPromptSubmit]: t('When the user submits a prompt'),
-    [HookEventName.SessionStart]: t('When a new session is started'),
-    [HookEventName.Stop]: t('Right before AIRIS Code concludes its response'),
-    [HookEventName.SubagentStart]: t(
-      'When a subagent (Agent tool call) is started',
-    ),
-    [HookEventName.SubagentStop]: t(
-      'Right before a subagent concludes its response',
-    ),
-    [HookEventName.PreCompact]: t('Before conversation compaction'),
-    [HookEventName.SessionEnd]: t('When a session is ending'),
-    [HookEventName.PermissionRequest]: t(
-      'When a permission dialog is displayed',
-    ),
+    [HookEventName.PreToolUse]: t("Before tool execution"),
+    [HookEventName.PostToolUse]: t("After tool execution"),
+    [HookEventName.PostToolUseFailure]: t("After tool execution fails"),
+    [HookEventName.Notification]: t("When notifications are sent"),
+    [HookEventName.UserPromptSubmit]: t("When the user submits a prompt"),
+    [HookEventName.SessionStart]: t("When a new session is started"),
+    [HookEventName.Stop]: t("Right before AIRIS Code concludes its response"),
+    [HookEventName.SubagentStart]: t("When a subagent (Agent tool call) is started"),
+    [HookEventName.SubagentStop]: t("Right before a subagent concludes its response"),
+    [HookEventName.PreCompact]: t("Before conversation compaction"),
+    [HookEventName.SessionEnd]: t("When a session is ending"),
+    [HookEventName.PermissionRequest]: t("When a permission dialog is displayed"),
   };
-  return descriptions[eventName] || '';
+  return descriptions[eventName] || "";
 }
 
 /**
@@ -130,56 +122,39 @@ export function getHookShortDescription(eventName: string): string {
  */
 export function getHookDescription(eventName: string): string {
   const descriptions: Record<string, string> = {
-    [HookEventName.Stop]: '',
-    [HookEventName.PreToolUse]: t(
-      'Input to command is JSON of tool call arguments.',
-    ),
+    [HookEventName.Stop]: "",
+    [HookEventName.PreToolUse]: t("Input to command is JSON of tool call arguments."),
     [HookEventName.PostToolUse]: t(
       'Input to command is JSON with fields "inputs" (tool call arguments) and "response" (tool call response).',
     ),
     [HookEventName.PostToolUseFailure]: t(
-      'Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.',
-    ),
-    [HookEventName.Notification]: t(
-      'Input to command is JSON with notification message and type.',
-    ),
-    [HookEventName.UserPromptSubmit]: t(
-      'Input to command is JSON with original user prompt text.',
-    ),
-    [HookEventName.SessionStart]: t(
-      'Input to command is JSON with session start source.',
-    ),
-    [HookEventName.SessionEnd]: t(
-      'Input to command is JSON with session end reason.',
-    ),
-    [HookEventName.SubagentStart]: t(
-      'Input to command is JSON with agent_id and agent_type.',
+      "Input to command is JSON with tool_name, tool_input, tool_use_id, error, error_type, is_interrupt, and is_timeout.",
     ),
+    [HookEventName.Notification]: t("Input to command is JSON with notification message and type."),
+    [HookEventName.UserPromptSubmit]: t("Input to command is JSON with original user prompt text."),
+    [HookEventName.SessionStart]: t("Input to command is JSON with session start source."),
+    [HookEventName.SessionEnd]: t("Input to command is JSON with session end reason."),
+    [HookEventName.SubagentStart]: t("Input to command is JSON with agent_id and agent_type."),
     [HookEventName.SubagentStop]: t(
-      'Input to command is JSON with agent_id, agent_type, and agent_transcript_path.',
-    ),
-    [HookEventName.PreCompact]: t(
-      'Input to command is JSON with compaction details.',
+      "Input to command is JSON with agent_id, agent_type, and agent_transcript_path.",
     ),
+    [HookEventName.PreCompact]: t("Input to command is JSON with compaction details."),
     [HookEventName.PermissionRequest]: t(
-      'Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.',
+      "Input to command is JSON with tool_name, tool_input, and tool_use_id. Output JSON with hookSpecificOutput containing decision to allow or deny.",
     ),
   };
-  return descriptions[eventName] || '';
+  return descriptions[eventName] || "";
 }
 
 /**
  * Source display mapping (translated)
  */
-export function getTranslatedSourceDisplayMap(): Record<
-  HooksConfigSource,
-  string
-> {
+export function getTranslatedSourceDisplayMap(): Record<HooksConfigSource, string> {
   return {
-    [HooksConfigSource.Project]: t('Local Settings'),
-    [HooksConfigSource.User]: t('User Settings'),
-    [HooksConfigSource.System]: t('System Settings'),
-    [HooksConfigSource.Extensions]: t('Extensions'),
+    [HooksConfigSource.Project]: t("Local Settings"),
+    [HooksConfigSource.User]: t("User Settings"),
+    [HooksConfigSource.System]: t("System Settings"),
+    [HooksConfigSource.Extensions]: t("Extensions"),
   };
 }
 
@@ -190,15 +165,12 @@ export function getTranslatedSourceDisplayMap(): Record<
  * needs to be different (e.g., grouped by lifecycle phase), consider using
  * an explicit sorted array instead. Current enum order is acceptable for display.
  */
-export const DISPLAY_HOOK_EVENTS: HookEventName[] =
-  Object.values(HookEventName);
+export const DISPLAY_HOOK_EVENTS: HookEventName[] = Object.values(HookEventName);
 
 /**
  * Create empty hook event display info
  */
-export function createEmptyHookEventInfo(
-  eventName: HookEventName,
-): HookEventDisplayInfo {
+export function createEmptyHookEventInfo(eventName: HookEventName): HookEventDisplayInfo {
   return {
     event: eventName,
     shortDescription: getHookShortDescription(eventName),
diff --git a/apps/airiscode-cli/src/ui/components/hooks/index.ts b/apps/airiscode-cli/src/ui/components/hooks/index.ts
index 0c2669ec7..6e8222cb2 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/index.ts
+++ b/apps/airiscode-cli/src/ui/components/hooks/index.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { HooksManagementDialog } from './HooksManagementDialog.js';
-export { HooksListStep } from './HooksListStep.js';
-export { HookDetailStep } from './HookDetailStep.js';
-export { HookConfigDetailStep } from './HookConfigDetailStep.js';
-export { HooksDisabledStep } from './HooksDisabledStep.js';
-export * from './types.js';
-export * from './constants.js';
+export * from "./constants.js";
+export { HookConfigDetailStep } from "./HookConfigDetailStep.js";
+export { HookDetailStep } from "./HookDetailStep.js";
+export { HooksDisabledStep } from "./HooksDisabledStep.js";
+export { HooksListStep } from "./HooksListStep.js";
+export { HooksManagementDialog } from "./HooksManagementDialog.js";
+export * from "./types.js";
diff --git a/apps/airiscode-cli/src/ui/components/hooks/types.ts b/apps/airiscode-cli/src/ui/components/hooks/types.ts
index 113ac3389..7823f4cfb 100644
--- a/apps/airiscode-cli/src/ui/components/hooks/types.ts
+++ b/apps/airiscode-cli/src/ui/components/hooks/types.ts
@@ -4,11 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  HookConfig,
-  HooksConfigSource,
-  HookEventName,
-} from '@airiscode/core';
+import type { HookConfig, HookEventName, HooksConfigSource } from "@airiscode/core";
 
 /**
  * Exit code description for hooks
@@ -44,10 +40,10 @@ export interface HookConfigDisplayInfo {
  * Hook management dialog step names
  */
 export const HOOKS_MANAGEMENT_STEPS = {
-  HOOKS_DISABLED: 'hooks_disabled',
-  HOOKS_LIST: 'hooks_list',
-  HOOK_DETAIL: 'hook_detail',
-  HOOK_CONFIG_DETAIL: 'hook_config_detail',
+  HOOKS_DISABLED: "hooks_disabled",
+  HOOKS_LIST: "hooks_list",
+  HOOK_DETAIL: "hook_detail",
+  HOOK_CONFIG_DETAIL: "hook_config_detail",
 } as const;
 
 export type HooksManagementStep =
diff --git a/apps/airiscode-cli/src/ui/components/mcp/MCPManagementDialog.tsx b/apps/airiscode-cli/src/ui/components/mcp/MCPManagementDialog.tsx
index bf29671de..a1193aead 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/MCPManagementDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/mcp/MCPManagementDialog.tsx
@@ -4,60 +4,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useEffect, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { t } from '../../../i18n/index.js';
-import type {
-  MCPManagementDialogProps,
-  MCPServerDisplayInfo,
-  MCPToolDisplayInfo,
-} from './types.js';
-import { MCP_MANAGEMENT_STEPS } from './types.js';
-import { ServerListStep } from './steps/ServerListStep.js';
-import { ServerDetailStep } from './steps/ServerDetailStep.js';
-import { ToolListStep } from './steps/ToolListStep.js';
-import { ToolDetailStep } from './steps/ToolDetailStep.js';
-import { DisableScopeSelectStep } from './steps/DisableScopeSelectStep.js';
-import { AuthenticateStep } from './steps/AuthenticateStep.js';
-import { useConfig } from '../../contexts/ConfigContext.js';
 import {
-  getMCPServerStatus,
+  type AnyDeclarativeTool,
+  createDebugLogger,
+  type DiscoveredMCPPrompt,
   DiscoveredMCPTool,
+  getMCPServerStatus,
   MCPOAuthTokenStorage,
   type MCPServerConfig,
-  type AnyDeclarativeTool,
-  type DiscoveredMCPPrompt,
-  createDebugLogger,
-} from '@airiscode/core';
-import { loadSettings, SettingScope } from '../../../config/settings.js';
-import { isToolValid, getToolInvalidReasons } from './utils.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+} from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { loadSettings, SettingScope } from "../../../config/settings.js";
+import { t } from "../../../i18n/index.js";
+import { useConfig } from "../../contexts/ConfigContext.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import { theme } from "../../semantic-colors.js";
+import { AuthenticateStep } from "./steps/AuthenticateStep.js";
+import { DisableScopeSelectStep } from "./steps/DisableScopeSelectStep.js";
+import { ServerDetailStep } from "./steps/ServerDetailStep.js";
+import { ServerListStep } from "./steps/ServerListStep.js";
+import { ToolDetailStep } from "./steps/ToolDetailStep.js";
+import { ToolListStep } from "./steps/ToolListStep.js";
+import type {
+  MCPManagementDialogProps,
+  MCPServerDisplayInfo,
+  MCPToolDisplayInfo,
+} from "./types.js";
+import { MCP_MANAGEMENT_STEPS } from "./types.js";
+import { getToolInvalidReasons, isToolValid } from "./utils.js";
 
-const debugLogger = createDebugLogger('MCP_DIALOG');
+const debugLogger = createDebugLogger("MCP_DIALOG");
 
-export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
-  onClose,
-}) => {
+export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({ onClose }) => {
   const config = useConfig();
   const { columns: width } = useTerminalSize();
   const boxWidth = width - 4;
 
   const [servers, setServers] = useState<MCPServerDisplayInfo[]>([]);
   const [selectedServerIndex, setSelectedServerIndex] = useState<number>(-1);
-  const [selectedTool, setSelectedTool] = useState<MCPToolDisplayInfo | null>(
-    null,
-  );
+  const [selectedTool, setSelectedTool] = useState<MCPToolDisplayInfo | null>(null);
   const [navigationStack, setNavigationStack] = useState<string[]>([
     MCP_MANAGEMENT_STEPS.SERVER_LIST,
   ]);
   const [isLoading, setIsLoading] = useState(true);
 
   // Load MCP server data - extracted to a separate function for reuse
-  const fetchServerData = useCallback(async (): Promise<
-    MCPServerDisplayInfo[]
-  > => {
+  const fetchServerData = useCallback(async (): Promise<MCPServerDisplayInfo[]> => {
     if (!config) return [];
 
     const mcpServers = config.getMcpServers() || {};
@@ -67,9 +61,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
     // Get settings to determine the scope of each server
     const settings = loadSettings();
     const userSettings = settings.forScope(SettingScope.User).settings;
-    const workspaceSettings = settings.forScope(
-      SettingScope.Workspace,
-    ).settings;
+    const workspaceSettings = settings.forScope(SettingScope.Workspace).settings;
 
     const serverInfos: MCPServerDisplayInfo[] = [];
 
@@ -81,34 +73,28 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       // Get tools for this server
       const allTools: AnyDeclarativeTool[] = toolRegistry?.getAllTools() || [];
       const serverTools = allTools.filter(
-        (t): t is DiscoveredMCPTool =>
-          t instanceof DiscoveredMCPTool && t.serverName === name,
+        (t): t is DiscoveredMCPTool => t instanceof DiscoveredMCPTool && t.serverName === name,
       );
 
       // Get prompts for this server
-      const allPrompts: DiscoveredMCPPrompt[] =
-        promptRegistry?.getAllPrompts() || [];
-      const serverPrompts = allPrompts.filter(
-        (p) => 'serverName' in p && p.serverName === name,
-      );
+      const allPrompts: DiscoveredMCPPrompt[] = promptRegistry?.getAllPrompts() || [];
+      const serverPrompts = allPrompts.filter((p) => "serverName" in p && p.serverName === name);
 
       // Determine source type
-      let source: 'user' | 'project' | 'extension' = 'user';
+      let source: "user" | "project" | "extension" = "user";
       if (serverConfig.extensionName) {
-        source = 'extension';
+        source = "extension";
       } else if (workspaceSettings.mcpServers?.[name]) {
-        source = 'project';
+        source = "project";
       } else if (userSettings.mcpServers?.[name]) {
-        source = 'user';
+        source = "user";
       }
 
       // Use config.isMcpServerDisabled() to check if server is disabled
       const isDisabled = config.isMcpServerDisabled(name);
 
       // Count invalid tools (missing name or description)
-      const invalidToolCount = serverTools.filter(
-        (t) => !t.name || !t.description,
-      ).length;
+      const invalidToolCount = serverTools.filter((t) => !t.name || !t.description).length;
 
       // Check if OAuth tokens exist for this server
       let hasOAuthTokens = false;
@@ -144,7 +130,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         const serverInfos = await fetchServerData();
         setServers(serverInfos);
       } catch (error) {
-        debugLogger.error('Error loading MCP servers:', error);
+        debugLogger.error("Error loading MCP servers:", error);
       } finally {
         setIsLoading(false);
       }
@@ -163,9 +149,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
 
   // Current step
   const getCurrentStep = useCallback(
-    () =>
-      navigationStack[navigationStack.length - 1] ||
-      MCP_MANAGEMENT_STEPS.SERVER_LIST,
+    () => navigationStack[navigationStack.length - 1] || MCP_MANAGEMENT_STEPS.SERVER_LIST,
     [navigationStack],
   );
 
@@ -200,10 +184,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
     const allTools: AnyDeclarativeTool[] = toolRegistry.getAllTools();
     const mcpTools: DiscoveredMCPTool[] = [];
     for (const tool of allTools) {
-      if (
-        tool instanceof DiscoveredMCPTool &&
-        tool.serverName === selectedServer.name
-      ) {
+      if (tool instanceof DiscoveredMCPTool && tool.serverName === selectedServer.name) {
         mcpTools.push(tool);
       }
     }
@@ -214,11 +195,11 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       let invalidReason: string | undefined;
       if (!isValid) {
         const reasons = getToolInvalidReasons(tool.name, tool.description);
-        invalidReason = reasons.map((r) => t(r)).join(', ');
+        invalidReason = reasons.map((r) => t(r)).join(", ");
       }
 
       return {
-        name: tool.name || t('(unnamed)'),
+        name: tool.name || t("(unnamed)"),
         description: tool.description,
         serverName: tool.serverName,
         schema: tool.parameterSchema as object | undefined,
@@ -255,7 +236,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       const serverInfos = await fetchServerData();
       setServers(serverInfos);
     } catch (error) {
-      debugLogger.error('Error reloading MCP servers:', error);
+      debugLogger.error("Error reloading MCP servers:", error);
     } finally {
       setIsLoading(false);
     }
@@ -269,9 +250,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       setIsLoading(true);
       const tokenStorage = new MCPOAuthTokenStorage();
       await tokenStorage.deleteCredentials(selectedServer.name);
-      debugLogger.info(
-        `Cleared OAuth tokens for server '${selectedServer.name}'`,
-      );
+      debugLogger.info(`Cleared OAuth tokens for server '${selectedServer.name}'`);
 
       // Disconnect the server so it no longer appears as connected
       const toolRegistry = config.getToolRegistry();
@@ -282,10 +261,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       // Reload to update hasOAuthTokens flag and server status
       await reloadServers();
     } catch (error) {
-      debugLogger.error(
-        `Error clearing OAuth tokens for server '${selectedServer.name}':`,
-        error,
-      );
+      debugLogger.error(`Error clearing OAuth tokens for server '${selectedServer.name}':`, error);
     } finally {
       setIsLoading(false);
     }
@@ -304,10 +280,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       // Reload server data to update status
       await reloadServers();
     } catch (error) {
-      debugLogger.error(
-        `Error reconnecting to server '${selectedServer.name}':`,
-        error,
-      );
+      debugLogger.error(`Error reconnecting to server '${selectedServer.name}':`, error);
     } finally {
       setIsLoading(false);
     }
@@ -329,18 +302,14 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         const currentExcluded = scopeSettings.mcp?.excluded || [];
 
         if (currentExcluded.includes(server.name)) {
-          const newExcluded = currentExcluded.filter(
-            (name: string) => name !== server.name,
-          );
-          settings.setValue(scope, 'mcp.excluded', newExcluded);
+          const newExcluded = currentExcluded.filter((name: string) => name !== server.name);
+          settings.setValue(scope, "mcp.excluded", newExcluded);
         }
       }
 
       // Update runtime config exclusion list
       const currentExcluded = config.getExcludedMcpServers() || [];
-      const newExcluded = currentExcluded.filter(
-        (name: string) => name !== server.name,
-      );
+      const newExcluded = currentExcluded.filter((name: string) => name !== server.name);
       config.setExcludedMcpServers(newExcluded);
 
       // Rediscover tools for this server
@@ -352,10 +321,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       // Reload server data
       await reloadServers();
     } catch (error) {
-      debugLogger.error(
-        `Error enabling server '${selectedServer.name}':`,
-        error,
-      );
+      debugLogger.error(`Error enabling server '${selectedServer.name}':`, error);
     } finally {
       setIsLoading(false);
     }
@@ -377,22 +343,20 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         const settings = loadSettings();
 
         // Determine the scope based on server configuration location
-        let targetScope: 'user' | 'workspace' = 'user';
-        if (server.source === 'extension') {
+        let targetScope: "user" | "workspace" = "user";
+        if (server.source === "extension") {
           // Extension servers should not be disabled through user/workspace settings
           // Show error message and return
-          debugLogger.warn(
-            `Cannot disable extension MCP server '${server.name}'`,
-          );
+          debugLogger.warn(`Cannot disable extension MCP server '${server.name}'`);
           setIsLoading(false);
           return;
-        } else if (server.source === 'project') {
-          targetScope = 'workspace';
+        } else if (server.source === "project") {
+          targetScope = "workspace";
         }
 
         // Get current exclusion list for the target scope
         const scopeSettings = settings.forScope(
-          targetScope === 'user' ? SettingScope.User : SettingScope.Workspace,
+          targetScope === "user" ? SettingScope.User : SettingScope.Workspace,
         ).settings;
         const currentExcluded = scopeSettings.mcp?.excluded || [];
 
@@ -400,8 +364,8 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         if (!currentExcluded.includes(server.name)) {
           const newExcluded = [...currentExcluded, server.name];
           settings.setValue(
-            targetScope === 'user' ? SettingScope.User : SettingScope.Workspace,
-            'mcp.excluded',
+            targetScope === "user" ? SettingScope.User : SettingScope.Workspace,
+            "mcp.excluded",
             newExcluded,
           );
         }
@@ -415,10 +379,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         // Reload server list
         await reloadServers();
       } catch (error) {
-        debugLogger.error(
-          `Error disabling server '${selectedServer.name}':`,
-          error,
-        );
+        debugLogger.error(`Error disabling server '${selectedServer.name}':`, error);
       } finally {
         setIsLoading(false);
       }
@@ -427,7 +388,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
 
   // Execute disable after selecting scope
   const handleSelectDisableScope = useCallback(
-    async (scope: 'user' | 'workspace') => {
+    async (scope: "user" | "workspace") => {
       if (!config || !selectedServer) return;
 
       try {
@@ -438,7 +399,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
 
         // Get current exclusion list
         const scopeSettings = settings.forScope(
-          scope === 'user' ? SettingScope.User : SettingScope.Workspace,
+          scope === "user" ? SettingScope.User : SettingScope.Workspace,
         ).settings;
         const currentExcluded = scopeSettings.mcp?.excluded || [];
 
@@ -446,8 +407,8 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         if (!currentExcluded.includes(server.name)) {
           const newExcluded = [...currentExcluded, server.name];
           settings.setValue(
-            scope === 'user' ? SettingScope.User : SettingScope.Workspace,
-            'mcp.excluded',
+            scope === "user" ? SettingScope.User : SettingScope.Workspace,
+            "mcp.excluded",
             newExcluded,
           );
         }
@@ -464,10 +425,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         // Return to server detail page
         handleNavigateBack();
       } catch (error) {
-        debugLogger.error(
-          `Error disabling server '${selectedServer.name}':`,
-          error,
-        );
+        debugLogger.error(`Error disabling server '${selectedServer.name}':`, error);
       } finally {
         setIsLoading(false);
       }
@@ -481,10 +439,10 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
     let headerText = (
       <Box flexDirection="column">
         <Text color={theme.text.accent} bold>
-          {t('Manage MCP servers')}
+          {t("Manage MCP servers")}
         </Text>
         <Text color={theme.text.secondary}>
-          {servers.length} {servers.length === 1 ? t('server') : t('servers')}
+          {servers.length} {servers.length === 1 ? t("server") : t("servers")}
         </Text>
       </Box>
     );
@@ -494,7 +452,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         headerText = (
           <Box>
             <Text color={theme.text.accent} bold>
-              {selectedServer?.name || t('Server Detail')}
+              {selectedServer?.name || t("Server Detail")}
             </Text>
           </Box>
         );
@@ -503,13 +461,12 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         headerText = (
           <Box flexDirection="column">
             <Text color={theme.text.accent} bold>
-              {t('Tools for {{serverName}}', {
-                serverName: selectedServer?.name || 'Server',
+              {t("Tools for {{serverName}}", {
+                serverName: selectedServer?.name || "Server",
               })}
             </Text>
             <Text color={theme.text.secondary}>
-              ({getServerTools().length}{' '}
-              {getServerTools().length === 1 ? t('tool') : t('tools')})
+              ({getServerTools().length} {getServerTools().length === 1 ? t("tool") : t("tools")})
             </Text>
           </Box>
         );
@@ -519,24 +476,22 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
           <Box flexDirection="column">
             <Box>
               <Text color={theme.text.accent} bold>
-                {selectedTool?.name || t('Tool Detail')}
+                {selectedTool?.name || t("Tool Detail")}
               </Text>
               {selectedTool?.annotations?.destructiveHint && (
-                <Text color={theme.status.error}>{'[destructive]'}</Text>
+                <Text color={theme.status.error}>{"[destructive]"}</Text>
               )}
               {selectedTool?.annotations?.idempotentHint && (
-                <Text color={theme.status.warning}>{'[idempotent]'}</Text>
+                <Text color={theme.status.warning}>{"[idempotent]"}</Text>
               )}
               {selectedTool?.annotations?.readOnlyHint && (
-                <Text color={theme.status.success}>{'[read-only]'}</Text>
+                <Text color={theme.status.success}>{"[read-only]"}</Text>
               )}
               {selectedTool?.annotations?.openWorldHint && (
-                <Text color={theme.text.primary}>{'[open-world]'}</Text>
+                <Text color={theme.text.primary}>{"[open-world]"}</Text>
               )}
             </Box>
-            <Text color={theme.text.secondary}>
-              {selectedTool?.serverName || t('Server')}
-            </Text>
+            <Text color={theme.text.secondary}>{selectedTool?.serverName || t("Server")}</Text>
           </Box>
         );
         break;
@@ -544,7 +499,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         headerText = (
           <Box>
             <Text color={theme.text.accent} bold>
-              {t('OAuth Authentication')}
+              {t("OAuth Authentication")}
             </Text>
           </Box>
         );
@@ -560,16 +515,14 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
   // Render step content
   const renderStepContent = useCallback(() => {
     if (isLoading) {
-      return <Text color={theme.text.secondary}>{t('Loading...')}</Text>;
+      return <Text color={theme.text.secondary}>{t("Loading...")}</Text>;
     }
 
     const currentStep = getCurrentStep();
 
     switch (currentStep) {
       case MCP_MANAGEMENT_STEPS.SERVER_LIST:
-        return (
-          <ServerListStep servers={servers} onSelect={handleSelectServer} />
-        );
+        return <ServerListStep servers={servers} onSelect={handleSelectServer} />;
 
       case MCP_MANAGEMENT_STEPS.SERVER_DETAIL:
         return (
@@ -597,16 +550,14 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
         return (
           <ToolListStep
             tools={getServerTools()}
-            serverName={selectedServer?.name || ''}
+            serverName={selectedServer?.name || ""}
             onSelect={handleSelectTool}
             onBack={handleNavigateBack}
           />
         );
 
       case MCP_MANAGEMENT_STEPS.TOOL_DETAIL:
-        return (
-          <ToolDetailStep tool={selectedTool} onBack={handleNavigateBack} />
-        );
+        return <ToolDetailStep tool={selectedTool} onBack={handleNavigateBack} />;
 
       case MCP_MANAGEMENT_STEPS.AUTHENTICATE:
         return (
@@ -622,7 +573,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
       default:
         return (
           <Box>
-            <Text color={theme.status.error}>{t('Unknown step')}</Text>
+            <Text color={theme.status.error}>{t("Unknown step")}</Text>
           </Box>
         );
     }
@@ -648,33 +599,33 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
   // Render step footer
   const renderStepFooter = useCallback(() => {
     const currentStep = getCurrentStep();
-    let footerText = '';
+    let footerText = "";
 
     switch (currentStep) {
       case MCP_MANAGEMENT_STEPS.SERVER_LIST:
         if (servers.length === 0) {
-          footerText = t('Esc to close');
+          footerText = t("Esc to close");
         } else {
-          footerText = t('↑↓ to navigate · Enter to select · Esc to close');
+          footerText = t("↑↓ to navigate · Enter to select · Esc to close");
         }
         break;
       case MCP_MANAGEMENT_STEPS.SERVER_DETAIL:
-        footerText = t('↑↓ to navigate · Enter to select · Esc to back');
+        footerText = t("↑↓ to navigate · Enter to select · Esc to back");
         break;
       case MCP_MANAGEMENT_STEPS.DISABLE_SCOPE_SELECT:
-        footerText = t('↑↓ to navigate · Enter to confirm · Esc to back');
+        footerText = t("↑↓ to navigate · Enter to confirm · Esc to back");
         break;
       case MCP_MANAGEMENT_STEPS.TOOL_LIST:
-        footerText = t('↑↓ to navigate · Enter to select · Esc to back');
+        footerText = t("↑↓ to navigate · Enter to select · Esc to back");
         break;
       case MCP_MANAGEMENT_STEPS.TOOL_DETAIL:
-        footerText = t('Esc to back');
+        footerText = t("Esc to back");
         break;
       case MCP_MANAGEMENT_STEPS.AUTHENTICATE:
-        footerText = t('Esc to go back');
+        footerText = t("Esc to go back");
         break;
       default:
-        footerText = t('Esc to close');
+        footerText = t("Esc to close");
     }
 
     return (
@@ -687,10 +638,7 @@ export const MCPManagementDialog: React.FC<MCPManagementDialogProps> = ({
   // ESC key handler - only close dialog, child components handle back navigation to avoid duplicate triggers
   useKeypress(
     (key) => {
-      if (
-        key.name === 'escape' &&
-        getCurrentStep() === MCP_MANAGEMENT_STEPS.SERVER_LIST
-      ) {
+      if (key.name === "escape" && getCurrentStep() === MCP_MANAGEMENT_STEPS.SERVER_LIST) {
         onClose();
       }
     },
diff --git a/apps/airiscode-cli/src/ui/components/mcp/constants.ts b/apps/airiscode-cli/src/ui/components/mcp/constants.ts
index cfdc2691f..e62bfe572 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/constants.ts
+++ b/apps/airiscode-cli/src/ui/components/mcp/constants.ts
@@ -32,16 +32,16 @@ export const VISIBLE_TOOLS_COUNT = 10;
  * 分组显示名称映射
  */
 export const SOURCE_DISPLAY_NAMES: Record<string, string> = {
-  user: 'User MCPs',
-  project: 'Project MCPs',
-  extension: 'Extension MCPs',
+  user: "User MCPs",
+  project: "Project MCPs",
+  extension: "Extension MCPs",
 };
 
 /**
  * 状态显示文本
  */
 export const STATUS_TEXT: Record<string, string> = {
-  connected: 'connected',
-  connecting: 'connecting',
-  disconnected: 'failed',
+  connected: "connected",
+  connecting: "connecting",
+  disconnected: "failed",
 };
diff --git a/apps/airiscode-cli/src/ui/components/mcp/index.ts b/apps/airiscode-cli/src/ui/components/mcp/index.ts
index 01ebfee8f..6ab4eb301 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/index.ts
+++ b/apps/airiscode-cli/src/ui/components/mcp/index.ts
@@ -5,26 +5,25 @@
  */
 
 // Main Dialog
-export { MCPManagementDialog } from './MCPManagementDialog.js';
-
+export { MCPManagementDialog } from "./MCPManagementDialog.js";
+export { ServerDetailStep } from "./steps/ServerDetailStep.js";
 // Steps
-export { ServerListStep } from './steps/ServerListStep.js';
-export { ServerDetailStep } from './steps/ServerDetailStep.js';
-export { ToolListStep } from './steps/ToolListStep.js';
-export { ToolDetailStep } from './steps/ToolDetailStep.js';
+export { ServerListStep } from "./steps/ServerListStep.js";
+export { ToolDetailStep } from "./steps/ToolDetailStep.js";
+export { ToolListStep } from "./steps/ToolListStep.js";
 
 // Types
 export type {
   MCPManagementDialogProps,
+  MCPManagementStep,
+  MCPPromptDisplayInfo,
   MCPServerDisplayInfo,
   MCPToolDisplayInfo,
-  MCPPromptDisplayInfo,
-  ServerListStepProps,
   ServerDetailStepProps,
-  ToolListStepProps,
+  ServerListStepProps,
   ToolDetailStepProps,
-  MCPManagementStep,
-} from './types.js';
+  ToolListStepProps,
+} from "./types.js";
 
 // Constants
-export { MCP_MANAGEMENT_STEPS } from './types.js';
+export { MCP_MANAGEMENT_STEPS } from "./types.js";
diff --git a/apps/airiscode-cli/src/ui/components/mcp/steps/AuthenticateStep.tsx b/apps/airiscode-cli/src/ui/components/mcp/steps/AuthenticateStep.tsx
index 6ed7c3b35..7f15224f5 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/steps/AuthenticateStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/mcp/steps/AuthenticateStep.tsx
@@ -4,31 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useRef, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
-import type { AuthenticateStepProps } from '../types.js';
-import { useConfig } from '../../../contexts/ConfigContext.js';
-import {
-  MCPOAuthProvider,
-  MCPOAuthTokenStorage,
-  getErrorMessage,
-} from '@airiscode/core';
-import type { OAuthDisplayPayload } from '@airiscode/core';
-import { appEvents, AppEvent } from '../../../../utils/events.js';
-
-type AuthState = 'idle' | 'authenticating' | 'success' | 'error';
+import type { OAuthDisplayPayload } from "@airiscode/core";
+import { getErrorMessage, MCPOAuthProvider, MCPOAuthTokenStorage } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { AppEvent, appEvents } from "../../../../utils/events.js";
+import { useConfig } from "../../../contexts/ConfigContext.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import type { AuthenticateStepProps } from "../types.js";
+
+type AuthState = "idle" | "authenticating" | "success" | "error";
 
 const AUTO_BACK_DELAY_MS = 2000;
 
-export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
-  server,
-  onBack,
-}) => {
+export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({ server, onBack }) => {
   const config = useConfig();
-  const [authState, setAuthState] = useState<AuthState>('idle');
+  const [authState, setAuthState] = useState<AuthState>("idle");
   const [messages, setMessages] = useState<string[]>([]);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const isRunning = useRef(false);
@@ -37,15 +30,14 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
     if (!server || !config || isRunning.current) return;
     isRunning.current = true;
 
-    setAuthState('authenticating');
+    setAuthState("authenticating");
     setMessages([]);
     setErrorMessage(null);
 
     // Listen for OAuth display messages - supports both plain strings and
     // structured i18n messages ({ key, params }) emitted by the core layer.
     const displayListener = (message: OAuthDisplayPayload) => {
-      const text =
-        typeof message === 'string' ? message : t(message.key, message.params);
+      const text = typeof message === "string" ? message : t(message.key, message.params);
       setMessages((prev) => [...prev, text]);
     };
     appEvents.on(AppEvent.OauthDisplayMessage, displayListener);
@@ -64,12 +56,7 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
 
       const mcpServerUrl = server.config.httpUrl || server.config.url;
       const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
-      await authProvider.authenticate(
-        server.name,
-        oauthConfig,
-        mcpServerUrl,
-        appEvents,
-      );
+      await authProvider.authenticate(server.name, oauthConfig, mcpServerUrl, appEvents);
 
       setMessages((prev) => [
         ...prev,
@@ -108,13 +95,13 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
 
       setMessages((prev) => [
         ...prev,
-        t('Authentication complete. Returning to server details...'),
+        t("Authentication complete. Returning to server details..."),
       ]);
 
-      setAuthState('success');
+      setAuthState("success");
     } catch (error) {
       setErrorMessage(getErrorMessage(error));
-      setAuthState('error');
+      setAuthState("error");
     } finally {
       isRunning.current = false;
       appEvents.removeListener(AppEvent.OauthDisplayMessage, displayListener);
@@ -128,7 +115,7 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
 
   // Auto-navigate back after authentication succeeds
   useEffect(() => {
-    if (authState !== 'success') return;
+    if (authState !== "success") return;
     const timer = setTimeout(() => {
       onBack();
     }, AUTO_BACK_DELAY_MS);
@@ -137,7 +124,7 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onBack();
       }
     },
@@ -147,7 +134,7 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
   if (!server) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No server selected')}</Text>
+        <Text color={theme.status.error}>{t("No server selected")}</Text>
       </Box>
     );
   }
@@ -157,7 +144,7 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
       {/* Server info */}
       <Box>
         <Text color={theme.text.secondary}>
-          {t('Server:')} {server.name}
+          {t("Server:")} {server.name}
         </Text>
       </Box>
 
@@ -173,7 +160,7 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
       )}
 
       {/* Error message */}
-      {authState === 'error' && errorMessage && (
+      {authState === "error" && errorMessage && (
         <Box>
           <Text color={theme.status.error}>{errorMessage}</Text>
         </Box>
@@ -181,15 +168,13 @@ export const AuthenticateStep: React.FC<AuthenticateStepProps> = ({
 
       {/* Action hints */}
       <Box>
-        {authState === 'authenticating' && (
+        {authState === "authenticating" && (
           <Text color={theme.text.secondary}>
-            {t('Authenticating... Please complete the login in your browser.')}
+            {t("Authenticating... Please complete the login in your browser.")}
           </Text>
         )}
-        {authState === 'success' && (
-          <Text color={theme.status.success}>
-            {t('Authentication successful.')}
-          </Text>
+        {authState === "success" && (
+          <Text color={theme.status.success}>{t("Authentication successful.")}</Text>
         )}
       </Box>
     </Box>
diff --git a/apps/airiscode-cli/src/ui/components/mcp/steps/DisableScopeSelectStep.tsx b/apps/airiscode-cli/src/ui/components/mcp/steps/DisableScopeSelectStep.tsx
index 3c97ccfd1..502ec1342 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/steps/DisableScopeSelectStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/mcp/steps/DisableScopeSelectStep.tsx
@@ -4,45 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import { t } from '../../../../i18n/index.js';
-import type { DisableScopeSelectStepProps } from '../types.js';
+import { Box, Text } from "ink";
+import { useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import type { DisableScopeSelectStepProps } from "../types.js";
 
 export const DisableScopeSelectStep: React.FC<DisableScopeSelectStepProps> = ({
   server,
   onSelectScope,
   onBack,
 }) => {
-  const [selectedScope, setSelectedScope] = useState<'user' | 'workspace'>(
-    'user',
-  );
+  const [selectedScope, setSelectedScope] = useState<"user" | "workspace">("user");
 
   const scopes = [
     {
-      key: 'user',
+      key: "user",
       get label() {
-        return t('User Settings (global)');
+        return t("User Settings (global)");
       },
-      value: 'user' as const,
+      value: "user" as const,
     },
     {
-      key: 'workspace',
+      key: "workspace",
       get label() {
-        return t('Workspace Settings (project-specific)');
+        return t("Workspace Settings (project-specific)");
       },
-      value: 'workspace' as const,
+      value: "workspace" as const,
     },
   ];
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onBack();
-      } else if (key.name === 'return') {
+      } else if (key.name === "return") {
         onSelectScope(selectedScope);
       }
     },
@@ -52,7 +50,7 @@ export const DisableScopeSelectStep: React.FC<DisableScopeSelectStepProps> = ({
   if (!server) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No server selected')}</Text>
+        <Text color={theme.status.error}>{t("No server selected")}</Text>
       </Box>
     );
   }
@@ -61,27 +59,25 @@ export const DisableScopeSelectStep: React.FC<DisableScopeSelectStepProps> = ({
     <Box flexDirection="column" gap={1}>
       <Box flexDirection="column">
         <Text color={theme.text.primary}>
-          {t('Disable server:')} {server.name}
+          {t("Disable server:")} {server.name}
         </Text>
         <Box marginTop={1}>
           <Text color={theme.text.secondary}>
-            {t('Select where to add the server to the exclude list:')}
+            {t("Select where to add the server to the exclude list:")}
           </Text>
         </Box>
       </Box>
 
       <Box marginTop={1}>
-        <RadioButtonSelect<'user' | 'workspace'>
+        <RadioButtonSelect<"user" | "workspace">
           items={scopes}
-          onHighlight={(value: 'user' | 'workspace') => setSelectedScope(value)}
-          onSelect={(value: 'user' | 'workspace') => onSelectScope(value)}
+          onHighlight={(value: "user" | "workspace") => setSelectedScope(value)}
+          onSelect={(value: "user" | "workspace") => onSelectScope(value)}
         />
       </Box>
 
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          {t('Press Enter to confirm, Esc to cancel')}
-        </Text>
+        <Text color={theme.text.secondary}>{t("Press Enter to confirm, Esc to cancel")}</Text>
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/mcp/steps/ServerDetailStep.tsx b/apps/airiscode-cli/src/ui/components/mcp/steps/ServerDetailStep.tsx
index 3718f5e87..8de2ce6b8 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/steps/ServerDetailStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/mcp/steps/ServerDetailStep.tsx
@@ -4,28 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import { t } from '../../../../i18n/index.js';
-import type { ServerDetailStepProps } from '../types.js';
-import {
-  getStatusColor,
-  getStatusIcon,
-  formatServerCommand,
-} from '../utils.js';
+import { Box, Text } from "ink";
+import { useMemo } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import type { ServerDetailStepProps } from "../types.js";
+import { formatServerCommand, getStatusColor, getStatusIcon } from "../utils.js";
 
 // 标签列宽度
 const LABEL_WIDTH = 15;
 
-type ServerAction =
-  | 'view-tools'
-  | 'reconnect'
-  | 'toggle-disable'
-  | 'authenticate'
-  | 'clear-auth';
+type ServerAction = "view-tools" | "reconnect" | "toggle-disable" | "authenticate" | "clear-auth";
 
 export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
   server,
@@ -38,9 +29,9 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
 }) => {
   const statusColor = server
     ? server.isDisabled
-      ? 'yellow'
+      ? "yellow"
       : getStatusColor(server.status)
-    : 'gray';
+    : "gray";
 
   // 根据服务器状态动态生成可用操作
   const actions = useMemo(() => {
@@ -57,43 +48,43 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
     // 只在服务器未禁用且有工具时显示"查看工具"选项
     if (!server.isDisabled && (server.toolCount ?? 0) > 0) {
       result.push({
-        key: 'view-tools',
-        label: t('View tools'),
-        value: 'view-tools',
+        key: "view-tools",
+        label: t("View tools"),
+        value: "view-tools",
       });
     }
 
     // 只在服务器未禁用且已断开连接时显示"重新连接"选项
-    if (!server.isDisabled && server.status === 'disconnected') {
+    if (!server.isDisabled && server.status === "disconnected") {
       result.push({
-        key: 'reconnect',
-        label: t('Reconnect'),
-        value: 'reconnect',
+        key: "reconnect",
+        label: t("Reconnect"),
+        value: "reconnect",
       });
     }
 
     // 始终显示启用/禁用选项
     result.push({
-      key: 'toggle-disable',
-      label: server?.isDisabled ? t('Enable') : t('Disable'),
-      value: 'toggle-disable',
+      key: "toggle-disable",
+      label: server?.isDisabled ? t("Enable") : t("Disable"),
+      value: "toggle-disable",
     });
 
     // 已认证的服务器显示"重新认证"，未认证的显示"认证"
     if (!server.isDisabled) {
       result.push({
-        key: 'authenticate',
-        label: server.hasOAuthTokens ? t('Re-authenticate') : t('Authenticate'),
-        value: 'authenticate',
+        key: "authenticate",
+        label: server.hasOAuthTokens ? t("Re-authenticate") : t("Authenticate"),
+        value: "authenticate",
       });
     }
 
     // 只在存储有 OAuth 认证信息时显示“清空认证”选项
     if (!server.isDisabled && server.hasOAuthTokens) {
       result.push({
-        key: 'clear-auth',
-        label: t('Clear Authentication'),
-        value: 'clear-auth',
+        key: "clear-auth",
+        label: t("Clear Authentication"),
+        value: "clear-auth",
       });
     }
 
@@ -102,7 +93,7 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onBack();
       }
     },
@@ -112,7 +103,7 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
   if (!server) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No server selected')}</Text>
+        <Text color={theme.status.error}>{t("No server selected")}</Text>
       </Box>
     );
   }
@@ -123,42 +114,41 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
       <Box flexDirection="column">
         <Box>
           <Box width={LABEL_WIDTH}>
-            <Text color={theme.text.primary}>{t('Status:')}</Text>
+            <Text color={theme.text.primary}>{t("Status:")}</Text>
           </Box>
           <Box>
             <Text
               color={
-                statusColor === 'green'
+                statusColor === "green"
                   ? theme.status.success
-                  : statusColor === 'yellow'
+                  : statusColor === "yellow"
                     ? theme.status.warning
                     : theme.status.error
               }
             >
-              {getStatusIcon(server.status)}{' '}
-              {server.isDisabled ? t('disabled') : t(server.status)}
+              {getStatusIcon(server.status)} {server.isDisabled ? t("disabled") : t(server.status)}
             </Text>
           </Box>
         </Box>
 
         <Box>
           <Box width={LABEL_WIDTH}>
-            <Text color={theme.text.primary}>{t('Source:')}</Text>
+            <Text color={theme.text.primary}>{t("Source:")}</Text>
           </Box>
           <Box>
             <Text color={theme.text.primary}>
-              {server.source === 'user'
-                ? t('User Settings')
-                : server.source === 'project'
-                  ? t('Workspace Settings')
-                  : t('Extension')}
+              {server.source === "user"
+                ? t("User Settings")
+                : server.source === "project"
+                  ? t("Workspace Settings")
+                  : t("Extension")}
             </Text>
           </Box>
         </Box>
 
         <Box>
           <Box width={LABEL_WIDTH}>
-            <Text color={theme.text.primary}>{t('Command:')}</Text>
+            <Text color={theme.text.primary}>{t("Command:")}</Text>
           </Box>
           <Box>
             <Text wrap="truncate">{formatServerCommand(server)}</Text>
@@ -168,7 +158,7 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
         {server.config.cwd && (
           <Box>
             <Box width={LABEL_WIDTH}>
-              <Text color={theme.text.primary}>{t('Working Directory:')}</Text>
+              <Text color={theme.text.primary}>{t("Working Directory:")}</Text>
             </Box>
             <Box>
               <Text wrap="truncate">{server.config.cwd}</Text>
@@ -179,20 +169,16 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
         {!server.isDisabled && (
           <Box>
             <Box width={LABEL_WIDTH}>
-              <Text color={theme.text.primary}>{t('Tools:')}</Text>
+              <Text color={theme.text.primary}>{t("Tools:")}</Text>
             </Box>
             <Box>
               <Text>
-                {server.toolCount}{' '}
-                {server.toolCount === 1 ? t('tool') : t('tools')}
+                {server.toolCount} {server.toolCount === 1 ? t("tool") : t("tools")}
                 {!!server.invalidToolCount && server.invalidToolCount > 0 && (
                   <Text color={theme.status.warning}>
-                    {' '}
-                    ({server.invalidToolCount}{' '}
-                    {server.invalidToolCount === 1
-                      ? t('invalid')
-                      : t('invalid')}
-                    )
+                    {" "}
+                    ({server.invalidToolCount}{" "}
+                    {server.invalidToolCount === 1 ? t("invalid") : t("invalid")})
                   </Text>
                 )}
               </Text>
@@ -203,7 +189,7 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
         {server.errorMessage && (
           <Box>
             <Box width={LABEL_WIDTH}>
-              <Text color={theme.status.error}>{t('Error:')}</Text>
+              <Text color={theme.status.error}>{t("Error:")}</Text>
             </Box>
             <Box>
               <Text color={theme.status.error} wrap="wrap">
@@ -221,19 +207,19 @@ export const ServerDetailStep: React.FC<ServerDetailStepProps> = ({
           showNumbers={false}
           onSelect={(value: ServerAction) => {
             switch (value) {
-              case 'view-tools':
+              case "view-tools":
                 onViewTools();
                 break;
-              case 'reconnect':
+              case "reconnect":
                 onReconnect?.();
                 break;
-              case 'toggle-disable':
+              case "toggle-disable":
                 onDisable?.();
                 break;
-              case 'authenticate':
+              case "authenticate":
                 onAuthenticate?.();
                 break;
-              case 'clear-auth':
+              case "clear-auth":
                 onClearAuth?.();
                 break;
               default:
diff --git a/apps/airiscode-cli/src/ui/components/mcp/steps/ServerListStep.tsx b/apps/airiscode-cli/src/ui/components/mcp/steps/ServerListStep.tsx
index bd9c58568..677c2f8bf 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/steps/ServerListStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/mcp/steps/ServerListStep.tsx
@@ -4,28 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
-import type { ServerListStepProps, MCPServerDisplayInfo } from '../types.js';
-import {
-  groupServersBySource,
-  getStatusIcon,
-  getStatusColor,
-} from '../utils.js';
+import { Box, Text } from "ink";
+import { useMemo, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import type { MCPServerDisplayInfo, ServerListStepProps } from "../types.js";
+import { getStatusColor, getStatusIcon, groupServersBySource } from "../utils.js";
 
-export const ServerListStep: React.FC<ServerListStepProps> = ({
-  servers,
-  onSelect,
-}) => {
+export const ServerListStep: React.FC<ServerListStepProps> = ({ servers, onSelect }) => {
   const [selectedIndex, setSelectedIndex] = useState(0);
 
-  const groupedServers = useMemo(
-    () => groupServersBySource(servers),
-    [servers],
-  );
+  const groupedServers = useMemo(() => groupServersBySource(servers), [servers]);
 
   const serverNameWidth = useMemo(() => {
     if (servers.length === 0) return 20;
@@ -44,11 +34,11 @@ export const ServerListStep: React.FC<ServerListStepProps> = ({
 
   useKeypress(
     (key) => {
-      if (key.name === 'up') {
+      if (key.name === "up") {
         setSelectedIndex((prev) => Math.max(0, prev - 1));
-      } else if (key.name === 'down') {
+      } else if (key.name === "down") {
         setSelectedIndex((prev) => Math.min(flatServers.length - 1, prev + 1));
-      } else if (key.name === 'return') {
+      } else if (key.name === "return") {
         onSelect(selectedIndex);
       }
     },
@@ -58,11 +48,9 @@ export const ServerListStep: React.FC<ServerListStepProps> = ({
   if (servers.length === 0) {
     return (
       <Box flexDirection="column">
+        <Text color={theme.text.secondary}>{t("No MCP servers configured.")}</Text>
         <Text color={theme.text.secondary}>
-          {t('No MCP servers configured.')}
-        </Text>
-        <Text color={theme.text.secondary}>
-          {t('Add MCP servers to your settings to get started.')}
+          {t("Add MCP servers to your settings to get started.")}
         </Text>
       </Box>
     );
@@ -96,10 +84,7 @@ export const ServerListStep: React.FC<ServerListStepProps> = ({
           <Text bold color={theme.text.primary}>
             {`  ${group.displayName}`}
             {group.servers[0]?.configPath && (
-              <Text color={theme.text.secondary}>
-                {' '}
-                ({group.servers[0].configPath})
-              </Text>
+              <Text color={theme.text.secondary}> ({group.servers[0].configPath})</Text>
             )}
           </Text>
           <Box flexDirection="column">
@@ -107,27 +92,19 @@ export const ServerListStep: React.FC<ServerListStepProps> = ({
               const isSelected =
                 groupIndex === currentPosition.groupIndex &&
                 itemIndex === currentPosition.itemIndex;
-              const statusColor = server.isDisabled
-                ? 'yellow'
-                : getStatusColor(server.status);
+              const statusColor = server.isDisabled ? "yellow" : getStatusColor(server.status);
 
               return (
                 <Box key={server.name}>
                   <Box minWidth={2}>
-                    <Text
-                      color={
-                        isSelected ? theme.text.accent : theme.text.primary
-                      }
-                    >
-                      {isSelected ? '❯' : ' '}
+                    <Text color={isSelected ? theme.text.accent : theme.text.primary}>
+                      {isSelected ? "❯" : " "}
                     </Text>
                   </Box>
                   {/* 服务器名称 - 固定宽度 */}
                   <Box width={serverNameWidth}>
                     <Text
-                      color={
-                        isSelected ? theme.text.accent : theme.text.primary
-                      }
+                      color={isSelected ? theme.text.accent : theme.text.primary}
                       wrap="truncate"
                     >
                       {server.name}
@@ -137,21 +114,21 @@ export const ServerListStep: React.FC<ServerListStepProps> = ({
                   {/* 状态图标和文本 */}
                   <Text
                     color={
-                      statusColor === 'green'
+                      statusColor === "green"
                         ? theme.status.success
-                        : statusColor === 'yellow'
+                        : statusColor === "yellow"
                           ? theme.status.warning
                           : theme.status.error
                     }
                   >
-                    {getStatusIcon(server.status)}{' '}
-                    {server.isDisabled ? t('disabled') : t(server.status)}
+                    {getStatusIcon(server.status)}{" "}
+                    {server.isDisabled ? t("disabled") : t(server.status)}
                   </Text>
                   {/* 显示无效工具警告 */}
                   {!!server.invalidToolCount && server.invalidToolCount > 0 && (
                     <Text color={theme.status.warning}>
-                      {' '}
-                      {t('{{count}} invalid tools', {
+                      {" "}
+                      {t("{{count}} invalid tools", {
                         count: String(server.invalidToolCount),
                       })}
                     </Text>
@@ -164,11 +141,9 @@ export const ServerListStep: React.FC<ServerListStepProps> = ({
       ))}
 
       {/* 提示信息 */}
-      {servers.some((s) => s.status === 'disconnected' && !s.isDisabled) && (
+      {servers.some((s) => s.status === "disconnected" && !s.isDisabled) && (
         <Box marginTop={1}>
-          <Text color={theme.status.warning}>
-            ※ {t('Run qwen --debug to see error logs')}
-          </Text>
+          <Text color={theme.status.warning}>※ {t("Run qwen --debug to see error logs")}</Text>
         </Box>
       )}
     </Box>
diff --git a/apps/airiscode-cli/src/ui/components/mcp/steps/ToolDetailStep.tsx b/apps/airiscode-cli/src/ui/components/mcp/steps/ToolDetailStep.tsx
index d864c5732..77af9a67d 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/steps/ToolDetailStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/mcp/steps/ToolDetailStep.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
-import type { ToolDetailStepProps } from '../types.js';
+import { Box, Text } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import type { ToolDetailStepProps } from "../types.js";
 
 /**
  * 渲染单个参数
@@ -18,11 +18,11 @@ const renderParameter = (
   param: Record<string, unknown>,
   isRequired: boolean,
 ): React.ReactNode => {
-  const type = (param['type'] as string) || 'any';
-  const description = (param['description'] as string) || '';
+  const type = (param["type"] as string) || "any";
+  const description = (param["description"] as string) || "";
   // const defaultValue = param['default'];
   // const enumValues = param['enum'] as string[] | undefined;
-  const text = `• ${name}${isRequired ? t('required') : ''}: ${type} ${description ? `- ${description}` : ''}`;
+  const text = `• ${name}${isRequired ? t("required") : ""}: ${type} ${description ? `- ${description}` : ""}`;
 
   return (
     <Box key={name}>
@@ -45,15 +45,11 @@ const ParametersList: React.FC<{
   return (
     <Box flexDirection="column">
       <Text color={theme.text.primary} bold>
-        {t('Parameters')}:
+        {t("Parameters")}:
       </Text>
       <Box flexDirection="column" marginLeft={1}>
         {Object.entries(properties).map(([name, param]) =>
-          renderParameter(
-            name,
-            param as Record<string, unknown>,
-            requiredSet.has(name),
-          ),
+          renderParameter(name, param as Record<string, unknown>, requiredSet.has(name)),
         )}
       </Box>
     </Box>
@@ -65,8 +61,8 @@ const ParametersList: React.FC<{
  */
 const SchemaSummary: React.FC<{ schema: object }> = ({ schema }) => {
   const obj = schema as Record<string, unknown>;
-  const properties = obj['properties'] as Record<string, unknown> | undefined;
-  const required = (obj['required'] as string[]) || [];
+  const properties = obj["properties"] as Record<string, unknown> | undefined;
+  const required = (obj["required"] as string[]) || [];
 
   return (
     <Box flexDirection="column">
@@ -78,13 +74,10 @@ const SchemaSummary: React.FC<{ schema: object }> = ({ schema }) => {
   );
 };
 
-export const ToolDetailStep: React.FC<ToolDetailStepProps> = ({
-  tool,
-  onBack,
-}) => {
+export const ToolDetailStep: React.FC<ToolDetailStepProps> = ({ tool, onBack }) => {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onBack();
       }
     },
@@ -94,7 +87,7 @@ export const ToolDetailStep: React.FC<ToolDetailStepProps> = ({
   if (!tool) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No tool selected')}</Text>
+        <Text color={theme.status.error}>{t("No tool selected")}</Text>
       </Box>
     );
   }
@@ -105,15 +98,13 @@ export const ToolDetailStep: React.FC<ToolDetailStepProps> = ({
       {!tool.isValid && (
         <Box flexDirection="column" marginBottom={1}>
           <Text color={theme.status.error} bold>
-            {t('Warning: This tool cannot be called by the LLM')}
+            {t("Warning: This tool cannot be called by the LLM")}
           </Text>
           <Text color={theme.status.error}>
-            {t('Reason')}: {tool.invalidReason || t('unknown')}
+            {t("Reason")}: {tool.invalidReason || t("unknown")}
           </Text>
           <Text color={theme.text.secondary}>
-            {t(
-              'Tools must have both name and description to be used by the LLM.',
-            )}
+            {t("Tools must have both name and description to be used by the LLM.")}
           </Text>
         </Box>
       )}
@@ -122,7 +113,7 @@ export const ToolDetailStep: React.FC<ToolDetailStepProps> = ({
       {tool.description && (
         <Box flexDirection="column">
           <Text color={theme.text.primary} bold>
-            {t('Description')}:
+            {t("Description")}:
           </Text>
           <Text wrap="wrap">{tool.description}</Text>
         </Box>
diff --git a/apps/airiscode-cli/src/ui/components/mcp/steps/ToolListStep.tsx b/apps/airiscode-cli/src/ui/components/mcp/steps/ToolListStep.tsx
index 81d8e2f7c..11bac9bdf 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/steps/ToolListStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/mcp/steps/ToolListStep.tsx
@@ -4,19 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
-import type { ToolListStepProps, MCPToolDisplayInfo } from '../types.js';
-import { VISIBLE_TOOLS_COUNT } from '../constants.js';
+import { Box, Text } from "ink";
+import { useMemo, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import { VISIBLE_TOOLS_COUNT } from "../constants.js";
+import type { MCPToolDisplayInfo, ToolListStepProps } from "../types.js";
 
-export const ToolListStep: React.FC<ToolListStepProps> = ({
-  tools,
-  onSelect,
-  onBack,
-}) => {
+export const ToolListStep: React.FC<ToolListStepProps> = ({ tools, onSelect, onBack }) => {
   const [selectedIndex, setSelectedIndex] = useState(0);
 
   // 动态计算工具名称列的最大宽度（基于实际内容）
@@ -36,10 +32,7 @@ export const ToolListStep: React.FC<ToolListStepProps> = ({
     if (selectedIndex < VISIBLE_TOOLS_COUNT - 1) {
       return 0;
     }
-    return Math.min(
-      selectedIndex - VISIBLE_TOOLS_COUNT + 1,
-      tools.length - VISIBLE_TOOLS_COUNT,
-    );
+    return Math.min(selectedIndex - VISIBLE_TOOLS_COUNT + 1, tools.length - VISIBLE_TOOLS_COUNT);
   }, [selectedIndex, tools.length]);
 
   // 当前可视的工具列表
@@ -50,13 +43,13 @@ export const ToolListStep: React.FC<ToolListStepProps> = ({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onBack();
-      } else if (key.name === 'up') {
+      } else if (key.name === "up") {
         setSelectedIndex((prev) => Math.max(0, prev - 1));
-      } else if (key.name === 'down') {
+      } else if (key.name === "down") {
         setSelectedIndex((prev) => Math.min(tools.length - 1, prev + 1));
-      } else if (key.name === 'return') {
+      } else if (key.name === "return") {
         if (tools[selectedIndex]) {
           onSelect(tools[selectedIndex]);
         }
@@ -68,20 +61,18 @@ export const ToolListStep: React.FC<ToolListStepProps> = ({
   if (tools.length === 0) {
     return (
       <Box flexDirection="column">
-        <Text color={theme.text.secondary}>
-          {t('No tools available for this server.')}
-        </Text>
+        <Text color={theme.text.secondary}>{t("No tools available for this server.")}</Text>
       </Box>
     );
   }
 
   const getToolAnnotations = (tool: MCPToolDisplayInfo): string => {
     const hints: string[] = [];
-    if (tool.annotations?.destructiveHint) hints.push('destructive');
-    if (tool.annotations?.readOnlyHint) hints.push('read-only');
-    if (tool.annotations?.openWorldHint) hints.push('open-world');
-    if (tool.annotations?.idempotentHint) hints.push('idempotent');
-    return hints.join(', ');
+    if (tool.annotations?.destructiveHint) hints.push("destructive");
+    if (tool.annotations?.readOnlyHint) hints.push("read-only");
+    if (tool.annotations?.openWorldHint) hints.push("open-world");
+    if (tool.annotations?.idempotentHint) hints.push("idempotent");
+    return hints.join(", ");
   };
 
   return (
@@ -97,26 +88,21 @@ export const ToolListStep: React.FC<ToolListStepProps> = ({
             <Box key={tool.name}>
               {/* 选择器 */}
               <Box minWidth={2}>
-                <Text
-                  color={isSelected ? theme.text.accent : theme.text.primary}
-                >
-                  {isSelected ? '❯' : ' '}
+                <Text color={isSelected ? theme.text.accent : theme.text.primary}>
+                  {isSelected ? "❯" : " "}
                 </Text>
               </Box>
               {/* 工具名称 - 固定宽度 */}
               <Box width={toolNameWidth}>
-                <Text
-                  color={isSelected ? theme.text.accent : theme.text.primary}
-                  wrap="truncate"
-                >
+                <Text color={isSelected ? theme.text.accent : theme.text.primary} wrap="truncate">
                   {tool.name}
                 </Text>
               </Box>
               {/* 显示无效工具警告 */}
               {!tool.isValid && (
                 <Text color={theme.status.warning}>
-                  {t('invalid: {{reason}}', {
-                    reason: tool.invalidReason || t('unknown'),
+                  {t("invalid: {{reason}}", {
+                    reason: tool.invalidReason || t("unknown"),
                   })}
                 </Text>
               )}
@@ -132,12 +118,12 @@ export const ToolListStep: React.FC<ToolListStepProps> = ({
       {tools.length > VISIBLE_TOOLS_COUNT && (
         <Box marginTop={1}>
           <Text color={theme.text.secondary}>
-            {scrollOffset > 0 ? '↑ ' : '  '}
-            {t('{{current}}/{{total}}', {
+            {scrollOffset > 0 ? "↑ " : "  "}
+            {t("{{current}}/{{total}}", {
               current: (selectedIndex + 1).toString(),
               total: tools.length.toString(),
             })}
-            {scrollOffset + VISIBLE_TOOLS_COUNT < tools.length ? ' ↓' : ''}
+            {scrollOffset + VISIBLE_TOOLS_COUNT < tools.length ? " ↓" : ""}
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/mcp/types.ts b/apps/airiscode-cli/src/ui/components/mcp/types.ts
index b453aaf63..6a79c3c69 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/types.ts
+++ b/apps/airiscode-cli/src/ui/components/mcp/types.ts
@@ -4,25 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  MCPServerConfig,
-  MCPServerStatus,
-} from '@airiscode/core';
+import type { MCPServerConfig, MCPServerStatus } from "@airiscode/core";
 
 /**
  * MCP管理步骤定义
  */
 export const MCP_MANAGEMENT_STEPS = {
-  SERVER_LIST: 'server-list',
-  SERVER_DETAIL: 'server-detail',
-  DISABLE_SCOPE_SELECT: 'disable-scope-select',
-  TOOL_LIST: 'tool-list',
-  TOOL_DETAIL: 'tool-detail',
-  AUTHENTICATE: 'authenticate', // OAuth 认证步骤
+  SERVER_LIST: "server-list",
+  SERVER_DETAIL: "server-detail",
+  DISABLE_SCOPE_SELECT: "disable-scope-select",
+  TOOL_LIST: "tool-list",
+  TOOL_DETAIL: "tool-detail",
+  AUTHENTICATE: "authenticate", // OAuth 认证步骤
 } as const;
 
-export type MCPManagementStep =
-  (typeof MCP_MANAGEMENT_STEPS)[keyof typeof MCP_MANAGEMENT_STEPS];
+export type MCPManagementStep = (typeof MCP_MANAGEMENT_STEPS)[keyof typeof MCP_MANAGEMENT_STEPS];
 
 /**
  * MCP服务器显示信息
@@ -33,7 +29,7 @@ export interface MCPServerDisplayInfo {
   /** 连接状态 */
   status: MCPServerStatus;
   /** 来源类型 */
-  source: 'user' | 'project' | 'extension';
+  source: "user" | "project" | "extension";
   /** 配置文件路径 */
   configPath?: string;
   /** 服务器配置 */
@@ -147,7 +143,7 @@ export interface DisableScopeSelectStepProps {
   /** 选中的服务器 */
   server: MCPServerDisplayInfo | null;
   /** 选择 scope 回调 */
-  onSelectScope: (scope: 'user' | 'workspace') => void;
+  onSelectScope: (scope: "user" | "workspace") => void;
   /** 返回回调 */
   onBack: () => void;
 }
diff --git a/apps/airiscode-cli/src/ui/components/mcp/utils.ts b/apps/airiscode-cli/src/ui/components/mcp/utils.ts
index 4220fe7eb..41cc41360 100644
--- a/apps/airiscode-cli/src/ui/components/mcp/utils.ts
+++ b/apps/airiscode-cli/src/ui/components/mcp/utils.ts
@@ -4,15 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MCPServerDisplayInfo, GroupedServers } from './types.js';
-import { SOURCE_DISPLAY_NAMES } from './constants.js';
+import { SOURCE_DISPLAY_NAMES } from "./constants.js";
+import type { GroupedServers, MCPServerDisplayInfo } from "./types.js";
 
 /**
  * 按来源分组服务器
  */
-export function groupServersBySource(
-  servers: MCPServerDisplayInfo[],
-): GroupedServers[] {
+export function groupServersBySource(servers: MCPServerDisplayInfo[]): GroupedServers[] {
   const groups = new Map<string, MCPServerDisplayInfo[]>();
 
   for (const server of servers) {
@@ -25,7 +23,7 @@ export function groupServersBySource(
   }
 
   // 按优先级排序: user > project > extension
-  const sourceOrder = ['user', 'project', 'extension'];
+  const sourceOrder = ["user", "project", "extension"];
   const result: GroupedServers[] = [];
 
   for (const source of sourceOrder) {
@@ -45,18 +43,16 @@ export function groupServersBySource(
 /**
  * 获取状态颜色
  */
-export function getStatusColor(
-  status: string,
-): 'green' | 'yellow' | 'red' | 'gray' {
+export function getStatusColor(status: string): "green" | "yellow" | "red" | "gray" {
   switch (status) {
-    case 'connected':
-      return 'green';
-    case 'connecting':
-      return 'yellow';
-    case 'disconnected':
-      return 'red';
+    case "connected":
+      return "green";
+    case "connecting":
+      return "yellow";
+    case "disconnected":
+      return "red";
     default:
-      return 'gray';
+      return "gray";
   }
 }
 
@@ -65,14 +61,14 @@ export function getStatusColor(
  */
 export function getStatusIcon(status: string): string {
   switch (status) {
-    case 'connected':
-      return '✓';
-    case 'connecting':
-      return '…';
-    case 'disconnected':
-      return '✗';
+    case "connected":
+      return "✓";
+    case "connecting":
+      return "…";
+    case "disconnected":
+      return "✗";
     default:
-      return '?';
+      return "?";
   }
 }
 
@@ -81,7 +77,7 @@ export function getStatusIcon(status: string): string {
  */
 export function truncateText(text: string, maxLength: number): string {
   if (text.length <= maxLength) return text;
-  return text.substring(0, maxLength - 3) + '...';
+  return text.substring(0, maxLength - 3) + "...";
 }
 
 /**
@@ -96,10 +92,10 @@ export function formatServerCommand(server: MCPServerDisplayInfo): string {
     return `${config.url} (sse)`;
   }
   if (config.command) {
-    const args = config.args?.join(' ') || '';
+    const args = config.args?.join(" ") || "";
     return `${config.command} ${args} (stdio)`.trim();
   }
-  return 'Unknown';
+  return "Unknown";
 }
 
 /**
@@ -118,12 +114,9 @@ export function isToolValid(name?: string, description?: string): boolean {
  * @param description - Tool description
  * @returns Array of missing fields
  */
-export function getToolInvalidReasons(
-  name?: string,
-  description?: string,
-): string[] {
+export function getToolInvalidReasons(name?: string, description?: string): string[] {
   const reasons: string[] = [];
-  if (!name) reasons.push('missing name');
-  if (!description) reasons.push('missing description');
+  if (!name) reasons.push("missing name");
+  if (!description) reasons.push("missing description");
   return reasons;
 }
diff --git a/apps/airiscode-cli/src/ui/components/messages/AskUserQuestionDialog.tsx b/apps/airiscode-cli/src/ui/components/messages/AskUserQuestionDialog.tsx
index 201c43563..1f13d4cc8 100644
--- a/apps/airiscode-cli/src/ui/components/messages/AskUserQuestionDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/AskUserQuestionDialog.tsx
@@ -4,26 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState } from 'react';
-import { Box, Text } from 'ink';
 import {
   type ToolAskUserQuestionConfirmationDetails,
   ToolConfirmationOutcome,
   type ToolConfirmationPayload,
-} from '@airiscode/core';
-import { theme } from '../../semantic-colors.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { TextInput } from '../shared/TextInput.js';
-import { t } from '../../../i18n/index.js';
+} from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useState } from "react";
+import { t } from "../../../i18n/index.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { TextInput } from "../shared/TextInput.js";
 
 interface AskUserQuestionDialogProps {
   confirmationDetails: ToolAskUserQuestionConfirmationDetails;
   isFocused?: boolean;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
 }
 
 export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
@@ -32,60 +29,45 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
   onConfirm,
 }) => {
   const [currentQuestionIndex, setCurrentQuestionIndex] = useState(0);
-  const [selectedOptions, setSelectedOptions] = useState<
-    Record<number, string>
-  >({});
-  const [customInputValues, setCustomInputValues] = useState<
-    Record<number, string>
-  >({});
+  const [selectedOptions, setSelectedOptions] = useState<Record<number, string>>({});
+  const [customInputValues, setCustomInputValues] = useState<Record<number, string>>({});
   const [selectedIndex, setSelectedIndex] = useState(0);
-  const [multiSelectedOptions, setMultiSelectedOptions] = useState<
-    Record<number, string[]>
-  >({});
-  const [customInputChecked, setCustomInputChecked] = useState<
-    Record<number, boolean>
-  >({});
+  const [multiSelectedOptions, setMultiSelectedOptions] = useState<Record<number, string[]>>({});
+  const [customInputChecked, setCustomInputChecked] = useState<Record<number, boolean>>({});
 
   const hasMultipleQuestions = confirmationDetails.questions.length > 1;
   const totalTabs = hasMultipleQuestions
     ? confirmationDetails.questions.length + 1
     : confirmationDetails.questions.length; // +1 for Submit tab
-  const isSubmitTab =
-    hasMultipleQuestions && currentQuestionIndex === totalTabs - 1;
+  const isSubmitTab = hasMultipleQuestions && currentQuestionIndex === totalTabs - 1;
 
-  const currentQuestion = isSubmitTab
-    ? null
-    : confirmationDetails.questions[currentQuestionIndex];
+  const currentQuestion = isSubmitTab ? null : confirmationDetails.questions[currentQuestionIndex];
   const isMultiSelect = currentQuestion?.multiSelect ?? false;
   // Options + custom input ("Other")
   const totalOptions = currentQuestion ? currentQuestion.options.length + 1 : 2;
 
   // Check if the custom input option is selected
   const isCustomInputSelected =
-    !isSubmitTab &&
-    currentQuestion &&
-    selectedIndex === currentQuestion.options.length;
+    !isSubmitTab && currentQuestion && selectedIndex === currentQuestion.options.length;
 
-  const currentCustomInputValue = customInputValues[currentQuestionIndex] ?? '';
+  const currentCustomInputValue = customInputValues[currentQuestionIndex] ?? "";
   const isCustomInputAnswer =
     !isSubmitTab &&
     currentQuestion &&
     !isMultiSelect &&
     selectedOptions[currentQuestionIndex] !== undefined &&
-    !currentQuestion.options.some(
-      (opt) => opt.label === selectedOptions[currentQuestionIndex],
-    );
+    !currentQuestion.options.some((opt) => opt.label === selectedOptions[currentQuestionIndex]);
 
   // Compute the current answer for a question, considering multi-select state
   const getAnswerForQuestion = (idx: number): string | undefined => {
     const q = confirmationDetails.questions[idx];
     if (q?.multiSelect) {
       const selections = [...(multiSelectedOptions[idx] ?? [])];
-      const customValue = (customInputValues[idx] ?? '').trim();
+      const customValue = (customInputValues[idx] ?? "").trim();
       if (customInputChecked[idx] && customValue) {
         selections.push(customValue);
       }
-      return selections.length > 0 ? selections.join(', ') : undefined;
+      return selections.length > 0 ? selections.join(", ") : undefined;
     }
     return selectedOptions[idx];
   };
@@ -111,7 +93,7 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
     }
     if (selections.length === 0) return;
 
-    const value = selections.join(', ');
+    const value = selections.join(", ");
     const updated = { ...selectedOptions, [currentQuestionIndex]: value };
     setSelectedOptions(updated);
 
@@ -175,15 +157,15 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
 
       // When custom input is focused, still allow up/down navigation, tab switch and escape
       if (isCustomInputSelected) {
-        if (key.name === 'up') {
+        if (key.name === "up") {
           setSelectedIndex(Math.max(0, selectedIndex - 1));
           return;
         }
-        if (key.name === 'down') {
+        if (key.name === "down") {
           setSelectedIndex(Math.min(totalOptions - 1, selectedIndex + 1));
           return;
         }
-        if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+        if (key.name === "escape" || (key.ctrl && key.name === "c")) {
           void onConfirm(ToolConfirmationOutcome.Cancel);
           return;
         }
@@ -193,14 +175,14 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
       const input = key.sequence;
 
       // Tab navigation (left/right arrows)
-      if (key.name === 'left' && hasMultipleQuestions) {
+      if (key.name === "left" && hasMultipleQuestions) {
         if (currentQuestionIndex > 0) {
           setCurrentQuestionIndex(currentQuestionIndex - 1);
           setSelectedIndex(0);
         }
         return;
       }
-      if (key.name === 'right' && hasMultipleQuestions) {
+      if (key.name === "right" && hasMultipleQuestions) {
         if (currentQuestionIndex < totalTabs - 1) {
           setCurrentQuestionIndex(currentQuestionIndex + 1);
           setSelectedIndex(0);
@@ -209,24 +191,24 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
       }
 
       // Option navigation (up/down arrows)
-      if (key.name === 'up') {
+      if (key.name === "up") {
         setSelectedIndex(Math.max(0, selectedIndex - 1));
         return;
       }
-      if (key.name === 'down') {
+      if (key.name === "down") {
         setSelectedIndex(Math.min(totalOptions - 1, selectedIndex + 1));
         return;
       }
 
       // Number key selection
-      const numKey = parseInt(input || '', 10);
+      const numKey = parseInt(input || "", 10);
       if (!isNaN(numKey) && numKey >= 1 && numKey <= totalOptions) {
         setSelectedIndex(numKey - 1);
         return;
       }
 
       // Space to toggle multi-select
-      if (key.name === 'space' && isMultiSelect && currentQuestion) {
+      if (key.name === "space" && isMultiSelect && currentQuestion) {
         if (selectedIndex < currentQuestion.options.length) {
           const option = currentQuestion.options[selectedIndex];
           if (option) {
@@ -245,7 +227,7 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
       }
 
       // Enter to select
-      if (key.name === 'return') {
+      if (key.name === "return") {
         // Handle Submit tab
         if (isSubmitTab) {
           if (selectedIndex === 0) {
@@ -287,9 +269,7 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
               // Auto-advance to next tab after selection
               if (currentQuestionIndex < totalTabs - 1) {
                 setTimeout(() => {
-                  setCurrentQuestionIndex((prev) =>
-                    Math.min(prev + 1, totalTabs - 1),
-                  );
+                  setCurrentQuestionIndex((prev) => Math.min(prev + 1, totalTabs - 1));
                   setSelectedIndex(0);
                 }, 150);
               }
@@ -300,7 +280,7 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
       }
 
       // Cancel
-      if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+      if (key.name === "escape" || (key.ctrl && key.name === "c")) {
         void onConfirm(ToolConfirmationOutcome.Cancel);
         return;
       }
@@ -319,33 +299,33 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
             return (
               <Box key={idx}>
                 <Text dimColor>
-                  {isAnswered ? '  ' : '  '}
+                  {isAnswered ? "  " : "  "}
                   {q.header}
-                  {isAnswered ? ' ✓' : ''}
+                  {isAnswered ? " ✓" : ""}
                 </Text>
               </Box>
             );
           })}
           <Box>
             <Text color={theme.text.accent} bold>
-              ▸ {t('Submit')}
+              ▸ {t("Submit")}
             </Text>
           </Box>
         </Box>
 
         {/* Show selected answers */}
         <Box flexDirection="column" marginBottom={1}>
-          <Text bold>{t('Your answers:')}</Text>
+          <Text bold>{t("Your answers:")}</Text>
           {confirmationDetails.questions.map((q, idx) => {
             const answer = getAnswerForQuestion(idx);
             return (
               <Box key={idx} marginLeft={2}>
                 <Text>
-                  {q.header}:{' '}
+                  {q.header}:{" "}
                   {answer ? (
                     <Text color={theme.text.accent}>{answer}</Text>
                   ) : (
-                    <Text dimColor>{t('(not answered)')}</Text>
+                    <Text dimColor>{t("(not answered)")}</Text>
                   )}
                 </Text>
               </Box>
@@ -354,37 +334,31 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
         </Box>
 
         <Box marginTop={1} marginBottom={1}>
-          <Text>{t('Ready to submit your answers?')}</Text>
+          <Text>{t("Ready to submit your answers?")}</Text>
         </Box>
 
         {/* Submit/Cancel options */}
         <Box flexDirection="column">
           <Box>
             <Text
-              color={
-                selectedIndex === 0 ? theme.text.accent : theme.text.primary
-              }
+              color={selectedIndex === 0 ? theme.text.accent : theme.text.primary}
               bold={selectedIndex === 0}
             >
-              {selectedIndex === 0 ? '❯ ' : '  '}1. {t('Submit answers')}
+              {selectedIndex === 0 ? "❯ " : "  "}1. {t("Submit answers")}
             </Text>
           </Box>
           <Box>
             <Text
-              color={
-                selectedIndex === 1 ? theme.text.accent : theme.text.primary
-              }
+              color={selectedIndex === 1 ? theme.text.accent : theme.text.primary}
               bold={selectedIndex === 1}
             >
-              {selectedIndex === 1 ? '❯ ' : '  '}2. {t('Cancel')}
+              {selectedIndex === 1 ? "❯ " : "  "}2. {t("Cancel")}
             </Text>
           </Box>
         </Box>
 
         <Box marginTop={1}>
-          <Text dimColor>
-            {t('↑/↓: Navigate | ←/→: Switch tabs | Enter: Select')}
-          </Text>
+          <Text dimColor>{t("↑/↓: Navigate | ←/→: Switch tabs | Enter: Select")}</Text>
         </Box>
       </Box>
     );
@@ -401,23 +375,19 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
             return (
               <Box key={idx}>
                 <Text
-                  color={
-                    idx === currentQuestionIndex
-                      ? theme.text.accent
-                      : theme.text.primary
-                  }
+                  color={idx === currentQuestionIndex ? theme.text.accent : theme.text.primary}
                   bold={idx === currentQuestionIndex}
                   dimColor={idx !== currentQuestionIndex}
                 >
-                  {idx === currentQuestionIndex ? '▸ ' : '  '}
+                  {idx === currentQuestionIndex ? "▸ " : "  "}
                   {q.header}
-                  {isAnswered ? ' ✓' : ''}
+                  {isAnswered ? " ✓" : ""}
                 </Text>
               </Box>
             );
           })}
           <Box>
-            <Text dimColor> {t('Submit')}</Text>
+            <Text dimColor> {t("Submit")}</Text>
           </Box>
         </Box>
       )}
@@ -439,18 +409,12 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
         {currentQuestion!.options.map((opt, index) => {
           const isSelected = selectedIndex === index;
           const isMultiChecked =
-            isMultiSelect &&
-            (multiSelectedOptions[currentQuestionIndex] ?? []).includes(
-              opt.label,
-            );
-          const isAnswered =
-            !isMultiSelect &&
-            selectedOptions[currentQuestionIndex] === opt.label;
+            isMultiSelect && (multiSelectedOptions[currentQuestionIndex] ?? []).includes(opt.label);
+          const isAnswered = !isMultiSelect && selectedOptions[currentQuestionIndex] === opt.label;
           const isHighlighted = isSelected || isAnswered || isMultiChecked;
           // Calculate prefix width for description alignment:
           // 2 (cursor) + checkbox (4 if multi) + number + ". " (2)
-          const prefixWidth =
-            2 + (isMultiSelect ? 4 : 0) + String(index + 1).length + 2;
+          const prefixWidth = 2 + (isMultiSelect ? 4 : 0) + String(index + 1).length + 2;
           return (
             <Box key={index} flexDirection="column">
               <Box>
@@ -458,10 +422,10 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
                   color={isHighlighted ? theme.text.accent : theme.text.primary}
                   bold={isHighlighted}
                 >
-                  {isSelected ? '❯ ' : '  '}
-                  {isMultiSelect ? (isMultiChecked ? '[✓] ' : '[ ] ') : ''}
+                  {isSelected ? "❯ " : "  "}
+                  {isMultiSelect ? (isMultiChecked ? "[✓] " : "[ ] ") : ""}
                   {index + 1}. {opt.label}
-                  {isAnswered ? ' ✓' : ''}
+                  {isAnswered ? " ✓" : ""}
                 </Text>
               </Box>
               {opt.description && (
@@ -479,20 +443,15 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
             // Inline TextInput replaces the option text
             <Box>
               <Text color={theme.text.accent} bold>
-                ❯{' '}
-                {isMultiSelect
-                  ? customInputChecked[currentQuestionIndex]
-                    ? '[✓] '
-                    : '[ ] '
-                  : ''}
-                {currentQuestion!.options.length + 1}.{' '}
+                ❯{" "}
+                {isMultiSelect ? (customInputChecked[currentQuestionIndex] ? "[✓] " : "[ ] ") : ""}
+                {currentQuestion!.options.length + 1}.{" "}
               </Text>
               <TextInput
                 value={currentCustomInputValue}
                 initialCursorOffset={currentCustomInputValue.length}
                 onChange={(value: string) => {
-                  const oldValue =
-                    customInputValues[currentQuestionIndex] ?? '';
+                  const oldValue = customInputValues[currentQuestionIndex] ?? "";
                   if (isMultiSelect && value !== oldValue) {
                     setCustomInputChecked((prevChecked) => ({
                       ...prevChecked,
@@ -505,7 +464,7 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
                   }));
                 }}
                 onSubmit={handleCustomInputSubmit}
-                placeholder={t('Type something...')}
+                placeholder={t("Type something...")}
                 isActive={true}
                 inputWidth={50}
               />
@@ -515,32 +474,22 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
             <Box>
               <Text
                 color={
-                  isCustomInputAnswer ||
-                  customInputChecked[currentQuestionIndex]
+                  isCustomInputAnswer || customInputChecked[currentQuestionIndex]
                     ? theme.text.accent
                     : theme.text.primary
                 }
-                bold={
-                  !!(
-                    isCustomInputAnswer ||
-                    customInputChecked[currentQuestionIndex]
-                  )
-                }
+                bold={!!(isCustomInputAnswer || customInputChecked[currentQuestionIndex])}
                 dimColor={
                   !currentCustomInputValue &&
                   !isCustomInputAnswer &&
                   !customInputChecked[currentQuestionIndex]
                 }
               >
-                {'  '}
-                {isMultiSelect
-                  ? customInputChecked[currentQuestionIndex]
-                    ? '[✓] '
-                    : '[ ] '
-                  : ''}
-                {currentQuestion!.options.length + 1}.{' '}
-                {currentCustomInputValue || t('Type something...')}
-                {isCustomInputAnswer ? ' ✓' : ''}
+                {"  "}
+                {isMultiSelect ? (customInputChecked[currentQuestionIndex] ? "[✓] " : "[ ] ") : ""}
+                {currentQuestion!.options.length + 1}.{" "}
+                {currentCustomInputValue || t("Type something...")}
+                {isCustomInputAnswer ? " ✓" : ""}
               </Text>
             </Box>
           )}
@@ -554,16 +503,12 @@ export const AskUserQuestionDialog: React.FC<AskUserQuestionDialogProps> = ({
             {hasMultipleQuestions
               ? isMultiSelect
                 ? t(
-                    '↑/↓: Navigate | ←/→: Switch tabs | Space: Toggle | Enter: Confirm | Esc: Cancel',
-                  )
-                : t(
-                    '↑/↓: Navigate | ←/→: Switch tabs | Enter: Select | Esc: Cancel',
+                    "↑/↓: Navigate | ←/→: Switch tabs | Space: Toggle | Enter: Confirm | Esc: Cancel",
                   )
+                : t("↑/↓: Navigate | ←/→: Switch tabs | Enter: Select | Esc: Cancel")
               : isMultiSelect
-                ? t(
-                    '↑/↓: Navigate | Space: Toggle | Enter: Confirm | Esc: Cancel',
-                  )
-                : t('↑/↓: Navigate | Enter: Select | Esc: Cancel')}
+                ? t("↑/↓: Navigate | Space: Toggle | Enter: Confirm | Esc: Cancel")
+                : t("↑/↓: Navigate | Enter: Select | Esc: Cancel")}
           </Text>
         </Box>
       </Box>
diff --git a/apps/airiscode-cli/src/ui/components/messages/BtwMessage.tsx b/apps/airiscode-cli/src/ui/components/messages/BtwMessage.tsx
index fe6dcde4b..f44b11965 100644
--- a/apps/airiscode-cli/src/ui/components/messages/BtwMessage.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/BtwMessage.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Box, Text } from 'ink';
-import type { BtwProps } from '../../types.js';
-import { Colors } from '../../colors.js';
-import { t } from '../../../i18n/index.js';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text } from "ink";
+import React from "react";
+import { t } from "../../../i18n/index.js";
+import { Colors } from "../../colors.js";
+import { useTerminalSize } from "../../hooks/useTerminalSize.js";
+import type { BtwProps } from "../../types.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
 
 export interface BtwDisplayProps {
   btw: BtwProps;
@@ -28,13 +28,10 @@ const BTW_SELF_CHROME = 4;
  * emit the opening fence right after prose text without a preceding newline.
  */
 function normalizeCodeFences(text: string): string {
-  return text.replace(/([^\n])(```|~~~)/g, '$1\n$2');
+  return text.replace(/([^\n])(```|~~~)/g, "$1\n$2");
 }
 
-const BtwMessageInternal: React.FC<BtwDisplayProps> = ({
-  btw,
-  containerWidth,
-}) => {
+const BtwMessageInternal: React.FC<BtwDisplayProps> = ({ btw, containerWidth }) => {
   const { columns: terminalWidth } = useTerminalSize();
   const baseWidth = containerWidth ?? terminalWidth;
   const contentWidth = Math.max(2, baseWidth - BTW_SELF_CHROME);
@@ -49,7 +46,7 @@ const BtwMessageInternal: React.FC<BtwDisplayProps> = ({
     >
       <Box flexDirection="row">
         <Text color={Colors.AccentYellow} bold>
-          {'/btw '}
+          {"/btw "}
         </Text>
         <Text wrap="wrap" color={Colors.AccentYellow}>
           {btw.question}
@@ -58,13 +55,11 @@ const BtwMessageInternal: React.FC<BtwDisplayProps> = ({
       {btw.isPending ? (
         <Box flexDirection="column" marginTop={1}>
           <Box>
-            <Text color={Colors.AccentYellow}>{'+ '}</Text>
-            <Text color={Colors.AccentYellow}>{t('Answering...')}</Text>
+            <Text color={Colors.AccentYellow}>{"+ "}</Text>
+            <Text color={Colors.AccentYellow}>{t("Answering...")}</Text>
           </Box>
           <Box marginTop={1}>
-            <Text dimColor>
-              {t('Press Escape, Ctrl+C, or Ctrl+D to cancel')}
-            </Text>
+            <Text dimColor>{t("Press Escape, Ctrl+C, or Ctrl+D to cancel")}</Text>
           </Box>
         </Box>
       ) : (
@@ -75,9 +70,7 @@ const BtwMessageInternal: React.FC<BtwDisplayProps> = ({
             contentWidth={contentWidth}
           />
           <Box marginTop={1}>
-            <Text dimColor>
-              {t('Press Space, Enter, or Escape to dismiss')}
-            </Text>
+            <Text dimColor>{t("Press Space, Enter, or Escape to dismiss")}</Text>
           </Box>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/messages/CompactToolGroupDisplay.tsx b/apps/airiscode-cli/src/ui/components/messages/CompactToolGroupDisplay.tsx
index cf870f0be..13a752feb 100644
--- a/apps/airiscode-cli/src/ui/components/messages/CompactToolGroupDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/CompactToolGroupDisplay.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import type { IndividualToolCallDisplay } from '../../types.js';
-import { ToolCallStatus } from '../../types.js';
-import { SHELL_COMMAND_NAME, SHELL_NAME } from '../../constants.js';
-import { theme } from '../../semantic-colors.js';
-import { t } from '../../../i18n/index.js';
-import { ToolStatusIndicator } from '../shared/ToolStatusIndicator.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../../i18n/index.js";
+import { SHELL_COMMAND_NAME, SHELL_NAME } from "../../constants.js";
+import { theme } from "../../semantic-colors.js";
+import type { IndividualToolCallDisplay } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
+import { ToolStatusIndicator } from "../shared/ToolStatusIndicator.js";
 
 interface CompactToolGroupDisplayProps {
   toolCalls: IndividualToolCallDisplay[];
@@ -19,26 +19,18 @@ interface CompactToolGroupDisplayProps {
 }
 
 // Priority: Confirming > Executing > Error > Canceled > Pending > Success
-function getOverallStatus(
-  toolCalls: IndividualToolCallDisplay[],
-): ToolCallStatus {
+function getOverallStatus(toolCalls: IndividualToolCallDisplay[]): ToolCallStatus {
   if (toolCalls.some((t) => t.status === ToolCallStatus.Confirming))
     return ToolCallStatus.Confirming;
-  if (toolCalls.some((t) => t.status === ToolCallStatus.Executing))
-    return ToolCallStatus.Executing;
-  if (toolCalls.some((t) => t.status === ToolCallStatus.Error))
-    return ToolCallStatus.Error;
-  if (toolCalls.some((t) => t.status === ToolCallStatus.Canceled))
-    return ToolCallStatus.Canceled;
-  if (toolCalls.some((t) => t.status === ToolCallStatus.Pending))
-    return ToolCallStatus.Pending;
+  if (toolCalls.some((t) => t.status === ToolCallStatus.Executing)) return ToolCallStatus.Executing;
+  if (toolCalls.some((t) => t.status === ToolCallStatus.Error)) return ToolCallStatus.Error;
+  if (toolCalls.some((t) => t.status === ToolCallStatus.Canceled)) return ToolCallStatus.Canceled;
+  if (toolCalls.some((t) => t.status === ToolCallStatus.Pending)) return ToolCallStatus.Pending;
   return ToolCallStatus.Success;
 }
 
 // Active tool priority: Confirming > Executing > last in array
-function getActiveTool(
-  toolCalls: IndividualToolCallDisplay[],
-): IndividualToolCallDisplay {
+function getActiveTool(toolCalls: IndividualToolCallDisplay[]): IndividualToolCallDisplay {
   return (
     toolCalls.find((t) => t.status === ToolCallStatus.Confirming) ??
     toolCalls.find((t) => t.status === ToolCallStatus.Executing) ??
@@ -46,9 +38,10 @@ function getActiveTool(
   );
 }
 
-export const CompactToolGroupDisplay: React.FC<
-  CompactToolGroupDisplayProps
-> = ({ toolCalls, contentWidth }) => {
+export const CompactToolGroupDisplay: React.FC<CompactToolGroupDisplayProps> = ({
+  toolCalls,
+  contentWidth,
+}) => {
   if (toolCalls.length === 0) return null;
 
   const overallStatus = getOverallStatus(toolCalls);
@@ -57,9 +50,7 @@ export const CompactToolGroupDisplay: React.FC<
   const isShellCommand = toolCalls.some(
     (t) => t.name === SHELL_COMMAND_NAME || t.name === SHELL_NAME,
   );
-  const hasPending = !toolCalls.every(
-    (t) => t.status === ToolCallStatus.Success,
-  );
+  const hasPending = !toolCalls.every((t) => t.status === ToolCallStatus.Success);
 
   const borderColor = isShellCommand
     ? theme.ui.symbol
@@ -70,9 +61,7 @@ export const CompactToolGroupDisplay: React.FC<
   // Take only the first line of description to prevent multi-line shell scripts
   // from expanding the compact view (wrap="truncate-end" only handles width overflow,
   // not literal \n characters in the content)
-  const activeToolDescription = activeTool.description
-    ? activeTool.description.split('\n')[0]
-    : '';
+  const activeToolDescription = activeTool.description ? activeTool.description.split("\n")[0] : "";
 
   return (
     <Box
@@ -91,7 +80,7 @@ export const CompactToolGroupDisplay: React.FC<
             <Text bold>{activeTool.name}</Text>
             {activeToolDescription ? (
               <Text color={theme.text.secondary}>
-                {'  '}
+                {"  "}
                 {activeToolDescription}
               </Text>
             ) : null}
@@ -100,9 +89,7 @@ export const CompactToolGroupDisplay: React.FC<
       </Box>
 
       {/* Hint line */}
-      <Text color={theme.text.secondary}>
-        {t('Press Ctrl+O to show full tool output')}
-      </Text>
+      <Text color={theme.text.secondary}>{t("Press Ctrl+O to show full tool output")}</Text>
     </Box>
   );
 };
diff --git a/apps/airiscode-cli/src/ui/components/messages/CompressionMessage.tsx b/apps/airiscode-cli/src/ui/components/messages/CompressionMessage.tsx
index 2f80664af..f322e2b0e 100644
--- a/apps/airiscode-cli/src/ui/components/messages/CompressionMessage.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/CompressionMessage.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type { CompressionProps } from '../../types.js';
-import Spinner from 'ink-spinner';
-import { theme } from '../../semantic-colors.js';
-import { SCREEN_READER_MODEL_PREFIX } from '../../textConstants.js';
-import { CompressionStatus } from '@airiscode/core';
-import { t } from '../../../i18n/index.js';
+import { CompressionStatus } from "@airiscode/core";
+import { Box, Text } from "ink";
+import Spinner from "ink-spinner";
+import { t } from "../../../i18n/index.js";
+import { theme } from "../../semantic-colors.js";
+import { SCREEN_READER_MODEL_PREFIX } from "../../textConstants.js";
+import type { CompressionProps } from "../../types.js";
 
 export interface CompressionDisplayProps {
   compression: CompressionProps;
@@ -20,47 +20,39 @@ export interface CompressionDisplayProps {
  * Compression messages appear when the /compress command is run, and show a loading spinner
  * while compression is in progress, followed up by some compression stats.
  */
-export function CompressionMessage({
-  compression,
-}: CompressionDisplayProps): React.JSX.Element {
-  const { isPending, originalTokenCount, newTokenCount, compressionStatus } =
-    compression;
+export function CompressionMessage({ compression }: CompressionDisplayProps): React.JSX.Element {
+  const { isPending, originalTokenCount, newTokenCount, compressionStatus } = compression;
 
   const originalTokens = originalTokenCount ?? 0;
   const newTokens = newTokenCount ?? 0;
 
   const getCompressionText = () => {
     if (isPending) {
-      return t('Compressing chat history');
+      return t("Compressing chat history");
     }
 
     switch (compressionStatus) {
       case CompressionStatus.COMPRESSED:
-        return t(
-          'Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.',
-          {
-            originalTokens: String(originalTokens),
-            newTokens: String(newTokens),
-          },
-        );
+        return t("Chat history compressed from {{originalTokens}} to {{newTokens}} tokens.", {
+          originalTokens: String(originalTokens),
+          newTokens: String(newTokens),
+        });
       case CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT:
         // For smaller histories (< 50k tokens), compression overhead likely exceeds benefits
         if (originalTokens < 50000) {
-          return t('Compression was not beneficial for this history size.');
+          return t("Compression was not beneficial for this history size.");
         }
         // For larger histories where compression should work but didn't,
         // this suggests an issue with the compression process itself
         return t(
-          'Chat history compression did not reduce size. This may indicate issues with the compression prompt.',
+          "Chat history compression did not reduce size. This may indicate issues with the compression prompt.",
         );
       case CompressionStatus.COMPRESSION_FAILED_TOKEN_COUNT_ERROR:
-        return t(
-          'Could not compress chat history due to a token counting error.',
-        );
+        return t("Could not compress chat history due to a token counting error.");
       case CompressionStatus.NOOP:
-        return 'Nothing to compress.';
+        return "Nothing to compress.";
       default:
-        return '';
+        return "";
     }
   };
 
@@ -69,17 +61,11 @@ export function CompressionMessage({
   return (
     <Box flexDirection="row">
       <Box marginRight={1}>
-        {isPending ? (
-          <Spinner type="dots" />
-        ) : (
-          <Text color={theme.text.accent}>✦</Text>
-        )}
+        {isPending ? <Spinner type="dots" /> : <Text color={theme.text.accent}>✦</Text>}
       </Box>
       <Box>
         <Text
-          color={
-            compression.isPending ? theme.text.accent : theme.status.success
-          }
+          color={compression.isPending ? theme.text.accent : theme.status.success}
           aria-label={SCREEN_READER_MODEL_PREFIX}
         >
           {text}
diff --git a/apps/airiscode-cli/src/ui/components/messages/ConversationMessages.tsx b/apps/airiscode-cli/src/ui/components/messages/ConversationMessages.tsx
index 526bc9cfe..f3b511e8c 100644
--- a/apps/airiscode-cli/src/ui/components/messages/ConversationMessages.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/ConversationMessages.tsx
@@ -4,15 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import stringWidth from 'string-width';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import { theme } from '../../semantic-colors.js';
-import {
-  SCREEN_READER_MODEL_PREFIX,
-  SCREEN_READER_USER_PREFIX,
-} from '../../textConstants.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import stringWidth from "string-width";
+import { theme } from "../../semantic-colors.js";
+import { SCREEN_READER_MODEL_PREFIX, SCREEN_READER_USER_PREFIX } from "../../textConstants.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
 
 interface UserMessageProps {
   text: string;
@@ -57,7 +54,7 @@ interface PrefixedTextMessageProps {
   textColor: string;
   ariaLabel?: string;
   marginTop?: number;
-  alignSelf?: 'auto' | 'flex-start' | 'center' | 'flex-end';
+  alignSelf?: "auto" | "flex-start" | "center" | "flex-end";
 }
 
 interface PrefixedMarkdownMessageProps {
@@ -97,12 +94,7 @@ const PrefixedTextMessage: React.FC<PrefixedTextMessageProps> = ({
   const prefixWidth = getPrefixWidth(prefix);
 
   return (
-    <Box
-      flexDirection="row"
-      paddingY={0}
-      marginTop={marginTop}
-      alignSelf={alignSelf}
-    >
+    <Box flexDirection="row" paddingY={0} marginTop={marginTop} alignSelf={alignSelf}>
       <Box width={prefixWidth}>
         <Text color={prefixColor} aria-label={ariaLabel}>
           {prefix}
@@ -149,9 +141,7 @@ const PrefixedMarkdownMessage: React.FC<PrefixedMarkdownMessageProps> = ({
   );
 };
 
-const ContinuationMarkdownMessage: React.FC<
-  ContinuationMarkdownMessageProps
-> = ({
+const ContinuationMarkdownMessage: React.FC<ContinuationMarkdownMessageProps> = ({
   text,
   isPending,
   availableTerminalHeight,
@@ -186,7 +176,7 @@ export const UserMessage: React.FC<UserMessageProps> = ({ text }) => (
 );
 
 export const UserShellMessage: React.FC<UserShellMessageProps> = ({ text }) => {
-  const commandToDisplay = text.startsWith('!') ? text.substring(1) : text;
+  const commandToDisplay = text.startsWith("!") ? text.substring(1) : text;
 
   return (
     <PrefixedTextMessage
@@ -215,9 +205,12 @@ export const AssistantMessage: React.FC<AssistantMessageProps> = ({
   />
 );
 
-export const AssistantMessageContent: React.FC<
-  AssistantMessageContentProps
-> = ({ text, isPending, availableTerminalHeight, contentWidth }) => (
+export const AssistantMessageContent: React.FC<AssistantMessageContentProps> = ({
+  text,
+  isPending,
+  availableTerminalHeight,
+  contentWidth,
+}) => (
   <ContinuationMarkdownMessage
     text={text}
     isPending={isPending}
diff --git a/apps/airiscode-cli/src/ui/components/messages/DiffRenderer.tsx b/apps/airiscode-cli/src/ui/components/messages/DiffRenderer.tsx
index 8910d6d80..08a6f1fc7 100644
--- a/apps/airiscode-cli/src/ui/components/messages/DiffRenderer.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/DiffRenderer.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import crypto from 'node:crypto';
-import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js';
-import { MaxSizedBox } from '../shared/MaxSizedBox.js';
-import { theme as semanticTheme } from '../../semantic-colors.js';
-import type { Theme } from '../../themes/theme.js';
-import type { LoadedSettings } from '../../../config/settings.js';
+import crypto from "node:crypto";
+import { Box, Text, useIsScreenReaderEnabled } from "ink";
+import type React from "react";
+import type { LoadedSettings } from "../../../config/settings.js";
+import { theme as semanticTheme } from "../../semantic-colors.js";
+import type { Theme } from "../../themes/theme.js";
+import { colorizeCode, colorizeLine } from "../../utils/CodeColorizer.js";
+import { MaxSizedBox } from "../shared/MaxSizedBox.js";
 
 interface DiffLine {
-  type: 'add' | 'del' | 'context' | 'hunk' | 'other';
+  type: "add" | "del" | "context" | "hunk" | "other";
   oldLine?: number;
   newLine?: number;
   content: string;
 }
 
 function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
-  const lines = diffContent.split('\n');
+  const lines = diffContent.split("\n");
   const result: DiffLine[] = [];
   let currentOldLine = 0;
   let currentNewLine = 0;
@@ -34,7 +34,7 @@ function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
       currentOldLine = parseInt(hunkMatch[1], 10);
       currentNewLine = parseInt(hunkMatch[2], 10);
       inHunk = true;
-      result.push({ type: 'hunk', content: line });
+      result.push({ type: "hunk", content: line });
       // We need to adjust the starting point because the first line number applies to the *first* actual line change/context,
       // but we increment *before* pushing that line. So decrement here.
       currentOldLine--;
@@ -43,38 +43,38 @@ function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
     }
     if (!inHunk) {
       // Skip standard Git header lines more robustly
-      if (line.startsWith('--- ')) {
+      if (line.startsWith("--- ")) {
         continue;
       }
       // If it's not a hunk or header, skip (or handle as 'other' if needed)
       continue;
     }
-    if (line.startsWith('+')) {
+    if (line.startsWith("+")) {
       currentNewLine++; // Increment before pushing
       result.push({
-        type: 'add',
+        type: "add",
         newLine: currentNewLine,
         content: line.substring(1),
       });
-    } else if (line.startsWith('-')) {
+    } else if (line.startsWith("-")) {
       currentOldLine++; // Increment before pushing
       result.push({
-        type: 'del',
+        type: "del",
         oldLine: currentOldLine,
         content: line.substring(1),
       });
-    } else if (line.startsWith(' ')) {
+    } else if (line.startsWith(" ")) {
       currentOldLine++; // Increment before pushing
       currentNewLine++;
       result.push({
-        type: 'context',
+        type: "context",
         oldLine: currentOldLine,
         newLine: currentNewLine,
         content: line.substring(1),
       });
-    } else if (line.startsWith('\\')) {
+    } else if (line.startsWith("\\")) {
       // Handle "\ No newline at end of file"
-      result.push({ type: 'other', content: line });
+      result.push({ type: "other", content: line });
     }
   }
   return result;
@@ -102,7 +102,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
   settings,
 }) => {
   const screenReaderEnabled = useIsScreenReaderEnabled();
-  if (!diffContent || typeof diffContent !== 'string') {
+  if (!diffContent || typeof diffContent !== "string") {
     return <Text color={semanticTheme.status.warning}>No diff content.</Text>;
   }
 
@@ -110,11 +110,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
 
   if (parsedLines.length === 0) {
     return (
-      <Box
-        borderStyle="round"
-        borderColor={semanticTheme.border.default}
-        padding={1}
-      >
+      <Box borderStyle="round" borderColor={semanticTheme.border.default} padding={1}>
         <Text dimColor>No changes detected.</Text>
       </Box>
     );
@@ -134,11 +130,11 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
   // Check if the diff represents a new file (only additions and header lines)
   const isNewFile = parsedLines.every(
     (line) =>
-      line.type === 'add' ||
-      line.type === 'hunk' ||
-      line.type === 'other' ||
-      line.content.startsWith('diff --git') ||
-      line.content.startsWith('new file mode'),
+      line.type === "add" ||
+      line.type === "hunk" ||
+      line.type === "other" ||
+      line.content.startsWith("diff --git") ||
+      line.content.startsWith("new file mode"),
   );
 
   let renderedOutput;
@@ -146,14 +142,12 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
   if (isNewFile) {
     // Extract only the added lines' content
     const addedContent = parsedLines
-      .filter((line) => line.type === 'add')
+      .filter((line) => line.type === "add")
       .map((line) => line.content)
-      .join('\n');
+      .join("\n");
     // Attempt to infer language from filename, default to plain text if no filename
-    const fileExtension = filename?.split('.').pop() || null;
-    const language = fileExtension
-      ? getLanguageFromExtension(fileExtension)
-      : null;
+    const fileExtension = filename?.split(".").pop() || null;
+    const language = fileExtension ? getLanguageFromExtension(fileExtension) : null;
     renderedOutput = colorizeCode(
       addedContent,
       language,
@@ -188,21 +182,15 @@ const renderDiffContent = (
   // 1. Normalize whitespace (replace tabs with spaces) *before* further processing
   const normalizedLines = parsedLines.map((line) => ({
     ...line,
-    content: line.content.replace(/\t/g, ' '.repeat(tabWidth)),
+    content: line.content.replace(/\t/g, " ".repeat(tabWidth)),
   }));
 
   // Filter out non-displayable lines (hunks, potentially 'other') using the normalized list
-  const displayableLines = normalizedLines.filter(
-    (l) => l.type !== 'hunk' && l.type !== 'other',
-  );
+  const displayableLines = normalizedLines.filter((l) => l.type !== "hunk" && l.type !== "other");
 
   if (displayableLines.length === 0) {
     return (
-      <Box
-        borderStyle="round"
-        borderColor={semanticTheme.border.default}
-        padding={1}
-      >
+      <Box borderStyle="round" borderColor={semanticTheme.border.default} padding={1}>
         <Text dimColor>No changes detected.</Text>
       </Box>
     );
@@ -217,16 +205,14 @@ const renderDiffContent = (
   );
   const gutterWidth = Math.max(1, maxLineNumber.toString().length);
 
-  const fileExtension = filename?.split('.').pop() || null;
-  const language = fileExtension
-    ? getLanguageFromExtension(fileExtension)
-    : null;
+  const fileExtension = filename?.split(".").pop() || null;
+  const language = fileExtension ? getLanguageFromExtension(fileExtension) : null;
 
   // Calculate the minimum indentation across all displayable lines
   let baseIndentation = Infinity; // Start high to find the minimum
   for (const line of displayableLines) {
     // Only consider lines with actual content for indentation calculation
-    if (line.content.trim() === '') continue;
+    if (line.content.trim() === "") continue;
 
     const firstCharIndex = line.content.search(/\S/); // Find index of first non-whitespace char
     const currentIndent = firstCharIndex === -1 ? 0 : firstCharIndex; // Indent is 0 if no non-whitespace found
@@ -239,23 +225,19 @@ const renderDiffContent = (
 
   const key = filename
     ? `diff-box-${filename}`
-    : `diff-box-${crypto.createHash('sha1').update(JSON.stringify(parsedLines)).digest('hex')}`;
+    : `diff-box-${crypto.createHash("sha1").update(JSON.stringify(parsedLines)).digest("hex")}`;
 
   let lastLineNumber: number | null = null;
   const MAX_CONTEXT_LINES_WITHOUT_GAP = 5;
 
   return (
-    <MaxSizedBox
-      maxHeight={availableTerminalHeight}
-      maxWidth={contentWidth}
-      key={key}
-    >
+    <MaxSizedBox maxHeight={availableTerminalHeight} maxWidth={contentWidth} key={key}>
       {displayableLines.reduce<React.ReactNode[]>((acc, line, index) => {
         // Determine the relevant line number for gap calculation based on type
         let relevantLineNumberForGapCalc: number | null = null;
-        if (line.type === 'add' || line.type === 'context') {
+        if (line.type === "add" || line.type === "context") {
           relevantLineNumberForGapCalc = line.newLine ?? null;
-        } else if (line.type === 'del') {
+        } else if (line.type === "del") {
           // For deletions, the gap is typically in relation to the original file's line numbering
           relevantLineNumberForGapCalc = line.oldLine ?? null;
         }
@@ -263,31 +245,30 @@ const renderDiffContent = (
         if (
           lastLineNumber !== null &&
           relevantLineNumberForGapCalc !== null &&
-          relevantLineNumberForGapCalc >
-            lastLineNumber + MAX_CONTEXT_LINES_WITHOUT_GAP + 1
+          relevantLineNumberForGapCalc > lastLineNumber + MAX_CONTEXT_LINES_WITHOUT_GAP + 1
         ) {
           acc.push(
             <Box key={`gap-${index}`}>
               <Text wrap="truncate" color={semanticTheme.text.secondary}>
-                {'═'.repeat(contentWidth)}
+                {"═".repeat(contentWidth)}
               </Text>
             </Box>,
           );
         }
 
         const lineKey = `diff-line-${index}`;
-        let gutterNumStr = '';
-        let prefixSymbol = ' ';
+        let gutterNumStr = "";
+        let prefixSymbol = " ";
 
         switch (line.type) {
-          case 'add':
-            gutterNumStr = (line.newLine ?? '').toString();
-            prefixSymbol = '+';
+          case "add":
+            gutterNumStr = (line.newLine ?? "").toString();
+            prefixSymbol = "+";
             lastLineNumber = line.newLine ?? null;
             break;
-          case 'del':
-            gutterNumStr = (line.oldLine ?? '').toString();
-            prefixSymbol = '-';
+          case "del":
+            gutterNumStr = (line.oldLine ?? "").toString();
+            prefixSymbol = "-";
             // For deletions, update lastLineNumber based on oldLine if it's advancing.
             // This helps manage gaps correctly if there are multiple consecutive deletions
             // or if a deletion is followed by a context line far away in the original file.
@@ -295,9 +276,9 @@ const renderDiffContent = (
               lastLineNumber = line.oldLine;
             }
             break;
-          case 'context':
-            gutterNumStr = (line.newLine ?? '').toString();
-            prefixSymbol = ' ';
+          case "context":
+            gutterNumStr = (line.newLine ?? "").toString();
+            prefixSymbol = " ";
             lastLineNumber = line.newLine ?? null;
             break;
           default:
@@ -312,27 +293,25 @@ const renderDiffContent = (
               <Text
                 color={semanticTheme.text.secondary}
                 backgroundColor={
-                  line.type === 'add'
+                  line.type === "add"
                     ? semanticTheme.background.diff.added
-                    : line.type === 'del'
+                    : line.type === "del"
                       ? semanticTheme.background.diff.removed
                       : undefined
                 }
               >
-                {gutterNumStr.padStart(gutterWidth)}{' '}
+                {gutterNumStr.padStart(gutterWidth)}{" "}
               </Text>
             )}
-            {line.type === 'context' ? (
+            {line.type === "context" ? (
               <>
                 <Text>{prefixSymbol} </Text>
-                <Text wrap="wrap">
-                  {colorizeLine(displayContent, language)}
-                </Text>
+                <Text wrap="wrap">{colorizeLine(displayContent, language)}</Text>
               </>
             ) : (
               <Text
                 backgroundColor={
-                  line.type === 'add'
+                  line.type === "add"
                     ? semanticTheme.background.diff.added
                     : semanticTheme.background.diff.removed
                 }
@@ -340,13 +319,11 @@ const renderDiffContent = (
               >
                 <Text
                   color={
-                    line.type === 'add'
-                      ? semanticTheme.status.success
-                      : semanticTheme.status.error
+                    line.type === "add" ? semanticTheme.status.success : semanticTheme.status.error
                   }
                 >
                   {prefixSymbol}
-                </Text>{' '}
+                </Text>{" "}
                 {colorizeLine(displayContent, language)}
               </Text>
             )}
@@ -360,21 +337,21 @@ const renderDiffContent = (
 
 const getLanguageFromExtension = (extension: string): string | null => {
   const languageMap: { [key: string]: string } = {
-    js: 'javascript',
-    ts: 'typescript',
-    py: 'python',
-    json: 'json',
-    css: 'css',
-    html: 'html',
-    sh: 'bash',
-    md: 'markdown',
-    yaml: 'yaml',
-    yml: 'yaml',
-    txt: 'plaintext',
-    java: 'java',
-    c: 'c',
-    cpp: 'cpp',
-    rb: 'ruby',
+    js: "javascript",
+    ts: "typescript",
+    py: "python",
+    json: "json",
+    css: "css",
+    html: "html",
+    sh: "bash",
+    md: "markdown",
+    yaml: "yaml",
+    yml: "yaml",
+    txt: "plaintext",
+    java: "java",
+    c: "c",
+    cpp: "cpp",
+    rb: "ruby",
   };
   return languageMap[extension] || null; // Return null if extension not found
 };
diff --git a/apps/airiscode-cli/src/ui/components/messages/InsightProgressMessage.tsx b/apps/airiscode-cli/src/ui/components/messages/InsightProgressMessage.tsx
index 78c900b2d..fe23ee8d7 100644
--- a/apps/airiscode-cli/src/ui/components/messages/InsightProgressMessage.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/InsightProgressMessage.tsx
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import type { InsightProgressProps } from '../../types.js';
-import Spinner from 'ink-spinner';
+import { Box, Text } from "ink";
+import Spinner from "ink-spinner";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import type { InsightProgressProps } from "../../types.js";
 
 interface InsightProgressMessageProps {
   progress: InsightProgressProps;
 }
 
-export const InsightProgressMessage: React.FC<InsightProgressMessageProps> = ({
-  progress,
-}) => {
+export const InsightProgressMessage: React.FC<InsightProgressMessageProps> = ({ progress }) => {
   const { stage, progress: percent, isComplete, error } = progress;
   const width = 30;
   const completedWidth = Math.round((percent / 100) * width);
   const remainingWidth = width - completedWidth;
 
-  const bar =
-    '█'.repeat(Math.max(0, completedWidth)) +
-    '░'.repeat(Math.max(0, remainingWidth));
+  const bar = "█".repeat(Math.max(0, completedWidth)) + "░".repeat(Math.max(0, remainingWidth));
 
   if (error) {
     return (
@@ -52,7 +48,7 @@ export const InsightProgressMessage: React.FC<InsightProgressMessageProps> = ({
       <Text color={theme.text.secondary}>{bar} </Text>
       <Text color={theme.text.accent}>
         {stage}
-        {progress.detail ? ` (${progress.detail})` : ''}
+        {progress.detail ? ` (${progress.detail})` : ""}
       </Text>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/messages/StatusMessages.tsx b/apps/airiscode-cli/src/ui/components/messages/StatusMessages.tsx
index b6b026a28..42cdc5dac 100644
--- a/apps/airiscode-cli/src/ui/components/messages/StatusMessages.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/StatusMessages.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import stringWidth from 'string-width';
-import { theme } from '../../semantic-colors.js';
-import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import stringWidth from "string-width";
+import { theme } from "../../semantic-colors.js";
+import { RenderInline } from "../../utils/InlineMarkdownRenderer.js";
 
 interface StatusMessageProps {
   text: string;
@@ -33,7 +33,7 @@ export const StatusMessage: React.FC<StatusMessageProps> = ({
   textColor,
   children,
 }) => {
-  if (!text || text.trim() === '') {
+  if (!text || text.trim() === "") {
     return null;
   }
 
@@ -81,10 +81,7 @@ export const WarningMessage: React.FC<StatusTextProps> = ({ text }) => (
   />
 );
 
-export const ErrorMessage: React.FC<StatusTextProps & { hint?: string }> = ({
-  text,
-  hint,
-}) => (
+export const ErrorMessage: React.FC<StatusTextProps & { hint?: string }> = ({ text, hint }) => (
   <StatusMessage
     text={text}
     prefix="✕"
diff --git a/apps/airiscode-cli/src/ui/components/messages/SummaryMessage.tsx b/apps/airiscode-cli/src/ui/components/messages/SummaryMessage.tsx
index 82819f959..4dc242a0a 100644
--- a/apps/airiscode-cli/src/ui/components/messages/SummaryMessage.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/SummaryMessage.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import type { SummaryProps } from '../../types.js';
-import Spinner from 'ink-spinner';
-import { Colors } from '../../colors.js';
+import { Box, Text } from "ink";
+import Spinner from "ink-spinner";
+import type React from "react";
+import { Colors } from "../../colors.js";
+import type { SummaryProps } from "../../types.js";
 
 export interface SummaryDisplayProps {
   summary: SummaryProps;
@@ -22,15 +22,15 @@ export const SummaryMessage: React.FC<SummaryDisplayProps> = ({ summary }) => {
   const getText = () => {
     if (summary.isPending) {
       switch (summary.stage) {
-        case 'generating':
-          return 'Generating project summary...';
-        case 'saving':
-          return 'Saving project summary...';
+        case "generating":
+          return "Generating project summary...";
+        case "saving":
+          return "Saving project summary...";
         default:
-          return 'Processing summary...';
+          return "Processing summary...";
       }
     }
-    const baseMessage = 'Project summary generated and saved successfully!';
+    const baseMessage = "Project summary generated and saved successfully!";
     if (summary.filePath) {
       return `${baseMessage} Saved to: ${summary.filePath}`;
     }
@@ -48,9 +48,7 @@ export const SummaryMessage: React.FC<SummaryDisplayProps> = ({ summary }) => {
     <Box flexDirection="row">
       <Box marginRight={1}>{getIcon()}</Box>
       <Box>
-        <Text
-          color={summary.isPending ? Colors.AccentPurple : Colors.AccentGreen}
-        >
+        <Text color={summary.isPending ? Colors.AccentPurple : Colors.AccentGreen}>
           {getText()}
         </Text>
       </Box>
diff --git a/apps/airiscode-cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/apps/airiscode-cli/src/ui/components/messages/ToolConfirmationMessage.tsx
index 2ea3f94e4..d7f33a6b8 100644
--- a/apps/airiscode-cli/src/ui/components/messages/ToolConfirmationMessage.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/ToolConfirmationMessage.tsx
@@ -4,32 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useState } from 'react';
-import { Box, Text } from 'ink';
-import { DiffRenderer } from './DiffRenderer.js';
-import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
 import type {
+  Config,
+  EditorType,
   ToolCallConfirmationDetails,
   ToolExecuteConfirmationDetails,
   ToolMcpConfirmationDetails,
-  Config,
-  EditorType,
-} from '@airiscode/core';
-import {
-  IdeClient,
-  ToolConfirmationOutcome,
-  buildHumanReadableRuleLabel,
-} from '@airiscode/core';
-import type { RadioSelectItem } from '../shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from '../shared/RadioButtonSelect.js';
-import { MaxSizedBox } from '../shared/MaxSizedBox.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { useSettings } from '../../contexts/SettingsContext.js';
-import { theme } from '../../semantic-colors.js';
-import { t } from '../../../i18n/index.js';
-import { AskUserQuestionDialog } from './AskUserQuestionDialog.js';
+} from "@airiscode/core";
+import { buildHumanReadableRuleLabel, IdeClient, ToolConfirmationOutcome } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import { t } from "../../../i18n/index.js";
+import { useSettings } from "../../contexts/SettingsContext.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { RenderInline } from "../../utils/InlineMarkdownRenderer.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
+import { MaxSizedBox } from "../shared/MaxSizedBox.js";
+import type { RadioSelectItem } from "../shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "../shared/RadioButtonSelect.js";
+import { AskUserQuestionDialog } from "./AskUserQuestionDialog.js";
+import { DiffRenderer } from "./DiffRenderer.js";
 
 export interface ToolConfirmationMessageProps {
   confirmationDetails: ToolCallConfirmationDetails;
@@ -40,9 +36,7 @@ export interface ToolConfirmationMessageProps {
   compactMode?: boolean;
 }
 
-export const ToolConfirmationMessage: React.FC<
-  ToolConfirmationMessageProps
-> = ({
+export const ToolConfirmationMessage: React.FC<ToolConfirmationMessageProps> = ({
   confirmationDetails,
   config,
   isFocused = true,
@@ -53,9 +47,7 @@ export const ToolConfirmationMessage: React.FC<
   const { onConfirm } = confirmationDetails;
 
   const settings = useSettings();
-  const preferredEditor = settings.merged.general?.preferredEditor as
-    | EditorType
-    | undefined;
+  const preferredEditor = settings.merged.general?.preferredEditor as EditorType | undefined;
 
   const [ideClient, setIdeClient] = useState<IdeClient | null>(null);
   const [isDiffingEnabled, setIsDiffingEnabled] = useState(false);
@@ -84,14 +76,10 @@ export const ToolConfirmationMessage: React.FC<
     // with ProceedOnce, racing with the intended CLI outcome.
     onConfirm(outcome);
 
-    if (confirmationDetails.type === 'edit') {
+    if (confirmationDetails.type === "edit") {
       if (config.getIdeMode() && isDiffingEnabled) {
-        const cliOutcome =
-          outcome === ToolConfirmationOutcome.Cancel ? 'rejected' : 'accepted';
-        await ideClient?.resolveDiffFromCli(
-          confirmationDetails.filePath,
-          cliOutcome,
-        );
+        const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? "rejected" : "accepted";
+        await ideClient?.resolveDiffFromCli(confirmationDetails.filePath, cliOutcome);
       }
     }
   };
@@ -101,7 +89,7 @@ export const ToolConfirmationMessage: React.FC<
   useKeypress(
     (key) => {
       if (!isFocused) return;
-      if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+      if (key.name === "escape" || (key.ctrl && key.name === "c")) {
         handleConfirm(ToolConfirmationOutcome.Cancel);
       }
     },
@@ -114,18 +102,18 @@ export const ToolConfirmationMessage: React.FC<
   if (compactMode) {
     const compactOptions: Array<RadioSelectItem<ToolConfirmationOutcome>> = [
       {
-        key: 'proceed-once',
-        label: t('Yes, allow once'),
+        key: "proceed-once",
+        label: t("Yes, allow once"),
         value: ToolConfirmationOutcome.ProceedOnce,
       },
       {
-        key: 'proceed-always',
-        label: t('Allow always'),
+        key: "proceed-always",
+        label: t("Allow always"),
         value: ToolConfirmationOutcome.ProceedAlways,
       },
       {
-        key: 'cancel',
-        label: t('No'),
+        key: "cancel",
+        label: t("No"),
         value: ToolConfirmationOutcome.Cancel,
       },
     ];
@@ -133,14 +121,10 @@ export const ToolConfirmationMessage: React.FC<
     return (
       <Box flexDirection="column">
         <Box>
-          <Text wrap="truncate">{t('Do you want to proceed?')}</Text>
+          <Text wrap="truncate">{t("Do you want to proceed?")}</Text>
         </Box>
         <Box>
-          <RadioButtonSelect
-            items={compactOptions}
-            onSelect={handleSelect}
-            isFocused={isFocused}
-          />
+          <RadioButtonSelect items={compactOptions} onSelect={handleSelect} isFocused={isFocused} />
         </Box>
       </Box>
     );
@@ -150,9 +134,8 @@ export const ToolConfirmationMessage: React.FC<
   let bodyContent: React.ReactNode | null = null; // Removed contextDisplay here
   let question: string;
 
-  const options: Array<RadioSelectItem<ToolConfirmationOutcome>> = new Array<
-    RadioSelectItem<ToolConfirmationOutcome>
-  >();
+  const options: Array<RadioSelectItem<ToolConfirmationOutcome>> =
+    [] as RadioSelectItem<ToolConfirmationOutcome>[];
 
   // Body content is now the DiffRenderer, passing filename to it
   // The bordered box is removed from here and handled within DiffRenderer
@@ -160,7 +143,7 @@ export const ToolConfirmationMessage: React.FC<
   function availableBodyContentHeight() {
     if (options.length === 0) {
       // This should not happen in practice as options are always added before this is called.
-      throw new Error('Options not provided for confirmation message');
+      throw new Error("Options not provided for confirmation message");
     }
 
     if (availableTerminalHeight === undefined) {
@@ -184,7 +167,7 @@ export const ToolConfirmationMessage: React.FC<
     return Math.max(availableTerminalHeight - surroundingElementsHeight, 1);
   }
 
-  if (confirmationDetails.type === 'edit') {
+  if (confirmationDetails.type === "edit") {
     if (confirmationDetails.isModifying) {
       return (
         <Box
@@ -195,39 +178,39 @@ export const ToolConfirmationMessage: React.FC<
           padding={1}
           overflow="hidden"
         >
-          <Text color={theme.text.primary}>{t('Modify in progress:')} </Text>
+          <Text color={theme.text.primary}>{t("Modify in progress:")} </Text>
           <Text color={theme.status.success}>
-            {t('Save and close external editor to continue')}
+            {t("Save and close external editor to continue")}
           </Text>
         </Box>
       );
     }
 
-    question = t('Apply this change?');
+    question = t("Apply this change?");
     options.push({
-      label: t('Yes, allow once'),
+      label: t("Yes, allow once"),
       value: ToolConfirmationOutcome.ProceedOnce,
-      key: 'Yes, allow once',
+      key: "Yes, allow once",
     });
     if (isTrustedFolder) {
       options.push({
-        label: t('Yes, allow always'),
+        label: t("Yes, allow always"),
         value: ToolConfirmationOutcome.ProceedAlways,
-        key: 'Yes, allow always',
+        key: "Yes, allow always",
       });
     }
     if ((!config.getIdeMode() || !isDiffingEnabled) && preferredEditor) {
       options.push({
-        label: t('Modify with external editor'),
+        label: t("Modify with external editor"),
         value: ToolConfirmationOutcome.ModifyWithEditor,
-        key: 'Modify with external editor',
+        key: "Modify with external editor",
       });
     }
 
     options.push({
-      label: t('No, suggest changes (esc)'),
+      label: t("No, suggest changes (esc)"),
       value: ToolConfirmationOutcome.Cancel,
-      key: 'No, suggest changes (esc)',
+      key: "No, suggest changes (esc)",
     });
 
     bodyContent = (
@@ -239,45 +222,44 @@ export const ToolConfirmationMessage: React.FC<
         settings={settings}
       />
     );
-  } else if (confirmationDetails.type === 'exec') {
-    const executionProps =
-      confirmationDetails as ToolExecuteConfirmationDetails;
+  } else if (confirmationDetails.type === "exec") {
+    const executionProps = confirmationDetails as ToolExecuteConfirmationDetails;
 
     question = t("Allow execution of: '{{command}}'?", {
       command: executionProps.rootCommand,
     });
     options.push({
-      label: t('Yes, allow once'),
+      label: t("Yes, allow once"),
       value: ToolConfirmationOutcome.ProceedOnce,
-      key: 'Yes, allow once',
+      key: "Yes, allow once",
     });
     if (isTrustedFolder && !confirmationDetails.hideAlwaysAllow) {
       const friendlyLabel = executionProps.permissionRules?.length
         ? ` ${buildHumanReadableRuleLabel(executionProps.permissionRules)}`
-        : '';
+        : "";
       options.push({
         label: friendlyLabel
-          ? t('Always allow {{action}} in this project', {
+          ? t("Always allow {{action}} in this project", {
               action: friendlyLabel.trim(),
             })
-          : t('Always allow in this project'),
+          : t("Always allow in this project"),
         value: ToolConfirmationOutcome.ProceedAlwaysProject,
-        key: 'Always allow in this project',
+        key: "Always allow in this project",
       });
       options.push({
         label: friendlyLabel
-          ? t('Always allow {{action}} for this user', {
+          ? t("Always allow {{action}} for this user", {
               action: friendlyLabel.trim(),
             })
-          : t('Always allow for this user'),
+          : t("Always allow for this user"),
         value: ToolConfirmationOutcome.ProceedAlwaysUser,
-        key: 'Always allow for this user',
+        key: "Always allow for this user",
       });
     }
     options.push({
-      label: t('No, suggest changes (esc)'),
+      label: t("No, suggest changes (esc)"),
       value: ToolConfirmationOutcome.Cancel,
-      key: 'No, suggest changes (esc)',
+      key: "No, suggest changes (esc)",
     });
 
     let bodyContentHeight = availableBodyContentHeight();
@@ -287,10 +269,7 @@ export const ToolConfirmationMessage: React.FC<
     bodyContent = (
       <Box flexDirection="column">
         <Box paddingX={1} marginLeft={1}>
-          <MaxSizedBox
-            maxHeight={bodyContentHeight}
-            maxWidth={Math.max(contentWidth, 1)}
-          >
+          <MaxSizedBox maxHeight={bodyContentHeight} maxWidth={Math.max(contentWidth, 1)}>
             <Box>
               <Text color={theme.text.link}>{executionProps.command}</Text>
             </Box>
@@ -298,30 +277,30 @@ export const ToolConfirmationMessage: React.FC<
         </Box>
       </Box>
     );
-  } else if (confirmationDetails.type === 'plan') {
+  } else if (confirmationDetails.type === "plan") {
     const planProps = confirmationDetails;
 
     question = planProps.title;
     options.push({
-      key: 'restore-previous',
-      label: t('Yes, restore previous mode ({{mode}})', {
-        mode: planProps.prePlanMode ?? 'default',
+      key: "restore-previous",
+      label: t("Yes, restore previous mode ({{mode}})", {
+        mode: planProps.prePlanMode ?? "default",
       }),
       value: ToolConfirmationOutcome.RestorePrevious,
     });
     options.push({
-      key: 'proceed-always',
-      label: t('Yes, and auto-accept edits'),
+      key: "proceed-always",
+      label: t("Yes, and auto-accept edits"),
       value: ToolConfirmationOutcome.ProceedAlways,
     });
     options.push({
-      key: 'proceed-once',
-      label: t('Yes, and manually approve edits'),
+      key: "proceed-once",
+      label: t("Yes, and manually approve edits"),
       value: ToolConfirmationOutcome.ProceedOnce,
     });
     options.push({
-      key: 'cancel',
-      label: t('No, keep planning (esc)'),
+      key: "cancel",
+      label: t("No, keep planning (esc)"),
       value: ToolConfirmationOutcome.Cancel,
     });
 
@@ -335,47 +314,46 @@ export const ToolConfirmationMessage: React.FC<
         />
       </Box>
     );
-  } else if (confirmationDetails.type === 'info') {
+  } else if (confirmationDetails.type === "info") {
     const infoProps = confirmationDetails;
     const displayUrls =
-      infoProps.urls &&
-      !(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
+      infoProps.urls && !(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
 
-    question = t('Do you want to proceed?');
+    question = t("Do you want to proceed?");
     options.push({
-      label: t('Yes, allow once'),
+      label: t("Yes, allow once"),
       value: ToolConfirmationOutcome.ProceedOnce,
-      key: 'Yes, allow once',
+      key: "Yes, allow once",
     });
     if (isTrustedFolder && !confirmationDetails.hideAlwaysAllow) {
       const friendlyLabel =
-        'permissionRules' in infoProps &&
+        "permissionRules" in infoProps &&
         (infoProps as { permissionRules?: string[] }).permissionRules?.length
           ? ` ${buildHumanReadableRuleLabel((infoProps as { permissionRules?: string[] }).permissionRules!)}`
-          : '';
+          : "";
       options.push({
         label: friendlyLabel
-          ? t('Always allow {{action}} in this project', {
+          ? t("Always allow {{action}} in this project", {
               action: friendlyLabel.trim(),
             })
-          : t('Always allow in this project'),
+          : t("Always allow in this project"),
         value: ToolConfirmationOutcome.ProceedAlwaysProject,
-        key: 'Always allow in this project',
+        key: "Always allow in this project",
       });
       options.push({
         label: friendlyLabel
-          ? t('Always allow {{action}} for this user', {
+          ? t("Always allow {{action}} for this user", {
               action: friendlyLabel.trim(),
             })
-          : t('Always allow for this user'),
+          : t("Always allow for this user"),
         value: ToolConfirmationOutcome.ProceedAlwaysUser,
-        key: 'Always allow for this user',
+        key: "Always allow for this user",
       });
     }
     options.push({
-      label: t('No, suggest changes (esc)'),
+      label: t("No, suggest changes (esc)"),
       value: ToolConfirmationOutcome.Cancel,
-      key: 'No, suggest changes (esc)',
+      key: "No, suggest changes (esc)",
     });
 
     bodyContent = (
@@ -385,10 +363,10 @@ export const ToolConfirmationMessage: React.FC<
         </Text>
         {displayUrls && infoProps.urls && infoProps.urls.length > 0 && (
           <Box flexDirection="column" marginTop={1}>
-            <Text color={theme.text.primary}>{t('URLs to fetch:')}</Text>
+            <Text color={theme.text.primary}>{t("URLs to fetch:")}</Text>
             {infoProps.urls.map((url) => (
               <Text key={url}>
-                {' '}
+                {" "}
                 - <RenderInline text={url} />
               </Text>
             ))}
@@ -396,7 +374,7 @@ export const ToolConfirmationMessage: React.FC<
         )}
       </Box>
     );
-  } else if (confirmationDetails.type === 'ask_user_question') {
+  } else if (confirmationDetails.type === "ask_user_question") {
     // Use dedicated dialog for ask_user_question type
     return (
       <AskUserQuestionDialog
@@ -412,53 +390,48 @@ export const ToolConfirmationMessage: React.FC<
     bodyContent = (
       <Box flexDirection="column" paddingX={1} marginLeft={1}>
         <Text color={theme.text.link}>
-          {t('MCP Server: {{server}}', { server: mcpProps.serverName })}
-        </Text>
-        <Text color={theme.text.link}>
-          {t('Tool: {{tool}}', { tool: mcpProps.toolName })}
+          {t("MCP Server: {{server}}", { server: mcpProps.serverName })}
         </Text>
+        <Text color={theme.text.link}>{t("Tool: {{tool}}", { tool: mcpProps.toolName })}</Text>
       </Box>
     );
 
-    question = t(
-      'Allow execution of MCP tool "{{tool}}" from server "{{server}}"?',
-      {
-        tool: mcpProps.toolName,
-        server: mcpProps.serverName,
-      },
-    );
+    question = t('Allow execution of MCP tool "{{tool}}" from server "{{server}}"?', {
+      tool: mcpProps.toolName,
+      server: mcpProps.serverName,
+    });
     options.push({
-      label: t('Yes, allow once'),
+      label: t("Yes, allow once"),
       value: ToolConfirmationOutcome.ProceedOnce,
-      key: 'Yes, allow once',
+      key: "Yes, allow once",
     });
     if (isTrustedFolder && !confirmationDetails.hideAlwaysAllow) {
       const friendlyLabel = mcpProps.permissionRules?.length
         ? ` ${buildHumanReadableRuleLabel(mcpProps.permissionRules)}`
-        : '';
+        : "";
       options.push({
         label: friendlyLabel
-          ? t('Always allow {{action}} in this project', {
+          ? t("Always allow {{action}} in this project", {
               action: friendlyLabel.trim(),
             })
-          : t('Always allow in this project'),
+          : t("Always allow in this project"),
         value: ToolConfirmationOutcome.ProceedAlwaysProject,
-        key: 'Always allow in this project',
+        key: "Always allow in this project",
       });
       options.push({
         label: friendlyLabel
-          ? t('Always allow {{action}} for this user', {
+          ? t("Always allow {{action}} for this user", {
               action: friendlyLabel.trim(),
             })
-          : t('Always allow for this user'),
+          : t("Always allow for this user"),
         value: ToolConfirmationOutcome.ProceedAlwaysUser,
-        key: 'Always allow for this user',
+        key: "Always allow for this user",
       });
     }
     options.push({
-      label: t('No, suggest changes (esc)'),
+      label: t("No, suggest changes (esc)"),
       value: ToolConfirmationOutcome.Cancel,
-      key: 'No, suggest changes (esc)',
+      key: "No, suggest changes (esc)",
     });
   }
 
@@ -479,11 +452,7 @@ export const ToolConfirmationMessage: React.FC<
 
       {/* Select Input for Options */}
       <Box flexShrink={0}>
-        <RadioButtonSelect
-          items={options}
-          onSelect={handleSelect}
-          isFocused={isFocused}
-        />
+        <RadioButtonSelect items={options} onSelect={handleSelect} isFocused={isFocused} />
       </Box>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/messages/ToolGroupMessage.tsx b/apps/airiscode-cli/src/ui/components/messages/ToolGroupMessage.tsx
index 747f6193c..9e37872e4 100644
--- a/apps/airiscode-cli/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/ToolGroupMessage.tsx
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useMemo, useRef } from 'react';
-import { Box } from 'ink';
-import type { IndividualToolCallDisplay } from '../../types.js';
-import { ToolCallStatus } from '../../types.js';
-import { ToolMessage } from './ToolMessage.js';
-import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
-import { CompactToolGroupDisplay } from './CompactToolGroupDisplay.js';
-import { theme } from '../../semantic-colors.js';
-import { SHELL_COMMAND_NAME, SHELL_NAME } from '../../constants.js';
-import { useConfig } from '../../contexts/ConfigContext.js';
-import { useVerboseMode } from '../../contexts/VerboseModeContext.js';
-import type { AgentResultDisplay } from '@airiscode/core';
+import type { AgentResultDisplay } from "@airiscode/core";
+import { Box } from "ink";
+import type React from "react";
+import { useMemo, useRef } from "react";
+import { SHELL_COMMAND_NAME, SHELL_NAME } from "../../constants.js";
+import { useConfig } from "../../contexts/ConfigContext.js";
+import { useVerboseMode } from "../../contexts/VerboseModeContext.js";
+import { theme } from "../../semantic-colors.js";
+import type { IndividualToolCallDisplay } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
+import { CompactToolGroupDisplay } from "./CompactToolGroupDisplay.js";
+import { ToolConfirmationMessage } from "./ToolConfirmationMessage.js";
+import { ToolMessage } from "./ToolMessage.js";
 
 function isAgentWithPendingConfirmation(
-  rd: IndividualToolCallDisplay['resultDisplay'],
+  rd: IndividualToolCallDisplay["resultDisplay"],
 ): rd is AgentResultDisplay {
   return (
-    typeof rd === 'object' &&
+    typeof rd === "object" &&
     rd !== null &&
-    'type' in rd &&
-    (rd as AgentResultDisplay).type === 'task_execution' &&
+    "type" in rd &&
+    (rd as AgentResultDisplay).type === "task_execution" &&
     (rd as AgentResultDisplay).pendingConfirmation !== undefined
   );
 }
@@ -55,16 +55,11 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
   const config = useConfig();
   const { verboseMode } = useVerboseMode();
 
-  const hasConfirmingTool = toolCalls.some(
-    (t) => t.status === ToolCallStatus.Confirming,
-  );
+  const hasConfirmingTool = toolCalls.some((t) => t.status === ToolCallStatus.Confirming);
   const hasErrorTool = toolCalls.some((t) => t.status === ToolCallStatus.Error);
   const isEmbeddedShellFocused =
     embeddedShellFocused &&
-    toolCalls.some(
-      (t) =>
-        t.ptyId === activeShellPtyId && t.status === ToolCallStatus.Executing,
-    );
+    toolCalls.some((t) => t.ptyId === activeShellPtyId && t.status === ToolCallStatus.Executing);
 
   // useMemo must be called unconditionally (Rules of Hooks) — before any early return
   // only prompt for tool approval on the first 'confirming' tool in the list
@@ -76,10 +71,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
   // Determine which subagent tools currently have a pending confirmation.
   // Must be called unconditionally (Rules of Hooks) — before any early return.
   const subagentsAwaitingApproval = useMemo(
-    () =>
-      toolCalls.filter((tc) =>
-        isAgentWithPendingConfirmation(tc.resultDisplay),
-      ),
+    () => toolCalls.filter((tc) => isAgentWithPendingConfirmation(tc.resultDisplay)),
     [toolCalls],
   );
 
@@ -110,18 +102,11 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
     !isUserInitiated;
 
   if (showCompact) {
-    return (
-      <CompactToolGroupDisplay
-        toolCalls={toolCalls}
-        contentWidth={contentWidth}
-      />
-    );
+    return <CompactToolGroupDisplay toolCalls={toolCalls} contentWidth={contentWidth} />;
   }
 
   // Full expanded view
-  const hasPending = !toolCalls.every(
-    (t) => t.status === ToolCallStatus.Success,
-  );
+  const hasPending = !toolCalls.every((t) => t.status === ToolCallStatus.Success);
   const isShellCommand = toolCalls.some(
     (t) => t.name === SHELL_COMMAND_NAME || t.name === SHELL_NAME,
   );
@@ -138,7 +123,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
 
   let countToolCallsWithResults = 0;
   for (const tool of toolCalls) {
-    if (tool.resultDisplay !== undefined && tool.resultDisplay !== '') {
+    if (tool.resultDisplay !== undefined && tool.resultDisplay !== "") {
       countToolCallsWithResults++;
     }
   }
@@ -164,9 +149,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
         cause tearing.
       */
       width={contentWidth}
-      borderDimColor={
-        hasPending && (!isShellCommand || !isEmbeddedShellFocused)
-      }
+      borderDimColor={hasPending && (!isShellCommand || !isEmbeddedShellFocused)}
       borderColor={borderColor}
       gap={1}
     >
@@ -176,9 +159,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
         // when (1) there is no direct tool-level confirmation active, and
         // (2) this tool currently holds the focus lock.
         const isSubagentFocused =
-          isFocused &&
-          !toolAwaitingApproval &&
-          focusedSubagentCallId === tool.callId;
+          isFocused && !toolAwaitingApproval && focusedSubagentCallId === tool.callId;
         // Show the waiting indicator only when this subagent genuinely has a
         // pending confirmation AND another subagent holds the focus lock.
         const isWaitingForOtherApproval =
@@ -192,13 +173,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                 {...tool}
                 availableTerminalHeight={availableTerminalHeightPerToolMessage}
                 contentWidth={innerWidth}
-                emphasis={
-                  isConfirming
-                    ? 'high'
-                    : toolAwaitingApproval
-                      ? 'low'
-                      : 'medium'
-                }
+                emphasis={isConfirming ? "high" : toolAwaitingApproval ? "low" : "medium"}
                 activeShellPtyId={activeShellPtyId}
                 embeddedShellFocused={embeddedShellFocused}
                 config={config}
@@ -218,9 +193,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                   confirmationDetails={tool.confirmationDetails}
                   config={config}
                   isFocused={isFocused}
-                  availableTerminalHeight={
-                    availableTerminalHeightPerToolMessage
-                  }
+                  availableTerminalHeight={availableTerminalHeightPerToolMessage}
                   contentWidth={innerWidth}
                 />
               )}
diff --git a/apps/airiscode-cli/src/ui/components/messages/ToolMessage.tsx b/apps/airiscode-cli/src/ui/components/messages/ToolMessage.tsx
index 643908743..e9aec417d 100644
--- a/apps/airiscode-cli/src/ui/components/messages/ToolMessage.tsx
+++ b/apps/airiscode-cli/src/ui/components/messages/ToolMessage.tsx
@@ -4,36 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Box, Text } from 'ink';
-import type { IndividualToolCallDisplay } from '../../types.js';
-import { ToolCallStatus } from '../../types.js';
-import { DiffRenderer } from './DiffRenderer.js';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import { AnsiOutputText } from '../AnsiOutput.js';
-import { MaxSizedBox } from '../shared/MaxSizedBox.js';
-import { TodoDisplay } from '../TodoDisplay.js';
 import type {
-  TodoResultDisplay,
   AgentResultDisplay,
-  PlanResultDisplay,
   AnsiOutput,
   Config,
   McpToolProgressData,
-} from '@airiscode/core';
-import { AgentExecutionDisplay } from '../subagents/index.js';
-import { PlanSummaryDisplay } from '../PlanSummaryDisplay.js';
-import { ShellInputPrompt } from '../ShellInputPrompt.js';
-import { SHELL_COMMAND_NAME, SHELL_NAME } from '../../constants.js';
-import { theme } from '../../semantic-colors.js';
-import { useSettings } from '../../contexts/SettingsContext.js';
-import type { LoadedSettings } from '../../../config/settings.js';
-import { useVerboseMode } from '../../contexts/VerboseModeContext.js';
-
-import {
-  ToolStatusIndicator,
-  STATUS_INDICATOR_WIDTH,
-} from '../shared/ToolStatusIndicator.js';
+  PlanResultDisplay,
+  TodoResultDisplay,
+} from "@airiscode/core";
+import { Box, Text } from "ink";
+import React from "react";
+import type { LoadedSettings } from "../../../config/settings.js";
+import { SHELL_COMMAND_NAME, SHELL_NAME } from "../../constants.js";
+import { useSettings } from "../../contexts/SettingsContext.js";
+import { useVerboseMode } from "../../contexts/VerboseModeContext.js";
+import { theme } from "../../semantic-colors.js";
+import type { IndividualToolCallDisplay } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
+import { AnsiOutputText } from "../AnsiOutput.js";
+import { PlanSummaryDisplay } from "../PlanSummaryDisplay.js";
+import { ShellInputPrompt } from "../ShellInputPrompt.js";
+import { MaxSizedBox } from "../shared/MaxSizedBox.js";
+import { STATUS_INDICATOR_WIDTH, ToolStatusIndicator } from "../shared/ToolStatusIndicator.js";
+import { AgentExecutionDisplay } from "../subagents/index.js";
+import { TodoDisplay } from "../TodoDisplay.js";
+import { DiffRenderer } from "./DiffRenderer.js";
 
 const STATIC_HEIGHT = 1;
 const RESERVED_LINE_COUNT = 5; // for tool name, status, padding etc.
@@ -42,106 +38,104 @@ const MIN_LINES_SHOWN = 2; // show at least this many lines
 // Large threshold to ensure we don't cause performance issues for very large
 // outputs that will get truncated further MaxSizedBox anyway.
 const MAXIMUM_RESULT_DISPLAY_CHARACTERS = 1000000;
-export type TextEmphasis = 'high' | 'medium' | 'low';
+export type TextEmphasis = "high" | "medium" | "low";
 
 type DisplayRendererResult =
-  | { type: 'none' }
-  | { type: 'todo'; data: TodoResultDisplay }
-  | { type: 'plan'; data: PlanResultDisplay }
-  | { type: 'string'; data: string }
-  | { type: 'diff'; data: { fileDiff: string; fileName: string } }
-  | { type: 'task'; data: AgentResultDisplay }
-  | { type: 'ansi'; data: AnsiOutput };
+  | { type: "none" }
+  | { type: "todo"; data: TodoResultDisplay }
+  | { type: "plan"; data: PlanResultDisplay }
+  | { type: "string"; data: string }
+  | { type: "diff"; data: { fileDiff: string; fileName: string } }
+  | { type: "task"; data: AgentResultDisplay }
+  | { type: "ansi"; data: AnsiOutput };
 
 /**
  * Custom hook to determine the type of result display and return appropriate rendering info
  */
-const useResultDisplayRenderer = (
-  resultDisplay: unknown,
-): DisplayRendererResult =>
+const useResultDisplayRenderer = (resultDisplay: unknown): DisplayRendererResult =>
   React.useMemo(() => {
     if (!resultDisplay) {
-      return { type: 'none' };
+      return { type: "none" };
     }
 
     // Check for TodoResultDisplay
     if (
-      typeof resultDisplay === 'object' &&
+      typeof resultDisplay === "object" &&
       resultDisplay !== null &&
-      'type' in resultDisplay &&
-      resultDisplay.type === 'todo_list'
+      "type" in resultDisplay &&
+      resultDisplay.type === "todo_list"
     ) {
       return {
-        type: 'todo',
+        type: "todo",
         data: resultDisplay as TodoResultDisplay,
       };
     }
 
     if (
-      typeof resultDisplay === 'object' &&
+      typeof resultDisplay === "object" &&
       resultDisplay !== null &&
-      'type' in resultDisplay &&
-      resultDisplay.type === 'plan_summary'
+      "type" in resultDisplay &&
+      resultDisplay.type === "plan_summary"
     ) {
       return {
-        type: 'plan',
+        type: "plan",
         data: resultDisplay as PlanResultDisplay,
       };
     }
 
     // Check for SubagentExecutionResultDisplay (for non-task tools)
     if (
-      typeof resultDisplay === 'object' &&
+      typeof resultDisplay === "object" &&
       resultDisplay !== null &&
-      'type' in resultDisplay &&
-      resultDisplay.type === 'task_execution'
+      "type" in resultDisplay &&
+      resultDisplay.type === "task_execution"
     ) {
       return {
-        type: 'task',
+        type: "task",
         data: resultDisplay as AgentResultDisplay,
       };
     }
 
     // Check for FileDiff
     if (
-      typeof resultDisplay === 'object' &&
+      typeof resultDisplay === "object" &&
       resultDisplay !== null &&
-      'fileDiff' in resultDisplay
+      "fileDiff" in resultDisplay
     ) {
       return {
-        type: 'diff',
+        type: "diff",
         data: resultDisplay as { fileDiff: string; fileName: string },
       };
     }
 
     // Check for McpToolProgressData
     if (
-      typeof resultDisplay === 'object' &&
+      typeof resultDisplay === "object" &&
       resultDisplay !== null &&
-      'type' in resultDisplay &&
-      resultDisplay.type === 'mcp_tool_progress'
+      "type" in resultDisplay &&
+      resultDisplay.type === "mcp_tool_progress"
     ) {
       const progress = resultDisplay as McpToolProgressData;
       const msg = progress.message ?? `Progress: ${progress.progress}`;
-      const totalStr = progress.total != null ? `/${progress.total}` : '';
+      const totalStr = progress.total != null ? `/${progress.total}` : "";
       return {
-        type: 'string',
+        type: "string",
         data: `⏳ [${progress.progress}${totalStr}] ${msg}`,
       };
     }
 
     // Check for AnsiOutput
     if (
-      typeof resultDisplay === 'object' &&
+      typeof resultDisplay === "object" &&
       resultDisplay !== null &&
-      'ansiOutput' in resultDisplay
+      "ansiOutput" in resultDisplay
     ) {
-      return { type: 'ansi', data: resultDisplay.ansiOutput as AnsiOutput };
+      return { type: "ansi", data: resultDisplay.ansiOutput as AnsiOutput };
     }
 
     // Default to string
     return {
-      type: 'string',
+      type: "string",
       data: resultDisplay as string,
     };
   }, [resultDisplay]);
@@ -149,20 +143,16 @@ const useResultDisplayRenderer = (
 /**
  * Component to render todo list results
  */
-const TodoResultRenderer: React.FC<{ data: TodoResultDisplay }> = ({
-  data,
-}) => <TodoDisplay todos={data.todos} />;
+const TodoResultRenderer: React.FC<{ data: TodoResultDisplay }> = ({ data }) => (
+  <TodoDisplay todos={data.todos} />
+);
 
 const PlanResultRenderer: React.FC<{
   data: PlanResultDisplay;
   availableHeight?: number;
   childWidth: number;
 }> = ({ data, availableHeight, childWidth }) => (
-  <PlanSummaryDisplay
-    data={data}
-    availableHeight={availableHeight}
-    childWidth={childWidth}
-  />
+  <PlanSummaryDisplay data={data} availableHeight={availableHeight} childWidth={childWidth} />
 );
 
 /**
@@ -175,14 +165,7 @@ const SubagentExecutionRenderer: React.FC<{
   config: Config;
   isFocused?: boolean;
   isWaitingForOtherApproval?: boolean;
-}> = ({
-  data,
-  availableHeight,
-  childWidth,
-  config,
-  isFocused,
-  isWaitingForOtherApproval,
-}) => (
+}> = ({ data, availableHeight, childWidth, config, isFocused, isWaitingForOtherApproval }) => (
   <AgentExecutionDisplay
     data={data}
     availableHeight={availableHeight}
@@ -206,7 +189,7 @@ const StringResultRenderer: React.FC<{
 
   // Truncate if too long
   if (displayData.length > MAXIMUM_RESULT_DISPLAY_CHARACTERS) {
-    displayData = '...' + displayData.slice(-MAXIMUM_RESULT_DISPLAY_CHARACTERS);
+    displayData = "..." + displayData.slice(-MAXIMUM_RESULT_DISPLAY_CHARACTERS);
   }
 
   if (renderAsMarkdown) {
@@ -273,7 +256,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   status,
   availableTerminalHeight,
   contentWidth,
-  emphasis = 'medium',
+  emphasis = "medium",
   renderOutputAsMarkdown = true,
   activeShellPtyId,
   embeddedShellFocused,
@@ -323,8 +306,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
     status === ToolCallStatus.Executing &&
     config?.getShouldUseNodePtyShell();
 
-  const shouldShowFocusHint =
-    isThisShellFocusable && (showFocusHint || userHasFocused);
+  const shouldShowFocusHint = isThisShellFocusable && (showFocusHint || userHasFocused);
 
   const availableHeight = availableTerminalHeight
     ? Math.max(
@@ -345,43 +327,36 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   const displayRenderer = useResultDisplayRenderer(resultDisplay);
   const { verboseMode } = useVerboseMode();
   const effectiveDisplayRenderer =
-    verboseMode || forceShowResult
-      ? displayRenderer
-      : { type: 'none' as const };
+    verboseMode || forceShowResult ? displayRenderer : { type: "none" as const };
 
   return (
     <Box paddingX={1} paddingY={0} flexDirection="column">
       <Box minHeight={1}>
         <ToolStatusIndicator status={status} name={name} />
-        <ToolInfo
-          name={name}
-          status={status}
-          description={description}
-          emphasis={emphasis}
-        />
+        <ToolInfo name={name} status={status} description={description} emphasis={emphasis} />
         {shouldShowFocusHint && (
           <Box marginLeft={1} flexShrink={0}>
             <Text color={theme.text.accent}>
-              {isThisShellFocused ? '(Focused)' : '(ctrl+f to focus)'}
+              {isThisShellFocused ? "(Focused)" : "(ctrl+f to focus)"}
             </Text>
           </Box>
         )}
-        {emphasis === 'high' && <TrailingIndicator />}
+        {emphasis === "high" && <TrailingIndicator />}
       </Box>
-      {effectiveDisplayRenderer.type !== 'none' && (
+      {effectiveDisplayRenderer.type !== "none" && (
         <Box paddingLeft={STATUS_INDICATOR_WIDTH} width="100%" marginTop={1}>
           <Box flexDirection="column">
-            {effectiveDisplayRenderer.type === 'todo' && (
+            {effectiveDisplayRenderer.type === "todo" && (
               <TodoResultRenderer data={effectiveDisplayRenderer.data} />
             )}
-            {effectiveDisplayRenderer.type === 'plan' && (
+            {effectiveDisplayRenderer.type === "plan" && (
               <PlanResultRenderer
                 data={effectiveDisplayRenderer.data}
                 availableHeight={availableHeight}
                 childWidth={innerWidth}
               />
             )}
-            {effectiveDisplayRenderer.type === 'task' && config && (
+            {effectiveDisplayRenderer.type === "task" && config && (
               <SubagentExecutionRenderer
                 data={effectiveDisplayRenderer.data}
                 availableHeight={availableHeight}
@@ -391,7 +366,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
                 isWaitingForOtherApproval={isWaitingForOtherApproval}
               />
             )}
-            {effectiveDisplayRenderer.type === 'diff' && (
+            {effectiveDisplayRenderer.type === "diff" && (
               <DiffResultRenderer
                 data={effectiveDisplayRenderer.data}
                 availableHeight={availableHeight}
@@ -399,13 +374,13 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
                 settings={settings}
               />
             )}
-            {effectiveDisplayRenderer.type === 'ansi' && (
+            {effectiveDisplayRenderer.type === "ansi" && (
               <AnsiOutputText
                 data={effectiveDisplayRenderer.data}
                 availableTerminalHeight={availableHeight}
               />
             )}
-            {effectiveDisplayRenderer.type === 'string' && (
+            {effectiveDisplayRenderer.type === "string" && (
               <StringResultRenderer
                 data={effectiveDisplayRenderer.data}
                 renderAsMarkdown={renderOutputAsMarkdown}
@@ -434,19 +409,14 @@ type ToolInfo = {
   status: ToolCallStatus;
   emphasis: TextEmphasis;
 };
-const ToolInfo: React.FC<ToolInfo> = ({
-  name,
-  description,
-  status,
-  emphasis,
-}) => {
+const ToolInfo: React.FC<ToolInfo> = ({ name, description, status, emphasis }) => {
   const nameColor = React.useMemo<string>(() => {
     switch (emphasis) {
-      case 'high':
+      case "high":
         return theme.text.primary;
-      case 'medium':
+      case "medium":
         return theme.text.primary;
-      case 'low':
+      case "low":
         return theme.text.secondary;
       default: {
         const exhaustiveCheck: never = emphasis;
@@ -456,13 +426,10 @@ const ToolInfo: React.FC<ToolInfo> = ({
   }, [emphasis]);
   return (
     <Box>
-      <Text
-        wrap="truncate-end"
-        strikethrough={status === ToolCallStatus.Canceled}
-      >
+      <Text wrap="truncate-end" strikethrough={status === ToolCallStatus.Canceled}>
         <Text color={nameColor} bold>
           {name}
-        </Text>{' '}
+        </Text>{" "}
         <Text color={theme.text.secondary}>{description}</Text>
       </Text>
     </Box>
@@ -471,7 +438,7 @@ const ToolInfo: React.FC<ToolInfo> = ({
 
 const TrailingIndicator: React.FC = () => (
   <Text color={theme.text.primary} wrap="truncate">
-    {' '}
+    {" "}
     ←
   </Text>
 );
diff --git a/apps/airiscode-cli/src/ui/components/shared/BaseSelectionList.tsx b/apps/airiscode-cli/src/ui/components/shared/BaseSelectionList.tsx
index aacc63421..885542a10 100644
--- a/apps/airiscode-cli/src/ui/components/shared/BaseSelectionList.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/BaseSelectionList.tsx
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useState } from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useSelectionList } from '../../hooks/useSelectionList.js';
-
-import type { SelectionListItem } from '../../hooks/useSelectionList.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import type { SelectionListItem } from "../../hooks/useSelectionList.js";
+import { useSelectionList } from "../../hooks/useSelectionList.js";
+import { theme } from "../../semantic-colors.js";
 
 export interface RenderItemContext {
   isSelected: boolean;
@@ -49,10 +48,7 @@ export interface BaseSelectionListProps<
  * Specific components should use this as a base and provide
  * their own renderItem implementation for custom content.
  */
-export function BaseSelectionList<
-  T,
-  TItem extends SelectionListItem<T> = SelectionListItem<T>,
->({
+export function BaseSelectionList<T, TItem extends SelectionListItem<T> = SelectionListItem<T>>({
   items,
   initialIndex = 0,
   onSelect,
@@ -95,11 +91,7 @@ export function BaseSelectionList<
     <Box flexDirection="column" gap={itemGap}>
       {/* Use conditional coloring instead of conditional rendering */}
       {showScrollArrows && (
-        <Text
-          color={scrollOffset > 0 ? theme.text.primary : theme.text.secondary}
-        >
-          ▲
-        </Text>
+        <Text color={scrollOffset > 0 ? theme.text.primary : theme.text.secondary}>▲</Text>
       )}
 
       {visibleItems.map((item, index) => {
@@ -126,19 +118,14 @@ export function BaseSelectionList<
           numberColor = theme.text.secondary;
         }
 
-        const itemNumberText = `${String(itemIndex + 1).padStart(
-          numberColumnWidth,
-        )}.`;
+        const itemNumberText = `${String(itemIndex + 1).padStart(numberColumnWidth)}.`;
 
         return (
           <Box key={item.key} alignItems="flex-start">
             {/* Radio button indicator */}
             <Box minWidth={2} flexShrink={0}>
-              <Text
-                color={isSelected ? theme.status.success : theme.text.primary}
-                aria-hidden
-              >
-                {isSelected ? '›' : ' '}
+              <Text color={isSelected ? theme.status.success : theme.text.primary} aria-hidden>
+                {isSelected ? "›" : " "}
               </Text>
             </Box>
 
@@ -169,9 +156,7 @@ export function BaseSelectionList<
       {showScrollArrows && (
         <Text
           color={
-            scrollOffset + maxItemsToShow < items.length
-              ? theme.text.primary
-              : theme.text.secondary
+            scrollOffset + maxItemsToShow < items.length ? theme.text.primary : theme.text.secondary
           }
         >
           ▼
diff --git a/apps/airiscode-cli/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx b/apps/airiscode-cli/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx
index 8ab45c2de..7205f0d0d 100644
--- a/apps/airiscode-cli/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { BaseSelectionList } from './BaseSelectionList.js';
-import type { SelectionListItem } from '../../hooks/useSelectionList.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import type { SelectionListItem } from "../../hooks/useSelectionList.js";
+import { theme } from "../../semantic-colors.js";
+import { BaseSelectionList } from "./BaseSelectionList.js";
 
 export interface DescriptiveRadioSelectItem<T> extends SelectionListItem<T> {
   title: React.ReactNode;
@@ -66,7 +66,7 @@ export function DescriptiveRadioButtonSelect<T>({
       renderItem={(item, { titleColor }) => (
         <Box flexDirection="column" key={item.key}>
           <Text color={titleColor}>{item.title}</Text>
-          {typeof item.description === 'string' ? (
+          {typeof item.description === "string" ? (
             <Text color={theme.text.secondary}>{item.description}</Text>
           ) : (
             item.description
diff --git a/apps/airiscode-cli/src/ui/components/shared/EnumSelector.tsx b/apps/airiscode-cli/src/ui/components/shared/EnumSelector.tsx
index a86efd8ff..08d3177ce 100644
--- a/apps/airiscode-cli/src/ui/components/shared/EnumSelector.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/EnumSelector.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { Colors } from '../../colors.js';
-import type { SettingEnumOption } from '../../../config/settingsSchema.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import type { SettingEnumOption } from "../../../config/settingsSchema.js";
+import { Colors } from "../../colors.js";
 
 interface EnumSelectorProps {
   options: readonly SettingEnumOption[];
@@ -61,23 +61,16 @@ export function EnumSelector({
 
   return (
     <Box flexDirection="row" alignItems="center">
-      <Text
-        color={isActive && canScrollLeft ? Colors.AccentGreen : Colors.Gray}
-      >
-        {canScrollLeft ? '←' : ' '}
+      <Text color={isActive && canScrollLeft ? Colors.AccentGreen : Colors.Gray}>
+        {canScrollLeft ? "←" : " "}
       </Text>
       <Text> </Text>
-      <Text
-        color={isActive ? Colors.AccentGreen : Colors.Foreground}
-        bold={isActive}
-      >
+      <Text color={isActive ? Colors.AccentGreen : Colors.Foreground} bold={isActive}>
         {currentOption.label}
       </Text>
       <Text> </Text>
-      <Text
-        color={isActive && canScrollRight ? Colors.AccentGreen : Colors.Gray}
-      >
-        {canScrollRight ? '→' : ' '}
+      <Text color={isActive && canScrollRight ? Colors.AccentGreen : Colors.Gray}>
+        {canScrollRight ? "→" : " "}
       </Text>
     </Box>
   );
diff --git a/apps/airiscode-cli/src/ui/components/shared/MaxSizedBox.tsx b/apps/airiscode-cli/src/ui/components/shared/MaxSizedBox.tsx
index 825aa28ab..23ae938fd 100644
--- a/apps/airiscode-cli/src/ui/components/shared/MaxSizedBox.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/MaxSizedBox.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { Fragment, useEffect, useId } from 'react';
-import { Box, Text } from 'ink';
-import stringWidth from 'string-width';
-import { theme } from '../../semantic-colors.js';
-import { toCodePoints } from '../../utils/textUtils.js';
-import { useOverflowActions } from '../../contexts/OverflowContext.js';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import { Box, Text } from "ink";
+import React, { Fragment, useEffect, useId } from "react";
+import stringWidth from "string-width";
+import { useOverflowActions } from "../../contexts/OverflowContext.js";
+import { theme } from "../../semantic-colors.js";
+import { toCodePoints } from "../../utils/textUtils.js";
 
 let enableDebugLog = false;
-const debugLogger = createDebugLogger('MAX_SIZED_BOX');
+const debugLogger = createDebugLogger("MAX_SIZED_BOX");
 
 /**
  * Minimum height for the MaxSizedBox component.
@@ -30,35 +30,29 @@ function debugReportError(message: string, element: React.ReactNode) {
   if (!enableDebugLog) return;
 
   if (!React.isValidElement(element)) {
-    debugLogger.error(
-      message,
-      `Invalid element: '${String(element)}' typeof=${typeof element}`,
-    );
+    debugLogger.error(message, `Invalid element: '${String(element)}' typeof=${typeof element}`);
     return;
   }
 
-  let sourceMessage = '<Unknown file>';
+  let sourceMessage = "<Unknown file>";
   try {
     const elementWithSource = element as {
       _source?: { fileName?: string; lineNumber?: number };
     };
     const fileName = elementWithSource._source?.fileName;
     const lineNumber = elementWithSource._source?.lineNumber;
-    sourceMessage = fileName ? `${fileName}:${lineNumber}` : '<Unknown file>';
+    sourceMessage = fileName ? `${fileName}:${lineNumber}` : "<Unknown file>";
   } catch (error) {
-    debugLogger.error('Error while trying to get file name:', error);
+    debugLogger.error("Error while trying to get file name:", error);
   }
 
-  debugLogger.error(
-    message,
-    `${String(element.type)}. Source: ${sourceMessage}`,
-  );
+  debugLogger.error(message, `${String(element.type)}. Source: ${sourceMessage}`);
 }
 interface MaxSizedBoxProps {
   children?: React.ReactNode;
   maxWidth?: number;
   maxHeight: number | undefined;
-  overflowDirection?: 'top' | 'bottom';
+  overflowDirection?: "top" | "bottom";
   additionalHiddenLinesCount?: number;
 }
 
@@ -105,7 +99,7 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
   children,
   maxWidth,
   maxHeight,
-  overflowDirection = 'top',
+  overflowDirection = "top",
   additionalHiddenLinesCount = 0,
 }) => {
   const id = useId();
@@ -118,7 +112,7 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
   );
 
   if (maxWidth === undefined) {
-    throw new Error('maxWidth must be defined when maxHeight is set.');
+    throw new Error("maxWidth must be defined when maxHeight is set.");
   }
   function visitRows(element: React.ReactNode) {
     if (!React.isValidElement<{ children?: React.ReactNode }>(element)) {
@@ -135,19 +129,16 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
       return;
     }
 
-    debugReportError('MaxSizedBox children must be <Box> elements', element);
+    debugReportError("MaxSizedBox children must be <Box> elements", element);
   }
 
   React.Children.forEach(children, visitRows);
 
   const contentWillOverflow =
-    (targetMaxHeight !== undefined &&
-      laidOutStyledText.length > targetMaxHeight) ||
+    (targetMaxHeight !== undefined && laidOutStyledText.length > targetMaxHeight) ||
     additionalHiddenLinesCount > 0;
   const visibleContentHeight =
-    contentWillOverflow && targetMaxHeight !== undefined
-      ? targetMaxHeight - 1
-      : targetMaxHeight;
+    contentWillOverflow && targetMaxHeight !== undefined ? targetMaxHeight - 1 : targetMaxHeight;
 
   const hiddenLinesCount =
     visibleContentHeight !== undefined
@@ -169,7 +160,7 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
 
   const visibleStyledText =
     hiddenLinesCount > 0
-      ? overflowDirection === 'top'
+      ? overflowDirection === "top"
         ? laidOutStyledText.slice(hiddenLinesCount, laidOutStyledText.length)
         : laidOutStyledText.slice(0, visibleContentHeight)
       : laidOutStyledText;
@@ -190,17 +181,15 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
 
   return (
     <Box flexDirection="column" width={maxWidth} flexShrink={0}>
-      {totalHiddenLines > 0 && overflowDirection === 'top' && (
+      {totalHiddenLines > 0 && overflowDirection === "top" && (
         <Text color={theme.text.secondary} wrap="truncate">
-          ... first {totalHiddenLines} line{totalHiddenLines === 1 ? '' : 's'}{' '}
-          hidden ...
+          ... first {totalHiddenLines} line{totalHiddenLines === 1 ? "" : "s"} hidden ...
         </Text>
       )}
       {visibleLines}
-      {totalHiddenLines > 0 && overflowDirection === 'bottom' && (
+      {totalHiddenLines > 0 && overflowDirection === "bottom" && (
         <Text color={theme.text.secondary} wrap="truncate">
-          ... last {totalHiddenLines} line{totalHiddenLines === 1 ? '' : 's'}{' '}
-          hidden ...
+          ... last {totalHiddenLines} line{totalHiddenLines === 1 ? "" : "s"} hidden ...
         </Text>
       )}
     </Box>
@@ -253,16 +242,10 @@ interface Row {
  * @returns An array of `Row` objects.
  */
 function visitBoxRow(element: React.ReactNode): Row {
-  if (
-    !React.isValidElement<{ children?: React.ReactNode }>(element) ||
-    element.type !== Box
-  ) {
-    debugReportError(
-      `All children of MaxSizedBox must be <Box> elements`,
-      element,
-    );
+  if (!React.isValidElement<{ children?: React.ReactNode }>(element) || element.type !== Box) {
+    debugReportError(`All children of MaxSizedBox must be <Box> elements`, element);
     return {
-      noWrapSegments: [{ text: '<ERROR>', props: {} }],
+      noWrapSegments: [{ text: "<ERROR>", props: {} }],
       segments: [],
     };
   }
@@ -270,11 +253,7 @@ function visitBoxRow(element: React.ReactNode): Row {
   if (enableDebugLog) {
     const boxProps = element.props as {
       children?: React.ReactNode;
-      readonly flexDirection?:
-        | 'row'
-        | 'column'
-        | 'row-reverse'
-        | 'column-reverse';
+      readonly flexDirection?: "row" | "column" | "row-reverse" | "column-reverse";
     };
     // Ensure the Box has no props other than the default ones and key.
     let maxExpectedProps = 4;
@@ -282,20 +261,14 @@ function visitBoxRow(element: React.ReactNode): Row {
       // Allow the key prop, which is automatically added by React.
       maxExpectedProps += 1;
     }
-    if (
-      boxProps.flexDirection !== undefined &&
-      boxProps.flexDirection !== 'row'
-    ) {
-      debugReportError(
-        'MaxSizedBox children must have flexDirection="row".',
-        element,
-      );
+    if (boxProps.flexDirection !== undefined && boxProps.flexDirection !== "row") {
+      debugReportError('MaxSizedBox children must have flexDirection="row".', element);
     }
     if (Object.keys(boxProps).length > maxExpectedProps) {
       debugReportError(
-        `Boxes inside MaxSizedBox must not have additional props. ${Object.keys(
-          boxProps,
-        ).join(', ')}`,
+        `Boxes inside MaxSizedBox must not have additional props. ${Object.keys(boxProps).join(
+          ", ",
+        )}`,
         element,
       );
     }
@@ -315,7 +288,7 @@ function visitBoxRow(element: React.ReactNode): Row {
     if (element === null) {
       return;
     }
-    if (typeof element === 'string' || typeof element === 'number') {
+    if (typeof element === "string" || typeof element === "number") {
       const text = String(element);
       // Ignore empty strings as they don't need to be rendered.
       if (!text) {
@@ -325,7 +298,7 @@ function visitBoxRow(element: React.ReactNode): Row {
       const segment: StyledText = { text, props: parentProps ?? {} };
 
       // Check the 'wrap' property from the merged props to decide the segment type.
-      if (parentProps === undefined || parentProps['wrap'] === 'wrap') {
+      if (parentProps === undefined || parentProps["wrap"] === "wrap") {
         hasSeenWrapped = true;
         row.segments.push(segment);
       } else {
@@ -335,7 +308,7 @@ function visitBoxRow(element: React.ReactNode): Row {
           // put in the wrapped segment as the row is already stuck in wrapped mode.
           row.segments.push(segment);
           debugReportError(
-            'Text elements without wrapping cannot appear after elements with wrapping in the same row.',
+            "Text elements without wrapping cannot appear after elements with wrapping in the same row.",
             element,
           );
         }
@@ -344,39 +317,28 @@ function visitBoxRow(element: React.ReactNode): Row {
     }
 
     if (!React.isValidElement<{ children?: React.ReactNode }>(element)) {
-      debugReportError('Invalid element.', element);
+      debugReportError("Invalid element.", element);
       return;
     }
 
     if (element.type === Fragment) {
-      React.Children.forEach(element.props.children, (child) =>
-        visitRowChild(child, parentProps),
-      );
+      React.Children.forEach(element.props.children, (child) => visitRowChild(child, parentProps));
       return;
     }
 
     if (element.type !== Text) {
-      debugReportError(
-        'Children of a row Box must be <Text> elements.',
-        element,
-      );
+      debugReportError("Children of a row Box must be <Text> elements.", element);
       return;
     }
 
     // Merge props from parent <Text> elements. Child props take precedence.
     const { children, ...currentProps } = element.props;
     const mergedProps =
-      parentProps === undefined
-        ? currentProps
-        : { ...parentProps, ...currentProps };
-    React.Children.forEach(children, (child) =>
-      visitRowChild(child, mergedProps),
-    );
+      parentProps === undefined ? currentProps : { ...parentProps, ...currentProps };
+    React.Children.forEach(children, (child) => visitRowChild(child, mergedProps));
   }
 
-  React.Children.forEach(element.props.children, (child) =>
-    visitRowChild(child, undefined),
-  );
+  React.Children.forEach(element.props.children, (child) => visitRowChild(child, undefined));
 
   return row;
 }
@@ -409,7 +371,7 @@ function layoutInkElementAsStyledText(
     const lines: StyledText[][] = [];
     let currentLine: StyledText[] = [];
     nonWrappingContent.forEach((segment) => {
-      const textLines = segment.text.split('\n');
+      const textLines = segment.text.split("\n");
       textLines.forEach((text, index) => {
         if (index > 0) {
           lines.push(currentLine);
@@ -423,7 +385,7 @@ function layoutInkElementAsStyledText(
     if (
       currentLine.length > 0 ||
       (nonWrappingContent.length > 0 &&
-        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith('\n'))
+        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith("\n"))
     ) {
       lines.push(currentLine);
     }
@@ -445,7 +407,7 @@ function layoutInkElementAsStyledText(
     let currentLineWidth = 0;
 
     for (const segment of nonWrappingContent) {
-      const textLines = segment.text.split('\n');
+      const textLines = segment.text.split("\n");
       textLines.forEach((text, index) => {
         if (index > 0) {
           // New line encountered, finish current line and start new one
@@ -461,11 +423,11 @@ function layoutInkElementAsStyledText(
           // For lines after the first line break, show only ellipsis if the text would be truncated
           if (index > 0 && textWidth > 0) {
             // This is content after a line break - just show ellipsis to indicate truncation
-            currentLine.push({ text: '…', props: {} });
-            currentLineWidth = stringWidth('…');
+            currentLine.push({ text: "…", props: {} });
+            currentLineWidth = stringWidth("…");
           } else {
             // This is the first line or a continuation, try to fit what we can
-            const maxContentWidth = Math.max(0, maxWidth - stringWidth('…'));
+            const maxContentWidth = Math.max(0, maxWidth - stringWidth("…"));
 
             if (textWidth <= maxContentWidth && currentLineWidth === 0) {
               // Text fits completely on this line
@@ -486,12 +448,12 @@ function layoutInkElementAsStyledText(
                 sliceEndIndex++;
               }
 
-              const slice = codePoints.slice(0, sliceEndIndex).join('');
+              const slice = codePoints.slice(0, sliceEndIndex).join("");
               if (slice) {
                 currentLine.push({ text: slice, props: segment.props });
               }
-              currentLine.push({ text: '…', props: {} });
-              currentLineWidth = truncatedWidth + stringWidth('…');
+              currentLine.push({ text: "…", props: {} });
+              currentLineWidth = truncatedWidth + stringWidth("…");
             }
           }
         }
@@ -502,14 +464,14 @@ function layoutInkElementAsStyledText(
     if (
       currentLine.length > 0 ||
       (nonWrappingContent.length > 0 &&
-        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith('\n'))
+        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith("\n"))
     ) {
       lines.push(currentLine);
     }
 
     // If we don't have any lines yet, add an ellipsis line
     if (lines.length === 0) {
-      lines.push([{ text: '…', props: {} }]);
+      lines.push([{ text: "…", props: {} }]);
     }
 
     for (const line of lines) {
@@ -527,10 +489,7 @@ function layoutInkElementAsStyledText(
       lines.push([...nonWrappingContent, ...wrappingPart]);
     } else {
       if (noWrappingWidth > 0) {
-        lines.push([
-          ...[{ text: ' '.repeat(noWrappingWidth), props: {} }],
-          ...wrappingPart,
-        ]);
+        lines.push([...[{ text: " ".repeat(noWrappingWidth), props: {} }], ...wrappingPart]);
       } else {
         lines.push(wrappingPart);
       }
@@ -540,10 +499,7 @@ function layoutInkElementAsStyledText(
   }
 
   function addToWrappingPart(text: string, props: Record<string, unknown>) {
-    if (
-      wrappingPart.length > 0 &&
-      wrappingPart[wrappingPart.length - 1].props === props
-    ) {
+    if (wrappingPart.length > 0 && wrappingPart[wrappingPart.length - 1].props === props) {
       wrappingPart[wrappingPart.length - 1].text += text;
     } else {
       wrappingPart.push({ text, props });
@@ -551,7 +507,7 @@ function layoutInkElementAsStyledText(
   }
 
   row.segments.forEach((segment) => {
-    const linesFromSegment = segment.text.split('\n');
+    const linesFromSegment = segment.text.split("\n");
 
     linesFromSegment.forEach((lineText, lineIndex) => {
       if (lineIndex > 0) {
@@ -564,10 +520,7 @@ function layoutInkElementAsStyledText(
         if (!word) return;
         const wordWidth = stringWidth(word);
 
-        if (
-          wrappingPartWidth + wordWidth > availableWidth &&
-          wrappingPartWidth > 0
-        ) {
+        if (wrappingPartWidth + wordWidth > availableWidth && wrappingPartWidth > 0) {
           addWrappingPartToLines();
           if (/^\s+$/.test(word)) {
             return;
@@ -583,10 +536,7 @@ function layoutInkElementAsStyledText(
             let currentSplitWidth = 0;
             for (const char of remainingWordAsCodePoints) {
               const charWidth = stringWidth(char);
-              if (
-                wrappingPartWidth + currentSplitWidth + charWidth >
-                availableWidth
-              ) {
+              if (wrappingPartWidth + currentSplitWidth + charWidth > availableWidth) {
                 break;
               }
               currentSplitWidth += charWidth;
@@ -594,13 +544,10 @@ function layoutInkElementAsStyledText(
             }
 
             if (splitIndex > 0) {
-              const part = remainingWordAsCodePoints
-                .slice(0, splitIndex)
-                .join('');
+              const part = remainingWordAsCodePoints.slice(0, splitIndex).join("");
               addToWrappingPart(part, segment.props);
               wrappingPartWidth += stringWidth(part);
-              remainingWordAsCodePoints =
-                remainingWordAsCodePoints.slice(splitIndex);
+              remainingWordAsCodePoints = remainingWordAsCodePoints.slice(splitIndex);
             }
 
             if (remainingWordAsCodePoints.length > 0) {
@@ -614,7 +561,7 @@ function layoutInkElementAsStyledText(
       });
     });
     // Split omits a trailing newline, so we need to handle it here
-    if (segment.text.endsWith('\n')) {
+    if (segment.text.endsWith("\n")) {
       addWrappingPartToLines();
     }
   });
diff --git a/apps/airiscode-cli/src/ui/components/shared/MultiSelect.tsx b/apps/airiscode-cli/src/ui/components/shared/MultiSelect.tsx
index b910430ba..16762f7b6 100644
--- a/apps/airiscode-cli/src/ui/components/shared/MultiSelect.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/MultiSelect.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useSelectionList } from '../../hooks/useSelectionList.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import type { SelectionListItem } from '../../hooks/useSelectionList.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import type { SelectionListItem } from "../../hooks/useSelectionList.js";
+import { useSelectionList } from "../../hooks/useSelectionList.js";
+import { theme } from "../../semantic-colors.js";
 
 export interface MultiSelectItem<T> extends SelectionListItem<T> {
   label: string;
@@ -31,13 +31,8 @@ export interface MultiSelectProps<T> {
 
 const EMPTY_SELECTED_KEYS: string[] = [];
 
-function getSelectedValues<T>(
-  items: Array<MultiSelectItem<T>>,
-  selectedKeys: Set<string>,
-): T[] {
-  return items
-    .filter((item) => selectedKeys.has(item.key))
-    .map((item) => item.value);
+function getSelectedValues<T>(items: Array<MultiSelectItem<T>>, selectedKeys: Set<string>): T[] {
+  return items.filter((item) => selectedKeys.has(item.key)).map((item) => item.value);
 }
 
 export function MultiSelect<T>({
@@ -52,18 +47,13 @@ export function MultiSelect<T>({
   showScrollArrows = false,
   maxItemsToShow = 10,
 }: MultiSelectProps<T>): React.JSX.Element {
-  const [selectedKeys, setSelectedKeys] = useState<Set<string>>(
-    () => new Set(initialSelectedKeys),
-  );
+  const [selectedKeys, setSelectedKeys] = useState<Set<string>>(() => new Set(initialSelectedKeys));
   const [scrollOffset, setScrollOffset] = useState(0);
 
   useEffect(() => {
     setSelectedKeys((prev) => {
       const next = new Set(initialSelectedKeys);
-      if (
-        prev.size === next.size &&
-        Array.from(next).every((key) => prev.has(key))
-      ) {
+      if (prev.size === next.size && Array.from(next).every((key) => prev.has(key))) {
         return prev;
       }
       return next;
@@ -111,7 +101,7 @@ export function MultiSelect<T>({
 
   useKeypress(
     (key) => {
-      if (key.name === 'space' || key.sequence === ' ') {
+      if (key.name === "space" || key.sequence === " ") {
         toggleSelectionAtIndex(activeIndex);
       }
     },
@@ -138,10 +128,7 @@ export function MultiSelect<T>({
   const hasMoreAbove = scrollOffset > 0;
   const hasMoreBelow = scrollOffset + maxItemsToShow < items.length;
   const moreAboveCount = scrollOffset;
-  const moreBelowCount = Math.max(
-    0,
-    items.length - (scrollOffset + maxItemsToShow),
-  );
+  const moreBelowCount = Math.max(0, items.length - (scrollOffset + maxItemsToShow));
 
   return (
     <Box flexDirection="column">
@@ -154,10 +141,8 @@ export function MultiSelect<T>({
         const isActive = activeIndex === itemIndex;
         const isChecked = selectedKeys.has(item.key);
 
-        const itemNumberText = `${String(itemIndex + 1).padStart(
-          numberColumnWidth,
-        )}.`;
-        const checkboxText = item.disabled ? '[x]' : isChecked ? '[✓]' : '[ ]';
+        const itemNumberText = `${String(itemIndex + 1).padStart(numberColumnWidth)}.`;
+        const checkboxText = item.disabled ? "[x]" : isChecked ? "[✓]" : "[ ]";
 
         let textColor = theme.text.primary;
         if (item.disabled) {
diff --git a/apps/airiscode-cli/src/ui/components/shared/RadioButtonSelect.tsx b/apps/airiscode-cli/src/ui/components/shared/RadioButtonSelect.tsx
index 02fc85228..10dc53e05 100644
--- a/apps/airiscode-cli/src/ui/components/shared/RadioButtonSelect.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/RadioButtonSelect.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { BaseSelectionList } from './BaseSelectionList.js';
-import type { SelectionListItem } from '../../hooks/useSelectionList.js';
+import { Text } from "ink";
+import type React from "react";
+import type { SelectionListItem } from "../../hooks/useSelectionList.js";
+import { theme } from "../../semantic-colors.js";
+import { BaseSelectionList } from "./BaseSelectionList.js";
 
 /**
  * Represents a single option for the RadioButtonSelect.
@@ -74,7 +74,7 @@ export function RadioButtonSelect<T>({
         if (item.themeNameDisplay && item.themeTypeDisplay) {
           return (
             <Text color={titleColor} wrap="truncate" key={item.key}>
-              {item.themeNameDisplay}{' '}
+              {item.themeNameDisplay}{" "}
               <Text color={theme.text.secondary}>{item.themeTypeDisplay}</Text>
             </Text>
           );
diff --git a/apps/airiscode-cli/src/ui/components/shared/ScopeSelector.tsx b/apps/airiscode-cli/src/ui/components/shared/ScopeSelector.tsx
index f5d265bfd..0fd060214 100644
--- a/apps/airiscode-cli/src/ui/components/shared/ScopeSelector.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/ScopeSelector.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import type { SettingScope } from '../../../config/settings.js';
-import { getScopeItems } from '../../../utils/dialogScopeUtils.js';
-import { RadioButtonSelect } from './RadioButtonSelect.js';
-import { t } from '../../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import type { SettingScope } from "../../../config/settings.js";
+import { t } from "../../../i18n/index.js";
+import { getScopeItems } from "../../../utils/dialogScopeUtils.js";
+import { RadioButtonSelect } from "./RadioButtonSelect.js";
 
 interface ScopeSelectorProps {
   /** Callback function when a scope is selected */
@@ -34,16 +34,14 @@ export function ScopeSelector({
     key: item.value,
   }));
 
-  const initialIndex = scopeItems.findIndex(
-    (item) => item.value === initialScope,
-  );
+  const initialIndex = scopeItems.findIndex((item) => item.value === initialScope);
   const safeInitialIndex = initialIndex >= 0 ? initialIndex : 0;
 
   return (
     <Box flexDirection="column">
       <Text bold={isFocused} wrap="truncate">
-        {isFocused ? '> ' : '  '}
-        {t('Apply To')}
+        {isFocused ? "> " : "  "}
+        {t("Apply To")}
       </Text>
       <Box height={1} />
       <RadioButtonSelect
diff --git a/apps/airiscode-cli/src/ui/components/shared/TextInput.tsx b/apps/airiscode-cli/src/ui/components/shared/TextInput.tsx
index eed7d2a78..148fb10fb 100644
--- a/apps/airiscode-cli/src/ui/components/shared/TextInput.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/TextInput.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import chalk from "chalk";
 // no hooks needed beyond keypress handled inside
-import { Box, Text } from 'ink';
-import chalk from 'chalk';
-import stringWidth from 'string-width';
-import { useTextBuffer } from './text-buffer.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { keyMatchers, Command } from '../../keyMatchers.js';
-import { cpSlice, cpLen } from '../../utils/textUtils.js';
-import { theme } from '../../semantic-colors.js';
-import { Colors } from '../../colors.js';
-import type { Key } from '../../hooks/useKeypress.js';
-import { useCallback, useRef, useEffect } from 'react';
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useRef } from "react";
+import stringWidth from "string-width";
+import { Colors } from "../../colors.js";
+import type { Key } from "../../hooks/useKeypress.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { Command, keyMatchers } from "../../keyMatchers.js";
+import { theme } from "../../semantic-colors.js";
+import { cpLen, cpSlice } from "../../utils/textUtils.js";
+import { useTextBuffer } from "./text-buffer.js";
 
 export interface TextInputProps {
   value: string;
@@ -61,7 +61,7 @@ export function TextInput({
   }, []);
 
   const buffer = useTextBuffer({
-    initialText: value || '',
+    initialText: value || "",
     initialCursorOffset,
     viewport: { height, width: inputWidth },
     isValidPath: () => false,
@@ -78,28 +78,28 @@ export function TextInput({
       if (!buffer || !isActive) return;
 
       // Tab completion: delegate to caller instead of inserting a tab character
-      if (key.name === 'tab') {
+      if (key.name === "tab") {
         onTab?.();
         return;
       }
 
       // Arrow-key completion navigation: delegate to caller
-      if (key.name === 'up' && onUp) {
+      if (key.name === "up" && onUp) {
         onUp();
         return;
       }
-      if (key.name === 'down' && onDown) {
+      if (key.name === "down" && onDown) {
         onDown();
         return;
       }
 
       // Submit on Enter
-      if (keyMatchers[Command.SUBMIT](key) || key.name === 'return') {
+      if (keyMatchers[Command.SUBMIT](key) || key.name === "return") {
         if (allowMultiline) {
           const [row, col] = buffer.cursor;
           const line = buffer.lines[row];
-          const charBefore = col > 0 ? cpSlice(line, col - 1, col) : '';
-          if (charBefore === '\\') {
+          const charBefore = col > 0 ? cpSlice(line, col - 1, col) : "";
+          if (charBefore === "\\") {
             buffer.backspace();
             buffer.newline();
           } else {
@@ -119,17 +119,17 @@ export function TextInput({
 
       // Navigation helpers
       if (keyMatchers[Command.HOME](key)) {
-        buffer.move('home');
+        buffer.move("home");
         return;
       }
       if (keyMatchers[Command.END](key)) {
-        buffer.move('end');
+        buffer.move("end");
         buffer.moveToOffset(cpLen(buffer.text));
         return;
       }
 
       if (keyMatchers[Command.CLEAR_INPUT](key)) {
-        if (buffer.text.length > 0) buffer.setText('');
+        if (buffer.text.length > 0) buffer.setText("");
         return;
       }
       if (keyMatchers[Command.KILL_LINE_RIGHT](key)) {
@@ -154,14 +154,13 @@ export function TextInput({
   if (!buffer) return null;
 
   const linesToRender = buffer.viewportVisualLines;
-  const [cursorVisualRowAbsolute, cursorVisualColAbsolute] =
-    buffer.visualCursor;
+  const [cursorVisualRowAbsolute, cursorVisualColAbsolute] = buffer.visualCursor;
   const scrollVisualRow = buffer.visualScrollRow;
 
   return (
     <Box flexDirection="column" gap={1}>
       <Box>
-        <Text color={theme.text.accent}>{'> '}</Text>
+        <Text color={theme.text.accent}>{"> "}</Text>
         <Box flexGrow={1} flexDirection="column">
           {buffer.text.length === 0 && placeholder ? (
             <Text>
@@ -174,7 +173,7 @@ export function TextInput({
               let display = cpSlice(lineText, 0, inputWidth);
               const currentVisualWidth = stringWidth(display);
               if (currentVisualWidth < inputWidth) {
-                display = display + ' '.repeat(inputWidth - currentVisualWidth);
+                display = display + " ".repeat(inputWidth - currentVisualWidth);
               }
 
               if (visualIdxInRenderedSet === cursorVisualRow) {
@@ -186,7 +185,7 @@ export function TextInput({
                         display,
                         relativeVisualColForHighlight,
                         relativeVisualColForHighlight + 1,
-                      ) || ' ';
+                      ) || " ";
                     const highlighted = chalk.inverse(charToHighlight);
                     display =
                       cpSlice(display, 0, relativeVisualColForHighlight) +
@@ -196,13 +195,11 @@ export function TextInput({
                     relativeVisualColForHighlight === cpLen(display) &&
                     cpLen(display) === inputWidth
                   ) {
-                    display = display + chalk.inverse(' ');
+                    display = display + chalk.inverse(" ");
                   }
                 }
               }
-              return (
-                <Text key={`line-${visualIdxInRenderedSet}`}>{display}</Text>
-              );
+              return <Text key={`line-${visualIdxInRenderedSet}`}>{display}</Text>;
             })
           )}
         </Box>
diff --git a/apps/airiscode-cli/src/ui/components/shared/ToolStatusIndicator.tsx b/apps/airiscode-cli/src/ui/components/shared/ToolStatusIndicator.tsx
index 51ddfc2be..c81b43550 100644
--- a/apps/airiscode-cli/src/ui/components/shared/ToolStatusIndicator.tsx
+++ b/apps/airiscode-cli/src/ui/components/shared/ToolStatusIndicator.tsx
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { ToolCallStatus } from '../../types.js';
-import { GeminiRespondingSpinner } from '../GeminiRespondingSpinner.js';
-import {
-  TOOL_STATUS,
-  SHELL_COMMAND_NAME,
-  SHELL_NAME,
-} from '../../constants.js';
-import { theme } from '../../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { SHELL_COMMAND_NAME, SHELL_NAME, TOOL_STATUS } from "../../constants.js";
+import { theme } from "../../semantic-colors.js";
+import { ToolCallStatus } from "../../types.js";
+import { GeminiRespondingSpinner } from "../GeminiRespondingSpinner.js";
 
 export const STATUS_INDICATOR_WIDTH = 3;
 
@@ -22,10 +18,7 @@ type ToolStatusIndicatorProps = {
   name: string;
 };
 
-export const ToolStatusIndicator: React.FC<ToolStatusIndicatorProps> = ({
-  status,
-  name,
-}) => {
+export const ToolStatusIndicator: React.FC<ToolStatusIndicatorProps> = ({ status, name }) => {
   const isShell = name === SHELL_COMMAND_NAME || name === SHELL_NAME;
   const statusColor = isShell ? theme.ui.symbol : theme.status.warning;
 
@@ -41,22 +34,22 @@ export const ToolStatusIndicator: React.FC<ToolStatusIndicatorProps> = ({
         />
       )}
       {status === ToolCallStatus.Success && (
-        <Text color={theme.status.success} aria-label={'Success:'}>
+        <Text color={theme.status.success} aria-label={"Success:"}>
           {TOOL_STATUS.SUCCESS}
         </Text>
       )}
       {status === ToolCallStatus.Confirming && (
-        <Text color={statusColor} aria-label={'Confirming:'}>
+        <Text color={statusColor} aria-label={"Confirming:"}>
           {TOOL_STATUS.CONFIRMING}
         </Text>
       )}
       {status === ToolCallStatus.Canceled && (
-        <Text color={statusColor} aria-label={'Canceled:'} bold>
+        <Text color={statusColor} aria-label={"Canceled:"} bold>
           {TOOL_STATUS.CANCELED}
         </Text>
       )}
       {status === ToolCallStatus.Error && (
-        <Text color={theme.status.error} aria-label={'Error:'} bold>
+        <Text color={theme.status.error} aria-label={"Error:"} bold>
           {TOOL_STATUS.ERROR}
         </Text>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/shared/text-buffer.ts b/apps/airiscode-cli/src/ui/components/shared/text-buffer.ts
index f0ec68643..545a07681 100644
--- a/apps/airiscode-cli/src/ui/components/shared/text-buffer.ts
+++ b/apps/airiscode-cli/src/ui/components/shared/text-buffer.ts
@@ -4,33 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawnSync } from 'node:child_process';
-import fs from 'node:fs';
-import os from 'node:os';
-import pathMod from 'node:path';
-import { useState, useCallback, useEffect, useMemo, useReducer } from 'react';
-import { createDebugLogger, unescapePath } from '@airiscode/core';
+import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import pathMod from "node:path";
+import { createDebugLogger, unescapePath } from "@airiscode/core";
+import { useCallback, useEffect, useMemo, useReducer, useState } from "react";
 import {
-  toCodePoints,
   cpLen,
   cpSlice,
-  stripUnsafeCharacters,
   getCachedStringWidth,
-} from '../../utils/textUtils.js';
-import type { VimAction } from './vim-buffer-actions.js';
-import { handleVimAction } from './vim-buffer-actions.js';
+  stripUnsafeCharacters,
+  toCodePoints,
+} from "../../utils/textUtils.js";
+import type { VimAction } from "./vim-buffer-actions.js";
+import { handleVimAction } from "./vim-buffer-actions.js";
 
-const debugLogger = createDebugLogger('TEXT_BUFFER');
+const debugLogger = createDebugLogger("TEXT_BUFFER");
 
 export type Direction =
-  | 'left'
-  | 'right'
-  | 'up'
-  | 'down'
-  | 'wordLeft'
-  | 'wordRight'
-  | 'home'
-  | 'end';
+  | "left"
+  | "right"
+  | "up"
+  | "down"
+  | "wordLeft"
+  | "wordRight"
+  | "home"
+  | "end";
 
 // Simple helper for word‑wise ops.
 function isWordChar(ch: string | undefined): boolean {
@@ -41,8 +41,7 @@ function isWordChar(ch: string | undefined): boolean {
 }
 
 // Helper functions for line-based word navigation
-export const isWordCharStrict = (char: string): boolean =>
-  /[\w\p{L}\p{N}]/u.test(char); // Matches a single character that is any Unicode letter, any Unicode number, or an underscore
+export const isWordCharStrict = (char: string): boolean => /[\w\p{L}\p{N}]/u.test(char); // Matches a single character that is any Unicode letter, any Unicode number, or an underscore
 
 export const isWhitespace = (char: string): boolean => /\s/.test(char);
 
@@ -55,13 +54,13 @@ export const isWordCharWithCombining = (char: string): boolean =>
 
 // Get the script of a character (simplified for common scripts)
 export const getCharScript = (char: string): string => {
-  if (/[\p{Script=Latin}]/u.test(char)) return 'latin'; // All Latin script chars including diacritics
-  if (/[\p{Script=Han}]/u.test(char)) return 'han'; // Chinese
-  if (/[\p{Script=Arabic}]/u.test(char)) return 'arabic';
-  if (/[\p{Script=Hiragana}]/u.test(char)) return 'hiragana';
-  if (/[\p{Script=Katakana}]/u.test(char)) return 'katakana';
-  if (/[\p{Script=Cyrillic}]/u.test(char)) return 'cyrillic';
-  return 'other';
+  if (/[\p{Script=Latin}]/u.test(char)) return "latin"; // All Latin script chars including diacritics
+  if (/[\p{Script=Han}]/u.test(char)) return "han"; // Chinese
+  if (/[\p{Script=Arabic}]/u.test(char)) return "arabic";
+  if (/[\p{Script=Hiragana}]/u.test(char)) return "hiragana";
+  if (/[\p{Script=Katakana}]/u.test(char)) return "katakana";
+  if (/[\p{Script=Cyrillic}]/u.test(char)) return "cyrillic";
+  return "other";
 };
 
 // Check if two characters are from different scripts (indicating word boundary)
@@ -71,10 +70,7 @@ export const isDifferentScript = (char1: string, char2: string): boolean => {
 };
 
 // Find next word start within a line, starting from col
-export const findNextWordStartInLine = (
-  line: string,
-  col: number,
-): number | null => {
+export const findNextWordStartInLine = (line: string, col: number): number | null => {
   const chars = toCodePoints(line);
   let i = col;
 
@@ -97,11 +93,7 @@ export const findNextWordStartInLine = (
       i++;
     }
   } else if (!isWhitespace(currentChar)) {
-    while (
-      i < chars.length &&
-      !isWordCharStrict(chars[i]) &&
-      !isWhitespace(chars[i])
-    ) {
+    while (i < chars.length && !isWordCharStrict(chars[i]) && !isWhitespace(chars[i])) {
       i++;
     }
   }
@@ -115,10 +107,7 @@ export const findNextWordStartInLine = (
 };
 
 // Find previous word start within a line
-export const findPrevWordStartInLine = (
-  line: string,
-  col: number,
-): number | null => {
+export const findPrevWordStartInLine = (line: string, col: number): number | null => {
   const chars = toCodePoints(line);
   let i = col;
 
@@ -177,9 +166,7 @@ export const findWordEndInLine = (line: string, col: number): number | null => {
     i < chars.length &&
     !isWordCharWithCombining(chars[i]) &&
     !isWhitespace(chars[i]) &&
-    (i + 1 >= chars.length ||
-      isWhitespace(chars[i + 1]) ||
-      isWordCharWithCombining(chars[i + 1]));
+    (i + 1 >= chars.length || isWhitespace(chars[i + 1]) || isWordCharWithCombining(chars[i + 1]));
 
   if (atEndOfWordChar || atEndOfPunctuation) {
     // We're at the end of a word or punctuation sequence, move forward to find next word
@@ -229,11 +216,7 @@ export const findWordEndInLine = (line: string, col: number): number | null => {
     }
   } else if (i < chars.length && !isWhitespace(chars[i])) {
     // Handle punctuation sequences (like ████)
-    while (
-      i < chars.length &&
-      !isWordCharStrict(chars[i]) &&
-      !isWhitespace(chars[i])
-    ) {
+    while (i < chars.length && !isWordCharStrict(chars[i]) && !isWhitespace(chars[i])) {
       foundWord = true;
       lastBaseCharPos = i;
       i++;
@@ -257,7 +240,7 @@ export const findNextWordAcrossLines = (
   searchForWordStart: boolean,
 ): { row: number; col: number } | null => {
   // First try current line
-  const currentLine = lines[cursorRow] || '';
+  const currentLine = lines[cursorRow] || "";
   const colInCurrentLine = searchForWordStart
     ? findNextWordStartInLine(currentLine, cursorCol)
     : findWordEndInLine(currentLine, cursorCol);
@@ -268,7 +251,7 @@ export const findNextWordAcrossLines = (
 
   // Search subsequent lines
   for (let row = cursorRow + 1; row < lines.length; row++) {
-    const line = lines[row] || '';
+    const line = lines[row] || "";
     const chars = toCodePoints(line);
 
     // For empty lines, if we haven't found any words yet, return the empty line
@@ -276,7 +259,7 @@ export const findNextWordAcrossLines = (
       // Check if there are any words in remaining lines
       let hasWordsInLaterLines = false;
       for (let laterRow = row + 1; laterRow < lines.length; laterRow++) {
-        const laterLine = lines[laterRow] || '';
+        const laterLine = lines[laterRow] || "";
         const laterChars = toCodePoints(laterLine);
         let firstNonWhitespace = 0;
         while (
@@ -300,10 +283,7 @@ export const findNextWordAcrossLines = (
 
     // Find first non-whitespace
     let firstNonWhitespace = 0;
-    while (
-      firstNonWhitespace < chars.length &&
-      isWhitespace(chars[firstNonWhitespace])
-    ) {
+    while (firstNonWhitespace < chars.length && isWhitespace(chars[firstNonWhitespace])) {
       firstNonWhitespace++;
     }
 
@@ -330,7 +310,7 @@ export const findPrevWordAcrossLines = (
   cursorCol: number,
 ): { row: number; col: number } | null => {
   // First try current line
-  const currentLine = lines[cursorRow] || '';
+  const currentLine = lines[cursorRow] || "";
   const colInCurrentLine = findPrevWordStartInLine(currentLine, cursorCol);
 
   if (colInCurrentLine !== null) {
@@ -339,7 +319,7 @@ export const findPrevWordAcrossLines = (
 
   // Search previous lines
   for (let row = cursorRow - 1; row >= 0; row--) {
-    const line = lines[row] || '';
+    const line = lines[row] || "";
     const chars = toCodePoints(line);
 
     if (chars.length === 0) continue;
@@ -363,11 +343,7 @@ export const findPrevWordAcrossLines = (
 };
 
 // Helper functions for vim line operations
-export const getPositionFromOffsets = (
-  startOffset: number,
-  endOffset: number,
-  lines: string[],
-) => {
+export const getPositionFromOffsets = (startOffset: number, endOffset: number, lines: string[]) => {
   let offset = 0;
   let startRow = 0;
   let startCol = 0;
@@ -400,11 +376,7 @@ export const getPositionFromOffsets = (
   return { startRow, startCol, endRow, endCol };
 };
 
-export const getLineRangeOffsets = (
-  startRow: number,
-  lineCount: number,
-  lines: string[],
-) => {
+export const getLineRangeOffsets = (startRow: number, lineCount: number, lines: string[]) => {
   let startOffset = 0;
 
   // Calculate start offset
@@ -435,10 +407,9 @@ export const replaceRangeInternal = (
   endCol: number,
   text: string,
 ): TextBufferState => {
-  const currentLine = (row: number) => state.lines[row] || '';
+  const currentLine = (row: number) => state.lines[row] || "";
   const currentLineLen = (row: number) => cpLen(currentLine(row));
-  const clamp = (value: number, min: number, max: number) =>
-    Math.min(Math.max(value, min), max);
+  const clamp = (value: number, min: number, max: number) => Math.min(Math.max(value, min), max);
 
   if (
     startRow > endRow ||
@@ -459,10 +430,8 @@ export const replaceRangeInternal = (
   const prefix = cpSlice(currentLine(startRow), 0, sCol);
   const suffix = cpSlice(currentLine(endRow), eCol);
 
-  const normalisedReplacement = text
-    .replace(/\r\n/g, '\n')
-    .replace(/\r/g, '\n');
-  const replacementParts = normalisedReplacement.split('\n');
+  const normalisedReplacement = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  const replacementParts = normalisedReplacement.split("\n");
 
   // The combined first line of the new text
   const firstLine = prefix + replacementParts[0];
@@ -474,28 +443,18 @@ export const replaceRangeInternal = (
     // Newlines in replacement: create new lines.
     const lastLine = replacementParts[replacementParts.length - 1] + suffix;
     const middleLines = replacementParts.slice(1, -1);
-    newLines.splice(
-      startRow,
-      endRow - startRow + 1,
-      firstLine,
-      ...middleLines,
-      lastLine,
-    );
+    newLines.splice(startRow, endRow - startRow + 1, firstLine, ...middleLines, lastLine);
   }
 
   const finalCursorRow = startRow + replacementParts.length - 1;
   const finalCursorCol =
-    (replacementParts.length > 1 ? 0 : sCol) +
-    cpLen(replacementParts[replacementParts.length - 1]);
+    (replacementParts.length > 1 ? 0 : sCol) + cpLen(replacementParts[replacementParts.length - 1]);
 
   return {
     ...state,
     lines: newLines,
     cursorRow: Math.min(Math.max(finalCursorRow, 0), newLines.length - 1),
-    cursorCol: Math.max(
-      0,
-      Math.min(finalCursorCol, cpLen(newLines[finalCursorRow] || '')),
-    ),
+    cursorCol: Math.max(0, Math.min(finalCursorCol, cpLen(newLines[finalCursorRow] || ""))),
     preferredCol: null,
   };
 };
@@ -528,17 +487,13 @@ interface UndoHistoryEntry {
   cursorCol: number;
 }
 
-function calculateInitialCursorPosition(
-  initialLines: string[],
-  offset: number,
-): [number, number] {
+function calculateInitialCursorPosition(initialLines: string[], offset: number): [number, number] {
   let remainingChars = offset;
   let row = 0;
   while (row < initialLines.length) {
     const lineLength = cpLen(initialLines[row]);
     // Add 1 for the newline character (except for the last line)
-    const totalCharsInLineAndNewline =
-      lineLength + (row < initialLines.length - 1 ? 1 : 0);
+    const totalCharsInLineAndNewline = lineLength + (row < initialLines.length - 1 ? 1 : 0);
 
     if (remainingChars <= lineLength) {
       // Cursor is on this line
@@ -555,17 +510,14 @@ function calculateInitialCursorPosition(
   return [0, 0]; // Default for empty text
 }
 
-export function offsetToLogicalPos(
-  text: string,
-  offset: number,
-): [number, number] {
+export function offsetToLogicalPos(text: string, offset: number): [number, number] {
   let row = 0;
   let col = 0;
   let currentOffset = 0;
 
   if (offset === 0) return [0, 0];
 
-  const lines = text.split('\n');
+  const lines = text.split("\n");
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     const lineLength = cpLen(line);
@@ -581,10 +533,7 @@ export function offsetToLogicalPos(
       row = i;
       col = lineLength; // Position cursor at the end of the current line content
       // If the offset IS the newline, and it's not the last line, advance to next line, col 0
-      if (
-        offset === currentOffset + lineLengthWithNewline &&
-        i < lines.length - 1
-      ) {
+      if (offset === currentOffset + lineLengthWithNewline && i < lines.length - 1) {
         return [i + 1, 0];
       }
       return [row, col]; // Otherwise, it's at the end of the current line content
@@ -608,11 +557,7 @@ export function offsetToLogicalPos(
  * Converts logical row/col position to absolute text offset
  * Inverse operation of offsetToLogicalPos
  */
-export function logicalPosToOffset(
-  lines: string[],
-  row: number,
-  col: number,
-): number {
+export function logicalPosToOffset(lines: string[], row: number, col: number): number {
   let offset = 0;
 
   // Clamp row to valid range
@@ -641,10 +586,7 @@ export interface VisualLayout {
 
 // Calculates the visual wrapping of lines and the mapping between logical and visual coordinates.
 // This is an expensive operation and should be memoized.
-function calculateLayout(
-  logicalLines: string[],
-  viewportWidth: number,
-): VisualLayout {
+function calculateLayout(logicalLines: string[], viewportWidth: number): VisualLayout {
   const visualLines: string[] = [];
   const logicalToVisualMap: Array<Array<[number, number]>> = [];
   const visualToLogicalMap: Array<[number, number]> = [];
@@ -655,14 +597,14 @@ function calculateLayout(
       // Handle empty logical line
       logicalToVisualMap[logIndex].push([visualLines.length, 0]);
       visualToLogicalMap.push([logIndex, 0]);
-      visualLines.push('');
+      visualLines.push("");
     } else {
       // Non-empty logical line
       let currentPosInLogLine = 0; // Tracks position within the current logical line (code point index)
       const codePointsInLogLine = toCodePoints(logLine);
 
       while (currentPosInLogLine < codePointsInLogLine.length) {
-        let currentChunk = '';
+        let currentChunk = "";
         let currentChunkVisualWidth = 0;
         let numCodePointsInChunk = 0;
         let lastWordBreakPoint = -1; // Index in codePointsInLogLine for word break
@@ -682,26 +624,17 @@ function calculateLayout(
             ) {
               // We have a valid word break point to use, and it's not the start of the current segment
               currentChunk = codePointsInLogLine
-                .slice(
-                  currentPosInLogLine,
-                  currentPosInLogLine + numCodePointsAtLastWordBreak,
-                )
-                .join('');
+                .slice(currentPosInLogLine, currentPosInLogLine + numCodePointsAtLastWordBreak)
+                .join("");
               numCodePointsInChunk = numCodePointsAtLastWordBreak;
             } else {
               // No word break, or word break is at the start of this potential chunk, or word break leads to empty chunk.
               // Hard break: take characters up to viewportWidth, or just the current char if it alone is too wide.
-              if (
-                numCodePointsInChunk === 0 &&
-                charVisualWidth > viewportWidth
-              ) {
+              if (numCodePointsInChunk === 0 && charVisualWidth > viewportWidth) {
                 // Single character is wider than viewport, take it anyway
                 currentChunk = char;
                 numCodePointsInChunk = 1;
-              } else if (
-                numCodePointsInChunk === 0 &&
-                charVisualWidth <= viewportWidth
-              ) {
+              } else if (numCodePointsInChunk === 0 && charVisualWidth <= viewportWidth) {
                 // This case should ideally be caught by the next iteration if the char fits.
                 // If it doesn't fit (because currentChunkVisualWidth was already > 0 from a previous char that filled the line),
                 // then numCodePointsInChunk would not be 0.
@@ -717,7 +650,7 @@ function calculateLayout(
           numCodePointsInChunk++;
 
           // Check for word break opportunity (space)
-          if (char === ' ') {
+          if (char === " ") {
             lastWordBreakPoint = i; // Store code point index of the space
             // Store the state *before* adding the space, if we decide to break here.
             numCodePointsAtLastWordBreak = numCodePointsInChunk - 1; // Chars *before* the space
@@ -726,10 +659,7 @@ function calculateLayout(
 
         // If the inner loop completed without breaking (i.e., remaining text fits)
         // or if the loop broke but numCodePointsInChunk is still 0 (e.g. first char too wide for empty line)
-        if (
-          numCodePointsInChunk === 0 &&
-          currentPosInLogLine < codePointsInLogLine.length
-        ) {
+        if (numCodePointsInChunk === 0 && currentPosInLogLine < codePointsInLogLine.length) {
           // This can happen if the very first character considered for a new visual line is wider than the viewport.
           // In this case, we take that single character.
           const firstChar = codePointsInLogLine[currentPosInLogLine];
@@ -739,19 +669,13 @@ function calculateLayout(
 
         // If after everything, numCodePointsInChunk is still 0 but we haven't processed the whole logical line,
         // it implies an issue, like viewportWidth being 0 or less. Avoid infinite loop.
-        if (
-          numCodePointsInChunk === 0 &&
-          currentPosInLogLine < codePointsInLogLine.length
-        ) {
+        if (numCodePointsInChunk === 0 && currentPosInLogLine < codePointsInLogLine.length) {
           // Force advance by one character to prevent infinite loop if something went wrong
           currentChunk = codePointsInLogLine[currentPosInLogLine];
           numCodePointsInChunk = 1;
         }
 
-        logicalToVisualMap[logIndex].push([
-          visualLines.length,
-          currentPosInLogLine,
-        ]);
+        logicalToVisualMap[logIndex].push([visualLines.length, currentPosInLogLine]);
         visualToLogicalMap.push([logIndex, currentPosInLogLine]);
         visualLines.push(currentChunk);
 
@@ -762,10 +686,9 @@ function calculateLayout(
         // and the character immediately following the chunk is a space,
         // advance past this space as it acted as a delimiter for word wrapping.
         if (
-          logicalStartOfThisChunk + numCodePointsInChunk <
-            codePointsInLogLine.length &&
+          logicalStartOfThisChunk + numCodePointsInChunk < codePointsInLogLine.length &&
           currentPosInLogLine < codePointsInLogLine.length && // Redundant if previous is true, but safe
-          codePointsInLogLine[currentPosInLogLine] === ' '
+          codePointsInLogLine[currentPosInLogLine] === " "
         ) {
           currentPosInLogLine++;
         }
@@ -774,12 +697,9 @@ function calculateLayout(
   });
 
   // If the entire logical text was empty, ensure there's one empty visual line.
-  if (
-    logicalLines.length === 0 ||
-    (logicalLines.length === 1 && logicalLines[0] === '')
-  ) {
+  if (logicalLines.length === 0 || (logicalLines.length === 1 && logicalLines[0] === "")) {
     if (visualLines.length === 0) {
-      visualLines.push('');
+      visualLines.push("");
       if (!logicalToVisualMap[0]) logicalToVisualMap[0] = [];
       logicalToVisualMap[0].push([0, 0]);
       visualToLogicalMap.push([0, 0]);
@@ -811,17 +731,11 @@ function calculateVisualCursorFromLayout(
 
   // Find the segment where the logical column fits.
   // The segments are sorted by startColInLogical.
-  let targetSegmentIndex = segmentsForLogicalLine.findIndex(
-    ([, startColInLogical], index) => {
-      const nextStartColInLogical =
-        index + 1 < segmentsForLogicalLine.length
-          ? segmentsForLogicalLine[index + 1][1]
-          : Infinity;
-      return (
-        logicalCol >= startColInLogical && logicalCol < nextStartColInLogical
-      );
-    },
-  );
+  let targetSegmentIndex = segmentsForLogicalLine.findIndex(([, startColInLogical], index) => {
+    const nextStartColInLogical =
+      index + 1 < segmentsForLogicalLine.length ? segmentsForLogicalLine[index + 1][1] : Infinity;
+    return logicalCol >= startColInLogical && logicalCol < nextStartColInLogical;
+  });
 
   // If not found, it means the cursor is at the end of the logical line.
   if (targetSegmentIndex === -1) {
@@ -832,15 +746,11 @@ function calculateVisualCursorFromLayout(
     }
   }
 
-  const [visualRow, startColInLogical] =
-    segmentsForLogicalLine[targetSegmentIndex];
+  const [visualRow, startColInLogical] = segmentsForLogicalLine[targetSegmentIndex];
   const visualCol = logicalCol - startColInLogical;
 
   // The visual column should not exceed the length of the visual line.
-  const clampedVisualCol = Math.min(
-    visualCol,
-    cpLen(visualLines[visualRow] ?? ''),
-  );
+  const clampedVisualCol = Math.min(visualCol, cpLen(visualLines[visualRow] ?? ""));
 
   return [visualRow, clampedVisualCol];
 }
@@ -877,32 +787,32 @@ export const pushUndo = (currentState: TextBufferState): TextBufferState => {
 };
 
 export type TextBufferAction =
-  | { type: 'set_text'; payload: string; pushToUndo?: boolean }
-  | { type: 'insert'; payload: string }
-  | { type: 'backspace' }
+  | { type: "set_text"; payload: string; pushToUndo?: boolean }
+  | { type: "insert"; payload: string }
+  | { type: "backspace" }
   | {
-      type: 'move';
+      type: "move";
       payload: {
         dir: Direction;
       };
     }
   | {
-      type: 'set_cursor';
+      type: "set_cursor";
       payload: {
         cursorRow: number;
         cursorCol: number;
         preferredCol: number | null;
       };
     }
-  | { type: 'delete' }
-  | { type: 'delete_word_left' }
-  | { type: 'delete_word_right' }
-  | { type: 'kill_line_right' }
-  | { type: 'kill_line_left' }
-  | { type: 'undo' }
-  | { type: 'redo' }
+  | { type: "delete" }
+  | { type: "delete_word_left" }
+  | { type: "delete_word_right" }
+  | { type: "kill_line_right" }
+  | { type: "kill_line_left" }
+  | { type: "undo" }
+  | { type: "redo" }
   | {
-      type: 'replace_range';
+      type: "replace_range";
       payload: {
         startRow: number;
         startCol: number;
@@ -911,87 +821,80 @@ export type TextBufferAction =
         text: string;
       };
     }
-  | { type: 'move_to_offset'; payload: { offset: number } }
-  | { type: 'create_undo_snapshot' }
-  | { type: 'set_viewport'; payload: { width: number; height: number } }
-  | { type: 'vim_delete_word_forward'; payload: { count: number } }
-  | { type: 'vim_delete_word_backward'; payload: { count: number } }
-  | { type: 'vim_delete_word_end'; payload: { count: number } }
-  | { type: 'vim_change_word_forward'; payload: { count: number } }
-  | { type: 'vim_change_word_backward'; payload: { count: number } }
-  | { type: 'vim_change_word_end'; payload: { count: number } }
-  | { type: 'vim_delete_line'; payload: { count: number } }
-  | { type: 'vim_change_line'; payload: { count: number } }
-  | { type: 'vim_delete_to_end_of_line' }
-  | { type: 'vim_change_to_end_of_line' }
+  | { type: "move_to_offset"; payload: { offset: number } }
+  | { type: "create_undo_snapshot" }
+  | { type: "set_viewport"; payload: { width: number; height: number } }
+  | { type: "vim_delete_word_forward"; payload: { count: number } }
+  | { type: "vim_delete_word_backward"; payload: { count: number } }
+  | { type: "vim_delete_word_end"; payload: { count: number } }
+  | { type: "vim_change_word_forward"; payload: { count: number } }
+  | { type: "vim_change_word_backward"; payload: { count: number } }
+  | { type: "vim_change_word_end"; payload: { count: number } }
+  | { type: "vim_delete_line"; payload: { count: number } }
+  | { type: "vim_change_line"; payload: { count: number } }
+  | { type: "vim_delete_to_end_of_line" }
+  | { type: "vim_change_to_end_of_line" }
   | {
-      type: 'vim_change_movement';
-      payload: { movement: 'h' | 'j' | 'k' | 'l'; count: number };
+      type: "vim_change_movement";
+      payload: { movement: "h" | "j" | "k" | "l"; count: number };
     }
   // New vim actions for stateless command handling
-  | { type: 'vim_move_left'; payload: { count: number } }
-  | { type: 'vim_move_right'; payload: { count: number } }
-  | { type: 'vim_move_up'; payload: { count: number } }
-  | { type: 'vim_move_down'; payload: { count: number } }
-  | { type: 'vim_move_word_forward'; payload: { count: number } }
-  | { type: 'vim_move_word_backward'; payload: { count: number } }
-  | { type: 'vim_move_word_end'; payload: { count: number } }
-  | { type: 'vim_delete_char'; payload: { count: number } }
-  | { type: 'vim_insert_at_cursor' }
-  | { type: 'vim_append_at_cursor' }
-  | { type: 'vim_open_line_below' }
-  | { type: 'vim_open_line_above' }
-  | { type: 'vim_append_at_line_end' }
-  | { type: 'vim_insert_at_line_start' }
-  | { type: 'vim_move_to_line_start' }
-  | { type: 'vim_move_to_line_end' }
-  | { type: 'vim_move_to_first_nonwhitespace' }
-  | { type: 'vim_move_to_first_line' }
-  | { type: 'vim_move_to_last_line' }
-  | { type: 'vim_move_to_line'; payload: { lineNumber: number } }
-  | { type: 'vim_escape_insert_mode' };
-
-function textBufferReducerLogic(
-  state: TextBufferState,
-  action: TextBufferAction,
-): TextBufferState {
+  | { type: "vim_move_left"; payload: { count: number } }
+  | { type: "vim_move_right"; payload: { count: number } }
+  | { type: "vim_move_up"; payload: { count: number } }
+  | { type: "vim_move_down"; payload: { count: number } }
+  | { type: "vim_move_word_forward"; payload: { count: number } }
+  | { type: "vim_move_word_backward"; payload: { count: number } }
+  | { type: "vim_move_word_end"; payload: { count: number } }
+  | { type: "vim_delete_char"; payload: { count: number } }
+  | { type: "vim_insert_at_cursor" }
+  | { type: "vim_append_at_cursor" }
+  | { type: "vim_open_line_below" }
+  | { type: "vim_open_line_above" }
+  | { type: "vim_append_at_line_end" }
+  | { type: "vim_insert_at_line_start" }
+  | { type: "vim_move_to_line_start" }
+  | { type: "vim_move_to_line_end" }
+  | { type: "vim_move_to_first_nonwhitespace" }
+  | { type: "vim_move_to_first_line" }
+  | { type: "vim_move_to_last_line" }
+  | { type: "vim_move_to_line"; payload: { lineNumber: number } }
+  | { type: "vim_escape_insert_mode" };
+
+function textBufferReducerLogic(state: TextBufferState, action: TextBufferAction): TextBufferState {
   const pushUndoLocal = pushUndo;
 
-  const currentLine = (r: number): string => state.lines[r] ?? '';
+  const currentLine = (r: number): string => state.lines[r] ?? "";
   const currentLineLen = (r: number): number => cpLen(currentLine(r));
 
   switch (action.type) {
-    case 'set_text': {
+    case "set_text": {
       let nextState = state;
       if (action.pushToUndo !== false) {
         nextState = pushUndoLocal(state);
       }
-      const newContentLines = action.payload
-        .replace(/\r\n?/g, '\n')
-        .split('\n');
-      const lines = newContentLines.length === 0 ? [''] : newContentLines;
+      const newContentLines = action.payload.replace(/\r\n?/g, "\n").split("\n");
+      const lines = newContentLines.length === 0 ? [""] : newContentLines;
       const lastNewLineIndex = lines.length - 1;
       return {
         ...nextState,
         lines,
         cursorRow: lastNewLineIndex,
-        cursorCol: cpLen(lines[lastNewLineIndex] ?? ''),
+        cursorCol: cpLen(lines[lastNewLineIndex] ?? ""),
         preferredCol: null,
       };
     }
 
-    case 'insert': {
+    case "insert": {
       const nextState = pushUndoLocal(state);
       const newLines = [...nextState.lines];
       let newCursorRow = nextState.cursorRow;
       let newCursorCol = nextState.cursorCol;
 
-      const currentLine = (r: number) => newLines[r] ?? '';
+      const currentLine = (r: number) => newLines[r] ?? "";
 
-      const str = stripUnsafeCharacters(
-        action.payload.replace(/\r\n/g, '\n').replace(/\r/g, '\n'),
-      );
-      const parts = str.split('\n');
+      const str = stripUnsafeCharacters(action.payload.replace(/\r\n/g, "\n").replace(/\r/g, "\n"));
+      const parts = str.split("\n");
       const lineContent = currentLine(newCursorRow);
       const before = cpSlice(lineContent, 0, newCursorCol);
       const after = cpSlice(lineContent, newCursorCol);
@@ -999,13 +902,9 @@ function textBufferReducerLogic(
       if (parts.length > 1) {
         newLines[newCursorRow] = before + parts[0];
         const remainingParts = parts.slice(1);
-        const lastPartOriginal = remainingParts.pop() ?? '';
+        const lastPartOriginal = remainingParts.pop() ?? "";
         newLines.splice(newCursorRow + 1, 0, ...remainingParts);
-        newLines.splice(
-          newCursorRow + parts.length - 1,
-          0,
-          lastPartOriginal + after,
-        );
+        newLines.splice(newCursorRow + parts.length - 1, 0, lastPartOriginal + after);
         newCursorRow = newCursorRow + parts.length - 1;
         newCursorCol = cpLen(lastPartOriginal);
       } else {
@@ -1022,21 +921,20 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'backspace': {
+    case "backspace": {
       const nextState = pushUndoLocal(state);
       const newLines = [...nextState.lines];
       let newCursorRow = nextState.cursorRow;
       let newCursorCol = nextState.cursorCol;
 
-      const currentLine = (r: number) => newLines[r] ?? '';
+      const currentLine = (r: number) => newLines[r] ?? "";
 
       if (newCursorCol === 0 && newCursorRow === 0) return state;
 
       if (newCursorCol > 0) {
         const lineContent = currentLine(newCursorRow);
         newLines[newCursorRow] =
-          cpSlice(lineContent, 0, newCursorCol - 1) +
-          cpSlice(lineContent, newCursorCol);
+          cpSlice(lineContent, 0, newCursorCol - 1) + cpSlice(lineContent, newCursorCol);
         newCursorCol--;
       } else if (newCursorRow > 0) {
         const prevLineContent = currentLine(newCursorRow - 1);
@@ -1057,7 +955,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'set_viewport': {
+    case "set_viewport": {
       const { width, height } = action.payload;
       if (width === state.viewportWidth && height === state.viewportHeight) {
         return state;
@@ -1069,42 +967,39 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'move': {
+    case "move": {
       const { dir } = action.payload;
       const { cursorRow, cursorCol, lines, visualLayout, preferredCol } = state;
 
       // Visual movements
       if (
-        dir === 'left' ||
-        dir === 'right' ||
-        dir === 'up' ||
-        dir === 'down' ||
-        dir === 'home' ||
-        dir === 'end'
+        dir === "left" ||
+        dir === "right" ||
+        dir === "up" ||
+        dir === "down" ||
+        dir === "home" ||
+        dir === "end"
       ) {
-        const visualCursor = calculateVisualCursorFromLayout(visualLayout, [
-          cursorRow,
-          cursorCol,
-        ]);
+        const visualCursor = calculateVisualCursorFromLayout(visualLayout, [cursorRow, cursorCol]);
         const { visualLines, visualToLogicalMap } = visualLayout;
 
         let newVisualRow = visualCursor[0];
         let newVisualCol = visualCursor[1];
         let newPreferredCol = preferredCol;
 
-        const currentVisLineLen = cpLen(visualLines[newVisualRow] ?? '');
+        const currentVisLineLen = cpLen(visualLines[newVisualRow] ?? "");
 
         switch (dir) {
-          case 'left':
+          case "left":
             newPreferredCol = null;
             if (newVisualCol > 0) {
               newVisualCol--;
             } else if (newVisualRow > 0) {
               newVisualRow--;
-              newVisualCol = cpLen(visualLines[newVisualRow] ?? '');
+              newVisualCol = cpLen(visualLines[newVisualRow] ?? "");
             }
             break;
-          case 'right':
+          case "right":
             newPreferredCol = null;
             if (newVisualCol < currentVisLineLen) {
               newVisualCol++;
@@ -1113,41 +1008,31 @@ function textBufferReducerLogic(
               newVisualCol = 0;
             }
             break;
-          case 'up':
+          case "up":
             if (newVisualRow > 0) {
               if (newPreferredCol === null) newPreferredCol = newVisualCol;
               newVisualRow--;
-              newVisualCol = clamp(
-                newPreferredCol,
-                0,
-                cpLen(visualLines[newVisualRow] ?? ''),
-              );
+              newVisualCol = clamp(newPreferredCol, 0, cpLen(visualLines[newVisualRow] ?? ""));
             }
             break;
-          case 'down':
+          case "down":
             if (newVisualRow < visualLines.length - 1) {
               if (newPreferredCol === null) newPreferredCol = newVisualCol;
               newVisualRow++;
-              newVisualCol = clamp(
-                newPreferredCol,
-                0,
-                cpLen(visualLines[newVisualRow] ?? ''),
-              );
+              newVisualCol = clamp(newPreferredCol, 0, cpLen(visualLines[newVisualRow] ?? ""));
             }
             break;
-          case 'home':
+          case "home":
             newPreferredCol = null;
             newVisualCol = 0;
             break;
-          case 'end':
+          case "end":
             newPreferredCol = null;
             newVisualCol = currentVisLineLen;
             break;
           default: {
             const exhaustiveCheck: never = dir;
-            debugLogger.error(
-              `Unknown visual movement direction: ${exhaustiveCheck}`,
-            );
+            debugLogger.error(`Unknown visual movement direction: ${exhaustiveCheck}`);
             return state;
           }
         }
@@ -1157,11 +1042,7 @@ function textBufferReducerLogic(
           return {
             ...state,
             cursorRow: logRow,
-            cursorCol: clamp(
-              logStartCol + newVisualCol,
-              0,
-              cpLen(lines[logRow] ?? ''),
-            ),
+            cursorCol: clamp(logStartCol + newVisualCol, 0, cpLen(lines[logRow] ?? "")),
             preferredCol: newPreferredCol,
           };
         }
@@ -1170,7 +1051,7 @@ function textBufferReducerLogic(
 
       // Logical movements
       switch (dir) {
-        case 'wordLeft': {
+        case "wordLeft": {
           if (cursorCol === 0 && cursorRow === 0) return state;
 
           let newCursorRow = cursorRow;
@@ -1178,7 +1059,7 @@ function textBufferReducerLogic(
 
           if (cursorCol === 0) {
             newCursorRow--;
-            newCursorCol = cpLen(lines[newCursorRow] ?? '');
+            newCursorCol = cpLen(lines[newCursorRow] ?? "");
           } else {
             const lineContent = lines[cursorRow];
             const arr = toCodePoints(lineContent);
@@ -1205,17 +1086,14 @@ function textBufferReducerLogic(
             preferredCol: null,
           };
         }
-        case 'wordRight': {
-          if (
-            cursorRow === lines.length - 1 &&
-            cursorCol === cpLen(lines[cursorRow] ?? '')
-          ) {
+        case "wordRight": {
+          if (cursorRow === lines.length - 1 && cursorCol === cpLen(lines[cursorRow] ?? "")) {
             return state;
           }
 
           let newCursorRow = cursorRow;
           let newCursorCol = cursorCol;
-          const lineContent = lines[cursorRow] ?? '';
+          const lineContent = lines[cursorRow] ?? "";
           const arr = toCodePoints(lineContent);
 
           if (cursorCol >= arr.length) {
@@ -1239,22 +1117,21 @@ function textBufferReducerLogic(
       }
     }
 
-    case 'set_cursor': {
+    case "set_cursor": {
       return {
         ...state,
         ...action.payload,
       };
     }
 
-    case 'delete': {
+    case "delete": {
       const { cursorRow, cursorCol, lines } = state;
       const lineContent = currentLine(cursorRow);
       if (cursorCol < currentLineLen(cursorRow)) {
         const nextState = pushUndoLocal(state);
         const newLines = [...nextState.lines];
         newLines[cursorRow] =
-          cpSlice(lineContent, 0, cursorCol) +
-          cpSlice(lineContent, cursorCol + 1);
+          cpSlice(lineContent, 0, cursorCol) + cpSlice(lineContent, cursorCol + 1);
         return {
           ...nextState,
           lines: newLines,
@@ -1275,7 +1152,7 @@ function textBufferReducerLogic(
       return state;
     }
 
-    case 'delete_word_left': {
+    case "delete_word_left": {
       const { cursorRow, cursorCol } = state;
       if (cursorCol === 0 && cursorRow === 0) return state;
 
@@ -1286,10 +1163,7 @@ function textBufferReducerLogic(
 
       if (newCursorCol > 0) {
         const lineContent = currentLine(newCursorRow);
-        const prevWordStart = findPrevWordStartInLine(
-          lineContent,
-          newCursorCol,
-        );
+        const prevWordStart = findPrevWordStartInLine(lineContent, newCursorCol);
         const start = prevWordStart === null ? 0 : prevWordStart;
         newLines[newCursorRow] =
           cpSlice(lineContent, 0, start) + cpSlice(lineContent, newCursorCol);
@@ -1314,7 +1188,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'delete_word_right': {
+    case "delete_word_right": {
       const { cursorRow, cursorCol, lines } = state;
       const lineContent = currentLine(cursorRow);
       const lineLen = cpLen(lineContent);
@@ -1334,8 +1208,7 @@ function textBufferReducerLogic(
       } else {
         const nextWordStart = findNextWordStartInLine(lineContent, cursorCol);
         const end = nextWordStart === null ? lineLen : nextWordStart;
-        newLines[cursorRow] =
-          cpSlice(lineContent, 0, cursorCol) + cpSlice(lineContent, end);
+        newLines[cursorRow] = cpSlice(lineContent, 0, cursorCol) + cpSlice(lineContent, end);
       }
 
       return {
@@ -1345,7 +1218,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'kill_line_right': {
+    case "kill_line_right": {
       const { cursorRow, cursorCol, lines } = state;
       const lineContent = currentLine(cursorRow);
       if (cursorCol < currentLineLen(cursorRow)) {
@@ -1372,7 +1245,7 @@ function textBufferReducerLogic(
       return state;
     }
 
-    case 'kill_line_left': {
+    case "kill_line_left": {
       const { cursorRow, cursorCol } = state;
       if (cursorCol > 0) {
         const nextState = pushUndoLocal(state);
@@ -1389,7 +1262,7 @@ function textBufferReducerLogic(
       return state;
     }
 
-    case 'undo': {
+    case "undo": {
       const stateToRestore = state.undoStack[state.undoStack.length - 1];
       if (!stateToRestore) return state;
 
@@ -1406,7 +1279,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'redo': {
+    case "redo": {
       const stateToRestore = state.redoStack[state.redoStack.length - 1];
       if (!stateToRestore) return state;
 
@@ -1423,25 +1296,15 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'replace_range': {
+    case "replace_range": {
       const { startRow, startCol, endRow, endCol, text } = action.payload;
       const nextState = pushUndoLocal(state);
-      return replaceRangeInternal(
-        nextState,
-        startRow,
-        startCol,
-        endRow,
-        endCol,
-        text,
-      );
+      return replaceRangeInternal(nextState, startRow, startCol, endRow, endCol, text);
     }
 
-    case 'move_to_offset': {
+    case "move_to_offset": {
       const { offset } = action.payload;
-      const [newRow, newCol] = offsetToLogicalPos(
-        state.lines.join('\n'),
-        offset,
-      );
+      const [newRow, newCol] = offsetToLogicalPos(state.lines.join("\n"), offset);
       return {
         ...state,
         cursorRow: newRow,
@@ -1450,43 +1313,43 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'create_undo_snapshot': {
+    case "create_undo_snapshot": {
       return pushUndoLocal(state);
     }
 
     // Vim-specific operations
-    case 'vim_delete_word_forward':
-    case 'vim_delete_word_backward':
-    case 'vim_delete_word_end':
-    case 'vim_change_word_forward':
-    case 'vim_change_word_backward':
-    case 'vim_change_word_end':
-    case 'vim_delete_line':
-    case 'vim_change_line':
-    case 'vim_delete_to_end_of_line':
-    case 'vim_change_to_end_of_line':
-    case 'vim_change_movement':
-    case 'vim_move_left':
-    case 'vim_move_right':
-    case 'vim_move_up':
-    case 'vim_move_down':
-    case 'vim_move_word_forward':
-    case 'vim_move_word_backward':
-    case 'vim_move_word_end':
-    case 'vim_delete_char':
-    case 'vim_insert_at_cursor':
-    case 'vim_append_at_cursor':
-    case 'vim_open_line_below':
-    case 'vim_open_line_above':
-    case 'vim_append_at_line_end':
-    case 'vim_insert_at_line_start':
-    case 'vim_move_to_line_start':
-    case 'vim_move_to_line_end':
-    case 'vim_move_to_first_nonwhitespace':
-    case 'vim_move_to_first_line':
-    case 'vim_move_to_last_line':
-    case 'vim_move_to_line':
-    case 'vim_escape_insert_mode':
+    case "vim_delete_word_forward":
+    case "vim_delete_word_backward":
+    case "vim_delete_word_end":
+    case "vim_change_word_forward":
+    case "vim_change_word_backward":
+    case "vim_change_word_end":
+    case "vim_delete_line":
+    case "vim_change_line":
+    case "vim_delete_to_end_of_line":
+    case "vim_change_to_end_of_line":
+    case "vim_change_movement":
+    case "vim_move_left":
+    case "vim_move_right":
+    case "vim_move_up":
+    case "vim_move_down":
+    case "vim_move_word_forward":
+    case "vim_move_word_backward":
+    case "vim_move_word_end":
+    case "vim_delete_char":
+    case "vim_insert_at_cursor":
+    case "vim_append_at_cursor":
+    case "vim_open_line_below":
+    case "vim_open_line_above":
+    case "vim_append_at_line_end":
+    case "vim_insert_at_line_start":
+    case "vim_move_to_line_start":
+    case "vim_move_to_line_end":
+    case "vim_move_to_first_nonwhitespace":
+    case "vim_move_to_first_line":
+    case "vim_move_to_last_line":
+    case "vim_move_to_line":
+    case "vim_escape_insert_mode":
       return handleVimAction(state, action as VimAction);
 
     default: {
@@ -1503,10 +1366,7 @@ export function textBufferReducer(
 ): TextBufferState {
   const newState = textBufferReducerLogic(state, action);
 
-  if (
-    newState.lines !== state.lines ||
-    newState.viewportWidth !== state.viewportWidth
-  ) {
+  if (newState.lines !== state.lines || newState.viewportWidth !== state.viewportWidth) {
     return {
       ...newState,
       visualLayout: calculateLayout(newState.lines, newState.viewportWidth),
@@ -1519,7 +1379,7 @@ export function textBufferReducer(
 // --- End of reducer logic ---
 
 export function useTextBuffer({
-  initialText = '',
+  initialText = "",
   initialCursorOffset = 0,
   viewport,
   stdin,
@@ -1529,17 +1389,14 @@ export function useTextBuffer({
   shellModeActive = false,
 }: UseTextBufferProps): TextBuffer {
   const initialState = useMemo((): TextBufferState => {
-    const lines = initialText.split('\n');
+    const lines = initialText.split("\n");
     const [initialCursorRow, initialCursorCol] = calculateInitialCursorPosition(
-      lines.length === 0 ? [''] : lines,
+      lines.length === 0 ? [""] : lines,
       initialCursorOffset,
     );
-    const visualLayout = calculateLayout(
-      lines.length === 0 ? [''] : lines,
-      viewport.width,
-    );
+    const visualLayout = calculateLayout(lines.length === 0 ? [""] : lines, viewport.width);
     return {
-      lines: lines.length === 0 ? [''] : lines,
+      lines: lines.length === 0 ? [""] : lines,
       cursorRow: initialCursorRow,
       cursorCol: initialCursorCol,
       preferredCol: null,
@@ -1554,16 +1411,9 @@ export function useTextBuffer({
   }, [initialText, initialCursorOffset, viewport.width, viewport.height]);
 
   const [state, dispatch] = useReducer(textBufferReducer, initialState);
-  const {
-    lines,
-    cursorRow,
-    cursorCol,
-    preferredCol,
-    selectionAnchor,
-    visualLayout,
-  } = state;
+  const { lines, cursorRow, cursorCol, preferredCol, selectionAnchor, visualLayout } = state;
 
-  const text = useMemo(() => lines.join('\n'), [lines]);
+  const text = useMemo(() => lines.join("\n"), [lines]);
 
   const visualCursor = useMemo(
     () => calculateVisualCursorFromLayout(visualLayout, [cursorRow, cursorCol]),
@@ -1582,7 +1432,7 @@ export function useTextBuffer({
 
   useEffect(() => {
     dispatch({
-      type: 'set_viewport',
+      type: "set_viewport",
       payload: { width: viewport.width, height: viewport.height },
     });
   }, [viewport.width, viewport.height]);
@@ -1612,16 +1462,12 @@ export function useTextBuffer({
   const insert = useCallback(
     (ch: string, { paste = false }: { paste?: boolean } = {}): void => {
       if (/[\n\r]/.test(ch)) {
-        dispatch({ type: 'insert', payload: ch });
+        dispatch({ type: "insert", payload: ch });
         return;
       }
 
       const minLengthToInferAsDragDrop = 3;
-      if (
-        ch.length >= minLengthToInferAsDragDrop &&
-        !shellModeActive &&
-        paste
-      ) {
+      if (ch.length >= minLengthToInferAsDragDrop && !shellModeActive && paste) {
         let potentialPath = ch.trim();
         const quoteMatch = potentialPath.match(/^'(.*)'$/);
         if (quoteMatch) {
@@ -1634,233 +1480,230 @@ export function useTextBuffer({
         }
       }
 
-      let currentText = '';
+      let currentText = "";
       for (const char of toCodePoints(ch)) {
         if (char.codePointAt(0) === 127) {
           if (currentText.length > 0) {
-            dispatch({ type: 'insert', payload: currentText });
-            currentText = '';
+            dispatch({ type: "insert", payload: currentText });
+            currentText = "";
           }
-          dispatch({ type: 'backspace' });
+          dispatch({ type: "backspace" });
         } else {
           currentText += char;
         }
       }
       if (currentText.length > 0) {
-        dispatch({ type: 'insert', payload: currentText });
+        dispatch({ type: "insert", payload: currentText });
       }
     },
     [isValidPath, shellModeActive],
   );
 
   const newline = useCallback((): void => {
-    dispatch({ type: 'insert', payload: '\n' });
+    dispatch({ type: "insert", payload: "\n" });
   }, []);
 
   const backspace = useCallback((): void => {
-    dispatch({ type: 'backspace' });
+    dispatch({ type: "backspace" });
   }, []);
 
   const del = useCallback((): void => {
-    dispatch({ type: 'delete' });
+    dispatch({ type: "delete" });
   }, []);
 
   const move = useCallback(
     (dir: Direction): void => {
-      dispatch({ type: 'move', payload: { dir } });
+      dispatch({ type: "move", payload: { dir } });
     },
     [dispatch],
   );
 
   const undo = useCallback((): void => {
-    dispatch({ type: 'undo' });
+    dispatch({ type: "undo" });
   }, []);
 
   const redo = useCallback((): void => {
-    dispatch({ type: 'redo' });
+    dispatch({ type: "redo" });
   }, []);
 
   const setText = useCallback((newText: string): void => {
-    dispatch({ type: 'set_text', payload: newText });
+    dispatch({ type: "set_text", payload: newText });
   }, []);
 
   const deleteWordLeft = useCallback((): void => {
-    dispatch({ type: 'delete_word_left' });
+    dispatch({ type: "delete_word_left" });
   }, []);
 
   const deleteWordRight = useCallback((): void => {
-    dispatch({ type: 'delete_word_right' });
+    dispatch({ type: "delete_word_right" });
   }, []);
 
   const killLineRight = useCallback((): void => {
-    dispatch({ type: 'kill_line_right' });
+    dispatch({ type: "kill_line_right" });
   }, []);
 
   const killLineLeft = useCallback((): void => {
-    dispatch({ type: 'kill_line_left' });
+    dispatch({ type: "kill_line_left" });
   }, []);
 
   // Vim-specific operations
   const vimDeleteWordForward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_word_forward', payload: { count } });
+    dispatch({ type: "vim_delete_word_forward", payload: { count } });
   }, []);
 
   const vimDeleteWordBackward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_word_backward', payload: { count } });
+    dispatch({ type: "vim_delete_word_backward", payload: { count } });
   }, []);
 
   const vimDeleteWordEnd = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_word_end', payload: { count } });
+    dispatch({ type: "vim_delete_word_end", payload: { count } });
   }, []);
 
   const vimChangeWordForward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_word_forward', payload: { count } });
+    dispatch({ type: "vim_change_word_forward", payload: { count } });
   }, []);
 
   const vimChangeWordBackward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_word_backward', payload: { count } });
+    dispatch({ type: "vim_change_word_backward", payload: { count } });
   }, []);
 
   const vimChangeWordEnd = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_word_end', payload: { count } });
+    dispatch({ type: "vim_change_word_end", payload: { count } });
   }, []);
 
   const vimDeleteLine = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_line', payload: { count } });
+    dispatch({ type: "vim_delete_line", payload: { count } });
   }, []);
 
   const vimChangeLine = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_line', payload: { count } });
+    dispatch({ type: "vim_change_line", payload: { count } });
   }, []);
 
   const vimDeleteToEndOfLine = useCallback((): void => {
-    dispatch({ type: 'vim_delete_to_end_of_line' });
+    dispatch({ type: "vim_delete_to_end_of_line" });
   }, []);
 
   const vimChangeToEndOfLine = useCallback((): void => {
-    dispatch({ type: 'vim_change_to_end_of_line' });
+    dispatch({ type: "vim_change_to_end_of_line" });
   }, []);
 
-  const vimChangeMovement = useCallback(
-    (movement: 'h' | 'j' | 'k' | 'l', count: number): void => {
-      dispatch({ type: 'vim_change_movement', payload: { movement, count } });
-    },
-    [],
-  );
+  const vimChangeMovement = useCallback((movement: "h" | "j" | "k" | "l", count: number): void => {
+    dispatch({ type: "vim_change_movement", payload: { movement, count } });
+  }, []);
 
   // New vim navigation and operation methods
   const vimMoveLeft = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_left', payload: { count } });
+    dispatch({ type: "vim_move_left", payload: { count } });
   }, []);
 
   const vimMoveRight = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_right', payload: { count } });
+    dispatch({ type: "vim_move_right", payload: { count } });
   }, []);
 
   const vimMoveUp = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_up', payload: { count } });
+    dispatch({ type: "vim_move_up", payload: { count } });
   }, []);
 
   const vimMoveDown = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_down', payload: { count } });
+    dispatch({ type: "vim_move_down", payload: { count } });
   }, []);
 
   const vimMoveWordForward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_word_forward', payload: { count } });
+    dispatch({ type: "vim_move_word_forward", payload: { count } });
   }, []);
 
   const vimMoveWordBackward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_word_backward', payload: { count } });
+    dispatch({ type: "vim_move_word_backward", payload: { count } });
   }, []);
 
   const vimMoveWordEnd = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_word_end', payload: { count } });
+    dispatch({ type: "vim_move_word_end", payload: { count } });
   }, []);
 
   const vimDeleteChar = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_char', payload: { count } });
+    dispatch({ type: "vim_delete_char", payload: { count } });
   }, []);
 
   const vimInsertAtCursor = useCallback((): void => {
-    dispatch({ type: 'vim_insert_at_cursor' });
+    dispatch({ type: "vim_insert_at_cursor" });
   }, []);
 
   const vimAppendAtCursor = useCallback((): void => {
-    dispatch({ type: 'vim_append_at_cursor' });
+    dispatch({ type: "vim_append_at_cursor" });
   }, []);
 
   const vimOpenLineBelow = useCallback((): void => {
-    dispatch({ type: 'vim_open_line_below' });
+    dispatch({ type: "vim_open_line_below" });
   }, []);
 
   const vimOpenLineAbove = useCallback((): void => {
-    dispatch({ type: 'vim_open_line_above' });
+    dispatch({ type: "vim_open_line_above" });
   }, []);
 
   const vimAppendAtLineEnd = useCallback((): void => {
-    dispatch({ type: 'vim_append_at_line_end' });
+    dispatch({ type: "vim_append_at_line_end" });
   }, []);
 
   const vimInsertAtLineStart = useCallback((): void => {
-    dispatch({ type: 'vim_insert_at_line_start' });
+    dispatch({ type: "vim_insert_at_line_start" });
   }, []);
 
   const vimMoveToLineStart = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_line_start' });
+    dispatch({ type: "vim_move_to_line_start" });
   }, []);
 
   const vimMoveToLineEnd = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_line_end' });
+    dispatch({ type: "vim_move_to_line_end" });
   }, []);
 
   const vimMoveToFirstNonWhitespace = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_first_nonwhitespace' });
+    dispatch({ type: "vim_move_to_first_nonwhitespace" });
   }, []);
 
   const vimMoveToFirstLine = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_first_line' });
+    dispatch({ type: "vim_move_to_first_line" });
   }, []);
 
   const vimMoveToLastLine = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_last_line' });
+    dispatch({ type: "vim_move_to_last_line" });
   }, []);
 
   const vimMoveToLine = useCallback((lineNumber: number): void => {
-    dispatch({ type: 'vim_move_to_line', payload: { lineNumber } });
+    dispatch({ type: "vim_move_to_line", payload: { lineNumber } });
   }, []);
 
   const vimEscapeInsertMode = useCallback((): void => {
-    dispatch({ type: 'vim_escape_insert_mode' });
+    dispatch({ type: "vim_escape_insert_mode" });
   }, []);
 
   const openInExternalEditor = useCallback(
     async (opts: { editor?: string } = {}): Promise<void> => {
       const editor =
         opts.editor ??
-        process.env['VISUAL'] ??
-        process.env['EDITOR'] ??
-        (process.platform === 'win32' ? 'notepad' : 'vi');
-      const tmpDir = fs.mkdtempSync(pathMod.join(os.tmpdir(), 'qwen-edit-'));
-      const filePath = pathMod.join(tmpDir, 'buffer.txt');
-      fs.writeFileSync(filePath, text, 'utf8');
+        process.env["VISUAL"] ??
+        process.env["EDITOR"] ??
+        (process.platform === "win32" ? "notepad" : "vi");
+      const tmpDir = fs.mkdtempSync(pathMod.join(os.tmpdir(), "qwen-edit-"));
+      const filePath = pathMod.join(tmpDir, "buffer.txt");
+      fs.writeFileSync(filePath, text, "utf8");
 
-      dispatch({ type: 'create_undo_snapshot' });
+      dispatch({ type: "create_undo_snapshot" });
 
       const wasRaw = stdin?.isRaw ?? false;
       try {
         setRawMode?.(false);
         const { status, error } = spawnSync(editor, [filePath], {
-          stdio: 'inherit',
+          stdio: "inherit",
         });
         if (error) throw error;
-        if (typeof status === 'number' && status !== 0)
+        if (typeof status === "number" && status !== 0)
           throw new Error(`External editor exited with status ${status}`);
 
-        let newText = fs.readFileSync(filePath, 'utf8');
-        newText = newText.replace(/\r\n?/g, '\n');
-        dispatch({ type: 'set_text', payload: newText, pushToUndo: false });
+        let newText = fs.readFileSync(filePath, "utf8");
+        newText = newText.replace(/\r\n?/g, "\n");
+        dispatch({ type: "set_text", payload: newText, pushToUndo: false });
       } catch (err) {
-        debugLogger.error('[useTextBuffer] external editor error', err);
+        debugLogger.error("[useTextBuffer] external editor error", err);
       } finally {
         if (wasRaw) setRawMode?.(true);
         try {
@@ -1897,59 +1740,40 @@ export function useTextBuffer({
       }
 
       if (
-        key.name === 'return' ||
-        input === '\r' ||
-        input === '\n' ||
-        input === '\\\r' // VSCode terminal represents shift + enter this way
+        key.name === "return" ||
+        input === "\r" ||
+        input === "\n" ||
+        input === "\\\r" // VSCode terminal represents shift + enter this way
       )
         newline();
-      else if (key.name === 'left' && !key.meta && !key.ctrl) move('left');
-      else if (key.ctrl && key.name === 'b') move('left');
-      else if (key.name === 'right' && !key.meta && !key.ctrl) move('right');
-      else if (key.ctrl && key.name === 'f') move('right');
-      else if (key.name === 'up' && !key.shift) move('up');
-      else if (key.name === 'down' && !key.shift) move('down');
-      else if ((key.ctrl || key.meta) && key.name === 'left') move('wordLeft');
-      else if (key.meta && key.name === 'b') move('wordLeft');
-      else if ((key.ctrl || key.meta) && key.name === 'right')
-        move('wordRight');
-      else if (key.meta && key.name === 'f') move('wordRight');
-      else if (key.name === 'home') move('home');
-      else if (key.ctrl && key.name === 'a') move('home');
-      else if (key.name === 'end') move('end');
-      else if (key.ctrl && key.name === 'e') move('end');
-      else if (key.ctrl && key.name === 'w') deleteWordLeft();
-      else if (
-        (key.meta || key.ctrl) &&
-        (key.name === 'backspace' || input === '\x7f')
-      )
+      else if (key.name === "left" && !key.meta && !key.ctrl) move("left");
+      else if (key.ctrl && key.name === "b") move("left");
+      else if (key.name === "right" && !key.meta && !key.ctrl) move("right");
+      else if (key.ctrl && key.name === "f") move("right");
+      else if (key.name === "up" && !key.shift) move("up");
+      else if (key.name === "down" && !key.shift) move("down");
+      else if ((key.ctrl || key.meta) && key.name === "left") move("wordLeft");
+      else if (key.meta && key.name === "b") move("wordLeft");
+      else if ((key.ctrl || key.meta) && key.name === "right") move("wordRight");
+      else if (key.meta && key.name === "f") move("wordRight");
+      else if (key.name === "home") move("home");
+      else if (key.ctrl && key.name === "a") move("home");
+      else if (key.name === "end") move("end");
+      else if (key.ctrl && key.name === "e") move("end");
+      else if (key.ctrl && key.name === "w") deleteWordLeft();
+      else if ((key.meta || key.ctrl) && (key.name === "backspace" || input === "\x7f"))
         deleteWordLeft();
-      else if ((key.meta || key.ctrl) && key.name === 'delete')
-        deleteWordRight();
-      else if (
-        key.name === 'backspace' ||
-        input === '\x7f' ||
-        (key.ctrl && key.name === 'h')
-      )
+      else if ((key.meta || key.ctrl) && key.name === "delete") deleteWordRight();
+      else if (key.name === "backspace" || input === "\x7f" || (key.ctrl && key.name === "h"))
         backspace();
-      else if (key.name === 'delete' || (key.ctrl && key.name === 'd')) del();
-      else if (key.ctrl && !key.shift && key.name === 'z') undo();
-      else if (key.ctrl && key.shift && key.name === 'z') redo();
+      else if (key.name === "delete" || (key.ctrl && key.name === "d")) del();
+      else if (key.ctrl && !key.shift && key.name === "z") undo();
+      else if (key.ctrl && key.shift && key.name === "z") redo();
       else if (input && !key.ctrl && !key.meta) {
         insert(input, { paste: key.paste });
       }
     },
-    [
-      newline,
-      move,
-      deleteWordLeft,
-      deleteWordRight,
-      backspace,
-      del,
-      insert,
-      undo,
-      redo,
-    ],
+    [newline, move, deleteWordLeft, deleteWordRight, backspace, del, insert, undo, redo],
   );
 
   const renderedVisualLines = useMemo(
@@ -1958,15 +1782,9 @@ export function useTextBuffer({
   );
 
   const replaceRange = useCallback(
-    (
-      startRow: number,
-      startCol: number,
-      endRow: number,
-      endCol: number,
-      text: string,
-    ): void => {
+    (startRow: number, startCol: number, endRow: number, endCol: number, text: string): void => {
       dispatch({
-        type: 'replace_range',
+        type: "replace_range",
         payload: { startRow, startCol, endRow, endCol, text },
       });
     },
@@ -1983,7 +1801,7 @@ export function useTextBuffer({
   );
 
   const moveToOffset = useCallback((offset: number): void => {
-    dispatch({ type: 'move_to_offset', payload: { offset } });
+    dispatch({ type: "move_to_offset", payload: { offset } });
   }, []);
 
   const returnValue: TextBuffer = useMemo(
@@ -2229,11 +2047,7 @@ export interface TextBuffer {
    */
   openInExternalEditor: (opts?: { editor?: string }) => Promise<void>;
 
-  replaceRangeByOffset: (
-    startOffset: number,
-    endOffset: number,
-    replacementText: string,
-  ) => void;
+  replaceRangeByOffset: (startOffset: number, endOffset: number, replacementText: string) => void;
   moveToOffset(offset: number): void;
 
   // Vim-specific operations
@@ -2280,7 +2094,7 @@ export interface TextBuffer {
   /**
    * Change movement operations (vim 'ch', 'cj', 'ck', 'cl' commands)
    */
-  vimChangeMovement: (movement: 'h' | 'j' | 'k' | 'l', count: number) => void;
+  vimChangeMovement: (movement: "h" | "j" | "k" | "l", count: number) => void;
   /**
    * Move cursor left N times (vim 'h' command)
    */
diff --git a/apps/airiscode-cli/src/ui/components/shared/vim-buffer-actions.ts b/apps/airiscode-cli/src/ui/components/shared/vim-buffer-actions.ts
index 8243aeabd..3f4d23b39 100644
--- a/apps/airiscode-cli/src/ui/components/shared/vim-buffer-actions.ts
+++ b/apps/airiscode-cli/src/ui/components/shared/vim-buffer-actions.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TextBufferState, TextBufferAction } from './text-buffer.js';
+import { assumeExhaustive } from "../../../utils/checks.js";
+import { cpLen, toCodePoints } from "../../utils/textUtils.js";
+import type { TextBufferAction, TextBufferState } from "./text-buffer.js";
 import {
+  findNextWordAcrossLines,
+  findPrevWordAcrossLines,
+  findWordEndInLine,
   getLineRangeOffsets,
   getPositionFromOffsets,
-  replaceRangeInternal,
-  pushUndo,
+  isCombiningMark,
   isWordCharStrict,
   isWordCharWithCombining,
-  isCombiningMark,
-  findNextWordAcrossLines,
-  findPrevWordAcrossLines,
-  findWordEndInLine,
-} from './text-buffer.js';
-import { cpLen, toCodePoints } from '../../utils/textUtils.js';
-import { assumeExhaustive } from '../../../utils/checks.js';
+  pushUndo,
+  replaceRangeInternal,
+} from "./text-buffer.js";
 
 // Check if we're at the end of a base word (on the last base character)
 // Returns true if current position has a base character followed only by combining marks until non-word
@@ -39,49 +39,46 @@ function isAtEndOfBaseWord(lineCodePoints: string[], col: number): boolean {
 
 export type VimAction = Extract<
   TextBufferAction,
-  | { type: 'vim_delete_word_forward' }
-  | { type: 'vim_delete_word_backward' }
-  | { type: 'vim_delete_word_end' }
-  | { type: 'vim_change_word_forward' }
-  | { type: 'vim_change_word_backward' }
-  | { type: 'vim_change_word_end' }
-  | { type: 'vim_delete_line' }
-  | { type: 'vim_change_line' }
-  | { type: 'vim_delete_to_end_of_line' }
-  | { type: 'vim_change_to_end_of_line' }
-  | { type: 'vim_change_movement' }
-  | { type: 'vim_move_left' }
-  | { type: 'vim_move_right' }
-  | { type: 'vim_move_up' }
-  | { type: 'vim_move_down' }
-  | { type: 'vim_move_word_forward' }
-  | { type: 'vim_move_word_backward' }
-  | { type: 'vim_move_word_end' }
-  | { type: 'vim_delete_char' }
-  | { type: 'vim_insert_at_cursor' }
-  | { type: 'vim_append_at_cursor' }
-  | { type: 'vim_open_line_below' }
-  | { type: 'vim_open_line_above' }
-  | { type: 'vim_append_at_line_end' }
-  | { type: 'vim_insert_at_line_start' }
-  | { type: 'vim_move_to_line_start' }
-  | { type: 'vim_move_to_line_end' }
-  | { type: 'vim_move_to_first_nonwhitespace' }
-  | { type: 'vim_move_to_first_line' }
-  | { type: 'vim_move_to_last_line' }
-  | { type: 'vim_move_to_line' }
-  | { type: 'vim_escape_insert_mode' }
+  | { type: "vim_delete_word_forward" }
+  | { type: "vim_delete_word_backward" }
+  | { type: "vim_delete_word_end" }
+  | { type: "vim_change_word_forward" }
+  | { type: "vim_change_word_backward" }
+  | { type: "vim_change_word_end" }
+  | { type: "vim_delete_line" }
+  | { type: "vim_change_line" }
+  | { type: "vim_delete_to_end_of_line" }
+  | { type: "vim_change_to_end_of_line" }
+  | { type: "vim_change_movement" }
+  | { type: "vim_move_left" }
+  | { type: "vim_move_right" }
+  | { type: "vim_move_up" }
+  | { type: "vim_move_down" }
+  | { type: "vim_move_word_forward" }
+  | { type: "vim_move_word_backward" }
+  | { type: "vim_move_word_end" }
+  | { type: "vim_delete_char" }
+  | { type: "vim_insert_at_cursor" }
+  | { type: "vim_append_at_cursor" }
+  | { type: "vim_open_line_below" }
+  | { type: "vim_open_line_above" }
+  | { type: "vim_append_at_line_end" }
+  | { type: "vim_insert_at_line_start" }
+  | { type: "vim_move_to_line_start" }
+  | { type: "vim_move_to_line_end" }
+  | { type: "vim_move_to_first_nonwhitespace" }
+  | { type: "vim_move_to_first_line" }
+  | { type: "vim_move_to_last_line" }
+  | { type: "vim_move_to_line" }
+  | { type: "vim_escape_insert_mode" }
 >;
 
-export function handleVimAction(
-  state: TextBufferState,
-  action: VimAction,
-): TextBufferState {
+export function handleVimAction(state: TextBufferState, action: VimAction): TextBufferState {
   const { lines, cursorRow, cursorCol } = state;
 
   switch (action.type) {
-    case 'vim_delete_word_forward':
-    case 'vim_change_word_forward': {
+    case "vim_delete_word_forward":
+    case "vim_change_word_forward": {
       const { count } = action.payload;
       let endRow = cursorRow;
       let endCol = cursorCol;
@@ -93,7 +90,7 @@ export function handleVimAction(
           endCol = nextWord.col;
         } else {
           // No more words, delete/change to end of current word or line
-          const currentLine = lines[endRow] || '';
+          const currentLine = lines[endRow] || "";
           const wordEnd = findWordEndInLine(currentLine, endCol);
           if (wordEnd !== null) {
             endCol = wordEnd + 1; // Include the character at word end
@@ -106,20 +103,13 @@ export function handleVimAction(
 
       if (endRow !== cursorRow || endCol !== cursorCol) {
         const nextState = pushUndo(state);
-        return replaceRangeInternal(
-          nextState,
-          cursorRow,
-          cursorCol,
-          endRow,
-          endCol,
-          '',
-        );
+        return replaceRangeInternal(nextState, cursorRow, cursorCol, endRow, endCol, "");
       }
       return state;
     }
 
-    case 'vim_delete_word_backward':
-    case 'vim_change_word_backward': {
+    case "vim_delete_word_backward":
+    case "vim_change_word_backward": {
       const { count } = action.payload;
       let startRow = cursorRow;
       let startCol = cursorCol;
@@ -136,20 +126,13 @@ export function handleVimAction(
 
       if (startRow !== cursorRow || startCol !== cursorCol) {
         const nextState = pushUndo(state);
-        return replaceRangeInternal(
-          nextState,
-          startRow,
-          startCol,
-          cursorRow,
-          cursorCol,
-          '',
-        );
+        return replaceRangeInternal(nextState, startRow, startCol, cursorRow, cursorCol, "");
       }
       return state;
     }
 
-    case 'vim_delete_word_end':
-    case 'vim_change_word_end': {
+    case "vim_delete_word_end":
+    case "vim_change_word_end": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -163,12 +146,7 @@ export function handleVimAction(
           endCol = wordEnd.col + 1; // Include the character at word end
           // For next iteration, move to start of next word
           if (i < count - 1) {
-            const nextWord = findNextWordAcrossLines(
-              lines,
-              wordEnd.row,
-              wordEnd.col + 1,
-              true,
-            );
+            const nextWord = findNextWordAcrossLines(lines, wordEnd.row, wordEnd.col + 1, true);
             if (nextWord) {
               row = nextWord.row;
               col = nextWord.col;
@@ -183,25 +161,18 @@ export function handleVimAction(
 
       // Ensure we don't go past the end of the last line
       if (endRow < lines.length) {
-        const lineLen = cpLen(lines[endRow] || '');
+        const lineLen = cpLen(lines[endRow] || "");
         endCol = Math.min(endCol, lineLen);
       }
 
       if (endRow !== cursorRow || endCol !== cursorCol) {
         const nextState = pushUndo(state);
-        return replaceRangeInternal(
-          nextState,
-          cursorRow,
-          cursorCol,
-          endRow,
-          endCol,
-          '',
-        );
+        return replaceRangeInternal(nextState, cursorRow, cursorCol, endRow, endCol, "");
       }
       return state;
     }
 
-    case 'vim_delete_line': {
+    case "vim_delete_line": {
       const { count } = action.payload;
       if (lines.length === 0) return state;
 
@@ -214,7 +185,7 @@ export function handleVimAction(
         const nextState = pushUndo(state);
         return {
           ...nextState,
-          lines: [''],
+          lines: [""],
           cursorRow: 0,
           cursorCol: 0,
           preferredCol: null,
@@ -238,7 +209,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_change_line': {
+    case "vim_change_line": {
       const { count } = action.payload;
       if (lines.length === 0) return state;
 
@@ -255,19 +226,12 @@ export function handleVimAction(
         endOffset,
         nextState.lines,
       );
-      return replaceRangeInternal(
-        nextState,
-        startRow,
-        startCol,
-        endRow,
-        endCol,
-        '',
-      );
+      return replaceRangeInternal(nextState, startRow, startCol, endRow, endCol, "");
     }
 
-    case 'vim_delete_to_end_of_line':
-    case 'vim_change_to_end_of_line': {
-      const currentLine = lines[cursorRow] || '';
+    case "vim_delete_to_end_of_line":
+    case "vim_change_to_end_of_line": {
+      const currentLine = lines[cursorRow] || "";
       if (cursorCol < cpLen(currentLine)) {
         const nextState = pushUndo(state);
         return replaceRangeInternal(
@@ -276,18 +240,18 @@ export function handleVimAction(
           cursorCol,
           cursorRow,
           cpLen(currentLine),
-          '',
+          "",
         );
       }
       return state;
     }
 
-    case 'vim_change_movement': {
+    case "vim_change_movement": {
       const { movement, count } = action.payload;
       const totalLines = lines.length;
 
       switch (movement) {
-        case 'h': {
+        case "h": {
           // Left
           // Change N characters to the left
           const startCol = Math.max(0, cursorCol - count);
@@ -297,24 +261,17 @@ export function handleVimAction(
             startCol,
             cursorRow,
             cursorCol,
-            '',
+            "",
           );
         }
 
-        case 'j': {
+        case "j": {
           // Down
           const linesToChange = Math.min(count, totalLines - cursorRow);
           if (linesToChange > 0) {
             if (totalLines === 1) {
-              const currentLine = state.lines[0] || '';
-              return replaceRangeInternal(
-                pushUndo(state),
-                0,
-                0,
-                0,
-                cpLen(currentLine),
-                '',
-              );
+              const currentLine = state.lines[0] || "";
+              return replaceRangeInternal(pushUndo(state), 0, 0, 0, cpLen(currentLine), "");
             } else {
               const nextState = pushUndo(state);
               const { startOffset, endOffset } = getLineRangeOffsets(
@@ -322,35 +279,24 @@ export function handleVimAction(
                 linesToChange,
                 nextState.lines,
               );
-              const { startRow, startCol, endRow, endCol } =
-                getPositionFromOffsets(startOffset, endOffset, nextState.lines);
-              return replaceRangeInternal(
-                nextState,
-                startRow,
-                startCol,
-                endRow,
-                endCol,
-                '',
+              const { startRow, startCol, endRow, endCol } = getPositionFromOffsets(
+                startOffset,
+                endOffset,
+                nextState.lines,
               );
+              return replaceRangeInternal(nextState, startRow, startCol, endRow, endCol, "");
             }
           }
           return state;
         }
 
-        case 'k': {
+        case "k": {
           // Up
           const upLines = Math.min(count, cursorRow + 1);
           if (upLines > 0) {
             if (state.lines.length === 1) {
-              const currentLine = state.lines[0] || '';
-              return replaceRangeInternal(
-                pushUndo(state),
-                0,
-                0,
-                0,
-                cpLen(currentLine),
-                '',
-              );
+              const currentLine = state.lines[0] || "";
+              return replaceRangeInternal(pushUndo(state), 0, 0, 0, cpLen(currentLine), "");
             } else {
               const startRow = Math.max(0, cursorRow - count + 1);
               const linesToChange = cursorRow - startRow + 1;
@@ -365,18 +311,14 @@ export function handleVimAction(
                 startCol,
                 endRow,
                 endCol,
-              } = getPositionFromOffsets(
-                startOffset,
-                endOffset,
-                nextState.lines,
-              );
+              } = getPositionFromOffsets(startOffset, endOffset, nextState.lines);
               const resultState = replaceRangeInternal(
                 nextState,
                 newStartRow,
                 startCol,
                 endRow,
                 endCol,
-                '',
+                "",
               );
               return {
                 ...resultState,
@@ -388,7 +330,7 @@ export function handleVimAction(
           return state;
         }
 
-        case 'l': {
+        case "l": {
           // Right
           // Change N characters to the right
           return replaceRangeInternal(
@@ -396,8 +338,8 @@ export function handleVimAction(
             cursorRow,
             cursorCol,
             cursorRow,
-            Math.min(cpLen(lines[cursorRow] || ''), cursorCol + count),
-            '',
+            Math.min(cpLen(lines[cursorRow] || ""), cursorCol + count),
+            "",
           );
         }
 
@@ -406,7 +348,7 @@ export function handleVimAction(
       }
     }
 
-    case 'vim_move_left': {
+    case "vim_move_left": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       let newRow = cursorRow;
@@ -418,7 +360,7 @@ export function handleVimAction(
         } else if (newRow > 0) {
           // Move to end of previous line
           newRow--;
-          const prevLine = lines[newRow] || '';
+          const prevLine = lines[newRow] || "";
           const prevLineLength = cpLen(prevLine);
           // Position on last character, or column 0 for empty lines
           newCol = prevLineLength === 0 ? 0 : prevLineLength - 1;
@@ -433,14 +375,14 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_right': {
+    case "vim_move_right": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       let newRow = cursorRow;
       let newCol = cursorCol;
 
       for (let i = 0; i < count; i++) {
-        const currentLine = lines[newRow] || '';
+        const currentLine = lines[newRow] || "";
         const lineLength = cpLen(currentLine);
         // Don't move past the last character of the line
         // For empty lines, stay at column 0; for non-empty lines, don't go past last character
@@ -477,16 +419,13 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_up': {
+    case "vim_move_up": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       const newRow = Math.max(0, cursorRow - count);
-      const targetLine = lines[newRow] || '';
+      const targetLine = lines[newRow] || "";
       const targetLineLength = cpLen(targetLine);
-      const newCol = Math.min(
-        cursorCol,
-        targetLineLength > 0 ? targetLineLength - 1 : 0,
-      );
+      const newCol = Math.min(cursorCol, targetLineLength > 0 ? targetLineLength - 1 : 0);
 
       return {
         ...state,
@@ -496,16 +435,13 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_down': {
+    case "vim_move_down": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       const newRow = Math.min(lines.length - 1, cursorRow + count);
-      const targetLine = lines[newRow] || '';
+      const targetLine = lines[newRow] || "";
       const targetLineLength = cpLen(targetLine);
-      const newCol = Math.min(
-        cursorCol,
-        targetLineLength > 0 ? targetLineLength - 1 : 0,
-      );
+      const newCol = Math.min(cursorCol, targetLineLength > 0 ? targetLineLength - 1 : 0);
 
       return {
         ...state,
@@ -515,7 +451,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_word_forward': {
+    case "vim_move_word_forward": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -539,7 +475,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_word_backward': {
+    case "vim_move_word_backward": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -562,7 +498,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_word_end': {
+    case "vim_move_word_end": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -570,7 +506,7 @@ export function handleVimAction(
       for (let i = 0; i < count; i++) {
         // Special handling for the first iteration when we're at end of word
         if (i === 0) {
-          const currentLine = lines[row] || '';
+          const currentLine = lines[row] || "";
           const lineCodePoints = toCodePoints(currentLine);
 
           // Check if we're at the end of a word (on the last base character)
@@ -580,17 +516,11 @@ export function handleVimAction(
             (col + 1 >= lineCodePoints.length ||
               !isWordCharWithCombining(lineCodePoints[col + 1]) ||
               // Or if we're on a base char followed only by combining marks until non-word
-              (isWordCharStrict(lineCodePoints[col]) &&
-                isAtEndOfBaseWord(lineCodePoints, col)));
+              (isWordCharStrict(lineCodePoints[col]) && isAtEndOfBaseWord(lineCodePoints, col)));
 
           if (atEndOfWord) {
             // We're already at end of word, find next word end
-            const nextWord = findNextWordAcrossLines(
-              lines,
-              row,
-              col + 1,
-              false,
-            );
+            const nextWord = findNextWordAcrossLines(lines, row, col + 1, false);
             if (nextWord) {
               row = nextWord.row;
               col = nextWord.col;
@@ -616,10 +546,10 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_delete_char': {
+    case "vim_delete_char": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       const lineLength = cpLen(currentLine);
 
       if (cursorCol < lineLength) {
@@ -631,20 +561,20 @@ export function handleVimAction(
           cursorCol,
           cursorRow,
           cursorCol + deleteCount,
-          '',
+          "",
         );
       }
       return state;
     }
 
-    case 'vim_insert_at_cursor': {
+    case "vim_insert_at_cursor": {
       // Just return state - mode change is handled elsewhere
       return state;
     }
 
-    case 'vim_append_at_cursor': {
+    case "vim_append_at_cursor": {
       const { cursorRow, cursorCol, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       const newCol = cursorCol < cpLen(currentLine) ? cursorCol + 1 : cursorCol;
 
       return {
@@ -654,35 +584,21 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_open_line_below': {
+    case "vim_open_line_below": {
       const { cursorRow, lines } = state;
       const nextState = pushUndo(state);
 
       // Insert newline at end of current line
-      const endOfLine = cpLen(lines[cursorRow] || '');
-      return replaceRangeInternal(
-        nextState,
-        cursorRow,
-        endOfLine,
-        cursorRow,
-        endOfLine,
-        '\n',
-      );
+      const endOfLine = cpLen(lines[cursorRow] || "");
+      return replaceRangeInternal(nextState, cursorRow, endOfLine, cursorRow, endOfLine, "\n");
     }
 
-    case 'vim_open_line_above': {
+    case "vim_open_line_above": {
       const { cursorRow } = state;
       const nextState = pushUndo(state);
 
       // Insert newline at beginning of current line
-      const resultState = replaceRangeInternal(
-        nextState,
-        cursorRow,
-        0,
-        cursorRow,
-        0,
-        '\n',
-      );
+      const resultState = replaceRangeInternal(nextState, cursorRow, 0, cursorRow, 0, "\n");
 
       // Move cursor to the new line above
       return {
@@ -692,9 +608,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_append_at_line_end': {
+    case "vim_append_at_line_end": {
       const { cursorRow, lines } = state;
-      const lineLength = cpLen(lines[cursorRow] || '');
+      const lineLength = cpLen(lines[cursorRow] || "");
 
       return {
         ...state,
@@ -703,9 +619,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_insert_at_line_start': {
+    case "vim_insert_at_line_start": {
       const { cursorRow, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       let col = 0;
 
       // Find first non-whitespace character using proper Unicode handling
@@ -721,7 +637,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_line_start': {
+    case "vim_move_to_line_start": {
       return {
         ...state,
         cursorCol: 0,
@@ -729,9 +645,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_line_end': {
+    case "vim_move_to_line_end": {
       const { cursorRow, lines } = state;
-      const lineLength = cpLen(lines[cursorRow] || '');
+      const lineLength = cpLen(lines[cursorRow] || "");
 
       return {
         ...state,
@@ -740,9 +656,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_first_nonwhitespace': {
+    case "vim_move_to_first_nonwhitespace": {
       const { cursorRow, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       let col = 0;
 
       // Find first non-whitespace character using proper Unicode handling
@@ -758,7 +674,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_first_line': {
+    case "vim_move_to_first_line": {
       return {
         ...state,
         cursorRow: 0,
@@ -767,7 +683,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_last_line': {
+    case "vim_move_to_last_line": {
       const { lines } = state;
       const lastRow = lines.length - 1;
 
@@ -779,7 +695,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_line': {
+    case "vim_move_to_line": {
       const { lineNumber } = action.payload;
       const { lines } = state;
       const targetRow = Math.min(Math.max(0, lineNumber - 1), lines.length - 1);
@@ -792,7 +708,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_escape_insert_mode': {
+    case "vim_escape_insert_mode": {
       // Move cursor left if not at beginning of line (vim behavior when exiting insert mode)
       const { cursorCol } = state;
       const newCol = cursorCol > 0 ? cursorCol - 1 : 0;
diff --git a/apps/airiscode-cli/src/ui/components/subagents/constants.ts b/apps/airiscode-cli/src/ui/components/subagents/constants.ts
index 0aecfefe5..f609b6fa0 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/constants.ts
+++ b/apps/airiscode-cli/src/ui/components/subagents/constants.ts
@@ -23,49 +23,49 @@ export const TOTAL_WIZARD_STEPS = 6;
 
 // Step names for display
 export const STEP_NAMES: Record<number, string> = {
-  [WIZARD_STEPS.LOCATION_SELECTION]: 'Location Selection',
-  [WIZARD_STEPS.GENERATION_METHOD]: 'Generation Method',
-  [WIZARD_STEPS.DESCRIPTION_INPUT]: 'Description Input',
-  [WIZARD_STEPS.TOOL_SELECTION]: 'Tool Selection',
-  [WIZARD_STEPS.COLOR_SELECTION]: 'Color Selection',
-  [WIZARD_STEPS.FINAL_CONFIRMATION]: 'Final Confirmation',
+  [WIZARD_STEPS.LOCATION_SELECTION]: "Location Selection",
+  [WIZARD_STEPS.GENERATION_METHOD]: "Generation Method",
+  [WIZARD_STEPS.DESCRIPTION_INPUT]: "Description Input",
+  [WIZARD_STEPS.TOOL_SELECTION]: "Tool Selection",
+  [WIZARD_STEPS.COLOR_SELECTION]: "Color Selection",
+  [WIZARD_STEPS.FINAL_CONFIRMATION]: "Final Confirmation",
 };
 
 // Color options for subagent display
 export const COLOR_OPTIONS = [
   {
-    id: 'auto',
-    name: 'Automatic Color',
-    value: 'auto',
+    id: "auto",
+    name: "Automatic Color",
+    value: "auto",
   },
   {
-    id: 'blue',
-    name: 'Blue',
-    value: '#3b82f6',
+    id: "blue",
+    name: "Blue",
+    value: "#3b82f6",
   },
   {
-    id: 'green',
-    name: 'Green',
-    value: '#10b981',
+    id: "green",
+    name: "Green",
+    value: "#10b981",
   },
   {
-    id: 'purple',
-    name: 'Purple',
-    value: '#8b5cf6',
+    id: "purple",
+    name: "Purple",
+    value: "#8b5cf6",
   },
   {
-    id: 'orange',
-    name: 'Orange',
-    value: '#f59e0b',
+    id: "orange",
+    name: "Orange",
+    value: "#f59e0b",
   },
   {
-    id: 'red',
-    name: 'Red',
-    value: '#ef4444',
+    id: "red",
+    name: "Red",
+    value: "#ef4444",
   },
   {
-    id: 'cyan',
-    name: 'Cyan',
-    value: '#06b6d4',
+    id: "cyan",
+    name: "Cyan",
+    value: "#06b6d4",
   },
 ];
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/AgentCreationWizard.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/AgentCreationWizard.tsx
index 8ad5969ff..a5cfecb48 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/AgentCreationWizard.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/AgentCreationWizard.tsx
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useReducer, useCallback, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { wizardReducer, initialWizardState } from '../reducers.js';
-import { LocationSelector } from './LocationSelector.js';
-import { GenerationMethodSelector } from './GenerationMethodSelector.js';
-import { DescriptionInput } from './DescriptionInput.js';
-import { ToolSelector } from './ToolSelector.js';
-import { ColorSelector } from './ColorSelector.js';
-import { CreationSummary } from './CreationSummary.js';
-import { type WizardStepProps } from '../types.js';
-import { WIZARD_STEPS } from '../constants.js';
-import { getStepKind } from '../utils.js';
-import type { Config } from '@airiscode/core';
-import { theme } from '../../../semantic-colors.js';
-import { TextEntryStep } from './TextEntryStep.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
+import type { Config } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useMemo, useReducer } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import { WIZARD_STEPS } from "../constants.js";
+import { initialWizardState, wizardReducer } from "../reducers.js";
+import { type WizardStepProps } from "../types.js";
+import { getStepKind } from "../utils.js";
+import { ColorSelector } from "./ColorSelector.js";
+import { CreationSummary } from "./CreationSummary.js";
+import { DescriptionInput } from "./DescriptionInput.js";
+import { GenerationMethodSelector } from "./GenerationMethodSelector.js";
+import { LocationSelector } from "./LocationSelector.js";
+import { TextEntryStep } from "./TextEntryStep.js";
+import { ToolSelector } from "./ToolSelector.js";
 
 interface AgentCreationWizardProps {
   onClose: () => void;
@@ -30,35 +30,32 @@ interface AgentCreationWizardProps {
 /**
  * Main orchestrator component for the subagent creation wizard.
  */
-export function AgentCreationWizard({
-  onClose,
-  config,
-}: AgentCreationWizardProps) {
+export function AgentCreationWizard({ onClose, config }: AgentCreationWizardProps) {
   const [state, dispatch] = useReducer(wizardReducer, initialWizardState);
 
   const handleNext = useCallback(() => {
-    dispatch({ type: 'GO_TO_NEXT_STEP' });
+    dispatch({ type: "GO_TO_NEXT_STEP" });
   }, []);
 
   const handlePrevious = useCallback(() => {
-    dispatch({ type: 'GO_TO_PREVIOUS_STEP' });
+    dispatch({ type: "GO_TO_PREVIOUS_STEP" });
   }, []);
 
   const handleCancel = useCallback(() => {
-    dispatch({ type: 'RESET_WIZARD' });
+    dispatch({ type: "RESET_WIZARD" });
     onClose();
   }, [onClose]);
 
   // Centralized ESC key handling for the entire wizard
   useKeypress(
     (key) => {
-      if (key.name !== 'escape') {
+      if (key.name !== "escape") {
         return;
       }
 
       // LLM DescriptionInput handles its own ESC logic when generating
       const kind = getStepKind(state.generationMethod, state.currentStep);
-      if (kind === 'LLM_DESC' && state.isGenerating) {
+      if (kind === "LLM_DESC" && state.isGenerating) {
         return; // Let DescriptionInput handle it
       }
 
@@ -90,26 +87,26 @@ export function AgentCreationWizard({
       const kind = getStepKind(state.generationMethod, state.currentStep);
       const n = state.currentStep;
       switch (kind) {
-        case 'LOCATION':
-          return t('Step {{n}}: Choose Location', { n: n.toString() });
-        case 'GEN_METHOD':
-          return t('Step {{n}}: Choose Generation Method', { n: n.toString() });
-        case 'LLM_DESC':
-          return t('Step {{n}}: Describe Your Subagent', { n: n.toString() });
-        case 'MANUAL_NAME':
-          return t('Step {{n}}: Enter Subagent Name', { n: n.toString() });
-        case 'MANUAL_PROMPT':
-          return t('Step {{n}}: Enter System Prompt', { n: n.toString() });
-        case 'MANUAL_DESC':
-          return t('Step {{n}}: Enter Description', { n: n.toString() });
-        case 'TOOLS':
-          return t('Step {{n}}: Select Tools', { n: n.toString() });
-        case 'COLOR':
-          return t('Step {{n}}: Choose Background Color', { n: n.toString() });
-        case 'FINAL':
-          return t('Step {{n}}: Confirm and Save', { n: n.toString() });
+        case "LOCATION":
+          return t("Step {{n}}: Choose Location", { n: n.toString() });
+        case "GEN_METHOD":
+          return t("Step {{n}}: Choose Generation Method", { n: n.toString() });
+        case "LLM_DESC":
+          return t("Step {{n}}: Describe Your Subagent", { n: n.toString() });
+        case "MANUAL_NAME":
+          return t("Step {{n}}: Enter Subagent Name", { n: n.toString() });
+        case "MANUAL_PROMPT":
+          return t("Step {{n}}: Enter System Prompt", { n: n.toString() });
+        case "MANUAL_DESC":
+          return t("Step {{n}}: Enter Description", { n: n.toString() });
+        case "TOOLS":
+          return t("Step {{n}}: Select Tools", { n: n.toString() });
+        case "COLOR":
+          return t("Step {{n}}: Choose Background Color", { n: n.toString() });
+        case "FINAL":
+          return t("Step {{n}}: Confirm and Save", { n: n.toString() });
         default:
-          return t('Unknown Step');
+          return t("Unknown Step");
       }
     };
 
@@ -124,29 +121,27 @@ export function AgentCreationWizard({
     const getNavigationInstructions = () => {
       // Special case: During generation in description input step, only show cancel option
       const kind = getStepKind(state.generationMethod, state.currentStep);
-      if (kind === 'LLM_DESC' && state.isGenerating) {
-        return t('Esc to cancel');
+      if (kind === "LLM_DESC" && state.isGenerating) {
+        return t("Esc to cancel");
       }
 
-      if (getStepKind(state.generationMethod, state.currentStep) === 'FINAL') {
-        return t('Press Enter to save, e to save and edit, Esc to go back');
+      if (getStepKind(state.generationMethod, state.currentStep) === "FINAL") {
+        return t("Press Enter to save, e to save and edit, Esc to go back");
       }
 
       // Steps that have ↑↓ navigation (RadioButtonSelect components)
       const kindForNav = getStepKind(state.generationMethod, state.currentStep);
       const hasNavigation =
-        kindForNav === 'LOCATION' ||
-        kindForNav === 'GEN_METHOD' ||
-        kindForNav === 'TOOLS' ||
-        kindForNav === 'COLOR';
-      const navigationPart = hasNavigation ? t('↑↓ to navigate, ') : '';
+        kindForNav === "LOCATION" ||
+        kindForNav === "GEN_METHOD" ||
+        kindForNav === "TOOLS" ||
+        kindForNav === "COLOR";
+      const navigationPart = hasNavigation ? t("↑↓ to navigate, ") : "";
 
       const escAction =
-        state.currentStep === WIZARD_STEPS.LOCATION_SELECTION
-          ? t('cancel')
-          : t('go back');
+        state.currentStep === WIZARD_STEPS.LOCATION_SELECTION ? t("cancel") : t("go back");
 
-      return t('Press Enter to continue, {{navigation}}Esc to {{action}}', {
+      return t("Press Enter to continue, {{navigation}}Esc to {{action}}", {
         navigation: navigationPart,
         action: escAction,
       });
@@ -162,33 +157,31 @@ export function AgentCreationWizard({
   const renderStepContent = useCallback(() => {
     const kind = getStepKind(state.generationMethod, state.currentStep);
     switch (kind) {
-      case 'LOCATION':
+      case "LOCATION":
         return <LocationSelector {...stepProps} />;
-      case 'GEN_METHOD':
+      case "GEN_METHOD":
         return <GenerationMethodSelector {...stepProps} />;
-      case 'LLM_DESC':
+      case "LLM_DESC":
         return <DescriptionInput {...stepProps} />;
-      case 'MANUAL_NAME':
+      case "MANUAL_NAME":
         return (
           <TextEntryStep
             key="manual-name"
             state={state}
             dispatch={dispatch}
             onNext={handleNext}
-            description={t('Enter a clear, unique name for this subagent.')}
-            placeholder={t('e.g., Code Reviewer')}
+            description={t("Enter a clear, unique name for this subagent.")}
+            placeholder={t("e.g., Code Reviewer")}
             height={1}
             initialText={state.generatedName}
             onChange={(text) => {
               const value = text; // keep raw, trim later when validating
-              dispatch({ type: 'SET_GENERATED_NAME', name: value });
+              dispatch({ type: "SET_GENERATED_NAME", name: value });
             }}
-            validate={(text) =>
-              text.trim().length === 0 ? t('Name cannot be empty.') : null
-            }
+            validate={(text) => (text.trim().length === 0 ? t("Name cannot be empty.") : null)}
           />
         );
-      case 'MANUAL_PROMPT':
+      case "MANUAL_PROMPT":
         return (
           <TextEntryStep
             key="manual-prompt"
@@ -198,79 +191,71 @@ export function AgentCreationWizard({
             description={t(
               "Write the system prompt that defines this subagent's behavior. Be comprehensive for best results.",
             )}
-            placeholder={t('e.g., You are an expert code reviewer...')}
+            placeholder={t("e.g., You are an expert code reviewer...")}
             height={10}
             initialText={state.generatedSystemPrompt}
             onChange={(text) => {
               dispatch({
-                type: 'SET_GENERATED_SYSTEM_PROMPT',
+                type: "SET_GENERATED_SYSTEM_PROMPT",
                 systemPrompt: text,
               });
             }}
             validate={(text) =>
-              text.trim().length === 0
-                ? t('System prompt cannot be empty.')
-                : null
+              text.trim().length === 0 ? t("System prompt cannot be empty.") : null
             }
           />
         );
-      case 'MANUAL_DESC':
+      case "MANUAL_DESC":
         return (
           <TextEntryStep
             key="manual-desc"
             state={state}
             dispatch={dispatch}
             onNext={handleNext}
-            description={t(
-              'Describe when and how this subagent should be used.',
-            )}
-            placeholder={t(
-              'e.g., Reviews code for best practices and potential bugs.',
-            )}
+            description={t("Describe when and how this subagent should be used.")}
+            placeholder={t("e.g., Reviews code for best practices and potential bugs.")}
             height={6}
             initialText={state.generatedDescription}
             onChange={(text) => {
               dispatch({
-                type: 'SET_GENERATED_DESCRIPTION',
+                type: "SET_GENERATED_DESCRIPTION",
                 description: text,
               });
             }}
             validate={(text) =>
-              text.trim().length === 0
-                ? t('Description cannot be empty.')
-                : null
+              text.trim().length === 0 ? t("Description cannot be empty.") : null
             }
           />
         );
-      case 'TOOLS':
+      case "TOOLS":
         return (
           <ToolSelector
             tools={state.selectedTools}
             onSelect={(tools) => {
-              dispatch({ type: 'SET_TOOLS', tools });
+              dispatch({ type: "SET_TOOLS", tools });
               handleNext();
             }}
             config={config}
           />
         );
-      case 'COLOR':
+      case "COLOR":
         return (
           <ColorSelector
             color={state.color}
             agentName={state.generatedName}
             onSelect={(color) => {
-              dispatch({ type: 'SET_BACKGROUND_COLOR', color });
+              dispatch({ type: "SET_BACKGROUND_COLOR", color });
               handleNext();
             }}
           />
         );
-      case 'FINAL':
+      case "FINAL":
         return <CreationSummary {...stepProps} />;
       default:
         return (
           <Box>
             <Text color={theme.status.error}>
-              {t('Invalid step: {{step}}', {
+              {t("Invalid step: {{step}}", {
                 step: state.currentStep.toString(),
               })}
             </Text>
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/ColorSelector.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/ColorSelector.tsx
index ba8802833..466e436f8 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/ColorSelector.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/ColorSelector.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import { type ColorOption } from '../types.js';
-import { theme } from '../../../semantic-colors.js';
-import { COLOR_OPTIONS } from '../constants.js';
+import { Box, Text } from "ink";
+import { useEffect, useState } from "react";
+import { theme } from "../../../semantic-colors.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import { COLOR_OPTIONS } from "../constants.js";
+import { type ColorOption } from "../types.js";
 
 const colorOptions: ColorOption[] = COLOR_OPTIONS;
 
@@ -23,8 +23,8 @@ interface ColorSelectorProps {
  * Color selection with preview.
  */
 export function ColorSelector({
-  color = 'auto',
-  agentName = 'Agent',
+  color = "auto",
+  agentName = "Agent",
   onSelect,
 }: ColorSelectorProps) {
   const [selectedColor, setSelectedColor] = useState<string>(color);
@@ -35,26 +35,21 @@ export function ColorSelector({
   }, [color]);
 
   const handleSelect = (selectedValue: string) => {
-    const colorOption = colorOptions.find(
-      (option) => option.id === selectedValue,
-    );
+    const colorOption = colorOptions.find((option) => option.id === selectedValue);
     if (colorOption) {
       onSelect(colorOption.name);
     }
   };
 
   const handleHighlight = (selectedValue: string) => {
-    const colorOption = colorOptions.find(
-      (option) => option.id === selectedValue,
-    );
+    const colorOption = colorOptions.find((option) => option.id === selectedValue);
     if (colorOption) {
       setSelectedColor(colorOption.name);
     }
   };
 
   const currentColor =
-    colorOptions.find((option) => option.name === selectedColor) ||
-    colorOptions[0];
+    colorOptions.find((option) => option.name === selectedColor) || colorOptions[0];
 
   return (
     <Box flexDirection="column" gap={1}>
@@ -65,9 +60,7 @@ export function ColorSelector({
             label: option.name,
             value: option.id,
           }))}
-          initialIndex={colorOptions.findIndex(
-            (opt) => opt.id === currentColor.id,
-          )}
+          initialIndex={colorOptions.findIndex((opt) => opt.id === currentColor.id)}
           onSelect={handleSelect}
           onHighlight={handleHighlight}
           isFocused={true}
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/CreationSummary.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/CreationSummary.tsx
index 53e9d7ade..001fae2d4 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/CreationSummary.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/CreationSummary.tsx
@@ -4,21 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import type { WizardStepProps } from '../types.js';
-import type {
-  SubagentManager,
-  SubagentConfig,
-} from '@airiscode/core';
-import { createDebugLogger } from '@airiscode/core';
-import { theme } from '../../../semantic-colors.js';
-import { shouldShowColor, getColorForDisplay } from '../utils.js';
-import { useLaunchEditor } from '../../../hooks/useLaunchEditor.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
-
-const debugLogger = createDebugLogger('SUBAGENT_CREATION_SUMMARY');
+import type { SubagentConfig, SubagentManager } from "@airiscode/core";
+import { createDebugLogger } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { useLaunchEditor } from "../../../hooks/useLaunchEditor.js";
+import { theme } from "../../../semantic-colors.js";
+import type { WizardStepProps } from "../types.js";
+import { getColorForDisplay, shouldShowColor } from "../utils.js";
+
+const debugLogger = createDebugLogger("SUBAGENT_CREATION_SUMMARY");
 
 /**
  * Step 6: Final confirmation and actions.
@@ -37,7 +34,7 @@ export function CreationSummary({
 
   const truncateText = (text: string, maxLength: number): string => {
     if (text.length <= maxLength) return text;
-    return text.substring(0, maxLength - 3) + '...';
+    return text.substring(0, maxLength - 3) + "...";
   };
 
   // Check for warnings
@@ -52,16 +49,11 @@ export function CreationSummary({
         const subagentManager = config.getSubagentManager();
 
         // Check for name conflicts
-        const isAvailable = await subagentManager.isNameAvailable(
-          state.generatedName,
-        );
+        const isAvailable = await subagentManager.isNameAvailable(state.generatedName);
         if (!isAvailable) {
-          const existing = await subagentManager.loadSubagent(
-            state.generatedName,
-          );
+          const existing = await subagentManager.loadSubagent(state.generatedName);
           if (existing) {
-            const conflictLevel =
-              existing.level === 'project' ? 'project' : 'user';
+            const conflictLevel = existing.level === "project" ? "project" : "user";
             const targetLevel = state.location;
 
             if (conflictLevel === targetLevel) {
@@ -71,12 +63,11 @@ export function CreationSummary({
                   { name: state.generatedName, level: conflictLevel },
                 ),
               );
-            } else if (targetLevel === 'project') {
+            } else if (targetLevel === "project") {
               allWarnings.push(
-                t(
-                  'Name "{{name}}" exists at user level - project level will take precedence',
-                  { name: state.generatedName },
-                ),
+                t('Name "{{name}}" exists at user level - project level will take precedence', {
+                  name: state.generatedName,
+                }),
               );
             } else {
               allWarnings.push(
@@ -90,20 +81,20 @@ export function CreationSummary({
         }
       } catch (error) {
         // Silently handle errors in warning checks
-        debugLogger.warn('Error checking subagent name availability:', error);
+        debugLogger.warn("Error checking subagent name availability:", error);
       }
 
       // Check length warnings
       if (state.generatedDescription.length > 1000) {
         allWarnings.push(
-          t('Description is over {{length}} characters', {
+          t("Description is over {{length}} characters", {
             length: state.generatedDescription.length.toString(),
           }),
         );
       }
       if (state.generatedSystemPrompt.length > 10000) {
         allWarnings.push(
-          t('System prompt is over {{length}} characters', {
+          t("System prompt is over {{length}} characters", {
             length: state.generatedSystemPrompt.length.toString(),
           }),
         );
@@ -122,14 +113,13 @@ export function CreationSummary({
   ]);
 
   // If no tools explicitly selected, it means "all tools" for this agent
-  const toolsDisplay =
-    state.selectedTools.length === 0 ? '*' : state.selectedTools.join(', ');
+  const toolsDisplay = state.selectedTools.length === 0 ? "*" : state.selectedTools.join(", ");
 
   // Common method to save subagent configuration
   const saveSubagent = useCallback(async (): Promise<SubagentManager> => {
     // Create SubagentManager instance
     if (!config) {
-      throw new Error('Configuration not available');
+      throw new Error("Configuration not available");
     }
     const subagentManager = config.getSubagentManager();
 
@@ -139,10 +129,8 @@ export function CreationSummary({
       description: state.generatedDescription,
       systemPrompt: state.generatedSystemPrompt,
       level: state.location,
-      filePath: '', // Will be set by manager
-      tools: Array.isArray(state.selectedTools)
-        ? state.selectedTools
-        : undefined,
+      filePath: "", // Will be set by manager
+      tools: Array.isArray(state.selectedTools) ? state.selectedTools : undefined,
       color: state.color,
     };
 
@@ -171,9 +159,7 @@ export function CreationSummary({
       await saveSubagent();
       showSuccessAndClose();
     } catch (error) {
-      setSaveError(
-        error instanceof Error ? error.message : 'Unknown error occurred',
-      );
+      setSaveError(error instanceof Error ? error.message : "Unknown error occurred");
     }
   }, [saveSubagent, showSuccessAndClose]);
 
@@ -186,10 +172,7 @@ export function CreationSummary({
       const subagentManager = await saveSubagent();
 
       // Get the file path of the created subagent
-      const subagentFilePath = subagentManager.getSubagentPath(
-        state.generatedName,
-        state.location,
-      );
+      const subagentFilePath = subagentManager.getSubagentPath(state.generatedName, state.location);
 
       // Launch editor with the actual subagent file
       await launchEditor(subagentFilePath);
@@ -198,30 +181,24 @@ export function CreationSummary({
       showSuccessAndClose();
     } catch (error) {
       setSaveError(
-        t('Failed to save and edit subagent: {{error}}', {
-          error: error instanceof Error ? error.message : 'Unknown error',
+        t("Failed to save and edit subagent: {{error}}", {
+          error: error instanceof Error ? error.message : "Unknown error",
         }),
       );
     }
-  }, [
-    saveSubagent,
-    showSuccessAndClose,
-    state.generatedName,
-    state.location,
-    launchEditor,
-  ]);
+  }, [saveSubagent, showSuccessAndClose, state.generatedName, state.location, launchEditor]);
 
   // Handle keyboard input
   useKeypress(
     (key) => {
       if (saveSuccess) return;
 
-      if (key.name === 'return' || key.sequence === 's') {
+      if (key.name === "return" || key.sequence === "s") {
         handleSave();
         return;
       }
 
-      if (key.sequence === 'e') {
+      if (key.sequence === "e") {
         handleEdit();
         return;
       }
@@ -234,7 +211,7 @@ export function CreationSummary({
       <Box flexDirection="column" gap={1}>
         <Box>
           <Text bold color={theme.status.success}>
-            {t('✅ Subagent Created Successfully!')}
+            {t("✅ Subagent Created Successfully!")}
           </Text>
         </Box>
         <Box>
@@ -253,56 +230,50 @@ export function CreationSummary({
     <Box flexDirection="column" gap={1}>
       <Box flexDirection="column">
         <Box>
-          <Text color={theme.text.primary}>{t('Name: ')}</Text>
-          <Text color={getColorForDisplay(state.color)}>
-            {state.generatedName}
-          </Text>
+          <Text color={theme.text.primary}>{t("Name: ")}</Text>
+          <Text color={getColorForDisplay(state.color)}>{state.generatedName}</Text>
         </Box>
 
         <Box>
-          <Text color={theme.text.primary}>{t('Location: ')}</Text>
+          <Text color={theme.text.primary}>{t("Location: ")}</Text>
           <Text>
-            {state.location === 'project'
-              ? t('Project Level (.airiscode/agents/)')
-              : t('User Level (~/.airiscode/agents/)')}
+            {state.location === "project"
+              ? t("Project Level (.airiscode/agents/)")
+              : t("User Level (~/.airiscode/agents/)")}
           </Text>
         </Box>
 
         <Box>
-          <Text color={theme.text.primary}>{t('Tools: ')}</Text>
+          <Text color={theme.text.primary}>{t("Tools: ")}</Text>
           <Text>{toolsDisplay}</Text>
         </Box>
 
         {shouldShowColor(state.color) && (
           <Box>
-            <Text color={theme.text.primary}>{t('Color: ')}</Text>
+            <Text color={theme.text.primary}>{t("Color: ")}</Text>
             <Text color={getColorForDisplay(state.color)}>{state.color}</Text>
           </Box>
         )}
 
         <Box marginTop={1}>
-          <Text color={theme.text.primary}>{t('Description:')}</Text>
+          <Text color={theme.text.primary}>{t("Description:")}</Text>
         </Box>
         <Box padding={1} paddingBottom={0}>
-          <Text wrap="wrap">
-            {truncateText(state.generatedDescription, 250)}
-          </Text>
+          <Text wrap="wrap">{truncateText(state.generatedDescription, 250)}</Text>
         </Box>
 
         <Box marginTop={1}>
-          <Text color={theme.text.primary}>{t('System Prompt:')}</Text>
+          <Text color={theme.text.primary}>{t("System Prompt:")}</Text>
         </Box>
         <Box padding={1} paddingBottom={0}>
-          <Text wrap="wrap">
-            {truncateText(state.generatedSystemPrompt, 250)}
-          </Text>
+          <Text wrap="wrap">{truncateText(state.generatedSystemPrompt, 250)}</Text>
         </Box>
       </Box>
 
       {saveError && (
         <Box flexDirection="column">
           <Text bold color={theme.status.error}>
-            {t('❌ Error saving subagent:')}
+            {t("❌ Error saving subagent:")}
           </Text>
           <Box flexDirection="column" padding={1} paddingBottom={0}>
             <Text color={theme.status.error} wrap="wrap">
@@ -315,7 +286,7 @@ export function CreationSummary({
       {warnings.length > 0 && (
         <Box flexDirection="column">
           <Text bold color={theme.status.warning}>
-            {t('Warnings:')}
+            {t("Warnings:")}
           </Text>
           <Box flexDirection="column" padding={1} paddingBottom={0}>
             {warnings.map((warning, index) => (
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/DescriptionInput.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/DescriptionInput.tsx
index f52060cbb..5cc48b63c 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/DescriptionInput.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/DescriptionInput.tsx
@@ -4,34 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useRef } from 'react';
-import { Box, Text } from 'ink';
-import Spinner from 'ink-spinner';
-import type { WizardStepProps, WizardAction } from '../types.js';
-import { sanitizeInput } from '../utils.js';
-import { type Config, subagentGenerator } from '@airiscode/core';
-import { useKeypress, type Key } from '../../../hooks/useKeypress.js';
-import { keyMatchers, Command } from '../../../keyMatchers.js';
-import { theme } from '../../../semantic-colors.js';
-import { TextInput } from '../../shared/TextInput.js';
-import { t } from '../../../../i18n/index.js';
+import { type Config, subagentGenerator } from "@airiscode/core";
+import { Box, Text } from "ink";
+import Spinner from "ink-spinner";
+import { useCallback, useRef } from "react";
+import { t } from "../../../../i18n/index.js";
+import { type Key, useKeypress } from "../../../hooks/useKeypress.js";
+import { Command, keyMatchers } from "../../../keyMatchers.js";
+import { theme } from "../../../semantic-colors.js";
+import { TextInput } from "../../shared/TextInput.js";
+import type { WizardAction, WizardStepProps } from "../types.js";
+import { sanitizeInput } from "../utils.js";
 
 /**
  * Step 3: Description input with LLM generation.
  */
-export function DescriptionInput({
-  state,
-  dispatch,
-  onNext,
-  config,
-}: WizardStepProps) {
+export function DescriptionInput({ state, dispatch, onNext, config }: WizardStepProps) {
   const abortControllerRef = useRef<AbortController | null>(null);
 
   const handleTextChange = useCallback(
     (text: string) => {
       const sanitized = sanitizeInput(text);
       dispatch({
-        type: 'SET_USER_DESCRIPTION',
+        type: "SET_USER_DESCRIPTION",
         description: sanitized,
       });
     },
@@ -50,16 +45,12 @@ export function DescriptionInput({
       abortControllerRef.current = abortController;
 
       try {
-        const generated = await subagentGenerator(
-          userDescription,
-          config,
-          abortController.signal,
-        );
+        const generated = await subagentGenerator(userDescription, config, abortController.signal);
 
         // Only dispatch if not aborted
         if (!abortController.signal.aborted) {
           dispatch({
-            type: 'SET_GENERATED_CONTENT',
+            type: "SET_GENERATED_CONTENT",
             name: generated.name,
             description: generated.description,
             systemPrompt: generated.systemPrompt,
@@ -84,28 +75,28 @@ export function DescriptionInput({
     }
 
     // Start LLM generation
-    dispatch({ type: 'SET_GENERATING', isGenerating: true });
+    dispatch({ type: "SET_GENERATING", isGenerating: true });
 
     try {
       if (!config) {
-        throw new Error('Configuration not available');
+        throw new Error("Configuration not available");
       }
 
       // Use real LLM integration
       await handleGenerate(inputValue, dispatch, config);
     } catch (error) {
-      dispatch({ type: 'SET_GENERATING', isGenerating: false });
+      dispatch({ type: "SET_GENERATING", isGenerating: false });
 
       // Don't show error if it was cancelled by user
-      if (error instanceof Error && error.name === 'AbortError') {
+      if (error instanceof Error && error.name === "AbortError") {
         return;
       }
 
       dispatch({
-        type: 'SET_VALIDATION_ERRORS',
+        type: "SET_VALIDATION_ERRORS",
         errors: [
-          t('Failed to generate subagent: {{error}}', {
-            error: error instanceof Error ? error.message : 'Unknown error',
+          t("Failed to generate subagent: {{error}}", {
+            error: error instanceof Error ? error.message : "Unknown error",
           }),
         ],
       });
@@ -126,7 +117,7 @@ export function DescriptionInput({
         if (abortControllerRef.current) {
           // Cancel the ongoing generation
           abortControllerRef.current.abort();
-          dispatch({ type: 'SET_GENERATING', isGenerating: false });
+          dispatch({ type: "SET_GENERATING", isGenerating: false });
         }
       }
     },
@@ -138,16 +129,14 @@ export function DescriptionInput({
     isActive: state.isGenerating,
   });
 
-  const placeholder = t(
-    'e.g., Expert code reviewer that reviews code based on best practices...',
-  );
+  const placeholder = t("e.g., Expert code reviewer that reviews code based on best practices...");
 
   return (
     <Box flexDirection="column" gap={1}>
       <Box>
         <Text color={theme.text.secondary}>
           {t(
-            'Describe what this subagent should do and when it should be used. (Be comprehensive for best results)',
+            "Describe what this subagent should do and when it should be used. (Be comprehensive for best results)",
           )}
         </Text>
       </Box>
@@ -157,13 +146,11 @@ export function DescriptionInput({
           <Box marginRight={1}>
             <Spinner />
           </Box>
-          <Text color={theme.text.accent}>
-            {t('Generating subagent configuration...')}
-          </Text>
+          <Text color={theme.text.accent}>{t("Generating subagent configuration...")}</Text>
         </Box>
       ) : (
         <TextInput
-          value={state.userDescription || ''}
+          value={state.userDescription || ""}
           onChange={handleTextChange}
           onSubmit={handleSubmit}
           placeholder={placeholder}
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/GenerationMethodSelector.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/GenerationMethodSelector.tsx
index a0edbd941..639561600 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/GenerationMethodSelector.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/GenerationMethodSelector.tsx
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import type { WizardStepProps } from '../types.js';
-import { t } from '../../../../i18n/index.js';
+import { Box } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import type { WizardStepProps } from "../types.js";
 
 interface GenerationOption {
   label: string;
-  value: 'airiscode' | 'manual';
+  value: "airiscode" | "manual";
 }
 
 const generationOptions: GenerationOption[] = [
   {
     get label() {
-      return t('Generate with AIRIS Code (Recommended)');
+      return t("Generate with AIRIS Code (Recommended)");
     },
-    value: 'airiscode',
+    value: "airiscode",
   },
   {
     get label() {
-      return t('Manual Creation');
+      return t("Manual Creation");
     },
-    value: 'manual',
+    value: "manual",
   },
 ];
 
@@ -39,8 +39,8 @@ export function GenerationMethodSelector({
   onPrevious: _onPrevious,
 }: WizardStepProps) {
   const handleSelect = (selectedValue: string) => {
-    const method = selectedValue as 'airiscode' | 'manual';
-    dispatch({ type: 'SET_GENERATION_METHOD', method });
+    const method = selectedValue as "airiscode" | "manual";
+    dispatch({ type: "SET_GENERATION_METHOD", method });
     onNext();
   };
 
@@ -52,9 +52,7 @@ export function GenerationMethodSelector({
           label: option.label,
           value: option.value,
         }))}
-        initialIndex={generationOptions.findIndex(
-          (opt) => opt.value === state.generationMethod,
-        )}
+        initialIndex={generationOptions.findIndex((opt) => opt.value === state.generationMethod)}
         onSelect={handleSelect}
         isFocused={true}
       />
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/LocationSelector.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/LocationSelector.tsx
index 990b6b54b..1c15d6a4f 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/LocationSelector.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/LocationSelector.tsx
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import type { WizardStepProps } from '../types.js';
-import { t } from '../../../../i18n/index.js';
+import { Box } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import type { WizardStepProps } from "../types.js";
 
 interface LocationOption {
   label: string;
-  value: 'project' | 'user';
+  value: "project" | "user";
 }
 
 const locationOptions: LocationOption[] = [
   {
     get label() {
-      return t('Project Level (.airiscode/agents/)');
+      return t("Project Level (.airiscode/agents/)");
     },
-    value: 'project',
+    value: "project",
   },
   {
     get label() {
-      return t('User Level (~/.airiscode/agents/)');
+      return t("User Level (~/.airiscode/agents/)");
     },
-    value: 'user',
+    value: "user",
   },
 ];
 
@@ -34,8 +34,8 @@ const locationOptions: LocationOption[] = [
  */
 export function LocationSelector({ state, dispatch, onNext }: WizardStepProps) {
   const handleSelect = (selectedValue: string) => {
-    const location = selectedValue as 'project' | 'user';
-    dispatch({ type: 'SET_LOCATION', location });
+    const location = selectedValue as "project" | "user";
+    dispatch({ type: "SET_LOCATION", location });
     onNext();
   };
 
@@ -47,9 +47,7 @@ export function LocationSelector({ state, dispatch, onNext }: WizardStepProps) {
           label: option.label,
           value: option.value,
         }))}
-        initialIndex={locationOptions.findIndex(
-          (opt) => opt.value === state.location,
-        )}
+        initialIndex={locationOptions.findIndex((opt) => opt.value === state.location)}
         onSelect={handleSelect}
         isFocused={true}
       />
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/TextEntryStep.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/TextEntryStep.tsx
index 3e080765e..408864d99 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/TextEntryStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/TextEntryStep.tsx
@@ -4,14 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback } from 'react';
-import { Box, Text } from 'ink';
-import type { WizardStepProps } from '../types.js';
-import { theme } from '../../../semantic-colors.js';
-import { TextInput } from '../../shared/TextInput.js';
+import { Box, Text } from "ink";
+import { useCallback } from "react";
+import { theme } from "../../../semantic-colors.js";
+import { TextInput } from "../../shared/TextInput.js";
+import type { WizardStepProps } from "../types.js";
 
-interface TextEntryStepProps
-  extends Pick<WizardStepProps, 'dispatch' | 'onNext' | 'state'> {
+interface TextEntryStepProps extends Pick<WizardStepProps, "dispatch" | "onNext" | "state"> {
   description: string;
   placeholder?: string;
   /**
@@ -37,22 +36,18 @@ export function TextEntryStep({
   description,
   placeholder,
   height = 1,
-  initialText = '',
+  initialText = "",
   onChange,
   validate,
 }: TextEntryStepProps) {
   const submit = useCallback(() => {
-    const value = initialText ? initialText.trim() : '';
-    const error = validate
-      ? validate(value)
-      : value.length === 0
-        ? 'Please enter a value.'
-        : null;
+    const value = initialText ? initialText.trim() : "";
+    const error = validate ? validate(value) : value.length === 0 ? "Please enter a value." : null;
     if (error) {
-      dispatch({ type: 'SET_VALIDATION_ERRORS', errors: [error] });
+      dispatch({ type: "SET_VALIDATION_ERRORS", errors: [error] });
       return;
     }
-    dispatch({ type: 'SET_VALIDATION_ERRORS', errors: [] });
+    dispatch({ type: "SET_VALIDATION_ERRORS", errors: [] });
     onNext();
   }, [dispatch, onNext, validate, initialText]);
 
diff --git a/apps/airiscode-cli/src/ui/components/subagents/create/ToolSelector.tsx b/apps/airiscode-cli/src/ui/components/subagents/create/ToolSelector.tsx
index 561deb9fc..819b0307d 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/create/ToolSelector.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/create/ToolSelector.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useMemo, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import type { ToolCategory } from '../types.js';
-import { Kind, type Config } from '@airiscode/core';
-import { theme } from '../../../semantic-colors.js';
-import { t } from '../../../../i18n/index.js';
+import { type Config, Kind } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useEffect, useMemo, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { theme } from "../../../semantic-colors.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import type { ToolCategory } from "../types.js";
 
 interface ToolOption {
   label: string;
@@ -27,33 +27,23 @@ interface ToolSelectorProps {
 /**
  * Tool selection with categories.
  */
-export function ToolSelector({
-  tools = [],
-  onSelect,
-  config,
-}: ToolSelectorProps) {
+export function ToolSelector({ tools = [], onSelect, config }: ToolSelectorProps) {
   // Generate tool categories from actual tool registry
-  const {
-    toolCategories,
-    readTools,
-    editTools,
-    executeTools,
-    initialCategory,
-  } = useMemo(() => {
+  const { toolCategories, readTools, editTools, executeTools, initialCategory } = useMemo(() => {
     if (!config) {
       // Fallback categories if config not available
       return {
         toolCategories: [
           {
-            id: 'all',
-            name: t('All Tools (Default)'),
+            id: "all",
+            name: t("All Tools (Default)"),
             tools: [],
           },
         ],
         readTools: [],
         editTools: [],
         executeTools: [],
-        initialCategory: 'all',
+        initialCategory: "all",
       };
     }
 
@@ -74,10 +64,7 @@ export function ToolSelector({
 
     const editTools = allTools
       .filter(
-        (tool) =>
-          tool.kind === Kind.Edit ||
-          tool.kind === Kind.Delete ||
-          tool.kind === Kind.Move,
+        (tool) => tool.kind === Kind.Edit || tool.kind === Kind.Delete || tool.kind === Kind.Move,
       )
       .map((tool) => tool.displayName)
       .sort();
@@ -89,37 +76,37 @@ export function ToolSelector({
 
     const toolCategories = [
       {
-        id: 'all',
-        name: t('All Tools'),
+        id: "all",
+        name: t("All Tools"),
         tools: [],
       },
       {
-        id: 'read',
-        name: t('Read-only Tools'),
+        id: "read",
+        name: t("Read-only Tools"),
         tools: readTools,
       },
       {
-        id: 'edit',
-        name: t('Read & Edit Tools'),
+        id: "edit",
+        name: t("Read & Edit Tools"),
         tools: [...readTools, ...editTools],
       },
       {
-        id: 'execute',
-        name: t('Read & Edit & Execution Tools'),
+        id: "execute",
+        name: t("Read & Edit & Execution Tools"),
         tools: [...readTools, ...editTools, ...executeTools],
       },
-    ].filter((category) => category.id === 'all' || category.tools.length > 0);
+    ].filter((category) => category.id === "all" || category.tools.length > 0);
 
     // Determine initial category based on tools prop
-    let initialCategory = 'all'; // default to first option
+    let initialCategory = "all"; // default to first option
 
     if (tools.length === 0) {
       // Empty array represents all tools
-      initialCategory = 'all';
+      initialCategory = "all";
     } else {
       // Try to match tools array to a category
       const matchingCategory = toolCategories.find((category) => {
-        if (category.id === 'all') return false;
+        if (category.id === "all") return false;
 
         // Check if the tools array exactly matches this category's tools
         const categoryToolsSet = new Set(category.tools);
@@ -146,8 +133,7 @@ export function ToolSelector({
     };
   }, [config, tools]);
 
-  const [selectedCategory, setSelectedCategory] =
-    useState<string>(initialCategory);
+  const [selectedCategory, setSelectedCategory] = useState<string>(initialCategory);
 
   // Update selected category when initialCategory changes (when tools prop changes)
   useEffect(() => {
@@ -167,7 +153,7 @@ export function ToolSelector({
   const handleSelect = (selectedValue: string) => {
     const category = toolCategories.find((cat) => cat.id === selectedValue);
     if (category) {
-      if (category.id === 'all') {
+      if (category.id === "all") {
         onSelect([]); // Empty array for 'all'
       } else {
         onSelect(category.tools);
@@ -176,9 +162,7 @@ export function ToolSelector({
   };
 
   // Get the currently selected category for displaying tools
-  const currentCategory = toolCategories.find(
-    (cat) => cat.id === selectedCategory,
-  );
+  const currentCategory = toolCategories.find((cat) => cat.id === selectedCategory);
 
   return (
     <Box flexDirection="column" gap={1}>
@@ -189,9 +173,7 @@ export function ToolSelector({
             label: option.label,
             value: option.value,
           }))}
-          initialIndex={toolOptions.findIndex(
-            (opt) => opt.value === selectedCategory,
-          )}
+          initialIndex={toolOptions.findIndex((opt) => opt.value === selectedCategory)}
           onSelect={handleSelect}
           onHighlight={handleHighlight}
           isFocused={true}
@@ -201,43 +183,39 @@ export function ToolSelector({
       {/* Show help information or tools for selected category */}
       {currentCategory && (
         <Box flexDirection="column">
-          {currentCategory.id === 'all' ? (
-            <Text color={theme.text.secondary}>
-              {t('All tools selected, including MCP tools')}
-            </Text>
+          {currentCategory.id === "all" ? (
+            <Text color={theme.text.secondary}>{t("All tools selected, including MCP tools")}</Text>
           ) : currentCategory.tools.length > 0 ? (
             <>
-              <Text color={theme.text.secondary}>{t('Selected tools:')}</Text>
+              <Text color={theme.text.secondary}>{t("Selected tools:")}</Text>
               <Box flexDirection="column" marginLeft={2}>
                 {(() => {
                   // Filter the already categorized tools to show only those in current category
-                  const categoryReadTools = currentCategory.tools.filter(
-                    (tool) => readTools.includes(tool),
+                  const categoryReadTools = currentCategory.tools.filter((tool) =>
+                    readTools.includes(tool),
                   );
-                  const categoryEditTools = currentCategory.tools.filter(
-                    (tool) => editTools.includes(tool),
+                  const categoryEditTools = currentCategory.tools.filter((tool) =>
+                    editTools.includes(tool),
                   );
-                  const categoryExecuteTools = currentCategory.tools.filter(
-                    (tool) => executeTools.includes(tool),
+                  const categoryExecuteTools = currentCategory.tools.filter((tool) =>
+                    executeTools.includes(tool),
                   );
 
                   return (
                     <>
                       {categoryReadTools.length > 0 && (
                         <Text color={theme.text.secondary}>
-                          • {t('Read-only tools:')}{' '}
-                          {categoryReadTools.join(', ')}
+                          • {t("Read-only tools:")} {categoryReadTools.join(", ")}
                         </Text>
                       )}
                       {categoryEditTools.length > 0 && (
                         <Text color={theme.text.secondary}>
-                          • {t('Edit tools:')} {categoryEditTools.join(', ')}
+                          • {t("Edit tools:")} {categoryEditTools.join(", ")}
                         </Text>
                       )}
                       {categoryExecuteTools.length > 0 && (
                         <Text color={theme.text.secondary}>
-                          • {t('Execution tools:')}{' '}
-                          {categoryExecuteTools.join(', ')}
+                          • {t("Execution tools:")} {categoryExecuteTools.join(", ")}
                         </Text>
                       )}
                     </>
diff --git a/apps/airiscode-cli/src/ui/components/subagents/index.ts b/apps/airiscode-cli/src/ui/components/subagents/index.ts
index 8f22a244d..56fd143bd 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/index.ts
+++ b/apps/airiscode-cli/src/ui/components/subagents/index.ts
@@ -5,10 +5,10 @@
  */
 
 // Creation Wizard
-export { AgentCreationWizard } from './create/AgentCreationWizard.js';
+export { AgentCreationWizard } from "./create/AgentCreationWizard.js";
 
 // Management Dialog
-export { AgentsManagerDialog } from './manage/AgentsManagerDialog.js';
+export { AgentsManagerDialog } from "./manage/AgentsManagerDialog.js";
 
 // Execution Display
-export { AgentExecutionDisplay } from './runtime/AgentExecutionDisplay.js';
+export { AgentExecutionDisplay } from "./runtime/AgentExecutionDisplay.js";
diff --git a/apps/airiscode-cli/src/ui/components/subagents/manage/ActionSelectionStep.tsx b/apps/airiscode-cli/src/ui/components/subagents/manage/ActionSelectionStep.tsx
index a07c24ba2..0761c2bca 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/manage/ActionSelectionStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/manage/ActionSelectionStep.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState } from 'react';
-import { Box } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import { MANAGEMENT_STEPS } from '../types.js';
-import { type SubagentConfig } from '@airiscode/core';
-import { t } from '../../../../i18n/index.js';
+import { type SubagentConfig } from "@airiscode/core";
+import { Box } from "ink";
+import { useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import { MANAGEMENT_STEPS } from "../types.js";
 
 interface ActionSelectionStepProps {
   selectedAgent: SubagentConfig | null;
@@ -22,54 +22,49 @@ export const ActionSelectionStep = ({
   onNavigateToStep,
   onNavigateBack,
 }: ActionSelectionStepProps) => {
-  const [selectedAction, setSelectedAction] = useState<
-    'view' | 'edit' | 'delete' | null
-  >(null);
+  const [selectedAction, setSelectedAction] = useState<"view" | "edit" | "delete" | null>(null);
 
   // Filter actions based on whether the agent is built-in
   const allActions = [
     {
-      key: 'view',
+      key: "view",
       get label() {
-        return t('View Agent');
+        return t("View Agent");
       },
-      value: 'view' as const,
+      value: "view" as const,
     },
     {
-      key: 'edit',
+      key: "edit",
       get label() {
-        return t('Edit Agent');
+        return t("Edit Agent");
       },
-      value: 'edit' as const,
+      value: "edit" as const,
     },
     {
-      key: 'delete',
+      key: "delete",
       get label() {
-        return t('Delete Agent');
+        return t("Delete Agent");
       },
-      value: 'delete' as const,
+      value: "delete" as const,
     },
     {
-      key: 'back',
+      key: "back",
       get label() {
-        return t('Back');
+        return t("Back");
       },
-      value: 'back' as const,
+      value: "back" as const,
     },
   ];
 
   // Extension-level agents are also read-only (like builtin)
-  const isReadOnly =
-    selectedAgent?.isBuiltin || selectedAgent?.level === 'extension';
+  const isReadOnly = selectedAgent?.isBuiltin || selectedAgent?.level === "extension";
 
   const actions = isReadOnly
-    ? allActions.filter(
-        (action) => action.value === 'view' || action.value === 'back',
-      )
+    ? allActions.filter((action) => action.value === "view" || action.value === "back")
     : allActions;
 
-  const handleActionSelect = (value: 'view' | 'edit' | 'delete' | 'back') => {
-    if (value === 'back') {
+  const handleActionSelect = (value: "view" | "edit" | "delete" | "back") => {
+    if (value === "back") {
       onNavigateBack();
       return;
     }
@@ -77,11 +72,11 @@ export const ActionSelectionStep = ({
     setSelectedAction(value);
 
     // Navigate to appropriate step based on action
-    if (value === 'view') {
+    if (value === "view") {
       onNavigateToStep(MANAGEMENT_STEPS.AGENT_VIEWER);
-    } else if (value === 'edit') {
+    } else if (value === "edit") {
       onNavigateToStep(MANAGEMENT_STEPS.EDIT_OPTIONS);
-    } else if (value === 'delete') {
+    } else if (value === "delete") {
       onNavigateToStep(MANAGEMENT_STEPS.DELETE_CONFIRMATION);
     }
   };
diff --git a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentDeleteStep.tsx b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentDeleteStep.tsx
index 802fbb3ea..bf1b6b991 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentDeleteStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentDeleteStep.tsx
@@ -4,38 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { type SubagentConfig } from '@airiscode/core';
-import { createDebugLogger } from '@airiscode/core';
-import type { StepNavigationProps } from '../types.js';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
+import { createDebugLogger, type SubagentConfig } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import type { StepNavigationProps } from "../types.js";
 
 interface AgentDeleteStepProps extends StepNavigationProps {
   selectedAgent: SubagentConfig | null;
   onDelete: (agent: SubagentConfig) => Promise<void>;
 }
 
-const debugLogger = createDebugLogger('AGENT_DELETE_STEP');
+const debugLogger = createDebugLogger("AGENT_DELETE_STEP");
 
-export function AgentDeleteStep({
-  selectedAgent,
-  onDelete,
-  onNavigateBack,
-}: AgentDeleteStepProps) {
+export function AgentDeleteStep({ selectedAgent, onDelete, onNavigateBack }: AgentDeleteStepProps) {
   useKeypress(
     async (key) => {
       if (!selectedAgent) return;
 
-      if (key.name === 'y' || key.name === 'return') {
+      if (key.name === "y" || key.name === "return") {
         try {
           await onDelete(selectedAgent);
           // Navigation will be handled by the parent component after successful deletion
         } catch (error) {
-          debugLogger.error('Failed to delete agent:', error);
+          debugLogger.error("Failed to delete agent:", error);
         }
-      } else if (key.name === 'n') {
+      } else if (key.name === "n") {
         onNavigateBack();
       }
     },
@@ -45,7 +40,7 @@ export function AgentDeleteStep({
   if (!selectedAgent) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No agent selected')}</Text>
+        <Text color={theme.status.error}>{t("No agent selected")}</Text>
       </Box>
     );
   }
diff --git a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentEditStep.tsx b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentEditStep.tsx
index 3878c81d7..0168c2488 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentEditStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentEditStep.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import { Box, Text } from 'ink';
-import { RadioButtonSelect } from '../../shared/RadioButtonSelect.js';
-import { MANAGEMENT_STEPS } from '../types.js';
-import { theme } from '../../../semantic-colors.js';
-import { useLaunchEditor } from '../../../hooks/useLaunchEditor.js';
-import { type SubagentConfig } from '@airiscode/core';
-import { t } from '../../../../i18n/index.js';
+import { type SubagentConfig } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useLaunchEditor } from "../../../hooks/useLaunchEditor.js";
+import { theme } from "../../../semantic-colors.js";
+import { RadioButtonSelect } from "../../shared/RadioButtonSelect.js";
+import { MANAGEMENT_STEPS } from "../types.js";
 
 interface EditOption {
   id: string;
@@ -20,21 +20,21 @@ interface EditOption {
 
 const editOptions: EditOption[] = [
   {
-    id: 'editor',
+    id: "editor",
     get label() {
-      return t('Open in editor');
+      return t("Open in editor");
     },
   },
   {
-    id: 'tools',
+    id: "tools",
     get label() {
-      return t('Edit tools');
+      return t("Edit tools");
     },
   },
   {
-    id: 'color',
+    id: "color",
     get label() {
-      return t('Edit color');
+      return t("Edit color");
     },
   },
 ];
@@ -47,11 +47,8 @@ interface EditOptionsStepProps {
 /**
  * Edit options selection step - choose what to edit about the agent.
  */
-export function EditOptionsStep({
-  selectedAgent,
-  onNavigateToStep,
-}: EditOptionsStepProps) {
-  const [selectedOption, setSelectedOption] = useState<string>('editor');
+export function EditOptionsStep({ selectedAgent, onNavigateToStep }: EditOptionsStepProps) {
+  const [selectedOption, setSelectedOption] = useState<string>("editor");
   const [error, setError] = useState<string | null>(null);
 
   const launchEditor = useLaunchEditor();
@@ -66,23 +63,23 @@ export function EditOptionsStep({
 
       setError(null);
 
-      if (selectedValue === 'editor') {
+      if (selectedValue === "editor") {
         // Launch editor directly
         try {
           if (!selectedAgent.filePath) {
-            throw new Error('Agent has no file path');
+            throw new Error("Agent has no file path");
           }
           await launchEditor(selectedAgent.filePath);
         } catch (err) {
           setError(
-            t('Failed to launch editor: {{error}}', {
-              error: err instanceof Error ? err.message : 'Unknown error',
+            t("Failed to launch editor: {{error}}", {
+              error: err instanceof Error ? err.message : "Unknown error",
             }),
           );
         }
-      } else if (selectedValue === 'tools') {
+      } else if (selectedValue === "tools") {
         onNavigateToStep(MANAGEMENT_STEPS.EDIT_TOOLS);
-      } else if (selectedValue === 'color') {
+      } else if (selectedValue === "color") {
         onNavigateToStep(MANAGEMENT_STEPS.EDIT_COLOR);
       }
     },
@@ -98,9 +95,7 @@ export function EditOptionsStep({
             label: option.label,
             value: option.id,
           }))}
-          initialIndex={editOptions.findIndex(
-            (opt) => opt.id === selectedOption,
-          )}
+          initialIndex={editOptions.findIndex((opt) => opt.id === selectedOption)}
           onSelect={handleSelect}
           onHighlight={handleHighlight}
           isFocused={true}
@@ -110,7 +105,7 @@ export function EditOptionsStep({
       {error && (
         <Box flexDirection="column">
           <Text bold color={theme.status.error}>
-            {t('❌ Error:')}
+            {t("❌ Error:")}
           </Text>
           <Box flexDirection="column" padding={1} paddingBottom={0}>
             <Text color={theme.status.error} wrap="wrap">
diff --git a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentSelectionStep.tsx b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentSelectionStep.tsx
index dd09651a2..b1ceb131e 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentSelectionStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentSelectionStep.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { type SubagentConfig } from '@airiscode/core';
-import { t } from '../../../../i18n/index.js';
+import { type SubagentConfig } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useEffect, useMemo, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
 
 interface NavigationState {
-  currentBlock: 'project' | 'user' | 'builtin' | 'extension';
+  currentBlock: "project" | "user" | "builtin" | "extension";
   projectIndex: number;
   userIndex: number;
   builtinIndex: number;
@@ -24,12 +24,9 @@ interface AgentSelectionStepProps {
   onAgentSelect: (agentIndex: number) => void;
 }
 
-export const AgentSelectionStep = ({
-  availableAgents,
-  onAgentSelect,
-}: AgentSelectionStepProps) => {
+export const AgentSelectionStep = ({ availableAgents, onAgentSelect }: AgentSelectionStepProps) => {
   const [navigation, setNavigation] = useState<NavigationState>({
-    currentBlock: 'project',
+    currentBlock: "project",
     projectIndex: 0,
     userIndex: 0,
     builtinIndex: 0,
@@ -38,19 +35,19 @@ export const AgentSelectionStep = ({
 
   // Group agents by level
   const projectAgents = useMemo(
-    () => availableAgents.filter((agent) => agent.level === 'project'),
+    () => availableAgents.filter((agent) => agent.level === "project"),
     [availableAgents],
   );
   const userAgents = useMemo(
-    () => availableAgents.filter((agent) => agent.level === 'user'),
+    () => availableAgents.filter((agent) => agent.level === "user"),
     [availableAgents],
   );
   const builtinAgents = useMemo(
-    () => availableAgents.filter((agent) => agent.level === 'builtin'),
+    () => availableAgents.filter((agent) => agent.level === "builtin"),
     [availableAgents],
   );
   const extensionAgents = useMemo(
-    () => availableAgents.filter((agent) => agent.level === 'extension'),
+    () => availableAgents.filter((agent) => agent.level === "extension"),
     [availableAgents],
   );
   const projectNames = useMemo(
@@ -61,13 +58,13 @@ export const AgentSelectionStep = ({
   // Initialize navigation state when agents are loaded (only once)
   useEffect(() => {
     if (projectAgents.length > 0) {
-      setNavigation((prev) => ({ ...prev, currentBlock: 'project' }));
+      setNavigation((prev) => ({ ...prev, currentBlock: "project" }));
     } else if (userAgents.length > 0) {
-      setNavigation((prev) => ({ ...prev, currentBlock: 'user' }));
+      setNavigation((prev) => ({ ...prev, currentBlock: "user" }));
     } else if (builtinAgents.length > 0) {
-      setNavigation((prev) => ({ ...prev, currentBlock: 'builtin' }));
+      setNavigation((prev) => ({ ...prev, currentBlock: "builtin" }));
     } else if (extensionAgents.length > 0) {
-      setNavigation((prev) => ({ ...prev, currentBlock: 'extension' }));
+      setNavigation((prev) => ({ ...prev, currentBlock: "extension" }));
     }
   }, [projectAgents, userAgents, builtinAgents, extensionAgents]);
 
@@ -76,65 +73,65 @@ export const AgentSelectionStep = ({
     (key) => {
       const { name } = key;
 
-      if (name === 'up' || name === 'k') {
+      if (name === "up" || name === "k") {
         setNavigation((prev) => {
-          if (prev.currentBlock === 'project') {
+          if (prev.currentBlock === "project") {
             if (prev.projectIndex > 0) {
               return { ...prev, projectIndex: prev.projectIndex - 1 };
             } else if (builtinAgents.length > 0) {
               // Move to last item in builtin block
               return {
                 ...prev,
-                currentBlock: 'builtin',
+                currentBlock: "builtin",
                 builtinIndex: builtinAgents.length - 1,
               };
             } else if (userAgents.length > 0) {
               // Move to last item in user block
               return {
                 ...prev,
-                currentBlock: 'user',
+                currentBlock: "user",
                 userIndex: userAgents.length - 1,
               };
             } else if (extensionAgents.length > 0) {
               // Move to last item in extension block
               return {
                 ...prev,
-                currentBlock: 'extension',
+                currentBlock: "extension",
                 extensionIndex: extensionAgents.length - 1,
               };
             } else {
               // Wrap to last item in project block
               return { ...prev, projectIndex: projectAgents.length - 1 };
             }
-          } else if (prev.currentBlock === 'user') {
+          } else if (prev.currentBlock === "user") {
             if (prev.userIndex > 0) {
               return { ...prev, userIndex: prev.userIndex - 1 };
             } else if (projectAgents.length > 0) {
               // Move to last item in project block
               return {
                 ...prev,
-                currentBlock: 'project',
+                currentBlock: "project",
                 projectIndex: projectAgents.length - 1,
               };
             } else if (builtinAgents.length > 0) {
               // Move to last item in builtin block
               return {
                 ...prev,
-                currentBlock: 'builtin',
+                currentBlock: "builtin",
                 builtinIndex: builtinAgents.length - 1,
               };
             } else if (extensionAgents.length > 0) {
               // Move to last item in extension block
               return {
                 ...prev,
-                currentBlock: 'extension',
+                currentBlock: "extension",
                 extensionIndex: extensionAgents.length - 1,
               };
             } else {
               // Wrap to last item in user block
               return { ...prev, userIndex: userAgents.length - 1 };
             }
-          } else if (prev.currentBlock === 'builtin') {
+          } else if (prev.currentBlock === "builtin") {
             // builtin block
             if (prev.builtinIndex > 0) {
               return { ...prev, builtinIndex: prev.builtinIndex - 1 };
@@ -142,21 +139,21 @@ export const AgentSelectionStep = ({
               // Move to last item in user block
               return {
                 ...prev,
-                currentBlock: 'user',
+                currentBlock: "user",
                 userIndex: userAgents.length - 1,
               };
             } else if (projectAgents.length > 0) {
               // Move to last item in project block
               return {
                 ...prev,
-                currentBlock: 'project',
+                currentBlock: "project",
                 projectIndex: projectAgents.length - 1,
               };
             } else if (extensionAgents.length > 0) {
               // Move to last item in extension block
               return {
                 ...prev,
-                currentBlock: 'extension',
+                currentBlock: "extension",
                 extensionIndex: extensionAgents.length - 1,
               };
             } else {
@@ -171,21 +168,21 @@ export const AgentSelectionStep = ({
               // Move to last item in user block
               return {
                 ...prev,
-                currentBlock: 'user',
+                currentBlock: "user",
                 userIndex: userAgents.length - 1,
               };
             } else if (projectAgents.length > 0) {
               // Move to last item in project block
               return {
                 ...prev,
-                currentBlock: 'project',
+                currentBlock: "project",
                 projectIndex: projectAgents.length - 1,
               };
             } else if (builtinAgents.length > 0) {
               // Move to last item in builtin block
               return {
                 ...prev,
-                currentBlock: 'builtin',
+                currentBlock: "builtin",
                 builtinIndex: builtinAgents.length - 1,
               };
             } else {
@@ -194,53 +191,53 @@ export const AgentSelectionStep = ({
             }
           }
         });
-      } else if (name === 'down' || name === 'j') {
+      } else if (name === "down" || name === "j") {
         setNavigation((prev) => {
-          if (prev.currentBlock === 'project') {
+          if (prev.currentBlock === "project") {
             if (prev.projectIndex < projectAgents.length - 1) {
               return { ...prev, projectIndex: prev.projectIndex + 1 };
             } else if (userAgents.length > 0) {
               // Move to first item in user block
-              return { ...prev, currentBlock: 'user', userIndex: 0 };
+              return { ...prev, currentBlock: "user", userIndex: 0 };
             } else if (builtinAgents.length > 0) {
               // Move to first item in builtin block
-              return { ...prev, currentBlock: 'builtin', builtinIndex: 0 };
+              return { ...prev, currentBlock: "builtin", builtinIndex: 0 };
             } else if (extensionAgents.length > 0) {
               // Move to first item in extension block
-              return { ...prev, currentBlock: 'extension', extensionIndex: 0 };
+              return { ...prev, currentBlock: "extension", extensionIndex: 0 };
             } else {
               // Wrap to first item in project block
               return { ...prev, projectIndex: 0 };
             }
-          } else if (prev.currentBlock === 'user') {
+          } else if (prev.currentBlock === "user") {
             if (prev.userIndex < userAgents.length - 1) {
               return { ...prev, userIndex: prev.userIndex + 1 };
             } else if (builtinAgents.length > 0) {
               // Move to first item in builtin block
-              return { ...prev, currentBlock: 'builtin', builtinIndex: 0 };
+              return { ...prev, currentBlock: "builtin", builtinIndex: 0 };
             } else if (extensionAgents.length > 0) {
               // Move to first item in extension block
-              return { ...prev, currentBlock: 'extension', extensionIndex: 0 };
+              return { ...prev, currentBlock: "extension", extensionIndex: 0 };
             } else if (projectAgents.length > 0) {
               // Move to first item in project block
-              return { ...prev, currentBlock: 'project', projectIndex: 0 };
+              return { ...prev, currentBlock: "project", projectIndex: 0 };
             } else {
               // Wrap to first item in user block
               return { ...prev, userIndex: 0 };
             }
-          } else if (prev.currentBlock === 'builtin') {
+          } else if (prev.currentBlock === "builtin") {
             // builtin block
             if (prev.builtinIndex < builtinAgents.length - 1) {
               return { ...prev, builtinIndex: prev.builtinIndex + 1 };
             } else if (extensionAgents.length > 0) {
               // Move to first item in extension block
-              return { ...prev, currentBlock: 'extension', extensionIndex: 0 };
+              return { ...prev, currentBlock: "extension", extensionIndex: 0 };
             } else if (projectAgents.length > 0) {
               // Move to first item in project block
-              return { ...prev, currentBlock: 'project', projectIndex: 0 };
+              return { ...prev, currentBlock: "project", projectIndex: 0 };
             } else if (userAgents.length > 0) {
               // Move to first item in user block
-              return { ...prev, currentBlock: 'user', userIndex: 0 };
+              return { ...prev, currentBlock: "user", userIndex: 0 };
             } else {
               // Wrap to first item in builtin block
               return { ...prev, builtinIndex: 0 };
@@ -251,31 +248,30 @@ export const AgentSelectionStep = ({
               return { ...prev, extensionIndex: prev.extensionIndex + 1 };
             } else if (projectAgents.length > 0) {
               // Move to first item in project block
-              return { ...prev, currentBlock: 'project', projectIndex: 0 };
+              return { ...prev, currentBlock: "project", projectIndex: 0 };
             } else if (userAgents.length > 0) {
               // Move to first item in user block
-              return { ...prev, currentBlock: 'user', userIndex: 0 };
+              return { ...prev, currentBlock: "user", userIndex: 0 };
             } else if (builtinAgents.length > 0) {
               // Move to first item in builtin block
-              return { ...prev, currentBlock: 'builtin', builtinIndex: 0 };
+              return { ...prev, currentBlock: "builtin", builtinIndex: 0 };
             } else {
               // Wrap to first item in extension block
               return { ...prev, extensionIndex: 0 };
             }
           }
         });
-      } else if (name === 'return' || name === 'space') {
+      } else if (name === "return" || name === "space") {
         // Calculate global index and select current item
         let globalIndex: number;
-        if (navigation.currentBlock === 'project') {
+        if (navigation.currentBlock === "project") {
           globalIndex = navigation.projectIndex;
-        } else if (navigation.currentBlock === 'user') {
+        } else if (navigation.currentBlock === "user") {
           // User agents come after project agents in the availableAgents array
           globalIndex = projectAgents.length + navigation.userIndex;
-        } else if (navigation.currentBlock === 'builtin') {
+        } else if (navigation.currentBlock === "builtin") {
           // Builtin agents come after project and user agents in the availableAgents array
-          globalIndex =
-            projectAgents.length + userAgents.length + navigation.builtinIndex;
+          globalIndex = projectAgents.length + userAgents.length + navigation.builtinIndex;
         } else {
           // Extension agents come after project, user, and builtin agents
           globalIndex =
@@ -296,7 +292,7 @@ export const AgentSelectionStep = ({
   if (availableAgents.length === 0) {
     return (
       <Box flexDirection="column">
-        <Text color={theme.text.secondary}>{t('No subagents found.')}</Text>
+        <Text color={theme.text.secondary}>{t("No subagents found.")}</Text>
         <Text color={theme.text.secondary}>
           {t("Use '/agents create' to create your first subagent.")}
         </Text>
@@ -308,7 +304,7 @@ export const AgentSelectionStep = ({
   const renderAgentItem = (
     agent: {
       name: string;
-      level: 'project' | 'user' | 'builtin' | 'session' | 'extension';
+      level: "project" | "user" | "builtin" | "session" | "extension";
       isBuiltin?: boolean;
     },
     index: number,
@@ -320,23 +316,21 @@ export const AgentSelectionStep = ({
       <Box key={`${agent.name}-${agent.level}`} alignItems="center">
         <Box minWidth={2} flexShrink={0}>
           <Text color={isSelected ? theme.text.accent : theme.text.primary}>
-            {isSelected ? '●' : ' '}
+            {isSelected ? "●" : " "}
           </Text>
         </Box>
         <Text color={textColor} wrap="truncate">
           {agent.name}
           {agent.isBuiltin && (
             <Text color={isSelected ? theme.text.accent : theme.text.secondary}>
-              {' '}
-              {t('(built-in)')}
+              {" "}
+              {t("(built-in)")}
             </Text>
           )}
-          {agent.level === 'user' && projectNames.has(agent.name) && (
-            <Text
-              color={isSelected ? theme.status.warning : theme.text.secondary}
-            >
-              {' '}
-              {t('(overridden by project level agent)')}
+          {agent.level === "user" && projectNames.has(agent.name) && (
+            <Text color={isSelected ? theme.status.warning : theme.text.secondary}>
+              {" "}
+              {t("(overridden by project level agent)")}
             </Text>
           )}
         </Text>
@@ -357,15 +351,14 @@ export const AgentSelectionStep = ({
       {projectAgents.length > 0 && (
         <Box flexDirection="column" marginBottom={1}>
           <Text color={theme.text.primary} bold>
-            {t('Project Level ({{path}})', {
-              path: projectAgents[0].filePath?.replace(/\/[^/]+$/, '') || '',
+            {t("Project Level ({{path}})", {
+              path: projectAgents[0].filePath?.replace(/\/[^/]+$/, "") || "",
             })}
           </Text>
           <Box marginTop={1} flexDirection="column">
             {projectAgents.map((agent, index) => {
               const isSelected =
-                navigation.currentBlock === 'project' &&
-                navigation.projectIndex === index;
+                navigation.currentBlock === "project" && navigation.projectIndex === index;
               return renderAgentItem(agent, index, isSelected);
             })}
           </Box>
@@ -374,20 +367,16 @@ export const AgentSelectionStep = ({
 
       {/* User Level Agents */}
       {userAgents.length > 0 && (
-        <Box
-          flexDirection="column"
-          marginBottom={builtinAgents.length > 0 ? 1 : 0}
-        >
+        <Box flexDirection="column" marginBottom={builtinAgents.length > 0 ? 1 : 0}>
           <Text color={theme.text.primary} bold>
-            {t('User Level ({{path}})', {
-              path: userAgents[0].filePath?.replace(/\/[^/]+$/, '') || '',
+            {t("User Level ({{path}})", {
+              path: userAgents[0].filePath?.replace(/\/[^/]+$/, "") || "",
             })}
           </Text>
           <Box marginTop={1} flexDirection="column">
             {userAgents.map((agent, index) => {
               const isSelected =
-                navigation.currentBlock === 'user' &&
-                navigation.userIndex === index;
+                navigation.currentBlock === "user" && navigation.userIndex === index;
               return renderAgentItem(agent, index, isSelected);
             })}
           </Box>
@@ -396,18 +385,14 @@ export const AgentSelectionStep = ({
 
       {/* Built-in Agents */}
       {builtinAgents.length > 0 && (
-        <Box
-          flexDirection="column"
-          marginBottom={extensionAgents.length > 0 ? 1 : 0}
-        >
+        <Box flexDirection="column" marginBottom={extensionAgents.length > 0 ? 1 : 0}>
           <Text color={theme.text.primary} bold>
-            {t('Built-in Agents')}
+            {t("Built-in Agents")}
           </Text>
           <Box marginTop={1} flexDirection="column">
             {builtinAgents.map((agent, index) => {
               const isSelected =
-                navigation.currentBlock === 'builtin' &&
-                navigation.builtinIndex === index;
+                navigation.currentBlock === "builtin" && navigation.builtinIndex === index;
               return renderAgentItem(agent, index, isSelected);
             })}
           </Box>
@@ -418,13 +403,12 @@ export const AgentSelectionStep = ({
       {extensionAgents.length > 0 && (
         <Box flexDirection="column">
           <Text color={theme.text.primary} bold>
-            {t('Extension Agents')}
+            {t("Extension Agents")}
           </Text>
           <Box marginTop={1} flexDirection="column">
             {extensionAgents.map((agent, index) => {
               const isSelected =
-                navigation.currentBlock === 'extension' &&
-                navigation.extensionIndex === index;
+                navigation.currentBlock === "extension" && navigation.extensionIndex === index;
               return renderAgentItem(agent, index, isSelected);
             })}
           </Box>
@@ -438,7 +422,7 @@ export const AgentSelectionStep = ({
         extensionAgents.length > 0) && (
         <Box marginTop={1}>
           <Text color={theme.text.secondary}>
-            {t('Using: {{count}} agents', {
+            {t("Using: {{count}} agents", {
               count: enabledAgentsCount.toString(),
             })}
           </Text>
diff --git a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentViewerStep.tsx b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentViewerStep.tsx
index b390cb98d..762103a75 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentViewerStep.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentViewerStep.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../../../semantic-colors.js';
-import { shouldShowColor, getColorForDisplay } from '../utils.js';
-import { type SubagentConfig } from '@airiscode/core';
-import { t } from '../../../../i18n/index.js';
+import { type SubagentConfig } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { t } from "../../../../i18n/index.js";
+import { theme } from "../../../semantic-colors.js";
+import { getColorForDisplay, shouldShowColor } from "../utils.js";
 
 interface AgentViewerStepProps {
   selectedAgent: SubagentConfig | null;
@@ -18,51 +18,51 @@ export const AgentViewerStep = ({ selectedAgent }: AgentViewerStepProps) => {
   if (!selectedAgent) {
     return (
       <Box>
-        <Text color={theme.status.error}>{t('No agent selected')}</Text>
+        <Text color={theme.status.error}>{t("No agent selected")}</Text>
       </Box>
     );
   }
 
   const agent = selectedAgent;
 
-  const toolsDisplay = agent.tools ? agent.tools.join(', ') : '*';
+  const toolsDisplay = agent.tools ? agent.tools.join(", ") : "*";
 
   return (
     <Box flexDirection="column" gap={1}>
       <Box flexDirection="column">
         <Box>
-          <Text color={theme.text.primary}>{t('File Path: ')}</Text>
+          <Text color={theme.text.primary}>{t("File Path: ")}</Text>
           <Text>{agent.filePath}</Text>
         </Box>
 
         <Box>
-          <Text color={theme.text.primary}>{t('Tools: ')}</Text>
+          <Text color={theme.text.primary}>{t("Tools: ")}</Text>
           <Text>{toolsDisplay}</Text>
         </Box>
 
         {agent.model && (
           <Box>
-            <Text color={theme.text.primary}>{t('Model: ')}</Text>
+            <Text color={theme.text.primary}>{t("Model: ")}</Text>
             <Text>{agent.model}</Text>
           </Box>
         )}
 
         {shouldShowColor(agent.color) && (
           <Box>
-            <Text color={theme.text.primary}>{t('Color: ')}</Text>
+            <Text color={theme.text.primary}>{t("Color: ")}</Text>
             <Text color={getColorForDisplay(agent.color)}>{agent.color}</Text>
           </Box>
         )}
 
         <Box marginTop={1}>
-          <Text color={theme.text.primary}>{t('Description:')}</Text>
+          <Text color={theme.text.primary}>{t("Description:")}</Text>
         </Box>
         <Box padding={1} paddingBottom={0}>
           <Text wrap="wrap">{agent.description}</Text>
         </Box>
 
         <Box marginTop={1}>
-          <Text color={theme.text.primary}>{t('System Prompt:')}</Text>
+          <Text color={theme.text.primary}>{t("System Prompt:")}</Text>
         </Box>
         <Box padding={1} paddingBottom={0}>
           <Text wrap="wrap">{agent.systemPrompt}</Text>
diff --git a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentsManagerDialog.tsx b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentsManagerDialog.tsx
index 2594077a8..8cc01d841 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/manage/AgentsManagerDialog.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/manage/AgentsManagerDialog.tsx
@@ -4,37 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useMemo, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import { AgentSelectionStep } from './AgentSelectionStep.js';
-import { ActionSelectionStep } from './ActionSelectionStep.js';
-import { AgentViewerStep } from './AgentViewerStep.js';
-import { EditOptionsStep } from './AgentEditStep.js';
-import { AgentDeleteStep } from './AgentDeleteStep.js';
-import { ToolSelector } from '../create/ToolSelector.js';
-import { ColorSelector } from '../create/ColorSelector.js';
-import { MANAGEMENT_STEPS } from '../types.js';
-import { theme } from '../../../semantic-colors.js';
-import { getColorForDisplay, shouldShowColor } from '../utils.js';
-import type { SubagentConfig, Config } from '@airiscode/core';
-import { createDebugLogger } from '@airiscode/core';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { t } from '../../../../i18n/index.js';
+import type { Config, SubagentConfig } from "@airiscode/core";
+import { createDebugLogger } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { t } from "../../../../i18n/index.js";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import { ColorSelector } from "../create/ColorSelector.js";
+import { ToolSelector } from "../create/ToolSelector.js";
+import { MANAGEMENT_STEPS } from "../types.js";
+import { getColorForDisplay, shouldShowColor } from "../utils.js";
+import { ActionSelectionStep } from "./ActionSelectionStep.js";
+import { AgentDeleteStep } from "./AgentDeleteStep.js";
+import { EditOptionsStep } from "./AgentEditStep.js";
+import { AgentSelectionStep } from "./AgentSelectionStep.js";
+import { AgentViewerStep } from "./AgentViewerStep.js";
 
 interface AgentsManagerDialogProps {
   onClose: () => void;
   config: Config | null;
 }
 
-const debugLogger = createDebugLogger('AGENTS_MANAGER_DIALOG');
+const debugLogger = createDebugLogger("AGENTS_MANAGER_DIALOG");
 
 /**
  * Main orchestrator component for the agents management dialog.
  */
-export function AgentsManagerDialog({
-  onClose,
-  config,
-}: AgentsManagerDialogProps) {
+export function AgentsManagerDialog({ onClose, config }: AgentsManagerDialogProps) {
   // Simple state management with useState hooks
   const [availableAgents, setAvailableAgents] = useState<SubagentConfig[]>([]);
   const [selectedAgentIndex, setSelectedAgentIndex] = useState<number>(-1);
@@ -44,8 +41,7 @@ export function AgentsManagerDialog({
 
   // Memoized selectedAgent based on index
   const selectedAgent = useMemo(
-    () =>
-      selectedAgentIndex >= 0 ? availableAgents[selectedAgentIndex] : null,
+    () => (selectedAgentIndex >= 0 ? availableAgents[selectedAgentIndex] : null),
     [availableAgents, selectedAgentIndex],
   );
 
@@ -68,9 +64,7 @@ export function AgentsManagerDialog({
 
   // Helper to get current step
   const getCurrentStep = useCallback(
-    () =>
-      navigationStack[navigationStack.length - 1] ||
-      MANAGEMENT_STEPS.AGENT_SELECTION,
+    () => navigationStack[navigationStack.length - 1] || MANAGEMENT_STEPS.AGENT_SELECTION,
     [navigationStack],
   );
 
@@ -98,11 +92,7 @@ export function AgentsManagerDialog({
 
       try {
         const subagentManager = config.getSubagentManager();
-        await subagentManager.deleteSubagent(
-          agent.name,
-          agent.level,
-          agent.extensionName,
-        );
+        await subagentManager.deleteSubagent(agent.name, agent.level, agent.extensionName);
 
         // Reload agents to get updated state
         await loadAgents();
@@ -111,7 +101,7 @@ export function AgentsManagerDialog({
         setNavigationStack([MANAGEMENT_STEPS.AGENT_SELECTION]);
         setSelectedAgentIndex(-1);
       } catch (error) {
-        debugLogger.error('Failed to delete agent:', error);
+        debugLogger.error("Failed to delete agent:", error);
         throw error; // Re-throw to let the component handle the error state
       }
     },
@@ -121,7 +111,7 @@ export function AgentsManagerDialog({
   // Centralized ESC key handling for the entire dialog
   useKeypress(
     (key) => {
-      if (key.name !== 'escape') {
+      if (key.name !== "escape") {
         return;
       }
 
@@ -151,21 +141,21 @@ export function AgentsManagerDialog({
     const getStepHeaderText = () => {
       switch (currentStep) {
         case MANAGEMENT_STEPS.AGENT_SELECTION:
-          return t('Agents');
+          return t("Agents");
         case MANAGEMENT_STEPS.ACTION_SELECTION:
-          return t('Choose Action');
+          return t("Choose Action");
         case MANAGEMENT_STEPS.AGENT_VIEWER:
           return selectedAgent?.name;
         case MANAGEMENT_STEPS.EDIT_OPTIONS:
-          return t('Edit {{name}}', { name: selectedAgent?.name || '' });
+          return t("Edit {{name}}", { name: selectedAgent?.name || "" });
         case MANAGEMENT_STEPS.EDIT_TOOLS:
-          return t('Edit Tools: {{name}}', { name: selectedAgent?.name || '' });
+          return t("Edit Tools: {{name}}", { name: selectedAgent?.name || "" });
         case MANAGEMENT_STEPS.EDIT_COLOR:
-          return t('Edit Color: {{name}}', { name: selectedAgent?.name || '' });
+          return t("Edit Color: {{name}}", { name: selectedAgent?.name || "" });
         case MANAGEMENT_STEPS.DELETE_CONFIRMATION:
-          return t('Delete {{name}}', { name: selectedAgent?.name || '' });
+          return t("Delete {{name}}", { name: selectedAgent?.name || "" });
         default:
-          return t('Unknown Step');
+          return t("Unknown Step");
       }
     };
 
@@ -191,20 +181,20 @@ export function AgentsManagerDialog({
     const getNavigationInstructions = () => {
       if (currentStep === MANAGEMENT_STEPS.AGENT_SELECTION) {
         if (availableAgents.length === 0) {
-          return t('Esc to close');
+          return t("Esc to close");
         }
-        return t('Enter to select, ↑↓ to navigate, Esc to close');
+        return t("Enter to select, ↑↓ to navigate, Esc to close");
       }
 
       if (currentStep === MANAGEMENT_STEPS.AGENT_VIEWER) {
-        return t('Esc to go back');
+        return t("Esc to go back");
       }
 
       if (currentStep === MANAGEMENT_STEPS.DELETE_CONFIRMATION) {
-        return t('Enter to confirm, Esc to cancel');
+        return t("Enter to confirm, Esc to cancel");
       }
 
-      return t('Enter to select, ↑↓ to navigate, Esc to go back');
+      return t("Enter to select, ↑↓ to navigate, Esc to go back");
     };
 
     return (
@@ -226,17 +216,11 @@ export function AgentsManagerDialog({
           />
         );
       case MANAGEMENT_STEPS.ACTION_SELECTION:
-        return (
-          <ActionSelectionStep selectedAgent={selectedAgent} {...commonProps} />
-        );
+        return <ActionSelectionStep selectedAgent={selectedAgent} {...commonProps} />;
       case MANAGEMENT_STEPS.AGENT_VIEWER:
-        return (
-          <AgentViewerStep selectedAgent={selectedAgent} {...commonProps} />
-        );
+        return <AgentViewerStep selectedAgent={selectedAgent} {...commonProps} />;
       case MANAGEMENT_STEPS.EDIT_OPTIONS:
-        return (
-          <EditOptionsStep selectedAgent={selectedAgent} {...commonProps} />
-        );
+        return <EditOptionsStep selectedAgent={selectedAgent} {...commonProps} />;
       case MANAGEMENT_STEPS.EDIT_TOOLS:
         return (
           <Box flexDirection="column" gap={1}>
@@ -256,7 +240,7 @@ export function AgentsManagerDialog({
                     await loadAgents();
                     handleNavigateBack();
                   } catch (error) {
-                    debugLogger.error('Failed to save agent changes:', error);
+                    debugLogger.error("Failed to save agent changes:", error);
                   }
                 }
               }}
@@ -268,8 +252,8 @@ export function AgentsManagerDialog({
         return (
           <Box flexDirection="column" gap={1}>
             <ColorSelector
-              color={selectedAgent?.color || 'auto'}
-              agentName={selectedAgent?.name || 'Agent'}
+              color={selectedAgent?.color || "auto"}
+              agentName={selectedAgent?.name || "Agent"}
               onSelect={async (color) => {
                 // Save changes and reload agents
                 if (selectedAgent && config) {
@@ -285,7 +269,7 @@ export function AgentsManagerDialog({
                     await loadAgents();
                     handleNavigateBack();
                   } catch (error) {
-                    debugLogger.error('Failed to save color changes:', error);
+                    debugLogger.error("Failed to save color changes:", error);
                   }
                 }
               }}
@@ -304,7 +288,7 @@ export function AgentsManagerDialog({
         return (
           <Box>
             <Text color={theme.status.error}>
-              {t('Invalid step: {{step}}', { step: currentStep })}
+              {t("Invalid step: {{step}}", { step: currentStep })}
             </Text>
           </Box>
         );
diff --git a/apps/airiscode-cli/src/ui/components/subagents/reducers.tsx b/apps/airiscode-cli/src/ui/components/subagents/reducers.tsx
index 4f8fe8475..535171d69 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/reducers.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/reducers.tsx
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type CreationWizardState, type WizardAction } from './types.js';
-import { WIZARD_STEPS } from './constants.js';
-import { getStepKind, getTotalSteps } from './utils.js';
+import { WIZARD_STEPS } from "./constants.js";
+import { type CreationWizardState, type WizardAction } from "./types.js";
+import { getStepKind, getTotalSteps } from "./utils.js";
 
 /**
  * Initial state for the creation wizard.
  */
 export const initialWizardState: CreationWizardState = {
   currentStep: WIZARD_STEPS.LOCATION_SELECTION,
-  location: 'project',
-  generationMethod: 'airiscode',
-  userDescription: '',
-  generatedSystemPrompt: '',
-  generatedDescription: '',
-  generatedName: '',
+  location: "project",
+  generationMethod: "airiscode",
+  userDescription: "",
+  generatedSystemPrompt: "",
+  generatedDescription: "",
+  generatedName: "",
   selectedTools: [],
-  color: 'auto',
+  color: "auto",
   isGenerating: false,
   validationErrors: [],
   canProceed: false,
@@ -34,7 +34,7 @@ export function wizardReducer(
   action: WizardAction,
 ): CreationWizardState {
   switch (action.type) {
-    case 'SET_STEP':
+    case "SET_STEP":
       return {
         ...state,
         currentStep: Math.max(
@@ -44,28 +44,28 @@ export function wizardReducer(
         validationErrors: [],
       };
 
-    case 'SET_LOCATION':
+    case "SET_LOCATION":
       return {
         ...state,
         location: action.location,
         canProceed: true,
       };
 
-    case 'SET_GENERATION_METHOD':
+    case "SET_GENERATION_METHOD":
       return {
         ...state,
         generationMethod: action.method,
         canProceed: true,
       };
 
-    case 'SET_USER_DESCRIPTION':
+    case "SET_USER_DESCRIPTION":
       return {
         ...state,
         userDescription: action.description,
         canProceed: action.description.trim().length >= 0,
       };
 
-    case 'SET_GENERATED_CONTENT':
+    case "SET_GENERATED_CONTENT":
       return {
         ...state,
         generatedName: action.name,
@@ -75,60 +75,57 @@ export function wizardReducer(
         canProceed: true,
       };
 
-    case 'SET_GENERATED_NAME':
+    case "SET_GENERATED_NAME":
       return {
         ...state,
         generatedName: action.name,
         canProceed: action.name.trim().length > 0,
       };
 
-    case 'SET_GENERATED_SYSTEM_PROMPT':
+    case "SET_GENERATED_SYSTEM_PROMPT":
       return {
         ...state,
         generatedSystemPrompt: action.systemPrompt,
         canProceed: action.systemPrompt.trim().length > 0,
       };
 
-    case 'SET_GENERATED_DESCRIPTION':
+    case "SET_GENERATED_DESCRIPTION":
       return {
         ...state,
         generatedDescription: action.description,
         canProceed: action.description.trim().length > 0,
       };
 
-    case 'SET_TOOLS':
+    case "SET_TOOLS":
       return {
         ...state,
         selectedTools: action.tools,
         canProceed: true,
       };
 
-    case 'SET_BACKGROUND_COLOR':
+    case "SET_BACKGROUND_COLOR":
       return {
         ...state,
         color: action.color,
         canProceed: true,
       };
 
-    case 'SET_GENERATING':
+    case "SET_GENERATING":
       return {
         ...state,
         isGenerating: action.isGenerating,
         canProceed: !action.isGenerating,
       };
 
-    case 'SET_VALIDATION_ERRORS':
+    case "SET_VALIDATION_ERRORS":
       return {
         ...state,
         validationErrors: action.errors,
         canProceed: action.errors.length === 0,
       };
 
-    case 'GO_TO_NEXT_STEP':
-      if (
-        state.canProceed &&
-        state.currentStep < getTotalSteps(state.generationMethod)
-      ) {
+    case "GO_TO_NEXT_STEP":
+      if (state.canProceed && state.currentStep < getTotalSteps(state.generationMethod)) {
         return {
           ...state,
           currentStep: state.currentStep + 1,
@@ -138,7 +135,7 @@ export function wizardReducer(
       }
       return state;
 
-    case 'GO_TO_PREVIOUS_STEP':
+    case "GO_TO_PREVIOUS_STEP":
       if (state.currentStep > WIZARD_STEPS.LOCATION_SELECTION) {
         return {
           ...state,
@@ -149,7 +146,7 @@ export function wizardReducer(
       }
       return state;
 
-    case 'RESET_WIZARD':
+    case "RESET_WIZARD":
       return initialWizardState;
 
     default:
@@ -163,26 +160,26 @@ export function wizardReducer(
 function validateStep(step: number, state: CreationWizardState): boolean {
   const kind = getStepKind(state.generationMethod, step);
   switch (kind) {
-    case 'LOCATION':
-    case 'GEN_METHOD':
+    case "LOCATION":
+    case "GEN_METHOD":
       return true;
-    case 'LLM_DESC':
+    case "LLM_DESC":
       return state.userDescription.trim().length >= 0;
-    case 'MANUAL_NAME':
+    case "MANUAL_NAME":
       return state.generatedName.trim().length > 0;
-    case 'MANUAL_PROMPT':
+    case "MANUAL_PROMPT":
       return state.generatedSystemPrompt.trim().length > 0;
-    case 'MANUAL_DESC':
+    case "MANUAL_DESC":
       return state.generatedDescription.trim().length > 0;
-    case 'TOOLS':
+    case "TOOLS":
       return (
         state.generatedName.length > 0 &&
         state.generatedDescription.length > 0 &&
         state.generatedSystemPrompt.length > 0
       );
-    case 'COLOR':
+    case "COLOR":
       return true;
-    case 'FINAL':
+    case "FINAL":
       return state.color.length > 0;
     default:
       return false;
diff --git a/apps/airiscode-cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx b/apps/airiscode-cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
index fe4624466..5aeb4f029 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useMemo } from 'react';
-import { Box, Text } from 'ink';
-import type {
-  AgentResultDisplay,
-  AgentStatsSummary,
-  Config,
-} from '@airiscode/core';
-import { theme } from '../../../semantic-colors.js';
-import { useKeypress } from '../../../hooks/useKeypress.js';
-import { COLOR_OPTIONS } from '../constants.js';
-import { fmtDuration } from '../utils.js';
-import { ToolConfirmationMessage } from '../../messages/ToolConfirmationMessage.js';
-
-export type DisplayMode = 'compact' | 'default' | 'verbose';
+import type { AgentResultDisplay, AgentStatsSummary, Config } from "@airiscode/core";
+import { Box, Text } from "ink";
+import React, { useMemo } from "react";
+import { useKeypress } from "../../../hooks/useKeypress.js";
+import { theme } from "../../../semantic-colors.js";
+import { ToolConfirmationMessage } from "../../messages/ToolConfirmationMessage.js";
+import { COLOR_OPTIONS } from "../constants.js";
+import { fmtDuration } from "../utils.js";
+
+export type DisplayMode = "compact" | "default" | "verbose";
 
 export interface AgentExecutionDisplayProps {
   data: AgentResultDisplay;
@@ -31,41 +27,37 @@ export interface AgentExecutionDisplayProps {
 }
 
 const getStatusColor = (
-  status:
-    | AgentResultDisplay['status']
-    | 'executing'
-    | 'success'
-    | 'awaiting_approval',
+  status: AgentResultDisplay["status"] | "executing" | "success" | "awaiting_approval",
 ) => {
   switch (status) {
-    case 'running':
-    case 'executing':
-    case 'awaiting_approval':
+    case "running":
+    case "executing":
+    case "awaiting_approval":
       return theme.status.warning;
-    case 'completed':
-    case 'success':
+    case "completed":
+    case "success":
       return theme.status.success;
-    case 'cancelled':
+    case "cancelled":
       return theme.status.warning;
-    case 'failed':
+    case "failed":
       return theme.status.error;
     default:
       return theme.text.secondary;
   }
 };
 
-const getStatusText = (status: AgentResultDisplay['status']) => {
+const getStatusText = (status: AgentResultDisplay["status"]) => {
   switch (status) {
-    case 'running':
-      return 'Running';
-    case 'completed':
-      return 'Completed';
-    case 'cancelled':
-      return 'User Cancelled';
-    case 'failed':
-      return 'Failed';
+    case "running":
+      return "Running";
+    case "completed":
+      return "Completed";
+    case "cancelled":
+      return "User Cancelled";
+    case "failed":
+      return "Failed";
     default:
-      return 'Unknown';
+      return "Unknown";
   }
 };
 
@@ -85,57 +77,49 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
   isFocused = true,
   isWaitingForOtherApproval = false,
 }) => {
-  const [displayMode, setDisplayMode] = React.useState<DisplayMode>('compact');
+  const [displayMode, setDisplayMode] = React.useState<DisplayMode>("compact");
 
   const agentColor = useMemo(() => {
-    const colorOption = COLOR_OPTIONS.find(
-      (option) => option.name === data.subagentColor,
-    );
+    const colorOption = COLOR_OPTIONS.find((option) => option.name === data.subagentColor);
     return colorOption?.value || theme.text.accent;
   }, [data.subagentColor]);
 
   const footerText = React.useMemo(() => {
     // This component only listens to keyboard shortcut events when the subagent is running
-    if (data.status !== 'running') return '';
+    if (data.status !== "running") return "";
 
-    if (displayMode === 'default') {
-      const hasMoreLines =
-        data.taskPrompt.split('\n').length > MAX_TASK_PROMPT_LINES;
-      const hasMoreToolCalls =
-        data.toolCalls && data.toolCalls.length > MAX_TOOL_CALLS;
+    if (displayMode === "default") {
+      const hasMoreLines = data.taskPrompt.split("\n").length > MAX_TASK_PROMPT_LINES;
+      const hasMoreToolCalls = data.toolCalls && data.toolCalls.length > MAX_TOOL_CALLS;
 
       if (hasMoreToolCalls || hasMoreLines) {
-        return 'Press ctrl+e to show less, ctrl+f to show more.';
+        return "Press ctrl+e to show less, ctrl+f to show more.";
       }
-      return 'Press ctrl+e to show less.';
+      return "Press ctrl+e to show less.";
     }
 
-    if (displayMode === 'verbose') {
-      return 'Press ctrl+f to show less.';
+    if (displayMode === "verbose") {
+      return "Press ctrl+f to show less.";
     }
 
-    return '';
+    return "";
   }, [displayMode, data]);
 
   // Handle keyboard shortcuts to control display mode
   useKeypress(
     (key) => {
-      if (key.ctrl && key.name === 'e') {
+      if (key.ctrl && key.name === "e") {
         // ctrl+e toggles between compact and default
-        setDisplayMode((current) =>
-          current === 'compact' ? 'default' : 'compact',
-        );
-      } else if (key.ctrl && key.name === 'f') {
+        setDisplayMode((current) => (current === "compact" ? "default" : "compact"));
+      } else if (key.ctrl && key.name === "f") {
         // ctrl+f toggles between default and verbose
-        setDisplayMode((current) =>
-          current === 'default' ? 'verbose' : 'default',
-        );
+        setDisplayMode((current) => (current === "default" ? "verbose" : "default"));
       }
     },
     { isActive: true },
   );
 
-  if (displayMode === 'compact') {
+  if (displayMode === "compact") {
     return (
       <Box flexDirection="column">
         {/* Header: Agent name and status */}
@@ -150,21 +134,17 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
         )}
 
         {/* Running state: Show current tool call and progress */}
-        {data.status === 'running' && (
+        {data.status === "running" && (
           <>
             {/* Current tool call */}
             {data.toolCalls && data.toolCalls.length > 0 && (
               <Box flexDirection="column">
-                <ToolCallItem
-                  toolCall={data.toolCalls[data.toolCalls.length - 1]}
-                  compact={true}
-                />
+                <ToolCallItem toolCall={data.toolCalls[data.toolCalls.length - 1]} compact={true} />
                 {/* Show count of additional tool calls if there are more than 1 */}
                 {data.toolCalls.length > 1 && !data.pendingConfirmation && (
                   <Box flexDirection="row" paddingLeft={4}>
                     <Text color={theme.text.secondary}>
-                      +{data.toolCalls.length - 1} more tool calls (ctrl+e to
-                      expand)
+                      +{data.toolCalls.length - 1} more tool calls (ctrl+e to expand)
                     </Text>
                   </Box>
                 )}
@@ -195,22 +175,20 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
         )}
 
         {/* Completed state: Show summary line */}
-        {data.status === 'completed' && data.executionSummary && (
+        {data.status === "completed" && data.executionSummary && (
           <Box flexDirection="row" marginTop={1}>
             <Text color={theme.text.secondary}>
-              Execution Summary: {data.executionSummary.totalToolCalls} tool
-              uses · {data.executionSummary.totalTokens.toLocaleString()} tokens
-              · {fmtDuration(data.executionSummary.totalDurationMs)}
+              Execution Summary: {data.executionSummary.totalToolCalls} tool uses ·{" "}
+              {data.executionSummary.totalTokens.toLocaleString()} tokens ·{" "}
+              {fmtDuration(data.executionSummary.totalDurationMs)}
             </Text>
           </Box>
         )}
 
         {/* Failed/Cancelled state: Show error reason */}
-        {data.status === 'failed' && (
+        {data.status === "failed" && (
           <Box flexDirection="row" marginTop={1}>
-            <Text color={theme.status.error}>
-              Failed: {data.terminateReason}
-            </Text>
+            <Text color={theme.status.error}>Failed: {data.terminateReason}</Text>
           </Box>
         )}
       </Box>
@@ -230,22 +208,14 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
       </Box>
 
       {/* Task description */}
-      <TaskPromptSection
-        taskPrompt={data.taskPrompt}
-        displayMode={displayMode}
-      />
+      <TaskPromptSection taskPrompt={data.taskPrompt} displayMode={displayMode} />
 
       {/* Progress section for running tasks */}
-      {data.status === 'running' &&
-        data.toolCalls &&
-        data.toolCalls.length > 0 && (
-          <Box flexDirection="column">
-            <ToolCallsList
-              toolCalls={data.toolCalls}
-              displayMode={displayMode}
-            />
-          </Box>
-        )}
+      {data.status === "running" && data.toolCalls && data.toolCalls.length > 0 && (
+        <Box flexDirection="column">
+          <ToolCallsList toolCalls={data.toolCalls} displayMode={displayMode} />
+        </Box>
+      )}
 
       {/* Inline approval prompt when awaiting confirmation */}
       {data.pendingConfirmation && (
@@ -269,9 +239,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
       )}
 
       {/* Results section for completed/failed tasks */}
-      {(data.status === 'completed' ||
-        data.status === 'failed' ||
-        data.status === 'cancelled') && (
+      {(data.status === "completed" || data.status === "failed" || data.status === "cancelled") && (
         <ResultsSection data={data} displayMode={displayMode} />
       )}
 
@@ -292,25 +260,25 @@ const TaskPromptSection: React.FC<{
   taskPrompt: string;
   displayMode: DisplayMode;
 }> = ({ taskPrompt, displayMode }) => {
-  const lines = taskPrompt.split('\n');
+  const lines = taskPrompt.split("\n");
   const shouldTruncate = lines.length > 10;
-  const showFull = displayMode === 'verbose';
+  const showFull = displayMode === "verbose";
   const displayLines = showFull ? lines : lines.slice(0, MAX_TASK_PROMPT_LINES);
 
   return (
     <Box flexDirection="column" gap={1}>
       <Box flexDirection="row">
         <Text color={theme.text.primary}>Task Detail: </Text>
-        {shouldTruncate && displayMode === 'default' && (
+        {shouldTruncate && displayMode === "default" && (
           <Text color={theme.text.secondary}>
-            {' '}
+            {" "}
             Showing the first {MAX_TASK_PROMPT_LINES} lines.
           </Text>
         )}
       </Box>
       <Box paddingLeft={1}>
         <Text wrap="wrap">
-          {displayLines.join('\n') + (shouldTruncate && !showFull ? '...' : '')}
+          {displayLines.join("\n") + (shouldTruncate && !showFull ? "..." : "")}
         </Text>
       </Box>
     </Box>
@@ -321,7 +289,7 @@ const TaskPromptSection: React.FC<{
  * Status dot component with similar height as text
  */
 const StatusDot: React.FC<{
-  status: AgentResultDisplay['status'];
+  status: AgentResultDisplay["status"];
 }> = ({ status }) => (
   <Box marginLeft={1} marginRight={1}>
     <Text color={getStatusColor(status)}>●</Text>
@@ -332,7 +300,7 @@ const StatusDot: React.FC<{
  * Status indicator component
  */
 const StatusIndicator: React.FC<{
-  status: AgentResultDisplay['status'];
+  status: AgentResultDisplay["status"];
 }> = ({ status }) => {
   const color = getStatusColor(status);
   const text = getStatusText(status);
@@ -343,12 +311,12 @@ const StatusIndicator: React.FC<{
  * Tool calls list - format consistent with ToolInfo in ToolMessage.tsx
  */
 const ToolCallsList: React.FC<{
-  toolCalls: AgentResultDisplay['toolCalls'];
+  toolCalls: AgentResultDisplay["toolCalls"];
   displayMode: DisplayMode;
 }> = ({ toolCalls, displayMode }) => {
   const calls = toolCalls || [];
   const shouldTruncate = calls.length > MAX_TOOL_CALLS;
-  const showAll = displayMode === 'verbose';
+  const showAll = displayMode === "verbose";
   const displayCalls = showAll ? calls : calls.slice(-MAX_TOOL_CALLS); // Show last 5
 
   // Reverse the order to show most recent first
@@ -358,9 +326,9 @@ const ToolCallsList: React.FC<{
     <Box flexDirection="column">
       <Box flexDirection="row" marginBottom={1}>
         <Text color={theme.text.primary}>Tools:</Text>
-        {shouldTruncate && displayMode === 'default' && (
+        {shouldTruncate && displayMode === "default" && (
           <Text color={theme.text.secondary}>
-            {' '}
+            {" "}
             Showing the last {MAX_TOOL_CALLS} of {calls.length} tools.
           </Text>
         )}
@@ -378,7 +346,7 @@ const ToolCallsList: React.FC<{
 const ToolCallItem: React.FC<{
   toolCall: {
     name: string;
-    status: 'executing' | 'awaiting_approval' | 'success' | 'failed';
+    status: "executing" | "awaiting_approval" | "success" | "failed";
     error?: string;
     args?: Record<string, unknown>;
     result?: string;
@@ -393,13 +361,13 @@ const ToolCallItem: React.FC<{
   const statusIcon = React.useMemo(() => {
     const color = getStatusColor(toolCall.status);
     switch (toolCall.status) {
-      case 'executing':
+      case "executing":
         return <Text color={color}>⊷</Text>; // Using same as ToolMessage
-      case 'awaiting_approval':
+      case "awaiting_approval":
         return <Text color={theme.status.warning}>?</Text>;
-      case 'success':
+      case "success":
         return <Text color={color}>✓</Text>;
-      case 'failed':
+      case "failed":
         return (
           <Text color={color} bold>
             x
@@ -411,20 +379,16 @@ const ToolCallItem: React.FC<{
   }, [toolCall.status]);
 
   const description = React.useMemo(() => {
-    if (!toolCall.description) return '';
-    const firstLine = toolCall.description.split('\n')[0];
-    return firstLine.length > 80
-      ? firstLine.substring(0, 80) + '...'
-      : firstLine;
+    if (!toolCall.description) return "";
+    const firstLine = toolCall.description.split("\n")[0];
+    return firstLine.length > 80 ? firstLine.substring(0, 80) + "..." : firstLine;
   }, [toolCall.description]);
 
   // Get first line of resultDisplay for truncated output
   const truncatedOutput = React.useMemo(() => {
-    if (!toolCall.resultDisplay) return '';
-    const firstLine = toolCall.resultDisplay.split('\n')[0];
-    return firstLine.length > 80
-      ? firstLine.substring(0, 80) + '...'
-      : firstLine;
+    if (!toolCall.resultDisplay) return "";
+    const firstLine = toolCall.resultDisplay.split("\n")[0];
+    return firstLine.length > 80 ? firstLine.substring(0, 80) + "..." : firstLine;
   }, [toolCall.resultDisplay]);
 
   return (
@@ -433,11 +397,8 @@ const ToolCallItem: React.FC<{
       <Box flexDirection="row">
         <Box minWidth={STATUS_INDICATOR_WIDTH}>{statusIcon}</Box>
         <Text wrap="truncate-end">
-          <Text>{toolCall.name}</Text>{' '}
-          <Text color={theme.text.secondary}>{description}</Text>
-          {toolCall.error && (
-            <Text color={theme.status.error}> - {toolCall.error}</Text>
-          )}
+          <Text>{toolCall.name}</Text> <Text color={theme.text.secondary}>{description}</Text>
+          {toolCall.error && <Text color={theme.status.error}> - {toolCall.error}</Text>}
         </Text>
       </Box>
 
@@ -503,19 +464,10 @@ const ToolUsageStats: React.FC<{
         • <Text>Total Calls:</Text> {executionSummary.totalToolCalls}
       </Text>
       <Text>
-        • <Text>Success Rate:</Text>{' '}
-        <Text color={theme.status.success}>
-          {executionSummary.successRate.toFixed(1)}%
-        </Text>{' '}
-        (
-        <Text color={theme.status.success}>
-          {executionSummary.successfulToolCalls} success
-        </Text>
-        ,{' '}
-        <Text color={theme.status.error}>
-          {executionSummary.failedToolCalls} failed
-        </Text>
-        )
+        • <Text>Success Rate:</Text>{" "}
+        <Text color={theme.status.success}>{executionSummary.successRate.toFixed(1)}%</Text> (
+        <Text color={theme.status.success}>{executionSummary.successfulToolCalls} success</Text>,{" "}
+        <Text color={theme.status.error}>{executionSummary.failedToolCalls} failed</Text>)
       </Text>
     </Box>
   );
@@ -535,7 +487,7 @@ const ResultsSection: React.FC<{
     )}
 
     {/* Execution Summary section - hide when cancelled */}
-    {data.status === 'completed' && (
+    {data.status === "completed" && (
       <Box flexDirection="column">
         <Box flexDirection="row" marginBottom={1}>
           <Text color={theme.text.primary}>Execution Summary:</Text>
@@ -545,7 +497,7 @@ const ResultsSection: React.FC<{
     )}
 
     {/* Tool Usage section - hide when cancelled */}
-    {data.status === 'completed' && data.executionSummary && (
+    {data.status === "completed" && data.executionSummary && (
       <Box flexDirection="column">
         <Box flexDirection="row" marginBottom={1}>
           <Text color={theme.text.primary}>Tool Usage:</Text>
@@ -555,12 +507,12 @@ const ResultsSection: React.FC<{
     )}
 
     {/* Error reason for failed tasks */}
-    {data.status === 'cancelled' && (
+    {data.status === "cancelled" && (
       <Box flexDirection="row">
         <Text color={theme.status.warning}>⏹ User Cancelled</Text>
       </Box>
     )}
-    {data.status === 'failed' && (
+    {data.status === "failed" && (
       <Box flexDirection="row">
         <Text color={theme.status.error}>Task Failed: </Text>
         <Text color={theme.status.error}>{data.terminateReason}</Text>
diff --git a/apps/airiscode-cli/src/ui/components/subagents/types.ts b/apps/airiscode-cli/src/ui/components/subagents/types.ts
index b0a0eed51..7e0dad1b9 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/types.ts
+++ b/apps/airiscode-cli/src/ui/components/subagents/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SubagentLevel, Config } from '@airiscode/core';
+import type { Config, SubagentLevel } from "@airiscode/core";
 
 /**
  * State management for the subagent creation wizard.
@@ -17,7 +17,7 @@ export interface CreationWizardState {
   location: SubagentLevel;
 
   /** Generation method selection */
-  generationMethod: 'airiscode' | 'manual';
+  generationMethod: "airiscode" | "manual";
 
   /** User's description input for the subagent */
   userDescription: string;
@@ -69,26 +69,26 @@ export interface ColorOption {
  * Actions that can be dispatched to update wizard state.
  */
 export type WizardAction =
-  | { type: 'SET_STEP'; step: number }
-  | { type: 'SET_LOCATION'; location: SubagentLevel }
-  | { type: 'SET_GENERATION_METHOD'; method: 'airiscode' | 'manual' }
-  | { type: 'SET_USER_DESCRIPTION'; description: string }
-  | { type: 'SET_GENERATED_NAME'; name: string }
-  | { type: 'SET_GENERATED_SYSTEM_PROMPT'; systemPrompt: string }
-  | { type: 'SET_GENERATED_DESCRIPTION'; description: string }
+  | { type: "SET_STEP"; step: number }
+  | { type: "SET_LOCATION"; location: SubagentLevel }
+  | { type: "SET_GENERATION_METHOD"; method: "airiscode" | "manual" }
+  | { type: "SET_USER_DESCRIPTION"; description: string }
+  | { type: "SET_GENERATED_NAME"; name: string }
+  | { type: "SET_GENERATED_SYSTEM_PROMPT"; systemPrompt: string }
+  | { type: "SET_GENERATED_DESCRIPTION"; description: string }
   | {
-      type: 'SET_GENERATED_CONTENT';
+      type: "SET_GENERATED_CONTENT";
       name: string;
       description: string;
       systemPrompt: string;
     }
-  | { type: 'SET_TOOLS'; tools: string[] }
-  | { type: 'SET_BACKGROUND_COLOR'; color: string }
-  | { type: 'SET_GENERATING'; isGenerating: boolean }
-  | { type: 'SET_VALIDATION_ERRORS'; errors: string[] }
-  | { type: 'RESET_WIZARD' }
-  | { type: 'GO_TO_PREVIOUS_STEP' }
-  | { type: 'GO_TO_NEXT_STEP' };
+  | { type: "SET_TOOLS"; tools: string[] }
+  | { type: "SET_BACKGROUND_COLOR"; color: string }
+  | { type: "SET_GENERATING"; isGenerating: boolean }
+  | { type: "SET_VALIDATION_ERRORS"; errors: string[] }
+  | { type: "RESET_WIZARD" }
+  | { type: "GO_TO_PREVIOUS_STEP" }
+  | { type: "GO_TO_NEXT_STEP" };
 
 /**
  * Props for wizard step components.
@@ -115,13 +115,13 @@ export interface WizardResult {
 }
 
 export const MANAGEMENT_STEPS = {
-  AGENT_SELECTION: 'agent-selection',
-  ACTION_SELECTION: 'action-selection',
-  AGENT_VIEWER: 'agent-viewer',
-  EDIT_OPTIONS: 'edit-options',
-  EDIT_TOOLS: 'edit-tools',
-  EDIT_COLOR: 'edit-color',
-  DELETE_CONFIRMATION: 'delete-confirmation',
+  AGENT_SELECTION: "agent-selection",
+  ACTION_SELECTION: "action-selection",
+  AGENT_VIEWER: "agent-viewer",
+  EDIT_OPTIONS: "edit-options",
+  EDIT_TOOLS: "edit-tools",
+  EDIT_COLOR: "edit-color",
+  DELETE_CONFIRMATION: "delete-confirmation",
 } as const;
 
 /**
diff --git a/apps/airiscode-cli/src/ui/components/subagents/utils.ts b/apps/airiscode-cli/src/ui/components/subagents/utils.ts
index 7bbd0a25a..d6be8dbbf 100644
--- a/apps/airiscode-cli/src/ui/components/subagents/utils.ts
+++ b/apps/airiscode-cli/src/ui/components/subagents/utils.ts
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { COLOR_OPTIONS, TOTAL_WIZARD_STEPS } from './constants.js';
+import { COLOR_OPTIONS, TOTAL_WIZARD_STEPS } from "./constants.js";
 
-export const shouldShowColor = (color?: string): boolean =>
-  color !== undefined && color !== 'auto';
+export const shouldShowColor = (color?: string): boolean => color !== undefined && color !== "auto";
 
 export const getColorForDisplay = (colorName?: string): string | undefined =>
-  !colorName || colorName === 'auto'
+  !colorName || colorName === "auto"
     ? undefined
     : COLOR_OPTIONS.find((color) => color.name === colorName)?.value;
 
@@ -22,8 +21,8 @@ export function sanitizeInput(input: string): string {
     input
       .trim()
       // eslint-disable-next-line no-control-regex
-      .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, '') // Remove control characters
-      .replace(/\s+/g, ' ') // Normalize whitespace
+      .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "") // Remove control characters
+      .replace(/\s+/g, " ") // Normalize whitespace
   ); // Limit length
 }
 
@@ -42,61 +41,58 @@ export function fmtDuration(ms: number): string {
 
 // Dynamic step flow helpers (support manual and guided flows)
 export type StepKind =
-  | 'LOCATION'
-  | 'GEN_METHOD'
-  | 'LLM_DESC'
-  | 'MANUAL_NAME'
-  | 'MANUAL_PROMPT'
-  | 'MANUAL_DESC'
-  | 'TOOLS'
-  | 'COLOR'
-  | 'FINAL';
+  | "LOCATION"
+  | "GEN_METHOD"
+  | "LLM_DESC"
+  | "MANUAL_NAME"
+  | "MANUAL_PROMPT"
+  | "MANUAL_DESC"
+  | "TOOLS"
+  | "COLOR"
+  | "FINAL";
 
-export function getTotalSteps(method: 'airiscode' | 'manual'): number {
-  return method === 'manual' ? 8 : TOTAL_WIZARD_STEPS;
+export function getTotalSteps(method: "airiscode" | "manual"): number {
+  return method === "manual" ? 8 : TOTAL_WIZARD_STEPS;
 }
 
-export function getStepKind(
-  method: 'airiscode' | 'manual',
-  stepNumber: number,
-): StepKind {
-  if (method === 'manual') {
+export function getStepKind(method: "airiscode" | "manual", stepNumber: number): StepKind {
+  if (method === "manual") {
     switch (stepNumber) {
       case 1:
-        return 'LOCATION';
+        return "LOCATION";
       case 2:
-        return 'GEN_METHOD';
+        return "GEN_METHOD";
       case 3:
-        return 'MANUAL_NAME';
+        return "MANUAL_NAME";
       case 4:
-        return 'MANUAL_PROMPT';
+        return "MANUAL_PROMPT";
       case 5:
-        return 'MANUAL_DESC';
+        return "MANUAL_DESC";
       case 6:
-        return 'TOOLS';
+        return "TOOLS";
       case 7:
-        return 'COLOR';
+        return "COLOR";
       case 8:
-        return 'FINAL';
+        return "FINAL";
       default:
-        return 'FINAL';
+        return "FINAL";
     }
   }
 
   switch (stepNumber) {
     case 1:
-      return 'LOCATION';
+      return "LOCATION";
     case 2:
-      return 'GEN_METHOD';
+      return "GEN_METHOD";
     case 3:
-      return 'LLM_DESC';
+      return "LLM_DESC";
     case 4:
-      return 'TOOLS';
+      return "TOOLS";
     case 5:
-      return 'COLOR';
+      return "COLOR";
     case 6:
-      return 'FINAL';
+      return "FINAL";
     default:
-      return 'FINAL';
+      return "FINAL";
   }
 }
diff --git a/apps/airiscode-cli/src/ui/components/views/ContextUsage.tsx b/apps/airiscode-cli/src/ui/components/views/ContextUsage.tsx
index f6bed1d26..7484636e8 100644
--- a/apps/airiscode-cli/src/ui/components/views/ContextUsage.tsx
+++ b/apps/airiscode-cli/src/ui/components/views/ContextUsage.tsx
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../../i18n/index.js";
+import { theme } from "../../semantic-colors.js";
 import type {
   ContextCategoryBreakdown,
-  ContextToolDetail,
   ContextMemoryDetail,
   ContextSkillDetail,
-} from '../../types.js';
-import { t } from '../../../i18n/index.js';
+  ContextToolDetail,
+} from "../../types.js";
 
 // Progress bar characters
-const FILLED = '\u2588'; // █ - filled block
-const BUFFER = '\u2592'; // ▒ - medium shade (autocompact buffer)
-const EMPTY = '\u2591'; // ░ - light shade (free space)
+const FILLED = "\u2588"; // █ - filled block
+const BUFFER = "\u2592"; // ▒ - medium shade (autocompact buffer)
+const EMPTY = "\u2591"; // ░ - light shade (free space)
 
 const CONTENT_WIDTH = 56;
 
@@ -42,7 +42,7 @@ interface ContextUsageProps {
  */
 function truncateName(name: string, maxLen: number): string {
   if (name.length <= maxLen) return name;
-  return name.slice(0, maxLen - 1) + '\u2026';
+  return name.slice(0, maxLen - 1) + "\u2026";
 }
 
 /**
@@ -64,9 +64,7 @@ const ProgressBar: React.FC<{
   width: number;
 }> = ({ usedPercentage, bufferPercentage, width }) => {
   const usedCount = Math.round((Math.min(usedPercentage, 100) / 100) * width);
-  const bufferCount = Math.round(
-    (Math.min(bufferPercentage, 100 - usedPercentage) / 100) * width,
-  );
+  const bufferCount = Math.round((Math.min(bufferPercentage, 100 - usedPercentage) / 100) * width);
   const freeCount = Math.max(0, width - usedCount - bufferCount);
 
   const usedStr = FILLED.repeat(Math.max(0, usedCount));
@@ -101,7 +99,7 @@ const CategoryRow: React.FC<{
   symbolColor?: string;
 }> = ({ symbol, label, tokens, contextWindowSize, symbolColor }) => {
   const percentage = ((tokens / contextWindowSize) * 100).toFixed(1);
-  const tokenStr = `${formatTokens(tokens)} ${t('tokens')} (${percentage}%)`;
+  const tokenStr = `${formatTokens(tokens)} ${t("tokens")} (${percentage}%)`;
 
   return (
     <Box width={CONTENT_WIDTH}>
@@ -127,15 +125,12 @@ const DetailRow: React.FC<{
   name: string;
   tokens: number;
 }> = ({ name, tokens }) => {
-  const tokenStr =
-    tokens > 0 ? `${formatTokens(tokens)} ${t('tokens')}` : `0 ${t('tokens')}`;
+  const tokenStr = tokens > 0 ? `${formatTokens(tokens)} ${t("tokens")}` : `0 ${t("tokens")}`;
   return (
     <Box width={CONTENT_WIDTH} paddingLeft={2}>
-      <Text color={theme.text.secondary}>{'\u2514'} </Text>
+      <Text color={theme.text.secondary}>{"\u2514"} </Text>
       <Box width={32}>
-        <Text color={theme.text.link}>
-          {truncateName(name, DETAIL_NAME_MAX_LEN)}
-        </Text>
+        <Text color={theme.text.link}>{truncateName(name, DETAIL_NAME_MAX_LEN)}</Text>
       </Box>
       <Box flexGrow={1} justifyContent="flex-end">
         <Text color={theme.text.secondary}>{tokenStr}</Text>
@@ -156,17 +151,12 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
   isEstimated,
   showDetails = false,
 }) => {
-  const percentage =
-    contextWindowSize > 0 ? (totalTokens / contextWindowSize) * 100 : 0;
+  const percentage = contextWindowSize > 0 ? (totalTokens / contextWindowSize) * 100 : 0;
 
   // Sort detail items by token count (descending) for better readability
-  const sortedBuiltinTools = [...builtinTools].sort(
-    (a, b) => b.tokens - a.tokens,
-  );
+  const sortedBuiltinTools = [...builtinTools].sort((a, b) => b.tokens - a.tokens);
   const sortedMcpTools = [...mcpTools].sort((a, b) => b.tokens - a.tokens);
-  const sortedMemoryFiles = [...memoryFiles].sort(
-    (a, b) => b.tokens - a.tokens,
-  );
+  const sortedMemoryFiles = [...memoryFiles].sort((a, b) => b.tokens - a.tokens);
   // Sort skills: loaded first, then by total token cost descending
   const sortedSkills = [...skills].sort((a, b) => {
     if (a.loaded !== b.loaded) return a.loaded ? -1 : 1;
@@ -185,7 +175,7 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
     >
       {/* Title */}
       <Text bold color={theme.text.accent}>
-        {t('Context Usage')}
+        {t("Context Usage")}
       </Text>
       <Box height={1} />
 
@@ -194,19 +184,18 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
           {/* No API data yet — show hint instead of progress bar */}
           <Box marginBottom={1}>
             <Text color={theme.status.warning} italic>
-              {t('No API response yet. Send a message to see actual usage.')}
+              {t("No API response yet. Send a message to see actual usage.")}
             </Text>
           </Box>
 
           {/* Estimated overhead categories */}
           <Text bold color={theme.text.primary}>
-            {t('Estimated pre-conversation overhead')}
+            {t("Estimated pre-conversation overhead")}
           </Text>
           <Text color={theme.text.secondary}>
-            {t('Model')}: {modelName}
-            {'  '}
-            {t('Context window')}: {formatTokens(contextWindowSize)}{' '}
-            {t('tokens')}
+            {t("Model")}: {modelName}
+            {"  "}
+            {t("Context window")}: {formatTokens(contextWindowSize)} {t("tokens")}
           </Text>
           <Box height={1} />
         </>
@@ -215,12 +204,11 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
           {/* Model name + context window info */}
           <Box width={CONTENT_WIDTH} marginBottom={1}>
             <Text color={theme.text.secondary}>
-              {t('Model')}: {modelName}
+              {t("Model")}: {modelName}
             </Text>
             <Box flexGrow={1} justifyContent="flex-end">
               <Text color={theme.text.secondary}>
-                {t('Context window')}: {formatTokens(contextWindowSize)}{' '}
-                {t('tokens')}
+                {t("Context window")}: {formatTokens(contextWindowSize)} {t("tokens")}
               </Text>
             </Box>
           </Box>
@@ -229,9 +217,7 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
             <ProgressBar
               usedPercentage={Math.min(percentage, 100)}
               bufferPercentage={
-                contextWindowSize > 0
-                  ? (breakdown.autocompactBuffer / contextWindowSize) * 100
-                  : 0
+                contextWindowSize > 0 ? (breakdown.autocompactBuffer / contextWindowSize) * 100 : 0
               }
               width={CONTENT_WIDTH}
             />
@@ -240,21 +226,21 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
           {/* Legend — same layout as CategoryRow for alignment */}
           <CategoryRow
             symbol={FILLED}
-            label={t('Used')}
+            label={t("Used")}
             tokens={totalTokens}
             contextWindowSize={contextWindowSize}
             symbolColor={theme.text.accent}
           />
           <CategoryRow
             symbol={EMPTY}
-            label={t('Free')}
+            label={t("Free")}
             tokens={breakdown.freeSpace}
             contextWindowSize={contextWindowSize}
             symbolColor={theme.text.secondary}
           />
           <CategoryRow
             symbol={BUFFER}
-            label={t('Autocompact buffer')}
+            label={t("Autocompact buffer")}
             tokens={breakdown.autocompactBuffer}
             contextWindowSize={contextWindowSize}
             symbolColor={theme.status.warning}
@@ -263,21 +249,21 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
 
           {/* Breakdown header */}
           <Text bold color={theme.text.primary}>
-            {t('Usage by category')}
+            {t("Usage by category")}
           </Text>
         </>
       )}
 
       <CategoryRow
         symbol={FILLED}
-        label={t('System prompt')}
+        label={t("System prompt")}
         tokens={breakdown.systemPrompt}
         contextWindowSize={contextWindowSize}
         symbolColor={theme.text.accent}
       />
       <CategoryRow
         symbol={FILLED}
-        label={t('Built-in tools')}
+        label={t("Built-in tools")}
         tokens={breakdown.builtinTools}
         contextWindowSize={contextWindowSize}
         symbolColor={theme.text.accent}
@@ -285,7 +271,7 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
       {breakdown.mcpTools > 0 && (
         <CategoryRow
           symbol={FILLED}
-          label={t('MCP tools')}
+          label={t("MCP tools")}
           tokens={breakdown.mcpTools}
           contextWindowSize={contextWindowSize}
           symbolColor={theme.text.accent}
@@ -293,14 +279,14 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
       )}
       <CategoryRow
         symbol={FILLED}
-        label={t('Memory files')}
+        label={t("Memory files")}
         tokens={breakdown.memoryFiles}
         contextWindowSize={contextWindowSize}
         symbolColor={theme.text.accent}
       />
       <CategoryRow
         symbol={FILLED}
-        label={t('Skills')}
+        label={t("Skills")}
         tokens={breakdown.skills}
         contextWindowSize={contextWindowSize}
         symbolColor={theme.text.accent}
@@ -309,7 +295,7 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
       {!isEstimated && (
         <CategoryRow
           symbol={FILLED}
-          label={t('Messages')}
+          label={t("Messages")}
           tokens={breakdown.messages}
           contextWindowSize={contextWindowSize}
           symbolColor={theme.text.accent}
@@ -322,14 +308,10 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
           {sortedBuiltinTools.length > 0 && (
             <Box flexDirection="column" marginTop={1}>
               <Text bold color={theme.text.primary}>
-                {t('Built-in tools')}
+                {t("Built-in tools")}
               </Text>
               {sortedBuiltinTools.map((tool) => (
-                <DetailRow
-                  key={tool.name}
-                  name={tool.name}
-                  tokens={tool.tokens}
-                />
+                <DetailRow key={tool.name} name={tool.name} tokens={tool.tokens} />
               ))}
             </Box>
           )}
@@ -338,14 +320,10 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
           {sortedMcpTools.length > 0 && (
             <Box flexDirection="column" marginTop={1}>
               <Text bold color={theme.text.primary}>
-                {t('MCP tools')}
+                {t("MCP tools")}
               </Text>
               {sortedMcpTools.map((tool) => (
-                <DetailRow
-                  key={tool.name}
-                  name={tool.name}
-                  tokens={tool.tokens}
-                />
+                <DetailRow key={tool.name} name={tool.name} tokens={tool.tokens} />
               ))}
             </Box>
           )}
@@ -354,14 +332,10 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
           {sortedMemoryFiles.length > 0 && (
             <Box flexDirection="column" marginTop={1}>
               <Text bold color={theme.text.primary}>
-                {t('Memory files')}
+                {t("Memory files")}
               </Text>
               {sortedMemoryFiles.map((file) => (
-                <DetailRow
-                  key={file.path}
-                  name={file.path}
-                  tokens={file.tokens}
-                />
+                <DetailRow key={file.path} name={file.path} tokens={file.tokens} />
               ))}
             </Box>
           )}
@@ -370,43 +344,39 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
           {sortedSkills.length > 0 && (
             <Box flexDirection="column" marginTop={1}>
               <Text bold color={theme.text.primary}>
-                {t('Skills')}
+                {t("Skills")}
               </Text>
               {sortedSkills.map((skill) => (
                 <Box key={skill.name} flexDirection="column">
                   <Box width={CONTENT_WIDTH} paddingLeft={2}>
-                    <Text color={theme.text.secondary}>{'\u2514'} </Text>
+                    <Text color={theme.text.secondary}>{"\u2514"} </Text>
                     <Box width={32}>
                       <Text color={theme.text.link}>
                         {truncateName(skill.name, DETAIL_NAME_MAX_LEN)}
                       </Text>
-                      {skill.loaded && (
-                        <Text color={theme.status.success}> {t('active')}</Text>
-                      )}
+                      {skill.loaded && <Text color={theme.status.success}> {t("active")}</Text>}
                     </Box>
                     <Box flexGrow={1} justifyContent="flex-end">
                       <Text color={theme.text.secondary}>
-                        {formatTokens(skill.tokens)} {t('tokens')}
+                        {formatTokens(skill.tokens)} {t("tokens")}
                       </Text>
                     </Box>
                   </Box>
-                  {skill.loaded &&
-                    skill.bodyTokens != null &&
-                    skill.bodyTokens > 0 && (
-                      <Box width={CONTENT_WIDTH} paddingLeft={4}>
-                        <Text color={theme.text.secondary}>{'  \u2514'} </Text>
-                        <Box width={30}>
-                          <Text color={theme.text.secondary} italic>
-                            {t('body loaded')}
-                          </Text>
-                        </Box>
-                        <Box flexGrow={1} justifyContent="flex-end">
-                          <Text color={theme.status.success}>
-                            +{formatTokens(skill.bodyTokens)} {t('tokens')}
-                          </Text>
-                        </Box>
+                  {skill.loaded && skill.bodyTokens != null && skill.bodyTokens > 0 && (
+                    <Box width={CONTENT_WIDTH} paddingLeft={4}>
+                      <Text color={theme.text.secondary}>{"  \u2514"} </Text>
+                      <Box width={30}>
+                        <Text color={theme.text.secondary} italic>
+                          {t("body loaded")}
+                        </Text>
+                      </Box>
+                      <Box flexGrow={1} justifyContent="flex-end">
+                        <Text color={theme.status.success}>
+                          +{formatTokens(skill.bodyTokens)} {t("tokens")}
+                        </Text>
                       </Box>
-                    )}
+                    </Box>
+                  )}
                 </Box>
               ))}
             </Box>
@@ -415,7 +385,7 @@ export const ContextUsage: React.FC<ContextUsageProps> = ({
       ) : (
         <Box marginTop={1}>
           <Text color={theme.text.secondary} italic>
-            {t('Run /context detail for per-item breakdown.')}
+            {t("Run /context detail for per-item breakdown.")}
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/views/ExtensionsList.tsx b/apps/airiscode-cli/src/ui/components/views/ExtensionsList.tsx
index 39047f87b..c325a8c6e 100644
--- a/apps/airiscode-cli/src/ui/components/views/ExtensionsList.tsx
+++ b/apps/airiscode-cli/src/ui/components/views/ExtensionsList.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { ExtensionUpdateState } from '../../state/extensions.js';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import { Box, Text } from "ink";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { ExtensionUpdateState } from "../../state/extensions.js";
 
-const debugLogger = createDebugLogger('EXTENSIONS_LIST');
+const debugLogger = createDebugLogger("EXTENSIONS_LIST");
 
 export const ExtensionsList = () => {
   const { extensionsUpdateState, commandContext } = useUIState();
@@ -26,28 +26,28 @@ export const ExtensionsList = () => {
         {extensions.map((ext) => {
           const state = extensionsUpdateState.get(ext.name);
           const isActive = ext.isActive;
-          const activeString = isActive ? 'active' : 'disabled';
-          const activeColor = isActive ? 'green' : 'grey';
+          const activeString = isActive ? "active" : "disabled";
+          const activeColor = isActive ? "green" : "grey";
 
-          let stateColor = 'gray';
-          const stateText = state || 'unknown state';
+          let stateColor = "gray";
+          const stateText = state || "unknown state";
 
           switch (state) {
             case ExtensionUpdateState.CHECKING_FOR_UPDATES:
             case ExtensionUpdateState.UPDATING:
-              stateColor = 'cyan';
+              stateColor = "cyan";
               break;
             case ExtensionUpdateState.UPDATE_AVAILABLE:
             case ExtensionUpdateState.UPDATED_NEEDS_RESTART:
-              stateColor = 'yellow';
+              stateColor = "yellow";
               break;
             case ExtensionUpdateState.ERROR:
-              stateColor = 'red';
+              stateColor = "red";
               break;
             case ExtensionUpdateState.UP_TO_DATE:
             case ExtensionUpdateState.NOT_UPDATABLE:
             case ExtensionUpdateState.UPDATED:
-              stateColor = 'green';
+              stateColor = "green";
               break;
             default:
               debugLogger.error(`Unhandled ExtensionUpdateState ${state}`);
diff --git a/apps/airiscode-cli/src/ui/components/views/McpStatus.tsx b/apps/airiscode-cli/src/ui/components/views/McpStatus.tsx
index 91d2f7ced..d8c3e8185 100644
--- a/apps/airiscode-cli/src/ui/components/views/McpStatus.tsx
+++ b/apps/airiscode-cli/src/ui/components/views/McpStatus.tsx
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MCPServerConfig } from '@airiscode/core';
-import { MCPServerStatus } from '@airiscode/core';
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { theme } from '../../semantic-colors.js';
-import type {
-  HistoryItemMcpStatus,
-  JsonMcpPrompt,
-  JsonMcpTool,
-} from '../../types.js';
-import { t } from '../../../i18n/index.js';
+import type { MCPServerConfig } from "@airiscode/core";
+import { MCPServerStatus } from "@airiscode/core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../../i18n/index.js";
+import { theme } from "../../semantic-colors.js";
+import type { HistoryItemMcpStatus, JsonMcpPrompt, JsonMcpTool } from "../../types.js";
 
 interface McpStatusProps {
   servers: Record<string, MCPServerConfig>;
@@ -22,7 +18,7 @@ interface McpStatusProps {
   prompts: JsonMcpPrompt[];
   blockedServers: Array<{ name: string; extensionName: string }>;
   serverStatus: (serverName: string) => MCPServerStatus;
-  authStatus: HistoryItemMcpStatus['authStatus'];
+  authStatus: HistoryItemMcpStatus["authStatus"];
   discoveryInProgress: boolean;
   connectingServers: string[];
   showDescriptions: boolean;
@@ -48,7 +44,7 @@ export const McpStatus: React.FC<McpStatusProps> = ({
   if (serverNames.length === 0 && blockedServers.length === 0) {
     return (
       <Box flexDirection="column">
-        <Text>{t('No MCP servers configured.')}</Text>
+        <Text>{t("No MCP servers configured.")}</Text>
       </Box>
     );
   }
@@ -58,63 +54,56 @@ export const McpStatus: React.FC<McpStatusProps> = ({
       {discoveryInProgress && (
         <Box flexDirection="column" marginBottom={1}>
           <Text color={theme.status.warning}>
-            {t('⏳ MCP servers are starting up ({{count}} initializing)...', {
+            {t("⏳ MCP servers are starting up ({{count}} initializing)...", {
               count: String(connectingServers.length),
             })}
           </Text>
           <Text color={theme.text.primary}>
-            {t(
-              'Note: First startup may take longer. Tool availability will update automatically.',
-            )}
+            {t("Note: First startup may take longer. Tool availability will update automatically.")}
           </Text>
         </Box>
       )}
 
-      <Text bold>{t('Configured MCP servers:')}</Text>
+      <Text bold>{t("Configured MCP servers:")}</Text>
       <Box height={1} />
 
       {serverNames.map((serverName) => {
         const server = servers[serverName];
-        const serverTools = tools.filter(
-          (tool) => tool.serverName === serverName,
-        );
-        const serverPrompts = prompts.filter(
-          (prompt) => prompt.serverName === serverName,
-        );
+        const serverTools = tools.filter((tool) => tool.serverName === serverName);
+        const serverPrompts = prompts.filter((prompt) => prompt.serverName === serverName);
         const originalStatus = serverStatus(serverName);
-        const hasCachedItems =
-          serverTools.length > 0 || serverPrompts.length > 0;
+        const hasCachedItems = serverTools.length > 0 || serverPrompts.length > 0;
         const status =
           originalStatus === MCPServerStatus.DISCONNECTED && hasCachedItems
             ? MCPServerStatus.CONNECTED
             : originalStatus;
 
-        let statusIndicator = '';
-        let statusText = '';
+        let statusIndicator = "";
+        let statusText = "";
         let statusColor = theme.text.primary;
 
         switch (status) {
           case MCPServerStatus.CONNECTED:
-            statusIndicator = '🟢';
-            statusText = t('Ready');
+            statusIndicator = "🟢";
+            statusText = t("Ready");
             statusColor = theme.status.success;
             break;
           case MCPServerStatus.CONNECTING:
-            statusIndicator = '🔄';
-            statusText = t('Starting... (first startup may take longer)');
+            statusIndicator = "🔄";
+            statusText = t("Starting... (first startup may take longer)");
             statusColor = theme.status.warning;
             break;
           case MCPServerStatus.DISCONNECTED:
           default:
-            statusIndicator = '🔴';
-            statusText = t('Disconnected');
+            statusIndicator = "🔴";
+            statusText = t("Disconnected");
             statusColor = theme.status.error;
             break;
         }
 
         let serverDisplayName = serverName;
         if (server.extensionName) {
-          serverDisplayName += ` ${t('(from {{extensionName}})', {
+          serverDisplayName += ` ${t("(from {{extensionName}})", {
             extensionName: server.extensionName,
           })}`;
         }
@@ -125,32 +114,27 @@ export const McpStatus: React.FC<McpStatusProps> = ({
         if (toolCount > 0) {
           parts.push(
             toolCount === 1
-              ? t('{{count}} tool', { count: String(toolCount) })
-              : t('{{count}} tools', { count: String(toolCount) }),
+              ? t("{{count}} tool", { count: String(toolCount) })
+              : t("{{count}} tools", { count: String(toolCount) }),
           );
         }
         if (promptCount > 0) {
           parts.push(
             promptCount === 1
-              ? t('{{count}} prompt', { count: String(promptCount) })
-              : t('{{count}} prompts', { count: String(promptCount) }),
+              ? t("{{count}} prompt", { count: String(promptCount) })
+              : t("{{count}} prompts", { count: String(promptCount) }),
           );
         }
 
         const serverAuthStatus = authStatus[serverName];
         let authStatusNode: React.ReactNode = null;
-        if (serverAuthStatus === 'authenticated') {
-          authStatusNode = <Text> ({t('OAuth')})</Text>;
-        } else if (serverAuthStatus === 'expired') {
-          authStatusNode = (
-            <Text color={theme.status.error}> ({t('OAuth expired')})</Text>
-          );
-        } else if (serverAuthStatus === 'unauthenticated') {
+        if (serverAuthStatus === "authenticated") {
+          authStatusNode = <Text> ({t("OAuth")})</Text>;
+        } else if (serverAuthStatus === "expired") {
+          authStatusNode = <Text color={theme.status.error}> ({t("OAuth expired")})</Text>;
+        } else if (serverAuthStatus === "unauthenticated") {
           authStatusNode = (
-            <Text color={theme.status.warning}>
-              {' '}
-              ({t('OAuth not authenticated')})
-            </Text>
+            <Text color={theme.status.warning}> ({t("OAuth not authenticated")})</Text>
           );
         }
 
@@ -160,40 +144,35 @@ export const McpStatus: React.FC<McpStatusProps> = ({
               <Text color={statusColor}>{statusIndicator} </Text>
               <Text bold>{serverDisplayName}</Text>
               <Text>
-                {' - '}
+                {" - "}
                 {statusText}
                 {status === MCPServerStatus.CONNECTED &&
                   parts.length > 0 &&
-                  ` (${parts.join(', ')})`}
+                  ` (${parts.join(", ")})`}
               </Text>
               {authStatusNode}
             </Box>
             {status === MCPServerStatus.CONNECTING && (
-              <Text> ({t('tools and prompts will appear when ready')})</Text>
+              <Text> ({t("tools and prompts will appear when ready")})</Text>
             )}
             {status === MCPServerStatus.DISCONNECTED && toolCount > 0 && (
-              <Text>
-                ({t('{{count}} tools cached', { count: String(toolCount) })})
-              </Text>
+              <Text>({t("{{count}} tools cached", { count: String(toolCount) })})</Text>
             )}
 
             {showDescriptions && server?.description && (
-              <Text color={theme.text.secondary}>
-                {server.description.trim()}
-              </Text>
+              <Text color={theme.text.secondary}>{server.description.trim()}</Text>
             )}
 
             {serverTools.length > 0 && (
               <Box flexDirection="column" marginLeft={2}>
-                <Text color={theme.text.primary}>{t('Tools:')}</Text>
+                <Text color={theme.text.primary}>{t("Tools:")}</Text>
                 {serverTools.map((tool) => {
                   const schemaContent =
                     showSchema &&
                     tool.schema &&
                     (tool.schema.parametersJsonSchema || tool.schema.parameters)
                       ? JSON.stringify(
-                          tool.schema.parametersJsonSchema ??
-                            tool.schema.parameters,
+                          tool.schema.parametersJsonSchema ?? tool.schema.parameters,
                           null,
                           2,
                         )
@@ -206,19 +185,13 @@ export const McpStatus: React.FC<McpStatusProps> = ({
                       </Text>
                       {showDescriptions && tool.description && (
                         <Box marginLeft={2}>
-                          <Text color={theme.text.secondary}>
-                            {tool.description.trim()}
-                          </Text>
+                          <Text color={theme.text.secondary}>{tool.description.trim()}</Text>
                         </Box>
                       )}
                       {schemaContent && (
                         <Box flexDirection="column" marginLeft={4}>
-                          <Text color={theme.text.secondary}>
-                            {t('Parameters:')}
-                          </Text>
-                          <Text color={theme.text.secondary}>
-                            {schemaContent}
-                          </Text>
+                          <Text color={theme.text.secondary}>{t("Parameters:")}</Text>
+                          <Text color={theme.text.secondary}>{schemaContent}</Text>
                         </Box>
                       )}
                     </Box>
@@ -229,7 +202,7 @@ export const McpStatus: React.FC<McpStatusProps> = ({
 
             {serverPrompts.length > 0 && (
               <Box flexDirection="column" marginLeft={2}>
-                <Text color={theme.text.primary}>{t('Prompts:')}</Text>
+                <Text color={theme.text.primary}>{t("Prompts:")}</Text>
                 {serverPrompts.map((prompt) => (
                   <Box key={prompt.name} flexDirection="column">
                     <Text>
@@ -237,9 +210,7 @@ export const McpStatus: React.FC<McpStatusProps> = ({
                     </Text>
                     {showDescriptions && prompt.description && (
                       <Box marginLeft={2}>
-                        <Text color={theme.text.primary}>
-                          {prompt.description.trim()}
-                        </Text>
+                        <Text color={theme.text.primary}>{prompt.description.trim()}</Text>
                       </Box>
                     )}
                   </Box>
@@ -256,40 +227,37 @@ export const McpStatus: React.FC<McpStatusProps> = ({
           <Text bold>
             {server.name}
             {server.extensionName
-              ? ` ${t('(from {{extensionName}})', {
+              ? ` ${t("(from {{extensionName}})", {
                   extensionName: server.extensionName,
                 })}`
-              : ''}
+              : ""}
           </Text>
-          <Text> - {t('Blocked')}</Text>
+          <Text> - {t("Blocked")}</Text>
         </Box>
       ))}
 
       {showTips && (
         <Box flexDirection="column" marginTop={1}>
-          <Text color={theme.text.accent}>{t('💡 Tips:')}</Text>
+          <Text color={theme.text.accent}>{t("💡 Tips:")}</Text>
           <Text>
-            {'  '}- {t('Use')} <Text color={theme.text.accent}>/mcp desc</Text>{' '}
-            {t('to show server and tool descriptions')}
+            {"  "}- {t("Use")} <Text color={theme.text.accent}>/mcp desc</Text>{" "}
+            {t("to show server and tool descriptions")}
           </Text>
           <Text>
-            {'  '}- {t('Use')}{' '}
-            <Text color={theme.text.accent}>/mcp schema</Text>{' '}
-            {t('to show tool parameter schemas')}
+            {"  "}- {t("Use")} <Text color={theme.text.accent}>/mcp schema</Text>{" "}
+            {t("to show tool parameter schemas")}
           </Text>
           <Text>
-            {'  '}- {t('Use')}{' '}
-            <Text color={theme.text.accent}>/mcp nodesc</Text>{' '}
-            {t('to hide descriptions')}
+            {"  "}- {t("Use")} <Text color={theme.text.accent}>/mcp nodesc</Text>{" "}
+            {t("to hide descriptions")}
           </Text>
           <Text>
-            {'  '}- {t('Use')}{' '}
-            <Text color={theme.text.accent}>/mcp auth &lt;server-name&gt;</Text>{' '}
-            {t('to authenticate with OAuth-enabled servers')}
+            {"  "}- {t("Use")} <Text color={theme.text.accent}>/mcp auth &lt;server-name&gt;</Text>{" "}
+            {t("to authenticate with OAuth-enabled servers")}
           </Text>
           <Text>
-            {'  '}- {t('Press')} <Text color={theme.text.accent}>Ctrl+T</Text>{' '}
-            {t('to toggle tool descriptions on/off')}
+            {"  "}- {t("Press")} <Text color={theme.text.accent}>Ctrl+T</Text>{" "}
+            {t("to toggle tool descriptions on/off")}
           </Text>
         </Box>
       )}
diff --git a/apps/airiscode-cli/src/ui/components/views/SkillsList.tsx b/apps/airiscode-cli/src/ui/components/views/SkillsList.tsx
index c3d73c8e5..a356900e6 100644
--- a/apps/airiscode-cli/src/ui/components/views/SkillsList.tsx
+++ b/apps/airiscode-cli/src/ui/components/views/SkillsList.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { type SkillDefinition } from '../../types.js';
-import { t } from '../../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../../i18n/index.js";
+import { theme } from "../../semantic-colors.js";
+import { type SkillDefinition } from "../../types.js";
 
 interface SkillsListProps {
   skills: readonly SkillDefinition[];
@@ -17,20 +17,20 @@ interface SkillsListProps {
 export const SkillsList: React.FC<SkillsListProps> = ({ skills }) => (
   <Box flexDirection="column" marginBottom={1}>
     <Text bold color={theme.text.primary}>
-      {t('Available skills:')}
+      {t("Available skills:")}
     </Text>
     <Box height={1} />
     {skills.length > 0 ? (
       skills.map((skill) => (
         <Box key={skill.name} flexDirection="row">
-          <Text color={theme.text.primary}>{'  '}- </Text>
+          <Text color={theme.text.primary}>{"  "}- </Text>
           <Text bold color={theme.text.accent}>
             {skill.name}
           </Text>
         </Box>
       ))
     ) : (
-      <Text color={theme.text.primary}> {t('No skills available')}</Text>
+      <Text color={theme.text.primary}> {t("No skills available")}</Text>
     )}
   </Box>
 );
diff --git a/apps/airiscode-cli/src/ui/components/views/ToolsList.tsx b/apps/airiscode-cli/src/ui/components/views/ToolsList.tsx
index 30c7b33ea..4f73d0938 100644
--- a/apps/airiscode-cli/src/ui/components/views/ToolsList.tsx
+++ b/apps/airiscode-cli/src/ui/components/views/ToolsList.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { type ToolDefinition } from '../../types.js';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import { t } from '../../../i18n/index.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { t } from "../../../i18n/index.js";
+import { theme } from "../../semantic-colors.js";
+import { type ToolDefinition } from "../../types.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
 
 interface ToolsListProps {
   tools: readonly ToolDefinition[];
@@ -17,24 +17,20 @@ interface ToolsListProps {
   contentWidth: number;
 }
 
-export const ToolsList: React.FC<ToolsListProps> = ({
-  tools,
-  showDescriptions,
-  contentWidth,
-}) => (
+export const ToolsList: React.FC<ToolsListProps> = ({ tools, showDescriptions, contentWidth }) => (
   <Box flexDirection="column">
     <Text bold color={theme.text.primary}>
-      {t('Available AIRIS Code CLI tools:')}
+      {t("Available AIRIS Code CLI tools:")}
     </Text>
     <Box height={1} />
     {tools.length > 0 ? (
       tools.map((tool) => (
         <Box key={tool.name} flexDirection="row">
-          <Text color={theme.text.primary}>{'  '}- </Text>
+          <Text color={theme.text.primary}>{"  "}- </Text>
           <Box flexDirection="column">
             <Text bold color={theme.text.accent}>
               {tool.displayName}
-              {showDescriptions ? ` (${tool.name})` : ''}
+              {showDescriptions ? ` (${tool.name})` : ""}
             </Text>
             {showDescriptions && tool.description && (
               <MarkdownDisplay
@@ -47,7 +43,7 @@ export const ToolsList: React.FC<ToolsListProps> = ({
         </Box>
       ))
     ) : (
-      <Text color={theme.text.primary}> {t('No tools available')}</Text>
+      <Text color={theme.text.primary}> {t("No tools available")}</Text>
     )}
   </Box>
 );
diff --git a/apps/airiscode-cli/src/ui/constants.ts b/apps/airiscode-cli/src/ui/constants.ts
index 6b099fd80..6ffaf4c7d 100644
--- a/apps/airiscode-cli/src/ui/constants.ts
+++ b/apps/airiscode-cli/src/ui/constants.ts
@@ -9,21 +9,20 @@ const BoxBorderWidth = 1;
 export const BOX_PADDING_X = 1;
 
 // Calculate width based on art, padding, and border
-export const UI_WIDTH =
-  EstimatedArtWidth + BOX_PADDING_X * 2 + BoxBorderWidth * 2; // ~63
+export const UI_WIDTH = EstimatedArtWidth + BOX_PADDING_X * 2 + BoxBorderWidth * 2; // ~63
 
 export const STREAM_DEBOUNCE_MS = 100;
 
-export const SHELL_COMMAND_NAME = 'Shell Command';
+export const SHELL_COMMAND_NAME = "Shell Command";
 
-export const SHELL_NAME = 'Shell';
+export const SHELL_NAME = "Shell";
 
 // Tool status symbols used in ToolMessage component
 export const TOOL_STATUS = {
-  SUCCESS: '✓',
-  PENDING: 'o',
-  EXECUTING: '⊷',
-  CONFIRMING: '?',
-  CANCELED: '-',
-  ERROR: 'x',
+  SUCCESS: "✓",
+  PENDING: "o",
+  EXECUTING: "⊷",
+  CONFIRMING: "?",
+  CANCELED: "-",
+  ERROR: "x",
 } as const;
diff --git a/apps/airiscode-cli/src/ui/contexts/AgentViewContext.tsx b/apps/airiscode-cli/src/ui/contexts/AgentViewContext.tsx
index e8f25c637..caa91b91f 100644
--- a/apps/airiscode-cli/src/ui/contexts/AgentViewContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/AgentViewContext.tsx
@@ -15,19 +15,9 @@
  * in-process-only concerns and to make the feature self-contained.
  */
 
-import {
-  createContext,
-  useContext,
-  useCallback,
-  useMemo,
-  useState,
-} from 'react';
-import {
-  type AgentInteractive,
-  type ApprovalMode,
-  type Config,
-} from '@airiscode/core';
-import { useArenaInProcess } from '../hooks/useArenaInProcess.js';
+import { type AgentInteractive, type ApprovalMode, type Config } from "@airiscode/core";
+import { createContext, useCallback, useContext, useMemo, useState } from "react";
+import { useArenaInProcess } from "../hooks/useArenaInProcess.js";
 
 // ─── Types ──────────────────────────────────────────────────
 
@@ -83,10 +73,10 @@ const AgentViewActionsContext = createContext<AgentViewActions | null>(null);
 // ─── Defaults (used when no provider is mounted) ────────────
 
 const DEFAULT_STATE: AgentViewState = {
-  activeView: 'main',
+  activeView: "main",
   agents: new Map(),
   agentShellFocused: false,
-  agentInputBufferText: '',
+  agentInputBufferText: "",
   agentTabBarFocused: false,
   agentApprovalModes: new Map(),
 };
@@ -126,25 +116,20 @@ interface AgentViewProviderProps {
   children: React.ReactNode;
 }
 
-export function AgentViewProvider({
-  config,
-  children,
-}: AgentViewProviderProps) {
-  const [activeView, setActiveView] = useState<string>('main');
-  const [agents, setAgents] = useState<Map<string, RegisteredAgent>>(
-    () => new Map(),
-  );
+export function AgentViewProvider({ config, children }: AgentViewProviderProps) {
+  const [activeView, setActiveView] = useState<string>("main");
+  const [agents, setAgents] = useState<Map<string, RegisteredAgent>>(() => new Map());
   const [agentShellFocused, setAgentShellFocused] = useState(false);
-  const [agentInputBufferText, setAgentInputBufferText] = useState('');
+  const [agentInputBufferText, setAgentInputBufferText] = useState("");
   const [agentTabBarFocused, setAgentTabBarFocused] = useState(false);
-  const [agentApprovalModes, setAgentApprovalModes] = useState<
-    Map<string, ApprovalMode>
-  >(() => new Map());
+  const [agentApprovalModes, setAgentApprovalModes] = useState<Map<string, ApprovalMode>>(
+    () => new Map(),
+  );
 
   // ── Navigation ──
 
   const switchToMain = useCallback(() => {
-    setActiveView('main');
+    setActiveView("main");
     setAgentTabBarFocused(false);
   }, []);
 
@@ -158,14 +143,14 @@ export function AgentViewProvider({
   );
 
   const switchToNext = useCallback(() => {
-    const ids = ['main', ...agents.keys()];
+    const ids = ["main", ...agents.keys()];
     const currentIndex = ids.indexOf(activeView);
     const nextIndex = (currentIndex + 1) % ids.length;
     setActiveView(ids[nextIndex]!);
   }, [agents, activeView]);
 
   const switchToPrevious = useCallback(() => {
-    const ids = ['main', ...agents.keys()];
+    const ids = ["main", ...agents.keys()];
     const currentIndex = ids.indexOf(activeView);
     const prevIndex = (currentIndex - 1 + ids.length) % ids.length;
     setActiveView(ids[prevIndex]!);
@@ -215,13 +200,13 @@ export function AgentViewProvider({
       next.delete(agentId);
       return next;
     });
-    setActiveView((current) => (current === agentId ? 'main' : current));
+    setActiveView((current) => (current === agentId ? "main" : current));
   }, []);
 
   const unregisterAll = useCallback(() => {
     setAgents(new Map());
     setAgentApprovalModes(new Map());
-    setActiveView('main');
+    setActiveView("main");
     setAgentTabBarFocused(false);
   }, []);
 
diff --git a/apps/airiscode-cli/src/ui/contexts/AppContext.tsx b/apps/airiscode-cli/src/ui/contexts/AppContext.tsx
index 791c8a73a..79b2a05ef 100644
--- a/apps/airiscode-cli/src/ui/contexts/AppContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/AppContext.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
+import { createContext, useContext } from "react";
 
 export interface AppState {
   version: string;
@@ -16,7 +16,7 @@ export const AppContext = createContext<AppState | null>(null);
 export const useAppContext = () => {
   const context = useContext(AppContext);
   if (!context) {
-    throw new Error('useAppContext must be used within an AppProvider');
+    throw new Error("useAppContext must be used within an AppProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/contexts/ConfigContext.tsx b/apps/airiscode-cli/src/ui/contexts/ConfigContext.tsx
index 04dde6d73..65e3a98bd 100644
--- a/apps/airiscode-cli/src/ui/contexts/ConfigContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/ConfigContext.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useContext } from 'react';
-import { type Config } from '@airiscode/core';
+import { type Config } from "@airiscode/core";
+import React, { useContext } from "react";
 
 export const ConfigContext = React.createContext<Config | undefined>(undefined);
 
 export const useConfig = () => {
   const context = useContext(ConfigContext);
   if (context === undefined) {
-    throw new Error('useConfig must be used within a ConfigProvider');
+    throw new Error("useConfig must be used within a ConfigProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/contexts/KeypressContext.tsx b/apps/airiscode-cli/src/ui/contexts/KeypressContext.tsx
index 52af59729..4d6e5b447 100644
--- a/apps/airiscode-cli/src/ui/contexts/KeypressContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/KeypressContext.tsx
@@ -4,23 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/core';
+import readline from "node:readline";
+import { PassThrough } from "node:stream";
+import type { Config } from "@airiscode/core";
 import {
+  createDebugLogger,
   KittySequenceOverflowEvent,
   logKittySequenceOverflow,
-  createDebugLogger,
-} from '@airiscode/core';
-import { useStdin } from 'ink';
-import type React from 'react';
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-} from 'react';
-import readline from 'node:readline';
-import { PassThrough } from 'node:stream';
+} from "@airiscode/core";
+import { useStdin } from "ink";
+import type React from "react";
+import { createContext, useCallback, useContext, useEffect, useRef } from "react";
+import { FOCUS_IN, FOCUS_OUT } from "../hooks/useFocus.js";
+import { clipboardHasImage } from "../utils/clipboardUtils.js";
 import {
   BACKSLASH_ENTER_DETECTION_WINDOW_MS,
   CHAR_CODE_ESC,
@@ -29,18 +25,15 @@ import {
   KITTY_KEYCODE_ENTER,
   KITTY_KEYCODE_NUMPAD_ENTER,
   KITTY_KEYCODE_TAB,
-  MAX_KITTY_SEQUENCE_LENGTH,
   KITTY_MODIFIER_BASE,
   KITTY_MODIFIER_EVENT_TYPES_OFFSET,
-  MODIFIER_SHIFT_BIT,
+  MAX_KITTY_SEQUENCE_LENGTH,
   MODIFIER_ALT_BIT,
   MODIFIER_CTRL_BIT,
-} from '../utils/platformConstants.js';
-import { clipboardHasImage } from '../utils/clipboardUtils.js';
-
-import { FOCUS_IN, FOCUS_OUT } from '../hooks/useFocus.js';
+  MODIFIER_SHIFT_BIT,
+} from "../utils/platformConstants.js";
 
-const ESC = '\u001B';
+const ESC = "\u001B";
 export const PASTE_MODE_PREFIX = `${ESC}[200~`;
 export const PASTE_MODE_SUFFIX = `${ESC}[201~`;
 export const DRAG_COMPLETION_TIMEOUT_MS = 100; // Broadcast full path after 100ms if no more input
@@ -55,37 +48,37 @@ export const DOUBLE_QUOTE = '"';
 // Kitty keypad private-use keycodes (0xE000-0xE026)
 // Reference: https://sw.kovidgoyal.net/kitty/keyboard-protocol/#functional-key-definitions
 const KITTY_KEYPAD_PRINTABLE_KEYCODE_TO_CHAR: Record<number, string> = {
-  57399: '0',
-  57400: '1',
-  57401: '2',
-  57402: '3',
-  57403: '4',
-  57404: '5',
-  57405: '6',
-  57406: '7',
-  57407: '8',
-  57408: '9',
-  57409: '.',
-  57410: '/',
-  57411: '*',
-  57412: '-',
-  57413: '+',
+  57399: "0",
+  57400: "1",
+  57401: "2",
+  57402: "3",
+  57403: "4",
+  57404: "5",
+  57405: "6",
+  57406: "7",
+  57407: "8",
+  57408: "9",
+  57409: ".",
+  57410: "/",
+  57411: "*",
+  57412: "-",
+  57413: "+",
   // 57414 is keypad Enter - handled separately via CSI~ sequence
-  57415: '=',
-  57416: ',',
+  57415: "=",
+  57416: ",",
 };
 
 const KITTY_KEYPAD_FUNCTIONAL_KEYCODE_TO_NAME: Record<number, string> = {
-  57417: 'left',
-  57418: 'right',
-  57419: 'up',
-  57420: 'down',
-  57421: 'pageup',
-  57422: 'pagedown',
-  57423: 'home',
-  57424: 'end',
-  57425: 'insert',
-  57426: 'delete',
+  57417: "left",
+  57418: "right",
+  57419: "up",
+  57420: "down",
+  57421: "pageup",
+  57422: "pagedown",
+  57423: "home",
+  57424: "end",
+  57425: "insert",
+  57426: "delete",
 };
 
 export interface Key {
@@ -107,17 +100,13 @@ interface KeypressContextValue {
   pasteWorkaround: boolean;
 }
 
-const KeypressContext = createContext<KeypressContextValue | undefined>(
-  undefined,
-);
-const debugLogger = createDebugLogger('KEYPRESS');
+const KeypressContext = createContext<KeypressContextValue | undefined>(undefined);
+const debugLogger = createDebugLogger("KEYPRESS");
 
 export function useKeypressContext() {
   const context = useContext(KeypressContext);
   if (!context) {
-    throw new Error(
-      'useKeypressContext must be used within a KeypressProvider',
-    );
+    throw new Error("useKeypressContext must be used within a KeypressProvider");
   }
   return context;
 }
@@ -167,7 +156,7 @@ export function KeypressProvider({
 
     let isPaste = false;
     let pasteBuffer = Buffer.alloc(0);
-    const kittySequenceBufferRef = { current: '' };
+    const kittySequenceBufferRef = { current: "" };
     let kittySequenceTimeout: NodeJS.Timeout | null = null;
     let backslashTimeout: NodeJS.Timeout | null = null;
     let waitingForEnterAfterBackslash = false;
@@ -194,15 +183,13 @@ export function KeypressProvider({
           while (kittySequenceBufferRef.current) {
             const parsed = parseKittyPrefix(kittySequenceBufferRef.current);
             if (parsed) {
-              kittySequenceBufferRef.current =
-                kittySequenceBufferRef.current.slice(parsed.length);
+              kittySequenceBufferRef.current = kittySequenceBufferRef.current.slice(parsed.length);
               broadcast(parsed.key);
               continue;
             }
             const plain = parsePlainTextPrefix(kittySequenceBufferRef.current);
             if (plain) {
-              kittySequenceBufferRef.current =
-                kittySequenceBufferRef.current.slice(plain.length);
+              kittySequenceBufferRef.current = kittySequenceBufferRef.current.slice(plain.length);
               broadcast(plain.key);
               continue;
             }
@@ -212,11 +199,11 @@ export function KeypressProvider({
           if (kittySequenceBufferRef.current) {
             if (debugKeystrokeLogging) {
               debugLogger.debug(
-                '[DEBUG] Kitty buffer timeout, clearing:',
+                "[DEBUG] Kitty buffer timeout, clearing:",
                 kittySequenceBufferRef.current,
               );
             }
-            kittySequenceBufferRef.current = '';
+            kittySequenceBufferRef.current = "";
           }
         }
       }, KITTY_SEQUENCE_TIMEOUT_MS);
@@ -224,16 +211,12 @@ export function KeypressProvider({
 
     const clearKittyBufferAndTimeout = () => {
       clearKittyTimeout();
-      kittySequenceBufferRef.current = '';
+      kittySequenceBufferRef.current = "";
     };
 
     const createPrintableKey = (char: string): Key => {
       const printableName =
-        char === ' '
-          ? 'space'
-          : /^[A-Za-z]$/.test(char)
-            ? char.toLowerCase()
-            : char;
+        char === " " ? "space" : /^[A-Za-z]$/.test(char) ? char.toLowerCase() : char;
 
       return {
         name: printableName,
@@ -253,9 +236,7 @@ export function KeypressProvider({
     // Parse a single complete kitty/parameterized/legacy sequence from the start
     // of the buffer and return both the parsed Key and the number of characters
     // consumed. This enables peel-and-continue parsing for batched input.
-    const parseKittyPrefix = (
-      buffer: string,
-    ): { key: Key; length: number } | null => {
+    const parseKittyPrefix = (buffer: string): { key: Key; length: number } | null => {
       // In older terminals ESC [ Z was used as Cursor Backward Tabulation (CBT)
       // In newer terminals the same functionality of key combination for moving
       // backward through focusable elements is Shift+Tab, hence we will
@@ -271,7 +252,7 @@ export function KeypressProvider({
       if (m) {
         return {
           key: {
-            name: 'tab',
+            name: "tab",
             ctrl: false,
             meta: false,
             shift: true,
@@ -297,7 +278,7 @@ export function KeypressProvider({
         const ctrl = (bits & MODIFIER_CTRL_BIT) === MODIFIER_CTRL_BIT;
         return {
           key: {
-            name: 'tab',
+            name: "tab",
             ctrl,
             meta: alt,
             // Reverse tab implies Shift behavior; force shift regardless of mods
@@ -326,18 +307,18 @@ export function KeypressProvider({
         const ctrl = (bits & MODIFIER_CTRL_BIT) === MODIFIER_CTRL_BIT;
         const sym = m[2];
         const symbolToName: { [k: string]: string } = {
-          A: 'up',
-          B: 'down',
-          C: 'right',
-          D: 'left',
-          H: 'home',
-          F: 'end',
-          P: 'f1',
-          Q: 'f2',
-          R: 'f3',
-          S: 'f4',
+          A: "up",
+          B: "down",
+          C: "right",
+          D: "left",
+          H: "home",
+          F: "end",
+          P: "f1",
+          Q: "f2",
+          R: "f3",
+          S: "f4",
         };
-        const name = symbolToName[sym] || '';
+        const name = symbolToName[sym] || "";
         if (!name) return null;
         return {
           key: {
@@ -370,33 +351,32 @@ export function KeypressProvider({
           modifiers -= KITTY_MODIFIER_EVENT_TYPES_OFFSET;
         }
         const modifierBits = modifiers - KITTY_MODIFIER_BASE;
-        const shift =
-          (modifierBits & MODIFIER_SHIFT_BIT) === MODIFIER_SHIFT_BIT;
+        const shift = (modifierBits & MODIFIER_SHIFT_BIT) === MODIFIER_SHIFT_BIT;
         const alt = (modifierBits & MODIFIER_ALT_BIT) === MODIFIER_ALT_BIT;
         const ctrl = (modifierBits & MODIFIER_CTRL_BIT) === MODIFIER_CTRL_BIT;
         const terminator = m[3];
 
         // Tilde-coded functional keys (Delete, Insert, PageUp/Down, Home/End)
-        if (terminator === '~') {
+        if (terminator === "~") {
           let name: string | null = null;
           switch (keyCode) {
             case 1:
-              name = 'home';
+              name = "home";
               break;
             case 2:
-              name = 'insert';
+              name = "insert";
               break;
             case 3:
-              name = 'delete';
+              name = "delete";
               break;
             case 4:
-              name = 'end';
+              name = "end";
               break;
             case 5:
-              name = 'pageup';
+              name = "pageup";
               break;
             case 6:
-              name = 'pagedown';
+              name = "pagedown";
               break;
             default:
               break;
@@ -418,11 +398,11 @@ export function KeypressProvider({
         }
 
         const kittyKeyCodeToName: { [key: number]: string } = {
-          [CHAR_CODE_ESC]: 'escape',
-          [KITTY_KEYCODE_TAB]: 'tab',
-          [KITTY_KEYCODE_BACKSPACE]: 'backspace',
-          [KITTY_KEYCODE_ENTER]: 'return',
-          [KITTY_KEYCODE_NUMPAD_ENTER]: 'return',
+          [CHAR_CODE_ESC]: "escape",
+          [KITTY_KEYCODE_TAB]: "tab",
+          [KITTY_KEYCODE_BACKSPACE]: "backspace",
+          [KITTY_KEYCODE_ENTER]: "return",
+          [KITTY_KEYCODE_NUMPAD_ENTER]: "return",
         };
 
         const name = kittyKeyCodeToName[keyCode];
@@ -481,7 +461,7 @@ export function KeypressProvider({
         // such as keypad events, so exclude that range from generic printable
         // conversion and handle mapped keys explicitly above.
         if (
-          terminator === 'u' &&
+          terminator === "u" &&
           !ctrl &&
           keyCode >= 32 &&
           keyCode !== 127 &&
@@ -499,11 +479,7 @@ export function KeypressProvider({
         }
 
         // Ctrl+letters
-        if (
-          ctrl &&
-          keyCode >= 'a'.charCodeAt(0) &&
-          keyCode <= 'z'.charCodeAt(0)
-        ) {
+        if (ctrl && keyCode >= "a".charCodeAt(0) && keyCode <= "z".charCodeAt(0)) {
           const letter = String.fromCharCode(keyCode);
           return {
             key: {
@@ -527,12 +503,12 @@ export function KeypressProvider({
       if (m) {
         const sym = m[1];
         const nameMap: { [key: string]: string } = {
-          A: 'up',
-          B: 'down',
-          C: 'right',
-          D: 'left',
-          H: 'home',
-          F: 'end',
+          A: "up",
+          B: "down",
+          C: "right",
+          D: "left",
+          H: "home",
+          F: "end",
         };
         const name = nameMap[sym]!;
         return {
@@ -570,9 +546,7 @@ export function KeypressProvider({
       return null;
     };
 
-    const parsePlainTextPrefix = (
-      buffer: string,
-    ): { key: Key; length: number } | null => {
+    const parsePlainTextPrefix = (buffer: string): { key: Key; length: number } | null => {
       if (!buffer || buffer.startsWith(ESC)) {
         return null;
       }
@@ -607,15 +581,15 @@ export function KeypressProvider({
       if (key.sequence === FOCUS_IN || key.sequence === FOCUS_OUT) {
         return;
       }
-      if (key.name === 'paste-start') {
+      if (key.name === "paste-start") {
         isPaste = true;
         return;
       }
-      if (key.name === 'paste-end') {
+      if (key.name === "paste-end") {
         isPaste = false;
         if (pasteBuffer.toString().length > 0) {
           broadcast({
-            name: '',
+            name: "",
             ctrl: false,
             meta: false,
             shift: false,
@@ -625,7 +599,7 @@ export function KeypressProvider({
         } else {
           const hasImage = await clipboardHasImage();
           broadcast({
-            name: '',
+            name: "",
             ctrl: false,
             meta: false,
             shift: false,
@@ -648,7 +622,7 @@ export function KeypressProvider({
       // Modern terminals use bracketed paste mode (PASTE_MODE_PREFIX) for file drops,
       // which is handled above. This prevents input lag on quote keystrokes.
 
-      if (key.name === 'return' && waitingForEnterAfterBackslash) {
+      if (key.name === "return" && waitingForEnterAfterBackslash) {
         if (backslashTimeout) {
           clearTimeout(backslashTimeout);
           backslashTimeout = null;
@@ -657,12 +631,12 @@ export function KeypressProvider({
         broadcast({
           ...key,
           shift: true,
-          sequence: '\r', // Corrected escaping for newline
+          sequence: "\r", // Corrected escaping for newline
         });
         return;
       }
 
-      if (key.sequence === '\\' && !key.name) {
+      if (key.sequence === "\\" && !key.name) {
         // Corrected escaping for backslash
         waitingForEnterAfterBackslash = true;
         backslashTimeout = setTimeout(() => {
@@ -673,15 +647,15 @@ export function KeypressProvider({
         return;
       }
 
-      if (waitingForEnterAfterBackslash && key.name !== 'return') {
+      if (waitingForEnterAfterBackslash && key.name !== "return") {
         if (backslashTimeout) {
           clearTimeout(backslashTimeout);
           backslashTimeout = null;
         }
         waitingForEnterAfterBackslash = false;
         broadcast({
-          name: '',
-          sequence: '\\',
+          name: "",
+          sequence: "\\",
           ctrl: false,
           meta: false,
           shift: false,
@@ -689,25 +663,22 @@ export function KeypressProvider({
         });
       }
 
-      if (['up', 'down', 'left', 'right'].includes(key.name)) {
+      if (["up", "down", "left", "right"].includes(key.name)) {
         broadcast(key);
         return;
       }
 
-      if (
-        (key.ctrl && key.name === 'c') ||
-        key.sequence === `${ESC}${KITTY_CTRL_C}`
-      ) {
+      if ((key.ctrl && key.name === "c") || key.sequence === `${ESC}${KITTY_CTRL_C}`) {
         if (kittySequenceBufferRef.current && debugKeystrokeLogging) {
           debugLogger.debug(
-            '[DEBUG] Kitty buffer cleared on Ctrl+C:',
+            "[DEBUG] Kitty buffer cleared on Ctrl+C:",
             kittySequenceBufferRef.current,
           );
         }
         clearKittyBufferAndTimeout();
         if (key.sequence === `${ESC}${KITTY_CTRL_C}`) {
           broadcast({
-            name: 'c',
+            name: "c",
             ctrl: true,
             meta: false,
             shift: false,
@@ -734,10 +705,7 @@ export function KeypressProvider({
           startKittyTimeout();
 
           if (debugKeystrokeLogging) {
-            debugLogger.debug(
-              '[DEBUG] Kitty buffer accumulating:',
-              kittySequenceBufferRef.current,
-            );
+            debugLogger.debug("[DEBUG] Kitty buffer accumulating:", kittySequenceBufferRef.current);
           }
 
           // Try to peel off as many complete sequences as are available at the
@@ -749,26 +717,18 @@ export function KeypressProvider({
             const parsed = parseKittyPrefix(kittySequenceBufferRef.current);
             if (parsed) {
               if (debugKeystrokeLogging) {
-                const parsedSequence = kittySequenceBufferRef.current.slice(
-                  0,
-                  parsed.length,
-                );
+                const parsedSequence = kittySequenceBufferRef.current.slice(0, parsed.length);
                 if (kittySequenceBufferRef.current.length > parsed.length) {
                   debugLogger.debug(
-                    '[DEBUG] Kitty sequence parsed successfully (prefix):',
+                    "[DEBUG] Kitty sequence parsed successfully (prefix):",
                     parsedSequence,
                   );
                 } else {
-                  debugLogger.debug(
-                    '[DEBUG] Kitty sequence parsed successfully:',
-                    parsedSequence,
-                  );
+                  debugLogger.debug("[DEBUG] Kitty sequence parsed successfully:", parsedSequence);
                 }
               }
               // Consume the parsed prefix and broadcast it.
-              updateKittyBuffer(
-                kittySequenceBufferRef.current.slice(parsed.length),
-              );
+              updateKittyBuffer(kittySequenceBufferRef.current.slice(parsed.length));
               if (!kittySequenceBufferRef.current) {
                 clearKittyTimeout();
               }
@@ -783,18 +743,11 @@ export function KeypressProvider({
             if (completeUnsupportedCsiLength) {
               if (debugKeystrokeLogging) {
                 debugLogger.debug(
-                  '[DEBUG] Dropping unsupported complete CSI sequence:',
-                  kittySequenceBufferRef.current.slice(
-                    0,
-                    completeUnsupportedCsiLength,
-                  ),
+                  "[DEBUG] Dropping unsupported complete CSI sequence:",
+                  kittySequenceBufferRef.current.slice(0, completeUnsupportedCsiLength),
                 );
               }
-              updateKittyBuffer(
-                kittySequenceBufferRef.current.slice(
-                  completeUnsupportedCsiLength,
-                ),
-              );
+              updateKittyBuffer(kittySequenceBufferRef.current.slice(completeUnsupportedCsiLength));
               if (!kittySequenceBufferRef.current) {
                 clearKittyTimeout();
               }
@@ -802,19 +755,15 @@ export function KeypressProvider({
               continue;
             }
 
-            const plainTextPrefix = parsePlainTextPrefix(
-              kittySequenceBufferRef.current,
-            );
+            const plainTextPrefix = parsePlainTextPrefix(kittySequenceBufferRef.current);
             if (plainTextPrefix) {
               if (debugKeystrokeLogging) {
                 debugLogger.debug(
-                  '[DEBUG] Recovered plain text after kitty sequence:',
+                  "[DEBUG] Recovered plain text after kitty sequence:",
                   plainTextPrefix.key.sequence,
                 );
               }
-              updateKittyBuffer(
-                kittySequenceBufferRef.current.slice(plainTextPrefix.length),
-              );
+              updateKittyBuffer(kittySequenceBufferRef.current.slice(plainTextPrefix.length));
               if (!kittySequenceBufferRef.current) {
                 clearKittyTimeout();
               }
@@ -824,20 +773,15 @@ export function KeypressProvider({
             }
 
             // Look for the next potential CSI start beyond index 0
-            const nextStart = kittySequenceBufferRef.current.indexOf(
-              `${ESC}[`,
-              1,
-            );
+            const nextStart = kittySequenceBufferRef.current.indexOf(`${ESC}[`, 1);
             if (nextStart > 0) {
               if (debugKeystrokeLogging) {
                 debugLogger.debug(
-                  '[DEBUG] Skipping incomplete/invalid CSI prefix:',
+                  "[DEBUG] Skipping incomplete/invalid CSI prefix:",
                   kittySequenceBufferRef.current.slice(0, nextStart),
                 );
               }
-              updateKittyBuffer(
-                kittySequenceBufferRef.current.slice(nextStart),
-              );
+              updateKittyBuffer(kittySequenceBufferRef.current.slice(nextStart));
               if (!kittySequenceBufferRef.current) {
                 clearKittyTimeout();
               }
@@ -849,18 +793,16 @@ export function KeypressProvider({
           if (bufferedInputHandled) return;
 
           if (config?.getDebugMode() || debugKeystrokeLogging) {
-            const codes = Array.from(kittySequenceBufferRef.current).map(
-              (ch: string) => ch.charCodeAt(0),
+            const codes = Array.from(kittySequenceBufferRef.current).map((ch: string) =>
+              ch.charCodeAt(0),
             );
-            debugLogger.warn('Kitty sequence buffer has char codes:', codes);
+            debugLogger.warn("Kitty sequence buffer has char codes:", codes);
           }
 
-          if (
-            kittySequenceBufferRef.current.length > MAX_KITTY_SEQUENCE_LENGTH
-          ) {
+          if (kittySequenceBufferRef.current.length > MAX_KITTY_SEQUENCE_LENGTH) {
             if (debugKeystrokeLogging) {
               debugLogger.debug(
-                '[DEBUG] Kitty buffer overflow, clearing:',
+                "[DEBUG] Kitty buffer overflow, clearing:",
                 kittySequenceBufferRef.current,
               );
             }
@@ -878,7 +820,7 @@ export function KeypressProvider({
         }
       }
 
-      if (key.name === 'return' && key.sequence === `${ESC}\r`) {
+      if (key.name === "return" && key.sequence === `${ESC}\r`) {
         key.meta = true;
       }
       broadcast({ ...key, paste: isPaste });
@@ -892,8 +834,8 @@ export function KeypressProvider({
     };
 
     const createPasteKeyEvent = (
-      name: 'paste-start' | 'paste-end' | '' = '',
-      sequence: string = '',
+      name: "paste-start" | "paste-end" | "" = "",
+      sequence: string = "",
     ): Key => ({
       name,
       ctrl: false,
@@ -917,24 +859,22 @@ export function KeypressProvider({
         const prefixPos = data.indexOf(pasteModePrefixBuffer, cursor);
         const suffixPos = data.indexOf(pasteModeSuffixBuffer, cursor);
         const hasPrefix =
-          prefixPos !== -1 &&
-          prefixPos + pasteModePrefixBuffer.length <= data.length;
+          prefixPos !== -1 && prefixPos + pasteModePrefixBuffer.length <= data.length;
         const hasSuffix =
-          suffixPos !== -1 &&
-          suffixPos + pasteModeSuffixBuffer.length <= data.length;
+          suffixPos !== -1 && suffixPos + pasteModeSuffixBuffer.length <= data.length;
 
         let markerPos = -1;
         let markerLength = 0;
-        let markerType: 'prefix' | 'suffix' | null = null;
+        let markerType: "prefix" | "suffix" | null = null;
 
         if (hasPrefix && (!hasSuffix || prefixPos < suffixPos)) {
           markerPos = prefixPos;
           markerLength = pasteModePrefixBuffer.length;
-          markerType = 'prefix';
+          markerType = "prefix";
         } else if (hasSuffix) {
           markerPos = suffixPos;
           markerLength = pasteModeSuffixBuffer.length;
-          markerType = 'suffix';
+          markerType = "suffix";
         }
 
         if (markerPos === -1) {
@@ -945,10 +885,10 @@ export function KeypressProvider({
         if (nextData.length > 0) {
           keypressStream.write(nextData);
         }
-        if (markerType === 'prefix') {
-          handleKeypress(undefined, createPasteKeyEvent('paste-start'));
-        } else if (markerType === 'suffix') {
-          handleKeypress(undefined, createPasteKeyEvent('paste-end'));
+        if (markerType === "prefix") {
+          handleKeypress(undefined, createPasteKeyEvent("paste-start"));
+        } else if (markerType === "suffix") {
+          handleKeypress(undefined, createPasteKeyEvent("paste-end"));
         }
         cursor = markerPos + markerLength;
       }
@@ -967,9 +907,9 @@ export function KeypressProvider({
         keypressStream.write(rawDataBuffer);
       } else {
         // Flush raw data buffer as a paste event
-        handleKeypress(undefined, createPasteKeyEvent('paste-start'));
+        handleKeypress(undefined, createPasteKeyEvent("paste-start"));
         keypressStream.write(rawDataBuffer);
-        handleKeypress(undefined, createPasteKeyEvent('paste-end'));
+        handleKeypress(undefined, createPasteKeyEvent("paste-end"));
       }
 
       rawDataBuffer = Buffer.alloc(0);
@@ -977,7 +917,7 @@ export function KeypressProvider({
     };
 
     const handleRawKeypress = (_data: Buffer) => {
-      const data = Buffer.isBuffer(_data) ? _data : Buffer.from(_data, 'utf8');
+      const data = Buffer.isBuffer(_data) ? _data : Buffer.from(_data, "utf8");
 
       // Buffer the incoming data
       rawDataBuffer = Buffer.concat([rawDataBuffer, data]);
@@ -987,8 +927,7 @@ export function KeypressProvider({
       // On some Windows terminals, during a paste, the terminal might send a
       // single return character chunk. In this case, we need to wait a time period
       // to know if it is part of a paste or just a return character.
-      const isReturnChar =
-        rawDataBuffer.length <= 2 && rawDataBuffer.includes(0x0d);
+      const isReturnChar = rawDataBuffer.length <= 2 && rawDataBuffer.includes(0x0d);
       if (isReturnChar) {
         rawFlushTimeout = setTimeout(flushRawBuffer, 100);
       } else {
@@ -1004,20 +943,20 @@ export function KeypressProvider({
         escapeCodeTimeout: 0,
       });
       readline.emitKeypressEvents(keypressStream, rl);
-      keypressStream.on('keypress', handleKeypress);
-      stdin.on('data', handleRawKeypress);
+      keypressStream.on("keypress", handleKeypress);
+      stdin.on("data", handleRawKeypress);
     } else {
       rl = readline.createInterface({ input: stdin, escapeCodeTimeout: 0 });
       readline.emitKeypressEvents(stdin, rl);
-      stdin.on('keypress', handleKeypress);
+      stdin.on("keypress", handleKeypress);
     }
 
     return () => {
       if (usePassthrough) {
-        keypressStream.removeListener('keypress', handleKeypress);
-        stdin.removeListener('data', handleRawKeypress);
+        keypressStream.removeListener("keypress", handleKeypress);
+        stdin.removeListener("data", handleRawKeypress);
       } else {
-        stdin.removeListener('keypress', handleKeypress);
+        stdin.removeListener("keypress", handleKeypress);
       }
 
       rl.close();
@@ -1042,7 +981,7 @@ export function KeypressProvider({
       // Flush any pending paste data to avoid data loss on exit.
       if (isPaste) {
         broadcast({
-          name: '',
+          name: "",
           ctrl: false,
           meta: false,
           shift: false,
@@ -1063,9 +1002,7 @@ export function KeypressProvider({
   ]);
 
   return (
-    <KeypressContext.Provider
-      value={{ subscribe, unsubscribe, pasteWorkaround }}
-    >
+    <KeypressContext.Provider value={{ subscribe, unsubscribe, pasteWorkaround }}>
       {children}
     </KeypressContext.Provider>
   );
diff --git a/apps/airiscode-cli/src/ui/contexts/OverflowContext.tsx b/apps/airiscode-cli/src/ui/contexts/OverflowContext.tsx
index 9d8b78d4c..ddd92ab0d 100644
--- a/apps/airiscode-cli/src/ui/contexts/OverflowContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/OverflowContext.tsx
@@ -4,14 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import {
-  createContext,
-  useContext,
-  useState,
-  useCallback,
-  useMemo,
-} from 'react';
+import type React from "react";
+import { createContext, useCallback, useContext, useMemo, useState } from "react";
 
 interface OverflowState {
   overflowingIds: ReadonlySet<string>;
@@ -22,23 +16,16 @@ interface OverflowActions {
   removeOverflowingId: (id: string) => void;
 }
 
-const OverflowStateContext = createContext<OverflowState | undefined>(
-  undefined,
-);
+const OverflowStateContext = createContext<OverflowState | undefined>(undefined);
 
-const OverflowActionsContext = createContext<OverflowActions | undefined>(
-  undefined,
-);
+const OverflowActionsContext = createContext<OverflowActions | undefined>(undefined);
 
-export const useOverflowState = (): OverflowState | undefined =>
-  useContext(OverflowStateContext);
+export const useOverflowState = (): OverflowState | undefined => useContext(OverflowStateContext);
 
 export const useOverflowActions = (): OverflowActions | undefined =>
   useContext(OverflowActionsContext);
 
-export const OverflowProvider: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
+export const OverflowProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
   const [overflowingIds, setOverflowingIds] = useState(new Set<string>());
 
   const addOverflowingId = useCallback((id: string) => {
diff --git a/apps/airiscode-cli/src/ui/contexts/SessionContext.tsx b/apps/airiscode-cli/src/ui/contexts/SessionContext.tsx
index 2c3cc5e56..bbb9c1a0a 100644
--- a/apps/airiscode-cli/src/ui/contexts/SessionContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/SessionContext.tsx
@@ -4,28 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useState,
-  useMemo,
-  useEffect,
-} from 'react';
-
-import type {
-  SessionMetrics,
-  ModelMetrics,
-  ToolCallStats,
-} from '@airiscode/core';
-import { uiTelemetryService } from '@airiscode/core';
+import type { ModelMetrics, SessionMetrics, ToolCallStats } from "@airiscode/core";
+import { uiTelemetryService } from "@airiscode/core";
+import type React from "react";
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
 
 export enum ToolCallDecision {
-  ACCEPT = 'accept',
-  REJECT = 'reject',
-  MODIFY = 'modify',
-  AUTO_ACCEPT = 'auto_accept',
+  ACCEPT = "accept",
+  REJECT = "reject",
+  MODIFY = "modify",
+  AUTO_ACCEPT = "auto_accept",
 }
 
 function areModelMetricsEqual(a: ModelMetrics, b: ModelMetrics): boolean {
@@ -59,14 +47,10 @@ function areToolCallStatsEqual(a: ToolCallStats, b: ToolCallStats): boolean {
     return false;
   }
   if (
-    a.decisions[ToolCallDecision.ACCEPT] !==
-      b.decisions[ToolCallDecision.ACCEPT] ||
-    a.decisions[ToolCallDecision.REJECT] !==
-      b.decisions[ToolCallDecision.REJECT] ||
-    a.decisions[ToolCallDecision.MODIFY] !==
-      b.decisions[ToolCallDecision.MODIFY] ||
-    a.decisions[ToolCallDecision.AUTO_ACCEPT] !==
-      b.decisions[ToolCallDecision.AUTO_ACCEPT]
+    a.decisions[ToolCallDecision.ACCEPT] !== b.decisions[ToolCallDecision.ACCEPT] ||
+    a.decisions[ToolCallDecision.REJECT] !== b.decisions[ToolCallDecision.REJECT] ||
+    a.decisions[ToolCallDecision.MODIFY] !== b.decisions[ToolCallDecision.MODIFY] ||
+    a.decisions[ToolCallDecision.AUTO_ACCEPT] !== b.decisions[ToolCallDecision.AUTO_ACCEPT]
   ) {
     return false;
   }
@@ -138,7 +122,7 @@ function areMetricsEqual(a: SessionMetrics, b: SessionMetrics): boolean {
   return true;
 }
 
-export type { SessionMetrics, ModelMetrics };
+export type { ModelMetrics, SessionMetrics };
 
 export interface SessionStatsState {
   sessionId: string;
@@ -175,11 +159,9 @@ interface SessionStatsContextValue {
 
 // --- Context Definition ---
 
-const SessionStatsContext = createContext<SessionStatsContextValue | undefined>(
-  undefined,
-);
+const SessionStatsContext = createContext<SessionStatsContextValue | undefined>(undefined);
 
-const createDefaultStats = (sessionId: string = ''): SessionStatsState => ({
+const createDefaultStats = (sessionId: string = ""): SessionStatsState => ({
   sessionId,
   sessionStartTime: new Date(),
   metrics: uiTelemetryService.getMetrics(),
@@ -193,9 +175,7 @@ export const SessionStatsProvider: React.FC<{
   sessionId?: string;
   children: React.ReactNode;
 }> = ({ sessionId, children }) => {
-  const [stats, setStats] = useState<SessionStatsState>(() =>
-    createDefaultStats(sessionId ?? ''),
-  );
+  const [stats, setStats] = useState<SessionStatsState>(() => createDefaultStats(sessionId ?? ""));
 
   useEffect(() => {
     const handleUpdate = ({
@@ -220,7 +200,7 @@ export const SessionStatsProvider: React.FC<{
       });
     };
 
-    uiTelemetryService.on('update', handleUpdate);
+    uiTelemetryService.on("update", handleUpdate);
     // Set initial state
     handleUpdate({
       metrics: uiTelemetryService.getMetrics(),
@@ -228,7 +208,7 @@ export const SessionStatsProvider: React.FC<{
     });
 
     return () => {
-      uiTelemetryService.off('update', handleUpdate);
+      uiTelemetryService.off("update", handleUpdate);
     };
   }, []);
 
@@ -246,10 +226,7 @@ export const SessionStatsProvider: React.FC<{
     }));
   }, []);
 
-  const getPromptCount = useCallback(
-    () => stats.promptCount,
-    [stats.promptCount],
-  );
+  const getPromptCount = useCallback(() => stats.promptCount, [stats.promptCount]);
 
   const value = useMemo(
     () => ({
@@ -261,11 +238,7 @@ export const SessionStatsProvider: React.FC<{
     [stats, startNewSession, startNewPrompt, getPromptCount],
   );
 
-  return (
-    <SessionStatsContext.Provider value={value}>
-      {children}
-    </SessionStatsContext.Provider>
-  );
+  return <SessionStatsContext.Provider value={value}>{children}</SessionStatsContext.Provider>;
 };
 
 // --- Consumer Hook ---
@@ -273,9 +246,7 @@ export const SessionStatsProvider: React.FC<{
 export const useSessionStats = () => {
   const context = useContext(SessionStatsContext);
   if (context === undefined) {
-    throw new Error(
-      'useSessionStats must be used within a SessionStatsProvider',
-    );
+    throw new Error("useSessionStats must be used within a SessionStatsProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/contexts/SettingsContext.tsx b/apps/airiscode-cli/src/ui/contexts/SettingsContext.tsx
index 144e1a285..549c9f707 100644
--- a/apps/airiscode-cli/src/ui/contexts/SettingsContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/SettingsContext.tsx
@@ -4,17 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useContext } from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
+import React, { useContext } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
 
-export const SettingsContext = React.createContext<LoadedSettings | undefined>(
-  undefined,
-);
+export const SettingsContext = React.createContext<LoadedSettings | undefined>(undefined);
 
 export const useSettings = () => {
   const context = useContext(SettingsContext);
   if (context === undefined) {
-    throw new Error('useSettings must be used within a SettingsProvider');
+    throw new Error("useSettings must be used within a SettingsProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/contexts/ShellFocusContext.tsx b/apps/airiscode-cli/src/ui/contexts/ShellFocusContext.tsx
index aaed98c9d..19bf8649b 100644
--- a/apps/airiscode-cli/src/ui/contexts/ShellFocusContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/ShellFocusContext.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
+import { createContext, useContext } from "react";
 
 export const ShellFocusContext = createContext<boolean>(true);
 
diff --git a/apps/airiscode-cli/src/ui/contexts/StreamingContext.tsx b/apps/airiscode-cli/src/ui/contexts/StreamingContext.tsx
index 7195e21d4..54e92e63f 100644
--- a/apps/airiscode-cli/src/ui/contexts/StreamingContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/StreamingContext.tsx
@@ -4,19 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { createContext } from 'react';
-import type { StreamingState } from '../types.js';
+import React, { createContext } from "react";
+import type { StreamingState } from "../types.js";
 
-export const StreamingContext = createContext<StreamingState | undefined>(
-  undefined,
-);
+export const StreamingContext = createContext<StreamingState | undefined>(undefined);
 
 export const useStreamingContext = (): StreamingState => {
   const context = React.useContext(StreamingContext);
   if (context === undefined) {
-    throw new Error(
-      'useStreamingContext must be used within a StreamingContextProvider',
-    );
+    throw new Error("useStreamingContext must be used within a StreamingContextProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/contexts/UIActionsContext.tsx b/apps/airiscode-cli/src/ui/contexts/UIActionsContext.tsx
index 3bf622fee..578688d80 100644
--- a/apps/airiscode-cli/src/ui/contexts/UIActionsContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/UIActionsContext.tsx
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
-import { type Key } from '../hooks/useKeypress.js';
-import { type IdeIntegrationNudgeResult } from '../IdeIntegrationNudge.js';
-import { type CommandMigrationNudgeResult } from '../CommandFormatMigrationNudge.js';
-import { type FolderTrustChoice } from '../components/FolderTrustDialog.js';
-import {
-  type AuthType,
-  type EditorType,
-  type ApprovalMode,
-} from '@airiscode/core';
-import { type SettingScope } from '../../config/settings.js';
-import { type CodingPlanRegion } from '../../constants/codingPlan.js';
-import { type AlibabaStandardRegion } from '../../constants/alibabaStandardApiKey.js';
-import type { AuthState } from '../types.js';
-import { type ArenaDialogType } from '../hooks/useArenaCommand.js';
+import { type ApprovalMode, type AuthType, type EditorType } from "@airiscode/core";
+import { createContext, useContext } from "react";
+import { type SettingScope } from "../../config/settings.js";
+import { type AlibabaStandardRegion } from "../../constants/alibabaStandardApiKey.js";
+import { type CodingPlanRegion } from "../../constants/codingPlan.js";
+import { type CommandMigrationNudgeResult } from "../CommandFormatMigrationNudge.js";
+import { type FolderTrustChoice } from "../components/FolderTrustDialog.js";
+import { type ArenaDialogType } from "../hooks/useArenaCommand.js";
+import { type Key } from "../hooks/useKeypress.js";
+import { type IdeIntegrationNudgeResult } from "../IdeIntegrationNudge.js";
+import type { AuthState } from "../types.js";
 // OpenAICredentials type (previously imported from OpenAIKeyPrompt)
 export interface OpenAICredentials {
   apiKey: string;
@@ -29,23 +25,14 @@ export interface OpenAICredentials {
 export interface UIActions {
   openThemeDialog: () => void;
   openEditorDialog: () => void;
-  handleThemeSelect: (
-    themeName: string | undefined,
-    scope: SettingScope,
-  ) => void;
+  handleThemeSelect: (themeName: string | undefined, scope: SettingScope) => void;
   handleThemeHighlight: (themeName: string | undefined) => void;
-  handleApprovalModeSelect: (
-    mode: ApprovalMode | undefined,
-    scope: SettingScope,
-  ) => void;
+  handleApprovalModeSelect: (mode: ApprovalMode | undefined, scope: SettingScope) => void;
   handleAuthSelect: (
     authType: AuthType | undefined,
     credentials?: OpenAICredentials,
   ) => Promise<void>;
-  handleCodingPlanSubmit: (
-    apiKey: string,
-    region?: CodingPlanRegion,
-  ) => Promise<void>;
+  handleCodingPlanSubmit: (apiKey: string, region?: CodingPlanRegion) => Promise<void>;
   handleAlibabaStandardSubmit: (
     apiKey: string,
     region: AlibabaStandardRegion,
@@ -54,10 +41,7 @@ export interface UIActions {
   setAuthState: (state: AuthState) => void;
   onAuthError: (error: string | null) => void;
   cancelAuthentication: () => void;
-  handleEditorSelect: (
-    editorType: EditorType | undefined,
-    scope: SettingScope,
-  ) => void;
+  handleEditorSelect: (editorType: EditorType | undefined, scope: SettingScope) => void;
   exitEditorDialog: () => void;
   closeSettingsDialog: () => void;
   closeModelDialog: () => void;
@@ -80,7 +64,7 @@ export interface UIActions {
   handleRetryLastPrompt: () => void;
   handleClearScreen: () => void;
   // Welcome back dialog
-  handleWelcomeBackSelection: (choice: 'continue' | 'restart') => void;
+  handleWelcomeBackSelection: (choice: "continue" | "restart") => void;
   handleWelcomeBackClose: () => void;
   // Subagent dialogs
   closeSubagentCreateDialog: () => void;
@@ -109,7 +93,7 @@ export const UIActionsContext = createContext<UIActions | null>(null);
 export const useUIActions = () => {
   const context = useContext(UIActionsContext);
   if (!context) {
-    throw new Error('useUIActions must be used within a UIActionsProvider');
+    throw new Error("useUIActions must be used within a UIActionsProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/contexts/UIStateContext.tsx b/apps/airiscode-cli/src/ui/contexts/UIStateContext.tsx
index be0f7d829..2ed28411d 100644
--- a/apps/airiscode-cli/src/ui/contexts/UIStateContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/UIStateContext.tsx
@@ -4,37 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
+import type { ApprovalMode, AuthType, IdeContext, IdeInfo } from "@airiscode/core";
+import type { DOMElement } from "ink";
+import { createContext, useContext } from "react";
+import type { QwenAuthState } from "../auth/useAuth.js";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import type { SessionStatsState } from "../contexts/SessionContext.js";
+import { type ArenaDialogType } from "../hooks/useArenaCommand.js";
+import { type CodingPlanUpdateRequest } from "../hooks/useCodingPlanUpdates.js";
+import { type UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import { type RestartReason } from "../hooks/useIdeTrustListener.js";
+import type { ExtensionUpdateState } from "../state/extensions.js";
 import type {
+  ConfirmationRequest,
   HistoryItem,
   HistoryItemBtw,
-  ThoughtSummary,
-  ShellConfirmationRequest,
-  ConfirmationRequest,
-  LoopDetectionConfirmationRequest,
   HistoryItemWithoutId,
-  StreamingState,
-  SettingInputRequest,
+  LoopDetectionConfirmationRequest,
   PluginChoiceRequest,
-} from '../types.js';
-import type { QwenAuthState } from '../auth/useAuth.js';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import type {
-  AuthType,
-  IdeContext,
-  ApprovalMode,
-  IdeInfo,
-} from '@airiscode/core';
-import type { DOMElement } from 'ink';
-import type { SessionStatsState } from '../contexts/SessionContext.js';
-import type { ExtensionUpdateState } from '../state/extensions.js';
-import type { UpdateObject } from '../utils/updateCheck.js';
-
-import { type UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
-import { type RestartReason } from '../hooks/useIdeTrustListener.js';
-import { type CodingPlanUpdateRequest } from '../hooks/useCodingPlanUpdates.js';
-import { type ArenaDialogType } from '../hooks/useArenaCommand.js';
+  SettingInputRequest,
+  ShellConfirmationRequest,
+  StreamingState,
+  ThoughtSummary,
+} from "../types.js";
+import type { UpdateObject } from "../utils/updateCheck.js";
 
 export interface UIState {
   history: HistoryItem[];
@@ -129,7 +123,7 @@ export interface UIState {
     hasHistory: boolean;
     lastPrompt?: string;
   } | null;
-  welcomeBackChoice: 'continue' | 'restart' | null;
+  welcomeBackChoice: "continue" | "restart" | null;
   // Subagent dialogs
   isSubagentCreateDialogOpen: boolean;
   isAgentsManagerDialogOpen: boolean;
@@ -154,7 +148,7 @@ export const UIStateContext = createContext<UIState | null>(null);
 export const useUIState = () => {
   const context = useContext(UIStateContext);
   if (!context) {
-    throw new Error('useUIState must be used within a UIStateProvider');
+    throw new Error("useUIState must be used within a UIStateProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/contexts/VerboseModeContext.tsx b/apps/airiscode-cli/src/ui/contexts/VerboseModeContext.tsx
index becad58ea..b877a041e 100644
--- a/apps/airiscode-cli/src/ui/contexts/VerboseModeContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/VerboseModeContext.tsx
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
-import type { HistoryItemWithoutId } from '../types.js';
+import { createContext, useContext } from "react";
+import type { HistoryItemWithoutId } from "../types.js";
 
 interface VerboseModeContextType {
   verboseMode: boolean;
@@ -17,7 +17,6 @@ const VerboseModeContext = createContext<VerboseModeContextType>({
   frozenSnapshot: null,
 });
 
-export const useVerboseMode = (): VerboseModeContextType =>
-  useContext(VerboseModeContext);
+export const useVerboseMode = (): VerboseModeContextType => useContext(VerboseModeContext);
 
 export const VerboseModeProvider = VerboseModeContext.Provider;
diff --git a/apps/airiscode-cli/src/ui/contexts/VimModeContext.tsx b/apps/airiscode-cli/src/ui/contexts/VimModeContext.tsx
index 7f7cb7bf7..c4878da24 100644
--- a/apps/airiscode-cli/src/ui/contexts/VimModeContext.tsx
+++ b/apps/airiscode-cli/src/ui/contexts/VimModeContext.tsx
@@ -4,17 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useState,
-} from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
+import { createContext, useCallback, useContext, useEffect, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
 
-export type VimMode = 'NORMAL' | 'INSERT';
+export type VimMode = "NORMAL" | "INSERT";
 
 interface VimModeContextType {
   vimEnabled: boolean;
@@ -34,9 +28,7 @@ export const VimModeProvider = ({
 }) => {
   const initialVimEnabled = settings.merged.general?.vimMode ?? false;
   const [vimEnabled, setVimEnabled] = useState(initialVimEnabled);
-  const [vimMode, setVimMode] = useState<VimMode>(
-    initialVimEnabled ? 'NORMAL' : 'INSERT',
-  );
+  const [vimMode, setVimMode] = useState<VimMode>(initialVimEnabled ? "NORMAL" : "INSERT");
 
   useEffect(() => {
     // Initialize vimEnabled from settings on mount
@@ -44,7 +36,7 @@ export const VimModeProvider = ({
     setVimEnabled(enabled);
     // When vim mode is enabled, always start in NORMAL mode
     if (enabled) {
-      setVimMode('NORMAL');
+      setVimMode("NORMAL");
     }
   }, [settings.merged.general?.vimMode]);
 
@@ -53,9 +45,9 @@ export const VimModeProvider = ({
     setVimEnabled(newValue);
     // When enabling vim mode, start in NORMAL mode
     if (newValue) {
-      setVimMode('NORMAL');
+      setVimMode("NORMAL");
     }
-    await settings.setValue(SettingScope.User, 'general.vimMode', newValue);
+    await settings.setValue(SettingScope.User, "general.vimMode", newValue);
     return newValue;
   }, [vimEnabled, settings]);
 
@@ -66,15 +58,13 @@ export const VimModeProvider = ({
     setVimMode,
   };
 
-  return (
-    <VimModeContext.Provider value={value}>{children}</VimModeContext.Provider>
-  );
+  return <VimModeContext.Provider value={value}>{children}</VimModeContext.Provider>;
 };
 
 export const useVimMode = () => {
   const context = useContext(VimModeContext);
   if (context === undefined) {
-    throw new Error('useVimMode must be used within a VimModeProvider');
+    throw new Error("useVimMode must be used within a VimModeProvider");
   }
   return context;
 };
diff --git a/apps/airiscode-cli/src/ui/editors/editorSettingsManager.ts b/apps/airiscode-cli/src/ui/editors/editorSettingsManager.ts
index ea261fc05..744af812b 100644
--- a/apps/airiscode-cli/src/ui/editors/editorSettingsManager.ts
+++ b/apps/airiscode-cli/src/ui/editors/editorSettingsManager.ts
@@ -4,51 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  allowEditorTypeInSandbox,
-  checkHasEditorType,
-  type EditorType,
-} from '@airiscode/core';
+import { allowEditorTypeInSandbox, checkHasEditorType, type EditorType } from "@airiscode/core";
 
 export interface EditorDisplay {
   name: string;
-  type: EditorType | 'not_set';
+  type: EditorType | "not_set";
   disabled: boolean;
 }
 
 export const EDITOR_DISPLAY_NAMES: Record<EditorType, string> = {
-  cursor: 'Cursor',
-  emacs: 'Emacs',
-  neovim: 'Neovim',
-  vim: 'Vim',
-  vscode: 'VS Code',
-  vscodium: 'VSCodium',
-  windsurf: 'Windsurf',
-  zed: 'Zed',
-  trae: 'Trae',
+  cursor: "Cursor",
+  emacs: "Emacs",
+  neovim: "Neovim",
+  vim: "Vim",
+  vscode: "VS Code",
+  vscodium: "VSCodium",
+  windsurf: "Windsurf",
+  zed: "Zed",
+  trae: "Trae",
 };
 
 class EditorSettingsManager {
   private readonly availableEditors: EditorDisplay[];
 
   constructor() {
-    const editorTypes = Object.keys(
-      EDITOR_DISPLAY_NAMES,
-    ).sort() as EditorType[];
+    const editorTypes = Object.keys(EDITOR_DISPLAY_NAMES).sort() as EditorType[];
     this.availableEditors = [
       {
-        name: 'None',
-        type: 'not_set',
+        name: "None",
+        type: "not_set",
         disabled: false,
       },
       ...editorTypes.map((type) => {
         const hasEditor = checkHasEditorType(type);
         const isAllowedInSandbox = allowEditorTypeInSandbox(type);
 
-        let labelSuffix = !isAllowedInSandbox
-          ? ' (Not available in sandbox)'
-          : '';
-        labelSuffix = !hasEditor ? ' (Not installed)' : labelSuffix;
+        let labelSuffix = !isAllowedInSandbox ? " (Not available in sandbox)" : "";
+        labelSuffix = !hasEditor ? " (Not installed)" : labelSuffix;
 
         return {
           name: EDITOR_DISPLAY_NAMES[type] + labelSuffix,
diff --git a/apps/airiscode-cli/src/ui/hooks/atCommandProcessor.ts b/apps/airiscode-cli/src/ui/hooks/atCommandProcessor.ts
index 4c5e87ac8..0883c12ab 100644
--- a/apps/airiscode-cli/src/ui/hooks/atCommandProcessor.ts
+++ b/apps/airiscode-cli/src/ui/hooks/atCommandProcessor.ts
@@ -4,23 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import type { PartListUnion } from '@airiscode/core';
-import type { Config } from '@airiscode/core';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { Config, PartListUnion } from "@airiscode/core";
 import {
   getErrorMessage,
   isNodeError,
+  readManyFiles,
   Storage,
   unescapePath,
-  readManyFiles,
-} from '@airiscode/core';
+} from "@airiscode/core";
 import type {
   HistoryItemToolGroup,
   HistoryItemWithoutId,
   IndividualToolCallDisplay,
-} from '../types.js';
-import { ToolCallStatus } from '../types.js';
+} from "../types.js";
+import { ToolCallStatus } from "../types.js";
 
 interface HandleAtCommandParams {
   query: string;
@@ -39,7 +38,7 @@ interface HandleAtCommandResult {
 }
 
 interface AtCommandPart {
-  type: 'text' | 'atPath';
+  type: "text" | "atPath";
   content: string;
 }
 
@@ -57,8 +56,8 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     // Find next unescaped '@'
     while (nextSearchIndex < query.length) {
       if (
-        query[nextSearchIndex] === '@' &&
-        (nextSearchIndex === 0 || query[nextSearchIndex - 1] !== '\\')
+        query[nextSearchIndex] === "@" &&
+        (nextSearchIndex === 0 || query[nextSearchIndex - 1] !== "\\")
       ) {
         atIndex = nextSearchIndex;
         break;
@@ -69,7 +68,7 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     if (atIndex === -1) {
       // No more @
       if (currentIndex < query.length) {
-        parts.push({ type: 'text', content: query.substring(currentIndex) });
+        parts.push({ type: "text", content: query.substring(currentIndex) });
       }
       break;
     }
@@ -77,7 +76,7 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     // Add text before @
     if (atIndex > currentIndex) {
       parts.push({
-        type: 'text',
+        type: "text",
         content: query.substring(currentIndex, atIndex),
       });
     }
@@ -89,17 +88,16 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
       const char = query[pathEndIndex];
       if (inEscape) {
         inEscape = false;
-      } else if (char === '\\') {
+      } else if (char === "\\") {
         inEscape = true;
       } else if (/[,\s;!?()[\]{}]/.test(char)) {
         // Path ends at first whitespace or punctuation not escaped
         break;
-      } else if (char === '.') {
+      } else if (char === ".") {
         // For . we need to be more careful - only terminate if followed by whitespace or end of string
         // This allows file extensions like .txt, .js but terminates at sentence endings like "file.txt. Next sentence"
-        const nextChar =
-          pathEndIndex + 1 < query.length ? query[pathEndIndex + 1] : '';
-        if (nextChar === '' || /\s/.test(nextChar)) {
+        const nextChar = pathEndIndex + 1 < query.length ? query[pathEndIndex + 1] : "";
+        if (nextChar === "" || /\s/.test(nextChar)) {
           break;
         }
       }
@@ -108,13 +106,11 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     const rawAtPath = query.substring(atIndex, pathEndIndex);
     // unescapePath expects the @ symbol to be present, and will handle it.
     const atPath = unescapePath(rawAtPath);
-    parts.push({ type: 'atPath', content: atPath });
+    parts.push({ type: "atPath", content: atPath });
     currentIndex = pathEndIndex;
   }
   // Filter out empty text parts that might result from consecutive @paths or leading/trailing spaces
-  return parts.filter(
-    (part) => !(part.type === 'text' && part.content.trim() === ''),
-  );
+  return parts.filter((part) => !(part.type === "text" && part.content.trim() === ""));
 }
 
 /**
@@ -135,15 +131,13 @@ export async function handleAtCommand({
   addItem,
 }: HandleAtCommandParams): Promise<HandleAtCommandResult> {
   const commandParts = parseAllAtCommands(query);
-  const atPathCommandParts = commandParts.filter(
-    (part) => part.type === 'atPath',
-  );
+  const atPathCommandParts = commandParts.filter((part) => part.type === "atPath");
 
   const addToolGroup = (result: HandleAtCommandResult): void => {
     if (!addItem) return;
     if (result.toolDisplays && result.toolDisplays.length > 0) {
       const toolGroupItem: HistoryItemToolGroup = {
-        type: 'tool_group',
+        type: "tool_group",
         tools: result.toolDisplays,
       };
       addItem(toolGroupItem, userMessageTimestamp);
@@ -171,10 +165,8 @@ export async function handleAtCommand({
   for (const atPathPart of atPathCommandParts) {
     const originalAtPath = atPathPart.content; // e.g., "@file.txt" or "@"
 
-    if (originalAtPath === '@') {
-      onDebugMessage(
-        'Lone @ detected, will be treated as text in the modified query.',
-      );
+    if (originalAtPath === "@") {
+      onDebugMessage("Lone @ detected, will be treated as text in the modified query.");
       continue;
     }
 
@@ -187,15 +179,13 @@ export async function handleAtCommand({
     const projectTempDir = Storage.getGlobalTempDir();
     const absolutePathName = path.isAbsolute(pathName)
       ? pathName
-      : path.resolve(workspaceContext.getDirectories()[0] || '', pathName);
+      : path.resolve(workspaceContext.getDirectories()[0] || "", pathName);
 
     if (
       !absolutePathName.startsWith(projectTempDir) &&
       !workspaceContext.isPathWithinWorkspace(pathName)
     ) {
-      onDebugMessage(
-        `Path ${pathName} is not in the workspace and will be skipped.`,
-      );
+      onDebugMessage(`Path ${pathName} is not in the workspace and will be skipped.`);
       continue;
     }
 
@@ -213,15 +203,14 @@ export async function handleAtCommand({
       });
 
     if (gitIgnored || qwenIgnored) {
-      const reason =
-        gitIgnored && qwenIgnored ? 'both' : gitIgnored ? 'git' : 'airiscode';
+      const reason = gitIgnored && qwenIgnored ? "both" : gitIgnored ? "git" : "airiscode";
       ignoredByReason[reason].push(pathName);
       const reasonText =
-        reason === 'both'
-          ? 'ignored by both git and qwen'
-          : reason === 'git'
-            ? 'git-ignored'
-            : 'airiscode-ignored';
+        reason === "both"
+          ? "ignored by both git and qwen"
+          : reason === "git"
+            ? "git-ignored"
+            : "airiscode-ignored";
       onDebugMessage(`Path ${pathName} is ${reasonText} and will be skipped.`);
       continue;
     }
@@ -241,7 +230,7 @@ export async function handleAtCommand({
         }
         resolvedSuccessfully = true;
       } catch (error) {
-        if (isNodeError(error) && error.code === 'ENOENT') {
+        if (isNodeError(error) && error.code === "ENOENT") {
           sawNotFound = true;
           continue;
         } else {
@@ -258,34 +247,27 @@ export async function handleAtCommand({
       }
     }
     if (!resolvedSuccessfully && sawNotFound) {
-      onDebugMessage(
-        `Path ${pathName} not found. Path ${pathName} will be skipped.`,
-      );
+      onDebugMessage(`Path ${pathName} not found. Path ${pathName} will be skipped.`);
     }
   }
 
   // Construct the initial part of the query for the LLM
-  let initialQueryText = '';
+  let initialQueryText = "";
   for (let i = 0; i < commandParts.length; i++) {
     const part = commandParts[i];
-    if (part.type === 'text') {
+    if (part.type === "text") {
       initialQueryText += part.content;
     } else {
       // type === 'atPath'
       const resolvedSpec = atPathToResolvedSpecMap.get(part.content);
-      if (
-        i > 0 &&
-        initialQueryText.length > 0 &&
-        !initialQueryText.endsWith(' ')
-      ) {
+      if (i > 0 && initialQueryText.length > 0 && !initialQueryText.endsWith(" ")) {
         // Add space if previous part was text and didn't end with space, or if previous was @path
         const prevPart = commandParts[i - 1];
         if (
-          prevPart.type === 'text' ||
-          (prevPart.type === 'atPath' &&
-            atPathToResolvedSpecMap.has(prevPart.content))
+          prevPart.type === "text" ||
+          (prevPart.type === "atPath" && atPathToResolvedSpecMap.has(prevPart.content))
         ) {
-          initialQueryText += ' ';
+          initialQueryText += " ";
         }
       }
       if (resolvedSpec) {
@@ -296,10 +278,10 @@ export async function handleAtCommand({
         if (
           i > 0 &&
           initialQueryText.length > 0 &&
-          !initialQueryText.endsWith(' ') &&
-          !part.content.startsWith(' ')
+          !initialQueryText.endsWith(" ") &&
+          !part.content.startsWith(" ")
         ) {
-          initialQueryText += ' ';
+          initialQueryText += " ";
         }
         initialQueryText += part.content;
       }
@@ -309,30 +291,30 @@ export async function handleAtCommand({
 
   // Inform user about ignored paths
   const totalIgnored =
-    ignoredByReason['git'].length +
-    ignoredByReason['airiscode'].length +
-    ignoredByReason['both'].length;
+    ignoredByReason["git"].length +
+    ignoredByReason["airiscode"].length +
+    ignoredByReason["both"].length;
 
   if (totalIgnored > 0) {
     const messages = [];
-    if (ignoredByReason['git'].length) {
-      messages.push(`Git-ignored: ${ignoredByReason['git'].join(', ')}`);
+    if (ignoredByReason["git"].length) {
+      messages.push(`Git-ignored: ${ignoredByReason["git"].join(", ")}`);
     }
-    if (ignoredByReason['airiscode'].length) {
-      messages.push(`Qwen-ignored: ${ignoredByReason['airiscode'].join(', ')}`);
+    if (ignoredByReason["airiscode"].length) {
+      messages.push(`Qwen-ignored: ${ignoredByReason["airiscode"].join(", ")}`);
     }
-    if (ignoredByReason['both'].length) {
-      messages.push(`Ignored by both: ${ignoredByReason['both'].join(', ')}`);
+    if (ignoredByReason["both"].length) {
+      messages.push(`Ignored by both: ${ignoredByReason["both"].join(", ")}`);
     }
 
-    const message = `Ignored ${totalIgnored} files:\n${messages.join('\n')}`;
+    const message = `Ignored ${totalIgnored} files:\n${messages.join("\n")}`;
     onDebugMessage(message);
   }
 
   // Fallback for lone "@" or completely invalid @-commands resulting in empty initialQueryText
   if (pathSpecsToRead.length === 0) {
-    onDebugMessage('No valid file paths found in @ commands to read.');
-    if (initialQueryText === '@' && query.trim() === '@') {
+    onDebugMessage("No valid file paths found in @ commands to read.");
+    if (initialQueryText === "@" && query.trim() === "@") {
       // If the only thing was a lone @, pass original query (which might have spaces)
       return { processedQuery: [{ text: query }], shouldProceed: true };
     } else if (!initialQueryText && query) {
@@ -352,30 +334,26 @@ export async function handleAtCommand({
       signal,
     });
 
-    const parts = Array.isArray(result.contentParts)
-      ? result.contentParts
-      : [result.contentParts];
+    const parts = Array.isArray(result.contentParts) ? result.contentParts : [result.contentParts];
 
     // Create individual tool call displays for each file read
-    const toolCallDisplays: IndividualToolCallDisplay[] = result.files.map(
-      (file, index) => ({
-        callId: `client-read-${userMessageTimestamp}-${index}`,
-        name: file.isDirectory ? 'Read Directory' : 'Read File',
-        description: file.isDirectory
-          ? `Read directory ${path.basename(file.filePath)}`
-          : `Read file ${path.basename(file.filePath)}`,
-        status: ToolCallStatus.Success,
-        resultDisplay: undefined,
-        confirmationDetails: undefined,
-      }),
-    );
+    const toolCallDisplays: IndividualToolCallDisplay[] = result.files.map((file, index) => ({
+      callId: `client-read-${userMessageTimestamp}-${index}`,
+      name: file.isDirectory ? "Read Directory" : "Read File",
+      description: file.isDirectory
+        ? `Read directory ${path.basename(file.filePath)}`
+        : `Read file ${path.basename(file.filePath)}`,
+      status: ToolCallStatus.Success,
+      resultDisplay: undefined,
+      confirmationDetails: undefined,
+    }));
 
     const processedQueryParts: PartListUnion = [{ text: initialQueryText }];
 
     if (parts.length > 0 && !result.error) {
       // readManyFiles now returns properly formatted parts with headers and prefixes
       for (const part of parts) {
-        if (typeof part === 'string') {
+        if (typeof part === "string") {
           processedQueryParts.push({ text: part });
         } else {
           // part is a Part object (text, inlineData, or fileData)
@@ -383,7 +361,7 @@ export async function handleAtCommand({
         }
       }
     } else {
-      onDebugMessage('readManyFiles returned no content or empty content.');
+      onDebugMessage("readManyFiles returned no content or empty content.");
     }
 
     const processedResult: HandleAtCommandResult = {
@@ -396,7 +374,7 @@ export async function handleAtCommand({
     const chatRecorder = config.getChatRecordingService?.();
     chatRecorder?.recordAtCommand({
       filesRead: contentLabelsForDisplay,
-      status: 'success',
+      status: "success",
       userText: query,
     });
 
@@ -405,20 +383,20 @@ export async function handleAtCommand({
   } catch (error: unknown) {
     const errorToolCallDisplay: IndividualToolCallDisplay = {
       callId: `client-read-${userMessageTimestamp}`,
-      name: 'Read File(s)',
-      description: 'Error attempting to read files',
+      name: "Read File(s)",
+      description: "Error attempting to read files",
       status: ToolCallStatus.Error,
-      resultDisplay: `Error reading files (${contentLabelsForDisplay.join(', ')}): ${getErrorMessage(error)}`,
+      resultDisplay: `Error reading files (${contentLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
       confirmationDetails: undefined,
     };
     const chatRecorder = config.getChatRecordingService?.();
     const errorMessage =
-      typeof errorToolCallDisplay.resultDisplay === 'string'
+      typeof errorToolCallDisplay.resultDisplay === "string"
         ? errorToolCallDisplay.resultDisplay
         : undefined;
     chatRecorder?.recordAtCommand({
       filesRead: contentLabelsForDisplay,
-      status: 'error',
+      status: "error",
       message: errorMessage,
       userText: query,
     });
diff --git a/apps/airiscode-cli/src/ui/hooks/keyToAnsi.ts b/apps/airiscode-cli/src/ui/hooks/keyToAnsi.ts
index 1d5549ab0..d3bb4eb68 100644
--- a/apps/airiscode-cli/src/ui/hooks/keyToAnsi.ts
+++ b/apps/airiscode-cli/src/ui/hooks/keyToAnsi.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Key } from '../contexts/KeypressContext.js';
+import type { Key } from "../contexts/KeypressContext.js";
 
 export type { Key };
 
@@ -18,15 +18,13 @@ export type { Key };
 export function keyToAnsi(key: Key): string | null {
   if (key.ctrl) {
     // Ctrl + letter
-    if (key.name >= 'a' && key.name <= 'z') {
-      return String.fromCharCode(
-        key.name.charCodeAt(0) - 'a'.charCodeAt(0) + 1,
-      );
+    if (key.name >= "a" && key.name <= "z") {
+      return String.fromCharCode(key.name.charCodeAt(0) - "a".charCodeAt(0) + 1);
     }
     // Other Ctrl combinations might need specific handling
     switch (key.name) {
-      case 'c':
-        return '\x03'; // ETX (End of Text), commonly used for interrupt
+      case "c":
+        return "\x03"; // ETX (End of Text), commonly used for interrupt
       // Add other special ctrl cases if needed
       default:
         break;
@@ -35,37 +33,37 @@ export function keyToAnsi(key: Key): string | null {
 
   // Arrow keys and other special keys
   switch (key.name) {
-    case 'up':
-      return '\x1b[A';
-    case 'down':
-      return '\x1b[B';
-    case 'right':
-      return '\x1b[C';
-    case 'left':
-      return '\x1b[D';
-    case 'escape':
-      return '\x1b';
-    case 'tab':
-      return '\t';
-    case 'backspace':
-      return '\x7f';
-    case 'delete':
-      return '\x1b[3~';
-    case 'home':
-      return '\x1b[H';
-    case 'end':
-      return '\x1b[F';
-    case 'pageup':
-      return '\x1b[5~';
-    case 'pagedown':
-      return '\x1b[6~';
+    case "up":
+      return "\x1b[A";
+    case "down":
+      return "\x1b[B";
+    case "right":
+      return "\x1b[C";
+    case "left":
+      return "\x1b[D";
+    case "escape":
+      return "\x1b";
+    case "tab":
+      return "\t";
+    case "backspace":
+      return "\x7f";
+    case "delete":
+      return "\x1b[3~";
+    case "home":
+      return "\x1b[H";
+    case "end":
+      return "\x1b[F";
+    case "pageup":
+      return "\x1b[5~";
+    case "pagedown":
+      return "\x1b[6~";
     default:
       break;
   }
 
   // Enter/Return
-  if (key.name === 'return') {
-    return '\r';
+  if (key.name === "return") {
+    return "\r";
   }
 
   // If it's a simple character, return it.
diff --git a/apps/airiscode-cli/src/ui/hooks/shellCommandProcessor.ts b/apps/airiscode-cli/src/ui/hooks/shellCommandProcessor.ts
index 9637a0a43..5f6024d7a 100644
--- a/apps/airiscode-cli/src/ui/hooks/shellCommandProcessor.ts
+++ b/apps/airiscode-cli/src/ui/hooks/shellCommandProcessor.ts
@@ -4,36 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  HistoryItemWithoutId,
-  IndividualToolCallDisplay,
-} from '../types.js';
-import { ToolCallStatus } from '../types.js';
-import { useCallback, useState } from 'react';
-import type {
-  AnsiOutput,
-  Config,
-  GeminiClient,
-  ShellExecutionResult,
-} from '@airiscode/core';
+import crypto from "node:crypto";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import type { AnsiOutput, Config, GeminiClient, ShellExecutionResult } from "@airiscode/core";
 import {
   createDebugLogger,
   isBinary,
+  type PartListUnion,
   ShellExecutionService,
-} from '@airiscode/core';
-import { type PartListUnion } from '@airiscode/core';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { SHELL_COMMAND_NAME } from '../constants.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import crypto from 'node:crypto';
-import path from 'node:path';
-import os from 'node:os';
-import fs from 'node:fs';
-import { themeManager } from '../../ui/themes/theme-manager.js';
+} from "@airiscode/core";
+import { useCallback, useState } from "react";
+import { themeManager } from "../../ui/themes/theme-manager.js";
+import { SHELL_COMMAND_NAME } from "../constants.js";
+import type { HistoryItemWithoutId, IndividualToolCallDisplay } from "../types.js";
+import { ToolCallStatus } from "../types.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 const MAX_OUTPUT_LENGTH = 10000;
-const debugLogger = createDebugLogger('SHELL_COMMAND_PROCESSOR');
+const debugLogger = createDebugLogger("SHELL_COMMAND_PROCESSOR");
 
 function addShellCommandToGeminiHistory(
   geminiClient: GeminiClient,
@@ -42,11 +34,11 @@ function addShellCommandToGeminiHistory(
 ) {
   const modelContent =
     resultText.length > MAX_OUTPUT_LENGTH
-      ? resultText.substring(0, MAX_OUTPUT_LENGTH) + '\n... (truncated)'
+      ? resultText.substring(0, MAX_OUTPUT_LENGTH) + "\n... (truncated)"
       : resultText;
 
   geminiClient.addHistory({
-    role: 'user',
+    role: "user",
     parts: [
       {
         text: `I ran the following shell command:
@@ -68,10 +60,8 @@ ${modelContent}
  * Orchestrates command execution and updates history and agent context.
  */
 export const useShellCommandProcessor = (
-  addItemToHistory: UseHistoryManagerReturn['addItem'],
-  setPendingHistoryItem: React.Dispatch<
-    React.SetStateAction<HistoryItemWithoutId | null>
-  >,
+  addItemToHistory: UseHistoryManagerReturn["addItem"],
+  setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>,
   onExec: (command: Promise<void>) => void,
   onDebugMessage: (message: string) => void,
   config: Config,
@@ -83,18 +73,15 @@ export const useShellCommandProcessor = (
   const [activeShellPtyId, setActiveShellPtyId] = useState<number | null>(null);
   const handleShellCommand = useCallback(
     (rawQuery: PartListUnion, abortSignal: AbortSignal): boolean => {
-      if (typeof rawQuery !== 'string' || rawQuery.trim() === '') {
+      if (typeof rawQuery !== "string" || rawQuery.trim() === "") {
         return false;
       }
 
       const userMessageTimestamp = Date.now();
       const callId = `shell-${userMessageTimestamp}`;
-      addItemToHistory(
-        { type: 'user_shell', text: rawQuery },
-        userMessageTimestamp,
-      );
+      addItemToHistory({ type: "user_shell", text: rawQuery }, userMessageTimestamp);
 
-      const isWindows = os.platform() === 'win32';
+      const isWindows = os.platform() === "win32";
       const targetDir = config.getTargetDir();
       let commandToExecute = rawQuery;
       let pwdFilePath: string | undefined;
@@ -102,20 +89,18 @@ export const useShellCommandProcessor = (
       // On non-windows, wrap the command to capture the final working directory.
       if (!isWindows) {
         let command = rawQuery.trim();
-        const pwdFileName = `shell_pwd_${crypto.randomBytes(6).toString('hex')}.tmp`;
+        const pwdFileName = `shell_pwd_${crypto.randomBytes(6).toString("hex")}.tmp`;
         pwdFilePath = path.join(os.tmpdir(), pwdFileName);
         // Ensure command ends with a separator before adding our own.
-        if (!command.endsWith(';') && !command.endsWith('&')) {
-          command += ';';
+        if (!command.endsWith(";") && !command.endsWith("&")) {
+          command += ";";
         }
         commandToExecute = `{ ${command} }; __code=$?; pwd > "${pwdFilePath}"; exit $__code`;
       }
 
-      const executeCommand = async (
-        resolve: (value: void | PromiseLike<void>) => void,
-      ) => {
+      const executeCommand = async (resolve: (value: void | PromiseLike<void>) => void) => {
         let lastUpdateTime = Date.now();
-        let cumulativeStdout: string | AnsiOutput = '';
+        let cumulativeStdout: string | AnsiOutput = "";
         let isBinaryStream = false;
         let binaryBytesReceived = 0;
 
@@ -124,12 +109,12 @@ export const useShellCommandProcessor = (
           name: SHELL_COMMAND_NAME,
           description: rawQuery,
           status: ToolCallStatus.Executing,
-          resultDisplay: '',
+          resultDisplay: "",
           confirmationDetails: undefined,
         };
 
         setPendingHistoryItem({
-          type: 'tool_group',
+          type: "tool_group",
           tools: [initialToolDisplay],
           isUserInitiated: true,
         });
@@ -137,11 +122,9 @@ export const useShellCommandProcessor = (
         let executionPid: number | undefined;
 
         const abortHandler = () => {
-          onDebugMessage(
-            `Aborting shell command (PID: ${executionPid ?? 'unknown'})`,
-          );
+          onDebugMessage(`Aborting shell command (PID: ${executionPid ?? "unknown"})`);
         };
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
 
         onDebugMessage(`Executing in ${targetDir}: ${commandToExecute}`);
 
@@ -161,7 +144,7 @@ export const useShellCommandProcessor = (
             (event) => {
               let shouldUpdate = false;
               switch (event.type) {
-                case 'data':
+                case "data":
                   // Do not process text data if we've already switched to binary mode.
                   if (isBinaryStream) break;
                   // PTY provides the full screen state, so we just replace.
@@ -170,23 +153,23 @@ export const useShellCommandProcessor = (
                     cumulativeStdout = event.chunk;
                     shouldUpdate = true;
                   } else if (
-                    typeof event.chunk === 'string' &&
-                    typeof cumulativeStdout === 'string'
+                    typeof event.chunk === "string" &&
+                    typeof cumulativeStdout === "string"
                   ) {
                     cumulativeStdout += event.chunk;
                   }
                   break;
-                case 'binary_detected':
+                case "binary_detected":
                   isBinaryStream = true;
                   // Force an immediate UI update to show the binary detection message.
                   shouldUpdate = true;
                   break;
-                case 'binary_progress':
+                case "binary_progress":
                   isBinaryStream = true;
                   binaryBytesReceived = event.bytesReceived;
                   break;
                 default: {
-                  throw new Error('An unhandled ShellOutputEvent was found.');
+                  throw new Error("An unhandled ShellOutputEvent was found.");
                 }
               }
 
@@ -198,20 +181,16 @@ export const useShellCommandProcessor = (
                     binaryBytesReceived,
                   )} received]`;
                 } else {
-                  currentDisplayOutput =
-                    '[Binary output detected. Halting stream...]';
+                  currentDisplayOutput = "[Binary output detected. Halting stream...]";
                 }
               } else {
                 currentDisplayOutput = cumulativeStdout;
               }
 
               // Throttle pending UI updates, but allow forced updates.
-              if (
-                shouldUpdate ||
-                Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS
-              ) {
+              if (shouldUpdate || Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
                 setPendingHistoryItem((prevItem) => {
-                  if (prevItem?.type === 'tool_group') {
+                  if (prevItem?.type === "tool_group") {
                     return {
                       ...prevItem,
                       tools: prevItem.tools.map((tool) =>
@@ -219,7 +198,7 @@ export const useShellCommandProcessor = (
                           ? {
                               ...tool,
                               resultDisplay:
-                                typeof currentDisplayOutput === 'string'
+                                typeof currentDisplayOutput === "string"
                                   ? currentDisplayOutput
                                   : { ansiOutput: currentDisplayOutput },
                             }
@@ -243,7 +222,7 @@ export const useShellCommandProcessor = (
           if (pid) {
             setActiveShellPtyId(pid);
             setPendingHistoryItem((prevItem) => {
-              if (prevItem?.type === 'tool_group') {
+              if (prevItem?.type === "tool_group") {
                 return {
                   ...prevItem,
                   tools: prevItem.tools.map((tool) =>
@@ -262,11 +241,9 @@ export const useShellCommandProcessor = (
               let mainContent: string;
 
               if (isBinary(result.rawOutput)) {
-                mainContent =
-                  '[Command produced binary output, which is not shown.]';
+                mainContent = "[Command produced binary output, which is not shown.]";
               } else {
-                mainContent =
-                  result.output.trim() || '(Command produced no output)';
+                mainContent = result.output.trim() || "(Command produced no output)";
               }
 
               let finalOutput = mainContent;
@@ -287,7 +264,7 @@ export const useShellCommandProcessor = (
               }
 
               if (pwdFilePath && fs.existsSync(pwdFilePath)) {
-                const finalPwd = fs.readFileSync(pwdFilePath, 'utf8').trim();
+                const finalPwd = fs.readFileSync(pwdFilePath, "utf8").trim();
                 if (finalPwd && finalPwd !== targetDir) {
                   const warning = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.`;
                   finalOutput = `${warning}\n\n${finalOutput}`;
@@ -303,7 +280,7 @@ export const useShellCommandProcessor = (
               // Add the complete, contextual result to the local UI history.
               addItemToHistory(
                 {
-                  type: 'tool_group',
+                  type: "tool_group",
                   tools: [finalToolDisplay],
                   isUserInitiated: true,
                 } as HistoryItemWithoutId,
@@ -311,26 +288,21 @@ export const useShellCommandProcessor = (
               );
 
               // Add the same complete, contextual result to the LLM's history.
-              addShellCommandToGeminiHistory(
-                geminiClient,
-                rawQuery,
-                finalOutput,
-              );
+              addShellCommandToGeminiHistory(geminiClient, rawQuery, finalOutput);
             })
             .catch((err) => {
               setPendingHistoryItem(null);
-              const errorMessage =
-                err instanceof Error ? err.message : String(err);
+              const errorMessage = err instanceof Error ? err.message : String(err);
               addItemToHistory(
                 {
-                  type: 'error',
+                  type: "error",
                   text: `An unexpected error occurred: ${errorMessage}`,
                 },
                 userMessageTimestamp,
               );
             })
             .finally(() => {
-              abortSignal.removeEventListener('abort', abortHandler);
+              abortSignal.removeEventListener("abort", abortHandler);
               if (pwdFilePath && fs.existsSync(pwdFilePath)) {
                 fs.unlinkSync(pwdFilePath);
               }
@@ -344,7 +316,7 @@ export const useShellCommandProcessor = (
           const errorMessage = err instanceof Error ? err.message : String(err);
           addItemToHistory(
             {
-              type: 'error',
+              type: "error",
               text: `An unexpected error occurred: ${errorMessage}`,
             },
             userMessageTimestamp,
diff --git a/apps/airiscode-cli/src/ui/hooks/slashCommandProcessor.ts b/apps/airiscode-cli/src/ui/hooks/slashCommandProcessor.ts
index ba5f2e344..17d3bad4e 100644
--- a/apps/airiscode-cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/apps/airiscode-cli/src/ui/hooks/slashCommandProcessor.ts
@@ -4,68 +4,63 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useMemo, useEffect, useRef, useState } from 'react';
-import { type PartListUnion } from '@airiscode/core';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import type { ArenaDialogType } from './useArenaCommand.js';
 import {
-  type Logger,
   type Config,
   createDebugLogger,
   GitService,
+  IdeClient,
+  type Logger,
   logSlashCommand,
   makeSlashCommandEvent,
+  type PartListUnion,
   SlashCommandStatus,
   ToolConfirmationOutcome,
-  IdeClient,
-} from '@airiscode/core';
-import { useSessionStats } from '../contexts/SessionContext.js';
+} from "@airiscode/core";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { BuiltinCommandLoader } from "../../services/BuiltinCommandLoader.js";
+import { BundledSkillLoader } from "../../services/BundledSkillLoader.js";
+import { CommandService } from "../../services/CommandService.js";
+import { FileCommandLoader } from "../../services/FileCommandLoader.js";
+import { McpPromptLoader } from "../../services/McpPromptLoader.js";
+import { parseSlashCommand } from "../../utils/commands.js";
+import { clearScreen } from "../../utils/stdioHelpers.js";
+import { type CommandContext, type SlashCommand } from "../commands/types.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { type ExtensionUpdateAction, type ExtensionUpdateStatus } from "../state/extensions.js";
 import type {
-  Message,
-  HistoryItemWithoutId,
+  ConfirmationRequest,
+  HistoryItem,
   HistoryItemBtw,
+  HistoryItemWithoutId,
+  Message,
   SlashCommandProcessorResult,
-  HistoryItem,
-  ConfirmationRequest,
-} from '../types.js';
-import { MessageType } from '../types.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { type CommandContext, type SlashCommand } from '../commands/types.js';
-import { CommandService } from '../../services/CommandService.js';
-import { BuiltinCommandLoader } from '../../services/BuiltinCommandLoader.js';
-import { BundledSkillLoader } from '../../services/BundledSkillLoader.js';
-import { FileCommandLoader } from '../../services/FileCommandLoader.js';
-import { McpPromptLoader } from '../../services/McpPromptLoader.js';
-import { parseSlashCommand } from '../../utils/commands.js';
-import { isBtwCommand } from '../utils/commandUtils.js';
-import { clearScreen } from '../../utils/stdioHelpers.js';
-import { useKeypress } from './useKeypress.js';
-import {
-  type ExtensionUpdateAction,
-  type ExtensionUpdateStatus,
-} from '../state/extensions.js';
+} from "../types.js";
+import { MessageType } from "../types.js";
+import { isBtwCommand } from "../utils/commandUtils.js";
+import type { ArenaDialogType } from "./useArenaCommand.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { useKeypress } from "./useKeypress.js";
 
 type SerializableHistoryItem = Record<string, unknown>;
-const debugLogger = createDebugLogger('SLASH_COMMAND_PROCESSOR');
+const debugLogger = createDebugLogger("SLASH_COMMAND_PROCESSOR");
 
-function serializeHistoryItemForRecording(
-  item: Omit<HistoryItem, 'id'>,
-): SerializableHistoryItem {
+function serializeHistoryItemForRecording(item: Omit<HistoryItem, "id">): SerializableHistoryItem {
   const clone: SerializableHistoryItem = { ...item };
-  if ('timestamp' in clone && clone['timestamp'] instanceof Date) {
-    clone['timestamp'] = clone['timestamp'].toISOString();
+  if ("timestamp" in clone && clone["timestamp"] instanceof Date) {
+    clone["timestamp"] = clone["timestamp"].toISOString();
   }
   return clone;
 }
 
 const SLASH_COMMANDS_SKIP_RECORDING = new Set([
-  'quit',
-  'exit',
-  'clear',
-  'reset',
-  'new',
-  'resume',
-  'btw',
+  "quit",
+  "exit",
+  "clear",
+  "reset",
+  "new",
+  "resume",
+  "btw",
 ]);
 
 interface SlashCommandProcessorActions {
@@ -96,9 +91,9 @@ interface SlashCommandProcessorActions {
 export const useSlashCommandProcessor = (
   config: Config | null,
   settings: LoadedSettings,
-  addItem: UseHistoryManagerReturn['addItem'],
-  clearItems: UseHistoryManagerReturn['clearItems'],
-  loadHistory: UseHistoryManagerReturn['loadHistory'],
+  addItem: UseHistoryManagerReturn["addItem"],
+  clearItems: UseHistoryManagerReturn["clearItems"],
+  loadHistory: UseHistoryManagerReturn["loadHistory"],
   refreshStatic: () => void,
   toggleVimEnabled: () => Promise<boolean>,
   isProcessing: boolean,
@@ -116,22 +111,16 @@ export const useSlashCommandProcessor = (
   const reloadCommands = useCallback(() => {
     setReloadTrigger((v) => v + 1);
   }, []);
-  const [shellConfirmationRequest, setShellConfirmationRequest] =
-    useState<null | {
-      commands: string[];
-      onConfirm: (
-        outcome: ToolConfirmationOutcome,
-        approvedCommands?: string[],
-      ) => void;
-    }>(null);
+  const [shellConfirmationRequest, setShellConfirmationRequest] = useState<null | {
+    commands: string[];
+    onConfirm: (outcome: ToolConfirmationOutcome, approvedCommands?: string[]) => void;
+  }>(null);
   const [confirmationRequest, setConfirmationRequest] = useState<null | {
     prompt: React.ReactNode;
     onConfirm: (confirmed: boolean) => void;
   }>(null);
 
-  const [sessionShellAllowlist, setSessionShellAllowlist] = useState(
-    new Set<string>(),
-  );
+  const [sessionShellAllowlist, setSessionShellAllowlist] = useState(new Set<string>());
   const gitService = useMemo(() => {
     if (!config?.getProjectRoot()) {
       return;
@@ -139,9 +128,7 @@ export const useSlashCommandProcessor = (
     return new GitService(config.getProjectRoot(), config.storage);
   }, [config]);
 
-  const [pendingItem, setPendingItem] = useState<HistoryItemWithoutId | null>(
-    null,
-  );
+  const [pendingItem, setPendingItem] = useState<HistoryItemWithoutId | null>(null);
 
   const [btwItem, setBtwItem] = useState<HistoryItemBtw | null>(null);
   const btwAbortControllerRef = useRef<AbortController | null>(null);
@@ -164,7 +151,7 @@ export const useSlashCommandProcessor = (
     addItem(
       {
         type: MessageType.INFO,
-        text: 'Command cancelled.',
+        text: "Command cancelled.",
       },
       Date.now(),
     );
@@ -174,7 +161,7 @@ export const useSlashCommandProcessor = (
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         cancelSlashCommand();
       }
     },
@@ -195,45 +182,45 @@ export const useSlashCommandProcessor = (
       let historyItemContent: HistoryItemWithoutId;
       if (message.type === MessageType.ABOUT) {
         historyItemContent = {
-          type: 'about',
+          type: "about",
           systemInfo: message.systemInfo,
         };
       } else if (message.type === MessageType.HELP) {
         historyItemContent = {
-          type: 'help',
+          type: "help",
           timestamp: message.timestamp,
         };
       } else if (message.type === MessageType.STATS) {
         historyItemContent = {
-          type: 'stats',
+          type: "stats",
           duration: message.duration,
         };
       } else if (message.type === MessageType.MODEL_STATS) {
         historyItemContent = {
-          type: 'model_stats',
+          type: "model_stats",
         };
       } else if (message.type === MessageType.TOOL_STATS) {
         historyItemContent = {
-          type: 'tool_stats',
+          type: "tool_stats",
         };
       } else if (message.type === MessageType.QUIT) {
         historyItemContent = {
-          type: 'quit',
+          type: "quit",
           duration: message.duration,
         };
       } else if (message.type === MessageType.COMPRESSION) {
         historyItemContent = {
-          type: 'compression',
+          type: "compression",
           compression: message.compression,
         };
       } else if (message.type === MessageType.SUMMARY) {
         historyItemContent = {
-          type: 'summary',
+          type: "summary",
           summary: message.summary,
         };
       } else if (message.type === MessageType.INSIGHT_PROGRESS) {
         historyItemContent = {
-          type: 'insight_progress',
+          type: "insight_progress",
           progress: message.progress,
         };
       } else {
@@ -274,8 +261,7 @@ export const useSlashCommandProcessor = (
         reloadCommands,
         extensionsUpdateState,
         dispatchExtensionStateUpdate: actions.dispatchExtensionStateUpdate,
-        addConfirmUpdateExtensionRequest:
-          actions.addConfirmUpdateExtensionRequest,
+        addConfirmUpdateExtensionRequest: actions.addConfirmUpdateExtensionRequest,
       },
       session: {
         stats: sessionStats,
@@ -340,16 +326,13 @@ export const useSlashCommandProcessor = (
           new BundledSkillLoader(config),
           new FileCommandLoader(config),
         ];
-        const commandService = await CommandService.create(
-          loaders,
-          controller.signal,
-        );
+        const commandService = await CommandService.create(loaders, controller.signal);
         // Avoid overwriting newer results from a subsequent effect run
         if (!controller.signal.aborted) {
           setCommands(commandService.getCommands());
         }
       } catch (error) {
-        debugLogger.error('Failed to load slash commands:', error);
+        debugLogger.error("Failed to load slash commands:", error);
       }
     };
 
@@ -366,23 +349,20 @@ export const useSlashCommandProcessor = (
       oneTimeShellAllowlist?: Set<string>,
       overwriteConfirmed?: boolean,
     ): Promise<SlashCommandProcessorResult | false> => {
-      if (typeof rawQuery !== 'string') {
+      if (typeof rawQuery !== "string") {
         return false;
       }
 
       const trimmed = rawQuery.trim();
-      if (!trimmed.startsWith('/') && !trimmed.startsWith('?')) {
+      if (!trimmed.startsWith("/") && !trimmed.startsWith("?")) {
         return false;
       }
 
-      const recordedItems: Array<Omit<HistoryItem, 'id'>> = [];
-      const recordItem = (item: Omit<HistoryItem, 'id'>) => {
+      const recordedItems: Array<Omit<HistoryItem, "id">> = [];
+      const recordItem = (item: Omit<HistoryItem, "id">) => {
         recordedItems.push(item);
       };
-      const addItemWithRecording: UseHistoryManagerReturn['addItem'] = (
-        item,
-        timestamp,
-      ) => {
+      const addItemWithRecording: UseHistoryManagerReturn["addItem"] = (item, timestamp) => {
         recordItem(item);
         return addItem(item, timestamp);
       };
@@ -395,10 +375,7 @@ export const useSlashCommandProcessor = (
 
       const userMessageTimestamp = Date.now();
       if (!isBtwCommand(trimmed)) {
-        addItemWithRecording(
-          { type: MessageType.USER, text: trimmed },
-          userMessageTimestamp,
-        );
+        addItemWithRecording({ type: MessageType.USER, text: trimmed }, userMessageTimestamp);
       }
 
       let hasError = false;
@@ -409,9 +386,7 @@ export const useSlashCommandProcessor = (
       } = parseSlashCommand(trimmed, commands);
 
       const subcommand =
-        resolvedCommandPath.length > 1
-          ? resolvedCommandPath.slice(1).join(' ')
-          : undefined;
+        resolvedCommandPath.length > 1 ? resolvedCommandPath.slice(1).join(" ") : undefined;
 
       try {
         if (commandToExecute) {
@@ -448,11 +423,9 @@ export const useSlashCommandProcessor = (
             // operation (tryCompressChat) doesn't accept an AbortSignal
             // would keep submitQuery stuck until the operation completes.
             const abortPromise = new Promise<undefined>((resolve) => {
-              abortController.signal.addEventListener(
-                'abort',
-                () => resolve(undefined),
-                { once: true },
-              );
+              abortController.signal.addEventListener("abort", () => resolve(undefined), {
+                once: true,
+              });
             });
             const result = await Promise.race([
               commandToExecute.action(fullCommandContext, args),
@@ -461,19 +434,19 @@ export const useSlashCommandProcessor = (
 
             // If the command was cancelled via ESC while executing, skip result processing
             if (abortController.signal.aborted) {
-              return { type: 'handled' };
+              return { type: "handled" };
             }
 
             if (result) {
               switch (result.type) {
-                case 'tool':
+                case "tool":
                   return {
-                    type: 'schedule_tool',
+                    type: "schedule_tool",
                     toolName: result.toolName,
                     toolArgs: result.toolArgs,
                   };
-                case 'message':
-                  if (result.messageType === 'info') {
+                case "message":
+                  if (result.messageType === "info") {
                     addMessage({
                       type: MessageType.INFO,
                       content: result.content,
@@ -486,105 +459,100 @@ export const useSlashCommandProcessor = (
                       timestamp: new Date(),
                     });
                   }
-                  return { type: 'handled' };
-                case 'dialog':
+                  return { type: "handled" };
+                case "dialog":
                   switch (result.dialog) {
-                    case 'arena_start':
-                      actions.openArenaDialog?.('start');
-                      return { type: 'handled' };
-                    case 'arena_select':
-                      actions.openArenaDialog?.('select');
-                      return { type: 'handled' };
-                    case 'arena_stop':
-                      actions.openArenaDialog?.('stop');
-                      return { type: 'handled' };
-                    case 'arena_status':
-                      actions.openArenaDialog?.('status');
-                      return { type: 'handled' };
-                    case 'auth':
+                    case "arena_start":
+                      actions.openArenaDialog?.("start");
+                      return { type: "handled" };
+                    case "arena_select":
+                      actions.openArenaDialog?.("select");
+                      return { type: "handled" };
+                    case "arena_stop":
+                      actions.openArenaDialog?.("stop");
+                      return { type: "handled" };
+                    case "arena_status":
+                      actions.openArenaDialog?.("status");
+                      return { type: "handled" };
+                    case "auth":
                       actions.openAuthDialog();
-                      return { type: 'handled' };
-                    case 'theme':
+                      return { type: "handled" };
+                    case "theme":
                       actions.openThemeDialog();
-                      return { type: 'handled' };
-                    case 'editor':
+                      return { type: "handled" };
+                    case "editor":
                       actions.openEditorDialog();
-                      return { type: 'handled' };
-                    case 'settings':
+                      return { type: "handled" };
+                    case "settings":
                       actions.openSettingsDialog();
-                      return { type: 'handled' };
-                    case 'model':
+                      return { type: "handled" };
+                    case "model":
                       actions.openModelDialog();
-                      return { type: 'handled' };
-                    case 'fast-model':
+                      return { type: "handled" };
+                    case "fast-model":
                       actions.openModelDialog({ fastModelMode: true });
-                      return { type: 'handled' };
-                    case 'trust':
+                      return { type: "handled" };
+                    case "trust":
                       actions.openTrustDialog();
-                      return { type: 'handled' };
-                    case 'permissions':
+                      return { type: "handled" };
+                    case "permissions":
                       actions.openPermissionsDialog();
-                      return { type: 'handled' };
-                    case 'subagent_create':
+                      return { type: "handled" };
+                    case "subagent_create":
                       actions.openSubagentCreateDialog();
-                      return { type: 'handled' };
-                    case 'subagent_list':
+                      return { type: "handled" };
+                    case "subagent_list":
                       actions.openAgentsManagerDialog();
-                      return { type: 'handled' };
-                    case 'mcp':
+                      return { type: "handled" };
+                    case "mcp":
                       actions.openMcpDialog();
-                      return { type: 'handled' };
-                    case 'hooks':
+                      return { type: "handled" };
+                    case "hooks":
                       actions.openHooksDialog();
-                      return { type: 'handled' };
-                    case 'approval-mode':
+                      return { type: "handled" };
+                    case "approval-mode":
                       actions.openApprovalModeDialog();
-                      return { type: 'handled' };
-                    case 'resume':
+                      return { type: "handled" };
+                    case "resume":
                       actions.openResumeDialog();
-                      return { type: 'handled' };
-                    case 'extensions_manage':
+                      return { type: "handled" };
+                    case "extensions_manage":
                       actions.openExtensionsManagerDialog();
-                      return { type: 'handled' };
-                    case 'help':
-                      return { type: 'handled' };
+                      return { type: "handled" };
+                    case "help":
+                      return { type: "handled" };
                     default: {
                       const unhandled: never = result.dialog;
-                      throw new Error(
-                        `Unhandled slash command result: ${unhandled}`,
-                      );
+                      throw new Error(`Unhandled slash command result: ${unhandled}`);
                     }
                   }
-                case 'load_history': {
+                case "load_history": {
                   config?.getGeminiClient()?.setHistory(result.clientHistory);
                   config?.getGeminiClient()?.stripThoughtsFromHistory();
                   fullCommandContext.ui.clear();
                   result.history.forEach((item, index) => {
                     fullCommandContext.ui.addItem(item, index);
                   });
-                  return { type: 'handled' };
+                  return { type: "handled" };
                 }
 
-                case 'quit':
+                case "quit":
                   actions.quit(result.messages);
-                  return { type: 'handled' };
+                  return { type: "handled" };
 
-                case 'submit_prompt':
+                case "submit_prompt":
                   return {
-                    type: 'submit_prompt',
+                    type: "submit_prompt",
                     content: result.content,
                   };
-                case 'confirm_shell_commands': {
+                case "confirm_shell_commands": {
                   const { outcome, approvedCommands } = await new Promise<{
                     outcome: ToolConfirmationOutcome;
                     approvedCommands?: string[];
                   }>((resolve) => {
                     setShellConfirmationRequest({
                       commands: result.commandsToConfirm,
-                      onConfirm: (
-                        resolvedOutcome,
-                        resolvedApprovedCommands,
-                      ) => {
+                      onConfirm: (resolvedOutcome, resolvedApprovedCommands) => {
                         setShellConfirmationRequest(null); // Close the dialog
                         resolve({
                           outcome: resolvedOutcome,
@@ -599,13 +567,11 @@ export const useSlashCommandProcessor = (
                     !approvedCommands ||
                     approvedCommands.length === 0
                   ) {
-                    return { type: 'handled' };
+                    return { type: "handled" };
                   }
 
                   if (outcome === ToolConfirmationOutcome.ProceedAlways) {
-                    setSessionShellAllowlist(
-                      (prev) => new Set([...prev, ...approvedCommands]),
-                    );
+                    setSessionShellAllowlist((prev) => new Set([...prev, ...approvedCommands]));
                   }
 
                   return await handleSlashCommand(
@@ -614,7 +580,7 @@ export const useSlashCommandProcessor = (
                     new Set(approvedCommands),
                   );
                 }
-                case 'confirm_action': {
+                case "confirm_action": {
                   const { confirmed } = await new Promise<{
                     confirmed: boolean;
                   }>((resolve) => {
@@ -631,46 +597,40 @@ export const useSlashCommandProcessor = (
                     addItemWithRecording(
                       {
                         type: MessageType.INFO,
-                        text: 'Operation cancelled.',
+                        text: "Operation cancelled.",
                       },
                       Date.now(),
                     );
-                    return { type: 'handled' };
+                    return { type: "handled" };
                   }
 
-                  return await handleSlashCommand(
-                    result.originalInvocation.raw,
-                    undefined,
-                    true,
-                  );
+                  return await handleSlashCommand(result.originalInvocation.raw, undefined, true);
                 }
-                case 'stream_messages': {
+                case "stream_messages": {
                   // stream_messages is only used in ACP/Zed integration mode
                   // and should not be returned in interactive UI mode
                   throw new Error(
-                    'stream_messages result type is not supported in interactive mode',
+                    "stream_messages result type is not supported in interactive mode",
                   );
                 }
                 default: {
                   const unhandled: never = result;
-                  throw new Error(
-                    `Unhandled slash command result: ${unhandled}`,
-                  );
+                  throw new Error(`Unhandled slash command result: ${unhandled}`);
                 }
               }
             }
 
-            return { type: 'handled' };
+            return { type: "handled" };
           } else if (commandToExecute.subCommands) {
             const helpText = `Command '/${commandToExecute.name}' requires a subcommand. Available:\n${commandToExecute.subCommands
-              .map((sc) => `  - ${sc.name}: ${sc.description || ''}`)
-              .join('\n')}`;
+              .map((sc) => `  - ${sc.name}: ${sc.description || ""}`)
+              .join("\n")}`;
             addMessage({
               type: MessageType.INFO,
               content: helpText,
               timestamp: new Date(),
             });
-            return { type: 'handled' };
+            return { type: "handled" };
           }
         }
 
@@ -680,11 +640,11 @@ export const useSlashCommandProcessor = (
           timestamp: new Date(),
         });
 
-        return { type: 'handled' };
+        return { type: "handled" };
       } catch (e: unknown) {
         // If cancelled via ESC, the cancelSlashCommand callback already handled cleanup
         if (abortController.signal.aborted) {
-          return { type: 'handled' };
+          return { type: "handled" };
         }
         hasError = true;
         if (config) {
@@ -702,36 +662,30 @@ export const useSlashCommandProcessor = (
           },
           Date.now(),
         );
-        return { type: 'handled' };
+        return { type: "handled" };
       } finally {
         if (config?.getChatRecordingService) {
           const chatRecorder = config.getChatRecordingService();
           const primaryCommand =
-            resolvedCommandPath[0] ||
-            trimmed.replace(/^[/?]/, '').split(/\s+/)[0] ||
-            trimmed;
-          const shouldRecord =
-            !SLASH_COMMANDS_SKIP_RECORDING.has(primaryCommand);
+            resolvedCommandPath[0] || trimmed.replace(/^[/?]/, "").split(/\s+/)[0] || trimmed;
+          const shouldRecord = !SLASH_COMMANDS_SKIP_RECORDING.has(primaryCommand);
           try {
             if (shouldRecord) {
               chatRecorder?.recordSlashCommand({
-                phase: 'invocation',
+                phase: "invocation",
                 rawCommand: trimmed,
               });
               const outputItems = recordedItems
-                .filter((item) => item.type !== 'user')
+                .filter((item) => item.type !== "user")
                 .map(serializeHistoryItemForRecording);
               chatRecorder?.recordSlashCommand({
-                phase: 'result',
+                phase: "result",
                 rawCommand: trimmed,
                 outputHistoryItems: outputItems,
               });
             }
           } catch (recordError) {
-            debugLogger.error(
-              '[slashCommand] Failed to record slash command:',
-              recordError,
-            );
+            debugLogger.error("[slashCommand] Failed to record slash command:", recordError);
           }
         }
         if (config && resolvedCommandPath[0] && !hasError) {
diff --git a/apps/airiscode-cli/src/ui/hooks/useAgentStreamingState.ts b/apps/airiscode-cli/src/ui/hooks/useAgentStreamingState.ts
index af3cbd590..be2552373 100644
--- a/apps/airiscode-cli/src/ui/hooks/useAgentStreamingState.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useAgentStreamingState.ts
@@ -13,16 +13,16 @@
  * layout and interaction.
  */
 
-import { useState, useEffect, useCallback, useMemo, useRef } from 'react';
 import {
-  AgentStatus,
+  type AgentEventEmitter,
   AgentEventType,
-  isTerminalStatus,
   type AgentInteractive,
-  type AgentEventEmitter,
-} from '@airiscode/core';
-import { StreamingState } from '../types.js';
-import { useTimer } from './useTimer.js';
+  AgentStatus,
+  isTerminalStatus,
+} from "@airiscode/core";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { StreamingState } from "../types.js";
+import { useTimer } from "./useTimer.js";
 
 // ─── Types ──────────────────────────────────────────────────
 
@@ -73,8 +73,7 @@ export function useAgentStreamingState(
 
   useEffect(() => {
     if (!interactiveAgent) return;
-    const emitter: AgentEventEmitter | undefined =
-      interactiveAgent.getEventEmitter();
+    const emitter: AgentEventEmitter | undefined = interactiveAgent.getEventEmitter();
     if (!emitter) return;
 
     const handler = () => forceRender();
@@ -90,9 +89,8 @@ export function useAgentStreamingState(
     const usageHandler = (event: {
       usage?: { totalTokenCount?: number; promptTokenCount?: number };
     }) => {
-      const count =
-        event?.usage?.totalTokenCount ?? event?.usage?.promptTokenCount;
-      if (typeof count === 'number' && count > 0) {
+      const count = event?.usage?.totalTokenCount ?? event?.usage?.promptTokenCount;
+      if (typeof count === "number" && count > 0) {
         setLastPromptTokenCount(count);
       }
     };
@@ -110,8 +108,7 @@ export function useAgentStreamingState(
 
   const status = interactiveAgent?.getStatus();
   const pendingApprovals = interactiveAgent?.getPendingApprovals();
-  const hasPendingApprovals =
-    pendingApprovals !== undefined && pendingApprovals.size > 0;
+  const hasPendingApprovals = pendingApprovals !== undefined && pendingApprovals.size > 0;
 
   const streamingState = useMemo(() => {
     if (hasPendingApprovals) {
@@ -124,8 +121,7 @@ export function useAgentStreamingState(
   }, [status, hasPendingApprovals]);
 
   const isInputActive =
-    (streamingState === StreamingState.Idle ||
-      streamingState === StreamingState.Responding) &&
+    (streamingState === StreamingState.Idle || streamingState === StreamingState.Responding) &&
     status !== undefined &&
     !isTerminalStatus(status);
 
@@ -143,10 +139,7 @@ export function useAgentStreamingState(
     prevStreamingRef.current = streamingState;
   }, [streamingState]);
 
-  const elapsedTime = useTimer(
-    streamingState === StreamingState.Responding,
-    timerResetKey,
-  );
+  const elapsedTime = useTimer(streamingState === StreamingState.Responding, timerResetKey);
 
   return {
     status,
diff --git a/apps/airiscode-cli/src/ui/hooks/useAgentsManagerDialog.ts b/apps/airiscode-cli/src/ui/hooks/useAgentsManagerDialog.ts
index b5904af65..be66db526 100644
--- a/apps/airiscode-cli/src/ui/hooks/useAgentsManagerDialog.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useAgentsManagerDialog.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 export interface UseAgentsManagerDialogReturn {
   isAgentsManagerDialogOpen: boolean;
@@ -13,8 +13,7 @@ export interface UseAgentsManagerDialogReturn {
 }
 
 export const useAgentsManagerDialog = (): UseAgentsManagerDialogReturn => {
-  const [isAgentsManagerDialogOpen, setIsAgentsManagerDialogOpen] =
-    useState(false);
+  const [isAgentsManagerDialogOpen, setIsAgentsManagerDialogOpen] = useState(false);
 
   const openAgentsManagerDialog = useCallback(() => {
     setIsAgentsManagerDialogOpen(true);
diff --git a/apps/airiscode-cli/src/ui/hooks/useApprovalModeCommand.ts b/apps/airiscode-cli/src/ui/hooks/useApprovalModeCommand.ts
index e81db4805..1844dd4e2 100644
--- a/apps/airiscode-cli/src/ui/hooks/useApprovalModeCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useApprovalModeCommand.ts
@@ -4,25 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import type { ApprovalMode, Config } from '@airiscode/core';
-import type { LoadedSettings, SettingScope } from '../../config/settings.js';
+import type { ApprovalMode, Config } from "@airiscode/core";
+import { useCallback, useState } from "react";
+import type { LoadedSettings, SettingScope } from "../../config/settings.js";
 
 interface UseApprovalModeCommandReturn {
   isApprovalModeDialogOpen: boolean;
   openApprovalModeDialog: () => void;
-  handleApprovalModeSelect: (
-    mode: ApprovalMode | undefined,
-    scope: SettingScope,
-  ) => void;
+  handleApprovalModeSelect: (mode: ApprovalMode | undefined, scope: SettingScope) => void;
 }
 
 export const useApprovalModeCommand = (
   loadedSettings: LoadedSettings,
   config: Config,
 ): UseApprovalModeCommandReturn => {
-  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] =
-    useState(false);
+  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] = useState(false);
 
   const openApprovalModeDialog = useCallback(() => {
     setIsApprovalModeDialogOpen(true);
@@ -38,10 +34,8 @@ export const useApprovalModeCommand = (
         }
 
         // Set the mode in the current session and persist to settings
-        loadedSettings.setValue(scope, 'tools.approvalMode', mode);
-        config.setApprovalMode(
-          loadedSettings.merged.tools?.approvalMode ?? mode,
-        );
+        loadedSettings.setValue(scope, "tools.approvalMode", mode);
+        config.setApprovalMode(loadedSettings.merged.tools?.approvalMode ?? mode);
       } finally {
         setIsApprovalModeDialogOpen(false);
       }
diff --git a/apps/airiscode-cli/src/ui/hooks/useArenaCommand.ts b/apps/airiscode-cli/src/ui/hooks/useArenaCommand.ts
index 0392a0f1f..bd5f701ba 100644
--- a/apps/airiscode-cli/src/ui/hooks/useArenaCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useArenaCommand.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useState } from 'react';
+import { useCallback, useState } from "react";
 
-export type ArenaDialogType = 'start' | 'select' | 'stop' | 'status' | null;
+export type ArenaDialogType = "start" | "select" | "stop" | "status" | null;
 
 interface UseArenaCommandReturn {
   activeArenaDialog: ArenaDialogType;
@@ -15,15 +15,11 @@ interface UseArenaCommandReturn {
 }
 
 export function useArenaCommand(): UseArenaCommandReturn {
-  const [activeArenaDialog, setActiveArenaDialog] =
-    useState<ArenaDialogType>(null);
+  const [activeArenaDialog, setActiveArenaDialog] = useState<ArenaDialogType>(null);
 
-  const openArenaDialog = useCallback(
-    (type: Exclude<ArenaDialogType, null>) => {
-      setActiveArenaDialog(type);
-    },
-    [],
-  );
+  const openArenaDialog = useCallback((type: Exclude<ArenaDialogType, null>) => {
+    setActiveArenaDialog(type);
+  }, []);
 
   const closeArenaDialog = useCallback(() => {
     setActiveArenaDialog(null);
diff --git a/apps/airiscode-cli/src/ui/hooks/useArenaInProcess.ts b/apps/airiscode-cli/src/ui/hooks/useArenaInProcess.ts
index a062f725c..39ab17d47 100644
--- a/apps/airiscode-cli/src/ui/hooks/useArenaInProcess.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useArenaInProcess.ts
@@ -15,19 +15,19 @@
  * initialized.
  */
 
-import { useEffect, useRef } from 'react';
 import {
-  ArenaEventType,
-  ArenaSessionStatus,
-  DISPLAY_MODE,
   type ArenaAgentStartEvent,
+  ArenaEventType,
   type ArenaManager,
   type ArenaSessionCompleteEvent,
+  ArenaSessionStatus,
   type Config,
+  DISPLAY_MODE,
   type InProcessBackend,
-} from '@airiscode/core';
-import type { AgentViewActions } from '../contexts/AgentViewContext.js';
-import { theme } from '../semantic-colors.js';
+} from "@airiscode/core";
+import { useEffect, useRef } from "react";
+import type { AgentViewActions } from "../contexts/AgentViewContext.js";
+import { theme } from "../semantic-colors.js";
 
 const AGENT_COLORS = [
   theme.text.accent,
@@ -44,10 +44,7 @@ const AGENT_COLORS = [
  * Called by AgentViewProvider — accepts config and actions directly so the
  * hook has no dependency on AgentViewContext (avoiding a circular import).
  */
-export function useArenaInProcess(
-  config: Config | null,
-  actions: AgentViewActions,
-): void {
+export function useArenaInProcess(config: Config | null, actions: AgentViewActions): void {
   const actionsRef = useRef(actions);
   actionsRef.current = actions;
 
diff --git a/apps/airiscode-cli/src/ui/hooks/useAtCompletion.ts b/apps/airiscode-cli/src/ui/hooks/useAtCompletion.ts
index 6d167a8db..eeaa2fb7e 100644
--- a/apps/airiscode-cli/src/ui/hooks/useAtCompletion.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useAtCompletion.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useReducer, useRef } from 'react';
-import type { Config, FileSearch } from '@airiscode/core';
-import { FileSearchFactory, escapePath } from '@airiscode/core';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import { MAX_SUGGESTIONS_TO_SHOW } from '../components/SuggestionsDisplay.js';
+import type { Config, FileSearch } from "@airiscode/core";
+import { escapePath, FileSearchFactory } from "@airiscode/core";
+import { useEffect, useReducer, useRef } from "react";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import { MAX_SUGGESTIONS_TO_SHOW } from "../components/SuggestionsDisplay.js";
 
 export enum AtCompletionStatus {
-  IDLE = 'idle',
-  INITIALIZING = 'initializing',
-  READY = 'ready',
-  SEARCHING = 'searching',
-  ERROR = 'error',
+  IDLE = "idle",
+  INITIALIZING = "initializing",
+  READY = "ready",
+  SEARCHING = "searching",
+  ERROR = "error",
 }
 
 interface AtCompletionState {
@@ -26,13 +26,13 @@ interface AtCompletionState {
 }
 
 type AtCompletionAction =
-  | { type: 'INITIALIZE' }
-  | { type: 'INITIALIZE_SUCCESS' }
-  | { type: 'SEARCH'; payload: string }
-  | { type: 'SEARCH_SUCCESS'; payload: Suggestion[] }
-  | { type: 'SET_LOADING'; payload: boolean }
-  | { type: 'ERROR' }
-  | { type: 'RESET' };
+  | { type: "INITIALIZE" }
+  | { type: "INITIALIZE_SUCCESS" }
+  | { type: "SEARCH"; payload: string }
+  | { type: "SEARCH_SUCCESS"; payload: Suggestion[] }
+  | { type: "SET_LOADING"; payload: boolean }
+  | { type: "ERROR" }
+  | { type: "RESET" };
 
 const initialState: AtCompletionState = {
   status: AtCompletionStatus.IDLE,
@@ -46,42 +46,42 @@ function atCompletionReducer(
   action: AtCompletionAction,
 ): AtCompletionState {
   switch (action.type) {
-    case 'INITIALIZE':
+    case "INITIALIZE":
       return {
         ...state,
         status: AtCompletionStatus.INITIALIZING,
         isLoading: true,
       };
-    case 'INITIALIZE_SUCCESS':
+    case "INITIALIZE_SUCCESS":
       return { ...state, status: AtCompletionStatus.READY, isLoading: false };
-    case 'SEARCH':
+    case "SEARCH":
       // Keep old suggestions, don't set loading immediately
       return {
         ...state,
         status: AtCompletionStatus.SEARCHING,
         pattern: action.payload,
       };
-    case 'SEARCH_SUCCESS':
+    case "SEARCH_SUCCESS":
       return {
         ...state,
         status: AtCompletionStatus.READY,
         suggestions: action.payload,
         isLoading: false,
       };
-    case 'SET_LOADING':
+    case "SET_LOADING":
       // Only show loading if we are still in a searching state
       if (state.status === AtCompletionStatus.SEARCHING) {
         return { ...state, isLoading: action.payload, suggestions: [] };
       }
       return state;
-    case 'ERROR':
+    case "ERROR":
       return {
         ...state,
         status: AtCompletionStatus.ERROR,
         isLoading: false,
         suggestions: [],
       };
-    case 'RESET':
+    case "RESET":
       return initialState;
     default:
       return state;
@@ -98,14 +98,7 @@ export interface UseAtCompletionProps {
 }
 
 export function useAtCompletion(props: UseAtCompletionProps): void {
-  const {
-    enabled,
-    pattern,
-    config,
-    cwd,
-    setSuggestions,
-    setIsLoadingSuggestions,
-  } = props;
+  const { enabled, pattern, config, cwd, setSuggestions, setIsLoadingSuggestions } = props;
   const [state, dispatch] = useReducer(atCompletionReducer, initialState);
   const fileSearch = useRef<FileSearch | null>(null);
   const searchAbortController = useRef<AbortController | null>(null);
@@ -120,34 +113,31 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
   }, [state.isLoading, setIsLoadingSuggestions]);
 
   useEffect(() => {
-    dispatch({ type: 'RESET' });
+    dispatch({ type: "RESET" });
   }, [cwd, config]);
 
   // Reacts to user input (`pattern`) ONLY.
   useEffect(() => {
     if (!enabled) {
       // reset when first getting out of completion suggestions
-      if (
-        state.status === AtCompletionStatus.READY ||
-        state.status === AtCompletionStatus.ERROR
-      ) {
-        dispatch({ type: 'RESET' });
+      if (state.status === AtCompletionStatus.READY || state.status === AtCompletionStatus.ERROR) {
+        dispatch({ type: "RESET" });
       }
       return;
     }
     if (pattern === null) {
-      dispatch({ type: 'RESET' });
+      dispatch({ type: "RESET" });
       return;
     }
 
     if (state.status === AtCompletionStatus.IDLE) {
-      dispatch({ type: 'INITIALIZE' });
+      dispatch({ type: "INITIALIZE" });
     } else if (
       (state.status === AtCompletionStatus.READY ||
         state.status === AtCompletionStatus.SEARCHING) &&
       pattern !== state.pattern // Only search if the pattern has changed
     ) {
-      dispatch({ type: 'SEARCH', payload: pattern });
+      dispatch({ type: "SEARCH", payload: pattern });
     }
   }, [enabled, pattern, state.status, state.pattern]);
 
@@ -158,26 +148,22 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
         const searcher = FileSearchFactory.create({
           projectRoot: cwd,
           ignoreDirs: [],
-          useGitignore:
-            config?.getFileFilteringOptions()?.respectGitIgnore ?? true,
-          useQwenignore:
-            config?.getFileFilteringOptions()?.respectAiriscodeIgnore ?? true,
+          useGitignore: config?.getFileFilteringOptions()?.respectGitIgnore ?? true,
+          useQwenignore: config?.getFileFilteringOptions()?.respectAiriscodeIgnore ?? true,
           cache: true,
           cacheTtl: 30, // 30 seconds
-          enableRecursiveFileSearch:
-            config?.getEnableRecursiveFileSearch() ?? true,
+          enableRecursiveFileSearch: config?.getEnableRecursiveFileSearch() ?? true,
           // Use enableFuzzySearch with !== false to default to true when undefined.
-          enableFuzzySearch:
-            config?.getFileFilteringEnableFuzzySearch() !== false,
+          enableFuzzySearch: config?.getFileFilteringEnableFuzzySearch() !== false,
         });
         await searcher.initialize();
         fileSearch.current = searcher;
-        dispatch({ type: 'INITIALIZE_SUCCESS' });
+        dispatch({ type: "INITIALIZE_SUCCESS" });
         if (state.pattern !== null) {
-          dispatch({ type: 'SEARCH', payload: state.pattern });
+          dispatch({ type: "SEARCH", payload: state.pattern });
         }
       } catch (_) {
-        dispatch({ type: 'ERROR' });
+        dispatch({ type: "ERROR" });
       }
     };
 
@@ -194,7 +180,7 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
       searchAbortController.current = controller;
 
       slowSearchTimer.current = setTimeout(() => {
-        dispatch({ type: 'SET_LOADING', payload: true });
+        dispatch({ type: "SET_LOADING", payload: true });
       }, 200);
 
       try {
@@ -215,10 +201,10 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
           label: p,
           value: escapePath(p),
         }));
-        dispatch({ type: 'SEARCH_SUCCESS', payload: suggestions });
+        dispatch({ type: "SEARCH_SUCCESS", payload: suggestions });
       } catch (error) {
-        if (!(error instanceof Error && error.name === 'AbortError')) {
-          dispatch({ type: 'ERROR' });
+        if (!(error instanceof Error && error.name === "AbortError")) {
+          dispatch({ type: "ERROR" });
         }
       }
     };
diff --git a/apps/airiscode-cli/src/ui/hooks/useAttentionNotifications.ts b/apps/airiscode-cli/src/ui/hooks/useAttentionNotifications.ts
index 95be87980..817043937 100644
--- a/apps/airiscode-cli/src/ui/hooks/useAttentionNotifications.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useAttentionNotifications.ts
@@ -4,18 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useRef } from 'react';
-import { StreamingState } from '../types.js';
+import type { Config } from "@airiscode/core";
+import { fireNotificationHook, NotificationType } from "@airiscode/core";
+import { useEffect, useRef } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
 import {
-  notifyTerminalAttention,
   AttentionNotificationReason,
-} from '../../utils/attentionNotification.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import type { Config } from '@airiscode/core';
-import {
-  fireNotificationHook,
-  NotificationType,
-} from '@airiscode/core';
+  notifyTerminalAttention,
+} from "../../utils/attentionNotification.js";
+import { StreamingState } from "../types.js";
 
 export const LONG_TASK_NOTIFICATION_THRESHOLD_SECONDS = 20;
 
@@ -65,9 +62,7 @@ export const useAttentionNotifications = ({
     }
 
     if (streamingState === StreamingState.Idle) {
-      const wasLongTask =
-        respondingElapsedRef.current >=
-        LONG_TASK_NOTIFICATION_THRESHOLD_SECONDS;
+      const wasLongTask = respondingElapsedRef.current >= LONG_TASK_NOTIFICATION_THRESHOLD_SECONDS;
       if (wasLongTask && !isFocused) {
         notifyTerminalAttention(AttentionNotificationReason.LongTaskComplete, {
           enabled: terminalBellEnabled,
@@ -83,9 +78,9 @@ export const useAttentionNotifications = ({
         if (hooksEnabled && messageBus) {
           fireNotificationHook(
             messageBus,
-            'AIRIS Code is waiting for your input',
+            "AIRIS Code is waiting for your input",
             NotificationType.IdlePrompt,
-            'Waiting for input',
+            "Waiting for input",
           ).catch(() => {
             // Silently ignore errors - fireNotificationHook has internal error handling
             // and notification hooks should not block the idle flow
diff --git a/apps/airiscode-cli/src/ui/hooks/useAutoAcceptIndicator.ts b/apps/airiscode-cli/src/ui/hooks/useAutoAcceptIndicator.ts
index 6a17cf364..855eb03f8 100644
--- a/apps/airiscode-cli/src/ui/hooks/useAutoAcceptIndicator.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useAutoAcceptIndicator.ts
@@ -4,15 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  type ApprovalMode,
-  APPROVAL_MODES,
-  type Config,
-} from '@airiscode/core';
-import { useEffect, useState } from 'react';
-import { useKeypress } from './useKeypress.js';
-import type { HistoryItemWithoutId } from '../types.js';
-import { MessageType } from '../types.js';
+import { APPROVAL_MODES, type ApprovalMode, type Config } from "@airiscode/core";
+import { useEffect, useState } from "react";
+import type { HistoryItemWithoutId } from "../types.js";
+import { MessageType } from "../types.js";
+import { useKeypress } from "./useKeypress.js";
 
 export interface UseAutoAcceptIndicatorArgs {
   config: Config;
@@ -31,8 +27,7 @@ export function useAutoAcceptIndicator({
   disabled,
 }: UseAutoAcceptIndicatorArgs): ApprovalMode {
   const currentConfigValue = config.getApprovalMode();
-  const [showAutoAcceptIndicator, setShowAutoAcceptIndicator] =
-    useState(currentConfigValue);
+  const [showAutoAcceptIndicator, setShowAutoAcceptIndicator] = useState(currentConfigValue);
 
   useEffect(() => {
     setShowAutoAcceptIndicator(currentConfigValue);
@@ -43,12 +38,9 @@ export function useAutoAcceptIndicator({
       // Handle Shift+Tab to cycle through all modes
       // On Windows, Shift+Tab is indistinguishable from Tab (\t) in some terminals,
       // so we allow Tab to switch modes as well to support the shortcut.
-      const isShiftTab = key.shift && key.name === 'tab';
+      const isShiftTab = key.shift && key.name === "tab";
       const isWindowsTab =
-        process.platform === 'win32' &&
-        key.name === 'tab' &&
-        !key.ctrl &&
-        !key.meta;
+        process.platform === "win32" && key.name === "tab" && !key.ctrl && !key.meta;
 
       if (isShiftTab || isWindowsTab) {
         // On Windows, check if we should block Tab key when autocomplete is active
@@ -59,8 +51,7 @@ export function useAutoAcceptIndicator({
 
         const currentMode = config.getApprovalMode();
         const currentIndex = APPROVAL_MODES.indexOf(currentMode);
-        const nextIndex =
-          currentIndex === -1 ? 0 : (currentIndex + 1) % APPROVAL_MODES.length;
+        const nextIndex = currentIndex === -1 ? 0 : (currentIndex + 1) % APPROVAL_MODES.length;
         const nextApprovalMode = APPROVAL_MODES[nextIndex];
 
         try {
diff --git a/apps/airiscode-cli/src/ui/hooks/useBracketedPaste.ts b/apps/airiscode-cli/src/ui/hooks/useBracketedPaste.ts
index ae58be3b0..648de5191 100644
--- a/apps/airiscode-cli/src/ui/hooks/useBracketedPaste.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useBracketedPaste.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
+import { useEffect } from "react";
 
-const ENABLE_BRACKETED_PASTE = '\x1b[?2004h';
-const DISABLE_BRACKETED_PASTE = '\x1b[?2004l';
+const ENABLE_BRACKETED_PASTE = "\x1b[?2004h";
+const DISABLE_BRACKETED_PASTE = "\x1b[?2004l";
 
 /**
  * Enables and disables bracketed paste mode in the terminal.
@@ -23,15 +23,15 @@ export const useBracketedPaste = () => {
   useEffect(() => {
     process.stdout.write(ENABLE_BRACKETED_PASTE);
 
-    process.on('exit', cleanup);
-    process.on('SIGINT', cleanup);
-    process.on('SIGTERM', cleanup);
+    process.on("exit", cleanup);
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
 
     return () => {
       cleanup();
-      process.removeListener('exit', cleanup);
-      process.removeListener('SIGINT', cleanup);
-      process.removeListener('SIGTERM', cleanup);
+      process.removeListener("exit", cleanup);
+      process.removeListener("SIGINT", cleanup);
+      process.removeListener("SIGTERM", cleanup);
     };
   }, []);
 };
diff --git a/apps/airiscode-cli/src/ui/hooks/useCodingPlanUpdates.ts b/apps/airiscode-cli/src/ui/hooks/useCodingPlanUpdates.ts
index ead26ff4a..f2d2d3515 100644
--- a/apps/airiscode-cli/src/ui/hooks/useCodingPlanUpdates.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useCodingPlanUpdates.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useEffect, useState } from 'react';
-import type { Config, ModelProvidersConfig } from '@airiscode/core';
-import { AuthType } from '@airiscode/core';
-import type { LoadedSettings } from '../../config/settings.js';
-import { getPersistScopeForModelSelection } from '../../config/modelProvidersScope.js';
+import type { Config, ModelProvidersConfig } from "@airiscode/core";
+import { AuthType } from "@airiscode/core";
+import { useCallback, useEffect, useState } from "react";
+import { getPersistScopeForModelSelection } from "../../config/modelProvidersScope.js";
+import type { LoadedSettings } from "../../config/settings.js";
 import {
-  isCodingPlanConfig,
-  getCodingPlanConfig,
-  CodingPlanRegion,
   CODING_PLAN_ENV_KEY,
-} from '../../constants/codingPlan.js';
-import { t } from '../../i18n/index.js';
+  CodingPlanRegion,
+  getCodingPlanConfig,
+  isCodingPlanConfig,
+} from "../../constants/codingPlan.js";
+import { t } from "../../i18n/index.js";
 
 export interface CodingPlanUpdateRequest {
   prompt: string;
@@ -30,14 +30,9 @@ export interface CodingPlanUpdateRequest {
 export function useCodingPlanUpdates(
   settings: LoadedSettings,
   config: Config,
-  addItem: (
-    item: { type: 'info' | 'error' | 'warning'; text: string },
-    timestamp: number,
-  ) => void,
+  addItem: (item: { type: "info" | "error" | "warning"; text: string }, timestamp: number) => void,
 ) {
-  const [updateRequest, setUpdateRequest] = useState<
-    CodingPlanUpdateRequest | undefined
-  >();
+  const [updateRequest, setUpdateRequest] = useState<CodingPlanUpdateRequest | undefined>();
 
   /**
    * Execute the Coding Plan configuration update.
@@ -51,18 +46,15 @@ export function useCodingPlanUpdates(
         const persistScope = getPersistScopeForModelSelection(settings);
 
         // Get current configs
-        const currentConfigs =
-          (
-            settings.merged.modelProviders as any
-          )?.[AuthType.USE_OPENAI] || [];
+        const currentConfigs = (settings.merged.modelProviders as any)?.[AuthType.USE_OPENAI] || [];
 
         // Filter out all Coding Plan configs (since they are mutually exclusive)
         // Keep only non-Coding-Plan user custom configs
         const nonCodingPlanConfigs = currentConfigs.filter(
           (cfg: any) =>
             !isCodingPlanConfig(
-              cfg['baseUrl'] as string | undefined,
-              cfg['envKey'] as string | undefined,
+              cfg["baseUrl"] as string | undefined,
+              cfg["envKey"] as string | undefined,
             ),
         );
 
@@ -83,46 +75,36 @@ export function useCodingPlanUpdates(
 
         // Record the user's current model before the update
         const previousModel = config.getModel();
-        const previousModelStillAvailable = newConfigs.some(
-          (cfg) => cfg.id === previousModel,
-        );
+        const previousModelStillAvailable = newConfigs.some((cfg) => cfg.id === previousModel);
 
         // Hot-reload model providers configuration first (in-memory only)
         const updatedModelProviders = {
-          ...(settings.merged.modelProviders as
-            | Record<string, unknown>
-            | undefined),
+          ...(settings.merged.modelProviders as Record<string, unknown> | undefined),
           [AuthType.USE_OPENAI]: updatedConfigs,
         };
-        config.reloadModelProvidersConfig(
-          updatedModelProviders as unknown as ModelProvidersConfig,
-        );
+        config.reloadModelProvidersConfig(updatedModelProviders as unknown as ModelProvidersConfig);
 
         // Refresh auth with the new configuration
         // This validates the configuration before persisting
         await config.refreshAuth(AuthType.USE_OPENAI);
 
         // Persist to settings only after successful auth refresh
-        settings.setValue(
-          persistScope,
-          `modelProviders.${AuthType.USE_OPENAI}`,
-          updatedConfigs,
-        );
+        settings.setValue(persistScope, `modelProviders.${AuthType.USE_OPENAI}`, updatedConfigs);
 
         // Update the version (single version field for backward compatibility)
-        settings.setValue(persistScope, 'codingPlan.version', version);
+        settings.setValue(persistScope, "codingPlan.version", version);
 
         // Update the region
-        settings.setValue(persistScope, 'codingPlan.region', region);
+        settings.setValue(persistScope, "codingPlan.region", region);
 
         const activeModel = config.getModel();
 
         if (previousModelStillAvailable && activeModel === previousModel) {
           addItem(
             {
-              type: 'info',
-              text: t('{{region}} configuration updated successfully.', {
-                region: t('Alibaba Cloud Coding Plan'),
+              type: "info",
+              text: t("{{region}} configuration updated successfully.", {
+                region: t("Alibaba Cloud Coding Plan"),
               }),
             },
             Date.now(),
@@ -130,10 +112,10 @@ export function useCodingPlanUpdates(
         } else {
           addItem(
             {
-              type: 'info',
+              type: "info",
               text: t(
                 '{{region}} configuration updated successfully. Model switched to "{{model}}".',
-                { region: t('Alibaba Cloud Coding Plan'), model: activeModel },
+                { region: t("Alibaba Cloud Coding Plan"), model: activeModel },
               ),
             },
             Date.now(),
@@ -142,22 +124,19 @@ export function useCodingPlanUpdates(
 
         addItem(
           {
-            type: 'info',
-            text: t(
-              'Tip: Use /model to switch between available Coding Plan models.',
-            ),
+            type: "info",
+            text: t("Tip: Use /model to switch between available Coding Plan models."),
           },
           Date.now(),
         );
 
         return true;
       } catch (error) {
-        const errorMessage =
-          error instanceof Error ? error.message : String(error);
+        const errorMessage = error instanceof Error ? error.message : String(error);
         addItem(
           {
-            type: 'error',
-            text: t('Failed to update Coding Plan configuration: {{message}}', {
+            type: "error",
+            text: t("Failed to update Coding Plan configuration: {{message}}", {
               message: errorMessage,
             }),
           },
@@ -198,10 +177,9 @@ export function useCodingPlanUpdates(
     // Check if version matches
     if (savedVersion !== currentVersion) {
       setUpdateRequest({
-        prompt: t(
-          'New model configurations are available for {{region}}. Update now?',
-          { region: t('Alibaba Cloud Coding Plan') },
-        ),
+        prompt: t("New model configurations are available for {{region}}. Update now?", {
+          region: t("Alibaba Cloud Coding Plan"),
+        }),
         onConfirm: async (confirmed: boolean) => {
           setUpdateRequest(undefined);
           if (confirmed) {
diff --git a/apps/airiscode-cli/src/ui/hooks/useCommandCompletion.tsx b/apps/airiscode-cli/src/ui/hooks/useCommandCompletion.tsx
index 6b6d19c5b..c4294360e 100644
--- a/apps/airiscode-cli/src/ui/hooks/useCommandCompletion.tsx
+++ b/apps/airiscode-cli/src/ui/hooks/useCommandCompletion.tsx
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useMemo, useEffect } from 'react';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import { logicalPosToOffset } from '../components/shared/text-buffer.js';
-import { isSlashCommand } from '../utils/commandUtils.js';
-import { toCodePoints } from '../utils/textUtils.js';
-import { useAtCompletion } from './useAtCompletion.js';
-import { useSlashCompletion } from './useSlashCompletion.js';
-import type { Config } from '@airiscode/core';
-import { useCompletion } from './useCompletion.js';
+import type { Config } from "@airiscode/core";
+import { useCallback, useEffect, useMemo } from "react";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import { logicalPosToOffset } from "../components/shared/text-buffer.js";
+import { isSlashCommand } from "../utils/commandUtils.js";
+import { toCodePoints } from "../utils/textUtils.js";
+import { useAtCompletion } from "./useAtCompletion.js";
+import { useCompletion } from "./useCompletion.js";
+import { useSlashCompletion } from "./useSlashCompletion.js";
 
 export enum CompletionMode {
-  IDLE = 'IDLE',
-  AT = 'AT',
-  SLASH = 'SLASH',
+  IDLE = "IDLE",
+  AT = "AT",
+  SLASH = "SLASH",
 }
 
 export interface UseCommandCompletionReturn {
@@ -70,70 +70,69 @@ export function useCommandCompletion(
   const cursorRow = buffer.cursor[0];
   const cursorCol = buffer.cursor[1];
 
-  const { completionMode, query, completionStart, completionEnd } =
-    useMemo(() => {
-      const currentLine = buffer.lines[cursorRow] || '';
+  const { completionMode, query, completionStart, completionEnd } = useMemo(() => {
+    const currentLine = buffer.lines[cursorRow] || "";
 
-      // Check for @ completion first, so that typing @ after a slash command
-      // still triggers file search (see #2518).
-      const codePoints = toCodePoints(currentLine);
-      for (let i = cursorCol - 1; i >= 0; i--) {
-        const char = codePoints[i];
+    // Check for @ completion first, so that typing @ after a slash command
+    // still triggers file search (see #2518).
+    const codePoints = toCodePoints(currentLine);
+    for (let i = cursorCol - 1; i >= 0; i--) {
+      const char = codePoints[i];
 
-        if (char === ' ') {
-          let backslashCount = 0;
-          for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-            backslashCount++;
-          }
-          if (backslashCount % 2 === 0) {
-            break;
-          }
-        } else if (char === '@') {
-          let end = codePoints.length;
-          for (let i = cursorCol; i < codePoints.length; i++) {
-            if (codePoints[i] === ' ') {
-              let backslashCount = 0;
-              for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-                backslashCount++;
-              }
-
-              if (backslashCount % 2 === 0) {
-                end = i;
-                break;
-              }
+      if (char === " ") {
+        let backslashCount = 0;
+        for (let j = i - 1; j >= 0 && codePoints[j] === "\\"; j--) {
+          backslashCount++;
+        }
+        if (backslashCount % 2 === 0) {
+          break;
+        }
+      } else if (char === "@") {
+        let end = codePoints.length;
+        for (let i = cursorCol; i < codePoints.length; i++) {
+          if (codePoints[i] === " ") {
+            let backslashCount = 0;
+            for (let j = i - 1; j >= 0 && codePoints[j] === "\\"; j--) {
+              backslashCount++;
+            }
+
+            if (backslashCount % 2 === 0) {
+              end = i;
+              break;
             }
           }
-          const pathStart = i + 1;
-          const partialPath = currentLine.substring(pathStart, end);
-          return {
-            completionMode: CompletionMode.AT,
-            query: partialPath,
-            completionStart: pathStart,
-            completionEnd: end,
-          };
         }
-      }
-
-      if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
+        const pathStart = i + 1;
+        const partialPath = currentLine.substring(pathStart, end);
         return {
-          completionMode: CompletionMode.SLASH,
-          query: currentLine,
-          completionStart: 0,
-          completionEnd: currentLine.length,
+          completionMode: CompletionMode.AT,
+          query: partialPath,
+          completionStart: pathStart,
+          completionEnd: end,
         };
       }
+    }
 
+    if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
       return {
-        completionMode: CompletionMode.IDLE,
-        query: null,
-        completionStart: -1,
-        completionEnd: -1,
+        completionMode: CompletionMode.SLASH,
+        query: currentLine,
+        completionStart: 0,
+        completionEnd: currentLine.length,
       };
-    }, [cursorRow, cursorCol, buffer.lines]);
+    }
+
+    return {
+      completionMode: CompletionMode.IDLE,
+      query: null,
+      completionStart: -1,
+      completionEnd: -1,
+    };
+  }, [cursorRow, cursorCol, buffer.lines]);
 
   useAtCompletion({
     enabled: completionMode === CompletionMode.AT,
-    pattern: query || '',
+    pattern: query || "",
     config,
     cwd,
     setSuggestions,
@@ -156,11 +155,7 @@ export function useCommandCompletion(
   }, [suggestions, setActiveSuggestionIndex, setVisibleStartIndex]);
 
   useEffect(() => {
-    if (
-      completionMode === CompletionMode.IDLE ||
-      reverseSearchActive ||
-      !active
-    ) {
+    if (completionMode === CompletionMode.IDLE || reverseSearchActive || !active) {
       resetCompletionState();
       return;
     }
@@ -196,19 +191,15 @@ export function useCommandCompletion(
 
       let suggestionText = suggestion;
       if (completionMode === CompletionMode.SLASH) {
-        if (
-          start === end &&
-          start > 1 &&
-          (buffer.lines[cursorRow] || '')[start - 1] !== ' '
-        ) {
-          suggestionText = ' ' + suggestionText;
+        if (start === end && start > 1 && (buffer.lines[cursorRow] || "")[start - 1] !== " ") {
+          suggestionText = " " + suggestionText;
         }
       }
 
-      const lineCodePoints = toCodePoints(buffer.lines[cursorRow] || '');
+      const lineCodePoints = toCodePoints(buffer.lines[cursorRow] || "");
       const charAfterCompletion = lineCodePoints[end];
-      if (charAfterCompletion !== ' ') {
-        suggestionText += ' ';
+      if (charAfterCompletion !== " ") {
+        suggestionText += " ";
       }
 
       buffer.replaceRangeByOffset(
diff --git a/apps/airiscode-cli/src/ui/hooks/useCommandMigration.ts b/apps/airiscode-cli/src/ui/hooks/useCommandMigration.ts
index da777312e..7022e3691 100644
--- a/apps/airiscode-cli/src/ui/hooks/useCommandMigration.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useCommandMigration.ts
@@ -4,19 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useState } from 'react';
-import { Storage } from '@airiscode/core';
-import { detectTomlCommands } from '../../services/command-migration-tool.js';
-import type { LoadedSettings } from '../../config/settings.js';
+import { Storage } from "@airiscode/core";
+import { useEffect, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { detectTomlCommands } from "../../services/command-migration-tool.js";
 
 /**
  * Hook to detect TOML command files and manage migration nudge visibility.
  * Checks all command directories: workspace, user, and global levels.
  */
-export function useCommandMigration(
-  settings: LoadedSettings,
-  storage: Storage,
-) {
+export function useCommandMigration(settings: LoadedSettings, storage: Storage) {
   const [showMigrationNudge, setShowMigrationNudge] = useState(false);
   const [tomlFiles, setTomlFiles] = useState<string[]>([]);
 
diff --git a/apps/airiscode-cli/src/ui/hooks/useCompletion.ts b/apps/airiscode-cli/src/ui/hooks/useCompletion.ts
index 8d3d4c2f3..8a5f3bf69 100644
--- a/apps/airiscode-cli/src/ui/hooks/useCompletion.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useCompletion.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import { MAX_SUGGESTIONS_TO_SHOW } from '../components/SuggestionsDisplay.js';
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import { MAX_SUGGESTIONS_TO_SHOW } from "../components/SuggestionsDisplay.js";
 
 export interface UseCompletionReturn {
   suggestions: Suggestion[];
@@ -29,12 +29,10 @@ export interface UseCompletionReturn {
 
 export function useCompletion(): UseCompletionReturn {
   const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
-  const [activeSuggestionIndex, setActiveSuggestionIndex] =
-    useState<number>(-1);
+  const [activeSuggestionIndex, setActiveSuggestionIndex] = useState<number>(-1);
   const [visibleStartIndex, setVisibleStartIndex] = useState<number>(0);
   const [showSuggestions, setShowSuggestions] = useState<boolean>(false);
-  const [isLoadingSuggestions, setIsLoadingSuggestions] =
-    useState<boolean>(false);
+  const [isLoadingSuggestions, setIsLoadingSuggestions] = useState<boolean>(false);
   const [isPerfectMatch, setIsPerfectMatch] = useState<boolean>(false);
 
   const resetCompletionState = useCallback(() => {
@@ -51,8 +49,7 @@ export function useCompletion(): UseCompletionReturn {
 
     setActiveSuggestionIndex((prevActiveIndex) => {
       // Calculate new active index, handling wrap-around
-      const newActiveIndex =
-        prevActiveIndex <= 0 ? suggestions.length - 1 : prevActiveIndex - 1;
+      const newActiveIndex = prevActiveIndex <= 0 ? suggestions.length - 1 : prevActiveIndex - 1;
 
       // Adjust scroll position based on the new active index
       setVisibleStartIndex((prevVisibleStart) => {
@@ -80,16 +77,12 @@ export function useCompletion(): UseCompletionReturn {
 
     setActiveSuggestionIndex((prevActiveIndex) => {
       // Calculate new active index, handling wrap-around
-      const newActiveIndex =
-        prevActiveIndex >= suggestions.length - 1 ? 0 : prevActiveIndex + 1;
+      const newActiveIndex = prevActiveIndex >= suggestions.length - 1 ? 0 : prevActiveIndex + 1;
 
       // Adjust scroll position based on the new active index
       setVisibleStartIndex((prevVisibleStart) => {
         // Case 1: Wrapped around to the first item
-        if (
-          newActiveIndex === 0 &&
-          suggestions.length > MAX_SUGGESTIONS_TO_SHOW
-        ) {
+        if (newActiveIndex === 0 && suggestions.length > MAX_SUGGESTIONS_TO_SHOW) {
           return 0;
         }
         // Case 2: Scrolled below the current visible window
diff --git a/apps/airiscode-cli/src/ui/hooks/useDialogClose.ts b/apps/airiscode-cli/src/ui/hooks/useDialogClose.ts
index 770f7756e..91f20dd52 100644
--- a/apps/airiscode-cli/src/ui/hooks/useDialogClose.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useDialogClose.ts
@@ -4,10 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback } from 'react';
-import { SettingScope } from '../../config/settings.js';
-import type { AuthType, ApprovalMode } from '@airiscode/core';
-import type { ArenaDialogType } from './useArenaCommand.js';
+import type { ApprovalMode, AuthType } from "@airiscode/core";
+import { useCallback } from "react";
+import { SettingScope } from "../../config/settings.js";
+import type { ArenaDialogType } from "./useArenaCommand.js";
+
 // OpenAICredentials type (previously imported from OpenAIKeyPrompt)
 interface OpenAICredentials {
   apiKey: string;
@@ -22,10 +23,7 @@ export interface DialogCloseOptions {
 
   // Approval mode dialog
   isApprovalModeDialogOpen: boolean;
-  handleApprovalModeSelect: (
-    mode: ApprovalMode | undefined,
-    scope: SettingScope,
-  ) => void;
+  handleApprovalModeSelect: (mode: ApprovalMode | undefined, scope: SettingScope) => void;
 
   // Auth dialog
   isAuthDialogOpen: boolean;
diff --git a/apps/airiscode-cli/src/ui/hooks/useEditorSettings.ts b/apps/airiscode-cli/src/ui/hooks/useEditorSettings.ts
index 89333d6ff..1078e2449 100644
--- a/apps/airiscode-cli/src/ui/hooks/useEditorSettings.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useEditorSettings.ts
@@ -4,29 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import type { LoadedSettings, SettingScope } from '../../config/settings.js';
-import { type HistoryItem, MessageType } from '../types.js';
-import type { EditorType } from '@airiscode/core';
-import {
-  allowEditorTypeInSandbox,
-  checkHasEditorType,
-} from '@airiscode/core';
+import type { EditorType } from "@airiscode/core";
+import { allowEditorTypeInSandbox, checkHasEditorType } from "@airiscode/core";
+import { useCallback, useState } from "react";
+import type { LoadedSettings, SettingScope } from "../../config/settings.js";
+import { type HistoryItem, MessageType } from "../types.js";
 
 interface UseEditorSettingsReturn {
   isEditorDialogOpen: boolean;
   openEditorDialog: () => void;
-  handleEditorSelect: (
-    editorType: EditorType | undefined,
-    scope: SettingScope,
-  ) => void;
+  handleEditorSelect: (editorType: EditorType | undefined, scope: SettingScope) => void;
   exitEditorDialog: () => void;
 }
 
 export const useEditorSettings = (
   loadedSettings: LoadedSettings,
   setEditorError: (error: string | null) => void,
-  addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void,
+  addItem: (item: Omit<HistoryItem, "id">, timestamp: number) => void,
 ): UseEditorSettingsReturn => {
   const [isEditorDialogOpen, setIsEditorDialogOpen] = useState(false);
 
@@ -38,18 +32,17 @@ export const useEditorSettings = (
     (editorType: EditorType | undefined, scope: SettingScope) => {
       if (
         editorType &&
-        (!checkHasEditorType(editorType) ||
-          !allowEditorTypeInSandbox(editorType))
+        (!checkHasEditorType(editorType) || !allowEditorTypeInSandbox(editorType))
       ) {
         return;
       }
 
       try {
-        loadedSettings.setValue(scope, 'general.preferredEditor', editorType);
+        loadedSettings.setValue(scope, "general.preferredEditor", editorType);
         addItem(
           {
             type: MessageType.INFO,
-            text: `Editor preference ${editorType ? `set to "${editorType}"` : 'cleared'} in ${scope} settings.`,
+            text: `Editor preference ${editorType ? `set to "${editorType}"` : "cleared"} in ${scope} settings.`,
           },
           Date.now(),
         );
diff --git a/apps/airiscode-cli/src/ui/hooks/useExtensionUpdates.ts b/apps/airiscode-cli/src/ui/hooks/useExtensionUpdates.ts
index 61e63e1f3..a048fbe3e 100644
--- a/apps/airiscode-cli/src/ui/hooks/useExtensionUpdates.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useExtensionUpdates.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExtensionManager } from '@airiscode/core';
-import { getErrorMessage } from '../../utils/errors.js';
+import type { ExtensionManager } from "@airiscode/core";
+import { useCallback, useEffect, useMemo, useReducer } from "react";
+import { checkExhaustive } from "../../utils/checks.js";
+import { getErrorMessage } from "../../utils/errors.js";
 import {
   ExtensionUpdateState,
   extensionUpdatesReducer,
   initialExtensionUpdatesState,
-} from '../state/extensions.js';
-import { useCallback, useEffect, useMemo, useReducer } from 'react';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+} from "../state/extensions.js";
 import {
-  MessageType,
   type ConfirmationRequest,
-  type SettingInputRequest,
+  MessageType,
   type PluginChoiceRequest,
-} from '../types.js';
-import { checkExhaustive } from '../../utils/checks.js';
+  type SettingInputRequest,
+} from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 type ConfirmationRequestWrapper = {
   prompt: React.ReactNode;
@@ -27,17 +27,17 @@ type ConfirmationRequestWrapper = {
 };
 
 type ConfirmationRequestAction =
-  | { type: 'add'; request: ConfirmationRequestWrapper }
-  | { type: 'remove'; request: ConfirmationRequestWrapper };
+  | { type: "add"; request: ConfirmationRequestWrapper }
+  | { type: "remove"; request: ConfirmationRequestWrapper };
 
 function confirmationRequestsReducer(
   state: ConfirmationRequestWrapper[],
   action: ConfirmationRequestAction,
 ): ConfirmationRequestWrapper[] {
   switch (action.type) {
-    case 'add':
+    case "add":
       return [...state, action.request];
-    case 'remove':
+    case "remove":
       return state.filter((r) => r !== action.request);
     default:
       checkExhaustive(action);
@@ -46,10 +46,10 @@ function confirmationRequestsReducer(
 }
 
 export const useConfirmUpdateRequests = () => {
-  const [
-    confirmUpdateExtensionRequests,
-    dispatchConfirmUpdateExtensionRequests,
-  ] = useReducer(confirmationRequestsReducer, []);
+  const [confirmUpdateExtensionRequests, dispatchConfirmUpdateExtensionRequests] = useReducer(
+    confirmationRequestsReducer,
+    [],
+  );
   const addConfirmUpdateExtensionRequest = useCallback(
     (original: ConfirmationRequest) => {
       const wrappedRequest = {
@@ -57,14 +57,14 @@ export const useConfirmUpdateRequests = () => {
         onConfirm: (confirmed: boolean) => {
           // Remove it from the outstanding list of requests by identity.
           dispatchConfirmUpdateExtensionRequests({
-            type: 'remove',
+            type: "remove",
             request: wrappedRequest,
           });
           original.onConfirm(confirmed);
         },
       };
       dispatchConfirmUpdateExtensionRequests({
-        type: 'add',
+        type: "add",
         request: wrappedRequest,
       });
     },
@@ -86,17 +86,17 @@ type SettingInputRequestWrapper = {
 };
 
 type SettingInputRequestAction =
-  | { type: 'add'; request: SettingInputRequestWrapper }
-  | { type: 'remove'; request: SettingInputRequestWrapper };
+  | { type: "add"; request: SettingInputRequestWrapper }
+  | { type: "remove"; request: SettingInputRequestWrapper };
 
 function settingInputRequestsReducer(
   state: SettingInputRequestWrapper[],
   action: SettingInputRequestAction,
 ): SettingInputRequestWrapper[] {
   switch (action.type) {
-    case 'add':
+    case "add":
       return [...state, action.request];
-    case 'remove':
+    case "remove":
       return state.filter((r) => r !== action.request);
     default:
       checkExhaustive(action);
@@ -118,21 +118,21 @@ export const useSettingInputRequests = () => {
         onSubmit: (value: string) => {
           // Remove it from the outstanding list of requests by identity.
           dispatchSettingInputRequests({
-            type: 'remove',
+            type: "remove",
             request: wrappedRequest,
           });
           original.onSubmit(value);
         },
         onCancel: () => {
           dispatchSettingInputRequests({
-            type: 'remove',
+            type: "remove",
             request: wrappedRequest,
           });
           original.onCancel();
         },
       };
       dispatchSettingInputRequests({
-        type: 'add',
+        type: "add",
         request: wrappedRequest,
       });
     },
@@ -153,17 +153,17 @@ type PluginChoiceRequestWrapper = {
 };
 
 type PluginChoiceRequestAction =
-  | { type: 'add'; request: PluginChoiceRequestWrapper }
-  | { type: 'remove'; request: PluginChoiceRequestWrapper };
+  | { type: "add"; request: PluginChoiceRequestWrapper }
+  | { type: "remove"; request: PluginChoiceRequestWrapper };
 
 function pluginChoiceRequestsReducer(
   state: PluginChoiceRequestWrapper[],
   action: PluginChoiceRequestAction,
 ): PluginChoiceRequestWrapper[] {
   switch (action.type) {
-    case 'add':
+    case "add":
       return [...state, action.request];
-    case 'remove':
+    case "remove":
       return state.filter((r) => r !== action.request);
     default:
       checkExhaustive(action);
@@ -183,21 +183,21 @@ export const usePluginChoiceRequests = () => {
         plugins: original.plugins,
         onSelect: (pluginName: string) => {
           dispatchPluginChoiceRequests({
-            type: 'remove',
+            type: "remove",
             request: wrappedRequest,
           });
           original.onSelect(pluginName);
         },
         onCancel: () => {
           dispatchPluginChoiceRequests({
-            type: 'remove',
+            type: "remove",
             request: wrappedRequest,
           });
           original.onCancel();
         },
       };
       dispatchPluginChoiceRequests({
-        type: 'add',
+        type: "add",
         request: wrappedRequest,
       });
     },
@@ -212,7 +212,7 @@ export const usePluginChoiceRequests = () => {
 
 export const useExtensionUpdates = (
   extensionManager: ExtensionManager,
-  addItem: UseHistoryManagerReturn['addItem'],
+  addItem: UseHistoryManagerReturn["addItem"],
   cwd: string,
 ) => {
   const [extensionsUpdateState, dispatchExtensionStateUpdate] = useReducer(
@@ -224,24 +224,22 @@ export const useExtensionUpdates = (
   useEffect(() => {
     (async () => {
       const extensionsToCheck = extensions.filter((extension) => {
-        const currentStatus = extensionsUpdateState.extensionStatuses.get(
-          extension.name,
-        );
+        const currentStatus = extensionsUpdateState.extensionStatuses.get(extension.name);
         if (!currentStatus) return true;
         const currentState = currentStatus.status;
         return !currentState || currentState === ExtensionUpdateState.UNKNOWN;
       });
       if (extensionsToCheck.length === 0) return;
-      dispatchExtensionStateUpdate({ type: 'BATCH_CHECK_START' });
+      dispatchExtensionStateUpdate({ type: "BATCH_CHECK_START" });
       await extensionManager.checkForAllExtensionUpdates(
         (extensionName: string, state: ExtensionUpdateState) => {
           dispatchExtensionStateUpdate({
-            type: 'SET_STATE',
+            type: "SET_STATE",
             payload: { name: extensionName, state },
           });
         },
       );
-      dispatchExtensionStateUpdate({ type: 'BATCH_CHECK_END' });
+      dispatchExtensionStateUpdate({ type: "BATCH_CHECK_END" });
     })();
   }, [
     extensions,
@@ -257,9 +255,7 @@ export const useExtensionUpdates = (
 
     let extensionsWithUpdatesCount = 0;
     for (const extension of extensions) {
-      const currentState = extensionsUpdateState.extensionStatuses.get(
-        extension.name,
-      );
+      const currentState = extensionsUpdateState.extensionStatuses.get(extension.name);
       if (
         !currentState ||
         currentState.processed ||
@@ -270,22 +266,18 @@ export const useExtensionUpdates = (
 
       // Mark as processed immediately to avoid re-triggering.
       dispatchExtensionStateUpdate({
-        type: 'SET_PROCESSED',
+        type: "SET_PROCESSED",
         payload: { name: extension.name, processed: true },
       });
 
       if (extension.installMetadata?.autoUpdate) {
         extensionManager
-          .updateExtension(
-            extension,
-            currentState.status,
-            (extensionName, state) => {
-              dispatchExtensionStateUpdate({
-                type: 'SET_STATE',
-                payload: { name: extensionName, state },
-              });
-            },
-          )
+          .updateExtension(extension, currentState.status, (extensionName, state) => {
+            dispatchExtensionStateUpdate({
+              type: "SET_STATE",
+              payload: { name: extensionName, state },
+            });
+          })
           .then((result) => {
             if (!result) return;
             addItem(
@@ -310,7 +302,7 @@ export const useExtensionUpdates = (
       }
     }
     if (extensionsWithUpdatesCount > 0) {
-      const s = extensionsWithUpdatesCount > 1 ? 's' : '';
+      const s = extensionsWithUpdatesCount > 1 ? "s" : "";
       addItem(
         {
           type: MessageType.INFO,
@@ -323,10 +315,7 @@ export const useExtensionUpdates = (
 
   const extensionsUpdateStateComputed = useMemo(() => {
     const result = new Map<string, ExtensionUpdateState>();
-    for (const [
-      key,
-      value,
-    ] of extensionsUpdateState.extensionStatuses.entries()) {
+    for (const [key, value] of extensionsUpdateState.extensionStatuses.entries()) {
       result.set(key, value.status);
     }
     return result;
diff --git a/apps/airiscode-cli/src/ui/hooks/useExtensionsManagerDialog.ts b/apps/airiscode-cli/src/ui/hooks/useExtensionsManagerDialog.ts
index db6c82054..7cbcdb0c4 100644
--- a/apps/airiscode-cli/src/ui/hooks/useExtensionsManagerDialog.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useExtensionsManagerDialog.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 interface UseExtensionsManagerDialogReturn {
   isExtensionsManagerDialogOpen: boolean;
@@ -12,22 +12,20 @@ interface UseExtensionsManagerDialogReturn {
   closeExtensionsManagerDialog: () => void;
 }
 
-export const useExtensionsManagerDialog =
-  (): UseExtensionsManagerDialogReturn => {
-    const [isExtensionsManagerDialogOpen, setIsExtensionsManagerDialogOpen] =
-      useState(false);
+export const useExtensionsManagerDialog = (): UseExtensionsManagerDialogReturn => {
+  const [isExtensionsManagerDialogOpen, setIsExtensionsManagerDialogOpen] = useState(false);
 
-    const openExtensionsManagerDialog = useCallback(() => {
-      setIsExtensionsManagerDialogOpen(true);
-    }, []);
+  const openExtensionsManagerDialog = useCallback(() => {
+    setIsExtensionsManagerDialogOpen(true);
+  }, []);
 
-    const closeExtensionsManagerDialog = useCallback(() => {
-      setIsExtensionsManagerDialogOpen(false);
-    }, []);
+  const closeExtensionsManagerDialog = useCallback(() => {
+    setIsExtensionsManagerDialogOpen(false);
+  }, []);
 
-    return {
-      isExtensionsManagerDialogOpen,
-      openExtensionsManagerDialog,
-      closeExtensionsManagerDialog,
-    };
+  return {
+    isExtensionsManagerDialogOpen,
+    openExtensionsManagerDialog,
+    closeExtensionsManagerDialog,
   };
+};
diff --git a/apps/airiscode-cli/src/ui/hooks/useFeedbackDialog.ts b/apps/airiscode-cli/src/ui/hooks/useFeedbackDialog.ts
index bba6a13a8..892ec58db 100644
--- a/apps/airiscode-cli/src/ui/hooks/useFeedbackDialog.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useFeedbackDialog.ts
@@ -1,24 +1,20 @@
-import { useState, useCallback, useEffect } from 'react';
-import * as fs from 'node:fs';
+import * as fs from "node:fs";
 import {
   type Config,
   createDebugLogger,
+  isNodeError,
   logUserFeedback,
   UserFeedbackEvent,
   type UserFeedbackRating,
-  isNodeError,
-} from '@airiscode/core';
-import { StreamingState, MessageType, type HistoryItem } from '../types.js';
-import {
-  SettingScope,
-  type LoadedSettings,
-  USER_SETTINGS_PATH,
-} from '../../config/settings.js';
-import type { SessionStatsState } from '../contexts/SessionContext.js';
-import { FEEDBACK_OPTIONS } from '../FeedbackDialog.js';
-import stripJsonComments from 'strip-json-comments';
+} from "@airiscode/core";
+import { useCallback, useEffect, useState } from "react";
+import stripJsonComments from "strip-json-comments";
+import { type LoadedSettings, SettingScope, USER_SETTINGS_PATH } from "../../config/settings.js";
+import type { SessionStatsState } from "../contexts/SessionContext.js";
+import { FEEDBACK_OPTIONS } from "../FeedbackDialog.js";
+import { type HistoryItem, MessageType, StreamingState } from "../types.js";
 
-const debugLogger = createDebugLogger('FEEDBACK_DIALOG');
+const debugLogger = createDebugLogger("FEEDBACK_DIALOG");
 // Auto-prompted feedback dialog removed with Qwen OAuth. Helpers below are stubs
 // so existing imports continue to resolve; the dialog is only shown manually now.
 void debugLogger;
@@ -45,17 +41,13 @@ export const useFeedbackDialog = ({
 }: UseFeedbackDialogProps) => {
   // Feedback dialog state
   const [isFeedbackDialogOpen, setIsFeedbackDialogOpen] = useState(false);
-  const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] =
-    useState(false);
+  const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] = useState(false);
 
   const openFeedbackDialog = useCallback(() => {
     setIsFeedbackDialogOpen(true);
   }, []);
 
-  const closeFeedbackDialog = useCallback(
-    () => setIsFeedbackDialogOpen(false),
-    [],
-  );
+  const closeFeedbackDialog = useCallback(() => setIsFeedbackDialogOpen(false), []);
 
   const temporaryCloseFeedbackDialog = useCallback(() => {
     setIsFeedbackDialogOpen(false);
@@ -78,11 +70,7 @@ export const useFeedbackDialog = ({
       }
 
       // Record the timestamp when feedback dialog is submitted
-      settings.setValue(
-        SettingScope.User,
-        'ui.feedbackLastShownTimestamp',
-        Date.now(),
-      );
+      settings.setValue(SettingScope.User, "ui.feedbackLastShownTimestamp", Date.now());
 
       closeFeedbackDialog();
     },
@@ -113,10 +101,7 @@ export const useFeedbackDialog = ({
 
   // Reset temporary dismissal when a new AI response starts streaming
   useEffect(() => {
-    if (
-      streamingState === StreamingState.Responding &&
-      isFeedbackDismissedTemporarily
-    ) {
+    if (streamingState === StreamingState.Responding && isFeedbackDismissedTemporarily) {
       setIsFeedbackDismissedTemporarily(false);
     }
   }, [streamingState, isFeedbackDismissedTemporarily]);
diff --git a/apps/airiscode-cli/src/ui/hooks/useFocus.ts b/apps/airiscode-cli/src/ui/hooks/useFocus.ts
index 65288cb0d..3c0ec03a2 100644
--- a/apps/airiscode-cli/src/ui/hooks/useFocus.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useFocus.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useStdin, useStdout } from 'ink';
-import { useEffect, useState } from 'react';
-import { useKeypress } from './useKeypress.js';
+import { useStdin, useStdout } from "ink";
+import { useEffect, useState } from "react";
+import { useKeypress } from "./useKeypress.js";
 
 // ANSI escape codes to enable/disable terminal focus reporting
-export const ENABLE_FOCUS_REPORTING = '\x1b[?1004h';
-export const DISABLE_FOCUS_REPORTING = '\x1b[?1004l';
+export const ENABLE_FOCUS_REPORTING = "\x1b[?1004h";
+export const DISABLE_FOCUS_REPORTING = "\x1b[?1004l";
 
 // ANSI escape codes for focus events
-export const FOCUS_IN = '\x1b[I';
-export const FOCUS_OUT = '\x1b[O';
+export const FOCUS_IN = "\x1b[I";
+export const FOCUS_OUT = "\x1b[O";
 
 export const useFocus = () => {
   const { stdin } = useStdin();
@@ -36,12 +36,12 @@ export const useFocus = () => {
 
     // Enable focus reporting
     stdout?.write(ENABLE_FOCUS_REPORTING);
-    stdin?.on('data', handleData);
+    stdin?.on("data", handleData);
 
     return () => {
       // Disable focus reporting on cleanup
       stdout?.write(DISABLE_FOCUS_REPORTING);
-      stdin?.removeListener('data', handleData);
+      stdin?.removeListener("data", handleData);
     };
   }, [stdin, stdout]);
 
diff --git a/apps/airiscode-cli/src/ui/hooks/useFolderTrust.ts b/apps/airiscode-cli/src/ui/hooks/useFolderTrust.ts
index 76d63150d..5b64a1239 100644
--- a/apps/airiscode-cli/src/ui/hooks/useFolderTrust.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useFolderTrust.ts
@@ -4,15 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useEffect } from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
-import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
-import {
-  loadTrustedFolders,
-  TrustLevel,
-  isWorkspaceTrusted,
-} from '../../config/trustedFolders.js';
-import * as process from 'node:process';
+import * as process from "node:process";
+import { useCallback, useEffect, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted, loadTrustedFolders, TrustLevel } from "../../config/trustedFolders.js";
+import { FolderTrustChoice } from "../components/FolderTrustDialog.js";
 
 export const useFolderTrust = (
   settings: LoadedSettings,
@@ -55,8 +51,7 @@ export const useFolderTrust = (
 
       trustedFolders.setValue(cwd, trustLevel);
       const currentIsTrusted =
-        trustLevel === TrustLevel.TRUST_FOLDER ||
-        trustLevel === TrustLevel.TRUST_PARENT;
+        trustLevel === TrustLevel.TRUST_FOLDER || trustLevel === TrustLevel.TRUST_PARENT;
       setIsTrusted(currentIsTrusted);
       onTrustChange(currentIsTrusted);
 
diff --git a/apps/airiscode-cli/src/ui/hooks/useFollowupSuggestions.tsx b/apps/airiscode-cli/src/ui/hooks/useFollowupSuggestions.tsx
index 5c6bbe827..d0fa761f8 100644
--- a/apps/airiscode-cli/src/ui/hooks/useFollowupSuggestions.tsx
+++ b/apps/airiscode-cli/src/ui/hooks/useFollowupSuggestions.tsx
@@ -8,17 +8,17 @@
  * Thin React wrapper around the framework-agnostic controller from core.
  */
 
-import { useState, useMemo, useRef, useEffect, useCallback } from 'react';
+import type { Config, FollowupState } from "@airiscode/core";
 import {
-  INITIAL_FOLLOWUP_STATE,
   createFollowupController,
+  INITIAL_FOLLOWUP_STATE,
   logPromptSuggestion,
   PromptSuggestionEvent,
-} from '@airiscode/core';
-import type { FollowupState, Config } from '@airiscode/core';
+} from "@airiscode/core";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 // Re-export for consumers that import from here
-export type { FollowupState } from '@airiscode/core';
+export type { FollowupState } from "@airiscode/core";
 
 /**
  * Options for the hook
@@ -43,10 +43,7 @@ export interface UseFollowupSuggestionsReturn {
   /** Set suggestion text (called by parent component) */
   setSuggestion: (text: string | null) => void;
   /** Accept the current suggestion */
-  accept: (
-    method?: 'tab' | 'enter' | 'right',
-    options?: { skipOnAccept?: boolean },
-  ) => void;
+  accept: (method?: "tab" | "enter" | "right", options?: { skipOnAccept?: boolean }) => void;
   /** Dismiss the current suggestion */
   dismiss: () => void;
   /** Clear all state */
@@ -102,8 +99,8 @@ export function useFollowupSuggestionsCLI(
   // Telemetry callback from controller (accept/dismiss)
   const onOutcome = useCallback(
     (params: {
-      outcome: 'accepted' | 'ignored';
-      accept_method?: 'tab' | 'enter' | 'right';
+      outcome: "accepted" | "ignored";
+      accept_method?: "tab" | "enter" | "right";
       time_ms: number;
       suggestion_length: number;
     }) => {
@@ -114,16 +111,15 @@ export function useFollowupSuggestionsCLI(
         new PromptSuggestionEvent({
           outcome: params.outcome,
           accept_method: params.accept_method,
-          ...(params.outcome === 'accepted'
+          ...(params.outcome === "accepted"
             ? { time_to_accept_ms: params.time_ms }
             : { time_to_ignore_ms: params.time_ms }),
           ...(firstKeystrokeAtRef.current > 0 &&
             prevShownAtRef.current > 0 && {
-              time_to_first_keystroke_ms:
-                firstKeystrokeAtRef.current - prevShownAtRef.current,
+              time_to_first_keystroke_ms: firstKeystrokeAtRef.current - prevShownAtRef.current,
             }),
           suggestion_length: params.suggestion_length,
-          similarity: params.outcome === 'accepted' ? 1.0 : 0.0,
+          similarity: params.outcome === "accepted" ? 1.0 : 0.0,
           was_focused_when_shown: wasFocusedWhenShownRef.current,
         }),
       );
diff --git a/apps/airiscode-cli/src/ui/hooks/useGeminiStream.ts b/apps/airiscode-cli/src/ui/hooks/useGeminiStream.ts
index f7a4160c6..0a7fabc39 100644
--- a/apps/airiscode-cli/src/ui/hooks/useGeminiStream.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useGeminiStream.ts
@@ -4,79 +4,77 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
+import { promises as fs } from "node:fs";
+import path from "node:path";
 import type {
   Config,
+  ServerGeminiContentEvent as ContentEvent,
   EditorType,
   GeminiClient,
+  GeminiErrorEventValue,
+  ServerGeminiStreamEvent as GeminiEvent,
   RetryInfo,
   ServerGeminiChatCompressedEvent,
-  ServerGeminiContentEvent as ContentEvent,
   ServerGeminiFinishedEvent,
-  ServerGeminiStreamEvent as GeminiEvent,
   ThoughtSummary,
   ToolCallRequestInfo,
-  GeminiErrorEventValue,
-} from '@airiscode/core';
+} from "@airiscode/core";
 import {
-  GeminiEventType as ServerGeminiEventType,
-  SendMessageType,
+  ApiCancelEvent,
+  ApprovalMode,
+  ConversationFinishedEvent,
   createDebugLogger,
+  FinishReason,
+  GitService,
   getErrorMessage,
+  getUnsupportedImageFormatWarning,
   isNodeError,
-  MessageSenderType,
+  isSupportedImageMimeType,
+  logApiCancel,
+  logConversationFinishedEvent,
   logUserPrompt,
   logUserRetry,
-  GitService,
-  UnauthorizedError,
-  UserPromptEvent,
-  UserRetryEvent,
-  logConversationFinishedEvent,
-  ConversationFinishedEvent,
-  ApprovalMode,
+  MessageSenderType,
+  type Part,
+  type PartListUnion,
   parseAndFormatApiError,
   promptIdContext,
+  SendMessageType,
+  GeminiEventType as ServerGeminiEventType,
   ToolConfirmationOutcome,
-  logApiCancel,
-  ApiCancelEvent,
-  isSupportedImageMimeType,
-  getUnsupportedImageFormatWarning,
-} from '@airiscode/core';
-import { type Part, type PartListUnion, FinishReason } from '@airiscode/core';
+  UnauthorizedError,
+  UserPromptEvent,
+  UserRetryEvent,
+} from "@airiscode/core";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { t } from "../../i18n/index.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
 import type {
   HistoryItem,
-  HistoryItemWithoutId,
   HistoryItemToolGroup,
+  HistoryItemWithoutId,
   SlashCommandProcessorResult,
-} from '../types.js';
-import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
+} from "../types.js";
+import { MessageType, StreamingState, ToolCallStatus } from "../types.js";
+import { isAtCommand, isBtwCommand, isSlashCommand } from "../utils/commandUtils.js";
+import { findLastSafeSplitPoint } from "../utils/markdownUtilities.js";
+import { handleAtCommand } from "./atCommandProcessor.js";
+import { useShellCommandProcessor } from "./shellCommandProcessor.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { useLogger } from "./useLogger.js";
 import {
-  isAtCommand,
-  isBtwCommand,
-  isSlashCommand,
-} from '../utils/commandUtils.js';
-import { useShellCommandProcessor } from './shellCommandProcessor.js';
-import { handleAtCommand } from './atCommandProcessor.js';
-import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
-import { useStateAndRef } from './useStateAndRef.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { useLogger } from './useLogger.js';
-import {
-  useReactToolScheduler,
   mapToDisplay as mapTrackedToolCallsToDisplay,
-  type TrackedToolCall,
-  type TrackedCompletedToolCall,
   type TrackedCancelledToolCall,
+  type TrackedCompletedToolCall,
   type TrackedExecutingToolCall,
+  type TrackedToolCall,
   type TrackedWaitingToolCall,
-} from './useReactToolScheduler.js';
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { useSessionStats } from '../contexts/SessionContext.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { t } from '../../i18n/index.js';
+  useReactToolScheduler,
+} from "./useReactToolScheduler.js";
+import { useStateAndRef } from "./useStateAndRef.js";
 
-const debugLogger = createDebugLogger('GEMINI_STREAM');
+const debugLogger = createDebugLogger("GEMINI_STREAM");
 
 /**
  * Checks if image parts have supported formats and returns unsupported ones
@@ -89,7 +87,7 @@ function checkImageFormatsSupport(parts: PartListUnion): {
   const unsupportedMimeTypes: string[] = [];
   let hasImages = false;
 
-  if (typeof parts === 'string') {
+  if (typeof parts === "string") {
     return {
       hasImages: false,
       hasUnsupportedFormats: false,
@@ -100,21 +98,18 @@ function checkImageFormatsSupport(parts: PartListUnion): {
   const partsArray = Array.isArray(parts) ? parts : [parts];
 
   for (const part of partsArray) {
-    if (typeof part === 'string') continue;
+    if (typeof part === "string") continue;
 
     let mimeType: string | undefined;
 
     // Check inlineData
-    if (
-      'inlineData' in part &&
-      part.inlineData?.mimeType?.startsWith('image/')
-    ) {
+    if ("inlineData" in part && part.inlineData?.mimeType?.startsWith("image/")) {
       hasImages = true;
       mimeType = part.inlineData.mimeType;
     }
 
     // Check fileData
-    if ('fileData' in part && part.fileData?.mimeType?.startsWith('image/')) {
+    if ("fileData" in part && part.fileData?.mimeType?.startsWith("image/")) {
       hasImages = true;
       mimeType = part.fileData.mimeType;
     }
@@ -138,7 +133,7 @@ enum StreamProcessingStatus {
   Error,
 }
 
-const EDIT_TOOL_NAMES = new Set(['replace', 'write_file']);
+const EDIT_TOOL_NAMES = new Set(["replace", "write_file"]);
 
 function showCitations(settings: LoadedSettings): boolean {
   const enabled = settings?.merged?.ui?.showCitations;
@@ -155,13 +150,11 @@ function showCitations(settings: LoadedSettings): boolean {
 export const useGeminiStream = (
   geminiClient: GeminiClient,
   history: HistoryItem[],
-  addItem: UseHistoryManagerReturn['addItem'],
+  addItem: UseHistoryManagerReturn["addItem"],
   config: Config,
   settings: LoadedSettings,
   onDebugMessage: (message: string) => void,
-  handleSlashCommand: (
-    cmd: PartListUnion,
-  ) => Promise<SlashCommandProcessorResult | false>,
+  handleSlashCommand: (cmd: PartListUnion) => Promise<SlashCommandProcessorResult | false>,
   shellModeActive: boolean,
   getPreferredEditor: () => EditorType | undefined,
   onAuthError: (error: string) => void,
@@ -185,25 +178,13 @@ export const useGeminiStream = (
   const [thought, setThought] = useState<ThoughtSummary | null>(null);
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] =
     useStateAndRef<HistoryItemWithoutId | null>(null);
-  const [
-    pendingRetryErrorItem,
-    pendingRetryErrorItemRef,
-    setPendingRetryErrorItem,
-  ] = useStateAndRef<HistoryItemWithoutId | null>(null);
-  const [
-    pendingRetryCountdownItem,
-    pendingRetryCountdownItemRef,
-    setPendingRetryCountdownItem,
-  ] = useStateAndRef<HistoryItemWithoutId | null>(null);
-  const retryCountdownTimerRef = useRef<ReturnType<typeof setInterval> | null>(
-    null,
-  );
+  const [pendingRetryErrorItem, pendingRetryErrorItemRef, setPendingRetryErrorItem] =
+    useStateAndRef<HistoryItemWithoutId | null>(null);
+  const [pendingRetryCountdownItem, pendingRetryCountdownItemRef, setPendingRetryCountdownItem] =
+    useStateAndRef<HistoryItemWithoutId | null>(null);
+  const retryCountdownTimerRef = useRef<ReturnType<typeof setInterval> | null>(null);
   const processedMemoryToolsRef = useRef<Set<string>>(new Set());
-  const {
-    startNewPrompt,
-    getPromptCount,
-    stats: sessionStates,
-  } = useSessionStats();
+  const { startNewPrompt, getPromptCount, stats: sessionStates } = useSessionStats();
   const storage = config.storage;
   const logger = useLogger(storage, sessionStates.sessionId);
   const gitService = useMemo(() => {
@@ -213,40 +194,33 @@ export const useGeminiStream = (
     return new GitService(config.getProjectRoot(), storage);
   }, [config, storage]);
 
-  const [toolCalls, scheduleToolCalls, markToolsAsSubmitted] =
-    useReactToolScheduler(
-      async (completedToolCallsFromScheduler) => {
-        // This onComplete is called when ALL scheduled tools for a given batch are done.
-        if (completedToolCallsFromScheduler.length > 0) {
-          // Add the final state of these tools to the history for display.
-          addItem(
-            mapTrackedToolCallsToDisplay(
-              completedToolCallsFromScheduler as TrackedToolCall[],
-            ),
-            Date.now(),
-          );
+  const [toolCalls, scheduleToolCalls, markToolsAsSubmitted] = useReactToolScheduler(
+    async (completedToolCallsFromScheduler) => {
+      // This onComplete is called when ALL scheduled tools for a given batch are done.
+      if (completedToolCallsFromScheduler.length > 0) {
+        // Add the final state of these tools to the history for display.
+        addItem(
+          mapTrackedToolCallsToDisplay(completedToolCallsFromScheduler as TrackedToolCall[]),
+          Date.now(),
+        );
 
-          // Handle tool response submission immediately when tools complete
-          await handleCompletedTools(
-            completedToolCallsFromScheduler as TrackedToolCall[],
-          );
-        }
-      },
-      config,
-      getPreferredEditor,
-      onEditorClose,
-    );
+        // Handle tool response submission immediately when tools complete
+        await handleCompletedTools(completedToolCallsFromScheduler as TrackedToolCall[]);
+      }
+    },
+    config,
+    getPreferredEditor,
+    onEditorClose,
+  );
 
   const pendingToolCallGroupDisplay = useMemo(
-    () =>
-      toolCalls.length ? mapTrackedToolCallsToDisplay(toolCalls) : undefined,
+    () => (toolCalls.length ? mapTrackedToolCallsToDisplay(toolCalls) : undefined),
     [toolCalls],
   );
 
   const activeToolPtyId = useMemo(() => {
     const executingShellTool = toolCalls?.find(
-      (tc) =>
-        tc.status === 'executing' && tc.request.name === 'run_shell_command',
+      (tc) => tc.status === "executing" && tc.request.name === "run_shell_command",
     );
     if (executingShellTool) {
       return (executingShellTool as { pid?: number }).pid;
@@ -255,11 +229,8 @@ export const useGeminiStream = (
   }, [toolCalls]);
 
   const loopDetectedRef = useRef(false);
-  const [
-    loopDetectionConfirmationRequest,
-    setLoopDetectionConfirmationRequest,
-  ] = useState<{
-    onComplete: (result: { userSelection: 'disable' | 'keep' }) => void;
+  const [loopDetectionConfirmationRequest, setLoopDetectionConfirmationRequest] = useState<{
+    onComplete: (result: { userSelection: "disable" | "keep" }) => void;
   } | null>(null);
 
   const stopRetryCountdownTimer = useCallback(() => {
@@ -277,11 +248,7 @@ export const useGeminiStream = (
     skipRetryDelayRef.current = null;
     setPendingRetryErrorItem(null);
     setPendingRetryCountdownItem(null);
-  }, [
-    setPendingRetryErrorItem,
-    setPendingRetryCountdownItem,
-    stopRetryCountdownTimer,
-  ]);
+  }, [setPendingRetryErrorItem, setPendingRetryCountdownItem, stopRetryCountdownTimer]);
 
   // Holds the skipDelay callback from the current rate-limit RetryInfo.
   // Managed symmetrically: set in startRetryCountdown, cleared in clearRetryCountdown.
@@ -293,8 +260,7 @@ export const useGeminiStream = (
       skipRetryDelayRef.current = retryInfo.skipDelay;
       const startTime = Date.now();
       const { message, attempt, maxRetries, delayMs } = retryInfo;
-      const retryReasonText =
-        message ?? t('Rate limit exceeded. Please wait and try again.');
+      const retryReasonText = message ?? t("Rate limit exceeded. Please wait and try again.");
 
       // Countdown line updates every second (dim/secondary color)
       const updateCountdown = () => {
@@ -312,15 +278,12 @@ export const useGeminiStream = (
         });
 
         setPendingRetryCountdownItem({
-          type: 'retry_countdown',
-          text: t(
-            'Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})',
-            {
-              seconds: String(remainingSec),
-              attempt: String(attempt),
-              maxRetries: String(maxRetries),
-            },
-          ),
+          type: "retry_countdown",
+          text: t("Retrying in {{seconds}} seconds… (attempt {{attempt}}/{{maxRetries}})", {
+            seconds: String(remainingSec),
+            attempt: String(attempt),
+            maxRetries: String(maxRetries),
+          }),
         } as HistoryItemWithoutId);
 
         if (remainingMs <= 0) {
@@ -331,11 +294,7 @@ export const useGeminiStream = (
       updateCountdown();
       retryCountdownTimerRef.current = setInterval(updateCountdown, 1000);
     },
-    [
-      setPendingRetryErrorItem,
-      setPendingRetryCountdownItem,
-      stopRetryCountdownTimer,
-    ],
+    [setPendingRetryErrorItem, setPendingRetryCountdownItem, stopRetryCountdownTimer],
   );
 
   useEffect(() => () => stopRetryCountdownTimer(), [stopRetryCountdownTimer]);
@@ -366,20 +325,20 @@ export const useGeminiStream = (
   }, [activePtyId, setShellInputFocused]);
 
   const streamingState = useMemo(() => {
-    if (toolCalls.some((tc) => tc.status === 'awaiting_approval')) {
+    if (toolCalls.some((tc) => tc.status === "awaiting_approval")) {
       return StreamingState.WaitingForConfirmation;
     }
     // Check if any executing subagent task has a pending confirmation
     if (
       toolCalls.some((tc) => {
-        if (tc.status !== 'executing') return false;
+        if (tc.status !== "executing") return false;
         const liveOutput = (tc as TrackedExecutingToolCall).liveOutput;
         return (
-          typeof liveOutput === 'object' &&
+          typeof liveOutput === "object" &&
           liveOutput !== null &&
-          'type' in liveOutput &&
-          liveOutput.type === 'task_execution' &&
-          'pendingConfirmation' in liveOutput &&
+          "type" in liveOutput &&
+          liveOutput.type === "task_execution" &&
+          "pendingConfirmation" in liveOutput &&
           liveOutput.pendingConfirmation != null
         );
       })
@@ -390,14 +349,11 @@ export const useGeminiStream = (
       isResponding ||
       toolCalls.some(
         (tc) =>
-          tc.status === 'executing' ||
-          tc.status === 'scheduled' ||
-          tc.status === 'validating' ||
-          ((tc.status === 'success' ||
-            tc.status === 'error' ||
-            tc.status === 'cancelled') &&
-            !(tc as TrackedCompletedToolCall | TrackedCancelledToolCall)
-              .responseSubmittedToGemini),
+          tc.status === "executing" ||
+          tc.status === "scheduled" ||
+          tc.status === "validating" ||
+          ((tc.status === "success" || tc.status === "error" || tc.status === "cancelled") &&
+            !(tc as TrackedCompletedToolCall | TrackedCancelledToolCall).responseSubmittedToGemini),
       )
     ) {
       return StreamingState.Responding;
@@ -406,16 +362,12 @@ export const useGeminiStream = (
   }, [isResponding, toolCalls]);
 
   useEffect(() => {
-    if (
-      config.getApprovalMode() === ApprovalMode.YOLO &&
-      streamingState === StreamingState.Idle
-    ) {
+    if (config.getApprovalMode() === ApprovalMode.YOLO && streamingState === StreamingState.Idle) {
       const lastUserMessageIndex = history.findLastIndex(
         (item: HistoryItem) => item.type === MessageType.USER,
       );
 
-      const turnCount =
-        lastUserMessageIndex === -1 ? 0 : history.length - lastUserMessageIndex;
+      const turnCount = lastUserMessageIndex === -1 ? 0 : history.length - lastUserMessageIndex;
 
       if (turnCount > 0) {
         logConversationFinishedEvent(
@@ -444,7 +396,7 @@ export const useGeminiStream = (
     config.getArenaAgentClient()?.reportCancelled();
 
     // Log API cancellation
-    const prompt_id = config.getSessionId() + '########' + getPromptCount();
+    const prompt_id = config.getSessionId() + "########" + getPromptCount();
     const cancellationEvent = new ApiCancelEvent(
       config.getModel(),
       prompt_id,
@@ -458,7 +410,7 @@ export const useGeminiStream = (
     addItem(
       {
         type: MessageType.INFO,
-        text: 'Request cancelled.',
+        text: "Request cancelled.",
       },
       Date.now(),
     );
@@ -492,13 +444,13 @@ export const useGeminiStream = (
       if (turnCancelledRef.current) {
         return { queryToSend: null, shouldProceed: false };
       }
-      if (typeof query === 'string' && query.trim().length === 0) {
+      if (typeof query === "string" && query.trim().length === 0) {
         return { queryToSend: null, shouldProceed: false };
       }
 
       let localQueryToSendToGemini: PartListUnion | null = null;
 
-      if (typeof query === 'string') {
+      if (typeof query === "string") {
         const trimmedQuery = query.trim();
         onDebugMessage(`Received user query (${trimmedQuery.length} chars)`);
         await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
@@ -510,7 +462,7 @@ export const useGeminiStream = (
 
         if (slashCommandResult) {
           switch (slashCommandResult.type) {
-            case 'schedule_tool': {
+            case "schedule_tool": {
               const { toolName, toolArgs } = slashCommandResult;
               const toolCallRequest: ToolCallRequestInfo = {
                 callId: `${toolName}-${Date.now()}-${Math.random().toString(16).slice(2)}`,
@@ -522,7 +474,7 @@ export const useGeminiStream = (
               scheduleToolCalls([toolCallRequest], abortSignal);
               return { queryToSend: null, shouldProceed: false };
             }
-            case 'submit_prompt': {
+            case "submit_prompt": {
               localQueryToSendToGemini = slashCommandResult.content;
 
               return {
@@ -530,14 +482,12 @@ export const useGeminiStream = (
                 shouldProceed: true,
               };
             }
-            case 'handled': {
+            case "handled": {
               return { queryToSend: null, shouldProceed: false };
             }
             default: {
               const unreachable: never = slashCommandResult;
-              throw new Error(
-                `Unhandled slash command result type: ${unreachable}`,
-              );
+              throw new Error(`Unhandled slash command result type: ${unreachable}`);
             }
           }
         }
@@ -548,10 +498,7 @@ export const useGeminiStream = (
 
         localQueryToSendToGemini = trimmedQuery;
 
-        addItem(
-          { type: MessageType.USER, text: trimmedQuery },
-          userMessageTimestamp,
-        );
+        addItem({ type: MessageType.USER, text: trimmedQuery }, userMessageTimestamp);
 
         // Handle @-commands (which might involve tool calls)
         if (isAtCommand(trimmedQuery)) {
@@ -575,9 +522,7 @@ export const useGeminiStream = (
       }
 
       if (localQueryToSendToGemini === null) {
-        onDebugMessage(
-          'Query processing resulted in null, not sending to Gemini.',
-        );
+        onDebugMessage("Query processing resulted in null, not sending to Gemini.");
         return { queryToSend: null, shouldProceed: false };
       }
       return { queryToSend: localQueryToSendToGemini, shouldProceed: true };
@@ -598,23 +543,23 @@ export const useGeminiStream = (
 
   const handleContentEvent = useCallback(
     (
-      eventValue: ContentEvent['value'],
+      eventValue: ContentEvent["value"],
       currentGeminiMessageBuffer: string,
       userMessageTimestamp: number,
     ): string => {
       if (turnCancelledRef.current) {
         // Prevents additional output after a user initiated cancel.
-        return '';
+        return "";
       }
       let newGeminiMessageBuffer = currentGeminiMessageBuffer + eventValue;
       if (
-        pendingHistoryItemRef.current?.type !== 'gemini' &&
-        pendingHistoryItemRef.current?.type !== 'gemini_content'
+        pendingHistoryItemRef.current?.type !== "gemini" &&
+        pendingHistoryItemRef.current?.type !== "gemini_content"
       ) {
         if (pendingHistoryItemRef.current) {
           addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         }
-        setPendingHistoryItem({ type: 'gemini', text: '' });
+        setPendingHistoryItem({ type: "gemini", text: "" });
         newGeminiMessageBuffer = eventValue;
       }
       // Split large messages for better rendering performance. Ideally,
@@ -623,7 +568,7 @@ export const useGeminiStream = (
       if (splitPoint === newGeminiMessageBuffer.length) {
         // Update the existing message with accumulated content
         setPendingHistoryItem((item) => ({
-          type: item?.type as 'gemini' | 'gemini_content',
+          type: item?.type as "gemini" | "gemini_content",
           text: newGeminiMessageBuffer,
         }));
       } else {
@@ -639,14 +584,12 @@ export const useGeminiStream = (
         const afterText = newGeminiMessageBuffer.substring(splitPoint);
         addItem(
           {
-            type: pendingHistoryItemRef.current?.type as
-              | 'gemini'
-              | 'gemini_content',
+            type: pendingHistoryItemRef.current?.type as "gemini" | "gemini_content",
             text: beforeText,
           },
           userMessageTimestamp,
         );
-        setPendingHistoryItem({ type: 'gemini_content', text: afterText });
+        setPendingHistoryItem({ type: "gemini_content", text: afterText });
         newGeminiMessageBuffer = afterText;
       }
       return newGeminiMessageBuffer;
@@ -661,7 +604,7 @@ export const useGeminiStream = (
           return incoming;
         }
         const subject = incoming.subject || prev.subject;
-        const description = `${prev.description ?? ''}${incoming.description ?? ''}`;
+        const description = `${prev.description ?? ""}${incoming.description ?? ""}`;
         return { subject, description };
       });
     },
@@ -675,11 +618,11 @@ export const useGeminiStream = (
       userMessageTimestamp: number,
     ): string => {
       if (turnCancelledRef.current) {
-        return '';
+        return "";
       }
 
       // Extract the description text from the thought summary
-      const thoughtText = eventValue.description ?? '';
+      const thoughtText = eventValue.description ?? "";
       if (!thoughtText) {
         return currentThoughtBuffer;
       }
@@ -688,8 +631,7 @@ export const useGeminiStream = (
 
       const pendingType = pendingHistoryItemRef.current?.type;
       const isPendingThought =
-        pendingType === 'gemini_thought' ||
-        pendingType === 'gemini_thought_content';
+        pendingType === "gemini_thought" || pendingType === "gemini_thought_content";
 
       // If we're not already showing a thought, start a new one
       if (!isPendingThought) {
@@ -697,17 +639,17 @@ export const useGeminiStream = (
         if (pendingHistoryItemRef.current) {
           addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         }
-        setPendingHistoryItem({ type: 'gemini_thought', text: '' });
+        setPendingHistoryItem({ type: "gemini_thought", text: "" });
       }
 
       // Split large thought messages for better rendering performance (same rationale
       // as regular content streaming). This helps avoid terminal flicker caused by
       // constantly re-rendering an ever-growing "pending" block.
       const splitPoint = findLastSafeSplitPoint(newThoughtBuffer);
-      const nextPendingType: 'gemini_thought' | 'gemini_thought_content' =
-        isPendingThought && pendingType === 'gemini_thought_content'
-          ? 'gemini_thought_content'
-          : 'gemini_thought';
+      const nextPendingType: "gemini_thought" | "gemini_thought_content" =
+        isPendingThought && pendingType === "gemini_thought_content"
+          ? "gemini_thought_content"
+          : "gemini_thought";
 
       if (splitPoint === newThoughtBuffer.length) {
         // Update the existing thought message with accumulated content
@@ -726,7 +668,7 @@ export const useGeminiStream = (
           userMessageTimestamp,
         );
         setPendingHistoryItem({
-          type: 'gemini_thought_content',
+          type: "gemini_thought_content",
           text: afterText,
         });
         newThoughtBuffer = afterText;
@@ -748,14 +690,13 @@ export const useGeminiStream = (
 
       lastPromptErroredRef.current = false;
       if (pendingHistoryItemRef.current) {
-        if (pendingHistoryItemRef.current.type === 'tool_group') {
-          const updatedTools = pendingHistoryItemRef.current.tools.map(
-            (tool) =>
-              tool.status === ToolCallStatus.Pending ||
-              tool.status === ToolCallStatus.Confirming ||
-              tool.status === ToolCallStatus.Executing
-                ? { ...tool, status: ToolCallStatus.Canceled }
-                : tool,
+        if (pendingHistoryItemRef.current.type === "tool_group") {
+          const updatedTools = pendingHistoryItemRef.current.tools.map((tool) =>
+            tool.status === ToolCallStatus.Pending ||
+            tool.status === ToolCallStatus.Confirming ||
+            tool.status === ToolCallStatus.Executing
+              ? { ...tool, status: ToolCallStatus.Canceled }
+              : tool,
           );
           const pendingItem: HistoryItemToolGroup = {
             ...pendingHistoryItemRef.current,
@@ -768,20 +709,14 @@ export const useGeminiStream = (
         setPendingHistoryItem(null);
       }
       addItem(
-        { type: MessageType.INFO, text: 'User cancelled the request.' },
+        { type: MessageType.INFO, text: "User cancelled the request." },
         userMessageTimestamp,
       );
       clearRetryCountdown();
       setIsResponding(false);
       setThought(null); // Reset thought when user cancels
     },
-    [
-      addItem,
-      pendingHistoryItemRef,
-      setPendingHistoryItem,
-      setThought,
-      clearRetryCountdown,
-    ],
+    [addItem, pendingHistoryItemRef, setPendingHistoryItem, setThought, clearRetryCountdown],
   );
 
   const handleErrorEvent = useCallback(
@@ -796,12 +731,12 @@ export const useGeminiStream = (
       const isShowingAutoRetry = retryCountdownTimerRef.current !== null;
       clearRetryCountdown();
       if (!isShowingAutoRetry) {
-        const retryHint = t('Press Ctrl+Y to retry');
+        const retryHint = t("Press Ctrl+Y to retry");
         // Store error with hint as a pending item (not in history).
         // This allows the hint to be removed when the user retries with Ctrl+Y,
         // since pending items are in the dynamic rendering area (not <Static>).
         setPendingRetryErrorItem({
-          type: 'error' as const,
+          type: "error" as const,
           text: parseAndFormatApiError(
             eventValue.error,
             config.getContentGeneratorConfig()?.authType,
@@ -847,33 +782,28 @@ export const useGeminiStream = (
       const finishReasonMessages: Record<FinishReason, string | undefined> = {
         [FinishReason.FINISH_REASON_UNSPECIFIED]: undefined,
         [FinishReason.STOP]: undefined,
-        [FinishReason.MAX_TOKENS]: 'Response truncated due to token limits.',
-        [FinishReason.SAFETY]: 'Response stopped due to safety reasons.',
-        [FinishReason.RECITATION]: 'Response stopped due to recitation policy.',
-        [FinishReason.LANGUAGE]:
-          'Response stopped due to unsupported language.',
-        [FinishReason.BLOCKLIST]: 'Response stopped due to forbidden terms.',
-        [FinishReason.PROHIBITED_CONTENT]:
-          'Response stopped due to prohibited content.',
+        [FinishReason.MAX_TOKENS]: "Response truncated due to token limits.",
+        [FinishReason.SAFETY]: "Response stopped due to safety reasons.",
+        [FinishReason.RECITATION]: "Response stopped due to recitation policy.",
+        [FinishReason.LANGUAGE]: "Response stopped due to unsupported language.",
+        [FinishReason.BLOCKLIST]: "Response stopped due to forbidden terms.",
+        [FinishReason.PROHIBITED_CONTENT]: "Response stopped due to prohibited content.",
         [FinishReason.SPII]:
-          'Response stopped due to sensitive personally identifiable information.',
-        [FinishReason.OTHER]: 'Response stopped for other reasons.',
-        [FinishReason.MALFORMED_FUNCTION_CALL]:
-          'Response stopped due to malformed function call.',
-        [FinishReason.IMAGE_SAFETY]:
-          'Response stopped due to image safety violations.',
-        [FinishReason.UNEXPECTED_TOOL_CALL]:
-          'Response stopped due to unexpected tool call.',
+          "Response stopped due to sensitive personally identifiable information.",
+        [FinishReason.OTHER]: "Response stopped for other reasons.",
+        [FinishReason.MALFORMED_FUNCTION_CALL]: "Response stopped due to malformed function call.",
+        [FinishReason.IMAGE_SAFETY]: "Response stopped due to image safety violations.",
+        [FinishReason.UNEXPECTED_TOOL_CALL]: "Response stopped due to unexpected tool call.",
         [FinishReason.IMAGE_PROHIBITED_CONTENT]:
-          'Response stopped due to image prohibited content.',
-        [FinishReason.NO_IMAGE]: 'Response stopped due to no image.',
+          "Response stopped due to image prohibited content.",
+        [FinishReason.NO_IMAGE]: "Response stopped due to no image.",
       };
 
       const message = finishReasonMessages[finishReason];
       if (message) {
         addItem(
           {
-            type: 'info',
+            type: "info",
             text: `⚠️  ${message}`,
           },
           userMessageTimestamp,
@@ -888,22 +818,19 @@ export const useGeminiStream = (
   );
 
   const handleChatCompressionEvent = useCallback(
-    (
-      eventValue: ServerGeminiChatCompressedEvent['value'],
-      userMessageTimestamp: number,
-    ) => {
+    (eventValue: ServerGeminiChatCompressedEvent["value"], userMessageTimestamp: number) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       return addItem(
         {
-          type: 'info',
+          type: "info",
           text:
             `IMPORTANT: This conversation approached the input token limit for ${config.getModel()}. ` +
             `A compressed context will be sent for future messages (compressed from: ` +
-            `${eventValue?.originalTokenCount ?? 'unknown'} to ` +
-            `${eventValue?.newTokenCount ?? 'unknown'} tokens).`,
+            `${eventValue?.originalTokenCount ?? "unknown"} to ` +
+            `${eventValue?.newTokenCount ?? "unknown"} tokens).`,
         },
         Date.now(),
       );
@@ -915,7 +842,7 @@ export const useGeminiStream = (
     () =>
       addItem(
         {
-          type: 'info',
+          type: "info",
           text:
             `The session has reached the maximum number of turns: ${config.getMaxSessionTurns()}. ` +
             `Please update this limit in your setting.json file.`,
@@ -929,7 +856,7 @@ export const useGeminiStream = (
     (value: { currentTokens: number; limit: number; message: string }) =>
       addItem(
         {
-          type: 'error',
+          type: "error",
           text:
             `🚫 Session token limit exceeded: ${value.currentTokens.toLocaleString()} tokens > ${value.limit.toLocaleString()} limit.\n\n` +
             `💡 Solutions:\n` +
@@ -943,14 +870,14 @@ export const useGeminiStream = (
   );
 
   const handleLoopDetectionConfirmation = useCallback(
-    (result: { userSelection: 'disable' | 'keep' }) => {
+    (result: { userSelection: "disable" | "keep" }) => {
       setLoopDetectionConfirmationRequest(null);
 
-      if (result.userSelection === 'disable') {
+      if (result.userSelection === "disable") {
         config.getGeminiClient().getLoopDetectionService().disableForSession();
         addItem(
           {
-            type: 'info',
+            type: "info",
             text: `Loop detection has been disabled for this session. Please try your request again.`,
           },
           Date.now(),
@@ -958,7 +885,7 @@ export const useGeminiStream = (
       } else {
         addItem(
           {
-            type: 'info',
+            type: "info",
             text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
           },
           Date.now(),
@@ -976,17 +903,14 @@ export const useGeminiStream = (
   }, [handleLoopDetectionConfirmation]);
 
   const handleUserPromptSubmitBlockedEvent = useCallback(
-    (
-      value: { reason: string; originalPrompt: string },
-      userMessageTimestamp: number,
-    ) => {
+    (value: { reason: string; originalPrompt: string }, userMessageTimestamp: number) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       addItem(
         {
-          type: 'user_prompt_submit_blocked',
+          type: "user_prompt_submit_blocked",
           reason: value.reason,
           originalPrompt: value.originalPrompt,
         } as HistoryItemWithoutId,
@@ -1011,7 +935,7 @@ export const useGeminiStream = (
       }
       addItem(
         {
-          type: 'stop_hook_loop',
+          type: "stop_hook_loop",
           iterationCount: value.iterationCount,
           reasons: value.reasons,
           stopHookCount: value.stopHookCount,
@@ -1028,8 +952,8 @@ export const useGeminiStream = (
       userMessageTimestamp: number,
       signal: AbortSignal,
     ): Promise<StreamProcessingStatus> => {
-      let geminiMessageBuffer = '';
-      let thoughtBuffer = '';
+      let geminiMessageBuffer = "";
+      let thoughtBuffer = "";
       const toolCallRequests: ToolCallRequestInfo[] = [];
       for await (const event of stream) {
         switch (event.type) {
@@ -1039,11 +963,7 @@ export const useGeminiStream = (
             if (event.value.subject) {
               setThought(event.value);
             } else {
-              thoughtBuffer = handleThoughtEvent(
-                event.value,
-                thoughtBuffer,
-                userMessageTimestamp,
-              );
+              thoughtBuffer = handleThoughtEvent(event.value, thoughtBuffer, userMessageTimestamp);
             }
             break;
           case ServerGeminiEventType.Content:
@@ -1076,10 +996,7 @@ export const useGeminiStream = (
             handleSessionTokenLimitExceededEvent(event.value);
             break;
           case ServerGeminiEventType.Finished:
-            handleFinishedEvent(
-              event as ServerGeminiFinishedEvent,
-              userMessageTimestamp,
-            );
+            handleFinishedEvent(event as ServerGeminiFinishedEvent, userMessageTimestamp);
             break;
           case ServerGeminiEventType.Citation:
             handleCitationEvent(event.value, userMessageTimestamp);
@@ -1111,17 +1028,14 @@ export const useGeminiStream = (
             }
             addItem(
               {
-                type: 'stop_hook_system_message',
+                type: "stop_hook_system_message",
                 message: event.value,
               } as HistoryItemWithoutId,
               userMessageTimestamp,
             );
             break;
           case ServerGeminiEventType.UserPromptSubmitBlocked:
-            handleUserPromptSubmitBlockedEvent(
-              event.value,
-              userMessageTimestamp,
-            );
+            handleUserPromptSubmitBlockedEvent(event.value, userMessageTimestamp);
             break;
           case ServerGeminiEventType.StopHookLoop:
             handleStopHookLoopEvent(event.value, userMessageTimestamp);
@@ -1169,7 +1083,7 @@ export const useGeminiStream = (
       const allowConcurrentBtwDuringResponse =
         submitType === SendMessageType.UserQuery &&
         streamingState === StreamingState.Responding &&
-        typeof query === 'string' &&
+        typeof query === "string" &&
         isBtwCommand(query);
 
       // Prevent concurrent executions of submitQuery, but allow continuations
@@ -1196,19 +1110,13 @@ export const useGeminiStream = (
       const userMessageTimestamp = Date.now();
 
       // Reset quota error flag when starting a new query (not a continuation)
-      if (
-        submitType !== SendMessageType.ToolResult &&
-        !allowConcurrentBtwDuringResponse
-      ) {
+      if (submitType !== SendMessageType.ToolResult && !allowConcurrentBtwDuringResponse) {
         setModelSwitchedFromQuotaError(false);
         // Commit any pending retry error to history (without hint) since the
         // user is starting a new conversation turn.
         // Clear both countdown-based errors AND static errors (those without
         // an active countdown timer, e.g. "Press Ctrl+Y to retry").
-        if (
-          pendingRetryCountdownItemRef.current ||
-          pendingRetryErrorItemRef.current
-        ) {
+        if (pendingRetryCountdownItemRef.current || pendingRetryErrorItemRef.current) {
           clearRetryCountdown();
         }
       }
@@ -1224,19 +1132,14 @@ export const useGeminiStream = (
       }
 
       if (!prompt_id) {
-        prompt_id = config.getSessionId() + '########' + getPromptCount();
+        prompt_id = config.getSessionId() + "########" + getPromptCount();
       }
 
       return promptIdContext.run(prompt_id, async () => {
         const { queryToSend, shouldProceed } =
           submitType === SendMessageType.Retry
             ? { queryToSend: query, shouldProceed: true }
-            : await prepareQueryForGemini(
-                query,
-                userMessageTimestamp,
-                abortSignal,
-                prompt_id!,
-              );
+            : await prepareQueryForGemini(query, userMessageTimestamp, abortSignal, prompt_id!);
 
         if (!shouldProceed || queryToSend === null) {
           isSubmittingQueryRef.current = false;
@@ -1244,10 +1147,7 @@ export const useGeminiStream = (
         }
 
         // Check image format support for non-continuations
-        if (
-          submitType === SendMessageType.UserQuery ||
-          submitType === SendMessageType.Cron
-        ) {
+        if (submitType === SendMessageType.UserQuery || submitType === SendMessageType.Cron) {
           const formatCheck = checkImageFormatsSupport(queryToSend);
           if (formatCheck.hasUnsupportedFormats) {
             addItem(
@@ -1264,15 +1164,12 @@ export const useGeminiStream = (
         lastPromptRef.current = finalQueryToSend;
         lastPromptErroredRef.current = false;
 
-        if (
-          submitType === SendMessageType.UserQuery ||
-          submitType === SendMessageType.Cron
-        ) {
+        if (submitType === SendMessageType.UserQuery || submitType === SendMessageType.Cron) {
           // trigger new prompt event for session stats in CLI
           startNewPrompt();
 
           // log user prompt event for telemetry, only text prompts for now
-          if (typeof queryToSend === 'string') {
+          if (typeof queryToSend === "string") {
             logUserPrompt(
               config,
               new UserPromptEvent(
@@ -1296,12 +1193,9 @@ export const useGeminiStream = (
         setInitError(null);
 
         try {
-          const stream = geminiClient.sendMessageStream(
-            finalQueryToSend,
-            abortSignal,
-            prompt_id!,
-            { type: submitType },
-          );
+          const stream = geminiClient.sendMessageStream(finalQueryToSend, abortSignal, prompt_id!, {
+            type: submitType,
+          });
 
           const processingStatus = await processGeminiStreamEvents(
             stream,
@@ -1331,15 +1225,15 @@ export const useGeminiStream = (
           }
         } catch (error: unknown) {
           if (error instanceof UnauthorizedError) {
-            onAuthError('Session expired or is unauthorized.');
-          } else if (!isNodeError(error) || error.name !== 'AbortError') {
+            onAuthError("Session expired or is unauthorized.");
+          } else if (!isNodeError(error) || error.name !== "AbortError") {
             lastPromptErroredRef.current = true;
-            const retryHint = t('Press Ctrl+Y to retry');
+            const retryHint = t("Press Ctrl+Y to retry");
             // Store error with hint as a pending item (same as handleErrorEvent)
             setPendingRetryErrorItem({
-              type: 'error' as const,
+              type: "error" as const,
               text: parseAndFormatApiError(
-                getErrorMessage(error) || 'Unknown error',
+                getErrorMessage(error) || "Unknown error",
                 config.getContentGeneratorConfig()?.authType,
               ),
               hint: retryHint,
@@ -1415,7 +1309,7 @@ export const useGeminiStream = (
       addItem(
         {
           type: MessageType.INFO,
-          text: t('No failed request to retry.'),
+          text: t("No failed request to retry."),
         },
         Date.now(),
       );
@@ -1430,13 +1324,9 @@ export const useGeminiStream = (
   const handleApprovalModeChange = useCallback(
     async (newApprovalMode: ApprovalMode) => {
       // Auto-approve pending tool calls when switching to auto-approval modes
-      if (
-        newApprovalMode === ApprovalMode.YOLO ||
-        newApprovalMode === ApprovalMode.AUTO_EDIT
-      ) {
+      if (newApprovalMode === ApprovalMode.YOLO || newApprovalMode === ApprovalMode.AUTO_EDIT) {
         let awaitingApprovalCalls = toolCalls.filter(
-          (call): call is TrackedWaitingToolCall =>
-            call.status === 'awaiting_approval',
+          (call): call is TrackedWaitingToolCall => call.status === "awaiting_approval",
         );
 
         // For AUTO_EDIT mode, only approve edit tools (replace, write_file)
@@ -1450,14 +1340,9 @@ export const useGeminiStream = (
         for (const call of awaitingApprovalCalls) {
           if (call.confirmationDetails?.onConfirm) {
             try {
-              await call.confirmationDetails.onConfirm(
-                ToolConfirmationOutcome.ProceedOnce,
-              );
+              await call.confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
             } catch (error) {
-              debugLogger.error(
-                `Failed to auto-approve tool call ${call.request.callId}:`,
-                error,
-              );
+              debugLogger.error(`Failed to auto-approve tool call ${call.request.callId}:`, error);
             }
           }
         }
@@ -1472,32 +1357,23 @@ export const useGeminiStream = (
         return;
       }
 
-      const completedAndReadyToSubmitTools =
-        completedToolCallsFromScheduler.filter(
-          (
-            tc: TrackedToolCall,
-          ): tc is TrackedCompletedToolCall | TrackedCancelledToolCall => {
-            const isTerminalState =
-              tc.status === 'success' ||
-              tc.status === 'error' ||
-              tc.status === 'cancelled';
-
-            if (isTerminalState) {
-              const completedOrCancelledCall = tc as
-                | TrackedCompletedToolCall
-                | TrackedCancelledToolCall;
-              return (
-                completedOrCancelledCall.response?.responseParts !== undefined
-              );
-            }
-            return false;
-          },
-        );
+      const completedAndReadyToSubmitTools = completedToolCallsFromScheduler.filter(
+        (tc: TrackedToolCall): tc is TrackedCompletedToolCall | TrackedCancelledToolCall => {
+          const isTerminalState =
+            tc.status === "success" || tc.status === "error" || tc.status === "cancelled";
 
-      // Finalize any client-initiated tools as soon as they are done.
-      const clientTools = completedAndReadyToSubmitTools.filter(
-        (t) => t.request.isClientInitiated,
+          if (isTerminalState) {
+            const completedOrCancelledCall = tc as
+              | TrackedCompletedToolCall
+              | TrackedCancelledToolCall;
+            return completedOrCancelledCall.response?.responseParts !== undefined;
+          }
+          return false;
+        },
       );
+
+      // Finalize any client-initiated tools as soon as they are done.
+      const clientTools = completedAndReadyToSubmitTools.filter((t) => t.request.isClientInitiated);
       if (clientTools.length > 0) {
         markToolsAsSubmitted(clientTools.map((t) => t.request.callId));
       }
@@ -1505,8 +1381,8 @@ export const useGeminiStream = (
       // Identify new, successful save_memory calls that we haven't processed yet.
       const newSuccessfulMemorySaves = completedAndReadyToSubmitTools.filter(
         (t) =>
-          t.request.name === 'save_memory' &&
-          t.status === 'success' &&
+          t.request.name === "save_memory" &&
+          t.status === "success" &&
           !processedMemoryToolsRef.current.has(t.request.callId),
       );
 
@@ -1528,19 +1404,15 @@ export const useGeminiStream = (
       }
 
       // If all the tools were cancelled, don't submit a response to Gemini.
-      const allToolsCancelled = geminiTools.every(
-        (tc) => tc.status === 'cancelled',
-      );
+      const allToolsCancelled = geminiTools.every((tc) => tc.status === "cancelled");
 
       if (allToolsCancelled) {
         if (geminiClient) {
           // We need to manually add the function responses to the history
           // so the model knows the tools were cancelled.
-          const combinedParts = geminiTools.flatMap(
-            (toolCall) => toolCall.response.responseParts,
-          );
+          const combinedParts = geminiTools.flatMap((toolCall) => toolCall.response.responseParts);
           geminiClient.addHistory({
-            role: 'user',
+            role: "user",
             parts: combinedParts,
           });
 
@@ -1548,9 +1420,7 @@ export const useGeminiStream = (
           config.getArenaAgentClient()?.reportCancelled();
         }
 
-        const callIdsToMarkAsSubmitted = geminiTools.map(
-          (toolCall) => toolCall.request.callId,
-        );
+        const callIdsToMarkAsSubmitted = geminiTools.map((toolCall) => toolCall.request.callId);
         markToolsAsSubmitted(callIdsToMarkAsSubmitted);
         return;
       }
@@ -1558,13 +1428,9 @@ export const useGeminiStream = (
       const responsesToSend: Part[] = geminiTools.flatMap(
         (toolCall) => toolCall.response.responseParts,
       );
-      const callIdsToMarkAsSubmitted = geminiTools.map(
-        (toolCall) => toolCall.request.callId,
-      );
+      const callIdsToMarkAsSubmitted = geminiTools.map((toolCall) => toolCall.request.callId);
 
-      const prompt_ids = geminiTools.map(
-        (toolCall) => toolCall.request.prompt_id,
-      );
+      const prompt_ids = geminiTools.map((toolCall) => toolCall.request.prompt_id);
 
       markToolsAsSubmitted(callIdsToMarkAsSubmitted);
 
@@ -1628,8 +1494,7 @@ export const useGeminiStream = (
       }
       const restorableToolCalls = toolCalls.filter(
         (toolCall) =>
-          EDIT_TOOL_NAMES.has(toolCall.request.name) &&
-          toolCall.status === 'awaiting_approval',
+          EDIT_TOOL_NAMES.has(toolCall.request.name) && toolCall.status === "awaiting_approval",
       );
 
       if (restorableToolCalls.length > 0) {
@@ -1642,16 +1507,14 @@ export const useGeminiStream = (
         try {
           await fs.mkdir(checkpointDir, { recursive: true });
         } catch (error) {
-          if (!isNodeError(error) || error.code !== 'EEXIST') {
-            onDebugMessage(
-              `Failed to create checkpoint directory: ${getErrorMessage(error)}`,
-            );
+          if (!isNodeError(error) || error.code !== "EEXIST") {
+            onDebugMessage(`Failed to create checkpoint directory: ${getErrorMessage(error)}`);
             return;
           }
         }
 
         for (const toolCall of restorableToolCalls) {
-          const filePath = toolCall.request.args['file_path'] as string;
+          const filePath = toolCall.request.args["file_path"] as string;
           if (!filePath) {
             onDebugMessage(
               `Skipping restorable tool call due to missing file_path: ${toolCall.request.name}`,
@@ -1689,10 +1552,7 @@ export const useGeminiStream = (
               continue;
             }
 
-            const timestamp = new Date()
-              .toISOString()
-              .replace(/:/g, '-')
-              .replace(/\./g, '_');
+            const timestamp = new Date().toISOString().replace(/:/g, "-").replace(/\./g, "_");
             const toolName = toolCall.request.name;
             const fileName = path.basename(filePath);
             const toolCallWithSnapshotFileName = `${timestamp}-${fileName}-${toolName}.json`;
@@ -1730,15 +1590,7 @@ export const useGeminiStream = (
       }
     };
     saveRestorableToolCalls();
-  }, [
-    toolCalls,
-    config,
-    onDebugMessage,
-    gitService,
-    history,
-    geminiClient,
-    storage,
-  ]);
+  }, [toolCalls, config, onDebugMessage, gitService, history, geminiClient, storage]);
 
   // ─── Cron scheduler integration ─────────────────────────
   const cronQueueRef = useRef<string[]>([]);
@@ -1756,17 +1608,14 @@ export const useGeminiStream = (
       const summary = scheduler.getExitSummary();
       scheduler.stop();
       if (summary) {
-        process.stderr.write(summary + '\n');
+        process.stderr.write(summary + "\n");
       }
     };
   }, [config]);
 
   // When idle, drain the cron queue one prompt at a time
   useEffect(() => {
-    if (
-      streamingState === StreamingState.Idle &&
-      cronQueueRef.current.length > 0
-    ) {
+    if (streamingState === StreamingState.Idle && cronQueueRef.current.length > 0) {
       const prompt = cronQueueRef.current.shift()!;
       submitQuery(prompt, SendMessageType.Cron);
     }
diff --git a/apps/airiscode-cli/src/ui/hooks/useGitBranchName.ts b/apps/airiscode-cli/src/ui/hooks/useGitBranchName.ts
index 6a5abd3a7..05ba6a2fa 100644
--- a/apps/airiscode-cli/src/ui/hooks/useGitBranchName.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useGitBranchName.ts
@@ -4,35 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useCallback } from 'react';
-import { isCommandAvailable, execCommand } from '@airiscode/core';
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import path from "node:path";
+import { execCommand, isCommandAvailable } from "@airiscode/core";
+import { useCallback, useEffect, useState } from "react";
 
 export function useGitBranchName(cwd: string): string | undefined {
   const [branchName, setBranchName] = useState<string | undefined>(undefined);
 
   const fetchBranchName = useCallback(async () => {
     try {
-      if (!isCommandAvailable('git').available) {
+      if (!isCommandAvailable("git").available) {
         return;
       }
 
-      const { stdout } = await execCommand(
-        'git',
-        ['rev-parse', '--abbrev-ref', 'HEAD'],
-        { cwd },
-      );
+      const { stdout } = await execCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd });
       const branch = stdout.toString().trim();
-      if (branch && branch !== 'HEAD') {
+      if (branch && branch !== "HEAD") {
         setBranchName(branch);
       } else {
-        const { stdout: hashStdout } = await execCommand(
-          'git',
-          ['rev-parse', '--short', 'HEAD'],
-          { cwd },
-        );
+        const { stdout: hashStdout } = await execCommand("git", ["rev-parse", "--short", "HEAD"], {
+          cwd,
+        });
         setBranchName(hashStdout.toString().trim());
       }
     } catch (_error) {
@@ -43,7 +37,7 @@ export function useGitBranchName(cwd: string): string | undefined {
   useEffect(() => {
     fetchBranchName(); // Initial fetch
 
-    const gitLogsHeadPath = path.join(cwd, '.git', 'logs', 'HEAD');
+    const gitLogsHeadPath = path.join(cwd, ".git", "logs", "HEAD");
     let watcher: fs.FSWatcher | undefined;
 
     const setupWatcher = async () => {
@@ -52,7 +46,7 @@ export function useGitBranchName(cwd: string): string | undefined {
         await fsPromises.access(gitLogsHeadPath, fs.constants.F_OK);
         watcher = fs.watch(gitLogsHeadPath, (eventType: string) => {
           // Changes to .git/logs/HEAD (appends) indicate HEAD has likely changed
-          if (eventType === 'change' || eventType === 'rename') {
+          if (eventType === "change" || eventType === "rename") {
             // Handle rename just in case
             fetchBranchName();
           }
diff --git a/apps/airiscode-cli/src/ui/hooks/useHistoryManager.ts b/apps/airiscode-cli/src/ui/hooks/useHistoryManager.ts
index cc7ed5575..f0ae436cb 100644
--- a/apps/airiscode-cli/src/ui/hooks/useHistoryManager.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useHistoryManager.ts
@@ -4,21 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useRef, useCallback } from 'react';
-import type { HistoryItem } from '../types.js';
+import { useCallback, useRef, useState } from "react";
+import type { HistoryItem } from "../types.js";
 
 // Type for the updater function passed to updateHistoryItem
-type HistoryItemUpdater = (
-  prevItem: HistoryItem,
-) => Partial<Omit<HistoryItem, 'id'>>;
+type HistoryItemUpdater = (prevItem: HistoryItem) => Partial<Omit<HistoryItem, "id">>;
 
 export interface UseHistoryManagerReturn {
   history: HistoryItem[];
-  addItem: (itemData: Omit<HistoryItem, 'id'>, baseTimestamp: number) => number; // Returns the generated ID
-  updateItem: (
-    id: number,
-    updates: Partial<Omit<HistoryItem, 'id'>> | HistoryItemUpdater,
-  ) => void;
+  addItem: (itemData: Omit<HistoryItem, "id">, baseTimestamp: number) => number; // Returns the generated ID
+  updateItem: (id: number, updates: Partial<Omit<HistoryItem, "id">> | HistoryItemUpdater) => void;
   clearItems: () => void;
   loadHistory: (newHistory: HistoryItem[]) => void;
 }
@@ -45,7 +40,7 @@ export function useHistory(): UseHistoryManagerReturn {
 
   // Adds a new item to the history state with a unique ID.
   const addItem = useCallback(
-    (itemData: Omit<HistoryItem, 'id'>, baseTimestamp: number): number => {
+    (itemData: Omit<HistoryItem, "id">, baseTimestamp: number): number => {
       const id = getNextMessageId(baseTimestamp);
       const newItem: HistoryItem = { ...itemData, id } as HistoryItem;
 
@@ -54,8 +49,8 @@ export function useHistory(): UseHistoryManagerReturn {
           const lastItem = prevHistory[prevHistory.length - 1];
           // Prevent adding duplicate consecutive user messages
           if (
-            lastItem.type === 'user' &&
-            newItem.type === 'user' &&
+            lastItem.type === "user" &&
+            newItem.type === "user" &&
             lastItem.text === newItem.text
           ) {
             return prevHistory; // Don't add the duplicate
@@ -76,16 +71,12 @@ export function useHistory(): UseHistoryManagerReturn {
    */
   //
   const updateItem = useCallback(
-    (
-      id: number,
-      updates: Partial<Omit<HistoryItem, 'id'>> | HistoryItemUpdater,
-    ) => {
+    (id: number, updates: Partial<Omit<HistoryItem, "id">> | HistoryItemUpdater) => {
       setHistory((prevHistory) =>
         prevHistory.map((item) => {
           if (item.id === id) {
             // Apply updates based on whether it's an object or a function
-            const newUpdates =
-              typeof updates === 'function' ? updates(item) : updates;
+            const newUpdates = typeof updates === "function" ? updates(item) : updates;
             return { ...item, ...newUpdates } as HistoryItem;
           }
           return item;
diff --git a/apps/airiscode-cli/src/ui/hooks/useHooksDialog.ts b/apps/airiscode-cli/src/ui/hooks/useHooksDialog.ts
index 5f4bcea09..9ba8a0a86 100644
--- a/apps/airiscode-cli/src/ui/hooks/useHooksDialog.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useHooksDialog.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 export interface UseHooksDialogReturn {
   isHooksDialogOpen: boolean;
diff --git a/apps/airiscode-cli/src/ui/hooks/useIdeTrustListener.ts b/apps/airiscode-cli/src/ui/hooks/useIdeTrustListener.ts
index 6a57fbb7d..e167a6772 100644
--- a/apps/airiscode-cli/src/ui/hooks/useIdeTrustListener.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useIdeTrustListener.ts
@@ -5,22 +5,16 @@
  */
 
 import {
-  useCallback,
-  useEffect,
-  useState,
-  useSyncExternalStore,
-  useRef,
-} from 'react';
-import {
-  IdeClient,
+  type IDEConnectionState,
   IDEConnectionStatus,
+  IdeClient,
   ideContextStore,
-  type IDEConnectionState,
-} from '@airiscode/core';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
+} from "@airiscode/core";
+import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
+import { isWorkspaceTrusted } from "../../config/trustedFolders.js";
+import { useSettings } from "../contexts/SettingsContext.js";
 
-export type RestartReason = 'NONE' | 'CONNECTION_CHANGE' | 'TRUST_CHANGE';
+export type RestartReason = "NONE" | "CONNECTION_CHANGE" | "TRUST_CHANGE";
 
 /**
  * This hook listens for trust status updates from the IDE companion extension.
@@ -33,19 +27,19 @@ export function useIdeTrustListener() {
     IDEConnectionStatus.Disconnected,
   );
   const previousTrust = useRef<boolean | undefined>(undefined);
-  const [restartReason, setRestartReason] = useState<RestartReason>('NONE');
+  const [restartReason, setRestartReason] = useState<RestartReason>("NONE");
   const [needsRestart, setNeedsRestart] = useState(false);
 
   const subscribe = useCallback((onStoreChange: () => void) => {
     const handleStatusChange = (state: IDEConnectionState) => {
       setConnectionStatus(state.status);
-      setRestartReason('CONNECTION_CHANGE');
+      setRestartReason("CONNECTION_CHANGE");
       // Also notify useSyncExternalStore that the data has changed
       onStoreChange();
     };
 
     const handleTrustChange = () => {
-      setRestartReason('TRUST_CHANGE');
+      setRestartReason("TRUST_CHANGE");
       onStoreChange();
     };
 
@@ -77,10 +71,7 @@ export function useIdeTrustListener() {
     const currentTrust = isWorkspaceTrusted(settings.merged).isTrusted;
     // Trigger a restart if the overall trust status for the CLI has changed,
     // but not on the initial trust value.
-    if (
-      previousTrust.current !== undefined &&
-      previousTrust.current !== currentTrust
-    ) {
+    if (previousTrust.current !== undefined && previousTrust.current !== currentTrust) {
       setNeedsRestart(true);
     }
     previousTrust.current = currentTrust;
diff --git a/apps/airiscode-cli/src/ui/hooks/useInitializationAuthError.ts b/apps/airiscode-cli/src/ui/hooks/useInitializationAuthError.ts
index bb25d323d..52303de14 100644
--- a/apps/airiscode-cli/src/ui/hooks/useInitializationAuthError.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useInitializationAuthError.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef } from "react";
 
 /**
  * Hook that handles initialization authentication error only once.
diff --git a/apps/airiscode-cli/src/ui/hooks/useInputHistory.ts b/apps/airiscode-cli/src/ui/hooks/useInputHistory.ts
index 65e0256a5..4825c25ba 100644
--- a/apps/airiscode-cli/src/ui/hooks/useInputHistory.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useInputHistory.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 interface UseInputHistoryProps {
   userMessages: readonly string[];
@@ -29,12 +29,11 @@ export function useInputHistory({
   onChange,
 }: UseInputHistoryProps): UseInputHistoryReturn {
   const [historyIndex, setHistoryIndex] = useState<number>(-1);
-  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] =
-    useState<string>('');
+  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] = useState<string>("");
 
   const resetHistoryNav = useCallback(() => {
     setHistoryIndex(-1);
-    setOriginalQueryBeforeNav('');
+    setOriginalQueryBeforeNav("");
   }, []);
 
   const handleSubmit = useCallback(
@@ -95,14 +94,7 @@ export function useInputHistory({
       onChange(newValue);
     }
     return true;
-  }, [
-    historyIndex,
-    setHistoryIndex,
-    originalQueryBeforeNav,
-    onChange,
-    userMessages,
-    isActive,
-  ]);
+  }, [historyIndex, setHistoryIndex, originalQueryBeforeNav, onChange, userMessages, isActive]);
 
   return {
     handleSubmit,
diff --git a/apps/airiscode-cli/src/ui/hooks/useInputHistoryStore.ts b/apps/airiscode-cli/src/ui/hooks/useInputHistoryStore.ts
index 88db2f2c5..5a1be1a48 100644
--- a/apps/airiscode-cli/src/ui/hooks/useInputHistoryStore.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useInputHistoryStore.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import { useCallback, useState } from "react";
 
 interface Logger {
   getPreviousUserMessages(): Promise<string[]>;
@@ -17,7 +17,7 @@ export interface UseInputHistoryStoreReturn {
   initializeFromLogger: (logger: Logger | null) => Promise<void>;
 }
 
-const debugLogger = createDebugLogger('INPUT_HISTORY_STORE');
+const debugLogger = createDebugLogger("INPUT_HISTORY_STORE");
 
 /**
  * Hook for independently managing input history.
@@ -26,36 +26,31 @@ const debugLogger = createDebugLogger('INPUT_HISTORY_STORE');
 export function useInputHistoryStore(): UseInputHistoryStoreReturn {
   const [inputHistory, setInputHistory] = useState<string[]>([]);
   const [_pastSessionMessages, setPastSessionMessages] = useState<string[]>([]);
-  const [_currentSessionMessages, setCurrentSessionMessages] = useState<
-    string[]
-  >([]);
+  const [_currentSessionMessages, setCurrentSessionMessages] = useState<string[]>([]);
   const [isInitialized, setIsInitialized] = useState(false);
 
   /**
    * Recalculate the complete input history from past and current sessions.
    * Applies the same deduplication logic as the previous implementation.
    */
-  const recalculateHistory = useCallback(
-    (currentSession: string[], pastSession: string[]) => {
-      // Combine current session (newest first) + past session (newest first)
-      const combinedMessages = [...currentSession, ...pastSession];
+  const recalculateHistory = useCallback((currentSession: string[], pastSession: string[]) => {
+    // Combine current session (newest first) + past session (newest first)
+    const combinedMessages = [...currentSession, ...pastSession];
 
-      // Deduplicate consecutive identical messages (same algorithm as before)
-      const deduplicatedMessages: string[] = [];
-      if (combinedMessages.length > 0) {
-        deduplicatedMessages.push(combinedMessages[0]); // Add the newest one unconditionally
-        for (let i = 1; i < combinedMessages.length; i++) {
-          if (combinedMessages[i] !== combinedMessages[i - 1]) {
-            deduplicatedMessages.push(combinedMessages[i]);
-          }
+    // Deduplicate consecutive identical messages (same algorithm as before)
+    const deduplicatedMessages: string[] = [];
+    if (combinedMessages.length > 0) {
+      deduplicatedMessages.push(combinedMessages[0]); // Add the newest one unconditionally
+      for (let i = 1; i < combinedMessages.length; i++) {
+        if (combinedMessages[i] !== combinedMessages[i - 1]) {
+          deduplicatedMessages.push(combinedMessages[i]);
         }
       }
+    }
 
-      // Reverse to oldest first for useInputHistory
-      setInputHistory(deduplicatedMessages.reverse());
-    },
-    [],
-  );
+    // Reverse to oldest first for useInputHistory
+    setInputHistory(deduplicatedMessages.reverse());
+  }, []);
 
   /**
    * Initialize input history from logger with past session data.
@@ -72,10 +67,7 @@ export function useInputHistoryStore(): UseInputHistoryStoreReturn {
         setIsInitialized(true);
       } catch (error) {
         // Start with empty history even if logger initialization fails
-        debugLogger.warn(
-          'Failed to initialize input history from logger:',
-          error,
-        );
+        debugLogger.warn("Failed to initialize input history from logger:", error);
         setPastSessionMessages([]);
         recalculateHistory([], []);
         setIsInitialized(true);
diff --git a/apps/airiscode-cli/src/ui/hooks/useKeypress.ts b/apps/airiscode-cli/src/ui/hooks/useKeypress.ts
index 1ff3ae277..e8e203816 100644
--- a/apps/airiscode-cli/src/ui/hooks/useKeypress.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useKeypress.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
-import type { KeypressHandler, Key } from '../contexts/KeypressContext.js';
-import { useKeypressContext } from '../contexts/KeypressContext.js';
+import { useEffect } from "react";
+import type { Key, KeypressHandler } from "../contexts/KeypressContext.js";
+import { useKeypressContext } from "../contexts/KeypressContext.js";
 
 export type { Key };
 
@@ -17,10 +17,7 @@ export type { Key };
  * @param options - Options to control the hook's behavior.
  * @param options.isActive - Whether the hook should be actively listening for input.
  */
-export function useKeypress(
-  onKeypress: KeypressHandler,
-  { isActive }: { isActive: boolean },
-) {
+export function useKeypress(onKeypress: KeypressHandler, { isActive }: { isActive: boolean }) {
   const { subscribe, unsubscribe } = useKeypressContext();
 
   useEffect(() => {
diff --git a/apps/airiscode-cli/src/ui/hooks/useKittyKeyboardProtocol.ts b/apps/airiscode-cli/src/ui/hooks/useKittyKeyboardProtocol.ts
index 53c7566c6..700a5fe43 100644
--- a/apps/airiscode-cli/src/ui/hooks/useKittyKeyboardProtocol.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useKittyKeyboardProtocol.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState } from 'react';
+import { useState } from "react";
 import {
   isKittyProtocolEnabled,
   isKittyProtocolSupported,
-} from '../utils/kittyProtocolDetector.js';
+} from "../utils/kittyProtocolDetector.js";
 
 export interface KittyProtocolStatus {
   supported: boolean;
diff --git a/apps/airiscode-cli/src/ui/hooks/useLaunchEditor.ts b/apps/airiscode-cli/src/ui/hooks/useLaunchEditor.ts
index 058e5929c..aefd98929 100644
--- a/apps/airiscode-cli/src/ui/hooks/useLaunchEditor.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useLaunchEditor.ts
@@ -1,12 +1,9 @@
-import { useCallback } from 'react';
-import { useStdin } from 'ink';
-import type { EditorType } from '@airiscode/core';
-import {
-  editorCommands,
-  commandExists as coreCommandExists,
-} from '@airiscode/core';
-import { spawnSync } from 'child_process';
-import { useSettings } from '../contexts/SettingsContext.js';
+import type { EditorType } from "@airiscode/core";
+import { commandExists as coreCommandExists, editorCommands } from "@airiscode/core";
+import { spawnSync } from "child_process";
+import { useStdin } from "ink";
+import { useCallback } from "react";
+import { useSettings } from "../contexts/SettingsContext.js";
 
 /**
  * Cache for command existence checks to avoid repeated execSync calls.
@@ -31,15 +28,14 @@ function commandExists(cmd: string): boolean {
  */
 function getExecutableCommand(editorType: EditorType): string {
   const commandConfig = editorCommands[editorType];
-  const commands =
-    process.platform === 'win32' ? commandConfig.win32 : commandConfig.default;
+  const commands = process.platform === "win32" ? commandConfig.win32 : commandConfig.default;
 
   const availableCommand = commands.find((cmd) => commandExists(cmd));
 
   if (!availableCommand) {
     throw new Error(
       `No available editor command found for ${editorType}. ` +
-        `Tried: ${commands.join(', ')}. ` +
+        `Tried: ${commands.join(", ")}. ` +
         `Please install one of these editors or set a different preferredEditor in settings.`,
     );
   }
@@ -57,12 +53,12 @@ function getEditorCommand(preferredEditor?: EditorType): string {
 
   // Platform-specific defaults with UI preference for macOS
   switch (process.platform) {
-    case 'darwin':
-      return 'open -t'; // TextEdit in plain text mode
-    case 'win32':
-      return 'notepad';
+    case "darwin":
+      return "open -t"; // TextEdit in plain text mode
+    case "win32":
+      return "notepad";
     default:
-      return process.env['VISUAL'] || process.env['EDITOR'] || 'vi';
+      return process.env["VISUAL"] || process.env["EDITOR"] || "vi";
   }
 }
 
@@ -76,19 +72,17 @@ export function useLaunchEditor() {
 
   const launchEditor = useCallback(
     async (filePath: string): Promise<void> => {
-      const preferredEditor = settings.merged.general?.preferredEditor as
-        | EditorType
-        | undefined;
+      const preferredEditor = settings.merged.general?.preferredEditor as EditorType | undefined;
       const editor = getEditorCommand(preferredEditor);
 
       // Handle different editor command formats
       let editorCommand: string;
       let editorArgs: string[];
 
-      if (editor === 'open -t') {
+      if (editor === "open -t") {
         // macOS TextEdit in plain text mode
-        editorCommand = 'open';
-        editorArgs = ['-t', filePath];
+        editorCommand = "open";
+        editorArgs = ["-t", filePath];
       } else {
         // Standard editor command
         editorCommand = editor;
@@ -102,16 +96,16 @@ export function useLaunchEditor() {
 
         // On Windows, .cmd and .bat files need shell: true
         const needsShell =
-          process.platform === 'win32' &&
-          (editorCommand.endsWith('.cmd') || editorCommand.endsWith('.bat'));
+          process.platform === "win32" &&
+          (editorCommand.endsWith(".cmd") || editorCommand.endsWith(".bat"));
 
         const { status, error } = spawnSync(editorCommand, editorArgs, {
-          stdio: 'inherit',
+          stdio: "inherit",
           shell: needsShell,
         });
 
         if (error) throw error;
-        if (typeof status === 'number' && status !== 0) {
+        if (typeof status === "number" && status !== 0) {
           throw new Error(`Editor exited with status ${status}`);
         }
       } finally {
diff --git a/apps/airiscode-cli/src/ui/hooks/useLoadingIndicator.ts b/apps/airiscode-cli/src/ui/hooks/useLoadingIndicator.ts
index 63cab5711..c3d6177f6 100644
--- a/apps/airiscode-cli/src/ui/hooks/useLoadingIndicator.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useLoadingIndicator.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { StreamingState } from '../types.js';
-import { useTimer } from './useTimer.js';
-import { usePhraseCycler } from './usePhraseCycler.js';
-import { useState, useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from "react";
+import { StreamingState } from "../types.js";
+import { usePhraseCycler } from "./usePhraseCycler.js";
+import { useTimer } from "./useTimer.js";
 
 export const useLoadingIndicator = (
   streamingState: StreamingState,
diff --git a/apps/airiscode-cli/src/ui/hooks/useLogger.ts b/apps/airiscode-cli/src/ui/hooks/useLogger.ts
index 3e193ac1a..6a8bba7ad 100644
--- a/apps/airiscode-cli/src/ui/hooks/useLogger.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useLogger.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
-import type { Storage } from '@airiscode/core';
-import { Logger } from '@airiscode/core';
+import type { Storage } from "@airiscode/core";
+import { Logger } from "@airiscode/core";
+import { useEffect, useState } from "react";
 
 /**
  * Hook to manage the logger instance.
diff --git a/apps/airiscode-cli/src/ui/hooks/useMcpDialog.ts b/apps/airiscode-cli/src/ui/hooks/useMcpDialog.ts
index 3b444297f..894628c36 100644
--- a/apps/airiscode-cli/src/ui/hooks/useMcpDialog.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useMcpDialog.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 export interface UseMcpDialogReturn {
   isMcpDialogOpen: boolean;
diff --git a/apps/airiscode-cli/src/ui/hooks/useMemoryMonitor.ts b/apps/airiscode-cli/src/ui/hooks/useMemoryMonitor.ts
index 7573eb0c2..9489cacf1 100644
--- a/apps/airiscode-cli/src/ui/hooks/useMemoryMonitor.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useMemoryMonitor.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
-import process from 'node:process';
-import { type HistoryItemWithoutId, MessageType } from '../types.js';
+import process from "node:process";
+import { useEffect } from "react";
+import { type HistoryItemWithoutId, MessageType } from "../types.js";
 
 export const MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024; // 7GB in bytes
 export const MEMORY_CHECK_INTERVAL = 60 * 1000; // one minute
@@ -24,11 +24,8 @@ export const useMemoryMonitor = ({ addItem }: MemoryMonitorOptions) => {
           {
             type: MessageType.WARNING,
             text:
-              `High memory usage detected: ${(
-                usage /
-                (1024 * 1024 * 1024)
-              ).toFixed(2)} GB. ` +
-              'If you experience a crash, please file a bug report by running `/bug`',
+              `High memory usage detected: ${(usage / (1024 * 1024 * 1024)).toFixed(2)} GB. ` +
+              "If you experience a crash, please file a bug report by running `/bug`",
           },
           Date.now(),
         );
diff --git a/apps/airiscode-cli/src/ui/hooks/useMessageQueue.ts b/apps/airiscode-cli/src/ui/hooks/useMessageQueue.ts
index 00af564b3..21905778a 100644
--- a/apps/airiscode-cli/src/ui/hooks/useMessageQueue.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useMessageQueue.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { StreamingState } from '../types.js';
+import { useCallback, useEffect, useRef, useState } from "react";
+import { StreamingState } from "../types.js";
 
 export interface UseMessageQueueOptions {
   isConfigInitialized: boolean;
@@ -58,8 +58,8 @@ export function useMessageQueue({
 
   // Get all queued messages as a single text string
   const getQueuedMessagesText = useCallback(() => {
-    if (messageQueue.length === 0) return '';
-    return messageQueue.join('\n\n');
+    if (messageQueue.length === 0) return "";
+    return messageQueue.join("\n\n");
   }, [messageQueue]);
 
   // Atomically drain all queued messages (synchronous, safe from callbacks).
@@ -73,24 +73,14 @@ export function useMessageQueue({
 
   // Process queued messages when streaming becomes idle
   useEffect(() => {
-    if (
-      isConfigInitialized &&
-      streamingState === StreamingState.Idle &&
-      messageQueue.length > 0
-    ) {
+    if (isConfigInitialized && streamingState === StreamingState.Idle && messageQueue.length > 0) {
       // Combine all messages with double newlines for clarity
-      const combinedMessage = messageQueue.join('\n\n');
+      const combinedMessage = messageQueue.join("\n\n");
       // Clear the queue and submit
       clearQueue();
       submitQuery(combinedMessage);
     }
-  }, [
-    isConfigInitialized,
-    streamingState,
-    messageQueue,
-    submitQuery,
-    clearQueue,
-  ]);
+  }, [isConfigInitialized, streamingState, messageQueue, submitQuery, clearQueue]);
 
   return {
     messageQueue,
diff --git a/apps/airiscode-cli/src/ui/hooks/useModelCommand.ts b/apps/airiscode-cli/src/ui/hooks/useModelCommand.ts
index af182a2f3..51c8dde49 100644
--- a/apps/airiscode-cli/src/ui/hooks/useModelCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useModelCommand.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 interface UseModelCommandReturn {
   isModelDialogOpen: boolean;
@@ -17,13 +17,10 @@ export const useModelCommand = (): UseModelCommandReturn => {
   const [isModelDialogOpen, setIsModelDialogOpen] = useState(false);
   const [isFastModelMode, setIsFastModelMode] = useState(false);
 
-  const openModelDialog = useCallback(
-    (options?: { fastModelMode?: boolean }) => {
-      setIsFastModelMode(options?.fastModelMode ?? false);
-      setIsModelDialogOpen(true);
-    },
-    [],
-  );
+  const openModelDialog = useCallback((options?: { fastModelMode?: boolean }) => {
+    setIsFastModelMode(options?.fastModelMode ?? false);
+    setIsModelDialogOpen(true);
+  }, []);
 
   const closeModelDialog = useCallback(() => {
     setIsModelDialogOpen(false);
diff --git a/apps/airiscode-cli/src/ui/hooks/usePhraseCycler.ts b/apps/airiscode-cli/src/ui/hooks/usePhraseCycler.ts
index 4aa202e6c..a848c0caf 100644
--- a/apps/airiscode-cli/src/ui/hooks/usePhraseCycler.ts
+++ b/apps/airiscode-cli/src/ui/hooks/usePhraseCycler.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef, useMemo } from 'react';
-import { t, ta } from '../../i18n/index.js';
+import { useEffect, useMemo, useRef, useState } from "react";
+import { t, ta } from "../../i18n/index.js";
 
 export const WITTY_LOADING_PHRASES: string[] = ["I'm Feeling Lucky"];
 
@@ -27,20 +27,16 @@ export const usePhraseCycler = (
     if (customPhrases && customPhrases.length > 0) {
       return customPhrases;
     }
-    const translatedPhrases = ta('WITTY_LOADING_PHRASES');
-    return translatedPhrases.length > 0
-      ? translatedPhrases
-      : WITTY_LOADING_PHRASES;
+    const translatedPhrases = ta("WITTY_LOADING_PHRASES");
+    return translatedPhrases.length > 0 ? translatedPhrases : WITTY_LOADING_PHRASES;
   }, [customPhrases]);
 
-  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(
-    loadingPhrases[0],
-  );
+  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(loadingPhrases[0]);
   const phraseIntervalRef = useRef<NodeJS.Timeout | null>(null);
 
   useEffect(() => {
     if (isWaiting) {
-      setCurrentLoadingPhrase(t('Waiting for user confirmation...'));
+      setCurrentLoadingPhrase(t("Waiting for user confirmation..."));
       if (phraseIntervalRef.current) {
         clearInterval(phraseIntervalRef.current);
         phraseIntervalRef.current = null;
@@ -50,9 +46,7 @@ export const usePhraseCycler = (
         clearInterval(phraseIntervalRef.current);
       }
       // Select an initial random phrase
-      const initialRandomIndex = Math.floor(
-        Math.random() * loadingPhrases.length,
-      );
+      const initialRandomIndex = Math.floor(Math.random() * loadingPhrases.length);
       setCurrentLoadingPhrase(loadingPhrases[initialRandomIndex]);
 
       phraseIntervalRef.current = setInterval(() => {
diff --git a/apps/airiscode-cli/src/ui/hooks/useReactToolScheduler.ts b/apps/airiscode-cli/src/ui/hooks/useReactToolScheduler.ts
index 3e094b1c4..02cf37e3e 100644
--- a/apps/airiscode-cli/src/ui/hooks/useReactToolScheduler.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useReactToolScheduler.ts
@@ -5,33 +5,27 @@
  */
 
 import type {
+  AllToolCallsCompleteHandler,
+  CancelledToolCall,
+  CompletedToolCall,
   Config,
-  ToolCallRequestInfo,
+  Status as CoreStatus,
+  EditorType,
   ExecutingToolCall,
+  OutputUpdateHandler,
   ScheduledToolCall,
+  ToolCall,
+  ToolCallRequestInfo,
+  ToolCallsUpdateHandler,
   ValidatingToolCall,
   WaitingToolCall,
-  CompletedToolCall,
-  CancelledToolCall,
-  OutputUpdateHandler,
-  AllToolCallsCompleteHandler,
-  ToolCallsUpdateHandler,
-  ToolCall,
-  Status as CoreStatus,
-  EditorType,
-} from '@airiscode/core';
-import {
-  CoreToolScheduler,
-  createDebugLogger,
-} from '@airiscode/core';
-import { useCallback, useState, useMemo } from 'react';
-import type {
-  HistoryItemToolGroup,
-  IndividualToolCallDisplay,
-} from '../types.js';
-import { ToolCallStatus } from '../types.js';
+} from "@airiscode/core";
+import { CoreToolScheduler, createDebugLogger } from "@airiscode/core";
+import { useCallback, useMemo, useState } from "react";
+import type { HistoryItemToolGroup, IndividualToolCallDisplay } from "../types.js";
+import { ToolCallStatus } from "../types.js";
 
-const debugLogger = createDebugLogger('REACT_TOOL_SCHEDULER');
+const debugLogger = createDebugLogger("REACT_TOOL_SCHEDULER");
 
 export type ScheduleFn = (
   request: ToolCallRequestInfo | ToolCallRequestInfo[],
@@ -73,24 +67,19 @@ export function useReactToolScheduler(
   getPreferredEditor: () => EditorType | undefined,
   onEditorClose: () => void,
 ): [TrackedToolCall[], ScheduleFn, MarkToolsAsSubmittedFn] {
-  const [toolCallsForDisplay, setToolCallsForDisplay] = useState<
-    TrackedToolCall[]
-  >([]);
+  const [toolCallsForDisplay, setToolCallsForDisplay] = useState<TrackedToolCall[]>([]);
 
-  const outputUpdateHandler: OutputUpdateHandler = useCallback(
-    (toolCallId, outputChunk) => {
-      setToolCallsForDisplay((prevCalls) =>
-        prevCalls.map((tc) => {
-          if (tc.request.callId === toolCallId && tc.status === 'executing') {
-            const executingTc = tc as TrackedExecutingToolCall;
-            return { ...executingTc, liveOutput: outputChunk };
-          }
-          return tc;
-        }),
-      );
-    },
-    [],
-  );
+  const outputUpdateHandler: OutputUpdateHandler = useCallback((toolCallId, outputChunk) => {
+    setToolCallsForDisplay((prevCalls) =>
+      prevCalls.map((tc) => {
+        if (tc.request.callId === toolCallId && tc.status === "executing") {
+          const executingTc = tc as TrackedExecutingToolCall;
+          return { ...executingTc, liveOutput: outputChunk };
+        }
+        return tc;
+      }),
+    );
+  }, []);
 
   const allToolCallsCompleteHandler: AllToolCallsCompleteHandler = useCallback(
     async (completedToolCalls) => {
@@ -108,15 +97,13 @@ export function useReactToolScheduler(
           );
           // Start with the new core state, then layer on the existing UI state
           // to ensure UI-only properties like pid are preserved.
-          const responseSubmittedToGemini =
-            existingTrackedCall?.responseSubmittedToGemini ?? false;
+          const responseSubmittedToGemini = existingTrackedCall?.responseSubmittedToGemini ?? false;
 
-          if (coreTc.status === 'executing') {
+          if (coreTc.status === "executing") {
             return {
               ...coreTc,
               responseSubmittedToGemini,
-              liveOutput: (existingTrackedCall as TrackedExecutingToolCall)
-                ?.liveOutput,
+              liveOutput: (existingTrackedCall as TrackedExecutingToolCall)?.liveOutput,
               pid: (coreTc as ExecutingToolCall).pid,
             };
           }
@@ -157,27 +144,19 @@ export function useReactToolScheduler(
   );
 
   const schedule: ScheduleFn = useCallback(
-    (
-      request: ToolCallRequestInfo | ToolCallRequestInfo[],
-      signal: AbortSignal,
-    ) => {
+    (request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal) => {
       void scheduler.schedule(request, signal);
     },
     [scheduler],
   );
 
-  const markToolsAsSubmitted: MarkToolsAsSubmittedFn = useCallback(
-    (callIdsToMark: string[]) => {
-      setToolCallsForDisplay((prevCalls) =>
-        prevCalls.map((tc) =>
-          callIdsToMark.includes(tc.request.callId)
-            ? { ...tc, responseSubmittedToGemini: true }
-            : tc,
-        ),
-      );
-    },
-    [],
-  );
+  const markToolsAsSubmitted: MarkToolsAsSubmittedFn = useCallback((callIdsToMark: string[]) => {
+    setToolCallsForDisplay((prevCalls) =>
+      prevCalls.map((tc) =>
+        callIdsToMark.includes(tc.request.callId) ? { ...tc, responseSubmittedToGemini: true } : tc,
+      ),
+    );
+  }, []);
 
   return [toolCallsForDisplay, schedule, markToolsAsSubmitted];
 }
@@ -187,19 +166,19 @@ export function useReactToolScheduler(
  */
 function mapCoreStatusToDisplayStatus(coreStatus: CoreStatus): ToolCallStatus {
   switch (coreStatus) {
-    case 'validating':
+    case "validating":
       return ToolCallStatus.Executing;
-    case 'awaiting_approval':
+    case "awaiting_approval":
       return ToolCallStatus.Confirming;
-    case 'executing':
+    case "executing":
       return ToolCallStatus.Executing;
-    case 'success':
+    case "success":
       return ToolCallStatus.Success;
-    case 'cancelled':
+    case "cancelled":
       return ToolCallStatus.Canceled;
-    case 'error':
+    case "error":
       return ToolCallStatus.Error;
-    case 'scheduled':
+    case "scheduled":
       return ToolCallStatus.Pending;
     default: {
       const exhaustiveCheck: never = coreStatus;
@@ -217,98 +196,93 @@ export function mapToDisplay(
 ): HistoryItemToolGroup {
   const toolCalls = Array.isArray(toolOrTools) ? toolOrTools : [toolOrTools];
 
-  const toolDisplays = toolCalls.map(
-    (trackedCall): IndividualToolCallDisplay => {
-      let displayName: string;
-      let description: string;
-      let renderOutputAsMarkdown = false;
+  const toolDisplays = toolCalls.map((trackedCall): IndividualToolCallDisplay => {
+    let displayName: string;
+    let description: string;
+    let renderOutputAsMarkdown = false;
 
-      if (trackedCall.status === 'error') {
-        displayName =
-          trackedCall.tool === undefined
-            ? trackedCall.request.name
-            : trackedCall.tool.displayName;
-        description = JSON.stringify(trackedCall.request.args);
-      } else {
-        displayName = trackedCall.tool.displayName;
-        description = trackedCall.invocation.getDescription();
-        renderOutputAsMarkdown = trackedCall.tool.isOutputMarkdown;
-      }
+    if (trackedCall.status === "error") {
+      displayName =
+        trackedCall.tool === undefined ? trackedCall.request.name : trackedCall.tool.displayName;
+      description = JSON.stringify(trackedCall.request.args);
+    } else {
+      displayName = trackedCall.tool.displayName;
+      description = trackedCall.invocation.getDescription();
+      renderOutputAsMarkdown = trackedCall.tool.isOutputMarkdown;
+    }
 
-      const baseDisplayProperties: Omit<
-        IndividualToolCallDisplay,
-        'status' | 'resultDisplay' | 'confirmationDetails'
-      > = {
-        callId: trackedCall.request.callId,
-        name: displayName,
-        description,
-        renderOutputAsMarkdown,
-      };
+    const baseDisplayProperties: Omit<
+      IndividualToolCallDisplay,
+      "status" | "resultDisplay" | "confirmationDetails"
+    > = {
+      callId: trackedCall.request.callId,
+      name: displayName,
+      description,
+      renderOutputAsMarkdown,
+    };
 
-      switch (trackedCall.status) {
-        case 'success':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: trackedCall.response.resultDisplay,
-            confirmationDetails: undefined,
-          };
-        case 'error':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: trackedCall.response.resultDisplay,
-            confirmationDetails: undefined,
-          };
-        case 'cancelled':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: trackedCall.response.resultDisplay,
-            confirmationDetails: undefined,
-          };
-        case 'awaiting_approval':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: undefined,
-            confirmationDetails: trackedCall.confirmationDetails,
-          };
-        case 'executing':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay:
-              (trackedCall as TrackedExecutingToolCall).liveOutput ?? undefined,
-            confirmationDetails: undefined,
-            ptyId: (trackedCall as TrackedExecutingToolCall).pid,
-          };
-        case 'validating': // Fallthrough
-        case 'scheduled':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: undefined,
-            confirmationDetails: undefined,
-          };
-        default: {
-          const exhaustiveCheck: never = trackedCall;
-          return {
-            callId: (exhaustiveCheck as TrackedToolCall).request.callId,
-            name: 'Unknown Tool',
-            description: 'Encountered an unknown tool call state.',
-            status: ToolCallStatus.Error,
-            resultDisplay: 'Unknown tool call state',
-            confirmationDetails: undefined,
-            renderOutputAsMarkdown: false,
-          };
-        }
+    switch (trackedCall.status) {
+      case "success":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: trackedCall.response.resultDisplay,
+          confirmationDetails: undefined,
+        };
+      case "error":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: trackedCall.response.resultDisplay,
+          confirmationDetails: undefined,
+        };
+      case "cancelled":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: trackedCall.response.resultDisplay,
+          confirmationDetails: undefined,
+        };
+      case "awaiting_approval":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: undefined,
+          confirmationDetails: trackedCall.confirmationDetails,
+        };
+      case "executing":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: (trackedCall as TrackedExecutingToolCall).liveOutput ?? undefined,
+          confirmationDetails: undefined,
+          ptyId: (trackedCall as TrackedExecutingToolCall).pid,
+        };
+      case "validating": // Fallthrough
+      case "scheduled":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: undefined,
+          confirmationDetails: undefined,
+        };
+      default: {
+        const exhaustiveCheck: never = trackedCall;
+        return {
+          callId: (exhaustiveCheck as TrackedToolCall).request.callId,
+          name: "Unknown Tool",
+          description: "Encountered an unknown tool call state.",
+          status: ToolCallStatus.Error,
+          resultDisplay: "Unknown tool call state",
+          confirmationDetails: undefined,
+          renderOutputAsMarkdown: false,
+        };
       }
-    },
-  );
+    }
+  });
 
   return {
-    type: 'tool_group',
+    type: "tool_group",
     tools: toolDisplays,
   };
 }
diff --git a/apps/airiscode-cli/src/ui/hooks/useRefreshMemoryCommand.ts b/apps/airiscode-cli/src/ui/hooks/useRefreshMemoryCommand.ts
index 025eb9a05..f69c4ad01 100644
--- a/apps/airiscode-cli/src/ui/hooks/useRefreshMemoryCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useRefreshMemoryCommand.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const REFRESH_MEMORY_COMMAND_NAME = '/refreshmemory';
+export const REFRESH_MEMORY_COMMAND_NAME = "/refreshmemory";
diff --git a/apps/airiscode-cli/src/ui/hooks/useResumeCommand.ts b/apps/airiscode-cli/src/ui/hooks/useResumeCommand.ts
index 13dd1ff50..260a16892 100644
--- a/apps/airiscode-cli/src/ui/hooks/useResumeCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useResumeCommand.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
 import {
-  SessionService,
   type Config,
-  SessionStartSource,
   type PermissionMode,
-} from '@airiscode/core';
-import { buildResumedHistoryItems } from '../utils/resumeHistoryUtils.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+  SessionService,
+  SessionStartSource,
+} from "@airiscode/core";
+import { useCallback, useState } from "react";
+import { buildResumedHistoryItems } from "../utils/resumeHistoryUtils.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 export interface UseResumeCommandOptions {
   config: Config | null;
-  historyManager: Pick<UseHistoryManagerReturn, 'clearItems' | 'loadHistory'>;
+  historyManager: Pick<UseHistoryManagerReturn, "clearItems" | "loadHistory">;
   startNewSession: (sessionId: string) => void;
   remount?: () => void;
 }
@@ -28,9 +28,7 @@ export interface UseResumeCommandResult {
   handleResume: (sessionId: string) => void;
 }
 
-export function useResumeCommand(
-  options?: UseResumeCommandOptions,
-): UseResumeCommandResult {
+export function useResumeCommand(options?: UseResumeCommandOptions): UseResumeCommandResult {
   const [isResumeDialogOpen, setIsResumeDialogOpen] = useState(false);
 
   const openResumeDialog = useCallback(() => {
@@ -78,7 +76,7 @@ export function useResumeCommand(
           .getHookSystem()
           ?.fireSessionStartEvent(
             SessionStartSource.Resume,
-            config.getModel() ?? '',
+            config.getModel() ?? "",
             String(config.getApprovalMode()) as PermissionMode,
           );
       } catch (err) {
diff --git a/apps/airiscode-cli/src/ui/hooks/useReverseSearchCompletion.tsx b/apps/airiscode-cli/src/ui/hooks/useReverseSearchCompletion.tsx
index d90875c10..564c0c9a7 100644
--- a/apps/airiscode-cli/src/ui/hooks/useReverseSearchCompletion.tsx
+++ b/apps/airiscode-cli/src/ui/hooks/useReverseSearchCompletion.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useMemo, useCallback, useRef } from 'react';
-import { useCompletion } from './useCompletion.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import { useCompletion } from "./useCompletion.js";
 
 function useDebouncedValue<T>(value: T, delay = 200): T {
   const [debounced, setDebounced] = useState(value);
@@ -53,37 +53,34 @@ export function useReverseSearchCompletion(
   const debouncedQuery = useDebouncedValue(buffer.text, 100);
 
   // incremental search
-  const prevQueryRef = useRef<string>('');
+  const prevQueryRef = useRef<string>("");
   const prevMatchesRef = useRef<Suggestion[]>([]);
 
   // Clear incremental cache when activating reverse search
   useEffect(() => {
     if (reverseSearchActive) {
-      prevQueryRef.current = '';
+      prevQueryRef.current = "";
       prevMatchesRef.current = [];
     }
   }, [reverseSearchActive]);
 
   // Also clear cache when history changes so new items are considered
   useEffect(() => {
-    prevQueryRef.current = '';
+    prevQueryRef.current = "";
     prevMatchesRef.current = [];
   }, [history]);
 
-  const searchHistory = useCallback(
-    (query: string, items: readonly string[]) => {
-      const out: Suggestion[] = [];
-      for (let i = 0; i < items.length; i++) {
-        const cmd = items[i];
-        const idx = cmd.toLowerCase().indexOf(query);
-        if (idx !== -1) {
-          out.push({ label: cmd, value: cmd, matchedIndex: idx });
-        }
+  const searchHistory = useCallback((query: string, items: readonly string[]) => {
+    const out: Suggestion[] = [];
+    for (let i = 0; i < items.length; i++) {
+      const cmd = items[i];
+      const idx = cmd.toLowerCase().indexOf(query);
+      if (idx !== -1) {
+        out.push({ label: cmd, value: cmd, matchedIndex: idx });
       }
-      return out;
-    },
-    [],
-  );
+    }
+    return out;
+  }, []);
 
   const matches = useMemo<Suggestion[]>(() => {
     if (!reverseSearchActive) return [];
@@ -100,9 +97,7 @@ export function useReverseSearchCompletion(
       query.startsWith(prevQueryRef.current) &&
       prevMatchesRef.current.length > 0;
 
-    const source = canUseCache
-      ? prevMatchesRef.current.map((m) => m.value)
-      : history;
+    const source = canUseCache ? prevMatchesRef.current.map((m) => m.value) : history;
 
     return searchHistory(query, source);
   }, [debouncedQuery, history, reverseSearchActive, searchHistory]);
diff --git a/apps/airiscode-cli/src/ui/hooks/useSelectionList.ts b/apps/airiscode-cli/src/ui/hooks/useSelectionList.ts
index 200cc1b73..d07b4ea59 100644
--- a/apps/airiscode-cli/src/ui/hooks/useSelectionList.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useSelectionList.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useReducer, useRef, useEffect } from 'react';
-import { createDebugLogger } from '@airiscode/core';
-import { useKeypress } from './useKeypress.js';
+import { createDebugLogger } from "@airiscode/core";
+import { useEffect, useReducer, useRef } from "react";
+import { useKeypress } from "./useKeypress.js";
 
 export interface SelectionListItem<T> {
   key: string;
@@ -23,7 +23,7 @@ export interface UseSelectionListOptions<T> {
   showNumbers?: boolean;
 }
 
-const debugLogger = createDebugLogger('SELECTION_LIST');
+const debugLogger = createDebugLogger("SELECTION_LIST");
 
 export interface UseSelectionListResult {
   activeIndex: number;
@@ -40,36 +40,36 @@ interface SelectionListState<T> {
 
 type SelectionListAction<T> =
   | {
-      type: 'SET_ACTIVE_INDEX';
+      type: "SET_ACTIVE_INDEX";
       payload: {
         index: number;
         items: Array<SelectionListItem<T>>;
       };
     }
   | {
-      type: 'MOVE_UP';
+      type: "MOVE_UP";
       payload: {
         items: Array<SelectionListItem<T>>;
       };
     }
   | {
-      type: 'MOVE_DOWN';
+      type: "MOVE_DOWN";
       payload: {
         items: Array<SelectionListItem<T>>;
       };
     }
   | {
-      type: 'SELECT_CURRENT';
+      type: "SELECT_CURRENT";
       payload: {
         items: Array<SelectionListItem<T>>;
       };
     }
   | {
-      type: 'INITIALIZE';
+      type: "INITIALIZE";
       payload: { initialIndex: number; items: Array<SelectionListItem<T>> };
     }
   | {
-      type: 'CLEAR_PENDING_FLAGS';
+      type: "CLEAR_PENDING_FLAGS";
     };
 
 const NUMBER_INPUT_TIMEOUT_MS = 1000;
@@ -79,14 +79,14 @@ const NUMBER_INPUT_TIMEOUT_MS = 1000;
  */
 const findNextValidIndex = <T>(
   currentIndex: number,
-  direction: 'up' | 'down',
+  direction: "up" | "down",
   items: Array<SelectionListItem<T>>,
 ): number => {
   const len = items.length;
   if (len === 0) return currentIndex;
 
   let nextIndex = currentIndex;
-  const step = direction === 'down' ? 1 : -1;
+  const step = direction === "down" ? 1 : -1;
 
   for (let i = 0; i < len; i++) {
     // Calculate the next index, wrapping around if necessary.
@@ -126,7 +126,7 @@ const computeInitialIndex = <T>(
   }
 
   if (items[targetIndex]?.disabled) {
-    const nextValid = findNextValidIndex(targetIndex, 'down', items);
+    const nextValid = findNextValidIndex(targetIndex, "down", items);
     targetIndex = nextValid;
   }
 
@@ -159,7 +159,7 @@ function selectionListReducer<T>(
   action: SelectionListAction<T>,
 ): SelectionListState<T> {
   switch (action.type) {
-    case 'SET_ACTIVE_INDEX': {
+    case "SET_ACTIVE_INDEX": {
       const { index, items } = action.payload;
 
       // Only update if index actually changed and is valid
@@ -173,29 +173,29 @@ function selectionListReducer<T>(
       return state;
     }
 
-    case 'MOVE_UP': {
+    case "MOVE_UP": {
       const { items } = action.payload;
-      const newIndex = findNextValidIndex(state.activeIndex, 'up', items);
+      const newIndex = findNextValidIndex(state.activeIndex, "up", items);
       if (newIndex !== state.activeIndex) {
         return { ...state, activeIndex: newIndex, pendingHighlight: true };
       }
       return state;
     }
 
-    case 'MOVE_DOWN': {
+    case "MOVE_DOWN": {
       const { items } = action.payload;
-      const newIndex = findNextValidIndex(state.activeIndex, 'down', items);
+      const newIndex = findNextValidIndex(state.activeIndex, "down", items);
       if (newIndex !== state.activeIndex) {
         return { ...state, activeIndex: newIndex, pendingHighlight: true };
       }
       return state;
     }
 
-    case 'SELECT_CURRENT': {
+    case "SELECT_CURRENT": {
       return { ...state, pendingSelect: true };
     }
 
-    case 'INITIALIZE': {
+    case "INITIALIZE": {
       const { initialIndex, items } = action.payload;
       const initialIndexChanged = initialIndex !== state.initialIndex;
       const activeKey =
@@ -203,16 +203,9 @@ function selectionListReducer<T>(
           ? state.items[state.activeIndex]?.key
           : undefined;
       const targetIndex = computeInitialIndex(initialIndex, items, activeKey);
-      const itemsStructurallyEqual = areItemsStructurallyEqual(
-        items,
-        state.items,
-      );
-
-      if (
-        !initialIndexChanged &&
-        targetIndex === state.activeIndex &&
-        itemsStructurallyEqual
-      ) {
+      const itemsStructurallyEqual = areItemsStructurallyEqual(items, state.items);
+
+      if (!initialIndexChanged && targetIndex === state.activeIndex && itemsStructurallyEqual) {
         return state;
       }
 
@@ -225,7 +218,7 @@ function selectionListReducer<T>(
       };
     }
 
-    case 'CLEAR_PENDING_FLAGS': {
+    case "CLEAR_PENDING_FLAGS": {
       return {
         ...state,
         pendingHighlight: false,
@@ -267,12 +260,12 @@ export function useSelectionList<T>({
     pendingSelect: false,
     items,
   });
-  const numberInputRef = useRef('');
+  const numberInputRef = useRef("");
   const numberInputTimer = useRef<NodeJS.Timeout | null>(null);
 
   // Initialize/synchronize state when initialIndex or items change
   useEffect(() => {
-    dispatch({ type: 'INITIALIZE', payload: { initialIndex, items } });
+    dispatch({ type: "INITIALIZE", payload: { initialIndex, items } });
   }, [initialIndex, items]);
 
   // Handle side effects based on state changes
@@ -293,7 +286,7 @@ export function useSelectionList<T>({
     }
 
     if (needsClear) {
-      dispatch({ type: 'CLEAR_PENDING_FLAGS' });
+      dispatch({ type: "CLEAR_PENDING_FLAGS" });
     }
   }, [
     state.pendingHighlight,
@@ -321,21 +314,21 @@ export function useSelectionList<T>({
       // Clear number input buffer on non-numeric key press
       if (!isNumeric && numberInputTimer.current) {
         clearTimeout(numberInputTimer.current);
-        numberInputRef.current = '';
+        numberInputRef.current = "";
       }
 
-      if (name === 'k' || name === 'up') {
-        dispatch({ type: 'MOVE_UP', payload: { items } });
+      if (name === "k" || name === "up") {
+        dispatch({ type: "MOVE_UP", payload: { items } });
         return;
       }
 
-      if (name === 'j' || name === 'down') {
-        dispatch({ type: 'MOVE_DOWN', payload: { items } });
+      if (name === "j" || name === "down") {
+        dispatch({ type: "MOVE_DOWN", payload: { items } });
         return;
       }
 
-      if (name === 'return') {
-        dispatch({ type: 'SELECT_CURRENT', payload: { items } });
+      if (name === "return") {
+        dispatch({ type: "SELECT_CURRENT", payload: { items } });
         return;
       }
 
@@ -351,40 +344,40 @@ export function useSelectionList<T>({
         const targetIndex = Number.parseInt(newNumberInput, 10) - 1;
 
         // Single '0' is invalid (1-indexed)
-        if (newNumberInput === '0') {
+        if (newNumberInput === "0") {
           numberInputTimer.current = setTimeout(() => {
-            numberInputRef.current = '';
+            numberInputRef.current = "";
           }, NUMBER_INPUT_TIMEOUT_MS);
           return;
         }
 
         if (targetIndex >= 0 && targetIndex < items.length) {
           dispatch({
-            type: 'SET_ACTIVE_INDEX',
+            type: "SET_ACTIVE_INDEX",
             payload: { index: targetIndex, items },
           });
 
           // If the number can't be a prefix for another valid number, select immediately
-          const potentialNextNumber = Number.parseInt(newNumberInput + '0', 10);
+          const potentialNextNumber = Number.parseInt(newNumberInput + "0", 10);
           if (potentialNextNumber > items.length) {
             dispatch({
-              type: 'SELECT_CURRENT',
+              type: "SELECT_CURRENT",
               payload: { items },
             });
-            numberInputRef.current = '';
+            numberInputRef.current = "";
           } else {
             // Otherwise wait for more input or timeout
             numberInputTimer.current = setTimeout(() => {
               dispatch({
-                type: 'SELECT_CURRENT',
+                type: "SELECT_CURRENT",
                 payload: { items },
               });
-              numberInputRef.current = '';
+              numberInputRef.current = "";
             }, NUMBER_INPUT_TIMEOUT_MS);
           }
         } else {
           // Number is out of bounds
-          numberInputRef.current = '';
+          numberInputRef.current = "";
         }
       }
     },
@@ -393,7 +386,7 @@ export function useSelectionList<T>({
 
   const setActiveIndex = (index: number) => {
     dispatch({
-      type: 'SET_ACTIVE_INDEX',
+      type: "SET_ACTIVE_INDEX",
       payload: { index, items },
     });
   };
diff --git a/apps/airiscode-cli/src/ui/hooks/useSessionPicker.ts b/apps/airiscode-cli/src/ui/hooks/useSessionPicker.ts
index 6e21c562d..f43da91c6 100644
--- a/apps/airiscode-cli/src/ui/hooks/useSessionPicker.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useSessionPicker.ts
@@ -13,18 +13,14 @@
  *   outside the main app.
  */
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import type {
-  ListSessionsResult,
-  SessionListItem,
-  SessionService,
-} from '@airiscode/core';
+import type { ListSessionsResult, SessionListItem, SessionService } from "@airiscode/core";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   filterSessions,
   SESSION_PAGE_SIZE,
   type SessionState,
-} from '../utils/sessionPickerUtils.js';
-import { useKeypress } from './useKeypress.js';
+} from "../utils/sessionPickerUtils.js";
+import { useKeypress } from "./useKeypress.js";
 
 export interface UseSessionPickerOptions {
   sessionService: SessionService | null;
@@ -109,8 +105,7 @@ export function useSessionPicker({
     [filteredSessions, maxVisibleItems, scrollOffset],
   );
   const showScrollUp = scrollOffset > 0;
-  const showScrollDown =
-    scrollOffset + maxVisibleItems < filteredSessions.length;
+  const showScrollDown = scrollOffset + maxVisibleItems < filteredSessions.length;
 
   // Initial load
   useEffect(() => {
@@ -165,27 +160,18 @@ export function useSessionPicker({
 
   // Ensure selectedIndex is valid when filtered sessions change
   useEffect(() => {
-    if (
-      selectedIndex >= filteredSessions.length &&
-      filteredSessions.length > 0
-    ) {
+    if (selectedIndex >= filteredSessions.length && filteredSessions.length > 0) {
       setSelectedIndex(filteredSessions.length - 1);
     }
   }, [filteredSessions.length, selectedIndex]);
 
   // Auto-load more when centered mode hits the sentinel or list is empty.
   useEffect(() => {
-    if (
-      isLoading ||
-      !sessionState.hasMore ||
-      isLoadingMoreRef.current ||
-      !centerSelection
-    ) {
+    if (isLoading || !sessionState.hasMore || isLoadingMoreRef.current || !centerSelection) {
       return;
     }
 
-    const sentinelVisible =
-      scrollOffset + maxVisibleItems >= filteredSessions.length;
+    const sentinelVisible = scrollOffset + maxVisibleItems >= filteredSessions.length;
     const shouldLoadMore = filteredSessions.length === 0 || sentinelVisible;
 
     if (shouldLoadMore) {
@@ -206,12 +192,12 @@ export function useSessionPicker({
     (key) => {
       const { name, sequence, ctrl } = key;
 
-      if (name === 'escape' || (ctrl && name === 'c')) {
+      if (name === "escape" || (ctrl && name === "c")) {
         onCancel();
         return;
       }
 
-      if (name === 'return') {
+      if (name === "return") {
         const session = filteredSessions[selectedIndex];
         if (session) {
           onSelect(session.sessionId);
@@ -219,7 +205,7 @@ export function useSessionPicker({
         return;
       }
 
-      if (name === 'up' || name === 'k') {
+      if (name === "up" || name === "k") {
         setSelectedIndex((prev) => {
           const newIndex = Math.max(0, prev - 1);
           if (!centerSelection && newIndex < followScrollOffset) {
@@ -230,7 +216,7 @@ export function useSessionPicker({
         return;
       }
 
-      if (name === 'down' || name === 'j') {
+      if (name === "down" || name === "j") {
         if (filteredSessions.length === 0) {
           return;
         }
@@ -238,10 +224,7 @@ export function useSessionPicker({
         setSelectedIndex((prev) => {
           const newIndex = Math.min(filteredSessions.length - 1, prev + 1);
 
-          if (
-            !centerSelection &&
-            newIndex >= followScrollOffset + maxVisibleItems
-          ) {
+          if (!centerSelection && newIndex >= followScrollOffset + maxVisibleItems) {
             setFollowScrollOffset(newIndex - maxVisibleItems + 1);
           }
 
@@ -255,7 +238,7 @@ export function useSessionPicker({
         return;
       }
 
-      if (sequence === 'b' || sequence === 'B') {
+      if (sequence === "b" || sequence === "B") {
         if (currentBranch) {
           setFilterByBranch((prev) => !prev);
         }
diff --git a/apps/airiscode-cli/src/ui/hooks/useSettingsCommand.ts b/apps/airiscode-cli/src/ui/hooks/useSettingsCommand.ts
index 42f535dff..82a7b6117 100644
--- a/apps/airiscode-cli/src/ui/hooks/useSettingsCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useSettingsCommand.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 export function useSettingsCommand() {
   const [isSettingsDialogOpen, setIsSettingsDialogOpen] = useState(false);
diff --git a/apps/airiscode-cli/src/ui/hooks/useShellHistory.ts b/apps/airiscode-cli/src/ui/hooks/useShellHistory.ts
index 5284c3b17..83f794fdd 100644
--- a/apps/airiscode-cli/src/ui/hooks/useShellHistory.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useShellHistory.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useCallback } from 'react';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import {
-  createDebugLogger,
-  isNodeError,
-  Storage,
-} from '@airiscode/core';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { createDebugLogger, isNodeError, Storage } from "@airiscode/core";
+import { useCallback, useEffect, useState } from "react";
 
 const MAX_HISTORY_LENGTH = 100;
-const debugLogger = createDebugLogger('SHELL_HISTORY');
+const debugLogger = createDebugLogger("SHELL_HISTORY");
 
 export interface UseShellHistoryReturn {
   history: string[];
@@ -24,10 +20,7 @@ export interface UseShellHistoryReturn {
   resetHistoryPosition: () => void;
 }
 
-async function getHistoryFilePath(
-  projectRoot: string,
-  configStorage?: Storage,
-): Promise<string> {
+async function getHistoryFilePath(projectRoot: string, configStorage?: Storage): Promise<string> {
   const storage = configStorage ?? new Storage(projectRoot);
   return storage.getHistoryFilePath();
 }
@@ -35,9 +28,9 @@ async function getHistoryFilePath(
 // Handle multiline commands
 async function readHistoryFile(filePath: string): Promise<string[]> {
   try {
-    const text = await fs.readFile(filePath, 'utf-8');
+    const text = await fs.readFile(filePath, "utf-8");
     const result: string[] = [];
-    let cur = '';
+    let cur = "";
 
     for (const raw of text.split(/\r?\n/)) {
       if (!raw.trim()) continue;
@@ -46,7 +39,7 @@ async function readHistoryFile(filePath: string): Promise<string[]> {
       const m = cur.match(/(\\+)$/);
       if (m && m[1].length % 2) {
         // odd number of trailing '\'
-        cur = cur.slice(0, -1) + ' ' + line;
+        cur = cur.slice(0, -1) + " " + line;
       } else {
         if (cur) result.push(cur);
         cur = line;
@@ -56,28 +49,22 @@ async function readHistoryFile(filePath: string): Promise<string[]> {
     if (cur) result.push(cur);
     return result;
   } catch (err) {
-    if (isNodeError(err) && err.code === 'ENOENT') return [];
-    debugLogger.error('Error reading history:', err);
+    if (isNodeError(err) && err.code === "ENOENT") return [];
+    debugLogger.error("Error reading history:", err);
     return [];
   }
 }
 
-async function writeHistoryFile(
-  filePath: string,
-  history: string[],
-): Promise<void> {
+async function writeHistoryFile(filePath: string, history: string[]): Promise<void> {
   try {
     await fs.mkdir(path.dirname(filePath), { recursive: true });
-    await fs.writeFile(filePath, history.join('\n'));
+    await fs.writeFile(filePath, history.join("\n"));
   } catch (error) {
-    debugLogger.error('Error writing shell history:', error);
+    debugLogger.error("Error writing shell history:", error);
   }
 }
 
-export function useShellHistory(
-  projectRoot: string,
-  storage?: Storage,
-): UseShellHistoryReturn {
+export function useShellHistory(projectRoot: string, storage?: Storage): UseShellHistoryReturn {
   const [history, setHistory] = useState<string[]>([]);
   const [historyIndex, setHistoryIndex] = useState(-1);
   const [historyFilePath, setHistoryFilePath] = useState<string | null>(null);
@@ -124,7 +111,7 @@ export function useShellHistory(
     const newIndex = historyIndex - 1;
     setHistoryIndex(newIndex);
     if (newIndex < 0) {
-      return '';
+      return "";
     }
     return history[newIndex] ?? null;
   }, [history, historyIndex]);
diff --git a/apps/airiscode-cli/src/ui/hooks/useShowMemoryCommand.ts b/apps/airiscode-cli/src/ui/hooks/useShowMemoryCommand.ts
index 38833fce9..a53e1e1bb 100644
--- a/apps/airiscode-cli/src/ui/hooks/useShowMemoryCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useShowMemoryCommand.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Message } from '../types.js';
-import { MessageType } from '../types.js';
-import type { Config } from '@airiscode/core';
-import type { LoadedSettings } from '../../config/settings.js';
-import { createDebugLogger } from '@airiscode/core';
+import type { Config } from "@airiscode/core";
+import { createDebugLogger } from "@airiscode/core";
+import type { LoadedSettings } from "../../config/settings.js";
+import type { Message } from "../types.js";
+import { MessageType } from "../types.js";
 
-const debugLogger = createDebugLogger('SHOW_MEMORY');
+const debugLogger = createDebugLogger("SHOW_MEMORY");
 
 export function createShowMemoryAction(
   config: Config | null,
@@ -21,20 +21,18 @@ export function createShowMemoryAction(
     if (!config) {
       addMessage({
         type: MessageType.ERROR,
-        content: 'Configuration not available. Cannot show memory.',
+        content: "Configuration not available. Cannot show memory.",
         timestamp: new Date(),
       });
       return;
     }
 
-    debugLogger.debug('[DEBUG] Show Memory command invoked.');
+    debugLogger.debug("[DEBUG] Show Memory command invoked.");
 
     const currentMemory = config.getUserMemory();
     const fileCount = config.getGeminiMdFileCount();
     const contextFileName = settings.merged.context?.fileName;
-    const contextFileNames = Array.isArray(contextFileName)
-      ? contextFileName
-      : [contextFileName];
+    const contextFileNames = Array.isArray(contextFileName) ? contextFileName : [contextFileName];
 
     debugLogger.debug(
       `[DEBUG] Showing memory. Content from config.getUserMemory() (first 200 chars): ${currentMemory.substring(0, 200)}...`,
@@ -43,12 +41,10 @@ export function createShowMemoryAction(
 
     if (fileCount > 0) {
       const allNamesTheSame = new Set(contextFileNames).size < 2;
-      const name = allNamesTheSame ? contextFileNames[0] : 'context';
+      const name = allNamesTheSame ? contextFileNames[0] : "context";
       addMessage({
         type: MessageType.INFO,
-        content: `Loaded memory from ${fileCount} ${name} file${
-          fileCount > 1 ? 's' : ''
-        }.`,
+        content: `Loaded memory from ${fileCount} ${name} file${fileCount > 1 ? "s" : ""}.`,
         timestamp: new Date(),
       });
     }
@@ -64,8 +60,8 @@ export function createShowMemoryAction(
         type: MessageType.INFO,
         content:
           fileCount > 0
-            ? 'Hierarchical memory (AIRISCODE.md or other context files) is loaded but content is empty.'
-            : 'No hierarchical memory (AIRISCODE.md or other context files) is currently loaded.',
+            ? "Hierarchical memory (AIRISCODE.md or other context files) is loaded but content is empty."
+            : "No hierarchical memory (AIRISCODE.md or other context files) is currently loaded.",
         timestamp: new Date(),
       });
     }
diff --git a/apps/airiscode-cli/src/ui/hooks/useSlashCompletion.ts b/apps/airiscode-cli/src/ui/hooks/useSlashCompletion.ts
index 2d43acdbc..dfc6dc008 100644
--- a/apps/airiscode-cli/src/ui/hooks/useSlashCompletion.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useSlashCompletion.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useMemo } from 'react';
-import { AsyncFzf } from 'fzf';
-import { createDebugLogger } from '@airiscode/core';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import { createDebugLogger } from "@airiscode/core";
+import { AsyncFzf } from "fzf";
+import { useEffect, useMemo, useState } from "react";
 import {
-  CommandKind,
   type CommandCompletionItem,
   type CommandContext,
+  CommandKind,
   type SlashCommand,
-} from '../commands/types.js';
+} from "../commands/types.js";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
 
 // Type alias for improved type safety based on actual fzf result structure
 type FzfCommandResult = {
@@ -30,7 +30,7 @@ interface FzfCommandCacheEntry {
   commandMap: Map<string, SlashCommand>;
 }
 
-const debugLogger = createDebugLogger('SLASH_COMPLETION');
+const debugLogger = createDebugLogger("SLASH_COMPLETION");
 
 // Utility function to safely handle errors without information disclosure
 function logErrorSafely(error: unknown, context: string): void {
@@ -70,7 +70,7 @@ function useCommandParser(
       return {
         hasTrailingSpace: false,
         commandPathParts: [],
-        partial: '',
+        partial: "",
         currentLevel: slashCommands,
         leafCommand: null,
         exactMatchAsParent: undefined,
@@ -78,11 +78,11 @@ function useCommandParser(
       };
     }
 
-    const fullPath = query.substring(1) || '';
-    const hasTrailingSpace = !!query.endsWith(' ');
+    const fullPath = query.substring(1) || "";
+    const hasTrailingSpace = !!query.endsWith(" ");
     const rawParts = fullPath.split(/\s+/).filter((p) => p);
     let commandPathParts = rawParts;
-    let partial = '';
+    let partial = "";
 
     if (!hasTrailingSpace && rawParts.length > 0) {
       partial = rawParts[rawParts.length - 1];
@@ -98,9 +98,7 @@ function useCommandParser(
         currentLevel = [];
         break;
       }
-      const found: SlashCommand | undefined = currentLevel.find((cmd) =>
-        matchesCommand(cmd, part),
-      );
+      const found: SlashCommand | undefined = currentLevel.find((cmd) => matchesCommand(cmd, part));
 
       if (found) {
         leafCommand = found;
@@ -124,15 +122,14 @@ function useCommandParser(
       if (exactMatchAsParent) {
         leafCommand = exactMatchAsParent;
         currentLevel = exactMatchAsParent.subCommands;
-        partial = '';
+        partial = "";
       }
     }
 
     const depth = commandPathParts.length;
     const isArgumentCompletion = !!(
       leafCommand?.completion &&
-      (hasTrailingSpace ||
-        (rawParts.length > depth && depth > 0 && partial !== ''))
+      (hasTrailingSpace || (rawParts.length > depth && depth > 0 && partial !== ""))
     );
 
     return {
@@ -164,13 +161,8 @@ interface PerfectMatchResult {
 function useCommandSuggestions(
   parserResult: CommandParserResult,
   commandContext: CommandContext,
-  getFzfForCommands: (
-    commands: readonly SlashCommand[],
-  ) => FzfCommandCacheEntry | null,
-  getPrefixSuggestions: (
-    commands: readonly SlashCommand[],
-    partial: string,
-  ) => SlashCommand[],
+  getFzfForCommands: (commands: readonly SlashCommand[]) => FzfCommandCacheEntry | null,
+  getPrefixSuggestions: (commands: readonly SlashCommand[], partial: string) => SlashCommand[],
 ): SuggestionsResult {
   const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
   const [isLoading, setIsLoading] = useState(false);
@@ -179,13 +171,8 @@ function useCommandSuggestions(
     const abortController = new AbortController();
     const { signal } = abortController;
 
-    const {
-      isArgumentCompletion,
-      leafCommand,
-      commandPathParts,
-      partial,
-      currentLevel,
-    } = parserResult;
+    const { isArgumentCompletion, leafCommand, commandPathParts, partial, currentLevel } =
+      parserResult;
 
     if (isArgumentCompletion) {
       const fetchAndSetSuggestions = async () => {
@@ -193,9 +180,7 @@ function useCommandSuggestions(
 
         // Safety check: ensure leafCommand and completion exist
         if (!leafCommand?.completion) {
-          debugLogger.warn(
-            'Attempted argument completion without completion function',
-          );
+          debugLogger.warn("Attempted argument completion without completion function");
           return;
         }
 
@@ -204,13 +189,13 @@ function useCommandSuggestions(
           const rawParts = [...commandPathParts];
           if (partial) rawParts.push(partial);
           const depth = commandPathParts.length;
-          const argString = rawParts.slice(depth).join(' ');
+          const argString = rawParts.slice(depth).join(" ");
           const results =
             (await leafCommand.completion(
               {
                 ...commandContext,
                 invocation: {
-                  raw: `/${rawParts.join(' ')}`,
+                  raw: `/${rawParts.join(" ")}`,
                   name: leafCommand.name,
                   args: argString,
                 },
@@ -227,7 +212,7 @@ function useCommandSuggestions(
           }
         } catch (error) {
           if (!signal.aborted) {
-            logErrorSafely(error, 'Argument completion');
+            logErrorSafely(error, "Argument completion");
             setSuggestions([]);
             setIsLoading(false);
           }
@@ -243,11 +228,9 @@ function useCommandSuggestions(
         if (signal.aborted) return;
         let potentialSuggestions: SlashCommand[] = [];
 
-        if (partial === '') {
+        if (partial === "") {
           // If no partial query, show all available commands
-          potentialSuggestions = commandsToSearch.filter(
-            (cmd) => cmd.description && !cmd.hidden,
-          );
+          potentialSuggestions = commandsToSearch.filter((cmd) => cmd.description && !cmd.hidden);
         } else {
           // Use fuzzy search for non-empty partial queries with fallback
           const fzfInstance = getFzfForCommands(commandsToSearch);
@@ -264,22 +247,13 @@ function useCommandSuggestions(
               });
               potentialSuggestions = Array.from(uniqueCommands);
             } catch (error) {
-              logErrorSafely(
-                error,
-                'Fuzzy search - falling back to prefix matching',
-              );
+              logErrorSafely(error, "Fuzzy search - falling back to prefix matching");
               // Fallback to prefix-based filtering
-              potentialSuggestions = getPrefixSuggestions(
-                commandsToSearch,
-                partial,
-              );
+              potentialSuggestions = getPrefixSuggestions(commandsToSearch, partial);
             }
           } else {
             // Fallback to prefix-based filtering when fzf instance creation fails
-            potentialSuggestions = getPrefixSuggestions(
-              commandsToSearch,
-              partial,
-            );
+            potentialSuggestions = getPrefixSuggestions(commandsToSearch, partial);
           }
         }
 
@@ -296,7 +270,7 @@ function useCommandSuggestions(
       };
 
       performFuzzySearch().catch((error) => {
-        logErrorSafely(error, 'Unexpected fuzzy search error');
+        logErrorSafely(error, "Unexpected fuzzy search error");
         if (!signal.aborted) {
           // Ultimate fallback: show no suggestions rather than confusing the user
           // with all available commands when their query clearly doesn't match anything
@@ -314,7 +288,7 @@ function useCommandSuggestions(
 }
 
 function toSuggestion(item: string | CommandCompletionItem): Suggestion | null {
-  if (typeof item === 'string') {
+  if (typeof item === "string") {
     return { label: item, value: item };
   }
   if (!item.value) {
@@ -343,10 +317,9 @@ function useCompletionPositions(
       return { start: query.length, end: query.length };
     } else if (partial) {
       if (parserResult.isArgumentCompletion) {
-        const commandSoFar = `/${parserResult.commandPathParts.join(' ')}`;
+        const commandSoFar = `/${parserResult.commandPathParts.join(" ")}`;
         const argStartIndex =
-          commandSoFar.length +
-          (parserResult.commandPathParts.length > 0 ? 1 : 0);
+          commandSoFar.length + (parserResult.commandPathParts.length > 0 ? 1 : 0);
         return { start: argStartIndex, end: query.length };
       } else {
         return { start: query.length - partial.length, end: query.length };
@@ -357,25 +330,20 @@ function useCompletionPositions(
   }, [query, parserResult]);
 }
 
-function usePerfectMatch(
-  parserResult: CommandParserResult,
-): PerfectMatchResult {
+function usePerfectMatch(parserResult: CommandParserResult): PerfectMatchResult {
   return useMemo(() => {
-    const { hasTrailingSpace, partial, leafCommand, currentLevel } =
-      parserResult;
+    const { hasTrailingSpace, partial, leafCommand, currentLevel } = parserResult;
 
     if (hasTrailingSpace) {
       return { isPerfectMatch: false };
     }
 
-    if (leafCommand && partial === '' && leafCommand.action) {
+    if (leafCommand && partial === "" && leafCommand.action) {
       return { isPerfectMatch: true };
     }
 
     if (currentLevel) {
-      const perfectMatch = currentLevel.find(
-        (cmd) => matchesCommand(cmd, partial) && cmd.action,
-      );
+      const perfectMatch = currentLevel.find((cmd) => matchesCommand(cmd, partial) && cmd.action);
       if (perfectMatch) {
         return { isPerfectMatch: true };
       }
@@ -455,8 +423,8 @@ export function useSlashCompletion(props: UseSlashCompletionProps): {
       try {
         const instance: FzfCommandCacheEntry = {
           fzf: new AsyncFzf(commandItems, {
-            fuzzy: 'v2',
-            casing: 'case-insensitive', // Explicitly enforce case-insensitivity
+            fuzzy: "v2",
+            casing: "case-insensitive", // Explicitly enforce case-insensitivity
           }),
           commandMap,
         };
@@ -466,7 +434,7 @@ export function useSlashCompletion(props: UseSlashCompletionProps): {
 
         return instance;
       } catch (error) {
-        logErrorSafely(error, 'FZF instance creation');
+        logErrorSafely(error, "FZF instance creation");
         return null;
       }
     },
@@ -481,9 +449,7 @@ export function useSlashCompletion(props: UseSlashCompletionProps): {
           cmd.description &&
           !cmd.hidden &&
           (cmd.name.toLowerCase().startsWith(partial.toLowerCase()) ||
-            cmd.altNames?.some((alt) =>
-              alt.toLowerCase().startsWith(partial.toLowerCase()),
-            )),
+            cmd.altNames?.some((alt) => alt.toLowerCase().startsWith(partial.toLowerCase()))),
       ),
     [],
   );
@@ -551,5 +517,5 @@ function formatSlashCommandLabel(command: SlashCommand): string {
     return baseLabel;
   }
 
-  return `${baseLabel} (${altNames.join(', ')})`;
+  return `${baseLabel} (${altNames.join(", ")})`;
 }
diff --git a/apps/airiscode-cli/src/ui/hooks/useStateAndRef.ts b/apps/airiscode-cli/src/ui/hooks/useStateAndRef.ts
index 8a10bab4c..524b3a2b0 100644
--- a/apps/airiscode-cli/src/ui/hooks/useStateAndRef.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useStateAndRef.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
+import React from "react";
 
 // Hook to return state, state setter, and ref to most up-to-date value of state.
 // We need this in order to setState and reference the updated state multiple
@@ -18,19 +18,16 @@ export const useStateAndRef = <
   const [state, setState] = React.useState<T>(initialValue);
   const ref = React.useRef<T>(initialValue);
 
-  const setStateInternal = React.useCallback<typeof setState>(
-    (newStateOrCallback) => {
-      let newValue: T;
-      if (typeof newStateOrCallback === 'function') {
-        newValue = newStateOrCallback(ref.current);
-      } else {
-        newValue = newStateOrCallback;
-      }
-      setState(newValue);
-      ref.current = newValue;
-    },
-    [],
-  );
+  const setStateInternal = React.useCallback<typeof setState>((newStateOrCallback) => {
+    let newValue: T;
+    if (typeof newStateOrCallback === "function") {
+      newValue = newStateOrCallback(ref.current);
+    } else {
+      newValue = newStateOrCallback;
+    }
+    setState(newValue);
+    ref.current = newValue;
+  }, []);
 
   return [state, ref, setStateInternal] as const;
 };
diff --git a/apps/airiscode-cli/src/ui/hooks/useStatusLine.ts b/apps/airiscode-cli/src/ui/hooks/useStatusLine.ts
index 84e877461..7a2f56a20 100644
--- a/apps/airiscode-cli/src/ui/hooks/useStatusLine.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useStatusLine.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef, useCallback } from 'react';
-import { exec, type ChildProcess } from 'child_process';
-import { createDebugLogger } from '@airiscode/core';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
-import type { SessionMetrics } from '../contexts/SessionContext.js';
+import { createDebugLogger } from "@airiscode/core";
+import { type ChildProcess, exec } from "child_process";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useConfig } from "../contexts/ConfigContext.js";
+import type { SessionMetrics } from "../contexts/SessionContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
 
 /**
  * Structured JSON input passed to the status line command via stdin.
@@ -67,11 +67,11 @@ export interface StatusLineCommandInput {
 }
 
 interface StatusLineConfig {
-  type: 'command';
+  type: "command";
   command: string;
 }
 
-const debugLog = createDebugLogger('STATUS_LINE');
+const debugLog = createDebugLogger("STATUS_LINE");
 
 function getStatusLineConfig(
   settings: ReturnType<typeof useSettings>,
@@ -79,15 +79,15 @@ function getStatusLineConfig(
   const raw = settings.merged.ui?.statusLine;
   if (
     raw &&
-    typeof raw === 'object' &&
-    'type' in raw &&
-    raw.type === 'command' &&
-    'command' in raw &&
-    typeof raw.command === 'string' &&
+    typeof raw === "object" &&
+    "type" in raw &&
+    raw.type === "command" &&
+    "command" in raw &&
+    typeof raw.command === "string" &&
     raw.command.trim().length > 0
   ) {
     const config: StatusLineConfig = {
-      type: 'command',
+      type: "command",
       command: raw.command,
     };
     return config;
@@ -95,10 +95,8 @@ function getStatusLineConfig(
   return undefined;
 }
 
-function buildMetricsPayload(
-  m: SessionMetrics,
-): StatusLineCommandInput['metrics'] {
-  const models: StatusLineCommandInput['metrics']['models'] = {};
+function buildMetricsPayload(m: SessionMetrics): StatusLineCommandInput["metrics"] {
+  const models: StatusLineCommandInput["metrics"]["models"] = {};
   for (const [id, mm] of Object.entries(m.models)) {
     models[id] = {
       api: {
@@ -158,9 +156,7 @@ export function useStatusLine(): {
   const statusLineCommandRef = useRef(statusLineCommand);
   statusLineCommandRef.current = statusLineCommand;
 
-  const debounceTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(
-    undefined,
-  );
+  const debounceTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
 
   // Track previous trigger values to detect actual changes.
   // Initialized with current values so the state-change effect
@@ -169,8 +165,7 @@ export function useStatusLine(): {
   const { currentModel, branchName } = uiState;
   const totalToolCalls = uiState.sessionStats.metrics.tools.totalCalls;
   const totalLinesAdded = uiState.sessionStats.metrics.files.totalLinesAdded;
-  const totalLinesRemoved =
-    uiState.sessionStats.metrics.files.totalLinesRemoved;
+  const totalLinesRemoved = uiState.sessionStats.metrics.files.totalLinesRemoved;
   const effectiveVim = vimEnabled ? vimMode : undefined;
   const prevStateRef = useRef<{
     promptTokenCount: number;
@@ -210,18 +205,12 @@ export function useStatusLine(): {
     const stats = ui.sessionStats;
     const m = stats.metrics;
 
-    const contextWindowSize =
-      cfg.getContentGeneratorConfig()?.contextWindowSize || 0;
+    const contextWindowSize = cfg.getContentGeneratorConfig()?.contextWindowSize || 0;
     const usedPercentage =
       contextWindowSize > 0
         ? Math.min(
             100,
-            Math.max(
-              0,
-              Math.round(
-                (stats.lastPromptTokenCount / contextWindowSize) * 1000,
-              ) / 10,
-            ),
+            Math.max(0, Math.round((stats.lastPromptTokenCount / contextWindowSize) * 1000) / 10),
           )
         : 0;
 
@@ -234,9 +223,9 @@ export function useStatusLine(): {
 
     const input: StatusLineCommandInput = {
       session_id: stats.sessionId,
-      version: cfg.getCliVersion() || 'unknown',
+      version: cfg.getCliVersion() || "unknown",
       model: {
-        display_name: ui.currentModel || cfg.getModel() || 'unknown',
+        display_name: ui.currentModel || cfg.getModel() || "unknown",
       },
       context_window: {
         context_window_size: contextWindowSize,
@@ -277,7 +266,7 @@ export function useStatusLine(): {
         activeChildRef.current = undefined;
         if (!error && stdout) {
           // Strip only the trailing newline to preserve intentional whitespace.
-          const line = stdout.replace(/\r?\n$/, '').split(/\r?\n/, 1)[0];
+          const line = stdout.replace(/\r?\n$/, "").split(/\r?\n/, 1)[0];
           setOutput(line || null);
         } else {
           setOutput(null);
@@ -290,9 +279,9 @@ export function useStatusLine(): {
     // Pass structured JSON context via stdin.
     // Guard against EPIPE if the child exits before we finish writing.
     if (child.stdin) {
-      child.stdin.on('error', (err) => {
-        if ((err as NodeJS.ErrnoException).code !== 'EPIPE') {
-          debugLog.error('statusline stdin error:', err.message);
+      child.stdin.on("error", (err) => {
+        if ((err as NodeJS.ErrnoException).code !== "EPIPE") {
+          debugLog.error("statusline stdin error:", err.message);
         }
       });
       child.stdin.write(JSON.stringify(input));
diff --git a/apps/airiscode-cli/src/ui/hooks/useSubagentCreateDialog.ts b/apps/airiscode-cli/src/ui/hooks/useSubagentCreateDialog.ts
index 30c167031..b4bd53baa 100644
--- a/apps/airiscode-cli/src/ui/hooks/useSubagentCreateDialog.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useSubagentCreateDialog.ts
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 export function useSubagentCreateDialog() {
-  const [isSubagentCreateDialogOpen, setIsSubagentCreateDialogOpen] =
-    useState(false);
+  const [isSubagentCreateDialogOpen, setIsSubagentCreateDialogOpen] = useState(false);
 
   const openSubagentCreateDialog = useCallback(() => {
     setIsSubagentCreateDialogOpen(true);
diff --git a/apps/airiscode-cli/src/ui/hooks/useTerminalSize.ts b/apps/airiscode-cli/src/ui/hooks/useTerminalSize.ts
index 9f08a5310..8c3fa68c7 100644
--- a/apps/airiscode-cli/src/ui/hooks/useTerminalSize.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useTerminalSize.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from "react";
 
 /**
  * Returns the actual terminal size without any padding adjustments.
@@ -24,9 +24,9 @@ export function useTerminalSize(): { columns: number; rows: number } {
       });
     }
 
-    process.stdout.on('resize', updateSize);
+    process.stdout.on("resize", updateSize);
     return () => {
-      process.stdout.off('resize', updateSize);
+      process.stdout.off("resize", updateSize);
     };
   }, []);
 
diff --git a/apps/airiscode-cli/src/ui/hooks/useThemeCommand.ts b/apps/airiscode-cli/src/ui/hooks/useThemeCommand.ts
index e0f0383cb..d8f30b94f 100644
--- a/apps/airiscode-cli/src/ui/hooks/useThemeCommand.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useThemeCommand.ts
@@ -4,43 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import { themeManager } from '../themes/theme-manager.js';
-import type { LoadedSettings, SettingScope } from '../../config/settings.js'; // Import LoadedSettings, AppSettings, MergedSetting
-import { type HistoryItem, MessageType } from '../types.js';
-import process from 'node:process';
-import { t } from '../../i18n/index.js';
+import process from "node:process";
+import { useCallback, useState } from "react";
+import type { LoadedSettings, SettingScope } from "../../config/settings.js"; // Import LoadedSettings, AppSettings, MergedSetting
+import { t } from "../../i18n/index.js";
+import { themeManager } from "../themes/theme-manager.js";
+import { type HistoryItem, MessageType } from "../types.js";
 
 interface UseThemeCommandReturn {
   isThemeDialogOpen: boolean;
   openThemeDialog: () => void;
-  handleThemeSelect: (
-    themeName: string | undefined,
-    scope: SettingScope,
-  ) => void; // Added scope
+  handleThemeSelect: (themeName: string | undefined, scope: SettingScope) => void; // Added scope
   handleThemeHighlight: (themeName: string | undefined) => void;
 }
 
 export const useThemeCommand = (
   loadedSettings: LoadedSettings,
   setThemeError: (error: string | null) => void,
-  addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void,
+  addItem: (item: Omit<HistoryItem, "id">, timestamp: number) => void,
   initialThemeError: string | null,
 ): UseThemeCommandReturn => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] =
-    useState(!!initialThemeError);
-  const [themeBeforeDialogOpen, setThemeBeforeDialogOpen] = useState<
-    string | undefined
-  >(themeManager.getActiveTheme().name);
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = useState(!!initialThemeError);
+  const [themeBeforeDialogOpen, setThemeBeforeDialogOpen] = useState<string | undefined>(
+    themeManager.getActiveTheme().name,
+  );
 
   const openThemeDialog = useCallback(() => {
-    if (process.env['NO_COLOR']) {
+    if (process.env["NO_COLOR"]) {
       addItem(
         {
           type: MessageType.INFO,
-          text: t(
-            'Theme configuration unavailable due to NO_COLOR env variable.',
-          ),
+          text: t("Theme configuration unavailable due to NO_COLOR env variable."),
         },
         Date.now(),
       );
@@ -59,7 +53,7 @@ export const useThemeCommand = (
         setIsThemeDialogOpen(true);
         setThemeError(
           t('Theme "{{themeName}}" not found.', {
-            themeName: themeName ?? '',
+            themeName: themeName ?? "",
           }),
         );
       } else {
@@ -98,13 +92,13 @@ export const useThemeCommand = (
         if (!isBuiltIn && !isCustom) {
           setThemeError(
             t('Theme "{{themeName}}" not found in selected scope.', {
-              themeName: themeName ?? '',
+              themeName: themeName ?? "",
             }),
           );
           setIsThemeDialogOpen(true);
           return;
         }
-        loadedSettings.setValue(scope, 'ui.theme', themeName); // Update the merged settings
+        loadedSettings.setValue(scope, "ui.theme", themeName); // Update the merged settings
         if (loadedSettings.merged.ui?.customThemes) {
           themeManager.loadCustomThemes(loadedSettings.merged.ui?.customThemes);
         }
diff --git a/apps/airiscode-cli/src/ui/hooks/useTimer.ts b/apps/airiscode-cli/src/ui/hooks/useTimer.ts
index 53c266dde..9a8c12edd 100644
--- a/apps/airiscode-cli/src/ui/hooks/useTimer.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useTimer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from "react";
 
 /**
  * Custom hook to manage a timer that increments every second.
diff --git a/apps/airiscode-cli/src/ui/hooks/useTrustModify.ts b/apps/airiscode-cli/src/ui/hooks/useTrustModify.ts
index fa403f61a..98f3d3dc9 100644
--- a/apps/airiscode-cli/src/ui/hooks/useTrustModify.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useTrustModify.ts
@@ -4,18 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import * as process from 'node:process';
-import {
-  loadTrustedFolders,
-  TrustLevel,
-  isWorkspaceTrusted,
-} from '../../config/trustedFolders.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-
-import { MessageType } from '../types.js';
-import { type UseHistoryManagerReturn } from './useHistoryManager.js';
-import type { LoadedSettings } from '../../config/settings.js';
+import * as process from "node:process";
+import { useCallback, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted, loadTrustedFolders, TrustLevel } from "../../config/trustedFolders.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { MessageType } from "../types.js";
+import { type UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 interface TrustState {
   currentTrustLevel: TrustLevel | undefined;
@@ -23,46 +18,31 @@ interface TrustState {
   isInheritedTrustFromIde: boolean;
 }
 
-function getInitialTrustState(
-  settings: LoadedSettings,
-  cwd: string,
-): TrustState {
+function getInitialTrustState(settings: LoadedSettings, cwd: string): TrustState {
   const folders = loadTrustedFolders();
   const explicitTrustLevel = folders.user.config[cwd];
   const { isTrusted, source } = isWorkspaceTrusted(settings.merged);
 
   const isInheritedTrust =
-    isTrusted &&
-    (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
+    isTrusted && (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
 
   return {
     currentTrustLevel: explicitTrustLevel,
-    isInheritedTrustFromParent: !!(source === 'file' && isInheritedTrust),
-    isInheritedTrustFromIde: !!(source === 'ide' && isInheritedTrust),
+    isInheritedTrustFromParent: !!(source === "file" && isInheritedTrust),
+    isInheritedTrustFromIde: !!(source === "ide" && isInheritedTrust),
   };
 }
 
-export const useTrustModify = (
-  onExit: () => void,
-  addItem: UseHistoryManagerReturn['addItem'],
-) => {
+export const useTrustModify = (onExit: () => void, addItem: UseHistoryManagerReturn["addItem"]) => {
   const settings = useSettings();
   const cwd = process.cwd();
 
   const [initialState] = useState(() => getInitialTrustState(settings, cwd));
 
-  const [currentTrustLevel] = useState<TrustLevel | undefined>(
-    initialState.currentTrustLevel,
-  );
-  const [pendingTrustLevel, setPendingTrustLevel] = useState<
-    TrustLevel | undefined
-  >();
-  const [isInheritedTrustFromParent] = useState(
-    initialState.isInheritedTrustFromParent,
-  );
-  const [isInheritedTrustFromIde] = useState(
-    initialState.isInheritedTrustFromIde,
-  );
+  const [currentTrustLevel] = useState<TrustLevel | undefined>(initialState.currentTrustLevel);
+  const [pendingTrustLevel, setPendingTrustLevel] = useState<TrustLevel | undefined>();
+  const [isInheritedTrustFromParent] = useState(initialState.isInheritedTrustFromParent);
+  const [isInheritedTrustFromIde] = useState(initialState.isInheritedTrustFromIde);
   const [needsRestart, setNeedsRestart] = useState(false);
 
   const isFolderTrustEnabled = !!settings.merged.security?.folderTrust?.enabled;
@@ -75,17 +55,13 @@ export const useTrustModify = (
       const currentConfig = loadTrustedFolders().user.config;
       const newConfig = { ...currentConfig, [cwd]: trustLevel };
 
-      const { isTrusted, source } = isWorkspaceTrusted(
-        settings.merged,
-        newConfig,
-      );
+      const { isTrusted, source } = isWorkspaceTrusted(settings.merged, newConfig);
 
       if (trustLevel === TrustLevel.DO_NOT_TRUST && isTrusted) {
         let message =
-          'Note: This folder is still trusted because the connected IDE workspace is trusted.';
-        if (source === 'file') {
-          message =
-            'Note: This folder is still trusted because a parent folder is trusted.';
+          "Note: This folder is still trusted because the connected IDE workspace is trusted.";
+        if (source === "file") {
+          message = "Note: This folder is still trusted because a parent folder is trusted.";
         }
         addItem(
           {
diff --git a/apps/airiscode-cli/src/ui/hooks/useWelcomeBack.ts b/apps/airiscode-cli/src/ui/hooks/useWelcomeBack.ts
index 75a2aa538..d5f068664 100644
--- a/apps/airiscode-cli/src/ui/hooks/useWelcomeBack.ts
+++ b/apps/airiscode-cli/src/ui/hooks/useWelcomeBack.ts
@@ -4,24 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useCallback } from 'react';
-import {
-  getProjectSummaryInfo,
-  type ProjectSummaryInfo,
-  type Config,
-} from '@airiscode/core';
-import { type Settings } from '../../config/settingsSchema.js';
+import { type Config, getProjectSummaryInfo, type ProjectSummaryInfo } from "@airiscode/core";
+import { useCallback, useEffect, useState } from "react";
+import { type Settings } from "../../config/settingsSchema.js";
 
 export interface WelcomeBackState {
   welcomeBackInfo: ProjectSummaryInfo | null;
   showWelcomeBackDialog: boolean;
-  welcomeBackChoice: 'restart' | 'continue' | null;
+  welcomeBackChoice: "restart" | "continue" | null;
   shouldFillInput: boolean;
   inputFillText: string | null;
 }
 
 export interface WelcomeBackActions {
-  handleWelcomeBackSelection: (choice: 'restart' | 'continue') => void;
+  handleWelcomeBackSelection: (choice: "restart" | "continue") => void;
   handleWelcomeBackClose: () => void;
   checkWelcomeBack: () => Promise<void>;
   clearInputFill: () => void;
@@ -33,12 +29,9 @@ export function useWelcomeBack(
   buffer: { setText: (text: string) => void },
   settings: Settings,
 ): WelcomeBackState & WelcomeBackActions {
-  const [welcomeBackInfo, setWelcomeBackInfo] =
-    useState<ProjectSummaryInfo | null>(null);
+  const [welcomeBackInfo, setWelcomeBackInfo] = useState<ProjectSummaryInfo | null>(null);
   const [showWelcomeBackDialog, setShowWelcomeBackDialog] = useState(false);
-  const [welcomeBackChoice, setWelcomeBackChoice] = useState<
-    'restart' | 'continue' | null
-  >(null);
+  const [welcomeBackChoice, setWelcomeBackChoice] = useState<"restart" | "continue" | null>(null);
   const [shouldFillInput, setShouldFillInput] = useState(false);
   const [inputFillText, setInputFillText] = useState<string | null>(null);
 
@@ -57,17 +50,17 @@ export function useWelcomeBack(
       }
     } catch (error) {
       // Silently ignore errors - welcome back is not critical
-      config.getDebugLogger().debug('Welcome back check failed:', error);
+      config.getDebugLogger().debug("Welcome back check failed:", error);
     }
   }, [config, settings.ui?.enableWelcomeBack]);
 
   // Handle welcome back dialog selection
   const handleWelcomeBackSelection = useCallback(
-    (choice: 'restart' | 'continue') => {
+    (choice: "restart" | "continue") => {
       setWelcomeBackChoice(choice);
       setShowWelcomeBackDialog(false);
 
-      if (choice === 'continue' && welcomeBackInfo?.content) {
+      if (choice === "continue" && welcomeBackInfo?.content) {
         // Create the context message to fill in the input box
         const contextMessage = `@.airiscode/PROJECT_SUMMARY.md, Based on our previous conversation,Let's continue?`;
 
@@ -81,7 +74,7 @@ export function useWelcomeBack(
   );
 
   const handleWelcomeBackClose = useCallback(() => {
-    setWelcomeBackChoice('restart'); // Default to restart when closed
+    setWelcomeBackChoice("restart"); // Default to restart when closed
     setShowWelcomeBackDialog(false);
   }, []);
 
diff --git a/apps/airiscode-cli/src/ui/hooks/vim.ts b/apps/airiscode-cli/src/ui/hooks/vim.ts
index f7b3731df..ddd112018 100644
--- a/apps/airiscode-cli/src/ui/hooks/vim.ts
+++ b/apps/airiscode-cli/src/ui/hooks/vim.ts
@@ -4,71 +4,71 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useReducer, useEffect } from 'react';
-import { createDebugLogger } from '@airiscode/core';
-import type { Key } from './useKeypress.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
+import { createDebugLogger } from "@airiscode/core";
+import { useCallback, useEffect, useReducer } from "react";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
+import type { Key } from "./useKeypress.js";
 
-export type VimMode = 'NORMAL' | 'INSERT';
+export type VimMode = "NORMAL" | "INSERT";
 
 // Constants
 const DIGIT_MULTIPLIER = 10;
 const DEFAULT_COUNT = 1;
 const DIGIT_1_TO_9 = /^[1-9]$/;
 
-const debugLogger = createDebugLogger('VIM_MODE');
+const debugLogger = createDebugLogger("VIM_MODE");
 
 // Command types
 const CMD_TYPES = {
-  DELETE_WORD_FORWARD: 'dw',
-  DELETE_WORD_BACKWARD: 'db',
-  DELETE_WORD_END: 'de',
-  CHANGE_WORD_FORWARD: 'cw',
-  CHANGE_WORD_BACKWARD: 'cb',
-  CHANGE_WORD_END: 'ce',
-  DELETE_CHAR: 'x',
-  DELETE_LINE: 'dd',
-  CHANGE_LINE: 'cc',
-  DELETE_TO_EOL: 'D',
-  CHANGE_TO_EOL: 'C',
+  DELETE_WORD_FORWARD: "dw",
+  DELETE_WORD_BACKWARD: "db",
+  DELETE_WORD_END: "de",
+  CHANGE_WORD_FORWARD: "cw",
+  CHANGE_WORD_BACKWARD: "cb",
+  CHANGE_WORD_END: "ce",
+  DELETE_CHAR: "x",
+  DELETE_LINE: "dd",
+  CHANGE_LINE: "cc",
+  DELETE_TO_EOL: "D",
+  CHANGE_TO_EOL: "C",
   CHANGE_MOVEMENT: {
-    LEFT: 'ch',
-    DOWN: 'cj',
-    UP: 'ck',
-    RIGHT: 'cl',
+    LEFT: "ch",
+    DOWN: "cj",
+    UP: "ck",
+    RIGHT: "cl",
   },
 } as const;
 
 // Helper function to clear pending state
 const createClearPendingState = () => ({
   count: 0,
-  pendingOperator: null as 'g' | 'd' | 'c' | null,
+  pendingOperator: null as "g" | "d" | "c" | null,
 });
 
 // State and action types for useReducer
 type VimState = {
   mode: VimMode;
   count: number;
-  pendingOperator: 'g' | 'd' | 'c' | null;
+  pendingOperator: "g" | "d" | "c" | null;
   lastCommand: { type: string; count: number } | null;
 };
 
 type VimAction =
-  | { type: 'SET_MODE'; mode: VimMode }
-  | { type: 'SET_COUNT'; count: number }
-  | { type: 'INCREMENT_COUNT'; digit: number }
-  | { type: 'CLEAR_COUNT' }
-  | { type: 'SET_PENDING_OPERATOR'; operator: 'g' | 'd' | 'c' | null }
+  | { type: "SET_MODE"; mode: VimMode }
+  | { type: "SET_COUNT"; count: number }
+  | { type: "INCREMENT_COUNT"; digit: number }
+  | { type: "CLEAR_COUNT" }
+  | { type: "SET_PENDING_OPERATOR"; operator: "g" | "d" | "c" | null }
   | {
-      type: 'SET_LAST_COMMAND';
+      type: "SET_LAST_COMMAND";
       command: { type: string; count: number } | null;
     }
-  | { type: 'CLEAR_PENDING_STATES' }
-  | { type: 'ESCAPE_TO_NORMAL' };
+  | { type: "CLEAR_PENDING_STATES" }
+  | { type: "ESCAPE_TO_NORMAL" };
 
 const initialVimState: VimState = {
-  mode: 'NORMAL',
+  mode: "NORMAL",
   count: 0,
   pendingOperator: null,
   lastCommand: null,
@@ -77,31 +77,31 @@ const initialVimState: VimState = {
 // Reducer function
 const vimReducer = (state: VimState, action: VimAction): VimState => {
   switch (action.type) {
-    case 'SET_MODE':
+    case "SET_MODE":
       return { ...state, mode: action.mode };
 
-    case 'SET_COUNT':
+    case "SET_COUNT":
       return { ...state, count: action.count };
 
-    case 'INCREMENT_COUNT':
+    case "INCREMENT_COUNT":
       return { ...state, count: state.count * DIGIT_MULTIPLIER + action.digit };
 
-    case 'CLEAR_COUNT':
+    case "CLEAR_COUNT":
       return { ...state, count: 0 };
 
-    case 'SET_PENDING_OPERATOR':
+    case "SET_PENDING_OPERATOR":
       return { ...state, pendingOperator: action.operator };
 
-    case 'SET_LAST_COMMAND':
+    case "SET_LAST_COMMAND":
       return { ...state, lastCommand: action.command };
 
-    case 'CLEAR_PENDING_STATES':
+    case "CLEAR_PENDING_STATES":
       return {
         ...state,
         ...createClearPendingState(),
       };
 
-    case 'ESCAPE_TO_NORMAL':
+    case "ESCAPE_TO_NORMAL":
       // Handle escape - clear all pending states (mode is updated via context)
       return {
         ...state,
@@ -134,23 +134,20 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
   // Sync vim mode from context to local state
   useEffect(() => {
-    dispatch({ type: 'SET_MODE', mode: vimMode });
+    dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
 
   // Helper to update mode in both reducer and context
   const updateMode = useCallback(
     (mode: VimMode) => {
       setVimMode(mode);
-      dispatch({ type: 'SET_MODE', mode });
+      dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode],
   );
 
   // Helper functions using the reducer state
-  const getCurrentCount = useCallback(
-    () => state.count || DEFAULT_COUNT,
-    [state.count],
-  );
+  const getCurrentCount = useCallback(() => state.count || DEFAULT_COUNT, [state.count]);
 
   /** Executes common commands to eliminate duplication in dot (.) repeat command */
   const executeCommand = useCallback(
@@ -173,19 +170,19 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
         case CMD_TYPES.CHANGE_WORD_FORWARD: {
           buffer.vimChangeWordForward(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
         case CMD_TYPES.CHANGE_WORD_BACKWARD: {
           buffer.vimChangeWordBackward(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
         case CMD_TYPES.CHANGE_WORD_END: {
           buffer.vimChangeWordEnd(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
@@ -201,7 +198,7 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
         case CMD_TYPES.CHANGE_LINE: {
           buffer.vimChangeLine(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
@@ -209,16 +206,16 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         case CMD_TYPES.CHANGE_MOVEMENT.DOWN:
         case CMD_TYPES.CHANGE_MOVEMENT.UP:
         case CMD_TYPES.CHANGE_MOVEMENT.RIGHT: {
-          const movementMap: Record<string, 'h' | 'j' | 'k' | 'l'> = {
-            [CMD_TYPES.CHANGE_MOVEMENT.LEFT]: 'h',
-            [CMD_TYPES.CHANGE_MOVEMENT.DOWN]: 'j',
-            [CMD_TYPES.CHANGE_MOVEMENT.UP]: 'k',
-            [CMD_TYPES.CHANGE_MOVEMENT.RIGHT]: 'l',
+          const movementMap: Record<string, "h" | "j" | "k" | "l"> = {
+            [CMD_TYPES.CHANGE_MOVEMENT.LEFT]: "h",
+            [CMD_TYPES.CHANGE_MOVEMENT.DOWN]: "j",
+            [CMD_TYPES.CHANGE_MOVEMENT.UP]: "k",
+            [CMD_TYPES.CHANGE_MOVEMENT.RIGHT]: "l",
           };
           const movementType = movementMap[cmdType];
           if (movementType) {
             buffer.vimChangeMovement(movementType, count);
-            updateMode('INSERT');
+            updateMode("INSERT");
           }
           break;
         }
@@ -230,7 +227,7 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
         case CMD_TYPES.CHANGE_TO_EOL: {
           buffer.vimChangeToEndOfLine();
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
@@ -250,48 +247,41 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
   const handleInsertModeInput = useCallback(
     (normalizedKey: Key): boolean => {
       // Handle escape key immediately - switch to NORMAL mode on any escape
-      if (normalizedKey.name === 'escape') {
+      if (normalizedKey.name === "escape") {
         // Vim behavior: move cursor left when exiting insert mode (unless at beginning of line)
         buffer.vimEscapeInsertMode();
-        dispatch({ type: 'ESCAPE_TO_NORMAL' });
-        updateMode('NORMAL');
+        dispatch({ type: "ESCAPE_TO_NORMAL" });
+        updateMode("NORMAL");
         return true;
       }
 
       // In INSERT mode, let InputPrompt handle completion keys and special commands
       if (
-        normalizedKey.name === 'tab' ||
-        (normalizedKey.name === 'return' && !normalizedKey.ctrl) ||
-        normalizedKey.name === 'up' ||
-        normalizedKey.name === 'down' ||
-        (normalizedKey.ctrl && normalizedKey.name === 'r')
+        normalizedKey.name === "tab" ||
+        (normalizedKey.name === "return" && !normalizedKey.ctrl) ||
+        normalizedKey.name === "up" ||
+        normalizedKey.name === "down" ||
+        (normalizedKey.ctrl && normalizedKey.name === "r")
       ) {
         return false; // Let InputPrompt handle completion
       }
 
       // Let InputPrompt handle Ctrl+V or Cmd+V for clipboard image pasting
-      if (
-        (normalizedKey.ctrl || normalizedKey.meta) &&
-        normalizedKey.name === 'v'
-      ) {
+      if ((normalizedKey.ctrl || normalizedKey.meta) && normalizedKey.name === "v") {
         return false; // Let InputPrompt handle clipboard functionality
       }
 
       // Let InputPrompt handle shell commands
-      if (normalizedKey.sequence === '!' && buffer.text.length === 0) {
+      if (normalizedKey.sequence === "!" && buffer.text.length === 0) {
         return false;
       }
 
       // Special handling for Enter key to allow command submission (lower priority than completion)
-      if (
-        normalizedKey.name === 'return' &&
-        !normalizedKey.ctrl &&
-        !normalizedKey.meta
-      ) {
+      if (normalizedKey.name === "return" && !normalizedKey.ctrl && !normalizedKey.meta) {
         if (buffer.text.trim() && onSubmit) {
           // Handle command submission directly
           const submittedValue = buffer.text;
-          buffer.setText('');
+          buffer.setText("");
           onSubmit(submittedValue);
           return true;
         }
@@ -312,8 +302,8 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
    */
   const normalizeKey = useCallback(
     (key: Key): Key => ({
-      name: key.name || '',
-      sequence: key.sequence || '',
+      name: key.name || "",
+      sequence: key.sequence || "",
       ctrl: key.ctrl || false,
       meta: key.meta || false,
       shift: key.shift || false,
@@ -328,11 +318,11 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
    * @returns boolean indicating if command was handled
    */
   const handleChangeMovement = useCallback(
-    (movement: 'h' | 'j' | 'k' | 'l'): boolean => {
+    (movement: "h" | "j" | "k" | "l"): boolean => {
       const count = getCurrentCount();
-      dispatch({ type: 'CLEAR_COUNT' });
+      dispatch({ type: "CLEAR_COUNT" });
       buffer.vimChangeMovement(movement, count);
-      updateMode('INSERT');
+      updateMode("INSERT");
 
       const cmdTypeMap = {
         h: CMD_TYPES.CHANGE_MOVEMENT.LEFT,
@@ -342,10 +332,10 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
       };
 
       dispatch({
-        type: 'SET_LAST_COMMAND',
+        type: "SET_LAST_COMMAND",
         command: { type: cmdTypeMap[movement], count },
       });
-      dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+      dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
       return true;
     },
     [getCurrentCount, dispatch, buffer, updateMode],
@@ -358,7 +348,7 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
    * @returns boolean indicating if command was handled
    */
   const handleOperatorMotion = useCallback(
-    (operator: 'd' | 'c', motion: 'w' | 'b' | 'e'): boolean => {
+    (operator: "d" | "c", motion: "w" | "b" | "e"): boolean => {
       const count = getCurrentCount();
 
       const commandMap = {
@@ -378,11 +368,11 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
       executeCommand(cmdType, count);
 
       dispatch({
-        type: 'SET_LAST_COMMAND',
+        type: "SET_LAST_COMMAND",
         command: { type: cmdType, count },
       });
-      dispatch({ type: 'CLEAR_COUNT' });
-      dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+      dispatch({ type: "CLEAR_COUNT" });
+      dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
 
       return true;
     },
@@ -400,21 +390,21 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         normalizedKey = normalizeKey(key);
       } catch (error) {
         // Handle malformed key inputs gracefully
-        debugLogger.warn('Malformed key input in vim mode:', key, error);
+        debugLogger.warn("Malformed key input in vim mode:", key, error);
         return false;
       }
 
       // Handle INSERT mode
-      if (state.mode === 'INSERT') {
+      if (state.mode === "INSERT") {
         return handleInsertModeInput(normalizedKey);
       }
 
       // Handle NORMAL mode
-      if (state.mode === 'NORMAL') {
+      if (state.mode === "NORMAL") {
         // Let the documented shortcuts panel toggle handle plain `?` when the
         // prompt is empty and vim is otherwise idle.
         if (
-          normalizedKey.sequence === '?' &&
+          normalizedKey.sequence === "?" &&
           buffer.text.length === 0 &&
           state.pendingOperator === null &&
           state.count === 0
@@ -424,9 +414,9 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
         // If in NORMAL mode, allow escape to pass through to other handlers
         // if there's no pending operation.
-        if (normalizedKey.name === 'escape') {
+        if (normalizedKey.name === "escape") {
           if (state.pendingOperator) {
-            dispatch({ type: 'CLEAR_PENDING_STATES' });
+            dispatch({ type: "CLEAR_PENDING_STATES" });
             return true; // Handled by vim
           }
           return false; // Pass through to other handlers
@@ -435,10 +425,10 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         // Handle count input (numbers 1-9, and 0 if count > 0)
         if (
           DIGIT_1_TO_9.test(normalizedKey.sequence) ||
-          (normalizedKey.sequence === '0' && state.count > 0)
+          (normalizedKey.sequence === "0" && state.count > 0)
         ) {
           dispatch({
-            type: 'INCREMENT_COUNT',
+            type: "INCREMENT_COUNT",
             digit: parseInt(normalizedKey.sequence, 10),
           });
           return true; // Handled by vim
@@ -447,177 +437,177 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         const repeatCount = getCurrentCount();
 
         switch (normalizedKey.sequence) {
-          case 'h': {
+          case "h": {
             // Check if this is part of a change command (ch)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('h');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("h");
             }
 
             // Normal left movement
             buffer.vimMoveLeft(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'j': {
+          case "j": {
             // Check if this is part of a change command (cj)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('j');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("j");
             }
 
             // Normal down movement
             buffer.vimMoveDown(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'k': {
+          case "k": {
             // Check if this is part of a change command (ck)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('k');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("k");
             }
 
             // Normal up movement
             buffer.vimMoveUp(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'l': {
+          case "l": {
             // Check if this is part of a change command (cl)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('l');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("l");
             }
 
             // Normal right movement
             buffer.vimMoveRight(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'w': {
+          case "w": {
             // Check if this is part of a delete or change command (dw/cw)
-            if (state.pendingOperator === 'd') {
-              return handleOperatorMotion('d', 'w');
+            if (state.pendingOperator === "d") {
+              return handleOperatorMotion("d", "w");
             }
-            if (state.pendingOperator === 'c') {
-              return handleOperatorMotion('c', 'w');
+            if (state.pendingOperator === "c") {
+              return handleOperatorMotion("c", "w");
             }
 
             // Normal word movement
             buffer.vimMoveWordForward(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'b': {
+          case "b": {
             // Check if this is part of a delete or change command (db/cb)
-            if (state.pendingOperator === 'd') {
-              return handleOperatorMotion('d', 'b');
+            if (state.pendingOperator === "d") {
+              return handleOperatorMotion("d", "b");
             }
-            if (state.pendingOperator === 'c') {
-              return handleOperatorMotion('c', 'b');
+            if (state.pendingOperator === "c") {
+              return handleOperatorMotion("c", "b");
             }
 
             // Normal backward word movement
             buffer.vimMoveWordBackward(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'e': {
+          case "e": {
             // Check if this is part of a delete or change command (de/ce)
-            if (state.pendingOperator === 'd') {
-              return handleOperatorMotion('d', 'e');
+            if (state.pendingOperator === "d") {
+              return handleOperatorMotion("d", "e");
             }
-            if (state.pendingOperator === 'c') {
-              return handleOperatorMotion('c', 'e');
+            if (state.pendingOperator === "c") {
+              return handleOperatorMotion("c", "e");
             }
 
             // Normal word end movement
             buffer.vimMoveWordEnd(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'x': {
+          case "x": {
             // Delete character under cursor
             buffer.vimDeleteChar(repeatCount);
             dispatch({
-              type: 'SET_LAST_COMMAND',
+              type: "SET_LAST_COMMAND",
               command: { type: CMD_TYPES.DELETE_CHAR, count: repeatCount },
             });
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'i': {
+          case "i": {
             // Enter INSERT mode at current position
             buffer.vimInsertAtCursor();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'a': {
+          case "a": {
             // Enter INSERT mode after current position
             buffer.vimAppendAtCursor();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'o': {
+          case "o": {
             // Insert new line after current line and enter INSERT mode
             buffer.vimOpenLineBelow();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'O': {
+          case "O": {
             // Insert new line before current line and enter INSERT mode
             buffer.vimOpenLineAbove();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '0': {
+          case "0": {
             // Move to start of line
             buffer.vimMoveToLineStart();
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '$': {
+          case "$": {
             // Move to end of line
             buffer.vimMoveToLineEnd();
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '^': {
+          case "^": {
             // Move to first non-whitespace character
             buffer.vimMoveToFirstNonWhitespace();
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'g': {
-            if (state.pendingOperator === 'g') {
+          case "g": {
+            if (state.pendingOperator === "g") {
               // Second 'g' - go to first line (gg command)
               buffer.vimMoveToFirstLine();
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
             } else {
               // First 'g' - wait for second g
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'g' });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: "g" });
             }
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'G': {
+          case "G": {
             if (state.count > 0) {
               // Go to specific line number (1-based) when a count was provided
               buffer.vimMoveToLine(state.count);
@@ -625,85 +615,85 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
               // Go to last line when no count was provided
               buffer.vimMoveToLastLine();
             }
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'I': {
+          case "I": {
             // Enter INSERT mode at start of line (first non-whitespace)
             buffer.vimInsertAtLineStart();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'A': {
+          case "A": {
             // Enter INSERT mode at end of line
             buffer.vimAppendAtLineEnd();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'd': {
-            if (state.pendingOperator === 'd') {
+          case "d": {
+            if (state.pendingOperator === "d") {
               // Second 'd' - delete N lines (dd command)
               const repeatCount = getCurrentCount();
               executeCommand(CMD_TYPES.DELETE_LINE, repeatCount);
               dispatch({
-                type: 'SET_LAST_COMMAND',
+                type: "SET_LAST_COMMAND",
                 command: { type: CMD_TYPES.DELETE_LINE, count: repeatCount },
               });
-              dispatch({ type: 'CLEAR_COUNT' });
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+              dispatch({ type: "CLEAR_COUNT" });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
             } else {
               // First 'd' - wait for movement command
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'd' });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: "d" });
             }
             return true;
           }
 
-          case 'c': {
-            if (state.pendingOperator === 'c') {
+          case "c": {
+            if (state.pendingOperator === "c") {
               // Second 'c' - change N entire lines (cc command)
               const repeatCount = getCurrentCount();
               executeCommand(CMD_TYPES.CHANGE_LINE, repeatCount);
               dispatch({
-                type: 'SET_LAST_COMMAND',
+                type: "SET_LAST_COMMAND",
                 command: { type: CMD_TYPES.CHANGE_LINE, count: repeatCount },
               });
-              dispatch({ type: 'CLEAR_COUNT' });
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+              dispatch({ type: "CLEAR_COUNT" });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
             } else {
               // First 'c' - wait for movement command
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'c' });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: "c" });
             }
             return true;
           }
 
-          case 'D': {
+          case "D": {
             // Delete from cursor to end of line (equivalent to d$)
             executeCommand(CMD_TYPES.DELETE_TO_EOL, 1);
             dispatch({
-              type: 'SET_LAST_COMMAND',
+              type: "SET_LAST_COMMAND",
               command: { type: CMD_TYPES.DELETE_TO_EOL, count: 1 },
             });
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'C': {
+          case "C": {
             // Change from cursor to end of line (equivalent to c$)
             executeCommand(CMD_TYPES.CHANGE_TO_EOL, 1);
             dispatch({
-              type: 'SET_LAST_COMMAND',
+              type: "SET_LAST_COMMAND",
               command: { type: CMD_TYPES.CHANGE_TO_EOL, count: 1 },
             });
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '.': {
+          case ".": {
             // Repeat last command
             if (state.lastCommand) {
               const cmdData = state.lastCommand;
@@ -712,62 +702,62 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
               executeCommand(cmdData.type, cmdData.count);
             }
 
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
           default: {
             // Check for arrow keys (they have different sequences but known names)
-            if (normalizedKey.name === 'left') {
+            if (normalizedKey.name === "left") {
               // Left arrow - same as 'h'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('h');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("h");
               }
 
               // Normal left movement (same as 'h')
               buffer.vimMoveLeft(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
-            if (normalizedKey.name === 'down') {
+            if (normalizedKey.name === "down") {
               // Down arrow - same as 'j'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('j');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("j");
               }
 
               // Normal down movement (same as 'j')
               buffer.vimMoveDown(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
-            if (normalizedKey.name === 'up') {
+            if (normalizedKey.name === "up") {
               // Up arrow - same as 'k'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('k');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("k");
               }
 
               // Normal up movement (same as 'k')
               buffer.vimMoveUp(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
-            if (normalizedKey.name === 'right') {
+            if (normalizedKey.name === "right") {
               // Right arrow - same as 'l'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('l');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("l");
               }
 
               // Normal right movement (same as 'l')
               buffer.vimMoveRight(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
             // Unknown command, clear count and pending states
-            dispatch({ type: 'CLEAR_PENDING_STATES' });
+            dispatch({ type: "CLEAR_PENDING_STATES" });
             return true; // Still handled by vim to prevent other handlers
           }
         }
diff --git a/apps/airiscode-cli/src/ui/keyMatchers.ts b/apps/airiscode-cli/src/ui/keyMatchers.ts
index 0b47bb678..8120b22d2 100644
--- a/apps/airiscode-cli/src/ui/keyMatchers.ts
+++ b/apps/airiscode-cli/src/ui/keyMatchers.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Key } from './hooks/useKeypress.js';
-import type { KeyBinding, KeyBindingConfig } from '../config/keyBindings.js';
-import { Command, defaultKeyBindings } from '../config/keyBindings.js';
+import type { KeyBinding, KeyBindingConfig } from "../config/keyBindings.js";
+import { Command, defaultKeyBindings } from "../config/keyBindings.js";
+import type { Key } from "./hooks/useKeypress.js";
 
 /**
  * Matches a KeyBinding against an actual Key press
@@ -84,9 +84,7 @@ export type KeyMatchers = {
 /**
  * Creates key matchers from a key binding configuration
  */
-export function createKeyMatchers(
-  config: KeyBindingConfig = defaultKeyBindings,
-): KeyMatchers {
+export function createKeyMatchers(config: KeyBindingConfig = defaultKeyBindings): KeyMatchers {
   const matchers = {} as { [C in Command]: KeyMatcher };
 
   for (const command of Object.values(Command)) {
diff --git a/apps/airiscode-cli/src/ui/layouts/DefaultAppLayout.tsx b/apps/airiscode-cli/src/ui/layouts/DefaultAppLayout.tsx
index 88efdbefd..41c02f175 100644
--- a/apps/airiscode-cli/src/ui/layouts/DefaultAppLayout.tsx
+++ b/apps/airiscode-cli/src/ui/layouts/DefaultAppLayout.tsx
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useRef } from 'react';
-import { Box } from 'ink';
-import { MainContent } from '../components/MainContent.js';
-import { DialogManager } from '../components/DialogManager.js';
-import { Composer } from '../components/Composer.js';
-import { ExitWarning } from '../components/ExitWarning.js';
-import { BtwMessage } from '../components/messages/BtwMessage.js';
-import { AgentTabBar } from '../components/agent-view/AgentTabBar.js';
-import { AgentChatView } from '../components/agent-view/AgentChatView.js';
-import { AgentComposer } from '../components/agent-view/AgentComposer.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
-import { useAgentViewState } from '../contexts/AgentViewContext.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box } from "ink";
+import type React from "react";
+import { useEffect, useRef } from "react";
+import { AgentChatView } from "../components/agent-view/AgentChatView.js";
+import { AgentComposer } from "../components/agent-view/AgentComposer.js";
+import { AgentTabBar } from "../components/agent-view/AgentTabBar.js";
+import { Composer } from "../components/Composer.js";
+import { DialogManager } from "../components/DialogManager.js";
+import { ExitWarning } from "../components/ExitWarning.js";
+import { MainContent } from "../components/MainContent.js";
+import { BtwMessage } from "../components/messages/BtwMessage.js";
+import { useAgentViewState } from "../contexts/AgentViewContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
 
 export const DefaultAppLayout: React.FC = () => {
   const uiState = useUIState();
@@ -26,7 +26,7 @@ export const DefaultAppLayout: React.FC = () => {
   const { activeView, agents } = useAgentViewState();
   const { columns: terminalWidth } = useTerminalSize();
   const hasAgents = agents.size > 0;
-  const isAgentTab = activeView !== 'main' && agents.has(activeView);
+  const isAgentTab = activeView !== "main" && agents.has(activeView);
 
   // Clear terminal on view switch so previous view's <Static> output
   // is removed. refreshStatic clears the terminal and bumps the
@@ -57,11 +57,7 @@ export const DefaultAppLayout: React.FC = () => {
           <MainContent />
           <Box flexDirection="column" ref={uiState.mainControlsRef}>
             {uiState.dialogsVisible ? (
-              <Box
-                marginX={2}
-                flexDirection="column"
-                width={uiState.mainAreaWidth}
-              >
+              <Box marginX={2} flexDirection="column" width={uiState.mainAreaWidth}>
                 <DialogManager
                   terminalWidth={uiState.terminalWidth}
                   addItem={uiState.historyManager.addItem}
@@ -71,10 +67,7 @@ export const DefaultAppLayout: React.FC = () => {
               <>
                 {uiState.btwItem && (
                   <Box marginX={2} width={uiState.mainAreaWidth}>
-                    <BtwMessage
-                      btw={uiState.btwItem.btw}
-                      containerWidth={uiState.mainAreaWidth}
-                    />
+                    <BtwMessage btw={uiState.btwItem.btw} containerWidth={uiState.mainAreaWidth} />
                   </Box>
                 )}
                 <Composer />
diff --git a/apps/airiscode-cli/src/ui/layouts/ScreenReaderAppLayout.tsx b/apps/airiscode-cli/src/ui/layouts/ScreenReaderAppLayout.tsx
index e601db4b9..2761868a6 100644
--- a/apps/airiscode-cli/src/ui/layouts/ScreenReaderAppLayout.tsx
+++ b/apps/airiscode-cli/src/ui/layouts/ScreenReaderAppLayout.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box } from 'ink';
-import { Notifications } from '../components/Notifications.js';
-import { MainContent } from '../components/MainContent.js';
-import { DialogManager } from '../components/DialogManager.js';
-import { Composer } from '../components/Composer.js';
-import { Footer } from '../components/Footer.js';
-import { ExitWarning } from '../components/ExitWarning.js';
-import { BtwMessage } from '../components/messages/BtwMessage.js';
-import { useUIState } from '../contexts/UIStateContext.js';
+import { Box } from "ink";
+import type React from "react";
+import { Composer } from "../components/Composer.js";
+import { DialogManager } from "../components/DialogManager.js";
+import { ExitWarning } from "../components/ExitWarning.js";
+import { Footer } from "../components/Footer.js";
+import { MainContent } from "../components/MainContent.js";
+import { BtwMessage } from "../components/messages/BtwMessage.js";
+import { Notifications } from "../components/Notifications.js";
+import { useUIState } from "../contexts/UIStateContext.js";
 
 export const ScreenReaderAppLayout: React.FC = () => {
   const uiState = useUIState();
@@ -37,10 +37,7 @@ export const ScreenReaderAppLayout: React.FC = () => {
         <>
           {uiState.btwItem && (
             <Box marginX={2} width={uiState.mainAreaWidth}>
-              <BtwMessage
-                btw={uiState.btwItem.btw}
-                containerWidth={uiState.mainAreaWidth}
-              />
+              <BtwMessage btw={uiState.btwItem.btw} containerWidth={uiState.mainAreaWidth} />
             </Box>
           )}
           <Composer />
diff --git a/apps/airiscode-cli/src/ui/models/availableModels.ts b/apps/airiscode-cli/src/ui/models/availableModels.ts
index 0f47e2793..5908161e9 100644
--- a/apps/airiscode-cli/src/ui/models/availableModels.ts
+++ b/apps/airiscode-cli/src/ui/models/availableModels.ts
@@ -4,12 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  AuthType,
-  type Config,
-  type AvailableModel as CoreAvailableModel,
-} from '@airiscode/core';
-import { t } from '../../i18n/index.js';
+import { AuthType, type Config, type AvailableModel as CoreAvailableModel } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
 
 export type AvailableModel = {
   id: string;
@@ -31,26 +27,26 @@ export function getFilteredQwenModels(): AvailableModel[] {
  * In the future, after settings.json is updated, we will allow users to configure this themselves.
  */
 export function getOpenAIAvailableModelFromEnv(): AvailableModel | null {
-  const id = process.env['OPENAI_MODEL']?.trim();
+  const id = process.env["OPENAI_MODEL"]?.trim();
   return id
     ? {
         id,
         label: id,
         get description() {
-          return t('Configured via OPENAI_MODEL environment variable');
+          return t("Configured via OPENAI_MODEL environment variable");
         },
       }
     : null;
 }
 
 export function getAnthropicAvailableModelFromEnv(): AvailableModel | null {
-  const id = process.env['ANTHROPIC_MODEL']?.trim();
+  const id = process.env["ANTHROPIC_MODEL"]?.trim();
   return id
     ? {
         id,
         label: id,
         get description() {
-          return t('Configured via ANTHROPIC_MODEL environment variable');
+          return t("Configured via ANTHROPIC_MODEL environment variable");
         },
       }
     : null;
@@ -59,9 +55,7 @@ export function getAnthropicAvailableModelFromEnv(): AvailableModel | null {
 /**
  * Convert core AvailableModel to CLI AvailableModel format
  */
-function convertCoreModelToCliModel(
-  coreModel: CoreAvailableModel,
-): AvailableModel {
+function convertCoreModelToCliModel(coreModel: CoreAvailableModel): AvailableModel {
   return {
     id: coreModel.id,
     label: coreModel.label,
diff --git a/apps/airiscode-cli/src/ui/noninteractive/nonInteractiveUi.ts b/apps/airiscode-cli/src/ui/noninteractive/nonInteractiveUi.ts
index dbdf4e2e3..7eb7ff4ee 100644
--- a/apps/airiscode-cli/src/ui/noninteractive/nonInteractiveUi.ts
+++ b/apps/airiscode-cli/src/ui/noninteractive/nonInteractiveUi.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandContext } from '../commands/types.js';
-import type { ExtensionUpdateAction } from '../state/extensions.js';
+import type { CommandContext } from "../commands/types.js";
+import type { ExtensionUpdateAction } from "../state/extensions.js";
 
 /**
  * Creates a UI context object with no-op functions.
  * Useful for non-interactive environments where UI operations
  * are not applicable.
  */
-export function createNonInteractiveUI(): CommandContext['ui'] {
+export function createNonInteractiveUI(): CommandContext["ui"] {
   return {
     addItem: (_item, _timestamp) => 0,
     clear: () => {},
diff --git a/apps/airiscode-cli/src/ui/semantic-colors.ts b/apps/airiscode-cli/src/ui/semantic-colors.ts
index 88e75833f..b16489df0 100644
--- a/apps/airiscode-cli/src/ui/semantic-colors.ts
+++ b/apps/airiscode-cli/src/ui/semantic-colors.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { themeManager } from './themes/theme-manager.js';
-import type { SemanticColors } from './themes/semantic-tokens.js';
+import type { SemanticColors } from "./themes/semantic-tokens.js";
+import { themeManager } from "./themes/theme-manager.js";
 
 export const theme: SemanticColors = {
   get text() {
diff --git a/apps/airiscode-cli/src/ui/state/extensions.ts b/apps/airiscode-cli/src/ui/state/extensions.ts
index 88f0cadcd..89a51849d 100644
--- a/apps/airiscode-cli/src/ui/state/extensions.ts
+++ b/apps/airiscode-cli/src/ui/state/extensions.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { checkExhaustive } from '../../utils/checks.js';
+import { checkExhaustive } from "../../utils/checks.js";
 
 export enum ExtensionUpdateState {
-  CHECKING_FOR_UPDATES = 'checking for updates',
-  UPDATED_NEEDS_RESTART = 'updated, needs restart',
-  UPDATING = 'updating',
-  UPDATED = 'updated',
-  UPDATE_AVAILABLE = 'update available',
-  UP_TO_DATE = 'up to date',
-  ERROR = 'error',
-  NOT_UPDATABLE = 'not updatable',
-  UNKNOWN = 'unknown',
+  CHECKING_FOR_UPDATES = "checking for updates",
+  UPDATED_NEEDS_RESTART = "updated, needs restart",
+  UPDATING = "updating",
+  UPDATED = "updated",
+  UPDATE_AVAILABLE = "update available",
+  UP_TO_DATE = "up to date",
+  ERROR = "error",
+  NOT_UPDATABLE = "not updatable",
+  UNKNOWN = "unknown",
 }
 
 export interface ExtensionUpdateStatus {
@@ -35,22 +35,22 @@ export const initialExtensionUpdatesState: ExtensionUpdatesState = {
 
 export type ExtensionUpdateAction =
   | {
-      type: 'SET_STATE';
+      type: "SET_STATE";
       payload: { name: string; state: ExtensionUpdateState };
     }
   | {
-      type: 'SET_PROCESSED';
+      type: "SET_PROCESSED";
       payload: { name: string; processed: boolean };
     }
-  | { type: 'BATCH_CHECK_START' }
-  | { type: 'BATCH_CHECK_END' };
+  | { type: "BATCH_CHECK_START" }
+  | { type: "BATCH_CHECK_END" };
 
 export function extensionUpdatesReducer(
   state: ExtensionUpdatesState,
   action: ExtensionUpdateAction,
 ): ExtensionUpdatesState {
   switch (action.type) {
-    case 'SET_STATE': {
+    case "SET_STATE": {
       const existing = state.extensionStatuses.get(action.payload.name);
       if (existing?.status === action.payload.state) {
         return state;
@@ -62,7 +62,7 @@ export function extensionUpdatesReducer(
       });
       return { ...state, extensionStatuses: newStatuses };
     }
-    case 'SET_PROCESSED': {
+    case "SET_PROCESSED": {
       const existing = state.extensionStatuses.get(action.payload.name);
       if (!existing || existing.processed === action.payload.processed) {
         return state;
@@ -74,12 +74,12 @@ export function extensionUpdatesReducer(
       });
       return { ...state, extensionStatuses: newStatuses };
     }
-    case 'BATCH_CHECK_START':
+    case "BATCH_CHECK_START":
       return {
         ...state,
         batchChecksInProgress: state.batchChecksInProgress + 1,
       };
-    case 'BATCH_CHECK_END':
+    case "BATCH_CHECK_END":
       return {
         ...state,
         batchChecksInProgress: state.batchChecksInProgress - 1,
diff --git a/apps/airiscode-cli/src/ui/textConstants.ts b/apps/airiscode-cli/src/ui/textConstants.ts
index 53236cfed..c71f2cded 100644
--- a/apps/airiscode-cli/src/ui/textConstants.ts
+++ b/apps/airiscode-cli/src/ui/textConstants.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const SCREEN_READER_USER_PREFIX = 'User: ';
+export const SCREEN_READER_USER_PREFIX = "User: ";
 
-export const SCREEN_READER_MODEL_PREFIX = 'Model: ';
+export const SCREEN_READER_MODEL_PREFIX = "Model: ";
 
-export const SCREEN_READER_LOADING = 'loading';
+export const SCREEN_READER_LOADING = "loading";
 
-export const SCREEN_READER_RESPONDING = 'responding';
+export const SCREEN_READER_RESPONDING = "responding";
diff --git a/apps/airiscode-cli/src/ui/themes/ansi-light.ts b/apps/airiscode-cli/src/ui/themes/ansi-light.ts
index fc3f84abf..fc2fb8be0 100644
--- a/apps/airiscode-cli/src/ui/themes/ansi-light.ts
+++ b/apps/airiscode-cli/src/ui/themes/ansi-light.ts
@@ -4,147 +4,147 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { lightSemanticColors } from './semantic-tokens.js';
+import { lightSemanticColors } from "./semantic-tokens.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ansiLightColors: ColorsTheme = {
-  type: 'light',
-  Background: 'white',
-  Foreground: '#444',
-  LightBlue: 'blue',
-  AccentBlue: 'blue',
-  AccentPurple: 'purple',
-  AccentCyan: 'cyan',
-  AccentGreen: 'green',
-  AccentYellow: 'orange',
-  AccentRed: 'red',
-  AccentYellowDim: 'orange',
-  AccentRedDim: 'red',
-  DiffAdded: '#E5F2E5',
-  DiffRemoved: '#FFE5E5',
-  Comment: 'gray',
-  Gray: 'gray',
-  GradientColors: ['blue', 'green'],
+  type: "light",
+  Background: "white",
+  Foreground: "#444",
+  LightBlue: "blue",
+  AccentBlue: "blue",
+  AccentPurple: "purple",
+  AccentCyan: "cyan",
+  AccentGreen: "green",
+  AccentYellow: "orange",
+  AccentRed: "red",
+  AccentYellowDim: "orange",
+  AccentRedDim: "red",
+  DiffAdded: "#E5F2E5",
+  DiffRemoved: "#FFE5E5",
+  Comment: "gray",
+  Gray: "gray",
+  GradientColors: ["blue", "green"],
 };
 
 export const ANSILight: Theme = new Theme(
-  'ANSI Light',
-  'light',
+  "ANSI Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
-      background: 'white',
-      color: 'black',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
+      background: "white",
+      color: "black",
     },
-    'hljs-keyword': {
-      color: 'blue',
+    "hljs-keyword": {
+      color: "blue",
     },
-    'hljs-literal': {
-      color: 'blue',
+    "hljs-literal": {
+      color: "blue",
     },
-    'hljs-symbol': {
-      color: 'blue',
+    "hljs-symbol": {
+      color: "blue",
     },
-    'hljs-name': {
-      color: 'blue',
+    "hljs-name": {
+      color: "blue",
     },
-    'hljs-link': {
-      color: 'blue',
+    "hljs-link": {
+      color: "blue",
     },
-    'hljs-built_in': {
-      color: 'cyan',
+    "hljs-built_in": {
+      color: "cyan",
     },
-    'hljs-type': {
-      color: 'cyan',
+    "hljs-type": {
+      color: "cyan",
     },
-    'hljs-number': {
-      color: 'green',
+    "hljs-number": {
+      color: "green",
     },
-    'hljs-class': {
-      color: 'green',
+    "hljs-class": {
+      color: "green",
     },
-    'hljs-string': {
-      color: 'red',
+    "hljs-string": {
+      color: "red",
     },
-    'hljs-meta-string': {
-      color: 'red',
+    "hljs-meta-string": {
+      color: "red",
     },
-    'hljs-regexp': {
-      color: 'magenta',
+    "hljs-regexp": {
+      color: "magenta",
     },
-    'hljs-template-tag': {
-      color: 'magenta',
+    "hljs-template-tag": {
+      color: "magenta",
     },
-    'hljs-subst': {
-      color: 'black',
+    "hljs-subst": {
+      color: "black",
     },
-    'hljs-function': {
-      color: 'black',
+    "hljs-function": {
+      color: "black",
     },
-    'hljs-title': {
-      color: 'black',
+    "hljs-title": {
+      color: "black",
     },
-    'hljs-params': {
-      color: 'black',
+    "hljs-params": {
+      color: "black",
     },
-    'hljs-formula': {
-      color: 'black',
+    "hljs-formula": {
+      color: "black",
     },
-    'hljs-comment': {
-      color: 'gray',
+    "hljs-comment": {
+      color: "gray",
     },
-    'hljs-quote': {
-      color: 'gray',
+    "hljs-quote": {
+      color: "gray",
     },
-    'hljs-doctag': {
-      color: 'gray',
+    "hljs-doctag": {
+      color: "gray",
     },
-    'hljs-meta': {
-      color: 'gray',
+    "hljs-meta": {
+      color: "gray",
     },
-    'hljs-meta-keyword': {
-      color: 'gray',
+    "hljs-meta-keyword": {
+      color: "gray",
     },
-    'hljs-tag': {
-      color: 'gray',
+    "hljs-tag": {
+      color: "gray",
     },
-    'hljs-variable': {
-      color: 'purple',
+    "hljs-variable": {
+      color: "purple",
     },
-    'hljs-template-variable': {
-      color: 'purple',
+    "hljs-template-variable": {
+      color: "purple",
     },
-    'hljs-attr': {
-      color: 'blue',
+    "hljs-attr": {
+      color: "blue",
     },
-    'hljs-attribute': {
-      color: 'blue',
+    "hljs-attribute": {
+      color: "blue",
     },
-    'hljs-builtin-name': {
-      color: 'blue',
+    "hljs-builtin-name": {
+      color: "blue",
     },
-    'hljs-section': {
-      color: 'orange',
+    "hljs-section": {
+      color: "orange",
     },
-    'hljs-bullet': {
-      color: 'orange',
+    "hljs-bullet": {
+      color: "orange",
     },
-    'hljs-selector-tag': {
-      color: 'orange',
+    "hljs-selector-tag": {
+      color: "orange",
     },
-    'hljs-selector-id': {
-      color: 'orange',
+    "hljs-selector-id": {
+      color: "orange",
     },
-    'hljs-selector-class': {
-      color: 'orange',
+    "hljs-selector-class": {
+      color: "orange",
     },
-    'hljs-selector-attr': {
-      color: 'orange',
+    "hljs-selector-attr": {
+      color: "orange",
     },
-    'hljs-selector-pseudo': {
-      color: 'orange',
+    "hljs-selector-pseudo": {
+      color: "orange",
     },
   },
   ansiLightColors,
diff --git a/apps/airiscode-cli/src/ui/themes/ansi.ts b/apps/airiscode-cli/src/ui/themes/ansi.ts
index b0cbe95df..4e5d7e9a7 100644
--- a/apps/airiscode-cli/src/ui/themes/ansi.ts
+++ b/apps/airiscode-cli/src/ui/themes/ansi.ts
@@ -4,156 +4,156 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { darkSemanticColors } from './semantic-tokens.js';
+import { darkSemanticColors } from "./semantic-tokens.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ansiColors: ColorsTheme = {
-  type: 'dark',
-  Background: 'black',
-  Foreground: 'white',
-  LightBlue: 'bluebright',
-  AccentBlue: 'blue',
-  AccentPurple: 'magenta',
-  AccentCyan: 'cyan',
-  AccentGreen: 'green',
-  AccentYellow: 'yellow',
-  AccentRed: 'red',
-  AccentYellowDim: 'yellow',
-  AccentRedDim: 'red',
-  DiffAdded: '#003300',
-  DiffRemoved: '#4D0000',
-  Comment: 'gray',
-  Gray: 'gray',
-  GradientColors: ['cyan', 'green'],
+  type: "dark",
+  Background: "black",
+  Foreground: "white",
+  LightBlue: "bluebright",
+  AccentBlue: "blue",
+  AccentPurple: "magenta",
+  AccentCyan: "cyan",
+  AccentGreen: "green",
+  AccentYellow: "yellow",
+  AccentRed: "red",
+  AccentYellowDim: "yellow",
+  AccentRedDim: "red",
+  DiffAdded: "#003300",
+  DiffRemoved: "#4D0000",
+  Comment: "gray",
+  Gray: "gray",
+  GradientColors: ["cyan", "green"],
 };
 
 export const ANSI: Theme = new Theme(
-  'ANSI',
-  'dark', // Consistent with its color palette base
+  "ANSI",
+  "dark", // Consistent with its color palette base
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
-      background: 'black', // Mapped from #1E1E1E
-      color: 'white', // Mapped from #DCDCDC
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
+      background: "black", // Mapped from #1E1E1E
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-keyword': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-keyword": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-literal': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-literal": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-symbol': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-symbol": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-name': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-name": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-link': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-link": {
+      color: "blue", // Mapped from #569CD6
       // textDecoration is ignored by Theme class
     },
-    'hljs-built_in': {
-      color: 'cyan', // Mapped from #4EC9B0
+    "hljs-built_in": {
+      color: "cyan", // Mapped from #4EC9B0
     },
-    'hljs-type': {
-      color: 'cyan', // Mapped from #4EC9B0
+    "hljs-type": {
+      color: "cyan", // Mapped from #4EC9B0
     },
-    'hljs-number': {
-      color: 'green', // Mapped from #B8D7A3
+    "hljs-number": {
+      color: "green", // Mapped from #B8D7A3
     },
-    'hljs-class': {
-      color: 'green', // Mapped from #B8D7A3
+    "hljs-class": {
+      color: "green", // Mapped from #B8D7A3
     },
-    'hljs-string': {
-      color: 'yellow', // Mapped from #D69D85
+    "hljs-string": {
+      color: "yellow", // Mapped from #D69D85
     },
-    'hljs-meta-string': {
-      color: 'yellow', // Mapped from #D69D85
+    "hljs-meta-string": {
+      color: "yellow", // Mapped from #D69D85
     },
-    'hljs-regexp': {
-      color: 'red', // Mapped from #9A5334
+    "hljs-regexp": {
+      color: "red", // Mapped from #9A5334
     },
-    'hljs-template-tag': {
-      color: 'red', // Mapped from #9A5334
+    "hljs-template-tag": {
+      color: "red", // Mapped from #9A5334
     },
-    'hljs-subst': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-subst": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-function': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-function": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-title': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-title": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-params': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-params": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-formula': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-formula": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-comment': {
-      color: 'green', // Mapped from #57A64A
+    "hljs-comment": {
+      color: "green", // Mapped from #57A64A
       // fontStyle is ignored by Theme class
     },
-    'hljs-quote': {
-      color: 'green', // Mapped from #57A64A
+    "hljs-quote": {
+      color: "green", // Mapped from #57A64A
       // fontStyle is ignored by Theme class
     },
-    'hljs-doctag': {
-      color: 'green', // Mapped from #608B4E
+    "hljs-doctag": {
+      color: "green", // Mapped from #608B4E
     },
-    'hljs-meta': {
-      color: 'gray', // Mapped from #9B9B9B
+    "hljs-meta": {
+      color: "gray", // Mapped from #9B9B9B
     },
-    'hljs-meta-keyword': {
-      color: 'gray', // Mapped from #9B9B9B
+    "hljs-meta-keyword": {
+      color: "gray", // Mapped from #9B9B9B
     },
-    'hljs-tag': {
-      color: 'gray', // Mapped from #9B9B9B
+    "hljs-tag": {
+      color: "gray", // Mapped from #9B9B9B
     },
-    'hljs-variable': {
-      color: 'magenta', // Mapped from #BD63C5
+    "hljs-variable": {
+      color: "magenta", // Mapped from #BD63C5
     },
-    'hljs-template-variable': {
-      color: 'magenta', // Mapped from #BD63C5
+    "hljs-template-variable": {
+      color: "magenta", // Mapped from #BD63C5
     },
-    'hljs-attr': {
-      color: 'bluebright', // Mapped from #9CDCFE
+    "hljs-attr": {
+      color: "bluebright", // Mapped from #9CDCFE
     },
-    'hljs-attribute': {
-      color: 'bluebright', // Mapped from #9CDCFE
+    "hljs-attribute": {
+      color: "bluebright", // Mapped from #9CDCFE
     },
-    'hljs-builtin-name': {
-      color: 'bluebright', // Mapped from #9CDCFE
+    "hljs-builtin-name": {
+      color: "bluebright", // Mapped from #9CDCFE
     },
-    'hljs-section': {
-      color: 'yellow', // Mapped from gold
+    "hljs-section": {
+      color: "yellow", // Mapped from gold
     },
-    'hljs-emphasis': {
+    "hljs-emphasis": {
       // fontStyle is ignored by Theme class
     },
-    'hljs-strong': {
+    "hljs-strong": {
       // fontWeight is ignored by Theme class
     },
-    'hljs-bullet': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-bullet": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-tag': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-tag": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-id': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-id": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-class': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-class": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-attr': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-attr": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-pseudo': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-pseudo": {
+      color: "yellow", // Mapped from #D7BA7D
     },
   },
   ansiColors,
diff --git a/apps/airiscode-cli/src/ui/themes/atom-one-dark.ts b/apps/airiscode-cli/src/ui/themes/atom-one-dark.ts
index d40a6a0c0..15ebfc104 100644
--- a/apps/airiscode-cli/src/ui/themes/atom-one-dark.ts
+++ b/apps/airiscode-cli/src/ui/themes/atom-one-dark.ts
@@ -4,143 +4,143 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const atomOneDarkColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#282c34',
-  Foreground: '#abb2bf',
-  LightBlue: '#61aeee',
-  AccentBlue: '#61aeee',
-  AccentPurple: '#c678dd',
-  AccentCyan: '#56b6c2',
-  AccentGreen: '#98c379',
-  AccentYellow: '#e6c07b',
-  AccentRed: '#e06c75',
-  AccentYellowDim: '#8B7530',
-  AccentRedDim: '#8B3A4A',
-  DiffAdded: '#39544E',
-  DiffRemoved: '#562B2F',
-  Comment: '#5c6370',
-  Gray: '#5c6370',
-  GradientColors: ['#61aeee', '#98c379'],
+  type: "dark",
+  Background: "#282c34",
+  Foreground: "#abb2bf",
+  LightBlue: "#61aeee",
+  AccentBlue: "#61aeee",
+  AccentPurple: "#c678dd",
+  AccentCyan: "#56b6c2",
+  AccentGreen: "#98c379",
+  AccentYellow: "#e6c07b",
+  AccentRed: "#e06c75",
+  AccentYellowDim: "#8B7530",
+  AccentRedDim: "#8B3A4A",
+  DiffAdded: "#39544E",
+  DiffRemoved: "#562B2F",
+  Comment: "#5c6370",
+  Gray: "#5c6370",
+  GradientColors: ["#61aeee", "#98c379"],
 };
 
 export const AtomOneDark: Theme = new Theme(
-  'Atom One',
-  'dark',
+  "Atom One",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       color: atomOneDarkColors.Foreground,
       background: atomOneDarkColors.Background,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: atomOneDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: atomOneDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: atomOneDarkColors.AccentPurple,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: atomOneDarkColors.AccentPurple,
     },
-    'hljs-formula': {
+    "hljs-formula": {
       color: atomOneDarkColors.AccentPurple,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: atomOneDarkColors.AccentCyan,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: atomOneDarkColors.AccentBlue,
-      textDecoration: 'underline',
+      textDecoration: "underline",
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   atomOneDarkColors,
diff --git a/apps/airiscode-cli/src/ui/themes/ayu-light.ts b/apps/airiscode-cli/src/ui/themes/ayu-light.ts
index 729d0dab3..f65760997 100644
--- a/apps/airiscode-cli/src/ui/themes/ayu-light.ts
+++ b/apps/airiscode-cli/src/ui/themes/ayu-light.ts
@@ -4,134 +4,134 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ayuLightColors: ColorsTheme = {
-  type: 'light',
-  Background: '#f8f9fa',
-  Foreground: '#5c6166',
-  LightBlue: '#55b4d4',
-  AccentBlue: '#399ee6',
-  AccentPurple: '#a37acc',
-  AccentCyan: '#4cbf99',
-  AccentGreen: '#86b300',
-  AccentYellow: '#f2ae49',
-  AccentRed: '#f07171',
-  AccentYellowDim: '#8B7000',
-  AccentRedDim: '#993333',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FFCCCC',
-  Comment: '#ABADB1',
-  Gray: '#a6aaaf',
-  GradientColors: ['#399ee6', '#86b300'],
+  type: "light",
+  Background: "#f8f9fa",
+  Foreground: "#5c6166",
+  LightBlue: "#55b4d4",
+  AccentBlue: "#399ee6",
+  AccentPurple: "#a37acc",
+  AccentCyan: "#4cbf99",
+  AccentGreen: "#86b300",
+  AccentYellow: "#f2ae49",
+  AccentRed: "#f07171",
+  AccentYellowDim: "#8B7000",
+  AccentRedDim: "#993333",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FFCCCC",
+  Comment: "#ABADB1",
+  Gray: "#a6aaaf",
+  GradientColors: ["#399ee6", "#86b300"],
 };
 
 export const AyuLight: Theme = new Theme(
-  'Ayu Light',
-  'light',
+  "Ayu Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: ayuLightColors.Background,
       color: ayuLightColors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: ayuLightColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: ayuLightColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-string': {
+    "hljs-string": {
       color: ayuLightColors.AccentGreen,
     },
-    'hljs-constant': {
+    "hljs-constant": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: ayuLightColors.AccentPurple,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: ayuLightColors.Foreground,
     },
-    'hljs-variable.language': {
+    "hljs-variable.language": {
       color: ayuLightColors.LightBlue,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-title': {
+    "hljs-title": {
       color: ayuLightColors.AccentBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: ayuLightColors.AccentGreen,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: ayuLightColors.LightBlue,
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: ayuLightColors.AccentBlue,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: ayuLightColors.LightBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: ayuLightColors.AccentBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: ayuLightColors.LightBlue,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: ayuLightColors.AccentGreen,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: ayuLightColors.AccentRed,
     },
   },
diff --git a/apps/airiscode-cli/src/ui/themes/ayu.ts b/apps/airiscode-cli/src/ui/themes/ayu.ts
index d5bfc9ad4..b4e40330b 100644
--- a/apps/airiscode-cli/src/ui/themes/ayu.ts
+++ b/apps/airiscode-cli/src/ui/themes/ayu.ts
@@ -4,109 +4,109 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ayuDarkColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#0b0e14',
-  Foreground: '#aeaca6',
-  LightBlue: '#59C2FF',
-  AccentBlue: '#39BAE6',
-  AccentPurple: '#D2A6FF',
-  AccentCyan: '#95E6CB',
-  AccentGreen: '#AAD94C',
-  AccentYellow: '#FFB454',
-  AccentRed: '#F26D78',
-  AccentYellowDim: '#8B7530',
-  AccentRedDim: '#8B3A4A',
-  DiffAdded: '#293022',
-  DiffRemoved: '#3D1215',
-  Comment: '#646A71',
-  Gray: '#3D4149',
-  GradientColors: ['#FFB454', '#F26D78'],
+  type: "dark",
+  Background: "#0b0e14",
+  Foreground: "#aeaca6",
+  LightBlue: "#59C2FF",
+  AccentBlue: "#39BAE6",
+  AccentPurple: "#D2A6FF",
+  AccentCyan: "#95E6CB",
+  AccentGreen: "#AAD94C",
+  AccentYellow: "#FFB454",
+  AccentRed: "#F26D78",
+  AccentYellowDim: "#8B7530",
+  AccentRedDim: "#8B3A4A",
+  DiffAdded: "#293022",
+  DiffRemoved: "#3D1215",
+  Comment: "#646A71",
+  Gray: "#3D4149",
+  GradientColors: ["#FFB454", "#F26D78"],
 };
 
 export const AyuDark: Theme = new Theme(
-  'Ayu',
-  'dark',
+  "Ayu",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: ayuDarkColors.Background,
       color: ayuDarkColors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: ayuDarkColors.AccentPurple,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: ayuDarkColors.AccentCyan,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: ayuDarkColors.LightBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: ayuDarkColors.AccentBlue,
     },
-    'hljs-function .hljs-keyword': {
+    "hljs-function .hljs-keyword": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: ayuDarkColors.Foreground,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: ayuDarkColors.AccentGreen,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: ayuDarkColors.AccentBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: ayuDarkColors.AccentGreen,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: ayuDarkColors.Foreground,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: ayuDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: ayuDarkColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: ayuDarkColors.AccentRed,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   ayuDarkColors,
diff --git a/apps/airiscode-cli/src/ui/themes/color-utils.ts b/apps/airiscode-cli/src/ui/themes/color-utils.ts
index e0a71b823..41e47445a 100644
--- a/apps/airiscode-cli/src/ui/themes/color-utils.ts
+++ b/apps/airiscode-cli/src/ui/themes/color-utils.ts
@@ -4,173 +4,173 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
 
 // Mapping from common CSS color names (lowercase) to hex codes (lowercase)
 // Excludes names directly supported by Ink
 export const CSS_NAME_TO_HEX_MAP: Readonly<Record<string, string>> = {
-  aliceblue: '#f0f8ff',
-  antiquewhite: '#faebd7',
-  aqua: '#00ffff',
-  aquamarine: '#7fffd4',
-  azure: '#f0ffff',
-  beige: '#f5f5dc',
-  bisque: '#ffe4c4',
-  blanchedalmond: '#ffebcd',
-  blueviolet: '#8a2be2',
-  brown: '#a52a2a',
-  burlywood: '#deb887',
-  cadetblue: '#5f9ea0',
-  chartreuse: '#7fff00',
-  chocolate: '#d2691e',
-  coral: '#ff7f50',
-  cornflowerblue: '#6495ed',
-  cornsilk: '#fff8dc',
-  crimson: '#dc143c',
-  darkblue: '#00008b',
-  darkcyan: '#008b8b',
-  darkgoldenrod: '#b8860b',
-  darkgray: '#a9a9a9',
-  darkgrey: '#a9a9a9',
-  darkgreen: '#006400',
-  darkkhaki: '#bdb76b',
-  darkmagenta: '#8b008b',
-  darkolivegreen: '#556b2f',
-  darkorange: '#ff8c00',
-  darkorchid: '#9932cc',
-  darkred: '#8b0000',
-  darksalmon: '#e9967a',
-  darkseagreen: '#8fbc8f',
-  darkslateblue: '#483d8b',
-  darkslategray: '#2f4f4f',
-  darkslategrey: '#2f4f4f',
-  darkturquoise: '#00ced1',
-  darkviolet: '#9400d3',
-  deeppink: '#ff1493',
-  deepskyblue: '#00bfff',
-  dimgray: '#696969',
-  dimgrey: '#696969',
-  dodgerblue: '#1e90ff',
-  firebrick: '#b22222',
-  floralwhite: '#fffaf0',
-  forestgreen: '#228b22',
-  fuchsia: '#ff00ff',
-  gainsboro: '#dcdcdc',
-  ghostwhite: '#f8f8ff',
-  gold: '#ffd700',
-  goldenrod: '#daa520',
-  greenyellow: '#adff2f',
-  honeydew: '#f0fff0',
-  hotpink: '#ff69b4',
-  indianred: '#cd5c5c',
-  indigo: '#4b0082',
-  ivory: '#fffff0',
-  khaki: '#f0e68c',
-  lavender: '#e6e6fa',
-  lavenderblush: '#fff0f5',
-  lawngreen: '#7cfc00',
-  lemonchiffon: '#fffacd',
-  lightblue: '#add8e6',
-  lightcoral: '#f08080',
-  lightcyan: '#e0ffff',
-  lightgoldenrodyellow: '#fafad2',
-  lightgray: '#d3d3d3',
-  lightgrey: '#d3d3d3',
-  lightgreen: '#90ee90',
-  lightpink: '#ffb6c1',
-  lightsalmon: '#ffa07a',
-  lightseagreen: '#20b2aa',
-  lightskyblue: '#87cefa',
-  lightslategray: '#778899',
-  lightslategrey: '#778899',
-  lightsteelblue: '#b0c4de',
-  lightyellow: '#ffffe0',
-  lime: '#00ff00',
-  limegreen: '#32cd32',
-  linen: '#faf0e6',
-  maroon: '#800000',
-  mediumaquamarine: '#66cdaa',
-  mediumblue: '#0000cd',
-  mediumorchid: '#ba55d3',
-  mediumpurple: '#9370db',
-  mediumseagreen: '#3cb371',
-  mediumslateblue: '#7b68ee',
-  mediumspringgreen: '#00fa9a',
-  mediumturquoise: '#48d1cc',
-  mediumvioletred: '#c71585',
-  midnightblue: '#191970',
-  mintcream: '#f5fffa',
-  mistyrose: '#ffe4e1',
-  moccasin: '#ffe4b5',
-  navajowhite: '#ffdead',
-  navy: '#000080',
-  oldlace: '#fdf5e6',
-  olive: '#808000',
-  olivedrab: '#6b8e23',
-  orange: '#ffa500',
-  orangered: '#ff4500',
-  orchid: '#da70d6',
-  palegoldenrod: '#eee8aa',
-  palegreen: '#98fb98',
-  paleturquoise: '#afeeee',
-  palevioletred: '#db7093',
-  papayawhip: '#ffefd5',
-  peachpuff: '#ffdab9',
-  peru: '#cd853f',
-  pink: '#ffc0cb',
-  plum: '#dda0dd',
-  powderblue: '#b0e0e6',
-  purple: '#800080',
-  rebeccapurple: '#663399',
-  rosybrown: '#bc8f8f',
-  royalblue: '#4169e1',
-  saddlebrown: '#8b4513',
-  salmon: '#fa8072',
-  sandybrown: '#f4a460',
-  seagreen: '#2e8b57',
-  seashell: '#fff5ee',
-  sienna: '#a0522d',
-  silver: '#c0c0c0',
-  skyblue: '#87ceeb',
-  slateblue: '#6a5acd',
-  slategray: '#708090',
-  slategrey: '#708090',
-  snow: '#fffafa',
-  springgreen: '#00ff7f',
-  steelblue: '#4682b4',
-  tan: '#d2b48c',
-  teal: '#008080',
-  thistle: '#d8bfd8',
-  tomato: '#ff6347',
-  turquoise: '#40e0d0',
-  violet: '#ee82ee',
-  wheat: '#f5deb3',
-  whitesmoke: '#f5f5f5',
-  yellowgreen: '#9acd32',
+  aliceblue: "#f0f8ff",
+  antiquewhite: "#faebd7",
+  aqua: "#00ffff",
+  aquamarine: "#7fffd4",
+  azure: "#f0ffff",
+  beige: "#f5f5dc",
+  bisque: "#ffe4c4",
+  blanchedalmond: "#ffebcd",
+  blueviolet: "#8a2be2",
+  brown: "#a52a2a",
+  burlywood: "#deb887",
+  cadetblue: "#5f9ea0",
+  chartreuse: "#7fff00",
+  chocolate: "#d2691e",
+  coral: "#ff7f50",
+  cornflowerblue: "#6495ed",
+  cornsilk: "#fff8dc",
+  crimson: "#dc143c",
+  darkblue: "#00008b",
+  darkcyan: "#008b8b",
+  darkgoldenrod: "#b8860b",
+  darkgray: "#a9a9a9",
+  darkgrey: "#a9a9a9",
+  darkgreen: "#006400",
+  darkkhaki: "#bdb76b",
+  darkmagenta: "#8b008b",
+  darkolivegreen: "#556b2f",
+  darkorange: "#ff8c00",
+  darkorchid: "#9932cc",
+  darkred: "#8b0000",
+  darksalmon: "#e9967a",
+  darkseagreen: "#8fbc8f",
+  darkslateblue: "#483d8b",
+  darkslategray: "#2f4f4f",
+  darkslategrey: "#2f4f4f",
+  darkturquoise: "#00ced1",
+  darkviolet: "#9400d3",
+  deeppink: "#ff1493",
+  deepskyblue: "#00bfff",
+  dimgray: "#696969",
+  dimgrey: "#696969",
+  dodgerblue: "#1e90ff",
+  firebrick: "#b22222",
+  floralwhite: "#fffaf0",
+  forestgreen: "#228b22",
+  fuchsia: "#ff00ff",
+  gainsboro: "#dcdcdc",
+  ghostwhite: "#f8f8ff",
+  gold: "#ffd700",
+  goldenrod: "#daa520",
+  greenyellow: "#adff2f",
+  honeydew: "#f0fff0",
+  hotpink: "#ff69b4",
+  indianred: "#cd5c5c",
+  indigo: "#4b0082",
+  ivory: "#fffff0",
+  khaki: "#f0e68c",
+  lavender: "#e6e6fa",
+  lavenderblush: "#fff0f5",
+  lawngreen: "#7cfc00",
+  lemonchiffon: "#fffacd",
+  lightblue: "#add8e6",
+  lightcoral: "#f08080",
+  lightcyan: "#e0ffff",
+  lightgoldenrodyellow: "#fafad2",
+  lightgray: "#d3d3d3",
+  lightgrey: "#d3d3d3",
+  lightgreen: "#90ee90",
+  lightpink: "#ffb6c1",
+  lightsalmon: "#ffa07a",
+  lightseagreen: "#20b2aa",
+  lightskyblue: "#87cefa",
+  lightslategray: "#778899",
+  lightslategrey: "#778899",
+  lightsteelblue: "#b0c4de",
+  lightyellow: "#ffffe0",
+  lime: "#00ff00",
+  limegreen: "#32cd32",
+  linen: "#faf0e6",
+  maroon: "#800000",
+  mediumaquamarine: "#66cdaa",
+  mediumblue: "#0000cd",
+  mediumorchid: "#ba55d3",
+  mediumpurple: "#9370db",
+  mediumseagreen: "#3cb371",
+  mediumslateblue: "#7b68ee",
+  mediumspringgreen: "#00fa9a",
+  mediumturquoise: "#48d1cc",
+  mediumvioletred: "#c71585",
+  midnightblue: "#191970",
+  mintcream: "#f5fffa",
+  mistyrose: "#ffe4e1",
+  moccasin: "#ffe4b5",
+  navajowhite: "#ffdead",
+  navy: "#000080",
+  oldlace: "#fdf5e6",
+  olive: "#808000",
+  olivedrab: "#6b8e23",
+  orange: "#ffa500",
+  orangered: "#ff4500",
+  orchid: "#da70d6",
+  palegoldenrod: "#eee8aa",
+  palegreen: "#98fb98",
+  paleturquoise: "#afeeee",
+  palevioletred: "#db7093",
+  papayawhip: "#ffefd5",
+  peachpuff: "#ffdab9",
+  peru: "#cd853f",
+  pink: "#ffc0cb",
+  plum: "#dda0dd",
+  powderblue: "#b0e0e6",
+  purple: "#800080",
+  rebeccapurple: "#663399",
+  rosybrown: "#bc8f8f",
+  royalblue: "#4169e1",
+  saddlebrown: "#8b4513",
+  salmon: "#fa8072",
+  sandybrown: "#f4a460",
+  seagreen: "#2e8b57",
+  seashell: "#fff5ee",
+  sienna: "#a0522d",
+  silver: "#c0c0c0",
+  skyblue: "#87ceeb",
+  slateblue: "#6a5acd",
+  slategray: "#708090",
+  slategrey: "#708090",
+  snow: "#fffafa",
+  springgreen: "#00ff7f",
+  steelblue: "#4682b4",
+  tan: "#d2b48c",
+  teal: "#008080",
+  thistle: "#d8bfd8",
+  tomato: "#ff6347",
+  turquoise: "#40e0d0",
+  violet: "#ee82ee",
+  wheat: "#f5deb3",
+  whitesmoke: "#f5f5f5",
+  yellowgreen: "#9acd32",
 };
 
-const debugLogger = createDebugLogger('COLOR_UTILS');
+const debugLogger = createDebugLogger("COLOR_UTILS");
 
 // Define the set of Ink's named colors for quick lookup
 export const INK_SUPPORTED_NAMES = new Set([
-  'black',
-  'red',
-  'green',
-  'yellow',
-  'blue',
-  'cyan',
-  'magenta',
-  'white',
-  'gray',
-  'grey',
-  'blackbright',
-  'redbright',
-  'greenbright',
-  'yellowbright',
-  'bluebright',
-  'cyanbright',
-  'magentabright',
-  'whitebright',
+  "black",
+  "red",
+  "green",
+  "yellow",
+  "blue",
+  "cyan",
+  "magenta",
+  "white",
+  "gray",
+  "grey",
+  "blackbright",
+  "redbright",
+  "greenbright",
+  "yellowbright",
+  "bluebright",
+  "cyanbright",
+  "magentabright",
+  "whitebright",
 ]);
 
 /**
@@ -184,7 +184,7 @@ export function isValidColor(color: string): boolean {
   const lowerColor = color.toLowerCase();
 
   // 1. Check if it's a hex code
-  if (lowerColor.startsWith('#')) {
+  if (lowerColor.startsWith("#")) {
     return /^#[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$/.test(color);
   }
 
@@ -211,7 +211,7 @@ export function resolveColor(colorValue: string): string | undefined {
   const lowerColor = colorValue.toLowerCase();
 
   // 1. Check if it's already a hex code and valid
-  if (lowerColor.startsWith('#')) {
+  if (lowerColor.startsWith("#")) {
     if (/^#[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$/.test(colorValue)) {
       return lowerColor;
     } else {
diff --git a/apps/airiscode-cli/src/ui/themes/default-light.ts b/apps/airiscode-cli/src/ui/themes/default-light.ts
index 1803e7fae..ff094b6be 100644
--- a/apps/airiscode-cli/src/ui/themes/default-light.ts
+++ b/apps/airiscode-cli/src/ui/themes/default-light.ts
@@ -4,102 +4,102 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lightTheme, Theme } from './theme.js';
+import { lightTheme, Theme } from "./theme.js";
 
 export const DefaultLight: Theme = new Theme(
-  'Default Light',
-  'light',
+  "Default Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: lightTheme.Background,
       color: lightTheme.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: lightTheme.Comment,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: lightTheme.Comment,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: lightTheme.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: lightTheme.AccentRed,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: lightTheme.AccentRed,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: lightTheme.AccentRed,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: lightTheme.AccentRed,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: lightTheme.AccentRed,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: lightTheme.AccentRed,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: lightTheme.AccentRed,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: lightTheme.AccentRed,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: lightTheme.AccentGreen,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: lightTheme.AccentRed,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: lightTheme.Gray,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: lightTheme.AccentRed,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   lightTheme,
diff --git a/apps/airiscode-cli/src/ui/themes/default.ts b/apps/airiscode-cli/src/ui/themes/default.ts
index e1d0247c0..c2aa6a251 100644
--- a/apps/airiscode-cli/src/ui/themes/default.ts
+++ b/apps/airiscode-cli/src/ui/themes/default.ts
@@ -4,145 +4,145 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme } from './theme.js';
+import { darkTheme, Theme } from "./theme.js";
 
 export const DefaultDark: Theme = new Theme(
-  'Default',
-  'dark',
+  "Default",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: darkTheme.Background,
       color: darkTheme.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: darkTheme.AccentBlue,
-      textDecoration: 'underline',
+      textDecoration: "underline",
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: darkTheme.AccentCyan,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: darkTheme.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: darkTheme.AccentGreen,
     },
-    'hljs-class': {
+    "hljs-class": {
       color: darkTheme.AccentGreen,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: darkTheme.AccentRed,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: darkTheme.AccentRed,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: darkTheme.Foreground,
     },
-    'hljs-function': {
+    "hljs-function": {
       color: darkTheme.Foreground,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: darkTheme.Foreground,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: darkTheme.Foreground,
     },
-    'hljs-formula': {
+    "hljs-formula": {
       color: darkTheme.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: darkTheme.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: darkTheme.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: darkTheme.Comment,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: darkTheme.Gray,
     },
-    'hljs-meta-keyword': {
+    "hljs-meta-keyword": {
       color: darkTheme.Gray,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: darkTheme.Gray,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: darkTheme.AccentPurple,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: darkTheme.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: darkTheme.LightBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: darkTheme.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: darkTheme.LightBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-addition': {
-      backgroundColor: '#144212',
-      display: 'inline-block',
-      width: '100%',
+    "hljs-addition": {
+      backgroundColor: "#144212",
+      display: "inline-block",
+      width: "100%",
     },
-    'hljs-deletion': {
-      backgroundColor: '#600',
-      display: 'inline-block',
-      width: '100%',
+    "hljs-deletion": {
+      backgroundColor: "#600",
+      display: "inline-block",
+      width: "100%",
     },
   },
   darkTheme,
diff --git a/apps/airiscode-cli/src/ui/themes/dracula.ts b/apps/airiscode-cli/src/ui/themes/dracula.ts
index 8a982f4e7..901609a83 100644
--- a/apps/airiscode-cli/src/ui/themes/dracula.ts
+++ b/apps/airiscode-cli/src/ui/themes/dracula.ts
@@ -4,120 +4,120 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const draculaColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#282a36',
-  Foreground: '#a3afb7',
-  LightBlue: '#8be9fd',
-  AccentBlue: '#8be9fd',
-  AccentPurple: '#ff79c6',
-  AccentCyan: '#8be9fd',
-  AccentGreen: '#50fa7b',
-  AccentYellow: '#fff783',
-  AccentRed: '#ff5555',
-  AccentYellowDim: '#8B7530',
-  AccentRedDim: '#8B3A4A',
-  DiffAdded: '#11431d',
-  DiffRemoved: '#6e1818',
-  Comment: '#6272a4',
-  Gray: '#6272a4',
-  GradientColors: ['#ff79c6', '#8be9fd'],
+  type: "dark",
+  Background: "#282a36",
+  Foreground: "#a3afb7",
+  LightBlue: "#8be9fd",
+  AccentBlue: "#8be9fd",
+  AccentPurple: "#ff79c6",
+  AccentCyan: "#8be9fd",
+  AccentGreen: "#50fa7b",
+  AccentYellow: "#fff783",
+  AccentRed: "#ff5555",
+  AccentYellowDim: "#8B7530",
+  AccentRedDim: "#8B3A4A",
+  DiffAdded: "#11431d",
+  DiffRemoved: "#6e1818",
+  Comment: "#6272a4",
+  Gray: "#6272a4",
+  GradientColors: ["#ff79c6", "#8be9fd"],
 };
 
 export const Dracula: Theme = new Theme(
-  'Dracula',
-  'dark',
+  "Dracula",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: draculaColors.Background,
       color: draculaColors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-link': {
+    "hljs-link": {
       color: draculaColors.AccentBlue,
     },
-    'hljs-function .hljs-keyword': {
+    "hljs-function .hljs-keyword": {
       color: draculaColors.AccentPurple,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: draculaColors.Foreground,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: draculaColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-name': {
+    "hljs-name": {
       color: draculaColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: draculaColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: draculaColors.AccentGreen,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: draculaColors.Comment,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: draculaColors.Comment,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: draculaColors.AccentRed,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: draculaColors.Comment,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   draculaColors,
diff --git a/apps/airiscode-cli/src/ui/themes/github-dark.ts b/apps/airiscode-cli/src/ui/themes/github-dark.ts
index b2e24f15b..33f203a84 100644
--- a/apps/airiscode-cli/src/ui/themes/github-dark.ts
+++ b/apps/airiscode-cli/src/ui/themes/github-dark.ts
@@ -4,143 +4,143 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const githubDarkColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#24292e',
-  Foreground: '#c0c4c8',
-  LightBlue: '#79B8FF',
-  AccentBlue: '#79B8FF',
-  AccentPurple: '#B392F0',
-  AccentCyan: '#9ECBFF',
-  AccentGreen: '#85E89D',
-  AccentYellow: '#FFAB70',
-  AccentRed: '#F97583',
-  AccentYellowDim: '#8B7530',
-  AccentRedDim: '#8B3A4A',
-  DiffAdded: '#3C4636',
-  DiffRemoved: '#502125',
-  Comment: '#6A737D',
-  Gray: '#6A737D',
-  GradientColors: ['#79B8FF', '#85E89D'],
+  type: "dark",
+  Background: "#24292e",
+  Foreground: "#c0c4c8",
+  LightBlue: "#79B8FF",
+  AccentBlue: "#79B8FF",
+  AccentPurple: "#B392F0",
+  AccentCyan: "#9ECBFF",
+  AccentGreen: "#85E89D",
+  AccentYellow: "#FFAB70",
+  AccentRed: "#F97583",
+  AccentYellowDim: "#8B7530",
+  AccentRedDim: "#8B3A4A",
+  DiffAdded: "#3C4636",
+  DiffRemoved: "#502125",
+  Comment: "#6A737D",
+  Gray: "#6A737D",
+  GradientColors: ["#79B8FF", "#85E89D"],
 };
 
 export const GitHubDark: Theme = new Theme(
-  'GitHub',
-  'dark',
+  "GitHub",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       color: githubDarkColors.Foreground,
       background: githubDarkColors.Background,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: githubDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: githubDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: githubDarkColors.AccentRed,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: githubDarkColors.AccentRed,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: githubDarkColors.Foreground,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: githubDarkColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: githubDarkColors.AccentYellow,
     },
-    'hljs-tag .hljs-attr': {
+    "hljs-tag .hljs-attr": {
       color: githubDarkColors.AccentYellow,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: githubDarkColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: githubDarkColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: githubDarkColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: githubDarkColors.AccentGreen,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: githubDarkColors.AccentGreen,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: githubDarkColors.AccentGreen,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: githubDarkColors.AccentGreen,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: githubDarkColors.AccentPurple,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: githubDarkColors.AccentPurple,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: githubDarkColors.LightBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-deletion': {
-      background: '#86181D',
+    "hljs-deletion": {
+      background: "#86181D",
       color: githubDarkColors.AccentRed,
     },
-    'hljs-addition': {
-      background: '#144620',
+    "hljs-addition": {
+      background: "#144620",
       color: githubDarkColors.AccentGreen,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   githubDarkColors,
diff --git a/apps/airiscode-cli/src/ui/themes/github-light.ts b/apps/airiscode-cli/src/ui/themes/github-light.ts
index 65efa7a6a..b22533fe0 100644
--- a/apps/airiscode-cli/src/ui/themes/github-light.ts
+++ b/apps/airiscode-cli/src/ui/themes/github-light.ts
@@ -4,145 +4,145 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const githubLightColors: ColorsTheme = {
-  type: 'light',
-  Background: '#f8f8f8',
-  Foreground: '#24292E',
-  LightBlue: '#0086b3',
-  AccentBlue: '#458',
-  AccentPurple: '#900',
-  AccentCyan: '#009926',
-  AccentGreen: '#008080',
-  AccentYellow: '#990073',
-  AccentRed: '#d14',
-  AccentYellowDim: '#8B7000',
-  AccentRedDim: '#993333',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FFCCCC',
-  Comment: '#998',
-  Gray: '#999',
-  GradientColors: ['#458', '#008080'],
+  type: "light",
+  Background: "#f8f8f8",
+  Foreground: "#24292E",
+  LightBlue: "#0086b3",
+  AccentBlue: "#458",
+  AccentPurple: "#900",
+  AccentCyan: "#009926",
+  AccentGreen: "#008080",
+  AccentYellow: "#990073",
+  AccentRed: "#d14",
+  AccentYellowDim: "#8B7000",
+  AccentRedDim: "#993333",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FFCCCC",
+  Comment: "#998",
+  Gray: "#999",
+  GradientColors: ["#458", "#008080"],
 };
 
 export const GitHubLight: Theme = new Theme(
-  'GitHub Light',
-  'light',
+  "GitHub Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       color: githubLightColors.Foreground,
       background: githubLightColors.Background,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: githubLightColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: githubLightColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: githubLightColors.Foreground,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: githubLightColors.Foreground,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: githubLightColors.Foreground,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-number': {
+    "hljs-number": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-tag .hljs-attr': {
+    "hljs-tag .hljs-attr": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: githubLightColors.AccentRed,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: githubLightColors.AccentRed,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: githubLightColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: githubLightColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: githubLightColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-name': {
+    "hljs-name": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: githubLightColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: githubLightColors.AccentCyan,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: githubLightColors.AccentYellow,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: githubLightColors.AccentYellow,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: githubLightColors.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: githubLightColors.LightBlue,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: githubLightColors.Gray,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-deletion': {
-      background: '#fdd',
+    "hljs-deletion": {
+      background: "#fdd",
     },
-    'hljs-addition': {
-      background: '#dfd',
+    "hljs-addition": {
+      background: "#dfd",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   githubLightColors,
diff --git a/apps/airiscode-cli/src/ui/themes/googlecode.ts b/apps/airiscode-cli/src/ui/themes/googlecode.ts
index 09a41cb44..502fa44f8 100644
--- a/apps/airiscode-cli/src/ui/themes/googlecode.ts
+++ b/apps/airiscode-cli/src/ui/themes/googlecode.ts
@@ -4,142 +4,142 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme, lightTheme } from './theme.js';
+import { type ColorsTheme, lightTheme, Theme } from "./theme.js";
 
 const googleCodeColors: ColorsTheme = {
-  type: 'light',
-  Background: 'white',
-  Foreground: '#444',
-  LightBlue: '#066',
-  AccentBlue: '#008',
-  AccentPurple: '#606',
-  AccentCyan: '#066',
-  AccentGreen: '#080',
-  AccentYellow: '#660',
-  AccentRed: '#800',
-  AccentYellowDim: '#8B7000',
-  AccentRedDim: '#993333',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FEDEDE',
-  Comment: '#5f6368',
+  type: "light",
+  Background: "white",
+  Foreground: "#444",
+  LightBlue: "#066",
+  AccentBlue: "#008",
+  AccentPurple: "#606",
+  AccentCyan: "#066",
+  AccentGreen: "#080",
+  AccentYellow: "#660",
+  AccentRed: "#800",
+  AccentYellowDim: "#8B7000",
+  AccentRedDim: "#993333",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FEDEDE",
+  Comment: "#5f6368",
   Gray: lightTheme.Gray,
-  GradientColors: ['#066', '#606'],
+  GradientColors: ["#066", "#606"],
 };
 
 export const GoogleCode: Theme = new Theme(
-  'Google Code',
-  'light',
+  "Google Code",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: googleCodeColors.Background,
       color: googleCodeColors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: googleCodeColors.AccentRed,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: googleCodeColors.AccentRed,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: googleCodeColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: googleCodeColors.Foreground,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: googleCodeColors.Foreground,
     },
-    'hljs-formula': {
-      backgroundColor: '#eee',
-      fontStyle: 'italic',
+    "hljs-formula": {
+      backgroundColor: "#eee",
+      fontStyle: "italic",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-addition': {
-      backgroundColor: '#baeeba',
+    "hljs-addition": {
+      backgroundColor: "#baeeba",
     },
-    'hljs-deletion': {
-      backgroundColor: '#ffc8bd',
+    "hljs-deletion": {
+      backgroundColor: "#ffc8bd",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   googleCodeColors,
diff --git a/apps/airiscode-cli/src/ui/themes/no-color.ts b/apps/airiscode-cli/src/ui/themes/no-color.ts
index c3a7cbce4..00a567cd3 100644
--- a/apps/airiscode-cli/src/ui/themes/no-color.ts
+++ b/apps/airiscode-cli/src/ui/themes/no-color.ts
@@ -4,126 +4,126 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ColorsTheme } from './theme.js';
-import { Theme } from './theme.js';
-import type { SemanticColors } from './semantic-tokens.js';
+import type { SemanticColors } from "./semantic-tokens.js";
+import type { ColorsTheme } from "./theme.js";
+import { Theme } from "./theme.js";
 
 const noColorColorsTheme: ColorsTheme = {
-  type: 'ansi',
-  Background: '',
-  Foreground: '',
-  LightBlue: '',
-  AccentBlue: '',
-  AccentPurple: '',
-  AccentCyan: '',
-  AccentGreen: '',
-  AccentYellow: '',
-  AccentRed: '',
-  AccentYellowDim: '',
-  AccentRedDim: '',
-  DiffAdded: '',
-  DiffRemoved: '',
-  Comment: '',
-  Gray: '',
+  type: "ansi",
+  Background: "",
+  Foreground: "",
+  LightBlue: "",
+  AccentBlue: "",
+  AccentPurple: "",
+  AccentCyan: "",
+  AccentGreen: "",
+  AccentYellow: "",
+  AccentRed: "",
+  AccentYellowDim: "",
+  AccentRedDim: "",
+  DiffAdded: "",
+  DiffRemoved: "",
+  Comment: "",
+  Gray: "",
 };
 
 const noColorSemanticColors: SemanticColors = {
   text: {
-    primary: '',
-    secondary: '',
-    link: '',
-    accent: '',
-    code: '',
+    primary: "",
+    secondary: "",
+    link: "",
+    accent: "",
+    code: "",
   },
   background: {
-    primary: '',
+    primary: "",
     diff: {
-      added: '',
-      removed: '',
+      added: "",
+      removed: "",
     },
   },
   border: {
-    default: '',
-    focused: '',
+    default: "",
+    focused: "",
   },
   ui: {
-    comment: '',
-    symbol: '',
+    comment: "",
+    symbol: "",
     gradient: [],
   },
   status: {
-    error: '',
-    success: '',
-    warning: '',
-    errorDim: '',
-    warningDim: '',
+    error: "",
+    success: "",
+    warning: "",
+    errorDim: "",
+    warningDim: "",
   },
 };
 
 export const NoColorTheme: Theme = new Theme(
-  'NoColor',
-  'dark',
+  "NoColor",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
     },
-    'hljs-keyword': {},
-    'hljs-literal': {},
-    'hljs-symbol': {},
-    'hljs-name': {},
-    'hljs-link': {
-      textDecoration: 'underline',
+    "hljs-keyword": {},
+    "hljs-literal": {},
+    "hljs-symbol": {},
+    "hljs-name": {},
+    "hljs-link": {
+      textDecoration: "underline",
     },
-    'hljs-built_in': {},
-    'hljs-type': {},
-    'hljs-number': {},
-    'hljs-class': {},
-    'hljs-string': {},
-    'hljs-meta-string': {},
-    'hljs-regexp': {},
-    'hljs-template-tag': {},
-    'hljs-subst': {},
-    'hljs-function': {},
-    'hljs-title': {},
-    'hljs-params': {},
-    'hljs-formula': {},
-    'hljs-comment': {
-      fontStyle: 'italic',
+    "hljs-built_in": {},
+    "hljs-type": {},
+    "hljs-number": {},
+    "hljs-class": {},
+    "hljs-string": {},
+    "hljs-meta-string": {},
+    "hljs-regexp": {},
+    "hljs-template-tag": {},
+    "hljs-subst": {},
+    "hljs-function": {},
+    "hljs-title": {},
+    "hljs-params": {},
+    "hljs-formula": {},
+    "hljs-comment": {
+      fontStyle: "italic",
     },
-    'hljs-quote': {
-      fontStyle: 'italic',
+    "hljs-quote": {
+      fontStyle: "italic",
     },
-    'hljs-doctag': {},
-    'hljs-meta': {},
-    'hljs-meta-keyword': {},
-    'hljs-tag': {},
-    'hljs-variable': {},
-    'hljs-template-variable': {},
-    'hljs-attr': {},
-    'hljs-attribute': {},
-    'hljs-builtin-name': {},
-    'hljs-section': {},
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-doctag": {},
+    "hljs-meta": {},
+    "hljs-meta-keyword": {},
+    "hljs-tag": {},
+    "hljs-variable": {},
+    "hljs-template-variable": {},
+    "hljs-attr": {},
+    "hljs-attribute": {},
+    "hljs-builtin-name": {},
+    "hljs-section": {},
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-bullet': {},
-    'hljs-selector-tag': {},
-    'hljs-selector-id': {},
-    'hljs-selector-class': {},
-    'hljs-selector-attr': {},
-    'hljs-selector-pseudo': {},
-    'hljs-addition': {
-      display: 'inline-block',
-      width: '100%',
+    "hljs-bullet": {},
+    "hljs-selector-tag": {},
+    "hljs-selector-id": {},
+    "hljs-selector-class": {},
+    "hljs-selector-attr": {},
+    "hljs-selector-pseudo": {},
+    "hljs-addition": {
+      display: "inline-block",
+      width: "100%",
     },
-    'hljs-deletion': {
-      display: 'inline-block',
-      width: '100%',
+    "hljs-deletion": {
+      display: "inline-block",
+      width: "100%",
     },
   },
   noColorColorsTheme,
diff --git a/apps/airiscode-cli/src/ui/themes/qwen-dark.ts b/apps/airiscode-cli/src/ui/themes/qwen-dark.ts
index ab899a7c0..8df24a926 100644
--- a/apps/airiscode-cli/src/ui/themes/qwen-dark.ts
+++ b/apps/airiscode-cli/src/ui/themes/qwen-dark.ts
@@ -4,110 +4,110 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { darkSemanticColors } from './semantic-tokens.js';
+import { darkSemanticColors } from "./semantic-tokens.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const qwenDarkColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#0b0e14',
-  Foreground: '#bfbdb6',
-  LightBlue: '#59C2FF',
-  AccentBlue: '#39BAE6',
-  AccentPurple: '#D2A6FF',
-  AccentCyan: '#95E6CB',
-  AccentGreen: '#AAD94C',
-  AccentYellow: '#FFD700',
-  AccentRed: '#F26D78',
-  AccentYellowDim: '#8B7530',
-  AccentRedDim: '#8B3A4A',
-  DiffAdded: '#AAD94C',
-  DiffRemoved: '#F26D78',
-  Comment: '#646A71',
-  Gray: '#3D4149',
-  GradientColors: ['#FFD700', '#da7959'],
+  type: "dark",
+  Background: "#0b0e14",
+  Foreground: "#bfbdb6",
+  LightBlue: "#59C2FF",
+  AccentBlue: "#39BAE6",
+  AccentPurple: "#D2A6FF",
+  AccentCyan: "#95E6CB",
+  AccentGreen: "#AAD94C",
+  AccentYellow: "#FFD700",
+  AccentRed: "#F26D78",
+  AccentYellowDim: "#8B7530",
+  AccentRedDim: "#8B3A4A",
+  DiffAdded: "#AAD94C",
+  DiffRemoved: "#F26D78",
+  Comment: "#646A71",
+  Gray: "#3D4149",
+  GradientColors: ["#FFD700", "#da7959"],
 };
 
 export const QwenDark: Theme = new Theme(
-  'Qwen Dark',
-  'dark',
+  "Qwen Dark",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: qwenDarkColors.Background,
       color: qwenDarkColors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: qwenDarkColors.AccentPurple,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: qwenDarkColors.AccentCyan,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: qwenDarkColors.LightBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: qwenDarkColors.AccentBlue,
     },
-    'hljs-function .hljs-keyword': {
+    "hljs-function .hljs-keyword": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: qwenDarkColors.Foreground,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: qwenDarkColors.AccentGreen,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: qwenDarkColors.AccentBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: qwenDarkColors.AccentGreen,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: qwenDarkColors.Foreground,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: qwenDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: qwenDarkColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: qwenDarkColors.AccentRed,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: qwenDarkColors.AccentYellow,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   qwenDarkColors,
diff --git a/apps/airiscode-cli/src/ui/themes/qwen-light.ts b/apps/airiscode-cli/src/ui/themes/qwen-light.ts
index 325be2aaf..1a90fd0f6 100644
--- a/apps/airiscode-cli/src/ui/themes/qwen-light.ts
+++ b/apps/airiscode-cli/src/ui/themes/qwen-light.ts
@@ -4,135 +4,135 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { lightSemanticColors } from './semantic-tokens.js';
+import { lightSemanticColors } from "./semantic-tokens.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const qwenLightColors: ColorsTheme = {
-  type: 'light',
-  Background: '#f8f9fa',
-  Foreground: '#5c6166',
-  LightBlue: '#55b4d4',
-  AccentBlue: '#399ee6',
-  AccentPurple: '#a37acc',
-  AccentCyan: '#4cbf99',
-  AccentGreen: '#86b300',
-  AccentYellow: '#f2ae49',
-  AccentRed: '#f07171',
-  AccentYellowDim: '#8B7000',
-  AccentRedDim: '#993333',
-  DiffAdded: '#86b300',
-  DiffRemoved: '#f07171',
-  Comment: '#ABADB1',
-  Gray: '#CCCFD3',
-  GradientColors: ['#399ee6', '#86b300'],
+  type: "light",
+  Background: "#f8f9fa",
+  Foreground: "#5c6166",
+  LightBlue: "#55b4d4",
+  AccentBlue: "#399ee6",
+  AccentPurple: "#a37acc",
+  AccentCyan: "#4cbf99",
+  AccentGreen: "#86b300",
+  AccentYellow: "#f2ae49",
+  AccentRed: "#f07171",
+  AccentYellowDim: "#8B7000",
+  AccentRedDim: "#993333",
+  DiffAdded: "#86b300",
+  DiffRemoved: "#f07171",
+  Comment: "#ABADB1",
+  Gray: "#CCCFD3",
+  GradientColors: ["#399ee6", "#86b300"],
 };
 
 export const QwenLight: Theme = new Theme(
-  'Qwen Light',
-  'light',
+  "Qwen Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: qwenLightColors.Background,
       color: qwenLightColors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: qwenLightColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: qwenLightColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-string': {
+    "hljs-string": {
       color: qwenLightColors.AccentGreen,
     },
-    'hljs-constant': {
+    "hljs-constant": {
       color: qwenLightColors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: qwenLightColors.AccentPurple,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: qwenLightColors.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: qwenLightColors.AccentYellow,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: qwenLightColors.AccentYellow,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: qwenLightColors.Foreground,
     },
-    'hljs-variable.language': {
+    "hljs-variable.language": {
       color: qwenLightColors.LightBlue,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-title': {
+    "hljs-title": {
       color: qwenLightColors.AccentBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: qwenLightColors.AccentGreen,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: qwenLightColors.LightBlue,
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: qwenLightColors.AccentBlue,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: qwenLightColors.LightBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: qwenLightColors.AccentBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: qwenLightColors.AccentYellow,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: qwenLightColors.AccentYellow,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: qwenLightColors.AccentRed,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: qwenLightColors.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: qwenLightColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: qwenLightColors.LightBlue,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: qwenLightColors.AccentRed,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: qwenLightColors.AccentGreen,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: qwenLightColors.AccentCyan,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: qwenLightColors.AccentRed,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: qwenLightColors.AccentRed,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: qwenLightColors.AccentCyan,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: qwenLightColors.AccentRed,
     },
   },
diff --git a/apps/airiscode-cli/src/ui/themes/semantic-tokens.ts b/apps/airiscode-cli/src/ui/themes/semantic-tokens.ts
index d3047f0f0..597622cc9 100644
--- a/apps/airiscode-cli/src/ui/themes/semantic-tokens.ts
+++ b/apps/airiscode-cli/src/ui/themes/semantic-tokens.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lightTheme, darkTheme, ansiTheme } from './theme.js';
+import { ansiTheme, darkTheme, lightTheme } from "./theme.js";
 
 export interface SemanticColors {
   text: {
diff --git a/apps/airiscode-cli/src/ui/themes/shades-of-purple.ts b/apps/airiscode-cli/src/ui/themes/shades-of-purple.ts
index b0f7b9a9b..d71c70e98 100644
--- a/apps/airiscode-cli/src/ui/themes/shades-of-purple.ts
+++ b/apps/airiscode-cli/src/ui/themes/shades-of-purple.ts
@@ -8,344 +8,344 @@
  * Shades of Purple Theme — for Highlight.js.
  * @author Ahmad Awais <https://twitter.com/mrahmadawais/>
  */
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const shadesOfPurpleColors: ColorsTheme = {
-  type: 'dark',
+  type: "dark",
   // Required colors for ColorsTheme interface
-  Background: '#2d2b57', // Main background
-  Foreground: '#e3dfff', // Default text color (hljs, hljs-subst)
-  LightBlue: '#847ace', // Light blue/purple accent
-  AccentBlue: '#a599e9', // Borders, secondary blue
-  AccentPurple: '#ac65ff', // Comments (main purple)
-  AccentCyan: '#a1feff', // Names
-  AccentGreen: '#A5FF90', // Strings and many others
-  AccentYellow: '#fad000', // Title, main yellow
-  AccentRed: '#ff628c', // Error/deletion accent
-  AccentYellowDim: '#8B7530',
-  AccentRedDim: '#8B3A4A',
-  DiffAdded: '#383E45',
-  DiffRemoved: '#572244',
-  Comment: '#B362FF', // Comment color (same as AccentPurple)
-  Gray: '#726c86', // Gray color
-  GradientColors: ['#4d21fc', '#847ace', '#ff628c'],
+  Background: "#2d2b57", // Main background
+  Foreground: "#e3dfff", // Default text color (hljs, hljs-subst)
+  LightBlue: "#847ace", // Light blue/purple accent
+  AccentBlue: "#a599e9", // Borders, secondary blue
+  AccentPurple: "#ac65ff", // Comments (main purple)
+  AccentCyan: "#a1feff", // Names
+  AccentGreen: "#A5FF90", // Strings and many others
+  AccentYellow: "#fad000", // Title, main yellow
+  AccentRed: "#ff628c", // Error/deletion accent
+  AccentYellowDim: "#8B7530",
+  AccentRedDim: "#8B3A4A",
+  DiffAdded: "#383E45",
+  DiffRemoved: "#572244",
+  Comment: "#B362FF", // Comment color (same as AccentPurple)
+  Gray: "#726c86", // Gray color
+  GradientColors: ["#4d21fc", "#847ace", "#ff628c"],
 };
 
 // Additional colors from CSS that don't fit in the ColorsTheme interface
 const additionalColors = {
-  AccentYellowAlt: '#f8d000', // Attr yellow (slightly different)
-  AccentOrange: '#fb9e00', // Keywords, built_in, meta
-  AccentPink: '#fa658d', // Numbers, literals
-  AccentLightPurple: '#c991ff', // For params and properties
-  AccentDarkPurple: '#6943ff', // For operators
-  AccentTeal: '#2ee2fa', // For special constructs
+  AccentYellowAlt: "#f8d000", // Attr yellow (slightly different)
+  AccentOrange: "#fb9e00", // Keywords, built_in, meta
+  AccentPink: "#fa658d", // Numbers, literals
+  AccentLightPurple: "#c991ff", // For params and properties
+  AccentDarkPurple: "#6943ff", // For operators
+  AccentTeal: "#2ee2fa", // For special constructs
 };
 
 export const ShadesOfPurple = new Theme(
-  'Shades Of Purple',
-  'dark',
+  "Shades Of Purple",
+  "dark",
   {
     // Base styles
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
+      display: "block",
+      overflowX: "auto",
       background: shadesOfPurpleColors.Background,
       color: shadesOfPurpleColors.Foreground,
     },
 
     // Title elements
-    'hljs-title': {
+    "hljs-title": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
 
     // Names
-    'hljs-name': {
+    "hljs-name": {
       color: shadesOfPurpleColors.AccentCyan,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
 
     // Tags
-    'hljs-tag': {
+    "hljs-tag": {
       color: shadesOfPurpleColors.Foreground,
     },
 
     // Attributes
-    'hljs-attr': {
+    "hljs-attr": {
       color: additionalColors.AccentYellowAlt,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
 
     // Built-ins, selector tags, sections
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: additionalColors.AccentOrange,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: additionalColors.AccentOrange,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: additionalColors.AccentOrange,
     },
 
     // Keywords
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: additionalColors.AccentOrange,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
 
     // Default text and substitutions
-    'hljs-subst': {
+    "hljs-subst": {
       color: shadesOfPurpleColors.Foreground,
     },
 
     // Strings and related elements (all green)
-    'hljs-string': {
+    "hljs-string": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-code': {
+    "hljs-code": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: shadesOfPurpleColors.AccentRed,
     },
 
     // Meta elements
-    'hljs-meta': {
+    "hljs-meta": {
       color: additionalColors.AccentOrange,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: additionalColors.AccentOrange,
     },
 
     // Comments
-    'hljs-comment': {
+    "hljs-comment": {
       color: shadesOfPurpleColors.AccentPurple,
     },
 
     // Literals and numbers
-    'hljs-literal': {
+    "hljs-literal": {
       color: additionalColors.AccentPink,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-number': {
+    "hljs-number": {
       color: additionalColors.AccentPink,
     },
 
     // Emphasis and strong
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
 
     // Diff-specific classes
-    'hljs-diff': {
+    "hljs-diff": {
       color: shadesOfPurpleColors.Foreground,
     },
-    'hljs-meta.hljs-diff': {
+    "hljs-meta.hljs-diff": {
       color: shadesOfPurpleColors.AccentBlue,
     },
-    'hljs-ln': {
+    "hljs-ln": {
       color: shadesOfPurpleColors.Gray,
     },
 
     // Additional elements that might be needed
-    'hljs-type': {
+    "hljs-type": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: shadesOfPurpleColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-function .hljs-keyword': {
+    "hljs-function .hljs-keyword": {
       color: additionalColors.AccentOrange,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: shadesOfPurpleColors.LightBlue,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
 
     // Function parameters
-    'hljs-params': {
+    "hljs-params": {
       color: additionalColors.AccentLightPurple,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
 
     // Class definitions
-    'hljs-class': {
+    "hljs-class": {
       color: shadesOfPurpleColors.AccentCyan,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Function definitions
-    'hljs-function': {
+    "hljs-function": {
       color: shadesOfPurpleColors.AccentCyan,
     },
 
     // Object properties
-    'hljs-property': {
+    "hljs-property": {
       color: shadesOfPurpleColors.AccentBlue,
     },
 
     // Operators
-    'hljs-operator': {
+    "hljs-operator": {
       color: additionalColors.AccentDarkPurple,
     },
 
     // Punctuation (if supported by the parser)
-    'hljs-punctuation': {
+    "hljs-punctuation": {
       color: shadesOfPurpleColors.Gray,
     },
 
     // CSS ID selectors
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Character literals
-    'hljs-char': {
+    "hljs-char": {
       color: shadesOfPurpleColors.AccentGreen,
     },
 
     // Escape sequences
-    'hljs-escape': {
+    "hljs-escape": {
       color: additionalColors.AccentPink,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Meta keywords
-    'hljs-meta-keyword': {
+    "hljs-meta-keyword": {
       color: additionalColors.AccentOrange,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Built-in names
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: additionalColors.AccentTeal,
     },
 
     // Modules
-    'hljs-module': {
+    "hljs-module": {
       color: shadesOfPurpleColors.AccentCyan,
     },
 
     // Namespaces
-    'hljs-namespace': {
+    "hljs-namespace": {
       color: shadesOfPurpleColors.LightBlue,
     },
 
     // Important annotations
-    'hljs-important': {
+    "hljs-important": {
       color: shadesOfPurpleColors.AccentRed,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Formulas (for LaTeX, etc.)
-    'hljs-formula': {
+    "hljs-formula": {
       color: shadesOfPurpleColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
 
     // Language-specific additions
     // Python decorators
-    'hljs-decorator': {
+    "hljs-decorator": {
       color: additionalColors.AccentTeal,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Ruby symbols
-    'hljs-symbol.ruby': {
+    "hljs-symbol.ruby": {
       color: additionalColors.AccentPink,
     },
 
     // SQL keywords
-    'hljs-keyword.sql': {
+    "hljs-keyword.sql": {
       color: additionalColors.AccentOrange,
-      textTransform: 'uppercase',
+      textTransform: "uppercase",
     },
 
     // Markdown specific
-    'hljs-section.markdown': {
+    "hljs-section.markdown": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // JSON keys
-    'hljs-attr.json': {
+    "hljs-attr.json": {
       color: shadesOfPurpleColors.AccentCyan,
     },
 
     // XML/HTML specific
-    'hljs-tag .hljs-name': {
+    "hljs-tag .hljs-name": {
       color: shadesOfPurpleColors.AccentRed,
     },
-    'hljs-tag .hljs-attr': {
+    "hljs-tag .hljs-attr": {
       color: additionalColors.AccentYellowAlt,
     },
 
     // Line highlighting (if line numbers are enabled)
-    'hljs.hljs-line-numbers': {
+    "hljs.hljs-line-numbers": {
       borderRight: `1px solid ${shadesOfPurpleColors.Gray}`,
     },
-    'hljs.hljs-line-numbers .hljs-ln-numbers': {
+    "hljs.hljs-line-numbers .hljs-ln-numbers": {
       color: shadesOfPurpleColors.Gray,
-      paddingRight: '1em',
+      paddingRight: "1em",
     },
-    'hljs.hljs-line-numbers .hljs-ln-code': {
-      paddingLeft: '1em',
+    "hljs.hljs-line-numbers .hljs-ln-code": {
+      paddingLeft: "1em",
     },
 
     // Selection styling
-    'hljs::selection': {
-      background: shadesOfPurpleColors.AccentBlue + '40', // 40 = 25% opacity
+    "hljs::selection": {
+      background: shadesOfPurpleColors.AccentBlue + "40", // 40 = 25% opacity
     },
-    'hljs ::-moz-selection': {
-      background: shadesOfPurpleColors.AccentBlue + '40',
+    "hljs ::-moz-selection": {
+      background: shadesOfPurpleColors.AccentBlue + "40",
     },
 
     // Highlighted lines (for emphasis)
-    'hljs .hljs-highlight': {
-      background: shadesOfPurpleColors.AccentPurple + '20', // 20 = 12.5% opacity
-      display: 'block',
-      width: '100%',
+    "hljs .hljs-highlight": {
+      background: shadesOfPurpleColors.AccentPurple + "20", // 20 = 12.5% opacity
+      display: "block",
+      width: "100%",
     },
   },
   shadesOfPurpleColors,
diff --git a/apps/airiscode-cli/src/ui/themes/theme-manager.ts b/apps/airiscode-cli/src/ui/themes/theme-manager.ts
index ae8ad608c..6d5f87290 100644
--- a/apps/airiscode-cli/src/ui/themes/theme-manager.ts
+++ b/apps/airiscode-cli/src/ui/themes/theme-manager.ts
@@ -4,32 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AyuDark } from './ayu.js';
-import { AyuLight } from './ayu-light.js';
-import { AtomOneDark } from './atom-one-dark.js';
-import { Dracula } from './dracula.js';
-import { GitHubDark } from './github-dark.js';
-import { GitHubLight } from './github-light.js';
-import { GoogleCode } from './googlecode.js';
-import { DefaultLight } from './default-light.js';
-import { DefaultDark } from './default.js';
-import { ShadesOfPurple } from './shades-of-purple.js';
-import { XCode } from './xcode.js';
-import { QwenLight } from './qwen-light.js';
-import { QwenDark } from './qwen-dark.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import type { Theme, ThemeType, CustomTheme } from './theme.js';
-import { createCustomTheme, validateCustomTheme } from './theme.js';
-import type { SemanticColors } from './semantic-tokens.js';
-import { ANSI } from './ansi.js';
-import { ANSILight } from './ansi-light.js';
-import { NoColorTheme } from './no-color.js';
-import process from 'node:process';
-import { createDebugLogger } from '@airiscode/core';
-
-const debugLogger = createDebugLogger('THEME_MANAGER');
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import process from "node:process";
+import { createDebugLogger } from "@airiscode/core";
+import { ANSI } from "./ansi.js";
+import { ANSILight } from "./ansi-light.js";
+import { AtomOneDark } from "./atom-one-dark.js";
+import { AyuDark } from "./ayu.js";
+import { AyuLight } from "./ayu-light.js";
+import { DefaultDark } from "./default.js";
+import { DefaultLight } from "./default-light.js";
+import { Dracula } from "./dracula.js";
+import { GitHubDark } from "./github-dark.js";
+import { GitHubLight } from "./github-light.js";
+import { GoogleCode } from "./googlecode.js";
+import { NoColorTheme } from "./no-color.js";
+import { QwenDark } from "./qwen-dark.js";
+import { QwenLight } from "./qwen-light.js";
+import type { SemanticColors } from "./semantic-tokens.js";
+import { ShadesOfPurple } from "./shades-of-purple.js";
+import type { CustomTheme, Theme, ThemeType } from "./theme.js";
+import { createCustomTheme, validateCustomTheme } from "./theme.js";
+import { XCode } from "./xcode.js";
+
+const debugLogger = createDebugLogger("THEME_MANAGER");
 
 export interface ThemeDisplay {
   name: string;
@@ -76,9 +76,7 @@ class ThemeManager {
       return;
     }
 
-    for (const [name, customThemeConfig] of Object.entries(
-      customThemesSettings,
-    )) {
+    for (const [name, customThemeConfig] of Object.entries(customThemesSettings)) {
       const validation = validateCustomTheme(customThemeConfig);
       if (validation.isValid) {
         if (validation.warning) {
@@ -88,7 +86,7 @@ class ThemeManager {
           ...DEFAULT_THEME.colors,
           ...customThemeConfig,
           name: customThemeConfig.name || name,
-          type: 'custom',
+          type: "custom",
         };
 
         try {
@@ -104,7 +102,7 @@ class ThemeManager {
     // If the current active theme is a custom theme, keep it if still valid
     if (
       this.activeTheme &&
-      this.activeTheme.type === 'custom' &&
+      this.activeTheme.type === "custom" &&
       this.customThemes.has(this.activeTheme.name)
     ) {
       this.activeTheme = this.customThemes.get(this.activeTheme.name)!;
@@ -130,17 +128,13 @@ class ThemeManager {
    * @returns The active theme.
    */
   getActiveTheme(): Theme {
-    if (process.env['NO_COLOR']) {
+    if (process.env["NO_COLOR"]) {
       return NoColorTheme;
     }
 
     if (this.activeTheme) {
-      const isBuiltIn = this.availableThemes.some(
-        (t) => t.name === this.activeTheme.name,
-      );
-      const isCustom = [...this.customThemes.values()].includes(
-        this.activeTheme,
-      );
+      const isBuiltIn = this.availableThemes.some((t) => t.name === this.activeTheme.name);
+      const isCustom = [...this.customThemes.values()].includes(this.activeTheme);
 
       if (isBuiltIn || isCustom) {
         return this.activeTheme;
@@ -187,13 +181,11 @@ class ThemeManager {
       isCustom: false,
     }));
 
-    const customThemes = Array.from(this.customThemes.values()).map(
-      (theme) => ({
-        name: theme.name,
-        type: theme.type,
-        isCustom: true,
-      }),
-    );
+    const customThemes = Array.from(this.customThemes.values()).map((theme) => ({
+      name: theme.name,
+      type: theme.type,
+      isCustom: true,
+    }));
 
     // Separate Qwen themes
     const qwenThemes = builtInThemes.filter(
@@ -204,30 +196,28 @@ class ThemeManager {
     );
 
     // Sort other themes by type and then name
-    const sortedOtherThemes = [...otherBuiltInThemes, ...customThemes].sort(
-      (a, b) => {
-        const typeOrder = (type: ThemeType): number => {
-          switch (type) {
-            case 'dark':
-              return 1;
-            case 'light':
-              return 2;
-            case 'ansi':
-              return 3;
-            case 'custom':
-              return 4; // Custom themes at the end
-            default:
-              return 5;
-          }
-        };
-
-        const typeComparison = typeOrder(a.type) - typeOrder(b.type);
-        if (typeComparison !== 0) {
-          return typeComparison;
+    const sortedOtherThemes = [...otherBuiltInThemes, ...customThemes].sort((a, b) => {
+      const typeOrder = (type: ThemeType): number => {
+        switch (type) {
+          case "dark":
+            return 1;
+          case "light":
+            return 2;
+          case "ansi":
+            return 3;
+          case "custom":
+            return 4; // Custom themes at the end
+          default:
+            return 5;
         }
-        return a.name.localeCompare(b.name);
-      },
-    );
+      };
+
+      const typeComparison = typeOrder(a.type) - typeOrder(b.type);
+      if (typeComparison !== 0) {
+        return typeComparison;
+      }
+      return a.name.localeCompare(b.name);
+    });
 
     // Combine Qwen themes first, then sorted others
     return [...qwenThemes, ...sortedOtherThemes];
@@ -243,11 +233,7 @@ class ThemeManager {
   }
 
   private isPath(themeName: string): boolean {
-    return (
-      themeName.endsWith('.json') ||
-      themeName.startsWith('.') ||
-      path.isAbsolute(themeName)
-    );
+    return themeName.endsWith(".json") || themeName.startsWith(".") || path.isAbsolute(themeName);
   }
 
   private loadThemeFromFile(themePath: string): Theme | undefined {
@@ -271,14 +257,12 @@ class ThemeManager {
       }
 
       // 3. Read, parse, and validate the theme file.
-      const themeContent = fs.readFileSync(canonicalPath, 'utf-8');
+      const themeContent = fs.readFileSync(canonicalPath, "utf-8");
       const customThemeConfig = JSON.parse(themeContent) as CustomTheme;
 
       const validation = validateCustomTheme(customThemeConfig);
       if (!validation.isValid) {
-        debugLogger.warn(
-          `Invalid custom theme from file "${themePath}": ${validation.error}`,
-        );
+        debugLogger.warn(`Invalid custom theme from file "${themePath}": ${validation.error}`);
         return undefined;
       }
 
@@ -291,7 +275,7 @@ class ThemeManager {
         ...DEFAULT_THEME.colors,
         ...customThemeConfig,
         name: customThemeConfig.name || canonicalPath,
-        type: 'custom',
+        type: "custom",
       };
 
       const theme = createCustomTheme(themeWithDefaults);
@@ -300,13 +284,8 @@ class ThemeManager {
     } catch (error) {
       // Any error in the process (file not found, bad JSON, etc.) is caught here.
       // We can return undefined silently for file-not-found, and warn for others.
-      if (
-        !(error instanceof Error && 'code' in error && error.code === 'ENOENT')
-      ) {
-        debugLogger.warn(
-          `Could not load theme from file "${themePath}":`,
-          error,
-        );
+      if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) {
+        debugLogger.warn(`Could not load theme from file "${themePath}":`, error);
       }
       return undefined;
     }
@@ -318,9 +297,7 @@ class ThemeManager {
     }
 
     // First check built-in themes
-    const builtInTheme = this.availableThemes.find(
-      (theme) => theme.name === themeName,
-    );
+    const builtInTheme = this.availableThemes.find((theme) => theme.name === themeName);
     if (builtInTheme) {
       return builtInTheme;
     }
diff --git a/apps/airiscode-cli/src/ui/themes/theme.ts b/apps/airiscode-cli/src/ui/themes/theme.ts
index 5fee07729..67af7d295 100644
--- a/apps/airiscode-cli/src/ui/themes/theme.ts
+++ b/apps/airiscode-cli/src/ui/themes/theme.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CSSProperties } from 'react';
-import type { SemanticColors } from './semantic-tokens.js';
-import { resolveColor } from './color-utils.js';
+import type { CSSProperties } from "react";
+import { resolveColor } from "./color-utils.js";
+import type { SemanticColors } from "./semantic-tokens.js";
 
-export type ThemeType = 'light' | 'dark' | 'ansi' | 'custom';
+export type ThemeType = "light" | "dark" | "ansi" | "custom";
 
 export interface ColorsTheme {
   type: ThemeType;
@@ -32,7 +32,7 @@ export interface ColorsTheme {
 }
 
 export interface CustomTheme {
-  type: 'custom';
+  type: "custom";
   name: string;
 
   text?: {
@@ -86,62 +86,62 @@ export interface CustomTheme {
 }
 
 export const lightTheme: ColorsTheme = {
-  type: 'light',
-  Background: '#FAFAFA',
-  Foreground: '',
-  LightBlue: '#89BDCD',
-  AccentBlue: '#3B82F6',
-  AccentPurple: '#8B5CF6',
-  AccentCyan: '#06B6D4',
-  AccentGreen: '#3CA84B',
-  AccentYellow: '#D5A40A',
-  AccentRed: '#DD4C4C',
-  AccentYellowDim: '#8B7000',
-  AccentRedDim: '#993333',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FFCCCC',
-  Comment: '#008000',
-  Gray: '#97a0b0',
-  GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
+  type: "light",
+  Background: "#FAFAFA",
+  Foreground: "",
+  LightBlue: "#89BDCD",
+  AccentBlue: "#3B82F6",
+  AccentPurple: "#8B5CF6",
+  AccentCyan: "#06B6D4",
+  AccentGreen: "#3CA84B",
+  AccentYellow: "#D5A40A",
+  AccentRed: "#DD4C4C",
+  AccentYellowDim: "#8B7000",
+  AccentRedDim: "#993333",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FFCCCC",
+  Comment: "#008000",
+  Gray: "#97a0b0",
+  GradientColors: ["#4796E4", "#847ACE", "#C3677F"],
 };
 
 export const darkTheme: ColorsTheme = {
-  type: 'dark',
-  Background: '#1E1E2E',
-  Foreground: '',
-  LightBlue: '#ADD8E6',
-  AccentBlue: '#89B4FA',
-  AccentPurple: '#CBA6F7',
-  AccentCyan: '#89DCEB',
-  AccentGreen: '#A6E3A1',
-  AccentYellow: '#F9E2AF',
-  AccentRed: '#F38BA8',
-  AccentYellowDim: '#8B7530',
-  AccentRedDim: '#8B3A4A',
-  DiffAdded: '#28350B',
-  DiffRemoved: '#430000',
-  Comment: '#6C7086',
-  Gray: '#6C7086',
-  GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
+  type: "dark",
+  Background: "#1E1E2E",
+  Foreground: "",
+  LightBlue: "#ADD8E6",
+  AccentBlue: "#89B4FA",
+  AccentPurple: "#CBA6F7",
+  AccentCyan: "#89DCEB",
+  AccentGreen: "#A6E3A1",
+  AccentYellow: "#F9E2AF",
+  AccentRed: "#F38BA8",
+  AccentYellowDim: "#8B7530",
+  AccentRedDim: "#8B3A4A",
+  DiffAdded: "#28350B",
+  DiffRemoved: "#430000",
+  Comment: "#6C7086",
+  Gray: "#6C7086",
+  GradientColors: ["#4796E4", "#847ACE", "#C3677F"],
 };
 
 export const ansiTheme: ColorsTheme = {
-  type: 'ansi',
-  Background: 'black',
-  Foreground: 'white',
-  LightBlue: 'blue',
-  AccentBlue: 'blue',
-  AccentPurple: 'magenta',
-  AccentCyan: 'cyan',
-  AccentGreen: 'green',
-  AccentYellow: 'yellow',
-  AccentRed: 'red',
-  AccentYellowDim: 'yellow',
-  AccentRedDim: 'red',
-  DiffAdded: 'green',
-  DiffRemoved: 'red',
-  Comment: 'gray',
-  Gray: 'gray',
+  type: "ansi",
+  Background: "black",
+  Foreground: "white",
+  LightBlue: "blue",
+  AccentBlue: "blue",
+  AccentPurple: "magenta",
+  AccentCyan: "cyan",
+  AccentGreen: "green",
+  AccentYellow: "yellow",
+  AccentRed: "red",
+  AccentYellowDim: "yellow",
+  AccentRedDim: "red",
+  DiffAdded: "green",
+  DiffRemoved: "red",
+  Comment: "gray",
+  Gray: "gray",
 };
 
 export class Theme {
@@ -204,10 +204,8 @@ export class Theme {
     this._colorMap = Object.freeze(this._buildColorMap(rawMappings)); // Build and freeze the map
 
     // Determine the default foreground color
-    const rawDefaultColor = rawMappings['hljs']?.color;
-    this.defaultColor =
-      (rawDefaultColor ? Theme._resolveColor(rawDefaultColor) : undefined) ??
-      ''; // Default to empty string if not found or resolvable
+    const rawDefaultColor = rawMappings["hljs"]?.color;
+    this.defaultColor = (rawDefaultColor ? Theme._resolveColor(rawDefaultColor) : undefined) ?? ""; // Default to empty string if not found or resolvable
   }
 
   /**
@@ -234,13 +232,11 @@ export class Theme {
    * @param hljsTheme The raw CSSProperties mappings from a react-syntax-highlighter theme object.
    * @returns An Ink-compatible theme map (Record<string, string>).
    */
-  protected _buildColorMap(
-    hljsTheme: Record<string, CSSProperties>,
-  ): Record<string, string> {
+  protected _buildColorMap(hljsTheme: Record<string, CSSProperties>): Record<string, string> {
     const inkTheme: Record<string, string> = {};
     for (const key in hljsTheme) {
       // Ensure the key starts with 'hljs-' or is 'hljs' for the base style
-      if (!key.startsWith('hljs-') && key !== 'hljs') {
+      if (!key.startsWith("hljs-") && key !== "hljs") {
         continue; // Skip keys not related to highlighting classes
       }
 
@@ -268,164 +264,160 @@ export class Theme {
  */
 export function createCustomTheme(customTheme: CustomTheme): Theme {
   const colors: ColorsTheme = {
-    type: 'custom',
-    Background: customTheme.background?.primary ?? customTheme.Background ?? '',
-    Foreground: customTheme.text?.primary ?? customTheme.Foreground ?? '',
-    LightBlue: customTheme.text?.code ?? customTheme.LightBlue ?? '',
-    AccentBlue: customTheme.text?.link ?? customTheme.AccentBlue ?? '',
-    AccentPurple: customTheme.text?.accent ?? customTheme.AccentPurple ?? '',
-    AccentCyan: customTheme.text?.link ?? customTheme.AccentCyan ?? '',
-    AccentGreen: customTheme.status?.success ?? customTheme.AccentGreen ?? '',
-    AccentYellow: customTheme.status?.warning ?? customTheme.AccentYellow ?? '',
-    AccentRed: customTheme.status?.error ?? customTheme.AccentRed ?? '',
-    AccentYellowDim:
-      customTheme.status?.warningDim ?? customTheme.AccentYellowDim ?? '',
-    AccentRedDim:
-      customTheme.status?.errorDim ?? customTheme.AccentRedDim ?? '',
-    DiffAdded:
-      customTheme.background?.diff?.added ?? customTheme.DiffAdded ?? '',
-    DiffRemoved:
-      customTheme.background?.diff?.removed ?? customTheme.DiffRemoved ?? '',
-    Comment: customTheme.ui?.comment ?? customTheme.Comment ?? '',
-    Gray: customTheme.text?.secondary ?? customTheme.Gray ?? '',
+    type: "custom",
+    Background: customTheme.background?.primary ?? customTheme.Background ?? "",
+    Foreground: customTheme.text?.primary ?? customTheme.Foreground ?? "",
+    LightBlue: customTheme.text?.code ?? customTheme.LightBlue ?? "",
+    AccentBlue: customTheme.text?.link ?? customTheme.AccentBlue ?? "",
+    AccentPurple: customTheme.text?.accent ?? customTheme.AccentPurple ?? "",
+    AccentCyan: customTheme.text?.link ?? customTheme.AccentCyan ?? "",
+    AccentGreen: customTheme.status?.success ?? customTheme.AccentGreen ?? "",
+    AccentYellow: customTheme.status?.warning ?? customTheme.AccentYellow ?? "",
+    AccentRed: customTheme.status?.error ?? customTheme.AccentRed ?? "",
+    AccentYellowDim: customTheme.status?.warningDim ?? customTheme.AccentYellowDim ?? "",
+    AccentRedDim: customTheme.status?.errorDim ?? customTheme.AccentRedDim ?? "",
+    DiffAdded: customTheme.background?.diff?.added ?? customTheme.DiffAdded ?? "",
+    DiffRemoved: customTheme.background?.diff?.removed ?? customTheme.DiffRemoved ?? "",
+    Comment: customTheme.ui?.comment ?? customTheme.Comment ?? "",
+    Gray: customTheme.text?.secondary ?? customTheme.Gray ?? "",
     GradientColors: customTheme.ui?.gradient ?? customTheme.GradientColors,
   };
 
   // Generate CSS properties mappings based on the custom theme colors
   const rawMappings: Record<string, CSSProperties> = {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: colors.Background,
       color: colors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: colors.AccentBlue,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: colors.AccentBlue,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: colors.AccentBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: colors.AccentBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: colors.AccentBlue,
-      textDecoration: 'underline',
+      textDecoration: "underline",
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: colors.AccentCyan,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: colors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: colors.AccentGreen,
     },
-    'hljs-class': {
+    "hljs-class": {
       color: colors.AccentGreen,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: colors.AccentYellow,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: colors.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: colors.AccentRed,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: colors.AccentRed,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: colors.Foreground,
     },
-    'hljs-function': {
+    "hljs-function": {
       color: colors.Foreground,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: colors.Foreground,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: colors.Foreground,
     },
-    'hljs-formula': {
+    "hljs-formula": {
       color: colors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: colors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: colors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: colors.Comment,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: colors.Gray,
     },
-    'hljs-meta-keyword': {
+    "hljs-meta-keyword": {
       color: colors.Gray,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: colors.Gray,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: colors.AccentPurple,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: colors.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: colors.LightBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: colors.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: colors.LightBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: colors.AccentYellow,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: colors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       backgroundColor: colors.AccentGreen,
-      display: 'inline-block',
-      width: '100%',
+      display: "inline-block",
+      width: "100%",
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       backgroundColor: colors.AccentRed,
-      display: 'inline-block',
-      width: '100%',
+      display: "inline-block",
+      width: "100%",
     },
   };
 
@@ -462,13 +454,7 @@ export function createCustomTheme(customTheme: CustomTheme): Theme {
     },
   };
 
-  return new Theme(
-    customTheme.name,
-    'custom',
-    rawMappings,
-    colors,
-    semanticColors,
-  );
+  return new Theme(customTheme.name, "custom", rawMappings, colors, semanticColors);
 }
 
 /**
diff --git a/apps/airiscode-cli/src/ui/themes/xcode.ts b/apps/airiscode-cli/src/ui/themes/xcode.ts
index bbfcab4f8..1faa2f8b0 100644
--- a/apps/airiscode-cli/src/ui/themes/xcode.ts
+++ b/apps/airiscode-cli/src/ui/themes/xcode.ts
@@ -4,150 +4,150 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const xcodeColors: ColorsTheme = {
-  type: 'light',
-  Background: '#fff',
-  Foreground: '#444',
-  LightBlue: '#0E0EFF',
-  AccentBlue: '#1c00cf',
-  AccentPurple: '#aa0d91',
-  AccentCyan: '#3F6E74',
-  AccentGreen: '#007400',
-  AccentYellow: '#836C28',
-  AccentRed: '#c41a16',
-  AccentYellowDim: '#8B7000',
-  AccentRedDim: '#993333',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FEDEDE',
-  Comment: '#007400',
-  Gray: '#c0c0c0',
-  GradientColors: ['#1c00cf', '#007400'],
+  type: "light",
+  Background: "#fff",
+  Foreground: "#444",
+  LightBlue: "#0E0EFF",
+  AccentBlue: "#1c00cf",
+  AccentPurple: "#aa0d91",
+  AccentCyan: "#3F6E74",
+  AccentGreen: "#007400",
+  AccentYellow: "#836C28",
+  AccentRed: "#c41a16",
+  AccentYellowDim: "#8B7000",
+  AccentRedDim: "#993333",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FEDEDE",
+  Comment: "#007400",
+  Gray: "#c0c0c0",
+  GradientColors: ["#1c00cf", "#007400"],
 };
 
 export const XCode: Theme = new Theme(
-  'Xcode',
-  'light',
+  "Xcode",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: xcodeColors.Background,
       color: xcodeColors.Foreground,
     },
-    'xml .hljs-meta': {
+    "xml .hljs-meta": {
       color: xcodeColors.Gray,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: xcodeColors.Comment,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: xcodeColors.Comment,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: xcodeColors.AccentCyan,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: xcodeColors.AccentCyan,
     },
-    'hljs-code': {
+    "hljs-code": {
       color: xcodeColors.AccentRed,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: xcodeColors.AccentRed,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: xcodeColors.AccentRed,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: xcodeColors.LightBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: xcodeColors.LightBlue,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: xcodeColors.Foreground,
     },
-    'hljs-formula': {
-      backgroundColor: '#eee',
-      fontStyle: 'italic',
+    "hljs-formula": {
+      backgroundColor: "#eee",
+      fontStyle: "italic",
     },
-    'hljs-addition': {
-      backgroundColor: '#baeeba',
+    "hljs-addition": {
+      backgroundColor: "#baeeba",
     },
-    'hljs-deletion': {
-      backgroundColor: '#ffc8bd',
+    "hljs-deletion": {
+      backgroundColor: "#ffc8bd",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   xcodeColors,
diff --git a/apps/airiscode-cli/src/ui/types.ts b/apps/airiscode-cli/src/ui/types.ts
index bfebeb5f7..24228a29a 100644
--- a/apps/airiscode-cli/src/ui/types.ts
+++ b/apps/airiscode-cli/src/ui/types.ts
@@ -5,53 +5,53 @@
  */
 
 import type {
+  AgentStatus,
   CompressionStatus,
   MCPServerConfig,
+  PartListUnion,
   ThoughtSummary,
   ToolCallConfirmationDetails,
   ToolConfirmationOutcome,
   ToolResultDisplay,
-  AgentStatus,
-} from '@airiscode/core';
-import type { PartListUnion } from '@airiscode/core';
-import { type ReactNode } from 'react';
+} from "@airiscode/core";
+import { type ReactNode } from "react";
 
 export type { ThoughtSummary };
 
 export enum AuthState {
   // Attemtping to authenticate or re-authenticate
-  Unauthenticated = 'unauthenticated',
+  Unauthenticated = "unauthenticated",
   // Auth dialog is open for user to select auth method
-  Updating = 'updating',
+  Updating = "updating",
   // Successfully authenticated
-  Authenticated = 'authenticated',
+  Authenticated = "authenticated",
 }
 
 // Only defining the state enum needed by the UI
 export enum StreamingState {
-  Idle = 'idle',
-  Responding = 'responding',
-  WaitingForConfirmation = 'waiting_for_confirmation',
+  Idle = "idle",
+  Responding = "responding",
+  WaitingForConfirmation = "waiting_for_confirmation",
 }
 
 // Copied from server/src/core/turn.ts for CLI usage
 export enum GeminiEventType {
-  Content = 'content',
-  ToolCallRequest = 'tool_call_request',
+  Content = "content",
+  ToolCallRequest = "tool_call_request",
   // Add other event types if the UI hook needs to handle them
 }
 
 export enum ToolCallStatus {
-  Pending = 'Pending',
-  Canceled = 'Canceled',
-  Confirming = 'Confirming',
-  Executing = 'Executing',
-  Success = 'Success',
-  Error = 'Error',
+  Pending = "Pending",
+  Canceled = "Canceled",
+  Confirming = "Confirming",
+  Executing = "Executing",
+  Success = "Success",
+  Error = "Error",
 }
 
 export interface ToolCallEvent {
-  type: 'tool_call';
+  type: "tool_call";
   status: ToolCallStatus;
   callId: string;
   name: string;
@@ -80,7 +80,7 @@ export interface CompressionProps {
 
 export interface SummaryProps {
   isPending: boolean;
-  stage: 'generating' | 'saving' | 'completed';
+  stage: "generating" | "saving" | "completed";
   filePath?: string; // Path to the saved summary file
 }
 
@@ -89,58 +89,58 @@ export interface HistoryItemBase {
 }
 
 export type HistoryItemUser = HistoryItemBase & {
-  type: 'user';
+  type: "user";
   text: string;
 };
 
 export type HistoryItemGemini = HistoryItemBase & {
-  type: 'gemini';
+  type: "gemini";
   text: string;
 };
 
 export type HistoryItemGeminiContent = HistoryItemBase & {
-  type: 'gemini_content';
+  type: "gemini_content";
   text: string;
 };
 
 export type HistoryItemGeminiThought = HistoryItemBase & {
-  type: 'gemini_thought';
+  type: "gemini_thought";
   text: string;
 };
 
 export type HistoryItemGeminiThoughtContent = HistoryItemBase & {
-  type: 'gemini_thought_content';
+  type: "gemini_thought_content";
   text: string;
 };
 
 export type HistoryItemInfo = HistoryItemBase & {
-  type: 'info';
+  type: "info";
   text: string;
 };
 
 export type HistoryItemError = HistoryItemBase & {
-  type: 'error';
+  type: "error";
   text: string;
   hint?: string; // Optional inline hint (e.g., retry countdown) displayed in secondary color
 };
 
 export type HistoryItemWarning = HistoryItemBase & {
-  type: 'warning';
+  type: "warning";
   text: string;
 };
 
 export type HistoryItemSuccess = HistoryItemBase & {
-  type: 'success';
+  type: "success";
   text: string;
 };
 
 export type HistoryItemRetryCountdown = HistoryItemBase & {
-  type: 'retry_countdown';
+  type: "retry_countdown";
   text: string;
 };
 
 export type HistoryItemAbout = HistoryItemBase & {
-  type: 'about';
+  type: "about";
   systemInfo: {
     cliVersion: string;
     osPlatform: string;
@@ -160,51 +160,51 @@ export type HistoryItemAbout = HistoryItemBase & {
 };
 
 export type HistoryItemHelp = HistoryItemBase & {
-  type: 'help';
+  type: "help";
   timestamp: Date;
 };
 
 export type HistoryItemStats = HistoryItemBase & {
-  type: 'stats';
+  type: "stats";
   duration: string;
 };
 
 export type HistoryItemModelStats = HistoryItemBase & {
-  type: 'model_stats';
+  type: "model_stats";
 };
 
 export type HistoryItemToolStats = HistoryItemBase & {
-  type: 'tool_stats';
+  type: "tool_stats";
 };
 
 export type HistoryItemQuit = HistoryItemBase & {
-  type: 'quit';
+  type: "quit";
   duration: string;
 };
 
 export type HistoryItemToolGroup = HistoryItemBase & {
-  type: 'tool_group';
+  type: "tool_group";
   tools: IndividualToolCallDisplay[];
   isUserInitiated?: boolean;
 };
 
 export type HistoryItemUserShell = HistoryItemBase & {
-  type: 'user_shell';
+  type: "user_shell";
   text: string;
 };
 
 export type HistoryItemCompression = HistoryItemBase & {
-  type: 'compression';
+  type: "compression";
   compression: CompressionProps;
 };
 
 export type HistoryItemSummary = HistoryItemBase & {
-  type: 'summary';
+  type: "summary";
   summary: SummaryProps;
 };
 
 export type HistoryItemExtensionsList = HistoryItemBase & {
-  type: 'extensions_list';
+  type: "extensions_list";
 };
 
 export interface ToolDefinition {
@@ -218,13 +218,13 @@ export interface SkillDefinition {
 }
 
 export type HistoryItemToolsList = HistoryItemBase & {
-  type: 'tools_list';
+  type: "tools_list";
   tools: ToolDefinition[];
   showDescriptions: boolean;
 };
 
 export type HistoryItemSkillsList = HistoryItemBase & {
-  type: 'skills_list';
+  type: "skills_list";
   skills: SkillDefinition[];
 };
 
@@ -247,14 +247,11 @@ export interface JsonMcpPrompt {
 }
 
 export type HistoryItemMcpStatus = HistoryItemBase & {
-  type: 'mcp_status';
+  type: "mcp_status";
   servers: Record<string, MCPServerConfig>;
   tools: JsonMcpTool[];
   prompts: JsonMcpPrompt[];
-  authStatus: Record<
-    string,
-    'authenticated' | 'expired' | 'unauthenticated' | 'not-configured'
-  >;
+  authStatus: Record<string, "authenticated" | "expired" | "unauthenticated" | "not-configured">;
   blockedServers: Array<{ name: string; extensionName: string }>;
   discoveryInProgress: boolean;
   connectingServers: string[];
@@ -297,7 +294,7 @@ export interface ContextSkillDetail {
 }
 
 export type HistoryItemContextUsage = HistoryItemBase & {
-  type: 'context_usage';
+  type: "context_usage";
   modelName: string;
   totalTokens: number;
   contextWindowSize: number;
@@ -331,12 +328,12 @@ export interface ArenaAgentCardData {
 }
 
 export type HistoryItemArenaAgentComplete = HistoryItemBase & {
-  type: 'arena_agent_complete';
+  type: "arena_agent_complete";
   agent: ArenaAgentCardData;
 };
 
 export type HistoryItemArenaSessionComplete = HistoryItemBase & {
-  type: 'arena_session_complete';
+  type: "arena_session_complete";
   sessionStatus: string;
   task: string;
   totalDurationMs: number;
@@ -347,7 +344,7 @@ export type HistoryItemArenaSessionComplete = HistoryItemBase & {
  * Insight progress message.
  */
 export type HistoryItemInsightProgress = HistoryItemBase & {
-  type: 'insight_progress';
+  type: "insight_progress";
   progress: InsightProgressProps;
 };
 
@@ -358,7 +355,7 @@ export interface BtwProps {
 }
 
 export type HistoryItemBtw = HistoryItemBase & {
-  type: 'btw';
+  type: "btw";
   btw: BtwProps;
 };
 
@@ -367,7 +364,7 @@ export type HistoryItemBtw = HistoryItemBase & {
  * Displayed when a UserPromptSubmit hook blocks the user's prompt.
  */
 export type HistoryItemUserPromptSubmitBlocked = HistoryItemBase & {
-  type: 'user_prompt_submit_blocked';
+  type: "user_prompt_submit_blocked";
   reason: string;
   originalPrompt: string;
 };
@@ -377,7 +374,7 @@ export type HistoryItemUserPromptSubmitBlocked = HistoryItemBase & {
  * Displayed when Stop hooks create a loop, forcing the agent to continue.
  */
 export type HistoryItemStopHookLoop = HistoryItemBase & {
-  type: 'stop_hook_loop';
+  type: "stop_hook_loop";
   iterationCount: number;
   reasons: string[];
   stopHookCount: number;
@@ -388,7 +385,7 @@ export type HistoryItemStopHookLoop = HistoryItemBase & {
  * Displayed when Stop hooks return a systemMessage to show to the user.
  */
 export type HistoryItemStopHookSystemMessage = HistoryItemBase & {
-  type: 'stop_hook_system_message';
+  type: "stop_hook_system_message";
   message: string;
 };
 
@@ -435,29 +432,29 @@ export type HistoryItem = HistoryItemWithoutId & { id: number };
 
 // Message types used by internal command feedback (subset of HistoryItem types)
 export enum MessageType {
-  INFO = 'info',
-  SUCCESS = 'success',
-  ERROR = 'error',
-  WARNING = 'warning',
-  USER = 'user',
-  ABOUT = 'about',
-  HELP = 'help',
-  STATS = 'stats',
-  MODEL_STATS = 'model_stats',
-  TOOL_STATS = 'tool_stats',
-  QUIT = 'quit',
-  GEMINI = 'gemini',
-  COMPRESSION = 'compression',
-  SUMMARY = 'summary',
-  EXTENSIONS_LIST = 'extensions_list',
-  TOOLS_LIST = 'tools_list',
-  SKILLS_LIST = 'skills_list',
-  MCP_STATUS = 'mcp_status',
-  CONTEXT_USAGE = 'context_usage',
-  ARENA_AGENT_COMPLETE = 'arena_agent_complete',
-  ARENA_SESSION_COMPLETE = 'arena_session_complete',
-  INSIGHT_PROGRESS = 'insight_progress',
-  BTW = 'btw',
+  INFO = "info",
+  SUCCESS = "success",
+  ERROR = "error",
+  WARNING = "warning",
+  USER = "user",
+  ABOUT = "about",
+  HELP = "help",
+  STATS = "stats",
+  MODEL_STATS = "model_stats",
+  TOOL_STATS = "tool_stats",
+  QUIT = "quit",
+  GEMINI = "gemini",
+  COMPRESSION = "compression",
+  SUMMARY = "summary",
+  EXTENSIONS_LIST = "extensions_list",
+  TOOLS_LIST = "tools_list",
+  SKILLS_LIST = "skills_list",
+  MCP_STATUS = "mcp_status",
+  CONTEXT_USAGE = "context_usage",
+  ARENA_AGENT_COMPLETE = "arena_agent_complete",
+  ARENA_SESSION_COMPLETE = "arena_session_complete",
+  INSIGHT_PROGRESS = "insight_progress",
+  BTW = "btw",
 }
 
 export interface InsightProgressProps {
@@ -540,7 +537,7 @@ export type Message =
     };
 
 export interface ConsoleMessageItem {
-  type: 'log' | 'warn' | 'error' | 'debug' | 'info';
+  type: "log" | "warn" | "error" | "debug" | "info";
   content: string;
   count: number;
 }
@@ -550,7 +547,7 @@ export interface ConsoleMessageItem {
  * being submitted to the Gemini model.
  */
 export interface SubmitPromptResult {
-  type: 'submit_prompt';
+  type: "submit_prompt";
   content: PartListUnion;
 }
 
@@ -559,21 +556,18 @@ export interface SubmitPromptResult {
  */
 export type SlashCommandProcessorResult =
   | {
-      type: 'schedule_tool';
+      type: "schedule_tool";
       toolName: string;
       toolArgs: Record<string, unknown>;
     }
   | {
-      type: 'handled'; // Indicates the command was processed and no further action is needed.
+      type: "handled"; // Indicates the command was processed and no further action is needed.
     }
   | SubmitPromptResult;
 
 export interface ShellConfirmationRequest {
   commands: string[];
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    approvedCommands?: string[],
-  ) => void;
+  onConfirm: (outcome: ToolConfirmationOutcome, approvedCommands?: string[]) => void;
 }
 
 export interface ConfirmationRequest {
@@ -582,7 +576,7 @@ export interface ConfirmationRequest {
 }
 
 export interface LoopDetectionConfirmationRequest {
-  onComplete: (result: { userSelection: 'disable' | 'keep' }) => void;
+  onComplete: (result: { userSelection: "disable" | "keep" }) => void;
 }
 
 export interface SettingInputRequest {
diff --git a/apps/airiscode-cli/src/ui/utils/CodeColorizer.tsx b/apps/airiscode-cli/src/ui/utils/CodeColorizer.tsx
index 4b999e93c..8be35a817 100644
--- a/apps/airiscode-cli/src/ui/utils/CodeColorizer.tsx
+++ b/apps/airiscode-cli/src/ui/utils/CodeColorizer.tsx
@@ -4,44 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text, Box } from 'ink';
-import { common, createLowlight } from 'lowlight';
-import type {
-  Root,
-  Element,
-  Text as HastText,
-  ElementContent,
-  RootContent,
-} from 'hast';
-import { themeManager } from '../themes/theme-manager.js';
-import type { Theme } from '../themes/theme.js';
-import {
-  MaxSizedBox,
-  MINIMUM_MAX_HEIGHT,
-} from '../components/shared/MaxSizedBox.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import type { Element, ElementContent, Text as HastText, Root, RootContent } from "hast";
+import { Box, Text } from "ink";
+import { common, createLowlight } from "lowlight";
+import React from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { MaxSizedBox, MINIMUM_MAX_HEIGHT } from "../components/shared/MaxSizedBox.js";
+import type { Theme } from "../themes/theme.js";
+import { themeManager } from "../themes/theme-manager.js";
 
 // Configure theming and parsing utilities.
 const lowlight = createLowlight(common);
-const debugLogger = createDebugLogger('CODE_COLORIZER');
+const debugLogger = createDebugLogger("CODE_COLORIZER");
 
 function renderHastNode(
   node: Root | Element | HastText | RootContent,
   theme: Theme,
   inheritedColor: string | undefined,
 ): React.ReactNode {
-  if (node.type === 'text') {
+  if (node.type === "text") {
     // Use the color passed down from parent element, or the theme's default.
     const color = inheritedColor || theme.defaultColor;
     return <Text color={color}>{node.value}</Text>;
   }
 
   // Handle Element Nodes: Determine color and pass it down, don't wrap
-  if (node.type === 'element') {
-    const nodeClasses: string[] =
-      (node.properties?.['className'] as string[]) || [];
+  if (node.type === "element") {
+    const nodeClasses: string[] = (node.properties?.["className"] as string[]) || [];
     let elementColor: string | undefined = undefined;
 
     // Find color defined specifically for this element's class
@@ -59,13 +49,9 @@ function renderHastNode(
 
     // Recursively render children, passing the determined color down
     // Ensure child type matches expected HAST structure (ElementContent is common)
-    const children = node.children?.map(
-      (child: ElementContent, index: number) => (
-        <React.Fragment key={index}>
-          {renderHastNode(child, theme, colorToPassDown)}
-        </React.Fragment>
-      ),
-    );
+    const children = node.children?.map((child: ElementContent, index: number) => (
+      <React.Fragment key={index}>{renderHastNode(child, theme, colorToPassDown)}</React.Fragment>
+    ));
 
     // Element nodes now only group children; color is applied by Text nodes.
     // Use a React Fragment to avoid adding unnecessary elements.
@@ -73,7 +59,7 @@ function renderHastNode(
   }
 
   // Handle Root Node: Start recursion with initially inherited color
-  if (node.type === 'root') {
+  if (node.type === "root") {
     // Check if children array is empty - this happens when lowlight can't detect language – fall back to plain text
     if (!node.children || node.children.length === 0) {
       return null;
@@ -82,9 +68,7 @@ function renderHastNode(
     // Pass down the initial inheritedColor (likely undefined from the top call)
     // Ensure child type matches expected HAST structure (RootContent is common)
     return node.children?.map((child: RootContent, index: number) => (
-      <React.Fragment key={index}>
-        {renderHastNode(child, theme, inheritedColor)}
-      </React.Fragment>
+      <React.Fragment key={index}>{renderHastNode(child, theme, inheritedColor)}</React.Fragment>
     ));
   }
 
@@ -137,16 +121,14 @@ export function colorizeCode(
   settings?: LoadedSettings,
   tabWidth = 4,
 ): React.ReactNode {
-  const codeToHighlight = code
-    .replace(/\n$/, '')
-    .replace(/\t/g, ' '.repeat(tabWidth));
+  const codeToHighlight = code.replace(/\n$/, "").replace(/\t/g, " ".repeat(tabWidth));
   const activeTheme = theme || themeManager.getActiveTheme();
   const showLineNumbers = settings?.merged.ui?.showLineNumbers ?? true;
 
   try {
     // Render the HAST tree using the adapted theme
     // Apply the theme's default foreground color to the top-level Text element
-    let lines = codeToHighlight.split('\n');
+    let lines = codeToHighlight.split("\n");
     const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
 
     let hiddenLinesCount = 0;
@@ -169,20 +151,13 @@ export function colorizeCode(
         overflowDirection="top"
       >
         {lines.map((line, index) => {
-          const contentToRender = highlightAndRenderLine(
-            line,
-            language,
-            activeTheme,
-          );
+          const contentToRender = highlightAndRenderLine(line, language, activeTheme);
 
           return (
             <Box key={index}>
               {showLineNumbers && (
                 <Text color={activeTheme.colors.Gray}>
-                  {`${String(index + 1 + hiddenLinesCount).padStart(
-                    padWidth,
-                    ' ',
-                  )} `}
+                  {`${String(index + 1 + hiddenLinesCount).padStart(padWidth, " ")} `}
                 </Text>
               )}
               <Text color={activeTheme.defaultColor} wrap="wrap">
@@ -194,25 +169,18 @@ export function colorizeCode(
       </MaxSizedBox>
     );
   } catch (error) {
-    debugLogger.error(
-      `[colorizeCode] Error highlighting code for language "${language}":`,
-      error,
-    );
+    debugLogger.error(`[colorizeCode] Error highlighting code for language "${language}":`, error);
     // Fall back to plain text with default color on error
     // Also display line numbers in fallback
-    const lines = codeToHighlight.split('\n');
+    const lines = codeToHighlight.split("\n");
     const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
     return (
-      <MaxSizedBox
-        maxHeight={availableHeight}
-        maxWidth={maxWidth}
-        overflowDirection="top"
-      >
+      <MaxSizedBox maxHeight={availableHeight} maxWidth={maxWidth} overflowDirection="top">
         {lines.map((line, index) => (
           <Box key={index}>
             {showLineNumbers && (
               <Text color={activeTheme.defaultColor}>
-                {`${String(index + 1).padStart(padWidth, ' ')} `}
+                {`${String(index + 1).padStart(padWidth, " ")} `}
               </Text>
             )}
             <Text color={activeTheme.colors.Gray}>{line}</Text>
diff --git a/apps/airiscode-cli/src/ui/utils/InlineMarkdownRenderer.tsx b/apps/airiscode-cli/src/ui/utils/InlineMarkdownRenderer.tsx
index f3c19879a..47ea97c9e 100644
--- a/apps/airiscode-cli/src/ui/utils/InlineMarkdownRenderer.tsx
+++ b/apps/airiscode-cli/src/ui/utils/InlineMarkdownRenderer.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import stringWidth from 'string-width';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import { Text } from "ink";
+import React from "react";
+import stringWidth from "string-width";
+import { theme } from "../semantic-colors.js";
 
 // Constants for Markdown parsing
 const BOLD_MARKER_LENGTH = 2; // For "**"
@@ -18,7 +18,7 @@ const INLINE_CODE_MARKER_LENGTH = 1; // For "`"
 const UNDERLINE_TAG_START_LENGTH = 3; // For "<u>"
 const UNDERLINE_TAG_END_LENGTH = 4; // For "</u>"
 
-const debugLogger = createDebugLogger('INLINE_MARKDOWN');
+const debugLogger = createDebugLogger("INLINE_MARKDOWN");
 
 interface RenderInlineProps {
   text: string;
@@ -42,11 +42,7 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
 
   while ((match = inlineRegex.exec(text)) !== null) {
     if (match.index > lastIndex) {
-      nodes.push(
-        <Text key={`t-${lastIndex}`}>
-          {text.slice(lastIndex, match.index)}
-        </Text>,
-      );
+      nodes.push(<Text key={`t-${lastIndex}`}>{text.slice(lastIndex, match.index)}</Text>);
     }
 
     const fullMatch = match[0];
@@ -55,8 +51,8 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
 
     try {
       if (
-        fullMatch.startsWith('**') &&
-        fullMatch.endsWith('**') &&
+        fullMatch.startsWith("**") &&
+        fullMatch.endsWith("**") &&
         fullMatch.length > BOLD_MARKER_LENGTH * 2
       ) {
         renderedNode = (
@@ -66,16 +62,12 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
         );
       } else if (
         fullMatch.length > ITALIC_MARKER_LENGTH * 2 &&
-        ((fullMatch.startsWith('*') && fullMatch.endsWith('*')) ||
-          (fullMatch.startsWith('_') && fullMatch.endsWith('_'))) &&
+        ((fullMatch.startsWith("*") && fullMatch.endsWith("*")) ||
+          (fullMatch.startsWith("_") && fullMatch.endsWith("_"))) &&
         !/\w/.test(text.substring(match.index - 1, match.index)) &&
-        !/\w/.test(
-          text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 1),
-        ) &&
+        !/\w/.test(text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 1)) &&
         !/\S[./\\]/.test(text.substring(match.index - 2, match.index)) &&
-        !/[./\\]\S/.test(
-          text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 2),
-        )
+        !/[./\\]\S/.test(text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 2))
       ) {
         renderedNode = (
           <Text key={key} italic>
@@ -83,21 +75,18 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
           </Text>
         );
       } else if (
-        fullMatch.startsWith('~~') &&
-        fullMatch.endsWith('~~') &&
+        fullMatch.startsWith("~~") &&
+        fullMatch.endsWith("~~") &&
         fullMatch.length > STRIKETHROUGH_MARKER_LENGTH * 2
       ) {
         renderedNode = (
           <Text key={key} strikethrough>
-            {fullMatch.slice(
-              STRIKETHROUGH_MARKER_LENGTH,
-              -STRIKETHROUGH_MARKER_LENGTH,
-            )}
+            {fullMatch.slice(STRIKETHROUGH_MARKER_LENGTH, -STRIKETHROUGH_MARKER_LENGTH)}
           </Text>
         );
       } else if (
-        fullMatch.startsWith('`') &&
-        fullMatch.endsWith('`') &&
+        fullMatch.startsWith("`") &&
+        fullMatch.endsWith("`") &&
         fullMatch.length > INLINE_CODE_MARKER_LENGTH
       ) {
         const codeMatch = fullMatch.match(/^(`+)(.+?)\1$/s);
@@ -108,11 +97,7 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
             </Text>
           );
         }
-      } else if (
-        fullMatch.startsWith('[') &&
-        fullMatch.includes('](') &&
-        fullMatch.endsWith(')')
-      ) {
+      } else if (fullMatch.startsWith("[") && fullMatch.includes("](") && fullMatch.endsWith(")")) {
         const linkMatch = fullMatch.match(/\[(.*?)\]\((.*?)\)/);
         if (linkMatch) {
           const linkText = linkMatch[1];
@@ -125,17 +110,13 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
           );
         }
       } else if (
-        fullMatch.startsWith('<u>') &&
-        fullMatch.endsWith('</u>') &&
-        fullMatch.length >
-          UNDERLINE_TAG_START_LENGTH + UNDERLINE_TAG_END_LENGTH - 1 // -1 because length is compared to combined length of start and end tags
+        fullMatch.startsWith("<u>") &&
+        fullMatch.endsWith("</u>") &&
+        fullMatch.length > UNDERLINE_TAG_START_LENGTH + UNDERLINE_TAG_END_LENGTH - 1 // -1 because length is compared to combined length of start and end tags
       ) {
         renderedNode = (
           <Text key={key} underline>
-            {fullMatch.slice(
-              UNDERLINE_TAG_START_LENGTH,
-              -UNDERLINE_TAG_END_LENGTH,
-            )}
+            {fullMatch.slice(UNDERLINE_TAG_START_LENGTH, -UNDERLINE_TAG_END_LENGTH)}
           </Text>
         );
       } else if (fullMatch.match(/^https?:\/\//)) {
@@ -146,7 +127,7 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
         );
       }
     } catch (e) {
-      debugLogger.error('Error parsing inline markdown part:', fullMatch, e);
+      debugLogger.error("Error parsing inline markdown part:", fullMatch, e);
       renderedNode = null;
     }
 
@@ -169,12 +150,12 @@ export const RenderInline = React.memo(RenderInlineInternal);
  */
 export const getPlainTextLength = (text: string): number => {
   const cleanText = text
-    .replace(/\*\*(.*?)\*\*/g, '$1')
-    .replace(/\*(.*?)\*/g, '$1')
-    .replace(/_(.*?)_/g, '$1')
-    .replace(/~~(.*?)~~/g, '$1')
-    .replace(/`(.*?)`/g, '$1')
-    .replace(/<u>(.*?)<\/u>/g, '$1')
-    .replace(/.*\[(.*?)\]\(.*\)/g, '$1');
+    .replace(/\*\*(.*?)\*\*/g, "$1")
+    .replace(/\*(.*?)\*/g, "$1")
+    .replace(/_(.*?)_/g, "$1")
+    .replace(/~~(.*?)~~/g, "$1")
+    .replace(/`(.*?)`/g, "$1")
+    .replace(/<u>(.*?)<\/u>/g, "$1")
+    .replace(/.*\[(.*?)\]\(.*\)/g, "$1");
   return stringWidth(cleanText);
 };
diff --git a/apps/airiscode-cli/src/ui/utils/MarkdownDisplay.tsx b/apps/airiscode-cli/src/ui/utils/MarkdownDisplay.tsx
index 25e2110d9..cc9952cd6 100644
--- a/apps/airiscode-cli/src/ui/utils/MarkdownDisplay.tsx
+++ b/apps/airiscode-cli/src/ui/utils/MarkdownDisplay.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { colorizeCode } from './CodeColorizer.js';
-import { TableRenderer } from './TableRenderer.js';
-import { RenderInline } from './InlineMarkdownRenderer.js';
-import { useSettings } from '../contexts/SettingsContext.js';
+import { Box, Text } from "ink";
+import React from "react";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { theme } from "../semantic-colors.js";
+import { colorizeCode } from "./CodeColorizer.js";
+import { RenderInline } from "./InlineMarkdownRenderer.js";
+import { TableRenderer } from "./TableRenderer.js";
 
 interface MarkdownDisplayProps {
   text: string;
@@ -50,7 +50,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
   let lastLineEmpty = true;
   let codeBlockContent: string[] = [];
   let codeBlockLang: string | null = null;
-  let codeBlockFence = '';
+  let codeBlockFence = "";
   let inTable = false;
   let tableRows: string[][] = [];
   let tableHeaders: string[] = [];
@@ -85,7 +85,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
         inCodeBlock = false;
         codeBlockContent = [];
         codeBlockLang = null;
-        codeBlockFence = '';
+        codeBlockFence = "";
       } else {
         codeBlockContent.push(line);
       }
@@ -106,14 +106,11 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
       codeBlockLang = codeFenceMatch[2] || null;
     } else if (tableRowMatch && !inTable) {
       // Potential table start - check if next line is separator
-      if (
-        index + 1 < lines.length &&
-        lines[index + 1].match(tableSeparatorRegex)
-      ) {
+      if (index + 1 < lines.length && lines[index + 1].match(tableSeparatorRegex)) {
         inTable = true;
         tableHeaders = tableRowMatch[1]
           .split(/(?<!\\)\|/)
-          .map((cell) => cell.trim().replaceAll('\\|', '|'));
+          .map((cell) => cell.trim().replaceAll("\\|", "|"));
         tableRows = [];
       } else {
         // Not a table, treat as regular text
@@ -131,10 +128,10 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
       // Add table row
       const cells = tableRowMatch[1]
         .split(/(?<!\\)\|/)
-        .map((cell) => cell.trim().replaceAll('\\|', '|'));
+        .map((cell) => cell.trim().replaceAll("\\|", "|"));
       // Ensure row has same column count as headers
       while (cells.length < tableHeaders.length) {
-        cells.push('');
+        cells.push("");
       }
       if (cells.length > tableHeaders.length) {
         cells.length = tableHeaders.length;
@@ -245,9 +242,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
     } else {
       if (line.trim().length === 0 && !inCodeBlock) {
         if (!lastLineEmpty) {
-          contentBlocks.push(
-            <Box key={`spacer-${index}`} height={EMPTY_LINE_HEIGHT} />,
-          );
+          contentBlocks.push(<Box key={`spacer-${index}`} height={EMPTY_LINE_HEIGHT} />);
           lastLineEmpty = true;
         }
       } else {
@@ -312,25 +307,20 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
   const RESERVED_LINES = 2; // Lines reserved for the message itself and potential padding
 
   if (isPending && availableTerminalHeight !== undefined) {
-    const MAX_CODE_LINES_WHEN_PENDING = Math.max(
-      0,
-      availableTerminalHeight - RESERVED_LINES,
-    );
+    const MAX_CODE_LINES_WHEN_PENDING = Math.max(0, availableTerminalHeight - RESERVED_LINES);
 
     if (content.length > MAX_CODE_LINES_WHEN_PENDING) {
       if (MAX_CODE_LINES_WHEN_PENDING < MIN_LINES_FOR_MESSAGE) {
         // Not enough space to even show the message meaningfully
         return (
           <Box paddingLeft={CODE_BLOCK_PREFIX_PADDING}>
-            <Text color={theme.text.secondary}>
-              ... code is being written ...
-            </Text>
+            <Text color={theme.text.secondary}>... code is being written ...</Text>
           </Box>
         );
       }
       const truncatedContent = content.slice(0, MAX_CODE_LINES_WHEN_PENDING);
       const colorizedTruncatedCode = colorizeCode(
-        truncatedContent.join('\n'),
+        truncatedContent.join("\n"),
         lang,
         availableTerminalHeight,
         contentWidth - CODE_BLOCK_PREFIX_PADDING,
@@ -346,7 +336,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
     }
   }
 
-  const fullContent = content.join('\n');
+  const fullContent = content.join("\n");
   const colorizedCode = colorizeCode(
     fullContent,
     lang,
@@ -372,7 +362,7 @@ const RenderCodeBlock = React.memo(RenderCodeBlockInternal);
 
 interface RenderListItemProps {
   itemText: string;
-  type: 'ul' | 'ol';
+  type: "ul" | "ol";
   marker: string;
   leadingWhitespace?: string;
   textColor?: string;
@@ -382,18 +372,15 @@ const RenderListItemInternal: React.FC<RenderListItemProps> = ({
   itemText,
   type,
   marker,
-  leadingWhitespace = '',
+  leadingWhitespace = "",
   textColor = theme.text.primary,
 }) => {
-  const prefix = type === 'ol' ? `${marker}. ` : `${marker} `;
+  const prefix = type === "ol" ? `${marker}. ` : `${marker} `;
   const prefixWidth = prefix.length;
   const indentation = leadingWhitespace.length;
 
   return (
-    <Box
-      paddingLeft={indentation + LIST_ITEM_PREFIX_PADDING}
-      flexDirection="row"
-    >
+    <Box paddingLeft={indentation + LIST_ITEM_PREFIX_PADDING} flexDirection="row">
       <Box width={prefixWidth}>
         <Text color={textColor}>{prefix}</Text>
       </Box>
@@ -414,11 +401,7 @@ interface RenderTableProps {
   contentWidth: number;
 }
 
-const RenderTableInternal: React.FC<RenderTableProps> = ({
-  headers,
-  rows,
-  contentWidth,
-}) => (
+const RenderTableInternal: React.FC<RenderTableProps> = ({ headers, rows, contentWidth }) => (
   <TableRenderer headers={headers} rows={rows} contentWidth={contentWidth} />
 );
 
diff --git a/apps/airiscode-cli/src/ui/utils/TableRenderer.tsx b/apps/airiscode-cli/src/ui/utils/TableRenderer.tsx
index 7684a2b71..8b2b88162 100644
--- a/apps/airiscode-cli/src/ui/utils/TableRenderer.tsx
+++ b/apps/airiscode-cli/src/ui/utils/TableRenderer.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { RenderInline, getPlainTextLength } from './InlineMarkdownRenderer.js';
+import { Box, Text } from "ink";
+import React from "react";
+import { theme } from "../semantic-colors.js";
+import { getPlainTextLength, RenderInline } from "./InlineMarkdownRenderer.js";
 
 interface TableRendererProps {
   headers: string[];
@@ -19,17 +19,11 @@ interface TableRendererProps {
  * Custom table renderer for markdown tables
  * We implement our own instead of using ink-table due to module compatibility issues
  */
-export const TableRenderer: React.FC<TableRendererProps> = ({
-  headers,
-  rows,
-  contentWidth,
-}) => {
+export const TableRenderer: React.FC<TableRendererProps> = ({ headers, rows, contentWidth }) => {
   // Calculate column widths using actual display width after markdown processing
   const columnWidths = headers.map((header, index) => {
     const headerWidth = getPlainTextLength(header);
-    const maxRowWidth = Math.max(
-      ...rows.map((row) => getPlainTextLength(row[index] || '')),
-    );
+    const maxRowWidth = Math.max(...rows.map((row) => getPlainTextLength(row[index] || "")));
     return Math.max(headerWidth, maxRowWidth) + 2; // Add padding
   });
 
@@ -37,19 +31,11 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
   const totalWidth = columnWidths.reduce((sum, width) => sum + width + 1, 1);
   const fixedWidth = columnWidths.length + 1;
   const scaleFactor =
-    totalWidth > contentWidth
-      ? (contentWidth - fixedWidth) / (totalWidth - fixedWidth)
-      : 1;
-  const adjustedWidths = columnWidths.map((width) =>
-    Math.floor(width * scaleFactor),
-  );
+    totalWidth > contentWidth ? (contentWidth - fixedWidth) / (totalWidth - fixedWidth) : 1;
+  const adjustedWidths = columnWidths.map((width) => Math.floor(width * scaleFactor));
 
   // Helper function to render a cell with proper width
-  const renderCell = (
-    content: string,
-    width: number,
-    isHeader = false,
-  ): React.ReactNode => {
+  const renderCell = (content: string, width: number, isHeader = false): React.ReactNode => {
     const contentWidth = Math.max(0, width - 2);
     const displayWidth = getPlainTextLength(content);
 
@@ -57,10 +43,7 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
     if (displayWidth > contentWidth) {
       if (contentWidth <= 3) {
         // Just truncate by character count
-        cellContent = content.substring(
-          0,
-          Math.min(content.length, contentWidth),
-        );
+        cellContent = content.substring(0, Math.min(content.length, contentWidth));
       } else {
         // Truncate preserving markdown formatting using binary search
         let left = 0;
@@ -81,7 +64,7 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
           }
         }
 
-        cellContent = bestTruncated + '...';
+        cellContent = bestTruncated + "...";
       }
     }
 
@@ -98,17 +81,17 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
         ) : (
           <RenderInline text={cellContent} />
         )}
-        {' '.repeat(paddingNeeded)}
+        {" ".repeat(paddingNeeded)}
       </Text>
     );
   };
 
   // Helper function to render border
-  const renderBorder = (type: 'top' | 'middle' | 'bottom'): React.ReactNode => {
+  const renderBorder = (type: "top" | "middle" | "bottom"): React.ReactNode => {
     const chars = {
-      top: { left: '┌', middle: '┬', right: '┐', horizontal: '─' },
-      middle: { left: '├', middle: '┼', right: '┤', horizontal: '─' },
-      bottom: { left: '└', middle: '┴', right: '┘', horizontal: '─' },
+      top: { left: "┌", middle: "┬", right: "┐", horizontal: "─" },
+      middle: { left: "├", middle: "┼", right: "┤", horizontal: "─" },
+      bottom: { left: "└", middle: "┴", right: "┘", horizontal: "─" },
     };
 
     const char = chars[type];
@@ -122,18 +105,18 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
   const renderRow = (cells: string[], isHeader = false): React.ReactNode => {
     const renderedCells = cells.map((cell, index) => {
       const width = adjustedWidths[index] || 0;
-      return renderCell(cell || '', width, isHeader);
+      return renderCell(cell || "", width, isHeader);
     });
 
     return (
       <Text color={theme.text.primary}>
-        │{' '}
+        │{" "}
         {renderedCells.map((cell, index) => (
           <React.Fragment key={index}>
             {cell}
-            {index < renderedCells.length - 1 ? ' │ ' : ''}
+            {index < renderedCells.length - 1 ? " │ " : ""}
           </React.Fragment>
-        ))}{' '}
+        ))}{" "}
         │
       </Text>
     );
@@ -142,13 +125,13 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
   return (
     <Box flexDirection="column" marginY={1}>
       {/* Top border */}
-      {renderBorder('top')}
+      {renderBorder("top")}
 
       {/* Header row */}
       {renderRow(headers, true)}
 
       {/* Middle border */}
-      {renderBorder('middle')}
+      {renderBorder("middle")}
 
       {/* Data rows */}
       {rows.map((row, index) => (
@@ -156,7 +139,7 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
       ))}
 
       {/* Bottom border */}
-      {renderBorder('bottom')}
+      {renderBorder("bottom")}
     </Box>
   );
 };
diff --git a/apps/airiscode-cli/src/ui/utils/clipboardUtils.ts b/apps/airiscode-cli/src/ui/utils/clipboardUtils.ts
index 0ec661985..c98c31c18 100644
--- a/apps/airiscode-cli/src/ui/utils/clipboardUtils.ts
+++ b/apps/airiscode-cli/src/ui/utils/clipboardUtils.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { createDebugLogger } from '@airiscode/core';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { createDebugLogger } from "@airiscode/core";
 
-const debugLogger = createDebugLogger('CLIPBOARD_UTILS');
+const debugLogger = createDebugLogger("CLIPBOARD_UTILS");
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type ClipboardModule = any;
@@ -21,12 +21,12 @@ async function getClipboardModule(): Promise<ClipboardModule | null> {
   clipboardLoadAttempted = true;
 
   try {
-    const modName = '@teddyzhu/clipboard';
+    const modName = "@teddyzhu/clipboard";
     cachedClipboardModule = await import(modName);
     return cachedClipboardModule;
   } catch (_e) {
     debugLogger.error(
-      'Failed to load @teddyzhu/clipboard native module. Clipboard image features will be unavailable.',
+      "Failed to load @teddyzhu/clipboard native module. Clipboard image features will be unavailable.",
     );
     return null;
   }
@@ -41,9 +41,9 @@ export async function clipboardHasImage(): Promise<boolean> {
     const mod = await getClipboardModule();
     if (!mod) return false;
     const clipboard = new mod.ClipboardManager();
-    return clipboard.hasFormat('image');
+    return clipboard.hasFormat("image");
   } catch (error) {
-    debugLogger.error('Error checking clipboard for image:', error);
+    debugLogger.error("Error checking clipboard for image:", error);
     return false;
   }
 }
@@ -53,22 +53,20 @@ export async function clipboardHasImage(): Promise<boolean> {
  * @param targetDir The target directory to create temp files within
  * @returns The path to the saved image file, or null if no image or error
  */
-export async function saveClipboardImage(
-  targetDir?: string,
-): Promise<string | null> {
+export async function saveClipboardImage(targetDir?: string): Promise<string | null> {
   try {
     const mod = await getClipboardModule();
     if (!mod) return null;
     const clipboard = new mod.ClipboardManager();
 
-    if (!clipboard.hasFormat('image')) {
+    if (!clipboard.hasFormat("image")) {
       return null;
     }
 
     // Create a temporary directory for clipboard images within the target directory
     // This avoids security restrictions on paths outside the target directory
     const baseDir = targetDir || process.cwd();
-    const tempDir = path.join(baseDir, 'clipboard');
+    const tempDir = path.join(baseDir, "clipboard");
     await fs.mkdir(tempDir, { recursive: true });
 
     // Generate a unique filename with timestamp
@@ -87,7 +85,7 @@ export async function saveClipboardImage(
 
     return tempFilePath;
   } catch (error) {
-    debugLogger.error('Error saving clipboard image:', error);
+    debugLogger.error("Error saving clipboard image:", error);
     return null;
   }
 }
@@ -97,12 +95,10 @@ export async function saveClipboardImage(
  * Keeps maximum 100 images, when exceeding removes 50 oldest files to reduce cleanup frequency
  * @param targetDir The target directory where temp files are stored
  */
-export async function cleanupOldClipboardImages(
-  targetDir?: string,
-): Promise<void> {
+export async function cleanupOldClipboardImages(targetDir?: string): Promise<void> {
   try {
     const baseDir = targetDir || process.cwd();
-    const tempDir = path.join(baseDir, 'clipboard');
+    const tempDir = path.join(baseDir, "clipboard");
     const files = await fs.readdir(tempDir);
     const MAX_IMAGES = 100;
     const CLEANUP_COUNT = 50;
@@ -112,15 +108,15 @@ export async function cleanupOldClipboardImages(
 
     for (const file of files) {
       if (
-        file.startsWith('clipboard-') &&
-        (file.endsWith('.png') ||
-          file.endsWith('.jpg') ||
-          file.endsWith('.webp') ||
-          file.endsWith('.heic') ||
-          file.endsWith('.heif') ||
-          file.endsWith('.tiff') ||
-          file.endsWith('.gif') ||
-          file.endsWith('.bmp'))
+        file.startsWith("clipboard-") &&
+        (file.endsWith(".png") ||
+          file.endsWith(".jpg") ||
+          file.endsWith(".webp") ||
+          file.endsWith(".heic") ||
+          file.endsWith(".heif") ||
+          file.endsWith(".tiff") ||
+          file.endsWith(".gif") ||
+          file.endsWith(".bmp"))
       ) {
         const filePath = path.join(tempDir, file);
         const stats = await fs.stat(filePath);
@@ -138,10 +134,7 @@ export async function cleanupOldClipboardImages(
       imageFiles.sort((a, b) => a.atime - b.atime);
 
       // Remove CLEANUP_COUNT oldest files (or all excess files if less than CLEANUP_COUNT)
-      const removeCount = Math.min(
-        CLEANUP_COUNT,
-        imageFiles.length - MAX_IMAGES + CLEANUP_COUNT,
-      );
+      const removeCount = Math.min(CLEANUP_COUNT, imageFiles.length - MAX_IMAGES + CLEANUP_COUNT);
       const filesToRemove = imageFiles.slice(0, removeCount);
       for (const file of filesToRemove) {
         await fs.unlink(file.path);
diff --git a/apps/airiscode-cli/src/ui/utils/commandUtils.ts b/apps/airiscode-cli/src/ui/utils/commandUtils.ts
index 14e9e0d8c..6809008cb 100644
--- a/apps/airiscode-cli/src/ui/utils/commandUtils.ts
+++ b/apps/airiscode-cli/src/ui/utils/commandUtils.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SpawnOptions } from 'node:child_process';
-import { spawn } from 'node:child_process';
-import { createDebugLogger } from '@airiscode/core';
+import type { SpawnOptions } from "node:child_process";
+import { spawn } from "node:child_process";
+import { createDebugLogger } from "@airiscode/core";
 
 /**
  * Common Windows console code pages (CP) used for encoding conversions.
@@ -35,7 +35,7 @@ export type CodePage = (typeof CodePage)[keyof typeof CodePage];
  */
 export const isAtCommand = (query: string): boolean =>
   // Check if starts with @ OR has a space, then @
-  query.startsWith('@') || /\s@/.test(query);
+  query.startsWith("@") || /\s@/.test(query);
 
 /**
  * Checks if a query string potentially represents an '/' command.
@@ -45,17 +45,17 @@ export const isAtCommand = (query: string): boolean =>
  * @returns True if the query looks like an '/' command, false otherwise.
  */
 export const isSlashCommand = (query: string): boolean => {
-  if (!query.startsWith('/')) {
+  if (!query.startsWith("/")) {
     return false;
   }
 
   // Exclude line comments that start with '//'
-  if (query.startsWith('//')) {
+  if (query.startsWith("//")) {
     return false;
   }
 
   // Exclude block comments that start with '/*'
-  if (query.startsWith('/*')) {
+  if (query.startsWith("/*")) {
     return false;
   }
 
@@ -73,33 +73,29 @@ export const isBtwCommand = (query: string): boolean => {
   return trimmed.length > 0 && BTW_COMMAND_RE.test(trimmed);
 };
 
-const debugLogger = createDebugLogger('COMMAND_UTILS');
+const debugLogger = createDebugLogger("COMMAND_UTILS");
 
 // Copies a string snippet to the clipboard for different platforms
 export const copyToClipboard = async (text: string): Promise<void> => {
   const run = (cmd: string, args: string[], options?: SpawnOptions) =>
     new Promise<void>((resolve, reject) => {
       const child = options ? spawn(cmd, args, options) : spawn(cmd, args);
-      let stderr = '';
+      let stderr = "";
       if (child.stderr) {
-        child.stderr.on('data', (chunk) => (stderr += chunk.toString()));
+        child.stderr.on("data", (chunk) => (stderr += chunk.toString()));
       }
-      child.on('error', reject);
-      child.on('close', (code) => {
+      child.on("error", reject);
+      child.on("close", (code) => {
         if (code === 0) return resolve();
         const errorMsg = stderr.trim();
-        reject(
-          new Error(
-            `'${cmd}' exited with code ${code}${errorMsg ? `: ${errorMsg}` : ''}`,
-          ),
-        );
+        reject(new Error(`'${cmd}' exited with code ${code}${errorMsg ? `: ${errorMsg}` : ""}`));
       });
       if (child.stdin) {
-        child.stdin.on('error', reject);
+        child.stdin.on("error", reject);
         child.stdin.write(text);
         child.stdin.end();
       } else {
-        reject(new Error('Child process has no stdin stream to write to.'));
+        reject(new Error("Child process has no stdin stream to write to."));
       }
     });
 
@@ -107,51 +103,43 @@ export const copyToClipboard = async (text: string): Promise<void> => {
   // - stdin: 'pipe' to write the text that needs to be copied.
   // - stdout: 'inherit' since we don't need to capture the command's output on success.
   // - stderr: 'pipe' to capture error messages (e.g., "command not found") for better error handling.
-  const linuxOptions: SpawnOptions = { stdio: ['pipe', 'inherit', 'pipe'] };
+  const linuxOptions: SpawnOptions = { stdio: ["pipe", "inherit", "pipe"] };
 
   switch (process.platform) {
-    case 'win32':
-      return run('cmd', ['/c', `chcp ${CodePage.UTF8} >nul && clip`]);
-    case 'darwin':
-      return run('pbcopy', []);
-    case 'linux':
+    case "win32":
+      return run("cmd", ["/c", `chcp ${CodePage.UTF8} >nul && clip`]);
+    case "darwin":
+      return run("pbcopy", []);
+    case "linux":
       try {
-        await run('xclip', ['-selection', 'clipboard'], linuxOptions);
+        await run("xclip", ["-selection", "clipboard"], linuxOptions);
       } catch (primaryError) {
         try {
           // If xclip fails for any reason, try xsel as a fallback.
-          await run('xsel', ['--clipboard', '--input'], linuxOptions);
+          await run("xsel", ["--clipboard", "--input"], linuxOptions);
         } catch (fallbackError) {
           const xclipNotFound =
             primaryError instanceof Error &&
-            (primaryError as NodeJS.ErrnoException).code === 'ENOENT';
+            (primaryError as NodeJS.ErrnoException).code === "ENOENT";
           const xselNotFound =
             fallbackError instanceof Error &&
-            (fallbackError as NodeJS.ErrnoException).code === 'ENOENT';
+            (fallbackError as NodeJS.ErrnoException).code === "ENOENT";
           if (xclipNotFound && xselNotFound) {
-            throw new Error(
-              'Please ensure xclip or xsel is installed and configured.',
-            );
+            throw new Error("Please ensure xclip or xsel is installed and configured.");
           }
 
           let primaryMsg =
-            primaryError instanceof Error
-              ? primaryError.message
-              : String(primaryError);
+            primaryError instanceof Error ? primaryError.message : String(primaryError);
           if (xclipNotFound) {
             primaryMsg = `xclip not found`;
           }
           let fallbackMsg =
-            fallbackError instanceof Error
-              ? fallbackError.message
-              : String(fallbackError);
+            fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
           if (xselNotFound) {
             fallbackMsg = `xsel not found`;
           }
 
-          throw new Error(
-            `All copy commands failed. "${primaryMsg}", "${fallbackMsg}". `,
-          );
+          throw new Error(`All copy commands failed. "${primaryMsg}", "${fallbackMsg}". `);
         }
       }
       return;
@@ -164,18 +152,18 @@ export const getUrlOpenCommand = (): string => {
   // --- Determine the OS-specific command to open URLs ---
   let openCmd: string;
   switch (process.platform) {
-    case 'darwin':
-      openCmd = 'open';
+    case "darwin":
+      openCmd = "open";
       break;
-    case 'win32':
-      openCmd = 'start';
+    case "win32":
+      openCmd = "start";
       break;
-    case 'linux':
-      openCmd = 'xdg-open';
+    case "linux":
+      openCmd = "xdg-open";
       break;
     default:
       // Default to xdg-open, which appears to be supported for the less popular operating systems.
-      openCmd = 'xdg-open';
+      openCmd = "xdg-open";
       debugLogger.warn(
         `Unknown platform: ${process.platform}. Attempting to open URLs with: ${openCmd}.`,
       );
diff --git a/apps/airiscode-cli/src/ui/utils/computeStats.ts b/apps/airiscode-cli/src/ui/utils/computeStats.ts
index cc0d870e7..1ecdfcfd9 100644
--- a/apps/airiscode-cli/src/ui/utils/computeStats.ts
+++ b/apps/airiscode-cli/src/ui/utils/computeStats.ts
@@ -5,10 +5,10 @@
  */
 
 import type {
-  SessionMetrics,
   ComputedSessionStats,
   ModelMetrics,
-} from '../contexts/SessionContext.js';
+  SessionMetrics,
+} from "../contexts/SessionContext.js";
 
 export function calculateErrorRate(metrics: ModelMetrics): number {
   if (metrics.api.totalRequests === 0) {
@@ -31,9 +31,7 @@ export function calculateCacheHitRate(metrics: ModelMetrics): number {
   return (metrics.tokens.cached / metrics.tokens.prompt) * 100;
 }
 
-export const computeSessionStats = (
-  metrics: SessionMetrics,
-): ComputedSessionStats => {
+export const computeSessionStats = (metrics: SessionMetrics): ComputedSessionStats => {
   const { models, tools, files } = metrics;
   const totalApiTime = Object.values(models).reduce(
     (acc, model) => acc + model.api.totalLatencyMs,
@@ -41,10 +39,8 @@ export const computeSessionStats = (
   );
   const totalToolTime = tools.totalDurationMs;
   const agentActiveTime = totalApiTime + totalToolTime;
-  const apiTimePercent =
-    agentActiveTime > 0 ? (totalApiTime / agentActiveTime) * 100 : 0;
-  const toolTimePercent =
-    agentActiveTime > 0 ? (totalToolTime / agentActiveTime) * 100 : 0;
+  const apiTimePercent = agentActiveTime > 0 ? (totalApiTime / agentActiveTime) * 100 : 0;
+  const toolTimePercent = agentActiveTime > 0 ? (totalToolTime / agentActiveTime) * 100 : 0;
 
   const totalCachedTokens = Object.values(models).reduce(
     (acc, model) => acc + model.tokens.cached,
@@ -54,19 +50,13 @@ export const computeSessionStats = (
     (acc, model) => acc + model.tokens.prompt,
     0,
   );
-  const cacheEfficiency =
-    totalPromptTokens > 0 ? (totalCachedTokens / totalPromptTokens) * 100 : 0;
+  const cacheEfficiency = totalPromptTokens > 0 ? (totalCachedTokens / totalPromptTokens) * 100 : 0;
 
   const totalDecisions =
-    tools.totalDecisions.accept +
-    tools.totalDecisions.reject +
-    tools.totalDecisions.modify;
-  const successRate =
-    tools.totalCalls > 0 ? (tools.totalSuccess / tools.totalCalls) * 100 : 0;
+    tools.totalDecisions.accept + tools.totalDecisions.reject + tools.totalDecisions.modify;
+  const successRate = tools.totalCalls > 0 ? (tools.totalSuccess / tools.totalCalls) * 100 : 0;
   const agreementRate =
-    totalDecisions > 0
-      ? (tools.totalDecisions.accept / totalDecisions) * 100
-      : 0;
+    totalDecisions > 0 ? (tools.totalDecisions.accept / totalDecisions) * 100 : 0;
 
   return {
     totalApiTime,
diff --git a/apps/airiscode-cli/src/ui/utils/displayUtils.ts b/apps/airiscode-cli/src/ui/utils/displayUtils.ts
index d36800f80..ec665efd5 100644
--- a/apps/airiscode-cli/src/ui/utils/displayUtils.ts
+++ b/apps/airiscode-cli/src/ui/utils/displayUtils.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { theme } from '../semantic-colors.js';
-import { AgentStatus } from '@airiscode/core';
+import { AgentStatus } from "@airiscode/core";
+import { theme } from "../semantic-colors.js";
 
 // --- Status Labels ---
 
@@ -18,19 +18,19 @@ export interface StatusLabel {
 export function getArenaStatusLabel(status: AgentStatus): StatusLabel {
   switch (status) {
     case AgentStatus.IDLE:
-      return { icon: '✓', text: 'Idle', color: theme.status.success };
+      return { icon: "✓", text: "Idle", color: theme.status.success };
     case AgentStatus.COMPLETED:
-      return { icon: '✓', text: 'Done', color: theme.status.success };
+      return { icon: "✓", text: "Done", color: theme.status.success };
     case AgentStatus.CANCELLED:
-      return { icon: '⊘', text: 'Cancelled', color: theme.status.warning };
+      return { icon: "⊘", text: "Cancelled", color: theme.status.warning };
     case AgentStatus.FAILED:
-      return { icon: '✗', text: 'Failed', color: theme.status.error };
+      return { icon: "✗", text: "Failed", color: theme.status.error };
     case AgentStatus.RUNNING:
-      return { icon: '○', text: 'Running', color: theme.text.secondary };
+      return { icon: "○", text: "Running", color: theme.text.secondary };
     case AgentStatus.INITIALIZING:
-      return { icon: '○', text: 'Initializing', color: theme.text.secondary };
+      return { icon: "○", text: "Initializing", color: theme.text.secondary };
     default:
-      return { icon: '○', text: status, color: theme.text.secondary };
+      return { icon: "○", text: status, color: theme.text.secondary };
   }
 }
 
diff --git a/apps/airiscode-cli/src/ui/utils/export/collect.ts b/apps/airiscode-cli/src/ui/utils/export/collect.ts
index f0dd84a09..5a77b7dcb 100644
--- a/apps/airiscode-cli/src/ui/utils/export/collect.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/collect.ts
@@ -4,18 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { randomUUID } from 'node:crypto';
-import type { Config, ChatRecord } from '@airiscode/core';
-import type { GenerateContentResponseUsageMetadata } from '@airiscode/core';
+import { randomUUID } from "node:crypto";
+import type { ChatRecord, Config, GenerateContentResponseUsageMetadata } from "@airiscode/core";
+
 type SessionContext = any;
 type SessionUpdate = any;
 type ToolCall = any;
 const HistoryReplayer = null as any;
-import type {
-  ExportMessage,
-  ExportSessionData,
-  ExportMetadata,
-} from './types.js';
+
+import type { ExportMessage, ExportMetadata, ExportSessionData } from "./types.js";
 
 /**
  * File operation statistics extracted from tool calls.
@@ -44,7 +41,7 @@ function extractToolNameFromRecord(record: ChatRecord): string | undefined {
   }
 
   for (const part of record.message.parts) {
-    if ('functionResponse' in part && part.functionResponse?.name) {
+    if ("functionResponse" in part && part.functionResponse?.name) {
       return part.functionResponse.name;
     }
   }
@@ -61,7 +58,7 @@ function extractFunctionResponseId(record: ChatRecord): string | undefined {
   }
 
   for (const part of record.message.parts) {
-    if ('functionResponse' in part && part.functionResponse?.id) {
+    if ("functionResponse" in part && part.functionResponse?.id) {
       return part.functionResponse.id;
     }
   }
@@ -72,16 +69,14 @@ function extractFunctionResponseId(record: ChatRecord): string | undefined {
 /**
  * Normalizes function call args into a plain object.
  */
-function normalizeFunctionCallArgs(
-  args: unknown,
-): Record<string, unknown> | undefined {
-  if (args && typeof args === 'object') {
+function normalizeFunctionCallArgs(args: unknown): Record<string, unknown> | undefined {
+  if (args && typeof args === "object") {
     return args as Record<string, unknown>;
   }
-  if (typeof args === 'string') {
+  if (typeof args === "string") {
     try {
       const parsed = JSON.parse(args) as unknown;
-      if (parsed && typeof parsed === 'object') {
+      if (parsed && typeof parsed === "object") {
         return parsed as Record<string, unknown>;
       }
     } catch {
@@ -99,17 +94,16 @@ function buildToolCallArgsIndex(records: ChatRecord[]): ToolCallArgsIndex {
   const byName = new Map<string, Array<Record<string, unknown>>>();
 
   for (const record of records) {
-    if (record.type !== 'assistant' || !record.message?.parts) continue;
+    if (record.type !== "assistant" || !record.message?.parts) continue;
 
     for (const part of record.message.parts) {
-      if (!('functionCall' in part) || !part.functionCall?.name) continue;
+      if (!("functionCall" in part) || !part.functionCall?.name) continue;
 
       const normalizedArgs = normalizeFunctionCallArgs(part.functionCall.args);
       if (!normalizedArgs) continue;
 
       const toolName = part.functionCall.name;
-      const callId =
-        typeof part.functionCall.id === 'string' ? part.functionCall.id : null;
+      const callId = typeof part.functionCall.id === "string" ? part.functionCall.id : null;
 
       if (callId) {
         byId.set(callId, normalizedArgs);
@@ -140,15 +134,12 @@ function calculateFileStats(records: ChatRecord[]): FileOperationStats {
   };
 
   for (const record of records) {
-    if (record.type !== 'tool_result' || !record.toolCallResult) continue;
+    if (record.type !== "tool_result" || !record.toolCallResult) continue;
 
     const toolName = extractToolNameFromRecord(record);
-    const callId =
-      record.toolCallResult.callId ?? extractFunctionResponseId(record);
+    const callId = record.toolCallResult.callId ?? extractFunctionResponseId(record);
     const argsFromId =
-      callId && argsIndex.byId.has(callId)
-        ? argsIndex.byId.get(callId)
-        : undefined;
+      callId && argsIndex.byId.has(callId) ? argsIndex.byId.get(callId) : undefined;
     let args = argsFromId;
     if (!args && toolName) {
       const queue = argsIndex.byName.get(toolName);
@@ -161,11 +152,7 @@ function calculateFileStats(records: ChatRecord[]): FileOperationStats {
     const { resultDisplay } = record.toolCallResult;
 
     // Track file locations from resultDisplay
-    if (
-      resultDisplay &&
-      typeof resultDisplay === 'object' &&
-      'fileName' in resultDisplay
-    ) {
+    if (resultDisplay && typeof resultDisplay === "object" && "fileName" in resultDisplay) {
       const display = resultDisplay as {
         fileName: string;
         fileDiff?: string;
@@ -175,17 +162,17 @@ function calculateFileStats(records: ChatRecord[]): FileOperationStats {
       };
 
       // Determine operation type based on content fields
-      const hasOriginalContent = 'originalContent' in display;
-      const hasNewContent = 'newContent' in display;
+      const hasOriginalContent = "originalContent" in display;
+      const hasNewContent = "newContent" in display;
 
       // For write/edit operations, use full path from args if available
       let filePath: string;
-      if (typeof display.fileName === 'string') {
+      if (typeof display.fileName === "string") {
         // Prefer args.file_path for full path, fallback to fileName (which may be basename)
-        filePath = (args?.['file_path'] as string) || display.fileName;
+        filePath = (args?.["file_path"] as string) || display.fileName;
       } else {
         // Fallback if fileName is not a string
-        filePath = 'unknown';
+        filePath = "unknown";
       }
 
       if (hasOriginalContent || hasNewContent) {
@@ -200,16 +187,12 @@ function calculateFileStats(records: ChatRecord[]): FileOperationStats {
           stats.linesRemoved += display.diffStat.model_removed_lines ?? 0;
         } else {
           // Fallback: count lines in content
-          const oldText = String(display.originalContent ?? '');
-          const newText = String(display.newContent ?? '');
+          const oldText = String(display.originalContent ?? "");
+          const newText = String(display.newContent ?? "");
 
           // Count non-empty lines
-          const oldLines = oldText
-            .split('\n')
-            .filter((line) => line.length > 0).length;
-          const newLines = newText
-            .split('\n')
-            .filter((line) => line.length > 0).length;
+          const oldLines = oldText.split("\n").filter((line) => line.length > 0).length;
+          const newLines = newText.split("\n").filter((line) => line.length > 0).length;
 
           stats.linesAdded += newLines;
           stats.linesRemoved += oldLines;
@@ -225,16 +208,16 @@ function calculateFileStats(records: ChatRecord[]): FileOperationStats {
  * Extracts token usage from TaskResultDisplay executionSummary.
  */
 function extractTaskToolTokens(record: ChatRecord): number {
-  if (record.type !== 'tool_result' || !record.toolCallResult?.resultDisplay) {
+  if (record.type !== "tool_result" || !record.toolCallResult?.resultDisplay) {
     return 0;
   }
 
   const { resultDisplay } = record.toolCallResult;
   if (
-    typeof resultDisplay === 'object' &&
-    'type' in resultDisplay &&
-    resultDisplay.type === 'task_execution' &&
-    'executionSummary' in resultDisplay
+    typeof resultDisplay === "object" &&
+    "type" in resultDisplay &&
+    resultDisplay.type === "task_execution" &&
+    "executionSummary" in resultDisplay
   ) {
     const summary = resultDisplay.executionSummary as {
       totalTokens?: number;
@@ -244,7 +227,7 @@ function extractTaskToolTokens(record: ChatRecord): number {
       cachedTokens?: number;
     };
     // Use totalTokens if available, otherwise sum individual token counts
-    if (typeof summary.totalTokens === 'number') {
+    if (typeof summary.totalTokens === "number") {
       return summary.totalTokens;
     }
     // Fallback: sum available token counts
@@ -279,7 +262,7 @@ function calculateTokenStats(records: ChatRecord[]): {
 
   // Aggregate usageMetadata from all assistant records
   for (const record of records) {
-    if (record.type === 'assistant') {
+    if (record.type === "assistant") {
       if (record.usageMetadata) {
         totalTokens += record.usageMetadata.totalTokenCount ?? 0;
       }
@@ -305,9 +288,7 @@ function calculateTokenStats(records: ChatRecord[]): {
   // Use last valid record's values for context usage calculation
   // This represents how much of the context window is being used by the total tokens
   if (lastValidRecord) {
-    const percent =
-      (lastValidRecord.totalTokenCount / lastValidRecord.contextWindowSize) *
-      100;
+    const percent = (lastValidRecord.totalTokenCount / lastValidRecord.contextWindowSize) * 100;
     return {
       totalTokens,
       contextUsagePercent: Math.round(percent * 10) / 10,
@@ -319,7 +300,7 @@ function calculateTokenStats(records: ChatRecord[]): {
   // (for display purposes only, without percentage)
   const lastAssistantRecord = [...records]
     .reverse()
-    .find((r) => r.type === 'assistant' && r.contextWindowSize !== undefined);
+    .find((r) => r.type === "assistant" && r.contextWindowSize !== undefined);
 
   return {
     totalTokens,
@@ -342,20 +323,20 @@ async function extractMetadata(
 
   // Extract basic info from the first record
   const firstRecord = messages[0];
-  const cwd = firstRecord?.cwd ?? '';
+  const cwd = firstRecord?.cwd ?? "";
   const gitBranch = firstRecord?.gitBranch;
 
   // Get git repository name
   let gitRepo: string | undefined;
   if (cwd) {
-    const { getGitRepoName } = await import('@airiscode/core');
+    const { getGitRepoName } = await import("@airiscode/core");
     gitRepo = getGitRepoName(cwd);
   }
 
   // Try to get model from assistant messages
   let model: string | undefined;
   for (const record of messages) {
-    if (record.type === 'assistant' && record.model) {
+    if (record.type === "assistant" && record.model) {
       model = record.model;
       break;
     }
@@ -365,7 +346,7 @@ async function extractMetadata(
   const channel = config.getChannel?.();
 
   // Count user prompts
-  const promptCount = messages.filter((m) => m.type === 'user').length;
+  const promptCount = messages.filter((m) => m.type === "user").length;
 
   // Calculate file stats from original ChatRecords
   const fileStats = calculateFileStats(messages);
@@ -403,15 +384,15 @@ class ExportSessionContext implements SessionContext {
   readonly config: Config;
   private messages: ExportMessage[] = [];
   private currentMessage: {
-    type: 'user' | 'assistant';
-    role: 'user' | 'assistant' | 'thinking';
+    type: "user" | "assistant";
+    role: "user" | "assistant" | "thinking";
     parts: Array<{ text: string }>;
     timestamp: number;
     usageMetadata?: GenerateContentResponseUsageMetadata;
   } | null = null;
   private activeRecordId: string | null = null;
   private activeRecordTimestamp: string | null = null;
-  private toolCallMap: Map<string, ExportMessage['toolCall']> = new Map();
+  private toolCallMap: Map<string, ExportMessage["toolCall"]> = new Map();
 
   constructor(sessionId: string, config: Config) {
     this.sessionId = sessionId;
@@ -420,10 +401,10 @@ class ExportSessionContext implements SessionContext {
 
   async sendUpdate(update: SessionUpdate): Promise<void> {
     switch (update.sessionUpdate) {
-      case 'user_message_chunk':
-        this.handleMessageChunk('user', update.content);
+      case "user_message_chunk":
+        this.handleMessageChunk("user", update.content);
         break;
-      case 'agent_message_chunk': {
+      case "agent_message_chunk": {
         // Extract usageMetadata from _meta if available
         const usageMeta = update._meta as
           | {
@@ -436,35 +417,29 @@ class ExportSessionContext implements SessionContext {
               };
             }
           | undefined;
-        const usageMetadata: GenerateContentResponseUsageMetadata | undefined =
-          usageMeta?.usage
-            ? {
-                promptTokenCount: usageMeta.usage.inputTokens,
-                candidatesTokenCount: usageMeta.usage.outputTokens,
-                totalTokenCount: usageMeta.usage.totalTokens,
-                thoughtsTokenCount: usageMeta.usage.thoughtTokens,
-                cachedContentTokenCount: usageMeta.usage.cachedReadTokens,
-              }
-            : undefined;
-        this.handleMessageChunk(
-          'assistant',
-          update.content,
-          'assistant',
-          usageMetadata,
-        );
+        const usageMetadata: GenerateContentResponseUsageMetadata | undefined = usageMeta?.usage
+          ? {
+              promptTokenCount: usageMeta.usage.inputTokens,
+              candidatesTokenCount: usageMeta.usage.outputTokens,
+              totalTokenCount: usageMeta.usage.totalTokens,
+              thoughtsTokenCount: usageMeta.usage.thoughtTokens,
+              cachedContentTokenCount: usageMeta.usage.cachedReadTokens,
+            }
+          : undefined;
+        this.handleMessageChunk("assistant", update.content, "assistant", usageMetadata);
         break;
       }
-      case 'agent_thought_chunk':
-        this.handleMessageChunk('assistant', update.content, 'thinking');
+      case "agent_thought_chunk":
+        this.handleMessageChunk("assistant", update.content, "thinking");
         break;
-      case 'tool_call':
+      case "tool_call":
         this.flushCurrentMessage();
         this.handleToolCallStart(update);
         break;
-      case 'tool_call_update':
+      case "tool_call_update":
         this.handleToolCallUpdate(update);
         break;
-      case 'plan':
+      case "plan":
         this.flushCurrentMessage();
         this.handlePlanUpdate(update);
         break;
@@ -488,18 +463,17 @@ class ExportSessionContext implements SessionContext {
   }
 
   private handleMessageChunk(
-    role: 'user' | 'assistant',
+    role: "user" | "assistant",
     content: { type: string; text?: string },
-    messageRole: 'user' | 'assistant' | 'thinking' = role,
+    messageRole: "user" | "assistant" | "thinking" = role,
     usageMetadata?: GenerateContentResponseUsageMetadata,
   ): void {
-    if (content.type !== 'text' || !content.text) return;
+    if (content.type !== "text" || !content.text) return;
 
     // If we're starting a new message type, flush the previous one
     if (
       this.currentMessage &&
-      (this.currentMessage.type !== role ||
-        this.currentMessage.role !== messageRole)
+      (this.currentMessage.type !== role || this.currentMessage.role !== messageRole)
     ) {
       this.flushCurrentMessage();
     }
@@ -512,7 +486,7 @@ class ExportSessionContext implements SessionContext {
     ) {
       this.currentMessage.parts.push({ text: content.text });
       // Merge usageMetadata if provided (for assistant messages)
-      if (usageMetadata && role === 'assistant') {
+      if (usageMetadata && role === "assistant") {
         this.currentMessage.usageMetadata = usageMetadata;
       }
     } else {
@@ -521,18 +495,17 @@ class ExportSessionContext implements SessionContext {
         role: messageRole,
         parts: [{ text: content.text }],
         timestamp: Date.now(),
-        ...(usageMetadata && role === 'assistant' ? { usageMetadata } : {}),
+        ...(usageMetadata && role === "assistant" ? { usageMetadata } : {}),
       };
     }
   }
 
   private handleToolCallStart(update: ToolCall): void {
-    const toolCall: ExportMessage['toolCall'] = {
+    const toolCall: ExportMessage["toolCall"] = {
       toolCallId: update.toolCallId,
-      kind: update.kind || 'other',
-      title:
-        typeof update.title === 'string' ? update.title : update.title || '',
-      status: update.status || 'pending',
+      kind: update.kind || "other",
+      title: typeof update.title === "string" ? update.title : update.title || "",
+      status: update.status || "pending",
       rawInput: update.rawInput as string | object | undefined,
       locations: update.locations,
       timestamp: Date.now(),
@@ -546,14 +519,14 @@ class ExportSessionContext implements SessionContext {
       uuid,
       sessionId: this.sessionId,
       timestamp: this.getMessageTimestamp(),
-      type: 'tool_call',
+      type: "tool_call",
       toolCall,
     });
   }
 
   private handleToolCallUpdate(update: {
     toolCallId: string;
-    status?: 'pending' | 'in_progress' | 'completed' | 'failed' | null;
+    status?: "pending" | "in_progress" | "completed" | "failed" | null;
     title?: string | null;
     content?: Array<{ type: string; [key: string]: unknown }> | null;
     kind?: string | null;
@@ -563,15 +536,14 @@ class ExportSessionContext implements SessionContext {
       // Update the tool call in place
       if (update.status) toolCall.status = update.status;
       if (update.content) toolCall.content = update.content;
-      if (update.title)
-        toolCall.title = typeof update.title === 'string' ? update.title : '';
+      if (update.title) toolCall.title = typeof update.title === "string" ? update.title : "";
     }
   }
 
   private handlePlanUpdate(update: {
     entries: Array<{
       content: string;
-      status: 'pending' | 'in_progress' | 'completed';
+      status: "pending" | "in_progress" | "completed";
       priority?: string;
     }>;
   }): void {
@@ -584,20 +556,16 @@ class ExportSessionContext implements SessionContext {
     const todoText = update.entries
       .map((entry) => {
         const checkbox =
-          entry.status === 'completed'
-            ? '[x]'
-            : entry.status === 'in_progress'
-              ? '[-]'
-              : '[ ]';
+          entry.status === "completed" ? "[x]" : entry.status === "in_progress" ? "[-]" : "[ ]";
         return `- ${checkbox} ${entry.content}`;
       })
-      .join('\n');
+      .join("\n");
 
     const todoContent = [
       {
-        type: 'content' as const,
+        type: "content" as const,
         content: {
-          type: 'text',
+          type: "text",
           text: todoText,
         },
       },
@@ -607,12 +575,12 @@ class ExportSessionContext implements SessionContext {
       uuid,
       sessionId: this.sessionId,
       timestamp,
-      type: 'tool_call',
+      type: "tool_call",
       toolCall: {
         toolCallId: uuid, // Use the same uuid as toolCallId for plan updates
-        kind: 'todowrite',
-        title: 'TodoWrite',
-        status: 'completed',
+        kind: "todowrite",
+        title: "TodoWrite",
+        status: "completed",
         content: todoContent,
         timestamp: Date.parse(timestamp),
       },
@@ -635,10 +603,7 @@ class ExportSessionContext implements SessionContext {
     };
 
     // Add usageMetadata for assistant messages
-    if (
-      this.currentMessage.type === 'assistant' &&
-      this.currentMessage.usageMetadata
-    ) {
+    if (this.currentMessage.type === "assistant" && this.currentMessage.usageMetadata) {
       exportMessage.usageMetadata = this.currentMessage.usageMetadata;
     }
 
@@ -669,10 +634,7 @@ export async function collectSessionData(
   config: Config,
 ): Promise<ExportSessionData> {
   // Create export session context
-  const exportContext = new ExportSessionContext(
-    conversation.sessionId,
-    config,
-  );
+  const exportContext = new ExportSessionContext(conversation.sessionId, config);
 
   // Create history replayer with export context
   const replayer = new HistoryReplayer(exportContext);
diff --git a/apps/airiscode-cli/src/ui/utils/export/formatters/html.ts b/apps/airiscode-cli/src/ui/utils/export/formatters/html.ts
index e4a0af4f6..eaec813b8 100644
--- a/apps/airiscode-cli/src/ui/utils/export/formatters/html.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/formatters/html.ts
@@ -4,20 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExportSessionData } from '../types.js';
-const HTML_TEMPLATE = '<html><body>{{content}}</body></html>';
+import type { ExportSessionData } from "../types.js";
+
+const HTML_TEMPLATE = "<html><body>{{content}}</body></html>";
 
 /**
  * Escapes JSON for safe embedding in HTML.
  */
 function escapeJsonForHtml(json: string): string {
   return json
-    .replace(/<\/script/gi, '<\\/script')
-    .replace(/&/g, '\\u0026')
-    .replace(/</g, '\\u003c')
-    .replace(/>/g, '\\u003e')
-    .replace(/\u2028/g, '\\u2028')
-    .replace(/\u2029/g, '\\u2029');
+    .replace(/<\/script/gi, "<\\/script")
+    .replace(/&/g, "\\u0026")
+    .replace(/</g, "\\u003c")
+    .replace(/>/g, "\\u003e")
+    .replace(/\u2028/g, "\\u2028")
+    .replace(/\u2029/g, "\\u2029");
 }
 
 /**
@@ -47,28 +48,27 @@ export function injectDataIntoHtmlTemplate(
     return template;
   }
 
-  const openTagStart = template.lastIndexOf('<script', idIndex);
+  const openTagStart = template.lastIndexOf("<script", idIndex);
   if (openTagStart === -1) {
     return template;
   }
 
-  const openTagEnd = template.indexOf('>', idIndex);
+  const openTagEnd = template.indexOf(">", idIndex);
   if (openTagEnd === -1) {
     return template;
   }
 
-  const closeTagStart = template.indexOf('</script>', openTagEnd);
+  const closeTagStart = template.indexOf("</script>", openTagEnd);
   if (closeTagStart === -1) {
     return template;
   }
 
-  const lineStart = template.lastIndexOf('\n', openTagStart);
-  const lineIndent =
-    lineStart === -1 ? '' : template.slice(lineStart + 1, openTagStart);
+  const lineStart = template.lastIndexOf("\n", openTagStart);
+  const lineIndent = lineStart === -1 ? "" : template.slice(lineStart + 1, openTagStart);
   const indentedJson = escapedJsonData
-    .split('\n')
+    .split("\n")
     .map((line) => `${lineIndent}${line}`)
-    .join('\n');
+    .join("\n");
 
   const before = template.slice(0, openTagEnd + 1);
   const after = template.slice(closeTagStart);
diff --git a/apps/airiscode-cli/src/ui/utils/export/formatters/json.ts b/apps/airiscode-cli/src/ui/utils/export/formatters/json.ts
index 49942bb95..005e98c9f 100644
--- a/apps/airiscode-cli/src/ui/utils/export/formatters/json.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/formatters/json.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExportSessionData } from '../types.js';
+import type { ExportSessionData } from "../types.js";
 
 /**
  * Converts ExportSessionData to JSON format.
diff --git a/apps/airiscode-cli/src/ui/utils/export/formatters/jsonl.ts b/apps/airiscode-cli/src/ui/utils/export/formatters/jsonl.ts
index 4de132bb1..09286ad46 100644
--- a/apps/airiscode-cli/src/ui/utils/export/formatters/jsonl.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/formatters/jsonl.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExportSessionData } from '../types.js';
+import type { ExportSessionData } from "../types.js";
 
 /**
  * Converts ExportSessionData to JSONL (JSON Lines) format.
@@ -16,53 +16,53 @@ export function toJsonl(sessionData: ExportSessionData): string {
 
   // Add session metadata as the first line
   const metadata: Record<string, unknown> = {
-    type: 'session_metadata',
+    type: "session_metadata",
     sessionId: sessionData.sessionId,
     startTime: sessionData.startTime,
   };
 
   // Add all metadata fields if available
   if (sourceMetadata?.exportTime) {
-    metadata['exportTime'] = sourceMetadata.exportTime;
+    metadata["exportTime"] = sourceMetadata.exportTime;
   }
   if (sourceMetadata?.cwd) {
-    metadata['cwd'] = sourceMetadata.cwd;
+    metadata["cwd"] = sourceMetadata.cwd;
   }
   if (sourceMetadata?.gitRepo) {
-    metadata['gitRepo'] = sourceMetadata.gitRepo;
+    metadata["gitRepo"] = sourceMetadata.gitRepo;
   }
   if (sourceMetadata?.gitBranch) {
-    metadata['gitBranch'] = sourceMetadata.gitBranch;
+    metadata["gitBranch"] = sourceMetadata.gitBranch;
   }
   if (sourceMetadata?.model) {
-    metadata['model'] = sourceMetadata.model;
+    metadata["model"] = sourceMetadata.model;
   }
   if (sourceMetadata?.channel) {
-    metadata['channel'] = sourceMetadata.channel;
+    metadata["channel"] = sourceMetadata.channel;
   }
   if (sourceMetadata?.promptCount !== undefined) {
-    metadata['promptCount'] = sourceMetadata.promptCount;
+    metadata["promptCount"] = sourceMetadata.promptCount;
   }
   if (sourceMetadata?.contextUsagePercent !== undefined) {
-    metadata['contextUsagePercent'] = sourceMetadata.contextUsagePercent;
+    metadata["contextUsagePercent"] = sourceMetadata.contextUsagePercent;
   }
   if (sourceMetadata?.contextWindowSize !== undefined) {
-    metadata['contextWindowSize'] = sourceMetadata.contextWindowSize;
+    metadata["contextWindowSize"] = sourceMetadata.contextWindowSize;
   }
   if (sourceMetadata?.totalTokens !== undefined) {
-    metadata['totalTokens'] = sourceMetadata.totalTokens;
+    metadata["totalTokens"] = sourceMetadata.totalTokens;
   }
   if (sourceMetadata?.filesWritten !== undefined) {
-    metadata['filesWritten'] = sourceMetadata.filesWritten;
+    metadata["filesWritten"] = sourceMetadata.filesWritten;
   }
   if (sourceMetadata?.linesAdded !== undefined) {
-    metadata['linesAdded'] = sourceMetadata.linesAdded;
+    metadata["linesAdded"] = sourceMetadata.linesAdded;
   }
   if (sourceMetadata?.linesRemoved !== undefined) {
-    metadata['linesRemoved'] = sourceMetadata.linesRemoved;
+    metadata["linesRemoved"] = sourceMetadata.linesRemoved;
   }
   if (sourceMetadata?.uniqueFiles && sourceMetadata.uniqueFiles.length > 0) {
-    metadata['uniqueFiles'] = sourceMetadata.uniqueFiles;
+    metadata["uniqueFiles"] = sourceMetadata.uniqueFiles;
   }
 
   lines.push(JSON.stringify(metadata));
@@ -72,5 +72,5 @@ export function toJsonl(sessionData: ExportSessionData): string {
     lines.push(JSON.stringify(message));
   }
 
-  return lines.join('\n');
+  return lines.join("\n");
 }
diff --git a/apps/airiscode-cli/src/ui/utils/export/formatters/markdown.ts b/apps/airiscode-cli/src/ui/utils/export/formatters/markdown.ts
index 6ee18a754..ff10e50eb 100644
--- a/apps/airiscode-cli/src/ui/utils/export/formatters/markdown.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/formatters/markdown.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExportSessionData, ExportMessage } from '../types.js';
+import type { ExportMessage, ExportSessionData } from "../types.js";
 
 /**
  * Converts ExportSessionData to markdown format.
@@ -14,14 +14,12 @@ export function toMarkdown(sessionData: ExportSessionData): string {
   const metadata = sessionData.metadata;
 
   // Add header with metadata
-  lines.push('# Chat Session Export\n');
+  lines.push("# Chat Session Export\n");
   lines.push(`- **Session ID**: \`${sanitizeText(sessionData.sessionId)}\``);
   lines.push(`- **Start Time**: ${sanitizeText(sessionData.startTime)}`);
-  lines.push(
-    `- **Exported**: ${sanitizeText(metadata?.exportTime ?? new Date().toISOString())}`,
-  );
+  lines.push(`- **Exported**: ${sanitizeText(metadata?.exportTime ?? new Date().toISOString())}`);
 
-  lines.push('');
+  lines.push("");
 
   // Add context info
   if (metadata?.cwd) {
@@ -34,7 +32,7 @@ export function toMarkdown(sessionData: ExportSessionData): string {
     lines.push(`- **Git Branch**: \`${sanitizeText(metadata.gitBranch)}\``);
   }
 
-  lines.push('');
+  lines.push("");
 
   // Add model info
   if (metadata?.model) {
@@ -47,7 +45,7 @@ export function toMarkdown(sessionData: ExportSessionData): string {
     lines.push(`- **Prompt Count**: ${metadata.promptCount}`);
   }
 
-  lines.push('');
+  lines.push("");
 
   // Add token stats
   if (metadata?.totalTokens !== undefined) {
@@ -60,7 +58,7 @@ export function toMarkdown(sessionData: ExportSessionData): string {
     lines.push(`- **Context Usage**: ${metadata.contextUsagePercent}%`);
   }
 
-  lines.push('');
+  lines.push("");
 
   // Add file operation stats
   if (metadata?.filesWritten !== undefined) {
@@ -75,41 +73,41 @@ export function toMarkdown(sessionData: ExportSessionData): string {
 
   // Add unique files list if available
   if (metadata?.uniqueFiles && metadata.uniqueFiles.length > 0) {
-    lines.push('');
-    lines.push('<details>');
+    lines.push("");
+    lines.push("<details>");
     lines.push(
       `<summary><strong>Unique Files Referenced (${metadata.uniqueFiles.length})</strong></summary>`,
     );
-    lines.push('');
+    lines.push("");
     for (const file of metadata.uniqueFiles) {
       lines.push(`- \`${sanitizeText(file)}\``);
     }
-    lines.push('</details>');
+    lines.push("</details>");
   }
 
-  lines.push('\n---\n');
+  lines.push("\n---\n");
 
   // Process each message
   for (const message of sessionData.messages) {
-    if (message.type === 'user') {
-      lines.push('## User\n');
+    if (message.type === "user") {
+      lines.push("## User\n");
       lines.push(formatMessageContent(message));
-    } else if (message.type === 'assistant') {
-      lines.push('## Assistant\n');
+    } else if (message.type === "assistant") {
+      lines.push("## Assistant\n");
       lines.push(formatMessageContent(message));
-    } else if (message.type === 'tool_call') {
+    } else if (message.type === "tool_call") {
       lines.push(formatToolCall(message));
-    } else if (message.type === 'system') {
-      lines.push('### System\n');
+    } else if (message.type === "system") {
+      lines.push("### System\n");
       // Format as blockquote
       const text = formatMessageContent(message);
-      lines.push(`> ${text.replace(/\n/g, '\n> ')}`);
+      lines.push(`> ${text.replace(/\n/g, "\n> ")}`);
     }
 
-    lines.push('\n');
+    lines.push("\n");
   }
 
-  return lines.join('\n');
+  return lines.join("\n");
 }
 
 function formatMessageContent(message: ExportMessage): string {
@@ -124,88 +122,84 @@ function formatMessageContent(message: ExportMessage): string {
 
   const processedText = text.replace(
     /--- Content from referenced files ---\n([\s\S]*?)\n--- End of content ---/g,
-    (match, content) =>
-      `\n> **Referenced Files:**\n\n${createCodeBlock(content)}\n`,
+    (match, content) => `\n> **Referenced Files:**\n\n${createCodeBlock(content)}\n`,
   );
 
   return processedText;
 }
 
 function formatToolCall(message: ExportMessage): string {
-  if (!message.toolCall) return '';
+  if (!message.toolCall) return "";
 
   const lines: string[] = [];
   const { title, status, rawInput, content, locations } = message.toolCall;
 
-  const titleStr = typeof title === 'string' ? title : JSON.stringify(title);
+  const titleStr = typeof title === "string" ? title : JSON.stringify(title);
 
   lines.push(`### Tool: ${sanitizeText(titleStr)}`);
   lines.push(`**Status**: ${sanitizeText(status)}\n`);
 
   // Input
   if (rawInput) {
-    lines.push('**Input:**');
-    const inputStr =
-      typeof rawInput === 'string'
-        ? rawInput
-        : JSON.stringify(rawInput, null, 2);
-    lines.push(createCodeBlock(inputStr, 'json'));
-    lines.push('');
+    lines.push("**Input:**");
+    const inputStr = typeof rawInput === "string" ? rawInput : JSON.stringify(rawInput, null, 2);
+    lines.push(createCodeBlock(inputStr, "json"));
+    lines.push("");
   }
 
   // Locations
   if (locations && locations.length > 0) {
-    lines.push('**Affected Files:**');
+    lines.push("**Affected Files:**");
     for (const loc of locations) {
-      const lineSuffix = loc.line ? `:${loc.line}` : '';
+      const lineSuffix = loc.line ? `:${loc.line}` : "";
       lines.push(`- \`${sanitizeText(loc.path)}${lineSuffix}\``);
     }
-    lines.push('');
+    lines.push("");
   }
 
   // Output Content
   if (content && content.length > 0) {
-    lines.push('**Output:**');
+    lines.push("**Output:**");
 
     for (const item of content) {
-      if (item.type === 'content' && item['content']) {
-        const contentData = item['content'] as { type: string; text?: string };
-        if (contentData.type === 'text' && contentData.text) {
+      if (item.type === "content" && item["content"]) {
+        const contentData = item["content"] as { type: string; text?: string };
+        if (contentData.type === "text" && contentData.text) {
           // Try to infer language from locations if available and if there is only one location
           // or if the tool title suggests a file operation.
-          let language = '';
+          let language = "";
           if (locations && locations.length === 1 && locations[0].path) {
             language = getLanguageFromPath(locations[0].path);
           }
 
           lines.push(createCodeBlock(contentData.text, language));
         }
-      } else if (item.type === 'diff') {
-        const path = item['path'] as string;
-        const diffText = item['newText'] as string;
+      } else if (item.type === "diff") {
+        const path = item["path"] as string;
+        const diffText = item["newText"] as string;
         lines.push(`\n*Diff for \`${sanitizeText(path)}\`:*`);
-        lines.push(createCodeBlock(diffText, 'diff'));
+        lines.push(createCodeBlock(diffText, "diff"));
       }
     }
   }
 
-  return lines.join('\n');
+  return lines.join("\n");
 }
 
 /**
  * Extracts text content from an export message.
  */
 function extractTextFromMessage(message: ExportMessage): string {
-  if (!message.message?.parts) return '';
+  if (!message.message?.parts) return "";
 
   const textParts: string[] = [];
   for (const part of message.message.parts) {
-    if ('text' in part) {
+    if ("text" in part) {
       textParts.push(part.text);
     }
   }
 
-  return textParts.join('\n');
+  return textParts.join("\n");
 }
 
 /**
@@ -213,7 +207,7 @@ function extractTextFromMessage(message: ExportMessage): string {
  * Does NOT escape HTML content inside the block, as that would break code readability.
  * Security is handled by the fence.
  */
-function createCodeBlock(content: string, language: string = ''): string {
+function createCodeBlock(content: string, language: string = ""): string {
   const fence = buildFence(content);
   return `${fence}${language}\n${content}\n${fence}`;
 }
@@ -223,7 +217,7 @@ function createCodeBlock(content: string, language: string = ''): string {
  * Only escapes < and & to avoid breaking Markdown structures like code blocks (if used inline) or quotes.
  */
 function sanitizeText(value: string): string {
-  return (value ?? '').replace(/&/g, '&amp;').replace(/</g, '&lt;');
+  return (value ?? "").replace(/&/g, "&amp;").replace(/</g, "&lt;");
 }
 
 /**
@@ -231,65 +225,63 @@ function sanitizeText(value: string): string {
  * Ensures the fence is longer than any sequence of backticks in the content.
  */
 function buildFence(value: string): string {
-  const matches = (value ?? '').match(/`+/g);
-  const maxRun = matches
-    ? Math.max(...matches.map((match) => match.length))
-    : 0;
+  const matches = (value ?? "").match(/`+/g);
+  const maxRun = matches ? Math.max(...matches.map((match) => match.length)) : 0;
   const fenceLength = Math.max(3, maxRun + 1);
-  return '`'.repeat(fenceLength);
+  return "`".repeat(fenceLength);
 }
 
 /**
  * Simple helper to guess language from file extension.
  */
 function getLanguageFromPath(path: string): string {
-  const ext = path.split('.').pop()?.toLowerCase();
+  const ext = path.split(".").pop()?.toLowerCase();
   switch (ext) {
-    case 'ts':
-    case 'tsx':
-      return 'typescript';
-    case 'js':
-    case 'jsx':
-    case 'mjs':
-    case 'cjs':
-      return 'javascript';
-    case 'py':
-      return 'python';
-    case 'rb':
-      return 'ruby';
-    case 'go':
-      return 'go';
-    case 'rs':
-      return 'rust';
-    case 'java':
-      return 'java';
-    case 'c':
-    case 'cpp':
-    case 'h':
-    case 'hpp':
-      return 'cpp';
-    case 'cs':
-      return 'csharp';
-    case 'html':
-      return 'html';
-    case 'css':
-      return 'css';
-    case 'json':
-      return 'json';
-    case 'md':
-      return 'markdown';
-    case 'sh':
-    case 'bash':
-    case 'zsh':
-      return 'bash';
-    case 'yaml':
-    case 'yml':
-      return 'yaml';
-    case 'xml':
-      return 'xml';
-    case 'sql':
-      return 'sql';
+    case "ts":
+    case "tsx":
+      return "typescript";
+    case "js":
+    case "jsx":
+    case "mjs":
+    case "cjs":
+      return "javascript";
+    case "py":
+      return "python";
+    case "rb":
+      return "ruby";
+    case "go":
+      return "go";
+    case "rs":
+      return "rust";
+    case "java":
+      return "java";
+    case "c":
+    case "cpp":
+    case "h":
+    case "hpp":
+      return "cpp";
+    case "cs":
+      return "csharp";
+    case "html":
+      return "html";
+    case "css":
+      return "css";
+    case "json":
+      return "json";
+    case "md":
+      return "markdown";
+    case "sh":
+    case "bash":
+    case "zsh":
+      return "bash";
+    case "yaml":
+    case "yml":
+      return "yaml";
+    case "xml":
+      return "xml";
+    case "sql":
+      return "sql";
     default:
-      return '';
+      return "";
   }
 }
diff --git a/apps/airiscode-cli/src/ui/utils/export/index.ts b/apps/airiscode-cli/src/ui/utils/export/index.ts
index b19a6114b..366fcd589 100644
--- a/apps/airiscode-cli/src/ui/utils/export/index.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/index.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export type { ExportMessage, ExportSessionData } from './types.js';
-export { collectSessionData } from './collect.js';
-export { normalizeSessionData } from './normalize.js';
-export { toMarkdown } from './formatters/markdown.js';
+export { collectSessionData } from "./collect.js";
 export {
-  toHtml,
-  loadHtmlTemplate,
   injectDataIntoHtmlTemplate,
-} from './formatters/html.js';
-export { toJson } from './formatters/json.js';
-export { toJsonl } from './formatters/jsonl.js';
-export { generateExportFilename } from './utils.js';
+  loadHtmlTemplate,
+  toHtml,
+} from "./formatters/html.js";
+export { toJson } from "./formatters/json.js";
+export { toJsonl } from "./formatters/jsonl.js";
+export { toMarkdown } from "./formatters/markdown.js";
+export { normalizeSessionData } from "./normalize.js";
+export type { ExportMessage, ExportSessionData } from "./types.js";
+export { generateExportFilename } from "./utils.js";
diff --git a/apps/airiscode-cli/src/ui/utils/export/normalize.ts b/apps/airiscode-cli/src/ui/utils/export/normalize.ts
index 5a250e699..e875ce832 100644
--- a/apps/airiscode-cli/src/ui/utils/export/normalize.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/normalize.ts
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Part } from '@airiscode/core';
-import { ExitPlanModeTool, ToolNames } from '@airiscode/core';
-import type { ChatRecord, Config, Kind } from '@airiscode/core';
-import type { ExportMessage, ExportSessionData } from './types.js';
+import type { ChatRecord, Config, Kind, Part } from "@airiscode/core";
+import { ExitPlanModeTool, ToolNames } from "@airiscode/core";
+import type { ExportMessage, ExportSessionData } from "./types.js";
 
 /**
  * Normalizes export session data by merging tool call information from tool_result records.
@@ -23,7 +22,7 @@ export function normalizeSessionData(
 
   // Build index of tool call messages
   normalized.forEach((message, index) => {
-    if (message.type === 'tool_call' && message.toolCall?.toolCallId) {
+    if (message.type === "tool_call" && message.toolCall?.toolCallId) {
       toolCallIndexById.set(message.toolCall.toolCallId, index);
     }
   });
@@ -31,35 +30,30 @@ export function normalizeSessionData(
   // Build index of assistant messages by uuid for usageMetadata merging
   const assistantMessageIndexByUuid = new Map<string, number>();
   normalized.forEach((message, index) => {
-    if (message.type === 'assistant') {
+    if (message.type === "assistant") {
       assistantMessageIndexByUuid.set(message.uuid, index);
     }
   });
 
   // Merge tool result information into tool call messages
   for (const record of originalRecords) {
-    if (record.type !== 'tool_result') continue;
+    if (record.type !== "tool_result") continue;
 
     const toolCallMessage = buildToolCallMessageFromResult(record, config);
     if (!toolCallMessage?.toolCall) continue;
 
-    const existingIndex = toolCallIndexById.get(
-      toolCallMessage.toolCall.toolCallId,
-    );
+    const existingIndex = toolCallIndexById.get(toolCallMessage.toolCall.toolCallId);
 
     if (existingIndex === undefined) {
       // No existing tool call, add this one
-      toolCallIndexById.set(
-        toolCallMessage.toolCall.toolCallId,
-        normalized.length,
-      );
+      toolCallIndexById.set(toolCallMessage.toolCall.toolCallId, normalized.length);
       normalized.push(toolCallMessage);
       continue;
     }
 
     // Merge into existing tool call
     const existingMessage = normalized[existingIndex];
-    if (existingMessage.type !== 'tool_call' || !existingMessage.toolCall) {
+    if (existingMessage.type !== "tool_call" || !existingMessage.toolCall) {
       continue;
     }
 
@@ -68,7 +62,7 @@ export function normalizeSessionData(
 
   // Merge usageMetadata from assistant records
   for (const record of originalRecords) {
-    if (record.type !== 'assistant') continue;
+    if (record.type !== "assistant") continue;
     if (!record.usageMetadata) continue;
 
     const existingIndex = assistantMessageIndexByUuid.get(record.uuid);
@@ -90,22 +84,22 @@ export function normalizeSessionData(
  * Merges incoming tool call data into existing tool call.
  */
 function mergeToolCallData(
-  existing: NonNullable<ExportMessage['toolCall']>,
-  incoming: NonNullable<ExportMessage['toolCall']>,
+  existing: NonNullable<ExportMessage["toolCall"]>,
+  incoming: NonNullable<ExportMessage["toolCall"]>,
 ): void {
   if (!existing.content || existing.content.length === 0) {
     existing.content = incoming.content;
   }
-  if (existing.status === 'pending' || existing.status === 'in_progress') {
+  if (existing.status === "pending" || existing.status === "in_progress") {
     existing.status = incoming.status;
   }
   if (!existing.rawInput && incoming.rawInput) {
     existing.rawInput = incoming.rawInput;
   }
-  if (!existing.kind || existing.kind === 'other') {
+  if (!existing.kind || existing.kind === "other") {
     existing.kind = incoming.kind;
   }
-  if ((!existing.title || existing.title === '') && incoming.title) {
+  if ((!existing.title || existing.title === "") && incoming.title) {
     existing.title = incoming.title;
   }
   if (
@@ -120,10 +114,7 @@ function mergeToolCallData(
 /**
  * Builds a tool call message from a tool_result ChatRecord.
  */
-function buildToolCallMessageFromResult(
-  record: ChatRecord,
-  config: Config,
-): ExportMessage | null {
+function buildToolCallMessageFromResult(record: ChatRecord, config: Config): ExportMessage | null {
   const toolCallResult = record.toolCallResult;
   const toolName = extractToolNameFromRecord(record);
 
@@ -138,12 +129,10 @@ function buildToolCallMessageFromResult(
   const { kind, title, locations } = resolveToolMetadata(
     config,
     toolName,
-    functionCallArgs ??
-      (toolCallResult as { args?: Record<string, unknown> } | undefined)?.args,
+    functionCallArgs ?? (toolCallResult as { args?: Record<string, unknown> } | undefined)?.args,
   );
   const rawInput = normalizeRawInput(
-    functionCallArgs ??
-      (toolCallResult as { args?: unknown } | undefined)?.args,
+    functionCallArgs ?? (toolCallResult as { args?: unknown } | undefined)?.args,
   );
 
   const content =
@@ -155,12 +144,12 @@ function buildToolCallMessageFromResult(
     parentUuid: record.parentUuid,
     sessionId: record.sessionId,
     timestamp: record.timestamp,
-    type: 'tool_call',
+    type: "tool_call",
     toolCall: {
       toolCallId,
       kind,
       title,
-      status: toolCallResult?.error ? 'failed' : 'completed',
+      status: toolCallResult?.error ? "failed" : "completed",
       rawInput,
       content,
       locations,
@@ -174,30 +163,28 @@ function buildToolCallMessageFromResult(
  */
 function extractToolNameFromRecord(record: ChatRecord): string {
   if (!record.message?.parts) {
-    return '';
+    return "";
   }
 
   for (const part of record.message.parts) {
-    if ('functionResponse' in part && part.functionResponse?.name) {
+    if ("functionResponse" in part && part.functionResponse?.name) {
       return part.functionResponse.name;
     }
   }
 
-  return '';
+  return "";
 }
 
 /**
  * Extracts function call args from a ChatRecord.
  */
-function extractFunctionCallArgs(
-  record: ChatRecord,
-): Record<string, unknown> | undefined {
+function extractFunctionCallArgs(record: ChatRecord): Record<string, unknown> | undefined {
   if (!record.message?.parts) {
     return undefined;
   }
 
   for (const part of record.message.parts) {
-    if ('functionCall' in part && part.functionCall?.args) {
+    if ("functionCall" in part && part.functionCall?.args) {
       return part.functionCall.args as Record<string, unknown>;
     }
   }
@@ -220,7 +207,7 @@ function resolveToolMetadata(
   const toolRegistry = config.getToolRegistry?.();
   const tool = toolName ? toolRegistry?.getTool?.(toolName) : undefined;
 
-  let title: string | object = tool?.displayName ?? toolName ?? 'tool_call';
+  let title: string | object = tool?.displayName ?? toolName ?? "tool_call";
   let locations: Array<{ path: string; line?: number | null }> | undefined;
   const kind = mapToolKind(tool?.kind as Kind | undefined, toolName);
 
@@ -245,30 +232,30 @@ function resolveToolMetadata(
  */
 function mapToolKind(kind: Kind | undefined, toolName?: string): string {
   if (toolName && toolName === ExitPlanModeTool.Name) {
-    return 'switch_mode';
+    return "switch_mode";
   }
 
   if (toolName && toolName === ToolNames.TODO_WRITE) {
-    return 'todowrite';
+    return "todowrite";
   }
 
   const allowedKinds = new Set<string>([
-    'read',
-    'edit',
-    'delete',
-    'move',
-    'search',
-    'execute',
-    'think',
-    'fetch',
-    'other',
+    "read",
+    "edit",
+    "delete",
+    "move",
+    "search",
+    "execute",
+    "think",
+    "fetch",
+    "other",
   ]);
 
   if (kind && allowedKinds.has(kind)) {
     return kind;
   }
 
-  return 'other';
+  return "other";
 }
 
 /**
@@ -277,18 +264,18 @@ function mapToolKind(kind: Kind | undefined, toolName?: string): string {
 function extractDiffContent(
   resultDisplay: unknown,
 ): Array<{ type: string; [key: string]: unknown }> | null {
-  if (!resultDisplay || typeof resultDisplay !== 'object') {
+  if (!resultDisplay || typeof resultDisplay !== "object") {
     return null;
   }
 
   const display = resultDisplay as Record<string, unknown>;
-  if ('fileName' in display && 'newContent' in display) {
+  if ("fileName" in display && "newContent" in display) {
     return [
       {
-        type: 'diff',
-        path: display['fileName'] as string,
-        oldText: (display['originalContent'] as string) ?? '',
-        newText: display['newContent'] as string,
+        type: "diff",
+        path: display["fileName"] as string,
+        oldText: (display["originalContent"] as string) ?? "",
+        newText: display["newContent"] as string,
       },
     ];
   }
@@ -300,8 +287,8 @@ function extractDiffContent(
  * Normalizes raw input to string or object.
  */
 function normalizeRawInput(value: unknown): string | object | undefined {
-  if (typeof value === 'string') return value;
-  if (typeof value === 'object' && value !== null) return value;
+  if (typeof value === "string") return value;
+  if (typeof value === "object" && value !== null) return value;
   return undefined;
 }
 
@@ -314,30 +301,27 @@ function transformPartsToToolCallContent(
   const content: Array<{ type: string; [key: string]: unknown }> = [];
 
   for (const part of parts) {
-    if ('text' in part && part.text) {
+    if ("text" in part && part.text) {
       content.push({
-        type: 'content',
-        content: { type: 'text', text: part.text },
+        type: "content",
+        content: { type: "text", text: part.text },
       });
       continue;
     }
 
-    if ('functionResponse' in part && part.functionResponse) {
-      const response = part.functionResponse.response as Record<
-        string,
-        unknown
-      >;
-      const outputField = response?.['output'];
-      const errorField = response?.['error'];
+    if ("functionResponse" in part && part.functionResponse) {
+      const response = part.functionResponse.response as Record<string, unknown>;
+      const outputField = response?.["output"];
+      const errorField = response?.["error"];
       const responseText =
-        typeof outputField === 'string'
+        typeof outputField === "string"
           ? outputField
-          : typeof errorField === 'string'
+          : typeof errorField === "string"
             ? errorField
             : JSON.stringify(response);
       content.push({
-        type: 'content',
-        content: { type: 'text', text: responseText },
+        type: "content",
+        content: { type: "text", text: responseText },
       });
     }
   }
diff --git a/apps/airiscode-cli/src/ui/utils/export/types.ts b/apps/airiscode-cli/src/ui/utils/export/types.ts
index 7e09f99f9..54343670e 100644
--- a/apps/airiscode-cli/src/ui/utils/export/types.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentResponseUsageMetadata } from '@airiscode/core';
+import type { GenerateContentResponseUsageMetadata } from "@airiscode/core";
 
 /**
  * Universal export message format - SSOT for all export formats.
@@ -15,7 +15,7 @@ export interface ExportMessage {
   parentUuid?: string | null;
   sessionId?: string;
   timestamp: string;
-  type: 'user' | 'assistant' | 'system' | 'tool_call';
+  type: "user" | "assistant" | "system" | "tool_call";
 
   /** For user/assistant messages */
   message?: {
@@ -35,7 +35,7 @@ export interface ExportMessage {
     toolCallId: string;
     kind: string;
     title: string | object;
-    status: 'pending' | 'in_progress' | 'completed' | 'failed';
+    status: "pending" | "in_progress" | "completed" | "failed";
     rawInput?: string | object;
     content?: Array<{
       type: string;
diff --git a/apps/airiscode-cli/src/ui/utils/export/utils.ts b/apps/airiscode-cli/src/ui/utils/export/utils.ts
index 7eaf56432..aba124432 100644
--- a/apps/airiscode-cli/src/ui/utils/export/utils.ts
+++ b/apps/airiscode-cli/src/ui/utils/export/utils.ts
@@ -8,6 +8,6 @@
  * Generates a filename with timestamp for export files.
  */
 export function generateExportFilename(extension: string): string {
-  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
   return `airiscode-export-${timestamp}.${extension}`;
 }
diff --git a/apps/airiscode-cli/src/ui/utils/formatters.ts b/apps/airiscode-cli/src/ui/utils/formatters.ts
index 38afaaa30..8bc0f8ab3 100644
--- a/apps/airiscode-cli/src/ui/utils/formatters.ts
+++ b/apps/airiscode-cli/src/ui/utils/formatters.ts
@@ -38,21 +38,21 @@ export const formatRelativeTime = (timestamp: number): string => {
   const months = Math.floor(days / 30);
 
   if (months > 0) {
-    return months === 1 ? '1 month ago' : `${months} months ago`;
+    return months === 1 ? "1 month ago" : `${months} months ago`;
   }
   if (weeks > 0) {
-    return weeks === 1 ? '1 week ago' : `${weeks} weeks ago`;
+    return weeks === 1 ? "1 week ago" : `${weeks} weeks ago`;
   }
   if (days > 0) {
-    return days === 1 ? '1 day ago' : `${days} days ago`;
+    return days === 1 ? "1 day ago" : `${days} days ago`;
   }
   if (hours > 0) {
-    return hours === 1 ? '1 hour ago' : `${hours} hours ago`;
+    return hours === 1 ? "1 hour ago" : `${hours} hours ago`;
   }
   if (minutes > 0) {
-    return minutes === 1 ? '1 minute ago' : `${minutes} minutes ago`;
+    return minutes === 1 ? "1 minute ago" : `${minutes} minutes ago`;
   }
-  return 'just now';
+  return "just now";
 };
 
 export const formatTokenCount = (count: number): string => {
@@ -67,7 +67,7 @@ export const formatTokenCount = (count: number): string => {
 
 export const formatDuration = (milliseconds: number): string => {
   if (milliseconds <= 0) {
-    return '0s';
+    return "0s";
   }
 
   if (milliseconds < 1000) {
@@ -103,5 +103,5 @@ export const formatDuration = (milliseconds: number): string => {
     return `${seconds}s`;
   }
 
-  return parts.join(' ');
+  return parts.join(" ");
 };
diff --git a/apps/airiscode-cli/src/ui/utils/highlight.ts b/apps/airiscode-cli/src/ui/utils/highlight.ts
index 1e48b36f1..ee398c870 100644
--- a/apps/airiscode-cli/src/ui/utils/highlight.ts
+++ b/apps/airiscode-cli/src/ui/utils/highlight.ts
@@ -4,21 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { cpLen, cpSlice } from './textUtils.js';
+import { cpLen, cpSlice } from "./textUtils.js";
 
 export type HighlightToken = {
   text: string;
-  type: 'default' | 'command' | 'file';
+  type: "default" | "command" | "file";
 };
 
 const HIGHLIGHT_REGEX = /(^\/[a-zA-Z0-9_-]+|@(?:\\ |[a-zA-Z0-9_./-])+)/g;
 
-export function parseInputForHighlighting(
-  text: string,
-  index: number,
-): readonly HighlightToken[] {
+export function parseInputForHighlighting(text: string, index: number): readonly HighlightToken[] {
   if (!text) {
-    return [{ text: '', type: 'default' }];
+    return [{ text: "", type: "default" }];
   }
 
   const tokens: HighlightToken[] = [];
@@ -33,17 +30,17 @@ export function parseInputForHighlighting(
     if (matchIndex > lastIndex) {
       tokens.push({
         text: text.slice(lastIndex, matchIndex),
-        type: 'default',
+        type: "default",
       });
     }
 
     // Add the matched token
-    const type = fullMatch.startsWith('/') ? 'command' : 'file';
+    const type = fullMatch.startsWith("/") ? "command" : "file";
     // Only highlight slash commands if the index is 0.
-    if (type === 'command' && index !== 0) {
+    if (type === "command" && index !== 0) {
       tokens.push({
         text: fullMatch,
-        type: 'default',
+        type: "default",
       });
     } else {
       tokens.push({
@@ -59,7 +56,7 @@ export function parseInputForHighlighting(
   if (lastIndex < text.length) {
     tokens.push({
       text: text.slice(lastIndex),
-      type: 'default',
+      type: "default",
     });
   }
 
diff --git a/apps/airiscode-cli/src/ui/utils/kittyProtocolDetector.ts b/apps/airiscode-cli/src/ui/utils/kittyProtocolDetector.ts
index a46390603..7ebd9cb41 100644
--- a/apps/airiscode-cli/src/ui/utils/kittyProtocolDetector.ts
+++ b/apps/airiscode-cli/src/ui/utils/kittyProtocolDetector.ts
@@ -30,21 +30,21 @@ export async function detectAndEnableKittyProtocol(): Promise<boolean> {
       process.stdin.setRawMode(true);
     }
 
-    let responseBuffer = '';
+    let responseBuffer = "";
     let progressiveEnhancementReceived = false;
     let timeoutId: NodeJS.Timeout | undefined;
 
     const onTimeout = () => {
       timeoutId = undefined;
-      process.stdin.removeListener('data', handleData);
+      process.stdin.removeListener("data", handleData);
 
       // Keep a drain handler briefly to consume any late-arriving terminal
       // responses that would otherwise leak into the application input.
       const drainHandler = () => {};
-      process.stdin.on('data', drainHandler);
+      process.stdin.on("data", drainHandler);
 
       setTimeout(() => {
-        process.stdin.removeListener('data', drainHandler);
+        process.stdin.removeListener("data", drainHandler);
         if (!originalRawMode) {
           process.stdin.setRawMode(false);
         }
@@ -61,7 +61,7 @@ export async function detectAndEnableKittyProtocol(): Promise<boolean> {
       responseBuffer += data.toString();
 
       // Check for progressive enhancement response (CSI ? <flags> u)
-      if (responseBuffer.includes('\x1b[?') && responseBuffer.includes('u')) {
+      if (responseBuffer.includes("\x1b[?") && responseBuffer.includes("u")) {
         progressiveEnhancementReceived = true;
         // Give more time to get the full set of kitty responses if we have an
         // indication the terminal probably supports kitty and we just need to
@@ -71,10 +71,10 @@ export async function detectAndEnableKittyProtocol(): Promise<boolean> {
       }
 
       // Check for device attributes response (CSI ? <attrs> c)
-      if (responseBuffer.includes('\x1b[?') && responseBuffer.includes('c')) {
+      if (responseBuffer.includes("\x1b[?") && responseBuffer.includes("c")) {
         clearTimeout(timeoutId);
         timeoutId = undefined;
-        process.stdin.removeListener('data', handleData);
+        process.stdin.removeListener("data", handleData);
 
         if (!originalRawMode) {
           process.stdin.setRawMode(false);
@@ -82,13 +82,13 @@ export async function detectAndEnableKittyProtocol(): Promise<boolean> {
 
         if (progressiveEnhancementReceived) {
           // Enable the protocol
-          process.stdout.write('\x1b[>1u');
+          process.stdout.write("\x1b[>1u");
           protocolSupported = true;
           protocolEnabled = true;
 
           // Set up cleanup on exit
-          process.on('exit', disableProtocol);
-          process.on('SIGTERM', disableProtocol);
+          process.on("exit", disableProtocol);
+          process.on("SIGTERM", disableProtocol);
         }
 
         detectionComplete = true;
@@ -96,11 +96,11 @@ export async function detectAndEnableKittyProtocol(): Promise<boolean> {
       }
     };
 
-    process.stdin.on('data', handleData);
+    process.stdin.on("data", handleData);
 
     // Send queries
-    process.stdout.write('\x1b[?u'); // Query progressive enhancement
-    process.stdout.write('\x1b[c'); // Query device attributes
+    process.stdout.write("\x1b[?u"); // Query progressive enhancement
+    process.stdout.write("\x1b[c"); // Query device attributes
 
     // Timeout after 200ms
     // When a iterm2 terminal does not have focus this can take over 90s on a
@@ -111,7 +111,7 @@ export async function detectAndEnableKittyProtocol(): Promise<boolean> {
 
 function disableProtocol() {
   if (protocolEnabled) {
-    process.stdout.write('\x1b[<u');
+    process.stdout.write("\x1b[<u");
     protocolEnabled = false;
   }
 }
diff --git a/apps/airiscode-cli/src/ui/utils/layoutUtils.ts b/apps/airiscode-cli/src/ui/utils/layoutUtils.ts
index 208babcfc..e538ba801 100644
--- a/apps/airiscode-cli/src/ui/utils/layoutUtils.ts
+++ b/apps/airiscode-cli/src/ui/utils/layoutUtils.ts
@@ -22,9 +22,7 @@ export const calculatePromptWidths = (terminalWidth: number) => {
   const MIN_CONTENT_WIDTH = 2;
 
   const innerContentWidth =
-    Math.floor(terminalWidth * widthFraction) -
-    FRAME_PADDING_AND_BORDER -
-    PROMPT_PREFIX_WIDTH;
+    Math.floor(terminalWidth * widthFraction) - FRAME_PADDING_AND_BORDER - PROMPT_PREFIX_WIDTH;
 
   const inputWidth = Math.max(MIN_CONTENT_WIDTH, innerContentWidth);
   const FRAME_OVERHEAD = FRAME_PADDING_AND_BORDER + PROMPT_PREFIX_WIDTH;
diff --git a/apps/airiscode-cli/src/ui/utils/markdownUtilities.ts b/apps/airiscode-cli/src/ui/utils/markdownUtilities.ts
index 6a34f1387..eabb475fa 100644
--- a/apps/airiscode-cli/src/ui/utils/markdownUtilities.ts
+++ b/apps/airiscode-cli/src/ui/utils/markdownUtilities.ts
@@ -41,14 +41,11 @@ This function aims to find an *intelligent* or "safe" index within the provided
  * @param indexToTest The character index to test.
  * @returns True if the index is inside a code block's content, false otherwise.
  */
-const isIndexInsideCodeBlock = (
-  content: string,
-  indexToTest: number,
-): boolean => {
+const isIndexInsideCodeBlock = (content: string, indexToTest: number): boolean => {
   let fenceCount = 0;
   let searchPos = 0;
   while (searchPos < content.length) {
-    const nextFence = content.indexOf('```', searchPos);
+    const nextFence = content.indexOf("```", searchPos);
     if (nextFence === -1 || nextFence >= indexToTest) {
       break;
     }
@@ -65,20 +62,17 @@ const isIndexInsideCodeBlock = (
  * @param index The index to check.
  * @returns Start index of the enclosing code block or -1.
  */
-const findEnclosingCodeBlockStart = (
-  content: string,
-  index: number,
-): number => {
+const findEnclosingCodeBlockStart = (content: string, index: number): number => {
   if (!isIndexInsideCodeBlock(content, index)) {
     return -1;
   }
   let currentSearchPos = 0;
   while (currentSearchPos < index) {
-    const blockStartIndex = content.indexOf('```', currentSearchPos);
+    const blockStartIndex = content.indexOf("```", currentSearchPos);
     if (blockStartIndex === -1 || blockStartIndex >= index) {
       break;
     }
-    const blockEndIndex = content.indexOf('```', blockStartIndex + 3);
+    const blockEndIndex = content.indexOf("```", blockStartIndex + 3);
     if (blockStartIndex < index) {
       if (blockEndIndex === -1 || index < blockEndIndex + 3) {
         return blockStartIndex;
@@ -91,10 +85,7 @@ const findEnclosingCodeBlockStart = (
 };
 
 export const findLastSafeSplitPoint = (content: string) => {
-  const enclosingBlockStart = findEnclosingCodeBlockStart(
-    content,
-    content.length,
-  );
+  const enclosingBlockStart = findEnclosingCodeBlockStart(content, content.length);
   if (enclosingBlockStart !== -1) {
     // The end of the content is contained in a code block. Split right before.
     return enclosingBlockStart;
@@ -103,7 +94,7 @@ export const findLastSafeSplitPoint = (content: string) => {
   // Search for the last double newline (\n\n) not in a code block.
   let searchStartIndex = content.length;
   while (searchStartIndex >= 0) {
-    const dnlIndex = content.lastIndexOf('\n\n', searchStartIndex);
+    const dnlIndex = content.lastIndexOf("\n\n", searchStartIndex);
     if (dnlIndex === -1) {
       // No more double newlines found.
       break;
diff --git a/apps/airiscode-cli/src/ui/utils/platformConstants.ts b/apps/airiscode-cli/src/ui/utils/platformConstants.ts
index 7993883d6..22e954884 100644
--- a/apps/airiscode-cli/src/ui/utils/platformConstants.ts
+++ b/apps/airiscode-cli/src/ui/utils/platformConstants.ts
@@ -15,7 +15,7 @@
  * Kitty keyboard protocol sequences for enhanced keyboard input.
  * @see https://sw.kovidgoyal.net/kitty/keyboard-protocol/
  */
-export const KITTY_CTRL_C = '[99;5u';
+export const KITTY_CTRL_C = "[99;5u";
 
 /**
  * Kitty keyboard protocol keycodes
@@ -58,7 +58,7 @@ export const CTRL_EXIT_PROMPT_DURATION_MS = 1000;
 /**
  * VS Code terminal integration constants
  */
-export const VSCODE_SHIFT_ENTER_SEQUENCE = '\\\r\n';
+export const VSCODE_SHIFT_ENTER_SEQUENCE = "\\\r\n";
 
 /**
  * Backslash + Enter detection window in milliseconds.
diff --git a/apps/airiscode-cli/src/ui/utils/resumeHistoryUtils.ts b/apps/airiscode-cli/src/ui/utils/resumeHistoryUtils.ts
index fd6c5a3b6..71d879b1a 100644
--- a/apps/airiscode-cli/src/ui/utils/resumeHistoryUtils.ts
+++ b/apps/airiscode-cli/src/ui/utils/resumeHistoryUtils.ts
@@ -4,40 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import type { Part, FunctionCall } from '@airiscode/core';
+import * as path from "node:path";
 import type {
-  ResumedSessionData,
-  ConversationRecord,
-  Config,
   AnyDeclarativeTool,
-  ToolResultDisplay,
-  SlashCommandRecordPayload,
   AtCommandRecordPayload,
-} from '@airiscode/core';
-import type {
-  HistoryItem,
-  HistoryItemWithoutId,
-  IndividualToolCallDisplay,
-} from '../types.js';
-import { ToolCallStatus } from '../types.js';
+  Config,
+  ConversationRecord,
+  FunctionCall,
+  Part,
+  ResumedSessionData,
+  SlashCommandRecordPayload,
+  ToolResultDisplay,
+} from "@airiscode/core";
+import type { HistoryItem, HistoryItemWithoutId, IndividualToolCallDisplay } from "../types.js";
+import { ToolCallStatus } from "../types.js";
 
 /**
  * Extracts text content from a Content object's parts (excluding thought parts).
  */
 function extractTextFromParts(parts: Part[] | undefined): string {
-  if (!parts) return '';
+  if (!parts) return "";
 
   const textParts: string[] = [];
   for (const part of parts) {
-    if ('text' in part && part.text) {
+    if ("text" in part && part.text) {
       // Skip thought parts - they have a 'thought' property
-      if (!('thought' in part && part.thought)) {
+      if (!("thought" in part && part.thought)) {
         textParts.push(part.text);
       }
     }
   }
-  return textParts.join('\n');
+  return textParts.join("\n");
 }
 
 /**
@@ -45,15 +42,15 @@ function extractTextFromParts(parts: Part[] | undefined): string {
  * Thought parts are identified by having `thought: true`.
  */
 function extractThoughtTextFromParts(parts: Part[] | undefined): string {
-  if (!parts) return '';
+  if (!parts) return "";
 
   const thoughtParts: string[] = [];
   for (const part of parts) {
-    if ('text' in part && part.text && 'thought' in part && part.thought) {
+    if ("text" in part && part.text && "thought" in part && part.thought) {
       thoughtParts.push(part.text);
     }
   }
-  return thoughtParts.join('\n');
+  return thoughtParts.join("\n");
 }
 
 /**
@@ -70,11 +67,11 @@ function extractFunctionCalls(
     args: Record<string, unknown>;
   }> = [];
   for (const part of parts) {
-    if ('functionCall' in part && part.functionCall) {
+    if ("functionCall" in part && part.functionCall) {
       const fc = part.functionCall as FunctionCall;
       calls.push({
         id: fc.id || `call-${calls.length}`,
-        name: fc.name || 'unknown',
+        name: fc.name || "unknown",
         args: (fc.args as Record<string, unknown>) || {},
       });
     }
@@ -91,20 +88,17 @@ function getTool(config: Config, name: string): AnyDeclarativeTool | undefined {
  * Formats a tool description from its name and arguments using actual tool instances.
  * This ensures we get the exact same descriptions as during normal operation.
  */
-function formatToolDescription(
-  tool: AnyDeclarativeTool,
-  args: Record<string, unknown>,
-): string {
+function formatToolDescription(tool: AnyDeclarativeTool, args: Record<string, unknown>): string {
   try {
     // Create tool invocation instance and get description
     const invocation = tool.build(args);
     return invocation.getDescription();
   } catch {
     // Fallback: use the description arg directly if available
-    if (typeof args['description'] === 'string') {
-      return args['description'];
+    if (typeof args["description"] === "string") {
+      return args["description"];
     }
-    return '';
+    return "";
   }
 }
 
@@ -113,19 +107,19 @@ function formatToolDescription(
  * SlashCommandRecordPayload.outputHistoryItems.
  */
 function restoreHistoryItem(raw: unknown): HistoryItemWithoutId | undefined {
-  if (!raw || typeof raw !== 'object') {
+  if (!raw || typeof raw !== "object") {
     return;
   }
 
   const clone = { ...(raw as Record<string, unknown>) };
-  if ('timestamp' in clone) {
-    const ts = clone['timestamp'];
-    if (typeof ts === 'string' || typeof ts === 'number') {
-      clone['timestamp'] = new Date(ts);
+  if ("timestamp" in clone) {
+    const ts = clone["timestamp"];
+    if (typeof ts === "string" || typeof ts === "number") {
+      clone["timestamp"] = new Date(ts);
     }
   }
 
-  if (typeof clone['type'] !== 'string') {
+  if (typeof clone["type"] !== "string") {
     return;
   }
 
@@ -151,10 +145,7 @@ function convertToHistoryItems(
   let atCommandCounter = 0;
 
   // Track pending tool calls for grouping with results
-  const pendingToolCalls = new Map<
-    string,
-    { name: string; args: Record<string, unknown> }
-  >();
+  const pendingToolCalls = new Map<string, { name: string; args: Record<string, unknown> }>();
   let currentToolGroup: Array<{
     callId: string;
     name: string;
@@ -164,23 +155,18 @@ function convertToHistoryItems(
     confirmationDetails: undefined;
   }> = [];
 
-  const buildAtCommandDisplays = (
-    payload: AtCommandRecordPayload,
-  ): IndividualToolCallDisplay[] => {
+  const buildAtCommandDisplays = (payload: AtCommandRecordPayload): IndividualToolCallDisplay[] => {
     // Error case: single "Read File(s)" with error message
-    if (payload.status === 'error') {
+    if (payload.status === "error") {
       atCommandCounter += 1;
-      const filesLabel = payload.filesRead?.length
-        ? payload.filesRead.join(', ')
-        : 'files';
+      const filesLabel = payload.filesRead?.length ? payload.filesRead.join(", ") : "files";
       return [
         {
           callId: `at-command-${atCommandCounter}`,
-          name: 'Read File(s)',
-          description: 'Error attempting to read files',
+          name: "Read File(s)",
+          description: "Error attempting to read files",
           status: ToolCallStatus.Error,
-          resultDisplay:
-            payload.message || `Error reading files (${filesLabel})`,
+          resultDisplay: payload.message || `Error reading files (${filesLabel})`,
           confirmationDetails: undefined,
         },
       ];
@@ -192,8 +178,8 @@ function convertToHistoryItems(
       return [
         {
           callId: `at-command-${atCommandCounter}`,
-          name: 'Read File',
-          description: 'Read File(s)',
+          name: "Read File",
+          description: "Read File(s)",
           status: ToolCallStatus.Success,
           resultDisplay: undefined,
           confirmationDetails: undefined,
@@ -203,10 +189,10 @@ function convertToHistoryItems(
 
     return payload.filesRead.map((filePath) => {
       atCommandCounter += 1;
-      const isDir = filePath.endsWith('/');
+      const isDir = filePath.endsWith("/");
       return {
         callId: `at-command-${atCommandCounter}`,
-        name: isDir ? 'Read Directory' : 'Read File',
+        name: isDir ? "Read Directory" : "Read File",
         description: isDir
           ? `Read directory ${path.basename(filePath)}`
           : `Read file ${path.basename(filePath)}`,
@@ -218,24 +204,22 @@ function convertToHistoryItems(
   };
 
   for (const record of conversation.messages) {
-    if (record.type === 'system') {
-      if (record.subtype === 'slash_command') {
+    if (record.type === "system") {
+      if (record.subtype === "slash_command") {
         // Flush any pending tool group to avoid mixing contexts.
         if (currentToolGroup.length > 0) {
           items.push({
-            type: 'tool_group',
+            type: "tool_group",
             tools: [...currentToolGroup],
           });
           currentToolGroup = [];
         }
-        const payload = record.systemPayload as
-          | SlashCommandRecordPayload
-          | undefined;
+        const payload = record.systemPayload as SlashCommandRecordPayload | undefined;
         if (!payload) continue;
-        if (payload.phase === 'invocation' && payload.rawCommand) {
-          items.push({ type: 'user', text: payload.rawCommand });
+        if (payload.phase === "invocation" && payload.rawCommand) {
+          items.push({ type: "user", text: payload.rawCommand });
         }
-        if (payload.phase === 'result') {
+        if (payload.phase === "result") {
           const outputs = payload.outputHistoryItems ?? [];
           for (const raw of outputs) {
             const restored = restoreHistoryItem(raw);
@@ -245,39 +229,35 @@ function convertToHistoryItems(
           }
         }
       }
-      if (record.subtype === 'at_command') {
-        const payload = record.systemPayload as
-          | AtCommandRecordPayload
-          | undefined;
+      if (record.subtype === "at_command") {
+        const payload = record.systemPayload as AtCommandRecordPayload | undefined;
         if (!payload) continue;
         pendingAtCommands.push(payload);
       }
       continue;
     }
     switch (record.type) {
-      case 'user': {
+      case "user": {
         if (pendingAtCommands.length > 0) {
           // Flush any pending tool group before user message
           if (currentToolGroup.length > 0) {
             items.push({
-              type: 'tool_group',
+              type: "tool_group",
               tools: [...currentToolGroup],
             });
             currentToolGroup = [];
           }
 
           const payload = pendingAtCommands.shift()!;
-          const text =
-            payload.userText ||
-            extractTextFromParts(record.message?.parts as Part[]);
+          const text = payload.userText || extractTextFromParts(record.message?.parts as Part[]);
           if (text) {
-            items.push({ type: 'user', text });
+            items.push({ type: "user", text });
           }
 
           const toolDisplays = buildAtCommandDisplays(payload);
           if (toolDisplays.length > 0) {
             items.push({
-              type: 'tool_group',
+              type: "tool_group",
               tools: toolDisplays,
             });
           }
@@ -286,7 +266,7 @@ function convertToHistoryItems(
         // Flush any pending tool group before user message
         if (currentToolGroup.length > 0) {
           items.push({
-            type: 'tool_group',
+            type: "tool_group",
             tools: [...currentToolGroup],
           });
           currentToolGroup = [];
@@ -294,20 +274,18 @@ function convertToHistoryItems(
 
         const text = extractTextFromParts(record.message?.parts as Part[]);
         if (text) {
-          items.push({ type: 'user', text });
+          items.push({ type: "user", text });
         }
         break;
       }
 
-      case 'assistant': {
+      case "assistant": {
         const parts = record.message?.parts as Part[] | undefined;
 
         // Extract thought content
-        const thoughtText = !config
-          .getContentGenerator()
-          .useSummarizedThinking()
+        const thoughtText = !config.getContentGenerator().useSummarizedThinking()
           ? extractThoughtTextFromParts(parts)
-          : '';
+          : "";
 
         // Extract text content (non-function-call, non-thought)
         const text = extractTextFromParts(parts);
@@ -320,12 +298,12 @@ function convertToHistoryItems(
           // Flush any pending tool group before thought
           if (currentToolGroup.length > 0) {
             items.push({
-              type: 'tool_group',
+              type: "tool_group",
               tools: [...currentToolGroup],
             });
             currentToolGroup = [];
           }
-          items.push({ type: 'gemini_thought', text: thoughtText });
+          items.push({ type: "gemini_thought", text: thoughtText });
         }
 
         // If there's text content, add it as a gemini message
@@ -333,12 +311,12 @@ function convertToHistoryItems(
           // Flush any pending tool group before text
           if (currentToolGroup.length > 0) {
             items.push({
-              type: 'tool_group',
+              type: "tool_group",
               tools: [...currentToolGroup],
             });
             currentToolGroup = [];
           }
-          items.push({ type: 'gemini', text });
+          items.push({ type: "gemini", text });
         }
 
         // Track function calls for pairing with results
@@ -351,7 +329,7 @@ function convertToHistoryItems(
           currentToolGroup.push({
             callId: fc.id,
             name: tool?.displayName || fc.name,
-            description: tool ? formatToolDescription(tool, fc.args) : '',
+            description: tool ? formatToolDescription(tool, fc.args) : "",
             resultDisplay: undefined,
             status: ToolCallStatus.Success, // Will be updated by tool_result
             confirmationDetails: undefined,
@@ -360,7 +338,7 @@ function convertToHistoryItems(
         break;
       }
 
-      case 'tool_result': {
+      case "tool_result": {
         // Update the corresponding tool call in the current group
         if (record.toolCallResult) {
           const callId = record.toolCallResult.callId;
@@ -370,15 +348,12 @@ function convertToHistoryItems(
             const rawDisplay = record.toolCallResult.resultDisplay;
             toolCall.resultDisplay = rawDisplay;
             // Check if status exists and use it
-            const rawStatus = (
-              record.toolCallResult as Record<string, unknown>
-            )['status'] as string | undefined;
-            toolCall.status =
-              rawStatus === 'error'
-                ? ToolCallStatus.Error
-                : ToolCallStatus.Success;
+            const rawStatus = (record.toolCallResult as Record<string, unknown>)["status"] as
+              | string
+              | undefined;
+            toolCall.status = rawStatus === "error" ? ToolCallStatus.Error : ToolCallStatus.Success;
           }
-          pendingToolCalls.delete(callId || '');
+          pendingToolCalls.delete(callId || "");
         }
         break;
       }
@@ -394,7 +369,7 @@ function convertToHistoryItems(
       // Flush any pending tool group before standalone @-command
       if (currentToolGroup.length > 0) {
         items.push({
-          type: 'tool_group',
+          type: "tool_group",
           tools: [...currentToolGroup],
         });
         currentToolGroup = [];
@@ -402,12 +377,12 @@ function convertToHistoryItems(
 
       const text = payload.userText;
       if (text) {
-        items.push({ type: 'user', text });
+        items.push({ type: "user", text });
       }
       const toolDisplays = buildAtCommandDisplays(payload);
       if (toolDisplays.length > 0) {
         items.push({
-          type: 'tool_group',
+          type: "tool_group",
           tools: toolDisplays,
         });
       }
@@ -417,7 +392,7 @@ function convertToHistoryItems(
   // Flush any remaining tool group
   if (currentToolGroup.length > 0) {
     items.push({
-      type: 'tool_group',
+      type: "tool_group",
       tools: currentToolGroup,
     });
   }
diff --git a/apps/airiscode-cli/src/ui/utils/sessionPickerUtils.ts b/apps/airiscode-cli/src/ui/utils/sessionPickerUtils.ts
index 201bc9510..d2476f924 100644
--- a/apps/airiscode-cli/src/ui/utils/sessionPickerUtils.ts
+++ b/apps/airiscode-cli/src/ui/utils/sessionPickerUtils.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SessionListItem } from '@airiscode/core';
+import type { SessionListItem } from "@airiscode/core";
 
 /**
  * State for managing loaded sessions in the session picker.
@@ -31,7 +31,7 @@ export function truncateText(text: string, maxWidth: number): string {
   if (maxWidth <= 3) {
     return firstLine.slice(0, maxWidth);
   }
-  return firstLine.slice(0, maxWidth - 3) + '...';
+  return firstLine.slice(0, maxWidth - 3) + "...";
 }
 
 /**
@@ -55,5 +55,5 @@ export function filterSessions(
  * Formats message count for display with proper pluralization.
  */
 export function formatMessageCount(count: number): string {
-  return count === 1 ? '1 message' : `${count} messages`;
+  return count === 1 ? "1 message" : `${count} messages`;
 }
diff --git a/apps/airiscode-cli/src/ui/utils/terminalSetup.ts b/apps/airiscode-cli/src/ui/utils/terminalSetup.ts
index 9fd462adb..aa9e423de 100644
--- a/apps/airiscode-cli/src/ui/utils/terminalSetup.ts
+++ b/apps/airiscode-cli/src/ui/utils/terminalSetup.ts
@@ -23,17 +23,17 @@
  * to avoid conflicts with user customizations.
  */
 
-import { promises as fs } from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
-import { isKittyProtocolEnabled } from './kittyProtocolDetector.js';
-import { VSCODE_SHIFT_ENTER_SEQUENCE } from './platformConstants.js';
-import { t } from '../../i18n/index.js';
-import { createDebugLogger } from '@airiscode/core';
-
-const debugLogger = createDebugLogger('TERMINAL_SETUP');
+import { exec } from "node:child_process";
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { promisify } from "node:util";
+import { createDebugLogger } from "@airiscode/core";
+import { t } from "../../i18n/index.js";
+import { isKittyProtocolEnabled } from "./kittyProtocolDetector.js";
+import { VSCODE_SHIFT_ENTER_SEQUENCE } from "./platformConstants.js";
+
+const debugLogger = createDebugLogger("TERMINAL_SETUP");
 
 const execAsync = promisify(exec);
 
@@ -43,7 +43,7 @@ const execAsync = promisify(exec);
  */
 function stripJsonComments(content: string): string {
   // Remove single-line comments (// ...)
-  return content.replace(/^\s*\/\/.*$/gm, '');
+  return content.replace(/^\s*\/\/.*$/gm, "");
 }
 
 export interface TerminalSetupResult {
@@ -52,54 +52,48 @@ export interface TerminalSetupResult {
   requiresRestart?: boolean;
 }
 
-type SupportedTerminal = 'vscode' | 'cursor' | 'windsurf' | 'trae';
+type SupportedTerminal = "vscode" | "cursor" | "windsurf" | "trae";
 
 // Terminal detection
 async function detectTerminal(): Promise<SupportedTerminal | null> {
-  const termProgram = process.env['TERM_PROGRAM'];
+  const termProgram = process.env["TERM_PROGRAM"];
 
   // Check VS Code and its forks - check forks first to avoid false positives
   // Check for Cursor-specific indicators
   if (
-    process.env['CURSOR_TRACE_ID'] ||
-    process.env['VSCODE_GIT_ASKPASS_MAIN']?.toLowerCase().includes('cursor')
+    process.env["CURSOR_TRACE_ID"] ||
+    process.env["VSCODE_GIT_ASKPASS_MAIN"]?.toLowerCase().includes("cursor")
   ) {
-    return 'cursor';
+    return "cursor";
   }
   // Check for Windsurf-specific indicators
-  if (
-    process.env['VSCODE_GIT_ASKPASS_MAIN']?.toLowerCase().includes('windsurf')
-  ) {
-    return 'windsurf';
+  if (process.env["VSCODE_GIT_ASKPASS_MAIN"]?.toLowerCase().includes("windsurf")) {
+    return "windsurf";
   }
 
-  if (process.env['TERM_PRODUCT']?.toLowerCase().includes('trae')) {
-    return 'trae';
+  if (process.env["TERM_PRODUCT"]?.toLowerCase().includes("trae")) {
+    return "trae";
   }
 
   // Check VS Code last since forks may also set VSCODE env vars
-  if (termProgram === 'vscode' || process.env['VSCODE_GIT_IPC_HANDLE']) {
-    return 'vscode';
+  if (termProgram === "vscode" || process.env["VSCODE_GIT_IPC_HANDLE"]) {
+    return "vscode";
   }
 
   // Check parent process name
-  if (os.platform() !== 'win32') {
+  if (os.platform() !== "win32") {
     try {
-      const { stdout } = await execAsync('ps -o comm= -p $PPID');
+      const { stdout } = await execAsync("ps -o comm= -p $PPID");
       const parentName = stdout.trim();
 
       // Check forks before VS Code to avoid false positives
-      if (parentName.includes('windsurf') || parentName.includes('Windsurf'))
-        return 'windsurf';
-      if (parentName.includes('cursor') || parentName.includes('Cursor'))
-        return 'cursor';
-      if (parentName.includes('code') || parentName.includes('Code'))
-        return 'vscode';
-      if (parentName.includes('trae') || parentName.includes('Trae'))
-        return 'trae';
+      if (parentName.includes("windsurf") || parentName.includes("Windsurf")) return "windsurf";
+      if (parentName.includes("cursor") || parentName.includes("Cursor")) return "cursor";
+      if (parentName.includes("code") || parentName.includes("Code")) return "vscode";
+      if (parentName.includes("trae") || parentName.includes("Trae")) return "trae";
     } catch (error) {
       // Continue detection even if process check fails
-      debugLogger.debug('Parent process detection failed:', error);
+      debugLogger.debug("Parent process detection failed:", error);
     }
   }
 
@@ -109,7 +103,7 @@ async function detectTerminal(): Promise<SupportedTerminal | null> {
 // Backup file helper
 async function backupFile(filePath: string): Promise<void> {
   try {
-    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+    const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
     const backupPath = `${filePath}.backup.${timestamp}`;
     await fs.copyFile(filePath, backupPath);
   } catch (error) {
@@ -122,21 +116,15 @@ async function backupFile(filePath: string): Promise<void> {
 function getVSCodeStyleConfigDir(appName: string): string | null {
   const platform = os.platform();
 
-  if (platform === 'darwin') {
-    return path.join(
-      os.homedir(),
-      'Library',
-      'Application Support',
-      appName,
-      'User',
-    );
-  } else if (platform === 'win32') {
-    if (!process.env['APPDATA']) {
+  if (platform === "darwin") {
+    return path.join(os.homedir(), "Library", "Application Support", appName, "User");
+  } else if (platform === "win32") {
+    if (!process.env["APPDATA"]) {
       return null;
     }
-    return path.join(process.env['APPDATA'], appName, 'User');
+    return path.join(process.env["APPDATA"], appName, "User");
   } else {
-    return path.join(os.homedir(), '.config', appName, 'User');
+    return path.join(os.homedir(), ".config", appName, "User");
   }
 }
 
@@ -151,20 +139,20 @@ async function configureVSCodeStyle(
     return {
       success: false,
       message: t(
-        'Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.',
+        "Could not determine {{terminalName}} config path on Windows: APPDATA environment variable is not set.",
         { terminalName },
       ),
     };
   }
 
-  const keybindingsFile = path.join(configDir, 'keybindings.json');
+  const keybindingsFile = path.join(configDir, "keybindings.json");
 
   try {
     await fs.mkdir(configDir, { recursive: true });
 
     let keybindings: unknown[] = [];
     try {
-      const content = await fs.readFile(keybindingsFile, 'utf8');
+      const content = await fs.readFile(keybindingsFile, "utf8");
       await backupFile(keybindingsFile);
       try {
         const cleanContent = stripJsonComments(content);
@@ -174,11 +162,11 @@ async function configureVSCodeStyle(
             success: false,
             message:
               t(
-                '{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.',
+                "{{terminalName}} keybindings.json exists but is not a valid JSON array. Please fix the file manually or delete it to allow automatic configuration.",
                 { terminalName },
               ) +
-              '\n' +
-              t('File: {{file}}', { file: keybindingsFile }),
+              "\n" +
+              t("File: {{file}}", { file: keybindingsFile }),
           };
         }
         keybindings = parsedContent;
@@ -187,13 +175,13 @@ async function configureVSCodeStyle(
           success: false,
           message:
             t(
-              'Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.',
+              "Failed to parse {{terminalName}} keybindings.json. The file contains invalid JSON. Please fix the file manually or delete it to allow automatic configuration.",
               { terminalName },
             ) +
-            '\n' +
-            t('File: {{file}}', { file: keybindingsFile }) +
-            '\n' +
-            t('Error: {{error}}', { error: String(parseError) }),
+            "\n" +
+            t("File: {{file}}", { file: keybindingsFile }) +
+            "\n" +
+            t("Error: {{error}}", { error: String(parseError) }),
         };
       }
     } catch {
@@ -201,48 +189,46 @@ async function configureVSCodeStyle(
     }
 
     const shiftEnterBinding = {
-      key: 'shift+enter',
-      command: 'workbench.action.terminal.sendSequence',
-      when: 'terminalFocus',
+      key: "shift+enter",
+      command: "workbench.action.terminal.sendSequence",
+      when: "terminalFocus",
       args: { text: VSCODE_SHIFT_ENTER_SEQUENCE },
     };
 
     const ctrlEnterBinding = {
-      key: 'ctrl+enter',
-      command: 'workbench.action.terminal.sendSequence',
-      when: 'terminalFocus',
+      key: "ctrl+enter",
+      command: "workbench.action.terminal.sendSequence",
+      when: "terminalFocus",
       args: { text: VSCODE_SHIFT_ENTER_SEQUENCE },
     };
 
     // Check if ANY shift+enter or ctrl+enter bindings already exist
     const existingShiftEnter = keybindings.find((kb) => {
       const binding = kb as { key?: string };
-      return binding.key === 'shift+enter';
+      return binding.key === "shift+enter";
     });
 
     const existingCtrlEnter = keybindings.find((kb) => {
       const binding = kb as { key?: string };
-      return binding.key === 'ctrl+enter';
+      return binding.key === "ctrl+enter";
     });
 
     if (existingShiftEnter || existingCtrlEnter) {
       const messages: string[] = [];
       if (existingShiftEnter) {
-        messages.push('- ' + t('Shift+Enter binding already exists'));
+        messages.push("- " + t("Shift+Enter binding already exists"));
       }
       if (existingCtrlEnter) {
-        messages.push('- ' + t('Ctrl+Enter binding already exists'));
+        messages.push("- " + t("Ctrl+Enter binding already exists"));
       }
       return {
         success: false,
         message:
-          t(
-            'Existing keybindings detected. Will not modify to avoid conflicts.',
-          ) +
-          '\n' +
-          messages.join('\n') +
-          '\n' +
-          t('Please check and modify manually if needed: {{file}}', {
+          t("Existing keybindings detected. Will not modify to avoid conflicts.") +
+          "\n" +
+          messages.join("\n") +
+          "\n" +
+          t("Please check and modify manually if needed: {{file}}", {
             file: keybindingsFile,
           }),
       };
@@ -256,9 +242,9 @@ async function configureVSCodeStyle(
         key?: string;
       };
       return (
-        binding.key === 'shift+enter' &&
-        binding.command === 'workbench.action.terminal.sendSequence' &&
-        binding.args?.text === '\\\r\n'
+        binding.key === "shift+enter" &&
+        binding.command === "workbench.action.terminal.sendSequence" &&
+        binding.args?.text === "\\\r\n"
       );
     });
 
@@ -269,9 +255,9 @@ async function configureVSCodeStyle(
         key?: string;
       };
       return (
-        binding.key === 'ctrl+enter' &&
-        binding.command === 'workbench.action.terminal.sendSequence' &&
-        binding.args?.text === '\\\r\n'
+        binding.key === "ctrl+enter" &&
+        binding.command === "workbench.action.terminal.sendSequence" &&
+        binding.args?.text === "\\\r\n"
       );
     });
 
@@ -283,20 +269,17 @@ async function configureVSCodeStyle(
       return {
         success: true,
         message:
-          t(
-            'Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.',
-            {
-              terminalName,
-            },
-          ) +
-          '\n' +
-          t('Modified: {{file}}', { file: keybindingsFile }),
+          t("Added Shift+Enter and Ctrl+Enter keybindings to {{terminalName}}.", {
+            terminalName,
+          }) +
+          "\n" +
+          t("Modified: {{file}}", { file: keybindingsFile }),
         requiresRestart: true,
       };
     } else {
       return {
         success: true,
-        message: t('{{terminalName}} keybindings already configured.', {
+        message: t("{{terminalName}} keybindings already configured.", {
           terminalName,
         }),
       };
@@ -305,11 +288,11 @@ async function configureVSCodeStyle(
     return {
       success: false,
       message:
-        t('Failed to configure {{terminalName}}.', { terminalName }) +
-        '\n' +
-        t('File: {{file}}', { file: keybindingsFile }) +
-        '\n' +
-        t('Error: {{error}}', { error: String(error) }),
+        t("Failed to configure {{terminalName}}.", { terminalName }) +
+        "\n" +
+        t("File: {{file}}", { file: keybindingsFile }) +
+        "\n" +
+        t("Error: {{error}}", { error: String(error) }),
     };
   }
 }
@@ -317,19 +300,19 @@ async function configureVSCodeStyle(
 // Terminal-specific configuration functions
 
 async function configureVSCode(): Promise<TerminalSetupResult> {
-  return configureVSCodeStyle('VS Code', 'Code');
+  return configureVSCodeStyle("VS Code", "Code");
 }
 
 async function configureCursor(): Promise<TerminalSetupResult> {
-  return configureVSCodeStyle('Cursor', 'Cursor');
+  return configureVSCodeStyle("Cursor", "Cursor");
 }
 
 async function configureWindsurf(): Promise<TerminalSetupResult> {
-  return configureVSCodeStyle('Windsurf', 'Windsurf');
+  return configureVSCodeStyle("Windsurf", "Windsurf");
 }
 
 async function configureTrae(): Promise<TerminalSetupResult> {
-  return configureVSCodeStyle('Trae', 'Trae');
+  return configureVSCodeStyle("Trae", "Trae");
 }
 
 /**
@@ -357,7 +340,7 @@ export async function terminalSetup(): Promise<TerminalSetupResult> {
     return {
       success: true,
       message: t(
-        'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).',
+        "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).",
       ),
     };
   }
@@ -368,19 +351,19 @@ export async function terminalSetup(): Promise<TerminalSetupResult> {
     return {
       success: false,
       message: t(
-        'Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.',
+        "Could not detect terminal type. Supported terminals: VS Code, Cursor, Windsurf, and Trae.",
       ),
     };
   }
 
   switch (terminal) {
-    case 'vscode':
+    case "vscode":
       return configureVSCode();
-    case 'cursor':
+    case "cursor":
       return configureCursor();
-    case 'windsurf':
+    case "windsurf":
       return configureWindsurf();
-    case 'trae':
+    case "trae":
       return configureTrae();
     default:
       return {
diff --git a/apps/airiscode-cli/src/ui/utils/textUtils.ts b/apps/airiscode-cli/src/ui/utils/textUtils.ts
index e2872966c..119cdc167 100644
--- a/apps/airiscode-cli/src/ui/utils/textUtils.ts
+++ b/apps/airiscode-cli/src/ui/utils/textUtils.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import ansiRegex from 'ansi-regex';
-import { stripVTControlCharacters } from 'node:util';
-import stringWidth from 'string-width';
+import { stripVTControlCharacters } from "node:util";
+import ansiRegex from "ansi-regex";
+import stringWidth from "string-width";
+import stripAnsi from "strip-ansi";
 
 /**
  * Calculates the maximum width of a multi-line ASCII art string.
@@ -18,7 +18,7 @@ export const getAsciiArtWidth = (asciiArt: string): number => {
   if (!asciiArt) {
     return 0;
   }
-  const lines = asciiArt.split('\n');
+  const lines = asciiArt.split("\n");
   return Math.max(...lines.map((line) => line.length));
 };
 
@@ -42,7 +42,7 @@ export function toCodePoints(str: string): string[] {
     }
   }
   if (isAscii) {
-    return str.split('');
+    return str.split("");
   }
 
   // Cache short strings
@@ -70,7 +70,7 @@ export function cpLen(str: string): number {
 export function cpSlice(str: string, start: number, end?: number): string {
   // Slice by code‑point indices and re‑join.
   const arr = toCodePoints(str).slice(start, end);
-  return arr.join('');
+  return arr.join("");
 }
 
 /**
@@ -115,7 +115,7 @@ export function stripUnsafeCharacters(str: string): string {
       // Preserve all other characters including Unicode/emojis
       return true;
     })
-    .join('');
+    .join("");
 }
 
 // String width caching for performance optimization
@@ -166,18 +166,16 @@ const regex = ansiRegex();
  * original `obj` reference if no changes were necessary.
  */
 export function escapeAnsiCtrlCodes<T>(obj: T): T {
-  if (typeof obj === 'string') {
+  if (typeof obj === "string") {
     if (obj.search(regex) === -1) {
       return obj; // No changes return original string
     }
 
     regex.lastIndex = 0; // needed for global regex
-    return obj.replace(regex, (match) =>
-      JSON.stringify(match).slice(1, -1),
-    ) as T;
+    return obj.replace(regex, (match) => JSON.stringify(match).slice(1, -1)) as T;
   }
 
-  if (obj === null || typeof obj !== 'object') {
+  if (obj === null || typeof obj !== "object") {
     return obj;
   }
 
@@ -222,40 +220,40 @@ const SENSITIVE_PATTERNS: Array<{ pattern: RegExp; replacement: string }> = [
   // API keys with common prefixes
   {
     pattern: /(sk-[a-zA-Z0-9]{20,})/g,
-    replacement: 'sk-***REDACTED***',
+    replacement: "sk-***REDACTED***",
   },
   {
     pattern: /(api[_-]?key[_-]?[=:]\s*)[a-zA-Z0-9_-]{20,}/gi,
-    replacement: '$1***REDACTED***',
+    replacement: "$1***REDACTED***",
   },
   // Bearer tokens
   {
     pattern: /(Bearer\s+)[a-zA-Z0-9._-]+/gi,
-    replacement: '$1***REDACTED***',
+    replacement: "$1***REDACTED***",
   },
   // Generic tokens
   {
     pattern: /(token[_-]?[=:]\s*)[a-zA-Z0-9._-]{10,}/gi,
-    replacement: '$1***REDACTED***',
+    replacement: "$1***REDACTED***",
   },
   // Passwords in connection strings or assignments
   {
     pattern: /(password[_-]?[=:]\s*)[^\s]+/gi,
-    replacement: '$1***REDACTED***',
+    replacement: "$1***REDACTED***",
   },
   {
     pattern: /(pwd[_-]?[=:]\s*)[^\s]+/gi,
-    replacement: '$1***REDACTED***',
+    replacement: "$1***REDACTED***",
   },
   // AWS keys
   {
     pattern: /(AKIA[A-Z0-9]{16})/g,
-    replacement: '***REDACTED***',
+    replacement: "***REDACTED***",
   },
   // Generic secret patterns
   {
     pattern: /(secret[_-]?[=:]\s*)[a-zA-Z0-9._-]{10,}/gi,
-    replacement: '$1***REDACTED***',
+    replacement: "$1***REDACTED***",
   },
 ];
 
@@ -267,10 +265,7 @@ const SENSITIVE_PATTERNS: Array<{ pattern: RegExp; replacement: string }> = [
  * @param maxLength Maximum length of the output text (default: 200)
  * @returns Sanitized and truncated text
  */
-export function sanitizeSensitiveText(
-  text: string,
-  maxLength: number = 200,
-): string {
+export function sanitizeSensitiveText(text: string, maxLength: number = 200): string {
   let result = text;
 
   // Apply each sensitive pattern replacement
@@ -283,7 +278,7 @@ export function sanitizeSensitiveText(
     if (maxLength <= 3) {
       return result.slice(0, maxLength);
     }
-    return result.slice(0, maxLength - 3) + '...';
+    return result.slice(0, maxLength - 3) + "...";
   }
 
   return result;
diff --git a/apps/airiscode-cli/src/ui/utils/updateCheck.ts b/apps/airiscode-cli/src/ui/utils/updateCheck.ts
index da5fd75d8..882e8402f 100644
--- a/apps/airiscode-cli/src/ui/utils/updateCheck.ts
+++ b/apps/airiscode-cli/src/ui/utils/updateCheck.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { UpdateInfo } from 'update-notifier';
-import updateNotifier from 'update-notifier';
-import semver from 'semver';
-import { getPackageJson } from '../../utils/package.js';
-import { createDebugLogger } from '@airiscode/core';
+import { createDebugLogger } from "@airiscode/core";
+import semver from "semver";
+import type { UpdateInfo } from "update-notifier";
+import updateNotifier from "update-notifier";
+import { getPackageJson } from "../../utils/package.js";
 
-const debugLogger = createDebugLogger('UPDATE_CHECK');
+const debugLogger = createDebugLogger("UPDATE_CHECK");
 
 export const FETCH_TIMEOUT_MS = 2000;
 
@@ -23,19 +23,14 @@ export interface UpdateObject {
  * From a nightly and stable update, determines which is the "best" one to offer.
  * The rule is to always prefer nightly if the base versions are the same.
  */
-function getBestAvailableUpdate(
-  nightly?: UpdateInfo,
-  stable?: UpdateInfo,
-): UpdateInfo | null {
+function getBestAvailableUpdate(nightly?: UpdateInfo, stable?: UpdateInfo): UpdateInfo | null {
   if (!nightly) return stable || null;
   if (!stable) return nightly || null;
 
   const nightlyVer = nightly.latest;
   const stableVer = stable.latest;
 
-  if (
-    semver.coerce(stableVer)?.version === semver.coerce(nightlyVer)?.version
-  ) {
+  if (semver.coerce(stableVer)?.version === semver.coerce(nightlyVer)?.version) {
     return nightly;
   }
 
@@ -45,7 +40,7 @@ function getBestAvailableUpdate(
 export async function checkForUpdates(): Promise<UpdateObject | null> {
   try {
     // Skip update check when running from source (development mode)
-    if (process.env['DEV'] === 'true') {
+    if (process.env["DEV"] === "true") {
       return null;
     }
     const packageJson = await getPackageJson();
@@ -54,8 +49,8 @@ export async function checkForUpdates(): Promise<UpdateObject | null> {
     }
 
     const { name, version: currentVersion } = packageJson;
-    const isNightly = currentVersion.includes('nightly');
-    const createNotifier = (distTag: 'latest' | 'nightly') =>
+    const isNightly = currentVersion.includes("nightly");
+    const createNotifier = (distTag: "latest" | "nightly") =>
       updateNotifier({
         pkg: {
           name,
@@ -68,14 +63,11 @@ export async function checkForUpdates(): Promise<UpdateObject | null> {
 
     if (isNightly) {
       const [nightlyUpdateInfo, latestUpdateInfo] = await Promise.all([
-        createNotifier('nightly').fetchInfo(),
-        createNotifier('latest').fetchInfo(),
+        createNotifier("nightly").fetchInfo(),
+        createNotifier("latest").fetchInfo(),
       ]);
 
-      const bestUpdate = getBestAvailableUpdate(
-        nightlyUpdateInfo,
-        latestUpdateInfo,
-      );
+      const bestUpdate = getBestAvailableUpdate(nightlyUpdateInfo, latestUpdateInfo);
 
       if (bestUpdate && semver.gt(bestUpdate.latest, currentVersion)) {
         const message = `A new version of AIRIS Code is available! ${currentVersion} → ${bestUpdate.latest}`;
@@ -85,7 +77,7 @@ export async function checkForUpdates(): Promise<UpdateObject | null> {
         };
       }
     } else {
-      const updateInfo = await createNotifier('latest').fetchInfo();
+      const updateInfo = await createNotifier("latest").fetchInfo();
 
       if (updateInfo && semver.gt(updateInfo.latest, currentVersion)) {
         const message = `AIRIS Code update available! ${currentVersion} → ${updateInfo.latest}`;
@@ -98,7 +90,7 @@ export async function checkForUpdates(): Promise<UpdateObject | null> {
 
     return null;
   } catch (e) {
-    debugLogger.warn('Failed to check for updates: ' + e);
+    debugLogger.warn("Failed to check for updates: " + e);
     return null;
   }
 }
diff --git a/apps/airiscode-cli/src/utils/acpModelUtils.ts b/apps/airiscode-cli/src/utils/acpModelUtils.ts
index 3f8fb21ca..031644138 100644
--- a/apps/airiscode-cli/src/utils/acpModelUtils.ts
+++ b/apps/airiscode-cli/src/utils/acpModelUtils.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AuthType } from '@airiscode/core';
-import { z } from 'zod';
+import { AuthType } from "@airiscode/core";
+import { z } from "zod";
 
 /**
  * ACP model IDs are represented as `${modelId}(${authType})` in the ACP protocol.
@@ -22,8 +22,8 @@ export function formatAcpModelId(modelId: string, authType: AuthType): string {
  */
 export function parseAcpBaseModelId(value: string): string {
   const trimmed = value.trim();
-  const closeIdx = trimmed.lastIndexOf(')');
-  const openIdx = trimmed.lastIndexOf('(');
+  const closeIdx = trimmed.lastIndexOf(")");
+  const openIdx = trimmed.lastIndexOf("(");
   if (openIdx >= 0 && closeIdx === trimmed.length - 1 && openIdx < closeIdx) {
     return trimmed.slice(0, openIdx);
   }
@@ -47,8 +47,8 @@ export function parseAcpModelOption(input: string): {
   authType?: AuthType;
 } {
   const trimmed = input.trim();
-  const closeIdx = trimmed.lastIndexOf(')');
-  const openIdx = trimmed.lastIndexOf('(');
+  const closeIdx = trimmed.lastIndexOf(")");
+  const openIdx = trimmed.lastIndexOf("(");
   if (openIdx >= 0 && closeIdx === trimmed.length - 1 && openIdx < closeIdx) {
     const maybeModelId = trimmed.slice(0, openIdx);
     const maybeAuthType = trimmed.slice(openIdx + 1, closeIdx);
diff --git a/apps/airiscode-cli/src/utils/attentionNotification.ts b/apps/airiscode-cli/src/utils/attentionNotification.ts
index 36a250e77..a987e37a6 100644
--- a/apps/airiscode-cli/src/utils/attentionNotification.ts
+++ b/apps/airiscode-cli/src/utils/attentionNotification.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import process from 'node:process';
-import { createDebugLogger } from '@airiscode/core';
+import process from "node:process";
+import { createDebugLogger } from "@airiscode/core";
 
 export enum AttentionNotificationReason {
-  ToolApproval = 'tool_approval',
-  LongTaskComplete = 'long_task_complete',
+  ToolApproval = "tool_approval",
+  LongTaskComplete = "long_task_complete",
 }
 
 export interface TerminalNotificationOptions {
-  stream?: Pick<NodeJS.WriteStream, 'write' | 'isTTY'>;
+  stream?: Pick<NodeJS.WriteStream, "write" | "isTTY">;
   enabled?: boolean;
 }
 
-const TERMINAL_BELL = '\u0007';
-const debugLogger = createDebugLogger('ATTENTION_NOTIFICATION');
+const TERMINAL_BELL = "\u0007";
+const debugLogger = createDebugLogger("ATTENTION_NOTIFICATION");
 
 /**
  * Grabs the user's attention by emitting the terminal bell character.
@@ -45,7 +45,7 @@ export function notifyTerminalAttention(
     stream.write(TERMINAL_BELL);
     return true;
   } catch (error) {
-    debugLogger.warn('Failed to send terminal bell:', error);
+    debugLogger.warn("Failed to send terminal bell:", error);
     return false;
   }
 }
diff --git a/apps/airiscode-cli/src/utils/checks.ts b/apps/airiscode-cli/src/utils/checks.ts
index 0598835f4..2f699dddd 100644
--- a/apps/airiscode-cli/src/utils/checks.ts
+++ b/apps/airiscode-cli/src/utils/checks.ts
@@ -19,10 +19,7 @@ export function assumeExhaustive(_value: never): void {}
  *     checkExhaustive(enumValue);
  * }
  */
-export function checkExhaustive(
-  value: never,
-  msg = `unexpected value ${value}!`,
-): never {
+export function checkExhaustive(value: never, msg = `unexpected value ${value}!`): never {
   assumeExhaustive(value);
   throw new Error(msg);
 }
diff --git a/apps/airiscode-cli/src/utils/cleanup.ts b/apps/airiscode-cli/src/utils/cleanup.ts
index 9489865be..515e05638 100644
--- a/apps/airiscode-cli/src/utils/cleanup.ts
+++ b/apps/airiscode-cli/src/utils/cleanup.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import { join } from 'node:path';
-import { Storage } from '@airiscode/core';
+import { promises as fs } from "node:fs";
+import { join } from "node:path";
+import { Storage } from "@airiscode/core";
 
 const cleanupFunctions: Array<(() => void) | (() => Promise<void>)> = [];
 
@@ -28,7 +28,7 @@ export async function runExitCleanup() {
 export async function cleanupCheckpoints() {
   const storage = new Storage(process.cwd());
   const tempDir = storage.getProjectTempDir();
-  const checkpointsDir = join(tempDir, 'checkpoints');
+  const checkpointsDir = join(tempDir, "checkpoints");
   try {
     await fs.rm(checkpointsDir, { recursive: true, force: true });
   } catch {
diff --git a/apps/airiscode-cli/src/utils/commands.ts b/apps/airiscode-cli/src/utils/commands.ts
index c96c8c6ef..a92c6cc7d 100644
--- a/apps/airiscode-cli/src/utils/commands.ts
+++ b/apps/airiscode-cli/src/utils/commands.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type SlashCommand } from '../ui/commands/types.js';
+import { type SlashCommand } from "../ui/commands/types.js";
 
 export type ParsedSlashCommand = {
   commandToExecute: SlashCommand | undefined;
@@ -46,9 +46,7 @@ export const parseSlashCommand = (
 
     // Second pass: if no primary name matches, check for an alias.
     if (!foundCommand) {
-      foundCommand = currentCommands.find((cmd) =>
-        cmd.altNames?.includes(part),
-      );
+      foundCommand = currentCommands.find((cmd) => cmd.altNames?.includes(part));
     }
 
     if (foundCommand) {
@@ -65,7 +63,7 @@ export const parseSlashCommand = (
     }
   }
 
-  const args = parts.slice(pathIndex).join(' ');
+  const args = parts.slice(pathIndex).join(" ");
 
   return { commandToExecute, args, canonicalPath };
 };
diff --git a/apps/airiscode-cli/src/utils/commentJson.ts b/apps/airiscode-cli/src/utils/commentJson.ts
index 58b83e948..8d700303a 100644
--- a/apps/airiscode-cli/src/utils/commentJson.ts
+++ b/apps/airiscode-cli/src/utils/commentJson.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { parse, stringify } from 'comment-json';
-import { writeStderrLine } from './stdioHelpers.js';
+import * as fs from "node:fs";
+import { parse, stringify } from "comment-json";
+import { writeStderrLine } from "./stdioHelpers.js";
 
 /**
  * Updates a JSON file while preserving comments and formatting.
@@ -16,28 +16,26 @@ export function updateSettingsFilePreservingFormat(
   updates: Record<string, unknown>,
 ): void {
   if (!fs.existsSync(filePath)) {
-    fs.writeFileSync(filePath, JSON.stringify(updates, null, 2), 'utf-8');
+    fs.writeFileSync(filePath, JSON.stringify(updates, null, 2), "utf-8");
     return;
   }
 
-  const originalContent = fs.readFileSync(filePath, 'utf-8');
+  const originalContent = fs.readFileSync(filePath, "utf-8");
 
   let parsed: Record<string, unknown>;
   try {
     parsed = parse(originalContent) as Record<string, unknown>;
   } catch (error) {
-    writeStderrLine('Error parsing settings file.');
+    writeStderrLine("Error parsing settings file.");
     writeStderrLine(error instanceof Error ? error.message : String(error));
-    writeStderrLine(
-      'Settings file may be corrupted. Please check the JSON syntax.',
-    );
+    writeStderrLine("Settings file may be corrupted. Please check the JSON syntax.");
     return;
   }
 
   const updatedStructure = applyUpdates(parsed, updates);
   const updatedContent = stringify(updatedStructure, null, 2);
 
-  fs.writeFileSync(filePath, updatedContent, 'utf-8');
+  fs.writeFileSync(filePath, updatedContent, "utf-8");
 }
 
 export function applyUpdates(
@@ -49,11 +47,11 @@ export function applyUpdates(
   for (const key of Object.getOwnPropertyNames(updates)) {
     const value = updates[key];
     if (
-      typeof value === 'object' &&
+      typeof value === "object" &&
       value !== null &&
       !Array.isArray(value) &&
       Object.keys(value).length > 0 &&
-      typeof result[key] === 'object' &&
+      typeof result[key] === "object" &&
       result[key] !== null &&
       !Array.isArray(result[key])
     ) {
diff --git a/apps/airiscode-cli/src/utils/deepMerge.ts b/apps/airiscode-cli/src/utils/deepMerge.ts
index 85200ddba..b0867858a 100644
--- a/apps/airiscode-cli/src/utils/deepMerge.ts
+++ b/apps/airiscode-cli/src/utils/deepMerge.ts
@@ -4,21 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MergeStrategy } from '../config/settingsSchema.js';
+import { MergeStrategy } from "../config/settingsSchema.js";
 
-export type Mergeable =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | object
-  | Mergeable[];
+export type Mergeable = string | number | boolean | null | undefined | object | Mergeable[];
 
 export type MergeableObject = Record<string, Mergeable>;
 
 function isPlainObject(item: unknown): item is MergeableObject {
-  return !!item && typeof item === 'object' && !Array.isArray(item);
+  return !!item && typeof item === "object" && !Array.isArray(item);
 }
 
 function mergeRecursively(
@@ -28,7 +21,7 @@ function mergeRecursively(
   path: string[] = [],
 ) {
   for (const key of Object.keys(source)) {
-    if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+    if (key === "__proto__" || key === "constructor" || key === "prototype") {
       continue;
     }
     const newPath = [...path, key];
@@ -37,10 +30,8 @@ function mergeRecursively(
     const mergeStrategy = getMergeStrategyForPath(newPath);
 
     if (mergeStrategy === MergeStrategy.SHALLOW_MERGE && objValue && srcValue) {
-      const obj1 =
-        typeof objValue === 'object' && objValue !== null ? objValue : {};
-      const obj2 =
-        typeof srcValue === 'object' && srcValue !== null ? srcValue : {};
+      const obj1 = typeof objValue === "object" && objValue !== null ? objValue : {};
+      const obj2 = typeof srcValue === "object" && srcValue !== null ? srcValue : {};
       target[key] = { ...obj1, ...obj2 };
       continue;
     }
@@ -61,12 +52,7 @@ function mergeRecursively(
       mergeRecursively(objValue, srcValue, getMergeStrategyForPath, newPath);
     } else if (isPlainObject(srcValue)) {
       target[key] = {};
-      mergeRecursively(
-        target[key] as MergeableObject,
-        srcValue,
-        getMergeStrategyForPath,
-        newPath,
-      );
+      mergeRecursively(target[key] as MergeableObject, srcValue, getMergeStrategyForPath, newPath);
     } else {
       target[key] = srcValue;
     }
diff --git a/apps/airiscode-cli/src/utils/dialogScopeUtils.ts b/apps/airiscode-cli/src/utils/dialogScopeUtils.ts
index 027928abc..e74af52fe 100644
--- a/apps/airiscode-cli/src/utils/dialogScopeUtils.ts
+++ b/apps/airiscode-cli/src/utils/dialogScopeUtils.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { LoadedSettings } from '../config/settings.js';
-import { SettingScope } from '../config/settings.js';
-import { settingExistsInScope } from './settingsUtils.js';
+import type { LoadedSettings } from "../config/settings.js";
+import { SettingScope } from "../config/settings.js";
+import { settingExistsInScope } from "./settingsUtils.js";
 
 /**
  * Shared scope labels for dialog components that need to display setting scopes
  */
 export const SCOPE_LABELS = {
-  [SettingScope.User]: 'User Settings',
-  [SettingScope.Workspace]: 'Workspace Settings',
+  [SettingScope.User]: "User Settings",
+  [SettingScope.Workspace]: "Workspace Settings",
 
   // TODO: migrate system settings to user settings
   // we don't want to save settings to system scope, it is a troublemaker
@@ -43,9 +43,7 @@ export function getScopeMessageForSetting(
   selectedScope: SettingScope,
   settings: LoadedSettings,
 ): string {
-  const otherScopes = Object.values(SettingScope).filter(
-    (scope) => scope !== selectedScope,
-  );
+  const otherScopes = Object.values(SettingScope).filter((scope) => scope !== selectedScope);
 
   const modifiedInOtherScopes = otherScopes.filter((scope) => {
     const scopeSettings = settings.forScope(scope).settings;
@@ -53,15 +51,12 @@ export function getScopeMessageForSetting(
   });
 
   if (modifiedInOtherScopes.length === 0) {
-    return '';
+    return "";
   }
 
-  const modifiedScopesStr = modifiedInOtherScopes.join(', ');
+  const modifiedScopesStr = modifiedInOtherScopes.join(", ");
   const currentScopeSettings = settings.forScope(selectedScope).settings;
-  const existsInCurrentScope = settingExistsInScope(
-    settingKey,
-    currentScopeSettings,
-  );
+  const existsInCurrentScope = settingExistsInScope(settingKey, currentScopeSettings);
 
   return existsInCurrentScope
     ? `(Also modified in ${modifiedScopesStr})`
diff --git a/apps/airiscode-cli/src/utils/envVarResolver.ts b/apps/airiscode-cli/src/utils/envVarResolver.ts
index 096b5549e..201bf34be 100644
--- a/apps/airiscode-cli/src/utils/envVarResolver.ts
+++ b/apps/airiscode-cli/src/utils/envVarResolver.ts
@@ -17,17 +17,14 @@
  * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
  * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
  */
-export function resolveEnvVarsInString(
-  value: string,
-  customEnv?: Record<string, string>,
-): string {
+export function resolveEnvVarsInString(value: string, customEnv?: Record<string, string>): string {
   const envVarRegex = /\$(?:(\w+)|{([^}]+)})/g; // Find $VAR_NAME or ${VAR_NAME}
   return value.replace(envVarRegex, (match, varName1, varName2) => {
     const varName = varName1 || varName2;
-    if (customEnv && typeof customEnv[varName] === 'string') {
+    if (customEnv && typeof customEnv[varName] === "string") {
       return customEnv[varName];
     }
-    if (process && process.env && typeof process.env[varName] === 'string') {
+    if (process && process.env && typeof process.env[varName] === "string") {
       return process.env[varName]!;
     }
     return match;
@@ -53,10 +50,7 @@ export function resolveEnvVarsInString(
  * };
  * const resolved = resolveEnvVarsInObject(config);
  */
-export function resolveEnvVarsInObject<T>(
-  obj: T,
-  customEnv?: Record<string, string>,
-): T {
+export function resolveEnvVarsInObject<T>(obj: T, customEnv?: Record<string, string>): T {
   return resolveEnvVarsInObjectInternal(obj, new WeakSet(), customEnv);
 }
 
@@ -72,16 +66,11 @@ function resolveEnvVarsInObjectInternal<T>(
   visited: WeakSet<object>,
   customEnv?: Record<string, string>,
 ): T {
-  if (
-    obj === null ||
-    obj === undefined ||
-    typeof obj === 'boolean' ||
-    typeof obj === 'number'
-  ) {
+  if (obj === null || obj === undefined || typeof obj === "boolean" || typeof obj === "number") {
     return obj;
   }
 
-  if (typeof obj === 'string') {
+  if (typeof obj === "string") {
     return resolveEnvVarsInString(obj, customEnv) as unknown as T;
   }
 
@@ -100,7 +89,7 @@ function resolveEnvVarsInObjectInternal<T>(
     return result;
   }
 
-  if (typeof obj === 'object') {
+  if (typeof obj === "object") {
     // Check for circular reference
     if (visited.has(obj as object)) {
       // Return a shallow copy to break the cycle
@@ -110,12 +99,8 @@ function resolveEnvVarsInObjectInternal<T>(
     visited.add(obj as object);
     const newObj = { ...obj } as T;
     for (const key in newObj) {
-      if (Object.prototype.hasOwnProperty.call(newObj, key)) {
-        newObj[key] = resolveEnvVarsInObjectInternal(
-          newObj[key],
-          visited,
-          customEnv,
-        );
+      if (Object.hasOwn(newObj, key)) {
+        newObj[key] = resolveEnvVarsInObjectInternal(newObj[key], visited, customEnv);
       }
     }
     visited.delete(obj as object);
diff --git a/apps/airiscode-cli/src/utils/errors.ts b/apps/airiscode-cli/src/utils/errors.ts
index 5c38bbe48..2288b04d6 100644
--- a/apps/airiscode-cli/src/utils/errors.ts
+++ b/apps/airiscode-cli/src/utils/errors.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/core';
+import type { Config } from "@airiscode/core";
 import {
-  OutputFormat,
+  createDebugLogger,
+  FatalCancellationError,
+  FatalTurnLimitedError,
   JsonFormatter,
+  OutputFormat,
   parseAndFormatApiError,
-  FatalTurnLimitedError,
-  FatalCancellationError,
   ToolErrorType,
-  createDebugLogger,
-} from '@airiscode/core';
-import { writeStderrLine } from './stdioHelpers.js';
+} from "@airiscode/core";
+import { writeStderrLine } from "./stdioHelpers.js";
 
-const debugLogger = createDebugLogger('CLI_ERRORS');
+const debugLogger = createDebugLogger("CLI_ERRORS");
 
 export function getErrorMessage(error: unknown): string {
   if (error instanceof Error) {
@@ -26,15 +26,15 @@ export function getErrorMessage(error: unknown): string {
   // Handle objects with message property (error-like objects)
   if (
     error !== null &&
-    typeof error === 'object' &&
-    'message' in error &&
-    typeof (error as { message: unknown }).message === 'string'
+    typeof error === "object" &&
+    "message" in error &&
+    typeof (error as { message: unknown }).message === "string"
   ) {
     return (error as { message: string }).message;
   }
 
   // Handle plain objects by stringifying them
-  if (error !== null && typeof error === 'object') {
+  if (error !== null && typeof error === "object") {
     try {
       const stringified = JSON.stringify(error);
       // JSON.stringify can return undefined for objects with toJSON() returning undefined
@@ -61,7 +61,7 @@ function extractErrorCode(error: unknown): string | number {
   const errorWithCode = error as ErrorWithCode;
 
   // Prioritize exitCode for FatalError types, fall back to other codes
-  if (typeof errorWithCode.exitCode === 'number') {
+  if (typeof errorWithCode.exitCode === "number") {
     return errorWithCode.exitCode;
   }
   if (errorWithCode.code !== undefined) {
@@ -78,7 +78,7 @@ function extractErrorCode(error: unknown): string | number {
  * Converts an error code to a numeric exit code.
  */
 function getNumericExitCode(errorCode: string | number): number {
-  return typeof errorCode === 'number' ? errorCode : 1;
+  return typeof errorCode === "number" ? errorCode : 1;
 }
 
 /**
@@ -91,10 +91,7 @@ export function handleError(
   config: Config,
   customErrorCode?: string | number,
 ): never {
-  const errorMessage = parseAndFormatApiError(
-    error,
-    config.getContentGeneratorConfig()?.authType,
-  );
+  const errorMessage = parseAndFormatApiError(error, config.getContentGeneratorConfig()?.authType);
 
   if (config.getOutputFormat() === OutputFormat.JSON) {
     const formatter = new JsonFormatter();
@@ -147,23 +144,18 @@ export function handleToolError(
     process.stderr.write(warningMessage);
   }
 
-  debugLogger.error(
-    `Error executing tool ${toolName}: ${resultDisplay || toolError.message}`,
-  );
+  debugLogger.error(`Error executing tool ${toolName}: ${resultDisplay || toolError.message}`);
 }
 
 /**
  * Handles cancellation/abort signals consistently.
  */
 export function handleCancellationError(config: Config): never {
-  const cancellationError = new FatalCancellationError('Operation cancelled.');
+  const cancellationError = new FatalCancellationError("Operation cancelled.");
 
   if (config.getOutputFormat() === OutputFormat.JSON) {
     const formatter = new JsonFormatter();
-    const formattedError = formatter.formatError(
-      cancellationError,
-      cancellationError.exitCode,
-    );
+    const formattedError = formatter.formatError(cancellationError, cancellationError.exitCode);
 
     writeStderrLine(formattedError);
     process.exit(cancellationError.exitCode);
@@ -178,15 +170,12 @@ export function handleCancellationError(config: Config): never {
  */
 export function handleMaxTurnsExceededError(config: Config): never {
   const maxTurnsError = new FatalTurnLimitedError(
-    'Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.',
+    "Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.",
   );
 
   if (config.getOutputFormat() === OutputFormat.JSON) {
     const formatter = new JsonFormatter();
-    const formattedError = formatter.formatError(
-      maxTurnsError,
-      maxTurnsError.exitCode,
-    );
+    const formattedError = formatter.formatError(maxTurnsError, maxTurnsError.exitCode);
 
     writeStderrLine(formattedError);
     process.exit(maxTurnsError.exitCode);
diff --git a/apps/airiscode-cli/src/utils/events.ts b/apps/airiscode-cli/src/utils/events.ts
index c29f740bd..3ff6d5653 100644
--- a/apps/airiscode-cli/src/utils/events.ts
+++ b/apps/airiscode-cli/src/utils/events.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
+import { EventEmitter } from "node:events";
 
 export enum AppEvent {
-  OpenDebugConsole = 'open-debug-console',
-  LogError = 'log-error',
-  OauthDisplayMessage = 'oauth-display-message',
+  OpenDebugConsole = "open-debug-console",
+  LogError = "log-error",
+  OauthDisplayMessage = "oauth-display-message",
 }
 
 export const appEvents = new EventEmitter();
diff --git a/apps/airiscode-cli/src/utils/gitUtils.ts b/apps/airiscode-cli/src/utils/gitUtils.ts
index 83d60917b..718d2ea91 100644
--- a/apps/airiscode-cli/src/utils/gitUtils.ts
+++ b/apps/airiscode-cli/src/utils/gitUtils.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync } from 'node:child_process';
-import { ProxyAgent } from 'undici';
-import { createDebugLogger } from '@airiscode/core';
+import { execSync } from "node:child_process";
+import { createDebugLogger } from "@airiscode/core";
+import { ProxyAgent } from "undici";
 
-const debugLogger = createDebugLogger('GIT');
+const debugLogger = createDebugLogger("GIT");
 
 /**
  * Checks if a directory is within a git repository hosted on GitHub.
@@ -17,9 +17,9 @@ const debugLogger = createDebugLogger('GIT');
 export const isGitHubRepository = (): boolean => {
   try {
     const remotes = (
-      execSync('git remote -v', {
-        encoding: 'utf-8',
-      }) || ''
+      execSync("git remote -v", {
+        encoding: "utf-8",
+      }) || ""
     ).trim();
 
     const pattern = /github\.com/;
@@ -39,9 +39,9 @@ export const isGitHubRepository = (): boolean => {
  */
 export const getGitRepoRoot = (): string => {
   const gitRepoRoot = (
-    execSync('git rev-parse --show-toplevel', {
-      encoding: 'utf-8',
-    }) || ''
+    execSync("git rev-parse --show-toplevel", {
+      encoding: "utf-8",
+    }) || ""
   ).trim();
 
   if (!gitRepoRoot) {
@@ -55,29 +55,25 @@ export const getGitRepoRoot = (): string => {
  * getLatestGitHubRelease returns the release tag as a string.
  * @returns string of the release tag (e.g. "v1.2.3").
  */
-export const getLatestGitHubRelease = async (
-  proxy?: string,
-): Promise<string> => {
+export const getLatestGitHubRelease = async (proxy?: string): Promise<string> => {
   try {
     const controller = new AbortController();
 
     const endpoint = `https://api.github.com/repos/QwenLM/airiscode-action/releases/latest`;
 
     const response = await fetch(endpoint, {
-      method: 'GET',
+      method: "GET",
       headers: {
-        Accept: 'application/vnd.github+json',
-        'Content-Type': 'application/json',
-        'X-GitHub-Api-Version': '2022-11-28',
+        Accept: "application/vnd.github+json",
+        "Content-Type": "application/json",
+        "X-GitHub-Api-Version": "2022-11-28",
       },
       dispatcher: proxy ? new ProxyAgent(proxy) : undefined,
       signal: AbortSignal.any([AbortSignal.timeout(30_000), controller.signal]),
     } as RequestInit);
 
     if (!response.ok) {
-      throw new Error(
-        `Invalid response code: ${response.status} - ${response.statusText}`,
-      );
+      throw new Error(`Invalid response code: ${response.status} - ${response.statusText}`);
     }
 
     const releaseTag = (await response.json()).tag_name;
@@ -86,13 +82,8 @@ export const getLatestGitHubRelease = async (
     }
     return releaseTag;
   } catch (_error) {
-    debugLogger.debug(
-      `Failed to determine latest airiscode-action release:`,
-      _error,
-    );
-    throw new Error(
-      `Unable to determine the latest airiscode-action release on GitHub.`,
-    );
+    debugLogger.debug(`Failed to determine latest airiscode-action release:`, _error);
+    throw new Error(`Unable to determine the latest airiscode-action release on GitHub.`);
   }
 };
 
@@ -102,42 +93,34 @@ export const getLatestGitHubRelease = async (
  * @throws error if the exec command fails.
  */
 export function getGitHubRepoInfo(): { owner: string; repo: string } {
-  const remoteUrl = execSync('git remote get-url origin', {
-    encoding: 'utf-8',
+  const remoteUrl = execSync("git remote get-url origin", {
+    encoding: "utf-8",
   }).trim();
 
   // Handle SCP-style SSH URLs (git@github.com:owner/repo.git)
   let urlToParse = remoteUrl;
-  if (remoteUrl.startsWith('git@github.com:')) {
-    urlToParse = remoteUrl.replace('git@github.com:', '');
-  } else if (remoteUrl.startsWith('git@')) {
+  if (remoteUrl.startsWith("git@github.com:")) {
+    urlToParse = remoteUrl.replace("git@github.com:", "");
+  } else if (remoteUrl.startsWith("git@")) {
     // SSH URL for a different provider (GitLab, Bitbucket, etc.)
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`,
-    );
+    throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
   }
 
   let parsedUrl: URL;
   try {
-    parsedUrl = new URL(urlToParse, 'https://github.com');
+    parsedUrl = new URL(urlToParse, "https://github.com");
   } catch {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`,
-    );
+    throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
   }
 
-  if (parsedUrl.host !== 'github.com') {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`,
-    );
+  if (parsedUrl.host !== "github.com") {
+    throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
   }
 
-  const parts = parsedUrl.pathname.split('/').filter((part) => part !== '');
+  const parts = parsedUrl.pathname.split("/").filter((part) => part !== "");
   if (parts.length !== 2 || !parts[0] || !parts[1]) {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`,
-    );
+    throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
   }
 
-  return { owner: parts[0], repo: parts[1].replace(/\.git$/, '') };
+  return { owner: parts[0], repo: parts[1].replace(/\.git$/, "") };
 }
diff --git a/apps/airiscode-cli/src/utils/handleAutoUpdate.ts b/apps/airiscode-cli/src/utils/handleAutoUpdate.ts
index e02c0f615..ae7832eab 100644
--- a/apps/airiscode-cli/src/utils/handleAutoUpdate.ts
+++ b/apps/airiscode-cli/src/utils/handleAutoUpdate.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { UpdateObject } from '../ui/utils/updateCheck.js';
-import type { LoadedSettings } from '../config/settings.js';
-import { getInstallationInfo } from './installationInfo.js';
-import { updateEventEmitter } from './updateEventEmitter.js';
-import type { HistoryItem } from '../ui/types.js';
-import { MessageType } from '../ui/types.js';
-import { spawnWrapper } from './spawnWrapper.js';
-import type { spawn } from 'node:child_process';
-import os from 'node:os';
+import type { spawn } from "node:child_process";
+import os from "node:os";
+import type { LoadedSettings } from "../config/settings.js";
+import type { HistoryItem } from "../ui/types.js";
+import { MessageType } from "../ui/types.js";
+import type { UpdateObject } from "../ui/utils/updateCheck.js";
+import { getInstallationInfo } from "./installationInfo.js";
+import { spawnWrapper } from "./spawnWrapper.js";
+import { updateEventEmitter } from "./updateEventEmitter.js";
 
 export function handleAutoUpdate(
   info: UpdateObject | null,
@@ -26,20 +26,16 @@ export function handleAutoUpdate(
 
   // enableAutoUpdate is checked in gemini.tsx before calling this function,
   // so if we get here, auto-update is enabled (or undefined, which defaults to enabled).
-  const isAutoUpdateEnabled =
-    settings.merged.general?.enableAutoUpdate !== false;
+  const isAutoUpdateEnabled = settings.merged.general?.enableAutoUpdate !== false;
 
-  const installationInfo = getInstallationInfo(
-    projectRoot,
-    isAutoUpdateEnabled,
-  );
+  const installationInfo = getInstallationInfo(projectRoot, isAutoUpdateEnabled);
 
   let combinedMessage = info.message;
   if (installationInfo.updateMessage) {
     combinedMessage += `\n${installationInfo.updateMessage}`;
   }
 
-  updateEventEmitter.emit('update-received', {
+  updateEventEmitter.emit("update-received", {
     message: combinedMessage,
   });
 
@@ -47,36 +43,35 @@ export function handleAutoUpdate(
   if (!installationInfo.updateCommand || !isAutoUpdateEnabled) {
     return;
   }
-  const isNightly = info.update.latest.includes('nightly');
+  const isNightly = info.update.latest.includes("nightly");
 
   const updateCommand = installationInfo.updateCommand.replace(
-    '@latest',
-    isNightly ? '@nightly' : `@${info.update.latest}`,
+    "@latest",
+    isNightly ? "@nightly" : `@${info.update.latest}`,
   );
-  const isWindows = os.platform() === 'win32';
-  const shell = isWindows ? 'cmd.exe' : 'bash';
-  const shellArgs = isWindows ? ['/c', updateCommand] : ['-c', updateCommand];
-  const updateProcess = spawnFn(shell, shellArgs, { stdio: 'pipe' });
-  let errorOutput = '';
-  updateProcess.stderr.on('data', (data) => {
+  const isWindows = os.platform() === "win32";
+  const shell = isWindows ? "cmd.exe" : "bash";
+  const shellArgs = isWindows ? ["/c", updateCommand] : ["-c", updateCommand];
+  const updateProcess = spawnFn(shell, shellArgs, { stdio: "pipe" });
+  let errorOutput = "";
+  updateProcess.stderr.on("data", (data) => {
     errorOutput += data.toString();
   });
 
-  updateProcess.on('close', (code) => {
+  updateProcess.on("close", (code) => {
     if (code === 0) {
-      updateEventEmitter.emit('update-success', {
-        message:
-          'Update successful! The new version will be used on your next run.',
+      updateEventEmitter.emit("update-success", {
+        message: "Update successful! The new version will be used on your next run.",
       });
     } else {
-      updateEventEmitter.emit('update-failed', {
+      updateEventEmitter.emit("update-failed", {
         message: `Automatic update failed. Please try updating manually. (command: ${updateCommand}, stderr: ${errorOutput.trim()})`,
       });
     }
   });
 
-  updateProcess.on('error', (err) => {
-    updateEventEmitter.emit('update-failed', {
+  updateProcess.on("error", (err) => {
+    updateEventEmitter.emit("update-failed", {
       message: `Automatic update failed. Please try updating manually. (error: ${err.message})`,
     });
   });
@@ -84,7 +79,7 @@ export function handleAutoUpdate(
 }
 
 export function setUpdateHandler(
-  addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void,
+  addItem: (item: Omit<HistoryItem, "id">, timestamp: number) => void,
   setUpdateInfo: (info: UpdateObject | null) => void,
 ) {
   let successfullyInstalled = false;
@@ -138,15 +133,15 @@ export function setUpdateHandler(
     );
   };
 
-  updateEventEmitter.on('update-received', handleUpdateRecieved);
-  updateEventEmitter.on('update-failed', handleUpdateFailed);
-  updateEventEmitter.on('update-success', handleUpdateSuccess);
-  updateEventEmitter.on('update-info', handleUpdateInfo);
+  updateEventEmitter.on("update-received", handleUpdateRecieved);
+  updateEventEmitter.on("update-failed", handleUpdateFailed);
+  updateEventEmitter.on("update-success", handleUpdateSuccess);
+  updateEventEmitter.on("update-info", handleUpdateInfo);
 
   return () => {
-    updateEventEmitter.off('update-received', handleUpdateRecieved);
-    updateEventEmitter.off('update-failed', handleUpdateFailed);
-    updateEventEmitter.off('update-success', handleUpdateSuccess);
-    updateEventEmitter.off('update-info', handleUpdateInfo);
+    updateEventEmitter.off("update-received", handleUpdateRecieved);
+    updateEventEmitter.off("update-failed", handleUpdateFailed);
+    updateEventEmitter.off("update-success", handleUpdateSuccess);
+    updateEventEmitter.off("update-info", handleUpdateInfo);
   };
 }
diff --git a/apps/airiscode-cli/src/utils/installationInfo.ts b/apps/airiscode-cli/src/utils/installationInfo.ts
index 2982a776e..d14fd336a 100644
--- a/apps/airiscode-cli/src/utils/installationInfo.ts
+++ b/apps/airiscode-cli/src/utils/installationInfo.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createDebugLogger, isGitRepository } from '@airiscode/core';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as childProcess from 'node:child_process';
+import * as childProcess from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { createDebugLogger, isGitRepository } from "@airiscode/core";
 
 export enum PackageManager {
-  NPM = 'npm',
-  YARN = 'yarn',
-  PNPM = 'pnpm',
-  PNPX = 'pnpx',
-  BUN = 'bun',
-  BUNX = 'bunx',
-  HOMEBREW = 'homebrew',
-  NPX = 'npx',
-  UNKNOWN = 'unknown',
+  NPM = "npm",
+  YARN = "yarn",
+  PNPM = "pnpm",
+  PNPX = "pnpx",
+  BUN = "bun",
+  BUNX = "bunx",
+  HOMEBREW = "homebrew",
+  NPX = "npx",
+  UNKNOWN = "unknown",
 }
 
-const debugLogger = createDebugLogger('INSTALLATION_INFO');
+const debugLogger = createDebugLogger("INSTALLATION_INFO");
 
 export interface InstallationInfo {
   packageManager: PackageManager;
@@ -41,8 +41,8 @@ export function getInstallationInfo(
 
   try {
     // Normalize path separators to forward slashes for consistent matching.
-    const realPath = fs.realpathSync(cliPath).replace(/\\/g, '/');
-    const normalizedProjectRoot = projectRoot?.replace(/\\/g, '/');
+    const realPath = fs.realpathSync(cliPath).replace(/\\/g, "/");
+    const normalizedProjectRoot = projectRoot?.replace(/\\/g, "/");
     const isGit = isGitRepository(process.cwd());
 
     // Check for local git clone first
@@ -50,44 +50,42 @@ export function getInstallationInfo(
       isGit &&
       normalizedProjectRoot &&
       realPath.startsWith(normalizedProjectRoot) &&
-      !realPath.includes('/node_modules/')
+      !realPath.includes("/node_modules/")
     ) {
       return {
         packageManager: PackageManager.UNKNOWN, // Not managed by a package manager in this sense
         isGlobal: false,
-        updateMessage:
-          'Running from a local git clone. Please update with "git pull".',
+        updateMessage: 'Running from a local git clone. Please update with "git pull".',
       };
     }
 
     // Check for npx/pnpx
-    if (realPath.includes('/.npm/_npx') || realPath.includes('/npm/_npx')) {
+    if (realPath.includes("/.npm/_npx") || realPath.includes("/npm/_npx")) {
       return {
         packageManager: PackageManager.NPX,
         isGlobal: false,
-        updateMessage: 'Running via npx, update not applicable.',
+        updateMessage: "Running via npx, update not applicable.",
       };
     }
-    if (realPath.includes('/.pnpm/_pnpx')) {
+    if (realPath.includes("/.pnpm/_pnpx")) {
       return {
         packageManager: PackageManager.PNPX,
         isGlobal: false,
-        updateMessage: 'Running via pnpx, update not applicable.',
+        updateMessage: "Running via pnpx, update not applicable.",
       };
     }
 
     // Check for Homebrew
-    if (process.platform === 'darwin') {
+    if (process.platform === "darwin") {
       try {
         // We do not support homebrew for now, keep forward compatibility for future use
         childProcess.execSync('brew list -1 | grep -q "^airiscode$"', {
-          stdio: 'ignore',
+          stdio: "ignore",
         });
         return {
           packageManager: PackageManager.HOMEBREW,
           isGlobal: true,
-          updateMessage:
-            'Installed via Homebrew. Please update with "brew upgrade".',
+          updateMessage: 'Installed via Homebrew. Please update with "brew upgrade".',
         };
       } catch (_error) {
         // continue to the next check
@@ -95,84 +93,80 @@ export function getInstallationInfo(
     }
 
     // Check for pnpm
-    if (realPath.includes('/.pnpm/global')) {
-      const updateCommand = 'pnpm add -g @airiscode/cli@latest';
+    if (realPath.includes("/.pnpm/global")) {
+      const updateCommand = "pnpm add -g @airiscode/cli@latest";
       return {
         packageManager: PackageManager.PNPM,
         isGlobal: true,
         updateCommand,
         updateMessage: isAutoUpdateEnabled
-          ? 'Installed with pnpm. Attempting to automatically update now...'
+          ? "Installed with pnpm. Attempting to automatically update now..."
           : `Please run ${updateCommand} to update`,
       };
     }
 
     // Check for yarn
-    if (realPath.includes('/.yarn/global')) {
-      const updateCommand = 'yarn global add @airiscode/cli@latest';
+    if (realPath.includes("/.yarn/global")) {
+      const updateCommand = "yarn global add @airiscode/cli@latest";
       return {
         packageManager: PackageManager.YARN,
         isGlobal: true,
         updateCommand,
         updateMessage: isAutoUpdateEnabled
-          ? 'Installed with yarn. Attempting to automatically update now...'
+          ? "Installed with yarn. Attempting to automatically update now..."
           : `Please run ${updateCommand} to update`,
       };
     }
 
     // Check for bun
-    if (realPath.includes('/.bun/install/cache')) {
+    if (realPath.includes("/.bun/install/cache")) {
       return {
         packageManager: PackageManager.BUNX,
         isGlobal: false,
-        updateMessage: 'Running via bunx, update not applicable.',
+        updateMessage: "Running via bunx, update not applicable.",
       };
     }
-    if (realPath.includes('/.bun/bin')) {
-      const updateCommand = 'bun add -g @airiscode/cli@latest';
+    if (realPath.includes("/.bun/bin")) {
+      const updateCommand = "bun add -g @airiscode/cli@latest";
       return {
         packageManager: PackageManager.BUN,
         isGlobal: true,
         updateCommand,
         updateMessage: isAutoUpdateEnabled
-          ? 'Installed with bun. Attempting to automatically update now...'
+          ? "Installed with bun. Attempting to automatically update now..."
           : `Please run ${updateCommand} to update`,
       };
     }
 
     // Check for local install
-    if (
-      normalizedProjectRoot &&
-      realPath.startsWith(`${normalizedProjectRoot}/node_modules`)
-    ) {
+    if (normalizedProjectRoot && realPath.startsWith(`${normalizedProjectRoot}/node_modules`)) {
       let pm = PackageManager.NPM;
-      if (fs.existsSync(path.join(projectRoot, 'yarn.lock'))) {
+      if (fs.existsSync(path.join(projectRoot, "yarn.lock"))) {
         pm = PackageManager.YARN;
-      } else if (fs.existsSync(path.join(projectRoot, 'pnpm-lock.yaml'))) {
+      } else if (fs.existsSync(path.join(projectRoot, "pnpm-lock.yaml"))) {
         pm = PackageManager.PNPM;
-      } else if (fs.existsSync(path.join(projectRoot, 'bun.lockb'))) {
+      } else if (fs.existsSync(path.join(projectRoot, "bun.lockb"))) {
         pm = PackageManager.BUN;
       }
       return {
         packageManager: pm,
         isGlobal: false,
-        updateMessage:
-          "Locally installed. Please update via your project's package.json.",
+        updateMessage: "Locally installed. Please update via your project's package.json.",
       };
     }
 
     // Assume global npm
-    const updateCommand = 'npm install -g @airiscode/cli@latest';
+    const updateCommand = "npm install -g @airiscode/cli@latest";
     return {
       packageManager: PackageManager.NPM,
       isGlobal: true,
       updateCommand,
       updateMessage: isAutoUpdateEnabled
-        ? 'Installed with npm. Attempting to automatically update now...'
+        ? "Installed with npm. Attempting to automatically update now..."
         : `Please run ${updateCommand} to update`,
     };
   } catch (error) {
-    debugLogger.error('Failed to detect installation info:', error);
+    debugLogger.error("Failed to detect installation info:", error);
     return { packageManager: PackageManager.UNKNOWN, isGlobal: false };
   }
 }
diff --git a/apps/airiscode-cli/src/utils/languageUtils.ts b/apps/airiscode-cli/src/utils/languageUtils.ts
index 971489eee..3f49a7a10 100644
--- a/apps/airiscode-cli/src/utils/languageUtils.ts
+++ b/apps/airiscode-cli/src/utils/languageUtils.ts
@@ -10,19 +10,16 @@
  * which instructs the LLM to respond in the user's preferred language.
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { Storage } from '@airiscode/core';
-import {
-  detectSystemLanguage,
-  getLanguageNameFromLocale,
-} from '../i18n/index.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { Storage } from "@airiscode/core";
+import { detectSystemLanguage, getLanguageNameFromLocale } from "../i18n/index.js";
 
-const LLM_OUTPUT_LANGUAGE_RULE_FILENAME = 'output-language.md';
-const LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = 'airiscode:llm-output-language:';
+const LLM_OUTPUT_LANGUAGE_RULE_FILENAME = "output-language.md";
+const LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = "airiscode:llm-output-language:";
 
 /** Special value meaning "detect from system settings" */
-export const OUTPUT_LANGUAGE_AUTO = 'auto';
+export const OUTPUT_LANGUAGE_AUTO = "auto";
 
 /**
  * Checks if a value represents the "auto" setting.
@@ -41,7 +38,7 @@ export function normalizeOutputLanguage(language: string): string {
   const fullName = getLanguageNameFromLocale(lowered);
   // getLanguageNameFromLocale returns 'English' as default for unknown codes.
   // Only use the result if it's a known code or explicitly 'en'.
-  if (fullName !== 'English' || lowered === 'en') {
+  if (fullName !== "English" || lowered === "en") {
     return fullName;
   }
   return language;
@@ -50,9 +47,7 @@ export function normalizeOutputLanguage(language: string): string {
 /**
  * Resolves the output language, converting 'auto' to the detected system language.
  */
-export function resolveOutputLanguage(
-  value: string | undefined | null,
-): string {
+export function resolveOutputLanguage(value: string | undefined | null): string {
   if (isAutoLanguage(value)) {
     const detectedLocale = detectSystemLanguage();
     return getLanguageNameFromLocale(detectedLocale);
@@ -64,10 +59,7 @@ export function resolveOutputLanguage(
  * Returns the path to the LLM output language rule file (~/.airiscode/output-language.md).
  */
 function getOutputLanguageFilePath(): string {
-  return path.join(
-    Storage.getGlobalQwenDir(),
-    LLM_OUTPUT_LANGUAGE_RULE_FILENAME,
-  );
+  return path.join(Storage.getGlobalQwenDir(), LLM_OUTPUT_LANGUAGE_RULE_FILENAME);
 }
 
 /**
@@ -76,9 +68,9 @@ function getOutputLanguageFilePath(): string {
  */
 function sanitizeForMarker(language: string): string {
   return language
-    .replace(/[\r\n]/g, ' ')
-    .replace(/--!?>/g, '')
-    .replace(/--/g, '');
+    .replace(/[\r\n]/g, " ")
+    .replace(/--!?>/g, "")
+    .replace(/--/g, "");
 }
 
 /**
@@ -114,7 +106,7 @@ function parseOutputLanguageFromContent(content: string): string | null {
   // Primary: machine-readable marker (e.g., <!-- airiscode:llm-output-language: 中文 -->)
   const markerRegex = new RegExp(
     String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
-    'i',
+    "i",
   );
   const markerMatch = content.match(markerRegex);
   if (markerMatch?.[1]?.trim()) {
@@ -122,9 +114,7 @@ function parseOutputLanguageFromContent(content: string): string | null {
   }
 
   // Fallback: legacy heading format (e.g., # CRITICAL: Chinese Output Language Rule)
-  const headingMatch = content.match(
-    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im,
-  );
+  const headingMatch = content.match(/^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im);
   if (headingMatch?.[1]?.trim()) {
     return headingMatch[1].trim();
   }
@@ -142,7 +132,7 @@ function readOutputLanguageFromFile(): string | null {
     return null;
   }
   try {
-    const content = fs.readFileSync(filePath, 'utf-8');
+    const content = fs.readFileSync(filePath, "utf-8");
     return parseOutputLanguageFromContent(content);
   } catch {
     return null;
@@ -157,7 +147,7 @@ export function writeOutputLanguageFile(language: string): void {
   const content = generateOutputLanguageFileContent(language);
   const dir = path.dirname(filePath);
   fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(filePath, content, 'utf-8');
+  fs.writeFileSync(filePath, content, "utf-8");
 }
 
 /**
diff --git a/apps/airiscode-cli/src/utils/math.ts b/apps/airiscode-cli/src/utils/math.ts
index f067a4ef9..e1297590f 100644
--- a/apps/airiscode-cli/src/utils/math.ts
+++ b/apps/airiscode-cli/src/utils/math.ts
@@ -11,5 +11,4 @@
  * @param end The end value.
  * @param t The interpolation amount (typically between 0 and 1).
  */
-export const lerp = (start: number, end: number, t: number): number =>
-  start + (end - start) * t;
+export const lerp = (start: number, end: number, t: number): number => start + (end - start) * t;
diff --git a/apps/airiscode-cli/src/utils/modelConfigUtils.ts b/apps/airiscode-cli/src/utils/modelConfigUtils.ts
index 4fa420993..37229546e 100644
--- a/apps/airiscode-cli/src/utils/modelConfigUtils.ts
+++ b/apps/airiscode-cli/src/utils/modelConfigUtils.ts
@@ -8,11 +8,11 @@ import {
   AuthType,
   type ContentGeneratorConfig,
   type ContentGeneratorConfigSources,
-  resolveModelConfig,
   type ModelConfigSourcesInput,
   type ProviderModelConfig,
-} from '@airiscode/core';
-import type { Settings } from '../config/settings.js';
+  resolveModelConfig,
+} from "@airiscode/core";
+import type { Settings } from "../config/settings.js";
 
 export interface CliGenerationConfigInputs {
   argv: {
@@ -48,24 +48,24 @@ export interface ResolvedCliGenerationConfig {
 export function getAuthTypeFromEnv(): AuthType | undefined {
   // Explicit OpenAI configuration
   if (
-    process.env['OPENAI_API_KEY'] &&
-    process.env['OPENAI_MODEL'] &&
-    process.env['OPENAI_BASE_URL']
+    process.env["OPENAI_API_KEY"] &&
+    process.env["OPENAI_MODEL"] &&
+    process.env["OPENAI_BASE_URL"]
   ) {
     return AuthType.USE_OPENAI;
   }
 
   // Anthropic configuration
   if (
-    process.env['ANTHROPIC_API_KEY'] &&
-    process.env['ANTHROPIC_MODEL'] &&
-    process.env['ANTHROPIC_BASE_URL']
+    process.env["ANTHROPIC_API_KEY"] &&
+    process.env["ANTHROPIC_MODEL"] &&
+    process.env["ANTHROPIC_BASE_URL"]
   ) {
     return AuthType.USE_ANTHROPIC;
   }
 
   // Ollama: explicit OLLAMA_HOST or OLLAMA_MODEL, or fallback when no other auth is configured
-  if (process.env['OLLAMA_HOST'] || process.env['OLLAMA_MODEL']) {
+  if (process.env["OLLAMA_HOST"] || process.env["OLLAMA_MODEL"]) {
     return AuthType.USE_OLLAMA;
   }
 
@@ -129,12 +129,11 @@ export function resolveCliGenerationConfig(
 
   // Resolve OpenAI logging config (CLI-specific, not part of core resolver)
   const enableOpenAILogging =
-    (typeof argv.openaiLogging === 'undefined'
+    (typeof argv.openaiLogging === "undefined"
       ? settings.model?.enableOpenAILogging
       : argv.openaiLogging) ?? false;
 
-  const openAILoggingDir =
-    argv.openaiLoggingDir || settings.model?.openAILoggingDir;
+  const openAILoggingDir = argv.openaiLoggingDir || settings.model?.openAILoggingDir;
 
   // Build the full generation config
   // Note: we merge the resolved config with logging settings
@@ -145,9 +144,9 @@ export function resolveCliGenerationConfig(
   };
 
   return {
-    model: resolved.config.model || '',
-    apiKey: resolved.config.apiKey || '',
-    baseUrl: resolved.config.baseUrl || '',
+    model: resolved.config.model || "",
+    apiKey: resolved.config.apiKey || "",
+    baseUrl: resolved.config.baseUrl || "",
     generationConfig,
     sources: resolved.sources,
     warnings: resolved.warnings,
diff --git a/apps/airiscode-cli/src/utils/nonInteractiveHelpers.ts b/apps/airiscode-cli/src/utils/nonInteractiveHelpers.ts
index 2012db84c..4dee15194 100644
--- a/apps/airiscode-cli/src/utils/nonInteractiveHelpers.ts
+++ b/apps/airiscode-cli/src/utils/nonInteractiveHelpers.ts
@@ -5,36 +5,37 @@
  */
 
 import type {
-  Config,
-  ToolResultDisplay,
   AgentResultDisplay,
+  Config,
+  McpToolProgressData,
   OutputUpdateHandler,
+  Part,
+  PartListUnion,
+  SessionMetrics,
   ToolCallRequestInfo,
   ToolCallResponseInfo,
-  SessionMetrics,
-  McpToolProgressData,
-} from '@airiscode/core';
+  ToolResultDisplay,
+} from "@airiscode/core";
 import {
-  OutputFormat,
-  ToolErrorType,
   createDebugLogger,
   getMCPServerStatus,
-} from '@airiscode/core';
-import type { Part, PartListUnion } from '@airiscode/core';
-import type {
-  CLIUserMessage,
-  Usage,
-  PermissionMode,
-  CLISystemMessage,
-} from '../nonInteractive/types.js';
+  OutputFormat,
+  ToolErrorType,
+} from "@airiscode/core";
 import type {
   JsonOutputAdapterInterface,
   MessageEmitter,
-} from '../nonInteractive/io/BaseJsonOutputAdapter.js';
-import { computeSessionStats } from '../ui/utils/computeStats.js';
-import { getAvailableCommands } from '../nonInteractiveCliCommands.js';
+} from "../nonInteractive/io/BaseJsonOutputAdapter.js";
+import type {
+  CLISystemMessage,
+  CLIUserMessage,
+  PermissionMode,
+  Usage,
+} from "../nonInteractive/types.js";
+import { getAvailableCommands } from "../nonInteractiveCliCommands.js";
+import { computeSessionStats } from "../ui/utils/computeStats.js";
 
-const debugLogger = createDebugLogger('NON_INTERACTIVE');
+const debugLogger = createDebugLogger("NON_INTERACTIVE");
 
 /**
  * Normalizes various part list formats into a consistent Part[] array.
@@ -47,14 +48,12 @@ export function normalizePartList(parts: PartListUnion | null): Part[] {
     return [];
   }
 
-  if (typeof parts === 'string') {
+  if (typeof parts === "string") {
     return [{ text: parts }];
   }
 
   if (Array.isArray(parts)) {
-    return parts.map((part) =>
-      typeof part === 'string' ? { text: part } : (part as Part),
-    );
+    return parts.map((part) => (typeof part === "string" ? { text: part } : (part as Part)));
   }
 
   return [parts as Part];
@@ -74,17 +73,17 @@ export function extractPartsFromUserMessage(
   }
 
   const content = message.message?.content;
-  if (typeof content === 'string') {
+  if (typeof content === "string") {
     return content;
   }
 
   if (Array.isArray(content)) {
     const parts: Part[] = [];
     for (const block of content) {
-      if (!block || typeof block !== 'object' || !('type' in block)) {
+      if (!block || typeof block !== "object" || !("type" in block)) {
         continue;
       }
-      if (block.type === 'text' && 'text' in block && block.text) {
+      if (block.type === "text" && "text" in block && block.text) {
         parts.push({ text: block.text });
       } else {
         parts.push({ text: JSON.stringify(block) });
@@ -102,13 +101,11 @@ export function extractPartsFromUserMessage(
  * @param geminiClient - The Gemini client instance
  * @returns Usage information or undefined if not available
  */
-export function extractUsageFromGeminiClient(
-  geminiClient: unknown,
-): Usage | undefined {
+export function extractUsageFromGeminiClient(geminiClient: unknown): Usage | undefined {
   if (
     !geminiClient ||
-    typeof geminiClient !== 'object' ||
-    typeof (geminiClient as { getChat?: unknown }).getChat !== 'function'
+    typeof geminiClient !== "object" ||
+    typeof (geminiClient as { getChat?: unknown }).getChat !== "function"
   ) {
     return undefined;
   }
@@ -117,9 +114,8 @@ export function extractUsageFromGeminiClient(
     const chat = (geminiClient as { getChat: () => unknown }).getChat();
     if (
       !chat ||
-      typeof chat !== 'object' ||
-      typeof (chat as { getDebugResponses?: unknown }).getDebugResponses !==
-        'function'
+      typeof chat !== "object" ||
+      typeof (chat as { getDebugResponses?: unknown }).getDebugResponses !== "function"
     ) {
       return undefined;
     }
@@ -130,28 +126,23 @@ export function extractUsageFromGeminiClient(
       }
     ).getDebugResponses();
     for (let i = responses.length - 1; i >= 0; i--) {
-      const metadata = responses[i]?.['usageMetadata'] as
-        | Record<string, unknown>
-        | undefined;
+      const metadata = responses[i]?.["usageMetadata"] as Record<string, unknown> | undefined;
       if (metadata) {
-        const promptTokens = metadata['promptTokenCount'];
-        const completionTokens = metadata['candidatesTokenCount'];
-        const totalTokens = metadata['totalTokenCount'];
-        const cachedTokens = metadata['cachedContentTokenCount'];
+        const promptTokens = metadata["promptTokenCount"];
+        const completionTokens = metadata["candidatesTokenCount"];
+        const totalTokens = metadata["totalTokenCount"];
+        const cachedTokens = metadata["cachedContentTokenCount"];
 
         return {
-          input_tokens: typeof promptTokens === 'number' ? promptTokens : 0,
-          output_tokens:
-            typeof completionTokens === 'number' ? completionTokens : 0,
-          total_tokens:
-            typeof totalTokens === 'number' ? totalTokens : undefined,
-          cache_read_input_tokens:
-            typeof cachedTokens === 'number' ? cachedTokens : undefined,
+          input_tokens: typeof promptTokens === "number" ? promptTokens : 0,
+          output_tokens: typeof completionTokens === "number" ? completionTokens : 0,
+          total_tokens: typeof totalTokens === "number" ? totalTokens : undefined,
+          cache_read_input_tokens: typeof cachedTokens === "number" ? cachedTokens : undefined,
         };
       }
     }
   } catch (error) {
-    debugLogger.debug('Failed to extract usage metadata:', error);
+    debugLogger.debug("Failed to extract usage metadata:", error);
   }
 
   return undefined;
@@ -173,10 +164,7 @@ export function computeUsageFromMetrics(metrics: SessionMetrics): Usage {
     (acc, model) => acc + model.tokens.candidates,
     0,
   );
-  const totalTokens = Object.values(models).reduce(
-    (acc, model) => acc + model.tokens.total,
-    0,
-  );
+  const totalTokens = Object.values(models).reduce((acc, model) => acc + model.tokens.total, 0);
 
   const usage: Usage = {
     input_tokens: stats.totalPromptTokens,
@@ -215,10 +203,7 @@ async function loadSlashCommandNames(
     // Extract command names and sort
     return commands.map((cmd) => cmd.name).sort();
   } catch (error) {
-    debugLogger.error(
-      '[buildSystemMessage] Failed to load slash commands:',
-      error,
-    );
+    debugLogger.error("[buildSystemMessage] Failed to load slash commands:", error);
     return [];
   } finally {
     controller.abort();
@@ -262,10 +247,7 @@ export async function buildSystemMessage(
     : [];
 
   // Load slash commands with filtering based on allowed built-in commands
-  const slashCommands = await loadSlashCommandNames(
-    config,
-    allowedBuiltinCommandNames,
-  );
+  const slashCommands = await loadSlashCommandNames(config, allowedBuiltinCommandNames);
 
   // Load subagent names from config
   let agentNames: string[] = [];
@@ -274,12 +256,12 @@ export async function buildSystemMessage(
     const subagents = await subagentManager.listSubagents();
     agentNames = subagents.map((subagent) => subagent.name);
   } catch (error) {
-    debugLogger.error('[buildSystemMessage] Failed to load subagents:', error);
+    debugLogger.error("[buildSystemMessage] Failed to load subagents:", error);
   }
 
   const systemMessage: CLISystemMessage = {
-    type: 'system',
-    subtype: 'init',
+    type: "system",
+    subtype: "init",
     uuid: sessionId,
     session_id: sessionId,
     cwd: config.getTargetDir(),
@@ -288,21 +270,19 @@ export async function buildSystemMessage(
     model: config.getModel(),
     permission_mode: permissionMode,
     slash_commands: slashCommands,
-    qwen_code_version: config.getCliVersion() || 'unknown',
+    qwen_code_version: config.getCliVersion() || "unknown",
     agents: agentNames,
   };
 
   return systemMessage;
 }
 
-function isMcpToolProgressData(
-  output: ToolResultDisplay,
-): output is McpToolProgressData {
+function isMcpToolProgressData(output: ToolResultDisplay): output is McpToolProgressData {
   return (
-    typeof output === 'object' &&
+    typeof output === "object" &&
     output !== null &&
-    'type' in output &&
-    (output as McpToolProgressData).type === 'mcp_tool_progress'
+    "type" in output &&
+    (output as McpToolProgressData).type === "mcp_tool_progress"
   );
 }
 
@@ -322,10 +302,7 @@ export function createToolProgressHandler(
 ): {
   handler: OutputUpdateHandler;
 } {
-  const handler: OutputUpdateHandler = (
-    _callId: string,
-    output: ToolResultDisplay,
-  ) => {
+  const handler: OutputUpdateHandler = (_callId: string, output: ToolResultDisplay) => {
     if (isMcpToolProgressData(output)) {
       adapter.emitToolProgress(request, output);
     }
@@ -366,13 +343,13 @@ export function createAgentToolProgressHandler(
    * @returns ToolCallRequestInfo object
    */
   const buildRequest = (
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
   ): ToolCallRequestInfo => ({
     callId: toolCall.callId,
     name: toolCall.name,
     args: toolCall.args || {},
     isClientInitiated: true,
-    prompt_id: '',
+    prompt_id: "",
     response_id: undefined,
   });
 
@@ -383,15 +360,14 @@ export function createAgentToolProgressHandler(
    * @returns ToolCallResponseInfo object
    */
   const buildResponse = (
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
   ): ToolCallResponseInfo => ({
     callId: toolCall.callId,
     error:
-      toolCall.status === 'failed'
-        ? new Error(toolCall.error || 'Tool execution failed')
+      toolCall.status === "failed"
+        ? new Error(toolCall.error || "Tool execution failed")
         : undefined,
-    errorType:
-      toolCall.status === 'failed' ? ToolErrorType.EXECUTION_FAILED : undefined,
+    errorType: toolCall.status === "failed" ? ToolErrorType.EXECUTION_FAILED : undefined,
     resultDisplay: toolCall.resultDisplay,
     responseParts: toolCall.responseParts || [],
   });
@@ -403,13 +379,10 @@ export function createAgentToolProgressHandler(
    * @returns True if the tool call has result content to emit
    */
   const hasResultContent = (
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
   ): boolean => {
     // Check resultDisplay string
-    if (
-      typeof toolCall.resultDisplay === 'string' &&
-      toolCall.resultDisplay.trim().length > 0
-    ) {
+    if (typeof toolCall.resultDisplay === "string" && toolCall.resultDisplay.trim().length > 0) {
       return true;
     }
 
@@ -419,7 +392,7 @@ export function createAgentToolProgressHandler(
     }
 
     // Failed status should always emit result
-    return toolCall.status === 'failed';
+    return toolCall.status === "failed";
   };
 
   /**
@@ -429,25 +402,21 @@ export function createAgentToolProgressHandler(
    * @param fallbackStatus - Optional fallback status if toolCall.status should be overridden
    */
   const emitToolUseIfNeeded = (
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
-    fallbackStatus?: 'executing' | 'awaiting_approval',
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
+    fallbackStatus?: "executing" | "awaiting_approval",
   ): void => {
     if (emittedToolUseIds.has(toolCall.callId)) {
       return;
     }
 
-    const toolCallToEmit: NonNullable<AgentResultDisplay['toolCalls']>[number] =
-      fallbackStatus
-        ? {
-            ...toolCall,
-            status: fallbackStatus,
-          }
-        : toolCall;
+    const toolCallToEmit: NonNullable<AgentResultDisplay["toolCalls"]>[number] = fallbackStatus
+      ? {
+          ...toolCall,
+          status: fallbackStatus,
+        }
+      : toolCall;
 
-    if (
-      toolCallToEmit.status === 'executing' ||
-      toolCallToEmit.status === 'awaiting_approval'
-    ) {
+    if (toolCallToEmit.status === "executing" || toolCallToEmit.status === "awaiting_approval") {
       if (adapter.processSubagentToolCall) {
         adapter.processSubagentToolCall(toolCallToEmit, agentToolCallId);
         emittedToolUseIds.add(toolCall.callId);
@@ -461,7 +430,7 @@ export function createAgentToolProgressHandler(
    * @param toolCall - The tool call information
    */
   const emitToolResultIfNeeded = (
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
   ): void => {
     if (emittedToolResultIds.has(toolCall.callId)) {
       return;
@@ -478,10 +447,7 @@ export function createAgentToolProgressHandler(
     const response = buildResponse(toolCall);
     // For subagent tool results, we need to pass parentToolUseId
     // The adapter implementations accept an optional parentToolUseId parameter
-    if (
-      'emitToolResult' in adapter &&
-      typeof adapter.emitToolResult === 'function'
-    ) {
+    if ("emitToolResult" in adapter && typeof adapter.emitToolResult === "function") {
       adapter.emitToolResult(request, response, agentToolCallId);
     } else {
       adapter.emitToolResult(request, response);
@@ -495,18 +461,14 @@ export function createAgentToolProgressHandler(
    * @param previousCall - The previous state of the tool call (if any)
    */
   const processToolCall = (
-    toolCall: NonNullable<AgentResultDisplay['toolCalls']>[number],
-    previousCall?: NonNullable<AgentResultDisplay['toolCalls']>[number],
+    toolCall: NonNullable<AgentResultDisplay["toolCalls"]>[number],
+    previousCall?: NonNullable<AgentResultDisplay["toolCalls"]>[number],
   ): void => {
-    const isCompleted =
-      toolCall.status === 'success' || toolCall.status === 'failed';
-    const isExecuting =
-      toolCall.status === 'executing' ||
-      toolCall.status === 'awaiting_approval';
+    const isCompleted = toolCall.status === "success" || toolCall.status === "failed";
+    const isExecuting = toolCall.status === "executing" || toolCall.status === "awaiting_approval";
     const wasExecuting =
       previousCall &&
-      (previousCall.status === 'executing' ||
-        previousCall.status === 'awaiting_approval');
+      (previousCall.status === "executing" || previousCall.status === "awaiting_approval");
 
     // Emit tool_use if needed
     if (isExecuting) {
@@ -515,10 +477,10 @@ export function createAgentToolProgressHandler(
     } else if (isCompleted && !emittedToolUseIds.has(toolCall.callId)) {
       // Edge case: tool call appeared with result already (shouldn't happen normally,
       // but handle it gracefully by emitting tool_use with 'executing' status first)
-      emitToolUseIfNeeded(toolCall, 'executing');
+      emitToolUseIfNeeded(toolCall, "executing");
     } else if (wasExecuting && isCompleted) {
       // Status changed from executing to completed - ensure tool_use was emitted
-      emitToolUseIfNeeded(toolCall, 'executing');
+      emitToolUseIfNeeded(toolCall, "executing");
     }
 
     // Emit tool_result if tool call is completed
@@ -527,25 +489,19 @@ export function createAgentToolProgressHandler(
     }
   };
 
-  const outputUpdateHandler = (
-    callId: string,
-    outputChunk: ToolResultDisplay,
-  ) => {
+  const outputUpdateHandler = (callId: string, outputChunk: ToolResultDisplay) => {
     // Only process AgentResultDisplay (Task tool updates)
     if (
-      typeof outputChunk === 'object' &&
+      typeof outputChunk === "object" &&
       outputChunk !== null &&
-      'type' in outputChunk &&
-      outputChunk.type === 'task_execution'
+      "type" in outputChunk &&
+      outputChunk.type === "task_execution"
     ) {
       const taskDisplay = outputChunk as AgentResultDisplay;
       const previous = previousTaskStates.get(callId);
 
       // Only process if adapter supports subagent APIs
-      if (
-        !adapter.processSubagentToolCall ||
-        !adapter.emitSubagentErrorResult
-      ) {
+      if (!adapter.processSubagentToolCall || !adapter.emitSubagentErrorResult) {
         previousTaskStates.set(callId, taskDisplay);
         return;
       }
@@ -559,31 +515,24 @@ export function createAgentToolProgressHandler(
         } else {
           // Compare with previous state to find new/changed tool calls
           for (const toolCall of taskDisplay.toolCalls) {
-            const previousCall = previous.toolCalls.find(
-              (tc) => tc.callId === toolCall.callId,
-            );
+            const previousCall = previous.toolCalls.find((tc) => tc.callId === toolCall.callId);
             processToolCall(toolCall, previousCall);
           }
         }
       }
 
       // Handle task-level errors (status: 'failed', 'cancelled')
-      if (
-        taskDisplay.status === 'failed' ||
-        taskDisplay.status === 'cancelled'
-      ) {
+      if (taskDisplay.status === "failed" || taskDisplay.status === "cancelled") {
         const previousStatus = previous?.status;
         // Only emit error result if status changed to failed/cancelled
         if (
-          previousStatus !== 'failed' &&
-          previousStatus !== 'cancelled' &&
+          previousStatus !== "failed" &&
+          previousStatus !== "cancelled" &&
           previousStatus !== undefined
         ) {
           const errorMessage =
             taskDisplay.terminateReason ||
-            (taskDisplay.status === 'cancelled'
-              ? 'Task was cancelled'
-              : 'Task execution failed');
+            (taskDisplay.status === "cancelled" ? "Task was cancelled" : "Task execution failed");
           // Use subagent adapter's emitSubagentErrorResult method
           adapter.emitSubagentErrorResult(errorMessage, 0, agentToolCallId);
         }
@@ -599,10 +548,7 @@ export function createAgentToolProgressHandler(
           config.getOutputFormat() === OutputFormat.STREAM_JSON)
       ) {
         // Emit the user message with the correct parent_tool_use_id
-        adapter.emitUserMessage(
-          [{ text: taskDisplay.taskPrompt }],
-          agentToolCallId,
-        );
+        adapter.emitUserMessage([{ text: taskDisplay.taskPrompt }], agentToolCallId);
       }
 
       // Update previous state
@@ -627,13 +573,13 @@ export function createAgentToolProgressHandler(
 export function functionResponsePartsToString(parts: Part[]): string {
   return parts
     .map((part) => {
-      if ('functionResponse' in part) {
-        const content = part.functionResponse?.response?.['output'] ?? '';
+      if ("functionResponse" in part) {
+        const content = part.functionResponse?.response?.["output"] ?? "";
         return content;
       }
       return JSON.stringify(part);
     })
-    .join('');
+    .join("");
 }
 
 /**
@@ -645,13 +591,8 @@ export function functionResponsePartsToString(parts: Part[]): string {
  * @param response - Tool call response information
  * @returns String content for the tool_result block, or undefined if no content available
  */
-export function toolResultContent(
-  response: ToolCallResponseInfo,
-): string | undefined {
-  if (
-    typeof response.resultDisplay === 'string' &&
-    response.resultDisplay.trim().length > 0
-  ) {
+export function toolResultContent(response: ToolCallResponseInfo): string | undefined {
+  if (typeof response.resultDisplay === "string" && response.resultDisplay.trim().length > 0) {
     return response.resultDisplay;
   }
   if (response.responseParts && response.responseParts.length > 0) {
diff --git a/apps/airiscode-cli/src/utils/package.ts b/apps/airiscode-cli/src/utils/package.ts
index e90376b69..224bb94b1 100644
--- a/apps/airiscode-cli/src/utils/package.ts
+++ b/apps/airiscode-cli/src/utils/package.ts
@@ -4,12 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  readPackageUp,
-  type PackageJson as BasePackageJson,
-} from 'read-package-up';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { type PackageJson as BasePackageJson, readPackageUp } from "read-package-up";
 
 export type PackageJson = BasePackageJson & {
   config?: {
diff --git a/apps/airiscode-cli/src/utils/processUtils.ts b/apps/airiscode-cli/src/utils/processUtils.ts
index 7d3f1bcbf..e87731b3c 100644
--- a/apps/airiscode-cli/src/utils/processUtils.ts
+++ b/apps/airiscode-cli/src/utils/processUtils.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { runExitCleanup } from './cleanup.js';
+import { runExitCleanup } from "./cleanup.js";
 
 /**
  * Exit code used to signal that the CLI should be relaunched.
diff --git a/apps/airiscode-cli/src/utils/readStdin.ts b/apps/airiscode-cli/src/utils/readStdin.ts
index b95dddc74..587257ee8 100644
--- a/apps/airiscode-cli/src/utils/readStdin.ts
+++ b/apps/airiscode-cli/src/utils/readStdin.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { writeStderrLine } from './stdioHelpers.js';
+import { writeStderrLine } from "./stdioHelpers.js";
 
 export async function readStdin(): Promise<string> {
   const MAX_STDIN_SIZE = 8 * 1024 * 1024; // 8MB
   return new Promise((resolve, reject) => {
-    let data = '';
+    let data = "";
     let totalSize = 0;
-    process.stdin.setEncoding('utf8');
+    process.stdin.setEncoding("utf8");
 
     const pipedInputShouldBeAvailableInMs = 500;
     let pipedInputTimerId: null | NodeJS.Timeout = setTimeout(() => {
@@ -32,9 +32,7 @@ export async function readStdin(): Promise<string> {
         if (totalSize + chunk.length > MAX_STDIN_SIZE) {
           const remainingSize = MAX_STDIN_SIZE - totalSize;
           data += chunk.slice(0, remainingSize);
-          writeStderrLine(
-            `Warning: stdin input truncated to ${MAX_STDIN_SIZE} bytes.`,
-          );
+          writeStderrLine(`Warning: stdin input truncated to ${MAX_STDIN_SIZE} bytes.`);
           process.stdin.destroy(); // Stop reading further
           break;
         }
@@ -58,13 +56,13 @@ export async function readStdin(): Promise<string> {
         clearTimeout(pipedInputTimerId);
         pipedInputTimerId = null;
       }
-      process.stdin.removeListener('readable', onReadable);
-      process.stdin.removeListener('end', onEnd);
-      process.stdin.removeListener('error', onError);
+      process.stdin.removeListener("readable", onReadable);
+      process.stdin.removeListener("end", onEnd);
+      process.stdin.removeListener("error", onError);
     };
 
-    process.stdin.on('readable', onReadable);
-    process.stdin.on('end', onEnd);
-    process.stdin.on('error', onError);
+    process.stdin.on("readable", onReadable);
+    process.stdin.on("end", onEnd);
+    process.stdin.on("error", onError);
   });
 }
diff --git a/apps/airiscode-cli/src/utils/relaunch.ts b/apps/airiscode-cli/src/utils/relaunch.ts
index 4b6820de7..91bf7139a 100644
--- a/apps/airiscode-cli/src/utils/relaunch.ts
+++ b/apps/airiscode-cli/src/utils/relaunch.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
-import { RELAUNCH_EXIT_CODE } from './processUtils.js';
-import { writeStderrLine } from './stdioHelpers.js';
+import { spawn } from "node:child_process";
+import { RELAUNCH_EXIT_CODE } from "./processUtils.js";
+import { writeStderrLine } from "./stdioHelpers.js";
 
 export async function relaunchOnExitCode(runner: () => Promise<number>) {
   while (true) {
@@ -18,7 +18,7 @@ export async function relaunchOnExitCode(runner: () => Promise<number>) {
       }
     } catch (error) {
       process.stdin.resume();
-      writeStderrLine('Fatal error: Failed to relaunch the CLI process.');
+      writeStderrLine("Fatal error: Failed to relaunch the CLI process.");
       writeStderrLine(error instanceof Error ? error.message : String(error));
       process.exit(1);
     }
@@ -29,7 +29,7 @@ export async function relaunchAppInChildProcess(
   additionalNodeArgs: string[],
   additionalScriptArgs: string[],
 ) {
-  if (process.env['AIRISCODE_NO_RELAUNCH']) {
+  if (process.env["AIRISCODE_NO_RELAUNCH"]) {
     return;
   }
 
@@ -46,19 +46,19 @@ export async function relaunchAppInChildProcess(
       ...additionalScriptArgs,
       ...scriptArgs,
     ];
-    const newEnv = { ...process.env, AIRISCODE_NO_RELAUNCH: 'true' };
+    const newEnv = { ...process.env, AIRISCODE_NO_RELAUNCH: "true" };
 
     // The parent process should not be reading from stdin while the child is running.
     process.stdin.pause();
 
     const child = spawn(process.execPath, nodeArgs, {
-      stdio: 'inherit',
+      stdio: "inherit",
       env: newEnv,
     });
 
     return new Promise<number>((resolve, reject) => {
-      child.on('error', reject);
-      child.on('close', (code) => {
+      child.on("error", reject);
+      child.on("close", (code) => {
         // Resume stdin before the parent process exits.
         process.stdin.resume();
         resolve(code ?? 1);
diff --git a/apps/airiscode-cli/src/utils/resolvePath.ts b/apps/airiscode-cli/src/utils/resolvePath.ts
index dea8be55a..ee52d993e 100644
--- a/apps/airiscode-cli/src/utils/resolvePath.ts
+++ b/apps/airiscode-cli/src/utils/resolvePath.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as os from "node:os";
+import * as path from "node:path";
 
 export function resolvePath(p: string): string {
   if (!p) {
-    return '';
+    return "";
   }
   let expandedPath = p;
-  if (p.toLowerCase().startsWith('%userprofile%')) {
-    expandedPath = os.homedir() + p.substring('%userprofile%'.length);
-  } else if (p === '~' || p.startsWith('~/')) {
+  if (p.toLowerCase().startsWith("%userprofile%")) {
+    expandedPath = os.homedir() + p.substring("%userprofile%".length);
+  } else if (p === "~" || p.startsWith("~/")) {
     expandedPath = os.homedir() + p.substring(1);
   }
   return path.normalize(expandedPath);
diff --git a/apps/airiscode-cli/src/utils/sandbox.ts b/apps/airiscode-cli/src/utils/sandbox.ts
index 0eb099fd2..b595f2cd6 100644
--- a/apps/airiscode-cli/src/utils/sandbox.ts
+++ b/apps/airiscode-cli/src/utils/sandbox.ts
@@ -4,30 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { exec, execSync, spawn, type ChildProcess } from 'node:child_process';
-import os from 'node:os';
-import path from 'node:path';
-import fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { quote, parse } from 'shell-quote';
-import {
-  USER_SETTINGS_DIR,
-  SETTINGS_DIRECTORY_NAME,
-} from '../config/settings.js';
-import { promisify } from 'node:util';
-import type { Config, SandboxConfig } from '@airiscode/core';
-import { FatalSandboxError } from '@airiscode/core';
-import { randomBytes } from 'node:crypto';
-import { writeStderrLine } from './stdioHelpers.js';
+import { type ChildProcess, exec, execSync, spawn } from "node:child_process";
+import { randomBytes } from "node:crypto";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
+import type { Config, SandboxConfig } from "@airiscode/core";
+import { FatalSandboxError } from "@airiscode/core";
+import { parse, quote } from "shell-quote";
+import { SETTINGS_DIRECTORY_NAME, USER_SETTINGS_DIR } from "../config/settings.js";
+import { writeStderrLine } from "./stdioHelpers.js";
 
 const execAsync = promisify(exec);
 
 function getContainerPath(hostPath: string): string {
-  if (os.platform() !== 'win32') {
+  if (os.platform() !== "win32") {
     return hostPath;
   }
 
-  const withForwardSlashes = hostPath.replace(/\\/g, '/');
+  const withForwardSlashes = hostPath.replace(/\\/g, "/");
   const match = withForwardSlashes.match(/^([A-Z]):\/(.*)/i);
   if (match) {
     return `/${match[1].toLowerCase()}/${match[2]}`;
@@ -35,16 +32,16 @@ function getContainerPath(hostPath: string): string {
   return hostPath;
 }
 
-const LOCAL_DEV_SANDBOX_IMAGE_NAME = 'airiscode-sandbox';
-const SANDBOX_NETWORK_NAME = 'airiscode-sandbox';
-const SANDBOX_PROXY_NAME = 'airiscode-sandbox-proxy';
+const LOCAL_DEV_SANDBOX_IMAGE_NAME = "airiscode-sandbox";
+const SANDBOX_NETWORK_NAME = "airiscode-sandbox";
+const SANDBOX_PROXY_NAME = "airiscode-sandbox-proxy";
 const BUILTIN_SEATBELT_PROFILES = [
-  'permissive-open',
-  'permissive-closed',
-  'permissive-proxied',
-  'restrictive-open',
-  'restrictive-closed',
-  'restrictive-proxied',
+  "permissive-open",
+  "permissive-closed",
+  "permissive-proxied",
+  "restrictive-open",
+  "restrictive-closed",
+  "restrictive-proxied",
 ];
 
 /**
@@ -66,23 +63,23 @@ const BUILTIN_SEATBELT_PROFILES = [
  * @returns {Promise<boolean>} A promise that resolves to true if the current user's UID/GID should be used, false otherwise.
  */
 async function shouldUseCurrentUserInSandbox(): Promise<boolean> {
-  const envVar = process.env['SANDBOX_SET_UID_GID']?.toLowerCase().trim();
+  const envVar = process.env["SANDBOX_SET_UID_GID"]?.toLowerCase().trim();
 
-  if (envVar === '1' || envVar === 'true') {
+  if (envVar === "1" || envVar === "true") {
     return true;
   }
-  if (envVar === '0' || envVar === 'false') {
+  if (envVar === "0" || envVar === "false") {
     return false;
   }
 
-  if (os.platform() === 'linux') {
-    const debugEnv = [process.env['DEBUG'], process.env['DEBUG_MODE']].some(
-      (v) => v === 'true' || v === '1',
+  if (os.platform() === "linux") {
+    const debugEnv = [process.env["DEBUG"], process.env["DEBUG_MODE"]].some(
+      (v) => v === "true" || v === "1",
     );
     if (debugEnv) {
       // Use stderr so it doesn't clutter normal STDOUT output (e.g. in `--prompt` runs).
       writeStderrLine(
-        'INFO: Using current user UID/GID in Linux sandbox. Set SANDBOX_SET_UID_GID=false to disable.',
+        "INFO: Using current user UID/GID in Linux sandbox. Set SANDBOX_SET_UID_GID=false to disable.",
       );
     }
     return true;
@@ -94,32 +91,30 @@ async function shouldUseCurrentUserInSandbox(): Promise<boolean> {
 // docker does not allow container names to contain ':' or '/', so we
 // parse those out to shorten the name
 function parseImageName(image: string): string {
-  const [fullName, tag] = image.split(':');
-  const name = fullName.split('/').at(-1) ?? 'unknown-image';
+  const [fullName, tag] = image.split(":");
+  const name = fullName.split("/").at(-1) ?? "unknown-image";
   return tag ? `${name}-${tag}` : name;
 }
 
 function ports(): string[] {
-  return (process.env['SANDBOX_PORTS'] ?? '')
-    .split(',')
+  return (process.env["SANDBOX_PORTS"] ?? "")
+    .split(",")
     .filter((p) => p.trim())
     .map((p) => p.trim());
 }
 
 function entrypoint(workdir: string, cliArgs: string[]): string[] {
-  const isWindows = os.platform() === 'win32';
+  const isWindows = os.platform() === "win32";
   const containerWorkdir = getContainerPath(workdir);
   const shellCmds = [];
-  const pathSeparator = isWindows ? ';' : ':';
+  const pathSeparator = isWindows ? ";" : ":";
 
-  let pathSuffix = '';
-  if (process.env['PATH']) {
-    const paths = process.env['PATH'].split(pathSeparator);
+  let pathSuffix = "";
+  if (process.env["PATH"]) {
+    const paths = process.env["PATH"].split(pathSeparator);
     for (const p of paths) {
       const containerPath = getContainerPath(p);
-      if (
-        containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())
-      ) {
+      if (containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())) {
         pathSuffix += `:${containerPath}`;
       }
     }
@@ -128,14 +123,12 @@ function entrypoint(workdir: string, cliArgs: string[]): string[] {
     shellCmds.push(`export PATH="$PATH${pathSuffix}";`);
   }
 
-  let pythonPathSuffix = '';
-  if (process.env['PYTHONPATH']) {
-    const paths = process.env['PYTHONPATH'].split(pathSeparator);
+  let pythonPathSuffix = "";
+  if (process.env["PYTHONPATH"]) {
+    const paths = process.env["PYTHONPATH"].split(pathSeparator);
     for (const p of paths) {
       const containerPath = getContainerPath(p);
-      if (
-        containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())
-      ) {
+      if (containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())) {
         pythonPathSuffix += `:${containerPath}`;
       }
     }
@@ -144,10 +137,7 @@ function entrypoint(workdir: string, cliArgs: string[]): string[] {
     shellCmds.push(`export PYTHONPATH="$PYTHONPATH${pythonPathSuffix}";`);
   }
 
-  const projectSandboxBashrc = path.join(
-    SETTINGS_DIRECTORY_NAME,
-    'sandbox.bashrc',
-  );
+  const projectSandboxBashrc = path.join(SETTINGS_DIRECTORY_NAME, "sandbox.bashrc");
   if (fs.existsSync(projectSandboxBashrc)) {
     shellCmds.push(`source ${getContainerPath(projectSandboxBashrc)};`);
   }
@@ -160,16 +150,16 @@ function entrypoint(workdir: string, cliArgs: string[]): string[] {
 
   const quotedCliArgs = cliArgs.slice(2).map((arg) => quote([arg]));
   const cliCmd =
-    process.env['NODE_ENV'] === 'development'
-      ? process.env['DEBUG']
-        ? 'npm run debug --'
-        : 'npm rebuild && npm run start --'
-      : process.env['DEBUG']
-        ? `node --inspect-brk=0.0.0.0:${process.env['DEBUG_PORT'] || '9229'} $(which qwen)`
-        : 'airiscode';
+    process.env["NODE_ENV"] === "development"
+      ? process.env["DEBUG"]
+        ? "npm run debug --"
+        : "npm rebuild && npm run start --"
+      : process.env["DEBUG"]
+        ? `node --inspect-brk=0.0.0.0:${process.env["DEBUG_PORT"] || "9229"} $(which qwen)`
+        : "airiscode";
 
   const args = [...shellCmds, cliCmd, ...quotedCliArgs];
-  return ['bash', '-c', args.join(' ')];
+  return ["bash", "-c", args.join(" ")];
 }
 
 export async function start_sandbox(
@@ -178,53 +168,41 @@ export async function start_sandbox(
   cliConfig?: Config,
   cliArgs: string[] = [],
 ): Promise<number> {
-  if (config.command === 'sandbox-exec') {
+  if (config.command === "sandbox-exec") {
     // disallow BUILD_SANDBOX
-    if (process.env['BUILD_SANDBOX']) {
-      throw new FatalSandboxError(
-        'Cannot BUILD_SANDBOX when using macOS Seatbelt',
-      );
+    if (process.env["BUILD_SANDBOX"]) {
+      throw new FatalSandboxError("Cannot BUILD_SANDBOX when using macOS Seatbelt");
     }
 
-    const profile = (process.env['SEATBELT_PROFILE'] ??= 'permissive-open');
-    let profileFile = fileURLToPath(
-      new URL(`sandbox-macos-${profile}.sb`, import.meta.url),
-    );
+    const profile = (process.env["SEATBELT_PROFILE"] ??= "permissive-open");
+    let profileFile = fileURLToPath(new URL(`sandbox-macos-${profile}.sb`, import.meta.url));
     // if profile name is not recognized, then look for file under project settings directory
     if (!BUILTIN_SEATBELT_PROFILES.includes(profile)) {
-      profileFile = path.join(
-        SETTINGS_DIRECTORY_NAME,
-        `sandbox-macos-${profile}.sb`,
-      );
+      profileFile = path.join(SETTINGS_DIRECTORY_NAME, `sandbox-macos-${profile}.sb`);
     }
     if (!fs.existsSync(profileFile)) {
-      throw new FatalSandboxError(
-        `Missing macos seatbelt profile file '${profileFile}'`,
-      );
+      throw new FatalSandboxError(`Missing macos seatbelt profile file '${profileFile}'`);
     }
     // Log on STDERR so it doesn't clutter the output on STDOUT
     writeStderrLine(`using macos seatbelt (profile: ${profile}) ...`);
     // if DEBUG is set, convert to --inspect-brk in NODE_OPTIONS
-    const nodeOptions = [
-      ...(process.env['DEBUG'] ? ['--inspect-brk'] : []),
-      ...nodeArgs,
-    ].join(' ');
+    const nodeOptions = [...(process.env["DEBUG"] ? ["--inspect-brk"] : []), ...nodeArgs].join(" ");
 
     const args = [
-      '-D',
+      "-D",
       `TARGET_DIR=${fs.realpathSync(process.cwd())}`,
-      '-D',
+      "-D",
       `TMP_DIR=${fs.realpathSync(os.tmpdir())}`,
-      '-D',
+      "-D",
       `HOME_DIR=${fs.realpathSync(os.homedir())}`,
-      '-D',
+      "-D",
       `CACHE_DIR=${fs.realpathSync(execSync(`getconf DARWIN_USER_CACHE_DIR`).toString().trim())}`,
     ];
 
     // Add included directories from the workspace context
     // Always add 5 INCLUDE_DIR parameters to ensure .sb files can reference them
     const MAX_INCLUDE_DIRS = 5;
-    const targetDir = fs.realpathSync(cliConfig?.getTargetDir() || '');
+    const targetDir = fs.realpathSync(cliConfig?.getTargetDir() || "");
     const includedDirs: string[] = [];
 
     if (cliConfig) {
@@ -241,94 +219,92 @@ export async function start_sandbox(
     }
 
     for (let i = 0; i < MAX_INCLUDE_DIRS; i++) {
-      let dirPath = '/dev/null'; // Default to a safe path that won't cause issues
+      let dirPath = "/dev/null"; // Default to a safe path that won't cause issues
 
       if (i < includedDirs.length) {
         dirPath = includedDirs[i];
       }
 
-      args.push('-D', `INCLUDE_DIR_${i}=${dirPath}`);
+      args.push("-D", `INCLUDE_DIR_${i}=${dirPath}`);
     }
 
     const finalArgv = cliArgs;
 
     args.push(
-      '-f',
+      "-f",
       profileFile,
-      'sh',
-      '-c',
+      "sh",
+      "-c",
       [
         `SANDBOX=sandbox-exec`,
         `NODE_OPTIONS="${nodeOptions}"`,
         ...finalArgv.map((arg) => quote([arg])),
-      ].join(' '),
+      ].join(" "),
     );
     // start and set up proxy if AIRISCODE_SANDBOX_PROXY_COMMAND is set
-    const proxyCommand = process.env['AIRISCODE_SANDBOX_PROXY_COMMAND'];
+    const proxyCommand = process.env["AIRISCODE_SANDBOX_PROXY_COMMAND"];
     let proxyProcess: ChildProcess | undefined = undefined;
     let sandboxProcess: ChildProcess | undefined = undefined;
     const sandboxEnv = { ...process.env };
     if (proxyCommand) {
       const proxy =
-        process.env['HTTPS_PROXY'] ||
-        process.env['https_proxy'] ||
-        process.env['HTTP_PROXY'] ||
-        process.env['http_proxy'] ||
-        'http://localhost:8877';
-      sandboxEnv['HTTPS_PROXY'] = proxy;
-      sandboxEnv['https_proxy'] = proxy; // lower-case can be required, e.g. for curl
-      sandboxEnv['HTTP_PROXY'] = proxy;
-      sandboxEnv['http_proxy'] = proxy;
-      const noProxy = process.env['NO_PROXY'] || process.env['no_proxy'];
+        process.env["HTTPS_PROXY"] ||
+        process.env["https_proxy"] ||
+        process.env["HTTP_PROXY"] ||
+        process.env["http_proxy"] ||
+        "http://localhost:8877";
+      sandboxEnv["HTTPS_PROXY"] = proxy;
+      sandboxEnv["https_proxy"] = proxy; // lower-case can be required, e.g. for curl
+      sandboxEnv["HTTP_PROXY"] = proxy;
+      sandboxEnv["http_proxy"] = proxy;
+      const noProxy = process.env["NO_PROXY"] || process.env["no_proxy"];
       if (noProxy) {
-        sandboxEnv['NO_PROXY'] = noProxy;
-        sandboxEnv['no_proxy'] = noProxy;
+        sandboxEnv["NO_PROXY"] = noProxy;
+        sandboxEnv["no_proxy"] = noProxy;
       }
       // Note: CodeQL flags this as js/shell-command-injection-from-environment.
       // This is intentional - CLI tool executes user-provided proxy commands.
-      proxyProcess = spawn('bash', ['-c', proxyCommand], {
-        stdio: ['ignore', 'pipe', 'pipe'],
+      proxyProcess = spawn("bash", ["-c", proxyCommand], {
+        stdio: ["ignore", "pipe", "pipe"],
         detached: true,
       });
       // install handlers to stop proxy on exit/signal
       const stopProxy = () => {
-        writeStderrLine('stopping proxy ...');
+        writeStderrLine("stopping proxy ...");
         if (proxyProcess?.pid) {
-          process.kill(-proxyProcess.pid, 'SIGTERM');
+          process.kill(-proxyProcess.pid, "SIGTERM");
         }
       };
-      process.on('exit', stopProxy);
-      process.on('SIGINT', stopProxy);
-      process.on('SIGTERM', stopProxy);
+      process.on("exit", stopProxy);
+      process.on("SIGINT", stopProxy);
+      process.on("SIGTERM", stopProxy);
 
       // commented out as it disrupts ink rendering
       // proxyProcess.stdout?.on('data', (data) => {
       //   console.info(data.toString());
       // });
-      proxyProcess.stderr?.on('data', (data) => {
+      proxyProcess.stderr?.on("data", (data) => {
         writeStderrLine(data.toString());
       });
-      proxyProcess.on('close', (code, signal) => {
+      proxyProcess.on("close", (code, signal) => {
         if (sandboxProcess?.pid) {
-          process.kill(-sandboxProcess.pid, 'SIGTERM');
+          process.kill(-sandboxProcess.pid, "SIGTERM");
         }
         throw new FatalSandboxError(
           `Proxy command '${proxyCommand}' exited with code ${code}, signal ${signal}`,
         );
       });
-      writeStderrLine('waiting for proxy to start ...');
-      await execAsync(
-        `until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`,
-      );
+      writeStderrLine("waiting for proxy to start ...");
+      await execAsync(`until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`);
     }
     // spawn child and let it inherit stdio
     process.stdin.pause();
     sandboxProcess = spawn(config.command, args, {
-      stdio: 'inherit',
+      stdio: "inherit",
     });
     return new Promise((resolve, reject) => {
-      sandboxProcess?.on('error', reject);
-      sandboxProcess?.on('close', (code) => {
+      sandboxProcess?.on("error", reject);
+      sandboxProcess?.on("close", (code) => {
         process.stdin.resume();
         resolve(code ?? 1);
       });
@@ -340,10 +316,7 @@ export async function start_sandbox(
   // determine full path for airiscode to distinguish linked vs installed setting
   const gcPath = fs.realpathSync(process.argv[1]);
 
-  const projectSandboxDockerfile = path.join(
-    SETTINGS_DIRECTORY_NAME,
-    'sandbox.Dockerfile',
-  );
+  const projectSandboxDockerfile = path.join(SETTINGS_DIRECTORY_NAME, "sandbox.Dockerfile");
   const isCustomProjectSandbox = fs.existsSync(projectSandboxDockerfile);
 
   const image = config.image;
@@ -353,35 +326,29 @@ export async function start_sandbox(
   // if BUILD_SANDBOX is set, then call scripts/build_sandbox.js under airiscode repo
   //
   // note this can only be done with binary linked from airiscode repo
-  if (process.env['BUILD_SANDBOX']) {
-    if (!gcPath.includes('airiscode/packages/')) {
+  if (process.env["BUILD_SANDBOX"]) {
+    if (!gcPath.includes("airiscode/packages/")) {
       throw new FatalSandboxError(
-        'Cannot build sandbox using installed AIRIS Code binary; ' +
-          'run `npm link ./packages/cli` under AirisCode-cli repo to switch to linked binary.',
+        "Cannot build sandbox using installed AIRIS Code binary; " +
+          "run `npm link ./packages/cli` under AirisCode-cli repo to switch to linked binary.",
       );
     } else {
-      writeStderrLine('building sandbox ...');
-      const gcRoot = gcPath.split('/packages/')[0];
+      writeStderrLine("building sandbox ...");
+      const gcRoot = gcPath.split("/packages/")[0];
       // if project folder has sandbox.Dockerfile under project settings folder, use that
-      let buildArgs = '';
-      const projectSandboxDockerfile = path.join(
-        SETTINGS_DIRECTORY_NAME,
-        'sandbox.Dockerfile',
-      );
+      let buildArgs = "";
+      const projectSandboxDockerfile = path.join(SETTINGS_DIRECTORY_NAME, "sandbox.Dockerfile");
       if (isCustomProjectSandbox) {
         writeStderrLine(`using ${projectSandboxDockerfile} for sandbox`);
         buildArgs += `-f ${path.resolve(projectSandboxDockerfile)} -i ${image}`;
       }
-      execSync(
-        `cd ${gcRoot} && node scripts/build_sandbox.js -s ${buildArgs}`,
-        {
-          stdio: 'inherit',
-          env: {
-            ...process.env,
-            AIRISCODE_SANDBOX: config.command, // in case sandbox is enabled via flags (see config.ts under cli package)
-          },
+      execSync(`cd ${gcRoot} && node scripts/build_sandbox.js -s ${buildArgs}`, {
+        stdio: "inherit",
+        env: {
+          ...process.env,
+          AIRISCODE_SANDBOX: config.command, // in case sandbox is enabled via flags (see config.ts under cli package)
         },
-      );
+      });
     }
   }
 
@@ -389,8 +356,8 @@ export async function start_sandbox(
   if (!(await ensureSandboxImageIsPresent(config.command, image))) {
     const remedy =
       image === LOCAL_DEV_SANDBOX_IMAGE_NAME
-        ? 'Try running `npm run build:all` or `npm run build:sandbox` under the airiscode repo to build it locally, or check the image name and your network connection.'
-        : 'Please check the image name, your network connection, or notify airiscode-dev@service.alibaba.com if the issue persists.';
+        ? "Try running `npm run build:all` or `npm run build:sandbox` under the airiscode repo to build it locally, or check the image name and your network connection."
+        : "Please check the image name, your network connection, or notify airiscode-dev@service.alibaba.com if the issue persists.";
     throw new FatalSandboxError(
       `Sandbox image '${image}' is missing or could not be pulled. ${remedy}`,
     );
@@ -398,127 +365,112 @@ export async function start_sandbox(
 
   // use interactive mode and auto-remove container on exit
   // run init binary inside container to forward signals & reap zombies
-  const args = ['run', '-i', '--rm', '--init', '--workdir', containerWorkdir];
+  const args = ["run", "-i", "--rm", "--init", "--workdir", containerWorkdir];
 
   // add custom flags from SANDBOX_FLAGS
-  if (process.env['SANDBOX_FLAGS']) {
-    const flags = parse(process.env['SANDBOX_FLAGS'], process.env).filter(
-      (f): f is string => typeof f === 'string',
+  if (process.env["SANDBOX_FLAGS"]) {
+    const flags = parse(process.env["SANDBOX_FLAGS"], process.env).filter(
+      (f): f is string => typeof f === "string",
     );
     args.push(...flags);
   }
 
   // add TTY only if stdin is TTY as well, i.e. for piped input don't init TTY in container
   if (process.stdin.isTTY) {
-    args.push('-t');
+    args.push("-t");
   }
 
   // allow access to host.docker.internal
-  args.push('--add-host', 'host.docker.internal:host-gateway');
+  args.push("--add-host", "host.docker.internal:host-gateway");
 
   // mount current directory as working directory in sandbox (set via --workdir)
-  args.push('--volume', `${workdir}:${containerWorkdir}`);
+  args.push("--volume", `${workdir}:${containerWorkdir}`);
 
   // mount user settings directory inside container, after creating if missing
   // note user/home changes inside sandbox and we mount at BOTH paths for consistency
   const userSettingsDirOnHost = USER_SETTINGS_DIR;
-  const userSettingsDirInSandbox = getContainerPath(
-    `/home/node/${SETTINGS_DIRECTORY_NAME}`,
-  );
+  const userSettingsDirInSandbox = getContainerPath(`/home/node/${SETTINGS_DIRECTORY_NAME}`);
   if (!fs.existsSync(userSettingsDirOnHost)) {
     fs.mkdirSync(userSettingsDirOnHost);
   }
-  args.push('--volume', `${userSettingsDirOnHost}:${userSettingsDirInSandbox}`);
+  args.push("--volume", `${userSettingsDirOnHost}:${userSettingsDirInSandbox}`);
   if (userSettingsDirInSandbox !== userSettingsDirOnHost) {
-    args.push(
-      '--volume',
-      `${userSettingsDirOnHost}:${getContainerPath(userSettingsDirOnHost)}`,
-    );
+    args.push("--volume", `${userSettingsDirOnHost}:${getContainerPath(userSettingsDirOnHost)}`);
   }
 
   // mount os.tmpdir() as os.tmpdir() inside container
-  args.push('--volume', `${os.tmpdir()}:${getContainerPath(os.tmpdir())}`);
+  args.push("--volume", `${os.tmpdir()}:${getContainerPath(os.tmpdir())}`);
 
   // mount gcloud config directory if it exists
-  const gcloudConfigDir = path.join(os.homedir(), '.config', 'gcloud');
+  const gcloudConfigDir = path.join(os.homedir(), ".config", "gcloud");
   if (fs.existsSync(gcloudConfigDir)) {
-    args.push(
-      '--volume',
-      `${gcloudConfigDir}:${getContainerPath(gcloudConfigDir)}:ro`,
-    );
+    args.push("--volume", `${gcloudConfigDir}:${getContainerPath(gcloudConfigDir)}:ro`);
   }
 
   // mount ADC file if GOOGLE_APPLICATION_CREDENTIALS is set
-  if (process.env['GOOGLE_APPLICATION_CREDENTIALS']) {
-    const adcFile = process.env['GOOGLE_APPLICATION_CREDENTIALS'];
+  if (process.env["GOOGLE_APPLICATION_CREDENTIALS"]) {
+    const adcFile = process.env["GOOGLE_APPLICATION_CREDENTIALS"];
     if (fs.existsSync(adcFile)) {
-      args.push('--volume', `${adcFile}:${getContainerPath(adcFile)}:ro`);
-      args.push(
-        '--env',
-        `GOOGLE_APPLICATION_CREDENTIALS=${getContainerPath(adcFile)}`,
-      );
+      args.push("--volume", `${adcFile}:${getContainerPath(adcFile)}:ro`);
+      args.push("--env", `GOOGLE_APPLICATION_CREDENTIALS=${getContainerPath(adcFile)}`);
     }
   }
 
   // mount paths listed in SANDBOX_MOUNTS
-  if (process.env['SANDBOX_MOUNTS']) {
-    for (let mount of process.env['SANDBOX_MOUNTS'].split(',')) {
+  if (process.env["SANDBOX_MOUNTS"]) {
+    for (let mount of process.env["SANDBOX_MOUNTS"].split(",")) {
       if (mount.trim()) {
         // parse mount as from:to:opts
-        let [from, to, opts] = mount.trim().split(':');
+        let [from, to, opts] = mount.trim().split(":");
         to = to || from; // default to mount at same path inside container
-        opts = opts || 'ro'; // default to read-only
+        opts = opts || "ro"; // default to read-only
         mount = `${from}:${to}:${opts}`;
         // check that from path is absolute
         if (!path.isAbsolute(from)) {
-          throw new FatalSandboxError(
-            `Path '${from}' listed in SANDBOX_MOUNTS must be absolute`,
-          );
+          throw new FatalSandboxError(`Path '${from}' listed in SANDBOX_MOUNTS must be absolute`);
         }
         // check that from path exists on host
         if (!fs.existsSync(from)) {
-          throw new FatalSandboxError(
-            `Missing mount path '${from}' listed in SANDBOX_MOUNTS`,
-          );
+          throw new FatalSandboxError(`Missing mount path '${from}' listed in SANDBOX_MOUNTS`);
         }
         writeStderrLine(`SANDBOX_MOUNTS: ${from} -> ${to} (${opts})`);
-        args.push('--volume', mount);
+        args.push("--volume", mount);
       }
     }
   }
 
   // expose env-specified ports on the sandbox
-  ports().forEach((p) => args.push('--publish', `${p}:${p}`));
+  ports().forEach((p) => args.push("--publish", `${p}:${p}`));
 
   // if DEBUG is set, expose debugging port
-  if (process.env['DEBUG']) {
-    const debugPort = process.env['DEBUG_PORT'] || '9229';
+  if (process.env["DEBUG"]) {
+    const debugPort = process.env["DEBUG_PORT"] || "9229";
     args.push(`--publish`, `${debugPort}:${debugPort}`);
   }
 
   // copy proxy environment variables, replacing localhost with SANDBOX_PROXY_NAME
   // copy as both upper-case and lower-case as is required by some utilities
   // AIRISCODE_SANDBOX_PROXY_COMMAND implies HTTPS_PROXY unless HTTP_PROXY is set
-  const proxyCommand = process.env['AIRISCODE_SANDBOX_PROXY_COMMAND'];
+  const proxyCommand = process.env["AIRISCODE_SANDBOX_PROXY_COMMAND"];
 
   if (proxyCommand) {
     let proxy =
-      process.env['HTTPS_PROXY'] ||
-      process.env['https_proxy'] ||
-      process.env['HTTP_PROXY'] ||
-      process.env['http_proxy'] ||
-      'http://localhost:8877';
-    proxy = proxy.replace('localhost', SANDBOX_PROXY_NAME);
+      process.env["HTTPS_PROXY"] ||
+      process.env["https_proxy"] ||
+      process.env["HTTP_PROXY"] ||
+      process.env["http_proxy"] ||
+      "http://localhost:8877";
+    proxy = proxy.replace("localhost", SANDBOX_PROXY_NAME);
     if (proxy) {
-      args.push('--env', `HTTPS_PROXY=${proxy}`);
-      args.push('--env', `https_proxy=${proxy}`); // lower-case can be required, e.g. for curl
-      args.push('--env', `HTTP_PROXY=${proxy}`);
-      args.push('--env', `http_proxy=${proxy}`);
+      args.push("--env", `HTTPS_PROXY=${proxy}`);
+      args.push("--env", `https_proxy=${proxy}`); // lower-case can be required, e.g. for curl
+      args.push("--env", `HTTP_PROXY=${proxy}`);
+      args.push("--env", `http_proxy=${proxy}`);
     }
-    const noProxy = process.env['NO_PROXY'] || process.env['no_proxy'];
+    const noProxy = process.env["NO_PROXY"] || process.env["no_proxy"];
     if (noProxy) {
-      args.push('--env', `NO_PROXY=${noProxy}`);
-      args.push('--env', `no_proxy=${noProxy}`);
+      args.push("--env", `NO_PROXY=${noProxy}`);
+      args.push("--env", `no_proxy=${noProxy}`);
     }
 
     // if using proxy, switch to internal networking through proxy
@@ -526,7 +478,7 @@ export async function start_sandbox(
       execSync(
         `${config.command} network inspect ${SANDBOX_NETWORK_NAME} || ${config.command} network create --internal ${SANDBOX_NETWORK_NAME}`,
       );
-      args.push('--network', SANDBOX_NETWORK_NAME);
+      args.push("--network", SANDBOX_NETWORK_NAME);
       // if proxy command is set, create a separate network w/ host access (i.e. non-internal)
       // we will run proxy in its own container connected to both host network and internal network
       // this allows proxy to work even on rootless podman on macos with host<->vm<->container isolation
@@ -540,19 +492,14 @@ export async function start_sandbox(
 
   // name container after image, plus random suffix to avoid conflicts
   const imageName = parseImageName(image);
-  const isIntegrationTest =
-    process.env['AIRISCODE_INTEGRATION_TEST'] === 'true';
+  const isIntegrationTest = process.env["AIRISCODE_INTEGRATION_TEST"] === "true";
   let containerName;
   if (isIntegrationTest) {
-    containerName = `airiscode-integration-test-${randomBytes(4).toString(
-      'hex',
-    )}`;
+    containerName = `airiscode-integration-test-${randomBytes(4).toString("hex")}`;
     writeStderrLine(`ContainerName: ${containerName}`);
   } else {
     let index = 0;
-    const containerNameCheck = execSync(
-      `${config.command} ps -a --format "{{.Names}}"`,
-    )
+    const containerNameCheck = execSync(`${config.command} ps -a --format "{{.Names}}"`)
       .toString()
       .trim();
     while (containerNameCheck.includes(`${imageName}-${index}`)) {
@@ -561,92 +508,77 @@ export async function start_sandbox(
     containerName = `${imageName}-${index}`;
     writeStderrLine(`ContainerName (regular): ${containerName}`);
   }
-  args.push('--name', containerName, '--hostname', containerName);
+  args.push("--name", containerName, "--hostname", containerName);
 
   // copy AIRISCODE_TEST_VAR for integration tests
-  if (process.env['AIRISCODE_TEST_VAR']) {
-    args.push(
-      '--env',
-      `AIRISCODE_TEST_VAR=${process.env['AIRISCODE_TEST_VAR']}`,
-    );
+  if (process.env["AIRISCODE_TEST_VAR"]) {
+    args.push("--env", `AIRISCODE_TEST_VAR=${process.env["AIRISCODE_TEST_VAR"]}`);
   }
 
   // copy GEMINI_API_KEY(s)
-  if (process.env['GEMINI_API_KEY']) {
-    args.push('--env', `GEMINI_API_KEY=${process.env['GEMINI_API_KEY']}`);
+  if (process.env["GEMINI_API_KEY"]) {
+    args.push("--env", `GEMINI_API_KEY=${process.env["GEMINI_API_KEY"]}`);
   }
-  if (process.env['GOOGLE_API_KEY']) {
-    args.push('--env', `GOOGLE_API_KEY=${process.env['GOOGLE_API_KEY']}`);
+  if (process.env["GOOGLE_API_KEY"]) {
+    args.push("--env", `GOOGLE_API_KEY=${process.env["GOOGLE_API_KEY"]}`);
   }
 
   // copy OPENAI_API_KEY and related env vars for Qwen
-  if (process.env['OPENAI_API_KEY']) {
-    args.push('--env', `OPENAI_API_KEY=${process.env['OPENAI_API_KEY']}`);
+  if (process.env["OPENAI_API_KEY"]) {
+    args.push("--env", `OPENAI_API_KEY=${process.env["OPENAI_API_KEY"]}`);
   }
   // copy TAVILY_API_KEY for web search tool
-  if (process.env['TAVILY_API_KEY']) {
-    args.push('--env', `TAVILY_API_KEY=${process.env['TAVILY_API_KEY']}`);
+  if (process.env["TAVILY_API_KEY"]) {
+    args.push("--env", `TAVILY_API_KEY=${process.env["TAVILY_API_KEY"]}`);
   }
-  if (process.env['OPENAI_BASE_URL']) {
-    args.push('--env', `OPENAI_BASE_URL=${process.env['OPENAI_BASE_URL']}`);
+  if (process.env["OPENAI_BASE_URL"]) {
+    args.push("--env", `OPENAI_BASE_URL=${process.env["OPENAI_BASE_URL"]}`);
   }
-  if (process.env['OPENAI_MODEL']) {
-    args.push('--env', `OPENAI_MODEL=${process.env['OPENAI_MODEL']}`);
+  if (process.env["OPENAI_MODEL"]) {
+    args.push("--env", `OPENAI_MODEL=${process.env["OPENAI_MODEL"]}`);
   }
 
   // copy GOOGLE_GENAI_USE_VERTEXAI
-  if (process.env['GOOGLE_GENAI_USE_VERTEXAI']) {
-    args.push(
-      '--env',
-      `GOOGLE_GENAI_USE_VERTEXAI=${process.env['GOOGLE_GENAI_USE_VERTEXAI']}`,
-    );
+  if (process.env["GOOGLE_GENAI_USE_VERTEXAI"]) {
+    args.push("--env", `GOOGLE_GENAI_USE_VERTEXAI=${process.env["GOOGLE_GENAI_USE_VERTEXAI"]}`);
   }
 
   // copy GOOGLE_GENAI_USE_GCA
-  if (process.env['GOOGLE_GENAI_USE_GCA']) {
-    args.push(
-      '--env',
-      `GOOGLE_GENAI_USE_GCA=${process.env['GOOGLE_GENAI_USE_GCA']}`,
-    );
+  if (process.env["GOOGLE_GENAI_USE_GCA"]) {
+    args.push("--env", `GOOGLE_GENAI_USE_GCA=${process.env["GOOGLE_GENAI_USE_GCA"]}`);
   }
 
   // copy GOOGLE_CLOUD_PROJECT
-  if (process.env['GOOGLE_CLOUD_PROJECT']) {
-    args.push(
-      '--env',
-      `GOOGLE_CLOUD_PROJECT=${process.env['GOOGLE_CLOUD_PROJECT']}`,
-    );
+  if (process.env["GOOGLE_CLOUD_PROJECT"]) {
+    args.push("--env", `GOOGLE_CLOUD_PROJECT=${process.env["GOOGLE_CLOUD_PROJECT"]}`);
   }
 
   // copy GOOGLE_CLOUD_LOCATION
-  if (process.env['GOOGLE_CLOUD_LOCATION']) {
-    args.push(
-      '--env',
-      `GOOGLE_CLOUD_LOCATION=${process.env['GOOGLE_CLOUD_LOCATION']}`,
-    );
+  if (process.env["GOOGLE_CLOUD_LOCATION"]) {
+    args.push("--env", `GOOGLE_CLOUD_LOCATION=${process.env["GOOGLE_CLOUD_LOCATION"]}`);
   }
 
   // copy GEMINI_MODEL
-  if (process.env['GEMINI_MODEL']) {
-    args.push('--env', `GEMINI_MODEL=${process.env['GEMINI_MODEL']}`);
+  if (process.env["GEMINI_MODEL"]) {
+    args.push("--env", `GEMINI_MODEL=${process.env["GEMINI_MODEL"]}`);
   }
 
   // copy TERM and COLORTERM to try to maintain terminal setup
-  if (process.env['TERM']) {
-    args.push('--env', `TERM=${process.env['TERM']}`);
+  if (process.env["TERM"]) {
+    args.push("--env", `TERM=${process.env["TERM"]}`);
   }
-  if (process.env['COLORTERM']) {
-    args.push('--env', `COLORTERM=${process.env['COLORTERM']}`);
+  if (process.env["COLORTERM"]) {
+    args.push("--env", `COLORTERM=${process.env["COLORTERM"]}`);
   }
 
   // Pass through IDE mode environment variables
   for (const envVar of [
-    'AIRISCODE_IDE_SERVER_PORT',
-    'AIRISCODE_IDE_WORKSPACE_PATH',
-    'TERM_PROGRAM',
+    "AIRISCODE_IDE_SERVER_PORT",
+    "AIRISCODE_IDE_WORKSPACE_PATH",
+    "TERM_PROGRAM",
   ]) {
     if (process.env[envVar]) {
-      args.push('--env', `${envVar}=${process.env[envVar]}`);
+      args.push("--env", `${envVar}=${process.env[envVar]}`);
     }
   }
 
@@ -654,36 +586,25 @@ export async function start_sandbox(
   // also mount-replace VIRTUAL_ENV directory with <project_settings>/sandbox.venv
   // sandbox can then set up this new VIRTUAL_ENV directory using sandbox.bashrc (see below)
   // directory will be empty if not set up, which is still preferable to having host binaries
-  if (
-    process.env['VIRTUAL_ENV']?.toLowerCase().startsWith(workdir.toLowerCase())
-  ) {
-    const sandboxVenvPath = path.resolve(
-      SETTINGS_DIRECTORY_NAME,
-      'sandbox.venv',
-    );
+  if (process.env["VIRTUAL_ENV"]?.toLowerCase().startsWith(workdir.toLowerCase())) {
+    const sandboxVenvPath = path.resolve(SETTINGS_DIRECTORY_NAME, "sandbox.venv");
     if (!fs.existsSync(sandboxVenvPath)) {
       fs.mkdirSync(sandboxVenvPath, { recursive: true });
     }
-    args.push(
-      '--volume',
-      `${sandboxVenvPath}:${getContainerPath(process.env['VIRTUAL_ENV'])}`,
-    );
-    args.push(
-      '--env',
-      `VIRTUAL_ENV=${getContainerPath(process.env['VIRTUAL_ENV'])}`,
-    );
+    args.push("--volume", `${sandboxVenvPath}:${getContainerPath(process.env["VIRTUAL_ENV"])}`);
+    args.push("--env", `VIRTUAL_ENV=${getContainerPath(process.env["VIRTUAL_ENV"])}`);
   }
 
   // copy additional environment variables from SANDBOX_ENV
-  if (process.env['SANDBOX_ENV']) {
-    for (let env of process.env['SANDBOX_ENV'].split(',')) {
+  if (process.env["SANDBOX_ENV"]) {
+    for (let env of process.env["SANDBOX_ENV"].split(",")) {
       if ((env = env.trim())) {
-        if (env.includes('=')) {
+        if (env.includes("=")) {
           writeStderrLine(`SANDBOX_ENV: ${env}`);
-          args.push('--env', env);
+          args.push("--env", env);
         } else {
           throw new FatalSandboxError(
-            'SANDBOX_ENV must be a comma-separated list of key=value pairs',
+            "SANDBOX_ENV must be a comma-separated list of key=value pairs",
           );
         }
       }
@@ -691,29 +612,28 @@ export async function start_sandbox(
   }
 
   // copy NODE_OPTIONS
-  const existingNodeOptions = process.env['NODE_OPTIONS'] || '';
-  const allNodeOptions = [
-    ...(existingNodeOptions ? [existingNodeOptions] : []),
-    ...nodeArgs,
-  ].join(' ');
+  const existingNodeOptions = process.env["NODE_OPTIONS"] || "";
+  const allNodeOptions = [...(existingNodeOptions ? [existingNodeOptions] : []), ...nodeArgs].join(
+    " ",
+  );
 
   if (allNodeOptions.length > 0) {
-    args.push('--env', `NODE_OPTIONS="${allNodeOptions}"`);
+    args.push("--env", `NODE_OPTIONS="${allNodeOptions}"`);
   }
 
   // set SANDBOX as container name
-  args.push('--env', `SANDBOX=${containerName}`);
+  args.push("--env", `SANDBOX=${containerName}`);
 
   // for podman only, use empty --authfile to skip unnecessary auth refresh overhead
-  if (config.command === 'podman') {
-    const emptyAuthFilePath = path.join(os.tmpdir(), 'empty_auth.json');
-    fs.writeFileSync(emptyAuthFilePath, '{}', 'utf-8');
-    args.push('--authfile', emptyAuthFilePath);
+  if (config.command === "podman") {
+    const emptyAuthFilePath = path.join(os.tmpdir(), "empty_auth.json");
+    fs.writeFileSync(emptyAuthFilePath, "{}", "utf-8");
+    args.push("--authfile", emptyAuthFilePath);
   }
 
   // Determine if the current user's UID/GID should be passed to the sandbox.
   // See shouldUseCurrentUserInSandbox for more details.
-  let userFlag = '';
+  let userFlag = "";
   const finalEntrypoint = entrypoint(workdir, cliArgs);
 
   // Check if we should use current user's UID/GID in sandbox
@@ -727,17 +647,17 @@ export async function start_sandbox(
     // allowing tests that need to access host's ~/.qwen (e.g., --resume) to work.
     // For the user-creation logic to work, the container must start as root.
     // The entrypoint script then handles dropping privileges to the correct user.
-    args.push('--user', 'root');
+    args.push("--user", "root");
 
-    const uid = execSync('id -u').toString().trim();
-    const gid = execSync('id -g').toString().trim();
+    const uid = execSync("id -u").toString().trim();
+    const gid = execSync("id -g").toString().trim();
 
     // Instead of passing --user to the main sandbox container, we let it
     // start as root, then create a user with the host's UID/GID, and
     // finally switch to that user to run the qwen process. This is
     // necessary on Linux to ensure the user exists within the
     // container's /etc/passwd file, which is required by os.userInfo().
-    const username = 'airiscode';
+    const username = "airiscode";
     const homeDir = getContainerPath(os.homedir());
 
     const setupUserCommands = [
@@ -745,7 +665,7 @@ export async function start_sandbox(
       `groupadd -f -g ${gid} ${username}`,
       // Create user only if it doesn't exist. Use -o for non-unique UID.
       `id -u ${username} &>/dev/null || useradd -o -u ${uid} -g ${gid} -d ${homeDir} -s /bin/bash ${username}`,
-    ].join(' && ');
+    ].join(" && ");
 
     const originalCommand = finalEntrypoint[2];
     const escapedOriginalCommand = originalCommand.replace(/'/g, "'\\''");
@@ -759,11 +679,11 @@ export async function start_sandbox(
     // We still need userFlag for the simpler proxy container, which does not have this issue.
     userFlag = `--user ${uid}:${gid}`;
     // When forcing a UID in the sandbox, $HOME can be reset to '/', so we copy $HOME as well.
-    args.push('--env', `HOME=${os.homedir()}`);
+    args.push("--env", `HOME=${os.homedir()}`);
   } else if (isIntegrationTest) {
     // Integration test mode with UID/GID matching disabled: use root
-    args.push('--user', 'root');
-    userFlag = '--user root';
+    args.push("--user", "root");
+    userFlag = "--user root";
   }
   // else: non-IT mode with UID/GID matching disabled - use image default user (node)
 
@@ -780,45 +700,43 @@ export async function start_sandbox(
   if (proxyCommand) {
     // run proxyCommand in its own container
     const proxyContainerCommand = `${config.command} run --rm --init ${userFlag} --name ${SANDBOX_PROXY_NAME} --network ${SANDBOX_PROXY_NAME} -p 8877:8877 -v ${process.cwd()}:${workdir} --workdir ${workdir} ${image} ${proxyCommand}`;
-    const isWindows = os.platform() === 'win32';
-    const proxyShell = isWindows ? 'cmd.exe' : 'bash';
+    const isWindows = os.platform() === "win32";
+    const proxyShell = isWindows ? "cmd.exe" : "bash";
     const proxyShellArgs = isWindows
-      ? ['/c', proxyContainerCommand]
-      : ['-c', proxyContainerCommand];
+      ? ["/c", proxyContainerCommand]
+      : ["-c", proxyContainerCommand];
     // Note: CodeQL flags this as js/shell-command-injection-from-environment.
     // This is intentional - CLI tool executes user-provided proxy commands in container.
     proxyProcess = spawn(proxyShell, proxyShellArgs, {
-      stdio: ['ignore', 'pipe', 'pipe'],
+      stdio: ["ignore", "pipe", "pipe"],
       detached: true,
     });
     // install handlers to stop proxy on exit/signal
     const stopProxy = () => {
-      writeStderrLine('stopping proxy container ...');
+      writeStderrLine("stopping proxy container ...");
       execSync(`${config.command} rm -f ${SANDBOX_PROXY_NAME}`);
     };
-    process.on('exit', stopProxy);
-    process.on('SIGINT', stopProxy);
-    process.on('SIGTERM', stopProxy);
+    process.on("exit", stopProxy);
+    process.on("SIGINT", stopProxy);
+    process.on("SIGTERM", stopProxy);
 
     // commented out as it disrupts ink rendering
     // proxyProcess.stdout?.on('data', (data) => {
     //   console.info(data.toString());
     // });
-    proxyProcess.stderr?.on('data', (data) => {
+    proxyProcess.stderr?.on("data", (data) => {
       writeStderrLine(data.toString().trim());
     });
-    proxyProcess.on('close', (code, signal) => {
+    proxyProcess.on("close", (code, signal) => {
       if (sandboxProcess?.pid) {
-        process.kill(-sandboxProcess.pid, 'SIGTERM');
+        process.kill(-sandboxProcess.pid, "SIGTERM");
       }
       throw new FatalSandboxError(
         `Proxy container command '${proxyContainerCommand}' exited with code ${code}, signal ${signal}`,
       );
     });
-    writeStderrLine('waiting for proxy to start ...');
-    await execAsync(
-      `until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`,
-    );
+    writeStderrLine("waiting for proxy to start ...");
+    await execAsync(`until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`);
     // connect proxy container to sandbox network
     // (workaround for older versions of docker that don't support multiple --network args)
     await execAsync(
@@ -829,21 +747,19 @@ export async function start_sandbox(
   // spawn child and let it inherit stdio
   process.stdin.pause();
   sandboxProcess = spawn(config.command, args, {
-    stdio: 'inherit',
+    stdio: "inherit",
   });
 
   return new Promise<number>((resolve, reject) => {
-    sandboxProcess.on('error', (err) => {
+    sandboxProcess.on("error", (err) => {
       writeStderrLine(`Sandbox process error: ${err}`);
       reject(err);
     });
 
-    sandboxProcess?.on('close', (code, signal) => {
+    sandboxProcess?.on("close", (code, signal) => {
       process.stdin.resume();
       if (code !== 0 && code !== null) {
-        writeStderrLine(
-          `Sandbox process exited with code: ${code}, signal: ${signal}`,
-        );
+        writeStderrLine(`Sandbox process exited with code: ${code}, signal: ${signal}`);
       }
       resolve(code ?? 1);
     });
@@ -853,30 +769,28 @@ export async function start_sandbox(
 // Helper functions to ensure sandbox image is present
 async function imageExists(sandbox: string, image: string): Promise<boolean> {
   return new Promise((resolve) => {
-    const args = ['images', '-q', image];
+    const args = ["images", "-q", image];
     const checkProcess = spawn(sandbox, args);
 
-    let stdoutData = '';
+    let stdoutData = "";
     if (checkProcess.stdout) {
-      checkProcess.stdout.on('data', (data) => {
+      checkProcess.stdout.on("data", (data) => {
         stdoutData += data.toString();
       });
     }
 
-    checkProcess.on('error', (err) => {
-      writeStderrLine(
-        `Failed to start '${sandbox}' command for image check: ${err.message}`,
-      );
+    checkProcess.on("error", (err) => {
+      writeStderrLine(`Failed to start '${sandbox}' command for image check: ${err.message}`);
       resolve(false);
     });
 
-    checkProcess.on('close', (code) => {
+    checkProcess.on("close", (code) => {
       // Non-zero code might indicate docker daemon not running, etc.
       // The primary success indicator is non-empty stdoutData.
       if (code !== 0) {
         // console.warn(`'${sandbox} images -q ${image}' exited with code ${code}.`);
       }
-      resolve(stdoutData.trim() !== '');
+      resolve(stdoutData.trim() !== "");
     });
   });
 }
@@ -884,10 +798,10 @@ async function imageExists(sandbox: string, image: string): Promise<boolean> {
 async function pullImage(sandbox: string, image: string): Promise<boolean> {
   writeStderrLine(`Attempting to pull image ${image} using ${sandbox}...`);
   return new Promise((resolve) => {
-    const args = ['pull', image];
-    const pullProcess = spawn(sandbox, args, { stdio: 'pipe' });
+    const args = ["pull", image];
+    const pullProcess = spawn(sandbox, args, { stdio: "pipe" });
 
-    let stderrData = '';
+    let stderrData = "";
 
     const onStdoutData = (data: Buffer) => {
       writeStderrLine(data.toString().trim()); // Show pull progress
@@ -899,9 +813,7 @@ async function pullImage(sandbox: string, image: string): Promise<boolean> {
     };
 
     const onError = (err: Error) => {
-      writeStderrLine(
-        `Failed to start '${sandbox} pull ${image}' command: ${err.message}`,
-      );
+      writeStderrLine(`Failed to start '${sandbox} pull ${image}' command: ${err.message}`);
       cleanup();
       resolve(false);
     };
@@ -925,33 +837,30 @@ async function pullImage(sandbox: string, image: string): Promise<boolean> {
 
     const cleanup = () => {
       if (pullProcess.stdout) {
-        pullProcess.stdout.removeListener('data', onStdoutData);
+        pullProcess.stdout.removeListener("data", onStdoutData);
       }
       if (pullProcess.stderr) {
-        pullProcess.stderr.removeListener('data', onStderrData);
+        pullProcess.stderr.removeListener("data", onStderrData);
       }
-      pullProcess.removeListener('error', onError);
-      pullProcess.removeListener('close', onClose);
+      pullProcess.removeListener("error", onError);
+      pullProcess.removeListener("close", onClose);
       if (pullProcess.connected) {
         pullProcess.disconnect();
       }
     };
 
     if (pullProcess.stdout) {
-      pullProcess.stdout.on('data', onStdoutData);
+      pullProcess.stdout.on("data", onStdoutData);
     }
     if (pullProcess.stderr) {
-      pullProcess.stderr.on('data', onStderrData);
+      pullProcess.stderr.on("data", onStderrData);
     }
-    pullProcess.on('error', onError);
-    pullProcess.on('close', onClose);
+    pullProcess.on("error", onError);
+    pullProcess.on("close", onClose);
   });
 }
 
-async function ensureSandboxImageIsPresent(
-  sandbox: string,
-  image: string,
-): Promise<boolean> {
+async function ensureSandboxImageIsPresent(sandbox: string, image: string): Promise<boolean> {
   writeStderrLine(`Checking for sandbox image: ${image}`);
   if (await imageExists(sandbox, image)) {
     writeStderrLine(`Sandbox image ${image} found locally.`);
@@ -977,8 +886,6 @@ async function ensureSandboxImageIsPresent(
     }
   }
 
-  writeStderrLine(
-    `Failed to obtain sandbox image ${image} after check and pull attempt.`,
-  );
+  writeStderrLine(`Failed to obtain sandbox image ${image} after check and pull attempt.`);
   return false; // Pull command failed or image still not present
 }
diff --git a/apps/airiscode-cli/src/utils/settingsUtils.ts b/apps/airiscode-cli/src/utils/settingsUtils.ts
index c9bc0d3f0..846664339 100644
--- a/apps/airiscode-cli/src/utils/settingsUtils.ts
+++ b/apps/airiscode-cli/src/utils/settingsUtils.ts
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import type {
-  Settings,
-  SettingScope,
-  LoadedSettings,
-} from '../config/settings.js';
+import * as fs from "node:fs";
+import type { LoadedSettings, SettingScope, Settings } from "../config/settings.js";
 import type {
   SettingDefinition,
   SettingsSchema,
   SettingsType,
   SettingsValue,
-} from '../config/settingsSchema.js';
-import { getSettingsSchema } from '../config/settingsSchema.js';
-import { t } from '../i18n/index.js';
-import { isAutoLanguage } from './languageUtils.js';
+} from "../config/settingsSchema.js";
+import { getSettingsSchema } from "../config/settingsSchema.js";
+import { t } from "../i18n/index.js";
+import { isAutoLanguage } from "./languageUtils.js";
 
 // The schema is now nested, but many parts of the UI and logic work better
 // with a flattened structure and dot-notation keys. This section flattens the
@@ -26,7 +22,7 @@ import { isAutoLanguage } from './languageUtils.js';
 
 type FlattenedSchema = Record<string, SettingDefinition & { key: string }>;
 
-function flattenSchema(schema: SettingsSchema, prefix = ''): FlattenedSchema {
+function flattenSchema(schema: SettingsSchema, prefix = ""): FlattenedSchema {
   let result: FlattenedSchema = {};
   for (const key in schema) {
     const newKey = prefix ? `${prefix}.${key}` : key;
@@ -43,10 +39,7 @@ let _FLATTENED_SCHEMA: FlattenedSchema | undefined;
 
 /** Returns a flattened schema, the first call is memoized for future requests. */
 export function getFlattenedSchema() {
-  return (
-    _FLATTENED_SCHEMA ??
-    (_FLATTENED_SCHEMA = flattenSchema(getSettingsSchema()))
-  );
+  return _FLATTENED_SCHEMA ?? (_FLATTENED_SCHEMA = flattenSchema(getSettingsSchema()));
 }
 
 function clearFlattenedSchema() {
@@ -60,10 +53,7 @@ export function getSettingsByCategory(): Record<
   string,
   Array<SettingDefinition & { key: string }>
 > {
-  const categories: Record<
-    string,
-    Array<SettingDefinition & { key: string }>
-  > = {};
+  const categories: Record<string, Array<SettingDefinition & { key: string }>> = {};
 
   Object.values(getFlattenedSchema()).forEach((definition) => {
     const category = definition.category;
@@ -111,10 +101,7 @@ export function getRestartRequiredSettings(): string[] {
 /**
  * Recursively gets a value from a nested object using a key path array.
  */
-export function getNestedValue(
-  obj: Record<string, unknown>,
-  path: string[],
-): unknown {
+export function getNestedValue(obj: Record<string, unknown>, path: string[]): unknown {
   const [first, ...rest] = path;
   if (!first || !(first in obj)) {
     return undefined;
@@ -123,17 +110,14 @@ export function getNestedValue(
   if (rest.length === 0) {
     return value;
   }
-  if (value && typeof value === 'object' && value !== null) {
+  if (value && typeof value === "object" && value !== null) {
     return getNestedValue(value as Record<string, unknown>, rest);
   }
   return undefined;
 }
 
-export function getNestedProperty(
-  obj: Record<string, unknown>,
-  path: string,
-): unknown {
-  return getNestedValue(obj, path.split('.'));
+export function getNestedProperty(obj: Record<string, unknown>, path: string): unknown {
+  return getNestedValue(obj, path.split("."));
 }
 
 /**
@@ -150,7 +134,7 @@ export function getEffectiveValue(
     return undefined;
   }
 
-  const path = key.split('.');
+  const path = key.split(".");
 
   // Check the current scope's settings first
   let value = getNestedValue(settings as Record<string, unknown>, path);
@@ -178,12 +162,8 @@ export function getAllSettingKeys(): string[] {
 /**
  * Get settings by type
  */
-export function getSettingsByType(
-  type: SettingsType,
-): Array<SettingDefinition & { key: string }> {
-  return Object.values(getFlattenedSchema()).filter(
-    (definition) => definition.type === type,
-  );
+export function getSettingsByType(type: SettingsType): Array<SettingDefinition & { key: string }> {
+  return Object.values(getFlattenedSchema()).filter((definition) => definition.type === type);
 }
 
 /**
@@ -194,9 +174,7 @@ export function getSettingsRequiringRestart(): Array<
     key: string;
   }
 > {
-  return Object.values(getFlattenedSchema()).filter(
-    (definition) => definition.requiresRestart,
-  );
+  return Object.values(getFlattenedSchema()).filter((definition) => definition.requiresRestart);
 }
 
 /**
@@ -227,10 +205,7 @@ export function getDialogSettingsByCategory(): Record<
   string,
   Array<SettingDefinition & { key: string }>
 > {
-  const categories: Record<
-    string,
-    Array<SettingDefinition & { key: string }>
-  > = {};
+  const categories: Record<string, Array<SettingDefinition & { key: string }>> = {};
 
   Object.values(getFlattenedSchema())
     .filter((definition) => definition.showInDialog !== false)
@@ -252,8 +227,7 @@ export function getDialogSettingsByType(
   type: SettingsType,
 ): Array<SettingDefinition & { key: string }> {
   return Object.values(getFlattenedSchema()).filter(
-    (definition) =>
-      definition.type === type && definition.showInDialog !== false,
+    (definition) => definition.type === type && definition.showInDialog !== false,
   );
 }
 
@@ -273,39 +247,39 @@ export function getDialogSettingsByType(
  */
 const SETTINGS_DIALOG_ORDER: readonly string[] = [
   // Workflow Control - most impactful setting
-  'tools.approvalMode',
+  "tools.approvalMode",
 
   // Localization - users often set this first
-  'general.language',
-  'general.outputLanguage',
+  "general.language",
+  "general.outputLanguage",
 
   // Theme
-  'ui.theme',
+  "ui.theme",
 
   // Editor/Shell Experience
-  'general.vimMode',
-  'tools.shell.enableInteractiveShell',
+  "general.vimMode",
+  "tools.shell.enableInteractiveShell",
 
   // Display Preferences
-  'general.preferredEditor',
-  'ide.enabled',
-  'ui.showLineNumbers',
-  'ui.hideTips',
-  'general.terminalBell',
-  'ui.enableWelcomeBack',
+  "general.preferredEditor",
+  "ide.enabled",
+  "ui.showLineNumbers",
+  "ui.hideTips",
+  "general.terminalBell",
+  "ui.enableWelcomeBack",
 
   // Git Behavior
-  'general.gitCoAuthor',
+  "general.gitCoAuthor",
 
   // File Filtering
-  'context.fileFiltering.respectGitIgnore',
-  'context.fileFiltering.respectAiriscodeIgnore',
+  "context.fileFiltering.respectGitIgnore",
+  "context.fileFiltering.respectAiriscodeIgnore",
 
   // System Settings - rarely changed
-  'general.disableAutoUpdate',
+  "general.disableAutoUpdate",
 
   // Privacy
-  'privacy.usageStatisticsEnabled',
+  "privacy.usageStatisticsEnabled",
 ] as const;
 
 /**
@@ -353,12 +327,12 @@ export function getSettingValue(
 
   const value = getEffectiveValue(key, settings, mergedSettings);
   // Ensure we return a boolean value, converting from the more general type
-  if (typeof value === 'boolean') {
+  if (typeof value === "boolean") {
     return value;
   }
   // Fall back to default value, ensuring it's a boolean
   const defaultValue = definition.default;
-  if (typeof defaultValue === 'boolean') {
+  if (typeof defaultValue === "boolean") {
     return defaultValue;
   }
   return false; // Final fallback
@@ -370,7 +344,7 @@ export function getSettingValue(
 export function isSettingModified(key: string, value: boolean): boolean {
   const defaultValue = getDefaultValue(key);
   // Handle type comparison properly
-  if (typeof defaultValue === 'boolean') {
+  if (typeof defaultValue === "boolean") {
     return value !== defaultValue;
   }
   // If default is not a boolean, consider it modified if value is true
@@ -380,11 +354,8 @@ export function isSettingModified(key: string, value: boolean): boolean {
 /**
  * Check if a setting exists in the original settings file for a scope
  */
-export function settingExistsInScope(
-  key: string,
-  scopeSettings: Settings,
-): boolean {
-  const path = key.split('.');
+export function settingExistsInScope(key: string, scopeSettings: Settings): boolean {
+  const path = key.split(".");
   const value = getNestedValue(scopeSettings as Record<string, unknown>, path);
   return value !== undefined;
 }
@@ -394,13 +365,13 @@ export function setNestedPropertyForce(
   path: string,
   value: unknown,
 ): void {
-  const keys = path.split('.');
+  const keys = path.split(".");
   const lastKey = keys.pop();
   if (!lastKey) return;
 
   let current: Record<string, unknown> = obj;
   for (const key of keys) {
-    if (!current[key] || typeof current[key] !== 'object') {
+    if (!current[key] || typeof current[key] !== "object") {
       current[key] = {};
     }
     current = current[key] as Record<string, unknown>;
@@ -414,7 +385,7 @@ export function setNestedPropertySafe(
   path: string,
   value: unknown,
 ): void {
-  const keys = path.split('.');
+  const keys = path.split(".");
   const lastKey = keys.pop();
   if (!lastKey) return;
 
@@ -424,7 +395,7 @@ export function setNestedPropertySafe(
       current[key] = {};
     }
     const next = current[key];
-    if (typeof next === 'object' && next !== null) {
+    if (typeof next === "object" && next !== null) {
       current = next as Record<string, unknown>;
     } else {
       return;
@@ -434,18 +405,15 @@ export function setNestedPropertySafe(
   current[lastKey] = value;
 }
 
-export function deleteNestedPropertySafe(
-  obj: Record<string, unknown>,
-  path: string,
-): void {
-  const keys = path.split('.');
+export function deleteNestedPropertySafe(obj: Record<string, unknown>, path: string): void {
+  const keys = path.split(".");
   const lastKey = keys.pop();
   if (!lastKey) return;
 
   let current: Record<string, unknown> = obj;
   for (const key of keys) {
     const next = current[key];
-    if (typeof next !== 'object' || next === null) {
+    if (typeof next !== "object" || next === null) {
       return;
     }
     current = next as Record<string, unknown>;
@@ -483,18 +451,14 @@ export function setPendingSettingValueAny(
 /**
  * Check if any modified settings require a restart
  */
-export function hasRestartRequiredSettings(
-  modifiedSettings: Set<string>,
-): boolean {
+export function hasRestartRequiredSettings(modifiedSettings: Set<string>): boolean {
   return Array.from(modifiedSettings).some((key) => requiresRestart(key));
 }
 
 /**
  * Get the restart required settings from a set of modified settings
  */
-export function getRestartRequiredFromModified(
-  modifiedSettings: Set<string>,
-): string[] {
+export function getRestartRequiredFromModified(modifiedSettings: Set<string>): string[] {
   return Array.from(modifiedSettings).filter((key) => requiresRestart(key));
 }
 
@@ -508,11 +472,8 @@ export function saveModifiedSettings(
   scope: SettingScope,
 ): void {
   modifiedSettings.forEach((settingKey) => {
-    const path = settingKey.split('.');
-    const value = getNestedValue(
-      pendingSettings as Record<string, unknown>,
-      path,
-    );
+    const path = settingKey.split(".");
+    const value = getNestedValue(pendingSettings as Record<string, unknown>, path);
 
     const existsInOriginalFile = settingExistsInScope(
       settingKey,
@@ -565,9 +526,9 @@ export function getDisplayValue(
   let valueString = String(value);
 
   // Special handling for outputLanguage 'auto' value
-  if (key === 'general.outputLanguage' && isAutoLanguage(value as string)) {
-    valueString = t('Auto (detect from system)');
-  } else if (definition?.type === 'enum' && definition.options) {
+  if (key === "general.outputLanguage" && isAutoLanguage(value as string)) {
+    valueString = t("Auto (detect from system)");
+  } else if (definition?.type === "enum" && definition.options) {
     const option = definition.options?.find((option) => option.value === value);
     if (option?.label) {
       valueString = t(option.label) || option.label;
diff --git a/apps/airiscode-cli/src/utils/spawnWrapper.ts b/apps/airiscode-cli/src/utils/spawnWrapper.ts
index 108f166dc..9985e6f57 100644
--- a/apps/airiscode-cli/src/utils/spawnWrapper.ts
+++ b/apps/airiscode-cli/src/utils/spawnWrapper.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
+import { spawn } from "node:child_process";
 
 export const spawnWrapper = spawn;
diff --git a/apps/airiscode-cli/src/utils/startupWarnings.ts b/apps/airiscode-cli/src/utils/startupWarnings.ts
index 95fce1b30..a367c1b7f 100644
--- a/apps/airiscode-cli/src/utils/startupWarnings.ts
+++ b/apps/airiscode-cli/src/utils/startupWarnings.ts
@@ -4,24 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import { join as pathJoin } from 'node:path';
-import { getErrorMessage } from '@airiscode/core';
+import fs from "node:fs/promises";
+import os from "node:os";
+import { join as pathJoin } from "node:path";
+import { getErrorMessage } from "@airiscode/core";
 
-const warningsFilePath = pathJoin(os.tmpdir(), 'airiscode-warnings.txt');
+const warningsFilePath = pathJoin(os.tmpdir(), "airiscode-warnings.txt");
 
 export async function getStartupWarnings(): Promise<string[]> {
   try {
     await fs.access(warningsFilePath); // Check if file exists
-    const warningsContent = await fs.readFile(warningsFilePath, 'utf-8');
-    const warnings = warningsContent
-      .split('\n')
-      .filter((line) => line.trim() !== '');
+    const warningsContent = await fs.readFile(warningsFilePath, "utf-8");
+    const warnings = warningsContent.split("\n").filter((line) => line.trim() !== "");
     try {
       await fs.unlink(warningsFilePath);
     } catch {
-      warnings.push('Warning: Could not delete temporary warnings file.');
+      warnings.push("Warning: Could not delete temporary warnings file.");
     }
     return warnings;
   } catch (err: unknown) {
@@ -31,7 +29,7 @@ export async function getStartupWarnings(): Promise<string[]> {
     // However, the original logic returned an error message for any fs.existsSync failure.
     // To maintain closer parity while making it async, we'll check the error code.
     // ENOENT is "Error NO ENTry" (file not found).
-    if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
+    if (err instanceof Error && "code" in err && err.code === "ENOENT") {
       return []; // File not found, no warnings to return.
     }
     // For other errors (permissions, etc.), return the error message.
diff --git a/apps/airiscode-cli/src/utils/stdioHelpers.ts b/apps/airiscode-cli/src/utils/stdioHelpers.ts
index ad15e3eb0..52bf16825 100644
--- a/apps/airiscode-cli/src/utils/stdioHelpers.ts
+++ b/apps/airiscode-cli/src/utils/stdioHelpers.ts
@@ -20,7 +20,7 @@
  * Avoids double newlines if the message already ends with one.
  */
 export const writeStdoutLine = (message: string): void => {
-  process.stdout.write(message.endsWith('\n') ? message : `${message}\n`);
+  process.stdout.write(message.endsWith("\n") ? message : `${message}\n`);
 };
 
 /**
@@ -29,7 +29,7 @@ export const writeStdoutLine = (message: string): void => {
  * Avoids double newlines if the message already ends with one.
  */
 export const writeStderrLine = (message: string): void => {
-  process.stderr.write(message.endsWith('\n') ? message : `${message}\n`);
+  process.stderr.write(message.endsWith("\n") ? message : `${message}\n`);
 };
 
 /**
diff --git a/apps/airiscode-cli/src/utils/systemInfo.ts b/apps/airiscode-cli/src/utils/systemInfo.ts
index 4b9f4a2fe..9ae88ad1b 100644
--- a/apps/airiscode-cli/src/utils/systemInfo.ts
+++ b/apps/airiscode-cli/src/utils/systemInfo.ts
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import process from 'node:process';
-import os from 'node:os';
-import { execSync } from 'node:child_process';
-import type { CommandContext } from '../ui/commands/types.js';
-import { getCliVersion } from './version.js';
-import { IdeClient, AuthType } from '@airiscode/core';
-import { formatMemoryUsage } from '../ui/utils/formatters.js';
-const GIT_COMMIT_INFO = 'dev';
+import { execSync } from "node:child_process";
+import os from "node:os";
+import process from "node:process";
+import { AuthType, IdeClient } from "@airiscode/core";
+import type { CommandContext } from "../ui/commands/types.js";
+import { formatMemoryUsage } from "../ui/utils/formatters.js";
+import { getCliVersion } from "./version.js";
+
+const GIT_COMMIT_INFO = "dev";
 
 /**
  * System information interface containing all system-related details
@@ -50,9 +51,9 @@ export interface ExtendedSystemInfo extends SystemInfo {
  */
 export async function getNpmVersion(): Promise<string> {
   try {
-    return execSync('npm --version', { encoding: 'utf-8' }).trim();
+    return execSync("npm --version", { encoding: "utf-8" }).trim();
   } catch {
-    return 'unknown';
+    return "unknown";
   }
 }
 
@@ -60,17 +61,15 @@ export async function getNpmVersion(): Promise<string> {
  * Gets the IDE client name if IDE mode is enabled.
  * Returns empty string if IDE mode is disabled or IDE client is not detected.
  */
-export async function getIdeClientName(
-  context: CommandContext,
-): Promise<string> {
+export async function getIdeClientName(context: CommandContext): Promise<string> {
   if (!context.services.config?.getIdeMode()) {
-    return '';
+    return "";
   }
   try {
     const ideClient = await IdeClient.getInstance();
-    return ideClient?.getDetectedIdeDisplayName() ?? '';
+    return ideClient?.getDetectedIdeDisplayName() ?? "";
   } catch {
-    return '';
+    return "";
   }
 }
 
@@ -82,19 +81,19 @@ export async function getIdeClientName(
  * @param stripPrefix - Whether to strip 'qwen-' prefix (used for bug reports)
  */
 export function getSandboxEnv(stripPrefix = false): string {
-  const sandbox = process.env['SANDBOX'];
+  const sandbox = process.env["SANDBOX"];
 
-  if (!sandbox || sandbox === 'sandbox-exec') {
-    if (sandbox === 'sandbox-exec') {
-      const profile = process.env['SEATBELT_PROFILE'] || 'unknown';
+  if (!sandbox || sandbox === "sandbox-exec") {
+    if (sandbox === "sandbox-exec") {
+      const profile = process.env["SEATBELT_PROFILE"] || "unknown";
       return `sandbox-exec (${profile})`;
     }
-    return 'no sandbox';
+    return "no sandbox";
   }
 
   // For bug reports, remove qwen- prefix
   if (stripPrefix) {
-    return sandbox.replace(/^qwen-(?:code-)?/, '');
+    return sandbox.replace(/^qwen-(?:code-)?/, "");
   }
 
   return sandbox;
@@ -108,20 +107,18 @@ export function getSandboxEnv(stripPrefix = false): string {
  * @param context - Command context containing config and settings
  * @returns Promise resolving to SystemInfo object with all collected information
  */
-export async function getSystemInfo(
-  context: CommandContext,
-): Promise<SystemInfo> {
+export async function getSystemInfo(context: CommandContext): Promise<SystemInfo> {
   const osPlatform = process.platform;
   const osArch = process.arch;
   const osRelease = os.release();
   const nodeVersion = process.version;
   const npmVersion = await getNpmVersion();
   const sandboxEnv = getSandboxEnv();
-  const modelVersion = context.services.config?.getModel() || 'Unknown';
+  const modelVersion = context.services.config?.getModel() || "Unknown";
   const cliVersion = await getCliVersion();
-  const selectedAuthType = context.services.config?.getAuthType() || '';
+  const selectedAuthType = context.services.config?.getAuthType() || "";
   const ideClient = await getIdeClientName(context);
-  const sessionId = context.services.config?.getSessionId() || 'unknown';
+  const sessionId = context.services.config?.getSessionId() || "unknown";
   const proxy = context.services.config?.getProxy();
 
   return {
@@ -147,9 +144,7 @@ export async function getSystemInfo(
  * @param context - Command context containing config and settings
  * @returns Promise resolving to ExtendedSystemInfo object
  */
-export async function getExtendedSystemInfo(
-  context: CommandContext,
-): Promise<ExtendedSystemInfo> {
+export async function getExtendedSystemInfo(context: CommandContext): Promise<ExtendedSystemInfo> {
   const baseInfo = await getSystemInfo(context);
   const memoryUsage = formatMemoryUsage(process.memoryUsage().rss);
 
@@ -167,9 +162,7 @@ export async function getExtendedSystemInfo(
 
   // Get git commit info
   const gitCommit =
-    GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
-      ? GIT_COMMIT_INFO
-      : undefined;
+    GIT_COMMIT_INFO && !["N/A"].includes(GIT_COMMIT_INFO) ? GIT_COMMIT_INFO : undefined;
 
   // Get fast model from settings
   const fastModel = context.services.settings?.merged?.fastModel || undefined;
diff --git a/apps/airiscode-cli/src/utils/systemInfoFields.ts b/apps/airiscode-cli/src/utils/systemInfoFields.ts
index 413e00964..63f50d5f4 100644
--- a/apps/airiscode-cli/src/utils/systemInfoFields.ts
+++ b/apps/airiscode-cli/src/utils/systemInfoFields.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExtendedSystemInfo } from './systemInfo.js';
-import { t } from '../i18n/index.js';
-import { isCodingPlanConfig } from '../constants/codingPlan.js';
+import { isCodingPlanConfig } from "../constants/codingPlan.js";
+import { t } from "../i18n/index.js";
+import type { ExtendedSystemInfo } from "./systemInfo.js";
 
 /**
  * Field configuration for system information display
@@ -21,32 +21,26 @@ export interface SystemInfoDisplayField {
   value: string;
 }
 
-export function getSystemInfoFields(
-  info: ExtendedSystemInfo,
-): SystemInfoDisplayField[] {
+export function getSystemInfoFields(info: ExtendedSystemInfo): SystemInfoDisplayField[] {
   const fields: SystemInfoDisplayField[] = [];
 
-  addField(fields, t('AIRIS Code'), formatCliVersion(info));
-  addField(fields, t('Runtime'), formatRuntime(info));
-  addField(fields, t('IDE Client'), info.ideClient);
-  addField(fields, t('OS'), formatOs(info));
-  addField(fields, t('Auth'), formatAuth(info));
-  addField(fields, t('Base URL'), formatBaseUrl(info));
-  addField(fields, t('Model'), info.modelVersion);
-  addField(fields, t('Fast Model'), info.fastModel || info.modelVersion);
-  addField(fields, t('Session ID'), info.sessionId);
-  addField(fields, t('Sandbox'), info.sandboxEnv);
-  addField(fields, t('Proxy'), formatProxy(info.proxy));
-  addField(fields, t('Memory Usage'), info.memoryUsage);
+  addField(fields, t("AIRIS Code"), formatCliVersion(info));
+  addField(fields, t("Runtime"), formatRuntime(info));
+  addField(fields, t("IDE Client"), info.ideClient);
+  addField(fields, t("OS"), formatOs(info));
+  addField(fields, t("Auth"), formatAuth(info));
+  addField(fields, t("Base URL"), formatBaseUrl(info));
+  addField(fields, t("Model"), info.modelVersion);
+  addField(fields, t("Fast Model"), info.fastModel || info.modelVersion);
+  addField(fields, t("Session ID"), info.sessionId);
+  addField(fields, t("Sandbox"), info.sandboxEnv);
+  addField(fields, t("Proxy"), formatProxy(info.proxy));
+  addField(fields, t("Memory Usage"), info.memoryUsage);
 
   return fields;
 }
 
-function addField(
-  fields: SystemInfoDisplayField[],
-  label: string,
-  value: string,
-): void {
+function addField(fields: SystemInfoDisplayField[], label: string, value: string): void {
   if (value) {
     fields.push({ label, value });
   }
@@ -54,7 +48,7 @@ function addField(
 
 function formatCliVersion(info: ExtendedSystemInfo): string {
   if (!info.cliVersion) {
-    return '';
+    return "";
   }
   if (!info.gitCommit) {
     return info.cliVersion;
@@ -64,34 +58,31 @@ function formatCliVersion(info: ExtendedSystemInfo): string {
 
 function formatRuntime(info: ExtendedSystemInfo): string {
   if (!info.nodeVersion && !info.npmVersion) {
-    return '';
+    return "";
   }
-  const node = info.nodeVersion ? `Node.js ${info.nodeVersion}` : '';
-  const npm = info.npmVersion ? `npm ${info.npmVersion}` : '';
-  return joinParts([node, npm], ' / ');
+  const node = info.nodeVersion ? `Node.js ${info.nodeVersion}` : "";
+  const npm = info.npmVersion ? `npm ${info.npmVersion}` : "";
+  return joinParts([node, npm], " / ");
 }
 
 function formatOs(info: ExtendedSystemInfo): string {
-  return joinParts(
-    [info.osPlatform, info.osArch, formatOsRelease(info.osRelease)],
-    ' ',
-  ).trim();
+  return joinParts([info.osPlatform, info.osArch, formatOsRelease(info.osRelease)], " ").trim();
 }
 
 function formatOsRelease(release: string): string {
   if (!release) {
-    return '';
+    return "";
   }
   return `(${release})`;
 }
 
 function formatAuth(info: ExtendedSystemInfo): string {
   if (!info.selectedAuthType) {
-    return '';
+    return "";
   }
 
   if (isCodingPlanConfig(info.baseUrl, info.apiKeyEnvKey)) {
-    return t('Alibaba Cloud Coding Plan');
+    return t("Alibaba Cloud Coding Plan");
   }
 
   return `API Key - ${info.selectedAuthType}`;
@@ -99,7 +90,7 @@ function formatAuth(info: ExtendedSystemInfo): string {
 
 function formatBaseUrl(info: ExtendedSystemInfo): string {
   if (!info.selectedAuthType || !info.baseUrl) {
-    return '';
+    return "";
   }
 
   return info.baseUrl;
@@ -107,7 +98,7 @@ function formatBaseUrl(info: ExtendedSystemInfo): string {
 
 function formatProxy(proxy?: string): string {
   if (!proxy) {
-    return 'no proxy';
+    return "no proxy";
   }
   return redactProxy(proxy);
 }
@@ -116,12 +107,12 @@ function redactProxy(proxy: string): string {
   try {
     const url = new URL(proxy);
     if (url.username || url.password) {
-      url.username = url.username ? '***' : '';
-      url.password = url.password ? '***' : '';
+      url.username = url.username ? "***" : "";
+      url.password = url.password ? "***" : "";
     }
     return url.toString();
   } catch {
-    return proxy.replace(/\/\/[^/]*@/, '//***@');
+    return proxy.replace(/\/\/[^/]*@/, "//***@");
   }
 }
 
diff --git a/apps/airiscode-cli/src/utils/updateEventEmitter.ts b/apps/airiscode-cli/src/utils/updateEventEmitter.ts
index 1c6927725..dcc432cd1 100644
--- a/apps/airiscode-cli/src/utils/updateEventEmitter.ts
+++ b/apps/airiscode-cli/src/utils/updateEventEmitter.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
+import { EventEmitter } from "node:events";
 
 /**
  * A shared event emitter for application-wide communication
diff --git a/apps/airiscode-cli/src/utils/userStartupWarnings.ts b/apps/airiscode-cli/src/utils/userStartupWarnings.ts
index ea37efbf3..169b09dbf 100644
--- a/apps/airiscode-cli/src/utils/userStartupWarnings.ts
+++ b/apps/airiscode-cli/src/utils/userStartupWarnings.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import * as os from 'node:os';
-import path from 'node:path';
-import { canUseRipgrep } from '@airiscode/core';
+import fs from "node:fs/promises";
+import * as os from "node:os";
+import path from "node:path";
+import { canUseRipgrep } from "@airiscode/core";
 
 type WarningCheckOptions = {
   workspaceRoot: string;
@@ -22,7 +22,7 @@ type WarningCheck = {
 
 // Individual warning checks
 const homeDirectoryCheck: WarningCheck = {
-  id: 'home-directory',
+  id: "home-directory",
   check: async (options: WarningCheckOptions) => {
     try {
       const [workspaceRealPath, homeRealPath] = await Promise.all([
@@ -31,22 +31,22 @@ const homeDirectoryCheck: WarningCheck = {
       ]);
 
       if (workspaceRealPath === homeRealPath) {
-        return 'You are running AIRIS Code in your home directory. It is recommended to run in a project-specific directory.';
+        return "You are running AIRIS Code in your home directory. It is recommended to run in a project-specific directory.";
       }
       return null;
     } catch (_err: unknown) {
-      return 'Could not verify the current directory due to a file system error.';
+      return "Could not verify the current directory due to a file system error.";
     }
   },
 };
 
 const rootDirectoryCheck: WarningCheck = {
-  id: 'root-directory',
+  id: "root-directory",
   check: async (options: WarningCheckOptions) => {
     try {
       const workspaceRealPath = await fs.realpath(options.workspaceRoot);
       const errorMessage =
-        'Warning: You are running AIRIS Code in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.';
+        "Warning: You are running AIRIS Code in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.";
 
       // Check for Unix root directory
       if (path.dirname(workspaceRealPath) === workspaceRealPath) {
@@ -55,13 +55,13 @@ const rootDirectoryCheck: WarningCheck = {
 
       return null;
     } catch (_err: unknown) {
-      return 'Could not verify the current directory due to a file system error.';
+      return "Could not verify the current directory due to a file system error.";
     }
   },
 };
 
 const ripgrepAvailabilityCheck: WarningCheck = {
-  id: 'ripgrep-availability',
+  id: "ripgrep-availability",
   check: async (options: WarningCheckOptions) => {
     if (!options.useRipgrep) {
       return null;
@@ -70,11 +70,11 @@ const ripgrepAvailabilityCheck: WarningCheck = {
     try {
       const isAvailable = await canUseRipgrep(options.useBuiltinRipgrep);
       if (!isAvailable) {
-        return 'Ripgrep not available: Please install ripgrep globally to enable faster file content search. Falling back to built-in grep.';
+        return "Ripgrep not available: Please install ripgrep globally to enable faster file content search. Falling back to built-in grep.";
       }
       return null;
     } catch (error) {
-      return `Ripgrep not available: ${error instanceof Error ? error.message : 'Unknown error'}. Falling back to built-in grep.`;
+      return `Ripgrep not available: ${error instanceof Error ? error.message : "Unknown error"}. Falling back to built-in grep.`;
     }
   },
 };
@@ -86,11 +86,7 @@ const WARNING_CHECKS: readonly WarningCheck[] = [
   ripgrepAvailabilityCheck,
 ];
 
-export async function getUserStartupWarnings(
-  options: WarningCheckOptions,
-): Promise<string[]> {
-  const results = await Promise.all(
-    WARNING_CHECKS.map((check) => check.check(options)),
-  );
+export async function getUserStartupWarnings(options: WarningCheckOptions): Promise<string[]> {
+  const results = await Promise.all(WARNING_CHECKS.map((check) => check.check(options)));
   return results.filter((msg) => msg !== null);
 }
diff --git a/apps/airiscode-cli/src/utils/version.ts b/apps/airiscode-cli/src/utils/version.ts
index 0318f380b..be4c51947 100644
--- a/apps/airiscode-cli/src/utils/version.ts
+++ b/apps/airiscode-cli/src/utils/version.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getPackageJson } from './package.js';
+import { getPackageJson } from "./package.js";
 
 export async function getCliVersion(): Promise<string> {
   const pkgJson = await getPackageJson();
-  return process.env['CLI_VERSION'] || pkgJson?.version || 'unknown';
+  return process.env["CLI_VERSION"] || pkgJson?.version || "unknown";
 }
diff --git a/apps/airiscode-cli/src/utils/windowTitle.ts b/apps/airiscode-cli/src/utils/windowTitle.ts
index 306400673..dd91c5cab 100644
--- a/apps/airiscode-cli/src/utils/windowTitle.ts
+++ b/apps/airiscode-cli/src/utils/windowTitle.ts
@@ -11,12 +11,12 @@
  * @returns The computed window title, either from CLI_TITLE environment variable or the default Gemini title
  */
 export function computeWindowTitle(folderName: string): string {
-  const title = process.env['CLI_TITLE'] || `Qwen - ${folderName}`;
+  const title = process.env["CLI_TITLE"] || `Qwen - ${folderName}`;
 
   // Remove control characters that could cause issues in terminal titles
   return title.replace(
     // eslint-disable-next-line no-control-regex
     /[\x00-\x1F\x7F]/g,
-    '',
+    "",
   );
 }
diff --git a/apps/airiscode-cli/src/utils/writeWithBackup.ts b/apps/airiscode-cli/src/utils/writeWithBackup.ts
index 2c341ae38..33fd20776 100644
--- a/apps/airiscode-cli/src/utils/writeWithBackup.ts
+++ b/apps/airiscode-cli/src/utils/writeWithBackup.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
+import * as fs from "node:fs";
 
 /**
  * Options for writeWithBackup function.
@@ -63,7 +63,7 @@ export function writeWithBackupSync(
   content: string,
   options: WriteWithBackupOptions = {},
 ): void {
-  const { backupSuffix = '.orig', encoding = 'utf-8' } = options;
+  const { backupSuffix = ".orig", encoding = "utf-8" } = options;
   const tempPath = `${targetPath}.tmp`;
   const backupPath = `${targetPath}${backupSuffix}`;
 
@@ -91,9 +91,7 @@ export function writeWithBackupSync(
         } catch (_e) {
           // Ignore cleanup error
         }
-        throw new Error(
-          `Cannot write to '${targetPath}' because it is a directory`,
-        );
+        throw new Error(`Cannot write to '${targetPath}' because it is a directory`);
       }
 
       try {
@@ -125,16 +123,12 @@ export function writeWithBackupSync(
           fs.renameSync(backupPath, targetPath);
         } catch (restoreError) {
           restoreFailedMessage =
-            restoreError instanceof Error
-              ? restoreError.message
-              : String(restoreError);
+            restoreError instanceof Error ? restoreError.message : String(restoreError);
         }
       }
 
       const writeFailureMessage =
-        renameError instanceof Error
-          ? renameError.message
-          : String(renameError);
+        renameError instanceof Error ? renameError.message : String(renameError);
 
       if (restoreFailedMessage) {
         throw new Error(
diff --git a/apps/airiscode-cli/src/validateNonInterActiveAuth.ts b/apps/airiscode-cli/src/validateNonInterActiveAuth.ts
index 44a3f5f63..19620253c 100644
--- a/apps/airiscode-cli/src/validateNonInterActiveAuth.ts
+++ b/apps/airiscode-cli/src/validateNonInterActiveAuth.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/core';
-import { OutputFormat } from '@airiscode/core';
-import { validateAuthMethod } from './config/auth.js';
-import { type LoadedSettings } from './config/settings.js';
-import { JsonOutputAdapter } from './nonInteractive/io/JsonOutputAdapter.js';
-import { StreamJsonOutputAdapter } from './nonInteractive/io/StreamJsonOutputAdapter.js';
-import { runExitCleanup } from './utils/cleanup.js';
-import { writeStderrLine } from './utils/stdioHelpers.js';
+import type { Config } from "@airiscode/core";
+import { OutputFormat } from "@airiscode/core";
+import { validateAuthMethod } from "./config/auth.js";
+import { type LoadedSettings } from "./config/settings.js";
+import { JsonOutputAdapter } from "./nonInteractive/io/JsonOutputAdapter.js";
+import { StreamJsonOutputAdapter } from "./nonInteractive/io/StreamJsonOutputAdapter.js";
+import { runExitCleanup } from "./utils/cleanup.js";
+import { writeStderrLine } from "./utils/stdioHelpers.js";
 
 export async function validateNonInteractiveAuth(
   useExternalAuth: boolean | undefined,
@@ -20,12 +20,10 @@ export async function validateNonInteractiveAuth(
 ): Promise<Config> {
   try {
     // Get the actual authType from config which has already resolved CLI args, env vars, and settings
-    const authType = nonInteractiveConfig
-      .getModelsConfig()
-      .getCurrentAuthType();
+    const authType = nonInteractiveConfig.getModelsConfig().getCurrentAuthType();
     if (!authType) {
       throw new Error(
-        'No auth type is selected. Please configure an auth type (e.g. via settings or `--auth-type`) before running in non-interactive mode.',
+        "No auth type is selected. Please configure an auth type (e.g. via settings or `--auth-type`) before running in non-interactive mode.",
       );
     }
     const resolvedAuthType: NonNullable<typeof authType> = authType;
@@ -49,10 +47,7 @@ export async function validateNonInteractiveAuth(
     const outputFormat = nonInteractiveConfig.getOutputFormat();
 
     // In JSON and STREAM_JSON modes, emit error result and exit
-    if (
-      outputFormat === OutputFormat.JSON ||
-      outputFormat === OutputFormat.STREAM_JSON
-    ) {
+    if (outputFormat === OutputFormat.JSON || outputFormat === OutputFormat.STREAM_JSON) {
       let adapter;
       if (outputFormat === OutputFormat.JSON) {
         adapter = new JsonOutputAdapter(nonInteractiveConfig);
@@ -62,8 +57,7 @@ export async function validateNonInteractiveAuth(
           nonInteractiveConfig.getIncludePartialMessages(),
         );
       }
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       adapter.emitResult({
         isError: true,
         errorMessage,
diff --git a/apps/airiscode-cli/test-setup.ts b/apps/airiscode-cli/test-setup.ts
index c26e57fa5..0f2346eb8 100644
--- a/apps/airiscode-cli/test-setup.ts
+++ b/apps/airiscode-cli/test-setup.ts
@@ -5,14 +5,14 @@
  */
 
 // Unset NO_COLOR environment variable to ensure consistent theme behavior between local and CI test runs
-if (process.env['NO_COLOR'] !== undefined) {
-  delete process.env['NO_COLOR'];
+if (process.env["NO_COLOR"] !== undefined) {
+  delete process.env["NO_COLOR"];
 }
 
 // Avoid writing per-session debug log files during CLI tests.
 // Individual tests can still opt in by overriding this env var explicitly.
-if (process.env['QWEN_DEBUG_LOG_FILE'] === undefined) {
-  process.env['QWEN_DEBUG_LOG_FILE'] = '0';
+if (process.env["QWEN_DEBUG_LOG_FILE"] === undefined) {
+  process.env["QWEN_DEBUG_LOG_FILE"] = "0";
 }
 
-import './src/test-utils/customMatchers.js';
+import "./src/test-utils/customMatchers.js";
diff --git a/apps/airiscode-cli/vitest.config.ts b/apps/airiscode-cli/vitest.config.ts
index 4c022d4be..8ff5ce8c2 100644
--- a/apps/airiscode-cli/vitest.config.ts
+++ b/apps/airiscode-cli/vitest.config.ts
@@ -4,39 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import path from "node:path";
 /// <reference types="vitest" />
-import { defineConfig } from 'vitest/config';
-import path from 'node:path';
+import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   resolve: {
     alias: {
-      '@qwen-code/qwen-code-core': path.resolve(__dirname, '../core/index.ts'),
+      "@qwen-code/qwen-code-core": path.resolve(__dirname, "../core/index.ts"),
     },
   },
   test: {
-    include: ['**/*.{test,spec}.?(c|m)[jt]s?(x)', 'config.test.ts'],
-    exclude: ['**/node_modules/**', '**/dist/**', '**/cypress/**'],
-    environment: 'jsdom',
+    include: ["**/*.{test,spec}.?(c|m)[jt]s?(x)", "config.test.ts"],
+    exclude: ["**/node_modules/**", "**/dist/**", "**/cypress/**"],
+    environment: "jsdom",
     globals: true,
-    reporters: ['default', 'junit'],
+    reporters: ["default", "junit"],
     silent: true,
     outputFile: {
-      junit: 'junit.xml',
+      junit: "junit.xml",
     },
-    setupFiles: ['./test-setup.ts'],
+    setupFiles: ["./test-setup.ts"],
     coverage: {
       enabled: true,
-      provider: 'v8',
-      reportsDirectory: './coverage',
-      include: ['src/**/*'],
+      provider: "v8",
+      reportsDirectory: "./coverage",
+      include: ["src/**/*"],
       reporter: [
-        ['text', { file: 'full-text-summary.txt' }],
-        'html',
-        'json',
-        'lcov',
-        'cobertura',
-        ['json-summary', { outputFile: 'coverage-summary.json' }],
+        ["text", { file: "full-text-summary.txt" }],
+        "html",
+        "json",
+        "lcov",
+        "cobertura",
+        ["json-summary", { outputFile: "coverage-summary.json" }],
       ],
     },
     poolOptions: {
diff --git a/biome.json b/biome.json
new file mode 100644
index 000000000..a1046751b
--- /dev/null
+++ b/biome.json
@@ -0,0 +1,115 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.4.16/schema.json",
+  "vcs": {
+    "enabled": true,
+    "clientKind": "git",
+    "useIgnoreFile": true
+  },
+  "files": {
+    "includes": [
+      "**/*.{js,jsx,ts,tsx,mjs,cjs}",
+      "!**/dist/**",
+      "!**/node_modules/**",
+      "!**/build/**",
+      "!**/coverage/**",
+      "!**/.next/**"
+    ]
+  },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "lineWidth": 100
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": false,
+      "complexity": {
+        "noAdjacentSpacesInRegex": "error",
+        "noExtraBooleanCast": "error",
+        "noUselessCatch": "error",
+        "noUselessEscapeInRegex": "error",
+        "noUselessTypeConstraint": "error"
+      },
+      "correctness": {
+        "noConstAssign": "error",
+        "noConstantCondition": "error",
+        "noEmptyCharacterClassInRegex": "error",
+        "noEmptyPattern": "error",
+        "noGlobalObjectCalls": "error",
+        "noInvalidBuiltinInstantiation": "error",
+        "noInvalidConstructorSuper": "error",
+        "noNonoctalDecimalEscape": "error",
+        "noPrecisionLoss": "error",
+        "noSelfAssign": "error",
+        "noSetterReturn": "error",
+        "noSwitchDeclarations": "error",
+        "noUndeclaredVariables": "off",
+        "noUnreachable": "error",
+        "noUnreachableSuper": "error",
+        "noUnsafeFinally": "error",
+        "noUnsafeOptionalChaining": "error",
+        "noUnusedLabels": "error",
+        "noUnusedPrivateClassMembers": "warn",
+        "noUnusedVariables": "error",
+        "useIsNan": "error",
+        "useValidForDirection": "error",
+        "useValidTypeof": "error",
+        "useYield": "error"
+      },
+      "style": {
+        "noCommonJs": "error",
+        "noNamespace": "error",
+        "noNonNullAssertion": "warn",
+        "useArrayLiterals": "error",
+        "useAsConstAssertion": "error",
+        "useConst": "error",
+        "useTemplate": "warn"
+      },
+      "suspicious": {
+        "noAsyncPromiseExecutor": "error",
+        "noCatchAssign": "error",
+        "noClassAssign": "error",
+        "noCompareNegZero": "error",
+        "noConsole": {
+          "level": "warn",
+          "options": {
+            "allow": ["warn", "error", "info"]
+          }
+        },
+        "noConstantBinaryExpressions": "error",
+        "noControlCharactersInRegex": "off",
+        "noDebugger": "error",
+        "noDuplicateCase": "error",
+        "noDuplicateClassMembers": "error",
+        "noDuplicateElseIf": "error",
+        "noDuplicateObjectKeys": "error",
+        "noDuplicateParameters": "error",
+        "noEmptyBlockStatements": "warn",
+        "noExplicitAny": "warn",
+        "noExtraNonNullAssertion": "error",
+        "noFallthroughSwitchClause": "error",
+        "noFunctionAssign": "error",
+        "noGlobalAssign": "error",
+        "noImportAssign": "error",
+        "noIrregularWhitespace": "error",
+        "noMisleadingCharacterClass": "error",
+        "noMisleadingInstantiator": "error",
+        "noNonNullAssertedOptionalChain": "error",
+        "noPrototypeBuiltins": "error",
+        "noRedeclare": "error",
+        "noShadowRestrictedNames": "error",
+        "noSparseArray": "error",
+        "noTsIgnore": "error",
+        "noUnsafeDeclarationMerging": "error",
+        "noUnsafeNegation": "error",
+        "noUselessRegexBackrefs": "error",
+        "noVar": "error",
+        "noWith": "error",
+        "useGetterReturn": "error",
+        "useNamespaceKeyword": "error"
+      }
+    }
+  }
+}
diff --git a/examples/mcp-session-example.ts b/examples/mcp-session-example.ts
index d8b9bcf97..6a1d0ad1d 100644
--- a/examples/mcp-session-example.ts
+++ b/examples/mcp-session-example.ts
@@ -1,4 +1,5 @@
 #!/usr/bin/env tsx
+
 /**
  * AIRIS MCP Session Example
  *
@@ -13,80 +14,90 @@
  *   pnpm tsx examples/mcp-session-example.ts
  */
 
-import { MCPSessionManager } from '@airiscode/mcp-session';
-import { isAlwaysOn, isLazy } from '@airiscode/mcp-registry';
+import { isAlwaysOn, isLazy } from "@airiscode/mcp-registry";
+import { MCPSessionManager } from "@airiscode/mcp-session";
 
 async function main() {
-  console.log('🚀 AIRIS MCP Session Example\n');
+  console.log("🚀 AIRIS MCP Session Example\n");
 
   // 1. Create session manager
-  console.log('1️⃣  Creating MCP session...');
+  console.log("1️⃣  Creating MCP session...");
   const session = new MCPSessionManager({
     sessionId: `example-${Date.now()}`,
-    baseURL: process.env.MCP_GATEWAY_URL || 'http://localhost:3000',
+    baseURL: process.env.MCP_GATEWAY_URL || "http://localhost:3000",
     apiKey: process.env.MCP_API_KEY,
-    timeout: 30000
+    timeout: 30000,
   });
 
   try {
     // 2. Initialize and load always-on tools
-    console.log('2️⃣  Initializing session and loading always-on tools...');
+    console.log("2️⃣  Initializing session and loading always-on tools...");
     await session.initialize();
 
     const state = session.getState();
     console.log(`   ✅ Connected! Session: ${state.sessionId}`);
     console.log(`   📦 Always-on tools: ${state.alwaysOnTools.length}`);
-    console.log(`   🔧 Tools available:`, state.alwaysOnTools.map(t => t.name).slice(0, 5).join(', '), '...\n');
+    console.log(
+      `   🔧 Tools available:`,
+      state.alwaysOnTools
+        .map((t) => t.name)
+        .slice(0, 5)
+        .join(", "),
+      "...\n",
+    );
 
     // 3. Show tool categorization
-    console.log('3️⃣  Tool categorization:');
-    console.log(`   Always-on: filesystem, context7, sequential-thinking, serena, mindbase, self-management`);
+    console.log("3️⃣  Tool categorization:");
+    console.log(
+      `   Always-on: filesystem, context7, sequential-thinking, serena, mindbase, self-management`,
+    );
     console.log(`   Lazy: playwright, puppeteer, tavily, supabase, github, ...`);
-    console.log(`   isAlwaysOn('filesystem'): ${isAlwaysOn('filesystem')}`);
-    console.log(`   isLazy('playwright'): ${isLazy('playwright')}\n`);
+    console.log(`   isAlwaysOn('filesystem'): ${isAlwaysOn("filesystem")}`);
+    console.log(`   isLazy('playwright'): ${isLazy("playwright")}\n`);
 
     // 4. Enable a lazy server on-demand
-    console.log('4️⃣  Enabling lazy server (playwright)...');
+    console.log("4️⃣  Enabling lazy server (playwright)...");
     try {
-      const playwrightTools = await session.enableLazyServer('playwright', {
-        PLAYWRIGHT_BROWSER: 'chromium'
+      const playwrightTools = await session.enableLazyServer("playwright", {
+        PLAYWRIGHT_BROWSER: "chromium",
       });
       console.log(`   ✅ Playwright enabled with ${playwrightTools.length} tools`);
     } catch (error) {
-      console.log(`   ⚠️  Could not enable playwright: ${error instanceof Error ? error.message : String(error)}`);
+      console.log(
+        `   ⚠️  Could not enable playwright: ${error instanceof Error ? error.message : String(error)}`,
+      );
       console.log(`   (This is expected if MCP Gateway is not running)\n`);
     }
 
     // 5. Show all available tools
-    console.log('5️⃣  All available tools:');
+    console.log("5️⃣  All available tools:");
     const allTools = session.getAllTools();
     console.log(`   Total tools: ${allTools.length}`);
     console.log(`   Always-on servers: ${state.alwaysOnTools.length}`);
     console.log(`   Lazy servers enabled: ${state.lazyTools.size}\n`);
 
     // 6. Example: Invoke a tool (if gateway is available)
-    console.log('6️⃣  Example tool invocation:');
+    console.log("6️⃣  Example tool invocation:");
     console.log(`   session.invokeTool('filesystem', 'read_file', { path: '/path/to/file' })`);
     console.log(`   (Skipped - requires live gateway)\n`);
 
     // 7. Cleanup
-    console.log('7️⃣  Cleaning up session...');
+    console.log("7️⃣  Cleaning up session...");
     await session.cleanup();
     console.log(`   ✅ Session cleaned up\n`);
 
-    console.log('✨ Example completed successfully!');
-    console.log('\nToken Optimization Benefits:');
-    console.log('- Only 6 always-on servers loaded initially (~30-50 tools)');
-    console.log('- Lazy servers loaded on-demand when LLM requests them');
-    console.log('- Saves tokens by not describing unused tools');
-    console.log('- Cleanup disables lazy servers to free gateway resources');
-
+    console.log("✨ Example completed successfully!");
+    console.log("\nToken Optimization Benefits:");
+    console.log("- Only 6 always-on servers loaded initially (~30-50 tools)");
+    console.log("- Lazy servers loaded on-demand when LLM requests them");
+    console.log("- Saves tokens by not describing unused tools");
+    console.log("- Cleanup disables lazy servers to free gateway resources");
   } catch (error) {
-    console.error('❌ Error:', error);
-    console.error('\nTroubleshooting:');
-    console.error('1. Is AIRIS MCP Gateway running at http://localhost:3000?');
-    console.error('2. Start gateway: cd /Users/kazuki/github/airis-mcp-gateway && pnpm dev');
-    console.error('3. Set MCP_API_KEY if your gateway requires authentication');
+    console.error("❌ Error:", error);
+    console.error("\nTroubleshooting:");
+    console.error("1. Is AIRIS MCP Gateway running at http://localhost:3000?");
+    console.error("2. Start gateway: cd /Users/kazuki/github/airis-mcp-gateway && pnpm dev");
+    console.error("3. Set MCP_API_KEY if your gateway requires authentication");
     process.exit(1);
   }
 }
diff --git a/package.json b/package.json
index 8913d4667..ad61a5d7d 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "dev": "turbo run dev"
   },
   "devDependencies": {
+    "@biomejs/biome": "^2.4.16",
     "typescript": "5.9.3",
     "vitest": "4.0.15",
     "turbo": "latest",
diff --git a/packages/adapters/__tests__/adapter.spec.ts b/packages/adapters/__tests__/adapter.spec.ts
index 21eac1925..55a456eb1 100644
--- a/packages/adapters/__tests__/adapter.spec.ts
+++ b/packages/adapters/__tests__/adapter.spec.ts
@@ -1,43 +1,43 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { MockAdapter } from '../src/mock-adapter.js';
-import { DEFAULT_POLICY, TrustLevel, ApprovalsLevel } from '@airiscode/policies';
-import { AdapterEventKind } from '../src/events.js';
+import { ApprovalsLevel, DEFAULT_POLICY, TrustLevel } from "@airiscode/policies";
+import { beforeEach, describe, expect, it } from "vitest";
+import { AdapterEventKind } from "../src/events.js";
+import { MockAdapter } from "../src/mock-adapter.js";
 
-describe('@airiscode/adapters - AdapterProcess', () => {
+describe("@airiscode/adapters - AdapterProcess", () => {
   let adapter: MockAdapter;
 
   beforeEach(() => {
     adapter = new MockAdapter({
-      adapterName: 'test-adapter',
+      adapterName: "test-adapter",
       env: {},
       policy: DEFAULT_POLICY,
-      sessionId: 'test-session',
-      workingDir: '/test/dir',
+      sessionId: "test-session",
+      workingDir: "/test/dir",
     });
   });
 
-  describe('getMetadata', () => {
-    it('should return adapter metadata', () => {
+  describe("getMetadata", () => {
+    it("should return adapter metadata", () => {
       const metadata = adapter.getMetadata();
 
-      expect(metadata.name).toBe('mock-adapter');
-      expect(metadata.version).toBe('1.0.0-mock');
-      expect(metadata.supportedActions).toContain('implement');
-      expect(metadata.supportedActions).toContain('refactor');
+      expect(metadata.name).toBe("mock-adapter");
+      expect(metadata.version).toBe("1.0.0-mock");
+      expect(metadata.supportedActions).toContain("implement");
+      expect(metadata.supportedActions).toContain("refactor");
     });
   });
 
-  describe('spawn', () => {
-    it('should spawn adapter successfully', async () => {
+  describe("spawn", () => {
+    it("should spawn adapter successfully", async () => {
       await adapter.spawn();
 
       const state = adapter.getState();
-      expect(state.status).toBe('ready');
+      expect(state.status).toBe("ready");
       expect(state.processId).toBeGreaterThan(0);
       expect(state.startedAt).toBeInstanceOf(Date);
     });
 
-    it('should emit spawned and ready events', async () => {
+    it("should emit spawned and ready events", async () => {
       const events: any[] = [];
       adapter.on((event) => events.push(event));
 
@@ -48,73 +48,73 @@ describe('@airiscode/adapters - AdapterProcess', () => {
       expect(events[1].kind).toBe(AdapterEventKind.READY);
     });
 
-    it('should handle spawn failure', async () => {
+    it("should handle spawn failure", async () => {
       const failAdapter = new MockAdapter(
         {
-          adapterName: 'fail-adapter',
+          adapterName: "fail-adapter",
           env: {},
           policy: DEFAULT_POLICY,
-          sessionId: 'test-session',
-          workingDir: '/test/dir',
+          sessionId: "test-session",
+          workingDir: "/test/dir",
         },
-        { failSpawn: true }
+        { failSpawn: true },
       );
 
-      await expect(failAdapter.spawn()).rejects.toThrow('Mock spawn failure');
+      await expect(failAdapter.spawn()).rejects.toThrow("Mock spawn failure");
 
       const state = failAdapter.getState();
-      expect(state.status).toBe('error');
+      expect(state.status).toBe("error");
     });
   });
 
-  describe('execute', () => {
+  describe("execute", () => {
     beforeEach(async () => {
       await adapter.spawn();
     });
 
-    it('should execute action successfully', async () => {
-      adapter.setResponse('implement', {
+    it("should execute action successfully", async () => {
+      adapter.setResponse("implement", {
         outputJson: JSON.stringify({ implemented: true }),
-        proposedShell: ['git diff'],
+        proposedShell: ["git diff"],
       });
 
       const response = await adapter.execute({
-        action: 'implement',
-        inputJson: JSON.stringify({ feature: 'test' }),
+        action: "implement",
+        inputJson: JSON.stringify({ feature: "test" }),
       });
 
       expect(response.outputJson).toBe(JSON.stringify({ implemented: true }));
-      expect(response.proposedShell).toEqual(['git diff']);
+      expect(response.proposedShell).toEqual(["git diff"]);
     });
 
-    it('should filter dangerous shell commands', async () => {
-      adapter.setResponse('dangerous', {
-        outputJson: JSON.stringify({ result: 'done' }),
-        proposedShell: ['rm -rf /', 'git status', 'ls -la'],
+    it("should filter dangerous shell commands", async () => {
+      adapter.setResponse("dangerous", {
+        outputJson: JSON.stringify({ result: "done" }),
+        proposedShell: ["rm -rf /", "git status", "ls -la"],
       });
 
       const response = await adapter.execute({
-        action: 'dangerous',
+        action: "dangerous",
         inputJson: JSON.stringify({ test: true }),
       });
 
       // rm -rf / should be filtered out
-      expect(response.proposedShell).not.toContain('rm -rf /');
-      expect(response.proposedShell).toContain('git status');
-      expect(response.proposedShell).toContain('ls -la');
+      expect(response.proposedShell).not.toContain("rm -rf /");
+      expect(response.proposedShell).toContain("git status");
+      expect(response.proposedShell).toContain("ls -la");
     });
 
-    it('should emit execute events', async () => {
+    it("should emit execute events", async () => {
       const events: any[] = [];
       adapter.on((event) => events.push(event));
 
       await adapter.execute({
-        action: 'test',
+        action: "test",
         inputJson: JSON.stringify({ test: true }),
       });
 
       const executeEvents = events.filter(
-        (e) => e.kind === AdapterEventKind.EXECUTE_START || e.kind === AdapterEventKind.EXECUTE_END
+        (e) => e.kind === AdapterEventKind.EXECUTE_START || e.kind === AdapterEventKind.EXECUTE_END,
       );
 
       expect(executeEvents).toHaveLength(2);
@@ -123,127 +123,127 @@ describe('@airiscode/adapters - AdapterProcess', () => {
       expect(executeEvents[1].success).toBe(true);
     });
 
-    it('should validate execute request', async () => {
+    it("should validate execute request", async () => {
       await expect(
         adapter.execute({
-          action: '',
+          action: "",
           inputJson: JSON.stringify({ test: true }),
-        })
-      ).rejects.toThrow('Action is required');
+        }),
+      ).rejects.toThrow("Action is required");
 
       await expect(
         adapter.execute({
-          action: 'test',
-          inputJson: '',
-        })
-      ).rejects.toThrow('Input JSON is required');
+          action: "test",
+          inputJson: "",
+        }),
+      ).rejects.toThrow("Input JSON is required");
 
       await expect(
         adapter.execute({
-          action: 'test',
-          inputJson: 'invalid json',
-        })
-      ).rejects.toThrow('Invalid input JSON');
+          action: "test",
+          inputJson: "invalid json",
+        }),
+      ).rejects.toThrow("Invalid input JSON");
     });
   });
 
-  describe('requestShell', () => {
+  describe("requestShell", () => {
     beforeEach(async () => {
       await adapter.spawn();
     });
 
-    it('should execute safe commands', async () => {
-      const result = await adapter.requestShell('git status');
+    it("should execute safe commands", async () => {
+      const result = await adapter.requestShell("git status");
 
       expect(result.allowed).toBe(true);
       expect(result.exitCode).toBe(0);
-      expect(result.stdout).toContain('git status');
+      expect(result.stdout).toContain("git status");
     });
 
-    it('should block dangerous commands', async () => {
-      const result = await adapter.requestShell('rm -rf /');
+    it("should block dangerous commands", async () => {
+      const result = await adapter.requestShell("rm -rf /");
 
       expect(result.allowed).toBe(false);
       expect(result.reason).toBeDefined();
     });
 
-    it('should emit shell blocked event for dangerous commands', async () => {
+    it("should emit shell blocked event for dangerous commands", async () => {
       const events: any[] = [];
       adapter.on((event) => events.push(event));
 
-      await adapter.requestShell('rm -rf /');
+      await adapter.requestShell("rm -rf /");
 
       const blockedEvents = events.filter((e) => e.kind === AdapterEventKind.SHELL_BLOCKED);
       expect(blockedEvents).toHaveLength(1);
-      expect(blockedEvents[0].command).toBe('rm -rf /');
+      expect(blockedEvents[0].command).toBe("rm -rf /");
     });
 
-    it('should emit shell executed event for safe commands', async () => {
+    it("should emit shell executed event for safe commands", async () => {
       const events: any[] = [];
       adapter.on((event) => events.push(event));
 
-      await adapter.requestShell('ls -la');
+      await adapter.requestShell("ls -la");
 
       const executedEvents = events.filter((e) => e.kind === AdapterEventKind.SHELL_EXECUTED);
       expect(executedEvents).toHaveLength(1);
-      expect(executedEvents[0].command).toBe('ls -la');
+      expect(executedEvents[0].command).toBe("ls -la");
     });
   });
 
-  describe('policy enforcement', () => {
-    it('should respect RESTRICTED trust level', async () => {
+  describe("policy enforcement", () => {
+    it("should respect RESTRICTED trust level", async () => {
       const restrictedAdapter = new MockAdapter({
-        adapterName: 'restricted-adapter',
+        adapterName: "restricted-adapter",
         env: {},
         policy: {
           approvals: ApprovalsLevel.NEVER,
           trust: TrustLevel.RESTRICTED,
           guardStrict: true,
         },
-        sessionId: 'test-session',
-        workingDir: '/test/dir',
+        sessionId: "test-session",
+        workingDir: "/test/dir",
       });
 
       await restrictedAdapter.spawn();
 
       // All commands should be blocked in RESTRICTED mode
-      const result = await restrictedAdapter.requestShell('ls -la');
+      const result = await restrictedAdapter.requestShell("ls -la");
       expect(result.allowed).toBe(false);
-      expect(result.reason).toContain('restricted');
+      expect(result.reason).toContain("restricted");
     });
 
-    it('should block network commands in SANDBOXED mode', async () => {
+    it("should block network commands in SANDBOXED mode", async () => {
       await adapter.spawn();
 
-      const result = await adapter.requestShell('curl https://example.com');
+      const result = await adapter.requestShell("curl https://example.com");
       expect(result.allowed).toBe(false);
-      expect(result.reason).toContain('Network access');
+      expect(result.reason).toContain("Network access");
     });
 
-    it('should allow network commands in UNTRUSTED mode', async () => {
+    it("should allow network commands in UNTRUSTED mode", async () => {
       const untrustedAdapter = new MockAdapter({
-        adapterName: 'untrusted-adapter',
+        adapterName: "untrusted-adapter",
         env: {},
         policy: {
           approvals: ApprovalsLevel.NEVER,
           trust: TrustLevel.UNTRUSTED,
           guardStrict: true,
         },
-        sessionId: 'test-session',
-        workingDir: '/test/dir',
+        sessionId: "test-session",
+        workingDir: "/test/dir",
       });
 
       await untrustedAdapter.spawn();
 
-      const result = await untrustedAdapter.requestShell('curl https://example.com');
+      const result = await untrustedAdapter.requestShell("curl https://example.com");
       expect(result.allowed).toBe(true);
     });
   });
 
-  describe('streamLogs', () => {
-    it('should stream log messages', async () => {
-      adapter.addLog('Log message 1');
-      adapter.addLog('Log message 2');
+  describe("streamLogs", () => {
+    it("should stream log messages", async () => {
+      adapter.addLog("Log message 1");
+      adapter.addLog("Log message 2");
 
       const logs: string[] = [];
       for await (const log of adapter.streamLogs()) {
@@ -251,12 +251,12 @@ describe('@airiscode/adapters - AdapterProcess', () => {
       }
 
       expect(logs).toHaveLength(2);
-      expect(logs[0]).toBe('Log message 1');
-      expect(logs[1]).toBe('Log message 2');
+      expect(logs[0]).toBe("Log message 1");
+      expect(logs[1]).toBe("Log message 2");
     });
 
-    it('should clear logs', async () => {
-      adapter.addLog('Test log');
+    it("should clear logs", async () => {
+      adapter.addLog("Test log");
       adapter.clearLogs();
 
       const logs: string[] = [];
@@ -268,20 +268,20 @@ describe('@airiscode/adapters - AdapterProcess', () => {
     });
   });
 
-  describe('terminate', () => {
+  describe("terminate", () => {
     beforeEach(async () => {
       await adapter.spawn();
     });
 
-    it('should terminate adapter', async () => {
+    it("should terminate adapter", async () => {
       await adapter.terminate();
 
       const state = adapter.getState();
-      expect(state.status).toBe('terminated');
+      expect(state.status).toBe("terminated");
       expect(state.terminatedAt).toBeInstanceOf(Date);
     });
 
-    it('should emit terminated event', async () => {
+    it("should emit terminated event", async () => {
       const events: any[] = [];
       adapter.on((event) => events.push(event));
 
@@ -292,8 +292,8 @@ describe('@airiscode/adapters - AdapterProcess', () => {
     });
   });
 
-  describe('event listeners', () => {
-    it('should add and remove event listeners', async () => {
+  describe("event listeners", () => {
+    it("should add and remove event listeners", async () => {
       const events: any[] = [];
       const listener = (event: any) => events.push(event);
 
@@ -310,17 +310,17 @@ describe('@airiscode/adapters - AdapterProcess', () => {
     });
   });
 
-  describe('getState and getOptions', () => {
-    it('should return current state', () => {
+  describe("getState and getOptions", () => {
+    it("should return current state", () => {
       const state = adapter.getState();
-      expect(state.status).toBe('idle');
+      expect(state.status).toBe("idle");
     });
 
-    it('should return spawn options', () => {
+    it("should return spawn options", () => {
       const options = adapter.getOptions();
-      expect(options.adapterName).toBe('test-adapter');
-      expect(options.sessionId).toBe('test-session');
-      expect(options.workingDir).toBe('/test/dir');
+      expect(options.adapterName).toBe("test-adapter");
+      expect(options.sessionId).toBe("test-session");
+      expect(options.workingDir).toBe("/test/dir");
     });
   });
 });
diff --git a/packages/adapters/claude-code/__tests__/claude-code-adapter.spec.ts b/packages/adapters/claude-code/__tests__/claude-code-adapter.spec.ts
index ef16c4299..53cf6a7e8 100644
--- a/packages/adapters/claude-code/__tests__/claude-code-adapter.spec.ts
+++ b/packages/adapters/claude-code/__tests__/claude-code-adapter.spec.ts
@@ -1,9 +1,9 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { ClaudeCodeAdapter } from '../src/claude-code-adapter.js';
-import { DEFAULT_POLICY, TrustLevel, ApprovalsLevel } from '@airiscode/policies';
+import { ApprovalsLevel, DEFAULT_POLICY, TrustLevel } from "@airiscode/policies";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ClaudeCodeAdapter } from "../src/claude-code-adapter.js";
 
 // Mock child_process
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   spawn: vi.fn(() => ({
     pid: 12345,
     stdout: {
@@ -20,143 +20,143 @@ vi.mock('child_process', () => ({
   })),
 }));
 
-describe('@airiscode/adapters-claude-code - ClaudeCodeAdapter', () => {
+describe("@airiscode/adapters-claude-code - ClaudeCodeAdapter", () => {
   let adapter: ClaudeCodeAdapter;
 
   beforeEach(() => {
     adapter = new ClaudeCodeAdapter({
-      adapterName: 'claude-code',
+      adapterName: "claude-code",
       env: {},
       policy: DEFAULT_POLICY,
-      sessionId: 'test-session',
-      workingDir: '/test/dir',
+      sessionId: "test-session",
+      workingDir: "/test/dir",
     });
     vi.clearAllMocks();
   });
 
-  describe('getMetadata', () => {
-    it('should return adapter metadata', () => {
+  describe("getMetadata", () => {
+    it("should return adapter metadata", () => {
       const metadata = adapter.getMetadata();
 
-      expect(metadata.name).toBe('claude-code');
-      expect(metadata.version).toBe('1.0.0');
-      expect(metadata.supportedActions).toContain('implement');
-      expect(metadata.supportedActions).toContain('refactor');
-      expect(metadata.requiresCLI).toBe('claude');
+      expect(metadata.name).toBe("claude-code");
+      expect(metadata.version).toBe("1.0.0");
+      expect(metadata.supportedActions).toContain("implement");
+      expect(metadata.supportedActions).toContain("refactor");
+      expect(metadata.requiresCLI).toBe("claude");
     });
   });
 
-  describe('spawn', () => {
-    it('should spawn Claude Code process', async () => {
-      const { spawn } = await import('child_process');
+  describe("spawn", () => {
+    it("should spawn Claude Code process", async () => {
+      const { spawn } = await import("child_process");
 
       await adapter.spawn();
 
       expect(spawn).toHaveBeenCalledWith(
-        'claude',
-        ['--json'],
+        "claude",
+        ["--json"],
         expect.objectContaining({
-          cwd: '/test/dir',
-          stdio: ['pipe', 'pipe', 'pipe'],
-        })
+          cwd: "/test/dir",
+          stdio: ["pipe", "pipe", "pipe"],
+        }),
       );
 
       const state = adapter.getState();
-      expect(state.status).toBe('ready');
+      expect(state.status).toBe("ready");
       expect(state.processId).toBe(12345);
     });
   });
 
-  describe('execute', () => {
-    it('should validate execute request', async () => {
+  describe("execute", () => {
+    it("should validate execute request", async () => {
       await adapter.spawn();
 
       await expect(
         adapter.execute({
-          action: '',
-          inputJson: JSON.stringify({ prompt: 'test' }),
-        })
-      ).rejects.toThrow('Action is required');
+          action: "",
+          inputJson: JSON.stringify({ prompt: "test" }),
+        }),
+      ).rejects.toThrow("Action is required");
 
       await expect(
         adapter.execute({
-          action: 'implement',
-          inputJson: '',
-        })
-      ).rejects.toThrow('Input JSON is required');
+          action: "implement",
+          inputJson: "",
+        }),
+      ).rejects.toThrow("Input JSON is required");
 
       await expect(
         adapter.execute({
-          action: 'implement',
-          inputJson: 'invalid json',
-        })
-      ).rejects.toThrow('Invalid input JSON');
+          action: "implement",
+          inputJson: "invalid json",
+        }),
+      ).rejects.toThrow("Invalid input JSON");
     });
   });
 
-  describe('policy enforcement', () => {
-    it('should block dangerous commands', async () => {
+  describe("policy enforcement", () => {
+    it("should block dangerous commands", async () => {
       await adapter.spawn();
 
-      const result = await adapter.requestShell('rm -rf /');
+      const result = await adapter.requestShell("rm -rf /");
 
       expect(result.allowed).toBe(false);
       expect(result.reason).toBeDefined();
     });
 
-    it('should allow safe commands', async () => {
+    it("should allow safe commands", async () => {
       await adapter.spawn();
 
-      const result = await adapter.requestShell('git status');
+      const result = await adapter.requestShell("git status");
 
       expect(result.allowed).toBe(true);
       expect(result.exitCode).toBeDefined();
     });
 
-    it('should respect RESTRICTED trust level', async () => {
+    it("should respect RESTRICTED trust level", async () => {
       const restrictedAdapter = new ClaudeCodeAdapter({
-        adapterName: 'claude-code',
+        adapterName: "claude-code",
         env: {},
         policy: {
           approvals: ApprovalsLevel.NEVER,
           trust: TrustLevel.RESTRICTED,
           guardStrict: true,
         },
-        sessionId: 'test-session',
-        workingDir: '/test/dir',
+        sessionId: "test-session",
+        workingDir: "/test/dir",
       });
 
       await restrictedAdapter.spawn();
 
-      const result = await restrictedAdapter.requestShell('ls -la');
+      const result = await restrictedAdapter.requestShell("ls -la");
       expect(result.allowed).toBe(false);
-      expect(result.reason).toContain('restricted');
+      expect(result.reason).toContain("restricted");
     });
   });
 
-  describe('terminate', () => {
-    it('should terminate adapter process', async () => {
+  describe("terminate", () => {
+    it("should terminate adapter process", async () => {
       await adapter.spawn();
 
-      const { spawn } = await import('child_process');
+      const { spawn } = await import("child_process");
       const mockProcess = vi.mocked(spawn).mock.results[0].value;
 
       await adapter.terminate();
 
-      expect(mockProcess.kill).toHaveBeenCalledWith('SIGTERM');
+      expect(mockProcess.kill).toHaveBeenCalledWith("SIGTERM");
 
       const state = adapter.getState();
-      expect(state.status).toBe('terminated');
+      expect(state.status).toBe("terminated");
     });
   });
 
-  describe('getOptions', () => {
-    it('should return spawn options', () => {
+  describe("getOptions", () => {
+    it("should return spawn options", () => {
       const options = adapter.getOptions();
 
-      expect(options.adapterName).toBe('claude-code');
-      expect(options.sessionId).toBe('test-session');
-      expect(options.workingDir).toBe('/test/dir');
+      expect(options.adapterName).toBe("claude-code");
+      expect(options.sessionId).toBe("test-session");
+      expect(options.workingDir).toBe("/test/dir");
       expect(options.policy).toEqual(DEFAULT_POLICY);
     });
   });
diff --git a/packages/adapters/claude-code/package.json b/packages/adapters/claude-code/package.json
index 5a6fe8a29..6be610510 100644
--- a/packages/adapters/claude-code/package.json
+++ b/packages/adapters/claude-code/package.json
@@ -17,7 +17,7 @@
     "build": "echo Skipping claude-code adapter build",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/adapters/claude-code/src/claude-code-adapter.ts b/packages/adapters/claude-code/src/claude-code-adapter.ts
index 1a4376bda..3f6e977c4 100644
--- a/packages/adapters/claude-code/src/claude-code-adapter.ts
+++ b/packages/adapters/claude-code/src/claude-code-adapter.ts
@@ -2,22 +2,22 @@
  * Claude Code adapter implementation
  */
 
-import {
-  AdapterProcess,
-  AdapterSpawnError,
-  AdapterExecutionError,
-  AdapterCrashError,
-  AdapterEventKind,
-} from '@airiscode/adapters';
 import type {
-  SpawnOptions,
+  AdapterMetadata,
   ExecuteRequest,
   ExecuteResponse,
   ShellExecutionResult,
-  AdapterMetadata,
-} from '@airiscode/adapters';
-import { spawn, ChildProcess } from 'child_process';
-import type { ClaudeCodeTask, ClaudeCodeResponse } from './types.js';
+  SpawnOptions,
+} from "@airiscode/adapters";
+import {
+  AdapterCrashError,
+  AdapterEventKind,
+  AdapterExecutionError,
+  AdapterProcess,
+  AdapterSpawnError,
+} from "@airiscode/adapters";
+import { ChildProcess, spawn } from "child_process";
+import type { ClaudeCodeResponse, ClaudeCodeTask } from "./types.js";
 
 /**
  * Claude Code adapter
@@ -26,7 +26,7 @@ import type { ClaudeCodeTask, ClaudeCodeResponse } from './types.js';
  */
 export class ClaudeCodeAdapter extends AdapterProcess {
   private process?: ChildProcess;
-  private responseBuffer: string = '';
+  private responseBuffer: string = "";
   private pendingResolvers: Map<
     string,
     { resolve: (value: ClaudeCodeResponse) => void; reject: (error: Error) => void }
@@ -38,36 +38,36 @@ export class ClaudeCodeAdapter extends AdapterProcess {
 
   getMetadata(): AdapterMetadata {
     return {
-      name: 'claude-code',
-      version: '1.0.0',
-      supportedActions: ['implement', 'refactor', 'test', 'review', 'explain'],
-      requiresCLI: 'claude',
+      name: "claude-code",
+      version: "1.0.0",
+      supportedActions: ["implement", "refactor", "test", "review", "explain"],
+      requiresCLI: "claude",
     };
   }
 
   async spawn(): Promise<void> {
-    this.setState({ status: 'spawning', startedAt: new Date() });
+    this.setState({ status: "spawning", startedAt: new Date() });
 
     try {
       // Spawn Claude Code CLI in JSON mode
-      this.process = spawn('claude', ['--json'], {
+      this.process = spawn("claude", ["--json"], {
         cwd: this.options.workingDir,
         env: {
           ...process.env,
           ...this.options.env,
           CLAUDE_CODE_SESSION_ID: this.options.sessionId,
         },
-        stdio: ['pipe', 'pipe', 'pipe'],
+        stdio: ["pipe", "pipe", "pipe"],
       });
 
       // Handle process events
-      this.process.on('error', (error) => {
-        this.setState({ status: 'error', error: error.message });
-        throw new AdapterSpawnError(`Failed to spawn claude: ${error.message}`, 'claude-code');
+      this.process.on("error", (error) => {
+        this.setState({ status: "error", error: error.message });
+        throw new AdapterSpawnError(`Failed to spawn claude: ${error.message}`, "claude-code");
       });
 
-      this.process.on('exit', (code, signal) => {
-        this.setState({ status: 'terminated', terminatedAt: new Date() });
+      this.process.on("exit", (code, signal) => {
+        this.setState({ status: "terminated", terminatedAt: new Date() });
 
         this.emit({
           kind: AdapterEventKind.TERMINATED,
@@ -82,14 +82,14 @@ export class ClaudeCodeAdapter extends AdapterProcess {
           throw new AdapterCrashError(
             `Claude process exited with code ${code}`,
             code,
-            signal || undefined
+            signal || undefined,
           );
         }
       });
 
       // Setup STDOUT handler
       if (this.process.stdout) {
-        this.process.stdout.on('data', (chunk) => {
+        this.process.stdout.on("data", (chunk) => {
           this.responseBuffer += chunk.toString();
           this.processResponseBuffer();
         });
@@ -97,21 +97,21 @@ export class ClaudeCodeAdapter extends AdapterProcess {
 
       // Setup STDERR handler
       if (this.process.stderr) {
-        this.process.stderr.on('data', (chunk) => {
+        this.process.stderr.on("data", (chunk) => {
           const message = chunk.toString();
           this.emit({
             kind: AdapterEventKind.LOG,
             timestamp: new Date(),
             sessionId: this.options.sessionId,
             adapterName: this.options.adapterName,
-            level: 'error',
+            level: "error",
             message,
           });
         });
       }
 
       this.setState({
-        status: 'ready',
+        status: "ready",
         processId: this.process.pid,
       });
 
@@ -130,7 +130,10 @@ export class ClaudeCodeAdapter extends AdapterProcess {
         adapterName: this.options.adapterName,
       });
     } catch (error) {
-      this.setState({ status: 'error', error: error instanceof Error ? error.message : 'Unknown error' });
+      this.setState({
+        status: "error",
+        error: error instanceof Error ? error.message : "Unknown error",
+      });
       throw error;
     }
   }
@@ -139,10 +142,10 @@ export class ClaudeCodeAdapter extends AdapterProcess {
     this.validateExecuteRequest(request);
 
     if (!this.process || !this.process.stdin) {
-      throw new AdapterExecutionError('Adapter not spawned', request.action);
+      throw new AdapterExecutionError("Adapter not spawned", request.action);
     }
 
-    this.setState({ status: 'busy' });
+    this.setState({ status: "busy" });
 
     this.emit({
       kind: AdapterEventKind.EXECUTE_START,
@@ -157,7 +160,7 @@ export class ClaudeCodeAdapter extends AdapterProcess {
 
       // Send task to Claude Code
       const taskMessage = JSON.stringify({
-        type: 'task',
+        type: "task",
         action: request.action,
         prompt: input.prompt,
         context: input.context,
@@ -165,7 +168,7 @@ export class ClaudeCodeAdapter extends AdapterProcess {
       });
 
       const responsePromise = this.waitForResponse(request.action);
-      this.process.stdin.write(taskMessage + '\n');
+      this.process.stdin.write(taskMessage + "\n");
 
       const claudeResponse = await responsePromise;
 
@@ -180,7 +183,7 @@ export class ClaudeCodeAdapter extends AdapterProcess {
             sessionId: this.options.sessionId,
             adapterName: this.options.adapterName,
             command: cmd,
-            reason: validation.reason || 'Unknown reason',
+            reason: validation.reason || "Unknown reason",
           });
         } else {
           this.emit({
@@ -194,7 +197,7 @@ export class ClaudeCodeAdapter extends AdapterProcess {
         return validation.allowed;
       });
 
-      this.setState({ status: 'ready' });
+      this.setState({ status: "ready" });
 
       this.emit({
         kind: AdapterEventKind.EXECUTE_END,
@@ -210,24 +213,28 @@ export class ClaudeCodeAdapter extends AdapterProcess {
         proposedShell: filteredShell,
       };
     } catch (error) {
-      this.setState({ status: 'error', error: error instanceof Error ? error.message : 'Unknown error' });
+      this.setState({
+        status: "error",
+        error: error instanceof Error ? error.message : "Unknown error",
+      });
 
       this.emit({
         kind: AdapterEventKind.ERROR,
         timestamp: new Date(),
         sessionId: this.options.sessionId,
         adapterName: this.options.adapterName,
-        error: error instanceof Error ? error.message : 'Unknown error',
+        error: error instanceof Error ? error.message : "Unknown error",
         stack: error instanceof Error ? error.stack : undefined,
       });
 
       throw new AdapterExecutionError(
-        `Execution failed: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        request.action
+        `Execution failed: ${error instanceof Error ? error.message : "Unknown error"}`,
+        request.action,
       );
     }
   }
 
+  // biome-ignore lint/correctness/useYield: placeholder async generator yields nothing until process.stdout streaming is implemented
   async *streamLogs(): AsyncIterable<string> {
     // In real implementation, would stream from process.stdout
     // For now, just yield empty
@@ -244,7 +251,7 @@ export class ClaudeCodeAdapter extends AdapterProcess {
         sessionId: this.options.sessionId,
         adapterName: this.options.adapterName,
         command,
-        reason: validation.reason || 'Unknown reason',
+        reason: validation.reason || "Unknown reason",
       });
 
       return {
@@ -255,23 +262,23 @@ export class ClaudeCodeAdapter extends AdapterProcess {
 
     // Execute shell command using Node's child_process
     return new Promise((resolve) => {
-      const child = spawn('sh', ['-c', command], {
+      const child = spawn("sh", ["-c", command], {
         cwd: this.options.workingDir,
-        stdio: ['ignore', 'pipe', 'pipe'],
+        stdio: ["ignore", "pipe", "pipe"],
       });
 
-      let stdout = '';
-      let stderr = '';
+      let stdout = "";
+      let stderr = "";
 
-      child.stdout?.on('data', (chunk) => {
+      child.stdout?.on("data", (chunk) => {
         stdout += chunk.toString();
       });
 
-      child.stderr?.on('data', (chunk) => {
+      child.stderr?.on("data", (chunk) => {
         stderr += chunk.toString();
       });
 
-      child.on('exit', (code) => {
+      child.on("exit", (code) => {
         this.emit({
           kind: AdapterEventKind.SHELL_EXECUTED,
           timestamp: new Date(),
@@ -293,25 +300,25 @@ export class ClaudeCodeAdapter extends AdapterProcess {
 
   async terminate(): Promise<void> {
     if (this.process) {
-      this.process.kill('SIGTERM');
+      this.process.kill("SIGTERM");
 
       // Wait for process to exit
       await new Promise<void>((resolve) => {
         const timeout = setTimeout(() => {
           if (this.process && !this.process.killed) {
-            this.process.kill('SIGKILL');
+            this.process.kill("SIGKILL");
           }
           resolve();
         }, 5000);
 
-        this.process?.on('exit', () => {
+        this.process?.on("exit", () => {
           clearTimeout(timeout);
           resolve();
         });
       });
     }
 
-    this.setState({ status: 'terminated', terminatedAt: new Date() });
+    this.setState({ status: "terminated", terminatedAt: new Date() });
   }
 
   /**
@@ -341,8 +348,8 @@ export class ClaudeCodeAdapter extends AdapterProcess {
    * Process response buffer for complete JSON messages
    */
   private processResponseBuffer(): void {
-    const lines = this.responseBuffer.split('\n');
-    this.responseBuffer = lines.pop() || '';
+    const lines = this.responseBuffer.split("\n");
+    this.responseBuffer = lines.pop() || "";
 
     for (const line of lines) {
       if (line.trim()) {
@@ -351,12 +358,12 @@ export class ClaudeCodeAdapter extends AdapterProcess {
 
           // Match response to pending action
           // This is simplified - real implementation would need message correlation
-          if (message.type === 'response' && this.pendingResolvers.size > 0) {
+          if (message.type === "response" && this.pendingResolvers.size > 0) {
             const [action, resolver] = Array.from(this.pendingResolvers.entries())[0];
             this.pendingResolvers.delete(action);
             resolver.resolve(message.data as ClaudeCodeResponse);
           }
-        } catch (error) {
+        } catch {
           // Ignore parse errors
         }
       }
diff --git a/packages/adapters/claude-code/src/index.ts b/packages/adapters/claude-code/src/index.ts
index 01f573cab..5b26206e7 100644
--- a/packages/adapters/claude-code/src/index.ts
+++ b/packages/adapters/claude-code/src/index.ts
@@ -3,5 +3,5 @@
  * Claude Code CLI adapter
  */
 
-export * from './claude-code-adapter.js';
-export * from './types.js';
+export * from "./claude-code-adapter.js";
+export * from "./types.js";
diff --git a/packages/adapters/claude-code/src/types.ts b/packages/adapters/claude-code/src/types.ts
index 8a0ec6985..41cbff930 100644
--- a/packages/adapters/claude-code/src/types.ts
+++ b/packages/adapters/claude-code/src/types.ts
@@ -6,12 +6,12 @@
  * Claude Code message types
  */
 export type ClaudeCodeMessageType =
-  | 'task'
-  | 'response'
-  | 'tool_use'
-  | 'tool_result'
-  | 'error'
-  | 'status';
+  | "task"
+  | "response"
+  | "tool_use"
+  | "tool_result"
+  | "error"
+  | "status";
 
 /**
  * Claude Code message
@@ -46,7 +46,7 @@ export interface ClaudeCodeResponse {
  * Claude Code status
  */
 export interface ClaudeCodeStatus {
-  status: 'idle' | 'thinking' | 'working' | 'done' | 'error';
+  status: "idle" | "thinking" | "working" | "done" | "error";
   currentTask?: string;
   progress?: number;
 }
diff --git a/packages/adapters/package.json b/packages/adapters/package.json
index 166c13769..9aca06ee8 100644
--- a/packages/adapters/package.json
+++ b/packages/adapters/package.json
@@ -14,7 +14,7 @@
     "build": "echo Skipping adapters build",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/adapters/src/adapter.ts b/packages/adapters/src/adapter.ts
index d1a09f06b..b0dbf12c7 100644
--- a/packages/adapters/src/adapter.ts
+++ b/packages/adapters/src/adapter.ts
@@ -2,17 +2,17 @@
  * Base adapter process abstract class
  */
 
-import { ShellGuard } from '@airiscode/sandbox';
+import { ShellGuard } from "@airiscode/sandbox";
+import type { AnyAdapterEvent } from "./events.js";
 import type {
-  SpawnOptions,
-  ExecuteRequest,
-  ExecuteResponse,
-  ShellExecutionResult,
   AdapterMetadata,
   AdapterState,
   AdapterStatus,
-} from './types.js';
-import type { AnyAdapterEvent } from './events.js';
+  ExecuteRequest,
+  ExecuteResponse,
+  ShellExecutionResult,
+  SpawnOptions,
+} from "./types.js";
 
 /**
  * Abstract base class for all adapter processes
@@ -35,7 +35,7 @@ export abstract class AdapterProcess {
     this.options = options;
     this.guard = new ShellGuard(options.policy);
     this.state = {
-      status: 'idle',
+      status: "idle",
     };
   }
 
@@ -107,7 +107,7 @@ export abstract class AdapterProcess {
       try {
         listener(event);
       } catch (error) {
-        console.error('Error in event listener:', error);
+        console.error("Error in event listener:", error);
       }
     }
   }
@@ -124,17 +124,17 @@ export abstract class AdapterProcess {
    */
   protected validateExecuteRequest(request: ExecuteRequest): void {
     if (!request.action) {
-      throw new Error('Action is required');
+      throw new Error("Action is required");
     }
     if (!request.inputJson) {
-      throw new Error('Input JSON is required');
+      throw new Error("Input JSON is required");
     }
 
     // Validate JSON
     try {
       JSON.parse(request.inputJson);
     } catch {
-      throw new Error('Invalid input JSON');
+      throw new Error("Invalid input JSON");
     }
   }
 
diff --git a/packages/adapters/src/errors.ts b/packages/adapters/src/errors.ts
index a182fec2e..bf023b278 100644
--- a/packages/adapters/src/errors.ts
+++ b/packages/adapters/src/errors.ts
@@ -6,9 +6,12 @@
  * Base error for adapter-related issues
  */
 export class AdapterError extends Error {
-  constructor(message: string, public readonly code?: string) {
+  constructor(
+    message: string,
+    public readonly code?: string,
+  ) {
     super(message);
-    this.name = 'AdapterError';
+    this.name = "AdapterError";
   }
 }
 
@@ -16,9 +19,12 @@ export class AdapterError extends Error {
  * Error when adapter spawn fails
  */
 export class AdapterSpawnError extends AdapterError {
-  constructor(message: string, public readonly adapterName: string) {
-    super(message, 'ADAPTER_SPAWN_ERROR');
-    this.name = 'AdapterSpawnError';
+  constructor(
+    message: string,
+    public readonly adapterName: string,
+  ) {
+    super(message, "ADAPTER_SPAWN_ERROR");
+    this.name = "AdapterSpawnError";
   }
 }
 
@@ -26,9 +32,12 @@ export class AdapterSpawnError extends AdapterError {
  * Error when adapter execution fails
  */
 export class AdapterExecutionError extends AdapterError {
-  constructor(message: string, public readonly action?: string) {
-    super(message, 'ADAPTER_EXECUTION_ERROR');
-    this.name = 'AdapterExecutionError';
+  constructor(
+    message: string,
+    public readonly action?: string,
+  ) {
+    super(message, "ADAPTER_EXECUTION_ERROR");
+    this.name = "AdapterExecutionError";
   }
 }
 
@@ -36,9 +45,9 @@ export class AdapterExecutionError extends AdapterError {
  * Error when adapter times out
  */
 export class AdapterTimeoutError extends AdapterError {
-  constructor(message: string = 'Adapter operation timed out') {
-    super(message, 'ADAPTER_TIMEOUT_ERROR');
-    this.name = 'AdapterTimeoutError';
+  constructor(message: string = "Adapter operation timed out") {
+    super(message, "ADAPTER_TIMEOUT_ERROR");
+    this.name = "AdapterTimeoutError";
   }
 }
 
@@ -49,10 +58,10 @@ export class AdapterCrashError extends AdapterError {
   constructor(
     message: string,
     public readonly exitCode?: number,
-    public readonly signal?: string
+    public readonly signal?: string,
   ) {
-    super(message, 'ADAPTER_CRASH_ERROR');
-    this.name = 'AdapterCrashError';
+    super(message, "ADAPTER_CRASH_ERROR");
+    this.name = "AdapterCrashError";
   }
 }
 
@@ -63,9 +72,9 @@ export class ShellBlockedError extends AdapterError {
   constructor(
     message: string,
     public readonly command: string,
-    public readonly reason: string
+    public readonly reason: string,
   ) {
-    super(message, 'SHELL_BLOCKED_ERROR');
-    this.name = 'ShellBlockedError';
+    super(message, "SHELL_BLOCKED_ERROR");
+    this.name = "ShellBlockedError";
   }
 }
diff --git a/packages/adapters/src/events.ts b/packages/adapters/src/events.ts
index 6b1e8c093..351d0027c 100644
--- a/packages/adapters/src/events.ts
+++ b/packages/adapters/src/events.ts
@@ -6,16 +6,16 @@
  * Event kinds
  */
 export enum AdapterEventKind {
-  SPAWNED = 'spawned',
-  READY = 'ready',
-  EXECUTE_START = 'execute_start',
-  EXECUTE_END = 'execute_end',
-  SHELL_PROPOSED = 'shell_proposed',
-  SHELL_BLOCKED = 'shell_blocked',
-  SHELL_EXECUTED = 'shell_executed',
-  LOG = 'log',
-  ERROR = 'error',
-  TERMINATED = 'terminated',
+  SPAWNED = "spawned",
+  READY = "ready",
+  EXECUTE_START = "execute_start",
+  EXECUTE_END = "execute_end",
+  SHELL_PROPOSED = "shell_proposed",
+  SHELL_BLOCKED = "shell_blocked",
+  SHELL_EXECUTED = "shell_executed",
+  LOG = "log",
+  ERROR = "error",
+  TERMINATED = "terminated",
 }
 
 /**
@@ -105,7 +105,7 @@ export interface ShellExecutedEvent extends AdapterEvent {
 export interface LogEvent extends AdapterEvent {
   kind: AdapterEventKind.LOG;
   /** Log level */
-  level: 'debug' | 'info' | 'warn' | 'error';
+  level: "debug" | "info" | "warn" | "error";
   /** Log message */
   message: string;
 }
diff --git a/packages/adapters/src/index.ts b/packages/adapters/src/index.ts
index 5a1e1e9b0..801f55ae2 100644
--- a/packages/adapters/src/index.ts
+++ b/packages/adapters/src/index.ts
@@ -3,8 +3,8 @@
  * Adapter process interface for CLI coding assistants
  */
 
-export * from './types.js';
-export * from './adapter.js';
-export * from './mock-adapter.js';
-export * from './errors.js';
-export * from './events.js';
+export * from "./adapter.js";
+export * from "./errors.js";
+export * from "./events.js";
+export * from "./mock-adapter.js";
+export * from "./types.js";
diff --git a/packages/adapters/src/mock-adapter.ts b/packages/adapters/src/mock-adapter.ts
index 635f5b2c9..159aa2886 100644
--- a/packages/adapters/src/mock-adapter.ts
+++ b/packages/adapters/src/mock-adapter.ts
@@ -2,15 +2,15 @@
  * Mock adapter for testing
  */
 
-import { AdapterProcess } from './adapter.js';
+import { AdapterProcess } from "./adapter.js";
+import { AdapterEventKind } from "./events.js";
 import type {
-  SpawnOptions,
+  AdapterMetadata,
   ExecuteRequest,
   ExecuteResponse,
   ShellExecutionResult,
-  AdapterMetadata,
-} from './types.js';
-import { AdapterEventKind } from './events.js';
+  SpawnOptions,
+} from "./types.js";
 
 /**
  * Mock execution response
@@ -56,27 +56,27 @@ export class MockAdapter extends AdapterProcess {
 
   getMetadata(): AdapterMetadata {
     return {
-      name: 'mock-adapter',
-      version: '1.0.0-mock',
-      supportedActions: ['implement', 'refactor', 'test', 'review'],
+      name: "mock-adapter",
+      version: "1.0.0-mock",
+      supportedActions: ["implement", "refactor", "test", "review"],
       requiresCLI: undefined,
     };
   }
 
   async spawn(): Promise<void> {
     if (this.failSpawn) {
-      this.setState({ status: 'error', error: 'Mock spawn failure' });
-      throw new Error('Mock spawn failure');
+      this.setState({ status: "error", error: "Mock spawn failure" });
+      throw new Error("Mock spawn failure");
     }
 
-    this.setState({ status: 'spawning', startedAt: new Date() });
+    this.setState({ status: "spawning", startedAt: new Date() });
 
     if (this.delay > 0) {
       await new Promise((resolve) => setTimeout(resolve, this.delay));
     }
 
     this.setState({
-      status: 'ready',
+      status: "ready",
       processId: this.mockProcessId,
     });
 
@@ -100,11 +100,11 @@ export class MockAdapter extends AdapterProcess {
     this.validateExecuteRequest(request);
 
     if (this.failExecute) {
-      this.setState({ status: 'error', error: 'Mock execution failure' });
-      throw new Error('Mock execution failure');
+      this.setState({ status: "error", error: "Mock execution failure" });
+      throw new Error("Mock execution failure");
     }
 
-    this.setState({ status: 'busy' });
+    this.setState({ status: "busy" });
 
     this.emit({
       kind: AdapterEventKind.EXECUTE_START,
@@ -120,7 +120,7 @@ export class MockAdapter extends AdapterProcess {
 
     // Get mock response for this action
     const mockResponse = this.responses.get(request.action) || {
-      outputJson: JSON.stringify({ success: true, message: 'Mock execution complete' }),
+      outputJson: JSON.stringify({ success: true, message: "Mock execution complete" }),
       proposedShell: [],
     };
 
@@ -134,7 +134,7 @@ export class MockAdapter extends AdapterProcess {
           sessionId: this.options.sessionId,
           adapterName: this.options.adapterName,
           command: cmd,
-          reason: validation.reason || 'Unknown reason',
+          reason: validation.reason || "Unknown reason",
         });
       } else {
         this.emit({
@@ -148,7 +148,7 @@ export class MockAdapter extends AdapterProcess {
       return validation.allowed;
     });
 
-    this.setState({ status: 'ready' });
+    this.setState({ status: "ready" });
 
     this.emit({
       kind: AdapterEventKind.EXECUTE_END,
@@ -181,7 +181,7 @@ export class MockAdapter extends AdapterProcess {
         sessionId: this.options.sessionId,
         adapterName: this.options.adapterName,
         command,
-        reason: validation.reason || 'Unknown reason',
+        reason: validation.reason || "Unknown reason",
       });
 
       return {
@@ -208,13 +208,13 @@ export class MockAdapter extends AdapterProcess {
       allowed: true,
       exitCode: 0,
       stdout: `Mock execution of: ${command}`,
-      stderr: '',
+      stderr: "",
     };
   }
 
   async terminate(): Promise<void> {
     this.setState({
-      status: 'terminated',
+      status: "terminated",
       terminatedAt: new Date(),
     });
 
diff --git a/packages/adapters/src/types.ts b/packages/adapters/src/types.ts
index ee7e155ed..e46a7b5c7 100644
--- a/packages/adapters/src/types.ts
+++ b/packages/adapters/src/types.ts
@@ -2,7 +2,7 @@
  * Type definitions for adapter processes
  */
 
-import { PolicyProfile } from '@airiscode/policies';
+import { PolicyProfile } from "@airiscode/policies";
 
 /**
  * Options for spawning an adapter process
@@ -75,7 +75,7 @@ export interface AdapterMetadata {
 /**
  * Adapter status
  */
-export type AdapterStatus = 'idle' | 'spawning' | 'ready' | 'busy' | 'error' | 'terminated';
+export type AdapterStatus = "idle" | "spawning" | "ready" | "busy" | "error" | "terminated";
 
 /**
  * Adapter state information
diff --git a/packages/airis-tools/package.json b/packages/airis-tools/package.json
index 539a97cad..89d94702e 100644
--- a/packages/airis-tools/package.json
+++ b/packages/airis-tools/package.json
@@ -14,7 +14,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/airis-tools/src/implementer.ts b/packages/airis-tools/src/implementer.ts
index ea58633fa..72edea3a4 100644
--- a/packages/airis-tools/src/implementer.ts
+++ b/packages/airis-tools/src/implementer.ts
@@ -1,41 +1,39 @@
-import { McpToolSpec } from '@airiscode/mcp-client';
+import { McpToolSpec } from "@airiscode/mcp-client";
 
 export const implementerToolSpec: McpToolSpec = {
-  name: 'implementer',
-  description: 'Implements code changes based on a given instruction.',
+  name: "implementer",
+  description: "Implements code changes based on a given instruction.",
   inputSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       instruction: {
-        type: 'string',
-        description: 'A detailed description of the changes to implement.',
+        type: "string",
+        description: "A detailed description of the changes to implement.",
       },
       filePath: {
-        type: 'string',
-        description: 'The path to the file to modify.',
+        type: "string",
+        description: "The path to the file to modify.",
       },
     },
-    required: ['instruction', 'filePath'],
+    required: ["instruction", "filePath"],
   },
   outputSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       success: {
-        type: 'boolean',
-        description: 'Whether the implementation was successful.',
+        type: "boolean",
+        description: "Whether the implementation was successful.",
       },
       message: {
-        type: 'string',
-        description: 'A message describing the result.',
+        type: "string",
+        description: "A message describing the result.",
       },
     },
-    required: ['success'],
+    required: ["success"],
   },
 };
 
-export async function implementerTool(
-  inputs: any,
-): Promise<{ success: boolean; message: string }> {
+export async function implementerTool(inputs: any): Promise<{ success: boolean; message: string }> {
   console.log(`Implementer tool called with instruction: ${inputs.instruction}`);
   // Placeholder implementation
   return {
diff --git a/packages/airis-tools/src/index.ts b/packages/airis-tools/src/index.ts
index 8c54b7596..c8bf6f0d5 100644
--- a/packages/airis-tools/src/index.ts
+++ b/packages/airis-tools/src/index.ts
@@ -1,3 +1,3 @@
-export * from './implementer';
-export * from './tester';
-export * from './reviewer';
+export * from "./implementer";
+export * from "./reviewer";
+export * from "./tester";
diff --git a/packages/airis-tools/src/reviewer.ts b/packages/airis-tools/src/reviewer.ts
index 91b0d4b7e..97c00563b 100644
--- a/packages/airis-tools/src/reviewer.ts
+++ b/packages/airis-tools/src/reviewer.ts
@@ -1,37 +1,35 @@
-import { McpToolSpec } from '@airiscode/mcp-client';
+import { McpToolSpec } from "@airiscode/mcp-client";
 
 export const reviewerToolSpec: McpToolSpec = {
-  name: 'reviewer',
-  description: 'Reviews code changes for quality and adherence to standards.',
+  name: "reviewer",
+  description: "Reviews code changes for quality and adherence to standards.",
   inputSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       filePath: {
-        type: 'string',
-        description: 'The path to the file to review.',
+        type: "string",
+        description: "The path to the file to review.",
       },
     },
-    required: ['filePath'],
+    required: ["filePath"],
   },
   outputSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       approved: {
-        type: 'boolean',
-        description: 'Whether the review was approved.',
+        type: "boolean",
+        description: "Whether the review was approved.",
       },
       comments: {
-        type: 'string',
-        description: 'Review comments and suggestions.',
+        type: "string",
+        description: "Review comments and suggestions.",
       },
     },
-    required: ['approved'],
+    required: ["approved"],
   },
 };
 
-export async function reviewerTool(
-  inputs: any,
-): Promise<{ approved: boolean; comments: string }> {
+export async function reviewerTool(inputs: any): Promise<{ approved: boolean; comments: string }> {
   console.log(`Reviewer tool called for file: ${inputs.filePath}`);
   // Placeholder implementation
   return {
diff --git a/packages/airis-tools/src/tester.ts b/packages/airis-tools/src/tester.ts
index 09bb77c94..28e3013e6 100644
--- a/packages/airis-tools/src/tester.ts
+++ b/packages/airis-tools/src/tester.ts
@@ -1,37 +1,35 @@
-import { McpToolSpec } from '@airiscode/mcp-client';
+import { McpToolSpec } from "@airiscode/mcp-client";
 
 export const testerToolSpec: McpToolSpec = {
-  name: 'tester',
-  description: 'Runs tests for a given file or component.',
+  name: "tester",
+  description: "Runs tests for a given file or component.",
   inputSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       filePath: {
-        type: 'string',
-        description: 'The path to the file to test.',
+        type: "string",
+        description: "The path to the file to test.",
       },
     },
-    required: ['filePath'],
+    required: ["filePath"],
   },
   outputSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       success: {
-        type: 'boolean',
-        description: 'Whether the tests passed.',
+        type: "boolean",
+        description: "Whether the tests passed.",
       },
       log: {
-        type: 'string',
-        description: 'The output log from the test runner.',
+        type: "string",
+        description: "The output log from the test runner.",
       },
     },
-    required: ['success', 'log'],
+    required: ["success", "log"],
   },
 };
 
-export async function testerTool(
-  inputs: any,
-): Promise<{ success: boolean; log: string }> {
+export async function testerTool(inputs: any): Promise<{ success: boolean; log: string }> {
   console.log(`Tester tool called for file: ${inputs.filePath}`);
   // Placeholder implementation
   return {
diff --git a/packages/airiscode-core/index.d.ts b/packages/airiscode-core/index.d.ts
index 6ed9e1dec..c7b4d5b1e 100644
--- a/packages/airiscode-core/index.d.ts
+++ b/packages/airiscode-core/index.d.ts
@@ -3,5 +3,5 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-export * from './src/index.js';
-//# sourceMappingURL=index.d.ts.map
\ No newline at end of file
+export * from "./src/index.js";
+//# sourceMappingURL=index.d.ts.map
diff --git a/packages/airiscode-core/index.js b/packages/airiscode-core/index.js
index 1544a3f70..b61f0f0c6 100644
--- a/packages/airiscode-core/index.js
+++ b/packages/airiscode-core/index.js
@@ -3,5 +3,5 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-export * from './src/index.js';
-//# sourceMappingURL=index.js.map
\ No newline at end of file
+export * from "./src/index.js";
+//# sourceMappingURL=index.js.map
diff --git a/packages/airiscode-core/index.ts b/packages/airiscode-core/index.ts
index 3e74d6bed..aa7c9b5e2 100644
--- a/packages/airiscode-core/index.ts
+++ b/packages/airiscode-core/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './src/index.js';
+export * from "./src/index.js";
diff --git a/packages/airiscode-core/package.json b/packages/airiscode-core/package.json
index e77734233..5babc37e9 100644
--- a/packages/airiscode-core/package.json
+++ b/packages/airiscode-core/package.json
@@ -18,7 +18,7 @@
     "build": "tsc",
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "biome check .",
     "format": "prettier --write .",
     "test": "vitest run"
   },
diff --git a/packages/airiscode-core/scripts/postinstall.js b/packages/airiscode-core/scripts/postinstall.js
index 641b89a30..888e01d04 100644
--- a/packages/airiscode-core/scripts/postinstall.js
+++ b/packages/airiscode-core/scripts/postinstall.js
@@ -6,17 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
-import fs from 'node:fs';
+import { execSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 // Get the package root directory
-const packageRoot = path.join(__dirname, '..');
-const vendorDir = path.join(packageRoot, 'vendor', 'ripgrep');
+const packageRoot = path.join(__dirname, "..");
+const vendorDir = path.join(packageRoot, "vendor", "ripgrep");
 
 /**
  * Remove quarantine attribute and set executable permissions on macOS/Linux
@@ -25,7 +25,7 @@ const vendorDir = path.join(packageRoot, 'vendor', 'ripgrep');
 function setupRipgrepBinaries() {
   try {
     if (!fs.existsSync(vendorDir)) {
-      console.log('ℹ Vendor directory not found, skipping ripgrep setup');
+      console.log("ℹ Vendor directory not found, skipping ripgrep setup");
       return;
     }
 
@@ -34,25 +34,23 @@ function setupRipgrepBinaries() {
 
     // Determine the binary directory based on platform and architecture
     let binaryDir;
-    if (platform === 'darwin' || platform === 'linux') {
-      const archStr = arch === 'x64' || arch === 'arm64' ? arch : null;
+    if (platform === "darwin" || platform === "linux") {
+      const archStr = arch === "x64" || arch === "arm64" ? arch : null;
       if (archStr) {
         binaryDir = path.join(vendorDir, `${archStr}-${platform}`);
       }
-    } else if (platform === 'win32') {
+    } else if (platform === "win32") {
       // Windows doesn't need these fixes
-      console.log('ℹ Windows detected, skipping ripgrep setup');
+      console.log("ℹ Windows detected, skipping ripgrep setup");
       return;
     }
 
     if (!binaryDir || !fs.existsSync(binaryDir)) {
-      console.log(
-        `ℹ Binary directory not found for ${platform}-${arch}, skipping ripgrep setup`,
-      );
+      console.log(`ℹ Binary directory not found for ${platform}-${arch}, skipping ripgrep setup`);
       return;
     }
 
-    const rgBinary = path.join(binaryDir, 'rg');
+    const rgBinary = path.join(binaryDir, "rg");
 
     if (!fs.existsSync(rgBinary)) {
       console.log(`ℹ Ripgrep binary not found at ${rgBinary}, skipping setup`);
@@ -65,28 +63,24 @@ function setupRipgrepBinaries() {
       console.log(`✓ Set executable permissions on ${rgBinary}`);
 
       // On macOS, remove quarantine attribute
-      if (platform === 'darwin') {
+      if (platform === "darwin") {
         try {
           execSync(`xattr -d com.apple.quarantine "${rgBinary}"`, {
-            stdio: 'pipe',
+            stdio: "pipe",
           });
           console.log(`✓ Removed quarantine attribute from ${rgBinary}`);
         } catch {
           // Quarantine attribute might not exist, which is fine
-          console.log('ℹ Quarantine attribute not present or already removed');
+          console.log("ℹ Quarantine attribute not present or already removed");
         }
       }
     } catch (error) {
-      console.log(
-        `⚠ Could not complete ripgrep setup: ${error.message || 'Unknown error'}`,
-      );
-      console.log('  This is not critical - ripgrep may still work correctly');
+      console.log(`⚠ Could not complete ripgrep setup: ${error.message || "Unknown error"}`);
+      console.log("  This is not critical - ripgrep may still work correctly");
     }
   } catch (error) {
-    console.log(
-      `⚠ Ripgrep setup encountered an issue: ${error.message || 'Unknown error'}`,
-    );
-    console.log('  Continuing anyway - this should not affect functionality');
+    console.log(`⚠ Ripgrep setup encountered an issue: ${error.message || "Unknown error"}`);
+    console.log("  Continuing anyway - this should not affect functionality");
   }
 }
 
@@ -95,6 +89,6 @@ try {
   setupRipgrepBinaries();
 } catch {
   // Last resort catch - never let errors block npm
-  console.log('⚠ Postinstall script encountered an unexpected error');
-  console.log('  This will not affect the installation');
+  console.log("⚠ Postinstall script encountered an unexpected error");
+  console.log("  This will not affect the installation");
 }
diff --git a/packages/airiscode-core/src/agents/arena/ArenaAgentClient.ts b/packages/airiscode-core/src/agents/arena/ArenaAgentClient.ts
index 12780f8de..7fe661f99 100644
--- a/packages/airiscode-core/src/agents/arena/ArenaAgentClient.ts
+++ b/packages/airiscode-core/src/agents/arena/ArenaAgentClient.ts
@@ -4,24 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import { isNodeError } from '../../utils/errors.js';
-import { atomicWriteJSON } from '../../utils/atomicFileWrite.js';
-import { uiTelemetryService } from '../../telemetry/uiTelemetry.js';
-import type {
-  ArenaAgentStats,
-  ArenaControlSignal,
-  ArenaStatusFile,
-} from './types.js';
-import { safeAgentId } from './types.js';
-import { AgentStatus } from '../runtime/agent-types.js';
-
-const debugLogger = createDebugLogger('ARENA_AGENT_CLIENT');
-
-const AGENTS_SUBDIR = 'agents';
-const CONTROL_SUBDIR = 'control';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { uiTelemetryService } from "../../telemetry/uiTelemetry.js";
+import { atomicWriteJSON } from "../../utils/atomicFileWrite.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { isNodeError } from "../../utils/errors.js";
+import { AgentStatus } from "../runtime/agent-types.js";
+import type { ArenaAgentStats, ArenaControlSignal, ArenaStatusFile } from "./types.js";
+import { safeAgentId } from "./types.js";
+
+const debugLogger = createDebugLogger("ARENA_AGENT_CLIENT");
+
+const AGENTS_SUBDIR = "agents";
+const CONTROL_SUBDIR = "control";
 
 /**
  * ArenaAgentClient is used by child agent processes to communicate
@@ -50,9 +46,9 @@ export class ArenaAgentClient {
    * and ARENA_SESSION_DIR env vars are present, null otherwise.
    */
   static create(): ArenaAgentClient | null {
-    const agentId = process.env['ARENA_AGENT_ID'];
-    const sessionId = process.env['ARENA_SESSION_ID'];
-    const sessionDir = process.env['ARENA_SESSION_DIR'];
+    const agentId = process.env["ARENA_AGENT_ID"];
+    const sessionId = process.env["ARENA_SESSION_ID"];
+    const sessionDir = process.env["ARENA_SESSION_DIR"];
 
     if (!agentId || !sessionId || !sessionDir) {
       return null;
@@ -81,9 +77,7 @@ export class ArenaAgentClient {
     await fs.mkdir(this.agentsDir, { recursive: true });
     await fs.mkdir(this.controlDir, { recursive: true });
     this.initialized = true;
-    debugLogger.info(
-      `ArenaAgentClient initialized for agent ${this.agentId} at ${this.agentsDir}`,
-    );
+    debugLogger.info(`ArenaAgentClient initialized for agent ${this.agentId} at ${this.agentsDir}`);
   }
 
   /**
@@ -120,21 +114,21 @@ export class ArenaAgentClient {
     await this.ensureInitialized();
 
     try {
-      const content = await fs.readFile(this.controlFilePath, 'utf-8');
+      const content = await fs.readFile(this.controlFilePath, "utf-8");
       // Parse before deleting so a corrupted file isn't silently consumed
       const signal = JSON.parse(content) as ArenaControlSignal;
       await fs.unlink(this.controlFilePath);
       return signal;
     } catch (error: unknown) {
       // File doesn't exist = no signal pending
-      if (isNodeError(error) && error.code === 'ENOENT') {
+      if (isNodeError(error) && error.code === "ENOENT") {
         return null;
       }
       // Re-throw permission errors so they surface immediately
-      if (isNodeError(error) && error.code === 'EACCES') {
+      if (isNodeError(error) && error.code === "EACCES") {
         throw error;
       }
-      debugLogger.error('Error reading control signal:', error);
+      debugLogger.error("Error reading control signal:", error);
       return null;
     }
   }
diff --git a/packages/airiscode-core/src/agents/arena/ArenaManager.ts b/packages/airiscode-core/src/agents/arena/ArenaManager.ts
index 57e2ebae9..bae39910f 100644
--- a/packages/airiscode-core/src/agents/arena/ArenaManager.ts
+++ b/packages/airiscode-core/src/agents/arena/ArenaManager.ts
@@ -4,55 +4,52 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { GitWorktreeService } from '../../services/gitWorktreeService.js';
-import { Storage } from '../../config/storage.js';
-import type { Config } from '../../config/config.js';
-import { getCoreSystemPrompt } from '../../core/prompts.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import { isNodeError } from '../../utils/errors.js';
-import { atomicWriteJSON } from '../../utils/atomicFileWrite.js';
-import type { AnsiOutput } from '../../utils/terminalSerializer.js';
-import { ArenaEventEmitter, ArenaEventType } from './arena-events.js';
-import type { AgentSpawnConfig, Backend, DisplayMode } from '../index.js';
-import { detectBackend, DISPLAY_MODE } from '../index.js';
-import type { InProcessBackend } from '../backends/InProcessBackend.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { Config } from "../../config/config.js";
+import { Storage } from "../../config/storage.js";
+import { getCoreSystemPrompt } from "../../core/prompts.js";
+import { GitWorktreeService } from "../../services/gitWorktreeService.js";
+import type { ArenaSessionEndedStatus } from "../../telemetry/index.js";
 import {
-  AgentEventType,
-  type AgentStatusChangeEvent,
-} from '../runtime/agent-events.js';
+  logArenaAgentCompleted,
+  logArenaSessionEnded,
+  logArenaSessionStarted,
+  makeArenaAgentCompletedEvent,
+  makeArenaSessionEndedEvent,
+  makeArenaSessionStartedEvent,
+} from "../../telemetry/index.js";
+import { atomicWriteJSON } from "../../utils/atomicFileWrite.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { isNodeError } from "../../utils/errors.js";
+import type { AnsiOutput } from "../../utils/terminalSerializer.js";
+import type { InProcessBackend } from "../backends/InProcessBackend.js";
+import type { AgentSpawnConfig, Backend, DisplayMode } from "../index.js";
+import { DISPLAY_MODE, detectBackend } from "../index.js";
+import { AgentEventType, type AgentStatusChangeEvent } from "../runtime/agent-events.js";
 import {
+  AgentStatus,
+  isSettledStatus,
+  isSuccessStatus,
+  isTerminalStatus,
+} from "../runtime/agent-types.js";
+import { ArenaEventEmitter, ArenaEventType } from "./arena-events.js";
+import {
+  ARENA_MAX_AGENTS,
+  type ArenaAgentResult,
+  type ArenaAgentState,
+  type ArenaCallbacks,
   type ArenaConfig,
   type ArenaConfigFile,
   type ArenaControlSignal,
-  type ArenaStartOptions,
-  type ArenaAgentResult,
   type ArenaSessionResult,
-  type ArenaAgentState,
-  type ArenaCallbacks,
-  type ArenaStatusFile,
   ArenaSessionStatus,
-  ARENA_MAX_AGENTS,
+  type ArenaStartOptions,
+  type ArenaStatusFile,
   safeAgentId,
-} from './types.js';
-import {
-  AgentStatus,
-  isTerminalStatus,
-  isSettledStatus,
-  isSuccessStatus,
-} from '../runtime/agent-types.js';
-import {
-  logArenaSessionStarted,
-  logArenaAgentCompleted,
-  logArenaSessionEnded,
-  makeArenaSessionStartedEvent,
-  makeArenaAgentCompletedEvent,
-  makeArenaSessionEndedEvent,
-} from '../../telemetry/index.js';
-import type { ArenaSessionEndedStatus } from '../../telemetry/index.js';
+} from "./types.js";
 
-const debugLogger = createDebugLogger('ARENA');
+const debugLogger = createDebugLogger("ARENA");
 
 const ARENA_POLL_INTERVAL_MS = 500;
 
@@ -100,12 +97,8 @@ export class ArenaManager {
     const arenaSettings = config.getAgentsSettings().arena;
     // Use the user-configured base dir, or default to ~/.airiscode/arena.
     this.arenaBaseDir =
-      arenaSettings?.worktreeBaseDir ??
-      path.join(Storage.getGlobalQwenDir(), 'arena');
-    this.worktreeService = new GitWorktreeService(
-      config.getWorkingDir(),
-      this.arenaBaseDir,
-    );
+      arenaSettings?.worktreeBaseDir ?? path.join(Storage.getGlobalQwenDir(), "arena");
+    this.worktreeService = new GitWorktreeService(config.getWorkingDir(), this.arenaBaseDir);
     this.terminalCols = process.stdout.columns || 120;
     this.terminalRows = process.stdout.rows || 40;
   }
@@ -227,10 +220,7 @@ export class ArenaManager {
   /**
    * Get the screen snapshot for a specific agent.
    */
-  getAgentSnapshot(
-    agentId: string,
-    scrollOffset: number = 0,
-  ): AnsiOutput | null {
+  getAgentSnapshot(agentId: string, scrollOffset: number = 0): AnsiOutput | null {
     return this.backend?.getAgentSnapshot(agentId, scrollOffset) ?? null;
   }
 
@@ -290,8 +280,7 @@ export class ArenaManager {
       sessionId: this.sessionId,
       task: options.task,
       models: options.models,
-      maxRoundsPerAgent:
-        options.maxRoundsPerAgent ?? arenaSettings?.maxRoundsPerAgent,
+      maxRoundsPerAgent: options.maxRoundsPerAgent ?? arenaSettings?.maxRoundsPerAgent,
       timeoutSeconds: options.timeoutSeconds ?? arenaSettings?.timeoutSeconds,
       approvalMode: options.approvalMode,
       sourceRepoPath,
@@ -300,9 +289,7 @@ export class ArenaManager {
 
     debugLogger.info(`Starting Arena session: ${this.sessionId}`);
     debugLogger.info(`Task: ${options.task}`);
-    debugLogger.info(
-      `Models: ${options.models.map((m) => m.modelId).join(', ')}`,
-    );
+    debugLogger.info(`Models: ${options.models.map((m) => m.modelId).join(", ")}`);
 
     // Fail fast on missing git or non-repo directory before any UI output
     // so the user gets a clean, single error message without the
@@ -313,9 +300,7 @@ export class ArenaManager {
     }
     const isRepo = await this.worktreeService.isGitRepository();
     if (!isRepo) {
-      throw new Error(
-        'Failed to start arena: current directory is not a git repository.',
-      );
+      throw new Error("Failed to start arena: current directory is not a git repository.");
     }
 
     // Emit session start event
@@ -341,16 +326,14 @@ export class ArenaManager {
       // Priority: explicit option > agents.displayMode setting > auto-detect
       const displayMode =
         options.displayMode ??
-        (this.config.getAgentsSettings().displayMode as
-          | DisplayMode
-          | undefined);
+        (this.config.getAgentsSettings().displayMode as DisplayMode | undefined);
       await this.initializeBackend(displayMode);
 
       // If cancelled during backend init, bail out early
       if (this.masterAbortController?.signal.aborted) {
         this.sessionStatus = ArenaSessionStatus.CANCELLED;
         const result = await this.collectResults();
-        this.emitSessionEnded('cancelled');
+        this.emitSessionEnded("cancelled");
         return result;
       }
 
@@ -362,21 +345,18 @@ export class ArenaManager {
       if (this.masterAbortController?.signal.aborted) {
         this.sessionStatus = ArenaSessionStatus.CANCELLED;
         const result = await this.collectResults();
-        this.emitSessionEnded('cancelled');
+        this.emitSessionEnded("cancelled");
         return result;
       }
 
       // Emit worktree info for each agent
       const worktreeInfo = Array.from(this.agents.values())
-        .map(
-          (agent, i) =>
-            `  ${i + 1}. ${agent.model.modelId} → ${agent.worktree.path}`,
-        )
-        .join('\n');
+        .map((agent, i) => `  ${i + 1}. ${agent.model.modelId} → ${agent.worktree.path}`)
+        .join("\n");
       this.emitProgress(`Environment ready. Agent worktrees:\n${worktreeInfo}`);
 
       // Start all agents in parallel via PTY
-      this.emitProgress('Launching agents…');
+      this.emitProgress("Launching agents…");
       this.sessionStatus = ArenaSessionStatus.RUNNING;
       await this.runAgents();
 
@@ -408,8 +388,7 @@ export class ArenaManager {
     } catch (error) {
       this.sessionStatus = ArenaSessionStatus.FAILED;
 
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
 
       // Emit session error event
       this.eventEmitter.emit(ArenaEventType.SESSION_ERROR, {
@@ -419,11 +398,9 @@ export class ArenaManager {
       });
 
       // Log arena session failed telemetry
-      this.emitSessionEnded('failed');
+      this.emitSessionEnded("failed");
 
-      this.callbacks.onArenaError?.(
-        error instanceof Error ? error : new Error(errorMessage),
-      );
+      this.callbacks.onArenaError?.(error instanceof Error ? error : new Error(errorMessage));
 
       throw error;
     }
@@ -491,9 +468,7 @@ export class ArenaManager {
     // Use 'cancelled' if the session was explicitly stopped, 'discarded' if
     // the user simply left without picking a winner.
     this.emitSessionEnded(
-      this.sessionStatus === ArenaSessionStatus.CANCELLED
-        ? 'cancelled'
-        : 'discarded',
+      this.sessionStatus === ArenaSessionStatus.CANCELLED ? "cancelled" : "discarded",
     );
 
     // Stop polling in case cleanup is called without cancel
@@ -528,15 +503,11 @@ export class ArenaManager {
       return;
     }
 
-    debugLogger.info(
-      `Cleaning up Arena runtime (preserving artifacts): ${this.sessionId}`,
-    );
+    debugLogger.info(`Cleaning up Arena runtime (preserving artifacts): ${this.sessionId}`);
 
     // If no session-ended event was emitted yet, emit before tearing down.
     this.emitSessionEnded(
-      this.sessionStatus === ArenaSessionStatus.CANCELLED
-        ? 'cancelled'
-        : 'discarded',
+      this.sessionStatus === ArenaSessionStatus.CANCELLED ? "cancelled" : "discarded",
     );
 
     this.stopPolling();
@@ -560,9 +531,7 @@ export class ArenaManager {
   /**
    * Apply the result from a specific agent to the main working directory.
    */
-  async applyAgentResult(
-    agentId: string,
-  ): Promise<{ success: boolean; error?: string }> {
+  async applyAgentResult(agentId: string): Promise<{ success: boolean; error?: string }> {
     const agent = this.agents.get(agentId);
     if (!agent) {
       return { success: false, error: `Agent ${agentId} not found` };
@@ -575,12 +544,10 @@ export class ArenaManager {
       };
     }
 
-    const applyResult = await this.worktreeService.applyWorktreeChanges(
-      agent.worktree.path,
-    );
+    const applyResult = await this.worktreeService.applyWorktreeChanges(agent.worktree.path);
 
     if (applyResult.success) {
-      this.emitSessionEnded('selected', agent.model.modelId);
+      this.emitSessionEnded("selected", agent.model.modelId);
     }
 
     return applyResult;
@@ -609,10 +576,7 @@ export class ArenaManager {
    *  - applyAgentResult() on success → 'selected' (with winner)
    *  - cleanup() / cleanupRuntime() → 'discarded' (user left without picking)
    */
-  private emitSessionEnded(
-    status: ArenaSessionEndedStatus,
-    winnerModelId?: string,
-  ): void {
+  private emitSessionEnded(status: ArenaSessionEndedStatus, winnerModelId?: string): void {
     if (this.sessionEndedLogged) return;
     this.sessionEndedLogged = true;
 
@@ -620,19 +584,14 @@ export class ArenaManager {
     logArenaSessionEnded(
       this.config,
       makeArenaSessionEndedEvent({
-        arena_session_id: this.sessionId ?? '',
+        arena_session_id: this.sessionId ?? "",
         status,
         duration_ms: this.startedAt ? Date.now() - this.startedAt : 0,
         display_backend: this.backend?.type,
         agent_count: agents.length,
-        completed_agents: agents.filter(
-          (a) => a.status === AgentStatus.COMPLETED,
-        ).length,
-        failed_agents: agents.filter((a) => a.status === AgentStatus.FAILED)
-          .length,
-        cancelled_agents: agents.filter(
-          (a) => a.status === AgentStatus.CANCELLED,
-        ).length,
+        completed_agents: agents.filter((a) => a.status === AgentStatus.COMPLETED).length,
+        failed_agents: agents.filter((a) => a.status === AgentStatus.FAILED).length,
+        cancelled_agents: agents.filter((a) => a.status === AgentStatus.CANCELLED).length,
         winner_model_id: winnerModelId,
       }),
     );
@@ -644,10 +603,7 @@ export class ArenaManager {
    * Emit a progress message via SESSION_UPDATE so the UI can display
    * setup status.
    */
-  private emitProgress(
-    message: string,
-    type: 'info' | 'warning' | 'success' = 'info',
-  ): void {
+  private emitProgress(message: string, type: "info" | "warning" | "success" = "info"): void {
     if (!this.sessionId) return;
     this.eventEmitter.emit(ArenaEventType.SESSION_UPDATE, {
       sessionId: this.sessionId,
@@ -661,7 +617,7 @@ export class ArenaManager {
 
   private validateStartOptions(options: ArenaStartOptions): void {
     if (!options.models || options.models.length < 2) {
-      throw new Error('Arena requires at least 2 models to compare');
+      throw new Error("Arena requires at least 2 models to compare");
     }
 
     if (options.models.length > ARENA_MAX_AGENTS) {
@@ -669,14 +625,14 @@ export class ArenaManager {
     }
 
     if (!options.task || options.task.trim().length === 0) {
-      throw new Error('Arena requires a task/prompt');
+      throw new Error("Arena requires a task/prompt");
     }
 
     // Check for duplicate model IDs
     const modelIds = options.models.map((m) => m.modelId);
     const uniqueIds = new Set(modelIds);
     if (uniqueIds.size !== modelIds.length) {
-      throw new Error('Arena models must have unique identifiers');
+      throw new Error("Arena models must have unique identifiers");
     }
 
     // Check for collisions after filesystem-safe normalization.
@@ -686,12 +642,10 @@ export class ArenaManager {
     const safeIds = modelIds.map((id) => safeAgentId(id));
     const uniqueSafeIds = new Set(safeIds);
     if (uniqueSafeIds.size !== safeIds.length) {
-      const collisions = modelIds.filter(
-        (id, i) => safeIds.indexOf(safeIds[i]!) !== i,
-      );
+      const collisions = modelIds.filter((id, i) => safeIds.indexOf(safeIds[i]!) !== i);
       throw new Error(
-        `Arena model IDs collide after path normalization: ${collisions.join(', ')}. ` +
-          'Choose model IDs that remain unique when special characters (/ \\ : etc.) are replaced.',
+        `Arena model IDs collide after path normalization: ${collisions.join(", ")}. ` +
+          "Choose model IDs that remain unique when special characters (/ \\ : etc.) are replaced.",
       );
     }
   }
@@ -709,7 +663,7 @@ export class ArenaManager {
     if (warning && this.sessionId) {
       this.eventEmitter.emit(ArenaEventType.SESSION_UPDATE, {
         sessionId: this.sessionId,
-        type: 'warning',
+        type: "warning",
         message: warning,
         timestamp: Date.now(),
       });
@@ -720,7 +674,7 @@ export class ArenaManager {
     if (attachHint && this.sessionId) {
       this.eventEmitter.emit(ArenaEventType.SESSION_UPDATE, {
         sessionId: this.sessionId,
-        type: 'info',
+        type: "info",
         message: `To view agent panes, run: ${attachHint}`,
         timestamp: Date.now(),
       });
@@ -735,7 +689,7 @@ export class ArenaManager {
    * appends a numeric suffix (-2, -3, …) until an unused name is found.
    */
   private async deriveWorktreeDirName(sessionId: string): Promise<string> {
-    const shortId = sessionId.replaceAll('-', '').slice(0, 8);
+    const shortId = sessionId.replaceAll("-", "").slice(0, 8);
     let candidate = shortId;
     let suffix = 2;
 
@@ -753,10 +707,10 @@ export class ArenaManager {
 
   private async setupWorktrees(): Promise<void> {
     if (!this.arenaConfig) {
-      throw new Error('Arena config not initialized');
+      throw new Error("Arena config not initialized");
     }
 
-    debugLogger.info('Setting up worktrees for Arena agents');
+    debugLogger.info("Setting up worktrees for Arena agents");
 
     const worktreeNames = this.arenaConfig.models.map((m) => m.modelId);
 
@@ -768,9 +722,7 @@ export class ArenaManager {
     });
 
     if (!result.success) {
-      const errorMessages = result.errors
-        .map((e) => `${e.name}: ${e.error}`)
-        .join('; ');
+      const errorMessages = result.errors.map((e) => `${e.name}: ${e.error}`).join("; ");
       throw new Error(`Failed to set up worktrees: ${errorMessages}`);
     }
 
@@ -781,9 +733,7 @@ export class ArenaManager {
       const worktree = result.worktreesByName[worktreeName];
 
       if (!worktree) {
-        throw new Error(
-          `No worktree created for model ${model.modelId} (name: ${worktreeName})`,
-        );
+        throw new Error(`No worktree created for model ${model.modelId} (name: ${worktreeName})`);
       }
 
       const agentId = model.modelId;
@@ -806,7 +756,7 @@ export class ArenaManager {
           failedToolCalls: 0,
         },
         startedAt: 0,
-        accumulatedText: '',
+        accumulatedText: "",
       };
 
       this.agents.set(agentId, agentState);
@@ -819,10 +769,10 @@ export class ArenaManager {
 
   private async runAgents(): Promise<void> {
     if (!this.arenaConfig) {
-      throw new Error('Arena config not initialized');
+      throw new Error("Arena config not initialized");
     }
 
-    debugLogger.info('Starting Arena agents sequentially via backend');
+    debugLogger.info("Starting Arena agents sequentially via backend");
 
     const backend = this.requireBackend();
 
@@ -839,7 +789,7 @@ export class ArenaManager {
       await this.spawnAgentPty(agent);
     }
 
-    this.emitProgress('All agents are now live and working on the task.');
+    this.emitProgress("All agents are now live and working on the task.");
 
     // For in-process mode, set up event bridges instead of file-based polling.
     // For PTY mode, start polling agent status files.
@@ -865,7 +815,7 @@ export class ArenaManager {
     }
 
     if (!allSettled) {
-      debugLogger.info('Arena session timed out, stopping remaining agents');
+      debugLogger.info("Arena session timed out, stopping remaining agents");
       this.sessionStatus = ArenaSessionStatus.CANCELLED;
 
       // Terminate remaining active agents
@@ -879,7 +829,7 @@ export class ArenaManager {
       }
     }
 
-    debugLogger.info('All Arena agents settled or timed out');
+    debugLogger.info("All Arena agents settled or timed out");
   }
 
   private async spawnAgentPty(agent: ArenaAgentState): Promise<void> {
@@ -913,8 +863,7 @@ export class ArenaManager {
     try {
       await backend.spawnAgent(spawnConfig);
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       agent.error = errorMessage;
       this.updateAgentStatus(agentId, AgentStatus.FAILED);
 
@@ -931,23 +880,19 @@ export class ArenaManager {
 
   private requireBackend(): Backend {
     if (!this.backend) {
-      throw new Error('Arena backend not initialized.');
+      throw new Error("Arena backend not initialized.");
     }
     return this.backend;
   }
 
   private requireConfig(): ArenaConfig {
     if (!this.arenaConfig) {
-      throw new Error('Arena config not initialized');
+      throw new Error("Arena config not initialized");
     }
     return this.arenaConfig;
   }
 
-  private handleAgentExit(
-    agentId: string,
-    exitCode: number | null,
-    _signal: number | null,
-  ): void {
+  private handleAgentExit(agentId: string, exitCode: number | null, _signal: number | null): void {
     const agent = this.agents.get(agentId);
     if (!agent) {
       return;
@@ -960,11 +905,7 @@ export class ArenaManager {
 
     agent.stats.durationMs = Date.now() - agent.startedAt;
 
-    if (
-      exitCode !== 0 &&
-      exitCode !== null &&
-      !agent.abortController.signal.aborted
-    ) {
+    if (exitCode !== 0 && exitCode !== null && !agent.abortController.signal.aborted) {
       agent.error = `Process exited with code ${exitCode}`;
       this.eventEmitter.emit(ArenaEventType.AGENT_ERROR, {
         sessionId: this.requireConfig().sessionId,
@@ -976,9 +917,7 @@ export class ArenaManager {
 
     this.updateAgentStatus(
       agentId,
-      agent.abortController.signal.aborted
-        ? AgentStatus.CANCELLED
-        : AgentStatus.FAILED,
+      agent.abortController.signal.aborted ? AgentStatus.CANCELLED : AgentStatus.FAILED,
     );
     debugLogger.info(`Agent exited: ${agentId} (exit code: ${exitCode})`);
   }
@@ -1000,40 +939,40 @@ export class ArenaManager {
     const args: string[] = [];
 
     // Set the model and auth type
-    args.push('--model', model.modelId);
-    args.push('--auth-type', model.authType);
+    args.push("--model", model.modelId);
+    args.push("--auth-type", model.authType);
 
     // Pass the task via --prompt-interactive (-i) so the CLI enters
     // interactive mode AND immediately starts working on the task.
     // (--prompt runs non-interactively and would exit after completion.)
     if (this.arenaConfig?.task) {
-      args.push('--prompt-interactive', this.arenaConfig.task);
+      args.push("--prompt-interactive", this.arenaConfig.task);
     }
 
     // Set approval mode if specified
     if (this.arenaConfig?.approvalMode) {
-      args.push('--approval-mode', this.arenaConfig.approvalMode);
+      args.push("--approval-mode", this.arenaConfig.approvalMode);
     }
 
     // Pass the agent's session ID so the child CLI uses it for telemetry
     // correlation instead of generating a random UUID.
-    args.push('--session-id', agent.agentSessionId);
+    args.push("--session-id", agent.agentSessionId);
 
     // Construct env vars for the agent
     const arenaSessionDir = this.getArenaSessionDir();
     const env: Record<string, string> = {
-      QWEN_CODE: '1',
+      QWEN_CODE: "1",
       ARENA_AGENT_ID: agentId,
-      ARENA_SESSION_ID: this.arenaConfig?.sessionId ?? '',
+      ARENA_SESSION_ID: this.arenaConfig?.sessionId ?? "",
       ARENA_SESSION_DIR: arenaSessionDir,
     };
 
     // If the model has auth overrides, pass them via env
     if (model.apiKey) {
-      env['QWEN_API_KEY'] = model.apiKey;
+      env["QWEN_API_KEY"] = model.apiKey;
     }
     if (model.baseUrl) {
-      env['QWEN_BASE_URL'] = model.baseUrl;
+      env["QWEN_BASE_URL"] = model.baseUrl;
     }
 
     const spawnConfig: AgentSpawnConfig = {
@@ -1049,10 +988,7 @@ export class ArenaManager {
         initialTask: this.arenaConfig?.task,
         runtimeConfig: {
           promptConfig: {
-            systemPrompt: getCoreSystemPrompt(
-              this.config.getUserMemory(),
-              model.modelId,
-            ),
+            systemPrompt: getCoreSystemPrompt(this.config.getUserMemory(), model.modelId),
           },
           modelConfig: { model: model.modelId },
           runConfig: {
@@ -1074,11 +1010,9 @@ export class ArenaManager {
     debugLogger.info(
       `[buildAgentSpawnConfig] agentId=${agentId}, command=${spawnConfig.command}, cliEntry=${process.argv[1]}, resolvedEntry=${path.resolve(process.argv[1]!)}`,
     );
+    debugLogger.info(`[buildAgentSpawnConfig] args=${JSON.stringify(spawnConfig.args)}`);
     debugLogger.info(
-      `[buildAgentSpawnConfig] args=${JSON.stringify(spawnConfig.args)}`,
-    );
-    debugLogger.info(
-      `[buildAgentSpawnConfig] cwd=${spawnConfig.cwd}, env keys=${Object.keys(env).join(',')}`,
+      `[buildAgentSpawnConfig] cwd=${spawnConfig.cwd}, env keys=${Object.keys(env).join(",")}`,
     );
 
     return spawnConfig;
@@ -1087,17 +1021,11 @@ export class ArenaManager {
   // ─── Private: Status & Results ─────────────────────────────────
 
   /** Decide whether a status transition is valid. Returns the new status or null. */
-  private resolveTransition(
-    current: AgentStatus,
-    incoming: AgentStatus,
-  ): AgentStatus | null {
+  private resolveTransition(current: AgentStatus, incoming: AgentStatus): AgentStatus | null {
     if (current === incoming) return null;
     if (isTerminalStatus(current)) {
       // Allow revival: COMPLETED → RUNNING (agent received new input)
-      if (
-        current === AgentStatus.COMPLETED &&
-        incoming === AgentStatus.RUNNING
-      ) {
+      if (current === AgentStatus.COMPLETED && incoming === AgentStatus.RUNNING) {
         return incoming;
       }
       return null;
@@ -1135,31 +1063,22 @@ export class ArenaManager {
       newStatus === AgentStatus.IDLE
     ) {
       if (options?.roundCancelledByUser) {
-        this.emitProgress(`Agent ${label} is cancelled by user.`, 'warning');
+        this.emitProgress(`Agent ${label} is cancelled by user.`, "warning");
       } else {
-        this.emitProgress(`Agent ${label} finished initial task.`, 'success');
+        this.emitProgress(`Agent ${label} finished initial task.`, "success");
       }
     }
 
     // Emit progress messages for follow-up transitions (only after
     // the initial task — the session is IDLE once all agents first settle).
     if (this.sessionStatus === ArenaSessionStatus.IDLE) {
-      if (
-        previousStatus === AgentStatus.IDLE &&
-        newStatus === AgentStatus.RUNNING
-      ) {
+      if (previousStatus === AgentStatus.IDLE && newStatus === AgentStatus.RUNNING) {
         this.emitProgress(`Agent ${label} is working on a follow-up task…`);
-      } else if (
-        previousStatus === AgentStatus.RUNNING &&
-        newStatus === AgentStatus.IDLE
-      ) {
+      } else if (previousStatus === AgentStatus.RUNNING && newStatus === AgentStatus.IDLE) {
         if (options?.roundCancelledByUser) {
-          this.emitProgress(`Agent ${label} is cancelled by user.`, 'warning');
+          this.emitProgress(`Agent ${label} is cancelled by user.`, "warning");
         } else {
-          this.emitProgress(
-            `Agent ${label} finished follow-up task.`,
-            'success',
-          );
+          this.emitProgress(`Agent ${label} finished follow-up task.`, "success");
         }
       }
     }
@@ -1178,14 +1097,14 @@ export class ArenaManager {
       // Log arena agent completed telemetry
       const agentTelemetryStatus =
         newStatus === AgentStatus.COMPLETED
-          ? ('completed' as const)
+          ? ("completed" as const)
           : newStatus === AgentStatus.FAILED
-            ? ('failed' as const)
-            : ('cancelled' as const);
+            ? ("failed" as const)
+            : ("cancelled" as const);
       logArenaAgentCompleted(
         this.config,
         makeArenaAgentCompletedEvent({
-          arena_session_id: this.sessionId ?? '',
+          arena_session_id: this.sessionId ?? "",
           agent_session_id: agent.agentSessionId,
           agent_model_id: agent.model.modelId,
           status: agentTelemetryStatus,
@@ -1232,12 +1151,9 @@ export class ArenaManager {
    */
   getArenaSessionDir(): string {
     if (!this.arenaConfig) {
-      throw new Error('Arena config not initialized');
+      throw new Error("Arena config not initialized");
     }
-    return GitWorktreeService.getSessionDir(
-      this.worktreeDirName!,
-      this.arenaBaseDir,
-    );
+    return GitWorktreeService.getSessionDir(this.worktreeDirName!, this.arenaBaseDir);
   }
 
   // ─── Private: Polling & Control Signals ──────────────────────
@@ -1291,7 +1207,7 @@ export class ArenaManager {
 
     this.pollingInterval = setInterval(() => {
       this.pollAgentStatuses().catch((error) => {
-        debugLogger.error('Error polling agent statuses:', error);
+        debugLogger.error("Error polling agent statuses:", error);
       });
     }, ARENA_POLL_INTERVAL_MS);
   }
@@ -1322,8 +1238,7 @@ export class ArenaManager {
       // AgentInteractive emits canonical AgentStatus values — no mapping needed.
 
       const syncStats = () => {
-        const { totalToolCalls, totalDurationMs, ...rest } =
-          interactive.getStats();
+        const { totalToolCalls, totalDurationMs, ...rest } = interactive.getStats();
         Object.assign(agent.stats, rest, {
           toolCalls: totalToolCalls,
           durationMs: totalDurationMs,
@@ -1332,15 +1247,11 @@ export class ArenaManager {
 
       agent.syncStats = syncStats;
 
-      const applyStatus = (
-        incoming: AgentStatus,
-        options?: { roundCancelledByUser?: boolean },
-      ) => {
+      const applyStatus = (incoming: AgentStatus, options?: { roundCancelledByUser?: boolean }) => {
         const resolved = this.resolveTransition(agent.status, incoming);
         if (!resolved) return;
         if (resolved === AgentStatus.FAILED) {
-          agent.error =
-            interactive.getLastRoundError() || interactive.getError();
+          agent.error = interactive.getLastRoundError() || interactive.getError();
         }
         if (isSettledStatus(resolved)) {
           agent.stats.durationMs = Date.now() - agent.startedAt;
@@ -1358,14 +1269,14 @@ export class ArenaManager {
         // Write status files so external consumers get a consistent
         // file-based view regardless of backend mode.
         this.flushInProcessStatusFiles().catch((err) =>
-          debugLogger.error('Failed to flush in-process status files:', err),
+          debugLogger.error("Failed to flush in-process status files:", err),
         );
       };
 
       const onUsageMetadata = () => {
         syncStats();
         this.flushInProcessStatusFiles().catch((err) =>
-          debugLogger.error('Failed to flush in-process status files:', err),
+          debugLogger.error("Failed to flush in-process status files:", err),
         );
       };
 
@@ -1389,7 +1300,7 @@ export class ArenaManager {
     // Flush status files once after reconciliation so that agents which
     // already settled before the bridge was attached still get written to disk.
     this.flushInProcessStatusFiles().catch((err) =>
-      debugLogger.error('Failed to flush in-process status files:', err),
+      debugLogger.error("Failed to flush in-process status files:", err),
     );
   }
 
@@ -1410,24 +1321,18 @@ export class ArenaManager {
    */
   private async pollAgentStatuses(): Promise<void> {
     const sessionDir = this.getArenaSessionDir();
-    const agentsDir = path.join(sessionDir, 'agents');
+    const agentsDir = path.join(sessionDir, "agents");
     const consolidatedAgents: Record<string, ArenaStatusFile> = {};
 
     for (const agent of this.agents.values()) {
       // Only poll agents that are actively working
-      if (
-        isSettledStatus(agent.status) ||
-        agent.status === AgentStatus.INITIALIZING
-      ) {
+      if (isSettledStatus(agent.status) || agent.status === AgentStatus.INITIALIZING) {
         continue;
       }
 
       try {
-        const statusPath = path.join(
-          agentsDir,
-          `${safeAgentId(agent.agentId)}.json`,
-        );
-        const content = await fs.readFile(statusPath, 'utf-8');
+        const statusPath = path.join(agentsDir, `${safeAgentId(agent.agentId)}.json`);
+        const content = await fs.readFile(statusPath, "utf-8");
         const statusFile = JSON.parse(content) as ArenaStatusFile;
 
         // Collect for consolidated file
@@ -1440,10 +1345,7 @@ export class ArenaManager {
         };
 
         // Detect state transitions from the sideband status file
-        const resolved = this.resolveTransition(
-          agent.status,
-          statusFile.status,
-        );
+        const resolved = this.resolveTransition(agent.status, statusFile.status);
         if (resolved) {
           if (resolved === AgentStatus.FAILED && statusFile.error) {
             agent.error = statusFile.error;
@@ -1454,13 +1356,10 @@ export class ArenaManager {
         this.callbacks.onAgentStatsUpdate?.(agent.agentId, statusFile.stats);
       } catch (error: unknown) {
         // File may not exist yet (agent hasn't written first status)
-        if (isNodeError(error) && error.code === 'ENOENT') {
+        if (isNodeError(error) && error.code === "ENOENT") {
           continue;
         }
-        debugLogger.error(
-          `Error reading status for agent ${agent.agentId}:`,
-          error,
-        );
+        debugLogger.error(`Error reading status for agent ${agent.agentId}:`, error);
       }
     }
 
@@ -1475,17 +1374,15 @@ export class ArenaManager {
    * Reads the existing config, adds/updates `updatedAt` and `agents`,
    * then writes back atomically (temp file → rename).
    */
-  private async writeConsolidatedStatus(
-    agents: Record<string, ArenaStatusFile>,
-  ): Promise<void> {
+  private async writeConsolidatedStatus(agents: Record<string, ArenaStatusFile>): Promise<void> {
     const sessionDir = this.getArenaSessionDir();
-    const configPath = path.join(sessionDir, 'config.json');
+    const configPath = path.join(sessionDir, "config.json");
 
     try {
       // Read existing config.json written by GitWorktreeService
       let config: ArenaConfigFile;
       try {
-        const content = await fs.readFile(configPath, 'utf-8');
+        const content = await fs.readFile(configPath, "utf-8");
         config = JSON.parse(content) as ArenaConfigFile;
       } catch {
         // If config.json doesn't exist yet, create a minimal one
@@ -1493,9 +1390,7 @@ export class ArenaManager {
         config = {
           arenaSessionId: arenaConfig.sessionId,
           sourceRepoPath: arenaConfig.sourceRepoPath,
-          worktreeNames: arenaConfig.models.map(
-            (m) => m.displayName || m.modelId,
-          ),
+          worktreeNames: arenaConfig.models.map((m) => m.displayName || m.modelId),
           createdAt: this.startedAt!,
         };
       }
@@ -1506,10 +1401,7 @@ export class ArenaManager {
 
       await atomicWriteJSON(configPath, config);
     } catch (error) {
-      debugLogger.error(
-        'Failed to write consolidated status to config.json:',
-        error,
-      );
+      debugLogger.error("Failed to write consolidated status to config.json:", error);
     }
   }
 
@@ -1540,17 +1432,14 @@ export class ArenaManager {
    */
   private async flushInProcessStatusFiles(): Promise<void> {
     const sessionDir = this.getArenaSessionDir();
-    const agentsDir = path.join(sessionDir, 'agents');
+    const agentsDir = path.join(sessionDir, "agents");
     await fs.mkdir(agentsDir, { recursive: true });
 
     const consolidatedAgents: Record<string, ArenaStatusFile> = {};
 
     for (const agent of this.agents.values()) {
       const statusFile = this.buildStatusFile(agent);
-      const filePath = path.join(
-        agentsDir,
-        `${safeAgentId(agent.agentId)}.json`,
-      );
+      const filePath = path.join(agentsDir, `${safeAgentId(agent.agentId)}.json`);
       await atomicWriteJSON(filePath, statusFile);
       consolidatedAgents[agent.agentId] = statusFile;
     }
@@ -1566,14 +1455,12 @@ export class ArenaManager {
    */
   async sendControlSignal(
     agentId: string,
-    type: ArenaControlSignal['type'],
+    type: ArenaControlSignal["type"],
     reason: string,
   ): Promise<void> {
     const agent = this.agents.get(agentId);
     if (!agent) {
-      debugLogger.error(
-        `Cannot send control signal: agent ${agentId} not found`,
-      );
+      debugLogger.error(`Cannot send control signal: agent ${agentId} not found`);
       return;
     }
 
@@ -1584,30 +1471,21 @@ export class ArenaManager {
     };
 
     const sessionDir = this.getArenaSessionDir();
-    const controlDir = path.join(sessionDir, 'control');
+    const controlDir = path.join(sessionDir, "control");
     const controlPath = path.join(controlDir, `${safeAgentId(agentId)}.json`);
 
     try {
       await fs.mkdir(controlDir, { recursive: true });
-      await fs.writeFile(
-        controlPath,
-        JSON.stringify(controlSignal, null, 2),
-        'utf-8',
-      );
-      debugLogger.info(
-        `Sent ${type} control signal to agent ${agentId}: ${reason}`,
-      );
+      await fs.writeFile(controlPath, JSON.stringify(controlSignal, null, 2), "utf-8");
+      debugLogger.info(`Sent ${type} control signal to agent ${agentId}: ${reason}`);
     } catch (error) {
-      debugLogger.error(
-        `Failed to send control signal to agent ${agentId}:`,
-        error,
-      );
+      debugLogger.error(`Failed to send control signal to agent ${agentId}:`, error);
     }
   }
 
   private async collectResults(): Promise<ArenaSessionResult> {
     if (!this.arenaConfig) {
-      throw new Error('Arena config not initialized');
+      throw new Error("Arena config not initialized");
     }
 
     const agents: ArenaAgentResult[] = [];
@@ -1618,14 +1496,9 @@ export class ArenaManager {
       // Get diff for agents that finished their task (IDLE or COMPLETED)
       if (isSuccessStatus(agent.status)) {
         try {
-          result.diff = await this.worktreeService.getWorktreeDiff(
-            agent.worktree.path,
-          );
+          result.diff = await this.worktreeService.getWorktreeDiff(agent.worktree.path);
         } catch (error) {
-          debugLogger.error(
-            `Failed to get diff for agent ${agent.agentId}:`,
-            error,
-          );
+          debugLogger.error(`Failed to get diff for agent ${agent.agentId}:`, error);
         }
       }
 
diff --git a/packages/airiscode-core/src/agents/arena/arena-events.ts b/packages/airiscode-core/src/agents/arena/arena-events.ts
index def7c2444..ac6a13995 100644
--- a/packages/airiscode-core/src/agents/arena/arena-events.ts
+++ b/packages/airiscode-core/src/agents/arena/arena-events.ts
@@ -4,45 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'events';
-import type {
-  ArenaModelConfig,
-  ArenaAgentResult,
-  ArenaSessionResult,
-} from './types.js';
-import type { AgentStatus } from '../runtime/agent-types.js';
+import { EventEmitter } from "events";
+import type { AgentStatus } from "../runtime/agent-types.js";
+import type { ArenaAgentResult, ArenaModelConfig, ArenaSessionResult } from "./types.js";
 
 /**
  * Arena event types.
  */
 export enum ArenaEventType {
   /** Arena session started */
-  SESSION_START = 'session_start',
+  SESSION_START = "session_start",
   /** Informational or warning update during session lifecycle */
-  SESSION_UPDATE = 'session_update',
+  SESSION_UPDATE = "session_update",
   /** Arena session completed */
-  SESSION_COMPLETE = 'session_complete',
+  SESSION_COMPLETE = "session_complete",
   /** Arena session failed */
-  SESSION_ERROR = 'session_error',
+  SESSION_ERROR = "session_error",
   /** Agent started */
-  AGENT_START = 'agent_start',
+  AGENT_START = "agent_start",
   /** Agent status changed */
-  AGENT_STATUS_CHANGE = 'agent_status_change',
+  AGENT_STATUS_CHANGE = "agent_status_change",
   /** Agent completed */
-  AGENT_COMPLETE = 'agent_complete',
+  AGENT_COMPLETE = "agent_complete",
   /** Agent error */
-  AGENT_ERROR = 'agent_error',
+  AGENT_ERROR = "agent_error",
 }
 
 export type ArenaEvent =
-  | 'session_start'
-  | 'session_update'
-  | 'session_complete'
-  | 'session_error'
-  | 'agent_start'
-  | 'agent_status_change'
-  | 'agent_complete'
-  | 'agent_error';
+  | "session_start"
+  | "session_update"
+  | "session_complete"
+  | "session_error"
+  | "agent_start"
+  | "agent_status_change"
+  | "agent_complete"
+  | "agent_error";
 
 /**
  * Event payload for session start.
@@ -117,7 +113,7 @@ export interface ArenaAgentStatusChangeEvent {
 /**
  * Event payload for session update (informational or warning).
  */
-export type ArenaSessionUpdateType = 'info' | 'warning' | 'success';
+export type ArenaSessionUpdateType = "info" | "warning" | "success";
 
 export interface ArenaSessionUpdateEvent {
   sessionId: string;
@@ -146,10 +142,7 @@ export interface ArenaEventMap {
 export class ArenaEventEmitter {
   private ee = new EventEmitter();
 
-  on<E extends keyof ArenaEventMap>(
-    event: E,
-    listener: (payload: ArenaEventMap[E]) => void,
-  ): void {
+  on<E extends keyof ArenaEventMap>(event: E, listener: (payload: ArenaEventMap[E]) => void): void {
     this.ee.on(event, listener as (...args: unknown[]) => void);
   }
 
@@ -160,10 +153,7 @@ export class ArenaEventEmitter {
     this.ee.off(event, listener as (...args: unknown[]) => void);
   }
 
-  emit<E extends keyof ArenaEventMap>(
-    event: E,
-    payload: ArenaEventMap[E],
-  ): void {
+  emit<E extends keyof ArenaEventMap>(event: E, payload: ArenaEventMap[E]): void {
     this.ee.emit(event, payload);
   }
 
diff --git a/packages/airiscode-core/src/agents/arena/index.ts b/packages/airiscode-core/src/agents/arena/index.ts
index e744250c7..d76a9a3ec 100644
--- a/packages/airiscode-core/src/agents/arena/index.ts
+++ b/packages/airiscode-core/src/agents/arena/index.ts
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Arena-specific exports
-export * from './types.js';
-export * from './arena-events.js';
-export * from './ArenaManager.js';
-export * from './ArenaAgentClient.js';
-
 // Re-export shared agent infrastructure for backwards compatibility
-export * from '../backends/index.js';
+export * from "../backends/index.js";
+export * from "./ArenaAgentClient.js";
+export * from "./ArenaManager.js";
+export * from "./arena-events.js";
+// Arena-specific exports
+export * from "./types.js";
diff --git a/packages/airiscode-core/src/agents/arena/types.ts b/packages/airiscode-core/src/agents/arena/types.ts
index d144505b3..4523c677f 100644
--- a/packages/airiscode-core/src/agents/arena/types.ts
+++ b/packages/airiscode-core/src/agents/arena/types.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '../../types/llm.js';
-import type { WorktreeInfo } from '../../services/gitWorktreeService.js';
-import type { DisplayMode } from '../backends/types.js';
-import type { AgentStatus } from '../runtime/agent-types.js';
+import type { WorktreeInfo } from "../../services/gitWorktreeService.js";
+import type { Content } from "../../types/llm.js";
+import type { DisplayMode } from "../backends/types.js";
+import type { AgentStatus } from "../runtime/agent-types.js";
 
 /**
  * Maximum number of concurrent agents allowed in an Arena session.
@@ -19,17 +19,17 @@ export const ARENA_MAX_AGENTS = 5;
  */
 export enum ArenaSessionStatus {
   /** Session is being set up */
-  INITIALIZING = 'initializing',
+  INITIALIZING = "initializing",
   /** Session is running */
-  RUNNING = 'running',
+  RUNNING = "running",
   /** All agents finished their current task and are idle (can accept follow-ups) */
-  IDLE = 'idle',
+  IDLE = "idle",
   /** Session completed for good (winner selected or explicit end) */
-  COMPLETED = 'completed',
+  COMPLETED = "completed",
   /** Session was cancelled */
-  CANCELLED = 'cancelled',
+  CANCELLED = "cancelled",
   /** Session failed during initialization */
-  FAILED = 'failed',
+  FAILED = "failed",
 }
 
 /**
@@ -181,10 +181,7 @@ export interface ArenaCallbacks {
   /** Called when an agent completes */
   onAgentComplete?: (result: ArenaAgentResult) => void;
   /** Called when agent stats are updated */
-  onAgentStatsUpdate?: (
-    agentId: string,
-    stats: Partial<ArenaAgentStats>,
-  ) => void;
+  onAgentStatsUpdate?: (agentId: string, stats: Partial<ArenaAgentStats>) => void;
   /** Called when the arena session completes */
   onArenaComplete?: (result: ArenaSessionResult) => void;
   /** Called on arena error */
@@ -236,7 +233,7 @@ export interface ArenaConfigFile {
  * Written by ArenaManager, consumed (read + deleted) by ArenaAgentClient.
  */
 export interface ArenaControlSignal {
-  type: 'shutdown' | 'cancel';
+  type: "shutdown" | "cancel";
   reason: string;
   timestamp: number;
 }
@@ -246,7 +243,7 @@ export interface ArenaControlSignal {
  * string by replacing path-unsafe characters with "--".
  */
 export function safeAgentId(agentId: string): string {
-  return agentId.replace(/[/\\:*?"<>|]/g, '--');
+  return agentId.replace(/[/\\:*?"<>|]/g, "--");
 }
 
 /**
diff --git a/packages/airiscode-core/src/agents/backends/ITermBackend.ts b/packages/airiscode-core/src/agents/backends/ITermBackend.ts
index 7ff24c44b..7be25c0b8 100644
--- a/packages/airiscode-core/src/agents/backends/ITermBackend.ts
+++ b/packages/airiscode-core/src/agents/backends/ITermBackend.ts
@@ -16,23 +16,23 @@
  * polls to detect exits.
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import type { AnsiOutput } from '../../utils/terminalSerializer.js';
-import { DISPLAY_MODE } from './types.js';
-import type { AgentSpawnConfig, AgentExitCallback, Backend } from './types.js';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import type { AnsiOutput } from "../../utils/terminalSerializer.js";
 import {
-  verifyITerm,
-  itermSplitPane,
+  itermCloseSession,
+  itermFocusSession,
   itermRunCommand,
   itermSendText,
-  itermFocusSession,
-  itermCloseSession,
-} from './iterm-it2.js';
+  itermSplitPane,
+  verifyITerm,
+} from "./iterm-it2.js";
+import type { AgentExitCallback, AgentSpawnConfig, Backend } from "./types.js";
+import { DISPLAY_MODE } from "./types.js";
 
-const debugLogger = createDebugLogger('ITERM_BACKEND');
+const debugLogger = createDebugLogger("ITERM_BACKEND");
 
 /** Polling interval for exit detection (ms) */
 const EXIT_POLL_INTERVAL_MS = 500;
@@ -41,7 +41,7 @@ interface ITermAgentSession {
   agentId: string;
   sessionId: string;
   exitMarkerPath: string;
-  status: 'running' | 'exited';
+  status: "running" | "exited";
   exitCode: number;
 }
 
@@ -65,10 +65,7 @@ export class ITermBackend implements Backend {
   private spawnQueue: Promise<void> = Promise.resolve();
 
   constructor() {
-    this.exitMarkerDir = path.join(
-      os.tmpdir(),
-      `agent-iterm-exit-${Date.now().toString(36)}`,
-    );
+    this.exitMarkerDir = path.join(os.tmpdir(), `agent-iterm-exit-${Date.now().toString(36)}`);
   }
 
   async init(): Promise<void> {
@@ -80,14 +77,14 @@ export class ITermBackend implements Backend {
     await fs.mkdir(this.exitMarkerDir, { recursive: true });
 
     this.initialized = true;
-    debugLogger.info('ITermBackend initialized');
+    debugLogger.info("ITermBackend initialized");
   }
 
   // ─── Agent Lifecycle ────────────────────────────────────────
 
   async spawnAgent(config: AgentSpawnConfig): Promise<void> {
     if (!this.initialized) {
-      throw new Error('ITermBackend not initialized. Call init() first.');
+      throw new Error("ITermBackend not initialized. Call init() first.");
     }
     if (this.sessions.has(config.agentId)) {
       throw new Error(`Agent "${config.agentId}" already exists.`);
@@ -115,7 +112,7 @@ export class ITermBackend implements Backend {
 
       if (this.sessions.size === 0) {
         // First agent: split from ITERM_SESSION_ID if present, else active session
-        const leaderSessionId = process.env['ITERM_SESSION_ID'] || undefined;
+        const leaderSessionId = process.env["ITERM_SESSION_ID"] || undefined;
         sessionId = await itermSplitPane(leaderSessionId);
         await itermRunCommand(sessionId, cmd);
       } else {
@@ -128,7 +125,7 @@ export class ITermBackend implements Backend {
         agentId,
         sessionId,
         exitMarkerPath,
-        status: 'running',
+        status: "running",
         exitCode: 0,
       };
 
@@ -147,9 +144,9 @@ export class ITermBackend implements Backend {
       debugLogger.error(`Failed to spawn agent "${agentId}":`, error);
       this.sessions.set(agentId, {
         agentId,
-        sessionId: '',
+        sessionId: "",
         exitMarkerPath,
-        status: 'exited',
+        status: "exited",
         exitCode: 1,
       });
       this.agentOrder.push(agentId);
@@ -161,11 +158,11 @@ export class ITermBackend implements Backend {
 
   stopAgent(agentId: string): void {
     const session = this.sessions.get(agentId);
-    if (!session || session.status !== 'running') return;
+    if (!session || session.status !== "running") return;
     itermCloseSession(session.sessionId).catch((e) =>
       debugLogger.error(`Failed to close session for agent "${agentId}": ${e}`),
     );
-    session.status = 'exited';
+    session.status = "exited";
     session.exitCode = 1;
     this.onExitCallback?.(agentId, 1, null);
     debugLogger.info(`Closed iTerm2 session for agent "${agentId}"`);
@@ -173,13 +170,11 @@ export class ITermBackend implements Backend {
 
   stopAll(): void {
     for (const session of this.sessions.values()) {
-      if (session.status === 'running') {
+      if (session.status === "running") {
         itermCloseSession(session.sessionId).catch((e) =>
-          debugLogger.error(
-            `Failed to close session for agent "${session.agentId}": ${e}`,
-          ),
+          debugLogger.error(`Failed to close session for agent "${session.agentId}": ${e}`),
         );
-        session.status = 'exited';
+        session.status = "exited";
         session.exitCode = 1;
         this.onExitCallback?.(session.agentId, 1, null);
       }
@@ -196,7 +191,7 @@ export class ITermBackend implements Backend {
       try {
         await itermCloseSession(session.sessionId);
       } catch (error) {
-        debugLogger.error('Session cleanup error (ignored):', error);
+        debugLogger.error("Session cleanup error (ignored):", error);
       }
     }
 
@@ -207,7 +202,7 @@ export class ITermBackend implements Backend {
         force: true,
       });
     } catch (error) {
-      debugLogger.error('Exit marker cleanup error (ignored):', error);
+      debugLogger.error("Exit marker cleanup error (ignored):", error);
     }
 
     this.sessions.clear();
@@ -258,16 +253,15 @@ export class ITermBackend implements Backend {
 
   switchToNext(): void {
     if (this.agentOrder.length <= 1) return;
-    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? '');
+    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? "");
     const nextIndex = (currentIndex + 1) % this.agentOrder.length;
     this.switchTo(this.agentOrder[nextIndex]!);
   }
 
   switchToPrevious(): void {
     if (this.agentOrder.length <= 1) return;
-    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? '');
-    const prevIndex =
-      (currentIndex - 1 + this.agentOrder.length) % this.agentOrder.length;
+    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? "");
+    const prevIndex = (currentIndex - 1 + this.agentOrder.length) % this.agentOrder.length;
     this.switchTo(this.agentOrder[prevIndex]!);
   }
 
@@ -282,10 +276,7 @@ export class ITermBackend implements Backend {
     return null;
   }
 
-  getAgentSnapshot(
-    _agentId: string,
-    _scrollOffset: number = 0,
-  ): AnsiOutput | null {
+  getAgentSnapshot(_agentId: string, _scrollOffset: number = 0): AnsiOutput | null {
     return null;
   }
 
@@ -302,7 +293,7 @@ export class ITermBackend implements Backend {
 
   writeToAgent(agentId: string, data: string): boolean {
     const session = this.sessions.get(agentId);
-    if (!session || session.status !== 'running') return false;
+    if (!session || session.status !== "running") return false;
     itermSendText(session.sessionId, data).catch((e) =>
       debugLogger.error(`Failed to send text to agent "${agentId}": ${e}`),
     );
@@ -330,10 +321,7 @@ export class ITermBackend implements Backend {
    * file polling, since iTerm2 `write text` runs commands inside a shell
    * (the shell stays alive after the command exits).
    */
-  private buildShellCommand(
-    config: AgentSpawnConfig,
-    exitMarkerPath: string,
-  ): string {
+  private buildShellCommand(config: AgentSpawnConfig, exitMarkerPath: string): string {
     const envParts: string[] = [];
     if (config.env) {
       for (const [key, value] of Object.entries(config.env)) {
@@ -346,24 +334,21 @@ export class ITermBackend implements Backend {
       }
     }
 
-    const cmdParts = [
-      shellQuote(config.command),
-      ...config.args.map(shellQuote),
-    ];
+    const cmdParts = [shellQuote(config.command), ...config.args.map(shellQuote)];
 
     // Build: cd <cwd> && [env K=V] command args; echo $? > <marker>
     const parts = [`cd ${shellQuote(config.cwd)}`];
     if (envParts.length > 0) {
-      parts.push(`env ${envParts.join(' ')} ${cmdParts.join(' ')}`);
+      parts.push(`env ${envParts.join(" ")} ${cmdParts.join(" ")}`);
     } else {
-      parts.push(cmdParts.join(' '));
+      parts.push(cmdParts.join(" "));
     }
 
-    const mainCmd = parts.join(' && ');
+    const mainCmd = parts.join(" && ");
     // Write exit code to a temp file first, then atomically rename it
     // to the marker path. This prevents the polling loop from reading
     // a partially-written file.
-    const tmpMarker = shellQuote(exitMarkerPath + '.tmp');
+    const tmpMarker = shellQuote(exitMarkerPath + ".tmp");
     const finalMarker = shellQuote(exitMarkerPath);
     return `${mainCmd}; echo $? > ${tmpMarker} && mv ${tmpMarker} ${finalMarker}`;
   }
@@ -372,7 +357,7 @@ export class ITermBackend implements Backend {
     if (this.pendingSpawns > 0) return false;
     if (this.sessions.size === 0) return true;
     for (const session of this.sessions.values()) {
-      if (session.status === 'running') return false;
+      if (session.status === "running") return false;
     }
     return true;
   }
@@ -395,17 +380,15 @@ export class ITermBackend implements Backend {
 
   private async pollExitStatus(): Promise<void> {
     for (const agent of this.sessions.values()) {
-      if (agent.status !== 'running') continue;
+      if (agent.status !== "running") continue;
 
       try {
-        const content = await fs.readFile(agent.exitMarkerPath, 'utf8');
+        const content = await fs.readFile(agent.exitMarkerPath, "utf8");
         const exitCode = parseInt(content.trim(), 10);
-        agent.status = 'exited';
+        agent.status = "exited";
         agent.exitCode = isNaN(exitCode) ? 1 : exitCode;
 
-        debugLogger.info(
-          `Agent "${agent.agentId}" exited with code ${agent.exitCode}`,
-        );
+        debugLogger.info(`Agent "${agent.agentId}" exited with code ${agent.exitCode}`);
 
         this.onExitCallback?.(agent.agentId, agent.exitCode, null);
       } catch {
diff --git a/packages/airiscode-core/src/agents/backends/InProcessBackend.ts b/packages/airiscode-core/src/agents/backends/InProcessBackend.ts
index 0305ed59d..3340f3d1a 100644
--- a/packages/airiscode-core/src/agents/backends/InProcessBackend.ts
+++ b/packages/airiscode-core/src/agents/backends/InProcessBackend.ts
@@ -11,33 +11,33 @@
  * This enables Arena to work without tmux or any external terminal multiplexer.
  */
 
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import type { Config } from '../../config/config.js';
+import type { Config } from "../../config/config.js";
 import {
   type AuthType,
   type ContentGenerator,
   type ContentGeneratorConfig,
   createContentGenerator,
-} from '../../core/contentGenerator.js';
-import type { ToolRegistry } from '../../tools/tool-registry.js';
-import { WorkspaceContext } from '../../utils/workspaceContext.js';
-import { FileDiscoveryService } from '../../services/fileDiscoveryService.js';
-import { buildAgentContentGeneratorConfig } from '../../models/content-generator-config.js';
-import { AgentStatus, isTerminalStatus } from '../runtime/agent-types.js';
-import { AgentCore } from '../runtime/agent-core.js';
-import { AgentEventEmitter } from '../runtime/agent-events.js';
-import { ContextState } from '../runtime/agent-headless.js';
-import { AgentInteractive } from '../runtime/agent-interactive.js';
+} from "../../core/contentGenerator.js";
+import { buildAgentContentGeneratorConfig } from "../../models/content-generator-config.js";
+import { FileDiscoveryService } from "../../services/fileDiscoveryService.js";
+import type { ToolRegistry } from "../../tools/tool-registry.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import type { AnsiOutput } from "../../utils/terminalSerializer.js";
+import { WorkspaceContext } from "../../utils/workspaceContext.js";
+import { AgentCore } from "../runtime/agent-core.js";
+import { AgentEventEmitter } from "../runtime/agent-events.js";
+import { ContextState } from "../runtime/agent-headless.js";
+import { AgentInteractive } from "../runtime/agent-interactive.js";
+import { AgentStatus, isTerminalStatus } from "../runtime/agent-types.js";
 import type {
-  Backend,
-  AgentSpawnConfig,
   AgentExitCallback,
+  AgentSpawnConfig,
+  Backend,
   InProcessSpawnConfig,
-} from './types.js';
-import { DISPLAY_MODE } from './types.js';
-import type { AnsiOutput } from '../../utils/terminalSerializer.js';
+} from "./types.js";
+import { DISPLAY_MODE } from "./types.js";
 
-const debugLogger = createDebugLogger('IN_PROCESS_BACKEND');
+const debugLogger = createDebugLogger("IN_PROCESS_BACKEND");
 
 /**
  * InProcessBackend runs agents in the current Node.js process.
@@ -65,23 +65,20 @@ export class InProcessBackend implements Backend {
   // ─── Backend Interface ─────────────────────────────────────
 
   async init(): Promise<void> {
-    debugLogger.info('InProcessBackend initialized');
+    debugLogger.info("InProcessBackend initialized");
   }
 
   async spawnAgent(config: AgentSpawnConfig): Promise<void> {
     const inProcessConfig = config.inProcess;
     if (!inProcessConfig) {
-      throw new Error(
-        `InProcessBackend requires inProcess config for agent ${config.agentId}`,
-      );
+      throw new Error(`InProcessBackend requires inProcess config for agent ${config.agentId}`);
     }
 
     if (this.agents.has(config.agentId)) {
       throw new Error(`Agent "${config.agentId}" already exists.`);
     }
 
-    const { promptConfig, modelConfig, runConfig, toolConfig } =
-      inProcessConfig.runtimeConfig;
+    const { promptConfig, modelConfig, runConfig, toolConfig } = inProcessConfig.runtimeConfig;
 
     const eventEmitter = new AgentEventEmitter();
 
@@ -140,20 +137,13 @@ export class InProcessBackend implements Backend {
           return;
         }
         const exitCode =
-          status === AgentStatus.COMPLETED
-            ? 0
-            : status === AgentStatus.FAILED
-              ? 1
-              : null;
+          status === AgentStatus.COMPLETED ? 0 : status === AgentStatus.FAILED ? 1 : null;
         this.exitCallback?.(config.agentId, exitCode, null);
       });
 
       debugLogger.info(`Spawned in-process agent: ${config.agentId}`);
     } catch (error) {
-      debugLogger.error(
-        `Failed to start in-process agent "${config.agentId}":`,
-        error,
-      );
+      debugLogger.error(`Failed to start in-process agent "${config.agentId}":`, error);
       this.exitCallback?.(config.agentId, 1, null);
     }
   }
@@ -170,7 +160,7 @@ export class InProcessBackend implements Backend {
     for (const agent of this.agents.values()) {
       agent.abort();
     }
-    debugLogger.info('Stopped all in-process agents');
+    debugLogger.info("Stopped all in-process agents");
   }
 
   async cleanup(): Promise<void> {
@@ -202,7 +192,7 @@ export class InProcessBackend implements Backend {
     this.agents.clear();
     this.agentOrder.length = 0;
     this.activeAgentId = null;
-    debugLogger.info('InProcessBackend cleaned up');
+    debugLogger.info("InProcessBackend cleaned up");
   }
 
   setOnAgentExit(callback: AgentExitCallback): void {
@@ -212,9 +202,7 @@ export class InProcessBackend implements Backend {
   async waitForAll(timeoutMs?: number): Promise<boolean> {
     if (this.cleanedUp) return true;
 
-    const promises = Array.from(this.agents.values()).map((a) =>
-      a.waitForCompletion(),
-    );
+    const promises = Array.from(this.agents.values()).map((a) => a.waitForCompletion());
 
     if (timeoutMs === undefined) {
       await Promise.allSettled(promises);
@@ -222,17 +210,17 @@ export class InProcessBackend implements Backend {
     }
 
     let timerId: ReturnType<typeof setTimeout>;
-    const timeout = new Promise<'timeout'>((resolve) => {
-      timerId = setTimeout(() => resolve('timeout'), timeoutMs);
+    const timeout = new Promise<"timeout">((resolve) => {
+      timerId = setTimeout(() => resolve("timeout"), timeoutMs);
     });
 
     const result = await Promise.race([
-      Promise.allSettled(promises).then(() => 'done' as const),
+      Promise.allSettled(promises).then(() => "done" as const),
       timeout,
     ]);
 
     clearTimeout(timerId!);
-    return result === 'done';
+    return result === "done";
   }
 
   // ─── Navigation ────────────────────────────────────────────
@@ -261,10 +249,7 @@ export class InProcessBackend implements Backend {
     return null;
   }
 
-  getAgentSnapshot(
-    _agentId: string,
-    _scrollOffset?: number,
-  ): AnsiOutput | null {
+  getAgentSnapshot(_agentId: string, _scrollOffset?: number): AnsiOutput | null {
     return null;
   }
 
@@ -318,9 +303,7 @@ export class InProcessBackend implements Backend {
     const currentIndex = this.agentOrder.indexOf(this.activeAgentId);
     if (currentIndex === -1) return this.agentOrder[0] ?? null;
 
-    const nextIndex =
-      (currentIndex + direction + this.agentOrder.length) %
-      this.agentOrder.length;
+    const nextIndex = (currentIndex + direction + this.agentOrder.length) % this.agentOrder.length;
     return this.agentOrder[nextIndex] ?? null;
   }
 }
@@ -341,7 +324,7 @@ async function createPerAgentConfig(
   base: Config,
   cwd: string,
   modelId?: string,
-  authOverrides?: InProcessSpawnConfig['authOverrides'],
+  authOverrides?: InProcessSpawnConfig["authOverrides"],
 ): Promise<Config> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const override = Object.create(base) as any;
@@ -356,29 +339,19 @@ async function createPerAgentConfig(
   const agentFileService = new FileDiscoveryService(cwd);
   override.getFileService = () => agentFileService;
 
-  const agentRegistry: ToolRegistry = await override.createToolRegistry(
-    undefined,
-    { skipDiscovery: true },
-  );
+  const agentRegistry: ToolRegistry = await override.createToolRegistry(undefined, {
+    skipDiscovery: true,
+  });
   agentRegistry.copyDiscoveredToolsFrom(base.getToolRegistry());
   override.getToolRegistry = () => agentRegistry;
 
   if (authOverrides?.authType) {
     try {
-      const agentGeneratorConfig = buildAgentContentGeneratorConfig(
-        base,
-        modelId,
-        authOverrides,
-      );
-      const agentGenerator = await createContentGenerator(
-        agentGeneratorConfig,
-        override as Config,
-      );
+      const agentGeneratorConfig = buildAgentContentGeneratorConfig(base, modelId, authOverrides);
+      const agentGenerator = await createContentGenerator(agentGeneratorConfig, override as Config);
       override.getContentGenerator = (): ContentGenerator => agentGenerator;
-      override.getContentGeneratorConfig = (): ContentGeneratorConfig =>
-        agentGeneratorConfig;
-      override.getAuthType = (): AuthType | undefined =>
-        agentGeneratorConfig.authType;
+      override.getContentGeneratorConfig = (): ContentGeneratorConfig => agentGeneratorConfig;
+      override.getAuthType = (): AuthType | undefined => agentGeneratorConfig.authType;
       override.getModel = (): string => agentGeneratorConfig.model;
 
       debugLogger.info(
@@ -386,7 +359,7 @@ async function createPerAgentConfig(
       );
     } catch (error) {
       debugLogger.error(
-        'Failed to create per-agent ContentGenerator, falling back to parent:',
+        "Failed to create per-agent ContentGenerator, falling back to parent:",
         error,
       );
     }
diff --git a/packages/airiscode-core/src/agents/backends/TmuxBackend.ts b/packages/airiscode-core/src/agents/backends/TmuxBackend.ts
index adc75593f..fbe58d1b9 100644
--- a/packages/airiscode-core/src/agents/backends/TmuxBackend.ts
+++ b/packages/airiscode-core/src/agents/backends/TmuxBackend.ts
@@ -22,52 +22,52 @@
  * using `tiled` layout in a separate session/window.
  */
 
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import type { AnsiOutput } from '../../utils/terminalSerializer.js';
-import { DISPLAY_MODE } from './types.js';
-import type { AgentSpawnConfig, AgentExitCallback, Backend } from './types.js';
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import type { AnsiOutput } from "../../utils/terminalSerializer.js";
 import {
-  verifyTmux,
-  tmuxCurrentWindowTarget,
+  type TmuxPaneInfo,
   tmuxCurrentPaneId,
+  tmuxCurrentWindowTarget,
+  tmuxGetFirstPaneId,
   tmuxHasSession,
   tmuxHasWindow,
+  tmuxKillPane,
+  tmuxKillSession,
+  tmuxListPanes,
   tmuxNewSession,
   tmuxNewWindow,
-  tmuxSplitWindow,
-  tmuxSendKeys,
+  tmuxResizePane,
+  tmuxRespawnPane,
+  tmuxSelectLayout,
   tmuxSelectPane,
-  tmuxSelectPaneTitle,
   tmuxSelectPaneStyle,
-  tmuxSelectLayout,
-  tmuxListPanes,
+  tmuxSelectPaneTitle,
+  tmuxSendKeys,
   tmuxSetOption,
-  tmuxRespawnPane,
-  tmuxKillPane,
-  tmuxKillSession,
-  tmuxResizePane,
-  tmuxGetFirstPaneId,
-  type TmuxPaneInfo,
-} from './tmux-commands.js';
+  tmuxSplitWindow,
+  verifyTmux,
+} from "./tmux-commands.js";
+import type { AgentExitCallback, AgentSpawnConfig, Backend } from "./types.js";
+import { DISPLAY_MODE } from "./types.js";
 
-const debugLogger = createDebugLogger('TMUX_BACKEND');
+const debugLogger = createDebugLogger("TMUX_BACKEND");
 
 /** Polling interval for exit detection (ms) */
 const EXIT_POLL_INTERVAL_MS = 500;
 
 /** Default tmux server name prefix (for -L) when running outside tmux.
  *  Actual name is `${prefix}-${process.pid}` so each leader process is isolated. */
-const TMUX_SERVER_PREFIX = 'arena-server';
+const TMUX_SERVER_PREFIX = "arena-server";
 /** Default tmux session name when running outside tmux */
-const DEFAULT_TMUX_SESSION = 'arena-view';
+const DEFAULT_TMUX_SESSION = "arena-view";
 /** Default tmux window name when running outside tmux */
-const DEFAULT_TMUX_WINDOW = 'arena-view';
+const DEFAULT_TMUX_WINDOW = "arena-view";
 /** Default leader pane width percent (main pane) */
 const DEFAULT_LEADER_WIDTH_PERCENT = 30;
 /** Default first split percent (right side) */
 const DEFAULT_FIRST_SPLIT_PERCENT = 70;
 /** Default pane border format */
-const DEFAULT_PANE_BORDER_FORMAT = '#{pane_title}';
+const DEFAULT_PANE_BORDER_FORMAT = "#{pane_title}";
 /** Layout settle delays */
 const INTERNAL_LAYOUT_SETTLE_MS = 200;
 const EXTERNAL_LAYOUT_SETTLE_MS = 120;
@@ -75,7 +75,7 @@ const EXTERNAL_LAYOUT_SETTLE_MS = 120;
 interface TmuxAgentPane {
   agentId: string;
   paneId: string;
-  status: 'running' | 'exited';
+  status: "running" | "exited";
   exitCode: number;
 }
 
@@ -87,7 +87,7 @@ interface ResolvedTmuxOptions {
   paneBorderStyle?: string;
   paneActiveBorderStyle?: string;
   paneBorderFormat: string;
-  paneBorderStatus?: 'top' | 'bottom' | 'off';
+  paneBorderStatus?: "top" | "bottom" | "off";
   leaderPaneWidthPercent: number;
   firstSplitPercent: number;
 }
@@ -96,9 +96,9 @@ export class TmuxBackend implements Backend {
   readonly type = DISPLAY_MODE.TMUX;
 
   /** The pane ID where the main process runs (left side) */
-  private mainPaneId = '';
+  private mainPaneId = "";
   /** Window target (session:window) */
-  private windowTarget = '';
+  private windowTarget = "";
   /** Whether we are running inside tmux */
   private insideTmux = false;
   /** External tmux server name (when outside tmux) */
@@ -126,7 +126,7 @@ export class TmuxBackend implements Backend {
     // Verify tmux is available and version is sufficient
     await verifyTmux();
 
-    this.insideTmux = Boolean(process.env['TMUX']);
+    this.insideTmux = Boolean(process.env["TMUX"]);
 
     if (this.insideTmux) {
       // Get the current pane ID (this is where the main process runs)
@@ -136,9 +136,7 @@ export class TmuxBackend implements Backend {
         `Initialized inside tmux: pane ${this.mainPaneId}, window ${this.windowTarget}`,
       );
     } else {
-      debugLogger.info(
-        'Initialized outside tmux; will use external tmux server',
-      );
+      debugLogger.info("Initialized outside tmux; will use external tmux server");
     }
 
     this.initialized = true;
@@ -148,7 +146,7 @@ export class TmuxBackend implements Backend {
 
   async spawnAgent(config: AgentSpawnConfig): Promise<void> {
     if (!this.initialized) {
-      throw new Error('TmuxBackend not initialized. Call init() first.');
+      throw new Error("TmuxBackend not initialized. Call init() first.");
     }
     if (this.panes.has(config.agentId)) {
       throw new Error(`Agent "${config.agentId}" already exists.`);
@@ -164,19 +162,14 @@ export class TmuxBackend implements Backend {
     // Chain spawn operations to ensure they run sequentially.
     // This prevents race conditions where multiple agents all see
     // panes.size === 0 and try to split from mainPaneId.
-    const spawnPromise = this.spawnQueue.then(() =>
-      this.spawnAgentAsync(config, cmd),
-    );
+    const spawnPromise = this.spawnQueue.then(() => this.spawnAgentAsync(config, cmd));
     this.spawnQueue = spawnPromise;
 
     // Wait for this specific spawn to complete
     await spawnPromise;
   }
 
-  private async spawnAgentAsync(
-    config: AgentSpawnConfig,
-    cmd: string,
-  ): Promise<void> {
+  private async spawnAgentAsync(config: AgentSpawnConfig, cmd: string): Promise<void> {
     const { agentId } = config;
     const options = this.resolveTmuxOptions(config);
 
@@ -184,7 +177,7 @@ export class TmuxBackend implements Backend {
       `[spawnAgentAsync] Starting spawn for agent "${agentId}", mainPane="${this.mainPaneId}", currentPanesCount=${this.panes.size}`,
     );
     try {
-      let paneId = '';
+      let paneId = "";
       if (this.insideTmux) {
         paneId = await this.spawnInsideTmux(cmd, options);
       } else {
@@ -194,7 +187,7 @@ export class TmuxBackend implements Backend {
       const serverName = this.getServerName();
 
       // Set remain-on-exit so we can detect when the process exits
-      await tmuxSetOption(paneId, 'remain-on-exit', 'on', serverName);
+      await tmuxSetOption(paneId, "remain-on-exit", "on", serverName);
 
       // Apply pane title/border styling
       await this.applyPaneDecorations(paneId, options, serverName);
@@ -213,7 +206,7 @@ export class TmuxBackend implements Backend {
       const agentPane: TmuxAgentPane = {
         agentId,
         paneId,
-        status: 'running',
+        status: "running",
         exitCode: 0,
       };
 
@@ -228,19 +221,14 @@ export class TmuxBackend implements Backend {
       // Start exit polling if not already running
       this.startExitPolling();
 
-      debugLogger.info(
-        `[spawnAgentAsync] Spawned agent "${agentId}" in pane ${paneId} — SUCCESS`,
-      );
+      debugLogger.info(`[spawnAgentAsync] Spawned agent "${agentId}" in pane ${paneId} — SUCCESS`);
     } catch (error) {
-      debugLogger.error(
-        `[spawnAgentAsync] Failed to spawn agent "${agentId}":`,
-        error,
-      );
+      debugLogger.error(`[spawnAgentAsync] Failed to spawn agent "${agentId}":`, error);
       // Still register the agent as failed so exit callback fires
       this.panes.set(agentId, {
         agentId,
-        paneId: '',
-        status: 'exited',
+        paneId: "",
+        status: "exited",
         exitCode: 1,
       });
       this.agentOrder.push(agentId);
@@ -261,15 +249,13 @@ export class TmuxBackend implements Backend {
       try {
         // Method 1: Emit resize event on stdout (Ink listens to this)
         if (process.stdout.isTTY) {
-          process.stdout.emit('resize');
-          debugLogger.info(
-            '[triggerMainProcessRedraw] Emitted stdout resize event',
-          );
+          process.stdout.emit("resize");
+          debugLogger.info("[triggerMainProcessRedraw] Emitted stdout resize event");
         }
 
         // Method 2: Send SIGWINCH signal
-        process.kill(process.pid, 'SIGWINCH');
-        debugLogger.info('[triggerMainProcessRedraw] Sent SIGWINCH');
+        process.kill(process.pid, "SIGWINCH");
+        debugLogger.info("[triggerMainProcessRedraw] Sent SIGWINCH");
       } catch (error) {
         debugLogger.info(`[triggerMainProcessRedraw] Failed: ${error}`);
       }
@@ -278,23 +264,23 @@ export class TmuxBackend implements Backend {
 
   stopAgent(agentId: string): void {
     const pane = this.panes.get(agentId);
-    if (!pane || pane.status !== 'running') return;
+    if (!pane || pane.status !== "running") return;
     // Kill the pane outright — a single Ctrl-C only cancels the current
     // turn in interactive CLI agents and does not reliably exit the process.
     if (pane.paneId) {
       void tmuxKillPane(pane.paneId, this.getServerName());
     }
-    pane.status = 'exited';
+    pane.status = "exited";
     debugLogger.info(`Killed pane for agent "${agentId}"`);
   }
 
   stopAll(): void {
     for (const [agentId, pane] of this.panes.entries()) {
-      if (pane.status === 'running') {
+      if (pane.status === "running") {
         if (pane.paneId) {
           void tmuxKillPane(pane.paneId, this.getServerName());
         }
-        pane.status = 'exited';
+        pane.status = "exited";
         debugLogger.info(`Killed pane for agent "${agentId}"`);
       }
     }
@@ -312,9 +298,7 @@ export class TmuxBackend implements Backend {
           debugLogger.info(`Killed agent pane ${pane.paneId}`);
         } catch (_error) {
           // Pane may already be gone
-          debugLogger.info(
-            `Failed to kill pane ${pane.paneId} (may already be gone)`,
-          );
+          debugLogger.info(`Failed to kill pane ${pane.paneId} (may already be gone)`);
         }
       }
     }
@@ -327,9 +311,7 @@ export class TmuxBackend implements Backend {
           `Killed external tmux session "${this.sessionName}" on server "${this.serverName}"`,
         );
       } catch (_error) {
-        debugLogger.info(
-          `Failed to kill external tmux session (may already be gone)`,
-        );
+        debugLogger.info(`Failed to kill external tmux session (may already be gone)`);
       }
     }
 
@@ -339,8 +321,8 @@ export class TmuxBackend implements Backend {
     this.serverName = null;
     this.sessionName = null;
     this.windowName = null;
-    this.windowTarget = '';
-    this.mainPaneId = '';
+    this.windowTarget = "";
+    this.mainPaneId = "";
   }
 
   setOnAgentExit(callback: AgentExitCallback): void {
@@ -383,16 +365,15 @@ export class TmuxBackend implements Backend {
 
   switchToNext(): void {
     if (this.agentOrder.length <= 1) return;
-    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? '');
+    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? "");
     const nextIndex = (currentIndex + 1) % this.agentOrder.length;
     this.switchTo(this.agentOrder[nextIndex]!);
   }
 
   switchToPrevious(): void {
     if (this.agentOrder.length <= 1) return;
-    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? '');
-    const prevIndex =
-      (currentIndex - 1 + this.agentOrder.length) % this.agentOrder.length;
+    const currentIndex = this.agentOrder.indexOf(this.activeAgentId ?? "");
+    const prevIndex = (currentIndex - 1 + this.agentOrder.length) % this.agentOrder.length;
     this.switchTo(this.agentOrder[prevIndex]!);
   }
 
@@ -407,10 +388,7 @@ export class TmuxBackend implements Backend {
     return this.getAgentSnapshot(this.activeAgentId);
   }
 
-  getAgentSnapshot(
-    agentId: string,
-    _scrollOffset: number = 0,
-  ): AnsiOutput | null {
+  getAgentSnapshot(agentId: string, _scrollOffset: number = 0): AnsiOutput | null {
     // tmux panes are rendered by tmux itself. capture-pane is available
     // but returns raw text. For the progress bar we don't need snapshots;
     // full rendering is handled by tmux directly.
@@ -432,13 +410,8 @@ export class TmuxBackend implements Backend {
 
   writeToAgent(agentId: string, data: string): boolean {
     const pane = this.panes.get(agentId);
-    if (!pane || pane.status !== 'running') return false;
-    void tmuxSendKeys(
-      pane.paneId,
-      data,
-      { literal: true },
-      this.getServerName(),
-    );
+    if (!pane || pane.status !== "running") return false;
+    void tmuxSendKeys(pane.paneId, data, { literal: true }, this.getServerName());
     return true;
   }
 
@@ -473,10 +446,8 @@ export class TmuxBackend implements Backend {
       paneBorderStyle: opts.paneBorderStyle,
       paneActiveBorderStyle: opts.paneActiveBorderStyle,
       paneBorderFormat: opts.paneBorderFormat ?? DEFAULT_PANE_BORDER_FORMAT,
-      paneBorderStatus:
-        opts.paneBorderStatus ?? (this.insideTmux ? undefined : 'top'),
-      leaderPaneWidthPercent:
-        opts.leaderPaneWidthPercent ?? DEFAULT_LEADER_WIDTH_PERCENT,
+      paneBorderStatus: opts.paneBorderStatus ?? (this.insideTmux ? undefined : "top"),
+      leaderPaneWidthPercent: opts.leaderPaneWidthPercent ?? DEFAULT_LEADER_WIDTH_PERCENT,
       firstSplitPercent: opts.firstSplitPercent ?? DEFAULT_FIRST_SPLIT_PERCENT,
     };
   }
@@ -489,12 +460,7 @@ export class TmuxBackend implements Backend {
     config: AgentSpawnConfig,
     options: ResolvedTmuxOptions,
   ): Promise<void> {
-    if (
-      this.windowTarget &&
-      this.serverName &&
-      this.sessionName &&
-      this.windowName
-    ) {
+    if (this.windowTarget && this.serverName && this.sessionName && this.windowName) {
       return;
     }
 
@@ -532,12 +498,9 @@ export class TmuxBackend implements Backend {
     }
   }
 
-  private async spawnInsideTmux(
-    cmd: string,
-    options: ResolvedTmuxOptions,
-  ): Promise<string> {
+  private async spawnInsideTmux(cmd: string, options: ResolvedTmuxOptions): Promise<string> {
     if (!this.windowTarget) {
-      throw new Error('Tmux window target not initialized.');
+      throw new Error("Tmux window target not initialized.");
     }
 
     const panes = await tmuxListPanes(this.windowTarget);
@@ -556,7 +519,7 @@ export class TmuxBackend implements Backend {
     const splitTarget = this.pickMiddlePane(panes).paneId;
     const horizontal = this.shouldSplitHorizontally(paneCount);
     debugLogger.info(
-      `[spawnInsideTmux] Split from middle pane ${splitTarget} (${paneCount} panes, ${horizontal ? 'horizontal' : 'vertical'})`,
+      `[spawnInsideTmux] Split from middle pane ${splitTarget} (${paneCount} panes, ${horizontal ? "horizontal" : "vertical"})`,
     );
     return await tmuxSplitWindow(splitTarget, {
       horizontal,
@@ -571,20 +534,15 @@ export class TmuxBackend implements Backend {
   ): Promise<string> {
     await this.ensureExternalSession(config, options);
     if (!this.windowTarget) {
-      throw new Error('External tmux window target not initialized.');
+      throw new Error("External tmux window target not initialized.");
     }
 
     const serverName = this.getServerName();
 
     if (this.panes.size === 0) {
-      const firstPaneId = await tmuxGetFirstPaneId(
-        this.windowTarget,
-        serverName,
-      );
+      const firstPaneId = await tmuxGetFirstPaneId(this.windowTarget, serverName);
       this.mainPaneId = firstPaneId;
-      debugLogger.info(
-        `[spawnOutsideTmux] First agent — respawn in pane ${firstPaneId}`,
-      );
+      debugLogger.info(`[spawnOutsideTmux] First agent — respawn in pane ${firstPaneId}`);
       await tmuxRespawnPane(firstPaneId, cmd, serverName);
       return firstPaneId;
     }
@@ -593,18 +551,14 @@ export class TmuxBackend implements Backend {
     const splitTarget = this.pickMiddlePane(panes).paneId;
     const horizontal = this.shouldSplitHorizontally(panes.length);
     debugLogger.info(
-      `[spawnOutsideTmux] Split from middle pane ${splitTarget} (${panes.length} panes, ${horizontal ? 'horizontal' : 'vertical'})`,
-    );
-    return await tmuxSplitWindow(
-      splitTarget,
-      { horizontal, command: cmd },
-      serverName,
+      `[spawnOutsideTmux] Split from middle pane ${splitTarget} (${panes.length} panes, ${horizontal ? "horizontal" : "vertical"})`,
     );
+    return await tmuxSplitWindow(splitTarget, { horizontal, command: cmd }, serverName);
   }
 
   private pickMiddlePane(panes: TmuxPaneInfo[]): TmuxPaneInfo {
     if (panes.length === 0) {
-      throw new Error('No panes available to split.');
+      throw new Error("No panes available to split.");
     }
     return panes[Math.floor(panes.length / 2)]!;
   }
@@ -623,7 +577,7 @@ export class TmuxBackend implements Backend {
     if (options.paneBorderStatus) {
       await tmuxSetOption(
         this.windowTarget,
-        'pane-border-status',
+        "pane-border-status",
         options.paneBorderStatus,
         serverName,
       );
@@ -632,7 +586,7 @@ export class TmuxBackend implements Backend {
     if (options.paneBorderFormat) {
       await tmuxSetOption(
         this.windowTarget,
-        'pane-border-format',
+        "pane-border-format",
         options.paneBorderFormat,
         serverName,
       );
@@ -641,7 +595,7 @@ export class TmuxBackend implements Backend {
     if (options.paneBorderStyle) {
       await tmuxSetOption(
         this.windowTarget,
-        'pane-border-style',
+        "pane-border-style",
         options.paneBorderStyle,
         serverName,
       );
@@ -651,7 +605,7 @@ export class TmuxBackend implements Backend {
     if (options.paneActiveBorderStyle) {
       await tmuxSetOption(
         this.windowTarget,
-        'pane-active-border-style',
+        "pane-active-border-style",
         options.paneActiveBorderStyle,
         serverName,
       );
@@ -662,7 +616,7 @@ export class TmuxBackend implements Backend {
 
   private async applyInsideLayout(options: ResolvedTmuxOptions): Promise<void> {
     if (!this.windowTarget || !this.mainPaneId) return;
-    await tmuxSelectLayout(this.windowTarget, 'main-vertical');
+    await tmuxSelectLayout(this.windowTarget, "main-vertical");
     await tmuxResizePane(this.mainPaneId, {
       width: `${options.leaderPaneWidthPercent}%`,
     });
@@ -670,7 +624,7 @@ export class TmuxBackend implements Backend {
 
   private async applyExternalLayout(serverName?: string): Promise<void> {
     if (!this.windowTarget) return;
-    await tmuxSelectLayout(this.windowTarget, 'tiled', serverName);
+    await tmuxSelectLayout(this.windowTarget, "tiled", serverName);
   }
 
   private async sleep(ms: number): Promise<void> {
@@ -686,20 +640,17 @@ export class TmuxBackend implements Backend {
       }
     }
 
-    const cmdParts = [
-      shellQuote(config.command),
-      ...config.args.map(shellQuote),
-    ];
+    const cmdParts = [shellQuote(config.command), ...config.args.map(shellQuote)];
 
     // cd to the working directory first
     const parts = [`cd ${shellQuote(config.cwd)}`];
     if (envParts.length > 0) {
-      parts.push(`env ${envParts.join(' ')} ${cmdParts.join(' ')}`);
+      parts.push(`env ${envParts.join(" ")} ${cmdParts.join(" ")}`);
     } else {
-      parts.push(cmdParts.join(' '));
+      parts.push(cmdParts.join(" "));
     }
 
-    const fullCommand = parts.join(' && ');
+    const fullCommand = parts.join(" && ");
     debugLogger.info(
       `[buildShellCommand] agentId=${config.agentId}, command=${config.command}, args=${JSON.stringify(config.args)}, cwd=${config.cwd}`,
     );
@@ -711,7 +662,7 @@ export class TmuxBackend implements Backend {
     if (this.pendingSpawns > 0) return false;
     if (this.panes.size === 0) return true;
     for (const pane of this.panes.values()) {
-      if (pane.status === 'running') return false;
+      if (pane.status === "running") return false;
     }
     return true;
   }
@@ -771,12 +722,12 @@ export class TmuxBackend implements Backend {
     }
 
     for (const agent of this.panes.values()) {
-      if (agent.status !== 'running') continue;
+      if (agent.status !== "running") continue;
 
       const info = paneMap.get(agent.paneId);
       if (!info) {
         // Pane was killed externally — treat as exited
-        agent.status = 'exited';
+        agent.status = "exited";
         agent.exitCode = 1;
         debugLogger.info(
           `[pollPaneStatus] Agent "${agent.agentId}" pane ${agent.paneId} not found in tmux list — marking as exited`,
@@ -786,7 +737,7 @@ export class TmuxBackend implements Backend {
       }
 
       if (info.dead) {
-        agent.status = 'exited';
+        agent.status = "exited";
         agent.exitCode = info.deadStatus;
 
         debugLogger.info(
diff --git a/packages/airiscode-core/src/agents/backends/detect.ts b/packages/airiscode-core/src/agents/backends/detect.ts
index f94d8c41d..8b1330eb2 100644
--- a/packages/airiscode-core/src/agents/backends/detect.ts
+++ b/packages/airiscode-core/src/agents/backends/detect.ts
@@ -4,14 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import type { Config } from '../../config/config.js';
+import type { Config } from "../../config/config.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
 // import { TmuxBackend } from './TmuxBackend.js';
-import { InProcessBackend } from './InProcessBackend.js';
-import { type Backend, DISPLAY_MODE, type DisplayMode } from './types.js';
+import { InProcessBackend } from "./InProcessBackend.js";
+import { type Backend, DISPLAY_MODE, type DisplayMode } from "./types.js";
+
 // import { isTmuxAvailable } from './tmux-commands.js';
 
-const debugLogger = createDebugLogger('BACKEND_DETECT');
+const debugLogger = createDebugLogger("BACKEND_DETECT");
 
 export interface DetectBackendResult {
   backend: Backend;
@@ -41,7 +42,7 @@ export async function detectBackend(
     preference && preference !== DISPLAY_MODE.IN_PROCESS
       ? `Display mode "${preference}" is not currently supported. Using in-process mode instead.`
       : undefined;
-  debugLogger.info('Using InProcessBackend');
+  debugLogger.info("Using InProcessBackend");
   return { backend: new InProcessBackend(runtimeContext), warning };
 
   // --- Disabled backends (kept for future use) ---
diff --git a/packages/airiscode-core/src/agents/backends/index.ts b/packages/airiscode-core/src/agents/backends/index.ts
index 6105fe45c..58e097022 100644
--- a/packages/airiscode-core/src/agents/backends/index.ts
+++ b/packages/airiscode-core/src/agents/backends/index.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { DISPLAY_MODE } from './types.js';
+export { type DetectBackendResult, detectBackend } from "./detect.js";
+export { InProcessBackend } from "./InProcessBackend.js";
+export { ITermBackend } from "./ITermBackend.js";
+export { TmuxBackend } from "./TmuxBackend.js";
 export type {
+  AgentExitCallback,
+  AgentSpawnConfig,
   Backend,
   DisplayMode,
-  AgentSpawnConfig,
-  AgentExitCallback,
-  TmuxBackendOptions,
   InProcessSpawnConfig,
-} from './types.js';
-export { TmuxBackend } from './TmuxBackend.js';
-export { ITermBackend } from './ITermBackend.js';
-export { InProcessBackend } from './InProcessBackend.js';
-export { detectBackend, type DetectBackendResult } from './detect.js';
+  TmuxBackendOptions,
+} from "./types.js";
+export { DISPLAY_MODE } from "./types.js";
diff --git a/packages/airiscode-core/src/agents/backends/iterm-it2.ts b/packages/airiscode-core/src/agents/backends/iterm-it2.ts
index cf550b912..c9af2c080 100644
--- a/packages/airiscode-core/src/agents/backends/iterm-it2.ts
+++ b/packages/airiscode-core/src/agents/backends/iterm-it2.ts
@@ -11,18 +11,18 @@
  * AppleScript to match the Team design spec.
  */
 
-import { execCommand, isCommandAvailable } from '../../utils/shell-utils.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { execCommand, isCommandAvailable } from "../../utils/shell-utils.js";
 
-const debugLogger = createDebugLogger('ITERM_IT2');
+const debugLogger = createDebugLogger("ITERM_IT2");
 
 // ─── Helpers ────────────────────────────────────────────────────
 
 async function it2Result(
   args: string[],
 ): Promise<{ stdout: string; stderr: string; code: number }> {
-  debugLogger.info(`it2 ${args.join(' ')}`);
-  const result = await execCommand('it2', args, {
+  debugLogger.info(`it2 ${args.join(" ")}`);
+  const result = await execCommand("it2", args, {
     preserveOutputOnError: true,
   });
   if (result.code !== 0 && result.stderr.trim()) {
@@ -35,7 +35,7 @@ async function it2(args: string[]): Promise<string> {
   const result = await it2Result(args);
   if (result.code !== 0) {
     const message = result.stderr.trim() || result.stdout.trim();
-    throw new Error(message || 'it2 command failed');
+    throw new Error(message || "it2 command failed");
   }
   return result.stdout;
 }
@@ -51,13 +51,10 @@ function parseCreatedPaneId(output: string): string {
 // ─── Installation & Verification ───────────────────────────────
 
 export function isIt2Available(): boolean {
-  return isCommandAvailable('it2').available;
+  return isCommandAvailable("it2").available;
 }
 
-async function tryInstallIt2(
-  command: string,
-  args: string[],
-): Promise<boolean> {
+async function tryInstallIt2(command: string, args: string[]): Promise<boolean> {
   if (!isCommandAvailable(command).available) return false;
   const result = await execCommand(command, args, {
     preserveOutputOnError: true,
@@ -69,9 +66,9 @@ export async function ensureIt2Installed(): Promise<void> {
   if (isIt2Available()) return;
 
   const installers: Array<{ cmd: string; args: string[] }> = [
-    { cmd: 'uv', args: ['tool', 'install', 'it2'] },
-    { cmd: 'pipx', args: ['install', 'it2'] },
-    { cmd: 'pip', args: ['install', '--user', 'it2'] },
+    { cmd: "uv", args: ["tool", "install", "it2"] },
+    { cmd: "pipx", args: ["install", "it2"] },
+    { cmd: "pip", args: ["install", "--user", "it2"] },
   ];
 
   for (const installer of installers) {
@@ -87,55 +84,47 @@ export async function ensureIt2Installed(): Promise<void> {
 export async function verifyITerm(): Promise<void> {
   await ensureIt2Installed();
 
-  const result = await it2Result(['session', 'list']);
+  const result = await it2Result(["session", "list"]);
   if (result.code === 0) return;
 
   const combined = `${result.stdout}\n${result.stderr}`.toLowerCase();
   if (
-    combined.includes('api') ||
-    combined.includes('python') ||
-    combined.includes('connection refused') ||
-    combined.includes('not enabled')
+    combined.includes("api") ||
+    combined.includes("python") ||
+    combined.includes("connection refused") ||
+    combined.includes("not enabled")
   ) {
     throw new Error(
-      'iTerm2 Python API not enabled. Enable it in iTerm2 → Settings → General → Magic → Enable Python API, then restart iTerm2.',
+      "iTerm2 Python API not enabled. Enable it in iTerm2 → Settings → General → Magic → Enable Python API, then restart iTerm2.",
     );
   }
 
-  throw new Error(
-    `it2 session list failed: ${result.stderr.trim() || result.stdout.trim()}`,
-  );
+  throw new Error(`it2 session list failed: ${result.stderr.trim() || result.stdout.trim()}`);
 }
 
 // ─── Public API ─────────────────────────────────────────────────
 
 export async function itermSplitPane(sessionId?: string): Promise<string> {
-  const args = ['session', 'split', '-v'];
+  const args = ["session", "split", "-v"];
   if (sessionId) {
-    args.push('-s', sessionId);
+    args.push("-s", sessionId);
   }
   const output = await it2(args);
   return parseCreatedPaneId(output);
 }
 
-export async function itermRunCommand(
-  sessionId: string,
-  command: string,
-): Promise<void> {
-  await it2(['session', 'run', '-s', sessionId, command]);
+export async function itermRunCommand(sessionId: string, command: string): Promise<void> {
+  await it2(["session", "run", "-s", sessionId, command]);
 }
 
 export async function itermFocusSession(sessionId: string): Promise<void> {
-  await it2(['session', 'focus', sessionId]);
+  await it2(["session", "focus", sessionId]);
 }
 
-export async function itermSendText(
-  sessionId: string,
-  text: string,
-): Promise<void> {
-  await it2(['session', 'send', '-s', sessionId, text]);
+export async function itermSendText(sessionId: string, text: string): Promise<void> {
+  await it2(["session", "send", "-s", sessionId, text]);
 }
 
 export async function itermCloseSession(sessionId: string): Promise<void> {
-  await it2(['session', 'close', '-s', sessionId]);
+  await it2(["session", "close", "-s", sessionId]);
 }
diff --git a/packages/airiscode-core/src/agents/backends/tmux-commands.ts b/packages/airiscode-core/src/agents/backends/tmux-commands.ts
index 6400a72da..1164a882a 100644
--- a/packages/airiscode-core/src/agents/backends/tmux-commands.ts
+++ b/packages/airiscode-core/src/agents/backends/tmux-commands.ts
@@ -11,10 +11,10 @@
  * avoiding shell injection by passing arguments as arrays (execFile).
  */
 
-import { execCommand, isCommandAvailable } from '../../utils/shell-utils.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { execCommand, isCommandAvailable } from "../../utils/shell-utils.js";
 
-const debugLogger = createDebugLogger('TMUX_CMD');
+const debugLogger = createDebugLogger("TMUX_CMD");
 
 /**
  * Information about a tmux pane, parsed from `list-panes`.
@@ -41,7 +41,7 @@ export interface TmuxWindowInfo {
 /**
  * Minimum tmux version required for split-pane support.
  */
-const MIN_TMUX_VERSION = '3.0';
+const MIN_TMUX_VERSION = "3.0";
 
 // ─── Helpers ────────────────────────────────────────────────────
 
@@ -49,9 +49,9 @@ async function tmuxResult(
   args: string[],
   serverName?: string,
 ): Promise<{ stdout: string; stderr: string; code: number }> {
-  const fullArgs = serverName ? ['-L', serverName, ...args] : args;
-  debugLogger.info(`tmux ${fullArgs.join(' ')}`);
-  const result = await execCommand('tmux', fullArgs, {
+  const fullArgs = serverName ? ["-L", serverName, ...args] : args;
+  debugLogger.info(`tmux ${fullArgs.join(" ")}`);
+  const result = await execCommand("tmux", fullArgs, {
     preserveOutputOnError: true,
   });
   if (result.code !== 0 && result.stderr.trim()) {
@@ -90,14 +90,14 @@ function isVersionAtLeast(current: string, minimum: string): boolean {
  * Check if tmux is available on the system.
  */
 export function isTmuxAvailable(): boolean {
-  return isCommandAvailable('tmux').available;
+  return isCommandAvailable("tmux").available;
 }
 
 /**
  * Get tmux version string (e.g., "tmux 3.4").
  */
 export async function tmuxVersion(): Promise<string> {
-  const output = await tmux(['-V']);
+  const output = await tmux(["-V"]);
   return output.trim();
 }
 
@@ -108,9 +108,7 @@ export async function tmuxVersion(): Promise<string> {
  */
 export async function verifyTmux(): Promise<void> {
   if (!isTmuxAvailable()) {
-    throw new Error(
-      'tmux is not installed. Install tmux (version 3.0+) for split-pane mode.',
-    );
+    throw new Error("tmux is not installed. Install tmux (version 3.0+) for split-pane mode.");
   }
 
   const version = await tmuxVersion();
@@ -125,7 +123,7 @@ export async function verifyTmux(): Promise<void> {
  * Get the current tmux session name (when running inside tmux).
  */
 export async function tmuxCurrentSession(): Promise<string> {
-  const output = await tmux(['display-message', '-p', '#{session_name}']);
+  const output = await tmux(["display-message", "-p", "#{session_name}"]);
   return output.trim();
 }
 
@@ -133,7 +131,7 @@ export async function tmuxCurrentSession(): Promise<string> {
  * Get the current tmux pane ID (when running inside tmux).
  */
 export async function tmuxCurrentPaneId(): Promise<string> {
-  const output = await tmux(['display-message', '-p', '#{pane_id}']);
+  const output = await tmux(["display-message", "-p", "#{pane_id}"]);
   return output.trim();
 }
 
@@ -141,22 +139,15 @@ export async function tmuxCurrentPaneId(): Promise<string> {
  * Get the current tmux window target (session:window_index).
  */
 export async function tmuxCurrentWindowTarget(): Promise<string> {
-  const output = await tmux([
-    'display-message',
-    '-p',
-    '#{session_name}:#{window_index}',
-  ]);
+  const output = await tmux(["display-message", "-p", "#{session_name}:#{window_index}"]);
   return output.trim();
 }
 
 /**
  * Check if a tmux session exists.
  */
-export async function tmuxHasSession(
-  name: string,
-  serverName?: string,
-): Promise<boolean> {
-  const result = await tmuxResult(['has-session', '-t', name], serverName);
+export async function tmuxHasSession(name: string, serverName?: string): Promise<boolean> {
+  const result = await tmuxResult(["has-session", "-t", name], serverName);
   return result.code === 0;
 }
 
@@ -168,11 +159,11 @@ export async function tmuxListWindows(
   serverName?: string,
 ): Promise<TmuxWindowInfo[]> {
   const output = await tmux(
-    ['list-windows', '-t', sessionName, '-F', '#{window_name} #{window_id}'],
+    ["list-windows", "-t", sessionName, "-F", "#{window_name} #{window_id}"],
     serverName,
   );
   const windows: TmuxWindowInfo[] = [];
-  for (const line of output.trim().split('\n')) {
+  for (const line of output.trim().split("\n")) {
     if (!line.trim()) continue;
     const [name, id] = line.trim().split(/\s+/, 2);
     if (!name || !id) continue;
@@ -201,10 +192,10 @@ export async function tmuxNewSession(
   opts?: { cols?: number; rows?: number; windowName?: string },
   serverName?: string,
 ): Promise<void> {
-  const args = ['new-session', '-d', '-s', name];
-  if (opts?.windowName) args.push('-n', opts.windowName);
-  if (opts?.cols) args.push('-x', String(opts.cols));
-  if (opts?.rows) args.push('-y', String(opts.rows));
+  const args = ["new-session", "-d", "-s", name];
+  if (opts?.windowName) args.push("-n", opts.windowName);
+  if (opts?.cols) args.push("-x", String(opts.cols));
+  if (opts?.rows) args.push("-y", String(opts.rows));
   await tmux(args, serverName);
 }
 
@@ -218,10 +209,7 @@ export async function tmuxNewWindow(
 ): Promise<void> {
   // -t session: (with trailing colon) means "create window in this session"
   // -t session (without colon) means "create at window index = session", which fails if index exists
-  await tmux(
-    ['new-window', '-t', `${targetSession}:`, '-n', windowName],
-    serverName,
-  );
+  await tmux(["new-window", "-t", `${targetSession}:`, "-n", windowName], serverName);
 }
 
 /**
@@ -240,15 +228,15 @@ export async function tmuxSplitWindow(
   opts?: { horizontal?: boolean; percent?: number; command?: string },
   serverName?: string,
 ): Promise<string> {
-  const args = ['split-window', '-t', target];
+  const args = ["split-window", "-t", target];
   if (opts?.horizontal) {
-    args.push('-h');
+    args.push("-h");
   }
   if (opts?.percent !== undefined) {
-    args.push('-l', `${opts.percent}%`);
+    args.push("-l", `${opts.percent}%`);
   }
   // -P -F: print new pane info in the specified format
-  args.push('-P', '-F', '#{pane_id}');
+  args.push("-P", "-F", "#{pane_id}");
   if (opts?.command) {
     args.push(opts.command);
   }
@@ -269,13 +257,13 @@ export async function tmuxSendKeys(
   opts?: { literal?: boolean; enter?: boolean },
   serverName?: string,
 ): Promise<void> {
-  const args = ['send-keys', '-t', paneId];
+  const args = ["send-keys", "-t", paneId];
   if (opts?.literal) {
-    args.push('-l');
+    args.push("-l");
   }
   args.push(keys);
   if (opts?.enter) {
-    args.push('Enter');
+    args.push("Enter");
   }
   await tmux(args, serverName);
 }
@@ -283,11 +271,8 @@ export async function tmuxSendKeys(
 /**
  * Select (focus) a tmux pane.
  */
-export async function tmuxSelectPane(
-  paneId: string,
-  serverName?: string,
-): Promise<void> {
-  await tmux(['select-pane', '-t', paneId], serverName);
+export async function tmuxSelectPane(paneId: string, serverName?: string): Promise<void> {
+  await tmux(["select-pane", "-t", paneId], serverName);
 }
 
 /**
@@ -298,7 +283,7 @@ export async function tmuxSelectPaneTitle(
   title: string,
   serverName?: string,
 ): Promise<void> {
-  await tmux(['select-pane', '-t', paneId, '-T', title], serverName);
+  await tmux(["select-pane", "-t", paneId, "-T", title], serverName);
 }
 
 /**
@@ -309,7 +294,7 @@ export async function tmuxSelectPaneStyle(
   style: string,
   serverName?: string,
 ): Promise<void> {
-  await tmux(['select-pane', '-t', paneId, '-P', style], serverName);
+  await tmux(["select-pane", "-t", paneId, "-P", style], serverName);
 }
 
 /**
@@ -323,7 +308,7 @@ export async function tmuxSelectLayout(
   layout: string,
   serverName?: string,
 ): Promise<void> {
-  await tmux(['select-layout', '-t', target, layout], serverName);
+  await tmux(["select-layout", "-t", target, layout], serverName);
 }
 
 /**
@@ -331,12 +316,9 @@ export async function tmuxSelectLayout(
  *
  * @returns The captured pane content as a string.
  */
-export async function tmuxCapturePaneContent(
-  paneId: string,
-  serverName?: string,
-): Promise<string> {
+export async function tmuxCapturePaneContent(paneId: string, serverName?: string): Promise<string> {
   // -p: output to stdout, -e: include escape sequences
-  return await tmux(['capture-pane', '-t', paneId, '-p', '-e'], serverName);
+  return await tmux(["capture-pane", "-t", paneId, "-p", "-e"], serverName);
 }
 
 /**
@@ -345,18 +327,9 @@ export async function tmuxCapturePaneContent(
  * @param target - Target window (e.g., session:window)
  * @returns Array of pane information.
  */
-export async function tmuxListPanes(
-  target: string,
-  serverName?: string,
-): Promise<TmuxPaneInfo[]> {
+export async function tmuxListPanes(target: string, serverName?: string): Promise<TmuxPaneInfo[]> {
   const output = await tmux(
-    [
-      'list-panes',
-      '-t',
-      target,
-      '-F',
-      '#{pane_id} #{pane_dead} #{pane_dead_status}',
-    ],
+    ["list-panes", "-t", target, "-F", "#{pane_id} #{pane_dead} #{pane_dead_status}"],
     serverName,
   );
   return parseTmuxListPanes(output);
@@ -367,13 +340,13 @@ export async function tmuxListPanes(
  */
 export function parseTmuxListPanes(output: string): TmuxPaneInfo[] {
   const panes: TmuxPaneInfo[] = [];
-  for (const line of output.trim().split('\n')) {
+  for (const line of output.trim().split("\n")) {
     if (!line.trim()) continue;
     const parts = line.trim().split(/\s+/);
     if (parts.length < 2) continue;
     panes.push({
       paneId: parts[0]!,
-      dead: parts[1] === '1',
+      dead: parts[1] === "1",
       deadStatus: parts[2] ? parseInt(parts[2], 10) : 0,
     });
   }
@@ -389,7 +362,7 @@ export async function tmuxSetOption(
   value: string,
   serverName?: string,
 ): Promise<void> {
-  await tmux(['set-option', '-t', target, option, value], serverName);
+  await tmux(["set-option", "-t", target, option, value], serverName);
 }
 
 /**
@@ -407,7 +380,7 @@ export async function tmuxRespawnPane(
   command: string,
   serverName?: string,
 ): Promise<void> {
-  await tmux(['respawn-pane', '-k', '-t', paneId, command], serverName);
+  await tmux(["respawn-pane", "-k", "-t", paneId, command], serverName);
 }
 
 /**
@@ -418,7 +391,7 @@ export async function tmuxBreakPane(
   targetSession: string,
   serverName?: string,
 ): Promise<void> {
-  await tmux(['break-pane', '-s', paneId, '-t', targetSession], serverName);
+  await tmux(["break-pane", "-s", paneId, "-t", targetSession], serverName);
 }
 
 /**
@@ -429,17 +402,14 @@ export async function tmuxJoinPane(
   target: string,
   serverName?: string,
 ): Promise<void> {
-  await tmux(['join-pane', '-s', paneId, '-t', target], serverName);
+  await tmux(["join-pane", "-s", paneId, "-t", target], serverName);
 }
 
 /**
  * Kill a tmux pane.
  */
-export async function tmuxKillPane(
-  paneId: string,
-  serverName?: string,
-): Promise<void> {
-  await tmux(['kill-pane', '-t', paneId], serverName);
+export async function tmuxKillPane(paneId: string, serverName?: string): Promise<void> {
+  await tmux(["kill-pane", "-t", paneId], serverName);
 }
 
 /**
@@ -454,12 +424,12 @@ export async function tmuxResizePane(
   opts: { height?: number | string; width?: number | string },
   serverName?: string,
 ): Promise<void> {
-  const args = ['resize-pane', '-t', paneId];
+  const args = ["resize-pane", "-t", paneId];
   if (opts.height !== undefined) {
-    args.push('-y', String(opts.height));
+    args.push("-y", String(opts.height));
   }
   if (opts.width !== undefined) {
-    args.push('-x', String(opts.width));
+    args.push("-x", String(opts.width));
   }
   await tmux(args, serverName);
 }
@@ -467,35 +437,23 @@ export async function tmuxResizePane(
 /**
  * Kill a tmux session.
  */
-export async function tmuxKillSession(
-  name: string,
-  serverName?: string,
-): Promise<void> {
-  await tmux(['kill-session', '-t', name], serverName);
+export async function tmuxKillSession(name: string, serverName?: string): Promise<void> {
+  await tmux(["kill-session", "-t", name], serverName);
 }
 
 /**
  * Kill a tmux window.
  */
-export async function tmuxKillWindow(
-  target: string,
-  serverName?: string,
-): Promise<void> {
-  await tmux(['kill-window', '-t', target], serverName);
+export async function tmuxKillWindow(target: string, serverName?: string): Promise<void> {
+  await tmux(["kill-window", "-t", target], serverName);
 }
 
 /**
  * Get the first pane ID of a target window.
  */
-export async function tmuxGetFirstPaneId(
-  target: string,
-  serverName?: string,
-): Promise<string> {
-  const output = await tmux(
-    ['list-panes', '-t', target, '-F', '#{pane_id}'],
-    serverName,
-  );
-  const firstLine = output.trim().split('\n')[0];
+export async function tmuxGetFirstPaneId(target: string, serverName?: string): Promise<string> {
+  const output = await tmux(["list-panes", "-t", target, "-F", "#{pane_id}"], serverName);
+  const firstLine = output.trim().split("\n")[0];
   if (!firstLine) {
     throw new Error(`No panes found in target: ${target}`);
   }
diff --git a/packages/airiscode-core/src/agents/backends/types.ts b/packages/airiscode-core/src/agents/backends/types.ts
index 904be8cc8..ce6f0db98 100644
--- a/packages/airiscode-core/src/agents/backends/types.ts
+++ b/packages/airiscode-core/src/agents/backends/types.ts
@@ -11,22 +11,17 @@
  * These types are used across different agent orchestration modes.
  */
 
-import type { Content } from '../../types/llm.js';
-import type { AnsiOutput } from '../../utils/terminalSerializer.js';
-import type {
-  PromptConfig,
-  ModelConfig,
-  RunConfig,
-  ToolConfig,
-} from '../runtime/agent-types.js';
+import type { Content } from "../../types/llm.js";
+import type { AnsiOutput } from "../../utils/terminalSerializer.js";
+import type { ModelConfig, PromptConfig, RunConfig, ToolConfig } from "../runtime/agent-types.js";
 
 /**
  * Canonical display mode values shared across core and CLI.
  */
 export const DISPLAY_MODE = {
-  IN_PROCESS: 'in-process',
-  TMUX: 'tmux',
-  ITERM2: 'iterm2',
+  IN_PROCESS: "in-process",
+  TMUX: "tmux",
+  ITERM2: "iterm2",
 } as const;
 
 /**
@@ -268,7 +263,7 @@ export interface TmuxBackendOptions {
   /** Pane border format (default: "#{pane_title}") */
   paneBorderFormat?: string;
   /** Pane border status location */
-  paneBorderStatus?: 'top' | 'bottom' | 'off';
+  paneBorderStatus?: "top" | "bottom" | "off";
   /** Leader pane width percentage (default: 30) */
   leaderPaneWidthPercent?: number;
   /** First split percent when inside tmux (default: 70) */
diff --git a/packages/airiscode-core/src/agents/index.ts b/packages/airiscode-core/src/agents/index.ts
index d29d4dc09..88a507a3c 100644
--- a/packages/airiscode-core/src/agents/index.ts
+++ b/packages/airiscode-core/src/agents/index.ts
@@ -13,6 +13,6 @@
  * - Shared types for agent spawning and lifecycle
  */
 
-export * from './backends/index.js';
-export * from './arena/index.js';
-export * from './runtime/index.js';
+export * from "./arena/index.js";
+export * from "./backends/index.js";
+export * from "./runtime/index.js";
diff --git a/packages/airiscode-core/src/agents/runtime/agent-core.ts b/packages/airiscode-core/src/agents/runtime/agent-core.ts
index eef0f703b..a1af247ee 100644
--- a/packages/airiscode-core/src/agents/runtime/agent-core.ts
+++ b/packages/airiscode-core/src/agents/runtime/agent-core.ts
@@ -16,51 +16,43 @@
  * and how to interpret the results.
  */
 
-import { reportError } from '../../utils/errorReporting.js';
-import type { Config } from '../../config/config.js';
-import { type ToolCallRequestInfo } from '../../core/turn.js';
+import type { Config } from "../../config/config.js";
+import { DEFAULT_AIRISCODE_MODEL } from "../../config/models.js";
 import {
   CoreToolScheduler,
-  type ToolCall,
   type ExecutingToolCall,
+  type ToolCall,
   type WaitingToolCall,
-} from '../../core/coreToolScheduler.js';
-import type {
-  ToolConfirmationOutcome,
-  ToolCallConfirmationDetails,
-} from '../../tools/tools.js';
-import { getInitialChatHistory } from '../../utils/environmentContext.js';
+} from "../../core/coreToolScheduler.js";
+import { GeminiChat } from "../../core/geminiChat.js";
+import { type ToolCallRequestInfo } from "../../core/turn.js";
+import { AgentTool } from "../../tools/agent.js";
+import { ToolNames } from "../../tools/tool-names.js";
+import type { ToolCallConfirmationDetails, ToolConfirmationOutcome } from "../../tools/tools.js";
 import type {
   Content,
-  Part,
   FunctionCall,
-  GenerateContentConfig,
   FunctionDeclaration,
+  GenerateContentConfig,
   GenerateContentResponseUsageMetadata,
-} from '../../types/llm.js';
-import { GeminiChat } from '../../core/geminiChat.js';
-import type {
-  PromptConfig,
-  ModelConfig,
-  RunConfig,
-  ToolConfig,
-} from './agent-types.js';
-import { AgentTerminateMode } from './agent-types.js';
+  Part,
+} from "../../types/llm.js";
+import { getInitialChatHistory } from "../../utils/environmentContext.js";
+import { reportError } from "../../utils/errorReporting.js";
 import type {
+  AgentHooks,
   AgentRoundEvent,
   AgentRoundTextEvent,
   AgentToolCallEvent,
-  AgentToolResultEvent,
   AgentToolOutputUpdateEvent,
+  AgentToolResultEvent,
   AgentUsageEvent,
-  AgentHooks,
-} from './agent-events.js';
-import { type AgentEventEmitter, AgentEventType } from './agent-events.js';
-import { AgentStatistics, type AgentStatsSummary } from './agent-statistics.js';
-import { AgentTool } from '../../tools/agent.js';
-import { ToolNames } from '../../tools/tool-names.js';
-import { DEFAULT_AIRISCODE_MODEL } from '../../config/models.js';
-import { type ContextState, templateString } from './agent-headless.js';
+} from "./agent-events.js";
+import { type AgentEventEmitter, AgentEventType } from "./agent-events.js";
+import { type ContextState, templateString } from "./agent-headless.js";
+import { AgentStatistics, type AgentStatsSummary } from "./agent-statistics.js";
+import type { ModelConfig, PromptConfig, RunConfig, ToolConfig } from "./agent-types.js";
+import { AgentTerminateMode } from "./agent-types.js";
 
 /**
  * Result of a single reasoning loop invocation.
@@ -212,13 +204,11 @@ export class AgentCore {
     options?: CreateChatOptions,
   ): Promise<GeminiChat | undefined> {
     if (!this.promptConfig.systemPrompt && !this.promptConfig.initialMessages) {
-      throw new Error(
-        'PromptConfig must have either `systemPrompt` or `initialMessages` defined.',
-      );
+      throw new Error("PromptConfig must have either `systemPrompt` or `initialMessages` defined.");
     }
     if (this.promptConfig.systemPrompt && this.promptConfig.initialMessages) {
       throw new Error(
-        'PromptConfig cannot have both `systemPrompt` and `initialMessages` defined.',
+        "PromptConfig cannot have both `systemPrompt` and `initialMessages` defined.",
       );
     }
 
@@ -246,18 +236,9 @@ export class AgentCore {
         generationConfig.systemInstruction = systemInstruction;
       }
 
-      return new GeminiChat(
-        this.runtimeContext,
-        generationConfig,
-        startHistory,
-      );
+      return new GeminiChat(this.runtimeContext, generationConfig, startHistory);
     } catch (error) {
-      await reportError(
-        error,
-        'Error initializing chat session.',
-        startHistory,
-        'startChat',
-      );
+      await reportError(error, "Error initializing chat session.", startHistory, "startChat");
       return undefined;
     }
   }
@@ -284,12 +265,10 @@ export class AgentCore {
     ]);
 
     if (this.toolConfig) {
-      const asStrings = this.toolConfig.tools.filter(
-        (t): t is string => typeof t === 'string',
-      );
-      const hasWildcard = asStrings.includes('*');
+      const asStrings = this.toolConfig.tools.filter((t): t is string => typeof t === "string");
+      const hasWildcard = asStrings.includes("*");
       const onlyInlineDecls = this.toolConfig.tools.filter(
-        (t): t is FunctionDeclaration => typeof t !== 'string',
+        (t): t is FunctionDeclaration => typeof t !== "string",
       );
 
       if (hasWildcard || asStrings.length === 0) {
@@ -349,7 +328,7 @@ export class AgentCore {
     const startTime = options?.startTimeMs ?? Date.now();
     let currentMessages = initialMessages;
     let turnCounter = 0;
-    let finalText = '';
+    let finalText = "";
     let terminateMode: AgentTerminateMode | null = null;
 
     while (true) {
@@ -376,7 +355,7 @@ export class AgentCore {
       // in the model SDK. The parent abortController propagates abort to it.
       const roundAbortController = new AbortController();
       const onParentAbort = () => roundAbortController.abort();
-      abortController.signal.addEventListener('abort', onParentAbort);
+      abortController.signal.addEventListener("abort", onParentAbort);
       if (abortController.signal.aborted) {
         roundAbortController.abort();
       }
@@ -393,9 +372,7 @@ export class AgentCore {
 
       const roundStreamStart = Date.now();
       const responseStream = await chat.sendMessageStream(
-        this.modelConfig.model ||
-          this.runtimeContext.getModel() ||
-          DEFAULT_AIRISCODE_MODEL,
+        this.modelConfig.model || this.runtimeContext.getModel() || DEFAULT_AIRISCODE_MODEL,
         messageParams,
         promptId,
       );
@@ -407,15 +384,14 @@ export class AgentCore {
       } as AgentRoundEvent);
 
       const functionCalls: FunctionCall[] = [];
-      let roundText = '';
-      let roundThoughtText = '';
-      let lastUsage: GenerateContentResponseUsageMetadata | undefined =
-        undefined;
+      let roundText = "";
+      let roundThoughtText = "";
+      let lastUsage: GenerateContentResponseUsageMetadata | undefined = undefined;
       let currentResponseId: string | undefined = undefined;
 
       for await (const streamEvent of responseStream) {
         if (roundAbortController.signal.aborted) {
-          abortController.signal.removeEventListener('abort', onParentAbort);
+          abortController.signal.removeEventListener("abort", onParentAbort);
           return {
             text: finalText,
             terminateMode: AgentTerminateMode.CANCELLED,
@@ -424,12 +400,12 @@ export class AgentCore {
         }
 
         // Handle retry events
-        if (streamEvent.type === 'retry') {
+        if (streamEvent.type === "retry") {
           continue;
         }
 
         // Handle chunk events
-        if (streamEvent.type === 'chunk') {
+        if (streamEvent.type === "chunk") {
           const resp = streamEvent.value;
           // Track the response ID for tool call correlation
           if (resp.responseId) {
@@ -471,7 +447,7 @@ export class AgentCore {
 
       durationMin = (Date.now() - startTime) / (1000 * 60);
       if (options?.maxTimeMinutes && durationMin >= options.maxTimeMinutes) {
-        abortController.signal.removeEventListener('abort', onParentAbort);
+        abortController.signal.removeEventListener("abort", onParentAbort);
         terminateMode = AgentTerminateMode.TIMEOUT;
         break;
       }
@@ -504,17 +480,17 @@ export class AgentCore {
             timestamp: Date.now(),
           } as AgentRoundEvent);
           // Clean up before breaking
-          abortController.signal.removeEventListener('abort', onParentAbort);
+          abortController.signal.removeEventListener("abort", onParentAbort);
           // null terminateMode = normal text completion
           break;
         }
         // Otherwise, nudge the model to finalize a result.
         currentMessages = [
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
-                text: 'Please provide the final result now and stop calling tools.',
+                text: "Please provide the final result now and stop calling tools.",
               },
             ],
           },
@@ -529,7 +505,7 @@ export class AgentCore {
       } as AgentRoundEvent);
 
       // Clean up the per-round listener before the next iteration
-      abortController.signal.removeEventListener('abort', onParentAbort);
+      abortController.signal.removeEventListener("abort", onParentAbort);
     }
 
     return {
@@ -643,9 +619,9 @@ export class AgentCore {
 
           const toolName = call.request.name;
           const duration = call.durationMs ?? 0;
-          const success = call.status === 'success';
+          const success = call.status === "success";
           const errorMessage =
-            call.status === 'error' || call.status === 'cancelled'
+            call.status === "error" || call.status === "cancelled"
               ? call.response.error?.message
               : undefined;
 
@@ -683,7 +659,7 @@ export class AgentCore {
           if (respParts) {
             const parts = Array.isArray(respParts) ? respParts : [respParts];
             for (const part of parts) {
-              if (typeof part === 'string') {
+              if (typeof part === "string") {
                 toolResponseParts.push({ text: part });
               } else if (part) {
                 toolResponseParts.push(part);
@@ -697,7 +673,7 @@ export class AgentCore {
       onToolCallsUpdate: (calls: ToolCall[]) => {
         for (const call of calls) {
           // Track PTY PIDs so TOOL_OUTPUT_UPDATE events can carry them.
-          if (call.status === 'executing') {
+          if (call.status === "executing") {
             const pid = (call as ExecutingToolCall).pid;
             if (pid !== undefined) {
               const isNewPid = !pidMap.has(call.request.callId);
@@ -709,7 +685,7 @@ export class AgentCore {
                   subagentId: this.subagentId,
                   round: currentRound,
                   callId: call.request.callId,
-                  outputChunk: (call as ExecutingToolCall).liveOutput ?? '',
+                  outputChunk: (call as ExecutingToolCall).liveOutput ?? "",
                   pid,
                   timestamp: Date.now(),
                 } as AgentToolOutputUpdateEvent);
@@ -717,7 +693,7 @@ export class AgentCore {
             }
           }
 
-          if (call.status !== 'awaiting_approval') continue;
+          if (call.status !== "awaiting_approval") continue;
           const waiting = call as WaitingToolCall;
 
           // Emit approval request event for UI visibility
@@ -729,16 +705,11 @@ export class AgentCore {
               round: currentRound,
               callId: waiting.request.callId,
               name: waiting.request.name,
-              description: this.getToolDescription(
-                waiting.request.name,
-                waiting.request.args,
-              ),
+              description: this.getToolDescription(waiting.request.name, waiting.request.args),
               confirmationDetails: rest,
               respond: async (
                 outcome: ToolConfirmationOutcome,
-                payload?: Parameters<
-                  ToolCallConfirmationDetails['onConfirm']
-                >[1],
+                payload?: Parameters<ToolCallConfirmationDetails["onConfirm"]>[1],
               ) => {
                 if (responded.has(waiting.request.callId)) return;
                 responded.add(waiting.request.callId);
@@ -757,7 +728,7 @@ export class AgentCore {
 
     // Prepare requests and emit TOOL_CALL events
     const requests: ToolCallRequestInfo[] = authorizedCalls.map((fc) => {
-      const toolName = String(fc.name || 'unknown');
+      const toolName = String(fc.name || "unknown");
       const callId = fc.id ?? `${fc.name}-${Date.now()}`;
       const args = (fc.args ?? {}) as Record<string, unknown>;
       const request: ToolCallRequestInfo = {
@@ -811,7 +782,7 @@ export class AgentCore {
           if (emittedCallIds.has(req.callId)) continue;
           emittedCallIds.add(req.callId);
 
-          const errorMessage = 'Tool call cancelled by user abort.';
+          const errorMessage = "Tool call cancelled by user abort.";
           this.recordToolCallStats(req.name, false, 0, errorMessage);
 
           this.eventEmitter?.emit(AgentEventType.TOOL_RESULT, {
@@ -836,7 +807,7 @@ export class AgentCore {
           } as AgentToolResultEvent);
         }
       };
-      abortController.signal.addEventListener('abort', onAbort, { once: true });
+      abortController.signal.addEventListener("abort", onAbort, { once: true });
 
       // If already aborted before the listener was registered, resolve
       // immediately to avoid blocking forever.
@@ -847,17 +818,17 @@ export class AgentCore {
       await scheduler.schedule(requests, abortController.signal);
       await batchDone;
 
-      abortController.signal.removeEventListener('abort', onAbort);
+      abortController.signal.removeEventListener("abort", onAbort);
     }
 
     // If all tool calls failed, inform the model so it can re-evaluate.
     if (functionCalls.length > 0 && toolResponseParts.length === 0) {
       toolResponseParts.push({
-        text: 'All tool calls failed. Please analyze the errors and try an alternative approach.',
+        text: "All tool calls failed. Please analyze the errors and try an alternative approach.",
       });
     }
 
-    return [{ role: 'user', parts: toolResponseParts }];
+    return [{ role: "user", parts: toolResponseParts }];
   }
 
   // ─── Stats & Events ───────────────────────────────────────
@@ -887,8 +858,7 @@ export class AgentCore {
     }>;
   } & ExecutionStats {
     const total = this.executionStats.totalToolCalls;
-    const successRate =
-      total > 0 ? (this.executionStats.successfulToolCalls / total) * 100 : 0;
+    const successRate = total > 0 ? (this.executionStats.successfulToolCalls / total) * 100 : 0;
     return {
       ...this.executionStats,
       successRate,
@@ -908,13 +878,13 @@ export class AgentCore {
       const toolRegistry = this.runtimeContext.getToolRegistry();
       const tool = toolRegistry.getTool(toolName);
       if (!tool) {
-        return '';
+        return "";
       }
 
       const toolInstance = tool.build(args);
-      return toolInstance.getDescription() || '';
+      return toolInstance.getDescription() || "";
     } catch {
-      return '';
+      return "";
     }
   }
 
@@ -957,7 +927,7 @@ export class AgentCore {
       tu.success += 1;
     } else {
       tu.failure += 1;
-      tu.lastError = errorMessage || 'Unknown error';
+      tu.lastError = errorMessage || "Unknown error";
     }
     tu.totalDurationMs = (tu.totalDurationMs || 0) + durationMs;
     tu.averageDurationMs = tu.count > 0 ? tu.totalDurationMs / tu.count : 0;
@@ -978,12 +948,9 @@ export class AgentCore {
    * Builds the system prompt with template substitution and optional
    * non-interactive instructions suffix.
    */
-  private buildChatSystemPrompt(
-    context: ContextState,
-    options?: CreateChatOptions,
-  ): string {
+  private buildChatSystemPrompt(context: ContextState, options?: CreateChatOptions): string {
     if (!this.promptConfig.systemPrompt) {
-      return '';
+      return "";
     }
 
     let finalPrompt = templateString(this.promptConfig.systemPrompt, context);
@@ -1027,12 +994,7 @@ Important Rules:
     if (isFinite(contextTok) && contextTok > 0) {
       this.lastPromptTokenCount = contextTok;
     }
-    if (
-      isFinite(inTok) ||
-      isFinite(outTok) ||
-      isFinite(thoughtTok) ||
-      isFinite(cachedTok)
-    ) {
+    if (isFinite(inTok) || isFinite(outTok) || isFinite(thoughtTok) || isFinite(cachedTok)) {
       this.stats.recordTokens(
         isFinite(inTok) ? inTok : 0,
         isFinite(outTok) ? outTok : 0,
@@ -1044,11 +1006,9 @@ Important Rules:
       this.executionStats.inputTokens =
         (this.executionStats.inputTokens || 0) + (isFinite(inTok) ? inTok : 0);
       this.executionStats.outputTokens =
-        (this.executionStats.outputTokens || 0) +
-        (isFinite(outTok) ? outTok : 0);
+        (this.executionStats.outputTokens || 0) + (isFinite(outTok) ? outTok : 0);
       this.executionStats.totalTokens =
-        (this.executionStats.totalTokens || 0) +
-        (isFinite(totalTok) ? totalTok : 0);
+        (this.executionStats.totalTokens || 0) + (isFinite(totalTok) ? totalTok : 0);
     }
     this.eventEmitter?.emit(AgentEventType.USAGE_METADATA, {
       subagentId: this.subagentId,
diff --git a/packages/airiscode-core/src/agents/runtime/agent-events.ts b/packages/airiscode-core/src/agents/runtime/agent-events.ts
index fb331450c..26efe3d8e 100644
--- a/packages/airiscode-core/src/agents/runtime/agent-events.ts
+++ b/packages/airiscode-core/src/agents/runtime/agent-events.ts
@@ -13,47 +13,47 @@
  * - Lifecycle hooks (pre/post tool use, stop) for synchronous callbacks
  */
 
-import { EventEmitter } from 'events';
+import { EventEmitter } from "events";
 import type {
   ToolCallConfirmationDetails,
   ToolConfirmationOutcome,
   ToolResultDisplay,
-} from '../../tools/tools.js';
-import type { Part, GenerateContentResponseUsageMetadata } from '../../types/llm.js';
-import type { AgentStatus } from './agent-types.js';
+} from "../../tools/tools.js";
+import type { GenerateContentResponseUsageMetadata, Part } from "../../types/llm.js";
+import type { AgentStatus } from "./agent-types.js";
 
 // ─── Event Types ────────────────────────────────────────────
 
 export type AgentEvent =
-  | 'start'
-  | 'round_start'
-  | 'round_end'
-  | 'round_text'
-  | 'stream_text'
-  | 'tool_call'
-  | 'tool_result'
-  | 'tool_output_update'
-  | 'tool_waiting_approval'
-  | 'usage_metadata'
-  | 'finish'
-  | 'error'
-  | 'status_change';
+  | "start"
+  | "round_start"
+  | "round_end"
+  | "round_text"
+  | "stream_text"
+  | "tool_call"
+  | "tool_result"
+  | "tool_output_update"
+  | "tool_waiting_approval"
+  | "usage_metadata"
+  | "finish"
+  | "error"
+  | "status_change";
 
 export enum AgentEventType {
-  START = 'start',
-  ROUND_START = 'round_start',
-  ROUND_END = 'round_end',
+  START = "start",
+  ROUND_START = "round_start",
+  ROUND_END = "round_end",
   /** Complete round text, emitted once after streaming before tool calls. */
-  ROUND_TEXT = 'round_text',
-  STREAM_TEXT = 'stream_text',
-  TOOL_CALL = 'tool_call',
-  TOOL_RESULT = 'tool_result',
-  TOOL_OUTPUT_UPDATE = 'tool_output_update',
-  TOOL_WAITING_APPROVAL = 'tool_waiting_approval',
-  USAGE_METADATA = 'usage_metadata',
-  FINISH = 'finish',
-  ERROR = 'error',
-  STATUS_CHANGE = 'status_change',
+  ROUND_TEXT = "round_text",
+  STREAM_TEXT = "stream_text",
+  TOOL_CALL = "tool_call",
+  TOOL_RESULT = "tool_result",
+  TOOL_OUTPUT_UPDATE = "tool_output_update",
+  TOOL_WAITING_APPROVAL = "tool_waiting_approval",
+  USAGE_METADATA = "usage_metadata",
+  FINISH = "finish",
+  ERROR = "error",
+  STATUS_CHANGE = "status_change",
 }
 
 // ─── Event Payloads ─────────────────────────────────────────
@@ -142,12 +142,12 @@ export interface AgentApprovalRequestEvent {
   callId: string;
   name: string;
   description: string;
-  confirmationDetails: Omit<ToolCallConfirmationDetails, 'onConfirm'> & {
-    type: ToolCallConfirmationDetails['type'];
+  confirmationDetails: Omit<ToolCallConfirmationDetails, "onConfirm"> & {
+    type: ToolCallConfirmationDetails["type"];
   };
   respond: (
     outcome: ToolConfirmationOutcome,
-    payload?: Parameters<ToolCallConfirmationDetails['onConfirm']>[1],
+    payload?: Parameters<ToolCallConfirmationDetails["onConfirm"]>[1],
   ) => Promise<void>;
   timestamp: number;
 }
@@ -207,10 +207,7 @@ export interface AgentEventMap {
 export class AgentEventEmitter {
   private ee = new EventEmitter();
 
-  on<E extends keyof AgentEventMap>(
-    event: E,
-    listener: (payload: AgentEventMap[E]) => void,
-  ): void {
+  on<E extends keyof AgentEventMap>(event: E, listener: (payload: AgentEventMap[E]) => void): void {
     this.ee.on(event, listener as (...args: unknown[]) => void);
   }
 
@@ -221,10 +218,7 @@ export class AgentEventEmitter {
     this.ee.off(event, listener as (...args: unknown[]) => void);
   }
 
-  emit<E extends keyof AgentEventMap>(
-    event: E,
-    payload: AgentEventMap[E],
-  ): void {
+  emit<E extends keyof AgentEventMap>(event: E, payload: AgentEventMap[E]): void {
     this.ee.emit(event, payload);
   }
 }
diff --git a/packages/airiscode-core/src/agents/runtime/agent-headless.ts b/packages/airiscode-core/src/agents/runtime/agent-headless.ts
index 6b0f5585c..c1b2259b0 100644
--- a/packages/airiscode-core/src/agents/runtime/agent-headless.ts
+++ b/packages/airiscode-core/src/agents/runtime/agent-headless.ts
@@ -14,30 +14,25 @@
  * For persistent interactive agents, see AgentInteractive (Phase 2).
  */
 
-import type { Config } from '../../config/config.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
+import type { Config } from "../../config/config.js";
+import { DEFAULT_AIRISCODE_MODEL } from "../../config/models.js";
+import { logSubagentExecution } from "../../telemetry/loggers.js";
+import { SubagentExecutionEvent } from "../../telemetry/types.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { AgentCore } from "./agent-core.js";
 import type {
-  AgentEventEmitter,
-  AgentStartEvent,
   AgentErrorEvent,
+  AgentEventEmitter,
   AgentFinishEvent,
   AgentHooks,
-} from './agent-events.js';
-import { AgentEventType } from './agent-events.js';
-import type { AgentStatsSummary } from './agent-statistics.js';
-import type {
-  PromptConfig,
-  ModelConfig,
-  RunConfig,
-  ToolConfig,
-} from './agent-types.js';
-import { AgentTerminateMode } from './agent-types.js';
-import { logSubagentExecution } from '../../telemetry/loggers.js';
-import { SubagentExecutionEvent } from '../../telemetry/types.js';
-import { AgentCore } from './agent-core.js';
-import { DEFAULT_AIRISCODE_MODEL } from '../../config/models.js';
-
-const debugLogger = createDebugLogger('SUBAGENT');
+  AgentStartEvent,
+} from "./agent-events.js";
+import { AgentEventType } from "./agent-events.js";
+import type { AgentStatsSummary } from "./agent-statistics.js";
+import type { ModelConfig, PromptConfig, RunConfig, ToolConfig } from "./agent-types.js";
+import { AgentTerminateMode } from "./agent-types.js";
+
+const debugLogger = createDebugLogger("SUBAGENT");
 
 // ─── Utilities (unchanged, re-exported for consumers) ────────
 
@@ -91,10 +86,7 @@ export class ContextState {
  * @returns The populated string with all placeholders replaced.
  * @throws {Error} if any placeholder key is not found in the context.
  */
-export function templateString(
-  template: string,
-  context: ContextState,
-): string {
+export function templateString(template: string, context: ContextState): string {
   const placeholderRegex = /\$\{(\w+)\}/g;
 
   // First, find all unique keys required by the template.
@@ -104,22 +96,14 @@ export function templateString(
 
   // Check if all required keys exist in the context.
   const contextKeys = new Set(context.get_keys());
-  const missingKeys = Array.from(requiredKeys).filter(
-    (key) => !contextKeys.has(key),
-  );
+  const missingKeys = Array.from(requiredKeys).filter((key) => !contextKeys.has(key));
 
   if (missingKeys.length > 0) {
-    throw new Error(
-      `Missing context values for the following keys: ${missingKeys.join(
-        ', ',
-      )}`,
-    );
+    throw new Error(`Missing context values for the following keys: ${missingKeys.join(", ")}`);
   }
 
   // Perform the replacement using a replacer function.
-  return template.replace(placeholderRegex, (_match, key) =>
-    String(context.get(key)),
-  );
+  return template.replace(placeholderRegex, (_match, key) => String(context.get(key)));
 }
 
 // ─── AgentHeadless ──────────────────────────────────────────
@@ -134,7 +118,7 @@ export function templateString(
  */
 export class AgentHeadless {
   private readonly core: AgentCore;
-  private finalText: string = '';
+  private finalText: string = "";
   private terminateMode: AgentTerminateMode = AgentTerminateMode.ERROR;
 
   private constructor(core: AgentCore) {
@@ -189,10 +173,7 @@ export class AgentHeadless {
    * @param context - The current context state containing variables for prompt templating.
    * @param externalSignal - Optional abort signal for external cancellation.
    */
-  async execute(
-    context: ContextState,
-    externalSignal?: AbortSignal,
-  ): Promise<void> {
+  async execute(context: ContextState, externalSignal?: AbortSignal): Promise<void> {
     const chat = await this.core.createChat(context);
 
     if (!chat) {
@@ -206,7 +187,7 @@ export class AgentHeadless {
       abortController.abort();
     };
     if (externalSignal) {
-      externalSignal.addEventListener('abort', onExternalAbort);
+      externalSignal.addEventListener("abort", onExternalAbort);
     }
     if (externalSignal?.aborted) {
       abortController.abort();
@@ -214,12 +195,8 @@ export class AgentHeadless {
 
     const toolsList = this.core.prepareTools();
 
-    const initialTaskText = String(
-      (context.get('task_prompt') as string) ?? 'Get Started!',
-    );
-    const initialMessages = [
-      { role: 'user' as const, parts: [{ text: initialTaskText }] },
-    ];
+    const initialTaskText = String((context.get("task_prompt") as string) ?? "Get Started!");
+    const initialMessages = [{ role: "user" as const, parts: [{ text: initialTaskText }] }];
 
     const startTime = Date.now();
     this.core.executionStats.startTimeMs = startTime;
@@ -234,14 +211,14 @@ export class AgentHeadless {
           this.core.modelConfig.model ||
           this.core.runtimeContext.getModel() ||
           DEFAULT_AIRISCODE_MODEL,
-        tools: (this.core.toolConfig?.tools || ['*']).map((t) =>
-          typeof t === 'string' ? t : t.name,
+        tools: (this.core.toolConfig?.tools || ["*"]).map((t) =>
+          typeof t === "string" ? t : t.name,
         ),
         timestamp: Date.now(),
       } as AgentStartEvent);
 
       // Log telemetry for subagent start
-      const startEvent = new SubagentExecutionEvent(this.core.name, 'started');
+      const startEvent = new SubagentExecutionEvent(this.core.name, "started");
       logSubagentExecution(this.core.runtimeContext, startEvent);
 
       // Delegate to AgentCore's reasoning loop
@@ -260,7 +237,7 @@ export class AgentHeadless {
       this.finalText = result.text;
       this.terminateMode = result.terminateMode ?? AgentTerminateMode.GOAL;
     } catch (error) {
-      debugLogger.error('Error during subagent execution:', error);
+      debugLogger.error("Error during subagent execution:", error);
       this.terminateMode = AgentTerminateMode.ERROR;
       this.core.eventEmitter?.emit(AgentEventType.ERROR, {
         subagentId: this.core.subagentId,
@@ -271,7 +248,7 @@ export class AgentHeadless {
       throw error;
     } finally {
       if (externalSignal) {
-        externalSignal.removeEventListener('abort', onExternalAbort);
+        externalSignal.removeEventListener("abort", onExternalAbort);
       }
       this.core.executionStats.totalDurationMs = Date.now() - startTime;
       const summary = this.core.stats.getSummary(Date.now());
@@ -291,13 +268,11 @@ export class AgentHeadless {
 
       const completionEvent = new SubagentExecutionEvent(
         this.core.name,
-        this.terminateMode === AgentTerminateMode.GOAL ? 'completed' : 'failed',
+        this.terminateMode === AgentTerminateMode.GOAL ? "completed" : "failed",
         {
           terminate_reason: this.terminateMode,
           result: this.finalText,
-          execution_summary: this.core.stats.formatCompact(
-            'Subagent execution completed',
-          ),
+          execution_summary: this.core.stats.formatCompact("Subagent execution completed"),
         },
       );
       logSubagentExecution(this.core.runtimeContext, completionEvent);
diff --git a/packages/airiscode-core/src/agents/runtime/agent-interactive.ts b/packages/airiscode-core/src/agents/runtime/agent-interactive.ts
index 07d0dd63f..34ca1fdd3 100644
--- a/packages/airiscode-core/src/agents/runtime/agent-interactive.ts
+++ b/packages/airiscode-core/src/agents/runtime/agent-interactive.ts
@@ -11,35 +11,35 @@
  * state (messages, pending approvals, live outputs) that the UI reads.
  */
 
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import { type AgentEventEmitter, AgentEventType } from './agent-events.js';
+import type { GeminiChat } from "../../core/geminiChat.js";
+import {
+  type ToolCallConfirmationDetails,
+  ToolConfirmationOutcome,
+  type ToolResultDisplay,
+} from "../../tools/tools.js";
+import type { FunctionDeclaration } from "../../types/llm.js";
+import { AsyncMessageQueue } from "../../utils/asyncMessageQueue.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import type { AgentCore } from "./agent-core.js";
 import type {
+  AgentApprovalRequestEvent,
   AgentRoundTextEvent,
   AgentToolCallEvent,
-  AgentToolResultEvent,
   AgentToolOutputUpdateEvent,
-  AgentApprovalRequestEvent,
-} from './agent-events.js';
-import type { AgentStatsSummary } from './agent-statistics.js';
-import type { AgentCore } from './agent-core.js';
-import type { ContextState } from './agent-headless.js';
-import type { GeminiChat } from '../../core/geminiChat.js';
-import type { FunctionDeclaration } from '../../types/llm.js';
-import {
-  ToolConfirmationOutcome,
-  type ToolCallConfirmationDetails,
-  type ToolResultDisplay,
-} from '../../tools/tools.js';
-import { AsyncMessageQueue } from '../../utils/asyncMessageQueue.js';
+  AgentToolResultEvent,
+} from "./agent-events.js";
+import { type AgentEventEmitter, AgentEventType } from "./agent-events.js";
+import type { ContextState } from "./agent-headless.js";
+import type { AgentStatsSummary } from "./agent-statistics.js";
 import {
-  AgentTerminateMode,
-  AgentStatus,
-  isTerminalStatus,
   type AgentInteractiveConfig,
   type AgentMessage,
-} from './agent-types.js';
+  AgentStatus,
+  AgentTerminateMode,
+  isTerminalStatus,
+} from "./agent-types.js";
 
-const debugLogger = createDebugLogger('AGENT_INTERACTIVE');
+const debugLogger = createDebugLogger("AGENT_INTERACTIVE");
 
 /**
  * AgentInteractive — persistent interactive agent that processes
@@ -70,10 +70,7 @@ export class AgentInteractive {
   // Pending tool approval requests. Keyed by callId.
   // Populated by TOOL_WAITING_APPROVAL, removed by TOOL_RESULT or when
   // the user responds. The UI reads this to show confirmation dialogs.
-  private readonly pendingApprovals = new Map<
-    string,
-    ToolCallConfirmationDetails
-  >();
+  private readonly pendingApprovals = new Map<string, ToolCallConfirmationDetails>();
 
   // Live streaming output for currently-executing tools. Keyed by callId.
   // Populated by TOOL_OUTPUT_UPDATE (replaces previous), cleared on TOOL_RESULT.
@@ -105,7 +102,7 @@ export class AgentInteractive {
       extraHistory: this.config.chatHistory,
     });
     if (!this.chat) {
-      this.error = 'Failed to create chat session';
+      this.error = "Failed to create chat session";
       this.setStatus(AgentStatus.FAILED);
       return;
     }
@@ -115,7 +112,7 @@ export class AgentInteractive {
 
     if (this.config.chatHistory?.length) {
       this.addMessage(
-        'info',
+        "info",
         `History context from parent session included (${this.config.chatHistory.length} messages)`,
       );
     }
@@ -135,7 +132,7 @@ export class AgentInteractive {
     try {
       let message = this.queue.dequeue();
       while (message !== null && !this.masterAbortController.signal.aborted) {
-        this.addMessage('user', message);
+        this.addMessage("user", message);
         await this.runOneRound(message);
         message = this.queue.dequeue();
       }
@@ -148,7 +145,7 @@ export class AgentInteractive {
     } catch (err) {
       this.error = err instanceof Error ? err.message : String(err);
       this.setStatus(AgentStatus.FAILED);
-      debugLogger.error('AgentInteractive processing failed:', err);
+      debugLogger.error("AgentInteractive processing failed:", err);
     } finally {
       this.processing = false;
     }
@@ -168,15 +165,13 @@ export class AgentInteractive {
 
     // Propagate master abort to round
     const onMasterAbort = () => this.roundAbortController?.abort();
-    this.masterAbortController.signal.addEventListener('abort', onMasterAbort);
+    this.masterAbortController.signal.addEventListener("abort", onMasterAbort);
     if (this.masterAbortController.signal.aborted) {
       this.roundAbortController.abort();
     }
 
     try {
-      const initialMessages = [
-        { role: 'user' as const, parts: [{ text: message }] },
-      ];
+      const initialMessages = [{ role: "user" as const, parts: [{ text: message }] }];
 
       const result = await this.core.runReasoningLoop(
         this.chat,
@@ -191,13 +186,10 @@ export class AgentInteractive {
 
       // Surface non-normal termination as a visible info message and as
       // lastRoundError so Arena can distinguish limit stops from successes.
-      if (
-        result.terminateMode &&
-        result.terminateMode !== AgentTerminateMode.GOAL
-      ) {
+      if (result.terminateMode && result.terminateMode !== AgentTerminateMode.GOAL) {
         const msg = terminateModeMessage(result.terminateMode);
         if (msg) {
-          this.addMessage('info', msg.text, { metadata: { level: msg.level } });
+          this.addMessage("info", msg.text, { metadata: { level: msg.level } });
         }
         this.lastRoundError = `Terminated: ${result.terminateMode}`;
       }
@@ -207,13 +199,10 @@ export class AgentInteractive {
       // Agent survives round errors — log and settle status in runLoop.
       const errorMessage = err instanceof Error ? err.message : String(err);
       this.lastRoundError = errorMessage;
-      debugLogger.error('AgentInteractive round error:', err);
-      this.addMessage('info', errorMessage, { metadata: { level: 'error' } });
+      debugLogger.error("AgentInteractive round error:", err);
+      this.addMessage("info", errorMessage, { metadata: { level: "error" } });
     } finally {
-      this.masterAbortController.signal.removeEventListener(
-        'abort',
-        onMasterAbort,
-      );
+      this.masterAbortController.signal.removeEventListener("abort", onMasterAbort);
       this.roundAbortController = undefined;
     }
   }
@@ -228,8 +217,8 @@ export class AgentInteractive {
     this.roundCancelledByUser = true;
     this.roundAbortController?.abort();
     this.pendingApprovals.clear();
-    this.addMessage('info', 'Agent round cancelled.', {
-      metadata: { level: 'warning' },
+    this.addMessage("info", "Agent round cancelled.", {
+      metadata: { level: "warning" },
     });
   }
 
@@ -373,7 +362,7 @@ export class AgentInteractive {
   }
 
   private addMessage(
-    role: AgentMessage['role'],
+    role: AgentMessage["role"],
     content: string,
     options?: { thought?: boolean; metadata?: Record<string, unknown> },
   ): void {
@@ -397,15 +386,15 @@ export class AgentInteractive {
 
     emitter.on(AgentEventType.ROUND_TEXT, (event: AgentRoundTextEvent) => {
       if (event.thoughtText) {
-        this.addMessage('assistant', event.thoughtText, { thought: true });
+        this.addMessage("assistant", event.thoughtText, { thought: true });
       }
       if (event.text) {
-        this.addMessage('assistant', event.text);
+        this.addMessage("assistant", event.text);
       }
     });
 
     emitter.on(AgentEventType.TOOL_CALL, (event: AgentToolCallEvent) => {
-      this.addMessage('tool_call', `Tool call: ${event.name}`, {
+      this.addMessage("tool_call", `Tool call: ${event.name}`, {
         metadata: {
           callId: event.callId,
           toolName: event.name,
@@ -417,26 +406,23 @@ export class AgentInteractive {
       });
     });
 
-    emitter.on(
-      AgentEventType.TOOL_OUTPUT_UPDATE,
-      (event: AgentToolOutputUpdateEvent) => {
-        this.liveOutputs.set(event.callId, event.outputChunk);
-        if (event.pid !== undefined) {
-          this.shellPids.set(event.callId, event.pid);
-        }
-      },
-    );
+    emitter.on(AgentEventType.TOOL_OUTPUT_UPDATE, (event: AgentToolOutputUpdateEvent) => {
+      this.liveOutputs.set(event.callId, event.outputChunk);
+      if (event.pid !== undefined) {
+        this.shellPids.set(event.callId, event.pid);
+      }
+    });
 
     emitter.on(AgentEventType.TOOL_RESULT, (event: AgentToolResultEvent) => {
       this.liveOutputs.delete(event.callId);
       this.shellPids.delete(event.callId);
       this.pendingApprovals.delete(event.callId);
 
-      const statusText = event.success ? 'succeeded' : 'failed';
+      const statusText = event.success ? "succeeded" : "failed";
       const summary = event.error
         ? `Tool ${event.name} ${statusText}: ${event.error}`
         : `Tool ${event.name} ${statusText}`;
-      this.addMessage('tool_result', summary, {
+      this.addMessage("tool_result", summary, {
         metadata: {
           callId: event.callId,
           toolName: event.name,
@@ -448,38 +434,35 @@ export class AgentInteractive {
       });
     });
 
-    emitter.on(
-      AgentEventType.TOOL_WAITING_APPROVAL,
-      (event: AgentApprovalRequestEvent) => {
-        const fullDetails = {
-          ...event.confirmationDetails,
-          onConfirm: async (
-            outcome: Parameters<ToolCallConfirmationDetails['onConfirm']>[0],
-            payload?: Parameters<ToolCallConfirmationDetails['onConfirm']>[1],
-          ) => {
-            this.pendingApprovals.delete(event.callId);
-            // Nudge the UI to re-render so the tool transitions visually
-            // from Confirming → Executing without waiting for the first
-            // real TOOL_OUTPUT_UPDATE from the tool's execution.
-            this.core.eventEmitter?.emit(AgentEventType.TOOL_OUTPUT_UPDATE, {
-              subagentId: this.core.subagentId,
-              round: event.round,
-              callId: event.callId,
-              outputChunk: '',
-              timestamp: Date.now(),
-            } as AgentToolOutputUpdateEvent);
-            await event.respond(outcome, payload);
-            // When the user denies a tool, cancel the round immediately
-            // so the agent doesn't waste a turn "acknowledging" the denial.
-            if (outcome === ToolConfirmationOutcome.Cancel) {
-              this.cancelCurrentRound();
-            }
-          },
-        } as ToolCallConfirmationDetails;
-
-        this.pendingApprovals.set(event.callId, fullDetails);
-      },
-    );
+    emitter.on(AgentEventType.TOOL_WAITING_APPROVAL, (event: AgentApprovalRequestEvent) => {
+      const fullDetails = {
+        ...event.confirmationDetails,
+        onConfirm: async (
+          outcome: Parameters<ToolCallConfirmationDetails["onConfirm"]>[0],
+          payload?: Parameters<ToolCallConfirmationDetails["onConfirm"]>[1],
+        ) => {
+          this.pendingApprovals.delete(event.callId);
+          // Nudge the UI to re-render so the tool transitions visually
+          // from Confirming → Executing without waiting for the first
+          // real TOOL_OUTPUT_UPDATE from the tool's execution.
+          this.core.eventEmitter?.emit(AgentEventType.TOOL_OUTPUT_UPDATE, {
+            subagentId: this.core.subagentId,
+            round: event.round,
+            callId: event.callId,
+            outputChunk: "",
+            timestamp: Date.now(),
+          } as AgentToolOutputUpdateEvent);
+          await event.respond(outcome, payload);
+          // When the user denies a tool, cancel the round immediately
+          // so the agent doesn't waste a turn "acknowledging" the denial.
+          if (outcome === ToolConfirmationOutcome.Cancel) {
+            this.cancelCurrentRound();
+          }
+        },
+      } as ToolCallConfirmationDetails;
+
+      this.pendingApprovals.set(event.callId, fullDetails);
+    });
   }
 }
 
@@ -492,17 +475,17 @@ export class AgentInteractive {
  */
 function terminateModeMessage(
   mode: AgentTerminateMode,
-): { text: string; level: 'info' | 'warning' | 'error' } | null {
+): { text: string; level: "info" | "warning" | "error" } | null {
   switch (mode) {
     case AgentTerminateMode.MAX_TURNS:
       return {
-        text: 'Agent stopped: maximum turns reached.',
-        level: 'warning',
+        text: "Agent stopped: maximum turns reached.",
+        level: "warning",
       };
     case AgentTerminateMode.TIMEOUT:
-      return { text: 'Agent stopped: time limit reached.', level: 'warning' };
+      return { text: "Agent stopped: time limit reached.", level: "warning" };
     case AgentTerminateMode.ERROR:
-      return { text: 'Agent stopped due to an error.', level: 'error' };
+      return { text: "Agent stopped due to an error.", level: "error" };
     case AgentTerminateMode.CANCELLED:
     case AgentTerminateMode.SHUTDOWN:
       return null;
diff --git a/packages/airiscode-core/src/agents/runtime/agent-statistics.ts b/packages/airiscode-core/src/agents/runtime/agent-statistics.ts
index 55c16f529..90ad6f6de 100644
--- a/packages/airiscode-core/src/agents/runtime/agent-statistics.ts
+++ b/packages/airiscode-core/src/agents/runtime/agent-statistics.ts
@@ -50,12 +50,7 @@ export class AgentStatistics {
     this.rounds = rounds;
   }
 
-  recordToolCall(
-    name: string,
-    success: boolean,
-    durationMs: number,
-    lastError?: string,
-  ) {
+  recordToolCall(name: string, success: boolean, durationMs: number, lastError?: string) {
     this.totalToolCalls += 1;
     if (success) this.successfulToolCalls += 1;
     else this.failedToolCalls += 1;
@@ -95,10 +90,7 @@ export class AgentStatistics {
   getSummary(now = Date.now()): AgentStatsSummary {
     const totalDurationMs = this.startTimeMs ? now - this.startTimeMs : 0;
     const totalToolCalls = this.totalToolCalls;
-    const successRate =
-      totalToolCalls > 0
-        ? (this.successfulToolCalls / totalToolCalls) * 100
-        : 0;
+    const successRate = totalToolCalls > 0 ? (this.successfulToolCalls / totalToolCalls) * 100 : 0;
     const totalTokens =
       this.apiTotalTokens > 0
         ? this.apiTotalTokens
@@ -123,32 +115,27 @@ export class AgentStatistics {
     const stats = this.getSummary(now);
     const sr =
       stats.totalToolCalls > 0
-        ? (stats.successRate ??
-          (stats.successfulToolCalls / stats.totalToolCalls) * 100)
+        ? (stats.successRate ?? (stats.successfulToolCalls / stats.totalToolCalls) * 100)
         : 0;
     const lines = [
       `📋 Task Completed: ${taskDesc}`,
-      `🔧 Tool Usage: ${stats.totalToolCalls} calls${stats.totalToolCalls ? `, ${sr.toFixed(1)}% success` : ''}`,
+      `🔧 Tool Usage: ${stats.totalToolCalls} calls${stats.totalToolCalls ? `, ${sr.toFixed(1)}% success` : ""}`,
       `⏱️ Duration: ${this.fmtDuration(stats.totalDurationMs)} | 🔁 Rounds: ${stats.rounds}`,
     ];
-    if (typeof stats.totalTokens === 'number') {
-      const parts = [
-        `in ${stats.inputTokens ?? 0}`,
-        `out ${stats.outputTokens ?? 0}`,
-      ];
+    if (typeof stats.totalTokens === "number") {
+      const parts = [`in ${stats.inputTokens ?? 0}`, `out ${stats.outputTokens ?? 0}`];
       lines.push(
-        `🔢 Tokens: ${stats.totalTokens.toLocaleString()}${parts.length ? ` (${parts.join(', ')})` : ''}`,
+        `🔢 Tokens: ${stats.totalTokens.toLocaleString()}${parts.length ? ` (${parts.join(", ")})` : ""}`,
       );
     }
-    return lines.join('\n');
+    return lines.join("\n");
   }
 
   formatDetailed(taskDesc: string, now = Date.now()): string {
     const stats = this.getSummary(now);
     const sr =
       stats.totalToolCalls > 0
-        ? (stats.successRate ??
-          (stats.successfulToolCalls / stats.totalToolCalls) * 100)
+        ? (stats.successRate ?? (stats.successfulToolCalls / stats.totalToolCalls) * 100)
         : 0;
     const lines: string[] = [];
     lines.push(`📋 Task Completed: ${taskDesc}`);
@@ -156,51 +143,44 @@ export class AgentStatistics {
       `⏱️ Duration: ${this.fmtDuration(stats.totalDurationMs)} | 🔁 Rounds: ${stats.rounds}`,
     );
     // Quality indicator
-    let quality = 'Poor execution';
-    if (sr >= 95) quality = 'Excellent execution';
-    else if (sr >= 85) quality = 'Good execution';
-    else if (sr >= 70) quality = 'Fair execution';
+    let quality = "Poor execution";
+    if (sr >= 95) quality = "Excellent execution";
+    else if (sr >= 85) quality = "Good execution";
+    else if (sr >= 70) quality = "Fair execution";
     lines.push(`✅ Quality: ${quality} (${sr.toFixed(1)}% tool success)`);
     // Speed category
     const d = stats.totalDurationMs;
-    let speed = 'Long execution - consider breaking down tasks';
-    if (d < 10_000) speed = 'Fast completion - under 10 seconds';
-    else if (d < 60_000) speed = 'Good speed - under a minute';
-    else if (d < 300_000) speed = 'Moderate duration - a few minutes';
+    let speed = "Long execution - consider breaking down tasks";
+    if (d < 10_000) speed = "Fast completion - under 10 seconds";
+    else if (d < 60_000) speed = "Good speed - under a minute";
+    else if (d < 300_000) speed = "Moderate duration - a few minutes";
     lines.push(`🚀 Speed: ${speed}`);
     lines.push(
       `🔧 Tools: ${stats.totalToolCalls} calls, ${sr.toFixed(1)}% success (${stats.successfulToolCalls} ok, ${stats.failedToolCalls} failed)`,
     );
-    if (typeof stats.totalTokens === 'number') {
-      const parts = [
-        `in ${stats.inputTokens ?? 0}`,
-        `out ${stats.outputTokens ?? 0}`,
-      ];
-      lines.push(
-        `🔢 Tokens: ${stats.totalTokens.toLocaleString()} (${parts.join(', ')})`,
-      );
+    if (typeof stats.totalTokens === "number") {
+      const parts = [`in ${stats.inputTokens ?? 0}`, `out ${stats.outputTokens ?? 0}`];
+      lines.push(`🔢 Tokens: ${stats.totalTokens.toLocaleString()} (${parts.join(", ")})`);
     }
     if (stats.toolUsage && stats.toolUsage.length) {
-      const sorted = [...stats.toolUsage]
-        .sort((a, b) => b.count - a.count)
-        .slice(0, 5);
-      lines.push('\nTop tools:');
+      const sorted = [...stats.toolUsage].sort((a, b) => b.count - a.count).slice(0, 5);
+      lines.push("\nTop tools:");
       for (const t of sorted) {
         const avg =
-          typeof t.averageDurationMs === 'number'
+          typeof t.averageDurationMs === "number"
             ? `, avg ${this.fmtDuration(Math.round(t.averageDurationMs))}`
-            : '';
+            : "";
         lines.push(
-          ` - ${t.name}: ${t.count} calls (${t.success} ok, ${t.failure} fail${avg}${t.lastError ? `, last error: ${t.lastError}` : ''})`,
+          ` - ${t.name}: ${t.count} calls (${t.success} ok, ${t.failure} fail${avg}${t.lastError ? `, last error: ${t.lastError}` : ""})`,
         );
       }
     }
     const tips = this.generatePerformanceTips(stats);
     if (tips.length) {
-      lines.push('\n💡 Performance Insights:');
+      lines.push("\n💡 Performance Insights:");
       for (const tip of tips.slice(0, 3)) lines.push(` - ${tip}`);
     }
-    return lines.join('\n');
+    return lines.join("\n");
   }
 
   private fmtDuration(ms: number): string {
@@ -221,43 +201,34 @@ export class AgentStatistics {
     const totalCalls = stats.totalToolCalls;
     const sr =
       stats.totalToolCalls > 0
-        ? (stats.successRate ??
-          (stats.successfulToolCalls / stats.totalToolCalls) * 100)
+        ? (stats.successRate ?? (stats.successfulToolCalls / stats.totalToolCalls) * 100)
         : 0;
 
     // High failure rate
-    if (sr < 80)
-      tips.push('Low tool success rate - review inputs and error messages');
+    if (sr < 80) tips.push("Low tool success rate - review inputs and error messages");
 
     // Long duration
     if (stats.totalDurationMs > 60_000)
-      tips.push('Long execution time - consider breaking down complex tasks');
+      tips.push("Long execution time - consider breaking down complex tasks");
 
     // Token usage
-    if (typeof stats.totalTokens === 'number' && stats.totalTokens > 100_000) {
-      tips.push(
-        'High token usage - consider optimizing prompts or narrowing scope',
-      );
+    if (typeof stats.totalTokens === "number" && stats.totalTokens > 100_000) {
+      tips.push("High token usage - consider optimizing prompts or narrowing scope");
     }
-    if (typeof stats.totalTokens === 'number' && totalCalls > 0) {
+    if (typeof stats.totalTokens === "number" && totalCalls > 0) {
       const avgTokPerCall = stats.totalTokens / totalCalls;
       if (avgTokPerCall > 5_000)
-        tips.push(
-          `High token usage per tool call (~${Math.round(avgTokPerCall)} tokens/call)`,
-        );
+        tips.push(`High token usage per tool call (~${Math.round(avgTokPerCall)} tokens/call)`);
     }
 
     // Network failures
     const isNetworkTool = (name: string) => /web|fetch|search/i.test(name);
     const hadNetworkFailure = (stats.toolUsage || []).some(
-      (t) =>
-        isNetworkTool(t.name) &&
-        t.lastError &&
-        /timeout|network/i.test(t.lastError),
+      (t) => isNetworkTool(t.name) && t.lastError && /timeout|network/i.test(t.lastError),
     );
     if (hadNetworkFailure)
       tips.push(
-        'Network operations had failures - consider increasing timeout or checking connectivity',
+        "Network operations had failures - consider increasing timeout or checking connectivity",
       );
 
     // Slow tools
diff --git a/packages/airiscode-core/src/agents/runtime/agent-types.ts b/packages/airiscode-core/src/agents/runtime/agent-types.ts
index 5328272f3..654684068 100644
--- a/packages/airiscode-core/src/agents/runtime/agent-types.ts
+++ b/packages/airiscode-core/src/agents/runtime/agent-types.ts
@@ -11,7 +11,7 @@
  * run, tool), termination modes, and interactive agent types.
  */
 
-import type { Content, FunctionDeclaration } from '../../types/llm.js';
+import type { Content, FunctionDeclaration } from "../../types/llm.js";
 
 // ─── Agent Configuration ─────────────────────────────────────
 
@@ -80,17 +80,17 @@ export interface ToolConfig {
  */
 export enum AgentTerminateMode {
   /** The agent's execution terminated due to an unrecoverable error. */
-  ERROR = 'ERROR',
+  ERROR = "ERROR",
   /** The agent's execution terminated because it exceeded the maximum allowed working time. */
-  TIMEOUT = 'TIMEOUT',
+  TIMEOUT = "TIMEOUT",
   /** The agent's execution successfully completed all its defined goals. */
-  GOAL = 'GOAL',
+  GOAL = "GOAL",
   /** The agent's execution terminated because it exceeded the maximum number of turns. */
-  MAX_TURNS = 'MAX_TURNS',
+  MAX_TURNS = "MAX_TURNS",
   /** The agent's execution was cancelled via an abort signal. */
-  CANCELLED = 'CANCELLED',
+  CANCELLED = "CANCELLED",
   /** The agent was gracefully shut down (e.g., arena/team session ended). */
-  SHUTDOWN = 'SHUTDOWN',
+  SHUTDOWN = "SHUTDOWN",
 }
 
 // ─── Agent Status ────────────────────────────────────────────
@@ -109,19 +109,17 @@ export enum AgentTerminateMode {
  * - CANCELLED:    Cancelled by user or system.
  */
 export enum AgentStatus {
-  INITIALIZING = 'initializing',
-  RUNNING = 'running',
-  IDLE = 'idle',
-  COMPLETED = 'completed',
-  FAILED = 'failed',
-  CANCELLED = 'cancelled',
+  INITIALIZING = "initializing",
+  RUNNING = "running",
+  IDLE = "idle",
+  COMPLETED = "completed",
+  FAILED = "failed",
+  CANCELLED = "cancelled",
 }
 
 /** True for COMPLETED, FAILED, CANCELLED — agent is done for good. */
 export const isTerminalStatus = (s: AgentStatus): boolean =>
-  s === AgentStatus.COMPLETED ||
-  s === AgentStatus.FAILED ||
-  s === AgentStatus.CANCELLED;
+  s === AgentStatus.COMPLETED || s === AgentStatus.FAILED || s === AgentStatus.CANCELLED;
 
 /** True for IDLE or COMPLETED — agent finished its work successfully. */
 export const isSuccessStatus = (s: AgentStatus): boolean =>
@@ -162,7 +160,7 @@ export interface AgentInteractiveConfig {
  */
 export interface AgentMessage {
   /** Discriminator for the message kind. */
-  role: 'user' | 'assistant' | 'tool_call' | 'tool_result' | 'info';
+  role: "user" | "assistant" | "tool_call" | "tool_result" | "info";
   /** The text content of the message. */
   content: string;
   /** When the message was created (ms since epoch). */
diff --git a/packages/airiscode-core/src/agents/runtime/index.ts b/packages/airiscode-core/src/agents/runtime/index.ts
index 93ef0e5a3..da9db2fed 100644
--- a/packages/airiscode-core/src/agents/runtime/index.ts
+++ b/packages/airiscode-core/src/agents/runtime/index.ts
@@ -8,10 +8,10 @@
  * @fileoverview Runtime barrel — re-exports agent execution primitives.
  */
 
-export * from './agent-types.js';
-export * from './agent-core.js';
-export * from './agent-headless.js';
-export * from './agent-interactive.js';
-export * from './agent-events.js';
-export * from './agent-statistics.js';
-export { AsyncMessageQueue } from '../../utils/asyncMessageQueue.js';
+export { AsyncMessageQueue } from "../../utils/asyncMessageQueue.js";
+export * from "./agent-core.js";
+export * from "./agent-events.js";
+export * from "./agent-headless.js";
+export * from "./agent-interactive.js";
+export * from "./agent-statistics.js";
+export * from "./agent-types.js";
diff --git a/packages/airiscode-core/src/config/config.ts b/packages/airiscode-core/src/config/config.ts
index 3fb20a441..2649adba1 100644
--- a/packages/airiscode-core/src/config/config.ts
+++ b/packages/airiscode-core/src/config/config.ts
@@ -4,158 +4,132 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { randomUUID } from "node:crypto";
 // Node built-ins
-import type { EventEmitter } from 'node:events';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import process from 'node:process';
-
+import type { EventEmitter } from "node:events";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import process from "node:process";
 // External dependencies
-import { ProxyAgent, setGlobalDispatcher } from 'undici';
-
+import { ProxyAgent, setGlobalDispatcher } from "undici";
+import { ArenaAgentClient } from "../agents/arena/ArenaAgentClient.js";
+import type { ArenaManager } from "../agents/arena/ArenaManager.js";
+import { MessageBus } from "../confirmation-bus/message-bus.js";
+import {
+  type HookExecutionRequest,
+  type HookExecutionResponse,
+  MessageBusType,
+} from "../confirmation-bus/types.js";
+// Core
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import { GeminiClient } from "../core/client.js";
 // Types
 import type {
   ContentGenerator,
   ContentGeneratorConfig,
-} from '../core/contentGenerator.js';
-import type { ContentGeneratorConfigSources } from '../core/contentGenerator.js';
-import type { MCPOAuthConfig } from '../mcp/oauth-provider.js';
-import type { ShellExecutionConfig } from '../services/shellExecutionService.js';
-import type { AnyToolInvocation } from '../tools/tools.js';
-import type { ArenaManager } from '../agents/arena/ArenaManager.js';
-import { ArenaAgentClient } from '../agents/arena/ArenaAgentClient.js';
-
-// Core
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import { GeminiClient } from '../core/client.js';
+  ContentGeneratorConfigSources,
+} from "../core/contentGenerator.js";
 import {
   AuthType,
   createContentGenerator,
   resolveContentGeneratorConfigWithSources,
-} from '../core/contentGenerator.js';
-
+} from "../core/contentGenerator.js";
+import { fireNotificationHook } from "../core/toolHookTriggers.js";
+import type { ClaudeMarketplaceConfig } from "../extension/claude-converter.js";
+import { type Extension, ExtensionManager } from "../extension/extensionManager.js";
+import { createHookOutput, HookSystem } from "../hooks/index.js";
+import { NotificationType, PermissionMode, type PermissionSuggestion } from "../hooks/types.js";
+// Other modules
+import { ideContextStore } from "../ide/ideContext.js";
+import type { LspClient } from "../lsp/types.js";
+import type { MCPOAuthConfig } from "../mcp/oauth-provider.js";
+import {
+  type AvailableModel,
+  type ModelProvidersConfig,
+  ModelsConfig,
+  type RuntimeModelSnapshot,
+} from "../models/index.js";
+import { InputFormat, OutputFormat } from "../output/types.js";
+import { PermissionManager } from "../permissions/permission-manager.js";
+import { PromptRegistry } from "../prompts/prompt-registry.js";
+import { ChatRecordingService } from "../services/chatRecordingService.js";
+import { CronScheduler } from "../services/cronScheduler.js";
 // Services
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
 import {
+  type FileEncodingType,
   type FileSystemService,
   StandardFileSystemService,
-  type FileEncodingType,
-} from '../services/fileSystemService.js';
-import { GitService } from '../services/gitService.js';
-import { CronScheduler } from '../services/cronScheduler.js';
-
-// Tools
-import { AskUserQuestionTool } from '../tools/askUserQuestion.js';
-import { EditTool } from '../tools/edit.js';
-import { ExitPlanModeTool } from '../tools/exitPlanMode.js';
-import { GlobTool } from '../tools/glob.js';
-import { GrepTool } from '../tools/grep.js';
-import { LSTool } from '../tools/ls.js';
-import type { SendSdkMcpMessage } from '../tools/mcp-client.js';
-import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
-import { ReadFileTool } from '../tools/read-file.js';
-import { canUseRipgrep } from '../utils/ripgrepUtils.js';
-import { RipGrepTool } from '../tools/ripGrep.js';
-import { ShellTool } from '../tools/shell.js';
-import { SkillTool } from '../tools/skill.js';
-import { AgentTool } from '../tools/agent.js';
-import { TodoWriteTool } from '../tools/todoWrite.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { WebFetchTool } from '../tools/web-fetch.js';
-import { WebSearchTool } from '../tools/web-search/index.js';
-import { WriteFileTool } from '../tools/write-file.js';
-import { LspTool } from '../tools/lsp.js';
-import { CronCreateTool } from '../tools/cron-create.js';
-import { CronListTool } from '../tools/cron-list.js';
-import { CronDeleteTool } from '../tools/cron-delete.js';
-import type { LspClient } from '../lsp/types.js';
-
-// Other modules
-import { ideContextStore } from '../ide/ideContext.js';
-import { InputFormat, OutputFormat } from '../output/types.js';
-import { PromptRegistry } from '../prompts/prompt-registry.js';
-import { SkillManager } from '../skills/skill-manager.js';
-import { PermissionManager } from '../permissions/permission-manager.js';
-import { SubagentManager } from '../subagents/subagent-manager.js';
-import type { SubagentConfig } from '../subagents/types.js';
+} from "../services/fileSystemService.js";
+import { GitService } from "../services/gitService.js";
+import { type ResumedSessionData, SessionService } from "../services/sessionService.js";
+import type { ShellExecutionConfig } from "../services/shellExecutionService.js";
+import { SkillManager } from "../skills/skill-manager.js";
+import { SubagentManager } from "../subagents/subagent-manager.js";
+import type { SubagentConfig } from "../subagents/types.js";
 import {
   DEFAULT_OTLP_ENDPOINT,
   DEFAULT_TELEMETRY_TARGET,
   initializeTelemetry,
-  logStartSession,
   logRipgrepFallback,
+  logStartSession,
   RipgrepFallbackEvent,
   StartSessionEvent,
   type TelemetryTarget,
-} from '../telemetry/index.js';
-import {
-  ExtensionManager,
-  type Extension,
-} from '../extension/extensionManager.js';
-import { HookSystem, createHookOutput } from '../hooks/index.js';
-import { MessageBus } from '../confirmation-bus/message-bus.js';
-import {
-  MessageBusType,
-  type HookExecutionRequest,
-  type HookExecutionResponse,
-} from '../confirmation-bus/types.js';
-import {
-  PermissionMode,
-  NotificationType,
-  type PermissionSuggestion,
-} from '../hooks/types.js';
-import { fireNotificationHook } from '../core/toolHookTriggers.js';
-
+} from "../telemetry/index.js";
+import { AgentTool } from "../tools/agent.js";
+// Tools
+import { AskUserQuestionTool } from "../tools/askUserQuestion.js";
+import { CronCreateTool } from "../tools/cron-create.js";
+import { CronDeleteTool } from "../tools/cron-delete.js";
+import { CronListTool } from "../tools/cron-list.js";
+import { EditTool } from "../tools/edit.js";
+import { ExitPlanModeTool } from "../tools/exitPlanMode.js";
+import { GlobTool } from "../tools/glob.js";
+import { GrepTool } from "../tools/grep.js";
+import { LSTool } from "../tools/ls.js";
+import { LspTool } from "../tools/lsp.js";
+import type { SendSdkMcpMessage } from "../tools/mcp-client.js";
+import { MemoryTool, setGeminiMdFilename } from "../tools/memoryTool.js";
+import { ReadFileTool } from "../tools/read-file.js";
+import { RipGrepTool } from "../tools/ripGrep.js";
+import { ShellTool } from "../tools/shell.js";
+import { SkillTool } from "../tools/skill.js";
+import { TodoWriteTool } from "../tools/todoWrite.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import type { AnyToolInvocation } from "../tools/tools.js";
+import { WebFetchTool } from "../tools/web-fetch.js";
+import { WebSearchTool } from "../tools/web-search/index.js";
+import { WriteFileTool } from "../tools/write-file.js";
 // Utils
-import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
-import { FileExclusions } from '../utils/ignorePatterns.js';
-import { shouldDefaultToNodePty } from '../utils/shell-utils.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-import { type ToolName } from '../utils/tool-utils.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { normalizeProxyUrl } from '../utils/proxyUtils.js';
-
+import { shouldAttemptBrowserLaunch } from "../utils/browser.js";
+import { createDebugLogger, type DebugLogger, setDebugLogSession } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { FileExclusions } from "../utils/ignorePatterns.js";
+import { loadServerHierarchicalMemory } from "../utils/memoryDiscovery.js";
+import { normalizeProxyUrl } from "../utils/proxyUtils.js";
+import { canUseRipgrep } from "../utils/ripgrepUtils.js";
+import { shouldDefaultToNodePty } from "../utils/shell-utils.js";
+import { type ToolName } from "../utils/tool-utils.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
 // Local config modules
-import type { FileFilteringOptions } from './constants.js';
+import type { FileFilteringOptions } from "./constants.js";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS,
   DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-} from './constants.js';
-import { DEFAULT_QWEN_EMBEDDING_MODEL } from './models.js';
-import { Storage } from './storage.js';
-import { ChatRecordingService } from '../services/chatRecordingService.js';
-import {
-  SessionService,
-  type ResumedSessionData,
-} from '../services/sessionService.js';
-import { randomUUID } from 'node:crypto';
-import { loadServerHierarchicalMemory } from '../utils/memoryDiscovery.js';
-import {
-  createDebugLogger,
-  setDebugLogSession,
-  type DebugLogger,
-} from '../utils/debugLogger.js';
-
-import {
-  ModelsConfig,
-  type ModelProvidersConfig,
-  type AvailableModel,
-  type RuntimeModelSnapshot,
-} from '../models/index.js';
-import type { ClaudeMarketplaceConfig } from '../extension/claude-converter.js';
+} from "./constants.js";
+import { DEFAULT_QWEN_EMBEDDING_MODEL } from "./models.js";
+import { Storage } from "./storage.js";
 
 // Re-export types
 export type { AnyToolInvocation, FileFilteringOptions, MCPOAuthConfig };
-export {
-  DEFAULT_FILE_FILTERING_OPTIONS,
-  DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-};
+export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS };
 
 export enum ApprovalMode {
-  PLAN = 'plan',
-  DEFAULT = 'default',
-  AUTO_EDIT = 'auto-edit',
-  YOLO = 'yolo',
+  PLAN = "plan",
+  DEFAULT = "default",
+  AUTO_EDIT = "auto-edit",
+  YOLO = "yolo",
 }
 
 export const APPROVAL_MODES = Object.values(ApprovalMode);
@@ -176,23 +150,23 @@ export interface ApprovalModeInfo {
 export const APPROVAL_MODE_INFO: Record<ApprovalMode, ApprovalModeInfo> = {
   [ApprovalMode.PLAN]: {
     id: ApprovalMode.PLAN,
-    name: 'Plan',
-    description: 'Analyze only, do not modify files or execute commands',
+    name: "Plan",
+    description: "Analyze only, do not modify files or execute commands",
   },
   [ApprovalMode.DEFAULT]: {
     id: ApprovalMode.DEFAULT,
-    name: 'Default',
-    description: 'Require approval for file edits or shell commands',
+    name: "Default",
+    description: "Require approval for file edits or shell commands",
   },
   [ApprovalMode.AUTO_EDIT]: {
     id: ApprovalMode.AUTO_EDIT,
-    name: 'Auto Edit',
-    description: 'Automatically approve file edits',
+    name: "Auto Edit",
+    description: "Automatically approve file edits",
   },
   [ApprovalMode.YOLO]: {
     id: ApprovalMode.YOLO,
-    name: 'YOLO',
-    description: 'Automatically approve all tools',
+    name: "YOLO",
+    description: "Automatically approve all tools",
   },
 };
 
@@ -213,7 +187,7 @@ export interface TelemetrySettings {
   enabled?: boolean;
   target?: TelemetryTarget;
   otlpEndpoint?: string;
-  otlpProtocol?: 'grpc' | 'http';
+  otlpProtocol?: "grpc" | "http";
   logPrompts?: boolean;
   outfile?: string;
   useCollector?: boolean;
@@ -229,11 +203,11 @@ export interface GitCoAuthorSettings {
   email?: string;
 }
 
-export type ExtensionOriginSource = 'AirisCode' | 'Claude' | 'Gemini';
+export type ExtensionOriginSource = "AirisCode" | "Claude" | "Gemini";
 
 export interface ExtensionInstallMetadata {
   source: string;
-  type: 'git' | 'local' | 'link' | 'github-release' | 'npm';
+  type: "git" | "local" | "link" | "github-release" | "npm";
   originSource?: ExtensionOriginSource;
   releaseTag?: string; // Only present for github-release and npm installs.
   registryUrl?: string; // Only present for npm installs.
@@ -278,7 +252,7 @@ export class MCPServerConfig {
     /* targetServiceAccount format: <service-account-name>@<project-num>.iam.gserviceaccount.com */
     readonly targetServiceAccount?: string,
     // SDK MCP server type - 'sdk' indicates server runs in SDK process
-    readonly type?: 'sdk',
+    readonly type?: "sdk",
   ) {}
 }
 
@@ -286,15 +260,15 @@ export class MCPServerConfig {
  * Check if an MCP server config represents an SDK server
  */
 export function isSdkMcpServerConfig(config: MCPServerConfig): boolean {
-  return config.type === 'sdk';
+  return config.type === "sdk";
 }
 
 export enum AuthProviderType {
-  DYNAMIC_DISCOVERY = 'dynamic_discovery',
+  DYNAMIC_DISCOVERY = "dynamic_discovery",
 }
 
 export interface SandboxConfig {
-  command: 'docker' | 'podman' | 'sandbox-exec';
+  command: "docker" | "podman" | "sandbox-exec";
   image: string;
 }
 
@@ -391,12 +365,12 @@ export interface ConfigParameters {
   generationConfigSources?: ContentGeneratorConfigSources;
   cliVersion?: string;
   loadMemoryFromIncludeDirectories?: boolean;
-  importFormat?: 'tree' | 'flat';
+  importFormat?: "tree" | "flat";
   chatRecording?: boolean;
   // Web search providers
   webSearch?: {
     provider: Array<{
-      type: 'tavily' | 'google';
+      type: "tavily" | "google";
       apiKey?: string;
       searchEngineId?: string;
     }>;
@@ -447,25 +421,23 @@ export interface ConfigParameters {
    * @param rule - The raw rule string, e.g. "Bash(git *)" or "Edit".
    */
   onPersistPermissionRule?: (
-    scope: 'project' | 'user',
-    ruleType: 'allow' | 'ask' | 'deny',
+    scope: "project" | "user",
+    ruleType: "allow" | "ask" | "deny",
     rule: string,
   ) => Promise<void>;
 }
 
-function normalizeConfigOutputFormat(
-  format: OutputFormat | undefined,
-): OutputFormat | undefined {
+function normalizeConfigOutputFormat(format: OutputFormat | undefined): OutputFormat | undefined {
   if (!format) {
     return undefined;
   }
   switch (format) {
-    case 'stream-json':
+    case "stream-json":
       return OutputFormat.STREAM_JSON;
-    case 'json':
+    case "json":
     case OutputFormat.JSON:
       return OutputFormat.JSON;
-    case 'text':
+    case "text":
     case OutputFormat.TEXT:
     default:
       return OutputFormat.TEXT;
@@ -569,10 +541,10 @@ export class Config {
   private readonly cronEnabled: boolean = false;
   private readonly chatRecordingEnabled: boolean;
   private readonly loadMemoryFromIncludeDirectories: boolean = false;
-  private readonly importFormat: 'tree' | 'flat';
+  private readonly importFormat: "tree" | "flat";
   private readonly webSearch?: {
     provider: Array<{
-      type: 'tavily' | 'google';
+      type: "tavily" | "google";
       apiKey?: string;
       searchEngineId?: string;
     }>;
@@ -587,17 +559,15 @@ export class Config {
   private readonly skipNextSpeakerCheck: boolean;
   private shellExecutionConfig: ShellExecutionConfig;
   private arenaManager: ArenaManager | null = null;
-  private arenaManagerChangeCallback:
-    | ((manager: ArenaManager | null) => void)
-    | null = null;
+  private arenaManagerChangeCallback: ((manager: ArenaManager | null) => void) | null = null;
   private readonly arenaAgentClient: ArenaAgentClient | null;
   private readonly agentsSettings: AgentsCollabSettings;
   private readonly skipLoopDetection: boolean;
   private readonly skipStartupContext: boolean;
   private readonly warnings: string[];
   private readonly onPersistPermissionRuleCallback?: (
-    scope: 'project' | 'user',
-    ruleType: 'allow' | 'ask' | 'deny',
+    scope: "project" | "user",
+    ruleType: "allow" | "ask" | "deny",
     rule: string,
   ) => Promise<void>;
   private initialized: boolean = false;
@@ -622,10 +592,7 @@ export class Config {
     this.fileSystemService = new StandardFileSystemService();
     this.sandbox = params.sandbox;
     this.targetDir = path.resolve(params.targetDir);
-    this.workspaceContext = new WorkspaceContext(
-      this.targetDir,
-      params.includeDirectories ?? [],
-    );
+    this.workspaceContext = new WorkspaceContext(this.targetDir, params.includeDirectories ?? []);
     this.debugMode = params.debugMode;
     this.inputFormat = params.inputFormat ?? InputFormat.TEXT;
     const normalizedOutputFormat = normalizeConfigOutputFormat(
@@ -652,7 +619,7 @@ export class Config {
     this.excludedMcpServers = params.excludedMcpServers;
     this.sessionSubagents = params.sessionSubagents ?? [];
     this.sdkMode = params.sdkMode ?? false;
-    this.userMemory = params.userMemory ?? '';
+    this.userMemory = params.userMemory ?? "";
     this.geminiMdFileCount = params.geminiMdFileCount ?? 0;
     this.approvalMode = params.approvalMode ?? ApprovalMode.DEFAULT;
     this.accessibility = params.accessibility ?? {};
@@ -667,8 +634,8 @@ export class Config {
     };
     this.gitCoAuthor = {
       enabled: params.gitCoAuthor ?? true,
-      name: 'Qwen-Coder',
-      email: 'airiscoder@alibabacloud.com',
+      name: "Qwen-Coder",
+      email: "airiscoder@alibabacloud.com",
     };
     this.usageStatisticsEnabled = params.usageStatisticsEnabled ?? true;
     this.outputLanguageFilePath = params.outputLanguageFilePath;
@@ -676,8 +643,7 @@ export class Config {
     this.fileFiltering = {
       respectGitIgnore: params.fileFiltering?.respectGitIgnore ?? true,
       respectAiriscodeIgnore: params.fileFiltering?.respectAiriscodeIgnore ?? true,
-      enableRecursiveFileSearch:
-        params.fileFiltering?.enableRecursiveFileSearch ?? true,
+      enableRecursiveFileSearch: params.fileFiltering?.enableRecursiveFileSearch ?? true,
       enableFuzzySearch: params.fileFiltering?.enableFuzzySearch ?? true,
     };
     this.checkpointing = params.checkpointing ?? false;
@@ -686,11 +652,9 @@ export class Config {
     this.fileDiscoveryService = params.fileDiscoveryService ?? null;
     this.bugCommand = params.bugCommand;
     this.maxSessionTurns = params.maxSessionTurns ?? -1;
-    this.thinkingIdleThresholdMs =
-      (params.thinkingIdleThresholdMinutes ?? 5) * 60 * 1000;
+    this.thinkingIdleThresholdMs = (params.thinkingIdleThresholdMinutes ?? 5) * 60 * 1000;
     this.sessionTokenLimit = params.sessionTokenLimit ?? -1;
-    this.experimentalZedIntegration =
-      params.experimentalZedIntegration ?? false;
+    this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
     this.cronEnabled = params.cronEnabled ?? false;
     this.listExtensions = params.listExtensions ?? false;
     this.overrideExtensions = params.overrideExtensions;
@@ -703,9 +667,8 @@ export class Config {
 
     this.chatRecordingEnabled = params.chatRecording ?? true;
 
-    this.loadMemoryFromIncludeDirectories =
-      params.loadMemoryFromIncludeDirectories ?? false;
-    this.importFormat = params.importFormat ?? 'tree';
+    this.loadMemoryFromIncludeDirectories = params.loadMemoryFromIncludeDirectories ?? false;
+    this.importFormat = params.importFormat ?? "tree";
     this.chatCompression = params.chatCompression;
     this.interactive = params.interactive ?? false;
     this.trustedFolder = params.trustedFolder;
@@ -718,18 +681,16 @@ export class Config {
     this.webSearch = params.webSearch;
     this.useRipgrep = params.useRipgrep ?? true;
     this.useBuiltinRipgrep = params.useBuiltinRipgrep ?? true;
-    this.shouldUseNodePtyShell =
-      params.shouldUseNodePtyShell ?? shouldDefaultToNodePty();
+    this.shouldUseNodePtyShell = params.shouldUseNodePtyShell ?? shouldDefaultToNodePty();
     this.skipNextSpeakerCheck = params.skipNextSpeakerCheck ?? true;
     this.shellExecutionConfig = {
       terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
       terminalHeight: params.shellExecutionConfig?.terminalHeight ?? 24,
       showColor: params.shellExecutionConfig?.showColor ?? false,
-      pager: params.shellExecutionConfig?.pager ?? 'cat',
+      pager: params.shellExecutionConfig?.pager ?? "cat",
     };
     this.truncateToolOutputThreshold =
-      params.truncateToolOutputThreshold ??
-      DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
+      params.truncateToolOutputThreshold ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
     this.truncateToolOutputLines =
       params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
     this.channel = params.channel;
@@ -787,10 +748,10 @@ export class Config {
    */
   async initialize(options?: ConfigInitializeOptions): Promise<void> {
     if (this.initialized) {
-      throw Error('Config was already initialized');
+      throw Error("Config was already initialized");
     }
     this.initialized = true;
-    this.debugLogger.info('Config initialization started');
+    this.debugLogger.info("Config initialization started");
 
     // Initialize centralized FileDiscoveryService
     this.getFileService();
@@ -800,13 +761,13 @@ export class Config {
     this.promptRegistry = new PromptRegistry();
     this.extensionManager.setConfig(this);
     await this.extensionManager.refreshCache();
-    this.debugLogger.debug('Extension manager initialized');
+    this.debugLogger.debug("Extension manager initialized");
 
     // Initialize hook system if enabled
     if (!this.disableAllHooks) {
       this.hookSystem = new HookSystem(this);
       await this.hookSystem.initialize();
-      this.debugLogger.debug('Hook system initialized');
+      this.debugLogger.debug("Hook system initialized");
 
       // Initialize MessageBus for hook execution
       this.messageBus = new MessageBus();
@@ -822,7 +783,7 @@ export class Config {
                 type: MessageBusType.HOOK_EXECUTION_RESPONSE,
                 correlationId: request.correlationId,
                 success: false,
-                error: new Error('Hook system not initialized'),
+                error: new Error("Hook system not initialized"),
               } as HookExecutionResponse);
               return;
             }
@@ -833,7 +794,7 @@ export class Config {
                 type: MessageBusType.HOOK_EXECUTION_RESPONSE,
                 correlationId: request.correlationId,
                 success: false,
-                error: new Error('Hook execution cancelled (aborted)'),
+                error: new Error("Hook execution cancelled (aborted)"),
               } as HookExecutionResponse);
               return;
             }
@@ -844,101 +805,95 @@ export class Config {
             const input = request.input || {};
             const signal = request.signal;
             switch (request.eventName) {
-              case 'UserPromptSubmit':
+              case "UserPromptSubmit":
                 result = await hookSystem.fireUserPromptSubmitEvent(
-                  (input['prompt'] as string) || '',
+                  (input["prompt"] as string) || "",
                   signal,
                 );
                 break;
-              case 'Stop': {
+              case "Stop": {
                 const stopResult = await hookSystem.fireStopEvent(
-                  (input['stop_hook_active'] as boolean) || false,
-                  (input['last_assistant_message'] as string) || '',
+                  (input["stop_hook_active"] as boolean) || false,
+                  (input["last_assistant_message"] as string) || "",
                   signal,
                 );
                 result = stopResult.finalOutput
-                  ? createHookOutput('Stop', stopResult.finalOutput)
+                  ? createHookOutput("Stop", stopResult.finalOutput)
                   : undefined;
                 stopHookCount = stopResult.allOutputs.length;
                 break;
               }
-              case 'PreToolUse': {
+              case "PreToolUse": {
                 result = await hookSystem.firePreToolUseEvent(
-                  (input['tool_name'] as string) || '',
-                  (input['tool_input'] as Record<string, unknown>) || {},
-                  (input['tool_use_id'] as string) || '',
-                  (input['permission_mode'] as PermissionMode | undefined) ??
+                  (input["tool_name"] as string) || "",
+                  (input["tool_input"] as Record<string, unknown>) || {},
+                  (input["tool_use_id"] as string) || "",
+                  (input["permission_mode"] as PermissionMode | undefined) ??
                     PermissionMode.Default,
                   signal,
                 );
                 break;
               }
-              case 'PostToolUse':
+              case "PostToolUse":
                 result = await hookSystem.firePostToolUseEvent(
-                  (input['tool_name'] as string) || '',
-                  (input['tool_input'] as Record<string, unknown>) || {},
-                  (input['tool_response'] as Record<string, unknown>) || {},
-                  (input['tool_use_id'] as string) || '',
-                  (input['permission_mode'] as any) || 'default',
+                  (input["tool_name"] as string) || "",
+                  (input["tool_input"] as Record<string, unknown>) || {},
+                  (input["tool_response"] as Record<string, unknown>) || {},
+                  (input["tool_use_id"] as string) || "",
+                  (input["permission_mode"] as any) || "default",
                   signal,
                 );
                 break;
-              case 'PostToolUseFailure':
+              case "PostToolUseFailure":
                 result = await hookSystem.firePostToolUseFailureEvent(
-                  (input['tool_use_id'] as string) || '',
-                  (input['tool_name'] as string) || '',
-                  (input['tool_input'] as Record<string, unknown>) || {},
-                  (input['error'] as string) || '',
-                  input['is_interrupt'] as boolean | undefined,
-                  (input['permission_mode'] as any) || 'default',
+                  (input["tool_use_id"] as string) || "",
+                  (input["tool_name"] as string) || "",
+                  (input["tool_input"] as Record<string, unknown>) || {},
+                  (input["error"] as string) || "",
+                  input["is_interrupt"] as boolean | undefined,
+                  (input["permission_mode"] as any) || "default",
                   signal,
                 );
                 break;
-              case 'Notification':
+              case "Notification":
                 result = await hookSystem.fireNotificationEvent(
-                  (input['message'] as string) || '',
-                  ((input['notification_type'] || 'permission_prompt') as any),
-                  (input['title'] as string) || undefined,
+                  (input["message"] as string) || "",
+                  (input["notification_type"] || "permission_prompt") as any,
+                  (input["title"] as string) || undefined,
                   signal,
                 );
                 break;
-              case 'PermissionRequest':
+              case "PermissionRequest":
                 result = await hookSystem.firePermissionRequestEvent(
-                  (input['tool_name'] as string) || '',
-                  (input['tool_input'] as Record<string, unknown>) || {},
-                  (input['permission_mode'] as any) ||
-                    PermissionMode.Default,
-                  (input['permission_suggestions'] as
-                    | PermissionSuggestion[]
-                    | undefined) || undefined,
+                  (input["tool_name"] as string) || "",
+                  (input["tool_input"] as Record<string, unknown>) || {},
+                  (input["permission_mode"] as any) || PermissionMode.Default,
+                  (input["permission_suggestions"] as PermissionSuggestion[] | undefined) ||
+                    undefined,
                   signal,
                 );
                 break;
-              case 'SubagentStart':
+              case "SubagentStart":
                 result = await hookSystem.fireSubagentStartEvent(
-                  (input['agent_id'] as string) || '',
-                  (input['agent_type'] as string) || '',
-                  (input['permission_mode'] as any) ||
-                    PermissionMode.Default,
+                  (input["agent_id"] as string) || "",
+                  (input["agent_type"] as string) || "",
+                  (input["permission_mode"] as any) || PermissionMode.Default,
                   signal,
                 );
                 break;
-              case 'SubagentStop':
+              case "SubagentStop":
                 result = await hookSystem.fireSubagentStopEvent(
-                  (input['agent_id'] as string) || '',
-                  (input['agent_type'] as string) || '',
-                  (input['agent_transcript_path'] as string) || '',
-                  (input['last_assistant_message'] as string) || '',
-                  (input['stop_hook_active'] as boolean) || false,
-                  (input['permission_mode'] as any) ||
-                    PermissionMode.Default,
+                  (input["agent_id"] as string) || "",
+                  (input["agent_type"] as string) || "",
+                  (input["agent_transcript_path"] as string) || "",
+                  (input["last_assistant_message"] as string) || "",
+                  (input["stop_hook_active"] as boolean) || false,
+                  (input["permission_mode"] as any) || PermissionMode.Default,
                   signal,
                 );
                 break;
               default:
-                this.debugLogger.warn(
-                  `Unknown hook event: ${request.eventName}`,
-                );
+                this.debugLogger.warn(`Unknown hook event: ${request.eventName}`);
                 result = undefined;
             }
 
@@ -963,19 +918,19 @@ export class Config {
         },
       );
 
-      this.debugLogger.debug('MessageBus initialized with hook subscription');
+      this.debugLogger.debug("MessageBus initialized with hook subscription");
     } else {
-      this.debugLogger.debug('Hook system disabled, skipping initialization');
+      this.debugLogger.debug("Hook system disabled, skipping initialization");
     }
 
     this.subagentManager = new SubagentManager(this);
     this.skillManager = new SkillManager(this);
     await this.skillManager.startWatching();
-    this.debugLogger.debug('Skill manager initialized');
+    this.debugLogger.debug("Skill manager initialized");
 
     this.permissionManager = new PermissionManager(this);
     this.permissionManager.initialize();
-    this.debugLogger.debug('Permission manager initialized');
+    this.debugLogger.debug("Permission manager initialized");
 
     // Load session subagents if they were provided before initialization
     if (this.sessionSubagents.length > 0) {
@@ -985,23 +940,21 @@ export class Config {
     await this.extensionManager.refreshCache();
 
     await this.refreshHierarchicalMemory();
-    this.debugLogger.debug('Hierarchical memory loaded');
+    this.debugLogger.debug("Hierarchical memory loaded");
 
-    this.toolRegistry = await this.createToolRegistry(
-      options?.sendSdkMcpMessage,
-    );
+    this.toolRegistry = await this.createToolRegistry(options?.sendSdkMcpMessage);
     this.debugLogger.info(
       `Tool registry initialized with ${this.toolRegistry.getAllToolNames().length} tools`,
     );
 
     await this.geminiClient.initialize();
-    this.debugLogger.info('Gemini client initialized');
+    this.debugLogger.info("Gemini client initialized");
 
     // Detect and capture runtime model snapshot (from CLI/ENV/credentials)
     this.modelsConfig.detectAndCaptureRuntimeModel();
 
     logStartSession(this, new StartSessionEvent(this));
-    this.debugLogger.info('Config initialization completed');
+    this.debugLogger.info("Config initialization completed");
   }
 
   async refreshHierarchicalMemory(): Promise<void> {
@@ -1054,9 +1007,7 @@ export class Config {
    *
    * @param modelProvidersConfig - The updated model providers configuration
    */
-  reloadModelProvidersConfig(
-    modelProvidersConfig?: ModelProvidersConfig,
-  ): void {
+  reloadModelProvidersConfig(modelProvidersConfig?: ModelProvidersConfig): void {
     this.modelsConfig.reloadModelProvidersConfig(modelProvidersConfig);
   }
 
@@ -1069,8 +1020,7 @@ export class Config {
     this.modelsConfig.syncAfterAuthRefresh(authMethod, modelId);
 
     // Check and consume cached credentials flag
-    const requireCached =
-      this.modelsConfig.consumeRequireCachedCredentialsFlag();
+    const requireCached = this.modelsConfig.consumeRequireCachedCredentialsFlag();
 
     const { config, sources } = resolveContentGeneratorConfigWithSources(
       this,
@@ -1102,7 +1052,7 @@ export class Config {
         messageBus,
         `Successfully authenticated with ${authMethod}`,
         NotificationType.AuthSuccess,
-        'Authentication successful',
+        "Authentication successful",
       ).catch(() => {
         // Silently ignore errors - fireNotificationHook has internal error handling
         // and notification hooks should not block the auth flow
@@ -1117,13 +1067,10 @@ export class Config {
     if (!this.baseLlmClient) {
       // Handle cases where initialization might be deferred or authentication failed
       if (this.contentGenerator) {
-        this.baseLlmClient = new BaseLlmClient(
-          this.getContentGenerator(),
-          this,
-        );
+        this.baseLlmClient = new BaseLlmClient(this.getContentGenerator(), this);
       } else {
         throw new Error(
-          'BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.',
+          "BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.",
         );
       }
     }
@@ -1150,10 +1097,7 @@ export class Config {
   /**
    * Starts a new session and resets session-scoped services.
    */
-  startNewSession(
-    sessionId?: string,
-    sessionData?: ResumedSessionData,
-  ): string {
+  startNewSession(sessionId?: string, sessionData?: ResumedSessionData): string {
     this.sessionId = sessionId ?? randomUUID();
     this.sessionData = sessionData;
     setDebugLogSession(this);
@@ -1178,7 +1122,7 @@ export class Config {
     return this.loadMemoryFromIncludeDirectories;
   }
 
-  getImportFormat(): 'tree' | 'flat' {
+  getImportFormat(): "tree" | "flat" {
     return this.importFormat;
   }
 
@@ -1189,10 +1133,7 @@ export class Config {
   getContentGeneratorConfigSources(): ContentGeneratorConfigSources {
     // If contentGeneratorConfigSources is empty (before initializeAuth),
     // get sources from ModelsConfig
-    if (
-      Object.keys(this.contentGeneratorConfigSources).length === 0 &&
-      this.modelsConfig
-    ) {
+    if (Object.keys(this.contentGeneratorConfigSources).length === 0 && this.modelsConfig) {
       return this.modelsConfig.getGenerationConfigSources();
     }
     return this.contentGeneratorConfigSources;
@@ -1221,10 +1162,7 @@ export class Config {
    * Handle model change from ModelsConfig.
    * This updates the content generator config with the new model settings.
    */
-  private async handleModelChange(
-    authType: AuthType,
-    requiresRefresh: boolean,
-  ): Promise<void> {
+  private async handleModelChange(authType: AuthType, requiresRefresh: boolean): Promise<void> {
     if (!this.contentGeneratorConfig) {
       return;
     }
@@ -1307,12 +1245,12 @@ export class Config {
 
   isRestrictiveSandbox(): boolean {
     const sandboxConfig = this.getSandbox();
-    const seatbeltProfile = process.env['SEATBELT_PROFILE'];
+    const seatbeltProfile = process.env["SEATBELT_PROFILE"];
     return (
       !!sandboxConfig &&
-      sandboxConfig.command === 'sandbox-exec' &&
+      sandboxConfig.command === "sandbox-exec" &&
       !!seatbeltProfile &&
-      seatbeltProfile.startsWith('restrictive-')
+      seatbeltProfile.startsWith("restrictive-")
     );
   }
 
@@ -1356,7 +1294,7 @@ export class Config {
       await this.cleanupArenaRuntime();
     } catch (error) {
       // Log but don't throw - cleanup should be best-effort
-      this.debugLogger.error('Error during Config shutdown:', error);
+      this.debugLogger.error("Error during Config shutdown:", error);
     }
   }
 
@@ -1452,22 +1390,18 @@ export class Config {
     let mcpServers = { ...(this.mcpServers || {}) };
     const extensions = this.getActiveExtensions();
     for (const extension of extensions) {
-      Object.entries(extension.config.mcpServers || {}).forEach(
-        ([key, server]) => {
-          if (mcpServers[key]) return;
-          mcpServers[key] = {
-            ...server,
-            extensionName: extension.config.name,
-          };
-        },
-      );
+      Object.entries(extension.config.mcpServers || {}).forEach(([key, server]) => {
+        if (mcpServers[key]) return;
+        mcpServers[key] = {
+          ...server,
+          extensionName: extension.config.name,
+        };
+      });
     }
 
     if (this.allowedMcpServers) {
       mcpServers = Object.fromEntries(
-        Object.entries(mcpServers).filter(([key]) =>
-          this.allowedMcpServers?.includes(key),
-        ),
+        Object.entries(mcpServers).filter(([key]) => this.allowedMcpServers?.includes(key)),
       );
     }
 
@@ -1492,7 +1426,7 @@ export class Config {
 
   addMcpServers(servers: Record<string, MCPServerConfig>): void {
     if (this.initialized) {
-      throw new Error('Cannot modify mcpServers after initialization');
+      throw new Error("Cannot modify mcpServers after initialization");
     }
     this.mcpServers = { ...this.mcpServers, ...servers };
   }
@@ -1510,7 +1444,7 @@ export class Config {
    */
   setLspClient(client: LspClient | undefined): void {
     if (this.initialized) {
-      throw new Error('Cannot set LSP client after initialization');
+      throw new Error("Cannot set LSP client after initialization");
     }
     this.lspClient = client;
   }
@@ -1521,7 +1455,7 @@ export class Config {
 
   setSessionSubagents(subagents: SubagentConfig[]): void {
     if (this.initialized) {
-      throw new Error('Cannot modify sessionSubagents after initialization');
+      throw new Error("Cannot modify sessionSubagents after initialization");
     }
     this.sessionSubagents = subagents;
   }
@@ -1563,9 +1497,7 @@ export class Config {
    * Register a callback invoked whenever the arena manager changes.
    * Pass `null` to unsubscribe. Only one subscriber is supported.
    */
-  onArenaManagerChange(
-    cb: ((manager: ArenaManager | null) => void) | null,
-  ): void {
+  onArenaManagerChange(cb: ((manager: ArenaManager | null) => void) | null): void {
     this.arenaManagerChangeCallback = cb;
   }
 
@@ -1607,22 +1539,13 @@ export class Config {
   }
 
   setApprovalMode(mode: ApprovalMode): void {
-    if (
-      !this.isTrustedFolder() &&
-      mode !== ApprovalMode.DEFAULT &&
-      mode !== ApprovalMode.PLAN
-    ) {
-      throw new Error(
-        'Cannot enable privileged approval modes in an untrusted folder.',
-      );
+    if (!this.isTrustedFolder() && mode !== ApprovalMode.DEFAULT && mode !== ApprovalMode.PLAN) {
+      throw new Error("Cannot enable privileged approval modes in an untrusted folder.");
     }
     // Track the mode before entering plan mode so it can be restored later
     if (mode === ApprovalMode.PLAN && this.approvalMode !== ApprovalMode.PLAN) {
       this.prePlanMode = this.approvalMode;
-    } else if (
-      mode !== ApprovalMode.PLAN &&
-      this.approvalMode === ApprovalMode.PLAN
-    ) {
+    } else if (mode !== ApprovalMode.PLAN && this.approvalMode === ApprovalMode.PLAN) {
       this.prePlanMode = undefined;
     }
     this.approvalMode = mode;
@@ -1642,7 +1565,7 @@ export class Config {
     const filePath = this.getPlanFilePath();
     const dir = path.dirname(filePath);
     fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(filePath, plan, 'utf-8');
+    fs.writeFileSync(filePath, plan, "utf-8");
   }
 
   /**
@@ -1651,13 +1574,13 @@ export class Config {
   loadPlan(): string | undefined {
     const filePath = this.getPlanFilePath();
     try {
-      return fs.readFileSync(filePath, 'utf-8');
+      return fs.readFileSync(filePath, "utf-8");
     } catch (error: unknown) {
       if (
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'code' in error &&
-        (error as NodeJS.ErrnoException).code === 'ENOENT'
+        "code" in error &&
+        (error as NodeJS.ErrnoException).code === "ENOENT"
       ) {
         return undefined;
       }
@@ -1665,7 +1588,7 @@ export class Config {
     }
   }
 
-  getInputFormat(): 'text' | 'stream-json' {
+  getInputFormat(): "text" | "stream-json" {
     return this.inputFormat;
   }
 
@@ -1689,8 +1612,8 @@ export class Config {
     return this.telemetrySettings.otlpEndpoint ?? DEFAULT_OTLP_ENDPOINT;
   }
 
-  getTelemetryOtlpProtocol(): 'grpc' | 'http' {
-    return this.telemetrySettings.otlpProtocol ?? 'grpc';
+  getTelemetryOtlpProtocol(): "grpc" | "http" {
+    return this.telemetrySettings.otlpProtocol ?? "grpc";
   }
 
   getTelemetryTarget(): TelemetryTarget {
@@ -1722,7 +1645,7 @@ export class Config {
 
   isCronEnabled(): boolean {
     // Cron is experimental and opt-in: enabled via settings or env var
-    if (process.env['AIRISCODE_ENABLE_CRON'] === '1') return true;
+    if (process.env["AIRISCODE_ENABLE_CRON"] === "1") return true;
     return this.cronEnabled;
   }
 
@@ -1791,9 +1714,7 @@ export class Config {
   }
 
   getExtensionContextFilePaths(): string[] {
-    const extensionContextFilePaths = this.getActiveExtensions().flatMap(
-      (e) => e.contextFiles,
-    );
+    const extensionContextFilePaths = this.getActiveExtensions().flatMap((e) => e.contextFiles);
     return [
       ...extensionContextFilePaths,
       ...(this.outputLanguageFilePath ? [this.outputLanguageFilePath] : []),
@@ -1873,9 +1794,7 @@ export class Config {
   getExtensions(): Extension[] {
     const extensions = this.extensionManager.getLoadedExtensions();
     if (this.overrideExtensions) {
-      return extensions.filter((e) =>
-        this.overrideExtensions?.includes(e.name),
-      );
+      return extensions.filter((e) => this.overrideExtensions?.includes(e.name));
     } else {
       return extensions;
     }
@@ -1889,18 +1808,15 @@ export class Config {
     const mcpServers = { ...(this.mcpServers || {}) };
     const extensions = this.getActiveExtensions();
     for (const extension of extensions) {
-      Object.entries(extension.config.mcpServers || {}).forEach(
-        ([key, server]) => {
-          if (mcpServers[key]) return;
-          mcpServers[key] = {
-            ...server,
-            extensionName: extension.config.name,
-          };
-        },
-      );
+      Object.entries(extension.config.mcpServers || {}).forEach(([key, server]) => {
+        if (mcpServers[key]) return;
+        mcpServers[key] = {
+          ...server,
+          extensionName: extension.config.name,
+        };
+      });
     }
-    const blockedMcpServers: Array<{ name: string; extensionName: string }> =
-      [];
+    const blockedMcpServers: Array<{ name: string; extensionName: string }> = [];
 
     if (this.allowedMcpServers) {
       Object.entries(mcpServers).forEach(([key, server]) => {
@@ -1908,7 +1824,7 @@ export class Config {
         if (!isAllowed) {
           blockedMcpServers.push({
             name: key,
-            extensionName: server.extensionName || '',
+            extensionName: server.extensionName || "",
           });
         }
       });
@@ -2032,10 +1948,8 @@ export class Config {
 
   setShellExecutionConfig(config: ShellExecutionConfig): void {
     this.shellExecutionConfig = {
-      terminalWidth:
-        config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
-      terminalHeight:
-        config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
+      terminalWidth: config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
+      terminalHeight: config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
       showColor: config.showColor ?? this.shellExecutionConfig.showColor,
       pager: config.pager ?? this.shellExecutionConfig.pager,
     };
@@ -2100,12 +2014,12 @@ export class Config {
    */
   getTranscriptPath(): string {
     if (!this.chatRecordingEnabled) {
-      return '';
+      return "";
     }
     const projectDir = this.storage.getProjectDir();
     const sessionId = this.getSessionId();
     const safeFilename = `${sessionId}.jsonl`;
-    return path.join(projectDir, 'chats', safeFilename);
+    return path.join(projectDir, "chats", safeFilename);
   }
 
   /**
@@ -2140,8 +2054,8 @@ export class Config {
    */
   getOnPersistPermissionRule():
     | ((
-        scope: 'project' | 'user',
-        ruleType: 'allow' | 'ask' | 'deny',
+        scope: "project" | "user",
+        ruleType: "allow" | "ask" | "deny",
         rule: string,
       ) => Promise<void>)
     | undefined {
@@ -2152,17 +2066,13 @@ export class Config {
     sendSdkMcpMessage?: SendSdkMcpMessage,
     options?: { skipDiscovery?: boolean },
   ): Promise<ToolRegistry> {
-    const registry = new ToolRegistry(
-      this,
-      this.eventEmitter,
-      sendSdkMcpMessage,
-    );
+    const registry = new ToolRegistry(this, this.eventEmitter, sendSdkMcpMessage);
 
     // Helper to create & register core tools that are enabled
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const registerCoreTool = async (ToolClass: any, ...args: unknown[]) => {
       const toolName = ToolClass?.Name as ToolName | undefined;
-      const className = ToolClass?.name ?? 'UnknownTool';
+      const className = ToolClass?.name ?? "UnknownTool";
 
       if (!toolName) {
         // Log warning and skip this tool instead of crashing
@@ -2183,10 +2093,7 @@ export class Config {
         try {
           registry.registerTool(new ToolClass(...args));
         } catch (error) {
-          this.debugLogger.error(
-            `Failed to register tool ${className} (${toolName}):`,
-            error,
-          );
+          this.debugLogger.error(`Failed to register tool ${className} (${toolName}):`, error);
           throw error; // Re-throw after logging context
         }
       }
@@ -2214,7 +2121,7 @@ export class Config {
           new RipgrepFallbackEvent(
             this.getUseRipgrep(),
             this.getUseBuiltinRipgrep(),
-            errorString || 'ripgrep is not available',
+            errorString || "ripgrep is not available",
           ),
         );
         await registerCoreTool(GrepTool, this);
diff --git a/packages/airiscode-core/src/config/models.ts b/packages/airiscode-core/src/config/models.ts
index 206a4a532..abf76bfa7 100644
--- a/packages/airiscode-core/src/config/models.ts
+++ b/packages/airiscode-core/src/config/models.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const DEFAULT_AIRISCODE_MODEL = 'coder-model';
-export const DEFAULT_QWEN_FLASH_MODEL = 'coder-model';
-export const DEFAULT_QWEN_EMBEDDING_MODEL = 'text-embedding-v4';
-export const MAINLINE_CODER_MODEL = 'qwen3.6-plus';
+export const DEFAULT_AIRISCODE_MODEL = "coder-model";
+export const DEFAULT_QWEN_FLASH_MODEL = "coder-model";
+export const DEFAULT_QWEN_EMBEDDING_MODEL = "text-embedding-v4";
+export const MAINLINE_CODER_MODEL = "qwen3.6-plus";
diff --git a/packages/airiscode-core/src/config/rulesLoader.ts b/packages/airiscode-core/src/config/rulesLoader.ts
index 45fbf66e6..4d5243d56 100644
--- a/packages/airiscode-core/src/config/rulesLoader.ts
+++ b/packages/airiscode-core/src/config/rulesLoader.ts
@@ -10,11 +10,11 @@
  * .airiscode/rules/ takes precedence if the same filename exists in both.
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
+import * as fs from "node:fs";
+import * as path from "node:path";
 
 /** Directories to scan for rules, in priority order (last wins on conflict) */
-const RULES_DIRS = ['.claude/rules', '.airiscode/rules'];
+const RULES_DIRS = [".claude/rules", ".airiscode/rules"];
 
 /**
  * Load all rule files from rules directories.
@@ -36,11 +36,11 @@ export function loadProjectRules(cwd: string): string[] {
     try {
       const files = fs
         .readdirSync(rulesDir)
-        .filter((f) => f.endsWith('.md'))
+        .filter((f) => f.endsWith(".md"))
         .sort();
 
       for (const file of files) {
-        const content = fs.readFileSync(path.join(rulesDir, file), 'utf-8');
+        const content = fs.readFileSync(path.join(rulesDir, file), "utf-8");
         // Later directories override earlier ones (airiscode > claude)
         rulesByName.set(file, content);
       }
@@ -61,7 +61,7 @@ export function loadProjectRules(cwd: string): string[] {
 export function loadProjectRulesAsPrompt(cwd: string): string {
   const rules = loadProjectRules(cwd);
   if (rules.length === 0) {
-    return '';
+    return "";
   }
-  return `\n# Project Rules\n\n${rules.join('\n\n')}\n`;
+  return `\n# Project Rules\n\n${rules.join("\n\n")}\n`;
 }
diff --git a/packages/airiscode-core/src/config/storage.ts b/packages/airiscode-core/src/config/storage.ts
index e084ed3d6..76b995692 100644
--- a/packages/airiscode-core/src/config/storage.ts
+++ b/packages/airiscode-core/src/config/storage.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import * as os from 'node:os';
-import * as fs from 'node:fs';
-import { AsyncLocalStorage } from 'node:async_hooks';
-import { getProjectHash, sanitizeCwd } from '../utils/paths.js';
-
-export const AIRISCODE_DIR = '.airiscode';
-export const SKILL_PROVIDER_CONFIG_DIRS = ['.airiscode', '.agents'];
-const TMP_DIR_NAME = 'tmp';
-const BIN_DIR_NAME = 'bin';
-const PROJECT_DIR_NAME = 'projects';
-const IDE_DIR_NAME = 'ide';
-const PLANS_DIR_NAME = 'plans';
-const DEBUG_DIR_NAME = 'debug';
-const ARENA_DIR_NAME = 'arena';
+import { AsyncLocalStorage } from "node:async_hooks";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { getProjectHash, sanitizeCwd } from "../utils/paths.js";
+
+export const AIRISCODE_DIR = ".airiscode";
+export const SKILL_PROVIDER_CONFIG_DIRS = [".airiscode", ".agents"];
+const TMP_DIR_NAME = "tmp";
+const BIN_DIR_NAME = "bin";
+const PROJECT_DIR_NAME = "projects";
+const IDE_DIR_NAME = "ide";
+const PLANS_DIR_NAME = "plans";
+const DEBUG_DIR_NAME = "debug";
+const ARENA_DIR_NAME = "arena";
 
 export class Storage {
   private readonly targetDir: string;
@@ -28,9 +28,7 @@ export class Storage {
    * When null, falls back to getGlobalQwenDir().
    */
   private static runtimeBaseDir: string | null = null;
-  private static readonly runtimeBaseDirContext = new AsyncLocalStorage<
-    string | null
-  >();
+  private static readonly runtimeBaseDirContext = new AsyncLocalStorage<string | null>();
 
   constructor(targetDir: string) {
     this.targetDir = targetDir;
@@ -45,13 +43,9 @@ export class Storage {
     }
 
     let resolved = dir;
-    if (
-      resolved === '~' ||
-      resolved.startsWith('~/') ||
-      resolved.startsWith('~\\')
-    ) {
+    if (resolved === "~" || resolved.startsWith("~/") || resolved.startsWith("~\\")) {
       const relativeSegments =
-        resolved === '~'
+        resolved === "~"
           ? []
           : resolved
               .slice(2)
@@ -99,11 +93,9 @@ export class Storage {
    * @returns Absolute path to the runtime output base directory
    */
   static getRuntimeBaseDir(): string {
-    const envDir = process.env['QWEN_RUNTIME_DIR'];
+    const envDir = process.env["QWEN_RUNTIME_DIR"];
     if (envDir) {
-      return (
-        Storage.resolveRuntimeBaseDir(envDir) ?? Storage.getGlobalQwenDir()
-      );
+      return Storage.resolveRuntimeBaseDir(envDir) ?? Storage.getGlobalQwenDir();
     }
 
     const contextualDir = Storage.runtimeBaseDirContext.getStore();
@@ -119,34 +111,34 @@ export class Storage {
   static getGlobalQwenDir(): string {
     const homeDir = os.homedir();
     if (!homeDir) {
-      return path.join(os.tmpdir(), '.airiscode');
+      return path.join(os.tmpdir(), ".airiscode");
     }
     return path.join(homeDir, AIRISCODE_DIR);
   }
 
   static getMcpOAuthTokensPath(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'mcp-oauth-tokens.json');
+    return path.join(Storage.getGlobalQwenDir(), "mcp-oauth-tokens.json");
   }
 
   static getGlobalSettingsPath(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'settings.json');
+    return path.join(Storage.getGlobalQwenDir(), "settings.json");
   }
 
   static getInstallationIdPath(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'installation_id');
+    return path.join(Storage.getGlobalQwenDir(), "installation_id");
   }
 
   /** @deprecated Google accounts no longer used */
   static getGoogleAccountsPath(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'google_accounts.json');
+    return path.join(Storage.getGlobalQwenDir(), "google_accounts.json");
   }
 
   static getUserCommandsDir(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'commands');
+    return path.join(Storage.getGlobalQwenDir(), "commands");
   }
 
   static getGlobalMemoryFilePath(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'memory.md');
+    return path.join(Storage.getGlobalQwenDir(), "memory.md");
   }
 
   static getGlobalTempDir(): string {
@@ -187,10 +179,7 @@ export class Storage {
 
   getProjectDir(): string {
     const projectId = sanitizeCwd(this.getProjectRoot());
-    const projectsDir = path.join(
-      Storage.getRuntimeBaseDir(),
-      PROJECT_DIR_NAME,
-    );
+    const projectsDir = path.join(Storage.getRuntimeBaseDir(), PROJECT_DIR_NAME);
     return path.join(projectsDir, projectId);
   }
 
@@ -207,7 +196,7 @@ export class Storage {
 
   /** @deprecated OAuth creds no longer used */
   static getOAuthCredsPath(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'oauth_creds.json');
+    return path.join(Storage.getGlobalQwenDir(), "oauth_creds.json");
   }
 
   getProjectRoot(): string {
@@ -216,36 +205,34 @@ export class Storage {
 
   getHistoryDir(): string {
     const hash = getProjectHash(this.getProjectRoot());
-    const historyDir = path.join(Storage.getRuntimeBaseDir(), 'history');
+    const historyDir = path.join(Storage.getRuntimeBaseDir(), "history");
     const targetDir = path.join(historyDir, hash);
     return targetDir;
   }
 
   getWorkspaceSettingsPath(): string {
-    return path.join(this.getQwenDir(), 'settings.json');
+    return path.join(this.getQwenDir(), "settings.json");
   }
 
   getProjectCommandsDir(): string {
-    return path.join(this.getQwenDir(), 'commands');
+    return path.join(this.getQwenDir(), "commands");
   }
 
   getProjectTempCheckpointsDir(): string {
-    return path.join(this.getProjectTempDir(), 'checkpoints');
+    return path.join(this.getProjectTempDir(), "checkpoints");
   }
 
   getExtensionsDir(): string {
-    return path.join(this.getQwenDir(), 'extensions');
+    return path.join(this.getQwenDir(), "extensions");
   }
 
   getExtensionsConfigPath(): string {
-    return path.join(this.getExtensionsDir(), 'qwen-extension.json');
+    return path.join(this.getExtensionsDir(), "qwen-extension.json");
   }
 
   getUserSkillsDirs(): string[] {
     const homeDir = os.homedir() || os.tmpdir();
-    return SKILL_PROVIDER_CONFIG_DIRS.map((dir) =>
-      path.join(homeDir, dir, 'skills'),
-    );
+    return SKILL_PROVIDER_CONFIG_DIRS.map((dir) => path.join(homeDir, dir, "skills"));
   }
 
   /**
@@ -254,10 +241,10 @@ export class Storage {
    * project-level extensions which live in <project>/.airiscode/extensions/.
    */
   static getUserExtensionsDir(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'extensions');
+    return path.join(Storage.getGlobalQwenDir(), "extensions");
   }
 
   getHistoryFilePath(): string {
-    return path.join(this.getProjectTempDir(), 'shell_history');
+    return path.join(this.getProjectTempDir(), "shell_history");
   }
 }
diff --git a/packages/airiscode-core/src/confirmation-bus/message-bus.ts b/packages/airiscode-core/src/confirmation-bus/message-bus.ts
index e8a737f82..26fbd528d 100644
--- a/packages/airiscode-core/src/confirmation-bus/message-bus.ts
+++ b/packages/airiscode-core/src/confirmation-bus/message-bus.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { randomUUID } from 'node:crypto';
-import { EventEmitter } from 'node:events';
-import { MessageBusType, type Message } from './types.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import { randomUUID } from "node:crypto";
+import { EventEmitter } from "node:events";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { type Message, MessageBusType } from "./types.js";
 
-const debugLogger = createDebugLogger('TRUSTED_HOOKS');
+const debugLogger = createDebugLogger("TRUSTED_HOOKS");
 
 export class MessageBus extends EventEmitter {
   constructor(private readonly debug = false) {
@@ -25,7 +25,7 @@ export class MessageBus extends EventEmitter {
 
     if (
       message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST &&
-      !('correlationId' in message)
+      !("correlationId" in message)
     ) {
       return false;
     }
@@ -43,9 +43,7 @@ export class MessageBus extends EventEmitter {
     }
     try {
       if (!this.isValidMessage(message)) {
-        throw new Error(
-          `Invalid message structure: ${safeJsonStringify(message)}`,
-        );
+        throw new Error(`Invalid message structure: ${safeJsonStringify(message)}`);
       }
 
       if (message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
@@ -63,21 +61,15 @@ export class MessageBus extends EventEmitter {
         this.emitMessage(message);
       }
     } catch (error) {
-      this.emit('error', error);
+      this.emit("error", error);
     }
   }
 
-  subscribe<T extends Message>(
-    type: T['type'],
-    listener: (message: T) => void,
-  ): void {
+  subscribe<T extends Message>(type: T["type"], listener: (message: T) => void): void {
     this.on(type, listener);
   }
 
-  unsubscribe<T extends Message>(
-    type: T['type'],
-    listener: (message: T) => void,
-  ): void {
+  unsubscribe<T extends Message>(type: T["type"], listener: (message: T) => void): void {
     this.off(type, listener);
   }
 
@@ -87,8 +79,8 @@ export class MessageBus extends EventEmitter {
    * The correlation ID is generated internally and added to the request
    */
   async request<TRequest extends Message, TResponse extends Message>(
-    request: Omit<TRequest, 'correlationId'>,
-    responseType: TResponse['type'],
+    request: Omit<TRequest, "correlationId">,
+    responseType: TResponse["type"],
     timeoutMs: number = 60000,
     signal?: AbortSignal,
   ): Promise<TResponse> {
@@ -97,7 +89,7 @@ export class MessageBus extends EventEmitter {
     return new Promise<TResponse>((resolve, reject) => {
       // Check if already aborted
       if (signal?.aborted) {
-        reject(new Error('Request aborted'));
+        reject(new Error("Request aborted"));
         return;
       }
 
@@ -110,25 +102,22 @@ export class MessageBus extends EventEmitter {
         clearTimeout(timeoutId);
         this.unsubscribe(responseType, responseHandler);
         if (signal) {
-          signal.removeEventListener('abort', abortHandler);
+          signal.removeEventListener("abort", abortHandler);
         }
       };
 
       const abortHandler = () => {
         cleanup();
-        reject(new Error('Request aborted'));
+        reject(new Error("Request aborted"));
       };
 
       if (signal) {
-        signal.addEventListener('abort', abortHandler);
+        signal.addEventListener("abort", abortHandler);
       }
 
       const responseHandler = (response: TResponse) => {
         // Check if this response matches our request
-        if (
-          'correlationId' in response &&
-          response.correlationId === correlationId
-        ) {
+        if ("correlationId" in response && response.correlationId === correlationId) {
           cleanup();
           resolve(response);
         }
diff --git a/packages/airiscode-core/src/confirmation-bus/types.ts b/packages/airiscode-core/src/confirmation-bus/types.ts
index 3d9bdf4b5..ed3f8460d 100644
--- a/packages/airiscode-core/src/confirmation-bus/types.ts
+++ b/packages/airiscode-core/src/confirmation-bus/types.ts
@@ -4,19 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type FunctionCall } from '../types/llm.js';
-import type {
-  ToolConfirmationOutcome,
-  ToolConfirmationPayload,
-} from '../tools/tools.js';
+import type { ToolConfirmationOutcome, ToolConfirmationPayload } from "../tools/tools.js";
+import { type FunctionCall } from "../types/llm.js";
 
 export enum MessageBusType {
-  TOOL_CONFIRMATION_REQUEST = 'tool-confirmation-request',
-  TOOL_CONFIRMATION_RESPONSE = 'tool-confirmation-response',
-  TOOL_EXECUTION_SUCCESS = 'tool-execution-success',
-  TOOL_EXECUTION_FAILURE = 'tool-execution-failure',
-  HOOK_EXECUTION_REQUEST = 'hook-execution-request',
-  HOOK_EXECUTION_RESPONSE = 'hook-execution-response',
+  TOOL_CONFIRMATION_REQUEST = "tool-confirmation-request",
+  TOOL_CONFIRMATION_RESPONSE = "tool-confirmation-response",
+  TOOL_EXECUTION_SUCCESS = "tool-execution-success",
+  TOOL_EXECUTION_FAILURE = "tool-execution-failure",
+  HOOK_EXECUTION_REQUEST = "hook-execution-request",
+  HOOK_EXECUTION_RESPONSE = "hook-execution-response",
 }
 
 export interface ToolConfirmationRequest {
@@ -56,13 +53,13 @@ export interface ToolConfirmationResponse {
  */
 export type SerializableConfirmationDetails =
   | {
-      type: 'info';
+      type: "info";
       title: string;
       prompt: string;
       urls?: string[];
     }
   | {
-      type: 'edit';
+      type: "edit";
       title: string;
       fileName: string;
       filePath: string;
@@ -72,7 +69,7 @@ export type SerializableConfirmationDetails =
       isModifying?: boolean;
     }
   | {
-      type: 'exec';
+      type: "exec";
       title: string;
       command: string;
       rootCommand: string;
@@ -80,14 +77,14 @@ export type SerializableConfirmationDetails =
       commands?: string[];
     }
   | {
-      type: 'mcp';
+      type: "mcp";
       title: string;
       serverName: string;
       toolName: string;
       toolDisplayName: string;
     }
   | {
-      type: 'exit_plan_mode';
+      type: "exit_plan_mode";
       title: string;
       planPath: string;
     };
diff --git a/packages/airiscode-core/src/core/__tests__/orphanedToolCallsTest.ts b/packages/airiscode-core/src/core/__tests__/orphanedToolCallsTest.ts
index feaab0483..e13ac84f5 100644
--- a/packages/airiscode-core/src/core/__tests__/orphanedToolCallsTest.ts
+++ b/packages/airiscode-core/src/core/__tests__/orphanedToolCallsTest.ts
@@ -11,40 +11,40 @@
 export const createTestMessages = () => [
   // System message
   {
-    role: 'system' as const,
-    content: 'You are a helpful assistant.',
+    role: "system" as const,
+    content: "You are a helpful assistant.",
   },
   // User message
   {
-    role: 'user' as const,
-    content: 'Please use a tool to help me.',
+    role: "user" as const,
+    content: "Please use a tool to help me.",
   },
   // Assistant message with tool calls (some will be orphaned)
   {
-    role: 'assistant' as const,
-    content: 'I will help you with that.',
+    role: "assistant" as const,
+    content: "I will help you with that.",
     tool_calls: [
       {
-        id: 'call_1',
-        type: 'function' as const,
+        id: "call_1",
+        type: "function" as const,
         function: {
-          name: 'search_web',
+          name: "search_web",
           arguments: '{"query": "test"}',
         },
       },
       {
-        id: 'call_2',
-        type: 'function' as const,
+        id: "call_2",
+        type: "function" as const,
         function: {
-          name: 'calculate',
+          name: "calculate",
           arguments: '{"expression": "2+2"}',
         },
       },
       {
-        id: 'call_3', // This will be orphaned
-        type: 'function' as const,
+        id: "call_3", // This will be orphaned
+        type: "function" as const,
         function: {
-          name: 'send_email',
+          name: "send_email",
           arguments: '{"to": "test@example.com"}',
         },
       },
@@ -52,54 +52,54 @@ export const createTestMessages = () => [
   },
   // Tool response for call_1
   {
-    role: 'tool' as const,
-    tool_call_id: 'call_1',
-    content: 'Search results: Found relevant information.',
+    role: "tool" as const,
+    tool_call_id: "call_1",
+    content: "Search results: Found relevant information.",
   },
   // Tool response for call_2
   {
-    role: 'tool' as const,
-    tool_call_id: 'call_2',
-    content: 'Calculation result: 4',
+    role: "tool" as const,
+    tool_call_id: "call_2",
+    content: "Calculation result: 4",
   },
   // Note: No tool response for call_3 (this creates the orphaned tool call issue)
 
   // User continues conversation
   {
-    role: 'user' as const,
-    content: 'Thank you, that was helpful.',
+    role: "user" as const,
+    content: "Thank you, that was helpful.",
   },
 ];
 
 export const expectedCleanedMessages = () => [
   // System message (unchanged)
   {
-    role: 'system' as const,
-    content: 'You are a helpful assistant.',
+    role: "system" as const,
+    content: "You are a helpful assistant.",
   },
   // User message (unchanged)
   {
-    role: 'user' as const,
-    content: 'Please use a tool to help me.',
+    role: "user" as const,
+    content: "Please use a tool to help me.",
   },
   // Assistant message with only valid tool calls
   {
-    role: 'assistant' as const,
-    content: 'I will help you with that.',
+    role: "assistant" as const,
+    content: "I will help you with that.",
     tool_calls: [
       {
-        id: 'call_1',
-        type: 'function' as const,
+        id: "call_1",
+        type: "function" as const,
         function: {
-          name: 'search_web',
+          name: "search_web",
           arguments: '{"query": "test"}',
         },
       },
       {
-        id: 'call_2',
-        type: 'function' as const,
+        id: "call_2",
+        type: "function" as const,
         function: {
-          name: 'calculate',
+          name: "calculate",
           arguments: '{"expression": "2+2"}',
         },
       },
@@ -108,18 +108,18 @@ export const expectedCleanedMessages = () => [
   },
   // Tool responses (unchanged because they have corresponding calls)
   {
-    role: 'tool' as const,
-    tool_call_id: 'call_1',
-    content: 'Search results: Found relevant information.',
+    role: "tool" as const,
+    tool_call_id: "call_1",
+    content: "Search results: Found relevant information.",
   },
   {
-    role: 'tool' as const,
-    tool_call_id: 'call_2',
-    content: 'Calculation result: 4',
+    role: "tool" as const,
+    tool_call_id: "call_2",
+    content: "Calculation result: 4",
   },
   // User message (unchanged)
   {
-    role: 'user' as const,
-    content: 'Thank you, that was helpful.',
+    role: "user" as const,
+    content: "Thank you, that was helpful.",
   },
 ];
diff --git a/packages/airiscode-core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts b/packages/airiscode-core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts
index 649ac1188..72448feba 100644
--- a/packages/airiscode-core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts
+++ b/packages/airiscode-core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import Anthropic from '@anthropic-ai/sdk';
+import Anthropic from "@anthropic-ai/sdk";
+import type { Config } from "../../config/config.js";
 import type {
   CountTokensParameters,
   CountTokensResponse,
@@ -13,31 +14,24 @@ import type {
   GenerateContentParameters,
   GenerateContentResponseUsageMetadata,
   Part,
-} from '../../types/llm.js';
-import { GenerateContentResponse } from '../../types/llm.js';
-import type { Config } from '../../config/config.js';
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../contentGenerator.js';
+} from "../../types/llm.js";
+import { GenerateContentResponse } from "../../types/llm.js";
+import type { ContentGenerator, ContentGeneratorConfig } from "../contentGenerator.js";
+
 type Message = Anthropic.Message;
-type MessageCreateParamsNonStreaming =
-  Anthropic.MessageCreateParamsNonStreaming;
+type MessageCreateParamsNonStreaming = Anthropic.MessageCreateParamsNonStreaming;
 type MessageCreateParamsStreaming = Anthropic.MessageCreateParamsStreaming;
 type RawMessageStreamEvent = Anthropic.RawMessageStreamEvent;
-import { RequestTokenEstimator } from '../../utils/request-tokenizer/index.js';
-import { safeJsonParse } from '../../utils/safeJsonParse.js';
-import { AnthropicContentConverter } from './converter.js';
-import { buildRuntimeFetchOptions } from '../../utils/runtimeFetchOptions.js';
-import { DEFAULT_TIMEOUT } from '../openaiContentGenerator/constants.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import {
-  tokenLimit,
-  CAPPED_DEFAULT_MAX_TOKENS,
-  hasExplicitOutputLimit,
-} from '../tokenLimits.js';
-
-const debugLogger = createDebugLogger('ANTHROPIC');
+
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { RequestTokenEstimator } from "../../utils/request-tokenizer/index.js";
+import { buildRuntimeFetchOptions } from "../../utils/runtimeFetchOptions.js";
+import { safeJsonParse } from "../../utils/safeJsonParse.js";
+import { DEFAULT_TIMEOUT } from "../openaiContentGenerator/constants.js";
+import { CAPPED_DEFAULT_MAX_TOKENS, hasExplicitOutputLimit, tokenLimit } from "../tokenLimits.js";
+import { AnthropicContentConverter } from "./converter.js";
+
+const debugLogger = createDebugLogger("ANTHROPIC");
 
 type StreamingBlockState = {
   type: string;
@@ -48,10 +42,10 @@ type StreamingBlockState = {
 };
 
 type MessageCreateParamsWithThinking = MessageCreateParamsNonStreaming & {
-  thinking?: { type: 'enabled'; budget_tokens: number };
+  thinking?: { type: "enabled"; budget_tokens: number };
   // Anthropic beta feature: output_config.effort (requires beta header effort-2025-11-24)
   // This is not yet represented in the official SDK types we depend on.
-  output_config?: { effort: 'low' | 'medium' | 'high' };
+  output_config?: { effort: "low" | "medium" | "high" };
 };
 
 export class AnthropicContentGenerator implements ContentGenerator {
@@ -66,10 +60,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
     const baseURL = contentGeneratorConfig.baseUrl;
     // Configure runtime options to ensure user-configured timeout works as expected
     // bodyTimeout is always disabled (0) to let Anthropic SDK timeout control the request
-    const runtimeOptions = buildRuntimeFetchOptions(
-      'anthropic',
-      this.cliConfig.getProxy(),
-    );
+    const runtimeOptions = buildRuntimeFetchOptions("anthropic", this.cliConfig.getProxy());
 
     this.client = new Anthropic({
       apiKey: contentGeneratorConfig.apiKey,
@@ -87,9 +78,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
     );
   }
 
-  async generateContent(
-    request: GenerateContentParameters,
-  ): Promise<GenerateContentResponse> {
+  async generateContent(request: GenerateContentParameters): Promise<GenerateContentResponse> {
     const anthropicRequest = await this.buildRequest(request);
     const response = (await this.client.messages.create(anthropicRequest, {
       signal: request.config?.abortSignal,
@@ -103,7 +92,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     const anthropicRequest = await this.buildRequest(request);
     const streamingRequest: MessageCreateParamsStreaming & {
-      thinking?: { type: 'enabled'; budget_tokens: number };
+      thinking?: { type: "enabled"; budget_tokens: number };
     } = {
       ...anthropicRequest,
       stream: true,
@@ -119,9 +108,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
     return this.processStream(stream);
   }
 
-  async countTokens(
-    request: CountTokensParameters,
-  ): Promise<CountTokensResponse> {
+  async countTokens(request: CountTokensParameters): Promise<CountTokensResponse> {
     try {
       const estimator = new RequestTokenEstimator();
       const result = await estimator.calculateTokens(request);
@@ -131,8 +118,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
       };
     } catch (error) {
       debugLogger.warn(
-        'Failed to calculate tokens with tokenizer, ' +
-          'falling back to simple method:',
+        "Failed to calculate tokens with tokenizer, " + "falling back to simple method:",
         error,
       );
 
@@ -144,10 +130,8 @@ export class AnthropicContentGenerator implements ContentGenerator {
     }
   }
 
-  async embedContent(
-    _request: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
-    throw new Error('Anthropic does not support embeddings.');
+  async embedContent(_request: EmbedContentParameters): Promise<EmbedContentResponse> {
+    throw new Error("Anthropic does not support embeddings.");
   }
 
   useSummarizedThinking(): boolean {
@@ -155,7 +139,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
   }
 
   private buildHeaders(): Record<string, string> {
-    const version = this.cliConfig.getCliVersion() || 'unknown';
+    const version = this.cliConfig.getCliVersion() || "unknown";
     const userAgent = `AirisCode/${version} (${process.platform}; ${process.arch})`;
     const { customHeaders } = this.contentGeneratorConfig;
 
@@ -164,20 +148,20 @@ export class AnthropicContentGenerator implements ContentGenerator {
 
     // Interleaved thinking is used when we send the `thinking` field.
     if (reasoning !== false) {
-      betas.push('interleaved-thinking-2025-05-14');
+      betas.push("interleaved-thinking-2025-05-14");
     }
 
     // Effort (beta) is enabled when reasoning.effort is set.
     if (reasoning !== false && reasoning?.effort !== undefined) {
-      betas.push('effort-2025-11-24');
+      betas.push("effort-2025-11-24");
     }
 
     const headers: Record<string, string> = {
-      'User-Agent': userAgent,
+      "User-Agent": userAgent,
     };
 
     if (betas.length) {
-      headers['anthropic-beta'] = betas.join(',');
+      headers["anthropic-beta"] = betas.join(",");
     }
 
     return customHeaders ? { ...headers, ...customHeaders } : headers;
@@ -186,8 +170,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
   private async buildRequest(
     request: GenerateContentParameters,
   ): Promise<MessageCreateParamsWithThinking> {
-    const { system, messages } =
-      this.converter.convertGeminiRequestToAnthropic(request);
+    const { system, messages } = this.converter.convertGeminiRequestToAnthropic(request);
 
     const tools = request.config?.tools
       ? await this.converter.convertGeminiToolsToAnthropic(request.config.tools)
@@ -222,31 +205,25 @@ export class AnthropicContentGenerator implements ContentGenerator {
       requestKey?: keyof NonNullable<typeof requestConfig>,
     ): T | undefined => {
       const configValue = configSamplingParams?.[configKey] as T | undefined;
-      const requestValue = requestKey
-        ? (requestConfig[requestKey] as T | undefined)
-        : undefined;
+      const requestValue = requestKey ? (requestConfig[requestKey] as T | undefined) : undefined;
       return configValue !== undefined ? configValue : requestValue;
     };
 
     // Apply output token limit logic consistent with OpenAI providers
-    const userMaxTokens = getParam<number>('max_tokens', 'maxOutputTokens');
+    const userMaxTokens = getParam<number>("max_tokens", "maxOutputTokens");
     const modelId = this.contentGeneratorConfig.model;
-    const modelLimit = tokenLimit(modelId, 'output');
+    const modelLimit = tokenLimit(modelId, "output");
     const isKnownModel = hasExplicitOutputLimit(modelId);
 
     let maxTokens: number;
     if (userMaxTokens !== undefined && userMaxTokens !== null) {
-      maxTokens = isKnownModel
-        ? Math.min(userMaxTokens, modelLimit)
-        : userMaxTokens;
+      maxTokens = isKnownModel ? Math.min(userMaxTokens, modelLimit) : userMaxTokens;
     } else {
       // No explicit user config — check env var, then use capped default.
-      const envVal = process.env['AIRISCODE_MAX_OUTPUT_TOKENS'];
+      const envVal = process.env["AIRISCODE_MAX_OUTPUT_TOKENS"];
       const envMaxTokens = envVal ? parseInt(envVal, 10) : NaN;
       if (!isNaN(envMaxTokens) && envMaxTokens > 0) {
-        maxTokens = isKnownModel
-          ? Math.min(envMaxTokens, modelLimit)
-          : envMaxTokens;
+        maxTokens = isKnownModel ? Math.min(envMaxTokens, modelLimit) : envMaxTokens;
       } else {
         maxTokens = Math.min(modelLimit, CAPPED_DEFAULT_MAX_TOKENS);
       }
@@ -254,15 +231,15 @@ export class AnthropicContentGenerator implements ContentGenerator {
 
     return {
       max_tokens: maxTokens,
-      temperature: getParam<number>('temperature', 'temperature') ?? 1,
-      top_p: getParam<number>('top_p', 'topP'),
-      top_k: getParam<number>('top_k', 'topK'),
+      temperature: getParam<number>("temperature", "temperature") ?? 1,
+      top_p: getParam<number>("top_p", "topP"),
+      top_k: getParam<number>("top_k", "topK"),
     };
   }
 
   private buildThinkingConfig(
     request: GenerateContentParameters,
-  ): { type: 'enabled'; budget_tokens: number } | undefined {
+  ): { type: "enabled"; budget_tokens: number } | undefined {
     if (request.config?.thinkingConfig?.includeThoughts === false) {
       return undefined;
     }
@@ -275,25 +252,22 @@ export class AnthropicContentGenerator implements ContentGenerator {
 
     if (reasoning?.budget_tokens !== undefined) {
       return {
-        type: 'enabled',
+        type: "enabled",
         budget_tokens: reasoning.budget_tokens,
       };
     }
 
     const effort = reasoning?.effort;
     // When using interleaved thinking with tools, this budget token limit is the entire context window(200k tokens).
-    const budgetTokens =
-      effort === 'low' ? 16_000 : effort === 'high' ? 64_000 : 32_000;
+    const budgetTokens = effort === "low" ? 16_000 : effort === "high" ? 64_000 : 32_000;
 
     return {
-      type: 'enabled',
+      type: "enabled",
       budget_tokens: budgetTokens,
     };
   }
 
-  private buildOutputConfig():
-    | { effort: 'low' | 'medium' | 'high' }
-    | undefined {
+  private buildOutputConfig(): { effort: "low" | "medium" | "high" } | undefined {
     const reasoning = this.contentGeneratorConfig.reasoning;
     if (reasoning === false || reasoning === undefined) {
       return undefined;
@@ -321,54 +295,48 @@ export class AnthropicContentGenerator implements ContentGenerator {
 
     for await (const event of stream) {
       switch (event.type) {
-        case 'message_start': {
+        case "message_start": {
           messageId = event.message.id ?? messageId;
           model = event.message.model ?? model;
-          cachedTokens =
-            event.message.usage?.cache_read_input_tokens ?? cachedTokens;
+          cachedTokens = event.message.usage?.cache_read_input_tokens ?? cachedTokens;
           promptTokens = event.message.usage?.input_tokens ?? promptTokens;
           break;
         }
-        case 'content_block_start': {
+        case "content_block_start": {
           const index = event.index ?? 0;
-          const type = String(event.content_block.type || 'text');
+          const type = String(event.content_block.type || "text");
           const initialInput =
-            type === 'tool_use' && 'input' in event.content_block
+            type === "tool_use" && "input" in event.content_block
               ? JSON.stringify(event.content_block.input)
-              : '';
+              : "";
           blocks.set(index, {
             type,
-            id:
-              'id' in event.content_block ? event.content_block.id : undefined,
-            name:
-              'name' in event.content_block
-                ? event.content_block.name
-                : undefined,
-            inputJson: initialInput !== '{}' ? initialInput : '',
+            id: "id" in event.content_block ? event.content_block.id : undefined,
+            name: "name" in event.content_block ? event.content_block.name : undefined,
+            inputJson: initialInput !== "{}" ? initialInput : "",
             signature:
-              type === 'thinking' &&
-              'signature' in event.content_block &&
-              typeof event.content_block.signature === 'string'
+              type === "thinking" &&
+              "signature" in event.content_block &&
+              typeof event.content_block.signature === "string"
                 ? event.content_block.signature
-                : '',
+                : "",
           });
           break;
         }
-        case 'content_block_delta': {
+        case "content_block_delta": {
           const index = event.index ?? 0;
-          const deltaType = (event.delta as { type?: string }).type || '';
+          const deltaType = (event.delta as { type?: string }).type || "";
           const blockState = blocks.get(index);
 
-          if (deltaType === 'text_delta') {
-            const text = 'text' in event.delta ? event.delta.text : '';
+          if (deltaType === "text_delta") {
+            const text = "text" in event.delta ? event.delta.text : "";
             if (text) {
               const chunk = this.buildGeminiChunk({ text }, messageId, model);
               collectedResponses.push(chunk);
               yield chunk;
             }
-          } else if (deltaType === 'thinking_delta') {
-            const thinking =
-              (event.delta as { thinking?: string }).thinking || '';
+          } else if (deltaType === "thinking_delta") {
+            const thinking = (event.delta as { thinking?: string }).thinking || "";
             if (thinking) {
               const chunk = this.buildGeminiChunk(
                 { text: thinking, thought: true },
@@ -378,9 +346,8 @@ export class AnthropicContentGenerator implements ContentGenerator {
               collectedResponses.push(chunk);
               yield chunk;
             }
-          } else if (deltaType === 'signature_delta' && blockState) {
-            const signature =
-              (event.delta as { signature?: string }).signature || '';
+          } else if (deltaType === "signature_delta" && blockState) {
+            const signature = (event.delta as { signature?: string }).signature || "";
             if (signature) {
               blockState.signature += signature;
               const chunk = this.buildGeminiChunk(
@@ -391,20 +358,19 @@ export class AnthropicContentGenerator implements ContentGenerator {
               collectedResponses.push(chunk);
               yield chunk;
             }
-          } else if (deltaType === 'input_json_delta' && blockState) {
-            const jsonDelta =
-              (event.delta as { partial_json?: string }).partial_json || '';
+          } else if (deltaType === "input_json_delta" && blockState) {
+            const jsonDelta = (event.delta as { partial_json?: string }).partial_json || "";
             if (jsonDelta) {
               blockState.inputJson += jsonDelta;
             }
           }
           break;
         }
-        case 'content_block_stop': {
+        case "content_block_stop": {
           const index = event.index ?? 0;
           const blockState = blocks.get(index);
-          if (blockState?.type === 'tool_use') {
-            const args = safeJsonParse(blockState.inputJson || '{}', {});
+          if (blockState?.type === "tool_use") {
+            const args = safeJsonParse(blockState.inputJson || "{}", {});
             const chunk = this.buildGeminiChunk(
               {
                 functionCall: {
@@ -422,7 +388,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
           blocks.delete(index);
           break;
         }
-        case 'message_delta': {
+        case "message_delta": {
           const stopReasonValue = event.delta.stop_reason;
           if (stopReasonValue) {
             finishReason = stopReasonValue;
@@ -433,58 +399,46 @@ export class AnthropicContentGenerator implements ContentGenerator {
           // Anthropic SDK types only expose `output_tokens` here.
           const usageUnknown = event.usage as unknown;
           const usageRecord =
-            usageUnknown && typeof usageUnknown === 'object'
+            usageUnknown && typeof usageUnknown === "object"
               ? (usageUnknown as Record<string, unknown>)
               : undefined;
 
           if (event.usage?.output_tokens !== undefined) {
             completionTokens = event.usage.output_tokens;
           }
-          if (usageRecord?.['input_tokens'] !== undefined) {
-            const inputTokens = usageRecord['input_tokens'];
-            if (typeof inputTokens === 'number') {
+          if (usageRecord?.["input_tokens"] !== undefined) {
+            const inputTokens = usageRecord["input_tokens"];
+            if (typeof inputTokens === "number") {
               promptTokens = inputTokens;
             }
           }
-          if (usageRecord?.['cache_read_input_tokens'] !== undefined) {
-            const cacheRead = usageRecord['cache_read_input_tokens'];
-            if (typeof cacheRead === 'number') {
+          if (usageRecord?.["cache_read_input_tokens"] !== undefined) {
+            const cacheRead = usageRecord["cache_read_input_tokens"];
+            if (typeof cacheRead === "number") {
               cachedTokens = cacheRead;
             }
           }
 
           if (finishReason || event.usage) {
-            const chunk = this.buildGeminiChunk(
-              undefined,
-              messageId,
-              model,
-              finishReason,
-              {
-                cachedContentTokenCount: cachedTokens,
-                promptTokenCount: cachedTokens + promptTokens,
-                candidatesTokenCount: completionTokens,
-                totalTokenCount: cachedTokens + promptTokens + completionTokens,
-              },
-            );
+            const chunk = this.buildGeminiChunk(undefined, messageId, model, finishReason, {
+              cachedContentTokenCount: cachedTokens,
+              promptTokenCount: cachedTokens + promptTokens,
+              candidatesTokenCount: completionTokens,
+              totalTokenCount: cachedTokens + promptTokens + completionTokens,
+            });
             collectedResponses.push(chunk);
             yield chunk;
           }
           break;
         }
-        case 'message_stop': {
+        case "message_stop": {
           if (promptTokens || completionTokens) {
-            const chunk = this.buildGeminiChunk(
-              undefined,
-              messageId,
-              model,
-              finishReason,
-              {
-                cachedContentTokenCount: cachedTokens,
-                promptTokenCount: cachedTokens + promptTokens,
-                candidatesTokenCount: completionTokens,
-                totalTokenCount: cachedTokens + promptTokens + completionTokens,
-              },
-            );
+            const chunk = this.buildGeminiChunk(undefined, messageId, model, finishReason, {
+              cachedContentTokenCount: cachedTokens,
+              promptTokenCount: cachedTokens + promptTokens,
+              candidatesTokenCount: completionTokens,
+              totalTokenCount: cachedTokens + promptTokens + completionTokens,
+            });
             collectedResponses.push(chunk);
             yield chunk;
           }
@@ -523,7 +477,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
       {
         content: {
           parts: candidateParts,
-          role: 'model' as const,
+          role: "model" as const,
         },
         index: 0,
         safetyRatings: [],
diff --git a/packages/airiscode-core/src/core/anthropicContentGenerator/converter.ts b/packages/airiscode-core/src/core/anthropicContentGenerator/converter.ts
index 39cc6dd32..dee435e84 100644
--- a/packages/airiscode-core/src/core/anthropicContentGenerator/converter.ts
+++ b/packages/airiscode-core/src/core/anthropicContentGenerator/converter.ts
@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type Anthropic from "@anthropic-ai/sdk";
 import type {
-  Candidate,
   CallableTool,
+  Candidate,
   Content,
   ContentListUnion,
   ContentUnion,
@@ -16,18 +17,14 @@ import type {
   PartUnion,
   Tool,
   ToolListUnion,
-} from '../../types/llm.js';
-import { FinishReason, GenerateContentResponse } from '../../types/llm.js';
-import type Anthropic from '@anthropic-ai/sdk';
-import { safeJsonParse } from '../../utils/safeJsonParse.js';
-import {
-  convertSchema,
-  type SchemaComplianceMode,
-} from '../../utils/schemaConverter.js';
+} from "../../types/llm.js";
+import { FinishReason, GenerateContentResponse } from "../../types/llm.js";
+import { safeJsonParse } from "../../utils/safeJsonParse.js";
+import { convertSchema, type SchemaComplianceMode } from "../../utils/schemaConverter.js";
 
 type AnthropicMessageParam = Anthropic.MessageParam;
 type AnthropicToolParam = Anthropic.Tool & {
-  cache_control?: { type: 'ephemeral' };
+  cache_control?: { type: "ephemeral" };
 };
 type AnthropicContentBlockParam = Anthropic.ContentBlockParam;
 
@@ -38,7 +35,7 @@ export class AnthropicContentConverter {
 
   constructor(
     model: string,
-    schemaCompliance: SchemaComplianceMode = 'auto',
+    schemaCompliance: SchemaComplianceMode = "auto",
     enableCacheControl: boolean = true,
   ) {
     this.model = model;
@@ -52,9 +49,7 @@ export class AnthropicContentConverter {
   } {
     const messages: AnthropicMessageParam[] = [];
 
-    const systemText = this.extractTextFromContentUnion(
-      request.config?.systemInstruction,
-    );
+    const systemText = this.extractTextFromContentUnion(request.config?.systemInstruction);
 
     this.processContents(request.contents, messages);
 
@@ -72,15 +67,13 @@ export class AnthropicContentConverter {
     };
   }
 
-  async convertGeminiToolsToAnthropic(
-    geminiTools: ToolListUnion,
-  ): Promise<AnthropicToolParam[]> {
+  async convertGeminiToolsToAnthropic(geminiTools: ToolListUnion): Promise<AnthropicToolParam[]> {
     const tools: AnthropicToolParam[] = [];
 
     for (const tool of geminiTools) {
       let actualTool: Tool;
 
-      if ('tool' in tool) {
+      if ("tool" in tool) {
         actualTool = await (tool as CallableTool).tool();
       } else {
         actualTool = tool as Tool;
@@ -104,12 +97,12 @@ export class AnthropicContentConverter {
         }
 
         if (!inputSchema) {
-          inputSchema = { type: 'object', properties: {} };
+          inputSchema = { type: "object", properties: {} };
         }
 
         inputSchema = convertSchema(inputSchema, this.schemaCompliance);
-        if (typeof inputSchema['type'] !== 'string') {
-          inputSchema['type'] = 'object';
+        if (typeof inputSchema["type"] !== "string") {
+          inputSchema["type"] = "object";
         }
 
         tools.push({
@@ -125,30 +118,28 @@ export class AnthropicContentConverter {
       const lastToolIndex = tools.length - 1;
       tools[lastToolIndex] = {
         ...tools[lastToolIndex],
-        cache_control: { type: 'ephemeral' },
+        cache_control: { type: "ephemeral" },
       };
     }
 
     return tools;
   }
 
-  convertAnthropicResponseToGemini(
-    response: Anthropic.Message,
-  ): GenerateContentResponse {
+  convertAnthropicResponseToGemini(response: Anthropic.Message): GenerateContentResponse {
     const geminiResponse = new GenerateContentResponse();
     const parts: Part[] = [];
 
     for (const block of response.content || []) {
-      const blockType = String((block as { type?: string })['type'] || '');
-      if (blockType === 'text') {
+      const blockType = String((block as { type?: string })["type"] || "");
+      if (blockType === "text") {
         const text =
-          typeof (block as { text?: string }).text === 'string'
+          typeof (block as { text?: string }).text === "string"
             ? (block as { text?: string }).text
-            : '';
+            : "";
         if (text) {
           parts.push({ text });
         }
-      } else if (blockType === 'tool_use') {
+      } else if (blockType === "tool_use") {
         const toolUse = block as {
           id?: string;
           name?: string;
@@ -156,20 +147,20 @@ export class AnthropicContentConverter {
         };
         parts.push({
           functionCall: {
-            id: typeof toolUse.id === 'string' ? toolUse.id : undefined,
-            name: typeof toolUse.name === 'string' ? toolUse.name : undefined,
+            id: typeof toolUse.id === "string" ? toolUse.id : undefined,
+            name: typeof toolUse.name === "string" ? toolUse.name : undefined,
             args: this.safeInputToArgs(toolUse.input),
           },
         });
-      } else if (blockType === 'thinking') {
+      } else if (blockType === "thinking") {
         const thinking =
-          typeof (block as { thinking?: string }).thinking === 'string'
+          typeof (block as { thinking?: string }).thinking === "string"
             ? (block as { thinking?: string }).thinking
-            : '';
+            : "";
         const signature =
-          typeof (block as { signature?: string }).signature === 'string'
+          typeof (block as { signature?: string }).signature === "string"
             ? (block as { signature?: string }).signature
-            : '';
+            : "";
         if (thinking || signature) {
           const thoughtPart: Part = {
             text: thinking,
@@ -178,23 +169,21 @@ export class AnthropicContentConverter {
           };
           parts.push(thoughtPart);
         }
-      } else if (blockType === 'redacted_thinking') {
-        parts.push({ text: '', thought: true });
+      } else if (blockType === "redacted_thinking") {
+        parts.push({ text: "", thought: true });
       }
     }
 
     const candidate: Candidate = {
       content: {
         parts,
-        role: 'model' as const,
+        role: "model" as const,
       },
       index: 0,
       safetyRatings: [],
     };
 
-    const finishReason = this.mapAnthropicFinishReasonToGemini(
-      response.stop_reason,
-    );
+    const finishReason = this.mapAnthropicFinishReasonToGemini(response.stop_reason);
     if (finishReason) {
       candidate.finishReason = finishReason;
     }
@@ -218,10 +207,7 @@ export class AnthropicContentConverter {
     return geminiResponse;
   }
 
-  private processContents(
-    contents: ContentListUnion,
-    messages: AnthropicMessageParam[],
-  ): void {
+  private processContents(contents: ContentListUnion, messages: AnthropicMessageParam[]): void {
     if (Array.isArray(contents)) {
       for (const content of contents) {
         this.processContent(content, messages);
@@ -235,45 +221,41 @@ export class AnthropicContentConverter {
     content: ContentUnion | PartUnion,
     messages: AnthropicMessageParam[],
   ): void {
-    if (typeof content === 'string') {
+    if (typeof content === "string") {
       messages.push({
-        role: 'user',
-        content: [{ type: 'text', text: content }],
+        role: "user",
+        content: [{ type: "text", text: content }],
       });
       return;
     }
 
     if (!this.isContentObject(content)) return;
     const parts = content.parts || [];
-    const role = content.role === 'model' ? 'assistant' : 'user';
+    const role = content.role === "model" ? "assistant" : "user";
     const contentBlocks: AnthropicContentBlockParam[] = [];
     let toolCallIndex = 0;
 
     for (const part of parts) {
-      if (typeof part === 'string') {
-        contentBlocks.push({ type: 'text', text: part });
+      if (typeof part === "string") {
+        contentBlocks.push({ type: "text", text: part });
         continue;
       }
 
-      if ('text' in part && 'thought' in part && part.thought) {
-        if (role === 'assistant') {
+      if ("text" in part && "thought" in part && part.thought) {
+        if (role === "assistant") {
           const thinkingBlock: unknown = {
-            type: 'thinking',
-            thinking: part.text || '',
+            type: "thinking",
+            thinking: part.text || "",
           };
-          if (
-            'thoughtSignature' in part &&
-            typeof part.thoughtSignature === 'string'
-          ) {
-            (thinkingBlock as { signature?: string }).signature =
-              part.thoughtSignature;
+          if ("thoughtSignature" in part && typeof part.thoughtSignature === "string") {
+            (thinkingBlock as { signature?: string }).signature = part.thoughtSignature;
           }
           contentBlocks.push(thinkingBlock as AnthropicContentBlockParam);
         }
       }
 
-      if ('text' in part && part.text && !('thought' in part && part.thought)) {
-        contentBlocks.push({ type: 'text', text: part.text });
+      if ("text" in part && part.text && !("thought" in part && part.thought)) {
+        contentBlocks.push({ type: "text", text: part.text });
       }
 
       const mediaBlock = this.createMediaBlockFromPart(part);
@@ -281,12 +263,12 @@ export class AnthropicContentConverter {
         contentBlocks.push(mediaBlock);
       }
 
-      if ('functionCall' in part && part.functionCall) {
-        if (role === 'assistant') {
+      if ("functionCall" in part && part.functionCall) {
+        if (role === "assistant") {
           contentBlocks.push({
-            type: 'tool_use',
+            type: "tool_use",
             id: part.functionCall.id || `tool_${toolCallIndex}`,
-            name: part.functionCall.name || '',
+            name: part.functionCall.name || "",
             input: (part.functionCall.args as Record<string, unknown>) || {},
           });
           toolCallIndex += 1;
@@ -294,10 +276,8 @@ export class AnthropicContentConverter {
       }
 
       if (part.functionResponse) {
-        const toolResultBlock = this.createToolResultBlock(
-          part.functionResponse,
-        );
-        if (toolResultBlock && role === 'user') {
+        const toolResultBlock = this.createToolResultBlock(part.functionResponse);
+        if (toolResultBlock && role === "user") {
           contentBlocks.push(toolResultBlock);
         }
       }
@@ -308,12 +288,10 @@ export class AnthropicContentConverter {
     }
   }
 
-  private createToolResultBlock(
-    response: FunctionResponse,
-  ): Anthropic.ToolResultBlockParam | null {
+  private createToolResultBlock(response: FunctionResponse): Anthropic.ToolResultBlockParam | null {
     const textContent = this.extractFunctionResponseContent(response.response);
 
-    type ToolResultContent = Anthropic.ToolResultBlockParam['content'];
+    type ToolResultContent = Anthropic.ToolResultBlockParam["content"];
     const partBlocks: AnthropicContentBlockParam[] = [];
 
     for (const part of response.parts || []) {
@@ -327,7 +305,7 @@ export class AnthropicContentConverter {
     if (partBlocks.length > 0) {
       const blocks: AnthropicContentBlockParam[] = [];
       if (textContent) {
-        blocks.push({ type: 'text', text: textContent });
+        blocks.push({ type: "text", text: textContent });
       }
       blocks.push(...partBlocks);
       content = blocks as unknown as ToolResultContent;
@@ -336,79 +314,73 @@ export class AnthropicContentConverter {
     }
 
     return {
-      type: 'tool_result',
-      tool_use_id: response.id || '',
+      type: "tool_result",
+      tool_use_id: response.id || "",
       content,
     };
   }
 
-  private createMediaBlockFromPart(
-    part: Part,
-  ): AnthropicContentBlockParam | null {
+  private createMediaBlockFromPart(part: Part): AnthropicContentBlockParam | null {
     if (part.inlineData?.mimeType && part.inlineData?.data) {
       if (this.isSupportedAnthropicImageMimeType(part.inlineData.mimeType)) {
         return {
-          type: 'image',
+          type: "image",
           source: {
-            type: 'base64',
+            type: "base64",
             media_type: part.inlineData.mimeType as
-              | 'image/jpeg'
-              | 'image/png'
-              | 'image/gif'
-              | 'image/webp',
+              | "image/jpeg"
+              | "image/png"
+              | "image/gif"
+              | "image/webp",
             data: part.inlineData.data,
           },
         };
       }
 
-      if (part.inlineData.mimeType === 'application/pdf') {
+      if (part.inlineData.mimeType === "application/pdf") {
         return {
-          type: 'document',
+          type: "document",
           source: {
-            type: 'base64',
-            media_type: 'application/pdf',
+            type: "base64",
+            media_type: "application/pdf",
             data: part.inlineData.data,
           },
         };
       }
 
-      const displayName = part.inlineData.displayName
-        ? ` (${part.inlineData.displayName})`
-        : '';
+      const displayName = part.inlineData.displayName ? ` (${part.inlineData.displayName})` : "";
       return {
-        type: 'text',
+        type: "text",
         text: `Unsupported inline media type: ${part.inlineData.mimeType}${displayName}.`,
       };
     }
 
     if (part.fileData?.mimeType && part.fileData?.fileUri) {
-      const displayName = part.fileData.displayName
-        ? ` (${part.fileData.displayName})`
-        : '';
+      const displayName = part.fileData.displayName ? ` (${part.fileData.displayName})` : "";
       const fileUri = part.fileData.fileUri;
 
       if (this.isSupportedAnthropicImageMimeType(part.fileData.mimeType)) {
         return {
-          type: 'image',
+          type: "image",
           source: {
-            type: 'url',
+            type: "url",
             url: fileUri,
           },
         } as unknown as AnthropicContentBlockParam;
       }
 
-      if (part.fileData.mimeType === 'application/pdf') {
+      if (part.fileData.mimeType === "application/pdf") {
         return {
-          type: 'document',
+          type: "document",
           source: {
-            type: 'url',
+            type: "url",
             url: fileUri,
           },
         } as unknown as AnthropicContentBlockParam;
       }
 
       return {
-        type: 'text',
+        type: "text",
         text: `Unsupported file media type: ${part.fileData.mimeType}${displayName}.`,
       };
     }
@@ -418,17 +390,17 @@ export class AnthropicContentConverter {
 
   private isSupportedAnthropicImageMimeType(
     mimeType: string,
-  ): mimeType is 'image/jpeg' | 'image/png' | 'image/gif' | 'image/webp' {
+  ): mimeType is "image/jpeg" | "image/png" | "image/gif" | "image/webp" {
     return (
-      mimeType === 'image/jpeg' ||
-      mimeType === 'image/png' ||
-      mimeType === 'image/gif' ||
-      mimeType === 'image/webp'
+      mimeType === "image/jpeg" ||
+      mimeType === "image/png" ||
+      mimeType === "image/gif" ||
+      mimeType === "image/webp"
     );
   }
 
   private extractTextFromContentUnion(contentUnion: unknown): string {
-    if (typeof contentUnion === 'string') {
+    if (typeof contentUnion === "string") {
       return contentUnion;
     }
 
@@ -436,46 +408,46 @@ export class AnthropicContentConverter {
       return contentUnion
         .map((item) => this.extractTextFromContentUnion(item))
         .filter(Boolean)
-        .join('\n');
+        .join("\n");
     }
 
-    if (typeof contentUnion === 'object' && contentUnion !== null) {
-      if ('parts' in contentUnion) {
+    if (typeof contentUnion === "object" && contentUnion !== null) {
+      if ("parts" in contentUnion) {
         const content = contentUnion as Content;
         return (
           content.parts
             ?.map((part: Part) => {
-              if (typeof part === 'string') return part;
-              if ('text' in part) return part.text || '';
-              return '';
+              if (typeof part === "string") return part;
+              if ("text" in part) return part.text || "";
+              return "";
             })
             .filter(Boolean)
-            .join('\n') || ''
+            .join("\n") || ""
         );
       }
     }
 
-    return '';
+    return "";
   }
 
   private extractFunctionResponseContent(response: unknown): string {
     if (response === null || response === undefined) {
-      return '';
+      return "";
     }
 
-    if (typeof response === 'string') {
+    if (typeof response === "string") {
       return response;
     }
 
-    if (typeof response === 'object') {
+    if (typeof response === "object") {
       const responseObject = response as Record<string, unknown>;
-      const output = responseObject['output'];
-      if (typeof output === 'string') {
+      const output = responseObject["output"];
+      if (typeof output === "string") {
         return output;
       }
 
-      const error = responseObject['error'];
-      if (typeof error === 'string') {
+      const error = responseObject["error"];
+      if (typeof error === "string") {
         return error;
       }
     }
@@ -489,18 +461,16 @@ export class AnthropicContentConverter {
   }
 
   private safeInputToArgs(input: unknown): Record<string, unknown> {
-    if (input && typeof input === 'object') {
+    if (input && typeof input === "object") {
       return input as Record<string, unknown>;
     }
-    if (typeof input === 'string') {
+    if (typeof input === "string") {
       return safeJsonParse(input, {});
     }
     return {};
   }
 
-  mapAnthropicFinishReasonToGemini(
-    reason?: string | null,
-  ): FinishReason | undefined {
+  mapAnthropicFinishReasonToGemini(reason?: string | null): FinishReason | undefined {
     if (!reason) return undefined;
     const mapping: Record<string, FinishReason> = {
       end_turn: FinishReason.STOP,
@@ -512,15 +482,13 @@ export class AnthropicContentConverter {
     return mapping[reason] || FinishReason.FINISH_REASON_UNSPECIFIED;
   }
 
-  private isContentObject(
-    content: unknown,
-  ): content is { role: string; parts: Part[] } {
+  private isContentObject(content: unknown): content is { role: string; parts: Part[] } {
     return (
-      typeof content === 'object' &&
+      typeof content === "object" &&
       content !== null &&
-      'role' in content &&
-      'parts' in content &&
-      Array.isArray((content as Record<string, unknown>)['parts'])
+      "role" in content &&
+      "parts" in content &&
+      Array.isArray((content as Record<string, unknown>)["parts"])
     );
   }
 
@@ -528,18 +496,16 @@ export class AnthropicContentConverter {
    * Build system content blocks with cache_control.
    * Anthropic prompt caching requires cache_control on system content.
    */
-  private buildSystemWithCacheControl(
-    systemText: string,
-  ): Anthropic.TextBlockParam[] | string {
+  private buildSystemWithCacheControl(systemText: string): Anthropic.TextBlockParam[] | string {
     if (!systemText) {
       return systemText;
     }
 
     return [
       {
-        type: 'text',
+        type: "text",
         text: systemText,
-        cache_control: { type: 'ephemeral' },
+        cache_control: { type: "ephemeral" },
       },
     ];
   }
@@ -552,23 +518,23 @@ export class AnthropicContentConverter {
     // Find the last user message to add cache_control
     for (let i = messages.length - 1; i >= 0; i--) {
       const msg = messages[i];
-      if (msg.role === 'user') {
+      if (msg.role === "user") {
         const content = Array.isArray(msg.content)
           ? msg.content
-          : [{ type: 'text' as const, text: msg.content }];
+          : [{ type: "text" as const, text: msg.content }];
 
         if (content.length > 0) {
           const lastContent = content[content.length - 1];
           // Only add cache_control if the last block is a non-empty text block
           if (
-            typeof lastContent === 'object' &&
-            'type' in lastContent &&
-            lastContent.type === 'text' &&
-            'text' in lastContent &&
+            typeof lastContent === "object" &&
+            "type" in lastContent &&
+            lastContent.type === "text" &&
+            "text" in lastContent &&
             lastContent.text
           ) {
             lastContent.cache_control = {
-              type: 'ephemeral',
+              type: "ephemeral",
             };
           }
           // If last block is not text or is empty, don't add cache_control
diff --git a/packages/airiscode-core/src/core/anthropicContentGenerator/index.ts b/packages/airiscode-core/src/core/anthropicContentGenerator/index.ts
index ce480790a..074c17774 100644
--- a/packages/airiscode-core/src/core/anthropicContentGenerator/index.ts
+++ b/packages/airiscode-core/src/core/anthropicContentGenerator/index.ts
@@ -4,14 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../contentGenerator.js';
-import type { Config } from '../../config/config.js';
-import { AnthropicContentGenerator } from './anthropicContentGenerator.js';
+import type { Config } from "../../config/config.js";
+import type { ContentGenerator, ContentGeneratorConfig } from "../contentGenerator.js";
+import { AnthropicContentGenerator } from "./anthropicContentGenerator.js";
 
-export { AnthropicContentGenerator } from './anthropicContentGenerator.js';
+export { AnthropicContentGenerator } from "./anthropicContentGenerator.js";
 
 export function createAnthropicContentGenerator(
   contentGeneratorConfig: ContentGeneratorConfig,
diff --git a/packages/airiscode-core/src/core/baseLlmClient.ts b/packages/airiscode-core/src/core/baseLlmClient.ts
index a17e9eeed..9adea154f 100644
--- a/packages/airiscode-core/src/core/baseLlmClient.ts
+++ b/packages/airiscode-core/src/core/baseLlmClient.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { Config } from "../config/config.js";
 import type {
   Content,
-  GenerateContentConfig,
-  Part,
   EmbedContentParameters,
   FunctionDeclaration,
-  Tool,
+  GenerateContentConfig,
+  Part,
   Schema,
-} from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import { reportError } from '../utils/errorReporting.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import { getFunctionCalls } from '../utils/generateContentResponseUtilities.js';
+  Tool,
+} from "../types/llm.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { getFunctionCalls } from "../utils/generateContentResponseUtilities.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 
 const DEFAULT_MAX_ATTEMPTS = 7;
 
@@ -42,11 +42,7 @@ export interface GenerateJsonOptions {
    */
   config?: Omit<
     GenerateContentConfig,
-    | 'systemInstruction'
-    | 'responseJsonSchema'
-    | 'responseMimeType'
-    | 'tools'
-    | 'abortSignal'
+    "systemInstruction" | "responseJsonSchema" | "responseMimeType" | "tools" | "abortSignal"
   >;
   /** Signal for cancellation. */
   abortSignal: AbortSignal;
@@ -69,18 +65,9 @@ export class BaseLlmClient {
     private readonly config: Config,
   ) {}
 
-  async generateJson(
-    options: GenerateJsonOptions,
-  ): Promise<Record<string, unknown>> {
-    const {
-      contents,
-      schema,
-      model,
-      abortSignal,
-      systemInstruction,
-      promptId,
-      maxAttempts,
-    } = options;
+  async generateJson(options: GenerateJsonOptions): Promise<Record<string, unknown>> {
+    const { contents, schema, model, abortSignal, systemInstruction, promptId, maxAttempts } =
+      options;
 
     const requestConfig: GenerateContentConfig = {
       abortSignal,
@@ -90,8 +77,8 @@ export class BaseLlmClient {
 
     // Convert schema to function declaration
     const functionDeclaration: FunctionDeclaration = {
-      name: 'respond_in_schema',
-      description: 'Provide the response in provided schema',
+      name: "respond_in_schema",
+      description: "Provide the response in provided schema",
       parameters: schema as Schema,
     };
 
@@ -112,7 +99,7 @@ export class BaseLlmClient {
             },
             contents,
           },
-          promptId ?? '',
+          promptId ?? "",
         );
 
       const result = await retryWithBackoff(apiCall, {
@@ -121,9 +108,7 @@ export class BaseLlmClient {
 
       const functionCalls = getFunctionCalls(result);
       if (functionCalls && functionCalls.length > 0) {
-        const functionCall = functionCalls.find(
-          (call) => call.name === 'respond_in_schema',
-        );
+        const functionCall = functionCalls.find((call) => call.name === "respond_in_schema");
         if (functionCall && functionCall.args) {
           return functionCall.args as Record<string, unknown>;
         }
@@ -137,20 +122,18 @@ export class BaseLlmClient {
       // Avoid double reporting for the empty response case handled above
       if (
         error instanceof Error &&
-        error.message === 'API returned an empty response for generateJson.'
+        error.message === "API returned an empty response for generateJson."
       ) {
         throw error;
       }
 
       await reportError(
         error,
-        'Error generating JSON content via API.',
+        "Error generating JSON content via API.",
         contents,
-        'generateJson-api',
-      );
-      throw new Error(
-        `Failed to generate JSON content: ${getErrorMessage(error)}`,
+        "generateJson-api",
       );
+      throw new Error(`Failed to generate JSON content: ${getErrorMessage(error)}`);
     }
   }
 
@@ -163,13 +146,9 @@ export class BaseLlmClient {
       contents: texts,
     };
 
-    const embedContentResponse =
-      await this.contentGenerator.embedContent(embedModelParams);
-    if (
-      !embedContentResponse.embeddings ||
-      embedContentResponse.embeddings.length === 0
-    ) {
-      throw new Error('No embeddings found in API response.');
+    const embedContentResponse = await this.contentGenerator.embedContent(embedModelParams);
+    if (!embedContentResponse.embeddings || embedContentResponse.embeddings.length === 0) {
+      throw new Error("No embeddings found in API response.");
     }
 
     if (embedContentResponse.embeddings.length !== texts.length) {
diff --git a/packages/airiscode-core/src/core/client.ts b/packages/airiscode-core/src/core/client.ts
index 6cfc92282..067173df6 100644
--- a/packages/airiscode-core/src/core/client.ts
+++ b/packages/airiscode-core/src/core/client.ts
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+// Config
+import { ApprovalMode, type Config } from "../config/config.js";
 // External dependencies
 import type {
   Content,
@@ -11,95 +13,75 @@ import type {
   GenerateContentResponse,
   PartListUnion,
   Tool,
-} from '../types/llm.js';
-
-// Config
-import { ApprovalMode, type Config } from '../config/config.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+} from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
 
-const debugLogger = createDebugLogger('CLIENT');
+const debugLogger = createDebugLogger("CLIENT");
 
+// Hook types and utilities
+import {
+  type HookExecutionRequest,
+  type HookExecutionResponse,
+  MessageBusType,
+} from "../confirmation-bus/types.js";
+// Forked query cache
+import { clearCacheSafeParams, saveCacheSafeParams } from "../followup/forkedQuery.js";
+import type { StopHookOutput } from "../hooks/types.js";
+import { createHookOutput } from "../hooks/types.js";
+// IDE integration
+import { ideContextStore } from "../ide/ideContext.js";
+import { type File, type IdeContext } from "../ide/types.js";
+// Services
+import {
+  ChatCompressionService,
+  COMPRESSION_PRESERVE_THRESHOLD,
+  COMPRESSION_TOKEN_THRESHOLD,
+} from "../services/chatCompressionService.js";
+import { LoopDetectionService } from "../services/loopDetectionService.js";
+import {
+  buildApiHistoryFromConversation,
+  replayUiTelemetryFromConversation,
+} from "../services/sessionService.js";
+// Telemetry
+import { logNextSpeakerCheck, NextSpeakerCheckEvent } from "../telemetry/index.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+// Tools
+import { AgentTool } from "../tools/agent.js";
+// Utilities
+import { getDirectoryContextString, getInitialChatHistory } from "../utils/environmentContext.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { checkNextSpeaker } from "../utils/nextSpeakerChecker.js";
+import { flatMapTextParts, partToString } from "../utils/partUtils.js";
+import { promptIdContext } from "../utils/promptIdContext.js";
+import { retryWithBackoff } from "../utils/retry.js";
 // Core modules
-import type { ContentGenerator } from './contentGenerator.js';
-import { GeminiChat } from './geminiChat.js';
+import type { ContentGenerator } from "./contentGenerator.js";
+import { GeminiChat } from "./geminiChat.js";
 import {
   getArenaSystemReminder,
   getCoreSystemPrompt,
   getCustomSystemPrompt,
   getPlanModeSystemReminder,
   getSubagentSystemReminder,
-} from './prompts.js';
+} from "./prompts.js";
 import {
+  type ChatCompressionInfo,
   CompressionStatus,
   GeminiEventType,
-  Turn,
-  type ChatCompressionInfo,
   type ServerGeminiStreamEvent,
-} from './turn.js';
-
-// Services
-import {
-  ChatCompressionService,
-  COMPRESSION_PRESERVE_THRESHOLD,
-  COMPRESSION_TOKEN_THRESHOLD,
-} from '../services/chatCompressionService.js';
-import { LoopDetectionService } from '../services/loopDetectionService.js';
-
-// Tools
-import { AgentTool } from '../tools/agent.js';
-
-// Telemetry
-import {
-  NextSpeakerCheckEvent,
-  logNextSpeakerCheck,
-} from '../telemetry/index.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-
-// Forked query cache
-import {
-  saveCacheSafeParams,
-  clearCacheSafeParams,
-} from '../followup/forkedQuery.js';
-
-// Utilities
-import {
-  getDirectoryContextString,
-  getInitialChatHistory,
-} from '../utils/environmentContext.js';
-import {
-  buildApiHistoryFromConversation,
-  replayUiTelemetryFromConversation,
-} from '../services/sessionService.js';
-import { reportError } from '../utils/errorReporting.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { checkNextSpeaker } from '../utils/nextSpeakerChecker.js';
-import { flatMapTextParts } from '../utils/partUtils.js';
-import { promptIdContext } from '../utils/promptIdContext.js';
-import { retryWithBackoff } from '../utils/retry.js';
-
-// Hook types and utilities
-import {
-  MessageBusType,
-  type HookExecutionRequest,
-  type HookExecutionResponse,
-} from '../confirmation-bus/types.js';
-import { partToString } from '../utils/partUtils.js';
-import { createHookOutput } from '../hooks/types.js';
-
-// IDE integration
-import { ideContextStore } from '../ide/ideContext.js';
-import { type File, type IdeContext } from '../ide/types.js';
-import type { StopHookOutput } from '../hooks/types.js';
+  Turn,
+} from "./turn.js";
 
 const MAX_TURNS = 100;
 
 export enum SendMessageType {
-  UserQuery = 'userQuery',
-  ToolResult = 'toolResult',
-  Retry = 'retry',
-  Hook = 'hook',
+  UserQuery = "userQuery",
+  ToolResult = "toolResult",
+  Retry = "retry",
+  Hook = "hook",
   /** Cron-fired prompt. Behaves like UserQuery but skips UserPromptSubmit hook. */
-  Cron = 'cron',
+  Cron = "cron",
 }
 
 export interface SendMessageOptions {
@@ -158,9 +140,7 @@ export class GeminiClient {
       replayUiTelemetryFromConversation(resumedSessionData.conversation);
       // Convert resumed session to API history format
       // Each ChatRecord's message field is already a Content object
-      const resumedHistory = buildApiHistoryFromConversation(
-        resumedSessionData.conversation,
-      );
+      const resumedHistory = buildApiHistoryFromConversation(resumedSessionData.conversation);
       await this.startChat(resumedHistory);
     } else {
       await this.startChat();
@@ -169,7 +149,7 @@ export class GeminiClient {
 
   private getContentGeneratorOrFail(): ContentGenerator {
     if (!this.config.getContentGenerator()) {
-      throw new Error('Content generator not initialized');
+      throw new Error("Content generator not initialized");
     }
     return this.config.getContentGenerator();
   }
@@ -180,7 +160,7 @@ export class GeminiClient {
 
   getChat(): GeminiChat {
     if (!this.chat) {
-      throw new Error('Chat not initialized');
+      throw new Error("Chat not initialized");
     }
     return this.chat;
   }
@@ -234,7 +214,7 @@ export class GeminiClient {
     }
 
     this.getChat().addHistory({
-      role: 'user',
+      role: "user",
       parts: [{ text: await getDirectoryContextString(this.config) }],
     });
   }
@@ -245,18 +225,10 @@ export class GeminiClient {
     const appendSystemPrompt = this.config.getAppendSystemPrompt();
 
     if (overrideSystemPrompt) {
-      return getCustomSystemPrompt(
-        overrideSystemPrompt,
-        userMemory,
-        appendSystemPrompt,
-      );
+      return getCustomSystemPrompt(overrideSystemPrompt, userMemory, appendSystemPrompt);
     }
 
-    return getCoreSystemPrompt(
-      userMemory,
-      this.config.getModel(),
-      appendSystemPrompt,
-    );
+    return getCoreSystemPrompt(userMemory, this.config.getModel(), appendSystemPrompt);
   }
 
   async startChat(extraHistory?: Content[]): Promise<GeminiChat> {
@@ -284,12 +256,7 @@ export class GeminiClient {
 
       return this.chat;
     } catch (error) {
-      await reportError(
-        error,
-        'Error initializing chat session.',
-        history,
-        'startChat',
-      );
+      await reportError(error, "Error initializing chat session.", history, "startChat");
       throw new Error(`Failed to initialize chat: ${getErrorMessage(error)}`);
     }
   }
@@ -307,14 +274,12 @@ export class GeminiClient {
       // Send full context as plain text
       const openFiles = currentIdeContext.workspaceState?.openFiles || [];
       const activeFile = openFiles.find((f) => f.isActive);
-      const otherOpenFiles = openFiles
-        .filter((f) => !f.isActive)
-        .map((f) => f.path);
+      const otherOpenFiles = openFiles.filter((f) => !f.isActive).map((f) => f.path);
 
       const contextLines: string[] = [];
 
       if (activeFile) {
-        contextLines.push('Active file:');
+        contextLines.push("Active file:");
         contextLines.push(`  Path: ${activeFile.path}`);
         if (activeFile.cursor) {
           contextLines.push(
@@ -322,18 +287,18 @@ export class GeminiClient {
           );
         }
         if (activeFile.selectedText) {
-          contextLines.push('  Selected text:');
-          contextLines.push('```');
+          contextLines.push("  Selected text:");
+          contextLines.push("```");
           contextLines.push(activeFile.selectedText);
-          contextLines.push('```');
+          contextLines.push("```");
         }
       }
 
       if (otherOpenFiles.length > 0) {
         if (contextLines.length > 0) {
-          contextLines.push('');
+          contextLines.push("");
         }
-        contextLines.push('Other open files:');
+        contextLines.push("Other open files:");
         for (const filePath of otherOpenFiles) {
           contextLines.push(`  - ${filePath}`);
         }
@@ -345,10 +310,10 @@ export class GeminiClient {
 
       const contextParts = [
         "Here is the user's editor context. This is for your information only.",
-        contextLines.join('\n'),
+        contextLines.join("\n"),
       ];
 
-      debugLogger.debug(contextParts.join('\n'));
+      debugLogger.debug(contextParts.join("\n"));
       return {
         contextParts,
         newIdeContext: currentIdeContext,
@@ -358,15 +323,10 @@ export class GeminiClient {
       const changeLines: string[] = [];
 
       const lastFiles = new Map(
-        (this.lastSentIdeContext.workspaceState?.openFiles || []).map(
-          (f: File) => [f.path, f],
-        ),
+        (this.lastSentIdeContext.workspaceState?.openFiles || []).map((f: File) => [f.path, f]),
       );
       const currentFiles = new Map(
-        (currentIdeContext.workspaceState?.openFiles || []).map((f: File) => [
-          f.path,
-          f,
-        ]),
+        (currentIdeContext.workspaceState?.openFiles || []).map((f: File) => [f.path, f]),
       );
 
       const openedFiles: string[] = [];
@@ -376,7 +336,7 @@ export class GeminiClient {
         }
       }
       if (openedFiles.length > 0) {
-        changeLines.push('Files opened:');
+        changeLines.push("Files opened:");
         for (const filePath of openedFiles) {
           changeLines.push(`  - ${filePath}`);
         }
@@ -390,27 +350,27 @@ export class GeminiClient {
       }
       if (closedFiles.length > 0) {
         if (changeLines.length > 0) {
-          changeLines.push('');
+          changeLines.push("");
         }
-        changeLines.push('Files closed:');
+        changeLines.push("Files closed:");
         for (const filePath of closedFiles) {
           changeLines.push(`  - ${filePath}`);
         }
       }
 
-      const lastActiveFile = (
-        this.lastSentIdeContext.workspaceState?.openFiles || []
-      ).find((f: File) => f.isActive);
-      const currentActiveFile = (
-        currentIdeContext.workspaceState?.openFiles || []
-      ).find((f: File) => f.isActive);
+      const lastActiveFile = (this.lastSentIdeContext.workspaceState?.openFiles || []).find(
+        (f: File) => f.isActive,
+      );
+      const currentActiveFile = (currentIdeContext.workspaceState?.openFiles || []).find(
+        (f: File) => f.isActive,
+      );
 
       if (currentActiveFile) {
         if (!lastActiveFile || lastActiveFile.path !== currentActiveFile.path) {
           if (changeLines.length > 0) {
-            changeLines.push('');
+            changeLines.push("");
           }
-          changeLines.push('Active file changed:');
+          changeLines.push("Active file changed:");
           changeLines.push(`  Path: ${currentActiveFile.path}`);
           if (currentActiveFile.cursor) {
             changeLines.push(
@@ -418,10 +378,10 @@ export class GeminiClient {
             );
           }
           if (currentActiveFile.selectedText) {
-            changeLines.push('  Selected text:');
-            changeLines.push('```');
+            changeLines.push("  Selected text:");
+            changeLines.push("```");
             changeLines.push(currentActiveFile.selectedText);
-            changeLines.push('```');
+            changeLines.push("```");
           }
         } else {
           const lastCursor = lastActiveFile.cursor;
@@ -433,39 +393,39 @@ export class GeminiClient {
               lastCursor.character !== currentCursor.character)
           ) {
             if (changeLines.length > 0) {
-              changeLines.push('');
+              changeLines.push("");
             }
-            changeLines.push('Cursor moved:');
+            changeLines.push("Cursor moved:");
             changeLines.push(`  Path: ${currentActiveFile.path}`);
             changeLines.push(
               `  New position: line ${currentCursor.line}, character ${currentCursor.character}`,
             );
           }
 
-          const lastSelectedText = lastActiveFile.selectedText || '';
-          const currentSelectedText = currentActiveFile.selectedText || '';
+          const lastSelectedText = lastActiveFile.selectedText || "";
+          const currentSelectedText = currentActiveFile.selectedText || "";
           if (lastSelectedText !== currentSelectedText) {
             if (changeLines.length > 0) {
-              changeLines.push('');
+              changeLines.push("");
             }
-            changeLines.push('Selection changed:');
+            changeLines.push("Selection changed:");
             changeLines.push(`  Path: ${currentActiveFile.path}`);
             if (currentSelectedText) {
-              changeLines.push('  Selected text:');
-              changeLines.push('```');
+              changeLines.push("  Selected text:");
+              changeLines.push("```");
               changeLines.push(currentSelectedText);
-              changeLines.push('```');
+              changeLines.push("```");
             } else {
-              changeLines.push('  Selected text: (none)');
+              changeLines.push("  Selected text: (none)");
             }
           }
         }
       } else if (lastActiveFile) {
         if (changeLines.length > 0) {
-          changeLines.push('');
+          changeLines.push("");
         }
-        changeLines.push('Active file changed:');
-        changeLines.push('  No active file');
+        changeLines.push("Active file changed:");
+        changeLines.push("  No active file");
         changeLines.push(`  Previous path: ${lastActiveFile.path}`);
       }
 
@@ -475,10 +435,10 @@ export class GeminiClient {
 
       const contextParts = [
         "Here is a summary of changes in the user's editor context. This is for your information only.",
-        changeLines.join('\n'),
+        changeLines.join("\n"),
       ];
 
-      debugLogger.debug(contextParts.join('\n'));
+      debugLogger.debug(contextParts.join("\n"));
       return {
         contextParts,
         newIdeContext: currentIdeContext,
@@ -507,16 +467,13 @@ export class GeminiClient {
       messageType !== SendMessageType.Cron &&
       hooksEnabled &&
       messageBus &&
-      this.config.hasHooksForEvent('UserPromptSubmit')
+      this.config.hasHooksForEvent("UserPromptSubmit")
     ) {
       const promptText = partToString(request);
-      const response = await messageBus.request<
-        HookExecutionRequest,
-        HookExecutionResponse
-      >(
+      const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
         {
           type: MessageBusType.HOOK_EXECUTION_REQUEST,
-          eventName: 'UserPromptSubmit',
+          eventName: "UserPromptSubmit",
           input: {
             prompt: promptText,
           },
@@ -524,13 +481,10 @@ export class GeminiClient {
         MessageBusType.HOOK_EXECUTION_RESPONSE,
       );
       const hookOutput = response.output
-        ? createHookOutput('UserPromptSubmit', response.output)
+        ? createHookOutput("UserPromptSubmit", response.output)
         : undefined;
 
-      if (
-        hookOutput?.isBlockingDecision() ||
-        hookOutput?.shouldStopExecution()
-      ) {
+      if (hookOutput?.isBlockingDecision() || hookOutput?.shouldStopExecution()) {
         yield {
           type: GeminiEventType.UserPromptSubmitBlocked,
           value: {
@@ -549,10 +503,7 @@ export class GeminiClient {
       }
     }
 
-    if (
-      messageType === SendMessageType.UserQuery ||
-      messageType === SendMessageType.Cron
-    ) {
+    if (messageType === SendMessageType.UserQuery || messageType === SendMessageType.Cron) {
       this.loopDetector.reset(prompt_id);
       this.lastPromptId = prompt_id;
 
@@ -563,10 +514,7 @@ export class GeminiClient {
       // - Active session (< threshold idle): keep thinking blocks for reasoning coherence
       // - Idle > threshold: clear old thinking, keep only last 1 turn to free context
       // - Latch: once triggered, never revert — prevents oscillation
-      if (
-        !this.thinkingClearLatched &&
-        this.lastApiCompletionTimestamp !== null
-      ) {
+      if (!this.thinkingClearLatched && this.lastApiCompletionTimestamp !== null) {
         const thresholdMs = this.config.getThinkingIdleThresholdMs();
         const idleMs = Date.now() - this.lastApiCompletionTimestamp;
         if (idleMs > thresholdMs) {
@@ -578,7 +526,7 @@ export class GeminiClient {
       }
       if (this.thinkingClearLatched) {
         this.getChat().stripThoughtsFromHistoryKeepRecent(1);
-        debugLogger.debug('Stripped old thinking blocks (keeping last 1 turn)');
+        debugLogger.debug("Stripped old thinking blocks (keeping last 1 turn)");
       }
     }
     if (messageType !== SendMessageType.Retry) {
@@ -618,7 +566,7 @@ export class GeminiClient {
             limit: sessionTokenLimit,
             message:
               `Session token limit exceeded: ${lastPromptTokenCount} tokens > ${sessionTokenLimit} limit. ` +
-              'Please start a new session or increase the sessionTokenLimit in your settings.json.',
+              "Please start a new session or increase the sessionTokenLimit in your settings.json.",
           },
         };
         return new Turn(this.getChat(), prompt_id);
@@ -631,12 +579,11 @@ export class GeminiClient {
     // in the conversation history . The IDE context is not discarded; it will
     // be included in the next regular message sent to the model.
     const history = this.getHistory();
-    const lastMessage =
-      history.length > 0 ? history[history.length - 1] : undefined;
+    const lastMessage = history.length > 0 ? history[history.length - 1] : undefined;
     const hasPendingToolCall =
       !!lastMessage &&
-      lastMessage.role === 'model' &&
-      (lastMessage.parts?.some((p) => 'functionCall' in p) || false);
+      lastMessage.role === "model" &&
+      (lastMessage.parts?.some((p) => "functionCall" in p) || false);
 
     if (this.config.getIdeMode() && !hasPendingToolCall) {
       const { contextParts, newIdeContext } = this.getIdeContextParts(
@@ -644,8 +591,8 @@ export class GeminiClient {
       );
       if (contextParts.length > 0) {
         this.getChat().addHistory({
-          role: 'user',
-          parts: [{ text: contextParts.join('\n') }],
+          role: "user",
+          parts: [{ text: contextParts.join("\n") }],
         });
       }
       this.lastSentIdeContext = newIdeContext;
@@ -669,18 +616,13 @@ export class GeminiClient {
 
     // append system reminders to the request
     let requestToSent = await flatMapTextParts(request, async (text) => [text]);
-    if (
-      messageType === SendMessageType.UserQuery ||
-      messageType === SendMessageType.Cron
-    ) {
+    if (messageType === SendMessageType.UserQuery || messageType === SendMessageType.Cron) {
       const systemReminders = [];
 
       // add subagent system reminder if there are subagents
-      const hasAgentTool = this.config
-        .getToolRegistry()
-        .getTool(AgentTool.Name);
+      const hasAgentTool = this.config.getToolRegistry().getTool(AgentTool.Name);
       const subagents = (await this.config.getSubagentManager().listSubagents())
-        .filter((subagent) => subagent.level !== 'builtin')
+        .filter((subagent) => subagent.level !== "builtin")
         .map((subagent) => subagent.name);
 
       if (hasAgentTool && subagents.length > 0) {
@@ -689,9 +631,7 @@ export class GeminiClient {
 
       // add plan mode system reminder if approval mode is plan
       if (this.config.getApprovalMode() === ApprovalMode.PLAN) {
-        systemReminders.push(
-          getPlanModeSystemReminder(this.config.getSdkMode()),
-        );
+        systemReminders.push(getPlanModeSystemReminder(this.config.getSdkMode()));
       }
 
       // add arena system reminder if an arena session is active
@@ -709,17 +649,13 @@ export class GeminiClient {
       requestToSent = [...systemReminders, ...requestToSent];
     }
 
-    const resultStream = turn.run(
-      this.config.getModel(),
-      requestToSent,
-      signal,
-    );
+    const resultStream = turn.run(this.config.getModel(), requestToSent, signal);
     for await (const event of resultStream) {
       if (!this.config.getSkipLoopDetection()) {
         if (this.loopDetector.addAndCheck(event)) {
           yield { type: GeminiEventType.LoopDetected };
           if (arenaAgentClient) {
-            await arenaAgentClient.reportError('Loop detected');
+            await arenaAgentClient.reportError("Loop detected");
           }
           this.lastApiCompletionTimestamp = Date.now();
           return turn;
@@ -734,10 +670,7 @@ export class GeminiClient {
       yield event;
       if (event.type === GeminiEventType.Error) {
         if (arenaAgentClient) {
-          const errorMsg =
-            event.value instanceof Error
-              ? event.value.message
-              : 'Unknown error';
+          const errorMsg = event.value instanceof Error ? event.value.message : "Unknown error";
           await arenaAgentClient.reportError(errorMsg);
         }
         this.lastApiCompletionTimestamp = Date.now();
@@ -756,26 +689,21 @@ export class GeminiClient {
       !turn.pendingToolCalls.length &&
       signal &&
       !signal.aborted &&
-      this.config.hasHooksForEvent('Stop')
+      this.config.hasHooksForEvent("Stop")
     ) {
       // Get response text from the chat history
       const history = this.getHistory();
-      const lastModelMessage = history
-        .filter((msg) => msg.role === 'model')
-        .pop();
+      const lastModelMessage = history.filter((msg) => msg.role === "model").pop();
       const responseText =
         lastModelMessage?.parts
-          ?.filter((p): p is { text: string } => 'text' in p)
+          ?.filter((p): p is { text: string } => "text" in p)
           .map((p) => p.text)
-          .join('') || '[no response text]';
+          .join("") || "[no response text]";
 
-      const response = await messageBus.request<
-        HookExecutionRequest,
-        HookExecutionResponse
-      >(
+      const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
         {
           type: MessageBusType.HOOK_EXECUTION_REQUEST,
-          eventName: 'Stop',
+          eventName: "Stop",
           input: {
             stop_hook_active: true,
             last_assistant_message: responseText,
@@ -790,9 +718,7 @@ export class GeminiClient {
         return turn;
       }
 
-      const hookOutput = response.output
-        ? createHookOutput('Stop', response.output)
-        : undefined;
+      const hookOutput = response.output ? createHookOutput("Stop", response.output) : undefined;
 
       const stopOutput = hookOutput as StopHookOutput | undefined;
 
@@ -805,10 +731,7 @@ export class GeminiClient {
       }
 
       // For Stop hooks, blocking/stop execution should force continuation
-      if (
-        stopOutput?.isBlockingDecision() ||
-        stopOutput?.shouldStopExecution()
-      ) {
+      if (stopOutput?.isBlockingDecision() || stopOutput?.shouldStopExecution()) {
         // Check if aborted before continuing
         if (signal.aborted) {
           return turn;
@@ -817,12 +740,8 @@ export class GeminiClient {
         const continueReason = stopOutput.getEffectiveReason();
 
         // Track stop hook iterations
-        const currentIterationCount =
-          (options?.stopHookState?.iterationCount ?? 0) + 1;
-        const currentReasons = [
-          ...(options?.stopHookState?.reasons ?? []),
-          continueReason,
-        ];
+        const currentIterationCount = (options?.stopHookState?.iterationCount ?? 0) + 1;
+        const currentReasons = [...(options?.stopHookState?.reasons ?? []), continueReason];
 
         // Emit StopHookLoop event for iterations after the first one.
         // The first iteration (currentIterationCount === 1) is the initial request,
@@ -875,12 +794,12 @@ export class GeminiClient {
         this.config,
         new NextSpeakerCheckEvent(
           prompt_id,
-          turn.finishReason?.toString() || '',
-          nextSpeakerCheck?.next_speaker || '',
+          turn.finishReason?.toString() || "",
+          nextSpeakerCheck?.next_speaker || "",
         ),
       );
-      if (nextSpeakerCheck?.next_speaker === 'model') {
-        const nextRequest = [{ text: 'Please continue.' }];
+      if (nextSpeakerCheck?.next_speaker === "model") {
+        const nextRequest = [{ text: "Please continue." }];
         // This recursive call's events will be yielded out, and the final
         // turn object from the recursive call will be returned.
         return yield* this.sendMessageStream(
@@ -912,11 +831,7 @@ export class GeminiClient {
           fullHistory.length > maxHistoryForCache
             ? fullHistory.slice(-maxHistoryForCache)
             : fullHistory;
-        saveCacheSafeParams(
-          chat.getGenerationConfig(),
-          cachedHistory,
-          this.config.getModel(),
-        );
+        saveCacheSafeParams(chat.getGenerationConfig(), cachedHistory, this.config.getModel());
       } catch {
         // Best-effort — don't block the main flow
       }
@@ -933,8 +848,7 @@ export class GeminiClient {
     promptIdOverride?: string,
   ): Promise<GenerateContentResponse> {
     let currentAttemptModel: string = model;
-    const promptId =
-      promptIdOverride ?? promptIdContext.getStore() ?? this.lastPromptId!;
+    const promptId = promptIdOverride ?? promptIdContext.getStore() ?? this.lastPromptId!;
 
     try {
       const userMemory = this.config.getUserMemory();
@@ -976,7 +890,7 @@ export class GeminiClient {
           requestContents: contents,
           requestConfig: generationConfig,
         },
-        'generateContent-api',
+        "generateContent-api",
       );
       throw new Error(
         `Failed to generate content with model ${currentAttemptModel}: ${getErrorMessage(error)}`,
@@ -1016,10 +930,8 @@ export class GeminiClient {
         this.forceFullIdeContext = true;
       }
     } else if (
-      info.compressionStatus ===
-        CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT ||
-      info.compressionStatus ===
-        CompressionStatus.COMPRESSION_FAILED_EMPTY_SUMMARY
+      info.compressionStatus === CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT ||
+      info.compressionStatus === CompressionStatus.COMPRESSION_FAILED_EMPTY_SUMMARY
     ) {
       // Track failed attempts (only mark as failed if not forced)
       if (!force) {
diff --git a/packages/airiscode-core/src/core/contentGenerator.ts b/packages/airiscode-core/src/core/contentGenerator.ts
index 45cf4b4d2..215071138 100644
--- a/packages/airiscode-core/src/core/contentGenerator.ts
+++ b/packages/airiscode-core/src/core/contentGenerator.ts
@@ -4,21 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  CountTokensParameters,
-  CountTokensResponse,
-  EmbedContentParameters,
-  EmbedContentResponse,
-  GenerateContentParameters,
-  GenerateContentResponse,
-} from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from './loggingContentGenerator/index.js';
-import type {
-  ConfigSource,
-  ConfigSourceKind,
-  ConfigSources,
-} from '../utils/configResolver.js';
+import type { Config } from "../config/config.js";
 import {
   getDefaultApiKeyEnvVar,
   getDefaultModelEnvVar,
@@ -28,8 +14,18 @@ import {
   MissingModelError,
   StrictMissingCredentialsError,
   StrictMissingModelIdError,
-} from '../models/modelConfigErrors.js';
-import { PROVIDER_SOURCED_FIELDS } from '../models/modelsConfig.js';
+} from "../models/modelConfigErrors.js";
+import { PROVIDER_SOURCED_FIELDS } from "../models/modelsConfig.js";
+import type {
+  CountTokensParameters,
+  CountTokensResponse,
+  EmbedContentParameters,
+  EmbedContentResponse,
+  GenerateContentParameters,
+  GenerateContentResponse,
+} from "../types/llm.js";
+import type { ConfigSource, ConfigSourceKind, ConfigSources } from "../utils/configResolver.js";
+import { LoggingContentGenerator } from "./loggingContentGenerator/index.js";
 
 /**
  * Interface abstracting the core functionalities for generating content and counting tokens.
@@ -53,9 +49,9 @@ export interface ContentGenerator {
 }
 
 export enum AuthType {
-  USE_OPENAI = 'openai',
-  USE_OLLAMA = 'ollama',
-  USE_ANTHROPIC = 'anthropic',
+  USE_OPENAI = "openai",
+  USE_OLLAMA = "ollama",
+  USE_ANTHROPIC = "anthropic",
 }
 
 /**
@@ -94,13 +90,13 @@ export type ContentGeneratorConfig = {
   reasoning?:
     | false
     | {
-        effort?: 'low' | 'medium' | 'high';
+        effort?: "low" | "medium" | "high";
         budget_tokens?: number;
       };
   proxy?: string | undefined;
   userAgent?: string;
   // Schema compliance mode for tool definitions
-  schemaCompliance?: 'auto' | 'openapi_30';
+  schemaCompliance?: "auto" | "openapi_30";
   // Context window size override. If set to a positive number, it will override
   // the automatic detection. Leave undefined to use automatic detection.
   contextWindowSize?: number;
@@ -167,20 +163,20 @@ export function resolveContentGeneratorConfigWithSources(
   };
 
   // Set sources for computed fields
-  setSource(sources, 'authType', {
-    kind: 'computed',
-    detail: 'provided by caller',
+  setSource(sources, "authType", {
+    kind: "computed",
+    detail: "provided by caller",
   });
   if (config?.getProxy()) {
-    setSource(sources, 'proxy', {
-      kind: 'computed',
-      detail: 'Config.getProxy()',
+    setSource(sources, "proxy", {
+      kind: "computed",
+      detail: "Config.getProxy()",
     });
   }
 
   // Preserve seed sources for fields that were passed in
   const seedOrUnknown = (path: string): ContentGeneratorConfigSource =>
-    getSeedSource(seedSources, path) ?? { kind: 'unknown' };
+    getSeedSource(seedSources, path) ?? { kind: "unknown" };
 
   for (const field of PROVIDER_SOURCED_FIELDS) {
     if (generationConfig && field in generationConfig && !sources[field]) {
@@ -195,7 +191,7 @@ export function resolveContentGeneratorConfigWithSources(
     strictModelProvider,
   );
   if (!validation.valid) {
-    throw new Error(validation.errors.map((e) => e.message).join('\n'));
+    throw new Error(validation.errors.map((e) => e.message).join("\n"));
   }
 
   return {
@@ -231,15 +227,10 @@ export function validateModelConfig(
   if (!config.apiKey) {
     if (isStrictModelProvider) {
       errors.push(
-        new StrictMissingCredentialsError(
-          config.authType,
-          config.model,
-          config.apiKeyEnvKey,
-        ),
+        new StrictMissingCredentialsError(config.authType, config.model, config.apiKeyEnvKey),
       );
     } else {
-      const envKey =
-        config.apiKeyEnvKey || getDefaultApiKeyEnvVar(config.authType as any);
+      const envKey = config.apiKeyEnvKey || getDefaultApiKeyEnvVar(config.authType as any);
       errors.push(
         new MissingApiKeyError({
           authType: config.authType as any,
@@ -283,11 +274,7 @@ export function createContentGeneratorConfig(
   authType: AuthType | undefined,
   generationConfig?: Partial<ContentGeneratorConfig>,
 ): ContentGeneratorConfig {
-  return resolveContentGeneratorConfigWithSources(
-    config,
-    authType,
-    generationConfig,
-  ).config;
+  return resolveContentGeneratorConfigWithSources(config, authType, generationConfig).config;
 }
 
 export async function createContentGenerator(
@@ -297,33 +284,26 @@ export async function createContentGenerator(
 ): Promise<ContentGenerator> {
   const validation = validateModelConfig(generatorConfig, false);
   if (!validation.valid) {
-    throw new Error(validation.errors.map((e) => e.message).join('\n'));
+    throw new Error(validation.errors.map((e) => e.message).join("\n"));
   }
 
   const authType = generatorConfig.authType;
   if (!authType) {
-    throw new Error('ContentGeneratorConfig must have an authType');
+    throw new Error("ContentGeneratorConfig must have an authType");
   }
 
   let baseGenerator: ContentGenerator;
 
-  if (
-    authType === AuthType.USE_OPENAI ||
-    authType === AuthType.USE_OLLAMA
-  ) {
-    const { createOpenAIContentGenerator } = await import(
-      './openaiContentGenerator/index.js'
-    );
+  if (authType === AuthType.USE_OPENAI || authType === AuthType.USE_OLLAMA) {
+    const { createOpenAIContentGenerator } = await import("./openaiContentGenerator/index.js");
     baseGenerator = createOpenAIContentGenerator(generatorConfig, config);
   } else if (authType === AuthType.USE_ANTHROPIC) {
     const { createAnthropicContentGenerator } = await import(
-      './anthropicContentGenerator/index.js'
+      "./anthropicContentGenerator/index.js"
     );
     baseGenerator = createAnthropicContentGenerator(generatorConfig, config);
   } else {
-    throw new Error(
-      `Error creating contentGenerator: Unsupported authType: ${authType}`,
-    );
+    throw new Error(`Error creating contentGenerator: Unsupported authType: ${authType}`);
   }
 
   return new LoggingContentGenerator(baseGenerator, config, generatorConfig);
diff --git a/packages/airiscode-core/src/core/coreToolScheduler.ts b/packages/airiscode-core/src/core/coreToolScheduler.ts
index 50a964fad..2059b1711 100644
--- a/packages/airiscode-core/src/core/coreToolScheduler.ts
+++ b/packages/airiscode-core/src/core/coreToolScheduler.ts
@@ -4,88 +4,81 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { NotificationType } from "../hooks/types.js";
 import type {
+  AnyDeclarativeTool,
+  AnyToolInvocation,
+  ChatRecordingService,
+  Config,
+  EditorType,
+  ToolCallConfirmationDetails,
   ToolCallRequestInfo,
   ToolCallResponseInfo,
-  ToolCallConfirmationDetails,
+  ToolConfirmationPayload,
+  ToolRegistry,
   ToolResult,
   ToolResultDisplay,
-  ToolRegistry,
-  EditorType,
-  Config,
-  ToolConfirmationPayload,
-  AnyDeclarativeTool,
-  AnyToolInvocation,
-  ChatRecordingService,
-} from '../index.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+} from "../index.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
 import {
-  generateToolUseId,
-  firePreToolUseHook,
-  firePostToolUseHook,
-  firePostToolUseFailureHook,
+  appendAdditionalContext,
   fireNotificationHook,
   firePermissionRequestHook,
-  appendAdditionalContext,
-} from './toolHookTriggers.js';
-import { NotificationType } from '../hooks/types.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+  firePostToolUseFailureHook,
+  firePostToolUseHook,
+  firePreToolUseHook,
+  generateToolUseId,
+} from "./toolHookTriggers.js";
+
+const debugLogger = createDebugLogger("TOOL_SCHEDULER");
 
-const debugLogger = createDebugLogger('TOOL_SCHEDULER');
+import * as Diff from "diff";
+import levenshtein from "fast-levenshtein";
+import { IdeClient } from "../ide/ide-client.js";
 import {
-  ToolConfirmationOutcome,
   ApprovalMode,
-  logToolCall,
-  ToolErrorType,
-  ToolCallEvent,
   InputFormat,
   Kind,
+  logToolCall,
   SkillTool,
-} from '../index.js';
-import type {
-  FunctionResponse,
-  FunctionResponsePart,
-  Part,
-  PartListUnion,
-} from '../types/llm.js';
-import { ToolNames } from '../tools/tool-names.js';
+  ToolCallEvent,
+  ToolConfirmationOutcome,
+  ToolErrorType,
+} from "../index.js";
+import type { ModifyContext } from "../tools/modifiable-tool.js";
+import { isModifiableDeclarativeTool, modifyWithEditor } from "../tools/modifiable-tool.js";
+import { ShellToolInvocation } from "../tools/shell.js";
+import { ToolNames } from "../tools/tool-names.js";
+import type { FunctionResponse, FunctionResponsePart, Part, PartListUnion } from "../types/llm.js";
+import { getResponseTextFromParts } from "../utils/generateContentResponseUtilities.js";
 import {
   buildPermissionCheckContext,
   evaluatePermissionRules,
   injectPermissionRulesIfMissing,
   persistPermissionOutcome,
-} from './permission-helpers.js';
-import { getResponseTextFromParts } from '../utils/generateContentResponseUtilities.js';
-import type { ModifyContext } from '../tools/modifiable-tool.js';
-import {
-  isModifiableDeclarativeTool,
-  modifyWithEditor,
-} from '../tools/modifiable-tool.js';
-import * as Diff from 'diff';
-import levenshtein from 'fast-levenshtein';
-import { getPlanModeSystemReminder } from './prompts.js';
-import { ShellToolInvocation } from '../tools/shell.js';
-import { IdeClient } from '../ide/ide-client.js';
+} from "./permission-helpers.js";
+import { getPlanModeSystemReminder } from "./prompts.js";
 
 const TRUNCATION_PARAM_GUIDANCE =
-  'Note: Your previous response was truncated due to max_tokens limit, ' +
-  'which likely caused incomplete tool call parameters. ' +
-  'Please retry the tool call with complete parameters. ' +
-  'If the content is too large for a single response, ' +
-  'consider splitting it into smaller parts.';
+  "Note: Your previous response was truncated due to max_tokens limit, " +
+  "which likely caused incomplete tool call parameters. " +
+  "Please retry the tool call with complete parameters. " +
+  "If the content is too large for a single response, " +
+  "consider splitting it into smaller parts.";
 
 const TRUNCATION_EDIT_REJECTION =
-  'Your previous response was truncated due to max_tokens limit, ' +
-  'which likely produced incomplete file content. ' +
-  'The tool call has been rejected to prevent writing ' +
-  'truncated content to the file. ' +
-  'Please retry the tool call with complete content. ' +
-  'If the content is too large for a single response, ' +
-  'consider splitting it into smaller parts ' +
-  '(e.g., write_file for initial content, then edit for additions).';
+  "Your previous response was truncated due to max_tokens limit, " +
+  "which likely produced incomplete file content. " +
+  "The tool call has been rejected to prevent writing " +
+  "truncated content to the file. " +
+  "Please retry the tool call with complete content. " +
+  "If the content is too large for a single response, " +
+  "consider splitting it into smaller parts " +
+  "(e.g., write_file for initial content, then edit for additions).";
 
 export type ValidatingToolCall = {
-  status: 'validating';
+  status: "validating";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -94,7 +87,7 @@ export type ValidatingToolCall = {
 };
 
 export type ScheduledToolCall = {
-  status: 'scheduled';
+  status: "scheduled";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -103,7 +96,7 @@ export type ScheduledToolCall = {
 };
 
 export type ErroredToolCall = {
-  status: 'error';
+  status: "error";
   request: ToolCallRequestInfo;
   response: ToolCallResponseInfo;
   tool?: AnyDeclarativeTool;
@@ -112,7 +105,7 @@ export type ErroredToolCall = {
 };
 
 export type SuccessfulToolCall = {
-  status: 'success';
+  status: "success";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   response: ToolCallResponseInfo;
@@ -122,7 +115,7 @@ export type SuccessfulToolCall = {
 };
 
 export type ExecutingToolCall = {
-  status: 'executing';
+  status: "executing";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -133,7 +126,7 @@ export type ExecutingToolCall = {
 };
 
 export type CancelledToolCall = {
-  status: 'cancelled';
+  status: "cancelled";
   request: ToolCallRequestInfo;
   response: ToolCallResponseInfo;
   tool: AnyDeclarativeTool;
@@ -143,7 +136,7 @@ export type CancelledToolCall = {
 };
 
 export type WaitingToolCall = {
-  status: 'awaiting_approval';
+  status: "awaiting_approval";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -152,7 +145,7 @@ export type WaitingToolCall = {
   outcome?: ToolConfirmationOutcome;
 };
 
-export type Status = ToolCall['status'];
+export type Status = ToolCall["status"];
 
 export type ToolCall =
   | ValidatingToolCall
@@ -163,19 +156,11 @@ export type ToolCall =
   | CancelledToolCall
   | WaitingToolCall;
 
-export type CompletedToolCall =
-  | SuccessfulToolCall
-  | CancelledToolCall
-  | ErroredToolCall;
+export type CompletedToolCall = SuccessfulToolCall | CancelledToolCall | ErroredToolCall;
 
-export type ConfirmHandler = (
-  toolCall: WaitingToolCall,
-) => Promise<ToolConfirmationOutcome>;
+export type ConfirmHandler = (toolCall: WaitingToolCall) => Promise<ToolConfirmationOutcome>;
 
-export type OutputUpdateHandler = (
-  toolCallId: string,
-  outputChunk: ToolResultDisplay,
-) => void;
+export type OutputUpdateHandler = (toolCallId: string, outputChunk: ToolResultDisplay) => void;
 
 export type AllToolCallsCompleteHandler = (
   completedToolCalls: CompletedToolCall[],
@@ -210,11 +195,9 @@ export function convertToFunctionResponse(
   llmContent: PartListUnion,
 ): Part[] {
   const contentToProcess =
-    Array.isArray(llmContent) && llmContent.length === 1
-      ? llmContent[0]
-      : llmContent;
+    Array.isArray(llmContent) && llmContent.length === 1 ? llmContent[0] : llmContent;
 
-  if (typeof contentToProcess === 'string') {
+  if (typeof contentToProcess === "string") {
     return [createFunctionResponsePart(callId, toolName, contentToProcess)];
   }
 
@@ -236,18 +219,16 @@ export function convertToFunctionResponse(
       // dropped here – they should not appear inside tool results.
     }
 
-    const output =
-      textParts.length > 0 ? textParts.join('\n') : 'Tool execution succeeded.';
+    const output = textParts.length > 0 ? textParts.join("\n") : "Tool execution succeeded.";
     return [createFunctionResponsePart(callId, toolName, output, mediaParts)];
   }
 
   // After this point, contentToProcess is a single Part object.
   if (contentToProcess.functionResponse) {
-    if (contentToProcess.functionResponse.response?.['content']) {
+    if (contentToProcess.functionResponse.response?.["content"]) {
       const stringifiedOutput =
-        getResponseTextFromParts(
-          contentToProcess.functionResponse.response['content'] as Part[],
-        ) || '';
+        getResponseTextFromParts(contentToProcess.functionResponse.response["content"] as Part[]) ||
+        "";
       return [createFunctionResponsePart(callId, toolName, stringifiedOutput)];
     }
     // It's a functionResponse that we should pass through as is.
@@ -263,31 +244,22 @@ export function convertToFunctionResponse(
       mediaParts.push({ fileData: contentToProcess.fileData });
     }
 
-    const functionResponse = createFunctionResponsePart(
-      callId,
-      toolName,
-      '',
-      mediaParts,
-    );
+    const functionResponse = createFunctionResponsePart(callId, toolName, "", mediaParts);
     return [functionResponse];
   }
 
   if (contentToProcess.text !== undefined) {
-    return [
-      createFunctionResponsePart(callId, toolName, contentToProcess.text),
-    ];
+    return [createFunctionResponsePart(callId, toolName, contentToProcess.text)];
   }
 
   // Default case for other kinds of parts.
-  return [
-    createFunctionResponsePart(callId, toolName, 'Tool execution succeeded.'),
-  ];
+  return [createFunctionResponsePart(callId, toolName, "Tool execution succeeded.")];
 }
 
 function toParts(input: PartListUnion): Part[] {
   const parts: Part[] = [];
   for (const part of Array.isArray(input) ? input : [input]) {
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       parts.push({ text: part });
     } else if (part) {
       parts.push(part);
@@ -362,27 +334,23 @@ export class CoreToolScheduler {
 
   private setStatusInternal(
     targetCallId: string,
-    status: 'success',
+    status: "success",
     response: ToolCallResponseInfo,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'awaiting_approval',
+    status: "awaiting_approval",
     confirmationDetails: ToolCallConfirmationDetails,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'error',
+    status: "error",
     response: ToolCallResponseInfo,
   ): void;
+  private setStatusInternal(targetCallId: string, status: "cancelled", reason: string): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'cancelled',
-    reason: string,
-  ): void;
-  private setStatusInternal(
-    targetCallId: string,
-    status: 'executing' | 'scheduled' | 'validating',
+    status: "executing" | "scheduled" | "validating",
   ): void;
   private setStatusInternal(
     targetCallId: string,
@@ -392,9 +360,9 @@ export class CoreToolScheduler {
     this.toolCalls = this.toolCalls.map((currentCall) => {
       if (
         currentCall.request.callId !== targetCallId ||
-        currentCall.status === 'success' ||
-        currentCall.status === 'error' ||
-        currentCall.status === 'cancelled'
+        currentCall.status === "success" ||
+        currentCall.status === "error" ||
+        currentCall.status === "cancelled"
       ) {
         return currentCall;
       }
@@ -407,79 +375,72 @@ export class CoreToolScheduler {
       const outcome = currentCall.outcome;
 
       switch (newStatus) {
-        case 'success': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "success": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
           return {
             request: currentCall.request,
             tool: toolInstance,
             invocation,
-            status: 'success',
+            status: "success",
             response: auxiliaryData as ToolCallResponseInfo,
             durationMs,
             outcome,
           } as SuccessfulToolCall;
         }
-        case 'error': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "error": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
           return {
             request: currentCall.request,
-            status: 'error',
+            status: "error",
             tool: toolInstance,
             response: auxiliaryData as ToolCallResponseInfo,
             durationMs,
             outcome,
           } as ErroredToolCall;
         }
-        case 'awaiting_approval':
+        case "awaiting_approval":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'awaiting_approval',
+            status: "awaiting_approval",
             confirmationDetails: auxiliaryData as ToolCallConfirmationDetails,
             startTime: existingStartTime,
             outcome,
             invocation,
           } as WaitingToolCall;
-        case 'scheduled':
+        case "scheduled":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'scheduled',
+            status: "scheduled",
             startTime: existingStartTime,
             outcome,
             invocation,
           } as ScheduledToolCall;
-        case 'cancelled': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "cancelled": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
 
           // Preserve diff for cancelled edit operations
           // Preserve plan content for cancelled plan operations
           let resultDisplay: ToolResultDisplay | undefined = undefined;
-          if (currentCall.status === 'awaiting_approval') {
+          if (currentCall.status === "awaiting_approval") {
             const waitingCall = currentCall as WaitingToolCall;
-            if (waitingCall.confirmationDetails.type === 'edit') {
+            if (waitingCall.confirmationDetails.type === "edit") {
               resultDisplay = {
                 fileDiff: waitingCall.confirmationDetails.fileDiff,
                 fileName: waitingCall.confirmationDetails.fileName,
-                originalContent:
-                  waitingCall.confirmationDetails.originalContent,
+                originalContent: waitingCall.confirmationDetails.originalContent,
                 newContent: waitingCall.confirmationDetails.newContent,
               };
-            } else if (waitingCall.confirmationDetails.type === 'plan') {
+            } else if (waitingCall.confirmationDetails.type === "plan") {
               resultDisplay = {
-                type: 'plan_summary',
-                message: 'Plan was rejected. Remaining in plan mode.',
+                type: "plan_summary",
+                message: "Plan was rejected. Remaining in plan mode.",
                 plan: waitingCall.confirmationDetails.plan,
                 rejected: true,
               };
             }
-          } else if (currentCall.status === 'executing') {
+          } else if (currentCall.status === "executing") {
             // If the tool was streaming live output, preserve the latest
             // output so the UI can continue to show it after cancellation.
             const executingCall = currentCall as ExecutingToolCall;
@@ -493,7 +454,7 @@ export class CoreToolScheduler {
             request: currentCall.request,
             tool: toolInstance,
             invocation,
-            status: 'cancelled',
+            status: "cancelled",
             response: {
               callId: currentCall.request.callId,
               responseParts: [
@@ -516,20 +477,20 @@ export class CoreToolScheduler {
             outcome,
           } as CancelledToolCall;
         }
-        case 'validating':
+        case "validating":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'validating',
+            status: "validating",
             startTime: existingStartTime,
             outcome,
             invocation,
           } as ValidatingToolCall;
-        case 'executing':
+        case "executing":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'executing',
+            status: "executing",
             startTime: existingStartTime,
             outcome,
             invocation,
@@ -548,14 +509,11 @@ export class CoreToolScheduler {
     this.toolCalls = this.toolCalls.map((call) => {
       // We should never be asked to set args on an ErroredToolCall, but
       // we guard for the case anyways.
-      if (call.request.callId !== targetCallId || call.status === 'error') {
+      if (call.request.callId !== targetCallId || call.status === "error") {
         return call;
       }
 
-      const invocationOrError = this.buildInvocation(
-        call.tool,
-        args as Record<string, unknown>,
-      );
+      const invocationOrError = this.buildInvocation(call.tool, args as Record<string, unknown>);
       if (invocationOrError instanceof Error) {
         const response = createErrorResponse(
           call.request,
@@ -564,7 +522,7 @@ export class CoreToolScheduler {
         );
         return {
           request: { ...call.request, args: args as Record<string, unknown> },
-          status: 'error',
+          status: "error",
           tool: call.tool,
           response,
         } as ErroredToolCall;
@@ -582,16 +540,12 @@ export class CoreToolScheduler {
     return (
       this.isFinalizingToolCalls ||
       this.toolCalls.some(
-        (call) =>
-          call.status === 'executing' || call.status === 'awaiting_approval',
+        (call) => call.status === "executing" || call.status === "awaiting_approval",
       )
     );
   }
 
-  private buildInvocation(
-    tool: AnyDeclarativeTool,
-    args: object,
-  ): AnyToolInvocation | Error {
+  private buildInvocation(tool: AnyDeclarativeTool, args: object): AnyToolInvocation | Error {
     try {
       return tool.build(structuredClone(args));
     } catch (e) {
@@ -637,12 +591,10 @@ export class CoreToolScheduler {
     const topNResults = matches.slice(0, topN);
 
     if (topNResults.length === 0) {
-      return '';
+      return "";
     }
 
-    const suggestedNames = topNResults
-      .map((match) => `"${match.name}"`)
-      .join(', ');
+    const suggestedNames = topNResults.map((match) => `"${match.name}"`).join(", ");
 
     if (topNResults.length > 1) {
       return ` Did you mean one of: ${suggestedNames}?`;
@@ -659,26 +611,24 @@ export class CoreToolScheduler {
       return new Promise((resolve, reject) => {
         const abortHandler = () => {
           // Find and remove the request from the queue
-          const index = this.requestQueue.findIndex(
-            (item) => item.request === request,
-          );
+          const index = this.requestQueue.findIndex((item) => item.request === request);
           if (index > -1) {
             this.requestQueue.splice(index, 1);
-            reject(new Error('Tool call cancelled while in queue.'));
+            reject(new Error("Tool call cancelled while in queue."));
           }
         };
 
-        signal.addEventListener('abort', abortHandler, { once: true });
+        signal.addEventListener("abort", abortHandler, { once: true });
 
         this.requestQueue.push({
           request,
           signal,
           resolve: () => {
-            signal.removeEventListener('abort', abortHandler);
+            signal.removeEventListener("abort", abortHandler);
             resolve();
           },
           reject: (reason?: Error) => {
-            signal.removeEventListener('abort', abortHandler);
+            signal.removeEventListener("abort", abortHandler);
             reject(reason);
           },
         });
@@ -695,7 +645,7 @@ export class CoreToolScheduler {
     try {
       if (this.isRunning()) {
         throw new Error(
-          'Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).',
+          "Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).",
         );
       }
       const requestsToProcess = Array.isArray(request) ? request : [request];
@@ -709,12 +659,10 @@ export class CoreToolScheduler {
           const matchingRule = pm.findMatchingDenyRule({
             toolName: reqInfo.name,
           });
-          const ruleInfo = matchingRule
-            ? ` Matching deny rule: "${matchingRule}".`
-            : '';
+          const ruleInfo = matchingRule ? ` Matching deny rule: "${matchingRule}".` : "";
           const permissionErrorMessage = `AIRIS Code requires permission to use "${reqInfo.name}", but that permission was declined.${ruleInfo}`;
           newToolCalls.push({
-            status: 'error',
+            status: "error",
             request: reqInfo,
             response: createErrorResponse(
               reqInfo,
@@ -732,13 +680,12 @@ export class CoreToolScheduler {
           if (excludeTools && excludeTools.length > 0) {
             const normalizedToolName = reqInfo.name.toLowerCase().trim();
             const excludedMatch = excludeTools.find(
-              (excludedTool) =>
-                excludedTool.toLowerCase().trim() === normalizedToolName,
+              (excludedTool) => excludedTool.toLowerCase().trim() === normalizedToolName,
             );
             if (excludedMatch) {
               const permissionErrorMessage = `AIRIS Code requires permission to use ${excludedMatch}, but that permission was declined.`;
               newToolCalls.push({
-                status: 'error',
+                status: "error",
                 request: reqInfo,
                 response: createErrorResponse(
                   reqInfo,
@@ -757,7 +704,7 @@ export class CoreToolScheduler {
           // Tool is not in registry and not excluded - likely hallucinated or typo
           const errorMessage = this.getToolNotFoundMessage(reqInfo.name);
           newToolCalls.push({
-            status: 'error',
+            status: "error",
             request: reqInfo,
             response: createErrorResponse(
               reqInfo,
@@ -769,25 +716,16 @@ export class CoreToolScheduler {
           continue;
         }
 
-        const invocationOrError = this.buildInvocation(
-          toolInstance,
-          reqInfo.args,
-        );
+        const invocationOrError = this.buildInvocation(toolInstance, reqInfo.args);
         if (invocationOrError instanceof Error) {
           const error = reqInfo.wasOutputTruncated
-            ? new Error(
-                `${invocationOrError.message} ${TRUNCATION_PARAM_GUIDANCE}`,
-              )
+            ? new Error(`${invocationOrError.message} ${TRUNCATION_PARAM_GUIDANCE}`)
             : invocationOrError;
           newToolCalls.push({
-            status: 'error',
+            status: "error",
             request: reqInfo,
             tool: toolInstance,
-            response: createErrorResponse(
-              reqInfo,
-              error,
-              ToolErrorType.INVALID_TOOL_PARAMS,
-            ),
+            response: createErrorResponse(reqInfo, error, ToolErrorType.INVALID_TOOL_PARAMS),
             durationMs: 0,
           });
           continue;
@@ -798,21 +736,17 @@ export class CoreToolScheduler {
         if (reqInfo.wasOutputTruncated && toolInstance.kind === Kind.Edit) {
           const truncationError = new Error(TRUNCATION_EDIT_REJECTION);
           newToolCalls.push({
-            status: 'error',
+            status: "error",
             request: reqInfo,
             tool: toolInstance,
-            response: createErrorResponse(
-              reqInfo,
-              truncationError,
-              ToolErrorType.OUTPUT_TRUNCATED,
-            ),
+            response: createErrorResponse(reqInfo, truncationError, ToolErrorType.OUTPUT_TRUNCATED),
             durationMs: 0,
           });
           continue;
         }
 
         newToolCalls.push({
-          status: 'validating',
+          status: "validating",
           request: reqInfo,
           tool: toolInstance,
           invocation: invocationOrError,
@@ -824,7 +758,7 @@ export class CoreToolScheduler {
       this.notifyToolCallsUpdate();
 
       for (const toolCall of newToolCalls) {
-        if (toolCall.status !== 'validating') {
+        if (toolCall.status !== "validating") {
           continue;
         }
 
@@ -832,11 +766,7 @@ export class CoreToolScheduler {
 
         try {
           if (signal.aborted) {
-            this.setStatusInternal(
-              reqInfo.callId,
-              'cancelled',
-              'Tool call cancelled by user.',
-            );
+            this.setStatusInternal(reqInfo.callId, "cancelled", "Tool call cancelled by user.");
             continue;
           }
 
@@ -845,8 +775,7 @@ export class CoreToolScheduler {
           // =================================================================
 
           // ---- L3: Tool's default permission ----
-          const defaultPermission: string =
-            await invocation.getDefaultPermission();
+          const defaultPermission: string = await invocation.getDefaultPermission();
 
           // ---- L4: PermissionManager override (if relevant rules exist) ----
           const pm = this.config.getPermissionManager?.();
@@ -854,46 +783,40 @@ export class CoreToolScheduler {
           const pmCtx = buildPermissionCheckContext(
             reqInfo.name,
             toolParams,
-            this.config.getTargetDir?.() ?? '',
+            this.config.getTargetDir?.() ?? "",
+          );
+          const { finalPermission, pmForcedAsk } = await evaluatePermissionRules(
+            pm,
+            defaultPermission,
+            pmCtx,
           );
-          const { finalPermission, pmForcedAsk } =
-            await evaluatePermissionRules(pm, defaultPermission, pmCtx);
 
           // ---- L5: Final decision based on permission + ApprovalMode ----
           const approvalMode = this.config.getApprovalMode();
           const isPlanMode = approvalMode === ApprovalMode.PLAN;
-          const isExitPlanModeTool = reqInfo.name === 'exit_plan_mode';
+          const isExitPlanModeTool = reqInfo.name === "exit_plan_mode";
 
-          if (finalPermission === 'allow') {
+          if (finalPermission === "allow") {
             // Auto-approve: tool is inherently safe (read-only) or PM allows
-            this.setToolCallOutcome(
-              reqInfo.callId,
-              ToolConfirmationOutcome.ProceedAlways,
-            );
-            this.setStatusInternal(reqInfo.callId, 'scheduled');
+            this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+            this.setStatusInternal(reqInfo.callId, "scheduled");
             continue;
           }
 
-          if (finalPermission === 'deny') {
+          if (finalPermission === "deny") {
             // Hard deny: security violation or PM explicit deny
             let denyMessage: string;
-            if (defaultPermission === 'deny') {
+            if (defaultPermission === "deny") {
               denyMessage = `Tool "${reqInfo.name}" is denied: command substitution is not allowed for security reasons.`;
             } else {
               const matchingRule = pm?.findMatchingDenyRule(pmCtx);
-              const ruleInfo = matchingRule
-                ? ` Matching deny rule: "${matchingRule}".`
-                : '';
+              const ruleInfo = matchingRule ? ` Matching deny rule: "${matchingRule}".` : "";
               denyMessage = `Tool "${reqInfo.name}" is denied by permission rules.${ruleInfo}`;
             }
             this.setStatusInternal(
               reqInfo.callId,
-              'error',
-              createErrorResponse(
-                reqInfo,
-                new Error(denyMessage),
-                ToolErrorType.EXECUTION_DENIED,
-              ),
+              "error",
+              createErrorResponse(reqInfo, new Error(denyMessage), ToolErrorType.EXECUTION_DENIED),
             );
             continue;
           }
@@ -902,19 +825,14 @@ export class CoreToolScheduler {
           // apply ApprovalMode overrides.
           // ask_user_question always needs confirmation so the user can answer;
           // it must bypass both YOLO auto-approve and plan-mode blocking.
-          const isAskUserQuestionTool =
-            reqInfo.name === ToolNames.ASK_USER_QUESTION;
+          const isAskUserQuestionTool = reqInfo.name === ToolNames.ASK_USER_QUESTION;
           let confirmationDetails: ToolCallConfirmationDetails | undefined;
 
           if (approvalMode === ApprovalMode.YOLO && !isAskUserQuestionTool) {
-            this.setToolCallOutcome(
-              reqInfo.callId,
-              ToolConfirmationOutcome.ProceedAlways,
-            );
-            this.setStatusInternal(reqInfo.callId, 'scheduled');
+            this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+            this.setStatusInternal(reqInfo.callId, "scheduled");
           } else {
-            confirmationDetails =
-              await invocation.getConfirmationDetails(signal);
+            confirmationDetails = await invocation.getConfirmationDetails(signal);
 
             // ── Centralised rule injection ──────────────────────────────────
             injectPermissionRulesIfMissing(confirmationDetails, pmCtx);
@@ -923,16 +841,16 @@ export class CoreToolScheduler {
               isPlanMode &&
               !isExitPlanModeTool &&
               !isAskUserQuestionTool &&
-              confirmationDetails.type !== 'info'
+              confirmationDetails.type !== "info"
             ) {
-              this.setStatusInternal(reqInfo.callId, 'error', {
+              this.setStatusInternal(reqInfo.callId, "error", {
                 callId: reqInfo.callId,
                 responseParts: convertToFunctionResponse(
                   reqInfo.name,
                   reqInfo.callId,
                   getPlanModeSystemReminder(),
                 ),
-                resultDisplay: 'Plan mode blocked a non-read-only tool call.',
+                resultDisplay: "Plan mode blocked a non-read-only tool call.",
                 error: undefined,
                 errorType: undefined,
               });
@@ -942,14 +860,10 @@ export class CoreToolScheduler {
             // AUTO_EDIT mode: auto-approve edit-like and info tools
             if (
               approvalMode === ApprovalMode.AUTO_EDIT &&
-              (confirmationDetails.type === 'edit' ||
-                confirmationDetails.type === 'info')
+              (confirmationDetails.type === "edit" || confirmationDetails.type === "info")
             ) {
-              this.setToolCallOutcome(
-                reqInfo.callId,
-                ToolConfirmationOutcome.ProceedAlways,
-              );
-              this.setStatusInternal(reqInfo.callId, 'scheduled');
+              this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+              this.setStatusInternal(reqInfo.callId, "scheduled");
               continue;
             }
 
@@ -965,7 +879,7 @@ export class CoreToolScheduler {
               const errorMessage = `AIRIS Code requires permission to use "${reqInfo.name}", but that permission was declined (non-interactive mode cannot prompt for confirmation).`;
               this.setStatusInternal(
                 reqInfo.callId,
-                'error',
+                "error",
                 createErrorResponse(
                   reqInfo,
                   new Error(errorMessage),
@@ -976,9 +890,7 @@ export class CoreToolScheduler {
             }
 
             // Fire PermissionRequest hook before showing the permission dialog.
-            const messageBus = this.config.getMessageBus() as
-              | MessageBus
-              | undefined;
+            const messageBus = this.config.getMessageBus() as MessageBus | undefined;
             const hooksEnabled = !this.config.getDisableAllHooks();
 
             if (hooksEnabled && messageBus) {
@@ -993,23 +905,12 @@ export class CoreToolScheduler {
               if (hookResult.hasDecision) {
                 if (hookResult.shouldAllow) {
                   // Hook granted permission - apply updated input if provided and proceed
-                  if (
-                    hookResult.updatedInput &&
-                    typeof reqInfo.args === 'object'
-                  ) {
-                    this.setArgsInternal(
-                      reqInfo.callId,
-                      hookResult.updatedInput,
-                    );
+                  if (hookResult.updatedInput && typeof reqInfo.args === "object") {
+                    this.setArgsInternal(reqInfo.callId, hookResult.updatedInput);
                   }
-                  await confirmationDetails.onConfirm(
-                    ToolConfirmationOutcome.ProceedOnce,
-                  );
-                  this.setToolCallOutcome(
-                    reqInfo.callId,
-                    ToolConfirmationOutcome.ProceedOnce,
-                  );
-                  this.setStatusInternal(reqInfo.callId, 'scheduled');
+                  await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
+                  this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedOnce);
+                  this.setStatusInternal(reqInfo.callId, "scheduled");
                 } else {
                   // Hook denied permission - cancel with optional message
                   const cancelPayload = hookResult.denyMessage
@@ -1019,18 +920,14 @@ export class CoreToolScheduler {
                     ToolConfirmationOutcome.Cancel,
                     cancelPayload,
                   );
-                  this.setToolCallOutcome(
-                    reqInfo.callId,
-                    ToolConfirmationOutcome.Cancel,
-                  );
+                  this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.Cancel);
                   this.setStatusInternal(
                     reqInfo.callId,
-                    'error',
+                    "error",
                     createErrorResponse(
                       reqInfo,
                       new Error(
-                        hookResult.denyMessage ||
-                          `Permission denied by hook for "${reqInfo.name}"`,
+                        hookResult.denyMessage || `Permission denied by hook for "${reqInfo.name}"`,
                       ),
                       ToolErrorType.EXECUTION_DENIED,
                     ),
@@ -1041,11 +938,7 @@ export class CoreToolScheduler {
             }
 
             // Allow IDE to resolve confirmation
-            this.openIdeDiffIfEnabled(
-              confirmationDetails,
-              reqInfo.callId,
-              signal,
-            );
+            this.openIdeDiffIfEnabled(confirmationDetails, reqInfo.callId, signal);
 
             const originalOnConfirm = confirmationDetails.onConfirm;
             const wrappedConfirmationDetails: ToolCallConfirmationDetails = {
@@ -1054,10 +947,7 @@ export class CoreToolScheduler {
               // ineffective because ask takes priority over allow.
               // Hide the option so users aren't misled.
               ...(pmForcedAsk ? { hideAlwaysAllow: true } : {}),
-              onConfirm: (
-                outcome: ToolConfirmationOutcome,
-                payload?: ToolConfirmationPayload,
-              ) =>
+              onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) =>
                 this.handleConfirmationResponse(
                   reqInfo.callId,
                   originalOnConfirm,
@@ -1066,11 +956,7 @@ export class CoreToolScheduler {
                   payload,
                 ),
             };
-            this.setStatusInternal(
-              reqInfo.callId,
-              'awaiting_approval',
-              wrappedConfirmationDetails,
-            );
+            this.setStatusInternal(reqInfo.callId, "awaiting_approval", wrappedConfirmationDetails);
 
             // Fire permission_prompt notification hook
             if (hooksEnabled && messageBus) {
@@ -1078,7 +964,7 @@ export class CoreToolScheduler {
                 messageBus,
                 `AIRIS Code needs your permission to use ${reqInfo.name}`,
                 NotificationType.PermissionPrompt,
-                'Permission needed',
+                "Permission needed",
               ).catch((error) => {
                 debugLogger.warn(
                   `Permission prompt notification hook failed: ${error instanceof Error ? error.message : String(error)}`,
@@ -1088,17 +974,13 @@ export class CoreToolScheduler {
           }
         } catch (error) {
           if (signal.aborted) {
-            this.setStatusInternal(
-              reqInfo.callId,
-              'cancelled',
-              'Tool call cancelled by user.',
-            );
+            this.setStatusInternal(reqInfo.callId, "cancelled", "Tool call cancelled by user.");
             continue;
           }
 
           this.setStatusInternal(
             reqInfo.callId,
-            'error',
+            "error",
             createErrorResponse(
               reqInfo,
               error instanceof Error ? error : new Error(String(error)),
@@ -1125,7 +1007,7 @@ export class CoreToolScheduler {
     payload?: ToolConfirmationPayload,
   ): Promise<void> {
     const toolCall = this.toolCalls.find(
-      (c) => c.request.callId === callId && c.status === 'awaiting_approval',
+      (c) => c.request.callId === callId && c.status === "awaiting_approval",
     );
 
     // Guard: if the tool is no longer awaiting approval (already handled by
@@ -1155,9 +1037,8 @@ export class CoreToolScheduler {
 
     if (outcome === ToolConfirmationOutcome.Cancel || signal.aborted) {
       // Use custom cancel message from payload if provided, otherwise use default
-      const cancelMessage =
-        payload?.cancelMessage || 'User did not allow tool call';
-      this.setStatusInternal(callId, 'cancelled', cancelMessage);
+      const cancelMessage = payload?.cancelMessage || "User did not allow tool call";
+      this.setStatusInternal(callId, "cancelled", cancelMessage);
     } else if (outcome === ToolConfirmationOutcome.ModifyWithEditor) {
       const waitingToolCall = toolCall as WaitingToolCall;
       if (isModifiableDeclarativeTool(waitingToolCall.tool)) {
@@ -1167,7 +1048,7 @@ export class CoreToolScheduler {
           return;
         }
 
-        this.setStatusInternal(callId, 'awaiting_approval', {
+        this.setStatusInternal(callId, "awaiting_approval", {
           ...waitingToolCall.confirmationDetails,
           isModifying: true,
         } as ToolCallConfirmationDetails);
@@ -1182,7 +1063,7 @@ export class CoreToolScheduler {
           this.onEditorClose,
         );
         this.setArgsInternal(callId, updatedParams);
-        this.setStatusInternal(callId, 'awaiting_approval', {
+        this.setStatusInternal(callId, "awaiting_approval", {
           ...waitingToolCall.confirmationDetails,
           fileDiff: updatedDiff,
           isModifying: false,
@@ -1191,13 +1072,9 @@ export class CoreToolScheduler {
     } else {
       // If the client provided new content, apply it before scheduling.
       if (payload?.newContent && toolCall) {
-        await this._applyInlineModify(
-          toolCall as WaitingToolCall,
-          payload,
-          signal,
-        );
+        await this._applyInlineModify(toolCall as WaitingToolCall, payload, signal);
       }
-      this.setStatusInternal(callId, 'scheduled');
+      this.setStatusInternal(callId, "scheduled");
     }
     await this.attemptExecutionOfScheduledCalls(signal);
   }
@@ -1216,7 +1093,7 @@ export class CoreToolScheduler {
     callId: string,
     signal: AbortSignal,
   ) {
-    if (confirmationDetails.type !== 'edit' || !this.config.getIdeMode()) {
+    if (confirmationDetails.type !== "edit" || !this.config.getIdeMode()) {
       return;
     }
     const ideClient = await IdeClient.getInstance();
@@ -1232,18 +1109,17 @@ export class CoreToolScheduler {
     // triggers this handler AND the CLI's onConfirm, causing a
     // race where ProceedOnce overwrites ProceedAlways.
     const still = this.toolCalls.find(
-      (c) => c.request.callId === callId && c.status === 'awaiting_approval',
+      (c) => c.request.callId === callId && c.status === "awaiting_approval",
     );
     if (!still) return;
 
-    if (resolution.status === 'accepted') {
+    if (resolution.status === "accepted") {
       // When content is unchanged, skip the inline modify path so that
       // the original tool params (e.g. partial old_string for edit tool)
       // are preserved. Mitigate the multi-edit-on-same-file issue (#2702)
       // for the common accept-without-edit case.
       const userEdited =
-        resolution.content != null &&
-        resolution.content !== confirmationDetails.newContent;
+        resolution.content != null && resolution.content !== confirmationDetails.newContent;
       this.handleConfirmationResponse(
         callId,
         confirmationDetails.onConfirm,
@@ -1274,14 +1150,14 @@ export class CoreToolScheduler {
   ): Promise<void> {
     const confirmDetails = toolCall.confirmationDetails;
     if (
-      confirmDetails.type !== 'edit' ||
+      confirmDetails.type !== "edit" ||
       !isModifiableDeclarativeTool(toolCall.tool) ||
       !payload.newContent
     ) {
       return;
     }
 
-    const currentContent = confirmDetails.originalContent ?? '';
+    const currentContent = confirmDetails.originalContent ?? "";
     const modifyContext = toolCall.tool.getModifyContext(signal);
 
     const updatedParams = modifyContext.createUpdatedParams(
@@ -1293,43 +1169,35 @@ export class CoreToolScheduler {
       confirmDetails.filePath,
       currentContent,
       payload.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
     );
 
     this.setArgsInternal(toolCall.request.callId, updatedParams);
-    this.setStatusInternal(toolCall.request.callId, 'awaiting_approval', {
+    this.setStatusInternal(toolCall.request.callId, "awaiting_approval", {
       ...confirmDetails,
       fileDiff: updatedDiff,
     });
   }
 
-  private async attemptExecutionOfScheduledCalls(
-    signal: AbortSignal,
-  ): Promise<void> {
+  private async attemptExecutionOfScheduledCalls(signal: AbortSignal): Promise<void> {
     const allCallsFinalOrScheduled = this.toolCalls.every(
       (call) =>
-        call.status === 'scheduled' ||
-        call.status === 'cancelled' ||
-        call.status === 'success' ||
-        call.status === 'error',
+        call.status === "scheduled" ||
+        call.status === "cancelled" ||
+        call.status === "success" ||
+        call.status === "error",
     );
 
     if (allCallsFinalOrScheduled) {
-      const callsToExecute = this.toolCalls.filter(
-        (call) => call.status === 'scheduled',
-      );
+      const callsToExecute = this.toolCalls.filter((call) => call.status === "scheduled");
 
       // Task tools are safe to run concurrently — they spawn independent
       // sub-agents with no shared mutable state.  All other tools run
       // sequentially in their original order to preserve any implicit
       // ordering the model may rely on.
-      const taskCalls = callsToExecute.filter(
-        (call) => call.request.name === ToolNames.AGENT,
-      );
-      const otherCalls = callsToExecute.filter(
-        (call) => call.request.name !== ToolNames.AGENT,
-      );
+      const taskCalls = callsToExecute.filter((call) => call.request.name === ToolNames.AGENT);
+      const otherCalls = callsToExecute.filter((call) => call.request.name !== ToolNames.AGENT);
 
       const taskPromise = Promise.all(
         taskCalls.map((tc) => this.executeSingleToolCall(tc, signal)),
@@ -1345,11 +1213,8 @@ export class CoreToolScheduler {
     }
   }
 
-  private async executeSingleToolCall(
-    toolCall: ToolCall,
-    signal: AbortSignal,
-  ): Promise<void> {
-    if (toolCall.status !== 'scheduled') return;
+  private async executeSingleToolCall(toolCall: ToolCall, signal: AbortSignal): Promise<void> {
+    if (toolCall.status !== "scheduled") return;
 
     const scheduledCall = toolCall;
     const { callId, name: toolName } = scheduledCall.request;
@@ -1377,19 +1242,18 @@ export class CoreToolScheduler {
 
       if (!preHookResult.shouldProceed) {
         // Hook blocked the execution
-        const blockMessage =
-          preHookResult.blockReason || 'Tool execution blocked by hook';
+        const blockMessage = preHookResult.blockReason || "Tool execution blocked by hook";
         const errorResponse = createErrorResponse(
           scheduledCall.request,
           new Error(blockMessage),
           ToolErrorType.EXECUTION_DENIED,
         );
-        this.setStatusInternal(callId, 'error', errorResponse);
+        this.setStatusInternal(callId, "error", errorResponse);
         return;
       }
     }
 
-    this.setStatusInternal(callId, 'executing');
+    this.setStatusInternal(callId, "executing");
 
     const liveOutputCallback = scheduledCall.tool.canUpdateOutput
       ? (outputChunk: ToolResultDisplay) => {
@@ -1397,7 +1261,7 @@ export class CoreToolScheduler {
             this.outputUpdateHandler(callId, outputChunk);
           }
           this.toolCalls = this.toolCalls.map((tc) =>
-            tc.request.callId === callId && tc.status === 'executing'
+            tc.request.callId === callId && tc.status === "executing"
               ? { ...tc, liveOutput: outputChunk }
               : tc,
           );
@@ -1415,9 +1279,7 @@ export class CoreToolScheduler {
     if (invocation instanceof ShellToolInvocation) {
       const setPidCallback = (pid: number) => {
         this.toolCalls = this.toolCalls.map((tc) =>
-          tc.request.callId === callId && tc.status === 'executing'
-            ? { ...tc, pid }
-            : tc,
+          tc.request.callId === callId && tc.status === "executing" ? { ...tc, pid } : tc,
         );
         this.notifyToolCallsUpdate();
       };
@@ -1428,11 +1290,7 @@ export class CoreToolScheduler {
         setPidCallback,
       );
     } else {
-      promise = invocation.execute(
-        signal,
-        liveOutputCallback,
-        shellExecutionConfig,
-      );
+      promise = invocation.execute(signal, liveOutputCallback, shellExecutionConfig);
     }
 
     try {
@@ -1445,31 +1303,26 @@ export class CoreToolScheduler {
             toolUseId,
             toolName,
             toolInput,
-            'User cancelled tool execution.',
+            "User cancelled tool execution.",
             true,
             this.config.getApprovalMode(),
           );
 
           // Append additional context from hook if provided
-          let cancelMessage = 'User cancelled tool execution.';
+          let cancelMessage = "User cancelled tool execution.";
           if (failureHookResult.additionalContext) {
             cancelMessage += `\n\n${failureHookResult.additionalContext}`;
           }
-          this.setStatusInternal(callId, 'cancelled', cancelMessage);
+          this.setStatusInternal(callId, "cancelled", cancelMessage);
         } else {
-          this.setStatusInternal(
-            callId,
-            'cancelled',
-            'User cancelled tool execution.',
-          );
+          this.setStatusInternal(callId, "cancelled", "User cancelled tool execution.");
         }
         return; // Both code paths should return here
       }
 
       if (toolResult.error === undefined) {
         let content = toolResult.llmContent;
-        const contentLength =
-          typeof content === 'string' ? content.length : undefined;
+        const contentLength = typeof content === "string" ? content.length : undefined;
 
         // PostToolUse Hook
         if (hooksEnabled && messageBus) {
@@ -1489,22 +1342,18 @@ export class CoreToolScheduler {
 
           // Append additional context from hook if provided
           if (postHookResult.additionalContext) {
-            content = appendAdditionalContext(
-              content,
-              postHookResult.additionalContext,
-            );
+            content = appendAdditionalContext(content, postHookResult.additionalContext);
           }
 
           // Check if hook requested to stop execution
           if (postHookResult.shouldStop) {
-            const stopMessage =
-              postHookResult.stopReason || 'Execution stopped by hook';
+            const stopMessage = postHookResult.stopReason || "Execution stopped by hook";
             const errorResponse = createErrorResponse(
               scheduledCall.request,
               new Error(stopMessage),
               ToolErrorType.EXECUTION_DENIED,
             );
-            this.setStatusInternal(callId, 'error', errorResponse);
+            this.setStatusInternal(callId, "error", errorResponse);
             return;
           }
         }
@@ -1518,7 +1367,7 @@ export class CoreToolScheduler {
           errorType: undefined,
           contentLength,
         };
-        this.setStatusInternal(callId, 'success', successResponse);
+        this.setStatusInternal(callId, "success", successResponse);
       } else {
         // It is a failure
         // PostToolUseFailure Hook
@@ -1546,13 +1395,11 @@ export class CoreToolScheduler {
           error,
           toolResult.error.type,
         );
-        this.setStatusInternal(callId, 'error', errorResponse);
+        this.setStatusInternal(callId, "error", errorResponse);
       }
     } catch (executionError: unknown) {
       const errorMessage =
-        executionError instanceof Error
-          ? executionError.message
-          : String(executionError);
+        executionError instanceof Error ? executionError.message : String(executionError);
 
       if (signal.aborted) {
         // PostToolUseFailure Hook (user interrupt)
@@ -1562,23 +1409,19 @@ export class CoreToolScheduler {
             toolUseId,
             toolName,
             toolInput,
-            'User cancelled tool execution.',
+            "User cancelled tool execution.",
             true,
             this.config.getApprovalMode(),
           );
 
           // Append additional context from hook if provided
-          let cancelMessage = 'User cancelled tool execution.';
+          let cancelMessage = "User cancelled tool execution.";
           if (failureHookResult.additionalContext) {
             cancelMessage += `\n\n${failureHookResult.additionalContext}`;
           }
-          this.setStatusInternal(callId, 'cancelled', cancelMessage);
+          this.setStatusInternal(callId, "cancelled", cancelMessage);
         } else {
-          this.setStatusInternal(
-            callId,
-            'cancelled',
-            'User cancelled tool execution.',
-          );
+          this.setStatusInternal(callId, "cancelled", "User cancelled tool execution.");
         }
         return;
       } else {
@@ -1602,7 +1445,7 @@ export class CoreToolScheduler {
         }
         this.setStatusInternal(
           callId,
-          'error',
+          "error",
           createErrorResponse(
             scheduledCall.request,
             executionError instanceof Error
@@ -1617,10 +1460,7 @@ export class CoreToolScheduler {
 
   private async checkAndNotifyCompletion(): Promise<void> {
     const allCallsAreTerminal = this.toolCalls.every(
-      (call) =>
-        call.status === 'success' ||
-        call.status === 'error' ||
-        call.status === 'cancelled',
+      (call) => call.status === "success" || call.status === "error" || call.status === "cancelled",
     );
 
     if (this.toolCalls.length > 0 && allCallsAreTerminal) {
@@ -1643,9 +1483,7 @@ export class CoreToolScheduler {
       // After completion, process the next item in the queue.
       if (this.requestQueue.length > 0) {
         const next = this.requestQueue.shift()!;
-        this._schedule(next.request, next.signal)
-          .then(next.resolve)
-          .catch(next.reject);
+        this._schedule(next.request, next.signal).then(next.resolve).catch(next.reject);
       }
     }
   }
@@ -1659,9 +1497,7 @@ export class CoreToolScheduler {
     if (!this.chatRecordingService) return;
 
     // Collect all response parts from completed calls
-    const responseParts: Part[] = completedCalls.flatMap(
-      (call) => call.response.responseParts,
-    );
+    const responseParts: Part[] = completedCalls.flatMap((call) => call.response.responseParts);
 
     if (responseParts.length === 0) return;
 
@@ -1698,24 +1534,18 @@ export class CoreToolScheduler {
     triggeringCallId: string,
   ): Promise<void> {
     const pendingTools = this.toolCalls.filter(
-      (call) =>
-        call.status === 'awaiting_approval' &&
-        call.request.callId !== triggeringCallId,
+      (call) => call.status === "awaiting_approval" && call.request.callId !== triggeringCallId,
     ) as WaitingToolCall[];
 
     for (const pendingTool of pendingTools) {
       try {
         // Re-run L3→L4 to see if the tool can now be auto-approved
-        const defaultPermission =
-          await pendingTool.invocation.getDefaultPermission();
-        const toolParams = pendingTool.invocation.params as Record<
-          string,
-          unknown
-        >;
+        const defaultPermission = await pendingTool.invocation.getDefaultPermission();
+        const toolParams = pendingTool.invocation.params as Record<string, unknown>;
         const pmCtx = buildPermissionCheckContext(
           pendingTool.request.name,
           toolParams,
-          this.config.getTargetDir?.() ?? '',
+          this.config.getTargetDir?.() ?? "",
         );
         const { finalPermission } = await evaluatePermissionRules(
           this.config.getPermissionManager?.(),
@@ -1723,12 +1553,12 @@ export class CoreToolScheduler {
           pmCtx,
         );
 
-        if (finalPermission === 'allow') {
+        if (finalPermission === "allow") {
           this.setToolCallOutcome(
             pendingTool.request.callId,
             ToolConfirmationOutcome.ProceedAlways,
           );
-          this.setStatusInternal(pendingTool.request.callId, 'scheduled');
+          this.setStatusInternal(pendingTool.request.callId, "scheduled");
         }
       } catch (error) {
         debugLogger.error(
diff --git a/packages/airiscode-core/src/core/geminiChat.ts b/packages/airiscode-core/src/core/geminiChat.ts
index 835a0059d..a953d59c7 100644
--- a/packages/airiscode-core/src/core/geminiChat.ts
+++ b/packages/airiscode-core/src/core/geminiChat.ts
@@ -7,44 +7,38 @@
 // DISCLAIMER: This is a copied version of https://github.com/googleapis/js-genai/blob/main/src/chats.ts with the intention of working around a key bug
 // where function responses are not treated as "valid" responses: https://b.corp.google.com/issues/420354090
 
+import type { Config } from "../config/config.js";
+import { type ChatRecordingService } from "../services/chatRecordingService.js";
+import { logContentRetry, logContentRetryFailure } from "../telemetry/loggers.js";
+import { ContentRetryEvent, ContentRetryFailureEvent } from "../telemetry/types.js";
+import type { UiTelemetryService } from "../telemetry/uiTelemetry.js";
+import { hasCycleInSchema } from "../tools/tools.js";
 import type {
-  GenerateContentResponse,
   Content,
   GenerateContentConfig,
-  SendMessageParameters,
+  GenerateContentResponse,
+  GenerateContentResponseUsageMetadata,
   Part,
+  SendMessageParameters,
   Tool,
-  GenerateContentResponseUsageMetadata,
-} from '../types/llm.js';
-import { createUserContent, FinishReason } from '../types/llm.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import { getErrorStatus } from '../utils/errors.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { parseAndFormatApiError } from '../utils/errorParsing.js';
-import { isRateLimitError, type RetryInfo } from '../utils/rateLimit.js';
-import type { Config } from '../config/config.js';
-import { ESCALATED_MAX_TOKENS } from './tokenLimits.js';
-import { hasCycleInSchema } from '../tools/tools.js';
-import type { StructuredError } from './turn.js';
-import {
-  logContentRetry,
-  logContentRetryFailure,
-} from '../telemetry/loggers.js';
-import { type ChatRecordingService } from '../services/chatRecordingService.js';
-import {
-  ContentRetryEvent,
-  ContentRetryFailureEvent,
-} from '../telemetry/types.js';
-import type { UiTelemetryService } from '../telemetry/uiTelemetry.js';
-
-const debugLogger = createDebugLogger('AIRISCODE_CHAT');
+} from "../types/llm.js";
+import { createUserContent, FinishReason } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { parseAndFormatApiError } from "../utils/errorParsing.js";
+import { getErrorStatus } from "../utils/errors.js";
+import { isRateLimitError, type RetryInfo } from "../utils/rateLimit.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import { ESCALATED_MAX_TOKENS } from "./tokenLimits.js";
+import type { StructuredError } from "./turn.js";
+
+const debugLogger = createDebugLogger("AIRISCODE_CHAT");
 
 export enum StreamEventType {
   /** A regular content chunk from the API. */
-  CHUNK = 'chunk',
+  CHUNK = "chunk",
   /** A signal that a retry is about to happen. The UI should discard any partial
    * content from the attempt that just failed. */
-  RETRY = 'retry',
+  RETRY = "retry",
 }
 
 export type StreamEvent =
@@ -115,7 +109,7 @@ function delay(
     timeoutId = setTimeout(resolve, delayMs);
 
     signal?.addEventListener(
-      'abort',
+      "abort",
       () => {
         clearTimeout(timeoutId);
         reject(signal.reason);
@@ -160,7 +154,7 @@ function isValidResponse(response: GenerateContentResponse): boolean {
 
 export function isValidNonThoughtTextPart(part: Part): boolean {
   return (
-    typeof part.text === 'string' &&
+    typeof part.text === "string" &&
     !part.thought &&
     !part.thoughtSignature &&
     // Technically, the model should never generate parts that have text and
@@ -192,7 +186,7 @@ function isValidContentPart(part: Part): boolean {
     !part.thought &&
     !part.thoughtSignature &&
     part.text !== undefined &&
-    part.text === '' &&
+    part.text === "" &&
     part.functionCall === undefined;
 
   return !isInvalid;
@@ -206,7 +200,7 @@ function isValidContentPart(part: Part): boolean {
  */
 function validateHistory(history: Content[]) {
   for (const content of history) {
-    if (content.role !== 'user' && content.role !== 'model') {
+    if (content.role !== "user" && content.role !== "model") {
       throw new Error(`Role must be user or model, but got ${content.role}.`);
     }
   }
@@ -228,13 +222,13 @@ function extractCuratedHistory(comprehensiveHistory: Content[]): Content[] {
   const length = comprehensiveHistory.length;
   let i = 0;
   while (i < length) {
-    if (comprehensiveHistory[i].role === 'user') {
+    if (comprehensiveHistory[i].role === "user") {
       curatedHistory.push(comprehensiveHistory[i]);
       i++;
     } else {
       const modelOutput: Content[] = [];
       let isValid = true;
-      while (i < length && comprehensiveHistory[i].role === 'model') {
+      while (i < length && comprehensiveHistory[i].role === "model") {
         modelOutput.push(comprehensiveHistory[i]);
         if (isValid && !isValidContent(comprehensiveHistory[i])) {
           isValid = false;
@@ -254,11 +248,11 @@ function extractCuratedHistory(comprehensiveHistory: Content[]): Content[] {
  * which should trigger a retry.
  */
 export class InvalidStreamError extends Error {
-  readonly type: 'NO_FINISH_REASON' | 'NO_RESPONSE_TEXT';
+  readonly type: "NO_FINISH_REASON" | "NO_RESPONSE_TEXT";
 
-  constructor(message: string, type: 'NO_FINISH_REASON' | 'NO_RESPONSE_TEXT') {
+  constructor(message: string, type: "NO_FINISH_REASON" | "NO_RESPONSE_TEXT") {
     super(message);
-    this.name = 'InvalidStreamError';
+    this.name = "InvalidStreamError";
     this.type = type;
   }
 }
@@ -346,14 +340,13 @@ export class GeminiChat {
     const self = this;
     return (async function* () {
       try {
-        let lastError: unknown = new Error('Request failed after all retries.');
+        let lastError: unknown = new Error("Request failed after all retries.");
         let rateLimitRetryCount = 0;
         let invalidStreamRetryCount = 0;
 
         // Read per-config overrides; fall back to built-in defaults.
         const cgConfig = self.config.getContentGeneratorConfig();
-        const maxRateLimitRetries =
-          cgConfig?.maxRetries ?? RATE_LIMIT_RETRY_OPTIONS.maxRetries;
+        const maxRateLimitRetries = cgConfig?.maxRetries ?? RATE_LIMIT_RETRY_OPTIONS.maxRetries;
         const extraRetryErrorCodes = cgConfig?.retryErrorCodes;
 
         // Max output tokens escalation: when no user/env override is set,
@@ -363,21 +356,13 @@ export class GeminiChat {
         const hasUserMaxTokensOverride =
           (cgConfig?.samplingParams?.max_tokens !== undefined &&
             cgConfig?.samplingParams?.max_tokens !== null) ||
-          !!process.env['AIRISCODE_MAX_OUTPUT_TOKENS'];
+          !!process.env["AIRISCODE_MAX_OUTPUT_TOKENS"];
 
         let lastFinishReason: string | undefined;
 
-        for (
-          let attempt = 0;
-          attempt < INVALID_CONTENT_RETRY_OPTIONS.maxAttempts;
-          attempt++
-        ) {
+        for (let attempt = 0; attempt < INVALID_CONTENT_RETRY_OPTIONS.maxAttempts; attempt++) {
           try {
-            if (
-              attempt > 0 ||
-              rateLimitRetryCount > 0 ||
-              invalidStreamRetryCount > 0
-            ) {
+            if (attempt > 0 || rateLimitRetryCount > 0 || invalidStreamRetryCount > 0) {
               yield { type: StreamEventType.RETRY };
             }
 
@@ -415,10 +400,7 @@ export class GeminiChat {
                 `Rate limit throttling detected (retry ${rateLimitRetryCount}/${maxRateLimitRetries}). ` +
                   `Waiting ${delayMs / 1000}s before retrying...`,
               );
-              const { promise: delayPromise, skip } = delay(
-                delayMs,
-                params.config?.abortSignal,
-              );
+              const { promise: delayPromise, skip } = delay(delayMs, params.config?.abortSignal);
               yield {
                 type: StreamEventType.RETRY,
                 retryInfo: {
@@ -444,9 +426,7 @@ export class GeminiChat {
               invalidStreamRetryCount < INVALID_STREAM_RETRY_CONFIG.maxRetries
             ) {
               invalidStreamRetryCount++;
-              const delayMs =
-                INVALID_STREAM_RETRY_CONFIG.initialDelayMs *
-                invalidStreamRetryCount;
+              const delayMs = INVALID_STREAM_RETRY_CONFIG.initialDelayMs * invalidStreamRetryCount;
               debugLogger.warn(
                 `Invalid stream [${(error as InvalidStreamError).type}] ` +
                   `(retry ${invalidStreamRetryCount}/${INVALID_STREAM_RETRY_CONFIG.maxRetries}). ` +
@@ -512,10 +492,7 @@ export class GeminiChat {
           );
           // Remove partial model response from history
           // (processStreamResponse already pushed it)
-          if (
-            self.history.length > 0 &&
-            self.history[self.history.length - 1].role === 'model'
-          ) {
+          if (self.history.length > 0 && self.history[self.history.length - 1].role === "model") {
             self.history.pop();
           }
           // Signal UI to discard partial output
@@ -544,11 +521,7 @@ export class GeminiChat {
             const totalAttempts = invalidStreamRetryCount + 1;
             logContentRetryFailure(
               self.config,
-              new ContentRetryFailureEvent(
-                totalAttempts,
-                lastError.type,
-                model,
-              ),
+              new ContentRetryFailureEvent(totalAttempts, lastError.type, model),
             );
           }
           throw lastError;
@@ -618,9 +591,7 @@ export class GeminiChat {
    * chat session.
    */
   getHistory(curated: boolean = false): Content[] {
-    const history = curated
-      ? extractCuratedHistory(this.history)
-      : this.history;
+    const history = curated ? extractCuratedHistory(this.history) : this.history;
     // Deep copy the history to avoid mutating the history outside of the
     // chat session.
     return structuredClone(history);
@@ -652,23 +623,12 @@ export class GeminiChat {
         // Filter out thought parts entirely
         const filteredParts = content.parts
           .filter(
-            (part) =>
-              !(
-                part &&
-                typeof part === 'object' &&
-                'thought' in part &&
-                part.thought
-              ),
+            (part) => !(part && typeof part === "object" && "thought" in part && part.thought),
           )
           .map((part) => {
-            if (
-              part &&
-              typeof part === 'object' &&
-              'thoughtSignature' in part
-            ) {
+            if (part && typeof part === "object" && "thoughtSignature" in part) {
               const newPart = { ...part };
-              delete (newPart as { thoughtSignature?: string })
-                .thoughtSignature;
+              delete (newPart as { thoughtSignature?: string }).thoughtSignature;
               return newPart;
             }
             return part;
@@ -696,22 +656,16 @@ export class GeminiChat {
    * but still consume context tokens.
    */
   stripThoughtsFromHistoryKeepRecent(keepTurns: number): void {
-    keepTurns = Number.isFinite(keepTurns)
-      ? Math.max(0, Math.floor(keepTurns))
-      : 0;
+    keepTurns = Number.isFinite(keepTurns) ? Math.max(0, Math.floor(keepTurns)) : 0;
 
     // Find indices of model turns that contain thought parts
     const modelTurnIndices: number[] = [];
     for (let i = 0; i < this.history.length; i++) {
       const content = this.history[i];
       if (
-        content.role === 'model' &&
+        content.role === "model" &&
         content.parts?.some(
-          (part) =>
-            part &&
-            typeof part === 'object' &&
-            'thought' in part &&
-            part.thought,
+          (part) => part && typeof part === "object" && "thought" in part && part.thought,
         )
       ) {
         modelTurnIndices.push(i);
@@ -720,10 +674,7 @@ export class GeminiChat {
 
     // Determine which model turns to keep (the most recent `keepTurns`)
     const turnsToStrip = new Set(
-      modelTurnIndices.slice(
-        0,
-        Math.max(0, modelTurnIndices.length - keepTurns),
-      ),
+      modelTurnIndices.slice(0, Math.max(0, modelTurnIndices.length - keepTurns)),
     );
 
     if (turnsToStrip.size === 0) return;
@@ -735,23 +686,12 @@ export class GeminiChat {
         // Strip thought parts from this turn
         const filteredParts = content.parts
           .filter(
-            (part) =>
-              !(
-                part &&
-                typeof part === 'object' &&
-                'thought' in part &&
-                part.thought
-              ),
+            (part) => !(part && typeof part === "object" && "thought" in part && part.thought),
           )
           .map((part) => {
-            if (
-              part &&
-              typeof part === 'object' &&
-              'thoughtSignature' in part
-            ) {
+            if (part && typeof part === "object" && "thoughtSignature" in part) {
               const newPart = { ...part };
-              delete (newPart as { thoughtSignature?: string })
-                .thoughtSignature;
+              delete (newPart as { thoughtSignature?: string }).thoughtSignature;
               return newPart;
             }
             return part;
@@ -772,10 +712,7 @@ export class GeminiChat {
    * any trailing user entries are leftovers from a request that failed.
    */
   stripOrphanedUserEntriesFromHistory(): void {
-    while (
-      this.history.length > 0 &&
-      this.history[this.history.length - 1]!.role === 'user'
-    ) {
+    while (this.history.length > 0 && this.history[this.history.length - 1]!.role === "user") {
       this.history.pop();
     }
   }
@@ -792,10 +729,7 @@ export class GeminiChat {
   async maybeIncludeSchemaDepthContext(error: StructuredError): Promise<void> {
     // Check for potentially problematic cyclic tools with cyclic schemas
     // and include a recommendation to remove potentially problematic tools.
-    if (
-      isSchemaDepthError(error.message) ||
-      isInvalidArgumentError(error.message)
-    ) {
+    if (isSchemaDepthError(error.message) || isInvalidArgumentError(error.message)) {
       const tools = this.config.getToolRegistry().getAllTools();
       const cyclicSchemaTools: string[] = [];
       for (const tool of tools) {
@@ -831,8 +765,7 @@ export class GeminiChat {
     for await (const chunk of streamResponse) {
       // Use ||= to avoid later usage-only chunks (no candidates) overwriting
       // a finishReason that was already seen in an earlier chunk.
-      hasFinishReason ||=
-        chunk?.candidates?.some((candidate) => candidate.finishReason) ?? false;
+      hasFinishReason ||= chunk?.candidates?.some((candidate) => candidate.finishReason) ?? false;
 
       if (isValidResponse(chunk)) {
         const content = chunk.candidates?.[0]?.content;
@@ -870,10 +803,10 @@ export class GeminiChat {
     const thoughtText = allModelParts
       .filter((part) => part.thought)
       .map((part) => part.text)
-      .join('')
+      .join("")
       .trim();
 
-    if (thoughtText !== '') {
+    if (thoughtText !== "") {
       thoughtContentPart = {
         text: thoughtText,
         thought: true,
@@ -890,8 +823,7 @@ export class GeminiChat {
     const contentParts = allModelParts.filter((part) => !part.thought);
     const consolidatedHistoryParts: Part[] = [];
     for (const part of contentParts) {
-      const lastPart =
-        consolidatedHistoryParts[consolidatedHistoryParts.length - 1];
+      const lastPart = consolidatedHistoryParts[consolidatedHistoryParts.length - 1];
       if (
         lastPart?.text &&
         isValidNonThoughtTextPart(lastPart) &&
@@ -906,13 +838,12 @@ export class GeminiChat {
     const contentText = consolidatedHistoryParts
       .filter((part) => part.text)
       .map((part) => part.text)
-      .join('')
+      .join("")
       .trim();
 
     // Record assistant turn with raw Content and metadata
     if (thoughtContentPart || contentText || hasToolCall || usageMetadata) {
-      const contextWindowSize =
-        this.config.getContentGeneratorConfig()?.contextWindowSize;
+      const contextWindowSize = this.config.getContentGeneratorConfig()?.contextWindowSize;
       this.chatRecordingService?.recordAssistantTurn({
         model,
         message: [
@@ -939,32 +870,29 @@ export class GeminiChat {
     if (!hasToolCall && (!hasFinishReason || !contentText)) {
       if (!hasFinishReason) {
         throw new InvalidStreamError(
-          'Model stream ended without a finish reason.',
-          'NO_FINISH_REASON',
+          "Model stream ended without a finish reason.",
+          "NO_FINISH_REASON",
         );
       } else {
         throw new InvalidStreamError(
-          'Model stream ended with empty response text.',
-          'NO_RESPONSE_TEXT',
+          "Model stream ended with empty response text.",
+          "NO_RESPONSE_TEXT",
         );
       }
     }
 
     this.history.push({
-      role: 'model',
-      parts: [
-        ...(thoughtContentPart ? [thoughtContentPart] : []),
-        ...consolidatedHistoryParts,
-      ],
+      role: "model",
+      parts: [...(thoughtContentPart ? [thoughtContentPart] : []), ...consolidatedHistoryParts],
     });
   }
 }
 
 /** Visible for Testing */
 export function isSchemaDepthError(errorMessage: string): boolean {
-  return errorMessage.includes('maximum schema depth exceeded');
+  return errorMessage.includes("maximum schema depth exceeded");
 }
 
 export function isInvalidArgumentError(errorMessage: string): boolean {
-  return errorMessage.includes('Request contains an invalid argument');
+  return errorMessage.includes("Request contains an invalid argument");
 }
diff --git a/packages/airiscode-core/src/core/geminiRequest.ts b/packages/airiscode-core/src/core/geminiRequest.ts
index 879832b9c..f4a13d8d2 100644
--- a/packages/airiscode-core/src/core/geminiRequest.ts
+++ b/packages/airiscode-core/src/core/geminiRequest.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type PartListUnion } from '../types/llm.js';
-import { partToString } from '../utils/partUtils.js';
+import { type PartListUnion } from "../types/llm.js";
+import { partToString } from "../utils/partUtils.js";
 
 /**
  * Represents a request to be sent to the Gemini API.
diff --git a/packages/airiscode-core/src/core/logger.ts b/packages/airiscode-core/src/core/logger.ts
index 2b93bbbec..ffe2a39db 100644
--- a/packages/airiscode-core/src/core/logger.ts
+++ b/packages/airiscode-core/src/core/logger.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { promises as fs } from 'node:fs';
-import type { Content } from '../types/llm.js';
-import type { Storage } from '../config/storage.js';
-import { createDebugLogger, type DebugLogger } from '../utils/debugLogger.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import type { Storage } from "../config/storage.js";
+import type { Content } from "../types/llm.js";
+import { createDebugLogger, type DebugLogger } from "../utils/debugLogger.js";
 
-const LOG_FILE_NAME = 'logs.json';
+const LOG_FILE_NAME = "logs.json";
 
 export enum MessageSenderType {
-  USER = 'user',
-  MODEL_SWITCH = 'model_switch',
+  USER = "user",
+  MODEL_SWITCH = "model_switch",
 }
 
 export interface LogEntry {
@@ -28,7 +28,7 @@ export interface LogEntry {
 export interface ModelSwitchEvent {
   fromModel: string;
   toModel: string;
-  reason: 'vision_auto_switch' | 'manual' | 'fallback' | 'other';
+  reason: "vision_auto_switch" | "manual" | "fallback" | "other";
   context?: string;
 }
 
@@ -62,9 +62,7 @@ export function decodeTagName(str: string): string {
     return decodeURIComponent(str);
   } catch (_e) {
     // Fallback for old, potentially malformed encoding
-    return str.replace(/%([0-9A-F]{2})/g, (_, hex) =>
-      String.fromCharCode(parseInt(hex, 16)),
-    );
+    return str.replace(/%([0-9A-F]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
   }
 }
 
@@ -82,34 +80,34 @@ export class Logger {
     private readonly storage: Storage,
   ) {
     this.sessionId = sessionId;
-    this.debugLogger = createDebugLogger('LOGGER');
+    this.debugLogger = createDebugLogger("LOGGER");
   }
 
   private async _readLogFile(): Promise<LogEntry[]> {
     if (!this.logFilePath) {
-      throw new Error('Log file path not set during read attempt.');
+      throw new Error("Log file path not set during read attempt.");
     }
     try {
-      const fileContent = await fs.readFile(this.logFilePath, 'utf-8');
+      const fileContent = await fs.readFile(this.logFilePath, "utf-8");
       const parsedLogs = JSON.parse(fileContent);
       if (!Array.isArray(parsedLogs)) {
         this.debugLogger.debug(
           `Log file at ${this.logFilePath} is not a valid JSON array. Starting with empty logs.`,
         );
-        await this._backupCorruptedLogFile('malformed_array');
+        await this._backupCorruptedLogFile("malformed_array");
         return [];
       }
       return parsedLogs.filter(
         (entry) =>
-          typeof entry.sessionId === 'string' &&
-          typeof entry.messageId === 'number' &&
-          typeof entry.timestamp === 'string' &&
-          typeof entry.type === 'string' &&
-          typeof entry.message === 'string',
+          typeof entry.sessionId === "string" &&
+          typeof entry.messageId === "number" &&
+          typeof entry.timestamp === "string" &&
+          typeof entry.type === "string" &&
+          typeof entry.message === "string",
       ) as LogEntry[];
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         return [];
       }
       if (error instanceof SyntaxError) {
@@ -117,13 +115,10 @@ export class Logger {
           `Invalid JSON in log file ${this.logFilePath}. Backing up and starting fresh.`,
           error,
         );
-        await this._backupCorruptedLogFile('invalid_json');
+        await this._backupCorruptedLogFile("invalid_json");
         return [];
       }
-      this.debugLogger.debug(
-        `Failed to read or parse log file ${this.logFilePath}:`,
-        error,
-      );
+      this.debugLogger.debug(`Failed to read or parse log file ${this.logFilePath}:`, error);
       throw error;
     }
   }
@@ -157,40 +152,29 @@ export class Logger {
       }
       this.logs = await this._readLogFile();
       if (!fileExisted && this.logs.length === 0) {
-        await fs.writeFile(this.logFilePath, '[]', 'utf-8');
+        await fs.writeFile(this.logFilePath, "[]", "utf-8");
       }
-      const sessionLogs = this.logs.filter(
-        (entry) => entry.sessionId === this.sessionId,
-      );
+      const sessionLogs = this.logs.filter((entry) => entry.sessionId === this.sessionId);
       this.messageId =
-        sessionLogs.length > 0
-          ? Math.max(...sessionLogs.map((entry) => entry.messageId)) + 1
-          : 0;
+        sessionLogs.length > 0 ? Math.max(...sessionLogs.map((entry) => entry.messageId)) + 1 : 0;
       this.initialized = true;
     } catch (err) {
-      this.debugLogger.error('Failed to initialize logger:', err);
+      this.debugLogger.error("Failed to initialize logger:", err);
       this.initialized = false;
     }
   }
 
-  private async _updateLogFile(
-    entryToAppend: LogEntry,
-  ): Promise<LogEntry | null> {
+  private async _updateLogFile(entryToAppend: LogEntry): Promise<LogEntry | null> {
     if (!this.logFilePath) {
-      this.debugLogger.debug(
-        'Log file path not set. Cannot persist log entry.',
-      );
-      throw new Error('Log file path not set during update attempt.');
+      this.debugLogger.debug("Log file path not set. Cannot persist log entry.");
+      throw new Error("Log file path not set during update attempt.");
     }
 
     let currentLogsOnDisk: LogEntry[];
     try {
       currentLogsOnDisk = await this._readLogFile();
     } catch (readError) {
-      this.debugLogger.debug(
-        'Critical error reading log file before append:',
-        readError,
-      );
+      this.debugLogger.debug("Critical error reading log file before append:", readError);
       throw readError;
     }
 
@@ -199,9 +183,7 @@ export class Logger {
       (e) => e.sessionId === entryToAppend.sessionId,
     );
     const nextMessageIdForSession =
-      sessionLogsOnDisk.length > 0
-        ? Math.max(...sessionLogsOnDisk.map((e) => e.messageId)) + 1
-        : 0;
+      sessionLogsOnDisk.length > 0 ? Math.max(...sessionLogsOnDisk.map((e) => e.messageId)) + 1 : 0;
 
     // Update the messageId of the entry we are about to append
     entryToAppend.messageId = nextMessageIdForSession;
@@ -228,15 +210,11 @@ export class Logger {
     currentLogsOnDisk.push(entryToAppend);
 
     try {
-      await fs.writeFile(
-        this.logFilePath,
-        JSON.stringify(currentLogsOnDisk, null, 2),
-        'utf-8',
-      );
+      await fs.writeFile(this.logFilePath, JSON.stringify(currentLogsOnDisk, null, 2), "utf-8");
       this.logs = currentLogsOnDisk;
       return entryToAppend; // Return the successfully appended entry
     } catch (error) {
-      this.debugLogger.debug('Error writing to log file:', error);
+      this.debugLogger.debug("Error writing to log file:", error);
       throw error;
     }
   }
@@ -255,9 +233,7 @@ export class Logger {
 
   async logMessage(type: MessageSenderType, message: string): Promise<void> {
     if (!this.initialized || this.sessionId === undefined) {
-      this.debugLogger.debug(
-        'Logger not initialized or session ID missing. Cannot log message.',
-      );
+      this.debugLogger.debug("Logger not initialized or session ID missing. Cannot log message.");
       return;
     }
 
@@ -285,10 +261,10 @@ export class Logger {
 
   private _checkpointPath(tag: string): string {
     if (!tag.length) {
-      throw new Error('No checkpoint tag specified.');
+      throw new Error("No checkpoint tag specified.");
     }
     if (!this.qwenDir) {
-      throw new Error('Checkpoint file path not set.');
+      throw new Error("Checkpoint file path not set.");
     }
     // Encode the tag to handle all special characters safely.
     const encodedTag = encodeTagName(tag);
@@ -303,7 +279,7 @@ export class Logger {
       return newPath; // Found it, use the new path.
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
+      if (nodeError.code !== "ENOENT") {
         throw error; // A real error occurred, rethrow it.
       }
       // It was not found, so we'll check the old path next.
@@ -316,7 +292,7 @@ export class Logger {
       return oldPath; // Found it, use the old path.
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
+      if (nodeError.code !== "ENOENT") {
         throw error; // A real error occurred, rethrow it.
       }
     }
@@ -328,30 +304,30 @@ export class Logger {
   async saveCheckpoint(conversation: Content[], tag: string): Promise<void> {
     if (!this.initialized) {
       this.debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.",
       );
       return;
     }
     // Always save with the new encoded path.
     const path = this._checkpointPath(tag);
     try {
-      await fs.writeFile(path, JSON.stringify(conversation, null, 2), 'utf-8');
+      await fs.writeFile(path, JSON.stringify(conversation, null, 2), "utf-8");
     } catch (error) {
-      this.debugLogger.error('Error writing to checkpoint file:', error);
+      this.debugLogger.error("Error writing to checkpoint file:", error);
     }
   }
 
   async loadCheckpoint(tag: string): Promise<Content[]> {
     if (!this.initialized) {
       this.debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot load checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot load checkpoint.",
       );
       return [];
     }
 
     const path = await this._getCheckpointPath(tag);
     try {
-      const fileContent = await fs.readFile(path, 'utf-8');
+      const fileContent = await fs.readFile(path, "utf-8");
       const parsedContent = JSON.parse(fileContent);
       if (!Array.isArray(parsedContent)) {
         this.debugLogger.warn(
@@ -362,14 +338,11 @@ export class Logger {
       return parsedContent as Content[];
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         // This is okay, it just means the checkpoint doesn't exist in either format.
         return [];
       }
-      this.debugLogger.error(
-        `Failed to read or parse checkpoint file ${path}:`,
-        error,
-      );
+      this.debugLogger.error(`Failed to read or parse checkpoint file ${path}:`, error);
       return [];
     }
   }
@@ -377,7 +350,7 @@ export class Logger {
   async deleteCheckpoint(tag: string): Promise<boolean> {
     if (!this.initialized || !this.qwenDir) {
       this.debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.",
       );
       return false;
     }
@@ -391,11 +364,8 @@ export class Logger {
       deletedSomething = true;
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
-        this.debugLogger.error(
-          `Failed to delete checkpoint file ${newPath}:`,
-          error,
-        );
+      if (nodeError.code !== "ENOENT") {
+        this.debugLogger.error(`Failed to delete checkpoint file ${newPath}:`, error);
         throw error; // Rethrow unexpected errors
       }
       // It's okay if it doesn't exist.
@@ -409,11 +379,8 @@ export class Logger {
         deletedSomething = true;
       } catch (error) {
         const nodeError = error as NodeJS.ErrnoException;
-        if (nodeError.code !== 'ENOENT') {
-          this.debugLogger.error(
-            `Failed to delete checkpoint file ${oldPath}:`,
-            error,
-          );
+        if (nodeError.code !== "ENOENT") {
+          this.debugLogger.error(`Failed to delete checkpoint file ${oldPath}:`, error);
           throw error; // Rethrow unexpected errors
         }
         // It's okay if it doesn't exist.
@@ -425,9 +392,7 @@ export class Logger {
 
   async checkpointExists(tag: string): Promise<boolean> {
     if (!this.initialized) {
-      throw new Error(
-        'Logger not initialized. Cannot check for checkpoint existence.',
-      );
+      throw new Error("Logger not initialized. Cannot check for checkpoint existence.");
     }
     let filePath: string | undefined;
     try {
@@ -438,14 +403,12 @@ export class Logger {
       return true;
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         return false; // It truly doesn't exist in either format.
       }
       // A different error occurred.
       this.debugLogger.error(
-        `Failed to check checkpoint existence for ${
-          filePath ?? `path for tag "${tag}"`
-        }:`,
+        `Failed to check checkpoint existence for ${filePath ?? `path for tag "${tag}"`}:`,
         error,
       );
       throw error;
diff --git a/packages/airiscode-core/src/core/loggingContentGenerator/index.ts b/packages/airiscode-core/src/core/loggingContentGenerator/index.ts
index c3957292c..6e3c6e1d6 100644
--- a/packages/airiscode-core/src/core/loggingContentGenerator/index.ts
+++ b/packages/airiscode-core/src/core/loggingContentGenerator/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { LoggingContentGenerator } from './loggingContentGenerator.js';
+export { LoggingContentGenerator } from "./loggingContentGenerator.js";
diff --git a/packages/airiscode-core/src/core/loggingContentGenerator/loggingContentGenerator.ts b/packages/airiscode-core/src/core/loggingContentGenerator/loggingContentGenerator.ts
index 3b2817c70..327860042 100644
--- a/packages/airiscode-core/src/core/loggingContentGenerator/loggingContentGenerator.ts
+++ b/packages/airiscode-core/src/core/loggingContentGenerator/loggingContentGenerator.ts
@@ -4,53 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type OpenAI from "openai";
+import type { Config } from "../../config/config.js";
+import { logApiError, logApiRequest, logApiResponse } from "../../telemetry/loggers.js";
+import { ApiErrorEvent, ApiRequestEvent, ApiResponseEvent } from "../../telemetry/types.js";
 import {
-  GenerateContentResponse,
   type Content,
+  type ContentListUnion,
+  type ContentUnion,
   type CountTokensParameters,
   type CountTokensResponse,
   type EmbedContentParameters,
   type EmbedContentResponse,
+  type FinishReason,
   type GenerateContentParameters,
+  GenerateContentResponse,
   type GenerateContentResponseUsageMetadata,
-  type ContentListUnion,
-  type ContentUnion,
   type Part,
   type PartUnion,
-  type FinishReason,
-} from '../../types/llm.js';
-import type OpenAI from 'openai';
-import {
-  ApiRequestEvent,
-  ApiResponseEvent,
-  ApiErrorEvent,
-} from '../../telemetry/types.js';
-import type { Config } from '../../config/config.js';
-import {
-  logApiError,
-  logApiRequest,
-  logApiResponse,
-} from '../../telemetry/loggers.js';
-import { isInternalPromptId } from '../../utils/internalPromptIds.js';
+} from "../../types/llm.js";
+import { getErrorMessage, getErrorStatus, getErrorType } from "../../utils/errors.js";
+import { isInternalPromptId } from "../../utils/internalPromptIds.js";
+import { OpenAILogger } from "../../utils/openaiLogger.js";
 import type {
   ContentGenerator,
   ContentGeneratorConfig,
   InputModalities,
-} from '../contentGenerator.js';
-import { OpenAIContentConverter } from '../openaiContentGenerator/converter.js';
-import { OpenAILogger } from '../../utils/openaiLogger.js';
-import {
-  getErrorMessage,
-  getErrorStatus,
-  getErrorType,
-} from '../../utils/errors.js';
+} from "../contentGenerator.js";
+import { OpenAIContentConverter } from "../openaiContentGenerator/converter.js";
 
 /**
  * A decorator that wraps a ContentGenerator to add logging to API calls.
  */
 export class LoggingContentGenerator implements ContentGenerator {
   private openaiLogger?: OpenAILogger;
-  private schemaCompliance?: 'auto' | 'openapi_30';
+  private schemaCompliance?: "auto" | "openapi_30";
   private modalities?: InputModalities;
 
   constructor(
@@ -75,16 +63,9 @@ export class LoggingContentGenerator implements ContentGenerator {
     return this.wrapped;
   }
 
-  private logApiRequest(
-    contents: Content[],
-    model: string,
-    promptId: string,
-  ): void {
+  private logApiRequest(contents: Content[], model: string, promptId: string): void {
     const requestText = JSON.stringify(contents);
-    logApiRequest(
-      this.config,
-      new ApiRequestEvent(model, promptId, requestText),
-    );
+    logApiRequest(this.config, new ApiRequestEvent(model, promptId, requestText));
   }
 
   private _logApiResponse(
@@ -146,20 +127,14 @@ export class LoggingContentGenerator implements ContentGenerator {
     const startTime = Date.now();
     const isInternal = isInternalPromptId(userPromptId);
     if (!isInternal) {
-      this.logApiRequest(
-        this.toContents(req.contents),
-        req.model,
-        userPromptId,
-      );
+      this.logApiRequest(this.toContents(req.contents), req.model, userPromptId);
     }
-    const openaiRequest = isInternal
-      ? undefined
-      : await this.buildOpenAIRequestForLogging(req);
+    const openaiRequest = isInternal ? undefined : await this.buildOpenAIRequestForLogging(req);
     try {
       const response = await this.wrapped.generateContent(req, userPromptId);
       const durationMs = Date.now() - startTime;
       this._logApiResponse(
-        response.responseId ?? '',
+        response.responseId ?? "",
         durationMs,
         response.modelVersion || req.model,
         userPromptId,
@@ -171,7 +146,7 @@ export class LoggingContentGenerator implements ContentGenerator {
       return response;
     } catch (error) {
       const durationMs = Date.now() - startTime;
-      this._logApiError('', durationMs, error, req.model, userPromptId);
+      this._logApiError("", durationMs, error, req.model, userPromptId);
       if (!isInternal) {
         await this.logOpenAIInteraction(openaiRequest, undefined, error);
       }
@@ -186,35 +161,23 @@ export class LoggingContentGenerator implements ContentGenerator {
     const startTime = Date.now();
     const isInternal = isInternalPromptId(userPromptId);
     if (!isInternal) {
-      this.logApiRequest(
-        this.toContents(req.contents),
-        req.model,
-        userPromptId,
-      );
+      this.logApiRequest(this.toContents(req.contents), req.model, userPromptId);
     }
-    const openaiRequest = isInternal
-      ? undefined
-      : await this.buildOpenAIRequestForLogging(req);
+    const openaiRequest = isInternal ? undefined : await this.buildOpenAIRequestForLogging(req);
 
     let stream: AsyncGenerator<GenerateContentResponse>;
     try {
       stream = await this.wrapped.generateContentStream(req, userPromptId);
     } catch (error) {
       const durationMs = Date.now() - startTime;
-      this._logApiError('', durationMs, error, req.model, userPromptId);
+      this._logApiError("", durationMs, error, req.model, userPromptId);
       if (!isInternal) {
         await this.logOpenAIInteraction(openaiRequest, undefined, error);
       }
       throw error;
     }
 
-    return this.loggingStreamWrapper(
-      stream,
-      startTime,
-      userPromptId,
-      req.model,
-      openaiRequest,
-    );
+    return this.loggingStreamWrapper(stream, startTime, userPromptId, req.model, openaiRequest);
   }
 
   private async *loggingStreamWrapper(
@@ -231,8 +194,8 @@ export class LoggingContentGenerator implements ContentGenerator {
 
     // Track first-seen IDs so _logApiResponse/_logApiError have accurate
     // values even when we skip collecting full responses for internal prompts.
-    let firstResponseId = '';
-    let firstModelVersion = '';
+    let firstResponseId = "";
+    let firstModelVersion = "";
     let lastUsageMetadata: GenerateContentResponseUsageMetadata | undefined;
     try {
       for await (const response of stream) {
@@ -260,8 +223,7 @@ export class LoggingContentGenerator implements ContentGenerator {
         lastUsageMetadata,
       );
       if (!isInternal) {
-        const consolidatedResponse =
-          this.consolidateGeminiResponsesForLogging(responses);
+        const consolidatedResponse = this.consolidateGeminiResponsesForLogging(responses);
         await this.logOpenAIInteraction(openaiRequest, consolidatedResponse);
       }
     } catch (error) {
@@ -287,10 +249,7 @@ export class LoggingContentGenerator implements ContentGenerator {
       return undefined;
     }
 
-    const converter = new OpenAIContentConverter(
-      request.model,
-      this.schemaCompliance,
-    );
+    const converter = new OpenAIContentConverter(request.model, this.schemaCompliance);
     converter.setModalities(this.modalities ?? {});
     const messages = converter.convertGeminiRequestToOpenAI(request, {
       cleanOrphanToolCalls: false,
@@ -302,9 +261,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     };
 
     if (request.config?.tools) {
-      openaiRequest.tools = await converter.convertGeminiToolsToOpenAI(
-        request.config.tools,
-      );
+      openaiRequest.tools = await converter.convertGeminiToolsToOpenAI(request.config.tools);
     }
 
     if (request.config?.temperature !== undefined) {
@@ -342,11 +299,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     await this.openaiLogger.logInteraction(
       openaiRequest,
       openaiResponse,
-      error instanceof Error
-        ? error
-        : error
-          ? new Error(String(error))
-          : undefined,
+      error instanceof Error ? error : error ? new Error(String(error)) : undefined,
     );
   }
 
@@ -354,10 +307,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     response: GenerateContentResponse,
     openaiRequest: OpenAI.Chat.ChatCompletionCreateParams,
   ): OpenAI.Chat.ChatCompletion {
-    const converter = new OpenAIContentConverter(
-      openaiRequest.model,
-      this.schemaCompliance,
-    );
+    const converter = new OpenAIContentConverter(openaiRequest.model, this.schemaCompliance);
 
     return converter.convertGeminiResponseToOpenAI(response);
   }
@@ -387,27 +337,24 @@ export class LoggingContentGenerator implements ContentGenerator {
 
       const parts = candidate?.content?.parts ?? [];
       for (const part of parts as Part[]) {
-        if (typeof part === 'string') {
+        if (typeof part === "string") {
           combinedParts.push({ text: part });
           continue;
         }
 
-        if ('text' in part) {
+        if ("text" in part) {
           if (part.text) {
             combinedParts.push({
               text: part.text,
               ...(part.thought ? { thought: true } : {}),
-              ...(part.thoughtSignature
-                ? { thoughtSignature: part.thoughtSignature }
-                : {}),
+              ...(part.thoughtSignature ? { thoughtSignature: part.thoughtSignature } : {}),
             });
           }
           continue;
         }
 
-        if ('functionCall' in part && part.functionCall) {
-          const callKey =
-            part.functionCall.id || part.functionCall.name || 'tool_call';
+        if ("functionCall" in part && part.functionCall) {
+          const callKey = part.functionCall.id || part.functionCall.name || "tool_call";
           const existingIndex = functionCallIndex.get(callKey);
           const functionPart = { functionCall: part.functionCall };
           if (existingIndex !== undefined) {
@@ -419,7 +366,7 @@ export class LoggingContentGenerator implements ContentGenerator {
           continue;
         }
 
-        if ('functionResponse' in part && part.functionResponse) {
+        if ("functionResponse" in part && part.functionResponse) {
           combinedParts.push({ functionResponse: part.functionResponse });
           continue;
         }
@@ -440,7 +387,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     consolidated.candidates = [
       {
         content: {
-          role: lastCandidate?.content?.role || 'model',
+          role: lastCandidate?.content?.role || "model",
           parts: combinedParts,
         },
         ...(finishReason ? { finishReason } : {}),
@@ -456,9 +403,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     return this.wrapped.countTokens(req);
   }
 
-  async embedContent(
-    req: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(req: EmbedContentParameters): Promise<EmbedContentResponse> {
     return this.wrapped.embedContent(req);
   }
 
@@ -479,30 +424,28 @@ export class LoggingContentGenerator implements ContentGenerator {
     if (Array.isArray(content)) {
       // it's a PartsUnion[]
       return {
-        role: 'user',
+        role: "user",
         parts: this.toParts(content),
       };
     }
-    if (typeof content === 'string') {
+    if (typeof content === "string") {
       // it's a string
       return {
-        role: 'user',
+        role: "user",
         parts: [{ text: content }],
       };
     }
-    if ('parts' in content) {
+    if ("parts" in content) {
       // it's a Content - process parts to handle thought filtering
       const parts = (content as Content).parts;
       return {
         ...(content as Content),
-        parts: Array.isArray(parts)
-          ? this.toParts(parts.filter((p): p is Part => p != null))
-          : [],
+        parts: Array.isArray(parts) ? this.toParts(parts.filter((p): p is Part => p != null)) : [],
       };
     }
     // it's a Part
     return {
-      role: 'user',
+      role: "user",
       parts: [this.toPart(content as Part)],
     };
   }
@@ -512,7 +455,7 @@ export class LoggingContentGenerator implements ContentGenerator {
   }
 
   private toPart(part: PartUnion): Part {
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       // it's a string
       return { text: part };
     }
@@ -520,17 +463,17 @@ export class LoggingContentGenerator implements ContentGenerator {
     // Handle thought parts for CountToken API compatibility
     // The CountToken API expects parts to have certain required "oneof" fields initialized,
     // but thought parts don't conform to this schema and cause API failures
-    if ('thought' in part && part.thought) {
+    if ("thought" in part && part.thought) {
       const thoughtText = `[Thought: ${part.thought}]`;
 
       const newPart = { ...part };
-      delete (newPart as Record<string, unknown>)['thought'];
+      delete (newPart as Record<string, unknown>)["thought"];
 
       const hasApiContent =
-        'functionCall' in newPart ||
-        'functionResponse' in newPart ||
-        'inlineData' in newPart ||
-        'fileData' in newPart;
+        "functionCall" in newPart ||
+        "functionResponse" in newPart ||
+        "inlineData" in newPart ||
+        "fileData" in newPart;
 
       if (hasApiContent) {
         // It's a functionCall or other non-text part. Just strip the thought.
@@ -540,10 +483,8 @@ export class LoggingContentGenerator implements ContentGenerator {
       // If no other valid API content, this must be a text part.
       // Combine existing text (if any) with the thought, preserving other properties.
       const text = (newPart as { text?: unknown }).text;
-      const existingText = text ? String(text) : '';
-      const combinedText = existingText
-        ? `${existingText}\n${thoughtText}`
-        : thoughtText;
+      const existingText = text ? String(text) : "";
+      const combinedText = existingText ? `${existingText}\n${thoughtText}` : thoughtText;
 
       return {
         ...newPart,
diff --git a/packages/airiscode-core/src/core/modalityDefaults.ts b/packages/airiscode-core/src/core/modalityDefaults.ts
index 16bd16c62..a2dce5bcd 100644
--- a/packages/airiscode-core/src/core/modalityDefaults.ts
+++ b/packages/airiscode-core/src/core/modalityDefaults.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { InputModalities } from './contentGenerator.js';
-import { normalize } from './tokenLimits.js';
+import type { InputModalities } from "./contentGenerator.js";
+import { normalize } from "./tokenLimits.js";
 
 const FULL_MULTIMODAL: InputModalities = {
   image: true,
diff --git a/packages/airiscode-core/src/core/nonInteractiveToolExecutor.ts b/packages/airiscode-core/src/core/nonInteractiveToolExecutor.ts
index e6897b15d..2c2a97d79 100644
--- a/packages/airiscode-core/src/core/nonInteractiveToolExecutor.ts
+++ b/packages/airiscode-core/src/core/nonInteractiveToolExecutor.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ToolCallRequestInfo,
-  ToolCallResponseInfo,
-  Config,
-} from '../index.js';
+import type { Config, ToolCallRequestInfo, ToolCallResponseInfo } from "../index.js";
 import {
-  CoreToolScheduler,
   type AllToolCallsCompleteHandler,
+  CoreToolScheduler,
   type OutputUpdateHandler,
   type ToolCallsUpdateHandler,
-} from './coreToolScheduler.js';
+} from "./coreToolScheduler.js";
 
 export interface ExecuteToolCallOptions {
   outputUpdateHandler?: OutputUpdateHandler;
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/constants.ts b/packages/airiscode-core/src/core/openaiContentGenerator/constants.ts
index fd505c121..34507ac8d 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/constants.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/constants.ts
@@ -1,6 +1,6 @@
 export const DEFAULT_TIMEOUT = 120000;
 export const DEFAULT_MAX_RETRIES = 3;
 
-export const DEFAULT_OPENAI_BASE_URL = 'https://api.openai.com/v1';
-export const DEFAULT_DEEPSEEK_BASE_URL = 'https://api.deepseek.com/v1';
-export const DEFAULT_OPEN_ROUTER_BASE_URL = 'https://openrouter.ai/api/v1';
+export const DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1";
+export const DEFAULT_DEEPSEEK_BASE_URL = "https://api.deepseek.com/v1";
+export const DEFAULT_OPEN_ROUTER_BASE_URL = "https://openrouter.ai/api/v1";
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/converter.ts b/packages/airiscode-core/src/core/openaiContentGenerator/converter.ts
index b41e4d285..95358e79b 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/converter.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/converter.ts
@@ -4,31 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type OpenAI from "openai";
 import type {
-  GenerateContentParameters,
-  Part,
-  Content,
-  Tool,
-  ToolListUnion,
   CallableTool,
-  FunctionResponse,
+  Candidate,
+  Content,
   ContentListUnion,
   ContentUnion,
+  FunctionResponse,
+  GenerateContentParameters,
+  Part,
   PartUnion,
-  Candidate,
-} from '../../types/llm.js';
-import { GenerateContentResponse, FinishReason } from '../../types/llm.js';
-import type OpenAI from 'openai';
-import { safeJsonParse } from '../../utils/safeJsonParse.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import type { InputModalities } from '../contentGenerator.js';
-import { StreamingToolCallParser } from './streamingToolCallParser.js';
-import {
-  convertSchema,
-  type SchemaComplianceMode,
-} from '../../utils/schemaConverter.js';
-
-const debugLogger = createDebugLogger('CONVERTER');
+  Tool,
+  ToolListUnion,
+} from "../../types/llm.js";
+import { FinishReason, GenerateContentResponse } from "../../types/llm.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { safeJsonParse } from "../../utils/safeJsonParse.js";
+import { convertSchema, type SchemaComplianceMode } from "../../utils/schemaConverter.js";
+import type { InputModalities } from "../contentGenerator.js";
+import { StreamingToolCallParser } from "./streamingToolCallParser.js";
+
+const debugLogger = createDebugLogger("CONVERTER");
 
 /**
  * Extended usage type that supports both OpenAI standard format and alternative formats
@@ -47,14 +44,12 @@ type ExtendedChatCompletionMessageParam =
   | OpenAI.Chat.ChatCompletionMessageParam
   | ExtendedChatCompletionAssistantMessageParam;
 
-export interface ExtendedCompletionMessage
-  extends OpenAI.Chat.ChatCompletionMessage {
+export interface ExtendedCompletionMessage extends OpenAI.Chat.ChatCompletionMessage {
   reasoning_content?: string | null;
   reasoning?: string | null;
 }
 
-export interface ExtendedCompletionChunkDelta
-  extends OpenAI.Chat.ChatCompletionChunk.Choice.Delta {
+export interface ExtendedCompletionChunkDelta extends OpenAI.Chat.ChatCompletionChunk.Choice.Delta {
   reasoning_content?: string | null;
   reasoning?: string | null;
 }
@@ -69,14 +64,14 @@ export interface ToolCallAccumulator {
 }
 
 type OpenAIContentPartVideoUrl = {
-  type: 'video_url';
+  type: "video_url";
   video_url: {
     url: string;
   };
 };
 
 type OpenAIContentPartFile = {
-  type: 'file';
+  type: "file";
   file: {
     filename: string;
     file_data: string;
@@ -97,12 +92,11 @@ export class OpenAIContentConverter {
   private model: string;
   private schemaCompliance: SchemaComplianceMode;
   private modalities: InputModalities;
-  private streamingToolCallParser: StreamingToolCallParser =
-    new StreamingToolCallParser();
+  private streamingToolCallParser: StreamingToolCallParser = new StreamingToolCallParser();
 
   constructor(
     model: string,
-    schemaCompliance: SchemaComplianceMode = 'auto',
+    schemaCompliance: SchemaComplianceMode = "auto",
     modalities: InputModalities = {},
   ) {
     this.model = model;
@@ -140,14 +134,14 @@ export class OpenAIContentConverter {
   convertGeminiToolParametersToOpenAI(
     parameters: Record<string, unknown>,
   ): Record<string, unknown> | undefined {
-    if (!parameters || typeof parameters !== 'object') {
+    if (!parameters || typeof parameters !== "object") {
       return parameters;
     }
 
     const converted = JSON.parse(JSON.stringify(parameters));
 
     const convertTypes = (obj: unknown): unknown => {
-      if (typeof obj !== 'object' || obj === null) {
+      if (typeof obj !== "object" || obj === null) {
         return obj;
       }
 
@@ -157,40 +151,36 @@ export class OpenAIContentConverter {
 
       const result: Record<string, unknown> = {};
       for (const [key, value] of Object.entries(obj)) {
-        if (key === 'type' && typeof value === 'string') {
+        if (key === "type" && typeof value === "string") {
           // Convert Gemini types to OpenAI JSON Schema types
           const lowerValue = value.toLowerCase();
-          if (lowerValue === 'integer') {
-            result[key] = 'integer';
-          } else if (lowerValue === 'number') {
-            result[key] = 'number';
+          if (lowerValue === "integer") {
+            result[key] = "integer";
+          } else if (lowerValue === "number") {
+            result[key] = "number";
           } else {
             result[key] = lowerValue;
           }
-        } else if (
-          key === 'minimum' ||
-          key === 'maximum' ||
-          key === 'multipleOf'
-        ) {
+        } else if (key === "minimum" || key === "maximum" || key === "multipleOf") {
           // Ensure numeric constraints are actual numbers, not strings
-          if (typeof value === 'string' && !isNaN(Number(value))) {
+          if (typeof value === "string" && !isNaN(Number(value))) {
             result[key] = Number(value);
           } else {
             result[key] = value;
           }
         } else if (
-          key === 'minLength' ||
-          key === 'maxLength' ||
-          key === 'minItems' ||
-          key === 'maxItems'
+          key === "minLength" ||
+          key === "maxLength" ||
+          key === "minItems" ||
+          key === "maxItems"
         ) {
           // Ensure length constraints are integers, not strings
-          if (typeof value === 'string' && !isNaN(Number(value))) {
+          if (typeof value === "string" && !isNaN(Number(value))) {
             result[key] = parseInt(value, 10);
           } else {
             result[key] = value;
           }
-        } else if (typeof value === 'object') {
+        } else if (typeof value === "object") {
           result[key] = convertTypes(value);
         } else {
           result[key] = value;
@@ -215,7 +205,7 @@ export class OpenAIContentConverter {
       let actualTool: Tool;
 
       // Handle CallableTool vs Tool
-      if ('tool' in tool) {
+      if ("tool" in tool) {
         // This is a CallableTool
         actualTool = await (tool as CallableTool).tool();
       } else {
@@ -248,7 +238,7 @@ export class OpenAIContentConverter {
             }
 
             openAITools.push({
-              type: 'function',
+              type: "function",
               function: {
                 name: func.name,
                 description: func.description,
@@ -290,9 +280,7 @@ export class OpenAIContentConverter {
   /**
    * Convert Gemini response to OpenAI completion format (for logging).
    */
-  convertGeminiResponseToOpenAI(
-    response: GenerateContentResponse,
-  ): OpenAI.Chat.ChatCompletion {
+  convertGeminiResponseToOpenAI(response: GenerateContentResponse): OpenAI.Chat.ChatCompletion {
     const candidate = response.candidates?.[0];
     const parts = (candidate?.content?.parts || []) as Part[];
 
@@ -303,20 +291,20 @@ export class OpenAIContentConverter {
     let toolCallIndex = 0;
 
     for (const part of parts) {
-      if (typeof part === 'string') {
+      if (typeof part === "string") {
         contentParts.push(part);
-      } else if ('text' in part && part.text) {
-        if ('thought' in part && part.thought) {
+      } else if ("text" in part && part.text) {
+        if ("thought" in part && part.thought) {
           thoughtParts.push(part.text);
         } else {
           contentParts.push(part.text);
         }
-      } else if ('functionCall' in part && part.functionCall) {
+      } else if ("functionCall" in part && part.functionCall) {
         toolCalls.push({
           id: part.functionCall.id || `call_${toolCallIndex}`,
-          type: 'function' as const,
+          type: "function" as const,
           function: {
-            name: part.functionCall.name || '',
+            name: part.functionCall.name || "",
             arguments: JSON.stringify(part.functionCall.args || {}),
           },
         });
@@ -325,12 +313,12 @@ export class OpenAIContentConverter {
     }
 
     const message: ExtendedCompletionMessage = {
-      role: 'assistant',
-      content: contentParts.join('') || null,
+      role: "assistant",
+      content: contentParts.join("") || null,
       refusal: null,
     };
 
-    const reasoningContent = thoughtParts.join('');
+    const reasoningContent = thoughtParts.join("");
     if (reasoningContent) {
       message.reasoning_content = reasoningContent;
     }
@@ -339,9 +327,7 @@ export class OpenAIContentConverter {
       message.tool_calls = toolCalls;
     }
 
-    const finishReason = this.mapGeminiFinishReasonToOpenAI(
-      candidate?.finishReason,
-    );
+    const finishReason = this.mapGeminiFinishReasonToOpenAI(candidate?.finishReason);
 
     const usageMetadata = response.usageMetadata;
     const usage: OpenAI.CompletionUsage = {
@@ -360,16 +346,14 @@ export class OpenAIContentConverter {
       };
     }
 
-    const createdMs = response.createTime
-      ? Number(response.createTime)
-      : Date.now();
+    const createdMs = response.createTime ? Number(response.createTime) : Date.now();
     const createdSeconds = Number.isFinite(createdMs)
       ? Math.floor(createdMs / 1000)
       : Math.floor(Date.now() / 1000);
 
     return {
       id: response.responseId || `gemini-${Date.now()}`,
-      object: 'chat.completion',
+      object: "chat.completion",
       created: createdSeconds,
       model: response.modelVersion || this.model,
       choices: [
@@ -393,13 +377,11 @@ export class OpenAIContentConverter {
   ): void {
     if (!request.config?.systemInstruction) return;
 
-    const systemText = this.extractTextFromContentUnion(
-      request.config.systemInstruction,
-    );
+    const systemText = this.extractTextFromContentUnion(request.config.systemInstruction);
 
     if (systemText) {
       messages.push({
-        role: 'system' as const,
+        role: "system" as const,
         content: systemText,
       });
     }
@@ -428,14 +410,14 @@ export class OpenAIContentConverter {
     content: ContentUnion | PartUnion,
     messages: ExtendedChatCompletionMessageParam[],
   ): void {
-    if (typeof content === 'string') {
-      messages.push({ role: 'user' as const, content });
+    if (typeof content === "string") {
+      messages.push({ role: "user" as const, content });
       return;
     }
 
     if (!this.isContentObject(content)) return;
     const parts = content.parts || [];
-    const role = content.role === 'model' ? 'assistant' : 'user';
+    const role = content.role === "model" ? "assistant" : "user";
 
     const contentParts: OpenAIContentPart[] = [];
     const reasoningParts: string[] = [];
@@ -443,39 +425,39 @@ export class OpenAIContentConverter {
     let toolCallIndex = 0;
 
     for (const part of parts) {
-      if (typeof part === 'string') {
-        contentParts.push({ type: 'text' as const, text: part });
+      if (typeof part === "string") {
+        contentParts.push({ type: "text" as const, text: part });
         continue;
       }
 
-      if ('text' in part && 'thought' in part && part.thought) {
-        if (role === 'assistant' && part.text) {
+      if ("text" in part && "thought" in part && part.thought) {
+        if (role === "assistant" && part.text) {
           reasoningParts.push(part.text);
         }
       }
 
-      if ('text' in part && part.text && !('thought' in part && part.thought)) {
-        contentParts.push({ type: 'text' as const, text: part.text });
+      if ("text" in part && part.text && !("thought" in part && part.thought)) {
+        contentParts.push({ type: "text" as const, text: part.text });
       }
 
       const mediaPart = this.createMediaContentPart(part);
-      if (mediaPart && role === 'user') {
+      if (mediaPart && role === "user") {
         contentParts.push(mediaPart);
       }
 
-      if ('functionCall' in part && part.functionCall && role === 'assistant') {
+      if ("functionCall" in part && part.functionCall && role === "assistant") {
         toolCalls.push({
           id: part.functionCall.id || `call_${toolCallIndex}`,
-          type: 'function' as const,
+          type: "function" as const,
           function: {
-            name: part.functionCall.name || '',
+            name: part.functionCall.name || "",
             arguments: JSON.stringify(part.functionCall.args || {}),
           },
         });
         toolCallIndex += 1;
       }
 
-      if (part.functionResponse && role === 'user') {
+      if (part.functionResponse && role === "user") {
         // Create tool message for the function response (with embedded media)
         const toolMessage = this.createToolMessage(part.functionResponse);
         if (toolMessage) {
@@ -484,24 +466,17 @@ export class OpenAIContentConverter {
       }
     }
 
-    if (role === 'assistant') {
-      if (
-        contentParts.length === 0 &&
-        toolCalls.length === 0 &&
-        reasoningParts.length === 0
-      ) {
+    if (role === "assistant") {
+      if (contentParts.length === 0 && toolCalls.length === 0 && reasoningParts.length === 0) {
         return;
       }
 
       const assistantTextContent = contentParts
-        .filter(
-          (part): part is OpenAI.Chat.ChatCompletionContentPartText =>
-            part.type === 'text',
-        )
+        .filter((part): part is OpenAI.Chat.ChatCompletionContentPartText => part.type === "text")
         .map((part) => part.text)
-        .join('');
+        .join("");
       const assistantMessage: ExtendedChatCompletionAssistantMessageParam = {
-        role: 'assistant',
+        role: "assistant",
         content: assistantTextContent || null,
       };
 
@@ -509,7 +484,7 @@ export class OpenAIContentConverter {
         assistantMessage.tool_calls = toolCalls;
       }
 
-      const reasoningContent = reasoningParts.join('');
+      const reasoningContent = reasoningParts.join("");
       if (reasoningContent) {
         assistantMessage.reasoning_content = reasoningContent;
       }
@@ -520,31 +495,30 @@ export class OpenAIContentConverter {
 
     if (contentParts.length > 0) {
       messages.push({
-        role: 'user',
-        content:
-          contentParts as unknown as OpenAI.Chat.ChatCompletionContentPart[],
+        role: "user",
+        content: contentParts as unknown as OpenAI.Chat.ChatCompletionContentPart[],
       });
     }
   }
 
   private extractFunctionResponseContent(response: unknown): string {
     if (response === null || response === undefined) {
-      return '';
+      return "";
     }
 
-    if (typeof response === 'string') {
+    if (typeof response === "string") {
       return response;
     }
 
-    if (typeof response === 'object') {
+    if (typeof response === "object") {
       const responseObject = response as Record<string, unknown>;
-      const output = responseObject['output'];
-      if (typeof output === 'string') {
+      const output = responseObject["output"];
+      if (typeof output === "string") {
         return output;
       }
 
-      const error = responseObject['error'];
-      if (typeof error === 'string') {
+      const error = responseObject["error"];
+      if (typeof error === "string") {
         return error;
       }
     }
@@ -568,7 +542,7 @@ export class OpenAIContentConverter {
 
     // Add text content first if present
     if (textContent) {
-      contentParts.push({ type: 'text' as const, text: textContent });
+      contentParts.push({ type: "text" as const, text: textContent });
     }
 
     // Add media parts from function response
@@ -585,19 +559,17 @@ export class OpenAIContentConverter {
     if (contentParts.length === 0) {
       // Return empty string for empty tool results
       return {
-        role: 'tool' as const,
-        tool_call_id: response.id || '',
-        content: '',
+        role: "tool" as const,
+        tool_call_id: response.id || "",
+        content: "",
       };
     }
 
     // Cast to OpenAI type - some OpenAI-compatible APIs support richer content in tool messages
     return {
-      role: 'tool' as const,
-      tool_call_id: response.id || '',
-      content: contentParts as unknown as
-        | string
-        | OpenAI.Chat.ChatCompletionContentPartText[],
+      role: "tool" as const,
+      tool_call_id: response.id || "",
+      content: contentParts as unknown as string | OpenAI.Chat.ChatCompletionContentPartText[],
     };
   }
 
@@ -611,24 +583,24 @@ export class OpenAIContentConverter {
       const mediaType = this.getMediaType(mimeType);
       const displayName = part.inlineData.displayName || mimeType;
 
-      if (mediaType === 'image') {
+      if (mediaType === "image") {
         if (!this.modalities.image) {
-          return this.unsupportedModalityPlaceholder('image', displayName);
+          return this.unsupportedModalityPlaceholder("image", displayName);
         }
         const dataUrl = `data:${mimeType};base64,${part.inlineData.data}`;
         return {
-          type: 'image_url' as const,
+          type: "image_url" as const,
           image_url: { url: dataUrl },
         };
       }
 
-      if (mimeType === 'application/pdf') {
+      if (mimeType === "application/pdf") {
         if (!this.modalities.pdf) {
-          return this.unsupportedModalityPlaceholder('pdf', displayName);
+          return this.unsupportedModalityPlaceholder("pdf", displayName);
         }
-        const filename = part.inlineData.displayName || 'document.pdf';
+        const filename = part.inlineData.displayName || "document.pdf";
         return {
-          type: 'file' as const,
+          type: "file" as const,
           file: {
             filename,
             file_data: `data:${mimeType};base64,${part.inlineData.data}`,
@@ -636,14 +608,14 @@ export class OpenAIContentConverter {
         };
       }
 
-      if (mediaType === 'audio') {
+      if (mediaType === "audio") {
         if (!this.modalities.audio) {
-          return this.unsupportedModalityPlaceholder('audio', displayName);
+          return this.unsupportedModalityPlaceholder("audio", displayName);
         }
         const format = this.getAudioFormat(mimeType);
         if (format) {
           return {
-            type: 'input_audio' as const,
+            type: "input_audio" as const,
             input_audio: {
               data: `data:${mimeType};base64,${part.inlineData.data}`,
               format,
@@ -652,12 +624,12 @@ export class OpenAIContentConverter {
         }
       }
 
-      if (mediaType === 'video') {
+      if (mediaType === "video") {
         if (!this.modalities.video) {
-          return this.unsupportedModalityPlaceholder('video', displayName);
+          return this.unsupportedModalityPlaceholder("video", displayName);
         }
         return {
-          type: 'video_url' as const,
+          type: "video_url" as const,
           video_url: {
             url: `data:${mimeType};base64,${part.inlineData.data}`,
           },
@@ -665,33 +637,33 @@ export class OpenAIContentConverter {
       }
 
       return {
-        type: 'text' as const,
+        type: "text" as const,
         text: `Unsupported inline media type: ${mimeType} (${displayName}).`,
       };
     }
 
     if (part.fileData?.mimeType && part.fileData?.fileUri) {
-      const filename = part.fileData.displayName || 'file';
+      const filename = part.fileData.displayName || "file";
       const fileUri = part.fileData.fileUri;
       const mimeType = part.fileData.mimeType;
       const mediaType = this.getMediaType(mimeType);
 
-      if (mediaType === 'image') {
+      if (mediaType === "image") {
         if (!this.modalities.image) {
-          return this.unsupportedModalityPlaceholder('image', filename);
+          return this.unsupportedModalityPlaceholder("image", filename);
         }
         return {
-          type: 'image_url' as const,
+          type: "image_url" as const,
           image_url: { url: fileUri },
         };
       }
 
-      if (mimeType === 'application/pdf') {
+      if (mimeType === "application/pdf") {
         if (!this.modalities.pdf) {
-          return this.unsupportedModalityPlaceholder('pdf', filename);
+          return this.unsupportedModalityPlaceholder("pdf", filename);
         }
         return {
-          type: 'file' as const,
+          type: "file" as const,
           file: {
             filename,
             file_data: fileUri,
@@ -699,23 +671,21 @@ export class OpenAIContentConverter {
         };
       }
 
-      if (mediaType === 'video') {
+      if (mediaType === "video") {
         if (!this.modalities.video) {
-          return this.unsupportedModalityPlaceholder('video', filename);
+          return this.unsupportedModalityPlaceholder("video", filename);
         }
         return {
-          type: 'video_url' as const,
+          type: "video_url" as const,
           video_url: {
             url: fileUri,
           },
         };
       }
 
-      const displayNameStr = part.fileData.displayName
-        ? ` (${part.fileData.displayName})`
-        : '';
+      const displayNameStr = part.fileData.displayName ? ` (${part.fileData.displayName})` : "";
       return {
-        type: 'text' as const,
+        type: "text" as const,
         text: `Unsupported file media type: ${mimeType}${displayNameStr}.`,
       };
     }
@@ -726,23 +696,20 @@ export class OpenAIContentConverter {
   /**
    * Create a text placeholder for unsupported modalities.
    */
-  private unsupportedModalityPlaceholder(
-    modality: string,
-    displayName: string,
-  ): OpenAIContentPart {
+  private unsupportedModalityPlaceholder(modality: string, displayName: string): OpenAIContentPart {
     debugLogger.warn(
       `Model '${this.model}' does not support ${modality} input. ` +
         `Replacing with text placeholder: ${displayName}`,
     );
     let hint: string;
-    if (modality === 'pdf') {
+    if (modality === "pdf") {
       hint =
-        'This model does not support PDF input directly. The read_file tool cannot extract PDF content either. To extract text from the PDF file, try using skills if applicable, or guide user to install pdf skill by running this slash command:\n/extensions install https://github.com/anthropics/skills:document-skills';
+        "This model does not support PDF input directly. The read_file tool cannot extract PDF content either. To extract text from the PDF file, try using skills if applicable, or guide user to install pdf skill by running this slash command:\n/extensions install https://github.com/anthropics/skills:document-skills";
     } else {
       hint = `This model does not support ${modality} input. The read_file tool cannot process this type of file either. To handle this file, try using skills if applicable, or any tools installed at system wide, or let the user know you cannot process this type of file.`;
     }
     return {
-      type: 'text' as const,
+      type: "text" as const,
       text: `[Unsupported ${modality} file: "${displayName}". ${hint}]`,
     };
   }
@@ -750,34 +717,32 @@ export class OpenAIContentConverter {
   /**
    * Determine media type from MIME type
    */
-  private getMediaType(mimeType: string): 'image' | 'audio' | 'video' | 'file' {
-    if (mimeType.startsWith('image/')) return 'image';
-    if (mimeType.startsWith('audio/')) return 'audio';
-    if (mimeType.startsWith('video/')) return 'video';
-    return 'file';
+  private getMediaType(mimeType: string): "image" | "audio" | "video" | "file" {
+    if (mimeType.startsWith("image/")) return "image";
+    if (mimeType.startsWith("audio/")) return "audio";
+    if (mimeType.startsWith("video/")) return "video";
+    return "file";
   }
 
   /**
    * Convert MIME type to OpenAI audio format
    */
-  private getAudioFormat(mimeType: string): 'wav' | 'mp3' | null {
-    if (mimeType.includes('wav')) return 'wav';
-    if (mimeType.includes('mp3') || mimeType.includes('mpeg')) return 'mp3';
+  private getAudioFormat(mimeType: string): "wav" | "mp3" | null {
+    if (mimeType.includes("wav")) return "wav";
+    if (mimeType.includes("mp3") || mimeType.includes("mpeg")) return "mp3";
     return null;
   }
 
   /**
    * Type guard to check if content is a valid Content object
    */
-  private isContentObject(
-    content: unknown,
-  ): content is { role: string; parts: Part[] } {
+  private isContentObject(content: unknown): content is { role: string; parts: Part[] } {
     return (
-      typeof content === 'object' &&
+      typeof content === "object" &&
       content !== null &&
-      'role' in content &&
-      'parts' in content &&
-      Array.isArray((content as Record<string, unknown>)['parts'])
+      "role" in content &&
+      "parts" in content &&
+      Array.isArray((content as Record<string, unknown>)["parts"])
     );
   }
 
@@ -785,7 +750,7 @@ export class OpenAIContentConverter {
    * Extract text content from various Gemini content union types
    */
   private extractTextFromContentUnion(contentUnion: unknown): string {
-    if (typeof contentUnion === 'string') {
+    if (typeof contentUnion === "string") {
       return contentUnion;
     }
 
@@ -793,26 +758,26 @@ export class OpenAIContentConverter {
       return contentUnion
         .map((item) => this.extractTextFromContentUnion(item))
         .filter(Boolean)
-        .join('\n');
+        .join("\n");
     }
 
-    if (typeof contentUnion === 'object' && contentUnion !== null) {
-      if ('parts' in contentUnion) {
+    if (typeof contentUnion === "object" && contentUnion !== null) {
+      if ("parts" in contentUnion) {
         const content = contentUnion as Content;
         return (
           content.parts
             ?.map((part: Part) => {
-              if (typeof part === 'string') return part;
-              if ('text' in part) return part.text || '';
-              return '';
+              if (typeof part === "string") return part;
+              if ("text" in part) return part.text || "";
+              return "";
             })
             .filter(Boolean)
-            .join('\n') || ''
+            .join("\n") || ""
         );
       }
     }
 
-    return '';
+    return "";
   }
 
   /**
@@ -864,11 +829,9 @@ export class OpenAIContentConverter {
         {
           content: {
             parts,
-            role: 'model' as const,
+            role: "model" as const,
           },
-          finishReason: this.mapOpenAIFinishReasonToGemini(
-            choice.finish_reason || 'stop',
-          ),
+          finishReason: this.mapOpenAIFinishReasonToGemini(choice.finish_reason || "stop"),
           index: 0,
           safetyRatings: [],
         },
@@ -896,11 +859,8 @@ export class OpenAIContentConverter {
       // and cached_tokens (some models return it at top level)
       const extendedUsage = usage as ExtendedCompletionUsage;
       const cachedTokens =
-        usage.prompt_tokens_details?.cached_tokens ??
-        extendedUsage.cached_tokens ??
-        0;
-      const thinkingTokens =
-        usage.completion_tokens_details?.reasoning_tokens || 0;
+        usage.prompt_tokens_details?.cached_tokens ?? extendedUsage.cached_tokens ?? 0;
+      const thinkingTokens = usage.completion_tokens_details?.reasoning_tokens || 0;
 
       // If we only have total tokens but no breakdown, estimate the split
       // Typically input is ~70% and output is ~30% for most conversations
@@ -928,9 +888,7 @@ export class OpenAIContentConverter {
   /**
    * Convert OpenAI stream chunk to Gemini format
    */
-  convertOpenAIChunkToGemini(
-    chunk: OpenAI.Chat.ChatCompletionChunk,
-  ): GenerateContentResponse {
+  convertOpenAIChunkToGemini(chunk: OpenAI.Chat.ChatCompletionChunk): GenerateContentResponse {
     const choice = chunk.choices?.[0];
     const response = new GenerateContentResponse();
 
@@ -946,7 +904,7 @@ export class OpenAIContentConverter {
 
       // Handle text content
       if (choice.delta?.content) {
-        if (typeof choice.delta.content === 'string') {
+        if (typeof choice.delta.content === "string") {
           parts.push({ text: choice.delta.content });
         }
       }
@@ -968,7 +926,7 @@ export class OpenAIContentConverter {
             // Handle metadata-only chunks (id and/or name without arguments)
             this.streamingToolCallParser.addChunk(
               index,
-              '', // Empty chunk for metadata-only updates
+              "", // Empty chunk for metadata-only updates
               toolCall.id,
               toolCall.function?.name,
             );
@@ -982,19 +940,16 @@ export class OpenAIContentConverter {
         // Detect truncation the provider may not report correctly.
         // Some providers send "stop" or "tool_calls" even when output was cut
         // off mid-JSON due to max_tokens.
-        toolCallsTruncated =
-          this.streamingToolCallParser.hasIncompleteToolCalls();
+        toolCallsTruncated = this.streamingToolCallParser.hasIncompleteToolCalls();
 
-        const completedToolCalls =
-          this.streamingToolCallParser.getCompletedToolCalls();
+        const completedToolCalls = this.streamingToolCallParser.getCompletedToolCalls();
 
         for (const toolCall of completedToolCalls) {
           if (toolCall.name) {
             parts.push({
               functionCall: {
                 id:
-                  toolCall.id ||
-                  `call_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
+                  toolCall.id || `call_${Date.now()}_${Math.random().toString(36).substring(2, 9)}`,
                 name: toolCall.name,
                 args: toolCall.args,
               },
@@ -1009,23 +964,19 @@ export class OpenAIContentConverter {
       // If tool call JSON was truncated, override to "length" so downstream
       // (turn.ts) correctly sets wasOutputTruncated=true.
       const effectiveFinishReason =
-        toolCallsTruncated && choice.finish_reason !== 'length'
-          ? 'length'
-          : choice.finish_reason;
+        toolCallsTruncated && choice.finish_reason !== "length" ? "length" : choice.finish_reason;
 
       // Only include finishReason key if finish_reason is present
       const candidate: Candidate = {
         content: {
           parts,
-          role: 'model' as const,
+          role: "model" as const,
         },
         index: 0,
         safetyRatings: [],
       };
       if (effectiveFinishReason) {
-        candidate.finishReason = this.mapOpenAIFinishReasonToGemini(
-          effectiveFinishReason,
-        );
+        candidate.finishReason = this.mapOpenAIFinishReasonToGemini(effectiveFinishReason);
       }
       response.candidates = [candidate];
     } else {
@@ -1047,15 +998,12 @@ export class OpenAIContentConverter {
       const promptTokens = usage.prompt_tokens || 0;
       const completionTokens = usage.completion_tokens || 0;
       const totalTokens = usage.total_tokens || 0;
-      const thinkingTokens =
-        usage.completion_tokens_details?.reasoning_tokens || 0;
+      const thinkingTokens = usage.completion_tokens_details?.reasoning_tokens || 0;
       // Support both formats: prompt_tokens_details.cached_tokens (OpenAI standard)
       // and cached_tokens (some models return it at top level)
       const extendedUsage = usage as ExtendedCompletionUsage;
       const cachedTokens =
-        usage.prompt_tokens_details?.cached_tokens ??
-        extendedUsage.cached_tokens ??
-        0;
+        usage.prompt_tokens_details?.cached_tokens ?? extendedUsage.cached_tokens ?? 0;
 
       // If we only have total tokens but no breakdown, estimate the split
       // Typically input is ~70% and output is ~30% for most conversations
@@ -1083,9 +1031,7 @@ export class OpenAIContentConverter {
   /**
    * Map OpenAI finish reasons to Gemini finish reasons
    */
-  private mapOpenAIFinishReasonToGemini(
-    openaiReason: string | null,
-  ): FinishReason {
+  private mapOpenAIFinishReasonToGemini(openaiReason: string | null): FinishReason {
     if (!openaiReason) return FinishReason.FINISH_REASON_UNSPECIFIED;
     const mapping: Record<string, FinishReason> = {
       stop: FinishReason.STOP,
@@ -1099,23 +1045,23 @@ export class OpenAIContentConverter {
 
   private mapGeminiFinishReasonToOpenAI(
     geminiReason?: FinishReason,
-  ): 'stop' | 'length' | 'tool_calls' | 'content_filter' | 'function_call' {
+  ): "stop" | "length" | "tool_calls" | "content_filter" | "function_call" {
     if (!geminiReason) {
-      return 'stop';
+      return "stop";
     }
 
     switch (geminiReason) {
       case FinishReason.STOP:
-        return 'stop';
+        return "stop";
       case FinishReason.MAX_TOKENS:
-        return 'length';
+        return "length";
       case FinishReason.SAFETY:
-        return 'content_filter';
+        return "content_filter";
       default:
-        if (geminiReason === ('RECITATION' as FinishReason)) {
-          return 'content_filter';
+        if (geminiReason === ("RECITATION" as FinishReason)) {
+          return "content_filter";
         }
-        return 'stop';
+        return "stop";
     }
   }
 
@@ -1131,32 +1077,20 @@ export class OpenAIContentConverter {
 
     // First pass: collect all tool call IDs and tool response IDs
     for (const message of messages) {
-      if (
-        message.role === 'assistant' &&
-        'tool_calls' in message &&
-        message.tool_calls
-      ) {
+      if (message.role === "assistant" && "tool_calls" in message && message.tool_calls) {
         for (const toolCall of message.tool_calls) {
           if (toolCall.id) {
             toolCallIds.add(toolCall.id);
           }
         }
-      } else if (
-        message.role === 'tool' &&
-        'tool_call_id' in message &&
-        message.tool_call_id
-      ) {
+      } else if (message.role === "tool" && "tool_call_id" in message && message.tool_call_id) {
         toolResponseIds.add(message.tool_call_id);
       }
     }
 
     // Second pass: filter out orphaned messages
     for (const message of messages) {
-      if (
-        message.role === 'assistant' &&
-        'tool_calls' in message &&
-        message.tool_calls
-      ) {
+      if (message.role === "assistant" && "tool_calls" in message && message.tool_calls) {
         // Filter out tool calls that don't have corresponding responses
         const validToolCalls = message.tool_calls.filter(
           (toolCall) => toolCall.id && toolResponseIds.has(toolCall.id),
@@ -1171,10 +1105,7 @@ export class OpenAIContentConverter {
             }
           ).tool_calls = validToolCalls;
           cleaned.push(cleanedMessage);
-        } else if (
-          typeof message.content === 'string' &&
-          message.content.trim()
-        ) {
+        } else if (typeof message.content === "string" && message.content.trim()) {
           // Keep the message if it has text content, but remove tool calls
           const cleanedMessage = { ...message };
           delete (
@@ -1185,11 +1116,7 @@ export class OpenAIContentConverter {
           cleaned.push(cleanedMessage);
         }
         // If no valid tool calls and no content, skip the message entirely
-      } else if (
-        message.role === 'tool' &&
-        'tool_call_id' in message &&
-        message.tool_call_id
-      ) {
+      } else if (message.role === "tool" && "tool_call_id" in message && message.tool_call_id) {
         // Only keep tool responses that have corresponding tool calls
         if (toolCallIds.has(message.tool_call_id)) {
           cleaned.push(message);
@@ -1206,11 +1133,7 @@ export class OpenAIContentConverter {
 
     // Collect all remaining tool call IDs
     for (const message of cleaned) {
-      if (
-        message.role === 'assistant' &&
-        'tool_calls' in message &&
-        message.tool_calls
-      ) {
+      if (message.role === "assistant" && "tool_calls" in message && message.tool_calls) {
         for (const toolCall of message.tool_calls) {
           if (toolCall.id) {
             finalToolCallIds.add(toolCall.id);
@@ -1222,22 +1145,14 @@ export class OpenAIContentConverter {
     // Verify all tool calls have responses
     const finalToolResponseIds = new Set<string>();
     for (const message of cleaned) {
-      if (
-        message.role === 'tool' &&
-        'tool_call_id' in message &&
-        message.tool_call_id
-      ) {
+      if (message.role === "tool" && "tool_call_id" in message && message.tool_call_id) {
         finalToolResponseIds.add(message.tool_call_id);
       }
     }
 
     // Remove any remaining orphaned tool calls
     for (const message of cleaned) {
-      if (
-        message.role === 'assistant' &&
-        'tool_calls' in message &&
-        message.tool_calls
-      ) {
+      if (message.role === "assistant" && "tool_calls" in message && message.tool_calls) {
         const finalValidToolCalls = message.tool_calls.filter(
           (toolCall) => toolCall.id && finalToolResponseIds.has(toolCall.id),
         );
@@ -1250,10 +1165,7 @@ export class OpenAIContentConverter {
             }
           ).tool_calls = finalValidToolCalls;
           finalCleaned.push(cleanedMessage);
-        } else if (
-          typeof message.content === 'string' &&
-          message.content.trim()
-        ) {
+        } else if (typeof message.content === "string" && message.content.trim()) {
           const cleanedMessage = { ...message };
           delete (
             cleanedMessage as OpenAI.Chat.ChatCompletionMessageParam & {
@@ -1279,40 +1191,34 @@ export class OpenAIContentConverter {
     const merged: OpenAI.Chat.ChatCompletionMessageParam[] = [];
 
     for (const message of messages) {
-      if (message.role === 'assistant' && merged.length > 0) {
+      if (message.role === "assistant" && merged.length > 0) {
         const lastMessage = merged[merged.length - 1];
 
         // If the last message is also an assistant message, merge them
-        if (lastMessage.role === 'assistant') {
-          const lastToolCalls =
-            'tool_calls' in lastMessage ? lastMessage.tool_calls || [] : [];
-          const currentToolCalls =
-            'tool_calls' in message ? message.tool_calls || [] : [];
+        if (lastMessage.role === "assistant") {
+          const lastToolCalls = "tool_calls" in lastMessage ? lastMessage.tool_calls || [] : [];
+          const currentToolCalls = "tool_calls" in message ? message.tool_calls || [] : [];
           // Combine content
           const lastContent = lastMessage.content;
           const currentContent = message.content;
 
           // Determine if we should use array format (if either content is an array)
-          const useArrayFormat =
-            Array.isArray(lastContent) || Array.isArray(currentContent);
+          const useArrayFormat = Array.isArray(lastContent) || Array.isArray(currentContent);
 
-          let combinedContent:
-            | string
-            | OpenAI.Chat.ChatCompletionContentPart[]
-            | null;
+          let combinedContent: string | OpenAI.Chat.ChatCompletionContentPart[] | null;
 
           if (useArrayFormat) {
             // Convert both to array format and merge
             const lastParts = Array.isArray(lastContent)
               ? lastContent
-              : typeof lastContent === 'string' && lastContent
-                ? [{ type: 'text' as const, text: lastContent }]
+              : typeof lastContent === "string" && lastContent
+                ? [{ type: "text" as const, text: lastContent }]
                 : [];
 
             const currentParts = Array.isArray(currentContent)
               ? currentContent
-              : typeof currentContent === 'string' && currentContent
-                ? [{ type: 'text' as const, text: currentContent }]
+              : typeof currentContent === "string" && currentContent
+                ? [{ type: "text" as const, text: currentContent }]
                 : [];
 
             combinedContent = [
@@ -1321,10 +1227,9 @@ export class OpenAIContentConverter {
             ] as OpenAI.Chat.ChatCompletionContentPart[];
           } else {
             // Both are strings or null, merge as strings
-            const lastText = typeof lastContent === 'string' ? lastContent : '';
-            const currentText =
-              typeof currentContent === 'string' ? currentContent : '';
-            const mergedText = [lastText, currentText].filter(Boolean).join('');
+            const lastText = typeof lastContent === "string" ? lastContent : "";
+            const currentText = typeof currentContent === "string" ? currentContent : "";
+            const mergedText = [lastText, currentText].filter(Boolean).join("");
             combinedContent = mergedText || null;
           }
 
@@ -1341,10 +1246,7 @@ export class OpenAIContentConverter {
           if (combinedToolCalls.length > 0) {
             (
               lastMessage as OpenAI.Chat.ChatCompletionMessageParam & {
-                content:
-                  | string
-                  | OpenAI.Chat.ChatCompletionContentPart[]
-                  | null;
+                content: string | OpenAI.Chat.ChatCompletionContentPart[] | null;
                 tool_calls?: OpenAI.Chat.ChatCompletionMessageToolCall[];
               }
             ).tool_calls = combinedToolCalls;
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/errorHandler.ts b/packages/airiscode-core/src/core/openaiContentGenerator/errorHandler.ts
index 665f0c5e5..8f8d378c5 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/errorHandler.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/errorHandler.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentParameters } from '../../types/llm.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
+import type { GenerateContentParameters } from "../../types/llm.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
 
-const debugLogger = createDebugLogger('OPENAI_ERROR');
+const debugLogger = createDebugLogger("OPENAI_ERROR");
 
 export interface RequestContext {
   userPromptId: string;
@@ -19,15 +19,8 @@ export interface RequestContext {
 }
 
 export interface ErrorHandler {
-  handle(
-    error: unknown,
-    context: RequestContext,
-    request: GenerateContentParameters,
-  ): never;
-  shouldSuppressErrorLogging(
-    error: unknown,
-    request: GenerateContentParameters,
-  ): boolean;
+  handle(error: unknown, context: RequestContext, request: GenerateContentParameters): never;
+  shouldSuppressErrorLogging(error: unknown, request: GenerateContentParameters): boolean;
 }
 
 export class EnhancedErrorHandler implements ErrorHandler {
@@ -38,36 +31,25 @@ export class EnhancedErrorHandler implements ErrorHandler {
     ) => boolean = () => false,
   ) {}
 
-  handle(
-    error: unknown,
-    context: RequestContext,
-    request: GenerateContentParameters,
-  ): never {
+  handle(error: unknown, context: RequestContext, request: GenerateContentParameters): never {
     const isTimeoutError = this.isTimeoutError(error);
     const errorMessage = this.buildErrorMessage(error, context, isTimeoutError);
 
     // Allow subclasses to suppress error logging for specific scenarios
     if (!this.shouldSuppressErrorLogging(error, request)) {
-      const logPrefix = context.isStreaming
-        ? 'OpenAI API Streaming Error:'
-        : 'OpenAI API Error:';
+      const logPrefix = context.isStreaming ? "OpenAI API Streaming Error:" : "OpenAI API Error:";
       debugLogger.error(logPrefix, errorMessage);
     }
 
     // Provide helpful timeout-specific error message
     if (isTimeoutError) {
-      throw new Error(
-        `${errorMessage}\n\n${this.getTimeoutTroubleshootingTips(context)}`,
-      );
+      throw new Error(`${errorMessage}\n\n${this.getTimeoutTroubleshootingTips(context)}`);
     }
 
     throw error;
   }
 
-  shouldSuppressErrorLogging(
-    error: unknown,
-    request: GenerateContentParameters,
-  ): boolean {
+  shouldSuppressErrorLogging(error: unknown, request: GenerateContentParameters): boolean {
     return this.shouldSuppressLogging(error, request);
   }
 
@@ -75,9 +57,7 @@ export class EnhancedErrorHandler implements ErrorHandler {
     if (!error) return false;
 
     const errorMessage =
-      error instanceof Error
-        ? error.message.toLowerCase()
-        : String(error).toLowerCase();
+      error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const errorCode = (error as any)?.code;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -85,18 +65,18 @@ export class EnhancedErrorHandler implements ErrorHandler {
 
     // Check for common timeout indicators
     return (
-      errorMessage.includes('timeout') ||
-      errorMessage.includes('timed out') ||
-      errorMessage.includes('connection timeout') ||
-      errorMessage.includes('request timeout') ||
-      errorMessage.includes('read timeout') ||
-      errorMessage.includes('etimedout') ||
-      errorMessage.includes('esockettimedout') ||
-      errorCode === 'ETIMEDOUT' ||
-      errorCode === 'ESOCKETTIMEDOUT' ||
-      errorType === 'timeout' ||
-      errorMessage.includes('request timed out') ||
-      errorMessage.includes('deadline exceeded')
+      errorMessage.includes("timeout") ||
+      errorMessage.includes("timed out") ||
+      errorMessage.includes("connection timeout") ||
+      errorMessage.includes("request timeout") ||
+      errorMessage.includes("read timeout") ||
+      errorMessage.includes("etimedout") ||
+      errorMessage.includes("esockettimedout") ||
+      errorCode === "ETIMEDOUT" ||
+      errorCode === "ESOCKETTIMEDOUT" ||
+      errorType === "timeout" ||
+      errorMessage.includes("request timed out") ||
+      errorMessage.includes("deadline exceeded")
     );
   }
 
@@ -108,9 +88,7 @@ export class EnhancedErrorHandler implements ErrorHandler {
     const durationSeconds = Math.round(context.duration / 1000);
 
     if (isTimeoutError) {
-      const prefix = context.isStreaming
-        ? 'Streaming request timeout'
-        : 'Request timeout';
+      const prefix = context.isStreaming ? "Streaming request timeout" : "Request timeout";
       return `${prefix} after ${durationSeconds}s. Try reducing input length or increasing timeout in config.`;
     }
 
@@ -119,22 +97,22 @@ export class EnhancedErrorHandler implements ErrorHandler {
 
   private getTimeoutTroubleshootingTips(context: RequestContext): string {
     const baseTitle = context.isStreaming
-      ? 'Streaming timeout troubleshooting:'
-      : 'Troubleshooting tips:';
+      ? "Streaming timeout troubleshooting:"
+      : "Troubleshooting tips:";
 
     const baseTips = [
-      '- Reduce input length or complexity',
-      '- Increase timeout in config: contentGenerator.timeout',
-      '- Check network connectivity',
+      "- Reduce input length or complexity",
+      "- Increase timeout in config: contentGenerator.timeout",
+      "- Check network connectivity",
     ];
 
     const streamingSpecificTips = context.isStreaming
       ? [
-          '- Check network stability for streaming connections',
-          '- Consider using non-streaming mode for very long inputs',
+          "- Check network stability for streaming connections",
+          "- Consider using non-streaming mode for very long inputs",
         ]
-      : ['- Consider using streaming mode for long responses'];
+      : ["- Consider using streaming mode for long responses"];
 
-    return `${baseTitle}\n${[...baseTips, ...streamingSpecificTips].join('\n')}`;
+    return `${baseTitle}\n${[...baseTips, ...streamingSpecificTips].join("\n")}`;
   }
 }
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/index.ts b/packages/airiscode-core/src/core/openaiContentGenerator/index.ts
index 732b8eb82..dfc05b99a 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/index.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/index.ts
@@ -4,32 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../contentGenerator.js';
-import type { Config } from '../../config/config.js';
-import { OpenAIContentGenerator } from './openaiContentGenerator.js';
+import type { Config } from "../../config/config.js";
+import type { ContentGenerator, ContentGeneratorConfig } from "../contentGenerator.js";
+import { OpenAIContentGenerator } from "./openaiContentGenerator.js";
 import {
   DeepSeekOpenAICompatibleProvider,
+  DefaultOpenAICompatibleProvider,
   ModelScopeOpenAICompatibleProvider,
-  OpenRouterOpenAICompatibleProvider,
   OllamaOpenAICompatibleProvider,
   type OpenAICompatibleProvider,
-  DefaultOpenAICompatibleProvider,
-} from './provider/index.js';
-
-export { OpenAIContentGenerator } from './openaiContentGenerator.js';
-export { ContentGenerationPipeline, type PipelineConfig } from './pipeline.js';
+  OpenRouterOpenAICompatibleProvider,
+} from "./provider/index.js";
 
+export { OpenAIContentConverter } from "./converter.js";
+export { OpenAIContentGenerator } from "./openaiContentGenerator.js";
+export { ContentGenerationPipeline, type PipelineConfig } from "./pipeline.js";
 export {
-  type OpenAICompatibleProvider,
   DeepSeekOpenAICompatibleProvider,
-  OpenRouterOpenAICompatibleProvider,
   OllamaOpenAICompatibleProvider,
-} from './provider/index.js';
-
-export { OpenAIContentConverter } from './converter.js';
+  type OpenAICompatibleProvider,
+  OpenRouterOpenAICompatibleProvider,
+} from "./provider/index.js";
 
 /**
  * Create an OpenAI-compatible content generator with the appropriate provider
@@ -39,11 +34,7 @@ export function createOpenAIContentGenerator(
   cliConfig: Config,
 ): ContentGenerator {
   const provider = determineProvider(contentGeneratorConfig, cliConfig);
-  return new OpenAIContentGenerator(
-    contentGeneratorConfig,
-    cliConfig,
-    provider,
-  );
+  return new OpenAIContentGenerator(contentGeneratorConfig, cliConfig, provider);
 }
 
 /**
@@ -53,42 +44,29 @@ export function determineProvider(
   contentGeneratorConfig: ContentGeneratorConfig,
   cliConfig: Config,
 ): OpenAICompatibleProvider {
-  const config =
-    contentGeneratorConfig || cliConfig.getContentGeneratorConfig();
+  const config = contentGeneratorConfig || cliConfig.getContentGeneratorConfig();
 
   if (DeepSeekOpenAICompatibleProvider.isDeepSeekProvider(config)) {
-    return new DeepSeekOpenAICompatibleProvider(
-      contentGeneratorConfig,
-      cliConfig,
-    );
+    return new DeepSeekOpenAICompatibleProvider(contentGeneratorConfig, cliConfig);
   }
 
   // Check for OpenRouter provider
   if (OpenRouterOpenAICompatibleProvider.isOpenRouterProvider(config)) {
-    return new OpenRouterOpenAICompatibleProvider(
-      contentGeneratorConfig,
-      cliConfig,
-    );
+    return new OpenRouterOpenAICompatibleProvider(contentGeneratorConfig, cliConfig);
   }
 
   // Check for ModelScope provider
   if (ModelScopeOpenAICompatibleProvider.isModelScopeProvider(config)) {
-    return new ModelScopeOpenAICompatibleProvider(
-      contentGeneratorConfig,
-      cliConfig,
-    );
+    return new ModelScopeOpenAICompatibleProvider(contentGeneratorConfig, cliConfig);
   }
 
   // Check for Ollama provider (local inference)
   if (OllamaOpenAICompatibleProvider.isOllamaProvider(config)) {
-    return new OllamaOpenAICompatibleProvider(
-      contentGeneratorConfig,
-      cliConfig,
-    );
+    return new OllamaOpenAICompatibleProvider(contentGeneratorConfig, cliConfig);
   }
 
   // Default provider for standard OpenAI-compatible APIs
   return new DefaultOpenAICompatibleProvider(contentGeneratorConfig, cliConfig);
 }
 
-export { type ErrorHandler, EnhancedErrorHandler } from './errorHandler.js';
+export { EnhancedErrorHandler, type ErrorHandler } from "./errorHandler.js";
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/openaiContentGenerator.ts b/packages/airiscode-core/src/core/openaiContentGenerator/openaiContentGenerator.ts
index 14e2e3b75..4a1c21fb2 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/openaiContentGenerator.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/openaiContentGenerator.ts
@@ -1,6 +1,4 @@
-import type { ContentGenerator } from '../contentGenerator.js';
-import type { Config } from '../../config/config.js';
-import { type OpenAICompatibleProvider } from './provider/index.js';
+import type { Config } from "../../config/config.js";
 import type {
   CountTokensParameters,
   CountTokensResponse,
@@ -8,16 +6,17 @@ import type {
   EmbedContentResponse,
   GenerateContentParameters,
   GenerateContentResponse,
-} from '../../types/llm.js';
-import type { PipelineConfig } from './pipeline.js';
-import { ContentGenerationPipeline } from './pipeline.js';
-import { EnhancedErrorHandler } from './errorHandler.js';
-import { RequestTokenEstimator } from '../../utils/request-tokenizer/index.js';
-import type { ContentGeneratorConfig } from '../contentGenerator.js';
-import { isAbortError } from '../../utils/errors.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('OPENAI');
+} from "../../types/llm.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { isAbortError } from "../../utils/errors.js";
+import { RequestTokenEstimator } from "../../utils/request-tokenizer/index.js";
+import type { ContentGenerator, ContentGeneratorConfig } from "../contentGenerator.js";
+import { EnhancedErrorHandler } from "./errorHandler.js";
+import type { PipelineConfig } from "./pipeline.js";
+import { ContentGenerationPipeline } from "./pipeline.js";
+import { type OpenAICompatibleProvider } from "./provider/index.js";
+
+const debugLogger = createDebugLogger("OPENAI");
 
 export class OpenAIContentGenerator implements ContentGenerator {
   protected pipeline: ContentGenerationPipeline;
@@ -32,9 +31,8 @@ export class OpenAIContentGenerator implements ContentGenerator {
       cliConfig,
       provider,
       contentGeneratorConfig,
-      errorHandler: new EnhancedErrorHandler(
-        (error: unknown, request: GenerateContentParameters) =>
-          this.shouldSuppressErrorLogging(error, request),
+      errorHandler: new EnhancedErrorHandler((error: unknown, request: GenerateContentParameters) =>
+        this.shouldSuppressErrorLogging(error, request),
       ),
     };
 
@@ -79,9 +77,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
     return this.pipeline.executeStream(request, userPromptId);
   }
 
-  async countTokens(
-    request: CountTokensParameters,
-  ): Promise<CountTokensResponse> {
+  async countTokens(request: CountTokensParameters): Promise<CountTokensResponse> {
     try {
       // Use the request token estimator (character-based).
       const estimator = new RequestTokenEstimator();
@@ -92,7 +88,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
       };
     } catch (error) {
       debugLogger.warn(
-        'Failed to calculate tokens with new tokenizer, falling back to simple method:',
+        "Failed to calculate tokens with new tokenizer, falling back to simple method:",
         error,
       );
 
@@ -106,52 +102,50 @@ export class OpenAIContentGenerator implements ContentGenerator {
     }
   }
 
-  async embedContent(
-    request: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse> {
     // Extract text from contents
-    let text = '';
+    let text = "";
     if (Array.isArray(request.contents)) {
       text = request.contents
         .map((content) => {
-          if (typeof content === 'string') return content;
+          if (typeof content === "string") return content;
           const parts = (content as { parts?: unknown[] }).parts;
           if (Array.isArray(parts)) {
             return parts
               .map((part: unknown) =>
-                typeof part === 'string'
+                typeof part === "string"
                   ? part
-                  : part && typeof part === 'object' && 'text' in part
-                    ? (part as { text?: string }).text || ''
-                    : '',
+                  : part && typeof part === "object" && "text" in part
+                    ? (part as { text?: string }).text || ""
+                    : "",
               )
-              .join(' ');
+              .join(" ");
           }
-          return '';
+          return "";
         })
-        .join(' ');
+        .join(" ");
     } else if (request.contents) {
-      if (typeof request.contents === 'string') {
+      if (typeof request.contents === "string") {
         text = request.contents;
       } else {
         const parts = (request.contents as { parts?: unknown[] }).parts;
         if (Array.isArray(parts)) {
           text = parts
             .map((part: unknown) =>
-              typeof part === 'string'
+              typeof part === "string"
                 ? part
-                : part && typeof part === 'object' && 'text' in part
-                  ? (part as { text?: string }).text || ''
-                  : '',
+                : part && typeof part === "object" && "text" in part
+                  ? (part as { text?: string }).text || ""
+                  : "",
             )
-            .join(' ');
+            .join(" ");
         }
       }
     }
 
     try {
       const embedding = await this.pipeline.client.embeddings.create({
-        model: 'text-embedding-ada-002', // Default embedding model
+        model: "text-embedding-ada-002", // Default embedding model
         input: text,
       });
 
@@ -163,7 +157,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
         ],
       };
     } catch (error) {
-      debugLogger.error('OpenAI API Embedding Error:', error);
+      debugLogger.error("OpenAI API Embedding Error:", error);
       throw new Error(
         `OpenAI API error: ${error instanceof Error ? error.message : String(error)}`,
       );
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/pipeline.ts b/packages/airiscode-core/src/core/openaiContentGenerator/pipeline.ts
index 285a8c853..5607dca4b 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/pipeline.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/pipeline.ts
@@ -4,16 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type OpenAI from 'openai';
-import {
-  type GenerateContentParameters,
-  GenerateContentResponse,
-} from '../../types/llm.js';
-import type { Config } from '../../config/config.js';
-import type { ContentGeneratorConfig } from '../contentGenerator.js';
-import type { OpenAICompatibleProvider } from './provider/index.js';
-import { OpenAIContentConverter } from './converter.js';
-import type { ErrorHandler, RequestContext } from './errorHandler.js';
+import type OpenAI from "openai";
+import type { Config } from "../../config/config.js";
+import { type GenerateContentParameters, GenerateContentResponse } from "../../types/llm.js";
+import type { ContentGeneratorConfig } from "../contentGenerator.js";
+import { OpenAIContentConverter } from "./converter.js";
+import type { ErrorHandler, RequestContext } from "./errorHandler.js";
+import type { OpenAICompatibleProvider } from "./provider/index.js";
 
 /**
  * Error thrown when the API returns an error embedded as stream content
@@ -24,7 +21,7 @@ import type { ErrorHandler, RequestContext } from './errorHandler.js';
 export class StreamContentError extends Error {
   constructor(message: string) {
     super(message);
-    this.name = 'StreamContentError';
+    this.name = "StreamContentError";
   }
 }
 
@@ -66,15 +63,11 @@ export class ContentGenerationPipeline {
       false,
       effectiveModel,
       async (openaiRequest) => {
-        const openaiResponse = (await this.client.chat.completions.create(
-          openaiRequest,
-          {
-            signal: request.config?.abortSignal,
-          },
-        )) as OpenAI.Chat.ChatCompletion;
+        const openaiResponse = (await this.client.chat.completions.create(openaiRequest, {
+          signal: request.config?.abortSignal,
+        })) as OpenAI.Chat.ChatCompletion;
 
-        const geminiResponse =
-          this.converter.convertOpenAIResponseToGemini(openaiResponse);
+        const geminiResponse = this.converter.convertOpenAIResponseToGemini(openaiResponse);
 
         return geminiResponse;
       },
@@ -95,12 +88,9 @@ export class ContentGenerationPipeline {
       effectiveModel,
       async (openaiRequest, context) => {
         // Stage 1: Create OpenAI stream
-        const stream = (await this.client.chat.completions.create(
-          openaiRequest,
-          {
-            signal: request.config?.abortSignal,
-          },
-        )) as AsyncIterable<OpenAI.Chat.ChatCompletionChunk>;
+        const stream = (await this.client.chat.completions.create(openaiRequest, {
+          signal: request.config?.abortSignal,
+        })) as AsyncIterable<OpenAI.Chat.ChatCompletionChunk>;
 
         // Stage 2: Process stream with conversion and logging
         return this.processStreamWithLogging(stream, context, request);
@@ -144,10 +134,8 @@ export class ContentGenerationPipeline {
         // Some providers return errors (e.g., TPM throttling) as a normal SSE chunk
         // with finish_reason="error_finish" and the error in delta.content,
         // instead of returning a proper HTTP error status.
-        if ((chunk.choices?.[0]?.finish_reason as string) === 'error_finish') {
-          const errorContent =
-            chunk.choices?.[0]?.delta?.content?.trim() ||
-            'Unknown stream error';
+        if ((chunk.choices?.[0]?.finish_reason as string) === "error_finish") {
+          const errorContent = chunk.choices?.[0]?.delta?.content?.trim() || "Unknown stream error";
           throw new StreamContentError(errorContent);
         }
 
@@ -175,8 +163,7 @@ export class ContentGenerationPipeline {
           // block below. TypeScript cannot infer this through the callback
           // assignment in handleChunkMerging, so an explicit cast is needed.
           if (response.usageMetadata) {
-            const pending =
-              pendingFinishResponse as GenerateContentResponse | null;
+            const pending = pendingFinishResponse as GenerateContentResponse | null;
             if (pending) {
               pending.usageMetadata = response.usageMetadata;
             }
@@ -251,8 +238,7 @@ export class ContentGenerationPipeline {
     // Check if we have a pending finish response from previous chunks
     const hasPendingFinish =
       collectedGeminiResponses.length > 0 &&
-      collectedGeminiResponses[collectedGeminiResponses.length - 1]
-        .candidates?.[0]?.finishReason;
+      collectedGeminiResponses[collectedGeminiResponses.length - 1].candidates?.[0]?.finishReason;
 
     if (isFinishChunk) {
       if (hasPendingFinish) {
@@ -261,8 +247,7 @@ export class ContentGenerationPipeline {
         // was already reset after the first finish chunk, so the second one
         // carries no functionCall parts. Merge only usageMetadata and keep the
         // candidates (including functionCall parts) from the first finish chunk.
-        const lastResponse =
-          collectedGeminiResponses[collectedGeminiResponses.length - 1];
+        const lastResponse = collectedGeminiResponses[collectedGeminiResponses.length - 1];
         if (response.usageMetadata) {
           lastResponse.usageMetadata = response.usageMetadata;
         }
@@ -275,8 +260,7 @@ export class ContentGenerationPipeline {
       return false; // Don't yield yet, wait for potential subsequent chunks to merge
     } else if (hasPendingFinish) {
       // We have a pending finish chunk, merge this chunk's data into it
-      const lastResponse =
-        collectedGeminiResponses[collectedGeminiResponses.length - 1];
+      const lastResponse = collectedGeminiResponses[collectedGeminiResponses.length - 1];
       const mergedResponse = new GenerateContentResponse();
 
       // Keep the finish reason from the previous chunk
@@ -296,8 +280,7 @@ export class ContentGenerationPipeline {
       mergedResponse.promptFeedback = response.promptFeedback;
 
       // Update the collected responses with the merged response
-      collectedGeminiResponses[collectedGeminiResponses.length - 1] =
-        mergedResponse;
+      collectedGeminiResponses[collectedGeminiResponses.length - 1] = mergedResponse;
 
       setPendingFinish(mergedResponse);
       return true; // Yield the merged response
@@ -325,28 +308,21 @@ export class ContentGenerationPipeline {
 
     // Add streaming options if present
     if (streaming) {
-      (
-        baseRequest as unknown as OpenAI.Chat.ChatCompletionCreateParamsStreaming
-      ).stream = true;
+      (baseRequest as unknown as OpenAI.Chat.ChatCompletionCreateParamsStreaming).stream = true;
       baseRequest.stream_options = { include_usage: true };
     }
 
     // Add tools if present
     if (request.config?.tools) {
-      baseRequest.tools = await this.converter.convertGeminiToolsToOpenAI(
-        request.config.tools,
-      );
+      baseRequest.tools = await this.converter.convertGeminiToolsToOpenAI(request.config.tools);
     }
 
     // Let provider enhance the request (e.g., add metadata, cache control)
     return this.config.provider.buildRequest(baseRequest, userPromptId);
   }
 
-  private buildGenerateContentConfig(
-    request: GenerateContentParameters,
-  ): Record<string, unknown> {
-    const defaultSamplingParams =
-      this.config.provider.getDefaultGenerationConfig();
+  private buildGenerateContentConfig(request: GenerateContentParameters): Record<string, unknown> {
+    const defaultSamplingParams = this.config.provider.getDefaultGenerationConfig();
     const configSamplingParams = this.contentGeneratorConfig.samplingParams;
 
     // Helper function to get parameter value with priority: config > request > default
@@ -355,12 +331,8 @@ export class ContentGenerationPipeline {
       requestKey?: keyof NonNullable<typeof request.config>,
     ): T | undefined => {
       const configValue = configSamplingParams?.[configKey] as T | undefined;
-      const requestValue = requestKey
-        ? (request.config?.[requestKey] as T | undefined)
-        : undefined;
-      const defaultValue = requestKey
-        ? (defaultSamplingParams[requestKey] as T)
-        : undefined;
+      const requestValue = requestKey ? (request.config?.[requestKey] as T | undefined) : undefined;
+      const defaultValue = requestKey ? (defaultSamplingParams[requestKey] as T) : undefined;
 
       if (configValue !== undefined) return configValue;
       if (requestValue !== undefined) return requestValue;
@@ -380,34 +352,24 @@ export class ContentGenerationPipeline {
 
     const params: Record<string, unknown> = {
       // Parameters with request fallback but no defaults
-      ...addParameterIfDefined('temperature', 'temperature', 'temperature'),
-      ...addParameterIfDefined('top_p', 'top_p', 'topP'),
+      ...addParameterIfDefined("temperature", "temperature", "temperature"),
+      ...addParameterIfDefined("top_p", "top_p", "topP"),
 
       // Max tokens (special case: different property names)
-      ...addParameterIfDefined('max_tokens', 'max_tokens', 'maxOutputTokens'),
+      ...addParameterIfDefined("max_tokens", "max_tokens", "maxOutputTokens"),
 
       // Config-only parameters (no request fallback)
-      ...addParameterIfDefined('top_k', 'top_k', 'topK'),
-      ...addParameterIfDefined('repetition_penalty', 'repetition_penalty'),
-      ...addParameterIfDefined(
-        'presence_penalty',
-        'presence_penalty',
-        'presencePenalty',
-      ),
-      ...addParameterIfDefined(
-        'frequency_penalty',
-        'frequency_penalty',
-        'frequencyPenalty',
-      ),
+      ...addParameterIfDefined("top_k", "top_k", "topK"),
+      ...addParameterIfDefined("repetition_penalty", "repetition_penalty"),
+      ...addParameterIfDefined("presence_penalty", "presence_penalty", "presencePenalty"),
+      ...addParameterIfDefined("frequency_penalty", "frequency_penalty", "frequencyPenalty"),
       ...this.buildReasoningConfig(request),
     };
 
     return params;
   }
 
-  private buildReasoningConfig(
-    request: GenerateContentParameters,
-  ): Record<string, unknown> {
+  private buildReasoningConfig(request: GenerateContentParameters): Record<string, unknown> {
     // Reasoning configuration for OpenAI-compatible endpoints is highly fragmented.
     // For example, across common providers and models:
     //
@@ -447,11 +409,7 @@ export class ContentGenerationPipeline {
       context: RequestContext,
     ) => Promise<T>,
   ): Promise<T> {
-    const context = this.createRequestContext(
-      userPromptId,
-      isStreaming,
-      effectiveModel,
-    );
+    const context = this.createRequestContext(userPromptId, isStreaming, effectiveModel);
 
     try {
       const openaiRequest = await this.buildRequest(
@@ -495,7 +453,7 @@ export class ContentGenerationPipeline {
     return {
       userPromptId,
       model: effectiveModel,
-      authType: this.contentGeneratorConfig.authType || 'unknown',
+      authType: this.contentGeneratorConfig.authType || "unknown",
       startTime: Date.now(),
       duration: 0,
       isStreaming,
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/provider/deepseek.ts b/packages/airiscode-core/src/core/openaiContentGenerator/provider/deepseek.ts
index 2ea5a18c2..032e1840e 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/provider/deepseek.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/provider/deepseek.ts
@@ -4,26 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type OpenAI from 'openai';
-import type { Config } from '../../../config/config.js';
-import type { ContentGeneratorConfig } from '../../contentGenerator.js';
-import { DefaultOpenAICompatibleProvider } from './default.js';
-import type { GenerateContentConfig } from '../../../types/llm.js';
+import type OpenAI from "openai";
+import type { Config } from "../../../config/config.js";
+import type { GenerateContentConfig } from "../../../types/llm.js";
+import type { ContentGeneratorConfig } from "../../contentGenerator.js";
+import { DefaultOpenAICompatibleProvider } from "./default.js";
 
 export class DeepSeekOpenAICompatibleProvider extends DefaultOpenAICompatibleProvider {
-  constructor(
-    contentGeneratorConfig: ContentGeneratorConfig,
-    cliConfig: Config,
-  ) {
+  constructor(contentGeneratorConfig: ContentGeneratorConfig, cliConfig: Config) {
     super(contentGeneratorConfig, cliConfig);
   }
 
-  static isDeepSeekProvider(
-    contentGeneratorConfig: ContentGeneratorConfig,
-  ): boolean {
-    const baseUrl = contentGeneratorConfig.baseUrl ?? '';
+  static isDeepSeekProvider(contentGeneratorConfig: ContentGeneratorConfig): boolean {
+    const baseUrl = contentGeneratorConfig.baseUrl ?? "";
 
-    return baseUrl.toLowerCase().includes('api.deepseek.com');
+    return baseUrl.toLowerCase().includes("api.deepseek.com");
   }
 
   /**
@@ -41,17 +36,13 @@ export class DeepSeekOpenAICompatibleProvider extends DefaultOpenAICompatiblePro
     }
 
     const messages = baseRequest.messages.map((message) => {
-      if (!('content' in message)) {
+      if (!("content" in message)) {
         return message;
       }
 
       const { content } = message;
 
-      if (
-        typeof content === 'string' ||
-        content === null ||
-        content === undefined
-      ) {
+      if (typeof content === "string" || content === null || content === undefined) {
         return message;
       }
 
@@ -61,15 +52,15 @@ export class DeepSeekOpenAICompatibleProvider extends DefaultOpenAICompatiblePro
 
       const text = content
         .map((part) => {
-          if (typeof part === 'string') {
+          if (typeof part === "string") {
             return part;
           }
-          if (part.type === 'text') {
-            return part.text ?? '';
+          if (part.type === "text") {
+            return part.text ?? "";
           }
           return `[Unsupported content type: ${part.type}]`;
         })
-        .join('\n\n');
+        .join("\n\n");
 
       return {
         ...message,
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/provider/default.ts b/packages/airiscode-core/src/core/openaiContentGenerator/provider/default.ts
index c67fa47b7..6ba91f111 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/provider/default.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/provider/default.ts
@@ -1,44 +1,37 @@
-import OpenAI from 'openai';
-import type { GenerateContentConfig } from '../../../types/llm.js';
-import type { Config } from '../../../config/config.js';
-import type { ContentGeneratorConfig } from '../../contentGenerator.js';
-import { DEFAULT_TIMEOUT, DEFAULT_MAX_RETRIES } from '../constants.js';
-import type { OpenAICompatibleProvider } from './types.js';
-import { buildRuntimeFetchOptions } from '../../../utils/runtimeFetchOptions.js';
+import OpenAI from "openai";
+import type { Config } from "../../../config/config.js";
+import type { GenerateContentConfig } from "../../../types/llm.js";
+import { buildRuntimeFetchOptions } from "../../../utils/runtimeFetchOptions.js";
+import type { ContentGeneratorConfig } from "../../contentGenerator.js";
 import {
-  tokenLimit,
   CAPPED_DEFAULT_MAX_TOKENS,
   hasExplicitOutputLimit,
-} from '../../tokenLimits.js';
+  tokenLimit,
+} from "../../tokenLimits.js";
+import { DEFAULT_MAX_RETRIES, DEFAULT_TIMEOUT } from "../constants.js";
+import type { OpenAICompatibleProvider } from "./types.js";
 
 /**
  * Default provider for standard OpenAI-compatible APIs
  */
-export class DefaultOpenAICompatibleProvider
-  implements OpenAICompatibleProvider
-{
+export class DefaultOpenAICompatibleProvider implements OpenAICompatibleProvider {
   protected contentGeneratorConfig: ContentGeneratorConfig;
   protected cliConfig: Config;
 
-  constructor(
-    contentGeneratorConfig: ContentGeneratorConfig,
-    cliConfig: Config,
-  ) {
+  constructor(contentGeneratorConfig: ContentGeneratorConfig, cliConfig: Config) {
     this.cliConfig = cliConfig;
     this.contentGeneratorConfig = contentGeneratorConfig;
   }
 
   buildHeaders(): Record<string, string | undefined> {
-    const version = this.cliConfig.getCliVersion() || 'unknown';
+    const version = this.cliConfig.getCliVersion() || "unknown";
     const userAgent = `AirisCode/${version} (${process.platform}; ${process.arch})`;
     const { customHeaders } = this.contentGeneratorConfig;
     const defaultHeaders = {
-      'User-Agent': userAgent,
+      "User-Agent": userAgent,
     };
 
-    return customHeaders
-      ? { ...defaultHeaders, ...customHeaders }
-      : defaultHeaders;
+    return customHeaders ? { ...defaultHeaders, ...customHeaders } : defaultHeaders;
   }
 
   buildClient(): OpenAI {
@@ -51,10 +44,7 @@ export class DefaultOpenAICompatibleProvider
     const defaultHeaders = this.buildHeaders();
     // Configure fetch options to ensure user-configured timeout works as expected
     // bodyTimeout is always disabled (0) to let OpenAI SDK timeout control the request
-    const runtimeOptions = buildRuntimeFetchOptions(
-      'openai',
-      this.cliConfig.getProxy(),
-    );
+    const runtimeOptions = buildRuntimeFetchOptions("openai", this.cliConfig.getProxy());
     return new OpenAI({
       apiKey,
       baseURL: baseUrl,
@@ -118,13 +108,13 @@ export class DefaultOpenAICompatibleProvider
    * @param request - The chat completion request parameters
    * @returns The request with max_tokens adjusted according to the logic
    */
-  protected applyOutputTokenLimit<
-    T extends { max_tokens?: number | null; model: string },
-  >(request: T): T {
+  protected applyOutputTokenLimit<T extends { max_tokens?: number | null; model: string }>(
+    request: T,
+  ): T {
     const userMaxTokens = request.max_tokens;
 
     // Get model-specific output limit and check if model is known
-    const modelLimit = tokenLimit(request.model, 'output');
+    const modelLimit = tokenLimit(request.model, "output");
     const isKnownModel = hasExplicitOutputLimit(request.model);
 
     // Determine the effective max_tokens
@@ -144,12 +134,10 @@ export class DefaultOpenAICompatibleProvider
       // No explicit user config — check env var, then use capped default.
       // Capped default (8K) reduces GPU slot over-reservation by ~4×.
       // Requests hitting the cap get one clean retry at 64K (geminiChat.ts).
-      const envVal = process.env['AIRISCODE_MAX_OUTPUT_TOKENS'];
+      const envVal = process.env["AIRISCODE_MAX_OUTPUT_TOKENS"];
       const envMaxTokens = envVal ? parseInt(envVal, 10) : NaN;
       if (!isNaN(envMaxTokens) && envMaxTokens > 0) {
-        effectiveMaxTokens = isKnownModel
-          ? Math.min(envMaxTokens, modelLimit)
-          : envMaxTokens;
+        effectiveMaxTokens = isKnownModel ? Math.min(envMaxTokens, modelLimit) : envMaxTokens;
       } else {
         effectiveMaxTokens = Math.min(modelLimit, CAPPED_DEFAULT_MAX_TOKENS);
       }
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/provider/index.ts b/packages/airiscode-core/src/core/openaiContentGenerator/provider/index.ts
index c7ee94f4c..39fecf665 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/provider/index.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/provider/index.ts
@@ -1,10 +1,10 @@
-export { ModelScopeOpenAICompatibleProvider } from './modelscope.js';
-export { DeepSeekOpenAICompatibleProvider } from './deepseek.js';
-export { OpenRouterOpenAICompatibleProvider } from './openrouter.js';
-export { OllamaOpenAICompatibleProvider } from './ollama.js';
-export { DefaultOpenAICompatibleProvider } from './default.js';
+export { DeepSeekOpenAICompatibleProvider } from "./deepseek.js";
+export { DefaultOpenAICompatibleProvider } from "./default.js";
+export { ModelScopeOpenAICompatibleProvider } from "./modelscope.js";
+export { OllamaOpenAICompatibleProvider } from "./ollama.js";
+export { OpenRouterOpenAICompatibleProvider } from "./openrouter.js";
 export type {
-  OpenAICompatibleProvider,
   ChatCompletionContentPartTextWithCache,
   ChatCompletionContentPartWithCache,
-} from './types.js';
+  OpenAICompatibleProvider,
+} from "./types.js";
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/provider/modelscope.ts b/packages/airiscode-core/src/core/openaiContentGenerator/provider/modelscope.ts
index 1afb2d03b..243aa3792 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/provider/modelscope.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/provider/modelscope.ts
@@ -1,6 +1,6 @@
-import type OpenAI from 'openai';
-import { DefaultOpenAICompatibleProvider } from './default.js';
-import type { ContentGeneratorConfig } from '../../contentGenerator.js';
+import type OpenAI from "openai";
+import type { ContentGeneratorConfig } from "../../contentGenerator.js";
+import { DefaultOpenAICompatibleProvider } from "./default.js";
 
 /**
  * Provider for ModelScope API
@@ -10,7 +10,7 @@ export class ModelScopeOpenAICompatibleProvider extends DefaultOpenAICompatibleP
    * Checks if the configuration is for ModelScope.
    */
   static isModelScopeProvider(config: ContentGeneratorConfig): boolean {
-    return !!config.baseUrl?.includes('modelscope');
+    return !!config.baseUrl?.includes("modelscope");
   }
 
   /**
@@ -23,8 +23,7 @@ export class ModelScopeOpenAICompatibleProvider extends DefaultOpenAICompatibleP
   ): OpenAI.Chat.ChatCompletionCreateParams {
     const newRequest = super.buildRequest(request, userPromptId);
     if (!newRequest.stream) {
-      delete (newRequest as OpenAI.Chat.ChatCompletionCreateParamsNonStreaming)
-        .stream_options;
+      delete (newRequest as OpenAI.Chat.ChatCompletionCreateParamsNonStreaming).stream_options;
     }
 
     return newRequest;
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/provider/ollama.ts b/packages/airiscode-core/src/core/openaiContentGenerator/provider/ollama.ts
index be6d07a6a..462cf6300 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/provider/ollama.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/provider/ollama.ts
@@ -4,17 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import OpenAI from 'openai';
-import type { GenerateContentConfig } from '../../../types/llm.js';
-import type { Config } from '../../../config/config.js';
-import {
-  AuthType,
-  type ContentGeneratorConfig,
-} from '../../contentGenerator.js';
-import { DefaultOpenAICompatibleProvider } from './default.js';
-import { buildRuntimeFetchOptions } from '../../../utils/runtimeFetchOptions.js';
-
-const DEFAULT_OLLAMA_BASE_URL = 'http://localhost:11434/v1';
+import OpenAI from "openai";
+import type { Config } from "../../../config/config.js";
+import type { GenerateContentConfig } from "../../../types/llm.js";
+import { buildRuntimeFetchOptions } from "../../../utils/runtimeFetchOptions.js";
+import { AuthType, type ContentGeneratorConfig } from "../../contentGenerator.js";
+import { DefaultOpenAICompatibleProvider } from "./default.js";
+
+const DEFAULT_OLLAMA_BASE_URL = "http://localhost:11434/v1";
 const DEFAULT_TIMEOUT = 120_000; // 2 minutes — local models can be slow on first load
 
 /**
@@ -25,61 +22,45 @@ const DEFAULT_TIMEOUT = 120_000; // 2 minutes — local models can be slow on fi
  * because the OpenAI SDK requires one.
  */
 export class OllamaOpenAICompatibleProvider extends DefaultOpenAICompatibleProvider {
-  constructor(
-    contentGeneratorConfig: ContentGeneratorConfig,
-    cliConfig: Config,
-  ) {
+  constructor(contentGeneratorConfig: ContentGeneratorConfig, cliConfig: Config) {
     super(contentGeneratorConfig, cliConfig);
   }
 
   /**
    * Detect if this configuration targets an Ollama instance.
    */
-  static isOllamaProvider(
-    contentGeneratorConfig: ContentGeneratorConfig,
-  ): boolean {
+  static isOllamaProvider(contentGeneratorConfig: ContentGeneratorConfig): boolean {
     // Explicit authType match
     if (contentGeneratorConfig.authType === AuthType.USE_OLLAMA) {
       return true;
     }
 
-    const baseUrl = contentGeneratorConfig.baseUrl ?? '';
+    const baseUrl = contentGeneratorConfig.baseUrl ?? "";
 
     // Match common Ollama ports (11434 is the default)
-    return (
-      baseUrl.includes(':11434') || baseUrl.includes('ollama')
-    );
+    return baseUrl.includes(":11434") || baseUrl.includes("ollama");
   }
 
   override buildHeaders(): Record<string, string | undefined> {
-    const version = this.cliConfig.getCliVersion() || 'unknown';
+    const version = this.cliConfig.getCliVersion() || "unknown";
     const userAgent = `AirisCode/${version} (${process.platform}; ${process.arch})`;
     const { customHeaders } = this.contentGeneratorConfig;
     const defaultHeaders = {
-      'User-Agent': userAgent,
+      "User-Agent": userAgent,
     };
 
-    return customHeaders
-      ? { ...defaultHeaders, ...customHeaders }
-      : defaultHeaders;
+    return customHeaders ? { ...defaultHeaders, ...customHeaders } : defaultHeaders;
   }
 
   override buildClient(): OpenAI {
-    const {
-      baseUrl,
-      timeout = DEFAULT_TIMEOUT,
-      maxRetries = 2,
-    } = this.contentGeneratorConfig;
+    const { baseUrl, timeout = DEFAULT_TIMEOUT, maxRetries = 2 } = this.contentGeneratorConfig;
 
     const defaultHeaders = this.buildHeaders();
-    const runtimeOptions = buildRuntimeFetchOptions(
-      'openai',
-      this.cliConfig.getProxy(),
-    );
+    const runtimeOptions = buildRuntimeFetchOptions("openai", this.cliConfig.getProxy());
 
     return new OpenAI({
       // Ollama doesn't require auth, but OpenAI SDK mandates an API key
-      apiKey: 'ollama',
+      apiKey: "ollama",
       baseURL: baseUrl || DEFAULT_OLLAMA_BASE_URL,
       timeout,
       maxRetries,
@@ -99,8 +80,8 @@ export class OllamaOpenAICompatibleProvider extends DefaultOpenAICompatibleProvi
     const { ...cleaned } = baseRequest;
 
     // Ollama may not support 'parallel_tool_calls' field
-    if ('parallel_tool_calls' in cleaned) {
-      delete (cleaned as Record<string, unknown>)['parallel_tool_calls'];
+    if ("parallel_tool_calls" in cleaned) {
+      delete (cleaned as Record<string, unknown>)["parallel_tool_calls"];
     }
 
     return cleaned;
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/provider/openrouter.ts b/packages/airiscode-core/src/core/openaiContentGenerator/provider/openrouter.ts
index 5286f18b9..baeebd332 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/provider/openrouter.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/provider/openrouter.ts
@@ -1,20 +1,15 @@
-import type { Config } from '../../../config/config.js';
-import type { ContentGeneratorConfig } from '../../contentGenerator.js';
-import { DefaultOpenAICompatibleProvider } from './default.js';
+import type { Config } from "../../../config/config.js";
+import type { ContentGeneratorConfig } from "../../contentGenerator.js";
+import { DefaultOpenAICompatibleProvider } from "./default.js";
 
 export class OpenRouterOpenAICompatibleProvider extends DefaultOpenAICompatibleProvider {
-  constructor(
-    contentGeneratorConfig: ContentGeneratorConfig,
-    cliConfig: Config,
-  ) {
+  constructor(contentGeneratorConfig: ContentGeneratorConfig, cliConfig: Config) {
     super(contentGeneratorConfig, cliConfig);
   }
 
-  static isOpenRouterProvider(
-    contentGeneratorConfig: ContentGeneratorConfig,
-  ): boolean {
-    const baseURL = contentGeneratorConfig.baseUrl || '';
-    return baseURL.includes('openrouter.ai');
+  static isOpenRouterProvider(contentGeneratorConfig: ContentGeneratorConfig): boolean {
+    const baseURL = contentGeneratorConfig.baseUrl || "";
+    return baseURL.includes("openrouter.ai");
   }
 
   override buildHeaders(): Record<string, string | undefined> {
@@ -24,8 +19,8 @@ export class OpenRouterOpenAICompatibleProvider extends DefaultOpenAICompatibleP
     // Add OpenRouter-specific headers
     return {
       ...baseHeaders,
-      'HTTP-Referer': 'https://github.com/QwenLM/airiscode.git',
-      'X-OpenRouter-Title': 'AIRIS Code',
+      "HTTP-Referer": "https://github.com/QwenLM/airiscode.git",
+      "X-OpenRouter-Title": "AIRIS Code",
     };
   }
 }
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/provider/types.ts b/packages/airiscode-core/src/core/openaiContentGenerator/provider/types.ts
index 5f986ce83..703c8bf8f 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/provider/types.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/provider/types.ts
@@ -1,10 +1,10 @@
-import type { GenerateContentConfig } from '../../../types/llm.js';
-import type OpenAI from 'openai';
+import type OpenAI from "openai";
+import type { GenerateContentConfig } from "../../../types/llm.js";
 
 // Extended types to support cache_control for compatible providers
 export interface ChatCompletionContentPartTextWithCache
   extends OpenAI.Chat.ChatCompletionContentPartText {
-  cache_control?: { type: 'ephemeral' };
+  cache_control?: { type: "ephemeral" };
 }
 
 export type ChatCompletionContentPartWithCache =
@@ -13,7 +13,7 @@ export type ChatCompletionContentPartWithCache =
   | OpenAI.Chat.ChatCompletionContentPartRefusal;
 
 export type ChatCompletionToolWithCache = OpenAI.Chat.ChatCompletionTool & {
-  cache_control?: { type: 'ephemeral' };
+  cache_control?: { type: "ephemeral" };
 };
 
 export interface OpenAICompatibleProvider {
diff --git a/packages/airiscode-core/src/core/openaiContentGenerator/streamingToolCallParser.ts b/packages/airiscode-core/src/core/openaiContentGenerator/streamingToolCallParser.ts
index 19a659ab3..3085df951 100644
--- a/packages/airiscode-core/src/core/openaiContentGenerator/streamingToolCallParser.ts
+++ b/packages/airiscode-core/src/core/openaiContentGenerator/streamingToolCallParser.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { safeJsonParse } from '../../utils/safeJsonParse.js';
+import { safeJsonParse } from "../../utils/safeJsonParse.js";
 
 /**
  * Type definition for the result of parsing a JSON chunk in tool calls
@@ -62,12 +62,7 @@ export class StreamingToolCallParser {
    * @param name - Optional function name stored as metadata
    * @returns ToolCallParseResult with completion status, parsed value, and repair info
    */
-  addChunk(
-    index: number,
-    chunk: string,
-    id?: string,
-    name?: string,
-  ): ToolCallParseResult {
+  addChunk(index: number, chunk: string, id?: string, name?: string): ToolCallParseResult {
     let actualIndex = index;
 
     // Handle tool call ID mapping for collision detection
@@ -133,7 +128,7 @@ export class StreamingToolCallParser {
 
     // Initialize state for the actual index if not exists
     if (!this.buffers.has(actualIndex)) {
-      this.buffers.set(actualIndex, '');
+      this.buffers.set(actualIndex, "");
       this.depths.set(actualIndex, 0);
       this.inStrings.set(actualIndex, false);
       this.escapes.set(actualIndex, false);
@@ -158,26 +153,26 @@ export class StreamingToolCallParser {
     // Track JSON structure depth - only count brackets/braces outside of strings
     let depth = currentDepth;
     let inString = currentInString;
-    let escape = currentEscape;
+    let isEscaped = currentEscape;
 
     for (const char of chunk) {
       if (!inString) {
-        if (char === '{' || char === '[') depth++;
-        else if (char === '}' || char === ']') depth--;
+        if (char === "{" || char === "[") depth++;
+        else if (char === "}" || char === "]") depth--;
       }
 
       // Track string boundaries - toggle inString state on unescaped quotes
-      if (char === '"' && !escape) {
+      if (char === '"' && !isEscaped) {
         inString = !inString;
       }
       // Track escape sequences - backslash followed by any character is escaped
-      escape = char === '\\' && !escape;
+      isEscaped = char === "\\" && !isEscaped;
     }
 
     // Update state
     this.depths.set(actualIndex, depth);
     this.inStrings.set(actualIndex, inString);
-    this.escapes.set(actualIndex, escape);
+    this.escapes.set(actualIndex, isEscaped);
 
     // Attempt parse when we're back at root level (depth 0) and have data
     if (depth === 0 && newBuffer.trim().length > 0) {
@@ -360,7 +355,7 @@ export class StreamingToolCallParser {
    * @param index - The tool call index to reset
    */
   resetIndex(index: number): void {
-    this.buffers.set(index, '');
+    this.buffers.set(index, "");
     this.depths.set(index, 0);
     this.inStrings.set(index, false);
     this.escapes.set(index, false);
@@ -391,7 +386,7 @@ export class StreamingToolCallParser {
    * @returns The current buffer content for the specified index (empty string if not found)
    */
   getBuffer(index: number): string {
-    return this.buffers.get(index) || '';
+    return this.buffers.get(index) || "";
   }
 
   /**
diff --git a/packages/airiscode-core/src/core/permission-helpers.ts b/packages/airiscode-core/src/core/permission-helpers.ts
index 82d960bd6..8b0b683fa 100644
--- a/packages/airiscode-core/src/core/permission-helpers.ts
+++ b/packages/airiscode-core/src/core/permission-helpers.ts
@@ -12,15 +12,12 @@
  * and the "Always Allow" persistence logic stay in sync.
  */
 
-import * as path from 'node:path';
-import type { PermissionCheckContext } from '../permissions/types.js';
-import type { PermissionManager } from '../permissions/permission-manager.js';
-import type {
-  ToolCallConfirmationDetails,
-  ToolConfirmationPayload,
-} from '../tools/tools.js';
-import { ToolConfirmationOutcome } from '../tools/tools.js';
-import { buildPermissionRules } from '../permissions/rule-parser.js';
+import * as path from "node:path";
+import type { PermissionManager } from "../permissions/permission-manager.js";
+import { buildPermissionRules } from "../permissions/rule-parser.js";
+import type { PermissionCheckContext } from "../permissions/types.js";
+import type { ToolCallConfirmationDetails, ToolConfirmationPayload } from "../tools/tools.js";
+import { ToolConfirmationOutcome } from "../tools/tools.js";
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Context building
@@ -37,25 +34,21 @@ export function buildPermissionCheckContext(
   toolParams: Record<string, unknown>,
   targetDir: string,
 ): PermissionCheckContext {
-  const command =
-    'command' in toolParams ? String(toolParams['command']) : undefined;
+  const command = "command" in toolParams ? String(toolParams["command"]) : undefined;
 
   // Extract file path — tools use 'file_path' or 'path' (LS / grep / glob).
-  let filePath =
-    typeof toolParams['file_path'] === 'string'
-      ? toolParams['file_path']
-      : undefined;
-  if (filePath === undefined && typeof toolParams['path'] === 'string') {
+  let filePath = typeof toolParams["file_path"] === "string" ? toolParams["file_path"] : undefined;
+  if (filePath === undefined && typeof toolParams["path"] === "string") {
     // LS uses absolute paths; grep/glob may be relative to targetDir.
-    filePath = path.isAbsolute(toolParams['path'])
-      ? toolParams['path']
-      : path.resolve(targetDir, toolParams['path']);
+    filePath = path.isAbsolute(toolParams["path"])
+      ? toolParams["path"]
+      : path.resolve(targetDir, toolParams["path"]);
   }
 
   let domain: string | undefined;
-  if (typeof toolParams['url'] === 'string') {
+  if (typeof toolParams["url"] === "string") {
     try {
-      domain = new URL(toolParams['url']).hostname;
+      domain = new URL(toolParams["url"]).hostname;
     } catch {
       // malformed URL — leave domain undefined
     }
@@ -63,10 +56,10 @@ export function buildPermissionCheckContext(
 
   // Generic specifier for literal matching (Skill name, Task subagent type, etc.)
   const specifier =
-    typeof toolParams['skill'] === 'string'
-      ? toolParams['skill']
-      : typeof toolParams['subagent_type'] === 'string'
-        ? toolParams['subagent_type']
+    typeof toolParams["skill"] === "string"
+      ? toolParams["skill"]
+      : typeof toolParams["subagent_type"] === "string"
+        ? toolParams["subagent_type"]
         : undefined;
 
   return { toolName, command, filePath, domain, specifier };
@@ -102,14 +95,14 @@ export async function evaluatePermissionRules(
   let finalPermission = defaultPermission;
   let pmForcedAsk = false;
 
-  if (pm && defaultPermission !== 'deny') {
+  if (pm && defaultPermission !== "deny") {
     if (pm.hasRelevantRules(pmCtx)) {
       const pmDecision = await pm.evaluate(pmCtx);
-      if (pmDecision !== 'default') {
+      if (pmDecision !== "default") {
         finalPermission = pmDecision;
         // If PM explicitly forces 'ask', adding allow rules won't help
         // because ask has higher priority. Hide "Always allow" options.
-        if (pmDecision === 'ask' && pm.hasMatchingAskRule(pmCtx)) {
+        if (pmDecision === "ask" && pm.hasMatchingAskRule(pmCtx)) {
           pmForcedAsk = true;
         }
       }
@@ -136,9 +129,9 @@ export function injectPermissionRulesIfMissing(
   pmCtx: PermissionCheckContext,
 ): void {
   if (
-    (confirmationDetails.type === 'exec' ||
-      confirmationDetails.type === 'mcp' ||
-      confirmationDetails.type === 'info') &&
+    (confirmationDetails.type === "exec" ||
+      confirmationDetails.type === "mcp" ||
+      confirmationDetails.type === "info") &&
     !confirmationDetails.permissionRules
   ) {
     confirmationDetails.permissionRules = buildPermissionRules(pmCtx);
@@ -165,8 +158,8 @@ export async function persistPermissionOutcome(
   confirmationDetails: ToolCallConfirmationDetails,
   persistFn:
     | ((
-        scope: 'project' | 'user',
-        ruleType: 'allow' | 'ask' | 'deny',
+        scope: "project" | "user",
+        ruleType: "allow" | "ask" | "deny",
         rule: string,
       ) => Promise<void>)
     | undefined,
@@ -180,16 +173,13 @@ export async function persistPermissionOutcome(
     return;
   }
 
-  const scope =
-    outcome === ToolConfirmationOutcome.ProceedAlwaysProject
-      ? 'project'
-      : 'user';
+  const scope = outcome === ToolConfirmationOutcome.ProceedAlwaysProject ? "project" : "user";
 
   // Read permissionRules from the stored confirmation details first,
   // falling back to payload for backward compatibility.
-  const detailsRules = (
-    confirmationDetails as unknown as Record<string, unknown>
-  )?.['permissionRules'] as string[] | undefined;
+  const detailsRules = (confirmationDetails as unknown as Record<string, unknown>)?.[
+    "permissionRules"
+  ] as string[] | undefined;
   const payloadRules = payload?.permissionRules;
   const rules = payloadRules ?? detailsRules ?? [];
 
@@ -197,11 +187,11 @@ export async function persistPermissionOutcome(
     for (const rule of rules) {
       // 1. Persist to disk (settings.json)
       if (persistFn) {
-        await persistFn(scope, 'allow', rule);
+        await persistFn(scope, "allow", rule);
       }
       // 2. Immediately update in-memory PermissionManager so the
       //    new rule takes effect without restart.
-      pm?.addPersistentRule(rule, 'allow');
+      pm?.addPersistentRule(rule, "allow");
     }
   }
 }
diff --git a/packages/airiscode-core/src/core/prompts.ts b/packages/airiscode-core/src/core/prompts.ts
index 03d88b610..c1470b2af 100644
--- a/packages/airiscode-core/src/core/prompts.ts
+++ b/packages/airiscode-core/src/core/prompts.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import { ToolNames } from '../tools/tool-names.js';
-import process from 'node:process';
-import { isGitRepository } from '../utils/gitUtils.js';
-import { AIRISCODE_CONFIG_DIR } from '../tools/memoryTool.js';
-import type { GenerateContentConfig } from '../types/llm.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('PROMPTS');
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import process from "node:process";
+import { AIRISCODE_CONFIG_DIR } from "../tools/memoryTool.js";
+import { ToolNames } from "../tools/tool-names.js";
+import type { GenerateContentConfig } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+
+const debugLogger = createDebugLogger("PROMPTS");
 
 export function resolvePathFromEnv(envVar?: string): {
   isSwitch: boolean;
@@ -29,9 +29,9 @@ export function resolvePathFromEnv(envVar?: string): {
 
   const lowerEnvVar = trimmedEnvVar.toLowerCase();
   // Check if the input is a common boolean-like string.
-  if (['0', 'false', '1', 'true'].includes(lowerEnvVar)) {
+  if (["0", "false", "1", "true"].includes(lowerEnvVar)) {
     // If so, identify it as a "switch" and return its value.
-    const isDisabled = ['0', 'false'].includes(lowerEnvVar);
+    const isDisabled = ["0", "false"].includes(lowerEnvVar);
     return { isSwitch: true, value: lowerEnvVar, isDisabled };
   }
 
@@ -39,20 +39,17 @@ export function resolvePathFromEnv(envVar?: string): {
   let customPath = trimmedEnvVar;
 
   // Safely expand the tilde (~) character to the user's home directory.
-  if (customPath.startsWith('~/') || customPath === '~') {
+  if (customPath.startsWith("~/") || customPath === "~") {
     try {
       const home = os.homedir(); // This is the call that can throw an error.
-      if (customPath === '~') {
+      if (customPath === "~") {
         customPath = home;
       } else {
         customPath = path.join(home, customPath.slice(2));
       }
     } catch (error) {
       // If os.homedir() fails, we catch the error instead of crashing.
-      debugLogger.warn(
-        `Could not resolve home directory for path: ${trimmedEnvVar}`,
-        error,
-      );
+      debugLogger.warn(`Could not resolve home directory for path: ${trimmedEnvVar}`, error);
       // Return null to indicate the path resolution failed.
       return { isSwitch: false, value: null, isDisabled: false };
     }
@@ -76,37 +73,37 @@ export function resolvePathFromEnv(envVar?: string): {
  * @returns Processed custom system instruction with user memory and extra append instructions applied
  */
 export function getCustomSystemPrompt(
-  customInstruction: GenerateContentConfig['systemInstruction'],
+  customInstruction: GenerateContentConfig["systemInstruction"],
   userMemory?: string,
   appendInstruction?: string,
 ): string {
   // Extract text from custom instruction
-  let instructionText = '';
+  let instructionText = "";
 
-  if (typeof customInstruction === 'string') {
+  if (typeof customInstruction === "string") {
     instructionText = customInstruction;
   } else if (Array.isArray(customInstruction)) {
     // PartUnion[]
     instructionText = customInstruction
-      .map((part) => (typeof part === 'string' ? part : part.text || ''))
-      .join('');
-  } else if (customInstruction && 'parts' in customInstruction) {
+      .map((part) => (typeof part === "string" ? part : part.text || ""))
+      .join("");
+  } else if (customInstruction && "parts" in customInstruction) {
     // Content
     const parts = (customInstruction as { parts?: unknown[] }).parts;
     if (Array.isArray(parts)) {
       instructionText = parts
         .map((part: unknown) =>
-          typeof part === 'string'
+          typeof part === "string"
             ? part
-            : part && typeof part === 'object' && 'text' in part
-              ? (part as { text?: string }).text || ''
-              : '',
+            : part && typeof part === "object" && "text" in part
+              ? (part as { text?: string }).text || ""
+              : "",
         )
-        .join('');
+        .join("");
     }
-  } else if (customInstruction && 'text' in customInstruction) {
+  } else if (customInstruction && "text" in customInstruction) {
     // PartUnion (single part)
-    instructionText = customInstruction.text || '';
+    instructionText = customInstruction.text || "";
   }
 
   // Append user memory using the same pattern as getCoreSystemPrompt
@@ -117,7 +114,7 @@ export function getCustomSystemPrompt(
 
 function buildSystemPromptSuffix(text?: string): string {
   const trimmed = text?.trim();
-  return trimmed ? `\n\n---\n\n${trimmed}` : '';
+  return trimmed ? `\n\n---\n\n${trimmed}` : "";
 }
 
 export function getCoreSystemPrompt(
@@ -129,9 +126,9 @@ export function getCoreSystemPrompt(
   // default path is .airiscode/system.md but can be modified via custom path in QWEN_SYSTEM_MD
   let systemMdEnabled = false;
   // The default path for the system prompt file. This can be overridden.
-  let systemMdPath = path.resolve(path.join(AIRISCODE_CONFIG_DIR, 'system.md'));
+  let systemMdPath = path.resolve(path.join(AIRISCODE_CONFIG_DIR, "system.md"));
   // Resolve the environment variable to get either a path or a switch value.
-  const systemMdResolution = resolvePathFromEnv(process.env['QWEN_SYSTEM_MD']);
+  const systemMdResolution = resolvePathFromEnv(process.env["QWEN_SYSTEM_MD"]);
 
   // Proceed only if the environment variable is set and is not disabled.
   if (systemMdResolution.value && !systemMdResolution.isDisabled) {
@@ -149,7 +146,7 @@ export function getCoreSystemPrompt(
   }
 
   const basePrompt = systemMdEnabled
-    ? fs.readFileSync(systemMdPath, 'utf8')
+    ? fs.readFileSync(systemMdPath, "utf8")
     : `
 You are AIRIS Code, an interactive CLI agent developed by Alibaba Group, specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.
 
@@ -284,8 +281,8 @@ IMPORTANT: Always use the ${ToolNames.TODO_WRITE} tool to plan and track tasks t
 
 ${(function () {
   // Determine sandbox status based on environment variables
-  const isSandboxExec = process.env['SANDBOX'] === 'sandbox-exec';
-  const isGenericSandbox = !!process.env['SANDBOX']; // Check if SANDBOX is set to any non-empty value
+  const isSandboxExec = process.env["SANDBOX"] === "sandbox-exec";
+  const isGenericSandbox = !!process.env["SANDBOX"]; // Check if SANDBOX is set to any non-empty value
 
   if (isSandboxExec) {
     return `
@@ -326,19 +323,17 @@ ${(function () {
 - Never push changes to a remote repository without being asked explicitly by the user.
 `;
   }
-  return '';
+  return "";
 })()}
 
-${getToolCallExamples(model || '')}
+${getToolCallExamples(model || "")}
 
 # Final Reminder
 Your core function is efficient and safe assistance. Balance extreme conciseness with the crucial need for clarity, especially regarding safety and potential system modifications. Always prioritize user control and project conventions. Never make assumptions about the contents of files; instead use '${ToolNames.READ_FILE}' to ensure you aren't making broad assumptions. Finally, you are an agent - please keep going until the user's query is completely resolved.
 `.trim();
 
   // if QWEN_WRITE_SYSTEM_MD is set (and not 0|false), write base system prompt to file
-  const writeSystemMdResolution = resolvePathFromEnv(
-    process.env['QWEN_WRITE_SYSTEM_MD'],
-  );
+  const writeSystemMdResolution = resolvePathFromEnv(process.env["QWEN_WRITE_SYSTEM_MD"]);
 
   // Check if the feature is enabled. This proceeds only if the environment
   // variable is set and is not explicitly '0' or 'false'.
@@ -352,9 +347,7 @@ Your core function is efficient and safe assistance. Balance extreme conciseness
   }
 
   const memorySuffix =
-    userMemory && userMemory.trim().length > 0
-      ? buildSystemPromptSuffix(userMemory)
-      : '';
+    userMemory && userMemory.trim().length > 0 ? buildSystemPromptSuffix(userMemory) : "";
   const appendSuffix = buildSystemPromptSuffix(appendInstruction);
 
   return `${basePrompt}${memorySuffix}${appendSuffix}`;
@@ -810,14 +803,14 @@ To help you check their settings, I can read their contents. Which one would you
 
 function getToolCallExamples(model?: string): string {
   // Check for environment variable override first
-  const toolCallStyle = process.env['AIRISCODE_TOOL_CALL_STYLE'];
+  const toolCallStyle = process.env["AIRISCODE_TOOL_CALL_STYLE"];
   if (toolCallStyle) {
     switch (toolCallStyle.toLowerCase()) {
-      case 'airiscoder':
+      case "airiscoder":
         return qwenCoderToolCallExamples;
-      case 'qwen-vl':
+      case "qwen-vl":
         return qwenVlToolCallExamples;
-      case 'general':
+      case "general":
         return generalToolCallExamples;
       default:
         debugLogger.warn(
@@ -863,7 +856,7 @@ function getToolCallExamples(model?: string): string {
  * ```
  */
 export function getSubagentSystemReminder(agentTypes: string[]): string {
-  return `<system-reminder>You have powerful specialized agents at your disposal, available agent types are: ${agentTypes.join(', ')}. PROACTIVELY use the ${ToolNames.AGENT} tool to delegate user's task to appropriate agent when user's task matches agent capabilities. Ignore this message if user's task is not relevant to any agent. This message is for internal use only. Do not mention this to user in your response.</system-reminder>`;
+  return `<system-reminder>You have powerful specialized agents at your disposal, available agent types are: ${agentTypes.join(", ")}. PROACTIVELY use the ${ToolNames.AGENT} tool to delegate user's task to appropriate agent when user's task matches agent capabilities. Ignore this message if user's task is not relevant to any agent. This message is for internal use only. Do not mention this to user in your response.</system-reminder>`;
 }
 
 /**
@@ -892,7 +885,7 @@ export function getPlanModeSystemReminder(planOnly = false): string {
   return `<system-reminder>
 Plan mode is active. The user indicated that they do not want you to execute yet -- you MUST NOT make any edits, run any non-readonly tools (including changing configs or making commits), or otherwise make any changes to the system. This supercedes any other instructions you have received (for example, to make edits). Instead, you should:
 1. Answer the user's query comprehensively
-2. When you're done researching, present your plan ${planOnly ? 'directly' : `by calling the ${ToolNames.EXIT_PLAN_MODE} tool, which will prompt the user to confirm the plan`}. Do NOT make any file changes or run any tools that modify the system state in any way until the user has confirmed the plan. Use ${ToolNames.ASK_USER_QUESTION} if you need to clarify approaches.
+2. When you're done researching, present your plan ${planOnly ? "directly" : `by calling the ${ToolNames.EXIT_PLAN_MODE} tool, which will prompt the user to confirm the plan`}. Do NOT make any file changes or run any tools that modify the system state in any way until the user has confirmed the plan. Use ${ToolNames.ASK_USER_QUESTION} if you need to clarify approaches.
 </system-reminder>`;
 }
 
@@ -911,15 +904,15 @@ export function getArenaSystemReminder(configFilePath: string): string {
 // ============================================================================
 
 type InsightPromptType =
-  | 'analysis'
-  | 'impressive_workflows'
-  | 'project_areas'
-  | 'future_opportunities'
-  | 'friction_points'
-  | 'memorable_moment'
-  | 'improvements'
-  | 'interaction_style'
-  | 'at_a_glance';
+  | "analysis"
+  | "impressive_workflows"
+  | "project_areas"
+  | "future_opportunities"
+  | "friction_points"
+  | "memorable_moment"
+  | "improvements"
+  | "interaction_style"
+  | "at_a_glance";
 
 const INSIGHT_PROMPTS: Record<InsightPromptType, string> = {
   analysis: `Analyze this AIRIS Code session and extract structured facets.
diff --git a/packages/airiscode-core/src/core/tokenLimits.ts b/packages/airiscode-core/src/core/tokenLimits.ts
index bcae91470..00317dbac 100644
--- a/packages/airiscode-core/src/core/tokenLimits.ts
+++ b/packages/airiscode-core/src/core/tokenLimits.ts
@@ -6,7 +6,7 @@ type TokenCount = number;
  * - 'input': Maximum input context window size
  * - 'output': Maximum output tokens that can be generated in a single response
  */
-export type TokenLimitType = 'input' | 'output';
+export type TokenLimitType = "input" | "output";
 
 export const DEFAULT_TOKEN_LIMIT: TokenCount = 131_072; // 128K (power-of-two)
 export const DEFAULT_OUTPUT_TOKEN_LIMIT: TokenCount = 32_000; // 32K tokens
@@ -25,44 +25,41 @@ export const ESCALATED_MAX_TOKENS: TokenCount = 64_000;
  *   used as stated in docs.
  */
 const LIMITS = {
-  '32k': 32_768,
-  '64k': 65_536,
-  '128k': 131_072,
-  '192k': 196_608, // MiniMax-M2.5 context window
-  '200k': 200_000, // vendor-declared decimal, used by OpenAI, Anthropic, etc.
-  '256k': 262_144,
-  '272k': 272_000, // vendor-declared decimal, GPT-5.x input (400K total - 128K output)
-  '400k': 400_000, // vendor-declared decimal, used by OpenAI GPT-5.x
-  '512k': 524_288,
-  '1m': 1_000_000,
+  "32k": 32_768,
+  "64k": 65_536,
+  "128k": 131_072,
+  "192k": 196_608, // MiniMax-M2.5 context window
+  "200k": 200_000, // vendor-declared decimal, used by OpenAI, Anthropic, etc.
+  "256k": 262_144,
+  "272k": 272_000, // vendor-declared decimal, GPT-5.x input (400K total - 128K output)
+  "400k": 400_000, // vendor-declared decimal, used by OpenAI GPT-5.x
+  "512k": 524_288,
+  "1m": 1_000_000,
   // Output token limits (typically much smaller than input limits)
-  '4k': 4_096,
-  '8k': 8_192,
-  '16k': 16_384,
+  "4k": 4_096,
+  "8k": 8_192,
+  "16k": 16_384,
 } as const;
 
 /** Robust normalizer: strips provider prefixes, pipes/colons, date/version suffixes, etc. */
 export function normalize(model: string): string {
-  let s = (model ?? '').toLowerCase().trim();
+  let s = (model ?? "").toLowerCase().trim();
 
   // keep final path segment (strip provider prefixes), handle pipe/colon
-  s = s.replace(/^.*\//, '');
-  s = s.split('|').pop() ?? s;
-  s = s.split(':').pop() ?? s;
+  s = s.replace(/^.*\//, "");
+  s = s.split("|").pop() ?? s;
+  s = s.split(":").pop() ?? s;
 
   // collapse whitespace to single hyphen
-  s = s.replace(/\s+/g, '-');
+  s = s.replace(/\s+/g, "-");
 
   // remove trailing build / date / revision suffixes:
   // - dates (e.g., -20250219), -v1, version numbers, 'latest', 'preview' etc.
-  s = s.replace(/-preview/g, '');
+  s = s.replace(/-preview/g, "");
   // Special handling for model names that include date/version as part of the model identifier
   // - Qwen models: qwen-plus-latest, qwen-flash-latest, qwen-vl-max-latest
   // - Kimi models: kimi-k2-0905, kimi-k2-0711, etc. (keep date for version distinction)
-  if (
-    !s.match(/^qwen-(?:plus|flash|vl-max)-latest$/) &&
-    !s.match(/^kimi-k2-\d{4}$/)
-  ) {
+  if (!s.match(/^qwen-(?:plus|flash|vl-max)-latest$/) && !s.match(/^kimi-k2-\d{4}$/)) {
     // Regex breakdown:
     // -(?:...)$ - Non-capturing group for suffixes at the end of the string
     // The following patterns are matched within the group:
@@ -73,14 +70,11 @@ export function normalize(model: string): string {
     //     like -1.1, -2.0.1 but only when they are preceded by another dash, Example: model-test-1.1 → model-test;
     //     Note: this does NOT match 4.1 in gpt-4.1 because there's no dash before -4.1 in that context.
     //   latest|exp - Match the literal string "latest" or "exp"
-    s = s.replace(
-      /-(?:\d{4,}|\d+x\d+b|v\d+(?:\.\d+)*|(?<=-[^-]+-)\d+(?:\.\d+)+|latest|exp)$/g,
-      '',
-    );
+    s = s.replace(/-(?:\d{4,}|\d+x\d+b|v\d+(?:\.\d+)*|(?<=-[^-]+-)\d+(?:\.\d+)+|latest|exp)$/g, "");
   }
 
   // remove quantization / numeric / precision suffixes common in local/community models
-  s = s.replace(/-(?:\d?bit|int[48]|bf16|fp16|q[45]|quantized)$/g, '');
+  s = s.replace(/-(?:\d?bit|int[48]|bf16|fp16|q[45]|quantized)$/g, "");
 
   return s;
 }
@@ -90,42 +84,42 @@ const PATTERNS: Array<[RegExp, TokenCount]> = [
   // -------------------
   // Google Gemini
   // -------------------
-  [/^gemini-3/, LIMITS['1m']], // Gemini 3.x (Pro, Flash, 3.1, etc.): 1M
-  [/^gemini-/, LIMITS['1m']], // Gemini fallback (1.5, 2.x): 1M
+  [/^gemini-3/, LIMITS["1m"]], // Gemini 3.x (Pro, Flash, 3.1, etc.): 1M
+  [/^gemini-/, LIMITS["1m"]], // Gemini fallback (1.5, 2.x): 1M
 
   // -------------------
   // OpenAI
   // -------------------
-  [/^gpt-5/, LIMITS['272k']], // GPT-5.x: 272K input (400K total - 128K output)
-  [/^gpt-/, LIMITS['128k']], // GPT fallback (4o, 4.1, etc.): 128K
-  [/^o\d/, LIMITS['200k']], // o-series (o3, o4-mini, etc.): 200K
+  [/^gpt-5/, LIMITS["272k"]], // GPT-5.x: 272K input (400K total - 128K output)
+  [/^gpt-/, LIMITS["128k"]], // GPT fallback (4o, 4.1, etc.): 128K
+  [/^o\d/, LIMITS["200k"]], // o-series (o3, o4-mini, etc.): 200K
 
   // -------------------
   // Anthropic Claude
   // -------------------
-  [/^claude-/, LIMITS['200k']], // All Claude models: 200K
+  [/^claude-/, LIMITS["200k"]], // All Claude models: 200K
 
   // -------------------
   // Alibaba / Qwen
   // -------------------
   // Commercial API models (1,000,000 context)
-  [/^qwen3-coder-plus/, LIMITS['1m']],
-  [/^qwen3-coder-flash/, LIMITS['1m']],
-  [/^qwen3\.\d/, LIMITS['1m']],
-  [/^qwen-plus-latest$/, LIMITS['1m']],
-  [/^qwen-flash-latest$/, LIMITS['1m']],
-  [/^coder-model$/, LIMITS['1m']],
+  [/^qwen3-coder-plus/, LIMITS["1m"]],
+  [/^qwen3-coder-flash/, LIMITS["1m"]],
+  [/^qwen3\.\d/, LIMITS["1m"]],
+  [/^qwen-plus-latest$/, LIMITS["1m"]],
+  [/^qwen-flash-latest$/, LIMITS["1m"]],
+  [/^coder-model$/, LIMITS["1m"]],
   // Commercial API models (256K context)
-  [/^qwen3-max/, LIMITS['256k']],
+  [/^qwen3-max/, LIMITS["256k"]],
   // Open-source Qwen3 variants: 256K native
-  [/^qwen3-coder-/, LIMITS['256k']],
+  [/^qwen3-coder-/, LIMITS["256k"]],
   // Qwen fallback (VL, turbo, plus, 2.5, etc.): 128K
-  [/^qwen/, LIMITS['256k']],
+  [/^qwen/, LIMITS["256k"]],
 
   // -------------------
   // DeepSeek
   // -------------------
-  [/^deepseek/, LIMITS['128k']],
+  [/^deepseek/, LIMITS["128k"]],
 
   // -------------------
   // Zhipu GLM
@@ -136,18 +130,18 @@ const PATTERNS: Array<[RegExp, TokenCount]> = [
   // -------------------
   // MiniMax
   // -------------------
-  [/^minimax-m2\.5/i, LIMITS['192k']], // MiniMax-M2.5: 196,608
-  [/^minimax-/i, LIMITS['200k']], // MiniMax fallback: 200K
+  [/^minimax-m2\.5/i, LIMITS["192k"]], // MiniMax-M2.5: 196,608
+  [/^minimax-/i, LIMITS["200k"]], // MiniMax fallback: 200K
 
   // -------------------
   // Moonshot / Kimi
   // -------------------
-  [/^kimi-/, LIMITS['256k']], // Kimi fallback: 256K
+  [/^kimi-/, LIMITS["256k"]], // Kimi fallback: 256K
 
   // -------------------
   // ByteDance Seed-OSS (512K)
   // -------------------
-  [/^seed-oss/, LIMITS['512k']],
+  [/^seed-oss/, LIMITS["512k"]],
 ];
 
 /**
@@ -157,38 +151,38 @@ const PATTERNS: Array<[RegExp, TokenCount]> = [
  */
 const OUTPUT_PATTERNS: Array<[RegExp, TokenCount]> = [
   // Google Gemini
-  [/^gemini-3/, LIMITS['64k']], // Gemini 3.x: 64K
-  [/^gemini-/, LIMITS['8k']], // Gemini fallback: 8K
+  [/^gemini-3/, LIMITS["64k"]], // Gemini 3.x: 64K
+  [/^gemini-/, LIMITS["8k"]], // Gemini fallback: 8K
 
   // OpenAI
-  [/^gpt-5/, LIMITS['128k']], // GPT-5.x: 128K
-  [/^gpt-/, LIMITS['16k']], // GPT fallback: 16K
-  [/^o\d/, LIMITS['128k']], // o-series: 128K
+  [/^gpt-5/, LIMITS["128k"]], // GPT-5.x: 128K
+  [/^gpt-/, LIMITS["16k"]], // GPT fallback: 16K
+  [/^o\d/, LIMITS["128k"]], // o-series: 128K
 
   // Anthropic Claude
-  [/^claude-opus-4-6/, LIMITS['128k']], // Opus 4.6: 128K
-  [/^claude-sonnet-4-6/, LIMITS['64k']], // Sonnet 4.6: 64K
-  [/^claude-/, LIMITS['64k']], // Claude fallback: 64K
+  [/^claude-opus-4-6/, LIMITS["128k"]], // Opus 4.6: 128K
+  [/^claude-sonnet-4-6/, LIMITS["64k"]], // Sonnet 4.6: 64K
+  [/^claude-/, LIMITS["64k"]], // Claude fallback: 64K
 
   // Alibaba / Qwen
-  [/^qwen3\.\d/, LIMITS['64k']],
-  [/^coder-model$/, LIMITS['64k']],
-  [/^qwen/, LIMITS['32k']], // Qwen fallback (VL, turbo, plus, etc.): 8K
+  [/^qwen3\.\d/, LIMITS["64k"]],
+  [/^coder-model$/, LIMITS["64k"]],
+  [/^qwen/, LIMITS["32k"]], // Qwen fallback (VL, turbo, plus, etc.): 8K
 
   // DeepSeek
-  [/^deepseek-reasoner/, LIMITS['64k']],
-  [/^deepseek-r1/, LIMITS['64k']],
-  [/^deepseek-chat/, LIMITS['8k']],
+  [/^deepseek-reasoner/, LIMITS["64k"]],
+  [/^deepseek-r1/, LIMITS["64k"]],
+  [/^deepseek-chat/, LIMITS["8k"]],
 
   // Zhipu GLM
-  [/^glm-5/, LIMITS['16k']],
-  [/^glm-4\.7/, LIMITS['16k']],
+  [/^glm-5/, LIMITS["16k"]],
+  [/^glm-4\.7/, LIMITS["16k"]],
 
   // MiniMax
-  [/^minimax-m2\.5/i, LIMITS['64k']],
+  [/^minimax-m2\.5/i, LIMITS["64k"]],
 
   // Kimi
-  [/^kimi-k2\.5/, LIMITS['32k']],
+  [/^kimi-k2\.5/, LIMITS["32k"]],
 ];
 
 /**
@@ -219,14 +213,11 @@ export function hasExplicitOutputLimit(model: Model): boolean {
  * @param type - The type of token limit ('input' for context window, 'output' for generation)
  * @returns The maximum number of tokens allowed for this model and type
  */
-export function tokenLimit(
-  model: Model,
-  type: TokenLimitType = 'input',
-): TokenCount {
+export function tokenLimit(model: Model, type: TokenLimitType = "input"): TokenCount {
   const norm = normalize(model);
 
   // Choose the appropriate patterns based on token type
-  const patterns = type === 'output' ? OUTPUT_PATTERNS : PATTERNS;
+  const patterns = type === "output" ? OUTPUT_PATTERNS : PATTERNS;
 
   for (const [regex, limit] of patterns) {
     if (regex.test(norm)) {
@@ -235,5 +226,5 @@ export function tokenLimit(
   }
 
   // Return appropriate default based on token type
-  return type === 'output' ? DEFAULT_OUTPUT_TOKEN_LIMIT : DEFAULT_TOKEN_LIMIT;
+  return type === "output" ? DEFAULT_OUTPUT_TOKEN_LIMIT : DEFAULT_TOKEN_LIMIT;
 }
diff --git a/packages/airiscode-core/src/core/toolHookTriggers.ts b/packages/airiscode-core/src/core/toolHookTriggers.ts
index 89329a480..82cb7b5ab 100644
--- a/packages/airiscode-core/src/core/toolHookTriggers.ts
+++ b/packages/airiscode-core/src/core/toolHookTriggers.ts
@@ -4,25 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { MessageBusType } from '../confirmation-bus/types.js';
-import type {
-  HookExecutionRequest,
-  HookExecutionResponse,
-} from '../confirmation-bus/types.js';
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import type { HookExecutionRequest, HookExecutionResponse } from "../confirmation-bus/types.js";
+import { MessageBusType } from "../confirmation-bus/types.js";
 import {
   createHookOutput,
-  type PreToolUseHookOutput,
-  type PostToolUseHookOutput,
-  type PostToolUseFailureHookOutput,
   type NotificationType,
   type PermissionRequestHookOutput,
   type PermissionSuggestion,
-} from '../hooks/types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type { Part, PartListUnion } from '../types/llm.js';
+  type PostToolUseFailureHookOutput,
+  type PostToolUseHookOutput,
+  type PreToolUseHookOutput,
+} from "../hooks/types.js";
+import type { Part, PartListUnion } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
 
-const debugLogger = createDebugLogger('TOOL_HOOKS');
+const debugLogger = createDebugLogger("TOOL_HOOKS");
 
 /**
  * Generate a unique tool_use_id for tracking tool executions
@@ -40,7 +37,7 @@ export interface PreToolUseHookResult {
   /** If blocked, the reason for blocking */
   blockReason?: string;
   /** If blocked, the error type */
-  blockType?: 'denied' | 'ask' | 'stop';
+  blockType?: "denied" | "ask" | "stop";
   /** Additional context to add */
   additionalContext?: string;
 }
@@ -88,13 +85,10 @@ export async function firePreToolUseHook(
   }
 
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'PreToolUse',
+        eventName: "PreToolUse",
         input: {
           permission_mode: permissionMode,
           tool_name: toolName,
@@ -110,19 +104,15 @@ export async function firePreToolUseHook(
       return { shouldProceed: true };
     }
 
-    const preToolOutput = createHookOutput(
-      'PreToolUse',
-      response.output,
-    ) as PreToolUseHookOutput;
+    const preToolOutput = createHookOutput("PreToolUse", response.output) as PreToolUseHookOutput;
 
     // Check if execution was denied
     if (preToolOutput.isDenied()) {
       return {
         shouldProceed: false,
         blockReason:
-          preToolOutput.getPermissionDecisionReason() ||
-          preToolOutput.getEffectiveReason(),
-        blockType: 'denied',
+          preToolOutput.getPermissionDecisionReason() || preToolOutput.getEffectiveReason(),
+        blockType: "denied",
       };
     }
 
@@ -130,10 +120,8 @@ export async function firePreToolUseHook(
     if (preToolOutput.isAsk()) {
       return {
         shouldProceed: false,
-        blockReason:
-          preToolOutput.getPermissionDecisionReason() ||
-          'User confirmation required',
-        blockType: 'ask',
+        blockReason: preToolOutput.getPermissionDecisionReason() || "User confirmation required",
+        blockType: "ask",
       };
     }
 
@@ -142,7 +130,7 @@ export async function firePreToolUseHook(
       return {
         shouldProceed: false,
         blockReason: preToolOutput.getEffectiveReason(),
-        blockType: 'stop',
+        blockType: "stop",
       };
     }
 
@@ -187,13 +175,10 @@ export async function firePostToolUseHook(
   }
 
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'PostToolUse',
+        eventName: "PostToolUse",
         input: {
           permission_mode: permissionMode,
           tool_name: toolName,
@@ -211,7 +196,7 @@ export async function firePostToolUseHook(
     }
 
     const postToolOutput = createHookOutput(
-      'PostToolUse',
+      "PostToolUse",
       response.output,
     ) as PostToolUseHookOutput;
 
@@ -266,13 +251,10 @@ export async function firePostToolUseFailureHook(
   }
 
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'PostToolUseFailure',
+        eventName: "PostToolUseFailure",
         input: {
           permission_mode: permissionMode,
           tool_use_id: toolUseId,
@@ -291,7 +273,7 @@ export async function firePostToolUseFailureHook(
     }
 
     const failureOutput = createHookOutput(
-      'PostToolUseFailure',
+      "PostToolUseFailure",
       response.output,
     ) as PostToolUseFailureHookOutput;
     const additionalContext = failureOutput.getAdditionalContext();
@@ -332,13 +314,10 @@ export async function fireNotificationHook(
   }
 
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'Notification',
+        eventName: "Notification",
         input: {
           message,
           notification_type: notificationType,
@@ -353,10 +332,7 @@ export async function fireNotificationHook(
       return {};
     }
 
-    const notificationOutput = createHookOutput(
-      'Notification',
-      response.output,
-    );
+    const notificationOutput = createHookOutput("Notification", response.output);
     const additionalContext = notificationOutput.getAdditionalContext();
 
     return {
@@ -405,13 +381,10 @@ export async function firePermissionRequestHook(
   }
 
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'PermissionRequest',
+        eventName: "PermissionRequest",
         input: {
           tool_name: toolName,
           tool_input: toolInput,
@@ -428,7 +401,7 @@ export async function firePermissionRequestHook(
     }
 
     const permissionOutput = createHookOutput(
-      'PermissionRequest',
+      "PermissionRequest",
       response.output,
     ) as PermissionRequestHookOutput;
 
@@ -437,7 +410,7 @@ export async function firePermissionRequestHook(
       return { hasDecision: false };
     }
 
-    if (decision.behavior === 'allow') {
+    if (decision.behavior === "allow") {
       return {
         hasDecision: true,
         shouldAllow: true,
@@ -474,8 +447,8 @@ export function appendAdditionalContext(
     return content;
   }
 
-  if (typeof content === 'string') {
-    return content + '\n\n' + additionalContext;
+  if (typeof content === "string") {
+    return content + "\n\n" + additionalContext;
   }
 
   // For PartListUnion content, append as an additional text part
diff --git a/packages/airiscode-core/src/core/turn.ts b/packages/airiscode-core/src/core/turn.ts
index 3362ef2e5..d631499ea 100644
--- a/packages/airiscode-core/src/core/turn.ts
+++ b/packages/airiscode-core/src/core/turn.ts
@@ -4,65 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { ToolErrorType } from "../tools/tool-error.js";
+import type { ToolCallConfirmationDetails, ToolResult, ToolResultDisplay } from "../tools/tools.js";
 import {
   FinishReason,
-  type Part,
-  type PartListUnion,
-  type GenerateContentResponse,
   type FunctionCall,
   type FunctionDeclaration,
+  type GenerateContentResponse,
   type GenerateContentResponseUsageMetadata,
-} from '../types/llm.js';
-import type {
-  ToolCallConfirmationDetails,
-  ToolResult,
-  ToolResultDisplay,
-} from '../tools/tools.js';
-import type { ToolErrorType } from '../tools/tool-error.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { reportError } from '../utils/errorReporting.js';
-import {
-  getErrorMessage,
-  UnauthorizedError,
-  toFriendlyError,
-} from '../utils/errors.js';
-import type { GeminiChat } from './geminiChat.js';
-import type { RetryInfo } from '../utils/rateLimit.js';
-import {
-  getThoughtText,
-  parseThought,
-  type ThoughtSummary,
-} from '../utils/thoughtUtils.js';
+  type Part,
+  type PartListUnion,
+} from "../types/llm.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage, toFriendlyError, UnauthorizedError } from "../utils/errors.js";
+import { getResponseText } from "../utils/partUtils.js";
+import type { RetryInfo } from "../utils/rateLimit.js";
+import { getThoughtText, parseThought, type ThoughtSummary } from "../utils/thoughtUtils.js";
+import type { GeminiChat } from "./geminiChat.js";
 
 // Define a structure for tools passed to the server
 export interface ServerTool {
   name: string;
   schema: FunctionDeclaration;
   // The execute method signature might differ slightly or be wrapped
-  execute(
-    params: Record<string, unknown>,
-    signal?: AbortSignal,
-  ): Promise<ToolResult>;
+  execute(params: Record<string, unknown>, signal?: AbortSignal): Promise<ToolResult>;
 }
 
 export enum GeminiEventType {
-  Content = 'content',
-  ToolCallRequest = 'tool_call_request',
-  ToolCallResponse = 'tool_call_response',
-  ToolCallConfirmation = 'tool_call_confirmation',
-  UserCancelled = 'user_cancelled',
-  Error = 'error',
-  ChatCompressed = 'chat_compressed',
-  Thought = 'thought',
-  MaxSessionTurns = 'max_session_turns',
-  SessionTokenLimitExceeded = 'session_token_limit_exceeded',
-  Finished = 'finished',
-  LoopDetected = 'loop_detected',
-  Citation = 'citation',
-  Retry = 'retry',
-  HookSystemMessage = 'hook_system_message',
-  UserPromptSubmitBlocked = 'user_prompt_submit_blocked',
-  StopHookLoop = 'stop_hook_loop',
+  Content = "content",
+  ToolCallRequest = "tool_call_request",
+  ToolCallResponse = "tool_call_response",
+  ToolCallConfirmation = "tool_call_confirmation",
+  UserCancelled = "user_cancelled",
+  Error = "error",
+  ChatCompressed = "chat_compressed",
+  Thought = "thought",
+  MaxSessionTurns = "max_session_turns",
+  SessionTokenLimitExceeded = "session_token_limit_exceeded",
+  Finished = "finished",
+  LoopDetected = "loop_detected",
+  Citation = "citation",
+  Retry = "retry",
+  HookSystemMessage = "hook_system_message",
+  UserPromptSubmitBlocked = "user_prompt_submit_blocked",
+  StopHookLoop = "stop_hook_loop",
 }
 
 export type ServerGeminiRetryEvent = {
@@ -282,7 +267,7 @@ export class Turn {
 
         // Handle the new RETRY event: clear accumulated state from the
         // previous attempt to avoid duplicate tool calls and stale metadata.
-        if (streamEvent.type === 'retry') {
+        if (streamEvent.type === "retry") {
           this.pendingToolCalls.length = 0;
           this.pendingCitations.clear();
           this.debugResponses = [];
@@ -347,7 +332,7 @@ export class Turn {
           if (this.pendingCitations.size > 0) {
             yield {
               type: GeminiEventType.Citation,
-              value: `Citations:\n${[...this.pendingCitations].sort().join('\n')}`,
+              value: `Citations:\n${[...this.pendingCitations].sort().join("\n")}`,
             };
             this.pendingCitations.clear();
           }
@@ -377,15 +362,15 @@ export class Turn {
       const contextForReport = [...this.chat.getHistory(/*curated*/ true), req];
       await reportError(
         error,
-        'Error when talking to API',
+        "Error when talking to API",
         contextForReport,
-        'Turn.run-sendMessageStream',
+        "Turn.run-sendMessageStream",
       );
       const status =
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'status' in error &&
-        typeof (error as { status: unknown }).status === 'number'
+        "status" in error &&
+        typeof (error as { status: unknown }).status === "number"
           ? (error as { status: number }).status
           : undefined;
       const structuredError: StructuredError = {
@@ -398,13 +383,10 @@ export class Turn {
     }
   }
 
-  private handlePendingFunctionCall(
-    fnCall: FunctionCall,
-  ): ServerGeminiStreamEvent | null {
+  private handlePendingFunctionCall(fnCall: FunctionCall): ServerGeminiStreamEvent | null {
     const callId =
-      fnCall.id ??
-      `${fnCall.name}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-    const name = fnCall.name || 'undefined_tool_name';
+      fnCall.id ?? `${fnCall.name}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+    const name = fnCall.name || "undefined_tool_name";
     const args = (fnCall.args || {}) as Record<string, unknown>;
 
     const toolCallRequest: ToolCallRequestInfo = {
@@ -428,8 +410,10 @@ export class Turn {
 }
 
 function getCitations(resp: GenerateContentResponse): string[] {
-  const citations = (resp.candidates?.[0]?.citationMetadata?.citations ??
-    []) as Array<{ uri?: string; title?: string }>;
+  const citations = (resp.candidates?.[0]?.citationMetadata?.citations ?? []) as Array<{
+    uri?: string;
+    title?: string;
+  }>;
   return citations
     .filter((citation) => citation.uri !== undefined)
     .map((citation) => {
diff --git a/packages/airiscode-core/src/extension/claude-converter.ts b/packages/airiscode-core/src/extension/claude-converter.ts
index e8fee6783..43e1baf0b 100644
--- a/packages/airiscode-core/src/extension/claude-converter.ts
+++ b/packages/airiscode-core/src/extension/claude-converter.ts
@@ -4,31 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { createHash } from "node:crypto";
 /**
  * Converter for Claude Code plugins to AIRIS Code format.
  */
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { glob } from 'glob';
-import type { ExtensionConfig } from './extensionManager.js';
-import { ExtensionStorage } from './storage.js';
-import type {
-  ExtensionInstallMetadata,
-  MCPServerConfig,
-} from '../config/config.js';
-import type { HookEventName, HookDefinition } from '../hooks/types.js';
-import { cloneFromGit, downloadFromGitHubRelease } from './github.js';
-import { createHash } from 'node:crypto';
-import { copyDirectory } from './gemini-converter.js';
-import {
-  parse as parseYaml,
-  stringify as stringifyYaml,
-} from '../utils/yaml-parser.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { normalizeContent } from '../utils/textUtils.js';
-import { substituteHookVariables } from './variables.js';
-
-const debugLogger = createDebugLogger('CLAUDE_CONVERTER');
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { glob } from "glob";
+import type { ExtensionInstallMetadata, MCPServerConfig } from "../config/config.js";
+import type { HookDefinition, HookEventName } from "../hooks/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { normalizeContent } from "../utils/textUtils.js";
+import { parse as parseYaml, stringify as stringifyYaml } from "../utils/yaml-parser.js";
+import type { ExtensionConfig } from "./extensionManager.js";
+import { copyDirectory } from "./gemini-converter.js";
+import { cloneFromGit, downloadFromGitHubRelease } from "./github.js";
+import { ExtensionStorage } from "./storage.js";
+import { substituteHookVariables } from "./variables.js";
+
+const debugLogger = createDebugLogger("CLAUDE_CONVERTER");
 
 export interface ClaudePluginConfig {
   name: string;
@@ -76,8 +70,8 @@ export interface ClaudeAgentConfig {
 }
 
 export type ClaudePluginSource =
-  | { source: 'github'; repo: string }
-  | { source: 'url'; url: string };
+  | { source: "github"; repo: string }
+  | { source: "url"; url: string };
 
 export interface ClaudeMarketplacePluginConfig extends ClaudePluginConfig {
   source: string | ClaudePluginSource;
@@ -94,23 +88,23 @@ export interface ClaudeMarketplaceConfig {
 }
 
 const CLAUDE_TOOLS_MAPPING: Record<string, string | string[]> = {
-  AskUserQuestion: 'AskUserQuestion',
-  Bash: 'Shell',
-  BashOutput: 'None',
-  Edit: 'Edit',
-  ExitPlanMode: 'ExitPlanMode',
-  Glob: 'Glob',
-  Grep: 'Grep',
-  KillShell: 'None',
-  NotebookEdit: 'None',
-  Read: 'ReadFile',
-  Skill: 'Skill',
-  Task: 'Task',
-  TodoWrite: 'TodoWrite',
-  WebFetch: 'WebFetch',
-  WebSearch: 'WebSearch',
-  Write: 'WriteFile',
-  LS: 'ListFiles',
+  AskUserQuestion: "AskUserQuestion",
+  Bash: "Shell",
+  BashOutput: "None",
+  Edit: "Edit",
+  ExitPlanMode: "ExitPlanMode",
+  Glob: "Glob",
+  Grep: "Grep",
+  KillShell: "None",
+  NotebookEdit: "None",
+  Read: "ReadFile",
+  Skill: "Skill",
+  Task: "Task",
+  TodoWrite: "TodoWrite",
+  WebFetch: "WebFetch",
+  WebSearch: "WebSearch",
+  Write: "WriteFile",
+  LS: "ListFiles",
 };
 
 const claudeBuildInToolsTransform = (tools: string[]): string[] => {
@@ -119,7 +113,7 @@ const claudeBuildInToolsTransform = (tools: string[]): string[] => {
     if (!CLAUDE_TOOLS_MAPPING[tool]) {
       transformedTools.push(tool);
     } else {
-      if (CLAUDE_TOOLS_MAPPING[tool] === 'None') {
+      if (CLAUDE_TOOLS_MAPPING[tool] === "None") {
         return;
       } else if (Array.isArray(CLAUDE_TOOLS_MAPPING[tool])) {
         transformedTools.push(...CLAUDE_TOOLS_MAPPING[tool]);
@@ -144,10 +138,10 @@ function parseStringOrArray(value: unknown): string[] | undefined {
   if (Array.isArray(value)) {
     return value.map(String);
   }
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     // Split by comma and trim whitespace
     return value
-      .split(',')
+      .split(",")
       .map((s) => s.trim())
       .filter((s) => s.length > 0);
   }
@@ -159,9 +153,7 @@ function parseStringOrArray(value: unknown): string[] | undefined {
  * @param claudeAgent Claude agent configuration
  * @returns Converted agent config compatible with AIRIS Code SubagentConfig
  */
-export function convertClaudeAgentConfig(
-  claudeAgent: ClaudeAgentConfig,
-): Record<string, unknown> {
+export function convertClaudeAgentConfig(claudeAgent: ClaudeAgentConfig): Record<string, unknown> {
   // Base config with required fields
   const qwenAgent: Record<string, unknown> = {
     name: claudeAgent.name,
@@ -169,37 +161,37 @@ export function convertClaudeAgentConfig(
   };
 
   if (claudeAgent.color) {
-    qwenAgent['color'] = claudeAgent.color;
+    qwenAgent["color"] = claudeAgent.color;
   }
 
   // Convert system prompt if present
   if (claudeAgent.systemPrompt) {
-    qwenAgent['systemPrompt'] = claudeAgent.systemPrompt;
+    qwenAgent["systemPrompt"] = claudeAgent.systemPrompt;
   }
 
   // Convert tools using claudeBuildInToolsTransform
   if (claudeAgent.tools && claudeAgent.tools.length > 0) {
-    qwenAgent['tools'] = claudeBuildInToolsTransform(claudeAgent.tools);
+    qwenAgent["tools"] = claudeBuildInToolsTransform(claudeAgent.tools);
   }
 
   // Preserve Claude's top-level model selector.
   if (claudeAgent.model) {
-    qwenAgent['model'] = claudeAgent.model;
+    qwenAgent["model"] = claudeAgent.model;
   }
 
   // Preserve unsupported fields as-is for potential future compatibility
   // These fields are not supported by AIRIS Code SubagentConfig but we keep them
   if (claudeAgent.permissionMode) {
-    qwenAgent['permissionMode'] = claudeAgent.permissionMode;
+    qwenAgent["permissionMode"] = claudeAgent.permissionMode;
   }
   if (claudeAgent.hooks) {
-    qwenAgent['hooks'] = claudeAgent.hooks;
+    qwenAgent["hooks"] = claudeAgent.hooks;
   }
   if (claudeAgent.skills && claudeAgent.skills.length > 0) {
-    qwenAgent['skills'] = claudeAgent.skills;
+    qwenAgent["skills"] = claudeAgent.skills;
   }
   if (claudeAgent.disallowedTools && claudeAgent.disallowedTools.length > 0) {
-    qwenAgent['disallowedTools'] = claudeAgent.disallowedTools;
+    qwenAgent["disallowedTools"] = claudeAgent.disallowedTools;
   }
 
   return qwenAgent;
@@ -218,12 +210,12 @@ async function convertAgentFiles(agentsDir: string): Promise<void> {
   const files = await fs.promises.readdir(agentsDir);
 
   for (const file of files) {
-    if (!file.endsWith('.md')) continue;
+    if (!file.endsWith(".md")) continue;
 
     const filePath = path.join(agentsDir, file);
 
     try {
-      const content = await fs.promises.readFile(filePath, 'utf-8');
+      const content = await fs.promises.readFile(filePath, "utf-8");
       const normalizedContent = normalizeContent(content);
 
       // Parse frontmatter
@@ -241,15 +233,15 @@ async function convertAgentFiles(agentsDir: string): Promise<void> {
       // Build Claude agent config from frontmatter
       // Note: Claude tools/disallowedTools/skills can be comma-separated strings like 'Glob, Grep, Read'
       const claudeAgent: ClaudeAgentConfig = {
-        name: String(frontmatter['name'] || ''),
-        description: String(frontmatter['description'] || ''),
-        tools: parseStringOrArray(frontmatter['tools']),
-        disallowedTools: parseStringOrArray(frontmatter['disallowedTools']),
-        model: frontmatter['model'] as string | undefined,
-        permissionMode: frontmatter['permissionMode'] as string | undefined,
-        skills: parseStringOrArray(frontmatter['skills']),
-        hooks: frontmatter['hooks'],
-        color: frontmatter['color'] as string | undefined,
+        name: String(frontmatter["name"] || ""),
+        description: String(frontmatter["description"] || ""),
+        tools: parseStringOrArray(frontmatter["tools"]),
+        disallowedTools: parseStringOrArray(frontmatter["disallowedTools"]),
+        model: frontmatter["model"] as string | undefined,
+        permissionMode: frontmatter["permissionMode"] as string | undefined,
+        skills: parseStringOrArray(frontmatter["skills"]),
+        hooks: frontmatter["hooks"],
+        color: frontmatter["color"] as string | undefined,
         systemPrompt: body.trim(),
       };
 
@@ -259,14 +251,14 @@ async function convertAgentFiles(agentsDir: string): Promise<void> {
       // Build new frontmatter (excluding systemPrompt as it goes in body)
       const newFrontmatter: Record<string, unknown> = {};
       for (const [key, value] of Object.entries(qwenAgent)) {
-        if (key !== 'systemPrompt' && value !== undefined) {
+        if (key !== "systemPrompt" && value !== undefined) {
           newFrontmatter[key] = value;
         }
       }
 
       // Write converted content back
       const newYaml = stringifyYaml(newFrontmatter);
-      const systemPrompt = (qwenAgent['systemPrompt'] as string) || body.trim();
+      const systemPrompt = (qwenAgent["systemPrompt"] as string) || body.trim();
       const newContent = `---
 ${newYaml}
 ---
@@ -274,7 +266,7 @@ ${newYaml}
 ${systemPrompt}
 `;
 
-      await fs.promises.writeFile(filePath, newContent, 'utf-8');
+      await fs.promises.writeFile(filePath, newContent, "utf-8");
     } catch (error) {
       debugLogger.warn(
         `[Claude Converter] Failed to convert agent file ${filePath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -288,18 +280,16 @@ ${systemPrompt}
  * @param claudeConfig Claude plugin configuration
  * @returns Qwen ExtensionConfig
  */
-export function convertClaudeToQwenConfig(
-  claudeConfig: ClaudePluginConfig,
-): ExtensionConfig {
+export function convertClaudeToQwenConfig(claudeConfig: ClaudePluginConfig): ExtensionConfig {
   // Validate required fields
   if (!claudeConfig.name) {
-    throw new Error('Claude plugin config must have name field');
+    throw new Error("Claude plugin config must have name field");
   }
 
   // Parse MCP servers
   let mcpServers: Record<string, MCPServerConfig> | undefined;
   if (claudeConfig.mcpServers) {
-    if (typeof claudeConfig.mcpServers === 'string') {
+    if (typeof claudeConfig.mcpServers === "string") {
       // TODO: Load from file path
       debugLogger.warn(
         `[Claude Converter] MCP servers path not yet supported: ${claudeConfig.mcpServers}`,
@@ -312,7 +302,7 @@ export function convertClaudeToQwenConfig(
   // Parse hooks
   let hooks: { [K in HookEventName]?: HookDefinition[] } | undefined;
   if (claudeConfig.hooks) {
-    if (typeof claudeConfig.hooks === 'string') {
+    if (typeof claudeConfig.hooks === "string") {
       // If it's a string, it's a file path, we handle it later in the conversion process
       // hooks will be loaded from file path in the convertClaudePluginPackage function
     } else {
@@ -352,25 +342,16 @@ export async function convertClaudePluginPackage(
   pluginName: string,
 ): Promise<{ config: ExtensionConfig; convertedDir: string }> {
   // Step 1: Load marketplace.json
-  const marketplaceJsonPath = path.join(
-    extensionDir,
-    '.claude-plugin',
-    'marketplace.json',
-  );
+  const marketplaceJsonPath = path.join(extensionDir, ".claude-plugin", "marketplace.json");
   if (!fs.existsSync(marketplaceJsonPath)) {
-    throw new Error(
-      `Marketplace configuration not found at ${marketplaceJsonPath}`,
-    );
+    throw new Error(`Marketplace configuration not found at ${marketplaceJsonPath}`);
   }
 
-  const marketplaceContent = fs.readFileSync(marketplaceJsonPath, 'utf-8');
-  const marketplaceConfig: ClaudeMarketplaceConfig =
-    JSON.parse(marketplaceContent);
+  const marketplaceContent = fs.readFileSync(marketplaceJsonPath, "utf-8");
+  const marketplaceConfig: ClaudeMarketplaceConfig = JSON.parse(marketplaceContent);
 
   // Find the target plugin in marketplace
-  const marketplacePlugin = marketplaceConfig.plugins.find(
-    (p) => p.name === pluginName,
-  );
+  const marketplacePlugin = marketplaceConfig.plugins.find((p) => p.name === pluginName);
   if (!marketplacePlugin) {
     throw new Error(`Plugin ${pluginName} not found in marketplace.json`);
   }
@@ -378,15 +359,11 @@ export async function convertClaudePluginPackage(
   // Step 2: Resolve plugin source directory based on source field
   const pluginDir = path.join(
     extensionDir,
-    `plugin${createHash('sha256').update(`${extensionDir}/${pluginName}`).digest('hex')}`,
+    `plugin${createHash("sha256").update(`${extensionDir}/${pluginName}`).digest("hex")}`,
   );
   await fs.promises.mkdir(pluginDir, { recursive: true });
 
-  const pluginSource = await resolvePluginSource(
-    marketplacePlugin,
-    extensionDir,
-    pluginDir,
-  );
+  const pluginSource = await resolvePluginSource(marketplacePlugin, extensionDir, pluginDir);
 
   if (!fs.existsSync(pluginSource)) {
     throw new Error(`Plugin source directory not found: ${pluginSource}`);
@@ -396,16 +373,12 @@ export async function convertClaudePluginPackage(
   const strict = marketplacePlugin.strict ?? false;
   let mergedConfig: ClaudePluginConfig;
 
-  const pluginJsonPath = path.join(
-    pluginSource,
-    '.claude-plugin',
-    'plugin.json',
-  );
+  const pluginJsonPath = path.join(pluginSource, ".claude-plugin", "plugin.json");
   if (strict && !fs.existsSync(pluginJsonPath)) {
     throw new Error(`Strict mode requires plugin.json at ${pluginJsonPath}`);
   }
   if (fs.existsSync(pluginJsonPath)) {
-    const pluginContent = fs.readFileSync(pluginJsonPath, 'utf-8');
+    const pluginContent = fs.readFileSync(pluginJsonPath, "utf-8");
     const pluginConfig: ClaudePluginConfig = JSON.parse(pluginContent);
     mergedConfig = mergeClaudeConfigs(marketplacePlugin, pluginConfig);
   } else {
@@ -413,18 +386,15 @@ export async function convertClaudePluginPackage(
   }
 
   // Step 4: Resolve MCP servers from JSON files if needed
-  if (mergedConfig.mcpServers && typeof mergedConfig.mcpServers === 'string') {
+  if (mergedConfig.mcpServers && typeof mergedConfig.mcpServers === "string") {
     const mcpServersPath = path.isAbsolute(mergedConfig.mcpServers)
       ? mergedConfig.mcpServers
       : path.join(pluginSource, mergedConfig.mcpServers);
 
     if (fs.existsSync(mcpServersPath)) {
       try {
-        const mcpContent = fs.readFileSync(mcpServersPath, 'utf-8');
-        mergedConfig.mcpServers = JSON.parse(mcpContent) as Record<
-          string,
-          MCPServerConfig
-        >;
+        const mcpContent = fs.readFileSync(mcpServersPath, "utf-8");
+        mergedConfig.mcpServers = JSON.parse(mcpContent) as Record<string, MCPServerConfig>;
       } catch (error) {
         debugLogger.warn(
           `Failed to parse MCP servers file ${mcpServersPath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -444,9 +414,9 @@ export async function convertClaudePluginPackage(
     // If configuration specifies resources, only collect those
     // If configuration doesn't specify, keep the existing folder (if exists)
     const resourceConfigs = [
-      { name: 'commands', config: mergedConfig.commands },
-      { name: 'skills', config: mergedConfig.skills },
-      { name: 'agents', config: mergedConfig.agents },
+      { name: "commands", config: mergedConfig.commands },
+      { name: "skills", config: mergedConfig.skills },
+      { name: "agents", config: mergedConfig.agents },
     ];
 
     for (const { name, config } of resourceConfigs) {
@@ -469,20 +439,20 @@ export async function convertClaudePluginPackage(
     }
 
     // Step 7: Handle hooks from file paths if needed
-    if (mergedConfig.hooks && typeof mergedConfig.hooks === 'string') {
+    if (mergedConfig.hooks && typeof mergedConfig.hooks === "string") {
       const hooksPath = path.isAbsolute(mergedConfig.hooks)
         ? mergedConfig.hooks
         : path.join(pluginSource, mergedConfig.hooks);
 
       if (fs.existsSync(hooksPath)) {
         try {
-          const hooksContent = fs.readFileSync(hooksPath, 'utf-8');
+          const hooksContent = fs.readFileSync(hooksPath, "utf-8");
           const parsedHooks = JSON.parse(hooksContent);
 
           // Check if the file has a top-level "hooks" property (like Claude plugins use)
           // or if the entire file content is the hooks object
           let hooksData;
-          if (parsedHooks.hooks && typeof parsedHooks.hooks === 'object') {
+          if (parsedHooks.hooks && typeof parsedHooks.hooks === "object") {
             hooksData = parsedHooks.hooks as {
               [K in HookEventName]?: HookDefinition[];
             };
@@ -504,19 +474,15 @@ export async function convertClaudePluginPackage(
     }
 
     // Step 9: Convert collected agent files from Claude format to Qwen format
-    const agentsDestDir = path.join(tmpDir, 'agents');
+    const agentsDestDir = path.join(tmpDir, "agents");
     await convertAgentFiles(agentsDestDir);
 
     // Step 10: Convert to Qwen format config
     const qwenConfig = convertClaudeToQwenConfig(mergedConfig);
 
     // Step 11: Write qwen-extension.json
-    const qwenConfigPath = path.join(tmpDir, 'qwen-extension.json');
-    fs.writeFileSync(
-      qwenConfigPath,
-      JSON.stringify(qwenConfig, null, 2),
-      'utf-8',
-    );
+    const qwenConfigPath = path.join(tmpDir, "qwen-extension.json");
+    fs.writeFileSync(qwenConfigPath, JSON.stringify(qwenConfig, null, 2), "utf-8");
 
     return {
       config: qwenConfig,
@@ -575,9 +541,7 @@ async function collectResources(
       // If the directory is already named as the destination folder (e.g., 'commands')
       // and it's at the plugin root level, skip it
       if (dirName === destFolderName && parentDir === pluginRoot) {
-        debugLogger.debug(
-          `Skipping ${resolvedPath} as it's already in the correct location`,
-        );
+        debugLogger.debug(`Skipping ${resolvedPath} as it's already in the correct location`);
         continue;
       }
 
@@ -586,7 +550,7 @@ async function collectResources(
       const finalDestDir = path.join(destDir, dirName);
 
       // Copy all files from the directory
-      const files = await glob('**/*', {
+      const files = await glob("**/*", {
         cwd: resolvedPath,
         nodir: true,
         dot: false,
@@ -624,9 +588,7 @@ async function collectResources(
       // e.g., 'commands/test1.md' or 'commands/me/test.md' should be skipped
       const segments = relativePath.split(path.sep);
       if (segments.length > 0 && segments[0] === destFolderName) {
-        debugLogger.debug(
-          `Skipping ${resolvedPath} as it's already in ${destFolderName}/`,
-        );
+        debugLogger.debug(`Skipping ${resolvedPath} as it's already in ${destFolderName}/`);
         continue;
       }
 
@@ -650,9 +612,7 @@ export function mergeClaudeConfigs(
   pluginConfig?: ClaudePluginConfig,
 ): ClaudePluginConfig {
   if (!pluginConfig && marketplacePlugin.strict === true) {
-    throw new Error(
-      `Plugin ${marketplacePlugin.name} requires plugin.json (strict mode)`,
-    );
+    throw new Error(`Plugin ${marketplacePlugin.name} requires plugin.json (strict mode)`);
   }
 
   // Start with plugin.json config (if exists)
@@ -660,30 +620,25 @@ export function mergeClaudeConfigs(
     ? { ...pluginConfig }
     : {
         name: marketplacePlugin.name,
-        version: '1.0.0', // Default version if not in marketplace
+        version: "1.0.0", // Default version if not in marketplace
       };
 
   // Overlay marketplace config (takes precedence)
   if (marketplacePlugin.name) merged.name = marketplacePlugin.name;
   if (marketplacePlugin.version) merged.version = marketplacePlugin.version;
-  if (marketplacePlugin.description)
-    merged.description = marketplacePlugin.description;
+  if (marketplacePlugin.description) merged.description = marketplacePlugin.description;
   if (marketplacePlugin.author) merged.author = marketplacePlugin.author;
   if (marketplacePlugin.homepage) merged.homepage = marketplacePlugin.homepage;
-  if (marketplacePlugin.repository)
-    merged.repository = marketplacePlugin.repository;
+  if (marketplacePlugin.repository) merged.repository = marketplacePlugin.repository;
   if (marketplacePlugin.license) merged.license = marketplacePlugin.license;
   if (marketplacePlugin.keywords) merged.keywords = marketplacePlugin.keywords;
   if (marketplacePlugin.commands) merged.commands = marketplacePlugin.commands;
   if (marketplacePlugin.agents) merged.agents = marketplacePlugin.agents;
   if (marketplacePlugin.skills) merged.skills = marketplacePlugin.skills;
   if (marketplacePlugin.hooks) merged.hooks = marketplacePlugin.hooks;
-  if (marketplacePlugin.mcpServers)
-    merged.mcpServers = marketplacePlugin.mcpServers;
-  if (marketplacePlugin.outputStyles)
-    merged.outputStyles = marketplacePlugin.outputStyles;
-  if (marketplacePlugin.lspServers)
-    merged.lspServers = marketplacePlugin.lspServers;
+  if (marketplacePlugin.mcpServers) merged.mcpServers = marketplacePlugin.mcpServers;
+  if (marketplacePlugin.outputStyles) merged.outputStyles = marketplacePlugin.outputStyles;
+  if (marketplacePlugin.lspServers) merged.lspServers = marketplacePlugin.lspServers;
 
   return merged;
 }
@@ -697,21 +652,15 @@ export function isClaudePluginConfig(
   extensionDir: string,
   marketplace: { marketplaceSource: string; pluginName: string },
 ) {
-  const marketplaceConfigFilePath = path.join(
-    extensionDir,
-    '.claude-plugin/marketplace.json',
-  );
+  const marketplaceConfigFilePath = path.join(extensionDir, ".claude-plugin/marketplace.json");
   if (!fs.existsSync(marketplaceConfigFilePath)) {
     return false;
   }
 
-  const marketplaceConfigContent = fs.readFileSync(
-    marketplaceConfigFilePath,
-    'utf-8',
-  );
+  const marketplaceConfigContent = fs.readFileSync(marketplaceConfigFilePath, "utf-8");
   const marketplaceConfig = JSON.parse(marketplaceConfigContent);
 
-  if (typeof marketplaceConfig !== 'object' || marketplaceConfig === null) {
+  if (typeof marketplaceConfig !== "object" || marketplaceConfig === null) {
     return false;
   }
 
@@ -719,19 +668,18 @@ export function isClaudePluginConfig(
 
   // Must have name and owner
   if (
-    typeof marketplaceConfigObj['name'] !== 'string' ||
-    typeof marketplaceConfigObj['owner'] !== 'object'
+    typeof marketplaceConfigObj["name"] !== "string" ||
+    typeof marketplaceConfigObj["owner"] !== "object"
   ) {
     return false;
   }
 
-  if (!Array.isArray(marketplaceConfigObj['plugins'])) {
+  if (!Array.isArray(marketplaceConfigObj["plugins"])) {
     return false;
   }
 
-  const marketplacePluginObj = marketplaceConfigObj['plugins'].find(
-    (plugin: ClaudeMarketplacePluginConfig) =>
-      plugin.name === marketplace.pluginName,
+  const marketplacePluginObj = marketplaceConfigObj["plugins"].find(
+    (plugin: ClaudeMarketplacePluginConfig) => plugin.name === marketplace.pluginName,
   );
 
   if (!marketplacePluginObj) return false;
@@ -751,14 +699,14 @@ async function resolvePluginSource(
   const source = pluginConfig.source;
 
   // Handle string source (relative path or URL)
-  if (typeof source === 'string') {
+  if (typeof source === "string") {
     // Check if it's a URL
-    if (source.startsWith('http://') || source.startsWith('https://')) {
+    if (source.startsWith("http://") || source.startsWith("https://")) {
       // Download from URL
       const installMetadata: ExtensionInstallMetadata = {
         source,
-        type: 'git',
-        originSource: 'Claude',
+        type: "git",
+        originSource: "Claude",
       };
       try {
         await downloadFromGitHubRelease(installMetadata, pluginDir);
@@ -788,10 +736,10 @@ async function resolvePluginSource(
   }
 
   // Handle object source (github or url)
-  if (source.source === 'github') {
+  if (source.source === "github") {
     const installMetadata: ExtensionInstallMetadata = {
       source: `https://github.com/${source.repo}`,
-      type: 'git',
+      type: "git",
     };
     try {
       await downloadFromGitHubRelease(installMetadata, pluginDir);
@@ -801,10 +749,10 @@ async function resolvePluginSource(
     return pluginDir;
   }
 
-  if (source.source === 'url') {
+  if (source.source === "url") {
     const installMetadata: ExtensionInstallMetadata = {
       source: source.url,
-      type: 'git',
+      type: "git",
     };
     try {
       await downloadFromGitHubRelease(installMetadata, pluginDir);
diff --git a/packages/airiscode-core/src/extension/extensionManager.ts b/packages/airiscode-core/src/extension/extensionManager.ts
index 7d302e947..6cbd1c455 100644
--- a/packages/airiscode-core/src/extension/extensionManager.ts
+++ b/packages/airiscode-core/src/extension/extensionManager.ts
@@ -4,88 +4,74 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { createHash } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { glob } from "glob";
+import type { ExtensionOriginSource, TelemetrySettings } from "../config/config.js";
+import type { HookDefinition, HookEventName } from "../hooks/types.js";
 import type {
-  MCPServerConfig,
+  ClaudeMarketplaceConfig,
   ExtensionInstallMetadata,
+  MCPServerConfig,
   SkillConfig,
   SubagentConfig,
-  ClaudeMarketplaceConfig,
-} from '../index.js';
-import type { HookEventName, HookDefinition } from '../hooks/types.js';
+} from "../index.js";
 import {
-  Storage,
   Config,
+  logExtensionDisable,
   logExtensionEnable,
   logExtensionInstallEvent,
   logExtensionUninstall,
-  logExtensionDisable,
-} from '../index.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-
-import { getErrorMessage } from '../utils/errors.js';
+  Storage,
+} from "../index.js";
+import { loadSkillsFromDir } from "../skills/skill-load.js";
+import { loadSubagentFromDir } from "../subagents/subagent-manager.js";
+import { logExtensionUpdateEvent } from "../telemetry/loggers.js";
 import {
-  EXTENSIONS_CONFIG_FILENAME,
-  INSTALL_METADATA_FILENAME,
-  recursivelyHydrateStrings,
-  substituteHookVariables,
-  performVariableReplacement,
-} from './variables.js';
-import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
+  ExtensionDisableEvent,
+  ExtensionEnableEvent,
+  ExtensionInstallEvent,
+  ExtensionUninstallEvent,
+  ExtensionUpdateEvent,
+} from "../telemetry/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { resolveEnvVarsInObject } from "../utils/envVarResolver.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { convertClaudePluginPackage } from "./claude-converter.js";
+import type { ExtensionSetting, ResolvedExtensionSetting } from "./extensionSettings.js";
+import { getEnvContents, maybePromptForSettings, promptForSetting } from "./extensionSettings.js";
+import { convertGeminiExtensionPackage, isGeminiExtensionConfig } from "./gemini-converter.js";
 import {
   checkForExtensionUpdate,
   cloneFromGit,
   downloadFromGitHubRelease,
   parseGitHubRepoForReleases,
-} from './github.js';
-import { downloadFromNpmRegistry } from './npm.js';
-import type { LoadExtensionContext } from './variableSchema.js';
-import { Override, type AllExtensionsEnablementConfig } from './override.js';
-import {
-  isGeminiExtensionConfig,
-  convertGeminiExtensionPackage,
-} from './gemini-converter.js';
-import { convertClaudePluginPackage } from './claude-converter.js';
-import { glob } from 'glob';
-import { createHash } from 'node:crypto';
-import { ExtensionStorage } from './storage.js';
-import {
-  getEnvContents,
-  maybePromptForSettings,
-  promptForSetting,
-} from './extensionSettings.js';
-import type {
-  ExtensionSetting,
-  ResolvedExtensionSetting,
-} from './extensionSettings.js';
-import type {
-  ExtensionOriginSource,
-  TelemetrySettings,
-} from '../config/config.js';
-import { logExtensionUpdateEvent } from '../telemetry/loggers.js';
+} from "./github.js";
+import { downloadFromNpmRegistry } from "./npm.js";
+import { type AllExtensionsEnablementConfig, Override } from "./override.js";
+import { ExtensionStorage } from "./storage.js";
+import type { LoadExtensionContext } from "./variableSchema.js";
 import {
-  ExtensionDisableEvent,
-  ExtensionEnableEvent,
-  ExtensionInstallEvent,
-  ExtensionUninstallEvent,
-  ExtensionUpdateEvent,
-} from '../telemetry/types.js';
-import { loadSkillsFromDir } from '../skills/skill-load.js';
-import { loadSubagentFromDir } from '../subagents/subagent-manager.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+  EXTENSIONS_CONFIG_FILENAME,
+  INSTALL_METADATA_FILENAME,
+  performVariableReplacement,
+  recursivelyHydrateStrings,
+  substituteHookVariables,
+} from "./variables.js";
 
-const debugLogger = createDebugLogger('EXTENSIONS');
+const debugLogger = createDebugLogger("EXTENSIONS");
 
 // ============================================================================
 // Types and Interfaces
 // ============================================================================
 
 export enum SettingScope {
-  User = 'User',
-  Workspace = 'Workspace',
-  System = 'System',
-  SystemDefaults = 'SystemDefaults',
+  User = "User",
+  Workspace = "Workspace",
+  System = "System",
+  SystemDefaults = "SystemDefaults",
 }
 
 export interface ExtensionChannelConfig {
@@ -143,15 +129,15 @@ export interface ExtensionUpdateStatus {
 }
 
 export enum ExtensionUpdateState {
-  CHECKING_FOR_UPDATES = 'checking for updates',
-  UPDATED_NEEDS_RESTART = 'updated, needs restart',
-  UPDATING = 'updating',
-  UPDATED = 'updated',
-  UPDATE_AVAILABLE = 'update available',
-  UP_TO_DATE = 'up to date',
-  ERROR = 'error',
-  NOT_UPDATABLE = 'not updatable',
-  UNKNOWN = 'unknown',
+  CHECKING_FOR_UPDATES = "checking for updates",
+  UPDATED_NEEDS_RESTART = "updated, needs restart",
+  UPDATING = "updating",
+  UPDATED = "updated",
+  UPDATE_AVAILABLE = "update available",
+  UP_TO_DATE = "up to date",
+  ERROR = "error",
+  NOT_UPDATABLE = "not updatable",
+  UNKNOWN = "unknown",
 }
 
 export type ExtensionRequestOptions = {
@@ -176,9 +162,7 @@ export interface ExtensionManagerOptions {
   config?: Config;
   requestConsent?: (options?: ExtensionRequestOptions) => Promise<void>;
   requestSetting?: (setting: ExtensionSetting) => Promise<string>;
-  requestChoicePlugin?: (
-    marketplace: ClaudeMarketplaceConfig,
-  ) => Promise<string>;
+  requestChoicePlugin?: (marketplace: ClaudeMarketplaceConfig) => Promise<string>;
 }
 
 // ============================================================================
@@ -186,26 +170,23 @@ export interface ExtensionManagerOptions {
 // ============================================================================
 
 function ensureLeadingAndTrailingSlash(dirPath: string): string {
-  let result = dirPath.replace(/\\/g, '/');
-  if (result.charAt(0) !== '/') {
-    result = '/' + result;
+  let result = dirPath.replace(/\\/g, "/");
+  if (result.charAt(0) !== "/") {
+    result = "/" + result;
   }
-  if (result.charAt(result.length - 1) !== '/') {
-    result = result + '/';
+  if (result.charAt(result.length - 1) !== "/") {
+    result = result + "/";
   }
   return result;
 }
 
-function getTelemetryConfig(
-  cwd: string,
-  telemetrySettings?: TelemetrySettings,
-) {
+function getTelemetryConfig(cwd: string, telemetrySettings?: TelemetrySettings) {
   const config = new Config({
     telemetry: telemetrySettings,
     interactive: false,
     targetDir: cwd,
     cwd,
-    model: '',
+    model: "",
     debugMode: false,
   });
   return config;
@@ -219,7 +200,7 @@ function filterMcpConfig(original: MCPServerConfig): MCPServerConfig {
 
 function getContextFileNames(config: ExtensionConfig): string[] {
   if (!config.contextFileName || config.contextFileName.length === 0) {
-    return ['AIRISCODE.md'];
+    return ["AIRISCODE.md"];
   } else if (!Array.isArray(config.contextFileName)) {
     return [config.contextFileName];
   }
@@ -234,29 +215,26 @@ async function loadCommandsFromDir(dir: string): Promise<string[]> {
   };
 
   try {
-    const mdFiles = await glob('**/*.md', {
+    const mdFiles = await glob("**/*.md", {
       ...globOptions,
       cwd: dir,
     });
 
     const commandNames = mdFiles.map((file) => {
       const relativePathWithExt = path.relative(dir, path.join(dir, file));
-      const relativePath = relativePathWithExt.substring(
-        0,
-        relativePathWithExt.length - 3,
-      );
+      const relativePath = relativePathWithExt.substring(0, relativePathWithExt.length - 3);
       const commandName = relativePath
         .split(path.sep)
-        .map((segment) => segment.replaceAll(':', '_'))
-        .join(':');
+        .map((segment) => segment.replaceAll(":", "_"))
+        .join(":");
 
       return commandName;
     });
 
     return commandNames;
   } catch (error) {
-    const isEnoent = (error as NodeJS.ErrnoException).code === 'ENOENT';
-    const isAbortError = error instanceof Error && error.name === 'AbortError';
+    const isEnoent = (error as NodeJS.ErrnoException).code === "ENOENT";
+    const isAbortError = error instanceof Error && error.name === "AbortError";
     if (!isEnoent && !isAbortError) {
       debugLogger.error(`Error loading commands from ${dir}:`, error);
     }
@@ -269,19 +247,16 @@ async function convertGeminiOrClaudeExtension(
   pluginName?: string,
 ): Promise<{ extensionDir: string; originSource: ExtensionOriginSource }> {
   let newExtensionDir = extensionDir;
-  let originSource: ExtensionOriginSource = 'AirisCode';
+  let originSource: ExtensionOriginSource = "AirisCode";
   const configFilePath = path.join(extensionDir, EXTENSIONS_CONFIG_FILENAME);
   if (fs.existsSync(configFilePath)) {
     newExtensionDir = extensionDir;
   } else if (isGeminiExtensionConfig(extensionDir)) {
-    newExtensionDir = (await convertGeminiExtensionPackage(extensionDir))
-      .convertedDir;
-    originSource = 'Gemini';
+    newExtensionDir = (await convertGeminiExtensionPackage(extensionDir)).convertedDir;
+    originSource = "Gemini";
   } else if (pluginName) {
-    newExtensionDir = (
-      await convertClaudePluginPackage(extensionDir, pluginName)
-    ).convertedDir;
-    originSource = 'Claude';
+    newExtensionDir = (await convertClaudePluginPackage(extensionDir, pluginName)).convertedDir;
+    originSource = "Claude";
   }
   // Claude plugin conversion not yet implemented
   return { extensionDir: newExtensionDir, originSource };
@@ -305,23 +280,16 @@ export class ExtensionManager {
   private isWorkspaceTrusted: boolean;
   private requestConsent: (options?: ExtensionRequestOptions) => Promise<void>;
   private requestSetting?: (setting: ExtensionSetting) => Promise<string>;
-  private requestChoicePlugin: (
-    marketplace: ClaudeMarketplaceConfig,
-  ) => Promise<string>;
+  private requestChoicePlugin: (marketplace: ClaudeMarketplaceConfig) => Promise<string>;
 
   constructor(options: ExtensionManagerOptions) {
     this.workspaceDir = options.workspaceDir ?? process.cwd();
     this.enabledExtensionNamesOverride =
-      options.enabledExtensionOverrides?.map((name) => name.toLowerCase()) ??
-      [];
+      options.enabledExtensionOverrides?.map((name) => name.toLowerCase()) ?? [];
     this.configDir = ExtensionStorage.getUserExtensionsDir();
-    this.configFilePath = path.join(
-      this.configDir,
-      'extension-enablement.json',
-    );
+    this.configFilePath = path.join(this.configDir, "extension-enablement.json");
     this.requestSetting = options.requestSetting;
-    this.requestChoicePlugin =
-      options.requestChoicePlugin || (() => Promise.resolve(''));
+    this.requestChoicePlugin = options.requestChoicePlugin || (() => Promise.resolve(""));
     this.requestConsent = options.requestConsent || (() => Promise.resolve());
     this.config = options.config;
     this.telemetrySettings = options.telemetrySettings;
@@ -332,22 +300,16 @@ export class ExtensionManager {
     this.config = config;
   }
 
-  setRequestConsent(
-    requestConsent: (options?: ExtensionRequestOptions) => Promise<void>,
-  ): void {
+  setRequestConsent(requestConsent: (options?: ExtensionRequestOptions) => Promise<void>): void {
     this.requestConsent = requestConsent;
   }
 
-  setRequestSetting(
-    requestSetting?: (setting: ExtensionSetting) => Promise<string>,
-  ): void {
+  setRequestSetting(requestSetting?: (setting: ExtensionSetting) => Promise<string>): void {
     this.requestSetting = requestSetting;
   }
 
   setRequestChoicePlugin(
-    requestChoicePlugin: (
-      marketplace: ClaudeMarketplaceConfig,
-    ) => Promise<string>,
+    requestChoicePlugin: (marketplace: ClaudeMarketplaceConfig) => Promise<string>,
   ): void {
     this.requestChoicePlugin = requestChoicePlugin;
   }
@@ -361,12 +323,8 @@ export class ExtensionManager {
    */
   validateExtensionOverrides(extensions: Extension[]): void {
     for (const name of this.enabledExtensionNamesOverride) {
-      if (name === 'none') continue;
-      if (
-        !extensions.some(
-          (ext) => ext.config.name.toLowerCase() === name.toLowerCase(),
-        )
-      ) {
+      if (name === "none") continue;
+      if (!extensions.some((ext) => ext.config.name.toLowerCase() === name.toLowerCase())) {
         debugLogger.error(`Extension not found: ${name}`);
       }
     }
@@ -381,16 +339,14 @@ export class ExtensionManager {
     // If we have a single override called 'none', this disables all extensions.
     if (
       this.enabledExtensionNamesOverride.length === 1 &&
-      this.enabledExtensionNamesOverride[0] === 'none'
+      this.enabledExtensionNamesOverride[0] === "none"
     ) {
       return false;
     }
 
     // If we have explicit overrides, only enable those extensions.
     if (this.enabledExtensionNamesOverride.length > 0) {
-      return this.enabledExtensionNamesOverride.includes(
-        extensionName.toLowerCase(),
-      );
+      return this.enabledExtensionNamesOverride.includes(extensionName.toLowerCase());
     }
 
     // Otherwise, use the configuration settings
@@ -410,26 +366,16 @@ export class ExtensionManager {
   /**
    * Enables an extension at the specified scope.
    */
-  async enableExtension(
-    name: string,
-    scope: SettingScope,
-    cwd?: string,
-  ): Promise<void> {
+  async enableExtension(name: string, scope: SettingScope, cwd?: string): Promise<void> {
     const currentDir = cwd ?? this.workspaceDir;
-    if (
-      scope === SettingScope.System ||
-      scope === SettingScope.SystemDefaults
-    ) {
-      throw new Error('System and SystemDefaults scopes are not supported.');
+    if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) {
+      throw new Error("System and SystemDefaults scopes are not supported.");
     }
-    const extension = this.getLoadedExtensions().find(
-      (ext) => ext.name === name,
-    );
+    const extension = this.getLoadedExtensions().find((ext) => ext.name === name);
     if (!extension) {
       throw new Error(`Extension with name ${name} does not exist.`);
     }
-    const scopePath =
-      scope === SettingScope.Workspace ? currentDir : os.homedir();
+    const scopePath = scope === SettingScope.Workspace ? currentDir : os.homedir();
     this.enableByPath(name, true, scopePath);
     const config = getTelemetryConfig(currentDir, this.telemetrySettings);
     logExtensionEnable(config, new ExtensionEnableEvent(name, scope));
@@ -440,27 +386,17 @@ export class ExtensionManager {
   /**
    * Disables an extension at the specified scope.
    */
-  async disableExtension(
-    name: string,
-    scope: SettingScope,
-    cwd?: string,
-  ): Promise<void> {
+  async disableExtension(name: string, scope: SettingScope, cwd?: string): Promise<void> {
     const currentDir = cwd ?? this.workspaceDir;
     const config = getTelemetryConfig(currentDir, this.telemetrySettings);
-    if (
-      scope === SettingScope.System ||
-      scope === SettingScope.SystemDefaults
-    ) {
-      throw new Error('System and SystemDefaults scopes are not supported.');
+    if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) {
+      throw new Error("System and SystemDefaults scopes are not supported.");
     }
-    const extension = this.getLoadedExtensions().find(
-      (ext) => ext.name === name,
-    );
+    const extension = this.getLoadedExtensions().find((ext) => ext.name === name);
     if (!extension) {
       throw new Error(`Extension with name ${name} does not exist.`);
     }
-    const scopePath =
-      scope === SettingScope.Workspace ? currentDir : os.homedir();
+    const scopePath = scope === SettingScope.Workspace ? currentDir : os.homedir();
     this.disableByPath(name, true, scopePath);
     logExtensionDisable(config, new ExtensionDisableEvent(name, scope));
     extension.isActive = false;
@@ -478,11 +414,7 @@ export class ExtensionManager {
     }
   }
 
-  private enableByPath(
-    extensionName: string,
-    includeSubdirs: boolean,
-    scopePath: string,
-  ): void {
+  private enableByPath(extensionName: string, includeSubdirs: boolean, scopePath: string): void {
     const config = this.readEnablementConfig();
     if (!config[extensionName]) {
       config[extensionName] = { overrides: [] };
@@ -490,10 +422,7 @@ export class ExtensionManager {
     const override = Override.fromInput(scopePath, includeSubdirs);
     const overrides = config[extensionName].overrides.filter((rule) => {
       const fileOverride = Override.fromFileRule(rule);
-      if (
-        fileOverride.conflictsWith(override) ||
-        fileOverride.isEqualTo(override)
-      ) {
+      if (fileOverride.conflictsWith(override) || fileOverride.isEqualTo(override)) {
         return false;
       }
       return !fileOverride.isChildOf(override);
@@ -503,27 +432,19 @@ export class ExtensionManager {
     this.writeEnablementConfig(config);
   }
 
-  private disableByPath(
-    extensionName: string,
-    includeSubdirs: boolean,
-    scopePath: string,
-  ): void {
+  private disableByPath(extensionName: string, includeSubdirs: boolean, scopePath: string): void {
     this.enableByPath(extensionName, includeSubdirs, `!${scopePath}`);
   }
 
   private readEnablementConfig(): AllExtensionsEnablementConfig {
     try {
-      const content = fs.readFileSync(this.configFilePath, 'utf-8');
+      const content = fs.readFileSync(this.configFilePath, "utf-8");
       return JSON.parse(content);
     } catch (error) {
-      if (
-        error instanceof Error &&
-        'code' in error &&
-        error.code === 'ENOENT'
-      ) {
+      if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return {};
       }
-      debugLogger.error('Error reading extension enablement config:', error);
+      debugLogger.error("Error reading extension enablement config:", error);
       return {};
     }
   }
@@ -558,10 +479,7 @@ export class ExtensionManager {
   /**
    * Loads an extension by name.
    */
-  async loadExtensionByName(
-    name: string,
-    workspaceDir?: string,
-  ): Promise<Extension | null> {
+  async loadExtensionByName(name: string, workspaceDir?: string): Promise<Extension | null> {
     const cwd = workspaceDir ?? this.workspaceDir;
     const userExtensionsDir = ExtensionStorage.getUserExtensionsDir();
     if (!fs.existsSync(userExtensionsDir)) {
@@ -577,10 +495,7 @@ export class ExtensionManager {
         extensionDir,
         workspaceDir: cwd,
       });
-      if (
-        extension &&
-        extension.config.name.toLowerCase() === name.toLowerCase()
-      ) {
+      if (extension && extension.config.name.toLowerCase() === name.toLowerCase()) {
         return extension;
       }
     }
@@ -615,9 +530,7 @@ export class ExtensionManager {
     return extensions;
   }
 
-  async loadExtension(
-    context: LoadExtensionContext,
-  ): Promise<Extension | null> {
+  async loadExtension(context: LoadExtensionContext): Promise<Extension | null> {
     const { extensionDir, workspaceDir } = context;
     if (!fs.statSync(extensionDir).isDirectory()) {
       return null;
@@ -626,7 +539,7 @@ export class ExtensionManager {
     const installMetadata = this.loadInstallMetadata(extensionDir);
     let effectiveExtensionPath = extensionDir;
 
-    if (installMetadata?.type === 'link') {
+    if (installMetadata?.type === "link") {
       effectiveExtensionPath = installMetadata.source;
     }
 
@@ -641,10 +554,7 @@ export class ExtensionManager {
       const extension: Extension = {
         id: getExtensionId(config, installMetadata),
         name: config.name,
-        version:
-          config.version ||
-          installMetadata?.marketplaceConfig?.metadata?.version ||
-          '1.0.0',
+        version: config.version || installMetadata?.marketplaceConfig?.metadata?.version || "1.0.0",
         path: effectiveExtensionPath,
         installMetadata,
         isActive: this.isEnabled(config.name, this.workspaceDir),
@@ -655,10 +565,7 @@ export class ExtensionManager {
 
       if (config.mcpServers) {
         extension.mcpServers = Object.fromEntries(
-          Object.entries(config.mcpServers).map(([key, value]) => [
-            key,
-            filterMcpConfig(value),
-          ]),
+          Object.entries(config.mcpServers).map(([key, value]) => [key, filterMcpConfig(value)]),
         );
       }
 
@@ -666,58 +573,42 @@ export class ExtensionManager {
         extension.channels = config.channels;
       }
 
-      extension.commands = await loadCommandsFromDir(
-        `${effectiveExtensionPath}/commands`,
-      );
+      extension.commands = await loadCommandsFromDir(`${effectiveExtensionPath}/commands`);
 
       extension.contextFiles = getContextFileNames(config)
-        .map((contextFileName) =>
-          path.join(effectiveExtensionPath, contextFileName),
-        )
+        .map((contextFileName) => path.join(effectiveExtensionPath, contextFileName))
         .filter((contextFilePath) => fs.existsSync(contextFilePath));
 
-      extension.skills = await loadSkillsFromDir(
-        `${effectiveExtensionPath}/skills`,
-      );
-      extension.agents = await loadSubagentFromDir(
-        `${effectiveExtensionPath}/agents`,
-      );
+      extension.skills = await loadSkillsFromDir(`${effectiveExtensionPath}/skills`);
+      extension.agents = await loadSubagentFromDir(`${effectiveExtensionPath}/agents`);
 
-      if (config.hooks && typeof config.hooks !== 'string') {
+      if (config.hooks && typeof config.hooks !== "string") {
         // Process the hooks to substitute variables like ${CLAUDE_PLUGIN_ROOT}
-        extension.hooks = this.substituteHookVariables(
-          config.hooks,
-          effectiveExtensionPath,
-        );
+        extension.hooks = this.substituteHookVariables(config.hooks, effectiveExtensionPath);
       }
 
       // Also load hooks from hooks directory or from config.hooks string path if available and not already set
       if (!extension.hooks) {
-        const hooksDir = path.join(effectiveExtensionPath, 'hooks');
-        const hooksJsonPath = path.join(hooksDir, 'hooks.json');
+        const hooksDir = path.join(effectiveExtensionPath, "hooks");
+        const hooksJsonPath = path.join(hooksDir, "hooks.json");
 
         const configHooksPath =
-          typeof config.hooks === 'string'
+          typeof config.hooks === "string"
             ? path.isAbsolute(config.hooks)
               ? config.hooks
               : path.join(effectiveExtensionPath, config.hooks)
             : null;
 
-        if (
-          fs.existsSync(hooksJsonPath) ||
-          (configHooksPath && fs.existsSync(configHooksPath))
-        ) {
+        if (fs.existsSync(hooksJsonPath) || (configHooksPath && fs.existsSync(configHooksPath))) {
           const hooksFilePath =
-            configHooksPath && fs.existsSync(configHooksPath)
-              ? configHooksPath
-              : hooksJsonPath;
+            configHooksPath && fs.existsSync(configHooksPath) ? configHooksPath : hooksJsonPath;
 
           try {
-            const hooksContent = fs.readFileSync(hooksFilePath, 'utf-8');
+            const hooksContent = fs.readFileSync(hooksFilePath, "utf-8");
             const parsedHooks = JSON.parse(hooksContent);
 
             let hooksData;
-            if (parsedHooks.hooks && typeof parsedHooks.hooks === 'object') {
+            if (parsedHooks.hooks && typeof parsedHooks.hooks === "object") {
               hooksData = parsedHooks.hooks as {
                 [K in HookEventName]?: HookDefinition[];
               };
@@ -729,10 +620,7 @@ export class ExtensionManager {
             }
 
             // Process the hooks to substitute variables like ${CLAUDE_PLUGIN_ROOT}
-            extension.hooks = this.substituteHookVariables(
-              hooksData,
-              effectiveExtensionPath,
-            );
+            extension.hooks = this.substituteHookVariables(hooksData, effectiveExtensionPath);
           } catch (error) {
             debugLogger.warn(
               `Failed to parse hooks file ${hooksJsonPath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -744,9 +632,7 @@ export class ExtensionManager {
       return extension;
     } catch (e) {
       debugLogger.warn(
-        `Warning: Skipping extension in ${effectiveExtensionPath}: ${getErrorMessage(
-          e,
-        )}`,
+        `Warning: Skipping extension in ${effectiveExtensionPath}: ${getErrorMessage(e)}`,
       );
       return null;
     }
@@ -762,12 +648,10 @@ export class ExtensionManager {
     return substituteHookVariables(hooks, extensionPath);
   }
 
-  loadInstallMetadata(
-    extensionDir: string,
-  ): ExtensionInstallMetadata | undefined {
+  loadInstallMetadata(extensionDir: string): ExtensionInstallMetadata | undefined {
     const metadataFilePath = path.join(extensionDir, INSTALL_METADATA_FILENAME);
     try {
-      const configContent = fs.readFileSync(metadataFilePath, 'utf-8');
+      const configContent = fs.readFileSync(metadataFilePath, "utf-8");
       const metadata = JSON.parse(configContent) as ExtensionInstallMetadata;
       return metadata;
     } catch (_e) {
@@ -782,27 +666,23 @@ export class ExtensionManager {
       throw new Error(`Configuration file not found at ${configFilePath}`);
     }
     try {
-      const configContent = fs.readFileSync(configFilePath, 'utf-8');
+      const configContent = fs.readFileSync(configFilePath, "utf-8");
       const config = recursivelyHydrateStrings(JSON.parse(configContent), {
         extensionPath: extensionDir,
         CLAUDE_PLUGIN_ROOT: extensionDir,
         workspacePath: workspaceDir,
-        '/': path.sep,
+        "/": path.sep,
         pathSeparator: path.sep,
       }) as unknown as ExtensionConfig;
 
       if (!config.name) {
-        throw new Error(
-          `Invalid configuration in ${configFilePath}: missing "name"`,
-        );
+        throw new Error(`Invalid configuration in ${configFilePath}: missing "name"`);
       }
       validateName(config.name);
       return config;
     } catch (e) {
       throw new Error(
-        `Failed to load extension config from ${configFilePath}: ${getErrorMessage(
-          e,
-        )}`,
+        `Failed to load extension config from ${configFilePath}: ${getErrorMessage(e)}`,
       );
     }
   }
@@ -822,10 +702,7 @@ export class ExtensionManager {
     previousExtensionConfig?: ExtensionConfig,
   ): Promise<Extension> {
     const currentDir = cwd ?? this.workspaceDir;
-    const telemetryConfig = getTelemetryConfig(
-      currentDir,
-      this.telemetrySettings,
-    );
+    const telemetryConfig = getTelemetryConfig(currentDir, this.telemetrySettings);
     let extension: Extension | null;
 
     const isUpdate = !!previousExtensionConfig;
@@ -844,71 +721,53 @@ export class ExtensionManager {
 
       if (
         !path.isAbsolute(installMetadata.source) &&
-        (installMetadata.type === 'local' || installMetadata.type === 'link')
+        (installMetadata.type === "local" || installMetadata.type === "link")
       ) {
-        installMetadata.source = path.resolve(
-          currentDir,
-          installMetadata.source,
-        );
+        installMetadata.source = path.resolve(currentDir, installMetadata.source);
       }
 
       let tempDir: string | undefined;
 
       if (
-        installMetadata.originSource === 'Claude' &&
+        installMetadata.originSource === "Claude" &&
         installMetadata.marketplaceConfig &&
         !installMetadata.pluginName
       ) {
-        const pluginName = await this.requestChoicePlugin(
-          installMetadata.marketplaceConfig,
-        );
+        const pluginName = await this.requestChoicePlugin(installMetadata.marketplaceConfig);
         installMetadata.pluginName = pluginName;
       }
 
-      if (
-        installMetadata.type === 'git' ||
-        installMetadata.type === 'github-release'
-      ) {
+      if (installMetadata.type === "git" || installMetadata.type === "github-release") {
         tempDir = await ExtensionStorage.createTmpDir();
         try {
-          const result = await downloadFromGitHubRelease(
-            installMetadata,
-            tempDir,
-          );
-          if (
-            installMetadata.type === 'git' ||
-            installMetadata.type === 'github-release'
-          ) {
+          const result = await downloadFromGitHubRelease(installMetadata, tempDir);
+          if (installMetadata.type === "git" || installMetadata.type === "github-release") {
             installMetadata.type = result.type;
             installMetadata.releaseTag = result.tagName;
           }
         } catch (_error) {
           await cloneFromGit(installMetadata, tempDir);
-          if (installMetadata.type === 'github-release') {
-            installMetadata.type = 'git';
+          if (installMetadata.type === "github-release") {
+            installMetadata.type = "git";
           }
         }
         localSourcePath = tempDir;
-      } else if (installMetadata.type === 'npm') {
+      } else if (installMetadata.type === "npm") {
         tempDir = await ExtensionStorage.createTmpDir();
         const result = await downloadFromNpmRegistry(installMetadata, tempDir);
         installMetadata.releaseTag = result.version;
         localSourcePath = tempDir;
-      } else if (
-        installMetadata.type === 'local' ||
-        installMetadata.type === 'link'
-      ) {
+      } else if (installMetadata.type === "local" || installMetadata.type === "link") {
         localSourcePath = installMetadata.source;
       } else {
         throw new Error(`Unsupported install type: ${installMetadata.type}`);
       }
 
       try {
-        const { extensionDir, originSource } =
-          await convertGeminiOrClaudeExtension(
-            localSourcePath,
-            installMetadata.pluginName,
-          );
+        const { extensionDir, originSource } = await convertGeminiOrClaudeExtension(
+          localSourcePath,
+          installMetadata.pluginName,
+        );
 
         localSourcePath = extensionDir;
         installMetadata.originSource = originSource;
@@ -919,12 +778,8 @@ export class ExtensionManager {
         });
 
         if (isUpdate && installMetadata.autoUpdate) {
-          const oldSettings = new Set(
-            previousExtensionConfig.settings?.map((s) => s.name) || [],
-          );
-          const newSettings = new Set(
-            newExtensionConfig.settings?.map((s) => s.name) || [],
-          );
+          const oldSettings = new Set(previousExtensionConfig.settings?.map((s) => s.name) || []);
+          const newSettings = new Set(newExtensionConfig.settings?.map((s) => s.name) || []);
 
           const settingsAreEqual =
             oldSettings.size === newSettings.size &&
@@ -951,17 +806,13 @@ export class ExtensionManager {
           );
         }
 
-        const commands = await loadCommandsFromDir(
-          `${localSourcePath}/commands`,
-        );
+        const commands = await loadCommandsFromDir(`${localSourcePath}/commands`);
         const previousCommands = previous?.commands ?? [];
 
         const skills = await loadSkillsFromDir(`${localSourcePath}/skills`);
         const previousSkills = previous?.skills ?? [];
 
-        const subagents = await loadSubagentFromDir(
-          `${localSourcePath}/agents`,
-        );
+        const subagents = await loadSubagentFromDir(`${localSourcePath}/agents`);
         const previousSubagents = previous?.agents ?? [];
 
         if (requestConsent) {
@@ -995,10 +846,7 @@ export class ExtensionManager {
         const extensionId = getExtensionId(newExtensionConfig, installMetadata);
         let previousSettings: Record<string, string> | undefined;
         if (isUpdate) {
-          previousSettings = await getEnvContents(
-            previousExtensionConfig,
-            extensionId,
-          );
+          previousSettings = await getEnvContents(previousExtensionConfig, extensionId);
           await this.uninstallExtension(newExtensionName, isUpdate);
         }
         await fs.promises.mkdir(destinationPath, { recursive: true });
@@ -1019,37 +867,32 @@ export class ExtensionManager {
           );
         }
 
-        if (installMetadata.type !== 'link') {
+        if (installMetadata.type !== "link") {
           await copyExtension(localSourcePath, destinationPath);
         }
 
         // Perform variable replacement in extension files (e.g., ${CLAUDE_PLUGIN_ROOT}) for Claude extensions
-        const hooksDir = path.join(destinationPath, 'hooks');
+        const hooksDir = path.join(destinationPath, "hooks");
         const configHooksPath =
-          typeof newExtensionConfig.hooks === 'string'
+          typeof newExtensionConfig.hooks === "string"
             ? path.isAbsolute(newExtensionConfig.hooks)
               ? newExtensionConfig.hooks
               : path.join(destinationPath, newExtensionConfig.hooks)
             : null;
 
         if (
-          (originSource === 'Claude' && fs.existsSync(hooksDir)) ||
-          (originSource === 'Claude' &&
-            configHooksPath &&
-            fs.existsSync(configHooksPath))
+          (originSource === "Claude" && fs.existsSync(hooksDir)) ||
+          (originSource === "Claude" && configHooksPath && fs.existsSync(configHooksPath))
         ) {
           try {
             await performVariableReplacement(destinationPath);
           } catch (error) {
-            debugLogger.error('Variable replacement failed', error);
+            debugLogger.error("Variable replacement failed", error);
           }
         }
 
         const metadataString = JSON.stringify(installMetadata, null, 2);
-        const metadataPath = path.join(
-          destinationPath,
-          INSTALL_METADATA_FILENAME,
-        );
+        const metadataPath = path.join(destinationPath, INSTALL_METADATA_FILENAME);
         await fs.promises.writeFile(metadataPath, metadataString);
 
         extension = await this.loadExtension({ extensionDir: destinationPath });
@@ -1070,7 +913,7 @@ export class ExtensionManager {
               newExtensionConfig.version,
               previousExtensionConfig.version,
               installMetadata.type,
-              'success',
+              "success",
             ),
           );
           await this.refreshTools();
@@ -1081,7 +924,7 @@ export class ExtensionManager {
               newExtensionConfig.name,
               newExtensionConfig!.version,
               installMetadata.source,
-              'success',
+              "success",
             ),
           );
           this.enableExtension(newExtensionConfig.name, SettingScope.User);
@@ -1092,8 +935,8 @@ export class ExtensionManager {
         }
         if (
           localSourcePath !== tempDir &&
-          installMetadata.type !== 'link' &&
-          installMetadata.type !== 'local'
+          installMetadata.type !== "link" &&
+          installMetadata.type !== "local"
         ) {
           await fs.promises.rm(localSourcePath, {
             recursive: true,
@@ -1114,29 +957,27 @@ export class ExtensionManager {
         }
       }
       const config = newExtensionConfig ?? previousExtensionConfig;
-      const extensionId = config
-        ? getExtensionId(config, installMetadata)
-        : undefined;
+      const extensionId = config ? getExtensionId(config, installMetadata) : undefined;
       if (isUpdate) {
         logExtensionUpdateEvent(
           telemetryConfig,
           new ExtensionUpdateEvent(
-            config?.name ?? '',
-            extensionId ?? '',
-            newExtensionConfig?.version ?? '',
+            config?.name ?? "",
+            extensionId ?? "",
+            newExtensionConfig?.version ?? "",
             previousExtensionConfig.version,
             installMetadata.type,
-            'error',
+            "error",
           ),
         );
       } else {
         logExtensionInstallEvent(
           telemetryConfig,
           new ExtensionInstallEvent(
-            newExtensionConfig?.name ?? '',
-            newExtensionConfig?.version ?? '',
+            newExtensionConfig?.name ?? "",
+            newExtensionConfig?.version ?? "",
             installMetadata.source,
-            'error',
+            "error",
           ),
         );
       }
@@ -1153,25 +994,18 @@ export class ExtensionManager {
     cwd?: string,
   ): Promise<void> {
     const currentDir = cwd ?? this.workspaceDir;
-    const telemetryConfig = getTelemetryConfig(
-      currentDir,
-      this.telemetrySettings,
-    );
+    const telemetryConfig = getTelemetryConfig(currentDir, this.telemetrySettings);
     const installedExtensions = this.getLoadedExtensions();
     const extension = installedExtensions.find(
       (installed) =>
-        installed.config.name.toLowerCase() ===
-          extensionIdentifier.toLowerCase() ||
-        installed.installMetadata?.source.toLowerCase() ===
-          extensionIdentifier.toLowerCase(),
+        installed.config.name.toLowerCase() === extensionIdentifier.toLowerCase() ||
+        installed.installMetadata?.source.toLowerCase() === extensionIdentifier.toLowerCase(),
     );
     if (!extension) {
       throw new Error(`Extension not found.`);
     }
     const storage = new ExtensionStorage(
-      extension.installMetadata?.type === 'link'
-        ? extension.name
-        : path.basename(extension.path),
+      extension.installMetadata?.type === "link" ? extension.name : path.basename(extension.path),
     );
 
     await fs.promises.rm(storage.getExtensionDir(), {
@@ -1188,10 +1022,7 @@ export class ExtensionManager {
     this.removeEnablementConfig(extension.name);
     await this.refreshTools();
 
-    logExtensionUninstall(
-      telemetryConfig,
-      new ExtensionUninstallEvent(extension.name, 'success'),
-    );
+    logExtensionUninstall(telemetryConfig, new ExtensionUninstallEvent(extension.name, "success"));
   }
 
   async performWorkspaceExtensionMigration(
@@ -1205,14 +1036,10 @@ export class ExtensionManager {
       try {
         const installMetadata: ExtensionInstallMetadata = {
           source: extension.path,
-          type: 'local',
-          originSource: extension.installMetadata?.originSource || 'AirisCode',
+          type: "local",
+          originSource: extension.installMetadata?.originSource || "AirisCode",
         };
-        await this.installExtension(
-          installMetadata,
-          requestConsent,
-          requestSetting,
-        );
+        await this.installExtension(installMetadata, requestConsent, requestSetting);
       } catch (_) {
         failedInstallNames.push(extension.config.name);
       }
@@ -1254,11 +1081,9 @@ export class ExtensionManager {
 
     if (!installMetadata?.type) {
       callback(extension.name, ExtensionUpdateState.ERROR);
-      throw new Error(
-        `Extension ${extension.name} cannot be updated, type is unknown.`,
-      );
+      throw new Error(`Extension ${extension.name} cannot be updated, type is unknown.`);
     }
-    if (installMetadata?.type === 'link') {
+    if (installMetadata?.type === "link") {
       callback(extension.name, ExtensionUpdateState.UP_TO_DATE);
       throw new Error(`Extension is linked so does not need to be updated`);
     }
@@ -1280,9 +1105,7 @@ export class ExtensionManager {
         );
       } catch (e) {
         callback(extension.name, ExtensionUpdateState.ERROR);
-        throw new Error(
-          `Updated extension not found after installation, got error:\n${e}`,
-        );
+        throw new Error(`Updated extension not found after installation, got error:\n${e}`);
       }
       const updatedVersion = updatedExtension.version;
       callback(
@@ -1297,9 +1120,7 @@ export class ExtensionManager {
         updatedVersion,
       };
     } catch (e) {
-      debugLogger.error(
-        `Error updating extension, rolling back. ${getErrorMessage(e)}`,
-      );
+      debugLogger.error(`Error updating extension, rolling back. ${getErrorMessage(e)}`);
       callback(extension.name, ExtensionUpdateState.ERROR);
       await copyExtension(tempDir, extension.path);
       throw e;
@@ -1319,8 +1140,7 @@ export class ExtensionManager {
         extensions
           .filter(
             (extension) =>
-              extensionsState.get(extension.name)?.status ===
-              ExtensionUpdateState.UPDATE_AVAILABLE,
+              extensionsState.get(extension.name)?.status === ExtensionUpdateState.UPDATE_AVAILABLE,
           )
           .map((extension) =>
             this.updateExtension(
@@ -1353,10 +1173,7 @@ export class ExtensionManager {
   }
 }
 
-export async function copyExtension(
-  source: string,
-  destination: string,
-): Promise<void> {
+export async function copyExtension(source: string, destination: string): Promise<void> {
   await fs.promises.cp(source, destination, {
     recursive: true,
     dereference: true,
@@ -1382,8 +1199,7 @@ export function getExtensionId(
   let githubUrlParts = null;
   if (
     installMetadata &&
-    (installMetadata.type === 'git' ||
-      installMetadata.type === 'github-release')
+    (installMetadata.type === "git" || installMetadata.type === "github-release")
   ) {
     try {
       githubUrlParts = parseGitHubRepoForReleases(installMetadata.source);
@@ -1400,7 +1216,7 @@ export function getExtensionId(
 }
 
 export function hashValue(value: string): string {
-  return createHash('sha256').update(value).digest('hex');
+  return createHash("sha256").update(value).digest("hex");
 }
 
 export function validateName(name: string) {
diff --git a/packages/airiscode-core/src/extension/extensionSettings.ts b/packages/airiscode-core/src/extension/extensionSettings.ts
index 3b2dc2fe1..c501ab7a1 100644
--- a/packages/airiscode-core/src/extension/extensionSettings.ts
+++ b/packages/airiscode-core/src/extension/extensionSettings.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as fsSync from 'node:fs';
-import * as dotenv from 'dotenv';
-import * as path from 'node:path';
-import { ExtensionStorage } from './storage.js';
-import type { ExtensionConfig } from './extensionManager.js';
-import prompts from 'prompts';
-import { EXTENSION_SETTINGS_FILENAME } from './variables.js';
-import { KeychainTokenStorage } from '../mcp/token-storage/keychain-token-storage.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('EXT_SETTINGS');
+import * as fsSync from "node:fs";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import * as dotenv from "dotenv";
+import prompts from "prompts";
+import { KeychainTokenStorage } from "../mcp/token-storage/keychain-token-storage.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import type { ExtensionConfig } from "./extensionManager.js";
+import { ExtensionStorage } from "./storage.js";
+import { EXTENSION_SETTINGS_FILENAME } from "./variables.js";
+
+const debugLogger = createDebugLogger("EXT_SETTINGS");
 
 export interface ExtensionSetting {
   name: string;
@@ -32,8 +32,8 @@ export interface ResolvedExtensionSetting {
 }
 
 export enum ExtensionSettingScope {
-  USER = 'user',
-  WORKSPACE = 'workspace',
+  USER = "user",
+  WORKSPACE = "workspace",
 }
 
 export interface ExtensionSetting {
@@ -56,10 +56,7 @@ const getKeychainStorageName = (
   return base;
 };
 
-const getEnvFilePath = (
-  extensionName: string,
-  scope: ExtensionSettingScope,
-): string => {
+const getEnvFilePath = (extensionName: string, scope: ExtensionSettingScope): string => {
   if (scope === ExtensionSettingScope.WORKSPACE) {
     return path.join(process.cwd(), EXTENSION_SETTINGS_FILENAME);
   }
@@ -76,8 +73,7 @@ export async function maybePromptForSettings(
   const { name: extensionName, settings } = extensionConfig;
   if (
     (!settings || settings.length === 0) &&
-    (!previousExtensionConfig?.settings ||
-      previousExtensionConfig.settings.length === 0)
+    (!previousExtensionConfig?.settings || previousExtensionConfig.settings.length === 0)
   ) {
     return;
   }
@@ -94,10 +90,7 @@ export async function maybePromptForSettings(
     return;
   }
 
-  const settingsChanges = getSettingsChanges(
-    settings,
-    previousExtensionConfig?.settings ?? [],
-  );
+  const settingsChanges = getSettingsChanges(settings, previousExtensionConfig?.settings ?? []);
 
   const allSettings: Record<string, string> = { ...previousSettings };
 
@@ -109,9 +102,7 @@ export async function maybePromptForSettings(
     await keychain.deleteSecret(removedSensitiveSetting.envVar);
   }
 
-  for (const setting of settingsChanges.promptForSensitive.concat(
-    settingsChanges.promptForEnv,
-  )) {
+  for (const setting of settingsChanges.promptForSensitive.concat(settingsChanges.promptForEnv)) {
     const answer = await requestSetting(setting);
     allSettings[setting.envVar] = answer;
   }
@@ -135,20 +126,18 @@ export async function maybePromptForSettings(
 }
 
 function formatEnvContent(settings: Record<string, string>): string {
-  let envContent = '';
+  let envContent = "";
   for (const [key, value] of Object.entries(settings)) {
-    const formattedValue = value.includes(' ') ? `"${value}"` : value;
+    const formattedValue = value.includes(" ") ? `"${value}"` : value;
     envContent += `${key}=${formattedValue}\n`;
   }
   return envContent;
 }
 
-export async function promptForSetting(
-  setting: ExtensionSetting,
-): Promise<string> {
+export async function promptForSetting(setting: ExtensionSetting): Promise<string> {
   const response = await prompts({
-    type: setting.sensitive ? 'password' : 'text',
-    name: 'value',
+    type: setting.sensitive ? "password" : "text",
+    name: "value",
     message: `${setting.name}\n${setting.description}`,
   });
   return response.value;
@@ -166,7 +155,7 @@ export async function getScopedEnvContents(
   const envFilePath = getEnvFilePath(extensionName, scope);
   let customEnv: Record<string, string> = {};
   if (fsSync.existsSync(envFilePath)) {
-    const envFile = fsSync.readFileSync(envFilePath, 'utf-8');
+    const envFile = fsSync.readFileSync(envFilePath, "utf-8");
     customEnv = dotenv.parse(envFile);
   }
 
@@ -214,15 +203,11 @@ export async function updateSetting(
 ): Promise<void> {
   const { name: extensionName, settings } = extensionConfig;
   if (!settings || settings.length === 0) {
-    debugLogger.debug(
-      `updateSetting: Extension "${extensionName}" has no settings`,
-    );
+    debugLogger.debug(`updateSetting: Extension "${extensionName}" has no settings`);
     return;
   }
 
-  const settingToUpdate = settings.find(
-    (s) => s.name === settingKey || s.envVar === settingKey,
-  );
+  const settingToUpdate = settings.find((s) => s.name === settingKey || s.envVar === settingKey);
 
   if (!settingToUpdate) {
     debugLogger.debug(
@@ -244,9 +229,9 @@ export async function updateSetting(
   // For non-sensitive settings, we need to read the existing .env file,
   // update the value, and write it back, preserving any other values.
   const envFilePath = getEnvFilePath(extensionName, scope);
-  let envContent = '';
+  let envContent = "";
   if (fsSync.existsSync(envFilePath)) {
-    envContent = await fs.readFile(envFilePath, 'utf-8');
+    envContent = await fs.readFile(envFilePath, "utf-8");
   }
 
   const parsedEnv = dotenv.parse(envContent);
@@ -254,9 +239,7 @@ export async function updateSetting(
 
   // We only want to write back the variables that are not sensitive.
   const nonSensitiveSettings: Record<string, string> = {};
-  const sensitiveEnvVars = new Set(
-    settings.filter((s) => s.sensitive).map((s) => s.envVar),
-  );
+  const sensitiveEnvVars = new Set(settings.filter((s) => s.sensitive).map((s) => s.envVar));
   for (const [key, value] of Object.entries(parsedEnv)) {
     if (!sensitiveEnvVars.has(key)) {
       nonSensitiveSettings[key] = value;
@@ -289,24 +272,15 @@ function getSettingsChanges(
     promptForSensitive: sensitiveNew.filter(
       (s) => !sensitiveOld.some((old) => isSameSetting(s, old)),
     ),
-    removeSensitive: sensitiveOld.filter(
-      (s) => !sensitiveNew.some((neu) => isSameSetting(s, neu)),
-    ),
-    promptForEnv: envNew.filter(
-      (s) => !envOld.some((old) => isSameSetting(s, old)),
-    ),
-    removeEnv: envOld.filter(
-      (s) => !envNew.some((neu) => isSameSetting(s, neu)),
-    ),
+    removeSensitive: sensitiveOld.filter((s) => !sensitiveNew.some((neu) => isSameSetting(s, neu))),
+    promptForEnv: envNew.filter((s) => !envOld.some((old) => isSameSetting(s, old))),
+    removeEnv: envOld.filter((s) => !envNew.some((neu) => isSameSetting(s, neu))),
   };
 }
 
-async function clearSettings(
-  envFilePath: string,
-  keychain: KeychainTokenStorage,
-) {
+async function clearSettings(envFilePath: string, keychain: KeychainTokenStorage) {
   if (fsSync.existsSync(envFilePath)) {
-    await fs.writeFile(envFilePath, '');
+    await fs.writeFile(envFilePath, "");
   }
   if (!(await keychain.isAvailable())) {
     return;
diff --git a/packages/airiscode-core/src/extension/gemini-converter.ts b/packages/airiscode-core/src/extension/gemini-converter.ts
index 469d24d2e..8d89a424e 100644
--- a/packages/airiscode-core/src/extension/gemini-converter.ts
+++ b/packages/airiscode-core/src/extension/gemini-converter.ts
@@ -8,16 +8,16 @@
  * Converter for Gemini extensions to AIRIS Code format.
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { glob } from 'glob';
-import type { ExtensionConfig } from './extensionManager.js';
-import type { ExtensionSetting } from './extensionSettings.js';
-import { ExtensionStorage } from './storage.js';
-import { convertTomlToMarkdown } from '../utils/toml-to-markdown-converter.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { glob } from "glob";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { convertTomlToMarkdown } from "../utils/toml-to-markdown-converter.js";
+import type { ExtensionConfig } from "./extensionManager.js";
+import type { ExtensionSetting } from "./extensionSettings.js";
+import { ExtensionStorage } from "./storage.js";
 
-const debugLogger = createDebugLogger('GEMINI_CONVERTER');
+const debugLogger = createDebugLogger("GEMINI_CONVERTER");
 
 export interface GeminiExtensionConfig {
   name: string;
@@ -32,17 +32,13 @@ export interface GeminiExtensionConfig {
  * @param extensionDir Path to the Gemini extension directory
  * @returns Qwen ExtensionConfig
  */
-export function convertGeminiToQwenConfig(
-  extensionDir: string,
-): ExtensionConfig {
-  const configFilePath = path.join(extensionDir, 'gemini-extension.json');
-  const configContent = fs.readFileSync(configFilePath, 'utf-8');
+export function convertGeminiToQwenConfig(extensionDir: string): ExtensionConfig {
+  const configFilePath = path.join(extensionDir, "gemini-extension.json");
+  const configContent = fs.readFileSync(configFilePath, "utf-8");
   const geminiConfig: GeminiExtensionConfig = JSON.parse(configContent);
   // Validate required fields
   if (!geminiConfig.name || !geminiConfig.version) {
-    throw new Error(
-      'Gemini extension config must have name and version fields',
-    );
+    throw new Error("Gemini extension config must have name and version fields");
   }
 
   const settings: ExtensionSetting[] | undefined = geminiConfig.settings;
@@ -51,7 +47,7 @@ export function convertGeminiToQwenConfig(
   return {
     name: geminiConfig.name,
     version: geminiConfig.version,
-    mcpServers: geminiConfig.mcpServers as ExtensionConfig['mcpServers'],
+    mcpServers: geminiConfig.mcpServers as ExtensionConfig["mcpServers"],
     contextFileName: geminiConfig.contextFileName,
     settings,
   };
@@ -80,18 +76,14 @@ export async function convertGeminiExtensionPackage(
     await copyDirectory(extensionDir, tmpDir);
 
     // Step 2: Convert TOML commands to Markdown in commands folder
-    const commandsDir = path.join(tmpDir, 'commands');
+    const commandsDir = path.join(tmpDir, "commands");
     if (fs.existsSync(commandsDir)) {
       await convertCommandsDirectory(commandsDir);
     }
 
     // Step 3: Create qwen-extension.json with converted config
-    const qwenConfigPath = path.join(tmpDir, 'qwen-extension.json');
-    fs.writeFileSync(
-      qwenConfigPath,
-      JSON.stringify(geminiConfig, null, 2),
-      'utf-8',
-    );
+    const qwenConfigPath = path.join(tmpDir, "qwen-extension.json");
+    fs.writeFileSync(qwenConfigPath, JSON.stringify(geminiConfig, null, 2), "utf-8");
 
     return {
       config: geminiConfig,
@@ -113,10 +105,7 @@ export async function convertGeminiExtensionPackage(
  * @param source Source directory path
  * @param destination Destination directory path
  */
-export async function copyDirectory(
-  source: string,
-  destination: string,
-): Promise<void> {
+export async function copyDirectory(source: string, destination: string): Promise<void> {
   // Create destination directory if it doesn't exist
   if (!fs.existsSync(destination)) {
     fs.mkdirSync(destination, { recursive: true });
@@ -157,7 +146,7 @@ export async function copyDirectory(
  */
 async function convertCommandsDirectory(commandsDir: string): Promise<void> {
   // Find all .toml files in the commands directory
-  const tomlFiles = await glob('**/*.toml', {
+  const tomlFiles = await glob("**/*.toml", {
     cwd: commandsDir,
     nodir: true,
     dot: false,
@@ -169,16 +158,16 @@ async function convertCommandsDirectory(commandsDir: string): Promise<void> {
 
     try {
       // Read TOML file
-      const tomlContent = fs.readFileSync(tomlPath, 'utf-8');
+      const tomlContent = fs.readFileSync(tomlPath, "utf-8");
 
       // Convert to Markdown
       const markdownContent = convertTomlToMarkdown(tomlContent);
 
       // Generate Markdown file path (same location, .md extension)
-      const markdownPath = tomlPath.replace(/\.toml$/, '.md');
+      const markdownPath = tomlPath.replace(/\.toml$/, ".md");
 
       // Write Markdown file
-      fs.writeFileSync(markdownPath, markdownContent, 'utf-8');
+      fs.writeFileSync(markdownPath, markdownContent, "utf-8");
 
       // Delete original TOML file
       fs.unlinkSync(tomlPath);
@@ -198,33 +187,29 @@ async function convertCommandsDirectory(commandsDir: string): Promise<void> {
  * @returns true if config appears to be Gemini format
  */
 export function isGeminiExtensionConfig(extensionDir: string) {
-  const configFilePath = path.join(extensionDir, 'gemini-extension.json');
+  const configFilePath = path.join(extensionDir, "gemini-extension.json");
   if (!fs.existsSync(configFilePath)) {
     return false;
   }
 
-  const configContent = fs.readFileSync(configFilePath, 'utf-8');
+  const configContent = fs.readFileSync(configFilePath, "utf-8");
   const parsedConfig = JSON.parse(configContent);
 
-  if (typeof parsedConfig !== 'object' || parsedConfig === null) {
+  if (typeof parsedConfig !== "object" || parsedConfig === null) {
     return false;
   }
 
   const obj = parsedConfig as Record<string, unknown>;
 
   // Must have name and version
-  if (typeof obj['name'] !== 'string' || typeof obj['version'] !== 'string') {
+  if (typeof obj["name"] !== "string" || typeof obj["version"] !== "string") {
     return false;
   }
 
   // Check for Gemini-specific settings format
-  if (obj['settings'] && Array.isArray(obj['settings'])) {
-    const firstSetting = obj['settings'][0];
-    if (
-      firstSetting &&
-      typeof firstSetting === 'object' &&
-      'envVar' in firstSetting
-    ) {
+  if (obj["settings"] && Array.isArray(obj["settings"])) {
+    const firstSetting = obj["settings"][0];
+    if (firstSetting && typeof firstSetting === "object" && "envVar" in firstSetting) {
       return true;
     }
   }
diff --git a/packages/airiscode-core/src/extension/github.ts b/packages/airiscode-core/src/extension/github.ts
index 9cf463cc0..245a68f18 100644
--- a/packages/airiscode-core/src/extension/github.ts
+++ b/packages/airiscode-core/src/extension/github.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { simpleGit } from 'simple-git';
-import { getErrorMessage } from '../utils/errors.js';
-import * as os from 'node:os';
-import * as https from 'node:https';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { EXTENSIONS_CONFIG_FILENAME } from './variables.js';
-import * as tar from 'tar';
-import extract from 'extract-zip';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import * as fs from "node:fs";
+import * as https from "node:https";
+import * as os from "node:os";
+import * as path from "node:path";
+import extract from "extract-zip";
+import { simpleGit } from "simple-git";
+import * as tar from "tar";
+import type { ExtensionInstallMetadata } from "../config/config.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
 import {
-  ExtensionUpdateState,
   type Extension,
   type ExtensionConfig,
   type ExtensionManager,
-} from './extensionManager.js';
-import type { ExtensionInstallMetadata } from '../config/config.js';
-import { checkNpmUpdate } from './npm.js';
+  ExtensionUpdateState,
+} from "./extensionManager.js";
+import { checkNpmUpdate } from "./npm.js";
+import { EXTENSIONS_CONFIG_FILENAME } from "./variables.js";
 
-const debugLogger = createDebugLogger('EXT_GITHUB');
+const debugLogger = createDebugLogger("EXT_GITHUB");
 
 interface GithubReleaseData {
   assets: Asset[];
@@ -39,11 +39,11 @@ interface Asset {
 
 export interface GitHubDownloadResult {
   tagName: string;
-  type: 'git' | 'github-release';
+  type: "git" | "github-release";
 }
 
 function getGitHubToken(): string | undefined {
-  return process.env['GITHUB_TOKEN'];
+  return process.env["GITHUB_TOKEN"];
 }
 
 /**
@@ -62,10 +62,7 @@ export async function cloneFromGit(
     if (token) {
       try {
         const parsedUrl = new URL(sourceUrl);
-        if (
-          parsedUrl.protocol === 'https:' &&
-          parsedUrl.hostname === 'github.com'
-        ) {
+        if (parsedUrl.protocol === "https:" && parsedUrl.hostname === "github.com") {
           if (!parsedUrl.username) {
             parsedUrl.username = token;
           }
@@ -78,28 +75,21 @@ export async function cloneFromGit(
     }
     // On Windows, symlinks require elevated privileges by default, so we
     // disable them to avoid "Permission denied" errors during checkout.
-    const symlinkValue = os.platform() === 'win32' ? 'false' : 'true';
-    await git.clone(sourceUrl, './', [
-      '-c',
-      `core.symlinks=${symlinkValue}`,
-      '--depth',
-      '1',
-    ]);
+    const symlinkValue = os.platform() === "win32" ? "false" : "true";
+    await git.clone(sourceUrl, "./", ["-c", `core.symlinks=${symlinkValue}`, "--depth", "1"]);
 
     const remotes = await git.getRemotes(true);
     if (remotes.length === 0) {
-      throw new Error(
-        `Unable to find any remotes for repo ${installMetadata.source}`,
-      );
+      throw new Error(`Unable to find any remotes for repo ${installMetadata.source}`);
     }
 
-    const refToFetch = installMetadata.ref || 'HEAD';
+    const refToFetch = installMetadata.ref || "HEAD";
 
     await git.fetch(remotes[0].name, refToFetch);
 
     // After fetching, checkout FETCH_HEAD to get the content of the fetched ref.
     // This results in a detached HEAD state, which is fine for this purpose.
-    await git.checkout('FETCH_HEAD');
+    await git.checkout("FETCH_HEAD");
   } catch (error) {
     throw new Error(
       `Failed to clone Git repository from ${installMetadata.source} ${getErrorMessage(error)}`,
@@ -115,18 +105,18 @@ export function parseGitHubRepoForReleases(source: string): {
   repo: string;
 } {
   // Default to a github repo path, so `source` can be just an org/repo
-  const parsedUrl = URL.parse(source, 'https://github.com');
+  const parsedUrl = URL.parse(source, "https://github.com");
   // The pathname should be "/owner/repo".
-  const parts = parsedUrl?.pathname.substring(1).split('/');
-  if (parts?.length !== 2 || parsedUrl?.host !== 'github.com') {
+  const parts = parsedUrl?.pathname.substring(1).split("/");
+  if (parts?.length !== 2 || parsedUrl?.host !== "github.com") {
     throw new Error(
       `Invalid GitHub repository source: ${source}. Expected "owner/repo" or a github repo uri.`,
     );
   }
   const owner = parts[0];
-  const repo = parts[1].replace('.git', '');
+  const repo = parts[1].replace(".git", "");
 
-  if (owner.startsWith('git@github.com')) {
+  if (owner.startsWith("git@github.com")) {
     throw new Error(
       `GitHub release-based extensions are not supported for SSH. You must use an HTTPS URI with a personal access token to download releases from private repositories. You can set your personal access token in the GITHUB_TOKEN environment variable and install the extension via SSH.`,
     );
@@ -140,7 +130,7 @@ async function fetchReleaseFromGithub(
   repo: string,
   ref?: string,
 ): Promise<GithubReleaseData> {
-  const endpoint = ref ? `releases/tags/${ref}` : 'releases/latest';
+  const endpoint = ref ? `releases/tags/${ref}` : "releases/latest";
   const url = `https://api.github.com/repos/${owner}/${repo}/${endpoint}`;
   return await fetchJson(url);
 }
@@ -150,7 +140,7 @@ export async function checkForExtensionUpdate(
   extensionManager: ExtensionManager,
 ): Promise<ExtensionUpdateState> {
   const installMetadata = extension.installMetadata;
-  if (installMetadata?.type === 'local') {
+  if (installMetadata?.type === "local") {
     let latestConfig: ExtensionConfig | undefined;
     try {
       latestConfig = extensionManager.loadExtensionConfig({
@@ -174,50 +164,45 @@ export async function checkForExtensionUpdate(
     }
     return ExtensionUpdateState.UP_TO_DATE;
   }
-  if (installMetadata?.type === 'npm') {
+  if (installMetadata?.type === "npm") {
     return checkNpmUpdate(installMetadata);
   }
   if (
     !installMetadata ||
-    installMetadata.originSource === 'Claude' ||
-    (installMetadata.type !== 'git' &&
-      installMetadata.type !== 'github-release')
+    installMetadata.originSource === "Claude" ||
+    (installMetadata.type !== "git" && installMetadata.type !== "github-release")
   ) {
     return ExtensionUpdateState.NOT_UPDATABLE;
   }
   try {
-    if (installMetadata.type === 'git') {
+    if (installMetadata.type === "git") {
       const git = simpleGit(extension.path);
       const remotes = await git.getRemotes(true);
       if (remotes.length === 0) {
-        debugLogger.error('No git remotes found.');
+        debugLogger.error("No git remotes found.");
         return ExtensionUpdateState.ERROR;
       }
       const remoteUrl = remotes[0].refs.fetch;
       if (!remoteUrl) {
-        debugLogger.error(
-          `No fetch URL found for git remote ${remotes[0].name}.`,
-        );
+        debugLogger.error(`No fetch URL found for git remote ${remotes[0].name}.`);
         return ExtensionUpdateState.ERROR;
       }
 
       // Determine the ref to check on the remote.
-      const refToCheck = installMetadata.ref || 'HEAD';
+      const refToCheck = installMetadata.ref || "HEAD";
 
       const lsRemoteOutput = await git.listRemote([remoteUrl, refToCheck]);
 
-      if (typeof lsRemoteOutput !== 'string' || lsRemoteOutput.trim() === '') {
+      if (typeof lsRemoteOutput !== "string" || lsRemoteOutput.trim() === "") {
         debugLogger.error(`Git ref ${refToCheck} not found.`);
         return ExtensionUpdateState.ERROR;
       }
 
-      const remoteHash = lsRemoteOutput.split('\t')[0];
-      const localHash = await git.revparse(['HEAD']);
+      const remoteHash = lsRemoteOutput.split("\t")[0];
+      const localHash = await git.revparse(["HEAD"]);
 
       if (!remoteHash) {
-        debugLogger.error(
-          `Unable to parse hash from git ls-remote output "${lsRemoteOutput}"`,
-        );
+        debugLogger.error(`Unable to parse hash from git ls-remote output "${lsRemoteOutput}"`);
         return ExtensionUpdateState.ERROR;
       }
       if (remoteHash === localHash) {
@@ -232,11 +217,7 @@ export async function checkForExtensionUpdate(
       }
       const { owner, repo } = parseGitHubRepoForReleases(source);
 
-      const releaseData = await fetchReleaseFromGithub(
-        owner,
-        repo,
-        installMetadata.ref,
-      );
+      const releaseData = await fetchReleaseFromGithub(owner, repo, installMetadata.ref);
       if (releaseData.tag_name !== releaseTag) {
         return ExtensionUpdateState.UPDATE_AVAILABLE;
       }
@@ -260,9 +241,7 @@ export async function downloadFromGitHubRelease(
   try {
     const releaseData = await fetchReleaseFromGithub(owner, repo, ref);
     if (!releaseData) {
-      throw new Error(
-        `No release data found for ${owner}/${repo} at tag ${ref}`,
-      );
+      throw new Error(`No release data found for ${owner}/${repo} at tag ${ref}`);
     }
 
     const asset = findReleaseAsset(releaseData.assets);
@@ -281,18 +260,13 @@ export async function downloadFromGitHubRelease(
       }
     }
     if (!archiveUrl) {
-      throw new Error(
-        `No assets found for release with tag ${releaseData.tag_name}`,
-      );
+      throw new Error(`No assets found for release with tag ${releaseData.tag_name}`);
     }
-    let downloadedAssetPath = path.join(
-      destination,
-      path.basename(new URL(archiveUrl).pathname),
-    );
-    if (isTar && !downloadedAssetPath.endsWith('.tar.gz')) {
-      downloadedAssetPath += '.tar.gz';
-    } else if (isZip && !downloadedAssetPath.endsWith('.zip')) {
-      downloadedAssetPath += '.zip';
+    let downloadedAssetPath = path.join(destination, path.basename(new URL(archiveUrl).pathname));
+    if (isTar && !downloadedAssetPath.endsWith(".tar.gz")) {
+      downloadedAssetPath += ".tar.gz";
+    } else if (isZip && !downloadedAssetPath.endsWith(".zip")) {
+      downloadedAssetPath += ".zip";
     }
 
     await downloadFile(archiveUrl, downloadedAssetPath);
@@ -315,24 +289,15 @@ export async function downloadFromGitHubRelease(
           path.join(destination, lonelyDir.name, EXTENSIONS_CONFIG_FILENAME),
         );
         const hasGeminiConfig = fs.existsSync(
-          path.join(destination, lonelyDir.name, 'gemini-extension.json'),
+          path.join(destination, lonelyDir.name, "gemini-extension.json"),
         );
         const hasMarketplaceConfig = fs.existsSync(
-          path.join(
-            destination,
-            lonelyDir.name,
-            '.claude-plugin/marketplace.json',
-          ),
+          path.join(destination, lonelyDir.name, ".claude-plugin/marketplace.json"),
         );
         const hasClaudePluginConfig = fs.existsSync(
-          path.join(destination, lonelyDir.name, '.claude-plugin/plugin.json'),
+          path.join(destination, lonelyDir.name, ".claude-plugin/plugin.json"),
         );
-        if (
-          hasQwenConfig ||
-          hasGeminiConfig ||
-          hasMarketplaceConfig ||
-          hasClaudePluginConfig
-        ) {
+        if (hasQwenConfig || hasGeminiConfig || hasMarketplaceConfig || hasClaudePluginConfig) {
           const dirPathToExtract = path.join(destination, lonelyDir.name);
           const extractedDirFiles = await fs.promises.readdir(dirPathToExtract);
           for (const file of extractedDirFiles) {
@@ -349,7 +314,7 @@ export async function downloadFromGitHubRelease(
     await fs.promises.unlink(downloadedAssetPath);
     return {
       tagName: releaseData.tag_name,
-      type: 'github-release',
+      type: "github-release",
     };
   } catch (error) {
     throw new Error(
@@ -374,9 +339,7 @@ export function findReleaseAsset(assets: Asset[]): Asset | undefined {
   }
 
   // Check for platform specific asset
-  const platformAsset = assets.find((asset) =>
-    asset.name.toLowerCase().startsWith(platformPrefix),
-  );
+  const platformAsset = assets.find((asset) => asset.name.toLowerCase().startsWith(platformPrefix));
   if (platformAsset) {
     return platformAsset;
   }
@@ -384,9 +347,9 @@ export function findReleaseAsset(assets: Asset[]): Asset | undefined {
   // Check for generic asset if only one is available
   const genericAsset = assets.find(
     (asset) =>
-      !asset.name.toLowerCase().includes('darwin') &&
-      !asset.name.toLowerCase().includes('linux') &&
-      !asset.name.toLowerCase().includes('win32'),
+      !asset.name.toLowerCase().includes("darwin") &&
+      !asset.name.toLowerCase().includes("linux") &&
+      !asset.name.toLowerCase().includes("win32"),
   );
   if (assets.length === 1) {
     return genericAsset;
@@ -396,8 +359,8 @@ export function findReleaseAsset(assets: Asset[]): Asset | undefined {
 }
 
 async function fetchJson<T>(url: string): Promise<T> {
-  const headers: { 'User-Agent': string; Authorization?: string } = {
-    'User-Agent': 'gemini-cli',
+  const headers: { "User-Agent": string; Authorization?: string } = {
+    "User-Agent": "gemini-cli",
   };
   const token = getGitHubToken();
   if (token) {
@@ -407,24 +370,22 @@ async function fetchJson<T>(url: string): Promise<T> {
     https
       .get(url, { headers }, (res) => {
         if (res.statusCode !== 200) {
-          return reject(
-            new Error(`Request failed with status code ${res.statusCode}`),
-          );
+          return reject(new Error(`Request failed with status code ${res.statusCode}`));
         }
         const chunks: Buffer[] = [];
-        res.on('data', (chunk) => chunks.push(chunk));
-        res.on('end', () => {
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("end", () => {
           const data = Buffer.concat(chunks).toString();
           resolve(JSON.parse(data) as T);
         });
       })
-      .on('error', reject);
+      .on("error", reject);
   });
 }
 
 async function downloadFile(url: string, dest: string): Promise<void> {
-  const headers: { 'User-agent': string; Authorization?: string } = {
-    'User-agent': 'gemini-cli',
+  const headers: { "User-agent": string; Authorization?: string } = {
+    "User-agent": "gemini-cli",
   };
   const token = getGitHubToken();
   if (token) {
@@ -438,25 +399,23 @@ async function downloadFile(url: string, dest: string): Promise<void> {
           return;
         }
         if (res.statusCode !== 200) {
-          return reject(
-            new Error(`Request failed with status code ${res.statusCode}`),
-          );
+          return reject(new Error(`Request failed with status code ${res.statusCode}`));
         }
         const file = fs.createWriteStream(dest);
         res.pipe(file);
-        file.on('finish', () => file.close(resolve as () => void));
+        file.on("finish", () => file.close(resolve as () => void));
       })
-      .on('error', reject);
+      .on("error", reject);
   });
 }
 
 export async function extractFile(file: string, dest: string): Promise<void> {
-  if (file.endsWith('.tar.gz')) {
+  if (file.endsWith(".tar.gz")) {
     await tar.x({
       file,
       cwd: dest,
     });
-  } else if (file.endsWith('.zip')) {
+  } else if (file.endsWith(".zip")) {
     await extract(file, { dir: dest });
   } else {
     throw new Error(`Unsupported file extension for extraction: ${file}`);
diff --git a/packages/airiscode-core/src/extension/index.ts b/packages/airiscode-core/src/extension/index.ts
index d2f0c25c7..6c31bff18 100644
--- a/packages/airiscode-core/src/extension/index.ts
+++ b/packages/airiscode-core/src/extension/index.ts
@@ -1,7 +1,7 @@
-export * from './extensionManager.js';
-export * from './variables.js';
-export * from './github.js';
-export * from './extensionSettings.js';
-export * from './marketplace.js';
-export * from './npm.js';
-export * from './claude-converter.js';
+export * from "./claude-converter.js";
+export * from "./extensionManager.js";
+export * from "./extensionSettings.js";
+export * from "./github.js";
+export * from "./marketplace.js";
+export * from "./npm.js";
+export * from "./variables.js";
diff --git a/packages/airiscode-core/src/extension/marketplace.ts b/packages/airiscode-core/src/extension/marketplace.ts
index 316e1898c..546f5e828 100644
--- a/packages/airiscode-core/src/extension/marketplace.ts
+++ b/packages/airiscode-core/src/extension/marketplace.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExtensionConfig } from './extensionManager.js';
-import type { ExtensionInstallMetadata } from '../config/config.js';
-import type { ClaudeMarketplaceConfig } from './claude-converter.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as https from 'node:https';
-import { stat } from 'node:fs/promises';
-import { parseGitHubRepoForReleases } from './github.js';
-import { isScopedNpmPackage } from './npm.js';
+import * as fs from "node:fs";
+import { stat } from "node:fs/promises";
+import * as https from "node:https";
+import * as path from "node:path";
+import type { ExtensionInstallMetadata } from "../config/config.js";
+import type { ClaudeMarketplaceConfig } from "./claude-converter.js";
+import type { ExtensionConfig } from "./extensionManager.js";
+import { parseGitHubRepoForReleases } from "./github.js";
+import { isScopedNpmPackage } from "./npm.js";
 
 export interface MarketplaceInstallOptions {
   marketplaceUrl: string;
@@ -40,7 +40,7 @@ function parseSourceAndPluginName(source: string): {
 } {
   // Check if source contains a colon that could be a pluginName separator
   // We need to handle URL schemes that contain colons
-  const urlSchemes = ['http://', 'https://', 'git@', 'sso://'];
+  const urlSchemes = ["http://", "https://", "git@", "sso://"];
 
   let repoEndIndex = source.length;
   let hasPluginName = false;
@@ -49,14 +49,14 @@ function parseSourceAndPluginName(source: string): {
   for (const scheme of urlSchemes) {
     if (source.startsWith(scheme)) {
       const afterScheme = source.substring(scheme.length);
-      const lastColonIndex = afterScheme.lastIndexOf(':');
+      const lastColonIndex = afterScheme.lastIndexOf(":");
       if (lastColonIndex !== -1) {
         // Check if what follows the colon looks like a pluginName (not a port number or path)
         const potentialPluginName = afterScheme.substring(lastColonIndex + 1);
         // Plugin name should not contain '/' and should not be a number (port)
         if (
           potentialPluginName &&
-          !potentialPluginName.includes('/') &&
+          !potentialPluginName.includes("/") &&
           !/^\d+/.test(potentialPluginName)
         ) {
           repoEndIndex = scheme.length + lastColonIndex;
@@ -68,11 +68,8 @@ function parseSourceAndPluginName(source: string): {
   }
 
   // For non-URL sources (local paths or owner/repo format)
-  if (
-    repoEndIndex === source.length &&
-    !urlSchemes.some((s) => source.startsWith(s))
-  ) {
-    const lastColonIndex = source.lastIndexOf(':');
+  if (repoEndIndex === source.length && !urlSchemes.some((s) => source.startsWith(s))) {
+    const lastColonIndex = source.lastIndexOf(":");
     // On Windows, avoid treating drive letter as pluginName separator (e.g., C:\path)
     if (lastColonIndex > 1) {
       repoEndIndex = lastColonIndex;
@@ -111,20 +108,17 @@ function convertOwnerRepoToGitHubUrl(ownerRepo: string): string {
  */
 function isGitUrl(source: string): boolean {
   return (
-    source.startsWith('http://') ||
-    source.startsWith('https://') ||
-    source.startsWith('git@') ||
-    source.startsWith('sso://')
+    source.startsWith("http://") ||
+    source.startsWith("https://") ||
+    source.startsWith("git@") ||
+    source.startsWith("sso://")
   );
 }
 
 /**
  * Fetch content from a URL
  */
-function fetchUrl(
-  url: string,
-  headers: Record<string, string>,
-): Promise<string | null> {
+function fetchUrl(url: string, headers: Record<string, string>): Promise<string | null> {
   return new Promise((resolve) => {
     https
       .get(url, { headers }, (res) => {
@@ -133,12 +127,12 @@ function fetchUrl(
           return;
         }
         const chunks: Buffer[] = [];
-        res.on('data', (chunk) => chunks.push(chunk));
-        res.on('end', () => {
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("end", () => {
           resolve(Buffer.concat(chunks).toString());
         });
       })
-      .on('error', () => resolve(null));
+      .on("error", () => resolve(null));
   });
 }
 
@@ -151,16 +145,16 @@ async function fetchGitHubMarketplaceConfig(
   owner: string,
   repo: string,
 ): Promise<ClaudeMarketplaceConfig | null> {
-  const token = process.env['GITHUB_TOKEN'];
+  const token = process.env["GITHUB_TOKEN"];
 
   // Primary: GitHub API (works for private repos, but has rate limits)
   const apiUrl = `https://api.github.com/repos/${owner}/${repo}/contents/.claude-plugin/marketplace.json`;
   const apiHeaders: Record<string, string> = {
-    'User-Agent': 'airiscode',
-    Accept: 'application/vnd.github.v3.raw',
+    "User-Agent": "airiscode",
+    Accept: "application/vnd.github.v3.raw",
   };
   if (token) {
-    apiHeaders['Authorization'] = `token ${token}`;
+    apiHeaders["Authorization"] = `token ${token}`;
   }
 
   let content = await fetchUrl(apiUrl, apiHeaders);
@@ -169,7 +163,7 @@ async function fetchGitHubMarketplaceConfig(
   if (!content) {
     const rawUrl = `https://raw.githubusercontent.com/${owner}/${repo}/HEAD/.claude-plugin/marketplace.json`;
     const rawHeaders: Record<string, string> = {
-      'User-Agent': 'airiscode',
+      "User-Agent": "airiscode",
     };
     content = await fetchUrl(rawUrl, rawHeaders);
   }
@@ -191,22 +185,16 @@ async function fetchGitHubMarketplaceConfig(
 async function readLocalMarketplaceConfig(
   localPath: string,
 ): Promise<ClaudeMarketplaceConfig | null> {
-  const marketplaceConfigPath = path.join(
-    localPath,
-    '.claude-plugin',
-    'marketplace.json',
-  );
+  const marketplaceConfigPath = path.join(localPath, ".claude-plugin", "marketplace.json");
   try {
-    const content = await fs.promises.readFile(marketplaceConfigPath, 'utf-8');
+    const content = await fs.promises.readFile(marketplaceConfigPath, "utf-8");
     return JSON.parse(content) as ClaudeMarketplaceConfig;
   } catch {
     return null;
   }
 }
 
-export async function parseInstallSource(
-  source: string,
-): Promise<ExtensionInstallMetadata> {
+export async function parseInstallSource(source: string): Promise<ExtensionInstallMetadata> {
   // Step 1: Parse source into repo and optional pluginName
   const { repo, pluginName } = parseSourceAndPluginName(source);
 
@@ -228,7 +216,7 @@ export async function parseInstallSource(
     // Local path exists
     installMetadata = {
       source: repo,
-      type: 'local',
+      type: "local",
       pluginName,
     };
 
@@ -238,7 +226,7 @@ export async function parseInstallSource(
     // Priority 2: Git URL (http://, https://, git@, sso://)
     installMetadata = {
       source: repoSource,
-      type: 'git',
+      type: "git",
       pluginName,
     };
 
@@ -253,7 +241,7 @@ export async function parseInstallSource(
     // Priority 3: Scoped npm package (@scope/name, optionally @version)
     installMetadata = {
       source: repo,
-      type: 'npm',
+      type: "npm",
       pluginName,
     };
   } else if (isOwnerRepoFormat(repo)) {
@@ -261,13 +249,13 @@ export async function parseInstallSource(
     repoSource = convertOwnerRepoToGitHubUrl(repo);
     installMetadata = {
       source: repoSource,
-      type: 'git',
+      type: "git",
       pluginName,
     };
 
     // Try to fetch marketplace config from GitHub
     try {
-      const [owner, repoName] = repo.split('/');
+      const [owner, repoName] = repo.split("/");
       marketplaceConfig = await fetchGitHubMarketplaceConfig(owner, repoName);
     } catch {
       // Not a valid GitHub URL or failed to fetch, continue without marketplace config
@@ -280,7 +268,7 @@ export async function parseInstallSource(
   // Step 3: If marketplace config exists, update type to marketplace
   if (marketplaceConfig) {
     installMetadata.marketplaceConfig = marketplaceConfig;
-    installMetadata.originSource = 'Claude';
+    installMetadata.originSource = "Claude";
   }
 
   return installMetadata;
diff --git a/packages/airiscode-core/src/extension/npm.ts b/packages/airiscode-core/src/extension/npm.ts
index 94017878f..776915ae7 100644
--- a/packages/airiscode-core/src/extension/npm.ts
+++ b/packages/airiscode-core/src/extension/npm.ts
@@ -2,25 +2,25 @@
  * npm registry support for extension installation and updates.
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import * as https from 'node:https';
-import * as http from 'node:http';
-import * as tar from 'tar';
-import type { ExtensionInstallMetadata } from '../config/config.js';
-import { ExtensionUpdateState } from './extensionManager.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('EXT_NPM');
+import * as fs from "node:fs";
+import * as http from "node:http";
+import * as https from "node:https";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as tar from "tar";
+import type { ExtensionInstallMetadata } from "../config/config.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { ExtensionUpdateState } from "./extensionManager.js";
+
+const debugLogger = createDebugLogger("EXT_NPM");
 
 export interface NpmDownloadResult {
   version: string;
-  type: 'npm';
+  type: "npm";
 }
 
 interface NpmPackageMetadata {
-  'dist-tags': Record<string, string>;
+  "dist-tags": Record<string, string>;
   versions: Record<
     string,
     {
@@ -71,41 +71,33 @@ export function isScopedNpmPackage(source: string): boolean {
  * 3. Default registry from .npmrc
  * 4. Fallback: https://registry.npmjs.org/
  */
-export function resolveNpmRegistry(
-  scope: string,
-  registryOverride?: string,
-): string {
+export function resolveNpmRegistry(scope: string, registryOverride?: string): string {
   if (registryOverride) {
-    return registryOverride.replace(/\/$/, '');
+    return registryOverride.replace(/\/$/, "");
   }
 
-  const npmrcPaths = [
-    path.join(process.cwd(), '.npmrc'),
-    path.join(os.homedir(), '.npmrc'),
-  ];
+  const npmrcPaths = [path.join(process.cwd(), ".npmrc"), path.join(os.homedir(), ".npmrc")];
 
   let scopedRegistry: string | undefined;
   let defaultRegistry: string | undefined;
 
   for (const npmrcPath of npmrcPaths) {
     try {
-      const content = fs.readFileSync(npmrcPath, 'utf-8');
-      const lines = content.split('\n');
+      const content = fs.readFileSync(npmrcPath, "utf-8");
+      const lines = content.split("\n");
       for (const line of lines) {
         const trimmed = line.trim();
         // Scoped registry: @scope:registry=https://...
         const scopeMatch = trimmed.match(
-          new RegExp(
-            `^${scope.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}:registry\\s*=\\s*(.+)`,
-          ),
+          new RegExp(`^${scope.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}:registry\\s*=\\s*(.+)`),
         );
         if (scopeMatch && !scopedRegistry) {
-          scopedRegistry = scopeMatch[1].trim().replace(/\/$/, '');
+          scopedRegistry = scopeMatch[1].trim().replace(/\/$/, "");
         }
         // Default registry: registry=https://...
         const defaultMatch = trimmed.match(/^registry\s*=\s*(.+)/);
         if (defaultMatch && !defaultRegistry) {
-          defaultRegistry = defaultMatch[1].trim().replace(/\/$/, '');
+          defaultRegistry = defaultMatch[1].trim().replace(/\/$/, "");
         }
       }
     } catch {
@@ -113,7 +105,7 @@ export function resolveNpmRegistry(
     }
   }
 
-  return scopedRegistry || defaultRegistry || 'https://registry.npmjs.org';
+  return scopedRegistry || defaultRegistry || "https://registry.npmjs.org";
 }
 
 /**
@@ -124,15 +116,12 @@ export function resolveNpmRegistry(
  * 2. Registry-specific _authToken from .npmrc
  */
 function getNpmAuthToken(registryUrl: string): string | undefined {
-  const envToken = process.env['NPM_TOKEN'];
+  const envToken = process.env["NPM_TOKEN"];
   if (envToken) {
     return envToken;
   }
 
-  const npmrcPaths = [
-    path.join(process.cwd(), '.npmrc'),
-    path.join(os.homedir(), '.npmrc'),
-  ];
+  const npmrcPaths = [path.join(process.cwd(), ".npmrc"), path.join(os.homedir(), ".npmrc")];
 
   // Build candidate prefixes from the registry URL to match against .npmrc
   // entries. For "https://host/path/to/registry/", we try:
@@ -144,25 +133,22 @@ function getNpmAuthToken(registryUrl: string): string | undefined {
   // and path-scoped entries (//pkgs.dev.azure.com/org/_packaging/feed/npm/registry/:_authToken=...)
   const parsed = new URL(registryUrl);
   const registryPrefixes: string[] = [];
-  const pathSegments = parsed.pathname
-    .replace(/\/$/, '')
-    .split('/')
-    .filter(Boolean);
+  const pathSegments = parsed.pathname.replace(/\/$/, "").split("/").filter(Boolean);
   for (let i = pathSegments.length; i >= 0; i--) {
-    const prefix = pathSegments.slice(0, i).join('/');
-    registryPrefixes.push(`${parsed.host}${prefix ? `/${prefix}` : ''}`);
+    const prefix = pathSegments.slice(0, i).join("/");
+    registryPrefixes.push(`${parsed.host}${prefix ? `/${prefix}` : ""}`);
   }
 
   for (const npmrcPath of npmrcPaths) {
     try {
-      const content = fs.readFileSync(npmrcPath, 'utf-8');
-      const lines = content.split('\n');
+      const content = fs.readFileSync(npmrcPath, "utf-8");
+      const lines = content.split("\n");
       for (const line of lines) {
         const trimmed = line.trim();
         // Format: //host[/path]/:_authToken=TOKEN
         const match = trimmed.match(/^\/\/(.+?)\/:_authToken\s*=\s*(.+)/);
         if (match) {
-          const entryPrefix = match[1].replace(/\/$/, '');
+          const entryPrefix = match[1].replace(/\/$/, "");
           if (registryPrefixes.includes(entryPrefix)) {
             return match[2].trim();
           }
@@ -181,13 +167,13 @@ function getNpmAuthToken(registryUrl: string): string | undefined {
  */
 function fetchNpmJson<T>(url: string, authToken?: string): Promise<T> {
   const headers: Record<string, string> = {
-    Accept: 'application/json',
+    Accept: "application/json",
   };
   if (authToken) {
-    headers['Authorization'] = `Bearer ${authToken}`;
+    headers["Authorization"] = `Bearer ${authToken}`;
   }
 
-  const client = url.startsWith('https://') ? https : http;
+  const client = url.startsWith("https://") ? https : http;
 
   return new Promise((resolve, reject) => {
     client
@@ -197,24 +183,19 @@ function fetchNpmJson<T>(url: string, authToken?: string): Promise<T> {
             // Strip auth token when redirected to a different host
             const originalHost = new URL(url).host;
             const redirectHost = new URL(res.headers.location).host;
-            const redirectToken =
-              redirectHost === originalHost ? authToken : undefined;
-            fetchNpmJson<T>(res.headers.location, redirectToken)
-              .then(resolve)
-              .catch(reject);
+            const redirectToken = redirectHost === originalHost ? authToken : undefined;
+            fetchNpmJson<T>(res.headers.location, redirectToken).then(resolve).catch(reject);
             return;
           }
         }
         if (res.statusCode !== 200) {
           return reject(
-            new Error(
-              `npm registry request failed with status ${res.statusCode}: ${url}`,
-            ),
+            new Error(`npm registry request failed with status ${res.statusCode}: ${url}`),
           );
         }
         const chunks: Buffer[] = [];
-        res.on('data', (chunk) => chunks.push(chunk));
-        res.on('end', () => {
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("end", () => {
           try {
             resolve(JSON.parse(Buffer.concat(chunks).toString()) as T);
           } catch (e) {
@@ -222,24 +203,20 @@ function fetchNpmJson<T>(url: string, authToken?: string): Promise<T> {
           }
         });
       })
-      .on('error', reject);
+      .on("error", reject);
   });
 }
 
 /**
  * Download a file from a URL, following redirects.
  */
-function downloadNpmFile(
-  url: string,
-  dest: string,
-  authToken?: string,
-): Promise<void> {
+function downloadNpmFile(url: string, dest: string, authToken?: string): Promise<void> {
   const headers: Record<string, string> = {};
   if (authToken) {
-    headers['Authorization'] = `Bearer ${authToken}`;
+    headers["Authorization"] = `Bearer ${authToken}`;
   }
 
-  const client = url.startsWith('https://') ? https : http;
+  const client = url.startsWith("https://") ? https : http;
 
   return new Promise((resolve, reject) => {
     client
@@ -249,26 +226,19 @@ function downloadNpmFile(
             // Strip auth token when redirected to a different host
             const originalHost = new URL(url).host;
             const redirectHost = new URL(res.headers.location).host;
-            const redirectToken =
-              redirectHost === originalHost ? authToken : undefined;
-            downloadNpmFile(res.headers.location, dest, redirectToken)
-              .then(resolve)
-              .catch(reject);
+            const redirectToken = redirectHost === originalHost ? authToken : undefined;
+            downloadNpmFile(res.headers.location, dest, redirectToken).then(resolve).catch(reject);
             return;
           }
         }
         if (res.statusCode !== 200) {
-          return reject(
-            new Error(
-              `Failed to download npm tarball: status ${res.statusCode}`,
-            ),
-          );
+          return reject(new Error(`Failed to download npm tarball: status ${res.statusCode}`));
         }
         const file = fs.createWriteStream(dest);
         res.pipe(file);
-        file.on('finish', () => file.close(resolve as () => void));
+        file.on("finish", () => file.close(resolve as () => void));
       })
-      .on('error', reject);
+      .on("error", reject);
   });
 }
 
@@ -279,12 +249,9 @@ export async function downloadFromNpmRegistry(
   installMetadata: ExtensionInstallMetadata,
   destination: string,
 ): Promise<NpmDownloadResult> {
-  const { name, version: requestedVersion } = parseNpmPackageSource(
-    installMetadata.source,
-  );
-  const scope = name.split('/')[0];
-  const registryUrl =
-    installMetadata.registryUrl || resolveNpmRegistry(scope, undefined);
+  const { name, version: requestedVersion } = parseNpmPackageSource(installMetadata.source);
+  const scope = name.split("/")[0];
+  const registryUrl = installMetadata.registryUrl || resolveNpmRegistry(scope, undefined);
 
   // Store resolved registry for future update checks
   installMetadata.registryUrl = registryUrl;
@@ -292,29 +259,24 @@ export async function downloadFromNpmRegistry(
   const authToken = getNpmAuthToken(registryUrl);
 
   // Fetch package metadata
-  const encodedName = name.replaceAll('/', '%2f');
+  const encodedName = name.replaceAll("/", "%2f");
   const metadataUrl = `${registryUrl}/${encodedName}`;
   debugLogger.debug(`Fetching npm package metadata from ${metadataUrl}`);
 
-  const metadata = await fetchNpmJson<NpmPackageMetadata>(
-    metadataUrl,
-    authToken,
-  );
+  const metadata = await fetchNpmJson<NpmPackageMetadata>(metadataUrl, authToken);
 
   // Resolve version
   let resolvedVersion: string;
-  if (requestedVersion && requestedVersion !== 'latest') {
+  if (requestedVersion && requestedVersion !== "latest") {
     if (metadata.versions[requestedVersion]) {
       resolvedVersion = requestedVersion;
-    } else if (metadata['dist-tags'][requestedVersion]) {
-      resolvedVersion = metadata['dist-tags'][requestedVersion];
+    } else if (metadata["dist-tags"][requestedVersion]) {
+      resolvedVersion = metadata["dist-tags"][requestedVersion];
     } else {
-      throw new Error(
-        `Version "${requestedVersion}" not found for package ${name}`,
-      );
+      throw new Error(`Version "${requestedVersion}" not found for package ${name}`);
     }
   } else {
-    resolvedVersion = metadata['dist-tags']['latest'];
+    resolvedVersion = metadata["dist-tags"]["latest"];
     if (!resolvedVersion) {
       throw new Error(`No "latest" dist-tag found for package ${name}`);
     }
@@ -322,15 +284,11 @@ export async function downloadFromNpmRegistry(
 
   const versionData = metadata.versions[resolvedVersion];
   if (!versionData) {
-    throw new Error(
-      `Version data for "${resolvedVersion}" not found for package ${name}`,
-    );
+    throw new Error(`Version data for "${resolvedVersion}" not found for package ${name}`);
   }
 
   const tarballUrl = versionData.dist.tarball;
-  debugLogger.debug(
-    `Downloading ${name}@${resolvedVersion} from ${tarballUrl}`,
-  );
+  debugLogger.debug(`Downloading ${name}@${resolvedVersion} from ${tarballUrl}`);
 
   // Only send auth token if the tarball is hosted on the same registry host.
   // Private registries often point dist.tarball at a CDN on a different domain;
@@ -340,7 +298,7 @@ export async function downloadFromNpmRegistry(
   const tarballAuthToken = tarballHost === registryHost ? authToken : undefined;
 
   // Download tarball
-  const tarballPath = path.join(destination, 'package.tgz');
+  const tarballPath = path.join(destination, "package.tgz");
   await downloadNpmFile(tarballUrl, tarballPath, tarballAuthToken);
 
   // Extract tarball
@@ -350,14 +308,11 @@ export async function downloadFromNpmRegistry(
   });
 
   // npm tarballs contain a `package/` wrapper directory — flatten it
-  const packageDir = path.join(destination, 'package');
+  const packageDir = path.join(destination, "package");
   if (fs.existsSync(packageDir)) {
     const entries = await fs.promises.readdir(packageDir);
     for (const entry of entries) {
-      await fs.promises.rename(
-        path.join(packageDir, entry),
-        path.join(destination, entry),
-      );
+      await fs.promises.rename(path.join(packageDir, entry), path.join(destination, entry));
     }
     await fs.promises.rmdir(packageDir);
   }
@@ -365,13 +320,11 @@ export async function downloadFromNpmRegistry(
   // Clean up tarball
   await fs.promises.unlink(tarballPath);
 
-  debugLogger.debug(
-    `Successfully extracted ${name}@${resolvedVersion} to ${destination}`,
-  );
+  debugLogger.debug(`Successfully extracted ${name}@${resolvedVersion} to ${destination}`);
 
   return {
     version: resolvedVersion,
-    type: 'npm',
+    type: "npm",
   };
 }
 
@@ -383,37 +336,29 @@ export async function checkNpmUpdate(
 ): Promise<ExtensionUpdateState> {
   try {
     const { name } = parseNpmPackageSource(installMetadata.source);
-    const scope = name.split('/')[0];
-    const registryUrl =
-      installMetadata.registryUrl || resolveNpmRegistry(scope, undefined);
+    const scope = name.split("/")[0];
+    const registryUrl = installMetadata.registryUrl || resolveNpmRegistry(scope, undefined);
     const authToken = getNpmAuthToken(registryUrl);
 
-    const encodedName = name.replaceAll('/', '%2f');
+    const encodedName = name.replaceAll("/", "%2f");
     const metadataUrl = `${registryUrl}/${encodedName}`;
-    const metadata = await fetchNpmJson<NpmPackageMetadata>(
-      metadataUrl,
-      authToken,
-    );
+    const metadata = await fetchNpmJson<NpmPackageMetadata>(metadataUrl, authToken);
 
-    const { version: requestedVersion } = parseNpmPackageSource(
-      installMetadata.source,
-    );
+    const { version: requestedVersion } = parseNpmPackageSource(installMetadata.source);
 
     // If pinned to an exact version, it's always up-to-date
     if (
       requestedVersion &&
-      requestedVersion !== 'latest' &&
-      !metadata['dist-tags'][requestedVersion]
+      requestedVersion !== "latest" &&
+      !metadata["dist-tags"][requestedVersion]
     ) {
       return ExtensionUpdateState.UP_TO_DATE;
     }
 
     // Resolve the target dist-tag (default: "latest")
     const targetTag =
-      requestedVersion && metadata['dist-tags'][requestedVersion]
-        ? requestedVersion
-        : 'latest';
-    const targetVersion = metadata['dist-tags'][targetTag];
+      requestedVersion && metadata["dist-tags"][requestedVersion] ? requestedVersion : "latest";
+    const targetVersion = metadata["dist-tags"][targetTag];
     if (!targetVersion) {
       debugLogger.error(`No "${targetTag}" dist-tag found for package ${name}`);
       return ExtensionUpdateState.ERROR;
@@ -424,9 +369,7 @@ export async function checkNpmUpdate(
     }
     return ExtensionUpdateState.UP_TO_DATE;
   } catch (error) {
-    debugLogger.error(
-      `Failed to check npm update for "${installMetadata.source}": ${error}`,
-    );
+    debugLogger.error(`Failed to check npm update for "${installMetadata.source}": ${error}`);
     return ExtensionUpdateState.ERROR;
   }
 }
diff --git a/packages/airiscode-core/src/extension/override.ts b/packages/airiscode-core/src/extension/override.ts
index caafe001a..4e510e9a8 100644
--- a/packages/airiscode-core/src/extension/override.ts
+++ b/packages/airiscode-core/src/extension/override.ts
@@ -20,28 +20,23 @@ export class Override {
   ) {}
 
   static fromInput(inputRule: string, includeSubdirs: boolean): Override {
-    const isDisable = inputRule.startsWith('!');
+    const isDisable = inputRule.startsWith("!");
     let baseRule = isDisable ? inputRule.substring(1) : inputRule;
     baseRule = ensureLeadingAndTrailingSlash(baseRule);
     return new Override(baseRule, isDisable, includeSubdirs);
   }
 
   static fromFileRule(fileRule: string): Override {
-    const isDisable = fileRule.startsWith('!');
+    const isDisable = fileRule.startsWith("!");
     let baseRule = isDisable ? fileRule.substring(1) : fileRule;
-    const includeSubdirs = baseRule.endsWith('*');
-    baseRule = includeSubdirs
-      ? baseRule.substring(0, baseRule.length - 1)
-      : baseRule;
+    const includeSubdirs = baseRule.endsWith("*");
+    baseRule = includeSubdirs ? baseRule.substring(0, baseRule.length - 1) : baseRule;
     return new Override(baseRule, isDisable, includeSubdirs);
   }
 
   conflictsWith(other: Override): boolean {
     if (this.baseRule === other.baseRule) {
-      return (
-        this.includeSubdirs !== other.includeSubdirs ||
-        this.isDisable !== other.isDisable
-      );
+      return this.includeSubdirs !== other.includeSubdirs || this.isDisable !== other.isDisable;
     }
     return false;
   }
@@ -55,7 +50,7 @@ export class Override {
   }
 
   asRegex(): RegExp {
-    return globToRegex(`${this.baseRule}${this.includeSubdirs ? '*' : ''}`);
+    return globToRegex(`${this.baseRule}${this.includeSubdirs ? "*" : ""}`);
   }
 
   isChildOf(parent: Override) {
@@ -66,7 +61,7 @@ export class Override {
   }
 
   output(): string {
-    return `${this.isDisable ? '!' : ''}${this.baseRule}${this.includeSubdirs ? '*' : ''}`;
+    return `${this.isDisable ? "!" : ""}${this.baseRule}${this.includeSubdirs ? "*" : ""}`;
   }
 
   matchesPath(path: string) {
@@ -76,12 +71,12 @@ export class Override {
 
 const ensureLeadingAndTrailingSlash = function (dirPath: string): string {
   // Normalize separators to forward slashes for consistent matching across platforms.
-  let result = dirPath.replace(/\\/g, '/');
-  if (result.charAt(0) !== '/') {
-    result = '/' + result;
+  let result = dirPath.replace(/\\/g, "/");
+  if (result.charAt(0) !== "/") {
+    result = "/" + result;
   }
-  if (result.charAt(result.length - 1) !== '/') {
-    result = result + '/';
+  if (result.charAt(result.length - 1) !== "/") {
+    result = result + "/";
   }
   return result;
 };
@@ -95,8 +90,8 @@ const ensureLeadingAndTrailingSlash = function (dirPath: string): string {
  */
 function globToRegex(glob: string): RegExp {
   const regexString = glob
-    .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape special regex characters
-    .replace(/(\/?)\*/g, '($1.*)?'); // Convert * to optional group
+    .replace(/[.+?^${}()|[\]\\]/g, "\\$&") // Escape special regex characters
+    .replace(/(\/?)\*/g, "($1.*)?"); // Convert * to optional group
 
   return new RegExp(`^${regexString}$`);
 }
diff --git a/packages/airiscode-core/src/extension/settings.ts b/packages/airiscode-core/src/extension/settings.ts
index 0118a98bd..240762c8e 100644
--- a/packages/airiscode-core/src/extension/settings.ts
+++ b/packages/airiscode-core/src/extension/settings.ts
@@ -9,9 +9,9 @@
  * Settings are stored in .env files within extension directories.
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import type { ExtensionSetting } from './extensionSettings.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { ExtensionSetting } from "./extensionSettings.js";
 
 /**
  * Parse .env file content into key-value pairs.
@@ -22,18 +22,18 @@ import type { ExtensionSetting } from './extensionSettings.js';
  */
 export function parseEnvFile(content: string): Record<string, string> {
   const result: Record<string, string> = {};
-  const lines = content.split('\n');
+  const lines = content.split("\n");
 
   for (const line of lines) {
     const trimmed = line.trim();
 
     // Skip empty lines and comments
-    if (!trimmed || trimmed.startsWith('#')) {
+    if (!trimmed || trimmed.startsWith("#")) {
       continue;
     }
 
     // Parse KEY=VALUE
-    const equalIndex = trimmed.indexOf('=');
+    const equalIndex = trimmed.indexOf("=");
     if (equalIndex === -1) {
       continue; // Invalid line, skip
     }
@@ -62,17 +62,17 @@ export function parseEnvFile(content: string): Record<string, string> {
 export function generateEnvFile(settings: Record<string, string>): string {
   const lines: string[] = [];
 
-  lines.push('# Extension Settings');
-  lines.push('# Generated by AIRIS Code');
-  lines.push('');
+  lines.push("# Extension Settings");
+  lines.push("# Generated by AIRIS Code");
+  lines.push("");
 
   for (const [key, value] of Object.entries(settings)) {
     // Quote values that contain spaces
-    const quotedValue = value.includes(' ') ? `"${value}"` : value;
+    const quotedValue = value.includes(" ") ? `"${value}"` : value;
     lines.push(`${key}=${quotedValue}`);
   }
 
-  return lines.join('\n') + '\n';
+  return lines.join("\n") + "\n";
 }
 
 /**
@@ -81,14 +81,14 @@ export function generateEnvFile(settings: Record<string, string>): string {
 export async function loadExtensionSettings(
   extensionPath: string,
 ): Promise<Record<string, string>> {
-  const envPath = path.join(extensionPath, '.env');
+  const envPath = path.join(extensionPath, ".env");
 
   try {
-    const content = await fs.promises.readFile(envPath, 'utf-8');
+    const content = await fs.promises.readFile(envPath, "utf-8");
     return parseEnvFile(content);
   } catch (error) {
     // If .env file doesn't exist, return empty object
-    if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
       return {};
     }
     throw error;
@@ -102,9 +102,9 @@ export async function saveExtensionSettings(
   extensionPath: string,
   settings: Record<string, string>,
 ): Promise<void> {
-  const envPath = path.join(extensionPath, '.env');
+  const envPath = path.join(extensionPath, ".env");
   const content = generateEnvFile(settings);
-  await fs.promises.writeFile(envPath, content, 'utf-8');
+  await fs.promises.writeFile(envPath, content, "utf-8");
 }
 
 /**
@@ -125,10 +125,8 @@ export function validateSettings(
 
     // Basic validation - check if value exists and is not empty
     // Note: All settings are optional in Gemini Extension format
-    if (value !== undefined && typeof value !== 'string') {
-      errors.push(
-        `Setting "${config.name}" (${config.envVar}) must be a string`,
-      );
+    if (value !== undefined && typeof value !== "string") {
+      errors.push(`Setting "${config.name}" (${config.envVar}) must be a string`);
     }
   }
 
diff --git a/packages/airiscode-core/src/extension/storage.ts b/packages/airiscode-core/src/extension/storage.ts
index fffddcd60..d5a3f592e 100644
--- a/packages/airiscode-core/src/extension/storage.ts
+++ b/packages/airiscode-core/src/extension/storage.ts
@@ -1,11 +1,8 @@
-import { Storage } from '../config/storage.js';
-import path from 'node:path';
-import * as os from 'node:os';
-import {
-  EXTENSION_SETTINGS_FILENAME,
-  EXTENSIONS_CONFIG_FILENAME,
-} from './variables.js';
-import * as fs from 'node:fs';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import path from "node:path";
+import { Storage } from "../config/storage.js";
+import { EXTENSION_SETTINGS_FILENAME, EXTENSIONS_CONFIG_FILENAME } from "./variables.js";
 
 export class ExtensionStorage {
   private readonly extensionName: string;
@@ -15,10 +12,7 @@ export class ExtensionStorage {
   }
 
   getExtensionDir(): string {
-    return path.join(
-      ExtensionStorage.getUserExtensionsDir(),
-      this.extensionName,
-    );
+    return path.join(ExtensionStorage.getUserExtensionsDir(), this.extensionName);
   }
 
   getConfigPath(): string {
@@ -36,15 +30,15 @@ export class ExtensionStorage {
       const tmpDir = os.tmpdir();
       if (!tmpDir) {
         // Ultimate fallback when both os.homedir and os.tmpdir are mocked
-        return '/tmp/.airiscode/extensions';
+        return "/tmp/.airiscode/extensions";
       }
-      return path.join(tmpDir, '.airiscode', 'extensions');
+      return path.join(tmpDir, ".airiscode", "extensions");
     }
     const storage = new Storage(homeDir);
     return storage.getExtensionsDir();
   }
 
   static async createTmpDir(): Promise<string> {
-    return await fs.promises.mkdtemp(path.join(os.tmpdir(), 'qwen-extension'));
+    return await fs.promises.mkdtemp(path.join(os.tmpdir(), "qwen-extension"));
   }
 }
diff --git a/packages/airiscode-core/src/extension/variableSchema.ts b/packages/airiscode-core/src/extension/variableSchema.ts
index e509eb05d..a1f3e9243 100644
--- a/packages/airiscode-core/src/extension/variableSchema.ts
+++ b/packages/airiscode-core/src/extension/variableSchema.ts
@@ -5,7 +5,7 @@
  */
 
 export interface VariableDefinition {
-  type: 'string';
+  type: "string";
   description: string;
   default?: string;
   required?: boolean;
@@ -21,23 +21,23 @@ export interface LoadExtensionContext {
 }
 
 const PATH_SEPARATOR_DEFINITION = {
-  type: 'string',
-  description: 'The path separator.',
+  type: "string",
+  description: "The path separator.",
 } as const;
 
 export const VARIABLE_SCHEMA = {
   extensionPath: {
-    type: 'string',
-    description: 'The path of the extension in the filesystem.',
+    type: "string",
+    description: "The path of the extension in the filesystem.",
   },
   CLAUDE_PLUGIN_ROOT: {
-    type: 'string',
-    description: 'The path of the extension in the filesystem.',
+    type: "string",
+    description: "The path of the extension in the filesystem.",
   },
   workspacePath: {
-    type: 'string',
-    description: 'The absolute path of the current workspace.',
+    type: "string",
+    description: "The absolute path of the current workspace.",
   },
-  '/': PATH_SEPARATOR_DEFINITION,
+  "/": PATH_SEPARATOR_DEFINITION,
   pathSeparator: PATH_SEPARATOR_DEFINITION,
 } as const;
diff --git a/packages/airiscode-core/src/extension/variables.ts b/packages/airiscode-core/src/extension/variables.ts
index c532256cc..f8e33a9f6 100644
--- a/packages/airiscode-core/src/extension/variables.ts
+++ b/packages/airiscode-core/src/extension/variables.ts
@@ -4,43 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type VariableSchema, VARIABLE_SCHEMA } from './variableSchema.js';
-import path from 'node:path';
-import { AIRISCODE_DIR } from '../config/storage.js';
-import type { HookDefinition } from '../hooks/types.js';
-import type { HookEventName } from '../hooks/types.js';
-import * as fs from 'node:fs';
-import { glob } from 'glob';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import * as fs from "node:fs";
+import path from "node:path";
+import { glob } from "glob";
+import { AIRISCODE_DIR } from "../config/storage.js";
+import type { HookDefinition, HookEventName } from "../hooks/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { VARIABLE_SCHEMA, type VariableSchema } from "./variableSchema.js";
 
-const debugLogger = createDebugLogger('Extension:variables');
+const debugLogger = createDebugLogger("Extension:variables");
 
 // Re-export types for substituteHookVariables
 export type { HookDefinition };
 
-export const EXTENSIONS_DIRECTORY_NAME = path.join(AIRISCODE_DIR, 'extensions');
-export const EXTENSIONS_CONFIG_FILENAME = 'qwen-extension.json';
-export const INSTALL_METADATA_FILENAME = '.qwen-extension-install.json';
-export const EXTENSION_SETTINGS_FILENAME = '.env';
+export const EXTENSIONS_DIRECTORY_NAME = path.join(AIRISCODE_DIR, "extensions");
+export const EXTENSIONS_CONFIG_FILENAME = "qwen-extension.json";
+export const INSTALL_METADATA_FILENAME = ".qwen-extension-install.json";
+export const EXTENSION_SETTINGS_FILENAME = ".env";
 
 export type JsonObject = { [key: string]: JsonValue };
 export type JsonArray = JsonValue[];
-export type JsonValue =
-  | string
-  | number
-  | boolean
-  | null
-  | JsonObject
-  | JsonArray;
+export type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
 
 export type VariableContext = {
   [key in keyof typeof VARIABLE_SCHEMA]?: string;
 };
 
-export function validateVariables(
-  variables: VariableContext,
-  schema: VariableSchema,
-) {
+export function validateVariables(variables: VariableContext, schema: VariableSchema) {
   for (const key in schema) {
     const definition = schema[key];
     if (definition.required && !variables[key as keyof VariableContext]) {
@@ -59,20 +49,17 @@ export function hydrateString(str: string, context: VariableContext): string {
   );
 }
 
-export function recursivelyHydrateStrings(
-  obj: JsonValue,
-  values: VariableContext,
-): JsonValue {
-  if (typeof obj === 'string') {
+export function recursivelyHydrateStrings(obj: JsonValue, values: VariableContext): JsonValue {
+  if (typeof obj === "string") {
     return hydrateString(obj, values);
   }
   if (Array.isArray(obj)) {
     return obj.map((item) => recursivelyHydrateStrings(item, values));
   }
-  if (typeof obj === 'object' && obj !== null) {
+  if (typeof obj === "object" && obj !== null) {
     const newObj: JsonObject = {};
     for (const key in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      if (Object.hasOwn(obj, key)) {
         newObj[key] = recursivelyHydrateStrings(obj[key], values);
       }
     }
@@ -103,11 +90,8 @@ export function substituteHookVariables(
       for (const hookDef of eventHooks) {
         if (hookDef.hooks && Array.isArray(hookDef.hooks)) {
           for (const hook of hookDef.hooks) {
-            if (hook.type === 'command' && hook.command) {
-              hook.command = hook.command.replace(
-                /\$\{CLAUDE_PLUGIN_ROOT\}/g,
-                basePath,
-              );
+            if (hook.type === "command" && hook.command) {
+              hook.command = hook.command.replace(/\$\{CLAUDE_PLUGIN_ROOT\}/g, basePath);
             }
           }
         }
@@ -125,7 +109,7 @@ export function substituteHookVariables(
  */
 export function performVariableReplacement(extensionPath: string): void {
   // Process markdown files
-  const mdGlobPattern = '**/*.md';
+  const mdGlobPattern = "**/*.md";
   const mdGlobOptions = {
     cwd: extensionPath,
     nodir: true,
@@ -138,19 +122,16 @@ export function performVariableReplacement(extensionPath: string): void {
       const filePath = path.join(extensionPath, file);
 
       try {
-        const content = fs.readFileSync(filePath, 'utf8');
+        const content = fs.readFileSync(filePath, "utf8");
 
         // Replace ${CLAUDE_PLUGIN_ROOT} with the actual extension path
-        const updatedContent = content.replace(
-          /\$\{CLAUDE_PLUGIN_ROOT\}/g,
-          extensionPath,
-        );
+        const updatedContent = content.replace(/\$\{CLAUDE_PLUGIN_ROOT\}/g, extensionPath);
 
         // Replace Markdown shell syntax ```! ... ``` with system-recognized !{...} syntax
         // This regex finds code blocks with ! language identifier and captures their content
         const syntaxUpdatedContent = updatedContent.replace(
           /```!(?:\s*\n)?([\s\S]*?)\n*```/g,
-          '!{$1}',
+          "!{$1}",
         );
 
         // Replace references to ".claude" directory with ".airiscode" in markdown files
@@ -158,15 +139,13 @@ export function performVariableReplacement(extensionPath: string): void {
         // Avoid matching URLs, comments, or string literals containing .claude
         const updatedMdContent = syntaxUpdatedContent.replace(
           /(\$\{?HOME\}?\/|~\/)?\.claude(\/|$)/g,
-          '$1.qwen$2',
+          "$1.qwen$2",
         );
 
         // Only write if content was actually changed
         if (updatedMdContent !== content) {
-          fs.writeFileSync(filePath, updatedMdContent, 'utf8');
-          debugLogger.debug(
-            `Updated variables, syntax, and .claude paths in file: ${filePath}`,
-          );
+          fs.writeFileSync(filePath, updatedMdContent, "utf8");
+          debugLogger.debug(`Updated variables, syntax, and .claude paths in file: ${filePath}`);
         }
       } catch (error) {
         debugLogger.warn(
@@ -181,7 +160,7 @@ export function performVariableReplacement(extensionPath: string): void {
   }
 
   // Process shell script files
-  const scriptGlobPattern = '**/*.sh';
+  const scriptGlobPattern = "**/*.sh";
   const scriptGlobOptions = {
     cwd: extensionPath,
     nodir: true,
@@ -194,13 +173,10 @@ export function performVariableReplacement(extensionPath: string): void {
       const filePath = path.join(extensionPath, file);
 
       try {
-        const content = fs.readFileSync(filePath, 'utf8');
+        const content = fs.readFileSync(filePath, "utf8");
 
         // Replace references to "role":"assistant" with "type":"assistant" in shell scripts
-        const updatedScriptContent = content.replace(
-          /"role":"assistant"/g,
-          '"type":"assistant"',
-        );
+        const updatedScriptContent = content.replace(/"role":"assistant"/g, '"type":"assistant"');
 
         // Replace transcript parsing logic to adapt to actual transcript structure
         // Change from .message.content | map(select(.type == "text")) to .message.parts | map(select(has("text")))
@@ -214,12 +190,12 @@ export function performVariableReplacement(extensionPath: string): void {
         // Avoid matching URLs, comments, or string literals containing .claude
         const finalScriptContent = adaptedScriptContent.replace(
           /(\$\{?HOME\}?\/|~\/)?\.claude(\/|$)/g,
-          '$1.qwen$2',
+          "$1.qwen$2",
         );
 
         // Only write if content was actually changed
         if (finalScriptContent !== content) {
-          fs.writeFileSync(filePath, finalScriptContent, 'utf8');
+          fs.writeFileSync(filePath, finalScriptContent, "utf8");
           debugLogger.debug(
             `Updated transcript format and replaced .claude with .qwen in shell script: ${filePath}`,
           );
diff --git a/packages/airiscode-core/src/followup/followupState.ts b/packages/airiscode-core/src/followup/followupState.ts
index 60e8f717a..529d21560 100644
--- a/packages/airiscode-core/src/followup/followupState.ts
+++ b/packages/airiscode-core/src/followup/followupState.ts
@@ -57,8 +57,8 @@ export interface FollowupControllerOptions {
    * at the generation site, not through this callback.
    */
   onOutcome?: (params: {
-    outcome: 'accepted' | 'ignored';
-    accept_method?: 'tab' | 'enter' | 'right';
+    outcome: "accepted" | "ignored";
+    accept_method?: "tab" | "enter" | "right";
     time_ms: number;
     suggestion_length: number;
   }) => void;
@@ -72,10 +72,7 @@ export interface FollowupControllerActions {
   /** Set suggestion text (with delayed show). Null clears immediately. */
   setSuggestion: (text: string | null) => void;
   /** Accept the current suggestion and invoke onAccept callback */
-  accept: (
-    method?: 'tab' | 'enter' | 'right',
-    options?: { skipOnAccept?: boolean },
-  ) => void;
+  accept: (method?: "tab" | "enter" | "right", options?: { skipOnAccept?: boolean }) => void;
   /** Dismiss/clear suggestion */
   dismiss: () => void;
   /** Hard-clear all state and timers */
@@ -139,7 +136,7 @@ export function createFollowupController(
   };
 
   const accept = (
-    method?: 'tab' | 'enter' | 'right',
+    method?: "tab" | "enter" | "right",
     options?: { skipOnAccept?: boolean },
   ): void => {
     if (accepting) {
@@ -162,14 +159,14 @@ export function createFollowupController(
 
     try {
       onOutcome?.({
-        outcome: 'accepted',
+        outcome: "accepted",
         accept_method: method,
         time_ms: shownAt > 0 ? Date.now() - shownAt : 0,
         suggestion_length: text.length,
       });
     } catch (e: unknown) {
       // eslint-disable-next-line no-console
-      console.error('[followup] onOutcome callback threw:', e);
+      console.error("[followup] onOutcome callback threw:", e);
     }
 
     applyState(INITIAL_FOLLOWUP_STATE);
@@ -181,7 +178,7 @@ export function createFollowupController(
         }
       } catch (error: unknown) {
         // eslint-disable-next-line no-console
-        console.error('[followup] onAccept callback threw:', error);
+        console.error("[followup] onAccept callback threw:", error);
       } finally {
         if (acceptTimeoutId) {
           clearTimeout(acceptTimeoutId);
@@ -208,14 +205,13 @@ export function createFollowupController(
     if (currentState.isVisible && currentState.suggestion) {
       try {
         onOutcome?.({
-          outcome: 'ignored',
-          time_ms:
-            currentState.shownAt > 0 ? Date.now() - currentState.shownAt : 0,
+          outcome: "ignored",
+          time_ms: currentState.shownAt > 0 ? Date.now() - currentState.shownAt : 0,
           suggestion_length: currentState.suggestion.length,
         });
       } catch (e: unknown) {
         // eslint-disable-next-line no-console
-        console.error('[followup] onOutcome callback threw:', e);
+        console.error("[followup] onOutcome callback threw:", e);
       }
     }
 
diff --git a/packages/airiscode-core/src/followup/forkedQuery.ts b/packages/airiscode-core/src/followup/forkedQuery.ts
index 3e589a147..7b3beff1c 100644
--- a/packages/airiscode-core/src/followup/forkedQuery.ts
+++ b/packages/airiscode-core/src/followup/forkedQuery.ts
@@ -17,19 +17,16 @@
  * generationConfig (including tools) for callers like speculation that need them.
  */
 
+import type { Config } from "../config/config.js";
+import { GeminiChat, StreamEventType } from "../core/geminiChat.js";
 import type {
   Content,
   GenerateContentConfig,
   GenerateContentResponseUsageMetadata,
-} from '../types/llm.js';
-import { GeminiChat, StreamEventType } from '../core/geminiChat.js';
-import type { Config } from '../config/config.js';
+} from "../types/llm.js";
 
 /** Per-request config that strips tools so the model never produces function calls. */
-const NO_TOOLS = Object.freeze({ tools: [] as const }) as Pick<
-  GenerateContentConfig,
-  'tools'
->;
+const NO_TOOLS = Object.freeze({ tools: [] as const }) as Pick<GenerateContentConfig, "tools">;
 
 /**
  * Snapshot of the main conversation's cache-critical parameters.
@@ -85,8 +82,7 @@ export function saveCacheSafeParams(
     JSON.stringify(prevConfig.systemInstruction) !==
       JSON.stringify(generationConfig.systemInstruction);
   const toolsChanged =
-    !prevConfig ||
-    JSON.stringify(prevConfig.tools) !== JSON.stringify(generationConfig.tools);
+    !prevConfig || JSON.stringify(prevConfig.tools) !== JSON.stringify(generationConfig.tools);
 
   if (sysChanged || toolsChanged) {
     currentVersion++;
@@ -104,9 +100,7 @@ export function saveCacheSafeParams(
  * Get the current cache-safe params, or null if not yet captured.
  */
 export function getCacheSafeParams(): CacheSafeParams | null {
-  return currentCacheSafeParams
-    ? structuredClone(currentCacheSafeParams)
-    : null;
+  return currentCacheSafeParams ? structuredClone(currentCacheSafeParams) : null;
 }
 
 /**
@@ -132,10 +126,7 @@ export function clearCacheSafeParams(): void {
  * The fork does NOT have chatRecordingService or telemetryService to avoid
  * polluting the main session's recordings and token counts.
  */
-export function createForkedChat(
-  config: Config,
-  params: CacheSafeParams,
-): GeminiChat {
+export function createForkedChat(config: Config, params: CacheSafeParams): GeminiChat {
   // Limit history to avoid excessive cost
   const maxHistoryEntries = 40;
   const history =
@@ -167,9 +158,7 @@ export function createForkedChat(
 // Forked query execution
 // ---------------------------------------------------------------------------
 
-function extractUsage(
-  metadata?: GenerateContentResponseUsageMetadata,
-): ForkedQueryResult['usage'] {
+function extractUsage(metadata?: GenerateContentResponseUsageMetadata): ForkedQueryResult["usage"] {
   return {
     inputTokens: metadata?.promptTokenCount ?? 0,
     outputTokens: metadata?.candidatesTokenCount ?? 0,
@@ -199,7 +188,7 @@ export async function runForkedQuery(
 ): Promise<ForkedQueryResult> {
   const params = getCacheSafeParams();
   if (!params) {
-    throw new Error('CacheSafeParams not available');
+    throw new Error("CacheSafeParams not available");
   }
 
   const model = options?.model ?? params.model;
@@ -213,7 +202,7 @@ export async function runForkedQuery(
     requestConfig.abortSignal = options.abortSignal;
   }
   if (options?.jsonSchema) {
-    requestConfig.responseMimeType = 'application/json';
+    requestConfig.responseMimeType = "application/json";
     requestConfig.responseJsonSchema = options.jsonSchema;
   }
 
@@ -223,12 +212,12 @@ export async function runForkedQuery(
       message: [{ text: userMessage }],
       config: requestConfig,
     },
-    'forked_query',
+    "forked_query",
   );
 
   // Collect the full response
-  let fullText = '';
-  let usage: ForkedQueryResult['usage'] = {
+  let fullText = "";
+  let usage: ForkedQueryResult["usage"] = {
     inputTokens: 0,
     outputTokens: 0,
     cacheHitTokens: 0,
@@ -238,9 +227,7 @@ export async function runForkedQuery(
     if (event.type !== StreamEventType.CHUNK) continue;
     const response = event.value;
     // Extract text from candidates
-    const text = response.candidates?.[0]?.content?.parts
-      ?.map((p) => p.text ?? '')
-      .join('');
+    const text = response.candidates?.[0]?.content?.parts?.map((p) => p.text ?? "").join("");
     if (text) {
       fullText += text;
     }
diff --git a/packages/airiscode-core/src/followup/index.ts b/packages/airiscode-core/src/followup/index.ts
index d05fa52fd..70a6641a5 100644
--- a/packages/airiscode-core/src/followup/index.ts
+++ b/packages/airiscode-core/src/followup/index.ts
@@ -8,9 +8,9 @@
  * Exports for the prompt suggestion feature.
  */
 
-export * from './followupState.js';
-export * from './suggestionGenerator.js';
-export * from './forkedQuery.js';
-export * from './overlayFs.js';
-export * from './speculationToolGate.js';
-export * from './speculation.js';
+export * from "./followupState.js";
+export * from "./forkedQuery.js";
+export * from "./overlayFs.js";
+export * from "./speculation.js";
+export * from "./speculationToolGate.js";
+export * from "./suggestionGenerator.js";
diff --git a/packages/airiscode-core/src/followup/overlayFs.ts b/packages/airiscode-core/src/followup/overlayFs.ts
index 6e115cc7e..db28ac07c 100644
--- a/packages/airiscode-core/src/followup/overlayFs.ts
+++ b/packages/airiscode-core/src/followup/overlayFs.ts
@@ -10,11 +10,11 @@
  * or the real filesystem.
  */
 
-import { mkdir, copyFile, rm } from 'node:fs/promises';
-import { existsSync } from 'node:fs';
-import { join, dirname, relative, isAbsolute } from 'node:path';
-import { tmpdir } from 'node:os';
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
+import { existsSync } from "node:fs";
+import { copyFile, mkdir, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { dirname, isAbsolute, join, relative } from "node:path";
 
 /**
  * Copy-on-write overlay filesystem for speculation safety.
@@ -25,12 +25,7 @@ export class OverlayFs {
 
   constructor(private readonly realCwd: string) {
     const id = randomUUID().slice(0, 8);
-    this.overlayDir = join(
-      tmpdir(),
-      'qwen-speculation',
-      String(process.pid),
-      id,
-    );
+    this.overlayDir = join(tmpdir(), "qwen-speculation", String(process.pid), id);
   }
 
   /** Get the overlay directory path */
@@ -128,11 +123,9 @@ export class OverlayFs {
    */
   private toRelative(inputPath: string): string | null {
     // Resolve relative paths against realCwd (not process.cwd())
-    const abs = isAbsolute(inputPath)
-      ? inputPath
-      : join(this.realCwd, inputPath);
+    const abs = isAbsolute(inputPath) ? inputPath : join(this.realCwd, inputPath);
     const rel = relative(this.realCwd, abs);
-    if (isAbsolute(rel) || rel.startsWith('..')) {
+    if (isAbsolute(rel) || rel.startsWith("..")) {
       return null;
     }
     return rel;
diff --git a/packages/airiscode-core/src/followup/speculation.ts b/packages/airiscode-core/src/followup/speculation.ts
index dc458dd95..97d99d658 100644
--- a/packages/airiscode-core/src/followup/speculation.ts
+++ b/packages/airiscode-core/src/followup/speculation.ts
@@ -15,18 +15,14 @@
  * 4. User types → abortSpeculation() cleans up
  */
 
-import type { Content, Part } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import type { GeminiClient } from '../core/client.js';
-import { StreamEventType } from '../core/geminiChat.js';
-import { OverlayFs } from './overlayFs.js';
-import { evaluateToolCall, rewritePathArgs } from './speculationToolGate.js';
-import {
-  getCacheSafeParams,
-  createForkedChat,
-  runForkedQuery,
-} from './forkedQuery.js';
-import { getFilterReason, SUGGESTION_PROMPT } from './suggestionGenerator.js';
+import type { Config } from "../config/config.js";
+import type { GeminiClient } from "../core/client.js";
+import { StreamEventType } from "../core/geminiChat.js";
+import type { Content, Part } from "../types/llm.js";
+import { createForkedChat, getCacheSafeParams, runForkedQuery } from "./forkedQuery.js";
+import { OverlayFs } from "./overlayFs.js";
+import { evaluateToolCall, rewritePathArgs } from "./speculationToolGate.js";
+import { getFilterReason, SUGGESTION_PROMPT } from "./suggestionGenerator.js";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -47,7 +43,7 @@ export interface BoundaryInfo {
 
 export interface SpeculationState {
   id: string;
-  status: 'idle' | 'running' | 'completed' | 'boundary' | 'aborted';
+  status: "idle" | "running" | "completed" | "boundary" | "aborted";
   suggestion: string;
   overlayFs: OverlayFs | null;
   abortController: AbortController | null;
@@ -67,9 +63,9 @@ export interface SpeculationResult {
 }
 
 export const IDLE_SPECULATION: Readonly<SpeculationState> = Object.freeze({
-  id: '',
-  status: 'idle' as const,
-  suggestion: '',
+  id: "",
+  status: "idle" as const,
+  suggestion: "",
   overlayFs: null,
   abortController: null,
   messages: [],
@@ -93,7 +89,7 @@ export async function startSpeculation(
 ): Promise<SpeculationState> {
   const cacheSafe = getCacheSafeParams();
   if (!cacheSafe) {
-    throw new Error('CacheSafeParams not available for speculation');
+    throw new Error("CacheSafeParams not available for speculation");
   }
 
   const abortController = new AbortController();
@@ -102,7 +98,7 @@ export async function startSpeculation(
   if (parentSignal?.aborted) {
     return {
       id: Math.random().toString(36).slice(2, 10),
-      status: 'aborted' as const,
+      status: "aborted" as const,
       suggestion,
       overlayFs: null,
       abortController,
@@ -116,7 +112,7 @@ export async function startSpeculation(
   let parentAbortHandler: (() => void) | undefined;
   if (parentSignal) {
     parentAbortHandler = () => abortController.abort();
-    parentSignal.addEventListener('abort', parentAbortHandler, { once: true });
+    parentSignal.addEventListener("abort", parentAbortHandler, { once: true });
   }
 
   const overlayFs = new OverlayFs(config.getCwd());
@@ -124,7 +120,7 @@ export async function startSpeculation(
 
   const state: SpeculationState = {
     id: Math.random().toString(36).slice(2, 10),
-    status: 'running',
+    status: "running",
     suggestion,
     overlayFs,
     abortController,
@@ -137,17 +133,17 @@ export async function startSpeculation(
   runSpeculativeLoop(config, state, cacheSafe, options?.model)
     .then(async (result) => {
       if (abortController.signal.aborted) {
-        state.status = 'aborted';
+        state.status = "aborted";
         await overlayFs.cleanup();
         return;
       }
-      if (state.status === 'running') {
+      if (state.status === "running") {
         state.messages = result.messages;
         if (result.boundary) {
           state.boundary = result.boundary;
-          state.status = 'boundary';
+          state.status = "boundary";
         } else {
-          state.status = 'completed';
+          state.status = "completed";
           // Generate pipelined suggestion for the next step
           if (!abortController.signal.aborted) {
             try {
@@ -158,7 +154,7 @@ export async function startSpeculation(
                 abortController.signal,
                 options?.model,
               );
-              if (next && state.status === 'completed') {
+              if (next && state.status === "completed") {
                 state.pipelinedSuggestion = next;
               }
             } catch {
@@ -170,15 +166,15 @@ export async function startSpeculation(
     })
     .catch(async () => {
       // Cleanup overlay on error (#16)
-      if (state.status === 'running') {
-        state.status = 'aborted';
+      if (state.status === "running") {
+        state.status = "aborted";
       }
       await overlayFs.cleanup();
     })
     .finally(() => {
       // Clean up parent signal listener (#20)
       if (parentSignal && parentAbortHandler) {
-        parentSignal.removeEventListener('abort', parentAbortHandler);
+        parentSignal.removeEventListener("abort", parentAbortHandler);
       }
     });
 
@@ -197,7 +193,7 @@ interface LoopResult {
 async function runSpeculativeLoop(
   config: Config,
   state: SpeculationState,
-  cacheSafe: import('./forkedQuery.js').CacheSafeParams,
+  cacheSafe: import("./forkedQuery.js").CacheSafeParams,
   modelOverride?: string,
 ): Promise<LoopResult> {
   const chat = createForkedChat(config, cacheSafe);
@@ -207,7 +203,7 @@ async function runSpeculativeLoop(
 
   // Add the suggestion as the initial user message
   const userMsg: Content = {
-    role: 'user',
+    role: "user",
     parts: [{ text: state.suggestion }],
   };
   messages.push(userMsg);
@@ -221,7 +217,7 @@ async function runSpeculativeLoop(
     const stream = await chat.sendMessageStream(
       model,
       { message: lastUserMsg.parts ?? [] },
-      'speculation',
+      "speculation",
     );
 
     const modelParts: Part[] = [];
@@ -232,7 +228,7 @@ async function runSpeculativeLoop(
       const parts = response.candidates?.[0]?.content?.parts ?? [];
       for (const part of parts) {
         // Skip thought/reasoning parts — only capture visible text + function calls
-        if (part.text && !(part as Record<string, unknown>)['thought']) {
+        if (part.text && !(part as Record<string, unknown>)["thought"]) {
           modelParts.push({ text: part.text });
         }
         if (part.functionCall && part.functionCall.name) {
@@ -249,12 +245,12 @@ async function runSpeculativeLoop(
     if (state.abortController?.signal.aborted) break;
     if (modelParts.length === 0) break;
 
-    const modelMsg: Content = { role: 'model', parts: modelParts };
+    const modelMsg: Content = { role: "model", parts: modelParts };
     messages.push(modelMsg);
 
     // Extract function calls from model response
     const functionCalls = modelParts.filter(
-      (p): p is Part & { functionCall: NonNullable<Part['functionCall']> } =>
+      (p): p is Part & { functionCall: NonNullable<Part["functionCall"]> } =>
         p.functionCall !== undefined,
     );
 
@@ -269,21 +265,16 @@ async function runSpeculativeLoop(
 
     for (const part of functionCalls) {
       const fc = part.functionCall;
-      const name = fc.name ?? '';
+      const name = fc.name ?? "";
       const args = (fc.args ?? {}) as Record<string, unknown>;
-      const gate = await evaluateToolCall(
-        name,
-        args,
-        state.overlayFs!,
-        approvalMode,
-      );
-
-      if (gate.action === 'boundary') {
+      const gate = await evaluateToolCall(name, args, state.overlayFs!, approvalMode);
+
+      if (gate.action === "boundary") {
         hitBoundary = true;
         break;
       }
 
-      if (gate.action === 'redirect') {
+      if (gate.action === "redirect") {
         try {
           await rewritePathArgs(args, state.overlayFs!);
         } catch {
@@ -313,7 +304,7 @@ async function runSpeculativeLoop(
         state.toolUseCount++;
 
         const responseContent =
-          typeof result.llmContent === 'string'
+          typeof result.llmContent === "string"
             ? { output: result.llmContent }
             : { output: JSON.stringify(result.llmContent) };
         functionResponses.push({
@@ -324,10 +315,7 @@ async function runSpeculativeLoop(
           functionResponse: {
             name,
             response: {
-              error:
-                error instanceof Error
-                  ? error.message
-                  : 'Tool execution failed',
+              error: error instanceof Error ? error.message : "Tool execution failed",
             },
           },
         });
@@ -352,22 +340,20 @@ async function runSpeculativeLoop(
         });
         if (keptModelParts.length > 0) {
           messages[messages.length - 1] = {
-            role: 'model',
+            role: "model",
             parts: keptModelParts,
           };
           // Add the tool results we have
-          messages.push({ role: 'user', parts: functionResponses });
+          messages.push({ role: "user", parts: functionResponses });
         } else {
           messages.pop();
         }
       } else {
         // No tools were executed — remove the model message entirely
-        const textOnlyParts = modelParts.filter(
-          (p) => p.functionCall === undefined,
-        );
+        const textOnlyParts = modelParts.filter((p) => p.functionCall === undefined);
         if (textOnlyParts.length > 0) {
           messages[messages.length - 1] = {
-            role: 'model',
+            role: "model",
             parts: textOnlyParts,
           };
         } else {
@@ -378,8 +364,8 @@ async function runSpeculativeLoop(
       return {
         messages,
         boundary: {
-          type: 'boundary',
-          detail: 'speculation_boundary',
+          type: "boundary",
+          detail: "speculation_boundary",
           completedAt: Date.now(),
         },
       };
@@ -387,7 +373,7 @@ async function runSpeculativeLoop(
 
     // Add tool results to history for next turn
     if (functionResponses.length > 0) {
-      const resultMsg: Content = { role: 'user', parts: functionResponses };
+      const resultMsg: Content = { role: "user", parts: functionResponses };
       messages.push(resultMsg);
     }
   }
@@ -413,9 +399,7 @@ export async function acceptSpeculation(
 
   try {
     // Copy overlay files to real filesystem
-    const filesApplied = state.overlayFs
-      ? await state.overlayFs.applyToReal()
-      : [];
+    const filesApplied = state.overlayFs ? await state.overlayFs.applyToReal() : [];
 
     // Ensure tool result pairing is complete before injection
     const cleanMessages = ensureToolResultPairing(state.messages);
@@ -425,7 +409,7 @@ export async function acceptSpeculation(
       await geminiClient.addHistory(msg);
     }
 
-    state.status = 'completed';
+    state.status = "completed";
 
     return {
       filesApplied,
@@ -451,7 +435,7 @@ export async function acceptSpeculation(
  */
 export async function abortSpeculation(state: SpeculationState): Promise<void> {
   state.abortController?.abort();
-  state.status = 'aborted';
+  state.status = "aborted";
   if (state.overlayFs) {
     await state.overlayFs.cleanup();
   }
@@ -473,16 +457,12 @@ export function ensureToolResultPairing(messages: Content[]): Content[] {
   const lastMsg = result[result.length - 1];
 
   // If last message is model with function calls but no following user response
-  if (lastMsg.role === 'model' && lastMsg.parts) {
-    const hasFunctionCalls = lastMsg.parts.some(
-      (p) => p.functionCall !== undefined,
-    );
+  if (lastMsg.role === "model" && lastMsg.parts) {
+    const hasFunctionCalls = lastMsg.parts.some((p) => p.functionCall !== undefined);
     if (hasFunctionCalls) {
-      const textParts = lastMsg.parts.filter(
-        (p) => p.functionCall === undefined,
-      );
+      const textParts = lastMsg.parts.filter((p) => p.functionCall === undefined);
       if (textParts.length > 0) {
-        result[result.length - 1] = { role: 'model', parts: textParts };
+        result[result.length - 1] = { role: "model", parts: textParts };
       } else {
         result.pop();
       }
@@ -500,15 +480,14 @@ export function ensureToolResultPairing(messages: Content[]): Content[] {
 // to ensure pipelined suggestions have the same quality as initial suggestions.
 
 const PIPELINED_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     suggestion: {
-      type: 'string',
-      description:
-        'The predicted next user input (2-12 words), or empty string.',
+      type: "string",
+      description: "The predicted next user input (2-12 words), or empty string.",
     },
   },
-  required: ['suggestion'],
+  required: ["suggestion"],
 };
 
 /**
@@ -525,15 +504,15 @@ async function generatePipelinedSuggestion(
   try {
     // Build augmented prompt that includes the speculated context inline
     const speculatedSummary = speculatedMessages
-      .filter((m) => m.role === 'model')
+      .filter((m) => m.role === "model")
       .flatMap((m) => m.parts ?? [])
-      .map((p) => p.text ?? '')
+      .map((p) => p.text ?? "")
       .filter(Boolean)
-      .join('\n')
+      .join("\n")
       .slice(0, 500);
 
     const augmentedPrompt = `The user just said: "${suggestionText}"
-The assistant responded: ${speculatedSummary || '(tool calls executed)'}
+The assistant responded: ${speculatedSummary || "(tool calls executed)"}
 
 ${SUGGESTION_PROMPT}`;
 
@@ -547,8 +526,8 @@ ${SUGGESTION_PROMPT}`;
 
     let raw: string | null = null;
     if (result.jsonResult) {
-      const val = result.jsonResult['suggestion'];
-      raw = typeof val === 'string' ? val.trim() : null;
+      const val = result.jsonResult["suggestion"];
+      raw = typeof val === "string" ? val.trim() : null;
     } else if (result.text) {
       raw = result.text;
     }
diff --git a/packages/airiscode-core/src/followup/speculationToolGate.ts b/packages/airiscode-core/src/followup/speculationToolGate.ts
index 98a4452bb..7346744c4 100644
--- a/packages/airiscode-core/src/followup/speculationToolGate.ts
+++ b/packages/airiscode-core/src/followup/speculationToolGate.ts
@@ -15,13 +15,13 @@
  * write tools hit boundary — no silent writes without user consent.
  */
 
-import { ToolNames } from '../tools/tool-names.js';
-import { isShellCommandReadOnlyAST } from '../utils/shellAstParser.js';
-import { ApprovalMode } from '../config/config.js';
-import type { OverlayFs } from './overlayFs.js';
+import { ApprovalMode } from "../config/config.js";
+import { ToolNames } from "../tools/tool-names.js";
+import { isShellCommandReadOnlyAST } from "../utils/shellAstParser.js";
+import type { OverlayFs } from "./overlayFs.js";
 
 export interface ToolGateResult {
-  action: 'allow' | 'redirect' | 'boundary';
+  action: "allow" | "redirect" | "boundary";
   reason?: string;
 }
 
@@ -70,43 +70,40 @@ export async function evaluateToolCall(
   if (SAFE_READ_ONLY_TOOLS.has(toolName)) {
     // Rewrite read paths to overlay if file was previously written there
     await resolveReadPaths(args, overlayFs);
-    return { action: 'allow' };
+    return { action: "allow" };
   }
 
   // Write tools — only redirect to overlay if approval mode permits auto-edits
   if (WRITE_TOOLS.has(toolName)) {
-    if (
-      approvalMode === ApprovalMode.AUTO_EDIT ||
-      approvalMode === ApprovalMode.YOLO
-    ) {
-      return { action: 'redirect', reason: `write_tool:${toolName}` };
+    if (approvalMode === ApprovalMode.AUTO_EDIT || approvalMode === ApprovalMode.YOLO) {
+      return { action: "redirect", reason: `write_tool:${toolName}` };
     }
     // In default/plan mode, writes are a boundary — don't silently edit
     return {
-      action: 'boundary',
+      action: "boundary",
       reason: `write_tool_no_auto:${toolName}`,
     };
   }
 
   // Shell — use AST parser for accurate read-only detection
   if (toolName === ToolNames.SHELL) {
-    const command = typeof args['command'] === 'string' ? args['command'] : '';
+    const command = typeof args["command"] === "string" ? args["command"] : "";
     if (command && (await isShellCommandReadOnlyAST(command))) {
-      return { action: 'allow' };
+      return { action: "allow" };
     }
     return {
-      action: 'boundary',
-      reason: `shell:${command.slice(0, 50) || 'empty'}`,
+      action: "boundary",
+      reason: `shell:${command.slice(0, 50) || "empty"}`,
     };
   }
 
   // Known boundary tools
   if (BOUNDARY_TOOLS.has(toolName)) {
-    return { action: 'boundary', reason: `denied_tool:${toolName}` };
+    return { action: "boundary", reason: `denied_tool:${toolName}` };
   }
 
   // Unknown tools (including MCP/discovered) — boundary for safety
-  return { action: 'boundary', reason: `unknown_tool:${toolName}` };
+  return { action: "boundary", reason: `unknown_tool:${toolName}` };
 }
 
 /**
@@ -118,9 +115,9 @@ async function resolveReadPaths(
   args: Record<string, unknown>,
   overlayFs: OverlayFs,
 ): Promise<void> {
-  const pathKeys = ['file_path', 'filePath', 'path', 'notebook_path'];
+  const pathKeys = ["file_path", "filePath", "path", "notebook_path"];
   for (const key of pathKeys) {
-    if (typeof args[key] === 'string') {
+    if (typeof args[key] === "string") {
       args[key] = overlayFs.resolveReadPath(args[key] as string);
       return;
     }
@@ -136,9 +133,9 @@ export async function rewritePathArgs(
   overlayFs: OverlayFs,
 ): Promise<void> {
   // Common path argument names used by Edit and WriteFile tools
-  const pathKeys = ['file_path', 'filePath', 'path', 'notebook_path'];
+  const pathKeys = ["file_path", "filePath", "path", "notebook_path"];
   for (const key of pathKeys) {
-    if (typeof args[key] === 'string') {
+    if (typeof args[key] === "string") {
       args[key] = await overlayFs.redirectWrite(args[key] as string);
       return;
     }
diff --git a/packages/airiscode-core/src/followup/suggestionGenerator.ts b/packages/airiscode-core/src/followup/suggestionGenerator.ts
index 0495d20e4..efdca46e0 100644
--- a/packages/airiscode-core/src/followup/suggestionGenerator.ts
+++ b/packages/airiscode-core/src/followup/suggestionGenerator.ts
@@ -9,14 +9,11 @@
  * type next (Next-step Suggestion / NES).
  */
 
-import type { Content } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import { getCacheSafeParams, runForkedQuery } from './forkedQuery.js';
-import {
-  uiTelemetryService,
-  EVENT_API_RESPONSE,
-} from '../telemetry/uiTelemetry.js';
-import { ApiResponseEvent } from '../telemetry/types.js';
+import type { Config } from "../config/config.js";
+import { ApiResponseEvent } from "../telemetry/types.js";
+import { EVENT_API_RESPONSE, uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import type { Content } from "../types/llm.js";
+import { getCacheSafeParams, runForkedQuery } from "./forkedQuery.js";
 
 /**
  * Prompt for suggestion generation.
@@ -64,15 +61,15 @@ Reply with ONLY the suggestion, no quotes or explanation.`;
  * JSON schema for the suggestion response.
  */
 const SUGGESTION_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     suggestion: {
-      type: 'string',
+      type: "string",
       description:
-        'The predicted next user input (2-12 words), or empty string if nothing obvious.',
+        "The predicted next user input (2-12 words), or empty string if nothing obvious.",
     },
   },
-  required: ['suggestion'],
+  required: ["suggestion"],
 };
 
 /** Minimum assistant turns before generating suggestions */
@@ -93,11 +90,9 @@ export async function generatePromptSuggestion(
   options?: { enableCacheSharing?: boolean; model?: string },
 ): Promise<{ suggestion: string | null; filterReason?: string }> {
   // Don't suggest in very early conversations
-  const modelTurns = conversationHistory.filter(
-    (c) => c.role === 'model',
-  ).length;
+  const modelTurns = conversationHistory.filter((c) => c.role === "model").length;
   if (modelTurns < MIN_ASSISTANT_TURNS) {
-    return { suggestion: null, filterReason: 'early_conversation' };
+    return { suggestion: null, filterReason: "early_conversation" };
   }
 
   try {
@@ -106,17 +101,12 @@ export async function generatePromptSuggestion(
     const modelOverride = options?.model;
     const raw = cacheSafe
       ? await generateViaForkedQuery(config, abortSignal, modelOverride)
-      : await generateViaBaseLlm(
-          config,
-          conversationHistory,
-          abortSignal,
-          modelOverride,
-        );
+      : await generateViaBaseLlm(config, conversationHistory, abortSignal, modelOverride);
 
-    const suggestion = typeof raw === 'string' ? raw.trim() : null;
+    const suggestion = typeof raw === "string" ? raw.trim() : null;
 
     if (!suggestion) {
-      return { suggestion: null, filterReason: 'empty' };
+      return { suggestion: null, filterReason: "empty" };
     }
 
     const filterReason = getFilterReason(suggestion);
@@ -129,7 +119,7 @@ export async function generatePromptSuggestion(
     if (abortSignal.aborted) {
       return { suggestion: null };
     }
-    return { suggestion: null, filterReason: 'error' };
+    return { suggestion: null, filterReason: "error" };
   }
 }
 
@@ -163,16 +153,16 @@ async function generateViaForkedQuery(
   }
 
   if (result.jsonResult) {
-    const raw = result.jsonResult['suggestion'];
-    return typeof raw === 'string' ? raw : null;
+    const raw = result.jsonResult["suggestion"];
+    return typeof raw === "string" ? raw : null;
   }
 
   // Fallback: try parsing text as JSON
   if (result.text) {
     try {
       const parsed = JSON.parse(result.text) as Record<string, unknown>;
-      const raw = parsed['suggestion'];
-      return typeof raw === 'string' ? raw : null;
+      const raw = parsed["suggestion"];
+      return typeof raw === "string" ? raw : null;
     } catch {
       // Model returned plain text — use it directly
       return result.text;
@@ -192,7 +182,7 @@ async function generateViaBaseLlm(
   const model = modelOverride || config.getModel();
   const contents: Content[] = [
     ...conversationHistory,
-    { role: 'user', parts: [{ text: SUGGESTION_PROMPT }] },
+    { role: "user", parts: [{ text: SUGGESTION_PROMPT }] },
   ];
 
   const generator = config.getContentGenerator();
@@ -207,7 +197,7 @@ async function generateViaBaseLlm(
         thinkingConfig: { includeThoughts: false },
       },
     },
-    'prompt_suggestion',
+    "prompt_suggestion",
   );
   const durationMs = Date.now() - startTime;
 
@@ -218,15 +208,15 @@ async function generateViaBaseLlm(
   }
 
   const text = response.candidates?.[0]?.content?.parts
-    ?.map((p) => p.text ?? '')
-    .join('')
+    ?.map((p) => p.text ?? "")
+    .join("")
     .trim();
   if (text) {
     // Try to parse as JSON first (model might return {"suggestion": "..."})
     try {
       const parsed = JSON.parse(text) as Record<string, unknown>;
-      const s = parsed['suggestion'];
-      if (typeof s === 'string') return s;
+      const s = parsed["suggestion"];
+      if (typeof s === "string") return s;
     } catch {
       // Not JSON — use raw text as the suggestion
     }
@@ -238,23 +228,23 @@ async function generateViaBaseLlm(
 
 /** Single-word suggestions allowed through the too_few_words filter */
 const ALLOWED_SINGLE_WORDS = new Set([
-  'yes',
-  'yeah',
-  'yep',
-  'yea',
-  'yup',
-  'sure',
-  'ok',
-  'okay',
-  'push',
-  'commit',
-  'deploy',
-  'stop',
-  'continue',
-  'check',
-  'exit',
-  'quit',
-  'no',
+  "yes",
+  "yeah",
+  "yep",
+  "yea",
+  "yup",
+  "sure",
+  "ok",
+  "okay",
+  "push",
+  "commit",
+  "deploy",
+  "stop",
+  "continue",
+  "check",
+  "exit",
+  "quit",
+  "no",
 ]);
 
 /**
@@ -264,59 +254,57 @@ export function getFilterReason(suggestion: string): string | null {
   const lower = suggestion.toLowerCase();
   const wordCount = suggestion.trim().split(/\s+/).length;
 
-  if (lower === 'done') return 'done';
+  if (lower === "done") return "done";
 
   if (
-    lower === 'nothing found' ||
-    lower === 'nothing found.' ||
-    lower.startsWith('nothing to suggest') ||
-    lower.startsWith('no suggestion') ||
+    lower === "nothing found" ||
+    lower === "nothing found." ||
+    lower.startsWith("nothing to suggest") ||
+    lower.startsWith("no suggestion") ||
     /\bsilence is\b|\bstay(s|ing)? silent\b/.test(lower) ||
     /^\W*silence\W*$/.test(lower)
   ) {
-    return 'meta_text';
+    return "meta_text";
   }
 
-  if (/^\(.*\)$|^\[.*\]$/.test(suggestion)) return 'meta_wrapped';
+  if (/^\(.*\)$|^\[.*\]$/.test(suggestion)) return "meta_wrapped";
 
   if (
-    lower.startsWith('api error:') ||
-    lower.startsWith('prompt is too long') ||
-    lower.startsWith('request timed out') ||
-    lower.startsWith('invalid api key') ||
-    lower.startsWith('image was too large')
+    lower.startsWith("api error:") ||
+    lower.startsWith("prompt is too long") ||
+    lower.startsWith("request timed out") ||
+    lower.startsWith("invalid api key") ||
+    lower.startsWith("image was too large")
   ) {
-    return 'error_message';
+    return "error_message";
   }
 
-  if (/^\w+:\s/.test(suggestion)) return 'prefixed_label';
+  if (/^\w+:\s/.test(suggestion)) return "prefixed_label";
 
   // CJK text has no spaces — skip whitespace-based word count checks
   // and use character count instead
-  const hasCJK = /[\u4e00-\u9fff\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/.test(
-    suggestion,
-  );
+  const hasCJK = /[\u4e00-\u9fff\u3040-\u309f\u30a0-\u30ff\uac00-\ud7af]/.test(suggestion);
   if (!hasCJK) {
     if (wordCount < 2) {
-      if (suggestion.startsWith('/')) return null; // slash commands ok
-      if (!ALLOWED_SINGLE_WORDS.has(lower)) return 'too_few_words';
+      if (suggestion.startsWith("/")) return null; // slash commands ok
+      if (!ALLOWED_SINGLE_WORDS.has(lower)) return "too_few_words";
     }
-    if (wordCount > 12) return 'too_many_words';
+    if (wordCount > 12) return "too_many_words";
   } else {
     // For CJK: filter if too short (< 2 chars) or too long (> 30 chars)
-    if (suggestion.length < 2) return 'too_few_words';
-    if (suggestion.length > 30) return 'too_many_words';
+    if (suggestion.length < 2) return "too_few_words";
+    if (suggestion.length > 30) return "too_many_words";
   }
-  if (suggestion.length >= 100) return 'too_long';
-  if (/[.!?]\s+[A-Z]/.test(suggestion)) return 'multiple_sentences';
-  if (/[\n*]|\*\*/.test(suggestion)) return 'has_formatting';
+  if (suggestion.length >= 100) return "too_long";
+  if (/[.!?]\s+[A-Z]/.test(suggestion)) return "multiple_sentences";
+  if (/[\n*]|\*\*/.test(suggestion)) return "has_formatting";
 
   if (
     /\bthanks\b|\bthank you\b|\blooks good\b|\bsounds good\b|\bthat works\b|\bthat worked\b|\bthat's all\b|\bnice\b|\bgreat\b|\bperfect\b|\bmakes sense\b|\bawesome\b|\bexcellent\b/.test(
       lower,
     )
   ) {
-    return 'evaluative';
+    return "evaluative";
   }
 
   if (
@@ -324,7 +312,7 @@ export function getFilterReason(suggestion: string): string | null {
       suggestion,
     )
   ) {
-    return 'ai_voice';
+    return "ai_voice";
   }
 
   return null;
@@ -353,10 +341,10 @@ function reportSuggestionUsage(
   durationMs: number,
 ): void {
   const event = new ApiResponseEvent(
-    'suggestion-' + Date.now(),
+    "suggestion-" + Date.now(),
     model,
     durationMs,
-    'prompt_suggestion',
+    "prompt_suggestion",
     undefined,
     {
       promptTokenCount: usage.promptTokenCount ?? 0,
@@ -368,7 +356,7 @@ function reportSuggestionUsage(
   );
   // Override event.name to match UiEvent type (UiTelemetryService switch)
   const uiEvent = Object.assign(event, {
-    'event.name': EVENT_API_RESPONSE as typeof EVENT_API_RESPONSE,
+    "event.name": EVENT_API_RESPONSE as typeof EVENT_API_RESPONSE,
   });
   uiTelemetryService.addEvent(uiEvent);
 }
diff --git a/packages/airiscode-core/src/hooks/hookAggregator.ts b/packages/airiscode-core/src/hooks/hookAggregator.ts
index 32da197cb..4ef7d73b1 100644
--- a/packages/airiscode-core/src/hooks/hookAggregator.ts
+++ b/packages/airiscode-core/src/hooks/hookAggregator.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { HookExecutionResult, HookOutput } from "./types.js";
 import {
-  HookEventName,
   DefaultHookOutput,
-  PreToolUseHookOutput,
-  PostToolUseHookOutput,
+  HookEventName,
+  PermissionRequestHookOutput,
   PostToolUseFailureHookOutput,
+  PostToolUseHookOutput,
+  PreToolUseHookOutput,
   StopHookOutput,
-  PermissionRequestHookOutput,
-} from './types.js';
-import type { HookOutput, HookExecutionResult } from './types.js';
+} from "./types.js";
 
 /**
  * Aggregated result from multiple hook executions
@@ -36,10 +36,7 @@ export class HookAggregator {
   /**
    * Aggregate results from multiple hook executions
    */
-  aggregateResults(
-    results: HookExecutionResult[],
-    eventName: HookEventName,
-  ): AggregatedHookResult {
+  aggregateResults(results: HookExecutionResult[], eventName: HookEventName): AggregatedHookResult {
     const allOutputs: HookOutput[] = [];
     const errors: Error[] = [];
     let totalDuration = 0;
@@ -71,10 +68,7 @@ export class HookAggregator {
   /**
    * Merge multiple hook outputs based on event type
    */
-  private mergeOutputs(
-    outputs: HookOutput[],
-    eventName: HookEventName,
-  ): HookOutput | undefined {
+  private mergeOutputs(outputs: HookOutput[], eventName: HookEventName): HookOutput | undefined {
     if (outputs.length === 0) {
       return undefined;
     }
@@ -114,10 +108,7 @@ export class HookAggregator {
    * - Additional context is concatenated
    * - For PostToolUse, decision and reason are required fields
    */
-  private mergeWithOrLogic(
-    outputs: HookOutput[],
-    _eventName?: HookEventName,
-  ): HookOutput {
+  private mergeWithOrLogic(outputs: HookOutput[], _eventName?: HookEventName): HookOutput {
     const merged: HookOutput = {};
     const reasons: string[] = [];
     const additionalContexts: string[] = [];
@@ -128,7 +119,7 @@ export class HookAggregator {
 
     for (const output of outputs) {
       // Check for blocking decisions
-      if (output.decision === 'block' || output.decision === 'deny') {
+      if (output.decision === "block" || output.decision === "deny") {
         hasBlock = true;
       }
 
@@ -151,7 +142,7 @@ export class HookAggregator {
       // Collect other hookSpecificOutput fields (later values win)
       if (output.hookSpecificOutput) {
         for (const [key, value] of Object.entries(output.hookSpecificOutput)) {
-          if (key !== 'additionalContext') {
+          if (key !== "additionalContext") {
             otherHookSpecificFields[key] = value;
           }
         }
@@ -168,14 +159,14 @@ export class HookAggregator {
 
     // Set merged decision
     if (hasBlock) {
-      merged.decision = 'block';
-    } else if (outputs.some((o) => o.decision === 'allow')) {
-      merged.decision = 'allow';
+      merged.decision = "block";
+    } else if (outputs.some((o) => o.decision === "allow")) {
+      merged.decision = "allow";
     }
 
     // Set merged reason
     if (reasons.length > 0) {
-      merged.reason = reasons.join('\n');
+      merged.reason = reasons.join("\n");
     }
 
     // Set continue flag
@@ -191,7 +182,7 @@ export class HookAggregator {
       ...otherHookSpecificFields,
     };
     if (additionalContexts.length > 0) {
-      hookSpecificOutput['additionalContext'] = additionalContexts.join('\n');
+      hookSpecificOutput["additionalContext"] = additionalContexts.join("\n");
     }
 
     if (Object.keys(hookSpecificOutput).length > 0) {
@@ -224,7 +215,7 @@ export class HookAggregator {
       const specific = output.hookSpecificOutput;
       if (!specific) continue;
 
-      const decision = specific['decision'] as
+      const decision = specific["decision"] as
         | {
             behavior?: string;
             message?: string;
@@ -237,31 +228,31 @@ export class HookAggregator {
       if (!decision) continue;
 
       // Check behavior
-      if (decision['behavior'] === 'deny') {
+      if (decision["behavior"] === "deny") {
         hasDeny = true;
-      } else if (decision['behavior'] === 'allow') {
+      } else if (decision["behavior"] === "allow") {
         hasAllow = true;
       }
 
       // Collect message
-      if (decision['message']) {
-        messages.push(decision['message'] as string);
+      if (decision["message"]) {
+        messages.push(decision["message"] as string);
       }
 
       // Check interrupt - true wins
-      if (decision['interrupt'] === true) {
+      if (decision["interrupt"] === true) {
         interrupt = true;
       }
 
       // Collect updatedInput - use last non-empty
-      if (decision['updatedInput']) {
-        updatedInput = decision['updatedInput'] as Record<string, unknown>;
+      if (decision["updatedInput"]) {
+        updatedInput = decision["updatedInput"] as Record<string, unknown>;
       }
 
       // Collect updatedPermissions
-      if (decision['updatedPermissions']) {
+      if (decision["updatedPermissions"]) {
         allUpdatedPermissions.push(
-          ...(decision['updatedPermissions'] as Array<{
+          ...(decision["updatedPermissions"] as Array<{
             type: string;
             tool?: string;
           }>),
@@ -281,25 +272,25 @@ export class HookAggregator {
     const mergedDecision: Record<string, unknown> = {};
 
     if (hasDeny) {
-      mergedDecision['behavior'] = 'deny';
+      mergedDecision["behavior"] = "deny";
     } else if (hasAllow) {
-      mergedDecision['behavior'] = 'allow';
+      mergedDecision["behavior"] = "allow";
     }
 
     if (messages.length > 0) {
-      mergedDecision['message'] = messages.join('\n');
+      mergedDecision["message"] = messages.join("\n");
     }
 
     if (interrupt) {
-      mergedDecision['interrupt'] = true;
+      mergedDecision["interrupt"] = true;
     }
 
     if (updatedInput) {
-      mergedDecision['updatedInput'] = updatedInput;
+      mergedDecision["updatedInput"] = updatedInput;
     }
 
     if (allUpdatedPermissions.length > 0) {
-      mergedDecision['updatedPermissions'] = allUpdatedPermissions;
+      mergedDecision["updatedPermissions"] = allUpdatedPermissions;
     }
 
     merged.hookSpecificOutput = {
@@ -327,7 +318,7 @@ export class HookAggregator {
     if (additionalContexts.length > 0) {
       merged.hookSpecificOutput = {
         ...merged.hookSpecificOutput,
-        additionalContext: additionalContexts.join('\n'),
+        additionalContext: additionalContexts.join("\n"),
       };
     }
 
@@ -361,21 +352,15 @@ export class HookAggregator {
   /**
    * Extract additional context from hook-specific outputs
    */
-  private extractAdditionalContext(
-    output: HookOutput,
-    contexts: string[],
-  ): void {
+  private extractAdditionalContext(output: HookOutput, contexts: string[]): void {
     const specific = output.hookSpecificOutput;
     if (!specific) {
       return;
     }
 
     // Extract additionalContext from various hook types
-    if (
-      'additionalContext' in specific &&
-      typeof specific['additionalContext'] === 'string'
-    ) {
-      contexts.push(specific['additionalContext']);
+    if ("additionalContext" in specific && typeof specific["additionalContext"] === "string") {
+      contexts.push(specific["additionalContext"]);
     }
   }
 }
diff --git a/packages/airiscode-core/src/hooks/hookEventHandler.ts b/packages/airiscode-core/src/hooks/hookEventHandler.ts
index ae3602ab9..e5b127a9b 100644
--- a/packages/airiscode-core/src/hooks/hookEventHandler.ts
+++ b/packages/airiscode-core/src/hooks/hookEventHandler.ts
@@ -4,40 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { HookPlanner, HookEventContext } from './hookPlanner.js';
-import type { HookRunner } from './hookRunner.js';
-import type { HookAggregator, AggregatedHookResult } from './hookAggregator.js';
-import { HookEventName } from './types.js';
+import type { Config } from "../config/config.js";
+import { logHookCall } from "../telemetry/loggers.js";
+import { HookCallEvent } from "../telemetry/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import type { AggregatedHookResult, HookAggregator } from "./hookAggregator.js";
+import type { HookEventContext, HookPlanner } from "./hookPlanner.js";
+import type { HookRunner } from "./hookRunner.js";
 import type {
+  AgentType,
   HookConfig,
-  HookInput,
   HookExecutionResult,
-  UserPromptSubmitInput,
-  StopInput,
-  SessionStartInput,
-  SessionEndInput,
-  SessionStartSource,
-  SessionEndReason,
-  AgentType,
-  PreToolUseInput,
-  PostToolUseInput,
-  PostToolUseFailureInput,
-  PreCompactInput,
-  PreCompactTrigger,
+  HookInput,
   NotificationInput,
   NotificationType,
   PermissionRequestInput,
   PermissionSuggestion,
+  PostToolUseFailureInput,
+  PostToolUseInput,
+  PreCompactInput,
+  PreCompactTrigger,
+  PreToolUseInput,
+  SessionEndInput,
+  SessionEndReason,
+  SessionStartInput,
+  SessionStartSource,
+  StopInput,
   SubagentStartInput,
   SubagentStopInput,
-} from './types.js';
-import { PermissionMode } from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { logHookCall } from '../telemetry/loggers.js';
-import { HookCallEvent } from '../telemetry/types.js';
+  UserPromptSubmitInput,
+} from "./types.js";
+import { HookEventName, PermissionMode } from "./types.js";
 
-const debugLogger = createDebugLogger('TRUSTED_HOOKS');
+const debugLogger = createDebugLogger("TRUSTED_HOOKS");
 
 /**
  * Hook event bus that coordinates hook execution across the system
@@ -73,12 +72,7 @@ export class HookEventHandler {
       prompt,
     };
 
-    return this.executeHooks(
-      HookEventName.UserPromptSubmit,
-      input,
-      undefined,
-      signal,
-    );
+    return this.executeHooks(HookEventName.UserPromptSubmit, input, undefined, signal);
   }
 
   /**
@@ -87,7 +81,7 @@ export class HookEventHandler {
    */
   async fireStopEvent(
     stopHookActive: boolean = false,
-    lastAssistantMessage: string = '',
+    lastAssistantMessage: string = "",
     signal?: AbortSignal,
   ): Promise<AggregatedHookResult> {
     const input: StopInput = {
@@ -255,7 +249,7 @@ export class HookEventHandler {
    */
   async firePreCompactEvent(
     trigger: PreCompactTrigger,
-    customInstructions: string = '',
+    customInstructions: string = "",
     signal?: AbortSignal,
   ): Promise<AggregatedHookResult> {
     const input: PreCompactInput = {
@@ -427,7 +421,7 @@ export class HookEventHandler {
       const onHookEnd = (config: HookConfig, result: HookExecutionResult) => {
         const hookName = this.getHookName(config);
         debugLogger.debug(
-          `Hook ${hookName} ended for event ${eventName}: ${result.success ? 'success' : 'failed'}`,
+          `Hook ${hookName} ended for event ${eventName}: ${result.success ? "success" : "failed"}`,
         );
       };
 
@@ -451,10 +445,7 @@ export class HookEventHandler {
           );
 
       // Aggregate results
-      const aggregated = this.hookAggregator.aggregateResults(
-        results,
-        eventName,
-      );
+      const aggregated = this.hookAggregator.aggregateResults(results, eventName);
 
       // Process common hook output fields centrally
       this.processCommonHookOutputFields(aggregated);
@@ -494,9 +485,7 @@ export class HookEventHandler {
   /**
    * Process common hook output fields centrally
    */
-  private processCommonHookOutputFields(
-    aggregated: AggregatedHookResult,
-  ): void {
+  private processCommonHookOutputFields(aggregated: AggregatedHookResult): void {
     if (!aggregated.finalOutput) {
       return;
     }
@@ -510,9 +499,7 @@ export class HookEventHandler {
     // Handle continue=false - this should stop the entire agent execution
     if (aggregated.finalOutput.continue === false) {
       const stopReason =
-        aggregated.finalOutput.stopReason ||
-        aggregated.finalOutput.reason ||
-        'No reason provided';
+        aggregated.finalOutput.stopReason || aggregated.finalOutput.reason || "No reason provided";
       debugLogger.debug(`Hook requested to stop execution: ${stopReason}`);
     }
   }
@@ -531,9 +518,7 @@ export class HookEventHandler {
     const errorCount = failedHooks.length;
 
     if (errorCount > 0) {
-      const failedNames = failedHooks
-        .map((r) => this.getHookNameFromResult(r))
-        .join(', ');
+      const failedNames = failedHooks.map((r) => this.getHookNameFromResult(r)).join(", ");
 
       debugLogger.warn(
         `Hook(s) [${failedNames}] failed for event ${eventName}. Check debug logs for more details.`,
@@ -575,10 +560,10 @@ export class HookEventHandler {
    * Get hook name from config for display or telemetry
    */
   private getHookName(config: HookConfig): string {
-    if (config.type === 'command') {
-      return config.name || config.command || 'unknown-command';
+    if (config.type === "command") {
+      return config.name || config.command || "unknown-command";
     }
-    return config.name || 'unknown-hook';
+    return config.name || "unknown-hook";
   }
 
   /**
@@ -591,7 +576,7 @@ export class HookEventHandler {
   /**
    * Get hook type from execution result for telemetry
    */
-  private getHookTypeFromResult(result: HookExecutionResult): 'command' {
-    return result.hookConfig.type as 'command';
+  private getHookTypeFromResult(result: HookExecutionResult): "command" {
+    return result.hookConfig.type as "command";
   }
 }
diff --git a/packages/airiscode-core/src/hooks/hookPlanner.ts b/packages/airiscode-core/src/hooks/hookPlanner.ts
index 23628c712..dd4559e6d 100644
--- a/packages/airiscode-core/src/hooks/hookPlanner.ts
+++ b/packages/airiscode-core/src/hooks/hookPlanner.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HookRegistry, HookRegistryEntry } from './hookRegistry.js';
-import type { HookExecutionPlan } from './types.js';
-import { getHookKey, HookEventName } from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import { createDebugLogger } from "../utils/debugLogger.js";
+import type { HookRegistry, HookRegistryEntry } from "./hookRegistry.js";
+import type { HookExecutionPlan } from "./types.js";
+import { getHookKey, HookEventName } from "./types.js";
 
-const debugLogger = createDebugLogger('TRUSTED_HOOKS');
+const debugLogger = createDebugLogger("TRUSTED_HOOKS");
 
 /**
  * Hook planner that selects matching hooks and creates execution plans
@@ -50,9 +50,7 @@ export class HookPlanner {
     const hookConfigs = deduplicatedEntries.map((entry) => entry.config);
 
     // Determine execution strategy - if ANY hook definition has sequential=true, run all sequentially
-    const sequential = deduplicatedEntries.some(
-      (entry) => entry.sequential === true,
-    );
+    const sequential = deduplicatedEntries.some((entry) => entry.sequential === true);
 
     const plan: HookExecutionPlan = {
       eventName,
@@ -80,7 +78,7 @@ export class HookPlanner {
 
     const matcher = entry.matcher.trim();
 
-    if (matcher === '' || matcher === '*') {
+    if (matcher === "" || matcher === "*") {
       return true; // Empty string or wildcard matches all
     }
 
@@ -91,22 +89,16 @@ export class HookPlanner {
       case HookEventName.PostToolUse:
       case HookEventName.PostToolUseFailure:
       case HookEventName.PermissionRequest:
-        return context.toolName
-          ? this.matchesToolName(matcher, context.toolName)
-          : true;
+        return context.toolName ? this.matchesToolName(matcher, context.toolName) : true;
 
       // Subagent events: match against agent type
       case HookEventName.SubagentStart:
       case HookEventName.SubagentStop:
-        return context.agentType
-          ? this.matchesAgentType(matcher, context.agentType)
-          : true;
+        return context.agentType ? this.matchesAgentType(matcher, context.agentType) : true;
 
       // PreCompact: match against trigger
       case HookEventName.PreCompact:
-        return context.trigger
-          ? this.matchesTrigger(matcher, context.trigger)
-          : true;
+        return context.trigger ? this.matchesTrigger(matcher, context.trigger) : true;
 
       // Notification: match against notification type
       case HookEventName.Notification:
@@ -116,14 +108,10 @@ export class HookPlanner {
 
       // SessionStart/SessionEnd: match against source/reason
       case HookEventName.SessionStart:
-        return context.trigger
-          ? this.matchesSessionTrigger(matcher, context.trigger)
-          : true;
+        return context.trigger ? this.matchesSessionTrigger(matcher, context.trigger) : true;
 
       case HookEventName.SessionEnd:
-        return context.trigger
-          ? this.matchesSessionTrigger(matcher, context.trigger)
-          : true;
+        return context.trigger ? this.matchesSessionTrigger(matcher, context.trigger) : true;
 
       // Events that don't support matchers: always match
       case HookEventName.UserPromptSubmit:
@@ -136,10 +124,7 @@ export class HookPlanner {
   /**
    * Match notification type against matcher pattern
    */
-  private matchesNotificationType(
-    matcher: string,
-    notificationType: string,
-  ): boolean {
+  private matchesNotificationType(matcher: string, notificationType: string): boolean {
     return matcher === notificationType;
   }
 
diff --git a/packages/airiscode-core/src/hooks/hookRegistry.ts b/packages/airiscode-core/src/hooks/hookRegistry.ts
index 6c7f975d7..8d4ed3dc8 100644
--- a/packages/airiscode-core/src/hooks/hookRegistry.ts
+++ b/packages/airiscode-core/src/hooks/hookRegistry.ts
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HookDefinition, HookConfig } from './types.js';
-import {
-  HookEventName,
-  HooksConfigSource,
-  HOOKS_CONFIG_FIELDS,
-} from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { TrustedHooksManager } from './trustedHooks.js';
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { TrustedHooksManager } from "./trustedHooks.js";
+import type { HookConfig, HookDefinition } from "./types.js";
+import { HOOKS_CONFIG_FIELDS, HookEventName, HooksConfigSource } from "./types.js";
 
-const debugLogger = createDebugLogger('HOOK_REGISTRY');
+const debugLogger = createDebugLogger("HOOK_REGISTRY");
 
 /**
  * Extension with hooks support
@@ -39,7 +35,7 @@ export interface HookRegistryConfig {
  * Feedback emitter interface for warning/info messages
  */
 export interface FeedbackEmitter {
-  emitFeedback(type: 'warning' | 'info' | 'error', message: string): void;
+  emitFeedback(type: "warning" | "info" | "error", message: string): void;
 }
 
 /**
@@ -74,9 +70,7 @@ export class HookRegistry {
     this.entries = [];
     this.processHooksFromConfig();
 
-    debugLogger.debug(
-      `Hook registry initialized with ${this.entries.length} hook entries`,
-    );
+    debugLogger.debug(`Hook registry initialized with ${this.entries.length} hook entries`);
   }
 
   /**
@@ -85,10 +79,7 @@ export class HookRegistry {
   getHooksForEvent(eventName: HookEventName): HookRegistryEntry[] {
     return this.entries
       .filter((entry) => entry.eventName === eventName && entry.enabled)
-      .sort(
-        (a, b) =>
-          this.getSourcePriority(a.source) - this.getSourcePriority(b.source),
-      );
+      .sort((a, b) => this.getSourcePriority(a.source) - this.getSourcePriority(b.source));
   }
 
   /**
@@ -113,7 +104,7 @@ export class HookRegistry {
 
     if (updated.length > 0) {
       debugLogger.info(
-        `${enabled ? 'Enabled' : 'Disabled'} ${updated.length} hook(s) matching "${hookName}"`,
+        `${enabled ? "Enabled" : "Disabled"} ${updated.length} hook(s) matching "${hookName}"`,
       );
     } else {
       debugLogger.warn(`No hooks found matching "${hookName}"`);
@@ -123,10 +114,12 @@ export class HookRegistry {
   /**
    * Get hook name for identification and display purposes
    */
-  private getHookName(
-    entry: HookRegistryEntry | { config: HookConfig },
-  ): string {
-    return entry.config.name || ('command' in entry.config ? entry.config.command : 'inject') || 'unknown-hook';
+  private getHookName(entry: HookRegistryEntry | { config: HookConfig }): string {
+    return (
+      entry.config.name ||
+      ("command" in entry.config ? entry.config.command : "inject") ||
+      "unknown-hook"
+    );
   }
 
   /**
@@ -145,20 +138,17 @@ export class HookRegistry {
 
       if (untrusted.length > 0) {
         const message = `WARNING: The following project-level hooks have been detected in this workspace:
-${untrusted.map((h: string) => `  - ${h}`).join('\n')}
+${untrusted.map((h: string) => `  - ${h}`).join("\n")}
 
 These hooks will be executed. If you did not configure these hooks or do not trust this project,
 please review the project settings (.airiscode/settings.json) and remove them.`;
-        this.feedbackEmitter?.emitFeedback('warning', message);
+        this.feedbackEmitter?.emitFeedback("warning", message);
 
         // Trust them so we don't warn again
-        trustedHooksManager.trustHooks(
-          this.config.getProjectRoot(),
-          projectHooks,
-        );
+        trustedHooksManager.trustHooks(this.config.getProjectRoot(), projectHooks);
       }
     } catch {
-      debugLogger.warn('Failed to check project hooks trust');
+      debugLogger.warn("Failed to check project hooks trust");
     }
   }
 
@@ -176,9 +166,7 @@ please review the project settings (.airiscode/settings.json) and remove them.`;
       if (this.config.isTrustedFolder()) {
         this.processHooksConfiguration(configHooks, HooksConfigSource.Project);
       } else {
-        debugLogger.warn(
-          'Project hooks disabled because the folder is not trusted.',
-        );
+        debugLogger.warn("Project hooks disabled because the folder is not trusted.");
       }
     }
 
@@ -186,10 +174,7 @@ please review the project settings (.airiscode/settings.json) and remove them.`;
     const extensions = this.config.getExtensions() || [];
     for (const extension of extensions) {
       if (extension.isActive && extension.hooks) {
-        this.processHooksConfiguration(
-          extension.hooks,
-          HooksConfigSource.Extensions,
-        );
+        this.processHooksConfiguration(extension.hooks, HooksConfigSource.Extensions);
       }
     }
   }
@@ -208,7 +193,7 @@ please review the project settings (.airiscode/settings.json) and remove them.`;
 
       if (!this.isValidEventName(eventName)) {
         this.feedbackEmitter?.emitFeedback(
-          'warning',
+          "warning",
           `Invalid hook event name: "${eventName}" from ${source} config. Skipping.`,
         );
         continue;
@@ -237,11 +222,7 @@ please review the project settings (.airiscode/settings.json) and remove them.`;
     eventName: HookEventName,
     source: HooksConfigSource,
   ): void {
-    if (
-      !definition ||
-      typeof definition !== 'object' ||
-      !Array.isArray(definition.hooks)
-    ) {
+    if (!definition || typeof definition !== "object" || !Array.isArray(definition.hooks)) {
       debugLogger.warn(
         `Discarding invalid hook definition for ${eventName} from ${source}:`,
         definition,
@@ -252,7 +233,7 @@ please review the project settings (.airiscode/settings.json) and remove them.`;
     for (const hookConfig of definition.hooks) {
       if (
         hookConfig &&
-        typeof hookConfig === 'object' &&
+        typeof hookConfig === "object" &&
         this.validateHookConfig(hookConfig, eventName, source)
       ) {
         const hookName = this.getHookName({ config: hookConfig });
@@ -302,17 +283,13 @@ please review the project settings (.airiscode/settings.json) and remove them.`;
     eventName: HookEventName,
     source: HooksConfigSource,
   ): boolean {
-    if (!config.type || !['command', 'plugin'].includes(config.type)) {
-      debugLogger.warn(
-        `Invalid hook ${eventName} from ${source} type: ${config.type}`,
-      );
+    if (!config.type || !["command", "plugin"].includes(config.type)) {
+      debugLogger.warn(`Invalid hook ${eventName} from ${source} type: ${config.type}`);
       return false;
     }
 
-    if (config.type === 'command' && !config.command) {
-      debugLogger.warn(
-        `Command hook ${eventName} from ${source} missing command field`,
-      );
+    if (config.type === "command" && !config.command) {
+      debugLogger.warn(`Command hook ${eventName} from ${source} missing command field`);
       return false;
     }
 
diff --git a/packages/airiscode-core/src/hooks/hookRunner.ts b/packages/airiscode-core/src/hooks/hookRunner.ts
index 0774ce6db..3fadc596a 100644
--- a/packages/airiscode-core/src/hooks/hookRunner.ts
+++ b/packages/airiscode-core/src/hooks/hookRunner.ts
@@ -4,26 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
-import { HookEventName, HookType } from './types.js';
+import { spawn } from "node:child_process";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { escapeShellArg, getShellConfiguration, type ShellType } from "../utils/shell-utils.js";
 import type {
-  HookConfig,
   CommandHookConfig,
-  InjectHookConfig,
+  HookConfig,
+  HookExecutionResult,
   HookInput,
   HookOutput,
-  HookExecutionResult,
+  InjectHookConfig,
   PreToolUseInput,
   UserPromptSubmitInput,
-} from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import {
-  escapeShellArg,
-  getShellConfiguration,
-  type ShellType,
-} from '../utils/shell-utils.js';
+} from "./types.js";
+import { HookEventName, HookType } from "./types.js";
 
-const debugLogger = createDebugLogger('TRUSTED_HOOKS');
+const debugLogger = createDebugLogger("TRUSTED_HOOKS");
 
 /**
  * Default timeout for hook execution (60 seconds)
@@ -63,7 +59,8 @@ export class HookRunner {
 
     // Check if already aborted before starting
     if (signal?.aborted) {
-      const hookId = hookConfig.name || ('command' in hookConfig ? hookConfig.command : 'inject') || 'unknown';
+      const hookId =
+        hookConfig.name || ("command" in hookConfig ? hookConfig.command : "inject") || "unknown";
       return {
         hookConfig,
         eventName,
@@ -76,12 +73,7 @@ export class HookRunner {
     try {
       // Inject hooks return content as systemMessage without spawning a process
       if (hookConfig.type === HookType.Inject) {
-        return this.executeInjectHook(
-          hookConfig as InjectHookConfig,
-          eventName,
-          input,
-          startTime,
-        );
+        return this.executeInjectHook(hookConfig as InjectHookConfig, eventName, input, startTime);
       }
 
       return await this.executeCommandHook(
@@ -93,7 +85,8 @@ export class HookRunner {
       );
     } catch (error) {
       const duration = Date.now() - startTime;
-      const hookId = hookConfig.name || ('command' in hookConfig ? hookConfig.command : 'inject') || 'unknown';
+      const hookId =
+        hookConfig.name || ("command" in hookConfig ? hookConfig.command : "inject") || "unknown";
       const errorMessage = `Hook execution failed for event '${eventName}' (hook: ${hookId}): ${error}`;
       debugLogger.warn(`Hook execution error (non-fatal): ${errorMessage}`);
 
@@ -151,22 +144,13 @@ export class HookRunner {
       }
       const config = hookConfigs[i];
       onHookStart?.(config, i);
-      const result = await this.executeHook(
-        config,
-        eventName,
-        currentInput,
-        signal,
-      );
+      const result = await this.executeHook(config, eventName, currentInput, signal);
       onHookEnd?.(config, result);
       results.push(result);
 
       // If the hook succeeded and has output, use it to modify the input for the next hook
       if (result.success && result.output) {
-        currentInput = this.applyHookOutputToInput(
-          currentInput,
-          result.output,
-          eventName,
-        );
+        currentInput = this.applyHookOutputToInput(currentInput, result.output, eventName);
       }
     }
 
@@ -188,26 +172,22 @@ export class HookRunner {
     if (hookOutput.hookSpecificOutput) {
       switch (eventName) {
         case HookEventName.UserPromptSubmit:
-          if ('additionalContext' in hookOutput.hookSpecificOutput) {
+          if ("additionalContext" in hookOutput.hookSpecificOutput) {
             // For UserPromptSubmit, we could modify the prompt with additional context
-            const additionalContext =
-              hookOutput.hookSpecificOutput['additionalContext'];
-            if (
-              typeof additionalContext === 'string' &&
-              'prompt' in modifiedInput
-            ) {
-              (modifiedInput as UserPromptSubmitInput).prompt +=
-                '\n\n' + additionalContext;
+            const additionalContext = hookOutput.hookSpecificOutput["additionalContext"];
+            if (typeof additionalContext === "string" && "prompt" in modifiedInput) {
+              (modifiedInput as UserPromptSubmitInput).prompt += "\n\n" + additionalContext;
             }
           }
           break;
 
         case HookEventName.PreToolUse:
-          if ('tool_input' in hookOutput.hookSpecificOutput) {
-            const newToolInput = hookOutput.hookSpecificOutput[
-              'tool_input'
-            ] as Record<string, unknown>;
-            if (newToolInput && 'tool_input' in modifiedInput) {
+          if ("tool_input" in hookOutput.hookSpecificOutput) {
+            const newToolInput = hookOutput.hookSpecificOutput["tool_input"] as Record<
+              string,
+              unknown
+            >;
+            if (newToolInput && "tool_input" in modifiedInput) {
               (modifiedInput as PreToolUseInput).tool_input = {
                 ...(modifiedInput as PreToolUseInput).tool_input,
                 ...newToolInput,
@@ -248,27 +228,19 @@ export class HookRunner {
 
     // Simple template variable substitution
     let content = hookConfig.content;
-    content = content.replace(/\$SESSION_ID/g, input.session_id || '');
-    content = content.replace(/\$CWD/g, input.cwd || '');
+    content = content.replace(/\$SESSION_ID/g, input.session_id || "");
+    content = content.replace(/\$CWD/g, input.cwd || "");
     content = content.replace(/\$EVENT/g, eventName);
 
     // For PreToolUse events, substitute tool-specific variables
-    if ('tool_name' in input) {
-      content = content.replace(
-        /\$TOOL_NAME/g,
-        (input as PreToolUseInput).tool_name || '',
-      );
+    if ("tool_name" in input) {
+      content = content.replace(/\$TOOL_NAME/g, (input as PreToolUseInput).tool_name || "");
     }
-    if ('tool_input' in input) {
-      content = content.replace(
-        /\$TOOL_INPUT/g,
-        JSON.stringify((input as any).tool_input || ''),
-      );
+    if ("tool_input" in input) {
+      content = content.replace(/\$TOOL_INPUT/g, JSON.stringify((input as any).tool_input || ""));
     }
 
-    debugLogger.debug(
-      `Inject hook executed for ${eventName}: ${content.slice(0, 100)}...`,
-    );
+    debugLogger.debug(`Inject hook executed for ${eventName}: ${content.slice(0, 100)}...`);
 
     const output: HookOutput = {
       continue: true,
@@ -295,10 +267,8 @@ export class HookRunner {
 
     return new Promise((resolve) => {
       if (!hookConfig.command) {
-        const errorMessage = 'Command hook missing command';
-        debugLogger.warn(
-          `Hook configuration error (non-fatal): ${errorMessage}`,
-        );
+        const errorMessage = "Command hook missing command";
+        debugLogger.warn(`Hook configuration error (non-fatal): ${errorMessage}`);
         resolve({
           hookConfig,
           eventName,
@@ -309,45 +279,37 @@ export class HookRunner {
         return;
       }
 
-      let stdout = '';
-      let stderr = '';
+      let stdout = "";
+      let stderr = "";
       let timedOut = false;
       let aborted = false;
 
       const shellConfig = getShellConfiguration();
-      const command = this.expandCommand(
-        hookConfig.command,
-        input,
-        shellConfig.shell,
-      );
+      const command = this.expandCommand(hookConfig.command, input, shellConfig.shell);
 
       const env = {
         ...process.env,
         GEMINI_PROJECT_DIR: input.cwd,
         CLAUDE_PROJECT_DIR: input.cwd, // For compatibility
         QWEN_PROJECT_DIR: input.cwd, // For AIRIS Code compatibility
-        ...('env' in hookConfig ? hookConfig.env : {}),
+        ...("env" in hookConfig ? hookConfig.env : {}),
       };
 
-      const child = spawn(
-        shellConfig.executable,
-        [...shellConfig.argsPrefix, command],
-        {
-          env,
-          cwd: input.cwd,
-          stdio: ['pipe', 'pipe', 'pipe'],
-          shell: false,
-        },
-      );
+      const child = spawn(shellConfig.executable, [...shellConfig.argsPrefix, command], {
+        env,
+        cwd: input.cwd,
+        stdio: ["pipe", "pipe", "pipe"],
+        shell: false,
+      });
 
       // Helper to kill child process
       const killChild = () => {
         if (!child.killed) {
-          child.kill('SIGTERM');
+          child.kill("SIGTERM");
           // Force kill after 2 seconds
           setTimeout(() => {
             if (!child.killed) {
-              child.kill('SIGKILL');
+              child.kill("SIGKILL");
             }
           }, 2000);
         }
@@ -367,14 +329,14 @@ export class HookRunner {
       };
 
       if (signal) {
-        signal.addEventListener('abort', abortHandler);
+        signal.addEventListener("abort", abortHandler);
       }
 
       // Send input to stdin
       if (child.stdin) {
-        child.stdin.on('error', (err: NodeJS.ErrnoException) => {
+        child.stdin.on("error", (err: NodeJS.ErrnoException) => {
           // Ignore EPIPE errors which happen when the child process closes stdin early
-          if (err.code !== 'EPIPE') {
+          if (err.code !== "EPIPE") {
             debugLogger.debug(`Hook stdin error: ${err}`);
           }
         });
@@ -386,14 +348,14 @@ export class HookRunner {
           child.stdin.end();
         } catch (err) {
           // Ignore EPIPE errors which happen when the child process closes stdin early
-          if (err instanceof Error && 'code' in err && err.code !== 'EPIPE') {
+          if (err instanceof Error && "code" in err && err.code !== "EPIPE") {
             debugLogger.debug(`Hook stdin write error: ${err}`);
           }
         }
       }
 
       // Collect stdout
-      child.stdout?.on('data', (data: Buffer) => {
+      child.stdout?.on("data", (data: Buffer) => {
         if (stdout.length < MAX_OUTPUT_LENGTH) {
           const remaining = MAX_OUTPUT_LENGTH - stdout.length;
           stdout += data.slice(0, remaining).toString();
@@ -406,7 +368,7 @@ export class HookRunner {
       });
 
       // Collect stderr
-      child.stderr?.on('data', (data: Buffer) => {
+      child.stderr?.on("data", (data: Buffer) => {
         if (stderr.length < MAX_OUTPUT_LENGTH) {
           const remaining = MAX_OUTPUT_LENGTH - stderr.length;
           stderr += data.slice(0, remaining).toString();
@@ -419,11 +381,11 @@ export class HookRunner {
       });
 
       // Handle process exit
-      child.on('close', (exitCode) => {
+      child.on("close", (exitCode) => {
         clearTimeout(timeoutHandle);
         // Clean up abort listener
         if (signal) {
-          signal.removeEventListener('abort', abortHandler);
+          signal.removeEventListener("abort", abortHandler);
         }
         const duration = Date.now() - startTime;
 
@@ -432,7 +394,7 @@ export class HookRunner {
             hookConfig,
             eventName,
             success: false,
-            error: new Error('Hook execution cancelled (aborted)'),
+            error: new Error("Hook execution cancelled (aborted)"),
             stdout,
             stderr,
             duration,
@@ -459,19 +421,17 @@ export class HookRunner {
         const isBlockingError = exitCode === 2;
 
         // For exit code 2, only use stderr (ignore stdout)
-        const textToParse = isBlockingError
-          ? stderr.trim()
-          : stdout.trim() || stderr.trim();
+        const textToParse = isBlockingError ? stderr.trim() : stdout.trim() || stderr.trim();
 
         if (textToParse) {
           // Try parsing as JSON to preserve structured output like
           // hookSpecificOutput.additionalContext (applies to both exit 0 and exit 2)
           try {
             let parsed = JSON.parse(textToParse);
-            if (typeof parsed === 'string') {
+            if (typeof parsed === "string") {
               parsed = JSON.parse(parsed);
             }
-            if (parsed && typeof parsed === 'object') {
+            if (parsed && typeof parsed === "object") {
               output = parsed as HookOutput;
             }
           } catch {
@@ -494,17 +454,17 @@ export class HookRunner {
           exitCode: exitCode ?? -1,
           duration,
           ...(killedBySignal && {
-            error: new Error('Hook killed by signal'),
+            error: new Error("Hook killed by signal"),
           }),
         });
       });
 
       // Handle process errors
-      child.on('error', (error) => {
+      child.on("error", (error) => {
         clearTimeout(timeoutHandle);
         // Clean up abort listener
         if (signal) {
-          signal.removeEventListener('abort', abortHandler);
+          signal.removeEventListener("abort", abortHandler);
         }
         const duration = Date.now() - startTime;
 
@@ -524,11 +484,7 @@ export class HookRunner {
   /**
    * Expand command with environment variables and input context
    */
-  private expandCommand(
-    command: string,
-    input: HookInput,
-    shellType: ShellType,
-  ): string {
+  private expandCommand(command: string, input: HookInput, shellType: ShellType): string {
     debugLogger.debug(`Expanding hook command: ${command} (cwd: ${input.cwd})`);
     const escapedCwd = escapeShellArg(input.cwd, shellType);
     return command
@@ -539,28 +495,25 @@ export class HookRunner {
   /**
    * Convert plain text output to structured HookOutput
    */
-  private convertPlainTextToHookOutput(
-    text: string,
-    exitCode: number,
-  ): HookOutput {
+  private convertPlainTextToHookOutput(text: string, exitCode: number): HookOutput {
     if (exitCode === EXIT_CODE_SUCCESS) {
       // Success - treat as system message or additional context
       return {
-        decision: 'allow',
-        reason: 'Hook executed successfully',
+        decision: "allow",
+        reason: "Hook executed successfully",
         systemMessage: text,
       };
     } else if (exitCode === EXIT_CODE_NON_BLOCKING_ERROR) {
       // Non-blocking error (EXIT_CODE_NON_BLOCKING_ERROR = 1)
       return {
-        decision: 'allow',
+        decision: "allow",
         reason: `Non-blocking error: ${text}`,
         systemMessage: `Warning: ${text}`,
       };
     } else {
       // All other non-zero exit codes (including 2) are blocking
       return {
-        decision: 'deny',
+        decision: "deny",
         reason: text,
       };
     }
diff --git a/packages/airiscode-core/src/hooks/hookSystem.ts b/packages/airiscode-core/src/hooks/hookSystem.ts
index cb346b42c..31464754f 100644
--- a/packages/airiscode-core/src/hooks/hookSystem.ts
+++ b/packages/airiscode-core/src/hooks/hookSystem.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { HookRegistry } from './hookRegistry.js';
-import { HookRunner } from './hookRunner.js';
-import { HookAggregator, type AggregatedHookResult } from './hookAggregator.js';
-import { HookPlanner } from './hookPlanner.js';
-import { HookEventHandler } from './hookEventHandler.js';
-import type { HookRegistryEntry } from './hookRegistry.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type { DefaultHookOutput } from './types.js';
-import { createHookOutput } from './types.js';
+import type { Config } from "../config/config.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { type AggregatedHookResult, HookAggregator } from "./hookAggregator.js";
+import { HookEventHandler } from "./hookEventHandler.js";
+import { HookPlanner } from "./hookPlanner.js";
+import type { HookRegistryEntry } from "./hookRegistry.js";
+import { HookRegistry } from "./hookRegistry.js";
+import { HookRunner } from "./hookRunner.js";
 import type {
-  SessionStartSource,
-  SessionEndReason,
   AgentType,
-  PermissionMode,
-  PreCompactTrigger,
+  DefaultHookOutput,
+  HookEventName,
   NotificationType,
+  PermissionMode,
   PermissionSuggestion,
-  HookEventName,
-} from './types.js';
+  PreCompactTrigger,
+  SessionEndReason,
+  SessionStartSource,
+} from "./types.js";
+import { createHookOutput } from "./types.js";
 
-const debugLogger = createDebugLogger('TRUSTED_HOOKS');
+const debugLogger = createDebugLogger("TRUSTED_HOOKS");
 
 /**
  * Main hook system that coordinates all hook-related functionality
@@ -57,7 +57,7 @@ export class HookSystem {
    */
   async initialize(): Promise<void> {
     await this.hookRegistry.initialize();
-    debugLogger.debug('Hook system initialized successfully');
+    debugLogger.debug("Hook system initialized successfully");
   }
 
   /**
@@ -94,34 +94,25 @@ export class HookSystem {
    * when no hooks are configured for a given event.
    */
   hasHooksForEvent(eventName: string): boolean {
-    return (
-      this.hookRegistry.getHooksForEvent(eventName as HookEventName).length > 0
-    );
+    return this.hookRegistry.getHooksForEvent(eventName as HookEventName).length > 0;
   }
 
   async fireUserPromptSubmitEvent(
     prompt: string,
     signal?: AbortSignal,
   ): Promise<DefaultHookOutput | undefined> {
-    const result = await this.hookEventHandler.fireUserPromptSubmitEvent(
-      prompt,
-      signal,
-    );
+    const result = await this.hookEventHandler.fireUserPromptSubmitEvent(prompt, signal);
     return result.finalOutput
-      ? createHookOutput('UserPromptSubmit', result.finalOutput)
+      ? createHookOutput("UserPromptSubmit", result.finalOutput)
       : undefined;
   }
 
   async fireStopEvent(
     stopHookActive: boolean = false,
-    lastAssistantMessage: string = '',
+    lastAssistantMessage: string = "",
     signal?: AbortSignal,
   ): Promise<AggregatedHookResult> {
-    return this.hookEventHandler.fireStopEvent(
-      stopHookActive,
-      lastAssistantMessage,
-      signal,
-    );
+    return this.hookEventHandler.fireStopEvent(stopHookActive, lastAssistantMessage, signal);
   }
 
   async fireSessionStartEvent(
@@ -138,22 +129,15 @@ export class HookSystem {
       agentType,
       signal,
     );
-    return result.finalOutput
-      ? createHookOutput('SessionStart', result.finalOutput)
-      : undefined;
+    return result.finalOutput ? createHookOutput("SessionStart", result.finalOutput) : undefined;
   }
 
   async fireSessionEndEvent(
     reason: SessionEndReason,
     signal?: AbortSignal,
   ): Promise<DefaultHookOutput | undefined> {
-    const result = await this.hookEventHandler.fireSessionEndEvent(
-      reason,
-      signal,
-    );
-    return result.finalOutput
-      ? createHookOutput('SessionEnd', result.finalOutput)
-      : undefined;
+    const result = await this.hookEventHandler.fireSessionEndEvent(reason, signal);
+    return result.finalOutput ? createHookOutput("SessionEnd", result.finalOutput) : undefined;
   }
 
   /**
@@ -173,9 +157,7 @@ export class HookSystem {
       permissionMode,
       signal,
     );
-    return result.finalOutput
-      ? createHookOutput('PreToolUse', result.finalOutput)
-      : undefined;
+    return result.finalOutput ? createHookOutput("PreToolUse", result.finalOutput) : undefined;
   }
 
   /**
@@ -197,9 +179,7 @@ export class HookSystem {
       permissionMode,
       signal,
     );
-    return result.finalOutput
-      ? createHookOutput('PostToolUse', result.finalOutput)
-      : undefined;
+    return result.finalOutput ? createHookOutput("PostToolUse", result.finalOutput) : undefined;
   }
 
   /**
@@ -224,7 +204,7 @@ export class HookSystem {
       signal,
     );
     return result.finalOutput
-      ? createHookOutput('PostToolUseFailure', result.finalOutput)
+      ? createHookOutput("PostToolUseFailure", result.finalOutput)
       : undefined;
   }
 
@@ -233,7 +213,7 @@ export class HookSystem {
    */
   async firePreCompactEvent(
     trigger: PreCompactTrigger,
-    customInstructions: string = '',
+    customInstructions: string = "",
     signal?: AbortSignal,
   ): Promise<DefaultHookOutput | undefined> {
     const result = await this.hookEventHandler.firePreCompactEvent(
@@ -241,9 +221,7 @@ export class HookSystem {
       customInstructions,
       signal,
     );
-    return result.finalOutput
-      ? createHookOutput('PreCompact', result.finalOutput)
-      : undefined;
+    return result.finalOutput ? createHookOutput("PreCompact", result.finalOutput) : undefined;
   }
 
   /**
@@ -261,9 +239,7 @@ export class HookSystem {
       title,
       signal,
     );
-    return result.finalOutput
-      ? createHookOutput('Notification', result.finalOutput)
-      : undefined;
+    return result.finalOutput ? createHookOutput("Notification", result.finalOutput) : undefined;
   }
 
   /**
@@ -281,9 +257,7 @@ export class HookSystem {
       permissionMode,
       signal,
     );
-    return result.finalOutput
-      ? createHookOutput('SubagentStart', result.finalOutput)
-      : undefined;
+    return result.finalOutput ? createHookOutput("SubagentStart", result.finalOutput) : undefined;
   }
 
   /**
@@ -307,9 +281,7 @@ export class HookSystem {
       permissionMode,
       signal,
     );
-    return result.finalOutput
-      ? createHookOutput('SubagentStop', result.finalOutput)
-      : undefined;
+    return result.finalOutput ? createHookOutput("SubagentStop", result.finalOutput) : undefined;
   }
 
   /**
@@ -330,7 +302,7 @@ export class HookSystem {
       signal,
     );
     return result.finalOutput
-      ? createHookOutput('PermissionRequest', result.finalOutput)
+      ? createHookOutput("PermissionRequest", result.finalOutput)
       : undefined;
   }
 }
diff --git a/packages/airiscode-core/src/hooks/index.ts b/packages/airiscode-core/src/hooks/index.ts
index 779f3b332..b78203bdf 100644
--- a/packages/airiscode-core/src/hooks/index.ts
+++ b/packages/airiscode-core/src/hooks/index.ts
@@ -4,19 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Export types
-export * from './types.js';
-
-// Export core components
-export { HookSystem } from './hookSystem.js';
-export { HookRegistry } from './hookRegistry.js';
-export { HookRunner } from './hookRunner.js';
-export { HookAggregator } from './hookAggregator.js';
-export { HookPlanner } from './hookPlanner.js';
-export { HookEventHandler } from './hookEventHandler.js';
-
+export type { AggregatedHookResult } from "./hookAggregator.js";
+export { HookAggregator } from "./hookAggregator.js";
+export { HookEventHandler } from "./hookEventHandler.js";
+export type { HookEventContext } from "./hookPlanner.js";
+export { HookPlanner } from "./hookPlanner.js";
 // Export interfaces and enums
-export type { HookRegistryEntry } from './hookRegistry.js';
-export { HooksConfigSource as ConfigSource } from './types.js';
-export type { AggregatedHookResult } from './hookAggregator.js';
-export type { HookEventContext } from './hookPlanner.js';
+export type { HookRegistryEntry } from "./hookRegistry.js";
+export { HookRegistry } from "./hookRegistry.js";
+export { HookRunner } from "./hookRunner.js";
+// Export core components
+export { HookSystem } from "./hookSystem.js";
+// Export types
+export * from "./types.js";
+export { HooksConfigSource as ConfigSource } from "./types.js";
diff --git a/packages/airiscode-core/src/hooks/trustedHooks.ts b/packages/airiscode-core/src/hooks/trustedHooks.ts
index 55b383cf7..20c273bfe 100644
--- a/packages/airiscode-core/src/hooks/trustedHooks.ts
+++ b/packages/airiscode-core/src/hooks/trustedHooks.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import {
-  getHookKey,
-  type HookDefinition,
-  type HookEventName,
-} from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { Storage } from "../config/storage.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getHookKey, type HookDefinition, type HookEventName } from "./types.js";
 
-const debugLogger = createDebugLogger('TRUSTED_HOOKS');
+const debugLogger = createDebugLogger("TRUSTED_HOOKS");
 
 interface TrustedHooksConfig {
   [projectPath: string]: string[]; // Array of trusted hook keys (name:command)
@@ -25,21 +21,18 @@ export class TrustedHooksManager {
   private trustedHooks: TrustedHooksConfig = {};
 
   constructor() {
-    this.configPath = path.join(
-      Storage.getGlobalQwenDir(),
-      'trusted_hooks.json',
-    );
+    this.configPath = path.join(Storage.getGlobalQwenDir(), "trusted_hooks.json");
     this.load();
   }
 
   private load(): void {
     try {
       if (fs.existsSync(this.configPath)) {
-        const content = fs.readFileSync(this.configPath, 'utf-8');
+        const content = fs.readFileSync(this.configPath, "utf-8");
         this.trustedHooks = JSON.parse(content);
       }
     } catch (error) {
-      debugLogger.warn('Failed to load trusted hooks config', error);
+      debugLogger.warn("Failed to load trusted hooks config", error);
       this.trustedHooks = {};
     }
   }
@@ -50,12 +43,9 @@ export class TrustedHooksManager {
       if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir, { recursive: true });
       }
-      fs.writeFileSync(
-        this.configPath,
-        JSON.stringify(this.trustedHooks, null, 2),
-      );
+      fs.writeFileSync(this.configPath, JSON.stringify(this.trustedHooks, null, 2));
     } catch (error) {
-      debugLogger.warn('Failed to save trusted hooks config', error);
+      debugLogger.warn("Failed to save trusted hooks config", error);
     }
   }
 
@@ -82,7 +72,9 @@ export class TrustedHooksManager {
           const key = getHookKey(hook);
           if (!trustedKeys.has(key)) {
             // Return friendly name or command
-            untrusted.push(hook.name || ('command' in hook ? hook.command : 'inject') || 'unknown-hook');
+            untrusted.push(
+              hook.name || ("command" in hook ? hook.command : "inject") || "unknown-hook",
+            );
           }
         }
       }
@@ -94,10 +86,7 @@ export class TrustedHooksManager {
   /**
    * Trust all provided hooks for a project
    */
-  trustHooks(
-    projectPath: string,
-    hooks: { [K in HookEventName]?: HookDefinition[] },
-  ): void {
+  trustHooks(projectPath: string, hooks: { [K in HookEventName]?: HookDefinition[] }): void {
     const currentTrusted = new Set(this.trustedHooks[projectPath] || []);
 
     for (const eventName of Object.keys(hooks)) {
diff --git a/packages/airiscode-core/src/hooks/types.ts b/packages/airiscode-core/src/hooks/types.ts
index 379cb2ff4..dedd4a140 100644
--- a/packages/airiscode-core/src/hooks/types.ts
+++ b/packages/airiscode-core/src/hooks/types.ts
@@ -3,15 +3,15 @@
  * Copyright 2026 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
-import { createDebugLogger } from '../utils/debugLogger.js';
+import { createDebugLogger } from "../utils/debugLogger.js";
 
-const debugLogger = createDebugLogger('TRUSTED_HOOKS');
+const debugLogger = createDebugLogger("TRUSTED_HOOKS");
 
 export enum HooksConfigSource {
-  Project = 'project',
-  User = 'user',
-  System = 'system',
-  Extensions = 'extensions',
+  Project = "project",
+  User = "user",
+  System = "system",
+  Extensions = "extensions",
 }
 
 /**
@@ -19,35 +19,35 @@ export enum HooksConfigSource {
  */
 export enum HookEventName {
   // PreToolUse - Before tool execution
-  PreToolUse = 'PreToolUse',
+  PreToolUse = "PreToolUse",
   // PostToolUse - After tool execution
-  PostToolUse = 'PostToolUse',
+  PostToolUse = "PostToolUse",
   // PostToolUseFailure - After tool execution fails
-  PostToolUseFailure = 'PostToolUseFailure',
+  PostToolUseFailure = "PostToolUseFailure",
   // Notification - When notifications are sent
-  Notification = 'Notification',
+  Notification = "Notification",
   // UserPromptSubmit - When the user submits a prompt
-  UserPromptSubmit = 'UserPromptSubmit',
+  UserPromptSubmit = "UserPromptSubmit",
   // SessionStart - When a new session is started
-  SessionStart = 'SessionStart',
+  SessionStart = "SessionStart",
   // Stop - Right before Claude concludes its response
-  Stop = 'Stop',
+  Stop = "Stop",
   // SubagentStart - When a subagent (Task tool call) is started
-  SubagentStart = 'SubagentStart',
+  SubagentStart = "SubagentStart",
   // SubagentStop - Right before a subagent (Task tool call) concludes its response
-  SubagentStop = 'SubagentStop',
+  SubagentStop = "SubagentStop",
   // PreCompact - Before conversation compaction
-  PreCompact = 'PreCompact',
+  PreCompact = "PreCompact",
   // SessionEnd - When a session is ending
-  SessionEnd = 'SessionEnd',
+  SessionEnd = "SessionEnd",
   // When a permission dialog is displayed
-  PermissionRequest = 'PermissionRequest',
+  PermissionRequest = "PermissionRequest",
 }
 
 /**
  * Fields in the hooks configuration that are not hook event names
  */
-export const HOOKS_CONFIG_FIELDS = ['enabled', 'disabled', 'notifications'];
+export const HOOKS_CONFIG_FIELDS = ["enabled", "disabled", "notifications"];
 
 /**
  * Hook configuration entry
@@ -73,7 +73,7 @@ export interface InjectHookConfig {
   name?: string;
   description?: string;
   /** Where to inject: main agent, subagent, or both */
-  target?: 'main' | 'subagent' | 'both';
+  target?: "main" | "subagent" | "both";
   source?: HooksConfigSource;
 }
 
@@ -92,16 +92,16 @@ export interface HookDefinition {
  * Hook implementation types
  */
 export enum HookType {
-  Command = 'command',
+  Command = "command",
   /** Context injection hook - AIRIS Code extension */
-  Inject = 'inject',
+  Inject = "inject",
 }
 
 /**
  * Generate a unique key for a hook configuration
  */
 export function getHookKey(hook: HookConfig): string {
-  const name = hook.name ?? '';
+  const name = hook.name ?? "";
   if (hook.type === HookType.Inject) {
     return name ? `inject:${name}` : `inject:${hook.content.slice(0, 50)}`;
   }
@@ -111,7 +111,7 @@ export function getHookKey(hook: HookConfig): string {
 /**
  * Decision types for hook outputs
  */
-export type HookDecision = 'ask' | 'block' | 'deny' | 'approve' | 'allow';
+export type HookDecision = "ask" | "block" | "deny" | "approve" | "allow";
 
 /**
  * Base hook input - common fields for all events
@@ -141,10 +141,7 @@ export interface HookOutput {
  * Factory function to create the appropriate hook output class based on event name
  * Returns specialized HookOutput subclasses for events with specific methods
  */
-export function createHookOutput(
-  eventName: string,
-  data: Partial<HookOutput>,
-): DefaultHookOutput {
+export function createHookOutput(eventName: string, data: Partial<HookOutput>): DefaultHookOutput {
   switch (eventName) {
     case HookEventName.PreToolUse:
       return new PreToolUseHookOutput(data);
@@ -188,7 +185,7 @@ export class DefaultHookOutput implements HookOutput {
    * Check if this output represents a blocking decision
    */
   isBlockingDecision(): boolean {
-    return this.decision === 'block' || this.decision === 'deny';
+    return this.decision === "block" || this.decision === "deny";
   }
 
   /**
@@ -202,24 +199,21 @@ export class DefaultHookOutput implements HookOutput {
    * Get the effective reason for blocking or stopping
    */
   getEffectiveReason(): string {
-    return this.stopReason || this.reason || 'No reason provided';
+    return this.stopReason || this.reason || "No reason provided";
   }
 
   /**
    * Get sanitized additional context for adding to responses.
    */
   getAdditionalContext(): string | undefined {
-    if (
-      this.hookSpecificOutput &&
-      'additionalContext' in this.hookSpecificOutput
-    ) {
-      const context = this.hookSpecificOutput['additionalContext'];
-      if (typeof context !== 'string') {
+    if (this.hookSpecificOutput && "additionalContext" in this.hookSpecificOutput) {
+      const context = this.hookSpecificOutput["additionalContext"];
+      if (typeof context !== "string") {
         return undefined;
       }
 
       // Sanitize by escaping < and > to prevent tag injection
-      return context.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+      return context.replace(/</g, "&lt;").replace(/>/g, "&gt;");
     }
     return undefined;
   }
@@ -234,7 +228,7 @@ export class DefaultHookOutput implements HookOutput {
         reason: this.getEffectiveReason(),
       };
     }
-    return { blocked: false, reason: '' };
+    return { blocked: false, reason: "" };
   }
 
   /**
@@ -253,25 +247,22 @@ export class PreToolUseHookOutput extends DefaultHookOutput {
    * Get permission decision from hook output
    * @returns 'allow' | 'deny' | 'ask' | undefined
    */
-  getPermissionDecision(): 'allow' | 'deny' | 'ask' | undefined {
-    if (
-      this.hookSpecificOutput &&
-      'permissionDecision' in this.hookSpecificOutput
-    ) {
-      const decision = this.hookSpecificOutput['permissionDecision'];
-      if (decision === 'allow' || decision === 'deny' || decision === 'ask') {
+  getPermissionDecision(): "allow" | "deny" | "ask" | undefined {
+    if (this.hookSpecificOutput && "permissionDecision" in this.hookSpecificOutput) {
+      const decision = this.hookSpecificOutput["permissionDecision"];
+      if (decision === "allow" || decision === "deny" || decision === "ask") {
         return decision;
       }
     }
     // Fall back to base decision field
-    if (this.decision === 'allow' || this.decision === 'approve') {
-      return 'allow';
+    if (this.decision === "allow" || this.decision === "approve") {
+      return "allow";
     }
-    if (this.decision === 'deny' || this.decision === 'block') {
-      return 'deny';
+    if (this.decision === "deny" || this.decision === "block") {
+      return "deny";
     }
-    if (this.decision === 'ask') {
-      return 'ask';
+    if (this.decision === "ask") {
+      return "ask";
     }
     return undefined;
   }
@@ -280,12 +271,9 @@ export class PreToolUseHookOutput extends DefaultHookOutput {
    * Get permission decision reason
    */
   getPermissionDecisionReason(): string | undefined {
-    if (
-      this.hookSpecificOutput &&
-      'permissionDecisionReason' in this.hookSpecificOutput
-    ) {
-      const reason = this.hookSpecificOutput['permissionDecisionReason'];
-      if (typeof reason === 'string') {
+    if (this.hookSpecificOutput && "permissionDecisionReason" in this.hookSpecificOutput) {
+      const reason = this.hookSpecificOutput["permissionDecisionReason"];
+      if (typeof reason === "string") {
         return reason;
       }
     }
@@ -296,21 +284,21 @@ export class PreToolUseHookOutput extends DefaultHookOutput {
    * Check if permission was denied
    */
   isDenied(): boolean {
-    return this.getPermissionDecision() === 'deny';
+    return this.getPermissionDecision() === "deny";
   }
 
   /**
    * Check if user confirmation is required
    */
   isAsk(): boolean {
-    return this.getPermissionDecision() === 'ask';
+    return this.getPermissionDecision() === "ask";
   }
 
   /**
    * Check if permission was allowed
    */
   isAllowed(): boolean {
-    return this.getPermissionDecision() === 'allow';
+    return this.getPermissionDecision() === "allow";
   }
 }
 
@@ -327,14 +315,12 @@ export class PostToolUseHookOutput extends DefaultHookOutput {
     super(data);
     // Default to allowing tool usage if hook does not provide explicit decision
     // This maintains backward compatibility and follows security model of allowing by default
-    this.decision = data.decision ?? 'allow';
-    this.reason = data.reason ?? 'No reason provided';
+    this.decision = data.decision ?? "allow";
+    this.reason = data.reason ?? "No reason provided";
 
     // Log when default values are used to help with debugging
     if (data.decision === undefined) {
-      debugLogger.debug(
-        'PostToolUseHookOutput: No explicit decision set, defaulting to "allow"',
-      );
+      debugLogger.debug('PostToolUseHookOutput: No explicit decision set, defaulting to "allow"');
     }
     if (data.reason === undefined) {
       debugLogger.debug(
@@ -400,7 +386,7 @@ export interface PermissionRequestInput extends HookInput {
  * Decision object for PermissionRequest hooks
  */
 export interface PermissionRequestDecision {
-  behavior: 'allow' | 'deny';
+  behavior: "allow" | "deny";
   updatedInput?: Record<string, unknown>;
   updatedPermissions?: PermissionSuggestion[];
   message?: string;
@@ -415,13 +401,9 @@ export class PermissionRequestHookOutput extends DefaultHookOutput {
    * Get the permission decision if provided by hook
    */
   getPermissionDecision(): PermissionRequestDecision | undefined {
-    if (this.hookSpecificOutput && 'decision' in this.hookSpecificOutput) {
-      const decision = this.hookSpecificOutput['decision'];
-      if (
-        typeof decision === 'object' &&
-        decision !== null &&
-        !Array.isArray(decision)
-      ) {
+    if (this.hookSpecificOutput && "decision" in this.hookSpecificOutput) {
+      const decision = this.hookSpecificOutput["decision"];
+      if (typeof decision === "object" && decision !== null && !Array.isArray(decision)) {
         return decision as PermissionRequestDecision;
       }
     }
@@ -433,7 +415,7 @@ export class PermissionRequestHookOutput extends DefaultHookOutput {
    */
   isPermissionDenied(): boolean {
     const decision = this.getPermissionDecision();
-    return decision?.behavior === 'deny';
+    return decision?.behavior === "deny";
   }
 
   /**
@@ -484,8 +466,8 @@ export interface PreToolUseInput extends HookInput {
  */
 export interface PreToolUseOutput extends HookOutput {
   hookSpecificOutput: {
-    hookEventName: 'PreToolUse';
-    permissionDecision: 'allow' | 'deny' | 'ask';
+    hookEventName: "PreToolUse";
+    permissionDecision: "allow" | "deny" | "ask";
     permissionDecisionReason: string;
   };
 }
@@ -508,7 +490,7 @@ export interface PostToolUseOutput extends HookOutput {
   decision: HookDecision;
   reason: string;
   hookSpecificOutput?: {
-    hookEventName: 'PostToolUse';
+    hookEventName: "PostToolUse";
     additionalContext?: string;
   };
   updatedMCPToolOutput?: Record<string, unknown>;
@@ -533,7 +515,7 @@ export interface PostToolUseFailureInput extends HookInput {
  */
 export interface PostToolUseFailureOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'PostToolUseFailure';
+    hookEventName: "PostToolUseFailure";
     additionalContext?: string;
   };
 }
@@ -550,7 +532,7 @@ export interface UserPromptSubmitInput extends HookInput {
  */
 export interface UserPromptSubmitOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'UserPromptSubmit';
+    hookEventName: "UserPromptSubmit";
     additionalContext?: string;
   };
 }
@@ -559,10 +541,10 @@ export interface UserPromptSubmitOutput extends HookOutput {
  * Notification types
  */
 export enum NotificationType {
-  PermissionPrompt = 'permission_prompt',
-  IdlePrompt = 'idle_prompt',
-  AuthSuccess = 'auth_success',
-  ElicitationDialog = 'elicitation_dialog',
+  PermissionPrompt = "permission_prompt",
+  IdlePrompt = "idle_prompt",
+  AuthSuccess = "auth_success",
+  ElicitationDialog = "elicitation_dialog",
 }
 
 /**
@@ -579,7 +561,7 @@ export interface NotificationInput extends HookInput {
  */
 export interface NotificationOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'Notification';
+    hookEventName: "Notification";
     additionalContext?: string;
   };
 }
@@ -597,7 +579,7 @@ export interface StopInput extends HookInput {
  */
 export interface StopOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'Stop';
+    hookEventName: "Stop";
     additionalContext?: string;
   };
 }
@@ -606,17 +588,17 @@ export interface StopOutput extends HookOutput {
  * SessionStart source types
  */
 export enum SessionStartSource {
-  Startup = 'startup',
-  Resume = 'resume',
-  Clear = 'clear',
-  Compact = 'compact',
+  Startup = "startup",
+  Resume = "resume",
+  Clear = "clear",
+  Compact = "compact",
 }
 
 export enum PermissionMode {
-  Default = 'default',
-  Plan = 'plan',
-  AutoEdit = 'auto_edit',
-  Yolo = 'yolo',
+  Default = "default",
+  Plan = "plan",
+  AutoEdit = "auto_edit",
+  Yolo = "yolo",
 }
 
 /**
@@ -634,7 +616,7 @@ export interface SessionStartInput extends HookInput {
  */
 export interface SessionStartOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'SessionStart';
+    hookEventName: "SessionStart";
     additionalContext?: string;
   };
 }
@@ -643,11 +625,11 @@ export interface SessionStartOutput extends HookOutput {
  * SessionEnd reason types
  */
 export enum SessionEndReason {
-  Clear = 'clear',
-  Logout = 'logout',
-  PromptInputExit = 'prompt_input_exit',
-  Bypass_permissions_disabled = 'bypass_permissions_disabled',
-  Other = 'other',
+  Clear = "clear",
+  Logout = "logout",
+  PromptInputExit = "prompt_input_exit",
+  Bypass_permissions_disabled = "bypass_permissions_disabled",
+  Other = "other",
 }
 
 /**
@@ -662,7 +644,7 @@ export interface SessionEndInput extends HookInput {
  */
 export interface SessionEndOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'SessionEnd';
+    hookEventName: "SessionEnd";
     additionalContext?: string;
   };
 }
@@ -671,8 +653,8 @@ export interface SessionEndOutput extends HookOutput {
  * PreCompress trigger types
  */
 export enum PreCompactTrigger {
-  Manual = 'manual',
-  Auto = 'auto',
+  Manual = "manual",
+  Auto = "auto",
 }
 
 /**
@@ -688,16 +670,16 @@ export interface PreCompactInput extends HookInput {
  */
 export interface PreCompactOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'PreCompact';
+    hookEventName: "PreCompact";
     additionalContext: string;
   };
 }
 
 export enum AgentType {
-  Bash = 'Bash',
-  Explorer = 'Explorer',
-  Plan = 'Plan',
-  Custom = 'Custom',
+  Bash = "Bash",
+  Explorer = "Explorer",
+  Plan = "Plan",
+  Custom = "Custom",
 }
 
 /**
@@ -715,7 +697,7 @@ export interface SubagentStartInput extends HookInput {
  */
 export interface SubagentStartOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'SubagentStart';
+    hookEventName: "SubagentStart";
     additionalContext?: string;
   };
 }
@@ -739,7 +721,7 @@ export interface SubagentStopInput extends HookInput {
  */
 export interface SubagentStopOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'SubagentStop';
+    hookEventName: "SubagentStop";
     additionalContext?: string;
   };
 }
diff --git a/packages/airiscode-core/src/ide/constants.ts b/packages/airiscode-core/src/ide/constants.ts
index 106c82cd4..ee482e33e 100644
--- a/packages/airiscode-core/src/ide/constants.ts
+++ b/packages/airiscode-core/src/ide/constants.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const AIRISCODE_COMPANION_EXTENSION_NAME = 'AIRIS Code Companion';
+export const AIRISCODE_COMPANION_EXTENSION_NAME = "AIRIS Code Companion";
 export const IDE_MAX_OPEN_FILES = 10;
 export const IDE_MAX_SELECTED_TEXT_LENGTH = 16384; // 16 KiB limit
 export const IDE_REQUEST_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
diff --git a/packages/airiscode-core/src/ide/detect-ide.ts b/packages/airiscode-core/src/ide/detect-ide.ts
index c00d9a629..5914363b7 100644
--- a/packages/airiscode-core/src/ide/detect-ide.ts
+++ b/packages/airiscode-core/src/ide/detect-ide.ts
@@ -5,15 +5,15 @@
  */
 
 export const IDE_DEFINITIONS = {
-  devin: { name: 'devin', displayName: 'Devin' },
-  replit: { name: 'replit', displayName: 'Replit' },
-  cursor: { name: 'cursor', displayName: 'Cursor' },
-  cloudshell: { name: 'cloudshell', displayName: 'Cloud Shell' },
-  codespaces: { name: 'codespaces', displayName: 'GitHub Codespaces' },
-  firebasestudio: { name: 'firebasestudio', displayName: 'Firebase Studio' },
-  trae: { name: 'trae', displayName: 'Trae' },
-  vscode: { name: 'vscode', displayName: 'VS Code' },
-  vscodefork: { name: 'vscodefork', displayName: 'IDE' },
+  devin: { name: "devin", displayName: "Devin" },
+  replit: { name: "replit", displayName: "Replit" },
+  cursor: { name: "cursor", displayName: "Cursor" },
+  cloudshell: { name: "cloudshell", displayName: "Cloud Shell" },
+  codespaces: { name: "codespaces", displayName: "GitHub Codespaces" },
+  firebasestudio: { name: "firebasestudio", displayName: "Firebase Studio" },
+  trae: { name: "trae", displayName: "Trae" },
+  vscode: { name: "vscode", displayName: "VS Code" },
+  vscodefork: { name: "vscodefork", displayName: "IDE" },
 } as const;
 
 export interface IdeInfo {
@@ -22,29 +22,29 @@ export interface IdeInfo {
 }
 
 export function isCloudShell(): boolean {
-  return !!(process.env['EDITOR_IN_CLOUD_SHELL'] || process.env['CLOUD_SHELL']);
+  return !!(process.env["EDITOR_IN_CLOUD_SHELL"] || process.env["CLOUD_SHELL"]);
 }
 
 export function detectIdeFromEnv(): IdeInfo {
-  if (process.env['__COG_BASHRC_SOURCED']) {
+  if (process.env["__COG_BASHRC_SOURCED"]) {
     return IDE_DEFINITIONS.devin;
   }
-  if (process.env['REPLIT_USER']) {
+  if (process.env["REPLIT_USER"]) {
     return IDE_DEFINITIONS.replit;
   }
-  if (process.env['CURSOR_TRACE_ID']) {
+  if (process.env["CURSOR_TRACE_ID"]) {
     return IDE_DEFINITIONS.cursor;
   }
-  if (process.env['CODESPACES']) {
+  if (process.env["CODESPACES"]) {
     return IDE_DEFINITIONS.codespaces;
   }
   if (isCloudShell()) {
     return IDE_DEFINITIONS.cloudshell;
   }
-  if (process.env['TERM_PRODUCT'] === 'Trae') {
+  if (process.env["TERM_PRODUCT"] === "Trae") {
     return IDE_DEFINITIONS.trae;
   }
-  if (process.env['MONOSPACE_ENV']) {
+  if (process.env["MONOSPACE_ENV"]) {
     return IDE_DEFINITIONS.firebasestudio;
   }
   return IDE_DEFINITIONS.vscode;
@@ -60,10 +60,7 @@ function verifyVSCode(
   if (ide.name !== IDE_DEFINITIONS.vscode.name) {
     return ide;
   }
-  if (
-    ideProcessInfo.command &&
-    ideProcessInfo.command.toLowerCase().includes('code')
-  ) {
+  if (ideProcessInfo.command && ideProcessInfo.command.toLowerCase().includes("code")) {
     return IDE_DEFINITIONS.vscode;
   }
   return IDE_DEFINITIONS.vscodefork;
@@ -84,7 +81,7 @@ export function detectIde(
   }
 
   // Only VSCode-based integrations are currently supported.
-  if (process.env['TERM_PROGRAM'] !== 'vscode') {
+  if (process.env["TERM_PROGRAM"] !== "vscode") {
     return undefined;
   }
 
diff --git a/packages/airiscode-core/src/ide/ide-client.ts b/packages/airiscode-core/src/ide/ide-client.ts
index deb89f0f7..157d1311c 100644
--- a/packages/airiscode-core/src/ide/ide-client.ts
+++ b/packages/airiscode-core/src/ide/ide-client.ts
@@ -4,39 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as dns from 'node:dns';
-import * as fs from 'node:fs';
-import { isSubpath } from '../utils/paths.js';
-import { detectIde, type IdeInfo } from '../ide/detect-ide.js';
-import { ideContextStore } from './ideContext.js';
-import { Storage } from '../config/storage.js';
+import * as dns from "node:dns";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { CallToolResultSchema, ListToolsResultSchema } from "@modelcontextprotocol/sdk/types.js";
+import { EnvHttpProxyAgent } from "undici";
+import { Storage } from "../config/storage.js";
+import { detectIde, type IdeInfo } from "../ide/detect-ide.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { isSubpath } from "../utils/paths.js";
+import { IDE_REQUEST_TIMEOUT_MS } from "./constants.js";
+import { ideContextStore } from "./ideContext.js";
+import { getIdeProcessInfo } from "./process-utils.js";
 import {
   IdeContextNotificationSchema,
   IdeDiffAcceptedNotificationSchema,
   IdeDiffClosedNotificationSchema,
   IdeDiffRejectedNotificationSchema,
-} from './types.js';
-import { getIdeProcessInfo } from './process-utils.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { EnvHttpProxyAgent } from 'undici';
-import { ListToolsResultSchema } from '@modelcontextprotocol/sdk/types.js';
-import { IDE_REQUEST_TIMEOUT_MS } from './constants.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('IDE');
+} from "./types.js";
+
+const debugLogger = createDebugLogger("IDE");
 
 export type DiffUpdateResult =
   | {
-      status: 'accepted';
+      status: "accepted";
       content?: string;
     }
   | {
-      status: 'rejected';
+      status: "rejected";
       content: undefined;
     };
 
@@ -46,9 +45,9 @@ export type IDEConnectionState = {
 };
 
 export enum IDEConnectionStatus {
-  Connected = 'connected',
-  Disconnected = 'disconnected',
-  Connecting = 'connecting',
+  Connected = "connected",
+  Disconnected = "disconnected",
+  Connecting = "connecting",
 }
 
 type StdioConfig = {
@@ -93,8 +92,7 @@ export class IdeClient {
   private client: Client | undefined = undefined;
   private state: IDEConnectionState = {
     status: IDEConnectionStatus.Disconnected,
-    details:
-      'IDE integration is currently disabled. To enable it, run /ide enable.',
+    details: "IDE integration is currently disabled. To enable it, run /ide enable.",
   };
   private currentIde: IdeInfo | undefined;
   private ideProcessInfo: { pid: number; command: string } | undefined;
@@ -119,10 +117,7 @@ export class IdeClient {
         const client = new IdeClient();
         client.ideProcessInfo = await getIdeProcessInfo();
         client.connectionConfig = await client.getConnectionConfigFromFile();
-        client.currentIde = detectIde(
-          client.ideProcessInfo,
-          client.connectionConfig?.ideInfo,
-        );
+        client.currentIde = detectIde(client.ideProcessInfo, client.connectionConfig?.ideInfo);
         return client;
       })();
     }
@@ -162,13 +157,9 @@ export class IdeClient {
       this.authToken = this.connectionConfig.authToken;
     }
     const workspacePath =
-      this.connectionConfig?.workspacePath ??
-      process.env['AIRISCODE_IDE_WORKSPACE_PATH'];
+      this.connectionConfig?.workspacePath ?? process.env["AIRISCODE_IDE_WORKSPACE_PATH"];
 
-    const { isValid, error } = IdeClient.validateWorkspacePath(
-      workspacePath,
-      process.cwd(),
-    );
+    const { isValid, error } = IdeClient.validateWorkspacePath(workspacePath, process.cwd());
 
     if (!isValid) {
       this.setState(IDEConnectionStatus.Disconnected, error, true);
@@ -177,9 +168,7 @@ export class IdeClient {
 
     if (this.connectionConfig) {
       if (this.connectionConfig.port) {
-        const connected = await this.establishHttpConnection(
-          this.connectionConfig.port,
-        );
+        const connected = await this.establishHttpConnection(this.connectionConfig.port);
         if (connected) {
           return;
         }
@@ -189,9 +178,7 @@ export class IdeClient {
         }
       }
       if (this.connectionConfig.stdio) {
-        const connected = await this.establishStdioConnection(
-          this.connectionConfig.stdio,
-        );
+        const connected = await this.establishStdioConnection(this.connectionConfig.stdio);
         if (connected) {
           return;
         }
@@ -239,22 +226,19 @@ export class IdeClient {
    *   whether the diff was 'accepted' or 'rejected' and including the final
    *   content if accepted.
    */
-  async openDiff(
-    filePath: string,
-    newContent: string,
-  ): Promise<DiffUpdateResult> {
+  async openDiff(filePath: string, newContent: string): Promise<DiffUpdateResult> {
     const release = await this.acquireMutex();
 
     const promise = new Promise<DiffUpdateResult>((resolve, reject) => {
       if (!this.client) {
         // The promise will be rejected, and the finally block below will release the mutex.
-        return reject(new Error('IDE client is not connected.'));
+        return reject(new Error("IDE client is not connected."));
       }
       this.diffResponses.set(filePath, resolve);
       this.client
         .request(
           {
-            method: 'tools/call',
+            method: "tools/call",
             params: {
               name: `openDiff`,
               arguments: {
@@ -268,11 +252,8 @@ export class IdeClient {
         )
         .then((parsedResultData) => {
           if (parsedResultData.isError) {
-            const textPart = parsedResultData.content.find(
-              (part) => part.type === 'text',
-            );
-            const errorMessage =
-              textPart?.text ?? `Tool 'openDiff' reported an error.`;
+            const textPart = parsedResultData.content.find((part) => part.type === "text");
+            const errorMessage = textPart?.text ?? `Tool 'openDiff' reported an error.`;
             debugLogger.debug(
               `Request for openDiff ${filePath} failed with isError:`,
               errorMessage,
@@ -331,7 +312,7 @@ export class IdeClient {
       }
       const resultData = await this.client.request(
         {
-          method: 'tools/call',
+          method: "tools/call",
           params: {
             name: `closeDiff`,
             arguments: {
@@ -349,34 +330,25 @@ export class IdeClient {
       }
 
       if (resultData.isError) {
-        const textPart = resultData.content.find(
-          (part) => part.type === 'text',
-        );
-        const errorMessage =
-          textPart?.text ?? `Tool 'closeDiff' reported an error.`;
-        debugLogger.debug(
-          `Request for closeDiff ${filePath} failed with isError:`,
-          errorMessage,
-        );
+        const textPart = resultData.content.find((part) => part.type === "text");
+        const errorMessage = textPart?.text ?? `Tool 'closeDiff' reported an error.`;
+        debugLogger.debug(`Request for closeDiff ${filePath} failed with isError:`, errorMessage);
         return undefined;
       }
 
-      const textPart = resultData.content.find((part) => part.type === 'text');
+      const textPart = resultData.content.find((part) => part.type === "text");
 
       if (textPart?.text) {
         try {
           const parsedJson = JSON.parse(textPart.text);
-          if (parsedJson && typeof parsedJson.content === 'string') {
+          if (parsedJson && typeof parsedJson.content === "string") {
             return parsedJson.content;
           }
           if (parsedJson && parsedJson.content === null) {
             return undefined;
           }
         } catch (_e) {
-          debugLogger.debug(
-            `Invalid JSON in closeDiff response for ${filePath}:`,
-            textPart.text,
-          );
+          debugLogger.debug(`Invalid JSON in closeDiff response for ${filePath}:`, textPart.text);
         }
       }
     } catch (err) {
@@ -387,7 +359,7 @@ export class IdeClient {
 
   // Closes the diff. Instead of waiting for a notification,
   // manually resolves the diff resolver as the desired outcome.
-  async resolveDiffFromCli(filePath: string, outcome: 'accepted' | 'rejected') {
+  async resolveDiffFromCli(filePath: string, outcome: "accepted" | "rejected") {
     const resolver = this.diffResponses.get(filePath);
     const content = await this.closeDiff(filePath, {
       // Suppress notification to avoid race where closing the diff rejects the
@@ -396,10 +368,10 @@ export class IdeClient {
     });
 
     if (resolver) {
-      if (outcome === 'accepted') {
-        resolver({ status: 'accepted', content });
+      if (outcome === "accepted") {
+        resolver({ status: "accepted", content });
       } else {
-        resolver({ status: 'rejected', content: undefined });
+        resolver({ status: "rejected", content: undefined });
       }
       this.diffResponses.delete(filePath);
     }
@@ -415,7 +387,7 @@ export class IdeClient {
     this.diffResponses.clear();
     this.setState(
       IDEConnectionStatus.Disconnected,
-      'IDE integration disabled. To enable it again, run /ide enable.',
+      "IDE integration disabled. To enable it again, run /ide enable.",
     );
     this.client?.close();
   }
@@ -436,8 +408,8 @@ export class IdeClient {
     return (
       !!this.client &&
       this.state.status === IDEConnectionStatus.Connected &&
-      this.availableTools.includes('openDiff') &&
-      this.availableTools.includes('closeDiff')
+      this.availableTools.includes("openDiff") &&
+      this.availableTools.includes("closeDiff")
     );
   }
 
@@ -446,9 +418,9 @@ export class IdeClient {
       return;
     }
     try {
-      debugLogger.debug('Discovering tools from IDE...');
+      debugLogger.debug("Discovering tools from IDE...");
       const response = await this.client.request(
-        { method: 'tools/list', params: {} },
+        { method: "tools/list", params: {} },
         ListToolsResultSchema,
       );
 
@@ -457,33 +429,24 @@ export class IdeClient {
 
       if (this.availableTools.length > 0) {
         debugLogger.debug(
-          `Discovered ${this.availableTools.length} tools from IDE: ${this.availableTools.join(', ')}`,
+          `Discovered ${this.availableTools.length} tools from IDE: ${this.availableTools.join(", ")}`,
         );
       } else {
-        debugLogger.debug(
-          'IDE supports tool discovery, but no tools are available.',
-        );
+        debugLogger.debug("IDE supports tool discovery, but no tools are available.");
       }
     } catch (error) {
       // It's okay if this fails, the IDE might not support it.
       // Don't log an error if the method is not found, which is a common case.
-      if (
-        error instanceof Error &&
-        !error.message?.includes('Method not found')
-      ) {
+      if (error instanceof Error && !error.message?.includes("Method not found")) {
         debugLogger.error(`Error discovering tools from IDE: ${error.message}`);
       } else {
-        debugLogger.debug('IDE does not support tool discovery.');
+        debugLogger.debug("IDE does not support tool discovery.");
       }
       this.availableTools = [];
     }
   }
 
-  private setState(
-    status: IDEConnectionStatus,
-    details?: string,
-    logToConsole = false,
-  ) {
+  private setState(status: IDEConnectionStatus, details?: string, logToConsole = false) {
     const isAlreadyDisconnected =
       this.state.status === IDEConnectionStatus.Disconnected &&
       status === IDEConnectionStatus.Disconnected;
@@ -522,7 +485,7 @@ export class IdeClient {
       };
     }
 
-    if (ideWorkspacePath === '') {
+    if (ideWorkspacePath === "") {
       return {
         isValid: false,
         error: `To use this feature, please open a workspace folder in your IDE and try again.`,
@@ -540,7 +503,7 @@ export class IdeClient {
       return {
         isValid: false,
         error: `Directory mismatch. AIRIS Code is running in a different location than the open workspace in the IDE. Please run the CLI from one of the following directories: ${ideWorkspacePaths.join(
-          ', ',
+          ", ",
         )}`,
       };
     }
@@ -548,7 +511,7 @@ export class IdeClient {
   }
 
   private getPortFromEnv(): string | undefined {
-    const port = process.env['AIRISCODE_IDE_SERVER_PORT'];
+    const port = process.env["AIRISCODE_IDE_SERVER_PORT"];
     if (!port) {
       return undefined;
     }
@@ -556,12 +519,12 @@ export class IdeClient {
   }
 
   private getStdioConfigFromEnv(): StdioConfig | undefined {
-    const command = process.env['AIRISCODE_IDE_SERVER_STDIO_COMMAND'];
+    const command = process.env["AIRISCODE_IDE_SERVER_STDIO_COMMAND"];
     if (!command) {
       return undefined;
     }
 
-    const argsStr = process.env['AIRISCODE_IDE_SERVER_STDIO_ARGS'];
+    const argsStr = process.env["AIRISCODE_IDE_SERVER_STDIO_ARGS"];
     let args: string[] = [];
     if (argsStr) {
       try {
@@ -569,31 +532,24 @@ export class IdeClient {
         if (Array.isArray(parsedArgs)) {
           args = parsedArgs;
         } else {
-          debugLogger.error(
-            'AIRISCODE_IDE_SERVER_STDIO_ARGS must be a JSON array string.',
-          );
+          debugLogger.error("AIRISCODE_IDE_SERVER_STDIO_ARGS must be a JSON array string.");
         }
       } catch (e) {
-        debugLogger.error(
-          'Failed to parse AIRISCODE_IDE_SERVER_STDIO_ARGS:',
-          e,
-        );
+        debugLogger.error("Failed to parse AIRISCODE_IDE_SERVER_STDIO_ARGS:", e);
       }
     }
 
     return { command, args };
   }
 
-  private async getConnectionConfigFromFile(): Promise<
-    IdeConnectionConfig | undefined
-  > {
+  private async getConnectionConfigFromFile(): Promise<IdeConnectionConfig | undefined> {
     const portFromEnv = this.getPortFromEnv();
 
     if (portFromEnv) {
       try {
         const ideDir = Storage.getGlobalIdeDir();
         const lockFile = path.join(ideDir, `${portFromEnv}.lock`);
-        const lockFileContents = await fs.promises.readFile(lockFile, 'utf8');
+        const lockFileContents = await fs.promises.readFile(lockFile, "utf8");
         return JSON.parse(lockFileContents);
       } catch (_) {
         // Fall through to legacy discovery.
@@ -626,7 +582,7 @@ export class IdeClient {
           os.tmpdir(),
           `airiscode-ide-server-${this.ideProcessInfo.pid}.json`,
         );
-        const portFileContents = await fs.promises.readFile(portFile, 'utf8');
+        const portFileContents = await fs.promises.readFile(portFile, "utf8");
         return JSON.parse(portFileContents);
       } catch (_) {
         // For older/newer extension versions, the file name matches the pattern
@@ -638,11 +594,8 @@ export class IdeClient {
 
     if (portFromEnv) {
       try {
-        const portFile = path.join(
-          os.tmpdir(),
-          `airiscode-ide-server-${portFromEnv}.json`,
-        );
-        const portFileContents = await fs.promises.readFile(portFile, 'utf8');
+        const portFile = path.join(os.tmpdir(), `airiscode-ide-server-${portFromEnv}.json`);
+        const portFileContents = await fs.promises.readFile(portFile, "utf8");
         return JSON.parse(portFileContents);
       } catch (_) {
         // Ignore and fall through.
@@ -652,9 +605,7 @@ export class IdeClient {
     return undefined;
   }
 
-  protected async getAllConnectionConfigs(
-    ideDir: string,
-  ): Promise<IdeConnectionConfig[]> {
+  protected async getAllConnectionConfigs(ideDir: string): Promise<IdeConnectionConfig[]> {
     const fileRegex = /^\d+\.lock$/;
     let lockFiles: string[];
     try {
@@ -662,7 +613,7 @@ export class IdeClient {
         .map((file) => file.toString())
         .filter((file) => fileRegex.test(file));
     } catch (e) {
-      debugLogger.debug('Failed to read IDE connection directory:', e);
+      debugLogger.debug("Failed to read IDE connection directory:", e);
       return [];
     }
 
@@ -671,7 +622,7 @@ export class IdeClient {
         const fullPath = path.join(ideDir, file);
         try {
           const stat = await fs.promises.stat(fullPath);
-          const content = await fs.promises.readFile(fullPath, 'utf8');
+          const content = await fs.promises.readFile(fullPath, "utf8");
           try {
             return {
               file,
@@ -680,19 +631,18 @@ export class IdeClient {
               parsed: JSON.parse(content) as IdeConnectionConfig,
             };
           } catch (error) {
-            debugLogger.debug('Failed to parse JSON from lock file: ', error);
+            debugLogger.debug("Failed to parse JSON from lock file: ", error);
             return undefined;
           }
         } catch (error) {
-          debugLogger.debug('Failed to read/stat IDE lock file:', error);
+          debugLogger.debug("Failed to read/stat IDE lock file:", error);
           return undefined;
         }
       }),
     );
 
     const parsedLockFiles = fileContents.filter(
-      (lockFile): lockFile is ParsedConnectionLockFile =>
-        lockFile !== undefined,
+      (lockFile): lockFile is ParsedConnectionLockFile => lockFile !== undefined,
     );
     const activeLockFiles = await Promise.all(
       parsedLockFiles.map(async (lockFile) => ({
@@ -703,9 +653,7 @@ export class IdeClient {
 
     const staleCount = activeLockFiles.filter(({ isStale }) => isStale).length;
     if (staleCount > 0) {
-      debugLogger.debug(
-        `[cleanupStaleLockFiles] Cleaned up ${staleCount} stale lock file(s)`,
-      );
+      debugLogger.debug(`[cleanupStaleLockFiles] Cleaned up ${staleCount} stale lock file(s)`);
     }
 
     return activeLockFiles
@@ -748,10 +696,7 @@ export class IdeClient {
 
       return false;
     } catch (error) {
-      debugLogger.debug(
-        `[cleanupStaleLockFiles] Error checking lock file "${file}":`,
-        error,
-      );
+      debugLogger.debug(`[cleanupStaleLockFiles] Error checking lock file "${file}":`, error);
       return false;
     }
   }
@@ -759,9 +704,7 @@ export class IdeClient {
   private async tryFallbackPorts(): Promise<boolean> {
     const cwd = process.cwd();
     const currentPort = this.connectionConfig?.port;
-    const configs = await this.getAllConnectionConfigs(
-      Storage.getGlobalIdeDir(),
-    );
+    const configs = await this.getAllConnectionConfigs(Storage.getGlobalIdeDir());
     const workspaceMatches: IdeConnectionConfig[] = [];
     const otherConfigs: IdeConnectionConfig[] = [];
 
@@ -801,19 +744,19 @@ export class IdeClient {
   private createProxyAwareFetch(ideHost: string) {
     // Ignore proxy for IDE server host to allow connecting to the ide mcp
     // server even when HTTP_PROXY is set
-    const existingNoProxy = process.env['NO_PROXY'] || '';
+    const existingNoProxy = process.env["NO_PROXY"] || "";
     const noProxyHosts = [existingNoProxy, ideHost];
     const agent = new EnvHttpProxyAgent({
-      noProxy: noProxyHosts.filter(Boolean).join(','),
+      noProxy: noProxyHosts.filter(Boolean).join(","),
     });
-    const undiciPromise = import('undici');
+    const undiciPromise = import("undici");
     return async (url: string | URL, init?: RequestInit): Promise<Response> => {
       const { fetch: fetchFn } = await undiciPromise;
       const fetchOptions: RequestInit & { dispatcher?: unknown } = {
         ...init,
         dispatcher: agent,
       };
-      const options = fetchOptions as unknown as import('undici').RequestInit;
+      const options = fetchOptions as unknown as import("undici").RequestInit;
       const response = await fetchFn(url, options);
       // Convert undici Headers to standard Headers for compatibility
       const standardHeaders = new Headers();
@@ -834,18 +777,15 @@ export class IdeClient {
       return;
     }
 
-    this.client.setNotificationHandler(
-      IdeContextNotificationSchema,
-      (notification) => {
-        ideContextStore.set(notification.params);
-        const isTrusted = notification.params.workspaceState?.isTrusted;
-        if (isTrusted !== undefined) {
-          for (const listener of this.trustChangeListeners) {
-            listener(isTrusted);
-          }
+    this.client.setNotificationHandler(IdeContextNotificationSchema, (notification) => {
+      ideContextStore.set(notification.params);
+      const isTrusted = notification.params.workspaceState?.isTrusted;
+      if (isTrusted !== undefined) {
+        for (const listener of this.trustChangeListeners) {
+          listener(isTrusted);
         }
-      },
-    );
+      }
+    });
     this.client.onerror = (_error) => {
       const errorMessage = _error instanceof Error ? _error.message : `_error`;
       this.setState(
@@ -861,49 +801,40 @@ export class IdeClient {
         true,
       );
     };
-    this.client.setNotificationHandler(
-      IdeDiffAcceptedNotificationSchema,
-      (notification) => {
-        const { filePath, content } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'accepted', content });
-          this.diffResponses.delete(filePath);
-        } else {
-          debugLogger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffAcceptedNotificationSchema, (notification) => {
+      const { filePath, content } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "accepted", content });
+        this.diffResponses.delete(filePath);
+      } else {
+        debugLogger.debug(`No resolver found for ${filePath}`);
+      }
+    });
 
-    this.client.setNotificationHandler(
-      IdeDiffRejectedNotificationSchema,
-      (notification) => {
-        const { filePath } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'rejected', content: undefined });
-          this.diffResponses.delete(filePath);
-        } else {
-          debugLogger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffRejectedNotificationSchema, (notification) => {
+      const { filePath } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "rejected", content: undefined });
+        this.diffResponses.delete(filePath);
+      } else {
+        debugLogger.debug(`No resolver found for ${filePath}`);
+      }
+    });
 
     // For backwards compatability. Newer extension versions will only send
     // IdeDiffRejectedNotificationSchema.
-    this.client.setNotificationHandler(
-      IdeDiffClosedNotificationSchema,
-      (notification) => {
-        const { filePath } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'rejected', content: undefined });
-          this.diffResponses.delete(filePath);
-        } else {
-          debugLogger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffClosedNotificationSchema, (notification) => {
+      const { filePath } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "rejected", content: undefined });
+        this.diffResponses.delete(filePath);
+      } else {
+        debugLogger.debug(`No resolver found for ${filePath}`);
+      }
+    });
   }
 
   private async establishHttpConnection(port: string): Promise<boolean> {
@@ -932,26 +863,19 @@ export class IdeClient {
   private async tryHttpConnect(port: string, host: string): Promise<boolean> {
     let transport: StreamableHTTPClientTransport | undefined;
     try {
-      debugLogger.debug(
-        `Attempting to connect to IDE via HTTP at ${host}:${port}`,
-      );
+      debugLogger.debug(`Attempting to connect to IDE via HTTP at ${host}:${port}`);
       this.client = new Client({
-        name: 'streamable-http-client',
+        name: "streamable-http-client",
         // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: "1.0.0",
       });
 
-      transport = new StreamableHTTPClientTransport(
-        new URL(`http://${host}:${port}/mcp`),
-        {
-          fetch: this.createProxyAwareFetch(host),
-          requestInit: {
-            headers: this.authToken
-              ? { Authorization: `Bearer ${this.authToken}` }
-              : {},
-          },
+      transport = new StreamableHTTPClientTransport(new URL(`http://${host}:${port}/mcp`), {
+        fetch: this.createProxyAwareFetch(host),
+        requestInit: {
+          headers: this.authToken ? { Authorization: `Bearer ${this.authToken}` } : {},
         },
-      );
+      });
 
       this.registerClientHandlers();
 
@@ -966,24 +890,21 @@ export class IdeClient {
         try {
           await transport.close();
         } catch (closeError) {
-          debugLogger.debug('Failed to close transport:', closeError);
+          debugLogger.debug("Failed to close transport:", closeError);
         }
       }
       return false;
     }
   }
 
-  private async establishStdioConnection({
-    command,
-    args,
-  }: StdioConfig): Promise<boolean> {
+  private async establishStdioConnection({ command, args }: StdioConfig): Promise<boolean> {
     let transport: StdioClientTransport | undefined;
     try {
-      debugLogger.debug('Attempting to connect to IDE via stdio');
+      debugLogger.debug("Attempting to connect to IDE via stdio");
       this.client = new Client({
-        name: 'stdio-client',
+        name: "stdio-client",
         // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: "1.0.0",
       });
 
       transport = new StdioClientTransport({
@@ -1000,7 +921,7 @@ export class IdeClient {
         try {
           await transport.close();
         } catch (closeError) {
-          debugLogger.debug('Failed to close transport:', closeError);
+          debugLogger.debug("Failed to close transport:", closeError);
         }
       }
       return false;
@@ -1008,8 +929,8 @@ export class IdeClient {
   }
 }
 
-const CONTAINER_HOST = 'host.docker.internal';
-const LOCAL_HOST = '127.0.0.1';
+const CONTAINER_HOST = "host.docker.internal";
+const LOCAL_HOST = "127.0.0.1";
 const DNS_LOOKUP_TIMEOUT_MS = 3_000;
 
 /**
@@ -1061,8 +982,7 @@ async function isHostResolvable(hostname: string): Promise<boolean> {
  * Results are cached; concurrent calls share a single lookup.
  */
 async function resolveIdeServerHost(): Promise<string> {
-  const isInContainer =
-    fs.existsSync('/.dockerenv') || fs.existsSync('/run/.containerenv');
+  const isInContainer = fs.existsSync("/.dockerenv") || fs.existsSync("/run/.containerenv");
 
   if (!isInContainer) {
     return LOCAL_HOST;
@@ -1070,12 +990,12 @@ async function resolveIdeServerHost(): Promise<string> {
 
   const reachable = await isHostResolvable(CONTAINER_HOST);
   if (reachable) {
-    debugLogger.debug('Container detected, host.docker.internal is reachable');
+    debugLogger.debug("Container detected, host.docker.internal is reachable");
     return CONTAINER_HOST;
   }
 
   debugLogger.debug(
-    'Container detected, but host.docker.internal is NOT reachable, falling back to 127.0.0.1',
+    "Container detected, but host.docker.internal is NOT reachable, falling back to 127.0.0.1",
   );
   return LOCAL_HOST;
 }
diff --git a/packages/airiscode-core/src/ide/ide-installer.ts b/packages/airiscode-core/src/ide/ide-installer.ts
index 309893b0c..3b44e1a69 100644
--- a/packages/airiscode-core/src/ide/ide-installer.ts
+++ b/packages/airiscode-core/src/ide/ide-installer.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as child_process from 'node:child_process';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import { IDE_DEFINITIONS, type IdeInfo } from './detect-ide.js';
-import { AIRISCODE_COMPANION_EXTENSION_NAME } from './constants.js';
+import * as child_process from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as process from "node:process";
+import { AIRISCODE_COMPANION_EXTENSION_NAME } from "./constants.js";
+import { IDE_DEFINITIONS, type IdeInfo } from "./detect-ide.js";
 
 function getVsCodeCommand(platform: NodeJS.Platform = process.platform) {
-  return platform === 'win32' ? 'code.cmd' : 'code';
+  return platform === "win32" ? "code.cmd" : "code";
 }
 
 export interface IdeInstaller {
@@ -31,11 +31,8 @@ async function findVsCodeCommand(
   // 1. Check PATH first.
   const vscodeCommand = getVsCodeCommand(platform);
   try {
-    if (platform === 'win32') {
-      const result = child_process
-        .execSync(`where.exe ${vscodeCommand}`)
-        .toString()
-        .trim();
+    if (platform === "win32") {
+      const result = child_process.execSync(`where.exe ${vscodeCommand}`).toString().trim();
       // `where.exe` can return multiple paths. Return the first one.
       const firstPath = result.split(/\r?\n/)[0];
       if (firstPath) {
@@ -43,7 +40,7 @@ async function findVsCodeCommand(
       }
     } else {
       child_process.execSync(`command -v ${vscodeCommand}`, {
-        stdio: 'ignore',
+        stdio: "ignore",
       });
       return vscodeCommand;
     }
@@ -55,37 +52,29 @@ async function findVsCodeCommand(
   const locations: string[] = [];
   const homeDir = os.homedir();
 
-  if (platform === 'darwin') {
+  if (platform === "darwin") {
     // macOS
     locations.push(
-      '/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code',
-      path.join(homeDir, 'Library/Application Support/Code/bin/code'),
+      "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code",
+      path.join(homeDir, "Library/Application Support/Code/bin/code"),
     );
-  } else if (platform === 'linux') {
+  } else if (platform === "linux") {
     // Linux
     locations.push(
-      '/usr/share/code/bin/code',
-      '/snap/bin/code',
-      path.join(homeDir, '.local/share/code/bin/code'),
+      "/usr/share/code/bin/code",
+      "/snap/bin/code",
+      path.join(homeDir, ".local/share/code/bin/code"),
     );
-  } else if (platform === 'win32') {
+  } else if (platform === "win32") {
     // Windows
     locations.push(
       path.join(
-        process.env['ProgramFiles'] || 'C:\\Program Files',
-        'Microsoft VS Code',
-        'bin',
-        'code.cmd',
-      ),
-      path.join(
-        homeDir,
-        'AppData',
-        'Local',
-        'Programs',
-        'Microsoft VS Code',
-        'bin',
-        'code.cmd',
+        process.env["ProgramFiles"] || "C:\\Program Files",
+        "Microsoft VS Code",
+        "bin",
+        "code.cmd",
       ),
+      path.join(homeDir, "AppData", "Local", "Programs", "Microsoft VS Code", "bin", "code.cmd"),
     );
   }
 
@@ -117,22 +106,16 @@ class VsCodeInstaller implements IdeInstaller {
       };
     }
 
-    const isWindows = process.platform === 'win32';
+    const isWindows = process.platform === "win32";
     try {
       const result = child_process.spawnSync(
         isWindows ? `"${commandPath}"` : commandPath,
-        [
-          '--install-extension',
-          'agiletec.airiscode-vscode-ide-companion',
-          '--force',
-        ],
-        { stdio: 'pipe', shell: isWindows },
+        ["--install-extension", "agiletec.airiscode-vscode-ide-companion", "--force"],
+        { stdio: "pipe", shell: isWindows },
       );
 
       if (result.status !== 0) {
-        throw new Error(
-          `Failed to install extension: ${result.stderr?.toString()}`,
-        );
+        throw new Error(`Failed to install extension: ${result.stderr?.toString()}`);
       }
 
       return {
@@ -148,10 +131,7 @@ class VsCodeInstaller implements IdeInstaller {
   }
 }
 
-export function getIdeInstaller(
-  ide: IdeInfo,
-  platform = process.platform,
-): IdeInstaller | null {
+export function getIdeInstaller(ide: IdeInfo, platform = process.platform): IdeInstaller | null {
   switch (ide.name) {
     case IDE_DEFINITIONS.vscode.name:
     case IDE_DEFINITIONS.firebasestudio.name:
diff --git a/packages/airiscode-core/src/ide/ideContext.ts b/packages/airiscode-core/src/ide/ideContext.ts
index 527d4135c..9ec0a1e3b 100644
--- a/packages/airiscode-core/src/ide/ideContext.ts
+++ b/packages/airiscode-core/src/ide/ideContext.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  IDE_MAX_OPEN_FILES,
-  IDE_MAX_SELECTED_TEXT_LENGTH,
-} from './constants.js';
-import type { IdeContext } from './types.js';
+import { IDE_MAX_OPEN_FILES, IDE_MAX_SELECTED_TEXT_LENGTH } from "./constants.js";
+import type { IdeContext } from "./types.js";
 
 type IdeContextSubscriber = (ideContext?: IdeContext) => void;
 
@@ -69,10 +66,8 @@ export class IdeContextStore {
           mostRecentFile.selectedText.length > IDE_MAX_SELECTED_TEXT_LENGTH
         ) {
           mostRecentFile.selectedText =
-            mostRecentFile.selectedText.substring(
-              0,
-              IDE_MAX_SELECTED_TEXT_LENGTH,
-            ) + '... [TRUNCATED]';
+            mostRecentFile.selectedText.substring(0, IDE_MAX_SELECTED_TEXT_LENGTH) +
+            "... [TRUNCATED]";
         }
       }
 
diff --git a/packages/airiscode-core/src/ide/process-utils.ts b/packages/airiscode-core/src/ide/process-utils.ts
index 15337d3c4..690a3f16b 100644
--- a/packages/airiscode-core/src/ide/process-utils.ts
+++ b/packages/airiscode-core/src/ide/process-utils.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { exec, execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import os from 'node:os';
-import path from 'node:path';
+import { exec, execFile } from "node:child_process";
+import os from "node:os";
+import path from "node:path";
+import { promisify } from "node:util";
 
 const execAsync = promisify(exec);
 const execFileAsync = promisify(execFile);
@@ -25,20 +25,20 @@ async function getProcessInfo(pid: number): Promise<{
     const { stdout } = await execAsync(command);
     const trimmedStdout = stdout.trim();
     if (!trimmedStdout) {
-      return { parentPid: 0, name: '', command: '' };
+      return { parentPid: 0, name: "", command: "" };
     }
     const parts = trimmedStdout.split(/\s+/);
     const ppidString = parts[0];
     const parentPid = parseInt(ppidString, 10);
     const fullCommand = trimmedStdout.substring(ppidString.length).trim();
-    const processName = path.basename(fullCommand.split(' ')[0]);
+    const processName = path.basename(fullCommand.split(" ")[0]);
     return {
       parentPid: isNaN(parentPid) ? 1 : parentPid,
       name: processName,
       command: fullCommand,
     };
   } catch (_e) {
-    return { parentPid: 0, name: '', command: '' };
+    return { parentPid: 0, name: "", command: "" };
   }
 }
 /**
@@ -54,7 +54,7 @@ async function getIdeProcessInfoForUnix(): Promise<{
   pid: number;
   command: string;
 }> {
-  const shells = ['zsh', 'bash', 'sh', 'tcsh', 'csh', 'ksh', 'fish', 'dash'];
+  const shells = ["zsh", "bash", "sh", "tcsh", "csh", "ksh", "fish", "dash"];
   let currentPid = process.pid;
 
   for (let i = 0; i < MAX_TRAVERSAL_DEPTH; i++) {
@@ -114,10 +114,10 @@ async function getProcessTableWindows(): Promise<Map<number, ProcessInfo>> {
   const processMap = new Map<number, ProcessInfo>();
   try {
     const powershellCommand =
-      'Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress';
+      "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress";
     const { stdout } = await execFileAsync(
-      'powershell',
-      ['-NoProfile', '-NonInteractive', '-Command', powershellCommand],
+      "powershell",
+      ["-NoProfile", "-NonInteractive", "-Command", powershellCommand],
       { maxBuffer: 10 * 1024 * 1024 },
     );
 
@@ -137,12 +137,12 @@ async function getProcessTableWindows(): Promise<Map<number, ProcessInfo>> {
     }
 
     for (const p of processes) {
-      if (p && typeof p.ProcessId === 'number') {
+      if (p && typeof p.ProcessId === "number") {
         processMap.set(p.ProcessId, {
           pid: p.ProcessId,
           parentPid: p.ParentProcessId || 0,
-          name: p.Name || '',
-          command: p.CommandLine || '',
+          name: p.Name || "",
+          command: p.CommandLine || "",
         });
       }
     }
@@ -164,7 +164,7 @@ async function getIdeProcessInfoForWindows(): Promise<{
 
   if (!myProc) {
     // Fallback: return current process info if snapshot fails
-    return { pid: myPid, command: '' };
+    return { pid: myPid, command: "" };
   }
 
   // Perform tree traversal in memory
@@ -211,7 +211,7 @@ export async function getIdeProcessInfo(): Promise<{
 }> {
   const platform = os.platform();
 
-  if (platform === 'win32') {
+  if (platform === "win32") {
     return getIdeProcessInfoForWindows();
   }
 
diff --git a/packages/airiscode-core/src/ide/types.ts b/packages/airiscode-core/src/ide/types.ts
index f94132db5..ea1644881 100644
--- a/packages/airiscode-core/src/ide/types.ts
+++ b/packages/airiscode-core/src/ide/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
+import { z } from "zod";
 
 /**
  * A file that is open in the IDE.
@@ -67,8 +67,8 @@ export type IdeContext = z.infer<typeof IdeContextSchema>;
  * A notification that the IDE context has been updated.
  */
 export const IdeContextNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/contextUpdate'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/contextUpdate"),
   params: IdeContextSchema,
 });
 
@@ -76,8 +76,8 @@ export const IdeContextNotificationSchema = z.object({
  * A notification that a diff has been accepted in the IDE.
  */
 export const IdeDiffAcceptedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffAccepted'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffAccepted"),
   params: z.object({
     /**
      * The absolute path to the file that was diffed.
@@ -94,8 +94,8 @@ export const IdeDiffAcceptedNotificationSchema = z.object({
  * A notification that a diff has been rejected in the IDE.
  */
 export const IdeDiffRejectedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffRejected'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffRejected"),
   params: z.object({
     /**
      * The absolute path to the file that was diffed.
@@ -111,8 +111,8 @@ export const IdeDiffRejectedNotificationSchema = z.object({
  * A notification that a diff has been closed in the IDE.
  */
 export const IdeDiffClosedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffClosed'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffClosed"),
   params: z.object({
     filePath: z.string(),
     content: z.string().optional(),
diff --git a/packages/airiscode-core/src/index.ts b/packages/airiscode-core/src/index.ts
index 25e3abdd8..ac48065d9 100644
--- a/packages/airiscode-core/src/index.ts
+++ b/packages/airiscode-core/src/index.ts
@@ -9,19 +9,15 @@
 // ============================================================================
 
 // Core configuration
-export * from './config/config.js';
-export { Storage } from './config/storage.js';
-
-// Permission system
-export * from './permissions/index.js';
-
+export * from "./config/config.js";
 // Model configuration
 export {
   DEFAULT_AIRISCODE_MODEL,
-  DEFAULT_QWEN_FLASH_MODEL,
   DEFAULT_QWEN_EMBEDDING_MODEL,
+  DEFAULT_QWEN_FLASH_MODEL,
   MAINLINE_CODER_MODEL,
-} from './config/models.js';
+} from "./config/models.js";
+export { Storage } from "./config/storage.js";
 export {
   type AvailableModel,
   type ModelCapabilities,
@@ -31,139 +27,140 @@ export {
   type ModelConfigSettingsInput,
   type ModelConfigSourcesInput,
   type ModelConfigValidationResult,
-  ModelRegistry,
   type ModelGenerationConfig,
-  ModelsConfig,
-  type ModelsConfigOptions,
   type ModelProvidersConfig,
+  ModelRegistry,
   type ModelSwitchMetadata,
+  ModelsConfig,
+  type ModelsConfigOptions,
   type OnModelChangeCallback,
-  resolveModelConfig,
   type ResolvedModelConfig,
+  resolveModelConfig,
   validateModelConfig,
-} from './models/index.js';
-
+} from "./models/index.js";
 // Output formatting
-export * from './output/json-formatter.js';
-export * from './output/types.js';
+export * from "./output/json-formatter.js";
+export * from "./output/types.js";
+// Permission system
+export * from "./permissions/index.js";
 
 // ============================================================================
 // Core Engine
 // ============================================================================
 
-export * from './core/client.js';
-export * from './core/contentGenerator.js';
-export * from './core/coreToolScheduler.js';
-export * from './core/permission-helpers.js';
-export * from './core/geminiChat.js';
-export * from './core/geminiRequest.js';
-export * from './core/logger.js';
-export * from './core/nonInteractiveToolExecutor.js';
-export * from './core/prompts.js';
-export * from './core/tokenLimits.js';
-export * from './core/turn.js';
+export * from "./core/client.js";
+export * from "./core/contentGenerator.js";
+export * from "./core/coreToolScheduler.js";
+export * from "./core/geminiChat.js";
+export * from "./core/geminiRequest.js";
+export * from "./core/logger.js";
+export * from "./core/nonInteractiveToolExecutor.js";
+export * from "./core/permission-helpers.js";
+export * from "./core/prompts.js";
+export * from "./core/tokenLimits.js";
+export * from "./core/turn.js";
 
 // ============================================================================
 // Tools
 // ============================================================================
 
-// Tool names and registry
-export * from './tools/tool-names.js';
-export * from './tools/tool-error.js';
-export * from './tools/tool-registry.js';
-export * from './tools/tools.js';
+export * from "./tools/agent.js";
+export * from "./tools/cron-create.js";
+export * from "./tools/cron-delete.js";
+export * from "./tools/cron-list.js";
 
 // Individual tools
-export * from './tools/edit.js';
-export * from './tools/exitPlanMode.js';
-export * from './tools/glob.js';
-export * from './tools/grep.js';
-export * from './tools/ls.js';
-export * from './tools/lsp.js';
-export * from './tools/mcp-client.js';
-export * from './tools/mcp-client-manager.js';
-export * from './tools/mcp-tool.js';
-export * from './tools/memoryTool.js';
-export * from './tools/read-file.js';
-export * from './tools/ripGrep.js';
-export * from './tools/sdk-control-client-transport.js';
-export * from './tools/shell.js';
-export * from './tools/skill.js';
-export * from './tools/agent.js';
-export * from './tools/todoWrite.js';
-export * from './tools/tool-error.js';
-export * from './tools/tool-registry.js';
-export * from './tools/web-fetch.js';
-export * from './tools/web-search/index.js';
-export * from './tools/write-file.js';
-export * from './tools/cron-create.js';
-export * from './tools/cron-list.js';
-export * from './tools/cron-delete.js';
+export * from "./tools/edit.js";
+export * from "./tools/exitPlanMode.js";
+export * from "./tools/glob.js";
+export * from "./tools/grep.js";
+export * from "./tools/ls.js";
+export * from "./tools/lsp.js";
+export * from "./tools/mcp-client.js";
+export * from "./tools/mcp-client-manager.js";
+export * from "./tools/mcp-tool.js";
+export * from "./tools/memoryTool.js";
+export * from "./tools/read-file.js";
+export * from "./tools/ripGrep.js";
+export * from "./tools/sdk-control-client-transport.js";
+export * from "./tools/shell.js";
+export * from "./tools/skill.js";
+export * from "./tools/todoWrite.js";
+export * from "./tools/tool-error.js";
+export * from "./tools/tool-error.js";
+// Tool names and registry
+export * from "./tools/tool-names.js";
+export * from "./tools/tool-registry.js";
+export * from "./tools/tool-registry.js";
+export * from "./tools/tools.js";
+export * from "./tools/web-fetch.js";
+export * from "./tools/web-search/index.js";
+export * from "./tools/write-file.js";
 
 // ============================================================================
 // Services
 // ============================================================================
 
-export * from './services/chatRecordingService.js';
-export * from './services/cronScheduler.js';
-export * from './services/fileDiscoveryService.js';
-export * from './services/fileSystemService.js';
-export * from './services/gitService.js';
-export * from './services/gitWorktreeService.js';
-export * from './services/sessionService.js';
-export * from './services/shellExecutionService.js';
+export * from "./services/chatRecordingService.js";
+export * from "./services/cronScheduler.js";
+export * from "./services/fileDiscoveryService.js";
+export * from "./services/fileSystemService.js";
+export * from "./services/gitService.js";
+export * from "./services/gitWorktreeService.js";
+export * from "./services/sessionService.js";
+export * from "./services/shellExecutionService.js";
 
 // ============================================================================
 // IDE Support
 // ============================================================================
 
-export * from './ide/ide-client.js';
-export * from './ide/ideContext.js';
-export * from './ide/ide-installer.js';
-export { IDE_DEFINITIONS, type IdeInfo } from './ide/detect-ide.js';
-export * from './ide/constants.js';
-export * from './ide/types.js';
+export * from "./ide/constants.js";
+export { IDE_DEFINITIONS, type IdeInfo } from "./ide/detect-ide.js";
+export * from "./ide/ide-client.js";
+export * from "./ide/ide-installer.js";
+export * from "./ide/ideContext.js";
+export * from "./ide/types.js";
 
 // ============================================================================
 // LSP Support
 // ============================================================================
 
-export * from './lsp/constants.js';
-export * from './lsp/LspConfigLoader.js';
-export * from './lsp/LspConnectionFactory.js';
-export * from './lsp/LspResponseNormalizer.js';
-export * from './lsp/LspServerManager.js';
-export * from './lsp/NativeLspClient.js';
-export * from './lsp/NativeLspService.js';
-export * from './lsp/types.js';
+export * from "./lsp/constants.js";
+export * from "./lsp/LspConfigLoader.js";
+export * from "./lsp/LspConnectionFactory.js";
+export * from "./lsp/LspResponseNormalizer.js";
+export * from "./lsp/LspServerManager.js";
+export * from "./lsp/NativeLspClient.js";
+export * from "./lsp/NativeLspService.js";
+export * from "./lsp/types.js";
 
 // ============================================================================
 // MCP (Model Context Protocol)
 // ============================================================================
 
-export { MCPOAuthProvider } from './mcp/oauth-provider.js';
 export type {
   MCPOAuthConfig,
   OAuthDisplayMessage,
   OAuthDisplayPayload,
-} from './mcp/oauth-provider.js';
-export { MCPOAuthTokenStorage } from './mcp/oauth-token-storage.js';
-export { KeychainTokenStorage } from './mcp/token-storage/keychain-token-storage.js';
-export type {
-  OAuthCredentials,
-  OAuthToken,
-} from './mcp/token-storage/types.js';
-export { OAuthUtils } from './mcp/oauth-utils.js';
+} from "./mcp/oauth-provider.js";
+export { MCPOAuthProvider } from "./mcp/oauth-provider.js";
+export { MCPOAuthTokenStorage } from "./mcp/oauth-token-storage.js";
 export type {
   OAuthAuthorizationServerMetadata,
   OAuthProtectedResourceMetadata,
-} from './mcp/oauth-utils.js';
+} from "./mcp/oauth-utils.js";
+export { OAuthUtils } from "./mcp/oauth-utils.js";
+export { KeychainTokenStorage } from "./mcp/token-storage/keychain-token-storage.js";
+export type {
+  OAuthCredentials,
+  OAuthToken,
+} from "./mcp/token-storage/types.js";
 
 // ============================================================================
 // Telemetry
 // ============================================================================
 
-export * from './telemetry/index.js';
+export * from "./telemetry/index.js";
 export {
   logAuth,
   logExtensionDisable,
@@ -172,7 +169,7 @@ export {
   logModelSlashCommand,
   logPromptSuggestion,
   logSpeculation,
-} from './telemetry/loggers.js';
+} from "./telemetry/loggers.js";
 export {
   AuthEvent,
   ExtensionDisableEvent,
@@ -184,151 +181,149 @@ export {
   ModelSlashCommandEvent,
   PromptSuggestionEvent,
   SpeculationEvent,
-} from './telemetry/types.js';
+} from "./telemetry/types.js";
 
 // ============================================================================
 // Extensions, Skills, Subagents & Agents
 // ============================================================================
 
-export * from './extension/index.js';
-export * from './prompts/mcp-prompts.js';
-export * from './skills/index.js';
-export * from './subagents/index.js';
-export * from './agents/index.js';
+export * from "./agents/index.js";
+export * from "./extension/index.js";
+export * from "./prompts/mcp-prompts.js";
+export * from "./skills/index.js";
+export * from "./subagents/index.js";
 
 // ============================================================================
 // Follow-up Suggestions
 // ============================================================================
 
-export * from './followup/index.js';
+export * from "./followup/index.js";
 
 // ============================================================================
 // Utilities
 // ============================================================================
 
-export * from './utils/browser.js';
-export * from './utils/configResolver.js';
-export * from './utils/debugLogger.js';
-export * from './utils/editor.js';
-export * from './utils/environmentContext.js';
-export * from './utils/errorParsing.js';
-export * from './utils/errors.js';
-export * from './utils/fileUtils.js';
-export * from './utils/filesearch/fileSearch.js';
-export * from './utils/formatters.js';
-export * from './utils/generateContentResponseUtilities.js';
-export * from './utils/getFolderStructure.js';
-export * from './utils/gitIgnoreParser.js';
-export * from './utils/gitUtils.js';
-export * from './utils/ignorePatterns.js';
-export * from './utils/jsonl-utils.js';
-export * from './utils/memoryDiscovery.js';
-export { OpenAILogger, openaiLogger } from './utils/openaiLogger.js';
-export * from './utils/partUtils.js';
-export * from './utils/pathReader.js';
-export * from './utils/paths.js';
-export * from './utils/projectSummary.js';
-export * from './utils/promptIdContext.js';
-export * from './utils/proxyUtils.js';
-export * from './utils/quotaErrorDetection.js';
-export * from './utils/rateLimit.js';
-export * from './utils/readManyFiles.js';
-export * from './utils/request-tokenizer/supportedImageFormats.js';
-export { TextTokenizer } from './utils/request-tokenizer/textTokenizer.js';
-export * from './utils/retry.js';
-export * from './utils/ripgrepUtils.js';
-export * from './utils/schemaValidator.js';
-export * from './utils/shell-utils.js';
-export * from './utils/subagentGenerator.js';
-export * from './utils/symlink.js';
-export * from './utils/systemEncoding.js';
-export * from './utils/terminalSerializer.js';
-export * from './utils/textUtils.js';
-export * from './utils/thoughtUtils.js';
-export * from './utils/toml-to-markdown-converter.js';
-export * from './utils/tool-utils.js';
-export * from './utils/workspaceContext.js';
-export * from './utils/yaml-parser.js';
+export * from "./utils/browser.js";
+export * from "./utils/configResolver.js";
+export * from "./utils/debugLogger.js";
+export * from "./utils/editor.js";
+export * from "./utils/environmentContext.js";
+export * from "./utils/errorParsing.js";
+export * from "./utils/errors.js";
+export * from "./utils/filesearch/fileSearch.js";
+export * from "./utils/fileUtils.js";
+export * from "./utils/formatters.js";
+export * from "./utils/generateContentResponseUtilities.js";
+export * from "./utils/getFolderStructure.js";
+export * from "./utils/gitIgnoreParser.js";
+export * from "./utils/gitUtils.js";
+export * from "./utils/ignorePatterns.js";
+export * from "./utils/jsonl-utils.js";
+export * from "./utils/memoryDiscovery.js";
+export { OpenAILogger, openaiLogger } from "./utils/openaiLogger.js";
+export * from "./utils/partUtils.js";
+export * from "./utils/pathReader.js";
+export * from "./utils/paths.js";
+export * from "./utils/projectSummary.js";
+export * from "./utils/promptIdContext.js";
+export * from "./utils/proxyUtils.js";
+export * from "./utils/quotaErrorDetection.js";
+export * from "./utils/rateLimit.js";
+export * from "./utils/readManyFiles.js";
+export * from "./utils/request-tokenizer/supportedImageFormats.js";
+export { TextTokenizer } from "./utils/request-tokenizer/textTokenizer.js";
+export * from "./utils/retry.js";
+export * from "./utils/ripgrepUtils.js";
+export * from "./utils/schemaValidator.js";
+export * from "./utils/shell-utils.js";
+export * from "./utils/subagentGenerator.js";
+export * from "./utils/symlink.js";
+export * from "./utils/systemEncoding.js";
+export * from "./utils/terminalSerializer.js";
+export * from "./utils/textUtils.js";
+export * from "./utils/thoughtUtils.js";
+export * from "./utils/toml-to-markdown-converter.js";
+export * from "./utils/tool-utils.js";
+export * from "./utils/workspaceContext.js";
+export * from "./utils/yaml-parser.js";
 
 // ============================================================================
 // OAuth & Authentication
 // ============================================================================
 
-
 // ============================================================================
 // Testing Utilities
 // ============================================================================
 
-export { makeFakeConfig } from './test-utils/config.js';
-export * from './test-utils/index.js';
+export { makeFakeConfig } from "./test-utils/config.js";
+export * from "./test-utils/index.js";
 
 // ============================================================================
 // Hooks
 // ============================================================================
 
-export * from './hooks/types.js';
-export { HookSystem, HookRegistry } from './hooks/index.js';
-export type { HookRegistryEntry } from './hooks/index.js';
-
 // Export hook triggers for notification hooks
 export {
   fireNotificationHook,
   firePermissionRequestHook,
   type NotificationHookResult,
-} from './core/toolHookTriggers.js';
+} from "./core/toolHookTriggers.js";
+export type { HookRegistryEntry } from "./hooks/index.js";
+export { HookRegistry, HookSystem } from "./hooks/index.js";
+export * from "./hooks/types.js";
 
 // ============================================================================
 // LLM Types (self-hosted replacement for @google/genai)
 // ============================================================================
 
 export {
-  FinishReason,
-  Type,
-  HarmCategory,
-  HarmBlockThreshold,
-  BlockedReason,
-  Modality,
-  GenerateContentResponse,
   ApiError as LlmApiError,
-  createUserContent,
-  createModelContent,
-  mcpToTool,
-  type Schema,
-  type FunctionCall,
-  type FunctionResponse,
-  type InlineData,
-  type FileData,
-  type ExecutableCode,
-  type CodeExecutionResult,
-  type Part,
-  type FunctionResponsePart,
-  type PartUnion,
-  type PartListUnion,
-  type Content,
-  type ContentUnion,
-  type ContentListUnion,
-  type FunctionDeclaration,
-  type Tool as LlmTool,
-  type ToolUnion,
-  type ToolListUnion,
-  type ToolConfig as LlmToolConfig,
-  type ToolUseConfig,
+  type ApiErrorInit,
+  BlockedReason,
   type CallableTool,
-  type SafetySetting,
-  type SafetyRating,
+  type Candidate,
   type CitationMetadata,
+  type CodeExecutionResult,
+  type Content,
   type ContentEmbedding,
-  type GenerationConfig,
-  type ThinkingConfig,
-  type GenerateContentConfig,
-  type GenerateContentParameters,
-  type SendMessageParameters,
+  type ContentListUnion,
+  type ContentUnion,
   type CountTokensParameters,
   type CountTokensResponse,
+  createModelContent,
+  createUserContent,
   type EmbedContentParameters,
   type EmbedContentResponse,
+  type ExecutableCode,
+  type FileData,
+  FinishReason,
+  type FunctionCall,
+  type FunctionDeclaration,
+  type FunctionResponse,
+  type FunctionResponsePart,
+  type GenerateContentConfig,
+  type GenerateContentParameters,
+  GenerateContentResponse,
   type GenerateContentResponseUsageMetadata,
-  type Candidate,
+  type GenerationConfig,
+  HarmBlockThreshold,
+  HarmCategory,
+  type InlineData,
+  Modality,
+  mcpToTool,
+  type Part,
+  type PartListUnion,
+  type PartUnion,
   type PromptFeedback,
-  type ApiErrorInit,
-} from './types/llm.js';
+  type SafetyRating,
+  type SafetySetting,
+  type Schema,
+  type SendMessageParameters,
+  type ThinkingConfig,
+  type Tool as LlmTool,
+  type ToolConfig as LlmToolConfig,
+  type ToolListUnion,
+  type ToolUnion,
+  type ToolUseConfig,
+  Type,
+} from "./types/llm.js";
diff --git a/packages/airiscode-core/src/lsp/LspConfigLoader.ts b/packages/airiscode-core/src/lsp/LspConfigLoader.ts
index 0a3b384c7..010136a28 100644
--- a/packages/airiscode-core/src/lsp/LspConfigLoader.ts
+++ b/packages/airiscode-core/src/lsp/LspConfigLoader.ts
@@ -4,22 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'path';
-import { pathToFileURL } from 'url';
-import {
-  recursivelyHydrateStrings,
-  type JsonValue,
-} from '../extension/variables.js';
-import type { Extension } from '../extension/extensionManager.js';
-import type {
-  LspInitializationOptions,
-  LspServerConfig,
-  LspSocketOptions,
-} from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('LSP');
+import * as fs from "node:fs";
+import * as path from "path";
+import { pathToFileURL } from "url";
+import type { Extension } from "../extension/extensionManager.js";
+import { type JsonValue, recursivelyHydrateStrings } from "../extension/variables.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import type { LspInitializationOptions, LspServerConfig, LspSocketOptions } from "./types.js";
+
+const debugLogger = createDebugLogger("LSP");
 
 export class LspConfigLoader {
   constructor(private readonly workspaceRoot: string) {}
@@ -29,17 +22,17 @@ export class LspConfigLoader {
    * Supports basic format: { "language": { "command": "...", "extensionToLanguage": {...} } }
    */
   async loadUserConfigs(): Promise<LspServerConfig[]> {
-    const lspConfigPath = path.join(this.workspaceRoot, '.lsp.json');
+    const lspConfigPath = path.join(this.workspaceRoot, ".lsp.json");
     if (!fs.existsSync(lspConfigPath)) {
       return [];
     }
 
     try {
-      const configContent = fs.readFileSync(lspConfigPath, 'utf-8');
+      const configContent = fs.readFileSync(lspConfigPath, "utf-8");
       const data = JSON.parse(configContent);
       return this.parseConfigSource(data, lspConfigPath);
     } catch (error) {
-      debugLogger.warn('Failed to load user .lsp.json config:', error);
+      debugLogger.warn("Failed to load user .lsp.json config:", error);
       return [];
     }
   }
@@ -47,9 +40,7 @@ export class LspConfigLoader {
   /**
    * Load LSP configurations declared by extensions (Claude plugins).
    */
-  async loadExtensionConfigs(
-    extensions: Extension[],
-  ): Promise<LspServerConfig[]> {
+  async loadExtensionConfigs(extensions: Extension[]): Promise<LspServerConfig[]> {
     const configs: LspServerConfig[] = [];
 
     for (const extension of extensions) {
@@ -59,46 +50,26 @@ export class LspConfigLoader {
       }
 
       const originBase = `extension ${extension.name}`;
-      if (typeof lspServers === 'string') {
-        const configPath = this.resolveExtensionConfigPath(
-          extension.path,
-          lspServers,
-        );
+      if (typeof lspServers === "string") {
+        const configPath = this.resolveExtensionConfigPath(extension.path, lspServers);
         if (!fs.existsSync(configPath)) {
-          debugLogger.warn(
-            `LSP config not found for ${originBase}: ${configPath}`,
-          );
+          debugLogger.warn(`LSP config not found for ${originBase}: ${configPath}`);
           continue;
         }
 
         try {
-          const configContent = fs.readFileSync(configPath, 'utf-8');
+          const configContent = fs.readFileSync(configPath, "utf-8");
           const data = JSON.parse(configContent) as JsonValue;
           const hydrated = this.hydrateExtensionLspConfig(data, extension.path);
-          configs.push(
-            ...this.parseConfigSource(
-              hydrated,
-              `${originBase} (${configPath})`,
-            ),
-          );
+          configs.push(...this.parseConfigSource(hydrated, `${originBase} (${configPath})`));
         } catch (error) {
-          debugLogger.warn(
-            `Failed to load extension LSP config from ${configPath}:`,
-            error,
-          );
+          debugLogger.warn(`Failed to load extension LSP config from ${configPath}:`, error);
         }
       } else if (this.isRecord(lspServers)) {
-        const hydrated = this.hydrateExtensionLspConfig(
-          lspServers as JsonValue,
-          extension.path,
-        );
-        configs.push(
-          ...this.parseConfigSource(hydrated, `${originBase} (lspServers)`),
-        );
+        const hydrated = this.hydrateExtensionLspConfig(lspServers as JsonValue, extension.path);
+        configs.push(...this.parseConfigSource(hydrated, `${originBase} (lspServers)`));
       } else {
-        debugLogger.warn(
-          `LSP config for ${originBase} must be an object or a JSON file path.`,
-        );
+        debugLogger.warn(`LSP config for ${originBase} must be an object or a JSON file path.`);
       }
     }
 
@@ -121,9 +92,7 @@ export class LspConfigLoader {
     const applyConfigs = (configs: LspServerConfig[]) => {
       for (const config of configs) {
         // Find if there's a preset with the same name, if so replace it
-        const existingIndex = mergedConfigs.findIndex(
-          (c) => c.name === config.name,
-        );
+        const existingIndex = mergedConfigs.findIndex((c) => c.name === config.name);
         if (existingIndex !== -1) {
           mergedConfigs[existingIndex] = config;
         } else {
@@ -138,19 +107,17 @@ export class LspConfigLoader {
     return mergedConfigs;
   }
 
-  collectExtensionToLanguageOverrides(
-    configs: LspServerConfig[],
-  ): Record<string, string> {
+  collectExtensionToLanguageOverrides(configs: LspServerConfig[]): Record<string, string> {
     const overrides: Record<string, string> = {};
     for (const config of configs) {
       if (!config.extensionToLanguage) {
         continue;
       }
       for (const [key, value] of Object.entries(config.extensionToLanguage)) {
-        if (typeof value !== 'string') {
+        if (typeof value !== "string") {
           continue;
         }
-        const normalized = key.startsWith('.') ? key.slice(1) : key;
+        const normalized = key.startsWith(".") ? key.slice(1) : key;
         if (!normalized) {
           continue;
         }
@@ -164,10 +131,7 @@ export class LspConfigLoader {
    * Parse configuration source and extract server configs.
    * Expects basic format keyed by language identifier.
    */
-  private parseConfigSource(
-    source: unknown,
-    origin: string,
-  ): LspServerConfig[] {
+  private parseConfigSource(source: unknown, origin: string): LspServerConfig[] {
     if (!this.isRecord(source)) {
       return [];
     }
@@ -181,8 +145,7 @@ export class LspConfigLoader {
 
       // In basic format: key is language name, server name comes from command.
       const languages = [key];
-      const name =
-        typeof spec['command'] === 'string' ? (spec['command'] as string) : key;
+      const name = typeof spec["command"] === "string" ? (spec["command"] as string) : key;
 
       const config = this.buildServerConfig(name, languages, spec, origin);
       if (config) {
@@ -193,24 +156,18 @@ export class LspConfigLoader {
     return configs;
   }
 
-  private resolveExtensionConfigPath(
-    extensionPath: string,
-    configPath: string,
-  ): string {
+  private resolveExtensionConfigPath(extensionPath: string, configPath: string): string {
     return path.isAbsolute(configPath)
       ? path.resolve(configPath)
       : path.resolve(extensionPath, configPath);
   }
 
-  private hydrateExtensionLspConfig(
-    source: JsonValue,
-    extensionPath: string,
-  ): JsonValue {
+  private hydrateExtensionLspConfig(source: JsonValue, extensionPath: string): JsonValue {
     return recursivelyHydrateStrings(source, {
       extensionPath,
       CLAUDE_PLUGIN_ROOT: extensionPath,
       workspacePath: this.workspaceRoot,
-      '/': path.sep,
+      "/": path.sep,
       pathSeparator: path.sep,
     });
   }
@@ -221,50 +178,35 @@ export class LspConfigLoader {
     spec: Record<string, unknown>,
     origin: string,
   ): LspServerConfig | null {
-    const transport = this.normalizeTransport(spec['transport']);
-    const command =
-      typeof spec['command'] === 'string'
-        ? (spec['command'] as string)
-        : undefined;
-    const args = this.normalizeStringArray(spec['args']) ?? [];
-    const env = this.normalizeEnv(spec['env']);
-    const initializationOptions = this.isRecord(spec['initializationOptions'])
-      ? (spec['initializationOptions'] as LspInitializationOptions)
+    const transport = this.normalizeTransport(spec["transport"]);
+    const command = typeof spec["command"] === "string" ? (spec["command"] as string) : undefined;
+    const args = this.normalizeStringArray(spec["args"]) ?? [];
+    const env = this.normalizeEnv(spec["env"]);
+    const initializationOptions = this.isRecord(spec["initializationOptions"])
+      ? (spec["initializationOptions"] as LspInitializationOptions)
       : undefined;
-    const settings = this.isRecord(spec['settings'])
-      ? (spec['settings'] as Record<string, unknown>)
+    const settings = this.isRecord(spec["settings"])
+      ? (spec["settings"] as Record<string, unknown>)
       : undefined;
-    const extensionToLanguage = this.normalizeExtensionToLanguage(
-      spec['extensionToLanguage'],
-    );
-    const workspaceFolder = this.resolveWorkspaceFolder(
-      spec['workspaceFolder'],
-    );
+    const extensionToLanguage = this.normalizeExtensionToLanguage(spec["extensionToLanguage"]);
+    const workspaceFolder = this.resolveWorkspaceFolder(spec["workspaceFolder"]);
     const rootUri = pathToFileURL(workspaceFolder).toString();
-    const startupTimeout = this.normalizeTimeout(spec['startupTimeout']);
-    const shutdownTimeout = this.normalizeTimeout(spec['shutdownTimeout']);
+    const startupTimeout = this.normalizeTimeout(spec["startupTimeout"]);
+    const shutdownTimeout = this.normalizeTimeout(spec["shutdownTimeout"]);
     const restartOnCrash =
-      typeof spec['restartOnCrash'] === 'boolean'
-        ? (spec['restartOnCrash'] as boolean)
-        : undefined;
-    const maxRestarts = this.normalizeMaxRestarts(spec['maxRestarts']);
+      typeof spec["restartOnCrash"] === "boolean" ? (spec["restartOnCrash"] as boolean) : undefined;
+    const maxRestarts = this.normalizeMaxRestarts(spec["maxRestarts"]);
     const trustRequired =
-      typeof spec['trustRequired'] === 'boolean'
-        ? (spec['trustRequired'] as boolean)
-        : true;
+      typeof spec["trustRequired"] === "boolean" ? (spec["trustRequired"] as boolean) : true;
     const socket = this.normalizeSocketOptions(spec);
 
-    if (transport === 'stdio' && !command) {
-      debugLogger.warn(
-        `LSP config error in ${origin}: ${name} missing command`,
-      );
+    if (transport === "stdio" && !command) {
+      debugLogger.warn(`LSP config error in ${origin}: ${name} missing command`);
       return null;
     }
 
-    if (transport !== 'stdio' && !socket) {
-      debugLogger.warn(
-        `LSP config error in ${origin}: ${name} missing socket info`,
-      );
+    if (transport !== "stdio" && !socket) {
+      debugLogger.warn(`LSP config error in ${origin}: ${name} missing socket info`);
       return null;
     }
 
@@ -290,14 +232,14 @@ export class LspConfigLoader {
   }
 
   private isRecord(value: unknown): value is Record<string, unknown> {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
+    return typeof value === "object" && value !== null && !Array.isArray(value);
   }
 
   private normalizeStringArray(value: unknown): string[] | undefined {
     if (!Array.isArray(value)) {
       return undefined;
     }
-    return value.filter((item): item is string => typeof item === 'string');
+    return value.filter((item): item is string => typeof item === "string");
   }
 
   private normalizeEnv(value: unknown): Record<string, string> | undefined {
@@ -306,29 +248,23 @@ export class LspConfigLoader {
     }
     const env: Record<string, string> = {};
     for (const [key, val] of Object.entries(value)) {
-      if (
-        typeof val === 'string' ||
-        typeof val === 'number' ||
-        typeof val === 'boolean'
-      ) {
+      if (typeof val === "string" || typeof val === "number" || typeof val === "boolean") {
         env[key] = String(val);
       }
     }
     return Object.keys(env).length > 0 ? env : undefined;
   }
 
-  private normalizeExtensionToLanguage(
-    value: unknown,
-  ): Record<string, string> | undefined {
+  private normalizeExtensionToLanguage(value: unknown): Record<string, string> | undefined {
     if (!this.isRecord(value)) {
       return undefined;
     }
     const mapping: Record<string, string> = {};
     for (const [key, lang] of Object.entries(value)) {
-      if (typeof lang !== 'string') {
+      if (typeof lang !== "string") {
         continue;
       }
-      const normalized = key.startsWith('.') ? key.slice(1) : key;
+      const normalized = key.startsWith(".") ? key.slice(1) : key;
       if (!normalized) {
         continue;
       }
@@ -337,19 +273,19 @@ export class LspConfigLoader {
     return Object.keys(mapping).length > 0 ? mapping : undefined;
   }
 
-  private normalizeTransport(value: unknown): 'stdio' | 'tcp' | 'socket' {
-    if (typeof value !== 'string') {
-      return 'stdio';
+  private normalizeTransport(value: unknown): "stdio" | "tcp" | "socket" {
+    if (typeof value !== "string") {
+      return "stdio";
     }
     const normalized = value.toLowerCase();
-    if (normalized === 'tcp' || normalized === 'socket') {
+    if (normalized === "tcp" || normalized === "socket") {
       return normalized;
     }
-    return 'stdio';
+    return "stdio";
   }
 
   private normalizeTimeout(value: unknown): number | undefined {
-    if (typeof value !== 'number') {
+    if (typeof value !== "number") {
       return undefined;
     }
     if (!Number.isFinite(value) || value <= 0) {
@@ -359,7 +295,7 @@ export class LspConfigLoader {
   }
 
   private normalizeMaxRestarts(value: unknown): number | undefined {
-    if (typeof value !== 'number') {
+    if (typeof value !== "number") {
       return undefined;
     }
     if (!Number.isFinite(value) || value < 0) {
@@ -368,30 +304,25 @@ export class LspConfigLoader {
     return value;
   }
 
-  private normalizeSocketOptions(
-    value: Record<string, unknown>,
-  ): LspSocketOptions | undefined {
-    const socketValue = value['socket'];
-    if (typeof socketValue === 'string') {
+  private normalizeSocketOptions(value: Record<string, unknown>): LspSocketOptions | undefined {
+    const socketValue = value["socket"];
+    if (typeof socketValue === "string") {
       return { path: socketValue };
     }
 
     const source = this.isRecord(socketValue) ? socketValue : value;
-    const host =
-      typeof source['host'] === 'string'
-        ? (source['host'] as string)
-        : undefined;
+    const host = typeof source["host"] === "string" ? (source["host"] as string) : undefined;
     const pathValue =
-      typeof source['path'] === 'string'
-        ? (source['path'] as string)
-        : typeof source['socketPath'] === 'string'
-          ? (source['socketPath'] as string)
+      typeof source["path"] === "string"
+        ? (source["path"] as string)
+        : typeof source["socketPath"] === "string"
+          ? (source["socketPath"] as string)
           : undefined;
-    const portValue = source['port'];
+    const portValue = source["port"];
     const port =
-      typeof portValue === 'number'
+      typeof portValue === "number"
         ? portValue
-        : typeof portValue === 'string'
+        : typeof portValue === "string"
           ? Number(portValue)
           : undefined;
 
@@ -413,7 +344,7 @@ export class LspConfigLoader {
   }
 
   private resolveWorkspaceFolder(value: unknown): string {
-    if (typeof value !== 'string' || value.trim() === '') {
+    if (typeof value !== "string" || value.trim() === "") {
       return this.workspaceRoot;
     }
 
diff --git a/packages/airiscode-core/src/lsp/LspConnectionFactory.ts b/packages/airiscode-core/src/lsp/LspConnectionFactory.ts
index e6f59718a..e0ff05d0c 100644
--- a/packages/airiscode-core/src/lsp/LspConnectionFactory.ts
+++ b/packages/airiscode-core/src/lsp/LspConnectionFactory.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as cp from 'node:child_process';
-import * as net from 'node:net';
-import { DEFAULT_LSP_REQUEST_TIMEOUT_MS } from './constants.js';
-import type { JsonRpcMessage } from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import * as cp from "node:child_process";
+import * as net from "node:net";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { DEFAULT_LSP_REQUEST_TIMEOUT_MS } from "./constants.js";
+import type { JsonRpcMessage } from "./types.js";
 
-const debugLogger = createDebugLogger('LSP');
+const debugLogger = createDebugLogger("LSP");
 
 interface PendingRequest {
   resolve: (value: unknown) => void;
@@ -19,15 +19,12 @@ interface PendingRequest {
 }
 
 class JsonRpcConnection {
-  private buffer = '';
+  private buffer = "";
   private nextId = 1;
   private disposed = false;
   private pendingRequests = new Map<string | number, PendingRequest>();
-  private notificationHandlers: Array<(notification: JsonRpcMessage) => void> =
-    [];
-  private requestHandlers: Array<
-    (request: JsonRpcMessage) => Promise<unknown>
-  > = [];
+  private notificationHandlers: Array<(notification: JsonRpcMessage) => void> = [];
+  private requestHandlers: Array<(request: JsonRpcMessage) => Promise<unknown>> = [];
 
   constructor(
     private readonly writer: (data: string) => void,
@@ -35,11 +32,9 @@ class JsonRpcConnection {
   ) {}
 
   listen(readable: NodeJS.ReadableStream): void {
-    readable.on('data', (chunk: Buffer) => this.handleData(chunk));
-    readable.on('error', (error) =>
-      this.disposePending(
-        error instanceof Error ? error : new Error(String(error)),
-      ),
+    readable.on("data", (chunk: Buffer) => this.handleData(chunk));
+    readable.on("error", (error) =>
+      this.disposePending(error instanceof Error ? error : new Error(String(error))),
     );
   }
 
@@ -56,12 +51,12 @@ class JsonRpcConnection {
   }
 
   async initialize(params: unknown): Promise<unknown> {
-    return this.sendRequest('initialize', params);
+    return this.sendRequest("initialize", params);
   }
 
   async shutdown(): Promise<void> {
     try {
-      await this.sendRequest('shutdown', {});
+      await this.sendRequest("shutdown", {});
     } catch (_error) {
       // Ignore shutdown errors – the server may already be gone.
     } finally {
@@ -89,7 +84,7 @@ class JsonRpcConnection {
 
     const id = this.nextId++;
     const payload: JsonRpcMessage = {
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id,
       method,
       params,
@@ -112,7 +107,7 @@ class JsonRpcConnection {
     const handler = this.requestHandlers[this.requestHandlers.length - 1];
     if (!handler) {
       this.writeMessage({
-        jsonrpc: '2.0',
+        jsonrpc: "2.0",
         id: message.id,
         error: {
           code: -32601,
@@ -125,17 +120,17 @@ class JsonRpcConnection {
     try {
       const result = await handler(message);
       this.writeMessage({
-        jsonrpc: '2.0',
+        jsonrpc: "2.0",
         id: message.id,
         result: result ?? null,
       });
     } catch (error) {
       this.writeMessage({
-        jsonrpc: '2.0',
+        jsonrpc: "2.0",
         id: message.id,
         error: {
           code: -32603,
-          message: (error as Error).message ?? 'Internal error',
+          message: (error as Error).message ?? "Internal error",
         },
       });
     }
@@ -146,10 +141,10 @@ class JsonRpcConnection {
       return;
     }
 
-    this.buffer += chunk.toString('utf8');
+    this.buffer += chunk.toString("utf8");
 
     while (true) {
-      const headerEnd = this.buffer.indexOf('\r\n\r\n');
+      const headerEnd = this.buffer.indexOf("\r\n\r\n");
       if (headerEnd === -1) {
         break;
       }
@@ -182,7 +177,7 @@ class JsonRpcConnection {
   }
 
   private routeMessage(message: JsonRpcMessage): void {
-    if (typeof message?.id !== 'undefined' && !message.method) {
+    if (typeof message?.id !== "undefined" && !message.method) {
       const pending = this.pendingRequests.get(message.id);
       if (!pending) {
         return;
@@ -190,16 +185,14 @@ class JsonRpcConnection {
       clearTimeout(pending.timer);
       this.pendingRequests.delete(message.id);
       if (message.error) {
-        pending.reject(
-          new Error(message.error.message || 'LSP request failed'),
-        );
+        pending.reject(new Error(message.error.message || "LSP request failed"));
       } else {
         pending.resolve(message.result);
       }
       return;
     }
 
-    if (message?.method && typeof message.id !== 'undefined') {
+    if (message?.method && typeof message.id !== "undefined") {
       void this.handleServerRequest(message);
       return;
     }
@@ -220,14 +213,14 @@ class JsonRpcConnection {
       return;
     }
     const json = JSON.stringify(message);
-    const header = `Content-Length: ${Buffer.byteLength(json, 'utf8')}\r\n\r\n`;
+    const header = `Content-Length: ${Buffer.byteLength(json, "utf8")}\r\n\r\n`;
     this.writer(header + json);
   }
 
   private disposePending(error?: Error): void {
     for (const [, pending] of Array.from(this.pendingRequests)) {
       clearTimeout(pending.timer);
-      pending.reject(error ?? new Error('LSP connection closed'));
+      pending.reject(error ?? new Error("LSP connection closed"));
     }
     this.pendingRequests.clear();
   }
@@ -257,28 +250,28 @@ export class LspConnectionFactory {
   ): Promise<LspConnection> {
     return new Promise((resolve, reject) => {
       const spawnOptions: cp.SpawnOptions = {
-        stdio: 'pipe',
+        stdio: "pipe",
         ...options,
       };
       const processInstance = cp.spawn(command, args, spawnOptions);
 
       const timeoutId = setTimeout(() => {
-        reject(new Error('LSP server spawn timeout'));
+        reject(new Error("LSP server spawn timeout"));
         if (!processInstance.killed) {
           processInstance.kill();
         }
       }, timeoutMs);
 
-      processInstance.once('error', (error) => {
+      processInstance.once("error", (error) => {
         clearTimeout(timeoutId);
         reject(new Error(`Failed to spawn LSP server: ${error.message}`));
       });
 
-      processInstance.once('spawn', () => {
+      processInstance.once("spawn", () => {
         clearTimeout(timeoutId);
 
         if (!processInstance.stdout || !processInstance.stdin) {
-          reject(new Error('LSP server stdio not available'));
+          reject(new Error("LSP server stdio not available"));
           return;
         }
 
@@ -288,8 +281,8 @@ export class LspConnectionFactory {
         );
 
         connection.listen(processInstance.stdout);
-        processInstance.once('exit', () => connection.end());
-        processInstance.once('close', () => connection.end());
+        processInstance.once("exit", () => connection.end());
+        processInstance.once("close", () => connection.end());
 
         resolve({
           connection,
@@ -307,10 +300,7 @@ export class LspConnectionFactory {
     port: number,
     timeoutMs = 10000,
   ): Promise<LspConnection> {
-    return LspConnectionFactory.createSocketConnection(
-      { host, port },
-      timeoutMs,
-    );
+    return LspConnectionFactory.createSocketConnection({ host, port }, timeoutMs);
   }
 
   /**
@@ -327,11 +317,11 @@ export class LspConnectionFactory {
         socketOptions = { path: options.path };
       } else {
         if (!options.port) {
-          reject(new Error('Socket transport requires port or path'));
+          reject(new Error("Socket transport requires port or path"));
           return;
         }
         socketOptions = {
-          host: options.host ?? '127.0.0.1',
+          host: options.host ?? "127.0.0.1",
           port: options.port,
         };
       }
@@ -339,7 +329,7 @@ export class LspConnectionFactory {
       const socket = net.createConnection(socketOptions);
 
       const timeoutId = setTimeout(() => {
-        reject(new Error('LSP server connection timeout'));
+        reject(new Error("LSP server connection timeout"));
         socket.destroy();
       }, timeoutMs);
 
@@ -348,19 +338,19 @@ export class LspConnectionFactory {
         reject(new Error(`Failed to connect to LSP server: ${error.message}`));
       };
 
-      socket.once('error', onError);
+      socket.once("error", onError);
 
-      socket.on('connect', () => {
+      socket.on("connect", () => {
         clearTimeout(timeoutId);
-        socket.off('error', onError);
+        socket.off("error", onError);
 
         const connection = new JsonRpcConnection(
           (payload) => socket.write(payload),
           () => socket.destroy(),
         );
         connection.listen(socket);
-        socket.once('close', () => connection.end());
-        socket.once('error', () => connection.end());
+        socket.once("close", () => connection.end());
+        socket.once("error", () => connection.end());
 
         resolve({
           connection,
@@ -378,7 +368,7 @@ export class LspConnectionFactory {
       try {
         await lspConnection.connection.shutdown();
       } catch (e) {
-        debugLogger.warn('LSP shutdown failed:', e);
+        debugLogger.warn("LSP shutdown failed:", e);
       } finally {
         lspConnection.connection.end();
       }
diff --git a/packages/airiscode-core/src/lsp/LspResponseNormalizer.ts b/packages/airiscode-core/src/lsp/LspResponseNormalizer.ts
index a890c32bc..45bfc63a2 100644
--- a/packages/airiscode-core/src/lsp/LspResponseNormalizer.ts
+++ b/packages/airiscode-core/src/lsp/LspResponseNormalizer.ts
@@ -11,6 +11,11 @@
  * Handles various response formats from different language servers.
  */
 
+import {
+  CODE_ACTION_KIND_LABELS,
+  DIAGNOSTIC_SEVERITY_LABELS,
+  SYMBOL_KIND_LABELS,
+} from "./constants.js";
 import type {
   LspCallHierarchyIncomingCall,
   LspCallHierarchyItem,
@@ -27,12 +32,7 @@ import type {
   LspSymbolInformation,
   LspTextEdit,
   LspWorkspaceEdit,
-} from './types.js';
-import {
-  CODE_ACTION_KIND_LABELS,
-  DIAGNOSTIC_SEVERITY_LABELS,
-  SYMBOL_KIND_LABELS,
-} from './constants.js';
+} from "./types.js";
 
 /**
  * Normalizes LSP protocol responses to internal types.
@@ -46,45 +46,33 @@ export class LspResponseNormalizer {
    * Normalize diagnostic result from LSP response
    */
   normalizeDiagnostic(item: unknown, serverName: string): LspDiagnostic | null {
-    if (!item || typeof item !== 'object') {
+    if (!item || typeof item !== "object") {
       return null;
     }
 
     const itemObj = item as Record<string, unknown>;
-    const range = this.normalizeRange(itemObj['range']);
+    const range = this.normalizeRange(itemObj["range"]);
     if (!range) {
       return null;
     }
 
-    const message =
-      typeof itemObj['message'] === 'string'
-        ? (itemObj['message'] as string)
-        : '';
+    const message = typeof itemObj["message"] === "string" ? (itemObj["message"] as string) : "";
     if (!message) {
       return null;
     }
 
     const severityNum =
-      typeof itemObj['severity'] === 'number'
-        ? (itemObj['severity'] as number)
-        : undefined;
-    const severity = severityNum
-      ? DIAGNOSTIC_SEVERITY_LABELS[severityNum]
-      : undefined;
+      typeof itemObj["severity"] === "number" ? (itemObj["severity"] as number) : undefined;
+    const severity = severityNum ? DIAGNOSTIC_SEVERITY_LABELS[severityNum] : undefined;
 
-    const code = itemObj['code'];
-    const codeValue =
-      typeof code === 'string' || typeof code === 'number' ? code : undefined;
+    const code = itemObj["code"];
+    const codeValue = typeof code === "string" || typeof code === "number" ? code : undefined;
 
     const source =
-      typeof itemObj['source'] === 'string'
-        ? (itemObj['source'] as string)
-        : undefined;
+      typeof itemObj["source"] === "string" ? (itemObj["source"] as string) : undefined;
 
-    const tags = this.normalizeDiagnosticTags(itemObj['tags']);
-    const relatedInfo = this.normalizeDiagnosticRelatedInfo(
-      itemObj['relatedInformation'],
-    );
+    const tags = this.normalizeDiagnosticTags(itemObj["tags"]);
+    const relatedInfo = this.normalizeDiagnosticRelatedInfo(itemObj["relatedInformation"]);
 
     return {
       range,
@@ -112,9 +100,7 @@ export class LspResponseNormalizer {
     return {
       range: diagnostic.range,
       message: diagnostic.message,
-      severity: diagnostic.severity
-        ? severityMap[diagnostic.severity]
-        : undefined,
+      severity: diagnostic.severity ? severityMap[diagnostic.severity] : undefined,
       code: diagnostic.code,
       source: diagnostic.source,
     };
@@ -123,17 +109,17 @@ export class LspResponseNormalizer {
   /**
    * Normalize diagnostic tags
    */
-  normalizeDiagnosticTags(tags: unknown): Array<'unnecessary' | 'deprecated'> {
+  normalizeDiagnosticTags(tags: unknown): Array<"unnecessary" | "deprecated"> {
     if (!Array.isArray(tags)) {
       return [];
     }
 
-    const result: Array<'unnecessary' | 'deprecated'> = [];
+    const result: Array<"unnecessary" | "deprecated"> = [];
     for (const tag of tags) {
       if (tag === 1) {
-        result.push('unnecessary');
+        result.push("unnecessary");
       } else if (tag === 2) {
-        result.push('deprecated');
+        result.push("deprecated");
       }
     }
     return result;
@@ -142,29 +128,27 @@ export class LspResponseNormalizer {
   /**
    * Normalize diagnostic related information
    */
-  normalizeDiagnosticRelatedInfo(
-    info: unknown,
-  ): Array<{ location: LspLocation; message: string }> {
+  normalizeDiagnosticRelatedInfo(info: unknown): Array<{ location: LspLocation; message: string }> {
     if (!Array.isArray(info)) {
       return [];
     }
 
     const result: Array<{ location: LspLocation; message: string }> = [];
     for (const item of info) {
-      if (!item || typeof item !== 'object') {
+      if (!item || typeof item !== "object") {
         continue;
       }
       const itemObj = item as Record<string, unknown>;
-      const location = itemObj['location'];
-      if (!location || typeof location !== 'object') {
+      const location = itemObj["location"];
+      if (!location || typeof location !== "object") {
         continue;
       }
       const locObj = location as Record<string, unknown>;
-      const uri = locObj['uri'];
-      const range = this.normalizeRange(locObj['range']);
-      const message = itemObj['message'];
+      const uri = locObj["uri"];
+      const range = this.normalizeRange(locObj["range"]);
+      const message = itemObj["message"];
 
-      if (typeof uri === 'string' && range && typeof message === 'string') {
+      if (typeof uri === "string" && range && typeof message === "string") {
         result.push({
           location: { uri, range },
           message,
@@ -177,22 +161,18 @@ export class LspResponseNormalizer {
   /**
    * Normalize file diagnostics result
    */
-  normalizeFileDiagnostics(
-    item: unknown,
-    serverName: string,
-  ): LspFileDiagnostics | null {
-    if (!item || typeof item !== 'object') {
+  normalizeFileDiagnostics(item: unknown, serverName: string): LspFileDiagnostics | null {
+    if (!item || typeof item !== "object") {
       return null;
     }
 
     const itemObj = item as Record<string, unknown>;
-    const uri =
-      typeof itemObj['uri'] === 'string' ? (itemObj['uri'] as string) : '';
+    const uri = typeof itemObj["uri"] === "string" ? (itemObj["uri"] as string) : "";
     if (!uri) {
       return null;
     }
 
-    const items = itemObj['items'];
+    const items = itemObj["items"];
     if (!Array.isArray(items)) {
       return null;
     }
@@ -220,53 +200,46 @@ export class LspResponseNormalizer {
    * Normalize code action result
    */
   normalizeCodeAction(item: unknown, serverName: string): LspCodeAction | null {
-    if (!item || typeof item !== 'object') {
+    if (!item || typeof item !== "object") {
       return null;
     }
 
     const itemObj = item as Record<string, unknown>;
 
     // Check if this is a Command instead of CodeAction
-    if (
-      itemObj['command'] &&
-      typeof itemObj['title'] === 'string' &&
-      !itemObj['kind']
-    ) {
+    if (itemObj["command"] && typeof itemObj["title"] === "string" && !itemObj["kind"]) {
       // This is a raw Command, wrap it
       return {
-        title: itemObj['title'] as string,
+        title: itemObj["title"] as string,
         command: {
-          title: itemObj['title'] as string,
-          command: (itemObj['command'] as string) ?? '',
-          arguments: itemObj['arguments'] as unknown[] | undefined,
+          title: itemObj["title"] as string,
+          command: (itemObj["command"] as string) ?? "",
+          arguments: itemObj["arguments"] as unknown[] | undefined,
         },
         serverName,
       };
     }
 
-    const title =
-      typeof itemObj['title'] === 'string' ? (itemObj['title'] as string) : '';
+    const title = typeof itemObj["title"] === "string" ? (itemObj["title"] as string) : "";
     if (!title) {
       return null;
     }
 
     const kind =
-      typeof itemObj['kind'] === 'string'
-        ? (CODE_ACTION_KIND_LABELS[itemObj['kind'] as string] ??
-          (itemObj['kind'] as LspCodeActionKind))
+      typeof itemObj["kind"] === "string"
+        ? (CODE_ACTION_KIND_LABELS[itemObj["kind"] as string] ??
+          (itemObj["kind"] as LspCodeActionKind))
         : undefined;
 
     const isPreferred =
-      typeof itemObj['isPreferred'] === 'boolean'
-        ? (itemObj['isPreferred'] as boolean)
-        : undefined;
+      typeof itemObj["isPreferred"] === "boolean" ? (itemObj["isPreferred"] as boolean) : undefined;
 
-    const edit = this.normalizeWorkspaceEdit(itemObj['edit']);
-    const command = this.normalizeCommand(itemObj['command']);
+    const edit = this.normalizeWorkspaceEdit(itemObj["edit"]);
+    const command = this.normalizeCommand(itemObj["command"]);
 
     const diagnostics: LspDiagnostic[] = [];
-    if (Array.isArray(itemObj['diagnostics'])) {
-      for (const diag of itemObj['diagnostics']) {
+    if (Array.isArray(itemObj["diagnostics"])) {
+      for (const diag of itemObj["diagnostics"]) {
         const normalized = this.normalizeDiagnostic(diag, serverName);
         if (normalized) {
           diagnostics.push(normalized);
@@ -281,7 +254,7 @@ export class LspResponseNormalizer {
       isPreferred,
       edit: edit ?? undefined,
       command: command ?? undefined,
-      data: itemObj['data'],
+      data: itemObj["data"],
       serverName,
     };
   }
@@ -294,7 +267,7 @@ export class LspResponseNormalizer {
    * Normalize workspace edit
    */
   normalizeWorkspaceEdit(edit: unknown): LspWorkspaceEdit | null {
-    if (!edit || typeof edit !== 'object') {
+    if (!edit || typeof edit !== "object") {
       return null;
     }
 
@@ -302,8 +275,8 @@ export class LspResponseNormalizer {
     const result: LspWorkspaceEdit = {};
 
     // Handle changes (map of URI to TextEdit[])
-    if (editObj['changes'] && typeof editObj['changes'] === 'object') {
-      const changes = editObj['changes'] as Record<string, unknown>;
+    if (editObj["changes"] && typeof editObj["changes"] === "object") {
+      const changes = editObj["changes"] as Record<string, unknown>;
       result.changes = {};
       for (const [uri, edits] of Object.entries(changes)) {
         if (Array.isArray(edits)) {
@@ -322,9 +295,9 @@ export class LspResponseNormalizer {
     }
 
     // Handle documentChanges
-    if (Array.isArray(editObj['documentChanges'])) {
+    if (Array.isArray(editObj["documentChanges"])) {
       result.documentChanges = [];
-      for (const docChange of editObj['documentChanges']) {
+      for (const docChange of editObj["documentChanges"]) {
         const normalized = this.normalizeTextDocumentEdit(docChange);
         if (normalized) {
           result.documentChanges.push(normalized);
@@ -346,20 +319,17 @@ export class LspResponseNormalizer {
    * Normalize text edit
    */
   normalizeTextEdit(edit: unknown): LspTextEdit | null {
-    if (!edit || typeof edit !== 'object') {
+    if (!edit || typeof edit !== "object") {
       return null;
     }
 
     const editObj = edit as Record<string, unknown>;
-    const range = this.normalizeRange(editObj['range']);
+    const range = this.normalizeRange(editObj["range"]);
     if (!range) {
       return null;
     }
 
-    const newText =
-      typeof editObj['newText'] === 'string'
-        ? (editObj['newText'] as string)
-        : '';
+    const newText = typeof editObj["newText"] === "string" ? (editObj["newText"] as string) : "";
 
     return { range, newText };
   }
@@ -371,31 +341,26 @@ export class LspResponseNormalizer {
     textDocument: { uri: string; version?: number | null };
     edits: LspTextEdit[];
   } | null {
-    if (!docEdit || typeof docEdit !== 'object') {
+    if (!docEdit || typeof docEdit !== "object") {
       return null;
     }
 
     const docEditObj = docEdit as Record<string, unknown>;
-    const textDocument = docEditObj['textDocument'];
-    if (!textDocument || typeof textDocument !== 'object') {
+    const textDocument = docEditObj["textDocument"];
+    if (!textDocument || typeof textDocument !== "object") {
       return null;
     }
 
     const textDocObj = textDocument as Record<string, unknown>;
-    const uri =
-      typeof textDocObj['uri'] === 'string'
-        ? (textDocObj['uri'] as string)
-        : '';
+    const uri = typeof textDocObj["uri"] === "string" ? (textDocObj["uri"] as string) : "";
     if (!uri) {
       return null;
     }
 
     const version =
-      typeof textDocObj['version'] === 'number'
-        ? (textDocObj['version'] as number)
-        : null;
+      typeof textDocObj["version"] === "number" ? (textDocObj["version"] as number) : null;
 
-    const edits = docEditObj['edits'];
+    const edits = docEditObj["edits"];
     if (!Array.isArray(edits)) {
       return null;
     }
@@ -421,27 +386,21 @@ export class LspResponseNormalizer {
   /**
    * Normalize command
    */
-  normalizeCommand(
-    cmd: unknown,
-  ): { title: string; command: string; arguments?: unknown[] } | null {
-    if (!cmd || typeof cmd !== 'object') {
+  normalizeCommand(cmd: unknown): { title: string; command: string; arguments?: unknown[] } | null {
+    if (!cmd || typeof cmd !== "object") {
       return null;
     }
 
     const cmdObj = cmd as Record<string, unknown>;
-    const title =
-      typeof cmdObj['title'] === 'string' ? (cmdObj['title'] as string) : '';
-    const command =
-      typeof cmdObj['command'] === 'string'
-        ? (cmdObj['command'] as string)
-        : '';
+    const title = typeof cmdObj["title"] === "string" ? (cmdObj["title"] as string) : "";
+    const command = typeof cmdObj["command"] === "string" ? (cmdObj["command"] as string) : "";
 
     if (!command) {
       return null;
     }
 
-    const args = Array.isArray(cmdObj['arguments'])
-      ? (cmdObj['arguments'] as unknown[])
+    const args = Array.isArray(cmdObj["arguments"])
+      ? (cmdObj["arguments"] as unknown[])
       : undefined;
 
     return { title, command, arguments: args };
@@ -454,25 +413,20 @@ export class LspResponseNormalizer {
   /**
    * Normalize location result (definitions, references, implementations)
    */
-  normalizeLocationResult(
-    item: unknown,
-    serverName: string,
-  ): LspReference | null {
-    if (!item || typeof item !== 'object') {
+  normalizeLocationResult(item: unknown, serverName: string): LspReference | null {
+    if (!item || typeof item !== "object") {
       return null;
     }
 
     const itemObj = item as Record<string, unknown>;
-    const uri = (itemObj['uri'] ??
-      itemObj['targetUri'] ??
-      (itemObj['target'] as Record<string, unknown>)?.['uri']) as
-      | string
-      | undefined;
-
-    const range = (itemObj['range'] ??
-      itemObj['targetSelectionRange'] ??
-      itemObj['targetRange'] ??
-      (itemObj['target'] as Record<string, unknown>)?.['range']) as
+    const uri = (itemObj["uri"] ??
+      itemObj["targetUri"] ??
+      (itemObj["target"] as Record<string, unknown>)?.["uri"]) as string | undefined;
+
+    const range = (itemObj["range"] ??
+      itemObj["targetSelectionRange"] ??
+      itemObj["targetRange"] ??
+      (itemObj["target"] as Record<string, unknown>)?.["range"]) as
       | { start?: unknown; end?: unknown }
       | undefined;
 
@@ -502,50 +456,47 @@ export class LspResponseNormalizer {
   /**
    * Normalize symbol result (workspace symbols, document symbols)
    */
-  normalizeSymbolResult(
-    item: unknown,
-    serverName: string,
-  ): LspSymbolInformation | null {
-    if (!item || typeof item !== 'object') {
+  normalizeSymbolResult(item: unknown, serverName: string): LspSymbolInformation | null {
+    if (!item || typeof item !== "object") {
       return null;
     }
 
     const itemObj = item as Record<string, unknown>;
-    const location = itemObj['location'] ?? itemObj['target'] ?? item;
-    if (!location || typeof location !== 'object') {
+    const location = itemObj["location"] ?? itemObj["target"] ?? item;
+    if (!location || typeof location !== "object") {
       return null;
     }
 
     const locationObj = location as Record<string, unknown>;
-    const range = (locationObj['range'] ??
-      locationObj['targetRange'] ??
-      itemObj['range'] ??
+    const range = (locationObj["range"] ??
+      locationObj["targetRange"] ??
+      itemObj["range"] ??
       undefined) as { start?: unknown; end?: unknown } | undefined;
 
     // Only require uri; range is optional per LSP 3.17 WorkspaceSymbol spec
     // where location may be { uri } without a range.
-    if (!locationObj['uri']) {
+    if (!locationObj["uri"]) {
       return null;
     }
 
     // LSP 3.17 WorkspaceSymbol format may have location with only uri (no range).
     // Servers like jdtls use this format, requiring a workspaceSymbol/resolve call
     // for the full range. Default to file start when range is absent.
-    const start = (range?.start as
-      | { line?: number; character?: number }
-      | undefined) ?? { line: 0, character: 0 };
-    const end = (range?.end as
-      | { line?: number; character?: number }
-      | undefined) ?? { line: 0, character: 0 };
+    const start = (range?.start as { line?: number; character?: number } | undefined) ?? {
+      line: 0,
+      character: 0,
+    };
+    const end = (range?.end as { line?: number; character?: number } | undefined) ?? {
+      line: 0,
+      character: 0,
+    };
 
     return {
-      name: (itemObj['name'] ?? itemObj['label'] ?? 'symbol') as string,
-      kind: this.normalizeSymbolKind(itemObj['kind']),
-      containerName: (itemObj['containerName'] ?? itemObj['container']) as
-        | string
-        | undefined,
+      name: (itemObj["name"] ?? itemObj["label"] ?? "symbol") as string,
+      kind: this.normalizeSymbolKind(itemObj["kind"]),
+      containerName: (itemObj["containerName"] ?? itemObj["container"]) as string | undefined,
       location: {
-        uri: locationObj['uri'] as string,
+        uri: locationObj["uri"] as string,
         range: {
           start: {
             line: Number(start?.line ?? 0),
@@ -569,20 +520,15 @@ export class LspResponseNormalizer {
    * Normalize a single range
    */
   normalizeRange(range: unknown): LspRange | null {
-    if (!range || typeof range !== 'object') {
+    if (!range || typeof range !== "object") {
       return null;
     }
 
     const rangeObj = range as Record<string, unknown>;
-    const start = rangeObj['start'];
-    const end = rangeObj['end'];
+    const start = rangeObj["start"];
+    const end = rangeObj["end"];
 
-    if (
-      !start ||
-      typeof start !== 'object' ||
-      !end ||
-      typeof end !== 'object'
-    ) {
+    if (!start || typeof start !== "object" || !end || typeof end !== "object") {
       return null;
     }
 
@@ -591,12 +537,12 @@ export class LspResponseNormalizer {
 
     return {
       start: {
-        line: Number(startObj['line'] ?? 0),
-        character: Number(startObj['character'] ?? 0),
+        line: Number(startObj["line"] ?? 0),
+        character: Number(startObj["character"] ?? 0),
       },
       end: {
-        line: Number(endObj['line'] ?? 0),
-        character: Number(endObj['character'] ?? 0),
+        line: Number(endObj["line"] ?? 0),
+        character: Number(endObj["character"] ?? 0),
       },
     };
   }
@@ -624,12 +570,12 @@ export class LspResponseNormalizer {
    * Normalize symbol kind from number to string label
    */
   normalizeSymbolKind(kind: unknown): string | undefined {
-    if (typeof kind === 'number') {
+    if (typeof kind === "number") {
       return SYMBOL_KIND_LABELS[kind] ?? String(kind);
     }
-    if (typeof kind === 'string') {
+    if (typeof kind === "string") {
       const trimmed = kind.trim();
-      if (trimmed === '') {
+      if (trimmed === "") {
         return undefined;
       }
       const numeric = Number(trimmed);
@@ -650,9 +596,9 @@ export class LspResponseNormalizer {
    */
   normalizeHoverContents(contents: unknown): string {
     if (!contents) {
-      return '';
+      return "";
     }
-    if (typeof contents === 'string') {
+    if (typeof contents === "string") {
       return contents;
     }
     if (Array.isArray(contents)) {
@@ -660,33 +606,30 @@ export class LspResponseNormalizer {
         .map((item) => this.normalizeHoverContents(item))
         .map((item) => item.trim())
         .filter((item) => item.length > 0);
-      return parts.join('\n');
+      return parts.join("\n");
     }
-    if (typeof contents === 'object') {
+    if (typeof contents === "object") {
       const contentsObj = contents as Record<string, unknown>;
-      const value = contentsObj['value'];
-      if (typeof value === 'string') {
-        const language = contentsObj['language'];
-        if (typeof language === 'string' && language.trim() !== '') {
+      const value = contentsObj["value"];
+      if (typeof value === "string") {
+        const language = contentsObj["language"];
+        if (typeof language === "string" && language.trim() !== "") {
           return `\`\`\`${language}\n${value}\n\`\`\``;
         }
         return value;
       }
     }
-    return '';
+    return "";
   }
 
   /**
    * Normalize hover result
    */
-  normalizeHoverResult(
-    response: unknown,
-    serverName: string,
-  ): LspHoverResult | null {
+  normalizeHoverResult(response: unknown, serverName: string): LspHoverResult | null {
     if (!response) {
       return null;
     }
-    if (typeof response !== 'object') {
+    if (typeof response !== "object") {
       const contents = this.normalizeHoverContents(response);
       if (!contents.trim()) {
         return null;
@@ -698,12 +641,12 @@ export class LspResponseNormalizer {
     }
 
     const responseObj = response as Record<string, unknown>;
-    const contents = this.normalizeHoverContents(responseObj['contents']);
+    const contents = this.normalizeHoverContents(responseObj["contents"]);
     if (!contents.trim()) {
       return null;
     }
 
-    const range = this.normalizeRange(responseObj['range']);
+    const range = this.normalizeRange(responseObj["range"]);
     return {
       contents,
       range: range ?? undefined,
@@ -718,45 +661,38 @@ export class LspResponseNormalizer {
   /**
    * Normalize call hierarchy item
    */
-  normalizeCallHierarchyItem(
-    item: unknown,
-    serverName: string,
-  ): LspCallHierarchyItem | null {
-    if (!item || typeof item !== 'object') {
+  normalizeCallHierarchyItem(item: unknown, serverName: string): LspCallHierarchyItem | null {
+    if (!item || typeof item !== "object") {
       return null;
     }
 
     const itemObj = item as Record<string, unknown>;
-    const nameValue = itemObj['name'] ?? itemObj['label'] ?? 'symbol';
-    const name =
-      typeof nameValue === 'string' ? nameValue : String(nameValue ?? '');
-    const uri = itemObj['uri'];
+    const nameValue = itemObj["name"] ?? itemObj["label"] ?? "symbol";
+    const name = typeof nameValue === "string" ? nameValue : String(nameValue ?? "");
+    const uri = itemObj["uri"];
 
-    if (!name || typeof uri !== 'string') {
+    if (!name || typeof uri !== "string") {
       return null;
     }
 
-    const range = this.normalizeRange(itemObj['range']);
-    const selectionRange =
-      this.normalizeRange(itemObj['selectionRange']) ?? range;
+    const range = this.normalizeRange(itemObj["range"]);
+    const selectionRange = this.normalizeRange(itemObj["selectionRange"]) ?? range;
 
     if (!range || !selectionRange) {
       return null;
     }
 
     const serverOverride =
-      typeof itemObj['serverName'] === 'string'
-        ? (itemObj['serverName'] as string)
-        : undefined;
+      typeof itemObj["serverName"] === "string" ? (itemObj["serverName"] as string) : undefined;
 
     // Preserve raw numeric kind for server communication
     let rawKind: number | undefined;
-    if (typeof itemObj['rawKind'] === 'number') {
-      rawKind = itemObj['rawKind'];
-    } else if (typeof itemObj['kind'] === 'number') {
-      rawKind = itemObj['kind'];
-    } else if (typeof itemObj['kind'] === 'string') {
-      const parsed = Number(itemObj['kind']);
+    if (typeof itemObj["rawKind"] === "number") {
+      rawKind = itemObj["rawKind"];
+    } else if (typeof itemObj["kind"] === "number") {
+      rawKind = itemObj["kind"];
+    } else if (typeof itemObj["kind"] === "string") {
+      const parsed = Number(itemObj["kind"]);
       if (Number.isFinite(parsed)) {
         rawKind = parsed;
       }
@@ -764,16 +700,13 @@ export class LspResponseNormalizer {
 
     return {
       name,
-      kind: this.normalizeSymbolKind(itemObj['kind']),
+      kind: this.normalizeSymbolKind(itemObj["kind"]),
       rawKind,
-      detail:
-        typeof itemObj['detail'] === 'string'
-          ? (itemObj['detail'] as string)
-          : undefined,
+      detail: typeof itemObj["detail"] === "string" ? (itemObj["detail"] as string) : undefined,
       uri,
       range,
       selectionRange,
-      data: itemObj['data'],
+      data: itemObj["data"],
       serverName: serverOverride ?? serverName,
     };
   }
@@ -781,51 +714,43 @@ export class LspResponseNormalizer {
   /**
    * Normalize incoming call
    */
-  normalizeIncomingCall(
-    item: unknown,
-    serverName: string,
-  ): LspCallHierarchyIncomingCall | null {
-    if (!item || typeof item !== 'object') {
+  normalizeIncomingCall(item: unknown, serverName: string): LspCallHierarchyIncomingCall | null {
+    if (!item || typeof item !== "object") {
       return null;
     }
     const itemObj = item as Record<string, unknown>;
-    const from = this.normalizeCallHierarchyItem(itemObj['from'], serverName);
+    const from = this.normalizeCallHierarchyItem(itemObj["from"], serverName);
     if (!from) {
       return null;
     }
     return {
       from,
-      fromRanges: this.normalizeRanges(itemObj['fromRanges']),
+      fromRanges: this.normalizeRanges(itemObj["fromRanges"]),
     };
   }
 
   /**
    * Normalize outgoing call
    */
-  normalizeOutgoingCall(
-    item: unknown,
-    serverName: string,
-  ): LspCallHierarchyOutgoingCall | null {
-    if (!item || typeof item !== 'object') {
+  normalizeOutgoingCall(item: unknown, serverName: string): LspCallHierarchyOutgoingCall | null {
+    if (!item || typeof item !== "object") {
       return null;
     }
     const itemObj = item as Record<string, unknown>;
-    const to = this.normalizeCallHierarchyItem(itemObj['to'], serverName);
+    const to = this.normalizeCallHierarchyItem(itemObj["to"], serverName);
     if (!to) {
       return null;
     }
     return {
       to,
-      fromRanges: this.normalizeRanges(itemObj['fromRanges']),
+      fromRanges: this.normalizeRanges(itemObj["fromRanges"]),
     };
   }
 
   /**
    * Convert call hierarchy item back to LSP params format
    */
-  toCallHierarchyItemParams(
-    item: LspCallHierarchyItem,
-  ): Record<string, unknown> {
+  toCallHierarchyItemParams(item: LspCallHierarchyItem): Record<string, unknown> {
     // Use rawKind (numeric) for server communication
     let numericKind: number | undefined = item.rawKind;
     if (numericKind === undefined && item.kind !== undefined) {
@@ -854,12 +779,12 @@ export class LspResponseNormalizer {
    * Check if item is a DocumentSymbol (has range and selectionRange)
    */
   isDocumentSymbol(item: Record<string, unknown>): boolean {
-    const range = item['range'];
-    const selectionRange = item['selectionRange'];
+    const range = item["range"];
+    const selectionRange = item["selectionRange"];
     return (
-      typeof range === 'object' &&
+      typeof range === "object" &&
       range !== null &&
-      typeof selectionRange === 'object' &&
+      typeof selectionRange === "object" &&
       selectionRange !== null
     );
   }
@@ -879,11 +804,10 @@ export class LspResponseNormalizer {
       return;
     }
 
-    const nameValue = item['name'] ?? item['label'] ?? 'symbol';
-    const name = typeof nameValue === 'string' ? nameValue : String(nameValue);
+    const nameValue = item["name"] ?? item["label"] ?? "symbol";
+    const name = typeof nameValue === "string" ? nameValue : String(nameValue);
     const selectionRange =
-      this.normalizeRange(item['selectionRange']) ??
-      this.normalizeRange(item['range']);
+      this.normalizeRange(item["selectionRange"]) ?? this.normalizeRange(item["range"]);
 
     if (!selectionRange) {
       return;
@@ -891,7 +815,7 @@ export class LspResponseNormalizer {
 
     results.push({
       name,
-      kind: this.normalizeSymbolKind(item['kind']),
+      kind: this.normalizeSymbolKind(item["kind"]),
       containerName,
       location: {
         uri,
@@ -904,13 +828,13 @@ export class LspResponseNormalizer {
       return;
     }
 
-    const children = item['children'];
+    const children = item["children"];
     if (Array.isArray(children)) {
       for (const child of children) {
         if (results.length >= limit) {
           break;
         }
-        if (child && typeof child === 'object') {
+        if (child && typeof child === "object") {
           this.collectDocumentSymbol(
             child as Record<string, unknown>,
             uri,
diff --git a/packages/airiscode-core/src/lsp/LspServerManager.ts b/packages/airiscode-core/src/lsp/LspServerManager.ts
index 544dcd6ef..786c587ba 100644
--- a/packages/airiscode-core/src/lsp/LspServerManager.ts
+++ b/packages/airiscode-core/src/lsp/LspServerManager.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config as CoreConfig } from '../config/config.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import type { WorkspaceContext } from '../utils/workspaceContext.js';
-import { spawn, type ChildProcess } from 'node:child_process';
-import * as fs from 'node:fs';
-import * as path from 'path';
-import { pathToFileURL } from 'url';
-import { globSync } from 'glob';
-import { LspConnectionFactory } from './LspConnectionFactory.js';
+import { type ChildProcess, spawn } from "node:child_process";
+import * as fs from "node:fs";
+import { globSync } from "glob";
+import * as path from "path";
+import { pathToFileURL } from "url";
+import type { Config as CoreConfig } from "../config/config.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import type { WorkspaceContext } from "../utils/workspaceContext.js";
 import {
   DEFAULT_LSP_COMMAND_CHECK_TIMEOUT_MS,
   DEFAULT_LSP_MAX_RESTARTS,
@@ -20,17 +20,17 @@ import {
   DEFAULT_LSP_SOCKET_RETRY_DELAY_MS,
   DEFAULT_LSP_STARTUP_TIMEOUT_MS,
   DEFAULT_LSP_WARMUP_DELAY_MS,
-} from './constants.js';
+} from "./constants.js";
+import { LspConnectionFactory } from "./LspConnectionFactory.js";
 import type {
   LspConnectionResult,
   LspServerConfig,
   LspServerHandle,
   LspServerStatus,
   LspSocketOptions,
-} from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+} from "./types.js";
 
-const debugLogger = createDebugLogger('LSP');
+const debugLogger = createDebugLogger("LSP");
 
 export interface LspServerManagerOptions {
   requireTrustedWorkspace: boolean;
@@ -57,7 +57,7 @@ export class LspServerManager {
     for (const config of configs) {
       this.serverHandles.set(config.name, {
         config,
-        status: 'NOT_STARTED',
+        status: "NOT_STARTED",
       });
     }
   }
@@ -115,18 +115,18 @@ export class LspServerManager {
     }
 
     const uri = pathToFileURL(tsFile).toString();
-    const languageId = tsFile.endsWith('.tsx')
-      ? 'typescriptreact'
-      : tsFile.endsWith('.jsx')
-        ? 'javascriptreact'
-        : tsFile.endsWith('.js')
-          ? 'javascript'
-          : 'typescript';
+    const languageId = tsFile.endsWith(".tsx")
+      ? "typescriptreact"
+      : tsFile.endsWith(".jsx")
+        ? "javascriptreact"
+        : tsFile.endsWith(".js")
+          ? "javascript"
+          : "typescript";
     try {
-      const text = fs.readFileSync(tsFile, 'utf-8');
+      const text = fs.readFileSync(tsFile, "utf-8");
       handle.connection.send({
-        jsonrpc: '2.0',
-        method: 'textDocument/didOpen',
+        jsonrpc: "2.0",
+        method: "textDocument/didOpen",
         params: {
           textDocument: {
             uri,
@@ -137,15 +137,13 @@ export class LspServerManager {
         },
       });
       // Give tsserver a moment to build the project.
-      await new Promise((resolve) =>
-        setTimeout(resolve, DEFAULT_LSP_WARMUP_DELAY_MS),
-      );
+      await new Promise((resolve) => setTimeout(resolve, DEFAULT_LSP_WARMUP_DELAY_MS));
       // Only mark as warmed up after successful completion
       handle.warmedUp = true;
       return uri;
     } catch (error) {
       // Do not set warmedUp to true on failure, allowing retry
-      debugLogger.warn('TypeScript server warm-up failed:', error);
+      debugLogger.warn("TypeScript server warm-up failed:", error);
       return undefined;
     }
   }
@@ -158,8 +156,8 @@ export class LspServerManager {
    */
   isTypescriptServer(handle: LspServerHandle): boolean {
     return (
-      handle.config.name.includes('typescript') ||
-      (handle.config.command?.includes('typescript') ?? false)
+      handle.config.name.includes("typescript") ||
+      (handle.config.command?.includes("typescript") ?? false)
     );
   }
 
@@ -169,16 +167,13 @@ export class LspServerManager {
    * @param name - The name of the LSP server
    * @param handle - The LSP server handle
    */
-  private async startServer(
-    name: string,
-    handle: LspServerHandle,
-  ): Promise<void> {
+  private async startServer(name: string, handle: LspServerHandle): Promise<void> {
     // If already starting, wait for the existing promise
     if (handle.startingPromise) {
       return handle.startingPromise;
     }
 
-    if (handle.status === 'IN_PROGRESS' || handle.status === 'READY') {
+    if (handle.status === "IN_PROGRESS" || handle.status === "READY") {
       return;
     }
     handle.stopRequested = false;
@@ -197,59 +192,35 @@ export class LspServerManager {
    * @param name - The name of the LSP server
    * @param handle - The LSP server handle
    */
-  private async doStartServer(
-    name: string,
-    handle: LspServerHandle,
-  ): Promise<void> {
+  private async doStartServer(name: string, handle: LspServerHandle): Promise<void> {
     const workspaceTrusted = this.config.isTrustedFolder();
-    if (
-      (this.requireTrustedWorkspace || handle.config.trustRequired) &&
-      !workspaceTrusted
-    ) {
-      debugLogger.warn(
-        `LSP server ${name} requires trusted workspace, skipping startup`,
-      );
-      handle.status = 'FAILED';
+    if ((this.requireTrustedWorkspace || handle.config.trustRequired) && !workspaceTrusted) {
+      debugLogger.warn(`LSP server ${name} requires trusted workspace, skipping startup`);
+      handle.status = "FAILED";
       return;
     }
 
     // Request user confirmation
-    const consent = await this.requestUserConsent(
-      name,
-      handle.config,
-      workspaceTrusted,
-    );
+    const consent = await this.requestUserConsent(name, handle.config, workspaceTrusted);
     if (!consent) {
       debugLogger.info(`User declined to start LSP server ${name}`);
-      handle.status = 'FAILED';
+      handle.status = "FAILED";
       return;
     }
 
     // Check if command exists
     if (handle.config.command) {
       const commandCwd = handle.config.workspaceFolder ?? this.workspaceRoot;
-      if (
-        !(await this.commandExists(
-          handle.config.command,
-          handle.config.env,
-          commandCwd,
-        ))
-      ) {
-        debugLogger.warn(
-          `LSP server ${name} command not found: ${handle.config.command}`,
-        );
-        handle.status = 'FAILED';
+      if (!(await this.commandExists(handle.config.command, handle.config.env, commandCwd))) {
+        debugLogger.warn(`LSP server ${name} command not found: ${handle.config.command}`);
+        handle.status = "FAILED";
         return;
       }
 
       // Check path safety
-      if (
-        !this.isPathSafe(handle.config.command, this.workspaceRoot, commandCwd)
-      ) {
-        debugLogger.warn(
-          `LSP server ${name} command path is unsafe: ${handle.config.command}`,
-        );
-        handle.status = 'FAILED';
+      if (!this.isPathSafe(handle.config.command, this.workspaceRoot, commandCwd)) {
+        debugLogger.warn(`LSP server ${name} command path is unsafe: ${handle.config.command}`);
+        handle.status = "FAILED";
         return;
       }
     }
@@ -257,7 +228,7 @@ export class LspServerManager {
     try {
       handle.error = undefined;
       handle.warmedUp = false;
-      handle.status = 'IN_PROGRESS';
+      handle.status = "IN_PROGRESS";
 
       // Create LSP connection
       const connection = await this.createLspConnection(handle.config);
@@ -267,11 +238,11 @@ export class LspServerManager {
       // Initialize LSP server
       await this.initializeLspServer(connection, handle.config);
 
-      handle.status = 'READY';
+      handle.status = "READY";
       this.attachRestartHandler(name, handle);
       debugLogger.info(`LSP server ${name} started successfully`);
     } catch (error) {
-      handle.status = 'FAILED';
+      handle.status = "FAILED";
       handle.error = error as Error;
       debugLogger.error(`LSP server ${name} failed to start:`, error);
     }
@@ -280,10 +251,7 @@ export class LspServerManager {
   /**
    * Stop individual LSP server
    */
-  private async stopServer(
-    name: string,
-    handle: LspServerHandle,
-  ): Promise<void> {
+  private async stopServer(name: string, handle: LspServerHandle): Promise<void> {
     handle.stopRequested = true;
 
     if (handle.connection) {
@@ -297,7 +265,7 @@ export class LspServerManager {
     }
     handle.connection = undefined;
     handle.process = undefined;
-    handle.status = 'NOT_STARTED';
+    handle.status = "NOT_STARTED";
     handle.warmedUp = false;
     handle.restartAttempts = 0;
   }
@@ -308,12 +276,10 @@ export class LspServerManager {
     }
     try {
       const shutdownPromise = handle.connection.shutdown();
-      if (typeof handle.config.shutdownTimeout === 'number') {
+      if (typeof handle.config.shutdownTimeout === "number") {
         await Promise.race([
           shutdownPromise,
-          new Promise<void>((resolve) =>
-            setTimeout(resolve, handle.config.shutdownTimeout),
-          ),
+          new Promise<void>((resolve) => setTimeout(resolve, handle.config.shutdownTimeout)),
         ]);
       } else {
         await shutdownPromise;
@@ -327,17 +293,17 @@ export class LspServerManager {
     if (!handle.process) {
       return;
     }
-    handle.process.once('exit', (code) => {
+    handle.process.once("exit", (code) => {
       if (handle.stopRequested) {
         return;
       }
       if (!handle.config.restartOnCrash) {
-        handle.status = 'FAILED';
+        handle.status = "FAILED";
         return;
       }
       const maxRestarts = handle.config.maxRestarts ?? DEFAULT_LSP_MAX_RESTARTS;
       if (maxRestarts <= 0) {
-        handle.status = 'FAILED';
+        handle.status = "FAILED";
         return;
       }
       const attempts = handle.restartAttempts ?? 0;
@@ -345,12 +311,12 @@ export class LspServerManager {
         debugLogger.warn(
           `LSP server ${name} reached max restart attempts (${maxRestarts}), stopping restarts`,
         );
-        handle.status = 'FAILED';
+        handle.status = "FAILED";
         return;
       }
       handle.restartAttempts = attempts + 1;
       debugLogger.warn(
-        `LSP server ${name} exited (code ${code ?? 'unknown'}), restarting (${handle.restartAttempts}/${maxRestarts})`,
+        `LSP server ${name} exited (code ${code ?? "unknown"}), restarting (${handle.restartAttempts}/${maxRestarts})`,
       );
       this.resetHandle(handle);
       void this.startServer(name, handle);
@@ -366,15 +332,13 @@ export class LspServerManager {
     }
     handle.connection = undefined;
     handle.process = undefined;
-    handle.status = 'NOT_STARTED';
+    handle.status = "NOT_STARTED";
     handle.error = undefined;
     handle.warmedUp = false;
     handle.stopRequested = false;
   }
 
-  private buildProcessEnv(
-    env: Record<string, string> | undefined,
-  ): NodeJS.ProcessEnv | undefined {
+  private buildProcessEnv(env: Record<string, string> | undefined): NodeJS.ProcessEnv | undefined {
     if (!env || Object.keys(env).length === 0) {
       return undefined;
     }
@@ -384,21 +348,16 @@ export class LspServerManager {
   private async connectSocketWithRetry(
     socket: LspSocketOptions,
     timeoutMs: number,
-  ): Promise<
-    Awaited<ReturnType<typeof LspConnectionFactory.createSocketConnection>>
-  > {
+  ): Promise<Awaited<ReturnType<typeof LspConnectionFactory.createSocketConnection>>> {
     const deadline = Date.now() + timeoutMs;
     let attempt = 0;
     while (true) {
       const remaining = deadline - Date.now();
       if (remaining <= 0) {
-        throw new Error('LSP server connection timeout');
+        throw new Error("LSP server connection timeout");
       }
       try {
-        return await LspConnectionFactory.createSocketConnection(
-          socket,
-          remaining,
-        );
+        return await LspConnectionFactory.createSocketConnection(socket, remaining);
       } catch (error) {
         attempt += 1;
         if (Date.now() >= deadline) {
@@ -416,17 +375,14 @@ export class LspServerManager {
   /**
    * Create LSP connection
    */
-  private async createLspConnection(
-    config: LspServerConfig,
-  ): Promise<LspConnectionResult> {
+  private async createLspConnection(config: LspServerConfig): Promise<LspConnectionResult> {
     const workspaceFolder = config.workspaceFolder ?? this.workspaceRoot;
-    const startupTimeout =
-      config.startupTimeout ?? DEFAULT_LSP_STARTUP_TIMEOUT_MS;
+    const startupTimeout = config.startupTimeout ?? DEFAULT_LSP_STARTUP_TIMEOUT_MS;
     const env = this.buildProcessEnv(config.env);
 
-    if (config.transport === 'stdio') {
+    if (config.transport === "stdio") {
       if (!config.command) {
-        throw new Error('LSP stdio transport requires a command');
+        throw new Error("LSP stdio transport requires a command");
       }
 
       // Fix: use cwd as cwd instead of rootUri
@@ -449,12 +405,11 @@ export class LspServerManager {
           }
           lspConnection.connection.end();
         },
-        initialize: async (params: unknown) =>
-          lspConnection.connection.initialize(params),
+        initialize: async (params: unknown) => lspConnection.connection.initialize(params),
       };
-    } else if (config.transport === 'tcp' || config.transport === 'socket') {
+    } else if (config.transport === "tcp" || config.transport === "socket") {
       if (!config.socket) {
-        throw new Error('LSP socket transport requires host/port or path');
+        throw new Error("LSP socket transport requires host/port or path");
       }
 
       let process: ChildProcess | undefined;
@@ -462,21 +417,18 @@ export class LspServerManager {
         process = spawn(config.command, config.args ?? [], {
           cwd: workspaceFolder,
           env,
-          stdio: 'ignore',
+          stdio: "ignore",
         });
         await new Promise<void>((resolve, reject) => {
-          process?.once('spawn', () => resolve());
-          process?.once('error', (error) => {
+          process?.once("spawn", () => resolve());
+          process?.once("error", (error) => {
             reject(new Error(`Failed to spawn LSP server: ${error.message}`));
           });
         });
       }
 
       try {
-        const lspConnection = await this.connectSocketWithRetry(
-          config.socket,
-          startupTimeout,
-        );
+        const lspConnection = await this.connectSocketWithRetry(config.socket, startupTimeout);
 
         return {
           connection: lspConnection.connection,
@@ -487,8 +439,7 @@ export class LspServerManager {
           exit: () => {
             lspConnection.connection.end();
           },
-          initialize: async (params: unknown) =>
-            lspConnection.connection.initialize(params),
+          initialize: async (params: unknown) => lspConnection.connection.initialize(params),
         };
       } catch (error) {
         if (process && process.exitCode === null) {
@@ -540,13 +491,13 @@ export class LspServerManager {
     // Send initialized notification and workspace folders change to help servers (e.g. tsserver)
     // create projects in the correct workspace.
     connection.connection.send({
-      jsonrpc: '2.0',
-      method: 'initialized',
+      jsonrpc: "2.0",
+      method: "initialized",
       params: {},
     });
     connection.connection.send({
-      jsonrpc: '2.0',
-      method: 'workspace/didChangeWorkspaceFolders',
+      jsonrpc: "2.0",
+      method: "workspace/didChangeWorkspaceFolders",
       params: {
         event: {
           added: [workspaceFolder],
@@ -557,8 +508,8 @@ export class LspServerManager {
 
     if (config.settings && Object.keys(config.settings).length > 0) {
       connection.connection.send({
-        jsonrpc: '2.0',
-        method: 'workspace/didChangeConfiguration',
+        jsonrpc: "2.0",
+        method: "workspace/didChangeConfiguration",
         params: {
           settings: config.settings,
         },
@@ -589,18 +540,18 @@ export class LspServerManager {
   ): Promise<boolean> {
     return new Promise((resolve) => {
       let settled = false;
-      const child = spawn(command, ['--version'], {
-        stdio: ['ignore', 'ignore', 'ignore'],
+      const child = spawn(command, ["--version"], {
+        stdio: ["ignore", "ignore", "ignore"],
         cwd: cwd ?? this.workspaceRoot,
         env: this.buildProcessEnv(env),
       });
 
-      child.on('error', () => {
+      child.on("error", () => {
         settled = true;
         resolve(false);
       });
 
-      child.on('exit', (code) => {
+      child.on("exit", (code) => {
         if (settled) {
           return;
         }
@@ -625,14 +576,10 @@ export class LspServerManager {
   /**
    * Check path safety
    */
-  private isPathSafe(
-    command: string,
-    workspacePath: string,
-    cwd?: string,
-  ): boolean {
+  private isPathSafe(command: string, workspacePath: string, cwd?: string): boolean {
     // Allow commands without path separators (global PATH commands like 'typescript-language-server')
     // These are resolved by the shell from PATH and are generally safe
-    if (!command.includes(path.sep) && !command.includes('/')) {
+    if (!command.includes(path.sep) && !command.includes("/")) {
       return true;
     }
 
@@ -678,13 +625,8 @@ export class LspServerManager {
    * Find a representative TypeScript/JavaScript file to warm up tsserver.
    */
   private findFirstTypescriptFile(): string | undefined {
-    const patterns = ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'];
-    const excludePatterns = [
-      '**/node_modules/**',
-      '**/.git/**',
-      '**/dist/**',
-      '**/build/**',
-    ];
+    const patterns = ["**/*.ts", "**/*.tsx", "**/*.js", "**/*.jsx"];
+    const excludePatterns = ["**/node_modules/**", "**/.git/**", "**/dist/**", "**/build/**"];
 
     for (const root of this.workspaceContext.getDirectories()) {
       for (const pattern of patterns) {
diff --git a/packages/airiscode-core/src/lsp/NativeLspClient.ts b/packages/airiscode-core/src/lsp/NativeLspClient.ts
index 8510ed876..dcb9a351c 100644
--- a/packages/airiscode-core/src/lsp/NativeLspClient.ts
+++ b/packages/airiscode-core/src/lsp/NativeLspClient.ts
@@ -12,6 +12,7 @@
  * and the NativeLspService implementation.
  */
 
+import type { NativeLspService } from "./NativeLspService.js";
 import type {
   LspCallHierarchyIncomingCall,
   LspCallHierarchyItem,
@@ -28,9 +29,7 @@ import type {
   LspReference,
   LspSymbolInformation,
   LspWorkspaceEdit,
-} from './types.js';
-
-import type { NativeLspService } from './NativeLspService.js';
+} from "./types.js";
 
 /**
  * Adapter class that implements LspClient by delegating to NativeLspService.
@@ -58,10 +57,7 @@ export class NativeLspClient implements LspClient {
    * @param limit - Maximum number of results to return
    * @returns Promise resolving to array of symbol information
    */
-  workspaceSymbols(
-    query: string,
-    limit?: number,
-  ): Promise<LspSymbolInformation[]> {
+  workspaceSymbols(query: string, limit?: number): Promise<LspSymbolInformation[]> {
     return this.service.workspaceSymbols(query, limit);
   }
 
@@ -96,12 +92,7 @@ export class NativeLspClient implements LspClient {
     includeDeclaration?: boolean,
     limit?: number,
   ): Promise<LspReference[]> {
-    return this.service.references(
-      location,
-      serverName,
-      includeDeclaration,
-      limit,
-    );
+    return this.service.references(location, serverName, includeDeclaration, limit);
   }
 
   /**
@@ -111,10 +102,7 @@ export class NativeLspClient implements LspClient {
    * @param serverName - Optional specific LSP server to query
    * @returns Promise resolving to hover result or null if not available
    */
-  hover(
-    location: LspLocation,
-    serverName?: string,
-  ): Promise<LspHoverResult | null> {
+  hover(location: LspLocation, serverName?: string): Promise<LspHoverResult | null> {
     return this.service.hover(location, serverName);
   }
 
@@ -216,10 +204,7 @@ export class NativeLspClient implements LspClient {
    * @param limit - Maximum number of file diagnostics to return
    * @returns Promise resolving to array of file diagnostics
    */
-  workspaceDiagnostics(
-    serverName?: string,
-    limit?: number,
-  ): Promise<LspFileDiagnostics[]> {
+  workspaceDiagnostics(serverName?: string, limit?: number): Promise<LspFileDiagnostics[]> {
     return this.service.workspaceDiagnostics(serverName, limit);
   }
 
@@ -250,10 +235,7 @@ export class NativeLspClient implements LspClient {
    * @param serverName - Optional specific LSP server context
    * @returns Promise resolving to true if edit was applied successfully
    */
-  applyWorkspaceEdit(
-    edit: LspWorkspaceEdit,
-    serverName?: string,
-  ): Promise<boolean> {
+  applyWorkspaceEdit(edit: LspWorkspaceEdit, serverName?: string): Promise<boolean> {
     return this.service.applyWorkspaceEdit(edit, serverName);
   }
 }
diff --git a/packages/airiscode-core/src/lsp/NativeLspService.ts b/packages/airiscode-core/src/lsp/NativeLspService.ts
index 1ef901e77..8af8dec62 100644
--- a/packages/airiscode-core/src/lsp/NativeLspService.ts
+++ b/packages/airiscode-core/src/lsp/NativeLspService.ts
@@ -4,17 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config as CoreConfig } from '../config/config.js';
-import type { Extension } from '../extension/extensionManager.js';
-import type { IdeContextStore } from '../ide/ideContext.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import type { WorkspaceContext } from '../utils/workspaceContext.js';
+import * as fs from "node:fs";
+import type { EventEmitter } from "events";
+import { globSync } from "glob";
+import * as path from "path";
+import { fileURLToPath, pathToFileURL } from "url";
+import type { Config as CoreConfig } from "../config/config.js";
+import type { Extension } from "../extension/extensionManager.js";
+import type { IdeContextStore } from "../ide/ideContext.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import type { WorkspaceContext } from "../utils/workspaceContext.js";
+import {
+  DEFAULT_LSP_DOCUMENT_OPEN_DELAY_MS,
+  DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS,
+  DEFAULT_LSP_WORKSPACE_SYMBOL_WARMUP_DELAY_MS,
+} from "./constants.js";
+import { LspConfigLoader } from "./LspConfigLoader.js";
+import { LspResponseNormalizer } from "./LspResponseNormalizer.js";
+import { LspServerManager } from "./LspServerManager.js";
 import type {
   LspCallHierarchyIncomingCall,
   LspCallHierarchyItem,
   LspCallHierarchyOutgoingCall,
   LspCodeAction,
   LspCodeActionContext,
+  LspConnectionInterface,
   LspDefinition,
   LspDiagnostic,
   LspFileDiagnostics,
@@ -22,32 +37,15 @@ import type {
   LspLocation,
   LspRange,
   LspReference,
+  LspServerHandle,
+  LspServerStatus,
   LspSymbolInformation,
   LspTextEdit,
   LspWorkspaceEdit,
-} from './types.js';
-import type { EventEmitter } from 'events';
-import {
-  DEFAULT_LSP_DOCUMENT_OPEN_DELAY_MS,
-  DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS,
-  DEFAULT_LSP_WORKSPACE_SYMBOL_WARMUP_DELAY_MS,
-} from './constants.js';
-import { LspConfigLoader } from './LspConfigLoader.js';
-import { LspResponseNormalizer } from './LspResponseNormalizer.js';
-import { LspServerManager } from './LspServerManager.js';
-import type {
-  LspConnectionInterface,
-  LspServerHandle,
-  LspServerStatus,
   NativeLspServiceOptions,
-} from './types.js';
-import * as path from 'path';
-import { fileURLToPath, pathToFileURL } from 'url';
-import * as fs from 'node:fs';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { globSync } from 'glob';
+} from "./types.js";
 
-const debugLogger = createDebugLogger('LSP');
+const debugLogger = createDebugLogger("LSP");
 
 /**
  * Mapping from LSP language identifiers to file extensions, only for cases
@@ -56,21 +54,16 @@ const debugLogger = createDebugLogger('LSP');
  * are handled by the fallback in getWorkspaceSymbolExtensions().
  */
 const LANGUAGE_ID_TO_EXTENSIONS: Record<string, string[]> = {
-  typescript: ['ts', 'tsx'],
-  typescriptreact: ['tsx'],
-  javascript: ['js', 'jsx'],
-  javascriptreact: ['jsx'],
-  python: ['py'],
-  csharp: ['cs'],
-  ruby: ['rb'],
+  typescript: ["ts", "tsx"],
+  typescriptreact: ["tsx"],
+  javascript: ["js", "jsx"],
+  javascriptreact: ["jsx"],
+  python: ["py"],
+  csharp: ["cs"],
+  ruby: ["rb"],
 };
 
-const DEFAULT_EXCLUDE_PATTERNS = [
-  '**/node_modules/**',
-  '**/.git/**',
-  '**/dist/**',
-  '**/build/**',
-];
+const DEFAULT_EXCLUDE_PATTERNS = ["**/node_modules/**", "**/.git/**", "**/dist/**", "**/build/**"];
 
 export class NativeLspService {
   private config: CoreConfig;
@@ -97,8 +90,7 @@ export class NativeLspService {
     this.fileDiscoveryService = fileDiscoveryService;
     this.requireTrustedWorkspace = options.requireTrustedWorkspace ?? true;
     this.workspaceRoot =
-      options.workspaceRoot ??
-      (config as { getProjectRoot: () => string }).getProjectRoot();
+      options.workspaceRoot ?? (config as { getProjectRoot: () => string }).getProjectRoot();
     this.configLoader = new LspConfigLoader(this.workspaceRoot);
     this.normalizer = new LspResponseNormalizer();
     this.serverManager = new LspServerManager(
@@ -121,9 +113,7 @@ export class NativeLspService {
 
     // Check if workspace is trusted
     if (this.requireTrustedWorkspace && !workspaceTrusted) {
-      debugLogger.warn(
-        'Workspace is not trusted, skipping LSP server discovery',
-      );
+      debugLogger.warn("Workspace is not trusted, skipping LSP server discovery");
       return;
     }
 
@@ -133,11 +123,7 @@ export class NativeLspService {
       this.getActiveExtensions(),
     );
     // Merge configs: extension LSP configs + user .lsp.json
-    const serverConfigs = this.configLoader.mergeConfigs(
-      [],
-      extensionConfigs,
-      userConfigs,
-    );
+    const serverConfigs = this.configLoader.mergeConfigs([], extensionConfigs, userConfigs);
     this.serverManager.setServerConfigs(serverConfigs);
   }
 
@@ -145,7 +131,7 @@ export class NativeLspService {
     const configWithExtensions = this.config as unknown as {
       getActiveExtensions?: () => Extension[];
     };
-    return typeof configWithExtensions.getActiveExtensions === 'function'
+    return typeof configWithExtensions.getActiveExtensions === "function"
       ? configWithExtensions.getActiveExtensions()
       : [];
   }
@@ -182,13 +168,8 @@ export class NativeLspService {
     serverName?: string,
   ): Array<[string, LspServerHandle & { connection: LspConnectionInterface }]> {
     return Array.from(this.serverManager.getHandles().entries()).filter(
-      (
-        entry,
-      ): entry is [
-        string,
-        LspServerHandle & { connection: LspConnectionInterface },
-      ] =>
-        entry[1].status === 'READY' &&
+      (entry): entry is [string, LspServerHandle & { connection: LspConnectionInterface }] =>
+        entry[1].status === "READY" &&
         entry[1].connection !== undefined &&
         (!serverName || entry[0] === serverName),
     );
@@ -216,7 +197,7 @@ export class NativeLspService {
     }
     this.lastConnections.set(serverName, handle.connection);
 
-    if (!uri.startsWith('file://')) {
+    if (!uri.startsWith("file://")) {
       return false;
     }
     const openedForServer = this.openedDocuments.get(serverName);
@@ -234,20 +215,17 @@ export class NativeLspService {
 
     let text: string;
     try {
-      text = fs.readFileSync(filePath, 'utf-8');
+      text = fs.readFileSync(filePath, "utf-8");
     } catch (error) {
-      debugLogger.warn(
-        `Failed to read file for LSP didOpen: ${filePath}`,
-        error,
-      );
+      debugLogger.warn(`Failed to read file for LSP didOpen: ${filePath}`, error);
       return false;
     }
 
-    const languageId = this.resolveLanguageId(filePath, handle) ?? 'plaintext';
+    const languageId = this.resolveLanguageId(filePath, handle) ?? "plaintext";
 
     handle.connection.send({
-      jsonrpc: '2.0',
-      method: 'textDocument/didOpen',
+      jsonrpc: "2.0",
+      method: "textDocument/didOpen",
       params: {
         textDocument: {
           uri,
@@ -278,20 +256,16 @@ export class NativeLspService {
    * @param uri - The document URI to track as already opened
    */
   private trackExternallyOpenedDocument(serverName: string, uri: string): void {
-    const openedForServer =
-      this.openedDocuments.get(serverName) ?? new Set<string>();
+    const openedForServer = this.openedDocuments.get(serverName) ?? new Set<string>();
     openedForServer.add(uri);
     this.openedDocuments.set(serverName, openedForServer);
   }
 
-  private resolveLanguageId(
-    filePath: string,
-    handle: LspServerHandle,
-  ): string | undefined {
+  private resolveLanguageId(filePath: string, handle: LspServerHandle): string | undefined {
     const ext = path.extname(filePath).slice(1).toLowerCase();
     if (ext && handle.config.extensionToLanguage) {
       const mapping = handle.config.extensionToLanguage;
-      return mapping[ext] ?? mapping['.' + ext];
+      return mapping[ext] ?? mapping["." + ext];
     }
     if (handle.config.languages && handle.config.languages.length > 0) {
       return handle.config.languages[0];
@@ -336,16 +310,13 @@ export class NativeLspService {
    * @param handle - The LSP server handle to determine target extensions
    * @returns Absolute path of the first matching file, or undefined
    */
-  private findWorkspaceFileForServer(
-    handle: LspServerHandle,
-  ): string | undefined {
+  private findWorkspaceFileForServer(handle: LspServerHandle): string | undefined {
     const extensions = this.getWorkspaceSymbolExtensions(handle);
     if (extensions.length === 0) {
       return undefined;
     }
     // Brace expansion requires at least 2 items; use plain glob for a single ext
-    const extGlob =
-      extensions.length === 1 ? extensions[0]! : `{${extensions.join(',')}}`;
+    const extGlob = extensions.length === 1 ? extensions[0]! : `{${extensions.join(",")}}`;
     const pattern = `**/*.${extGlob}`;
     const roots = this.workspaceContext.getDirectories();
 
@@ -388,7 +359,7 @@ export class NativeLspService {
     const extMapping = handle.config.extensionToLanguage;
     if (extMapping) {
       for (const key of Object.keys(extMapping)) {
-        const normalized = key.startsWith('.') ? key.slice(1) : key;
+        const normalized = key.startsWith(".") ? key.slice(1) : key;
         if (normalized) {
           extensions.add(normalized.toLowerCase());
         }
@@ -427,10 +398,7 @@ export class NativeLspService {
     handle: LspServerHandle,
     force = false,
   ): Promise<void> {
-    const warmupUri = await this.serverManager.warmupTypescriptServer(
-      handle,
-      force,
-    );
+    const warmupUri = await this.serverManager.warmupTypescriptServer(handle, force);
     if (warmupUri) {
       this.trackExternallyOpenedDocument(serverName, warmupUri);
     }
@@ -441,10 +409,7 @@ export class NativeLspService {
    * results. We retry when a textDocument/didOpen was just sent (the server
    * may still be indexing) AND the server is not a fast TypeScript server.
    */
-  private shouldRetryAfterOpen(
-    justOpened: boolean,
-    handle: LspServerHandle,
-  ): boolean {
+  private shouldRetryAfterOpen(justOpened: boolean, handle: LspServerHandle): boolean {
     return justOpened && !this.serverManager.isTypescriptServer(handle);
   }
 
@@ -455,16 +420,11 @@ export class NativeLspService {
   /**
    * Workspace symbol search across all ready LSP servers.
    */
-  async workspaceSymbols(
-    query: string,
-    limit = 50,
-  ): Promise<LspSymbolInformation[]> {
+  async workspaceSymbols(query: string, limit = 50): Promise<LspSymbolInformation[]> {
     const results: LspSymbolInformation[] = [];
 
-    for (const [serverName, handle] of Array.from(
-      this.serverManager.getHandles(),
-    )) {
-      if (handle.status !== 'READY' || !handle.connection) {
+    for (const [serverName, handle] of Array.from(this.serverManager.getHandles())) {
+      if (handle.status !== "READY" || !handle.connection) {
         continue;
       }
       try {
@@ -472,7 +432,7 @@ export class NativeLspService {
         const warmedUp = this.serverManager.isTypescriptServer(handle)
           ? false
           : await this.warmupWorkspaceSymbols(serverName, handle);
-        let response = await handle.connection.request('workspace/symbol', {
+        let response = await handle.connection.request("workspace/symbol", {
           query,
         });
         if (
@@ -482,7 +442,7 @@ export class NativeLspService {
           warmedUp
         ) {
           await this.delay(DEFAULT_LSP_WORKSPACE_SYMBOL_WARMUP_DELAY_MS);
-          response = await handle.connection.request('workspace/symbol', {
+          response = await handle.connection.request("workspace/symbol", {
             query,
           });
         }
@@ -491,7 +451,7 @@ export class NativeLspService {
           this.isNoProjectErrorResponse(response)
         ) {
           await this.warmupAndTrack(serverName, handle, true);
-          response = await handle.connection.request('workspace/symbol', {
+          response = await handle.connection.request("workspace/symbol", {
             query,
           });
         }
@@ -499,10 +459,7 @@ export class NativeLspService {
           continue;
         }
         for (const item of response) {
-          const symbol = this.normalizer.normalizeSymbolResult(
-            item,
-            serverName,
-          );
+          const symbol = this.normalizer.normalizeSymbolResult(item, serverName);
           if (symbol) {
             results.push(symbol);
           }
@@ -511,10 +468,7 @@ export class NativeLspService {
           }
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP workspace/symbol failed for ${serverName}:`,
-          error,
-        );
+        debugLogger.warn(`LSP workspace/symbol failed for ${serverName}:`, error);
       }
     }
 
@@ -537,34 +491,17 @@ export class NativeLspService {
 
     for (const [name, handle] of handles) {
       try {
-        const justOpened = await this.ensureDocumentOpen(
-          name,
-          handle,
-          location.uri,
-        );
+        const justOpened = await this.ensureDocumentOpen(name, handle, location.uri);
         await this.warmupAndTrack(name, handle);
 
-        let response = await handle.connection.request(
-          'textDocument/definition',
-          requestParams,
-        );
+        let response = await handle.connection.request("textDocument/definition", requestParams);
 
-        if (
-          this.isEmptyResponse(response) &&
-          this.shouldRetryAfterOpen(justOpened, handle)
-        ) {
+        if (this.isEmptyResponse(response) && this.shouldRetryAfterOpen(justOpened, handle)) {
           await this.delay(DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS);
-          response = await handle.connection.request(
-            'textDocument/definition',
-            requestParams,
-          );
+          response = await handle.connection.request("textDocument/definition", requestParams);
         }
 
-        const candidates = Array.isArray(response)
-          ? response
-          : response
-            ? [response]
-            : [];
+        const candidates = Array.isArray(response) ? response : response ? [response] : [];
         const definitions: LspDefinition[] = [];
         for (const def of candidates) {
           const normalized = this.normalizer.normalizeLocationResult(def, name);
@@ -579,10 +516,7 @@ export class NativeLspService {
           return definitions.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP textDocument/definition failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP textDocument/definition failed for ${name}:`, error);
       }
     }
 
@@ -607,27 +541,14 @@ export class NativeLspService {
 
     for (const [name, handle] of handles) {
       try {
-        const justOpened = await this.ensureDocumentOpen(
-          name,
-          handle,
-          location.uri,
-        );
+        const justOpened = await this.ensureDocumentOpen(name, handle, location.uri);
         await this.warmupAndTrack(name, handle);
 
-        let response = await handle.connection.request(
-          'textDocument/references',
-          requestParams,
-        );
+        let response = await handle.connection.request("textDocument/references", requestParams);
 
-        if (
-          this.isEmptyResponse(response) &&
-          this.shouldRetryAfterOpen(justOpened, handle)
-        ) {
+        if (this.isEmptyResponse(response) && this.shouldRetryAfterOpen(justOpened, handle)) {
           await this.delay(DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS);
-          response = await handle.connection.request(
-            'textDocument/references',
-            requestParams,
-          );
+          response = await handle.connection.request("textDocument/references", requestParams);
         }
 
         if (!Array.isArray(response)) {
@@ -647,10 +568,7 @@ export class NativeLspService {
           return refs.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP textDocument/references failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP textDocument/references failed for ${name}:`, error);
       }
     }
 
@@ -660,10 +578,7 @@ export class NativeLspService {
   /**
    * Get hover information
    */
-  async hover(
-    location: LspLocation,
-    serverName?: string,
-  ): Promise<LspHoverResult | null> {
+  async hover(location: LspLocation, serverName?: string): Promise<LspHoverResult | null> {
     const handles = this.getReadyHandles(serverName);
     const requestParams = {
       textDocument: { uri: location.uri },
@@ -672,27 +587,14 @@ export class NativeLspService {
 
     for (const [name, handle] of handles) {
       try {
-        const justOpened = await this.ensureDocumentOpen(
-          name,
-          handle,
-          location.uri,
-        );
+        const justOpened = await this.ensureDocumentOpen(name, handle, location.uri);
         await this.warmupAndTrack(name, handle);
 
-        let response = await handle.connection.request(
-          'textDocument/hover',
-          requestParams,
-        );
+        let response = await handle.connection.request("textDocument/hover", requestParams);
 
-        if (
-          this.isEmptyResponse(response) &&
-          this.shouldRetryAfterOpen(justOpened, handle)
-        ) {
+        if (this.isEmptyResponse(response) && this.shouldRetryAfterOpen(justOpened, handle)) {
           await this.delay(DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS);
-          response = await handle.connection.request(
-            'textDocument/hover',
-            requestParams,
-          );
+          response = await handle.connection.request("textDocument/hover", requestParams);
         }
 
         const normalized = this.normalizer.normalizeHoverResult(response, name);
@@ -724,19 +626,13 @@ export class NativeLspService {
         await this.warmupAndTrack(name, handle);
 
         let response = await handle.connection.request(
-          'textDocument/documentSymbol',
+          "textDocument/documentSymbol",
           requestParams,
         );
 
-        if (
-          this.isEmptyResponse(response) &&
-          this.shouldRetryAfterOpen(justOpened, handle)
-        ) {
+        if (this.isEmptyResponse(response) && this.shouldRetryAfterOpen(justOpened, handle)) {
           await this.delay(DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS);
-          response = await handle.connection.request(
-            'textDocument/documentSymbol',
-            requestParams,
-          );
+          response = await handle.connection.request("textDocument/documentSymbol", requestParams);
         }
 
         if (!Array.isArray(response)) {
@@ -744,23 +640,14 @@ export class NativeLspService {
         }
         const symbols: LspSymbolInformation[] = [];
         for (const item of response) {
-          if (!item || typeof item !== 'object') {
+          if (!item || typeof item !== "object") {
             continue;
           }
           const itemObj = item as Record<string, unknown>;
           if (this.normalizer.isDocumentSymbol(itemObj)) {
-            this.normalizer.collectDocumentSymbol(
-              itemObj,
-              uri,
-              name,
-              symbols,
-              limit,
-            );
+            this.normalizer.collectDocumentSymbol(itemObj, uri, name, symbols, limit);
           } else {
-            const normalized = this.normalizer.normalizeSymbolResult(
-              itemObj,
-              name,
-            );
+            const normalized = this.normalizer.normalizeSymbolResult(itemObj, name);
             if (normalized) {
               symbols.push(normalized);
             }
@@ -773,10 +660,7 @@ export class NativeLspService {
           return symbols.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP textDocument/documentSymbol failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP textDocument/documentSymbol failed for ${name}:`, error);
       }
     }
 
@@ -799,40 +683,23 @@ export class NativeLspService {
 
     for (const [name, handle] of handles) {
       try {
-        const justOpened = await this.ensureDocumentOpen(
-          name,
-          handle,
-          location.uri,
-        );
+        const justOpened = await this.ensureDocumentOpen(name, handle, location.uri);
         await this.warmupAndTrack(name, handle);
 
         let response = await handle.connection.request(
-          'textDocument/implementation',
+          "textDocument/implementation",
           requestParams,
         );
 
-        if (
-          this.isEmptyResponse(response) &&
-          this.shouldRetryAfterOpen(justOpened, handle)
-        ) {
+        if (this.isEmptyResponse(response) && this.shouldRetryAfterOpen(justOpened, handle)) {
           await this.delay(DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS);
-          response = await handle.connection.request(
-            'textDocument/implementation',
-            requestParams,
-          );
+          response = await handle.connection.request("textDocument/implementation", requestParams);
         }
 
-        const candidates = Array.isArray(response)
-          ? response
-          : response
-            ? [response]
-            : [];
+        const candidates = Array.isArray(response) ? response : response ? [response] : [];
         const implementations: LspDefinition[] = [];
         for (const item of candidates) {
-          const normalized = this.normalizer.normalizeLocationResult(
-            item,
-            name,
-          );
+          const normalized = this.normalizer.normalizeLocationResult(item, name);
           if (normalized) {
             implementations.push(normalized);
             if (implementations.length >= limit) {
@@ -844,10 +711,7 @@ export class NativeLspService {
           return implementations.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP textDocument/implementation failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP textDocument/implementation failed for ${name}:`, error);
       }
     }
 
@@ -870,40 +734,26 @@ export class NativeLspService {
 
     for (const [name, handle] of handles) {
       try {
-        const justOpened = await this.ensureDocumentOpen(
-          name,
-          handle,
-          location.uri,
-        );
+        const justOpened = await this.ensureDocumentOpen(name, handle, location.uri);
         await this.warmupAndTrack(name, handle);
 
         let response = await handle.connection.request(
-          'textDocument/prepareCallHierarchy',
+          "textDocument/prepareCallHierarchy",
           requestParams,
         );
 
-        if (
-          this.isEmptyResponse(response) &&
-          this.shouldRetryAfterOpen(justOpened, handle)
-        ) {
+        if (this.isEmptyResponse(response) && this.shouldRetryAfterOpen(justOpened, handle)) {
           await this.delay(DEFAULT_LSP_DOCUMENT_RETRY_DELAY_MS);
           response = await handle.connection.request(
-            'textDocument/prepareCallHierarchy',
+            "textDocument/prepareCallHierarchy",
             requestParams,
           );
         }
 
-        const candidates = Array.isArray(response)
-          ? response
-          : response
-            ? [response]
-            : [];
+        const candidates = Array.isArray(response) ? response : response ? [response] : [];
         const items: LspCallHierarchyItem[] = [];
         for (const item of candidates) {
-          const normalized = this.normalizer.normalizeCallHierarchyItem(
-            item,
-            name,
-          );
+          const normalized = this.normalizer.normalizeCallHierarchyItem(item, name);
           if (normalized) {
             items.push(normalized);
             if (items.length >= limit) {
@@ -915,10 +765,7 @@ export class NativeLspService {
           return items.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP textDocument/prepareCallHierarchy failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP textDocument/prepareCallHierarchy failed for ${name}:`, error);
       }
     }
 
@@ -939,12 +786,9 @@ export class NativeLspService {
     for (const [name, handle] of handles) {
       try {
         await this.warmupAndTrack(name, handle);
-        const response = await handle.connection.request(
-          'callHierarchy/incomingCalls',
-          {
-            item: this.normalizer.toCallHierarchyItemParams(item),
-          },
-        );
+        const response = await handle.connection.request("callHierarchy/incomingCalls", {
+          item: this.normalizer.toCallHierarchyItemParams(item),
+        });
         if (!Array.isArray(response)) {
           continue;
         }
@@ -962,10 +806,7 @@ export class NativeLspService {
           return calls.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP callHierarchy/incomingCalls failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP callHierarchy/incomingCalls failed for ${name}:`, error);
       }
     }
 
@@ -986,12 +827,9 @@ export class NativeLspService {
     for (const [name, handle] of handles) {
       try {
         await this.warmupAndTrack(name, handle);
-        const response = await handle.connection.request(
-          'callHierarchy/outgoingCalls',
-          {
-            item: this.normalizer.toCallHierarchyItemParams(item),
-          },
-        );
+        const response = await handle.connection.request("callHierarchy/outgoingCalls", {
+          item: this.normalizer.toCallHierarchyItemParams(item),
+        });
         if (!Array.isArray(response)) {
           continue;
         }
@@ -1009,10 +847,7 @@ export class NativeLspService {
           return calls.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP callHierarchy/outgoingCalls failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP callHierarchy/outgoingCalls failed for ${name}:`, error);
       }
     }
 
@@ -1022,10 +857,7 @@ export class NativeLspService {
   /**
    * Get diagnostics for a document
    */
-  async diagnostics(
-    uri: string,
-    serverName?: string,
-  ): Promise<LspDiagnostic[]> {
+  async diagnostics(uri: string, serverName?: string): Promise<LspDiagnostic[]> {
     const handles = this.getReadyHandles(serverName);
     const allDiagnostics: LspDiagnostic[] = [];
 
@@ -1035,22 +867,16 @@ export class NativeLspService {
         await this.warmupAndTrack(name, handle);
 
         // Request pull diagnostics if the server supports it
-        const response = await handle.connection.request(
-          'textDocument/diagnostic',
-          {
-            textDocument: { uri },
-          },
-        );
+        const response = await handle.connection.request("textDocument/diagnostic", {
+          textDocument: { uri },
+        });
 
-        if (response && typeof response === 'object') {
+        if (response && typeof response === "object") {
           const responseObj = response as Record<string, unknown>;
-          const items = responseObj['items'];
+          const items = responseObj["items"];
           if (Array.isArray(items)) {
             for (const item of items) {
-              const normalized = this.normalizer.normalizeDiagnostic(
-                item,
-                name,
-              );
+              const normalized = this.normalizer.normalizeDiagnostic(item, name);
               if (normalized) {
                 allDiagnostics.push(normalized);
               }
@@ -1060,10 +886,7 @@ export class NativeLspService {
       } catch (error) {
         // Fall back to cached diagnostics from publishDiagnostics notifications
         // This is handled by the notification handler if implemented
-        debugLogger.warn(
-          `LSP textDocument/diagnostic failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP textDocument/diagnostic failed for ${name}:`, error);
       }
     }
 
@@ -1073,10 +896,7 @@ export class NativeLspService {
   /**
    * Get diagnostics for all documents in the workspace
    */
-  async workspaceDiagnostics(
-    serverName?: string,
-    limit = 100,
-  ): Promise<LspFileDiagnostics[]> {
+  async workspaceDiagnostics(serverName?: string, limit = 100): Promise<LspFileDiagnostics[]> {
     const handles = this.getReadyHandles(serverName);
     const results: LspFileDiagnostics[] = [];
 
@@ -1085,25 +905,19 @@ export class NativeLspService {
         await this.warmupAndTrack(name, handle);
 
         // Request workspace diagnostics if supported
-        const response = await handle.connection.request(
-          'workspace/diagnostic',
-          {
-            previousResultIds: [],
-          },
-        );
+        const response = await handle.connection.request("workspace/diagnostic", {
+          previousResultIds: [],
+        });
 
-        if (response && typeof response === 'object') {
+        if (response && typeof response === "object") {
           const responseObj = response as Record<string, unknown>;
-          const items = responseObj['items'];
+          const items = responseObj["items"];
           if (Array.isArray(items)) {
             for (const item of items) {
               if (results.length >= limit) {
                 break;
               }
-              const normalized = this.normalizer.normalizeFileDiagnostics(
-                item,
-                name,
-              );
+              const normalized = this.normalizer.normalizeFileDiagnostics(item, name);
               if (normalized && normalized.diagnostics.length > 0) {
                 results.push(normalized);
               }
@@ -1144,21 +958,18 @@ export class NativeLspService {
           this.normalizer.denormalizeDiagnostic(d),
         );
 
-        const response = await handle.connection.request(
-          'textDocument/codeAction',
-          {
-            textDocument: { uri },
-            range,
-            context: {
-              diagnostics: lspDiagnostics,
-              only: context.only,
-              triggerKind:
-                context.triggerKind === 'automatic'
-                  ? 2 // CodeActionTriggerKind.Automatic
-                  : 1, // CodeActionTriggerKind.Invoked
-            },
+        const response = await handle.connection.request("textDocument/codeAction", {
+          textDocument: { uri },
+          range,
+          context: {
+            diagnostics: lspDiagnostics,
+            only: context.only,
+            triggerKind:
+              context.triggerKind === "automatic"
+                ? 2 // CodeActionTriggerKind.Automatic
+                : 1, // CodeActionTriggerKind.Invoked
           },
-        );
+        });
 
         if (!Array.isArray(response)) {
           continue;
@@ -1179,10 +990,7 @@ export class NativeLspService {
           return actions.slice(0, limit);
         }
       } catch (error) {
-        debugLogger.warn(
-          `LSP textDocument/codeAction failed for ${name}:`,
-          error,
-        );
+        debugLogger.warn(`LSP textDocument/codeAction failed for ${name}:`, error);
       }
     }
 
@@ -1192,10 +1000,7 @@ export class NativeLspService {
   /**
    * Apply workspace edit
    */
-  async applyWorkspaceEdit(
-    edit: LspWorkspaceEdit,
-    _serverName?: string,
-  ): Promise<boolean> {
+  async applyWorkspaceEdit(edit: LspWorkspaceEdit, _serverName?: string): Promise<boolean> {
     // Apply edits locally - this doesn't go through LSP server
     // Instead, it applies the edits to the file system
     try {
@@ -1207,16 +1012,13 @@ export class NativeLspService {
 
       if (edit.documentChanges) {
         for (const docChange of edit.documentChanges) {
-          await this.applyTextEdits(
-            docChange.textDocument.uri,
-            docChange.edits,
-          );
+          await this.applyTextEdits(docChange.textDocument.uri, docChange.edits);
         }
       }
 
       return true;
     } catch (error) {
-      debugLogger.error('Failed to apply workspace edit:', error);
+      debugLogger.error("Failed to apply workspace edit:", error);
       return false;
     }
   }
@@ -1224,11 +1026,8 @@ export class NativeLspService {
   /**
    * Apply text edits to a file
    */
-  private async applyTextEdits(
-    uri: string,
-    edits: LspTextEdit[],
-  ): Promise<void> {
-    let filePath = uri.startsWith('file://') ? fileURLToPath(uri) : uri;
+  private async applyTextEdits(uri: string, edits: LspTextEdit[]): Promise<void> {
+    let filePath = uri.startsWith("file://") ? fileURLToPath(uri) : uri;
     if (!path.isAbsolute(filePath)) {
       filePath = path.resolve(this.workspaceRoot, filePath);
     }
@@ -1239,10 +1038,10 @@ export class NativeLspService {
     // Read the current file content
     let content: string;
     try {
-      content = fs.readFileSync(filePath, 'utf-8');
+      content = fs.readFileSync(filePath, "utf-8");
     } catch {
       // File doesn't exist, treat as empty
-      content = '';
+      content = "";
     }
 
     // Sort edits in reverse order to apply from end to start
@@ -1253,7 +1052,7 @@ export class NativeLspService {
       return b.range.start.character - a.range.start.character;
     });
 
-    const lines = content.split('\n');
+    const lines = content.split("\n");
 
     for (const edit of sortedEdits) {
       const { range, newText } = edit;
@@ -1263,22 +1062,22 @@ export class NativeLspService {
       const endChar = range.end.character;
 
       // Get the affected lines
-      const startLineText = lines[startLine] ?? '';
-      const endLineText = lines[endLine] ?? '';
+      const startLineText = lines[startLine] ?? "";
+      const endLineText = lines[endLine] ?? "";
 
       // Build the new content
       const before = startLineText.slice(0, startChar);
       const after = endLineText.slice(endChar);
 
       // Replace the range with new text
-      const newLines = (before + newText + after).split('\n');
+      const newLines = (before + newText + after).split("\n");
 
       // Replace affected lines
       lines.splice(startLine, endLine - startLine + 1, ...newLines);
     }
 
     // Write back to file
-    fs.writeFileSync(filePath, lines.join('\n'), 'utf-8');
+    fs.writeFileSync(filePath, lines.join("\n"), "utf-8");
   }
 
   /**
@@ -1300,11 +1099,11 @@ export class NativeLspService {
       return false;
     }
     const message =
-      typeof response === 'string'
+      typeof response === "string"
         ? response
-        : typeof (response as Record<string, unknown>)['message'] === 'string'
-          ? ((response as Record<string, unknown>)['message'] as string)
-          : '';
-    return message.includes('No Project');
+        : typeof (response as Record<string, unknown>)["message"] === "string"
+          ? ((response as Record<string, unknown>)["message"] as string)
+          : "";
+    return message.includes("No Project");
   }
 }
diff --git a/packages/airiscode-core/src/lsp/__e2e__/lsp-e2e-test.ts b/packages/airiscode-core/src/lsp/__e2e__/lsp-e2e-test.ts
index 5a4149c9e..74d5c4080 100644
--- a/packages/airiscode-core/src/lsp/__e2e__/lsp-e2e-test.ts
+++ b/packages/airiscode-core/src/lsp/__e2e__/lsp-e2e-test.ts
@@ -23,10 +23,10 @@
  * Usage: npx tsx packages/core/src/lsp/__e2e__/lsp-e2e-test.ts
  */
 
-import { NativeLspService } from '../NativeLspService.js';
-import { EventEmitter } from 'events';
-import { pathToFileURL } from 'url';
-import * as path from 'path';
+import { EventEmitter } from "events";
+import * as path from "path";
+import { pathToFileURL } from "url";
+import { NativeLspService } from "../NativeLspService.js";
 
 /* ------------------------------------------------------------------ */
 /*  Helpers                                                           */
@@ -45,14 +45,9 @@ interface TestResult {
 
 const results: TestResult[] = [];
 
-function record(
-  method: string,
-  language: string,
-  passed: boolean,
-  detail: string,
-): void {
+function record(method: string, language: string, passed: boolean, detail: string): void {
   results.push({ method, language, passed, detail });
-  const icon = passed ? green('PASS') : red('FAIL');
+  const icon = passed ? green("PASS") : red("FAIL");
   console.log(`  [${icon}] ${language}/${method}: ${detail}`);
 }
 
@@ -121,7 +116,7 @@ function createService(workspaceRoot: string): NativeLspService {
     getDirectories: () => [workspaceRoot],
     isPathWithinWorkspace: () => true,
     fileExists: async () => false,
-    readFile: async () => '{}',
+    readFile: async () => "{}",
     resolvePath: (p: string) => path.resolve(workspaceRoot, p),
   };
   const fileDiscovery = {
@@ -143,15 +138,8 @@ function createService(workspaceRoot: string): NativeLspService {
 /*  Per-language test runner                                          */
 /* ------------------------------------------------------------------ */
 async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
-  const {
-    langName,
-    workspaceRoot,
-    positions,
-    indexWaitMs,
-    serverLimitedMethods,
-  } = cfg;
-  const isServerLimited = (method: string) =>
-    serverLimitedMethods?.has(method) ?? false;
+  const { langName, workspaceRoot, positions, indexWaitMs, serverLimitedMethods } = cfg;
+  const isServerLimited = (method: string) => serverLimitedMethods?.has(method) ?? false;
 
   console.log(bold(`\n=============== ${langName} ===============`));
   console.log(`  workspace : ${workspaceRoot}`);
@@ -167,19 +155,19 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
     const status = service.getStatus();
     const serverStatuses = Array.from(status.entries());
     if (serverStatuses.length === 0) {
-      record('startup', langName, false, 'No servers discovered');
+      record("startup", langName, false, "No servers discovered");
       return;
     }
     let anyReady = false;
     for (const [name, s] of serverStatuses) {
       console.log(`  Server "${name}": ${s}`);
-      if (s === 'READY') anyReady = true;
+      if (s === "READY") anyReady = true;
     }
     if (!anyReady) {
-      record('startup', langName, false, 'No server reached READY');
+      record("startup", langName, false, "No server reached READY");
       return;
     }
-    record('startup', langName, true, 'Server ready');
+    record("startup", langName, true, "Server ready");
 
     /* ---------- warmup: open main files via documentSymbols ---------- */
     // This triggers ensureDocumentOpen for each file, so the server starts
@@ -208,24 +196,15 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
 
     /* ---------- 1. hover ---------- */
     try {
-      const hoverLoc = loc(
-        positions.hover.file,
-        positions.hover.line,
-        positions.hover.char,
-      );
+      const hoverLoc = loc(positions.hover.file, positions.hover.line, positions.hover.char);
       const hover = await service.hover(hoverLoc);
       if (hover?.contents) {
-        record(
-          'hover',
-          langName,
-          true,
-          `"${hover.contents.substring(0, 100)}"`,
-        );
+        record("hover", langName, true, `"${hover.contents.substring(0, 100)}"`);
       } else {
-        record('hover', langName, false, 'Empty/null result');
+        record("hover", langName, false, "Empty/null result");
       }
     } catch (e: any) {
-      record('hover', langName, false, `Error: ${e.message}`);
+      record("hover", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 2. definitions ---------- */
@@ -237,13 +216,13 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
       );
       const defs = await service.definitions(defLoc);
       record(
-        'definitions',
+        "definitions",
         langName,
         defs.length > 0,
-        defs.length > 0 ? `${defs.length} def(s)` : 'Empty result',
+        defs.length > 0 ? `${defs.length} def(s)` : "Empty result",
       );
     } catch (e: any) {
-      record('definitions', langName, false, `Error: ${e.message}`);
+      record("definitions", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 3. references ---------- */
@@ -255,13 +234,13 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
       );
       const refs = await service.references(refLoc, undefined, true);
       record(
-        'references',
+        "references",
         langName,
         refs.length > 0,
-        refs.length > 0 ? `${refs.length} ref(s)` : 'Empty result',
+        refs.length > 0 ? `${refs.length} ref(s)` : "Empty result",
       );
     } catch (e: any) {
-      record('references', langName, false, `Error: ${e.message}`);
+      record("references", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 4. documentSymbols ---------- */
@@ -272,18 +251,13 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
         const names = symbols
           .slice(0, 5)
           .map((s) => s.name)
-          .join(', ');
-        record(
-          'documentSymbols',
-          langName,
-          true,
-          `${symbols.length} symbol(s): ${names}`,
-        );
+          .join(", ");
+        record("documentSymbols", langName, true, `${symbols.length} symbol(s): ${names}`);
       } else {
-        record('documentSymbols', langName, false, 'Empty result');
+        record("documentSymbols", langName, false, "Empty result");
       }
     } catch (e: any) {
-      record('documentSymbols', langName, false, `Error: ${e.message}`);
+      record("documentSymbols", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 5. workspaceSymbols ---------- */
@@ -293,18 +267,13 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
         const names = wsSymbols
           .slice(0, 5)
           .map((s) => s.name)
-          .join(', ');
-        record(
-          'workspaceSymbols',
-          langName,
-          true,
-          `${wsSymbols.length} symbol(s): ${names}`,
-        );
+          .join(", ");
+        record("workspaceSymbols", langName, true, `${wsSymbols.length} symbol(s): ${names}`);
       } else {
-        record('workspaceSymbols', langName, false, 'Empty result');
+        record("workspaceSymbols", langName, false, "Empty result");
       }
     } catch (e: any) {
-      record('workspaceSymbols', langName, false, `Error: ${e.message}`);
+      record("workspaceSymbols", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 6. implementations ---------- */
@@ -316,13 +285,13 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
       );
       const impls = await service.implementations(implLoc);
       record(
-        'implementations',
+        "implementations",
         langName,
         impls.length > 0,
-        impls.length > 0 ? `${impls.length} impl(s)` : 'Empty result',
+        impls.length > 0 ? `${impls.length} impl(s)` : "Empty result",
       );
     } catch (e: any) {
-      record('implementations', langName, false, `Error: ${e.message}`);
+      record("implementations", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 7/8/9. call hierarchy ---------- */
@@ -335,7 +304,7 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
       const callItems = await service.prepareCallHierarchy(callLoc);
       if (callItems.length > 0) {
         record(
-          'prepareCallHierarchy',
+          "prepareCallHierarchy",
           langName,
           true,
           `${callItems.length} item(s): ${callItems[0]!.name}`,
@@ -344,53 +313,41 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
         try {
           const incoming = await service.incomingCalls(callItems[0]!);
           record(
-            'incomingCalls',
+            "incomingCalls",
             langName,
             incoming.length > 0,
-            incoming.length > 0
-              ? `${incoming.length} caller(s)`
-              : 'Empty (no callers found)',
+            incoming.length > 0 ? `${incoming.length} caller(s)` : "Empty (no callers found)",
           );
         } catch (e: any) {
-          record('incomingCalls', langName, false, `Error: ${e.message}`);
+          record("incomingCalls", langName, false, `Error: ${e.message}`);
         }
 
         try {
           const outgoing = await service.outgoingCalls(callItems[0]!);
           if (outgoing.length > 0) {
+            record("outgoingCalls", langName, true, `${outgoing.length} callee(s)`);
+          } else if (isServerLimited("outgoingCalls")) {
             record(
-              'outgoingCalls',
+              "outgoingCalls",
               langName,
               true,
-              `${outgoing.length} callee(s)`,
-            );
-          } else if (isServerLimited('outgoingCalls')) {
-            record(
-              'outgoingCalls',
-              langName,
-              true,
-              'Empty (server does not implement this method)',
+              "Empty (server does not implement this method)",
             );
           } else {
-            record(
-              'outgoingCalls',
-              langName,
-              false,
-              'Empty (no callees found)',
-            );
+            record("outgoingCalls", langName, false, "Empty (no callees found)");
           }
         } catch (e: any) {
-          record('outgoingCalls', langName, false, `Error: ${e.message}`);
+          record("outgoingCalls", langName, false, `Error: ${e.message}`);
         }
       } else {
-        record('prepareCallHierarchy', langName, false, 'Empty result');
-        record('incomingCalls', langName, false, 'Skipped');
-        record('outgoingCalls', langName, false, 'Skipped');
+        record("prepareCallHierarchy", langName, false, "Empty result");
+        record("incomingCalls", langName, false, "Skipped");
+        record("outgoingCalls", langName, false, "Skipped");
       }
     } catch (e: any) {
-      record('prepareCallHierarchy', langName, false, `Error: ${e.message}`);
-      record('incomingCalls', langName, false, 'Skipped');
-      record('outgoingCalls', langName, false, 'Skipped');
+      record("prepareCallHierarchy", langName, false, `Error: ${e.message}`);
+      record("incomingCalls", langName, false, "Skipped");
+      record("outgoingCalls", langName, false, "Skipped");
     }
 
     /* ---------- 10. diagnostics ---------- */
@@ -398,9 +355,9 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
       const diagUri = pathToFileURL(positions.diagnosticsFile).toString();
       const diags = await service.diagnostics(diagUri);
       // 0 diagnostics is fine for clean code
-      record('diagnostics', langName, true, `${diags.length} diagnostic(s)`);
+      record("diagnostics", langName, true, `${diags.length} diagnostic(s)`);
     } catch (e: any) {
-      record('diagnostics', langName, false, `Error: ${e.message}`);
+      record("diagnostics", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 11. codeActions ---------- */
@@ -409,25 +366,20 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
       const actions = await service.codeActions(
         caUri,
         { start: { line: 0, character: 0 }, end: { line: 0, character: 10 } },
-        { diagnostics: [], triggerKind: 'invoked' as const },
+        { diagnostics: [], triggerKind: "invoked" as const },
       );
       // 0 actions is fine when there are no diagnostics
-      record('codeActions', langName, true, `${actions.length} action(s)`);
+      record("codeActions", langName, true, `${actions.length} action(s)`);
     } catch (e: any) {
-      record('codeActions', langName, false, `Error: ${e.message}`);
+      record("codeActions", langName, false, `Error: ${e.message}`);
     }
 
     /* ---------- 12. workspaceDiagnostics ---------- */
     try {
       const wsDiags = await service.workspaceDiagnostics();
-      record(
-        'workspaceDiagnostics',
-        langName,
-        true,
-        `${wsDiags.length} file(s) with diagnostics`,
-      );
+      record("workspaceDiagnostics", langName, true, `${wsDiags.length} file(s) with diagnostics`);
     } catch (e: any) {
-      record('workspaceDiagnostics', langName, false, `Error: ${e.message}`);
+      record("workspaceDiagnostics", langName, false, `Error: ${e.message}`);
     }
 
     await service.stop();
@@ -446,9 +398,9 @@ async function testLanguage(cfg: LanguageTestConfig): Promise<void> {
 /*  Language configs                                                   */
 /* ------------------------------------------------------------------ */
 
-const TS_ROOT = '/tmp/lsp-e2e-test/ts-project';
-const CPP_ROOT = '/tmp/lsp-e2e-test/cpp-project';
-const JAVA_ROOT = '/tmp/lsp-e2e-test/java-project';
+const TS_ROOT = "/tmp/lsp-e2e-test/ts-project";
+const CPP_ROOT = "/tmp/lsp-e2e-test/cpp-project";
+const JAVA_ROOT = "/tmp/lsp-e2e-test/java-project";
 
 /**
  * TypeScript positions (all in index.ts / math.ts):
@@ -466,7 +418,7 @@ const JAVA_ROOT = '/tmp/lsp-e2e-test/java-project';
  *   L15: export function createCalculator(): Calculator {
  */
 const tsConfig: LanguageTestConfig = {
-  langName: 'TypeScript',
+  langName: "TypeScript",
   workspaceRoot: TS_ROOT,
   indexWaitMs: 3000,
   positions: {
@@ -478,7 +430,7 @@ const tsConfig: LanguageTestConfig = {
     references: { file: `${TS_ROOT}/src/index.ts`, line: 2, char: 12 },
     // documentSymbols on math.ts (has interface, class, function)
     documentSymbolsFile: `${TS_ROOT}/src/math.ts`,
-    symbolQuery: 'Calculator',
+    symbolQuery: "Calculator",
     // implementations on `Calculator` interface → SimpleCalculator
     implementations: { file: `${TS_ROOT}/src/math.ts`, line: 0, char: 17 },
     // call hierarchy on `createCalculator` (called by index.ts, calls SimpleCalculator)
@@ -524,11 +476,11 @@ const tsConfig: LanguageTestConfig = {
  *   L2:  int Calculator::add(int a, int b) {
  */
 const cppConfig: LanguageTestConfig = {
-  langName: 'C++',
+  langName: "C++",
   workspaceRoot: CPP_ROOT,
   indexWaitMs: 5000,
   // clangd v19.x does not implement callHierarchy/outgoingCalls (returns -32601)
-  serverLimitedMethods: new Set(['outgoingCalls']),
+  serverLimitedMethods: new Set(["outgoingCalls"]),
   positions: {
     // hover on `Calculator` type at main.cpp L16:4 → class info
     hover: { file: `${CPP_ROOT}/src/main.cpp`, line: 16, char: 4 },
@@ -538,7 +490,7 @@ const cppConfig: LanguageTestConfig = {
     references: { file: `${CPP_ROOT}/src/calculator.h`, line: 4, char: 8 },
     // documentSymbols on main.cpp → addValues, subtractValues, computeSum, main
     documentSymbolsFile: `${CPP_ROOT}/src/main.cpp`,
-    symbolQuery: 'Calculator',
+    symbolQuery: "Calculator",
     // implementations on `Calculator` class at calculator.h L2:6
     // → should find AdvancedCalculator (derived class)
     implementations: { file: `${CPP_ROOT}/src/calculator.h`, line: 2, char: 6 },
@@ -578,7 +530,7 @@ const cppConfig: LanguageTestConfig = {
  *   L4:      public int add(int a, int b) {
  */
 const javaConfig: LanguageTestConfig = {
-  langName: 'Java',
+  langName: "Java",
   workspaceRoot: JAVA_ROOT,
   indexWaitMs: 20000,
   positions: {
@@ -602,7 +554,7 @@ const javaConfig: LanguageTestConfig = {
     },
     // documentSymbols on Main.java → Main class, computeSum, main
     documentSymbolsFile: `${JAVA_ROOT}/src/main/java/com/test/Main.java`,
-    symbolQuery: 'Calculator',
+    symbolQuery: "Calculator",
     // implementations on `Calculator` interface at Calculator.java L2:17
     implementations: {
       file: `${JAVA_ROOT}/src/main/java/com/test/Calculator.java`,
@@ -624,58 +576,53 @@ const javaConfig: LanguageTestConfig = {
 /*  Main                                                              */
 /* ------------------------------------------------------------------ */
 async function main(): Promise<void> {
-  console.log(bold('LSP End-to-End Test Suite'));
-  console.log(
-    'Verifying all 12 LSP methods with real servers (TS / C++ / Java)\n',
-  );
+  console.log(bold("LSP End-to-End Test Suite"));
+  console.log("Verifying all 12 LSP methods with real servers (TS / C++ / Java)\n");
 
   await testLanguage(tsConfig);
   await testLanguage(cppConfig);
   await testLanguage(javaConfig);
 
   /* ---------- Summary ---------- */
-  console.log(bold('\n================== Summary =================='));
+  console.log(bold("\n================== Summary =================="));
   const passed = results.filter((r) => r.passed).length;
   const failed = results.filter((r) => !r.passed).length;
   console.log(
     `Total: ${results.length} | ${green(`Passed: ${passed}`)} | ${red(`Failed: ${failed}`)}`,
   );
 
-  console.log(bold('\nPer Language:'));
-  for (const lang of ['TypeScript', 'C++', 'Java']) {
+  console.log(bold("\nPer Language:"));
+  for (const lang of ["TypeScript", "C++", "Java"]) {
     const lr = results.filter((r) => r.language === lang);
     const lp = lr.filter((r) => r.passed).length;
-    const icon =
-      lp === lr.length ? green('ALL PASS') : yellow(`${lp}/${lr.length}`);
+    const icon = lp === lr.length ? green("ALL PASS") : yellow(`${lp}/${lr.length}`);
     console.log(`  ${lang}: ${icon}`);
   }
 
-  console.log(bold('\nPer Method:'));
+  console.log(bold("\nPer Method:"));
   const methods = [
-    'startup',
-    'hover',
-    'definitions',
-    'references',
-    'documentSymbols',
-    'workspaceSymbols',
-    'implementations',
-    'prepareCallHierarchy',
-    'incomingCalls',
-    'outgoingCalls',
-    'diagnostics',
-    'codeActions',
-    'workspaceDiagnostics',
+    "startup",
+    "hover",
+    "definitions",
+    "references",
+    "documentSymbols",
+    "workspaceSymbols",
+    "implementations",
+    "prepareCallHierarchy",
+    "incomingCalls",
+    "outgoingCalls",
+    "diagnostics",
+    "codeActions",
+    "workspaceDiagnostics",
   ];
   for (const m of methods) {
     const mr = results.filter((r) => r.method === m);
-    const langs = mr
-      .map((r) => (r.passed ? green(r.language) : red(r.language)))
-      .join(' | ');
+    const langs = mr.map((r) => (r.passed ? green(r.language) : red(r.language))).join(" | ");
     console.log(`  ${m}: ${langs}`);
   }
 
   if (failed > 0) {
-    console.log(yellow('\nFailed tests:'));
+    console.log(yellow("\nFailed tests:"));
     for (const r of results.filter((rr) => !rr.passed)) {
       console.log(red(`  ${r.language}/${r.method}: ${r.detail}`));
     }
diff --git a/packages/airiscode-core/src/lsp/constants.ts b/packages/airiscode-core/src/lsp/constants.ts
index aa70435a0..a7c7b9bee 100644
--- a/packages/airiscode-core/src/lsp/constants.ts
+++ b/packages/airiscode-core/src/lsp/constants.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { LspCodeActionKind, LspDiagnosticSeverity } from './types.js';
+import type { LspCodeActionKind, LspDiagnosticSeverity } from "./types.js";
 
 // ============================================================================
 // Timeout Constants
@@ -61,57 +61,56 @@ export const DEFAULT_LSP_SOCKET_MAX_RETRY_DELAY_MS = 1000;
  * https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#symbolKind
  */
 export const SYMBOL_KIND_LABELS: Record<number, string> = {
-  1: 'File',
-  2: 'Module',
-  3: 'Namespace',
-  4: 'Package',
-  5: 'Class',
-  6: 'Method',
-  7: 'Property',
-  8: 'Field',
-  9: 'Constructor',
-  10: 'Enum',
-  11: 'Interface',
-  12: 'Function',
-  13: 'Variable',
-  14: 'Constant',
-  15: 'String',
-  16: 'Number',
-  17: 'Boolean',
-  18: 'Array',
-  19: 'Object',
-  20: 'Key',
-  21: 'Null',
-  22: 'EnumMember',
-  23: 'Struct',
-  24: 'Event',
-  25: 'Operator',
-  26: 'TypeParameter',
+  1: "File",
+  2: "Module",
+  3: "Namespace",
+  4: "Package",
+  5: "Class",
+  6: "Method",
+  7: "Property",
+  8: "Field",
+  9: "Constructor",
+  10: "Enum",
+  11: "Interface",
+  12: "Function",
+  13: "Variable",
+  14: "Constant",
+  15: "String",
+  16: "Number",
+  17: "Boolean",
+  18: "Array",
+  19: "Object",
+  20: "Key",
+  21: "Null",
+  22: "EnumMember",
+  23: "Struct",
+  24: "Event",
+  25: "Operator",
+  26: "TypeParameter",
 };
 
 /**
  * Diagnostic severity labels for converting numeric LSP DiagnosticSeverity to readable strings.
  * Based on the LSP specification.
  */
-export const DIAGNOSTIC_SEVERITY_LABELS: Record<number, LspDiagnosticSeverity> =
-  {
-    1: 'error',
-    2: 'warning',
-    3: 'information',
-    4: 'hint',
-  };
+export const DIAGNOSTIC_SEVERITY_LABELS: Record<number, LspDiagnosticSeverity> = {
+  1: "error",
+  2: "warning",
+  3: "information",
+  4: "hint",
+};
 
 /**
  * Code action kind labels from LSP specification.
  */
 export const CODE_ACTION_KIND_LABELS: Record<string, LspCodeActionKind> = {
-  '': 'quickfix',
-  quickfix: 'quickfix',
-  refactor: 'refactor',
-  'refactor.extract': 'refactor.extract',
-  'refactor.inline': 'refactor.inline',
-  'refactor.rewrite': 'refactor.rewrite',
-  source: 'source',
-  'source.organizeImports': 'source.organizeImports',
-  'source.fixAll': 'source.fixAll',
+  "": "quickfix",
+  quickfix: "quickfix",
+  refactor: "refactor",
+  "refactor.extract": "refactor.extract",
+  "refactor.inline": "refactor.inline",
+  "refactor.rewrite": "refactor.rewrite",
+  source: "source",
+  "source.organizeImports": "source.organizeImports",
+  "source.fixAll": "source.fixAll",
 };
diff --git a/packages/airiscode-core/src/lsp/types.ts b/packages/airiscode-core/src/lsp/types.ts
index f7806fe12..d102afb39 100644
--- a/packages/airiscode-core/src/lsp/types.ts
+++ b/packages/airiscode-core/src/lsp/types.ts
@@ -98,11 +98,7 @@ export interface LspCallHierarchyOutgoingCall {
 /**
  * Diagnostic severity levels from LSP specification.
  */
-export type LspDiagnosticSeverity =
-  | 'error'
-  | 'warning'
-  | 'information'
-  | 'hint';
+export type LspDiagnosticSeverity = "error" | "warning" | "information" | "hint";
 
 /**
  * A diagnostic message from a language server.
@@ -129,7 +125,7 @@ export interface LspDiagnostic {
 /**
  * Diagnostic tags from LSP specification.
  */
-export type LspDiagnosticTag = 'unnecessary' | 'deprecated';
+export type LspDiagnosticTag = "unnecessary" | "deprecated";
 
 /**
  * Related diagnostic information.
@@ -179,14 +175,14 @@ export interface LspCodeAction {
  * Code action kinds from LSP specification.
  */
 export type LspCodeActionKind =
-  | 'quickfix'
-  | 'refactor'
-  | 'refactor.extract'
-  | 'refactor.inline'
-  | 'refactor.rewrite'
-  | 'source'
-  | 'source.organizeImports'
-  | 'source.fixAll'
+  | "quickfix"
+  | "refactor"
+  | "refactor.extract"
+  | "refactor.inline"
+  | "refactor.rewrite"
+  | "source"
+  | "source.organizeImports"
+  | "source.fixAll"
   | string;
 
 /**
@@ -243,25 +239,19 @@ export interface LspCodeActionContext {
   /** Requested kinds of code actions to return. */
   only?: LspCodeActionKind[];
   /** The reason why code actions were requested. */
-  triggerKind?: 'invoked' | 'automatic';
+  triggerKind?: "invoked" | "automatic";
 }
 
 export interface LspClient {
   /**
    * Search for symbols across the workspace.
    */
-  workspaceSymbols(
-    query: string,
-    limit?: number,
-  ): Promise<LspSymbolInformation[]>;
+  workspaceSymbols(query: string, limit?: number): Promise<LspSymbolInformation[]>;
 
   /**
    * Get hover information (documentation, type info) for a symbol.
    */
-  hover(
-    location: LspLocation,
-    serverName?: string,
-  ): Promise<LspHoverResult | null>;
+  hover(location: LspLocation, serverName?: string): Promise<LspHoverResult | null>;
 
   /**
    * Get all symbols in a document.
@@ -275,11 +265,7 @@ export interface LspClient {
   /**
    * Find where a symbol is defined.
    */
-  definitions(
-    location: LspLocation,
-    serverName?: string,
-    limit?: number,
-  ): Promise<LspDefinition[]>;
+  definitions(location: LspLocation, serverName?: string, limit?: number): Promise<LspDefinition[]>;
 
   /**
    * Find implementations of an interface or abstract method.
@@ -335,10 +321,7 @@ export interface LspClient {
   /**
    * Get diagnostics for all open documents in the workspace.
    */
-  workspaceDiagnostics(
-    serverName?: string,
-    limit?: number,
-  ): Promise<LspFileDiagnostics[]>;
+  workspaceDiagnostics(serverName?: string, limit?: number): Promise<LspFileDiagnostics[]>;
 
   /**
    * Get code actions available at a specific location.
@@ -354,17 +337,14 @@ export interface LspClient {
   /**
    * Apply a workspace edit (from code action or other sources).
    */
-  applyWorkspaceEdit(
-    edit: LspWorkspaceEdit,
-    serverName?: string,
-  ): Promise<boolean>;
+  applyWorkspaceEdit(edit: LspWorkspaceEdit, serverName?: string): Promise<boolean>;
 }
 
 // ============================================================================
 // LSP Service Types (migrated from cli)
 // ============================================================================
 
-import type { ChildProcess } from 'node:child_process';
+import type { ChildProcess } from "node:child_process";
 
 /**
  * LSP server initialization options passed during the initialize request.
@@ -398,7 +378,7 @@ export interface LspServerConfig {
   /** Command line arguments */
   args?: string[];
   /** Transport type: stdio, tcp, or socket */
-  transport: 'stdio' | 'tcp' | 'socket';
+  transport: "stdio" | "tcp" | "socket";
   /** Environment variables for the server process */
   env?: Record<string, string>;
   /** LSP initialization options */
@@ -466,11 +446,7 @@ export interface LspConnectionInterface {
 /**
  * Status of an LSP server instance.
  */
-export type LspServerStatus =
-  | 'NOT_STARTED'
-  | 'IN_PROGRESS'
-  | 'READY'
-  | 'FAILED';
+export type LspServerStatus = "NOT_STARTED" | "IN_PROGRESS" | "READY" | "FAILED";
 
 /**
  * Handle for managing an LSP server instance.
diff --git a/packages/airiscode-core/src/mcp/constants.ts b/packages/airiscode-core/src/mcp/constants.ts
index f274eda96..8b777ba92 100644
--- a/packages/airiscode-core/src/mcp/constants.ts
+++ b/packages/airiscode-core/src/mcp/constants.ts
@@ -8,13 +8,12 @@
  * OAuth client name used for MCP dynamic client registration.
  * This name must match the allowlist on MCP servers like Figma.
  */
-export const MCP_OAUTH_CLIENT_NAME = 'AIRIS Code MCP Client';
+export const MCP_OAUTH_CLIENT_NAME = "AIRIS Code MCP Client";
 
 /**
  * OAuth client name for service account impersonation provider.
  */
-export const MCP_SA_IMPERSONATION_CLIENT_NAME =
-  'AIRIS Code (Service Account Impersonation)';
+export const MCP_SA_IMPERSONATION_CLIENT_NAME = "AIRIS Code (Service Account Impersonation)";
 
 /**
  * Port for OAuth redirect callback server.
@@ -24,4 +23,4 @@ export const OAUTH_REDIRECT_PORT = 7777;
 /**
  * Path for OAuth redirect callback.
  */
-export const OAUTH_REDIRECT_PATH = '/oauth/callback';
+export const OAUTH_REDIRECT_PATH = "/oauth/callback";
diff --git a/packages/airiscode-core/src/mcp/oauth-provider.ts b/packages/airiscode-core/src/mcp/oauth-provider.ts
index 8ec6e2d83..1280ef750 100644
--- a/packages/airiscode-core/src/mcp/oauth-provider.ts
+++ b/packages/airiscode-core/src/mcp/oauth-provider.ts
@@ -4,23 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as http from 'node:http';
-import * as crypto from 'node:crypto';
-import { URL } from 'node:url';
-import type { EventEmitter } from 'node:events';
-import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
-import type { OAuthToken } from './token-storage/types.js';
-import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { OAuthUtils } from './oauth-utils.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import {
-  MCP_OAUTH_CLIENT_NAME,
-  OAUTH_REDIRECT_PORT,
-  OAUTH_REDIRECT_PATH,
-} from './constants.js';
-
-export const OAUTH_DISPLAY_MESSAGE_EVENT = 'oauth-display-message' as const;
+import * as crypto from "node:crypto";
+import type { EventEmitter } from "node:events";
+import * as http from "node:http";
+import { URL } from "node:url";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { openBrowserSecurely } from "../utils/secure-browser-launcher.js";
+import { MCP_OAUTH_CLIENT_NAME, OAUTH_REDIRECT_PATH, OAUTH_REDIRECT_PORT } from "./constants.js";
+import { MCPOAuthTokenStorage } from "./oauth-token-storage.js";
+import { OAuthUtils } from "./oauth-utils.js";
+import type { OAuthToken } from "./token-storage/types.js";
+
+export const OAUTH_DISPLAY_MESSAGE_EVENT = "oauth-display-message" as const;
 
 /**
  * Structured display message for i18n support.
@@ -35,7 +31,7 @@ export interface OAuthDisplayMessage {
 /** Payload type for OAuth display message events: structured i18n message or plain string. */
 export type OAuthDisplayPayload = string | OAuthDisplayMessage;
 
-const debugLogger = createDebugLogger('MCP_OAUTH');
+const debugLogger = createDebugLogger("MCP_OAUTH");
 
 // Module-level reference to the active OAuth callback server.
 // This ensures that if a new authentication is started before the previous one
@@ -141,23 +137,22 @@ export class MCPOAuthProvider {
     config: MCPOAuthConfig,
   ): Promise<OAuthClientRegistrationResponse> {
     const redirectUri =
-      config.redirectUri ||
-      `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
+      config.redirectUri || `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
 
     const registrationRequest: OAuthClientRegistrationRequest = {
       client_name: MCP_OAUTH_CLIENT_NAME,
       redirect_uris: [redirectUri],
-      grant_types: ['authorization_code', 'refresh_token'],
-      response_types: ['code'],
-      token_endpoint_auth_method: 'none', // Public client
-      code_challenge_method: ['S256'],
-      scope: config.scopes?.join(' ') || '',
+      grant_types: ["authorization_code", "refresh_token"],
+      response_types: ["code"],
+      token_endpoint_auth_method: "none", // Public client
+      code_challenge_method: ["S256"],
+      scope: config.scopes?.join(" ") || "",
     };
 
     const response = await fetch(registrationUrl, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       body: JSON.stringify(registrationRequest),
     });
@@ -178,9 +173,7 @@ export class MCPOAuthProvider {
    * @param mcpServerUrl The MCP server URL
    * @returns OAuth configuration if discovered, null otherwise
    */
-  private async discoverOAuthFromMCPServer(
-    mcpServerUrl: string,
-  ): Promise<MCPOAuthConfig | null> {
+  private async discoverOAuthFromMCPServer(mcpServerUrl: string): Promise<MCPOAuthConfig | null> {
     // Use the full URL with path preserved for OAuth discovery
     return OAuthUtils.discoverOAuthConfig(mcpServerUrl);
   }
@@ -192,16 +185,13 @@ export class MCPOAuthProvider {
    */
   private generatePKCEParams(): PKCEParams {
     // Generate code verifier (43-128 characters)
-    const codeVerifier = crypto.randomBytes(32).toString('base64url');
+    const codeVerifier = crypto.randomBytes(32).toString("base64url");
 
     // Generate code challenge using SHA256
-    const codeChallenge = crypto
-      .createHash('sha256')
-      .update(codeVerifier)
-      .digest('base64url');
+    const codeChallenge = crypto.createHash("sha256").update(codeVerifier).digest("base64url");
 
     // Generate state for CSRF protection
-    const state = crypto.randomBytes(16).toString('base64url');
+    const state = crypto.randomBytes(16).toString("base64url");
 
     return { codeVerifier, codeChallenge, state };
   }
@@ -212,9 +202,7 @@ export class MCPOAuthProvider {
    * @param expectedState The state parameter to validate
    * @returns Promise that resolves with the authorization code
    */
-  private async startCallbackServer(
-    expectedState: string,
-  ): Promise<OAuthAuthorizationResponse> {
+  private async startCallbackServer(expectedState: string): Promise<OAuthAuthorizationResponse> {
     // Close any previously active callback server to avoid EADDRINUSE
     if (activeCallbackServer) {
       try {
@@ -233,29 +221,26 @@ export class MCPOAuthProvider {
       const server = http.createServer(
         async (req: http.IncomingMessage, res: http.ServerResponse) => {
           try {
-            const url = new URL(
-              req.url!,
-              `http://localhost:${OAUTH_REDIRECT_PORT}`,
-            );
+            const url = new URL(req.url!, `http://localhost:${OAUTH_REDIRECT_PORT}`);
 
             if (url.pathname !== OAUTH_REDIRECT_PATH) {
               res.writeHead(404);
-              res.end('Not found');
+              res.end("Not found");
               return;
             }
 
-            const code = url.searchParams.get('code');
-            const state = url.searchParams.get('state');
-            const error = url.searchParams.get('error');
+            const code = url.searchParams.get("code");
+            const state = url.searchParams.get("state");
+            const error = url.searchParams.get("error");
 
             if (error) {
-              res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
+              res.writeHead(HTTP_OK, { "Content-Type": "text/html" });
               res.end(`
               <html>
                 <body>
                   <h1>Authentication Failed</h1>
-                  <p>Error: ${(error as string).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p>
-                  <p>${((url.searchParams.get('error_description') || '') as string).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p>
+                  <p>Error: ${(error as string).replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p>
+                  <p>${((url.searchParams.get("error_description") || "") as string).replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p>
                   <p>You can close this window.</p>
                 </body>
               </html>
@@ -272,25 +257,25 @@ export class MCPOAuthProvider {
 
             if (!code || !state) {
               res.writeHead(400);
-              res.end('Missing code or state parameter');
+              res.end("Missing code or state parameter");
               return;
             }
 
             if (state !== expectedState) {
               res.writeHead(400);
-              res.end('Invalid state parameter');
+              res.end("Invalid state parameter");
               activeCallbackServer = null;
               if (activeCallbackTimeout) {
                 clearTimeout(activeCallbackTimeout);
                 activeCallbackTimeout = null;
               }
               server.close();
-              reject(new Error('State mismatch - possible CSRF attack'));
+              reject(new Error("State mismatch - possible CSRF attack"));
               return;
             }
 
             // Send success response to browser
-            res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
+            res.writeHead(HTTP_OK, { "Content-Type": "text/html" });
             res.end(`
             <html>
               <body>
@@ -320,11 +305,9 @@ export class MCPOAuthProvider {
         },
       );
 
-      server.on('error', reject);
+      server.on("error", reject);
       server.listen(OAUTH_REDIRECT_PORT, () => {
-        debugLogger.debug(
-          `OAuth callback server listening on port ${OAUTH_REDIRECT_PORT}`,
-        );
+        debugLogger.debug(`OAuth callback server listening on port ${OAUTH_REDIRECT_PORT}`);
       });
 
       // Track the active server so it can be cleaned up if a new auth starts
@@ -336,7 +319,7 @@ export class MCPOAuthProvider {
           activeCallbackServer = null;
           activeCallbackTimeout = null;
           server.close();
-          reject(new Error('OAuth callback timeout'));
+          reject(new Error("OAuth callback timeout"));
         },
         5 * 60 * 1000,
       );
@@ -357,38 +340,32 @@ export class MCPOAuthProvider {
     mcpServerUrl?: string,
   ): string {
     const redirectUri =
-      config.redirectUri ||
-      `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
+      config.redirectUri || `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
 
     const params = new URLSearchParams({
       client_id: config.clientId!,
-      response_type: 'code',
+      response_type: "code",
       redirect_uri: redirectUri,
       state: pkceParams.state,
       code_challenge: pkceParams.codeChallenge,
-      code_challenge_method: 'S256',
+      code_challenge_method: "S256",
     });
 
     if (config.scopes && config.scopes.length > 0) {
-      params.append('scope', config.scopes.join(' '));
+      params.append("scope", config.scopes.join(" "));
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
     // Only add if we have an MCP server URL (indicates MCP OAuth flow, not standard OAuth)
     if (mcpServerUrl) {
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(mcpServerUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
@@ -415,11 +392,10 @@ export class MCPOAuthProvider {
     mcpServerUrl?: string,
   ): Promise<OAuthTokenResponse> {
     const redirectUri =
-      config.redirectUri ||
-      `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
+      config.redirectUri || `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
 
     const params = new URLSearchParams({
-      grant_type: 'authorization_code',
+      grant_type: "authorization_code",
       code,
       redirect_uri: redirectUri,
       code_verifier: codeVerifier,
@@ -427,11 +403,11 @@ export class MCPOAuthProvider {
     });
 
     if (config.clientSecret) {
-      params.append('client_secret', config.clientSecret);
+      params.append("client_secret", config.clientSecret);
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
@@ -439,52 +415,46 @@ export class MCPOAuthProvider {
     if (mcpServerUrl) {
       const resourceUrl = mcpServerUrl;
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(resourceUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(resourceUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
     const response = await fetch(config.tokenUrl!, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json, application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json, application/x-www-form-urlencoded",
       },
       body: params.toString(),
     });
 
     const responseText = await response.text();
-    const contentType = response.headers.get('content-type') || '';
+    const contentType = response.headers.get("content-type") || "";
 
     if (!response.ok) {
       // Try to parse error from form-urlencoded response
       let errorMessage: string | null = null;
       try {
         const errorParams = new URLSearchParams(responseText);
-        const error = errorParams.get('error');
-        const errorDescription = errorParams.get('error_description');
+        const error = errorParams.get("error");
+        const errorDescription = errorParams.get("error_description");
         if (error) {
-          errorMessage = `Token exchange failed: ${error} - ${errorDescription || 'No description'}`;
+          errorMessage = `Token exchange failed: ${error} - ${errorDescription || "No description"}`;
         }
       } catch {
         // Fall back to raw error
       }
       throw new Error(
-        errorMessage ||
-          `Token exchange failed: ${response.status} - ${responseText}`,
+        errorMessage || `Token exchange failed: ${response.status} - ${responseText}`,
       );
     }
 
     // Log unexpected content types for debugging
     if (
-      !contentType.includes('application/json') &&
-      !contentType.includes('application/x-www-form-urlencoded')
+      !contentType.includes("application/json") &&
+      !contentType.includes("application/x-www-form-urlencoded")
     ) {
       debugLogger.warn(
         `Token endpoint returned unexpected content-type: ${contentType}. ` +
@@ -499,18 +469,18 @@ export class MCPOAuthProvider {
     } catch {
       // Parse form-urlencoded response
       const tokenParams = new URLSearchParams(responseText);
-      const accessToken = tokenParams.get('access_token');
-      const tokenType = tokenParams.get('token_type') || 'Bearer';
-      const expiresIn = tokenParams.get('expires_in');
-      const refreshToken = tokenParams.get('refresh_token');
-      const scope = tokenParams.get('scope');
+      const accessToken = tokenParams.get("access_token");
+      const tokenType = tokenParams.get("token_type") || "Bearer";
+      const expiresIn = tokenParams.get("expires_in");
+      const refreshToken = tokenParams.get("refresh_token");
+      const scope = tokenParams.get("scope");
 
       if (!accessToken) {
         // Check for error in response
-        const error = tokenParams.get('error');
-        const errorDescription = tokenParams.get('error_description');
+        const error = tokenParams.get("error");
+        const errorDescription = tokenParams.get("error_description");
         throw new Error(
-          `Token exchange failed: ${error || 'no_access_token'} - ${errorDescription || responseText}`,
+          `Token exchange failed: ${error || "no_access_token"} - ${errorDescription || responseText}`,
         );
       }
 
@@ -540,73 +510,65 @@ export class MCPOAuthProvider {
     mcpServerUrl?: string,
   ): Promise<OAuthTokenResponse> {
     const params = new URLSearchParams({
-      grant_type: 'refresh_token',
+      grant_type: "refresh_token",
       refresh_token: refreshToken,
       client_id: config.clientId!,
     });
 
     if (config.clientSecret) {
-      params.append('client_secret', config.clientSecret);
+      params.append("client_secret", config.clientSecret);
     }
 
     if (config.scopes && config.scopes.length > 0) {
-      params.append('scope', config.scopes.join(' '));
+      params.append("scope", config.scopes.join(" "));
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
     // Only add if we have an MCP server URL (indicates MCP OAuth flow, not standard OAuth)
     if (mcpServerUrl) {
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(mcpServerUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
     const response = await fetch(tokenUrl, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json, application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json, application/x-www-form-urlencoded",
       },
       body: params.toString(),
     });
 
     const responseText = await response.text();
-    const contentType = response.headers.get('content-type') || '';
+    const contentType = response.headers.get("content-type") || "";
 
     if (!response.ok) {
       // Try to parse error from form-urlencoded response
       let errorMessage: string | null = null;
       try {
         const errorParams = new URLSearchParams(responseText);
-        const error = errorParams.get('error');
-        const errorDescription = errorParams.get('error_description');
+        const error = errorParams.get("error");
+        const errorDescription = errorParams.get("error_description");
         if (error) {
-          errorMessage = `Token refresh failed: ${error} - ${errorDescription || 'No description'}`;
+          errorMessage = `Token refresh failed: ${error} - ${errorDescription || "No description"}`;
         }
       } catch {
         // Fall back to raw error
       }
-      throw new Error(
-        errorMessage ||
-          `Token refresh failed: ${response.status} - ${responseText}`,
-      );
+      throw new Error(errorMessage || `Token refresh failed: ${response.status} - ${responseText}`);
     }
 
     // Log unexpected content types for debugging
     if (
-      !contentType.includes('application/json') &&
-      !contentType.includes('application/x-www-form-urlencoded')
+      !contentType.includes("application/json") &&
+      !contentType.includes("application/x-www-form-urlencoded")
     ) {
       debugLogger.warn(
         `Token refresh endpoint returned unexpected content-type: ${contentType}. ` +
@@ -621,18 +583,18 @@ export class MCPOAuthProvider {
     } catch {
       // Parse form-urlencoded response
       const tokenParams = new URLSearchParams(responseText);
-      const accessToken = tokenParams.get('access_token');
-      const tokenType = tokenParams.get('token_type') || 'Bearer';
-      const expiresIn = tokenParams.get('expires_in');
-      const refreshToken = tokenParams.get('refresh_token');
-      const scope = tokenParams.get('scope');
+      const accessToken = tokenParams.get("access_token");
+      const tokenType = tokenParams.get("token_type") || "Bearer";
+      const expiresIn = tokenParams.get("expires_in");
+      const refreshToken = tokenParams.get("refresh_token");
+      const scope = tokenParams.get("scope");
 
       if (!accessToken) {
         // Check for error in response
-        const error = tokenParams.get('error');
-        const errorDescription = tokenParams.get('error_description');
+        const error = tokenParams.get("error");
+        const errorDescription = tokenParams.get("error_description");
         throw new Error(
-          `Token refresh failed: ${error || 'unknown_error'} - ${errorDescription || responseText}`,
+          `Token refresh failed: ${error || "unknown_error"} - ${errorDescription || responseText}`,
         );
       }
 
@@ -666,11 +628,11 @@ export class MCPOAuthProvider {
       if (events) {
         events.emit(OAUTH_DISPLAY_MESSAGE_EVENT, message);
       } else {
-        if (typeof message === 'string') {
+        if (typeof message === "string") {
           debugLogger.info(message);
         } else {
           debugLogger.info(
-            `[${message.key}]${message.params ? ` ${JSON.stringify(message.params)}` : ''}`,
+            `[${message.key}]${message.params ? ` ${JSON.stringify(message.params)}` : ""}`,
           );
         }
       }
@@ -684,22 +646,20 @@ export class MCPOAuthProvider {
       // First check if the server requires authentication via WWW-Authenticate header
       try {
         const headers: HeadersInit = OAuthUtils.isSSEEndpoint(mcpServerUrl)
-          ? { Accept: 'text/event-stream' }
-          : { Accept: 'application/json' };
+          ? { Accept: "text/event-stream" }
+          : { Accept: "application/json" };
 
         const response = await fetch(mcpServerUrl, {
-          method: 'HEAD',
+          method: "HEAD",
           headers,
         });
 
         if (response.status === 401 || response.status === 307) {
-          const wwwAuthenticate = response.headers.get('www-authenticate');
+          const wwwAuthenticate = response.headers.get("www-authenticate");
 
           if (wwwAuthenticate) {
             const discoveredConfig =
-              await OAuthUtils.discoverOAuthFromWWWAuthenticate(
-                wwwAuthenticate,
-              );
+              await OAuthUtils.discoverOAuthFromWWWAuthenticate(wwwAuthenticate);
             if (discoveredConfig) {
               // Merge discovered config with existing config, preserving clientId and clientSecret
               config = {
@@ -722,8 +682,7 @@ export class MCPOAuthProvider {
 
       // If we still don't have OAuth config, try the standard discovery
       if (!config.authorizationUrl) {
-        const discoveredConfig =
-          await this.discoverOAuthFromMCPServer(mcpServerUrl);
+        const discoveredConfig = await this.discoverOAuthFromMCPServer(mcpServerUrl);
         if (discoveredConfig) {
           // Merge discovered config with existing config, preserving clientId and clientSecret
           config = {
@@ -737,9 +696,7 @@ export class MCPOAuthProvider {
             clientSecret: config.clientSecret,
           };
         } else {
-          throw new Error(
-            'Failed to discover OAuth configuration from MCP server',
-          );
+          throw new Error("Failed to discover OAuth configuration from MCP server");
         }
       }
     }
@@ -752,71 +709,55 @@ export class MCPOAuthProvider {
       if (!registrationUrl) {
         // Extract server URL from authorization URL
         if (!config.authorizationUrl) {
-          throw new Error(
-            'Cannot perform dynamic registration without authorization URL',
-          );
+          throw new Error("Cannot perform dynamic registration without authorization URL");
         }
 
         const authUrl = new URL(config.authorizationUrl);
         const serverUrl = `${authUrl.protocol}//${authUrl.host}`;
 
-        debugLogger.debug('→ Attempting dynamic client registration...');
+        debugLogger.debug("→ Attempting dynamic client registration...");
 
         // Get the authorization server metadata for registration
-        const authServerMetadata =
-          await OAuthUtils.discoverAuthorizationServerMetadata(serverUrl);
+        const authServerMetadata = await OAuthUtils.discoverAuthorizationServerMetadata(serverUrl);
 
         if (!authServerMetadata) {
-          throw new Error(
-            'Failed to fetch authorization server metadata for client registration',
-          );
+          throw new Error("Failed to fetch authorization server metadata for client registration");
         }
         registrationUrl = authServerMetadata.registration_endpoint;
       }
 
       // Register client if registration endpoint is available
       if (registrationUrl) {
-        const clientRegistration = await this.registerClient(
-          registrationUrl,
-          config,
-        );
+        const clientRegistration = await this.registerClient(registrationUrl, config);
 
         config.clientId = clientRegistration.client_id;
         if (clientRegistration.client_secret) {
           config.clientSecret = clientRegistration.client_secret;
         }
 
-        debugLogger.debug('✓ Dynamic client registration successful');
+        debugLogger.debug("✓ Dynamic client registration successful");
       } else {
-        throw new Error(
-          'No client ID provided and dynamic registration not supported',
-        );
+        throw new Error("No client ID provided and dynamic registration not supported");
       }
     }
 
     // Validate configuration
     if (!config.clientId || !config.authorizationUrl || !config.tokenUrl) {
-      throw new Error(
-        'Missing required OAuth configuration after discovery and registration',
-      );
+      throw new Error("Missing required OAuth configuration after discovery and registration");
     }
 
     // Generate PKCE parameters
     const pkceParams = this.generatePKCEParams();
 
     // Build authorization URL
-    const authUrl = this.buildAuthorizationUrl(
-      config,
-      pkceParams,
-      mcpServerUrl,
-    );
+    const authUrl = this.buildAuthorizationUrl(config, pkceParams, mcpServerUrl);
 
     displayMessage({
-      key: 'If the browser does not open, copy and paste this URL into your browser:',
+      key: "If the browser does not open, copy and paste this URL into your browser:",
     });
     displayMessage(`\n${authUrl.toString()}\n`);
     displayMessage({
-      key: 'Make sure to copy the COMPLETE URL - it may wrap across multiple lines.',
+      key: "Make sure to copy the COMPLETE URL - it may wrap across multiple lines.",
     });
 
     // Start callback server
@@ -826,17 +767,13 @@ export class MCPOAuthProvider {
     try {
       await openBrowserSecurely(authUrl);
     } catch (error) {
-      debugLogger.warn(
-        `Failed to open browser automatically: ${getErrorMessage(error)}`,
-      );
+      debugLogger.warn(`Failed to open browser automatically: ${getErrorMessage(error)}`);
     }
 
     // Wait for callback
     const { code } = await callbackPromise;
 
-    debugLogger.debug(
-      '✓ Authorization code received, exchanging for tokens...',
-    );
+    debugLogger.debug("✓ Authorization code received, exchanging for tokens...");
 
     // Exchange code for tokens
     const tokenResponse = await this.exchangeCodeForToken(
@@ -848,12 +785,12 @@ export class MCPOAuthProvider {
 
     // Convert to our token format
     if (!tokenResponse.access_token) {
-      throw new Error('No access token received from token endpoint');
+      throw new Error("No access token received from token endpoint");
     }
 
     const token: OAuthToken = {
       accessToken: tokenResponse.access_token,
-      tokenType: tokenResponse.token_type || 'Bearer',
+      tokenType: tokenResponse.token_type || "Bearer",
       refreshToken: tokenResponse.refresh_token,
       scope: tokenResponse.scope,
     };
@@ -871,24 +808,20 @@ export class MCPOAuthProvider {
         config.tokenUrl,
         mcpServerUrl,
       );
-      debugLogger.debug('✓ Authentication successful! Token saved.');
+      debugLogger.debug("✓ Authentication successful! Token saved.");
 
       // Verify token was saved
       const savedToken = await this.tokenStorage.getCredentials(serverName);
       if (savedToken && savedToken.token && savedToken.token.accessToken) {
         // Avoid leaking token material; log a short SHA-256 fingerprint instead.
         const tokenFingerprint = crypto
-          .createHash('sha256')
+          .createHash("sha256")
           .update(savedToken.token.accessToken)
-          .digest('hex')
+          .digest("hex")
           .slice(0, 8);
-        debugLogger.debug(
-          `✓ Token verification successful (fingerprint: ${tokenFingerprint})`,
-        );
+        debugLogger.debug(`✓ Token verification successful (fingerprint: ${tokenFingerprint})`);
       } else {
-        debugLogger.error(
-          'Token verification failed: token not found or invalid after save',
-        );
+        debugLogger.error("Token verification failed: token not found or invalid after save");
       }
     } catch (saveError) {
       debugLogger.error(`Failed to save token: ${getErrorMessage(saveError)}`);
@@ -905,10 +838,7 @@ export class MCPOAuthProvider {
    * @param config OAuth configuration
    * @returns A valid access token or null if not authenticated
    */
-  async getValidToken(
-    serverName: string,
-    config: MCPOAuthConfig,
-  ): Promise<string | null> {
+  async getValidToken(serverName: string, config: MCPOAuthConfig): Promise<string | null> {
     debugLogger.debug(`Getting valid token for server: ${serverName}`);
     const credentials = await this.tokenStorage.getCredentials(serverName);
 
@@ -931,9 +861,7 @@ export class MCPOAuthProvider {
     // Try to refresh if we have a refresh token
     if (token.refreshToken && config.clientId && credentials.tokenUrl) {
       try {
-        debugLogger.info(
-          `Refreshing expired token for MCP server: ${serverName}`,
-        );
+        debugLogger.info(`Refreshing expired token for MCP server: ${serverName}`);
 
         const newTokenResponse = await this.refreshAccessToken(
           config,
diff --git a/packages/airiscode-core/src/mcp/oauth-token-storage.ts b/packages/airiscode-core/src/mcp/oauth-token-storage.ts
index e1bc53105..9dcaef33a 100644
--- a/packages/airiscode-core/src/mcp/oauth-token-storage.ts
+++ b/packages/airiscode-core/src/mcp/oauth-token-storage.ts
@@ -4,33 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type {
-  OAuthToken,
-  OAuthCredentials,
-  TokenStorage,
-} from './token-storage/types.js';
-import { HybridTokenStorage } from './token-storage/hybrid-token-storage.js';
-import {
-  DEFAULT_SERVICE_NAME,
-  FORCE_ENCRYPTED_FILE_ENV_VAR,
-} from './token-storage/index.js';
-
-const debugLogger = createDebugLogger('MCP_OAUTH');
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { Storage } from "../config/storage.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { HybridTokenStorage } from "./token-storage/hybrid-token-storage.js";
+import { DEFAULT_SERVICE_NAME, FORCE_ENCRYPTED_FILE_ENV_VAR } from "./token-storage/index.js";
+import type { OAuthCredentials, OAuthToken, TokenStorage } from "./token-storage/types.js";
+
+const debugLogger = createDebugLogger("MCP_OAUTH");
 
 /**
  * Class for managing MCP OAuth token storage and retrieval.
  */
 export class MCPOAuthTokenStorage implements TokenStorage {
-  private readonly hybridTokenStorage = new HybridTokenStorage(
-    DEFAULT_SERVICE_NAME,
-  );
-  private readonly useEncryptedFile =
-    process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === 'true';
+  private readonly hybridTokenStorage = new HybridTokenStorage(DEFAULT_SERVICE_NAME);
+  private readonly useEncryptedFile = process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === "true";
 
   /**
    * Get the path to the token storage file.
@@ -62,7 +52,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
 
     try {
       const tokenFile = this.getTokenFilePath();
-      const data = await fs.readFile(tokenFile, 'utf-8');
+      const data = await fs.readFile(tokenFile, "utf-8");
       const tokens = JSON.parse(data) as OAuthCredentials[];
 
       for (const credential of tokens) {
@@ -70,10 +60,8 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       }
     } catch (error) {
       // File doesn't exist or is invalid, return empty map
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        debugLogger.error(
-          `Failed to load MCP OAuth tokens: ${getErrorMessage(error)}`,
-        );
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+        debugLogger.error(`Failed to load MCP OAuth tokens: ${getErrorMessage(error)}`);
       }
     }
 
@@ -105,9 +93,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
         { mode: 0o600 }, // Restrict file permissions
       );
     } catch (error) {
-      debugLogger.error(
-        `Failed to save MCP OAuth token: ${getErrorMessage(error)}`,
-      );
+      debugLogger.error(`Failed to save MCP OAuth token: ${getErrorMessage(error)}`);
       throw error;
     }
   }
@@ -184,9 +170,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
           });
         }
       } catch (error) {
-        debugLogger.error(
-          `Failed to remove MCP OAuth token: ${getErrorMessage(error)}`,
-        );
+        debugLogger.error(`Failed to remove MCP OAuth token: ${getErrorMessage(error)}`);
       }
     }
   }
@@ -218,10 +202,8 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       const tokenFile = this.getTokenFilePath();
       await fs.unlink(tokenFile);
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        debugLogger.error(
-          `Failed to clear MCP OAuth tokens: ${getErrorMessage(error)}`,
-        );
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+        debugLogger.error(`Failed to clear MCP OAuth tokens: ${getErrorMessage(error)}`);
       }
     }
   }
diff --git a/packages/airiscode-core/src/mcp/oauth-utils.ts b/packages/airiscode-core/src/mcp/oauth-utils.ts
index 8f60d4f82..28105e63f 100644
--- a/packages/airiscode-core/src/mcp/oauth-utils.ts
+++ b/packages/airiscode-core/src/mcp/oauth-utils.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MCPOAuthConfig } from './oauth-provider.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import type { MCPOAuthConfig } from "./oauth-provider.js";
 
-const debugLogger = createDebugLogger('MCP_OAUTH');
+const debugLogger = createDebugLogger("MCP_OAUTH");
 
 /**
  * OAuth authorization server metadata as per RFC 8414.
@@ -57,19 +57,13 @@ export class OAuthUtils {
     if (!includePathSuffix) {
       // Standard discovery: use root-based well-known URLs
       return {
-        protectedResource: new URL(
-          '/.well-known/oauth-protected-resource',
-          base,
-        ).toString(),
-        authorizationServer: new URL(
-          '/.well-known/oauth-authorization-server',
-          base,
-        ).toString(),
+        protectedResource: new URL("/.well-known/oauth-protected-resource", base).toString(),
+        authorizationServer: new URL("/.well-known/oauth-authorization-server", base).toString(),
       };
     }
 
     // Path-based discovery: append path suffix to well-known URLs
-    const pathSuffix = serverUrl.pathname.replace(/\/$/, ''); // Remove trailing slash
+    const pathSuffix = serverUrl.pathname.replace(/\/$/, ""); // Remove trailing slash
     return {
       protectedResource: new URL(
         `/.well-known/oauth-protected-resource${pathSuffix}`,
@@ -134,9 +128,7 @@ export class OAuthUtils {
    * @param metadata The authorization server metadata
    * @returns The OAuth configuration
    */
-  static metadataToOAuthConfig(
-    metadata: OAuthAuthorizationServerMetadata,
-  ): MCPOAuthConfig {
+  static metadataToOAuthConfig(metadata: OAuthAuthorizationServerMetadata): MCPOAuthConfig {
     return {
       authorizationUrl: metadata.authorization_endpoint,
       tokenUrl: metadata.token_endpoint,
@@ -162,7 +154,7 @@ export class OAuthUtils {
 
     // With issuer URLs with path components, try the following well-known
     // endpoints in order:
-    if (authServerUrlObj.pathname !== '/') {
+    if (authServerUrlObj.pathname !== "/") {
       // 1. OAuth 2.0 Authorization Server Metadata with path insertion
       endpointsToTry.push(
         new URL(
@@ -173,18 +165,12 @@ export class OAuthUtils {
 
       // 2. OpenID Connect Discovery 1.0 with path insertion
       endpointsToTry.push(
-        new URL(
-          `/.well-known/openid-configuration${authServerUrlObj.pathname}`,
-          base,
-        ).toString(),
+        new URL(`/.well-known/openid-configuration${authServerUrlObj.pathname}`, base).toString(),
       );
 
       // 3. OpenID Connect Discovery 1.0 with path appending
       endpointsToTry.push(
-        new URL(
-          `${authServerUrlObj.pathname}/.well-known/openid-configuration`,
-          base,
-        ).toString(),
+        new URL(`${authServerUrlObj.pathname}/.well-known/openid-configuration`, base).toString(),
       );
     }
 
@@ -192,26 +178,19 @@ export class OAuthUtils {
     // discoveries, try the following well-known endpoints in order:
 
     // 1. OAuth 2.0 Authorization Server Metadata
-    endpointsToTry.push(
-      new URL('/.well-known/oauth-authorization-server', base).toString(),
-    );
+    endpointsToTry.push(new URL("/.well-known/oauth-authorization-server", base).toString());
 
     // 2. OpenID Connect Discovery 1.0
-    endpointsToTry.push(
-      new URL('/.well-known/openid-configuration', base).toString(),
-    );
+    endpointsToTry.push(new URL("/.well-known/openid-configuration", base).toString());
 
     for (const endpoint of endpointsToTry) {
-      const authServerMetadata =
-        await this.fetchAuthorizationServerMetadata(endpoint);
+      const authServerMetadata = await this.fetchAuthorizationServerMetadata(endpoint);
       if (authServerMetadata) {
         return authServerMetadata;
       }
     }
 
-    debugLogger.debug(
-      `Metadata discovery failed for authorization server ${authServerUrl}`,
-    );
+    debugLogger.debug(`Metadata discovery failed for authorization server ${authServerUrl}`);
     return null;
   }
 
@@ -221,9 +200,7 @@ export class OAuthUtils {
    * @param serverUrl The base URL of the server
    * @returns The discovered OAuth configuration or null if not available
    */
-  static async discoverOAuthConfig(
-    serverUrl: string,
-  ): Promise<MCPOAuthConfig | null> {
+  static async discoverOAuthConfig(serverUrl: string): Promise<MCPOAuthConfig | null> {
     try {
       // First try standard root-based discovery
       const wellKnownUrls = this.buildWellKnownUrls(serverUrl, false);
@@ -236,7 +213,7 @@ export class OAuthUtils {
       // If root discovery fails and we have a path, try path-based discovery
       if (!resourceMetadata) {
         const url = new URL(serverUrl);
-        if (url.pathname && url.pathname !== '/') {
+        if (url.pathname && url.pathname !== "/") {
           const pathBasedUrls = this.buildWellKnownUrls(serverUrl, true);
           resourceMetadata = await this.fetchProtectedResourceMetadata(
             pathBasedUrls.protectedResource,
@@ -247,8 +224,7 @@ export class OAuthUtils {
       if (resourceMetadata?.authorization_servers?.length) {
         // Use the first authorization server
         const authServerUrl = resourceMetadata.authorization_servers[0];
-        const authServerMetadata =
-          await this.discoverAuthorizationServerMetadata(authServerUrl);
+        const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
 
         if (authServerMetadata) {
           const config = this.metadataToOAuthConfig(authServerMetadata);
@@ -268,8 +244,7 @@ export class OAuthUtils {
 
       // Fallback: try well-known endpoints at the base URL
       debugLogger.debug(`Trying OAuth discovery fallback at ${serverUrl}`);
-      const authServerMetadata =
-        await this.discoverAuthorizationServerMetadata(serverUrl);
+      const authServerMetadata = await this.discoverAuthorizationServerMetadata(serverUrl);
 
       if (authServerMetadata) {
         const config = this.metadataToOAuthConfig(authServerMetadata);
@@ -283,9 +258,7 @@ export class OAuthUtils {
 
       return null;
     } catch (error) {
-      debugLogger.debug(
-        `Failed to discover OAuth configuration: ${getErrorMessage(error)}`,
-      );
+      debugLogger.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error)}`);
       return null;
     }
   }
@@ -314,21 +287,18 @@ export class OAuthUtils {
   static async discoverOAuthFromWWWAuthenticate(
     wwwAuthenticate: string,
   ): Promise<MCPOAuthConfig | null> {
-    const resourceMetadataUri =
-      this.parseWWWAuthenticateHeader(wwwAuthenticate);
+    const resourceMetadataUri = this.parseWWWAuthenticateHeader(wwwAuthenticate);
     if (!resourceMetadataUri) {
       return null;
     }
 
-    const resourceMetadata =
-      await this.fetchProtectedResourceMetadata(resourceMetadataUri);
+    const resourceMetadata = await this.fetchProtectedResourceMetadata(resourceMetadataUri);
     if (!resourceMetadata?.authorization_servers?.length) {
       return null;
     }
 
     const authServerUrl = resourceMetadata.authorization_servers[0];
-    const authServerMetadata =
-      await this.discoverAuthorizationServerMetadata(authServerUrl);
+    const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
 
     if (authServerMetadata) {
       const config = this.metadataToOAuthConfig(authServerMetadata);
@@ -361,7 +331,7 @@ export class OAuthUtils {
    * @returns True if the URL appears to be an SSE endpoint
    */
   static isSSEEndpoint(url: string): boolean {
-    return url.includes('/sse') || !url.includes('/mcp');
+    return url.includes("/sse") || !url.includes("/mcp");
   }
 
   /**
@@ -379,11 +349,11 @@ export class OAuthUtils {
     const url = new URL(endpointUrl);
     // Build canonical URI: scheme + host + path (no query, no fragment)
     // per RFC 8707 Section 2 and MCP spec Resource Parameter Implementation
-    const path = url.pathname === '/' ? '' : url.pathname;
+    const path = url.pathname === "/" ? "" : url.pathname;
     let canonical = `${url.protocol}//${url.host}${path}`;
     // Remove trailing slash from non-root paths for consistency
     // (MCP spec recommends form without trailing slash)
-    if (canonical.endsWith('/') && path !== '') {
+    if (canonical.endsWith("/") && path !== "") {
       canonical = canonical.slice(0, -1);
     }
     return canonical;
diff --git a/packages/airiscode-core/src/mcp/token-storage/base-token-storage.ts b/packages/airiscode-core/src/mcp/token-storage/base-token-storage.ts
index b36096fd8..410454b47 100644
--- a/packages/airiscode-core/src/mcp/token-storage/base-token-storage.ts
+++ b/packages/airiscode-core/src/mcp/token-storage/base-token-storage.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TokenStorage, OAuthCredentials } from './types.js';
+import type { OAuthCredentials, TokenStorage } from "./types.js";
 
 export abstract class BaseTokenStorage implements TokenStorage {
   protected readonly serviceName: string;
@@ -22,16 +22,16 @@ export abstract class BaseTokenStorage implements TokenStorage {
 
   protected validateCredentials(credentials: OAuthCredentials): void {
     if (!credentials.serverName) {
-      throw new Error('Server name is required');
+      throw new Error("Server name is required");
     }
     if (!credentials.token) {
-      throw new Error('Token is required');
+      throw new Error("Token is required");
     }
     if (!credentials.token.accessToken) {
-      throw new Error('Access token is required');
+      throw new Error("Access token is required");
     }
     if (!credentials.token.tokenType) {
-      throw new Error('Token type is required');
+      throw new Error("Token type is required");
     }
   }
 
@@ -44,6 +44,6 @@ export abstract class BaseTokenStorage implements TokenStorage {
   }
 
   protected sanitizeServerName(serverName: string): string {
-    return serverName.replace(/[^a-zA-Z0-9-_.]/g, '_');
+    return serverName.replace(/[^a-zA-Z0-9-_.]/g, "_");
   }
 }
diff --git a/packages/airiscode-core/src/mcp/token-storage/file-token-storage.ts b/packages/airiscode-core/src/mcp/token-storage/file-token-storage.ts
index d5a2eb04a..e5594ae22 100644
--- a/packages/airiscode-core/src/mcp/token-storage/file-token-storage.ts
+++ b/packages/airiscode-core/src/mcp/token-storage/file-token-storage.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import * as crypto from 'node:crypto';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials } from './types.js';
+import * as crypto from "node:crypto";
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
 
 export class FileTokenStorage extends BaseTokenStorage {
   private readonly tokenFilePath: string;
@@ -17,47 +17,43 @@ export class FileTokenStorage extends BaseTokenStorage {
 
   constructor(serviceName: string) {
     super(serviceName);
-    const configDir = path.join(os.homedir(), '.airiscode');
-    this.tokenFilePath = path.join(configDir, 'mcp-oauth-tokens-v2.json');
+    const configDir = path.join(os.homedir(), ".airiscode");
+    this.tokenFilePath = path.join(configDir, "mcp-oauth-tokens-v2.json");
     this.encryptionKey = this.deriveEncryptionKey();
   }
 
   private deriveEncryptionKey(): Buffer {
     const salt = `${os.hostname()}-${os.userInfo().username}-airiscode`;
-    return crypto.scryptSync('airiscode-oauth', salt, 32);
+    return crypto.scryptSync("airiscode-oauth", salt, 32);
   }
 
   private encrypt(text: string): string {
     const iv = crypto.randomBytes(16);
-    const cipher = crypto.createCipheriv('aes-256-gcm', this.encryptionKey, iv);
+    const cipher = crypto.createCipheriv("aes-256-gcm", this.encryptionKey, iv);
 
-    let encrypted = cipher.update(text, 'utf8', 'hex');
-    encrypted += cipher.final('hex');
+    let encrypted = cipher.update(text, "utf8", "hex");
+    encrypted += cipher.final("hex");
 
     const authTag = cipher.getAuthTag();
 
-    return iv.toString('hex') + ':' + authTag.toString('hex') + ':' + encrypted;
+    return iv.toString("hex") + ":" + authTag.toString("hex") + ":" + encrypted;
   }
 
   private decrypt(encryptedData: string): string {
-    const parts = encryptedData.split(':');
+    const parts = encryptedData.split(":");
     if (parts.length !== 3) {
-      throw new Error('Invalid encrypted data format');
+      throw new Error("Invalid encrypted data format");
     }
 
-    const iv = Buffer.from(parts[0], 'hex');
-    const authTag = Buffer.from(parts[1], 'hex');
+    const iv = Buffer.from(parts[0], "hex");
+    const authTag = Buffer.from(parts[1], "hex");
     const encrypted = parts[2];
 
-    const decipher = crypto.createDecipheriv(
-      'aes-256-gcm',
-      this.encryptionKey,
-      iv,
-    );
+    const decipher = crypto.createDecipheriv("aes-256-gcm", this.encryptionKey, iv);
     decipher.setAuthTag(authTag);
 
-    let decrypted = decipher.update(encrypted, 'hex', 'utf8');
-    decrypted += decipher.final('utf8');
+    let decrypted = decipher.update(encrypted, "hex", "utf8");
+    decrypted += decipher.final("utf8");
 
     return decrypted;
   }
@@ -69,30 +65,26 @@ export class FileTokenStorage extends BaseTokenStorage {
 
   private async loadTokens(): Promise<Map<string, OAuthCredentials>> {
     try {
-      const data = await fs.readFile(this.tokenFilePath, 'utf-8');
+      const data = await fs.readFile(this.tokenFilePath, "utf-8");
       const decrypted = this.decrypt(data);
       const tokens = JSON.parse(decrypted) as Record<string, OAuthCredentials>;
       return new Map(Object.entries(tokens));
     } catch (error: unknown) {
       const err = error as NodeJS.ErrnoException & { message?: string };
-      if (err.code === 'ENOENT') {
-        throw new Error('Token file does not exist');
+      if (err.code === "ENOENT") {
+        throw new Error("Token file does not exist");
       }
       if (
-        err.message?.includes('Invalid encrypted data format') ||
-        err.message?.includes(
-          'Unsupported state or unable to authenticate data',
-        )
+        err.message?.includes("Invalid encrypted data format") ||
+        err.message?.includes("Unsupported state or unable to authenticate data")
       ) {
-        throw new Error('Token file corrupted');
+        throw new Error("Token file corrupted");
       }
       throw error;
     }
   }
 
-  private async saveTokens(
-    tokens: Map<string, OAuthCredentials>,
-  ): Promise<void> {
+  private async saveTokens(tokens: Map<string, OAuthCredentials>): Promise<void> {
     await this.ensureDirectoryExists();
 
     const data = Object.fromEntries(tokens);
@@ -144,7 +136,7 @@ export class FileTokenStorage extends BaseTokenStorage {
         await fs.unlink(this.tokenFilePath);
       } catch (error: unknown) {
         const err = error as NodeJS.ErrnoException;
-        if (err.code !== 'ENOENT') {
+        if (err.code !== "ENOENT") {
           throw error;
         }
       }
@@ -176,7 +168,7 @@ export class FileTokenStorage extends BaseTokenStorage {
       await fs.unlink(this.tokenFilePath);
     } catch (error: unknown) {
       const err = error as NodeJS.ErrnoException;
-      if (err.code !== 'ENOENT') {
+      if (err.code !== "ENOENT") {
         throw error;
       }
     }
diff --git a/packages/airiscode-core/src/mcp/token-storage/hybrid-token-storage.ts b/packages/airiscode-core/src/mcp/token-storage/hybrid-token-storage.ts
index c1dced18a..874f360d8 100644
--- a/packages/airiscode-core/src/mcp/token-storage/hybrid-token-storage.ts
+++ b/packages/airiscode-core/src/mcp/token-storage/hybrid-token-storage.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseTokenStorage } from './base-token-storage.js';
-import { FileTokenStorage } from './file-token-storage.js';
-import type { TokenStorage, OAuthCredentials } from './types.js';
-import { TokenStorageType } from './types.js';
+import { BaseTokenStorage } from "./base-token-storage.js";
+import { FileTokenStorage } from "./file-token-storage.js";
+import type { OAuthCredentials, TokenStorage } from "./types.js";
+import { TokenStorageType } from "./types.js";
 
-const FORCE_FILE_STORAGE_ENV_VAR = 'AIRISCODE_FORCE_FILE_STORAGE';
+const FORCE_FILE_STORAGE_ENV_VAR = "AIRISCODE_FORCE_FILE_STORAGE";
 
 export class HybridTokenStorage extends BaseTokenStorage {
   private storage: TokenStorage | null = null;
@@ -21,13 +21,11 @@ export class HybridTokenStorage extends BaseTokenStorage {
   }
 
   private async initializeStorage(): Promise<TokenStorage> {
-    const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === 'true';
+    const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
 
     if (!forceFileStorage) {
       try {
-        const { KeychainTokenStorage } = await import(
-          './keychain-token-storage.js'
-        );
+        const { KeychainTokenStorage } = await import("./keychain-token-storage.js");
         const keychainStorage = new KeychainTokenStorage(this.serviceName);
 
         const isAvailable = await keychainStorage.isAvailable();
diff --git a/packages/airiscode-core/src/mcp/token-storage/index.ts b/packages/airiscode-core/src/mcp/token-storage/index.ts
index 0d2f5ea4a..dee9e5ba5 100644
--- a/packages/airiscode-core/src/mcp/token-storage/index.ts
+++ b/packages/airiscode-core/src/mcp/token-storage/index.ts
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './types.js';
-export * from './base-token-storage.js';
-export * from './file-token-storage.js';
-export * from './hybrid-token-storage.js';
+export * from "./base-token-storage.js";
+export * from "./file-token-storage.js";
+export * from "./hybrid-token-storage.js";
+export * from "./types.js";
 
-export const DEFAULT_SERVICE_NAME = 'airiscode-oauth';
-export const FORCE_ENCRYPTED_FILE_ENV_VAR =
-  'AIRISCODE_FORCE_ENCRYPTED_FILE_STORAGE';
+export const DEFAULT_SERVICE_NAME = "airiscode-oauth";
+export const FORCE_ENCRYPTED_FILE_ENV_VAR = "AIRISCODE_FORCE_ENCRYPTED_FILE_STORAGE";
diff --git a/packages/airiscode-core/src/mcp/token-storage/keychain-token-storage.ts b/packages/airiscode-core/src/mcp/token-storage/keychain-token-storage.ts
index e11661d0b..bea8c9b80 100644
--- a/packages/airiscode-core/src/mcp/token-storage/keychain-token-storage.ts
+++ b/packages/airiscode-core/src/mcp/token-storage/keychain-token-storage.ts
@@ -4,28 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as crypto from 'node:crypto';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials } from './types.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
+import * as crypto from "node:crypto";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
 
-const debugLogger = createDebugLogger('MCP_KEYCHAIN');
+const debugLogger = createDebugLogger("MCP_KEYCHAIN");
 
 interface Keytar {
   getPassword(service: string, account: string): Promise<string | null>;
-  setPassword(
-    service: string,
-    account: string,
-    password: string,
-  ): Promise<void>;
+  setPassword(service: string, account: string, password: string): Promise<void>;
   deletePassword(service: string, account: string): Promise<boolean>;
-  findCredentials(
-    service: string,
-  ): Promise<Array<{ account: string; password: string }>>;
+  findCredentials(service: string): Promise<Array<{ account: string; password: string }>>;
 }
 
-const KEYCHAIN_TEST_PREFIX = '__keychain_test__';
-const SECRET_PREFIX = '__secret__';
+const KEYCHAIN_TEST_PREFIX = "__keychain_test__";
+const SECRET_PREFIX = "__secret__";
 
 export class KeychainTokenStorage extends BaseTokenStorage {
   private keychainAvailable: boolean | null = null;
@@ -42,7 +36,7 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
     try {
       // Try to import keytar without any timeout - let the OS handle it
-      const moduleName = 'keytar';
+      const moduleName = "keytar";
       const module = await import(moduleName);
       this.keytarModule = module.default || module;
     } catch (error) {
@@ -53,12 +47,12 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async getCredentials(serverName: string): Promise<OAuthCredentials | null> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     try {
@@ -86,12 +80,12 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async setCredentials(credentials: OAuthCredentials): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     this.validateCredentials(credentials);
@@ -108,19 +102,16 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async deleteCredentials(serverName: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     const sanitizedName = this.sanitizeServerName(serverName);
-    const deleted = await keytar.deletePassword(
-      this.serviceName,
-      sanitizedName,
-    );
+    const deleted = await keytar.deletePassword(this.serviceName, sanitizedName);
 
     if (!deleted) {
       throw new Error(`No credentials found for ${serverName}`);
@@ -129,12 +120,12 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async listServers(): Promise<string[]> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     try {
@@ -151,12 +142,12 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async getAllCredentials(): Promise<Map<string, OAuthCredentials>> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     const result = new Map<string, OAuthCredentials>();
@@ -172,15 +163,11 @@ export class KeychainTokenStorage extends BaseTokenStorage {
             result.set(cred.account, data);
           }
         } catch (error) {
-          debugLogger.error(
-            `Failed to parse credentials for ${cred.account}: ${error}`,
-          );
+          debugLogger.error(`Failed to parse credentials for ${cred.account}: ${error}`);
         }
       }
     } catch (error) {
-      debugLogger.error(
-        `Failed to get all credentials from keychain: ${error}`,
-      );
+      debugLogger.error(`Failed to get all credentials from keychain: ${error}`);
     }
 
     return result;
@@ -188,7 +175,7 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async clearAll(): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const servers = this.keytarModule
@@ -196,9 +183,7 @@ export class KeychainTokenStorage extends BaseTokenStorage {
           .findCredentials(this.serviceName)
           .then((creds) => creds.map((c) => c.account))
           .catch((error: Error) => {
-            throw new Error(
-              `Failed to list servers for clearing: ${error.message}`,
-            );
+            throw new Error(`Failed to list servers for clearing: ${error.message}`);
           })
       : [];
     const errors: Error[] = [];
@@ -213,7 +198,7 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
     if (errors.length > 0) {
       throw new Error(
-        `Failed to clear some credentials: ${errors.map((e) => e.message).join(', ')}`,
+        `Failed to clear some credentials: ${errors.map((e) => e.message).join(", ")}`,
       );
     }
   }
@@ -232,15 +217,12 @@ export class KeychainTokenStorage extends BaseTokenStorage {
         return false;
       }
 
-      const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto.randomBytes(8).toString('hex')}`;
-      const testPassword = 'test';
+      const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto.randomBytes(8).toString("hex")}`;
+      const testPassword = "test";
 
       await keytar.setPassword(this.serviceName, testAccount, testPassword);
       const retrieved = await keytar.getPassword(this.serviceName, testAccount);
-      const deleted = await keytar.deletePassword(
-        this.serviceName,
-        testAccount,
-      );
+      const deleted = await keytar.deletePassword(this.serviceName, testAccount);
 
       const success = deleted && retrieved === testPassword;
       this.keychainAvailable = success;
@@ -257,38 +239,35 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async setSecret(key: string, value: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     await keytar.setPassword(this.serviceName, `${SECRET_PREFIX}${key}`, value);
   }
 
   async getSecret(key: string): Promise<string | null> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     return keytar.getPassword(this.serviceName, `${SECRET_PREFIX}${key}`);
   }
 
   async deleteSecret(key: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
-    const deleted = await keytar.deletePassword(
-      this.serviceName,
-      `${SECRET_PREFIX}${key}`,
-    );
+    const deleted = await keytar.deletePassword(this.serviceName, `${SECRET_PREFIX}${key}`);
     if (!deleted) {
       throw new Error(`No secret found for key: ${key}`);
     }
@@ -296,11 +275,11 @@ export class KeychainTokenStorage extends BaseTokenStorage {
 
   async listSecrets(): Promise<string[]> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     try {
       const credentials = await keytar.findCredentials(this.serviceName);
diff --git a/packages/airiscode-core/src/mcp/token-storage/types.ts b/packages/airiscode-core/src/mcp/token-storage/types.ts
index 1e95a975e..f5b55cef2 100644
--- a/packages/airiscode-core/src/mcp/token-storage/types.ts
+++ b/packages/airiscode-core/src/mcp/token-storage/types.ts
@@ -37,6 +37,6 @@ export interface TokenStorage {
 }
 
 export enum TokenStorageType {
-  KEYCHAIN = 'keychain',
-  ENCRYPTED_FILE = 'encrypted_file',
+  KEYCHAIN = "keychain",
+  ENCRYPTED_FILE = "encrypted_file",
 }
diff --git a/packages/airiscode-core/src/mocks/msw.ts b/packages/airiscode-core/src/mocks/msw.ts
index 4bf93138e..1a3d38f52 100644
--- a/packages/airiscode-core/src/mocks/msw.ts
+++ b/packages/airiscode-core/src/mocks/msw.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { setupServer } from 'msw/node';
+import { setupServer } from "msw/node";
 
 export const server = setupServer();
diff --git a/packages/airiscode-core/src/models/constants.ts b/packages/airiscode-core/src/models/constants.ts
index 7f2b4f0e5..032624e87 100644
--- a/packages/airiscode-core/src/models/constants.ts
+++ b/packages/airiscode-core/src/models/constants.ts
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MAINLINE_CODER_MODEL } from '../config/models.js';
+import { MAINLINE_CODER_MODEL } from "../config/models.js";
 
-type AuthType = import('../core/contentGenerator.js').AuthType;
-type ContentGeneratorConfig =
-  import('../core/contentGenerator.js').ContentGeneratorConfig;
+type AuthType = import("../core/contentGenerator.js").AuthType;
+type ContentGeneratorConfig = import("../core/contentGenerator.js").ContentGeneratorConfig;
 
 /**
  * Field keys for model-scoped generation config.
@@ -17,17 +16,17 @@ type ContentGeneratorConfig =
  * usage is type-only and does not emit runtime imports.
  */
 export const MODEL_GENERATION_CONFIG_FIELDS = [
-  'samplingParams',
-  'timeout',
-  'maxRetries',
-  'retryErrorCodes',
-  'enableCacheControl',
-  'schemaCompliance',
-  'reasoning',
-  'contextWindowSize',
-  'customHeaders',
-  'extra_body',
-  'modalities',
+  "samplingParams",
+  "timeout",
+  "maxRetries",
+  "retryErrorCodes",
+  "enableCacheControl",
+  "schemaCompliance",
+  "reasoning",
+  "contextWindowSize",
+  "customHeaders",
+  "extra_body",
+  "modalities",
 ] as const satisfies ReadonlyArray<keyof ContentGeneratorConfig>;
 
 /**
@@ -35,10 +34,10 @@ export const MODEL_GENERATION_CONFIG_FIELDS = [
  * but not ModelGenerationConfig.
  */
 export const CREDENTIAL_FIELDS = [
-  'model',
-  'apiKey',
-  'apiKeyEnvKey',
-  'baseUrl',
+  "model",
+  "apiKey",
+  "apiKeyEnvKey",
+  "baseUrl",
 ] as const satisfies ReadonlyArray<keyof ContentGeneratorConfig>;
 
 /**
@@ -61,19 +60,19 @@ export interface AuthEnvMapping {
 
 export const AUTH_ENV_MAPPINGS = {
   openai: {
-    apiKey: ['OPENAI_API_KEY'],
-    baseUrl: ['OPENAI_BASE_URL'],
-    model: ['OPENAI_MODEL', 'AIRISCODE_MODEL'],
+    apiKey: ["OPENAI_API_KEY"],
+    baseUrl: ["OPENAI_BASE_URL"],
+    model: ["OPENAI_MODEL", "AIRISCODE_MODEL"],
   },
   ollama: {
     apiKey: [],
-    baseUrl: ['OLLAMA_HOST'],
-    model: ['OLLAMA_MODEL', 'AIRISCODE_MODEL'],
+    baseUrl: ["OLLAMA_HOST"],
+    model: ["OLLAMA_MODEL", "AIRISCODE_MODEL"],
   },
   anthropic: {
-    apiKey: ['ANTHROPIC_API_KEY'],
-    baseUrl: ['ANTHROPIC_BASE_URL'],
-    model: ['ANTHROPIC_MODEL'],
+    apiKey: ["ANTHROPIC_API_KEY"],
+    baseUrl: ["ANTHROPIC_BASE_URL"],
+    model: ["ANTHROPIC_MODEL"],
   },
 } as const satisfies Record<AuthType, AuthEnvMapping>;
 
diff --git a/packages/airiscode-core/src/models/content-generator-config.ts b/packages/airiscode-core/src/models/content-generator-config.ts
index c2ef1a242..fc761acfa 100644
--- a/packages/airiscode-core/src/models/content-generator-config.ts
+++ b/packages/airiscode-core/src/models/content-generator-config.ts
@@ -12,16 +12,10 @@
  * different model or provider than the parent process.
  */
 
-import type { Config } from '../config/config.js';
-import {
-  type AuthType,
-  type ContentGeneratorConfig,
-} from '../core/contentGenerator.js';
-import {
-  AUTH_ENV_MAPPINGS,
-  MODEL_GENERATION_CONFIG_FIELDS,
-} from './constants.js';
-import type { ResolvedModelConfig } from './types.js';
+import type { Config } from "../config/config.js";
+import { type AuthType, type ContentGeneratorConfig } from "../core/contentGenerator.js";
+import { AUTH_ENV_MAPPINGS, MODEL_GENERATION_CONFIG_FIELDS } from "./constants.js";
+import type { ResolvedModelConfig } from "./types.js";
 
 export interface AuthOverrides {
   authType: string;
@@ -67,12 +61,7 @@ export function buildAgentContentGeneratorConfig(
   }
 
   if (resolvedModel) {
-    applyResolvedModelConfig(
-      nextConfig,
-      resolvedModel,
-      parentConfig,
-      authOverrides,
-    );
+    applyResolvedModelConfig(nextConfig, resolvedModel, parentConfig, authOverrides);
     return nextConfig;
   }
 
@@ -80,7 +69,7 @@ export function buildAgentContentGeneratorConfig(
     authOverrides.apiKey,
     sameProvider ? parentConfig.apiKey : undefined,
     authOverrides.authType,
-    'apiKey',
+    "apiKey",
   );
   nextConfig.baseUrl =
     authOverrides.baseUrl ??
@@ -88,11 +77,9 @@ export function buildAgentContentGeneratorConfig(
       undefined,
       sameProvider ? parentConfig.baseUrl : undefined,
       authOverrides.authType,
-      'baseUrl',
+      "baseUrl",
     );
-  nextConfig.apiKeyEnvKey = sameProvider
-    ? parentConfig.apiKeyEnvKey
-    : undefined;
+  nextConfig.apiKeyEnvKey = sameProvider ? parentConfig.apiKeyEnvKey : undefined;
 
   return nextConfig;
 }
@@ -122,11 +109,9 @@ function applyResolvedModelConfig(
       authOverrides.apiKey,
       sameProvider ? parentConfig.apiKey : undefined,
       authOverrides.authType,
-      'apiKey',
+      "apiKey",
     );
-    targetConfig.apiKeyEnvKey = sameProvider
-      ? parentConfig.apiKeyEnvKey
-      : undefined;
+    targetConfig.apiKeyEnvKey = sameProvider ? parentConfig.apiKeyEnvKey : undefined;
   }
 
   // Apply registry-defined generation config fields. Cross-provider
@@ -149,13 +134,12 @@ export function resolveCredentialField(
   explicitValue: string | undefined,
   inheritedValue: string | undefined,
   authType: string,
-  field: 'apiKey' | 'baseUrl',
+  field: "apiKey" | "baseUrl",
 ): string | undefined {
   if (explicitValue) return explicitValue;
   if (inheritedValue) return inheritedValue;
 
-  const envMapping =
-    AUTH_ENV_MAPPINGS[authType as keyof typeof AUTH_ENV_MAPPINGS];
+  const envMapping = AUTH_ENV_MAPPINGS[authType as keyof typeof AUTH_ENV_MAPPINGS];
   if (!envMapping) return undefined;
 
   for (const envKey of envMapping[field]) {
diff --git a/packages/airiscode-core/src/models/index.ts b/packages/airiscode-core/src/models/index.ts
index c62a2372e..ff679ff50 100644
--- a/packages/airiscode-core/src/models/index.ts
+++ b/packages/airiscode-core/src/models/index.ts
@@ -4,40 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export {
-  type ModelCapabilities,
-  type ModelGenerationConfig,
-  type ModelConfig,
-  type ModelProvidersConfig,
-  type ResolvedModelConfig,
-  type AvailableModel,
-  type ModelSwitchMetadata,
-  type RuntimeModelSnapshot,
-} from './types.js';
-
-export { ModelRegistry } from './modelRegistry.js';
-
-export {
-  ModelsConfig,
-  type ModelsConfigOptions,
-  type OnModelChangeCallback,
-} from './modelsConfig.js';
-
 export {
   AUTH_ENV_MAPPINGS,
   CREDENTIAL_FIELDS,
   DEFAULT_MODELS,
   MODEL_GENERATION_CONFIG_FIELDS,
   PROVIDER_SOURCED_FIELDS,
-} from './constants.js';
-
+} from "./constants.js";
 // Model configuration resolver
 export {
-  resolveModelConfig,
-  validateModelConfig,
-  type ModelConfigSourcesInput,
   type ModelConfigCliInput,
-  type ModelConfigSettingsInput,
   type ModelConfigResolutionResult,
+  type ModelConfigSettingsInput,
+  type ModelConfigSourcesInput,
   type ModelConfigValidationResult,
-} from './modelConfigResolver.js';
+  resolveModelConfig,
+  validateModelConfig,
+} from "./modelConfigResolver.js";
+export { ModelRegistry } from "./modelRegistry.js";
+export {
+  ModelsConfig,
+  type ModelsConfigOptions,
+  type OnModelChangeCallback,
+} from "./modelsConfig.js";
+export {
+  type AvailableModel,
+  type ModelCapabilities,
+  type ModelConfig,
+  type ModelGenerationConfig,
+  type ModelProvidersConfig,
+  type ModelSwitchMetadata,
+  type ResolvedModelConfig,
+  type RuntimeModelSnapshot,
+} from "./types.js";
diff --git a/packages/airiscode-core/src/models/modelConfigErrors.ts b/packages/airiscode-core/src/models/modelConfigErrors.ts
index e2d86445c..e3b87fb71 100644
--- a/packages/airiscode-core/src/models/modelConfigErrors.ts
+++ b/packages/airiscode-core/src/models/modelConfigErrors.ts
@@ -6,31 +6,31 @@
 
 export function getDefaultApiKeyEnvVar(authType: string | undefined): string {
   switch (authType) {
-    case 'openai':
-      return 'OPENAI_API_KEY';
-    case 'anthropic':
-      return 'ANTHROPIC_API_KEY';
-    case 'gemini':
-      return 'GEMINI_API_KEY';
-    case 'vertex-ai':
-      return 'GOOGLE_API_KEY';
+    case "openai":
+      return "OPENAI_API_KEY";
+    case "anthropic":
+      return "ANTHROPIC_API_KEY";
+    case "gemini":
+      return "GEMINI_API_KEY";
+    case "vertex-ai":
+      return "GOOGLE_API_KEY";
     default:
-      return 'API_KEY';
+      return "API_KEY";
   }
 }
 
 export function getDefaultModelEnvVar(authType: string | undefined): string {
   switch (authType) {
-    case 'openai':
-      return 'OPENAI_MODEL';
-    case 'anthropic':
-      return 'ANTHROPIC_MODEL';
-    case 'gemini':
-      return 'GEMINI_MODEL';
-    case 'vertex-ai':
-      return 'GOOGLE_MODEL';
+    case "openai":
+      return "OPENAI_MODEL";
+    case "anthropic":
+      return "ANTHROPIC_MODEL";
+    case "gemini":
+      return "GEMINI_MODEL";
+    case "vertex-ai":
+      return "GOOGLE_MODEL";
     default:
-      return 'MODEL';
+      return "MODEL";
   }
 }
 
@@ -45,15 +45,11 @@ export abstract class ModelConfigError extends Error {
 }
 
 export class StrictMissingCredentialsError extends ModelConfigError {
-  readonly code = 'STRICT_MISSING_CREDENTIALS';
-
-  constructor(
-    authType: string | undefined,
-    model: string | undefined,
-    envKey?: string,
-  ) {
-    const providerKey = authType || '(unknown)';
-    const modelName = model || '(unknown)';
+  readonly code = "STRICT_MISSING_CREDENTIALS";
+
+  constructor(authType: string | undefined, model: string | undefined, envKey?: string) {
+    const providerKey = authType || "(unknown)";
+    const modelName = model || "(unknown)";
     super(
       `Missing credentials for modelProviders model '${modelName}'. ` +
         (envKey
@@ -64,17 +60,15 @@ export class StrictMissingCredentialsError extends ModelConfigError {
 }
 
 export class StrictMissingModelIdError extends ModelConfigError {
-  readonly code = 'STRICT_MISSING_MODEL_ID';
+  readonly code = "STRICT_MISSING_MODEL_ID";
 
   constructor(authType: string | undefined) {
-    super(
-      `Missing model id for strict modelProviders resolution (authType: ${authType}).`,
-    );
+    super(`Missing model id for strict modelProviders resolution (authType: ${authType}).`);
   }
 }
 
 export class MissingApiKeyError extends ModelConfigError {
-  readonly code = 'MISSING_API_KEY';
+  readonly code = "MISSING_API_KEY";
 
   constructor(params: {
     authType: string | undefined;
@@ -84,7 +78,7 @@ export class MissingApiKeyError extends ModelConfigError {
   }) {
     super(
       `Missing API key for ${params.authType} auth. ` +
-        `Current model: '${params.model || '(unknown)'}', baseUrl: '${params.baseUrl || '(default)'}'. ` +
+        `Current model: '${params.model || "(unknown)"}', baseUrl: '${params.baseUrl || "(default)"}'. ` +
         `Provide an API key via settings (security.auth.apiKey), ` +
         `or set the environment variable '${params.envKey}'.`,
     );
@@ -92,7 +86,7 @@ export class MissingApiKeyError extends ModelConfigError {
 }
 
 export class MissingModelError extends ModelConfigError {
-  readonly code = 'MISSING_MODEL';
+  readonly code = "MISSING_MODEL";
 
   constructor(params: { authType: string | undefined; envKey: string }) {
     super(
@@ -103,23 +97,23 @@ export class MissingModelError extends ModelConfigError {
 }
 
 export class MissingBaseUrlError extends ModelConfigError {
-  readonly code = 'MISSING_BASE_URL';
+  readonly code = "MISSING_BASE_URL";
 
   constructor(params: {
     authType: string | undefined;
     model: string | undefined;
   }) {
     super(
-      `Missing baseUrl for modelProviders model '${params.model || '(unknown)'}'. ` +
-        `Configure modelProviders.${params.authType || '(unknown)'}[].baseUrl.`,
+      `Missing baseUrl for modelProviders model '${params.model || "(unknown)"}'. ` +
+        `Configure modelProviders.${params.authType || "(unknown)"}[].baseUrl.`,
     );
   }
 }
 
 export class MissingAnthropicBaseUrlEnvError extends ModelConfigError {
-  readonly code = 'MISSING_ANTHROPIC_BASE_URL_ENV';
+  readonly code = "MISSING_ANTHROPIC_BASE_URL_ENV";
 
   constructor() {
-    super('ANTHROPIC_BASE_URL environment variable not found.');
+    super("ANTHROPIC_BASE_URL environment variable not found.");
   }
 }
diff --git a/packages/airiscode-core/src/models/modelConfigResolver.ts b/packages/airiscode-core/src/models/modelConfigResolver.ts
index 12d264104..185b2a31b 100644
--- a/packages/airiscode-core/src/models/modelConfigResolver.ts
+++ b/packages/airiscode-core/src/models/modelConfigResolver.ts
@@ -18,31 +18,28 @@
  * 5. Defaults - Built-in default values
  */
 
-import { AuthType } from '../core/contentGenerator.js';
-import type { ContentGeneratorConfig } from '../core/contentGenerator.js';
+import type { ContentGeneratorConfig } from "../core/contentGenerator.js";
+import { AuthType } from "../core/contentGenerator.js";
 import {
+  type ConfigLayer,
+  type ConfigSources,
+  cliSource,
+  computedSource,
+  defaultSource,
+  envLayer,
+  layer,
+  modelProvidersSource,
   resolveField,
   resolveOptionalField,
-  layer,
-  envLayer,
-  cliSource,
   settingsSource,
-  modelProvidersSource,
-  defaultSource,
-  computedSource,
-  type ConfigSources,
-  type ConfigLayer,
-} from '../utils/configResolver.js';
-import {
-  AUTH_ENV_MAPPINGS,
-  DEFAULT_MODELS,
-  MODEL_GENERATION_CONFIG_FIELDS,
-} from './constants.js';
-import type { ModelConfig as ModelProviderConfig } from './types.js';
+} from "../utils/configResolver.js";
+import { AUTH_ENV_MAPPINGS, DEFAULT_MODELS, MODEL_GENERATION_CONFIG_FIELDS } from "./constants.js";
+import type { ModelConfig as ModelProviderConfig } from "./types.js";
+
 export {
-  validateModelConfig,
   type ModelConfigValidationResult,
-} from '../core/contentGenerator.js';
+  validateModelConfig,
+} from "../core/contentGenerator.js";
 
 /**
  * CLI-provided configuration values
@@ -113,9 +110,7 @@ export interface ModelConfigResolutionResult {
  * @param input - All configuration sources
  * @returns Resolved configuration with source tracking
  */
-export function resolveModelConfig(
-  input: ModelConfigSourcesInput,
-): ModelConfigResolutionResult {
+export function resolveModelConfig(input: ModelConfigSourcesInput): ModelConfigResolutionResult {
   const { authType, cli, settings, env, modelProvider, proxy } = input;
   const warnings: string[] = [];
   const sources: ConfigSources = {};
@@ -134,29 +129,22 @@ export function resolveModelConfig(
 
   if (authType && modelProvider) {
     modelLayers.push(
-      layer(
-        modelProvider.id,
-        modelProvidersSource(authType, modelProvider.id, 'model.id'),
-      ),
+      layer(modelProvider.id, modelProvidersSource(authType, modelProvider.id, "model.id")),
     );
   }
   if (cli?.model) {
-    modelLayers.push(layer(cli.model, cliSource('--model')));
+    modelLayers.push(layer(cli.model, cliSource("--model")));
   }
   for (const envKey of envMapping.model) {
     modelLayers.push(envLayer(env, envKey));
   }
   if (settings?.model) {
-    modelLayers.push(layer(settings.model, settingsSource('model.name')));
+    modelLayers.push(layer(settings.model, settingsSource("model.name")));
   }
 
-  const defaultModel = authType ? DEFAULT_MODELS[authType] : '';
-  const modelResult = resolveField(
-    modelLayers,
-    defaultModel,
-    defaultSource(defaultModel),
-  );
-  sources['model'] = modelResult.source;
+  const defaultModel = authType ? DEFAULT_MODELS[authType] : "";
+  const modelResult = resolveField(modelLayers, defaultModel, defaultSource(defaultModel));
+  sources["model"] = modelResult.source;
 
   // ---- API Key ----
   const apiKeyLayers: Array<ConfigLayer<string>> = [];
@@ -167,28 +155,26 @@ export function resolveModelConfig(
     if (apiKeyFromEnv) {
       apiKeyLayers.push(
         layer(apiKeyFromEnv, {
-          kind: 'env',
+          kind: "env",
           envKey: modelProvider.envKey,
-          via: modelProvidersSource(authType, modelProvider.id, 'envKey'),
+          via: modelProvidersSource(authType, modelProvider.id, "envKey"),
         }),
       );
     }
   }
   if (cli?.apiKey) {
-    apiKeyLayers.push(layer(cli.apiKey, cliSource('--openaiApiKey')));
+    apiKeyLayers.push(layer(cli.apiKey, cliSource("--openaiApiKey")));
   }
   for (const envKey of envMapping.apiKey) {
     apiKeyLayers.push(envLayer(env, envKey));
   }
   if (settings?.apiKey) {
-    apiKeyLayers.push(
-      layer(settings.apiKey, settingsSource('security.auth.apiKey')),
-    );
+    apiKeyLayers.push(layer(settings.apiKey, settingsSource("security.auth.apiKey")));
   }
 
   const apiKeyResult = resolveOptionalField(apiKeyLayers);
   if (apiKeyResult) {
-    sources['apiKey'] = apiKeyResult.source;
+    sources["apiKey"] = apiKeyResult.source;
   }
 
   // ---- Base URL ----
@@ -196,38 +182,29 @@ export function resolveModelConfig(
 
   if (authType && modelProvider?.baseUrl) {
     baseUrlLayers.push(
-      layer(
-        modelProvider.baseUrl,
-        modelProvidersSource(authType, modelProvider.id, 'baseUrl'),
-      ),
+      layer(modelProvider.baseUrl, modelProvidersSource(authType, modelProvider.id, "baseUrl")),
     );
   }
   if (cli?.baseUrl) {
-    baseUrlLayers.push(layer(cli.baseUrl, cliSource('--openaiBaseUrl')));
+    baseUrlLayers.push(layer(cli.baseUrl, cliSource("--openaiBaseUrl")));
   }
   for (const envKey of envMapping.baseUrl) {
     baseUrlLayers.push(envLayer(env, envKey));
   }
   if (settings?.baseUrl) {
-    baseUrlLayers.push(
-      layer(settings.baseUrl, settingsSource('security.auth.baseUrl')),
-    );
+    baseUrlLayers.push(layer(settings.baseUrl, settingsSource("security.auth.baseUrl")));
   }
 
   const baseUrlResult = resolveOptionalField(baseUrlLayers);
   if (baseUrlResult) {
-    sources['baseUrl'] = baseUrlResult.source;
+    sources["baseUrl"] = baseUrlResult.source;
   }
 
   // ---- API Key Env Key (for error messages) ----
   let apiKeyEnvKey: string | undefined;
   if (authType && modelProvider?.envKey) {
     apiKeyEnvKey = modelProvider.envKey;
-    sources['apiKeyEnvKey'] = modelProvidersSource(
-      authType,
-      modelProvider.id,
-      'envKey',
-    );
+    sources["apiKeyEnvKey"] = modelProvidersSource(authType, modelProvider.id, "envKey");
   }
 
   // ---- Generation Config (from settings or modelProvider) ----
@@ -242,7 +219,7 @@ export function resolveModelConfig(
   // Build final config
   const config: ContentGeneratorConfig = {
     authType,
-    model: modelResult.value || '',
+    model: modelResult.value || "",
     apiKey: apiKeyResult?.value,
     apiKeyEnvKey,
     baseUrl: baseUrlResult?.value,
@@ -252,11 +229,11 @@ export function resolveModelConfig(
 
   // Add proxy source
   if (proxy) {
-    sources['proxy'] = computedSource('Config.getProxy()');
+    sources["proxy"] = computedSource("Config.getProxy()");
   }
 
   // Add authType source
-  sources['authType'] = computedSource('provided by caller');
+  sources["authType"] = computedSource("provided by caller");
 
   return { config, sources, warnings };
 }
@@ -278,11 +255,7 @@ function resolveGenerationConfig(
     if (authType && modelProviderConfig && field in modelProviderConfig) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (result as any)[field] = modelProviderConfig[field];
-      sources[field] = modelProvidersSource(
-        authType,
-        modelId || '',
-        `generationConfig.${field}`,
-      );
+      sources[field] = modelProvidersSource(authType, modelId || "", `generationConfig.${field}`);
     } else if (settingsConfig && field in settingsConfig) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (result as any)[field] = settingsConfig[field];
diff --git a/packages/airiscode-core/src/models/modelRegistry.ts b/packages/airiscode-core/src/models/modelRegistry.ts
index 72fcb09c2..5ff0fa74f 100644
--- a/packages/airiscode-core/src/models/modelRegistry.ts
+++ b/packages/airiscode-core/src/models/modelRegistry.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AuthType } from '../core/contentGenerator.js';
-import { defaultModalities } from '../core/modalityDefaults.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import { DEFAULT_OPENAI_BASE_URL } from '../core/openaiContentGenerator/constants.js';
+import { AuthType } from "../core/contentGenerator.js";
+import { defaultModalities } from "../core/modalityDefaults.js";
+import { DEFAULT_OPENAI_BASE_URL } from "../core/openaiContentGenerator/constants.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
 import {
+  type AvailableModel,
   type ModelConfig,
   type ModelProvidersConfig,
   type ResolvedModelConfig,
-  type AvailableModel,
-} from './types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+} from "./types.js";
 
-const debugLogger = createDebugLogger('MODEL_REGISTRY');
+const debugLogger = createDebugLogger("MODEL_REGISTRY");
 
 /**
  * Validates if a string key is a valid AuthType enum value.
@@ -45,7 +45,7 @@ export class ModelRegistry {
       case AuthType.USE_OPENAI:
         return DEFAULT_OPENAI_BASE_URL;
       default:
-        return '';
+        return "";
     }
   }
 
@@ -59,7 +59,7 @@ export class ModelRegistry {
 
         if (!authType) {
           debugLogger.warn(
-            `Invalid authType key "${rawKey}" in modelProviders config. Expected one of: ${Object.values(AuthType).join(', ')}. Skipping.`,
+            `Invalid authType key "${rawKey}" in modelProviders config. Expected one of: ${Object.values(AuthType).join(", ")}. Skipping.`,
           );
           continue;
         }
@@ -73,10 +73,7 @@ export class ModelRegistry {
    * Register models for an authType.
    * If multiple models have the same id, the first one takes precedence.
    */
-  private registerAuthTypeModels(
-    authType: AuthType,
-    models: ModelConfig[],
-  ): void {
+  private registerAuthTypeModels(authType: AuthType, models: ModelConfig[]): void {
     const modelMap = new Map<string, ResolvedModelConfig>();
 
     for (const config of models) {
@@ -109,10 +106,8 @@ export class ModelRegistry {
       capabilities: model.capabilities,
       authType: model.authType,
       isVision: model.capabilities?.vision ?? false,
-      contextWindowSize:
-        model.generationConfig.contextWindowSize ?? tokenLimit(model.id),
-      modalities:
-        model.generationConfig.modalities ?? defaultModalities(model.id),
+      contextWindowSize: model.generationConfig.contextWindowSize ?? tokenLimit(model.id),
+      modalities: model.generationConfig.modalities ?? defaultModalities(model.id),
       baseUrl: model.baseUrl,
       envKey: model.envKey,
     }));
@@ -121,10 +116,7 @@ export class ModelRegistry {
   /**
    * Get model configuration by authType and modelId
    */
-  getModel(
-    authType: AuthType,
-    modelId: string,
-  ): ResolvedModelConfig | undefined {
+  getModel(authType: AuthType, modelId: string): ResolvedModelConfig | undefined {
     const models = this.modelsByAuthType.get(authType);
     return models?.get(modelId);
   }
@@ -141,9 +133,7 @@ export class ModelRegistry {
    * Get default model for an authType.
    * Returns the first configured model.
    */
-  getDefaultModelForAuthType(
-    authType: AuthType,
-  ): ResolvedModelConfig | undefined {
+  getDefaultModelForAuthType(authType: AuthType): ResolvedModelConfig | undefined {
     const models = this.modelsByAuthType.get(authType);
     if (!models || models.size === 0) return undefined;
     return Array.from(models.values())[0];
@@ -152,10 +142,7 @@ export class ModelRegistry {
   /**
    * Resolve model config by applying defaults
    */
-  private resolveModelConfig(
-    config: ModelConfig,
-    authType: AuthType,
-  ): ResolvedModelConfig {
+  private resolveModelConfig(config: ModelConfig, authType: AuthType): ResolvedModelConfig {
     this.validateModelConfig(config, authType);
 
     return {
@@ -173,9 +160,7 @@ export class ModelRegistry {
    */
   private validateModelConfig(config: ModelConfig, authType: AuthType): void {
     if (!config.id) {
-      throw new Error(
-        `Model config in authType '${authType}' missing required field: id`,
-      );
+      throw new Error(`Model config in authType '${authType}' missing required field: id`);
     }
   }
 
@@ -194,7 +179,7 @@ export class ModelRegistry {
 
         if (!authType) {
           debugLogger.warn(
-            `Invalid authType key "${rawKey}" in modelProviders config. Expected one of: ${Object.values(AuthType).join(', ')}. Skipping.`,
+            `Invalid authType key "${rawKey}" in modelProviders config. Expected one of: ${Object.values(AuthType).join(", ")}. Skipping.`,
           );
           continue;
         }
diff --git a/packages/airiscode-core/src/models/modelsConfig.ts b/packages/airiscode-core/src/models/modelsConfig.ts
index a15b5cbcc..88b5ec10e 100644
--- a/packages/airiscode-core/src/models/modelsConfig.ts
+++ b/packages/airiscode-core/src/models/modelsConfig.ts
@@ -4,43 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import process from 'node:process';
-
-import { AuthType } from '../core/contentGenerator.js';
-import type { ContentGeneratorConfig } from '../core/contentGenerator.js';
-import type { ContentGeneratorConfigSources } from '../core/contentGenerator.js';
-import { DEFAULT_AIRISCODE_MODEL } from '../config/models.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import { defaultModalities } from '../core/modalityDefaults.js';
-
-import { ModelRegistry } from './modelRegistry.js';
+import process from "node:process";
+import { DEFAULT_AIRISCODE_MODEL } from "../config/models.js";
+import type {
+  ContentGeneratorConfig,
+  ContentGeneratorConfigSources,
+} from "../core/contentGenerator.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { defaultModalities } from "../core/modalityDefaults.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import {
+  CREDENTIAL_FIELDS,
+  MODEL_GENERATION_CONFIG_FIELDS,
+  PROVIDER_SOURCED_FIELDS,
+} from "./constants.js";
+import { ModelRegistry } from "./modelRegistry.js";
 import {
-  type ModelProvidersConfig,
-  type ResolvedModelConfig,
   type AvailableModel,
+  type ModelProvidersConfig,
   type ModelSwitchMetadata,
+  type ResolvedModelConfig,
   type RuntimeModelSnapshot,
-} from './types.js';
-import {
-  MODEL_GENERATION_CONFIG_FIELDS,
-  CREDENTIAL_FIELDS,
-  PROVIDER_SOURCED_FIELDS,
-} from './constants.js';
+} from "./types.js";
 
-export {
-  MODEL_GENERATION_CONFIG_FIELDS,
-  CREDENTIAL_FIELDS,
-  PROVIDER_SOURCED_FIELDS,
-};
+export { CREDENTIAL_FIELDS, MODEL_GENERATION_CONFIG_FIELDS, PROVIDER_SOURCED_FIELDS };
 
 /**
  * Callback for when the model changes.
  * Used by Config to refresh auth/ContentGenerator when needed.
  */
-export type OnModelChangeCallback = (
-  authType: AuthType,
-  requiresRefresh: boolean,
-) => Promise<void>;
+export type OnModelChangeCallback = (authType: AuthType, requiresRefresh: boolean) => Promise<void>;
 
 /**
  * Options for creating ModelsConfig
@@ -127,7 +120,7 @@ export class ModelsConfig {
   private activeRuntimeModelSnapshotId: string | undefined;
 
   private static deepClone<T>(value: T): T {
-    if (value === null || typeof value !== 'object') {
+    if (value === null || typeof value !== "object") {
       return value;
     }
     if (Array.isArray(value)) {
@@ -135,9 +128,7 @@ export class ModelsConfig {
     }
     const out: Record<string, unknown> = {};
     for (const key of Object.keys(value as Record<string, unknown>)) {
-      out[key] = ModelsConfig.deepClone(
-        (value as Record<string, unknown>)[key],
-      );
+      out[key] = ModelsConfig.deepClone((value as Record<string, unknown>)[key]);
     }
     return out as T;
   }
@@ -179,9 +170,7 @@ export class ModelsConfig {
     return {
       currentAuthType: this.currentAuthType,
       generationConfig: ModelsConfig.deepClone(this._generationConfig),
-      generationConfigSources: ModelsConfig.deepClone(
-        this.generationConfigSources,
-      ),
+      generationConfigSources: ModelsConfig.deepClone(this.generationConfigSources),
       strictModelProviderSelection: this.strictModelProviderSelection,
       requireCachedQwenCredentialsOnce: this.requireCachedQwenCredentialsOnce,
       hasManualCredentials: this.hasManualCredentials,
@@ -196,14 +185,13 @@ export class ModelsConfig {
    * @param snapshot - The state snapshot to restore
    */
   private rollbackToStateSnapshot(
-    snapshot: ReturnType<ModelsConfig['createStateSnapshotForRollback']>,
+    snapshot: ReturnType<ModelsConfig["createStateSnapshotForRollback"]>,
   ): void {
     this.currentAuthType = snapshot.currentAuthType;
     this._generationConfig = snapshot.generationConfig;
     this.generationConfigSources = snapshot.generationConfigSources;
     this.strictModelProviderSelection = snapshot.strictModelProviderSelection;
-    this.requireCachedQwenCredentialsOnce =
-      snapshot.requireCachedQwenCredentialsOnce;
+    this.requireCachedQwenCredentialsOnce = snapshot.requireCachedQwenCredentialsOnce;
     this.hasManualCredentials = snapshot.hasManualCredentials;
     this.activeRuntimeModelSnapshotId = snapshot.activeRuntimeModelSnapshotId;
   }
@@ -254,8 +242,7 @@ export class ModelsConfig {
    * - Runtime model option (if active) is included before registry models of the same authType.
    */
   getAllConfiguredModels(authTypes?: AuthType[]): AvailableModel[] {
-    const inputAuthTypes =
-      authTypes && authTypes.length > 0 ? authTypes : Object.values(AuthType);
+    const inputAuthTypes = authTypes && authTypes.length > 0 ? authTypes : Object.values(AuthType);
 
     // De-duplicate while preserving the original order.
     const seen = new Set<AuthType>();
@@ -295,10 +282,7 @@ export class ModelsConfig {
    * Get a fully resolved provider model config for the given authType/modelId.
    * Returns undefined for raw runtime models that are not present in the registry.
    */
-  getResolvedModel(
-    authType: AuthType,
-    modelId: string,
-  ): ResolvedModelConfig | undefined {
+  getResolvedModel(authType: AuthType, modelId: string): ResolvedModelConfig | undefined {
     return this.modelRegistry.getModel(authType, modelId);
   }
 
@@ -306,15 +290,9 @@ export class ModelsConfig {
    * Set model programmatically (e.g., VLM auto-switch, fallback).
    * Supports both registry models and raw model IDs.
    */
-  async setModel(
-    newModel: string,
-    metadata?: ModelSwitchMetadata,
-  ): Promise<void> {
+  async setModel(newModel: string, metadata?: ModelSwitchMetadata): Promise<void> {
     // If model exists in registry, use full switch logic
-    if (
-      this.currentAuthType &&
-      this.modelRegistry.hasModel(this.currentAuthType, newModel)
-    ) {
+    if (this.currentAuthType && this.modelRegistry.hasModel(this.currentAuthType, newModel)) {
       await this.switchModel(this.currentAuthType, newModel);
       return;
     }
@@ -322,9 +300,9 @@ export class ModelsConfig {
     // Raw model override: update generation config in-place
     this.strictModelProviderSelection = false;
     this._generationConfig.model = newModel;
-    this.generationConfigSources['model'] = {
-      kind: 'programmatic',
-      detail: metadata?.reason || 'setModel',
+    this.generationConfigSources["model"] = {
+      kind: "programmatic",
+      detail: metadata?.reason || "setModel",
     };
   }
 
@@ -360,9 +338,7 @@ export class ModelsConfig {
 
       const model = this.modelRegistry.getModel(authType, modelId);
       if (!model) {
-        throw new Error(
-          `Model '${modelId}' not found for authType '${authType}'`,
-        );
+        throw new Error(`Model '${modelId}' not found for authType '${authType}'`);
       }
 
       // Apply model defaults
@@ -373,9 +349,7 @@ export class ModelsConfig {
 
       const requiresRefresh = isAuthTypeChange
         ? true
-        : this.checkRequiresRefresh(
-            rollbackSnapshot.generationConfig.model || '',
-          );
+        : this.checkRequiresRefresh(rollbackSnapshot.generationConfig.model || "");
 
       if (this.onModelChange) {
         await this.onModelChange(authType, requiresRefresh);
@@ -391,7 +365,7 @@ export class ModelsConfig {
    * Prefix used to identify RuntimeModelSnapshot IDs.
    * Chosen to avoid conflicts with real model IDs which may contain `-` or `:`.
    */
-  private static readonly RUNTIME_SNAPSHOT_PREFIX = '$runtime|';
+  private static readonly RUNTIME_SNAPSHOT_PREFIX = "$runtime|";
 
   /**
    * Build a RuntimeModelSnapshot ID from authType and modelId.
@@ -404,10 +378,7 @@ export class ModelsConfig {
    * @param modelId - The model ID
    * @returns The snapshot ID in format `$runtime|${authType}|${modelId}`
    */
-  private buildRuntimeModelSnapshotId(
-    authType: AuthType,
-    modelId: string,
-  ): string {
+  private buildRuntimeModelSnapshotId(authType: AuthType, modelId: string): string {
     return `${ModelsConfig.RUNTIME_SNAPSHOT_PREFIX}${authType}|${modelId}`;
   }
 
@@ -462,23 +433,17 @@ export class ModelsConfig {
    * Merge settings generation config, preserving existing values.
    * Used when provider-sourced config is cleared but settings should still apply.
    */
-  mergeSettingsGenerationConfig(
-    settingsGenerationConfig?: Partial<ContentGeneratorConfig>,
-  ): void {
+  mergeSettingsGenerationConfig(settingsGenerationConfig?: Partial<ContentGeneratorConfig>): void {
     if (!settingsGenerationConfig) {
       return;
     }
 
     for (const field of MODEL_GENERATION_CONFIG_FIELDS) {
-      if (
-        !(field in this._generationConfig) &&
-        field in settingsGenerationConfig
-      ) {
+      if (!(field in this._generationConfig) && field in settingsGenerationConfig) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (this._generationConfig as any)[field] =
-          settingsGenerationConfig[field];
+        (this._generationConfig as any)[field] = settingsGenerationConfig[field];
         this.generationConfigSources[field] = {
-          kind: 'settings',
+          kind: "settings",
           detail: `model.generationConfig.${field}`,
         };
       }
@@ -524,23 +489,23 @@ export class ModelsConfig {
 
     if (credentials.apiKey) {
       this._generationConfig.apiKey = credentials.apiKey;
-      this.generationConfigSources['apiKey'] = {
-        kind: 'programmatic',
-        detail: 'updateCredentials',
+      this.generationConfigSources["apiKey"] = {
+        kind: "programmatic",
+        detail: "updateCredentials",
       };
     }
     if (credentials.baseUrl) {
       this._generationConfig.baseUrl = credentials.baseUrl;
-      this.generationConfigSources['baseUrl'] = {
-        kind: 'programmatic',
-        detail: 'updateCredentials',
+      this.generationConfigSources["baseUrl"] = {
+        kind: "programmatic",
+        detail: "updateCredentials",
       };
     }
     if (credentials.model) {
       this._generationConfig.model = credentials.model;
-      this.generationConfigSources['model'] = {
-        kind: 'programmatic',
-        detail: 'updateCredentials',
+      this.generationConfigSources["model"] = {
+        kind: "programmatic",
+        detail: "updateCredentials",
       };
     }
     // When credentials are manually set, disable strict model provider selection
@@ -590,9 +555,7 @@ export class ModelsConfig {
       this.activeRuntimeModelSnapshotId &&
       this.runtimeModelSnapshots.has(this.activeRuntimeModelSnapshotId)
     ) {
-      const snapshot = this.runtimeModelSnapshots.get(
-        this.activeRuntimeModelSnapshotId,
-      )!;
+      const snapshot = this.runtimeModelSnapshots.get(this.activeRuntimeModelSnapshotId)!;
 
       // Update snapshot with current values (already verified to exist above)
       snapshot.apiKey = apiKey;
@@ -600,10 +563,7 @@ export class ModelsConfig {
       snapshot.modelId = model;
 
       // Update ID if model changed
-      const newSnapshotId = this.buildRuntimeModelSnapshotId(
-        snapshot.authType,
-        snapshot.modelId,
-      );
+      const newSnapshotId = this.buildRuntimeModelSnapshotId(snapshot.authType, snapshot.modelId);
       if (newSnapshotId !== snapshot.id) {
         this.runtimeModelSnapshots.delete(snapshot.id);
         snapshot.id = newSnapshotId;
@@ -626,7 +586,7 @@ export class ModelsConfig {
   private clearProviderSourcedConfig(): void {
     for (const field of PROVIDER_SOURCED_FIELDS) {
       const source = this.generationConfigSources[field];
-      if (source?.kind === 'modelProviders') {
+      if (source?.kind === "modelProviders") {
         // Clear the value - let other layers resolve it
         delete (this._generationConfig as Record<string, unknown>)[field];
         delete this.generationConfigSources[field];
@@ -667,11 +627,11 @@ export class ModelsConfig {
     this.hasManualCredentials = false;
 
     this._generationConfig.model = model.id;
-    this.generationConfigSources['model'] = {
-      kind: 'modelProviders',
+    this.generationConfigSources["model"] = {
+      kind: "modelProviders",
       authType: model.authType,
       modelId: model.id,
-      detail: 'model.id',
+      detail: "model.id",
     };
 
     // Clear credentials to avoid reusing previous model's API key
@@ -684,33 +644,33 @@ export class ModelsConfig {
       const apiKey = process.env[model.envKey];
       if (apiKey) {
         this._generationConfig.apiKey = apiKey;
-        this.generationConfigSources['apiKey'] = {
-          kind: 'env',
+        this.generationConfigSources["apiKey"] = {
+          kind: "env",
           envKey: model.envKey,
           via: {
-            kind: 'modelProviders',
+            kind: "modelProviders",
             authType: model.authType,
             modelId: model.id,
-            detail: 'envKey',
+            detail: "envKey",
           },
         };
       }
       this._generationConfig.apiKeyEnvKey = model.envKey;
-      this.generationConfigSources['apiKeyEnvKey'] = {
-        kind: 'modelProviders',
+      this.generationConfigSources["apiKeyEnvKey"] = {
+        kind: "modelProviders",
         authType: model.authType,
         modelId: model.id,
-        detail: 'envKey',
+        detail: "envKey",
       };
     }
 
     // Base URL
     this._generationConfig.baseUrl = model.baseUrl;
-    this.generationConfigSources['baseUrl'] = {
-      kind: 'modelProviders',
+    this.generationConfigSources["baseUrl"] = {
+      kind: "modelProviders",
       authType: model.authType,
       modelId: model.id,
-      detail: 'baseUrl',
+      detail: "baseUrl",
     };
 
     // Generation config: apply all fields from MODEL_GENERATION_CONFIG_FIELDS
@@ -719,7 +679,7 @@ export class ModelsConfig {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (this._generationConfig as any)[field] = gc[field];
       this.generationConfigSources[field] = {
-        kind: 'modelProviders',
+        kind: "modelProviders",
         authType: model.authType,
         modelId: model.id,
         detail: `generationConfig.${field}`,
@@ -728,19 +688,19 @@ export class ModelsConfig {
 
     // contextWindowSize fallback: auto-detect from model when not set by provider
     if (gc.contextWindowSize === undefined) {
-      this._generationConfig.contextWindowSize = tokenLimit(model.id, 'input');
-      this.generationConfigSources['contextWindowSize'] = {
-        kind: 'computed',
-        detail: 'auto-detected from model',
+      this._generationConfig.contextWindowSize = tokenLimit(model.id, "input");
+      this.generationConfigSources["contextWindowSize"] = {
+        kind: "computed",
+        detail: "auto-detected from model",
       };
     }
 
     // modalities fallback: auto-detect from model when not set by provider
     if (gc.modalities === undefined) {
       this._generationConfig.modalities = defaultModalities(model.id);
-      this.generationConfigSources['modalities'] = {
-        kind: 'computed',
-        detail: 'auto-detected from model',
+      this.generationConfigSources["modalities"] = {
+        kind: "computed",
+        detail: "auto-detected from model",
       };
     }
   }
@@ -768,14 +728,8 @@ export class ModelsConfig {
     }
 
     // Get previous and current model configs
-    const previousModel = this.modelRegistry.getModel(
-      authType,
-      previousModelId,
-    );
-    const currentModel = this.modelRegistry.getModel(
-      authType,
-      this._generationConfig.model || '',
-    );
+    const previousModel = this.modelRegistry.getModel(authType, previousModelId);
+    const currentModel = this.modelRegistry.getModel(authType, this._generationConfig.model || "");
 
     // If either model is not in registry, require refresh to be safe
     if (!previousModel || !currentModel) {
@@ -827,13 +781,11 @@ export class ModelsConfig {
     }
 
     // Step 2: Check if there are existing credentials from other sources (not modelProviders)
-    const apiKeySource = this.generationConfigSources['apiKey'];
-    const baseUrlSource = this.generationConfigSources['baseUrl'];
+    const apiKeySource = this.generationConfigSources["apiKey"];
+    const baseUrlSource = this.generationConfigSources["baseUrl"];
     const hasExistingCredentials =
-      (this._generationConfig.apiKey &&
-        apiKeySource?.kind !== 'modelProviders') ||
-      (this._generationConfig.baseUrl &&
-        baseUrlSource?.kind !== 'modelProviders');
+      (this._generationConfig.apiKey && apiKeySource?.kind !== "modelProviders") ||
+      (this._generationConfig.baseUrl && baseUrlSource?.kind !== "modelProviders");
 
     // Only preserve credentials if:
     // 1. AuthType hasn't changed (credentials are authType-specific), AND
@@ -847,18 +799,17 @@ export class ModelsConfig {
     const isAuthTypeChange = previousAuthType !== authType;
     const shouldPreserveCredentials =
       !isAuthTypeChange &&
-      (modelId === undefined ||
-        !this.modelRegistry.hasModel(authType, modelId)) &&
+      (modelId === undefined || !this.modelRegistry.hasModel(authType, modelId)) &&
       (this.hasManualCredentials || hasExistingCredentials);
 
     if (shouldPreserveCredentials) {
       // Preserve existing credentials, just update authType and modelId if provided
       if (modelId) {
         this._generationConfig.model = modelId;
-        if (!this.generationConfigSources['model']) {
-          this.generationConfigSources['model'] = {
-            kind: 'programmatic',
-            detail: 'auth refresh (preserved credentials)',
+        if (!this.generationConfigSources["model"]) {
+          this.generationConfigSources["model"] = {
+            kind: "programmatic",
+            detail: "auth refresh (preserved credentials)",
           };
         }
       }
@@ -866,8 +817,7 @@ export class ModelsConfig {
     }
 
     // Step 3: Fall back to default model for the authType
-    const defaultModel =
-      this.modelRegistry.getDefaultModelForAuthType(authType);
+    const defaultModel = this.modelRegistry.getDefaultModelForAuthType(authType);
     if (defaultModel) {
       this.applyResolvedModelDefaults(defaultModel);
       // Clear active runtime model snapshot since we're now using a registry model
@@ -879,10 +829,10 @@ export class ModelsConfig {
     // resolveContentGeneratorConfigWithSources will throw exceptions as expected
     if (modelId) {
       this._generationConfig.model = modelId;
-      if (!this.generationConfigSources['model']) {
-        this.generationConfigSources['model'] = {
-          kind: 'programmatic',
-          detail: 'auth refresh (no default model)',
+      if (!this.generationConfigSources["model"]) {
+        this.generationConfigSources["model"] = {
+          kind: "programmatic",
+          detail: "auth refresh (no default model)",
         };
       }
     }
@@ -927,18 +877,14 @@ export class ModelsConfig {
     }
 
     // Check if we have valid credentials (apiKey + baseUrl)
-    const hasValidCredentials =
-      this._generationConfig.apiKey && this._generationConfig.baseUrl;
+    const hasValidCredentials = this._generationConfig.apiKey && this._generationConfig.baseUrl;
 
     if (!hasValidCredentials) {
       return undefined;
     }
 
     // Create or update RuntimeModelSnapshot
-    const snapshotId = this.buildRuntimeModelSnapshotId(
-      currentAuthType,
-      currentModel,
-    );
+    const snapshotId = this.buildRuntimeModelSnapshotId(currentAuthType, currentModel);
     const snapshot: RuntimeModelSnapshot = {
       id: snapshotId,
       authType: currentAuthType,
@@ -999,8 +945,7 @@ export class ModelsConfig {
     const rollbackSnapshot = this.createStateSnapshotForRollback();
 
     try {
-      const isAuthTypeChange =
-        runtimeModelSnapshot.authType !== this.currentAuthType;
+      const isAuthTypeChange = runtimeModelSnapshot.authType !== this.currentAuthType;
       this.currentAuthType = runtimeModelSnapshot.authType;
       this.activeRuntimeModelSnapshotId = snapshotId;
 
@@ -1009,28 +954,24 @@ export class ModelsConfig {
       this.hasManualCredentials = true; // Mark as manual to prevent provider override
 
       this._generationConfig.model = runtimeModelSnapshot.modelId;
-      this.generationConfigSources['model'] = {
-        kind: 'programmatic',
-        detail: 'runtimeModelSwitch',
+      this.generationConfigSources["model"] = {
+        kind: "programmatic",
+        detail: "runtimeModelSwitch",
       };
 
       if (runtimeModelSnapshot.apiKey) {
         this._generationConfig.apiKey = runtimeModelSnapshot.apiKey;
-        this.generationConfigSources['apiKey'] = runtimeModelSnapshot.sources[
-          'apiKey'
-        ] || {
-          kind: 'programmatic',
-          detail: 'runtimeModelSwitch',
+        this.generationConfigSources["apiKey"] = runtimeModelSnapshot.sources["apiKey"] || {
+          kind: "programmatic",
+          detail: "runtimeModelSwitch",
         };
       }
 
       if (runtimeModelSnapshot.baseUrl) {
         this._generationConfig.baseUrl = runtimeModelSnapshot.baseUrl;
-        this.generationConfigSources['baseUrl'] = runtimeModelSnapshot.sources[
-          'baseUrl'
-        ] || {
-          kind: 'programmatic',
-          detail: 'runtimeModelSwitch',
+        this.generationConfigSources["baseUrl"] = runtimeModelSnapshot.sources["baseUrl"] || {
+          kind: "programmatic",
+          detail: "runtimeModelSwitch",
         };
       }
 
@@ -1040,19 +981,13 @@ export class ModelsConfig {
 
       // Apply generation config
       if (runtimeModelSnapshot.generationConfig) {
-        Object.assign(
-          this._generationConfig,
-          runtimeModelSnapshot.generationConfig,
-        );
+        Object.assign(this._generationConfig, runtimeModelSnapshot.generationConfig);
       }
 
       const requiresRefresh = isAuthTypeChange;
 
       if (this.onModelChange) {
-        await this.onModelChange(
-          runtimeModelSnapshot.authType,
-          requiresRefresh,
-        );
+        await this.onModelChange(runtimeModelSnapshot.authType, requiresRefresh);
       }
     } catch (error) {
       this.rollbackToStateSnapshot(rollbackSnapshot);
@@ -1144,9 +1079,7 @@ export class ModelsConfig {
    *
    * @param modelProvidersConfig - The updated model providers configuration
    */
-  reloadModelProvidersConfig(
-    modelProvidersConfig?: ModelProvidersConfig,
-  ): void {
+  reloadModelProvidersConfig(modelProvidersConfig?: ModelProvidersConfig): void {
     this.modelRegistry.reloadModels(modelProvidersConfig);
   }
 }
diff --git a/packages/airiscode-core/src/models/types.ts b/packages/airiscode-core/src/models/types.ts
index 7a2fd00ab..8368e73a9 100644
--- a/packages/airiscode-core/src/models/types.ts
+++ b/packages/airiscode-core/src/models/types.ts
@@ -8,8 +8,8 @@ import type {
   AuthType,
   ContentGeneratorConfig,
   InputModalities,
-} from '../core/contentGenerator.js';
-import type { ConfigSources } from '../utils/configResolver.js';
+} from "../core/contentGenerator.js";
+import type { ConfigSources } from "../utils/configResolver.js";
 
 /**
  * Model capabilities configuration
@@ -27,17 +27,17 @@ export interface ModelCapabilities {
  */
 export type ModelGenerationConfig = Pick<
   ContentGeneratorConfig,
-  | 'samplingParams'
-  | 'timeout'
-  | 'maxRetries'
-  | 'retryErrorCodes'
-  | 'enableCacheControl'
-  | 'schemaCompliance'
-  | 'reasoning'
-  | 'customHeaders'
-  | 'extra_body'
-  | 'contextWindowSize'
-  | 'modalities'
+  | "samplingParams"
+  | "timeout"
+  | "maxRetries"
+  | "retryErrorCodes"
+  | "enableCacheControl"
+  | "schemaCompliance"
+  | "reasoning"
+  | "customHeaders"
+  | "extra_body"
+  | "contextWindowSize"
+  | "modalities"
 >;
 
 /**
diff --git a/packages/airiscode-core/src/output/json-formatter.ts b/packages/airiscode-core/src/output/json-formatter.ts
index 83ea3e386..1229fd08e 100644
--- a/packages/airiscode-core/src/output/json-formatter.ts
+++ b/packages/airiscode-core/src/output/json-formatter.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
-import type { JsonError, JsonOutput } from './types.js';
+import stripAnsi from "strip-ansi";
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import type { JsonError, JsonOutput } from "./types.js";
 
 export class JsonFormatter {
   format(response?: string, stats?: SessionMetrics, error?: JsonError): string {
diff --git a/packages/airiscode-core/src/output/types.ts b/packages/airiscode-core/src/output/types.ts
index 4a300a437..3fbccde94 100644
--- a/packages/airiscode-core/src/output/types.ts
+++ b/packages/airiscode-core/src/output/types.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
 
 export enum InputFormat {
-  TEXT = 'text',
-  STREAM_JSON = 'stream-json',
+  TEXT = "text",
+  STREAM_JSON = "stream-json",
 }
 
 export enum OutputFormat {
-  TEXT = 'text',
-  JSON = 'json',
-  STREAM_JSON = 'stream-json',
+  TEXT = "text",
+  JSON = "json",
+  STREAM_JSON = "stream-json",
 }
 
 export interface JsonError {
diff --git a/packages/airiscode-core/src/permissions/index.ts b/packages/airiscode-core/src/permissions/index.ts
index f03062aa7..d195c04a9 100644
--- a/packages/airiscode-core/src/permissions/index.ts
+++ b/packages/airiscode-core/src/permissions/index.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './types.js';
-export * from './rule-parser.js';
-export { PermissionManager } from './permission-manager.js';
-export type { PermissionManagerConfig } from './permission-manager.js';
-export { extractShellOperations } from './shell-semantics.js';
-export type { ShellOperation } from './shell-semantics.js';
+export type { PermissionManagerConfig } from "./permission-manager.js";
+export { PermissionManager } from "./permission-manager.js";
+export * from "./rule-parser.js";
+export type { ShellOperation } from "./shell-semantics.js";
+export { extractShellOperations } from "./shell-semantics.js";
+export * from "./types.js";
diff --git a/packages/airiscode-core/src/permissions/permission-manager.ts b/packages/airiscode-core/src/permissions/permission-manager.ts
index 3f38347f9..2544c39a2 100644
--- a/packages/airiscode-core/src/permissions/permission-manager.ts
+++ b/packages/airiscode-core/src/permissions/permission-manager.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { detectCommandSubstitution } from "../utils/shell-utils.js";
+import { isShellCommandReadOnlyAST } from "../utils/shellAstParser.js";
+import type { PathMatchContext } from "./rule-parser.js";
 import {
-  parseRules,
-  parseRule,
   matchesRule,
+  parseRule,
+  parseRules,
   resolveToolName,
   splitCompoundCommand,
-} from './rule-parser.js';
-import type { PathMatchContext } from './rule-parser.js';
-import { extractShellOperations } from './shell-semantics.js';
-import type { ShellOperation } from './shell-semantics.js';
-import { isShellCommandReadOnlyAST } from '../utils/shellAstParser.js';
-import { detectCommandSubstitution } from '../utils/shell-utils.js';
+} from "./rule-parser.js";
+import type { ShellOperation } from "./shell-semantics.js";
+import { extractShellOperations } from "./shell-semantics.js";
 import type {
   PermissionCheckContext,
   PermissionDecision,
   PermissionRule,
   PermissionRuleSet,
+  RuleScope,
   RuleType,
   RuleWithSource,
-  RuleScope,
-} from './types.js';
+} from "./types.js";
 
 /**
  * Numeric priority for each PermissionDecision.
@@ -139,9 +139,7 @@ export class PermissionManager {
     // because the registry check is at the tool level, not the invocation level.
     const rawCoreTools = this.config.getCoreTools?.();
     if (rawCoreTools && rawCoreTools.length > 0) {
-      this.coreToolsAllowList = new Set(
-        rawCoreTools.map((t) => parseRule(t).toolName),
-      );
+      this.coreToolsAllowList = new Set(rawCoreTools.map((t) => parseRule(t).toolName));
     }
   }
 
@@ -173,11 +171,7 @@ export class PermissionManager {
     // For shell commands, resolve 'default' to actual permission using AST analysis
     // This ensures 'default' is never returned for shell commands - they always get
     // a concrete permission (deny/ask/allow) based on the command's readonly status.
-    if (
-      decision === 'default' &&
-      toolName === 'run_shell_command' &&
-      command !== undefined
-    ) {
+    if (decision === "default" && toolName === "run_shell_command" && command !== undefined) {
       return this.resolveDefaultPermission(command);
     }
 
@@ -206,44 +200,28 @@ export class PermissionManager {
           }
         : undefined;
 
-    const matchArgs = [
-      toolName,
-      command,
-      filePath,
-      domain,
-      pathCtx,
-      specifier,
-    ] as const;
+    const matchArgs = [toolName, command, filePath, domain, pathCtx, specifier] as const;
 
     // Compute the base decision from explicit Bash/file/domain rules.
     // Using an IIFE to keep the priority-cascade logic clean.
     const baseDecision: PermissionDecision = (() => {
       // Priority 1: deny rules (session first, then persistent)
-      for (const rule of [
-        ...this.sessionRules.deny,
-        ...this.persistentRules.deny,
-      ]) {
-        if (matchesRule(rule, ...matchArgs)) return 'deny';
+      for (const rule of [...this.sessionRules.deny, ...this.persistentRules.deny]) {
+        if (matchesRule(rule, ...matchArgs)) return "deny";
       }
       // Priority 2: ask rules
-      for (const rule of [
-        ...this.sessionRules.ask,
-        ...this.persistentRules.ask,
-      ]) {
-        if (matchesRule(rule, ...matchArgs)) return 'ask';
+      for (const rule of [...this.sessionRules.ask, ...this.persistentRules.ask]) {
+        if (matchesRule(rule, ...matchArgs)) return "ask";
       }
       // Priority 3: allow rules
-      for (const rule of [
-        ...this.sessionRules.allow,
-        ...this.persistentRules.allow,
-      ]) {
-        if (matchesRule(rule, ...matchArgs)) return 'allow';
+      for (const rule of [...this.sessionRules.allow, ...this.persistentRules.allow]) {
+        if (matchesRule(rule, ...matchArgs)) return "allow";
       }
-      return 'default';
+      return "default";
     })();
 
     // `deny` is the most restrictive result — no further checks needed.
-    if (baseDecision === 'deny') return 'deny';
+    if (baseDecision === "deny") return "deny";
 
     // For shell commands: evaluate virtual file/network operations extracted
     // from the command string against Read/Edit/Write/WebFetch/ListFiles rules.
@@ -253,14 +231,14 @@ export class PermissionManager {
     // must never downgrade an explicit 'allow' decision from a Bash rule.
     // Example: `git status` has no file ops; an allow rule for `Bash(git *)`
     // should return 'allow', not be downgraded to 'default'.
-    if (toolName === 'run_shell_command' && command !== undefined) {
+    if (toolName === "run_shell_command" && command !== undefined) {
       const cwd = pathCtx?.cwd ?? process.cwd();
       const virtualDecision = this.evaluateShellVirtualOps(
         extractShellOperations(command, cwd),
         pathCtx,
       );
       if (
-        virtualDecision !== 'default' &&
+        virtualDecision !== "default" &&
         DECISION_PRIORITY[virtualDecision] > DECISION_PRIORITY[baseDecision]
       ) {
         return virtualDecision;
@@ -283,9 +261,9 @@ export class PermissionManager {
     ops: ShellOperation[],
     _pathCtx: PathMatchContext | undefined,
   ): PermissionDecision {
-    if (ops.length === 0) return 'default';
+    if (ops.length === 0) return "default";
 
-    let worst: PermissionDecision = 'default';
+    let worst: PermissionDecision = "default";
 
     for (const op of ops) {
       // Evaluate the virtual operation using the standard rule-matching path.
@@ -299,7 +277,7 @@ export class PermissionManager {
 
       if (DECISION_PRIORITY[opDecision] > DECISION_PRIORITY[worst]) {
         worst = opDecision;
-        if (worst === 'deny') return 'deny'; // short-circuit
+        if (worst === "deny") return "deny"; // short-circuit
       }
     }
 
@@ -328,14 +306,14 @@ export class PermissionManager {
     subCommands: string[],
   ): Promise<PermissionDecision> {
     // Type for resolved decisions (excludes 'default' since it's resolved)
-    type ResolvedDecision = 'allow' | 'ask' | 'deny';
+    type ResolvedDecision = "allow" | "ask" | "deny";
     const PRIORITY: Record<ResolvedDecision, number> = {
       deny: 3,
       ask: 2,
       allow: 0,
     };
 
-    let mostRestrictive: ResolvedDecision = 'allow';
+    let mostRestrictive: ResolvedDecision = "allow";
 
     for (const subCmd of subCommands) {
       const subCtx: PermissionCheckContext = {
@@ -347,7 +325,7 @@ export class PermissionManager {
       // Resolve 'default' to actual permission using AST analysis
       // (same logic as ShellToolInvocation.getDefaultPermission)
       const decision: ResolvedDecision =
-        rawDecision === 'default'
+        rawDecision === "default"
           ? await this.resolveDefaultPermission(subCmd)
           : (rawDecision as ResolvedDecision);
 
@@ -356,8 +334,8 @@ export class PermissionManager {
       }
 
       // Short-circuit: deny is the most restrictive possible
-      if (mostRestrictive === 'deny') {
-        return 'deny';
+      if (mostRestrictive === "deny") {
+        return "deny";
       }
     }
 
@@ -371,25 +349,23 @@ export class PermissionManager {
    * @param command - The shell command to analyze.
    * @returns 'deny' for command substitution, 'allow' for read-only, 'ask' otherwise.
    */
-  private async resolveDefaultPermission(
-    command: string,
-  ): Promise<'allow' | 'ask' | 'deny'> {
+  private async resolveDefaultPermission(command: string): Promise<"allow" | "ask" | "deny"> {
     // Security: command substitution ($(), ``, <(), >()) → deny
     if (detectCommandSubstitution(command)) {
-      return 'deny';
+      return "deny";
     }
 
     // AST-based read-only detection
     try {
       const isReadOnly = await isShellCommandReadOnlyAST(command);
       if (isReadOnly) {
-        return 'allow';
+        return "allow";
       }
     } catch {
       // AST check failed, fall back to 'ask'
     }
 
-    return 'ask';
+    return "ask";
   }
 
   // ---------------------------------------------------------------------------
@@ -401,21 +377,21 @@ export class PermissionManager {
    * Tools not in this set (MCP, Skill, Agent, etc.) bypass the check.
    */
   private static readonly CORE_TOOLS = new Set([
-    'read_file',
-    'write_file',
-    'edit',
-    'glob',
-    'grep_search',
-    'run_shell_command',
-    'list_directory',
-    'web_fetch',
-    'web_search',
-    'todo_write',
-    'save_memory',
-    'lsp',
-    'cron_create',
-    'cron_list',
-    'cron_delete',
+    "read_file",
+    "write_file",
+    "edit",
+    "glob",
+    "grep_search",
+    "run_shell_command",
+    "list_directory",
+    "web_fetch",
+    "web_search",
+    "todo_write",
+    "save_memory",
+    "lsp",
+    "cron_create",
+    "cron_list",
+    "cron_delete",
   ]);
 
   /**
@@ -443,7 +419,7 @@ export class PermissionManager {
     // Non-core tools bypass coreTools allowlist check
     if (!this.isCoreTool(canonicalName)) {
       const decision = await this.evaluate({ toolName: canonicalName });
-      return decision !== 'deny';
+      return decision !== "deny";
     }
 
     // Core tools: if a coreTools allowlist is active, only explicitly listed
@@ -458,7 +434,7 @@ export class PermissionManager {
     // evaluate({ toolName }) without a command will only match rules that have
     // no specifier, which is the correct registry-level check.
     const decision = await this.evaluate({ toolName: canonicalName });
-    return decision !== 'deny';
+    return decision !== "deny";
   }
 
   /**
@@ -478,19 +454,9 @@ export class PermissionManager {
           }
         : undefined;
 
-    const matchArgs = [
-      toolName,
-      command,
-      filePath,
-      domain,
-      pathCtx,
-      specifier,
-    ] as const;
+    const matchArgs = [toolName, command, filePath, domain, pathCtx, specifier] as const;
 
-    for (const rule of [
-      ...this.sessionRules.deny,
-      ...this.persistentRules.deny,
-    ]) {
+    for (const rule of [...this.sessionRules.deny, ...this.persistentRules.deny]) {
       if (matchesRule(rule, ...matchArgs)) {
         return rule.raw;
       }
@@ -510,7 +476,7 @@ export class PermissionManager {
    */
   async isCommandAllowed(command: string): Promise<PermissionDecision> {
     return this.evaluate({
-      toolName: 'run_shell_command',
+      toolName: "run_shell_command",
       command,
     });
   }
@@ -543,12 +509,10 @@ export class PermissionManager {
   hasRelevantRules(ctx: PermissionCheckContext): boolean {
     const { toolName, command, filePath, domain, specifier } = ctx;
 
-    if (ctx.toolName === 'run_shell_command' && command !== undefined) {
+    if (ctx.toolName === "run_shell_command" && command !== undefined) {
       const subCommands = splitCompoundCommand(command);
       if (subCommands.length > 1) {
-        return subCommands.some((subCmd) =>
-          this.hasRelevantRules({ ...ctx, command: subCmd }),
-        );
+        return subCommands.some((subCmd) => this.hasRelevantRules({ ...ctx, command: subCmd }));
       }
     }
 
@@ -560,14 +524,7 @@ export class PermissionManager {
           }
         : undefined;
 
-    const matchArgs = [
-      toolName,
-      command,
-      filePath,
-      domain,
-      pathCtx,
-      specifier,
-    ] as const;
+    const matchArgs = [toolName, command, filePath, domain, pathCtx, specifier] as const;
 
     const allRules = [
       ...this.sessionRules.allow,
@@ -584,7 +541,7 @@ export class PermissionManager {
     // extracted from the command has a relevant rule. This ensures the PM is
     // consulted (and the confirmation dialog shown) when Read/Edit/etc. rules
     // would match equivalent shell commands.
-    if (ctx.toolName === 'run_shell_command' && ctx.command !== undefined) {
+    if (ctx.toolName === "run_shell_command" && ctx.command !== undefined) {
       const cwd = pathCtx?.cwd ?? process.cwd();
       const ops = extractShellOperations(ctx.command, cwd);
       if (
@@ -619,12 +576,10 @@ export class PermissionManager {
   hasMatchingAskRule(ctx: PermissionCheckContext): boolean {
     const { toolName, command, filePath, domain, specifier } = ctx;
 
-    if (ctx.toolName === 'run_shell_command' && command !== undefined) {
+    if (ctx.toolName === "run_shell_command" && command !== undefined) {
       const subCommands = splitCompoundCommand(command);
       if (subCommands.length > 1) {
-        return subCommands.some((subCmd) =>
-          this.hasMatchingAskRule({ ...ctx, command: subCmd }),
-        );
+        return subCommands.some((subCmd) => this.hasMatchingAskRule({ ...ctx, command: subCmd }));
       }
     }
 
@@ -636,14 +591,7 @@ export class PermissionManager {
           }
         : undefined;
 
-    const matchArgs = [
-      toolName,
-      command,
-      filePath,
-      domain,
-      pathCtx,
-      specifier,
-    ] as const;
+    const matchArgs = [toolName, command, filePath, domain, pathCtx, specifier] as const;
 
     const askRules = [...this.sessionRules.ask, ...this.persistentRules.ask];
 
@@ -651,7 +599,7 @@ export class PermissionManager {
       return true;
     }
 
-    if (ctx.toolName === 'run_shell_command' && ctx.command !== undefined) {
+    if (ctx.toolName === "run_shell_command" && ctx.command !== undefined) {
       const cwd = pathCtx?.cwd ?? process.cwd();
       const ops = extractShellOperations(ctx.command, cwd);
       return ops.some((op) => {
@@ -753,7 +701,7 @@ export class PermissionManager {
    * determine the actual behavior (ask vs allow).
    */
   getDefaultMode(): string {
-    return this.config.getApprovalMode?.() ?? 'default';
+    return this.config.getApprovalMode?.() ?? "default";
   }
 
   /**
@@ -783,22 +731,18 @@ export class PermissionManager {
   listRules(): RuleWithSource[] {
     const result: RuleWithSource[] = [];
 
-    const addRules = (
-      rules: PermissionRule[],
-      type: RuleType,
-      scope: RuleScope,
-    ) => {
+    const addRules = (rules: PermissionRule[], type: RuleType, scope: RuleScope) => {
       for (const rule of rules) {
         result.push({ rule, type, scope });
       }
     };
 
-    addRules(this.sessionRules.deny, 'deny', 'session');
-    addRules(this.persistentRules.deny, 'deny', 'user');
-    addRules(this.sessionRules.ask, 'ask', 'session');
-    addRules(this.persistentRules.ask, 'ask', 'user');
-    addRules(this.sessionRules.allow, 'allow', 'session');
-    addRules(this.persistentRules.allow, 'allow', 'user');
+    addRules(this.sessionRules.deny, "deny", "session");
+    addRules(this.persistentRules.deny, "deny", "user");
+    addRules(this.sessionRules.ask, "ask", "session");
+    addRules(this.persistentRules.ask, "ask", "user");
+    addRules(this.sessionRules.allow, "allow", "session");
+    addRules(this.persistentRules.allow, "allow", "user");
 
     return result;
   }
diff --git a/packages/airiscode-core/src/permissions/rule-parser.ts b/packages/airiscode-core/src/permissions/rule-parser.ts
index 3c471439a..9ddfbe8e9 100644
--- a/packages/airiscode-core/src/permissions/rule-parser.ts
+++ b/packages/airiscode-core/src/permissions/rule-parser.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import os from 'node:os';
-import picomatch from 'picomatch';
-import { parse } from 'shell-quote';
+import os from "node:os";
+import path from "node:path";
+import picomatch from "picomatch";
+import { parse } from "shell-quote";
 
 /**
  * Normalize a filesystem path to use POSIX-style forward slashes.
@@ -21,13 +21,10 @@ import { parse } from 'shell-quote';
  *   toPosixPath('/home/user/project') → '/home/user/project' (no-op on POSIX)
  */
 function toPosixPath(p: string): string {
-  return p.replace(/\\/g, '/');
+  return p.replace(/\\/g, "/");
 }
-import type {
-  PermissionCheckContext,
-  PermissionRule,
-  SpecifierKind,
-} from './types.js';
+
+import type { PermissionCheckContext, PermissionRule, SpecifierKind } from "./types.js";
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Tool name aliases & categories
@@ -39,100 +36,100 @@ import type {
  */
 export const TOOL_NAME_ALIASES: Readonly<Record<string, string>> = {
   // Shell tool
-  run_shell_command: 'run_shell_command',
-  Shell: 'run_shell_command',
-  ShellTool: 'run_shell_command',
-  Bash: 'run_shell_command', // Claude Code compatibility
+  run_shell_command: "run_shell_command",
+  Shell: "run_shell_command",
+  ShellTool: "run_shell_command",
+  Bash: "run_shell_command", // Claude Code compatibility
 
   // Edit tool — "Edit" is also a meta-category covering edit + write_file
-  edit: 'edit',
-  Edit: 'edit',
-  EditTool: 'edit',
+  edit: "edit",
+  Edit: "edit",
+  EditTool: "edit",
 
   // Write File tool — also matched by "Edit" meta-category rules
-  write_file: 'write_file',
-  WriteFile: 'write_file',
-  WriteFileTool: 'write_file',
-  Write: 'write_file',
+  write_file: "write_file",
+  WriteFile: "write_file",
+  WriteFileTool: "write_file",
+  Write: "write_file",
 
   // Read File tool — "Read" is also a meta-category covering read_file + grep + glob + list_directory
-  read_file: 'read_file',
-  ReadFile: 'read_file',
-  ReadFileTool: 'read_file',
-  Read: 'read_file',
+  read_file: "read_file",
+  ReadFile: "read_file",
+  ReadFileTool: "read_file",
+  Read: "read_file",
 
   // Grep tool — also matched by "Read" meta-category rules
-  grep_search: 'grep_search',
-  Grep: 'grep_search',
-  GrepTool: 'grep_search',
-  search_file_content: 'grep_search', // legacy
-  SearchFiles: 'grep_search', // legacy display name
+  grep_search: "grep_search",
+  Grep: "grep_search",
+  GrepTool: "grep_search",
+  search_file_content: "grep_search", // legacy
+  SearchFiles: "grep_search", // legacy display name
 
   // Glob tool — also matched by "Read" meta-category rules
-  glob: 'glob',
-  Glob: 'glob',
-  GlobTool: 'glob',
-  FindFiles: 'glob', // legacy display name
+  glob: "glob",
+  Glob: "glob",
+  GlobTool: "glob",
+  FindFiles: "glob", // legacy display name
 
   // List Directory tool — also matched by "Read" meta-category rules
-  list_directory: 'list_directory',
-  ListFiles: 'list_directory',
-  ListFilesTool: 'list_directory',
-  ReadFolder: 'list_directory', // legacy display name
+  list_directory: "list_directory",
+  ListFiles: "list_directory",
+  ListFilesTool: "list_directory",
+  ReadFolder: "list_directory", // legacy display name
 
   // Memory tool
-  save_memory: 'save_memory',
-  SaveMemory: 'save_memory',
-  SaveMemoryTool: 'save_memory',
+  save_memory: "save_memory",
+  SaveMemory: "save_memory",
+  SaveMemoryTool: "save_memory",
 
   // TodoWrite tool
-  todo_write: 'todo_write',
-  TodoWrite: 'todo_write',
-  TodoWriteTool: 'todo_write',
+  todo_write: "todo_write",
+  TodoWrite: "todo_write",
+  TodoWriteTool: "todo_write",
 
   // WebFetch tool
-  web_fetch: 'web_fetch',
-  WebFetch: 'web_fetch',
-  WebFetchTool: 'web_fetch',
+  web_fetch: "web_fetch",
+  WebFetch: "web_fetch",
+  WebFetchTool: "web_fetch",
 
   // WebSearch tool
-  web_search: 'web_search',
-  WebSearch: 'web_search',
-  WebSearchTool: 'web_search',
+  web_search: "web_search",
+  WebSearch: "web_search",
+  WebSearchTool: "web_search",
 
   // Agent (subagent) tool
-  agent: 'agent',
-  Agent: 'agent',
-  AgentTool: 'agent',
+  agent: "agent",
+  Agent: "agent",
+  AgentTool: "agent",
 
   // Legacy aliases for the agent tool (renamed from "task")
-  task: 'agent',
-  Task: 'agent',
-  TaskTool: 'agent',
+  task: "agent",
+  Task: "agent",
+  TaskTool: "agent",
 
   // Skill tool
-  skill: 'skill',
-  Skill: 'skill',
-  SkillTool: 'skill',
+  skill: "skill",
+  Skill: "skill",
+  SkillTool: "skill",
 
   // ExitPlanMode tool
-  exit_plan_mode: 'exit_plan_mode',
-  ExitPlanMode: 'exit_plan_mode',
-  ExitPlanModeTool: 'exit_plan_mode',
+  exit_plan_mode: "exit_plan_mode",
+  ExitPlanMode: "exit_plan_mode",
+  ExitPlanModeTool: "exit_plan_mode",
 
   // LSP tool
-  lsp: 'lsp',
-  Lsp: 'lsp',
-  LspTool: 'lsp',
+  lsp: "lsp",
+  Lsp: "lsp",
+  LspTool: "lsp",
 
   // Legacy edit tool name
-  replace: 'edit',
+  replace: "edit",
 };
 
 /**
  * Shell tool canonical names.
  */
-const SHELL_TOOL_NAMES = new Set(['run_shell_command']);
+const SHELL_TOOL_NAMES = new Set(["run_shell_command"]);
 
 /**
  * File-reading tools — "Read" rules apply to all of these (best-effort).
@@ -140,24 +137,19 @@ const SHELL_TOOL_NAMES = new Set(['run_shell_command']);
  * Per Claude Code docs: "Claude makes a best-effort attempt to apply Read rules
  * to all built-in tools that read files like Grep and Glob."
  */
-const READ_TOOLS = new Set([
-  'read_file',
-  'grep_search',
-  'glob',
-  'list_directory',
-]);
+const READ_TOOLS = new Set(["read_file", "grep_search", "glob", "list_directory"]);
 
 /**
  * File-editing tools — "Edit" rules apply to all of these.
  *
  * Per Claude Code docs: "Edit rules apply to all built-in tools that edit files."
  */
-const EDIT_TOOLS = new Set(['edit', 'write_file']);
+const EDIT_TOOLS = new Set(["edit", "write_file"]);
 
 /**
  * WebFetch tools.
  */
-const WEBFETCH_TOOLS = new Set(['web_fetch']);
+const WEBFETCH_TOOLS = new Set(["web_fetch"]);
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Tool name resolution & categorization
@@ -178,15 +170,15 @@ export function resolveToolName(rawName: string): string {
  */
 export function getSpecifierKind(canonicalToolName: string): SpecifierKind {
   if (SHELL_TOOL_NAMES.has(canonicalToolName)) {
-    return 'command';
+    return "command";
   }
   if (READ_TOOLS.has(canonicalToolName) || EDIT_TOOLS.has(canonicalToolName)) {
-    return 'path';
+    return "path";
   }
   if (WEBFETCH_TOOLS.has(canonicalToolName)) {
-    return 'domain';
+    return "domain";
   }
-  return 'literal';
+  return "literal";
 }
 
 /**
@@ -196,19 +188,16 @@ export function getSpecifierKind(canonicalToolName: string): SpecifierKind {
  * "Read" → resolves to "read_file", but also covers grep_search, glob, list_directory
  * "Edit" → resolves to "edit", but also covers write_file
  */
-export function toolMatchesRuleToolName(
-  ruleToolName: string,
-  contextToolName: string,
-): boolean {
+export function toolMatchesRuleToolName(ruleToolName: string, contextToolName: string): boolean {
   if (ruleToolName === contextToolName) {
     return true;
   }
   // "Read" → covers all READ_TOOLS
-  if (ruleToolName === 'read_file' && READ_TOOLS.has(contextToolName)) {
+  if (ruleToolName === "read_file" && READ_TOOLS.has(contextToolName)) {
     return true;
   }
   // "Edit" → covers all EDIT_TOOLS
-  if (ruleToolName === 'edit' && EDIT_TOOLS.has(contextToolName)) {
+  if (ruleToolName === "edit" && EDIT_TOOLS.has(contextToolName)) {
     return true;
   }
   return false;
@@ -238,9 +227,9 @@ export function parseRule(raw: string): PermissionRule {
 
   // Handle legacy `:*` suffix (deprecated, equivalent to ` *`)
   // e.g. "Bash(git:*)" → "Bash(git *)"
-  const normalized = trimmed.replace(/:(\*)/, ' $1');
+  const normalized = trimmed.replace(/:(\*)/, " $1");
 
-  const openParen = normalized.indexOf('(');
+  const openParen = normalized.indexOf("(");
 
   if (openParen === -1) {
     // Simple tool name rule (no specifier)
@@ -252,7 +241,7 @@ export function parseRule(raw: string): PermissionRule {
   }
 
   const toolPart = normalized.substring(0, openParen).trim();
-  const specifier = normalized.endsWith(')')
+  const specifier = normalized.endsWith(")")
     ? normalized.substring(openParen + 1, normalized.length - 1)
     : undefined;
 
@@ -290,26 +279,26 @@ export function parseRules(raws: string[]): PermissionRule[] {
  */
 const CANONICAL_TO_RULE_DISPLAY: Readonly<Record<string, string>> = {
   // Read meta-category
-  read_file: 'Read',
-  grep_search: 'Read',
-  glob: 'Read',
-  list_directory: 'Read',
+  read_file: "Read",
+  grep_search: "Read",
+  glob: "Read",
+  list_directory: "Read",
   // Edit meta-category
-  edit: 'Edit',
-  write_file: 'Edit',
+  edit: "Edit",
+  write_file: "Edit",
   // Shell
-  run_shell_command: 'Bash',
+  run_shell_command: "Bash",
   // Web
-  web_fetch: 'WebFetch',
-  web_search: 'WebSearch',
+  web_fetch: "WebFetch",
+  web_search: "WebSearch",
   // Agent / Skill
-  agent: 'Agent',
-  skill: 'Skill',
+  agent: "Agent",
+  skill: "Skill",
   // Others
-  save_memory: 'SaveMemory',
-  todo_write: 'TodoWrite',
-  lsp: 'Lsp',
-  exit_plan_mode: 'ExitPlanMode',
+  save_memory: "SaveMemory",
+  todo_write: "TodoWrite",
+  lsp: "Lsp",
+  exit_plan_mode: "ExitPlanMode",
 };
 
 /**
@@ -332,7 +321,7 @@ export function getRuleDisplayName(canonicalToolName: string): string {
  * Directory-targeted tools (list_directory, grep_search, glob) already receive
  * a directory path, so they use it as-is.
  */
-const FILE_TARGETED_TOOLS = new Set(['read_file', 'edit', 'write_file']);
+const FILE_TARGETED_TOOLS = new Set(["read_file", "edit", "write_file"]);
 
 /**
  * Build minimum-scope permission rule strings from a permission check context.
@@ -365,7 +354,7 @@ export function buildPermissionRules(ctx: PermissionCheckContext): string[] {
   const kind = getSpecifierKind(canonicalName);
 
   switch (kind) {
-    case 'command':
+    case "command":
       // Shell commands — fallback only; shell.ts provides its own rules via
       // extractCommandRules which are more granular (per-simple-command).
       if (ctx.command) {
@@ -373,7 +362,7 @@ export function buildPermissionRules(ctx: PermissionCheckContext): string[] {
       }
       return [displayName];
 
-    case 'path':
+    case "path":
       if (ctx.filePath) {
         // For file-targeted tools, scope to the containing directory;
         // for directory-targeted tools the path is already a directory.
@@ -384,20 +373,18 @@ export function buildPermissionRules(ctx: PermissionCheckContext): string[] {
         // Append `/**` so the gitignore-style glob matches all files in the
         // directory recursively (picomatch uses `**` for recursive descent).
         // resolvePathPattern("//foo/**") → "/foo/**" — round-trips correctly.
-        const specifier = dirPath.startsWith('/')
-          ? `/${dirPath}/**`
-          : `${dirPath}/**`;
+        const specifier = dirPath.startsWith("/") ? `/${dirPath}/**` : `${dirPath}/**`;
         return [`${displayName}(${specifier})`];
       }
       return [displayName];
 
-    case 'domain':
+    case "domain":
       if (ctx.domain) {
         return [`${displayName}(${ctx.domain})`];
       }
       return [displayName];
 
-    case 'literal':
+    case "literal":
     default:
       if (ctx.specifier) {
         return [`${displayName}(${ctx.specifier})`];
@@ -411,17 +398,17 @@ export function buildPermissionRules(ctx: PermissionCheckContext): string[] {
  * Maps display name → verb phrase for use in "Always allow [verb phrase] in this project".
  */
 const DISPLAY_NAME_TO_VERB: Readonly<Record<string, string>> = {
-  Read: 'read files',
-  Edit: 'edit files',
-  Bash: 'run commands',
-  WebFetch: 'fetch from',
-  WebSearch: 'search the web',
-  Agent: 'use agent',
-  Skill: 'use skill',
-  SaveMemory: 'save memory',
-  TodoWrite: 'write todos',
-  Lsp: 'use LSP',
-  ExitPlanMode: 'exit plan mode',
+  Read: "read files",
+  Edit: "edit files",
+  Bash: "run commands",
+  WebFetch: "fetch from",
+  WebSearch: "search the web",
+  Agent: "use agent",
+  Skill: "use skill",
+  SaveMemory: "save memory",
+  TodoWrite: "write todos",
+  Lsp: "use LSP",
+  ExitPlanMode: "exit plan mode",
 };
 
 /**
@@ -434,14 +421,14 @@ const DISPLAY_NAME_TO_VERB: Readonly<Record<string, string>> = {
 function cleanPathSpecifier(specifier: string): string {
   let cleaned = specifier;
   // Remove trailing glob patterns like /** or /*
-  cleaned = cleaned.replace(/\/\*\*$/, '/').replace(/\/\*$/, '/');
+  cleaned = cleaned.replace(/\/\*\*$/, "/").replace(/\/\*$/, "/");
   // Convert rule grammar `//absolute` → `/absolute`
-  if (cleaned.startsWith('//')) {
+  if (cleaned.startsWith("//")) {
     cleaned = cleaned.substring(1);
   }
   // Ensure trailing slash for directories
-  if (!cleaned.endsWith('/')) {
-    cleaned += '/';
+  if (!cleaned.endsWith("/")) {
+    cleaned += "/";
   }
   return cleaned;
 }
@@ -462,12 +449,12 @@ function cleanPathSpecifier(specifier: string): string {
  * @returns A human-readable description string
  */
 export function buildHumanReadableRuleLabel(rules: string[]): string {
-  if (!rules.length) return '';
+  if (!rules.length) return "";
 
   const parts: string[] = [];
   for (const rule of rules) {
     // Parse "DisplayName(specifier)" or bare "DisplayName"
-    const parenIdx = rule.indexOf('(');
+    const parenIdx = rule.indexOf("(");
     if (parenIdx === -1) {
       // Bare rule like "Read" or "Bash"
       const verb = DISPLAY_NAME_TO_VERB[rule] ?? rule.toLowerCase();
@@ -482,28 +469,28 @@ export function buildHumanReadableRuleLabel(rules: string[]): string {
     const canonicalName = Object.entries(CANONICAL_TO_RULE_DISPLAY).find(
       ([, v]) => v === displayName,
     )?.[0];
-    const kind = canonicalName ? getSpecifierKind(canonicalName) : 'literal';
+    const kind = canonicalName ? getSpecifierKind(canonicalName) : "literal";
 
     switch (kind) {
-      case 'path': {
+      case "path": {
         const cleanPath = cleanPathSpecifier(specifier);
         parts.push(`${verb} in ${cleanPath}`);
         break;
       }
-      case 'command':
+      case "command":
         parts.push(`run '${specifier}' commands`);
         break;
-      case 'domain':
+      case "domain":
         parts.push(`${verb} ${specifier}`);
         break;
-      case 'literal':
+      case "literal":
       default:
         parts.push(`${verb} "${specifier}"`);
         break;
     }
   }
 
-  return parts.join(', ');
+  return parts.join(", ");
 }
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -514,7 +501,7 @@ export function buildHumanReadableRuleLabel(rules: string[]): string {
  * Shell operator tokens that act as command boundaries.
  * Ordered by length (longest first) for correct multi-char operator detection.
  */
-const SHELL_OPERATORS = ['&&', '||', ';;', '|&', '|', ';'];
+const SHELL_OPERATORS = ["&&", "||", ";;", "|&", "|", ";"];
 
 /**
  * Split a compound shell command into its individual simple commands
@@ -543,7 +530,7 @@ export function splitCompoundCommand(command: string): string[] {
       escaped = false;
       continue;
     }
-    if (ch === '\\') {
+    if (ch === "\\") {
       escaped = true;
       continue;
     }
@@ -601,27 +588,21 @@ export function splitCompoundCommand(command: string): string[] {
  *
  * 5. `Bash(*)` is equivalent to `Bash` and matches any command.
  */
-export function matchesCommandPattern(
-  pattern: string,
-  command: string,
-): boolean {
+export function matchesCommandPattern(pattern: string, command: string): boolean {
   // This function matches a single pattern against a single simple command.
   // Compound command splitting is handled by the caller (PermissionManager).
   const normalizedCommand = stripLeadingVariableAssignments(command);
 
   // Special case: lone `*` matches any single command
-  if (pattern === '*') {
+  if (pattern === "*") {
     return true;
   }
 
-  if (!pattern.includes('*')) {
+  if (!pattern.includes("*")) {
     // No wildcards: prefix matching (backward compat).
     // "git commit" matches "git commit" and "git commit -m test"
     // but NOT "gitcommit".
-    return (
-      normalizedCommand === pattern ||
-      normalizedCommand.startsWith(pattern + ' ')
-    );
+    return normalizedCommand === pattern || normalizedCommand.startsWith(pattern + " ");
   }
 
   // Build regex from glob pattern with word-boundary semantics.
@@ -631,11 +612,11 @@ export function matchesCommandPattern(
   //   - If preceded by a space: the space acts as a word boundary before `.*`
   //   - If preceded by non-space (or at start): `.*` with no boundary constraint
 
-  let regex = '^';
+  let regex = "^";
   let pos = 0;
 
   while (pos < pattern.length) {
-    const starIdx = pattern.indexOf('*', pos);
+    const starIdx = pattern.indexOf("*", pos);
     if (starIdx === -1) {
       // No more wildcards; rest is literal, then allow trailing args
       regex += escapeRegex(pattern.substring(pos));
@@ -645,7 +626,7 @@ export function matchesCommandPattern(
     // Add literal part before the `*`
     const literalBefore = pattern.substring(pos, starIdx);
 
-    if (starIdx > 0 && pattern[starIdx - 1] === ' ') {
+    if (starIdx > 0 && pattern[starIdx - 1] === " ") {
       // Word-boundary wildcard: "ls *"
       // The literal includes the trailing space. The `*` matches
       // anything after that space (including empty = just "ls").
@@ -655,11 +636,11 @@ export function matchesCommandPattern(
       // Rewrite: literal without trailing space + (space + anything | end)
       const literalWithoutTrailingSpace = literalBefore.slice(0, -1);
       regex += escapeRegex(literalWithoutTrailingSpace);
-      regex += '( .*)?';
+      regex += "( .*)?";
     } else {
       // No word boundary: "ls*" → `ls` followed by anything
       regex += escapeRegex(literalBefore);
-      regex += '.*';
+      regex += ".*";
     }
 
     pos = starIdx + 1;
@@ -667,10 +648,10 @@ export function matchesCommandPattern(
 
   // If the pattern does NOT end with `*`, the regex already matches exactly.
   // If it does end with `*`, the trailing `.*` handles it.
-  regex += '$';
+  regex += "$";
 
   try {
-    return new RegExp(regex, 's').test(normalizedCommand);
+    return new RegExp(regex, "s").test(normalizedCommand);
   } catch {
     return normalizedCommand === pattern;
   }
@@ -680,7 +661,7 @@ export function matchesCommandPattern(
  * Escape special regex characters.
  */
 function escapeRegex(s: string): string {
-  return s.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
+  return s.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
 }
 
 const ENV_ASSIGNMENT_REGEX = /^[A-Za-z_][A-Za-z0-9_]*=/;
@@ -695,13 +676,13 @@ function stripLeadingVariableAssignments(command: string): string {
     const tokens: string[] = [];
 
     for (const token of parse(trimmed)) {
-      if (typeof token === 'string') {
+      if (typeof token === "string") {
         tokens.push(token);
       } else if (
         token &&
-        typeof token === 'object' &&
-        'op' in token &&
-        typeof token.op === 'string'
+        typeof token === "object" &&
+        "op" in token &&
+        typeof token.op === "string"
       ) {
         tokens.push(token.op);
       }
@@ -715,7 +696,7 @@ function stripLeadingVariableAssignments(command: string): string {
       firstCommandToken++;
     }
 
-    return tokens.slice(firstCommandToken).join(' ');
+    return tokens.slice(firstCommandToken).join(" ");
   } catch {
     return trimmed;
   }
@@ -742,28 +723,24 @@ function stripLeadingVariableAssignments(command: string): string {
  * WARNING: `/Users/alice/file` is NOT an absolute path — it's relative to
  * the project root. Use `//Users/alice/file` for absolute paths.
  */
-export function resolvePathPattern(
-  specifier: string,
-  projectRoot: string,
-  cwd: string,
-): string {
-  if (specifier.startsWith('//')) {
+export function resolvePathPattern(specifier: string, projectRoot: string, cwd: string): string {
+  if (specifier.startsWith("//")) {
     // Absolute path from filesystem root: `//path` → `/path`
     return specifier.substring(1);
   }
 
-  if (specifier.startsWith('~/')) {
+  if (specifier.startsWith("~/")) {
     // Relative to home directory
     // Normalize homedir to forward slashes for cross-platform picomatch compatibility
     return toPosixPath(path.join(os.homedir(), specifier.substring(2)));
   }
 
-  if (specifier.startsWith('/')) {
+  if (specifier.startsWith("/")) {
     // Relative to project root (NOT absolute!)
     return toPosixPath(path.join(projectRoot, specifier.substring(1)));
   }
 
-  if (specifier.startsWith('./')) {
+  if (specifier.startsWith("./")) {
     // Relative to current working directory
     return toPosixPath(path.join(cwd, specifier.substring(2)));
   }
@@ -823,12 +800,9 @@ export function matchesPathPattern(
  *   matchesDomainPattern("domain:example.com", "sub.example.com")  → true
  *   matchesDomainPattern("domain:example.com", "notexample.com")   → false
  */
-export function matchesDomainPattern(
-  specifier: string,
-  domain: string,
-): boolean {
+export function matchesDomainPattern(specifier: string, domain: string): boolean {
   // Strip the "domain:" prefix if present
-  const pattern = specifier.startsWith('domain:')
+  const pattern = specifier.startsWith("domain:")
     ? specifier.substring(7).trim()
     : specifier.trim();
 
@@ -845,7 +819,7 @@ export function matchesDomainPattern(
   }
 
   // Subdomain match: "sub.example.com" matches "example.com"
-  if (normalizedDomain.endsWith('.' + normalizedPattern)) {
+  if (normalizedDomain.endsWith("." + normalizedPattern)) {
     return true;
   }
 
@@ -872,15 +846,15 @@ function matchesMcpPattern(pattern: string, toolName: string): boolean {
   // Wildcard: patterns ending with "*" match by prefix.
   // e.g. "mcp__server__*" matches all tools from that server,
   //      "mcp__chrome__use_*" matches all "use_*" tools from chrome.
-  if (pattern.endsWith('*')) {
+  if (pattern.endsWith("*")) {
     const prefix = pattern.slice(0, -1); // strip trailing "*"
     return toolName.startsWith(prefix);
   }
 
   // Server-level match: "mcp__puppeteer" matches "mcp__puppeteer__anything"
   // Only when the pattern has exactly 2 parts (mcp + server) and the tool has 3+
-  const patternParts = pattern.split('__');
-  const toolParts = toolName.split('__');
+  const patternParts = pattern.split("__");
+  const toolParts = toolName.split("__");
   if (
     patternParts.length === 2 &&
     toolParts.length >= 3 &&
@@ -945,10 +919,7 @@ export function matchesRule(
   const canonicalCtxToolName = resolveToolName(toolName);
 
   // ── MCP tool matching ────────────────────────────────────────────────
-  if (
-    rule.toolName.startsWith('mcp__') ||
-    canonicalCtxToolName.startsWith('mcp__')
-  ) {
+  if (rule.toolName.startsWith("mcp__") || canonicalCtxToolName.startsWith("mcp__")) {
     return matchesMcpPattern(rule.toolName, canonicalCtxToolName);
   }
 
@@ -966,14 +937,14 @@ export function matchesRule(
   const kind = rule.specifierKind ?? getSpecifierKind(rule.toolName);
 
   switch (kind) {
-    case 'command': {
+    case "command": {
       if (command === undefined) {
         return false;
       }
       return matchesCommandPattern(rule.specifier, command);
     }
 
-    case 'path': {
+    case "path": {
       if (filePath === undefined) {
         return false;
       }
@@ -981,22 +952,17 @@ export function matchesRule(
         projectRoot: process.cwd(),
         cwd: process.cwd(),
       };
-      return matchesPathPattern(
-        rule.specifier,
-        filePath,
-        ctx.projectRoot,
-        ctx.cwd,
-      );
+      return matchesPathPattern(rule.specifier, filePath, ctx.projectRoot, ctx.cwd);
     }
 
-    case 'domain': {
+    case "domain": {
       if (domain === undefined) {
         return false;
       }
       return matchesDomainPattern(rule.specifier, domain);
     }
 
-    case 'literal':
+    case "literal":
     default: {
       // Literal/exact matching (for Skill names, Agent subagent types, etc.)
       const value = command ?? specifier;
diff --git a/packages/airiscode-core/src/permissions/shell-semantics.ts b/packages/airiscode-core/src/permissions/shell-semantics.ts
index 414d51103..39af9bc7f 100644
--- a/packages/airiscode-core/src/permissions/shell-semantics.ts
+++ b/packages/airiscode-core/src/permissions/shell-semantics.ts
@@ -31,8 +31,8 @@
  *   - Complex dynamic expressions: `eval "cat $f"`
  */
 
-import nodePath from 'node:path';
-import os from 'node:os';
+import os from "node:os";
+import nodePath from "node:path";
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Types
@@ -48,13 +48,7 @@ export interface ShellOperation {
    * The virtual tool this operation maps to.
    * Matches the canonical tool names used in the permission system.
    */
-  virtualTool:
-    | 'read_file'
-    | 'list_directory'
-    | 'edit'
-    | 'write_file'
-    | 'web_fetch'
-    | 'grep_search';
+  virtualTool: "read_file" | "list_directory" | "edit" | "write_file" | "web_fetch" | "grep_search";
   /** Absolute file or directory path (for file operations). */
   filePath?: string;
   /** Domain name without port (for web_fetch operations). */
@@ -74,7 +68,7 @@ export interface ShellOperation {
  */
 function tokenize(command: string): string[] {
   const tokens: string[] = [];
-  let current = '';
+  let current = "";
   let inSingle = false;
   let inDouble = false;
   let escaped = false;
@@ -87,7 +81,7 @@ function tokenize(command: string): string[] {
       escaped = false;
       continue;
     }
-    if (ch === '\\' && !inSingle) {
+    if (ch === "\\" && !inSingle) {
       escaped = true;
       continue;
     }
@@ -99,10 +93,10 @@ function tokenize(command: string): string[] {
       inDouble = !inDouble;
       continue;
     }
-    if (!inSingle && !inDouble && (ch === ' ' || ch === '\t')) {
+    if (!inSingle && !inDouble && (ch === " " || ch === "\t")) {
       if (current) {
         tokens.push(current);
-        current = '';
+        current = "";
       }
       continue;
     }
@@ -126,18 +120,18 @@ function tokenize(command: string): string[] {
  */
 function resolvePath(p: string, cwd: string): string {
   // Normalize inputs to forward slashes for consistent cross-platform handling
-  const normP = p.replace(/\\/g, '/');
-  const normCwd = cwd.replace(/\\/g, '/');
+  const normP = p.replace(/\\/g, "/");
+  const normCwd = cwd.replace(/\\/g, "/");
 
-  if (normP === '~' || normP.startsWith('~/')) {
-    const homeDir = os.homedir().replace(/\\/g, '/');
+  if (normP === "~" || normP.startsWith("~/")) {
+    const homeDir = os.homedir().replace(/\\/g, "/");
     const rest = normP.slice(1); // '' or '/some/path'
     // nodePath.posix.join handles the rest correctly:
     // join('C:/Users/foo', '/.ssh/id_rsa') → 'C:/Users/foo/.ssh/id_rsa'
     return rest ? nodePath.posix.join(homeDir, rest) : homeDir;
   }
   // isAbsolute check: handle both POSIX (/foo) and Windows (C:\foo) absolute paths
-  if (nodePath.isAbsolute(normP) || normP.startsWith('/')) {
+  if (nodePath.isAbsolute(normP) || normP.startsWith("/")) {
     return normP;
   }
   return nodePath.posix.join(normCwd, normP);
@@ -150,15 +144,15 @@ function resolvePath(p: string, cwd: string): string {
 function looksLikePath(s: string): boolean {
   if (!s) return false;
   // Shell variable references
-  if (s.startsWith('$')) return false;
+  if (s.startsWith("$")) return false;
   // Flags
-  if (s.startsWith('-')) return false;
+  if (s.startsWith("-")) return false;
   // Pure integers — likely a count/size/mode argument (e.g. -n 10, chmod 755)
   if (/^\d+$/.test(s)) return false;
   // Script-like expressions (awk/sed programs, brace expansions)
-  if (s.includes('{') || s.includes('}')) return false;
+  if (s.includes("{") || s.includes("}")) return false;
   // URLs are handled separately by the web-fetch handlers
-  if (s.includes('://')) return false;
+  if (s.includes("://")) return false;
   return true;
 }
 
@@ -191,7 +185,7 @@ function extractRedirects(tokens: string[], cwd: string): RedirectResult {
     const tok = tokens[i]!;
 
     // ── Separate-token redirect operators ─────────────────────────────────
-    if (tok === '>' || tok === '1>') {
+    if (tok === ">" || tok === "1>") {
       const target = tokens[i + 1];
       if (target && looksLikePath(target)) {
         writeFiles.push(resolvePath(target, cwd));
@@ -199,7 +193,7 @@ function extractRedirects(tokens: string[], cwd: string): RedirectResult {
         toRemove.add(i + 1);
         i++;
       }
-    } else if (tok === '>>' || tok === '1>>') {
+    } else if (tok === ">>" || tok === "1>>") {
       const target = tokens[i + 1];
       if (target && looksLikePath(target)) {
         writeFiles.push(resolvePath(target, cwd));
@@ -207,7 +201,7 @@ function extractRedirects(tokens: string[], cwd: string): RedirectResult {
         toRemove.add(i + 1);
         i++;
       }
-    } else if (tok === '<') {
+    } else if (tok === "<") {
       const target = tokens[i + 1];
       if (target && looksLikePath(target)) {
         readFiles.push(resolvePath(target, cwd));
@@ -215,11 +209,11 @@ function extractRedirects(tokens: string[], cwd: string): RedirectResult {
         toRemove.add(i + 1);
         i++;
       }
-    } else if (tok === '2>' || tok === '2>>' || tok === '&>' || tok === '&>>') {
+    } else if (tok === "2>" || tok === "2>>" || tok === "&>" || tok === "&>>") {
       // stderr / combined redirect — consume target
       const target = tokens[i + 1];
       if (target) {
-        if (target !== '/dev/null' && looksLikePath(target)) {
+        if (target !== "/dev/null" && looksLikePath(target)) {
           writeFiles.push(resolvePath(target, cwd));
         }
         toRemove.add(i);
@@ -233,8 +227,8 @@ function extractRedirects(tokens: string[], cwd: string): RedirectResult {
       if (m) {
         const op = m[1]!;
         const target = m[2]!;
-        if (target !== '/dev/null' && looksLikePath(target)) {
-          if (op === '<') {
+        if (target !== "/dev/null" && looksLikePath(target)) {
+          if (op === "<") {
             readFiles.push(resolvePath(target, cwd));
           } else {
             writeFiles.push(resolvePath(target, cwd));
@@ -275,7 +269,7 @@ function getPositionalArgs(
       skipNext = false;
       continue;
     }
-    if (!arg.startsWith('-')) {
+    if (!arg.startsWith("-")) {
       positional.push(arg);
       continue;
     }
@@ -305,7 +299,7 @@ function readOps(
   return getPositionalArgs(args, flagsWithValue)
     .filter(looksLikePath)
     .map((p) => ({
-      virtualTool: 'read_file' as const,
+      virtualTool: "read_file" as const,
       filePath: resolvePath(p, cwd),
     }));
 }
@@ -318,10 +312,9 @@ function listOps(
   flagsWithValue?: ReadonlySet<string>,
 ): ShellOperation[] {
   const dirs = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
-  if (dirs.length === 0)
-    return [{ virtualTool: 'list_directory', filePath: cwd }];
+  if (dirs.length === 0) return [{ virtualTool: "list_directory", filePath: cwd }];
   return dirs.map((p) => ({
-    virtualTool: 'list_directory' as const,
+    virtualTool: "list_directory" as const,
     filePath: resolvePath(p, cwd),
   }));
 }
@@ -329,9 +322,9 @@ function listOps(
 /** Extract URL domain and return a web_fetch operation, or null on failure. */
 function webOp(url: string): ShellOperation | null {
   try {
-    const normalized = url.includes('://') ? url : `https://${url}`;
+    const normalized = url.includes("://") ? url : `https://${url}`;
     const domain = new URL(normalized).hostname;
-    return domain ? { virtualTool: 'web_fetch', domain } : null;
+    return domain ? { virtualTool: "web_fetch", domain } : null;
   } catch {
     return null;
   }
@@ -352,19 +345,11 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
   xzcat: (a, d) => readOps(a, d),
   gzcat: (a, d) => readOps(a, d),
   lzcat: (a, d) => readOps(a, d),
-  head: (a, d) => readOps(a, d, new Set(['-n', '-c', '--lines', '--bytes'])),
+  head: (a, d) => readOps(a, d, new Set(["-n", "-c", "--lines", "--bytes"])),
   tail: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set(['-n', '-c', '-s', '--lines', '--bytes', '--sleep-interval']),
-    ),
+    readOps(a, d, new Set(["-n", "-c", "-s", "--lines", "--bytes", "--sleep-interval"])),
   less: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set(['-b', '-h', '-j', '-p', '-x', '-y', '-z', '--shift', '--tabs']),
-    ),
+    readOps(a, d, new Set(["-b", "-h", "-j", "-p", "-x", "-y", "-z", "--shift", "--tabs"])),
   more: (a, d) => readOps(a, d),
   most: (a, d) => readOps(a, d),
   wc: (a, d) => readOps(a, d),
@@ -372,43 +357,29 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     readOps(
       a,
       d,
-      new Set([
-        '-m',
-        '-e',
-        '-F',
-        '-P',
-        '--magic-file',
-        '--exclude',
-        '--extension',
-        '--separator',
-      ]),
-    ),
-  stat: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set(['-c', '-f', '--format', '--printf', '--file-system']),
+      new Set(["-m", "-e", "-F", "-P", "--magic-file", "--exclude", "--extension", "--separator"]),
     ),
+  stat: (a, d) => readOps(a, d, new Set(["-c", "-f", "--format", "--printf", "--file-system"])),
   readlink: (a, d) =>
     readOps(
       a,
       d,
       new Set([
-        '-e',
-        '-f',
-        '-m',
-        '-q',
-        '-s',
-        '-v',
-        '-z',
-        '--canonicalize',
-        '--canonicalize-existing',
-        '--canonicalize-missing',
-        '--no-newline',
-        '--quiet',
-        '--silent',
-        '--verbose',
-        '--zero',
+        "-e",
+        "-f",
+        "-m",
+        "-q",
+        "-s",
+        "-v",
+        "-z",
+        "--canonicalize",
+        "--canonicalize-existing",
+        "--canonicalize-missing",
+        "--no-newline",
+        "--quiet",
+        "--silent",
+        "--verbose",
+        "--zero",
       ]),
     ),
   realpath: (a, d) =>
@@ -416,20 +387,20 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
       a,
       d,
       new Set([
-        '--relative-to',
-        '--relative-base',
-        '-e',
-        '-m',
-        '-s',
-        '-z',
-        '--canonicalize-existing',
-        '--canonicalize-missing',
-        '--logical',
-        '--physical',
-        '--no-symlinks',
-        '--quiet',
-        '--strip',
-        '--zero',
+        "--relative-to",
+        "--relative-base",
+        "-e",
+        "-m",
+        "-s",
+        "-z",
+        "--canonicalize-existing",
+        "--canonicalize-missing",
+        "--logical",
+        "--physical",
+        "--no-symlinks",
+        "--quiet",
+        "--strip",
+        "--zero",
       ]),
     ),
   diff: (a, d) =>
@@ -437,64 +408,44 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
       a,
       d,
       new Set([
-        '-u',
-        '-U',
-        '-c',
-        '-C',
-        '-I',
-        '-x',
-        '-X',
-        '-W',
-        '--label',
-        '--to-file',
-        '--from-file',
-        '--width',
-        '--horizon-lines',
-        '--strip-trailing-cr',
-        '--ignore-matching-lines',
-        '--exclude',
-        '--exclude-from',
+        "-u",
+        "-U",
+        "-c",
+        "-C",
+        "-I",
+        "-x",
+        "-X",
+        "-W",
+        "--label",
+        "--to-file",
+        "--from-file",
+        "--width",
+        "--horizon-lines",
+        "--strip-trailing-cr",
+        "--ignore-matching-lines",
+        "--exclude",
+        "--exclude-from",
       ]),
     ),
   diff3: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set([
-        '-m',
-        '-T',
-        '-A',
-        '-E',
-        '-e',
-        '-x',
-        '-X',
-        '-3',
-        '-i',
-        '--label',
-      ]),
-    ),
-  sdiff: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set(['-o', '-w', '-W', '-s', '-i', '-b', '-B', '-E', '-H']),
-    ),
+    readOps(a, d, new Set(["-m", "-T", "-A", "-E", "-e", "-x", "-X", "-3", "-i", "--label"])),
+  sdiff: (a, d) => readOps(a, d, new Set(["-o", "-w", "-W", "-s", "-i", "-b", "-B", "-E", "-H"])),
   cmp: (a, d) =>
     readOps(
       a,
       d,
       new Set([
-        '-i',
-        '-l',
-        '-n',
-        '-s',
-        '--ignore-initial',
-        '--bytes',
-        '--print-bytes',
-        '--quiet',
-        '--silent',
-        '--verbose',
-        '--zero',
+        "-i",
+        "-l",
+        "-n",
+        "-s",
+        "--ignore-initial",
+        "--bytes",
+        "--print-bytes",
+        "--quiet",
+        "--silent",
+        "--verbose",
+        "--zero",
       ]),
     ),
   md5sum: (a, d) => readOps(a, d),
@@ -511,79 +462,52 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
       a,
       d,
       new Set([
-        '-n',
-        '-t',
-        '-e',
-        '-o',
-        '-a',
-        '--min-len',
-        '--radix',
-        '--encoding',
-        '--file',
-        '--print-file-name',
-        '--data',
-        '--all',
+        "-n",
+        "-t",
+        "-e",
+        "-o",
+        "-a",
+        "--min-len",
+        "--radix",
+        "--encoding",
+        "--file",
+        "--print-file-name",
+        "--data",
+        "--all",
       ]),
     ),
   hexdump: (a, d) =>
     readOps(
       a,
       d,
-      new Set([
-        '-n',
-        '-s',
-        '-l',
-        '-C',
-        '-b',
-        '-c',
-        '-d',
-        '-o',
-        '-x',
-        '-e',
-        '-f',
-        '-v',
-      ]),
+      new Set(["-n", "-s", "-l", "-C", "-b", "-c", "-d", "-o", "-x", "-e", "-f", "-v"]),
     ),
   xxd: (a, d) =>
     readOps(
       a,
       d,
-      new Set([
-        '-l',
-        '-s',
-        '-c',
-        '-g',
-        '-o',
-        '-n',
-        '-b',
-        '-e',
-        '-i',
-        '-p',
-        '-r',
-        '-u',
-        '-E',
-      ]),
+      new Set(["-l", "-s", "-c", "-g", "-o", "-n", "-b", "-e", "-i", "-p", "-r", "-u", "-E"]),
     ),
   od: (a, d) =>
     readOps(
       a,
       d,
       new Set([
-        '-N',
-        '-j',
-        '-w',
-        '-s',
-        '-t',
-        '-A',
-        '-v',
-        '--address-radix',
-        '--endian',
-        '--format',
-        '--read-bytes',
-        '--skip-bytes',
-        '--strings',
-        '--output-duplicates',
-        '--width',
+        "-N",
+        "-j",
+        "-w",
+        "-s",
+        "-t",
+        "-A",
+        "-v",
+        "--address-radix",
+        "--endian",
+        "--format",
+        "--read-bytes",
+        "--skip-bytes",
+        "--strings",
+        "--output-duplicates",
+        "--width",
       ]),
     ),
   sort: (a, d) =>
@@ -591,70 +515,61 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
       a,
       d,
       new Set([
-        '-k',
-        '-t',
-        '-T',
-        '--output',
-        '-o',
-        '--field-separator',
-        '--key',
-        '--temporary-directory',
-        '--compress-program',
-        '--batch-size',
-        '--parallel',
-        '--random-source',
-        '--sort',
+        "-k",
+        "-t",
+        "-T",
+        "--output",
+        "-o",
+        "--field-separator",
+        "--key",
+        "--temporary-directory",
+        "--compress-program",
+        "--batch-size",
+        "--parallel",
+        "--random-source",
+        "--sort",
       ]),
     ),
   uniq: (a, d) =>
     readOps(
       a,
       d,
-      new Set([
-        '-f',
-        '-s',
-        '-w',
-        '-n',
-        '--skip-fields',
-        '--skip-chars',
-        '--check-chars',
-      ]),
+      new Set(["-f", "-s", "-w", "-n", "--skip-fields", "--skip-chars", "--check-chars"]),
     ),
   cut: (a, d) =>
     readOps(
       a,
       d,
       new Set([
-        '-b',
-        '-c',
-        '-d',
-        '-f',
-        '--delimiter',
-        '--fields',
-        '--bytes',
-        '--characters',
-        '--output-delimiter',
+        "-b",
+        "-c",
+        "-d",
+        "-f",
+        "--delimiter",
+        "--fields",
+        "--bytes",
+        "--characters",
+        "--output-delimiter",
       ]),
     ),
-  paste: (a, d) =>
-    readOps(a, d, new Set(['-d', '-s', '--delimiters', '--serial'])),
+  paste: (a, d) => readOps(a, d, new Set(["-d", "-s", "--delimiters", "--serial"])),
   join: (a, d) =>
     readOps(
       a,
       d,
       new Set([
-        '-t',
-        '-1',
-        '-2',
-        '-j',
-        '-o',
-        '-a',
-        '-e',
-        '--field',
-        '--header',
-        '--check-order',
-        '--nocheck-order',
-        '--zero-terminated',
+        "-t",
+        "-1",
+        "-2",
+        "-j",
+        "-o",
+        "-a",
+        "-e",
+        "--field",
+        "--header",
+        "--check-order",
+        "--nocheck-order",
+        "--zero-terminated",
       ]),
     ),
   column: (a, d) =>
@@ -662,172 +577,147 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
       a,
       d,
       new Set([
-        '-t',
-        '-s',
-        '-n',
-        '-c',
-        '-o',
-        '-x',
-        '--table',
-        '--separator',
-        '--output-separator',
-        '--fillrows',
+        "-t",
+        "-s",
+        "-n",
+        "-c",
+        "-o",
+        "-x",
+        "--table",
+        "--separator",
+        "--output-separator",
+        "--fillrows",
       ]),
     ),
-  fold: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set(['-w', '-b', '-s', '--width', '--bytes', '--spaces']),
-    ),
-  expand: (a, d) => readOps(a, d, new Set(['-t', '--tabs', '--initial'])),
-  unexpand: (a, d) =>
-    readOps(a, d, new Set(['-t', '-a', '--tabs', '--all', '--first-only'])),
+  fold: (a, d) => readOps(a, d, new Set(["-w", "-b", "-s", "--width", "--bytes", "--spaces"])),
+  expand: (a, d) => readOps(a, d, new Set(["-t", "--tabs", "--initial"])),
+  unexpand: (a, d) => readOps(a, d, new Set(["-t", "-a", "--tabs", "--all", "--first-only"])),
   base64: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set(['-d', '-i', '-w', '--decode', '--ignore-garbage', '--wrap']),
-    ),
+    readOps(a, d, new Set(["-d", "-i", "-w", "--decode", "--ignore-garbage", "--wrap"])),
   base32: (a, d) =>
-    readOps(
-      a,
-      d,
-      new Set(['-d', '-i', '-w', '--decode', '--ignore-garbage', '--wrap']),
-    ),
+    readOps(a, d, new Set(["-d", "-i", "-w", "--decode", "--ignore-garbage", "--wrap"])),
   tr: (a, d) => readOps(a, d),
 
   // ── Grep / search commands ────────────────────────────────────────────────
 
   grep: (args, cwd) => {
     const hasPatternFlag = args.some(
-      (a) =>
-        a === '-e' || a === '-f' || a.startsWith('-e') || a.startsWith('-f'),
+      (a) => a === "-e" || a === "-f" || a.startsWith("-e") || a.startsWith("-f"),
     );
     const isRecursive = args.some((a) =>
-      ['-r', '-R', '--recursive', '--dereference-recursive'].includes(a),
+      ["-r", "-R", "--recursive", "--dereference-recursive"].includes(a),
     );
     const flagsWithValue = new Set([
-      '-e',
-      '-f',
-      '-m',
-      '-A',
-      '-B',
-      '-C',
-      '--context',
-      '--include',
-      '--exclude',
-      '--exclude-dir',
-      '--max-count',
-      '--after-context',
-      '--before-context',
-      '-n',
-      '--line-number',
-      '--label',
-      '-D',
-      '--devices',
-      '--max-depth',
-      '-X',
-      '--exclude-from',
+      "-e",
+      "-f",
+      "-m",
+      "-A",
+      "-B",
+      "-C",
+      "--context",
+      "--include",
+      "--exclude",
+      "--exclude-dir",
+      "--max-count",
+      "--after-context",
+      "--before-context",
+      "-n",
+      "--line-number",
+      "--label",
+      "-D",
+      "--devices",
+      "--max-depth",
+      "-X",
+      "--exclude-from",
     ]);
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     // If -e/-f was used, there is no positional pattern; all positionals are paths.
     // Otherwise, the first positional is the pattern and the rest are paths.
     const filePaths = hasPatternFlag ? positional : positional.slice(1);
-    const tool: 'read_file' | 'list_directory' = isRecursive
-      ? 'list_directory'
-      : 'read_file';
+    const tool: "read_file" | "list_directory" = isRecursive ? "list_directory" : "read_file";
     return filePaths.map((p) => ({
       virtualTool: tool,
       filePath: resolvePath(p, cwd),
     }));
   },
-  egrep: (a, d) => (COMMANDS['grep'] as CommandHandler)(a, d),
-  fgrep: (a, d) => (COMMANDS['grep'] as CommandHandler)(a, d),
-  zgrep: (a, d) => (COMMANDS['grep'] as CommandHandler)(a, d),
-  bzgrep: (a, d) => (COMMANDS['grep'] as CommandHandler)(a, d),
+  egrep: (a, d) => (COMMANDS["grep"] as CommandHandler)(a, d),
+  fgrep: (a, d) => (COMMANDS["grep"] as CommandHandler)(a, d),
+  zgrep: (a, d) => (COMMANDS["grep"] as CommandHandler)(a, d),
+  bzgrep: (a, d) => (COMMANDS["grep"] as CommandHandler)(a, d),
 
   rg: (args, cwd) => {
     // ripgrep: recursive by default; first non-flag positional = pattern
-    const hasPatternFlag = args.some((a) => a === '-e' || a === '-f');
+    const hasPatternFlag = args.some((a) => a === "-e" || a === "-f");
     const flagsWithValue = new Set([
-      '-e',
-      '-f',
-      '-m',
-      '-A',
-      '-B',
-      '-C',
-      '-t',
-      '-T',
-      '-g',
-      '--iglob',
-      '--glob',
-      '--type',
-      '--type-not',
-      '--max-count',
-      '--max-depth',
-      '--context',
-      '--after-context',
-      '--before-context',
-      '-M',
-      '--max-columns',
-      '--field-match-separator',
+      "-e",
+      "-f",
+      "-m",
+      "-A",
+      "-B",
+      "-C",
+      "-t",
+      "-T",
+      "-g",
+      "--iglob",
+      "--glob",
+      "--type",
+      "--type-not",
+      "--max-count",
+      "--max-depth",
+      "--context",
+      "--after-context",
+      "--before-context",
+      "-M",
+      "--max-columns",
+      "--field-match-separator",
     ]);
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     const filePaths = hasPatternFlag ? positional : positional.slice(1);
     return filePaths.map((p) => ({
-      virtualTool: 'list_directory' as const,
+      virtualTool: "list_directory" as const,
       filePath: resolvePath(p, cwd),
     }));
   },
 
   ag: (args, cwd) => {
-    const hasPatternFlag = args.some((a) => a === '-e');
+    const hasPatternFlag = args.some((a) => a === "-e");
     const flagsWithValue = new Set([
-      '-e',
-      '-m',
-      '-A',
-      '-B',
-      '-C',
-      '--depth',
-      '--file-search-regex',
-      '--file-search-regex-i',
-      '--ignore',
-      '--ignore-dir',
-      '-n',
+      "-e",
+      "-m",
+      "-A",
+      "-B",
+      "-C",
+      "--depth",
+      "--file-search-regex",
+      "--file-search-regex-i",
+      "--ignore",
+      "--ignore-dir",
+      "-n",
     ]);
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     const filePaths = hasPatternFlag ? positional : positional.slice(1);
     return filePaths.map((p) => ({
-      virtualTool: 'list_directory' as const,
+      virtualTool: "list_directory" as const,
       filePath: resolvePath(p, cwd),
     }));
   },
 
   ack: (args, cwd) => {
     const flagsWithValue = new Set([
-      '-m',
-      '-A',
-      '-B',
-      '-C',
-      '--type',
-      '--ignore-dir',
-      '--ignore-file',
-      '--ignore-directory',
-      '-n',
+      "-m",
+      "-A",
+      "-B",
+      "-C",
+      "--type",
+      "--ignore-dir",
+      "--ignore-file",
+      "--ignore-directory",
+      "-n",
     ]);
     // ack: first positional = pattern, rest = paths
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     return positional.slice(1).map((p) => ({
-      virtualTool: 'list_directory' as const,
+      virtualTool: "list_directory" as const,
       filePath: resolvePath(p, cwd),
     }));
   },
@@ -841,49 +731,31 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     listOps(
       a,
       d,
-      new Set([
-        '-L',
-        '--level',
-        '--sort',
-        '--color',
-        '--colour',
-        '--group',
-        '-I',
-        '--ignore-glob',
-      ]),
+      new Set(["-L", "--level", "--sort", "--color", "--colour", "--group", "-I", "--ignore-glob"]),
     ),
   eza: (a, d) =>
     listOps(
       a,
       d,
-      new Set([
-        '-L',
-        '--level',
-        '--sort',
-        '--color',
-        '--colour',
-        '--group',
-        '-I',
-        '--ignore-glob',
-      ]),
+      new Set(["-L", "--level", "--sort", "--color", "--colour", "--group", "-I", "--ignore-glob"]),
     ),
   lsd: (a, d) =>
     listOps(
       a,
       d,
       new Set([
-        '--depth',
-        '--color',
-        '--icon',
-        '--icon-theme',
-        '--date',
-        '--size',
-        '--blocks',
-        '--header',
-        '--classic',
-        '--no-symlink',
-        '--ignore-glob',
-        '-I',
+        "--depth",
+        "--color",
+        "--icon",
+        "--icon-theme",
+        "--date",
+        "--size",
+        "--blocks",
+        "--header",
+        "--classic",
+        "--no-symlink",
+        "--ignore-glob",
+        "-I",
       ]),
     ),
 
@@ -891,67 +763,61 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     // `find [starting-point...] [expression]`
     // Starting points come before any expression keyword beginning with `-` or `(`.
     const expressionKeywords = new Set([
-      '-name',
-      '-iname',
-      '-path',
-      '-ipath',
-      '-regex',
-      '-iregex',
-      '-type',
-      '-maxdepth',
-      '-mindepth',
-      '-newer',
-      '-mtime',
-      '-atime',
-      '-ctime',
-      '-size',
-      '-user',
-      '-group',
-      '-perm',
-      '-links',
-      '-inum',
-      '-exec',
-      '-execdir',
-      '-ok',
-      '-okdir',
-      '-print',
-      '-print0',
-      '-ls',
-      '-delete',
-      '-prune',
-      '-depth',
-      '-empty',
-      '-readable',
-      '-writable',
-      '-executable',
-      '-follow',
-      '-xdev',
-      '-mount',
-      '-true',
-      '-false',
-      '-not',
-      '!',
-      '-a',
-      '-and',
-      '-o',
-      '-or',
+      "-name",
+      "-iname",
+      "-path",
+      "-ipath",
+      "-regex",
+      "-iregex",
+      "-type",
+      "-maxdepth",
+      "-mindepth",
+      "-newer",
+      "-mtime",
+      "-atime",
+      "-ctime",
+      "-size",
+      "-user",
+      "-group",
+      "-perm",
+      "-links",
+      "-inum",
+      "-exec",
+      "-execdir",
+      "-ok",
+      "-okdir",
+      "-print",
+      "-print0",
+      "-ls",
+      "-delete",
+      "-prune",
+      "-depth",
+      "-empty",
+      "-readable",
+      "-writable",
+      "-executable",
+      "-follow",
+      "-xdev",
+      "-mount",
+      "-true",
+      "-false",
+      "-not",
+      "!",
+      "-a",
+      "-and",
+      "-o",
+      "-or",
     ]);
     const startingPoints: string[] = [];
     for (const arg of args) {
-      if (
-        arg.startsWith('-') ||
-        arg === '(' ||
-        arg === ')' ||
-        expressionKeywords.has(arg)
-      )
-        break;
+      if (arg.startsWith("-") || arg === "(" || arg === ")" || expressionKeywords.has(arg)) break;
       if (looksLikePath(arg)) startingPoints.push(resolvePath(arg, cwd));
     }
     if (startingPoints.length === 0) {
-      return [{ virtualTool: 'list_directory', filePath: cwd }];
+      return [{ virtualTool: "list_directory", filePath: cwd }];
     }
     return startingPoints.map((p) => ({
-      virtualTool: 'list_directory' as const,
+      virtualTool: "list_directory" as const,
       filePath: p,
     }));
   },
@@ -961,21 +827,21 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
       args,
       cwd,
       new Set([
-        '-L',
-        '-P',
-        '-I',
-        '-o',
-        '-n',
-        '-H',
-        '-T',
-        '--charset',
-        '--filelimit',
-        '--matchdirs',
-        '--dirsfirst',
-        '-J',
-        '-X',
-        '--du',
-        '--si',
+        "-L",
+        "-P",
+        "-I",
+        "-o",
+        "-n",
+        "-H",
+        "-T",
+        "--charset",
+        "--filelimit",
+        "--matchdirs",
+        "--dirsfirst",
+        "-J",
+        "-X",
+        "--du",
+        "--si",
       ]),
     ),
 
@@ -984,46 +850,43 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
       args,
       cwd,
       new Set([
-        '-d',
-        '--max-depth',
-        '--threshold',
-        '-t',
-        '--block-size',
-        '-B',
-        '--time-style',
-        '--exclude',
-        '-X',
-        '--time',
-        '--output',
+        "-d",
+        "--max-depth",
+        "--threshold",
+        "-t",
+        "--block-size",
+        "-B",
+        "--time-style",
+        "--exclude",
+        "-X",
+        "--time",
+        "--output",
       ]),
     ),
 
   // ── File-write commands (create or overwrite) ─────────────────────────────
 
   touch: (args, cwd) =>
-    getPositionalArgs(
-      args,
-      new Set(['-t', '-r', '--reference', '--date', '-d', '--time']),
-    )
+    getPositionalArgs(args, new Set(["-t", "-r", "--reference", "--date", "-d", "--time"]))
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'write_file' as const,
+        virtualTool: "write_file" as const,
         filePath: resolvePath(p, cwd),
       })),
 
   mkdir: (args, cwd) =>
-    getPositionalArgs(args, new Set(['-m', '--mode', '-Z', '--context']))
+    getPositionalArgs(args, new Set(["-m", "--mode", "-Z", "--context"]))
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'write_file' as const,
+        virtualTool: "write_file" as const,
         filePath: resolvePath(p, cwd),
       })),
 
   mkfifo: (args, cwd) =>
-    getPositionalArgs(args, new Set(['-m', '--mode', '-Z']))
+    getPositionalArgs(args, new Set(["-m", "--mode", "-Z"]))
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'write_file' as const,
+        virtualTool: "write_file" as const,
         filePath: resolvePath(p, cwd),
       })),
 
@@ -1031,32 +894,30 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     getPositionalArgs(args)
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'write_file' as const,
+        virtualTool: "write_file" as const,
         filePath: resolvePath(p, cwd),
       })),
 
   cp: (args, cwd) => {
     const flagsWithValue = new Set([
-      '-S',
-      '--suffix',
-      '-t',
-      '--target-directory',
-      '--backup',
-      '--no-target-directory',
-      '--sparse',
-      '--reflink',
-      '-Z',
-      '--context',
-      '--copy-contents',
+      "-S",
+      "--suffix",
+      "-t",
+      "--target-directory",
+      "--backup",
+      "--no-target-directory",
+      "--sparse",
+      "--reflink",
+      "-Z",
+      "--context",
+      "--copy-contents",
     ]);
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     if (positional.length === 0) return [];
     if (positional.length === 1) {
       return [
         {
-          virtualTool: 'read_file',
+          virtualTool: "read_file",
           filePath: resolvePath(positional[0]!, cwd),
         },
       ];
@@ -1065,80 +926,76 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     const dst = positional[positional.length - 1]!;
     return [
       ...srcs.map((p) => ({
-        virtualTool: 'read_file' as const,
+        virtualTool: "read_file" as const,
         filePath: resolvePath(p, cwd),
       })),
-      { virtualTool: 'write_file' as const, filePath: resolvePath(dst, cwd) },
+      { virtualTool: "write_file" as const, filePath: resolvePath(dst, cwd) },
     ];
   },
 
   mv: (args, cwd) => {
     const flagsWithValue = new Set([
-      '-S',
-      '--suffix',
-      '-t',
-      '--target-directory',
-      '--backup',
-      '-Z',
-      '--context',
+      "-S",
+      "--suffix",
+      "-t",
+      "--target-directory",
+      "--backup",
+      "-Z",
+      "--context",
     ]);
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     if (positional.length < 2) return [];
     const srcs = positional.slice(0, -1);
     const dst = positional[positional.length - 1]!;
     return [
       // The source files are edited (moved away — their original location changes)
       ...srcs.map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       })),
-      { virtualTool: 'write_file' as const, filePath: resolvePath(dst, cwd) },
+      { virtualTool: "write_file" as const, filePath: resolvePath(dst, cwd) },
     ];
   },
 
   install: (args, cwd) => {
     const flagsWithValue = new Set([
-      '-m',
-      '--mode',
-      '-o',
-      '--owner',
-      '-g',
-      '--group',
-      '-S',
-      '--suffix',
-      '-t',
-      '--target-directory',
-      '-T',
-      '--no-target-directory',
-      '-Z',
-      '--context',
-      '-C',
-      '--compare',
+      "-m",
+      "--mode",
+      "-o",
+      "--owner",
+      "-g",
+      "--group",
+      "-S",
+      "--suffix",
+      "-t",
+      "--target-directory",
+      "-T",
+      "--no-target-directory",
+      "-Z",
+      "--context",
+      "-C",
+      "--compare",
     ]);
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     if (positional.length < 2) return [];
     const dst = positional[positional.length - 1]!;
-    return [{ virtualTool: 'write_file', filePath: resolvePath(dst, cwd) }];
+    return [{ virtualTool: "write_file", filePath: resolvePath(dst, cwd) }];
   },
 
   dd: (args, cwd) => {
     // dd if=input of=output — arguments are key=value pairs, not flags
     const ops: ShellOperation[] = [];
     for (const arg of args) {
-      if (arg.startsWith('if=')) {
+      if (arg.startsWith("if=")) {
         const p = arg.slice(3);
         if (looksLikePath(p)) {
-          ops.push({ virtualTool: 'read_file', filePath: resolvePath(p, cwd) });
+          ops.push({ virtualTool: "read_file", filePath: resolvePath(p, cwd) });
         }
-      } else if (arg.startsWith('of=')) {
+      } else if (arg.startsWith("of=")) {
         const p = arg.slice(3);
         if (looksLikePath(p)) {
           ops.push({
-            virtualTool: 'write_file',
+            virtualTool: "write_file",
             filePath: resolvePath(p, cwd),
           });
         }
@@ -1151,33 +1008,28 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     // ln [-s] TARGET LINKNAME — the link being created is a write operation
     const positional = getPositionalArgs(
       args,
-      new Set(['-S', '--suffix', '-t', '--target-directory', '-b', '--backup']),
+      new Set(["-S", "--suffix", "-t", "--target-directory", "-b", "--backup"]),
     ).filter(looksLikePath);
     if (positional.length < 2) return [];
     const linkname = positional[positional.length - 1]!;
-    return [
-      { virtualTool: 'write_file', filePath: resolvePath(linkname, cwd) },
-    ];
+    return [{ virtualTool: "write_file", filePath: resolvePath(linkname, cwd) }];
   },
 
   // ── File-edit commands (modify or delete existing content) ────────────────
 
   rm: (args, cwd) =>
-    getPositionalArgs(args, new Set(['--interactive']))
+    getPositionalArgs(args, new Set(["--interactive"]))
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       })),
 
   rmdir: (args, cwd) =>
-    getPositionalArgs(
-      args,
-      new Set(['--ignore-fail-on-non-empty', '-p', '--parents']),
-    )
+    getPositionalArgs(args, new Set(["--ignore-fail-on-non-empty", "-p", "--parents"]))
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       })),
 
@@ -1185,18 +1037,15 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     getPositionalArgs(args)
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       })),
 
   shred: (args, cwd) =>
-    getPositionalArgs(
-      args,
-      new Set(['-n', '--iterations', '-s', '--size', '--random-source']),
-    )
+    getPositionalArgs(args, new Set(["-n", "--iterations", "-s", "--size", "--random-source"]))
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       })),
 
@@ -1204,20 +1053,20 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     getPositionalArgs(
       args,
       new Set([
-        '-s',
-        '--size',
-        '-r',
-        '--reference',
-        '-o',
-        '-I',
-        '-c',
-        '--io-blocks',
-        '--no-create',
+        "-s",
+        "--size",
+        "-r",
+        "--reference",
+        "-o",
+        "-I",
+        "-c",
+        "--io-blocks",
+        "--no-create",
       ]),
     )
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       })),
 
@@ -1225,41 +1074,35 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     // chmod [opts] MODE file... — the mode is the first positional arg.
     // Apply slice(1) BEFORE filter so that numeric modes like '755' (which are
     // filtered by looksLikePath) don't cause the file path to be dropped.
-    const positional = getPositionalArgs(
-      args,
-      new Set(['-f', '--reference', '--from']),
-    );
+    const positional = getPositionalArgs(args, new Set(["-f", "--reference", "--from"]));
     return positional
       .slice(1)
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       }));
   },
 
   chown: (args, cwd) => {
     // chown [opts] OWNER[:GROUP] file... — the owner spec is the first positional.
-    const positional = getPositionalArgs(
-      args,
-      new Set(['--from', '--reference']),
-    );
+    const positional = getPositionalArgs(args, new Set(["--from", "--reference"]));
     return positional
       .slice(1)
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       }));
   },
 
   chgrp: (args, cwd) => {
-    const positional = getPositionalArgs(args, new Set(['--reference']));
+    const positional = getPositionalArgs(args, new Set(["--reference"]));
     return positional
       .slice(1)
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'edit' as const,
+        virtualTool: "edit" as const,
         filePath: resolvePath(p, cwd),
       }));
   },
@@ -1268,7 +1111,7 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     // rename FROM TO file... — skip first two positionals (the from/to patterns)
     const positional = getPositionalArgs(args).filter(looksLikePath);
     return positional.slice(2).map((p) => ({
-      virtualTool: 'edit' as const,
+      virtualTool: "edit" as const,
       filePath: resolvePath(p, cwd),
     }));
   },
@@ -1276,30 +1119,26 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
   sed: (args, cwd) => {
     // sed [-i] SCRIPT file... or sed -e SCRIPT file...
     // With -i: in-place edit (virtualTool = 'edit'); otherwise read (virtualTool = 'read_file')
-    const hasInPlace = args.some((a) => a === '-i' || a.startsWith('-i'));
-    const hasExplicitScript = args.some(
-      (a) => a === '-e' || a === '-f' || a.startsWith('-e'),
-    );
+    const hasInPlace = args.some((a) => a === "-i" || a.startsWith("-i"));
+    const hasExplicitScript = args.some((a) => a === "-e" || a === "-f" || a.startsWith("-e"));
     const flagsWithValue = new Set([
-      '-e',
-      '-f',
-      '--expression',
-      '--file',
+      "-e",
+      "-f",
+      "--expression",
+      "--file",
       // NOTE: -i is intentionally absent — it is an optional-suffix flag
       // (e.g. `-i`, `-i.bak`) and does NOT consume the next token as a value.
-      '-l',
-      '--line-length',
-      '--sandbox',
-      '-s',
-      '--separate',
+      "-l",
+      "--line-length",
+      "--sandbox",
+      "-s",
+      "--separate",
     ]);
-    const positional = getPositionalArgs(args, flagsWithValue).filter(
-      looksLikePath,
-    );
+    const positional = getPositionalArgs(args, flagsWithValue).filter(looksLikePath);
     // If -e/-f was used, all positionals are file paths.
     // Otherwise, the first positional is the script expression.
     const filePaths = hasExplicitScript ? positional : positional.slice(1);
-    const tool: 'edit' | 'read_file' = hasInPlace ? 'edit' : 'read_file';
+    const tool: "edit" | "read_file" = hasInPlace ? "edit" : "read_file";
     return filePaths.map((p) => ({
       virtualTool: tool,
       filePath: resolvePath(p, cwd),
@@ -1311,40 +1150,40 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
     // The PROGRAM is the first positional — it will contain `{...}` which is
     // filtered out by looksLikePath, so we don't need special handling.
     const flagsWithValue = new Set([
-      '-F',
-      '-f',
-      '-v',
-      '-m',
-      '-W',
-      '-M',
-      '--source',
-      '--include',
-      '--load',
-      '-b',
-      '--characters-as-bytes',
-      '-c',
-      '--traditional',
-      '-d',
-      '-D',
-      '--debug',
-      '-e',
-      '--exec',
-      '-h',
-      '--help',
-      '-i',
-      '--lint',
-      '-o',
-      '-p',
-      '-r',
-      '-s',
-      '-S',
-      '-t',
-      '-V',
+      "-F",
+      "-f",
+      "-v",
+      "-m",
+      "-W",
+      "-M",
+      "--source",
+      "--include",
+      "--load",
+      "-b",
+      "--characters-as-bytes",
+      "-c",
+      "--traditional",
+      "-d",
+      "-D",
+      "--debug",
+      "-e",
+      "--exec",
+      "-h",
+      "--help",
+      "-i",
+      "--lint",
+      "-o",
+      "-p",
+      "-r",
+      "-s",
+      "-S",
+      "-t",
+      "-V",
     ]);
     return getPositionalArgs(args, flagsWithValue)
       .filter(looksLikePath)
       .map((p) => ({
-        virtualTool: 'read_file' as const,
+        virtualTool: "read_file" as const,
         filePath: resolvePath(p, cwd),
       }));
   },
@@ -1353,70 +1192,67 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
 
   curl: (args) => {
     const flagsWithValue = new Set([
-      '-o',
-      '-O',
-      '--output',
-      '-u',
-      '--user',
-      '-A',
-      '--user-agent',
-      '-H',
-      '--header',
-      '-d',
-      '--data',
-      '--data-binary',
-      '--data-raw',
-      '--data-urlencode',
-      '-X',
-      '--request',
-      '-F',
-      '--form',
-      '-e',
-      '--referer',
-      '-T',
-      '--upload-file',
-      '--cacert',
-      '--capath',
-      '--cert',
-      '--key',
-      '--pass',
-      '-m',
-      '--max-time',
-      '--connect-timeout',
-      '-r',
-      '--range',
-      '--limit-rate',
-      '-b',
-      '--cookie',
-      '-c',
-      '--cookie-jar',
-      '--proxy',
-      '-U',
-      '--proxy-user',
-      '-K',
-      '--config',
-      '--netrc-file',
-      '--resolve',
-      '--connect-to',
-      '-w',
-      '--write-out',
-      '-x',
-      '-Y',
-      '--speed-limit',
-      '--speed-time',
-      '-y',
-      '--max-filesize',
-      '--proto',
-      '--proto-redir',
-      '-E',
-      '--cert-type',
-      '--key-type',
+      "-o",
+      "-O",
+      "--output",
+      "-u",
+      "--user",
+      "-A",
+      "--user-agent",
+      "-H",
+      "--header",
+      "-d",
+      "--data",
+      "--data-binary",
+      "--data-raw",
+      "--data-urlencode",
+      "-X",
+      "--request",
+      "-F",
+      "--form",
+      "-e",
+      "--referer",
+      "-T",
+      "--upload-file",
+      "--cacert",
+      "--capath",
+      "--cert",
+      "--key",
+      "--pass",
+      "-m",
+      "--max-time",
+      "--connect-timeout",
+      "-r",
+      "--range",
+      "--limit-rate",
+      "-b",
+      "--cookie",
+      "-c",
+      "--cookie-jar",
+      "--proxy",
+      "-U",
+      "--proxy-user",
+      "-K",
+      "--config",
+      "--netrc-file",
+      "--resolve",
+      "--connect-to",
+      "-w",
+      "--write-out",
+      "-x",
+      "-Y",
+      "--speed-limit",
+      "--speed-time",
+      "-y",
+      "--max-filesize",
+      "--proto",
+      "--proto-redir",
+      "-E",
+      "--cert-type",
+      "--key-type",
     ]);
     return getPositionalArgs(args, flagsWithValue)
-      .filter(
-        (p) =>
-          p.includes('://') || /^https?:\/\//.test(p) || /^ftp:\/\//.test(p),
-      )
+      .filter((p) => p.includes("://") || /^https?:\/\//.test(p) || /^ftp:\/\//.test(p))
       .flatMap((url) => {
         const op = webOp(url);
         return op ? [op] : [];
@@ -1425,58 +1261,58 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
 
   wget: (args) => {
     const flagsWithValue = new Set([
-      '-O',
-      '--output-document',
-      '-P',
-      '--directory-prefix',
-      '-o',
-      '--output-file',
-      '-a',
-      '--append-output',
-      '-U',
-      '--user-agent',
-      '--header',
-      '-e',
-      '--execute',
-      '--tries',
-      '-t',
-      '-T',
-      '--timeout',
-      '--wait',
-      '-w',
-      '--quota',
-      '-Q',
-      '--bind-address',
-      '--limit-rate',
-      '--user',
-      '--password',
-      '--proxy-user',
-      '--proxy-password',
-      '-i',
-      '--input-file',
-      '--base',
-      '--config',
-      '--referer',
-      '-D',
-      '--domains',
-      '--exclude-domains',
-      '-I',
-      '--include-directories',
-      '-X',
-      '--exclude-directories',
-      '--regex-type',
-      '-A',
-      '-R',
-      '--accept',
-      '--reject',
-      '--no-check-certificate',
-      '--ca-certificate',
-      '--ca-directory',
-      '--certificate',
-      '--private-key',
+      "-O",
+      "--output-document",
+      "-P",
+      "--directory-prefix",
+      "-o",
+      "--output-file",
+      "-a",
+      "--append-output",
+      "-U",
+      "--user-agent",
+      "--header",
+      "-e",
+      "--execute",
+      "--tries",
+      "-t",
+      "-T",
+      "--timeout",
+      "--wait",
+      "-w",
+      "--quota",
+      "-Q",
+      "--bind-address",
+      "--limit-rate",
+      "--user",
+      "--password",
+      "--proxy-user",
+      "--proxy-password",
+      "-i",
+      "--input-file",
+      "--base",
+      "--config",
+      "--referer",
+      "-D",
+      "--domains",
+      "--exclude-domains",
+      "-I",
+      "--include-directories",
+      "-X",
+      "--exclude-directories",
+      "--regex-type",
+      "-A",
+      "-R",
+      "--accept",
+      "--reject",
+      "--no-check-certificate",
+      "--ca-certificate",
+      "--ca-directory",
+      "--certificate",
+      "--private-key",
     ]);
     return getPositionalArgs(args, flagsWithValue)
-      .filter((p) => p.includes('://') || /^https?:\/\//.test(p))
+      .filter((p) => p.includes("://") || /^https?:\/\//.test(p))
       .flatMap((url) => {
         const op = webOp(url);
         return op ? [op] : [];
@@ -1486,18 +1322,18 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
   fetch: (args) => {
     // BSD `fetch` utility
     const flagsWithValue = new Set([
-      '-o',
-      '-q',
-      '-v',
-      '-a',
-      '-T',
-      '-S',
-      '--no-verify-peer',
-      '--no-verify-hostname',
-      '--ca-cert',
+      "-o",
+      "-q",
+      "-v",
+      "-a",
+      "-T",
+      "-S",
+      "--no-verify-peer",
+      "--no-verify-hostname",
+      "--ca-cert",
     ]);
     return getPositionalArgs(args, flagsWithValue)
-      .filter((p) => p.includes('://'))
+      .filter((p) => p.includes("://"))
       .flatMap((url) => {
         const op = webOp(url);
         return op ? [op] : [];
@@ -1516,31 +1352,31 @@ const COMMANDS: Readonly<Record<string, CommandHandler>> = {
  */
 const PREFIX_COMMAND_FLAGS_WITH_VALUE = new Map<string, ReadonlySet<string>>([
   [
-    'sudo',
+    "sudo",
     new Set([
-      '-u',
-      '--user',
-      '-g',
-      '--group',
-      '-C',
-      '--close-from',
-      '-c',
-      '--login-class',
-      '-D',
-      '--chdir',
-      '-p',
-      '--prompt',
-      '-r',
-      '--role',
-      '-t',
-      '--type',
-      '-T',
-      '--command-timeout',
-      '-U',
-      '--other-user',
+      "-u",
+      "--user",
+      "-g",
+      "--group",
+      "-C",
+      "--close-from",
+      "-c",
+      "--login-class",
+      "-D",
+      "--chdir",
+      "-p",
+      "--prompt",
+      "-r",
+      "--role",
+      "-t",
+      "--type",
+      "-T",
+      "--command-timeout",
+      "-U",
+      "--other-user",
     ]),
   ],
-  ['timeout', new Set(['-s', '--signal', '-k', '--kill-after'])],
+  ["timeout", new Set(["-s", "--signal", "-k", "--kill-after"])],
 ]);
 
 /**
@@ -1553,16 +1389,16 @@ const PREFIX_COMMAND_FLAGS_WITH_VALUE = new Map<string, ReadonlySet<string>>([
  *   `timeout 10 wget http://…` → analyse `wget http://…`
  */
 const PREFIX_COMMANDS = new Set([
-  'sudo',
-  'doas', // OpenBSD sudo alternative
-  'env',
-  'time',
-  'nice',
-  'ionice',
-  'nohup',
-  'timeout',
-  'unbuffer',
-  'stdbuf',
+  "sudo",
+  "doas", // OpenBSD sudo alternative
+  "env",
+  "time",
+  "nice",
+  "ionice",
+  "nohup",
+  "timeout",
+  "unbuffer",
+  "stdbuf",
 ]);
 
 // ─────────────────────────────────────────────────────────────────────────────
@@ -1584,10 +1420,7 @@ const PREFIX_COMMANDS = new Set([
  * @param simpleCommand - A single shell command without compound operators.
  * @param cwd           - Working directory for resolving relative paths.
  */
-export function extractShellOperations(
-  simpleCommand: string,
-  cwd: string,
-): ShellOperation[] {
+export function extractShellOperations(simpleCommand: string, cwd: string): ShellOperation[] {
   if (!simpleCommand.trim()) return [];
 
   const tokens = tokenize(simpleCommand);
@@ -1595,26 +1428,25 @@ export function extractShellOperations(
 
   // Extract I/O redirections before dispatching to the command handler.
   // This mutates `tokens` in-place by removing redirect tokens.
-  const { readFiles: redirectReads, writeFiles: redirectWrites } =
-    extractRedirects(tokens, cwd);
+  const { readFiles: redirectReads, writeFiles: redirectWrites } = extractRedirects(tokens, cwd);
 
   const cmdName = tokens[0];
   if (!cmdName) {
     // Only redirections were present (e.g. `> file` or `< file`)
     return [
       ...redirectReads.map((p) => ({
-        virtualTool: 'read_file' as const,
+        virtualTool: "read_file" as const,
         filePath: p,
       })),
       ...redirectWrites.map((p) => ({
-        virtualTool: 'write_file' as const,
+        virtualTool: "write_file" as const,
         filePath: p,
       })),
     ];
   }
 
   // Skip pure environment variable assignments: `FOO=bar`, `FOO=bar BAR=baz`
-  if (cmdName.includes('=')) return [];
+  if (cmdName.includes("=")) return [];
 
   const ops: ShellOperation[] = [];
 
@@ -1627,18 +1459,18 @@ export function extractShellOperations(
     let startIdx = 1;
     while (startIdx < tokens.length) {
       const t = tokens[startIdx]!;
-      if (t.startsWith('-')) {
+      if (t.startsWith("-")) {
         // Skip the flag itself
         startIdx++;
         // If this flag takes a separate value argument, skip that too
         if (
           flagsWithVal?.has(t) &&
           startIdx < tokens.length &&
-          !tokens[startIdx]!.startsWith('-')
+          !tokens[startIdx]!.startsWith("-")
         ) {
           startIdx++;
         }
-      } else if (t.includes('=')) {
+      } else if (t.includes("=")) {
         // Environment variable assignment: skip
         startIdx++;
       } else {
@@ -1647,16 +1479,12 @@ export function extractShellOperations(
     }
     // `timeout DURATION command` — the duration is a numeric positional that
     // precedes the actual command.  Skip it.
-    if (
-      cmdName === 'timeout' &&
-      startIdx < tokens.length &&
-      /^\d/.test(tokens[startIdx]!)
-    ) {
+    if (cmdName === "timeout" && startIdx < tokens.length && /^\d/.test(tokens[startIdx]!)) {
       startIdx++;
     }
     if (startIdx < tokens.length) {
       // Reconstruct the inner command and recurse
-      const innerCommand = tokens.slice(startIdx).join(' ');
+      const innerCommand = tokens.slice(startIdx).join(" ");
       ops.push(...extractShellOperations(innerCommand, cwd));
     }
   } else {
@@ -1672,11 +1500,11 @@ export function extractShellOperations(
   // Append redirect-derived operations
   ops.push(
     ...redirectReads.map((p) => ({
-      virtualTool: 'read_file' as const,
+      virtualTool: "read_file" as const,
       filePath: p,
     })),
     ...redirectWrites.map((p) => ({
-      virtualTool: 'write_file' as const,
+      virtualTool: "write_file" as const,
       filePath: p,
     })),
   );
diff --git a/packages/airiscode-core/src/permissions/types.ts b/packages/airiscode-core/src/permissions/types.ts
index 01d919cba..3b6c1b74d 100644
--- a/packages/airiscode-core/src/permissions/types.ts
+++ b/packages/airiscode-core/src/permissions/types.ts
@@ -11,13 +11,13 @@
  * - 'deny': Blocked; will not run.
  * - 'default': No explicit rule matched; falls back to the global approval mode.
  */
-export type PermissionDecision = 'allow' | 'ask' | 'deny' | 'default';
+export type PermissionDecision = "allow" | "ask" | "deny" | "default";
 
 /** The type of a permission rule. */
-export type RuleType = 'allow' | 'ask' | 'deny';
+export type RuleType = "allow" | "ask" | "deny";
 
 /** The scope/source of a permission rule. */
-export type RuleScope = 'system' | 'user' | 'workspace' | 'session';
+export type RuleScope = "system" | "user" | "workspace" | "session";
 
 /**
  * The kind of specifier a rule uses, determines which matching algorithm
@@ -28,7 +28,7 @@ export type RuleScope = 'system' | 'user' | 'workspace' | 'session';
  * - 'domain': Domain matching with `domain:` prefix (for WebFetch)
  * - 'literal': Simple literal equality (fallback for unknown tool types)
  */
-export type SpecifierKind = 'command' | 'path' | 'domain' | 'literal';
+export type SpecifierKind = "command" | "path" | "domain" | "literal";
 
 /**
  * A parsed permission rule.
diff --git a/packages/airiscode-core/src/prompts/mcp-prompts.ts b/packages/airiscode-core/src/prompts/mcp-prompts.ts
index 01096cf06..6274ccb96 100644
--- a/packages/airiscode-core/src/prompts/mcp-prompts.ts
+++ b/packages/airiscode-core/src/prompts/mcp-prompts.ts
@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
+import type { Config } from "../config/config.js";
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
 
-export function getMCPServerPrompts(
-  config: Config,
-  serverName: string,
-): DiscoveredMCPPrompt[] {
+export function getMCPServerPrompts(config: Config, serverName: string): DiscoveredMCPPrompt[] {
   const promptRegistry = config.getPromptRegistry();
   if (!promptRegistry) {
     return [];
diff --git a/packages/airiscode-core/src/prompts/prompt-registry.ts b/packages/airiscode-core/src/prompts/prompt-registry.ts
index 8a0367f77..8b73a5acf 100644
--- a/packages/airiscode-core/src/prompts/prompt-registry.ts
+++ b/packages/airiscode-core/src/prompts/prompt-registry.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
 
-const debugLogger = createDebugLogger('PROMPT_REGISTRY');
+const debugLogger = createDebugLogger("PROMPT_REGISTRY");
 
 export class PromptRegistry {
   private prompts: Map<string, DiscoveredMCPPrompt> = new Map();
@@ -32,9 +32,7 @@ export class PromptRegistry {
    * Returns an array of all registered and discovered prompt instances.
    */
   getAllPrompts(): DiscoveredMCPPrompt[] {
-    return Array.from(this.prompts.values()).sort((a, b) =>
-      a.name.localeCompare(b.name),
-    );
+    return Array.from(this.prompts.values()).sort((a, b) => a.name.localeCompare(b.name));
   }
 
   /**
diff --git a/packages/airiscode-core/src/services/chatCompressionService.ts b/packages/airiscode-core/src/services/chatCompressionService.ts
index 9c6428ce4..a6bf72564 100644
--- a/packages/airiscode-core/src/services/chatCompressionService.ts
+++ b/packages/airiscode-core/src/services/chatCompressionService.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import { type ChatCompressionInfo, CompressionStatus } from '../core/turn.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-import { DEFAULT_TOKEN_LIMIT } from '../core/tokenLimits.js';
-import { getCompressionPrompt } from '../core/prompts.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { logChatCompression } from '../telemetry/loggers.js';
-import { makeChatCompressionEvent } from '../telemetry/types.js';
-import type { PermissionMode } from '../hooks/types.js';
-import { SessionStartSource, PreCompactTrigger } from '../hooks/types.js';
+import type { Config } from "../config/config.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import { getCompressionPrompt } from "../core/prompts.js";
+import { DEFAULT_TOKEN_LIMIT } from "../core/tokenLimits.js";
+import { type ChatCompressionInfo, CompressionStatus } from "../core/turn.js";
+import type { PermissionMode } from "../hooks/types.js";
+import { PreCompactTrigger, SessionStartSource } from "../hooks/types.js";
+import { logChatCompression } from "../telemetry/loggers.js";
+import { makeChatCompressionEvent } from "../telemetry/types.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import type { Content } from "../types/llm.js";
+import { getResponseText } from "../utils/partUtils.js";
 
 /**
  * Threshold for compression token count as a fraction of the model's token limit.
@@ -45,12 +45,9 @@ export const MIN_COMPRESSION_FRACTION = 0.05;
  *
  * Exported for testing purposes.
  */
-export function findCompressSplitPoint(
-  contents: Content[],
-  fraction: number,
-): number {
+export function findCompressSplitPoint(contents: Content[], fraction: number): number {
   if (fraction <= 0 || fraction >= 1) {
-    throw new Error('Fraction must be between 0 and 1');
+    throw new Error("Fraction must be between 0 and 1");
   }
 
   const charCounts = contents.map((content) => JSON.stringify(content).length);
@@ -61,10 +58,7 @@ export function findCompressSplitPoint(
   let cumulativeCharCount = 0;
   for (let i = 0; i < contents.length; i++) {
     const content = contents[i];
-    if (
-      content.role === 'user' &&
-      !content.parts?.some((part) => !!part.functionResponse)
-    ) {
+    if (content.role === "user" && !content.parts?.some((part) => !!part.functionResponse)) {
       if (cumulativeCharCount >= targetCharCount) {
         return i;
       }
@@ -76,18 +70,12 @@ export function findCompressSplitPoint(
   // We found no split points after targetCharCount.
   // Check if it's safe to compress everything.
   const lastContent = contents[contents.length - 1];
-  if (
-    lastContent?.role === 'model' &&
-    !lastContent?.parts?.some((part) => part.functionCall)
-  ) {
+  if (lastContent?.role === "model" && !lastContent?.parts?.some((part) => part.functionCall)) {
     return contents.length;
   }
   // Also safe to compress everything if the last message completes a tool call
   // sequence (all function calls have matching responses).
-  if (
-    lastContent?.role === 'user' &&
-    lastContent?.parts?.some((part) => !!part.functionResponse)
-  ) {
+  if (lastContent?.role === "user" && lastContent?.parts?.some((part) => !!part.functionResponse)) {
     return contents.length;
   }
 
@@ -106,15 +94,10 @@ export class ChatCompressionService {
   ): Promise<{ newHistory: Content[] | null; info: ChatCompressionInfo }> {
     const curatedHistory = chat.getHistory(true);
     const threshold =
-      config.getChatCompression()?.contextPercentageThreshold ??
-      COMPRESSION_TOKEN_THRESHOLD;
+      config.getChatCompression()?.contextPercentageThreshold ?? COMPRESSION_TOKEN_THRESHOLD;
 
     // Regardless of `force`, don't do anything if the history is empty.
-    if (
-      curatedHistory.length === 0 ||
-      threshold <= 0 ||
-      (hasFailedCompressionAttempt && !force)
-    ) {
+    if (curatedHistory.length === 0 || threshold <= 0 || (hasFailedCompressionAttempt && !force)) {
       return {
         newHistory: null,
         info: {
@@ -130,8 +113,7 @@ export class ChatCompressionService {
     // Don't compress if not forced and we are under the limit.
     if (!force) {
       const contextLimit =
-        config.getContentGeneratorConfig()?.contextWindowSize ??
-        DEFAULT_TOKEN_LIMIT;
+        config.getContentGeneratorConfig()?.contextWindowSize ?? DEFAULT_TOKEN_LIMIT;
       if (originalTokenCount < threshold * contextLimit) {
         return {
           newHistory: null,
@@ -149,7 +131,7 @@ export class ChatCompressionService {
     if (hookSystem) {
       const trigger = force ? PreCompactTrigger.Manual : PreCompactTrigger.Auto;
       try {
-        await hookSystem.firePreCompactEvent(trigger, '', signal);
+        await hookSystem.firePreCompactEvent(trigger, "", signal);
       } catch (err) {
         config.getDebugLogger().warn(`PreCompact hook failed: ${err}`);
       }
@@ -166,17 +148,10 @@ export class ChatCompressionService {
     // history, so the trailing funcCall is still active, not orphaned.
     const lastMessage = curatedHistory[curatedHistory.length - 1];
     const hasOrphanedFuncCall =
-      force &&
-      lastMessage?.role === 'model' &&
-      lastMessage.parts?.some((p) => !!p.functionCall);
-    const historyForSplit = hasOrphanedFuncCall
-      ? curatedHistory.slice(0, -1)
-      : curatedHistory;
+      force && lastMessage?.role === "model" && lastMessage.parts?.some((p) => !!p.functionCall);
+    const historyForSplit = hasOrphanedFuncCall ? curatedHistory.slice(0, -1) : curatedHistory;
 
-    const splitPoint = findCompressSplitPoint(
-      historyForSplit,
-      1 - COMPRESSION_PRESERVE_THRESHOLD,
-    );
+    const splitPoint = findCompressSplitPoint(historyForSplit, 1 - COMPRESSION_PRESERVE_THRESHOLD);
 
     const historyToCompress = historyForSplit.slice(0, splitPoint);
     const historyToKeep = historyForSplit.slice(splitPoint);
@@ -203,14 +178,8 @@ export class ChatCompressionService {
       (sum, c) => sum + JSON.stringify(c).length,
       0,
     );
-    const totalCharCount = historyForSplit.reduce(
-      (sum, c) => sum + JSON.stringify(c).length,
-      0,
-    );
-    if (
-      totalCharCount > 0 &&
-      compressCharCount / totalCharCount < MIN_COMPRESSION_FRACTION
-    ) {
+    const totalCharCount = historyForSplit.reduce((sum, c) => sum + JSON.stringify(c).length, 0);
+    if (totalCharCount > 0 && compressCharCount / totalCharCount < MIN_COMPRESSION_FRACTION) {
       return {
         newHistory: null,
         info: {
@@ -227,10 +196,10 @@ export class ChatCompressionService {
         contents: [
           ...historyToCompress,
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
-                text: 'First, reason in your scratchpad. Then, generate the <state_snapshot>.',
+                text: "First, reason in your scratchpad. Then, generate the <state_snapshot>.",
               },
             ],
           },
@@ -241,17 +210,15 @@ export class ChatCompressionService {
       },
       promptId,
     );
-    const summary = getResponseText(summaryResponse) ?? '';
+    const summary = getResponseText(summaryResponse) ?? "";
     const isSummaryEmpty = !summary || summary.trim().length === 0;
     const compressionUsageMetadata = summaryResponse.usageMetadata;
-    const compressionInputTokenCount =
-      compressionUsageMetadata?.promptTokenCount;
-    let compressionOutputTokenCount =
-      compressionUsageMetadata?.candidatesTokenCount;
+    const compressionInputTokenCount = compressionUsageMetadata?.promptTokenCount;
+    let compressionOutputTokenCount = compressionUsageMetadata?.candidatesTokenCount;
     if (
       compressionOutputTokenCount === undefined &&
-      typeof compressionUsageMetadata?.totalTokenCount === 'number' &&
-      typeof compressionInputTokenCount === 'number'
+      typeof compressionUsageMetadata?.totalTokenCount === "number" &&
+      typeof compressionInputTokenCount === "number"
     ) {
       compressionOutputTokenCount = Math.max(
         0,
@@ -266,12 +233,12 @@ export class ChatCompressionService {
     if (!isSummaryEmpty) {
       extraHistory = [
         {
-          role: 'user',
+          role: "user",
           parts: [{ text: summary }],
         },
         {
-          role: 'model',
-          parts: [{ text: 'Got it. Thanks for the additional context!' }],
+          role: "model",
+          parts: [{ text: "Got it. Thanks for the additional context!" }],
         },
         ...historyToKeep,
       ];
@@ -283,17 +250,15 @@ export class ChatCompressionService {
       // compressionOutputTokenCount may include non-persisted tokens (thoughts).
       // We accept these inaccuracies to avoid local token estimation.
       if (
-        typeof compressionInputTokenCount === 'number' &&
+        typeof compressionInputTokenCount === "number" &&
         compressionInputTokenCount > 0 &&
-        typeof compressionOutputTokenCount === 'number' &&
+        typeof compressionOutputTokenCount === "number" &&
         compressionOutputTokenCount > 0
       ) {
         canCalculateNewTokenCount = true;
         newTokenCount = Math.max(
           0,
-          originalTokenCount -
-            (compressionInputTokenCount - 1000) +
-            compressionOutputTokenCount,
+          originalTokenCount - (compressionInputTokenCount - 1000) + compressionOutputTokenCount,
         );
       }
     }
@@ -323,8 +288,7 @@ export class ChatCompressionService {
         info: {
           originalTokenCount,
           newTokenCount: originalTokenCount,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_TOKEN_COUNT_ERROR,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_TOKEN_COUNT_ERROR,
         },
       };
     } else if (newTokenCount > originalTokenCount) {
@@ -333,8 +297,7 @@ export class ChatCompressionService {
         info: {
           originalTokenCount,
           newTokenCount,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         },
       };
     } else {
@@ -342,14 +305,12 @@ export class ChatCompressionService {
 
       // Fire SessionStart event after successful compression
       try {
-        const permissionMode = String(
-          config.getApprovalMode(),
-        ) as PermissionMode;
+        const permissionMode = String(config.getApprovalMode()) as PermissionMode;
         await config
           .getHookSystem()
           ?.fireSessionStartEvent(
             SessionStartSource.Compact,
-            model ?? '',
+            model ?? "",
             permissionMode,
             undefined,
             signal,
diff --git a/packages/airiscode-core/src/services/chatRecordingService.ts b/packages/airiscode-core/src/services/chatRecordingService.ts
index 86714426c..870a677b7 100644
--- a/packages/airiscode-core/src/services/chatRecordingService.ts
+++ b/packages/airiscode-core/src/services/chatRecordingService.ts
@@ -4,29 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type Config } from '../config/config.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import { type Config } from "../config/config.js";
 import {
-  type PartListUnion,
   type Content,
-  type GenerateContentResponseUsageMetadata,
-  createUserContent,
   createModelContent,
-} from '../types/llm.js';
-import * as jsonl from '../utils/jsonl-utils.js';
-import { getGitBranch } from '../utils/gitUtils.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('CHAT_RECORDING');
-import type {
-  ChatCompressionInfo,
-  ToolCallResponseInfo,
-} from '../core/turn.js';
-import type { Status } from '../core/coreToolScheduler.js';
-import type { AgentResultDisplay } from '../tools/tools.js';
-import type { UiEvent } from '../telemetry/uiTelemetry.js';
+  createUserContent,
+  type GenerateContentResponseUsageMetadata,
+  type PartListUnion,
+} from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getGitBranch } from "../utils/gitUtils.js";
+import * as jsonl from "../utils/jsonl-utils.js";
+
+const debugLogger = createDebugLogger("CHAT_RECORDING");
+
+import type { Status } from "../core/coreToolScheduler.js";
+import type { ChatCompressionInfo, ToolCallResponseInfo } from "../core/turn.js";
+import type { UiEvent } from "../telemetry/uiTelemetry.js";
+import type { AgentResultDisplay } from "../tools/tools.js";
 
 /**
  * A single record stored in the JSONL file.
@@ -51,13 +49,9 @@ export interface ChatRecord {
    * System records are append-only events that can alter how history is reconstructed
    * (e.g., chat compression checkpoints) while keeping the original UI history intact.
    */
-  type: 'user' | 'assistant' | 'tool_result' | 'system';
+  type: "user" | "assistant" | "tool_result" | "system";
   /** Optional system subtype for distinguishing system behaviors */
-  subtype?:
-    | 'chat_compression'
-    | 'slash_command'
-    | 'ui_telemetry'
-    | 'at_command';
+  subtype?: "chat_compression" | "slash_command" | "ui_telemetry" | "at_command";
   /** Working directory at time of message */
   cwd: string;
   /** CLI version for compatibility tracking */
@@ -117,7 +111,7 @@ export interface ChatCompressionRecordPayload {
 
 export interface SlashCommandRecordPayload {
   /** Whether this record represents the invocation or the resulting output. */
-  phase: 'invocation' | 'result';
+  phase: "invocation" | "result";
   /** Raw user-entered slash command (e.g., "/about"). */
   rawCommand: string;
   /**
@@ -134,7 +128,7 @@ export interface AtCommandRecordPayload {
   /** Files that were read for this @-command. */
   filesRead: string[];
   /** Status for UI reconstruction. */
-  status: 'success' | 'error';
+  status: "success" | "error";
   /** Optional result message for UI reconstruction. */
   message?: string;
   /** Raw user-entered @-command query (optional for legacy records). */
@@ -179,8 +173,7 @@ export class ChatRecordingService {
 
   constructor(config: Config) {
     this.config = config;
-    this.lastRecordUuid =
-      config.getResumedSessionData()?.lastCompletedUuid ?? null;
+    this.lastRecordUuid = config.getResumedSessionData()?.lastCompletedUuid ?? null;
   }
 
   /**
@@ -198,7 +191,7 @@ export class ChatRecordingService {
    */
   private ensureChatsDir(): string {
     const projectDir = this.config.storage.getProjectDir();
-    const chatsDir = path.join(projectDir, 'chats');
+    const chatsDir = path.join(projectDir, "chats");
 
     try {
       fs.mkdirSync(chatsDir, { recursive: true });
@@ -228,15 +221,13 @@ export class ChatRecordingService {
     try {
       // Use 'wx' flag for exclusive creation - atomic operation that fails if file exists
       // This avoids the TOCTOU race condition of existsSync + writeFileSync
-      fs.writeFileSync(conversationFile, '', { flag: 'wx', encoding: 'utf8' });
+      fs.writeFileSync(conversationFile, "", { flag: "wx", encoding: "utf8" });
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
       // EEXIST means file already exists, which is expected and fine
-      if (nodeError.code !== 'EEXIST') {
+      if (nodeError.code !== "EEXIST") {
         const message = error instanceof Error ? error.message : String(error);
-        throw new Error(
-          `Failed to create conversation file at ${conversationFile}: ${message}`,
-        );
+        throw new Error(`Failed to create conversation file at ${conversationFile}: ${message}`);
       }
     }
 
@@ -247,8 +238,8 @@ export class ChatRecordingService {
    * Creates base fields for a ChatRecord.
    */
   private createBaseRecord(
-    type: ChatRecord['type'],
-  ): Omit<ChatRecord, 'message' | 'tokens' | 'model' | 'toolCallsMetadata'> {
+    type: ChatRecord["type"],
+  ): Omit<ChatRecord, "message" | "tokens" | "model" | "toolCallsMetadata"> {
     return {
       uuid: randomUUID(),
       parentUuid: this.lastRecordUuid,
@@ -256,7 +247,7 @@ export class ChatRecordingService {
       timestamp: new Date().toISOString(),
       type,
       cwd: this.config.getProjectRoot(),
-      version: this.config.getCliVersion() || 'unknown',
+      version: this.config.getCliVersion() || "unknown",
       gitBranch: getGitBranch(this.config.getProjectRoot()),
     };
   }
@@ -271,7 +262,7 @@ export class ChatRecordingService {
       jsonl.writeLineSync(conversationFile, record);
       this.lastRecordUuid = record.uuid;
     } catch (error) {
-      debugLogger.error('Error appending record:', error);
+      debugLogger.error("Error appending record:", error);
       throw error;
     }
   }
@@ -285,12 +276,12 @@ export class ChatRecordingService {
   recordUserMessage(message: PartListUnion): void {
     try {
       const record: ChatRecord = {
-        ...this.createBaseRecord('user'),
+        ...this.createBaseRecord("user"),
         message: createUserContent(message),
       };
       this.appendRecord(record);
     } catch (error) {
-      debugLogger.error('Error saving user message:', error);
+      debugLogger.error("Error saving user message:", error);
     }
   }
 
@@ -312,7 +303,7 @@ export class ChatRecordingService {
   }): void {
     try {
       const record: ChatRecord = {
-        ...this.createBaseRecord('assistant'),
+        ...this.createBaseRecord("assistant"),
         model: data.model,
       };
 
@@ -330,7 +321,7 @@ export class ChatRecordingService {
 
       this.appendRecord(record);
     } catch (error) {
-      debugLogger.error('Error saving assistant turn:', error);
+      debugLogger.error("Error saving assistant turn:", error);
     }
   }
 
@@ -347,17 +338,17 @@ export class ChatRecordingService {
   ): void {
     try {
       const record: ChatRecord = {
-        ...this.createBaseRecord('tool_result'),
+        ...this.createBaseRecord("tool_result"),
         message: createUserContent(message),
       };
 
       if (toolCallResult) {
         // special case for task executions - we don't want to record the tool calls
         if (
-          typeof toolCallResult.resultDisplay === 'object' &&
+          typeof toolCallResult.resultDisplay === "object" &&
           toolCallResult.resultDisplay !== null &&
-          'type' in toolCallResult.resultDisplay &&
-          toolCallResult.resultDisplay.type === 'task_execution'
+          "type" in toolCallResult.resultDisplay &&
+          toolCallResult.resultDisplay.type === "task_execution"
         ) {
           const taskResult = toolCallResult.resultDisplay as AgentResultDisplay;
           record.toolCallResult = {
@@ -374,7 +365,7 @@ export class ChatRecordingService {
 
       this.appendRecord(record);
     } catch (error) {
-      debugLogger.error('Error saving tool result:', error);
+      debugLogger.error("Error saving tool result:", error);
     }
   }
 
@@ -386,15 +377,15 @@ export class ChatRecordingService {
   recordSlashCommand(payload: SlashCommandRecordPayload): void {
     try {
       const record: ChatRecord = {
-        ...this.createBaseRecord('system'),
-        type: 'system',
-        subtype: 'slash_command',
+        ...this.createBaseRecord("system"),
+        type: "system",
+        subtype: "slash_command",
         systemPayload: payload,
       };
 
       this.appendRecord(record);
     } catch (error) {
-      debugLogger.error('Error saving slash command record:', error);
+      debugLogger.error("Error saving slash command record:", error);
     }
   }
 
@@ -406,15 +397,15 @@ export class ChatRecordingService {
   recordChatCompression(payload: ChatCompressionRecordPayload): void {
     try {
       const record: ChatRecord = {
-        ...this.createBaseRecord('system'),
-        type: 'system',
-        subtype: 'chat_compression',
+        ...this.createBaseRecord("system"),
+        type: "system",
+        subtype: "chat_compression",
         systemPayload: payload,
       };
 
       this.appendRecord(record);
     } catch (error) {
-      debugLogger.error('Error saving chat compression record:', error);
+      debugLogger.error("Error saving chat compression record:", error);
     }
   }
 
@@ -424,15 +415,15 @@ export class ChatRecordingService {
   recordUiTelemetryEvent(uiEvent: UiEvent): void {
     try {
       const record: ChatRecord = {
-        ...this.createBaseRecord('system'),
-        type: 'system',
-        subtype: 'ui_telemetry',
+        ...this.createBaseRecord("system"),
+        type: "system",
+        subtype: "ui_telemetry",
         systemPayload: { uiEvent },
       };
 
       this.appendRecord(record);
     } catch (error) {
-      debugLogger.error('Error saving ui telemetry record:', error);
+      debugLogger.error("Error saving ui telemetry record:", error);
     }
   }
 
@@ -442,15 +433,15 @@ export class ChatRecordingService {
   recordAtCommand(payload: AtCommandRecordPayload): void {
     try {
       const record: ChatRecord = {
-        ...this.createBaseRecord('system'),
-        type: 'system',
-        subtype: 'at_command',
+        ...this.createBaseRecord("system"),
+        type: "system",
+        subtype: "at_command",
         systemPayload: payload,
       };
 
       this.appendRecord(record);
     } catch (error) {
-      debugLogger.error('Error saving @-command record:', error);
+      debugLogger.error("Error saving @-command record:", error);
     }
   }
 }
diff --git a/packages/airiscode-core/src/services/cronScheduler.ts b/packages/airiscode-core/src/services/cronScheduler.ts
index 9685dde5b..229e0aab8 100644
--- a/packages/airiscode-core/src/services/cronScheduler.ts
+++ b/packages/airiscode-core/src/services/cronScheduler.ts
@@ -3,8 +3,8 @@
  * process exits. Ticks every second, fires callbacks when jobs are due.
  */
 
-import { matches, nextFireTime } from '../utils/cronParser.js';
-import { humanReadableCron } from '../utils/cronDisplay.js';
+import { humanReadableCron } from "../utils/cronDisplay.js";
+import { matches, nextFireTime } from "../utils/cronParser.js";
 
 const MAX_JOBS = 50;
 const THREE_DAYS_MS = 3 * 24 * 60 * 60 * 1000;
@@ -41,11 +41,7 @@ function hashId(id: string): number {
  * One-shot jobs landing on :00 or :30: up to 90s early (subtracted before fire time).
  * Other one-shot jobs: 0 jitter.
  */
-function computeJitter(
-  id: string,
-  cronExpr: string,
-  recurring: boolean,
-): number {
+function computeJitter(id: string, cronExpr: string, recurring: boolean): number {
   const hash = hashId(id);
 
   if (recurring) {
@@ -66,7 +62,7 @@ function computeJitter(
   // One-shot: apply up to 90s early jitter only when minute is :00 or :30
   try {
     const fields = cronExpr.trim().split(/\s+/);
-    const minuteField = fields[0] ?? '';
+    const minuteField = fields[0] ?? "";
     const minuteVal = parseInt(minuteField, 10);
     if (!isNaN(minuteVal) && (minuteVal === 0 || minuteVal === 30)) {
       // Negative jitter = fire early
@@ -80,8 +76,8 @@ function computeJitter(
 }
 
 function generateId(): string {
-  const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
-  let id = '';
+  const chars = "abcdefghijklmnopqrstuvwxyz0123456789";
+  let id = "";
   for (let i = 0; i < 8; i++) {
     id += chars[Math.floor(Math.random() * chars.length)];
   }
@@ -99,9 +95,7 @@ export class CronScheduler {
    */
   create(cronExpr: string, prompt: string, recurring: boolean): CronJob {
     if (this.jobs.size >= MAX_JOBS) {
-      throw new Error(
-        `Maximum number of cron jobs (${MAX_JOBS}) reached. Delete some jobs first.`,
-      );
+      throw new Error(`Maximum number of cron jobs (${MAX_JOBS}) reached. Delete some jobs first.`);
     }
 
     const id = generateId();
@@ -230,10 +224,7 @@ export class CronScheduler {
       }
 
       // Prevent double-firing: compare against the cron minute we last fired for
-      if (
-        job.lastFiredAt !== undefined &&
-        job.lastFiredAt === matchedMinuteMs
-      ) {
+      if (job.lastFiredAt !== undefined && job.lastFiredAt === matchedMinuteMs) {
         continue; // Already fired for this cron minute
       }
 
@@ -259,17 +250,14 @@ export class CronScheduler {
     if (this.jobs.size === 0) return null;
 
     const count = this.jobs.size;
-    const lines = [
-      `Session ending. ${count} active loop${count === 1 ? '' : 's'} cancelled:`,
-    ];
+    const lines = [`Session ending. ${count} active loop${count === 1 ? "" : "s"} cancelled:`];
     for (const job of this.jobs.values()) {
       const schedule = humanReadableCron(job.cronExpr);
       // Truncate long prompts
-      const prompt =
-        job.prompt.length > 60 ? job.prompt.slice(0, 57) + '...' : job.prompt;
+      const prompt = job.prompt.length > 60 ? job.prompt.slice(0, 57) + "..." : job.prompt;
       lines.push(`  - [${job.id}] ${schedule}: ${prompt}`);
     }
-    return lines.join('\n');
+    return lines.join("\n");
   }
 
   /**
diff --git a/packages/airiscode-core/src/services/fileDiscoveryService.ts b/packages/airiscode-core/src/services/fileDiscoveryService.ts
index 07323e323..60aa76fa6 100644
--- a/packages/airiscode-core/src/services/fileDiscoveryService.ts
+++ b/packages/airiscode-core/src/services/fileDiscoveryService.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GitIgnoreFilter } from '../utils/gitIgnoreParser.js';
-import type { QwenIgnoreFilter } from '../utils/qwenIgnoreParser.js';
-import { GitIgnoreParser } from '../utils/gitIgnoreParser.js';
-import { QwenIgnoreParser } from '../utils/qwenIgnoreParser.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import * as path from 'node:path';
+import * as path from "node:path";
+import type { GitIgnoreFilter } from "../utils/gitIgnoreParser.js";
+import { GitIgnoreParser } from "../utils/gitIgnoreParser.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import type { QwenIgnoreFilter } from "../utils/qwenIgnoreParser.js";
+import { QwenIgnoreParser } from "../utils/qwenIgnoreParser.js";
 
 export interface FilterFilesOptions {
   respectGitIgnore?: boolean;
@@ -115,14 +115,9 @@ export class FileDiscoveryService {
   /**
    * Unified method to check if a file should be ignored based on filtering options
    */
-  shouldIgnoreFile(
-    filePath: string,
-    options: FilterFilesOptions = {},
-  ): boolean {
-    const {
-      respectGitIgnore = true,
-      respectAiriscodeIgnore: respectAiriscodeIgnore = true,
-    } = options;
+  shouldIgnoreFile(filePath: string, options: FilterFilesOptions = {}): boolean {
+    const { respectGitIgnore = true, respectAiriscodeIgnore: respectAiriscodeIgnore = true } =
+      options;
 
     if (respectGitIgnore && this.shouldGitIgnoreFile(filePath)) {
       return true;
diff --git a/packages/airiscode-core/src/services/fileSystemService.ts b/packages/airiscode-core/src/services/fileSystemService.ts
index b4615e37a..7e902f8b4 100644
--- a/packages/airiscode-core/src/services/fileSystemService.ts
+++ b/packages/airiscode-core/src/services/fileSystemService.ts
@@ -4,23 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import * as path from 'node:path';
-import { globSync } from 'glob';
-import { readFileWithLineAndLimit } from '../utils/fileUtils.js';
+import fs from "node:fs/promises";
+import os from "node:os";
+import * as path from "node:path";
+import { globSync } from "glob";
+import { readFileWithLineAndLimit } from "../utils/fileUtils.js";
 import {
   iconvEncode,
   iconvEncodingExists,
   isUtf8CompatibleEncoding,
-} from '../utils/iconvHelper.js';
-import { getSystemEncoding } from '../utils/systemEncoding.js';
+} from "../utils/iconvHelper.js";
+import { getSystemEncoding } from "../utils/systemEncoding.js";
+
 // ACP SDK types inlined (was @agentclientprotocol/sdk)
-type ReadTextFileRequest = { path: string; encoding?: string; line?: number; limit?: number; _meta?: Record<string, unknown> };
-type WriteTextFileRequest = { path: string; content: string; encoding?: string; _meta?: Record<string, unknown> };
+type ReadTextFileRequest = {
+  path: string;
+  encoding?: string;
+  line?: number;
+  limit?: number;
+  _meta?: Record<string, unknown>;
+};
+type WriteTextFileRequest = {
+  path: string;
+  content: string;
+  encoding?: string;
+  _meta?: Record<string, unknown>;
+};
 type WriteTextFileResponse = { path: string; _meta?: Record<string, unknown> };
 
-export type LineEnding = 'crlf' | 'lf';
+export type LineEnding = "crlf" | "lf";
 
 export type ReadTextFileResponse = {
   content: string;
@@ -36,8 +48,8 @@ export type ReadTextFileResponse = {
  * Supported file encodings for new files.
  */
 export const FileEncoding = {
-  UTF8: 'utf-8',
-  UTF8_BOM: 'utf-8-bom',
+  UTF8: "utf-8",
+  UTF8_BOM: "utf-8-bom",
 } as const;
 
 /**
@@ -49,13 +61,9 @@ export type FileEncodingType = (typeof FileEncoding)[keyof typeof FileEncoding];
  * Interface for file system operations that may be delegated to different implementations
  */
 export interface FileSystemService {
-  readTextFile(
-    params: Omit<ReadTextFileRequest, 'sessionId'>,
-  ): Promise<ReadTextFileResponse>;
+  readTextFile(params: Omit<ReadTextFileRequest, "sessionId">): Promise<ReadTextFileResponse>;
 
-  writeTextFile(
-    params: Omit<WriteTextFileRequest, 'sessionId'>,
-  ): Promise<WriteTextFileResponse>;
+  writeTextFile(params: Omit<WriteTextFileRequest, "sessionId">): Promise<WriteTextFileResponse>;
 
   /**
    * Finds files with a given name within specified search paths.
@@ -92,7 +100,7 @@ export interface WriteTextFileOptions {
  * cmd.exe parses .bat/.cmd files using CRLF delimiters; LF-only endings can
  * break multi-line constructs, labels, and goto statements.
  */
-const CRLF_EXTENSIONS = new Set(['.bat', '.cmd']);
+const CRLF_EXTENSIONS = new Set([".bat", ".cmd"]);
 
 /**
  * File extensions that need UTF-8 BOM on Windows with a non-UTF-8 code page.
@@ -101,7 +109,7 @@ const CRLF_EXTENSIONS = new Set(['.bat', '.cmd']);
  * in the script will be misinterpreted (e.g. on a GBK system). PowerShell 7+
  * defaults to UTF-8 and handles BOM fine, so adding BOM is always safe.
  */
-const UTF8_BOM_EXTENSIONS = new Set(['.ps1']);
+const UTF8_BOM_EXTENSIONS = new Set([".ps1"]);
 
 // Cache so we only call getSystemEncoding() once per process
 let cachedIsNonUtf8Windows: boolean | undefined;
@@ -119,11 +127,11 @@ export function needsUtf8Bom(filePath: string): boolean {
     return false;
   }
   if (cachedIsNonUtf8Windows === undefined) {
-    if (os.platform() !== 'win32') {
+    if (os.platform() !== "win32") {
       cachedIsNonUtf8Windows = false;
     } else {
       const sysEnc = getSystemEncoding();
-      cachedIsNonUtf8Windows = sysEnc !== 'utf-8';
+      cachedIsNonUtf8Windows = sysEnc !== "utf-8";
     }
   }
   return cachedIsNonUtf8Windows;
@@ -141,7 +149,7 @@ export function resetUtf8BomCache(): void {
  * Only applies on Windows where cmd.exe actually parses these files.
  */
 function needsCrlfLineEndings(filePath: string): boolean {
-  if (os.platform() !== 'win32') {
+  if (os.platform() !== "win32") {
     return false;
   }
   const ext = path.extname(filePath).toLowerCase();
@@ -154,7 +162,7 @@ function needsCrlfLineEndings(filePath: string): boolean {
  */
 export function ensureCrlfLineEndings(content: string): string {
   // First normalize CRLF to LF to avoid double-conversion, then convert all LF to CRLF
-  return content.split('\r\n').join('\n').split('\n').join('\r\n');
+  return content.split("\r\n").join("\n").split("\n").join("\r\n");
 }
 
 /**
@@ -163,7 +171,7 @@ export function ensureCrlfLineEndings(content: string): string {
  * 'lf' otherwise (including for content with no line endings).
  */
 export function detectLineEnding(content: string): LineEnding {
-  return content.includes('\r\n') ? 'crlf' : 'lf';
+  return content.includes("\r\n") ? "crlf" : "lf";
 }
 
 /**
@@ -172,19 +180,19 @@ export function detectLineEnding(content: string): LineEnding {
  * originally had a BOM so the BOM is preserved.
  */
 function getBOMBytesForEncoding(encoding: string): Buffer | null {
-  const lower = encoding.toLowerCase().replace(/[^a-z0-9]/g, '');
+  const lower = encoding.toLowerCase().replace(/[^a-z0-9]/g, "");
   switch (lower) {
-    case 'utf8':
+    case "utf8":
       return Buffer.from([0xef, 0xbb, 0xbf]);
-    case 'utf16le':
-    case 'utf16':
+    case "utf16le":
+    case "utf16":
       return Buffer.from([0xff, 0xfe]);
-    case 'utf16be':
+    case "utf16be":
       return Buffer.from([0xfe, 0xff]);
-    case 'utf32le':
-    case 'utf32':
+    case "utf32le":
+    case "utf32":
       return Buffer.from([0xff, 0xfe, 0x00, 0x00]);
-    case 'utf32be':
+    case "utf32be":
       return Buffer.from([0x00, 0x00, 0xfe, 0xff]);
     default:
       return null;
@@ -196,41 +204,35 @@ function getBOMBytesForEncoding(encoding: string): Buffer | null {
  */
 export class StandardFileSystemService implements FileSystemService {
   async readTextFile(
-    params: Omit<ReadTextFileRequest, 'sessionId'>,
+    params: Omit<ReadTextFileRequest, "sessionId">,
   ): Promise<ReadTextFileResponse> {
     const { path, limit, line } = params;
     // Use encoding-aware reader that handles BOM and non-UTF-8 encodings (e.g. GBK)
-    const { content, bom, encoding, originalLineCount } =
-      await readFileWithLineAndLimit({
-        path,
-        limit: limit ?? Number.POSITIVE_INFINITY,
-        line: line || 0,
-      });
+    const { content, bom, encoding, originalLineCount } = await readFileWithLineAndLimit({
+      path,
+      limit: limit ?? Number.POSITIVE_INFINITY,
+      line: line || 0,
+    });
     const lineEnding = detectLineEnding(content);
     return { content, _meta: { bom, encoding, originalLineCount, lineEnding } };
   }
 
   async writeTextFile(
-    params: Omit<WriteTextFileRequest, 'sessionId'>,
+    params: Omit<WriteTextFileRequest, "sessionId">,
   ): Promise<WriteTextFileResponse> {
     const { path: filePath, _meta } = params;
-    const lineEnding = _meta?.['lineEnding'] as string | undefined;
+    const lineEnding = _meta?.["lineEnding"] as string | undefined;
     // Convert LF to CRLF when:
     // 1. The file type requires it (e.g. .bat, .cmd on Windows), OR
     // 2. The original file used CRLF line endings (preserve original style)
-    const shouldUseCrlf =
-      needsCrlfLineEndings(filePath) || lineEnding === 'crlf';
-    const content = shouldUseCrlf
-      ? ensureCrlfLineEndings(params.content)
-      : params.content;
-    const bom = _meta?.['bom'] ?? (false as boolean);
-    const encoding = _meta?.['encoding'] as string | undefined;
+    const shouldUseCrlf = needsCrlfLineEndings(filePath) || lineEnding === "crlf";
+    const content = shouldUseCrlf ? ensureCrlfLineEndings(params.content) : params.content;
+    const bom = _meta?.["bom"] ?? (false as boolean);
+    const encoding = _meta?.["encoding"] as string | undefined;
 
     // Check if a non-UTF-8 encoding is specified and supported by iconv-lite
     const isNonUtf8Encoding =
-      encoding &&
-      !isUtf8CompatibleEncoding(encoding) &&
-      iconvEncodingExists(encoding);
+      encoding && !isUtf8CompatibleEncoding(encoding) && iconvEncodingExists(encoding);
 
     if (isNonUtf8Encoding) {
       // Non-UTF-8 encoding (e.g. GBK, Big5, Shift_JIS, UTF-16LE, UTF-32BE…)
@@ -240,30 +242,26 @@ export class StandardFileSystemService implements FileSystemService {
       const encoded = iconvEncode(content, encoding);
       if (bom) {
         const bomBytes = getBOMBytesForEncoding(encoding);
-        await fs.writeFile(
-          filePath,
-          bomBytes ? Buffer.concat([bomBytes, encoded]) : encoded,
-        );
+        await fs.writeFile(filePath, bomBytes ? Buffer.concat([bomBytes, encoded]) : encoded);
       } else {
         await fs.writeFile(filePath, encoded);
       }
     } else if (bom) {
       // UTF-8 BOM: prepend EF BB BF
       // If content already starts with the BOM character, strip it first to avoid double BOM.
-      const normalizedContent =
-        content.charCodeAt(0) === 0xfeff ? content.slice(1) : content;
+      const normalizedContent = content.charCodeAt(0) === 0xfeff ? content.slice(1) : content;
       const bomBuffer = Buffer.from([0xef, 0xbb, 0xbf]);
-      const contentBuffer = Buffer.from(normalizedContent, 'utf-8');
+      const contentBuffer = Buffer.from(normalizedContent, "utf-8");
       await fs.writeFile(filePath, Buffer.concat([bomBuffer, contentBuffer]));
     } else {
-      await fs.writeFile(filePath, content, 'utf-8');
+      await fs.writeFile(filePath, content, "utf-8");
     }
     return { path: filePath, _meta };
   }
 
   findFiles(fileName: string, searchPaths: readonly string[]): string[] {
     return searchPaths.flatMap((searchPath) => {
-      const pattern = path.posix.join(searchPath, '**', fileName);
+      const pattern = path.posix.join(searchPath, "**", fileName);
       return globSync(pattern, {
         nodir: true,
         absolute: true,
diff --git a/packages/airiscode-core/src/services/gitService.ts b/packages/airiscode-core/src/services/gitService.ts
index 58896ed3b..b2d7049cd 100644
--- a/packages/airiscode-core/src/services/gitService.ts
+++ b/packages/airiscode-core/src/services/gitService.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isCommandAvailable } from '../utils/shell-utils.js';
-import type { SimpleGit } from 'simple-git';
-import { simpleGit, CheckRepoActions } from 'simple-git';
-import type { Storage } from '../config/storage.js';
-import { isNodeError } from '../utils/errors.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { SimpleGit } from "simple-git";
+import { CheckRepoActions, simpleGit } from "simple-git";
+import type { Storage } from "../config/storage.js";
+import { isNodeError } from "../utils/errors.js";
+import { isCommandAvailable } from "../utils/shell-utils.js";
 
 export class GitService {
   private projectRoot: string;
@@ -26,17 +26,17 @@ export class GitService {
   }
 
   async initialize(): Promise<void> {
-    const { available: gitAvailable } = isCommandAvailable('git');
+    const { available: gitAvailable } = isCommandAvailable("git");
     if (!gitAvailable) {
       throw new Error(
-        'Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.',
+        "Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.",
       );
     }
     try {
       await this.setupShadowGitRepository();
     } catch (error) {
       throw new Error(
-        `Failed to initialize checkpointing: ${error instanceof Error ? error.message : 'Unknown error'}. Please check that Git is working properly or disable checkpointing.`,
+        `Failed to initialize checkpointing: ${error instanceof Error ? error.message : "Unknown error"}. Please check that Git is working properly or disable checkpointing.`,
       );
     }
   }
@@ -47,14 +47,14 @@ export class GitService {
    */
   async setupShadowGitRepository() {
     const repoDir = this.getHistoryDir();
-    const gitConfigPath = path.join(repoDir, '.gitconfig');
+    const gitConfigPath = path.join(repoDir, ".gitconfig");
 
     await fs.mkdir(repoDir, { recursive: true });
 
     // We don't want to inherit the user's name, email, or gpg signing
     // preferences for the shadow repository, so we create a dedicated gitconfig.
     const gitConfigContent =
-      '[user]\n  name = AIRIS Code\n  email = airiscode@qwen.ai\n[commit]\n  gpgsign = false\n';
+      "[user]\n  name = AIRIS Code\n  email = airiscode@qwen.ai\n[commit]\n  gpgsign = false\n";
     await fs.writeFile(gitConfigPath, gitConfigContent);
 
     const repo = simpleGit(repoDir);
@@ -69,20 +69,20 @@ export class GitService {
 
     if (!isRepoDefined) {
       await repo.init(false, {
-        '--initial-branch': 'main',
+        "--initial-branch": "main",
       });
 
-      await repo.commit('Initial commit', { '--allow-empty': null });
+      await repo.commit("Initial commit", { "--allow-empty": null });
     }
 
-    const userGitIgnorePath = path.join(this.projectRoot, '.gitignore');
-    const shadowGitIgnorePath = path.join(repoDir, '.gitignore');
+    const userGitIgnorePath = path.join(this.projectRoot, ".gitignore");
+    const shadowGitIgnorePath = path.join(repoDir, ".gitignore");
 
-    let userGitIgnoreContent = '';
+    let userGitIgnoreContent = "";
     try {
-      userGitIgnoreContent = await fs.readFile(userGitIgnorePath, 'utf-8');
+      userGitIgnoreContent = await fs.readFile(userGitIgnorePath, "utf-8");
     } catch (error) {
-      if (isNodeError(error) && error.code !== 'ENOENT') {
+      if (isNodeError(error) && error.code !== "ENOENT") {
         throw error;
       }
     }
@@ -93,7 +93,7 @@ export class GitService {
   private get shadowGitRepository(): SimpleGit {
     const repoDir = this.getHistoryDir();
     return simpleGit(this.projectRoot).env({
-      GIT_DIR: path.join(repoDir, '.git'),
+      GIT_DIR: path.join(repoDir, ".git"),
       GIT_WORK_TREE: this.projectRoot,
       // Prevent git from using the user's global git config.
       HOME: repoDir,
@@ -102,27 +102,27 @@ export class GitService {
   }
 
   async getCurrentCommitHash(): Promise<string> {
-    const hash = await this.shadowGitRepository.raw('rev-parse', 'HEAD');
+    const hash = await this.shadowGitRepository.raw("rev-parse", "HEAD");
     return hash.trim();
   }
 
   async createFileSnapshot(message: string): Promise<string> {
     try {
       const repo = this.shadowGitRepository;
-      await repo.add('.');
+      await repo.add(".");
       const commitResult = await repo.commit(message);
       return commitResult.commit;
     } catch (error) {
       throw new Error(
-        `Failed to create checkpoint snapshot: ${error instanceof Error ? error.message : 'Unknown error'}. Checkpointing may not be working properly.`,
+        `Failed to create checkpoint snapshot: ${error instanceof Error ? error.message : "Unknown error"}. Checkpointing may not be working properly.`,
       );
     }
   }
 
   async restoreProjectFromSnapshot(commitHash: string): Promise<void> {
     const repo = this.shadowGitRepository;
-    await repo.raw(['restore', '--source', commitHash, '.']);
+    await repo.raw(["restore", "--source", commitHash, "."]);
     // Removes any untracked files that were introduced post snapshot.
-    await repo.clean('f', ['-d']);
+    await repo.clean("f", ["-d"]);
   }
 }
diff --git a/packages/airiscode-core/src/services/gitWorktreeService.ts b/packages/airiscode-core/src/services/gitWorktreeService.ts
index 8c023bd90..3e196a8b9 100644
--- a/packages/airiscode-core/src/services/gitWorktreeService.ts
+++ b/packages/airiscode-core/src/services/gitWorktreeService.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { execSync } from 'node:child_process';
-import { simpleGit, CheckRepoActions } from 'simple-git';
-import type { SimpleGit } from 'simple-git';
-import { Storage } from '../config/storage.js';
-import { isCommandAvailable } from '../utils/shell-utils.js';
-import { isNodeError } from '../utils/errors.js';
+import { execSync } from "node:child_process";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { SimpleGit } from "simple-git";
+import { CheckRepoActions, simpleGit } from "simple-git";
+import { Storage } from "../config/storage.js";
+import { isNodeError } from "../utils/errors.js";
+import { isCommandAvailable } from "../utils/shell-utils.js";
 
 /**
  * Commit message used for the baseline snapshot in worktrees.
@@ -19,14 +19,14 @@ import { isNodeError } from '../utils/errors.js';
  * a commit with this message is created so that later diffs only capture the
  * agent's changes — not the pre-existing local edits.
  */
-export const BASELINE_COMMIT_MESSAGE = 'baseline (dirty state overlay)';
+export const BASELINE_COMMIT_MESSAGE = "baseline (dirty state overlay)";
 
 /**
  * Default directory and branch-prefix name used for worktrees.
  * Changing this value affects the on-disk layout (`~/.airiscode/<WORKTREES_DIR>/`)
  * **and** the default git branch prefix (`<WORKTREES_DIR>/<sessionId>/…`).
  */
-export const WORKTREES_DIR = 'worktrees';
+export const WORKTREES_DIR = "worktrees";
 
 export interface WorktreeInfo {
   /** Unique identifier for this worktree */
@@ -124,10 +124,7 @@ export class GitWorktreeService {
    * @param customBaseDir - Optional custom base directory override
    */
   static getWorktreesDir(sessionId: string, customBaseDir?: string): string {
-    return path.join(
-      GitWorktreeService.getSessionDir(sessionId, customBaseDir),
-      WORKTREES_DIR,
-    );
+    return path.join(GitWorktreeService.getSessionDir(sessionId, customBaseDir), WORKTREES_DIR);
   }
 
   /**
@@ -141,11 +138,11 @@ export class GitWorktreeService {
    * Checks if git is available on the system.
    */
   async checkGitAvailable(): Promise<{ available: boolean; error?: string }> {
-    const { available } = isCommandAvailable('git');
+    const { available } = isCommandAvailable("git");
     if (!available) {
       return {
         available: false,
-        error: 'Git is not installed. Please install Git.',
+        error: "Git is not installed. Please install Git.",
       };
     }
     return { available: true };
@@ -185,19 +182,19 @@ export class GitWorktreeService {
     }
 
     try {
-      await this.git.init(false, { '--initial-branch': 'main' });
+      await this.git.init(false, { "--initial-branch": "main" });
 
       // Create initial commit so we can create worktrees
-      await this.git.add('.');
-      await this.git.commit('Initial commit', {
-        '--allow-empty': null,
+      await this.git.add(".");
+      await this.git.commit("Initial commit", {
+        "--allow-empty": null,
       });
 
       return { initialized: true };
     } catch (error) {
       return {
         initialized: false,
-        error: `Failed to initialize git repository: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        error: `Failed to initialize git repository: ${error instanceof Error ? error.message : "Unknown error"}`,
       };
     }
   }
@@ -206,7 +203,7 @@ export class GitWorktreeService {
    * Gets the current branch name.
    */
   async getCurrentBranch(): Promise<string> {
-    const branch = await this.git.revparse(['--abbrev-ref', 'HEAD']);
+    const branch = await this.git.revparse(["--abbrev-ref", "HEAD"]);
     return branch.trim();
   }
 
@@ -214,7 +211,7 @@ export class GitWorktreeService {
    * Gets the current commit hash.
    */
   async getCurrentCommitHash(): Promise<string> {
-    const hash = await this.git.revparse(['HEAD']);
+    const hash = await this.git.revparse(["HEAD"]);
     return hash.trim();
   }
 
@@ -227,10 +224,7 @@ export class GitWorktreeService {
     baseBranch?: string,
   ): Promise<CreateWorktreeResult> {
     try {
-      const worktreesDir = GitWorktreeService.getWorktreesDir(
-        sessionId,
-        this.customBaseDir,
-      );
+      const worktreesDir = GitWorktreeService.getWorktreesDir(sessionId, this.customBaseDir);
       await fs.mkdir(worktreesDir, { recursive: true });
 
       // Sanitize name for use as branch and directory name
@@ -252,14 +246,7 @@ export class GitWorktreeService {
       const branchName = `${base}-${shortSession}-${sanitizedName}`;
 
       // Create the worktree with a new branch
-      await this.git.raw([
-        'worktree',
-        'add',
-        '-b',
-        branchName,
-        worktreePath,
-        base,
-      ]);
+      await this.git.raw(["worktree", "add", "-b", branchName, worktreePath, base]);
 
       const worktree: WorktreeInfo = {
         id: `${sessionId}/${sanitizedName}`,
@@ -274,7 +261,7 @@ export class GitWorktreeService {
     } catch (error) {
       return {
         success: false,
-        error: `Failed to create worktree for "${name}": ${error instanceof Error ? error.message : 'Unknown error'}`,
+        error: `Failed to create worktree for "${name}": ${error instanceof Error ? error.message : "Unknown error"}`,
       };
     }
   }
@@ -283,9 +270,7 @@ export class GitWorktreeService {
    * Sets up all worktrees for a session.
    * This is the main entry point for worktree creation.
    */
-  async setupWorktrees(
-    config: WorktreeSetupConfig,
-  ): Promise<WorktreeSetupResult> {
+  async setupWorktrees(config: WorktreeSetupConfig): Promise<WorktreeSetupResult> {
     const result: WorktreeSetupResult = {
       success: false,
       sessionId: config.sessionId,
@@ -301,7 +286,7 @@ export class GitWorktreeService {
       if (!sanitized) {
         result.errors.push({
           name,
-          error: 'Worktree name becomes empty after sanitization',
+          error: "Worktree name becomes empty after sanitization",
         });
         continue;
       }
@@ -322,7 +307,7 @@ export class GitWorktreeService {
     // Check git availability
     const gitCheck = await this.checkGitAvailable();
     if (!gitCheck.available) {
-      result.errors.push({ name: 'system', error: gitCheck.error! });
+      result.errors.push({ name: "system", error: gitCheck.error! });
       return result;
     }
 
@@ -330,21 +315,18 @@ export class GitWorktreeService {
     const isRepo = await this.isGitRepository();
     if (!isRepo) {
       result.errors.push({
-        name: 'repository',
-        error: 'Source path is not a git repository.',
+        name: "repository",
+        error: "Source path is not a git repository.",
       });
       return result;
     }
 
     // Create session directory
-    const sessionDir = GitWorktreeService.getSessionDir(
-      config.sessionId,
-      this.customBaseDir,
-    );
+    const sessionDir = GitWorktreeService.getSessionDir(config.sessionId, this.customBaseDir);
     await fs.mkdir(sessionDir, { recursive: true });
 
     // Save session config for later reference
-    const configPath = path.join(sessionDir, 'config.json');
+    const configPath = path.join(sessionDir, "config.json");
     const configFile: SessionConfigFile = {
       sessionId: config.sessionId,
       sourceRepoPath: config.sourceRepoPath,
@@ -359,9 +341,9 @@ export class GitWorktreeService {
     // without modifying the source working tree or index.
     // NOTE: `git stash create` does NOT support --include-untracked;
     // untracked files are handled separately below via file copy.
-    let dirtyStateSnapshot = '';
+    let dirtyStateSnapshot = "";
     try {
-      dirtyStateSnapshot = (await this.git.stash(['create'])).trim();
+      dirtyStateSnapshot = (await this.git.stash(["create"])).trim();
     } catch {
       // Ignore — proceed without dirty state if stash create fails
     }
@@ -370,23 +352,15 @@ export class GitWorktreeService {
     // `git ls-files --others --exclude-standard` is read-only and safe.
     let untrackedFiles: string[] = [];
     try {
-      const raw = await this.git.raw([
-        'ls-files',
-        '--others',
-        '--exclude-standard',
-      ]);
-      untrackedFiles = raw.trim().split('\n').filter(Boolean);
+      const raw = await this.git.raw(["ls-files", "--others", "--exclude-standard"]);
+      untrackedFiles = raw.trim().split("\n").filter(Boolean);
     } catch {
       // Non-fatal: proceed without untracked files
     }
 
     // Create worktrees for each entry
     for (const name of config.worktreeNames) {
-      const createResult = await this.createWorktree(
-        config.sessionId,
-        name,
-        config.baseBranch,
-      );
+      const createResult = await this.createWorktree(config.sessionId, name, config.baseBranch);
 
       if (createResult.success && createResult.worktree) {
         result.worktrees.push(createResult.worktree);
@@ -394,7 +368,7 @@ export class GitWorktreeService {
       } else {
         result.errors.push({
           name,
-          error: createResult.error || 'Unknown error',
+          error: createResult.error || "Unknown error",
         });
       }
     }
@@ -405,8 +379,8 @@ export class GitWorktreeService {
         await this.cleanupSession(config.sessionId);
       } catch (error) {
         result.errors.push({
-          name: 'cleanup',
-          error: `Failed to cleanup after partial worktree creation: ${error instanceof Error ? error.message : 'Unknown error'}`,
+          name: "cleanup",
+          error: `Failed to cleanup after partial worktree creation: ${error instanceof Error ? error.message : "Unknown error"}`,
         });
       }
       result.success = false;
@@ -425,7 +399,7 @@ export class GitWorktreeService {
         // 1. Apply tracked dirty changes (staged + unstaged)
         if (dirtyStateSnapshot) {
           try {
-            await wtGit.raw(['stash', 'apply', dirtyStateSnapshot]);
+            await wtGit.raw(["stash", "apply", dirtyStateSnapshot]);
           } catch {
             // Non-fatal: worktree still usable with committed state only
           }
@@ -447,10 +421,10 @@ export class GitWorktreeService {
         //    (committed + dirty + untracked). This allows us to later diff
         //    only the agent's changes, excluding the pre-existing dirty state.
         try {
-          await wtGit.add(['--all']);
+          await wtGit.add(["--all"]);
           await wtGit.commit(BASELINE_COMMIT_MESSAGE, {
-            '--allow-empty': null,
-            '--no-verify': null,
+            "--allow-empty": null,
+            "--no-verify": null,
           });
         } catch {
           // Non-fatal: diff will fall back to merge-base if baseline is missing
@@ -465,10 +439,7 @@ export class GitWorktreeService {
    * Lists all worktrees for a session.
    */
   async listWorktrees(sessionId: string): Promise<WorktreeInfo[]> {
-    const worktreesDir = GitWorktreeService.getWorktreesDir(
-      sessionId,
-      this.customBaseDir,
-    );
+    const worktreesDir = GitWorktreeService.getWorktreesDir(sessionId, this.customBaseDir);
 
     try {
       const entries = await fs.readdir(worktreesDir, { withFileTypes: true });
@@ -479,12 +450,12 @@ export class GitWorktreeService {
           const worktreePath = path.join(worktreesDir, entry.name);
 
           // Read the actual branch from the worktree
-          let branchName = '';
+          let branchName = "";
           try {
-            branchName = execSync('git rev-parse --abbrev-ref HEAD', {
+            branchName = execSync("git rev-parse --abbrev-ref HEAD", {
               cwd: worktreePath,
-              encoding: 'utf8',
-              stdio: ['pipe', 'pipe', 'pipe'],
+              encoding: "utf8",
+              stdio: ["pipe", "pipe", "pipe"],
             }).trim();
           } catch {
             // Fallback if git command fails
@@ -512,7 +483,7 @@ export class GitWorktreeService {
 
       return worktrees;
     } catch (error) {
-      if (isNodeError(error) && error.code === 'ENOENT') {
+      if (isNodeError(error) && error.code === "ENOENT") {
         return [];
       }
       throw error;
@@ -522,24 +493,22 @@ export class GitWorktreeService {
   /**
    * Removes a single worktree.
    */
-  async removeWorktree(
-    worktreePath: string,
-  ): Promise<{ success: boolean; error?: string }> {
+  async removeWorktree(worktreePath: string): Promise<{ success: boolean; error?: string }> {
     try {
       // Remove the worktree from git
-      await this.git.raw(['worktree', 'remove', worktreePath, '--force']);
+      await this.git.raw(["worktree", "remove", worktreePath, "--force"]);
       return { success: true };
     } catch (error) {
       // Try to remove the directory manually if git worktree remove fails
       try {
         await fs.rm(worktreePath, { recursive: true, force: true });
         // Prune worktree references
-        await this.git.raw(['worktree', 'prune']);
+        await this.git.raw(["worktree", "prune"]);
         return { success: true };
       } catch (_rmError) {
         return {
           success: false,
-          error: `Failed to remove worktree: ${error instanceof Error ? error.message : 'Unknown error'}`,
+          error: `Failed to remove worktree: ${error instanceof Error ? error.message : "Unknown error"}`,
         };
       }
     }
@@ -563,9 +532,7 @@ export class GitWorktreeService {
 
     // Collect actual branch names from worktrees before removing them
     const worktrees = await this.listWorktrees(sessionId);
-    const worktreeBranches = new Set(
-      worktrees.map((w) => w.branch).filter(Boolean),
-    );
+    const worktreeBranches = new Set(worktrees.map((w) => w.branch).filter(Boolean));
 
     // Remove all worktrees
     for (const worktree of worktrees) {
@@ -573,23 +540,18 @@ export class GitWorktreeService {
       if (removeResult.success) {
         result.removedWorktrees.push(worktree.name);
       } else {
-        result.errors.push(
-          removeResult.error || `Failed to remove ${worktree.name}`,
-        );
+        result.errors.push(removeResult.error || `Failed to remove ${worktree.name}`);
         result.success = false;
       }
     }
 
     // Remove session directory
-    const sessionDir = GitWorktreeService.getSessionDir(
-      sessionId,
-      this.customBaseDir,
-    );
+    const sessionDir = GitWorktreeService.getSessionDir(sessionId, this.customBaseDir);
     try {
       await fs.rm(sessionDir, { recursive: true, force: true });
     } catch (error) {
       result.errors.push(
-        `Failed to remove session directory: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Failed to remove session directory: ${error instanceof Error ? error.message : "Unknown error"}`,
       );
     }
 
@@ -597,7 +559,7 @@ export class GitWorktreeService {
     try {
       for (const branchName of worktreeBranches) {
         try {
-          await this.git.branch(['-D', branchName]);
+          await this.git.branch(["-D", branchName]);
           result.removedBranches.push(branchName);
         } catch {
           // Branch might already be deleted, ignore
@@ -609,7 +571,7 @@ export class GitWorktreeService {
 
     // Prune worktree references
     try {
-      await this.git.raw(['worktree', 'prune']);
+      await this.git.raw(["worktree", "prune"]);
     } catch {
       // Ignore prune errors
     }
@@ -623,23 +585,18 @@ export class GitWorktreeService {
    * so the diff only shows the agent's changes. Falls back to the base branch
    * when no baseline commit exists.
    */
-  async getWorktreeDiff(
-    worktreePath: string,
-    baseBranch?: string,
-  ): Promise<string> {
+  async getWorktreeDiff(worktreePath: string, baseBranch?: string): Promise<string> {
     const worktreeGit = simpleGit(worktreePath);
 
     const base =
-      (await this.resolveBaseline(worktreeGit)) ??
-      baseBranch ??
-      (await this.getCurrentBranch());
+      (await this.resolveBaseline(worktreeGit)) ?? baseBranch ?? (await this.getCurrentBranch());
 
     try {
       return await this.withStagedChanges(worktreeGit, () =>
-        worktreeGit.diff(['--binary', '--cached', base]),
+        worktreeGit.diff(["--binary", "--cached", base]),
       );
     } catch (error) {
-      return `Error getting diff: ${error instanceof Error ? error.message : 'Unknown error'}`;
+      return `Error getting diff: ${error instanceof Error ? error.message : "Unknown error"}`;
     }
   }
 
@@ -666,14 +623,12 @@ export class GitWorktreeService {
 
       if (!base) {
         // Fallback: diff from merge-base
-        const targetHead = (await targetGit.revparse(['HEAD'])).trim();
-        base = (
-          await worktreeGit.raw(['merge-base', 'HEAD', targetHead])
-        ).trim();
+        const targetHead = (await targetGit.revparse(["HEAD"])).trim();
+        base = (await worktreeGit.raw(["merge-base", "HEAD", targetHead])).trim();
       }
 
       const patch = await this.withStagedChanges(worktreeGit, () =>
-        worktreeGit.diff(['--binary', '--cached', base]),
+        worktreeGit.diff(["--binary", "--cached", base]),
       );
 
       if (!patch.trim()) {
@@ -685,7 +640,7 @@ export class GitWorktreeService {
         `.worktree-apply-${Date.now()}-${Math.random().toString(16).slice(2)}.patch`,
       );
       await fs.mkdir(path.dirname(patchFile), { recursive: true });
-      await fs.writeFile(patchFile, patch, 'utf-8');
+      await fs.writeFile(patchFile, patch, "utf-8");
 
       try {
         // When using the baseline, the target working tree already matches the
@@ -694,8 +649,8 @@ export class GitWorktreeService {
         // pre-image may not match the working tree; it falls back to index
         // blob lookup which would fail on baseline-relative patches.
         const applyArgs = hasBaseline
-          ? ['apply', '--whitespace=nowarn', patchFile]
-          : ['apply', '--3way', '--whitespace=nowarn', patchFile];
+          ? ["apply", "--whitespace=nowarn", patchFile]
+          : ["apply", "--3way", "--whitespace=nowarn", patchFile];
         await targetGit.raw(applyArgs);
       } finally {
         await fs.rm(patchFile, { force: true });
@@ -705,7 +660,7 @@ export class GitWorktreeService {
     } catch (error) {
       return {
         success: false,
-        error: `Failed to apply worktree changes: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        error: `Failed to apply worktree changes: ${error instanceof Error ? error.message : "Unknown error"}`,
       };
     }
   }
@@ -734,9 +689,9 @@ export class GitWorktreeService {
 
       for (const entry of entries) {
         if (entry.isDirectory()) {
-          const configPath = path.join(baseDir, entry.name, 'config.json');
+          const configPath = path.join(baseDir, entry.name, "config.json");
           try {
-            const configContent = await fs.readFile(configPath, 'utf-8');
+            const configContent = await fs.readFile(configPath, "utf-8");
             const config = JSON.parse(configContent) as SessionConfigFile;
 
             const worktreesDir = path.join(baseDir, entry.name, WORKTREES_DIR);
@@ -751,7 +706,7 @@ export class GitWorktreeService {
             sessions.push({
               sessionId: entry.name,
               createdAt: config.createdAt || Date.now(),
-              sourceRepoPath: config.sourceRepoPath || '',
+              sourceRepoPath: config.sourceRepoPath || "",
               worktreeCount,
             });
           } catch {
@@ -770,18 +725,10 @@ export class GitWorktreeService {
    * Finds the baseline commit in a worktree, if one exists.
    * Returns the commit SHA, or null if not found.
    */
-  private async resolveBaseline(
-    worktreeGit: SimpleGit,
-  ): Promise<string | null> {
+  private async resolveBaseline(worktreeGit: SimpleGit): Promise<string | null> {
     try {
       const sha = (
-        await worktreeGit.raw([
-          'log',
-          '--grep',
-          BASELINE_COMMIT_MESSAGE,
-          '--format=%H',
-          '-1',
-        ])
+        await worktreeGit.raw(["log", "--grep", BASELINE_COMMIT_MESSAGE, "--format=%H", "-1"])
       ).trim();
       return sha || null;
     } catch {
@@ -790,16 +737,13 @@ export class GitWorktreeService {
   }
 
   /** Stages all changes, runs a callback, then resets the index. */
-  private async withStagedChanges<T>(
-    git: SimpleGit,
-    fn: () => Promise<T>,
-  ): Promise<T> {
-    await git.add(['--all']);
+  private async withStagedChanges<T>(git: SimpleGit, fn: () => Promise<T>): Promise<T> {
+    await git.add(["--all"]);
     try {
       return await fn();
     } finally {
       try {
-        await git.raw(['reset']);
+        await git.raw(["reset"]);
       } catch {
         // Best-effort: ignore reset failures
       }
@@ -810,9 +754,9 @@ export class GitWorktreeService {
     // Replace invalid characters with hyphens
     return name
       .toLowerCase()
-      .replace(/[^a-z0-9-]/g, '-')
-      .replace(/-+/g, '-')
-      .replace(/^-|-$/g, '');
+      .replace(/[^a-z0-9-]/g, "-")
+      .replace(/-+/g, "-")
+      .replace(/^-|-$/g, "");
   }
 
   private async pathExists(p: string): Promise<boolean> {
diff --git a/packages/airiscode-core/src/services/loopDetectionService.ts b/packages/airiscode-core/src/services/loopDetectionService.ts
index d14e4223e..6575e826e 100644
--- a/packages/airiscode-core/src/services/loopDetectionService.ts
+++ b/packages/airiscode-core/src/services/loopDetectionService.ts
@@ -4,19 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createHash } from 'node:crypto';
-import type { ServerGeminiStreamEvent } from '../core/turn.js';
-import { GeminiEventType } from '../core/turn.js';
-import {
-  logLoopDetected,
-  logLoopDetectionDisabled,
-} from '../telemetry/loggers.js';
-import {
-  LoopDetectedEvent,
-  LoopDetectionDisabledEvent,
-  LoopType,
-} from '../telemetry/types.js';
-import type { Config } from '../config/config.js';
+import { createHash } from "node:crypto";
+import type { Config } from "../config/config.js";
+import type { ServerGeminiStreamEvent } from "../core/turn.js";
+import { GeminiEventType } from "../core/turn.js";
+import { logLoopDetected, logLoopDetectionDisabled } from "../telemetry/loggers.js";
+import { LoopDetectedEvent, LoopDetectionDisabledEvent, LoopType } from "../telemetry/types.js";
 
 const TOOL_CALL_LOOP_THRESHOLD = 5;
 const CONTENT_LOOP_THRESHOLD = 10;
@@ -29,14 +22,14 @@ const MAX_HISTORY_LENGTH = 1000;
  */
 export class LoopDetectionService {
   private readonly config: Config;
-  private promptId = '';
+  private promptId = "";
 
   // Tool call tracking
   private lastToolCallKey: string | null = null;
   private toolCallRepetitionCount: number = 0;
 
   // Content streaming tracking
-  private streamContentHistory = '';
+  private streamContentHistory = "";
   private contentStats = new Map<string, number[]>();
   private lastContentIndex = 0;
   private loopDetected = false;
@@ -54,16 +47,13 @@ export class LoopDetectionService {
    */
   disableForSession(): void {
     this.disabledForSession = true;
-    logLoopDetectionDisabled(
-      this.config,
-      new LoopDetectionDisabledEvent(this.promptId),
-    );
+    logLoopDetectionDisabled(this.config, new LoopDetectionDisabledEvent(this.promptId));
   }
 
   private getToolCallKey(toolCall: { name: string; args: object }): string {
     const argsString = JSON.stringify(toolCall.args);
     const keyString = `${toolCall.name}:${argsString}`;
-    return createHash('sha256').update(keyString).digest('hex');
+    return createHash("sha256").update(keyString).digest("hex");
   }
 
   /**
@@ -103,10 +93,7 @@ export class LoopDetectionService {
     if (this.toolCallRepetitionCount >= TOOL_CALL_LOOP_THRESHOLD) {
       logLoopDetected(
         this.config,
-        new LoopDetectedEvent(
-          LoopType.CONSECUTIVE_IDENTICAL_TOOL_CALLS,
-          this.promptId,
-        ),
+        new LoopDetectedEvent(LoopType.CONSECUTIVE_IDENTICAL_TOOL_CALLS, this.promptId),
       );
       return true;
     }
@@ -130,28 +117,19 @@ export class LoopDetectionService {
     // reset tracking to avoid analyzing content that spans across different element boundaries.
     const numFences = (content.match(/```/g) ?? []).length;
     const hasTable = /(^|\n)\s*(\|.*\||[|+-]{3,})/.test(content);
-    const hasListItem =
-      /(^|\n)\s*[*-+]\s/.test(content) || /(^|\n)\s*\d+\.\s/.test(content);
+    const hasListItem = /(^|\n)\s*[*-+]\s/.test(content) || /(^|\n)\s*\d+\.\s/.test(content);
     const hasHeading = /(^|\n)#+\s/.test(content);
     const hasBlockquote = /(^|\n)>\s/.test(content);
     const isDivider = /^[+-_=*\u2500-\u257F]+$/.test(content);
 
-    if (
-      numFences ||
-      hasTable ||
-      hasListItem ||
-      hasHeading ||
-      hasBlockquote ||
-      isDivider
-    ) {
+    if (numFences || hasTable || hasListItem || hasHeading || hasBlockquote || isDivider) {
       // Reset tracking when different content elements are detected to avoid analyzing content
       // that spans across different element boundaries.
       this.resetContentTracking();
     }
 
     const wasInCodeBlock = this.inCodeBlock;
-    this.inCodeBlock =
-      numFences % 2 === 0 ? this.inCodeBlock : !this.inCodeBlock;
+    this.inCodeBlock = numFences % 2 === 0 ? this.inCodeBlock : !this.inCodeBlock;
     if (wasInCodeBlock || this.inCodeBlock || isDivider) {
       return false;
     }
@@ -172,14 +150,9 @@ export class LoopDetectionService {
     }
 
     // Calculate how much content to remove from the beginning
-    const truncationAmount =
-      this.streamContentHistory.length - MAX_HISTORY_LENGTH;
-    this.streamContentHistory =
-      this.streamContentHistory.slice(truncationAmount);
-    this.lastContentIndex = Math.max(
-      0,
-      this.lastContentIndex - truncationAmount,
-    );
+    const truncationAmount = this.streamContentHistory.length - MAX_HISTORY_LENGTH;
+    this.streamContentHistory = this.streamContentHistory.slice(truncationAmount);
+    this.lastContentIndex = Math.max(0, this.lastContentIndex - truncationAmount);
 
     // Update all stored chunk indices to account for the truncation
     for (const [hash, oldIndices] of this.contentStats.entries()) {
@@ -211,15 +184,12 @@ export class LoopDetectionService {
         this.lastContentIndex,
         this.lastContentIndex + CONTENT_CHUNK_SIZE,
       );
-      const chunkHash = createHash('sha256').update(currentChunk).digest('hex');
+      const chunkHash = createHash("sha256").update(currentChunk).digest("hex");
 
       if (this.isLoopDetectedForChunk(currentChunk, chunkHash)) {
         logLoopDetected(
           this.config,
-          new LoopDetectedEvent(
-            LoopType.CHANTING_IDENTICAL_SENTENCES,
-            this.promptId,
-          ),
+          new LoopDetectedEvent(LoopType.CHANTING_IDENTICAL_SENTENCES, this.promptId),
         );
         return true;
       }
@@ -232,10 +202,7 @@ export class LoopDetectionService {
   }
 
   private hasMoreChunksToProcess(): boolean {
-    return (
-      this.lastContentIndex + CONTENT_CHUNK_SIZE <=
-      this.streamContentHistory.length
-    );
+    return this.lastContentIndex + CONTENT_CHUNK_SIZE <= this.streamContentHistory.length;
   }
 
   /**
@@ -268,8 +235,7 @@ export class LoopDetectionService {
 
     // Analyze the most recent occurrences to see if they're clustered closely together
     const recentIndices = existingIndices.slice(-CONTENT_LOOP_THRESHOLD);
-    const totalDistance =
-      recentIndices[recentIndices.length - 1] - recentIndices[0];
+    const totalDistance = recentIndices[recentIndices.length - 1] - recentIndices[0];
     const averageDistance = totalDistance / (CONTENT_LOOP_THRESHOLD - 1);
     const maxAllowedDistance = CONTENT_CHUNK_SIZE * 1.5;
 
@@ -280,10 +246,7 @@ export class LoopDetectionService {
    * Verifies that two chunks with the same hash actually contain identical content.
    * This prevents false positives from hash collisions.
    */
-  private isActualContentMatch(
-    currentChunk: string,
-    originalIndex: number,
-  ): boolean {
+  private isActualContentMatch(currentChunk: string, originalIndex: number): boolean {
     const originalChunk = this.streamContentHistory.substring(
       originalIndex,
       originalIndex + CONTENT_CHUNK_SIZE,
@@ -308,7 +271,7 @@ export class LoopDetectionService {
 
   private resetContentTracking(resetHistory = true): void {
     if (resetHistory) {
-      this.streamContentHistory = '';
+      this.streamContentHistory = "";
     }
     this.contentStats.clear();
     this.lastContentIndex = 0;
diff --git a/packages/airiscode-core/src/services/sessionService.ts b/packages/airiscode-core/src/services/sessionService.ts
index 52f104fed..1442854ed 100644
--- a/packages/airiscode-core/src/services/sessionService.ts
+++ b/packages/airiscode-core/src/services/sessionService.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Storage } from '../config/storage.js';
-import { getProjectHash } from '../utils/paths.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import readline from 'node:readline';
-import type { Content, Part } from '../types/llm.js';
-import * as jsonl from '../utils/jsonl-utils.js';
+import fs from "node:fs";
+import path from "node:path";
+import readline from "node:readline";
+import { Storage } from "../config/storage.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import type { Content, Part } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import * as jsonl from "../utils/jsonl-utils.js";
+import { getProjectHash } from "../utils/paths.js";
 import type {
   ChatCompressionRecordPayload,
   ChatRecord,
   UiTelemetryRecordPayload,
-} from './chatRecordingService.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+} from "./chatRecordingService.js";
 
-const debugLogger = createDebugLogger('SESSION');
+const debugLogger = createDebugLogger("SESSION");
 
 /**
  * Session item for list display.
@@ -135,24 +135,24 @@ export class SessionService {
   }
 
   private getChatsDir(): string {
-    return path.join(this.storage.getProjectDir(), 'chats');
+    return path.join(this.storage.getProjectDir(), "chats");
   }
 
   /**
    * Extracts the first user prompt text from a Content object.
    */
   private extractPromptText(message: Content | undefined): string {
-    if (!message?.parts) return '';
+    if (!message?.parts) return "";
 
     for (const part of message.parts as Part[]) {
-      if ('text' in part) {
+      if ("text" in part) {
         const textPart = part as { text: string };
         const text = textPart.text;
         // Truncate long prompts for display
         return text.length > 200 ? `${text.slice(0, 200)}...` : text;
       }
     }
-    return '';
+    return "";
   }
 
   /**
@@ -161,11 +161,11 @@ export class SessionService {
    */
   private extractFirstPromptFromRecords(records: ChatRecord[]): string {
     for (const record of records) {
-      if (record.type !== 'user') continue;
+      if (record.type !== "user") continue;
       const prompt = this.extractPromptText(record.message);
       if (prompt) return prompt;
     }
-    return '';
+    return "";
   }
 
   /**
@@ -186,7 +186,7 @@ export class SessionService {
         if (!trimmed) continue;
         try {
           const record = JSON.parse(trimmed) as ChatRecord;
-          if (record.type === 'user' || record.type === 'assistant') {
+          if (record.type === "user" || record.type === "assistant") {
             uniqueUuids.add(record.uuid);
           }
         } catch {
@@ -213,9 +213,7 @@ export class SessionService {
    * @param options Pagination options
    * @returns Paginated list of sessions
    */
-  async listSessions(
-    options: ListSessionsOptions = {},
-  ): Promise<ListSessionsResult> {
+  async listSessions(options: ListSessionsOptions = {}): Promise<ListSessionsResult> {
     const { cursor, size = 20 } = options;
     const chatsDir = this.getChatsDir();
 
@@ -236,7 +234,7 @@ export class SessionService {
         }
       }
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") {
         return { items: [], hasMore: false };
       }
       throw error;
@@ -275,10 +273,7 @@ export class SessionService {
       lastProcessedMtime = file.mtime;
 
       const filePath = path.join(chatsDir, file.name);
-      const records = await jsonl.readLines<ChatRecord>(
-        filePath,
-        MAX_PROMPT_SCAN_LINES,
-      );
+      const records = await jsonl.readLines<ChatRecord>(filePath, MAX_PROMPT_SCAN_LINES);
 
       if (records.length === 0) continue;
       const firstRecord = records[0];
@@ -308,9 +303,7 @@ export class SessionService {
     // Determine next cursor (mtime of last processed file)
     // Only set if there are more files to process
     const nextCursor =
-      hasMoreFiles && lastProcessedMtime !== undefined
-        ? lastProcessedMtime
-        : undefined;
+      hasMoreFiles && lastProcessedMtime !== undefined ? lastProcessedMtime : undefined;
 
     return {
       items,
@@ -326,8 +319,8 @@ export class SessionService {
     try {
       return await jsonl.read<ChatRecord>(filePath);
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        debugLogger.error('Error reading session file:', error);
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+        debugLogger.error("Error reading session file:", error);
       }
       return [];
     }
@@ -339,7 +332,7 @@ export class SessionService {
    */
   private aggregateRecords(records: ChatRecord[]): ChatRecord {
     if (records.length === 0) {
-      throw new Error('Cannot aggregate empty records array');
+      throw new Error("Cannot aggregate empty records array");
     }
 
     const base = { ...records[0] };
@@ -354,10 +347,7 @@ export class SessionService {
         } else {
           base.message = {
             role: base.message.role,
-            parts: [
-              ...(base.message.parts || []),
-              ...(record.message.parts || []),
-            ],
+            parts: [...(base.message.parts || []), ...(record.message.parts || [])],
           };
         }
       }
@@ -389,10 +379,7 @@ export class SessionService {
   /**
    * Reconstructs a linear conversation from tree-structured records.
    */
-  private reconstructHistory(
-    records: ChatRecord[],
-    leafUuid?: string,
-  ): ChatRecord[] {
+  private reconstructHistory(records: ChatRecord[], leafUuid?: string): ChatRecord[] {
     if (records.length === 0) return [];
 
     const recordsByUuid = new Map<string, ChatRecord[]>();
@@ -402,8 +389,7 @@ export class SessionService {
       recordsByUuid.set(record.uuid, existing);
     }
 
-    let currentUuid: string | null =
-      leafUuid ?? records[records.length - 1].uuid;
+    let currentUuid: string | null = leafUuid ?? records[records.length - 1].uuid;
     const uuidChain: string[] = [];
     const visited = new Set<string>();
 
@@ -434,9 +420,7 @@ export class SessionService {
    * @param sessionId The session ID to load
    * @returns Session data for resumption, or null if not found
    */
-  async loadSession(
-    sessionId: string,
-  ): Promise<ResumedSessionData | undefined> {
+  async loadSession(sessionId: string): Promise<ResumedSessionData | undefined> {
     const chatsDir = this.getChatsDir();
     const filePath = path.join(chatsDir, `${sessionId}.jsonl`);
 
@@ -501,7 +485,7 @@ export class SessionService {
       fs.unlinkSync(filePath);
       return true;
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") {
         return false;
       }
       throw error;
@@ -600,10 +584,8 @@ export function buildApiHistoryFromConversation(
   let compressedHistory: Content[] | undefined;
 
   messages.forEach((record, index) => {
-    if (record.type === 'system' && record.subtype === 'chat_compression') {
-      const payload = record.systemPayload as
-        | ChatCompressionRecordPayload
-        | undefined;
+    if (record.type === "system" && record.subtype === "chat_compression") {
+      const payload = record.systemPayload as ChatCompressionRecordPayload | undefined;
       if (payload?.compressedHistory) {
         lastCompressionIndex = index;
         compressedHistory = payload.compressedHistory;
@@ -617,7 +599,7 @@ export function buildApiHistoryFromConversation(
     // Append everything after the compression record (newer turns)
     for (let i = lastCompressionIndex + 1; i < messages.length; i++) {
       const record = messages[i];
-      if (record.type === 'system') continue;
+      if (record.type === "system") continue;
       if (record.message) {
         baseHistory.push(structuredClone(record.message as Content));
       }
@@ -649,18 +631,14 @@ export function buildApiHistoryFromConversation(
  * Replays stored UI telemetry events to rebuild metrics when resuming a session.
  * Also restores the last prompt token count from the best available source.
  */
-export function replayUiTelemetryFromConversation(
-  conversation: ConversationRecord,
-): void {
+export function replayUiTelemetryFromConversation(conversation: ConversationRecord): void {
   uiTelemetryService.reset();
 
   for (const record of conversation.messages) {
-    if (record.type !== 'system' || record.subtype !== 'ui_telemetry') {
+    if (record.type !== "system" || record.subtype !== "ui_telemetry") {
       continue;
     }
-    const payload = record.systemPayload as
-      | UiTelemetryRecordPayload
-      | undefined;
+    const payload = record.systemPayload as UiTelemetryRecordPayload | undefined;
     const uiEvent = payload?.uiEvent;
     if (uiEvent) {
       uiTelemetryService.addEvent(uiEvent);
@@ -678,23 +656,19 @@ export function replayUiTelemetryFromConversation(
  * - If a chat compression checkpoint exists, use its new token count.
  * - Otherwise, use the last assistant usageMetadata input (fallback to total).
  */
-export function getResumePromptTokenCount(
-  conversation: ConversationRecord,
-): number | undefined {
+export function getResumePromptTokenCount(conversation: ConversationRecord): number | undefined {
   let fallback: number | undefined;
 
   for (let i = conversation.messages.length - 1; i >= 0; i--) {
     const record = conversation.messages[i];
-    if (record.type === 'system' && record.subtype === 'chat_compression') {
-      const payload = record.systemPayload as
-        | ChatCompressionRecordPayload
-        | undefined;
+    if (record.type === "system" && record.subtype === "chat_compression") {
+      const payload = record.systemPayload as ChatCompressionRecordPayload | undefined;
       if (payload?.info) {
         return payload.info.newTokenCount;
       }
     }
 
-    if (fallback === undefined && record.type === 'assistant') {
+    if (fallback === undefined && record.type === "assistant") {
       const usage = record.usageMetadata;
       if (usage) {
         fallback = usage.totalTokenCount ?? usage.promptTokenCount;
diff --git a/packages/airiscode-core/src/services/shellExecutionService.ts b/packages/airiscode-core/src/services/shellExecutionService.ts
index d3d71b36e..e097c46fe 100644
--- a/packages/airiscode-core/src/services/shellExecutionService.ts
+++ b/packages/airiscode-core/src/services/shellExecutionService.ts
@@ -4,12 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import type { PtyImplementation } from '../utils/getPty.js';
-import { getPty } from '../utils/getPty.js';
-import { spawn as cpSpawn, spawnSync } from 'node:child_process';
-import { TextDecoder } from 'node:util';
-import os from 'node:os';
+import { spawn as cpSpawn, spawnSync } from "node:child_process";
+import os from "node:os";
+import { TextDecoder } from "node:util";
+import stripAnsi from "strip-ansi";
+import type { PtyImplementation } from "../utils/getPty.js";
+import { getPty } from "../utils/getPty.js";
+
 // Local stub for @lydell/node-pty — the optional native dep is not installed
 // in this build. Consumers that actually need PTY support must wire it up
 // through getPty() which provides a runtime implementation.
@@ -23,25 +24,21 @@ interface IPty {
     dispose: () => void;
   };
 }
-import { getCachedEncodingForBuffer } from '../utils/systemEncoding.js';
-import { isBinary } from '../utils/textUtils.js';
-import { getShellConfiguration } from '../utils/shell-utils.js';
-import pkg from '@xterm/headless';
-import {
-  serializeTerminalToObject,
-  type AnsiOutput,
-} from '../utils/terminalSerializer.js';
+
+import pkg from "@xterm/headless";
+import { getShellConfiguration } from "../utils/shell-utils.js";
+import { getCachedEncodingForBuffer } from "../utils/systemEncoding.js";
+import { type AnsiOutput, serializeTerminalToObject } from "../utils/terminalSerializer.js";
+import { isBinary } from "../utils/textUtils.js";
+
 const { Terminal } = pkg;
 
 const SIGKILL_TIMEOUT_MS = 200;
-const WINDOWS_PATH_DELIMITER = ';';
+const WINDOWS_PATH_DELIMITER = ";";
 let cachedWindowsPathFingerprint: string | undefined;
 let cachedMergedWindowsPath: string | undefined;
 
-function mergeWindowsPathValues(
-  env: NodeJS.ProcessEnv,
-  pathKeys: string[],
-): string | undefined {
+function mergeWindowsPathValues(env: NodeJS.ProcessEnv, pathKeys: string[]): string | undefined {
   const mergedEntries: string[] = [];
   const seenEntries = new Set<string>();
 
@@ -60,37 +57,30 @@ function mergeWindowsPathValues(
     }
   }
 
-  return mergedEntries.length > 0
-    ? mergedEntries.join(WINDOWS_PATH_DELIMITER)
-    : undefined;
+  return mergedEntries.length > 0 ? mergedEntries.join(WINDOWS_PATH_DELIMITER) : undefined;
 }
 
-function getWindowsPathFingerprint(
-  env: NodeJS.ProcessEnv,
-  pathKeys: string[],
-): string {
-  return pathKeys.map((key) => `${key}=${env[key] ?? ''}`).join('\0');
+function getWindowsPathFingerprint(env: NodeJS.ProcessEnv, pathKeys: string[]): string {
+  return pathKeys.map((key) => `${key}=${env[key] ?? ""}`).join("\0");
 }
 
 function normalizePathEnvForWindows(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
-  if (os.platform() !== 'win32') {
+  if (os.platform() !== "win32") {
     return env;
   }
 
   const normalized: NodeJS.ProcessEnv = { ...env };
-  const pathKeys = Object.keys(normalized).filter(
-    (key) => key.toLowerCase() === 'path',
-  );
+  const pathKeys = Object.keys(normalized).filter((key) => key.toLowerCase() === "path");
 
   if (pathKeys.length === 0) {
     return normalized;
   }
 
   const orderedPathKeys = [...pathKeys].sort((left, right) => {
-    if (left === 'PATH') {
+    if (left === "PATH") {
       return -1;
     }
-    if (right === 'PATH') {
+    if (right === "PATH") {
       return 1;
     }
     return left.localeCompare(right);
@@ -108,13 +98,13 @@ function normalizePathEnvForWindows(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
   }
 
   for (const key of pathKeys) {
-    if (key !== 'PATH') {
+    if (key !== "PATH") {
       delete normalized[key];
     }
   }
 
   if (canonicalValue !== undefined) {
-    normalized['PATH'] = canonicalValue;
+    normalized["PATH"] = canonicalValue;
   }
 
   return normalized;
@@ -126,8 +116,8 @@ function normalizePathEnvForWindows(env: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
  * as UTF-8 regardless of the system codepage.
  */
 function applyPowerShellUtf8Prefix(command: string, shell: string): string {
-  if (os.platform() === 'win32' && shell === 'powershell') {
-    return '[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;' + command;
+  if (os.platform() === "win32" && shell === "powershell") {
+    return "[Console]::OutputEncoding=[System.Text.Encoding]::UTF8;" + command;
   }
   return command;
 }
@@ -149,7 +139,7 @@ export interface ShellExecutionResult {
   /** The process ID of the spawned shell. */
   pid: number | undefined;
   /** The method used to execute the shell command. */
-  executionMethod: 'lydell-node-pty' | 'node-pty' | 'child_process' | 'none';
+  executionMethod: "lydell-node-pty" | "node-pty" | "child_process" | "none";
 }
 
 /** A handle for an ongoing shell execution. */
@@ -177,17 +167,17 @@ export interface ShellExecutionConfig {
 export type ShellOutputEvent =
   | {
       /** The event contains a chunk of output data. */
-      type: 'data';
+      type: "data";
       /** The decoded string chunk. */
       chunk: string | AnsiOutput;
     }
   | {
       /** Signals that the output stream has been identified as binary. */
-      type: 'binary_detected';
+      type: "binary_detected";
     }
   | {
       /** Provides progress updates for a binary stream. */
-      type: 'binary_progress';
+      type: "binary_progress";
       /** The total number of bytes received so far. */
       bytesReceived: number;
     };
@@ -198,11 +188,11 @@ interface ActivePty {
 }
 
 const getErrnoCode = (error: unknown): string | undefined => {
-  if (!error || typeof error !== 'object' || !('code' in error)) {
+  if (!error || typeof error !== "object" || !("code" in error)) {
     return undefined;
   }
   const code = (error as { code?: unknown }).code;
-  return typeof code === 'string' ? code : undefined;
+  return typeof code === "string" ? code : undefined;
 };
 
 const getErrorMessage = (error: unknown): string =>
@@ -210,24 +200,24 @@ const getErrorMessage = (error: unknown): string =>
 
 const isExpectedPtyReadExitError = (error: unknown): boolean => {
   const code = getErrnoCode(error);
-  if (code === 'EIO') {
+  if (code === "EIO") {
     return true;
   }
 
   const message = getErrorMessage(error);
-  return message.includes('read EIO');
+  return message.includes("read EIO");
 };
 
 const isExpectedPtyExitRaceError = (error: unknown): boolean => {
   const code = getErrnoCode(error);
-  if (code === 'ESRCH' || code === 'EBADF') {
+  if (code === "ESRCH" || code === "EBADF") {
     return true;
   }
 
   const message = getErrorMessage(error);
   return (
-    message.includes('ioctl(2) failed, EBADF') ||
-    message.includes('Cannot resize a pty that has already exited')
+    message.includes("ioctl(2) failed, EBADF") ||
+    message.includes("Cannot resize a pty that has already exited")
   );
 };
 
@@ -236,10 +226,10 @@ const getFullBufferText = (terminal: pkg.Terminal): string => {
   const lines: string[] = [];
   for (let i = 0; i < buffer.length; i++) {
     const line = buffer.getLine(i);
-    const lineContent = line ? line.translateToString(true) : '';
+    const lineContent = line ? line.translateToString(true) : "";
     lines.push(lineContent);
   }
-  return lines.join('\n').trimEnd();
+  return lines.join("\n").trimEnd();
 };
 
 const replayTerminalOutput = async (
@@ -274,11 +264,11 @@ const windowsStrategy: ProcessCleanupStrategy = {
   killChildProcesses: (pids) => {
     if (pids.size > 0) {
       try {
-        const args = ['/f', '/t'];
+        const args = ["/f", "/t"];
         for (const pid of pids) {
-          args.push('/pid', pid.toString());
+          args.push("/pid", pid.toString());
         }
-        spawnSync('taskkill', args);
+        spawnSync("taskkill", args);
       } catch {
         // ignore
       }
@@ -288,12 +278,12 @@ const windowsStrategy: ProcessCleanupStrategy = {
 
 const posixStrategy: ProcessCleanupStrategy = {
   killPty: (pid, _pty) => {
-    process.kill(-pid, 'SIGKILL');
+    process.kill(-pid, "SIGKILL");
   },
   killChildProcesses: (pids) => {
     for (const pid of pids) {
       try {
-        process.kill(-pid, 'SIGKILL');
+        process.kill(-pid, "SIGKILL");
       } catch {
         // ignore
       }
@@ -301,8 +291,7 @@ const posixStrategy: ProcessCleanupStrategy = {
   },
 };
 
-const getCleanupStrategy = () =>
-  os.platform() === 'win32' ? windowsStrategy : posixStrategy;
+const getCleanupStrategy = () => (os.platform() === "win32" ? windowsStrategy : posixStrategy);
 
 /**
  * A centralized service for executing shell commands with robust process
@@ -330,7 +319,7 @@ export class ShellExecutionService {
   }
 
   static {
-    process.on('exit', () => {
+    process.on("exit", () => {
       ShellExecutionService.cleanup();
     });
   }
@@ -371,12 +360,7 @@ export class ShellExecutionService {
       }
     }
 
-    return this.childProcessFallback(
-      commandToExecute,
-      cwd,
-      onOutputEvent,
-      abortSignal,
-    );
+    return this.childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal);
   }
 
   private static childProcessFallback(
@@ -386,7 +370,7 @@ export class ShellExecutionService {
     abortSignal: AbortSignal,
   ): ShellExecutionHandle {
     try {
-      const isWindows = os.platform() === 'win32';
+      const isWindows = os.platform() === "win32";
       const { executable, argsPrefix, shell } = getShellConfiguration();
       commandToExecute = applyPowerShellUtf8Prefix(commandToExecute, shell);
       const shellArgs = [...argsPrefix, commandToExecute];
@@ -400,15 +384,15 @@ export class ShellExecutionService {
       // round-trip correctly through CommandLineToArgvW.
       const child = cpSpawn(executable, shellArgs, {
         cwd,
-        stdio: ['ignore', 'pipe', 'pipe'],
-        windowsVerbatimArguments: isWindows && shell === 'cmd',
+        stdio: ["ignore", "pipe", "pipe"],
+        windowsVerbatimArguments: isWindows && shell === "cmd",
         detached: !isWindows,
         windowsHide: isWindows,
         env: {
           ...normalizePathEnvForWindows(process.env),
-          QWEN_CODE: '1',
-          TERM: 'xterm-256color',
-          PAGER: 'cat',
+          QWEN_CODE: "1",
+          TERM: "xterm-256color",
+          PAGER: "cat",
         },
       });
 
@@ -416,8 +400,8 @@ export class ShellExecutionService {
         let stdoutDecoder: TextDecoder | null = null;
         let stderrDecoder: TextDecoder | null = null;
 
-        let stdout = '';
-        let stderr = '';
+        let stdout = "";
+        let stderr = "";
         const outputChunks: Buffer[] = [];
         let error: Error | null = null;
         let exited = false;
@@ -426,15 +410,15 @@ export class ShellExecutionService {
         const MAX_SNIFF_SIZE = 4096;
         let sniffedBytes = 0;
 
-        const handleOutput = (data: Buffer, stream: 'stdout' | 'stderr') => {
+        const handleOutput = (data: Buffer, stream: "stdout" | "stderr") => {
           if (!stdoutDecoder || !stderrDecoder) {
             const encoding = getCachedEncodingForBuffer(data);
             try {
               stdoutDecoder = new TextDecoder(encoding);
               stderrDecoder = new TextDecoder(encoding);
             } catch {
-              stdoutDecoder = new TextDecoder('utf-8');
-              stderrDecoder = new TextDecoder('utf-8');
+              stdoutDecoder = new TextDecoder("utf-8");
+              stderrDecoder = new TextDecoder("utf-8");
             }
           }
 
@@ -450,10 +434,10 @@ export class ShellExecutionService {
           }
 
           if (isStreamingRawContent) {
-            const decoder = stream === 'stdout' ? stdoutDecoder : stderrDecoder;
+            const decoder = stream === "stdout" ? stdoutDecoder : stderrDecoder;
             const decodedChunk = decoder.decode(data, { stream: true });
 
-            if (stream === 'stdout') {
+            if (stream === "stdout") {
               stdout += decodedChunk;
             } else {
               stderr += decodedChunk;
@@ -461,24 +445,20 @@ export class ShellExecutionService {
           }
         };
 
-        const handleExit = (
-          code: number | null,
-          signal: NodeJS.Signals | null,
-        ) => {
+        const handleExit = (code: number | null, signal: NodeJS.Signals | null) => {
           const { finalBuffer } = cleanup();
           // Ensure we don't add an extra newline if stdout already ends with one.
-          const separator = stdout.endsWith('\n') ? '' : '\n';
-          const combinedOutput =
-            stdout + (stderr ? (stdout ? separator : '') + stderr : '');
+          const separator = stdout.endsWith("\n") ? "" : "\n";
+          const combinedOutput = stdout + (stderr ? (stdout ? separator : "") + stderr : "");
 
           const finalStrippedOutput = stripAnsi(combinedOutput).trim();
 
           if (isStreamingRawContent) {
             if (finalStrippedOutput) {
-              onOutputEvent({ type: 'data', chunk: finalStrippedOutput });
+              onOutputEvent({ type: "data", chunk: finalStrippedOutput });
             }
           } else {
-            onOutputEvent({ type: 'binary_detected' });
+            onOutputEvent({ type: "binary_detected" });
           }
 
           resolve({
@@ -489,13 +469,13 @@ export class ShellExecutionService {
             error,
             aborted: abortSignal.aborted,
             pid: undefined,
-            executionMethod: 'child_process',
+            executionMethod: "child_process",
           });
         };
 
-        child.stdout.on('data', (data) => handleOutput(data, 'stdout'));
-        child.stderr.on('data', (data) => handleOutput(data, 'stderr'));
-        child.on('error', (err) => {
+        child.stdout.on("data", (data) => handleOutput(data, "stdout"));
+        child.stderr.on("data", (data) => handleOutput(data, "stderr"));
+        child.on("error", (err) => {
           error = err;
           handleExit(1, null);
         });
@@ -503,28 +483,28 @@ export class ShellExecutionService {
         const abortHandler = async () => {
           if (child.pid && !exited) {
             if (isWindows) {
-              cpSpawn('taskkill', ['/pid', child.pid.toString(), '/f', '/t']);
+              cpSpawn("taskkill", ["/pid", child.pid.toString(), "/f", "/t"]);
             } else {
               try {
-                process.kill(-child.pid, 'SIGTERM');
+                process.kill(-child.pid, "SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
-                  process.kill(-child.pid, 'SIGKILL');
+                  process.kill(-child.pid, "SIGKILL");
                 }
               } catch (_e) {
-                if (!exited) child.kill('SIGKILL');
+                if (!exited) child.kill("SIGKILL");
               }
             }
           }
         };
 
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
 
         if (child.pid) {
           this.activeChildProcesses.add(child.pid);
         }
 
-        child.on('exit', (code, signal) => {
+        child.on("exit", (code, signal) => {
           if (child.pid) {
             this.activeChildProcesses.delete(child.pid);
           }
@@ -533,7 +513,7 @@ export class ShellExecutionService {
 
         function cleanup() {
           exited = true;
-          abortSignal.removeEventListener('abort', abortHandler);
+          abortSignal.removeEventListener("abort", abortHandler);
           if (stdoutDecoder) {
             const remaining = stdoutDecoder.decode();
             if (remaining) {
@@ -560,13 +540,13 @@ export class ShellExecutionService {
         pid: undefined,
         result: Promise.resolve({
           error,
-          rawOutput: Buffer.from(''),
-          output: '',
+          rawOutput: Buffer.from(""),
+          output: "",
           exitCode: 1,
           signal: null,
           aborted: false,
           pid: undefined,
-          executionMethod: 'none',
+          executionMethod: "none",
         }),
       };
     }
@@ -582,7 +562,7 @@ export class ShellExecutionService {
   ): ShellExecutionHandle {
     if (!ptyInfo) {
       // This should not happen, but as a safeguard...
-      throw new Error('PTY implementation not found');
+      throw new Error("PTY implementation not found");
     }
     try {
       const cols = shellExecutionConfig.terminalWidth ?? 80;
@@ -601,21 +581,21 @@ export class ShellExecutionService {
       // The string form breaks quoted paths ending in \ (e.g., "C:\Temp\")
       // because CommandLineToArgvW treats \" as an escaped quote.
       const args: string[] | string =
-        os.platform() === 'win32' && shell === 'cmd'
-          ? [...argsPrefix, commandToExecute].join(' ')
+        os.platform() === "win32" && shell === "cmd"
+          ? [...argsPrefix, commandToExecute].join(" ")
           : [...argsPrefix, commandToExecute];
 
       const ptyProcess = ptyInfo.module.spawn(executable, args, {
         cwd,
-        name: 'xterm',
+        name: "xterm",
         cols,
         rows,
         env: {
           ...normalizePathEnvForWindows(process.env),
-          QWEN_CODE: '1',
-          TERM: 'xterm-256color',
-          PAGER: shellExecutionConfig.pager ?? 'cat',
-          GIT_PAGER: shellExecutionConfig.pager ?? 'cat',
+          QWEN_CODE: "1",
+          TERM: "xterm-256color",
+          PAGER: shellExecutionConfig.pager ?? "cat",
+          GIT_PAGER: shellExecutionConfig.pager ?? "cat",
         },
         handleFlowControl: true,
       });
@@ -670,7 +650,7 @@ export class ShellExecutionService {
             const lines: AnsiOutput = [];
             for (let y = 0; y < headlessTerminal.rows; y++) {
               const line = buffer.getLine(buffer.viewportY + y);
-              const lineContent = line ? line.translateToString(true) : '';
+              const lineContent = line ? line.translateToString(true) : "";
               lines.push([
                 {
                   text: lineContent,
@@ -679,8 +659,8 @@ export class ShellExecutionService {
                   underline: false,
                   dim: false,
                   inverse: false,
-                  fg: '',
-                  bg: '',
+                  fg: "",
+                  bg: "",
                 },
               ]);
             }
@@ -693,7 +673,7 @@ export class ShellExecutionService {
             if (
               line
                 .map((segment) => segment.text)
-                .join('')
+                .join("")
                 .trim().length > 0
             ) {
               lastNonEmptyLine = i;
@@ -711,7 +691,7 @@ export class ShellExecutionService {
           if (JSON.stringify(output) !== JSON.stringify(finalOutput)) {
             output = finalOutput;
             onOutputEvent({
-              type: 'data',
+              type: "data",
               chunk: finalOutput,
             });
           }
@@ -764,7 +744,7 @@ export class ShellExecutionService {
           try {
             decoder = new TextDecoder(encoding);
           } catch {
-            decoder = new TextDecoder('utf-8');
+            decoder = new TextDecoder("utf-8");
           }
         };
 
@@ -786,7 +766,7 @@ export class ShellExecutionService {
 
                   if (isBinary(sniffBuffer)) {
                     isStreamingRawContent = false;
-                    onOutputEvent({ type: 'binary_detected' });
+                    onOutputEvent({ type: "binary_detected" });
                   }
                 }
 
@@ -800,7 +780,7 @@ export class ShellExecutionService {
                   });
                 } else {
                   onOutputEvent({
-                    type: 'binary_progress',
+                    type: "binary_progress",
                     bytesReceived,
                   });
                   resolve();
@@ -810,7 +790,7 @@ export class ShellExecutionService {
         };
 
         ptyProcess.onData((data: string) => {
-          const bufferData = Buffer.from(data, 'utf-8');
+          const bufferData = Buffer.from(data, "utf-8");
           handleOutput(bufferData);
         });
 
@@ -818,7 +798,7 @@ export class ShellExecutionService {
         // due to race conditions between the exit event and read operations.
         // This is a normal behavior on macOS/Linux and should not crash the app.
         // See: https://github.com/microsoft/node-pty/issues/178
-        ptyProcess.on('error', (err: NodeJS.ErrnoException) => {
+        ptyProcess.on("error", (err: NodeJS.ErrnoException) => {
           if (isExpectedPtyReadExitError(err)) {
             // EIO is expected when the PTY process exits - ignore it
             return;
@@ -828,87 +808,71 @@ export class ShellExecutionService {
           throw err;
         });
 
-        ptyProcess.onExit(
-          ({ exitCode, signal }: { exitCode: number; signal?: number }) => {
-            exited = true;
-            abortSignal.removeEventListener('abort', abortHandler);
-            this.activePtys.delete(ptyProcess.pid);
+        ptyProcess.onExit(({ exitCode, signal }: { exitCode: number; signal?: number }) => {
+          exited = true;
+          abortSignal.removeEventListener("abort", abortHandler);
+          this.activePtys.delete(ptyProcess.pid);
 
-            const finalize = async () => {
-              render(true);
-              const finalBuffer = Buffer.concat(outputChunks);
-              let fullOutput = '';
+          const finalize = async () => {
+            render(true);
+            const finalBuffer = Buffer.concat(outputChunks);
+            let fullOutput = "";
 
+            try {
+              if (isStreamingRawContent) {
+                // Re-decode the full buffer with proper encoding detection.
+                // The streaming decoder used the first-chunk heuristic which
+                // can misdetect when early output is ASCII-only but later
+                // output is in a different encoding (e.g. GBK).
+                const finalEncoding = getCachedEncodingForBuffer(finalBuffer);
+                const decodedOutput = new TextDecoder(finalEncoding).decode(finalBuffer);
+                fullOutput = await replayTerminalOutput(decodedOutput, cols, rows);
+              } else {
+                fullOutput = getFullBufferText(headlessTerminal);
+              }
+            } catch {
               try {
-                if (isStreamingRawContent) {
-                  // Re-decode the full buffer with proper encoding detection.
-                  // The streaming decoder used the first-chunk heuristic which
-                  // can misdetect when early output is ASCII-only but later
-                  // output is in a different encoding (e.g. GBK).
-                  const finalEncoding = getCachedEncodingForBuffer(finalBuffer);
-                  const decodedOutput = new TextDecoder(finalEncoding).decode(
-                    finalBuffer,
-                  );
-                  fullOutput = await replayTerminalOutput(
-                    decodedOutput,
-                    cols,
-                    rows,
-                  );
-                } else {
-                  fullOutput = getFullBufferText(headlessTerminal);
-                }
+                fullOutput = getFullBufferText(headlessTerminal);
               } catch {
-                try {
-                  fullOutput = getFullBufferText(headlessTerminal);
-                } catch {
-                  // Ignore fallback rendering errors and resolve with empty text.
-                }
+                // Ignore fallback rendering errors and resolve with empty text.
               }
+            }
 
-              resolve({
-                rawOutput: finalBuffer,
-                output: fullOutput,
-                exitCode,
-                signal: signal ?? null,
-                error,
-                aborted: abortSignal.aborted,
-                pid: ptyProcess.pid,
-                executionMethod:
-                  (ptyInfo?.name as 'node-pty' | 'lydell-node-pty') ??
-                  'node-pty',
-              });
-            };
-
-            // Give any last onData callbacks a chance to run before finalizing.
-            // onExit can arrive slightly before late PTY data is processed.
-            const flushChain = () => processingChain.then(() => {});
-            const deadline = new Promise<void>((res) =>
-              setTimeout(res, SIGKILL_TIMEOUT_MS),
-            );
-            const drain = () =>
-              new Promise<void>((res) => setImmediate(res)).then(flushChain);
-
-            void Promise.race([
-              flushChain().then(drain).then(drain),
-              deadline,
-            ]).then(() => {
-              void finalize();
+            resolve({
+              rawOutput: finalBuffer,
+              output: fullOutput,
+              exitCode,
+              signal: signal ?? null,
+              error,
+              aborted: abortSignal.aborted,
+              pid: ptyProcess.pid,
+              executionMethod: (ptyInfo?.name as "node-pty" | "lydell-node-pty") ?? "node-pty",
             });
-          },
-        );
+          };
+
+          // Give any last onData callbacks a chance to run before finalizing.
+          // onExit can arrive slightly before late PTY data is processed.
+          const flushChain = () => processingChain.then(() => {});
+          const deadline = new Promise<void>((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
+          const drain = () => new Promise<void>((res) => setImmediate(res)).then(flushChain);
+
+          void Promise.race([flushChain().then(drain).then(drain), deadline]).then(() => {
+            void finalize();
+          });
+        });
 
         const abortHandler = async () => {
           if (ptyProcess.pid && !exited) {
-            if (os.platform() === 'win32') {
+            if (os.platform() === "win32") {
               ptyProcess.kill();
             } else {
               try {
                 // Send SIGTERM first to allow graceful shutdown
-                process.kill(-ptyProcess.pid, 'SIGTERM');
+                process.kill(-ptyProcess.pid, "SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
                   // Escalate to SIGKILL if still running
-                  process.kill(-ptyProcess.pid, 'SIGKILL');
+                  process.kill(-ptyProcess.pid, "SIGKILL");
                 }
               } catch (_e) {
                 // Fallback to killing just the process if the group kill fails
@@ -920,17 +884,17 @@ export class ShellExecutionService {
           }
         };
 
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
       });
 
       return { pid: ptyProcess.pid, result };
     } catch (e) {
       const error = e as Error;
-      if (error.message.includes('posix_spawnp failed')) {
+      if (error.message.includes("posix_spawnp failed")) {
         onOutputEvent({
-          type: 'data',
+          type: "data",
           chunk:
-            '[WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n',
+            "[WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n",
         });
         throw e;
       } else {
@@ -938,13 +902,13 @@ export class ShellExecutionService {
           pid: undefined,
           result: Promise.resolve({
             error,
-            rawOutput: Buffer.from(''),
-            output: '',
+            rawOutput: Buffer.from(""),
+            output: "",
             exitCode: 1,
             signal: null,
             aborted: false,
             pid: undefined,
-            executionMethod: 'none',
+            executionMethod: "none",
           }),
         };
       }
diff --git a/packages/airiscode-core/src/skills/index.ts b/packages/airiscode-core/src/skills/index.ts
index a4b3fbead..54804bfeb 100644
--- a/packages/airiscode-core/src/skills/index.ts
+++ b/packages/airiscode-core/src/skills/index.ts
@@ -20,16 +20,14 @@
  * - Bundled: built-in skills shipped with airiscode
  */
 
+// Main management class
+export { SkillManager } from "./skill-manager.js";
 // Core types and interfaces
 export type {
+  ListSkillsOptions,
   SkillConfig,
+  SkillErrorCode,
   SkillLevel,
   SkillValidationResult,
-  ListSkillsOptions,
-  SkillErrorCode,
-} from './types.js';
-
-export { SkillError } from './types.js';
-
-// Main management class
-export { SkillManager } from './skill-manager.js';
+} from "./types.js";
+export { SkillError } from "./types.js";
diff --git a/packages/airiscode-core/src/skills/skill-load.ts b/packages/airiscode-core/src/skills/skill-load.ts
index 639b85071..2655cdfd7 100644
--- a/packages/airiscode-core/src/skills/skill-load.ts
+++ b/packages/airiscode-core/src/skills/skill-load.ts
@@ -1,17 +1,15 @@
-import type { SkillConfig, SkillValidationResult } from './types.js';
-import * as fs from 'fs/promises';
-import * as path from 'path';
-import { parse as parseYaml } from '../utils/yaml-parser.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { normalizeContent } from '../utils/textUtils.js';
+import * as fs from "fs/promises";
+import * as path from "path";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { normalizeContent } from "../utils/textUtils.js";
+import { parse as parseYaml } from "../utils/yaml-parser.js";
+import type { SkillConfig, SkillValidationResult } from "./types.js";
 
-const debugLogger = createDebugLogger('SKILL_LOAD');
+const debugLogger = createDebugLogger("SKILL_LOAD");
 
-const SKILL_MANIFEST_FILE = 'SKILL.md';
+const SKILL_MANIFEST_FILE = "SKILL.md";
 
-export async function loadSkillsFromDir(
-  baseDir: string,
-): Promise<SkillConfig[]> {
+export async function loadSkillsFromDir(baseDir: string): Promise<SkillConfig[]> {
   debugLogger.debug(`Loading skills from directory (skill-load): ${baseDir}`);
   try {
     const entries = await fs.readdir(baseDir, { withFileTypes: true });
@@ -32,15 +30,12 @@ export async function loadSkillsFromDir(
         // Check if SKILL.md exists
         await fs.access(skillManifest);
 
-        const content = await fs.readFile(skillManifest, 'utf8');
+        const content = await fs.readFile(skillManifest, "utf8");
         const config = parseSkillContent(content, skillManifest);
         skills.push(config);
       } catch (error) {
-        const errorMessage =
-          error instanceof Error ? error.message : 'Unknown error';
-        debugLogger.error(
-          `Failed to parse skill at ${skillDir}: ${errorMessage}`,
-        );
+        const errorMessage = error instanceof Error ? error.message : "Unknown error";
+        debugLogger.error(`Failed to parse skill at ${skillDir}: ${errorMessage}`);
         continue;
       }
     }
@@ -48,19 +43,13 @@ export async function loadSkillsFromDir(
     return skills;
   } catch (error) {
     // Directory doesn't exist or can't be read
-    const errorMessage =
-      error instanceof Error ? error.message : 'Unknown error';
-    debugLogger.debug(
-      `Cannot read skills directory ${baseDir}: ${errorMessage}`,
-    );
+    const errorMessage = error instanceof Error ? error.message : "Unknown error";
+    debugLogger.debug(`Cannot read skills directory ${baseDir}: ${errorMessage}`);
     return [];
   }
 }
 
-export function parseSkillContent(
-  content: string,
-  filePath: string,
-): SkillConfig {
+export function parseSkillContent(content: string, filePath: string): SkillConfig {
   debugLogger.debug(`Parsing skill content from: ${filePath}`);
 
   // Normalize content to handle BOM and CRLF line endings
@@ -72,7 +61,7 @@ export function parseSkillContent(
   const match = normalizedContent.match(frontmatterRegex);
 
   if (!match) {
-    throw new Error('Invalid format: missing YAML frontmatter');
+    throw new Error("Invalid format: missing YAML frontmatter");
   }
 
   const [, frontmatterYaml, body] = match;
@@ -81,14 +70,14 @@ export function parseSkillContent(
   const frontmatter = parseYaml(frontmatterYaml) as Record<string, unknown>;
 
   // Extract required fields
-  const nameRaw = frontmatter['name'];
-  const descriptionRaw = frontmatter['description'];
+  const nameRaw = frontmatter["name"];
+  const descriptionRaw = frontmatter["description"];
 
-  if (nameRaw == null || nameRaw === '') {
+  if (nameRaw == null || nameRaw === "") {
     throw new Error('Missing "name" in frontmatter');
   }
 
-  if (descriptionRaw == null || descriptionRaw === '') {
+  if (descriptionRaw == null || descriptionRaw === "") {
     throw new Error('Missing "description" in frontmatter');
   }
 
@@ -97,7 +86,7 @@ export function parseSkillContent(
   const description = String(descriptionRaw);
 
   // Extract optional fields
-  const allowedToolsRaw = frontmatter['allowedTools'] as unknown[] | undefined;
+  const allowedToolsRaw = frontmatter["allowedTools"] as unknown[] | undefined;
   let allowedTools: string[] | undefined;
 
   if (allowedToolsRaw !== undefined) {
@@ -114,35 +103,33 @@ export function parseSkillContent(
     allowedTools,
     filePath,
     body: body.trim(),
-    level: 'extension',
+    level: "extension",
   };
 
   // Validate the parsed configuration
   const validation = validateConfig(config);
   if (!validation.isValid) {
-    throw new Error(`Validation failed: ${validation.errors.join(', ')}`);
+    throw new Error(`Validation failed: ${validation.errors.join(", ")}`);
   }
 
   debugLogger.debug(`Successfully parsed skill: ${name} from ${filePath}`);
   return config;
 }
 
-export function validateConfig(
-  config: Partial<SkillConfig>,
-): SkillValidationResult {
+export function validateConfig(config: Partial<SkillConfig>): SkillValidationResult {
   const errors: string[] = [];
   const warnings: string[] = [];
 
   // Check required fields
-  if (typeof config.name !== 'string') {
+  if (typeof config.name !== "string") {
     errors.push('Missing or invalid "name" field');
-  } else if (config.name.trim() === '') {
+  } else if (config.name.trim() === "") {
     errors.push('"name" cannot be empty');
   }
 
-  if (typeof config.description !== 'string') {
+  if (typeof config.description !== "string") {
     errors.push('Missing or invalid "description" field');
-  } else if (config.description.trim() === '') {
+  } else if (config.description.trim() === "") {
     errors.push('"description" cannot be empty');
   }
 
@@ -152,7 +139,7 @@ export function validateConfig(
       errors.push('"allowedTools" must be an array');
     } else {
       for (const tool of config.allowedTools) {
-        if (typeof tool !== 'string') {
+        if (typeof tool !== "string") {
           errors.push('"allowedTools" must contain only strings');
           break;
         }
@@ -161,8 +148,8 @@ export function validateConfig(
   }
 
   // Warn if body is empty
-  if (!config.body || config.body.trim() === '') {
-    warnings.push('Skill body is empty');
+  if (!config.body || config.body.trim() === "") {
+    warnings.push("Skill body is empty");
   }
 
   return {
diff --git a/packages/airiscode-core/src/skills/skill-manager.ts b/packages/airiscode-core/src/skills/skill-manager.ts
index 07b38c3c3..320481c2a 100644
--- a/packages/airiscode-core/src/skills/skill-manager.ts
+++ b/packages/airiscode-core/src/skills/skill-manager.ts
@@ -4,31 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs/promises';
-import * as fsSync from 'fs';
-import * as path from 'path';
-import * as os from 'os';
-import { fileURLToPath } from 'url';
-import { watch as watchFs, type FSWatcher } from 'chokidar';
-import { parse as parseYaml } from '../utils/yaml-parser.js';
-import type {
-  SkillConfig,
-  SkillLevel,
-  ListSkillsOptions,
-  SkillValidationResult,
-} from './types.js';
-import { SkillError, SkillErrorCode } from './types.js';
-import type { Config } from '../config/config.js';
-import { validateConfig } from './skill-load.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { normalizeContent } from '../utils/textUtils.js';
-import { SKILL_PROVIDER_CONFIG_DIRS } from '../config/storage.js';
-
-const debugLogger = createDebugLogger('SKILL_MANAGER');
-
-const AIRISCODE_CONFIG_DIR = '.airiscode';
-const SKILLS_CONFIG_DIR = 'skills';
-const SKILL_MANIFEST_FILE = 'SKILL.md';
+import { type FSWatcher, watch as watchFs } from "chokidar";
+import * as fsSync from "fs";
+import * as fs from "fs/promises";
+import * as os from "os";
+import * as path from "path";
+import { fileURLToPath } from "url";
+import type { Config } from "../config/config.js";
+import { SKILL_PROVIDER_CONFIG_DIRS } from "../config/storage.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { normalizeContent } from "../utils/textUtils.js";
+import { parse as parseYaml } from "../utils/yaml-parser.js";
+import { validateConfig } from "./skill-load.js";
+import type { ListSkillsOptions, SkillConfig, SkillLevel, SkillValidationResult } from "./types.js";
+import { SkillError, SkillErrorCode } from "./types.js";
+
+const debugLogger = createDebugLogger("SKILL_MANAGER");
+
+const AIRISCODE_CONFIG_DIR = ".airiscode";
+const SKILLS_CONFIG_DIR = "skills";
+const SKILL_MANIFEST_FILE = "SKILL.md";
 
 /**
  * Manages skill configurations stored as directories containing SKILL.md files.
@@ -44,10 +39,7 @@ export class SkillManager {
   private readonly bundledSkillsDir: string;
 
   constructor(private readonly config: Config) {
-    this.bundledSkillsDir = path.join(
-      path.dirname(fileURLToPath(import.meta.url)),
-      'bundled',
-    );
+    this.bundledSkillsDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "bundled");
   }
 
   /**
@@ -69,7 +61,7 @@ export class SkillManager {
       try {
         listener();
       } catch (error) {
-        debugLogger.warn('Skill change listener threw an error:', error);
+        debugLogger.warn("Skill change listener threw an error:", error);
       }
     }
   }
@@ -90,39 +82,35 @@ export class SkillManager {
    */
   async listSkills(options: ListSkillsOptions = {}): Promise<SkillConfig[]> {
     debugLogger.debug(
-      `Listing skills${options.level ? ` at level: ${options.level}` : ''}${options.force ? ' (forced refresh)' : ''}`,
+      `Listing skills${options.level ? ` at level: ${options.level}` : ""}${options.force ? " (forced refresh)" : ""}`,
     );
     const skills: SkillConfig[] = [];
     const seenNames = new Set<string>();
 
     const levelsToCheck: SkillLevel[] = options.level
       ? [options.level]
-      : ['project', 'user', 'extension', 'bundled'];
+      : ["project", "user", "extension", "bundled"];
 
     // Check if we should use cache or force refresh
     const shouldUseCache = !options.force && this.skillsCache !== null;
 
     // Initialize cache if it doesn't exist or we're forcing a refresh
     if (!shouldUseCache) {
-      debugLogger.debug('Cache miss or force refresh, reloading skills');
+      debugLogger.debug("Cache miss or force refresh, reloading skills");
       await this.refreshCache();
     } else {
-      debugLogger.debug('Using cached skills');
+      debugLogger.debug("Using cached skills");
     }
 
     // Collect skills from each level (precedence: project > user > extension > bundled)
     for (const level of levelsToCheck) {
       const levelSkills = this.skillsCache?.get(level) || [];
-      debugLogger.debug(
-        `Processing ${levelSkills.length} ${level} level skills`,
-      );
+      debugLogger.debug(`Processing ${levelSkills.length} ${level} level skills`);
 
       for (const skill of levelSkills) {
         // Skip if we've already seen this name (precedence: project > user > extension > bundled)
         if (seenNames.has(skill.name)) {
-          debugLogger.debug(
-            `Skipping duplicate skill: ${skill.name} (${level})`,
-          );
+          debugLogger.debug(`Skipping duplicate skill: ${skill.name} (${level})`);
           continue;
         }
 
@@ -147,13 +135,8 @@ export class SkillManager {
    * @param level - Optional level to limit search to
    * @returns SkillConfig or null if not found
    */
-  async loadSkill(
-    name: string,
-    level?: SkillLevel,
-  ): Promise<SkillConfig | null> {
-    debugLogger.debug(
-      `Loading skill: ${name}${level ? ` at level: ${level}` : ''}`,
-    );
+  async loadSkill(name: string, level?: SkillLevel): Promise<SkillConfig | null> {
+    debugLogger.debug(`Loading skill: ${name}${level ? ` at level: ${level}` : ""}`);
 
     if (level) {
       const skill = await this.findSkillByNameAtLevel(name, level);
@@ -166,28 +149,28 @@ export class SkillManager {
     }
 
     // Try project level first
-    const projectSkill = await this.findSkillByNameAtLevel(name, 'project');
+    const projectSkill = await this.findSkillByNameAtLevel(name, "project");
     if (projectSkill) {
       debugLogger.debug(`Found skill ${name} at project level`);
       return projectSkill;
     }
 
     // Try user level
-    const userSkill = await this.findSkillByNameAtLevel(name, 'user');
+    const userSkill = await this.findSkillByNameAtLevel(name, "user");
     if (userSkill) {
       debugLogger.debug(`Found skill ${name} at user level`);
       return userSkill;
     }
 
     // Try extension level
-    const extensionSkill = await this.findSkillByNameAtLevel(name, 'extension');
+    const extensionSkill = await this.findSkillByNameAtLevel(name, "extension");
     if (extensionSkill) {
       debugLogger.debug(`Found skill ${name} at extension level`);
       return extensionSkill;
     }
 
     // Try bundled level (lowest precedence)
-    const bundledSkill = await this.findSkillByNameAtLevel(name, 'bundled');
+    const bundledSkill = await this.findSkillByNameAtLevel(name, "bundled");
     if (bundledSkill) {
       debugLogger.debug(`Found skill ${name} at bundled level`);
     } else {
@@ -206,22 +189,15 @@ export class SkillManager {
    * @param level - Optional level to limit search to
    * @returns SkillConfig or null if not found
    */
-  async loadSkillForRuntime(
-    name: string,
-    level?: SkillLevel,
-  ): Promise<SkillConfig | null> {
-    debugLogger.debug(
-      `Loading skill for runtime: ${name}${level ? ` at level: ${level}` : ''}`,
-    );
+  async loadSkillForRuntime(name: string, level?: SkillLevel): Promise<SkillConfig | null> {
+    debugLogger.debug(`Loading skill for runtime: ${name}${level ? ` at level: ${level}` : ""}`);
     const skill = await this.loadSkill(name, level);
     if (!skill) {
       debugLogger.debug(`Skill not found for runtime: ${name}`);
       return null;
     }
 
-    debugLogger.info(
-      `Skill loaded for runtime: ${name} from ${skill.filePath}`,
-    );
+    debugLogger.info(`Skill loaded for runtime: ${name} from ${skill.filePath}`);
     return skill;
   }
 
@@ -239,11 +215,11 @@ export class SkillManager {
    * Refreshes the skills cache by loading all skills from disk.
    */
   async refreshCache(): Promise<void> {
-    debugLogger.info('Refreshing skills cache...');
+    debugLogger.info("Refreshing skills cache...");
     const skillsCache = new Map<SkillLevel, SkillConfig[]>();
     this.parseErrors.clear();
 
-    const levels: SkillLevel[] = ['project', 'user', 'extension', 'bundled'];
+    const levels: SkillLevel[] = ["project", "user", "extension", "bundled"];
     let totalSkills = 0;
 
     for (const level of levels) {
@@ -254,9 +230,7 @@ export class SkillManager {
     }
 
     this.skillsCache = skillsCache;
-    debugLogger.info(
-      `Skills cache refreshed: ${totalSkills} total skills loaded`,
-    );
+    debugLogger.info(`Skills cache refreshed: ${totalSkills} total skills loaded`);
     this.notifyChangeListeners();
   }
 
@@ -265,26 +239,26 @@ export class SkillManager {
    */
   async startWatching(): Promise<void> {
     if (this.watchStarted) {
-      debugLogger.debug('Skill watching already started, skipping');
+      debugLogger.debug("Skill watching already started, skipping");
       return;
     }
 
-    debugLogger.info('Starting skill directory watchers...');
+    debugLogger.info("Starting skill directory watchers...");
     this.watchStarted = true;
     await this.ensureUserSkillsDir();
     await this.refreshCache();
     this.updateWatchersFromCache();
-    debugLogger.info('Skill directory watchers started');
+    debugLogger.info("Skill directory watchers started");
   }
 
   /**
    * Stops watching skill directories for changes.
    */
   stopWatching(): void {
-    debugLogger.info('Stopping skill directory watchers...');
+    debugLogger.info("Stopping skill directory watchers...");
     for (const watcher of this.watchers.values()) {
       void watcher.close().catch((error) => {
-        debugLogger.warn('Failed to close skills watcher:', error);
+        debugLogger.warn("Failed to close skills watcher:", error);
       });
     }
     this.watchers.clear();
@@ -293,7 +267,7 @@ export class SkillManager {
       clearTimeout(this.refreshTimer);
       this.refreshTimer = null;
     }
-    debugLogger.info('Skill directory watchers stopped');
+    debugLogger.info("Skill directory watchers stopped");
   }
 
   /**
@@ -311,20 +285,14 @@ export class SkillManager {
   /**
    * Internal implementation of skill file parsing.
    */
-  private async parseSkillFileInternal(
-    filePath: string,
-    level: SkillLevel,
-  ): Promise<SkillConfig> {
+  private async parseSkillFileInternal(filePath: string, level: SkillLevel): Promise<SkillConfig> {
     let content: string;
 
     try {
-      content = await fs.readFile(filePath, 'utf8');
+      content = await fs.readFile(filePath, "utf8");
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : 'Unknown error';
-      debugLogger.error(
-        `Failed to read skill file ${filePath}: ${errorMessage}`,
-      );
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      debugLogger.error(`Failed to read skill file ${filePath}: ${errorMessage}`);
       const skillError = new SkillError(
         `Failed to read skill file: ${errorMessage}`,
         SkillErrorCode.FILE_ERROR,
@@ -345,11 +313,7 @@ export class SkillManager {
    * @returns SkillConfig
    * @throws SkillError if parsing fails
    */
-  parseSkillContent(
-    content: string,
-    filePath: string,
-    level: SkillLevel,
-  ): SkillConfig {
+  parseSkillContent(content: string, filePath: string, level: SkillLevel): SkillConfig {
     try {
       const normalizedContent = normalizeContent(content);
 
@@ -358,7 +322,7 @@ export class SkillManager {
       const match = normalizedContent.match(frontmatterRegex);
 
       if (!match) {
-        throw new Error('Invalid format: missing YAML frontmatter');
+        throw new Error("Invalid format: missing YAML frontmatter");
       }
 
       const [, frontmatterYaml, body] = match;
@@ -367,14 +331,14 @@ export class SkillManager {
       const frontmatter = parseYaml(frontmatterYaml) as Record<string, unknown>;
 
       // Extract required fields
-      const nameRaw = frontmatter['name'];
-      const descriptionRaw = frontmatter['description'];
+      const nameRaw = frontmatter["name"];
+      const descriptionRaw = frontmatter["description"];
 
-      if (nameRaw == null || nameRaw === '') {
+      if (nameRaw == null || nameRaw === "") {
         throw new Error('Missing "name" in frontmatter');
       }
 
-      if (descriptionRaw == null || descriptionRaw === '') {
+      if (descriptionRaw == null || descriptionRaw === "") {
         throw new Error('Missing "description" in frontmatter');
       }
 
@@ -383,9 +347,7 @@ export class SkillManager {
       const description = String(descriptionRaw);
 
       // Extract optional fields
-      const allowedToolsRaw = frontmatter['allowedTools'] as
-        | unknown[]
-        | undefined;
+      const allowedToolsRaw = frontmatter["allowedTools"] as unknown[] | undefined;
       let allowedTools: string[] | undefined;
 
       if (allowedToolsRaw !== undefined) {
@@ -408,16 +370,14 @@ export class SkillManager {
       // Validate the parsed configuration
       const validation = this.validateConfig(config);
       if (!validation.isValid) {
-        throw new Error(`Validation failed: ${validation.errors.join(', ')}`);
+        throw new Error(`Validation failed: ${validation.errors.join(", ")}`);
       }
 
-      debugLogger.debug(
-        `Successfully parsed skill: ${name} (${level}) from ${filePath}`,
-      );
+      debugLogger.debug(`Successfully parsed skill: ${name} (${level}) from ${filePath}`);
       return config;
     } catch (error) {
       const skillError = new SkillError(
-        `Failed to parse skill file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Failed to parse skill file: ${error instanceof Error ? error.message : "Unknown error"}`,
         SkillErrorCode.PARSE_ERROR,
       );
       this.parseErrors.set(filePath, skillError);
@@ -433,19 +393,17 @@ export class SkillManager {
    */
   getSkillsBaseDirs(level: SkillLevel): string[] {
     switch (level) {
-      case 'project':
+      case "project":
         return SKILL_PROVIDER_CONFIG_DIRS.map((v) =>
           path.join(this.config.getProjectRoot(), v, SKILLS_CONFIG_DIR),
         );
-      case 'user':
-        return SKILL_PROVIDER_CONFIG_DIRS.map((v) =>
-          path.join(os.homedir(), v, SKILLS_CONFIG_DIR),
-        );
-      case 'bundled':
+      case "user":
+        return SKILL_PROVIDER_CONFIG_DIRS.map((v) => path.join(os.homedir(), v, SKILLS_CONFIG_DIR));
+      case "bundled":
         return [this.bundledSkillsDir];
-      case 'extension':
+      case "extension":
         throw new Error(
-          'Extension skills do not have a base directory; they are loaded from active extensions.',
+          "Extension skills do not have a base directory; they are loaded from active extensions.",
         );
       default:
         throw new Error(`Unknown skill level: ${level as string}`);
@@ -465,14 +423,12 @@ export class SkillManager {
 
     // If project level is requested but project root is same as home directory,
     // return empty array to avoid conflicts between project and global skills
-    if (level === 'project' && isHomeDirectory) {
-      debugLogger.debug(
-        'Skipping project-level skills: project root is home directory',
-      );
+    if (level === "project" && isHomeDirectory) {
+      debugLogger.debug("Skipping project-level skills: project root is home directory");
       return [];
     }
 
-    if (level === 'extension') {
+    if (level === "extension") {
       const extensions = this.config.getActiveExtensions();
       const skills: SkillConfig[] = [];
       for (const extension of extensions) {
@@ -486,7 +442,7 @@ export class SkillManager {
       return skills;
     }
 
-    if (level === 'bundled') {
+    if (level === "bundled") {
       const bundledDir = this.bundledSkillsDir;
       if (!fsSync.existsSync(bundledDir)) {
         debugLogger.warn(
@@ -495,7 +451,7 @@ export class SkillManager {
         return [];
       }
       debugLogger.debug(`Loading bundled skills from: ${bundledDir}`);
-      const skills = await this.loadSkillsFromDir(bundledDir, 'bundled');
+      const skills = await this.loadSkillsFromDir(bundledDir, "bundled");
       debugLogger.debug(`Loaded ${skills.length} bundled skills`);
       return skills;
     }
@@ -524,10 +480,7 @@ export class SkillManager {
     return skills;
   }
 
-  async loadSkillsFromDir(
-    baseDir: string,
-    level: SkillLevel,
-  ): Promise<SkillConfig[]> {
+  async loadSkillsFromDir(baseDir: string, level: SkillLevel): Promise<SkillConfig[]> {
     debugLogger.debug(`Loading skills from directory: ${baseDir}`);
     try {
       const entries = await fs.readdir(baseDir, { withFileTypes: true });
@@ -551,14 +504,12 @@ export class SkillManager {
           try {
             const targetStat = await fs.stat(skillDir);
             if (!targetStat.isDirectory()) {
-              debugLogger.warn(
-                `Skipping symlink ${entry.name} that does not point to a directory`,
-              );
+              debugLogger.warn(`Skipping symlink ${entry.name} that does not point to a directory`);
               continue;
             }
           } catch (error) {
             debugLogger.warn(
-              `Skipping invalid symlink ${entry.name}: ${error instanceof Error ? error.message : 'Unknown error'}`,
+              `Skipping invalid symlink ${entry.name}: ${error instanceof Error ? error.message : "Unknown error"}`,
             );
             continue;
           }
@@ -570,22 +521,15 @@ export class SkillManager {
           // Check if SKILL.md exists
           await fs.access(skillManifest);
 
-          const config = await this.parseSkillFileInternal(
-            skillManifest,
-            level,
-          );
+          const config = await this.parseSkillFileInternal(skillManifest, level);
           skills.push(config);
         } catch (error) {
           // Skip directories without valid SKILL.md
           if (error instanceof SkillError) {
             // Parse error was already recorded
-            debugLogger.error(
-              `Failed to parse skill at ${skillDir}: ${error.message}`,
-            );
+            debugLogger.error(`Failed to parse skill at ${skillDir}: ${error.message}`);
           } else {
-            debugLogger.debug(
-              `No valid SKILL.md found in ${skillDir}, skipping`,
-            );
+            debugLogger.debug(`No valid SKILL.md found in ${skillDir}, skipping`);
           }
           continue;
         }
@@ -594,11 +538,8 @@ export class SkillManager {
       return skills;
     } catch (error) {
       // Directory doesn't exist or can't be read
-      const errorMessage =
-        error instanceof Error ? error.message : 'Unknown error';
-      debugLogger.debug(
-        `Cannot read skills directory ${baseDir}: ${errorMessage}`,
-      );
+      const errorMessage = error instanceof Error ? error.message : "Unknown error";
+      debugLogger.debug(`Cannot read skills directory ${baseDir}: ${errorMessage}`);
       return [];
     }
   }
@@ -641,7 +582,7 @@ export class SkillManager {
   // skills are managed by the extension system, so neither needs watching.
   private updateWatchersFromCache(): void {
     const watchTargets = new Set<string>(
-      (['project', 'user'] as const)
+      (["project", "user"] as const)
         .map((level) => this.getSkillsBaseDirs(level))
         .reduce((acc, baseDirs) => acc.concat(baseDirs), [])
         .filter((baseDir) => fsSync.existsSync(baseDir)),
@@ -653,10 +594,7 @@ export class SkillManager {
           .get(existingPath)
           ?.close()
           .catch((error) => {
-            debugLogger.warn(
-              `Failed to close skills watcher for ${existingPath}:`,
-              error,
-            );
+            debugLogger.warn(`Failed to close skills watcher for ${existingPath}:`, error);
           });
         this.watchers.delete(existingPath);
       }
@@ -671,18 +609,15 @@ export class SkillManager {
         const watcher = watchFs(watchPath, {
           ignoreInitial: true,
         })
-          .on('all', () => {
+          .on("all", () => {
             this.scheduleRefresh();
           })
-          .on('error', (error) => {
+          .on("error", (error) => {
             debugLogger.warn(`Skills watcher error for ${watchPath}:`, error);
           });
         this.watchers.set(watchPath, watcher);
       } catch (error) {
-        debugLogger.warn(
-          `Failed to watch skills directory at ${watchPath}:`,
-          error,
-        );
+        debugLogger.warn(`Failed to watch skills directory at ${watchPath}:`, error);
       }
     }
   }
@@ -703,10 +638,7 @@ export class SkillManager {
     try {
       await fs.mkdir(baseDir, { recursive: true });
     } catch (error) {
-      debugLogger.warn(
-        `Failed to create user skills directory at ${baseDir}:`,
-        error,
-      );
+      debugLogger.warn(`Failed to create user skills directory at ${baseDir}:`, error);
     }
   }
 }
diff --git a/packages/airiscode-core/src/skills/types.ts b/packages/airiscode-core/src/skills/types.ts
index aa26abcde..9b609c283 100644
--- a/packages/airiscode-core/src/skills/types.ts
+++ b/packages/airiscode-core/src/skills/types.ts
@@ -11,7 +11,7 @@
  * - 'extension': Provided by an installed extension
  * - 'bundled': Built-in skills shipped with airiscode
  */
-export type SkillLevel = 'project' | 'user' | 'extension' | 'bundled';
+export type SkillLevel = "project" | "user" | "extension" | "bundled";
 
 /**
  * Core configuration for a skill as stored in SKILL.md files.
@@ -93,7 +93,7 @@ export class SkillError extends Error {
     readonly skillName?: string,
   ) {
     super(message);
-    this.name = 'SkillError';
+    this.name = "SkillError";
   }
 }
 
@@ -101,12 +101,11 @@ export class SkillError extends Error {
  * Error codes for skill operations.
  */
 export const SkillErrorCode = {
-  NOT_FOUND: 'NOT_FOUND',
-  INVALID_CONFIG: 'INVALID_CONFIG',
-  INVALID_NAME: 'INVALID_NAME',
-  FILE_ERROR: 'FILE_ERROR',
-  PARSE_ERROR: 'PARSE_ERROR',
+  NOT_FOUND: "NOT_FOUND",
+  INVALID_CONFIG: "INVALID_CONFIG",
+  INVALID_NAME: "INVALID_NAME",
+  FILE_ERROR: "FILE_ERROR",
+  PARSE_ERROR: "PARSE_ERROR",
 } as const;
 
-export type SkillErrorCode =
-  (typeof SkillErrorCode)[keyof typeof SkillErrorCode];
+export type SkillErrorCode = (typeof SkillErrorCode)[keyof typeof SkillErrorCode];
diff --git a/packages/airiscode-core/src/subagents/builtin-agents.ts b/packages/airiscode-core/src/subagents/builtin-agents.ts
index 8c58f91f6..41177e5c3 100644
--- a/packages/airiscode-core/src/subagents/builtin-agents.ts
+++ b/packages/airiscode-core/src/subagents/builtin-agents.ts
@@ -4,21 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ToolDisplayNames, ToolNames } from '../tools/tool-names.js';
-import type { SubagentConfig } from './types.js';
+import { ToolDisplayNames, ToolNames } from "../tools/tool-names.js";
+import type { SubagentConfig } from "./types.js";
 
 /**
  * Registry of built-in subagents that are always available to all users.
  * These agents are embedded in the codebase and cannot be modified or deleted.
  */
 export class BuiltinAgentRegistry {
-  private static readonly BUILTIN_AGENTS: Array<
-    Omit<SubagentConfig, 'level' | 'filePath'>
-  > = [
+  private static readonly BUILTIN_AGENTS: Array<Omit<SubagentConfig, "level" | "filePath">> = [
     {
-      name: 'general-purpose',
+      name: "general-purpose",
       description:
-        'General-purpose agent for researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries use this agent to perform the search for you.',
+        "General-purpose agent for researching complex questions, searching for code, and executing multi-step tasks. When you are searching for a keyword or file and are not confident that you will find the right match in the first few tries use this agent to perform the search for you.",
       systemPrompt: `You are a general-purpose agent. Given the user's message, you should use the tools available to complete the task. Do what has been asked; nothing more, nothing less. When you complete the task, respond with a concise report covering what was done and any key findings — the caller will relay this to the user, so it only needs the essentials.
 
 Your strengths:
@@ -42,7 +40,7 @@ Notes:
 - For clear communication with the user the assistant MUST avoid using emojis.`,
     },
     {
-      name: 'Explore',
+      name: "Explore",
       description:
         'Fast agent specialized for exploring codebases. Use this when you need to quickly find files by patterns (eg. "src/components/**/*.tsx"), search code for keywords (eg. "API endpoints"), or answer questions about the codebase (eg. "how do API endpoints work?"). When calling this agent, specify the desired thoroughness level: "quick" for basic searches, "medium" for moderate exploration, or "very thorough" for comprehensive analysis across multiple locations and naming conventions.',
       systemPrompt: `You are a file search specialist agent. You excel at thoroughly navigating and exploring codebases.
@@ -101,16 +99,15 @@ Notes:
       ],
     },
     {
-      name: 'statusline-setup',
-      description:
-        "Use this agent to configure the user's AIRIS Code status line setting.",
+      name: "statusline-setup",
+      description: "Use this agent to configure the user's AIRIS Code status line setting.",
       tools: [
         ToolNames.READ_FILE,
         ToolNames.WRITE_FILE,
         ToolNames.EDIT,
         ToolNames.ASK_USER_QUESTION,
       ],
-      color: 'orange',
+      color: "orange",
       systemPrompt: `You are a status line setup agent for AIRIS Code. Your job is to create or update the statusLine command in the user's AIRIS Code settings.
 
 When asked to convert the user's shell PS1 configuration, follow these steps:
@@ -219,9 +216,9 @@ Guidelines:
 `,
     },
     {
-      name: 'Plan',
+      name: "Plan",
       description:
-        'Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a task. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs.',
+        "Software architect agent for designing implementation plans. Use this when you need to plan the implementation strategy for a task. Returns step-by-step plans, identifies critical files, and considers architectural trade-offs.",
       systemPrompt: `You are a planning specialist agent. Your job is to analyze codebases and design implementation plans.
 
 Your strengths:
@@ -262,9 +259,9 @@ Notes:
       ],
     },
     {
-      name: 'code-reviewer',
+      name: "code-reviewer",
       description:
-        'Use this agent when a major project step has been completed and needs to be reviewed against the original plan and coding standards. Examples: after implementing a feature, before creating a PR, after a refactor.',
+        "Use this agent when a major project step has been completed and needs to be reviewed against the original plan and coding standards. Examples: after implementing a feature, before creating a PR, after a refactor.",
       systemPrompt: `You are a code review specialist agent. Your job is to review code changes against project standards and the original plan.
 
 === CRITICAL: READ-ONLY MODE ===
@@ -314,7 +311,7 @@ Notes:
   static getBuiltinAgents(): SubagentConfig[] {
     return this.BUILTIN_AGENTS.map((agent) => ({
       ...agent,
-      level: 'builtin' as const,
+      level: "builtin" as const,
       filePath: `<builtin:${agent.name}>`,
       isBuiltin: true,
     }));
@@ -327,16 +324,14 @@ Notes:
    */
   static getBuiltinAgent(name: string): SubagentConfig | null {
     const lowerName = name.toLowerCase();
-    const agent = this.BUILTIN_AGENTS.find(
-      (a) => a.name.toLowerCase() === lowerName,
-    );
+    const agent = this.BUILTIN_AGENTS.find((a) => a.name.toLowerCase() === lowerName);
     if (!agent) {
       return null;
     }
 
     return {
       ...agent,
-      level: 'builtin' as const,
+      level: "builtin" as const,
       filePath: `<builtin:${agent.name}>`,
       isBuiltin: true,
     };
@@ -349,9 +344,7 @@ Notes:
    */
   static isBuiltinAgent(name: string): boolean {
     const lowerName = name.toLowerCase();
-    return this.BUILTIN_AGENTS.some(
-      (agent) => agent.name.toLowerCase() === lowerName,
-    );
+    return this.BUILTIN_AGENTS.some((agent) => agent.name.toLowerCase() === lowerName);
   }
 
   /**
diff --git a/packages/airiscode-core/src/subagents/index.ts b/packages/airiscode-core/src/subagents/index.ts
index c05c38697..d0ec5877e 100644
--- a/packages/airiscode-core/src/subagents/index.ts
+++ b/packages/airiscode-core/src/subagents/index.ts
@@ -12,24 +12,20 @@
  *
  */
 
+// Built-in agents registry
+export { BuiltinAgentRegistry } from "./builtin-agents.js";
+// Main management class
+export { SubagentManager } from "./subagent-manager.js";
 // Core types and interfaces
 export type {
+  CreateSubagentOptions,
+  ListSubagentsOptions,
   SubagentConfig,
+  SubagentErrorCode,
   SubagentLevel,
   SubagentRuntimeConfig,
   ValidationResult,
-  ListSubagentsOptions,
-  CreateSubagentOptions,
-  SubagentErrorCode,
-} from './types.js';
-
-export { SubagentError } from './types.js';
-
-// Built-in agents registry
-export { BuiltinAgentRegistry } from './builtin-agents.js';
-
+} from "./types.js";
+export { SubagentError } from "./types.js";
 // Validation system
-export { SubagentValidator } from './validation.js';
-
-// Main management class
-export { SubagentManager } from './subagent-manager.js';
+export { SubagentValidator } from "./validation.js";
diff --git a/packages/airiscode-core/src/subagents/model-selection.ts b/packages/airiscode-core/src/subagents/model-selection.ts
index f9c909f78..18bb920f7 100644
--- a/packages/airiscode-core/src/subagents/model-selection.ts
+++ b/packages/airiscode-core/src/subagents/model-selection.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AuthType } from '../core/contentGenerator.js';
+import { AuthType } from "../core/contentGenerator.js";
 
 export interface ParsedSubagentModelSelection {
   authType?: AuthType;
@@ -26,11 +26,11 @@ export function parseSubagentModelSelection(
   model: string | undefined,
 ): ParsedSubagentModelSelection {
   const trimmed = model?.trim();
-  if (!trimmed || trimmed === 'inherit') {
+  if (!trimmed || trimmed === "inherit") {
     return { inherits: true };
   }
 
-  const colonIndex = trimmed.indexOf(':');
+  const colonIndex = trimmed.indexOf(":");
   if (colonIndex === -1) {
     return { modelId: trimmed, inherits: false };
   }
@@ -45,9 +45,7 @@ export function parseSubagentModelSelection(
   }
 
   if (!modelId) {
-    throw new Error(
-      'Model selector must include a model ID after the authType',
-    );
+    throw new Error("Model selector must include a model ID after the authType");
   }
 
   return {
diff --git a/packages/airiscode-core/src/subagents/subagent-manager.ts b/packages/airiscode-core/src/subagents/subagent-manager.ts
index fa1d85769..c5435d3a6 100644
--- a/packages/airiscode-core/src/subagents/subagent-manager.ts
+++ b/packages/airiscode-core/src/subagents/subagent-manager.ts
@@ -4,53 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs/promises';
-import * as path from 'path';
-import * as os from 'os';
-// Note: yaml package would need to be added as a dependency
-// For now, we'll use a simple YAML parser implementation
-import {
-  parse as parseYaml,
-  stringify as stringifyYaml,
-} from '../utils/yaml-parser.js';
+import * as fs from "fs/promises";
+import * as os from "os";
+import * as path from "path";
+import type { AgentEventEmitter, AgentHooks } from "../agents/runtime/agent-events.js";
+import { AgentHeadless } from "../agents/runtime/agent-headless.js";
 import type {
-  SubagentConfig,
-  SubagentRuntimeConfig,
-  SubagentLevel,
-  ListSubagentsOptions,
-  CreateSubagentOptions,
-} from './types.js';
-import type {
-  PromptConfig,
   ModelConfig,
+  PromptConfig,
   RunConfig,
   ToolConfig,
-} from '../agents/runtime/agent-types.js';
-import { SubagentError, SubagentErrorCode } from './types.js';
-import { SubagentValidator } from './validation.js';
-import { AgentHeadless } from '../agents/runtime/agent-headless.js';
-import type {
-  AgentEventEmitter,
-  AgentHooks,
-} from '../agents/runtime/agent-events.js';
-import type { Config } from '../config/config.js';
+} from "../agents/runtime/agent-types.js";
+import type { Config } from "../config/config.js";
 import {
   type AuthType,
   type ContentGenerator,
   type ContentGeneratorConfig,
   createContentGenerator,
-} from '../core/contentGenerator.js';
-import { buildAgentContentGeneratorConfig } from '../models/content-generator-config.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { normalizeContent } from '../utils/textUtils.js';
-import { parseSubagentModelSelection } from './model-selection.js';
+} from "../core/contentGenerator.js";
+import { buildAgentContentGeneratorConfig } from "../models/content-generator-config.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { normalizeContent } from "../utils/textUtils.js";
+// Note: yaml package would need to be added as a dependency
+// For now, we'll use a simple YAML parser implementation
+import { parse as parseYaml, stringify as stringifyYaml } from "../utils/yaml-parser.js";
+import { parseSubagentModelSelection } from "./model-selection.js";
+import type {
+  CreateSubagentOptions,
+  ListSubagentsOptions,
+  SubagentConfig,
+  SubagentLevel,
+  SubagentRuntimeConfig,
+} from "./types.js";
+import { SubagentError, SubagentErrorCode } from "./types.js";
+import { SubagentValidator } from "./validation.js";
 
-const debugLogger = createDebugLogger('SUBAGENT_MANAGER');
-import { BuiltinAgentRegistry } from './builtin-agents.js';
-import { ToolDisplayNamesMigration } from '../tools/tool-names.js';
+const debugLogger = createDebugLogger("SUBAGENT_MANAGER");
 
-const AIRISCODE_CONFIG_DIR = '.airiscode';
-const AGENT_CONFIG_DIR = 'agents';
+import { ToolDisplayNamesMigration } from "../tools/tool-names.js";
+import { BuiltinAgentRegistry } from "./builtin-agents.js";
+
+const AIRISCODE_CONFIG_DIR = ".airiscode";
+const AGENT_CONFIG_DIR = "agents";
 
 /**
  * Manages subagent configurations stored as Markdown files with YAML frontmatter.
@@ -77,7 +72,7 @@ export class SubagentManager {
       try {
         listener();
       } catch (error) {
-        debugLogger.warn('Subagent change listener threw an error:', error);
+        debugLogger.warn("Subagent change listener threw an error:", error);
       }
     }
   }
@@ -89,14 +84,11 @@ export class SubagentManager {
    * @param options - Creation options
    * @throws SubagentError if creation fails
    */
-  async createSubagent(
-    config: SubagentConfig,
-    options: CreateSubagentOptions,
-  ): Promise<void> {
+  async createSubagent(config: SubagentConfig, options: CreateSubagentOptions): Promise<void> {
     this.validator.validateOrThrow(config);
 
     // Prevent creating session-level agents
-    if (options.level === 'session') {
+    if (options.level === "session") {
       throw new SubagentError(
         `Cannot create session-level subagent "${config.name}". Session agents are read-only and provided at runtime.`,
         SubagentErrorCode.INVALID_CONFIG,
@@ -105,8 +97,7 @@ export class SubagentManager {
     }
 
     // Determine file path
-    const filePath =
-      options.customPath || this.getSubagentPath(config.name, options.level);
+    const filePath = options.customPath || this.getSubagentPath(config.name, options.level);
 
     // Check if file already exists
     if (!options.overwrite) {
@@ -138,12 +129,12 @@ export class SubagentManager {
     const content = this.serializeSubagent(finalConfig);
 
     try {
-      await fs.writeFile(filePath, content, 'utf8');
+      await fs.writeFile(filePath, content, "utf8");
       // Refresh cache after successful creation
       await this.refreshCache();
     } catch (error) {
       throw new SubagentError(
-        `Failed to write subagent file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Failed to write subagent file: ${error instanceof Error ? error.message : "Unknown error"}`,
         SubagentErrorCode.FILE_ERROR,
         config.name,
       );
@@ -159,56 +150,44 @@ export class SubagentManager {
    * @param level - Optional level to limit search to specific level
    * @returns SubagentConfig or null if not found
    */
-  async loadSubagent(
-    name: string,
-    level?: SubagentLevel,
-  ): Promise<SubagentConfig | null> {
+  async loadSubagent(name: string, level?: SubagentLevel): Promise<SubagentConfig | null> {
     const lowerName = name.toLowerCase();
 
     if (level) {
       // Search only the specified level
-      if (level === 'builtin') {
+      if (level === "builtin") {
         return BuiltinAgentRegistry.getBuiltinAgent(name);
       }
 
-      if (level === 'session') {
-        const sessionSubagents = this.subagentsCache?.get('session') || [];
-        return (
-          sessionSubagents.find(
-            (agent) => agent.name.toLowerCase() === lowerName,
-          ) || null
-        );
+      if (level === "session") {
+        const sessionSubagents = this.subagentsCache?.get("session") || [];
+        return sessionSubagents.find((agent) => agent.name.toLowerCase() === lowerName) || null;
       }
 
       return this.findSubagentByNameAtLevel(name, level);
     }
 
     // Try session level first (highest priority for runtime)
-    const sessionSubagents = this.subagentsCache?.get('session') || [];
-    const sessionConfig = sessionSubagents.find(
-      (agent) => agent.name.toLowerCase() === lowerName,
-    );
+    const sessionSubagents = this.subagentsCache?.get("session") || [];
+    const sessionConfig = sessionSubagents.find((agent) => agent.name.toLowerCase() === lowerName);
     if (sessionConfig) {
       return sessionConfig;
     }
 
     // Try project level
-    const projectConfig = await this.findSubagentByNameAtLevel(name, 'project');
+    const projectConfig = await this.findSubagentByNameAtLevel(name, "project");
     if (projectConfig) {
       return projectConfig;
     }
 
     // Try user level
-    const userConfig = await this.findSubagentByNameAtLevel(name, 'user');
+    const userConfig = await this.findSubagentByNameAtLevel(name, "user");
     if (userConfig) {
       return userConfig;
     }
 
     // Try extension level
-    const extensionConfig = await this.findSubagentByNameAtLevel(
-      name,
-      'extension',
-    );
+    const extensionConfig = await this.findSubagentByNameAtLevel(name, "extension");
     if (extensionConfig) {
       return extensionConfig;
     }
@@ -231,11 +210,7 @@ export class SubagentManager {
   ): Promise<void> {
     const existing = await this.loadSubagent(name, level);
     if (!existing) {
-      throw new SubagentError(
-        `Subagent "${name}" not found`,
-        SubagentErrorCode.NOT_FOUND,
-        name,
-      );
+      throw new SubagentError(`Subagent "${name}" not found`, SubagentErrorCode.NOT_FOUND, name);
     }
 
     // Prevent updating built-in agents
@@ -248,7 +223,7 @@ export class SubagentManager {
     }
 
     // Prevent updating session-level agents
-    if (existing.level === 'session') {
+    if (existing.level === "session") {
       throw new SubagentError(
         `Cannot update session-level subagent "${name}"`,
         SubagentErrorCode.INVALID_CONFIG,
@@ -275,12 +250,12 @@ export class SubagentManager {
     const content = this.serializeSubagent(updatedConfig);
 
     try {
-      await fs.writeFile(existing.filePath, content, 'utf8');
+      await fs.writeFile(existing.filePath, content, "utf8");
       // Refresh cache after successful update
       await this.refreshCache();
     } catch (error) {
       throw new SubagentError(
-        `Failed to update subagent file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Failed to update subagent file: ${error instanceof Error ? error.message : "Unknown error"}`,
         SubagentErrorCode.FILE_ERROR,
         name,
       );
@@ -294,11 +269,7 @@ export class SubagentManager {
    * @param level - Specific level to delete from, or undefined to delete from both
    * @throws SubagentError if deletion fails
    */
-  async deleteSubagent(
-    name: string,
-    level?: SubagentLevel,
-    extensionName?: string,
-  ): Promise<void> {
+  async deleteSubagent(name: string, level?: SubagentLevel, extensionName?: string): Promise<void> {
     // Check if it's a built-in agent first
     if (BuiltinAgentRegistry.isBuiltinAgent(name)) {
       throw new SubagentError(
@@ -307,7 +278,7 @@ export class SubagentManager {
         name,
       );
     }
-    if (level === 'extension') {
+    if (level === "extension") {
       throw new SubagentError(
         `Cannot delete subagent "${name}" in extension "${extensionName}", If needed, you can directly uninstall extension.`,
         SubagentErrorCode.INVALID_CONFIG,
@@ -315,14 +286,12 @@ export class SubagentManager {
       );
     }
 
-    const levelsToCheck: SubagentLevel[] = level
-      ? [level]
-      : ['project', 'user'];
+    const levelsToCheck: SubagentLevel[] = level ? [level] : ["project", "user"];
     let deleted = false;
 
     for (const currentLevel of levelsToCheck) {
       // Skip builtin and session levels for deletion
-      if (currentLevel === 'builtin' || currentLevel === 'session') {
+      if (currentLevel === "builtin" || currentLevel === "session") {
         continue;
       }
 
@@ -339,11 +308,7 @@ export class SubagentManager {
     }
 
     if (!deleted) {
-      throw new SubagentError(
-        `Subagent "${name}" not found`,
-        SubagentErrorCode.NOT_FOUND,
-        name,
-      );
+      throw new SubagentError(`Subagent "${name}" not found`, SubagentErrorCode.NOT_FOUND, name);
     }
 
     // Refresh cache after successful deletion
@@ -356,27 +321,20 @@ export class SubagentManager {
    * @param options - Filtering and sorting options
    * @returns Array of subagent metadata
    */
-  async listSubagents(
-    options: ListSubagentsOptions = {},
-  ): Promise<SubagentConfig[]> {
+  async listSubagents(options: ListSubagentsOptions = {}): Promise<SubagentConfig[]> {
     const subagents: SubagentConfig[] = [];
     const seenNames = new Set<string>();
 
     // In SDK mode, only load session-level subagents
     if (this.config.getSdkMode()) {
-      const levelsToCheck: SubagentLevel[] = options.level
-        ? [options.level]
-        : ['session'];
+      const levelsToCheck: SubagentLevel[] = options.level ? [options.level] : ["session"];
 
       for (const level of levelsToCheck) {
         const levelSubagents = this.subagentsCache?.get(level) || [];
 
         for (const subagent of levelSubagents) {
           // Apply tool filter if specified
-          if (
-            options.hasTool &&
-            (!subagent.tools || !subagent.tools.includes(options.hasTool))
-          ) {
+          if (options.hasTool && (!subagent.tools || !subagent.tools.includes(options.hasTool))) {
             continue;
           }
 
@@ -391,7 +349,7 @@ export class SubagentManager {
     // Normal mode: load from project, user, and builtin levels
     const levelsToCheck: SubagentLevel[] = options.level
       ? [options.level]
-      : ['project', 'user', 'builtin', 'extension'];
+      : ["project", "user", "builtin", "extension"];
 
     // Check if we should use cache or force refresh
     const shouldUseCache = !options.force && this.subagentsCache !== null;
@@ -412,10 +370,7 @@ export class SubagentManager {
         }
 
         // Apply tool filter if specified
-        if (
-          options.hasTool &&
-          (!subagent.tools || !subagent.tools.includes(options.hasTool))
-        ) {
+        if (options.hasTool && (!subagent.tools || !subagent.tools.includes(options.hasTool))) {
           continue;
         }
 
@@ -430,10 +385,10 @@ export class SubagentManager {
         let comparison = 0;
 
         switch (options.sortBy) {
-          case 'name':
+          case "name":
             comparison = a.name.localeCompare(b.name);
             break;
-          case 'level': {
+          case "level": {
             // Project comes before user, user comes before builtin, session comes last
             const levelOrder = {
               project: 0,
@@ -443,8 +398,7 @@ export class SubagentManager {
               extension: 4,
             };
             comparison =
-              levelOrder[a.level as SubagentLevel] -
-              levelOrder[b.level as SubagentLevel];
+              levelOrder[a.level as SubagentLevel] - levelOrder[b.level as SubagentLevel];
             break;
           }
           default:
@@ -452,7 +406,7 @@ export class SubagentManager {
             break;
         }
 
-        return options.sortOrder === 'desc' ? -comparison : comparison;
+        return options.sortOrder === "desc" ? -comparison : comparison;
       });
     }
 
@@ -472,11 +426,11 @@ export class SubagentManager {
 
     const sessionSubagents = subagents.map((config) => ({
       ...config,
-      level: 'session' as SubagentLevel,
+      level: "session" as SubagentLevel,
       filePath: `<session:${config.name}>`,
     }));
 
-    this.subagentsCache.set('session', sessionSubagents);
+    this.subagentsCache.set("session", sessionSubagents);
     this.notifyChangeListeners();
   }
 
@@ -489,7 +443,7 @@ export class SubagentManager {
   async refreshCache(): Promise<void> {
     const subagentsCache = new Map();
 
-    const levels: SubagentLevel[] = ['project', 'user', 'builtin', 'extension'];
+    const levels: SubagentLevel[] = ["project", "user", "builtin", "extension"];
 
     for (const level of levels) {
       const levelSubagents = await this.listSubagentsAtLevel(level);
@@ -497,9 +451,9 @@ export class SubagentManager {
     }
 
     // Preserve session subagents from old cache
-    const sessionSubagents = this.subagentsCache?.get('session');
+    const sessionSubagents = this.subagentsCache?.get("session");
     if (sessionSubagents) {
-      subagentsCache.set('session', sessionSubagents);
+      subagentsCache.set("session", sessionSubagents);
     }
 
     this.subagentsCache = subagentsCache;
@@ -512,10 +466,7 @@ export class SubagentManager {
    * @param name - Name of the subagent to find
    * @returns SubagentConfig or null if not found
    */
-  async findSubagentByName(
-    name: string,
-    level?: SubagentLevel,
-  ): Promise<SubagentConfig | null> {
+  async findSubagentByName(name: string, level?: SubagentLevel): Promise<SubagentConfig | null> {
     const config = await this.loadSubagent(name, level);
     if (!config) {
       return null;
@@ -531,17 +482,14 @@ export class SubagentManager {
    * @returns SubagentConfig
    * @throws SubagentError if parsing fails
    */
-  async parseSubagentFile(
-    filePath: string,
-    level: SubagentLevel,
-  ): Promise<SubagentConfig> {
+  async parseSubagentFile(filePath: string, level: SubagentLevel): Promise<SubagentConfig> {
     let content: string;
 
     try {
-      content = await fs.readFile(filePath, 'utf8');
+      content = await fs.readFile(filePath, "utf8");
     } catch (error) {
       throw new SubagentError(
-        `Failed to read subagent file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Failed to read subagent file: ${error instanceof Error ? error.message : "Unknown error"}`,
         SubagentErrorCode.FILE_ERROR,
       );
     }
@@ -557,11 +505,7 @@ export class SubagentManager {
    * @returns SubagentConfig
    * @throws SubagentError if parsing fails
    */
-  parseSubagentContent(
-    content: string,
-    filePath: string,
-    level: SubagentLevel,
-  ): SubagentConfig {
+  parseSubagentContent(content: string, filePath: string, level: SubagentLevel): SubagentConfig {
     return parseSubagentContent(content, filePath, level, this.validator);
   }
 
@@ -579,19 +523,19 @@ export class SubagentManager {
     };
 
     if (config.tools && config.tools.length > 0) {
-      frontmatter['tools'] = config.tools;
+      frontmatter["tools"] = config.tools;
     }
 
-    if (config.model && config.model !== 'inherit') {
-      frontmatter['model'] = config.model;
+    if (config.model && config.model !== "inherit") {
+      frontmatter["model"] = config.model;
     }
 
     if (config.runConfig) {
-      frontmatter['runConfig'] = config.runConfig;
+      frontmatter["runConfig"] = config.runConfig;
     }
 
-    if (config.color && config.color !== 'auto') {
-      frontmatter['color'] = config.color;
+    if (config.color && config.color !== "auto") {
+      frontmatter["color"] = config.color;
     }
 
     // Serialize to YAML
@@ -625,10 +569,7 @@ export class SubagentManager {
       // When the model selector specifies a different provider, build a
       // per-agent Config with a dedicated ContentGenerator so the subagent
       // talks to the right API without affecting the parent process.
-      const agentContext = await this.maybeOverrideContentGenerator(
-        config,
-        runtimeContext,
-      );
+      const agentContext = await this.maybeOverrideContentGenerator(config, runtimeContext);
 
       return await AgentHeadless.create(
         config.name,
@@ -667,8 +608,7 @@ export class SubagentManager {
       return base;
     }
 
-    const authType =
-      selection.authType ?? base.getContentGeneratorConfig().authType;
+    const authType = selection.authType ?? base.getContentGeneratorConfig().authType;
     const authOverrides = {
       authType: authType as string,
     };
@@ -679,18 +619,13 @@ export class SubagentManager {
       authOverrides,
     );
 
-    const agentGenerator = await createContentGenerator(
-      agentGeneratorConfig,
-      base,
-    );
+    const agentGenerator = await createContentGenerator(agentGeneratorConfig, base);
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const override = Object.create(base) as any;
     override.getContentGenerator = (): ContentGenerator => agentGenerator;
-    override.getContentGeneratorConfig = (): ContentGeneratorConfig =>
-      agentGeneratorConfig;
-    override.getAuthType = (): AuthType | undefined =>
-      agentGeneratorConfig.authType;
+    override.getContentGeneratorConfig = (): ContentGeneratorConfig => agentGeneratorConfig;
+    override.getAuthType = (): AuthType | undefined => agentGeneratorConfig.authType;
     override.getModel = (): string => agentGeneratorConfig.model;
 
     debugLogger.info(
@@ -756,9 +691,7 @@ export class SubagentManager {
     const result: string[] = [];
     for (const toolIdentifier of tools) {
       // First, try to find an exact match by tool name (highest priority)
-      const exactNameMatch = allTools.find(
-        (tool) => tool.name === toolIdentifier,
-      );
+      const exactNameMatch = allTools.find((tool) => tool.name === toolIdentifier);
       if (exactNameMatch) {
         result.push(exactNameMatch.name);
         continue;
@@ -769,9 +702,9 @@ export class SubagentManager {
         (tool) =>
           tool.displayName === toolIdentifier ||
           tool.displayName ===
-            (ToolDisplayNamesMigration[
-              toolIdentifier as keyof typeof ToolDisplayNamesMigration
-            ] as string | undefined),
+            (ToolDisplayNamesMigration[toolIdentifier as keyof typeof ToolDisplayNamesMigration] as
+              | string
+              | undefined),
       );
       if (displayNameMatch) {
         result.push(displayNameMatch.name);
@@ -781,9 +714,7 @@ export class SubagentManager {
       // If no match found, preserve the original identifier as-is
       // This allows for tools that might not be registered yet or custom tools
       result.push(toolIdentifier);
-      debugLogger.warn(
-        `Tool "${toolIdentifier}" not found in tool registry, preserving as-is`,
-      );
+      debugLogger.warn(`Tool "${toolIdentifier}" not found in tool registry, preserving as-is`);
     }
 
     return result;
@@ -797,16 +728,11 @@ export class SubagentManager {
    * @param updates - Partial updates to apply
    * @returns New configuration with updates applied
    */
-  mergeConfigurations(
-    base: SubagentConfig,
-    updates: Partial<SubagentConfig>,
-  ): SubagentConfig {
+  mergeConfigurations(base: SubagentConfig, updates: Partial<SubagentConfig>): SubagentConfig {
     return {
       ...base,
       ...updates,
-      runConfig: updates.runConfig
-        ? { ...base.runConfig, ...updates.runConfig }
-        : base.runConfig,
+      runConfig: updates.runConfig ? { ...base.runConfig, ...updates.runConfig } : base.runConfig,
     };
   }
 
@@ -818,21 +744,17 @@ export class SubagentManager {
    * @returns Absolute file path
    */
   getSubagentPath(name: string, level: SubagentLevel): string {
-    if (level === 'builtin') {
+    if (level === "builtin") {
       return `<builtin:${name}>`;
     }
 
-    if (level === 'session') {
+    if (level === "session") {
       return `<session:${name}>`;
     }
 
     const baseDir =
-      level === 'project'
-        ? path.join(
-            this.config.getProjectRoot(),
-            AIRISCODE_CONFIG_DIR,
-            AGENT_CONFIG_DIR,
-          )
+      level === "project"
+        ? path.join(this.config.getProjectRoot(), AIRISCODE_CONFIG_DIR, AGENT_CONFIG_DIR)
         : path.join(os.homedir(), AIRISCODE_CONFIG_DIR, AGENT_CONFIG_DIR);
 
     return path.join(baseDir, `${name}.md`);
@@ -845,15 +767,13 @@ export class SubagentManager {
    * @param level - Storage level to scan
    * @returns Array of subagent configurations
    */
-  private async listSubagentsAtLevel(
-    level: SubagentLevel,
-  ): Promise<SubagentConfig[]> {
+  private async listSubagentsAtLevel(level: SubagentLevel): Promise<SubagentConfig[]> {
     // Handle built-in agents
-    if (level === 'builtin') {
+    if (level === "builtin") {
       return BuiltinAgentRegistry.getBuiltinAgents();
     }
 
-    if (level === 'extension') {
+    if (level === "extension") {
       const extensions = this.config.getActiveExtensions();
       return extensions.flatMap((extension) => extension.agents || []);
     }
@@ -864,11 +784,11 @@ export class SubagentManager {
 
     // If project level is requested but project root is same as home directory,
     // return empty array to avoid conflicts between project and global agents
-    if (level === 'project' && isHomeDirectory) {
+    if (level === "project" && isHomeDirectory) {
       return [];
     }
 
-    let baseDir = level === 'project' ? projectRoot : homeDir;
+    let baseDir = level === "project" ? projectRoot : homeDir;
     baseDir = path.join(baseDir, AIRISCODE_CONFIG_DIR, AGENT_CONFIG_DIR);
 
     try {
@@ -876,7 +796,7 @@ export class SubagentManager {
       const subagents: SubagentConfig[] = [];
 
       for (const file of files) {
-        if (!file.endsWith('.md')) continue;
+        if (!file.endsWith(".md")) continue;
 
         const filePath = path.join(baseDir, file);
 
@@ -942,24 +862,22 @@ export class SubagentManager {
   }
 }
 
-export async function loadSubagentFromDir(
-  baseDir: string,
-): Promise<SubagentConfig[]> {
+export async function loadSubagentFromDir(baseDir: string): Promise<SubagentConfig[]> {
   try {
     const files = await fs.readdir(baseDir);
     const subagents: SubagentConfig[] = [];
 
     for (const file of files) {
-      if (!file.endsWith('.md')) continue;
+      if (!file.endsWith(".md")) continue;
 
       const filePath = path.join(baseDir, file);
 
       try {
-        const content = await fs.readFile(filePath, 'utf8');
+        const content = await fs.readFile(filePath, "utf8");
         const config = parseSubagentContent(
           content,
           filePath,
-          'extension',
+          "extension",
           new SubagentValidator(),
         );
         subagents.push(config);
@@ -990,7 +908,7 @@ function parseSubagentContent(
     const match = normalizedContent.match(frontmatterRegex);
 
     if (!match) {
-      throw new Error('Invalid format: missing YAML frontmatter');
+      throw new Error("Invalid format: missing YAML frontmatter");
     }
 
     const [, frontmatterYaml, systemPrompt] = match;
@@ -999,14 +917,14 @@ function parseSubagentContent(
     const frontmatter = parseYaml(frontmatterYaml) as Record<string, unknown>;
 
     // Extract required fields and convert to strings
-    const nameRaw = frontmatter['name'];
-    const descriptionRaw = frontmatter['description'];
+    const nameRaw = frontmatter["name"];
+    const descriptionRaw = frontmatter["description"];
 
-    if (nameRaw == null || nameRaw === '') {
+    if (nameRaw == null || nameRaw === "") {
       throw new Error('Missing "name" in frontmatter');
     }
 
-    if (descriptionRaw == null || descriptionRaw === '') {
+    if (descriptionRaw == null || descriptionRaw === "") {
       throw new Error('Missing "description" in frontmatter');
     }
 
@@ -1015,20 +933,16 @@ function parseSubagentContent(
     const description = String(descriptionRaw);
 
     // Extract optional fields
-    const tools = frontmatter['tools'] as string[] | undefined;
-    const modelRaw = frontmatter['model'];
-    const legacyModelConfig = frontmatter['modelConfig'] as
-      | Record<string, unknown>
-      | undefined;
-    const runConfig = frontmatter['runConfig'] as
-      | Record<string, unknown>
-      | undefined;
-    const color = frontmatter['color'] as string | undefined;
+    const tools = frontmatter["tools"] as string[] | undefined;
+    const modelRaw = frontmatter["model"];
+    const legacyModelConfig = frontmatter["modelConfig"] as Record<string, unknown> | undefined;
+    const runConfig = frontmatter["runConfig"] as Record<string, unknown> | undefined;
+    const color = frontmatter["color"] as string | undefined;
     const model =
-      modelRaw != null && modelRaw !== ''
+      modelRaw != null && modelRaw !== ""
         ? String(modelRaw)
-        : typeof legacyModelConfig?.['model'] === 'string'
-          ? legacyModelConfig['model']
+        : typeof legacyModelConfig?.["model"] === "string"
+          ? legacyModelConfig["model"]
           : undefined;
 
     const config: SubagentConfig = {
@@ -1046,13 +960,13 @@ function parseSubagentContent(
     // Validate the parsed configuration
     const validation = validator.validateConfig(config);
     if (!validation.isValid) {
-      throw new Error(`Validation failed: ${validation.errors.join(', ')}`);
+      throw new Error(`Validation failed: ${validation.errors.join(", ")}`);
     }
 
     return config;
   } catch (error) {
     throw new SubagentError(
-      `Failed to parse subagent file: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      `Failed to parse subagent file: ${error instanceof Error ? error.message : "Unknown error"}`,
       SubagentErrorCode.INVALID_CONFIG,
     );
   }
diff --git a/packages/airiscode-core/src/subagents/types.ts b/packages/airiscode-core/src/subagents/types.ts
index a9574eb1a..d98368a05 100644
--- a/packages/airiscode-core/src/subagents/types.ts
+++ b/packages/airiscode-core/src/subagents/types.ts
@@ -13,10 +13,10 @@
 
 import type {
   ModelConfig,
-  RunConfig,
   PromptConfig,
+  RunConfig,
   ToolConfig,
-} from '../agents/runtime/agent-types.js';
+} from "../agents/runtime/agent-types.js";
 
 /**
  * Represents the storage level for a subagent configuration.
@@ -26,12 +26,7 @@ import type {
  * - 'extension': Provided by an installed extension
  * - 'builtin': Built-in agents embedded in the codebase, always available (lowest priority)
  */
-export type SubagentLevel =
-  | 'session'
-  | 'project'
-  | 'user'
-  | 'extension'
-  | 'builtin';
+export type SubagentLevel = "session" | "project" | "user" | "extension" | "builtin";
 
 /**
  * Core configuration for a subagent as stored in Markdown files.
@@ -138,10 +133,10 @@ export interface ListSubagentsOptions {
   hasTool?: string;
 
   /** Sort order for results */
-  sortBy?: 'name' | 'lastModified' | 'level';
+  sortBy?: "name" | "lastModified" | "level";
 
   /** Sort direction */
-  sortOrder?: 'asc' | 'desc';
+  sortOrder?: "asc" | "desc";
 
   /** Force refresh from disk, bypassing cache. Defaults to false. */
   force?: boolean;
@@ -171,7 +166,7 @@ export class SubagentError extends Error {
     readonly subagentName?: string,
   ) {
     super(message);
-    this.name = 'SubagentError';
+    this.name = "SubagentError";
   }
 }
 
@@ -179,14 +174,13 @@ export class SubagentError extends Error {
  * Error codes for subagent operations.
  */
 export const SubagentErrorCode = {
-  NOT_FOUND: 'NOT_FOUND',
-  ALREADY_EXISTS: 'ALREADY_EXISTS',
-  INVALID_CONFIG: 'INVALID_CONFIG',
-  INVALID_NAME: 'INVALID_NAME',
-  FILE_ERROR: 'FILE_ERROR',
-  VALIDATION_ERROR: 'VALIDATION_ERROR',
-  TOOL_NOT_FOUND: 'TOOL_NOT_FOUND',
+  NOT_FOUND: "NOT_FOUND",
+  ALREADY_EXISTS: "ALREADY_EXISTS",
+  INVALID_CONFIG: "INVALID_CONFIG",
+  INVALID_NAME: "INVALID_NAME",
+  FILE_ERROR: "FILE_ERROR",
+  VALIDATION_ERROR: "VALIDATION_ERROR",
+  TOOL_NOT_FOUND: "TOOL_NOT_FOUND",
 } as const;
 
-export type SubagentErrorCode =
-  (typeof SubagentErrorCode)[keyof typeof SubagentErrorCode];
+export type SubagentErrorCode = (typeof SubagentErrorCode)[keyof typeof SubagentErrorCode];
diff --git a/packages/airiscode-core/src/subagents/validation.ts b/packages/airiscode-core/src/subagents/validation.ts
index 192c53ade..23d13f495 100644
--- a/packages/airiscode-core/src/subagents/validation.ts
+++ b/packages/airiscode-core/src/subagents/validation.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { SubagentError, SubagentErrorCode } from './types.js';
-import type { SubagentConfig, ValidationResult } from './types.js';
-import type { RunConfig } from '../agents/runtime/agent-types.js';
-import { parseSubagentModelSelection } from './model-selection.js';
+import type { RunConfig } from "../agents/runtime/agent-types.js";
+import { parseSubagentModelSelection } from "./model-selection.js";
+import type { SubagentConfig, ValidationResult } from "./types.js";
+import { SubagentError, SubagentErrorCode } from "./types.js";
 
 /**
  * Validates subagent configurations to ensure they are well-formed
@@ -32,10 +32,10 @@ export class SubagentValidator {
 
     // Validate description
     if (!config.description || config.description.trim().length === 0) {
-      errors.push('Description is required and cannot be empty');
+      errors.push("Description is required and cannot be empty");
     } else if (config.description.length > 1000) {
       warnings.push(
-        'Description is quite long (>1,000 chars), consider shortening for better readability',
+        "Description is quite long (>1,000 chars), consider shortening for better readability",
       );
     }
 
@@ -92,7 +92,7 @@ export class SubagentValidator {
     const warnings: string[] = [];
 
     if (!name || name.trim().length === 0) {
-      errors.push('Name is required and cannot be empty');
+      errors.push("Name is required and cannot be empty");
       return { isValid: false, errors, warnings };
     }
 
@@ -100,53 +100,41 @@ export class SubagentValidator {
 
     // Check length constraints
     if (trimmedName.length < 2) {
-      errors.push('Name must be at least 2 characters long');
+      errors.push("Name must be at least 2 characters long");
     }
 
     if (trimmedName.length > 50) {
-      errors.push('Name must be 50 characters or less');
+      errors.push("Name must be 50 characters or less");
     }
 
     // Check valid characters (alphanumeric, hyphens, underscores)
     const validNameRegex = /^[a-zA-Z0-9_-]+$/;
     if (!validNameRegex.test(trimmedName)) {
-      errors.push(
-        'Name can only contain letters, numbers, hyphens, and underscores',
-      );
+      errors.push("Name can only contain letters, numbers, hyphens, and underscores");
     }
 
     // Check that it doesn't start or end with special characters
-    if (trimmedName.startsWith('-') || trimmedName.startsWith('_')) {
-      errors.push('Name cannot start with a hyphen or underscore');
+    if (trimmedName.startsWith("-") || trimmedName.startsWith("_")) {
+      errors.push("Name cannot start with a hyphen or underscore");
     }
 
-    if (trimmedName.endsWith('-') || trimmedName.endsWith('_')) {
-      errors.push('Name cannot end with a hyphen or underscore');
+    if (trimmedName.endsWith("-") || trimmedName.endsWith("_")) {
+      errors.push("Name cannot end with a hyphen or underscore");
     }
 
     // Check for reserved names
-    const reservedNames = [
-      'self',
-      'system',
-      'user',
-      'model',
-      'tool',
-      'config',
-      'default',
-    ];
+    const reservedNames = ["self", "system", "user", "model", "tool", "config", "default"];
     if (reservedNames.includes(trimmedName.toLowerCase())) {
       errors.push(`"${trimmedName}" is a reserved name and cannot be used`);
     }
 
     // Warnings for naming conventions
     if (trimmedName !== trimmedName.toLowerCase()) {
-      warnings.push('Consider using lowercase names for consistency');
+      warnings.push("Consider using lowercase names for consistency");
     }
 
-    if (trimmedName.includes('_') && trimmedName.includes('-')) {
-      warnings.push(
-        'Consider using either hyphens or underscores consistently, not both',
-      );
+    if (trimmedName.includes("_") && trimmedName.includes("-")) {
+      warnings.push("Consider using either hyphens or underscores consistently, not both");
     }
 
     return {
@@ -167,7 +155,7 @@ export class SubagentValidator {
     const warnings: string[] = [];
 
     if (!prompt || prompt.trim().length === 0) {
-      errors.push('System prompt is required and cannot be empty');
+      errors.push("System prompt is required and cannot be empty");
       return { isValid: false, errors, warnings };
     }
 
@@ -175,14 +163,12 @@ export class SubagentValidator {
 
     // Check minimum length for meaningful prompts
     if (trimmedPrompt.length < 10) {
-      errors.push('System prompt must be at least 10 characters long');
+      errors.push("System prompt must be at least 10 characters long");
     }
 
     // Warn for very long prompts
     if (trimmedPrompt.length > 10000) {
-      warnings.push(
-        'System prompt is quite long (>10,000 characters), consider shortening',
-      );
+      warnings.push("System prompt is quite long (>10,000 characters), consider shortening");
     }
 
     return {
@@ -203,32 +189,30 @@ export class SubagentValidator {
     const warnings: string[] = [];
 
     if (!Array.isArray(tools)) {
-      errors.push('Tools must be an array of strings');
+      errors.push("Tools must be an array of strings");
       return { isValid: false, errors, warnings };
     }
 
     if (tools.length === 0) {
-      warnings.push(
-        'Empty tools array - subagent will inherit all available tools',
-      );
+      warnings.push("Empty tools array - subagent will inherit all available tools");
       return { isValid: true, errors, warnings };
     }
 
     // Check for duplicates
     const uniqueTools = new Set(tools);
     if (uniqueTools.size !== tools.length) {
-      warnings.push('Duplicate tool names found in tools array');
+      warnings.push("Duplicate tool names found in tools array");
     }
 
     // Validate each tool name
     for (const tool of tools) {
-      if (typeof tool !== 'string') {
+      if (typeof tool !== "string") {
         errors.push(`Tool name must be a string, got: ${typeof tool}`);
         continue;
       }
 
       if (tool.trim().length === 0) {
-        errors.push('Tool name cannot be empty');
+        errors.push("Tool name cannot be empty");
         continue;
       }
     }
@@ -250,8 +234,8 @@ export class SubagentValidator {
     const errors: string[] = [];
     const warnings: string[] = [];
 
-    if (typeof model !== 'string' || model.trim().length === 0) {
-      errors.push('Model must be a non-empty string');
+    if (typeof model !== "string" || model.trim().length === 0) {
+      errors.push("Model must be a non-empty string");
       return {
         isValid: false,
         errors,
@@ -262,10 +246,10 @@ export class SubagentValidator {
     try {
       parseSubagentModelSelection(model);
     } catch (error) {
-      errors.push(error instanceof Error ? error.message : 'Invalid model');
+      errors.push(error instanceof Error ? error.message : "Invalid model");
     }
 
-    if (model.trim() === 'inherit') {
+    if (model.trim() === "inherit") {
       warnings.push(
         'Explicit "inherit" is optional because omitting the model uses the main conversation model',
       );
@@ -289,28 +273,24 @@ export class SubagentValidator {
     const warnings: string[] = [];
 
     if (runConfig.max_time_minutes !== undefined) {
-      if (typeof runConfig.max_time_minutes !== 'number') {
-        errors.push('max_time_minutes must be a number');
+      if (typeof runConfig.max_time_minutes !== "number") {
+        errors.push("max_time_minutes must be a number");
       } else if (runConfig.max_time_minutes <= 0) {
-        errors.push('max_time_minutes must be greater than 0');
+        errors.push("max_time_minutes must be greater than 0");
       } else if (runConfig.max_time_minutes > 60) {
-        warnings.push(
-          'Very long execution time (>60 minutes) may cause resource issues',
-        );
+        warnings.push("Very long execution time (>60 minutes) may cause resource issues");
       }
     }
 
     if (runConfig.max_turns !== undefined) {
-      if (typeof runConfig.max_turns !== 'number') {
-        errors.push('max_turns must be a number');
+      if (typeof runConfig.max_turns !== "number") {
+        errors.push("max_turns must be a number");
       } else if (runConfig.max_turns <= 0) {
-        errors.push('max_turns must be greater than 0');
+        errors.push("max_turns must be greater than 0");
       } else if (!Number.isInteger(runConfig.max_turns)) {
-        errors.push('max_turns must be an integer');
+        errors.push("max_turns must be an integer");
       } else if (runConfig.max_turns > 100) {
-        warnings.push(
-          'Very high turn limit (>100) may cause long execution times',
-        );
+        warnings.push("Very high turn limit (>100) may cause long execution times");
       }
     }
 
@@ -332,7 +312,7 @@ export class SubagentValidator {
     const result = this.validateConfig(config);
     if (!result.isValid) {
       throw new SubagentError(
-        `Validation failed: ${result.errors.join(', ')}`,
+        `Validation failed: ${result.errors.join(", ")}`,
         SubagentErrorCode.VALIDATION_ERROR,
         subagentName || config.name,
       );
diff --git a/packages/airiscode-core/src/telemetry/config.ts b/packages/airiscode-core/src/telemetry/config.ts
index f1037e742..0733db2b2 100644
--- a/packages/airiscode-core/src/telemetry/config.ts
+++ b/packages/airiscode-core/src/telemetry/config.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TelemetrySettings } from '../config/config.js';
-import { FatalConfigError } from '../utils/errors.js';
-import { TelemetryTarget } from './index.js';
+import type { TelemetrySettings } from "../config/config.js";
+import { FatalConfigError } from "../utils/errors.js";
+import { TelemetryTarget } from "./index.js";
 
 /**
  * Parse a boolean environment flag. Accepts 'true'/'1' as true.
  */
-export function parseBooleanEnvFlag(
-  value: string | undefined,
-): boolean | undefined {
+export function parseBooleanEnvFlag(value: string | undefined): boolean | undefined {
   if (value === undefined) return undefined;
-  return value === 'true' || value === '1';
+  return value === "true" || value === "1";
 }
 
 /**
@@ -25,10 +23,10 @@ export function parseTelemetryTargetValue(
   value: string | TelemetryTarget | undefined,
 ): TelemetryTarget | undefined {
   if (value === undefined) return undefined;
-  if (value === TelemetryTarget.LOCAL || value === 'local') {
+  if (value === TelemetryTarget.LOCAL || value === "local") {
     return TelemetryTarget.LOCAL;
   }
-  if (value === TelemetryTarget.GCP || value === 'gcp') {
+  if (value === TelemetryTarget.GCP || value === "gcp") {
     return TelemetryTarget.GCP;
   }
   return undefined;
@@ -56,55 +54,45 @@ export async function resolveTelemetrySettings(options: {
   const settings = options.settings ?? {};
 
   const enabled =
-    argv.telemetry ??
-    parseBooleanEnvFlag(env['QWEN_TELEMETRY_ENABLED']) ??
-    settings.enabled;
+    argv.telemetry ?? parseBooleanEnvFlag(env["QWEN_TELEMETRY_ENABLED"]) ?? settings.enabled;
 
   const rawTarget =
     (argv.telemetryTarget as string | TelemetryTarget | undefined) ??
-    env['QWEN_TELEMETRY_TARGET'] ??
+    env["QWEN_TELEMETRY_TARGET"] ??
     (settings.target as string | TelemetryTarget | undefined);
   const target = parseTelemetryTargetValue(rawTarget);
   if (rawTarget !== undefined && target === undefined) {
     throw new FatalConfigError(
-      `Invalid telemetry target: ${String(
-        rawTarget,
-      )}. Valid values are: local, gcp`,
+      `Invalid telemetry target: ${String(rawTarget)}. Valid values are: local, gcp`,
     );
   }
 
   const otlpEndpoint =
     argv.telemetryOtlpEndpoint ??
-    env['QWEN_TELEMETRY_OTLP_ENDPOINT'] ??
-    env['OTEL_EXPORTER_OTLP_ENDPOINT'] ??
+    env["QWEN_TELEMETRY_OTLP_ENDPOINT"] ??
+    env["OTEL_EXPORTER_OTLP_ENDPOINT"] ??
     settings.otlpEndpoint;
 
   const rawProtocol =
     (argv.telemetryOtlpProtocol as string | undefined) ??
-    env['QWEN_TELEMETRY_OTLP_PROTOCOL'] ??
+    env["QWEN_TELEMETRY_OTLP_PROTOCOL"] ??
     settings.otlpProtocol;
-  const otlpProtocol = (['grpc', 'http'] as const).find(
-    (p) => p === rawProtocol,
-  );
+  const otlpProtocol = (["grpc", "http"] as const).find((p) => p === rawProtocol);
   if (rawProtocol !== undefined && otlpProtocol === undefined) {
     throw new FatalConfigError(
-      `Invalid telemetry OTLP protocol: ${String(
-        rawProtocol,
-      )}. Valid values are: grpc, http`,
+      `Invalid telemetry OTLP protocol: ${String(rawProtocol)}. Valid values are: grpc, http`,
     );
   }
 
   const logPrompts =
     argv.telemetryLogPrompts ??
-    parseBooleanEnvFlag(env['QWEN_TELEMETRY_LOG_PROMPTS']) ??
+    parseBooleanEnvFlag(env["QWEN_TELEMETRY_LOG_PROMPTS"]) ??
     settings.logPrompts;
 
-  const outfile =
-    argv.telemetryOutfile ?? env['QWEN_TELEMETRY_OUTFILE'] ?? settings.outfile;
+  const outfile = argv.telemetryOutfile ?? env["QWEN_TELEMETRY_OUTFILE"] ?? settings.outfile;
 
   const useCollector =
-    parseBooleanEnvFlag(env['QWEN_TELEMETRY_USE_COLLECTOR']) ??
-    settings.useCollector;
+    parseBooleanEnvFlag(env["QWEN_TELEMETRY_USE_COLLECTOR"]) ?? settings.useCollector;
 
   return {
     enabled,
diff --git a/packages/airiscode-core/src/telemetry/constants.ts b/packages/airiscode-core/src/telemetry/constants.ts
index 6243ea021..c24a38684 100644
--- a/packages/airiscode-core/src/telemetry/constants.ts
+++ b/packages/airiscode-core/src/telemetry/constants.ts
@@ -4,52 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const SERVICE_NAME = 'airiscode';
+export const SERVICE_NAME = "airiscode";
 
-export const EVENT_USER_PROMPT = 'airiscode.user_prompt';
-export const EVENT_USER_RETRY = 'airiscode.user_retry';
-export const EVENT_TOOL_CALL = 'airiscode.tool_call';
-export const EVENT_API_REQUEST = 'airiscode.api_request';
-export const EVENT_API_ERROR = 'airiscode.api_error';
-export const EVENT_API_CANCEL = 'airiscode.api_cancel';
-export const EVENT_API_RESPONSE = 'airiscode.api_response';
-export const EVENT_CLI_CONFIG = 'airiscode.config';
-export const EVENT_EXTENSION_DISABLE = 'airiscode.extension_disable';
-export const EVENT_EXTENSION_ENABLE = 'airiscode.extension_enable';
-export const EVENT_EXTENSION_INSTALL = 'airiscode.extension_install';
-export const EVENT_EXTENSION_UNINSTALL = 'airiscode.extension_uninstall';
-export const EVENT_EXTENSION_UPDATE = 'airiscode.extension_update';
-export const EVENT_FLASH_FALLBACK = 'airiscode.flash_fallback';
-export const EVENT_RIPGREP_FALLBACK = 'airiscode.ripgrep_fallback';
-export const EVENT_NEXT_SPEAKER_CHECK = 'airiscode.next_speaker_check';
-export const EVENT_SLASH_COMMAND = 'airiscode.slash_command';
-export const EVENT_IDE_CONNECTION = 'airiscode.ide_connection';
-export const EVENT_CHAT_COMPRESSION = 'airiscode.chat_compression';
-export const EVENT_INVALID_CHUNK = 'airiscode.chat.invalid_chunk';
-export const EVENT_CONTENT_RETRY = 'airiscode.chat.content_retry';
-export const EVENT_CONTENT_RETRY_FAILURE =
-  'airiscode.chat.content_retry_failure';
-export const EVENT_CONVERSATION_FINISHED = 'airiscode.conversation_finished';
-export const EVENT_MALFORMED_JSON_RESPONSE =
-  'airiscode.malformed_json_response';
-export const EVENT_FILE_OPERATION = 'airiscode.file_operation';
-export const EVENT_MODEL_SLASH_COMMAND = 'airiscode.slash_command.model';
-export const EVENT_SUBAGENT_EXECUTION = 'airiscode.subagent_execution';
-export const EVENT_SKILL_LAUNCH = 'airiscode.skill_launch';
-export const EVENT_AUTH = 'airiscode.auth';
-export const EVENT_USER_FEEDBACK = 'airiscode.user_feedback';
+export const EVENT_USER_PROMPT = "airiscode.user_prompt";
+export const EVENT_USER_RETRY = "airiscode.user_retry";
+export const EVENT_TOOL_CALL = "airiscode.tool_call";
+export const EVENT_API_REQUEST = "airiscode.api_request";
+export const EVENT_API_ERROR = "airiscode.api_error";
+export const EVENT_API_CANCEL = "airiscode.api_cancel";
+export const EVENT_API_RESPONSE = "airiscode.api_response";
+export const EVENT_CLI_CONFIG = "airiscode.config";
+export const EVENT_EXTENSION_DISABLE = "airiscode.extension_disable";
+export const EVENT_EXTENSION_ENABLE = "airiscode.extension_enable";
+export const EVENT_EXTENSION_INSTALL = "airiscode.extension_install";
+export const EVENT_EXTENSION_UNINSTALL = "airiscode.extension_uninstall";
+export const EVENT_EXTENSION_UPDATE = "airiscode.extension_update";
+export const EVENT_FLASH_FALLBACK = "airiscode.flash_fallback";
+export const EVENT_RIPGREP_FALLBACK = "airiscode.ripgrep_fallback";
+export const EVENT_NEXT_SPEAKER_CHECK = "airiscode.next_speaker_check";
+export const EVENT_SLASH_COMMAND = "airiscode.slash_command";
+export const EVENT_IDE_CONNECTION = "airiscode.ide_connection";
+export const EVENT_CHAT_COMPRESSION = "airiscode.chat_compression";
+export const EVENT_INVALID_CHUNK = "airiscode.chat.invalid_chunk";
+export const EVENT_CONTENT_RETRY = "airiscode.chat.content_retry";
+export const EVENT_CONTENT_RETRY_FAILURE = "airiscode.chat.content_retry_failure";
+export const EVENT_CONVERSATION_FINISHED = "airiscode.conversation_finished";
+export const EVENT_MALFORMED_JSON_RESPONSE = "airiscode.malformed_json_response";
+export const EVENT_FILE_OPERATION = "airiscode.file_operation";
+export const EVENT_MODEL_SLASH_COMMAND = "airiscode.slash_command.model";
+export const EVENT_SUBAGENT_EXECUTION = "airiscode.subagent_execution";
+export const EVENT_SKILL_LAUNCH = "airiscode.skill_launch";
+export const EVENT_AUTH = "airiscode.auth";
+export const EVENT_USER_FEEDBACK = "airiscode.user_feedback";
 
 // Prompt Suggestion Events
-export const EVENT_PROMPT_SUGGESTION = 'airiscode.prompt_suggestion';
-export const EVENT_SPECULATION = 'airiscode.speculation';
+export const EVENT_PROMPT_SUGGESTION = "airiscode.prompt_suggestion";
+export const EVENT_SPECULATION = "airiscode.speculation";
 
 // Arena Events
-export const EVENT_ARENA_SESSION_STARTED = 'airiscode.arena_session_started';
-export const EVENT_ARENA_AGENT_COMPLETED = 'airiscode.arena_agent_completed';
-export const EVENT_ARENA_SESSION_ENDED = 'airiscode.arena_session_ended';
+export const EVENT_ARENA_SESSION_STARTED = "airiscode.arena_session_started";
+export const EVENT_ARENA_AGENT_COMPLETED = "airiscode.arena_agent_completed";
+export const EVENT_ARENA_SESSION_ENDED = "airiscode.arena_session_ended";
 
 // Performance Events
-export const EVENT_STARTUP_PERFORMANCE = 'airiscode.startup.performance';
-export const EVENT_MEMORY_USAGE = 'airiscode.memory.usage';
-export const EVENT_PERFORMANCE_BASELINE = 'airiscode.performance.baseline';
-export const EVENT_PERFORMANCE_REGRESSION = 'airiscode.performance.regression';
+export const EVENT_STARTUP_PERFORMANCE = "airiscode.startup.performance";
+export const EVENT_MEMORY_USAGE = "airiscode.memory.usage";
+export const EVENT_PERFORMANCE_BASELINE = "airiscode.performance.baseline";
+export const EVENT_PERFORMANCE_REGRESSION = "airiscode.performance.regression";
diff --git a/packages/airiscode-core/src/telemetry/index.ts b/packages/airiscode-core/src/telemetry/index.ts
index 6a03b299f..08983d758 100644
--- a/packages/airiscode-core/src/telemetry/index.ts
+++ b/packages/airiscode-core/src/telemetry/index.ts
@@ -5,121 +5,123 @@
  */
 
 export enum TelemetryTarget {
-  GCP = 'gcp',
-  LOCAL = 'local',
-  QWEN = 'airiscode',
+  GCP = "gcp",
+  LOCAL = "local",
+  QWEN = "airiscode",
 }
 
 const DEFAULT_TELEMETRY_TARGET = TelemetryTarget.LOCAL;
-const DEFAULT_OTLP_ENDPOINT = 'http://localhost:4317';
+const DEFAULT_OTLP_ENDPOINT = "http://localhost:4317";
 
-export { DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT };
 export {
-  initializeTelemetry,
-  shutdownTelemetry,
-  isTelemetrySdkInitialized,
-} from './sdk.js';
-export {
-  resolveTelemetrySettings,
   parseBooleanEnvFlag,
   parseTelemetryTargetValue,
-} from './config.js';
+  resolveTelemetrySettings,
+} from "./config.js";
 export {
-  logStartSession,
-  logUserPrompt,
-  logUserRetry,
-  logToolCall,
-  logApiRequest,
-  logApiError,
   logApiCancel,
+  logApiError,
+  logApiRequest,
   logApiResponse,
-  logFlashFallback,
-  logSlashCommand,
-  logConversationFinishedEvent,
-  logKittySequenceOverflow,
+  logArenaAgentCompleted,
+  logArenaSessionEnded,
+  logArenaSessionStarted,
+  logAuth,
   logChatCompression,
-  logToolOutputTruncated,
+  logConversationFinishedEvent,
+  logExtensionDisable,
   logExtensionEnable,
   logExtensionInstallEvent,
   logExtensionUninstall,
-  logExtensionDisable,
   logExtensionUpdateEvent,
-  logRipgrepFallback,
+  logFlashFallback,
+  logKittySequenceOverflow,
   logNextSpeakerCheck,
-  logAuth,
+  logRipgrepFallback,
   logSkillLaunch,
+  logSlashCommand,
+  logStartSession,
+  logToolCall,
+  logToolOutputTruncated,
   logUserFeedback,
-  logArenaSessionStarted,
-  logArenaAgentCompleted,
-  logArenaSessionEnded,
-} from './loggers.js';
-export type { SlashCommandEvent, ChatCompressionEvent } from './types.js';
+  logUserPrompt,
+  logUserRetry,
+} from "./loggers.js";
 export {
-  SlashCommandStatus,
-  EndSessionEvent,
-  UserPromptEvent,
-  UserRetryEvent,
-  ApiRequestEvent,
+  ApiRequestPhase,
+  FileOperation,
+  isPerformanceMonitoringActive,
+  MemoryMetricType,
+  // Performance monitoring types
+  PerformanceMetricType,
+  recordApiErrorMetrics,
+  recordApiRequestBreakdown,
+  recordApiResponseMetrics,
+  recordArenaAgentCompletedMetrics,
+  recordArenaSessionEndedMetrics,
+  // Arena metrics functions
+  recordArenaSessionStartedMetrics,
+  recordBaselineComparison,
+  recordContentRetry,
+  recordContentRetryFailure,
+  recordCpuUsage,
+  recordFileOperationMetric,
+  recordInvalidChunk,
+  recordMemoryUsage,
+  recordPerformanceRegression,
+  recordPerformanceScore,
+  // Performance monitoring functions
+  recordStartupPerformance,
+  recordTokenEfficiency,
+  recordTokenUsageMetrics,
+  // Core metrics functions
+  recordToolCallMetrics,
+  recordToolExecutionBreakdown,
+  recordToolQueueDepth,
+  ToolExecutionPhase,
+} from "./metrics.js";
+export { sanitizeHookName } from "./sanitize.js";
+export {
+  initializeTelemetry,
+  isTelemetrySdkInitialized,
+  shutdownTelemetry,
+} from "./sdk.js";
+export type {
+  ArenaAgentCompletedEvent,
+  ArenaAgentCompletedStatus,
+  ArenaSessionEndedEvent,
+  ArenaSessionEndedStatus,
+  ArenaSessionStartedEvent,
+  ChatCompressionEvent,
+  SlashCommandEvent,
+  TelemetryEvent,
+} from "./types.js";
+export {
+  ApiCancelEvent,
   ApiErrorEvent,
+  ApiRequestEvent,
   ApiResponseEvent,
-  ApiCancelEvent,
-  FlashFallbackEvent,
-  StartSessionEvent,
-  ToolCallEvent,
+  AuthEvent,
   ConversationFinishedEvent,
+  EndSessionEvent,
+  FlashFallbackEvent,
   KittySequenceOverflowEvent,
-  ToolOutputTruncatedEvent,
-  RipgrepFallbackEvent,
+  makeArenaAgentCompletedEvent,
+  makeArenaSessionEndedEvent,
+  makeArenaSessionStartedEvent,
+  makeChatCompressionEvent,
+  makeSlashCommandEvent,
   NextSpeakerCheckEvent,
-  AuthEvent,
+  RipgrepFallbackEvent,
   SkillLaunchEvent,
+  SlashCommandStatus,
+  StartSessionEvent,
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
   UserFeedbackEvent,
   UserFeedbackRating,
-  makeArenaSessionStartedEvent,
-  makeArenaAgentCompletedEvent,
-  makeArenaSessionEndedEvent,
-} from './types.js';
-export { makeSlashCommandEvent, makeChatCompressionEvent } from './types.js';
-export type {
-  ArenaSessionStartedEvent,
-  ArenaAgentCompletedEvent,
-  ArenaSessionEndedEvent,
-  ArenaSessionEndedStatus,
-  ArenaAgentCompletedStatus,
-} from './types.js';
-export type { TelemetryEvent } from './types.js';
-export * from './uiTelemetry.js';
-export {
-  // Core metrics functions
-  recordToolCallMetrics,
-  recordTokenUsageMetrics,
-  recordApiResponseMetrics,
-  recordApiErrorMetrics,
-  recordFileOperationMetric,
-  recordInvalidChunk,
-  recordContentRetry,
-  recordContentRetryFailure,
-  // Performance monitoring functions
-  recordStartupPerformance,
-  recordMemoryUsage,
-  recordCpuUsage,
-  recordToolQueueDepth,
-  recordToolExecutionBreakdown,
-  recordTokenEfficiency,
-  recordApiRequestBreakdown,
-  recordPerformanceScore,
-  recordPerformanceRegression,
-  recordBaselineComparison,
-  isPerformanceMonitoringActive,
-  // Arena metrics functions
-  recordArenaSessionStartedMetrics,
-  recordArenaAgentCompletedMetrics,
-  recordArenaSessionEndedMetrics,
-  // Performance monitoring types
-  PerformanceMetricType,
-  MemoryMetricType,
-  ToolExecutionPhase,
-  ApiRequestPhase,
-  FileOperation,
-} from './metrics.js';
-export { sanitizeHookName } from './sanitize.js';
+  UserPromptEvent,
+  UserRetryEvent,
+} from "./types.js";
+export * from "./uiTelemetry.js";
+export { DEFAULT_OTLP_ENDPOINT, DEFAULT_TELEMETRY_TARGET };
diff --git a/packages/airiscode-core/src/telemetry/loggers.ts b/packages/airiscode-core/src/telemetry/loggers.ts
index 2577affe0..a58705c2c 100644
--- a/packages/airiscode-core/src/telemetry/loggers.ts
+++ b/packages/airiscode-core/src/telemetry/loggers.ts
@@ -8,75 +8,72 @@
 // Functions preserved for API compatibility with existing call sites that are
 // gated by isTelemetrySdkInitialized() returning false.
 
-import type { Config } from '../config/config.js';
-import { isInternalPromptId } from '../utils/internalPromptIds.js';
+import type { Config } from "../config/config.js";
+import { isInternalPromptId } from "../utils/internalPromptIds.js";
 import {
-  EVENT_API_ERROR,
   EVENT_API_CANCEL,
+  EVENT_API_ERROR,
   EVENT_API_RESPONSE,
   EVENT_TOOL_CALL,
   EVENT_USER_FEEDBACK,
-} from './constants.js';
+} from "./constants.js";
 import type {
-  ApiErrorEvent,
   ApiCancelEvent,
+  ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
-  FileOperationEvent,
-  IdeConnectionEvent,
-  StartSessionEvent,
-  ToolCallEvent,
-  UserPromptEvent,
-  UserRetryEvent,
-  FlashFallbackEvent,
-  NextSpeakerCheckEvent,
-  LoopDetectedEvent,
-  LoopDetectionDisabledEvent,
-  SlashCommandEvent,
-  ConversationFinishedEvent,
-  KittySequenceOverflowEvent,
+  ArenaAgentCompletedEvent,
+  ArenaSessionEndedEvent,
+  ArenaSessionStartedEvent,
+  AuthEvent,
   ChatCompressionEvent,
   ContentRetryEvent,
   ContentRetryFailureEvent,
-  RipgrepFallbackEvent,
-  ToolOutputTruncatedEvent,
+  ConversationFinishedEvent,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
+  ExtensionInstallEvent,
   ExtensionUninstallEvent,
   ExtensionUpdateEvent,
-  ExtensionInstallEvent,
-  ModelSlashCommandEvent,
-  SubagentExecutionEvent,
-  MalformedJsonResponseEvent,
+  FileOperationEvent,
+  FlashFallbackEvent,
+  HookCallEvent,
+  IdeConnectionEvent,
   InvalidChunkEvent,
-  AuthEvent,
-  SkillLaunchEvent,
-  UserFeedbackEvent,
-  ArenaSessionStartedEvent,
-  ArenaAgentCompletedEvent,
-  ArenaSessionEndedEvent,
+  KittySequenceOverflowEvent,
+  LoopDetectedEvent,
+  LoopDetectionDisabledEvent,
+  MalformedJsonResponseEvent,
+  ModelSlashCommandEvent,
+  NextSpeakerCheckEvent,
   PromptSuggestionEvent,
+  RipgrepFallbackEvent,
+  SkillLaunchEvent,
+  SlashCommandEvent,
   SpeculationEvent,
-} from './types.js';
-import type { HookCallEvent } from './types.js';
-import type { UiEvent } from './uiTelemetry.js';
-import { uiTelemetryService } from './uiTelemetry.js';
+  StartSessionEvent,
+  SubagentExecutionEvent,
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
+  UserFeedbackEvent,
+  UserPromptEvent,
+  UserRetryEvent,
+} from "./types.js";
+import type { UiEvent } from "./uiTelemetry.js";
+import { uiTelemetryService } from "./uiTelemetry.js";
 
 // Minimal attribute bag retained for internal use only.
 type LogAttributes = Record<string, unknown>;
 
 function getCommonAttributes(config: Config): LogAttributes {
   return {
-    'session.id': config.getSessionId(),
+    "session.id": config.getSessionId(),
   };
 }
 
 export { getCommonAttributes };
 
-export function logStartSession(
-  _config: Config,
-  _event: StartSessionEvent,
-): void {
+export function logStartSession(_config: Config, _event: StartSessionEvent): void {
   return;
 }
 
@@ -92,8 +89,8 @@ export function logToolCall(config: Config, event: ToolCallEvent): void {
   // Preserve the UI telemetry side effects since they are independent of OTel.
   const uiEvent = {
     ...event,
-    'event.name': EVENT_TOOL_CALL,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_TOOL_CALL,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   if (!isInternalPromptId(event.prompt_id)) {
@@ -101,17 +98,11 @@ export function logToolCall(config: Config, event: ToolCallEvent): void {
   }
 }
 
-export function logToolOutputTruncated(
-  _config: Config,
-  _event: ToolOutputTruncatedEvent,
-): void {
+export function logToolOutputTruncated(_config: Config, _event: ToolOutputTruncatedEvent): void {
   return;
 }
 
-export function logFileOperation(
-  _config: Config,
-  _event: FileOperationEvent,
-): void {
+export function logFileOperation(_config: Config, _event: FileOperationEvent): void {
   return;
 }
 
@@ -119,17 +110,11 @@ export function logApiRequest(_config: Config, _event: ApiRequestEvent): void {
   return;
 }
 
-export function logFlashFallback(
-  _config: Config,
-  _event: FlashFallbackEvent,
-): void {
+export function logFlashFallback(_config: Config, _event: FlashFallbackEvent): void {
   return;
 }
 
-export function logRipgrepFallback(
-  _config: Config,
-  _event: RipgrepFallbackEvent,
-): void {
+export function logRipgrepFallback(_config: Config, _event: RipgrepFallbackEvent): void {
   return;
 }
 
@@ -137,8 +122,8 @@ export function logApiError(config: Config, event: ApiErrorEvent): void {
   // Preserve the UI telemetry side effects since they are independent of OTel.
   const uiEvent = {
     ...event,
-    'event.name': EVENT_API_ERROR,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_API_ERROR,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   if (!isInternalPromptId(event.prompt_id)) {
@@ -150,8 +135,8 @@ export function logApiCancel(_config: Config, event: ApiCancelEvent): void {
   // Preserve the UI telemetry side effects since they are independent of OTel.
   const uiEvent = {
     ...event,
-    'event.name': EVENT_API_CANCEL,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_API_CANCEL,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
 }
@@ -160,8 +145,8 @@ export function logApiResponse(config: Config, event: ApiResponseEvent): void {
   // Preserve the UI telemetry side effects since they are independent of OTel.
   const uiEvent = {
     ...event,
-    'event.name': EVENT_API_RESPONSE,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_API_RESPONSE,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   if (!isInternalPromptId(event.prompt_id)) {
@@ -169,10 +154,7 @@ export function logApiResponse(config: Config, event: ApiResponseEvent): void {
   }
 }
 
-export function logLoopDetected(
-  _config: Config,
-  _event: LoopDetectedEvent,
-): void {
+export function logLoopDetected(_config: Config, _event: LoopDetectedEvent): void {
   return;
 }
 
@@ -183,24 +165,15 @@ export function logLoopDetectionDisabled(
   return;
 }
 
-export function logNextSpeakerCheck(
-  _config: Config,
-  _event: NextSpeakerCheckEvent,
-): void {
+export function logNextSpeakerCheck(_config: Config, _event: NextSpeakerCheckEvent): void {
   return;
 }
 
-export function logSlashCommand(
-  _config: Config,
-  _event: SlashCommandEvent,
-): void {
+export function logSlashCommand(_config: Config, _event: SlashCommandEvent): void {
   return;
 }
 
-export function logIdeConnection(
-  _config: Config,
-  _event: IdeConnectionEvent,
-): void {
+export function logIdeConnection(_config: Config, _event: IdeConnectionEvent): void {
   return;
 }
 
@@ -211,10 +184,7 @@ export function logConversationFinishedEvent(
   return;
 }
 
-export function logChatCompression(
-  _config: Config,
-  _event: ChatCompressionEvent,
-): void {
+export function logChatCompression(_config: Config, _event: ChatCompressionEvent): void {
   return;
 }
 
@@ -232,38 +202,23 @@ export function logMalformedJsonResponse(
   return;
 }
 
-export function logInvalidChunk(
-  _config: Config,
-  _event: InvalidChunkEvent,
-): void {
+export function logInvalidChunk(_config: Config, _event: InvalidChunkEvent): void {
   return;
 }
 
-export function logContentRetry(
-  _config: Config,
-  _event: ContentRetryEvent,
-): void {
+export function logContentRetry(_config: Config, _event: ContentRetryEvent): void {
   return;
 }
 
-export function logContentRetryFailure(
-  _config: Config,
-  _event: ContentRetryFailureEvent,
-): void {
+export function logContentRetryFailure(_config: Config, _event: ContentRetryFailureEvent): void {
   return;
 }
 
-export function logSubagentExecution(
-  _config: Config,
-  _event: SubagentExecutionEvent,
-): void {
+export function logSubagentExecution(_config: Config, _event: SubagentExecutionEvent): void {
   return;
 }
 
-export function logModelSlashCommand(
-  _config: Config,
-  _event: ModelSlashCommandEvent,
-): void {
+export function logModelSlashCommand(_config: Config, _event: ModelSlashCommandEvent): void {
   return;
 }
 
@@ -271,17 +226,11 @@ export function logHookCall(_config: Config, _event: HookCallEvent): void {
   return;
 }
 
-export function logExtensionInstallEvent(
-  _config: Config,
-  _event: ExtensionInstallEvent,
-): void {
+export function logExtensionInstallEvent(_config: Config, _event: ExtensionInstallEvent): void {
   return;
 }
 
-export function logExtensionUninstall(
-  _config: Config,
-  _event: ExtensionUninstallEvent,
-): void {
+export function logExtensionUninstall(_config: Config, _event: ExtensionUninstallEvent): void {
   return;
 }
 
@@ -292,17 +241,11 @@ export async function logExtensionUpdateEvent(
   return Promise.resolve();
 }
 
-export function logExtensionEnable(
-  _config: Config,
-  _event: ExtensionEnableEvent,
-): void {
+export function logExtensionEnable(_config: Config, _event: ExtensionEnableEvent): void {
   return;
 }
 
-export function logExtensionDisable(
-  _config: Config,
-  _event: ExtensionDisableEvent,
-): void {
+export function logExtensionDisable(_config: Config, _event: ExtensionDisableEvent): void {
   return;
 }
 
@@ -310,58 +253,37 @@ export function logAuth(_config: Config, _event: AuthEvent): void {
   return;
 }
 
-export function logSkillLaunch(
-  _config: Config,
-  _event: SkillLaunchEvent,
-): void {
+export function logSkillLaunch(_config: Config, _event: SkillLaunchEvent): void {
   return;
 }
 
-export function logUserFeedback(
-  config: Config,
-  event: UserFeedbackEvent,
-): void {
+export function logUserFeedback(config: Config, event: UserFeedbackEvent): void {
   // Preserve the UI telemetry side effects since they are independent of OTel.
   const uiEvent = {
     ...event,
-    'event.name': EVENT_USER_FEEDBACK,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_USER_FEEDBACK,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   config.getChatRecordingService()?.recordUiTelemetryEvent(uiEvent);
 }
 
-export function logArenaSessionStarted(
-  _config: Config,
-  _event: ArenaSessionStartedEvent,
-): void {
+export function logArenaSessionStarted(_config: Config, _event: ArenaSessionStartedEvent): void {
   return;
 }
 
-export function logArenaAgentCompleted(
-  _config: Config,
-  _event: ArenaAgentCompletedEvent,
-): void {
+export function logArenaAgentCompleted(_config: Config, _event: ArenaAgentCompletedEvent): void {
   return;
 }
 
-export function logArenaSessionEnded(
-  _config: Config,
-  _event: ArenaSessionEndedEvent,
-): void {
+export function logArenaSessionEnded(_config: Config, _event: ArenaSessionEndedEvent): void {
   return;
 }
 
-export function logPromptSuggestion(
-  _config: Config,
-  _event: PromptSuggestionEvent,
-): void {
+export function logPromptSuggestion(_config: Config, _event: PromptSuggestionEvent): void {
   return;
 }
 
-export function logSpeculation(
-  _config: Config,
-  _event: SpeculationEvent,
-): void {
+export function logSpeculation(_config: Config, _event: SpeculationEvent): void {
   return;
 }
diff --git a/packages/airiscode-core/src/telemetry/metrics.ts b/packages/airiscode-core/src/telemetry/metrics.ts
index 4a8e3fdf9..2a2a72cc0 100644
--- a/packages/airiscode-core/src/telemetry/metrics.ts
+++ b/packages/airiscode-core/src/telemetry/metrics.ts
@@ -8,9 +8,9 @@
 // Functions preserved for API compatibility with existing call sites that are
 // gated by isTelemetrySdkInitialized() returning false.
 
-import { SERVICE_NAME, EVENT_CHAT_COMPRESSION } from './constants.js';
-import type { Config } from '../config/config.js';
-import type { ModelSlashCommandEvent } from './types.js';
+import type { Config } from "../config/config.js";
+import { EVENT_CHAT_COMPRESSION, SERVICE_NAME } from "./constants.js";
+import type { ModelSlashCommandEvent } from "./types.js";
 
 export const SUBAGENT_EXECUTION_COUNT = `${SERVICE_NAME}.subagent.execution.count`;
 
@@ -25,39 +25,39 @@ export type MetricDefinitions = Record<
 >;
 
 export enum FileOperation {
-  CREATE = 'create',
-  READ = 'read',
-  UPDATE = 'update',
+  CREATE = "create",
+  READ = "read",
+  UPDATE = "update",
 }
 
 export enum PerformanceMetricType {
-  STARTUP = 'startup',
-  MEMORY = 'memory',
-  CPU = 'cpu',
-  TOOL_EXECUTION = 'tool_execution',
-  API_REQUEST = 'api_request',
-  TOKEN_EFFICIENCY = 'token_efficiency',
+  STARTUP = "startup",
+  MEMORY = "memory",
+  CPU = "cpu",
+  TOOL_EXECUTION = "tool_execution",
+  API_REQUEST = "api_request",
+  TOKEN_EFFICIENCY = "token_efficiency",
 }
 
 export enum MemoryMetricType {
-  HEAP_USED = 'heap_used',
-  HEAP_TOTAL = 'heap_total',
-  EXTERNAL = 'external',
-  RSS = 'rss',
+  HEAP_USED = "heap_used",
+  HEAP_TOTAL = "heap_total",
+  EXTERNAL = "external",
+  RSS = "rss",
 }
 
 export enum ToolExecutionPhase {
-  VALIDATION = 'validation',
-  PREPARATION = 'preparation',
-  EXECUTION = 'execution',
-  RESULT_PROCESSING = 'result_processing',
+  VALIDATION = "validation",
+  PREPARATION = "preparation",
+  EXECUTION = "execution",
+  RESULT_PROCESSING = "result_processing",
 }
 
 export enum ApiRequestPhase {
-  REQUEST_PREPARATION = 'request_preparation',
-  NETWORK_LATENCY = 'network_latency',
-  RESPONSE_PROCESSING = 'response_processing',
-  TOKEN_PROCESSING = 'token_processing',
+  REQUEST_PREPARATION = "request_preparation",
+  NETWORK_LATENCY = "network_latency",
+  RESPONSE_PROCESSING = "response_processing",
+  TOKEN_PROCESSING = "token_processing",
 }
 
 // `Meter` shape kept loose so that existing callers that store the result do
@@ -83,8 +83,8 @@ export function recordToolCallMetrics(
   _attributes: {
     function_name: string;
     success: boolean;
-    decision?: 'accept' | 'reject' | 'modify' | 'auto_accept';
-    tool_type?: 'native' | 'mcp';
+    decision?: "accept" | "reject" | "modify" | "auto_accept";
+    tool_type?: "native" | "mcp";
   },
 ): void {
   return;
@@ -95,7 +95,7 @@ export function recordTokenUsageMetrics(
   _tokenCount: number,
   _attributes: {
     model: string;
-    type: 'input' | 'output' | 'thought' | 'cache' | 'tool';
+    type: "input" | "output" | "thought" | "cache" | "tool";
   },
 ): void {
   return;
@@ -159,10 +159,7 @@ export function recordContentRetryFailure(_config: Config): void {
   return;
 }
 
-export function recordModelSlashCommand(
-  _config: Config,
-  _event: ModelSlashCommandEvent,
-): void {
+export function recordModelSlashCommand(_config: Config, _event: ModelSlashCommandEvent): void {
   return;
 }
 
@@ -204,10 +201,7 @@ export function recordCpuUsage(
   return;
 }
 
-export function recordToolQueueDepth(
-  _config: Config,
-  _queueDepth: number,
-): void {
+export function recordToolQueueDepth(_config: Config, _queueDepth: number): void {
   return;
 }
 
@@ -260,7 +254,7 @@ export function recordPerformanceRegression(
   _config: Config,
   _attributes: {
     metric: string;
-    severity: 'low' | 'medium' | 'high';
+    severity: "low" | "medium" | "high";
     current_value: number;
     baseline_value: number;
   },
@@ -291,7 +285,7 @@ export function isPerformanceMonitoringActive(): boolean {
 export function recordSubagentExecutionMetrics(
   _config: Config,
   _subagentName: string,
-  _status: 'started' | 'completed' | 'failed' | 'cancelled',
+  _status: "started" | "completed" | "failed" | "cancelled",
   _terminateReason?: string,
 ): void {
   return;
diff --git a/packages/airiscode-core/src/telemetry/sanitize.ts b/packages/airiscode-core/src/telemetry/sanitize.ts
index 44376d104..178d1d21d 100644
--- a/packages/airiscode-core/src/telemetry/sanitize.ts
+++ b/packages/airiscode-core/src/telemetry/sanitize.ts
@@ -26,26 +26,26 @@
 export function sanitizeHookName(hookName: string): string {
   // Handle empty or whitespace-only strings
   if (!hookName || !hookName.trim()) {
-    return 'unknown-command';
+    return "unknown-command";
   }
 
   // Split by spaces to get command parts
   const parts = hookName.trim().split(/\s+/);
   if (parts.length === 0) {
-    return 'unknown-command';
+    return "unknown-command";
   }
 
   // Get the first part (the command)
   const command = parts[0];
   if (!command) {
-    return 'unknown-command';
+    return "unknown-command";
   }
 
   // If it's a path, extract just the basename
-  if (command.includes('/') || command.includes('\\')) {
+  if (command.includes("/") || command.includes("\\")) {
     const pathParts = command.split(/[/\\]/);
     const basename = pathParts[pathParts.length - 1];
-    return basename || 'unknown-command';
+    return basename || "unknown-command";
   }
 
   return command;
diff --git a/packages/airiscode-core/src/telemetry/sdk.ts b/packages/airiscode-core/src/telemetry/sdk.ts
index c425ed7f1..d8fa32fbd 100644
--- a/packages/airiscode-core/src/telemetry/sdk.ts
+++ b/packages/airiscode-core/src/telemetry/sdk.ts
@@ -8,7 +8,7 @@
 // Telemetry calls throughout the codebase are gated by isTelemetrySdkInitialized()
 // which now always returns false, making them no-ops.
 
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
 
 export function isTelemetrySdkInitialized(): boolean {
   return false;
diff --git a/packages/airiscode-core/src/telemetry/telemetry-utils.ts b/packages/airiscode-core/src/telemetry/telemetry-utils.ts
index a14c13ac1..406e27f0b 100644
--- a/packages/airiscode-core/src/telemetry/telemetry-utils.ts
+++ b/packages/airiscode-core/src/telemetry/telemetry-utils.ts
@@ -4,13 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
 
-export function getProgrammingLanguage(
-  args: Record<string, unknown>,
-): string | undefined {
-  const filePath = args['file_path'] || args['path'];
-  if (typeof filePath === 'string') {
+export function getProgrammingLanguage(args: Record<string, unknown>): string | undefined {
+  const filePath = args["file_path"] || args["path"];
+  if (typeof filePath === "string") {
     return getLanguageFromFilePath(filePath);
   }
   return undefined;
diff --git a/packages/airiscode-core/src/telemetry/tool-call-decision.ts b/packages/airiscode-core/src/telemetry/tool-call-decision.ts
index 07c346e73..fdf62dee0 100644
--- a/packages/airiscode-core/src/telemetry/tool-call-decision.ts
+++ b/packages/airiscode-core/src/telemetry/tool-call-decision.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ToolConfirmationOutcome } from '../tools/tools.js';
+import { ToolConfirmationOutcome } from "../tools/tools.js";
 
 export enum ToolCallDecision {
-  ACCEPT = 'accept',
-  REJECT = 'reject',
-  MODIFY = 'modify',
-  AUTO_ACCEPT = 'auto_accept',
+  ACCEPT = "accept",
+  REJECT = "reject",
+  MODIFY = "modify",
+  AUTO_ACCEPT = "auto_accept",
 }
 
-export function getDecisionFromOutcome(
-  outcome: ToolConfirmationOutcome,
-): ToolCallDecision {
+export function getDecisionFromOutcome(outcome: ToolConfirmationOutcome): ToolCallDecision {
   switch (outcome) {
     case ToolConfirmationOutcome.ProceedOnce:
     case ToolConfirmationOutcome.RestorePrevious:
diff --git a/packages/airiscode-core/src/telemetry/types.ts b/packages/airiscode-core/src/telemetry/types.ts
index 6cb996bc2..cf67d17f1 100644
--- a/packages/airiscode-core/src/telemetry/types.ts
+++ b/packages/airiscode-core/src/telemetry/types.ts
@@ -4,35 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentResponseUsageMetadata } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import type { ApprovalMode } from '../config/config.js';
-import type { CompletedToolCall } from '../core/coreToolScheduler.js';
-import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
-import type { FileDiff } from '../tools/tools.js';
-import type { AuthType } from '../core/contentGenerator.js';
-import {
-  getDecisionFromOutcome,
-  ToolCallDecision,
-} from './tool-call-decision.js';
-import type { FileOperation } from './metrics.js';
+import type { ApprovalMode, Config } from "../config/config.js";
+import type { AuthType } from "../core/contentGenerator.js";
+import type { CompletedToolCall } from "../core/coreToolScheduler.js";
+import { DiscoveredMCPTool } from "../tools/mcp-tool.js";
+import type { FileDiff } from "../tools/tools.js";
+import type { GenerateContentResponseUsageMetadata } from "../types/llm.js";
+import type { FileOperation } from "./metrics.js";
+import { getDecisionFromOutcome, ToolCallDecision } from "./tool-call-decision.js";
+
 export { ToolCallDecision };
-import type { OutputFormat } from '../output/types.js';
-import { ToolNames } from '../tools/tool-names.js';
-import type { SkillTool } from '../tools/skill.js';
-import type { AgentTool } from '../tools/agent.js';
+
+import type { OutputFormat } from "../output/types.js";
+import type { AgentTool } from "../tools/agent.js";
+import type { SkillTool } from "../tools/skill.js";
+import { ToolNames } from "../tools/tool-names.js";
 
 export interface BaseTelemetryEvent {
-  'event.name': string;
+  "event.name": string;
   /** Current timestamp in ISO 8601 format */
-  'event.timestamp': string;
+  "event.timestamp": string;
 }
 
 type CommonFields = keyof BaseTelemetryEvent;
 
 export class StartSessionEvent implements BaseTelemetryEvent {
-  'event.name': 'cli_config';
-  'event.timestamp': string;
+  "event.name": "cli_config";
+  "event.timestamp": string;
   session_id: string;
   model: string;
   sandbox_enabled: boolean;
@@ -58,25 +56,22 @@ export class StartSessionEvent implements BaseTelemetryEvent {
     const mcpServers = config.getMcpServers();
     const toolRegistry = config.getToolRegistry();
 
-    this['event.name'] = 'cli_config';
+    this["event.name"] = "cli_config";
     this.session_id = config.getSessionId();
     this.model = config.getModel();
-    this.sandbox_enabled =
-      typeof config.getSandbox() === 'string' || !!config.getSandbox();
+    this.sandbox_enabled = typeof config.getSandbox() === "string" || !!config.getSandbox();
     this.core_tools_enabled = (
       config.getPermissionManager?.()?.getAllowRawStrings() ??
       config.getCoreTools() ??
       []
-    ).join(',');
+    ).join(",");
     this.approval_mode = config.getApprovalMode();
     this.debug_enabled = config.getDebugMode();
-    this.truncate_tool_output_threshold =
-      config.getTruncateToolOutputThreshold();
+    this.truncate_tool_output_threshold = config.getTruncateToolOutputThreshold();
     this.truncate_tool_output_lines = config.getTruncateToolOutputLines();
-    this.mcp_servers = mcpServers ? Object.keys(mcpServers).join(',') : '';
+    this.mcp_servers = mcpServers ? Object.keys(mcpServers).join(",") : "";
     this.telemetry_enabled = config.getTelemetryEnabled();
-    this.file_filtering_respect_git_ignore =
-      config.getFileFilteringRespectGitIgnore();
+    this.file_filtering_respect_git_ignore = config.getFileFilteringRespectGitIgnore();
     this.mcp_servers_count = mcpServers ? Object.keys(mcpServers).length : 0;
     this.output_format = config.getOutputFormat();
     this.ide_enabled = config.getIdeMode();
@@ -87,7 +82,7 @@ export class StartSessionEvent implements BaseTelemetryEvent {
       const allHooks = hookSystem.getAllHooks();
       const uniqueEventNames = [...new Set(allHooks.map((h) => h.eventName))];
       if (uniqueEventNames.length > 0) {
-        this.hooks = uniqueEventNames.join(',');
+        this.hooks = uniqueEventNames.join(",");
       }
     }
 
@@ -96,57 +91,46 @@ export class StartSessionEvent implements BaseTelemetryEvent {
         .getAllTools()
         .filter((tool) => tool instanceof DiscoveredMCPTool);
       this.mcp_tools_count = mcpTools.length;
-      this.mcp_tools = mcpTools
-        .map((tool) => (tool as DiscoveredMCPTool).name)
-        .join(',');
+      this.mcp_tools = mcpTools.map((tool) => (tool as DiscoveredMCPTool).name).join(",");
 
-      const skillTool = toolRegistry.getTool(ToolNames.SKILL) as
-        | SkillTool
-        | undefined;
+      const skillTool = toolRegistry.getTool(ToolNames.SKILL) as SkillTool | undefined;
       const skillNames = skillTool?.getAvailableSkillNames?.();
       if (skillNames && skillNames.length > 0) {
-        this.skills = skillNames.join(',');
+        this.skills = skillNames.join(",");
       }
 
-      const agentTool = toolRegistry.getTool(ToolNames.AGENT) as
-        | AgentTool
-        | undefined;
+      const agentTool = toolRegistry.getTool(ToolNames.AGENT) as AgentTool | undefined;
       const subagentNames = agentTool?.getAvailableSubagentNames?.();
       if (subagentNames && subagentNames.length > 0) {
-        this.subagents = subagentNames.join(',');
+        this.subagents = subagentNames.join(",");
       }
     }
   }
 }
 
 export class EndSessionEvent implements BaseTelemetryEvent {
-  'event.name': 'end_session';
-  'event.timestamp': string;
+  "event.name": "end_session";
+  "event.timestamp": string;
   session_id?: string;
 
   constructor(config?: Config) {
-    this['event.name'] = 'end_session';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "end_session";
+    this["event.timestamp"] = new Date().toISOString();
     this.session_id = config?.getSessionId();
   }
 }
 
 export class UserPromptEvent implements BaseTelemetryEvent {
-  'event.name': 'user_prompt';
-  'event.timestamp': string;
+  "event.name": "user_prompt";
+  "event.timestamp": string;
   prompt_length: number;
   prompt_id: string;
   auth_type?: string;
   prompt?: string;
 
-  constructor(
-    prompt_length: number,
-    prompt_Id: string,
-    auth_type?: string,
-    prompt?: string,
-  ) {
-    this['event.name'] = 'user_prompt';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(prompt_length: number, prompt_Id: string, auth_type?: string, prompt?: string) {
+    this["event.name"] = "user_prompt";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_length = prompt_length;
     this.prompt_id = prompt_Id;
     this.auth_type = auth_type;
@@ -155,67 +139,62 @@ export class UserPromptEvent implements BaseTelemetryEvent {
 }
 
 export class UserRetryEvent implements BaseTelemetryEvent {
-  'event.name': 'user_retry';
-  'event.timestamp': string;
+  "event.name": "user_retry";
+  "event.timestamp": string;
   prompt_id: string;
 
   constructor(prompt_id: string) {
-    this['event.name'] = 'user_retry';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "user_retry";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
   }
 }
 
 export class ToolCallEvent implements BaseTelemetryEvent {
-  'event.name': 'tool_call';
-  'event.timestamp': string;
+  "event.name": "tool_call";
+  "event.timestamp": string;
   function_name: string;
   function_args: Record<string, unknown>;
   duration_ms: number;
-  status: 'success' | 'error' | 'cancelled';
+  status: "success" | "error" | "cancelled";
   success: boolean; // Keep for backward compatibility
   decision?: ToolCallDecision;
   error?: string;
   error_type?: string;
   prompt_id: string;
   response_id?: string;
-  tool_type: 'native' | 'mcp';
+  tool_type: "native" | "mcp";
   content_length?: number;
   mcp_server_name?: string;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   metadata?: { [key: string]: any };
 
   constructor(call: CompletedToolCall) {
-    this['event.name'] = 'tool_call';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "tool_call";
+    this["event.timestamp"] = new Date().toISOString();
     this.function_name = call.request.name;
     this.function_args = call.request.args;
     this.duration_ms = call.durationMs ?? 0;
     this.status = call.status;
-    this.success = call.status === 'success'; // Keep for backward compatibility
-    this.decision = call.outcome
-      ? getDecisionFromOutcome(call.outcome)
-      : undefined;
+    this.success = call.status === "success"; // Keep for backward compatibility
+    this.decision = call.outcome ? getDecisionFromOutcome(call.outcome) : undefined;
     this.error = call.response.error?.message;
     this.error_type = call.response.errorType;
     this.prompt_id = call.request.prompt_id;
     this.content_length = call.response.contentLength;
-    if (
-      typeof call.tool !== 'undefined' &&
-      call.tool instanceof DiscoveredMCPTool
-    ) {
-      this.tool_type = 'mcp';
+    if (typeof call.tool !== "undefined" && call.tool instanceof DiscoveredMCPTool) {
+      this.tool_type = "mcp";
       this.mcp_server_name = call.tool.serverName;
     } else {
-      this.tool_type = 'native';
+      this.tool_type = "native";
     }
     this.response_id = call.request.response_id;
 
     if (
-      call.status === 'success' &&
-      typeof call.response.resultDisplay === 'object' &&
+      call.status === "success" &&
+      typeof call.response.resultDisplay === "object" &&
       call.response.resultDisplay !== null &&
-      'diffStat' in call.response.resultDisplay
+      "diffStat" in call.response.resultDisplay
     ) {
       const diffStat = (call.response.resultDisplay as FileDiff).diffStat;
       if (diffStat) {
@@ -235,15 +214,15 @@ export class ToolCallEvent implements BaseTelemetryEvent {
 }
 
 export class ApiRequestEvent implements BaseTelemetryEvent {
-  'event.name': 'api_request';
-  'event.timestamp': string;
+  "event.name": "api_request";
+  "event.timestamp": string;
   model: string;
   prompt_id: string;
   request_text?: string;
 
   constructor(model: string, prompt_id: string, request_text?: string) {
-    this['event.name'] = 'api_request';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_request";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
     this.prompt_id = prompt_id;
     this.request_text = request_text;
@@ -251,8 +230,8 @@ export class ApiRequestEvent implements BaseTelemetryEvent {
 }
 
 export class ApiErrorEvent implements BaseTelemetryEvent {
-  'event.name': 'api_error';
-  'event.timestamp': string; // ISO 8601
+  "event.name": "api_error";
+  "event.timestamp": string; // ISO 8601
   response_id?: string;
   model: string;
   duration_ms: number;
@@ -275,8 +254,8 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
     errorType?: string;
     statusCode?: number | string;
   }) {
-    this['event.name'] = 'api_error';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_error";
+    this["event.timestamp"] = new Date().toISOString();
     this.response_id = opts.responseId;
     this.model = opts.model;
     this.duration_ms = opts.durationMs;
@@ -289,15 +268,15 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
 }
 
 export class ApiCancelEvent implements BaseTelemetryEvent {
-  'event.name': 'api_cancel';
-  'event.timestamp': string;
+  "event.name": "api_cancel";
+  "event.timestamp": string;
   model: string;
   prompt_id: string;
   auth_type?: string;
 
   constructor(model: string, prompt_id: string, auth_type?: string) {
-    this['event.name'] = 'api_cancel';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_cancel";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
     this.prompt_id = prompt_id;
     this.auth_type = auth_type;
@@ -305,8 +284,8 @@ export class ApiCancelEvent implements BaseTelemetryEvent {
 }
 
 export class ApiResponseEvent implements BaseTelemetryEvent {
-  'event.name': 'api_response';
-  'event.timestamp': string; // ISO 8601
+  "event.name": "api_response";
+  "event.timestamp": string; // ISO 8601
   response_id: string;
   model: string;
   status_code?: number | string;
@@ -330,8 +309,8 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
     usage_data?: GenerateContentResponseUsageMetadata,
     response_text?: string,
   ) {
-    this['event.name'] = 'api_response';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_response";
+    this["event.timestamp"] = new Date().toISOString();
     this.response_id = response_id;
     this.model = model;
     this.duration_ms = duration_ms;
@@ -349,31 +328,27 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
 }
 
 export class FlashFallbackEvent implements BaseTelemetryEvent {
-  'event.name': 'flash_fallback';
-  'event.timestamp': string;
+  "event.name": "flash_fallback";
+  "event.timestamp": string;
   auth_type: string;
 
   constructor(auth_type: string) {
-    this['event.name'] = 'flash_fallback';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "flash_fallback";
+    this["event.timestamp"] = new Date().toISOString();
     this.auth_type = auth_type;
   }
 }
 
 export class RipgrepFallbackEvent implements BaseTelemetryEvent {
-  'event.name': 'ripgrep_fallback';
-  'event.timestamp': string;
+  "event.name": "ripgrep_fallback";
+  "event.timestamp": string;
   use_ripgrep: boolean;
   use_builtin_ripgrep: boolean;
   error?: string;
 
-  constructor(
-    use_ripgrep: boolean,
-    use_builtin_ripgrep: boolean,
-    error?: string,
-  ) {
-    this['event.name'] = 'ripgrep_fallback';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(use_ripgrep: boolean, use_builtin_ripgrep: boolean, error?: string) {
+    this["event.name"] = "ripgrep_fallback";
+    this["event.timestamp"] = new Date().toISOString();
     this.use_ripgrep = use_ripgrep;
     this.use_builtin_ripgrep = use_builtin_ripgrep;
     this.error = error;
@@ -381,46 +356,46 @@ export class RipgrepFallbackEvent implements BaseTelemetryEvent {
 }
 
 export enum LoopType {
-  CONSECUTIVE_IDENTICAL_TOOL_CALLS = 'consecutive_identical_tool_calls',
-  CHANTING_IDENTICAL_SENTENCES = 'chanting_identical_sentences',
+  CONSECUTIVE_IDENTICAL_TOOL_CALLS = "consecutive_identical_tool_calls",
+  CHANTING_IDENTICAL_SENTENCES = "chanting_identical_sentences",
 }
 
 export class LoopDetectedEvent implements BaseTelemetryEvent {
-  'event.name': 'loop_detected';
-  'event.timestamp': string;
+  "event.name": "loop_detected";
+  "event.timestamp": string;
   loop_type: LoopType;
   prompt_id: string;
 
   constructor(loop_type: LoopType, prompt_id: string) {
-    this['event.name'] = 'loop_detected';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "loop_detected";
+    this["event.timestamp"] = new Date().toISOString();
     this.loop_type = loop_type;
     this.prompt_id = prompt_id;
   }
 }
 
 export class LoopDetectionDisabledEvent implements BaseTelemetryEvent {
-  'event.name': 'loop_detection_disabled';
-  'event.timestamp': string;
+  "event.name": "loop_detection_disabled";
+  "event.timestamp": string;
   prompt_id: string;
 
   constructor(prompt_id: string) {
-    this['event.name'] = 'loop_detection_disabled';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "loop_detection_disabled";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
   }
 }
 
 export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
-  'event.name': 'next_speaker_check';
-  'event.timestamp': string;
+  "event.name": "next_speaker_check";
+  "event.timestamp": string;
   prompt_id: string;
   finish_reason: string;
   result: string;
 
   constructor(prompt_id: string, finish_reason: string, result: string) {
-    this['event.name'] = 'next_speaker_check';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "next_speaker_check";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
     this.finish_reason = finish_reason;
     this.result = result;
@@ -428,8 +403,8 @@ export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
 }
 
 export interface SlashCommandEvent extends BaseTelemetryEvent {
-  'event.name': 'slash_command';
-  'event.timestamp': string;
+  "event.name": "slash_command";
+  "event.timestamp": string;
   command: string;
   subcommand?: string;
   status?: SlashCommandStatus;
@@ -441,8 +416,8 @@ export function makeSlashCommandEvent({
   status,
 }: Omit<SlashCommandEvent, CommonFields>): SlashCommandEvent {
   return {
-    'event.name': 'slash_command',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "slash_command",
+    "event.timestamp": new Date().toISOString(),
     command,
     subcommand,
     status,
@@ -450,13 +425,13 @@ export function makeSlashCommandEvent({
 }
 
 export enum SlashCommandStatus {
-  SUCCESS = 'success',
-  ERROR = 'error',
+  SUCCESS = "success",
+  ERROR = "error",
 }
 
 export interface ChatCompressionEvent extends BaseTelemetryEvent {
-  'event.name': 'chat_compression';
-  'event.timestamp': string;
+  "event.name": "chat_compression";
+  "event.timestamp": string;
   tokens_before: number;
   tokens_after: number;
   compression_input_token_count?: number;
@@ -470,70 +445,66 @@ export function makeChatCompressionEvent({
   compression_output_token_count,
 }: Omit<ChatCompressionEvent, CommonFields>): ChatCompressionEvent {
   return {
-    'event.name': 'chat_compression',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "chat_compression",
+    "event.timestamp": new Date().toISOString(),
     tokens_before,
     tokens_after,
-    ...(compression_input_token_count !== undefined
-      ? { compression_input_token_count }
-      : {}),
-    ...(compression_output_token_count !== undefined
-      ? { compression_output_token_count }
-      : {}),
+    ...(compression_input_token_count !== undefined ? { compression_input_token_count } : {}),
+    ...(compression_output_token_count !== undefined ? { compression_output_token_count } : {}),
   };
 }
 
 export class MalformedJsonResponseEvent implements BaseTelemetryEvent {
-  'event.name': 'malformed_json_response';
-  'event.timestamp': string;
+  "event.name": "malformed_json_response";
+  "event.timestamp": string;
   model: string;
 
   constructor(model: string) {
-    this['event.name'] = 'malformed_json_response';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "malformed_json_response";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
   }
 }
 
 export enum IdeConnectionType {
-  START = 'start',
-  SESSION = 'session',
+  START = "start",
+  SESSION = "session",
 }
 
 export class IdeConnectionEvent {
-  'event.name': 'ide_connection';
-  'event.timestamp': string;
+  "event.name": "ide_connection";
+  "event.timestamp": string;
   connection_type: IdeConnectionType;
 
   constructor(connection_type: IdeConnectionType) {
-    this['event.name'] = 'ide_connection';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "ide_connection";
+    this["event.timestamp"] = new Date().toISOString();
     this.connection_type = connection_type;
   }
 }
 
 export class ConversationFinishedEvent {
-  'event_name': 'conversation_finished';
-  'event.timestamp': string; // ISO 8601;
+  event_name: "conversation_finished";
+  "event.timestamp": string; // ISO 8601;
   approvalMode: ApprovalMode;
   turnCount: number;
 
   constructor(approvalMode: ApprovalMode, turnCount: number) {
-    this['event_name'] = 'conversation_finished';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event_name"] = "conversation_finished";
+    this["event.timestamp"] = new Date().toISOString();
     this.approvalMode = approvalMode;
     this.turnCount = turnCount;
   }
 }
 
 export class KittySequenceOverflowEvent {
-  'event.name': 'kitty_sequence_overflow';
-  'event.timestamp': string; // ISO 8601
+  "event.name": "kitty_sequence_overflow";
+  "event.timestamp": string; // ISO 8601
   sequence_length: number;
   truncated_sequence: string;
   constructor(sequence_length: number, truncated_sequence: string) {
-    this['event.name'] = 'kitty_sequence_overflow';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "kitty_sequence_overflow";
+    this["event.timestamp"] = new Date().toISOString();
     this.sequence_length = sequence_length;
     // Truncate to first 20 chars for logging (avoid logging sensitive data)
     this.truncated_sequence = truncated_sequence.substring(0, 20);
@@ -541,8 +512,8 @@ export class KittySequenceOverflowEvent {
 }
 
 export class FileOperationEvent implements BaseTelemetryEvent {
-  'event.name': 'file_operation';
-  'event.timestamp': string;
+  "event.name": "file_operation";
+  "event.timestamp": string;
   tool_name: string;
   operation: FileOperation;
   lines?: number;
@@ -558,8 +529,8 @@ export class FileOperationEvent implements BaseTelemetryEvent {
     extension?: string,
     programming_language?: string,
   ) {
-    this['event.name'] = 'file_operation';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "file_operation";
+    this["event.timestamp"] = new Date().toISOString();
     this.tool_name = tool_name;
     this.operation = operation;
     this.lines = lines;
@@ -571,33 +542,28 @@ export class FileOperationEvent implements BaseTelemetryEvent {
 
 // Add these new event interfaces
 export class InvalidChunkEvent implements BaseTelemetryEvent {
-  'event.name': 'invalid_chunk';
-  'event.timestamp': string;
+  "event.name": "invalid_chunk";
+  "event.timestamp": string;
   error_message?: string; // Optional: validation error details
 
   constructor(error_message?: string) {
-    this['event.name'] = 'invalid_chunk';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "invalid_chunk";
+    this["event.timestamp"] = new Date().toISOString();
     this.error_message = error_message;
   }
 }
 
 export class ContentRetryEvent implements BaseTelemetryEvent {
-  'event.name': 'content_retry';
-  'event.timestamp': string;
+  "event.name": "content_retry";
+  "event.timestamp": string;
   attempt_number: number;
   error_type: string; // e.g., 'EmptyStreamError'
   retry_delay_ms: number;
   model: string;
 
-  constructor(
-    attempt_number: number,
-    error_type: string,
-    retry_delay_ms: number,
-    model: string,
-  ) {
-    this['event.name'] = 'content_retry';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(attempt_number: number, error_type: string, retry_delay_ms: number, model: string) {
+    this["event.name"] = "content_retry";
+    this["event.timestamp"] = new Date().toISOString();
     this.attempt_number = attempt_number;
     this.error_type = error_type;
     this.retry_delay_ms = retry_delay_ms;
@@ -606,8 +572,8 @@ export class ContentRetryEvent implements BaseTelemetryEvent {
 }
 
 export class ContentRetryFailureEvent implements BaseTelemetryEvent {
-  'event.name': 'content_retry_failure';
-  'event.timestamp': string;
+  "event.name": "content_retry_failure";
+  "event.timestamp": string;
   total_attempts: number;
   final_error_type: string;
   total_duration_ms?: number; // Optional: total time spent retrying
@@ -619,8 +585,8 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
     model: string,
     total_duration_ms?: number,
   ) {
-    this['event.name'] = 'content_retry_failure';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "content_retry_failure";
+    this["event.timestamp"] = new Date().toISOString();
     this.total_attempts = total_attempts;
     this.final_error_type = final_error_type;
     this.total_duration_ms = total_duration_ms;
@@ -629,21 +595,21 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
 }
 
 export class ExtensionInstallEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_install';
-  'event.timestamp': string;
+  "event.name": "extension_install";
+  "event.timestamp": string;
   extension_name: string;
   extension_version: string;
   extension_source: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
   constructor(
     extension_name: string,
     extension_version: string,
     extension_source: string,
-    status: 'success' | 'error',
+    status: "success" | "error",
   ) {
-    this['event.name'] = 'extension_install';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_install";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_version = extension_version;
     this.extension_source = extension_source;
@@ -652,9 +618,9 @@ export class ExtensionInstallEvent implements BaseTelemetryEvent {
 }
 
 export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
-  readonly eventName = 'tool_output_truncated';
-  readonly 'event.timestamp' = new Date().toISOString();
-  'event.name': string;
+  readonly eventName = "tool_output_truncated";
+  readonly "event.timestamp" = new Date().toISOString();
+  "event.name": string;
   tool_name: string;
   original_content_length: number;
   truncated_content_length: number;
@@ -672,7 +638,7 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
       lines: number;
     },
   ) {
-    this['event.name'] = this.eventName;
+    this["event.name"] = this.eventName;
     this.prompt_id = prompt_id;
     this.tool_name = details.toolName;
     this.original_content_length = details.originalContentLength;
@@ -683,28 +649,28 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
 }
 
 export class ExtensionUninstallEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_uninstall';
-  'event.timestamp': string;
+  "event.name": "extension_uninstall";
+  "event.timestamp": string;
   extension_name: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
-  constructor(extension_name: string, status: 'success' | 'error') {
-    this['event.name'] = 'extension_uninstall';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(extension_name: string, status: "success" | "error") {
+    this["event.name"] = "extension_uninstall";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.status = status;
   }
 }
 
 export class ExtensionUpdateEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_update';
-  'event.timestamp': string;
+  "event.name": "extension_update";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   extension_previous_version: string;
   extension_version: string;
   extension_source: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
   constructor(
     extension_name: string,
@@ -712,10 +678,10 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
     extension_version: string,
     extension_previous_version: string,
     extension_source: string,
-    status: 'success' | 'error',
+    status: "success" | "error",
   ) {
-    this['event.name'] = 'extension_update';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_update";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.extension_version = extension_version;
@@ -726,51 +692,51 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
 }
 
 export class ExtensionEnableEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_enable';
-  'event.timestamp': string;
+  "event.name": "extension_enable";
+  "event.timestamp": string;
   extension_name: string;
   setting_scope: string;
 
   constructor(extension_name: string, settingScope: string) {
-    this['event.name'] = 'extension_enable';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_enable";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.setting_scope = settingScope;
   }
 }
 
 export class ModelSlashCommandEvent implements BaseTelemetryEvent {
-  'event.name': 'model_slash_command';
-  'event.timestamp': string;
+  "event.name": "model_slash_command";
+  "event.timestamp": string;
   model_name: string;
 
   constructor(model_name: string) {
-    this['event.name'] = 'model_slash_command';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "model_slash_command";
+    this["event.timestamp"] = new Date().toISOString();
     this.model_name = model_name;
   }
 }
 
 export class SubagentExecutionEvent implements BaseTelemetryEvent {
-  'event.name': 'subagent_execution';
-  'event.timestamp': string;
+  "event.name": "subagent_execution";
+  "event.timestamp": string;
   subagent_name: string;
-  status: 'started' | 'completed' | 'failed' | 'cancelled';
+  status: "started" | "completed" | "failed" | "cancelled";
   terminate_reason?: string;
   result?: string;
   execution_summary?: string;
 
   constructor(
     subagent_name: string,
-    status: 'started' | 'completed' | 'failed' | 'cancelled',
+    status: "started" | "completed" | "failed" | "cancelled",
     options?: {
       terminate_reason?: string;
       result?: string;
       execution_summary?: string;
     },
   ) {
-    this['event.name'] = 'subagent_execution';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "subagent_execution";
+    this["event.timestamp"] = new Date().toISOString();
     this.subagent_name = subagent_name;
     this.status = status;
     this.terminate_reason = options?.terminate_reason;
@@ -780,21 +746,21 @@ export class SubagentExecutionEvent implements BaseTelemetryEvent {
 }
 
 export class AuthEvent implements BaseTelemetryEvent {
-  'event.name': 'auth';
-  'event.timestamp': string;
+  "event.name": "auth";
+  "event.timestamp": string;
   auth_type: AuthType;
-  action_type: 'auto' | 'manual' | 'coding-plan';
-  status: 'success' | 'error' | 'cancelled';
+  action_type: "auto" | "manual" | "coding-plan";
+  status: "success" | "error" | "cancelled";
   error_message?: string;
 
   constructor(
     auth_type: AuthType,
-    action_type: 'auto' | 'manual' | 'coding-plan',
-    status: 'success' | 'error' | 'cancelled',
+    action_type: "auto" | "manual" | "coding-plan",
+    status: "success" | "error" | "cancelled",
     error_message?: string,
   ) {
-    this['event.name'] = 'auth';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "auth";
+    this["event.timestamp"] = new Date().toISOString();
     this.auth_type = auth_type;
     this.action_type = action_type;
     this.status = status;
@@ -806,10 +772,10 @@ export class AuthEvent implements BaseTelemetryEvent {
  * Hook call telemetry event
  */
 export class HookCallEvent implements BaseTelemetryEvent {
-  'event.name': string;
-  'event.timestamp': string;
+  "event.name": string;
+  "event.timestamp": string;
   hook_event_name: string;
-  hook_type: 'command';
+  hook_type: "command";
   hook_name: string;
   hook_input: Record<string, unknown>;
   hook_output?: Record<string, unknown>;
@@ -822,7 +788,7 @@ export class HookCallEvent implements BaseTelemetryEvent {
 
   constructor(
     hookEventName: string,
-    hookType: 'command',
+    hookType: "command",
     hookName: string,
     hookInput: Record<string, unknown>,
     durationMs: number,
@@ -833,8 +799,8 @@ export class HookCallEvent implements BaseTelemetryEvent {
     stderr?: string,
     error?: string,
   ) {
-    this['event.name'] = 'hook_call';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "hook_call";
+    this["event.timestamp"] = new Date().toISOString();
     this.hook_event_name = hookEventName;
     this.hook_type = hookType;
     this.hook_name = hookName;
@@ -850,14 +816,14 @@ export class HookCallEvent implements BaseTelemetryEvent {
 }
 
 export class SkillLaunchEvent implements BaseTelemetryEvent {
-  'event.name': 'skill_launch';
-  'event.timestamp': string;
+  "event.name": "skill_launch";
+  "event.timestamp": string;
   skill_name: string;
   success: boolean;
 
   constructor(skill_name: string, success: boolean) {
-    this['event.name'] = 'skill_launch';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "skill_launch";
+    this["event.timestamp"] = new Date().toISOString();
     this.skill_name = skill_name;
     this.success = success;
   }
@@ -870,8 +836,8 @@ export enum UserFeedbackRating {
 }
 
 export class UserFeedbackEvent implements BaseTelemetryEvent {
-  'event.name': 'user_feedback';
-  'event.timestamp': string;
+  "event.name": "user_feedback";
+  "event.timestamp": string;
   session_id: string;
   rating: UserFeedbackRating;
   model: string;
@@ -885,8 +851,8 @@ export class UserFeedbackEvent implements BaseTelemetryEvent {
     approval_mode: string,
     prompt_id?: string,
   ) {
-    this['event.name'] = 'user_feedback';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "user_feedback";
+    this["event.timestamp"] = new Date().toISOString();
     this.session_id = session_id;
     this.rating = rating;
     this.model = model;
@@ -934,7 +900,7 @@ export type TelemetryEvent =
 // ─── Arena Telemetry Events ────────────────────────────────────
 
 export interface ArenaSessionStartedEvent extends BaseTelemetryEvent {
-  'event.name': 'arena_session_started';
+  "event.name": "arena_session_started";
   arena_session_id: string;
   model_ids: string[];
   task_length: number;
@@ -946,18 +912,18 @@ export function makeArenaSessionStartedEvent({
   task_length,
 }: Omit<ArenaSessionStartedEvent, CommonFields>): ArenaSessionStartedEvent {
   return {
-    'event.name': 'arena_session_started',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "arena_session_started",
+    "event.timestamp": new Date().toISOString(),
     arena_session_id,
     model_ids,
     task_length,
   };
 }
 
-export type ArenaAgentCompletedStatus = 'completed' | 'failed' | 'cancelled';
+export type ArenaAgentCompletedStatus = "completed" | "failed" | "cancelled";
 
 export interface ArenaAgentCompletedEvent extends BaseTelemetryEvent {
-  'event.name': 'arena_agent_completed';
+  "event.name": "arena_agent_completed";
   arena_session_id: string;
   agent_session_id: string;
   agent_model_id: string;
@@ -987,8 +953,8 @@ export function makeArenaAgentCompletedEvent({
   failed_tool_calls,
 }: Omit<ArenaAgentCompletedEvent, CommonFields>): ArenaAgentCompletedEvent {
   return {
-    'event.name': 'arena_agent_completed',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "arena_agent_completed",
+    "event.timestamp": new Date().toISOString(),
     arena_session_id,
     agent_session_id,
     agent_model_id,
@@ -1004,14 +970,10 @@ export function makeArenaAgentCompletedEvent({
   };
 }
 
-export type ArenaSessionEndedStatus =
-  | 'selected'
-  | 'discarded'
-  | 'failed'
-  | 'cancelled';
+export type ArenaSessionEndedStatus = "selected" | "discarded" | "failed" | "cancelled";
 
 export interface ArenaSessionEndedEvent extends BaseTelemetryEvent {
-  'event.name': 'arena_session_ended';
+  "event.name": "arena_session_ended";
   arena_session_id: string;
   status: ArenaSessionEndedStatus;
   duration_ms: number;
@@ -1035,8 +997,8 @@ export function makeArenaSessionEndedEvent({
   winner_model_id,
 }: Omit<ArenaSessionEndedEvent, CommonFields>): ArenaSessionEndedEvent {
   return {
-    'event.name': 'arena_session_ended',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "arena_session_ended",
+    "event.timestamp": new Date().toISOString(),
     arena_session_id,
     status,
     duration_ms,
@@ -1050,25 +1012,25 @@ export function makeArenaSessionEndedEvent({
 }
 
 export class ExtensionDisableEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_disable';
-  'event.timestamp': string;
+  "event.name": "extension_disable";
+  "event.timestamp": string;
   extension_name: string;
   setting_scope: string;
 
   constructor(extension_name: string, settingScope: string) {
-    this['event.name'] = 'extension_disable';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_disable";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.setting_scope = settingScope;
   }
 }
 
 export class PromptSuggestionEvent implements BaseTelemetryEvent {
-  'event.name': 'airiscode.prompt_suggestion';
-  'event.timestamp': string;
-  outcome: 'accepted' | 'ignored' | 'suppressed';
+  "event.name": "airiscode.prompt_suggestion";
+  "event.timestamp": string;
+  outcome: "accepted" | "ignored" | "suppressed";
   prompt_id?: string;
-  accept_method?: 'tab' | 'enter' | 'right';
+  accept_method?: "tab" | "enter" | "right";
   time_to_accept_ms?: number;
   time_to_ignore_ms?: number;
   time_to_first_keystroke_ms?: number;
@@ -1078,9 +1040,9 @@ export class PromptSuggestionEvent implements BaseTelemetryEvent {
   reason?: string;
 
   constructor(params: {
-    outcome: 'accepted' | 'ignored' | 'suppressed';
+    outcome: "accepted" | "ignored" | "suppressed";
     prompt_id?: string;
-    accept_method?: 'tab' | 'enter' | 'right';
+    accept_method?: "tab" | "enter" | "right";
     time_to_accept_ms?: number;
     time_to_ignore_ms?: number;
     time_to_first_keystroke_ms?: number;
@@ -1089,10 +1051,10 @@ export class PromptSuggestionEvent implements BaseTelemetryEvent {
     was_focused_when_shown?: boolean;
     reason?: string;
   }) {
-    this['event.name'] = 'airiscode.prompt_suggestion';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "airiscode.prompt_suggestion";
+    this["event.timestamp"] = new Date().toISOString();
     this.outcome = params.outcome;
-    this.prompt_id = params.prompt_id ?? 'user_intent';
+    this.prompt_id = params.prompt_id ?? "user_intent";
     this.accept_method = params.accept_method;
     this.time_to_accept_ms = params.time_to_accept_ms;
     this.time_to_ignore_ms = params.time_to_ignore_ms;
@@ -1105,9 +1067,9 @@ export class PromptSuggestionEvent implements BaseTelemetryEvent {
 }
 
 export class SpeculationEvent implements BaseTelemetryEvent {
-  'event.name': 'airiscode.speculation';
-  'event.timestamp': string;
-  outcome: 'accepted' | 'aborted' | 'failed';
+  "event.name": "airiscode.speculation";
+  "event.timestamp": string;
+  outcome: "accepted" | "aborted" | "failed";
   turns_used: number;
   files_written: number;
   tool_use_count: number;
@@ -1116,7 +1078,7 @@ export class SpeculationEvent implements BaseTelemetryEvent {
   had_pipelined_suggestion: boolean;
 
   constructor(params: {
-    outcome: 'accepted' | 'aborted' | 'failed';
+    outcome: "accepted" | "aborted" | "failed";
     turns_used: number;
     files_written: number;
     tool_use_count: number;
@@ -1124,8 +1086,8 @@ export class SpeculationEvent implements BaseTelemetryEvent {
     boundary_type?: string;
     had_pipelined_suggestion: boolean;
   }) {
-    this['event.name'] = 'airiscode.speculation';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "airiscode.speculation";
+    this["event.timestamp"] = new Date().toISOString();
     this.outcome = params.outcome;
     this.turns_used = params.turns_used;
     this.files_written = params.files_written;
diff --git a/packages/airiscode-core/src/telemetry/uiTelemetry.ts b/packages/airiscode-core/src/telemetry/uiTelemetry.ts
index a7361f038..2ee355593 100644
--- a/packages/airiscode-core/src/telemetry/uiTelemetry.ts
+++ b/packages/airiscode-core/src/telemetry/uiTelemetry.ts
@@ -4,30 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
-import {
-  EVENT_API_ERROR,
-  EVENT_API_RESPONSE,
-  EVENT_TOOL_CALL,
-} from './constants.js';
+import { EventEmitter } from "node:events";
+import { EVENT_API_ERROR, EVENT_API_RESPONSE, EVENT_TOOL_CALL } from "./constants.js";
 
-import { ToolCallDecision } from './tool-call-decision.js';
-import type {
-  ApiErrorEvent,
-  ApiResponseEvent,
-  ToolCallEvent,
-} from './types.js';
+import { ToolCallDecision } from "./tool-call-decision.js";
+import type { ApiErrorEvent, ApiResponseEvent, ToolCallEvent } from "./types.js";
 
 export type UiEvent =
-  | (ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE })
-  | (ApiErrorEvent & { 'event.name': typeof EVENT_API_ERROR })
-  | (ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+  | (ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE })
+  | (ApiErrorEvent & { "event.name": typeof EVENT_API_ERROR })
+  | (ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
 export {
   EVENT_API_ERROR,
   EVENT_API_RESPONSE,
   EVENT_TOOL_CALL,
-} from './constants.js';
+} from "./constants.js";
 
 export interface ToolCallStats {
   count: number;
@@ -122,7 +114,7 @@ export class UiTelemetryService extends EventEmitter {
   #lastCachedContentTokenCount = 0;
 
   addEvent(event: UiEvent) {
-    switch (event['event.name']) {
+    switch (event["event.name"]) {
       case EVENT_API_RESPONSE:
         this.processApiResponse(event);
         break;
@@ -137,7 +129,7 @@ export class UiTelemetryService extends EventEmitter {
         return;
     }
 
-    this.emit('update', {
+    this.emit("update", {
       metrics: this.#metrics,
       lastPromptTokenCount: this.#lastPromptTokenCount,
     });
@@ -153,7 +145,7 @@ export class UiTelemetryService extends EventEmitter {
 
   setLastPromptTokenCount(lastPromptTokenCount: number): void {
     this.#lastPromptTokenCount = lastPromptTokenCount;
-    this.emit('update', {
+    this.emit("update", {
       metrics: this.#metrics,
       lastPromptTokenCount: this.#lastPromptTokenCount,
     });
@@ -174,7 +166,7 @@ export class UiTelemetryService extends EventEmitter {
     this.#metrics = createInitialMetrics();
     this.#lastPromptTokenCount = 0;
     this.#lastCachedContentTokenCount = 0;
-    this.emit('update', {
+    this.emit("update", {
       metrics: this.#metrics,
       lastPromptTokenCount: this.#lastPromptTokenCount,
     });
@@ -250,11 +242,11 @@ export class UiTelemetryService extends EventEmitter {
 
     // Aggregate line count data from metadata
     if (event.metadata) {
-      if (event.metadata['model_added_lines'] !== undefined) {
-        files.totalLinesAdded += event.metadata['model_added_lines'];
+      if (event.metadata["model_added_lines"] !== undefined) {
+        files.totalLinesAdded += event.metadata["model_added_lines"];
       }
-      if (event.metadata['model_removed_lines'] !== undefined) {
-        files.totalLinesRemoved += event.metadata['model_removed_lines'];
+      if (event.metadata["model_removed_lines"] !== undefined) {
+        files.totalLinesRemoved += event.metadata["model_removed_lines"];
       }
     }
   }
diff --git a/packages/airiscode-core/src/test-utils/config.ts b/packages/airiscode-core/src/test-utils/config.ts
index 7a9e95b41..3e6e525d1 100644
--- a/packages/airiscode-core/src/test-utils/config.ts
+++ b/packages/airiscode-core/src/test-utils/config.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ConfigParameters } from '../config/config.js';
-import { Config } from '../config/config.js';
+import type { ConfigParameters } from "../config/config.js";
+import { Config } from "../config/config.js";
 
 /**
  * Default parameters used for {@link FAKE_CONFIG}
@@ -14,9 +14,9 @@ export const DEFAULT_CONFIG_PARAMETERS: ConfigParameters = {
   usageStatisticsEnabled: true,
   debugMode: false,
   proxy: undefined,
-  model: 'qwen-9001-super-duper',
-  targetDir: '/',
-  cwd: '/',
+  model: "qwen-9001-super-duper",
+  targetDir: "/",
+  cwd: "/",
 };
 
 /**
diff --git a/packages/airiscode-core/src/test-utils/index.ts b/packages/airiscode-core/src/test-utils/index.ts
index 6146d39d3..afcb672ae 100644
--- a/packages/airiscode-core/src/test-utils/index.ts
+++ b/packages/airiscode-core/src/test-utils/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './mock-tool.js';
+export * from "./mock-tool.js";
diff --git a/packages/airiscode-core/src/test-utils/mock-tool.ts b/packages/airiscode-core/src/test-utils/mock-tool.ts
index 0e3cf293d..8e03cdea4 100644
--- a/packages/airiscode-core/src/test-utils/mock-tool.ts
+++ b/packages/airiscode-core/src/test-utils/mock-tool.ts
@@ -4,21 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from '../tools/modifiable-tool.js';
-import type {
-  ToolCallConfirmationDetails,
-  ToolInvocation,
-  ToolResult,
-} from '../tools/tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-} from '../tools/tools.js';
+import type { PermissionDecision } from "../permissions/types.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "../tools/modifiable-tool.js";
+import type { ToolCallConfirmationDetails, ToolInvocation, ToolResult } from "../tools/tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "../tools/tools.js";
 
 interface MockToolOptions {
   name: string;
@@ -27,9 +16,7 @@ interface MockToolOptions {
   canUpdateOutput?: boolean;
   isOutputMarkdown?: boolean;
   getDefaultPermission?: () => Promise<PermissionDecision>;
-  getConfirmationDetails?: (
-    signal: AbortSignal,
-  ) => Promise<ToolCallConfirmationDetails>;
+  getConfirmationDetails?: (signal: AbortSignal) => Promise<ToolCallConfirmationDetails>;
   execute?: (
     params: { [key: string]: unknown },
     signal?: AbortSignal,
@@ -38,10 +25,7 @@ interface MockToolOptions {
   params?: object;
 }
 
-class MockToolInvocation extends BaseToolInvocation<
-  { [key: string]: unknown },
-  ToolResult
-> {
+class MockToolInvocation extends BaseToolInvocation<{ [key: string]: unknown }, ToolResult> {
   constructor(
     private readonly tool: MockTool,
     params: { [key: string]: unknown },
@@ -49,10 +33,7 @@ class MockToolInvocation extends BaseToolInvocation<
     super(params);
   }
 
-  execute(
-    signal: AbortSignal,
-    updateOutput?: (output: string) => void,
-  ): Promise<ToolResult> {
+  execute(signal: AbortSignal, updateOutput?: (output: string) => void): Promise<ToolResult> {
     if (updateOutput) {
       return this.tool.execute(this.params, signal, updateOutput);
     } else {
@@ -64,9 +45,7 @@ class MockToolInvocation extends BaseToolInvocation<
     return this.tool.getDefaultPermission();
   }
 
-  override getConfirmationDetails(
-    abortSignal: AbortSignal,
-  ): Promise<ToolCallConfirmationDetails> {
+  override getConfirmationDetails(abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails> {
     return this.tool.getConfirmationDetails(abortSignal);
   }
 
@@ -78,14 +57,9 @@ class MockToolInvocation extends BaseToolInvocation<
 /**
  * A highly configurable mock tool for testing purposes.
  */
-export class MockTool extends BaseDeclarativeTool<
-  { [key: string]: unknown },
-  ToolResult
-> {
+export class MockTool extends BaseDeclarativeTool<{ [key: string]: unknown }, ToolResult> {
   getDefaultPermission: () => Promise<PermissionDecision>;
-  getConfirmationDetails: (
-    signal: AbortSignal,
-  ) => Promise<ToolCallConfirmationDetails>;
+  getConfirmationDetails: (signal: AbortSignal) => Promise<ToolCallConfirmationDetails>;
   execute: (
     params: { [key: string]: unknown },
     signal?: AbortSignal,
@@ -106,8 +80,7 @@ export class MockTool extends BaseDeclarativeTool<
     if (options.getDefaultPermission) {
       this.getDefaultPermission = options.getDefaultPermission;
     } else {
-      this.getDefaultPermission = () =>
-        Promise.resolve('allow' as PermissionDecision);
+      this.getDefaultPermission = () => Promise.resolve("allow" as PermissionDecision);
     }
 
     if (options.getConfirmationDetails) {
@@ -139,15 +112,14 @@ export class MockTool extends BaseDeclarativeTool<
   }
 }
 
-export const MOCK_TOOL_GET_DEFAULT_PERMISSION = () =>
-  Promise.resolve('ask' as PermissionDecision);
+export const MOCK_TOOL_GET_DEFAULT_PERMISSION = () => Promise.resolve("ask" as PermissionDecision);
 
 export const MOCK_TOOL_GET_CONFIRMATION_DETAILS = () =>
   Promise.resolve({
-    type: 'exec' as const,
-    title: 'Confirm mockTool',
-    command: 'mockTool',
-    rootCommand: 'mockTool',
+    type: "exec" as const,
+    title: "Confirm mockTool",
+    command: "mockTool",
+    rootCommand: "mockTool",
     onConfirm: async () => {},
   });
 
@@ -173,20 +145,20 @@ export class MockModifiableToolInvocation extends BaseToolInvocation<
   }
 
   override async getDefaultPermission(): Promise<PermissionDecision> {
-    return this.tool.shouldConfirm ? 'ask' : 'allow';
+    return this.tool.shouldConfirm ? "ask" : "allow";
   }
 
   override async getConfirmationDetails(
     _abortSignal: AbortSignal,
   ): Promise<ToolCallConfirmationDetails> {
     return {
-      type: 'edit',
-      title: 'Confirm Mock Tool',
-      fileName: 'test.txt',
-      filePath: 'test.txt',
-      fileDiff: 'diff',
-      originalContent: 'originalContent',
-      newContent: 'newContent',
+      type: "edit",
+      title: "Confirm Mock Tool",
+      fileName: "test.txt",
+      filePath: "test.txt",
+      fileDiff: "diff",
+      originalContent: "originalContent",
+      newContent: "newContent",
       onConfirm: async () => {},
     };
   }
@@ -205,24 +177,21 @@ export class MockModifiableTool
 {
   // Should be overrided in test file. Functionality will be updated in follow
   // up PR which has MockModifiableTool expect MockTool
-  executeFn: (params: Record<string, unknown>) => ToolResult | undefined = () =>
-    undefined;
+  executeFn: (params: Record<string, unknown>) => ToolResult | undefined = () => undefined;
   shouldConfirm = true;
 
-  constructor(name = 'mockModifiableTool') {
-    super(name, name, 'A mock modifiable tool for testing.', Kind.Other, {
-      type: 'object',
-      properties: { param: { type: 'string' } },
+  constructor(name = "mockModifiableTool") {
+    super(name, name, "A mock modifiable tool for testing.", Kind.Other, {
+      type: "object",
+      properties: { param: { type: "string" } },
     });
   }
 
-  getModifyContext(
-    _abortSignal: AbortSignal,
-  ): ModifyContext<Record<string, unknown>> {
+  getModifyContext(_abortSignal: AbortSignal): ModifyContext<Record<string, unknown>> {
     return {
-      getFilePath: () => 'test.txt',
-      getCurrentContent: async () => 'old content',
-      getProposedContent: async () => 'new content',
+      getFilePath: () => "test.txt",
+      getCurrentContent: async () => "old content",
+      getProposedContent: async () => "new content",
       createUpdatedParams: (
         _oldContent: string,
         modifiedProposedContent: string,
diff --git a/packages/airiscode-core/src/test-utils/mockWorkspaceContext.ts b/packages/airiscode-core/src/test-utils/mockWorkspaceContext.ts
index 67c614e9f..4327d96e4 100644
--- a/packages/airiscode-core/src/test-utils/mockWorkspaceContext.ts
+++ b/packages/airiscode-core/src/test-utils/mockWorkspaceContext.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import type { WorkspaceContext } from '../utils/workspaceContext.js';
+import { vi } from "vitest";
+import type { WorkspaceContext } from "../utils/workspaceContext.js";
 
 /**
  * Creates a mock WorkspaceContext for testing
@@ -24,9 +24,7 @@ export function createMockWorkspaceContext(
     getDirectories: vi.fn().mockReturnValue(allDirs),
     isPathWithinWorkspace: vi
       .fn()
-      .mockImplementation((path: string) =>
-        allDirs.some((dir) => path.startsWith(dir)),
-      ),
+      .mockImplementation((path: string) => allDirs.some((dir) => path.startsWith(dir))),
   } as unknown as WorkspaceContext;
 
   return mockWorkspaceContext;
diff --git a/packages/airiscode-core/src/tools/agent.ts b/packages/airiscode-core/src/tools/agent.ts
index 96be07d20..68607051e 100644
--- a/packages/airiscode-core/src/tools/agent.ts
+++ b/packages/airiscode-core/src/tools/agent.ts
@@ -4,38 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
 import type {
-  ToolResult,
-  ToolResultDisplay,
-  AgentResultDisplay,
-} from './tools.js';
-import { ToolConfirmationOutcome } from './tools.js';
+  AgentApprovalRequestEvent,
+  AgentErrorEvent,
+  AgentFinishEvent,
+  AgentToolCallEvent,
+  AgentToolResultEvent,
+} from "../agents/runtime/agent-events.js";
+import { AgentEventEmitter, AgentEventType } from "../agents/runtime/agent-events.js";
+import { ContextState } from "../agents/runtime/agent-headless.js";
+import { AgentTerminateMode } from "../agents/runtime/agent-types.js";
+import type { Config } from "../config/config.js";
+import type { StopHookOutput } from "../hooks/types.js";
+import { PermissionMode } from "../hooks/types.js";
+import { BuiltinAgentRegistry } from "../subagents/builtin-agents.js";
+import type { SubagentManager } from "../subagents/subagent-manager.js";
+import type { SubagentConfig } from "../subagents/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
 import type {
+  AgentResultDisplay,
   ToolCallConfirmationDetails,
   ToolConfirmationPayload,
-} from './tools.js';
-import type { Config } from '../config/config.js';
-import type { SubagentManager } from '../subagents/subagent-manager.js';
-import type { SubagentConfig } from '../subagents/types.js';
-import { AgentTerminateMode } from '../agents/runtime/agent-types.js';
-import { ContextState } from '../agents/runtime/agent-headless.js';
-import {
-  AgentEventEmitter,
-  AgentEventType,
-} from '../agents/runtime/agent-events.js';
-import type {
-  AgentToolCallEvent,
-  AgentToolResultEvent,
-  AgentFinishEvent,
-  AgentErrorEvent,
-  AgentApprovalRequestEvent,
-} from '../agents/runtime/agent-events.js';
-import { BuiltinAgentRegistry } from '../subagents/builtin-agents.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { PermissionMode } from '../hooks/types.js';
-import type { StopHookOutput } from '../hooks/types.js';
+  ToolResult,
+  ToolResultDisplay,
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 export interface AgentParams {
   description: string;
@@ -43,7 +37,7 @@ export interface AgentParams {
   subagent_type: string;
 }
 
-const debugLogger = createDebugLogger('AGENT');
+const debugLogger = createDebugLogger("AGENT");
 
 /**
  * Agent tool that enables primary agents to delegate tasks to specialized agents.
@@ -54,37 +48,36 @@ export class AgentTool extends BaseDeclarativeTool<AgentParams, ToolResult> {
   static readonly Name: string = ToolNames.AGENT;
 
   private subagentManager: SubagentManager;
-  private availableSubagents: SubagentConfig[] =
-    BuiltinAgentRegistry.getBuiltinAgents();
+  private availableSubagents: SubagentConfig[] = BuiltinAgentRegistry.getBuiltinAgents();
   private readonly removeChangeListener: () => void;
 
   constructor(private readonly config: Config) {
     // Initialize with a basic schema first
     const initialSchema = {
-      type: 'object',
+      type: "object",
       properties: {
         description: {
-          type: 'string',
-          description: 'A short (3-5 word) description of the task',
+          type: "string",
+          description: "A short (3-5 word) description of the task",
         },
         prompt: {
-          type: 'string',
-          description: 'The task for the agent to perform',
+          type: "string",
+          description: "The task for the agent to perform",
         },
         subagent_type: {
-          type: 'string',
-          description: 'The type of specialized agent to use for this task',
+          type: "string",
+          description: "The type of specialized agent to use for this task",
         },
       },
-      required: ['description', 'prompt', 'subagent_type'],
+      required: ["description", "prompt", "subagent_type"],
       additionalProperties: false,
-      $schema: 'http://json-schema.org/draft-07/schema#',
+      $schema: "http://json-schema.org/draft-07/schema#",
     };
 
     super(
       AgentTool.Name,
       ToolDisplayNames.AGENT,
-      'Launch a new agent to handle complex, multi-step tasks autonomously.\n\nThe Agent tool launches specialized agents (subprocesses) that autonomously handle complex tasks. Each agent type has specific capabilities and tools available to it.\n\nAvailable agent types and the tools they have access to:\n',
+      "Launch a new agent to handle complex, multi-step tasks autonomously.\n\nThe Agent tool launches specialized agents (subprocesses) that autonomously handle complex tasks. Each agent type has specific capabilities and tools available to it.\n\nAvailable agent types and the tools they have access to:\n",
       Kind.Other,
       initialSchema,
       true, // isOutputMarkdown
@@ -113,7 +106,7 @@ export class AgentTool extends BaseDeclarativeTool<AgentParams, ToolResult> {
       this.availableSubagents = await this.subagentManager.listSubagents();
       this.updateDescriptionAndSchema();
     } catch (error) {
-      debugLogger.warn('Failed to load agents for Agent tool:', error);
+      debugLogger.warn("Failed to load agents for Agent tool:", error);
       this.availableSubagents = BuiltinAgentRegistry.getBuiltinAgents();
       this.updateDescriptionAndSchema();
     } finally {
@@ -129,14 +122,14 @@ export class AgentTool extends BaseDeclarativeTool<AgentParams, ToolResult> {
    * Updates the tool's description and schema based on available subagents.
    */
   private updateDescriptionAndSchema(): void {
-    let subagentDescriptions = '';
+    let subagentDescriptions = "";
     if (this.availableSubagents.length === 0) {
       subagentDescriptions =
-        'No subagents are currently configured. You can create subagents using the /agents command.';
+        "No subagents are currently configured. You can create subagents using the /agents command.";
     } else {
       subagentDescriptions = this.availableSubagents
         .map((subagent) => `- **${subagent.name}**: ${subagent.description}`)
-        .join('\n');
+        .join("\n");
     }
 
     const baseDescription = `Launch a new agent to handle complex, multi-step tasks autonomously.
@@ -225,24 +218,20 @@ assistant: "I'm going to use the ${ToolNames.AGENT} tool to launch the greeting-
     // Validate required fields
     if (
       !params.description ||
-      typeof params.description !== 'string' ||
-      params.description.trim() === ''
+      typeof params.description !== "string" ||
+      params.description.trim() === ""
     ) {
       return 'Parameter "description" must be a non-empty string.';
     }
 
-    if (
-      !params.prompt ||
-      typeof params.prompt !== 'string' ||
-      params.prompt.trim() === ''
-    ) {
+    if (!params.prompt || typeof params.prompt !== "string" || params.prompt.trim() === "") {
       return 'Parameter "prompt" must be a non-empty string.';
     }
 
     if (
       !params.subagent_type ||
-      typeof params.subagent_type !== 'string' ||
-      params.subagent_type.trim() === ''
+      typeof params.subagent_type !== "string" ||
+      params.subagent_type.trim() === ""
     ) {
       return 'Parameter "subagent_type" must be a non-empty string.';
     }
@@ -255,7 +244,7 @@ assistant: "I'm going to use the ${ToolNames.AGENT} tool to launch the greeting-
 
     if (!subagentExists) {
       const availableNames = this.availableSubagents.map((s) => s.name);
-      return `Subagent "${params.subagent_type}" not found. Available subagents: ${availableNames.join(', ')}`;
+      return `Subagent "${params.subagent_type}" not found. Available subagents: ${availableNames.join(", ")}`;
     }
 
     return null;
@@ -273,7 +262,7 @@ assistant: "I'm going to use the ${ToolNames.AGENT} tool to launch the greeting-
 class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
   readonly eventEmitter: AgentEventEmitter = new AgentEventEmitter();
   private currentDisplay: AgentResultDisplay | null = null;
-  private currentToolCalls: AgentResultDisplay['toolCalls'] = [];
+  private currentToolCalls: AgentResultDisplay["toolCalls"] = [];
 
   constructor(
     private readonly config: Config,
@@ -305,13 +294,11 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
   /**
    * Sets up event listeners for real-time subagent progress updates
    */
-  private setupEventListeners(
-    updateOutput?: (output: ToolResultDisplay) => void,
-  ): void {
+  private setupEventListeners(updateOutput?: (output: ToolResultDisplay) => void): void {
     let pendingConfirmationCallId: string | undefined;
 
     this.eventEmitter.on(AgentEventType.START, () => {
-      this.updateDisplay({ status: 'running' }, updateOutput);
+      this.updateDisplay({ status: "running" }, updateOutput);
     });
 
     this.eventEmitter.on(AgentEventType.TOOL_CALL, (...args: unknown[]) => {
@@ -319,7 +306,7 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
       const newToolCall = {
         callId: event.callId,
         name: event.name,
-        status: 'executing' as const,
+        status: "executing" as const,
         args: event.args,
         description: event.description,
       };
@@ -341,7 +328,7 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
       if (toolCallIndex >= 0) {
         this.currentToolCalls![toolCallIndex] = {
           ...this.currentToolCalls![toolCallIndex],
-          status: event.success ? 'success' : 'failed',
+          status: event.success ? "success" : "failed",
           error: event.error,
           responseParts: event.responseParts,
         };
@@ -351,9 +338,7 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
         // the IDE diff-tab accept resolved the tool via CoreToolScheduler's
         // IDE confirmation handler, which bypasses the UI's onConfirm wrapper.
         const clearPending =
-          pendingConfirmationCallId === event.callId
-            ? { pendingConfirmation: undefined }
-            : {};
+          pendingConfirmationCallId === event.callId ? { pendingConfirmation: undefined } : {};
         if (pendingConfirmationCallId === event.callId) {
           pendingConfirmationCallId = undefined;
         }
@@ -372,7 +357,7 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
       const event = args[0] as AgentFinishEvent;
       this.updateDisplay(
         {
-          status: event.terminateReason === 'GOAL' ? 'completed' : 'failed',
+          status: event.terminateReason === "GOAL" ? "completed" : "failed",
           terminateReason: event.terminateReason,
         },
         updateOutput,
@@ -383,7 +368,7 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
       const event = args[0] as AgentErrorEvent;
       this.updateDisplay(
         {
-          status: 'failed',
+          status: "failed",
           terminateReason: event.error,
         },
         updateOutput,
@@ -391,87 +376,71 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
     });
 
     // Indicate when a tool call is waiting for approval
-    this.eventEmitter.on(
-      AgentEventType.TOOL_WAITING_APPROVAL,
-      (...args: unknown[]) => {
-        const event = args[0] as AgentApprovalRequestEvent;
-        const idx = this.currentToolCalls!.findIndex(
-          (c) => c.callId === event.callId,
-        );
-        if (idx >= 0) {
-          this.currentToolCalls![idx] = {
-            ...this.currentToolCalls![idx],
-            status: 'awaiting_approval',
-          };
-        } else {
-          this.currentToolCalls!.push({
-            callId: event.callId,
-            name: event.name,
-            status: 'awaiting_approval',
-            description: event.description,
-          });
-        }
+    this.eventEmitter.on(AgentEventType.TOOL_WAITING_APPROVAL, (...args: unknown[]) => {
+      const event = args[0] as AgentApprovalRequestEvent;
+      const idx = this.currentToolCalls!.findIndex((c) => c.callId === event.callId);
+      if (idx >= 0) {
+        this.currentToolCalls![idx] = {
+          ...this.currentToolCalls![idx],
+          status: "awaiting_approval",
+        };
+      } else {
+        this.currentToolCalls!.push({
+          callId: event.callId,
+          name: event.name,
+          status: "awaiting_approval",
+          description: event.description,
+        });
+      }
 
-        // Bridge scheduler confirmation details to UI inline prompt
-        pendingConfirmationCallId = event.callId;
-        const details: ToolCallConfirmationDetails = {
-          ...(event.confirmationDetails as Omit<
-            ToolCallConfirmationDetails,
-            'onConfirm'
-          >),
-          onConfirm: async (
-            outcome: ToolConfirmationOutcome,
-            payload?: ToolConfirmationPayload,
-          ) => {
-            // Clear the inline prompt immediately
-            // and optimistically mark the tool as executing for proceed outcomes.
-            pendingConfirmationCallId = undefined;
-            const proceedOutcomes = new Set<ToolConfirmationOutcome>([
-              ToolConfirmationOutcome.ProceedOnce,
-              ToolConfirmationOutcome.ProceedAlways,
-              ToolConfirmationOutcome.ProceedAlwaysServer,
-              ToolConfirmationOutcome.ProceedAlwaysTool,
-              ToolConfirmationOutcome.ProceedAlwaysProject,
-              ToolConfirmationOutcome.ProceedAlwaysUser,
-            ]);
-
-            if (proceedOutcomes.has(outcome)) {
-              const idx2 = this.currentToolCalls!.findIndex(
-                (c) => c.callId === event.callId,
-              );
-              if (idx2 >= 0) {
-                this.currentToolCalls![idx2] = {
-                  ...this.currentToolCalls![idx2],
-                  status: 'executing',
-                };
-              }
-              this.updateDisplay(
-                {
-                  toolCalls: [...this.currentToolCalls!],
-                  pendingConfirmation: undefined,
-                },
-                updateOutput,
-              );
-            } else {
-              this.updateDisplay(
-                { pendingConfirmation: undefined },
-                updateOutput,
-              );
+      // Bridge scheduler confirmation details to UI inline prompt
+      pendingConfirmationCallId = event.callId;
+      const details: ToolCallConfirmationDetails = {
+        ...(event.confirmationDetails as Omit<ToolCallConfirmationDetails, "onConfirm">),
+        onConfirm: async (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => {
+          // Clear the inline prompt immediately
+          // and optimistically mark the tool as executing for proceed outcomes.
+          pendingConfirmationCallId = undefined;
+          const proceedOutcomes = new Set<ToolConfirmationOutcome>([
+            ToolConfirmationOutcome.ProceedOnce,
+            ToolConfirmationOutcome.ProceedAlways,
+            ToolConfirmationOutcome.ProceedAlwaysServer,
+            ToolConfirmationOutcome.ProceedAlwaysTool,
+            ToolConfirmationOutcome.ProceedAlwaysProject,
+            ToolConfirmationOutcome.ProceedAlwaysUser,
+          ]);
+
+          if (proceedOutcomes.has(outcome)) {
+            const idx2 = this.currentToolCalls!.findIndex((c) => c.callId === event.callId);
+            if (idx2 >= 0) {
+              this.currentToolCalls![idx2] = {
+                ...this.currentToolCalls![idx2],
+                status: "executing",
+              };
             }
+            this.updateDisplay(
+              {
+                toolCalls: [...this.currentToolCalls!],
+                pendingConfirmation: undefined,
+              },
+              updateOutput,
+            );
+          } else {
+            this.updateDisplay({ pendingConfirmation: undefined }, updateOutput);
+          }
 
-            await event.respond(outcome, payload);
-          },
-        } as ToolCallConfirmationDetails;
+          await event.respond(outcome, payload);
+        },
+      } as ToolCallConfirmationDetails;
 
-        this.updateDisplay(
-          {
-            toolCalls: [...this.currentToolCalls!],
-            pendingConfirmation: details,
-          },
-          updateOutput,
-        );
-      },
-    );
+      this.updateDisplay(
+        {
+          toolCalls: [...this.currentToolCalls!],
+          pendingConfirmation: details,
+        },
+        updateOutput,
+      );
+    });
   }
 
   getDescription(): string {
@@ -484,17 +453,15 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
   ): Promise<ToolResult> {
     try {
       // Load the subagent configuration
-      const subagentConfig = await this.subagentManager.loadSubagent(
-        this.params.subagent_type,
-      );
+      const subagentConfig = await this.subagentManager.loadSubagent(this.params.subagent_type);
 
       if (!subagentConfig) {
         const errorDisplay = {
-          type: 'task_execution' as const,
+          type: "task_execution" as const,
           subagentName: this.params.subagent_type,
           taskDescription: this.params.description,
           taskPrompt: this.params.prompt,
-          status: 'failed' as const,
+          status: "failed" as const,
           terminateReason: `Subagent "${this.params.subagent_type}" not found`,
         };
 
@@ -506,11 +473,11 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
 
       // Initialize the current display state
       this.currentDisplay = {
-        type: 'task_execution' as const,
+        type: "task_execution" as const,
         subagentName: subagentConfig.name,
         taskDescription: this.params.description,
         taskPrompt: this.params.prompt,
-        status: 'running' as const,
+        status: "running" as const,
         subagentColor: subagentConfig.color,
       };
 
@@ -521,15 +488,13 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
       if (updateOutput) {
         updateOutput(this.currentDisplay);
       }
-      const subagent = await this.subagentManager.createAgentHeadless(
-        subagentConfig,
-        this.config,
-        { eventEmitter: this.eventEmitter },
-      );
+      const subagent = await this.subagentManager.createAgentHeadless(subagentConfig, this.config, {
+        eventEmitter: this.eventEmitter,
+      });
 
       // Create context state with the task prompt
       const contextState = new ContextState();
-      contextState.set('task_prompt', this.params.prompt);
+      contextState.set("task_prompt", this.params.prompt);
 
       // Fire SubagentStart hook before execution
       const hookSystem = this.config.getHookSystem();
@@ -548,12 +513,10 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
           // Inject additional context from hook output into subagent context
           const additionalContext = startHookOutput?.getAdditionalContext();
           if (additionalContext) {
-            contextState.set('hook_context', additionalContext);
+            contextState.set("hook_context", additionalContext);
           }
         } catch (hookError) {
-          debugLogger.warn(
-            `[Agent] SubagentStart hook failed, continuing execution: ${hookError}`,
-          );
+          debugLogger.warn(`[Agent] SubagentStart hook failed, continuing execution: ${hookError}`);
         }
       }
 
@@ -593,20 +556,15 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
               signal,
             );
 
-            const typedStopOutput = stopHookOutput as
-              | StopHookOutput
-              | undefined;
+            const typedStopOutput = stopHookOutput as StopHookOutput | undefined;
 
-            if (
-              typedStopOutput?.isBlockingDecision() ||
-              typedStopOutput?.shouldStopExecution()
-            ) {
+            if (typedStopOutput?.isBlockingDecision() || typedStopOutput?.shouldStopExecution()) {
               // Feed the reason back to the subagent and continue execution
               const continueReason = typedStopOutput.getEffectiveReason();
               stopHookActive = true;
 
               const continueContext = new ContextState();
-              continueContext.set('task_prompt', continueReason);
+              continueContext.set("task_prompt", continueReason);
               await subagent.execute(continueContext, signal);
 
               if (signal?.aborted) {
@@ -617,9 +575,7 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
               continueExecution = false;
             }
           } catch (hookError) {
-            debugLogger.warn(
-              `[TaskTool] SubagentStop hook failed, allowing stop: ${hookError}`,
-            );
+            debugLogger.warn(`[TaskTool] SubagentStop hook failed, allowing stop: ${hookError}`);
             continueExecution = false;
           }
         }
@@ -634,8 +590,8 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
       if (signal?.aborted) {
         this.updateDisplay(
           {
-            status: 'cancelled',
-            terminateReason: 'Agent was cancelled by user',
+            status: "cancelled",
+            terminateReason: "Agent was cancelled by user",
             executionSummary,
           },
           updateOutput,
@@ -643,7 +599,7 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
       } else {
         this.updateDisplay(
           {
-            status: success ? 'completed' : 'failed',
+            status: success ? "completed" : "failed",
             terminateReason: terminateMode,
             result: finalText,
             executionSummary,
@@ -657,13 +613,12 @@ class AgentToolInvocation extends BaseToolInvocation<AgentParams, ToolResult> {
         returnDisplay: this.currentDisplay!,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       debugLogger.error(`[AgentTool] Error running subagent: ${errorMessage}`);
 
       const errorDisplay: AgentResultDisplay = {
         ...this.currentDisplay!,
-        status: 'failed',
+        status: "failed",
         terminateReason: `Failed to run subagent: ${errorMessage}`,
       };
 
diff --git a/packages/airiscode-core/src/tools/askUserQuestion.ts b/packages/airiscode-core/src/tools/askUserQuestion.ts
index fc529f9a1..f68e4f326 100644
--- a/packages/airiscode-core/src/tools/askUserQuestion.ts
+++ b/packages/airiscode-core/src/tools/askUserQuestion.ts
@@ -4,25 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { Config } from "../config/config.js";
+import { InputFormat } from "../output/types.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { FunctionDeclaration } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
 import type {
   ToolAskUserQuestionConfirmationDetails,
   ToolConfirmationPayload,
   ToolResult,
-} from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { FunctionDeclaration } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import { ToolDisplayNames, ToolNames } from './tool-names.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { InputFormat } from '../output/types.js';
-
-const debugLogger = createDebugLogger('ASK_USER_QUESTION');
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
+
+const debugLogger = createDebugLogger("ASK_USER_QUESTION");
 
 export interface QuestionOption {
   label: string;
@@ -58,88 +53,85 @@ Plan mode note: In plan mode, use this tool to clarify requirements or choose be
 `;
 
 const askUserQuestionToolSchemaData: FunctionDeclaration = {
-  name: 'ask_user_question',
+  name: "ask_user_question",
   description: askUserQuestionToolDescription,
   parametersJsonSchema: {
-    $schema: 'https://json-schema.org/draft/2020-12/schema',
-    type: 'object',
+    $schema: "https://json-schema.org/draft/2020-12/schema",
+    type: "object",
     properties: {
       questions: {
-        description: 'Questions to ask the user (1-4 questions)',
+        description: "Questions to ask the user (1-4 questions)",
         minItems: 1,
         maxItems: 4,
-        type: 'array',
+        type: "array",
         items: {
-          type: 'object',
+          type: "object",
           properties: {
             question: {
               description:
                 'The complete question to ask the user. Should be clear, specific, and end with a question mark. Example: "Which library should we use for date formatting?" If multiSelect is true, phrase it accordingly, e.g. "Which features do you want to enable?"',
-              type: 'string',
+              type: "string",
             },
             header: {
               description:
                 'Very short label displayed as a chip/tag (max 12 chars). Examples: "Auth method", "Library", "Approach".',
-              type: 'string',
+              type: "string",
             },
             options: {
               description:
                 "The available choices for this question. Must have 2-4 options. Each option should be a distinct, mutually exclusive choice (unless multiSelect is enabled). There should be no 'Other' option, that will be provided automatically.",
               minItems: 2,
               maxItems: 4,
-              type: 'array',
+              type: "array",
               items: {
-                type: 'object',
+                type: "object",
                 properties: {
                   label: {
                     description:
-                      'The display text for this option that the user will see and select. Should be concise (1-5 words) and clearly describe the choice.',
-                    type: 'string',
+                      "The display text for this option that the user will see and select. Should be concise (1-5 words) and clearly describe the choice.",
+                    type: "string",
                   },
                   description: {
                     description:
-                      'Explanation of what this option means or what will happen if chosen. Useful for providing context about trade-offs or implications.',
-                    type: 'string',
+                      "Explanation of what this option means or what will happen if chosen. Useful for providing context about trade-offs or implications.",
+                    type: "string",
                   },
                 },
-                required: ['label', 'description'],
+                required: ["label", "description"],
                 additionalProperties: false,
               },
             },
             multiSelect: {
               description:
-                'Set to true to allow the user to select multiple options instead of just one. Use when choices are not mutually exclusive.',
+                "Set to true to allow the user to select multiple options instead of just one. Use when choices are not mutually exclusive.",
               default: false,
-              type: 'boolean',
+              type: "boolean",
             },
           },
-          required: ['question', 'header', 'options', 'multiSelect'],
+          required: ["question", "header", "options", "multiSelect"],
           additionalProperties: false,
         },
       },
       metadata: {
         description:
-          'Optional metadata for tracking and analytics purposes. Not displayed to user.',
-        type: 'object',
+          "Optional metadata for tracking and analytics purposes. Not displayed to user.",
+        type: "object",
         properties: {
           source: {
             description:
               'Optional identifier for the source of this question (e.g., "remember" for /remember command). Used for analytics tracking.',
-            type: 'string',
+            type: "string",
           },
         },
         additionalProperties: false,
       },
     },
-    required: ['questions'],
+    required: ["questions"],
     additionalProperties: false,
   },
 };
 
-class AskUserQuestionToolInvocation extends BaseToolInvocation<
-  AskUserQuestionParams,
-  ToolResult
-> {
+class AskUserQuestionToolInvocation extends BaseToolInvocation<AskUserQuestionParams, ToolResult> {
   private userAnswers: Record<string, string> = {};
   private wasAnswered = false;
 
@@ -152,7 +144,7 @@ class AskUserQuestionToolInvocation extends BaseToolInvocation<
 
   getDescription(): string {
     const questionCount = this.params.questions.length;
-    return `Ask user ${questionCount} question${questionCount > 1 ? 's' : ''}`;
+    return `Ask user ${questionCount} question${questionCount > 1 ? "s" : ""}`;
   }
 
   /**
@@ -167,23 +159,20 @@ class AskUserQuestionToolInvocation extends BaseToolInvocation<
 
     if (!this._config.isInteractive() && !isAcpMode) {
       // Non-interactive + no ACP: skip entirely
-      return 'allow';
+      return "allow";
     }
-    return 'ask';
+    return "ask";
   }
 
   override async getConfirmationDetails(
     _abortSignal: AbortSignal,
   ): Promise<ToolAskUserQuestionConfirmationDetails> {
     const details: ToolAskUserQuestionConfirmationDetails = {
-      type: 'ask_user_question',
-      title: 'Please answer the following question(s):',
+      type: "ask_user_question",
+      title: "Please answer the following question(s):",
       questions: this.params.questions,
       metadata: this.params.metadata,
-      onConfirm: async (
-        outcome: ToolConfirmationOutcome,
-        payload?: ToolConfirmationPayload,
-      ) => {
+      onConfirm: async (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => {
         switch (outcome) {
           case ToolConfirmationOutcome.ProceedOnce:
           case ToolConfirmationOutcome.ProceedAlways:
@@ -215,7 +204,7 @@ class AskUserQuestionToolInvocation extends BaseToolInvocation<
       // In non-interactive mode without ACP support, we cannot collect user input
       if (!this._config.isInteractive() && !isAcpMode) {
         const errorMessage =
-          'Cannot ask user questions in non-interactive mode without ACP support. Please run in interactive mode or enable ACP mode to use this tool.';
+          "Cannot ask user questions in non-interactive mode without ACP support. Please run in interactive mode or enable ACP mode to use this tool.";
         return {
           llmContent: errorMessage,
           returnDisplay: errorMessage,
@@ -223,7 +212,7 @@ class AskUserQuestionToolInvocation extends BaseToolInvocation<
       }
 
       if (!this.wasAnswered) {
-        const cancellationMessage = 'User declined to answer the questions.';
+        const cancellationMessage = "User declined to answer the questions.";
         return {
           llmContent: cancellationMessage,
           returnDisplay: cancellationMessage,
@@ -237,7 +226,7 @@ class AskUserQuestionToolInvocation extends BaseToolInvocation<
           const question = this.params.questions[questionIndex];
           return `**${question?.header || `Question ${questionIndex + 1}`}**: ${value}`;
         })
-        .join('\n');
+        .join("\n");
 
       const llmMessage = `User has provided the following answers:\n\n${answersContent}`;
       const displayMessage = `User has provided the following answers:\n\n${answersContent}`;
@@ -247,11 +236,8 @@ class AskUserQuestionToolInvocation extends BaseToolInvocation<
         returnDisplay: displayMessage,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      debugLogger.error(
-        `[AskUserQuestionTool] Error executing ask_user_question: ${errorMessage}`,
-      );
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      debugLogger.error(`[AskUserQuestionTool] Error executing ask_user_question: ${errorMessage}`);
 
       const errorLlmContent = `Failed to process user answers: ${errorMessage}`;
 
@@ -263,10 +249,7 @@ class AskUserQuestionToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class AskUserQuestionTool extends BaseDeclarativeTool<
-  AskUserQuestionParams,
-  ToolResult
-> {
+export class AskUserQuestionTool extends BaseDeclarativeTool<AskUserQuestionParams, ToolResult> {
   static readonly Name: string = ToolNames.ASK_USER_QUESTION;
 
   constructor(private readonly config: Config) {
@@ -275,10 +258,7 @@ export class AskUserQuestionTool extends BaseDeclarativeTool<
       ToolDisplayNames.ASK_USER_QUESTION,
       askUserQuestionToolDescription,
       Kind.Think,
-      askUserQuestionToolSchemaData.parametersJsonSchema as Record<
-        string,
-        unknown
-      >,
+      askUserQuestionToolSchemaData.parametersJsonSchema as Record<string, unknown>,
     );
   }
 
@@ -298,16 +278,16 @@ export class AskUserQuestionTool extends BaseDeclarativeTool<
 
       if (
         !question.question ||
-        typeof question.question !== 'string' ||
-        question.question.trim() === ''
+        typeof question.question !== "string" ||
+        question.question.trim() === ""
       ) {
         return `Question ${i + 1}: "question" must be a non-empty string.`;
       }
 
       if (
         !question.header ||
-        typeof question.header !== 'string' ||
-        question.header.trim() === ''
+        typeof question.header !== "string" ||
+        question.header.trim() === ""
       ) {
         return `Question ${i + 1}: "header" must be a non-empty string.`;
       }
@@ -328,24 +308,20 @@ export class AskUserQuestionTool extends BaseDeclarativeTool<
       for (let j = 0; j < question.options.length; j++) {
         const option = question.options[j];
 
-        if (
-          !option.label ||
-          typeof option.label !== 'string' ||
-          option.label.trim() === ''
-        ) {
+        if (!option.label || typeof option.label !== "string" || option.label.trim() === "") {
           return `Question ${i + 1}, Option ${j + 1}: "label" must be a non-empty string.`;
         }
 
         if (
           !option.description ||
-          typeof option.description !== 'string' ||
-          option.description.trim() === ''
+          typeof option.description !== "string" ||
+          option.description.trim() === ""
         ) {
           return `Question ${i + 1}, Option ${j + 1}: "description" must be a non-empty string.`;
         }
       }
 
-      if (typeof question.multiSelect !== 'boolean') {
+      if (typeof question.multiSelect !== "boolean") {
         return `Question ${i + 1}: "multiSelect" must be a boolean.`;
       }
     }
diff --git a/packages/airiscode-core/src/tools/cron-create.ts b/packages/airiscode-core/src/tools/cron-create.ts
index 935e8a69e..b057622ff 100644
--- a/packages/airiscode-core/src/tools/cron-create.ts
+++ b/packages/airiscode-core/src/tools/cron-create.ts
@@ -2,12 +2,12 @@
  * cron_create tool — creates a new in-session cron job.
  */
 
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import type { Config } from '../config/config.js';
-import { parseCron } from '../utils/cronParser.js';
-import { humanReadableCron } from '../utils/cronDisplay.js';
+import type { Config } from "../config/config.js";
+import { humanReadableCron } from "../utils/cronDisplay.js";
+import { parseCron } from "../utils/cronParser.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 export interface CronCreateParams {
   cron: string;
@@ -15,10 +15,7 @@ export interface CronCreateParams {
   recurring?: boolean;
 }
 
-class CronCreateInvocation extends BaseToolInvocation<
-  CronCreateParams,
-  ToolResult
-> {
+class CronCreateInvocation extends BaseToolInvocation<CronCreateParams, ToolResult> {
   constructor(
     private config: Config,
     params: CronCreateParams,
@@ -38,11 +35,7 @@ class CronCreateInvocation extends BaseToolInvocation<
       // Validate cron expression before creating the job
       parseCron(this.params.cron);
 
-      const job = scheduler.create(
-        this.params.cron,
-        this.params.prompt,
-        recurring,
-      );
+      const job = scheduler.create(this.params.cron, this.params.prompt, recurring);
 
       const display = humanReadableCron(job.cronExpr);
       const returnDisplay = `Scheduled ${job.id} (${display})`;
@@ -51,13 +44,13 @@ class CronCreateInvocation extends BaseToolInvocation<
       if (recurring) {
         llmContent =
           `Scheduled recurring job ${job.id} (${job.cronExpr}). ` +
-          'Session-only (not written to disk, dies when AIRIS Code exits). ' +
-          'Auto-expires after 3 days. Use CronDelete to cancel sooner.';
+          "Session-only (not written to disk, dies when AIRIS Code exits). " +
+          "Auto-expires after 3 days. Use CronDelete to cancel sooner.";
       } else {
         llmContent =
           `Scheduled one-shot task ${job.id} (${job.cronExpr}). ` +
-          'Session-only (not written to disk, dies when AIRIS Code exits). ' +
-          'It will fire once then auto-delete.';
+          "Session-only (not written to disk, dies when AIRIS Code exits). " +
+          "It will fire once then auto-delete.";
       }
 
       return { llmContent, returnDisplay };
@@ -72,58 +65,55 @@ class CronCreateInvocation extends BaseToolInvocation<
   }
 }
 
-export class CronCreateTool extends BaseDeclarativeTool<
-  CronCreateParams,
-  ToolResult
-> {
+export class CronCreateTool extends BaseDeclarativeTool<CronCreateParams, ToolResult> {
   static readonly Name = ToolNames.CRON_CREATE;
 
   constructor(private config: Config) {
     super(
       CronCreateTool.Name,
       ToolDisplayNames.CRON_CREATE,
-      'Schedule a prompt to be enqueued at a future time. Use for both recurring schedules and one-shot reminders.\n\n' +
+      "Schedule a prompt to be enqueued at a future time. Use for both recurring schedules and one-shot reminders.\n\n" +
         'Uses standard 5-field cron in the user\'s local timezone: minute hour day-of-month month day-of-week. "0 9 * * *" means 9am local — no timezone conversion needed.\n\n' +
-        '## One-shot tasks (recurring: false)\n\n' +
+        "## One-shot tasks (recurring: false)\n\n" +
         'For "remind me at X" or "at <time>, do Y" requests — fire once then auto-delete.\n' +
-        'Pin minute/hour/day-of-month/month to specific values:\n' +
+        "Pin minute/hour/day-of-month/month to specific values:\n" +
         '  "remind me at 2:30pm today to check the deploy" → cron: "30 14 <today_dom> <today_month> *", recurring: false\n' +
         '  "tomorrow morning, run the smoke test" → cron: "57 8 <tomorrow_dom> <tomorrow_month> *", recurring: false\n\n' +
-        '## Recurring jobs (recurring: true, the default)\n\n' +
+        "## Recurring jobs (recurring: true, the default)\n\n" +
         'For "every N minutes" / "every hour" / "weekdays at 9am" requests:\n' +
         '  "*/5 * * * *" (every 5 min), "0 * * * *" (hourly), "0 9 * * 1-5" (weekdays at 9am local)\n\n' +
-        '## Avoid the :00 and :30 minute marks when the task allows it\n\n' +
+        "## Avoid the :00 and :30 minute marks when the task allows it\n\n" +
         'Every user who asks for "9am" gets `0 9`, and every user who asks for "hourly" gets `0 *` — which means requests from across the planet land on the API at the same instant. When the user\'s request is approximate, pick a minute that is NOT 0 or 30:\n' +
         '  "every morning around 9" → "57 8 * * *" or "3 9 * * *" (not "0 9 * * *")\n' +
         '  "hourly" → "7 * * * *" (not "0 * * * *")\n' +
         '  "in an hour or so, remind me to..." → pick whatever minute you land on, don\'t round\n\n' +
         'Only use minute 0 or 30 when the user names that exact time and clearly means it ("at 9:00 sharp", "at half past", coordinating with a meeting). When in doubt, nudge a few minutes early or late — the user will not notice, and the fleet will.\n\n' +
-        '## Session-only\n\n' +
-        'Jobs live only in this AIRIS Code session — nothing is written to disk, and the job is gone when AIRIS Code exits.\n\n' +
-        '## Runtime behavior\n\n' +
-        'Jobs only fire while the REPL is idle (not mid-query). The scheduler adds a small deterministic jitter on top of whatever you pick: recurring tasks fire up to 10% of their period late (max 15 min); one-shot tasks landing on :00 or :30 fire up to 90 s early. Picking an off-minute is still the bigger lever.\n\n' +
-        'Recurring tasks auto-expire after 3 days — they fire one final time, then are deleted. This bounds session lifetime. Tell the user about the 3-day limit when scheduling recurring jobs.\n\n' +
-        'Returns a job ID you can pass to CronDelete.',
+        "## Session-only\n\n" +
+        "Jobs live only in this AIRIS Code session — nothing is written to disk, and the job is gone when AIRIS Code exits.\n\n" +
+        "## Runtime behavior\n\n" +
+        "Jobs only fire while the REPL is idle (not mid-query). The scheduler adds a small deterministic jitter on top of whatever you pick: recurring tasks fire up to 10% of their period late (max 15 min); one-shot tasks landing on :00 or :30 fire up to 90 s early. Picking an off-minute is still the bigger lever.\n\n" +
+        "Recurring tasks auto-expire after 3 days — they fire one final time, then are deleted. This bounds session lifetime. Tell the user about the 3-day limit when scheduling recurring jobs.\n\n" +
+        "Returns a job ID you can pass to CronDelete.",
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {
           cron: {
-            type: 'string',
+            type: "string",
             description:
               'Standard 5-field cron expression in local time: "M H DoM Mon DoW" (e.g. "*/5 * * * *" = every 5 minutes, "30 14 28 2 *" = Feb 28 at 2:30pm local once).',
           },
           prompt: {
-            type: 'string',
-            description: 'The prompt to enqueue at each fire time.',
+            type: "string",
+            description: "The prompt to enqueue at each fire time.",
           },
           recurring: {
-            type: 'boolean',
+            type: "boolean",
             description:
               'true (default) = fire on every cron match until deleted or auto-expired after 3 days. false = fire once at the next match, then auto-delete. Use false for "remind me at X" one-shot requests with pinned minute/hour/dom/month.',
           },
         },
-        required: ['cron', 'prompt'],
+        required: ["cron", "prompt"],
         additionalProperties: false,
       },
     );
diff --git a/packages/airiscode-core/src/tools/cron-delete.ts b/packages/airiscode-core/src/tools/cron-delete.ts
index 25644982d..4a8083916 100644
--- a/packages/airiscode-core/src/tools/cron-delete.ts
+++ b/packages/airiscode-core/src/tools/cron-delete.ts
@@ -2,19 +2,16 @@
  * cron_delete tool — deletes an in-session cron job by ID.
  */
 
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 export interface CronDeleteParams {
   id: string;
 }
 
-class CronDeleteInvocation extends BaseToolInvocation<
-  CronDeleteParams,
-  ToolResult
-> {
+class CronDeleteInvocation extends BaseToolInvocation<CronDeleteParams, ToolResult> {
   constructor(
     private config: Config,
     params: CronDeleteParams,
@@ -45,27 +42,24 @@ class CronDeleteInvocation extends BaseToolInvocation<
   }
 }
 
-export class CronDeleteTool extends BaseDeclarativeTool<
-  CronDeleteParams,
-  ToolResult
-> {
+export class CronDeleteTool extends BaseDeclarativeTool<CronDeleteParams, ToolResult> {
   static readonly Name = ToolNames.CRON_DELETE;
 
   constructor(private config: Config) {
     super(
       CronDeleteTool.Name,
       ToolDisplayNames.CRON_DELETE,
-      'Cancel a cron job previously scheduled with CronCreate. Removes it from the in-memory session store.',
+      "Cancel a cron job previously scheduled with CronCreate. Removes it from the in-memory session store.",
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {
           id: {
-            type: 'string',
-            description: 'Job ID returned by CronCreate.',
+            type: "string",
+            description: "Job ID returned by CronCreate.",
           },
         },
-        required: ['id'],
+        required: ["id"],
         additionalProperties: false,
       },
     );
diff --git a/packages/airiscode-core/src/tools/cron-list.ts b/packages/airiscode-core/src/tools/cron-list.ts
index 0624d8246..abf89908d 100644
--- a/packages/airiscode-core/src/tools/cron-list.ts
+++ b/packages/airiscode-core/src/tools/cron-list.ts
@@ -2,18 +2,15 @@
  * cron_list tool — lists all active in-session cron jobs.
  */
 
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import type { Config } from '../config/config.js';
-import { humanReadableCron } from '../utils/cronDisplay.js';
+import type { Config } from "../config/config.js";
+import { humanReadableCron } from "../utils/cronDisplay.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 export type CronListParams = Record<string, never>;
 
-class CronListInvocation extends BaseToolInvocation<
-  CronListParams,
-  ToolResult
-> {
+class CronListInvocation extends BaseToolInvocation<CronListParams, ToolResult> {
   constructor(
     private config: Config,
     params: CronListParams,
@@ -22,7 +19,7 @@ class CronListInvocation extends BaseToolInvocation<
   }
 
   getDescription(): string {
-    return '';
+    return "";
   }
 
   async execute(): Promise<ToolResult> {
@@ -30,46 +27,41 @@ class CronListInvocation extends BaseToolInvocation<
     const jobs = scheduler.list();
 
     if (jobs.length === 0) {
-      const result = 'No active cron jobs.';
+      const result = "No active cron jobs.";
       return { llmContent: result, returnDisplay: result };
     }
 
     const llmLines = jobs.map((job) => {
-      const type = job.recurring ? 'recurring' : 'one-shot';
+      const type = job.recurring ? "recurring" : "one-shot";
       return `${job.id} — ${job.cronExpr} (${type}) [session-only]: ${job.prompt}`;
     });
-    const llmContent = llmLines.join('\n');
+    const llmContent = llmLines.join("\n");
 
     const displayLines = jobs.map((job) => `${job.id} ${humanReadableCron(job.cronExpr)}`);
-    const returnDisplay = displayLines.join('\n');
+    const returnDisplay = displayLines.join("\n");
 
     return { llmContent, returnDisplay };
   }
 }
 
-export class CronListTool extends BaseDeclarativeTool<
-  CronListParams,
-  ToolResult
-> {
+export class CronListTool extends BaseDeclarativeTool<CronListParams, ToolResult> {
   static readonly Name = ToolNames.CRON_LIST;
 
   constructor(private config: Config) {
     super(
       CronListTool.Name,
       ToolDisplayNames.CRON_LIST,
-      'List all cron jobs scheduled via CronCreate in this session.',
+      "List all cron jobs scheduled via CronCreate in this session.",
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {},
         additionalProperties: false,
       },
     );
   }
 
-  protected createInvocation(
-    params: CronListParams,
-  ): ToolInvocation<CronListParams, ToolResult> {
+  protected createInvocation(params: CronListParams): ToolInvocation<CronListParams, ToolResult> {
     return new CronListInvocation(this.config, params);
   }
 }
diff --git a/packages/airiscode-core/src/tools/diffOptions.ts b/packages/airiscode-core/src/tools/diffOptions.ts
index ad0738ba0..c916f83ed 100644
--- a/packages/airiscode-core/src/tools/diffOptions.ts
+++ b/packages/airiscode-core/src/tools/diffOptions.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Diff from 'diff';
-import type { DiffStat } from './tools.js';
+import * as Diff from "diff";
+import type { DiffStat } from "./tools.js";
 
 export const DEFAULT_DIFF_OPTIONS: Diff.PatchOptions = {
   context: 3,
@@ -26,10 +26,10 @@ export function getDiffStat(
 
     patch.hunks.forEach((hunk: Diff.Hunk) => {
       hunk.lines.forEach((line: string) => {
-        if (line.startsWith('+')) {
+        if (line.startsWith("+")) {
           addedLines++;
           addedChars += line.length - 1;
-        } else if (line.startsWith('-')) {
+        } else if (line.startsWith("-")) {
           removedLines++;
           removedChars += line.length - 1;
         }
@@ -43,8 +43,8 @@ export function getDiffStat(
     fileName,
     oldStr,
     aiStr,
-    'Current',
-    'Proposed',
+    "Current",
+    "Proposed",
     DEFAULT_DIFF_OPTIONS,
   );
   const modelStats = getStats(modelPatch);
@@ -54,8 +54,8 @@ export function getDiffStat(
     fileName,
     aiStr,
     userStr,
-    'Proposed',
-    'User',
+    "Proposed",
+    "User",
     DEFAULT_DIFF_OPTIONS,
   );
   const userStats = getStats(userPatch);
diff --git a/packages/airiscode-core/src/tools/edit.ts b/packages/airiscode-core/src/tools/edit.ts
index 62ee14044..076bf506d 100644
--- a/packages/airiscode-core/src/tools/edit.ts
+++ b/packages/airiscode-core/src/tools/edit.ts
@@ -4,51 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as Diff from 'diff';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import { ApprovalMode } from "../config/config.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { LineEnding } from "../services/fileSystemService.js";
+import { detectLineEnding, FileEncoding, needsUtf8Bom } from "../services/fileSystemService.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import {
+  countOccurrences,
+  extractEditSnippet,
+  maybeAugmentOldStringForDeletion,
+  normalizeEditStrings,
+} from "../utils/editHelper.js";
+import { isNodeError } from "../utils/errors.js";
+import { getSpecificMimeType, fileExists as isFilefileExists } from "../utils/fileUtils.js";
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { safeLiteralReplace } from "../utils/textUtils.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ReadFileTool } from "./read-file.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
 import type {
   ToolCallConfirmationDetails,
   ToolEditConfirmationDetails,
   ToolInvocation,
   ToolLocation,
   ToolResult,
-} from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import { BaseDeclarativeTool, Kind, ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { isNodeError } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../config/config.js';
-import {
-  FileEncoding,
-  needsUtf8Bom,
-  detectLineEnding,
-} from '../services/fileSystemService.js';
-import type { LineEnding } from '../services/fileSystemService.js';
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import { ReadFileTool } from './read-file.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import {
-  getSpecificMimeType,
-  fileExists as isFilefileExists,
-} from '../utils/fileUtils.js';
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { safeLiteralReplace } from '../utils/textUtils.js';
-import {
-  countOccurrences,
-  extractEditSnippet,
-  maybeAugmentOldStringForDeletion,
-  normalizeEditStrings,
-} from '../utils/editHelper.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 export function applyReplacement(
   currentContent: string | null,
@@ -61,10 +51,10 @@ export function applyReplacement(
   }
   if (currentContent === null) {
     // Should not happen if not a new file, but defensively return empty or newString if oldString is also empty
-    return oldString === '' ? newString : '';
+    return oldString === "" ? newString : "";
   }
   // If oldString is empty and it's not a new file, do not modify the content.
-  if (oldString === '' && !isNewFile) {
+  if (oldString === "" && !isNewFile) {
     return currentContent;
   }
 
@@ -145,12 +135,10 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
     let finalNewString = params.new_string;
     let finalOldString = params.old_string;
     let occurrences = 0;
-    let error:
-      | { display: string; raw: string; type: ToolErrorType }
-      | undefined = undefined;
+    let error: { display: string; raw: string; type: ToolErrorType } | undefined = undefined;
     let useBOM = false;
-    let detectedEncoding = 'utf-8';
-    let detectedLineEnding: LineEnding = 'lf';
+    let detectedEncoding = "utf-8";
+    let detectedLineEnding: LineEnding = "lf";
     if (fileExists) {
       try {
         const fileInfo = await this.config
@@ -159,19 +147,17 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
         if (fileInfo._meta?.bom !== undefined) {
           useBOM = fileInfo._meta.bom;
         } else {
-          useBOM =
-            fileInfo.content.length > 0 &&
-            fileInfo.content.codePointAt(0) === 0xfeff;
+          useBOM = fileInfo.content.length > 0 && fileInfo.content.codePointAt(0) === 0xfeff;
         }
-        detectedEncoding = fileInfo._meta?.encoding || 'utf-8';
+        detectedEncoding = fileInfo._meta?.encoding || "utf-8";
         // Detect original line ending style before normalizing
         detectedLineEnding = detectLineEnding(fileInfo.content);
         // Normalize line endings to LF for consistent processing.
-        currentContent = fileInfo.content.replace(/\r\n/g, '\n');
+        currentContent = fileInfo.content.replace(/\r\n/g, "\n");
         fileExists = true;
         // Encoding and BOM are returned from the same I/O pass, avoiding redundant reads.
       } catch (err: unknown) {
-        if (!isNodeError(err) || err.code !== 'ENOENT') {
+        if (!isNodeError(err) || err.code !== "ENOENT") {
           // Rethrow unexpected FS errors (permissions, etc.)
           throw err;
         }
@@ -179,15 +165,11 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
       }
     }
 
-    const normalizedStrings = normalizeEditStrings(
-      currentContent,
-      finalOldString,
-      finalNewString,
-    );
+    const normalizedStrings = normalizeEditStrings(currentContent, finalOldString, finalNewString);
     finalOldString = normalizedStrings.oldString;
     finalNewString = normalizedStrings.newString;
 
-    if (finalOldString === '' && !fileExists) {
+    if (finalOldString === "" && !fileExists) {
       // Creating a new file
       isNewFile = true;
     } else if (!fileExists) {
@@ -205,7 +187,7 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
       );
 
       occurrences = countOccurrences(currentContent, finalOldString);
-      if (params.old_string === '') {
+      if (params.old_string === "") {
         // Error: Trying to create a file that already exists
         error = {
           display: `Failed to edit. Attempted to create a file that already exists.`,
@@ -241,18 +223,12 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
     }
 
     const newContent = !error
-      ? applyReplacement(
-          currentContent,
-          finalOldString,
-          finalNewString,
-          isNewFile,
-        )
-      : (currentContent ?? '');
+      ? applyReplacement(currentContent, finalOldString, finalNewString, isNewFile)
+      : (currentContent ?? "");
 
     if (!error && fileExists && currentContent === newContent) {
       error = {
-        display:
-          'No changes to apply. The new content is identical to the current content.',
+        display: "No changes to apply. The new content is identical to the current content.",
         raw: `No changes to apply. The new content is identical to the current content in file: ${params.file_path}`,
         type: ToolErrorType.EDIT_NO_CHANGE,
       };
@@ -274,15 +250,13 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
    * Edit operations always need user confirmation (unless overridden by PM or ApprovalMode).
    */
   async getDefaultPermission(): Promise<PermissionDecision> {
-    return 'ask';
+    return "ask";
   }
 
   /**
    * Constructs the edit diff confirmation details.
    */
-  async getConfirmationDetails(
-    abortSignal: AbortSignal,
-  ): Promise<ToolCallConfirmationDetails> {
+  async getConfirmationDetails(abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails> {
     let editData: CalculatedEdit;
     try {
       editData = await this.calculateEdit(this.params);
@@ -301,14 +275,14 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
     const fileName = path.basename(this.params.file_path);
     const fileDiff = Diff.createPatch(
       fileName,
-      editData.currentContent ?? '',
+      editData.currentContent ?? "",
       editData.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Edit: ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`,
       fileName,
       filePath: this.params.file_path,
@@ -325,20 +299,17 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
-    if (this.params.old_string === '') {
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
+    if (this.params.old_string === "") {
       return `Create ${shortenPath(relativePath)}`;
     }
 
     const oldStringSnippet =
-      this.params.old_string.split('\n')[0].substring(0, 30) +
-      (this.params.old_string.length > 30 ? '...' : '');
+      this.params.old_string.split("\n")[0].substring(0, 30) +
+      (this.params.old_string.length > 30 ? "..." : "");
     const newStringSnippet =
-      this.params.new_string.split('\n')[0].substring(0, 30) +
-      (this.params.new_string.length > 30 ? '...' : '');
+      this.params.new_string.split("\n")[0].substring(0, 30) +
+      (this.params.new_string.length > 30 ? "..." : "");
 
     if (this.params.old_string === this.params.new_string) {
       return `No file changes to ${shortenPath(relativePath)}`;
@@ -415,21 +386,20 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
       }
 
       const fileName = path.basename(this.params.file_path);
-      const originallyProposedContent =
-        this.params.ai_proposed_content || editData.newContent;
+      const originallyProposedContent = this.params.ai_proposed_content || editData.newContent;
       const diffStat = getDiffStat(
         fileName,
-        editData.currentContent ?? '',
+        editData.currentContent ?? "",
         originallyProposedContent,
         editData.newContent,
       );
 
       const fileDiff = Diff.createPatch(
         fileName,
-        editData.currentContent ?? '', // Should not be null here if not isNewFile
+        editData.currentContent ?? "", // Should not be null here if not isNewFile
         editData.newContent,
-        'Current',
-        'Proposed',
+        "Current",
+        "Proposed",
         DEFAULT_DIFF_OPTIONS,
       );
       const displayResult = {
@@ -442,20 +412,16 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
 
       // Log file operation for telemetry (without diff_stat to avoid double-counting)
       const mimetype = getSpecificMimeType(this.params.file_path);
-      const programmingLanguage = getLanguageFromFilePath(
-        this.params.file_path,
-      );
+      const programmingLanguage = getLanguageFromFilePath(this.params.file_path);
       const extension = path.extname(this.params.file_path);
-      const operation = editData.isNewFile
-        ? FileOperation.CREATE
-        : FileOperation.UPDATE;
+      const operation = editData.isNewFile ? FileOperation.CREATE : FileOperation.UPDATE;
 
       logFileOperation(
         this.config,
         new FileOperationEvent(
           EditTool.Name,
           operation,
-          editData.newContent.split('\n').length,
+          editData.newContent.split("\n").length,
           mimetype,
           extension,
           programmingLanguage,
@@ -468,17 +434,14 @@ class EditToolInvocation implements ToolInvocation<EditToolParams, ToolResult> {
           : `The file: ${this.params.file_path} has been updated.`,
       ];
 
-      const snippetResult = extractEditSnippet(
-        editData.currentContent,
-        editData.newContent,
-      );
+      const snippetResult = extractEditSnippet(editData.currentContent, editData.newContent);
       if (snippetResult) {
         const snippetText = `Showing lines ${snippetResult.startLine}-${snippetResult.endLine} of ${snippetResult.totalLines} from the edited file:\n\n---\n\n${snippetResult.content}`;
         llmSuccessMessageParts.push(snippetText);
       }
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -532,28 +495,26 @@ Expectation for required parameters:
       {
         properties: {
           file_path: {
-            description:
-              "The absolute path to the file to modify. Must start with '/'.",
-            type: 'string',
+            description: "The absolute path to the file to modify. Must start with '/'.",
+            type: "string",
           },
           old_string: {
             description:
-              'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
-            type: 'string',
+              "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            type: "string",
           },
           new_string: {
             description:
-              'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
-            type: 'string',
+              "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
+            type: "string",
           },
           replace_all: {
-            type: 'boolean',
-            description:
-              'Replace all occurrences of old_string (default false).',
+            type: "boolean",
+            description: "Replace all occurrences of old_string (default false).",
           },
         },
-        required: ['file_path', 'old_string', 'new_string'],
-        type: 'object',
+        required: ["file_path", "old_string", "new_string"],
+        type: "object",
       },
     );
   }
@@ -563,9 +524,7 @@ Expectation for required parameters:
    * @param params Parameters to validate
    * @returns Error message string or null if valid
    */
-  protected override validateToolParamValues(
-    params: EditToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: EditToolParams): string | null {
     if (!params.file_path) {
       return "The 'file_path' parameter must be non-empty.";
     }
@@ -577,9 +536,7 @@ Expectation for required parameters:
     return null;
   }
 
-  protected createInvocation(
-    params: EditToolParams,
-  ): ToolInvocation<EditToolParams, ToolResult> {
+  protected createInvocation(params: EditToolParams): ToolInvocation<EditToolParams, ToolResult> {
     return new EditToolInvocation(this.config, params);
   }
 
@@ -595,11 +552,11 @@ Expectation for required parameters:
               .readTextFile({ path: params.file_path });
             return content;
           } catch (err) {
-            if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-            return '';
+            if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+            return "";
           }
         } else {
-          return '';
+          return "";
         }
       },
       getProposedContent: async (params: EditToolParams): Promise<string> => {
@@ -612,14 +569,14 @@ Expectation for required parameters:
               currentContent,
               params.old_string,
               params.new_string,
-              params.old_string === '' && currentContent === '',
+              params.old_string === "" && currentContent === "",
             );
           } catch (err) {
-            if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-            return '';
+            if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+            return "";
           }
         } else {
-          return '';
+          return "";
         }
       },
       createUpdatedParams: (
diff --git a/packages/airiscode-core/src/tools/exitPlanMode.ts b/packages/airiscode-core/src/tools/exitPlanMode.ts
index e6b8b9886..236de9722 100644
--- a/packages/airiscode-core/src/tools/exitPlanMode.ts
+++ b/packages/airiscode-core/src/tools/exitPlanMode.ts
@@ -4,21 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolPlanConfirmationDetails, ToolResult } from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { FunctionDeclaration } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../config/config.js';
-import { ToolDisplayNames, ToolNames } from './tool-names.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('EXIT_PLAN_MODE');
+import type { Config } from "../config/config.js";
+import { ApprovalMode } from "../config/config.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { FunctionDeclaration } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolPlanConfirmationDetails, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
+
+const debugLogger = createDebugLogger("EXIT_PLAN_MODE");
 
 export interface ExitPlanModeParams {
   plan: string;
@@ -43,27 +38,24 @@ Ensure your plan is complete and unambiguous:
 `;
 
 const exitPlanModeToolSchemaData: FunctionDeclaration = {
-  name: 'exit_plan_mode',
+  name: "exit_plan_mode",
   description: exitPlanModeToolDescription,
   parametersJsonSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       plan: {
-        type: 'string',
+        type: "string",
         description:
-          'The plan you came up with, that you want to run by the user for approval. Supports markdown. The plan should be pretty concise.',
+          "The plan you came up with, that you want to run by the user for approval. Supports markdown. The plan should be pretty concise.",
       },
     },
-    required: ['plan'],
+    required: ["plan"],
     additionalProperties: false,
-    $schema: 'http://json-schema.org/draft-07/schema#',
+    $schema: "http://json-schema.org/draft-07/schema#",
   },
 };
 
-class ExitPlanModeToolInvocation extends BaseToolInvocation<
-  ExitPlanModeParams,
-  ToolResult
-> {
+class ExitPlanModeToolInvocation extends BaseToolInvocation<ExitPlanModeParams, ToolResult> {
   private wasApproved = false;
 
   constructor(
@@ -74,14 +66,14 @@ class ExitPlanModeToolInvocation extends BaseToolInvocation<
   }
 
   getDescription(): string {
-    return 'Plan:';
+    return "Plan:";
   }
 
   /**
    * Plan mode exit always requires user confirmation.
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
-    return 'ask';
+    return "ask";
   }
 
   override async getConfirmationDetails(
@@ -89,8 +81,8 @@ class ExitPlanModeToolInvocation extends BaseToolInvocation<
   ): Promise<ToolPlanConfirmationDetails> {
     const prePlanMode = this.config.getPrePlanMode();
     const details: ToolPlanConfirmationDetails = {
-      type: 'plan',
-      title: 'Would you like to proceed?',
+      type: "plan",
+      title: "Would you like to proceed?",
       plan: this.params.plan,
       prePlanMode,
       onConfirm: async (outcome: ToolConfirmationOutcome) => {
@@ -127,8 +119,7 @@ class ExitPlanModeToolInvocation extends BaseToolInvocation<
     try {
       this.config.setApprovalMode(mode);
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       debugLogger.error(
         `[ExitPlanModeTool] Failed to set approval mode to "${mode}": ${errorMessage}`,
       );
@@ -145,8 +136,7 @@ class ExitPlanModeToolInvocation extends BaseToolInvocation<
       const effectivelyApproved = this.wasApproved || isYolo;
 
       if (!effectivelyApproved) {
-        const rejectionMessage =
-          'Plan execution was not approved. Remaining in plan mode.';
+        const rejectionMessage = "Plan execution was not approved. Remaining in plan mode.";
         return {
           llmContent: rejectionMessage,
           returnDisplay: rejectionMessage,
@@ -163,22 +153,19 @@ class ExitPlanModeToolInvocation extends BaseToolInvocation<
       }
 
       const llmMessage = `User has approved your plan. You can now start coding. Start with updating your todo list if applicable.`;
-      const displayMessage = 'User approved the plan.';
+      const displayMessage = "User approved the plan.";
 
       return {
         llmContent: llmMessage,
         returnDisplay: {
-          type: 'plan_summary',
+          type: "plan_summary",
           message: displayMessage,
           plan,
         },
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      debugLogger.error(
-        `[ExitPlanModeTool] Error executing exit_plan_mode: ${errorMessage}`,
-      );
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      debugLogger.error(`[ExitPlanModeTool] Error executing exit_plan_mode: ${errorMessage}`);
 
       const errorLlmContent = `Failed to present plan: ${errorMessage}`;
 
@@ -190,10 +177,7 @@ class ExitPlanModeToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class ExitPlanModeTool extends BaseDeclarativeTool<
-  ExitPlanModeParams,
-  ToolResult
-> {
+export class ExitPlanModeTool extends BaseDeclarativeTool<ExitPlanModeParams, ToolResult> {
   static readonly Name: string = ToolNames.EXIT_PLAN_MODE;
 
   constructor(private readonly config: Config) {
@@ -202,20 +186,13 @@ export class ExitPlanModeTool extends BaseDeclarativeTool<
       ToolDisplayNames.EXIT_PLAN_MODE,
       exitPlanModeToolDescription,
       Kind.Think,
-      exitPlanModeToolSchemaData.parametersJsonSchema as Record<
-        string,
-        unknown
-      >,
+      exitPlanModeToolSchemaData.parametersJsonSchema as Record<string, unknown>,
     );
   }
 
   override validateToolParams(params: ExitPlanModeParams): string | null {
     // Validate plan parameter
-    if (
-      !params.plan ||
-      typeof params.plan !== 'string' ||
-      params.plan.trim() === ''
-    ) {
+    if (!params.plan || typeof params.plan !== "string" || params.plan.trim() === "") {
       return 'Parameter "plan" must be a non-empty string.';
     }
 
diff --git a/packages/airiscode-core/src/tools/glob.ts b/packages/airiscode-core/src/tools/glob.ts
index 925eb32cc..7a5691576 100644
--- a/packages/airiscode-core/src/tools/glob.ts
+++ b/packages/airiscode-core/src/tools/glob.ts
@@ -4,25 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import { glob, escape } from 'glob';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import { resolveAndValidatePath } from '../utils/paths.js';
-import { type Config } from '../config/config.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import {
-  DEFAULT_FILE_FILTERING_OPTIONS,
-  type FileFilteringOptions,
-} from '../config/constants.js';
-import { ToolErrorType } from './tool-error.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('GLOB');
+import fs from "node:fs";
+import path from "node:path";
+import { escape as escapeGlob, glob } from "glob";
+import { type Config } from "../config/config.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS, type FileFilteringOptions } from "../config/constants.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { resolveAndValidatePath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+const debugLogger = createDebugLogger("GLOB");
 
 const MAX_FILE_COUNT = 100;
 
@@ -77,10 +74,7 @@ export interface GlobToolParams {
   path?: string;
 }
 
-class GlobToolInvocation extends BaseToolInvocation<
-  GlobToolParams,
-  ToolResult
-> {
+class GlobToolInvocation extends BaseToolInvocation<GlobToolParams, ToolResult> {
   private fileService: FileDiscoveryService;
 
   constructor(
@@ -106,17 +100,14 @@ class GlobToolInvocation extends BaseToolInvocation<
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
     if (!this.params.path) {
-      return 'allow'; // Default workspace directory
+      return "allow"; // Default workspace directory
     }
     const workspaceContext = this.config.getWorkspaceContext();
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.path,
-    );
+    const resolvedPath = path.resolve(this.config.getTargetDir(), this.params.path);
     if (workspaceContext.isPathWithinWorkspace(resolvedPath)) {
-      return 'allow';
+      return "allow";
     }
-    return 'ask';
+    return "ask";
   }
 
   /**
@@ -130,7 +121,7 @@ class GlobToolInvocation extends BaseToolInvocation<
     let effectivePattern = pattern;
     const fullPath = path.join(searchDir, effectivePattern);
     if (fs.existsSync(fullPath)) {
-      effectivePattern = escape(effectivePattern);
+      effectivePattern = escapeGlob(effectivePattern);
     }
 
     const entries = (await glob(effectivePattern, {
@@ -149,9 +140,7 @@ class GlobToolInvocation extends BaseToolInvocation<
     // Using searchDir-relative paths would cause ignore rules to be
     // evaluated against incorrect paths when searchDir != projectRoot.
     const projectRoot = this.config.getTargetDir();
-    const relativePaths = entries.map((p) =>
-      path.relative(projectRoot, p.fullpath()),
-    );
+    const relativePaths = entries.map((p) => path.relative(projectRoot, p.fullpath()));
 
     const { filteredPaths } = this.fileService.filterFilesWithReport(
       relativePaths,
@@ -159,14 +148,10 @@ class GlobToolInvocation extends BaseToolInvocation<
     );
 
     const normalizePathForComparison = (p: string) =>
-      process.platform === 'win32' || process.platform === 'darwin'
-        ? p.toLowerCase()
-        : p;
+      process.platform === "win32" || process.platform === "darwin" ? p.toLowerCase() : p;
 
     const filteredAbsolutePaths = new Set(
-      filteredPaths.map((p) =>
-        normalizePathForComparison(path.resolve(projectRoot, p)),
-      ),
+      filteredPaths.map((p) => normalizePathForComparison(path.resolve(projectRoot, p))),
     );
 
     return entries.filter((entry) =>
@@ -182,18 +167,14 @@ class GlobToolInvocation extends BaseToolInvocation<
 
       if (this.params.path) {
         // User specified a path — search only that directory
-        const searchDirAbs = resolveAndValidatePath(
-          this.config,
-          this.params.path,
-          { allowExternalPaths: true },
-        );
+        const searchDirAbs = resolveAndValidatePath(this.config, this.params.path, {
+          allowExternalPaths: true,
+        });
         searchDirs.push(searchDirAbs);
         searchLocationDescription = `within ${searchDirAbs}`;
       } else {
         // No path specified — search all workspace directories
-        const workspaceDirs = this.config
-          .getWorkspaceContext()
-          .getDirectories();
+        const workspaceDirs = this.config.getWorkspaceContext().getDirectories();
         searchDirs.push(...workspaceDirs);
         searchLocationDescription =
           workspaceDirs.length > 1
@@ -232,28 +213,17 @@ class GlobToolInvocation extends BaseToolInvocation<
       const nowTimestamp = new Date().getTime();
 
       // Sort the filtered entries using the new helper function
-      const sortedEntries = sortFileEntries(
-        filteredEntries,
-        nowTimestamp,
-        oneDayInMs,
-      );
+      const sortedEntries = sortFileEntries(filteredEntries, nowTimestamp, oneDayInMs);
 
       const totalFileCount = sortedEntries.length;
-      const fileLimit = Math.min(
-        MAX_FILE_COUNT,
-        this.config.getTruncateToolOutputLines(),
-      );
+      const fileLimit = Math.min(MAX_FILE_COUNT, this.config.getTruncateToolOutputLines());
       const truncated = totalFileCount > fileLimit;
 
       // Limit to fileLimit if needed
-      const entriesToShow = truncated
-        ? sortedEntries.slice(0, fileLimit)
-        : sortedEntries;
+      const entriesToShow = truncated ? sortedEntries.slice(0, fileLimit) : sortedEntries;
 
-      const sortedAbsolutePaths = entriesToShow.map((entry) =>
-        entry.fullpath(),
-      );
-      const fileListDescription = sortedAbsolutePaths.join('\n');
+      const sortedAbsolutePaths = entriesToShow.map((entry) => entry.fullpath());
+      const fileListDescription = sortedAbsolutePaths.join("\n");
 
       let resultMessage = `Found ${totalFileCount} file(s) matching "${this.params.pattern}" ${searchLocationDescription}`;
       resultMessage += `, sorted by modification time (newest first):\n---\n${fileListDescription}`;
@@ -261,22 +231,21 @@ class GlobToolInvocation extends BaseToolInvocation<
       // Add truncation notice if needed
       if (truncated) {
         const omittedFiles = totalFileCount - fileLimit;
-        const fileTerm = omittedFiles === 1 ? 'file' : 'files';
+        const fileTerm = omittedFiles === 1 ? "file" : "files";
         resultMessage += `\n---\n[${omittedFiles} ${fileTerm} truncated] ...`;
       }
 
       return {
         llmContent: resultMessage,
-        returnDisplay: `Found ${totalFileCount} matching file(s)${truncated ? ' (truncated)' : ''}`,
+        returnDisplay: `Found ${totalFileCount} matching file(s)${truncated ? " (truncated)" : ""}`,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       debugLogger.error(`GlobLogic execute Error: ${errorMessage}`, error);
       const rawError = `Error during glob search operation: ${errorMessage}`;
       return {
         llmContent: rawError,
-        returnDisplay: `Error: ${errorMessage || 'An unexpected error occurred.'}`,
+        returnDisplay: `Error: ${errorMessage || "An unexpected error occurred."}`,
         error: {
           message: rawError,
           type: ToolErrorType.GLOB_EXECUTION_ERROR,
@@ -289,11 +258,9 @@ class GlobToolInvocation extends BaseToolInvocation<
     const options = this.config.getFileFilteringOptions?.();
     return {
       respectGitIgnore:
-        options?.respectGitIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        options?.respectGitIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
       respectAiriscodeIgnore:
-        options?.respectAiriscodeIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectAiriscodeIgnore,
+        options?.respectAiriscodeIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectAiriscodeIgnore,
     };
   }
 }
@@ -313,17 +280,17 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
       {
         properties: {
           pattern: {
-            description: 'The glob pattern to match files against',
-            type: 'string',
+            description: "The glob pattern to match files against",
+            type: "string",
           },
           path: {
             description:
               'The directory to search in. If not specified, the current working directory will be used. IMPORTANT: Omit this field to use the default directory. DO NOT enter "undefined" or "null" - simply omit it for the default behavior. Must be a valid directory path if provided.',
-            type: 'string',
+            type: "string",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
     );
   }
@@ -331,14 +298,8 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
   /**
    * Validates the parameters for the tool.
    */
-  protected override validateToolParamValues(
-    params: GlobToolParams,
-  ): string | null {
-    if (
-      !params.pattern ||
-      typeof params.pattern !== 'string' ||
-      params.pattern.trim() === ''
-    ) {
+  protected override validateToolParamValues(params: GlobToolParams): string | null {
+    if (!params.pattern || typeof params.pattern !== "string" || params.pattern.trim() === "") {
       return "The 'pattern' parameter cannot be empty.";
     }
 
@@ -356,9 +317,7 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
     return null;
   }
 
-  protected createInvocation(
-    params: GlobToolParams,
-  ): ToolInvocation<GlobToolParams, ToolResult> {
+  protected createInvocation(params: GlobToolParams): ToolInvocation<GlobToolParams, ToolResult> {
     return new GlobToolInvocation(this.config, params);
   }
 }
diff --git a/packages/airiscode-core/src/tools/grep.ts b/packages/airiscode-core/src/tools/grep.ts
index 4f927a167..d57c75ff4 100644
--- a/packages/airiscode-core/src/tools/grep.ts
+++ b/packages/airiscode-core/src/tools/grep.ts
@@ -4,25 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import { EOL } from 'node:os';
-import { spawn } from 'node:child_process';
-import { globStream } from 'glob';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('GREP');
-import { resolveAndValidatePath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import type { Config } from '../config/config.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import type { FileExclusions } from '../utils/ignorePatterns.js';
-import { ToolErrorType } from './tool-error.js';
-import { isCommandAvailable } from '../utils/shell-utils.js';
+import { spawn } from "node:child_process";
+import fsPromises from "node:fs/promises";
+import { EOL } from "node:os";
+import path from "node:path";
+import { globStream } from "glob";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+const debugLogger = createDebugLogger("GREP");
+
+import type { Config } from "../config/config.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import type { FileExclusions } from "../utils/ignorePatterns.js";
+import { resolveAndValidatePath } from "../utils/paths.js";
+import { isCommandAvailable } from "../utils/shell-utils.js";
+import { ToolErrorType } from "./tool-error.js";
 
 // --- Interfaces ---
 
@@ -60,10 +61,7 @@ interface GrepMatch {
   line: string;
 }
 
-class GrepToolInvocation extends BaseToolInvocation<
-  GrepToolParams,
-  ToolResult
-> {
+class GrepToolInvocation extends BaseToolInvocation<GrepToolParams, ToolResult> {
   private readonly fileExclusions: FileExclusions;
 
   constructor(
@@ -80,17 +78,14 @@ class GrepToolInvocation extends BaseToolInvocation<
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
     if (!this.params.path) {
-      return 'allow'; // Default workspace directory
+      return "allow"; // Default workspace directory
     }
     const workspaceContext = this.config.getWorkspaceContext();
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.path,
-    );
+    const resolvedPath = path.resolve(this.config.getTargetDir(), this.params.path);
     if (workspaceContext.isPathWithinWorkspace(resolvedPath)) {
-      return 'allow';
+      return "allow";
     }
-    return 'ask';
+    return "ask";
   }
 
   async execute(signal: AbortSignal): Promise<ToolResult> {
@@ -101,18 +96,14 @@ class GrepToolInvocation extends BaseToolInvocation<
 
       if (this.params.path) {
         // User specified a path — search only that directory
-        const searchDirAbs = resolveAndValidatePath(
-          this.config,
-          this.params.path,
-          { allowExternalPaths: true },
-        );
+        const searchDirAbs = resolveAndValidatePath(this.config, this.params.path, {
+          allowExternalPaths: true,
+        });
         searchDirs.push(searchDirAbs);
         searchLocationDescription = `in path "${this.params.path}"`;
       } else {
         // No path specified — search all workspace directories
-        const workspaceDirs = this.config
-          .getWorkspaceContext()
-          .getDirectories();
+        const workspaceDirs = this.config.getWorkspaceContext().getDirectories();
         searchDirs.push(...workspaceDirs);
         searchLocationDescription =
           workspaceDirs.length > 1
@@ -154,9 +145,7 @@ class GrepToolInvocation extends BaseToolInvocation<
         });
       }
 
-      const filterDescription = this.params.glob
-        ? ` (filter: "${this.params.glob}")`
-        : '';
+      const filterDescription = this.params.glob ? ` (filter: "${this.params.glob}")` : "";
 
       // Check if we have any matches
       if (rawMatches.length === 0) {
@@ -179,7 +168,7 @@ class GrepToolInvocation extends BaseToolInvocation<
       }
 
       const totalMatches = rawMatches.length;
-      const matchTerm = totalMatches === 1 ? 'match' : 'matches';
+      const matchTerm = totalMatches === 1 ? "match" : "matches";
 
       // Build header
       const header = `Found ${totalMatches} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${filterDescription}:\n---\n`;
@@ -199,30 +188,27 @@ class GrepToolInvocation extends BaseToolInvocation<
       );
 
       // Build grep output
-      let grepOutput = '';
+      let grepOutput = "";
       for (const filePath in matchesByFile) {
         grepOutput += `File: ${filePath}\n`;
         matchesByFile[filePath].forEach((match) => {
           const trimmedLine = match.line.trim();
           grepOutput += `L${match.lineNumber}: ${trimmedLine}\n`;
         });
-        grepOutput += '---\n';
+        grepOutput += "---\n";
       }
 
       // Apply character limit as safety net
       let truncatedByCharLimit = false;
       if (Number.isFinite(charLimit) && grepOutput.length > charLimit) {
-        grepOutput = grepOutput.slice(0, charLimit) + '...';
+        grepOutput = grepOutput.slice(0, charLimit) + "...";
         truncatedByCharLimit = true;
       }
 
       // Count how many lines we actually included after character truncation
       const finalLines = grepOutput
-        .split('\n')
-        .filter(
-          (line) =>
-            line.trim() && !line.startsWith('File:') && !line.startsWith('---'),
-        );
+        .split("\n")
+        .filter((line) => line.trim() && !line.startsWith("File:") && !line.startsWith("---"));
       const includedLines = finalLines.length;
 
       // Build result
@@ -231,7 +217,7 @@ class GrepToolInvocation extends BaseToolInvocation<
       // Add truncation notice if needed
       if (truncatedByLineLimit || truncatedByCharLimit) {
         const omittedMatches = totalMatches - includedLines;
-        llmContent += ` [${omittedMatches} ${omittedMatches === 1 ? 'line' : 'lines'} truncated] ...`;
+        llmContent += ` [${omittedMatches} ${omittedMatches === 1 ? "line" : "lines"} truncated] ...`;
       }
 
       // Build display message
@@ -276,19 +262,16 @@ class GrepToolInvocation extends BaseToolInvocation<
       if (!line.trim()) continue;
 
       // Find the index of the first colon.
-      const firstColonIndex = line.indexOf(':');
+      const firstColonIndex = line.indexOf(":");
       if (firstColonIndex === -1) continue; // Malformed
 
       // Find the index of the second colon, searching *after* the first one.
-      const secondColonIndex = line.indexOf(':', firstColonIndex + 1);
+      const secondColonIndex = line.indexOf(":", firstColonIndex + 1);
       if (secondColonIndex === -1) continue; // Malformed
 
       // Extract parts based on the found colon indices
       const filePathRaw = line.substring(0, firstColonIndex);
-      const lineNumberStr = line.substring(
-        firstColonIndex + 1,
-        secondColonIndex,
-      );
+      const lineNumberStr = line.substring(firstColonIndex + 1, secondColonIndex);
       const lineContent = line.substring(secondColonIndex + 1);
 
       const lineNumber = parseInt(lineNumberStr, 10);
@@ -312,7 +295,7 @@ class GrepToolInvocation extends BaseToolInvocation<
    * @returns A string describing the grep
    */
   getDescription(): string {
-    let description = `'${this.params.pattern}' in path '${this.params.path || './'}'`;
+    let description = `'${this.params.pattern}' in path '${this.params.path || "./"}'`;
     if (this.params.glob) {
       description += ` (filter: '${this.params.glob}')`;
     }
@@ -332,84 +315,72 @@ class GrepToolInvocation extends BaseToolInvocation<
     signal: AbortSignal;
   }): Promise<GrepMatch[]> {
     const { pattern, path: absolutePath, glob } = options;
-    let strategyUsed = 'none';
+    let strategyUsed = "none";
 
     try {
       // --- Strategy 1: git grep ---
       const isGit = isGitRepository(absolutePath);
-      const gitAvailable = isGit && isCommandAvailable('git').available;
+      const gitAvailable = isGit && isCommandAvailable("git").available;
 
       if (gitAvailable) {
-        strategyUsed = 'git grep';
-        const gitArgs = [
-          'grep',
-          '--untracked',
-          '-n',
-          '-E',
-          '--ignore-case',
-          pattern,
-        ];
+        strategyUsed = "git grep";
+        const gitArgs = ["grep", "--untracked", "-n", "-E", "--ignore-case", pattern];
         if (glob) {
-          gitArgs.push('--', glob);
+          gitArgs.push("--", glob);
         }
 
         try {
           const output = await new Promise<string>((resolve, reject) => {
-            const child = spawn('git', gitArgs, {
+            const child = spawn("git", gitArgs, {
               cwd: absolutePath,
               windowsHide: true,
             });
             const stdoutChunks: Buffer[] = [];
             const stderrChunks: Buffer[] = [];
 
-            child.stdout.on('data', (chunk) => stdoutChunks.push(chunk));
-            child.stderr.on('data', (chunk) => stderrChunks.push(chunk));
-            child.on('error', (err) =>
+            child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
+            child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
+            child.on("error", (err) =>
               reject(new Error(`Failed to start git grep: ${err.message}`)),
             );
-            child.on('close', (code) => {
-              const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-              const stderrData = Buffer.concat(stderrChunks).toString('utf8');
+            child.on("close", (code) => {
+              const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+              const stderrData = Buffer.concat(stderrChunks).toString("utf8");
               if (code === 0) resolve(stdoutData);
               else if (code === 1)
-                resolve(''); // No matches
-              else
-                reject(
-                  new Error(`git grep exited with code ${code}: ${stderrData}`),
-                );
+                resolve(""); // No matches
+              else reject(new Error(`git grep exited with code ${code}: ${stderrData}`));
             });
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (gitError: unknown) {
           debugLogger.debug(
-            `GrepLogic: git grep failed: ${getErrorMessage(
-              gitError,
-            )}. Falling back...`,
+            `GrepLogic: git grep failed: ${getErrorMessage(gitError)}. Falling back...`,
           );
         }
       }
 
       // --- Strategy 2: System grep ---
-      const { available: grepAvailable } = isCommandAvailable('grep');
+      const { available: grepAvailable } = isCommandAvailable("grep");
       if (grepAvailable) {
-        strategyUsed = 'system grep';
-        const grepArgs = ['-r', '-n', '-H', '-E'];
+        strategyUsed = "system grep";
+        const grepArgs = ["-r", "-n", "-H", "-E"];
         // Extract directory names from exclusion patterns for grep --exclude-dir
         const globExcludes = this.fileExclusions.getGlobExcludes();
         const commonExcludes = globExcludes
           .map((pattern) => {
             let dir = pattern;
-            if (dir.startsWith('**/')) {
+            if (dir.startsWith("**/")) {
               dir = dir.substring(3);
             }
-            if (dir.endsWith('/**')) {
+            if (dir.endsWith("/**")) {
               dir = dir.slice(0, -3);
-            } else if (dir.endsWith('/')) {
+            } else if (dir.endsWith("/")) {
               dir = dir.slice(0, -1);
             }
 
             // Only consider patterns that are likely directories. This filters out file patterns.
-            if (dir && !dir.includes('/') && !dir.includes('*')) {
+            if (dir && !dir.includes("/") && !dir.includes("*")) {
               return dir;
             }
             return null;
@@ -420,11 +391,11 @@ class GrepToolInvocation extends BaseToolInvocation<
           grepArgs.push(`--include=${glob}`);
         }
         grepArgs.push(pattern);
-        grepArgs.push('.');
+        grepArgs.push(".");
 
         try {
           const output = await new Promise<string>((resolve, reject) => {
-            const child = spawn('grep', grepArgs, {
+            const child = spawn("grep", grepArgs, {
               cwd: absolutePath,
               windowsHide: true,
             });
@@ -436,7 +407,7 @@ class GrepToolInvocation extends BaseToolInvocation<
               const stderrStr = chunk.toString();
               // Suppress common harmless stderr messages
               if (
-                !stderrStr.includes('Permission denied') &&
+                !stderrStr.includes("Permission denied") &&
                 !/grep:.*: Is a directory/i.test(stderrStr)
               ) {
                 stderrChunks.push(chunk);
@@ -447,56 +418,46 @@ class GrepToolInvocation extends BaseToolInvocation<
               reject(new Error(`Failed to start system grep: ${err.message}`));
             };
             const onClose = (code: number | null) => {
-              const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-              const stderrData = Buffer.concat(stderrChunks)
-                .toString('utf8')
-                .trim();
+              const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+              const stderrData = Buffer.concat(stderrChunks).toString("utf8").trim();
               cleanup();
               if (code === 0) resolve(stdoutData);
               else if (code === 1)
-                resolve(''); // No matches
+                resolve(""); // No matches
               else {
                 if (stderrData)
-                  reject(
-                    new Error(
-                      `System grep exited with code ${code}: ${stderrData}`,
-                    ),
-                  );
-                else resolve(''); // Exit code > 1 but no stderr, likely just suppressed errors
+                  reject(new Error(`System grep exited with code ${code}: ${stderrData}`));
+                else resolve(""); // Exit code > 1 but no stderr, likely just suppressed errors
               }
             };
 
             const cleanup = () => {
-              child.stdout.removeListener('data', onData);
-              child.stderr.removeListener('data', onStderr);
-              child.removeListener('error', onError);
-              child.removeListener('close', onClose);
+              child.stdout.removeListener("data", onData);
+              child.stderr.removeListener("data", onStderr);
+              child.removeListener("error", onError);
+              child.removeListener("close", onClose);
               if (child.connected) {
                 child.disconnect();
               }
             };
 
-            child.stdout.on('data', onData);
-            child.stderr.on('data', onStderr);
-            child.on('error', onError);
-            child.on('close', onClose);
+            child.stdout.on("data", onData);
+            child.stderr.on("data", onStderr);
+            child.on("error", onError);
+            child.on("close", onClose);
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (grepError: unknown) {
           debugLogger.debug(
-            `GrepLogic: System grep failed: ${getErrorMessage(
-              grepError,
-            )}. Falling back...`,
+            `GrepLogic: System grep failed: ${getErrorMessage(grepError)}. Falling back...`,
           );
         }
       }
 
       // --- Strategy 3: Pure JavaScript Fallback ---
-      debugLogger.debug(
-        'GrepLogic: Falling back to JavaScript grep implementation.',
-      );
-      strategyUsed = 'javascript fallback';
-      const globPattern = glob ? glob : '**/*';
+      debugLogger.debug("GrepLogic: Falling back to JavaScript grep implementation.");
+      strategyUsed = "javascript fallback";
+      const globPattern = glob ? glob : "**/*";
       const ignorePatterns = this.fileExclusions.getGlobExcludes();
 
       const filesIterator = globStream(globPattern, {
@@ -508,20 +469,19 @@ class GrepToolInvocation extends BaseToolInvocation<
         signal: options.signal,
       });
 
-      const regex = new RegExp(pattern, 'i');
+      const regex = new RegExp(pattern, "i");
       const allMatches: GrepMatch[] = [];
 
       for await (const filePath of filesIterator) {
         const fileAbsolutePath = filePath as string;
         try {
-          const content = await fsPromises.readFile(fileAbsolutePath, 'utf8');
+          const content = await fsPromises.readFile(fileAbsolutePath, "utf8");
           const lines = content.split(/\r?\n/);
           lines.forEach((line, index) => {
             if (regex.test(line)) {
               allMatches.push({
                 filePath:
-                  path.relative(absolutePath, fileAbsolutePath) ||
-                  path.basename(fileAbsolutePath),
+                  path.relative(absolutePath, fileAbsolutePath) || path.basename(fileAbsolutePath),
                 lineNumber: index + 1,
                 line,
               });
@@ -529,7 +489,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           });
         } catch (readError: unknown) {
           // Ignore errors like permission denied or file gone during read
-          if (!isNodeError(readError) || readError.code !== 'ENOENT') {
+          if (!isNodeError(readError) || readError.code !== "ENOENT") {
             debugLogger.debug(
               `GrepLogic: Could not read/process ${fileAbsolutePath}: ${getErrorMessage(
                 readError,
@@ -568,28 +528,25 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
       {
         properties: {
           pattern: {
-            type: 'string',
-            description:
-              'The regular expression pattern to search for in file contents',
+            type: "string",
+            description: "The regular expression pattern to search for in file contents",
           },
           glob: {
-            type: 'string',
-            description:
-              'Glob pattern to filter files (e.g. "*.js", "*.{ts,tsx}")',
+            type: "string",
+            description: 'Glob pattern to filter files (e.g. "*.js", "*.{ts,tsx}")',
           },
           path: {
-            type: 'string',
-            description:
-              'File or directory to search in. Defaults to current working directory.',
+            type: "string",
+            description: "File or directory to search in. Defaults to current working directory.",
           },
           limit: {
-            type: 'number',
+            type: "number",
             description:
-              'Limit output to first N matching lines. Optional - shows all matches if not specified.',
+              "Limit output to first N matching lines. Optional - shows all matches if not specified.",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
     );
   }
@@ -599,9 +556,7 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
    * @param params Parameters to validate
    * @returns An error message string if invalid, null otherwise
    */
-  protected override validateToolParamValues(
-    params: GrepToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: GrepToolParams): string | null {
     // Validate pattern is a valid regex
     try {
       new RegExp(params.pattern);
@@ -623,9 +578,7 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
     return null; // Parameters are valid
   }
 
-  protected createInvocation(
-    params: GrepToolParams,
-  ): ToolInvocation<GrepToolParams, ToolResult> {
+  protected createInvocation(params: GrepToolParams): ToolInvocation<GrepToolParams, ToolResult> {
     return new GrepToolInvocation(this.config, params);
   }
 }
diff --git a/packages/airiscode-core/src/tools/ls.ts b/packages/airiscode-core/src/tools/ls.ts
index 1210aab86..a923ac616 100644
--- a/packages/airiscode-core/src/tools/ls.ts
+++ b/packages/airiscode-core/src/tools/ls.ts
@@ -4,21 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { isSubpaths, isSubpath } from '../utils/paths.js';
-import type { Config } from '../config/config.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { ToolErrorType } from './tool-error.js';
-import { ToolDisplayNames, ToolNames } from './tool-names.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import { Storage } from '../config/storage.js';
-
-const debugLogger = createDebugLogger('LS');
+import fs from "node:fs/promises";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import { Storage } from "../config/storage.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { isSubpath, isSubpaths, makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+const debugLogger = createDebugLogger("LS");
 
 const MAX_ENTRY_COUNT = 100;
 
@@ -96,9 +95,9 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
     for (const pattern of patterns) {
       // Convert glob pattern to RegExp
       const regexPattern = pattern
-        .replace(/[.+^${}()|[\]\\]/g, '\\$&')
-        .replace(/\*/g, '.*')
-        .replace(/\?/g, '.');
+        .replace(/[.+^${}()|[\]\\]/g, "\\$&")
+        .replace(/\*/g, ".*")
+        .replace(/\?/g, ".");
       const regex = new RegExp(`^${regexPattern}$`);
       if (regex.test(filename)) {
         return true;
@@ -112,10 +111,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
    * @returns A string describing the file being read
    */
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.path,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.params.path, this.config.getTargetDir());
     return shortenPath(relativePath);
   }
 
@@ -134,17 +130,13 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       isSubpaths(userSkillsDirs, dirPath) ||
       isSubpath(userExtensionsDir, dirPath)
     ) {
-      return 'allow';
+      return "allow";
     }
-    return 'ask';
+    return "ask";
   }
 
   // Helper for consistent error formatting
-  private errorResult(
-    llmContent: string,
-    returnDisplay: string,
-    type: ToolErrorType,
-  ): ToolResult {
+  private errorResult(llmContent: string, returnDisplay: string, type: ToolErrorType): ToolResult {
     return {
       llmContent,
       // Keep returnDisplay simpler in core logic
@@ -190,10 +182,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       }
 
       const relativePaths = files.map((file) =>
-        path.relative(
-          this.config.getTargetDir(),
-          path.join(this.params.path, file),
-        ),
+        path.relative(this.config.getTargetDir(), path.join(this.params.path, file)),
       );
 
       const fileDiscovery = this.config.getFileService();
@@ -241,23 +230,20 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       });
 
       const totalEntryCount = entries.length;
-      const entryLimit = Math.min(
-        MAX_ENTRY_COUNT,
-        this.config.getTruncateToolOutputLines(),
-      );
+      const entryLimit = Math.min(MAX_ENTRY_COUNT, this.config.getTruncateToolOutputLines());
       const truncated = totalEntryCount > entryLimit;
 
       const entriesToShow = truncated ? entries.slice(0, entryLimit) : entries;
 
       const directoryContent = entriesToShow
-        .map((entry) => `${entry.isDirectory ? '[DIR] ' : ''}${entry.name}`)
-        .join('\n');
+        .map((entry) => `${entry.isDirectory ? "[DIR] " : ""}${entry.name}`)
+        .join("\n");
 
       let resultMessage = `Listed ${totalEntryCount} item(s) in ${this.params.path}:\n---\n${directoryContent}`;
 
       if (truncated) {
         const omittedEntries = totalEntryCount - entryLimit;
-        const entryTerm = omittedEntries === 1 ? 'item' : 'items';
+        const entryTerm = omittedEntries === 1 ? "item" : "items";
         resultMessage += `\n---\n[${omittedEntries} ${entryTerm} truncated] ...`;
       }
 
@@ -269,15 +255,15 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
         ignoredMessages.push(`${qwenIgnoredCount} qwen-ignored`);
       }
       if (ignoredMessages.length > 0) {
-        resultMessage += `\n\n(${ignoredMessages.join(', ')})`;
+        resultMessage += `\n\n(${ignoredMessages.join(", ")})`;
       }
 
       let displayMessage = `Listed ${totalEntryCount} item(s)`;
       if (ignoredMessages.length > 0) {
-        displayMessage += ` (${ignoredMessages.join(', ')})`;
+        displayMessage += ` (${ignoredMessages.join(", ")})`;
       }
       if (truncated) {
-        displayMessage += ' (truncated)';
+        displayMessage += " (truncated)";
       }
 
       return {
@@ -288,7 +274,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       const errorMsg = `Error listing directory: ${error instanceof Error ? error.message : String(error)}`;
       return this.errorResult(
         errorMsg,
-        'Failed to list directory.',
+        "Failed to list directory.",
         ToolErrorType.LS_EXECUTION_ERROR,
       );
     }
@@ -305,42 +291,42 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
     super(
       LSTool.Name,
       ToolDisplayNames.LS,
-      'Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.',
+      "Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.",
       Kind.Search,
       {
         properties: {
           path: {
             description:
-              'The absolute path to the directory to list (must be absolute, not relative)',
-            type: 'string',
+              "The absolute path to the directory to list (must be absolute, not relative)",
+            type: "string",
           },
           ignore: {
-            description: 'List of glob patterns to ignore',
+            description: "List of glob patterns to ignore",
             items: {
-              type: 'string',
+              type: "string",
             },
-            type: 'array',
+            type: "array",
           },
           file_filtering_options: {
             description:
-              'Optional: Whether to respect ignore patterns from .gitignore or .airiscodeigenore',
-            type: 'object',
+              "Optional: Whether to respect ignore patterns from .gitignore or .airiscodeigenore",
+            type: "object",
             properties: {
               respect_git_ignore: {
                 description:
-                  'Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.',
-                type: 'boolean',
+                  "Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.",
+                type: "boolean",
               },
               respect_airiscode_ignore: {
                 description:
-                  'Optional: Whether to respect .airiscodeigenore patterns when listing files. Defaults to true.',
-                type: 'boolean',
+                  "Optional: Whether to respect .airiscodeigenore patterns when listing files. Defaults to true.",
+                type: "boolean",
               },
             },
           },
         },
-        required: ['path'],
-        type: 'object',
+        required: ["path"],
+        type: "object",
       },
     );
   }
@@ -350,9 +336,7 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
    * @param params Parameters to validate
    * @returns An error message string if invalid, null otherwise
    */
-  protected override validateToolParamValues(
-    params: LSToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: LSToolParams): string | null {
     if (!path.isAbsolute(params.path)) {
       return `Path must be absolute: ${params.path}`;
     }
@@ -360,9 +344,7 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
     return null;
   }
 
-  protected createInvocation(
-    params: LSToolParams,
-  ): ToolInvocation<LSToolParams, ToolResult> {
+  protected createInvocation(params: LSToolParams): ToolInvocation<LSToolParams, ToolResult> {
     return new LSToolInvocation(this.config, params);
   }
 }
diff --git a/packages/airiscode-core/src/tools/lsp.ts b/packages/airiscode-core/src/tools/lsp.ts
index 27711a080..e9d2900cd 100644
--- a/packages/airiscode-core/src/tools/lsp.ts
+++ b/packages/airiscode-core/src/tools/lsp.ts
@@ -4,12 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolDisplayNames, ToolNames } from './tool-names.js';
-import type { Config } from '../config/config.js';
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import type { Config } from "../config/config.js";
 import type {
   LspCallHierarchyIncomingCall,
   LspCallHierarchyItem,
@@ -25,24 +22,27 @@ import type {
   LspRange,
   LspReference,
   LspSymbolInformation,
-} from '../lsp/types.js';
+} from "../lsp/types.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Supported LSP operations.
  */
 export type LspOperation =
-  | 'goToDefinition'
-  | 'findReferences'
-  | 'hover'
-  | 'documentSymbol'
-  | 'workspaceSymbol'
-  | 'goToImplementation'
-  | 'prepareCallHierarchy'
-  | 'incomingCalls'
-  | 'outgoingCalls'
-  | 'diagnostics'
-  | 'workspaceDiagnostics'
-  | 'codeActions';
+  | "goToDefinition"
+  | "findReferences"
+  | "hover"
+  | "documentSymbol"
+  | "workspaceSymbol"
+  | "goToImplementation"
+  | "prepareCallHierarchy"
+  | "incomingCalls"
+  | "outgoingCalls"
+  | "diagnostics"
+  | "workspaceDiagnostics"
+  | "codeActions";
 
 /**
  * Parameters for the unified LSP tool.
@@ -85,30 +85,24 @@ type ResolvedTarget =
 
 /** Operations that require filePath and line. */
 const LOCATION_REQUIRED_OPERATIONS = new Set<LspOperation>([
-  'goToDefinition',
-  'findReferences',
-  'hover',
-  'goToImplementation',
-  'prepareCallHierarchy',
+  "goToDefinition",
+  "findReferences",
+  "hover",
+  "goToImplementation",
+  "prepareCallHierarchy",
 ]);
 
 /** Operations that only require filePath. */
-const FILE_REQUIRED_OPERATIONS = new Set<LspOperation>([
-  'documentSymbol',
-  'diagnostics',
-]);
+const FILE_REQUIRED_OPERATIONS = new Set<LspOperation>(["documentSymbol", "diagnostics"]);
 
 /** Operations that require query. */
-const QUERY_REQUIRED_OPERATIONS = new Set<LspOperation>(['workspaceSymbol']);
+const QUERY_REQUIRED_OPERATIONS = new Set<LspOperation>(["workspaceSymbol"]);
 
 /** Operations that require callHierarchyItem. */
-const ITEM_REQUIRED_OPERATIONS = new Set<LspOperation>([
-  'incomingCalls',
-  'outgoingCalls',
-]);
+const ITEM_REQUIRED_OPERATIONS = new Set<LspOperation>(["incomingCalls", "outgoingCalls"]);
 
 /** Operations that require filePath and range for code actions. */
-const RANGE_REQUIRED_OPERATIONS = new Set<LspOperation>(['codeActions']);
+const RANGE_REQUIRED_OPERATIONS = new Set<LspOperation>(["codeActions"]);
 
 class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
   constructor(
@@ -120,18 +114,15 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
   getDescription(): string {
     const operationLabel = this.getOperationLabel();
-    if (this.params.operation === 'workspaceSymbol') {
-      return `LSP ${operationLabel} for "${this.params.query ?? ''}"`;
+    if (this.params.operation === "workspaceSymbol") {
+      return `LSP ${operationLabel} for "${this.params.query ?? ""}"`;
     }
-    if (this.params.operation === 'documentSymbol') {
+    if (this.params.operation === "documentSymbol") {
       return this.params.filePath
         ? `LSP ${operationLabel} for ${this.params.filePath}`
         : `LSP ${operationLabel}`;
     }
-    if (
-      this.params.operation === 'incomingCalls' ||
-      this.params.operation === 'outgoingCalls'
-    ) {
+    if (this.params.operation === "incomingCalls" || this.params.operation === "outgoingCalls") {
       return `LSP ${operationLabel} for ${this.describeCallHierarchyItemShort()}`;
     }
     if (this.params.filePath && this.params.line !== undefined) {
@@ -151,29 +142,29 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     }
 
     switch (this.params.operation) {
-      case 'goToDefinition':
+      case "goToDefinition":
         return this.executeDefinitions(client);
-      case 'findReferences':
+      case "findReferences":
         return this.executeReferences(client);
-      case 'hover':
+      case "hover":
         return this.executeHover(client);
-      case 'documentSymbol':
+      case "documentSymbol":
         return this.executeDocumentSymbols(client);
-      case 'workspaceSymbol':
+      case "workspaceSymbol":
         return this.executeWorkspaceSymbols(client);
-      case 'goToImplementation':
+      case "goToImplementation":
         return this.executeImplementations(client);
-      case 'prepareCallHierarchy':
+      case "prepareCallHierarchy":
         return this.executePrepareCallHierarchy(client);
-      case 'incomingCalls':
+      case "incomingCalls":
         return this.executeIncomingCalls(client);
-      case 'outgoingCalls':
+      case "outgoingCalls":
         return this.executeOutgoingCalls(client);
-      case 'diagnostics':
+      case "diagnostics":
         return this.executeDiagnostics(client);
-      case 'workspaceDiagnostics':
+      case "workspaceDiagnostics":
         return this.executeWorkspaceDiagnostics(client);
-      case 'codeActions':
+      case "codeActions":
         return this.executeCodeActions(client);
       default: {
         const message = `Unsupported LSP operation: ${this.params.operation}`;
@@ -184,22 +175,16 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
   private async executeDefinitions(client: LspClient): Promise<ToolResult> {
     const target = this.resolveLocationTarget();
-    if ('error' in target) {
+    if ("error" in target) {
       return { llmContent: target.error, returnDisplay: target.error };
     }
 
     const limit = this.params.limit ?? 20;
     let definitions: LspDefinition[] = [];
     try {
-      definitions = await client.definitions(
-        target.location,
-        this.params.serverName,
-        limit,
-      );
+      definitions = await client.definitions(target.location, this.params.serverName, limit);
     } catch (error) {
-      const message = `LSP go-to-definition failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP go-to-definition failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -218,14 +203,14 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
     const heading = `Definitions for ${target.description}:`;
     return {
-      llmContent: [heading, ...lines].join('\n'),
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n"),
+      returnDisplay: lines.join("\n"),
     };
   }
 
   private async executeImplementations(client: LspClient): Promise<ToolResult> {
     const target = this.resolveLocationTarget();
-    if ('error' in target) {
+    if ("error" in target) {
       return { llmContent: target.error, returnDisplay: target.error };
     }
 
@@ -259,14 +244,14 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
     const heading = `Implementations for ${target.description}:`;
     return {
-      llmContent: [heading, ...lines].join('\n'),
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n"),
+      returnDisplay: lines.join("\n"),
     };
   }
 
   private async executeReferences(client: LspClient): Promise<ToolResult> {
     const target = this.resolveLocationTarget();
-    if ('error' in target) {
+    if ("error" in target) {
       return { llmContent: target.error, returnDisplay: target.error };
     }
 
@@ -280,9 +265,7 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
         limit,
       );
     } catch (error) {
-      const message = `LSP find-references failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP find-references failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -301,30 +284,25 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
     const heading = `References for ${target.description}:`;
     return {
-      llmContent: [heading, ...lines].join('\n'),
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n"),
+      returnDisplay: lines.join("\n"),
     };
   }
 
   private async executeHover(client: LspClient): Promise<ToolResult> {
     const target = this.resolveLocationTarget();
-    if ('error' in target) {
+    if ("error" in target) {
       return { llmContent: target.error, returnDisplay: target.error };
     }
 
-    let hoverText = '';
+    let hoverText = "";
     try {
-      const result = await client.hover(
-        target.location,
-        this.params.serverName,
-      );
+      const result = await client.hover(target.location, this.params.serverName);
       if (result) {
-        hoverText = result.contents ?? '';
+        hoverText = result.contents ?? "";
       }
     } catch (error) {
-      const message = `LSP hover failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP hover failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -343,25 +321,19 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
   private async executeDocumentSymbols(client: LspClient): Promise<ToolResult> {
     const workspaceRoot = this.config.getProjectRoot();
-    const filePath = this.params.filePath ?? '';
+    const filePath = this.params.filePath ?? "";
     const uri = this.resolveUri(filePath, workspaceRoot);
     if (!uri) {
-      const message = 'A valid filePath is required for document symbols.';
+      const message = "A valid filePath is required for document symbols.";
       return { llmContent: message, returnDisplay: message };
     }
 
     const limit = this.params.limit ?? 50;
     let symbols: LspSymbolInformation[] = [];
     try {
-      symbols = await client.documentSymbols(
-        uri,
-        this.params.serverName,
-        limit,
-      );
+      symbols = await client.documentSymbols(uri, this.params.serverName, limit);
     } catch (error) {
-      const message = `LSP document symbols failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP document symbols failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -372,31 +344,24 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     }
 
     const lines = symbols.slice(0, limit).map((symbol, index) => {
-      const location = this.formatLocationWithoutServer(
-        symbol.location,
-        workspaceRoot,
-      );
-      const serverSuffix = symbol.serverName ? ` [${symbol.serverName}]` : '';
-      const kind = symbol.kind ? ` (${symbol.kind})` : '';
-      const container = symbol.containerName
-        ? ` in ${symbol.containerName}`
-        : '';
+      const location = this.formatLocationWithoutServer(symbol.location, workspaceRoot);
+      const serverSuffix = symbol.serverName ? ` [${symbol.serverName}]` : "";
+      const kind = symbol.kind ? ` (${symbol.kind})` : "";
+      const container = symbol.containerName ? ` in ${symbol.containerName}` : "";
       return `${index + 1}. ${symbol.name}${kind}${container} - ${location}${serverSuffix}`;
     });
 
     const fileLabel = this.formatUriForDisplay(uri, workspaceRoot);
     const heading = `Document symbols for ${fileLabel}:`;
     return {
-      llmContent: [heading, ...lines].join('\n'),
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n"),
+      returnDisplay: lines.join("\n"),
     };
   }
 
-  private async executeWorkspaceSymbols(
-    client: LspClient,
-  ): Promise<ToolResult> {
+  private async executeWorkspaceSymbols(client: LspClient): Promise<ToolResult> {
     const limit = this.params.limit ?? 20;
-    const query = this.params.query ?? '';
+    const query = this.params.query ?? "";
     let symbols: LspSymbolInformation[] = [];
     try {
       symbols = await client.workspaceSymbols(query, limit);
@@ -414,15 +379,10 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
     const workspaceRoot = this.config.getProjectRoot();
     const lines = symbols.slice(0, limit).map((symbol, index) => {
-      const location = this.formatLocationWithoutServer(
-        symbol.location,
-        workspaceRoot,
-      );
-      const serverSuffix = symbol.serverName ? ` [${symbol.serverName}]` : '';
-      const kind = symbol.kind ? ` (${symbol.kind})` : '';
-      const container = symbol.containerName
-        ? ` in ${symbol.containerName}`
-        : '';
+      const location = this.formatLocationWithoutServer(symbol.location, workspaceRoot);
+      const serverSuffix = symbol.serverName ? ` [${symbol.serverName}]` : "";
+      const kind = symbol.kind ? ` (${symbol.kind})` : "";
+      const container = symbol.containerName ? ` in ${symbol.containerName}` : "";
       return `${index + 1}. ${symbol.name}${kind}${container} - ${location}${serverSuffix}`;
     });
 
@@ -431,7 +391,7 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     } symbols for query "${query}":`;
 
     // Also fetch references for the top match to provide additional context.
-    let referenceSection = '';
+    let referenceSection = "";
     const topSymbol = symbols[0];
     if (topSymbol) {
       try {
@@ -444,18 +404,15 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
         );
         if (references.length > 0) {
           const refLines = references.map((ref, index) => {
-            const location = this.formatLocationWithoutServer(
-              ref,
-              workspaceRoot,
-            );
-            const serverSuffix = ref.serverName ? ` [${ref.serverName}]` : '';
+            const location = this.formatLocationWithoutServer(ref, workspaceRoot);
+            const serverSuffix = ref.serverName ? ` [${ref.serverName}]` : "";
             return `${index + 1}. ${location}${serverSuffix}`;
           });
           referenceSection = [
-            '',
+            "",
             `References for top match (${topSymbol.name}):`,
             ...refLines,
-          ].join('\n');
+          ].join("\n");
         }
       } catch (error) {
         referenceSection = `\nReferences lookup failed: ${
@@ -464,35 +421,25 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
       }
     }
 
-    const llmParts = referenceSection
-      ? [heading, ...lines, referenceSection]
-      : [heading, ...lines];
-    const displayParts = referenceSection
-      ? [...lines, referenceSection]
-      : [...lines];
+    const llmParts = referenceSection ? [heading, ...lines, referenceSection] : [heading, ...lines];
+    const displayParts = referenceSection ? [...lines, referenceSection] : [...lines];
 
     return {
-      llmContent: llmParts.join('\n'),
-      returnDisplay: displayParts.join('\n'),
+      llmContent: llmParts.join("\n"),
+      returnDisplay: displayParts.join("\n"),
     };
   }
 
-  private async executePrepareCallHierarchy(
-    client: LspClient,
-  ): Promise<ToolResult> {
+  private async executePrepareCallHierarchy(client: LspClient): Promise<ToolResult> {
     const target = this.resolveLocationTarget();
-    if ('error' in target) {
+    if ("error" in target) {
       return { llmContent: target.error, returnDisplay: target.error };
     }
 
     const limit = this.params.limit ?? 20;
     let items: LspCallHierarchyItem[] = [];
     try {
-      items = await client.prepareCallHierarchy(
-        target.location,
-        this.params.serverName,
-        limit,
-      );
+      items = await client.prepareCallHierarchy(target.location, this.params.serverName, limit);
     } catch (error) {
       const message = `LSP call hierarchy prepare failed: ${
         (error as Error)?.message || String(error)
@@ -512,20 +459,17 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     );
 
     const heading = `Call hierarchy items for ${target.description}:`;
-    const jsonSection = this.formatJsonSection(
-      'Call hierarchy items (JSON)',
-      slicedItems,
-    );
+    const jsonSection = this.formatJsonSection("Call hierarchy items (JSON)", slicedItems);
     return {
-      llmContent: [heading, ...lines].join('\n') + jsonSection,
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n") + jsonSection,
+      returnDisplay: lines.join("\n"),
     };
   }
 
   private async executeIncomingCalls(client: LspClient): Promise<ToolResult> {
     const item = this.params.callHierarchyItem;
     if (!item) {
-      const message = 'callHierarchyItem is required for incomingCalls.';
+      const message = "callHierarchyItem is required for incomingCalls.";
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -535,16 +479,12 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     try {
       calls = await client.incomingCalls(item, serverName, limit);
     } catch (error) {
-      const message = `LSP incoming calls failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP incoming calls failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
     if (!calls.length) {
-      const message = `No incoming calls found for ${this.describeCallHierarchyItemFull(
-        item,
-      )}.`;
+      const message = `No incoming calls found for ${this.describeCallHierarchyItemFull(item)}.`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -560,29 +500,24 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
         },
         workspaceRoot,
       );
-      const kind = targetItem.kind ? ` (${targetItem.kind})` : '';
-      const detail = targetItem.detail ? ` ${targetItem.detail}` : '';
+      const kind = targetItem.kind ? ` (${targetItem.kind})` : "";
+      const detail = targetItem.detail ? ` ${targetItem.detail}` : "";
       const rangeSuffix = this.formatCallRanges(call.fromRanges);
       return `${index + 1}. ${targetItem.name}${kind}${detail} - ${location}${rangeSuffix}`;
     });
 
-    const heading = `Incoming calls for ${this.describeCallHierarchyItemFull(
-      item,
-    )}:`;
-    const jsonSection = this.formatJsonSection(
-      'Incoming calls (JSON)',
-      slicedCalls,
-    );
+    const heading = `Incoming calls for ${this.describeCallHierarchyItemFull(item)}:`;
+    const jsonSection = this.formatJsonSection("Incoming calls (JSON)", slicedCalls);
     return {
-      llmContent: [heading, ...lines].join('\n') + jsonSection,
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n") + jsonSection,
+      returnDisplay: lines.join("\n"),
     };
   }
 
   private async executeOutgoingCalls(client: LspClient): Promise<ToolResult> {
     const item = this.params.callHierarchyItem;
     if (!item) {
-      const message = 'callHierarchyItem is required for outgoingCalls.';
+      const message = "callHierarchyItem is required for outgoingCalls.";
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -592,16 +527,12 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     try {
       calls = await client.outgoingCalls(item, serverName, limit);
     } catch (error) {
-      const message = `LSP outgoing calls failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP outgoing calls failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
     if (!calls.length) {
-      const message = `No outgoing calls found for ${this.describeCallHierarchyItemFull(
-        item,
-      )}.`;
+      const message = `No outgoing calls found for ${this.describeCallHierarchyItemFull(item)}.`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -617,31 +548,26 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
         },
         workspaceRoot,
       );
-      const kind = targetItem.kind ? ` (${targetItem.kind})` : '';
-      const detail = targetItem.detail ? ` ${targetItem.detail}` : '';
+      const kind = targetItem.kind ? ` (${targetItem.kind})` : "";
+      const detail = targetItem.detail ? ` ${targetItem.detail}` : "";
       const rangeSuffix = this.formatCallRanges(call.fromRanges);
       return `${index + 1}. ${targetItem.name}${kind}${detail} - ${location}${rangeSuffix}`;
     });
 
-    const heading = `Outgoing calls for ${this.describeCallHierarchyItemFull(
-      item,
-    )}:`;
-    const jsonSection = this.formatJsonSection(
-      'Outgoing calls (JSON)',
-      slicedCalls,
-    );
+    const heading = `Outgoing calls for ${this.describeCallHierarchyItemFull(item)}:`;
+    const jsonSection = this.formatJsonSection("Outgoing calls (JSON)", slicedCalls);
     return {
-      llmContent: [heading, ...lines].join('\n') + jsonSection,
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n") + jsonSection,
+      returnDisplay: lines.join("\n"),
     };
   }
 
   private async executeDiagnostics(client: LspClient): Promise<ToolResult> {
     const workspaceRoot = this.config.getProjectRoot();
-    const filePath = this.params.filePath ?? '';
+    const filePath = this.params.filePath ?? "";
     const uri = this.resolveUri(filePath, workspaceRoot);
     if (!uri) {
-      const message = 'A valid filePath is required for diagnostics.';
+      const message = "A valid filePath is required for diagnostics.";
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -649,9 +575,7 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     try {
       diagnostics = await client.diagnostics(uri, this.params.serverName);
     } catch (error) {
-      const message = `LSP diagnostics failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP diagnostics failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -662,31 +586,26 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     }
 
     const lines = diagnostics.map((diag, index) => {
-      const severity = diag.severity ? `[${diag.severity.toUpperCase()}]` : '';
+      const severity = diag.severity ? `[${diag.severity.toUpperCase()}]` : "";
       const position = `${diag.range.start.line + 1}:${diag.range.start.character + 1}`;
-      const code = diag.code ? ` (${diag.code})` : '';
-      const source = diag.source ? ` [${diag.source}]` : '';
+      const code = diag.code ? ` (${diag.code})` : "";
+      const source = diag.source ? ` [${diag.source}]` : "";
       return `${index + 1}. ${severity} ${position}${code}${source}: ${diag.message}`;
     });
 
     const fileLabel = this.formatUriForDisplay(uri, workspaceRoot);
     const heading = `Diagnostics for ${fileLabel} (${diagnostics.length} issues):`;
     return {
-      llmContent: [heading, ...lines].join('\n'),
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n"),
+      returnDisplay: lines.join("\n"),
     };
   }
 
-  private async executeWorkspaceDiagnostics(
-    client: LspClient,
-  ): Promise<ToolResult> {
+  private async executeWorkspaceDiagnostics(client: LspClient): Promise<ToolResult> {
     const limit = this.params.limit ?? 50;
     let fileDiagnostics: LspFileDiagnostics[] = [];
     try {
-      fileDiagnostics = await client.workspaceDiagnostics(
-        this.params.serverName,
-        limit,
-      );
+      fileDiagnostics = await client.workspaceDiagnostics(this.params.serverName, limit);
     } catch (error) {
       const message = `LSP workspace diagnostics failed: ${
         (error as Error)?.message || String(error)
@@ -695,7 +614,7 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     }
 
     if (!fileDiagnostics.length) {
-      const message = 'No diagnostics found in the workspace.';
+      const message = "No diagnostics found in the workspace.";
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -705,17 +624,13 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
     for (const fileDiag of fileDiagnostics) {
       const fileLabel = this.formatUriForDisplay(fileDiag.uri, workspaceRoot);
-      const serverSuffix = fileDiag.serverName
-        ? ` [${fileDiag.serverName}]`
-        : '';
+      const serverSuffix = fileDiag.serverName ? ` [${fileDiag.serverName}]` : "";
       lines.push(`\n${fileLabel}${serverSuffix}:`);
 
       for (const diag of fileDiag.diagnostics) {
-        const severity = diag.severity
-          ? `[${diag.severity.toUpperCase()}]`
-          : '';
+        const severity = diag.severity ? `[${diag.severity.toUpperCase()}]` : "";
         const position = `${diag.range.start.line + 1}:${diag.range.start.character + 1}`;
-        const code = diag.code ? ` (${diag.code})` : '';
+        const code = diag.code ? ` (${diag.code})` : "";
         lines.push(`  ${severity} ${position}${code}: ${diag.message}`);
         totalIssues++;
       }
@@ -723,31 +638,25 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
     const heading = `Workspace diagnostics (${totalIssues} issues in ${fileDiagnostics.length} files):`;
     return {
-      llmContent: [heading, ...lines].join('\n'),
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n"),
+      returnDisplay: lines.join("\n"),
     };
   }
 
   private async executeCodeActions(client: LspClient): Promise<ToolResult> {
     const workspaceRoot = this.config.getProjectRoot();
-    const filePath = this.params.filePath ?? '';
+    const filePath = this.params.filePath ?? "";
     const uri = this.resolveUri(filePath, workspaceRoot);
     if (!uri) {
-      const message = 'A valid filePath is required for code actions.';
+      const message = "A valid filePath is required for code actions.";
       return { llmContent: message, returnDisplay: message };
     }
 
     // Build range from params
     const startLine = Math.max(0, (this.params.line ?? 1) - 1);
     const startChar = Math.max(0, (this.params.character ?? 1) - 1);
-    const endLine = Math.max(
-      0,
-      (this.params.endLine ?? this.params.line ?? 1) - 1,
-    );
-    const endChar = Math.max(
-      0,
-      (this.params.endCharacter ?? this.params.character ?? 1) - 1,
-    );
+    const endLine = Math.max(0, (this.params.endLine ?? this.params.line ?? 1) - 1);
+    const endChar = Math.max(0, (this.params.endCharacter ?? this.params.character ?? 1) - 1);
 
     const range: LspRange = {
       start: { line: startLine, character: startChar },
@@ -758,23 +667,15 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     const context: LspCodeActionContext = {
       diagnostics: this.params.diagnostics ?? [],
       only: this.params.codeActionKinds,
-      triggerKind: 'invoked',
+      triggerKind: "invoked",
     };
 
     const limit = this.params.limit ?? 20;
     let actions: LspCodeAction[] = [];
     try {
-      actions = await client.codeActions(
-        uri,
-        range,
-        context,
-        this.params.serverName,
-        limit,
-      );
+      actions = await client.codeActions(uri, range, context, this.params.serverName, limit);
     } catch (error) {
-      const message = `LSP code actions failed: ${
-        (error as Error)?.message || String(error)
-      }`;
+      const message = `LSP code actions failed: ${(error as Error)?.message || String(error)}`;
       return { llmContent: message, returnDisplay: message };
     }
 
@@ -785,23 +686,20 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     }
 
     const lines = actions.slice(0, limit).map((action, index) => {
-      const kind = action.kind ? ` [${action.kind}]` : '';
-      const preferred = action.isPreferred ? ' ★' : '';
-      const hasEdit = action.edit ? ' (has edit)' : '';
-      const hasCommand = action.command ? ' (has command)' : '';
-      const serverSuffix = action.serverName ? ` [${action.serverName}]` : '';
+      const kind = action.kind ? ` [${action.kind}]` : "";
+      const preferred = action.isPreferred ? " ★" : "";
+      const hasEdit = action.edit ? " (has edit)" : "";
+      const hasCommand = action.command ? " (has command)" : "";
+      const serverSuffix = action.serverName ? ` [${action.serverName}]` : "";
       return `${index + 1}. ${action.title}${kind}${preferred}${hasEdit}${hasCommand}${serverSuffix}`;
     });
 
     const fileLabel = this.formatUriForDisplay(uri, workspaceRoot);
     const heading = `Code actions at ${fileLabel}:${startLine + 1}:${startChar + 1}:`;
-    const jsonSection = this.formatJsonSection(
-      'Code actions (JSON)',
-      actions.slice(0, limit),
-    );
+    const jsonSection = this.formatJsonSection("Code actions (JSON)", actions.slice(0, limit));
     return {
-      llmContent: [heading, ...lines].join('\n') + jsonSection,
-      returnDisplay: lines.join('\n'),
+      llmContent: [heading, ...lines].join("\n") + jsonSection,
+      returnDisplay: lines.join("\n"),
     };
   }
 
@@ -809,12 +707,12 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     const filePath = this.params.filePath;
     if (!filePath) {
       return {
-        error: 'filePath is required for this operation.',
+        error: "filePath is required for this operation.",
       };
     }
-    if (typeof this.params.line !== 'number') {
+    if (typeof this.params.line !== "number") {
       return {
-        error: 'line is required for this operation.',
+        error: "line is required for this operation.",
       };
     }
 
@@ -822,7 +720,7 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     const uri = this.resolveUri(filePath, workspaceRoot);
     if (!uri) {
       return {
-        error: 'A valid filePath is required when specifying a line/character.',
+        error: "A valid filePath is required when specifying a line/character.",
       };
     }
 
@@ -848,7 +746,7 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     if (!filePath) {
       return null;
     }
-    if (filePath.startsWith('file://') || filePath.includes('://')) {
+    if (filePath.startsWith("file://") || filePath.includes("://")) {
       return filePath;
     }
     const absolutePath = path.isAbsolute(filePath)
@@ -864,28 +762,23 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
     const start = location.range.start;
     let filePath = location.uri;
 
-    if (filePath.startsWith('file://')) {
+    if (filePath.startsWith("file://")) {
       filePath = fileURLToPath(filePath);
-      filePath = path.relative(workspaceRoot, filePath) || '.';
+      filePath = path.relative(workspaceRoot, filePath) || ".";
     }
 
     const serverSuffix =
-      location.serverName && location.serverName !== ''
-        ? ` [${location.serverName}]`
-        : '';
+      location.serverName && location.serverName !== "" ? ` [${location.serverName}]` : "";
 
     return `${filePath}:${(start.line ?? 0) + 1}:${(start.character ?? 0) + 1}${serverSuffix}`;
   }
 
-  private formatLocationWithoutServer(
-    location: LspLocation,
-    workspaceRoot: string,
-  ): string {
+  private formatLocationWithoutServer(location: LspLocation, workspaceRoot: string): string {
     const { uri, range } = location;
     let filePath = uri;
-    if (uri.startsWith('file://')) {
+    if (uri.startsWith("file://")) {
       filePath = fileURLToPath(uri);
-      filePath = path.relative(workspaceRoot, filePath) || '.';
+      filePath = path.relative(workspaceRoot, filePath) || ".";
     }
     const line = (range.start.line ?? 0) + 1;
     const character = (range.start.character ?? 0) + 1;
@@ -905,36 +798,33 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
       },
       workspaceRoot,
     );
-    const kind = item.kind ? ` (${item.kind})` : '';
-    const detail = item.detail ? ` ${item.detail}` : '';
+    const kind = item.kind ? ` (${item.kind})` : "";
+    const detail = item.detail ? ` ${item.detail}` : "";
     return `${index + 1}. ${item.name}${kind}${detail} - ${location}`;
   }
 
   private formatCallRanges(ranges: LspRange[]): string {
     if (!ranges.length) {
-      return '';
+      return "";
     }
     const formatted = ranges.map((range) => this.formatPosition(range.start));
     const maxShown = 3;
     const shown = formatted.slice(0, maxShown);
-    const extra =
-      formatted.length > maxShown
-        ? `, +${formatted.length - maxShown} more`
-        : '';
-    return ` (calls at ${shown.join(', ')}${extra})`;
+    const extra = formatted.length > maxShown ? `, +${formatted.length - maxShown} more` : "";
+    return ` (calls at ${shown.join(", ")}${extra})`;
   }
 
-  private formatPosition(position: LspRange['start']): string {
+  private formatPosition(position: LspRange["start"]): string {
     return `${(position.line ?? 0) + 1}:${(position.character ?? 0) + 1}`;
   }
 
   private formatUriForDisplay(uri: string, workspaceRoot: string): string {
     let filePath = uri;
-    if (uri.startsWith('file://')) {
+    if (uri.startsWith("file://")) {
       filePath = fileURLToPath(uri);
     }
     if (path.isAbsolute(filePath)) {
-      return path.relative(workspaceRoot, filePath) || '.';
+      return path.relative(workspaceRoot, filePath) || ".";
     }
     return filePath;
   }
@@ -946,9 +836,9 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
   private describeCallHierarchyItemShort(): string {
     const item = this.params.callHierarchyItem;
     if (!item) {
-      return 'call hierarchy item';
+      return "call hierarchy item";
     }
-    return item.name || 'call hierarchy item';
+    return item.name || "call hierarchy item";
   }
 
   private describeCallHierarchyItemFull(item: LspCallHierarchyItem): string {
@@ -966,30 +856,30 @@ class LspToolInvocation extends BaseToolInvocation<LspToolParams, ToolResult> {
 
   private getOperationLabel(): string {
     switch (this.params.operation) {
-      case 'goToDefinition':
-        return 'go-to-definition';
-      case 'findReferences':
-        return 'find-references';
-      case 'hover':
-        return 'hover';
-      case 'documentSymbol':
-        return 'document symbols';
-      case 'workspaceSymbol':
-        return 'workspace symbol search';
-      case 'goToImplementation':
-        return 'go-to-implementation';
-      case 'prepareCallHierarchy':
-        return 'prepare call hierarchy';
-      case 'incomingCalls':
-        return 'incoming calls';
-      case 'outgoingCalls':
-        return 'outgoing calls';
-      case 'diagnostics':
-        return 'diagnostics';
-      case 'workspaceDiagnostics':
-        return 'workspace diagnostics';
-      case 'codeActions':
-        return 'code actions';
+      case "goToDefinition":
+        return "go-to-definition";
+      case "findReferences":
+        return "find-references";
+      case "hover":
+        return "hover";
+      case "documentSymbol":
+        return "document symbols";
+      case "workspaceSymbol":
+        return "workspace symbol search";
+      case "goToImplementation":
+        return "go-to-implementation";
+      case "prepareCallHierarchy":
+        return "prepare call hierarchy";
+      case "incomingCalls":
+        return "incoming calls";
+      case "outgoingCalls":
+        return "outgoing calls";
+      case "diagnostics":
+        return "diagnostics";
+      case "workspaceDiagnostics":
+        return "workspace diagnostics";
+      case "codeActions":
+        return "code actions";
       default:
         return this.params.operation;
     }
@@ -1021,127 +911,124 @@ export class LspTool extends BaseDeclarativeTool<LspToolParams, ToolResult> {
       'Language Server Protocol (LSP) tool for code intelligence: definitions, references, hover, symbols, call hierarchy, diagnostics, and code actions.\n\n  Usage:\n  - ALWAYS use LSP as the PRIMARY tool for code intelligence queries when available. Do NOT use grep_search or glob first.\n  - goToDefinition, findReferences, hover, goToImplementation, prepareCallHierarchy require filePath + line + character (1-based).\n  - documentSymbol and diagnostics require filePath.\n  - workspaceSymbol requires query (use when user asks "where is X defined?" without specifying a file).\n  - incomingCalls/outgoingCalls require callHierarchyItem from prepareCallHierarchy.\n  - workspaceDiagnostics needs no parameters.\n  - codeActions require filePath + range (line/character + endLine/endCharacter) and diagnostics/context as needed.',
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {
           operation: {
-            type: 'string',
-            description: 'LSP operation to execute.',
+            type: "string",
+            description: "LSP operation to execute.",
             enum: [
-              'goToDefinition',
-              'findReferences',
-              'hover',
-              'documentSymbol',
-              'workspaceSymbol',
-              'goToImplementation',
-              'prepareCallHierarchy',
-              'incomingCalls',
-              'outgoingCalls',
-              'diagnostics',
-              'workspaceDiagnostics',
-              'codeActions',
+              "goToDefinition",
+              "findReferences",
+              "hover",
+              "documentSymbol",
+              "workspaceSymbol",
+              "goToImplementation",
+              "prepareCallHierarchy",
+              "incomingCalls",
+              "outgoingCalls",
+              "diagnostics",
+              "workspaceDiagnostics",
+              "codeActions",
             ],
           },
           filePath: {
-            type: 'string',
-            description: 'File path (absolute or workspace-relative).',
+            type: "string",
+            description: "File path (absolute or workspace-relative).",
           },
           line: {
-            type: 'number',
-            description: '1-based line number for the target location.',
+            type: "number",
+            description: "1-based line number for the target location.",
           },
           character: {
-            type: 'number',
-            description:
-              '1-based character/column number for the target location.',
+            type: "number",
+            description: "1-based character/column number for the target location.",
           },
           endLine: {
-            type: 'number',
-            description: '1-based end line number for range-based operations.',
+            type: "number",
+            description: "1-based end line number for range-based operations.",
           },
           endCharacter: {
-            type: 'number',
-            description: '1-based end character for range-based operations.',
+            type: "number",
+            description: "1-based end character for range-based operations.",
           },
           includeDeclaration: {
-            type: 'boolean',
-            description:
-              'Include the declaration itself when looking up references.',
+            type: "boolean",
+            description: "Include the declaration itself when looking up references.",
           },
           query: {
-            type: 'string',
-            description: 'Symbol query for workspace symbol search.',
+            type: "string",
+            description: "Symbol query for workspace symbol search.",
           },
           callHierarchyItem: {
-            $ref: '#/definitions/LspCallHierarchyItem',
-            description: 'Call hierarchy item for incoming/outgoing calls.',
+            $ref: "#/definitions/LspCallHierarchyItem",
+            description: "Call hierarchy item for incoming/outgoing calls.",
           },
           serverName: {
-            type: 'string',
-            description: 'Optional LSP server name to target.',
+            type: "string",
+            description: "Optional LSP server name to target.",
           },
           limit: {
-            type: 'number',
-            description: 'Optional maximum number of results to return.',
+            type: "number",
+            description: "Optional maximum number of results to return.",
           },
           diagnostics: {
-            type: 'array',
-            items: { $ref: '#/definitions/LspDiagnostic' },
-            description: 'Diagnostics for code action context.',
+            type: "array",
+            items: { $ref: "#/definitions/LspDiagnostic" },
+            description: "Diagnostics for code action context.",
           },
           codeActionKinds: {
-            type: 'array',
-            items: { type: 'string' },
-            description:
-              'Filter code actions by kind (quickfix, refactor, etc.).',
+            type: "array",
+            items: { type: "string" },
+            description: "Filter code actions by kind (quickfix, refactor, etc.).",
           },
         },
-        required: ['operation'],
+        required: ["operation"],
         definitions: {
           LspPosition: {
-            type: 'object',
+            type: "object",
             properties: {
-              line: { type: 'number' },
-              character: { type: 'number' },
+              line: { type: "number" },
+              character: { type: "number" },
             },
-            required: ['line', 'character'],
+            required: ["line", "character"],
           },
           LspRange: {
-            type: 'object',
+            type: "object",
             properties: {
-              start: { $ref: '#/definitions/LspPosition' },
-              end: { $ref: '#/definitions/LspPosition' },
+              start: { $ref: "#/definitions/LspPosition" },
+              end: { $ref: "#/definitions/LspPosition" },
             },
-            required: ['start', 'end'],
+            required: ["start", "end"],
           },
           LspCallHierarchyItem: {
-            type: 'object',
+            type: "object",
             properties: {
-              name: { type: 'string' },
-              kind: { type: 'string' },
-              rawKind: { type: 'number' },
-              detail: { type: 'string' },
-              uri: { type: 'string' },
-              range: { $ref: '#/definitions/LspRange' },
-              selectionRange: { $ref: '#/definitions/LspRange' },
+              name: { type: "string" },
+              kind: { type: "string" },
+              rawKind: { type: "number" },
+              detail: { type: "string" },
+              uri: { type: "string" },
+              range: { $ref: "#/definitions/LspRange" },
+              selectionRange: { $ref: "#/definitions/LspRange" },
               data: {},
-              serverName: { type: 'string' },
+              serverName: { type: "string" },
             },
-            required: ['name', 'uri', 'range', 'selectionRange'],
+            required: ["name", "uri", "range", "selectionRange"],
           },
           LspDiagnostic: {
-            type: 'object',
+            type: "object",
             properties: {
-              range: { $ref: '#/definitions/LspRange' },
+              range: { $ref: "#/definitions/LspRange" },
               severity: {
-                type: 'string',
-                enum: ['error', 'warning', 'information', 'hint'],
+                type: "string",
+                enum: ["error", "warning", "information", "hint"],
               },
-              code: { type: ['string', 'number'] },
-              source: { type: 'string' },
-              message: { type: 'string' },
-              serverName: { type: 'string' },
+              code: { type: ["string", "number"] },
+              source: { type: "string" },
+              message: { type: "string" },
+              serverName: { type: "string" },
             },
-            required: ['range', 'message'],
+            required: ["range", "message"],
           },
         },
       },
@@ -1150,28 +1037,26 @@ export class LspTool extends BaseDeclarativeTool<LspToolParams, ToolResult> {
     );
   }
 
-  protected override validateToolParamValues(
-    params: LspToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: LspToolParams): string | null {
     const operation = params.operation;
 
     if (LOCATION_REQUIRED_OPERATIONS.has(operation)) {
-      if (!params.filePath || params.filePath.trim() === '') {
+      if (!params.filePath || params.filePath.trim() === "") {
         return `filePath is required for ${operation}.`;
       }
-      if (typeof params.line !== 'number') {
+      if (typeof params.line !== "number") {
         return `line is required for ${operation}.`;
       }
     }
 
     if (FILE_REQUIRED_OPERATIONS.has(operation)) {
-      if (!params.filePath || params.filePath.trim() === '') {
+      if (!params.filePath || params.filePath.trim() === "") {
         return `filePath is required for ${operation}.`;
       }
     }
 
     if (QUERY_REQUIRED_OPERATIONS.has(operation)) {
-      if (!params.query || params.query.trim() === '') {
+      if (!params.query || params.query.trim() === "") {
         return `query is required for ${operation}.`;
       }
     }
@@ -1183,36 +1068,34 @@ export class LspTool extends BaseDeclarativeTool<LspToolParams, ToolResult> {
     }
 
     if (RANGE_REQUIRED_OPERATIONS.has(operation)) {
-      if (!params.filePath || params.filePath.trim() === '') {
+      if (!params.filePath || params.filePath.trim() === "") {
         return `filePath is required for ${operation}.`;
       }
-      if (typeof params.line !== 'number') {
+      if (typeof params.line !== "number") {
         return `line is required for ${operation}.`;
       }
     }
 
     if (params.line !== undefined && params.line < 1) {
-      return 'line must be a positive number.';
+      return "line must be a positive number.";
     }
     if (params.character !== undefined && params.character < 1) {
-      return 'character must be a positive number.';
+      return "character must be a positive number.";
     }
     if (params.endLine !== undefined && params.endLine < 1) {
-      return 'endLine must be a positive number.';
+      return "endLine must be a positive number.";
     }
     if (params.endCharacter !== undefined && params.endCharacter < 1) {
-      return 'endCharacter must be a positive number.';
+      return "endCharacter must be a positive number.";
     }
     if (params.limit !== undefined && params.limit <= 0) {
-      return 'limit must be a positive number.';
+      return "limit must be a positive number.";
     }
 
     return null;
   }
 
-  protected createInvocation(
-    params: LspToolParams,
-  ): ToolInvocation<LspToolParams, ToolResult> {
+  protected createInvocation(params: LspToolParams): ToolInvocation<LspToolParams, ToolResult> {
     return new LspToolInvocation(this.config, params);
   }
 }
diff --git a/packages/airiscode-core/src/tools/mcp-client-manager.ts b/packages/airiscode-core/src/tools/mcp-client-manager.ts
index ecc700739..86b97ed6a 100644
--- a/packages/airiscode-core/src/tools/mcp-client-manager.ts
+++ b/packages/airiscode-core/src/tools/mcp-client-manager.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { isSdkMcpServerConfig } from '../config/config.js';
-import type { ToolRegistry } from './tool-registry.js';
+import type { EventEmitter } from "node:events";
+import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import type { Config } from "../config/config.js";
+import { isSdkMcpServerConfig } from "../config/config.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import type { SendSdkMcpMessage } from "./mcp-client.js";
 import {
-  McpClient,
   MCPDiscoveryState,
   MCPServerStatus,
+  McpClient,
   populateMcpServerCommand,
-} from './mcp-client.js';
-import type { SendSdkMcpMessage } from './mcp-client.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type { EventEmitter } from 'node:events';
-import type { ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
+} from "./mcp-client.js";
+import type { ToolRegistry } from "./tool-registry.js";
 
-const debugLogger = createDebugLogger('MCP');
+const debugLogger = createDebugLogger("MCP");
 
 /**
  * Configuration for MCP health monitoring
@@ -92,47 +92,39 @@ export class McpClientManager {
 
     this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
 
-    this.eventEmitter?.emit('mcp-client-update', this.clients);
-    const discoveryPromises = Object.entries(servers).map(
-      async ([name, config]) => {
-        // Skip disabled servers
-        if (cliConfig.isMcpServerDisabled(name)) {
-          debugLogger.debug(`Skipping disabled MCP server: ${name}`);
-          return;
-        }
+    this.eventEmitter?.emit("mcp-client-update", this.clients);
+    const discoveryPromises = Object.entries(servers).map(async ([name, config]) => {
+      // Skip disabled servers
+      if (cliConfig.isMcpServerDisabled(name)) {
+        debugLogger.debug(`Skipping disabled MCP server: ${name}`);
+        return;
+      }
 
-        // For SDK MCP servers, pass the sendSdkMcpMessage callback
-        const sdkCallback = isSdkMcpServerConfig(config)
-          ? this.sendSdkMcpMessage
-          : undefined;
-
-        const client = new McpClient(
-          name,
-          config,
-          this.toolRegistry,
-          this.cliConfig.getPromptRegistry(),
-          this.cliConfig.getWorkspaceContext(),
-          this.cliConfig.getDebugMode(),
-          sdkCallback,
-        );
-        this.clients.set(name, client);
-
-        this.eventEmitter?.emit('mcp-client-update', this.clients);
-        try {
-          await client.connect();
-          await client.discover(cliConfig);
-          this.eventEmitter?.emit('mcp-client-update', this.clients);
-        } catch (error) {
-          this.eventEmitter?.emit('mcp-client-update', this.clients);
-          // Log the error but don't let a single failed server stop the others
-          debugLogger.error(
-            `Error during discovery for server '${name}': ${getErrorMessage(
-              error,
-            )}`,
-          );
-        }
-      },
-    );
+      // For SDK MCP servers, pass the sendSdkMcpMessage callback
+      const sdkCallback = isSdkMcpServerConfig(config) ? this.sendSdkMcpMessage : undefined;
+
+      const client = new McpClient(
+        name,
+        config,
+        this.toolRegistry,
+        this.cliConfig.getPromptRegistry(),
+        this.cliConfig.getWorkspaceContext(),
+        this.cliConfig.getDebugMode(),
+        sdkCallback,
+      );
+      this.clients.set(name, client);
+
+      this.eventEmitter?.emit("mcp-client-update", this.clients);
+      try {
+        await client.connect();
+        await client.discover(cliConfig);
+        this.eventEmitter?.emit("mcp-client-update", this.clients);
+      } catch (error) {
+        this.eventEmitter?.emit("mcp-client-update", this.clients);
+        // Log the error but don't let a single failed server stop the others
+        debugLogger.error(`Error during discovery for server '${name}': ${getErrorMessage(error)}`);
+      }
+    });
 
     await Promise.all(discoveryPromises);
     this.discoveryState = MCPDiscoveryState.COMPLETED;
@@ -144,10 +136,7 @@ export class McpClientManager {
    *
    * This is primarily used for on-demand re-discovery flows (e.g. after OAuth).
    */
-  async discoverMcpToolsForServer(
-    serverName: string,
-    cliConfig: Config,
-  ): Promise<void> {
+  async discoverMcpToolsForServer(serverName: string, cliConfig: Config): Promise<void> {
     const servers = populateMcpServerCommand(
       this.cliConfig.getMcpServers() || {},
       this.cliConfig.getMcpServerCommand(),
@@ -163,19 +152,15 @@ export class McpClientManager {
       try {
         await existingClient.disconnect();
       } catch (error) {
-        debugLogger.error(
-          `Error stopping client '${serverName}': ${getErrorMessage(error)}`,
-        );
+        debugLogger.error(`Error stopping client '${serverName}': ${getErrorMessage(error)}`);
       } finally {
         this.clients.delete(serverName);
-        this.eventEmitter?.emit('mcp-client-update', this.clients);
+        this.eventEmitter?.emit("mcp-client-update", this.clients);
       }
     }
 
     // For SDK MCP servers, pass the sendSdkMcpMessage callback.
-    const sdkCallback = isSdkMcpServerConfig(serverConfig)
-      ? this.sendSdkMcpMessage
-      : undefined;
+    const sdkCallback = isSdkMcpServerConfig(serverConfig) ? this.sendSdkMcpMessage : undefined;
 
     const client = new McpClient(
       serverName,
@@ -188,7 +173,7 @@ export class McpClientManager {
     );
 
     this.clients.set(serverName, client);
-    this.eventEmitter?.emit('mcp-client-update', this.clients);
+    this.eventEmitter?.emit("mcp-client-update", this.clients);
 
     try {
       await client.connect();
@@ -198,12 +183,10 @@ export class McpClientManager {
     } catch (error) {
       // Log the error but don't throw: callers expect best-effort discovery.
       debugLogger.error(
-        `Error during discovery for server '${serverName}': ${getErrorMessage(
-          error,
-        )}`,
+        `Error during discovery for server '${serverName}': ${getErrorMessage(error)}`,
       );
     } finally {
-      this.eventEmitter?.emit('mcp-client-update', this.clients);
+      this.eventEmitter?.emit("mcp-client-update", this.clients);
     }
   }
 
@@ -215,17 +198,13 @@ export class McpClientManager {
     // Stop all health checks first
     this.stopAllHealthChecks();
 
-    const disconnectionPromises = Array.from(this.clients.entries()).map(
-      async ([name, client]) => {
-        try {
-          await client.disconnect();
-        } catch (error) {
-          debugLogger.error(
-            `Error stopping client '${name}': ${getErrorMessage(error)}`,
-          );
-        }
-      },
-    );
+    const disconnectionPromises = Array.from(this.clients.entries()).map(async ([name, client]) => {
+      try {
+        await client.disconnect();
+      } catch (error) {
+        debugLogger.error(`Error stopping client '${name}': ${getErrorMessage(error)}`);
+      }
+    });
 
     await Promise.all(disconnectionPromises);
     this.clients.clear();
@@ -246,14 +225,12 @@ export class McpClientManager {
       try {
         await client.disconnect();
       } catch (error) {
-        debugLogger.error(
-          `Error disconnecting client '${serverName}': ${getErrorMessage(error)}`,
-        );
+        debugLogger.error(`Error disconnecting client '${serverName}': ${getErrorMessage(error)}`);
       } finally {
         this.clients.delete(serverName);
         this.consecutiveFailures.delete(serverName);
         this.isReconnecting.delete(serverName);
-        this.eventEmitter?.emit('mcp-client-update', this.clients);
+        this.eventEmitter?.emit("mcp-client-update", this.clients);
       }
     }
   }
@@ -384,9 +361,7 @@ export class McpClientManager {
 
     try {
       // Wait before reconnecting
-      await new Promise((resolve) =>
-        setTimeout(resolve, this.healthConfig.reconnectDelayMs),
-      );
+      await new Promise((resolve) => setTimeout(resolve, this.healthConfig.reconnectDelayMs));
 
       await this.discoverMcpToolsForServer(serverName, this.cliConfig);
 
@@ -394,9 +369,7 @@ export class McpClientManager {
       this.consecutiveFailures.set(serverName, 0);
       debugLogger.info(`Successfully reconnected to server '${serverName}'`);
     } catch (error) {
-      debugLogger.error(
-        `Failed to reconnect to server '${serverName}': ${getErrorMessage(error)}`,
-      );
+      debugLogger.error(`Failed to reconnect to server '${serverName}': ${getErrorMessage(error)}`);
     } finally {
       this.isReconnecting.set(serverName, false);
     }
@@ -487,7 +460,7 @@ export class McpClientManager {
     // Remove tools for this server from registry
     this.toolRegistry.removeMcpToolsByServer(serverName);
 
-    this.eventEmitter?.emit('mcp-client-update', this.clients);
+    this.eventEmitter?.emit("mcp-client-update", this.clients);
   }
 
   async readResource(
@@ -506,9 +479,7 @@ export class McpClientManager {
         throw new Error(`MCP server '${serverName}' is not configured.`);
       }
 
-      const sdkCallback = isSdkMcpServerConfig(serverConfig)
-        ? this.sendSdkMcpMessage
-        : undefined;
+      const sdkCallback = isSdkMcpServerConfig(serverConfig) ? this.sendSdkMcpMessage : undefined;
 
       client = new McpClient(
         serverName,
@@ -520,7 +491,7 @@ export class McpClientManager {
         sdkCallback,
       );
       this.clients.set(serverName, client);
-      this.eventEmitter?.emit('mcp-client-update', this.clients);
+      this.eventEmitter?.emit("mcp-client-update", this.clients);
     }
 
     if (client.getStatus() !== MCPServerStatus.CONNECTED) {
diff --git a/packages/airiscode-core/src/tools/mcp-client.ts b/packages/airiscode-core/src/tools/mcp-client.ts
index 190b97f6b..8b1199695 100644
--- a/packages/airiscode-core/src/tools/mcp-client.ts
+++ b/packages/airiscode-core/src/tools/mcp-client.ts
@@ -4,47 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import type { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import { basename } from "node:path";
+import { pathToFileURL } from "node:url";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { SSEClientTransportOptions } from "@modelcontextprotocol/sdk/client/sse.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import type { StreamableHTTPClientTransportOptions } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import type {
   GetPromptResult,
   JSONRPCMessage,
   Prompt,
   ReadResourceResult,
-} from '@modelcontextprotocol/sdk/types.js';
+} from "@modelcontextprotocol/sdk/types.js";
 import {
   GetPromptResultSchema,
   ListPromptsResultSchema,
   ListRootsRequestSchema,
   ReadResourceResultSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-import { parse } from 'shell-quote';
-import type { Config, MCPServerConfig } from '../config/config.js';
-import { isSdkMcpServerConfig } from '../config/config.js';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-import type { McpToolAnnotations } from './mcp-tool.js';
-import { SdkControlClientTransport } from './sdk-control-client-transport.js';
-
-import type { FunctionDeclaration } from '../types/llm.js';
-import { mcpToTool } from '../types/llm.js';
-import { basename } from 'node:path';
-import { pathToFileURL } from 'node:url';
-import { MCPOAuthProvider } from '../mcp/oauth-provider.js';
-import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
-import { OAuthUtils } from '../mcp/oauth-utils.js';
-import type { PromptRegistry } from '../prompts/prompt-registry.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type {
-  Unsubscribe,
-  WorkspaceContext,
-} from '../utils/workspaceContext.js';
-import type { ToolRegistry } from './tool-registry.js';
+} from "@modelcontextprotocol/sdk/types.js";
+import { parse } from "shell-quote";
+import type { Config, MCPServerConfig } from "../config/config.js";
+import { isSdkMcpServerConfig } from "../config/config.js";
+import { MCPOAuthProvider } from "../mcp/oauth-provider.js";
+import { MCPOAuthTokenStorage } from "../mcp/oauth-token-storage.js";
+import { OAuthUtils } from "../mcp/oauth-utils.js";
+import type { PromptRegistry } from "../prompts/prompt-registry.js";
+import type { FunctionDeclaration } from "../types/llm.js";
+import { mcpToTool } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import type { Unsubscribe, WorkspaceContext } from "../utils/workspaceContext.js";
+import type { McpToolAnnotations } from "./mcp-tool.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import { SdkControlClientTransport } from "./sdk-control-client-transport.js";
+import type { ToolRegistry } from "./tool-registry.js";
 
 /**
  * Callback type for sending MCP messages to SDK servers via control plane
@@ -56,7 +52,7 @@ export type SendSdkMcpMessage = (
 
 export const MCP_DEFAULT_TIMEOUT_MSEC = 10 * 60 * 1000; // default to 10 minutes
 
-const debugLogger = createDebugLogger('MCP');
+const debugLogger = createDebugLogger("MCP");
 
 export type DiscoveredMCPPrompt = Prompt & {
   serverName: string;
@@ -68,11 +64,11 @@ export type DiscoveredMCPPrompt = Prompt & {
  */
 export enum MCPServerStatus {
   /** Server is disconnected or experiencing errors */
-  DISCONNECTED = 'disconnected',
+  DISCONNECTED = "disconnected",
   /** Server is in the process of connecting */
-  CONNECTING = 'connecting',
+  CONNECTING = "connecting",
   /** Server is connected and ready to use */
-  CONNECTED = 'connected',
+  CONNECTED = "connected",
 }
 
 /**
@@ -80,11 +76,11 @@ export enum MCPServerStatus {
  */
 export enum MCPDiscoveryState {
   /** Discovery has not started yet */
-  NOT_STARTED = 'not_started',
+  NOT_STARTED = "not_started",
   /** Discovery is currently in progress */
-  IN_PROGRESS = 'in_progress',
+  IN_PROGRESS = "in_progress",
   /** Discovery has completed (with or without errors) */
-  COMPLETED = 'completed',
+  COMPLETED = "completed",
 }
 
 /**
@@ -110,7 +106,7 @@ export class McpClient {
   ) {
     this.client = new Client({
       name: `qwen-cli-mcp-client-${this.serverName}`,
-      version: '0.0.1',
+      version: "0.0.1",
     });
   }
 
@@ -164,14 +160,14 @@ export class McpClient {
    */
   async discover(cliConfig: Config): Promise<void> {
     if (this.status !== MCPServerStatus.CONNECTED) {
-      throw new Error('Client is not connected.');
+      throw new Error("Client is not connected.");
     }
 
     const prompts = await this.discoverPrompts();
     const tools = await this.discoverTools(cliConfig);
 
     if (prompts.length === 0 && tools.length === 0) {
-      throw new Error('No prompts or tools found on the server.');
+      throw new Error("No prompts or tools found on the server.");
     }
 
     for (const tool of tools) {
@@ -198,21 +194,18 @@ export class McpClient {
     return this.status;
   }
 
-  async readResource(
-    uri: string,
-    options?: { signal?: AbortSignal },
-  ): Promise<ReadResourceResult> {
+  async readResource(uri: string, options?: { signal?: AbortSignal }): Promise<ReadResourceResult> {
     if (this.status !== MCPServerStatus.CONNECTED) {
-      throw new Error('Client is not connected.');
+      throw new Error("Client is not connected.");
     }
 
     // Only request resources if the server supports them.
     if (this.client.getServerCapabilities()?.resources == null) {
-      throw new Error('MCP server does not support resources.');
+      throw new Error("MCP server does not support resources.");
     }
 
     return this.client.request(
-      { method: 'resources/read', params: { uri } },
+      { method: "resources/read", params: { uri } },
       ReadResourceResultSchema,
       options,
     );
@@ -233,12 +226,7 @@ export class McpClient {
   }
 
   private async discoverTools(cliConfig: Config): Promise<DiscoveredMCPTool[]> {
-    return discoverTools(
-      this.serverName,
-      this.serverConfig,
-      this.client,
-      cliConfig,
-    );
+    return discoverTools(this.serverName, this.serverConfig, this.client, cliConfig);
   }
 
   private async discoverPrompts(): Promise<Prompt[]> {
@@ -264,27 +252,20 @@ export const mcpServerRequiresOAuth: Map<string, boolean> = new Map();
 /**
  * Event listeners for MCP server status changes
  */
-type StatusChangeListener = (
-  serverName: string,
-  status: MCPServerStatus,
-) => void;
+type StatusChangeListener = (serverName: string, status: MCPServerStatus) => void;
 const statusChangeListeners: StatusChangeListener[] = [];
 
 /**
  * Add a listener for MCP server status changes
  */
-export function addMCPStatusChangeListener(
-  listener: StatusChangeListener,
-): void {
+export function addMCPStatusChangeListener(listener: StatusChangeListener): void {
   statusChangeListeners.push(listener);
 }
 
 /**
  * Remove a listener for MCP server status changes
  */
-export function removeMCPStatusChangeListener(
-  listener: StatusChangeListener,
-): void {
+export function removeMCPStatusChangeListener(listener: StatusChangeListener): void {
   const index = statusChangeListeners.indexOf(listener);
   if (index !== -1) {
     statusChangeListeners.splice(index, 1);
@@ -294,10 +275,7 @@ export function removeMCPStatusChangeListener(
 /**
  * Update the status of an MCP server
  */
-export function updateMCPServerStatus(
-  serverName: string,
-  status: MCPServerStatus,
-): void {
+export function updateMCPServerStatus(serverName: string, status: MCPServerStatus): void {
   serverStatuses.set(serverName, status);
   // Notify all listeners
   for (const listener of statusChangeListeners) {
@@ -370,15 +348,12 @@ async function handleAutomaticOAuth(
 
     // Always try to parse the resource metadata URI from the www-authenticate header
     let oauthConfig;
-    const resourceMetadataUri =
-      OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
+    const resourceMetadataUri = OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
     if (resourceMetadataUri) {
       oauthConfig = await OAuthUtils.discoverOAuthConfig(resourceMetadataUri);
     } else if (hasNetworkTransport(mcpServerConfig)) {
       // Fallback: try to discover OAuth config from the base URL
-      const serverUrl = new URL(
-        mcpServerConfig.httpUrl || mcpServerConfig.url!,
-      );
+      const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url!);
       const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
       oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
     }
@@ -403,15 +378,11 @@ async function handleAutomaticOAuth(
     // Perform OAuth authentication
     // Pass the server URL for proper discovery
     const serverUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
-    debugLogger.info(
-      `Starting OAuth authentication for server '${mcpServerName}'...`,
-    );
+    debugLogger.info(`Starting OAuth authentication for server '${mcpServerName}'...`);
     const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
     await authProvider.authenticate(mcpServerName, oauthAuthConfig, serverUrl);
 
-    debugLogger.info(
-      `OAuth authentication successful for server '${mcpServerName}'`,
-    );
+    debugLogger.info(`OAuth authentication successful for server '${mcpServerName}'`);
     return true;
   } catch (error) {
     debugLogger.error(
@@ -495,17 +466,16 @@ export async function discoverMcpTools(
   try {
     mcpServers = populateMcpServerCommand(mcpServers, mcpServerCommand);
 
-    const discoveryPromises = Object.entries(mcpServers).map(
-      ([mcpServerName, mcpServerConfig]) =>
-        connectAndDiscover(
-          mcpServerName,
-          mcpServerConfig,
-          toolRegistry,
-          promptRegistry,
-          debugMode,
-          workspaceContext,
-          cliConfig,
-        ),
+    const discoveryPromises = Object.entries(mcpServers).map(([mcpServerName, mcpServerConfig]) =>
+      connectAndDiscover(
+        mcpServerName,
+        mcpServerConfig,
+        toolRegistry,
+        promptRegistry,
+        debugMode,
+        workspaceContext,
+        cliConfig,
+      ),
     );
     await Promise.all(discoveryPromises);
   } finally {
@@ -521,11 +491,11 @@ export function populateMcpServerCommand(
   if (mcpServerCommand) {
     const cmd = mcpServerCommand;
     const args = parse(cmd, process.env) as string[];
-    if (args.some((arg) => typeof arg !== 'string')) {
-      throw new Error('failed to parse mcpServerCommand: ' + cmd);
+    if (args.some((arg) => typeof arg !== "string")) {
+      throw new Error("failed to parse mcpServerCommand: " + cmd);
     }
     // use generic server name 'mcp'
-    mcpServers['mcp'] = {
+    mcpServers["mcp"] = {
       command: args[0],
       args: args.slice(1),
     };
@@ -572,21 +542,12 @@ export async function connectAndDiscover(
     };
 
     // Attempt to discover both prompts and tools
-    const prompts = await discoverPrompts(
-      mcpServerName,
-      mcpClient,
-      promptRegistry,
-    );
-    const tools = await discoverTools(
-      mcpServerName,
-      mcpServerConfig,
-      mcpClient,
-      cliConfig,
-    );
+    const prompts = await discoverPrompts(mcpServerName, mcpClient, promptRegistry);
+    const tools = await discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfig);
 
     // If we have neither prompts nor tools, it's a failed discovery
     if (prompts.length === 0 && tools.length === 0) {
-      throw new Error('No prompts or tools found on the server.');
+      throw new Error("No prompts or tools found on the server.");
     }
 
     // If we found anything, the server is connected
@@ -601,9 +562,7 @@ export async function connectAndDiscover(
       mcpClient.close();
     }
     debugLogger.error(
-      `Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(
-        error,
-      )}`,
+      `Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(error)}`,
     );
     updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
   }
@@ -649,9 +608,7 @@ export async function discoverTools(
       }
     } catch {
       // If listTools fails, proceed without annotations — non-critical
-      debugLogger.error(
-        `Failed to fetch tool annotations from MCP server '${mcpServerName}'`,
-      );
+      debugLogger.error(`Failed to fetch tool annotations from MCP server '${mcpServerName}'`);
     }
 
     const mcpTimeout = mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC;
@@ -667,8 +624,8 @@ export async function discoverTools(
             mcpCallableTool,
             mcpServerName,
             funcDecl.name!,
-            funcDecl.description ?? '',
-            funcDecl.parametersJsonSchema ?? { type: 'object', properties: {} },
+            funcDecl.description ?? "",
+            funcDecl.parametersJsonSchema ?? { type: "object", properties: {} },
             mcpServerConfig.trust,
             undefined,
             cliConfig,
@@ -687,15 +644,8 @@ export async function discoverTools(
     }
     return discoveredTools;
   } catch (error) {
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
-      debugLogger.error(
-        `Error discovering tools from ${mcpServerName}: ${getErrorMessage(
-          error,
-        )}`,
-      );
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
+      debugLogger.error(`Error discovering tools from ${mcpServerName}: ${getErrorMessage(error)}`);
     }
     return [];
   }
@@ -718,7 +668,7 @@ export async function discoverPrompts(
     if (mcpClient.getServerCapabilities()?.prompts == null) return [];
 
     const response = await mcpClient.request(
-      { method: 'prompts/list', params: {} },
+      { method: "prompts/list", params: {} },
       ListPromptsResultSchema,
     );
 
@@ -734,14 +684,9 @@ export async function discoverPrompts(
   } catch (error) {
     // It's okay if this fails, not all servers will have prompts.
     // Don't log an error if the method is not found, which is a common case.
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       debugLogger.error(
-        `Error discovering prompts from ${mcpServerName}: ${getErrorMessage(
-          error,
-        )}`,
+        `Error discovering prompts from ${mcpServerName}: ${getErrorMessage(error)}`,
       );
     }
     return [];
@@ -766,7 +711,7 @@ export async function invokeMcpPrompt(
   try {
     const response = await mcpClient.request(
       {
-        method: 'prompts/get',
+        method: "prompts/get",
         params: {
           name: promptName,
           arguments: promptParams,
@@ -777,10 +722,7 @@ export async function invokeMcpPrompt(
 
     return response;
   } catch (error) {
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       debugLogger.error(
         `Error invoking prompt '${promptName}' from ${mcpServerName} ${promptParams}: ${getErrorMessage(
           error,
@@ -820,8 +762,8 @@ export async function connectToMcpServer(
   sendSdkMcpMessage?: SendSdkMcpMessage,
 ): Promise<Client> {
   const mcpClient = new Client({
-    name: 'airiscode-mcp-client',
-    version: '0.0.1',
+    name: "airiscode-mcp-client",
+    version: "0.0.1",
   });
 
   mcpClient.registerCapabilities({
@@ -843,11 +785,11 @@ export async function connectToMcpServer(
     };
   });
 
-  let unlistenDirectories: Unsubscribe | undefined =
-    workspaceContext.onDirectoriesChanged(async () => {
+  let unlistenDirectories: Unsubscribe | undefined = workspaceContext.onDirectoriesChanged(
+    async () => {
       try {
         await mcpClient.notification({
-          method: 'notifications/roots/list_changed',
+          method: "notifications/roots/list_changed",
         });
       } catch (_) {
         // If this fails, its almost certainly because the connection was closed
@@ -855,7 +797,8 @@ export async function connectToMcpServer(
         unlistenDirectories?.();
         unlistenDirectories = undefined;
       }
-    });
+    },
+  );
 
   // Attempt to pro-actively unsubscribe if the mcp client closes. This API is
   // very brittle though so we don't have any guarantees, hence the try/catch
@@ -892,12 +835,11 @@ export async function connectToMcpServer(
     unlistenDirectories = undefined;
     // Check if this is a 401 error that might indicate OAuth is required
     const errorString = String(error);
-    if (errorString.includes('401') && hasNetworkTransport(mcpServerConfig)) {
+    if (errorString.includes("401") && hasNetworkTransport(mcpServerConfig)) {
       mcpServerRequiresOAuth.set(mcpServerName, true);
       // Only trigger automatic OAuth discovery for HTTP servers or when OAuth is explicitly configured
       // For SSE servers, we should not trigger new OAuth flows automatically
-      const shouldTriggerOAuth =
-        mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
+      const shouldTriggerOAuth = mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
 
       if (!shouldTriggerOAuth) {
         // For SSE servers without explicit OAuth config, if a token was found but rejected, report it accurately.
@@ -905,13 +847,10 @@ export async function connectToMcpServer(
         const credentials = await tokenStorage.getCredentials(mcpServerName);
         if (credentials) {
           const authProvider = new MCPOAuthProvider(tokenStorage);
-          const hasStoredTokens = await authProvider.getValidToken(
-            mcpServerName,
-            {
-              // Pass client ID if available
-              clientId: credentials.clientId,
-            },
-          );
+          const hasStoredTokens = await authProvider.getValidToken(mcpServerName, {
+            // Pass client ID if available
+            clientId: credentials.clientId,
+          });
           if (hasStoredTokens) {
             debugLogger.warn(
               `Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
@@ -935,42 +874,32 @@ export async function connectToMcpServer(
 
       // If we didn't get the header from the error string, try to get it from the server
       if (!wwwAuthenticate && hasNetworkTransport(mcpServerConfig)) {
-        debugLogger.debug(
-          `No www-authenticate header in error, trying to fetch it from server...`,
-        );
+        debugLogger.debug(`No www-authenticate header in error, trying to fetch it from server...`);
         try {
           const urlToFetch = mcpServerConfig.httpUrl || mcpServerConfig.url!;
           const response = await fetch(urlToFetch, {
-            method: 'HEAD',
+            method: "HEAD",
             headers: {
-              Accept: mcpServerConfig.httpUrl
-                ? 'application/json'
-                : 'text/event-stream',
+              Accept: mcpServerConfig.httpUrl ? "application/json" : "text/event-stream",
             },
             signal: AbortSignal.timeout(5000),
           });
 
           if (response.status === 401) {
-            wwwAuthenticate = response.headers.get('www-authenticate');
+            wwwAuthenticate = response.headers.get("www-authenticate");
             if (wwwAuthenticate) {
-              debugLogger.debug(
-                `Found www-authenticate header from server: ${wwwAuthenticate}`,
-              );
+              debugLogger.debug(`Found www-authenticate header from server: ${wwwAuthenticate}`);
             }
           }
         } catch (fetchError) {
           debugLogger.debug(
-            `Failed to fetch www-authenticate header: ${getErrorMessage(
-              fetchError,
-            )}`,
+            `Failed to fetch www-authenticate header: ${getErrorMessage(fetchError)}`,
           );
         }
       }
 
       if (wwwAuthenticate) {
-        debugLogger.debug(
-          `Received 401 with www-authenticate header: ${wwwAuthenticate}`,
-        );
+        debugLogger.debug(`Received 401 with www-authenticate header: ${wwwAuthenticate}`);
 
         // Try automatic OAuth discovery and authentication
         const oauthSuccess = await handleAutomaticOAuth(
@@ -980,9 +909,7 @@ export async function connectToMcpServer(
         );
         if (oauthSuccess) {
           // Retry connection with OAuth token
-          debugLogger.info(
-            `Retrying connection to '${mcpServerName}' with OAuth token...`,
-          );
+          debugLogger.info(`Retrying connection to '${mcpServerName}' with OAuth token...`);
 
           // Get the valid token - we need to create a proper OAuth config
           // The token should already be available from the authentication process
@@ -990,13 +917,10 @@ export async function connectToMcpServer(
           const credentials = await tokenStorage.getCredentials(mcpServerName);
           if (credentials) {
             const authProvider = new MCPOAuthProvider(tokenStorage);
-            const accessToken = await authProvider.getValidToken(
-              mcpServerName,
-              {
-                // Pass client ID if available
-                clientId: credentials.clientId,
-              },
-            );
+            const accessToken = await authProvider.getValidToken(mcpServerName, {
+              // Pass client ID if available
+              clientId: credentials.clientId,
+            });
 
             if (accessToken) {
               // Create transport with OAuth token
@@ -1008,34 +932,23 @@ export async function connectToMcpServer(
               if (oauthTransport) {
                 try {
                   await mcpClient.connect(oauthTransport, {
-                    timeout:
-                      mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
+                    timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
                   });
                   // Connection successful with OAuth
                   return mcpClient;
                 } catch (retryError) {
                   debugLogger.error(
-                    `Failed to connect with OAuth token: ${getErrorMessage(
-                      retryError,
-                    )}`,
+                    `Failed to connect with OAuth token: ${getErrorMessage(retryError)}`,
                   );
                   throw retryError;
                 }
               } else {
-                debugLogger.error(
-                  `Failed to create OAuth transport for server '${mcpServerName}'`,
-                );
-                throw new Error(
-                  `Failed to create OAuth transport for server '${mcpServerName}'`,
-                );
+                debugLogger.error(`Failed to create OAuth transport for server '${mcpServerName}'`);
+                throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
               }
             } else {
-              debugLogger.error(
-                `Failed to get OAuth token for server '${mcpServerName}'`,
-              );
-              throw new Error(
-                `Failed to get OAuth token for server '${mcpServerName}'`,
-              );
+              debugLogger.error(`Failed to get OAuth token for server '${mcpServerName}'`);
+              throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
             }
           } else {
             debugLogger.error(
@@ -1046,32 +959,24 @@ export async function connectToMcpServer(
             );
           }
         } else {
-          debugLogger.error(
-            `Failed to handle automatic OAuth for server '${mcpServerName}'`,
-          );
-          throw new Error(
-            `Failed to handle automatic OAuth for server '${mcpServerName}'`,
-          );
+          debugLogger.error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
+          throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
         }
       } else {
         // No www-authenticate header found, but we got a 401
         // Only try OAuth discovery for HTTP servers or when OAuth is explicitly configured
         // For SSE servers, we should not trigger new OAuth flows automatically
-        const shouldTryDiscovery =
-          mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
+        const shouldTryDiscovery = mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
 
         if (!shouldTryDiscovery) {
           const tokenStorage = new MCPOAuthTokenStorage();
           const credentials = await tokenStorage.getCredentials(mcpServerName);
           if (credentials) {
             const authProvider = new MCPOAuthProvider(tokenStorage);
-            const hasStoredTokens = await authProvider.getValidToken(
-              mcpServerName,
-              {
-                // Pass client ID if available
-                clientId: credentials.clientId,
-              },
-            );
+            const hasStoredTokens = await authProvider.getValidToken(mcpServerName, {
+              // Pass client ID if available
+              clientId: credentials.clientId,
+            });
             if (hasStoredTokens) {
               debugLogger.warn(
                 `Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
@@ -1091,14 +996,10 @@ export async function connectToMcpServer(
         }
 
         // For SSE/HTTP servers, try to discover OAuth configuration from the base URL
-        debugLogger.info(
-          `Attempting OAuth discovery for '${mcpServerName}'...`,
-        );
+        debugLogger.info(`Attempting OAuth discovery for '${mcpServerName}'...`);
 
         if (hasNetworkTransport(mcpServerConfig)) {
-          const serverUrl = new URL(
-            mcpServerConfig.httpUrl || mcpServerConfig.url!,
-          );
+          const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url!);
           const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
 
           try {
@@ -1119,33 +1020,20 @@ export async function connectToMcpServer(
 
               // Perform OAuth authentication
               // Pass the server URL for proper discovery
-              const authServerUrl =
-                mcpServerConfig.httpUrl || mcpServerConfig.url;
-              debugLogger.info(
-                `Starting OAuth authentication for server '${mcpServerName}'...`,
-              );
-              const authProvider = new MCPOAuthProvider(
-                new MCPOAuthTokenStorage(),
-              );
-              await authProvider.authenticate(
-                mcpServerName,
-                oauthAuthConfig,
-                authServerUrl,
-              );
+              const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
+              debugLogger.info(`Starting OAuth authentication for server '${mcpServerName}'...`);
+              const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
+              await authProvider.authenticate(mcpServerName, oauthAuthConfig, authServerUrl);
 
               // Retry connection with OAuth token
               const tokenStorage = new MCPOAuthTokenStorage();
-              const credentials =
-                await tokenStorage.getCredentials(mcpServerName);
+              const credentials = await tokenStorage.getCredentials(mcpServerName);
               if (credentials) {
                 const authProvider = new MCPOAuthProvider(tokenStorage);
-                const accessToken = await authProvider.getValidToken(
-                  mcpServerName,
-                  {
-                    // Pass client ID if available
-                    clientId: credentials.clientId,
-                  },
-                );
+                const accessToken = await authProvider.getValidToken(mcpServerName, {
+                  // Pass client ID if available
+                  clientId: credentials.clientId,
+                });
                 if (accessToken) {
                   // Create transport with OAuth token
                   const oauthTransport = await createTransportWithOAuth(
@@ -1156,16 +1044,13 @@ export async function connectToMcpServer(
                   if (oauthTransport) {
                     try {
                       await mcpClient.connect(oauthTransport, {
-                        timeout:
-                          mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
+                        timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
                       });
                       // Connection successful with OAuth
                       return mcpClient;
                     } catch (retryError) {
                       debugLogger.error(
-                        `Failed to connect with OAuth token: ${getErrorMessage(
-                          retryError,
-                        )}`,
+                        `Failed to connect with OAuth token: ${getErrorMessage(retryError)}`,
                       );
                       throw retryError;
                     }
@@ -1178,20 +1063,12 @@ export async function connectToMcpServer(
                     );
                   }
                 } else {
-                  debugLogger.error(
-                    `Failed to get OAuth token for server '${mcpServerName}'`,
-                  );
-                  throw new Error(
-                    `Failed to get OAuth token for server '${mcpServerName}'`,
-                  );
+                  debugLogger.error(`Failed to get OAuth token for server '${mcpServerName}'`);
+                  throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
                 }
               } else {
-                debugLogger.error(
-                  `Failed to get stored credentials for server '${mcpServerName}'`,
-                );
-                throw new Error(
-                  `Failed to get stored credentials for server '${mcpServerName}'`,
-                );
+                debugLogger.error(`Failed to get stored credentials for server '${mcpServerName}'`);
+                throw new Error(`Failed to get stored credentials for server '${mcpServerName}'`);
               }
             } else {
               debugLogger.error(
@@ -1221,8 +1098,7 @@ export async function connectToMcpServer(
       // Create a concise error message
       const errorMessage = (error as Error).message || String(error);
       const isNetworkError =
-        errorMessage.includes('ENOTFOUND') ||
-        errorMessage.includes('ECONNREFUSED');
+        errorMessage.includes("ENOTFOUND") || errorMessage.includes("ECONNREFUSED");
 
       let conciseError: string;
       if (isNetworkError) {
@@ -1231,7 +1107,7 @@ export async function connectToMcpServer(
         conciseError = `Connection failed for '${mcpServerName}': ${errorMessage}`;
       }
 
-      if (process.env['SANDBOX']) {
+      if (process.env["SANDBOX"]) {
         conciseError += ` (check sandbox availability)`;
       }
 
@@ -1249,9 +1125,7 @@ export async function createTransport(
 ): Promise<Transport> {
   if (isSdkMcpServerConfig(mcpServerConfig)) {
     if (!sendSdkMcpMessage) {
-      throw new Error(
-        `SDK MCP server '${mcpServerName}' requires sendSdkMcpMessage callback`,
-      );
+      throw new Error(`SDK MCP server '${mcpServerName}' requires sendSdkMcpMessage callback`);
     }
     return new SdkControlClientTransport({
       serverName: mcpServerName,
@@ -1267,10 +1141,7 @@ export async function createTransport(
   if (hasOAuthConfig && mcpServerConfig.oauth) {
     const tokenStorage = new MCPOAuthTokenStorage();
     const authProvider = new MCPOAuthProvider(tokenStorage);
-    accessToken = await authProvider.getValidToken(
-      mcpServerName,
-      mcpServerConfig.oauth,
-    );
+    accessToken = await authProvider.getValidToken(mcpServerName, mcpServerConfig.oauth);
 
     if (!accessToken) {
       debugLogger.error(
@@ -1295,9 +1166,7 @@ export async function createTransport(
 
       if (accessToken) {
         hasOAuthConfig = true;
-        debugLogger.debug(
-          `Found stored OAuth token for server '${mcpServerName}'`,
-        );
+        debugLogger.debug(`Found stored OAuth token for server '${mcpServerName}'`);
       }
     }
   }
@@ -1319,10 +1188,7 @@ export async function createTransport(
       };
     }
 
-    return new StreamableHTTPClientTransport(
-      new URL(mcpServerConfig.httpUrl),
-      transportOptions,
-    );
+    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
   }
 
   if (mcpServerConfig.url) {
@@ -1342,10 +1208,7 @@ export async function createTransport(
       };
     }
 
-    return new SSEClientTransport(
-      new URL(mcpServerConfig.url),
-      transportOptions,
-    );
+    return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
   }
 
   if (mcpServerConfig.command) {
@@ -1357,10 +1220,10 @@ export async function createTransport(
         ...(mcpServerConfig.env || {}),
       } as Record<string, string>,
       cwd: mcpServerConfig.cwd,
-      stderr: 'pipe',
+      stderr: "pipe",
     });
     if (debugMode) {
-      transport.stderr!.on('data', (data) => {
+      transport.stderr!.on("data", (data) => {
         const stderrStr = data.toString().trim();
         debugLogger.debug(`MCP STDERR (${mcpServerName}):`, stderrStr);
       });
@@ -1394,8 +1257,6 @@ export function isEnabled(
 
   return (
     !includeTools ||
-    includeTools.some(
-      (tool) => tool === funcDecl.name || tool.startsWith(`${funcDecl.name}(`),
-    )
+    includeTools.some((tool) => tool === funcDecl.name || tool.startsWith(`${funcDecl.name}(`))
   );
 }
diff --git a/packages/airiscode-core/src/tools/mcp-tool.ts b/packages/airiscode-core/src/tools/mcp-tool.ts
index 00b9acb84..782f648e6 100644
--- a/packages/airiscode-core/src/tools/mcp-tool.ts
+++ b/packages/airiscode-core/src/tools/mcp-tool.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+import type { Config } from "../config/config.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { CallableTool, FunctionCall, Part } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { truncateToolOutput } from "../utils/truncation.js";
+import { ToolErrorType } from "./tool-error.js";
 import type {
+  McpToolProgressData,
   ToolCallConfirmationDetails,
+  ToolConfirmationOutcome,
+  ToolConfirmationPayload,
   ToolInvocation,
   ToolMcpConfirmationDetails,
   ToolResult,
   ToolResultDisplay,
-  ToolConfirmationPayload,
-  McpToolProgressData,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import type { CallableTool, FunctionCall, Part } from '../types/llm.js';
-import { ToolErrorType } from './tool-error.js';
-import type { Config } from '../config/config.js';
-import { truncateToolOutput } from '../utils/truncation.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
-const debugLogger = createDebugLogger('MCP_TOOL');
+const debugLogger = createDebugLogger("MCP_TOOL");
 
 type ToolParams = Record<string, unknown>;
 
@@ -37,11 +37,7 @@ export interface McpDirectClient {
     params: { name: string; arguments?: Record<string, unknown> },
     resultSchema?: unknown,
     options?: {
-      onprogress?: (progress: {
-        progress: number;
-        total?: number;
-        message?: string;
-      }) => void;
+      onprogress?: (progress: { progress: number; total?: number; message?: string }) => void;
       timeout?: number;
       signal?: AbortSignal;
     },
@@ -63,18 +59,18 @@ interface McpCallToolResult {
 
 // Discriminated union for MCP Content Blocks to ensure type safety.
 type McpTextBlock = {
-  type: 'text';
+  type: "text";
   text: string;
 };
 
 type McpMediaBlock = {
-  type: 'image' | 'audio';
+  type: "image" | "audio";
   mimeType: string;
   data: string;
 };
 
 type McpResourceBlock = {
-  type: 'resource';
+  type: "resource";
   resource: {
     text?: string;
     blob?: string;
@@ -83,17 +79,13 @@ type McpResourceBlock = {
 };
 
 type McpResourceLinkBlock = {
-  type: 'resource_link';
+  type: "resource_link";
   uri: string;
   title?: string;
   name?: string;
 };
 
-type McpContentBlock =
-  | McpTextBlock
-  | McpMediaBlock
-  | McpResourceBlock
-  | McpResourceLinkBlock;
+type McpContentBlock = McpTextBlock | McpMediaBlock | McpResourceBlock | McpResourceLinkBlock;
 
 /**
  * MCP Tool Annotations as defined in the MCP specification.
@@ -107,10 +99,7 @@ export interface McpToolAnnotations {
   openWorldHint?: boolean;
 }
 
-class DiscoveredMCPToolInvocation extends BaseToolInvocation<
-  ToolParams,
-  ToolResult
-> {
+class DiscoveredMCPToolInvocation extends BaseToolInvocation<ToolParams, ToolResult> {
   private static readonly MAX_RECONNECT_RETRIES = 3;
 
   constructor(
@@ -139,13 +128,13 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     // MCP servers explicitly marked as trusted bypass confirmation,
     // but only when the workspace folder is also trusted (security gate).
     if (this.trust === true && this.cliConfig?.isTrustedFolder()) {
-      return 'allow';
+      return "allow";
     }
     // MCP tools annotated with readOnlyHint: true are safe
     if (this.annotations?.readOnlyHint === true) {
-      return 'allow';
+      return "allow";
     }
-    return 'ask';
+    return "ask";
   }
 
   /**
@@ -158,16 +147,13 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     const permissionRule = `mcp__${this.serverName}__${this.serverToolName}`;
 
     const confirmationDetails: ToolMcpConfirmationDetails = {
-      type: 'mcp',
-      title: 'Confirm MCP Tool Execution',
+      type: "mcp",
+      title: "Confirm MCP Tool Execution",
       serverName: this.serverName,
       toolName: this.serverToolName,
       toolDisplayName: this.displayName,
       permissionRules: [permissionRule],
-      onConfirm: async (
-        _outcome: ToolConfirmationOutcome,
-        _payload?: ToolConfirmationPayload,
-      ) => {
+      onConfirm: async (_outcome: ToolConfirmationOutcome, _payload?: ToolConfirmationPayload) => {
         // No-op: persistence is handled by coreToolScheduler via PM rules
       },
     };
@@ -189,7 +175,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
       const error = (response as { error?: McpError })?.error;
       const isError = error?.isError;
 
-      if (error && (isError === true || isError === 'true')) {
+      if (error && (isError === true || isError === "true")) {
         return true;
       }
     }
@@ -202,26 +188,18 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     }
 
     try {
-      debugLogger.info(
-        `Attempting to reconnect MCP server '${this.serverName}'...`,
-      );
+      debugLogger.info(`Attempting to reconnect MCP server '${this.serverName}'...`);
       const toolRegistry = this.cliConfig.getToolRegistry();
       await toolRegistry.discoverToolsForServer(this.serverName);
 
-      const newTool = toolRegistry.getTool(
-        `mcp__${this.serverName}__${this.serverToolName}`,
-      );
+      const newTool = toolRegistry.getTool(`mcp__${this.serverName}__${this.serverToolName}`);
       if (newTool instanceof DiscoveredMCPTool) {
-        debugLogger.info(
-          `Successfully reconnected to MCP server '${this.serverName}'`,
-        );
+        debugLogger.info(`Successfully reconnected to MCP server '${this.serverName}'`);
         return newTool;
       }
       return null;
     } catch (error) {
-      debugLogger.error(
-        `Failed to reconnect MCP server '${this.serverName}': ${error}`,
-      );
+      debugLogger.error(`Failed to reconnect MCP server '${this.serverName}': ${error}`);
       return null;
     }
   }
@@ -240,23 +218,21 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
       const newTool = await this.attemptReconnect();
       if (newTool) {
         const newInvocation = new DiscoveredMCPToolInvocation(
-          newTool['mcpTool'],
+          newTool["mcpTool"],
           this.serverName,
           this.serverToolName,
           this.displayName,
           this.trust,
           this.params,
           this.cliConfig,
-          newTool['mcpClient'],
+          newTool["mcpClient"],
           this.mcpTimeout,
           this.annotations,
           this.retryCount + 1,
         );
         return newInvocation.execute(signal, updateOutput);
       }
-    } else if (
-      this.retryCount >= DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES
-    ) {
+    } else if (this.retryCount >= DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES) {
       debugLogger.error(
         `Max reconnection attempts (${DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES}) reached for MCP server '${this.serverName}'`,
       );
@@ -298,7 +274,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
           onprogress: (progress) => {
             if (updateOutput) {
               const progressData: McpToolProgressData = {
-                type: 'mcp_tool_progress',
+                type: "mcp_tool_progress",
                 progress: progress.progress,
                 ...(progress.total != null && { total: progress.total }),
                 ...(progress.message != null && { message: progress.message }),
@@ -313,10 +289,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
 
       // Wrap the raw CallToolResult into the Part[] format that the
       // existing transform/display functions expect.
-      const rawResponseParts = wrapMcpCallToolResultAsParts(
-        this.serverToolName,
-        callToolResult,
-      );
+      const rawResponseParts = wrapMcpCallToolResultAsParts(this.serverToolName, callToolResult);
 
       // Ensure the response is not an error
       if (this.isMCPToolError(rawResponseParts)) {
@@ -352,9 +325,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
    * Fallback: execute using the @google/genai CallableTool wrapper.
    * This path does NOT support progress notifications.
    */
-  private async executeWithCallableTool(
-    signal: AbortSignal,
-  ): Promise<ToolResult> {
+  private async executeWithCallableTool(signal: AbortSignal): Promise<ToolResult> {
     const functionCalls: FunctionCall[] = [
       {
         name: this.serverToolName,
@@ -366,21 +337,21 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     try {
       const rawResponseParts = await new Promise<Part[]>((resolve, reject) => {
         if (signal.aborted) {
-          const error = new Error('Tool call aborted');
-          error.name = 'AbortError';
+          const error = new Error("Tool call aborted");
+          error.name = "AbortError";
           reject(error);
           return;
         }
         const onAbort = () => {
           cleanup();
-          const error = new Error('Tool call aborted');
-          error.name = 'AbortError';
+          const error = new Error("Tool call aborted");
+          error.name = "AbortError";
           reject(error);
         };
         const cleanup = () => {
-          signal.removeEventListener('abort', onAbort);
+          signal.removeEventListener("abort", onAbort);
         };
-        signal.addEventListener('abort', onAbort, { once: true });
+        signal.addEventListener("abort", onAbort, { once: true });
 
         this.mcpTool
           .callTool(functionCalls)
@@ -453,10 +424,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class DiscoveredMCPTool extends BaseDeclarativeTool<
-  ToolParams,
-  ToolResult
-> {
+export class DiscoveredMCPTool extends BaseDeclarativeTool<ToolParams, ToolResult> {
   constructor(
     private readonly mcpTool: CallableTool,
     readonly serverName: string,
@@ -471,8 +439,7 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
     readonly annotations?: McpToolAnnotations,
   ) {
     super(
-      nameOverride ??
-        generateValidName(`mcp__${serverName}__${serverToolName}`),
+      nameOverride ?? generateValidName(`mcp__${serverName}__${serverToolName}`),
       `${serverToolName} (${serverName} MCP Server)`,
       description,
       annotations?.readOnlyHint === true ? Kind.Read : Kind.Other,
@@ -498,9 +465,7 @@ export class DiscoveredMCPTool extends BaseDeclarativeTool<
     );
   }
 
-  protected createInvocation(
-    params: ToolParams,
-  ): ToolInvocation<ToolParams, ToolResult> {
+  protected createInvocation(params: ToolParams): ToolInvocation<ToolParams, ToolResult> {
     return new DiscoveredMCPToolInvocation(
       this.mcpTool,
       this.serverName,
@@ -528,9 +493,7 @@ function wrapMcpCallToolResultAsParts(
     isError?: boolean;
   },
 ): Part[] {
-  const response = result.isError
-    ? { error: result, content: result.content }
-    : result;
+  const response = result.isError ? { error: result, content: result.content } : result;
   return [
     {
       functionResponse: {
@@ -545,10 +508,7 @@ function transformTextBlock(block: McpTextBlock): Part {
   return { text: block.text };
 }
 
-function transformImageAudioBlock(
-  block: McpMediaBlock,
-  toolName: string,
-): Part[] {
+function transformImageAudioBlock(block: McpMediaBlock, toolName: string): Part[] {
   return [
     {
       text: `[Tool '${toolName}' provided the following ${
@@ -564,16 +524,13 @@ function transformImageAudioBlock(
   ];
 }
 
-function transformResourceBlock(
-  block: McpResourceBlock,
-  toolName: string,
-): Part | Part[] | null {
+function transformResourceBlock(block: McpResourceBlock, toolName: string): Part | Part[] | null {
   const resource = block.resource;
   if (resource?.text) {
     return { text: resource.text };
   }
   if (resource?.blob) {
-    const mimeType = resource.mimeType || 'application/octet-stream';
+    const mimeType = resource.mimeType || "application/octet-stream";
     return [
       {
         text: `[Tool '${toolName}' provided the following embedded resource with mime-type: ${mimeType}]`,
@@ -603,30 +560,28 @@ function transformResourceLinkBlock(block: McpResourceLinkBlock): Part {
  */
 function transformMcpContentToParts(sdkResponse: Part[]): Part[] {
   const funcResponse = sdkResponse?.[0]?.functionResponse;
-  const mcpContent = funcResponse?.response?.['content'] as McpContentBlock[];
-  const toolName = funcResponse?.name || 'unknown tool';
+  const mcpContent = funcResponse?.response?.["content"] as McpContentBlock[];
+  const toolName = funcResponse?.name || "unknown tool";
 
   if (!Array.isArray(mcpContent)) {
-    return [{ text: '[Error: Could not parse tool response]' }];
+    return [{ text: "[Error: Could not parse tool response]" }];
   }
 
-  const transformed = mcpContent.flatMap(
-    (block: McpContentBlock): Part | Part[] | null => {
-      switch (block.type) {
-        case 'text':
-          return transformTextBlock(block);
-        case 'image':
-        case 'audio':
-          return transformImageAudioBlock(block, toolName);
-        case 'resource':
-          return transformResourceBlock(block, toolName);
-        case 'resource_link':
-          return transformResourceLinkBlock(block);
-        default:
-          return null;
-      }
-    },
-  );
+  const transformed = mcpContent.flatMap((block: McpContentBlock): Part | Part[] | null => {
+    switch (block.type) {
+      case "text":
+        return transformTextBlock(block);
+      case "image":
+      case "audio":
+        return transformImageAudioBlock(block, toolName);
+      case "resource":
+        return transformResourceBlock(block, toolName);
+      case "resource_link":
+        return transformResourceLinkBlock(block);
+      default:
+        return null;
+    }
+  });
 
   return transformed.filter((part): part is Part => part !== null);
 }
@@ -637,7 +592,7 @@ function transformMcpContentToParts(sdkResponse: Part[]): Part[] {
  */
 function getDisplayFromParts(parts: Part[]): string {
   if (parts.length === 0) {
-    return '';
+    return "";
   }
 
   const displayParts: string[] = [];
@@ -649,19 +604,18 @@ function getDisplayFromParts(parts: Part[]): string {
     }
   }
 
-  return displayParts.join('\n');
+  return displayParts.join("\n");
 }
 
 /** Visible for testing */
 export function generateValidName(name: string) {
   // Replace invalid characters (based on 400 error message from Gemini API) with underscores
-  let validToolname = name.replace(/[^a-zA-Z0-9_.-]/g, '_');
+  let validToolname = name.replace(/[^a-zA-Z0-9_.-]/g, "_");
 
   // If longer than 63 characters, replace middle with '___'
   // (Gemini API says max length 64, but actual limit seems to be 63)
   if (validToolname.length > 63) {
-    validToolname =
-      validToolname.slice(0, 28) + '___' + validToolname.slice(-32);
+    validToolname = validToolname.slice(0, 28) + "___" + validToolname.slice(-32);
   }
   return validToolname;
 }
diff --git a/packages/airiscode-core/src/tools/memoryTool.ts b/packages/airiscode-core/src/tools/memoryTool.ts
index 347adf314..a07997c50 100644
--- a/packages/airiscode-core/src/tools/memoryTool.ts
+++ b/packages/airiscode-core/src/tools/memoryTool.ts
@@ -4,51 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import * as Diff from "diff";
+import { Storage } from "../config/storage.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { FunctionDeclaration } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { tildeifyPath } from "../utils/paths.js";
+import { DEFAULT_DIFF_OPTIONS } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
 import type {
-  ToolEditConfirmationDetails,
-  ToolResult,
   ToolCallConfirmationDetails,
   ToolConfirmationOutcome,
-} from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import type { FunctionDeclaration } from '../types/llm.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import * as Diff from 'diff';
-import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
-import { tildeifyPath } from '../utils/paths.js';
-import { ToolDisplayNames, ToolNames } from './tool-names.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { ToolErrorType } from './tool-error.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+  ToolEditConfirmationDetails,
+  ToolResult,
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
-const debugLogger = createDebugLogger('MEMORY_TOOL');
+const debugLogger = createDebugLogger("MEMORY_TOOL");
 
 const memoryToolSchemaData: FunctionDeclaration = {
-  name: 'save_memory',
+  name: "save_memory",
   description:
-    'Saves a specific piece of information or fact to your long-term memory. Use this when the user explicitly asks you to remember something, or when they state a clear, concise fact that seems important to retain for future interactions.',
+    "Saves a specific piece of information or fact to your long-term memory. Use this when the user explicitly asks you to remember something, or when they state a clear, concise fact that seems important to retain for future interactions.",
   parametersJsonSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       fact: {
-        type: 'string',
+        type: "string",
         description:
-          'The specific fact or piece of information to remember. Should be a clear, self-contained statement.',
+          "The specific fact or piece of information to remember. Should be a clear, self-contained statement.",
       },
       scope: {
-        type: 'string',
+        type: "string",
         description:
           'Where to save the memory: "global" saves to user-level ~/.airiscode/AIRISCODE.md (shared across all projects), "project" saves to current project\'s AIRISCODE.md (project-specific). If not specified, will prompt user to choose.',
-        enum: ['global', 'project'],
+        enum: ["global", "project"],
       },
     },
-    required: ['fact'],
+    required: ["fact"],
   },
 };
 
@@ -75,10 +72,10 @@ Do NOT use this tool:
   - If not specified, the tool will ask the user where they want to save the memory.
 `;
 
-export const AIRISCODE_CONFIG_DIR = '.airiscode';
-export const DEFAULT_CONTEXT_FILENAME = 'AIRISCODE.md';
-export const AGENT_CONTEXT_FILENAME = 'AGENTS.md';
-export const MEMORY_SECTION_HEADER = '## Auto-saved Memories';
+export const AIRISCODE_CONFIG_DIR = ".airiscode";
+export const DEFAULT_CONTEXT_FILENAME = "AIRISCODE.md";
+export const AGENT_CONTEXT_FILENAME = "AGENTS.md";
+export const MEMORY_SECTION_HEADER = "## Auto-saved Memories";
 
 // Context files loaded at session start.
 // Reads AIRISCODE.md, CLAUDE.md, and AGENTS.md for Claude Code compatibility.
@@ -86,7 +83,7 @@ export const MEMORY_SECTION_HEADER = '## Auto-saved Memories';
 // projects that use both Claude Code and AIRIS Code to share context.
 let currentGeminiMdFilename: string | string[] = [
   DEFAULT_CONTEXT_FILENAME,
-  'CLAUDE.md',
+  "CLAUDE.md",
   AGENT_CONTEXT_FILENAME,
 ];
 
@@ -95,7 +92,7 @@ export function setGeminiMdFilename(newFilename: string | string[]): void {
     if (newFilename.length > 0) {
       currentGeminiMdFilename = newFilename.map((name) => name.trim());
     }
-  } else if (newFilename && newFilename.trim() !== '') {
+  } else if (newFilename && newFilename.trim() !== "") {
     currentGeminiMdFilename = newFilename.trim();
   }
 }
@@ -118,7 +115,7 @@ interface SaveMemoryParams {
   fact: string;
   modified_by_user?: boolean;
   modified_content?: string;
-  scope?: 'global' | 'project';
+  scope?: "global" | "project";
 }
 
 function getGlobalMemoryFilePath(): string {
@@ -129,36 +126,30 @@ function getProjectMemoryFilePath(): string {
   return path.join(process.cwd(), getCurrentGeminiMdFilename());
 }
 
-function getMemoryFilePath(scope: 'global' | 'project' = 'global'): string {
-  return scope === 'project'
-    ? getProjectMemoryFilePath()
-    : getGlobalMemoryFilePath();
+function getMemoryFilePath(scope: "global" | "project" = "global"): string {
+  return scope === "project" ? getProjectMemoryFilePath() : getGlobalMemoryFilePath();
 }
 
 /**
  * Ensures proper newline separation before appending content.
  */
 function ensureNewlineSeparation(currentContent: string): string {
-  if (currentContent.length === 0) return '';
-  if (currentContent.endsWith('\n\n') || currentContent.endsWith('\r\n\r\n'))
-    return '';
-  if (currentContent.endsWith('\n') || currentContent.endsWith('\r\n'))
-    return '\n';
-  return '\n\n';
+  if (currentContent.length === 0) return "";
+  if (currentContent.endsWith("\n\n") || currentContent.endsWith("\r\n\r\n")) return "";
+  if (currentContent.endsWith("\n") || currentContent.endsWith("\r\n")) return "\n";
+  return "\n\n";
 }
 
 /**
  * Reads the current content of the memory file
  */
-async function readMemoryFileContent(
-  scope: 'global' | 'project' = 'global',
-): Promise<string> {
+async function readMemoryFileContent(scope: "global" | "project" = "global"): Promise<string> {
   try {
-    return await fs.readFile(getMemoryFilePath(scope), 'utf-8');
+    return await fs.readFile(getMemoryFilePath(scope), "utf-8");
   } catch (err) {
     const error = err as Error & { code?: string };
-    if (!(error instanceof Error) || error.code !== 'ENOENT') throw err;
-    return '';
+    if (!(error instanceof Error) || error.code !== "ENOENT") throw err;
+    return "";
   }
 }
 
@@ -167,7 +158,7 @@ async function readMemoryFileContent(
  */
 function computeNewContent(currentContent: string, fact: string): string {
   let processedText = fact.trim();
-  processedText = processedText.replace(/^(-+\s*)+/, '').trim();
+  processedText = processedText.replace(/^(-+\s*)+/, "").trim();
   const newMemoryItem = `- ${processedText}`;
 
   const headerIndex = currentContent.indexOf(MEMORY_SECTION_HEADER);
@@ -175,24 +166,16 @@ function computeNewContent(currentContent: string, fact: string): string {
   if (headerIndex === -1) {
     // Header not found, append header and then the entry
     const separator = ensureNewlineSeparation(currentContent);
-    return (
-      currentContent +
-      `${separator}${MEMORY_SECTION_HEADER}\n${newMemoryItem}\n`
-    );
+    return currentContent + `${separator}${MEMORY_SECTION_HEADER}\n${newMemoryItem}\n`;
   } else {
     // Header found, find where to insert the new memory entry
     const startOfSectionContent = headerIndex + MEMORY_SECTION_HEADER.length;
-    let endOfSectionIndex = currentContent.indexOf(
-      '\n## ',
-      startOfSectionContent,
-    );
+    let endOfSectionIndex = currentContent.indexOf("\n## ", startOfSectionContent);
     if (endOfSectionIndex === -1) {
       endOfSectionIndex = currentContent.length; // End of file
     }
 
-    const beforeSectionMarker = currentContent
-      .substring(0, startOfSectionContent)
-      .trimEnd();
+    const beforeSectionMarker = currentContent.substring(0, startOfSectionContent).trimEnd();
     let sectionContent = currentContent
       .substring(startOfSectionContent, endOfSectionIndex)
       .trimEnd();
@@ -201,19 +184,16 @@ function computeNewContent(currentContent: string, fact: string): string {
     sectionContent += `\n${newMemoryItem}`;
     return (
       `${beforeSectionMarker}\n${sectionContent.trimStart()}\n${afterSectionMarker}`.trimEnd() +
-      '\n'
+      "\n"
     );
   }
 }
 
-class MemoryToolInvocation extends BaseToolInvocation<
-  SaveMemoryParams,
-  ToolResult
-> {
+class MemoryToolInvocation extends BaseToolInvocation<SaveMemoryParams, ToolResult> {
   getDescription(): string {
     if (!this.params.scope) {
-      const globalPath = tildeifyPath(getMemoryFilePath('global'));
-      const projectPath = tildeifyPath(getMemoryFilePath('project'));
+      const globalPath = tildeifyPath(getMemoryFilePath("global"));
+      const projectPath = tildeifyPath(getMemoryFilePath("project"));
       return `CHOOSE: ${globalPath} (global) OR ${projectPath} (project)`;
     }
     const scope = this.params.scope;
@@ -225,7 +205,7 @@ class MemoryToolInvocation extends BaseToolInvocation<
    * Memory save always needs user confirmation.
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
-    return 'ask';
+    return "ask";
   }
 
   /**
@@ -236,12 +216,12 @@ class MemoryToolInvocation extends BaseToolInvocation<
   ): Promise<ToolCallConfirmationDetails> {
     // When scope is not specified, show a choice dialog defaulting to global
     if (!this.params.scope) {
-      const defaultScope = 'global';
+      const defaultScope = "global";
       const currentContent = await readMemoryFileContent(defaultScope);
       const newContent = computeNewContent(currentContent, this.params.fact);
 
-      const globalPath = tildeifyPath(getMemoryFilePath('global'));
-      const projectPath = tildeifyPath(getMemoryFilePath('project'));
+      const globalPath = tildeifyPath(getMemoryFilePath("global"));
+      const projectPath = tildeifyPath(getMemoryFilePath("project"));
 
       const fileName = path.basename(getMemoryFilePath(defaultScope));
       const choiceText = `Choose where to save this memory:
@@ -260,13 +240,13 @@ Preview of changes to be made to GLOBAL memory:
           fileName,
           currentContent,
           newContent,
-          'Current',
-          'Proposed (Global)',
+          "Current",
+          "Proposed (Global)",
           DEFAULT_DIFF_OPTIONS,
         );
 
       const confirmationDetails: ToolEditConfirmationDetails = {
-        type: 'edit',
+        type: "edit",
         title: `Choose Memory Location: GLOBAL (${globalPath}) or PROJECT (${projectPath})`,
         fileName,
         filePath: getMemoryFilePath(defaultScope),
@@ -295,13 +275,13 @@ Preview of changes to be made to GLOBAL memory:
       fileName,
       currentContent,
       newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Memory Save: ${tildeifyPath(memoryFilePath)} (${scope})`,
       fileName: memoryFilePath,
       filePath: memoryFilePath,
@@ -318,7 +298,7 @@ Preview of changes to be made to GLOBAL memory:
   async execute(_signal: AbortSignal): Promise<ToolResult> {
     const { fact, modified_by_user, modified_content } = this.params;
 
-    if (!fact || typeof fact !== 'string' || fact.trim() === '') {
+    if (!fact || typeof fact !== "string" || fact.trim() === "") {
       const errorMessage = 'Parameter "fact" must be a non-empty string.';
       return {
         llmContent: `Error: ${errorMessage}`,
@@ -328,8 +308,8 @@ Preview of changes to be made to GLOBAL memory:
 
     // If scope is not specified and user didn't modify content, return error prompting for choice
     if (!this.params.scope && !modified_by_user) {
-      const globalPath = tildeifyPath(getMemoryFilePath('global'));
-      const projectPath = tildeifyPath(getMemoryFilePath('project'));
+      const globalPath = tildeifyPath(getMemoryFilePath("global"));
+      const projectPath = tildeifyPath(getMemoryFilePath("project"));
       const errorMessage = `Please specify where to save this memory:
 
 Global: ${globalPath} (shared across all projects)
@@ -341,7 +321,7 @@ Project: ${projectPath} (current project only)`;
       };
     }
 
-    const scope = this.params.scope || 'global';
+    const scope = this.params.scope || "global";
     const memoryFilePath = getMemoryFilePath(scope);
 
     try {
@@ -350,7 +330,7 @@ Project: ${projectPath} (current project only)`;
         await fs.mkdir(path.dirname(memoryFilePath), {
           recursive: true,
         });
-        await fs.writeFile(memoryFilePath, modified_content, 'utf-8');
+        await fs.writeFile(memoryFilePath, modified_content, "utf-8");
         const successMessage = `Okay, I've updated the ${scope} memory file with your modifications.`;
         return {
           llmContent: successMessage,
@@ -370,8 +350,7 @@ Project: ${projectPath} (current project only)`;
         };
       }
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       debugLogger.error(
         `[MemoryTool] Error executing save_memory for fact "${fact}" in ${scope}: ${errorMessage}`,
       );
@@ -403,10 +382,8 @@ export class MemoryTool
     );
   }
 
-  protected override validateToolParamValues(
-    params: SaveMemoryParams,
-  ): string | null {
-    if (params.fact.trim() === '') {
+  protected override validateToolParamValues(params: SaveMemoryParams): string | null {
+    if (params.fact.trim() === "") {
       return 'Parameter "fact" must be a non-empty string.';
     }
 
@@ -421,35 +398,25 @@ export class MemoryTool
     text: string,
     memoryFilePath: string,
     fsAdapter: {
-      readFile: (path: string, encoding: 'utf-8') => Promise<string>;
-      writeFile: (
-        path: string,
-        data: string,
-        encoding: 'utf-8',
-      ) => Promise<void>;
-      mkdir: (
-        path: string,
-        options: { recursive: boolean },
-      ) => Promise<string | undefined>;
+      readFile: (path: string, encoding: "utf-8") => Promise<string>;
+      writeFile: (path: string, data: string, encoding: "utf-8") => Promise<void>;
+      mkdir: (path: string, options: { recursive: boolean }) => Promise<string | undefined>;
     },
   ): Promise<void> {
     try {
       await fsAdapter.mkdir(path.dirname(memoryFilePath), { recursive: true });
-      let currentContent = '';
+      let currentContent = "";
       try {
-        currentContent = await fsAdapter.readFile(memoryFilePath, 'utf-8');
+        currentContent = await fsAdapter.readFile(memoryFilePath, "utf-8");
       } catch (_e) {
         // File doesn't exist, which is fine. currentContent will be empty.
       }
 
       const newContent = computeNewContent(currentContent, text);
 
-      await fsAdapter.writeFile(memoryFilePath, newContent, 'utf-8');
+      await fsAdapter.writeFile(memoryFilePath, newContent, "utf-8");
     } catch (error) {
-      debugLogger.error(
-        `[MemoryTool] Error adding memory entry to ${memoryFilePath}:`,
-        error,
-      );
+      debugLogger.error(`[MemoryTool] Error adding memory entry to ${memoryFilePath}:`, error);
       throw new Error(
         `[MemoryTool] Failed to add memory entry: ${error instanceof Error ? error.message : String(error)}`,
       );
@@ -460,13 +427,11 @@ export class MemoryTool
     return {
       getFilePath: (params: SaveMemoryParams) => {
         // Determine scope from modified content or default
-        let scope = params.scope || 'global';
+        let scope = params.scope || "global";
         if (params.modified_content) {
-          const scopeMatch = params.modified_content.match(
-            /^scope:\s*(global|project)\s*\n/i,
-          );
+          const scopeMatch = params.modified_content.match(/^scope:\s*(global|project)\s*\n/i);
           if (scopeMatch) {
-            scope = scopeMatch[1].toLowerCase() as 'global' | 'project';
+            scope = scopeMatch[1].toLowerCase() as "global" | "project";
           }
         }
         return getMemoryFilePath(scope);
@@ -474,40 +439,36 @@ export class MemoryTool
       getCurrentContent: async (params: SaveMemoryParams): Promise<string> => {
         // Check if content starts with scope directive
         if (params.modified_content) {
-          const scopeMatch = params.modified_content.match(
-            /^scope:\s*(global|project)\s*\n/i,
-          );
+          const scopeMatch = params.modified_content.match(/^scope:\s*(global|project)\s*\n/i);
           if (scopeMatch) {
-            const scope = scopeMatch[1].toLowerCase() as 'global' | 'project';
+            const scope = scopeMatch[1].toLowerCase() as "global" | "project";
             const content = await readMemoryFileContent(scope);
-            const globalPath = tildeifyPath(getMemoryFilePath('global'));
-            const projectPath = tildeifyPath(getMemoryFilePath('project'));
+            const globalPath = tildeifyPath(getMemoryFilePath("global"));
+            const projectPath = tildeifyPath(getMemoryFilePath("project"));
             return `scope: ${scope}\n\n# INSTRUCTIONS:\n# - Save as "global" for GLOBAL memory: ${globalPath}\n# - Save as "project" for PROJECT memory: ${projectPath}\n\n${content}`;
           }
         }
-        const scope = params.scope || 'global';
+        const scope = params.scope || "global";
         const content = await readMemoryFileContent(scope);
-        const globalPath = tildeifyPath(getMemoryFilePath('global'));
-        const projectPath = tildeifyPath(getMemoryFilePath('project'));
+        const globalPath = tildeifyPath(getMemoryFilePath("global"));
+        const projectPath = tildeifyPath(getMemoryFilePath("project"));
         return `scope: ${scope}\n\n# INSTRUCTIONS:\n# - Save as "global" for GLOBAL memory: ${globalPath}\n# - Save as "project" for PROJECT memory: ${projectPath}\n\n${content}`;
       },
       getProposedContent: async (params: SaveMemoryParams): Promise<string> => {
-        let scope = params.scope || 'global';
+        let scope = params.scope || "global";
 
         // Check if modified content has scope directive
         if (params.modified_content) {
-          const scopeMatch = params.modified_content.match(
-            /^scope:\s*(global|project)\s*\n/i,
-          );
+          const scopeMatch = params.modified_content.match(/^scope:\s*(global|project)\s*\n/i);
           if (scopeMatch) {
-            scope = scopeMatch[1].toLowerCase() as 'global' | 'project';
+            scope = scopeMatch[1].toLowerCase() as "global" | "project";
           }
         }
 
         const currentContent = await readMemoryFileContent(scope);
         const newContent = computeNewContent(currentContent, params.fact);
-        const globalPath = tildeifyPath(getMemoryFilePath('global'));
-        const projectPath = tildeifyPath(getMemoryFilePath('project'));
+        const globalPath = tildeifyPath(getMemoryFilePath("global"));
+        const projectPath = tildeifyPath(getMemoryFilePath("project"));
         return `scope: ${scope}\n\n# INSTRUCTIONS:\n# - Save as "global" for GLOBAL memory: ${globalPath}\n# - Save as "project" for PROJECT memory: ${projectPath}\n\n${newContent}`;
       },
       createUpdatedParams: (
@@ -516,21 +477,19 @@ export class MemoryTool
         originalParams: SaveMemoryParams,
       ): SaveMemoryParams => {
         // Parse user's scope choice from modified content
-        const scopeMatch = modifiedProposedContent.match(
-          /^scope:\s*(global|project)/i,
-        );
+        const scopeMatch = modifiedProposedContent.match(/^scope:\s*(global|project)/i);
         const scope = scopeMatch
-          ? (scopeMatch[1].toLowerCase() as 'global' | 'project')
-          : originalParams.scope || 'global';
+          ? (scopeMatch[1].toLowerCase() as "global" | "project")
+          : originalParams.scope || "global";
 
         // Strip out the scope directive and instruction lines, keep only the actual memory content
         const contentWithoutScope = modifiedProposedContent.replace(
           /^scope:\s*(global|project)\s*\n/,
-          '',
+          "",
         );
         const actualContent = contentWithoutScope
-          .replace(/^#[^\n]*\n/gm, '')
-          .replace(/^\s*\n/gm, '')
+          .replace(/^#[^\n]*\n/gm, "")
+          .replace(/^\s*\n/gm, "")
           .trim();
 
         return {
diff --git a/packages/airiscode-core/src/tools/modifiable-tool.ts b/packages/airiscode-core/src/tools/modifiable-tool.ts
index 44bf8e42f..86d8dea83 100644
--- a/packages/airiscode-core/src/tools/modifiable-tool.ts
+++ b/packages/airiscode-core/src/tools/modifiable-tool.ts
@@ -4,22 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { EditorType } from '../utils/editor.js';
-import { openDiff } from '../utils/editor.js';
-import os from 'node:os';
-import path from 'node:path';
-import fs from 'node:fs';
-import * as Diff from 'diff';
-import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
-import { isNodeError } from '../utils/errors.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type {
-  AnyDeclarativeTool,
-  DeclarativeTool,
-  ToolResult,
-} from './tools.js';
-
-const debugLogger = createDebugLogger('MODIFIABLE_TOOL');
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import * as Diff from "diff";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import type { EditorType } from "../utils/editor.js";
+import { openDiff } from "../utils/editor.js";
+import { isNodeError } from "../utils/errors.js";
+import { DEFAULT_DIFF_OPTIONS } from "./diffOptions.js";
+import type { AnyDeclarativeTool, DeclarativeTool, ToolResult } from "./tools.js";
+
+const debugLogger = createDebugLogger("MODIFIABLE_TOOL");
 
 /**
  * A declarative tool that supports a modify operation.
@@ -54,7 +50,7 @@ export interface ModifyResult<ToolParams> {
 export function isModifiableDeclarativeTool(
   tool: AnyDeclarativeTool,
 ): tool is ModifiableDeclarativeTool<object> {
-  return 'getModifyContext' in tool;
+  return "getModifyContext" in tool;
 }
 
 function createTempFilesForModify(
@@ -63,7 +59,7 @@ function createTempFilesForModify(
   file_path: string,
 ): { oldPath: string; newPath: string } {
   const tempDir = os.tmpdir();
-  const diffDir = path.join(tempDir, 'airiscode-tool-modify-diffs');
+  const diffDir = path.join(tempDir, "airiscode-tool-modify-diffs");
 
   if (!fs.existsSync(diffDir)) {
     fs.mkdirSync(diffDir, { recursive: true });
@@ -72,17 +68,11 @@ function createTempFilesForModify(
   const ext = path.extname(file_path);
   const fileName = path.basename(file_path, ext);
   const timestamp = Date.now();
-  const tempOldPath = path.join(
-    diffDir,
-    `airiscode-modify-${fileName}-old-${timestamp}${ext}`,
-  );
-  const tempNewPath = path.join(
-    diffDir,
-    `airiscode-modify-${fileName}-new-${timestamp}${ext}`,
-  );
+  const tempOldPath = path.join(diffDir, `airiscode-modify-${fileName}-old-${timestamp}${ext}`);
+  const tempNewPath = path.join(diffDir, `airiscode-modify-${fileName}-new-${timestamp}${ext}`);
 
-  fs.writeFileSync(tempOldPath, currentContent, 'utf8');
-  fs.writeFileSync(tempNewPath, proposedContent, 'utf8');
+  fs.writeFileSync(tempOldPath, currentContent, "utf8");
+  fs.writeFileSync(tempNewPath, proposedContent, "utf8");
 
   return { oldPath: tempOldPath, newPath: tempNewPath };
 }
@@ -93,34 +83,30 @@ function getUpdatedParams<ToolParams>(
   originalParams: ToolParams,
   modifyContext: ModifyContext<ToolParams>,
 ): { updatedParams: ToolParams; updatedDiff: string } {
-  let oldContent = '';
-  let newContent = '';
+  let oldContent = "";
+  let newContent = "";
 
   try {
-    oldContent = fs.readFileSync(tmpOldPath, 'utf8');
+    oldContent = fs.readFileSync(tmpOldPath, "utf8");
   } catch (err) {
-    if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-    oldContent = '';
+    if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+    oldContent = "";
   }
 
   try {
-    newContent = fs.readFileSync(tempNewPath, 'utf8');
+    newContent = fs.readFileSync(tempNewPath, "utf8");
   } catch (err) {
-    if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-    newContent = '';
+    if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+    newContent = "";
   }
 
-  const updatedParams = modifyContext.createUpdatedParams(
-    oldContent,
-    newContent,
-    originalParams,
-  );
+  const updatedParams = modifyContext.createUpdatedParams(oldContent, newContent, originalParams);
   const updatedDiff = Diff.createPatch(
     path.basename(modifyContext.getFilePath(originalParams)),
     oldContent,
     newContent,
-    'Current',
-    'Proposed',
+    "Current",
+    "Proposed",
     DEFAULT_DIFF_OPTIONS,
   );
 
@@ -153,8 +139,7 @@ export async function modifyWithEditor<ToolParams>(
   onEditorClose: () => void,
 ): Promise<ModifyResult<ToolParams>> {
   const currentContent = await modifyContext.getCurrentContent(originalParams);
-  const proposedContent =
-    await modifyContext.getProposedContent(originalParams);
+  const proposedContent = await modifyContext.getProposedContent(originalParams);
 
   const { oldPath, newPath } = createTempFilesForModify(
     currentContent,
@@ -164,12 +149,7 @@ export async function modifyWithEditor<ToolParams>(
 
   try {
     await openDiff(oldPath, newPath, editorType, onEditorClose);
-    const result = getUpdatedParams(
-      oldPath,
-      newPath,
-      originalParams,
-      modifyContext,
-    );
+    const result = getUpdatedParams(oldPath, newPath, originalParams, modifyContext);
 
     return result;
   } finally {
diff --git a/packages/airiscode-core/src/tools/read-file.ts b/packages/airiscode-core/src/tools/read-file.ts
index 6c9891543..cb5e2dc81 100644
--- a/packages/airiscode-core/src/tools/read-file.ts
+++ b/packages/airiscode-core/src/tools/read-file.ts
@@ -4,26 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import os from 'node:os';
-import path from 'node:path';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import type { ToolInvocation, ToolLocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-
-import type { PartUnion } from '../types/llm.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import {
-  processSingleFileContent,
-  getSpecificMimeType,
-} from '../utils/fileUtils.js';
-import type { Config } from '../config/config.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getProgrammingLanguage } from '../telemetry/telemetry-utils.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { isSubpaths, isSubpath } from '../utils/paths.js';
-import { Storage } from '../config/storage.js';
+import os from "node:os";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { getProgrammingLanguage } from "../telemetry/telemetry-utils.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import type { PartUnion } from "../types/llm.js";
+import { getSpecificMimeType, processSingleFileContent } from "../utils/fileUtils.js";
+import { isSubpath, isSubpaths, makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolLocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Parameters for the ReadFile tool
@@ -45,10 +40,7 @@ export interface ReadFileToolParams {
   limit?: number;
 }
 
-class ReadFileToolInvocation extends BaseToolInvocation<
-  ReadFileToolParams,
-  ToolResult
-> {
+class ReadFileToolInvocation extends BaseToolInvocation<ReadFileToolParams, ToolResult> {
   constructor(
     private config: Config,
     params: ReadFileToolParams,
@@ -57,10 +49,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
     const shortPath = shortenPath(relativePath);
 
     const { offset, limit } = this.params;
@@ -100,9 +89,9 @@ class ReadFileToolInvocation extends BaseToolInvocation<
       isSubpaths(userSkillsDirs, filePath) ||
       isSubpath(userExtensionsDir, filePath)
     ) {
-      return 'allow';
+      return "allow";
     }
-    return 'ask';
+    return "ask";
   }
 
   async execute(): Promise<ToolResult> {
@@ -116,7 +105,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
     if (result.error) {
       return {
         llmContent: result.llmContent,
-        returnDisplay: result.returnDisplay || 'Error reading file',
+        returnDisplay: result.returnDisplay || "Error reading file",
         error: {
           message: result.error,
           type: result.errorType,
@@ -130,13 +119,11 @@ class ReadFileToolInvocation extends BaseToolInvocation<
       const total = result.originalLineCount!;
       llmContent = `Showing lines ${start}-${end} of ${total} total lines.\n\n---\n\n${result.llmContent}`;
     } else {
-      llmContent = result.llmContent || '';
+      llmContent = result.llmContent || "";
     }
 
     const lines =
-      typeof result.llmContent === 'string'
-        ? result.llmContent.split('\n').length
-        : undefined;
+      typeof result.llmContent === "string" ? result.llmContent.split("\n").length : undefined;
     const mimetype = getSpecificMimeType(this.params.file_path);
     const programming_language = getProgrammingLanguage({
       file_path: this.params.file_path,
@@ -155,7 +142,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
 
     return {
       llmContent,
-      returnDisplay: result.returnDisplay || '',
+      returnDisplay: result.returnDisplay || "",
     };
   }
 }
@@ -163,10 +150,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
 /**
  * Implementation of the ReadFile tool logic
  */
-export class ReadFileTool extends BaseDeclarativeTool<
-  ReadFileToolParams,
-  ToolResult
-> {
+export class ReadFileTool extends BaseDeclarativeTool<ReadFileToolParams, ToolResult> {
   static readonly Name: string = ToolNames.READ_FILE;
 
   constructor(private config: Config) {
@@ -180,30 +164,28 @@ export class ReadFileTool extends BaseDeclarativeTool<
           file_path: {
             description:
               "The absolute path to the file to read (e.g., '/home/user/project/file.txt'). Relative paths are not supported. You must provide an absolute path.",
-            type: 'string',
+            type: "string",
           },
           offset: {
             description:
               "Optional: For text files, the 0-based line number to start reading from. Requires 'limit' to be set. Use for paginating through large files.",
-            type: 'number',
+            type: "number",
           },
           limit: {
             description:
               "Optional: For text files, maximum number of lines to read. Use with 'offset' to paginate through large files. If omitted, reads the entire file (if feasible, up to a default limit).",
-            type: 'number',
+            type: "number",
           },
         },
-        required: ['file_path'],
-        type: 'object',
+        required: ["file_path"],
+        type: "object",
       },
     );
   }
 
-  protected override validateToolParamValues(
-    params: ReadFileToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: ReadFileToolParams): string | null {
     const filePath = params.file_path;
-    if (params.file_path.trim() === '') {
+    if (params.file_path.trim() === "") {
       return "The 'file_path' parameter must be non-empty.";
     }
 
@@ -212,10 +194,10 @@ export class ReadFileTool extends BaseDeclarativeTool<
     }
 
     if (params.offset !== undefined && params.offset < 0) {
-      return 'Offset must be a non-negative number';
+      return "Offset must be a non-negative number";
     }
     if (params.limit !== undefined && params.limit <= 0) {
-      return 'Limit must be a positive number';
+      return "Limit must be a positive number";
     }
 
     const fileService = this.config.getFileService();
diff --git a/packages/airiscode-core/src/tools/ripGrep.ts b/packages/airiscode-core/src/tools/ripGrep.ts
index 193590dd6..c9285466b 100644
--- a/packages/airiscode-core/src/tools/ripGrep.ts
+++ b/packages/airiscode-core/src/tools/ripGrep.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames } from './tool-names.js';
-import { resolveAndValidatePath } from '../utils/paths.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { runRipgrep } from '../utils/ripgrepUtils.js';
-import { SchemaValidator } from '../utils/schemaValidator.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type { PermissionDecision } from '../permissions/types.js';
-
-const debugLogger = createDebugLogger('RIPGREP');
+import fs from "node:fs";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import type { FileFilteringOptions } from "../config/constants.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { resolveAndValidatePath } from "../utils/paths.js";
+import { runRipgrep } from "../utils/ripgrepUtils.js";
+import { SchemaValidator } from "../utils/schemaValidator.js";
+import { ToolNames } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+const debugLogger = createDebugLogger("RIPGREP");
 
 /**
  * Parameters for the GrepTool (Simplified)
@@ -46,10 +46,7 @@ export interface RipGrepToolParams {
   limit?: number;
 }
 
-class GrepToolInvocation extends BaseToolInvocation<
-  RipGrepToolParams,
-  ToolResult
-> {
+class GrepToolInvocation extends BaseToolInvocation<RipGrepToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: RipGrepToolParams,
@@ -63,17 +60,14 @@ class GrepToolInvocation extends BaseToolInvocation<
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
     if (!this.params.path) {
-      return 'allow'; // Default workspace directory
+      return "allow"; // Default workspace directory
     }
     const workspaceContext = this.config.getWorkspaceContext();
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.path,
-    );
+    const resolvedPath = path.resolve(this.config.getTargetDir(), this.params.path);
     if (workspaceContext.isPathWithinWorkspace(resolvedPath)) {
-      return 'allow';
+      return "allow";
     }
-    return 'ask';
+    return "ask";
   }
 
   async execute(signal: AbortSignal): Promise<ToolResult> {
@@ -84,20 +78,17 @@ class GrepToolInvocation extends BaseToolInvocation<
 
       if (this.params.path) {
         // User specified a path — search only that path
-        const searchDirAbs = resolveAndValidatePath(
-          this.config,
-          this.params.path,
-          { allowFiles: true, allowExternalPaths: true },
-        );
+        const searchDirAbs = resolveAndValidatePath(this.config, this.params.path, {
+          allowFiles: true,
+          allowExternalPaths: true,
+        });
         searchPaths.push(searchDirAbs);
         searchDirDisplay = this.params.path;
       } else {
         // No path specified — search all workspace directories
-        const workspaceDirs = this.config
-          .getWorkspaceContext()
-          .getDirectories();
+        const workspaceDirs = this.config.getWorkspaceContext().getDirectories();
         searchPaths.push(...workspaceDirs);
-        searchDirDisplay = '.';
+        searchDirDisplay = ".";
       }
 
       // Get raw ripgrep output
@@ -115,9 +106,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           ? `across ${searchPaths.length} workspace directories`
           : `in the workspace directory`;
 
-      const filterDescription = this.params.glob
-        ? ` (filter: "${this.params.glob}")`
-        : '';
+      const filterDescription = this.params.glob ? ` (filter: "${this.params.glob}")` : "";
 
       // Check if we have any matches
       if (!rawOutput.trim()) {
@@ -126,7 +115,7 @@ class GrepToolInvocation extends BaseToolInvocation<
       }
 
       // Split into lines and count total matches
-      let allLines = rawOutput.split('\n').filter((line) => line.trim());
+      let allLines = rawOutput.split("\n").filter((line) => line.trim());
 
       // Deduplicate lines from potentially overlapping workspace directories.
       // ripgrep reports the same file twice when given paths like /a and /a/sub.
@@ -134,9 +123,9 @@ class GrepToolInvocation extends BaseToolInvocation<
         const seen = new Set<string>();
         allLines = allLines.filter((line) => {
           // ripgrep output format: filepath:linenum:content
-          const firstColon = line.indexOf(':');
+          const firstColon = line.indexOf(":");
           if (firstColon !== -1) {
-            const secondColon = line.indexOf(':', firstColon + 1);
+            const secondColon = line.indexOf(":", firstColon + 1);
             if (secondColon !== -1) {
               const key = line.substring(0, secondColon);
               if (seen.has(key)) return false;
@@ -148,7 +137,7 @@ class GrepToolInvocation extends BaseToolInvocation<
       }
 
       const totalMatches = allLines.length;
-      const matchTerm = totalMatches === 1 ? 'match' : 'matches';
+      const matchTerm = totalMatches === 1 ? "match" : "matches";
 
       // Build header early to calculate available space
       const header = `Found ${totalMatches} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${filterDescription}:\n---\n`;
@@ -168,7 +157,7 @@ class GrepToolInvocation extends BaseToolInvocation<
       }
 
       // Build output and track how many lines we include, respecting character limit
-      let grepOutput = '';
+      let grepOutput = "";
       let truncatedByCharLimit = false;
       let includedLines = 0;
       if (Number.isFinite(charLimit)) {
@@ -185,15 +174,15 @@ class GrepToolInvocation extends BaseToolInvocation<
             currentLength = projectedLength;
           } else {
             const remaining = Math.max(charLimit - currentLength - sep, 10);
-            parts.push(line.slice(0, remaining) + '...');
+            parts.push(line.slice(0, remaining) + "...");
             truncatedByCharLimit = true;
             break;
           }
         }
 
-        grepOutput = parts.join('\n');
+        grepOutput = parts.join("\n");
       } else {
-        grepOutput = linesToInclude.join('\n');
+        grepOutput = linesToInclude.join("\n");
         includedLines = linesToInclude.length;
       }
 
@@ -203,7 +192,7 @@ class GrepToolInvocation extends BaseToolInvocation<
       // Add truncation notice if needed
       if (truncatedByLineLimit || truncatedByCharLimit) {
         const omittedMatches = totalMatches - includedLines;
-        llmContent += `\n---\n[${omittedMatches} ${omittedMatches === 1 ? 'line' : 'lines'} truncated] ...`;
+        llmContent += `\n---\n[${omittedMatches} ${omittedMatches === 1 ? "line" : "lines"} truncated] ...`;
       }
 
       // Build display message (show real count, not truncated)
@@ -217,7 +206,7 @@ class GrepToolInvocation extends BaseToolInvocation<
         returnDisplay: displayMessage,
       };
     } catch (error) {
-      debugLogger.error('Error during ripgrep search operation:', error);
+      debugLogger.error("Error during ripgrep search operation:", error);
       const errorMessage = getErrorMessage(error);
       return {
         llmContent: `Error during grep search operation: ${errorMessage}`,
@@ -235,18 +224,18 @@ class GrepToolInvocation extends BaseToolInvocation<
     const { pattern, paths, glob } = options;
 
     const rgArgs: string[] = [
-      '--line-number',
-      '--no-heading',
-      '--with-filename',
-      '--ignore-case',
-      '--regexp',
+      "--line-number",
+      "--no-heading",
+      "--with-filename",
+      "--ignore-case",
+      "--regexp",
       pattern,
     ];
 
     // Add file exclusions from .gitignore and .airiscodeigenore
     const filteringOptions = this.getFileFilteringOptions();
     if (!filteringOptions.respectGitIgnore) {
-      rgArgs.push('--no-ignore-vcs');
+      rgArgs.push("--no-ignore-vcs");
     }
 
     if (filteringOptions.respectAiriscodeIgnore) {
@@ -257,12 +246,9 @@ class GrepToolInvocation extends BaseToolInvocation<
           fs.existsSync(searchPath) && fs.statSync(searchPath).isDirectory()
             ? searchPath
             : path.dirname(searchPath);
-        const qwenIgnorePath = path.join(dir, '.airiscodeigenore');
-        if (
-          !seenIgnoreFiles.has(qwenIgnorePath) &&
-          fs.existsSync(qwenIgnorePath)
-        ) {
-          rgArgs.push('--ignore-file', qwenIgnorePath);
+        const qwenIgnorePath = path.join(dir, ".airiscodeigenore");
+        if (!seenIgnoreFiles.has(qwenIgnorePath) && fs.existsSync(qwenIgnorePath)) {
+          rgArgs.push("--ignore-file", qwenIgnorePath);
           seenIgnoreFiles.add(qwenIgnorePath);
         }
       }
@@ -270,10 +256,10 @@ class GrepToolInvocation extends BaseToolInvocation<
 
     // Add glob pattern if provided
     if (glob) {
-      rgArgs.push('--glob', glob);
+      rgArgs.push("--glob", glob);
     }
 
-    rgArgs.push('--threads', '4');
+    rgArgs.push("--threads", "4");
     // Pass all search paths to ripgrep (it supports multiple paths natively)
     rgArgs.push(...paths);
 
@@ -289,11 +275,9 @@ class GrepToolInvocation extends BaseToolInvocation<
     const options = this.config.getFileFilteringOptions?.();
     return {
       respectGitIgnore:
-        options?.respectGitIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        options?.respectGitIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
       respectAiriscodeIgnore:
-        options?.respectAiriscodeIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectAiriscodeIgnore,
+        options?.respectAiriscodeIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectAiriscodeIgnore,
     };
   }
 
@@ -317,43 +301,39 @@ class GrepToolInvocation extends BaseToolInvocation<
 /**
  * Implementation of the Grep tool logic
  */
-export class RipGrepTool extends BaseDeclarativeTool<
-  RipGrepToolParams,
-  ToolResult
-> {
+export class RipGrepTool extends BaseDeclarativeTool<RipGrepToolParams, ToolResult> {
   static readonly Name = ToolNames.GREP;
 
   constructor(private readonly config: Config) {
     super(
       RipGrepTool.Name,
-      'Grep',
+      "Grep",
       'A powerful search tool built on ripgrep\n\n  Usage:\n  - ALWAYS use Grep for search tasks. NEVER invoke `grep` or `rg` as a Bash command. The Grep tool has been optimized for correct permissions and access.\n  - Supports full regex syntax (e.g., "log.*Error", "function\\s+\\w+")\n  - Filter files with glob parameter (e.g., "*.js", "**/*.tsx")\n  - Use Agent tool for open-ended searches requiring multiple rounds\n  - Pattern syntax: Uses ripgrep (not grep) - special regex characters need escaping (use `interface\\{\\}` to find `interface{}` in Go code)\n',
       Kind.Search,
       {
         properties: {
           pattern: {
-            type: 'string',
-            description:
-              'The regular expression pattern to search for in file contents',
+            type: "string",
+            description: "The regular expression pattern to search for in file contents",
           },
           glob: {
-            type: 'string',
+            type: "string",
             description:
               'Glob pattern to filter files (e.g. "*.js", "*.{ts,tsx}") - maps to rg --glob',
           },
           path: {
-            type: 'string',
+            type: "string",
             description:
-              'File or directory to search in (rg PATH). Defaults to current working directory.',
+              "File or directory to search in (rg PATH). Defaults to current working directory.",
           },
           limit: {
-            type: 'number',
+            type: "number",
             description:
-              'Limit output to first N lines/entries. Optional - shows all matches if not specified.',
+              "Limit output to first N lines/entries. Optional - shows all matches if not specified.",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
     );
   }
@@ -363,13 +343,8 @@ export class RipGrepTool extends BaseDeclarativeTool<
    * @param params Parameters to validate
    * @returns An error message string if invalid, null otherwise
    */
-  protected override validateToolParamValues(
-    params: RipGrepToolParams,
-  ): string | null {
-    const errors = SchemaValidator.validate(
-      this.schema.parametersJsonSchema,
-      params,
-    );
+  protected override validateToolParamValues(params: RipGrepToolParams): string | null {
+    const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
     if (errors) {
       return errors;
     }
diff --git a/packages/airiscode-core/src/tools/sdk-control-client-transport.ts b/packages/airiscode-core/src/tools/sdk-control-client-transport.ts
index f83387d0c..034c0dcda 100644
--- a/packages/airiscode-core/src/tools/sdk-control-client-transport.ts
+++ b/packages/airiscode-core/src/tools/sdk-control-client-transport.ts
@@ -17,10 +17,10 @@
  * communicates with SDK MCP servers running in the SDK process.
  */
 
-import type { JSONRPCMessage } from '@modelcontextprotocol/sdk/types.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import type { JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
 
-const debugLogger = createDebugLogger('MCP_SDK_TRANSPORT');
+const debugLogger = createDebugLogger("MCP_SDK_TRANSPORT");
 
 /**
  * Callback to send MCP messages to SDK via control plane
@@ -86,17 +86,13 @@ export class SdkControlClientTransport {
       );
     }
 
-    debugLogger.debug(
-      `Sending message to '${this.serverName}': ${JSON.stringify(message)}`,
-    );
+    debugLogger.debug(`Sending message to '${this.serverName}': ${JSON.stringify(message)}`);
 
     try {
       // Send message to SDK and wait for response
       const response = await this.sendMcpMessage(this.serverName, message);
 
-      debugLogger.debug(
-        `Received response from '${this.serverName}': ${JSON.stringify(response)}`,
-      );
+      debugLogger.debug(`Received response from '${this.serverName}': ${JSON.stringify(response)}`);
 
       // Deliver response via onmessage callback
       if (this.onmessage) {
diff --git a/packages/airiscode-core/src/tools/shell.ts b/packages/airiscode-core/src/tools/shell.ts
index 0300f7bec..4035d02dd 100644
--- a/packages/airiscode-core/src/tools/shell.ts
+++ b/packages/airiscode-core/src/tools/shell.ts
@@ -4,47 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import os, { EOL } from 'node:os';
-import crypto from 'node:crypto';
-import type { Config } from '../config/config.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import { ToolErrorType } from './tool-error.js';
-import type {
-  ToolInvocation,
-  ToolResult,
-  ToolResultDisplay,
-  ToolCallConfirmationDetails,
-  ToolExecuteConfirmationDetails,
-  ToolConfirmationPayload,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { truncateToolOutput } from '../utils/truncation.js';
-import type {
-  ShellExecutionConfig,
-  ShellOutputEvent,
-} from '../services/shellExecutionService.js';
-import { ShellExecutionService } from '../services/shellExecutionService.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
-import { isSubpaths } from '../utils/paths.js';
+import crypto from "node:crypto";
+import fs from "node:fs";
+import os, { EOL } from "node:os";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { ShellExecutionConfig, ShellOutputEvent } from "../services/shellExecutionService.js";
+import { ShellExecutionService } from "../services/shellExecutionService.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
+import { isSubpaths } from "../utils/paths.js";
 import {
   getCommandRoot,
   getCommandRoots,
   splitCommands,
   stripShellWrapper,
-} from '../utils/shell-utils.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import {
-  isShellCommandReadOnlyAST,
-  extractCommandRules,
-} from '../utils/shellAstParser.js';
+} from "../utils/shell-utils.js";
+import { extractCommandRules, isShellCommandReadOnlyAST } from "../utils/shellAstParser.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { truncateToolOutput } from "../utils/truncation.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type {
+  ToolCallConfirmationDetails,
+  ToolConfirmationOutcome,
+  ToolConfirmationPayload,
+  ToolExecuteConfirmationDetails,
+  ToolInvocation,
+  ToolResult,
+  ToolResultDisplay,
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
-const debugLogger = createDebugLogger('SHELL');
+const debugLogger = createDebugLogger("SHELL");
 
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 const DEFAULT_FOREGROUND_TIMEOUT_MS = 120000;
@@ -57,10 +51,7 @@ export interface ShellToolParams {
   directory?: string;
 }
 
-export class ShellToolInvocation extends BaseToolInvocation<
-  ShellToolParams,
-  ToolResult
-> {
+export class ShellToolInvocation extends BaseToolInvocation<ShellToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: ShellToolParams,
@@ -84,7 +75,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
     }
     // append optional (description), replacing any line breaks with spaces
     if (this.params.description) {
-      description += ` (${this.params.description.replace(/\n/g, ' ')})`;
+      description += ` (${this.params.description.replace(/\n/g, " ")})`;
     }
     return description;
   }
@@ -101,13 +92,13 @@ export class ShellToolInvocation extends BaseToolInvocation<
     try {
       const isReadOnly = await isShellCommandReadOnlyAST(command);
       if (isReadOnly) {
-        return 'allow';
+        return "allow";
       }
     } catch (e) {
-      debugLogger.warn('AST read-only check failed, falling back to ask:', e);
+      debugLogger.warn("AST read-only check failed, falling back to ask:", e);
     }
 
-    return 'ask';
+    return "ask";
   }
 
   /**
@@ -139,11 +130,11 @@ export class ShellToolInvocation extends BaseToolInvocation<
 
       if (pm) {
         try {
-          if ((await pm.isCommandAllowed(sub)) === 'allow') {
+          if ((await pm.isCommandAllowed(sub)) === "allow") {
             continue;
           }
         } catch (e) {
-          debugLogger.warn('PermissionManager command check failed:', e);
+          debugLogger.warn("PermissionManager command check failed:", e);
         }
       }
 
@@ -157,9 +148,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
 
     const rootCommands = [
       ...new Set(
-        effectiveSubCommands
-          .map((c) => getCommandRoot(c))
-          .filter((c): c is string => !!c),
+        effectiveSubCommands.map((c) => getCommandRoot(c)).filter((c): c is string => !!c),
       ),
     ];
 
@@ -174,19 +163,16 @@ export class ShellToolInvocation extends BaseToolInvocation<
       }
       permissionRules = [...new Set(allRules)].map((rule) => `Bash(${rule})`);
     } catch (e) {
-      debugLogger.warn('Failed to extract command rules:', e);
+      debugLogger.warn("Failed to extract command rules:", e);
     }
 
     const confirmationDetails: ToolExecuteConfirmationDetails = {
-      type: 'exec',
-      title: 'Confirm Shell Command',
+      type: "exec",
+      title: "Confirm Shell Command",
       command: this.params.command,
-      rootCommand: rootCommands.join(', '),
+      rootCommand: rootCommands.join(", "),
       permissionRules,
-      onConfirm: async (
-        _outcome: ToolConfirmationOutcome,
-        _payload?: ToolConfirmationPayload,
-      ) => {
+      onConfirm: async (_outcome: ToolConfirmationOutcome, _payload?: ToolConfirmationPayload) => {
         // No-op: persistence is handled by coreToolScheduler via PM rules
       },
     };
@@ -203,8 +189,8 @@ export class ShellToolInvocation extends BaseToolInvocation<
 
     if (signal.aborted) {
       return {
-        llmContent: 'Command was cancelled by user before it could start.',
-        returnDisplay: 'Command cancelled by user.',
+        llmContent: "Command was cancelled by user before it could start.",
+        returnDisplay: "Command cancelled by user.",
       };
     }
 
@@ -219,10 +205,8 @@ export class ShellToolInvocation extends BaseToolInvocation<
       combinedSignal = AbortSignal.any([signal, timeoutSignal]);
     }
 
-    const isWindows = os.platform() === 'win32';
-    const tempFileName = `shell_pgrep_${crypto
-      .randomBytes(6)
-      .toString('hex')}.tmp`;
+    const isWindows = os.platform() === "win32";
+    const tempFileName = `shell_pgrep_${crypto.randomBytes(6).toString("hex")}.tmp`;
     const tempFilePath = path.join(os.tmpdir(), tempFileName);
 
     try {
@@ -236,18 +220,14 @@ export class ShellToolInvocation extends BaseToolInvocation<
       // On Windows, we don't use start /B because it creates a detached process that
       // doesn't die when the parent dies. Instead, we rely on the race logic below
       // to return early while keeping the process attached (detached: false).
-      if (
-        !isWindows &&
-        shouldRunInBackground &&
-        !finalCommand.trim().endsWith('&')
-      ) {
-        finalCommand = finalCommand.trim() + ' &';
+      if (!isWindows && shouldRunInBackground && !finalCommand.trim().endsWith("&")) {
+        finalCommand = finalCommand.trim() + " &";
       }
 
       // On Windows, we rely on the race logic below to handle background tasks.
       // We just ensure the command string is clean.
       if (isWindows && shouldRunInBackground) {
-        finalCommand = finalCommand.trim().replace(/&+$/, '').trim();
+        finalCommand = finalCommand.trim().replace(/&+$/, "").trim();
       }
 
       // On non-Windows background commands, wrap with pgrep to capture
@@ -256,65 +236,61 @@ export class ShellToolInvocation extends BaseToolInvocation<
         !isWindows && shouldRunInBackground
           ? (() => {
               let command = finalCommand.trim();
-              if (!command.endsWith('&')) command += ';';
+              if (!command.endsWith("&")) command += ";";
               return `{ ${command} }; __code=$?; pgrep -g 0 >${tempFilePath} 2>&1; exit $__code;`;
             })()
           : finalCommand;
 
       const cwd = this.params.directory || this.config.getTargetDir();
 
-      let cumulativeOutput: string | AnsiOutput = '';
+      let cumulativeOutput: string | AnsiOutput = "";
       let lastUpdateTime = Date.now();
       let isBinaryStream = false;
 
-      const { result: resultPromise, pid } =
-        await ShellExecutionService.execute(
-          commandToExecute,
-          cwd,
-          (event: ShellOutputEvent) => {
-            let shouldUpdate = false;
-
-            switch (event.type) {
-              case 'data':
-                if (isBinaryStream) break;
-                cumulativeOutput = event.chunk;
-                shouldUpdate = true;
-                break;
-              case 'binary_detected':
-                isBinaryStream = true;
-                cumulativeOutput =
-                  '[Binary output detected. Halting stream...]';
+      const { result: resultPromise, pid } = await ShellExecutionService.execute(
+        commandToExecute,
+        cwd,
+        (event: ShellOutputEvent) => {
+          let shouldUpdate = false;
+
+          switch (event.type) {
+            case "data":
+              if (isBinaryStream) break;
+              cumulativeOutput = event.chunk;
+              shouldUpdate = true;
+              break;
+            case "binary_detected":
+              isBinaryStream = true;
+              cumulativeOutput = "[Binary output detected. Halting stream...]";
+              shouldUpdate = true;
+              break;
+            case "binary_progress":
+              isBinaryStream = true;
+              cumulativeOutput = `[Receiving binary output... ${formatMemoryUsage(
+                event.bytesReceived,
+              )} received]`;
+              if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
                 shouldUpdate = true;
-                break;
-              case 'binary_progress':
-                isBinaryStream = true;
-                cumulativeOutput = `[Receiving binary output... ${formatMemoryUsage(
-                  event.bytesReceived,
-                )} received]`;
-                if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
-                  shouldUpdate = true;
-                }
-                break;
-              default: {
-                throw new Error('An unhandled ShellOutputEvent was found.');
               }
+              break;
+            default: {
+              throw new Error("An unhandled ShellOutputEvent was found.");
             }
+          }
 
-            if (shouldUpdate && updateOutput) {
-              updateOutput(
-                typeof cumulativeOutput === 'string'
-                  ? cumulativeOutput
-                  : { ansiOutput: cumulativeOutput },
-              );
-              lastUpdateTime = Date.now();
-            }
-          },
-          combinedSignal,
-          shouldRunInBackground
-            ? false
-            : this.config.getShouldUseNodePtyShell(),
-          shellExecutionConfig ?? {},
-        );
+          if (shouldUpdate && updateOutput) {
+            updateOutput(
+              typeof cumulativeOutput === "string"
+                ? cumulativeOutput
+                : { ansiOutput: cumulativeOutput },
+            );
+            lastUpdateTime = Date.now();
+          }
+        },
+        combinedSignal,
+        shouldRunInBackground ? false : this.config.getShouldUseNodePtyShell(),
+        shellExecutionConfig ?? {},
+      );
 
       if (pid && setPidCallback) {
         setPidCallback(pid);
@@ -323,8 +299,8 @@ export class ShellToolInvocation extends BaseToolInvocation<
       // On Windows, background commands rely on early return since there's
       // no & backgrounding or pgrep. Awaiting would block until completion.
       if (shouldRunInBackground && isWindows) {
-        const pidMsg = pid ? ` PID: ${pid}` : '';
-        const killHint = ' (Use taskkill /F /T /PID <pid> to stop)';
+        const pidMsg = pid ? ` PID: ${pid}` : "";
+        const killHint = " (Use taskkill /F /T /PID <pid> to stop)";
 
         return {
           llmContent: `Background command started.${pidMsg}${killHint}`,
@@ -339,10 +315,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
         const backgroundPIDs: number[] = [];
         if (!isWindows) {
           if (fs.existsSync(tempFilePath)) {
-            const pgrepLines = fs
-              .readFileSync(tempFilePath, 'utf8')
-              .split(EOL)
-              .filter(Boolean);
+            const pgrepLines = fs.readFileSync(tempFilePath, "utf8").split(EOL).filter(Boolean);
             for (const line of pgrepLines) {
               if (!/^\d+$/.test(line)) {
                 debugLogger.warn(`pgrep: ${line}`);
@@ -354,17 +327,17 @@ export class ShellToolInvocation extends BaseToolInvocation<
               }
             }
           } else if (!signal.aborted) {
-            debugLogger.warn('missing pgrep output');
+            debugLogger.warn("missing pgrep output");
           }
         }
 
         const bgPidMsg =
           backgroundPIDs.length > 0
-            ? ` PIDs: ${backgroundPIDs.join(', ')}`
+            ? ` PIDs: ${backgroundPIDs.join(", ")}`
             : pid
               ? ` PID: ${pid}`
-              : '';
-        const killHint = ' (Use kill <pid> to stop)';
+              : "";
+        const killHint = " (Use kill <pid> to stop)";
 
         return {
           llmContent: `Background command started.${bgPidMsg}${killHint}`,
@@ -372,7 +345,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
         };
       }
 
-      let llmContent = '';
+      let llmContent = "";
       if (result.aborted) {
         // Check if it was a timeout or user cancellation
         const wasTimeout =
@@ -386,15 +359,14 @@ export class ShellToolInvocation extends BaseToolInvocation<
           if (result.output.trim()) {
             llmContent += ` Below is the output before it timed out:\n${result.output}`;
           } else {
-            llmContent += ' There was no output before it timed out.';
+            llmContent += " There was no output before it timed out.";
           }
         } else {
-          llmContent =
-            'Command was cancelled by user before it could complete.';
+          llmContent = "Command was cancelled by user before it could complete.";
           if (result.output.trim()) {
             llmContent += ` Below is the output before it was cancelled:\n${result.output}`;
           } else {
-            llmContent += ' There was no output before it was cancelled.';
+            llmContent += " There was no output before it was cancelled.";
           }
         }
       } else {
@@ -402,20 +374,20 @@ export class ShellToolInvocation extends BaseToolInvocation<
         // with the user-facing command.
         const finalError = result.error
           ? result.error.message.replace(commandToExecute, this.params.command)
-          : '(none)';
+          : "(none)";
 
         llmContent = [
           `Command: ${this.params.command}`,
-          `Directory: ${this.params.directory || '(root)'}`,
-          `Output: ${result.output || '(empty)'}`,
+          `Directory: ${this.params.directory || "(root)"}`,
+          `Output: ${result.output || "(empty)"}`,
           `Error: ${finalError}`, // Use the cleaned error string.
-          `Exit Code: ${result.exitCode ?? '(none)'}`,
-          `Signal: ${result.signal ?? '(none)'}`,
-          `Process Group PGID: ${result.pid ?? '(none)'}`,
-        ].join('\n');
+          `Exit Code: ${result.exitCode ?? "(none)"}`,
+          `Signal: ${result.signal ?? "(none)"}`,
+          `Process Group PGID: ${result.pid ?? "(none)"}`,
+        ].join("\n");
       }
 
-      let returnDisplayMessage = '';
+      let returnDisplayMessage = "";
       if (this.config.getDebugMode()) {
         returnDisplayMessage = llmContent;
       } else {
@@ -432,13 +404,11 @@ export class ShellToolInvocation extends BaseToolInvocation<
 
             returnDisplayMessage = wasTimeout
               ? `Command timed out after ${effectiveTimeout}ms.`
-              : 'Command cancelled by user.';
+              : "Command cancelled by user.";
           } else if (result.signal) {
             returnDisplayMessage = `Command terminated by signal: ${result.signal}`;
           } else if (result.error) {
-            returnDisplayMessage = `Command failed: ${getErrorMessage(
-              result.error,
-            )}`;
+            returnDisplayMessage = `Command failed: ${getErrorMessage(result.error)}`;
           } else if (result.exitCode !== null && result.exitCode !== 0) {
             returnDisplayMessage = `Command exited with code: ${result.exitCode}`;
           }
@@ -448,17 +418,13 @@ export class ShellToolInvocation extends BaseToolInvocation<
       }
 
       // Truncate large output and save full content to a temp file.
-      if (typeof llmContent === 'string') {
-        const truncatedResult = await truncateToolOutput(
-          this.config,
-          ShellTool.Name,
-          llmContent,
-        );
+      if (typeof llmContent === "string") {
+        const truncatedResult = await truncateToolOutput(this.config, ShellTool.Name, llmContent);
 
         if (truncatedResult.outputFile) {
           llmContent = truncatedResult.content;
           returnDisplayMessage +=
-            (returnDisplayMessage ? '\n' : '') +
+            (returnDisplayMessage ? "\n" : "") +
             `Output too long and was saved to: ${truncatedResult.outputFile}`;
         }
       }
@@ -535,13 +501,11 @@ Co-authored-by: ${gitCoAuthorSettings.name} <${gitCoAuthorSettings.email}>`;
 }
 
 function getShellToolDescription(): string {
-  const isWindows = os.platform() === 'win32';
-  const executionWrapper = isWindows
-    ? 'cmd.exe /c <command>'
-    : 'bash -c <command>';
+  const isWindows = os.platform() === "win32";
+  const executionWrapper = isWindows ? "cmd.exe /c <command>" : "bash -c <command>";
   const processGroupNote = isWindows
-    ? ''
-    : '\n  - Command is executed as a subprocess that leads its own process group. Command process group can be terminated as `kill -- -PGID` or signaled as `kill -s SIGNAL -- -PGID`.';
+    ? ""
+    : "\n  - Command is executed as a subprocess that leads its own process group. Command process group can be terminated as `kill -- -PGID` or signaled as `kill -s SIGNAL -- -PGID`.";
 
   return `Executes a given shell command (as \`${executionWrapper}\`) in a persistent shell session with optional timeout, ensuring proper handling and security measures.
 
@@ -591,17 +555,14 @@ ${processGroupNote}
 }
 
 function getCommandDescription(): string {
-  if (os.platform() === 'win32') {
-    return 'Exact command to execute as `cmd.exe /c <command>`';
+  if (os.platform() === "win32") {
+    return "Exact command to execute as `cmd.exe /c <command>`";
   } else {
-    return 'Exact bash command to execute as `bash -c <command>`';
+    return "Exact bash command to execute as `bash -c <command>`";
   }
 }
 
-export class ShellTool extends BaseDeclarativeTool<
-  ShellToolParams,
-  ToolResult
-> {
+export class ShellTool extends BaseDeclarativeTool<ShellToolParams, ToolResult> {
   static Name: string = ToolNames.SHELL;
 
   constructor(private readonly config: Config) {
@@ -611,84 +572,74 @@ export class ShellTool extends BaseDeclarativeTool<
       getShellToolDescription(),
       Kind.Execute,
       {
-        type: 'object',
+        type: "object",
         properties: {
           command: {
-            type: 'string',
+            type: "string",
             description: getCommandDescription(),
           },
           is_background: {
-            type: 'boolean',
+            type: "boolean",
             description:
-              'Optional: Whether to run the command in background. If not specified, defaults to false (foreground execution). Explicitly set to true for long-running processes like development servers, watchers, or daemons that should continue running without blocking further commands.',
+              "Optional: Whether to run the command in background. If not specified, defaults to false (foreground execution). Explicitly set to true for long-running processes like development servers, watchers, or daemons that should continue running without blocking further commands.",
           },
           timeout: {
-            type: 'number',
-            description: 'Optional timeout in milliseconds (max 600000)',
+            type: "number",
+            description: "Optional timeout in milliseconds (max 600000)",
           },
           description: {
-            type: 'string',
+            type: "string",
             description:
-              'Brief description of the command for the user. Be specific and concise. Ideally a single sentence. Can be up to 3 sentences for clarity. No line breaks.',
+              "Brief description of the command for the user. Be specific and concise. Ideally a single sentence. Can be up to 3 sentences for clarity. No line breaks.",
           },
           directory: {
-            type: 'string',
+            type: "string",
             description:
-              '(OPTIONAL) The absolute path of the directory to run the command in. If not provided, the project root directory is used. Must be a directory within the workspace and must already exist.',
+              "(OPTIONAL) The absolute path of the directory to run the command in. If not provided, the project root directory is used. Must be a directory within the workspace and must already exist.",
           },
         },
-        required: ['command'],
+        required: ["command"],
       },
       false, // output is not markdown
       true, // output can be updated
     );
   }
 
-  protected override validateToolParamValues(
-    params: ShellToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: ShellToolParams): string | null {
     // NOTE: Permission checks (read-only detection, PM rules) are handled at
     // L3 (getDefaultPermission) and L4 (PM override) in coreToolScheduler.
     // This method only performs pure parameter validation.
     if (!params.command.trim()) {
-      return 'Command cannot be empty.';
+      return "Command cannot be empty.";
     }
     if (getCommandRoots(params.command).length === 0) {
-      return 'Could not identify command root to obtain permission from user.';
+      return "Could not identify command root to obtain permission from user.";
     }
     if (params.timeout !== undefined) {
-      if (
-        typeof params.timeout !== 'number' ||
-        !Number.isInteger(params.timeout)
-      ) {
-        return 'Timeout must be an integer number of milliseconds.';
+      if (typeof params.timeout !== "number" || !Number.isInteger(params.timeout)) {
+        return "Timeout must be an integer number of milliseconds.";
       }
       if (params.timeout <= 0) {
-        return 'Timeout must be a positive number.';
+        return "Timeout must be a positive number.";
       }
       if (params.timeout > 600000) {
-        return 'Timeout cannot exceed 600000ms (10 minutes).';
+        return "Timeout cannot exceed 600000ms (10 minutes).";
       }
     }
     if (params.directory) {
       if (!path.isAbsolute(params.directory)) {
-        return 'Directory must be an absolute path.';
+        return "Directory must be an absolute path.";
       }
 
       const userSkillsDirs = this.config.storage.getUserSkillsDirs();
       const resolvedDirectoryPath = path.resolve(params.directory);
-      const isWithinUserSkills = isSubpaths(
-        userSkillsDirs,
-        resolvedDirectoryPath,
-      );
+      const isWithinUserSkills = isSubpaths(userSkillsDirs, resolvedDirectoryPath);
       if (isWithinUserSkills) {
         return `Explicitly running shell commands from within the user skills directory is not allowed. Please use absolute paths for command parameter instead.`;
       }
 
       const workspaceDirs = this.config.getWorkspaceContext().getDirectories();
-      const isWithinWorkspace = workspaceDirs.some((wsDir) =>
-        params.directory!.startsWith(wsDir),
-      );
+      const isWithinWorkspace = workspaceDirs.some((wsDir) => params.directory!.startsWith(wsDir));
 
       if (!isWithinWorkspace) {
         return `Directory '${params.directory}' is not within any of the registered workspace directories.`;
@@ -697,9 +648,7 @@ export class ShellTool extends BaseDeclarativeTool<
     return null;
   }
 
-  protected createInvocation(
-    params: ShellToolParams,
-  ): ToolInvocation<ShellToolParams, ToolResult> {
+  protected createInvocation(params: ShellToolParams): ToolInvocation<ShellToolParams, ToolResult> {
     return new ShellToolInvocation(this.config, params);
   }
 }
diff --git a/packages/airiscode-core/src/tools/skill.ts b/packages/airiscode-core/src/tools/skill.ts
index e1e2ada2a..8e45f2ce7 100644
--- a/packages/airiscode-core/src/tools/skill.ts
+++ b/packages/airiscode-core/src/tools/skill.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import type { ToolResult, ToolResultDisplay } from './tools.js';
-import type { Config } from '../config/config.js';
-import type { SkillManager } from '../skills/skill-manager.js';
-import type { SkillConfig } from '../skills/types.js';
-import { logSkillLaunch, SkillLaunchEvent } from '../telemetry/index.js';
-import path from 'path';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('SKILL');
+import path from "path";
+import type { Config } from "../config/config.js";
+import type { SkillManager } from "../skills/skill-manager.js";
+import type { SkillConfig } from "../skills/types.js";
+import { logSkillLaunch, SkillLaunchEvent } from "../telemetry/index.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolResult, ToolResultDisplay } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+const debugLogger = createDebugLogger("SKILL");
 
 export interface SkillParams {
   skill: string;
@@ -44,22 +44,22 @@ export class SkillTool extends BaseDeclarativeTool<SkillParams, ToolResult> {
   constructor(private readonly config: Config) {
     // Initialize with a basic schema first
     const initialSchema = {
-      type: 'object',
+      type: "object",
       properties: {
         skill: {
-          type: 'string',
+          type: "string",
           description: 'The skill name (no arguments). E.g., "pdf" or "xlsx"',
         },
       },
-      required: ['skill'],
+      required: ["skill"],
       additionalProperties: false,
-      $schema: 'http://json-schema.org/draft-07/schema#',
+      $schema: "http://json-schema.org/draft-07/schema#",
     };
 
     super(
       SkillTool.Name,
       ToolDisplayNames.SKILL,
-      'Execute a skill within the main conversation. Loading available skills...', // Initial description
+      "Execute a skill within the main conversation. Loading available skills...", // Initial description
       Kind.Read,
       initialSchema,
       false, // isOutputMarkdown
@@ -68,7 +68,7 @@ export class SkillTool extends BaseDeclarativeTool<SkillParams, ToolResult> {
 
     const skillManager = config.getSkillManager();
     if (!skillManager) {
-      throw new Error('SkillManager not available');
+      throw new Error("SkillManager not available");
     }
     this.skillManager = skillManager;
     this.skillManager.addChangeListener(() => {
@@ -88,7 +88,7 @@ export class SkillTool extends BaseDeclarativeTool<SkillParams, ToolResult> {
       this.availableSkills = await this.skillManager.listSkills();
       this.updateDescriptionAndSchema();
     } catch (error) {
-      debugLogger.warn('Failed to load skills for Skills tool:', error);
+      debugLogger.warn("Failed to load skills for Skills tool:", error);
       this.availableSkills = [];
       this.updateDescriptionAndSchema();
     } finally {
@@ -104,10 +104,10 @@ export class SkillTool extends BaseDeclarativeTool<SkillParams, ToolResult> {
    * Updates the tool's description and schema based on available skills.
    */
   private updateDescriptionAndSchema(): void {
-    let skillDescriptions = '';
+    let skillDescriptions = "";
     if (this.availableSkills.length === 0) {
       skillDescriptions =
-        'No skills are currently configured. Skills can be created by adding directories with SKILL.md files to .airiscode/skills/ or ~/.airiscode/skills/.';
+        "No skills are currently configured. Skills can be created by adding directories with SKILL.md files to .airiscode/skills/ or ~/.airiscode/skills/.";
     } else {
       skillDescriptions = this.availableSkills
         .map(
@@ -123,7 +123,7 @@ ${skill.level}
 </location>
 </skill>`,
         )
-        .join('\n');
+        .join("\n");
     }
 
     const baseDescription = `Execute a skill within the main conversation
@@ -161,36 +161,27 @@ ${skillDescriptions}
 
   override validateToolParams(params: SkillParams): string | null {
     // Validate required fields
-    if (
-      !params.skill ||
-      typeof params.skill !== 'string' ||
-      params.skill.trim() === ''
-    ) {
+    if (!params.skill || typeof params.skill !== "string" || params.skill.trim() === "") {
       return 'Parameter "skill" must be a non-empty string.';
     }
 
     // Validate that the skill exists
-    const skillExists = this.availableSkills.some(
-      (skill) => skill.name === params.skill,
-    );
+    const skillExists = this.availableSkills.some((skill) => skill.name === params.skill);
 
     if (!skillExists) {
       const availableNames = this.availableSkills.map((s) => s.name);
       if (availableNames.length === 0) {
         return `Skill "${params.skill}" not found. No skills are currently available.`;
       }
-      return `Skill "${params.skill}" not found. Available skills: ${availableNames.join(', ')}`;
+      return `Skill "${params.skill}" not found. Available skills: ${availableNames.join(", ")}`;
     }
 
     return null;
   }
 
   protected createInvocation(params: SkillParams) {
-    return new SkillToolInvocation(
-      this.config,
-      this.skillManager,
-      params,
-      (name: string) => this.loadedSkillNames.add(name),
+    return new SkillToolInvocation(this.config, this.skillManager, params, (name: string) =>
+      this.loadedSkillNames.add(name),
     );
   }
 
@@ -236,16 +227,11 @@ class SkillToolInvocation extends BaseToolInvocation<SkillParams, ToolResult> {
   ): Promise<ToolResult> {
     try {
       // Load the skill with runtime config (includes additional files)
-      const skill = await this.skillManager.loadSkillForRuntime(
-        this.params.skill,
-      );
+      const skill = await this.skillManager.loadSkillForRuntime(this.params.skill);
 
       if (!skill) {
         // Log failed skill launch
-        logSkillLaunch(
-          this.config,
-          new SkillLaunchEvent(this.params.skill, false),
-        );
+        logSkillLaunch(this.config, new SkillLaunchEvent(this.params.skill, false));
 
         // Get parse errors if any
         const parseErrors = this.skillManager.getParseErrors();
@@ -258,9 +244,7 @@ class SkillToolInvocation extends BaseToolInvocation<SkillParams, ToolResult> {
         }
 
         const errorDetail =
-          errorMessages.length > 0
-            ? `\nErrors:\n${errorMessages.join('\n')}`
-            : '';
+          errorMessages.length > 0 ? `\nErrors:\n${errorMessages.join("\n")}` : "";
 
         return {
           llmContent: `Skill "${this.params.skill}" not found.${errorDetail}`,
@@ -269,10 +253,7 @@ class SkillToolInvocation extends BaseToolInvocation<SkillParams, ToolResult> {
       }
 
       // Log successful skill launch
-      logSkillLaunch(
-        this.config,
-        new SkillLaunchEvent(this.params.skill, true),
-      );
+      logSkillLaunch(this.config, new SkillLaunchEvent(this.params.skill, true));
       this.onSkillLoaded(this.params.skill);
 
       const baseDir = path.dirname(skill.filePath);
@@ -283,15 +264,11 @@ class SkillToolInvocation extends BaseToolInvocation<SkillParams, ToolResult> {
         returnDisplay: skill.description,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       debugLogger.error(`[SkillsTool] Error using skill: ${errorMessage}`);
 
       // Log failed skill launch
-      logSkillLaunch(
-        this.config,
-        new SkillLaunchEvent(this.params.skill, false),
-      );
+      logSkillLaunch(this.config, new SkillLaunchEvent(this.params.skill, false));
 
       return {
         llmContent: `Failed to load skill "${this.params.skill}": ${errorMessage}`,
diff --git a/packages/airiscode-core/src/tools/todoWrite.ts b/packages/airiscode-core/src/tools/todoWrite.ts
index a04c9b61b..156b4beb9 100644
--- a/packages/airiscode-core/src/tools/todoWrite.ts
+++ b/packages/airiscode-core/src/tools/todoWrite.ts
@@ -4,24 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import type { FunctionDeclaration } from '../types/llm.js';
-import * as fs from 'fs/promises';
-import * as fsSync from 'fs';
-import * as path from 'path';
-
-import type { Config } from '../config/config.js';
-import { Storage } from '../config/storage.js';
-import { ToolDisplayNames, ToolNames } from './tool-names.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('TODO_WRITE');
+import * as fsSync from "fs";
+import * as fs from "fs/promises";
+import * as path from "path";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import type { FunctionDeclaration } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
+import type { ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+const debugLogger = createDebugLogger("TODO_WRITE");
 
 export interface TodoItem {
   id: string;
   content: string;
-  status: 'pending' | 'in_progress' | 'completed';
+  status: "pending" | "in_progress" | "completed";
 }
 
 export interface TodoWriteParams {
@@ -31,37 +30,37 @@ export interface TodoWriteParams {
 }
 
 const todoWriteToolSchemaData: FunctionDeclaration = {
-  name: 'todo_write',
+  name: "todo_write",
   description:
-    'Creates and manages a structured task list for your current coding session. This helps track progress, organize complex tasks, and demonstrate thoroughness.',
+    "Creates and manages a structured task list for your current coding session. This helps track progress, organize complex tasks, and demonstrate thoroughness.",
   parametersJsonSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       todos: {
-        type: 'array',
+        type: "array",
         items: {
-          type: 'object',
+          type: "object",
           properties: {
             content: {
-              type: 'string',
+              type: "string",
               minLength: 1,
             },
             status: {
-              type: 'string',
-              enum: ['pending', 'in_progress', 'completed'],
+              type: "string",
+              enum: ["pending", "in_progress", "completed"],
             },
             id: {
-              type: 'string',
+              type: "string",
             },
           },
-          required: ['content', 'status', 'id'],
+          required: ["content", "status", "id"],
           additionalProperties: false,
         },
-        description: 'The updated todo list',
+        description: "The updated todo list",
       },
     },
-    required: ['todos'],
-    $schema: 'http://json-schema.org/draft-07/schema#',
+    required: ["todos"],
+    $schema: "http://json-schema.org/draft-07/schema#",
   },
 };
 
@@ -243,13 +242,13 @@ The assistant did not use the todo list because this is a single command executi
 When in doubt, use this tool. Being proactive with task management demonstrates attentiveness and ensures you complete all requirements successfully.
 `;
 
-const TODO_SUBDIR = 'todos';
+const TODO_SUBDIR = "todos";
 
 function getTodoFilePath(sessionId?: string): string {
   const todoDir = path.join(Storage.getRuntimeBaseDir(), TODO_SUBDIR);
 
   // Use sessionId if provided, otherwise fall back to 'default'
-  const filename = `${sessionId || 'default'}.json`;
+  const filename = `${sessionId || "default"}.json`;
   return path.join(todoDir, filename);
 }
 
@@ -259,12 +258,12 @@ function getTodoFilePath(sessionId?: string): string {
 async function readTodosFromFile(sessionId?: string): Promise<TodoItem[]> {
   try {
     const todoFilePath = getTodoFilePath(sessionId);
-    const content = await fs.readFile(todoFilePath, 'utf-8');
+    const content = await fs.readFile(todoFilePath, "utf-8");
     const data = JSON.parse(content);
     return Array.isArray(data.todos) ? data.todos : [];
   } catch (err) {
     const error = err as Error & { code?: string };
-    if (!(error instanceof Error) || error.code !== 'ENOENT') {
+    if (!(error instanceof Error) || error.code !== "ENOENT") {
       throw err;
     }
     return [];
@@ -274,10 +273,7 @@ async function readTodosFromFile(sessionId?: string): Promise<TodoItem[]> {
 /**
  * Writes todos to the file system
  */
-async function writeTodosToFile(
-  todos: TodoItem[],
-  sessionId?: string,
-): Promise<void> {
+async function writeTodosToFile(todos: TodoItem[], sessionId?: string): Promise<void> {
   const todoFilePath = getTodoFilePath(sessionId);
   const todoDir = path.dirname(todoFilePath);
 
@@ -285,29 +281,26 @@ async function writeTodosToFile(
 
   const data = {
     todos,
-    sessionId: sessionId || 'default',
+    sessionId: sessionId || "default",
   };
 
-  await fs.writeFile(todoFilePath, JSON.stringify(data, null, 2), 'utf-8');
+  await fs.writeFile(todoFilePath, JSON.stringify(data, null, 2), "utf-8");
 }
 
-class TodoWriteToolInvocation extends BaseToolInvocation<
-  TodoWriteParams,
-  ToolResult
-> {
-  private operationType: 'create' | 'update';
+class TodoWriteToolInvocation extends BaseToolInvocation<TodoWriteParams, ToolResult> {
+  private operationType: "create" | "update";
 
   constructor(
     private readonly config: Config,
     params: TodoWriteParams,
-    operationType: 'create' | 'update' = 'update',
+    operationType: "create" | "update" = "update",
   ) {
     super(params);
     this.operationType = operationType;
   }
 
   getDescription(): string {
-    return this.operationType === 'create' ? 'Create todos' : 'Update todos';
+    return this.operationType === "create" ? "Create todos" : "Update todos";
   }
 
   async execute(_signal: AbortSignal): Promise<ToolResult> {
@@ -330,7 +323,7 @@ class TodoWriteToolInvocation extends BaseToolInvocation<
 
       // Create structured display object for rich UI rendering
       const todoResultDisplay = {
-        type: 'todo_list' as const,
+        type: "todo_list" as const,
         todos: finalTodos,
       };
 
@@ -361,11 +354,8 @@ ${todosJson}. Continue on with the tasks at hand if applicable.
         returnDisplay: todoResultDisplay,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      debugLogger.error(
-        `[TodoWriteTool] Error executing todo_write: ${errorMessage}`,
-      );
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      debugLogger.error(`[TodoWriteTool] Error executing todo_write: ${errorMessage}`);
 
       // Create plain string format for error with system reminder
       const errorLlmContent = `Failed to modify todos. An error occurred during the operation.
@@ -385,9 +375,7 @@ Todo list modification failed with error: ${errorMessage}. You may need to retry
 /**
  * Utility function to read todos for a specific session (useful for session recovery)
  */
-export async function readTodosForSession(
-  sessionId?: string,
-): Promise<TodoItem[]> {
+export async function readTodosForSession(sessionId?: string): Promise<TodoItem[]> {
   return readTodosFromFile(sessionId);
 }
 
@@ -399,21 +387,18 @@ export async function listTodoSessions(): Promise<string[]> {
     const todoDir = path.join(Storage.getRuntimeBaseDir(), TODO_SUBDIR);
     const files = await fs.readdir(todoDir);
     return files
-      .filter((file: string) => file.endsWith('.json'))
-      .map((file: string) => file.replace('.json', ''));
+      .filter((file: string) => file.endsWith(".json"))
+      .map((file: string) => file.replace(".json", ""));
   } catch (err) {
     const error = err as Error & { code?: string };
-    if (!(error instanceof Error) || error.code !== 'ENOENT') {
+    if (!(error instanceof Error) || error.code !== "ENOENT") {
       throw err;
     }
     return [];
   }
 }
 
-export class TodoWriteTool extends BaseDeclarativeTool<
-  TodoWriteParams,
-  ToolResult
-> {
+export class TodoWriteTool extends BaseDeclarativeTool<TodoWriteParams, ToolResult> {
   static readonly Name: string = ToolNames.TODO_WRITE;
 
   constructor(private readonly config: Config) {
@@ -434,17 +419,13 @@ export class TodoWriteTool extends BaseDeclarativeTool<
 
     // Validate individual todos
     for (const todo of params.todos) {
-      if (!todo.id || typeof todo.id !== 'string' || todo.id.trim() === '') {
+      if (!todo.id || typeof todo.id !== "string" || todo.id.trim() === "") {
         return 'Each todo must have a non-empty "id" string.';
       }
-      if (
-        !todo.content ||
-        typeof todo.content !== 'string' ||
-        todo.content.trim() === ''
-      ) {
+      if (!todo.content || typeof todo.content !== "string" || todo.content.trim() === "") {
         return 'Each todo must have a non-empty "content" string.';
       }
-      if (!['pending', 'in_progress', 'completed'].includes(todo.status)) {
+      if (!["pending", "in_progress", "completed"].includes(todo.status)) {
         return 'Each todo must have a valid "status" (pending, in_progress, completed).';
       }
     }
@@ -453,7 +434,7 @@ export class TodoWriteTool extends BaseDeclarativeTool<
     const ids = params.todos.map((todo) => todo.id);
     const uniqueIds = new Set(ids);
     if (ids.length !== uniqueIds.size) {
-      return 'Todo IDs must be unique within the array.';
+      return "Todo IDs must be unique within the array.";
     }
 
     return null;
@@ -463,7 +444,7 @@ export class TodoWriteTool extends BaseDeclarativeTool<
     // Determine if this is a create or update operation by checking if todos file exists
     const sessionId = this.config.getSessionId();
     const todoFilePath = getTodoFilePath(sessionId);
-    const operationType = fsSync.existsSync(todoFilePath) ? 'update' : 'create';
+    const operationType = fsSync.existsSync(todoFilePath) ? "update" : "create";
 
     return new TodoWriteToolInvocation(this.config, params, operationType);
   }
diff --git a/packages/airiscode-core/src/tools/tool-error.ts b/packages/airiscode-core/src/tools/tool-error.ts
index 96581602f..36b75cf9c 100644
--- a/packages/airiscode-core/src/tools/tool-error.ts
+++ b/packages/airiscode-core/src/tools/tool-error.ts
@@ -9,64 +9,64 @@
  */
 export enum ToolErrorType {
   // General Errors
-  INVALID_TOOL_PARAMS = 'invalid_tool_params',
-  UNKNOWN = 'unknown',
-  UNHANDLED_EXCEPTION = 'unhandled_exception',
-  TOOL_NOT_REGISTERED = 'tool_not_registered',
-  EXECUTION_FAILED = 'execution_failed',
+  INVALID_TOOL_PARAMS = "invalid_tool_params",
+  UNKNOWN = "unknown",
+  UNHANDLED_EXCEPTION = "unhandled_exception",
+  TOOL_NOT_REGISTERED = "tool_not_registered",
+  EXECUTION_FAILED = "execution_failed",
   // Try to execute a tool that is excluded due to the approval mode
-  EXECUTION_DENIED = 'execution_denied',
+  EXECUTION_DENIED = "execution_denied",
 
   // File System Errors
-  FILE_NOT_FOUND = 'file_not_found',
-  FILE_WRITE_FAILURE = 'file_write_failure',
-  READ_CONTENT_FAILURE = 'read_content_failure',
-  ATTEMPT_TO_CREATE_EXISTING_FILE = 'attempt_to_create_existing_file',
-  FILE_TOO_LARGE = 'file_too_large',
-  PERMISSION_DENIED = 'permission_denied',
-  NO_SPACE_LEFT = 'no_space_left',
-  TARGET_IS_DIRECTORY = 'target_is_directory',
-  PATH_NOT_IN_WORKSPACE = 'path_not_in_workspace',
-  SEARCH_PATH_NOT_FOUND = 'search_path_not_found',
-  SEARCH_PATH_NOT_A_DIRECTORY = 'search_path_not_a_directory',
+  FILE_NOT_FOUND = "file_not_found",
+  FILE_WRITE_FAILURE = "file_write_failure",
+  READ_CONTENT_FAILURE = "read_content_failure",
+  ATTEMPT_TO_CREATE_EXISTING_FILE = "attempt_to_create_existing_file",
+  FILE_TOO_LARGE = "file_too_large",
+  PERMISSION_DENIED = "permission_denied",
+  NO_SPACE_LEFT = "no_space_left",
+  TARGET_IS_DIRECTORY = "target_is_directory",
+  PATH_NOT_IN_WORKSPACE = "path_not_in_workspace",
+  SEARCH_PATH_NOT_FOUND = "search_path_not_found",
+  SEARCH_PATH_NOT_A_DIRECTORY = "search_path_not_a_directory",
 
   // Edit-specific Errors
-  EDIT_PREPARATION_FAILURE = 'edit_preparation_failure',
-  EDIT_NO_OCCURRENCE_FOUND = 'edit_no_occurrence_found',
-  EDIT_EXPECTED_OCCURRENCE_MISMATCH = 'edit_expected_occurrence_mismatch',
-  EDIT_NO_CHANGE = 'edit_no_change',
-  EDIT_NO_CHANGE_LLM_JUDGEMENT = 'edit_no_change_llm_judgement',
+  EDIT_PREPARATION_FAILURE = "edit_preparation_failure",
+  EDIT_NO_OCCURRENCE_FOUND = "edit_no_occurrence_found",
+  EDIT_EXPECTED_OCCURRENCE_MISMATCH = "edit_expected_occurrence_mismatch",
+  EDIT_NO_CHANGE = "edit_no_change",
+  EDIT_NO_CHANGE_LLM_JUDGEMENT = "edit_no_change_llm_judgement",
 
   // Glob-specific Errors
-  GLOB_EXECUTION_ERROR = 'glob_execution_error',
+  GLOB_EXECUTION_ERROR = "glob_execution_error",
 
   // Grep-specific Errors
-  GREP_EXECUTION_ERROR = 'grep_execution_error',
+  GREP_EXECUTION_ERROR = "grep_execution_error",
 
   // Ls-specific Errors
-  LS_EXECUTION_ERROR = 'ls_execution_error',
-  PATH_IS_NOT_A_DIRECTORY = 'path_is_not_a_directory',
+  LS_EXECUTION_ERROR = "ls_execution_error",
+  PATH_IS_NOT_A_DIRECTORY = "path_is_not_a_directory",
 
   // MCP-specific Errors
-  MCP_TOOL_ERROR = 'mcp_tool_error',
+  MCP_TOOL_ERROR = "mcp_tool_error",
 
   // Memory-specific Errors
-  MEMORY_TOOL_EXECUTION_ERROR = 'memory_tool_execution_error',
+  MEMORY_TOOL_EXECUTION_ERROR = "memory_tool_execution_error",
 
   // Shell errors
-  SHELL_EXECUTE_ERROR = 'shell_execute_error',
+  SHELL_EXECUTE_ERROR = "shell_execute_error",
 
   // DiscoveredTool-specific Errors
-  DISCOVERED_TOOL_EXECUTION_ERROR = 'discovered_tool_execution_error',
+  DISCOVERED_TOOL_EXECUTION_ERROR = "discovered_tool_execution_error",
 
   // WebFetch-specific Errors
-  WEB_FETCH_NO_URL_IN_PROMPT = 'web_fetch_no_url_in_prompt',
-  WEB_FETCH_FALLBACK_FAILED = 'web_fetch_fallback_failed',
-  WEB_FETCH_PROCESSING_ERROR = 'web_fetch_processing_error',
+  WEB_FETCH_NO_URL_IN_PROMPT = "web_fetch_no_url_in_prompt",
+  WEB_FETCH_FALLBACK_FAILED = "web_fetch_fallback_failed",
+  WEB_FETCH_PROCESSING_ERROR = "web_fetch_processing_error",
 
   // WebSearch-specific Errors
-  WEB_SEARCH_FAILED = 'web_search_failed',
+  WEB_SEARCH_FAILED = "web_search_failed",
 
   // Truncation Errors
-  OUTPUT_TRUNCATED = 'output_truncated',
+  OUTPUT_TRUNCATED = "output_truncated",
 }
diff --git a/packages/airiscode-core/src/tools/tool-names.ts b/packages/airiscode-core/src/tools/tool-names.ts
index 9edc21508..a6802b530 100644
--- a/packages/airiscode-core/src/tools/tool-names.ts
+++ b/packages/airiscode-core/src/tools/tool-names.ts
@@ -10,25 +10,25 @@
  * with the actual tool class names.
  */
 export const ToolNames = {
-  EDIT: 'edit',
-  WRITE_FILE: 'write_file',
-  READ_FILE: 'read_file',
-  GREP: 'grep_search',
-  GLOB: 'glob',
-  SHELL: 'run_shell_command',
-  TODO_WRITE: 'todo_write',
-  MEMORY: 'save_memory',
-  AGENT: 'agent',
-  SKILL: 'skill',
-  EXIT_PLAN_MODE: 'exit_plan_mode',
-  WEB_FETCH: 'web_fetch',
-  WEB_SEARCH: 'web_search',
-  LS: 'list_directory',
-  LSP: 'lsp',
-  ASK_USER_QUESTION: 'ask_user_question',
-  CRON_CREATE: 'cron_create',
-  CRON_LIST: 'cron_list',
-  CRON_DELETE: 'cron_delete',
+  EDIT: "edit",
+  WRITE_FILE: "write_file",
+  READ_FILE: "read_file",
+  GREP: "grep_search",
+  GLOB: "glob",
+  SHELL: "run_shell_command",
+  TODO_WRITE: "todo_write",
+  MEMORY: "save_memory",
+  AGENT: "agent",
+  SKILL: "skill",
+  EXIT_PLAN_MODE: "exit_plan_mode",
+  WEB_FETCH: "web_fetch",
+  WEB_SEARCH: "web_search",
+  LS: "list_directory",
+  LSP: "lsp",
+  ASK_USER_QUESTION: "ask_user_question",
+  CRON_CREATE: "cron_create",
+  CRON_LIST: "cron_list",
+  CRON_DELETE: "cron_delete",
 } as const;
 
 /**
@@ -37,25 +37,25 @@ export const ToolNames = {
  * with the actual tool display names.
  */
 export const ToolDisplayNames = {
-  EDIT: 'Edit',
-  WRITE_FILE: 'WriteFile',
-  READ_FILE: 'ReadFile',
-  GREP: 'Grep',
-  GLOB: 'Glob',
-  SHELL: 'Shell',
-  TODO_WRITE: 'TodoWrite',
-  MEMORY: 'SaveMemory',
-  AGENT: 'Agent',
-  SKILL: 'Skill',
-  EXIT_PLAN_MODE: 'ExitPlanMode',
-  WEB_FETCH: 'WebFetch',
-  WEB_SEARCH: 'WebSearch',
-  LS: 'ListFiles',
-  LSP: 'Lsp',
-  ASK_USER_QUESTION: 'AskUserQuestion',
-  CRON_CREATE: 'CronCreate',
-  CRON_LIST: 'CronList',
-  CRON_DELETE: 'CronDelete',
+  EDIT: "Edit",
+  WRITE_FILE: "WriteFile",
+  READ_FILE: "ReadFile",
+  GREP: "Grep",
+  GLOB: "Glob",
+  SHELL: "Shell",
+  TODO_WRITE: "TodoWrite",
+  MEMORY: "SaveMemory",
+  AGENT: "Agent",
+  SKILL: "Skill",
+  EXIT_PLAN_MODE: "ExitPlanMode",
+  WEB_FETCH: "WebFetch",
+  WEB_SEARCH: "WebSearch",
+  LS: "ListFiles",
+  LSP: "Lsp",
+  ASK_USER_QUESTION: "AskUserQuestion",
+  CRON_CREATE: "CronCreate",
+  CRON_LIST: "CronList",
+  CRON_DELETE: "CronDelete",
 } as const;
 
 // Migration from old tool names to new tool names
diff --git a/packages/airiscode-core/src/tools/tool-registry.ts b/packages/airiscode-core/src/tools/tool-registry.ts
index eef337bc0..9bf891ce1 100644
--- a/packages/airiscode-core/src/tools/tool-registry.ts
+++ b/packages/airiscode-core/src/tools/tool-registry.ts
@@ -4,35 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FunctionDeclaration } from '../types/llm.js';
-import type {
-  AnyDeclarativeTool,
-  ToolResult,
-  ToolResultDisplay,
-  ToolInvocation,
-} from './tools.js';
-import { Kind, BaseDeclarativeTool, BaseToolInvocation } from './tools.js';
-import type { Config } from '../config/config.js';
-import { spawn } from 'node:child_process';
-import { StringDecoder } from 'node:string_decoder';
-import type { SendSdkMcpMessage } from './mcp-client.js';
-import { McpClientManager } from './mcp-client-manager.js';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-import { parse } from 'shell-quote';
-import { ToolErrorType } from './tool-error.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import type { EventEmitter } from 'node:events';
-import { createDebugLogger } from '../utils/debugLogger.js';
-import type { ReadResourceResult } from '@modelcontextprotocol/sdk/types.js';
+import { spawn } from "node:child_process";
+import type { EventEmitter } from "node:events";
+import { StringDecoder } from "node:string_decoder";
+import type { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
+import { parse } from "shell-quote";
+import type { Config } from "../config/config.js";
+import type { FunctionDeclaration } from "../types/llm.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import type { SendSdkMcpMessage } from "./mcp-client.js";
+import { McpClientManager } from "./mcp-client-manager.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { AnyDeclarativeTool, ToolInvocation, ToolResult, ToolResultDisplay } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 type ToolParams = Record<string, unknown>;
 
-const debugLogger = createDebugLogger('TOOL_REGISTRY');
+const debugLogger = createDebugLogger("TOOL_REGISTRY");
 
-class DiscoveredToolInvocation extends BaseToolInvocation<
-  ToolParams,
-  ToolResult
-> {
+class DiscoveredToolInvocation extends BaseToolInvocation<ToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     private readonly toolName: string,
@@ -54,8 +46,8 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
     child.stdin.write(JSON.stringify(this.params));
     child.stdin.end();
 
-    let stdout = '';
-    let stderr = '';
+    let stdout = "";
+    let stderr = "";
     let error: Error | null = null;
     let code: number | null = null;
     let signal: NodeJS.Signals | null = null;
@@ -73,10 +65,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
         error = err;
       };
 
-      const onClose = (
-        _code: number | null,
-        _signal: NodeJS.Signals | null,
-      ) => {
+      const onClose = (_code: number | null, _signal: NodeJS.Signals | null) => {
         code = _code;
         signal = _signal;
         cleanup();
@@ -84,30 +73,30 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
       };
 
       const cleanup = () => {
-        child.stdout.removeListener('data', onStdout);
-        child.stderr.removeListener('data', onStderr);
-        child.removeListener('error', onError);
-        child.removeListener('close', onClose);
+        child.stdout.removeListener("data", onStdout);
+        child.stderr.removeListener("data", onStderr);
+        child.removeListener("error", onError);
+        child.removeListener("close", onClose);
         if (child.connected) {
           child.disconnect();
         }
       };
 
-      child.stdout.on('data', onStdout);
-      child.stderr.on('data', onStderr);
-      child.on('error', onError);
-      child.on('close', onClose);
+      child.stdout.on("data", onStdout);
+      child.stderr.on("data", onStderr);
+      child.on("error", onError);
+      child.on("close", onClose);
     });
 
     // if there is any error, non-zero exit code, signal, or stderr, return error details instead of stdout
     if (error || code !== 0 || signal || stderr) {
       const llmContent = [
-        `Stdout: ${stdout || '(empty)'}`,
-        `Stderr: ${stderr || '(empty)'}`,
-        `Error: ${error ?? '(none)'}`,
-        `Exit Code: ${code ?? '(none)'}`,
-        `Signal: ${signal ?? '(none)'}`,
-      ].join('\n');
+        `Stdout: ${stdout || "(empty)"}`,
+        `Stderr: ${stderr || "(empty)"}`,
+        `Error: ${error ?? "(none)"}`,
+        `Exit Code: ${code ?? "(none)"}`,
+        `Signal: ${signal ?? "(none)"}`,
+      ].join("\n");
       return {
         llmContent,
         returnDisplay: llmContent,
@@ -125,10 +114,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class DiscoveredTool extends BaseDeclarativeTool<
-  ToolParams,
-  ToolResult
-> {
+export class DiscoveredTool extends BaseDeclarativeTool<ToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     name: string,
@@ -164,9 +150,7 @@ Signal: Signal number or \`(none)\` if no signal was received.
     );
   }
 
-  protected createInvocation(
-    params: ToolParams,
-  ): ToolInvocation<ToolParams, ToolResult> {
+  protected createInvocation(params: ToolParams): ToolInvocation<ToolParams, ToolResult> {
     return new DiscoveredToolInvocation(this.config, this.name, params);
   }
 }
@@ -177,11 +161,7 @@ export class ToolRegistry {
   private config: Config;
   private mcpClientManager: McpClientManager;
 
-  constructor(
-    config: Config,
-    eventEmitter?: EventEmitter,
-    sendSdkMcpMessage?: SendSdkMcpMessage,
-  ) {
+  constructor(config: Config, eventEmitter?: EventEmitter, sendSdkMcpMessage?: SendSdkMcpMessage) {
     this.config = config;
     this.mcpClientManager = new McpClientManager(
       this.config,
@@ -201,9 +181,7 @@ export class ToolRegistry {
         tool = tool.asFullyQualifiedTool();
       } else {
         // Decide on behavior: throw error, log warning, or allow overwrite
-        debugLogger.warn(
-          `Tool with name "${tool.name}" is already registered. Overwriting.`,
-        );
+        debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
       }
     }
     this.tools.set(tool.name, tool);
@@ -336,10 +314,7 @@ export class ToolRegistry {
 
     this.config.getPromptRegistry().removePromptsByServer(serverName);
 
-    await this.mcpClientManager.discoverMcpToolsForServer(
-      serverName,
-      this.config,
-    );
+    await this.mcpClientManager.discoverMcpToolsForServer(serverName, this.config);
   }
 
   private async discoverAndRegisterToolsFromCommand(): Promise<void> {
@@ -351,15 +326,13 @@ export class ToolRegistry {
     try {
       const cmdParts = parse(discoveryCmd);
       if (cmdParts.length === 0) {
-        throw new Error(
-          'Tool discovery command is empty or contains only whitespace.',
-        );
+        throw new Error("Tool discovery command is empty or contains only whitespace.");
       }
       const proc = spawn(cmdParts[0] as string, cmdParts.slice(1) as string[]);
-      let stdout = '';
-      const stdoutDecoder = new StringDecoder('utf8');
-      let stderr = '';
-      const stderrDecoder = new StringDecoder('utf8');
+      let stdout = "";
+      const stdoutDecoder = new StringDecoder("utf8");
+      let stderr = "";
+      const stderrDecoder = new StringDecoder("utf8");
       let sizeLimitExceeded = false;
       const MAX_STDOUT_SIZE = 10 * 1024 * 1024; // 10MB limit
       const MAX_STDERR_SIZE = 10 * 1024 * 1024; // 10MB limit
@@ -367,7 +340,7 @@ export class ToolRegistry {
       let stdoutByteLength = 0;
       let stderrByteLength = 0;
 
-      proc.stdout.on('data', (data) => {
+      proc.stdout.on("data", (data) => {
         if (sizeLimitExceeded) return;
         if (stdoutByteLength + data.length > MAX_STDOUT_SIZE) {
           sizeLimitExceeded = true;
@@ -378,7 +351,7 @@ export class ToolRegistry {
         stdout += stdoutDecoder.write(data);
       });
 
-      proc.stderr.on('data', (data) => {
+      proc.stderr.on("data", (data) => {
         if (sizeLimitExceeded) return;
         if (stderrByteLength + data.length > MAX_STDERR_SIZE) {
           sizeLimitExceeded = true;
@@ -390,8 +363,8 @@ export class ToolRegistry {
       });
 
       await new Promise<void>((resolve, reject) => {
-        proc.on('error', reject);
-        proc.on('close', (code) => {
+        proc.on("error", reject);
+        proc.on("close", (code) => {
           stdout += stdoutDecoder.end();
           stderr += stderrDecoder.end();
 
@@ -404,13 +377,9 @@ export class ToolRegistry {
           }
 
           if (code !== 0) {
-            debugLogger.error(
-              `Tool discovery command failed with code ${code}`,
-            );
+            debugLogger.error(`Tool discovery command failed with code ${code}`);
             debugLogger.error(stderr);
-            return reject(
-              new Error(`Tool discovery command failed with exit code ${code}`),
-            );
+            return reject(new Error(`Tool discovery command failed with exit code ${code}`));
           }
           resolve();
         });
@@ -421,18 +390,16 @@ export class ToolRegistry {
       const discoveredItems = JSON.parse(stdout.trim());
 
       if (!discoveredItems || !Array.isArray(discoveredItems)) {
-        throw new Error(
-          'Tool discovery command did not return a JSON array of tools.',
-        );
+        throw new Error("Tool discovery command did not return a JSON array of tools.");
       }
 
       for (const tool of discoveredItems) {
-        if (tool && typeof tool === 'object') {
-          if (Array.isArray(tool['function_declarations'])) {
-            functions.push(...tool['function_declarations']);
-          } else if (Array.isArray(tool['functionDeclarations'])) {
-            functions.push(...tool['functionDeclarations']);
-          } else if (tool['name']) {
+        if (tool && typeof tool === "object") {
+          if (Array.isArray(tool["function_declarations"])) {
+            functions.push(...tool["function_declarations"]);
+          } else if (Array.isArray(tool["functionDeclarations"])) {
+            functions.push(...tool["functionDeclarations"]);
+          } else if (tool["name"]) {
             functions.push(tool as FunctionDeclaration);
           }
         }
@@ -440,12 +407,12 @@ export class ToolRegistry {
       // register each function as a tool
       for (const func of functions) {
         if (!func.name) {
-          debugLogger.warn('Discovered a tool with no name. Skipping.');
+          debugLogger.warn("Discovered a tool with no name. Skipping.");
           continue;
         }
         const parameters =
           func.parametersJsonSchema &&
-          typeof func.parametersJsonSchema === 'object' &&
+          typeof func.parametersJsonSchema === "object" &&
           !Array.isArray(func.parametersJsonSchema)
             ? func.parametersJsonSchema
             : {};
@@ -453,7 +420,7 @@ export class ToolRegistry {
           new DiscoveredTool(
             this.config,
             func.name,
-            func.description ?? '',
+            func.description ?? "",
             parameters as Record<string, unknown>,
           ),
         );
@@ -536,7 +503,7 @@ export class ToolRegistry {
     options?: { signal?: AbortSignal },
   ): Promise<ReadResourceResult> {
     if (!this.config.isTrustedFolder()) {
-      throw new Error('MCP resources are unavailable in untrusted folders.');
+      throw new Error("MCP resources are unavailable in untrusted folders.");
     }
 
     return this.mcpClientManager.readResource(serverName, uri, options);
@@ -548,7 +515,7 @@ export class ToolRegistry {
    */
   async stop(): Promise<void> {
     for (const tool of this.tools.values()) {
-      if ('dispose' in tool && typeof tool.dispose === 'function') {
+      if ("dispose" in tool && typeof tool.dispose === "function") {
         try {
           tool.dispose();
         } catch (error) {
@@ -561,7 +528,7 @@ export class ToolRegistry {
       await this.mcpClientManager.stop();
     } catch (error) {
       // Log but don't throw - cleanup should be best-effort
-      debugLogger.error('Error stopping MCP clients:', error);
+      debugLogger.error("Error stopping MCP clients:", error);
     }
   }
 }
diff --git a/packages/airiscode-core/src/tools/tools.ts b/packages/airiscode-core/src/tools/tools.ts
index 30afffdb4..eb2faff47 100644
--- a/packages/airiscode-core/src/tools/tools.ts
+++ b/packages/airiscode-core/src/tools/tools.ts
@@ -4,22 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FunctionDeclaration, Part, PartListUnion } from '../types/llm.js';
-import { ToolErrorType } from './tool-error.js';
-import type { ShellExecutionConfig } from '../services/shellExecutionService.js';
-import { SchemaValidator } from '../utils/schemaValidator.js';
-import { type AgentStatsSummary } from '../agents/runtime/agent-statistics.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
-import type { PermissionDecision } from '../permissions/types.js';
+import { type AgentStatsSummary } from "../agents/runtime/agent-statistics.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { ShellExecutionConfig } from "../services/shellExecutionService.js";
+import type { FunctionDeclaration, Part, PartListUnion } from "../types/llm.js";
+import { SchemaValidator } from "../utils/schemaValidator.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { ToolErrorType } from "./tool-error.js";
 
 /**
  * Represents a validated and ready-to-execute tool call.
  * An instance of this is created by a `ToolBuilder`.
  */
-export interface ToolInvocation<
-  TParams extends object,
-  TResult extends ToolResult,
-> {
+export interface ToolInvocation<TParams extends object, TResult extends ToolResult> {
   /**
    * The validated parameters for this specific invocation.
    */
@@ -59,9 +56,7 @@ export interface ToolInvocation<
    * @param abortSignal Signal to cancel the operation.
    * @returns The confirmation details for the UI to display.
    */
-  getConfirmationDetails(
-    abortSignal: AbortSignal,
-  ): Promise<ToolCallConfirmationDetails>;
+  getConfirmationDetails(abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails>;
 
   /**
    * Executes the tool with the validated parameters.
@@ -79,10 +74,8 @@ export interface ToolInvocation<
 /**
  * A convenience base class for ToolInvocation.
  */
-export abstract class BaseToolInvocation<
-  TParams extends object,
-  TResult extends ToolResult,
-> implements ToolInvocation<TParams, TResult>
+export abstract class BaseToolInvocation<TParams extends object, TResult extends ToolResult>
+  implements ToolInvocation<TParams, TResult>
 {
   constructor(readonly params: TParams) {}
 
@@ -97,7 +90,7 @@ export abstract class BaseToolInvocation<
    * tools with side effects.
    */
   getDefaultPermission(): Promise<PermissionDecision> {
-    return Promise.resolve('allow');
+    return Promise.resolve("allow");
   }
 
   /**
@@ -108,17 +101,12 @@ export abstract class BaseToolInvocation<
    *
    * Tools with richer confirmation UIs (Shell, Edit, MCP, etc.) override this.
    */
-  getConfirmationDetails(
-    _abortSignal: AbortSignal,
-  ): Promise<ToolCallConfirmationDetails> {
+  getConfirmationDetails(_abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails> {
     const details: ToolInfoConfirmationDetails = {
-      type: 'info',
-      title: `Confirm ${this.constructor.name.replace(/Invocation$/, '')}`,
+      type: "info",
+      title: `Confirm ${this.constructor.name.replace(/Invocation$/, "")}`,
       prompt: this.getDescription(),
-      onConfirm: async (
-        _outcome: ToolConfirmationOutcome,
-        _payload?: ToolConfirmationPayload,
-      ) => {
+      onConfirm: async (_outcome: ToolConfirmationOutcome, _payload?: ToolConfirmationPayload) => {
         // No-op: persistence is handled by coreToolScheduler via PM rules
       },
     };
@@ -140,10 +128,7 @@ export type AnyToolInvocation = ToolInvocation<object, ToolResult>;
 /**
  * Interface for a tool builder that validates parameters and creates invocations.
  */
-export interface ToolBuilder<
-  TParams extends object,
-  TResult extends ToolResult,
-> {
+export interface ToolBuilder<TParams extends object, TResult extends ToolResult> {
   /**
    * The internal name of the tool (used for API calls).
    */
@@ -191,10 +176,8 @@ export interface ToolBuilder<
  * New base class for tools that separates validation from execution.
  * New tools should extend this class.
  */
-export abstract class DeclarativeTool<
-  TParams extends object,
-  TResult extends ToolResult,
-> implements ToolBuilder<TParams, TResult>
+export abstract class DeclarativeTool<TParams extends object, TResult extends ToolResult>
+  implements ToolBuilder<TParams, TResult>
 {
   constructor(
     readonly name: string,
@@ -258,9 +241,7 @@ export abstract class DeclarativeTool<
    * @param params The raw, untrusted parameters from the model.
    * @returns A `ToolInvocation` instance.
    */
-  private silentBuild(
-    params: TParams,
-  ): ToolInvocation<TParams, TResult> | Error {
+  private silentBuild(params: TParams): ToolInvocation<TParams, TResult> | Error {
     try {
       return this.build(params);
     } catch (e) {
@@ -278,10 +259,7 @@ export abstract class DeclarativeTool<
    * @params abortSignal a signal to abort.
    * @returns The result of the tool execution.
    */
-  async validateBuildAndExecute(
-    params: TParams,
-    abortSignal: AbortSignal,
-  ): Promise<ToolResult> {
+  async validateBuildAndExecute(params: TParams, abortSignal: AbortSignal): Promise<ToolResult> {
     const invocationOrError = this.silentBuild(params);
     if (invocationOrError instanceof Error) {
       const errorMessage = invocationOrError.message;
@@ -298,8 +276,7 @@ export abstract class DeclarativeTool<
     try {
       return await invocationOrError.execute(abortSignal);
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       return {
         llmContent: `Error: Tool call execution failed. Reason: ${errorMessage}`,
         returnDisplay: errorMessage,
@@ -331,10 +308,7 @@ export abstract class BaseDeclarativeTool<
   }
 
   override validateToolParams(params: TParams): string | null {
-    const errors = SchemaValidator.validate(
-      this.schema.parametersJsonSchema,
-      params,
-    );
+    const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
 
     if (errors) {
       return errors;
@@ -347,9 +321,7 @@ export abstract class BaseDeclarativeTool<
     return null;
   }
 
-  protected abstract createInvocation(
-    params: TParams,
-  ): ToolInvocation<TParams, TResult>;
+  protected abstract createInvocation(params: TParams): ToolInvocation<TParams, TResult>;
 }
 
 /**
@@ -364,11 +336,11 @@ export type AnyDeclarativeTool = DeclarativeTool<object, ToolResult>;
  */
 export function isTool(obj: unknown): obj is AnyDeclarativeTool {
   return (
-    typeof obj === 'object' &&
+    typeof obj === "object" &&
     obj !== null &&
-    'name' in obj &&
-    'build' in obj &&
-    typeof (obj as AnyDeclarativeTool).build === 'function'
+    "name" in obj &&
+    "build" in obj &&
+    typeof (obj as AnyDeclarativeTool).build === "function"
   );
 }
 
@@ -404,17 +376,13 @@ export interface ToolResult {
  */
 export function hasCycleInSchema(schema: object): boolean {
   function resolveRef(ref: string): object | null {
-    if (!ref.startsWith('#/')) {
+    if (!ref.startsWith("#/")) {
       return null;
     }
-    const path = ref.substring(2).split('/');
+    const path = ref.substring(2).split("/");
     let current: unknown = schema;
     for (const segment of path) {
-      if (
-        typeof current !== 'object' ||
-        current === null ||
-        !Object.prototype.hasOwnProperty.call(current, segment)
-      ) {
+      if (typeof current !== "object" || current === null || !Object.hasOwn(current, segment)) {
         return null;
       }
       current = (current as Record<string, unknown>)[segment];
@@ -422,12 +390,8 @@ export function hasCycleInSchema(schema: object): boolean {
     return current as object;
   }
 
-  function traverse(
-    node: unknown,
-    visitedRefs: Set<string>,
-    pathRefs: Set<string>,
-  ): boolean {
-    if (typeof node !== 'object' || node === null) {
+  function traverse(node: unknown, visitedRefs: Set<string>, pathRefs: Set<string>): boolean {
+    if (typeof node !== "object" || node === null) {
       return false;
     }
 
@@ -440,9 +404,9 @@ export function hasCycleInSchema(schema: object): boolean {
       return false;
     }
 
-    if ('$ref' in node && typeof node.$ref === 'string') {
+    if ("$ref" in node && typeof node.$ref === "string") {
       const ref = node.$ref;
-      if (ref === '#/' || pathRefs.has(ref)) {
+      if (ref === "#/" || pathRefs.has(ref)) {
         // A ref to just '#/' is always a cycle.
         return true; // Cycle detected!
       }
@@ -463,14 +427,8 @@ export function hasCycleInSchema(schema: object): boolean {
 
     // Crawl all the properties of node
     for (const key in node) {
-      if (Object.prototype.hasOwnProperty.call(node, key)) {
-        if (
-          traverse(
-            (node as Record<string, unknown>)[key],
-            visitedRefs,
-            pathRefs,
-          )
-        ) {
+      if (Object.hasOwn(node, key)) {
+        if (traverse((node as Record<string, unknown>)[key], visitedRefs, pathRefs)) {
           return true;
         }
       }
@@ -483,12 +441,12 @@ export function hasCycleInSchema(schema: object): boolean {
 }
 
 export interface AgentResultDisplay {
-  type: 'task_execution';
+  type: "task_execution";
   subagentName: string;
   subagentColor?: string;
   taskDescription: string;
   taskPrompt: string;
-  status: 'running' | 'completed' | 'failed' | 'cancelled';
+  status: "running" | "completed" | "failed" | "cancelled";
   terminateReason?: string;
   result?: string;
   executionSummary?: AgentStatsSummary;
@@ -500,7 +458,7 @@ export interface AgentResultDisplay {
   toolCalls?: Array<{
     callId: string;
     name: string;
-    status: 'executing' | 'awaiting_approval' | 'success' | 'failed';
+    status: "executing" | "awaiting_approval" | "success" | "failed";
     error?: string;
     args?: Record<string, unknown>;
     result?: string;
@@ -519,7 +477,7 @@ export interface AnsiOutputDisplay {
  * @see https://modelcontextprotocol.io/specification/2025-06-18/basic/utilities/progress
  */
 export interface McpToolProgressData {
-  type: 'mcp_tool_progress';
+  type: "mcp_tool_progress";
   /** Current progress value (must increase with each notification) */
   progress: number;
   /** Optional total value indicating the operation's target */
@@ -557,28 +515,25 @@ export interface DiffStat {
 }
 
 export interface TodoResultDisplay {
-  type: 'todo_list';
+  type: "todo_list";
   todos: Array<{
     id: string;
     content: string;
-    status: 'pending' | 'in_progress' | 'completed';
+    status: "pending" | "in_progress" | "completed";
   }>;
 }
 
 export interface PlanResultDisplay {
-  type: 'plan_summary';
+  type: "plan_summary";
   message: string;
   plan: string;
   rejected?: boolean;
 }
 
 export interface ToolEditConfirmationDetails {
-  type: 'edit';
+  type: "edit";
   title: string;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
   /**
    * When true, the UI should not show "Always allow" options (ProceedAlwaysProject/User).
    * Set by coreToolScheduler when PM has an explicit 'ask' rule that would override
@@ -608,12 +563,9 @@ export interface ToolConfirmationPayload {
 }
 
 export interface ToolExecuteConfirmationDetails {
-  type: 'exec';
+  type: "exec";
   title: string;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
   /** @see ToolEditConfirmationDetails.hideAlwaysAllow */
   hideAlwaysAllow?: boolean;
   command: string;
@@ -623,28 +575,22 @@ export interface ToolExecuteConfirmationDetails {
 }
 
 export interface ToolMcpConfirmationDetails {
-  type: 'mcp';
+  type: "mcp";
   title: string;
   /** @see ToolEditConfirmationDetails.hideAlwaysAllow */
   hideAlwaysAllow?: boolean;
   serverName: string;
   toolName: string;
   toolDisplayName: string;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
   /** Permission rule for this MCP tool, e.g. 'mcp__server__tool'. */
   permissionRules?: string[];
 }
 
 export interface ToolInfoConfirmationDetails {
-  type: 'info';
+  type: "info";
   title: string;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
   /** @see ToolEditConfirmationDetails.hideAlwaysAllow */
   hideAlwaysAllow?: boolean;
   prompt: string;
@@ -662,21 +608,18 @@ export type ToolCallConfirmationDetails =
   | ToolAskUserQuestionConfirmationDetails;
 
 export interface ToolPlanConfirmationDetails {
-  type: 'plan';
+  type: "plan";
   title: string;
   /** @see ToolEditConfirmationDetails.hideAlwaysAllow */
   hideAlwaysAllow?: boolean;
   plan: string;
   /** The approval mode that was active before entering plan mode (for display in the UI). */
   prePlanMode?: string;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
 }
 
 export interface ToolAskUserQuestionConfirmationDetails {
-  type: 'ask_user_question';
+  type: "ask_user_question";
   title: string;
   questions: Array<{
     question: string;
@@ -690,10 +633,7 @@ export interface ToolAskUserQuestionConfirmationDetails {
   metadata?: {
     source?: string;
   };
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
 }
 
 /**
@@ -702,41 +642,36 @@ export interface ToolAskUserQuestionConfirmationDetails {
  * 2. support proceed with modified input
  */
 export enum ToolConfirmationOutcome {
-  ProceedOnce = 'proceed_once',
-  ProceedAlways = 'proceed_always',
+  ProceedOnce = "proceed_once",
+  ProceedAlways = "proceed_always",
   /** @deprecated Use ProceedAlwaysProject or ProceedAlwaysUser instead. */
-  ProceedAlwaysServer = 'proceed_always_server',
+  ProceedAlwaysServer = "proceed_always_server",
   /** @deprecated Use ProceedAlwaysProject or ProceedAlwaysUser instead. */
-  ProceedAlwaysTool = 'proceed_always_tool',
+  ProceedAlwaysTool = "proceed_always_tool",
   /** Persist the permission rule to the project settings (workspace scope). */
-  ProceedAlwaysProject = 'proceed_always_project',
+  ProceedAlwaysProject = "proceed_always_project",
   /** Persist the permission rule to the user settings (user scope). */
-  ProceedAlwaysUser = 'proceed_always_user',
-  ModifyWithEditor = 'modify_with_editor',
+  ProceedAlwaysUser = "proceed_always_user",
+  ModifyWithEditor = "modify_with_editor",
   /** Restore the approval mode that was active before entering plan mode. */
-  RestorePrevious = 'restore_previous',
-  Cancel = 'cancel',
+  RestorePrevious = "restore_previous",
+  Cancel = "cancel",
 }
 
 export enum Kind {
-  Read = 'read',
-  Edit = 'edit',
-  Delete = 'delete',
-  Move = 'move',
-  Search = 'search',
-  Execute = 'execute',
-  Think = 'think',
-  Fetch = 'fetch',
-  Other = 'other',
+  Read = "read",
+  Edit = "edit",
+  Delete = "delete",
+  Move = "move",
+  Search = "search",
+  Execute = "execute",
+  Think = "think",
+  Fetch = "fetch",
+  Other = "other",
 }
 
 // Function kinds that have side effects
-export const MUTATOR_KINDS: Kind[] = [
-  Kind.Edit,
-  Kind.Delete,
-  Kind.Move,
-  Kind.Execute,
-] as const;
+export const MUTATOR_KINDS: Kind[] = [Kind.Edit, Kind.Delete, Kind.Move, Kind.Execute] as const;
 
 export interface ToolLocation {
   // Absolute path to the file
diff --git a/packages/airiscode-core/src/tools/web-fetch.ts b/packages/airiscode-core/src/tools/web-fetch.ts
index 76f57d982..514b40a12 100644
--- a/packages/airiscode-core/src/tools/web-fetch.ts
+++ b/packages/airiscode-core/src/tools/web-fetch.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { convert } from 'html-to-text';
-import type { Config } from '../config/config.js';
-import { fetchWithTimeout, isPrivateIp } from '../utils/fetch.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { ToolErrorType } from './tool-error.js';
+import { convert } from "html-to-text";
+import type { Config } from "../config/config.js";
+import { DEFAULT_AIRISCODE_MODEL } from "../config/models.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import { createDebugLogger, type DebugLogger } from "../utils/debugLogger.js";
+import { fetchWithTimeout, isPrivateIp } from "../utils/fetch.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
 import type {
   ToolCallConfirmationDetails,
+  ToolConfirmationOutcome,
+  ToolConfirmationPayload,
   ToolInvocation,
   ToolResult,
-  ToolConfirmationPayload,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { DEFAULT_AIRISCODE_MODEL } from '../config/models.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import { createDebugLogger, type DebugLogger } from '../utils/debugLogger.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 const URL_FETCH_TIMEOUT_MS = 10000;
 const MAX_CONTENT_LENGTH = 100000;
@@ -42,10 +42,7 @@ export interface WebFetchToolParams {
 /**
  * Implementation of the WebFetch tool invocation logic
  */
-class WebFetchToolInvocation extends BaseToolInvocation<
-  WebFetchToolParams,
-  ToolResult
-> {
+class WebFetchToolInvocation extends BaseToolInvocation<WebFetchToolParams, ToolResult> {
   private readonly debugLogger: DebugLogger;
 
   constructor(
@@ -53,20 +50,16 @@ class WebFetchToolInvocation extends BaseToolInvocation<
     params: WebFetchToolParams,
   ) {
     super(params);
-    this.debugLogger = createDebugLogger('WEB_FETCH');
+    this.debugLogger = createDebugLogger("WEB_FETCH");
   }
 
   private async executeDirectFetch(signal: AbortSignal): Promise<ToolResult> {
     let url = this.params.url;
 
     // Convert GitHub blob URL to raw URL
-    if (url.includes('github.com') && url.includes('/blob/')) {
-      url = url
-        .replace('github.com', 'raw.githubusercontent.com')
-        .replace('/blob/', '/');
-      this.debugLogger.debug(
-        `[WebFetchTool] Converted GitHub blob URL to raw URL: ${url}`,
-      );
+    if (url.includes("github.com") && url.includes("/blob/")) {
+      url = url.replace("github.com", "raw.githubusercontent.com").replace("/blob/", "/");
+      this.debugLogger.debug(`[WebFetchTool] Converted GitHub blob URL to raw URL: ${url}`);
     }
 
     try {
@@ -79,15 +72,13 @@ class WebFetchToolInvocation extends BaseToolInvocation<
         throw new Error(errorMessage);
       }
 
-      this.debugLogger.debug(
-        `[WebFetchTool] Successfully fetched content from ${url}`,
-      );
+      this.debugLogger.debug(`[WebFetchTool] Successfully fetched content from ${url}`);
       const html = await response.text();
       const textContent = convert(html, {
         wordwrap: false,
         selectors: [
-          { selector: 'a', options: { ignoreHref: true } },
-          { selector: 'img', format: 'skip' },
+          { selector: "a", options: { ignoreHref: true } },
+          { selector: "img", format: "skip" },
         ],
       }).substring(0, MAX_CONTENT_LENGTH);
 
@@ -109,16 +100,16 @@ ${textContent}
       );
 
       const result = await geminiClient.generateContent(
-        [{ role: 'user', parts: [{ text: fallbackPrompt }] }],
+        [{ role: "user", parts: [{ text: fallbackPrompt }] }],
         {
           systemInstruction:
-            'Extract and summarize the requested information from the provided web content. ' +
-            'Be concise and accurate. Respond only with the requested information.',
+            "Extract and summarize the requested information from the provided web content. " +
+            "Be concise and accurate. Respond only with the requested information.",
         },
         signal,
         this.config.getModel() || DEFAULT_AIRISCODE_MODEL,
       );
-      const resultText = getResponseText(result) || '';
+      const resultText = getResponseText(result) || "";
 
       this.debugLogger.debug(
         `[WebFetchTool] Successfully processed content from ${this.params.url}`,
@@ -146,7 +137,7 @@ ${textContent}
   override getDescription(): string {
     const displayPrompt =
       this.params.prompt.length > 100
-        ? this.params.prompt.substring(0, 97) + '...'
+        ? this.params.prompt.substring(0, 97) + "..."
         : this.params.prompt;
     return `Fetching content from ${this.params.url} and processing with prompt: "${displayPrompt}"`;
   }
@@ -156,7 +147,7 @@ ${textContent}
    * because it makes external network requests.
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
-    return 'ask';
+    return "ask";
   }
 
   /**
@@ -175,15 +166,12 @@ ${textContent}
     const permissionRules = [`WebFetch(${domain})`];
 
     const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
+      type: "info",
       title: `Confirm Web Fetch`,
       prompt: `Fetch content from ${this.params.url} and process with: ${this.params.prompt}`,
       urls: [this.params.url],
       permissionRules,
-      onConfirm: async (
-        _outcome: ToolConfirmationOutcome,
-        _payload?: ToolConfirmationPayload,
-      ) => {
+      onConfirm: async (_outcome: ToolConfirmationOutcome, _payload?: ToolConfirmationPayload) => {
         // No-op: persistence is handled by coreToolScheduler via PM rules
       },
     };
@@ -211,10 +199,7 @@ ${textContent}
 /**
  * Implementation of the WebFetch tool logic
  */
-export class WebFetchTool extends BaseDeclarativeTool<
-  WebFetchToolParams,
-  ToolResult
-> {
+export class WebFetchTool extends BaseDeclarativeTool<WebFetchToolParams, ToolResult> {
   static readonly Name: string = ToolNames.WEB_FETCH;
 
   constructor(private readonly config: Config) {
@@ -226,33 +211,28 @@ export class WebFetchTool extends BaseDeclarativeTool<
       {
         properties: {
           url: {
-            description: 'The URL to fetch content from',
-            type: 'string',
+            description: "The URL to fetch content from",
+            type: "string",
           },
           prompt: {
-            description: 'The prompt to run on the fetched content',
-            type: 'string',
+            description: "The prompt to run on the fetched content",
+            type: "string",
           },
         },
-        required: ['url', 'prompt'],
-        type: 'object',
+        required: ["url", "prompt"],
+        type: "object",
       },
     );
   }
 
-  protected override validateToolParamValues(
-    params: WebFetchToolParams,
-  ): string | null {
-    if (!params.url || params.url.trim() === '') {
+  protected override validateToolParamValues(params: WebFetchToolParams): string | null {
+    if (!params.url || params.url.trim() === "") {
       return "The 'url' parameter cannot be empty.";
     }
-    if (
-      !params.url.startsWith('http://') &&
-      !params.url.startsWith('https://')
-    ) {
+    if (!params.url.startsWith("http://") && !params.url.startsWith("https://")) {
       return "The 'url' must be a valid URL starting with http:// or https://.";
     }
-    if (!params.prompt || params.prompt.trim() === '') {
+    if (!params.prompt || params.prompt.trim() === "") {
       return "The 'prompt' parameter cannot be empty.";
     }
     return null;
diff --git a/packages/airiscode-core/src/tools/web-search/base-provider.ts b/packages/airiscode-core/src/tools/web-search/base-provider.ts
index a9bdc5b0d..1224232a4 100644
--- a/packages/airiscode-core/src/tools/web-search/base-provider.ts
+++ b/packages/airiscode-core/src/tools/web-search/base-provider.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { WebSearchProvider, WebSearchResult } from './types.js';
+import type { WebSearchProvider, WebSearchResult } from "./types.js";
 
 /**
  * Base implementation for web search providers.
@@ -24,10 +24,7 @@ export abstract class BaseWebSearchProvider implements WebSearchProvider {
    * @param signal Abort signal for cancellation
    * @returns Promise resolving to search results
    */
-  protected abstract performSearch(
-    query: string,
-    signal: AbortSignal,
-  ): Promise<WebSearchResult>;
+  protected abstract performSearch(query: string, signal: AbortSignal): Promise<WebSearchResult>;
 
   /**
    * Execute a web search with error handling.
@@ -37,18 +34,13 @@ export abstract class BaseWebSearchProvider implements WebSearchProvider {
    */
   async search(query: string, signal: AbortSignal): Promise<WebSearchResult> {
     if (!this.isAvailable()) {
-      throw new Error(
-        `[${this.name}] Provider is not available. Please check your configuration.`,
-      );
+      throw new Error(`[${this.name}] Provider is not available. Please check your configuration.`);
     }
 
     try {
       return await this.performSearch(query, signal);
     } catch (error: unknown) {
-      if (
-        error instanceof Error &&
-        error.message.startsWith(`[${this.name}]`)
-      ) {
+      if (error instanceof Error && error.message.startsWith(`[${this.name}]`)) {
         throw error;
       }
       const message = error instanceof Error ? error.message : String(error);
diff --git a/packages/airiscode-core/src/tools/web-search/index.ts b/packages/airiscode-core/src/tools/web-search/index.ts
index b1bacf351..6f555034f 100644
--- a/packages/airiscode-core/src/tools/web-search/index.ts
+++ b/packages/airiscode-core/src/tools/web-search/index.ts
@@ -4,40 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolConfirmationOutcome } from '../tools.js';
+import type { Config } from "../../config/config.js";
+import type { PermissionDecision } from "../../permissions/types.js";
+import { createDebugLogger } from "../../utils/debugLogger.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { ToolErrorType } from "../tool-error.js";
+import { ToolDisplayNames, ToolNames } from "../tool-names.js";
+import type { ToolConfirmationOutcome } from "../tools.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   Kind,
-  type ToolInvocation,
   type ToolCallConfirmationDetails,
-  type ToolInfoConfirmationDetails,
   type ToolConfirmationPayload,
-} from '../tools.js';
-import type { PermissionDecision } from '../../permissions/types.js';
-import { ToolErrorType } from '../tool-error.js';
-
-import type { Config } from '../../config/config.js';
-import { getErrorMessage } from '../../utils/errors.js';
-import { createDebugLogger } from '../../utils/debugLogger.js';
-import { buildContentWithSources } from './utils.js';
-import { TavilyProvider } from './providers/tavily-provider.js';
-import { GoogleProvider } from './providers/google-provider.js';
+  type ToolInfoConfirmationDetails,
+  type ToolInvocation,
+} from "../tools.js";
+import { GoogleProvider } from "./providers/google-provider.js";
+import { TavilyProvider } from "./providers/tavily-provider.js";
 import type {
-  WebSearchToolParams,
-  WebSearchToolResult,
   WebSearchProvider,
-  WebSearchResultItem,
   WebSearchProviderConfig,
-} from './types.js';
-import { ToolNames, ToolDisplayNames } from '../tool-names.js';
+  WebSearchResultItem,
+  WebSearchToolParams,
+  WebSearchToolResult,
+} from "./types.js";
+import { buildContentWithSources } from "./utils.js";
 
-const debugLogger = createDebugLogger('WEB_SEARCH');
+const debugLogger = createDebugLogger("WEB_SEARCH");
 
-class WebSearchToolInvocation extends BaseToolInvocation<
-  WebSearchToolParams,
-  WebSearchToolResult
-> {
+class WebSearchToolInvocation extends BaseToolInvocation<WebSearchToolParams, WebSearchToolResult> {
   constructor(
     private readonly config: Config,
     params: WebSearchToolParams,
@@ -48,7 +44,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
   override getDescription(): string {
     const webSearchConfig = this.config.getWebSearchConfig();
     if (!webSearchConfig) {
-      return ' (Web search is disabled - configure a provider in settings.json)';
+      return " (Web search is disabled - configure a provider in settings.json)";
     }
     const provider = this.params.provider || webSearchConfig.default;
     return ` (Searching the web via ${provider})`;
@@ -58,7 +54,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
    * WebSearch requires confirmation for external network requests.
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
-    return 'ask';
+    return "ask";
   }
 
   /**
@@ -71,14 +67,11 @@ class WebSearchToolInvocation extends BaseToolInvocation<
     const permissionRules = [`WebSearch`];
 
     const confirmationDetails: ToolInfoConfirmationDetails = {
-      type: 'info',
-      title: 'Confirm Web Search',
+      type: "info",
+      title: "Confirm Web Search",
       prompt: `Search the web for: "${this.params.query}"`,
       permissionRules,
-      onConfirm: async (
-        _outcome: ToolConfirmationOutcome,
-        _payload?: ToolConfirmationPayload,
-      ) => {
+      onConfirm: async (_outcome: ToolConfirmationOutcome, _payload?: ToolConfirmationPayload) => {
         // No-op: persistence is handled by coreToolScheduler via PM rules
       },
     };
@@ -90,21 +83,19 @@ class WebSearchToolInvocation extends BaseToolInvocation<
    */
   private createProvider(config: WebSearchProviderConfig): WebSearchProvider {
     switch (config.type) {
-      case 'tavily':
+      case "tavily":
         return new TavilyProvider(config);
-      case 'google':
+      case "google":
         return new GoogleProvider(config);
       default:
-        throw new Error('Unknown provider type');
+        throw new Error("Unknown provider type");
     }
   }
 
   /**
    * Create all configured providers.
    */
-  private createProviders(
-    configs: WebSearchProviderConfig[],
-  ): Map<string, WebSearchProvider> {
+  private createProviders(configs: WebSearchProviderConfig[]): Map<string, WebSearchProvider> {
     const providers = new Map<string, WebSearchProvider>();
 
     for (const config of configs) {
@@ -134,7 +125,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
     if (requestedProvider) {
       const provider = providers.get(requestedProvider);
       if (!provider) {
-        const available = Array.from(providers.keys()).join(', ');
+        const available = Array.from(providers.keys()).join(", ");
         throw new Error(
           `The specified provider "${requestedProvider}" is not available. Available: ${available}`,
         );
@@ -150,7 +141,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
     // Fallback to first available provider
     const firstProvider = providers.values().next().value;
     if (!firstProvider) {
-      throw new Error('No web search providers are available.');
+      throw new Error("No web search providers are available.");
     }
     return firstProvider;
   }
@@ -158,10 +149,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
   /**
    * Format search results into a content string.
    */
-  private formatSearchResults(searchResult: {
-    answer?: string;
-    results: WebSearchResultItem[];
-  }): {
+  private formatSearchResults(searchResult: { answer?: string; results: WebSearchResultItem[] }): {
     content: string;
     sources: Array<{ title: string; url: string }>;
   } {
@@ -170,7 +158,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
       url: r.url,
     }));
 
-    let content = searchResult.answer?.trim() || '';
+    let content = searchResult.answer?.trim() || "";
 
     if (!content) {
       // Fallback: Build an informative summary with title + snippet + source link
@@ -198,14 +186,14 @@ class WebSearchToolInvocation extends BaseToolInvocation<
             parts.push(`   Published: ${r.publishedDate}`);
           }
 
-          return parts.join('\n');
+          return parts.join("\n");
         })
-        .join('\n\n');
+        .join("\n\n");
 
       // Add a note about using web_fetch for detailed content
       if (content) {
         content +=
-          '\n\n*Note: For detailed content from any source above, use the web_fetch tool with the URL.*';
+          "\n\n*Note: For detailed content from any source above, use the web_fetch tool with the URL.*";
       }
     } else {
       // When answer is available, append sources section
@@ -221,10 +209,10 @@ class WebSearchToolInvocation extends BaseToolInvocation<
     if (!webSearchConfig) {
       return {
         llmContent:
-          'Web search is disabled. Please configure a web search provider in your settings.',
-        returnDisplay: 'Web search is disabled.',
+          "Web search is disabled. Please configure a web search provider in your settings.",
+        returnDisplay: "Web search is disabled.",
         error: {
-          message: 'Web search is disabled',
+          message: "Web search is disabled",
           type: ToolErrorType.EXECUTION_FAILED,
         },
       };
@@ -262,7 +250,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
       debugLogger.error(errorMessage, error);
       return {
         llmContent: errorMessage,
-        returnDisplay: 'Error performing web search.',
+        returnDisplay: "Error performing web search.",
         error: {
           message: errorMessage,
           type: ToolErrorType.EXECUTION_FAILED,
@@ -275,32 +263,29 @@ class WebSearchToolInvocation extends BaseToolInvocation<
 /**
  * A tool to perform web searches using configurable providers.
  */
-export class WebSearchTool extends BaseDeclarativeTool<
-  WebSearchToolParams,
-  WebSearchToolResult
-> {
+export class WebSearchTool extends BaseDeclarativeTool<WebSearchToolParams, WebSearchToolResult> {
   static readonly Name: string = ToolNames.WEB_SEARCH;
 
   constructor(private readonly config: Config) {
     super(
       WebSearchTool.Name,
       ToolDisplayNames.WEB_SEARCH,
-      'Allows searching the web and using results to inform responses. Provides up-to-date information for current events and recent data beyond the training data cutoff. Returns search results formatted with concise answers and source links. Use this tool when accessing information that may be outdated or beyond the knowledge cutoff.',
+      "Allows searching the web and using results to inform responses. Provides up-to-date information for current events and recent data beyond the training data cutoff. Returns search results formatted with concise answers and source links. Use this tool when accessing information that may be outdated or beyond the knowledge cutoff.",
       Kind.Search,
       {
-        type: 'object',
+        type: "object",
         properties: {
           query: {
-            type: 'string',
-            description: 'The search query to find information on the web.',
+            type: "string",
+            description: "The search query to find information on the web.",
           },
           provider: {
-            type: 'string',
+            type: "string",
             description:
               'Optional provider to use for the search (e.g., "tavily", "google"). IMPORTANT: Only specify this parameter if you explicitly know which provider to use. Otherwise, omit this parameter entirely and let the system automatically select the appropriate provider based on availability and configuration. The system will choose the best available provider automatically.',
           },
         },
-        required: ['query'],
+        required: ["query"],
       },
     );
   }
@@ -310,15 +295,13 @@ export class WebSearchTool extends BaseDeclarativeTool<
    * @param params The parameters to validate
    * @returns An error message string if validation fails, null if valid
    */
-  protected override validateToolParamValues(
-    params: WebSearchToolParams,
-  ): string | null {
-    if (!params.query || params.query.trim() === '') {
+  protected override validateToolParamValues(params: WebSearchToolParams): string | null {
+    if (!params.query || params.query.trim() === "") {
       return "The 'query' parameter cannot be empty.";
     }
 
     // Validate provider parameter if provided
-    if (params.provider !== undefined && params.provider.trim() === '') {
+    if (params.provider !== undefined && params.provider.trim() === "") {
       return "The 'provider' parameter cannot be empty if specified.";
     }
 
@@ -334,8 +317,8 @@ export class WebSearchTool extends BaseDeclarativeTool<
 
 // Re-export types for external use
 export type {
-  WebSearchToolParams,
-  WebSearchToolResult,
   WebSearchConfig,
   WebSearchProviderConfig,
-} from './types.js';
+  WebSearchToolParams,
+  WebSearchToolResult,
+} from "./types.js";
diff --git a/packages/airiscode-core/src/tools/web-search/providers/google-provider.ts b/packages/airiscode-core/src/tools/web-search/providers/google-provider.ts
index 0293bfdc6..3860e9eff 100644
--- a/packages/airiscode-core/src/tools/web-search/providers/google-provider.ts
+++ b/packages/airiscode-core/src/tools/web-search/providers/google-provider.ts
@@ -4,12 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseWebSearchProvider } from '../base-provider.js';
-import type {
-  WebSearchResult,
-  WebSearchResultItem,
-  GoogleProviderConfig,
-} from '../types.js';
+import { BaseWebSearchProvider } from "../base-provider.js";
+import type { GoogleProviderConfig, WebSearchResult, WebSearchResultItem } from "../types.js";
 
 interface GoogleSearchItem {
   title: string;
@@ -31,7 +27,7 @@ interface GoogleSearchResponse {
  * Web search provider using Google Custom Search API.
  */
 export class GoogleProvider extends BaseWebSearchProvider {
-  readonly name = 'Google';
+  readonly name = "Google";
 
   constructor(private readonly config: GoogleProviderConfig) {
     super();
@@ -41,37 +37,34 @@ export class GoogleProvider extends BaseWebSearchProvider {
     return !!(this.config.apiKey && this.config.searchEngineId);
   }
 
-  protected async performSearch(
-    query: string,
-    signal: AbortSignal,
-  ): Promise<WebSearchResult> {
+  protected async performSearch(query: string, signal: AbortSignal): Promise<WebSearchResult> {
     const params = new URLSearchParams({
       key: this.config.apiKey!,
       cx: this.config.searchEngineId!,
       q: query,
       num: String(this.config.maxResults || 10),
-      safe: this.config.safeSearch || 'medium',
+      safe: this.config.safeSearch || "medium",
     });
 
     if (this.config.language) {
-      params.append('lr', `lang_${this.config.language}`);
+      params.append("lr", `lang_${this.config.language}`);
     }
 
     if (this.config.country) {
-      params.append('cr', `country${this.config.country}`);
+      params.append("cr", `country${this.config.country}`);
     }
 
     const url = `https://www.googleapis.com/customsearch/v1?${params.toString()}`;
 
     const response = await fetch(url, {
-      method: 'GET',
+      method: "GET",
       signal,
     });
 
     if (!response.ok) {
-      const text = await response.text().catch(() => '');
+      const text = await response.text().catch(() => "");
       throw new Error(
-        `API error: ${response.status} ${response.statusText}${text ? ` - ${text}` : ''}`,
+        `API error: ${response.status} ${response.statusText}${text ? ` - ${text}` : ""}`,
       );
     }
 
diff --git a/packages/airiscode-core/src/tools/web-search/providers/tavily-provider.ts b/packages/airiscode-core/src/tools/web-search/providers/tavily-provider.ts
index b6284050f..dd6f50258 100644
--- a/packages/airiscode-core/src/tools/web-search/providers/tavily-provider.ts
+++ b/packages/airiscode-core/src/tools/web-search/providers/tavily-provider.ts
@@ -4,12 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseWebSearchProvider } from '../base-provider.js';
-import type {
-  WebSearchResult,
-  WebSearchResultItem,
-  TavilyProviderConfig,
-} from '../types.js';
+import { BaseWebSearchProvider } from "../base-provider.js";
+import type { TavilyProviderConfig, WebSearchResult, WebSearchResultItem } from "../types.js";
 
 interface TavilyResultItem {
   title: string;
@@ -29,7 +25,7 @@ interface TavilySearchResponse {
  * Web search provider using Tavily API.
  */
 export class TavilyProvider extends BaseWebSearchProvider {
-  readonly name = 'Tavily';
+  readonly name = "Tavily";
 
   constructor(private readonly config: TavilyProviderConfig) {
     super();
@@ -39,19 +35,16 @@ export class TavilyProvider extends BaseWebSearchProvider {
     return !!this.config.apiKey;
   }
 
-  protected async performSearch(
-    query: string,
-    signal: AbortSignal,
-  ): Promise<WebSearchResult> {
-    const response = await fetch('https://api.tavily.com/search', {
-      method: 'POST',
+  protected async performSearch(query: string, signal: AbortSignal): Promise<WebSearchResult> {
+    const response = await fetch("https://api.tavily.com/search", {
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       body: JSON.stringify({
         api_key: this.config.apiKey,
         query,
-        search_depth: this.config.searchDepth || 'advanced',
+        search_depth: this.config.searchDepth || "advanced",
         max_results: this.config.maxResults || 5,
         include_answer: this.config.includeAnswer !== false,
       }),
@@ -59,9 +52,9 @@ export class TavilyProvider extends BaseWebSearchProvider {
     });
 
     if (!response.ok) {
-      const text = await response.text().catch(() => '');
+      const text = await response.text().catch(() => "");
       throw new Error(
-        `API error: ${response.status} ${response.statusText}${text ? ` - ${text}` : ''}`,
+        `API error: ${response.status} ${response.statusText}${text ? ` - ${text}` : ""}`,
       );
     }
 
diff --git a/packages/airiscode-core/src/tools/web-search/types.ts b/packages/airiscode-core/src/tools/web-search/types.ts
index 23ae3e0e4..23bf13ea6 100644
--- a/packages/airiscode-core/src/tools/web-search/types.ts
+++ b/packages/airiscode-core/src/tools/web-search/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolResult } from '../tools.js';
+import type { ToolResult } from "../tools.js";
 
 /**
  * Common interface for all web search providers.
@@ -107,9 +107,9 @@ export interface WebSearchConfig {
  * Base configuration for Tavily provider.
  */
 export interface TavilyProviderConfig {
-  type: 'tavily';
+  type: "tavily";
   apiKey?: string;
-  searchDepth?: 'basic' | 'advanced';
+  searchDepth?: "basic" | "advanced";
   maxResults?: number;
   includeAnswer?: boolean;
 }
@@ -118,11 +118,11 @@ export interface TavilyProviderConfig {
  * Base configuration for Google provider.
  */
 export interface GoogleProviderConfig {
-  type: 'google';
+  type: "google";
   apiKey?: string;
   searchEngineId?: string;
   maxResults?: number;
-  safeSearch?: 'off' | 'medium' | 'high';
+  safeSearch?: "off" | "medium" | "high";
   language?: string;
   country?: string;
 }
@@ -131,6 +131,4 @@ export interface GoogleProviderConfig {
  * Discriminated union type for web search provider configurations.
  * This ensures type safety when working with different provider configs.
  */
-export type WebSearchProviderConfig =
-  | TavilyProviderConfig
-  | GoogleProviderConfig;
+export type WebSearchProviderConfig = TavilyProviderConfig | GoogleProviderConfig;
diff --git a/packages/airiscode-core/src/tools/web-search/utils.ts b/packages/airiscode-core/src/tools/web-search/utils.ts
index 4f4f24dbf..6d682e00e 100644
--- a/packages/airiscode-core/src/tools/web-search/utils.ts
+++ b/packages/airiscode-core/src/tools/web-search/utils.ts
@@ -20,8 +20,8 @@ export function buildContentWithSources(
 ): string {
   if (!sources.length) return content;
   const sourceList = sources
-    .map((s, i) => `[${i + 1}] ${s.title || 'Untitled'} (${s.url})`)
-    .join('\n');
+    .map((s, i) => `[${i + 1}] ${s.title || "Untitled"} (${s.url})`)
+    .join("\n");
   return `${content}\n\nSources:\n${sourceList}`;
 }
 
@@ -38,5 +38,5 @@ export function buildSummary(
   return sources
     .slice(0, maxResults)
     .map((s, i) => `${i + 1}. ${s.title} - ${s.url}`)
-    .join('\n');
+    .join("\n");
 }
diff --git a/packages/airiscode-core/src/tools/write-file.ts b/packages/airiscode-core/src/tools/write-file.ts
index ec978c851..0630b97d0 100644
--- a/packages/airiscode-core/src/tools/write-file.ts
+++ b/packages/airiscode-core/src/tools/write-file.ts
@@ -4,11 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import * as Diff from 'diff';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../config/config.js';
+import fs from "node:fs";
+import path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import { ApprovalMode } from "../config/config.js";
+import type { PermissionDecision } from "../permissions/types.js";
+import type { LineEnding } from "../services/fileSystemService.js";
+import { detectLineEnding, FileEncoding, needsUtf8Bom } from "../services/fileSystemService.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { getSpecificMimeType, fileExists as isFilefileExists } from "../utils/fileUtils.js";
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolDisplayNames, ToolNames } from "./tool-names.js";
 import type {
   FileDiff,
   ToolCallConfirmationDetails,
@@ -16,40 +31,10 @@ import type {
   ToolInvocation,
   ToolLocation,
   ToolResult,
-} from './tools.js';
-import type { PermissionDecision } from '../permissions/types.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import {
-  FileEncoding,
-  needsUtf8Bom,
-  detectLineEnding,
-} from '../services/fileSystemService.js';
-import type { LineEnding } from '../services/fileSystemService.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import { ToolNames, ToolDisplayNames } from './tool-names.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import {
-  getSpecificMimeType,
-  fileExists as isFilefileExists,
-} from '../utils/fileUtils.js';
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
-
-const debugLogger = createDebugLogger('WRITE_FILE');
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
+
+const debugLogger = createDebugLogger("WRITE_FILE");
 
 /**
  * Parameters for the WriteFile tool
@@ -76,10 +61,7 @@ export interface WriteFileToolParams {
   ai_proposed_content?: string;
 }
 
-class WriteFileToolInvocation extends BaseToolInvocation<
-  WriteFileToolParams,
-  ToolResult
-> {
+class WriteFileToolInvocation extends BaseToolInvocation<WriteFileToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: WriteFileToolParams,
@@ -92,10 +74,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
   }
 
   override getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
     return `Writing to ${shortenPath(relativePath)}`;
   }
 
@@ -103,7 +82,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
    * Write operations always need user confirmation.
    */
   override async getDefaultPermission(): Promise<PermissionDecision> {
-    return 'ask';
+    return "ask";
   }
 
   /**
@@ -112,7 +91,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
   override async getConfirmationDetails(
     _abortSignal: AbortSignal,
   ): Promise<ToolCallConfirmationDetails> {
-    let originalContent = '';
+    let originalContent = "";
     const fileExists = await isFilefileExists(this.params.file_path);
     if (fileExists) {
       try {
@@ -121,29 +100,24 @@ class WriteFileToolInvocation extends BaseToolInvocation<
           .readTextFile({ path: this.params.file_path });
         originalContent = content;
       } catch (err) {
-        throw new Error(
-          `Error reading existing file for confirmation: ${getErrorMessage(err)}`,
-        );
+        throw new Error(`Error reading existing file for confirmation: ${getErrorMessage(err)}`);
       }
     }
 
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
     const fileName = path.basename(this.params.file_path);
 
     const fileDiff = Diff.createPatch(
       fileName,
       originalContent, // Original content (empty if new file or unreadable)
       this.params.content, // Content after potential correction
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Write: ${shortenPath(relativePath)}`,
       fileName,
       filePath: this.params.file_path,
@@ -160,33 +134,28 @@ class WriteFileToolInvocation extends BaseToolInvocation<
   }
 
   async execute(_abortSignal: AbortSignal): Promise<ToolResult> {
-    const { file_path, content, ai_proposed_content, modified_by_user } =
-      this.params;
+    const { file_path, content, ai_proposed_content, modified_by_user } = this.params;
 
     let fileExists = await isFilefileExists(file_path);
-    let originalContent = '';
+    let originalContent = "";
     let useBOM = false;
     let detectedEncoding: string | undefined;
     let detectedLineEnding: LineEnding | undefined;
     const dirName = path.dirname(file_path);
     if (fileExists) {
       try {
-        const fileInfo = await this.config
-          .getFileSystemService()
-          .readTextFile({ path: file_path });
+        const fileInfo = await this.config.getFileSystemService().readTextFile({ path: file_path });
         if (fileInfo._meta?.bom !== undefined) {
           useBOM = fileInfo._meta.bom;
         } else {
-          useBOM =
-            fileInfo.content.length > 0 &&
-            fileInfo.content.codePointAt(0) === 0xfeff;
+          useBOM = fileInfo.content.length > 0 && fileInfo.content.codePointAt(0) === 0xfeff;
         }
-        detectedEncoding = fileInfo._meta?.encoding || 'utf-8';
+        detectedEncoding = fileInfo._meta?.encoding || "utf-8";
         detectedLineEnding = detectLineEnding(fileInfo.content);
         originalContent = fileInfo.content;
         fileExists = true; // File exists and was read
       } catch (err) {
-        if (isNodeError(err) && err.code === 'ENOENT') {
+        if (isNodeError(err) && err.code === "ENOENT") {
           fileExists = false;
         } else {
           const error = {
@@ -246,8 +215,8 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         fileName,
         currentContentForDiff,
         content,
-        'Original',
-        'Written',
+        "Original",
+        "Written",
         DEFAULT_DIFF_OPTIONS,
       );
 
@@ -265,20 +234,16 @@ class WriteFileToolInvocation extends BaseToolInvocation<
           : `Successfully overwrote file: ${file_path}.`,
       ];
       if (modified_by_user) {
-        llmSuccessMessageParts.push(
-          `User modified the \`content\` to be: ${content}`,
-        );
+        llmSuccessMessageParts.push(`User modified the \`content\` to be: ${content}`);
       }
 
       // Log file operation for telemetry (without diff_stat to avoid double-counting)
       const mimetype = getSpecificMimeType(file_path);
       const programmingLanguage = getLanguageFromFilePath(file_path);
       const extension = path.extname(file_path);
-      const operation = !fileExists
-        ? FileOperation.CREATE
-        : FileOperation.UPDATE;
+      const operation = !fileExists ? FileOperation.CREATE : FileOperation.UPDATE;
 
-      const lineCount = content.split('\n').length;
+      const lineCount = content.split("\n").length;
       logFileOperation(
         this.config,
         new FileOperationEvent(
@@ -300,7 +265,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
       };
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -313,20 +278,20 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         errorMsg = `Error writing to file '${file_path}': ${error.message} (${error.code})`;
 
         // Log specific error types for better debugging
-        if (error.code === 'EACCES') {
+        if (error.code === "EACCES") {
           errorMsg = `Permission denied writing to file: ${file_path} (${error.code})`;
           errorType = ToolErrorType.PERMISSION_DENIED;
-        } else if (error.code === 'ENOSPC') {
+        } else if (error.code === "ENOSPC") {
           errorMsg = `No space left on device: ${file_path} (${error.code})`;
           errorType = ToolErrorType.NO_SPACE_LEFT;
-        } else if (error.code === 'EISDIR') {
+        } else if (error.code === "EISDIR") {
           errorMsg = `Target is a directory, not a file: ${file_path} (${error.code})`;
           errorType = ToolErrorType.TARGET_IS_DIRECTORY;
         }
 
         // Include stack trace in debug mode for better troubleshooting
         if (this.config.getDebugMode() && error.stack) {
-          debugLogger.debug('Write file error stack:', error.stack);
+          debugLogger.debug("Write file error stack:", error.stack);
         }
       } else if (error instanceof Error) {
         errorMsg = `Error writing to file: ${error.message}`;
@@ -368,22 +333,20 @@ export class WriteFileTool
           file_path: {
             description:
               "The absolute path to the file to write to (e.g., '/home/user/project/file.txt'). Relative paths are not supported.",
-            type: 'string',
+            type: "string",
           },
           content: {
-            description: 'The content to write to the file.',
-            type: 'string',
+            description: "The content to write to the file.",
+            type: "string",
           },
         },
-        required: ['file_path', 'content'],
-        type: 'object',
+        required: ["file_path", "content"],
+        type: "object",
       },
     );
   }
 
-  protected override validateToolParamValues(
-    params: WriteFileToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: WriteFileToolParams): string | null {
     const filePath = params.file_path;
 
     if (!filePath) {
@@ -416,9 +379,7 @@ export class WriteFileTool
     return new WriteFileToolInvocation(this.config, params);
   }
 
-  getModifyContext(
-    _abortSignal: AbortSignal,
-  ): ModifyContext<WriteFileToolParams> {
+  getModifyContext(_abortSignal: AbortSignal): ModifyContext<WriteFileToolParams> {
     return {
       getFilePath: (params: WriteFileToolParams) => params.file_path,
       getCurrentContent: async (params: WriteFileToolParams) => {
@@ -430,11 +391,11 @@ export class WriteFileTool
               .readTextFile({ path: params.file_path });
             return content;
           } catch (err) {
-            if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-            return '';
+            if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+            return "";
           }
         } else {
-          return '';
+          return "";
         }
       },
       getProposedContent: async (params: WriteFileToolParams) => params.content,
diff --git a/packages/airiscode-core/src/types/llm.ts b/packages/airiscode-core/src/types/llm.ts
index 0dabb0843..2a90fc48f 100644
--- a/packages/airiscode-core/src/types/llm.ts
+++ b/packages/airiscode-core/src/types/llm.ts
@@ -22,64 +22,64 @@
  * Consumers can still reference FinishReason.STOP for well-known values.
  */
 export const FinishReason = {
-  FINISH_REASON_UNSPECIFIED: 'FINISH_REASON_UNSPECIFIED',
-  STOP: 'STOP',
-  MAX_TOKENS: 'MAX_TOKENS',
-  SAFETY: 'SAFETY',
-  RECITATION: 'RECITATION',
-  LANGUAGE: 'LANGUAGE',
-  OTHER: 'OTHER',
-  BLOCKLIST: 'BLOCKLIST',
-  PROHIBITED_CONTENT: 'PROHIBITED_CONTENT',
-  SPII: 'SPII',
-  MALFORMED_FUNCTION_CALL: 'MALFORMED_FUNCTION_CALL',
-  IMAGE_SAFETY: 'IMAGE_SAFETY',
-  UNEXPECTED_TOOL_CALL: 'UNEXPECTED_TOOL_CALL',
-  IMAGE_PROHIBITED_CONTENT: 'IMAGE_PROHIBITED_CONTENT',
-  NO_IMAGE: 'NO_IMAGE',
+  FINISH_REASON_UNSPECIFIED: "FINISH_REASON_UNSPECIFIED",
+  STOP: "STOP",
+  MAX_TOKENS: "MAX_TOKENS",
+  SAFETY: "SAFETY",
+  RECITATION: "RECITATION",
+  LANGUAGE: "LANGUAGE",
+  OTHER: "OTHER",
+  BLOCKLIST: "BLOCKLIST",
+  PROHIBITED_CONTENT: "PROHIBITED_CONTENT",
+  SPII: "SPII",
+  MALFORMED_FUNCTION_CALL: "MALFORMED_FUNCTION_CALL",
+  IMAGE_SAFETY: "IMAGE_SAFETY",
+  UNEXPECTED_TOOL_CALL: "UNEXPECTED_TOOL_CALL",
+  IMAGE_PROHIBITED_CONTENT: "IMAGE_PROHIBITED_CONTENT",
+  NO_IMAGE: "NO_IMAGE",
 } as const;
 export type FinishReason = string;
 
 export enum Type {
-  TYPE_UNSPECIFIED = 'TYPE_UNSPECIFIED',
-  STRING = 'STRING',
-  NUMBER = 'NUMBER',
-  INTEGER = 'INTEGER',
-  BOOLEAN = 'BOOLEAN',
-  ARRAY = 'ARRAY',
-  OBJECT = 'OBJECT',
-  NULL = 'NULL',
+  TYPE_UNSPECIFIED = "TYPE_UNSPECIFIED",
+  STRING = "STRING",
+  NUMBER = "NUMBER",
+  INTEGER = "INTEGER",
+  BOOLEAN = "BOOLEAN",
+  ARRAY = "ARRAY",
+  OBJECT = "OBJECT",
+  NULL = "NULL",
 }
 
 export enum HarmCategory {
-  HARM_CATEGORY_UNSPECIFIED = 'HARM_CATEGORY_UNSPECIFIED',
-  HARM_CATEGORY_HATE_SPEECH = 'HARM_CATEGORY_HATE_SPEECH',
-  HARM_CATEGORY_SEXUALLY_EXPLICIT = 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
-  HARM_CATEGORY_HARASSMENT = 'HARM_CATEGORY_HARASSMENT',
-  HARM_CATEGORY_DANGEROUS_CONTENT = 'HARM_CATEGORY_DANGEROUS_CONTENT',
+  HARM_CATEGORY_UNSPECIFIED = "HARM_CATEGORY_UNSPECIFIED",
+  HARM_CATEGORY_HATE_SPEECH = "HARM_CATEGORY_HATE_SPEECH",
+  HARM_CATEGORY_SEXUALLY_EXPLICIT = "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+  HARM_CATEGORY_HARASSMENT = "HARM_CATEGORY_HARASSMENT",
+  HARM_CATEGORY_DANGEROUS_CONTENT = "HARM_CATEGORY_DANGEROUS_CONTENT",
 }
 
 export enum HarmBlockThreshold {
-  HARM_BLOCK_THRESHOLD_UNSPECIFIED = 'HARM_BLOCK_THRESHOLD_UNSPECIFIED',
-  BLOCK_LOW_AND_ABOVE = 'BLOCK_LOW_AND_ABOVE',
-  BLOCK_MEDIUM_AND_ABOVE = 'BLOCK_MEDIUM_AND_ABOVE',
-  BLOCK_ONLY_HIGH = 'BLOCK_ONLY_HIGH',
-  BLOCK_NONE = 'BLOCK_NONE',
+  HARM_BLOCK_THRESHOLD_UNSPECIFIED = "HARM_BLOCK_THRESHOLD_UNSPECIFIED",
+  BLOCK_LOW_AND_ABOVE = "BLOCK_LOW_AND_ABOVE",
+  BLOCK_MEDIUM_AND_ABOVE = "BLOCK_MEDIUM_AND_ABOVE",
+  BLOCK_ONLY_HIGH = "BLOCK_ONLY_HIGH",
+  BLOCK_NONE = "BLOCK_NONE",
 }
 
 export enum BlockedReason {
-  BLOCKED_REASON_UNSPECIFIED = 'BLOCKED_REASON_UNSPECIFIED',
-  SAFETY = 'SAFETY',
-  OTHER = 'OTHER',
+  BLOCKED_REASON_UNSPECIFIED = "BLOCKED_REASON_UNSPECIFIED",
+  SAFETY = "SAFETY",
+  OTHER = "OTHER",
 }
 
 export enum Modality {
-  MODALITY_UNSPECIFIED = 'MODALITY_UNSPECIFIED',
-  TEXT = 'TEXT',
-  IMAGE = 'IMAGE',
-  AUDIO = 'AUDIO',
-  VIDEO = 'VIDEO',
-  DOCUMENT = 'DOCUMENT',
+  MODALITY_UNSPECIFIED = "MODALITY_UNSPECIFIED",
+  TEXT = "TEXT",
+  IMAGE = "IMAGE",
+  AUDIO = "AUDIO",
+  VIDEO = "VIDEO",
+  DOCUMENT = "DOCUMENT",
 }
 
 // ---------------------------------------------------------------------------
@@ -385,39 +385,35 @@ export class GenerateContentResponse {
     const parts = this.candidates?.[0]?.content?.parts;
     if (!parts || parts.length === 0) return undefined;
     const texts = parts
-      .filter((p) => typeof p.text === 'string' && !p.thought)
+      .filter((p) => typeof p.text === "string" && !p.thought)
       .map((p) => p.text as string);
     if (texts.length === 0) return undefined;
-    return texts.join('');
+    return texts.join("");
   }
 
   /** Convenience getter matching @google/genai: function calls from first candidate. */
   get functionCalls(): FunctionCall[] | undefined {
     const parts = this.candidates?.[0]?.content?.parts;
     if (!parts) return undefined;
-    const calls = parts
-      .filter((p) => p.functionCall)
-      .map((p) => p.functionCall as FunctionCall);
+    const calls = parts.filter((p) => p.functionCall).map((p) => p.functionCall as FunctionCall);
     return calls.length > 0 ? calls : undefined;
   }
 
   /** Convenience getter: executable code from first candidate. */
   get executableCode(): string | undefined {
-    return this.candidates?.[0]?.content?.parts?.find((p) => p.executableCode)
-      ?.executableCode?.code;
+    return this.candidates?.[0]?.content?.parts?.find((p) => p.executableCode)?.executableCode
+      ?.code;
   }
 
   /** Convenience getter: code execution result from first candidate. */
   get codeExecutionResult(): string | undefined {
-    return this.candidates?.[0]?.content?.parts?.find(
-      (p) => p.codeExecutionResult,
-    )?.codeExecutionResult?.output;
+    return this.candidates?.[0]?.content?.parts?.find((p) => p.codeExecutionResult)
+      ?.codeExecutionResult?.output;
   }
 
   /** Convenience getter: inline data (e.g. generated image) from first candidate. */
   get data(): string | undefined {
-    return this.candidates?.[0]?.content?.parts?.find((p) => p.inlineData)
-      ?.inlineData?.data;
+    return this.candidates?.[0]?.content?.parts?.find((p) => p.inlineData)?.inlineData?.data;
   }
 }
 
@@ -435,7 +431,7 @@ export class ApiError extends Error {
 
   constructor(init: ApiErrorInit) {
     super(init.message);
-    this.name = 'ApiError';
+    this.name = "ApiError";
     this.status = init.status;
   }
 }
@@ -445,9 +441,9 @@ export class ApiError extends Error {
 // ---------------------------------------------------------------------------
 
 function partsFromPartListUnion(parts: PartListUnion): Part[] {
-  if (typeof parts === 'string') return [{ text: parts }];
+  if (typeof parts === "string") return [{ text: parts }];
   if (Array.isArray(parts)) {
-    return parts.map((p) => (typeof p === 'string' ? { text: p } : p));
+    return parts.map((p) => (typeof p === "string" ? { text: p } : p));
   }
   return [parts];
 }
@@ -458,14 +454,14 @@ function partsFromPartListUnion(parts: PartListUnion): Part[] {
  * for our consumers. Proper handling lives in driver implementations.
  */
 export function createUserContent(parts: PartListUnion): Content {
-  return { role: 'user', parts: partsFromPartListUnion(parts) };
+  return { role: "user", parts: partsFromPartListUnion(parts) };
 }
 
 /**
  * Build a model-role Content from loose parts input.
  */
 export function createModelContent(parts: PartListUnion): Content {
-  return { role: 'model', parts: partsFromPartListUnion(parts) };
+  return { role: "model", parts: partsFromPartListUnion(parts) };
 }
 
 /**
@@ -475,18 +471,13 @@ export function createModelContent(parts: PartListUnion): Content {
  * layer, so this shim only needs to satisfy the type and not break existing
  * callers that pass the result through to driver adapters.
  */
-export function mcpToTool(
-  mcpClient: unknown,
-  _options?: unknown,
-): CallableTool {
+export function mcpToTool(mcpClient: unknown, _options?: unknown): CallableTool {
   return {
     tool: async (): Promise<Tool> => ({ functionDeclarations: [] }),
     callTool: async (_functionCalls: FunctionCall[]): Promise<Part[]> => {
-      throw new Error(
-        'mcpToTool runtime shim is not wired up; use the MCP session layer instead.',
-      );
+      throw new Error("mcpToTool runtime shim is not wired up; use the MCP session layer instead.");
     },
     // Preserve reference for downstream shims that may inspect it.
-    ...(mcpClient && typeof mcpClient === 'object' ? { __mcpClient: mcpClient } : {}),
+    ...(mcpClient && typeof mcpClient === "object" ? { __mcpClient: mcpClient } : {}),
   } as CallableTool;
 }
diff --git a/packages/airiscode-core/src/types/shims.d.ts b/packages/airiscode-core/src/types/shims.d.ts
index 17684e7b8..019815a72 100644
--- a/packages/airiscode-core/src/types/shims.d.ts
+++ b/packages/airiscode-core/src/types/shims.d.ts
@@ -1,7 +1,7 @@
 // Ambient module shims for packages without bundled type definitions.
 // The stub `@types/uuid@11` defers to uuid's own types, but `uuid@9` does
 // not ship typings of its own — declare the handful of helpers we use.
-declare module 'uuid' {
+declare module "uuid" {
   export function v4(): string;
   export function v5(name: string, namespace: string): string;
   export function v1(): string;
diff --git a/packages/airiscode-core/src/utils/atomicFileWrite.ts b/packages/airiscode-core/src/utils/atomicFileWrite.ts
index e79a05738..1daf2ed2a 100644
--- a/packages/airiscode-core/src/utils/atomicFileWrite.ts
+++ b/packages/airiscode-core/src/utils/atomicFileWrite.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as crypto from 'node:crypto';
-import * as fs from 'node:fs/promises';
-import { isNodeError } from './errors.js';
+import * as crypto from "node:crypto";
+import * as fs from "node:fs/promises";
+import { isNodeError } from "./errors.js";
 
 export interface AtomicWriteOptions {
   /** Number of rename retries on EPERM/EACCES (default: 3). */
@@ -33,9 +33,9 @@ export async function atomicWriteJSON(
   const retries = options?.retries ?? 3;
   const delayMs = options?.delayMs ?? 50;
 
-  const tmpPath = `${filePath}.${crypto.randomBytes(4).toString('hex')}.tmp`;
+  const tmpPath = `${filePath}.${crypto.randomBytes(4).toString("hex")}.tmp`;
   try {
-    await fs.writeFile(tmpPath, JSON.stringify(data, null, 2), 'utf-8');
+    await fs.writeFile(tmpPath, JSON.stringify(data, null, 2), "utf-8");
     await renameWithRetry(tmpPath, filePath, retries, delayMs);
   } catch (error) {
     try {
@@ -58,15 +58,11 @@ async function renameWithRetry(
       await fs.rename(src, dest);
       return;
     } catch (error: unknown) {
-      const isRetryable =
-        isNodeError(error) &&
-        (error.code === 'EPERM' || error.code === 'EACCES');
+      const isRetryable = isNodeError(error) && (error.code === "EPERM" || error.code === "EACCES");
       if (!isRetryable || attempt === retries) {
         throw error;
       }
-      await new Promise((resolve) =>
-        setTimeout(resolve, delayMs * 2 ** attempt),
-      );
+      await new Promise((resolve) => setTimeout(resolve, delayMs * 2 ** attempt));
     }
   }
 }
diff --git a/packages/airiscode-core/src/utils/browser.ts b/packages/airiscode-core/src/utils/browser.ts
index 35ee74611..10b4b9a19 100644
--- a/packages/airiscode-core/src/utils/browser.ts
+++ b/packages/airiscode-core/src/utils/browser.ts
@@ -14,29 +14,26 @@
 export function shouldAttemptBrowserLaunch(): boolean {
   // A list of browser names that indicate we should not attempt to open a
   // web browser for the user.
-  const browserBlocklist = ['www-browser'];
-  const browserEnv = process.env['BROWSER'];
+  const browserBlocklist = ["www-browser"];
+  const browserEnv = process.env["BROWSER"];
   if (browserEnv && browserBlocklist.includes(browserEnv)) {
     return false;
   }
   // Common environment variables used in CI/CD or other non-interactive shells.
-  if (
-    process.env['CI'] ||
-    process.env['DEBIAN_FRONTEND'] === 'noninteractive'
-  ) {
+  if (process.env["CI"] || process.env["DEBIAN_FRONTEND"] === "noninteractive") {
     return false;
   }
 
   // The presence of SSH_CONNECTION indicates a remote session.
   // We should not attempt to launch a browser unless a display is explicitly available
   // (checked below for Linux).
-  const isSSH = !!process.env['SSH_CONNECTION'];
+  const isSSH = !!process.env["SSH_CONNECTION"];
 
   // On Linux, the presence of a display server is a strong indicator of a GUI.
-  if (process.platform === 'linux') {
+  if (process.platform === "linux") {
     // These are environment variables that can indicate a running compositor on
     // Linux.
-    const displayVariables = ['DISPLAY', 'WAYLAND_DISPLAY', 'MIR_SOCKET'];
+    const displayVariables = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"];
     const hasDisplay = displayVariables.some((v) => !!process.env[v]);
     if (!hasDisplay) {
       return false;
@@ -45,7 +42,7 @@ export function shouldAttemptBrowserLaunch(): boolean {
 
   // If in an SSH session on a non-Linux OS (e.g., macOS), don't launch browser.
   // The Linux case is handled above (it's allowed if DISPLAY is set).
-  if (isSSH && process.platform !== 'linux') {
+  if (isSSH && process.platform !== "linux") {
     return false;
   }
 
diff --git a/packages/airiscode-core/src/utils/configResolver.ts b/packages/airiscode-core/src/utils/configResolver.ts
index 209052f5a..6bd42a6c4 100644
--- a/packages/airiscode-core/src/utils/configResolver.ts
+++ b/packages/airiscode-core/src/utils/configResolver.ts
@@ -17,14 +17,14 @@
  * Extensible for domain-specific needs.
  */
 export type ConfigSourceKind =
-  | 'cli'
-  | 'env'
-  | 'settings'
-  | 'modelProviders'
-  | 'default'
-  | 'computed'
-  | 'programmatic'
-  | 'unknown';
+  | "cli"
+  | "env"
+  | "settings"
+  | "modelProviders"
+  | "default"
+  | "computed"
+  | "programmatic"
+  | "unknown";
 
 /**
  * Source metadata for a configuration value.
@@ -44,7 +44,7 @@ export interface ConfigSource {
   /** Model ID if relevant (for modelProviders) */
   modelId?: string;
   /** Indirect source - when a value is derived via another source */
-  via?: Omit<ConfigSource, 'via'>;
+  via?: Omit<ConfigSource, "via">;
 }
 
 /**
@@ -100,7 +100,7 @@ export interface ResolvedField<T> {
 export function resolveField<T>(
   layers: Array<ConfigLayer<T>>,
   defaultValue: T,
-  defaultSource: ConfigSource = { kind: 'default' },
+  defaultSource: ConfigSource = { kind: "default" },
 ): ResolvedField<T> {
   for (const layer of layers) {
     if (isValuePresent(layer.value)) {
@@ -138,7 +138,7 @@ function isValuePresent<T>(value: T | undefined | null): value is T {
     return false;
   }
   // Treat empty strings as not present
-  if (typeof value === 'string' && value.trim() === '') {
+  if (typeof value === "string" && value.trim() === "") {
     return false;
   }
   return true;
@@ -148,21 +148,21 @@ function isValuePresent<T>(value: T | undefined | null): value is T {
  * Create a CLI source descriptor
  */
 export function cliSource(detail: string): ConfigSource {
-  return { kind: 'cli', detail };
+  return { kind: "cli", detail };
 }
 
 /**
  * Create an environment variable source descriptor
  */
 function envSource(envKey: string): ConfigSource {
-  return { kind: 'env', envKey };
+  return { kind: "env", envKey };
 }
 
 /**
  * Create a settings source descriptor
  */
 export function settingsSource(settingsPath: string): ConfigSource {
-  return { kind: 'settings', settingsPath };
+  return { kind: "settings", settingsPath };
 }
 
 /**
@@ -173,21 +173,21 @@ export function modelProvidersSource(
   modelId: string,
   detail?: string,
 ): ConfigSource {
-  return { kind: 'modelProviders', authType, modelId, detail };
+  return { kind: "modelProviders", authType, modelId, detail };
 }
 
 /**
  * Create a default value source descriptor
  */
 export function defaultSource(detail?: string): ConfigSource {
-  return { kind: 'default', detail };
+  return { kind: "default", detail };
 }
 
 /**
  * Create a computed value source descriptor
  */
 export function computedSource(detail?: string): ConfigSource {
-  return { kind: 'computed', detail };
+  return { kind: "computed", detail };
 }
 
 /**
@@ -214,9 +214,6 @@ export function envLayer<T = string>(
 /**
  * Create a layer with a static value and source
  */
-export function layer<T>(
-  value: T | undefined,
-  source: ConfigSource,
-): ConfigLayer<T> {
+export function layer<T>(value: T | undefined, source: ConfigSource): ConfigLayer<T> {
   return { value, source };
 }
diff --git a/packages/airiscode-core/src/utils/cronDisplay.ts b/packages/airiscode-core/src/utils/cronDisplay.ts
index 5108b11d9..2f0f00e3f 100644
--- a/packages/airiscode-core/src/utils/cronDisplay.ts
+++ b/packages/airiscode-core/src/utils/cronDisplay.ts
@@ -9,30 +9,18 @@ export function humanReadableCron(cronExpr: string): string {
   const [min, hour, dom, mon, dow] = parts;
 
   // */N * * * * → Every N minutes
-  if (
-    min!.startsWith('*/') &&
-    hour === '*' &&
-    dom === '*' &&
-    mon === '*' &&
-    dow === '*'
-  ) {
+  if (min!.startsWith("*/") && hour === "*" && dom === "*" && mon === "*" && dow === "*") {
     const n = parseInt(min!.slice(2), 10);
     if (!isNaN(n)) {
-      return n === 1 ? 'Every minute' : `Every ${n} minutes`;
+      return n === 1 ? "Every minute" : `Every ${n} minutes`;
     }
   }
 
   // 0 */N * * * → Every N hours (or single minute with */N hours)
-  if (
-    /^\d+$/.test(min!) &&
-    hour!.startsWith('*/') &&
-    dom === '*' &&
-    mon === '*' &&
-    dow === '*'
-  ) {
+  if (/^\d+$/.test(min!) && hour!.startsWith("*/") && dom === "*" && mon === "*" && dow === "*") {
     const n = parseInt(hour!.slice(2), 10);
     if (!isNaN(n)) {
-      return n === 1 ? 'Every hour' : `Every ${n} hours`;
+      return n === 1 ? "Every hour" : `Every ${n} hours`;
     }
   }
 
@@ -40,13 +28,13 @@ export function humanReadableCron(cronExpr: string): string {
   if (
     /^\d+$/.test(min!) &&
     /^\d+$/.test(hour!) &&
-    dom!.startsWith('*/') &&
-    mon === '*' &&
-    dow === '*'
+    dom!.startsWith("*/") &&
+    mon === "*" &&
+    dow === "*"
   ) {
     const n = parseInt(dom!.slice(2), 10);
     if (!isNaN(n)) {
-      return n === 1 ? 'Every day' : `Every ${n} days`;
+      return n === 1 ? "Every day" : `Every ${n} days`;
     }
   }
 
diff --git a/packages/airiscode-core/src/utils/cronParser.ts b/packages/airiscode-core/src/utils/cronParser.ts
index 49074aa51..ab7456513 100644
--- a/packages/airiscode-core/src/utils/cronParser.ts
+++ b/packages/airiscode-core/src/utils/cronParser.ts
@@ -33,14 +33,14 @@ const FIELD_RANGES: Array<[number, number]> = [
 function parseField(field: string, min: number, max: number): Set<number> {
   const values = new Set<number>();
 
-  for (const part of field.split(',')) {
+  for (const part of field.split(",")) {
     const trimmed = part.trim();
     if (!trimmed) {
       throw new Error(`Empty field segment in "${field}"`);
     }
 
     // Handle step: */N or range/N or value/N
-    const stepParts = trimmed.split('/');
+    const stepParts = trimmed.split("/");
     if (stepParts.length > 2) {
       throw new Error(`Invalid step expression: "${trimmed}"`);
     }
@@ -49,11 +49,11 @@ function parseField(field: string, min: number, max: number): Set<number> {
     let rangeEnd: number;
     const base = stepParts[0]!;
 
-    if (base === '*') {
+    if (base === "*") {
       rangeStart = min;
       rangeEnd = max;
-    } else if (base.includes('-')) {
-      const [startStr, endStr] = base.split('-');
+    } else if (base.includes("-")) {
+      const [startStr, endStr] = base.split("-");
       rangeStart = parseInt(startStr!, 10);
       rangeEnd = parseInt(endStr!, 10);
       if (isNaN(rangeStart) || isNaN(rangeEnd)) {
@@ -97,11 +97,7 @@ export function parseCron(cronExpr: string): CronFields {
   }
 
   // Parse day-of-week with range 0-7, then normalize 7 → 0 (both mean Sunday)
-  const dayOfWeek = parseField(
-    parts[4]!,
-    FIELD_RANGES[4]![0],
-    FIELD_RANGES[4]![1],
-  );
+  const dayOfWeek = parseField(parts[4]!, FIELD_RANGES[4]![0], FIELD_RANGES[4]![1]);
   if (dayOfWeek.has(7)) {
     dayOfWeek.delete(7);
     dayOfWeek.add(0);
@@ -113,8 +109,8 @@ export function parseCron(cronExpr: string): CronFields {
     dayOfMonth: parseField(parts[2]!, FIELD_RANGES[2]![0], FIELD_RANGES[2]![1]),
     month: parseField(parts[3]!, FIELD_RANGES[3]![0], FIELD_RANGES[3]![1]),
     dayOfWeek,
-    domIsWild: parts[2]!.trim() === '*',
-    dowIsWild: parts[4]!.trim() === '*',
+    domIsWild: parts[2]!.trim() === "*",
+    dowIsWild: parts[4]!.trim() === "*",
   };
 }
 
@@ -171,8 +167,7 @@ export function nextFireTime(cronExpr: string, after: Date): Date {
     const dowOk = fields.dayOfWeek.has(candidate.getDay());
 
     // Vixie-cron day semantics: OR when both constrained, AND otherwise
-    const dayOk =
-      !fields.domIsWild && !fields.dowIsWild ? domOk || dowOk : domOk && dowOk;
+    const dayOk = !fields.domIsWild && !fields.dowIsWild ? domOk || dowOk : domOk && dowOk;
 
     if (minuteOk && hourOk && monthOk && dayOk) {
       return candidate;
@@ -180,7 +175,5 @@ export function nextFireTime(cronExpr: string, after: Date): Date {
     candidate.setMinutes(candidate.getMinutes() + 1);
   }
 
-  throw new Error(
-    `No matching fire time found within 4 years for: "${cronExpr}"`,
-  );
+  throw new Error(`No matching fire time found within 4 years for: "${cronExpr}"`);
 }
diff --git a/packages/airiscode-core/src/utils/debugLogger.ts b/packages/airiscode-core/src/utils/debugLogger.ts
index bc92a2685..0dbd0acef 100644
--- a/packages/airiscode-core/src/utils/debugLogger.ts
+++ b/packages/airiscode-core/src/utils/debugLogger.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { AsyncLocalStorage } from 'node:async_hooks';
-import util from 'node:util';
-import { Storage } from '../config/storage.js';
-import { updateSymlink } from './symlink.js';
+import { AsyncLocalStorage } from "node:async_hooks";
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import util from "node:util";
+import { Storage } from "../config/storage.js";
+import { updateSymlink } from "./symlink.js";
 
-type LogLevel = 'DEBUG' | 'INFO' | 'WARN' | 'ERROR';
+type LogLevel = "DEBUG" | "INFO" | "WARN" | "ERROR";
 
 export interface DebugLogSession {
   getSessionId: () => string;
@@ -31,10 +31,10 @@ let globalSession: DebugLogSession | null = null;
 const sessionContext = new AsyncLocalStorage<DebugLogSession>();
 
 function isDebugLogFileEnabled(): boolean {
-  const value = process.env['QWEN_DEBUG_LOG_FILE'];
+  const value = process.env["QWEN_DEBUG_LOG_FILE"];
   if (!value) return true;
   const normalized = value.trim().toLowerCase();
-  return !['0', 'false', 'off', 'no'].includes(normalized);
+  return !["0", "false", "off", "no"].includes(normalized);
 }
 
 function getActiveSession(): DebugLogSession | null {
@@ -65,8 +65,8 @@ function formatArgs(args: unknown[]): string {
       }
       return arg;
     })
-    .map((arg) => (typeof arg === 'string' ? arg : util.inspect(arg)))
-    .join(' ');
+    .map((arg) => (typeof arg === "string" ? arg : util.inspect(arg)))
+    .join(" ");
 }
 
 /**
@@ -78,7 +78,7 @@ function formatArgs(args: unknown[]): string {
  */
 function buildLogLine(level: LogLevel, message: string, tag?: string): string {
   const timestamp = new Date().toISOString();
-  const tagPart = tag ? ` [${tag}]` : '';
+  const tagPart = tag ? ` [${tag}]` : "";
   return `${timestamp} [${level}]${tagPart} ${message}\n`;
 }
 
@@ -98,7 +98,7 @@ function writeLog(
   const line = buildLogLine(level, message, tag);
 
   void ensureDebugDirExists()
-    .then(() => fs.appendFile(logFilePath, line, 'utf8'))
+    .then(() => fs.appendFile(logFilePath, line, "utf8"))
     .catch(() => {
       hasWriteFailure = true;
     });
@@ -122,7 +122,7 @@ export function resetDebugLoggingState(): void {
   ensuredDebugDirPath = null;
 }
 
-const DEBUG_LATEST_ALIAS = 'latest';
+const DEBUG_LATEST_ALIAS = "latest";
 
 function updateLatestDebugLogAlias(sessionId: string): void {
   if (!isDebugLogFileEnabled()) {
@@ -145,9 +145,7 @@ function updateLatestDebugLogAlias(sessionId: string): void {
  * This is the default session used when there is no async-local session bound
  * via runWithDebugLogSession().
  */
-export function setDebugLogSession(
-  session: DebugLogSession | null | undefined,
-) {
+export function setDebugLogSession(session: DebugLogSession | null | undefined) {
   globalSession = session ?? null;
   if (session) {
     updateLatestDebugLogAlias(session.getSessionId());
@@ -160,10 +158,7 @@ export function setDebugLogSession(
  * This is optional; createDebugLogger() falls back to the process-wide session
  * set via setDebugLogSession().
  */
-export function runWithDebugLogSession<T>(
-  session: DebugLogSession,
-  fn: () => T,
-): T {
+export function runWithDebugLogSession<T>(session: DebugLogSession, fn: () => T): T {
   return sessionContext.run(session, fn);
 }
 
@@ -179,22 +174,22 @@ export function createDebugLogger(tag?: string): DebugLogger {
     debug: (...args: unknown[]) => {
       const session = getActiveSession();
       if (!session) return;
-      writeLog(session, 'DEBUG', tag, args);
+      writeLog(session, "DEBUG", tag, args);
     },
     info: (...args: unknown[]) => {
       const session = getActiveSession();
       if (!session) return;
-      writeLog(session, 'INFO', tag, args);
+      writeLog(session, "INFO", tag, args);
     },
     warn: (...args: unknown[]) => {
       const session = getActiveSession();
       if (!session) return;
-      writeLog(session, 'WARN', tag, args);
+      writeLog(session, "WARN", tag, args);
     },
     error: (...args: unknown[]) => {
       const session = getActiveSession();
       if (!session) return;
-      writeLog(session, 'ERROR', tag, args);
+      writeLog(session, "ERROR", tag, args);
     },
   };
 }
diff --git a/packages/airiscode-core/src/utils/editHelper.ts b/packages/airiscode-core/src/utils/editHelper.ts
index 797655a2f..15c6e20ec 100644
--- a/packages/airiscode-core/src/utils/editHelper.ts
+++ b/packages/airiscode-core/src/utils/editHelper.ts
@@ -19,45 +19,45 @@
 
 const UNICODE_EQUIVALENT_MAP: Record<string, string> = {
   // Hyphen variations → ASCII hyphen-minus.
-  '\u2010': '-',
-  '\u2011': '-',
-  '\u2012': '-',
-  '\u2013': '-',
-  '\u2014': '-',
-  '\u2015': '-',
-  '\u2212': '-',
+  "\u2010": "-",
+  "\u2011": "-",
+  "\u2012": "-",
+  "\u2013": "-",
+  "\u2014": "-",
+  "\u2015": "-",
+  "\u2212": "-",
   // Curly single quotes → straight apostrophe.
-  '\u2018': "'",
-  '\u2019': "'",
-  '\u201A': "'",
-  '\u201B': "'",
+  "\u2018": "'",
+  "\u2019": "'",
+  "\u201A": "'",
+  "\u201B": "'",
   // Curly double quotes → straight double quote.
-  '\u201C': '"',
-  '\u201D': '"',
-  '\u201E': '"',
-  '\u201F': '"',
+  "\u201C": '"',
+  "\u201D": '"',
+  "\u201E": '"',
+  "\u201F": '"',
   // Whitespace variants → normal space.
-  '\u00A0': ' ',
-  '\u2002': ' ',
-  '\u2003': ' ',
-  '\u2004': ' ',
-  '\u2005': ' ',
-  '\u2006': ' ',
-  '\u2007': ' ',
-  '\u2008': ' ',
-  '\u2009': ' ',
-  '\u200A': ' ',
-  '\u202F': ' ',
-  '\u205F': ' ',
-  '\u3000': ' ',
+  "\u00A0": " ",
+  "\u2002": " ",
+  "\u2003": " ",
+  "\u2004": " ",
+  "\u2005": " ",
+  "\u2006": " ",
+  "\u2007": " ",
+  "\u2008": " ",
+  "\u2009": " ",
+  "\u200A": " ",
+  "\u202F": " ",
+  "\u205F": " ",
+  "\u3000": " ",
 };
 
 function normalizeBasicCharacters(text: string): string {
-  if (text === '') {
+  if (text === "") {
     return text;
   }
 
-  let normalized = '';
+  let normalized = "";
   for (const char of text) {
     normalized += UNICODE_EQUIVALENT_MAP[char] ?? char;
   }
@@ -120,7 +120,7 @@ function buildLineIndex(text: string): {
   lines: string[];
   offsets: number[];
 } {
-  const lines = text.split('\n');
+  const lines = text.split("\n");
   const offsets = new Array<number>(lines.length + 1);
   let cursor = 0;
 
@@ -149,7 +149,7 @@ function sliceFromLines(
   includeTrailingNewline: boolean,
 ): string {
   if (lineCount === 0) {
-    return includeTrailingNewline ? '\n' : '';
+    return includeTrailingNewline ? "\n" : "";
   }
 
   const startIndex = offsets[startLine] ?? 0;
@@ -161,7 +161,7 @@ function sliceFromLines(
     const nextLineStart = offsets[startLine + lineCount];
     if (nextLineStart !== undefined) {
       endIndex = nextLineStart;
-    } else if (text.endsWith('\n')) {
+    } else if (text.endsWith("\n")) {
       endIndex = text.length;
     }
   }
@@ -169,13 +169,10 @@ function sliceFromLines(
   return text.slice(startIndex, endIndex);
 }
 
-function findLineBasedMatch(
-  haystack: string,
-  needle: string,
-): MatchedSliceResult | null {
+function findLineBasedMatch(haystack: string, needle: string): MatchedSliceResult | null {
   const { lines, offsets } = buildLineIndex(haystack);
-  const patternLines = needle.split('\n');
-  const endsWithNewline = needle.endsWith('\n');
+  const patternLines = needle.split("\n");
+  const endsWithNewline = needle.endsWith("\n");
 
   if (patternLines.length === 0) {
     return null;
@@ -188,11 +185,7 @@ function findLineBasedMatch(
         return idx;
       }
     }
-    return seekSequenceWithTransform(
-      lines,
-      candidate,
-      normalizeLineForComparison,
-    );
+    return seekSequenceWithTransform(lines, candidate, normalizeLineForComparison);
   };
 
   let matchIndex = attemptMatch(patternLines);
@@ -210,7 +203,7 @@ function findLineBasedMatch(
     };
   }
 
-  if (patternLines.at(-1) === '') {
+  if (patternLines.at(-1) === "") {
     const trimmedPattern = patternLines.slice(0, -1);
     if (trimmedPattern.length === 0) {
       return null;
@@ -218,14 +211,7 @@ function findLineBasedMatch(
     matchIndex = attemptMatch(trimmedPattern);
     if (matchIndex !== null) {
       return {
-        slice: sliceFromLines(
-          haystack,
-          offsets,
-          lines,
-          matchIndex,
-          trimmedPattern.length,
-          false,
-        ),
+        slice: sliceFromLines(haystack, offsets, lines, matchIndex, trimmedPattern.length, false),
         removedTrailingFinalEmptyLine: true,
       };
     }
@@ -238,11 +224,8 @@ function findLineBasedMatch(
 /* Slice discovery                                                           */
 /* -------------------------------------------------------------------------- */
 
-function findMatchedSlice(
-  haystack: string,
-  needle: string,
-): MatchedSliceResult | null {
-  if (needle === '') {
+function findMatchedSlice(haystack: string, needle: string): MatchedSliceResult | null {
+  if (needle === "") {
     return null;
   }
 
@@ -276,19 +259,16 @@ function findMatchedSlice(
 /* -------------------------------------------------------------------------- */
 
 function removeTrailingNewline(text: string): string {
-  if (text.endsWith('\r\n')) {
+  if (text.endsWith("\r\n")) {
     return text.slice(0, -2);
   }
-  if (text.endsWith('\n') || text.endsWith('\r')) {
+  if (text.endsWith("\n") || text.endsWith("\r")) {
     return text.slice(0, -1);
   }
   return text;
 }
 
-function adjustNewStringForTrailingLine(
-  newString: string,
-  removedTrailingLine: boolean,
-): string {
+function adjustNewStringForTrailingLine(newString: string, removedTrailingLine: boolean): string {
   return removedTrailingLine ? removeTrailingNewline(newString) : newString;
 }
 
@@ -315,7 +295,7 @@ export function normalizeEditStrings(
   oldString: string,
   newString: string,
 ): NormalizedEditStrings {
-  if (fileContent === null || oldString === '') {
+  if (fileContent === null || oldString === "") {
     return {
       oldString,
       newString,
@@ -349,12 +329,7 @@ export function maybeAugmentOldStringForDeletion(
   oldString: string,
   newString: string,
 ): string {
-  if (
-    fileContent === null ||
-    oldString === '' ||
-    newString !== '' ||
-    oldString.endsWith('\n')
-  ) {
+  if (fileContent === null || oldString === "" || newString !== "" || oldString.endsWith("\n")) {
     return oldString;
   }
 
@@ -367,7 +342,7 @@ export function maybeAugmentOldStringForDeletion(
  * {@link source}. Returns 0 when the substring is empty.
  */
 export function countOccurrences(source: string, substr: string): number {
-  if (substr === '') {
+  if (substr === "") {
     return 0;
   }
 
@@ -411,7 +386,7 @@ export function extractEditSnippet(
   oldContent: string | null,
   newContent: string,
 ): EditSnippetResult | null {
-  const newLines = newContent.split('\n');
+  const newLines = newContent.split("\n");
   const totalLines = newLines.length;
 
   if (oldContent === null) {
@@ -428,7 +403,7 @@ export function extractEditSnippet(
     return null;
   }
 
-  const oldLines = oldContent.split('\n');
+  const oldLines = oldContent.split("\n");
 
   // Find the first line that differs from the start
   let firstDiffLine = 0;
@@ -473,6 +448,6 @@ export function extractEditSnippet(
     startLine: snippetStart,
     endLine: snippetEnd,
     totalLines,
-    content: snippetLines.join('\n'),
+    content: snippetLines.join("\n"),
   };
 }
diff --git a/packages/airiscode-core/src/utils/editor.ts b/packages/airiscode-core/src/utils/editor.ts
index 70f574ab4..ce7f3edbf 100644
--- a/packages/airiscode-core/src/utils/editor.ts
+++ b/packages/airiscode-core/src/utils/editor.ts
@@ -4,33 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync, spawn, spawnSync } from 'node:child_process';
-import { createDebugLogger } from './debugLogger.js';
+import { execSync, spawn, spawnSync } from "node:child_process";
+import { createDebugLogger } from "./debugLogger.js";
 
-const debugLogger = createDebugLogger('EDITOR');
+const debugLogger = createDebugLogger("EDITOR");
 
 export type EditorType =
-  | 'vscode'
-  | 'vscodium'
-  | 'windsurf'
-  | 'cursor'
-  | 'vim'
-  | 'neovim'
-  | 'zed'
-  | 'emacs'
-  | 'trae';
+  | "vscode"
+  | "vscodium"
+  | "windsurf"
+  | "cursor"
+  | "vim"
+  | "neovim"
+  | "zed"
+  | "emacs"
+  | "trae";
 
 function isValidEditorType(editor: string): editor is EditorType {
   return [
-    'vscode',
-    'vscodium',
-    'windsurf',
-    'cursor',
-    'vim',
-    'neovim',
-    'zed',
-    'emacs',
-    'trae',
+    "vscode",
+    "vscodium",
+    "windsurf",
+    "cursor",
+    "vim",
+    "neovim",
+    "zed",
+    "emacs",
+    "trae",
   ].includes(editor);
 }
 
@@ -41,10 +41,9 @@ interface DiffCommand {
 
 export function commandExists(cmd: string): boolean {
   try {
-    execSync(
-      process.platform === 'win32' ? `where.exe ${cmd}` : `command -v ${cmd}`,
-      { stdio: 'ignore' },
-    );
+    execSync(process.platform === "win32" ? `where.exe ${cmd}` : `command -v ${cmd}`, {
+      stdio: "ignore",
+    });
     return true;
   } catch {
     return false;
@@ -55,33 +54,27 @@ export function commandExists(cmd: string): boolean {
  * Editor command configurations for different platforms.
  * Each editor can have multiple possible command names, listed in order of preference.
  */
-export const editorCommands: Record<
-  EditorType,
-  { win32: string[]; default: string[] }
-> = {
-  vscode: { win32: ['code.cmd'], default: ['code'] },
-  vscodium: { win32: ['codium.cmd'], default: ['codium'] },
-  windsurf: { win32: ['windsurf'], default: ['windsurf'] },
-  cursor: { win32: ['cursor'], default: ['cursor'] },
-  vim: { win32: ['vim'], default: ['vim'] },
-  neovim: { win32: ['nvim'], default: ['nvim'] },
-  zed: { win32: ['zed'], default: ['zed', 'zeditor'] },
-  emacs: { win32: ['emacs.exe'], default: ['emacs'] },
-  trae: { win32: ['trae'], default: ['trae'] },
+export const editorCommands: Record<EditorType, { win32: string[]; default: string[] }> = {
+  vscode: { win32: ["code.cmd"], default: ["code"] },
+  vscodium: { win32: ["codium.cmd"], default: ["codium"] },
+  windsurf: { win32: ["windsurf"], default: ["windsurf"] },
+  cursor: { win32: ["cursor"], default: ["cursor"] },
+  vim: { win32: ["vim"], default: ["vim"] },
+  neovim: { win32: ["nvim"], default: ["nvim"] },
+  zed: { win32: ["zed"], default: ["zed", "zeditor"] },
+  emacs: { win32: ["emacs.exe"], default: ["emacs"] },
+  trae: { win32: ["trae"], default: ["trae"] },
 };
 
 export function checkHasEditorType(editor: EditorType): boolean {
   const commandConfig = editorCommands[editor];
-  const commands =
-    process.platform === 'win32' ? commandConfig.win32 : commandConfig.default;
+  const commands = process.platform === "win32" ? commandConfig.win32 : commandConfig.default;
   return commands.some((cmd) => commandExists(cmd));
 }
 
 export function allowEditorTypeInSandbox(editor: EditorType): boolean {
-  const notUsingSandbox = !process.env['SANDBOX'];
-  if (
-    ['vscode', 'vscodium', 'windsurf', 'cursor', 'zed', 'trae'].includes(editor)
-  ) {
+  const notUsingSandbox = !process.env["SANDBOX"];
+  if (["vscode", "vscodium", "windsurf", "cursor", "zed", "trae"].includes(editor)) {
     return notUsingSandbox;
   }
   // For terminal-based editors like vim and emacs, allow in sandbox.
@@ -111,53 +104,51 @@ export function getDiffCommand(
     return null;
   }
   const commandConfig = editorCommands[editor];
-  const commands =
-    process.platform === 'win32' ? commandConfig.win32 : commandConfig.default;
+  const commands = process.platform === "win32" ? commandConfig.win32 : commandConfig.default;
   const command =
-    commands.slice(0, -1).find((cmd) => commandExists(cmd)) ||
-    commands[commands.length - 1];
+    commands.slice(0, -1).find((cmd) => commandExists(cmd)) || commands[commands.length - 1];
 
   switch (editor) {
-    case 'vscode':
-    case 'vscodium':
-    case 'windsurf':
-    case 'cursor':
-    case 'zed':
-    case 'trae':
-      return { command, args: ['--wait', '--diff', oldPath, newPath] };
-    case 'vim':
-    case 'neovim':
+    case "vscode":
+    case "vscodium":
+    case "windsurf":
+    case "cursor":
+    case "zed":
+    case "trae":
+      return { command, args: ["--wait", "--diff", oldPath, newPath] };
+    case "vim":
+    case "neovim":
       return {
         command,
         args: [
-          '-d',
+          "-d",
           // skip viminfo file to avoid E138 errors
-          '-i',
-          'NONE',
+          "-i",
+          "NONE",
           // make the left window read-only and the right window editable
-          '-c',
-          'wincmd h | set readonly | wincmd l',
+          "-c",
+          "wincmd h | set readonly | wincmd l",
           // set up colors for diffs
-          '-c',
-          'highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000',
+          "-c",
+          "highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000",
           // Show helpful messages
-          '-c',
-          'set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
-          '-c',
-          'wincmd h | setlocal statusline=OLD\\ FILE',
-          '-c',
-          'wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
+          "-c",
+          "set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
+          "-c",
+          "wincmd h | setlocal statusline=OLD\\ FILE",
+          "-c",
+          "wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
           // Auto close all windows when one is closed
-          '-c',
-          'autocmd BufWritePost * wqa',
+          "-c",
+          "autocmd BufWritePost * wqa",
           oldPath,
           newPath,
         ],
       };
-    case 'emacs':
+    case "emacs":
       return {
-        command: 'emacs',
-        args: ['--eval', `(ediff "${oldPath}" "${newPath}")`],
+        command: "emacs",
+        args: ["--eval", `(ediff "${oldPath}" "${newPath}")`],
       };
     default:
       return null;
@@ -177,17 +168,17 @@ export async function openDiff(
 ): Promise<void> {
   const diffCommand = getDiffCommand(oldPath, newPath, editor);
   if (!diffCommand) {
-    debugLogger.error('No diff tool available. Install a supported editor.');
+    debugLogger.error("No diff tool available. Install a supported editor.");
     return;
   }
 
   try {
-    const isTerminalEditor = ['vim', 'emacs', 'neovim'].includes(editor);
+    const isTerminalEditor = ["vim", "emacs", "neovim"].includes(editor);
 
     if (isTerminalEditor) {
       try {
         const result = spawnSync(diffCommand.command, diffCommand.args, {
-          stdio: 'inherit',
+          stdio: "inherit",
         });
         if (result.error) {
           throw result.error;
@@ -203,11 +194,11 @@ export async function openDiff(
 
     return new Promise<void>((resolve, reject) => {
       const childProcess = spawn(diffCommand.command, diffCommand.args, {
-        stdio: 'inherit',
-        shell: process.platform === 'win32',
+        stdio: "inherit",
+        shell: process.platform === "win32",
       });
 
-      childProcess.on('close', (code) => {
+      childProcess.on("close", (code) => {
         if (code === 0) {
           resolve();
         } else {
@@ -215,7 +206,7 @@ export async function openDiff(
         }
       });
 
-      childProcess.on('error', (error) => {
+      childProcess.on("error", (error) => {
         reject(error);
       });
     });
diff --git a/packages/airiscode-core/src/utils/envVarResolver.ts b/packages/airiscode-core/src/utils/envVarResolver.ts
index 096b5549e..5135e09eb 100644
--- a/packages/airiscode-core/src/utils/envVarResolver.ts
+++ b/packages/airiscode-core/src/utils/envVarResolver.ts
@@ -17,17 +17,14 @@
  * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
  * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
  */
-export function resolveEnvVarsInString(
-  value: string,
-  customEnv?: Record<string, string>,
-): string {
+export function resolveEnvVarsInString(value: string, customEnv?: Record<string, string>): string {
   const envVarRegex = /\$(?:(\w+)|{([^}]+)})/g; // Find $VAR_NAME or ${VAR_NAME}
   return value.replace(envVarRegex, (match, varName1, varName2) => {
     const varName = varName1 || varName2;
-    if (customEnv && typeof customEnv[varName] === 'string') {
+    if (customEnv && typeof customEnv[varName] === "string") {
       return customEnv[varName];
     }
-    if (process && process.env && typeof process.env[varName] === 'string') {
+    if (process && process.env && typeof process.env[varName] === "string") {
       return process.env[varName]!;
     }
     return match;
@@ -53,10 +50,7 @@ export function resolveEnvVarsInString(
  * };
  * const resolved = resolveEnvVarsInObject(config);
  */
-export function resolveEnvVarsInObject<T>(
-  obj: T,
-  customEnv?: Record<string, string>,
-): T {
+export function resolveEnvVarsInObject<T>(obj: T, customEnv?: Record<string, string>): T {
   return resolveEnvVarsInObjectInternal(obj, new WeakSet(), customEnv);
 }
 
@@ -72,16 +66,11 @@ function resolveEnvVarsInObjectInternal<T>(
   visited: WeakSet<object>,
   customEnv?: Record<string, string>,
 ): T {
-  if (
-    obj === null ||
-    obj === undefined ||
-    typeof obj === 'boolean' ||
-    typeof obj === 'number'
-  ) {
+  if (obj === null || obj === undefined || typeof obj === "boolean" || typeof obj === "number") {
     return obj;
   }
 
-  if (typeof obj === 'string') {
+  if (typeof obj === "string") {
     return resolveEnvVarsInString(obj, customEnv) as unknown as T;
   }
 
@@ -100,7 +89,7 @@ function resolveEnvVarsInObjectInternal<T>(
     return result;
   }
 
-  if (typeof obj === 'object') {
+  if (typeof obj === "object") {
     // Check for circular reference
     if (visited.has(obj as object)) {
       // Return a shallow copy to break the cycle
@@ -110,12 +99,8 @@ function resolveEnvVarsInObjectInternal<T>(
     visited.add(obj as object);
     const newObj = { ...obj } as T;
     for (const key in newObj) {
-      if (Object.prototype.hasOwnProperty.call(newObj, key)) {
-        newObj[key] = resolveEnvVarsInObjectInternal(
-          newObj[key],
-          visited,
-          customEnv,
-        );
+      if (Object.hasOwn(newObj as object, key)) {
+        newObj[key] = resolveEnvVarsInObjectInternal(newObj[key], visited, customEnv);
       }
     }
     visited.delete(obj as object);
diff --git a/packages/airiscode-core/src/utils/environmentContext.ts b/packages/airiscode-core/src/utils/environmentContext.ts
index e44ef37b2..9068768b1 100644
--- a/packages/airiscode-core/src/utils/environmentContext.ts
+++ b/packages/airiscode-core/src/utils/environmentContext.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content, Part } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import { getFolderStructure } from './getFolderStructure.js';
+import type { Config } from "../config/config.js";
+import type { Content, Part } from "../types/llm.js";
+import { getFolderStructure } from "./getFolderStructure.js";
 
 /**
  * Generates a string describing the current workspace directories and their structures.
  * @param {Config} config - The runtime configuration and services.
  * @returns {Promise<string>} A promise that resolves to the directory context string.
  */
-export async function getDirectoryContextString(
-  config: Config,
-): Promise<string> {
+export async function getDirectoryContextString(config: Config): Promise<string> {
   const workspaceContext = config.getWorkspaceContext();
   const workspaceDirectories = workspaceContext.getDirectories();
 
@@ -27,13 +25,13 @@ export async function getDirectoryContextString(
     ),
   );
 
-  const folderStructure = folderStructures.join('\n');
+  const folderStructure = folderStructures.join("\n");
 
   let workingDirPreamble: string;
   if (workspaceDirectories.length === 1) {
     workingDirPreamble = `I'm currently working in the directory: ${workspaceDirectories[0]}`;
   } else {
-    const dirList = workspaceDirectories.map((dir) => `  - ${dir}`).join('\n');
+    const dirList = workspaceDirectories.map((dir) => `  - ${dir}`).join("\n");
     workingDirPreamble = `I'm currently working in the following directories:\n${dirList}`;
   }
 
@@ -51,10 +49,10 @@ ${folderStructure}`;
  */
 export async function getEnvironmentContext(config: Config): Promise<Part[]> {
   const today = new Date().toLocaleDateString(undefined, {
-    weekday: 'long',
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
+    weekday: "long",
+    year: "numeric",
+    month: "long",
+    day: "numeric",
   });
   const platform = process.platform;
   const directoryContext = await getDirectoryContextString(config);
@@ -69,7 +67,7 @@ ${directoryContext}
   return [{ text: context }];
 }
 
-const STARTUP_CONTEXT_MODEL_ACK = 'Got it. Thanks for the context!';
+const STARTUP_CONTEXT_MODEL_ACK = "Got it. Thanks for the context!";
 
 export async function getInitialChatHistory(
   config: Config,
@@ -80,15 +78,15 @@ export async function getInitialChatHistory(
   }
 
   const envParts = await getEnvironmentContext(config);
-  const envContextString = envParts.map((part) => part.text || '').join('\n\n');
+  const envContextString = envParts.map((part) => part.text || "").join("\n\n");
 
   return [
     {
-      role: 'user',
+      role: "user",
       parts: [{ text: envContextString }],
     },
     {
-      role: 'model',
+      role: "model",
       parts: [{ text: STARTUP_CONTEXT_MODEL_ACK }],
     },
     ...(extraHistory ?? []),
@@ -106,7 +104,7 @@ export function stripStartupContext(history: Content[]): Content[] {
 
   const secondEntry = history[1];
   const ackText = secondEntry?.parts?.[0]?.text;
-  if (secondEntry?.role === 'model' && ackText === STARTUP_CONTEXT_MODEL_ACK) {
+  if (secondEntry?.role === "model" && ackText === STARTUP_CONTEXT_MODEL_ACK) {
     return history.slice(2);
   }
 
diff --git a/packages/airiscode-core/src/utils/errorParsing.ts b/packages/airiscode-core/src/utils/errorParsing.ts
index 787dd196e..49e7c8fcd 100644
--- a/packages/airiscode-core/src/utils/errorParsing.ts
+++ b/packages/airiscode-core/src/utils/errorParsing.ts
@@ -4,20 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isApiError, isStructuredError } from './quotaErrorDetection.js';
-import { AuthType } from '../core/contentGenerator.js';
+import { AuthType } from "../core/contentGenerator.js";
+import { isApiError, isStructuredError } from "./quotaErrorDetection.js";
 
 const RATE_LIMIT_ERROR_MESSAGE_DEFAULT =
-  '\nPossible quota limitations in place or slow response times detected. Please wait and try again later.';
+  "\nPossible quota limitations in place or slow response times detected. Please wait and try again later.";
 
 function getRateLimitMessage(_authType?: AuthType): string {
   return RATE_LIMIT_ERROR_MESSAGE_DEFAULT;
 }
 
-export function parseAndFormatApiError(
-  error: unknown,
-  authType?: AuthType,
-): string {
+export function parseAndFormatApiError(error: unknown, authType?: AuthType): string {
   if (isStructuredError(error)) {
     let text = `[API Error: ${error.message}]`;
     if (error.status === 429) {
@@ -27,8 +24,8 @@ export function parseAndFormatApiError(
   }
 
   // The error message might be a string containing a JSON object.
-  if (typeof error === 'string') {
-    const jsonStart = error.indexOf('{');
+  if (typeof error === "string") {
+    const jsonStart = error.indexOf("{");
     if (jsonStart === -1) {
       return `[API Error: ${error}]`; // Not a JSON error, return as is.
     }
@@ -48,9 +45,7 @@ export function parseAndFormatApiError(
         } catch (_e) {
           // It's not a nested JSON error, so we just use the message as is.
         }
-        const statusText = parsedError.error.status
-          ? ` (Status: ${parsedError.error.status})`
-          : '';
+        const statusText = parsedError.error.status ? ` (Status: ${parsedError.error.status})` : "";
         let text = `[API Error: ${finalMessage}${statusText}]`;
         if (parsedError.error.code === 429) {
           text += getRateLimitMessage(authType);
@@ -63,5 +58,5 @@ export function parseAndFormatApiError(
     return `[API Error: ${error}]`;
   }
 
-  return '[API Error: An unknown error occurred.]';
+  return "[API Error: An unknown error occurred.]";
 }
diff --git a/packages/airiscode-core/src/utils/errorReporting.ts b/packages/airiscode-core/src/utils/errorReporting.ts
index 2e10db0a2..a85d51e21 100644
--- a/packages/airiscode-core/src/utils/errorReporting.ts
+++ b/packages/airiscode-core/src/utils/errorReporting.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '../types/llm.js';
-import { createDebugLogger } from './debugLogger.js';
+import type { Content } from "../types/llm.js";
+import { createDebugLogger } from "./debugLogger.js";
 
-const debugLogger = createDebugLogger('ERROR_REPORT');
+const debugLogger = createDebugLogger("ERROR_REPORT");
 
 interface ErrorReportData {
   error: { message: string; stack?: string } | { message: string };
@@ -26,16 +26,12 @@ export async function reportError(
   error: Error | unknown,
   baseMessage: string,
   context?: Content[] | Record<string, unknown> | unknown[],
-  type = 'general',
+  type = "general",
 ): Promise<void> {
   let errorToReport: { message: string; stack?: string };
   if (error instanceof Error) {
     errorToReport = { message: error.message, stack: error.stack };
-  } else if (
-    typeof error === 'object' &&
-    error !== null &&
-    'message' in error
-  ) {
+  } else if (typeof error === "object" && error !== null && "message" in error) {
     errorToReport = {
       message: String((error as { message: unknown }).message),
     };
diff --git a/packages/airiscode-core/src/utils/errors.ts b/packages/airiscode-core/src/utils/errors.ts
index 790123508..67111dc3d 100644
--- a/packages/airiscode-core/src/utils/errors.ts
+++ b/packages/airiscode-core/src/utils/errors.ts
@@ -11,7 +11,7 @@ interface GaxiosError {
 }
 
 export function isNodeError(error: unknown): error is NodeJS.ErrnoException {
-  return error instanceof Error && 'code' in error;
+  return error instanceof Error && "code" in error;
 }
 
 /**
@@ -19,17 +19,17 @@ export function isNodeError(error: unknown): error is NodeJS.ErrnoException {
  * This handles both DOMException-style AbortError and Node.js abort errors.
  */
 export function isAbortError(error: unknown): boolean {
-  if (!error || typeof error !== 'object') {
+  if (!error || typeof error !== "object") {
     return false;
   }
 
   // Check for AbortError by name (standard DOMException and custom AbortError)
-  if (error instanceof Error && error.name === 'AbortError') {
+  if (error instanceof Error && error.name === "AbortError") {
     return true;
   }
 
   // Check for Node.js abort error code
-  if (isNodeError(error) && error.code === 'ABORT_ERR') {
+  if (isNodeError(error) && error.code === "ABORT_ERR") {
     return true;
   }
 
@@ -47,7 +47,7 @@ export function getErrorMessage(error: unknown): string {
   try {
     return String(error);
   } catch {
-    return 'Failed to get error details';
+    return "Failed to get error details";
   }
 }
 
@@ -63,7 +63,7 @@ export function getErrorMessage(error: unknown): string {
  * @returns The HTTP status code (100-599), or undefined if not found.
  */
 export function getErrorStatus(error: unknown): number | undefined {
-  if (typeof error !== 'object' || error === null) {
+  if (typeof error !== "object" || error === null) {
     return undefined;
   }
 
@@ -74,12 +74,9 @@ export function getErrorStatus(error: unknown): number | undefined {
     error?: { code?: unknown };
   };
 
-  const value =
-    err.status ?? err.statusCode ?? err.response?.status ?? err.error?.code;
+  const value = err.status ?? err.statusCode ?? err.response?.status ?? err.error?.code;
 
-  return typeof value === 'number' && value >= 100 && value <= 599
-    ? value
-    : undefined;
+  return typeof value === "number" && value >= 100 && value <= 599 ? value : undefined;
 }
 
 /**
@@ -96,29 +93,26 @@ export function getErrorStatus(error: unknown): number | undefined {
  * @returns A string identifying the error type.
  */
 export function getErrorType(error: unknown): string {
-  if (typeof error !== 'object' || error === null) {
-    return 'unknown';
+  if (typeof error !== "object" || error === null) {
+    return "unknown";
   }
 
   // Prefer the constructor name — SDK subclasses like APIConnectionError,
   // RateLimitError etc. have meaningful names.
   const constructorName =
-    error instanceof Error && error.constructor.name !== 'Error'
+    error instanceof Error && error.constructor.name !== "Error"
       ? error.constructor.name
       : undefined;
 
   // .type is set by OpenAI SDK (e.g. "invalid_request_error")
   const sdkType = (error as { type?: string }).type;
 
-  const baseType =
-    constructorName ??
-    sdkType ??
-    (error instanceof Error ? error.name : 'unknown');
+  const baseType = constructorName ?? sdkType ?? (error instanceof Error ? error.name : "unknown");
 
   // For network errors, append the cause code (e.g. ECONNREFUSED, ETIMEDOUT)
   const cause = error instanceof Error ? error.cause : undefined;
   const causeCode =
-    cause && typeof cause === 'object' && 'code' in cause
+    cause && typeof cause === "object" && "code" in cause
       ? (cause as { code?: string }).code
       : undefined;
 
@@ -182,7 +176,7 @@ interface ResponseData {
 }
 
 export function toFriendlyError(error: unknown): unknown {
-  if (error && typeof error === 'object' && 'response' in error) {
+  if (error && typeof error === "object" && "response" in error) {
     const gaxiosError = error as GaxiosError;
     const data = parseResponseData(gaxiosError);
     if (data.error && data.error.message && data.error.code) {
@@ -205,7 +199,7 @@ export function toFriendlyError(error: unknown): unknown {
 
 function parseResponseData(error: GaxiosError): ResponseData {
   // Inexplicably, Gaxios sometimes doesn't JSONify the response data.
-  if (typeof error.response?.data === 'string') {
+  if (typeof error.response?.data === "string") {
     return JSON.parse(error.response?.data) as ResponseData;
   }
   return error.response?.data as ResponseData;
diff --git a/packages/airiscode-core/src/utils/fetch.ts b/packages/airiscode-core/src/utils/fetch.ts
index 2766672f7..a8fb9852b 100644
--- a/packages/airiscode-core/src/utils/fetch.ts
+++ b/packages/airiscode-core/src/utils/fetch.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getErrorMessage, isNodeError } from './errors.js';
-import { URL } from 'node:url';
+import { URL } from "node:url";
+import { getErrorMessage, isNodeError } from "./errors.js";
 
 const PRIVATE_IP_RANGES = [
   /^10\./,
@@ -18,23 +18,23 @@ const PRIVATE_IP_RANGES = [
 ];
 
 const TLS_ERROR_CODES = new Set([
-  'UNABLE_TO_GET_ISSUER_CERT_LOCALLY',
-  'UNABLE_TO_VERIFY_LEAF_SIGNATURE',
-  'SELF_SIGNED_CERT_IN_CHAIN',
-  'DEPTH_ZERO_SELF_SIGNED_CERT',
-  'CERT_HAS_EXPIRED',
-  'ERR_TLS_CERT_ALTNAME_INVALID',
+  "UNABLE_TO_GET_ISSUER_CERT_LOCALLY",
+  "UNABLE_TO_VERIFY_LEAF_SIGNATURE",
+  "SELF_SIGNED_CERT_IN_CHAIN",
+  "DEPTH_ZERO_SELF_SIGNED_CERT",
+  "CERT_HAS_EXPIRED",
+  "ERR_TLS_CERT_ALTNAME_INVALID",
 ]);
 
 const FETCH_TROUBLESHOOTING_ERROR_CODES = new Set([
   ...TLS_ERROR_CODES,
-  'ECONNRESET',
-  'ETIMEDOUT',
-  'ECONNREFUSED',
-  'ENOTFOUND',
-  'EAI_AGAIN',
-  'EHOSTUNREACH',
-  'ENETUNREACH',
+  "ECONNRESET",
+  "ETIMEDOUT",
+  "ECONNREFUSED",
+  "ENOTFOUND",
+  "EAI_AGAIN",
+  "EHOSTUNREACH",
+  "ENETUNREACH",
 ]);
 
 export class FetchError extends Error {
@@ -43,7 +43,7 @@ export class FetchError extends Error {
     public code?: string,
   ) {
     super(message);
-    this.name = 'FetchError';
+    this.name = "FetchError";
   }
 }
 
@@ -56,10 +56,7 @@ export function isPrivateIp(url: string): boolean {
   }
 }
 
-export async function fetchWithTimeout(
-  url: string,
-  timeout: number,
-): Promise<Response> {
+export async function fetchWithTimeout(url: string, timeout: number): Promise<Response> {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), timeout);
 
@@ -67,8 +64,8 @@ export async function fetchWithTimeout(
     const response = await fetch(url, { signal: controller.signal });
     return response;
   } catch (error) {
-    if (isNodeError(error) && error.code === 'ABORT_ERR') {
-      throw new FetchError(`Request timed out after ${timeout}ms`, 'ETIMEDOUT');
+    if (isNodeError(error) && error.code === "ABORT_ERR") {
+      throw new FetchError(`Request timed out after ${timeout}ms`, "ETIMEDOUT");
     }
     throw new FetchError(getErrorMessage(error));
   } finally {
@@ -77,30 +74,23 @@ export async function fetchWithTimeout(
 }
 
 function getErrorCode(error: unknown): string | undefined {
-  if (!error || typeof error !== 'object') {
+  if (!error || typeof error !== "object") {
     return undefined;
   }
 
-  if (
-    'code' in error &&
-    typeof (error as Record<string, unknown>)['code'] === 'string'
-  ) {
-    return (error as Record<string, string>)['code'];
+  if ("code" in error && typeof (error as Record<string, unknown>)["code"] === "string") {
+    return (error as Record<string, string>)["code"];
   }
 
   return undefined;
 }
 
 function formatUnknownErrorMessage(error: unknown): string | undefined {
-  if (typeof error === 'string') {
+  if (typeof error === "string") {
     return error;
   }
 
-  if (
-    typeof error === 'number' ||
-    typeof error === 'boolean' ||
-    typeof error === 'bigint'
-  ) {
+  if (typeof error === "number" || typeof error === "boolean" || typeof error === "bigint") {
     return String(error);
   }
 
@@ -108,12 +98,12 @@ function formatUnknownErrorMessage(error: unknown): string | undefined {
     return error.message;
   }
 
-  if (!error || typeof error !== 'object') {
+  if (!error || typeof error !== "object") {
     return undefined;
   }
 
-  const message = (error as Record<string, unknown>)['message'];
-  if (typeof message === 'string') {
+  const message = (error as Record<string, unknown>)["message"];
+  if (typeof message === "string") {
     return message;
   }
 
@@ -144,28 +134,21 @@ function formatErrorCause(error: unknown): string | undefined {
   return causeMessage ?? causeCode;
 }
 
-export function formatFetchErrorForUser(
-  error: unknown,
-  options: { url?: string } = {},
-): string {
+export function formatFetchErrorForUser(error: unknown, options: { url?: string } = {}): string {
   const errorMessage = getErrorMessage(error);
 
   const code =
     error instanceof Error
-      ? (getErrorCode((error as Error & { cause?: unknown }).cause) ??
-        getErrorCode(error))
+      ? (getErrorCode((error as Error & { cause?: unknown }).cause) ?? getErrorCode(error))
       : getErrorCode(error);
 
   const cause = formatErrorCause(error);
-  const fullErrorMessage = [
-    errorMessage,
-    cause ? `(cause: ${cause})` : undefined,
-  ]
+  const fullErrorMessage = [errorMessage, cause ? `(cause: ${cause})` : undefined]
     .filter(Boolean)
-    .join(' ');
+    .join(" ");
 
   const shouldShowFetchHints =
-    errorMessage.toLowerCase().includes('fetch failed') ||
+    errorMessage.toLowerCase().includes("fetch failed") ||
     (code != null && FETCH_TROUBLESHOOTING_ERROR_CODES.has(code));
 
   const shouldShowTlsHint = code != null && TLS_ERROR_CODES.has(code);
@@ -175,18 +158,16 @@ export function formatFetchErrorForUser(
   }
 
   const hintLines = [
-    '',
-    'Troubleshooting:',
-    ...(options.url
-      ? [`- Confirm you can reach ${options.url} from this machine.`]
-      : []),
-    '- If you are behind a proxy, pass `--proxy <url>` (or set `proxy` in settings).',
+    "",
+    "Troubleshooting:",
+    ...(options.url ? [`- Confirm you can reach ${options.url} from this machine.`] : []),
+    "- If you are behind a proxy, pass `--proxy <url>` (or set `proxy` in settings).",
     ...(shouldShowTlsHint
       ? [
-          '- If your network uses a corporate TLS inspection CA, set `NODE_EXTRA_CA_CERTS` to your CA bundle.',
+          "- If your network uses a corporate TLS inspection CA, set `NODE_EXTRA_CA_CERTS` to your CA bundle.",
         ]
       : []),
   ];
 
-  return `${fullErrorMessage}${hintLines.join('\n')}`;
+  return `${fullErrorMessage}${hintLines.join("\n")}`;
 }
diff --git a/packages/airiscode-core/src/utils/fileUtils.ts b/packages/airiscode-core/src/utils/fileUtils.ts
index c125cc99f..97e2bb3e2 100644
--- a/packages/airiscode-core/src/utils/fileUtils.ts
+++ b/packages/airiscode-core/src/utils/fileUtils.ts
@@ -4,31 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import type { PartUnion } from '../types/llm.js';
-import mime from 'mime/lite';
-import {
-  iconvDecode,
-  iconvEncodingExists,
-  isUtf8CompatibleEncoding,
-} from './iconvHelper.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import { BINARY_EXTENSIONS } from './ignorePatterns.js';
-import type { Config } from '../config/config.js';
-import { createDebugLogger } from './debugLogger.js';
-import type { InputModalities } from '../core/contentGenerator.js';
-import { detectEncodingFromBuffer } from './systemEncoding.js';
-
-const debugLogger = createDebugLogger('FILE_UTILS');
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import path from "node:path";
+import mime from "mime/lite";
+import type { Config } from "../config/config.js";
+import type { InputModalities } from "../core/contentGenerator.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import type { PartUnion } from "../types/llm.js";
+import { createDebugLogger } from "./debugLogger.js";
+import { iconvDecode, iconvEncodingExists, isUtf8CompatibleEncoding } from "./iconvHelper.js";
+import { BINARY_EXTENSIONS } from "./ignorePatterns.js";
+import { detectEncodingFromBuffer } from "./systemEncoding.js";
+
+const debugLogger = createDebugLogger("FILE_UTILS");
 
 // Default values for encoding and separator format
-export const DEFAULT_ENCODING: BufferEncoding = 'utf-8';
+export const DEFAULT_ENCODING: BufferEncoding = "utf-8";
 
 // --- Unicode BOM detection & decoding helpers --------------------------------
 
-type UnicodeEncoding = 'utf8' | 'utf16le' | 'utf16be' | 'utf32le' | 'utf32be';
+type UnicodeEncoding = "utf8" | "utf16le" | "utf16be" | "utf32le" | "utf32be";
 
 interface BOMInfo {
   encoding: UnicodeEncoding;
@@ -42,28 +38,18 @@ interface BOMInfo {
 export function detectBOM(buf: Buffer): BOMInfo | null {
   if (buf.length >= 4) {
     // UTF-32 LE: FF FE 00 00
-    if (
-      buf[0] === 0xff &&
-      buf[1] === 0xfe &&
-      buf[2] === 0x00 &&
-      buf[3] === 0x00
-    ) {
-      return { encoding: 'utf32le', bomLength: 4 };
+    if (buf[0] === 0xff && buf[1] === 0xfe && buf[2] === 0x00 && buf[3] === 0x00) {
+      return { encoding: "utf32le", bomLength: 4 };
     }
     // UTF-32 BE: 00 00 FE FF
-    if (
-      buf[0] === 0x00 &&
-      buf[1] === 0x00 &&
-      buf[2] === 0xfe &&
-      buf[3] === 0xff
-    ) {
-      return { encoding: 'utf32be', bomLength: 4 };
+    if (buf[0] === 0x00 && buf[1] === 0x00 && buf[2] === 0xfe && buf[3] === 0xff) {
+      return { encoding: "utf32be", bomLength: 4 };
     }
   }
   if (buf.length >= 3) {
     // UTF-8: EF BB BF
     if (buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) {
-      return { encoding: 'utf8', bomLength: 3 };
+      return { encoding: "utf8", bomLength: 3 };
     }
   }
   if (buf.length >= 2) {
@@ -73,11 +59,11 @@ export function detectBOM(buf: Buffer): BOMInfo | null {
       buf[1] === 0xfe &&
       (buf.length < 4 || buf[2] !== 0x00 || buf[3] !== 0x00)
     ) {
-      return { encoding: 'utf16le', bomLength: 2 };
+      return { encoding: "utf16le", bomLength: 2 };
     }
     // UTF-16 BE: FE FF
     if (buf[0] === 0xfe && buf[1] === 0xff) {
-      return { encoding: 'utf16be', bomLength: 2 };
+      return { encoding: "utf16be", bomLength: 2 };
     }
   }
   return null;
@@ -88,10 +74,10 @@ export function detectBOM(buf: Buffer): BOMInfo | null {
  * (Node has 'utf16le' but not 'utf16be'.)
  */
 function decodeUTF16BE(buf: Buffer): string {
-  if (buf.length === 0) return '';
+  if (buf.length === 0) return "";
   const swapped = Buffer.from(buf); // swap16 mutates in place, so copy
   swapped.swap16();
-  return swapped.toString('utf16le');
+  return swapped.toString("utf16le");
 }
 
 /**
@@ -99,26 +85,18 @@ function decodeUTF16BE(buf: Buffer): string {
  * Invalid code points are replaced with U+FFFD, partial trailing bytes are ignored.
  */
 function decodeUTF32(buf: Buffer, littleEndian: boolean): string {
-  if (buf.length < 4) return '';
+  if (buf.length < 4) return "";
   const usable = buf.length - (buf.length % 4);
-  let out = '';
+  let out = "";
   for (let i = 0; i < usable; i += 4) {
     const cp = littleEndian
-      ? (buf[i] |
-          (buf[i + 1] << 8) |
-          (buf[i + 2] << 16) |
-          (buf[i + 3] << 24)) >>>
-        0
-      : (buf[i + 3] |
-          (buf[i + 2] << 8) |
-          (buf[i + 1] << 16) |
-          (buf[i] << 24)) >>>
-        0;
+      ? (buf[i] | (buf[i + 1] << 8) | (buf[i + 2] << 16) | (buf[i + 3] << 24)) >>> 0
+      : (buf[i + 3] | (buf[i + 2] << 8) | (buf[i + 1] << 16) | (buf[i] << 24)) >>> 0;
     // Valid planes: 0x0000..0x10FFFF excluding surrogates
     if (cp <= 0x10ffff && !(cp >= 0xd800 && cp <= 0xdfff)) {
       out += String.fromCodePoint(cp);
     } else {
-      out += '\uFFFD';
+      out += "\uFFFD";
     }
   }
   return out;
@@ -130,7 +108,7 @@ function decodeUTF32(buf: Buffer, littleEndian: boolean): string {
  */
 function isValidUtf8(buffer: Buffer): boolean {
   try {
-    new TextDecoder('utf-8', { fatal: true }).decode(buffer);
+    new TextDecoder("utf-8", { fatal: true }).decode(buffer);
     return true;
   } catch {
     return false;
@@ -160,19 +138,19 @@ export interface FileReadResult {
 function decodeBOMBuffer(buf: Buffer, bomInfo: BOMInfo): string {
   const content = buf.subarray(bomInfo.bomLength);
   switch (bomInfo.encoding) {
-    case 'utf8':
-      return content.toString('utf8');
-    case 'utf16le':
-      return content.toString('utf16le');
-    case 'utf16be':
+    case "utf8":
+      return content.toString("utf8");
+    case "utf16le":
+      return content.toString("utf16le");
+    case "utf16be":
       return decodeUTF16BE(content);
-    case 'utf32le':
+    case "utf32le":
       return decodeUTF32(content, true);
-    case 'utf32be':
+    case "utf32be":
       return decodeUTF32(content, false);
     default:
       // Defensive fallback; should be unreachable
-      return content.toString('utf8');
+      return content.toString("utf8");
   }
 }
 
@@ -181,18 +159,18 @@ function decodeBOMBuffer(buf: Buffer, bomInfo: BOMInfo): string {
  */
 function bomEncodingToName(bomEncoding: UnicodeEncoding): string {
   switch (bomEncoding) {
-    case 'utf8':
-      return 'utf-8';
-    case 'utf16le':
-      return 'utf-16le';
-    case 'utf16be':
-      return 'utf-16be';
-    case 'utf32le':
-      return 'utf-32le';
-    case 'utf32be':
-      return 'utf-32be';
+    case "utf8":
+      return "utf-8";
+    case "utf16le":
+      return "utf-16le";
+    case "utf16be":
+      return "utf-16be";
+    case "utf32le":
+      return "utf-32le";
+    case "utf32be":
+      return "utf-32be";
     default:
-      return 'utf-8';
+      return "utf-8";
   }
 }
 
@@ -205,12 +183,10 @@ function bomEncodingToName(bomEncoding: UnicodeEncoding): string {
  * Returns both the decoded content and the detected encoding/BOM information
  * in a single I/O pass, avoiding redundant file reads.
  */
-export async function readFileWithEncodingInfo(
-  filePath: string,
-): Promise<FileReadResult> {
+export async function readFileWithEncodingInfo(filePath: string): Promise<FileReadResult> {
   // Read the file once; detect BOM and decode from the single buffer.
   const full = await fs.promises.readFile(filePath);
-  if (full.length === 0) return { content: '', encoding: 'utf-8', bom: false };
+  if (full.length === 0) return { content: "", encoding: "utf-8", bom: false };
 
   const bomInfo = detectBOM(full);
   if (bomInfo) {
@@ -225,7 +201,7 @@ export async function readFileWithEncodingInfo(
 
   // No BOM — check if it's valid UTF-8 first (fast path for the common case)
   if (isValidUtf8(full)) {
-    return { content: full.toString('utf8'), encoding: 'utf-8', bom: false };
+    return { content: full.toString("utf8"), encoding: "utf-8", bom: false };
   }
 
   // Not valid UTF-8 — try chardet statistical detection
@@ -247,7 +223,7 @@ export async function readFileWithEncodingInfo(
   }
 
   // Final fallback: UTF-8 with replacement characters
-  return { content: full.toString('utf8'), encoding: 'utf-8', bom: false };
+  return { content: full.toString("utf8"), encoding: "utf-8", bom: false };
 }
 
 /**
@@ -263,7 +239,7 @@ export async function readFileWithEncoding(filePath: string): Promise<string> {
 
 export async function countFileLines(filePath: string): Promise<number> {
   const result = await readFileWithEncodingInfo(filePath);
-  return result.content.split('\n').length;
+  return result.content.split("\n").length;
 }
 
 export async function readFileWithLineAndLimit(params: {
@@ -278,7 +254,7 @@ export async function readFileWithLineAndLimit(params: {
 }> {
   const { path: filePath, limit, line } = params;
   const { content, encoding, bom } = await readFileWithEncodingInfo(filePath);
-  const lines = content.split('\n');
+  const lines = content.split("\n");
   const originalLineCount = lines.length;
   const startLine = line || 0;
   // Ensure endLine does not exceed originalLineCount
@@ -288,7 +264,7 @@ export async function readFileWithLineAndLimit(params: {
   const selectedLines = lines.slice(actualStartLine, endLine);
 
   return {
-    content: selectedLines.join('\n'),
+    content: selectedLines.join("\n"),
     bom,
     encoding,
     originalLineCount,
@@ -303,38 +279,38 @@ export async function readFileWithLineAndLimit(params: {
 export async function detectFileEncoding(filePath: string): Promise<string> {
   let fh: fs.promises.FileHandle | null = null;
   try {
-    fh = await fs.promises.open(filePath, 'r');
+    fh = await fs.promises.open(filePath, "r");
     const stats = await fh.stat();
-    if (stats.size === 0) return 'utf-8';
+    if (stats.size === 0) return "utf-8";
 
     // Read a sample (up to 8KB) for detection
     const sampleSize = Math.min(8192, stats.size);
     const buf = Buffer.alloc(sampleSize);
     const { bytesRead } = await fh.read(buf, 0, sampleSize, 0);
-    if (bytesRead === 0) return 'utf-8';
+    if (bytesRead === 0) return "utf-8";
     const sample = buf.subarray(0, bytesRead);
 
     // 1. Check for BOM
     const bom = detectBOM(sample);
     if (bom) {
       switch (bom.encoding) {
-        case 'utf8':
-          return 'utf-8';
-        case 'utf16le':
-          return 'utf-16le';
-        case 'utf16be':
-          return 'utf-16be';
-        case 'utf32le':
-          return 'utf-32le';
-        case 'utf32be':
-          return 'utf-32be';
+        case "utf8":
+          return "utf-8";
+        case "utf16le":
+          return "utf-16le";
+        case "utf16be":
+          return "utf-16be";
+        case "utf32le":
+          return "utf-32le";
+        case "utf32be":
+          return "utf-32be";
         default:
-          return 'utf-8';
+          return "utf-8";
       }
     }
 
     // 2. Validate UTF-8
-    if (isValidUtf8(sample)) return 'utf-8';
+    if (isValidUtf8(sample)) return "utf-8";
 
     // 3. Use chardet for detection
     const detected = detectEncodingFromBuffer(sample);
@@ -342,10 +318,10 @@ export async function detectFileEncoding(filePath: string): Promise<string> {
       return detected;
     }
 
-    return 'utf-8';
+    return "utf-8";
   } catch {
     // If file can't be read, default to UTF-8
-    return 'utf-8';
+    return "utf-8";
   } finally {
     if (fh) {
       try {
@@ -364,7 +340,7 @@ export async function detectFileEncoding(filePath: string): Promise<string> {
  */
 export function getSpecificMimeType(filePath: string): string | undefined {
   const lookedUpMime = mime.getType(filePath);
-  return typeof lookedUpMime === 'string' ? lookedUpMime : undefined;
+  return typeof lookedUpMime === "string" ? lookedUpMime : undefined;
 }
 
 /**
@@ -373,18 +349,14 @@ export function getSpecificMimeType(filePath: string): string | undefined {
  * @param rootDirectory The absolute root directory.
  * @returns True if the path is within the root directory, false otherwise.
  */
-export function isWithinRoot(
-  pathToCheck: string,
-  rootDirectory: string,
-): boolean {
+export function isWithinRoot(pathToCheck: string, rootDirectory: string): boolean {
   const normalizedPathToCheck = path.resolve(pathToCheck);
   const normalizedRootDirectory = path.resolve(rootDirectory);
 
   // Ensure the rootDirectory path ends with a separator for correct startsWith comparison,
   // unless it's the root path itself (e.g., '/' or 'C:\').
   const rootWithSeparator =
-    normalizedRootDirectory === path.sep ||
-    normalizedRootDirectory.endsWith(path.sep)
+    normalizedRootDirectory === path.sep || normalizedRootDirectory.endsWith(path.sep)
       ? normalizedRootDirectory
       : normalizedRootDirectory + path.sep;
 
@@ -402,7 +374,7 @@ export function isWithinRoot(
 export async function isBinaryFile(filePath: string): Promise<boolean> {
   let fh: fs.promises.FileHandle | null = null;
   try {
-    fh = await fs.promises.open(filePath, 'r');
+    fh = await fs.promises.open(filePath, "r");
     const stats = await fh.stat();
     const fileSize = stats.size;
     if (fileSize === 0) return false; // empty is not binary
@@ -453,49 +425,49 @@ export async function isBinaryFile(filePath: string): Promise<boolean> {
  */
 export async function detectFileType(
   filePath: string,
-): Promise<'text' | 'image' | 'pdf' | 'audio' | 'video' | 'binary' | 'svg'> {
+): Promise<"text" | "image" | "pdf" | "audio" | "video" | "binary" | "svg"> {
   const ext = path.extname(filePath).toLowerCase();
 
   // The mimetype for various TypeScript extensions (ts, mts, cts, tsx) can be
   // MPEG transport stream (a video format), but we want to assume these are
   // TypeScript files instead.
-  if (['.ts', '.mts', '.cts'].includes(ext)) {
-    return 'text';
+  if ([".ts", ".mts", ".cts"].includes(ext)) {
+    return "text";
   }
 
-  if (ext === '.svg') {
-    return 'svg';
+  if (ext === ".svg") {
+    return "svg";
   }
 
   const lookedUpMimeType = mime.getType(filePath); // Returns null if not found, or the mime type string
   if (lookedUpMimeType) {
-    if (lookedUpMimeType.startsWith('image/')) {
-      return 'image';
+    if (lookedUpMimeType.startsWith("image/")) {
+      return "image";
     }
-    if (lookedUpMimeType.startsWith('audio/')) {
-      return 'audio';
+    if (lookedUpMimeType.startsWith("audio/")) {
+      return "audio";
     }
-    if (lookedUpMimeType.startsWith('video/')) {
-      return 'video';
+    if (lookedUpMimeType.startsWith("video/")) {
+      return "video";
     }
-    if (lookedUpMimeType === 'application/pdf') {
-      return 'pdf';
+    if (lookedUpMimeType === "application/pdf") {
+      return "pdf";
     }
   }
 
   // Stricter binary check for common non-text extensions before content check
   // These are often not well-covered by mime-types or might be misidentified.
   if (BINARY_EXTENSIONS.includes(ext)) {
-    return 'binary';
+    return "binary";
   }
 
   // Fall back to content-based check if mime type wasn't conclusive for image/pdf
   // and it's not a known binary extension.
   if (await isBinaryFile(filePath)) {
-    return 'binary';
+    return "binary";
   }
 
-  return 'text';
+  return "text";
 }
 
 export interface ProcessedFileReadResult {
@@ -513,14 +485,9 @@ export interface ProcessedFileReadResult {
  * Returns undefined for non-media types (text, binary, svg) which are always supported.
  */
 function mediaModalityKey(
-  fileType: 'image' | 'pdf' | 'audio' | 'video' | 'text' | 'binary' | 'svg',
+  fileType: "image" | "pdf" | "audio" | "video" | "text" | "binary" | "svg",
 ): keyof InputModalities | undefined {
-  if (
-    fileType === 'image' ||
-    fileType === 'pdf' ||
-    fileType === 'audio' ||
-    fileType === 'video'
-  ) {
+  if (fileType === "image" || fileType === "pdf" || fileType === "audio" || fileType === "video") {
     return fileType;
   }
   return undefined;
@@ -530,14 +497,11 @@ function mediaModalityKey(
  * Build the same unsupported-modality message used by the converter,
  * so the LLM sees a consistent hint regardless of where the check fires.
  */
-function unsupportedModalityMessage(
-  modality: string,
-  displayName: string,
-): string {
+function unsupportedModalityMessage(modality: string, displayName: string): string {
   let hint: string;
-  if (modality === 'pdf') {
+  if (modality === "pdf") {
     hint =
-      'This model does not support PDF input directly. The read_file tool cannot extract PDF content either. To extract text from the PDF file, try using skills if applicable, or guide user to install pdf skill by running this slash command:\n/extensions install https://github.com/anthropics/skills:document-skills';
+      "This model does not support PDF input directly. The read_file tool cannot extract PDF content either. To extract text from the PDF file, try using skills if applicable, or guide user to install pdf skill by running this slash command:\n/extensions install https://github.com/anthropics/skills:document-skills";
   } else {
     hint = `This model does not support ${modality} input. The read_file tool cannot process this type of file either. To handle this file, try using skills if applicable, or any tools installed at system wide, or let the user know you cannot process this type of file.`;
   }
@@ -563,9 +527,8 @@ export async function processSingleFileContent(
     if (!fs.existsSync(filePath)) {
       // Sync check is acceptable before async read
       return {
-        llmContent:
-          'Could not read file because no file was found at the specified path.',
-        returnDisplay: 'File not found.',
+        llmContent: "Could not read file because no file was found at the specified path.",
+        returnDisplay: "File not found.",
         error: `File not found: ${filePath}`,
         errorType: ToolErrorType.FILE_NOT_FOUND,
       };
@@ -573,9 +536,8 @@ export async function processSingleFileContent(
     const stats = await fs.promises.stat(filePath);
     if (stats.isDirectory()) {
       return {
-        llmContent:
-          'Could not read file because the provided path is a directory, not a file.',
-        returnDisplay: 'Path is a directory.',
+        llmContent: "Could not read file because the provided path is a directory, not a file.",
+        returnDisplay: "Path is a directory.",
         error: `Path is a directory, not a file: ${filePath}`,
         errorType: ToolErrorType.TARGET_IS_DIRECTORY,
       };
@@ -585,17 +547,15 @@ export async function processSingleFileContent(
     // Use 9.9MB instead of 10MB to leave margin for encoding overhead (#1880)
     if (fileSizeInMB > 9.9) {
       return {
-        llmContent: 'File size exceeds the 10MB limit.',
-        returnDisplay: 'File size exceeds the 10MB limit.',
+        llmContent: "File size exceeds the 10MB limit.",
+        returnDisplay: "File size exceeds the 10MB limit.",
         error: `File size exceeds the 10MB limit: ${filePath} (${fileSizeInMB.toFixed(2)}MB)`,
         errorType: ToolErrorType.FILE_TOO_LARGE,
       };
     }
 
     const fileType = await detectFileType(filePath);
-    const relativePathForDisplay = path
-      .relative(rootDirectory, filePath)
-      .replace(/\\/g, '/');
+    const relativePathForDisplay = path.relative(rootDirectory, filePath).replace(/\\/g, "/");
 
     const displayName = path.basename(filePath);
 
@@ -603,8 +563,7 @@ export async function processSingleFileContent(
     // (same source of truth the converter uses at API-call time).
     const modality = mediaModalityKey(fileType);
     if (modality) {
-      const modalities: InputModalities =
-        config.getContentGeneratorConfig()?.modalities ?? {};
+      const modalities: InputModalities = config.getContentGeneratorConfig()?.modalities ?? {};
       if (!modalities[modality]) {
         const message = unsupportedModalityMessage(modality, displayName);
         debugLogger.warn(
@@ -619,13 +578,13 @@ export async function processSingleFileContent(
     }
 
     switch (fileType) {
-      case 'binary': {
+      case "binary": {
         return {
           llmContent: `Cannot display content of binary file: ${relativePathForDisplay}`,
           returnDisplay: `Skipped binary file: ${relativePathForDisplay}`,
         };
       }
-      case 'svg': {
+      case "svg": {
         const SVG_MAX_SIZE_BYTES = 1 * 1024 * 1024;
         if (stats.size > SVG_MAX_SIZE_BYTES) {
           return {
@@ -639,23 +598,20 @@ export async function processSingleFileContent(
           returnDisplay: `Read SVG as text: ${relativePathForDisplay}`,
         };
       }
-      case 'text': {
+      case "text": {
         // Use BOM-aware reader to avoid leaving a BOM character in content and to support UTF-16/32 transparently
-        const { content, _meta } = await config
-          .getFileSystemService()
-          .readTextFile({
-            path: filePath,
-            limit: limit ?? config.getTruncateToolOutputLines(),
-            line: offset,
-          });
-        const originalLineCount =
-          _meta?.originalLineCount ?? (await countFileLines(filePath));
-        const selectedLines = content.split('\n').map((line) => line.trimEnd());
+        const { content, _meta } = await config.getFileSystemService().readTextFile({
+          path: filePath,
+          limit: limit ?? config.getTruncateToolOutputLines(),
+          line: offset,
+        });
+        const originalLineCount = _meta?.originalLineCount ?? (await countFileLines(filePath));
+        const selectedLines = content.split("\n").map((line) => line.trimEnd());
         const startLine = offset || 0;
         const configCharLimit = config.getTruncateToolOutputThreshold();
 
         // Apply character limit truncation
-        let llmContent = '';
+        let llmContent = "";
         let contentLengthTruncated = false;
         let linesIncluded = 0;
 
@@ -673,38 +629,32 @@ export async function processSingleFileContent(
               currentLength = projectedLength;
             } else {
               // Truncate the current line to fit
-              const remaining = Math.max(
-                configCharLimit - currentLength - sep,
-                10,
-              );
-              formattedLines.push(
-                line.substring(0, remaining) + '... [truncated]',
-              );
+              const remaining = Math.max(configCharLimit - currentLength - sep, 10);
+              formattedLines.push(line.substring(0, remaining) + "... [truncated]");
               contentLengthTruncated = true;
               break;
             }
           }
 
-          llmContent = formattedLines.join('\n');
+          llmContent = formattedLines.join("\n");
         } else {
           // No character limit, use all selected lines
-          llmContent = selectedLines.join('\n');
+          llmContent = selectedLines.join("\n");
           linesIncluded = selectedLines.length;
         }
 
         const actualEndLine = startLine + linesIncluded;
-        const contentRangeTruncated =
-          startLine > 0 || actualEndLine < originalLineCount;
+        const contentRangeTruncated = startLine > 0 || actualEndLine < originalLineCount;
         const isTruncated = contentRangeTruncated || contentLengthTruncated;
 
         // By default, return nothing to streamline the common case of a successful read_file.
-        let returnDisplay = '';
+        let returnDisplay = "";
         if (isTruncated) {
           returnDisplay = `Read lines ${
             startLine + 1
           }-${actualEndLine} of ${originalLineCount} from ${relativePathForDisplay}`;
           if (contentLengthTruncated) {
-            returnDisplay += ' (truncated)';
+            returnDisplay += " (truncated)";
           }
         }
 
@@ -716,12 +666,12 @@ export async function processSingleFileContent(
           linesShown: [startLine + 1, actualEndLine],
         };
       }
-      case 'image':
-      case 'audio':
-      case 'video':
-      case 'pdf': {
+      case "image":
+      case "audio":
+      case "video":
+      case "pdf": {
         const contentBuffer = await fs.promises.readFile(filePath);
-        const base64Data = contentBuffer.toString('base64');
+        const base64Data = contentBuffer.toString("base64");
         const base64SizeInMB = base64Data.length / (1024 * 1024);
         // Use 9.9MB instead of 10MB to leave margin for small overhead (#1880)
         if (base64SizeInMB > 9.9) {
@@ -736,7 +686,7 @@ export async function processSingleFileContent(
           llmContent: {
             inlineData: {
               data: base64Data,
-              mimeType: mime.getType(filePath) || 'application/octet-stream',
+              mimeType: mime.getType(filePath) || "application/octet-stream",
               displayName,
             },
           },
@@ -755,9 +705,7 @@ export async function processSingleFileContent(
     }
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    const displayPath = path
-      .relative(rootDirectory, filePath)
-      .replace(/\\/g, '/');
+    const displayPath = path.relative(rootDirectory, filePath).replace(/\\/g, "/");
     return {
       llmContent: `Error reading file ${displayPath}: ${errorMessage}`,
       returnDisplay: `Error reading file ${displayPath}: ${errorMessage}`,
diff --git a/packages/airiscode-core/src/utils/filesearch/crawlCache.ts b/packages/airiscode-core/src/utils/filesearch/crawlCache.ts
index b905c9dfc..b13cf6812 100644
--- a/packages/airiscode-core/src/utils/filesearch/crawlCache.ts
+++ b/packages/airiscode-core/src/utils/filesearch/crawlCache.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import crypto from 'node:crypto';
+import crypto from "node:crypto";
 
 const crawlCache = new Map<string, string[]>();
 const cacheTimers = new Map<string, NodeJS.Timeout>();
@@ -19,13 +19,13 @@ export const getCacheKey = (
   ignoreContent: string,
   maxDepth?: number,
 ): string => {
-  const hash = crypto.createHash('sha256');
+  const hash = crypto.createHash("sha256");
   hash.update(directory);
   hash.update(ignoreContent);
   if (maxDepth !== undefined) {
     hash.update(String(maxDepth));
   }
-  return hash.digest('hex');
+  return hash.digest("hex");
 };
 
 /**
diff --git a/packages/airiscode-core/src/utils/filesearch/crawler.ts b/packages/airiscode-core/src/utils/filesearch/crawler.ts
index 9184ba328..4a1b7f22d 100644
--- a/packages/airiscode-core/src/utils/filesearch/crawler.ts
+++ b/packages/airiscode-core/src/utils/filesearch/crawler.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { fdir } from 'fdir';
-import type { Ignore } from './ignore.js';
-import * as cache from './crawlCache.js';
+import path from "node:path";
+import { fdir } from "fdir";
+import * as cache from "./crawlCache.js";
+import type { Ignore } from "./ignore.js";
 
 export interface CrawlOptions {
   // The directory to start the crawl from.
@@ -50,7 +50,7 @@ export async function crawl(options: CrawlOptions): Promise<string[]> {
     const api = new fdir()
       .withRelativePaths()
       .withDirs()
-      .withPathSeparator('/') // Always use unix style paths
+      .withPathSeparator("/") // Always use unix style paths
       .exclude((_, dirPath) => {
         const relativePath = path.posix.relative(posixCrawlDirectory, dirPath);
         return dirFilter(`${relativePath}/`);
@@ -68,9 +68,7 @@ export async function crawl(options: CrawlOptions): Promise<string[]> {
 
   const relativeToCrawlDir = path.posix.relative(posixCwd, posixCrawlDirectory);
 
-  const relativeToCwdResults = results.map((p) =>
-    path.posix.join(relativeToCrawlDir, p),
-  );
+  const relativeToCwdResults = results.map((p) => path.posix.join(relativeToCrawlDir, p));
 
   if (options.cache) {
     const cacheKey = cache.getCacheKey(
diff --git a/packages/airiscode-core/src/utils/filesearch/fileSearch.ts b/packages/airiscode-core/src/utils/filesearch/fileSearch.ts
index 9a030b436..d5d2207ec 100644
--- a/packages/airiscode-core/src/utils/filesearch/fileSearch.ts
+++ b/packages/airiscode-core/src/utils/filesearch/fileSearch.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import picomatch from 'picomatch';
-import type { Ignore } from './ignore.js';
-import { loadIgnoreRules } from './ignore.js';
-import { ResultCache } from './result-cache.js';
-import { crawl } from './crawler.js';
-import type { FzfResultItem } from 'fzf';
-import { AsyncFzf } from 'fzf';
-import { unescapePath } from '../paths.js';
+import path from "node:path";
+import type { FzfResultItem } from "fzf";
+import { AsyncFzf } from "fzf";
+import picomatch from "picomatch";
+import { unescapePath } from "../paths.js";
+import { crawl } from "./crawler.js";
+import type { Ignore } from "./ignore.js";
+import { loadIgnoreRules } from "./ignore.js";
+import { ResultCache } from "./result-cache.js";
 
 export interface FileSearchOptions {
   projectRoot: string;
@@ -27,9 +27,9 @@ export interface FileSearchOptions {
 }
 
 export class AbortError extends Error {
-  constructor(message = 'Search aborted') {
+  constructor(message = "Search aborted") {
     super(message);
-    this.name = 'AbortError';
+    this.name = "AbortError";
   }
 }
 
@@ -67,8 +67,8 @@ export async function filter(
   }
 
   results.sort((a, b) => {
-    const aIsDir = a.endsWith('/');
-    const bIsDir = b.endsWith('/');
+    const aIsDir = a.endsWith("/");
+    const bIsDir = b.endsWith("/");
 
     if (aIsDir && !bIsDir) return -1;
     if (!aIsDir && bIsDir) return 1;
@@ -112,10 +112,7 @@ class RecursiveFileSearch implements FileSearch {
     this.buildResultCache();
   }
 
-  async search(
-    pattern: string,
-    options: SearchOptions = {},
-  ): Promise<string[]> {
+  async search(pattern: string, options: SearchOptions = {}): Promise<string[]> {
     // Check if engine is properly initialized.
     // If fuzzy search is enabled (or undefined, default true), fzf must be initialized.
     if (
@@ -123,21 +120,20 @@ class RecursiveFileSearch implements FileSearch {
       (!this.fzf && this.options.enableFuzzySearch !== false) ||
       !this.ignore
     ) {
-      throw new Error('Engine not initialized. Call initialize() first.');
+      throw new Error("Engine not initialized. Call initialize() first.");
     }
 
-    pattern = unescapePath(pattern) || '*';
+    pattern = unescapePath(pattern) || "*";
 
     let filteredCandidates;
-    const { files: candidates, isExactMatch } =
-      await this.resultCache!.get(pattern);
+    const { files: candidates, isExactMatch } = await this.resultCache!.get(pattern);
 
     if (isExactMatch) {
       // Use the cached result.
       filteredCandidates = candidates;
     } else {
       let shouldCache = true;
-      if (pattern.includes('*') || !this.fzf) {
+      if (pattern.includes("*") || !this.fzf) {
         filteredCandidates = await filter(candidates, pattern, options.signal);
       } else {
         filteredCandidates = await this.fzf
@@ -169,7 +165,7 @@ class RecursiveFileSearch implements FileSearch {
       if (results.length >= (options.maxResults ?? Infinity)) {
         break;
       }
-      if (candidate === '.') {
+      if (candidate === ".") {
         continue;
       }
       if (!fileFilter(candidate)) {
@@ -187,7 +183,7 @@ class RecursiveFileSearch implements FileSearch {
       // occurence of the pattern. We use it for search spaces that have >20k
       // files, because the v2 algorithm is just too slow in those cases.
       this.fzf = new AsyncFzf(this.allFiles, {
-        fuzzy: this.allFiles.length > 20000 ? 'v1' : 'v2',
+        fuzzy: this.allFiles.length > 20000 ? "v1" : "v2",
       });
     }
   }
@@ -202,16 +198,13 @@ class DirectoryFileSearch implements FileSearch {
     this.ignore = loadIgnoreRules(this.options);
   }
 
-  async search(
-    pattern: string,
-    options: SearchOptions = {},
-  ): Promise<string[]> {
+  async search(pattern: string, options: SearchOptions = {}): Promise<string[]> {
     if (!this.ignore) {
-      throw new Error('Engine not initialized. Call initialize() first.');
+      throw new Error("Engine not initialized. Call initialize() first.");
     }
-    pattern = pattern || '*';
+    pattern = pattern || "*";
 
-    const dir = pattern.endsWith('/') ? pattern : path.dirname(pattern);
+    const dir = pattern.endsWith("/") ? pattern : path.dirname(pattern);
     const results = await crawl({
       crawlDirectory: path.join(this.options.projectRoot, dir),
       cwd: this.options.projectRoot,
@@ -229,7 +222,7 @@ class DirectoryFileSearch implements FileSearch {
       if (finalResults.length >= (options.maxResults ?? Infinity)) {
         break;
       }
-      if (candidate === '.') {
+      if (candidate === ".") {
         continue;
       }
       if (!fileFilter(candidate)) {
diff --git a/packages/airiscode-core/src/utils/filesearch/ignore.ts b/packages/airiscode-core/src/utils/filesearch/ignore.ts
index 04ff18bc2..a96fa99f4 100644
--- a/packages/airiscode-core/src/utils/filesearch/ignore.ts
+++ b/packages/airiscode-core/src/utils/filesearch/ignore.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import ignore from 'ignore';
-import picomatch from 'picomatch';
+import fs from "node:fs";
+import path from "node:path";
+import ignore from "ignore";
+import picomatch from "picomatch";
 
-const hasFileExtension = picomatch('**/*[*.]*');
+const hasFileExtension = picomatch("**/*[*.]*");
 
 export interface LoadIgnoreRulesOptions {
   projectRoot: string;
@@ -21,23 +21,23 @@ export interface LoadIgnoreRulesOptions {
 export function loadIgnoreRules(options: LoadIgnoreRulesOptions): Ignore {
   const ignorer = new Ignore();
   if (options.useGitignore) {
-    const gitignorePath = path.join(options.projectRoot, '.gitignore');
+    const gitignorePath = path.join(options.projectRoot, ".gitignore");
     if (fs.existsSync(gitignorePath)) {
-      ignorer.add(fs.readFileSync(gitignorePath, 'utf8'));
+      ignorer.add(fs.readFileSync(gitignorePath, "utf8"));
     }
   }
 
   if (options.useQwenignore) {
-    const qwenignorePath = path.join(options.projectRoot, '.airiscodeigenore');
+    const qwenignorePath = path.join(options.projectRoot, ".airiscodeigenore");
     if (fs.existsSync(qwenignorePath)) {
-      ignorer.add(fs.readFileSync(qwenignorePath, 'utf8'));
+      ignorer.add(fs.readFileSync(qwenignorePath, "utf8"));
     }
   }
 
-  const ignoreDirs = ['.git', ...options.ignoreDirs];
+  const ignoreDirs = [".git", ...options.ignoreDirs];
   ignorer.add(
     ignoreDirs.map((dir) => {
-      if (dir.endsWith('/')) {
+      if (dir.endsWith("/")) {
         return dir;
       }
       return `${dir}/`;
@@ -59,21 +59,20 @@ export class Ignore {
    * @returns The `Ignore` instance for chaining.
    */
   add(patterns: string | string[]): this {
-    if (typeof patterns === 'string') {
+    if (typeof patterns === "string") {
       patterns = patterns.split(/\r?\n/);
     }
 
     for (const p of patterns) {
       const pattern = p.trim();
 
-      if (pattern === '' || pattern.startsWith('#')) {
+      if (pattern === "" || pattern.startsWith("#")) {
         continue;
       }
 
       this.allPatterns.push(pattern);
 
-      const isPositiveDirPattern =
-        pattern.endsWith('/') && !pattern.startsWith('!');
+      const isPositiveDirPattern = pattern.endsWith("/") && !pattern.startsWith("!");
 
       if (isPositiveDirPattern) {
         this.dirIgnorer.add(pattern);
@@ -126,6 +125,6 @@ export class Ignore {
    * @returns A string fingerprint of the ignore patterns.
    */
   getFingerprint(): string {
-    return this.allPatterns.join('\n');
+    return this.allPatterns.join("\n");
   }
 }
diff --git a/packages/airiscode-core/src/utils/filesearch/result-cache.ts b/packages/airiscode-core/src/utils/filesearch/result-cache.ts
index cf0c2b4b1..274444d17 100644
--- a/packages/airiscode-core/src/utils/filesearch/result-cache.ts
+++ b/packages/airiscode-core/src/utils/filesearch/result-cache.ts
@@ -24,9 +24,7 @@ export class ResultCache {
    * @returns An object containing the files to search and a boolean indicating
    *          if the result is an exact cache hit.
    */
-  async get(
-    query: string,
-  ): Promise<{ files: string[]; isExactMatch: boolean }> {
+  async get(query: string): Promise<{ files: string[]; isExactMatch: boolean }> {
     const isCacheHit = this.cache.has(query);
 
     if (isCacheHit) {
@@ -42,16 +40,14 @@ export class ResultCache {
     // from the results of the "foo" search.
     // This finds the most specific, already-cached query that is a prefix
     // of the current query.
-    let bestBaseQuery = '';
+    let bestBaseQuery = "";
     for (const key of this.cache?.keys?.() ?? []) {
       if (query.startsWith(key) && key.length > bestBaseQuery.length) {
         bestBaseQuery = key;
       }
     }
 
-    const filesToSearch = bestBaseQuery
-      ? this.cache.get(bestBaseQuery)!
-      : this.allFiles;
+    const filesToSearch = bestBaseQuery ? this.cache.get(bestBaseQuery)! : this.allFiles;
 
     return { files: filesToSearch, isExactMatch: false };
   }
diff --git a/packages/airiscode-core/src/utils/generateContentResponseUtilities.ts b/packages/airiscode-core/src/utils/generateContentResponseUtilities.ts
index 5cee30f50..29193626c 100644
--- a/packages/airiscode-core/src/utils/generateContentResponseUtilities.ts
+++ b/packages/airiscode-core/src/utils/generateContentResponseUtilities.ts
@@ -4,12 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  GenerateContentResponse,
-  Part,
-  FunctionCall,
-} from '../types/llm.js';
-import { getResponseText } from './partUtils.js';
+import type { FunctionCall, GenerateContentResponse, Part } from "../types/llm.js";
+import { getResponseText } from "./partUtils.js";
 
 export function getResponseTextFromParts(parts: Part[]): string | undefined {
   if (!parts) {
@@ -17,17 +13,15 @@ export function getResponseTextFromParts(parts: Part[]): string | undefined {
   }
   const textSegments = parts
     .map((part) => part.text)
-    .filter((text): text is string => typeof text === 'string');
+    .filter((text): text is string => typeof text === "string");
 
   if (textSegments.length === 0) {
     return undefined;
   }
-  return textSegments.join('');
+  return textSegments.join("");
 }
 
-export function getFunctionCalls(
-  response: GenerateContentResponse,
-): FunctionCall[] | undefined {
+export function getFunctionCalls(response: GenerateContentResponse): FunctionCall[] | undefined {
   const parts = response.candidates?.[0]?.content?.parts;
   if (!parts) {
     return undefined;
@@ -40,10 +34,8 @@ export function getFunctionCalls(
   // and second has no name but has args. Merge them together.
   if (functionCallParts.length === 2) {
     const [first, second] = functionCallParts;
-    const firstHasNameOnly =
-      first.name && (!first.args || Object.keys(first.args).length === 0);
-    const secondHasArgsOnly =
-      !second.name && second.args && Object.keys(second.args).length > 0;
+    const firstHasNameOnly = first.name && (!first.args || Object.keys(first.args).length === 0);
+    const secondHasArgsOnly = !second.name && second.args && Object.keys(second.args).length > 0;
 
     if (firstHasNameOnly && secondHasArgsOnly) {
       return [
@@ -58,9 +50,7 @@ export function getFunctionCalls(
   return functionCallParts.length > 0 ? functionCallParts : undefined;
 }
 
-export function getFunctionCallsFromParts(
-  parts: Part[],
-): FunctionCall[] | undefined {
+export function getFunctionCallsFromParts(parts: Part[]): FunctionCall[] | undefined {
   if (!parts) {
     return undefined;
   }
@@ -70,9 +60,7 @@ export function getFunctionCallsFromParts(
   return functionCallParts.length > 0 ? functionCallParts : undefined;
 }
 
-export function getFunctionCallsAsJson(
-  response: GenerateContentResponse,
-): string | undefined {
+export function getFunctionCallsAsJson(response: GenerateContentResponse): string | undefined {
   const functionCalls = getFunctionCalls(response);
   if (!functionCalls) {
     return undefined;
@@ -80,9 +68,7 @@ export function getFunctionCallsAsJson(
   return JSON.stringify(functionCalls, null, 2);
 }
 
-export function getFunctionCallsFromPartsAsJson(
-  parts: Part[],
-): string | undefined {
+export function getFunctionCallsFromPartsAsJson(parts: Part[]): string | undefined {
   const functionCalls = getFunctionCallsFromParts(parts);
   if (!functionCalls) {
     return undefined;
@@ -90,9 +76,7 @@ export function getFunctionCallsFromPartsAsJson(
   return JSON.stringify(functionCalls, null, 2);
 }
 
-export function getStructuredResponse(
-  response: GenerateContentResponse,
-): string | undefined {
+export function getStructuredResponse(response: GenerateContentResponse): string | undefined {
   const textContent = getResponseText(response);
   const functionCallsJson = getFunctionCallsAsJson(response);
 
@@ -108,9 +92,7 @@ export function getStructuredResponse(
   return undefined;
 }
 
-export function getStructuredResponseFromParts(
-  parts: Part[],
-): string | undefined {
+export function getStructuredResponseFromParts(parts: Part[]): string | undefined {
   const textContent = getResponseTextFromParts(parts);
   const functionCallsJson = getFunctionCallsFromPartsAsJson(parts);
 
diff --git a/packages/airiscode-core/src/utils/getFolderStructure.ts b/packages/airiscode-core/src/utils/getFolderStructure.ts
index 28464eafe..a52ea767c 100644
--- a/packages/airiscode-core/src/utils/getFolderStructure.ts
+++ b/packages/airiscode-core/src/utils/getFolderStructure.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import type { Dirent } from 'node:fs';
-import * as path from 'node:path';
-import { getErrorMessage, isNodeError } from './errors.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { createDebugLogger } from './debugLogger.js';
+import type { Dirent } from "node:fs";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FileFilteringOptions } from "../config/constants.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { createDebugLogger } from "./debugLogger.js";
+import { getErrorMessage, isNodeError } from "./errors.js";
 
-const debugLogger = createDebugLogger('FOLDER_STRUCTURE');
+const debugLogger = createDebugLogger("FOLDER_STRUCTURE");
 
 const MAX_ITEMS = 20;
-const TRUNCATION_INDICATOR = '...';
-const DEFAULT_IGNORED_FOLDERS = new Set(['node_modules', '.git', 'dist']);
+const TRUNCATION_INDICATOR = "...";
+const DEFAULT_IGNORED_FOLDERS = new Set(["node_modules", ".git", "dist"]);
 
 // --- Interfaces ---
 
@@ -36,7 +36,7 @@ interface FolderStructureOptions {
 }
 // Define a type for the merged options where fileIncludePattern remains optional
 type MergedFolderStructureOptions = Required<
-  Omit<FolderStructureOptions, 'fileIncludePattern' | 'fileService'>
+  Omit<FolderStructureOptions, "fileIncludePattern" | "fileService">
 > & {
   fileIncludePattern?: RegExp;
   fileService?: FileDiscoveryService;
@@ -103,14 +103,9 @@ async function readFullStructure(
       // Sort entries alphabetically by name for consistent processing order
       entries = rawEntries.sort((a, b) => a.name.localeCompare(b.name));
     } catch (error: unknown) {
-      if (
-        isNodeError(error) &&
-        (error.code === 'EACCES' || error.code === 'ENOENT')
-      ) {
-        debugLogger.warn(
-          `Warning: Could not read directory ${currentPath}: ${error.message}`,
-        );
-        if (currentPath === rootPath && error.code === 'ENOENT') {
+      if (isNodeError(error) && (error.code === "EACCES" || error.code === "ENOENT")) {
+        debugLogger.warn(`Warning: Could not read directory ${currentPath}: ${error.message}`);
+        if (currentPath === rootPath && error.code === "ENOENT") {
           return null; // Root directory itself not found
         }
         // For other EACCES/ENOENT on subdirectories, just skip them.
@@ -141,10 +136,7 @@ async function readFullStructure(
             continue;
           }
         }
-        if (
-          !options.fileIncludePattern ||
-          options.fileIncludePattern.test(fileName)
-        ) {
+        if (!options.fileIncludePattern || options.fileIncludePattern.test(fileName)) {
           filesInCurrentDir.push(fileName);
           currentItemCount++;
           folderInfo.totalFiles++;
@@ -231,7 +223,7 @@ function formatStructure(
   isProcessingRootNode: boolean,
   builder: string[],
 ): void {
-  const connector = isLastChildOfParent ? '└───' : '├───';
+  const connector = isLastChildOfParent ? "└───" : "├───";
 
   // The root node of the structure (the one passed initially to getFolderStructure)
   // is not printed with a connector line itself, only its name as a header.
@@ -239,7 +231,7 @@ function formatStructure(
   // Ignored root nodes ARE printed with a connector.
   if (!isProcessingRootNode || node.isIgnored) {
     builder.push(
-      `${currentIndent}${connector}${node.name}${path.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ''}`,
+      `${currentIndent}${connector}${node.name}${path.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ""}`,
     );
   }
 
@@ -247,31 +239,27 @@ function formatStructure(
   // If *this* node was the root of the whole structure, its children start with no indent before their connectors.
   // Otherwise, children's indent extends from the current node's indent.
   const indentForChildren = isProcessingRootNode
-    ? ''
-    : currentIndent + (isLastChildOfParent ? '    ' : '│   ');
+    ? ""
+    : currentIndent + (isLastChildOfParent ? "    " : "│   ");
 
   // Render files of the current node
   const fileCount = node.files.length;
   for (let i = 0; i < fileCount; i++) {
     const isLastFileAmongSiblings =
-      i === fileCount - 1 &&
-      node.subFolders.length === 0 &&
-      !node.hasMoreSubfolders;
-    const fileConnector = isLastFileAmongSiblings ? '└───' : '├───';
+      i === fileCount - 1 && node.subFolders.length === 0 && !node.hasMoreSubfolders;
+    const fileConnector = isLastFileAmongSiblings ? "└───" : "├───";
     builder.push(`${indentForChildren}${fileConnector}${node.files[i]}`);
   }
   if (node.hasMoreFiles) {
-    const isLastIndicatorAmongSiblings =
-      node.subFolders.length === 0 && !node.hasMoreSubfolders;
-    const fileConnector = isLastIndicatorAmongSiblings ? '└───' : '├───';
+    const isLastIndicatorAmongSiblings = node.subFolders.length === 0 && !node.hasMoreSubfolders;
+    const fileConnector = isLastIndicatorAmongSiblings ? "└───" : "├───";
     builder.push(`${indentForChildren}${fileConnector}${TRUNCATION_INDICATOR}`);
   }
 
   // Render subfolders of the current node
   const subFolderCount = node.subFolders.length;
   for (let i = 0; i < subFolderCount; i++) {
-    const isLastSubfolderAmongSiblings =
-      i === subFolderCount - 1 && !node.hasMoreSubfolders;
+    const isLastSubfolderAmongSiblings = i === subFolderCount - 1 && !node.hasMoreSubfolders;
     // Children are never the root node being processed initially.
     formatStructure(
       node.subFolders[i],
@@ -307,8 +295,7 @@ export async function getFolderStructure(
     ignoredFolders: options?.ignoredFolders ?? DEFAULT_IGNORED_FOLDERS,
     fileIncludePattern: options?.fileIncludePattern,
     fileService: options?.fileService,
-    fileFilteringOptions:
-      options?.fileFilteringOptions ?? DEFAULT_FILE_FILTERING_OPTIONS,
+    fileFilteringOptions: options?.fileFilteringOptions ?? DEFAULT_FILE_FILTERING_OPTIONS,
   };
 
   try {
@@ -322,15 +309,12 @@ export async function getFolderStructure(
     // 2. Format the structure into a string
     const structureLines: string[] = [];
     // Pass true for isRoot for the initial call
-    formatStructure(structureRoot, '', true, true, structureLines);
+    formatStructure(structureRoot, "", true, true, structureLines);
 
     // 3. Build the final output string
-    return `Showing up to ${mergedOptions.maxItems} items:\n\n${resolvedPath}${path.sep}\n${structureLines.join('\n')}`;
+    return `Showing up to ${mergedOptions.maxItems} items:\n\n${resolvedPath}${path.sep}\n${structureLines.join("\n")}`;
   } catch (error: unknown) {
-    debugLogger.error(
-      `Error getting folder structure for ${resolvedPath}:`,
-      error,
-    );
+    debugLogger.error(`Error getting folder structure for ${resolvedPath}:`, error);
     return `Error processing directory "${resolvedPath}": ${getErrorMessage(error)}`;
   }
 }
diff --git a/packages/airiscode-core/src/utils/getPty.ts b/packages/airiscode-core/src/utils/getPty.ts
index 2d7cb16fc..2e61bc620 100644
--- a/packages/airiscode-core/src/utils/getPty.ts
+++ b/packages/airiscode-core/src/utils/getPty.ts
@@ -7,7 +7,7 @@
 export type PtyImplementation = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   module: any;
-  name: 'lydell-node-pty' | 'node-pty';
+  name: "lydell-node-pty" | "node-pty";
 } | null;
 
 export interface PtyProcess {
@@ -19,14 +19,14 @@ export interface PtyProcess {
 
 export const getPty = async (): Promise<PtyImplementation> => {
   try {
-    const lydell = '@lydell/node-pty';
+    const lydell = "@lydell/node-pty";
     const module = await import(lydell);
-    return { module, name: 'lydell-node-pty' };
+    return { module, name: "lydell-node-pty" };
   } catch (_e) {
     try {
-      const nodePty = 'node-pty';
+      const nodePty = "node-pty";
       const module = await import(nodePty);
-      return { module, name: 'node-pty' };
+      return { module, name: "node-pty" };
     } catch (_e2) {
       return null;
     }
diff --git a/packages/airiscode-core/src/utils/gitIgnoreParser.ts b/packages/airiscode-core/src/utils/gitIgnoreParser.ts
index 21d83651a..a9fea265c 100644
--- a/packages/airiscode-core/src/utils/gitIgnoreParser.ts
+++ b/packages/airiscode-core/src/utils/gitIgnoreParser.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import ignore from 'ignore';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import ignore from "ignore";
 
 export interface GitIgnoreFilter {
   isIgnored(filePath: string): boolean;
@@ -24,81 +24,79 @@ export class GitIgnoreParser implements GitIgnoreFilter {
   private loadPatternsForFile(patternsFilePath: string): string[] {
     let content: string;
     try {
-      content = fs.readFileSync(patternsFilePath, 'utf-8');
+      content = fs.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       return [];
     }
 
-    const isExcludeFile = patternsFilePath.endsWith(
-      path.join('.git', 'info', 'exclude'),
-    );
+    const isExcludeFile = patternsFilePath.endsWith(path.join(".git", "info", "exclude"));
 
     const relativeBaseDir = isExcludeFile
-      ? '.'
+      ? "."
       : path.dirname(path.relative(this.projectRoot, patternsFilePath));
 
     return content
-      .split('\n')
+      .split("\n")
       .map((p) => p.trim())
-      .filter((p) => p !== '' && !p.startsWith('#'))
+      .filter((p) => p !== "" && !p.startsWith("#"))
       .map((p) => {
-        const isNegative = p.startsWith('!');
+        const isNegative = p.startsWith("!");
         if (isNegative) {
           p = p.substring(1);
         }
 
-        const isAnchoredInFile = p.startsWith('/');
+        const isAnchoredInFile = p.startsWith("/");
         if (isAnchoredInFile) {
           p = p.substring(1);
         }
 
         // An empty pattern can result from a negated pattern like `!`,
         // which we can ignore.
-        if (p === '') {
-          return '';
+        if (p === "") {
+          return "";
         }
 
         let newPattern = p;
-        if (relativeBaseDir && relativeBaseDir !== '.') {
+        if (relativeBaseDir && relativeBaseDir !== ".") {
           // Only in nested .gitignore files, the patterns need to be modified according to:
           // - If `a/b/.gitignore` defines `/c` then it needs to be changed to `/a/b/c`
           // - If `a/b/.gitignore` defines `c` then it needs to be changed to `/a/b/**/c`
           // - If `a/b/.gitignore` defines `c/d` then it needs to be changed to `/a/b/c/d`
 
-          if (!isAnchoredInFile && !p.includes('/')) {
+          if (!isAnchoredInFile && !p.includes("/")) {
             // If no slash and not anchored in file, it matches files in any
             // subdirectory.
-            newPattern = path.join('**', p);
+            newPattern = path.join("**", p);
           }
 
           // Prepend the .gitignore file's directory.
           newPattern = path.join(relativeBaseDir, newPattern);
 
           // Anchor the pattern to a nested gitignore directory.
-          if (!newPattern.startsWith('/')) {
-            newPattern = '/' + newPattern;
+          if (!newPattern.startsWith("/")) {
+            newPattern = "/" + newPattern;
           }
         }
 
         // Anchor the pattern if originally anchored
-        if (isAnchoredInFile && !newPattern.startsWith('/')) {
-          newPattern = '/' + newPattern;
+        if (isAnchoredInFile && !newPattern.startsWith("/")) {
+          newPattern = "/" + newPattern;
         }
 
         if (isNegative) {
-          newPattern = '!' + newPattern;
+          newPattern = "!" + newPattern;
         }
 
         // Even in windows, Ignore expects forward slashes.
-        newPattern = newPattern.replace(/\\/g, '/');
+        newPattern = newPattern.replace(/\\/g, "/");
 
         return newPattern;
       })
-      .filter((p) => p !== '');
+      .filter((p) => p !== "");
   }
 
   isIgnored(filePath: string): boolean {
-    if (!filePath || typeof filePath !== 'string') {
+    if (!filePath || typeof filePath !== "string") {
       return false;
     }
 
@@ -111,30 +109,25 @@ export class GitIgnoreParser implements GitIgnoreFilter {
       const resolved = path.resolve(this.projectRoot, filePath);
       const relativePath = path.relative(this.projectRoot, resolved);
 
-      if (relativePath === '' || relativePath.startsWith('..')) {
+      if (relativePath === "" || relativePath.startsWith("..")) {
         return false;
       }
 
       // Even in windows, Ignore expects forward slashes.
-      const normalizedPath = relativePath.replace(/\\/g, '/');
+      const normalizedPath = relativePath.replace(/\\/g, "/");
 
-      if (normalizedPath.startsWith('/') || normalizedPath === '') {
+      if (normalizedPath.startsWith("/") || normalizedPath === "") {
         return false;
       }
 
       const ig = ignore();
 
       // Always ignore .git directory
-      ig.add('.git');
+      ig.add(".git");
 
       // Load global patterns from .git/info/exclude on first call
       if (this.globalPatterns === undefined) {
-        const excludeFile = path.join(
-          this.projectRoot,
-          '.git',
-          'info',
-          'exclude',
-        );
+        const excludeFile = path.join(this.projectRoot, ".git", "info", "exclude");
         this.globalPatterns = fs.existsSync(excludeFile)
           ? this.loadPatternsForFile(excludeFile)
           : [];
@@ -154,7 +147,7 @@ export class GitIgnoreParser implements GitIgnoreFilter {
       for (const dir of dirsToVisit) {
         const relativeDir = path.relative(this.projectRoot, dir);
         if (relativeDir) {
-          const normalizedRelativeDir = relativeDir.replace(/\\/g, '/');
+          const normalizedRelativeDir = relativeDir.replace(/\\/g, "/");
           if (ig.ignores(normalizedRelativeDir)) {
             // This directory is ignored by an ancestor's .gitignore.
             // According to git behavior, we don't need to process this
@@ -170,7 +163,7 @@ export class GitIgnoreParser implements GitIgnoreFilter {
             ig.add(patterns);
           }
         } else {
-          const gitignorePath = path.join(dir, '.gitignore');
+          const gitignorePath = path.join(dir, ".gitignore");
           if (fs.existsSync(gitignorePath)) {
             const patterns = this.loadPatternsForFile(gitignorePath);
             this.cache.set(dir, patterns);
diff --git a/packages/airiscode-core/src/utils/gitUtils.ts b/packages/airiscode-core/src/utils/gitUtils.ts
index 493c89bd6..b22ea861a 100644
--- a/packages/airiscode-core/src/utils/gitUtils.ts
+++ b/packages/airiscode-core/src/utils/gitUtils.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { execSync } from 'node:child_process';
+import { execSync } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
 
 /**
  * Checks if a directory is within a git repository
@@ -18,7 +18,7 @@ export function isGitRepository(directory: string): boolean {
     let currentDir = path.resolve(directory);
 
     while (true) {
-      const gitDir = path.join(currentDir, '.git');
+      const gitDir = path.join(currentDir, ".git");
 
       // Check if .git exists (either as directory or file for worktrees)
       if (fs.existsSync(gitDir)) {
@@ -52,7 +52,7 @@ export function findGitRoot(directory: string): string | null {
     let currentDir = path.resolve(directory);
 
     while (true) {
-      const gitDir = path.join(currentDir, '.git');
+      const gitDir = path.join(currentDir, ".git");
 
       if (fs.existsSync(gitDir)) {
         return currentDir;
@@ -78,10 +78,10 @@ export function findGitRoot(directory: string): string | null {
  */
 export const getGitBranch = (cwd: string): string | undefined => {
   try {
-    const branch = execSync('git rev-parse --abbrev-ref HEAD', {
+    const branch = execSync("git rev-parse --abbrev-ref HEAD", {
       cwd,
-      encoding: 'utf8',
-      stdio: ['pipe', 'pipe', 'pipe'],
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
     }).trim();
     return branch || undefined;
   } catch {
@@ -96,10 +96,10 @@ export const getGitBranch = (cwd: string): string | undefined => {
 export const getGitRepoName = (cwd: string): string | undefined => {
   try {
     // Try to get the repository name from the remote URL
-    const remoteUrl = execSync('git remote get-url origin', {
+    const remoteUrl = execSync("git remote get-url origin", {
       cwd,
-      encoding: 'utf8',
-      stdio: ['pipe', 'pipe', 'pipe'],
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
     }).trim();
 
     if (remoteUrl) {
@@ -111,16 +111,16 @@ export const getGitRepoName = (cwd: string): string | undefined => {
 
       // Handle SSH format: git@host.com:owner/repo.git
       let normalizedUrl = remoteUrl;
-      if (remoteUrl.startsWith('git@')) {
-        normalizedUrl = remoteUrl.replace(/^git@[^:]+:/, 'https://host.com/');
+      if (remoteUrl.startsWith("git@")) {
+        normalizedUrl = remoteUrl.replace(/^git@[^:]+:/, "https://host.com/");
       }
 
       try {
         const url = new URL(normalizedUrl);
         // Remove .git suffix and split path
         const pathParts = url.pathname
-          .replace(/\.git$/, '')
-          .split('/')
+          .replace(/\.git$/, "")
+          .split("/")
           .filter(Boolean);
         if (pathParts.length >= 2) {
           // Return owner/repo format
diff --git a/packages/airiscode-core/src/utils/iconvHelper.ts b/packages/airiscode-core/src/utils/iconvHelper.ts
index 12c1a56c8..fbdafb95a 100644
--- a/packages/airiscode-core/src/utils/iconvHelper.ts
+++ b/packages/airiscode-core/src/utils/iconvHelper.ts
@@ -20,7 +20,8 @@ interface IconvLite {
 // iconv-lite is a CJS module. Under NodeNext resolution, its ambient type
 // declarations don't map correctly. We import the default export (which is
 // the CJS module.exports object) and cast it to a proper interface.
-import iconvModule from 'iconv-lite';
+import iconvModule from "iconv-lite";
+
 const iconvLite: IconvLite = iconvModule as unknown as IconvLite;
 
 /**
@@ -60,6 +61,6 @@ export function iconvEncodingExists(encoding: string): boolean {
  * @returns True if the encoding is UTF-8 or ASCII compatible
  */
 export function isUtf8CompatibleEncoding(encoding: string): boolean {
-  const lower = encoding.toLowerCase().replace(/[^a-z0-9]/g, '');
-  return lower === 'utf8' || lower === 'ascii' || lower === 'usascii';
+  const lower = encoding.toLowerCase().replace(/[^a-z0-9]/g, "");
+  return lower === "utf8" || lower === "ascii" || lower === "usascii";
 }
diff --git a/packages/airiscode-core/src/utils/ignorePatterns.ts b/packages/airiscode-core/src/utils/ignorePatterns.ts
index b4a4c2e40..71834cef5 100644
--- a/packages/airiscode-core/src/utils/ignorePatterns.ts
+++ b/packages/airiscode-core/src/utils/ignorePatterns.ts
@@ -4,49 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import type { Config } from '../config/config.js';
-import { getAllGeminiMdFilenames } from '../tools/memoryTool.js';
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { getAllGeminiMdFilenames } from "../tools/memoryTool.js";
 
 /**
  * Common ignore patterns used across multiple tools for basic exclusions.
  * These are the most commonly ignored directories in development projects.
  */
 export const COMMON_IGNORE_PATTERNS: string[] = [
-  '**/node_modules/**',
-  '**/.git/**',
-  '**/bower_components/**',
-  '**/.svn/**',
-  '**/.hg/**',
+  "**/node_modules/**",
+  "**/.git/**",
+  "**/bower_components/**",
+  "**/.svn/**",
+  "**/.hg/**",
 ];
 
 /**
  * Binary file extension patterns that are typically excluded from text processing.
  */
 export const BINARY_FILE_PATTERNS: string[] = [
-  '**/*.bin',
-  '**/*.exe',
-  '**/*.dll',
-  '**/*.so',
-  '**/*.dylib',
-  '**/*.class',
-  '**/*.jar',
-  '**/*.war',
-  '**/*.zip',
-  '**/*.tar',
-  '**/*.gz',
-  '**/*.bz2',
-  '**/*.rar',
-  '**/*.7z',
-  '**/*.doc',
-  '**/*.docx',
-  '**/*.xls',
-  '**/*.xlsx',
-  '**/*.ppt',
-  '**/*.pptx',
-  '**/*.odt',
-  '**/*.ods',
-  '**/*.odp',
+  "**/*.bin",
+  "**/*.exe",
+  "**/*.dll",
+  "**/*.so",
+  "**/*.dylib",
+  "**/*.class",
+  "**/*.jar",
+  "**/*.war",
+  "**/*.zip",
+  "**/*.tar",
+  "**/*.gz",
+  "**/*.bz2",
+  "**/*.rar",
+  "**/*.7z",
+  "**/*.doc",
+  "**/*.docx",
+  "**/*.xls",
+  "**/*.xlsx",
+  "**/*.ppt",
+  "**/*.pptx",
+  "**/*.odt",
+  "**/*.ods",
+  "**/*.odp",
 ];
 
 /**
@@ -54,37 +54,37 @@ export const BINARY_FILE_PATTERNS: string[] = [
  * These files can be processed as inlineData when explicitly requested.
  */
 export const MEDIA_FILE_PATTERNS: string[] = [
-  '**/*.pdf',
-  '**/*.png',
-  '**/*.jpg',
-  '**/*.jpeg',
-  '**/*.gif',
-  '**/*.webp',
-  '**/*.bmp',
-  '**/*.svg',
+  "**/*.pdf",
+  "**/*.png",
+  "**/*.jpg",
+  "**/*.jpeg",
+  "**/*.gif",
+  "**/*.webp",
+  "**/*.bmp",
+  "**/*.svg",
 ];
 
 /**
  * Common directory patterns that are typically ignored in development projects.
  */
 export const COMMON_DIRECTORY_EXCLUDES: string[] = [
-  '**/.vscode/**',
-  '**/.idea/**',
-  '**/dist/**',
-  '**/build/**',
-  '**/coverage/**',
-  '**/__pycache__/**',
+  "**/.vscode/**",
+  "**/.idea/**",
+  "**/dist/**",
+  "**/build/**",
+  "**/coverage/**",
+  "**/__pycache__/**",
 ];
 
 /**
  * Python-specific patterns.
  */
-export const PYTHON_EXCLUDES: string[] = ['**/*.pyc', '**/*.pyo'];
+export const PYTHON_EXCLUDES: string[] = ["**/*.pyc", "**/*.pyo"];
 
 /**
  * System and environment file patterns.
  */
-export const SYSTEM_FILE_EXCLUDES: string[] = ['**/.DS_Store', '**/.env'];
+export const SYSTEM_FILE_EXCLUDES: string[] = ["**/.DS_Store", "**/.env"];
 
 /**
  * Comprehensive file exclusion patterns combining all common ignore patterns.
@@ -224,23 +224,23 @@ export class FileExclusions {
 export function extractExtensionsFromPatterns(patterns: string[]): string[] {
   const extensions = new Set(
     patterns
-      .filter((pattern) => pattern.includes('*.'))
+      .filter((pattern) => pattern.includes("*."))
       .flatMap((pattern) => {
-        const extPart = pattern.substring(pattern.lastIndexOf('*.') + 1);
+        const extPart = pattern.substring(pattern.lastIndexOf("*.") + 1);
         // Handle brace expansion e.g. `**/*.{jpg,png}`
-        if (extPart.startsWith('.{') && extPart.endsWith('}')) {
+        if (extPart.startsWith(".{") && extPart.endsWith("}")) {
           const inner = extPart.slice(2, -1); // get 'jpg,png'
           return inner
-            .split(',')
+            .split(",")
             .map((ext) => `.${ext.trim()}`)
-            .filter((ext) => ext !== '.');
+            .filter((ext) => ext !== ".");
         }
         // Handle simple/compound/dotfile extensions
         if (
-          extPart.startsWith('.') &&
-          !extPart.includes('/') &&
-          !extPart.includes('{') &&
-          !extPart.includes('}')
+          extPart.startsWith(".") &&
+          !extPart.includes("/") &&
+          !extPart.includes("{") &&
+          !extPart.includes("}")
         ) {
           // Using path.extname on a dummy file handles various cases like
           // '.tar.gz' -> '.gz' and '.profile' -> '.profile' correctly.
@@ -248,9 +248,7 @@ export function extractExtensionsFromPatterns(patterns: string[]): string[] {
           // If extname returns empty (e.g. for '.'), use the original part.
           // Then filter out empty or '.' results and invalid double dot patterns.
           const result = extracted || extPart;
-          return result && result !== '.' && !result.substring(1).includes('.')
-            ? [result]
-            : [];
+          return result && result !== "." && !result.substring(1).includes(".") ? [result] : [];
         }
         return [];
       }),
@@ -269,10 +267,10 @@ export const BINARY_EXTENSIONS: string[] = [
     ...PYTHON_EXCLUDES,
   ]),
   // Additional binary extensions not in the main patterns
-  '.dat',
-  '.obj',
-  '.o',
-  '.a',
-  '.lib',
-  '.wasm',
+  ".dat",
+  ".obj",
+  ".o",
+  ".a",
+  ".lib",
+  ".wasm",
 ].sort();
diff --git a/packages/airiscode-core/src/utils/installationManager.ts b/packages/airiscode-core/src/utils/installationManager.ts
index c81355bf4..8dc16d3c8 100644
--- a/packages/airiscode-core/src/utils/installationManager.ts
+++ b/packages/airiscode-core/src/utils/installationManager.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import { createDebugLogger } from '../utils/debugLogger.js';
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { Storage } from "../config/storage.js";
+import { createDebugLogger } from "../utils/debugLogger.js";
 
-const debugLogger = createDebugLogger('INSTALLATION');
+const debugLogger = createDebugLogger("INSTALLATION");
 
 export class InstallationManager {
   private getInstallationIdPath(): string {
@@ -20,9 +20,7 @@ export class InstallationManager {
   private readInstallationIdFromFile(): string | null {
     const installationIdFile = this.getInstallationIdPath();
     if (fs.existsSync(installationIdFile)) {
-      const installationid = fs
-        .readFileSync(installationIdFile, 'utf-8')
-        .trim();
+      const installationid = fs.readFileSync(installationIdFile, "utf-8").trim();
       return installationid || null;
     }
     return null;
@@ -32,7 +30,7 @@ export class InstallationManager {
     const installationIdFile = this.getInstallationIdPath();
     const dir = path.dirname(installationIdFile);
     fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(installationIdFile, installationId, 'utf-8');
+    fs.writeFileSync(installationIdFile, installationId, "utf-8");
   }
 
   /**
@@ -51,11 +49,8 @@ export class InstallationManager {
 
       return installationId;
     } catch (error) {
-      debugLogger.error(
-        'Error accessing installation ID file, generating ephemeral ID:',
-        error,
-      );
-      return '123456789';
+      debugLogger.error("Error accessing installation ID file, generating ephemeral ID:", error);
+      return "123456789";
     }
   }
 }
diff --git a/packages/airiscode-core/src/utils/internalPromptIds.ts b/packages/airiscode-core/src/utils/internalPromptIds.ts
index 8a178d783..3c62d23a6 100644
--- a/packages/airiscode-core/src/utils/internalPromptIds.ts
+++ b/packages/airiscode-core/src/utils/internalPromptIds.ts
@@ -12,9 +12,9 @@
 
 /** Prompt IDs that belong to internal background operations. */
 const INTERNAL_PROMPT_IDS: ReadonlySet<string> = new Set([
-  'prompt_suggestion',
-  'forked_query',
-  'speculation',
+  "prompt_suggestion",
+  "forked_query",
+  "speculation",
 ]);
 
 /**
diff --git a/packages/airiscode-core/src/utils/jsonl-utils.ts b/packages/airiscode-core/src/utils/jsonl-utils.ts
index 7c74282ef..804c2f639 100644
--- a/packages/airiscode-core/src/utils/jsonl-utils.ts
+++ b/packages/airiscode-core/src/utils/jsonl-utils.ts
@@ -21,13 +21,13 @@
  * - exists() - Checks if file exists and is non-empty
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import readline from 'node:readline';
-import { Mutex } from 'async-mutex';
-import { createDebugLogger } from './debugLogger.js';
+import fs from "node:fs";
+import path from "node:path";
+import readline from "node:readline";
+import { Mutex } from "async-mutex";
+import { createDebugLogger } from "./debugLogger.js";
 
-const debugLogger = createDebugLogger('JSONL');
+const debugLogger = createDebugLogger("JSONL");
 
 /**
  * A map of file paths to mutexes for preventing concurrent writes.
@@ -48,10 +48,7 @@ function getFileLock(filePath: string): Mutex {
  * Reads the first N lines from a JSONL file efficiently.
  * Returns an array of parsed objects.
  */
-export async function readLines<T = unknown>(
-  filePath: string,
-  count: number,
-): Promise<T[]> {
+export async function readLines<T = unknown>(filePath: string, count: number): Promise<T[]> {
   try {
     const fileStream = fs.createReadStream(filePath);
     const rl = readline.createInterface({
@@ -70,11 +67,8 @@ export async function readLines<T = unknown>(
 
     return results;
   } catch (error) {
-    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-      debugLogger.error(
-        `Error reading first ${count} lines from ${filePath}:`,
-        error,
-      );
+    if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+      debugLogger.error(`Error reading first ${count} lines from ${filePath}:`, error);
     }
     return [];
   }
@@ -102,7 +96,7 @@ export async function read<T = unknown>(filePath: string): Promise<T[]> {
 
     return results;
   } catch (error) {
-    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+    if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
       debugLogger.error(`Error reading ${filePath}:`, error);
     }
     return [];
@@ -113,10 +107,7 @@ export async function read<T = unknown>(filePath: string): Promise<T[]> {
  * Appends a line to a JSONL file with concurrency control.
  * This method uses a mutex to ensure only one write happens at a time per file.
  */
-export async function writeLine(
-  filePath: string,
-  data: unknown,
-): Promise<void> {
+export async function writeLine(filePath: string, data: unknown): Promise<void> {
   const lock = getFileLock(filePath);
   await lock.runExclusive(() => {
     const line = `${JSON.stringify(data)}\n`;
@@ -125,7 +116,7 @@ export async function writeLine(
     if (!fs.existsSync(dir)) {
       fs.mkdirSync(dir, { recursive: true });
     }
-    fs.appendFileSync(filePath, line, 'utf8');
+    fs.appendFileSync(filePath, line, "utf8");
   });
 }
 
@@ -140,7 +131,7 @@ export function writeLineSync(filePath: string, data: unknown): void {
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  fs.appendFileSync(filePath, line, 'utf8');
+  fs.appendFileSync(filePath, line, "utf8");
 }
 
 /**
@@ -148,13 +139,13 @@ export function writeLineSync(filePath: string, data: unknown): void {
  * Each object will be written as a separate line.
  */
 export function write(filePath: string, data: unknown[]): void {
-  const lines = data.map((item) => JSON.stringify(item)).join('\n');
+  const lines = data.map((item) => JSON.stringify(item)).join("\n");
   // Ensure directory exists before writing
   const dir = path.dirname(filePath);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  fs.writeFileSync(filePath, `${lines}\n`, 'utf8');
+  fs.writeFileSync(filePath, `${lines}\n`, "utf8");
 }
 
 /**
@@ -176,7 +167,7 @@ export async function countLines(filePath: string): Promise<number> {
     }
     return count;
   } catch (error) {
-    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+    if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
       debugLogger.error(`Error counting lines in ${filePath}:`, error);
     }
     return 0;
diff --git a/packages/airiscode-core/src/utils/language-detection.ts b/packages/airiscode-core/src/utils/language-detection.ts
index ebbefe8b3..6335bd9b0 100644
--- a/packages/airiscode-core/src/utils/language-detection.ts
+++ b/packages/airiscode-core/src/utils/language-detection.ts
@@ -4,93 +4,93 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
+import * as path from "node:path";
 
 const extensionToLanguageMap: { [key: string]: string } = {
-  '.ts': 'TypeScript',
-  '.js': 'JavaScript',
-  '.mjs': 'JavaScript',
-  '.cjs': 'JavaScript',
-  '.jsx': 'JavaScript',
-  '.tsx': 'TypeScript',
-  '.py': 'Python',
-  '.java': 'Java',
-  '.go': 'Go',
-  '.rb': 'Ruby',
-  '.php': 'PHP',
-  '.phtml': 'PHP',
-  '.cs': 'C#',
-  '.cpp': 'C++',
-  '.cxx': 'C++',
-  '.cc': 'C++',
-  '.c': 'C',
-  '.h': 'C/C++',
-  '.hpp': 'C++',
-  '.swift': 'Swift',
-  '.kt': 'Kotlin',
-  '.rs': 'Rust',
-  '.m': 'Objective-C',
-  '.mm': 'Objective-C',
-  '.pl': 'Perl',
-  '.pm': 'Perl',
-  '.lua': 'Lua',
-  '.r': 'R',
-  '.scala': 'Scala',
-  '.sc': 'Scala',
-  '.sh': 'Shell',
-  '.ps1': 'PowerShell',
-  '.bat': 'Batch',
-  '.cmd': 'Batch',
-  '.sql': 'SQL',
-  '.html': 'HTML',
-  '.htm': 'HTML',
-  '.css': 'CSS',
-  '.less': 'Less',
-  '.sass': 'Sass',
-  '.scss': 'Sass',
-  '.json': 'JSON',
-  '.xml': 'XML',
-  '.yaml': 'YAML',
-  '.yml': 'YAML',
-  '.md': 'Markdown',
-  '.markdown': 'Markdown',
-  '.dockerfile': 'Dockerfile',
-  '.vim': 'Vim script',
-  '.vb': 'Visual Basic',
-  '.fs': 'F#',
-  '.clj': 'Clojure',
-  '.cljs': 'Clojure',
-  '.dart': 'Dart',
-  '.ex': 'Elixir',
-  '.erl': 'Erlang',
-  '.hs': 'Haskell',
-  '.lisp': 'Lisp',
-  '.rkt': 'Racket',
-  '.groovy': 'Groovy',
-  '.jl': 'Julia',
-  '.tex': 'LaTeX',
-  '.ino': 'Arduino',
-  '.asm': 'Assembly',
-  '.s': 'Assembly',
-  '.toml': 'TOML',
-  '.vue': 'Vue',
-  '.svelte': 'Svelte',
-  '.gohtml': 'Go Template',
-  '.hbs': 'Handlebars',
-  '.ejs': 'EJS',
-  '.erb': 'ERB',
-  '.jsp': 'JSP',
-  '.dockerignore': 'Docker',
-  '.gitignore': 'Git',
-  '.npmignore': 'npm',
-  '.editorconfig': 'EditorConfig',
-  '.prettierrc': 'Prettier',
-  '.eslintrc': 'ESLint',
-  '.babelrc': 'Babel',
-  '.tsconfig': 'TypeScript',
-  '.flow': 'Flow',
-  '.graphql': 'GraphQL',
-  '.proto': 'Protocol Buffers',
+  ".ts": "TypeScript",
+  ".js": "JavaScript",
+  ".mjs": "JavaScript",
+  ".cjs": "JavaScript",
+  ".jsx": "JavaScript",
+  ".tsx": "TypeScript",
+  ".py": "Python",
+  ".java": "Java",
+  ".go": "Go",
+  ".rb": "Ruby",
+  ".php": "PHP",
+  ".phtml": "PHP",
+  ".cs": "C#",
+  ".cpp": "C++",
+  ".cxx": "C++",
+  ".cc": "C++",
+  ".c": "C",
+  ".h": "C/C++",
+  ".hpp": "C++",
+  ".swift": "Swift",
+  ".kt": "Kotlin",
+  ".rs": "Rust",
+  ".m": "Objective-C",
+  ".mm": "Objective-C",
+  ".pl": "Perl",
+  ".pm": "Perl",
+  ".lua": "Lua",
+  ".r": "R",
+  ".scala": "Scala",
+  ".sc": "Scala",
+  ".sh": "Shell",
+  ".ps1": "PowerShell",
+  ".bat": "Batch",
+  ".cmd": "Batch",
+  ".sql": "SQL",
+  ".html": "HTML",
+  ".htm": "HTML",
+  ".css": "CSS",
+  ".less": "Less",
+  ".sass": "Sass",
+  ".scss": "Sass",
+  ".json": "JSON",
+  ".xml": "XML",
+  ".yaml": "YAML",
+  ".yml": "YAML",
+  ".md": "Markdown",
+  ".markdown": "Markdown",
+  ".dockerfile": "Dockerfile",
+  ".vim": "Vim script",
+  ".vb": "Visual Basic",
+  ".fs": "F#",
+  ".clj": "Clojure",
+  ".cljs": "Clojure",
+  ".dart": "Dart",
+  ".ex": "Elixir",
+  ".erl": "Erlang",
+  ".hs": "Haskell",
+  ".lisp": "Lisp",
+  ".rkt": "Racket",
+  ".groovy": "Groovy",
+  ".jl": "Julia",
+  ".tex": "LaTeX",
+  ".ino": "Arduino",
+  ".asm": "Assembly",
+  ".s": "Assembly",
+  ".toml": "TOML",
+  ".vue": "Vue",
+  ".svelte": "Svelte",
+  ".gohtml": "Go Template",
+  ".hbs": "Handlebars",
+  ".ejs": "EJS",
+  ".erb": "ERB",
+  ".jsp": "JSP",
+  ".dockerignore": "Docker",
+  ".gitignore": "Git",
+  ".npmignore": "npm",
+  ".editorconfig": "EditorConfig",
+  ".prettierrc": "Prettier",
+  ".eslintrc": "ESLint",
+  ".babelrc": "Babel",
+  ".tsconfig": "TypeScript",
+  ".flow": "Flow",
+  ".graphql": "GraphQL",
+  ".proto": "Protocol Buffers",
 };
 
 export function getLanguageFromFilePath(filePath: string): string | undefined {
diff --git a/packages/airiscode-core/src/utils/memoryDiscovery.ts b/packages/airiscode-core/src/utils/memoryDiscovery.ts
index 342412fd2..1d5d96f54 100644
--- a/packages/airiscode-core/src/utils/memoryDiscovery.ts
+++ b/packages/airiscode-core/src/utils/memoryDiscovery.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as fsSync from 'node:fs';
-import * as path from 'node:path';
-import { homedir } from 'node:os';
-import { getAllGeminiMdFilenames } from '../tools/memoryTool.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { processImports } from './memoryImportProcessor.js';
-import { AIRISCODE_DIR } from './paths.js';
-import { createDebugLogger } from './debugLogger.js';
-
-const logger = createDebugLogger('MEMORY_DISCOVERY');
+import * as fsSync from "node:fs";
+import * as fs from "node:fs/promises";
+import { homedir } from "node:os";
+import * as path from "node:path";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { getAllGeminiMdFilenames } from "../tools/memoryTool.js";
+import { createDebugLogger } from "./debugLogger.js";
+import { processImports } from "./memoryImportProcessor.js";
+import { AIRISCODE_DIR } from "./paths.js";
+
+const logger = createDebugLogger("MEMORY_DISCOVERY");
 
 interface GeminiFileContent {
   filePath: string;
@@ -24,7 +24,7 @@ interface GeminiFileContent {
 async function findProjectRoot(startDir: string): Promise<string | null> {
   let currentDir = path.resolve(startDir);
   while (true) {
-    const gitPath = path.join(currentDir, '.git');
+    const gitPath = path.join(currentDir, ".git");
     try {
       const stats = await fs.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -34,22 +34,19 @@ async function findProjectRoot(startDir: string): Promise<string | null> {
       // Don't log ENOENT errors as they're expected when .git doesn't exist
       // Also don't log errors in test environments, which often have mocked fs
       const isENOENT =
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'code' in error &&
-        (error as { code: string }).code === 'ENOENT';
+        "code" in error &&
+        (error as { code: string }).code === "ENOENT";
 
       // Only log unexpected errors in non-test environments
       // process.env['NODE_ENV'] === 'test' or VITEST are common test indicators
-      const isTestEnv =
-        process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
+      const isTestEnv = process.env["NODE_ENV"] === "test" || process.env["VITEST"];
 
       if (!isENOENT && !isTestEnv) {
-        if (typeof error === 'object' && error !== null && 'code' in error) {
+        if (typeof error === "object" && error !== null && "code" in error) {
           const fsError = error as { code: string; message: string };
-          logger.warn(
-            `Error checking for .git directory at ${gitPath}: ${fsError.message}`,
-          );
+          logger.warn(`Error checking for .git directory at ${gitPath}: ${fsError.message}`);
         } else {
           logger.warn(
             `Non-standard error checking for .git directory at ${gitPath}: ${String(error)}`,
@@ -73,10 +70,7 @@ async function getGeminiMdFilePathsInternal(
   extensionContextFilePaths: string[] = [],
   folderTrust: boolean,
 ): Promise<string[]> {
-  const dirs = new Set<string>([
-    ...includeDirectoriesToReadGemini,
-    currentWorkingDirectory,
-  ]);
+  const dirs = new Set<string>([...includeDirectoriesToReadGemini, currentWorkingDirectory]);
 
   // Process directories in parallel with concurrency limit to prevent EMFILE errors
   const CONCURRENT_LIMIT = 10;
@@ -98,7 +92,7 @@ async function getGeminiMdFilePathsInternal(
     const batchResults = await Promise.allSettled(batchPromises);
 
     for (const result of batchResults) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         pathsArrays.push(result.value);
       } else {
         const error = result.reason;
@@ -125,19 +119,13 @@ async function getGeminiMdFilePathsInternalForEachDir(
 
   for (const geminiMdFilename of geminiMdFilenames) {
     const resolvedHome = path.resolve(userHomePath);
-    const globalMemoryPath = path.join(
-      resolvedHome,
-      AIRISCODE_DIR,
-      geminiMdFilename,
-    );
+    const globalMemoryPath = path.join(resolvedHome, AIRISCODE_DIR, geminiMdFilename);
 
     // This part that finds the global file always runs.
     try {
       await fs.access(globalMemoryPath, fsSync.constants.R_OK);
       allPaths.add(globalMemoryPath);
-      logger.debug(
-        `Found readable global ${geminiMdFilename}: ${globalMemoryPath}`,
-      );
+      logger.debug(`Found readable global ${geminiMdFilename}: ${globalMemoryPath}`);
     } catch {
       // It's okay if it's not found.
     }
@@ -153,9 +141,7 @@ async function getGeminiMdFilePathsInternalForEachDir(
         await fs.access(homeContextPath, fsSync.constants.R_OK);
         if (homeContextPath !== globalMemoryPath) {
           allPaths.add(homeContextPath);
-          logger.debug(
-            `Found readable home ${geminiMdFilename}: ${homeContextPath}`,
-          );
+          logger.debug(`Found readable home ${geminiMdFilename}: ${homeContextPath}`);
         }
       } catch {
         // Not found, which is okay
@@ -164,18 +150,14 @@ async function getGeminiMdFilePathsInternalForEachDir(
       // FIX: Only perform the workspace search (upward scan from CWD to project root)
       // if a valid currentWorkingDirectory is provided and it's not the home directory.
       const resolvedCwd = path.resolve(dir);
-      logger.debug(
-        `Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`,
-      );
+      logger.debug(`Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`);
 
       const projectRoot = await findProjectRoot(resolvedCwd);
-      logger.debug(`Determined project root: ${projectRoot ?? 'None'}`);
+      logger.debug(`Determined project root: ${projectRoot ?? "None"}`);
 
       const upwardPaths: string[] = [];
       let currentDir = resolvedCwd;
-      const ultimateStopDir = projectRoot
-        ? path.dirname(projectRoot)
-        : path.dirname(resolvedHome);
+      const ultimateStopDir = projectRoot ? path.dirname(projectRoot) : path.dirname(resolvedHome);
 
       while (currentDir && currentDir !== path.dirname(currentDir)) {
         if (currentDir === path.join(resolvedHome, AIRISCODE_DIR)) {
@@ -210,16 +192,14 @@ async function getGeminiMdFilePathsInternalForEachDir(
   const finalPaths = Array.from(allPaths);
 
   logger.debug(
-    `Final ordered ${getAllGeminiMdFilenames()} paths to read: ${JSON.stringify(
-      finalPaths,
-    )}`,
+    `Final ordered ${getAllGeminiMdFilenames()} paths to read: ${JSON.stringify(finalPaths)}`,
   );
   return finalPaths;
 }
 
 async function readGeminiMdFiles(
   filePaths: string[],
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
 ): Promise<GeminiFileContent[]> {
   // Process files in parallel with concurrency limit to prevent EMFILE errors
   const CONCURRENT_LIMIT = 20; // Higher limit for file reads as they're typically faster
@@ -227,44 +207,40 @@ async function readGeminiMdFiles(
 
   for (let i = 0; i < filePaths.length; i += CONCURRENT_LIMIT) {
     const batch = filePaths.slice(i, i + CONCURRENT_LIMIT);
-    const batchPromises = batch.map(
-      async (filePath): Promise<GeminiFileContent> => {
-        try {
-          const content = await fs.readFile(filePath, 'utf-8');
-
-          // Process imports in the content
-          const processedResult = await processImports(
-            content,
-            path.dirname(filePath),
-            undefined,
-            undefined,
-            importFormat,
-          );
-          logger.debug(
-            `Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`,
+    const batchPromises = batch.map(async (filePath): Promise<GeminiFileContent> => {
+      try {
+        const content = await fs.readFile(filePath, "utf-8");
+
+        // Process imports in the content
+        const processedResult = await processImports(
+          content,
+          path.dirname(filePath),
+          undefined,
+          undefined,
+          importFormat,
+        );
+        logger.debug(
+          `Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`,
+        );
+
+        return { filePath, content: processedResult.content };
+      } catch (error: unknown) {
+        const isTestEnv = process.env["NODE_ENV"] === "test" || process.env["VITEST"];
+        if (!isTestEnv) {
+          const message = error instanceof Error ? error.message : String(error);
+          logger.warn(
+            `Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`,
           );
-
-          return { filePath, content: processedResult.content };
-        } catch (error: unknown) {
-          const isTestEnv =
-            process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
-          if (!isTestEnv) {
-            const message =
-              error instanceof Error ? error.message : String(error);
-            logger.warn(
-              `Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`,
-            );
-          }
-          logger.debug(`Failed to read: ${filePath}`);
-          return { filePath, content: null }; // Still include it with null content
         }
-      },
-    );
+        logger.debug(`Failed to read: ${filePath}`);
+        return { filePath, content: null }; // Still include it with null content
+      }
+    });
 
     const batchResults = await Promise.allSettled(batchPromises);
 
     for (const result of batchResults) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         results.push(result.value);
       } else {
         // This case shouldn't happen since we catch all errors above,
@@ -285,7 +261,7 @@ function concatenateInstructions(
   currentWorkingDirectoryForDisplay: string,
 ): string {
   return instructionContents
-    .filter((item) => typeof item.content === 'string')
+    .filter((item) => typeof item.content === "string")
     .map((item) => {
       const trimmedContent = (item.content as string).trim();
       if (trimmedContent.length === 0) {
@@ -297,7 +273,7 @@ function concatenateInstructions(
       return `--- Context from: ${displayPath} ---\n${trimmedContent}\n--- End of Context from: ${displayPath} ---`;
     })
     .filter((block): block is string => block !== null)
-    .join('\n\n');
+    .join("\n\n");
 }
 
 export interface LoadServerHierarchicalMemoryResponse {
@@ -315,7 +291,7 @@ export async function loadServerHierarchicalMemory(
   fileService: FileDiscoveryService,
   extensionContextFilePaths: string[] = [],
   folderTrust: boolean,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
 ): Promise<LoadServerHierarchicalMemoryResponse> {
   logger.debug(
     `Loading server hierarchical memory for CWD: ${currentWorkingDirectory} (importFormat: ${importFormat})`,
@@ -333,15 +309,12 @@ export async function loadServerHierarchicalMemory(
     folderTrust,
   );
   if (filePaths.length === 0) {
-    logger.debug('No AIRISCODE.md files found in hierarchy.');
-    return { memoryContent: '', fileCount: 0 };
+    logger.debug("No AIRISCODE.md files found in hierarchy.");
+    return { memoryContent: "", fileCount: 0 };
   }
   const contentsWithPaths = await readGeminiMdFiles(filePaths, importFormat);
   // Pass CWD for relative path display in concatenated content
-  const combinedInstructions = concatenateInstructions(
-    contentsWithPaths,
-    currentWorkingDirectory,
-  );
+  const combinedInstructions = concatenateInstructions(contentsWithPaths, currentWorkingDirectory);
 
   // Only count files that match configured memory filenames (e.g., AIRISCODE.md),
   // excluding system context files like output-language.md
diff --git a/packages/airiscode-core/src/utils/memoryImportProcessor.ts b/packages/airiscode-core/src/utils/memoryImportProcessor.ts
index 42a089e33..4179c9d8f 100644
--- a/packages/airiscode-core/src/utils/memoryImportProcessor.ts
+++ b/packages/airiscode-core/src/utils/memoryImportProcessor.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isSubpath } from './paths.js';
-import { marked, type Token } from 'marked';
-import { createDebugLogger } from './debugLogger.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { marked, type Token } from "marked";
+import { createDebugLogger } from "./debugLogger.js";
+import { isSubpath } from "./paths.js";
 
-const logger = createDebugLogger('IMPORT_PROCESSOR');
+const logger = createDebugLogger("IMPORT_PROCESSOR");
 
 /**
  * Interface for tracking import processing state to prevent circular imports
@@ -42,7 +42,7 @@ export interface ProcessImportsResult {
 async function findProjectRoot(startDir: string): Promise<string> {
   let currentDir = path.resolve(startDir);
   while (true) {
-    const gitPath = path.join(currentDir, '.git');
+    const gitPath = path.join(currentDir, ".git");
     try {
       const stats = await fs.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -65,10 +65,10 @@ async function findProjectRoot(startDir: string): Promise<string> {
 // Add a type guard for error objects
 function hasMessage(err: unknown): err is { message: string } {
   return (
-    typeof err === 'object' &&
+    typeof err === "object" &&
     err !== null &&
-    'message' in err &&
-    typeof (err as { message: unknown }).message === 'string'
+    "message" in err &&
+    typeof (err as { message: unknown }).message === "string"
   );
 }
 
@@ -77,16 +77,14 @@ function hasMessage(err: unknown): err is { message: string } {
  * Finds all import statements in content without using regex
  * @returns Array of {start, _end, path} objects for each import found
  */
-function findImports(
-  content: string,
-): Array<{ start: number; _end: number; path: string }> {
+function findImports(content: string): Array<{ start: number; _end: number; path: string }> {
   const imports: Array<{ start: number; _end: number; path: string }> = [];
   let i = 0;
   const len = content.length;
 
   while (i < len) {
     // Find next @ symbol
-    i = content.indexOf('@', i);
+    i = content.indexOf("@", i);
     if (i === -1) break;
 
     // Check if it's a word boundary (not part of another word)
@@ -97,12 +95,7 @@ function findImports(
 
     // Find the end of the import path (whitespace or newline)
     let j = i + 1;
-    while (
-      j < len &&
-      !isWhitespace(content[j]) &&
-      content[j] !== '\n' &&
-      content[j] !== '\r'
-    ) {
+    while (j < len && !isWhitespace(content[j]) && content[j] !== "\n" && content[j] !== "\r") {
       j++;
     }
 
@@ -112,9 +105,7 @@ function findImports(
     // Basic validation (starts with ./ or / or letter)
     if (
       importPath.length > 0 &&
-      (importPath[0] === '.' ||
-        importPath[0] === '/' ||
-        isLetter(importPath[0]))
+      (importPath[0] === "." || importPath[0] === "/" || isLetter(importPath[0]))
     ) {
       imports.push({
         start: i,
@@ -130,7 +121,7 @@ function findImports(
 }
 
 function isWhitespace(char: string): boolean {
-  return char === ' ' || char === '\t' || char === '\n' || char === '\r';
+  return char === " " || char === "\t" || char === "\n" || char === "\r";
 }
 
 function isLetter(char: string): boolean {
@@ -146,10 +137,10 @@ function isLetter(char: string): boolean {
  */
 function isFileNotFoundError(err: unknown): boolean {
   return (
-    typeof err === 'object' &&
+    typeof err === "object" &&
     err !== null &&
-    'code' in err &&
-    (err as { code: unknown }).code === 'ENOENT'
+    "code" in err &&
+    (err as { code: unknown }).code === "ENOENT"
   );
 }
 
@@ -159,11 +150,11 @@ function findCodeRegions(content: string): Array<[number, number]> {
   let offset = 0;
 
   function walk(token: Token, baseOffset: number) {
-    if (token.type === 'code' || token.type === 'codespan') {
+    if (token.type === "code" || token.type === "codespan") {
       regions.push([baseOffset, baseOffset + token.raw.length]);
     }
 
-    if ('tokens' in token && token.tokens) {
+    if ("tokens" in token && token.tokens) {
       let childOffset = 0;
       for (const child of token.tokens) {
         const childIndexInParent = token.raw.indexOf(child.raw, childOffset);
@@ -206,7 +197,7 @@ export async function processImports(
     currentDepth: 0,
   },
   projectRoot?: string,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
 ): Promise<ProcessImportsResult> {
   if (!projectRoot) {
     projectRoot = await findProjectRoot(basePath);
@@ -218,12 +209,12 @@ export async function processImports(
     );
     return {
       content,
-      importTree: { path: importState.currentFile || 'unknown' },
+      importTree: { path: importState.currentFile || "unknown" },
     };
   }
 
   // --- FLAT FORMAT LOGIC ---
-  if (importFormat === 'flat') {
+  if (importFormat === "flat") {
     // Use a queue to process files in order of first encounter, and a set to avoid duplicates
     const flatFiles: Array<{ path: string; content: string }> = [];
     // Track processed files across the entire operation
@@ -258,18 +249,13 @@ export async function processImports(
 
         // Skip if inside a code region
         if (
-          codeRegions.some(
-            ([regionStart, regionEnd]) =>
-              start >= regionStart && start < regionEnd,
-          )
+          codeRegions.some(([regionStart, regionEnd]) => start >= regionStart && start < regionEnd)
         ) {
           continue;
         }
 
         // Validate import path
-        if (
-          !validateImportPath(importPath, fileBasePath, [projectRoot || ''])
-        ) {
+        if (!validateImportPath(importPath, fileBasePath, [projectRoot || ""])) {
           continue;
         }
 
@@ -281,21 +267,16 @@ export async function processImports(
 
         try {
           await fs.access(fullPath);
-          const importedContent = await fs.readFile(fullPath, 'utf-8');
+          const importedContent = await fs.readFile(fullPath, "utf-8");
 
           // Process the imported file
-          await processFlat(
-            importedContent,
-            path.dirname(fullPath),
-            normalizedFullPath,
-            depth + 1,
-          );
+          await processFlat(importedContent, path.dirname(fullPath), normalizedFullPath, depth + 1);
         } catch (error) {
           // If file doesn't exist, silently skip this import (it's not a real import)
           // Only log warnings for other types of errors
           if (!isFileNotFoundError(error)) {
             logger.warn(
-              `Failed to import ${fullPath}: ${hasMessage(error) ? error.message : 'Unknown error'}`,
+              `Failed to import ${fullPath}: ${hasMessage(error) ? error.message : "Unknown error"}`,
             );
           }
           // Continue with other imports even if one fails
@@ -304,18 +285,13 @@ export async function processImports(
     }
 
     // Start with the root file (current file)
-    const rootPath = path.normalize(
-      importState.currentFile || path.resolve(basePath),
-    );
+    const rootPath = path.normalize(importState.currentFile || path.resolve(basePath));
     await processFlat(content, basePath, rootPath, 0);
 
     // Concatenate all unique files in order, Claude-style
     const flatContent = flatFiles
-      .map(
-        (f) =>
-          `--- File: ${f.path} ---\n${f.content.trim()}\n--- End of File: ${f.path} ---`,
-      )
-      .join('\n\n');
+      .map((f) => `--- File: ${f.path} ---\n${f.content.trim()}\n--- End of File: ${f.path} ---`)
+      .join("\n\n");
 
     return {
       content: flatContent,
@@ -325,7 +301,7 @@ export async function processImports(
 
   // --- TREE FORMAT LOGIC (existing) ---
   const codeRegions = findCodeRegions(content);
-  let result = '';
+  let result = "";
   let lastIndex = 0;
   const imports: MemoryFile[] = [];
   const importsList = findImports(content);
@@ -341,7 +317,7 @@ export async function processImports(
       continue;
     }
     // Validate import path to prevent path traversal attacks
-    if (!validateImportPath(importPath, basePath, [projectRoot || ''])) {
+    if (!validateImportPath(importPath, basePath, [projectRoot || ""])) {
       result += `<!-- Import failed: ${importPath} - Path traversal attempt -->`;
       continue;
     }
@@ -352,7 +328,7 @@ export async function processImports(
     }
     try {
       await fs.access(fullPath);
-      const fileContent = await fs.readFile(fullPath, 'utf-8');
+      const fileContent = await fs.readFile(fullPath, "utf-8");
       // Mark this file as processed for this import chain
       const newImportState: ImportState = {
         ...importState,
@@ -377,10 +353,10 @@ export async function processImports(
         continue;
       }
       // For other errors, log and add error comment
-      let message = 'Unknown error';
+      let message = "Unknown error";
       if (hasMessage(err)) {
         message = err.message;
-      } else if (typeof err === 'string') {
+      } else if (typeof err === "string") {
         message = err;
       }
       logger.error(`Failed to import ${importPath}: ${message}`);
@@ -393,7 +369,7 @@ export async function processImports(
   return {
     content: result,
     importTree: {
-      path: importState.currentFile || 'unknown',
+      path: importState.currentFile || "unknown",
       imports: imports.length > 0 ? imports : undefined,
     },
   };
@@ -411,7 +387,5 @@ export function validateImportPath(
 
   const resolvedPath = path.resolve(basePath, importPath);
 
-  return allowedDirectories.some((allowedDir) =>
-    isSubpath(allowedDir, resolvedPath),
-  );
+  return allowedDirectories.some((allowedDir) => isSubpath(allowedDir, resolvedPath));
 }
diff --git a/packages/airiscode-core/src/utils/messageInspectors.ts b/packages/airiscode-core/src/utils/messageInspectors.ts
index 02c1cb937..3e8034eaa 100644
--- a/packages/airiscode-core/src/utils/messageInspectors.ts
+++ b/packages/airiscode-core/src/utils/messageInspectors.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '../types/llm.js';
+import type { Content } from "../types/llm.js";
 
 export function isFunctionResponse(content: Content): boolean {
   return (
-    content.role === 'user' &&
+    content.role === "user" &&
     !!content.parts &&
     content.parts.every((part) => !!part.functionResponse)
   );
@@ -16,7 +16,7 @@ export function isFunctionResponse(content: Content): boolean {
 
 export function isFunctionCall(content: Content): boolean {
   return (
-    content.role === 'model' &&
+    content.role === "model" &&
     !!content.parts &&
     content.parts.every((part) => !!part.functionCall)
   );
diff --git a/packages/airiscode-core/src/utils/nextSpeakerChecker.ts b/packages/airiscode-core/src/utils/nextSpeakerChecker.ts
index a0767f46f..e73d84bb9 100644
--- a/packages/airiscode-core/src/utils/nextSpeakerChecker.ts
+++ b/packages/airiscode-core/src/utils/nextSpeakerChecker.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '../types/llm.js';
-import { DEFAULT_AIRISCODE_MODEL } from '../config/models.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import { isFunctionResponse } from './messageInspectors.js';
-import type { Config } from '../config/config.js';
-import { createDebugLogger } from './debugLogger.js';
+import type { Config } from "../config/config.js";
+import { DEFAULT_AIRISCODE_MODEL } from "../config/models.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import type { Content } from "../types/llm.js";
+import { createDebugLogger } from "./debugLogger.js";
+import { isFunctionResponse } from "./messageInspectors.js";
 
-const debugLogger = createDebugLogger('NEXT_SPEAKER');
+const debugLogger = createDebugLogger("NEXT_SPEAKER");
 
 const CHECK_PROMPT = `Analyze *only* the content and structure of your immediately preceding response (your last turn in the conversation history). Based *strictly* on that response, determine who should logically speak next: the 'user' or the 'model' (you).
 **Decision Rules (apply in order):**
@@ -20,26 +20,26 @@ const CHECK_PROMPT = `Analyze *only* the content and structure of your immediate
 3.  **Waiting for User:** If your last response completed a thought, statement, or task *and* does not meet the criteria for Rule 1 (Model Continues) or Rule 2 (Question to User), it implies a pause expecting user input or reaction. In this case, the **'user'** should speak next.`;
 
 const RESPONSE_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     reasoning: {
-      type: 'string',
+      type: "string",
       description:
         "Brief explanation justifying the 'next_speaker' choice based *strictly* on the applicable rule and the content/structure of the preceding turn.",
     },
     next_speaker: {
-      type: 'string',
-      enum: ['user', 'model'],
+      type: "string",
+      enum: ["user", "model"],
       description:
-        'Who should speak next based *only* on the preceding turn and the decision rules',
+        "Who should speak next based *only* on the preceding turn and the decision rules",
     },
   },
-  required: ['reasoning', 'next_speaker'],
+  required: ["reasoning", "next_speaker"],
 };
 
 export interface NextSpeakerResponse {
   reasoning: string;
-  next_speaker: 'user' | 'model';
+  next_speaker: "user" | "model";
 }
 
 export async function checkNextSpeaker(
@@ -67,40 +67,35 @@ export async function checkNextSpeaker(
   if (comprehensiveHistory.length === 0) {
     return null;
   }
-  const lastComprehensiveMessage =
-    comprehensiveHistory[comprehensiveHistory.length - 1];
+  const lastComprehensiveMessage = comprehensiveHistory[comprehensiveHistory.length - 1];
 
   // If the last message is a user message containing only function_responses,
   // then the model should speak next.
-  if (
-    lastComprehensiveMessage &&
-    isFunctionResponse(lastComprehensiveMessage)
-  ) {
+  if (lastComprehensiveMessage && isFunctionResponse(lastComprehensiveMessage)) {
     return {
-      reasoning:
-        'The last message was a function response, so the model should speak next.',
-      next_speaker: 'model',
+      reasoning: "The last message was a function response, so the model should speak next.",
+      next_speaker: "model",
     };
   }
 
   if (
     lastComprehensiveMessage &&
-    lastComprehensiveMessage.role === 'model' &&
+    lastComprehensiveMessage.role === "model" &&
     lastComprehensiveMessage.parts &&
     lastComprehensiveMessage.parts.length === 0
   ) {
-    lastComprehensiveMessage.parts.push({ text: '' });
+    lastComprehensiveMessage.parts.push({ text: "" });
     return {
       reasoning:
-        'The last message was a filler model message with no content (nothing for user to act on), model should speak next.',
-      next_speaker: 'model',
+        "The last message was a filler model message with no content (nothing for user to act on), model should speak next.",
+      next_speaker: "model",
     };
   }
 
   // Things checked out. Let's proceed to potentially making an LLM request.
 
   const lastMessage = curatedHistory[curatedHistory.length - 1];
-  if (!lastMessage || lastMessage.role !== 'model') {
+  if (!lastMessage || lastMessage.role !== "model") {
     // Cannot determine next speaker if the last turn wasn't from the model
     // or if history is empty.
     return null;
@@ -108,7 +103,7 @@ export async function checkNextSpeaker(
 
   const contents: Content[] = [
     ...curatedHistory,
-    { role: 'user', parts: [{ text: CHECK_PROMPT }] },
+    { role: "user", parts: [{ text: CHECK_PROMPT }] },
   ];
 
   try {
@@ -123,14 +118,14 @@ export async function checkNextSpeaker(
     if (
       parsedResponse &&
       parsedResponse.next_speaker &&
-      ['user', 'model'].includes(parsedResponse.next_speaker)
+      ["user", "model"].includes(parsedResponse.next_speaker)
     ) {
       return parsedResponse;
     }
     return null;
   } catch (error) {
     debugLogger.warn(
-      'Failed to talk to Gemini endpoint when seeing if conversation should continue.',
+      "Failed to talk to Gemini endpoint when seeing if conversation should continue.",
       error,
     );
     return null;
diff --git a/packages/airiscode-core/src/utils/openaiLogger.ts b/packages/airiscode-core/src/utils/openaiLogger.ts
index 43028de2c..09f9d9afe 100644
--- a/packages/airiscode-core/src/utils/openaiLogger.ts
+++ b/packages/airiscode-core/src/utils/openaiLogger.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import { promises as fs } from 'node:fs';
-import { v4 as uuidv4 } from 'uuid';
-import * as os from 'os';
-import { createDebugLogger } from './debugLogger.js';
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import * as os from "os";
+import { v4 as uuidv4 } from "uuid";
+import { createDebugLogger } from "./debugLogger.js";
 
-const debugLogger = createDebugLogger('OPENAI_LOGGER');
+const debugLogger = createDebugLogger("OPENAI_LOGGER");
 
 /**
  * Logger specifically for OpenAI API requests and responses
@@ -32,7 +32,7 @@ export class OpenAILogger {
       // Resolve relative paths to absolute paths
       // Handle ~ expansion
       let resolvedPath = customLogDir;
-      if (customLogDir === '~' || customLogDir.startsWith('~/')) {
+      if (customLogDir === "~" || customLogDir.startsWith("~/")) {
         resolvedPath = path.join(os.homedir(), customLogDir.slice(1));
       } else if (!path.isAbsolute(customLogDir)) {
         // If it's a relative path, resolve it relative to provided working directory
@@ -40,7 +40,7 @@ export class OpenAILogger {
       }
       this.logDir = path.normalize(resolvedPath);
     } else {
-      this.logDir = path.join(baseCwd, 'logs', 'openai');
+      this.logDir = path.join(baseCwd, "logs", "openai");
     }
   }
 
@@ -54,7 +54,7 @@ export class OpenAILogger {
       await fs.mkdir(this.logDir, { recursive: true });
       this.initialized = true;
     } catch (error) {
-      debugLogger.error('Failed to initialize OpenAI logger:', error);
+      debugLogger.error("Failed to initialize OpenAI logger:", error);
       throw new Error(`Failed to initialize OpenAI logger: ${error}`);
     }
   }
@@ -66,16 +66,12 @@ export class OpenAILogger {
    * @param error Optional error if the request failed
    * @returns The file path where the log was written
    */
-  async logInteraction(
-    request: unknown,
-    response?: unknown,
-    error?: Error,
-  ): Promise<string> {
+  async logInteraction(request: unknown, response?: unknown, error?: Error): Promise<string> {
     if (!this.initialized) {
       await this.initialize();
     }
 
-    const timestamp = new Date().toISOString().replace(/:/g, '-');
+    const timestamp = new Date().toISOString().replace(/:/g, "-");
     const id = uuidv4().slice(0, 8);
     const filename = `openai-${timestamp}-${id}.json`;
     const filePath = path.join(this.logDir, filename);
@@ -99,10 +95,10 @@ export class OpenAILogger {
     };
 
     try {
-      await fs.writeFile(filePath, JSON.stringify(logData, null, 2), 'utf-8');
+      await fs.writeFile(filePath, JSON.stringify(logData, null, 2), "utf-8");
       return filePath;
     } catch (writeError) {
-      debugLogger.error('Failed to write OpenAI log file:', writeError);
+      debugLogger.error("Failed to write OpenAI log file:", writeError);
       throw new Error(`Failed to write OpenAI log file: ${writeError}`);
     }
   }
@@ -120,17 +116,17 @@ export class OpenAILogger {
     try {
       const files = await fs.readdir(this.logDir);
       const logFiles = files
-        .filter((file) => file.startsWith('openai-') && file.endsWith('.json'))
+        .filter((file) => file.startsWith("openai-") && file.endsWith(".json"))
         .map((file) => path.join(this.logDir, file))
         .sort()
         .reverse();
 
       return limit ? logFiles.slice(0, limit) : logFiles;
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") {
         return [];
       }
-      debugLogger.error('Failed to read OpenAI log directory:', error);
+      debugLogger.error("Failed to read OpenAI log directory:", error);
       return [];
     }
   }
@@ -142,7 +138,7 @@ export class OpenAILogger {
    */
   async readLogFile(filePath: string): Promise<unknown> {
     try {
-      const content = await fs.readFile(filePath, 'utf-8');
+      const content = await fs.readFile(filePath, "utf-8");
       return JSON.parse(content);
     } catch (error) {
       debugLogger.error(`Failed to read log file ${filePath}:`, error);
diff --git a/packages/airiscode-core/src/utils/partUtils.ts b/packages/airiscode-core/src/utils/partUtils.ts
index 8c7c91b81..f99bdfc83 100644
--- a/packages/airiscode-core/src/utils/partUtils.ts
+++ b/packages/airiscode-core/src/utils/partUtils.ts
@@ -4,29 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  GenerateContentResponse,
-  PartListUnion,
-  Part,
-  PartUnion,
-} from '../types/llm.js';
+import type { GenerateContentResponse, Part, PartListUnion, PartUnion } from "../types/llm.js";
 
 /**
  * Converts a PartListUnion into a string.
  * If verbose is true, includes summary representations of non-text parts.
  */
-export function partToString(
-  value: PartListUnion,
-  options?: { verbose?: boolean },
-): string {
+export function partToString(value: PartListUnion, options?: { verbose?: boolean }): string {
   if (!value) {
-    return '';
+    return "";
   }
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     return value;
   }
   if (Array.isArray(value)) {
-    return value.map((part) => partToString(part, options)).join('');
+    return value.map((part) => partToString(part, options)).join("");
   }
 
   // Cast to Part, assuming it might contain project-specific fields
@@ -66,24 +58,18 @@ export function partToString(
     }
   }
 
-  return part.text ?? '';
+  return part.text ?? "";
 }
 
-export function getResponseText(
-  response: GenerateContentResponse,
-): string | null {
+export function getResponseText(response: GenerateContentResponse): string | null {
   if (response.candidates && response.candidates.length > 0) {
     const candidate = response.candidates[0];
 
-    if (
-      candidate.content &&
-      candidate.content.parts &&
-      candidate.content.parts.length > 0
-    ) {
+    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
       return candidate.content.parts
         .filter((part) => part.text && !part.thought)
         .map((part) => part.text)
-        .join('');
+        .join("");
     }
   }
   return null;
@@ -106,15 +92,15 @@ export async function flatMapTextParts(
   const result: PartUnion[] = [];
   const partArray = Array.isArray(parts)
     ? parts
-    : typeof parts === 'string'
+    : typeof parts === "string"
       ? [{ text: parts }]
       : [parts];
 
   for (const part of partArray) {
     let textToProcess: string | undefined;
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       textToProcess = part;
-    } else if ('text' in part) {
+    } else if ("text" in part) {
       textToProcess = part.text;
     }
 
@@ -141,7 +127,7 @@ export async function flatMapTextParts(
 export function appendToLastTextPart(
   prompt: PartUnion[],
   textToAppend: string,
-  separator = '\n\n',
+  separator = "\n\n",
 ): PartUnion[] {
   if (!textToAppend) {
     return prompt;
@@ -154,9 +140,9 @@ export function appendToLastTextPart(
   const newPrompt = [...prompt];
   const lastPart = newPrompt.at(-1);
 
-  if (typeof lastPart === 'string') {
+  if (typeof lastPart === "string") {
     newPrompt[newPrompt.length - 1] = `${lastPart}${separator}${textToAppend}`;
-  } else if (lastPart && 'text' in lastPart) {
+  } else if (lastPart && "text" in lastPart) {
     newPrompt[newPrompt.length - 1] = {
       ...lastPart,
       text: `${lastPart.text}${separator}${textToAppend}`,
diff --git a/packages/airiscode-core/src/utils/pathReader.ts b/packages/airiscode-core/src/utils/pathReader.ts
index dd2017ddf..d93302e68 100644
--- a/packages/airiscode-core/src/utils/pathReader.ts
+++ b/packages/airiscode-core/src/utils/pathReader.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { glob } from 'glob';
-import type { PartUnion } from '../types/llm.js';
-import { processSingleFileContent } from './fileUtils.js';
-import type { Config } from '../config/config.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import { glob } from "glob";
+import type { Config } from "../config/config.js";
+import type { PartUnion } from "../types/llm.js";
+import { processSingleFileContent } from "./fileUtils.js";
 
 /**
  * Reads the content of a file or recursively expands a directory from
@@ -20,19 +20,14 @@ import type { Config } from '../config/config.js';
  * @returns A promise that resolves to an array of PartUnion (string | Part).
  * @throws An error if the path is not found or is outside the workspace.
  */
-export async function readPathFromWorkspace(
-  pathStr: string,
-  config: Config,
-): Promise<PartUnion[]> {
+export async function readPathFromWorkspace(pathStr: string, config: Config): Promise<PartUnion[]> {
   const workspace = config.getWorkspaceContext();
   const fileService = config.getFileService();
   let absolutePath: string | null = null;
 
   if (path.isAbsolute(pathStr)) {
     if (!workspace.isPathWithinWorkspace(pathStr)) {
-      throw new Error(
-        `Absolute path is outside of the allowed workspace: ${pathStr}`,
-      );
+      throw new Error(`Absolute path is outside of the allowed workspace: ${pathStr}`);
     }
     absolutePath = pathStr;
   } else {
@@ -62,30 +57,26 @@ export async function readPathFromWorkspace(
     });
 
     // Use glob to recursively find all files within the directory.
-    const files = await glob('**/*', {
+    const files = await glob("**/*", {
       cwd: absolutePath,
       nodir: true, // We only want files
       dot: true, // Include dotfiles
       absolute: true,
     });
 
-    const relativeFiles = files.map((p) =>
-      path.relative(config.getTargetDir(), p),
-    );
+    const relativeFiles = files.map((p) => path.relative(config.getTargetDir(), p));
     const filteredFiles = fileService.filterFiles(relativeFiles, {
       respectGitIgnore: true,
       respectAiriscodeIgnore: true,
     });
-    const finalFiles = filteredFiles.map((p) =>
-      path.resolve(config.getTargetDir(), p),
-    );
+    const finalFiles = filteredFiles.map((p) => path.resolve(config.getTargetDir(), p));
 
     for (const filePath of finalFiles) {
       const relativePathForDisplay = path.relative(absolutePath, filePath);
       allParts.push({ text: `--- ${relativePathForDisplay} ---\n` });
       const result = await processSingleFileContent(filePath, config);
       allParts.push(result.llmContent);
-      allParts.push({ text: '\n' }); // Add a newline for separation
+      allParts.push({ text: "\n" }); // Add a newline for separation
     }
 
     allParts.push({ text: `--- End of content for directory: ${pathStr} ---` });
diff --git a/packages/airiscode-core/src/utils/paths.ts b/packages/airiscode-core/src/utils/paths.ts
index 006b6ce21..be283609e 100644
--- a/packages/airiscode-core/src/utils/paths.ts
+++ b/packages/airiscode-core/src/utils/paths.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import * as crypto from 'node:crypto';
-import type { Config } from '../config/config.js';
-import { isNodeError } from './errors.js';
+import * as crypto from "node:crypto";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { isNodeError } from "./errors.js";
 
-export const AIRISCODE_DIR = '.airiscode';
-export const GOOGLE_ACCOUNTS_FILENAME = 'google_accounts.json';
+export const AIRISCODE_DIR = ".airiscode";
+export const GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
 
 /**
  * Special characters that need to be escaped in file paths for shell compatibility.
@@ -29,7 +29,7 @@ export const SHELL_SPECIAL_CHARS = /[ \t()[\]{};|*?$`'"#&<>!~]/;
 export function tildeifyPath(path: string): string {
   const homeDir = os.homedir();
   if (path.startsWith(homeDir)) {
-    return path.replace(homeDir, '~');
+    return path.replace(homeDir, "~");
   }
   return path;
 }
@@ -45,7 +45,7 @@ export function shortenPath(filePath: string, maxLen: number = 80): string {
   }
 
   const separator = path.sep;
-  const ellipsis = '...';
+  const ellipsis = "...";
 
   // Simple fallback for very short maxLen
   if (maxLen < 10) {
@@ -55,13 +55,11 @@ export function shortenPath(filePath: string, maxLen: number = 80): string {
   const parsedPath = path.parse(filePath);
   const root = parsedPath.root;
   const relativePath = filePath.substring(root.length);
-  const segments = relativePath.split(separator).filter((s) => s !== '');
+  const segments = relativePath.split(separator).filter((s) => s !== "");
 
   // Handle edge cases: no segments or single segment
   if (segments.length === 0) {
-    return root.length <= maxLen
-      ? root
-      : root.substring(0, maxLen - 3) + ellipsis;
+    return root.length <= maxLen ? root : root.substring(0, maxLen - 3) + ellipsis;
   }
 
   if (segments.length === 1) {
@@ -117,9 +115,7 @@ export function shortenPath(filePath: string, maxLen: number = 80): string {
   }
 
   // We have some end segments but not all - there's a gap, insert ellipsis
-  return (
-    startPart + separator + ellipsis + separator + endSegments.join(separator)
-  );
+  return startPart + separator + ellipsis + separator + endSegments.join(separator);
 }
 
 /**
@@ -131,10 +127,7 @@ export function shortenPath(filePath: string, maxLen: number = 80): string {
  * @param rootDirectory The absolute path of the directory to make the target path relative to.
  * @returns The relative path from rootDirectory to targetPath.
  */
-export function makeRelative(
-  targetPath: string,
-  rootDirectory: string,
-): string {
+export function makeRelative(targetPath: string, rootDirectory: string): string {
   const resolvedTargetPath = path.resolve(targetPath);
   const resolvedRootDirectory = path.resolve(rootDirectory);
 
@@ -145,7 +138,7 @@ export function makeRelative(
   const relativePath = path.relative(resolvedRootDirectory, resolvedTargetPath);
 
   // If the paths are the same, path.relative returns '', return '.' instead
-  return relativePath || '.';
+  return relativePath || ".";
 }
 
 /**
@@ -154,13 +147,13 @@ export function makeRelative(
  * asterisks, question marks, dollar signs, backticks, quotes, hash, and other shell metacharacters.
  */
 export function escapePath(filePath: string): string {
-  let result = '';
+  let result = "";
   for (let i = 0; i < filePath.length; i++) {
     const char = filePath[i];
 
     // Count consecutive backslashes before this character
     let backslashCount = 0;
-    for (let j = i - 1; j >= 0 && filePath[j] === '\\'; j--) {
+    for (let j = i - 1; j >= 0 && filePath[j] === "\\"; j--) {
       backslashCount++;
     }
 
@@ -169,7 +162,7 @@ export function escapePath(filePath: string): string {
 
     // Only escape if not already escaped
     if (!isAlreadyEscaped && SHELL_SPECIAL_CHARS.test(char)) {
-      result += '\\' + char;
+      result += "\\" + char;
     } else {
       result += char;
     }
@@ -183,8 +176,8 @@ export function escapePath(filePath: string): string {
  */
 export function unescapePath(filePath: string): string {
   return filePath.replace(
-    new RegExp(`\\\\([${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`, 'g'),
-    '$1',
+    new RegExp(`\\\\([${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`, "g"),
+    "$1",
   );
 }
 
@@ -197,9 +190,8 @@ export function unescapePath(filePath: string): string {
  */
 export function getProjectHash(projectRoot: string): string {
   // On Windows, normalize path to lowercase for case-insensitive matching
-  const normalizedPath =
-    os.platform() === 'win32' ? projectRoot.toLowerCase() : projectRoot;
-  return crypto.createHash('sha256').update(normalizedPath).digest('hex');
+  const normalizedPath = os.platform() === "win32" ? projectRoot.toLowerCase() : projectRoot;
+  return crypto.createHash("sha256").update(normalizedPath).digest("hex");
 }
 
 /**
@@ -217,8 +209,8 @@ export function getProjectHash(projectRoot: string): string {
  */
 export function sanitizeCwd(cwd: string): string {
   // On Windows, normalize to lowercase for case-insensitive matching
-  const normalizedCwd = os.platform() === 'win32' ? cwd.toLowerCase() : cwd;
-  return normalizedCwd.replace(/[^a-zA-Z0-9]/g, '-');
+  const normalizedCwd = os.platform() === "win32" ? cwd.toLowerCase() : cwd;
+  return normalizedCwd.replace(/[^a-zA-Z0-9]/g, "-");
 }
 
 /**
@@ -228,7 +220,7 @@ export function sanitizeCwd(cwd: string): string {
  * @returns True if childPath is a subpath of parentPath, false otherwise.
  */
 export function isSubpath(parentPath: string, childPath: string): boolean {
-  const isWindows = os.platform() === 'win32';
+  const isWindows = os.platform() === "win32";
   const pathModule = isWindows ? path.win32 : path;
 
   // On Windows, path.relative is case-insensitive. On POSIX, it's case-sensitive.
@@ -236,7 +228,7 @@ export function isSubpath(parentPath: string, childPath: string): boolean {
 
   return (
     !relative.startsWith(`..${pathModule.sep}`) &&
-    relative !== '..' &&
+    relative !== ".." &&
     !pathModule.isAbsolute(relative)
   );
 }
@@ -260,9 +252,9 @@ export function resolvePath(
 ): string {
   const homeDir = os.homedir();
 
-  if (relativePath === '~') {
+  if (relativePath === "~") {
     return homeDir;
-  } else if (relativePath.startsWith('~/')) {
+  } else if (relativePath.startsWith("~/")) {
     return path.join(homeDir, relativePath.slice(2));
   } else if (path.isAbsolute(relativePath)) {
     return relativePath;
@@ -300,11 +292,10 @@ export function validatePath(
 ): void {
   const { allowFiles = false, allowExternalPaths = false } = options;
   const workspaceContext = config.getWorkspaceContext();
-  const isWithinWorkspace =
-    workspaceContext.isPathWithinWorkspace(resolvedPath);
+  const isWithinWorkspace = workspaceContext.isPathWithinWorkspace(resolvedPath);
 
   if (!allowExternalPaths && !isWithinWorkspace) {
-    throw new Error('Path is not within workspace');
+    throw new Error("Path is not within workspace");
   }
 
   // For external paths where allowExternalPaths is true, skip filesystem checks.
@@ -320,7 +311,7 @@ export function validatePath(
       throw new Error(`Path is not a directory: ${resolvedPath}`);
     }
   } catch (error: unknown) {
-    if (isNodeError(error) && error.code === 'ENOENT') {
+    if (isNodeError(error) && error.code === "ENOENT") {
       throw new Error(`Path does not exist: ${resolvedPath}`);
     }
     throw error;
diff --git a/packages/airiscode-core/src/utils/projectSummary.ts b/packages/airiscode-core/src/utils/projectSummary.ts
index 5f1649f75..08b93b52a 100644
--- a/packages/airiscode-core/src/utils/projectSummary.ts
+++ b/packages/airiscode-core/src/utils/projectSummary.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from "fs/promises";
+import * as path from "path";
 
 export interface ProjectSummaryInfo {
   hasHistory: boolean;
@@ -25,7 +25,7 @@ export interface ProjectSummaryInfo {
  * Reads and parses the project summary file to extract structured information
  */
 export async function getProjectSummaryInfo(): Promise<ProjectSummaryInfo> {
-  const summaryPath = path.join(process.cwd(), '.airiscode', 'PROJECT_SUMMARY.md');
+  const summaryPath = path.join(process.cwd(), ".airiscode", "PROJECT_SUMMARY.md");
 
   try {
     await fs.access(summaryPath);
@@ -36,14 +36,12 @@ export async function getProjectSummaryInfo(): Promise<ProjectSummaryInfo> {
   }
 
   try {
-    const content = await fs.readFile(summaryPath, 'utf-8');
+    const content = await fs.readFile(summaryPath, "utf-8");
 
     // Extract timestamp if available
     const timestampMatch = content.match(/\*\*Update time\*\*: (.+)/);
 
-    const timestamp = timestampMatch
-      ? timestampMatch[1]
-      : new Date().toISOString();
+    const timestamp = timestampMatch ? timestampMatch[1] : new Date().toISOString();
 
     // Calculate time ago
     const getTimeAgo = (timestamp: string) => {
@@ -55,47 +53,35 @@ export async function getProjectSummaryInfo(): Promise<ProjectSummaryInfo> {
       const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
 
       if (diffDays > 0) {
-        return `${diffDays} day${diffDays > 1 ? 's' : ''} ago`;
+        return `${diffDays} day${diffDays > 1 ? "s" : ""} ago`;
       } else if (diffHours > 0) {
-        return `${diffHours} hour${diffHours > 1 ? 's' : ''} ago`;
+        return `${diffHours} hour${diffHours > 1 ? "s" : ""} ago`;
       } else if (diffMinutes > 0) {
-        return `${diffMinutes} minute${diffMinutes > 1 ? 's' : ''} ago`;
+        return `${diffMinutes} minute${diffMinutes > 1 ? "s" : ""} ago`;
       } else {
-        return 'just now';
+        return "just now";
       }
     };
 
     const timeAgo = getTimeAgo(timestamp);
 
     // Parse Overall Goal section
-    const goalSection = content.match(
-      /## Overall Goal\s*\n?([\s\S]*?)(?=\n## |$)/,
-    );
-    const goalContent = goalSection ? goalSection[1].trim() : '';
+    const goalSection = content.match(/## Overall Goal\s*\n?([\s\S]*?)(?=\n## |$)/);
+    const goalContent = goalSection ? goalSection[1].trim() : "";
 
     // Parse Current Plan section
-    const planSection = content.match(
-      /## Current Plan\s*\n?([\s\S]*?)(?=\n## |$)/,
-    );
-    const planContent = planSection ? planSection[1] : '';
-    const planLines = planContent.split('\n').filter((line) => line.trim());
-    const doneCount = planLines.filter((line) =>
-      line.includes('[DONE]'),
-    ).length;
-    const inProgressCount = planLines.filter((line) =>
-      line.includes('[IN PROGRESS]'),
-    ).length;
-    const todoCount = planLines.filter((line) =>
-      line.includes('[TODO]'),
-    ).length;
+    const planSection = content.match(/## Current Plan\s*\n?([\s\S]*?)(?=\n## |$)/);
+    const planContent = planSection ? planSection[1] : "";
+    const planLines = planContent.split("\n").filter((line) => line.trim());
+    const doneCount = planLines.filter((line) => line.includes("[DONE]")).length;
+    const inProgressCount = planLines.filter((line) => line.includes("[IN PROGRESS]")).length;
+    const todoCount = planLines.filter((line) => line.includes("[TODO]")).length;
     const totalTasks = doneCount + inProgressCount + todoCount;
 
     // Extract pending tasks
     const pendingTasks = planLines
-      .filter(
-        (line) => line.includes('[TODO]') || line.includes('[IN PROGRESS]'),
-      )
-      .map((line) => line.replace(/^\d+\.\s*/, '').trim())
+      .filter((line) => line.includes("[TODO]") || line.includes("[IN PROGRESS]"))
+      .map((line) => line.replace(/^\d+\.\s*/, "").trim())
       .slice(0, 3);
 
     return {
diff --git a/packages/airiscode-core/src/utils/promptIdContext.ts b/packages/airiscode-core/src/utils/promptIdContext.ts
index 6344bd0b8..ee933e989 100644
--- a/packages/airiscode-core/src/utils/promptIdContext.ts
+++ b/packages/airiscode-core/src/utils/promptIdContext.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AsyncLocalStorage } from 'node:async_hooks';
+import { AsyncLocalStorage } from "node:async_hooks";
 
 export const promptIdContext = new AsyncLocalStorage<string>();
diff --git a/packages/airiscode-core/src/utils/proxyUtils.ts b/packages/airiscode-core/src/utils/proxyUtils.ts
index b989494c5..972ff92e9 100644
--- a/packages/airiscode-core/src/utils/proxyUtils.ts
+++ b/packages/airiscode-core/src/utils/proxyUtils.ts
@@ -20,9 +20,7 @@
  * @returns The normalized proxy URL with protocol prefix, or undefined if input is undefined/empty
  * @throws Error if a SOCKS proxy URL is provided
  */
-export function normalizeProxyUrl(
-  proxyUrl: string | undefined,
-): string | undefined {
+export function normalizeProxyUrl(proxyUrl: string | undefined): string | undefined {
   if (!proxyUrl) {
     return undefined;
   }
diff --git a/packages/airiscode-core/src/utils/quotaErrorDetection.ts b/packages/airiscode-core/src/utils/quotaErrorDetection.ts
index 87e50aa98..fdce0b828 100644
--- a/packages/airiscode-core/src/utils/quotaErrorDetection.ts
+++ b/packages/airiscode-core/src/utils/quotaErrorDetection.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { StructuredError } from '../core/turn.js';
+import type { StructuredError } from "../core/turn.js";
 
 export interface ApiError {
   error: {
@@ -17,20 +17,20 @@ export interface ApiError {
 
 export function isApiError(error: unknown): error is ApiError {
   return (
-    typeof error === 'object' &&
+    typeof error === "object" &&
     error !== null &&
-    'error' in error &&
-    typeof (error as ApiError).error === 'object' &&
-    'message' in (error as ApiError).error
+    "error" in error &&
+    typeof (error as ApiError).error === "object" &&
+    "message" in (error as ApiError).error
   );
 }
 
 export function isStructuredError(error: unknown): error is StructuredError {
   return (
-    typeof error === 'object' &&
+    typeof error === "object" &&
     error !== null &&
-    'message' in error &&
-    typeof (error as StructuredError).message === 'string'
+    "message" in error &&
+    typeof (error as StructuredError).message === "string"
   );
 }
 
@@ -45,7 +45,7 @@ export function isProQuotaExceededError(error: unknown): boolean {
     message.includes("Quota exceeded for quota metric 'Gemini") &&
     message.includes("Pro Requests'");
 
-  if (typeof error === 'string') {
+  if (typeof error === "string") {
     return checkMessage(error);
   }
 
@@ -58,25 +58,25 @@ export function isProQuotaExceededError(error: unknown): boolean {
   }
 
   // Check if it's a Gaxios error with response data
-  if (error && typeof error === 'object' && 'response' in error) {
+  if (error && typeof error === "object" && "response" in error) {
     const gaxiosError = error as {
       response?: {
         data?: unknown;
       };
     };
     if (gaxiosError.response && gaxiosError.response.data) {
-      if (typeof gaxiosError.response.data === 'string') {
+      if (typeof gaxiosError.response.data === "string") {
         return checkMessage(gaxiosError.response.data);
       }
       if (
-        typeof gaxiosError.response.data === 'object' &&
+        typeof gaxiosError.response.data === "object" &&
         gaxiosError.response.data !== null &&
-        'error' in gaxiosError.response.data
+        "error" in gaxiosError.response.data
       ) {
         const errorData = gaxiosError.response.data as {
           error?: { message?: string };
         };
-        return checkMessage(errorData.error?.message || '');
+        return checkMessage(errorData.error?.message || "");
       }
     }
   }
@@ -84,16 +84,16 @@ export function isProQuotaExceededError(error: unknown): boolean {
 }
 
 export function isGenericQuotaExceededError(error: unknown): boolean {
-  if (typeof error === 'string') {
-    return error.includes('Quota exceeded for quota metric');
+  if (typeof error === "string") {
+    return error.includes("Quota exceeded for quota metric");
   }
 
   if (isStructuredError(error)) {
-    return error.message.includes('Quota exceeded for quota metric');
+    return error.message.includes("Quota exceeded for quota metric");
   }
 
   if (isApiError(error)) {
-    return error.error.message.includes('Quota exceeded for quota metric');
+    return error.error.message.includes("Quota exceeded for quota metric");
   }
 
   return false;
@@ -102,7 +102,7 @@ export function isGenericQuotaExceededError(error: unknown): boolean {
 export function isQwenQuotaExceededError(error: unknown): boolean {
   // Match the specific Qwen free-tier quota error to distinguish it from
   // temporary throttling (429 due to concurrency) or paid account quota limits.
-  if (typeof error !== 'object' || error === null) {
+  if (typeof error !== "object" || error === null) {
     return false;
   }
   const { status, code, message } = error as {
@@ -112,8 +112,8 @@ export function isQwenQuotaExceededError(error: unknown): boolean {
   };
   return (
     status === 429 &&
-    code === 'insufficient_quota' &&
-    typeof message === 'string' &&
-    message.toLowerCase().includes('free allocated quota exceeded')
+    code === "insufficient_quota" &&
+    typeof message === "string" &&
+    message.toLowerCase().includes("free allocated quota exceeded")
   );
 }
diff --git a/packages/airiscode-core/src/utils/qwenIgnoreParser.ts b/packages/airiscode-core/src/utils/qwenIgnoreParser.ts
index 8a374c3f2..e18ebe9d4 100644
--- a/packages/airiscode-core/src/utils/qwenIgnoreParser.ts
+++ b/packages/airiscode-core/src/utils/qwenIgnoreParser.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import ignore from 'ignore';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import ignore from "ignore";
 
 export interface QwenIgnoreFilter {
   isIgnored(filePath: string): boolean;
@@ -24,19 +24,19 @@ export class QwenIgnoreParser implements QwenIgnoreFilter {
   }
 
   private loadPatterns(): void {
-    const patternsFilePath = path.join(this.projectRoot, '.airiscodeigenore');
+    const patternsFilePath = path.join(this.projectRoot, ".airiscodeigenore");
     let content: string;
     try {
-      content = fs.readFileSync(patternsFilePath, 'utf-8');
+      content = fs.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       // ignore file not found
       return;
     }
 
-    this.patterns = (content ?? '')
-      .split('\n')
+    this.patterns = (content ?? "")
+      .split("\n")
       .map((p) => p.trim())
-      .filter((p) => p !== '' && !p.startsWith('#'));
+      .filter((p) => p !== "" && !p.startsWith("#"));
 
     this.ig.add(this.patterns);
   }
@@ -46,29 +46,25 @@ export class QwenIgnoreParser implements QwenIgnoreFilter {
       return false;
     }
 
-    if (!filePath || typeof filePath !== 'string') {
+    if (!filePath || typeof filePath !== "string") {
       return false;
     }
 
-    if (
-      filePath.startsWith('\\') ||
-      filePath === '/' ||
-      filePath.includes('\0')
-    ) {
+    if (filePath.startsWith("\\") || filePath === "/" || filePath.includes("\0")) {
       return false;
     }
 
     const resolved = path.resolve(this.projectRoot, filePath);
     const relativePath = path.relative(this.projectRoot, resolved);
 
-    if (relativePath === '' || relativePath.startsWith('..')) {
+    if (relativePath === "" || relativePath.startsWith("..")) {
       return false;
     }
 
     // Even in windows, Ignore expects forward slashes.
-    const normalizedPath = relativePath.replace(/\\/g, '/');
+    const normalizedPath = relativePath.replace(/\\/g, "/");
 
-    if (normalizedPath.startsWith('/') || normalizedPath === '') {
+    if (normalizedPath.startsWith("/") || normalizedPath === "") {
       return false;
     }
 
diff --git a/packages/airiscode-core/src/utils/rateLimit.ts b/packages/airiscode-core/src/utils/rateLimit.ts
index 77c0726d8..528f8b0a2 100644
--- a/packages/airiscode-core/src/utils/rateLimit.ts
+++ b/packages/airiscode-core/src/utils/rateLimit.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isApiError, isStructuredError } from './quotaErrorDetection.js';
+import { isApiError, isStructuredError } from "./quotaErrorDetection.js";
 
 // Known rate-limit error codes across providers.
 // 429  - Standard HTTP "Too Many Requests" (OpenAI, etc.)
@@ -32,10 +32,7 @@ export interface RetryInfo {
  * @param extraCodes - Additional error codes to treat as rate-limit errors,
  *   merged with the built-in set at call time (not mutating the default set).
  */
-export function isRateLimitError(
-  error: unknown,
-  extraCodes?: readonly number[],
-): boolean {
+export function isRateLimitError(error: unknown, extraCodes?: readonly number[]): boolean {
   const code = getErrorCode(error);
   if (code === null) return false;
   if (RATE_LIMIT_ERROR_CODES.has(code)) return true;
@@ -52,14 +49,9 @@ function getErrorCode(error: unknown): number | null {
 
   // JSON in string / Error.message — check BEFORE isStructuredError because
   // Error instances also satisfy isStructuredError (both have .message).
-  const msg =
-    error instanceof Error
-      ? error.message
-      : typeof error === 'string'
-        ? error
-        : null;
+  const msg = error instanceof Error ? error.message : typeof error === "string" ? error : null;
   if (msg) {
-    const i = msg.indexOf('{');
+    const i = msg.indexOf("{");
     if (i !== -1) {
       try {
         const p = JSON.parse(msg.substring(i)) as unknown;
@@ -72,13 +64,13 @@ function getErrorCode(error: unknown): number | null {
 
   // StructuredError (.status) — plain objects from Gemini SDK
   if (isStructuredError(error)) {
-    return typeof error.status === 'number' ? error.status : null;
+    return typeof error.status === "number" ? error.status : null;
   }
 
   // HttpError (.status on Error)
-  if (error instanceof Error && 'status' in error) {
+  if (error instanceof Error && "status" in error) {
     const s = (error as { status?: unknown }).status;
-    if (typeof s === 'number') return s;
+    if (typeof s === "number") return s;
   }
 
   return null;
diff --git a/packages/airiscode-core/src/utils/readManyFiles.ts b/packages/airiscode-core/src/utils/readManyFiles.ts
index db352d417..14f88c2f2 100644
--- a/packages/airiscode-core/src/utils/readManyFiles.ts
+++ b/packages/airiscode-core/src/utils/readManyFiles.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import type { Part, PartListUnion } from '../types/llm.js';
-import type { Config } from '../config/config.js';
-import { getErrorMessage } from './errors.js';
-import { processSingleFileContent } from './fileUtils.js';
-import { getFolderStructure } from './getFolderStructure.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { Config } from "../config/config.js";
+import type { Part, PartListUnion } from "../types/llm.js";
+import { getErrorMessage } from "./errors.js";
+import { processSingleFileContent } from "./fileUtils.js";
+import { getFolderStructure } from "./getFolderStructure.js";
 
 /**
  * Options for reading multiple files.
@@ -63,8 +63,8 @@ export interface ReadManyFilesResult {
   error?: string;
 }
 
-const DEFAULT_OUTPUT_HEADER = '\n--- Content from referenced files ---';
-const DEFAULT_OUTPUT_TERMINATOR = '\n--- End of content ---';
+const DEFAULT_OUTPUT_HEADER = "\n--- Content from referenced files ---";
+const DEFAULT_OUTPUT_TERMINATOR = "\n--- End of content ---";
 
 /**
  * Reads content from multiple files and directories specified by paths.
@@ -94,15 +94,12 @@ export async function readManyFiles(
     const projectRoot = config.getProjectRoot();
 
     for (const rawPattern of inputPatterns) {
-      const normalizedPattern = rawPattern.replace(/\\/g, '/');
+      const normalizedPattern = rawPattern.replace(/\\/g, "/");
       const fullPath = path.resolve(projectRoot, normalizedPattern);
       const stats = fs.existsSync(fullPath) ? fs.statSync(fullPath) : null;
 
       if (stats?.isDirectory()) {
-        const { contentParts: dirParts, info } = await readDirectory(
-          config,
-          fullPath,
-        );
+        const { contentParts: dirParts, info } = await readDirectory(config, fullPath);
         contentParts.push(...dirParts);
         files.push(info);
         continue;
@@ -131,7 +128,7 @@ export async function readManyFiles(
     contentParts.push({ text: DEFAULT_OUTPUT_TERMINATOR });
   } else {
     contentParts.push({
-      text: 'No files matching the criteria were found or all were skipped.',
+      text: "No files matching the criteria were found or all were skipped.",
     });
   }
 
@@ -174,8 +171,8 @@ async function readFileContent(
 
     const prefixText: Part = { text: `\nContent from ${filePath}:\n` };
 
-    if (typeof fileReadResult.llmContent === 'string') {
-      let fileContentForLlm = '';
+    if (typeof fileReadResult.llmContent === "string") {
+      let fileContentForLlm = "";
       if (fileReadResult.isTruncated) {
         const [start, end] = fileReadResult.linesShown!;
         const total = fileReadResult.originalLineCount!;
diff --git a/packages/airiscode-core/src/utils/request-tokenizer/imageTokenizer.ts b/packages/airiscode-core/src/utils/request-tokenizer/imageTokenizer.ts
index 76933a0c8..13c5aaffb 100644
--- a/packages/airiscode-core/src/utils/request-tokenizer/imageTokenizer.ts
+++ b/packages/airiscode-core/src/utils/request-tokenizer/imageTokenizer.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ImageMetadata } from './types.js';
-import { isSupportedImageMimeType } from './supportedImageFormats.js';
-import { createDebugLogger } from '../debugLogger.js';
+import { createDebugLogger } from "../debugLogger.js";
+import { isSupportedImageMimeType } from "./supportedImageFormats.js";
+import type { ImageMetadata } from "./types.js";
 
-const debugLogger = createDebugLogger('IMAGE_TOKENIZER');
+const debugLogger = createDebugLogger("IMAGE_TOKENIZER");
 
 /**
  * Image tokenizer for calculating image tokens based on dimensions
@@ -40,10 +40,7 @@ export class ImageTokenizer {
    * @param mimeType MIME type of the image
    * @returns Promise resolving to ImageMetadata with dimensions and format info
    */
-  async extractImageMetadata(
-    base64Data: string,
-    mimeType: string,
-  ): Promise<ImageMetadata> {
+  async extractImageMetadata(base64Data: string, mimeType: string): Promise<ImageMetadata> {
     try {
       // Check if the MIME type is supported
       if (!isSupportedImageMimeType(mimeType)) {
@@ -57,8 +54,8 @@ export class ImageTokenizer {
         };
       }
 
-      const cleanBase64 = base64Data.replace(/^data:[^;]+;base64,/, '');
-      const buffer = Buffer.from(cleanBase64, 'base64');
+      const cleanBase64 = base64Data.replace(/^data:[^;]+;base64,/, "");
+      const buffer = Buffer.from(cleanBase64, "base64");
       const dimensions = await this.extractDimensions(buffer, mimeType);
 
       return {
@@ -68,7 +65,7 @@ export class ImageTokenizer {
         dataSize: buffer.length,
       };
     } catch (error) {
-      debugLogger.warn('Failed to extract image metadata:', error);
+      debugLogger.warn("Failed to extract image metadata:", error);
       // Return default metadata for fallback
       return {
         width: 512,
@@ -90,31 +87,31 @@ export class ImageTokenizer {
     buffer: Buffer,
     mimeType: string,
   ): Promise<{ width: number; height: number }> {
-    if (mimeType.includes('png')) {
+    if (mimeType.includes("png")) {
       return this.extractPngDimensions(buffer);
     }
 
-    if (mimeType.includes('jpeg') || mimeType.includes('jpg')) {
+    if (mimeType.includes("jpeg") || mimeType.includes("jpg")) {
       return this.extractJpegDimensions(buffer);
     }
 
-    if (mimeType.includes('webp')) {
+    if (mimeType.includes("webp")) {
       return this.extractWebpDimensions(buffer);
     }
 
-    if (mimeType.includes('gif')) {
+    if (mimeType.includes("gif")) {
       return this.extractGifDimensions(buffer);
     }
 
-    if (mimeType.includes('bmp')) {
+    if (mimeType.includes("bmp")) {
       return this.extractBmpDimensions(buffer);
     }
 
-    if (mimeType.includes('tiff')) {
+    if (mimeType.includes("tiff")) {
       return this.extractTiffDimensions(buffer);
     }
 
-    if (mimeType.includes('heic')) {
+    if (mimeType.includes("heic")) {
       return this.extractHeicDimensions(buffer);
     }
 
@@ -131,16 +128,14 @@ export class ImageTokenizer {
     height: number;
   } {
     if (buffer.length < 24) {
-      throw new Error('Invalid PNG: buffer too short');
+      throw new Error("Invalid PNG: buffer too short");
     }
 
     // Verify PNG signature
     const signature = buffer.subarray(0, 8);
-    const expectedSignature = Buffer.from([
-      0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-    ]);
+    const expectedSignature = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
     if (!signature.equals(expectedSignature)) {
-      throw new Error('Invalid PNG signature');
+      throw new Error("Invalid PNG signature");
     }
 
     const width = buffer.readUInt32BE(16);
@@ -159,7 +154,7 @@ export class ImageTokenizer {
     height: number;
   } {
     if (buffer.length < 4 || buffer[0] !== 0xff || buffer[1] !== 0xd8) {
-      throw new Error('Invalid JPEG signature');
+      throw new Error("Invalid JPEG signature");
     }
 
     let offset = 2;
@@ -188,7 +183,7 @@ export class ImageTokenizer {
       offset += 2 + segmentLength;
     }
 
-    throw new Error('Could not find JPEG dimensions');
+    throw new Error("Could not find JPEG dimensions");
   }
 
   /**
@@ -200,34 +195,34 @@ export class ImageTokenizer {
     height: number;
   } {
     if (buffer.length < 30) {
-      throw new Error('Invalid WebP: too short');
+      throw new Error("Invalid WebP: too short");
     }
 
-    const riffSignature = buffer.subarray(0, 4).toString('ascii');
-    const webpSignature = buffer.subarray(8, 12).toString('ascii');
+    const riffSignature = buffer.subarray(0, 4).toString("ascii");
+    const webpSignature = buffer.subarray(8, 12).toString("ascii");
 
-    if (riffSignature !== 'RIFF' || webpSignature !== 'WEBP') {
-      throw new Error('Invalid WebP signature');
+    if (riffSignature !== "RIFF" || webpSignature !== "WEBP") {
+      throw new Error("Invalid WebP signature");
     }
 
-    const format = buffer.subarray(12, 16).toString('ascii');
+    const format = buffer.subarray(12, 16).toString("ascii");
 
-    if (format === 'VP8 ') {
+    if (format === "VP8 ") {
       const width = buffer.readUInt16LE(26) & 0x3fff;
       const height = buffer.readUInt16LE(28) & 0x3fff;
       return { width, height };
-    } else if (format === 'VP8L') {
+    } else if (format === "VP8L") {
       const bits = buffer.readUInt32LE(21);
       const width = (bits & 0x3fff) + 1;
       const height = ((bits >> 14) & 0x3fff) + 1;
       return { width, height };
-    } else if (format === 'VP8X') {
+    } else if (format === "VP8X") {
       const width = (buffer.readUInt32LE(24) & 0xffffff) + 1;
       const height = (buffer.readUInt32LE(26) & 0xffffff) + 1;
       return { width, height };
     }
 
-    throw new Error('Unsupported WebP format');
+    throw new Error("Unsupported WebP format");
   }
 
   /**
@@ -239,12 +234,12 @@ export class ImageTokenizer {
     height: number;
   } {
     if (buffer.length < 10) {
-      throw new Error('Invalid GIF: too short');
+      throw new Error("Invalid GIF: too short");
     }
 
-    const signature = buffer.subarray(0, 6).toString('ascii');
-    if (signature !== 'GIF87a' && signature !== 'GIF89a') {
-      throw new Error('Invalid GIF signature');
+    const signature = buffer.subarray(0, 6).toString("ascii");
+    if (signature !== "GIF87a" && signature !== "GIF89a") {
+      throw new Error("Invalid GIF signature");
     }
 
     const width = buffer.readUInt16LE(6);
@@ -281,10 +276,8 @@ export class ImageTokenizer {
     let wBar = Math.round(width / 28) * 28;
 
     // Define pixel boundaries
-    const minPixels =
-      ImageTokenizer.MIN_TOKENS_PER_IMAGE * ImageTokenizer.PIXELS_PER_TOKEN;
-    const maxPixels =
-      ImageTokenizer.MAX_TOKENS_PER_IMAGE * ImageTokenizer.PIXELS_PER_TOKEN;
+    const minPixels = ImageTokenizer.MIN_TOKENS_PER_IMAGE * ImageTokenizer.PIXELS_PER_TOKEN;
+    const maxPixels = ImageTokenizer.MAX_TOKENS_PER_IMAGE * ImageTokenizer.PIXELS_PER_TOKEN;
 
     // Apply scaling
     if (hBar * wBar > maxPixels) {
@@ -300,9 +293,7 @@ export class ImageTokenizer {
     }
 
     // Calculate tokens
-    const imageTokens = Math.floor(
-      (hBar * wBar) / ImageTokenizer.PIXELS_PER_TOKEN,
-    );
+    const imageTokens = Math.floor((hBar * wBar) / ImageTokenizer.PIXELS_PER_TOKEN);
 
     return imageTokens + ImageTokenizer.VISION_SPECIAL_TOKENS;
   }
@@ -323,12 +314,9 @@ export class ImageTokenizer {
         const metadata = await this.extractImageMetadata(data, mimeType);
         results.push(this.calculateTokens(metadata));
       } catch (error) {
-        debugLogger.warn('Error calculating tokens for image:', error);
+        debugLogger.warn("Error calculating tokens for image:", error);
         // Return minimum tokens as fallback
-        results.push(
-          ImageTokenizer.MIN_TOKENS_PER_IMAGE +
-            ImageTokenizer.VISION_SPECIAL_TOKENS,
-        );
+        results.push(ImageTokenizer.MIN_TOKENS_PER_IMAGE + ImageTokenizer.VISION_SPECIAL_TOKENS);
       }
     }
 
@@ -345,12 +333,12 @@ export class ImageTokenizer {
     height: number;
   } {
     if (buffer.length < 26) {
-      throw new Error('Invalid BMP: buffer too short');
+      throw new Error("Invalid BMP: buffer too short");
     }
 
     // Verify BMP signature
     if (buffer[0] !== 0x42 || buffer[1] !== 0x4d) {
-      throw new Error('Invalid BMP signature');
+      throw new Error("Invalid BMP signature");
     }
 
     const width = buffer.readUInt32LE(18);
@@ -369,33 +357,29 @@ export class ImageTokenizer {
     height: number;
   } {
     if (buffer.length < 8) {
-      throw new Error('Invalid TIFF: buffer too short');
+      throw new Error("Invalid TIFF: buffer too short");
     }
 
     // Check byte order
-    const byteOrder = buffer.subarray(0, 2).toString('ascii');
-    const isLittleEndian = byteOrder === 'II';
-    const isBigEndian = byteOrder === 'MM';
+    const byteOrder = buffer.subarray(0, 2).toString("ascii");
+    const isLittleEndian = byteOrder === "II";
+    const isBigEndian = byteOrder === "MM";
 
     if (!isLittleEndian && !isBigEndian) {
-      throw new Error('Invalid TIFF byte order');
+      throw new Error("Invalid TIFF byte order");
     }
 
     // Read magic number (should be 42)
-    const magic = isLittleEndian
-      ? buffer.readUInt16LE(2)
-      : buffer.readUInt16BE(2);
+    const magic = isLittleEndian ? buffer.readUInt16LE(2) : buffer.readUInt16BE(2);
     if (magic !== 42) {
-      throw new Error('Invalid TIFF magic number');
+      throw new Error("Invalid TIFF magic number");
     }
 
     // Read IFD offset
-    const ifdOffset = isLittleEndian
-      ? buffer.readUInt32LE(4)
-      : buffer.readUInt32BE(4);
+    const ifdOffset = isLittleEndian ? buffer.readUInt32LE(4) : buffer.readUInt32BE(4);
 
     if (ifdOffset >= buffer.length) {
-      throw new Error('Invalid TIFF IFD offset');
+      throw new Error("Invalid TIFF IFD offset");
     }
 
     // Read number of directory entries
@@ -436,7 +420,7 @@ export class ImageTokenizer {
     }
 
     if (width === 0 || height === 0) {
-      throw new Error('Could not find TIFF dimensions');
+      throw new Error("Could not find TIFF dimensions");
     }
 
     return { width, height };
@@ -452,38 +436,36 @@ export class ImageTokenizer {
     height: number;
   } {
     if (buffer.length < 12) {
-      throw new Error('Invalid HEIC: buffer too short');
+      throw new Error("Invalid HEIC: buffer too short");
     }
 
     // Check for ftyp box with HEIC brand
-    const ftypBox = buffer.subarray(4, 8).toString('ascii');
-    if (ftypBox !== 'ftyp') {
-      throw new Error('Invalid HEIC: missing ftyp box');
+    const ftypBox = buffer.subarray(4, 8).toString("ascii");
+    if (ftypBox !== "ftyp") {
+      throw new Error("Invalid HEIC: missing ftyp box");
     }
 
-    const brand = buffer.subarray(8, 12).toString('ascii');
-    if (!['heic', 'heix', 'hevc', 'hevx'].includes(brand)) {
-      throw new Error('Invalid HEIC brand');
+    const brand = buffer.subarray(8, 12).toString("ascii");
+    if (!["heic", "heix", "hevc", "hevx"].includes(brand)) {
+      throw new Error("Invalid HEIC brand");
     }
 
     // Look for meta box and then ispe box
     let offset = 0;
     while (offset < buffer.length - 8) {
       const boxSize = buffer.readUInt32BE(offset);
-      const boxType = buffer.subarray(offset + 4, offset + 8).toString('ascii');
+      const boxType = buffer.subarray(offset + 4, offset + 8).toString("ascii");
 
-      if (boxType === 'meta') {
+      if (boxType === "meta") {
         // Look for ispe box inside meta box
         const metaOffset = offset + 8;
         let innerOffset = metaOffset + 4; // Skip version and flags
 
         while (innerOffset < offset + boxSize - 8) {
           const innerBoxSize = buffer.readUInt32BE(innerOffset);
-          const innerBoxType = buffer
-            .subarray(innerOffset + 4, innerOffset + 8)
-            .toString('ascii');
+          const innerBoxType = buffer.subarray(innerOffset + 4, innerOffset + 8).toString("ascii");
 
-          if (innerBoxType === 'ispe') {
+          if (innerBoxType === "ispe") {
             // Found Image Spatial Extents box
             if (innerOffset + 20 <= buffer.length) {
               const width = buffer.readUInt32BE(innerOffset + 12);
@@ -502,7 +484,7 @@ export class ImageTokenizer {
     }
 
     // Fallback: return default dimensions if we can't parse the structure
-    debugLogger.warn('Could not extract HEIC dimensions, using default');
+    debugLogger.warn("Could not extract HEIC dimensions, using default");
     return { width: 512, height: 512 };
   }
 }
diff --git a/packages/airiscode-core/src/utils/request-tokenizer/index.ts b/packages/airiscode-core/src/utils/request-tokenizer/index.ts
index dc16c65f6..112e761ea 100644
--- a/packages/airiscode-core/src/utils/request-tokenizer/index.ts
+++ b/packages/airiscode-core/src/utils/request-tokenizer/index.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export { RequestTokenizer as RequestTokenEstimator } from './requestTokenizer.js';
-export { TextTokenizer } from './textTokenizer.js';
-export { ImageTokenizer } from './imageTokenizer.js';
+export { ImageTokenizer } from "./imageTokenizer.js";
+export { RequestTokenizer as RequestTokenEstimator } from "./requestTokenizer.js";
+export { TextTokenizer } from "./textTokenizer.js";
 
-export type { TokenCalculationResult, ImageMetadata } from './types.js';
+export type { ImageMetadata, TokenCalculationResult } from "./types.js";
diff --git a/packages/airiscode-core/src/utils/request-tokenizer/requestTokenizer.ts b/packages/airiscode-core/src/utils/request-tokenizer/requestTokenizer.ts
index 845b156d6..cde8000ef 100644
--- a/packages/airiscode-core/src/utils/request-tokenizer/requestTokenizer.ts
+++ b/packages/airiscode-core/src/utils/request-tokenizer/requestTokenizer.ts
@@ -4,18 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  CountTokensParameters,
-  Content,
-  Part,
-  PartUnion,
-} from '../../types/llm.js';
-import type { TokenCalculationResult } from './types.js';
-import { TextTokenizer } from './textTokenizer.js';
-import { ImageTokenizer } from './imageTokenizer.js';
-import { createDebugLogger } from '../debugLogger.js';
-
-const debugLogger = createDebugLogger('TOKENIZER');
+import type { Content, CountTokensParameters, Part, PartUnion } from "../../types/llm.js";
+import { createDebugLogger } from "../debugLogger.js";
+import { ImageTokenizer } from "./imageTokenizer.js";
+import { TextTokenizer } from "./textTokenizer.js";
+import type { TokenCalculationResult } from "./types.js";
+
+const debugLogger = createDebugLogger("TOKENIZER");
 
 /**
  * Simple request token estimator that handles text and image content serially
@@ -32,9 +27,7 @@ export class RequestTokenizer {
   /**
    * Calculate tokens for a request using serial processing
    */
-  async calculateTokens(
-    request: CountTokensParameters,
-  ): Promise<TokenCalculationResult> {
+  async calculateTokens(request: CountTokensParameters): Promise<TokenCalculationResult> {
     const startTime = performance.now();
 
     try {
@@ -80,7 +73,7 @@ export class RequestTokenizer {
         processingTime,
       };
     } catch (error) {
-      debugLogger.error('Error calculating tokens:', error);
+      debugLogger.error("Error calculating tokens:", error);
 
       // Fallback calculation
       const fallbackTokens = this.calculateFallbackTokens(request);
@@ -106,11 +99,11 @@ export class RequestTokenizer {
 
     try {
       // Avoid per-part rounding inflation by estimating once on the combined text.
-      return await this.textTokenizer.calculateTokens(textContents.join(''));
+      return await this.textTokenizer.calculateTokens(textContents.join(""));
     } catch (error) {
-      debugLogger.warn('Error calculating text tokens:', error);
+      debugLogger.warn("Error calculating text tokens:", error);
       // Fallback: character-based estimation
-      const totalChars = textContents.join('').length;
+      const totalChars = textContents.join("").length;
       return Math.ceil(totalChars / 4);
     }
   }
@@ -124,11 +117,10 @@ export class RequestTokenizer {
     if (imageContents.length === 0) return 0;
 
     try {
-      const tokenCounts =
-        await this.imageTokenizer.calculateTokensBatch(imageContents);
+      const tokenCounts = await this.imageTokenizer.calculateTokensBatch(imageContents);
       return tokenCounts.reduce((sum, count) => sum + count, 0);
     } catch (error) {
-      debugLogger.warn('Error calculating image tokens:', error);
+      debugLogger.warn("Error calculating image tokens:", error);
       // Fallback: minimum tokens per image
       return imageContents.length * 6; // 4 image tokens + 2 special tokens as minimum
     }
@@ -154,7 +146,7 @@ export class RequestTokenizer {
         // Rough estimate: 1 token per 100 bytes of audio data
         totalTokens += Math.max(Math.ceil(dataSize / 100), 10); // Minimum 10 tokens per audio
       } catch (error) {
-        debugLogger.warn('Error calculating audio tokens:', error);
+        debugLogger.warn("Error calculating audio tokens:", error);
         totalTokens += 10; // Fallback minimum
       }
     }
@@ -170,11 +162,11 @@ export class RequestTokenizer {
 
     try {
       // Treat other content as text, and avoid per-item rounding inflation.
-      return await this.textTokenizer.calculateTokens(otherContents.join(''));
+      return await this.textTokenizer.calculateTokens(otherContents.join(""));
     } catch (error) {
-      debugLogger.warn('Error calculating other content tokens:', error);
+      debugLogger.warn("Error calculating other content tokens:", error);
       // Fallback: character-based estimation
-      const totalChars = otherContents.join('').length;
+      const totalChars = otherContents.join("").length;
       return Math.ceil(totalChars / 4);
     }
   }
@@ -187,7 +179,7 @@ export class RequestTokenizer {
       const content = JSON.stringify(request.contents);
       return Math.ceil(content.length / 4); // Rough estimate: 1 token ≈ 4 characters
     } catch (error) {
-      debugLogger.warn('Error in fallback token calculation:', error);
+      debugLogger.warn("Error in fallback token calculation:", error);
       return 100; // Conservative fallback
     }
   }
@@ -210,31 +202,17 @@ export class RequestTokenizer {
       return { textContents, imageContents, audioContents, otherContents };
     }
 
-    const contents = Array.isArray(request.contents)
-      ? request.contents
-      : [request.contents];
+    const contents = Array.isArray(request.contents) ? request.contents : [request.contents];
 
     for (const content of contents) {
       // ContentUnion may itself be a PartUnion[]; in that case iterate parts.
       if (Array.isArray(content)) {
         for (const part of content) {
-          this.processPart(
-            part,
-            textContents,
-            imageContents,
-            audioContents,
-            otherContents,
-          );
+          this.processPart(part, textContents, imageContents, audioContents, otherContents);
         }
         continue;
       }
-      this.processContent(
-        content,
-        textContents,
-        imageContents,
-        audioContents,
-        otherContents,
-      );
+      this.processContent(content, textContents, imageContents, audioContents, otherContents);
     }
 
     return { textContents, imageContents, audioContents, otherContents };
@@ -250,24 +228,18 @@ export class RequestTokenizer {
     audioContents: Array<{ data: string; mimeType: string }>,
     otherContents: string[],
   ): void {
-    if (typeof content === 'string') {
+    if (typeof content === "string") {
       if (content.trim()) {
         textContents.push(content);
       }
       return;
     }
 
-    if ('parts' in content) {
+    if ("parts" in content) {
       const parts = (content as Content).parts;
       if (Array.isArray(parts)) {
         for (const part of parts) {
-          this.processPart(
-            part,
-            textContents,
-            imageContents,
-            audioContents,
-            otherContents,
-          );
+          this.processPart(part, textContents, imageContents, audioContents, otherContents);
         }
       }
       return;
@@ -294,41 +266,41 @@ export class RequestTokenizer {
     audioContents: Array<{ data: string; mimeType: string }>,
     otherContents: string[],
   ): void {
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       if (part.trim()) {
         textContents.push(part);
       }
       return;
     }
 
-    if ('text' in part && part.text) {
+    if ("text" in part && part.text) {
       textContents.push(part.text);
       return;
     }
 
-    if ('inlineData' in part && part.inlineData) {
+    if ("inlineData" in part && part.inlineData) {
       const { data, mimeType } = part.inlineData;
-      if (mimeType && mimeType.startsWith('image/')) {
-        imageContents.push({ data: data || '', mimeType });
+      if (mimeType && mimeType.startsWith("image/")) {
+        imageContents.push({ data: data || "", mimeType });
         return;
       }
-      if (mimeType && mimeType.startsWith('audio/')) {
-        audioContents.push({ data: data || '', mimeType });
+      if (mimeType && mimeType.startsWith("audio/")) {
+        audioContents.push({ data: data || "", mimeType });
         return;
       }
     }
 
-    if ('fileData' in part && part.fileData) {
+    if ("fileData" in part && part.fileData) {
       otherContents.push(JSON.stringify(part.fileData));
       return;
     }
 
-    if ('functionCall' in part && part.functionCall) {
+    if ("functionCall" in part && part.functionCall) {
       otherContents.push(JSON.stringify(part.functionCall));
       return;
     }
 
-    if ('functionResponse' in part && part.functionResponse) {
+    if ("functionResponse" in part && part.functionResponse) {
       otherContents.push(JSON.stringify(part.functionResponse));
       return;
     }
@@ -336,11 +308,11 @@ export class RequestTokenizer {
     // Unknown part type - try to serialize
     try {
       const serialized = JSON.stringify(part);
-      if (serialized && serialized !== '{}') {
+      if (serialized && serialized !== "{}") {
         otherContents.push(serialized);
       }
     } catch (error) {
-      debugLogger.warn('Failed to serialize unknown part type:', error);
+      debugLogger.warn("Failed to serialize unknown part type:", error);
     }
   }
 }
diff --git a/packages/airiscode-core/src/utils/request-tokenizer/supportedImageFormats.ts b/packages/airiscode-core/src/utils/request-tokenizer/supportedImageFormats.ts
index fce679d7c..708ec324b 100644
--- a/packages/airiscode-core/src/utils/request-tokenizer/supportedImageFormats.ts
+++ b/packages/airiscode-core/src/utils/request-tokenizer/supportedImageFormats.ts
@@ -9,32 +9,27 @@
  * These formats are supported by the vision model and can be processed by the image tokenizer
  */
 export const SUPPORTED_IMAGE_MIME_TYPES = [
-  'image/bmp',
-  'image/jpeg',
-  'image/jpg', // Alternative MIME type for JPEG
-  'image/png',
-  'image/tiff',
-  'image/webp',
-  'image/heic',
+  "image/bmp",
+  "image/jpeg",
+  "image/jpg", // Alternative MIME type for JPEG
+  "image/png",
+  "image/tiff",
+  "image/webp",
+  "image/heic",
 ] as const;
 
 /**
  * Type for supported image MIME types
  */
-export type SupportedImageMimeType =
-  (typeof SUPPORTED_IMAGE_MIME_TYPES)[number];
+export type SupportedImageMimeType = (typeof SUPPORTED_IMAGE_MIME_TYPES)[number];
 
 /**
  * Check if a MIME type is supported for vision processing
  * @param mimeType The MIME type to check
  * @returns True if the MIME type is supported
  */
-export function isSupportedImageMimeType(
-  mimeType: string,
-): mimeType is SupportedImageMimeType {
-  return SUPPORTED_IMAGE_MIME_TYPES.includes(
-    mimeType as SupportedImageMimeType,
-  );
+export function isSupportedImageMimeType(mimeType: string): mimeType is SupportedImageMimeType {
+  return SUPPORTED_IMAGE_MIME_TYPES.includes(mimeType as SupportedImageMimeType);
 }
 
 /**
@@ -42,9 +37,9 @@ export function isSupportedImageMimeType(
  * @returns Comma-separated string of supported formats
  */
 export function getSupportedImageFormatsString(): string {
-  return SUPPORTED_IMAGE_MIME_TYPES.map((type) =>
-    type.replace('image/', '').toUpperCase(),
-  ).join(', ');
+  return SUPPORTED_IMAGE_MIME_TYPES.map((type) => type.replace("image/", "").toUpperCase()).join(
+    ", ",
+  );
 }
 
 /**
diff --git a/packages/airiscode-core/src/utils/retry.ts b/packages/airiscode-core/src/utils/retry.ts
index cd5a1c30e..9f161a8c8 100644
--- a/packages/airiscode-core/src/utils/retry.ts
+++ b/packages/airiscode-core/src/utils/retry.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentResponse } from '../types/llm.js';
-import { createDebugLogger } from './debugLogger.js';
-import { getErrorStatus } from './errors.js';
+import type { GenerateContentResponse } from "../types/llm.js";
+import { createDebugLogger } from "./debugLogger.js";
+import { getErrorStatus } from "./errors.js";
 
-const debugLogger = createDebugLogger('RETRY');
+const debugLogger = createDebugLogger("RETRY");
 
 export interface HttpError extends Error {
   status?: number;
@@ -38,9 +38,7 @@ const DEFAULT_RETRY_OPTIONS: RetryOptions = {
  */
 function defaultShouldRetry(error: Error | unknown): boolean {
   const status = getErrorStatus(error);
-  return (
-    status === 429 || (status !== undefined && status >= 500 && status < 600)
-  );
+  return status === 429 || (status !== undefined && status >= 500 && status < 600);
 }
 
 /**
@@ -64,20 +62,14 @@ export async function retryWithBackoff<T>(
   options?: Partial<RetryOptions>,
 ): Promise<T> {
   if (options?.maxAttempts !== undefined && options.maxAttempts <= 0) {
-    throw new Error('maxAttempts must be a positive number.');
+    throw new Error("maxAttempts must be a positive number.");
   }
 
   const cleanOptions = options
     ? Object.fromEntries(Object.entries(options).filter(([_, v]) => v != null))
     : {};
 
-  const {
-    maxAttempts,
-    initialDelayMs,
-    maxDelayMs,
-    shouldRetryOnError,
-    shouldRetryOnContent,
-  } = {
+  const { maxAttempts, initialDelayMs, maxDelayMs, shouldRetryOnError, shouldRetryOnContent } = {
     ...DEFAULT_RETRY_OPTIONS,
     ...cleanOptions,
   };
@@ -90,10 +82,7 @@ export async function retryWithBackoff<T>(
     try {
       const result = await fn();
 
-      if (
-        shouldRetryOnContent &&
-        shouldRetryOnContent(result as GenerateContentResponse)
-      ) {
+      if (shouldRetryOnContent && shouldRetryOnContent(result as GenerateContentResponse)) {
         const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
         const delayWithJitter = Math.max(0, currentDelay + jitter);
         await delay(delayWithJitter);
@@ -110,13 +99,12 @@ export async function retryWithBackoff<T>(
         throw error;
       }
 
-      const retryAfterMs =
-        errorStatus === 429 ? getRetryAfterDelayMs(error) : 0;
+      const retryAfterMs = errorStatus === 429 ? getRetryAfterDelayMs(error) : 0;
 
       if (retryAfterMs > 0) {
         // Respect Retry-After header if present and parsed
         debugLogger.warn(
-          `Attempt ${attempt} failed with status ${errorStatus ?? 'unknown'}. Retrying after explicit delay of ${retryAfterMs}ms...`,
+          `Attempt ${attempt} failed with status ${errorStatus ?? "unknown"}. Retrying after explicit delay of ${retryAfterMs}ms...`,
           error,
         );
         await delay(retryAfterMs);
@@ -135,7 +123,7 @@ export async function retryWithBackoff<T>(
   }
   // This line should theoretically be unreachable due to the throw in the catch block.
   // Added for type safety and to satisfy the compiler that a promise is always returned.
-  throw new Error('Retry attempts exhausted');
+  throw new Error("Retry attempts exhausted");
 }
 
 /**
@@ -144,22 +132,22 @@ export async function retryWithBackoff<T>(
  * @returns The delay in milliseconds, or 0 if not found or invalid.
  */
 function getRetryAfterDelayMs(error: unknown): number {
-  if (typeof error === 'object' && error !== null) {
+  if (typeof error === "object" && error !== null) {
     // Check for error.response.headers (common in axios errors)
     if (
-      'response' in error &&
-      typeof (error as { response?: unknown }).response === 'object' &&
+      "response" in error &&
+      typeof (error as { response?: unknown }).response === "object" &&
       (error as { response?: unknown }).response !== null
     ) {
       const response = (error as { response: { headers?: unknown } }).response;
       if (
-        'headers' in response &&
-        typeof response.headers === 'object' &&
+        "headers" in response &&
+        typeof response.headers === "object" &&
         response.headers !== null
       ) {
-        const headers = response.headers as { 'retry-after'?: unknown };
-        const retryAfterHeader = headers['retry-after'];
-        if (typeof retryAfterHeader === 'string') {
+        const headers = response.headers as { "retry-after"?: unknown };
+        const retryAfterHeader = headers["retry-after"];
+        if (typeof retryAfterHeader === "string") {
           const retryAfterSeconds = parseInt(retryAfterHeader, 10);
           if (!isNaN(retryAfterSeconds)) {
             return retryAfterSeconds * 1000;
@@ -182,11 +170,7 @@ function getRetryAfterDelayMs(error: unknown): number {
  * @param error The error that caused the retry.
  * @param errorStatus The HTTP status code of the error, if available.
  */
-function logRetryAttempt(
-  attempt: number,
-  error: unknown,
-  errorStatus?: number,
-): void {
+function logRetryAttempt(attempt: number, error: unknown, errorStatus?: number): void {
   const message = errorStatus
     ? `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...`
     : `Attempt ${attempt} failed. Retrying with backoff...`;
diff --git a/packages/airiscode-core/src/utils/ripgrepUtils.ts b/packages/airiscode-core/src/utils/ripgrepUtils.ts
index 7f6f3d9c8..65cff0ffd 100644
--- a/packages/airiscode-core/src/utils/ripgrepUtils.ts
+++ b/packages/airiscode-core/src/utils/ripgrepUtils.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { execFile } from 'node:child_process';
-import { fileExists } from './fileUtils.js';
-import { execCommand, isCommandAvailable } from './shell-utils.js';
-import { createDebugLogger } from './debugLogger.js';
+import { execFile } from "node:child_process";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { createDebugLogger } from "./debugLogger.js";
+import { fileExists } from "./fileUtils.js";
+import { execCommand, isCommandAvailable } from "./shell-utils.js";
 
-const debugLogger = createDebugLogger('RIPGREP');
+const debugLogger = createDebugLogger("RIPGREP");
 
-const RIPGREP_COMMAND = 'rg';
+const RIPGREP_COMMAND = "rg";
 const RIPGREP_BUFFER_LIMIT = 20_000_000; // Keep buffers aligned with the original bundle.
 const RIPGREP_TEST_TIMEOUT_MS = 5_000;
 const RIPGREP_RUN_TIMEOUT_MS = 10_000;
 const RIPGREP_WSL_TIMEOUT_MS = 60_000;
 
-type RipgrepMode = 'builtin' | 'system';
+type RipgrepMode = "builtin" | "system";
 
 interface RipgrepSelection {
   mode: RipgrepMode;
@@ -52,7 +52,7 @@ let cachedHealth: RipgrepHealth | null = null;
 let macSigningAttempted = false;
 
 function wslTimeout(): number {
-  return process.platform === 'linux' && process.env['WSL_INTEROP']
+  return process.platform === "linux" && process.env["WSL_INTEROP"]
     ? RIPGREP_WSL_TIMEOUT_MS
     : RIPGREP_RUN_TIMEOUT_MS;
 }
@@ -61,17 +61,17 @@ function wslTimeout(): number {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-type Platform = 'darwin' | 'linux' | 'win32';
-type Architecture = 'x64' | 'arm64';
+type Platform = "darwin" | "linux" | "win32";
+type Architecture = "x64" | "arm64";
 
 /**
  * Maps process.platform values to vendor directory names
  */
 function getPlatformString(platform: string): Platform | undefined {
   switch (platform) {
-    case 'darwin':
-    case 'linux':
-    case 'win32':
+    case "darwin":
+    case "linux":
+    case "win32":
       return platform;
     default:
       return undefined;
@@ -83,8 +83,8 @@ function getPlatformString(platform: string): Platform | undefined {
  */
 function getArchitectureString(arch: string): Architecture | undefined {
   switch (arch) {
-    case 'x64':
-    case 'arm64':
+    case "x64":
+    case "arm64":
       return arch;
     default:
       return undefined;
@@ -103,20 +103,20 @@ export function getBuiltinRipgrep(): string | null {
     return null;
   }
 
-  const binaryName = platform === 'win32' ? 'rg.exe' : 'rg';
+  const binaryName = platform === "win32" ? "rg.exe" : "rg";
 
   // Determine levels to traverse up to reach package root where vendor/ lives:
   // - Bundle (dist/index.js): vendor copied into dist/, 0 levels
   // - Source (src/utils/*.ts): 2 levels up
   // - Transpiled (dist/src/utils/*.js): 3 levels up
-  const inSrcUtils = __filename.includes(path.join('src', 'utils'));
-  const levelsUp = !inSrcUtils ? 0 : __filename.endsWith('.ts') ? 2 : 3;
+  const inSrcUtils = __filename.includes(path.join("src", "utils"));
+  const levelsUp = !inSrcUtils ? 0 : __filename.endsWith(".ts") ? 2 : 3;
 
   return path.join(
     __dirname,
-    ...Array<string>(levelsUp).fill('..'),
-    'vendor',
-    'ripgrep',
+    ...Array<string>(levelsUp).fill(".."),
+    "vendor",
+    "ripgrep",
     `${arch}-${platform}`,
     binaryName,
   );
@@ -129,16 +129,14 @@ export function getBuiltinRipgrep(): string | null {
  * @returns The path to ripgrep binary ('rg' or 'rg.exe' for system ripgrep, or full path for bundled), or null if not available
  * @throws {Error} If an error occurs while resolving the ripgrep binary.
  */
-export async function resolveRipgrep(
-  useBuiltin: boolean = true,
-): Promise<RipgrepSelection | null> {
+export async function resolveRipgrep(useBuiltin: boolean = true): Promise<RipgrepSelection | null> {
   if (cachedSelection) return cachedSelection;
 
   if (useBuiltin) {
     // Try bundled ripgrep first
     const rgPath = getBuiltinRipgrep();
     if (rgPath && (await fileExists(rgPath))) {
-      cachedSelection = { mode: 'builtin', command: rgPath };
+      cachedSelection = { mode: "builtin", command: rgPath };
       return cachedSelection;
     }
     // Fallback to system rg if bundled binary is not available
@@ -146,7 +144,7 @@ export async function resolveRipgrep(
 
   const { available, error } = isCommandAvailable(RIPGREP_COMMAND);
   if (available) {
-    cachedSelection = { mode: 'system', command: RIPGREP_COMMAND };
+    cachedSelection = { mode: "system", command: RIPGREP_COMMAND };
     return cachedSelection;
   }
 
@@ -162,25 +160,15 @@ export async function resolveRipgrep(
  * @param selection The ripgrep selection to check.
  * @throws {Error} If ripgrep is not found or is not healthy.
  */
-export async function ensureRipgrepHealthy(
-  selection: RipgrepSelection,
-): Promise<void> {
-  if (
-    cachedHealth &&
-    cachedHealth.selection.command === selection.command &&
-    cachedHealth.working
-  )
+export async function ensureRipgrepHealthy(selection: RipgrepSelection): Promise<void> {
+  if (cachedHealth && cachedHealth.selection.command === selection.command && cachedHealth.working)
     return;
 
   try {
-    const { stdout, code } = await execCommand(
-      selection.command,
-      ['--version'],
-      {
-        timeout: RIPGREP_TEST_TIMEOUT_MS,
-      },
-    );
-    const working = code === 0 && stdout.startsWith('ripgrep');
+    const { stdout, code } = await execCommand(selection.command, ["--version"], {
+      timeout: RIPGREP_TEST_TIMEOUT_MS,
+    });
+    const working = code === 0 && stdout.startsWith("ripgrep");
     cachedHealth = { working, lastTested: Date.now(), selection };
   } catch (error) {
     cachedHealth = { working: false, lastTested: Date.now(), selection };
@@ -188,33 +176,29 @@ export async function ensureRipgrepHealthy(
   }
 }
 
-export async function ensureMacBinarySigned(
-  selection: RipgrepSelection,
-): Promise<void> {
-  if (process.platform !== 'darwin') return;
+export async function ensureMacBinarySigned(selection: RipgrepSelection): Promise<void> {
+  if (process.platform !== "darwin") return;
   if (macSigningAttempted) return;
   macSigningAttempted = true;
 
-  if (selection.mode !== 'builtin') return;
+  if (selection.mode !== "builtin") return;
   const binaryPath = selection.command;
 
-  const inspect = await execCommand('codesign', ['-vv', '-d', binaryPath], {
+  const inspect = await execCommand("codesign", ["-vv", "-d", binaryPath], {
     preserveOutputOnError: false,
   });
   const alreadySigned =
-    inspect.stdout
-      ?.split('\n')
-      .some((line) => line.includes('linker-signed')) ?? false;
+    inspect.stdout?.split("\n").some((line) => line.includes("linker-signed")) ?? false;
   if (!alreadySigned) return;
 
-  await execCommand('codesign', [
-    '--sign',
-    '-',
-    '--force',
-    '--preserve-metadata=entitlements,requirements,flags,runtime',
+  await execCommand("codesign", [
+    "--sign",
+    "-",
+    "--force",
+    "--preserve-metadata=entitlements,requirements,flags,runtime",
     binaryPath,
   ]);
-  await execCommand('xattr', ['-d', 'com.apple.quarantine', binaryPath]);
+  await execCommand("xattr", ["-d", "com.apple.quarantine", binaryPath]);
 }
 
 /**
@@ -224,9 +208,7 @@ export async function ensureMacBinarySigned(
  * @returns True if ripgrep is available, false otherwise.
  * @throws {Error} If an error occurs while resolving the ripgrep binary.
  */
-export async function canUseRipgrep(
-  useBuiltin: boolean = true,
-): Promise<boolean> {
+export async function canUseRipgrep(useBuiltin: boolean = true): Promise<boolean> {
   const selection = await resolveRipgrep(useBuiltin);
   if (!selection) {
     return false;
@@ -242,13 +224,10 @@ export async function canUseRipgrep(
  * @returns The result of running ripgrep
  * @throws {Error} If an error occurs while running ripgrep.
  */
-export async function runRipgrep(
-  args: string[],
-  signal?: AbortSignal,
-): Promise<RipgrepRunResult> {
+export async function runRipgrep(args: string[], signal?: AbortSignal): Promise<RipgrepRunResult> {
   const selection = await resolveRipgrep();
   if (!selection) {
-    throw new Error('ripgrep not found.');
+    throw new Error("ripgrep not found.");
   }
   await ensureRipgrepHealthy(selection);
 
@@ -261,7 +240,7 @@ export async function runRipgrep(
         timeout: wslTimeout(),
         signal,
       },
-      (error, stdout = '', stderr = '') => {
+      (error, stdout = "", stderr = "") => {
         if (!error) {
           // Success case
           resolve({
@@ -273,18 +252,15 @@ export async function runRipgrep(
 
         // Exit code 1 = no matches found (not an error)
         // The error.code from execFile can be string | number | undefined | null
-        const errorCode = (
-          error as Error & { code?: string | number | undefined | null }
-        ).code;
+        const errorCode = (error as Error & { code?: string | number | undefined | null }).code;
         if (errorCode === 1) {
-          resolve({ stdout: '', truncated: false });
+          resolve({ stdout: "", truncated: false });
           return;
         }
 
         // Detect various error conditions
-        const wasKilled =
-          error.signal === 'SIGTERM' || error.name === 'AbortError';
-        const overflow = errorCode === 'ERR_CHILD_PROCESS_STDIO_MAXBUFFER';
+        const wasKilled = error.signal === "SIGTERM" || error.name === "AbortError";
+        const overflow = errorCode === "ERR_CHILD_PROCESS_STDIO_MAXBUFFER";
         const syntaxError = errorCode === 2;
 
         const truncated = wasKilled || overflow;
@@ -292,17 +268,17 @@ export async function runRipgrep(
 
         // If killed or overflow with partial output, remove the last potentially incomplete line
         if (truncated && partialOutput.length > 0) {
-          const lines = partialOutput.split('\n');
+          const lines = partialOutput.split("\n");
           if (lines.length > 0) {
             lines.pop();
-            partialOutput = lines.join('\n');
+            partialOutput = lines.join("\n");
           }
         }
 
         // Log warnings for abnormal exits (except syntax errors)
         if (!syntaxError && truncated) {
           debugLogger.warn(
-            `ripgrep exited abnormally (signal=${error.signal} code=${error.code}) with stderr:\n${stderr.trim() || '(empty)'}`,
+            `ripgrep exited abnormally (signal=${error.signal} code=${error.code}) with stderr:\n${stderr.trim() || "(empty)"}`,
           );
         }
 
@@ -315,8 +291,6 @@ export async function runRipgrep(
     );
 
     // Handle spawn errors
-    child.on('error', (err) =>
-      resolve({ stdout: '', truncated: false, error: err }),
-    );
+    child.on("error", (err) => resolve({ stdout: "", truncated: false, error: err }));
   });
 }
diff --git a/packages/airiscode-core/src/utils/runtimeFetchOptions.ts b/packages/airiscode-core/src/utils/runtimeFetchOptions.ts
index 1e0ef4806..d7f72ae6d 100644
--- a/packages/airiscode-core/src/utils/runtimeFetchOptions.ts
+++ b/packages/airiscode-core/src/utils/runtimeFetchOptions.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Agent, ProxyAgent, type Dispatcher } from 'undici';
+import { Agent, type Dispatcher, ProxyAgent } from "undici";
 
 /**
  * JavaScript runtime type
  */
-export type Runtime = 'node' | 'bun' | 'unknown';
+export type Runtime = "node" | "bun" | "unknown";
 
 /**
  * Detect the current JavaScript runtime
  */
 export function detectRuntime(): Runtime {
-  if (typeof process !== 'undefined' && process.versions?.['bun']) {
-    return 'bun';
+  if (typeof process !== "undefined" && process.versions?.["bun"]) {
+    return "bun";
   }
-  if (typeof process !== 'undefined' && process.versions?.node) {
-    return 'node';
+  if (typeof process !== "undefined" && process.versions?.node) {
+    return "node";
   }
-  return 'unknown';
+  return "unknown";
 }
 
 /**
@@ -50,20 +50,20 @@ export type AnthropicRuntimeFetchOptions = {
 /**
  * SDK type identifier
  */
-export type SDKType = 'openai' | 'anthropic';
+export type SDKType = "openai" | "anthropic";
 
 /**
  * Build runtime-specific fetch options for OpenAI SDK
  */
 export function buildRuntimeFetchOptions(
-  sdkType: 'openai',
+  sdkType: "openai",
   proxyUrl?: string,
 ): OpenAIRuntimeFetchOptions;
 /**
  * Build runtime-specific fetch options for Anthropic SDK
  */
 export function buildRuntimeFetchOptions(
-  sdkType: 'anthropic',
+  sdkType: "anthropic",
   proxyUrl?: string,
 ): AnthropicRuntimeFetchOptions;
 /**
@@ -86,8 +86,8 @@ export function buildRuntimeFetchOptions(
   // ensure user-configured timeouts work as expected for long-running requests.
 
   switch (runtime) {
-    case 'bun': {
-      if (sdkType === 'openai') {
+    case "bun": {
+      if (sdkType === "openai") {
         // Bun: Disable built-in 300s timeout to let OpenAI SDK timeout control
         // This ensures user-configured timeout works as expected without interference
         return {
@@ -100,10 +100,7 @@ export function buildRuntimeFetchOptions(
         // This allows Anthropic SDK timeout to control the request
         // Note: Bun's fetch automatically uses proxy settings from environment variables
         // (HTTP_PROXY, HTTPS_PROXY, NO_PROXY), so proxy behavior is preserved
-        const bunFetch: typeof fetch = async (
-          input: RequestInfo | URL,
-          init?: RequestInit,
-        ) => {
+        const bunFetch: typeof fetch = async (input: RequestInfo | URL, init?: RequestInit) => {
           const bunFetchOptions: RequestInit = {
             ...init,
             // @ts-expect-error - Bun-specific timeout option
@@ -117,7 +114,7 @@ export function buildRuntimeFetchOptions(
       }
     }
 
-    case 'node': {
+    case "node": {
       // Node.js: Use undici dispatcher for both SDKs.
       // This enables proxy support and disables undici timeouts so SDK timeout
       // controls the total request time.
@@ -148,6 +145,6 @@ function buildFetchOptionsWithDispatcher(
         });
     return { fetchOptions: { dispatcher } };
   } catch {
-    return sdkType === 'openai' ? undefined : {};
+    return sdkType === "openai" ? undefined : {};
   }
 }
diff --git a/packages/airiscode-core/src/utils/safeJsonParse.ts b/packages/airiscode-core/src/utils/safeJsonParse.ts
index 76b796fb8..27b18e732 100644
--- a/packages/airiscode-core/src/utils/safeJsonParse.ts
+++ b/packages/airiscode-core/src/utils/safeJsonParse.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { jsonrepair } from 'jsonrepair';
-import { createDebugLogger } from './debugLogger.js';
+import { jsonrepair } from "jsonrepair";
+import { createDebugLogger } from "./debugLogger.js";
 
-const debugLogger = createDebugLogger('JSON_PARSE');
+const debugLogger = createDebugLogger("JSON_PARSE");
 
 /**
  * Safely parse JSON string with jsonrepair fallback for malformed JSON.
@@ -22,7 +22,7 @@ export function safeJsonParse<T = Record<string, unknown>>(
   jsonString: string,
   fallbackValue: T = {} as T,
 ): T {
-  if (!jsonString || typeof jsonString !== 'string') {
+  if (!jsonString || typeof jsonString !== "string") {
     return fallbackValue;
   }
 
@@ -37,7 +37,7 @@ export function safeJsonParse<T = Record<string, unknown>>(
       // jsonrepair always returns a string, so we need to parse it
       return JSON.parse(repairedJson) as T;
     } catch (repairError) {
-      debugLogger.error('Failed to parse JSON even with jsonrepair:', {
+      debugLogger.error("Failed to parse JSON even with jsonrepair:", {
         originalError: error,
         repairError,
         jsonString,
diff --git a/packages/airiscode-core/src/utils/safeJsonStringify.ts b/packages/airiscode-core/src/utils/safeJsonStringify.ts
index f439bcea1..c800adb38 100644
--- a/packages/airiscode-core/src/utils/safeJsonStringify.ts
+++ b/packages/airiscode-core/src/utils/safeJsonStringify.ts
@@ -11,17 +11,14 @@
  * @param space - Optional space parameter for formatting (defaults to no formatting)
  * @returns JSON string with circular references replaced by [Circular]
  */
-export function safeJsonStringify(
-  obj: unknown,
-  space?: string | number,
-): string {
+export function safeJsonStringify(obj: unknown, space?: string | number): string {
   const seen = new WeakSet();
   return JSON.stringify(
     obj,
     (key, value) => {
-      if (typeof value === 'object' && value !== null) {
+      if (typeof value === "object" && value !== null) {
         if (seen.has(value)) {
-          return '[Circular]';
+          return "[Circular]";
         }
         seen.add(value);
       }
diff --git a/packages/airiscode-core/src/utils/schemaConverter.ts b/packages/airiscode-core/src/utils/schemaConverter.ts
index 9d8a45a7d..2bbdc2ad3 100644
--- a/packages/airiscode-core/src/utils/schemaConverter.ts
+++ b/packages/airiscode-core/src/utils/schemaConverter.ts
@@ -10,16 +10,16 @@
  * OpenAPI 3.0 compatible Schema Objects, which is required for Google Gemini API.
  */
 
-export type SchemaComplianceMode = 'auto' | 'openapi_30';
+export type SchemaComplianceMode = "auto" | "openapi_30";
 
 /**
  * Converts a JSON Schema to be compatible with the specified compliance mode.
  */
 export function convertSchema(
   schema: Record<string, unknown>,
-  mode: SchemaComplianceMode = 'auto',
+  mode: SchemaComplianceMode = "auto",
 ): Record<string, unknown> {
-  if (mode === 'openapi_30') {
+  if (mode === "openapi_30") {
     return toOpenAPI30(schema);
   }
 
@@ -33,7 +33,7 @@ export function convertSchema(
  */
 function toOpenAPI30(schema: Record<string, unknown>): Record<string, unknown> {
   const convert = (obj: unknown): unknown => {
-    if (typeof obj !== 'object' || obj === null) {
+    if (typeof obj !== "object" || obj === null) {
       return obj;
     }
 
@@ -45,77 +45,74 @@ function toOpenAPI30(schema: Record<string, unknown>): Record<string, unknown> {
     const target: Record<string, unknown> = {};
 
     // 1. Type Handling
-    if (Array.isArray(source['type'])) {
-      const types = source['type'] as string[];
+    if (Array.isArray(source["type"])) {
+      const types = source["type"] as string[];
       // Handle ["string", "null"] pattern common in modern schemas
-      if (types.length === 2 && types.includes('null')) {
-        target['type'] = types.find((t) => t !== 'null');
-        target['nullable'] = true;
+      if (types.length === 2 && types.includes("null")) {
+        target["type"] = types.find((t) => t !== "null");
+        target["nullable"] = true;
       } else {
         // Fallback for other unions: take the first non-null type
         // OpenAPI 3.0 doesn't support type arrays.
         // Ideal fix would be anyOf, but simple fallback is safer for now.
-        target['type'] = types[0];
+        target["type"] = types[0];
       }
-    } else if (source['type'] !== undefined) {
-      target['type'] = source['type'];
+    } else if (source["type"] !== undefined) {
+      target["type"] = source["type"];
     }
 
     // 2. Const Handling (Draft 6+) -> Enum (OpenAPI 3.0)
-    if (source['const'] !== undefined) {
-      target['enum'] = [source['const']];
-      delete target['const'];
+    if (source["const"] !== undefined) {
+      target["enum"] = [source["const"]];
+      delete target["const"];
     }
 
     // 3. Exclusive Limits (Draft 6+ number) -> (Draft 4 boolean)
     // exclusiveMinimum: 10 -> minimum: 10, exclusiveMinimum: true
-    if (typeof source['exclusiveMinimum'] === 'number') {
-      target['minimum'] = source['exclusiveMinimum'];
-      target['exclusiveMinimum'] = true;
+    if (typeof source["exclusiveMinimum"] === "number") {
+      target["minimum"] = source["exclusiveMinimum"];
+      target["exclusiveMinimum"] = true;
     }
-    if (typeof source['exclusiveMaximum'] === 'number') {
-      target['maximum'] = source['exclusiveMaximum'];
-      target['exclusiveMaximum'] = true;
+    if (typeof source["exclusiveMaximum"] === "number") {
+      target["maximum"] = source["exclusiveMaximum"];
+      target["exclusiveMaximum"] = true;
     }
 
     // 4. Array Items (Tuple -> Single Schema)
     // OpenAPI 3.0 items must be a schema object, not an array of schemas
-    if (Array.isArray(source['items'])) {
+    if (Array.isArray(source["items"])) {
       // Tuple support is tricky.
       // Best effort: Use the first item's schema as a generic array type
       // or convert to an empty object (any type) if mixed.
       // For now, we'll strip it to allow validation to pass (accepts any items)
       // This matches the legacy behavior but is explicit.
       // Ideally, we could use `oneOf` on the items if we wanted to be stricter.
-      delete target['items'];
-    } else if (
-      typeof source['items'] === 'object' &&
-      source['items'] !== null
-    ) {
-      target['items'] = convert(source['items']);
+      delete target["items"];
+    } else if (typeof source["items"] === "object" && source["items"] !== null) {
+      target["items"] = convert(source["items"]);
     }
 
     // 5. Enum Stringification
     // Gemini strictly requires enums to be strings
-    if (Array.isArray(source['enum'])) {
-      target['enum'] = source['enum'].map(String);
+    if (Array.isArray(source["enum"])) {
+      target["enum"] = source["enum"].map(String);
     }
 
     // 6. Recursively process other properties
     for (const [key, value] of Object.entries(source)) {
       // Skip fields we've already handled or want to remove
       if (
-        key === 'type' ||
-        key === 'const' ||
-        key === 'exclusiveMinimum' ||
-        key === 'exclusiveMaximum' ||
-        key === 'items' ||
-        key === 'enum' ||
-        key === '$schema' ||
-        key === '$id' ||
-        key === 'default' || // Optional: Gemini sometimes complains about defaults conflicting with types
-        key === 'dependencies' ||
-        key === 'patternProperties'
+        key === "type" ||
+        key === "const" ||
+        key === "exclusiveMinimum" ||
+        key === "exclusiveMaximum" ||
+        key === "items" ||
+        key === "enum" ||
+        key === "$schema" ||
+        key === "$id" ||
+        key === "default" || // Optional: Gemini sometimes complains about defaults conflicting with types
+        key === "dependencies" ||
+        key === "patternProperties"
       ) {
         continue;
       }
diff --git a/packages/airiscode-core/src/utils/schemaValidator.ts b/packages/airiscode-core/src/utils/schemaValidator.ts
index 673f5b410..3e4a1aa01 100644
--- a/packages/airiscode-core/src/utils/schemaValidator.ts
+++ b/packages/airiscode-core/src/utils/schemaValidator.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import AjvPkg, { type AnySchema, type Ajv } from 'ajv';
+import AjvPkg, { type Ajv, type AnySchema } from "ajv";
 // Ajv2020 is the documented way to use draft-2020-12: https://ajv.js.org/json-schema.html#draft-2020-12
 // eslint-disable-next-line import/no-internal-modules
-import Ajv2020Pkg from 'ajv/dist/2020.js';
-import * as addFormats from 'ajv-formats';
-import { createDebugLogger } from './debugLogger.js';
+import Ajv2020Pkg from "ajv/dist/2020.js";
+import * as addFormats from "ajv-formats";
+import { createDebugLogger } from "./debugLogger.js";
 
 // Ajv's ESM/CJS interop: use 'any' for compatibility as recommended by Ajv docs
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -17,7 +17,7 @@ const AjvClass = (AjvPkg as any).default || AjvPkg;
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const Ajv2020Class = (Ajv2020Pkg as any).default || Ajv2020Pkg;
 
-const debugLogger = createDebugLogger('SchemaValidator');
+const debugLogger = createDebugLogger("SchemaValidator");
 
 const ajvOptions = {
   // See: https://ajv.js.org/options.html#strict-mode-options
@@ -42,16 +42,16 @@ addFormatsFunc(ajvDefault);
 addFormatsFunc(ajv2020);
 
 // Canonical draft-2020-12 meta-schema URI (used by rmcp MCP servers)
-const DRAFT_2020_12_SCHEMA = 'https://json-schema.org/draft/2020-12/schema';
+const DRAFT_2020_12_SCHEMA = "https://json-schema.org/draft/2020-12/schema";
 
 /**
  * Returns the appropriate validator based on schema's $schema field.
  */
 function getValidator(schema: AnySchema): Ajv {
   if (
-    typeof schema === 'object' &&
+    typeof schema === "object" &&
     schema !== null &&
-    '$schema' in schema &&
+    "$schema" in schema &&
     schema.$schema === DRAFT_2020_12_SCHEMA
   ) {
     return ajv2020;
@@ -72,8 +72,8 @@ export class SchemaValidator {
     if (!schema) {
       return null;
     }
-    if (typeof data !== 'object' || data === null) {
-      return 'Value of params must be an object';
+    if (typeof data !== "object" || data === null) {
+      return "Value of params must be an object";
     }
 
     const anySchema = schema as AnySchema;
@@ -91,9 +91,9 @@ export class SchemaValidator {
       // Skip validation rather than blocking tool usage.
       debugLogger.warn(
         `Failed to compile schema (${
-          (schema as Record<string, unknown>)?.['$schema'] ?? '<no $schema>'
+          (schema as Record<string, unknown>)?.["$schema"] ?? "<no $schema>"
         }): ${error instanceof Error ? error.message : String(error)}. ` +
-          'Skipping parameter validation.',
+          "Skipping parameter validation.",
       );
       return null;
     }
@@ -112,7 +112,7 @@ export class SchemaValidator {
 
       valid = validate(data);
       if (!valid && validate.errors) {
-        return validator.errorsText(validate.errors, { dataVar: 'params' });
+        return validator.errorsText(validate.errors, { dataVar: "params" });
       }
     }
     return null;
@@ -132,27 +132,25 @@ export class SchemaValidator {
  * Returns the set of JSON Schema types that a property accepts,
  * considering `type`, `anyOf`, and `oneOf` keywords.
  */
-function getAcceptedTypes(
-  propSchema: Record<string, unknown>,
-): Set<string> | null {
+function getAcceptedTypes(propSchema: Record<string, unknown>): Set<string> | null {
   const types = new Set<string>();
 
-  if (typeof propSchema['type'] === 'string') {
-    types.add(propSchema['type'] as string);
-  } else if (Array.isArray(propSchema['type'])) {
-    for (const t of propSchema['type'] as string[]) {
+  if (typeof propSchema["type"] === "string") {
+    types.add(propSchema["type"] as string);
+  } else if (Array.isArray(propSchema["type"])) {
+    for (const t of propSchema["type"] as string[]) {
       types.add(t);
     }
   }
 
-  for (const keyword of ['anyOf', 'oneOf']) {
+  for (const keyword of ["anyOf", "oneOf"]) {
     const variants = propSchema[keyword];
     if (Array.isArray(variants)) {
       for (const variant of variants as Array<Record<string, unknown>>) {
-        if (typeof variant['type'] === 'string') {
-          types.add(variant['type'] as string);
-        } else if (Array.isArray(variant['type'])) {
-          for (const t of variant['type'] as string[]) {
+        if (typeof variant["type"] === "string") {
+          types.add(variant["type"] as string);
+        } else if (Array.isArray(variant["type"])) {
+          for (const t of variant["type"] as string[]) {
             types.add(t);
           }
         }
@@ -175,35 +173,30 @@ function getAcceptedTypes(
  * 2. The schema accepts array or object but not string
  * 3. The parsed result matches one of the accepted types
  */
-function fixStringifiedJsonValues(
-  data: Record<string, unknown>,
-  schema: Record<string, unknown>,
-) {
-  const properties = schema['properties'] as
-    | Record<string, Record<string, unknown>>
-    | undefined;
+function fixStringifiedJsonValues(data: Record<string, unknown>, schema: Record<string, unknown>) {
+  const properties = schema["properties"] as Record<string, Record<string, unknown>> | undefined;
   if (!properties) return;
 
   for (const key of Object.keys(data)) {
     const value = data[key];
     const propSchema = properties[key];
-    if (!propSchema || typeof value !== 'string') continue;
+    if (!propSchema || typeof value !== "string") continue;
 
     const trimmed = value.trim();
     if (
-      (trimmed.startsWith('[') && trimmed.endsWith(']')) ||
-      (trimmed.startsWith('{') && trimmed.endsWith('}'))
+      (trimmed.startsWith("[") && trimmed.endsWith("]")) ||
+      (trimmed.startsWith("{") && trimmed.endsWith("}"))
     ) {
       const accepted = getAcceptedTypes(propSchema);
       if (!accepted) continue;
       // Only coerce if the schema does NOT accept string — otherwise the
       // string value may be intentional.
-      if (accepted.has('string')) continue;
-      if (!accepted.has('array') && !accepted.has('object')) continue;
+      if (accepted.has("string")) continue;
+      if (!accepted.has("array") && !accepted.has("object")) continue;
 
       try {
         const parsed = JSON.parse(trimmed);
-        const parsedType = Array.isArray(parsed) ? 'array' : typeof parsed;
+        const parsedType = Array.isArray(parsed) ? "array" : typeof parsed;
         if (accepted.has(parsedType)) {
           data[key] = parsed;
         }
@@ -219,13 +212,13 @@ function fixBooleanValues(data: Record<string, unknown>) {
     if (!(key in data)) continue;
     const value = data[key];
 
-    if (typeof value === 'object' && value !== null) {
+    if (typeof value === "object" && value !== null) {
       fixBooleanValues(value as Record<string, unknown>);
-    } else if (typeof value === 'string') {
+    } else if (typeof value === "string") {
       const lower = value.toLowerCase();
-      if (lower === 'true') {
+      if (lower === "true") {
         data[key] = true;
-      } else if (lower === 'false') {
+      } else if (lower === "false") {
         data[key] = false;
       }
     }
diff --git a/packages/airiscode-core/src/utils/secure-browser-launcher.ts b/packages/airiscode-core/src/utils/secure-browser-launcher.ts
index c60a646d1..fb15f0869 100644
--- a/packages/airiscode-core/src/utils/secure-browser-launcher.ts
+++ b/packages/airiscode-core/src/utils/secure-browser-launcher.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { platform } from 'node:os';
-import { URL } from 'node:url';
+import { execFile } from "node:child_process";
+import { platform } from "node:os";
+import { URL } from "node:url";
+import { promisify } from "node:util";
 
 const execFileAsync = promisify(execFile);
 
@@ -28,16 +28,14 @@ function validateUrl(url: string): void {
   }
 
   // Only allow HTTP and HTTPS protocols
-  if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
-    throw new Error(
-      `Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`,
-    );
+  if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+    throw new Error(`Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`);
   }
 
   // Additional validation: ensure no newlines or control characters
   // eslint-disable-next-line no-control-regex
   if (/[\r\n\x00-\x1f]/.test(url)) {
-    throw new Error('URL contains invalid characters');
+    throw new Error("URL contains invalid characters");
   }
 }
 
@@ -60,32 +58,32 @@ export async function openBrowserSecurely(url: string): Promise<void> {
   let args: string[];
 
   switch (platformName) {
-    case 'darwin':
+    case "darwin":
       // macOS
-      command = 'open';
+      command = "open";
       args = [url];
       break;
 
-    case 'win32':
+    case "win32":
       // Windows - use PowerShell with Start-Process
       // This avoids the cmd.exe shell which is vulnerable to injection
-      command = 'powershell.exe';
+      command = "powershell.exe";
       args = [
-        '-NoProfile',
-        '-NonInteractive',
-        '-WindowStyle',
-        'Hidden',
-        '-Command',
+        "-NoProfile",
+        "-NonInteractive",
+        "-WindowStyle",
+        "Hidden",
+        "-Command",
         `Start-Process '${url.replace(/'/g, "''")}'`,
       ];
       break;
 
-    case 'linux':
-    case 'freebsd':
-    case 'openbsd':
+    case "linux":
+    case "freebsd":
+    case "openbsd":
       // Linux and BSD variants
       // Try xdg-open first, fall back to other options
-      command = 'xdg-open';
+      command = "xdg-open";
       args = [url];
       break;
 
@@ -102,7 +100,7 @@ export async function openBrowserSecurely(url: string): Promise<void> {
     },
     // Detach the browser process so it doesn't block
     detached: true,
-    stdio: 'ignore',
+    stdio: "ignore",
   };
 
   try {
@@ -110,18 +108,10 @@ export async function openBrowserSecurely(url: string): Promise<void> {
   } catch (error) {
     // For Linux, try fallback commands if xdg-open fails
     if (
-      (platformName === 'linux' ||
-        platformName === 'freebsd' ||
-        platformName === 'openbsd') &&
-      command === 'xdg-open'
+      (platformName === "linux" || platformName === "freebsd" || platformName === "openbsd") &&
+      command === "xdg-open"
     ) {
-      const fallbackCommands = [
-        'gnome-open',
-        'kde-open',
-        'firefox',
-        'chromium',
-        'google-chrome',
-      ];
+      const fallbackCommands = ["gnome-open", "kde-open", "firefox", "chromium", "google-chrome"];
 
       for (const fallbackCommand of fallbackCommands) {
         try {
@@ -136,7 +126,7 @@ export async function openBrowserSecurely(url: string): Promise<void> {
 
     // Re-throw the error if all attempts failed
     throw new Error(
-      `Failed to open browser: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      `Failed to open browser: ${error instanceof Error ? error.message : "Unknown error"}`,
     );
   }
 }
@@ -150,29 +140,26 @@ export async function openBrowserSecurely(url: string): Promise<void> {
 export function shouldLaunchBrowser(): boolean {
   // A list of browser names that indicate we should not attempt to open a
   // web browser for the user.
-  const browserBlocklist = ['www-browser'];
-  const browserEnv = process.env['BROWSER'];
+  const browserBlocklist = ["www-browser"];
+  const browserEnv = process.env["BROWSER"];
   if (browserEnv && browserBlocklist.includes(browserEnv)) {
     return false;
   }
 
   // Common environment variables used in CI/CD or other non-interactive shells.
-  if (
-    process.env['CI'] ||
-    process.env['DEBIAN_FRONTEND'] === 'noninteractive'
-  ) {
+  if (process.env["CI"] || process.env["DEBIAN_FRONTEND"] === "noninteractive") {
     return false;
   }
 
   // The presence of SSH_CONNECTION indicates a remote session.
   // We should not attempt to launch a browser unless a display is explicitly available
   // (checked below for Linux).
-  const isSSH = !!process.env['SSH_CONNECTION'];
+  const isSSH = !!process.env["SSH_CONNECTION"];
 
   // On Linux, the presence of a display server is a strong indicator of a GUI.
-  if (platform() === 'linux') {
+  if (platform() === "linux") {
     // These are environment variables that can indicate a running compositor on Linux.
-    const displayVariables = ['DISPLAY', 'WAYLAND_DISPLAY', 'MIR_SOCKET'];
+    const displayVariables = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"];
     const hasDisplay = displayVariables.some((v) => !!process.env[v]);
     if (!hasDisplay) {
       return false;
@@ -181,7 +168,7 @@ export function shouldLaunchBrowser(): boolean {
 
   // If in an SSH session on a non-Linux OS (e.g., macOS), don't launch browser.
   // The Linux case is handled above (it's allowed if DISPLAY is set).
-  if (isSSH && platform() !== 'linux') {
+  if (isSSH && platform() !== "linux") {
     return false;
   }
 
diff --git a/packages/airiscode-core/src/utils/shell-utils.ts b/packages/airiscode-core/src/utils/shell-utils.ts
index ac4a2d0d5..9918e0be1 100644
--- a/packages/airiscode-core/src/utils/shell-utils.ts
+++ b/packages/airiscode-core/src/utils/shell-utils.ts
@@ -4,26 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AnyToolInvocation } from '../index.js';
-import type { Config } from '../config/config.js';
-import os from 'node:os';
-import path from 'node:path';
-import { parse, quote } from 'shell-quote';
-import { doesToolInvocationMatch } from './tool-utils.js';
-import { isShellCommandReadOnly } from './shellReadOnlyChecker.js';
-import {
-  execFile,
-  execFileSync,
-  type ExecFileOptions,
-} from 'node:child_process';
-import { accessSync, constants as fsConstants } from 'node:fs';
-
-const SHELL_TOOL_NAMES = ['run_shell_command', 'ShellTool'];
+import { type ExecFileOptions, execFile, execFileSync } from "node:child_process";
+import { accessSync, constants as fsConstants } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { parse, quote } from "shell-quote";
+import type { Config } from "../config/config.js";
+import type { AnyToolInvocation } from "../index.js";
+import { isShellCommandReadOnly } from "./shellReadOnlyChecker.js";
+import { doesToolInvocationMatch } from "./tool-utils.js";
+
+const SHELL_TOOL_NAMES = ["run_shell_command", "ShellTool"];
 
 /**
  * An identifier for the shell type.
  */
-export type ShellType = 'cmd' | 'powershell' | 'bash';
+export type ShellType = "cmd" | "powershell" | "bash";
 
 /**
  * Defines the configuration required to execute a command string within a specific shell.
@@ -54,11 +50,11 @@ function findGitBashPath(): string {
   }
 
   // Search in PATH directories
-  const pathEnv = process.env['PATH'] || '';
+  const pathEnv = process.env["PATH"] || "";
   const pathDirs = pathEnv.split(path.delimiter).filter(Boolean);
 
   for (const dir of pathDirs) {
-    const bashPath = path.join(dir, 'bash.exe');
+    const bashPath = path.join(dir, "bash.exe");
     try {
       accessSync(bashPath, fsConstants.X_OK);
       cachedBashPath = bashPath;
@@ -70,22 +66,21 @@ function findGitBashPath(): string {
 
   // Check common Git Bash installation locations
   const commonPaths = [
-    path.join('C:', 'Program Files', 'Git', 'bin', 'bash.exe'),
-    path.join('C:', 'Program Files', 'Git', 'usr', 'bin', 'bash.exe'),
-    path.join('C:', 'Program Files (x86)', 'Git', 'bin', 'bash.exe'),
-    path.join('C:', 'Program Files (x86)', 'Git', 'usr', 'bin', 'bash.exe'),
+    path.join("C:", "Program Files", "Git", "bin", "bash.exe"),
+    path.join("C:", "Program Files", "Git", "usr", "bin", "bash.exe"),
+    path.join("C:", "Program Files (x86)", "Git", "bin", "bash.exe"),
+    path.join("C:", "Program Files (x86)", "Git", "usr", "bin", "bash.exe"),
     path.join(
-      process.env['ProgramFiles'] || path.join('C:', 'Program Files'),
-      'Git',
-      'bin',
-      'bash.exe',
+      process.env["ProgramFiles"] || path.join("C:", "Program Files"),
+      "Git",
+      "bin",
+      "bash.exe",
     ),
     path.join(
-      process.env['ProgramFiles(x86)'] ||
-        path.join('C:', 'Program Files (x86)'),
-      'Git',
-      'bin',
-      'bash.exe',
+      process.env["ProgramFiles(x86)"] || path.join("C:", "Program Files (x86)"),
+      "Git",
+      "bin",
+      "bash.exe",
     ),
   ];
 
@@ -100,8 +95,8 @@ function findGitBashPath(): string {
   }
 
   // Fallback to 'bash' and let the system handle it
-  cachedBashPath = 'bash';
-  return 'bash';
+  cachedBashPath = "bash";
+  return "bash";
 }
 
 /**
@@ -116,36 +111,33 @@ export function getShellConfiguration(): ShellConfiguration {
   if (isWindows()) {
     // Detect Git Bash / MSYS2 / MinTTY environments
     // These environments should use bash instead of cmd/PowerShell
-    const msystem = process.env['MSYSTEM'];
-    const term = process.env['TERM'] || '';
+    const msystem = process.env["MSYSTEM"];
+    const term = process.env["TERM"] || "";
     const isGitBash =
-      msystem?.startsWith('MINGW') ||
-      msystem?.startsWith('MSYS') ||
-      term.includes('msys') ||
-      term.includes('cygwin');
+      msystem?.startsWith("MINGW") ||
+      msystem?.startsWith("MSYS") ||
+      term.includes("msys") ||
+      term.includes("cygwin");
 
     if (isGitBash) {
       return {
         executable: findGitBashPath(),
-        argsPrefix: ['-c'],
-        shell: 'bash',
+        argsPrefix: ["-c"],
+        shell: "bash",
       };
     }
 
-    const comSpec = process.env['ComSpec'] || 'cmd.exe';
+    const comSpec = process.env["ComSpec"] || "cmd.exe";
     const executable = comSpec.toLowerCase();
 
-    if (
-      executable.endsWith('powershell.exe') ||
-      executable.endsWith('pwsh.exe')
-    ) {
+    if (executable.endsWith("powershell.exe") || executable.endsWith("pwsh.exe")) {
       // For PowerShell, the arguments are different.
       // -NoProfile: Speeds up startup.
       // -Command: Executes the following command.
       return {
         executable: comSpec,
-        argsPrefix: ['-NoProfile', '-Command'],
-        shell: 'powershell',
+        argsPrefix: ["-NoProfile", "-Command"],
+        shell: "powershell",
       };
     }
 
@@ -156,19 +148,19 @@ export function getShellConfiguration(): ShellConfiguration {
     // /c: Carries out the command specified by the string and then terminates.
     return {
       executable: comSpec,
-      argsPrefix: ['/d', '/s', '/c'],
-      shell: 'cmd',
+      argsPrefix: ["/d", "/s", "/c"],
+      shell: "cmd",
     };
   }
 
   // Unix-like systems (Linux, macOS)
-  return { executable: 'bash', argsPrefix: ['-c'], shell: 'bash' };
+  return { executable: "bash", argsPrefix: ["-c"], shell: "bash" };
 }
 
 /**
  * Export the platform detection constant for use in process management (e.g., killing processes).
  */
-export const isWindows = () => os.platform() === 'win32';
+export const isWindows = () => os.platform() === "win32";
 
 /**
  * Escapes a string so that it can be safely used as a single argument
@@ -180,17 +172,17 @@ export const isWindows = () => os.platform() === 'win32';
  */
 export function escapeShellArg(arg: string, shell: ShellType): string {
   if (!arg) {
-    return '';
+    return "";
   }
 
   switch (shell) {
-    case 'powershell':
+    case "powershell":
       // For PowerShell, wrap in single quotes and escape internal single quotes by doubling them.
       return `'${arg.replace(/'/g, "''")}'`;
-    case 'cmd':
+    case "cmd":
       // Simple Windows escaping for cmd.exe: wrap in double quotes and escape inner double quotes.
       return `"${arg.replace(/"/g, '""')}"`;
-    case 'bash':
+    case "bash":
     default:
       // POSIX shell escaping using shell-quote.
       return quote([arg]);
@@ -205,7 +197,7 @@ export function escapeShellArg(arg: string, shell: ShellType): string {
  */
 export function splitCommands(command: string): string[] {
   const commands: string[] = [];
-  let currentCommand = '';
+  let currentCommand = "";
   let inSingleQuotes = false;
   let inDoubleQuotes = false;
   let i = 0;
@@ -224,7 +216,7 @@ export function splitCommands(command: string): string[] {
     const char = command[i];
     const nextChar = command[i + 1];
 
-    if (char === '\\' && i < command.length - 1) {
+    if (char === "\\" && i < command.length - 1) {
       currentCommand += char + command[i + 1];
       i += 2;
       continue;
@@ -238,40 +230,40 @@ export function splitCommands(command: string): string[] {
 
     if (!inSingleQuotes && !inDoubleQuotes) {
       if (
-        (char === '&' && nextChar === '&') ||
-        (char === '|' && (nextChar === '|' || nextChar === '&'))
+        (char === "&" && nextChar === "&") ||
+        (char === "|" && (nextChar === "|" || nextChar === "&"))
       ) {
         commands.push(currentCommand.trim());
-        currentCommand = '';
+        currentCommand = "";
         i++; // Skip the next character
-      } else if (char === ';') {
+      } else if (char === ";") {
         commands.push(currentCommand.trim());
-        currentCommand = '';
-      } else if (char === '&') {
+        currentCommand = "";
+      } else if (char === "&") {
         const prevChar = previousNonWhitespaceChar(i);
-        if (prevChar === '>' || prevChar === '<') {
+        if (prevChar === ">" || prevChar === "<") {
           currentCommand += char;
         } else {
           commands.push(currentCommand.trim());
-          currentCommand = '';
+          currentCommand = "";
         }
-      } else if (char === '|') {
+      } else if (char === "|") {
         const prevChar = previousNonWhitespaceChar(i);
-        if (prevChar === '>') {
+        if (prevChar === ">") {
           currentCommand += char;
         } else {
           commands.push(currentCommand.trim());
-          currentCommand = '';
+          currentCommand = "";
         }
-      } else if (char === '\r' && nextChar === '\n') {
+      } else if (char === "\r" && nextChar === "\n") {
         // Windows-style \r\n newline - treat as command separator
         commands.push(currentCommand.trim());
-        currentCommand = '';
+        currentCommand = "";
         i++; // Skip the \n
-      } else if (char === '\n') {
+      } else if (char === "\n") {
         // Unix-style \n newline - treat as command separator
         commands.push(currentCommand.trim());
-        currentCommand = '';
+        currentCommand = "";
       } else {
         currentCommand += char;
       }
@@ -301,7 +293,7 @@ export function getCommandRoot(command: string): string | undefined {
 
   try {
     const tokens = parse(trimmedCommand).filter(
-      (token): token is string => typeof token === 'string',
+      (token): token is string => typeof token === "string",
     );
 
     let idx = 0;
@@ -371,48 +363,48 @@ export function detectCommandSubstitution(command: string): boolean {
   };
 
   const isCommentStart = (index: number): boolean => {
-    if (command[index] !== '#') return false;
+    if (command[index] !== "#") return false;
     if (index === 0) return true;
 
     const prev = command[index - 1]!;
-    if (prev === ' ' || prev === '\t' || prev === '\n' || prev === '\r') {
+    if (prev === " " || prev === "\t" || prev === "\n" || prev === "\r") {
       return true;
     }
 
     // `#` starts a comment when it begins a word. In practice this includes
     // common command separators/operators where a new word can begin.
-    return [';', '&', '|', '(', ')', '<', '>'].includes(prev);
+    return [";", "&", "|", "(", ")", "<", ">"].includes(prev);
   };
 
   const isWordBoundary = (char: string): boolean => {
-    if (char === ' ' || char === '\t' || char === '\n' || char === '\r') {
+    if (char === " " || char === "\t" || char === "\n" || char === "\r") {
       return true;
     }
     // Shell metacharacters that would terminate a WORD token in this context.
     // This helps correctly parse heredoc delimiters in cases like `<<EOF;`.
-    return [';', '&', '|', '<', '>', '(', ')'].includes(char);
+    return [";", "&", "|", "<", ">", "(", ")"].includes(char);
   };
 
   const parseHeredocOperator = (
     startIndex: number,
   ): { nextIndex: number; heredoc: PendingHeredoc } | null => {
     // startIndex points at the first '<' of the `<<` operator.
-    if (command[startIndex] !== '<' || command[startIndex + 1] !== '<') {
+    if (command[startIndex] !== "<" || command[startIndex + 1] !== "<") {
       return null;
     }
 
     let i = startIndex + 2;
-    const stripLeadingTabs = command[i] === '-';
+    const stripLeadingTabs = command[i] === "-";
     if (stripLeadingTabs) i++;
 
     // Skip whitespace between operator and delimiter word.
-    while (i < command.length && (command[i] === ' ' || command[i] === '\t')) {
+    while (i < command.length && (command[i] === " " || command[i] === "\t")) {
       i++;
     }
 
     // Parse the delimiter WORD token. If any quoting is used in the delimiter,
     // bash disables expansions in the heredoc body.
-    let delimiter = '';
+    let delimiter = "";
     let isQuotedDelimiter = false;
     let inSingleQuotes = false;
     let inDoubleQuotes = false;
@@ -436,7 +428,7 @@ export function detectCommandSubstitution(command: string): boolean {
           i++;
           continue;
         }
-        if (char === '\\') {
+        if (char === "\\") {
           isQuotedDelimiter = true;
           i++;
           if (i >= command.length) break;
@@ -466,7 +458,7 @@ export function detectCommandSubstitution(command: string): boolean {
         i++;
         continue;
       }
-      if (char === '\\') {
+      if (char === "\\") {
         // Backslash quoting is supported in double-quoted words. For our
         // purposes, treat it as quoting and include the escaped char as-is.
         isQuotedDelimiter = true;
@@ -502,16 +494,16 @@ export function detectCommandSubstitution(command: string): boolean {
       const nextChar = line[i + 1];
 
       // In unquoted heredocs, backslash can be used to escape `$` and backticks.
-      if (char === '\\') {
+      if (char === "\\") {
         i++; // Skip the escaped char (if any)
         continue;
       }
 
-      if (char === '$' && nextChar === '(') {
+      if (char === "$" && nextChar === "(") {
         return true;
       }
 
-      if (char === '`') {
+      if (char === "`") {
         return true;
       }
     }
@@ -532,33 +524,20 @@ export function detectCommandSubstitution(command: string): boolean {
 
       while (i <= command.length) {
         const lineStart = i;
-        while (
-          i < command.length &&
-          command[i] !== '\n' &&
-          command[i] !== '\r'
-        ) {
+        while (i < command.length && command[i] !== "\n" && command[i] !== "\r") {
           i++;
         }
         const lineEnd = i;
 
         let newlineLength = 0;
-        if (
-          i < command.length &&
-          command[i] === '\r' &&
-          command[i + 1] === '\n'
-        ) {
+        if (i < command.length && command[i] === "\r" && command[i + 1] === "\n") {
           newlineLength = 2;
-        } else if (
-          i < command.length &&
-          (command[i] === '\n' || command[i] === '\r')
-        ) {
+        } else if (i < command.length && (command[i] === "\n" || command[i] === "\r")) {
           newlineLength = 1;
         }
 
         const rawLine = command.slice(lineStart, lineEnd);
-        const effectiveLine = heredoc.stripLeadingTabs
-          ? rawLine.replace(/^\t+/, '')
-          : rawLine;
+        const effectiveLine = heredoc.stripLeadingTabs ? rawLine.replace(/^\t+/, "") : rawLine;
 
         if (effectiveLine === heredoc.delimiter) {
           i = lineEnd + newlineLength;
@@ -566,7 +545,7 @@ export function detectCommandSubstitution(command: string): boolean {
         }
 
         if (!heredoc.isQuotedDelimiter) {
-          if (pendingDollarLineContinuation && effectiveLine.startsWith('(')) {
+          if (pendingDollarLineContinuation && effectiveLine.startsWith("(")) {
             return { nextIndex: i, hasSubstitution: true };
           }
 
@@ -578,15 +557,11 @@ export function detectCommandSubstitution(command: string): boolean {
           if (
             newlineLength > 0 &&
             rawLine.length >= 2 &&
-            rawLine.endsWith('\\') &&
-            rawLine[rawLine.length - 2] === '$'
+            rawLine.endsWith("\\") &&
+            rawLine[rawLine.length - 2] === "$"
           ) {
             let backslashCount = 0;
-            for (
-              let j = rawLine.length - 3;
-              j >= 0 && rawLine[j] === '\\';
-              j--
-            ) {
+            for (let j = rawLine.length - 3; j >= 0 && rawLine[j] === "\\"; j--) {
               backslashCount++;
             }
             const isEscapedDollar = backslashCount % 2 === 1;
@@ -620,7 +595,7 @@ export function detectCommandSubstitution(command: string): boolean {
     // after the command line ends (a newline). Once we hit that newline,
     // consume heredoc bodies sequentially before continuing.
     if (!inSingleQuotes && !inDoubleQuotes && !inBackticks) {
-      if (char === '\r' && nextChar === '\n') {
+      if (char === "\r" && nextChar === "\n") {
         inComment = false;
         if (pendingHeredocs.length > 0) {
           const result = consumeHeredocBodies(i + 2, pendingHeredocs);
@@ -629,7 +604,7 @@ export function detectCommandSubstitution(command: string): boolean {
           i = result.nextIndex;
           continue;
         }
-      } else if (char === '\n' || char === '\r') {
+      } else if (char === "\n" || char === "\r") {
         inComment = false;
         if (pendingHeredocs.length > 0) {
           const result = consumeHeredocBodies(i + 1, pendingHeredocs);
@@ -655,7 +630,7 @@ export function detectCommandSubstitution(command: string): boolean {
     }
 
     // Handle escaping - only works outside single quotes
-    if (char === '\\' && !inSingleQuotes) {
+    if (char === "\\" && !inSingleQuotes) {
       i += 2; // Skip the escaped character
       continue;
     }
@@ -665,19 +640,13 @@ export function detectCommandSubstitution(command: string): boolean {
       inSingleQuotes = !inSingleQuotes;
     } else if (char === '"' && !inSingleQuotes && !inBackticks) {
       inDoubleQuotes = !inDoubleQuotes;
-    } else if (char === '`' && !inSingleQuotes) {
+    } else if (char === "`" && !inSingleQuotes) {
       // Backticks work outside single quotes (including in double quotes)
       inBackticks = !inBackticks;
     }
 
     // Detect heredoc operators (`<<` / `<<-`) only in command-line context.
-    if (
-      !inSingleQuotes &&
-      !inDoubleQuotes &&
-      !inBackticks &&
-      char === '<' &&
-      nextChar === '<'
-    ) {
+    if (!inSingleQuotes && !inDoubleQuotes && !inBackticks && char === "<" && nextChar === "<") {
       const parsed = parseHeredocOperator(i);
       if (parsed) {
         pendingHeredocs.push(parsed.heredoc);
@@ -690,23 +659,23 @@ export function detectCommandSubstitution(command: string): boolean {
     // Note: heredoc body content is handled separately via consumeHeredocBodies.
     if (!inSingleQuotes) {
       // $(...) command substitution - works in double quotes and unquoted
-      if (char === '$' && nextChar === '(') {
+      if (char === "$" && nextChar === "(") {
         return true;
       }
 
       // <(...) process substitution - works unquoted only (not in double quotes)
-      if (char === '<' && nextChar === '(' && !inDoubleQuotes && !inBackticks) {
+      if (char === "<" && nextChar === "(" && !inDoubleQuotes && !inBackticks) {
         return true;
       }
 
       // >(...) process substitution - works unquoted only (not in double quotes)
-      if (char === '>' && nextChar === '(' && !inDoubleQuotes && !inBackticks) {
+      if (char === ">" && nextChar === "(" && !inDoubleQuotes && !inBackticks) {
         return true;
       }
 
       // Backtick command substitution.
       // We treat any unescaped backtick outside single quotes as substitution.
-      if (char === '`') {
+      if (char === "`") {
         return true;
       }
     }
@@ -756,15 +725,15 @@ export async function checkCommandPermissions(
       allAllowed: false,
       disallowedCommands: [command],
       blockReason:
-        'Command substitution using $(), `` ` ``, <(), or >() is not allowed for security reasons',
+        "Command substitution using $(), `` ` ``, <(), or >() is not allowed for security reasons",
       isHardDenial: true,
     };
   }
 
-  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, ' ');
+  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, " ");
   const commandsToValidate = splitCommands(command).map(normalize);
   const invocation: AnyToolInvocation & { params: { command: string } } = {
-    params: { command: '' },
+    params: { command: "" },
   } as AnyToolInvocation & { params: { command: string } };
 
   const pm = config.getPermissionManager?.();
@@ -776,20 +745,18 @@ export async function checkCommandPermissions(
     for (const cmd of commandsToValidate) {
       // 1. Session allowlist always wins (checked first regardless of PM rules)
       if (sessionAllowlist) {
-        invocation.params['command'] = cmd;
+        invocation.params["command"] = cmd;
         const isSessionAllowed = doesToolInvocationMatch(
-          'run_shell_command',
+          "run_shell_command",
           invocation,
-          [...sessionAllowlist].flatMap((c) =>
-            SHELL_TOOL_NAMES.map((name) => `${name}(${c})`),
-          ),
+          [...sessionAllowlist].flatMap((c) => SHELL_TOOL_NAMES.map((name) => `${name}(${c})`)),
         );
         if (isSessionAllowed) continue;
       }
 
       const decision = await pm.isCommandAllowed(cmd);
 
-      if (decision === 'deny') {
+      if (decision === "deny") {
         return {
           allAllowed: false,
           disallowedCommands: [cmd],
@@ -798,10 +765,10 @@ export async function checkCommandPermissions(
         };
       }
 
-      if (decision === 'allow') continue;
+      if (decision === "allow") continue;
 
       // 'ask' → always requires confirmation
-      if (decision === 'ask') {
+      if (decision === "ask") {
         disallowedCommands.push(cmd);
         continue;
       }
@@ -818,7 +785,7 @@ export async function checkCommandPermissions(
       return {
         allAllowed: false,
         disallowedCommands,
-        blockReason: `Command(s) require confirmation. Disallowed commands: ${disallowedCommands.map((c) => JSON.stringify(c)).join(', ')}`,
+        blockReason: `Command(s) require confirmation. Disallowed commands: ${disallowedCommands.map((c) => JSON.stringify(c)).join(", ")}`,
         isHardDenial: false,
       };
     }
@@ -832,24 +799,20 @@ export async function checkCommandPermissions(
 
   // 1. Blocklist Check (Highest Priority)
   const excludeTools = config.getPermissionsDeny() || [];
-  const isWildcardBlocked = SHELL_TOOL_NAMES.some((name) =>
-    excludeTools.includes(name),
-  );
+  const isWildcardBlocked = SHELL_TOOL_NAMES.some((name) => excludeTools.includes(name));
 
   if (isWildcardBlocked) {
     return {
       allAllowed: false,
       disallowedCommands: commandsToValidate,
-      blockReason: 'Shell tool is globally disabled in configuration',
+      blockReason: "Shell tool is globally disabled in configuration",
       isHardDenial: true,
     };
   }
 
   for (const cmd of commandsToValidate) {
-    invocation.params['command'] = cmd;
-    if (
-      doesToolInvocationMatch('run_shell_command', invocation, excludeTools)
-    ) {
+    invocation.params["command"] = cmd;
+    if (doesToolInvocationMatch("run_shell_command", invocation, excludeTools)) {
       return {
         allAllowed: false,
         disallowedCommands: [cmd],
@@ -860,9 +823,7 @@ export async function checkCommandPermissions(
   }
 
   const coreTools = config.getCoreTools() || [];
-  const isWildcardAllowed = SHELL_TOOL_NAMES.some((name) =>
-    coreTools.includes(name),
-  );
+  const isWildcardAllowed = SHELL_TOOL_NAMES.some((name) => coreTools.includes(name));
 
   // If there's a global wildcard, all commands are allowed at this point
   // because they have already passed the blocklist check.
@@ -876,25 +837,17 @@ export async function checkCommandPermissions(
     // "DEFAULT DENY" MODE: A session allowlist is provided.
     // All commands must be in either the session or global allowlist.
     const normalizedSessionAllowlist = new Set(
-      [...sessionAllowlist].flatMap((cmd) =>
-        SHELL_TOOL_NAMES.map((name) => `${name}(${cmd})`),
-      ),
+      [...sessionAllowlist].flatMap((cmd) => SHELL_TOOL_NAMES.map((name) => `${name}(${cmd})`)),
     );
 
     for (const cmd of commandsToValidate) {
-      invocation.params['command'] = cmd;
-      const isSessionAllowed = doesToolInvocationMatch(
-        'run_shell_command',
-        invocation,
-        [...normalizedSessionAllowlist],
-      );
+      invocation.params["command"] = cmd;
+      const isSessionAllowed = doesToolInvocationMatch("run_shell_command", invocation, [
+        ...normalizedSessionAllowlist,
+      ]);
       if (isSessionAllowed) continue;
 
-      const isGloballyAllowed = doesToolInvocationMatch(
-        'run_shell_command',
-        invocation,
-        coreTools,
-      );
+      const isGloballyAllowed = doesToolInvocationMatch("run_shell_command", invocation, coreTools);
       if (isGloballyAllowed) continue;
 
       disallowedCommands.push(cmd);
@@ -906,22 +859,21 @@ export async function checkCommandPermissions(
         disallowedCommands,
         blockReason: `Command(s) not on the global or session allowlist. Disallowed commands: ${disallowedCommands
           .map((c) => JSON.stringify(c))
-          .join(', ')}`,
+          .join(", ")}`,
         isHardDenial: false, // This is a soft denial; confirmation is possible.
       };
     }
   } else {
     // "DEFAULT ALLOW" MODE: No session allowlist.
     const hasSpecificAllowedCommands =
-      coreTools.filter((tool) =>
-        SHELL_TOOL_NAMES.some((name) => tool.startsWith(`${name}(`)),
-      ).length > 0;
+      coreTools.filter((tool) => SHELL_TOOL_NAMES.some((name) => tool.startsWith(`${name}(`)))
+        .length > 0;
 
     if (hasSpecificAllowedCommands) {
       for (const cmd of commandsToValidate) {
-        invocation.params['command'] = cmd;
+        invocation.params["command"] = cmd;
         const isGloballyAllowed = doesToolInvocationMatch(
-          'run_shell_command',
+          "run_shell_command",
           invocation,
           coreTools,
         );
@@ -935,7 +887,7 @@ export async function checkCommandPermissions(
           disallowedCommands,
           blockReason: `Command(s) not in the allowed commands list. Disallowed commands: ${disallowedCommands
             .map((c) => JSON.stringify(c))
-            .join(', ')}`,
+            .join(", ")}`,
           isHardDenial: false, // This is a soft denial.
         };
       }
@@ -973,28 +925,28 @@ export function execCommand(
     const child = execFile(
       command,
       args,
-      { encoding: 'utf8', ...options },
+      { encoding: "utf8", ...options },
       (error, stdout, stderr) => {
         if (error) {
           if (!options.preserveOutputOnError) {
             reject(error);
           } else {
             resolve({
-              stdout: String(stdout ?? ''),
-              stderr: String(stderr ?? ''),
-              code: typeof error.code === 'number' ? error.code : 1,
+              stdout: String(stdout ?? ""),
+              stderr: String(stderr ?? ""),
+              code: typeof error.code === "number" ? error.code : 1,
             });
           }
           return;
         }
         resolve({
-          stdout: String(stdout ?? ''),
-          stderr: String(stderr ?? ''),
+          stdout: String(stdout ?? ""),
+          stderr: String(stderr ?? ""),
           code: 0,
         });
       },
     );
-    child.on('error', reject);
+    child.on("error", reject);
   });
 }
 
@@ -1008,16 +960,16 @@ export function resolveCommandPath(command: string): {
   error?: Error;
 } {
   try {
-    const isWin = process.platform === 'win32';
+    const isWin = process.platform === "win32";
 
     if (isWin) {
-      const checkCommand = 'where.exe';
+      const checkCommand = "where.exe";
       const checkArgs = [command];
 
       let result: string | null = null;
       try {
         result = execFileSync(checkCommand, checkArgs, {
-          encoding: 'utf8',
+          encoding: "utf8",
           shell: false,
         }).trim();
       } catch {
@@ -1026,13 +978,13 @@ export function resolveCommandPath(command: string): {
 
       return result ? { path: result } : { path: null };
     } else {
-      const shell = '/bin/sh';
-      const checkArgs = ['-c', `command -v ${escapeShellArg(command, 'bash')}`];
+      const shell = "/bin/sh";
+      const checkArgs = ["-c", `command -v ${escapeShellArg(command, "bash")}`];
 
       let result: string | null = null;
       try {
         result = execFileSync(shell, checkArgs, {
-          encoding: 'utf8',
+          encoding: "utf8",
           shell: false,
         }).trim();
       } catch {
@@ -1069,10 +1021,7 @@ export async function isCommandAllowed(
   config: Config,
 ): Promise<{ allowed: boolean; reason?: string }> {
   // By not providing a sessionAllowlist, we invoke "default allow" behavior.
-  const { allAllowed, blockReason } = await checkCommandPermissions(
-    command,
-    config,
-  );
+  const { allAllowed, blockReason } = await checkCommandPermissions(command, config);
   if (allAllowed) {
     return { allowed: true };
   }
@@ -1091,7 +1040,7 @@ export function isCommandNeedsPermission(command: string): {
 
   return {
     requiresPermission: true,
-    reason: 'Command requires permission to execute.',
+    reason: "Command requires permission to execute.",
   };
 }
 
@@ -1113,26 +1062,24 @@ export function checkArgumentSafety(args: string): {
   const dangerousPatterns: string[] = [];
 
   // Command substitution patterns
-  if (args.includes('$(')) dangerousPatterns.push('$() command substitution');
-  if (args.includes('`'))
-    dangerousPatterns.push('backtick command substitution');
-  if (args.includes('<(')) dangerousPatterns.push('<() process substitution');
-  if (args.includes('>(')) dangerousPatterns.push('>() process substitution');
+  if (args.includes("$(")) dangerousPatterns.push("$() command substitution");
+  if (args.includes("`")) dangerousPatterns.push("backtick command substitution");
+  if (args.includes("<(")) dangerousPatterns.push("<() process substitution");
+  if (args.includes(">(")) dangerousPatterns.push(">() process substitution");
 
   // Command separators (outside of quotes)
-  if (args.includes(';')) dangerousPatterns.push('; command separator');
-  if (args.includes('|')) dangerousPatterns.push('| pipe');
-  if (args.includes('&&')) dangerousPatterns.push('&& AND operator');
-  if (args.includes('||')) dangerousPatterns.push('|| OR operator');
+  if (args.includes(";")) dangerousPatterns.push("; command separator");
+  if (args.includes("|")) dangerousPatterns.push("| pipe");
+  if (args.includes("&&")) dangerousPatterns.push("&& AND operator");
+  if (args.includes("||")) dangerousPatterns.push("|| OR operator");
 
   // Background execution (space + &, with optional surrounding)
-  if (args.includes(' &') || args.includes('& '))
-    dangerousPatterns.push('& background operator');
+  if (args.includes(" &") || args.includes("& ")) dangerousPatterns.push("& background operator");
 
   // Input/Output redirection
-  if (args.includes('>') || args.includes('<')) {
-    if (/>\s|\d>/.test(args)) dangerousPatterns.push('> output redirection');
-    if (/<\s|\d</.test(args)) dangerousPatterns.push('< input redirection');
+  if (args.includes(">") || args.includes("<")) {
+    if (/>\s|\d>/.test(args)) dangerousPatterns.push("> output redirection");
+    if (/<\s|\d</.test(args)) dangerousPatterns.push("< input redirection");
   }
 
   return {
@@ -1146,7 +1093,7 @@ export function checkArgumentSafety(args: string): {
 const CONPTY_MIN_WINDOWS_BUILD = 19042;
 
 export function shouldDefaultToNodePty(): boolean {
-  if (os.platform() !== 'win32') return true;
-  const build = parseInt(os.release().split('.')[2] ?? '', 10);
+  if (os.platform() !== "win32") return true;
+  const build = parseInt(os.release().split(".")[2] ?? "", 10);
   return !isNaN(build) && build >= CONPTY_MIN_WINDOWS_BUILD;
 }
diff --git a/packages/airiscode-core/src/utils/shellAstParser.ts b/packages/airiscode-core/src/utils/shellAstParser.ts
index 4a2ca7423..c4d4c33dd 100644
--- a/packages/airiscode-core/src/utils/shellAstParser.ts
+++ b/packages/airiscode-core/src/utils/shellAstParser.ts
@@ -14,12 +14,12 @@
  *   4. `extractCommandRules()`  – extract minimum-scope wildcard permission rules
  */
 
-import Parser from 'web-tree-sitter';
-import fs from 'node:fs';
-import { createRequire } from 'node:module';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { isShellCommandReadOnly } from './shellReadOnlyChecker.js';
+import fs from "node:fs";
+import { createRequire } from "node:module";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import Parser from "web-tree-sitter";
+import { isShellCommandReadOnly } from "./shellReadOnlyChecker.js";
 
 // ---------------------------------------------------------------------------
 // Constants
@@ -40,14 +40,11 @@ async function loadWasmBinary(
   dynamicImport: () => Promise<unknown>,
   fallbackSpecifier: string,
 ): Promise<Uint8Array> {
-  const nativeFs =
-    (process.getBuiltinModule?.('fs') as
-      | typeof import('node:fs')
-      | undefined) ?? fs;
+  const nativeFs = (process.getBuiltinModule?.("fs") as typeof import("node:fs") | undefined) ?? fs;
   const moduleFilePath = fileURLToPath(import.meta.url);
   const isBundleMode =
-    !moduleFilePath.includes(path.join('src', '')) &&
-    !moduleFilePath.includes(path.join('dist', 'src', ''));
+    !moduleFilePath.includes(path.join("src", "")) &&
+    !moduleFilePath.includes(path.join("dist", "src", ""));
 
   try {
     if (isBundleMode) {
@@ -73,90 +70,78 @@ async function loadWasmBinary(
  * unless explicitly listed in COMMANDS_WITH_SUBCOMMANDS).
  */
 const READ_ONLY_ROOT_COMMANDS = new Set([
-  'awk',
-  'basename',
-  'cat',
-  'cd',
-  'column',
-  'cut',
-  'df',
-  'dirname',
-  'du',
-  'echo',
-  'env',
-  'find',
-  'git',
-  'grep',
-  'head',
-  'less',
-  'ls',
-  'more',
-  'printenv',
-  'printf',
-  'ps',
-  'pwd',
-  'rg',
-  'ripgrep',
-  'sed',
-  'sort',
-  'stat',
-  'tail',
-  'tree',
-  'uniq',
-  'wc',
-  'which',
-  'where',
-  'whoami',
+  "awk",
+  "basename",
+  "cat",
+  "cd",
+  "column",
+  "cut",
+  "df",
+  "dirname",
+  "du",
+  "echo",
+  "env",
+  "find",
+  "git",
+  "grep",
+  "head",
+  "less",
+  "ls",
+  "more",
+  "printenv",
+  "printf",
+  "ps",
+  "pwd",
+  "rg",
+  "ripgrep",
+  "sed",
+  "sort",
+  "stat",
+  "tail",
+  "tree",
+  "uniq",
+  "wc",
+  "which",
+  "where",
+  "whoami",
 ]);
 
 /** Git sub-commands considered read-only. */
 const READ_ONLY_GIT_SUBCOMMANDS = new Set([
-  'blame',
-  'branch',
-  'cat-file',
-  'diff',
-  'grep',
-  'log',
-  'ls-files',
-  'remote',
-  'rev-parse',
-  'show',
-  'status',
-  'describe',
+  "blame",
+  "branch",
+  "cat-file",
+  "diff",
+  "grep",
+  "log",
+  "ls-files",
+  "remote",
+  "rev-parse",
+  "show",
+  "status",
+  "describe",
 ]);
 
 /** git remote actions that mutate state. */
 const BLOCKED_GIT_REMOTE_ACTIONS = new Set([
-  'add',
-  'remove',
-  'rename',
-  'set-url',
-  'prune',
-  'update',
+  "add",
+  "remove",
+  "rename",
+  "set-url",
+  "prune",
+  "update",
 ]);
 
 /** git branch flags that mutate state. */
-const BLOCKED_GIT_BRANCH_FLAGS = new Set([
-  '-d',
-  '-D',
-  '--delete',
-  '--move',
-  '-m',
-]);
+const BLOCKED_GIT_BRANCH_FLAGS = new Set(["-d", "-D", "--delete", "--move", "-m"]);
 
 /** find flags that have side-effects. */
-const BLOCKED_FIND_FLAGS = new Set([
-  '-delete',
-  '-exec',
-  '-execdir',
-  '-ok',
-  '-okdir',
-]);
+const BLOCKED_FIND_FLAGS = new Set(["-delete", "-exec", "-execdir", "-ok", "-okdir"]);
 
-const BLOCKED_FIND_PREFIXES = ['-fprint', '-fprintf'];
+const BLOCKED_FIND_PREFIXES = ["-fprint", "-fprintf"];
 
 /** sed flags that cause in-place editing. */
-const BLOCKED_SED_PREFIXES = ['-i'];
+const BLOCKED_SED_PREFIXES = ["-i"];
 
 /** AWK side-effect patterns that can execute commands or write files. */
 const AWK_SIDE_EFFECT_PATTERNS = [
@@ -173,20 +158,13 @@ const AWK_SIDE_EFFECT_PATTERNS = [
 ];
 
 /** SED side-effect patterns. */
-const SED_SIDE_EFFECT_PATTERNS = [
-  /[^\\]e\s/,
-  /^e\s/,
-  /[^\\]w\s/,
-  /^w\s/,
-  /[^\\]r\s/,
-  /^r\s/,
-];
+const SED_SIDE_EFFECT_PATTERNS = [/[^\\]e\s/, /^e\s/, /[^\\]w\s/, /^w\s/, /[^\\]r\s/, /^r\s/];
 
 /**
  * Write-redirection operators in file_redirect nodes.
  * Input-only redirections (`<`, `<<`, `<<<`) are safe.
  */
-const WRITE_REDIRECT_OPERATORS = new Set(['>', '>>', '&>', '&>>', '>|']);
+const WRITE_REDIRECT_OPERATORS = new Set([">", ">>", "&>", "&>>", ">|"]);
 
 /**
  * Map of root command → known sub-command sets.
@@ -194,406 +172,406 @@ const WRITE_REDIRECT_OPERATORS = new Set(['>', '>>', '&>', '&>>', '>|']);
  */
 const KNOWN_SUBCOMMANDS: Record<string, Set<string>> = {
   git: new Set([
-    'add',
-    'am',
-    'archive',
-    'bisect',
-    'blame',
-    'branch',
-    'bundle',
-    'cat-file',
-    'checkout',
-    'cherry-pick',
-    'clean',
-    'clone',
-    'commit',
-    'config',
-    'describe',
-    'diff',
-    'fetch',
-    'format-patch',
-    'gc',
-    'grep',
-    'init',
-    'log',
-    'ls-files',
-    'ls-remote',
-    'merge',
-    'mv',
-    'notes',
-    'pull',
-    'push',
-    'range-diff',
-    'rebase',
-    'reflog',
-    'remote',
-    'reset',
-    'restore',
-    'revert',
-    'rev-parse',
-    'rm',
-    'shortlog',
-    'show',
-    'stash',
-    'status',
-    'submodule',
-    'switch',
-    'tag',
-    'worktree',
+    "add",
+    "am",
+    "archive",
+    "bisect",
+    "blame",
+    "branch",
+    "bundle",
+    "cat-file",
+    "checkout",
+    "cherry-pick",
+    "clean",
+    "clone",
+    "commit",
+    "config",
+    "describe",
+    "diff",
+    "fetch",
+    "format-patch",
+    "gc",
+    "grep",
+    "init",
+    "log",
+    "ls-files",
+    "ls-remote",
+    "merge",
+    "mv",
+    "notes",
+    "pull",
+    "push",
+    "range-diff",
+    "rebase",
+    "reflog",
+    "remote",
+    "reset",
+    "restore",
+    "revert",
+    "rev-parse",
+    "rm",
+    "shortlog",
+    "show",
+    "stash",
+    "status",
+    "submodule",
+    "switch",
+    "tag",
+    "worktree",
   ]),
   npm: new Set([
-    'access',
-    'adduser',
-    'audit',
-    'bugs',
-    'cache',
-    'ci',
-    'completion',
-    'config',
-    'create',
-    'dedupe',
-    'deprecate',
-    'diff',
-    'dist-tag',
-    'docs',
-    'doctor',
-    'edit',
-    'exec',
-    'explain',
-    'explore',
-    'find-dupes',
-    'fund',
-    'help',
-    'hook',
-    'init',
-    'install',
-    'install-ci-test',
-    'install-test',
-    'link',
-    'login',
-    'logout',
-    'ls',
-    'org',
-    'outdated',
-    'owner',
-    'pack',
-    'ping',
-    'pkg',
-    'prefix',
-    'profile',
-    'prune',
-    'publish',
-    'query',
-    'rebuild',
-    'repo',
-    'restart',
-    'root',
-    'run',
-    'run-script',
-    'search',
-    'set-script',
-    'shrinkwrap',
-    'star',
-    'stars',
-    'start',
-    'stop',
-    'team',
-    'test',
-    'token',
-    'uninstall',
-    'unpublish',
-    'unstar',
-    'update',
-    'version',
-    'view',
-    'whoami',
+    "access",
+    "adduser",
+    "audit",
+    "bugs",
+    "cache",
+    "ci",
+    "completion",
+    "config",
+    "create",
+    "dedupe",
+    "deprecate",
+    "diff",
+    "dist-tag",
+    "docs",
+    "doctor",
+    "edit",
+    "exec",
+    "explain",
+    "explore",
+    "find-dupes",
+    "fund",
+    "help",
+    "hook",
+    "init",
+    "install",
+    "install-ci-test",
+    "install-test",
+    "link",
+    "login",
+    "logout",
+    "ls",
+    "org",
+    "outdated",
+    "owner",
+    "pack",
+    "ping",
+    "pkg",
+    "prefix",
+    "profile",
+    "prune",
+    "publish",
+    "query",
+    "rebuild",
+    "repo",
+    "restart",
+    "root",
+    "run",
+    "run-script",
+    "search",
+    "set-script",
+    "shrinkwrap",
+    "star",
+    "stars",
+    "start",
+    "stop",
+    "team",
+    "test",
+    "token",
+    "uninstall",
+    "unpublish",
+    "unstar",
+    "update",
+    "version",
+    "view",
+    "whoami",
   ]),
   yarn: new Set([
-    'add',
-    'autoclean',
-    'bin',
-    'cache',
-    'check',
-    'config',
-    'create',
-    'generate-lock-entry',
-    'global',
-    'help',
-    'import',
-    'info',
-    'init',
-    'install',
-    'licenses',
-    'link',
-    'list',
-    'login',
-    'logout',
-    'outdated',
-    'owner',
-    'pack',
-    'policies',
-    'publish',
-    'remove',
-    'run',
-    'tag',
-    'team',
-    'test',
-    'unlink',
-    'unplug',
-    'upgrade',
-    'upgrade-interactive',
-    'version',
-    'versions',
-    'why',
-    'workspace',
-    'workspaces',
+    "add",
+    "autoclean",
+    "bin",
+    "cache",
+    "check",
+    "config",
+    "create",
+    "generate-lock-entry",
+    "global",
+    "help",
+    "import",
+    "info",
+    "init",
+    "install",
+    "licenses",
+    "link",
+    "list",
+    "login",
+    "logout",
+    "outdated",
+    "owner",
+    "pack",
+    "policies",
+    "publish",
+    "remove",
+    "run",
+    "tag",
+    "team",
+    "test",
+    "unlink",
+    "unplug",
+    "upgrade",
+    "upgrade-interactive",
+    "version",
+    "versions",
+    "why",
+    "workspace",
+    "workspaces",
   ]),
   pnpm: new Set([
-    'add',
-    'audit',
-    'create',
-    'dedupe',
-    'deploy',
-    'dlx',
-    'env',
-    'exec',
-    'fetch',
-    'import',
-    'init',
-    'install',
-    'install-test',
-    'licenses',
-    'link',
-    'list',
-    'ls',
-    'outdated',
-    'pack',
-    'patch',
-    'patch-commit',
-    'prune',
-    'publish',
-    'rebuild',
-    'remove',
-    'root',
-    'run',
-    'server',
-    'setup',
-    'store',
-    'test',
-    'uninstall',
-    'unlink',
-    'update',
-    'why',
+    "add",
+    "audit",
+    "create",
+    "dedupe",
+    "deploy",
+    "dlx",
+    "env",
+    "exec",
+    "fetch",
+    "import",
+    "init",
+    "install",
+    "install-test",
+    "licenses",
+    "link",
+    "list",
+    "ls",
+    "outdated",
+    "pack",
+    "patch",
+    "patch-commit",
+    "prune",
+    "publish",
+    "rebuild",
+    "remove",
+    "root",
+    "run",
+    "server",
+    "setup",
+    "store",
+    "test",
+    "uninstall",
+    "unlink",
+    "update",
+    "why",
   ]),
   docker: new Set([
-    'attach',
-    'build',
-    'commit',
-    'compose',
-    'container',
-    'context',
-    'cp',
-    'create',
-    'diff',
-    'events',
-    'exec',
-    'export',
-    'history',
-    'image',
-    'images',
-    'import',
-    'info',
-    'inspect',
-    'kill',
-    'load',
-    'login',
-    'logout',
-    'logs',
-    'manifest',
-    'network',
-    'node',
-    'pause',
-    'plugin',
-    'port',
-    'ps',
-    'pull',
-    'push',
-    'rename',
-    'restart',
-    'rm',
-    'rmi',
-    'run',
-    'save',
-    'search',
-    'secret',
-    'service',
-    'stack',
-    'start',
-    'stats',
-    'stop',
-    'swarm',
-    'system',
-    'tag',
-    'top',
-    'trust',
-    'unpause',
-    'update',
-    'version',
-    'volume',
-    'wait',
+    "attach",
+    "build",
+    "commit",
+    "compose",
+    "container",
+    "context",
+    "cp",
+    "create",
+    "diff",
+    "events",
+    "exec",
+    "export",
+    "history",
+    "image",
+    "images",
+    "import",
+    "info",
+    "inspect",
+    "kill",
+    "load",
+    "login",
+    "logout",
+    "logs",
+    "manifest",
+    "network",
+    "node",
+    "pause",
+    "plugin",
+    "port",
+    "ps",
+    "pull",
+    "push",
+    "rename",
+    "restart",
+    "rm",
+    "rmi",
+    "run",
+    "save",
+    "search",
+    "secret",
+    "service",
+    "stack",
+    "start",
+    "stats",
+    "stop",
+    "swarm",
+    "system",
+    "tag",
+    "top",
+    "trust",
+    "unpause",
+    "update",
+    "version",
+    "volume",
+    "wait",
   ]),
   pip: new Set([
-    'install',
-    'download',
-    'uninstall',
-    'freeze',
-    'inspect',
-    'list',
-    'show',
-    'check',
-    'config',
-    'search',
-    'cache',
-    'index',
-    'wheel',
-    'hash',
-    'completion',
-    'debug',
-    'help',
+    "install",
+    "download",
+    "uninstall",
+    "freeze",
+    "inspect",
+    "list",
+    "show",
+    "check",
+    "config",
+    "search",
+    "cache",
+    "index",
+    "wheel",
+    "hash",
+    "completion",
+    "debug",
+    "help",
   ]),
   pip3: new Set([
-    'install',
-    'download',
-    'uninstall',
-    'freeze',
-    'inspect',
-    'list',
-    'show',
-    'check',
-    'config',
-    'search',
-    'cache',
-    'index',
-    'wheel',
-    'hash',
-    'completion',
-    'debug',
-    'help',
+    "install",
+    "download",
+    "uninstall",
+    "freeze",
+    "inspect",
+    "list",
+    "show",
+    "check",
+    "config",
+    "search",
+    "cache",
+    "index",
+    "wheel",
+    "hash",
+    "completion",
+    "debug",
+    "help",
   ]),
   cargo: new Set([
-    'add',
-    'bench',
-    'build',
-    'check',
-    'clean',
-    'clippy',
-    'doc',
-    'fetch',
-    'fix',
-    'fmt',
-    'generate-lockfile',
-    'init',
-    'install',
-    'locate-project',
-    'login',
-    'metadata',
-    'new',
-    'owner',
-    'package',
-    'pkgid',
-    'publish',
-    'read-manifest',
-    'remove',
-    'report',
-    'run',
-    'rustc',
-    'rustdoc',
-    'search',
-    'test',
-    'tree',
-    'uninstall',
-    'update',
-    'vendor',
-    'verify-project',
-    'version',
-    'yank',
+    "add",
+    "bench",
+    "build",
+    "check",
+    "clean",
+    "clippy",
+    "doc",
+    "fetch",
+    "fix",
+    "fmt",
+    "generate-lockfile",
+    "init",
+    "install",
+    "locate-project",
+    "login",
+    "metadata",
+    "new",
+    "owner",
+    "package",
+    "pkgid",
+    "publish",
+    "read-manifest",
+    "remove",
+    "report",
+    "run",
+    "rustc",
+    "rustdoc",
+    "search",
+    "test",
+    "tree",
+    "uninstall",
+    "update",
+    "vendor",
+    "verify-project",
+    "version",
+    "yank",
   ]),
   kubectl: new Set([
-    'annotate',
-    'api-resources',
-    'api-versions',
-    'apply',
-    'attach',
-    'auth',
-    'autoscale',
-    'certificate',
-    'cluster-info',
-    'completion',
-    'config',
-    'cordon',
-    'cp',
-    'create',
-    'debug',
-    'delete',
-    'describe',
-    'diff',
-    'drain',
-    'edit',
-    'events',
-    'exec',
-    'explain',
-    'expose',
-    'get',
-    'kustomize',
-    'label',
-    'logs',
-    'patch',
-    'plugin',
-    'port-forward',
-    'proxy',
-    'replace',
-    'rollout',
-    'run',
-    'scale',
-    'set',
-    'taint',
-    'top',
-    'uncordon',
-    'version',
-    'wait',
+    "annotate",
+    "api-resources",
+    "api-versions",
+    "apply",
+    "attach",
+    "auth",
+    "autoscale",
+    "certificate",
+    "cluster-info",
+    "completion",
+    "config",
+    "cordon",
+    "cp",
+    "create",
+    "debug",
+    "delete",
+    "describe",
+    "diff",
+    "drain",
+    "edit",
+    "events",
+    "exec",
+    "explain",
+    "expose",
+    "get",
+    "kustomize",
+    "label",
+    "logs",
+    "patch",
+    "plugin",
+    "port-forward",
+    "proxy",
+    "replace",
+    "rollout",
+    "run",
+    "scale",
+    "set",
+    "taint",
+    "top",
+    "uncordon",
+    "version",
+    "wait",
   ]),
   make: new Set([]), // make targets are positional, not subcommands
 };
 
 /** Docker multi-level sub-command support (e.g., `docker compose up`). */
 const DOCKER_COMPOSE_SUBCOMMANDS = new Set([
-  'build',
-  'config',
-  'cp',
-  'create',
-  'down',
-  'events',
-  'exec',
-  'images',
-  'kill',
-  'logs',
-  'ls',
-  'pause',
-  'port',
-  'ps',
-  'pull',
-  'push',
-  'restart',
-  'rm',
-  'run',
-  'start',
-  'stop',
-  'top',
-  'unpause',
-  'up',
-  'version',
-  'wait',
-  'watch',
+  "build",
+  "config",
+  "cp",
+  "create",
+  "down",
+  "events",
+  "exec",
+  "images",
+  "kill",
+  "logs",
+  "ls",
+  "pause",
+  "port",
+  "ps",
+  "pull",
+  "push",
+  "restart",
+  "rm",
+  "run",
+  "start",
+  "stop",
+  "top",
+  "unpause",
+  "up",
+  "version",
+  "wait",
+  "watch",
 ]);
 
 // ---------------------------------------------------------------------------
@@ -614,22 +592,19 @@ export async function initParser(): Promise<void> {
   if (parserInstance) return;
   // Once init has permanently failed, skip retrying to prevent hangs.
   if (parserInitFailed)
-    throw new Error(
-      'tree-sitter WASM failed to initialise; using regex-based fallback',
-    );
+    throw new Error("tree-sitter WASM failed to initialise; using regex-based fallback");
   if (initPromise) return initPromise;
 
   initPromise = (async () => {
     const treeSitterWasm = await loadWasmBinary(
-      () => import('web-tree-sitter/tree-sitter.wasm?binary' as string),
-      'web-tree-sitter/tree-sitter.wasm',
+      () => import("web-tree-sitter/tree-sitter.wasm?binary" as string),
+      "web-tree-sitter/tree-sitter.wasm",
     );
     await Parser.init({ wasmBinary: treeSitterWasm });
     parserInstance = new Parser();
     const bashWasm = await loadWasmBinary(
-      () =>
-        import('tree-sitter-wasms/out/tree-sitter-bash.wasm?binary' as string),
-      'tree-sitter-wasms/out/tree-sitter-bash.wasm',
+      () => import("tree-sitter-wasms/out/tree-sitter-bash.wasm?binary" as string),
+      "tree-sitter-wasms/out/tree-sitter-bash.wasm",
     );
     bashLanguage = await Parser.Language.load(bashWasm);
     parserInstance.setLanguage(bashLanguage);
@@ -660,10 +635,7 @@ export async function parseShellCommand(command: string): Promise<Parser.Tree> {
 type SyntaxNode = Parser.SyntaxNode;
 
 /** Collect all descendant nodes of given types. */
-function collectDescendants(
-  node: SyntaxNode,
-  types: Set<string>,
-): SyntaxNode[] {
+function collectDescendants(node: SyntaxNode, types: Set<string>): SyntaxNode[] {
   const result: SyntaxNode[] = [];
   const stack: SyntaxNode[] = [node];
   while (stack.length > 0) {
@@ -681,23 +653,20 @@ function collectDescendants(
 /** Check if a tree contains any command_substitution or process_substitution node. */
 function containsCommandSubstitutionAST(node: SyntaxNode): boolean {
   return (
-    collectDescendants(
-      node,
-      new Set(['command_substitution', 'process_substitution']),
-    ).length > 0
+    collectDescendants(node, new Set(["command_substitution", "process_substitution"])).length > 0
   );
 }
 
 /** Check if a redirected_statement contains a write-redirection. */
 function hasWriteRedirection(node: SyntaxNode): boolean {
-  if (node.type !== 'redirected_statement') return false;
+  if (node.type !== "redirected_statement") return false;
   for (let i = 0; i < node.childCount; i++) {
     const child = node.child(i)!;
-    if (child.type === 'file_redirect') {
+    if (child.type === "file_redirect") {
       // The operator is the first non-descriptor child
       for (let j = 0; j < child.childCount; j++) {
         const op = child.child(j)!;
-        if (op.type === 'file_descriptor') continue;
+        if (op.type === "file_descriptor") continue;
         // operator token
         if (WRITE_REDIRECT_OPERATORS.has(op.type)) return true;
         break; // only check the operator position
@@ -712,7 +681,7 @@ function hasWriteRedirection(node: SyntaxNode): boolean {
  * Handles leading variable_assignment(s) gracefully.
  */
 function getCommandName(commandNode: SyntaxNode): string | null {
-  const nameNode = commandNode.childForFieldName('name');
+  const nameNode = commandNode.childForFieldName("name");
   if (!nameNode) return null;
   return nameNode.text.toLowerCase();
 }
@@ -724,7 +693,7 @@ function getArgumentNodes(commandNode: SyntaxNode): SyntaxNode[] {
   const args: SyntaxNode[] = [];
   for (let i = 0; i < commandNode.childCount; i++) {
     const fieldName = commandNode.fieldNameForChild(i);
-    if (fieldName === 'argument') {
+    if (fieldName === "argument") {
       args.push(commandNode.child(i)!);
     }
   }
@@ -764,10 +733,10 @@ function evaluateCommandReadOnly(commandNode: SyntaxNode): boolean {
   if (!READ_ONLY_ROOT_COMMANDS.has(root)) return false;
 
   // Command-specific analysis
-  if (root === 'git') return evaluateGitReadOnly(argTexts);
-  if (root === 'find') return evaluateFindReadOnly(argTexts);
-  if (root === 'sed') return evaluateSedReadOnly(argTexts);
-  if (root === 'awk') return evaluateAwkReadOnly(argTexts);
+  if (root === "git") return evaluateGitReadOnly(argTexts);
+  if (root === "find") return evaluateFindReadOnly(argTexts);
+  if (root === "sed") return evaluateSedReadOnly(argTexts);
+  if (root === "awk") return evaluateAwkReadOnly(argTexts);
 
   return true;
 }
@@ -775,9 +744,9 @@ function evaluateCommandReadOnly(commandNode: SyntaxNode): boolean {
 function evaluateGitReadOnly(args: string[]): boolean {
   // Skip global flags to find subcommand
   let idx = 0;
-  while (idx < args.length && args[idx]!.startsWith('-')) {
+  while (idx < args.length && args[idx]!.startsWith("-")) {
     const flag = args[idx]!.toLowerCase();
-    if (flag === '--version' || flag === '--help') return true;
+    if (flag === "--version" || flag === "--help") return true;
     idx++;
   }
   if (idx >= args.length) return true; // `git` with only flags
@@ -786,10 +755,10 @@ function evaluateGitReadOnly(args: string[]): boolean {
   if (!READ_ONLY_GIT_SUBCOMMANDS.has(subcommand)) return false;
 
   const rest = args.slice(idx + 1);
-  if (subcommand === 'remote') {
+  if (subcommand === "remote") {
     return !rest.some((a) => BLOCKED_GIT_REMOTE_ACTIONS.has(a.toLowerCase()));
   }
-  if (subcommand === 'branch') {
+  if (subcommand === "branch") {
     return !rest.some((a) => BLOCKED_GIT_BRANCH_FLAGS.has(a));
   }
   return true;
@@ -806,19 +775,16 @@ function evaluateFindReadOnly(args: string[]): boolean {
 
 function evaluateSedReadOnly(args: string[]): boolean {
   for (const arg of args) {
-    if (
-      BLOCKED_SED_PREFIXES.some((p) => arg.startsWith(p)) ||
-      arg === '--in-place'
-    ) {
+    if (BLOCKED_SED_PREFIXES.some((p) => arg.startsWith(p)) || arg === "--in-place") {
       return false;
     }
   }
-  const scriptContent = args.join(' ');
+  const scriptContent = args.join(" ");
   return !SED_SIDE_EFFECT_PATTERNS.some((p) => p.test(scriptContent));
 }
 
 function evaluateAwkReadOnly(args: string[]): boolean {
-  const scriptContent = args.join(' ');
+  const scriptContent = args.join(" ");
   return !AWK_SIDE_EFFECT_PATTERNS.some((p) => p.test(scriptContent));
 }
 
@@ -834,12 +800,12 @@ function evaluateAwkReadOnly(args: string[]): boolean {
  */
 function evaluateStatementReadOnly(node: SyntaxNode): boolean {
   switch (node.type) {
-    case 'command':
+    case "command":
       // Check for command substitution anywhere inside the command
       if (containsCommandSubstitutionAST(node)) return false;
       return evaluateCommandReadOnly(node);
 
-    case 'pipeline': {
+    case "pipeline": {
       // All commands in the pipeline must be read-only
       for (const child of node.namedChildren) {
         if (!evaluateStatementReadOnly(child)) return false;
@@ -847,7 +813,7 @@ function evaluateStatementReadOnly(node: SyntaxNode): boolean {
       return true;
     }
 
-    case 'list': {
+    case "list": {
       // All commands joined by && / || must be read-only
       for (const child of node.namedChildren) {
         if (!evaluateStatementReadOnly(child)) return false;
@@ -855,7 +821,7 @@ function evaluateStatementReadOnly(node: SyntaxNode): boolean {
       return true;
     }
 
-    case 'redirected_statement': {
+    case "redirected_statement": {
       // Write redirections make it non-read-only
       if (hasWriteRedirection(node)) return false;
       // Evaluate the body statement
@@ -863,7 +829,7 @@ function evaluateStatementReadOnly(node: SyntaxNode): boolean {
       return body ? evaluateStatementReadOnly(body) : true;
     }
 
-    case 'subshell': {
+    case "subshell": {
       // Evaluate all statements inside the subshell
       for (const child of node.namedChildren) {
         if (!evaluateStatementReadOnly(child)) return false;
@@ -871,7 +837,7 @@ function evaluateStatementReadOnly(node: SyntaxNode): boolean {
       return true;
     }
 
-    case 'compound_statement': {
+    case "compound_statement": {
       // { cmd1; cmd2; } – evaluate each inner statement
       for (const child of node.namedChildren) {
         if (!evaluateStatementReadOnly(child)) return false;
@@ -879,29 +845,29 @@ function evaluateStatementReadOnly(node: SyntaxNode): boolean {
       return true;
     }
 
-    case 'variable_assignment':
-    case 'variable_assignments':
+    case "variable_assignment":
+    case "variable_assignments":
       // Pure assignments without a command – read-only (just sets env)
       return true;
 
-    case 'negated_command': {
+    case "negated_command": {
       const inner = node.namedChildren[0];
       return inner ? evaluateStatementReadOnly(inner) : true;
     }
 
-    case 'function_definition':
+    case "function_definition":
       // Function definitions are not read-only operations per se
       return false;
 
-    case 'if_statement':
-    case 'while_statement':
-    case 'for_statement':
-    case 'case_statement':
-    case 'c_style_for_statement':
+    case "if_statement":
+    case "while_statement":
+    case "for_statement":
+    case "case_statement":
+    case "c_style_for_statement":
       // Control flow constructs – conservatively non-read-only
       return false;
 
-    case 'declaration_command':
+    case "declaration_command":
       // export/declare/local/readonly/typeset – can modify env
       return false;
 
@@ -928,10 +894,8 @@ function evaluateStatementReadOnly(node: SyntaxNode): boolean {
  * @param command - The shell command string to evaluate.
  * @returns `true` if the command only performs read-only operations.
  */
-export async function isShellCommandReadOnlyAST(
-  command: string,
-): Promise<boolean> {
-  if (typeof command !== 'string' || !command.trim()) return false;
+export async function isShellCommandReadOnlyAST(command: string): Promise<boolean> {
+  if (typeof command !== "string" || !command.trim()) return false;
 
   // If the WASM parser is permanently unavailable (e.g. WASM file missing
   // after a symlinked install), fall back to the regex-based checker so the
@@ -985,7 +949,7 @@ function extractRuleFromCommand(commandNode: SyntaxNode): string | null {
 
   // Skip leading flags to find potential subcommand
   let idx = 0;
-  while (idx < argTexts.length && argTexts[idx]!.startsWith('-')) {
+  while (idx < argTexts.length && argTexts[idx]!.startsWith("-")) {
     idx++;
   }
 
@@ -998,17 +962,13 @@ function extractRuleFromCommand(commandNode: SyntaxNode): string | null {
       rule = `${rootName} ${argTexts[idx]!}`;
 
       // Docker multi-level: docker compose <sub>
-      if (
-        rootName === 'docker' &&
-        potentialSub === 'compose' &&
-        idx + 1 < argTexts.length
-      ) {
+      if (rootName === "docker" && potentialSub === "compose" && idx + 1 < argTexts.length) {
         const composeSub = argTexts[idx + 1]!.toLowerCase();
         if (DOCKER_COMPOSE_SUBCOMMANDS.has(composeSub)) {
           rule = `${rootName} compose ${argTexts[idx + 1]!}`;
           // Remaining args after compose sub
           if (idx + 2 < argTexts.length) {
-            rule += ' *';
+            rule += " *";
           }
           return rule;
         }
@@ -1016,7 +976,7 @@ function extractRuleFromCommand(commandNode: SyntaxNode): string | null {
 
       // Remaining args after subcommand
       if (idx + 1 < argTexts.length) {
-        rule += ' *';
+        rule += " *";
       }
       return rule;
     }
@@ -1024,7 +984,7 @@ function extractRuleFromCommand(commandNode: SyntaxNode): string | null {
 
   // No known subcommand – if there are any args, append *
   if (argTexts.length > 0) {
-    rule += ' *';
+    rule += " *";
   }
 
   return rule;
@@ -1036,13 +996,13 @@ function extractRuleFromCommand(commandNode: SyntaxNode): string | null {
  */
 function extractRulesFromStatement(node: SyntaxNode): string[] {
   switch (node.type) {
-    case 'command':
+    case "command":
       return [extractRuleFromCommand(node)].filter(Boolean) as string[];
 
-    case 'pipeline':
-    case 'list':
-    case 'compound_statement':
-    case 'subshell': {
+    case "pipeline":
+    case "list":
+    case "compound_statement":
+    case "subshell": {
       const rules: string[] = [];
       for (const child of node.namedChildren) {
         rules.push(...extractRulesFromStatement(child));
@@ -1050,18 +1010,18 @@ function extractRulesFromStatement(node: SyntaxNode): string[] {
       return rules;
     }
 
-    case 'redirected_statement': {
+    case "redirected_statement": {
       const body = node.namedChildren[0];
       return body ? extractRulesFromStatement(body) : [];
     }
 
-    case 'negated_command': {
+    case "negated_command": {
       const inner = node.namedChildren[0];
       return inner ? extractRulesFromStatement(inner) : [];
     }
 
-    case 'variable_assignment':
-    case 'variable_assignments':
+    case "variable_assignment":
+    case "variable_assignments":
       // Pure assignments – no rule needed
       return [];
 
@@ -1106,7 +1066,7 @@ function extractRulesFromStatement(node: SyntaxNode): string[] {
  * // → ['docker compose up *']
  */
 export async function extractCommandRules(command: string): Promise<string[]> {
-  if (typeof command !== 'string' || !command.trim()) return [];
+  if (typeof command !== "string" || !command.trim()) return [];
 
   const tree = await parseShellCommand(command);
   const root = tree.rootNode;
diff --git a/packages/airiscode-core/src/utils/shellReadOnlyChecker.ts b/packages/airiscode-core/src/utils/shellReadOnlyChecker.ts
index 470977313..fdeca1684 100644
--- a/packages/airiscode-core/src/utils/shellReadOnlyChecker.ts
+++ b/packages/airiscode-core/src/utils/shellReadOnlyChecker.ts
@@ -10,93 +10,77 @@
  * limitations. The AST-based replacement provides accurate parsing via tree-sitter-bash.
  */
 
-import { parse } from 'shell-quote';
-import {
-  detectCommandSubstitution,
-  splitCommands,
-  stripShellWrapper,
-} from './shell-utils.js';
+import { parse } from "shell-quote";
+import { detectCommandSubstitution, splitCommands, stripShellWrapper } from "./shell-utils.js";
 
 const READ_ONLY_ROOT_COMMANDS = new Set([
-  'awk',
-  'basename',
-  'cat',
-  'cd',
-  'column',
-  'cut',
-  'df',
-  'dirname',
-  'du',
-  'echo',
-  'env',
-  'find',
-  'git',
-  'grep',
-  'head',
-  'less',
-  'ls',
-  'more',
-  'printenv',
-  'printf',
-  'ps',
-  'pwd',
-  'rg',
-  'ripgrep',
-  'sed',
-  'sort',
-  'stat',
-  'tail',
-  'tree',
-  'uniq',
-  'wc',
-  'which',
-  'where',
-  'whoami',
+  "awk",
+  "basename",
+  "cat",
+  "cd",
+  "column",
+  "cut",
+  "df",
+  "dirname",
+  "du",
+  "echo",
+  "env",
+  "find",
+  "git",
+  "grep",
+  "head",
+  "less",
+  "ls",
+  "more",
+  "printenv",
+  "printf",
+  "ps",
+  "pwd",
+  "rg",
+  "ripgrep",
+  "sed",
+  "sort",
+  "stat",
+  "tail",
+  "tree",
+  "uniq",
+  "wc",
+  "which",
+  "where",
+  "whoami",
 ]);
 
-const BLOCKED_FIND_FLAGS = new Set([
-  '-delete',
-  '-exec',
-  '-execdir',
-  '-ok',
-  '-okdir',
-]);
+const BLOCKED_FIND_FLAGS = new Set(["-delete", "-exec", "-execdir", "-ok", "-okdir"]);
 
-const BLOCKED_FIND_PREFIXES = ['-fprint', '-fprintf'];
+const BLOCKED_FIND_PREFIXES = ["-fprint", "-fprintf"];
 
 const READ_ONLY_GIT_SUBCOMMANDS = new Set([
-  'blame',
-  'branch',
-  'cat-file',
-  'diff',
-  'grep',
-  'log',
-  'ls-files',
-  'remote',
-  'rev-parse',
-  'show',
-  'status',
-  'describe',
+  "blame",
+  "branch",
+  "cat-file",
+  "diff",
+  "grep",
+  "log",
+  "ls-files",
+  "remote",
+  "rev-parse",
+  "show",
+  "status",
+  "describe",
 ]);
 
 const BLOCKED_GIT_REMOTE_ACTIONS = new Set([
-  'add',
-  'remove',
-  'rename',
-  'set-url',
-  'prune',
-  'update',
+  "add",
+  "remove",
+  "rename",
+  "set-url",
+  "prune",
+  "update",
 ]);
 
-const BLOCKED_GIT_BRANCH_FLAGS = new Set([
-  '-d',
-  '-D',
-  '--delete',
-  '--move',
-  '-m',
-]);
+const BLOCKED_GIT_BRANCH_FLAGS = new Set(["-d", "-D", "--delete", "--move", "-m"]);
 
-const BLOCKED_SED_PREFIXES = ['-i'];
+const BLOCKED_SED_PREFIXES = ["-i"];
 
 // AWK side-effect patterns that can execute commands or write files
 const AWK_SIDE_EFFECT_PATTERNS = [
@@ -135,7 +119,7 @@ function containsWriteRedirection(command: string): boolean {
       continue;
     }
 
-    if (char === '\\' && !inSingleQuotes) {
+    if (char === "\\" && !inSingleQuotes) {
       escapeNext = true;
       continue;
     }
@@ -150,7 +134,7 @@ function containsWriteRedirection(command: string): boolean {
       continue;
     }
 
-    if (!inSingleQuotes && !inDoubleQuotes && char === '>') {
+    if (!inSingleQuotes && !inDoubleQuotes && char === ">") {
       return true;
     }
   }
@@ -162,7 +146,7 @@ function normalizeTokens(segment: string): string[] {
   const parsed = parse(segment);
   const tokens: string[] = [];
   for (const token of parsed) {
-    if (typeof token === 'string') {
+    if (typeof token === "string") {
       tokens.push(token);
     }
   }
@@ -205,16 +189,13 @@ function evaluateFindCommand(tokens: string[]): boolean {
 function evaluateSedCommand(tokens: string[]): boolean {
   const [, ...rest] = tokens;
   for (const token of rest) {
-    if (
-      BLOCKED_SED_PREFIXES.some((prefix) => token.startsWith(prefix)) ||
-      token === '--in-place'
-    ) {
+    if (BLOCKED_SED_PREFIXES.some((prefix) => token.startsWith(prefix)) || token === "--in-place") {
       return false;
     }
   }
 
   // Check for side-effect patterns in sed script
-  const scriptContent = rest.join(' ');
+  const scriptContent = rest.join(" ");
   for (const pattern of SED_SIDE_EFFECT_PATTERNS) {
     if (pattern.test(scriptContent)) {
       return false;
@@ -228,7 +209,7 @@ function evaluateAwkCommand(tokens: string[]): boolean {
   const [, ...rest] = tokens;
 
   // Join all arguments to check for awk script content
-  const scriptContent = rest.join(' ');
+  const scriptContent = rest.join(" ");
 
   // Check for dangerous side-effect patterns
   for (const pattern of AWK_SIDE_EFFECT_PATTERNS) {
@@ -260,9 +241,9 @@ function evaluateGitBranchArgs(args: string[]): boolean {
 
 function evaluateGitCommand(tokens: string[]): boolean {
   let index = 1;
-  while (index < tokens.length && tokens[index]!.startsWith('-')) {
+  while (index < tokens.length && tokens[index]!.startsWith("-")) {
     const flag = tokens[index]!.toLowerCase();
-    if (flag === '--version' || flag === '--help') {
+    if (flag === "--version" || flag === "--help") {
       return true;
     }
     index++;
@@ -279,11 +260,11 @@ function evaluateGitCommand(tokens: string[]): boolean {
 
   const args = tokens.slice(index + 1);
 
-  if (subcommand === 'remote') {
+  if (subcommand === "remote") {
     return evaluateGitRemoteArgs(args);
   }
 
-  if (subcommand === 'branch') {
+  if (subcommand === "branch") {
     return evaluateGitBranchArgs(args);
   }
 
@@ -323,19 +304,19 @@ function evaluateShellSegment(segment: string): boolean {
     return false;
   }
 
-  if (normalizedRoot === 'find') {
+  if (normalizedRoot === "find") {
     return evaluateFindCommand([normalizedRoot, ...args]);
   }
 
-  if (normalizedRoot === 'sed') {
+  if (normalizedRoot === "sed") {
     return evaluateSedCommand([normalizedRoot, ...args]);
   }
 
-  if (normalizedRoot === 'awk') {
+  if (normalizedRoot === "awk") {
     return evaluateAwkCommand([normalizedRoot, ...args]);
   }
 
-  if (normalizedRoot === 'git') {
+  if (normalizedRoot === "git") {
     return evaluateGitCommand([normalizedRoot, ...args]);
   }
 
@@ -348,7 +329,7 @@ function evaluateShellSegment(segment: string): boolean {
  * limitations. The AST-based replacement provides accurate parsing via tree-sitter-bash.
  */
 export function isShellCommandReadOnly(command: string): boolean {
-  if (typeof command !== 'string' || !command.trim()) {
+  if (typeof command !== "string" || !command.trim()) {
     return false;
   }
 
diff --git a/packages/airiscode-core/src/utils/subagentGenerator.ts b/packages/airiscode-core/src/utils/subagentGenerator.ts
index a8d4abc9d..fe4478f03 100644
--- a/packages/airiscode-core/src/utils/subagentGenerator.ts
+++ b/packages/airiscode-core/src/utils/subagentGenerator.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '../types/llm.js';
-import { DEFAULT_AIRISCODE_MODEL } from '../config/models.js';
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
+import { DEFAULT_AIRISCODE_MODEL } from "../config/models.js";
+import type { Content } from "../types/llm.js";
 
 const SYSTEM_PROMPT = `You are an elite AI agent architect specializing in crafting high-performance agent configurations. Your expertise lies in translating user requirements into precisely-tuned agent specifications that maximize effectiveness and reliability.
 
@@ -78,25 +78,25 @@ const createUserPrompt = (userInput: string): string =>
   `Create an agent configuration based on this request: "${userInput}"`;
 
 const RESPONSE_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     name: {
-      type: 'string',
+      type: "string",
       description:
         "A unique, descriptive identifier using lowercase letters, numbers, and hyphens (e.g., 'code-reviewer', 'api-docs-writer', 'test-generator')",
     },
     description: {
-      type: 'string',
+      type: "string",
       description:
         "A precise, actionable description starting with 'Use this agent when...' that clearly defines the triggering conditions and use cases",
     },
     systemPrompt: {
-      type: 'string',
+      type: "string",
       description:
         "The complete system prompt that will govern the agent's behavior, written in second person ('You are...', 'You will...') and structured for maximum clarity and effectiveness",
     },
   },
-  required: ['name', 'description', 'systemPrompt'],
+  required: ["name", "description", "systemPrompt"],
 };
 
 export interface SubagentGeneratedContent {
@@ -119,11 +119,11 @@ export async function subagentGenerator(
   abortSignal: AbortSignal,
 ): Promise<SubagentGeneratedContent> {
   if (!userDescription.trim()) {
-    throw new Error('User description cannot be empty');
+    throw new Error("User description cannot be empty");
   }
 
   const userPrompt = createUserPrompt(userDescription);
-  const contents: Content[] = [{ role: 'user', parts: [{ text: userPrompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: userPrompt }] }];
 
   const parsedResponse = (await config.getBaseLlmClient().generateJson({
     model: config.getModel() || DEFAULT_AIRISCODE_MODEL,
@@ -139,7 +139,7 @@ export async function subagentGenerator(
     !parsedResponse.description ||
     !parsedResponse.systemPrompt
   ) {
-    throw new Error('Invalid response from LLM: missing required fields');
+    throw new Error("Invalid response from LLM: missing required fields");
   }
 
   return parsedResponse;
diff --git a/packages/airiscode-core/src/utils/symlink.ts b/packages/airiscode-core/src/utils/symlink.ts
index 54b4879ea..ba65a7808 100644
--- a/packages/airiscode-core/src/utils/symlink.ts
+++ b/packages/airiscode-core/src/utils/symlink.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
+import { promises as fs } from "node:fs";
+import path from "node:path";
 
 export interface UpdateSymlinkOptions {
   /**
diff --git a/packages/airiscode-core/src/utils/systemEncoding.ts b/packages/airiscode-core/src/utils/systemEncoding.ts
index 1af4831f1..fc92ed821 100644
--- a/packages/airiscode-core/src/utils/systemEncoding.ts
+++ b/packages/airiscode-core/src/utils/systemEncoding.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isUtf8 } from 'node:buffer';
-import { execSync } from 'node:child_process';
-import os from 'node:os';
-import { detect as chardetDetect } from 'chardet';
-import { createDebugLogger } from './debugLogger.js';
+import { isUtf8 } from "node:buffer";
+import { execSync } from "node:child_process";
+import os from "node:os";
+import { detect as chardetDetect } from "chardet";
+import { createDebugLogger } from "./debugLogger.js";
 
-const debugLogger = createDebugLogger('ENCODING');
+const debugLogger = createDebugLogger("ENCODING");
 
 // Cache for system encoding to avoid repeated detection
 // Use undefined to indicate "not yet checked" vs null meaning "checked but failed"
@@ -39,7 +39,7 @@ export function resetEncodingCache(): void {
  */
 export function getCachedEncodingForBuffer(buffer: Buffer): string {
   if (isUtf8(buffer)) {
-    return 'utf-8';
+    return "utf-8";
   }
 
   // Buffer is not valid UTF-8 — try chardet, then system encoding
@@ -56,7 +56,7 @@ export function getCachedEncodingForBuffer(buffer: Buffer): string {
   }
 
   // Last resort
-  return 'utf-8';
+  return "utf-8";
 }
 
 /**
@@ -69,9 +69,9 @@ export function getCachedEncodingForBuffer(buffer: Buffer): string {
  */
 export function getSystemEncoding(): string | null {
   // Windows
-  if (os.platform() === 'win32') {
+  if (os.platform() === "win32") {
     try {
-      const output = execSync('chcp', { encoding: 'utf8' });
+      const output = execSync("chcp", { encoding: "utf8" });
       const match = output.match(/:\s*(\d+)/);
       if (match) {
         const codePage = parseInt(match[1], 10);
@@ -80,9 +80,7 @@ export function getSystemEncoding(): string | null {
         }
       }
       // Only warn if we can't parse the output format, not if windowsCodePageToEncoding fails
-      throw new Error(
-        `Unable to parse Windows code page from 'chcp' output "${output.trim()}". `,
-      );
+      throw new Error(`Unable to parse Windows code page from 'chcp' output "${output.trim()}". `);
     } catch (error) {
       debugLogger.warn(
         `Failed to get Windows code page using 'chcp' command: ${error instanceof Error ? error.message : String(error)}. ` +
@@ -97,16 +95,14 @@ export function getSystemEncoding(): string | null {
   // system encoding. However, these environment variables might not always
   // be set or accurate. Handle cases where none of these variables are set.
   const env = process.env;
-  let locale = env['LC_ALL'] || env['LC_CTYPE'] || env['LANG'] || '';
+  let locale = env["LC_ALL"] || env["LC_CTYPE"] || env["LANG"] || "";
 
   // Fallback to querying the system directly when environment variables are missing
   if (!locale) {
     try {
-      locale = execSync('locale charmap', { encoding: 'utf8' })
-        .toString()
-        .trim();
+      locale = execSync("locale charmap", { encoding: "utf8" }).toString().trim();
     } catch (_e) {
-      debugLogger.warn('Failed to get locale charmap.');
+      debugLogger.warn("Failed to get locale charmap.");
       return null;
     }
   }
@@ -117,7 +113,7 @@ export function getSystemEncoding(): string | null {
   }
 
   // Handle cases where locale charmap returns just the encoding name (e.g., "UTF-8")
-  if (locale && !locale.includes('.')) {
+  if (locale && !locale.includes(".")) {
     return locale.toLowerCase();
   }
 
@@ -133,27 +129,27 @@ export function getSystemEncoding(): string | null {
 export function windowsCodePageToEncoding(cp: number): string | null {
   // Most common mappings; extend as needed
   const map: { [key: number]: string } = {
-    437: 'cp437',
-    850: 'cp850',
-    852: 'cp852',
-    866: 'cp866',
-    874: 'windows-874',
-    932: 'shift_jis',
-    936: 'gbk',
-    949: 'euc-kr',
-    950: 'big5',
-    1200: 'utf-16le',
-    1201: 'utf-16be',
-    1250: 'windows-1250',
-    1251: 'windows-1251',
-    1252: 'windows-1252',
-    1253: 'windows-1253',
-    1254: 'windows-1254',
-    1255: 'windows-1255',
-    1256: 'windows-1256',
-    1257: 'windows-1257',
-    1258: 'windows-1258',
-    65001: 'utf-8',
+    437: "cp437",
+    850: "cp850",
+    852: "cp852",
+    866: "cp866",
+    874: "windows-874",
+    932: "shift_jis",
+    936: "gbk",
+    949: "euc-kr",
+    950: "big5",
+    1200: "utf-16le",
+    1201: "utf-16be",
+    1250: "windows-1250",
+    1251: "windows-1251",
+    1252: "windows-1252",
+    1253: "windows-1253",
+    1254: "windows-1254",
+    1255: "windows-1255",
+    1256: "windows-1256",
+    1257: "windows-1257",
+    1258: "windows-1258",
+    65001: "utf-8",
   };
 
   if (map[cp]) {
@@ -179,11 +175,11 @@ export function detectEncodingFromBuffer(buffer: Buffer): string | null {
   // Try chardet statistical detection first — works well for larger files
   try {
     const detected = chardetDetect(buffer);
-    if (detected && typeof detected === 'string') {
+    if (detected && typeof detected === "string") {
       return detected.toLowerCase();
     }
   } catch (error) {
-    debugLogger.warn('Failed to detect encoding with chardet:', error);
+    debugLogger.warn("Failed to detect encoding with chardet:", error);
   }
 
   return null;
diff --git a/packages/airiscode-core/src/utils/terminalSerializer.ts b/packages/airiscode-core/src/utils/terminalSerializer.ts
index e12fe25aa..a5c0e8623 100644
--- a/packages/airiscode-core/src/utils/terminalSerializer.ts
+++ b/packages/airiscode-core/src/utils/terminalSerializer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { IBufferCell, Terminal } from '@xterm/headless';
+import type { IBufferCell, Terminal } from "@xterm/headless";
 export interface AnsiToken {
   text: string;
   bold: boolean;
@@ -45,13 +45,7 @@ class Cell {
   fgColorMode: ColorMode = ColorMode.DEFAULT;
   bgColorMode: ColorMode = ColorMode.DEFAULT;
 
-  constructor(
-    cell: IBufferCell | null,
-    x: number,
-    y: number,
-    cursorX: number,
-    cursorY: number,
-  ) {
+  constructor(cell: IBufferCell | null, x: number, y: number, cursorX: number, cursorY: number) {
     this.cell = cell;
     this.x = x;
     this.y = y;
@@ -112,7 +106,7 @@ class Cell {
   }
 
   getChars(): string {
-    return this.cell?.getChars() || ' ';
+    return this.cell?.getChars() || " ";
   }
 
   isAttribute(attribute: Attribute): boolean {
@@ -136,8 +130,8 @@ export function serializeTerminalToObject(
   scrollOffset: number = 0,
 ): AnsiOutput {
   const buffer = terminal.buffer.active;
-  const defaultFg = '';
-  const defaultBg = '';
+  const defaultFg = "";
+  const defaultBg = "";
 
   // Clamp scrollOffset to valid range [0, viewportY]
   const clampedOffset = Math.max(0, Math.min(scrollOffset, buffer.viewportY));
@@ -158,7 +152,7 @@ export function serializeTerminalToObject(
     }
 
     let lastCell = new Cell(null, -1, -1, cursorX, cursorY);
-    let currentText = '';
+    let currentText = "";
 
     for (let x = 0; x < terminal.cols; x++) {
       const cellData = line.getCell(x);
@@ -172,14 +166,13 @@ export function serializeTerminalToObject(
             italic: lastCell.isAttribute(Attribute.italic),
             underline: lastCell.isAttribute(Attribute.underline),
             dim: lastCell.isAttribute(Attribute.dim),
-            inverse:
-              lastCell.isAttribute(Attribute.inverse) || lastCell.isCursor(),
+            inverse: lastCell.isAttribute(Attribute.inverse) || lastCell.isCursor(),
             fg: convertColorToHex(lastCell.fg, lastCell.fgColorMode, defaultFg),
             bg: convertColorToHex(lastCell.bg, lastCell.bgColorMode, defaultBg),
           };
           currentLine.push(token);
         }
-        currentText = '';
+        currentText = "";
       }
       currentText += cell.getChars();
       lastCell = cell;
@@ -207,262 +200,262 @@ export function serializeTerminalToObject(
 
 // ANSI color palette from https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
 const ANSI_COLORS = [
-  '#000000',
-  '#800000',
-  '#008000',
-  '#808000',
-  '#000080',
-  '#800080',
-  '#008080',
-  '#c0c0c0',
-  '#808080',
-  '#ff0000',
-  '#00ff00',
-  '#ffff00',
-  '#0000ff',
-  '#ff00ff',
-  '#00ffff',
-  '#ffffff',
-  '#000000',
-  '#00005f',
-  '#000087',
-  '#0000af',
-  '#0000d7',
-  '#0000ff',
-  '#005f00',
-  '#005f5f',
-  '#005f87',
-  '#005faf',
-  '#005fd7',
-  '#005fff',
-  '#008700',
-  '#00875f',
-  '#008787',
-  '#0087af',
-  '#0087d7',
-  '#0087ff',
-  '#00af00',
-  '#00af5f',
-  '#00af87',
-  '#00afaf',
-  '#00afd7',
-  '#00afff',
-  '#00d700',
-  '#00d75f',
-  '#00d787',
-  '#00d7af',
-  '#00d7d7',
-  '#00d7ff',
-  '#00ff00',
-  '#00ff5f',
-  '#00ff87',
-  '#00ffaf',
-  '#00ffd7',
-  '#00ffff',
-  '#5f0000',
-  '#5f005f',
-  '#5f0087',
-  '#5f00af',
-  '#5f00d7',
-  '#5f00ff',
-  '#5f5f00',
-  '#5f5f5f',
-  '#5f5f87',
-  '#5f5faf',
-  '#5f5fd7',
-  '#5f5fff',
-  '#5f8700',
-  '#5f875f',
-  '#5f8787',
-  '#5f87af',
-  '#5f87d7',
-  '#5f87ff',
-  '#5faf00',
-  '#5faf5f',
-  '#5faf87',
-  '#5fafaf',
-  '#5fafd7',
-  '#5fafff',
-  '#5fd700',
-  '#5fd75f',
-  '#5fd787',
-  '#5fd7af',
-  '#5fd7d7',
-  '#5fd7ff',
-  '#5fff00',
-  '#5fff5f',
-  '#5fff87',
-  '#5fffaf',
-  '#5fffd7',
-  '#5fffff',
-  '#870000',
-  '#87005f',
-  '#870087',
-  '#8700af',
-  '#8700d7',
-  '#8700ff',
-  '#875f00',
-  '#875f5f',
-  '#875f87',
-  '#875faf',
-  '#875fd7',
-  '#875fff',
-  '#878700',
-  '#87875f',
-  '#878787',
-  '#8787af',
-  '#8787d7',
-  '#8787ff',
-  '#87af00',
-  '#87af5f',
-  '#87af87',
-  '#87afaf',
-  '#87afd7',
-  '#87afff',
-  '#87d700',
-  '#87d75f',
-  '#87d787',
-  '#87d7af',
-  '#87d7d7',
-  '#87d7ff',
-  '#87ff00',
-  '#87ff5f',
-  '#87ff87',
-  '#87ffaf',
-  '#87ffd7',
-  '#87ffff',
-  '#af0000',
-  '#af005f',
-  '#af0087',
-  '#af00af',
-  '#af00d7',
-  '#af00ff',
-  '#af5f00',
-  '#af5f5f',
-  '#af5f87',
-  '#af5faf',
-  '#af5fd7',
-  '#af5fff',
-  '#af8700',
-  '#af875f',
-  '#af8787',
-  '#af87af',
-  '#af87d7',
-  '#af87ff',
-  '#afaf00',
-  '#afaf5f',
-  '#afaf87',
-  '#afafaf',
-  '#afafd7',
-  '#afafff',
-  '#afd700',
-  '#afd75f',
-  '#afd787',
-  '#afd7af',
-  '#afd7d7',
-  '#afd7ff',
-  '#afff00',
-  '#afff5f',
-  '#afff87',
-  '#afffaf',
-  '#afffd7',
-  '#afffff',
-  '#d70000',
-  '#d7005f',
-  '#d70087',
-  '#d700af',
-  '#d700d7',
-  '#d700ff',
-  '#d75f00',
-  '#d75f5f',
-  '#d75f87',
-  '#d75faf',
-  '#d75fd7',
-  '#d75fff',
-  '#d78700',
-  '#d7875f',
-  '#d78787',
-  '#d787af',
-  '#d787d7',
-  '#d787ff',
-  '#d7af00',
-  '#d7af5f',
-  '#d7af87',
-  '#d7afaf',
-  '#d7afd7',
-  '#d7afff',
-  '#d7d700',
-  '#d7d75f',
-  '#d7d787',
-  '#d7d7af',
-  '#d7d7d7',
-  '#d7d7ff',
-  '#d7ff00',
-  '#d7ff5f',
-  '#d7ff87',
-  '#d7ffaf',
-  '#d7ffd7',
-  '#d7ffff',
-  '#ff0000',
-  '#ff005f',
-  '#ff0087',
-  '#ff00af',
-  '#ff00d7',
-  '#ff00ff',
-  '#ff5f00',
-  '#ff5f5f',
-  '#ff5f87',
-  '#ff5faf',
-  '#ff5fd7',
-  '#ff5fff',
-  '#ff8700',
-  '#ff875f',
-  '#ff8787',
-  '#ff87af',
-  '#ff87d7',
-  '#ff87ff',
-  '#ffaf00',
-  '#ffaf5f',
-  '#ffaf87',
-  '#ffafaf',
-  '#ffafd7',
-  '#ffafff',
-  '#ffd700',
-  '#ffd75f',
-  '#ffd787',
-  '#ffd7af',
-  '#ffd7d7',
-  '#ffd7ff',
-  '#ffff00',
-  '#ffff5f',
-  '#ffff87',
-  '#ffffaf',
-  '#ffffd7',
-  '#ffffff',
-  '#080808',
-  '#121212',
-  '#1c1c1c',
-  '#262626',
-  '#303030',
-  '#3a3a3a',
-  '#444444',
-  '#4e4e4e',
-  '#585858',
-  '#626262',
-  '#6c6c6c',
-  '#767676',
-  '#808080',
-  '#8a8a8a',
-  '#949494',
-  '#9e9e9e',
-  '#a8a8a8',
-  '#b2b2b2',
-  '#bcbcbc',
-  '#c6c6c6',
-  '#d0d0d0',
-  '#dadada',
-  '#e4e4e4',
-  '#eeeeee',
+  "#000000",
+  "#800000",
+  "#008000",
+  "#808000",
+  "#000080",
+  "#800080",
+  "#008080",
+  "#c0c0c0",
+  "#808080",
+  "#ff0000",
+  "#00ff00",
+  "#ffff00",
+  "#0000ff",
+  "#ff00ff",
+  "#00ffff",
+  "#ffffff",
+  "#000000",
+  "#00005f",
+  "#000087",
+  "#0000af",
+  "#0000d7",
+  "#0000ff",
+  "#005f00",
+  "#005f5f",
+  "#005f87",
+  "#005faf",
+  "#005fd7",
+  "#005fff",
+  "#008700",
+  "#00875f",
+  "#008787",
+  "#0087af",
+  "#0087d7",
+  "#0087ff",
+  "#00af00",
+  "#00af5f",
+  "#00af87",
+  "#00afaf",
+  "#00afd7",
+  "#00afff",
+  "#00d700",
+  "#00d75f",
+  "#00d787",
+  "#00d7af",
+  "#00d7d7",
+  "#00d7ff",
+  "#00ff00",
+  "#00ff5f",
+  "#00ff87",
+  "#00ffaf",
+  "#00ffd7",
+  "#00ffff",
+  "#5f0000",
+  "#5f005f",
+  "#5f0087",
+  "#5f00af",
+  "#5f00d7",
+  "#5f00ff",
+  "#5f5f00",
+  "#5f5f5f",
+  "#5f5f87",
+  "#5f5faf",
+  "#5f5fd7",
+  "#5f5fff",
+  "#5f8700",
+  "#5f875f",
+  "#5f8787",
+  "#5f87af",
+  "#5f87d7",
+  "#5f87ff",
+  "#5faf00",
+  "#5faf5f",
+  "#5faf87",
+  "#5fafaf",
+  "#5fafd7",
+  "#5fafff",
+  "#5fd700",
+  "#5fd75f",
+  "#5fd787",
+  "#5fd7af",
+  "#5fd7d7",
+  "#5fd7ff",
+  "#5fff00",
+  "#5fff5f",
+  "#5fff87",
+  "#5fffaf",
+  "#5fffd7",
+  "#5fffff",
+  "#870000",
+  "#87005f",
+  "#870087",
+  "#8700af",
+  "#8700d7",
+  "#8700ff",
+  "#875f00",
+  "#875f5f",
+  "#875f87",
+  "#875faf",
+  "#875fd7",
+  "#875fff",
+  "#878700",
+  "#87875f",
+  "#878787",
+  "#8787af",
+  "#8787d7",
+  "#8787ff",
+  "#87af00",
+  "#87af5f",
+  "#87af87",
+  "#87afaf",
+  "#87afd7",
+  "#87afff",
+  "#87d700",
+  "#87d75f",
+  "#87d787",
+  "#87d7af",
+  "#87d7d7",
+  "#87d7ff",
+  "#87ff00",
+  "#87ff5f",
+  "#87ff87",
+  "#87ffaf",
+  "#87ffd7",
+  "#87ffff",
+  "#af0000",
+  "#af005f",
+  "#af0087",
+  "#af00af",
+  "#af00d7",
+  "#af00ff",
+  "#af5f00",
+  "#af5f5f",
+  "#af5f87",
+  "#af5faf",
+  "#af5fd7",
+  "#af5fff",
+  "#af8700",
+  "#af875f",
+  "#af8787",
+  "#af87af",
+  "#af87d7",
+  "#af87ff",
+  "#afaf00",
+  "#afaf5f",
+  "#afaf87",
+  "#afafaf",
+  "#afafd7",
+  "#afafff",
+  "#afd700",
+  "#afd75f",
+  "#afd787",
+  "#afd7af",
+  "#afd7d7",
+  "#afd7ff",
+  "#afff00",
+  "#afff5f",
+  "#afff87",
+  "#afffaf",
+  "#afffd7",
+  "#afffff",
+  "#d70000",
+  "#d7005f",
+  "#d70087",
+  "#d700af",
+  "#d700d7",
+  "#d700ff",
+  "#d75f00",
+  "#d75f5f",
+  "#d75f87",
+  "#d75faf",
+  "#d75fd7",
+  "#d75fff",
+  "#d78700",
+  "#d7875f",
+  "#d78787",
+  "#d787af",
+  "#d787d7",
+  "#d787ff",
+  "#d7af00",
+  "#d7af5f",
+  "#d7af87",
+  "#d7afaf",
+  "#d7afd7",
+  "#d7afff",
+  "#d7d700",
+  "#d7d75f",
+  "#d7d787",
+  "#d7d7af",
+  "#d7d7d7",
+  "#d7d7ff",
+  "#d7ff00",
+  "#d7ff5f",
+  "#d7ff87",
+  "#d7ffaf",
+  "#d7ffd7",
+  "#d7ffff",
+  "#ff0000",
+  "#ff005f",
+  "#ff0087",
+  "#ff00af",
+  "#ff00d7",
+  "#ff00ff",
+  "#ff5f00",
+  "#ff5f5f",
+  "#ff5f87",
+  "#ff5faf",
+  "#ff5fd7",
+  "#ff5fff",
+  "#ff8700",
+  "#ff875f",
+  "#ff8787",
+  "#ff87af",
+  "#ff87d7",
+  "#ff87ff",
+  "#ffaf00",
+  "#ffaf5f",
+  "#ffaf87",
+  "#ffafaf",
+  "#ffafd7",
+  "#ffafff",
+  "#ffd700",
+  "#ffd75f",
+  "#ffd787",
+  "#ffd7af",
+  "#ffd7d7",
+  "#ffd7ff",
+  "#ffff00",
+  "#ffff5f",
+  "#ffff87",
+  "#ffffaf",
+  "#ffffd7",
+  "#ffffff",
+  "#080808",
+  "#121212",
+  "#1c1c1c",
+  "#262626",
+  "#303030",
+  "#3a3a3a",
+  "#444444",
+  "#4e4e4e",
+  "#585858",
+  "#626262",
+  "#6c6c6c",
+  "#767676",
+  "#808080",
+  "#8a8a8a",
+  "#949494",
+  "#9e9e9e",
+  "#a8a8a8",
+  "#b2b2b2",
+  "#bcbcbc",
+  "#c6c6c6",
+  "#d0d0d0",
+  "#dadada",
+  "#e4e4e4",
+  "#eeeeee",
 ];
 
 export function convertColorToHex(
@@ -474,9 +467,9 @@ export function convertColorToHex(
     const r = (color >> 16) & 255;
     const g = (color >> 8) & 255;
     const b = color & 255;
-    return `#${r.toString(16).padStart(2, '0')}${g
+    return `#${r.toString(16).padStart(2, "0")}${g
       .toString(16)
-      .padStart(2, '0')}${b.toString(16).padStart(2, '0')}`;
+      .padStart(2, "0")}${b.toString(16).padStart(2, "0")}`;
   }
   if (colorMode === ColorMode.PALETTE) {
     return ANSI_COLORS[color] || defaultColor;
diff --git a/packages/airiscode-core/src/utils/testUtils.ts b/packages/airiscode-core/src/utils/testUtils.ts
index a0010b105..566fda202 100644
--- a/packages/airiscode-core/src/utils/testUtils.ts
+++ b/packages/airiscode-core/src/utils/testUtils.ts
@@ -56,7 +56,7 @@ export function disableSimulationAfterFallback(): void {
  * Create a simulated 429 error response
  */
 export function createSimulated429Error(): Error {
-  const error = new Error('Rate limit exceeded (simulated)') as Error & {
+  const error = new Error("Rate limit exceeded (simulated)") as Error & {
     status: number;
   };
   error.status = 429;
@@ -74,11 +74,7 @@ export function resetSimulationState(): void {
 /**
  * Enable/disable 429 simulation programmatically (for tests)
  */
-export function setSimulate429(
-  enabled: boolean,
-  afterRequests = 0,
-  forAuthType?: string,
-): void {
+export function setSimulate429(enabled: boolean, afterRequests = 0, forAuthType?: string): void {
   simulate429Enabled = enabled;
   simulate429AfterRequests = afterRequests;
   simulate429ForAuthType = forAuthType;
diff --git a/packages/airiscode-core/src/utils/textUtils.ts b/packages/airiscode-core/src/utils/textUtils.ts
index 32c25b89f..63f06f979 100644
--- a/packages/airiscode-core/src/utils/textUtils.ts
+++ b/packages/airiscode-core/src/utils/textUtils.ts
@@ -8,20 +8,16 @@
  * Safely replaces text with literal strings, avoiding ECMAScript GetSubstitution issues.
  * Escapes $ characters to prevent template interpretation.
  */
-export function safeLiteralReplace(
-  str: string,
-  oldString: string,
-  newString: string,
-): string {
-  if (oldString === '' || !str.includes(oldString)) {
+export function safeLiteralReplace(str: string, oldString: string, newString: string): string {
+  if (oldString === "" || !str.includes(oldString)) {
     return str;
   }
 
-  if (!newString.includes('$')) {
+  if (!newString.includes("$")) {
     return str.replaceAll(oldString, newString);
   }
 
-  const escapedNewString = newString.replaceAll('$', '$$$$');
+  const escapedNewString = newString.replaceAll("$", "$$$$");
   return str.replaceAll(oldString, escapedNewString);
 }
 
@@ -32,10 +28,7 @@ export function safeLiteralReplace(
  * @param sampleSize The number of bytes from the start of the buffer to test.
  * @returns True if a NULL byte is found, false otherwise.
  */
-export function isBinary(
-  data: Buffer | null | undefined,
-  sampleSize = 512,
-): boolean {
+export function isBinary(data: Buffer | null | undefined, sampleSize = 512): boolean {
   if (!data) {
     return false;
   }
@@ -66,10 +59,10 @@ export function isBinary(
  */
 export function normalizeContent(content: string): string {
   // Strip UTF-8 BOM to ensure string processing starts at the first real character.
-  let normalized = content.replace(/^\uFEFF/, '');
+  let normalized = content.replace(/^\uFEFF/, "");
 
   // Normalize line endings to LF (\n).
-  normalized = normalized.replace(/\r\n/g, '\n').replace(/\r/g, '\n');
+  normalized = normalized.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
 
   return normalized;
 }
diff --git a/packages/airiscode-core/src/utils/thoughtUtils.ts b/packages/airiscode-core/src/utils/thoughtUtils.ts
index 5206bf924..570f3776a 100644
--- a/packages/airiscode-core/src/utils/thoughtUtils.ts
+++ b/packages/airiscode-core/src/utils/thoughtUtils.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentResponse } from '../types/llm.js';
+import type { GenerateContentResponse } from "../types/llm.js";
 
 export type ThoughtSummary = {
   subject: string;
   description: string;
 };
 
-const START_DELIMITER = '**';
-const END_DELIMITER = '**';
+const START_DELIMITER = "**";
+const END_DELIMITER = "**";
 
 /**
  * Parses a raw thought string into a structured ThoughtSummary object.
@@ -29,47 +29,35 @@ export function parseThought(rawText: string): ThoughtSummary {
   const startIndex = rawText.indexOf(START_DELIMITER);
   if (startIndex === -1) {
     // No start delimiter found, the whole text is the description.
-    return { subject: '', description: rawText };
+    return { subject: "", description: rawText };
   }
 
-  const endIndex = rawText.indexOf(
-    END_DELIMITER,
-    startIndex + START_DELIMITER.length,
-  );
+  const endIndex = rawText.indexOf(END_DELIMITER, startIndex + START_DELIMITER.length);
   if (endIndex === -1) {
     // Start delimiter found but no end delimiter, so it's not a valid subject.
     // Treat the entire string as the description.
-    return { subject: '', description: rawText };
+    return { subject: "", description: rawText };
   }
 
-  const subject = rawText
-    .substring(startIndex + START_DELIMITER.length, endIndex)
-    .trim();
+  const subject = rawText.substring(startIndex + START_DELIMITER.length, endIndex).trim();
 
   // The description is everything before the start delimiter and after the end delimiter.
   const description = (
-    rawText.substring(0, startIndex) +
-    rawText.substring(endIndex + END_DELIMITER.length)
+    rawText.substring(0, startIndex) + rawText.substring(endIndex + END_DELIMITER.length)
   ).trim();
 
   return { subject, description };
 }
 
-export function getThoughtText(
-  response: GenerateContentResponse,
-): string | null {
+export function getThoughtText(response: GenerateContentResponse): string | null {
   if (response.candidates && response.candidates.length > 0) {
     const candidate = response.candidates[0];
 
-    if (
-      candidate.content &&
-      candidate.content.parts &&
-      candidate.content.parts.length > 0
-    ) {
+    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
       return candidate.content.parts
         .filter((part) => part.thought)
-        .map((part) => part.text ?? '')
-        .join('');
+        .map((part) => part.text ?? "")
+        .join("");
     }
   }
   return null;
diff --git a/packages/airiscode-core/src/utils/toml-to-markdown-converter.ts b/packages/airiscode-core/src/utils/toml-to-markdown-converter.ts
index 92f7778c0..4a7659fe1 100644
--- a/packages/airiscode-core/src/utils/toml-to-markdown-converter.ts
+++ b/packages/airiscode-core/src/utils/toml-to-markdown-converter.ts
@@ -8,7 +8,7 @@
  * Converts TOML command files to Markdown format.
  */
 
-import toml from '@iarna/toml';
+import toml from "@iarna/toml";
 
 export interface TomlCommandFormat {
   prompt: string;
@@ -31,19 +31,18 @@ export function convertTomlToMarkdown(tomlContent: string): string {
     );
   }
 
-  if (typeof parsed !== 'object' || parsed === null) {
-    throw new Error('TOML content must be an object');
+  if (typeof parsed !== "object" || parsed === null) {
+    throw new Error("TOML content must be an object");
   }
 
   const obj = parsed as Record<string, unknown>;
 
-  if (typeof obj['prompt'] !== 'string') {
+  if (typeof obj["prompt"] !== "string") {
     throw new Error('TOML must contain a "prompt" field');
   }
 
-  const prompt = obj['prompt'];
-  const description =
-    typeof obj['description'] === 'string' ? obj['description'] : undefined;
+  const prompt = obj["prompt"];
+  const description = typeof obj["description"] === "string" ? obj["description"] : undefined;
 
   // Generate Markdown
   if (description) {
diff --git a/packages/airiscode-core/src/utils/tool-utils.ts b/packages/airiscode-core/src/utils/tool-utils.ts
index fb6f52c75..7055820e4 100644
--- a/packages/airiscode-core/src/utils/tool-utils.ts
+++ b/packages/airiscode-core/src/utils/tool-utils.ts
@@ -4,19 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AnyDeclarativeTool, AnyToolInvocation } from '../index.js';
-import { isTool } from '../index.js';
+import type { AnyDeclarativeTool, AnyToolInvocation } from "../index.js";
+import { isTool } from "../index.js";
 import {
-  ToolNames,
   ToolDisplayNames,
-  ToolNamesMigration,
   ToolDisplayNamesMigration,
-} from '../tools/tool-names.js';
+  ToolNames,
+  ToolNamesMigration,
+} from "../tools/tool-names.js";
 
 export type ToolName = (typeof ToolNames)[keyof typeof ToolNames];
 
-const normalizeIdentifier = (identifier: string): string =>
-  identifier.trim().replace(/^_+/, '');
+const normalizeIdentifier = (identifier: string): string => identifier.trim().replace(/^_+/, "");
 
 const toolNameKeys = Object.keys(ToolNames) as Array<keyof typeof ToolNames>;
 
@@ -45,9 +44,7 @@ const TOOL_ALIAS_MAP: Map<ToolName, Set<string>> = (() => {
       }
     }
 
-    for (const [legacyDisplay, mappedDisplay] of Object.entries(
-      ToolDisplayNamesMigration,
-    )) {
+    for (const [legacyDisplay, mappedDisplay] of Object.entries(ToolDisplayNamesMigration)) {
       if (mappedDisplay === displayName) {
         addAlias(aliases, legacyDisplay);
       }
@@ -67,11 +64,10 @@ const getAliasSetForTool = (toolName: ToolName): Set<string> => {
   return aliases;
 };
 
-const sanitizeExactIdentifier = (value: string): string =>
-  normalizeIdentifier(value);
+const sanitizeExactIdentifier = (value: string): string => normalizeIdentifier(value);
 
 const sanitizePatternIdentifier = (value: string): string => {
-  const openParenIndex = value.indexOf('(');
+  const openParenIndex = value.indexOf("(");
   if (openParenIndex === -1) {
     return normalizeIdentifier(value);
   }
@@ -79,9 +75,7 @@ const sanitizePatternIdentifier = (value: string): string => {
 };
 
 const filterList = (list?: string[]): string[] =>
-  (list ?? []).filter((entry): entry is string =>
-    Boolean(entry && entry.trim()),
-  );
+  (list ?? []).filter((entry): entry is string => Boolean(entry && entry.trim()));
 
 export function isToolEnabled(
   toolName: ToolName,
@@ -112,7 +106,7 @@ export function isToolEnabled(
   return !filteredExclude.some((entry) => matchesIdentifier(entry));
 }
 
-const SHELL_TOOL_NAMES = ['run_shell_command', 'ShellTool'];
+const SHELL_TOOL_NAMES = ["run_shell_command", "ShellTool"];
 
 /**
  * Checks if a tool invocation matches any of a list of patterns.
@@ -143,7 +137,7 @@ export function doesToolInvocationMatch(
   }
 
   for (const pattern of patterns) {
-    const openParen = pattern.indexOf('(');
+    const openParen = pattern.indexOf("(");
 
     if (openParen === -1) {
       // No arguments, just a tool name
@@ -158,20 +152,15 @@ export function doesToolInvocationMatch(
       continue;
     }
 
-    if (!pattern.endsWith(')')) {
+    if (!pattern.endsWith(")")) {
       continue;
     }
 
     const argPattern = pattern.substring(openParen + 1, pattern.length - 1);
 
-    if (
-      'command' in invocation.params &&
-      toolNames.includes('run_shell_command')
-    ) {
-      const argValue = String(
-        (invocation.params as { command: string }).command,
-      );
-      if (argValue === argPattern || argValue.startsWith(argPattern + ' ')) {
+    if ("command" in invocation.params && toolNames.includes("run_shell_command")) {
+      const argValue = String((invocation.params as { command: string }).command);
+      if (argValue === argPattern || argValue.startsWith(argPattern + " ")) {
         return true;
       }
     }
diff --git a/packages/airiscode-core/src/utils/truncation.ts b/packages/airiscode-core/src/utils/truncation.ts
index 6672a1f83..aca017f12 100644
--- a/packages/airiscode-core/src/utils/truncation.ts
+++ b/packages/airiscode-core/src/utils/truncation.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import { ReadFileTool } from '../tools/read-file.js';
-import type { Config } from '../config/config.js';
-import { logToolOutputTruncated } from '../telemetry/loggers.js';
-import { ToolOutputTruncatedEvent } from '../telemetry/types.js';
+import * as crypto from "node:crypto";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { Config } from "../config/config.js";
+import { logToolOutputTruncated } from "../telemetry/loggers.js";
+import { ToolOutputTruncatedEvent } from "../telemetry/types.js";
+import { ReadFileTool } from "../tools/read-file.js";
 
 /**
  * Truncates large tool output and saves the full content to a temp file.
@@ -28,7 +28,7 @@ export async function truncateAndSaveToFile(
   threshold: number,
   truncateLines: number,
 ): Promise<{ content: string; outputFile?: string }> {
-  const lines = content.split('\n');
+  const lines = content.split("\n");
 
   // Check both constraints: character threshold and line limit.
   if (content.length <= threshold && lines.length <= truncateLines) {
@@ -39,8 +39,8 @@ export async function truncateAndSaveToFile(
   const effectiveLines = Math.min(truncateLines, lines.length);
   const headCount = Math.max(Math.floor(effectiveLines / 5), 1);
   const tailCount = effectiveLines - headCount;
-  const separator = '\n\n---\n... [CONTENT TRUNCATED] ...\n---\n\n';
-  const ellipsis = '...';
+  const separator = "\n\n---\n... [CONTENT TRUNCATED] ...\n---\n\n";
+  const ellipsis = "...";
 
   // Collect head lines within budget. If a single line exceeds the
   // remaining budget, include a truncated slice of it.
@@ -79,7 +79,7 @@ export async function truncateAndSaveToFile(
     tailChars += lines[i].length + 1;
   }
 
-  const truncatedContent = beginning.join('\n') + separator + end.join('\n');
+  const truncatedContent = beginning.join("\n") + separator + end.join("\n");
 
   // Sanitize fileName to prevent path traversal.
   const safeFileName = `${path.basename(fileName)}.output`;
@@ -99,8 +99,7 @@ ${truncatedContent}`,
     };
   } catch (_error) {
     return {
-      content:
-        truncatedContent + `\n[Note: Could not save full output to file]`,
+      content: truncatedContent + `\n[Note: Could not save full output to file]`,
     };
   }
 }
@@ -127,7 +126,7 @@ export async function truncateToolOutput(
   }
 
   const originalLength = content.length;
-  const fileName = `${toolName}_${crypto.randomBytes(6).toString('hex')}`;
+  const fileName = `${toolName}_${crypto.randomBytes(6).toString("hex")}`;
   const result = await truncateAndSaveToFile(
     content,
     fileName,
@@ -139,7 +138,7 @@ export async function truncateToolOutput(
   if (result.outputFile) {
     logToolOutputTruncated(
       config,
-      new ToolOutputTruncatedEvent('', {
+      new ToolOutputTruncatedEvent("", {
         toolName,
         originalContentLength: originalLength,
         truncatedContentLength: result.content.length,
diff --git a/packages/airiscode-core/src/utils/workspaceContext.ts b/packages/airiscode-core/src/utils/workspaceContext.ts
index 5f052100d..3a48fe590 100755
--- a/packages/airiscode-core/src/utils/workspaceContext.ts
+++ b/packages/airiscode-core/src/utils/workspaceContext.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isNodeError } from '../utils/errors.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as process from 'node:process';
-import { createDebugLogger } from './debugLogger.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as process from "node:process";
+import { isNodeError } from "../utils/errors.js";
+import { createDebugLogger } from "./debugLogger.js";
 
-const debugLogger = createDebugLogger('WORKSPACE');
+const debugLogger = createDebugLogger("WORKSPACE");
 
 export type Unsubscribe = () => void;
 
@@ -59,7 +59,7 @@ export class WorkspaceContext {
         listener();
       } catch (e) {
         // Don't let one listener break others.
-        debugLogger.error('Error in WorkspaceContext listener:', e);
+        debugLogger.error("Error in WorkspaceContext listener:", e);
       }
     }
   }
@@ -84,13 +84,8 @@ export class WorkspaceContext {
     }
   }
 
-  private resolveAndValidateDir(
-    directory: string,
-    basePath: string = process.cwd(),
-  ): string {
-    const absolutePath = path.isAbsolute(directory)
-      ? directory
-      : path.resolve(basePath, directory);
+  private resolveAndValidateDir(directory: string, basePath: string = process.cwd()): string {
+    const absolutePath = path.isAbsolute(directory) ? directory : path.resolve(basePath, directory);
 
     if (!fs.existsSync(absolutePath)) {
       throw new Error(`Directory does not exist: ${absolutePath}`);
@@ -128,9 +123,7 @@ export class WorkspaceContext {
       resolved = this.resolveAndValidateDir(directory);
     } catch {
       // If we can't resolve it, try matching by raw string (e.g. directory was deleted)
-      resolved = path.isAbsolute(directory)
-        ? directory
-        : path.resolve(process.cwd(), directory);
+      resolved = path.isAbsolute(directory) ? directory : path.resolve(process.cwd(), directory);
     }
 
     if (this.initialDirectories.has(resolved)) {
@@ -208,7 +201,7 @@ export class WorkspaceContext {
     } catch (e: unknown) {
       if (
         isNodeError(e) &&
-        e.code === 'ENOENT' &&
+        e.code === "ENOENT" &&
         e.path &&
         // realpathSync does not set e.path correctly for symlinks to
         // non-existent files.
@@ -226,7 +219,7 @@ export class WorkspaceContext {
    */
   private isFileSymlink(filePath: string): boolean {
     try {
-      return !fs.readlinkSync(filePath).endsWith('/');
+      return !fs.readlinkSync(filePath).endsWith("/");
     } catch (_error) {
       return false;
     }
@@ -239,14 +232,7 @@ export class WorkspaceContext {
  * @param rootDirectory The absolute root directory
  * @returns True if the path is within the root directory, false otherwise
  */
-export function isPathWithinRoot(
-  pathToCheck: string,
-  rootDirectory: string,
-): boolean {
+export function isPathWithinRoot(pathToCheck: string, rootDirectory: string): boolean {
   const relative = path.relative(rootDirectory, pathToCheck);
-  return (
-    !relative.startsWith(`..${path.sep}`) &&
-    relative !== '..' &&
-    !path.isAbsolute(relative)
-  );
+  return !relative.startsWith(`..${path.sep}`) && relative !== ".." && !path.isAbsolute(relative);
 }
diff --git a/packages/airiscode-core/src/utils/yaml-parser.ts b/packages/airiscode-core/src/utils/yaml-parser.ts
index 2ae8dea75..be36ad9de 100644
--- a/packages/airiscode-core/src/utils/yaml-parser.ts
+++ b/packages/airiscode-core/src/utils/yaml-parser.ts
@@ -19,22 +19,22 @@
  */
 export function parse(yamlString: string): Record<string, unknown> {
   const lines = yamlString
-    .split('\n')
-    .filter((line) => line.trim() && !line.trim().startsWith('#'));
+    .split("\n")
+    .filter((line) => line.trim() && !line.trim().startsWith("#"));
   const result: Record<string, unknown> = {};
 
-  let currentKey = '';
+  let currentKey = "";
   let currentArray: unknown[] = [];
   let inArray = false;
   let currentObject: Record<string, unknown> = {};
   let inObject = false;
-  let objectKey = '';
+  let objectKey = "";
 
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
 
     // Handle array items
-    if (line.startsWith('  - ')) {
+    if (line.startsWith("  - ")) {
       if (!inArray) {
         inArray = true;
         currentArray = [];
@@ -45,50 +45,50 @@ export function parse(yamlString: string): Record<string, unknown> {
     }
 
     // End of array
-    if (inArray && !line.startsWith('  - ')) {
+    if (inArray && !line.startsWith("  - ")) {
       result[currentKey] = currentArray;
       inArray = false;
       currentArray = [];
-      currentKey = '';
+      currentKey = "";
     }
 
     // Handle nested object items (simple indentation)
-    if (line.startsWith('  ') && inObject) {
-      const [key, ...valueParts] = line.trim().split(':');
-      const value = valueParts.join(':').trim();
+    if (line.startsWith("  ") && inObject) {
+      const [key, ...valueParts] = line.trim().split(":");
+      const value = valueParts.join(":").trim();
       currentObject[key.trim()] = parseValue(value);
       continue;
     }
 
     // End of object
-    if (inObject && !line.startsWith('  ')) {
+    if (inObject && !line.startsWith("  ")) {
       result[objectKey] = currentObject;
       inObject = false;
       currentObject = {};
-      objectKey = '';
+      objectKey = "";
     }
 
     // Handle key-value pairs
-    if (line.includes(':')) {
-      const [key, ...valueParts] = line.split(':');
-      const value = valueParts.join(':').trim();
+    if (line.includes(":")) {
+      const [key, ...valueParts] = line.split(":");
+      const value = valueParts.join(":").trim();
 
-      if (value === '') {
+      if (value === "") {
         // This might be the start of an object or array
         currentKey = key.trim();
 
         // Look ahead to determine if this is an array or object
         if (i + 1 < lines.length) {
           const nextLine = lines[i + 1];
-          if (nextLine.startsWith('  - ')) {
+          if (nextLine.startsWith("  - ")) {
             // Next line is an array item, so this will be handled in the next iteration
             continue;
-          } else if (nextLine.startsWith('  ')) {
+          } else if (nextLine.startsWith("  ")) {
             // Next line is indented, so this is an object
             inObject = true;
             objectKey = currentKey;
             currentObject = {};
-            currentKey = '';
+            currentKey = "";
             continue;
           }
         }
@@ -128,11 +128,9 @@ export function stringify(
       for (const item of value) {
         lines.push(`  - ${formatValue(item)}`);
       }
-    } else if (typeof value === 'object' && value !== null) {
+    } else if (typeof value === "object" && value !== null) {
       lines.push(`${key}:`);
-      for (const [subKey, subValue] of Object.entries(
-        value as Record<string, unknown>,
-      )) {
+      for (const [subKey, subValue] of Object.entries(value as Record<string, unknown>)) {
         lines.push(`  ${subKey}: ${formatValue(subValue)}`);
       }
     } else {
@@ -140,23 +138,23 @@ export function stringify(
     }
   }
 
-  return lines.join('\n');
+  return lines.join("\n");
 }
 
 /**
  * Parses a value string into appropriate JavaScript type.
  */
 function parseValue(value: string): unknown {
-  if (value === 'true') return true;
-  if (value === 'false') return false;
-  if (value === 'null') return null;
-  if (value === '') return '';
+  if (value === "true") return true;
+  if (value === "false") return false;
+  if (value === "null") return null;
+  if (value === "") return "";
 
   // Handle quoted strings
   if (value.startsWith('"') && value.endsWith('"') && value.length >= 2) {
     const unquoted = value.slice(1, -1);
     // Unescape quotes and backslashes
-    return unquoted.replace(/\\"/g, '"').replace(/\\\\/g, '\\');
+    return unquoted.replace(/\\"/g, '"').replace(/\\\\/g, "\\");
   }
 
   // Try to parse as number
@@ -173,17 +171,17 @@ function parseValue(value: string): unknown {
  * Formats a value for YAML output.
  */
 function formatValue(value: unknown): string {
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     // Quote strings that might be ambiguous or contain special characters
     if (
-      value.includes(':') ||
-      value.includes('#') ||
+      value.includes(":") ||
+      value.includes("#") ||
       value.includes('"') ||
-      value.includes('\\') ||
+      value.includes("\\") ||
       value.trim() !== value
     ) {
       // Escape backslashes THEN quotes
-      return `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
+      return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
     }
     return value;
   }
diff --git a/packages/airiscode-core/test-setup.ts b/packages/airiscode-core/test-setup.ts
index 8d2e7f74a..a669b6deb 100644
--- a/packages/airiscode-core/test-setup.ts
+++ b/packages/airiscode-core/test-setup.ts
@@ -5,16 +5,16 @@
  */
 
 // Unset NO_COLOR environment variable to ensure consistent theme behavior between local and CI test runs
-if (process.env['NO_COLOR'] !== undefined) {
-  delete process.env['NO_COLOR'];
+if (process.env["NO_COLOR"] !== undefined) {
+  delete process.env["NO_COLOR"];
 }
 
-import { setSimulate429 } from './src/utils/testUtils.js';
+import { setSimulate429 } from "./src/utils/testUtils.js";
 
 // Avoid writing per-session debug log files during tests.
 // Unit tests can opt-in by overriding this env var.
-if (process.env['QWEN_DEBUG_LOG_FILE'] === undefined) {
-  process.env['QWEN_DEBUG_LOG_FILE'] = '0';
+if (process.env["QWEN_DEBUG_LOG_FILE"] === undefined) {
+  process.env["QWEN_DEBUG_LOG_FILE"] = "0";
 }
 
 // Disable 429 simulation globally for all tests
@@ -22,6 +22,6 @@ setSimulate429(false);
 
 // Some dependencies (e.g., undici) expect a global File constructor in Node.
 // Provide a minimal shim for test environment if missing.
-if (typeof (globalThis as unknown as { File?: unknown }).File === 'undefined') {
+if (typeof (globalThis as unknown as { File?: unknown }).File === "undefined") {
   (globalThis as unknown as { File: unknown }).File = class {} as unknown;
 }
diff --git a/packages/airiscode-core/vitest.config.ts b/packages/airiscode-core/vitest.config.ts
index b98389125..e3f9c4535 100644
--- a/packages/airiscode-core/vitest.config.ts
+++ b/packages/airiscode-core/vitest.config.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { defineConfig } from 'vitest/config';
+import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
-    reporters: ['default', 'junit'],
+    reporters: ["default", "junit"],
     silent: true,
-    setupFiles: ['./test-setup.ts'],
+    setupFiles: ["./test-setup.ts"],
     outputFile: {
-      junit: 'junit.xml',
+      junit: "junit.xml",
     },
     coverage: {
       enabled: true,
-      provider: 'v8',
-      reportsDirectory: './coverage',
-      include: ['src/**/*'],
+      provider: "v8",
+      reportsDirectory: "./coverage",
+      include: ["src/**/*"],
       reporter: [
-        ['text', { file: 'full-text-summary.txt' }],
-        'html',
-        'json',
-        'lcov',
-        'cobertura',
-        ['json-summary', { outputFile: 'coverage-summary.json' }],
+        ["text", { file: "full-text-summary.txt" }],
+        "html",
+        "json",
+        "lcov",
+        "cobertura",
+        ["json-summary", { outputFile: "coverage-summary.json" }],
       ],
     },
     poolOptions: {
diff --git a/packages/drivers/__tests__/driver.spec.ts b/packages/drivers/__tests__/driver.spec.ts
index 898704d89..96ff3f347 100644
--- a/packages/drivers/__tests__/driver.spec.ts
+++ b/packages/drivers/__tests__/driver.spec.ts
@@ -1,21 +1,21 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { MockDriver } from '../src/mock-driver.js';
-import { DEFAULT_POLICY } from '@airiscode/policies';
+import { DEFAULT_POLICY } from "@airiscode/policies";
+import { beforeEach, describe, expect, it } from "vitest";
+import { MockDriver } from "../src/mock-driver.js";
 
-describe('@airiscode/drivers - ModelDriver', () => {
+describe("@airiscode/drivers - ModelDriver", () => {
   let driver: MockDriver;
 
   beforeEach(() => {
     driver = new MockDriver({
       responses: [
-        { text: 'Hello, how can I help you?' },
+        { text: "Hello, how can I help you?" },
         {
-          text: 'I will call a tool',
+          text: "I will call a tool",
           toolCalls: [
             {
-              id: 'call_123',
-              name: 'get_weather',
-              arguments: { location: 'Tokyo' },
+              id: "call_123",
+              name: "get_weather",
+              arguments: { location: "Tokyo" },
             },
           ],
         },
@@ -23,77 +23,77 @@ describe('@airiscode/drivers - ModelDriver', () => {
     });
   });
 
-  describe('getCapabilities', () => {
-    it('should return driver capabilities', async () => {
+  describe("getCapabilities", () => {
+    it("should return driver capabilities", async () => {
       const capabilities = await driver.getCapabilities();
 
       expect(capabilities.models).toHaveLength(2);
       expect(capabilities.supportsTools).toBe(true);
       expect(capabilities.supportsStream).toBe(true);
-      expect(capabilities.apiVersion).toBe('1.0.0-mock');
+      expect(capabilities.apiVersion).toBe("1.0.0-mock");
     });
   });
 
-  describe('chat', () => {
-    it('should perform synchronous chat', async () => {
+  describe("chat", () => {
+    it("should perform synchronous chat", async () => {
       const response = await driver.chat({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'Hello' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "Hello" }],
         policy: DEFAULT_POLICY,
       });
 
-      expect(response.text).toBe('Hello, how can I help you?');
+      expect(response.text).toBe("Hello, how can I help you?");
       expect(response.incomplete).toBe(false);
       expect(response.usage).toBeDefined();
-      expect(response.finishReason).toBe('stop');
+      expect(response.finishReason).toBe("stop");
     });
 
-    it('should handle tool calls', async () => {
+    it("should handle tool calls", async () => {
       // First call
       await driver.chat({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'Hello' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "Hello" }],
         policy: DEFAULT_POLICY,
       });
 
       // Second call with tool
       const response = await driver.chat({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'What is the weather?' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "What is the weather?" }],
         policy: DEFAULT_POLICY,
       });
 
-      expect(response.text).toBe('I will call a tool');
+      expect(response.text).toBe("I will call a tool");
       expect(response.toolCalls).toHaveLength(1);
-      expect(response.toolCalls![0].name).toBe('get_weather');
-      expect(response.toolCalls![0].arguments).toEqual({ location: 'Tokyo' });
-      expect(response.finishReason).toBe('tool_calls');
+      expect(response.toolCalls![0].name).toBe("get_weather");
+      expect(response.toolCalls![0].arguments).toEqual({ location: "Tokyo" });
+      expect(response.finishReason).toBe("tool_calls");
     });
 
-    it('should validate request', async () => {
+    it("should validate request", async () => {
       await expect(
         driver.chat({
-          sessionId: '',
-          messages: [{ role: 'user', content: 'Hello' }],
+          sessionId: "",
+          messages: [{ role: "user", content: "Hello" }],
           policy: DEFAULT_POLICY,
-        })
-      ).rejects.toThrow('Session ID is required');
+        }),
+      ).rejects.toThrow("Session ID is required");
 
       await expect(
         driver.chat({
-          sessionId: 'test-session',
+          sessionId: "test-session",
           messages: [],
           policy: DEFAULT_POLICY,
-        })
-      ).rejects.toThrow('Messages array cannot be empty');
+        }),
+      ).rejects.toThrow("Messages array cannot be empty");
     });
 
-    it('should calculate token usage', async () => {
+    it("should calculate token usage", async () => {
       const response = await driver.chat({
-        sessionId: 'test-session',
+        sessionId: "test-session",
         messages: [
-          { role: 'system', content: 'You are a helpful assistant' },
-          { role: 'user', content: 'Hello' },
+          { role: "system", content: "You are a helpful assistant" },
+          { role: "user", content: "Hello" },
         ],
         policy: DEFAULT_POLICY,
       });
@@ -102,19 +102,19 @@ describe('@airiscode/drivers - ModelDriver', () => {
       expect(response.usage!.promptTokens).toBeGreaterThan(0);
       expect(response.usage!.completionTokens).toBeGreaterThan(0);
       expect(response.usage!.totalTokens).toBe(
-        response.usage!.promptTokens + response.usage!.completionTokens
+        response.usage!.promptTokens + response.usage!.completionTokens,
       );
     });
   });
 
-  describe('chatStream', () => {
-    it('should stream chat responses', async () => {
+  describe("chatStream", () => {
+    it("should stream chat responses", async () => {
       const chunks: string[] = [];
       let finalResponse;
 
       for await (const chunk of driver.chatStream({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'Hello' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "Hello" }],
         policy: DEFAULT_POLICY,
       })) {
         if (chunk.delta) {
@@ -125,17 +125,17 @@ describe('@airiscode/drivers - ModelDriver', () => {
         }
       }
 
-      expect(chunks.join('')).toBe('Hello, how can I help you?');
+      expect(chunks.join("")).toBe("Hello, how can I help you?");
       expect(finalResponse).toBeDefined();
-      expect(finalResponse!.text).toBe('Hello, how can I help you?');
+      expect(finalResponse!.text).toBe("Hello, how can I help you?");
     });
 
-    it('should emit done chunk at the end', async () => {
+    it("should emit done chunk at the end", async () => {
       let doneCount = 0;
 
       for await (const chunk of driver.chatStream({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'Hi' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "Hi" }],
         policy: DEFAULT_POLICY,
       })) {
         if (chunk.done) {
@@ -147,81 +147,81 @@ describe('@airiscode/drivers - ModelDriver', () => {
     });
   });
 
-  describe('MockDriver specific', () => {
-    it('should cycle through responses', async () => {
-      driver.setResponses([{ text: 'Response 1' }, { text: 'Response 2' }]);
+  describe("MockDriver specific", () => {
+    it("should cycle through responses", async () => {
+      driver.setResponses([{ text: "Response 1" }, { text: "Response 2" }]);
 
       const response1 = await driver.chat({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
       const response2 = await driver.chat({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
       const response3 = await driver.chat({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
-      expect(response1.text).toBe('Response 1');
-      expect(response2.text).toBe('Response 2');
-      expect(response3.text).toBe('Response 1'); // Cycles back
+      expect(response1.text).toBe("Response 1");
+      expect(response2.text).toBe("Response 2");
+      expect(response3.text).toBe("Response 1"); // Cycles back
     });
 
-    it('should reset response index', async () => {
+    it("should reset response index", async () => {
       const response1 = await driver.chat({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
       driver.reset();
 
       const response2 = await driver.chat({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
       expect(response1.text).toBe(response2.text);
     });
 
-    it('should add responses dynamically', async () => {
+    it("should add responses dynamically", async () => {
       driver.reset();
-      driver.setResponses([{ text: 'Initial' }]);
+      driver.setResponses([{ text: "Initial" }]);
 
       const response1 = await driver.chat({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
-      driver.addResponse({ text: 'Added' });
+      driver.addResponse({ text: "Added" });
 
       const response2 = await driver.chat({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
-      expect(response1.text).toBe('Initial');
-      expect(response2.text).toBe('Added');
+      expect(response1.text).toBe("Initial");
+      expect(response2.text).toBe("Added");
     });
   });
 
-  describe('configuration', () => {
-    it('should get configuration', () => {
+  describe("configuration", () => {
+    it("should get configuration", () => {
       const config = driver.getConfig();
       expect(config.timeout).toBe(120000);
     });
 
-    it('should update configuration', () => {
+    it("should update configuration", () => {
       driver.updateConfig({ timeout: 60000 });
       const config = driver.getConfig();
       expect(config.timeout).toBe(60000);
diff --git a/packages/drivers/anthropic/src/contentGenerator.ts b/packages/drivers/anthropic/src/contentGenerator.ts
index b8d467d41..efe546448 100644
--- a/packages/drivers/anthropic/src/contentGenerator.ts
+++ b/packages/drivers/anthropic/src/contentGenerator.ts
@@ -6,12 +6,12 @@
 
 import type {
   ContentGenerator,
-  GenerateContentResponse,
-  GenerateContentParameters,
-  CountTokensResponse,
   CountTokensParameters,
-  EmbedContentResponse,
+  CountTokensResponse,
   EmbedContentParameters,
+  EmbedContentResponse,
+  GenerateContentParameters,
+  GenerateContentResponse,
 } from "@airiscode/core-gemini";
 
 export interface AnthropicOptions {
@@ -25,13 +25,11 @@ export class AnthropicContentGenerator implements ContentGenerator {
 
   async generateContent(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): Promise<GenerateContentResponse> {
     const url = `${this.opts.baseUrl ?? "https://api.anthropic.com"}/v1/messages`;
 
-    const messages = req.messages || [
-      { role: "user", content: req.prompt || "" }
-    ];
+    const messages = req.messages || [{ role: "user", content: req.prompt || "" }];
 
     const body: any = {
       model: this.opts.model,
@@ -65,20 +63,18 @@ export class AnthropicContentGenerator implements ContentGenerator {
 
   async generateContentStream(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     return this._generateContentStream(req, userPromptId);
   }
 
   private async *_generateContentStream(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): AsyncGenerator<GenerateContentResponse> {
     const url = `${this.opts.baseUrl ?? "https://api.anthropic.com"}/v1/messages`;
 
-    const messages = req.messages || [
-      { role: "user", content: req.prompt || "" }
-    ];
+    const messages = req.messages || [{ role: "user", content: req.prompt || "" }];
 
     const body: any = {
       model: this.opts.model,
@@ -136,7 +132,7 @@ export class AnthropicContentGenerator implements ContentGenerator {
               yield { content, raw: json };
             }
           }
-        } catch (e) {
+        } catch {
           // Skip invalid JSON
         }
       }
diff --git a/packages/drivers/anthropic/src/index.ts b/packages/drivers/anthropic/src/index.ts
index 663bb8866..e541787d9 100644
--- a/packages/drivers/anthropic/src/index.ts
+++ b/packages/drivers/anthropic/src/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: MIT
  */
 
-export * from './contentGenerator.js';
+export * from "./contentGenerator.js";
diff --git a/packages/drivers/local/__tests__/ollama-driver.spec.ts b/packages/drivers/local/__tests__/ollama-driver.spec.ts
index a4ea6cc0c..23ac7a5c3 100644
--- a/packages/drivers/local/__tests__/ollama-driver.spec.ts
+++ b/packages/drivers/local/__tests__/ollama-driver.spec.ts
@@ -1,17 +1,17 @@
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { OllamaDriver } from '../src/ollama-driver.js';
-import { DEFAULT_POLICY } from '@airiscode/policies';
-import { DriverAPIError, DriverTimeoutError } from '@airiscode/drivers';
+import { DriverAPIError, DriverTimeoutError } from "@airiscode/drivers";
+import { DEFAULT_POLICY } from "@airiscode/policies";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { OllamaDriver } from "../src/ollama-driver.js";
 
 // Mock fetch globally
 global.fetch = vi.fn();
 
-describe('@airiscode/drivers-local - OllamaDriver', () => {
+describe("@airiscode/drivers-local - OllamaDriver", () => {
   let driver: OllamaDriver;
 
   beforeEach(() => {
     driver = new OllamaDriver({
-      baseUrl: 'http://localhost:11434',
+      baseUrl: "http://localhost:11434",
       timeout: 5000,
     });
     vi.clearAllMocks();
@@ -21,21 +21,21 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
     vi.restoreAllMocks();
   });
 
-  describe('getCapabilities', () => {
-    it('should fetch available models', async () => {
+  describe("getCapabilities", () => {
+    it("should fetch available models", async () => {
       const mockResponse = {
         models: [
           {
-            name: 'qwen2.5-coder:7b',
-            modified_at: '2024-01-01T00:00:00Z',
+            name: "qwen2.5-coder:7b",
+            modified_at: "2024-01-01T00:00:00Z",
             size: 4661211808,
-            digest: 'abc123',
+            digest: "abc123",
           },
           {
-            name: 'llama3.1:8b',
-            modified_at: '2024-01-01T00:00:00Z',
+            name: "llama3.1:8b",
+            modified_at: "2024-01-01T00:00:00Z",
             size: 4661211808,
-            digest: 'def456',
+            digest: "def456",
           },
         ],
       };
@@ -48,32 +48,32 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
       const capabilities = await driver.getCapabilities();
 
       expect(capabilities.models).toHaveLength(2);
-      expect(capabilities.models).toContain('qwen2.5-coder:7b');
-      expect(capabilities.models).toContain('llama3.1:8b');
+      expect(capabilities.models).toContain("qwen2.5-coder:7b");
+      expect(capabilities.models).toContain("llama3.1:8b");
       expect(capabilities.supportsTools).toBe(true);
       expect(capabilities.supportsStream).toBe(true);
     });
 
-    it('should handle API errors', async () => {
+    it("should handle API errors", async () => {
       vi.mocked(fetch).mockResolvedValueOnce({
         ok: false,
         status: 500,
-        statusText: 'Internal Server Error',
-        text: async () => 'Server error',
+        statusText: "Internal Server Error",
+        text: async () => "Server error",
       } as Response);
 
       await expect(driver.getCapabilities()).rejects.toThrow(DriverAPIError);
     });
   });
 
-  describe('chat', () => {
-    it('should perform synchronous chat', async () => {
+  describe("chat", () => {
+    it("should perform synchronous chat", async () => {
       const mockResponse = {
-        model: 'qwen2.5-coder:7b',
-        created_at: '2024-01-01T00:00:00Z',
+        model: "qwen2.5-coder:7b",
+        created_at: "2024-01-01T00:00:00Z",
         message: {
-          role: 'assistant',
-          content: 'Hello! How can I help you today?',
+          role: "assistant",
+          content: "Hello! How can I help you today?",
         },
         done: true,
         prompt_eval_count: 10,
@@ -86,30 +86,30 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
       } as Response);
 
       const response = await driver.chat({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'Hello' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "Hello" }],
         policy: DEFAULT_POLICY,
       });
 
-      expect(response.text).toBe('Hello! How can I help you today?');
+      expect(response.text).toBe("Hello! How can I help you today?");
       expect(response.incomplete).toBe(false);
-      expect(response.finishReason).toBe('stop');
+      expect(response.finishReason).toBe("stop");
       expect(response.usage?.promptTokens).toBe(10);
       expect(response.usage?.completionTokens).toBe(8);
     });
 
-    it('should handle tool calls', async () => {
+    it("should handle tool calls", async () => {
       const mockResponse = {
-        model: 'qwen2.5-coder:7b',
-        created_at: '2024-01-01T00:00:00Z',
+        model: "qwen2.5-coder:7b",
+        created_at: "2024-01-01T00:00:00Z",
         message: {
-          role: 'assistant',
-          content: 'I will check the weather for you.',
+          role: "assistant",
+          content: "I will check the weather for you.",
           tool_calls: [
             {
               function: {
-                name: 'get_weather',
-                arguments: { location: 'Tokyo', unit: 'celsius' },
+                name: "get_weather",
+                arguments: { location: "Tokyo", unit: "celsius" },
               },
             },
           ],
@@ -125,17 +125,17 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
       } as Response);
 
       const response = await driver.chat({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'What is the weather in Tokyo?' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "What is the weather in Tokyo?" }],
         tools: [
           {
-            name: 'get_weather',
-            description: 'Get weather information',
+            name: "get_weather",
+            description: "Get weather information",
             parameters: {
-              type: 'object',
+              type: "object",
               properties: {
-                location: { type: 'string' },
-                unit: { type: 'string', enum: ['celsius', 'fahrenheit'] },
+                location: { type: "string" },
+                unit: { type: "string", enum: ["celsius", "fahrenheit"] },
               },
             },
           },
@@ -143,21 +143,21 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
         policy: DEFAULT_POLICY,
       });
 
-      expect(response.text).toBe('I will check the weather for you.');
+      expect(response.text).toBe("I will check the weather for you.");
       expect(response.toolCalls).toHaveLength(1);
-      expect(response.toolCalls![0].name).toBe('get_weather');
+      expect(response.toolCalls![0].name).toBe("get_weather");
       expect(response.toolCalls![0].arguments).toEqual({
-        location: 'Tokyo',
-        unit: 'celsius',
+        location: "Tokyo",
+        unit: "celsius",
       });
-      expect(response.finishReason).toBe('tool_calls');
+      expect(response.finishReason).toBe("tool_calls");
     });
 
-    it('should include temperature and maxTokens in options', async () => {
+    it("should include temperature and maxTokens in options", async () => {
       const mockResponse = {
-        model: 'qwen2.5-coder:7b',
-        created_at: '2024-01-01T00:00:00Z',
-        message: { role: 'assistant', content: 'Response' },
+        model: "qwen2.5-coder:7b",
+        created_at: "2024-01-01T00:00:00Z",
+        message: { role: "assistant", content: "Response" },
         done: true,
       };
 
@@ -167,8 +167,8 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
       } as Response);
 
       await driver.chat({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
         temperature: 0.7,
         maxTokens: 100,
@@ -181,45 +181,45 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
       expect(requestBody.options.num_predict).toBe(100);
     });
 
-    it('should handle timeout', async () => {
+    it("should handle timeout", async () => {
       vi.mocked(fetch).mockImplementationOnce(
         () =>
           new Promise((_, reject) => {
-            setTimeout(() => reject(new Error('AbortError')), 100);
-          })
+            setTimeout(() => reject(new Error("AbortError")), 100);
+          }),
       );
 
       const timeoutDriver = new OllamaDriver({ timeout: 50 });
 
       await expect(
         timeoutDriver.chat({
-          sessionId: 'test',
-          messages: [{ role: 'user', content: 'Test' }],
+          sessionId: "test",
+          messages: [{ role: "user", content: "Test" }],
           policy: DEFAULT_POLICY,
-        })
+        }),
       ).rejects.toThrow();
     });
   });
 
-  describe('chatStream', () => {
-    it('should stream chat responses', async () => {
+  describe("chatStream", () => {
+    it("should stream chat responses", async () => {
       const mockStreamData = [
         {
-          model: 'qwen2.5-coder:7b',
-          created_at: '2024-01-01T00:00:00Z',
-          message: { role: 'assistant', content: 'Hello' },
+          model: "qwen2.5-coder:7b",
+          created_at: "2024-01-01T00:00:00Z",
+          message: { role: "assistant", content: "Hello" },
           done: false,
         },
         {
-          model: 'qwen2.5-coder:7b',
-          created_at: '2024-01-01T00:00:00Z',
-          message: { role: 'assistant', content: ', how' },
+          model: "qwen2.5-coder:7b",
+          created_at: "2024-01-01T00:00:00Z",
+          message: { role: "assistant", content: ", how" },
           done: false,
         },
         {
-          model: 'qwen2.5-coder:7b',
-          created_at: '2024-01-01T00:00:00Z',
-          message: { role: 'assistant', content: ' are you?' },
+          model: "qwen2.5-coder:7b",
+          created_at: "2024-01-01T00:00:00Z",
+          message: { role: "assistant", content: " are you?" },
           done: true,
           prompt_eval_count: 5,
           eval_count: 10,
@@ -230,7 +230,7 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
       const stream = new ReadableStream({
         start(controller) {
           for (const data of mockStreamData) {
-            controller.enqueue(encoder.encode(JSON.stringify(data) + '\n'));
+            controller.enqueue(encoder.encode(JSON.stringify(data) + "\n"));
           }
           controller.close();
         },
@@ -245,8 +245,8 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
       let finalResponse;
 
       for await (const chunk of driver.chatStream({
-        sessionId: 'test-session',
-        messages: [{ role: 'user', content: 'Hello' }],
+        sessionId: "test-session",
+        messages: [{ role: "user", content: "Hello" }],
         policy: DEFAULT_POLICY,
       })) {
         if (chunk.delta) {
@@ -257,22 +257,22 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
         }
       }
 
-      expect(chunks.join('')).toBe('Hello, how are you?');
+      expect(chunks.join("")).toBe("Hello, how are you?");
       expect(finalResponse).toBeDefined();
-      expect(finalResponse!.text).toBe('Hello, how are you?');
+      expect(finalResponse!.text).toBe("Hello, how are you?");
       expect(finalResponse!.usage?.promptTokens).toBe(5);
       expect(finalResponse!.usage?.completionTokens).toBe(10);
     });
 
-    it('should handle streaming errors', async () => {
+    it("should handle streaming errors", async () => {
       vi.mocked(fetch).mockResolvedValueOnce({
         ok: true,
         body: null,
       } as Response);
 
       const streamIterator = driver.chatStream({
-        sessionId: 'test',
-        messages: [{ role: 'user', content: 'Test' }],
+        sessionId: "test",
+        messages: [{ role: "user", content: "Test" }],
         policy: DEFAULT_POLICY,
       });
 
@@ -280,43 +280,43 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
     });
   });
 
-  describe('request validation', () => {
-    it('should validate session ID', async () => {
+  describe("request validation", () => {
+    it("should validate session ID", async () => {
       await expect(
         driver.chat({
-          sessionId: '',
-          messages: [{ role: 'user', content: 'Test' }],
+          sessionId: "",
+          messages: [{ role: "user", content: "Test" }],
           policy: DEFAULT_POLICY,
-        })
-      ).rejects.toThrow('Session ID is required');
+        }),
+      ).rejects.toThrow("Session ID is required");
     });
 
-    it('should validate messages array', async () => {
+    it("should validate messages array", async () => {
       await expect(
         driver.chat({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
           policy: DEFAULT_POLICY,
-        })
-      ).rejects.toThrow('Messages array cannot be empty');
+        }),
+      ).rejects.toThrow("Messages array cannot be empty");
     });
 
-    it('should validate temperature range', async () => {
+    it("should validate temperature range", async () => {
       await expect(
         driver.chat({
-          sessionId: 'test',
-          messages: [{ role: 'user', content: 'Test' }],
+          sessionId: "test",
+          messages: [{ role: "user", content: "Test" }],
           policy: DEFAULT_POLICY,
           temperature: 3.0, // Invalid: > 2
-        })
-      ).rejects.toThrow('Temperature must be between 0 and 2');
+        }),
+      ).rejects.toThrow("Temperature must be between 0 and 2");
     });
   });
 
-  describe('configuration', () => {
-    it('should use custom base URL', async () => {
+  describe("configuration", () => {
+    it("should use custom base URL", async () => {
       const customDriver = new OllamaDriver({
-        baseUrl: 'http://custom-server:8080',
+        baseUrl: "http://custom-server:8080",
       });
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -326,19 +326,16 @@ describe('@airiscode/drivers-local - OllamaDriver', () => {
 
       await customDriver.getCapabilities();
 
-      expect(fetch).toHaveBeenCalledWith(
-        'http://custom-server:8080/api/tags',
-        expect.any(Object)
-      );
+      expect(fetch).toHaveBeenCalledWith("http://custom-server:8080/api/tags", expect.any(Object));
     });
 
-    it('should use default model from config', () => {
+    it("should use default model from config", () => {
       const driverWithDefault = new OllamaDriver({
-        defaultModel: 'llama3.1:8b',
+        defaultModel: "llama3.1:8b",
       });
 
       const config = driverWithDefault.getConfig();
-      expect(config.defaultModel).toBe('llama3.1:8b');
+      expect(config.defaultModel).toBe("llama3.1:8b");
     });
   });
 });
diff --git a/packages/drivers/local/package.json b/packages/drivers/local/package.json
index 48f9a0202..af0ac3806 100644
--- a/packages/drivers/local/package.json
+++ b/packages/drivers/local/package.json
@@ -15,7 +15,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/drivers/local/src/index.ts b/packages/drivers/local/src/index.ts
index bcdcc2df8..e04ed363e 100644
--- a/packages/drivers/local/src/index.ts
+++ b/packages/drivers/local/src/index.ts
@@ -3,5 +3,5 @@
  * Local LLM driver (Ollama, MLX)
  */
 
-export * from './ollama-driver.js';
-export * from './types.js';
+export * from "./ollama-driver.js";
+export * from "./types.js";
diff --git a/packages/drivers/local/src/ollama-driver.ts b/packages/drivers/local/src/ollama-driver.ts
index 2ef8ae12c..4c3273d97 100644
--- a/packages/drivers/local/src/ollama-driver.ts
+++ b/packages/drivers/local/src/ollama-driver.ts
@@ -2,20 +2,20 @@
  * Ollama driver implementation
  */
 
-import { ModelDriver, DriverAPIError, DriverTimeoutError } from '@airiscode/drivers';
 import type {
+  Capabilities,
   ChatRequest,
   ChatResponse,
-  Capabilities,
-  StreamChunk,
   DriverConfig,
-} from '@airiscode/drivers';
+  StreamChunk,
+} from "@airiscode/drivers";
+import { DriverAPIError, DriverTimeoutError, ModelDriver } from "@airiscode/drivers";
 import type {
   OllamaChatRequest,
   OllamaChatResponse,
   OllamaListResponse,
   OllamaTool,
-} from './types.js';
+} from "./types.js";
 
 /**
  * Ollama driver configuration
@@ -35,12 +35,12 @@ export class OllamaDriver extends ModelDriver {
 
   constructor(config: OllamaDriverConfig = {}) {
     super(config);
-    this.baseUrl = config.baseUrl || 'http://localhost:11434';
+    this.baseUrl = config.baseUrl || "http://localhost:11434";
   }
 
   async getCapabilities(): Promise<Capabilities> {
     try {
-      const response = await this.fetch('/api/tags');
+      const response = await this.fetch("/api/tags");
       const data = (await response.json()) as OllamaListResponse;
 
       return {
@@ -48,13 +48,13 @@ export class OllamaDriver extends ModelDriver {
         supportsTools: true,
         supportsStream: true,
         maxContextTokens: 128000, // Varies by model
-        apiVersion: '1.0.0',
+        apiVersion: "1.0.0",
       };
     } catch (error) {
       throw new DriverAPIError(
-        `Failed to get capabilities: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Failed to get capabilities: ${error instanceof Error ? error.message : "Unknown error"}`,
         undefined,
-        error
+        error,
       );
     }
   }
@@ -65,8 +65,8 @@ export class OllamaDriver extends ModelDriver {
     const ollamaRequest = this.buildOllamaRequest(request, false);
 
     try {
-      const response = await this.fetch('/api/chat', {
-        method: 'POST',
+      const response = await this.fetch("/api/chat", {
+        method: "POST",
         body: JSON.stringify(ollamaRequest),
       });
 
@@ -78,9 +78,9 @@ export class OllamaDriver extends ModelDriver {
         throw error;
       }
       throw new DriverAPIError(
-        `Chat request failed: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Chat request failed: ${error instanceof Error ? error.message : "Unknown error"}`,
         undefined,
-        error
+        error,
       );
     }
   }
@@ -91,27 +91,27 @@ export class OllamaDriver extends ModelDriver {
     const ollamaRequest = this.buildOllamaRequest(request, true);
 
     try {
-      const response = await this.fetch('/api/chat', {
-        method: 'POST',
+      const response = await this.fetch("/api/chat", {
+        method: "POST",
         body: JSON.stringify(ollamaRequest),
       });
 
       if (!response.body) {
-        throw new DriverAPIError('No response body for streaming');
+        throw new DriverAPIError("No response body for streaming");
       }
 
       const reader = response.body.getReader();
       const decoder = new TextDecoder();
-      let buffer = '';
-      let fullText = '';
+      let buffer = "";
+      let fullText = "";
 
       while (true) {
         const { done, value } = await reader.read();
         if (done) break;
 
         buffer += decoder.decode(value, { stream: true });
-        const lines = buffer.split('\n');
-        buffer = lines.pop() || '';
+        const lines = buffer.split("\n");
+        buffer = lines.pop() || "";
 
         for (const line of lines) {
           if (line.trim()) {
@@ -144,9 +144,9 @@ export class OllamaDriver extends ModelDriver {
         throw error;
       }
       throw new DriverAPIError(
-        `Stream request failed: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Stream request failed: ${error instanceof Error ? error.message : "Unknown error"}`,
         undefined,
-        error
+        error,
       );
     }
   }
@@ -173,7 +173,7 @@ export class OllamaDriver extends ModelDriver {
 
     if (request.tools && request.tools.length > 0) {
       ollamaRequest.tools = request.tools.map((t) => ({
-        type: 'function',
+        type: "function",
         function: {
           name: t.name,
           description: t.description,
@@ -204,7 +204,7 @@ export class OllamaDriver extends ModelDriver {
         completionTokens: data.eval_count || 0,
         totalTokens: (data.prompt_eval_count || 0) + (data.eval_count || 0),
       },
-      finishReason: toolCalls ? 'tool_calls' : data.done ? 'stop' : 'length',
+      finishReason: toolCalls ? "tool_calls" : data.done ? "stop" : "length",
     };
   }
 
@@ -217,16 +217,16 @@ export class OllamaDriver extends ModelDriver {
       method?: string;
       headers?: Record<string, string>;
       body?: string;
-    }
+    },
   ): Promise<Response> {
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
 
     try {
       const response = await fetch(`${this.baseUrl}${path}`, {
-        method: options?.method || 'GET',
+        method: options?.method || "GET",
         headers: {
-          'Content-Type': 'application/json',
+          "Content-Type": "application/json",
           ...this.config.headers,
           ...options?.headers,
         },
@@ -238,13 +238,13 @@ export class OllamaDriver extends ModelDriver {
         throw new DriverAPIError(
           `HTTP ${response.status}: ${response.statusText}`,
           response.status,
-          await response.text()
+          await response.text(),
         );
       }
 
       return response;
     } catch (error) {
-      if (error instanceof Error && error.name === 'AbortError') {
+      if (error instanceof Error && error.name === "AbortError") {
         throw new DriverTimeoutError(`Request timed out after ${this.config.timeout}ms`);
       }
       throw error;
diff --git a/packages/drivers/local/src/types.ts b/packages/drivers/local/src/types.ts
index d84182476..b990f3c63 100644
--- a/packages/drivers/local/src/types.ts
+++ b/packages/drivers/local/src/types.ts
@@ -15,7 +15,7 @@ export interface OllamaMessage {
  * Ollama tool definition
  */
 export interface OllamaTool {
-  type: 'function';
+  type: "function";
   function: {
     name: string;
     description: string;
@@ -30,7 +30,7 @@ export interface OllamaChatRequest {
   model: string;
   messages: OllamaMessage[];
   stream?: boolean;
-  format?: 'json';
+  format?: "json";
   options?: {
     temperature?: number;
     top_p?: number;
diff --git a/packages/drivers/ollama/src/contentGenerator.ts b/packages/drivers/ollama/src/contentGenerator.ts
index 5ded2333c..d219e5247 100644
--- a/packages/drivers/ollama/src/contentGenerator.ts
+++ b/packages/drivers/ollama/src/contentGenerator.ts
@@ -6,12 +6,12 @@
 
 import type {
   ContentGenerator,
-  GenerateContentResponse,
-  GenerateContentParameters,
-  CountTokensResponse,
   CountTokensParameters,
-  EmbedContentResponse,
+  CountTokensResponse,
   EmbedContentParameters,
+  EmbedContentResponse,
+  GenerateContentParameters,
+  GenerateContentResponse,
 } from "@airiscode/core-gemini";
 
 export interface OllamaOptions {
@@ -24,13 +24,13 @@ export class OllamaContentGenerator implements ContentGenerator {
 
   async generateContent(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): Promise<GenerateContentResponse> {
     const url = `${this.opts.baseUrl ?? "http://127.0.0.1:11434"}/api/chat`;
 
     const messages = req.messages || [
       ...(req.systemInstruction ? [{ role: "system", content: req.systemInstruction }] : []),
-      { role: "user", content: req.prompt || "" }
+      { role: "user", content: req.prompt || "" },
     ];
 
     const r = await fetch(url, {
@@ -55,20 +55,20 @@ export class OllamaContentGenerator implements ContentGenerator {
 
   async generateContentStream(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     return this._generateContentStream(req, userPromptId);
   }
 
   private async *_generateContentStream(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): AsyncGenerator<GenerateContentResponse> {
     const url = `${this.opts.baseUrl ?? "http://127.0.0.1:11434"}/api/chat`;
 
     const messages = req.messages || [
       ...(req.systemInstruction ? [{ role: "system", content: req.systemInstruction }] : []),
-      { role: "user", content: req.prompt || "" }
+      { role: "user", content: req.prompt || "" },
     ];
 
     const r = await fetch(url, {
@@ -115,7 +115,7 @@ export class OllamaContentGenerator implements ContentGenerator {
           if (json.done) {
             break;
           }
-        } catch (e) {
+        } catch {
           // Skip invalid JSON
         }
       }
diff --git a/packages/drivers/ollama/src/index.ts b/packages/drivers/ollama/src/index.ts
index 663bb8866..e541787d9 100644
--- a/packages/drivers/ollama/src/index.ts
+++ b/packages/drivers/ollama/src/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: MIT
  */
 
-export * from './contentGenerator.js';
+export * from "./contentGenerator.js";
diff --git a/packages/drivers/ollama/src/ollama-driver.ts b/packages/drivers/ollama/src/ollama-driver.ts
index 9141a1b25..a4089433e 100644
--- a/packages/drivers/ollama/src/ollama-driver.ts
+++ b/packages/drivers/ollama/src/ollama-driver.ts
@@ -5,17 +5,17 @@
  * Supports tool calling via Ollama's function calling API.
  */
 
-import { ModelDriver } from '@airiscode/drivers';
 import type {
+  Capabilities,
+  ChatMessage,
   ChatRequest,
   ChatResponse,
-  Capabilities,
   DriverConfig,
   StreamChunk,
-  ChatMessage,
-  ToolSpec,
   ToolCall,
-} from '@airiscode/drivers';
+  ToolSpec,
+} from "@airiscode/drivers";
+import { ModelDriver } from "@airiscode/drivers";
 
 export interface OllamaConfig extends DriverConfig {
   baseUrl?: string;
@@ -28,7 +28,7 @@ interface OllamaMessage {
 }
 
 interface OllamaTool {
-  type: 'function';
+  type: "function";
   function: {
     name: string;
     description: string;
@@ -60,10 +60,10 @@ export class OllamaDriver extends ModelDriver {
   constructor(config: OllamaConfig = {}) {
     super({
       timeout: 120000,
-      defaultModel: 'llama3.1:8b',
+      defaultModel: "llama3.1:8b",
       ...config,
     });
-    this.baseUrl = config.baseUrl || 'http://localhost:11434';
+    this.baseUrl = config.baseUrl || "http://localhost:11434";
   }
 
   async getCapabilities(): Promise<Capabilities> {
@@ -85,11 +85,11 @@ export class OllamaDriver extends ModelDriver {
         supportsTools: true, // Ollama supports function calling
         supportsStream: true,
         maxContextTokens: 8192, // Varies by model
-        apiVersion: '1.0',
+        apiVersion: "1.0",
       };
     } catch (error) {
       throw new Error(
-        `Failed to get Ollama capabilities: ${error instanceof Error ? error.message : String(error)}`
+        `Failed to get Ollama capabilities: ${error instanceof Error ? error.message : String(error)}`,
       );
     }
   }
@@ -117,8 +117,8 @@ export class OllamaDriver extends ModelDriver {
 
     try {
       const response = await fetch(`${this.baseUrl}/api/chat`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
         body: JSON.stringify(payload),
         signal: AbortSignal.timeout(this.config.timeout || 120000),
       });
@@ -132,7 +132,7 @@ export class OllamaDriver extends ModelDriver {
       return this.parseResponse(data);
     } catch (error) {
       throw new Error(
-        `Ollama chat failed: ${error instanceof Error ? error.message : String(error)}`
+        `Ollama chat failed: ${error instanceof Error ? error.message : String(error)}`,
       );
     }
   }
@@ -160,8 +160,8 @@ export class OllamaDriver extends ModelDriver {
 
     try {
       const response = await fetch(`${this.baseUrl}/api/chat`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
         body: JSON.stringify(payload),
         signal: AbortSignal.timeout(this.config.timeout || 120000),
       });
@@ -173,13 +173,13 @@ export class OllamaDriver extends ModelDriver {
 
       const reader = response.body?.getReader();
       if (!reader) {
-        throw new Error('No response body');
+        throw new Error("No response body");
       }
 
       const decoder = new TextDecoder();
-      let buffer = '';
-      let accumulatedText = '';
-      let accumulatedToolCalls: ToolCall[] = [];
+      let buffer = "";
+      let accumulatedText = "";
+      const accumulatedToolCalls: ToolCall[] = [];
 
       while (true) {
         const { done, value } = await reader.read();
@@ -188,8 +188,8 @@ export class OllamaDriver extends ModelDriver {
         }
 
         buffer += decoder.decode(value, { stream: true });
-        const lines = buffer.split('\n');
-        buffer = lines.pop() || '';
+        const lines = buffer.split("\n");
+        buffer = lines.pop() || "";
 
         for (const line of lines) {
           const trimmed = line.trim();
@@ -197,7 +197,7 @@ export class OllamaDriver extends ModelDriver {
 
           try {
             const data = JSON.parse(trimmed) as OllamaResponse;
-            const content = data.message?.content || '';
+            const content = data.message?.content || "";
 
             if (content) {
               accumulatedText += content;
@@ -218,7 +218,7 @@ export class OllamaDriver extends ModelDriver {
               const finalResponse: ChatResponse = {
                 text: accumulatedText,
                 incomplete: false,
-                finishReason: accumulatedToolCalls.length > 0 ? 'tool_calls' : 'stop',
+                finishReason: accumulatedToolCalls.length > 0 ? "tool_calls" : "stop",
                 toolCalls: accumulatedToolCalls.length > 0 ? accumulatedToolCalls : undefined,
                 usage: {
                   promptTokens: data.prompt_eval_count || 0,
@@ -235,13 +235,13 @@ export class OllamaDriver extends ModelDriver {
             }
           } catch (e) {
             // Skip invalid JSON
-            console.error('Failed to parse Ollama stream chunk:', e);
+            console.error("Failed to parse Ollama stream chunk:", e);
           }
         }
       }
     } catch (error) {
       throw new Error(
-        `Ollama stream failed: ${error instanceof Error ? error.message : String(error)}`
+        `Ollama stream failed: ${error instanceof Error ? error.message : String(error)}`,
       );
     }
   }
@@ -263,7 +263,7 @@ export class OllamaDriver extends ModelDriver {
     if (!tools) return [];
 
     return tools.map((tool) => ({
-      type: 'function',
+      type: "function",
       function: {
         name: tool.name,
         description: tool.description,
@@ -284,7 +284,7 @@ export class OllamaDriver extends ModelDriver {
       text: data.message.content,
       toolCalls,
       incomplete: false,
-      finishReason: toolCalls && toolCalls.length > 0 ? 'tool_calls' : 'stop',
+      finishReason: toolCalls && toolCalls.length > 0 ? "tool_calls" : "stop",
       usage: {
         promptTokens: data.prompt_eval_count || 0,
         completionTokens: data.eval_count || 0,
diff --git a/packages/drivers/openai/src/contentGenerator.ts b/packages/drivers/openai/src/contentGenerator.ts
index 93dd2166e..9652b642a 100644
--- a/packages/drivers/openai/src/contentGenerator.ts
+++ b/packages/drivers/openai/src/contentGenerator.ts
@@ -6,12 +6,12 @@
 
 import type {
   ContentGenerator,
-  GenerateContentResponse,
-  GenerateContentParameters,
-  CountTokensResponse,
   CountTokensParameters,
-  EmbedContentResponse,
+  CountTokensResponse,
   EmbedContentParameters,
+  EmbedContentResponse,
+  GenerateContentParameters,
+  GenerateContentResponse,
 } from "@airiscode/core-gemini";
 
 export interface OpenAIOptions {
@@ -25,13 +25,13 @@ export class OpenAIContentGenerator implements ContentGenerator {
 
   async generateContent(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): Promise<GenerateContentResponse> {
     const url = `${this.opts.baseUrl ?? "https://api.openai.com/v1"}/chat/completions`;
 
     const messages = req.messages || [
       ...(req.systemInstruction ? [{ role: "system", content: req.systemInstruction }] : []),
-      { role: "user", content: req.prompt || "" }
+      { role: "user", content: req.prompt || "" },
     ];
 
     const r = await fetch(url, {
@@ -59,20 +59,20 @@ export class OpenAIContentGenerator implements ContentGenerator {
 
   async generateContentStream(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     return this._generateContentStream(req, userPromptId);
   }
 
   private async *_generateContentStream(
     req: GenerateContentParameters,
-    userPromptId?: string
+    userPromptId?: string,
   ): AsyncGenerator<GenerateContentResponse> {
     const url = `${this.opts.baseUrl ?? "https://api.openai.com/v1"}/chat/completions`;
 
     const messages = req.messages || [
       ...(req.systemInstruction ? [{ role: "system", content: req.systemInstruction }] : []),
-      { role: "user", content: req.prompt || "" }
+      { role: "user", content: req.prompt || "" },
     ];
 
     const r = await fetch(url, {
@@ -122,7 +122,7 @@ export class OpenAIContentGenerator implements ContentGenerator {
           if (content) {
             yield { content, raw: json };
           }
-        } catch (e) {
+        } catch {
           // Skip invalid JSON
         }
       }
diff --git a/packages/drivers/openai/src/index.ts b/packages/drivers/openai/src/index.ts
index 663bb8866..e541787d9 100644
--- a/packages/drivers/openai/src/index.ts
+++ b/packages/drivers/openai/src/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: MIT
  */
 
-export * from './contentGenerator.js';
+export * from "./contentGenerator.js";
diff --git a/packages/drivers/package.json b/packages/drivers/package.json
index 7de8562b6..11149907b 100644
--- a/packages/drivers/package.json
+++ b/packages/drivers/package.json
@@ -15,7 +15,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/drivers/src/driver.ts b/packages/drivers/src/driver.ts
index dd59b4536..39ec52fd8 100644
--- a/packages/drivers/src/driver.ts
+++ b/packages/drivers/src/driver.ts
@@ -3,12 +3,12 @@
  */
 
 import type {
+  Capabilities,
   ChatRequest,
   ChatResponse,
-  Capabilities,
   DriverConfig,
   StreamChunk,
-} from './types.js';
+} from "./types.js";
 
 /**
  * Abstract base class for all model drivers
@@ -64,14 +64,14 @@ export abstract class ModelDriver {
    */
   protected validateRequest(request: ChatRequest): void {
     if (!request.sessionId) {
-      throw new Error('Session ID is required');
+      throw new Error("Session ID is required");
     }
     if (!request.messages || request.messages.length === 0) {
-      throw new Error('Messages array cannot be empty');
+      throw new Error("Messages array cannot be empty");
     }
     if (request.temperature !== undefined) {
       if (request.temperature < 0 || request.temperature > 2) {
-        throw new Error('Temperature must be between 0 and 2');
+        throw new Error("Temperature must be between 0 and 2");
       }
     }
   }
@@ -80,6 +80,6 @@ export abstract class ModelDriver {
    * Get default model from config or hints
    */
   protected getModelName(request: ChatRequest): string {
-    return request.modelHints?.model || this.config.defaultModel || 'default';
+    return request.modelHints?.model || this.config.defaultModel || "default";
   }
 }
diff --git a/packages/drivers/src/errors.ts b/packages/drivers/src/errors.ts
index 9ea887270..e7bda1096 100644
--- a/packages/drivers/src/errors.ts
+++ b/packages/drivers/src/errors.ts
@@ -6,9 +6,12 @@
  * Base error for driver-related issues
  */
 export class DriverError extends Error {
-  constructor(message: string, public readonly code?: string) {
+  constructor(
+    message: string,
+    public readonly code?: string,
+  ) {
     super(message);
-    this.name = 'DriverError';
+    this.name = "DriverError";
   }
 }
 
@@ -17,8 +20,8 @@ export class DriverError extends Error {
  */
 export class DriverInitError extends DriverError {
   constructor(message: string) {
-    super(message, 'DRIVER_INIT_ERROR');
-    this.name = 'DriverInitError';
+    super(message, "DRIVER_INIT_ERROR");
+    this.name = "DriverInitError";
   }
 }
 
@@ -29,10 +32,10 @@ export class DriverAPIError extends DriverError {
   constructor(
     message: string,
     public readonly statusCode?: number,
-    public readonly response?: unknown
+    public readonly response?: unknown,
   ) {
-    super(message, 'DRIVER_API_ERROR');
-    this.name = 'DriverAPIError';
+    super(message, "DRIVER_API_ERROR");
+    this.name = "DriverAPIError";
   }
 }
 
@@ -40,9 +43,9 @@ export class DriverAPIError extends DriverError {
  * Error when request times out
  */
 export class DriverTimeoutError extends DriverError {
-  constructor(message: string = 'Request timed out') {
-    super(message, 'DRIVER_TIMEOUT_ERROR');
-    this.name = 'DriverTimeoutError';
+  constructor(message: string = "Request timed out") {
+    super(message, "DRIVER_TIMEOUT_ERROR");
+    this.name = "DriverTimeoutError";
   }
 }
 
@@ -51,8 +54,8 @@ export class DriverTimeoutError extends DriverError {
  */
 export class ModelNotFoundError extends DriverError {
   constructor(model: string) {
-    super(`Model not found: ${model}`, 'MODEL_NOT_FOUND');
-    this.name = 'ModelNotFoundError';
+    super(`Model not found: ${model}`, "MODEL_NOT_FOUND");
+    this.name = "ModelNotFoundError";
   }
 }
 
@@ -61,7 +64,7 @@ export class ModelNotFoundError extends DriverError {
  */
 export class ToolsNotSupportedError extends DriverError {
   constructor() {
-    super('Tools/function calling is not supported by this driver', 'TOOLS_NOT_SUPPORTED');
-    this.name = 'ToolsNotSupportedError';
+    super("Tools/function calling is not supported by this driver", "TOOLS_NOT_SUPPORTED");
+    this.name = "ToolsNotSupportedError";
   }
 }
diff --git a/packages/drivers/src/index.ts b/packages/drivers/src/index.ts
index fa8262805..9253ca82f 100644
--- a/packages/drivers/src/index.ts
+++ b/packages/drivers/src/index.ts
@@ -3,7 +3,7 @@
  * Model driver interface and base implementations
  */
 
-export * from './types.js';
-export * from './driver.js';
-export * from './mock-driver.js';
-export * from './errors.js';
+export * from "./driver.js";
+export * from "./errors.js";
+export * from "./mock-driver.js";
+export * from "./types.js";
diff --git a/packages/drivers/src/mock-driver.ts b/packages/drivers/src/mock-driver.ts
index 2b109f169..5e68eb450 100644
--- a/packages/drivers/src/mock-driver.ts
+++ b/packages/drivers/src/mock-driver.ts
@@ -2,14 +2,14 @@
  * Mock driver for testing
  */
 
-import { ModelDriver } from './driver.js';
+import { ModelDriver } from "./driver.js";
 import type {
+  Capabilities,
   ChatRequest,
   ChatResponse,
-  Capabilities,
-  StreamChunk,
   DriverConfig,
-} from './types.js';
+  StreamChunk,
+} from "./types.js";
 
 /**
  * Mock responses for testing
@@ -41,21 +41,18 @@ export class MockDriver extends ModelDriver {
 
   constructor(config: MockDriverConfig = {}) {
     super(config);
-    this.responses = config.responses || [
-      { text: 'Mock response 1' },
-      { text: 'Mock response 2' },
-    ];
+    this.responses = config.responses || [{ text: "Mock response 1" }, { text: "Mock response 2" }];
     this.currentIndex = config.responseIndex || 0;
     this.delay = config.delay || 0;
   }
 
   async getCapabilities(): Promise<Capabilities> {
     return {
-      models: ['mock-model-1', 'mock-model-2'],
+      models: ["mock-model-1", "mock-model-2"],
       supportsTools: true,
       supportsStream: true,
       maxContextTokens: 128000,
-      apiVersion: '1.0.0-mock',
+      apiVersion: "1.0.0-mock",
     };
   }
 
@@ -83,10 +80,9 @@ export class MockDriver extends ModelDriver {
         promptTokens: request.messages.reduce((sum, m) => sum + m.content.length, 0),
         completionTokens: mockResponse.text.length,
         totalTokens:
-          request.messages.reduce((sum, m) => sum + m.content.length, 0) +
-          mockResponse.text.length,
+          request.messages.reduce((sum, m) => sum + m.content.length, 0) + mockResponse.text.length,
       },
-      finishReason: toolCalls ? 'tool_calls' : 'stop',
+      finishReason: toolCalls ? "tool_calls" : "stop",
     };
   }
 
@@ -127,7 +123,7 @@ export class MockDriver extends ModelDriver {
             request.messages.reduce((sum, m) => sum + m.content.length, 0) +
             mockResponse.text.length,
         },
-        finishReason: 'stop',
+        finishReason: "stop",
       },
     };
   }
diff --git a/packages/drivers/src/types.ts b/packages/drivers/src/types.ts
index a946e32c8..dd1b38321 100644
--- a/packages/drivers/src/types.ts
+++ b/packages/drivers/src/types.ts
@@ -2,7 +2,7 @@
  * Type definitions for model drivers
  */
 
-import { PolicyProfile } from '@airiscode/policies';
+import { PolicyProfile } from "@airiscode/policies";
 
 /**
  * Tool specification following JSON Schema format
@@ -19,7 +19,7 @@ export interface ToolSpec {
 /**
  * Chat message role
  */
-export type MessageRole = 'system' | 'user' | 'assistant' | 'tool';
+export type MessageRole = "system" | "user" | "assistant" | "tool";
 
 /**
  * Individual chat message
@@ -94,7 +94,7 @@ export interface ChatResponse {
   /** Token usage statistics */
   usage?: TokenUsage;
   /** Finish reason */
-  finishReason?: 'stop' | 'length' | 'tool_calls' | 'content_filter';
+  finishReason?: "stop" | "length" | "tool_calls" | "content_filter";
 }
 
 /**
diff --git a/packages/gemini-cli-core/package.json b/packages/gemini-cli-core/package.json
index f07dcc5b1..b4997c1bb 100644
--- a/packages/gemini-cli-core/package.json
+++ b/packages/gemini-cli-core/package.json
@@ -8,7 +8,7 @@
   "scripts": {
     "build": "echo 'Skipping gemini-cli-core build temporarily (OpenTelemetry version conflicts)'",
     "build:real": "tsc -b",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "biome check .",
     "test": "vitest run",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/gemini-cli-core/src/__mocks__/fs/promises.ts b/packages/gemini-cli-core/src/__mocks__/fs/promises.ts
index 423859111..78f96e8d5 100644
--- a/packages/gemini-cli-core/src/__mocks__/fs/promises.ts
+++ b/packages/gemini-cli-core/src/__mocks__/fs/promises.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import * as actualFsPromises from 'node:fs/promises';
+import * as actualFsPromises from "node:fs/promises";
+import { vi } from "vitest";
 
 const readFileMock = vi.fn();
 
diff --git a/packages/gemini-cli-core/src/agents/codebase-investigator.test.ts b/packages/gemini-cli-core/src/agents/codebase-investigator.test.ts
index f5398fc32..691e1ffef 100644
--- a/packages/gemini-cli-core/src/agents/codebase-investigator.test.ts
+++ b/packages/gemini-cli-core/src/agents/codebase-investigator.test.ts
@@ -4,30 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { CodebaseInvestigatorAgent } from './codebase-investigator.js';
+import { describe, expect, it } from "vitest";
+import { GEMINI_MODEL_ALIAS_PRO } from "../config/models.js";
 import {
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
   LS_TOOL_NAME,
   READ_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { GEMINI_MODEL_ALIAS_PRO } from '../config/models.js';
+} from "../tools/tool-names.js";
+import { CodebaseInvestigatorAgent } from "./codebase-investigator.js";
 
-describe('CodebaseInvestigatorAgent', () => {
-  it('should have the correct agent definition', () => {
-    expect(CodebaseInvestigatorAgent.name).toBe('codebase_investigator');
-    expect(CodebaseInvestigatorAgent.displayName).toBe(
-      'Codebase Investigator Agent',
-    );
+describe("CodebaseInvestigatorAgent", () => {
+  it("should have the correct agent definition", () => {
+    expect(CodebaseInvestigatorAgent.name).toBe("codebase_investigator");
+    expect(CodebaseInvestigatorAgent.displayName).toBe("Codebase Investigator Agent");
     expect(CodebaseInvestigatorAgent.description).toBeDefined();
-    expect(
-      CodebaseInvestigatorAgent.inputConfig.inputs['objective'].required,
-    ).toBe(true);
-    expect(CodebaseInvestigatorAgent.outputConfig?.outputName).toBe('report');
-    expect(CodebaseInvestigatorAgent.modelConfig?.model).toBe(
-      GEMINI_MODEL_ALIAS_PRO,
-    );
+    expect(CodebaseInvestigatorAgent.inputConfig.inputs["objective"].required).toBe(true);
+    expect(CodebaseInvestigatorAgent.outputConfig?.outputName).toBe("report");
+    expect(CodebaseInvestigatorAgent.modelConfig?.model).toBe(GEMINI_MODEL_ALIAS_PRO);
     expect(CodebaseInvestigatorAgent.toolConfig?.tools).toEqual([
       LS_TOOL_NAME,
       READ_FILE_TOOL_NAME,
@@ -36,10 +30,10 @@ describe('CodebaseInvestigatorAgent', () => {
     ]);
   });
 
-  it('should process output to a formatted JSON string', () => {
+  it("should process output to a formatted JSON string", () => {
     const report = {
-      SummaryOfFindings: 'summary',
-      ExplorationTrace: ['trace'],
+      SummaryOfFindings: "summary",
+      ExplorationTrace: ["trace"],
       RelevantLocations: [],
     };
     const processed = CodebaseInvestigatorAgent.processOutput?.(report);
diff --git a/packages/gemini-cli-core/src/agents/codebase-investigator.ts b/packages/gemini-cli-core/src/agents/codebase-investigator.ts
index 947fc1f9c..7d77d5c76 100644
--- a/packages/gemini-cli-core/src/agents/codebase-investigator.ts
+++ b/packages/gemini-cli-core/src/agents/codebase-investigator.ts
@@ -4,28 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AgentDefinition } from './types.js';
+import { z } from "zod";
+import { GEMINI_MODEL_ALIAS_PRO } from "../config/models.js";
 import {
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
   LS_TOOL_NAME,
   READ_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { GEMINI_MODEL_ALIAS_PRO } from '../config/models.js';
-import { z } from 'zod';
+} from "../tools/tool-names.js";
+import type { AgentDefinition } from "./types.js";
 
 // Define a type that matches the outputConfig schema for type safety.
 const CodebaseInvestigationReportSchema = z.object({
   SummaryOfFindings: z
     .string()
-    .describe(
-      "A summary of the investigation's conclusions and insights for the main agent.",
-    ),
+    .describe("A summary of the investigation's conclusions and insights for the main agent."),
   ExplorationTrace: z
     .array(z.string())
-    .describe(
-      'A step-by-step list of actions and tools used during the investigation.',
-    ),
+    .describe("A step-by-step list of actions and tools used during the investigation."),
   RelevantLocations: z
     .array(
       z.object({
@@ -34,63 +30,62 @@ const CodebaseInvestigationReportSchema = z.object({
         KeySymbols: z.array(z.string()),
       }),
     )
-    .describe('A list of relevant files and the key symbols within them.'),
+    .describe("A list of relevant files and the key symbols within them."),
 });
 
 /**
  * A Proof-of-Concept subagent specialized in analyzing codebase structure,
  * dependencies, and technologies.
  */
-export const CodebaseInvestigatorAgent: AgentDefinition<
-  typeof CodebaseInvestigationReportSchema
-> = {
-  name: 'codebase_investigator',
-  displayName: 'Codebase Investigator Agent',
-  description: `The specialized tool for codebase analysis, architectural mapping, and understanding system-wide dependencies. 
+export const CodebaseInvestigatorAgent: AgentDefinition<typeof CodebaseInvestigationReportSchema> =
+  {
+    name: "codebase_investigator",
+    displayName: "Codebase Investigator Agent",
+    description: `The specialized tool for codebase analysis, architectural mapping, and understanding system-wide dependencies. 
     Invoke this tool for tasks like vague requests, bug root-cause analysis, system refactoring, comprehensive feature implementation or to answer questions about the codebase that require investigation. 
     It returns a structured report with key file paths, symbols, and actionable architectural insights.`,
-  inputConfig: {
-    inputs: {
-      objective: {
-        description: `A comprehensive and detailed description of the user's ultimate goal. 
+    inputConfig: {
+      inputs: {
+        objective: {
+          description: `A comprehensive and detailed description of the user's ultimate goal. 
           You must include original user's objective as well as questions and any extra context and questions you may have.`,
-        type: 'string',
-        required: true,
+          type: "string",
+          required: true,
+        },
       },
     },
-  },
-  outputConfig: {
-    outputName: 'report',
-    description: 'The final investigation report as a JSON object.',
-    schema: CodebaseInvestigationReportSchema,
-  },
+    outputConfig: {
+      outputName: "report",
+      description: "The final investigation report as a JSON object.",
+      schema: CodebaseInvestigationReportSchema,
+    },
 
-  // The 'output' parameter is now strongly typed as CodebaseInvestigationReportSchema
-  processOutput: (output) => JSON.stringify(output, null, 2),
+    // The 'output' parameter is now strongly typed as CodebaseInvestigationReportSchema
+    processOutput: (output) => JSON.stringify(output, null, 2),
 
-  modelConfig: {
-    model: GEMINI_MODEL_ALIAS_PRO,
-    temp: 0.1,
-    top_p: 0.95,
-    thinkingBudget: -1,
-  },
+    modelConfig: {
+      model: GEMINI_MODEL_ALIAS_PRO,
+      temp: 0.1,
+      top_p: 0.95,
+      thinkingBudget: -1,
+    },
 
-  runConfig: {
-    max_time_minutes: 5,
-    max_turns: 15,
-  },
+    runConfig: {
+      max_time_minutes: 5,
+      max_turns: 15,
+    },
 
-  toolConfig: {
-    // Grant access only to read-only tools.
-    tools: [LS_TOOL_NAME, READ_FILE_TOOL_NAME, GLOB_TOOL_NAME, GREP_TOOL_NAME],
-  },
+    toolConfig: {
+      // Grant access only to read-only tools.
+      tools: [LS_TOOL_NAME, READ_FILE_TOOL_NAME, GLOB_TOOL_NAME, GREP_TOOL_NAME],
+    },
 
-  promptConfig: {
-    query: `Your task is to do a deep investigation of the codebase to find all relevant files, code locations, architectural mental map and insights to solve  for the following user objective:
+    promptConfig: {
+      query: `Your task is to do a deep investigation of the codebase to find all relevant files, code locations, architectural mental map and insights to solve  for the following user objective:
 <objective>
 \${objective}
 </objective>`,
-    systemPrompt: `You are **Codebase Investigator**, a hyper-specialized AI agent and an expert in reverse-engineering complex software projects. You are a sub-agent within a larger development system.
+      systemPrompt: `You are **Codebase Investigator**, a hyper-specialized AI agent and an expert in reverse-engineering complex software projects. You are a sub-agent within a larger development system.
 Your **SOLE PURPOSE** is to build a complete mental model of the code relevant to a given investigation. You must identify all relevant files, understand their roles, and foresee the direct architectural consequences of potential changes.
 You are a sub-agent in a larger system. Your only responsibility is to provide deep, actionable context.
 - **DO:** Find the key modules, classes, and functions that are part of the problem and its solution.
@@ -149,5 +144,5 @@ When you are finished, you **MUST** call the \`complete_task\` tool. The \`repor
 }
 \`\`\`
 `,
-  },
-};
+    },
+  };
diff --git a/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.test.ts b/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.test.ts
index ebf753db3..391dd5afd 100644
--- a/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.test.ts
+++ b/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.test.ts
@@ -4,39 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { DelegateToAgentTool } from './delegate-to-agent-tool.js';
-import { AgentRegistry } from './registry.js';
-import type { Config } from '../config/config.js';
-import type { AgentDefinition } from './types.js';
-import { SubagentInvocation } from './invocation.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { MessageBusType } from '../confirmation-bus/types.js';
-import { DELEGATE_TO_AGENT_TOOL_NAME } from '../tools/tool-names.js';
-
-vi.mock('./invocation.js', () => ({
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { MessageBusType } from "../confirmation-bus/types.js";
+import { DELEGATE_TO_AGENT_TOOL_NAME } from "../tools/tool-names.js";
+import { DelegateToAgentTool } from "./delegate-to-agent-tool.js";
+import { SubagentInvocation } from "./invocation.js";
+import { AgentRegistry } from "./registry.js";
+import type { AgentDefinition } from "./types.js";
+
+vi.mock("./invocation.js", () => ({
   SubagentInvocation: vi.fn().mockImplementation(() => ({
-    execute: vi
-      .fn()
-      .mockResolvedValue({ content: [{ type: 'text', text: 'Success' }] }),
+    execute: vi.fn().mockResolvedValue({ content: [{ type: "text", text: "Success" }] }),
   })),
 }));
 
-describe('DelegateToAgentTool', () => {
+describe("DelegateToAgentTool", () => {
   let registry: AgentRegistry;
   let config: Config;
   let tool: DelegateToAgentTool;
   let messageBus: MessageBus;
 
   const mockAgentDef: AgentDefinition = {
-    name: 'test_agent',
-    description: 'A test agent',
+    name: "test_agent",
+    description: "A test agent",
     promptConfig: {},
-    modelConfig: { model: 'test-model', temp: 0, top_p: 0 },
+    modelConfig: { model: "test-model", temp: 0, top_p: 0 },
     inputConfig: {
       inputs: {
-        arg1: { type: 'string', description: 'Argument 1', required: true },
-        arg2: { type: 'number', description: 'Argument 2', required: false },
+        arg1: { type: "string", description: "Argument 1", required: true },
+        arg2: { type: "number", description: "Argument 2", required: false },
       },
     },
     runConfig: { max_turns: 1, max_time_minutes: 1 },
@@ -65,83 +63,77 @@ describe('DelegateToAgentTool', () => {
     tool = new DelegateToAgentTool(registry, config, messageBus);
   });
 
-  it('should use dynamic description from registry', () => {
+  it("should use dynamic description from registry", () => {
     // registry has mockAgentDef registered in beforeEach
-    expect(tool.description).toContain(
-      'Delegates a task to a specialized sub-agent',
-    );
-    expect(tool.description).toContain(
-      `- **${mockAgentDef.name}**: ${mockAgentDef.description}`,
-    );
+    expect(tool.description).toContain("Delegates a task to a specialized sub-agent");
+    expect(tool.description).toContain(`- **${mockAgentDef.name}**: ${mockAgentDef.description}`);
   });
 
-  it('should validate agent_name exists in registry', async () => {
+  it("should validate agent_name exists in registry", async () => {
     // Zod validation happens at build time now (or rather, build validates the schema)
     // Since we use discriminated union, an invalid agent_name won't match any option.
     expect(() =>
       tool.build({
-        agent_name: 'non_existent_agent',
+        agent_name: "non_existent_agent",
       }),
     ).toThrow();
   });
 
-  it('should validate correct arguments', async () => {
+  it("should validate correct arguments", async () => {
     const invocation = tool.build({
-      agent_name: 'test_agent',
-      arg1: 'valid',
+      agent_name: "test_agent",
+      arg1: "valid",
     });
 
     const result = await invocation.execute(new AbortController().signal);
-    expect(result).toEqual({ content: [{ type: 'text', text: 'Success' }] });
+    expect(result).toEqual({ content: [{ type: "text", text: "Success" }] });
     expect(SubagentInvocation).toHaveBeenCalledWith(
-      { arg1: 'valid' },
+      { arg1: "valid" },
       mockAgentDef,
       config,
       messageBus,
     );
   });
 
-  it('should throw error for missing required argument', async () => {
+  it("should throw error for missing required argument", async () => {
     // Missing arg1 should fail Zod validation
     expect(() =>
       tool.build({
-        agent_name: 'test_agent',
+        agent_name: "test_agent",
         arg2: 123,
       }),
     ).toThrow();
   });
 
-  it('should throw error for invalid argument type', async () => {
+  it("should throw error for invalid argument type", async () => {
     // arg1 should be string, passing number
     expect(() =>
       tool.build({
-        agent_name: 'test_agent',
+        agent_name: "test_agent",
         arg1: 123,
       }),
     ).toThrow();
   });
 
-  it('should allow optional arguments to be omitted', async () => {
+  it("should allow optional arguments to be omitted", async () => {
     const invocation = tool.build({
-      agent_name: 'test_agent',
-      arg1: 'valid',
+      agent_name: "test_agent",
+      arg1: "valid",
       // arg2 is optional
     });
 
-    await expect(
-      invocation.execute(new AbortController().signal),
-    ).resolves.toBeDefined();
+    await expect(invocation.execute(new AbortController().signal)).resolves.toBeDefined();
   });
 
   it('should throw error if an agent has an input named "agent_name"', () => {
     const invalidAgentDef: AgentDefinition = {
       ...mockAgentDef,
-      name: 'invalid_agent',
+      name: "invalid_agent",
       inputConfig: {
         inputs: {
           agent_name: {
-            type: 'string',
-            description: 'Conflict',
+            type: "string",
+            description: "Conflict",
             required: true,
           },
         },
@@ -158,8 +150,8 @@ describe('DelegateToAgentTool', () => {
 
   it('should use correct tool name "delegate_to_agent" when requesting confirmation', async () => {
     const invocation = tool.build({
-      agent_name: 'test_agent',
-      arg1: 'valid',
+      agent_name: "test_agent",
+      arg1: "valid",
     });
 
     // Trigger confirmation check
diff --git a/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.ts b/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.ts
index 9993507e0..f8bbb8dcb 100644
--- a/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.ts
+++ b/packages/gemini-cli-core/src/agents/delegate-to-agent-tool.ts
@@ -4,29 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
+import { z } from "zod";
+import { zodToJsonSchema } from "zod-to-json-schema";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { DELEGATE_TO_AGENT_TOOL_NAME } from "../tools/tool-names.js";
 import {
   BaseDeclarativeTool,
+  BaseToolInvocation,
   Kind,
   type ToolInvocation,
   type ToolResult,
-  BaseToolInvocation,
-} from '../tools/tools.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
-import { DELEGATE_TO_AGENT_TOOL_NAME } from '../tools/tool-names.js';
-import type { AgentRegistry } from './registry.js';
-import type { Config } from '../config/config.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { SubagentInvocation } from './invocation.js';
-import type { AgentInputs } from './types.js';
+} from "../tools/tools.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { SubagentInvocation } from "./invocation.js";
+import type { AgentRegistry } from "./registry.js";
+import type { AgentInputs } from "./types.js";
 
 type DelegateParams = { agent_name: string } & Record<string, unknown>;
 
-export class DelegateToAgentTool extends BaseDeclarativeTool<
-  DelegateParams,
-  ToolResult
-> {
+export class DelegateToAgentTool extends BaseDeclarativeTool<DelegateParams, ToolResult> {
   constructor(
     private readonly registry: AgentRegistry,
     private readonly config: Config,
@@ -39,7 +36,7 @@ export class DelegateToAgentTool extends BaseDeclarativeTool<
     if (definitions.length === 0) {
       // Fallback if no agents are registered (mostly for testing/safety)
       schema = z.object({
-        agent_name: z.string().describe('No agents are currently available.'),
+        agent_name: z.string().describe("No agents are currently available."),
       });
     } else {
       const agentSchemas = definitions.map((def) => {
@@ -48,7 +45,7 @@ export class DelegateToAgentTool extends BaseDeclarativeTool<
         };
 
         for (const [key, inputDef] of Object.entries(def.inputConfig.inputs)) {
-          if (key === 'agent_name') {
+          if (key === "agent_name") {
             throw new Error(
               `Agent '${def.name}' cannot have an input parameter named 'agent_name' as it is a reserved parameter for delegation.`,
             );
@@ -58,22 +55,22 @@ export class DelegateToAgentTool extends BaseDeclarativeTool<
 
           // Map input types to Zod
           switch (inputDef.type) {
-            case 'string':
+            case "string":
               validator = z.string();
               break;
-            case 'number':
+            case "number":
               validator = z.number();
               break;
-            case 'boolean':
+            case "boolean":
               validator = z.boolean();
               break;
-            case 'integer':
+            case "integer":
               validator = z.number().int();
               break;
-            case 'string[]':
+            case "string[]":
               validator = z.array(z.string());
               break;
-            case 'number[]':
+            case "number[]":
               validator = z.array(z.number());
               break;
             default: {
@@ -92,9 +89,7 @@ export class DelegateToAgentTool extends BaseDeclarativeTool<
         }
 
         // Cast required because Zod can't infer the discriminator from dynamic keys
-        return z.object(
-          inputShape,
-        ) as z.ZodDiscriminatedUnionOption<'agent_name'>;
+        return z.object(inputShape) as z.ZodDiscriminatedUnionOption<"agent_name">;
       });
 
       // Create the discriminated union
@@ -103,11 +98,11 @@ export class DelegateToAgentTool extends BaseDeclarativeTool<
         schema = agentSchemas[0];
       } else {
         schema = z.discriminatedUnion(
-          'agent_name',
+          "agent_name",
           agentSchemas as [
-            z.ZodDiscriminatedUnionOption<'agent_name'>,
-            z.ZodDiscriminatedUnionOption<'agent_name'>,
-            ...Array<z.ZodDiscriminatedUnionOption<'agent_name'>>,
+            z.ZodDiscriminatedUnionOption<"agent_name">,
+            z.ZodDiscriminatedUnionOption<"agent_name">,
+            ...Array<z.ZodDiscriminatedUnionOption<"agent_name">>,
           ],
         );
       }
@@ -115,7 +110,7 @@ export class DelegateToAgentTool extends BaseDeclarativeTool<
 
     super(
       DELEGATE_TO_AGENT_TOOL_NAME,
-      'Delegate to Agent',
+      "Delegate to Agent",
       registry.getToolDescription(),
       Kind.Think,
       zodToJsonSchema(schema),
@@ -125,22 +120,12 @@ export class DelegateToAgentTool extends BaseDeclarativeTool<
     );
   }
 
-  protected createInvocation(
-    params: DelegateParams,
-  ): ToolInvocation<DelegateParams, ToolResult> {
-    return new DelegateInvocation(
-      params,
-      this.registry,
-      this.config,
-      this.messageBus,
-    );
+  protected createInvocation(params: DelegateParams): ToolInvocation<DelegateParams, ToolResult> {
+    return new DelegateInvocation(params, this.registry, this.config, this.messageBus);
   }
 }
 
-class DelegateInvocation extends BaseToolInvocation<
-  DelegateParams,
-  ToolResult
-> {
+class DelegateInvocation extends BaseToolInvocation<DelegateParams, ToolResult> {
   constructor(
     params: DelegateParams,
     private readonly registry: AgentRegistry,
diff --git a/packages/gemini-cli-core/src/agents/executor.test.ts b/packages/gemini-cli-core/src/agents/executor.test.ts
index 254435fea..7a5b70a29 100644
--- a/packages/gemini-cli-core/src/agents/executor.test.ts
+++ b/packages/gemini-cli-core/src/agents/executor.test.ts
@@ -5,86 +5,57 @@
  */
 
 import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { debugLogger } from '../utils/debugLogger.js';
-import { AgentExecutor, type ActivityCallback } from './executor.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { LSTool } from '../tools/ls.js';
-import { LS_TOOL_NAME, READ_FILE_TOOL_NAME } from '../tools/tool-names.js';
-import {
-  GeminiChat,
-  StreamEventType,
-  type StreamEvent,
-} from '../core/geminiChat.js';
-import {
+  type Content,
   type FunctionCall,
-  type Part,
   type GenerateContentResponse,
-  type Content,
+  type Part,
   type PartListUnion,
   type Tool,
-} from '@google/genai';
-import type { Config } from '../config/config.js';
-import { MockTool } from '../test-utils/mock-tool.js';
-import { getDirectoryContextString } from '../utils/environmentContext.js';
-import { z } from 'zod';
-import { promptIdContext } from '../utils/promptIdContext.js';
-import {
-  logAgentStart,
-  logAgentFinish,
-  logRecoveryAttempt,
-} from '../telemetry/loggers.js';
-import {
-  AgentStartEvent,
-  AgentFinishEvent,
-  RecoveryAttemptEvent,
-} from '../telemetry/types.js';
-import type {
-  AgentDefinition,
-  AgentInputs,
-  SubagentActivityEvent,
-  OutputConfig,
-} from './types.js';
-import { AgentTerminateMode } from './types.js';
-import type { AnyDeclarativeTool, AnyToolInvocation } from '../tools/tools.js';
-import { CompressionStatus } from '../core/turn.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
-import { getModelConfigAlias } from './registry.js';
-
-const {
-  mockSendMessageStream,
-  mockExecuteToolCall,
-  mockSetSystemInstruction,
-  mockCompress,
-} = vi.hoisted(() => ({
-  mockSendMessageStream: vi.fn(),
-  mockExecuteToolCall: vi.fn(),
-  mockSetSystemInstruction: vi.fn(),
-  mockCompress: vi.fn(),
-}));
+} from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { z } from "zod";
+import type { Config } from "../config/config.js";
+import { GeminiChat, type StreamEvent, StreamEventType } from "../core/geminiChat.js";
+import { CompressionStatus } from "../core/turn.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import { logAgentFinish, logAgentStart, logRecoveryAttempt } from "../telemetry/loggers.js";
+import { AgentFinishEvent, AgentStartEvent, RecoveryAttemptEvent } from "../telemetry/types.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { LSTool } from "../tools/ls.js";
+import { LS_TOOL_NAME, READ_FILE_TOOL_NAME } from "../tools/tool-names.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import type { AnyDeclarativeTool, AnyToolInvocation } from "../tools/tools.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getDirectoryContextString } from "../utils/environmentContext.js";
+import { promptIdContext } from "../utils/promptIdContext.js";
+import { type ActivityCallback, AgentExecutor } from "./executor.js";
+import { getModelConfigAlias } from "./registry.js";
+import type { AgentDefinition, AgentInputs, OutputConfig, SubagentActivityEvent } from "./types.js";
+import { AgentTerminateMode } from "./types.js";
+
+const { mockSendMessageStream, mockExecuteToolCall, mockSetSystemInstruction, mockCompress } =
+  vi.hoisted(() => ({
+    mockSendMessageStream: vi.fn(),
+    mockExecuteToolCall: vi.fn(),
+    mockSetSystemInstruction: vi.fn(),
+    mockCompress: vi.fn(),
+  }));
 
 let mockChatHistory: Content[] = [];
 const mockSetHistory = vi.fn((newHistory: Content[]) => {
   mockChatHistory = newHistory;
 });
 
-vi.mock('../services/chatCompressionService.js', () => ({
+vi.mock("../services/chatCompressionService.js", () => ({
   ChatCompressionService: vi.fn().mockImplementation(() => ({
     compress: mockCompress,
   })),
 }));
 
-vi.mock('../core/geminiChat.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../core/geminiChat.js')>();
+vi.mock("../core/geminiChat.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../core/geminiChat.js")>();
   return {
     ...actual,
     GeminiChat: vi.fn().mockImplementation(() => ({
@@ -96,21 +67,20 @@ vi.mock('../core/geminiChat.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../core/nonInteractiveToolExecutor.js', () => ({
+vi.mock("../core/nonInteractiveToolExecutor.js", () => ({
   executeToolCall: mockExecuteToolCall,
 }));
 
-vi.mock('../utils/environmentContext.js');
+vi.mock("../utils/environmentContext.js");
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logAgentStart: vi.fn(),
   logAgentFinish: vi.fn(),
   logRecoveryAttempt: vi.fn(),
 }));
 
-vi.mock('../utils/promptIdContext.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../utils/promptIdContext.js')>();
+vi.mock("../utils/promptIdContext.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/promptIdContext.js")>();
   return {
     ...actual,
     promptIdContext: {
@@ -129,8 +99,8 @@ const mockedLogAgentFinish = vi.mocked(logAgentFinish);
 const mockedLogRecoveryAttempt = vi.mocked(logRecoveryAttempt);
 
 // Constants for testing
-const TASK_COMPLETE_TOOL_NAME = 'complete_task';
-const MOCK_TOOL_NOT_ALLOWED = new MockTool({ name: 'write_file_interactive' });
+const TASK_COMPLETE_TOOL_NAME = "complete_task";
+const MOCK_TOOL_NOT_ALLOWED = new MockTool({ name: "write_file_interactive" });
 
 /**
  * Helper to create a mock API response chunk.
@@ -141,18 +111,14 @@ const createMockResponseChunk = (
   functionCalls?: FunctionCall[],
 ): GenerateContentResponse =>
   ({
-    candidates: [{ index: 0, content: { role: 'model', parts } }],
+    candidates: [{ index: 0, content: { role: "model", parts } }],
     ...(functionCalls && functionCalls.length > 0 ? { functionCalls } : {}),
   }) as unknown as GenerateContentResponse;
 
 /**
  * Helper to mock a single turn of model response in the stream.
  */
-const mockModelResponse = (
-  functionCalls: FunctionCall[],
-  thought?: string,
-  text?: string,
-) => {
+const mockModelResponse = (functionCalls: FunctionCall[], thought?: string, text?: string) => {
   const parts: Part[] = [];
   if (thought) {
     parts.push({
@@ -195,35 +161,35 @@ let parentToolRegistry: ToolRegistry;
  */
 const createTestDefinition = <TOutput extends z.ZodTypeAny>(
   tools: Array<string | MockTool> = [LS_TOOL_NAME],
-  runConfigOverrides: Partial<AgentDefinition<TOutput>['runConfig']> = {},
-  outputConfigMode: 'default' | 'none' = 'default',
+  runConfigOverrides: Partial<AgentDefinition<TOutput>["runConfig"]> = {},
+  outputConfigMode: "default" | "none" = "default",
   schema: TOutput = z.string() as unknown as TOutput,
 ): AgentDefinition<TOutput> => {
   let outputConfig: OutputConfig<TOutput> | undefined;
 
-  if (outputConfigMode === 'default') {
+  if (outputConfigMode === "default") {
     outputConfig = {
-      outputName: 'finalResult',
-      description: 'The final result.',
+      outputName: "finalResult",
+      description: "The final result.",
       schema,
     };
   }
 
   return {
-    name: 'TestAgent',
-    description: 'An agent for testing.',
+    name: "TestAgent",
+    description: "An agent for testing.",
     inputConfig: {
-      inputs: { goal: { type: 'string', required: true, description: 'goal' } },
+      inputs: { goal: { type: "string", required: true, description: "goal" } },
     },
-    modelConfig: { model: 'gemini-test-model', temp: 0, top_p: 1 },
+    modelConfig: { model: "gemini-test-model", temp: 0, top_p: 1 },
     runConfig: { max_time_minutes: 5, max_turns: 5, ...runConfigOverrides },
-    promptConfig: { systemPrompt: 'Achieve the goal: ${goal}.' },
+    promptConfig: { systemPrompt: "Achieve the goal: ${goal}." },
     toolConfig: { tools },
     outputConfig,
   };
 };
 
-describe('AgentExecutor', () => {
+describe("AgentExecutor", () => {
   let activities: SubagentActivityEvent[];
   let onActivity: ActivityCallback;
   let abortController: AbortController;
@@ -265,18 +231,12 @@ describe('AgentExecutor', () => {
     mockConfig = makeFakeConfig();
     parentToolRegistry = new ToolRegistry(mockConfig);
     parentToolRegistry.registerTool(new LSTool(mockConfig));
-    parentToolRegistry.registerTool(
-      new MockTool({ name: READ_FILE_TOOL_NAME }),
-    );
+    parentToolRegistry.registerTool(new MockTool({ name: READ_FILE_TOOL_NAME }));
     parentToolRegistry.registerTool(MOCK_TOOL_NOT_ALLOWED);
 
-    vi.spyOn(mockConfig, 'getToolRegistry').mockResolvedValue(
-      parentToolRegistry,
-    );
+    vi.spyOn(mockConfig, "getToolRegistry").mockResolvedValue(parentToolRegistry);
 
-    mockedGetDirectoryContextString.mockResolvedValue(
-      'Mocked Environment Context',
-    );
+    mockedGetDirectoryContextString.mockResolvedValue("Mocked Environment Context");
 
     activities = [];
     onActivity = (activity) => activities.push(activity);
@@ -288,36 +248,25 @@ describe('AgentExecutor', () => {
     vi.useRealTimers();
   });
 
-  describe('create (Initialization and Validation)', () => {
-    it('should create successfully with allowed tools', async () => {
+  describe("create (Initialization and Validation)", () => {
+    it("should create successfully with allowed tools", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
       expect(executor).toBeInstanceOf(AgentExecutor);
     });
 
-    it('SECURITY: should throw if a tool is not on the non-interactive allowlist', async () => {
+    it("SECURITY: should throw if a tool is not on the non-interactive allowlist", async () => {
       const definition = createTestDefinition([MOCK_TOOL_NOT_ALLOWED.name]);
-      await expect(
-        AgentExecutor.create(definition, mockConfig, onActivity),
-      ).rejects.toThrow(/not on the allow-list for non-interactive execution/);
+      await expect(AgentExecutor.create(definition, mockConfig, onActivity)).rejects.toThrow(
+        /not on the allow-list for non-interactive execution/,
+      );
     });
 
-    it('should create an isolated ToolRegistry for the agent', async () => {
-      const definition = createTestDefinition([
-        LS_TOOL_NAME,
-        READ_FILE_TOOL_NAME,
-      ]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+    it("should create an isolated ToolRegistry for the agent", async () => {
+      const definition = createTestDefinition([LS_TOOL_NAME, READ_FILE_TOOL_NAME]);
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      const agentRegistry = executor['toolRegistry'] as ToolRegistry;
+      const agentRegistry = executor["toolRegistry"] as ToolRegistry;
 
       expect(agentRegistry).not.toBe(parentToolRegistry);
       expect(agentRegistry.getAllToolNames()).toEqual(
@@ -327,47 +276,37 @@ describe('AgentExecutor', () => {
       expect(agentRegistry.getTool(MOCK_TOOL_NOT_ALLOWED.name)).toBeUndefined();
     });
 
-    it('should use parentPromptId from context to create agentId', async () => {
-      const parentId = 'parent-id';
+    it("should use parentPromptId from context to create agentId", async () => {
+      const parentId = "parent-id";
       mockedPromptIdContext.getStore.mockReturnValue(parentId);
 
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      expect(executor['agentId']).toMatch(
-        new RegExp(`^${parentId}-${definition.name}-`),
-      );
+      expect(executor["agentId"]).toMatch(new RegExp(`^${parentId}-${definition.name}-`));
     });
 
-    it('should correctly apply templates to initialMessages', async () => {
+    it("should correctly apply templates to initialMessages", async () => {
       const definition = createTestDefinition();
       // Override promptConfig to use initialMessages instead of systemPrompt
       definition.promptConfig = {
         initialMessages: [
-          { role: 'user', parts: [{ text: 'Goal: ${goal}' }] },
-          { role: 'model', parts: [{ text: 'OK, starting on ${goal}.' }] },
+          { role: "user", parts: [{ text: "Goal: ${goal}" }] },
+          { role: "model", parts: [{ text: "OK, starting on ${goal}." }] },
         ],
       };
-      const inputs = { goal: 'TestGoal' };
+      const inputs = { goal: "TestGoal" };
 
       // Mock a response to prevent the loop from running forever
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'done' },
-          id: 'call1',
+          args: { finalResult: "done" },
+          id: "call1",
         },
       ]);
 
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
       await executor.run(inputs, signal);
 
       const chatConstructorArgs = MockedGeminiChat.mock.calls[0];
@@ -378,30 +317,24 @@ describe('AgentExecutor', () => {
 
       // Perform checks on defined objects to satisfy TS
       const firstPart = startHistory?.[0]?.parts?.[0];
-      expect(firstPart?.text).toBe('Goal: TestGoal');
+      expect(firstPart?.text).toBe("Goal: TestGoal");
 
       const secondPart = startHistory?.[1]?.parts?.[0];
-      expect(secondPart?.text).toBe('OK, starting on TestGoal.');
+      expect(secondPart?.text).toBe("OK, starting on TestGoal.");
     });
   });
 
-  describe('run (Execution Loop and Logic)', () => {
-    it('should log AgentFinish with error if run throws', async () => {
+  describe("run (Execution Loop and Logic)", () => {
+    it("should log AgentFinish with error if run throws", async () => {
       const definition = createTestDefinition();
       // Make the definition invalid to cause an error during run
       definition.inputConfig.inputs = {
-        goal: { type: 'string', required: true, description: 'goal' },
+        goal: { type: "string", required: true, description: "goal" },
       };
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Run without inputs to trigger validation error
-      await expect(executor.run({}, signal)).rejects.toThrow(
-        /Missing required input parameters/,
-      );
+      await expect(executor.run({}, signal)).rejects.toThrow(/Missing required input parameters/);
 
       expect(mockedLogAgentStart).toHaveBeenCalledTimes(1);
       expect(mockedLogAgentFinish).toHaveBeenCalledTimes(1);
@@ -413,40 +346,33 @@ describe('AgentExecutor', () => {
       );
     });
 
-    it('should execute successfully when model calls complete_task with output (Happy Path with Output)', async () => {
+    it("should execute successfully when model calls complete_task with output (Happy Path with Output)", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const inputs: AgentInputs = { goal: 'Find files' };
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const inputs: AgentInputs = { goal: "Find files" };
 
       // Turn 1: Model calls ls
-      mockModelResponse(
-        [{ name: LS_TOOL_NAME, args: { path: '.' }, id: 'call1' }],
-        'T1: Listing',
-      );
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "call1" }], "T1: Listing");
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: 'file1.txt',
+          callId: "call1",
+          resultDisplay: "file1.txt",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
-                response: { result: 'file1.txt' },
-                id: 'call1',
+                response: { result: "file1.txt" },
+                id: "call1",
               },
             },
           ],
@@ -461,11 +387,11 @@ describe('AgentExecutor', () => {
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Found file1.txt' },
-            id: 'call2',
+            args: { finalResult: "Found file1.txt" },
+            id: "call2",
           },
         ],
-        'T2: Done',
+        "T2: Done",
       );
 
       const output = await executor.run(inputs, signal);
@@ -473,14 +399,10 @@ describe('AgentExecutor', () => {
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
 
       const systemInstruction = MockedGeminiChat.mock.calls[0][1];
-      expect(systemInstruction).toContain(
-        `MUST call the \`${TASK_COMPLETE_TOOL_NAME}\` tool`,
-      );
-      expect(systemInstruction).toContain('Mocked Environment Context');
-      expect(systemInstruction).toContain(
-        'You are running in a non-interactive mode',
-      );
-      expect(systemInstruction).toContain('Always use absolute paths');
+      expect(systemInstruction).toContain(`MUST call the \`${TASK_COMPLETE_TOOL_NAME}\` tool`);
+      expect(systemInstruction).toContain("Mocked Environment Context");
+      expect(systemInstruction).toContain("You are running in a non-interactive mode");
+      expect(systemInstruction).toContain("Always use absolute paths");
 
       const { modelConfigKey } = getMockMessageParams(0);
       expect(modelConfigKey.model).toBe(getModelConfigAlias(definition));
@@ -498,31 +420,23 @@ describe('AgentExecutor', () => {
         ]),
       );
 
-      const completeToolDef = sentTools!.find(
-        (t) => t.name === TASK_COMPLETE_TOOL_NAME,
-      );
-      expect(completeToolDef?.parameters?.required).toContain('finalResult');
+      const completeToolDef = sentTools!.find((t) => t.name === TASK_COMPLETE_TOOL_NAME);
+      expect(completeToolDef?.parameters?.required).toContain("finalResult");
 
-      expect(output.result).toBe('Found file1.txt');
+      expect(output.result).toBe("Found file1.txt");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
 
       // Telemetry checks
       expect(mockedLogAgentStart).toHaveBeenCalledTimes(1);
-      expect(mockedLogAgentStart).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(AgentStartEvent),
-      );
+      expect(mockedLogAgentStart).toHaveBeenCalledWith(mockConfig, expect.any(AgentStartEvent));
       expect(mockedLogAgentFinish).toHaveBeenCalledTimes(1);
-      expect(mockedLogAgentFinish).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(AgentFinishEvent),
-      );
+      expect(mockedLogAgentFinish).toHaveBeenCalledWith(mockConfig, expect.any(AgentFinishEvent));
       const finishEvent = mockedLogAgentFinish.mock.calls[0][1];
       expect(finishEvent.terminate_reason).toBe(AgentTerminateMode.GOAL);
 
       // Context checks
       expect(mockedPromptIdContext.run).toHaveBeenCalledTimes(2); // Two turns
-      const agentId = executor['agentId'];
+      const agentId = executor["agentId"];
       expect(mockedPromptIdContext.run).toHaveBeenNthCalledWith(
         1,
         `${agentId}#0`,
@@ -537,62 +451,56 @@ describe('AgentExecutor', () => {
       expect(activities).toEqual(
         expect.arrayContaining([
           expect.objectContaining({
-            type: 'THOUGHT_CHUNK',
-            data: { text: 'T1: Listing' },
+            type: "THOUGHT_CHUNK",
+            data: { text: "T1: Listing" },
           }),
           expect.objectContaining({
-            type: 'TOOL_CALL_END',
-            data: { name: LS_TOOL_NAME, output: 'file1.txt' },
+            type: "TOOL_CALL_END",
+            data: { name: LS_TOOL_NAME, output: "file1.txt" },
           }),
           expect.objectContaining({
-            type: 'TOOL_CALL_START',
+            type: "TOOL_CALL_START",
             data: {
               name: TASK_COMPLETE_TOOL_NAME,
-              args: { finalResult: 'Found file1.txt' },
+              args: { finalResult: "Found file1.txt" },
             },
           }),
           expect.objectContaining({
-            type: 'TOOL_CALL_END',
+            type: "TOOL_CALL_END",
             data: {
               name: TASK_COMPLETE_TOOL_NAME,
-              output: expect.stringContaining('Output submitted'),
+              output: expect.stringContaining("Output submitted"),
             },
           }),
         ]),
       );
     });
 
-    it('should execute successfully when model calls complete_task without output (Happy Path No Output)', async () => {
-      const definition = createTestDefinition([LS_TOOL_NAME], {}, 'none');
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+    it("should execute successfully when model calls complete_task without output (Happy Path No Output)", async () => {
+      const definition = createTestDefinition([LS_TOOL_NAME], {}, "none");
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '.' }, id: 'call1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "call1" }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: 'ok',
+          callId: "call1",
+          resultDisplay: "ok",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
                 response: {},
-                id: 'call1',
+                id: "call1",
               },
             },
           ],
@@ -603,11 +511,11 @@ describe('AgentExecutor', () => {
       });
 
       mockModelResponse(
-        [{ name: TASK_COMPLETE_TOOL_NAME, args: {}, id: 'call2' }],
-        'Task finished.',
+        [{ name: TASK_COMPLETE_TOOL_NAME, args: {}, id: "call2" }],
+        "Task finished.",
       );
 
-      const output = await executor.run({ goal: 'Do work' }, signal);
+      const output = await executor.run({ goal: "Do work" }, signal);
 
       const { modelConfigKey } = getMockMessageParams(0);
       expect(modelConfigKey.model).toBe(getModelConfigAlias(definition));
@@ -617,49 +525,39 @@ describe('AgentExecutor', () => {
       const sentTools = passedToolsArg[0].functionDeclarations;
       expect(sentTools).toBeDefined();
 
-      const completeToolDef = sentTools!.find(
-        (t) => t.name === TASK_COMPLETE_TOOL_NAME,
-      );
+      const completeToolDef = sentTools!.find((t) => t.name === TASK_COMPLETE_TOOL_NAME);
       expect(completeToolDef?.parameters?.required).toEqual([]);
-      expect(completeToolDef?.description).toContain(
-        'signal that you have completed',
-      );
+      expect(completeToolDef?.description).toContain("signal that you have completed");
 
-      expect(output.result).toBe('Task completed successfully.');
+      expect(output.result).toBe("Task completed successfully.");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
     });
 
-    it('should error immediately if the model stops tools without calling complete_task (Protocol Violation)', async () => {
+    it("should error immediately if the model stops tools without calling complete_task (Protocol Violation)", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '.' }, id: 'call1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "call1" }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: 'ok',
+          callId: "call1",
+          resultDisplay: "ok",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
                 response: {},
-                id: 'call1',
+                id: "call1",
               },
             },
           ],
@@ -670,20 +568,18 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 2 (protocol violation)
-      mockModelResponse([], 'I think I am done.');
+      mockModelResponse([], "I think I am done.");
 
       // Turn 3 (recovery turn - also fails)
-      mockModelResponse([], 'I still give up.');
+      mockModelResponse([], "I still give up.");
 
-      const output = await executor.run({ goal: 'Strict test' }, signal);
+      const output = await executor.run({ goal: "Strict test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(3);
 
       const expectedError = `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}'.`;
 
-      expect(output.terminate_reason).toBe(
-        AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
-      );
+      expect(output.terminate_reason).toBe(AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL);
       expect(output.result).toBe(expectedError);
 
       // Telemetry check for error
@@ -696,29 +592,25 @@ describe('AgentExecutor', () => {
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'protocol_violation',
+            context: "protocol_violation",
             error: expectedError,
           }),
         }),
       );
     });
 
-    it('should report an error if complete_task is called with missing required arguments', async () => {
+    it("should report an error if complete_task is called with missing required arguments", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Missing arg
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { wrongArg: 'oops' },
-          id: 'call1',
+          args: { wrongArg: "oops" },
+          id: "call1",
         },
       ]);
 
@@ -726,23 +618,22 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'Corrected result' },
-          id: 'call2',
+          args: { finalResult: "Corrected result" },
+          id: "call2",
         },
       ]);
 
-      const output = await executor.run({ goal: 'Error test' }, signal);
+      const output = await executor.run({ goal: "Error test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
 
-      const expectedError =
-        "Missing required argument 'finalResult' for completion.";
+      const expectedError = "Missing required argument 'finalResult' for completion.";
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: {
-            context: 'tool_call',
+            context: "tool_call",
             name: TASK_COMPLETE_TOOL_NAME,
             error: expectedError,
           },
@@ -759,67 +650,55 @@ describe('AgentExecutor', () => {
           functionResponse: expect.objectContaining({
             name: TASK_COMPLETE_TOOL_NAME,
             response: { error: expectedError },
-            id: 'call1',
+            id: "call1",
           }),
         }),
       );
 
-      expect(output.result).toBe('Corrected result');
+      expect(output.result).toBe("Corrected result");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
     });
 
-    it('should handle multiple calls to complete_task in the same turn (accept first, block rest)', async () => {
-      const definition = createTestDefinition([], {}, 'none');
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+    it("should handle multiple calls to complete_task in the same turn (accept first, block rest)", async () => {
+      const definition = createTestDefinition([], {}, "none");
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Duplicate calls
       mockModelResponse([
-        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: 'call1' },
-        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: 'call2' },
+        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: "call1" },
+        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: "call2" },
       ]);
 
-      const output = await executor.run({ goal: 'Dup test' }, signal);
+      const output = await executor.run({ goal: "Dup test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(1);
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
 
       const completions = activities.filter(
-        (a) =>
-          a.type === 'TOOL_CALL_END' &&
-          a.data['name'] === TASK_COMPLETE_TOOL_NAME,
+        (a) => a.type === "TOOL_CALL_END" && a.data["name"] === TASK_COMPLETE_TOOL_NAME,
       );
       const errors = activities.filter(
-        (a) => a.type === 'ERROR' && a.data['name'] === TASK_COMPLETE_TOOL_NAME,
+        (a) => a.type === "ERROR" && a.data["name"] === TASK_COMPLETE_TOOL_NAME,
       );
 
       expect(completions).toHaveLength(1);
       expect(errors).toHaveLength(1);
-      expect(errors[0].data['error']).toContain(
-        'Task already marked complete in this turn',
-      );
+      expect(errors[0].data["error"]).toContain("Task already marked complete in this turn");
     });
 
-    it('should execute parallel tool calls and then complete', async () => {
+    it("should execute parallel tool calls and then complete", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       const call1: FunctionCall = {
         name: LS_TOOL_NAME,
-        args: { path: '/a' },
-        id: 'c1',
+        args: { path: "/a" },
+        id: "c1",
       };
       const call2: FunctionCall = {
         name: LS_TOOL_NAME,
-        args: { path: '/b' },
-        id: 'c2',
+        args: { path: "/b" },
+        id: "c2",
       };
 
       // Turn 1: Parallel calls
@@ -837,13 +716,13 @@ describe('AgentExecutor', () => {
         if (callsStarted === 2) resolveCalls();
         await vi.advanceTimersByTimeAsync(100);
         return {
-          status: 'success',
+          status: "success",
           request: reqInfo,
           tool: {} as AnyDeclarativeTool,
           invocation: {} as AnyToolInvocation,
           response: {
             callId: reqInfo.callId,
-            resultDisplay: 'ok',
+            resultDisplay: "ok",
             responseParts: [
               {
                 functionResponse: {
@@ -864,12 +743,12 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'done' },
-          id: 'c3',
+          args: { finalResult: "done" },
+          id: "c3",
         },
       ]);
 
-      const runPromise = executor.run({ goal: 'Parallel' }, signal);
+      const runPromise = executor.run({ goal: "Parallel" }, signal);
 
       await vi.advanceTimersByTimeAsync(1);
       await bothStarted;
@@ -889,29 +768,25 @@ describe('AgentExecutor', () => {
       expect(parts).toEqual(
         expect.arrayContaining([
           expect.objectContaining({
-            functionResponse: expect.objectContaining({ id: 'c1' }),
+            functionResponse: expect.objectContaining({ id: "c1" }),
           }),
           expect.objectContaining({
-            functionResponse: expect.objectContaining({ id: 'c2' }),
+            functionResponse: expect.objectContaining({ id: "c2" }),
           }),
         ]),
       );
     });
 
-    it('SECURITY: should block unauthorized tools and provide explicit failure to model', async () => {
+    it("SECURITY: should block unauthorized tools and provide explicit failure to model", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Model tries to use a tool not in its config
-      const badCallId = 'bad_call_1';
+      const badCallId = "bad_call_1";
       mockModelResponse([
         {
           name: READ_FILE_TOOL_NAME,
-          args: { path: 'secret.txt' },
+          args: { path: "secret.txt" },
           id: badCallId,
         },
       ]);
@@ -920,16 +795,14 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'Could not read file.' },
-          id: 'c2',
+          args: { finalResult: "Could not read file." },
+          id: "c2",
         },
       ]);
 
-      const consoleWarnSpy = vi
-        .spyOn(debugLogger, 'warn')
-        .mockImplementation(() => {});
+      const consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
-      await executor.run({ goal: 'Sec test' }, signal);
+      await executor.run({ goal: "Sec test" }, signal);
 
       // Verify external executor was not called (Security held)
       expect(mockExecuteToolCall).not.toHaveBeenCalled();
@@ -950,7 +823,7 @@ describe('AgentExecutor', () => {
             id: badCallId,
             name: READ_FILE_TOOL_NAME,
             response: {
-              error: expect.stringContaining('Unauthorized tool call'),
+              error: expect.stringContaining("Unauthorized tool call"),
             },
           }),
         }),
@@ -959,9 +832,9 @@ describe('AgentExecutor', () => {
       // Verify Activity Stream reported the error
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'tool_call_unauthorized',
+            context: "tool_call_unauthorized",
             name: READ_FILE_TOOL_NAME,
           }),
         }),
@@ -969,26 +842,22 @@ describe('AgentExecutor', () => {
     });
   });
 
-  describe('Edge Cases and Error Handling', () => {
-    it('should report an error if complete_task output fails schema validation', async () => {
+  describe("Edge Cases and Error Handling", () => {
+    it("should report an error if complete_task output fails schema validation", async () => {
       const definition = createTestDefinition(
         [],
         {},
-        'default',
+        "default",
         z.string().min(10), // The schema is for the output value itself
       );
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Invalid arg (too short)
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'short' },
-          id: 'call1',
+          args: { finalResult: "short" },
+          id: "call1",
         },
       ]);
 
@@ -996,12 +865,12 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'This is a much longer and valid result' },
-          id: 'call2',
+          args: { finalResult: "This is a much longer and valid result" },
+          id: "call2",
         },
       ]);
 
-      const output = await executor.run({ goal: 'Validation test' }, signal);
+      const output = await executor.run({ goal: "Validation test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
 
@@ -1011,11 +880,11 @@ describe('AgentExecutor', () => {
       // Check that the error was reported in the activity stream
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: {
-            context: 'tool_call',
+            context: "tool_call",
             name: TASK_COMPLETE_TOOL_NAME,
-            error: expect.stringContaining('Output validation failed'),
+            error: expect.stringContaining("Output validation failed"),
           },
         }),
       );
@@ -1028,38 +897,34 @@ describe('AgentExecutor', () => {
           functionResponse: expect.objectContaining({
             name: TASK_COMPLETE_TOOL_NAME,
             response: { error: expectedError },
-            id: 'call1',
+            id: "call1",
           }),
         }),
       ]);
 
       // Check that the agent eventually succeeded
-      expect(output.result).toContain('This is a much longer and valid result');
+      expect(output.result).toContain("This is a much longer and valid result");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
     });
 
-    it('should throw and log if GeminiChat creation fails', async () => {
+    it("should throw and log if GeminiChat creation fails", async () => {
       const definition = createTestDefinition();
-      const initError = new Error('Chat creation failed');
+      const initError = new Error("Chat creation failed");
       MockedGeminiChat.mockImplementationOnce(() => {
         throw initError;
       });
 
       // We expect the error to be thrown during the run, not creation
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      await expect(executor.run({ goal: 'test' }, signal)).rejects.toThrow(
+      await expect(executor.run({ goal: "test" }, signal)).rejects.toThrow(
         `Failed to create chat object: ${initError}`,
       );
 
       // Ensure the error was reported via the activity callback
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
             error: `Error: Failed to create chat object: ${initError}`,
           }),
@@ -1075,47 +940,41 @@ describe('AgentExecutor', () => {
       );
     });
 
-    it('should handle a failed tool call and feed the error to the model', async () => {
+    it("should handle a failed tool call and feed the error to the model", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const toolErrorMessage = 'Tool failed spectacularly';
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const toolErrorMessage = "Tool failed spectacularly";
 
       // Turn 1: Model calls a tool that will fail
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '/fake' }, id: 'call1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "/fake" }, id: "call1" }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'error',
+        status: "error",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '/fake' },
+          args: { path: "/fake" },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: '',
+          callId: "call1",
+          resultDisplay: "",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
                 response: { error: toolErrorMessage },
-                id: 'call1',
+                id: "call1",
               },
             },
           ],
           error: {
-            type: 'ToolError',
+            type: "ToolError",
             message: toolErrorMessage,
           },
-          errorType: 'ToolError',
+          errorType: "ToolError",
           contentLength: 0,
         },
       });
@@ -1124,12 +983,12 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'Aborted due to tool failure.' },
-          id: 'call2',
+          args: { finalResult: "Aborted due to tool failure." },
+          id: "call2",
         },
       ]);
 
-      const output = await executor.run({ goal: 'Tool failure test' }, signal);
+      const output = await executor.run({ goal: "Tool failure test" }, signal);
 
       expect(mockExecuteToolCall).toHaveBeenCalledTimes(1);
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
@@ -1137,9 +996,9 @@ describe('AgentExecutor', () => {
       // Verify the error was reported in the activity stream
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: {
-            context: 'tool_call',
+            context: "tool_call",
             name: LS_TOOL_NAME,
             error: toolErrorMessage,
           },
@@ -1153,7 +1012,7 @@ describe('AgentExecutor', () => {
         expect.objectContaining({
           functionResponse: expect.objectContaining({
             name: LS_TOOL_NAME,
-            id: 'call1',
+            id: "call1",
             response: {
               error: toolErrorMessage,
             },
@@ -1162,30 +1021,28 @@ describe('AgentExecutor', () => {
       ]);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Aborted due to tool failure.');
+      expect(output.result).toBe("Aborted due to tool failure.");
     });
   });
 
-  describe('run (Termination Conditions)', () => {
+  describe("run (Termination Conditions)", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1193,51 +1050,46 @@ describe('AgentExecutor', () => {
       });
     };
 
-    it('should terminate when max_turns is reached', async () => {
+    it("should terminate when max_turns is reached", async () => {
       const MAX = 2;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
       });
       const executor = await AgentExecutor.create(definition, mockConfig);
 
-      mockWorkResponse('t1');
-      mockWorkResponse('t2');
+      mockWorkResponse("t1");
+      mockWorkResponse("t2");
       // Recovery turn
-      mockModelResponse([], 'I give up');
+      mockModelResponse([], "I give up");
 
-      const output = await executor.run({ goal: 'Turns test' }, signal);
+      const output = await executor.run({ goal: "Turns test" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.MAX_TURNS);
       expect(mockSendMessageStream).toHaveBeenCalledTimes(MAX + 1);
     });
 
-    it('should terminate with TIMEOUT if a model call takes too long', async () => {
+    it("should terminate with TIMEOUT if a model call takes too long", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 0.5, // 30 seconds
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Mock a model call that is interruptible by an abort signal.
-      mockSendMessageStream.mockImplementationOnce(
-        async (_key, _message, _promptId, signal) =>
-          // eslint-disable-next-line require-yield
-          (async function* () {
-            await new Promise<void>((resolve) => {
-              // This promise resolves when aborted, ending the generator.
-              signal?.addEventListener('abort', () => {
-                resolve();
-              });
+      mockSendMessageStream.mockImplementationOnce(async (_key, _message, _promptId, signal) =>
+        // eslint-disable-next-line require-yield
+        (async function* () {
+          await new Promise<void>((resolve) => {
+            // This promise resolves when aborted, ending the generator.
+            signal?.addEventListener("abort", () => {
+              resolve();
             });
-          })(),
+          });
+        })(),
       );
       // Recovery turn
-      mockModelResponse([], 'I give up');
+      mockModelResponse([], "I give up");
 
-      const runPromise = executor.run({ goal: 'Timeout test' }, signal);
+      const runPromise = executor.run({ goal: "Timeout test" }, signal);
 
       // Advance time past the timeout to trigger the abort.
       await vi.advanceTimersByTimeAsync(31 * 1000);
@@ -1245,16 +1097,16 @@ describe('AgentExecutor', () => {
       const output = await runPromise;
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.TIMEOUT);
-      expect(output.result).toContain('Agent timed out after 0.5 minutes.');
+      expect(output.result).toContain("Agent timed out after 0.5 minutes.");
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
 
       // Verify activity stream reported the timeout
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'timeout',
-            error: 'Agent timed out after 0.5 minutes.',
+            context: "timeout",
+            error: "Agent timed out after 0.5 minutes.",
           }),
         }),
       );
@@ -1268,27 +1120,25 @@ describe('AgentExecutor', () => {
       );
     });
 
-    it('should terminate with TIMEOUT if a tool call takes too long', async () => {
+    it("should terminate with TIMEOUT if a tool call takes too long", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 1,
       });
       const executor = await AgentExecutor.create(definition, mockConfig);
 
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '.' }, id: 't1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "t1" }]);
 
       // Long running tool
       mockExecuteToolCall.mockImplementationOnce(async (_ctx, reqInfo) => {
         await vi.advanceTimersByTimeAsync(61 * 1000);
         return {
-          status: 'success',
+          status: "success",
           request: reqInfo,
           tool: {} as AnyDeclarativeTool,
           invocation: {} as AnyToolInvocation,
           response: {
-            callId: 't1',
-            resultDisplay: 'ok',
+            callId: "t1",
+            resultDisplay: "ok",
             responseParts: [],
             error: undefined,
             errorType: undefined,
@@ -1298,15 +1148,15 @@ describe('AgentExecutor', () => {
       });
 
       // Recovery turn
-      mockModelResponse([], 'I give up');
+      mockModelResponse([], "I give up");
 
-      const output = await executor.run({ goal: 'Timeout test' }, signal);
+      const output = await executor.run({ goal: "Timeout test" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.TIMEOUT);
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
     });
 
-    it('should terminate when AbortSignal is triggered', async () => {
+    it("should terminate when AbortSignal is triggered", async () => {
       const definition = createTestDefinition();
       const executor = await AgentExecutor.create(definition, mockConfig);
 
@@ -1314,40 +1164,36 @@ describe('AgentExecutor', () => {
         (async function* () {
           yield {
             type: StreamEventType.CHUNK,
-            value: createMockResponseChunk([
-              { text: 'Thinking...', thought: true },
-            ]),
+            value: createMockResponseChunk([{ text: "Thinking...", thought: true }]),
           } as StreamEvent;
           abortController.abort();
         })(),
       );
 
-      const output = await executor.run({ goal: 'Abort test' }, signal);
+      const output = await executor.run({ goal: "Abort test" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.ABORTED);
     });
   });
 
-  describe('run (Recovery Turns)', () => {
+  describe("run (Recovery Turns)", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1355,194 +1201,165 @@ describe('AgentExecutor', () => {
       });
     };
 
-    it('should recover successfully if complete_task is called during the grace turn after MAX_TURNS', async () => {
+    it("should recover successfully if complete_task is called during the grace turn after MAX_TURNS", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (succeeds)
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered!' },
-            id: 't2',
+            args: { finalResult: "Recovered!" },
+            id: "t2",
           },
         ],
-        'Recovering from max turns',
+        "Recovering from max turns",
       );
 
-      const output = await executor.run({ goal: 'Turns recovery' }, signal);
+      const output = await executor.run({ goal: "Turns recovery" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Recovered!');
+      expect(output.result).toBe("Recovered!");
       expect(mockSendMessageStream).toHaveBeenCalledTimes(MAX + 1); // 1 regular + 1 recovery
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
+          type: "THOUGHT_CHUNK",
           data: {
-            text: 'Execution limit reached (MAX_TURNS). Attempting one final recovery turn with a grace period.',
+            text: "Execution limit reached (MAX_TURNS). Attempting one final recovery turn with a grace period.",
           },
         }),
       );
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
-          data: { text: 'Graceful recovery succeeded.' },
+          type: "THOUGHT_CHUNK",
+          data: { text: "Graceful recovery succeeded." },
         }),
       );
     });
 
-    it('should fail if complete_task is NOT called during the grace turn after MAX_TURNS', async () => {
+    it("should fail if complete_task is NOT called during the grace turn after MAX_TURNS", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (fails by calling no tools)
-      mockModelResponse([], 'I give up again.');
+      mockModelResponse([], "I give up again.");
 
-      const output = await executor.run(
-        { goal: 'Turns recovery fail' },
-        signal,
-      );
+      const output = await executor.run({ goal: "Turns recovery fail" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.MAX_TURNS);
-      expect(output.result).toContain('Agent reached max turns limit');
+      expect(output.result).toContain("Agent reached max turns limit");
       expect(mockSendMessageStream).toHaveBeenCalledTimes(MAX + 1);
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'recovery_turn',
-            error: 'Graceful recovery attempt failed. Reason: stop',
+            context: "recovery_turn",
+            error: "Graceful recovery attempt failed. Reason: stop",
           }),
         }),
       );
     });
 
-    it('should recover successfully from a protocol violation (no complete_task)', async () => {
+    it("should recover successfully from a protocol violation (no complete_task)", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Normal work
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Turn 2: Protocol violation (no tool calls)
-      mockModelResponse([], 'I think I am done, but I forgot the right tool.');
+      mockModelResponse([], "I think I am done, but I forgot the right tool.");
 
       // Turn 3: Recovery turn (succeeds)
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered from violation!' },
-            id: 't3',
+            args: { finalResult: "Recovered from violation!" },
+            id: "t3",
           },
         ],
-        'My mistake, here is the completion.',
+        "My mistake, here is the completion.",
       );
 
-      const output = await executor.run({ goal: 'Violation recovery' }, signal);
+      const output = await executor.run({ goal: "Violation recovery" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(3);
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Recovered from violation!');
+      expect(output.result).toBe("Recovered from violation!");
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
+          type: "THOUGHT_CHUNK",
           data: {
-            text: 'Execution limit reached (ERROR_NO_COMPLETE_TASK_CALL). Attempting one final recovery turn with a grace period.',
+            text: "Execution limit reached (ERROR_NO_COMPLETE_TASK_CALL). Attempting one final recovery turn with a grace period.",
           },
         }),
       );
     });
 
-    it('should fail recovery from a protocol violation if it violates again', async () => {
+    it("should fail recovery from a protocol violation if it violates again", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Normal work
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Turn 2: Protocol violation (no tool calls)
-      mockModelResponse([], 'I think I am done, but I forgot the right tool.');
+      mockModelResponse([], "I think I am done, but I forgot the right tool.");
 
       // Turn 3: Recovery turn (fails again)
-      mockModelResponse([], 'I still dont know what to do.');
+      mockModelResponse([], "I still dont know what to do.");
 
-      const output = await executor.run(
-        { goal: 'Violation recovery fail' },
-        signal,
-      );
+      const output = await executor.run({ goal: "Violation recovery fail" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(3);
-      expect(output.terminate_reason).toBe(
-        AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
-      );
+      expect(output.terminate_reason).toBe(AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL);
       expect(output.result).toContain(
         `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}'`,
       );
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'recovery_turn',
-            error: 'Graceful recovery attempt failed. Reason: stop',
+            context: "recovery_turn",
+            error: "Graceful recovery attempt failed. Reason: stop",
           }),
         }),
       );
     });
 
-    it('should recover successfully from a TIMEOUT', async () => {
+    it("should recover successfully from a TIMEOUT", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 0.5, // 30 seconds
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Mock a model call that gets interrupted by the timeout.
-      mockSendMessageStream.mockImplementationOnce(
-        async (_key, _message, _promptId, signal) =>
-          // eslint-disable-next-line require-yield
-          (async function* () {
-            // This promise never resolves, it waits for abort.
-            await new Promise<void>((resolve) => {
-              signal?.addEventListener('abort', () => resolve());
-            });
-          })(),
+      mockSendMessageStream.mockImplementationOnce(async (_key, _message, _promptId, signal) =>
+        // eslint-disable-next-line require-yield
+        (async function* () {
+          // This promise never resolves, it waits for abort.
+          await new Promise<void>((resolve) => {
+            signal?.addEventListener("abort", () => resolve());
+          });
+        })(),
       );
 
       // Recovery turn (succeeds)
@@ -1550,14 +1367,14 @@ describe('AgentExecutor', () => {
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered from timeout!' },
-            id: 't2',
+            args: { finalResult: "Recovered from timeout!" },
+            id: "t2",
           },
         ],
-        'Apologies for the delay, finishing up.',
+        "Apologies for the delay, finishing up.",
       );
 
-      const runPromise = executor.run({ goal: 'Timeout recovery' }, signal);
+      const runPromise = executor.run({ goal: "Timeout recovery" }, signal);
 
       // Advance time past the timeout to trigger the abort and recovery.
       await vi.advanceTimersByTimeAsync(31 * 1000);
@@ -1566,53 +1383,40 @@ describe('AgentExecutor', () => {
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2); // 1 failed + 1 recovery
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Recovered from timeout!');
+      expect(output.result).toBe("Recovered from timeout!");
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
+          type: "THOUGHT_CHUNK",
           data: {
-            text: 'Execution limit reached (TIMEOUT). Attempting one final recovery turn with a grace period.',
+            text: "Execution limit reached (TIMEOUT). Attempting one final recovery turn with a grace period.",
           },
         }),
       );
     });
 
-    it('should fail recovery from a TIMEOUT if the grace period also times out', async () => {
+    it("should fail recovery from a TIMEOUT if the grace period also times out", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 0.5, // 30 seconds
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      mockSendMessageStream.mockImplementationOnce(
-        async (_key, _message, _promptId, signal) =>
-          // eslint-disable-next-line require-yield
-          (async function* () {
-            await new Promise<void>((resolve) =>
-              signal?.addEventListener('abort', () => resolve()),
-            );
-          })(),
+      mockSendMessageStream.mockImplementationOnce(async (_key, _message, _promptId, signal) =>
+        // eslint-disable-next-line require-yield
+        (async function* () {
+          await new Promise<void>((resolve) => signal?.addEventListener("abort", () => resolve()));
+        })(),
       );
 
       // Mock the recovery call to also be long-running
-      mockSendMessageStream.mockImplementationOnce(
-        async (_key, _message, _promptId, signal) =>
-          // eslint-disable-next-line require-yield
-          (async function* () {
-            await new Promise<void>((resolve) =>
-              signal?.addEventListener('abort', () => resolve()),
-            );
-          })(),
+      mockSendMessageStream.mockImplementationOnce(async (_key, _message, _promptId, signal) =>
+        // eslint-disable-next-line require-yield
+        (async function* () {
+          await new Promise<void>((resolve) => signal?.addEventListener("abort", () => resolve()));
+        })(),
       );
 
-      const runPromise = executor.run(
-        { goal: 'Timeout recovery fail' },
-        signal,
-      );
+      const runPromise = executor.run({ goal: "Timeout recovery fail" }, signal);
 
       // 1. Trigger the main timeout
       await vi.advanceTimersByTimeAsync(31 * 1000);
@@ -1625,39 +1429,37 @@ describe('AgentExecutor', () => {
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
       expect(output.terminate_reason).toBe(AgentTerminateMode.TIMEOUT);
-      expect(output.result).toContain('Agent timed out after 0.5 minutes.');
+      expect(output.result).toContain("Agent timed out after 0.5 minutes.");
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'recovery_turn',
-            error: 'Graceful recovery attempt failed. Reason: stop',
+            context: "recovery_turn",
+            error: "Graceful recovery attempt failed. Reason: stop",
           }),
         }),
       );
     });
   });
-  describe('Telemetry and Logging', () => {
+  describe("Telemetry and Logging", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1669,7 +1471,7 @@ describe('AgentExecutor', () => {
       mockedLogRecoveryAttempt.mockClear();
     });
 
-    it('should log a RecoveryAttemptEvent when a recoverable error occurs and recovery fails', async () => {
+    it("should log a RecoveryAttemptEvent when a recoverable error occurs and recovery fails", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
@@ -1677,12 +1479,12 @@ describe('AgentExecutor', () => {
       const executor = await AgentExecutor.create(definition, mockConfig);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (fails by calling no tools)
-      mockModelResponse([], 'I give up again.');
+      mockModelResponse([], "I give up again.");
 
-      await executor.run({ goal: 'Turns recovery fail' }, signal);
+      await executor.run({ goal: "Turns recovery fail" }, signal);
 
       expect(mockedLogRecoveryAttempt).toHaveBeenCalledTimes(1);
       const recoveryEvent = mockedLogRecoveryAttempt.mock.calls[0][1];
@@ -1694,7 +1496,7 @@ describe('AgentExecutor', () => {
       expect(recoveryEvent.duration_ms).toBeGreaterThanOrEqual(0);
     });
 
-    it('should log a successful RecoveryAttemptEvent when recovery succeeds', async () => {
+    it("should log a successful RecoveryAttemptEvent when recovery succeeds", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
@@ -1702,21 +1504,21 @@ describe('AgentExecutor', () => {
       const executor = await AgentExecutor.create(definition, mockConfig);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (succeeds)
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered!' },
-            id: 't2',
+            args: { finalResult: "Recovered!" },
+            id: "t2",
           },
         ],
-        'Recovering from max turns',
+        "Recovering from max turns",
       );
 
-      await executor.run({ goal: 'Turns recovery success' }, signal);
+      await executor.run({ goal: "Turns recovery success" }, signal);
 
       expect(mockedLogRecoveryAttempt).toHaveBeenCalledTimes(1);
       const recoveryEvent = mockedLogRecoveryAttempt.mock.calls[0][1];
@@ -1725,26 +1527,24 @@ describe('AgentExecutor', () => {
       expect(recoveryEvent.reason).toBe(AgentTerminateMode.MAX_TURNS);
     });
   });
-  describe('Chat Compression', () => {
+  describe("Chat Compression", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1752,13 +1552,9 @@ describe('AgentExecutor', () => {
       });
     };
 
-    it('should attempt to compress chat history on each turn', async () => {
+    it("should attempt to compress chat history on each turn", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Mock compression to do nothing
       mockCompress.mockResolvedValue({
@@ -1767,35 +1563,29 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 1
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Turn 2: Complete
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 'call2',
+            args: { finalResult: "Done" },
+            id: "call2",
           },
         ],
-        'T2',
+        "T2",
       );
 
-      await executor.run({ goal: 'Compress test' }, signal);
+      await executor.run({ goal: "Compress test" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(2);
     });
 
-    it('should update chat history when compression is successful', async () => {
+    it("should update chat history when compression is successful", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const compressedHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'compressed' }] },
-      ];
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const compressedHistory: Content[] = [{ role: "user", parts: [{ text: "compressed" }] }];
 
       mockCompress.mockResolvedValue({
         newHistory: compressedHistory,
@@ -1807,34 +1597,29 @@ describe('AgentExecutor', () => {
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 'call1',
+            args: { finalResult: "Done" },
+            id: "call1",
           },
         ],
-        'T1',
+        "T1",
       );
 
-      await executor.run({ goal: 'Compress success' }, signal);
+      await executor.run({ goal: "Compress success" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(1);
       expect(mockSetHistory).toHaveBeenCalledTimes(1);
       expect(mockSetHistory).toHaveBeenCalledWith(compressedHistory);
     });
 
-    it('should pass hasFailedCompressionAttempt=true to compression after a failure', async () => {
+    it("should pass hasFailedCompressionAttempt=true to compression after a failure", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // First call fails
       mockCompress.mockResolvedValueOnce({
         newHistory: null,
         info: {
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         },
       });
       // Second call is neutral
@@ -1844,20 +1629,20 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 1
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
       // Turn 2: Complete
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 't2',
+            args: { finalResult: "Done" },
+            id: "t2",
           },
         ],
-        'T2',
+        "T2",
       );
 
-      await executor.run({ goal: 'Compress fail' }, signal);
+      await executor.run({ goal: "Compress fail" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(2);
       // First call, hasFailedCompressionAttempt is false
@@ -1866,23 +1651,16 @@ describe('AgentExecutor', () => {
       expect(mockCompress.mock.calls[1][5]).toBe(true);
     });
 
-    it('should reset hasFailedCompressionAttempt flag after a successful compression', async () => {
+    it("should reset hasFailedCompressionAttempt flag after a successful compression", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const compressedHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'compressed' }] },
-      ];
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const compressedHistory: Content[] = [{ role: "user", parts: [{ text: "compressed" }] }];
 
       // Turn 1: Fails
       mockCompress.mockResolvedValueOnce({
         newHistory: null,
         info: {
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         },
       });
       // Turn 2: Succeeds
@@ -1897,22 +1675,22 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 1
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
       // Turn 2
-      mockWorkResponse('t2');
+      mockWorkResponse("t2");
       // Turn 3: Complete
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 't3',
+            args: { finalResult: "Done" },
+            id: "t3",
           },
         ],
-        'T3',
+        "T3",
       );
 
-      await executor.run({ goal: 'Compress reset' }, signal);
+      await executor.run({ goal: "Compress reset" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(3);
       // Call 1: hasFailed... is false
diff --git a/packages/gemini-cli-core/src/agents/executor.ts b/packages/gemini-cli-core/src/agents/executor.ts
index 2a3b812a6..35434c8cb 100644
--- a/packages/gemini-cli-core/src/agents/executor.ts
+++ b/packages/gemini-cli-core/src/agents/executor.ts
@@ -4,22 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { reportError } from '../utils/errorReporting.js';
-import { GeminiChat, StreamEventType } from '../core/geminiChat.js';
-import { Type } from '@google/genai';
-import type {
-  Content,
-  Part,
-  FunctionCall,
-  FunctionDeclaration,
-  Schema,
-} from '@google/genai';
-import { executeToolCall } from '../core/nonInteractiveToolExecutor.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { type ToolCallRequestInfo, CompressionStatus } from '../core/turn.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-import { getDirectoryContextString } from '../utils/environmentContext.js';
+import type { Content, FunctionCall, FunctionDeclaration, Part, Schema } from "@google/genai";
+import { Type } from "@google/genai";
+import { type z } from "zod";
+import { zodToJsonSchema } from "zod-to-json-schema";
+import type { Config } from "../config/config.js";
+import { GeminiChat, StreamEventType } from "../core/geminiChat.js";
+import { executeToolCall } from "../core/nonInteractiveToolExecutor.js";
+import { CompressionStatus, type ToolCallRequestInfo } from "../core/turn.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import { logAgentFinish, logAgentStart, logRecoveryAttempt } from "../telemetry/loggers.js";
+import { AgentFinishEvent, AgentStartEvent, RecoveryAttemptEvent } from "../telemetry/types.js";
 import {
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
@@ -28,46 +23,32 @@ import {
   READ_FILE_TOOL_NAME,
   READ_MANY_FILES_TOOL_NAME,
   WEB_SEARCH_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { promptIdContext } from '../utils/promptIdContext.js';
-import {
-  logAgentStart,
-  logAgentFinish,
-  logRecoveryAttempt,
-} from '../telemetry/loggers.js';
-import {
-  AgentStartEvent,
-  AgentFinishEvent,
-  RecoveryAttemptEvent,
-} from '../telemetry/types.js';
-import type {
-  AgentDefinition,
-  AgentInputs,
-  OutputObject,
-  SubagentActivityEvent,
-} from './types.js';
-import { AgentTerminateMode } from './types.js';
-import { templateString } from './utils.js';
-import { parseThought } from '../utils/thoughtUtils.js';
-import { type z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import { debugLogger } from '../utils/debugLogger.js';
-import { getModelConfigAlias } from './registry.js';
+} from "../tools/tool-names.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getDirectoryContextString } from "../utils/environmentContext.js";
+import { reportError } from "../utils/errorReporting.js";
+import { promptIdContext } from "../utils/promptIdContext.js";
+import { parseThought } from "../utils/thoughtUtils.js";
+import { getModelConfigAlias } from "./registry.js";
+import type { AgentDefinition, AgentInputs, OutputObject, SubagentActivityEvent } from "./types.js";
+import { AgentTerminateMode } from "./types.js";
+import { templateString } from "./utils.js";
 
 /** A callback function to report on agent activity. */
 export type ActivityCallback = (activity: SubagentActivityEvent) => void;
 
-const TASK_COMPLETE_TOOL_NAME = 'complete_task';
+const TASK_COMPLETE_TOOL_NAME = "complete_task";
 const GRACE_PERIOD_MS = 60 * 1000; // 1 min
 
 /** The possible outcomes of a single agent turn. */
 type AgentTurnResult =
   | {
-      status: 'continue';
+      status: "continue";
       nextMessage: Content;
     }
   | {
-      status: 'stop';
+      status: "stop";
       terminateReason: AgentTerminateMode;
       finalResult: string | null;
     };
@@ -110,18 +91,14 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     if (definition.toolConfig) {
       for (const toolRef of definition.toolConfig.tools) {
-        if (typeof toolRef === 'string') {
+        if (typeof toolRef === "string") {
           // If the tool is referenced by name, retrieve it from the parent
           // registry and register it with the agent's isolated registry.
           const toolFromParent = parentToolRegistry.getTool(toolRef);
           if (toolFromParent) {
             agentToolRegistry.registerTool(toolFromParent);
           }
-        } else if (
-          typeof toolRef === 'object' &&
-          'name' in toolRef &&
-          'build' in toolRef
-        ) {
+        } else if (typeof toolRef === "object" && "name" in toolRef && "build" in toolRef) {
           agentToolRegistry.registerTool(toolRef);
         }
         // Note: Raw `FunctionDeclaration` objects in the config don't need to be
@@ -168,7 +145,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const randomIdPart = Math.random().toString(36).slice(2, 8);
     // parentPromptId will be undefined if this agent is invoked directly
     // (top-level), rather than as a sub-agent.
-    const parentPrefix = parentPromptId ? `${parentPromptId}-` : '';
+    const parentPrefix = parentPromptId ? `${parentPromptId}-` : "";
     this.agentId = `${parentPrefix}${this.definition.name}-${randomIdPart}`;
   }
 
@@ -199,7 +176,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         ? AgentTerminateMode.TIMEOUT
         : AgentTerminateMode.ABORTED;
       return {
-        status: 'stop',
+        status: "stop",
         terminateReason,
         finalResult: null, // 'run' method will set the final timeout string
       };
@@ -207,24 +184,27 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     // If the model stops calling tools without calling complete_task, it's an error.
     if (functionCalls.length === 0) {
-      this.emitActivity('ERROR', {
+      this.emitActivity("ERROR", {
         error: `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}' to finalize the session.`,
-        context: 'protocol_violation',
+        context: "protocol_violation",
       });
       return {
-        status: 'stop',
+        status: "stop",
         terminateReason: AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
         finalResult: null,
       };
     }
 
-    const { nextMessage, submittedOutput, taskCompleted } =
-      await this.processFunctionCalls(functionCalls, combinedSignal, promptId);
+    const { nextMessage, submittedOutput, taskCompleted } = await this.processFunctionCalls(
+      functionCalls,
+      combinedSignal,
+      promptId,
+    );
 
     if (taskCompleted) {
-      const finalResult = submittedOutput ?? 'Task completed successfully.';
+      const finalResult = submittedOutput ?? "Task completed successfully.";
       return {
-        status: 'stop',
+        status: "stop",
         terminateReason: AgentTerminateMode.GOAL,
         finalResult,
       };
@@ -232,7 +212,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     // Task is not complete, continue to the next turn.
     return {
-      status: 'continue',
+      status: "continue",
       nextMessage,
     };
   }
@@ -246,16 +226,16 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       | AgentTerminateMode.MAX_TURNS
       | AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
   ): string {
-    let explanation = '';
+    let explanation = "";
     switch (reason) {
       case AgentTerminateMode.TIMEOUT:
-        explanation = 'You have exceeded the time limit.';
+        explanation = "You have exceeded the time limit.";
         break;
       case AgentTerminateMode.MAX_TURNS:
-        explanation = 'You have exceeded the maximum number of turns.';
+        explanation = "You have exceeded the maximum number of turns.";
         break;
       case AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL:
-        explanation = 'You have stopped calling tools without finishing.';
+        explanation = "You have stopped calling tools without finishing.";
         break;
       default:
         throw new Error(`Unknown terminate reason: ${reason}`);
@@ -278,7 +258,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       | AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
     externalSignal: AbortSignal, // The original signal passed to run()
   ): Promise<string | null> {
-    this.emitActivity('THOUGHT_CHUNK', {
+    this.emitActivity("THOUGHT_CHUNK", {
       text: `Execution limit reached (${reason}). Attempting one final recovery turn with a grace period.`,
     });
 
@@ -288,21 +268,18 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const gracePeriodMs = GRACE_PERIOD_MS;
     const graceTimeoutController = new AbortController();
     const graceTimeoutId = setTimeout(
-      () => graceTimeoutController.abort(new Error('Grace period timed out.')),
+      () => graceTimeoutController.abort(new Error("Grace period timed out.")),
       gracePeriodMs,
     );
 
     try {
       const recoveryMessage: Content = {
-        role: 'user',
+        role: "user",
         parts: [{ text: this.getFinalWarningMessage(reason) }],
       };
 
       // We monitor both the external signal and our new grace period timeout
-      const combinedSignal = AbortSignal.any([
-        externalSignal,
-        graceTimeoutController.signal,
-      ]);
+      const combinedSignal = AbortSignal.any([externalSignal, graceTimeoutController.signal]);
 
       const turnResult = await this.executeTurn(
         chat,
@@ -312,29 +289,26 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         graceTimeoutController.signal, // Pass grace signal to identify a *grace* timeout
       );
 
-      if (
-        turnResult.status === 'stop' &&
-        turnResult.terminateReason === AgentTerminateMode.GOAL
-      ) {
+      if (turnResult.status === "stop" && turnResult.terminateReason === AgentTerminateMode.GOAL) {
         // Success!
-        this.emitActivity('THOUGHT_CHUNK', {
-          text: 'Graceful recovery succeeded.',
+        this.emitActivity("THOUGHT_CHUNK", {
+          text: "Graceful recovery succeeded.",
         });
         success = true;
-        return turnResult.finalResult ?? 'Task completed during grace period.';
+        return turnResult.finalResult ?? "Task completed during grace period.";
       }
 
       // Any other outcome (continue, error, non-GOAL stop) is a failure.
-      this.emitActivity('ERROR', {
+      this.emitActivity("ERROR", {
         error: `Graceful recovery attempt failed. Reason: ${turnResult.status}`,
-        context: 'recovery_turn',
+        context: "recovery_turn",
       });
       return null;
     } catch (error) {
       // This catch block will likely catch the 'Grace period timed out' error.
-      this.emitActivity('ERROR', {
+      this.emitActivity("ERROR", {
         error: `Graceful recovery attempt failed: ${String(error)}`,
-        context: 'recovery_turn',
+        context: "recovery_turn",
       });
       return null;
     } finally {
@@ -369,17 +343,14 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const { max_time_minutes } = this.definition.runConfig;
     const timeoutController = new AbortController();
     const timeoutId = setTimeout(
-      () => timeoutController.abort(new Error('Agent timed out.')),
+      () => timeoutController.abort(new Error("Agent timed out.")),
       max_time_minutes * 60 * 1000,
     );
 
     // Combine the external signal with the internal timeout signal.
     const combinedSignal = AbortSignal.any([signal, timeoutController.signal]);
 
-    logAgentStart(
-      this.runtimeContext,
-      new AgentStartEvent(this.agentId, this.definition.name),
-    );
+    logAgentStart(this.runtimeContext, new AgentStartEvent(this.agentId, this.definition.name));
 
     let chat: GeminiChat | undefined;
     let tools: FunctionDeclaration[] | undefined;
@@ -388,8 +359,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       chat = await this.createChatObject(inputs, tools);
       const query = this.definition.promptConfig.query
         ? templateString(this.definition.promptConfig.query, inputs)
-        : 'Get Started!';
-      let currentMessage: Content = { role: 'user', parts: [{ text: query }] };
+        : "Get Started!";
+      let currentMessage: Content = { role: "user", parts: [{ text: query }] };
 
       while (true) {
         // Check for termination conditions like max turns.
@@ -416,7 +387,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           timeoutController.signal,
         );
 
-        if (turnResult.status === 'stop') {
+        if (turnResult.status === "stop") {
           terminateReason = turnResult.terminateReason;
           // Only set finalResult if the turn provided one (e.g., error or goal).
           if (turnResult.finalResult) {
@@ -452,26 +423,24 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           // Recovery Failed. Set the final error message based on the *original* reason.
           if (terminateReason === AgentTerminateMode.TIMEOUT) {
             finalResult = `Agent timed out after ${this.definition.runConfig.max_time_minutes} minutes.`;
-            this.emitActivity('ERROR', {
+            this.emitActivity("ERROR", {
               error: finalResult,
-              context: 'timeout',
+              context: "timeout",
             });
           } else if (terminateReason === AgentTerminateMode.MAX_TURNS) {
             finalResult = `Agent reached max turns limit (${this.definition.runConfig.max_turns}).`;
-            this.emitActivity('ERROR', {
+            this.emitActivity("ERROR", {
               error: finalResult,
-              context: 'max_turns',
+              context: "max_turns",
             });
-          } else if (
-            terminateReason === AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL
-          ) {
+          } else if (terminateReason === AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL) {
             // The finalResult was already set by executeTurn, but we re-emit just in case.
             finalResult =
               finalResult ||
               `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}'.`;
-            this.emitActivity('ERROR', {
+            this.emitActivity("ERROR", {
               error: finalResult,
-              context: 'protocol_violation',
+              context: "protocol_violation",
             });
           }
         }
@@ -480,21 +449,20 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       // === FINAL RETURN LOGIC ===
       if (terminateReason === AgentTerminateMode.GOAL) {
         return {
-          result: finalResult || 'Task completed.',
+          result: finalResult || "Task completed.",
           terminate_reason: terminateReason,
         };
       }
 
       return {
-        result:
-          finalResult || 'Agent execution was terminated before completion.',
+        result: finalResult || "Agent execution was terminated before completion.",
         terminate_reason: terminateReason,
       };
     } catch (error) {
       // Check if the error is an AbortError caused by our internal timeout.
       if (
         error instanceof Error &&
-        error.name === 'AbortError' &&
+        error.name === "AbortError" &&
         timeoutController.signal.aborted &&
         !signal.aborted // Ensure the external signal was not the cause
       ) {
@@ -522,9 +490,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
         // Recovery failed or wasn't possible
         finalResult = `Agent timed out after ${this.definition.runConfig.max_time_minutes} minutes.`;
-        this.emitActivity('ERROR', {
+        this.emitActivity("ERROR", {
           error: finalResult,
-          context: 'timeout',
+          context: "timeout",
         });
         return {
           result: finalResult,
@@ -532,7 +500,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         };
       }
 
-      this.emitActivity('ERROR', { error: String(error) });
+      this.emitActivity("ERROR", { error: String(error) });
       throw error; // Re-throw other errors or external aborts.
     } finally {
       clearTimeout(timeoutId);
@@ -549,10 +517,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     }
   }
 
-  private async tryCompressChat(
-    chat: GeminiChat,
-    prompt_id: string,
-  ): Promise<void> {
+  private async tryCompressChat(chat: GeminiChat, prompt_id: string): Promise<void> {
     const model = this.definition.modelConfig.model;
 
     const { newHistory, info } = await this.compressionService.compress(
@@ -564,10 +529,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       this.hasFailedCompressionAttempt,
     );
 
-    if (
-      info.compressionStatus ===
-      CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT
-    ) {
+    if (info.compressionStatus === CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT) {
       this.hasFailedCompressionAttempt = true;
     } else if (info.compressionStatus === CompressionStatus.COMPRESSED) {
       if (newHistory) {
@@ -599,7 +561,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     );
 
     const functionCalls: FunctionCall[] = [];
-    let textResponse = '';
+    let textResponse = "";
 
     for await (const resp of responseStream) {
       if (signal.aborted) break;
@@ -609,11 +571,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         const parts = chunk.candidates?.[0]?.content?.parts;
 
         // Extract and emit any subject "thought" content from the model.
-        const { subject } = parseThought(
-          parts?.find((p) => p.thought)?.text || '',
-        );
+        const { subject } = parseThought(parts?.find((p) => p.thought)?.text || "");
         if (subject) {
-          this.emitActivity('THOUGHT_CHUNK', { text: subject });
+          this.emitActivity("THOUGHT_CHUNK", { text: subject });
         }
 
         // Collect any function calls requested by the model.
@@ -626,7 +586,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           parts
             ?.filter((p) => !p.thought && p.text)
             .map((p) => p.text)
-            .join('') || '';
+            .join("") || "";
 
         if (text) {
           textResponse += text;
@@ -645,9 +605,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const { promptConfig } = this.definition;
 
     if (!promptConfig.systemPrompt && !promptConfig.initialMessages) {
-      throw new Error(
-        'PromptConfig must define either `systemPrompt` or `initialMessages`.',
-      );
+      throw new Error("PromptConfig must define either `systemPrompt` or `initialMessages`.");
     }
 
     const startHistory = this.applyTemplateToInitialMessages(
@@ -672,7 +630,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         error,
         `Error initializing Gemini chat for agent ${this.definition.name}.`,
         startHistory,
-        'startChat',
+        "startChat",
       );
       // Re-throw as a more specific error after reporting.
       throw new Error(`Failed to create chat object: ${error}`);
@@ -709,7 +667,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       const callId = functionCall.id ?? `${promptId}-${index}`;
       const args = (functionCall.args ?? {}) as Record<string, unknown>;
 
-      this.emitActivity('TOOL_CALL_START', {
+      this.emitActivity("TOOL_CALL_START", {
         name: functionCall.name,
         args,
       });
@@ -717,8 +675,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       if (functionCall.name === TASK_COMPLETE_TOOL_NAME) {
         if (taskCompleted) {
           // We already have a completion from this turn. Ignore subsequent ones.
-          const error =
-            'Task already marked complete in this turn. Ignoring duplicate call.';
+          const error = "Task already marked complete in this turn. Ignoring duplicate call.";
           syncResponseParts.push({
             functionResponse: {
               name: TASK_COMPLETE_TOOL_NAME,
@@ -726,8 +683,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
               id: callId,
             },
           });
-          this.emitActivity('ERROR', {
-            context: 'tool_call',
+          this.emitActivity("ERROR", {
+            context: "tool_call",
             name: functionCall.name,
             error,
           });
@@ -753,8 +710,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
                   id: callId,
                 },
               });
-              this.emitActivity('ERROR', {
-                context: 'tool_call',
+              this.emitActivity("ERROR", {
+                context: "tool_call",
                 name: functionCall.name,
                 error,
               });
@@ -766,20 +723,20 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
               submittedOutput = this.definition.processOutput(validatedOutput);
             } else {
               submittedOutput =
-                typeof outputValue === 'string'
+                typeof outputValue === "string"
                   ? outputValue
                   : JSON.stringify(outputValue, null, 2);
             }
             syncResponseParts.push({
               functionResponse: {
                 name: TASK_COMPLETE_TOOL_NAME,
-                response: { result: 'Output submitted and task completed.' },
+                response: { result: "Output submitted and task completed." },
                 id: callId,
               },
             });
-            this.emitActivity('TOOL_CALL_END', {
+            this.emitActivity("TOOL_CALL_END", {
               name: functionCall.name,
-              output: 'Output submitted and task completed.',
+              output: "Output submitted and task completed.",
             });
           } else {
             // Failed to provide required output.
@@ -792,25 +749,25 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
                 id: callId,
               },
             });
-            this.emitActivity('ERROR', {
-              context: 'tool_call',
+            this.emitActivity("ERROR", {
+              context: "tool_call",
               name: functionCall.name,
               error,
             });
           }
         } else {
           // No output expected. Just signal completion.
-          submittedOutput = 'Task completed successfully.';
+          submittedOutput = "Task completed successfully.";
           syncResponseParts.push({
             functionResponse: {
               name: TASK_COMPLETE_TOOL_NAME,
-              response: { status: 'Task marked complete.' },
+              response: { status: "Task marked complete." },
               id: callId,
             },
           });
-          this.emitActivity('TOOL_CALL_END', {
+          this.emitActivity("TOOL_CALL_END", {
             name: functionCall.name,
-            output: 'Task marked complete.',
+            output: "Task marked complete.",
           });
         }
         continue;
@@ -830,8 +787,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           },
         });
 
-        this.emitActivity('ERROR', {
-          context: 'tool_call_unauthorized',
+        this.emitActivity("ERROR", {
+          context: "tool_call_unauthorized",
           name: functionCall.name,
           callId,
           error,
@@ -857,13 +814,13 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         );
 
         if (toolResponse.error) {
-          this.emitActivity('ERROR', {
-            context: 'tool_call',
+          this.emitActivity("ERROR", {
+            context: "tool_call",
             name: functionCall.name,
             error: toolResponse.error.message,
           });
         } else {
-          this.emitActivity('TOOL_CALL_END', {
+          this.emitActivity("TOOL_CALL_END", {
             name: functionCall.name,
             output: toolResponse.resultDisplay,
           });
@@ -887,18 +844,14 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     }
 
     // If all authorized tool calls failed (and task isn't complete), provide a generic error.
-    if (
-      functionCalls.length > 0 &&
-      toolResponseParts.length === 0 &&
-      !taskCompleted
-    ) {
+    if (functionCalls.length > 0 && toolResponseParts.length === 0 && !taskCompleted) {
       toolResponseParts.push({
-        text: 'All tool calls failed or were unauthorized. Please analyze the errors and try an alternative approach.',
+        text: "All tool calls failed or were unauthorized. Please analyze the errors and try an alternative approach.",
       });
     }
 
     return {
-      nextMessage: { role: 'user', parts: toolResponseParts },
+      nextMessage: { role: "user", parts: toolResponseParts },
       submittedOutput,
       taskCompleted,
     };
@@ -914,9 +867,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     if (toolConfig) {
       const toolNamesToLoad: string[] = [];
       for (const toolRef of toolConfig.tools) {
-        if (typeof toolRef === 'string') {
+        if (typeof toolRef === "string") {
           toolNamesToLoad.push(toolRef);
-        } else if (typeof toolRef === 'object' && 'schema' in toolRef) {
+        } else if (typeof toolRef === "object" && "schema" in toolRef) {
           // Tool instance with an explicit schema property.
           toolsList.push(toolRef.schema as FunctionDeclaration);
         } else {
@@ -925,9 +878,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         }
       }
       // Add schemas from tools that were registered by name.
-      toolsList.push(
-        ...this.toolRegistry.getFunctionDeclarationsFiltered(toolNamesToLoad),
-      );
+      toolsList.push(...this.toolRegistry.getFunctionDeclarationsFiltered(toolNamesToLoad));
     }
 
     // Always inject complete_task.
@@ -935,8 +886,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const completeTool: FunctionDeclaration = {
       name: TASK_COMPLETE_TOOL_NAME,
       description: outputConfig
-        ? 'Call this tool to submit your final answer and complete the task. This is the ONLY way to finish.'
-        : 'Call this tool to signal that you have completed your task. This is the ONLY way to finish.',
+        ? "Call this tool to submit your final answer and complete the task. This is the ONLY way to finish."
+        : "Call this tool to signal that you have completed your task. This is the ONLY way to finish.",
       parameters: {
         type: Type.OBJECT,
         properties: {},
@@ -946,13 +897,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     if (outputConfig) {
       const jsonSchema = zodToJsonSchema(outputConfig.schema);
-      const {
-        $schema: _$schema,
-        definitions: _definitions,
-        ...schema
-      } = jsonSchema;
-      completeTool.parameters!.properties![outputConfig.outputName] =
-        schema as Schema;
+      const { $schema: _$schema, definitions: _definitions, ...schema } = jsonSchema;
+      completeTool.parameters!.properties![outputConfig.outputName] = schema as Schema;
       completeTool.parameters!.required!.push(outputConfig.outputName);
     }
 
@@ -965,7 +911,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
   private async buildSystemPrompt(inputs: AgentInputs): Promise<string> {
     const { promptConfig } = this.definition;
     if (!promptConfig.systemPrompt) {
-      return '';
+      return "";
     }
 
     // Inject user inputs into the prompt template.
@@ -1003,7 +949,7 @@ Important Rules:
   ): Content[] {
     return initialMessages.map((content) => {
       const newParts = (content.parts ?? []).map((part) => {
-        if ('text' in part && part.text !== undefined) {
+        if ("text" in part && part.text !== undefined) {
           return { text: templateString(part.text, inputs) };
         }
         return part;
@@ -1017,10 +963,7 @@ Important Rules:
    *
    * @throws An error if a tool is not on the allow-list for non-interactive execution.
    */
-  private static async validateTools(
-    toolRegistry: ToolRegistry,
-    agentName: string,
-  ): Promise<void> {
+  private static async validateTools(toolRegistry: ToolRegistry, agentName: string): Promise<void> {
     // Tools that are non-interactive. This is temporary until we have tool
     // confirmations for subagents.
     const allowlist = new Set([
@@ -1048,10 +991,7 @@ Important Rules:
    *
    * @returns The reason for termination, or `null` if execution can continue.
    */
-  private checkTermination(
-    startTime: number,
-    turnCounter: number,
-  ): AgentTerminateMode | null {
+  private checkTermination(startTime: number, turnCounter: number): AgentTerminateMode | null {
     const { runConfig } = this.definition;
 
     if (runConfig.max_turns && turnCounter >= runConfig.max_turns) {
@@ -1062,10 +1002,7 @@ Important Rules:
   }
 
   /** Emits an activity event to the configured callback. */
-  private emitActivity(
-    type: SubagentActivityEvent['type'],
-    data: Record<string, unknown>,
-  ): void {
+  private emitActivity(type: SubagentActivityEvent["type"], data: Record<string, unknown>): void {
     if (this.onActivity) {
       const event: SubagentActivityEvent = {
         isSubagentActivityEvent: true,
diff --git a/packages/gemini-cli-core/src/agents/invocation.test.ts b/packages/gemini-cli-core/src/agents/invocation.test.ts
index a91f5ee80..9e0a0422a 100644
--- a/packages/gemini-cli-core/src/agents/invocation.test.ts
+++ b/packages/gemini-cli-core/src/agents/invocation.test.ts
@@ -4,42 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
-import { SubagentInvocation } from './invocation.js';
-import { AgentExecutor } from './executor.js';
-import type {
-  AgentDefinition,
-  SubagentActivityEvent,
-  AgentInputs,
-} from './types.js';
-import { AgentTerminateMode } from './types.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import type { Config } from '../config/config.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { type z } from 'zod';
-
-vi.mock('./executor.js');
+import { beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import { type z } from "zod";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { AgentExecutor } from "./executor.js";
+import { SubagentInvocation } from "./invocation.js";
+import type { AgentDefinition, AgentInputs, SubagentActivityEvent } from "./types.js";
+import { AgentTerminateMode } from "./types.js";
+
+vi.mock("./executor.js");
 
 const MockAgentExecutor = vi.mocked(AgentExecutor);
 
 let mockConfig: Config;
 
 const testDefinition: AgentDefinition<z.ZodUnknown> = {
-  name: 'MockAgent',
-  description: 'A mock agent.',
+  name: "MockAgent",
+  description: "A mock agent.",
   inputConfig: {
     inputs: {
-      task: { type: 'string', required: true, description: 'task' },
-      priority: { type: 'number', required: false, description: 'prio' },
+      task: { type: "string", required: true, description: "task" },
+      priority: { type: "number", required: false, description: "prio" },
     },
   },
-  modelConfig: { model: 'test', temp: 0, top_p: 1 },
+  modelConfig: { model: "test", temp: 0, top_p: 1 },
   runConfig: { max_time_minutes: 1 },
-  promptConfig: { systemPrompt: 'test' },
+  promptConfig: { systemPrompt: "test" },
 };
 
-describe('SubagentInvocation', () => {
+describe("SubagentInvocation", () => {
   let mockExecutorInstance: Mocked<AgentExecutor<z.ZodUnknown>>;
 
   beforeEach(() => {
@@ -56,9 +52,9 @@ describe('SubagentInvocation', () => {
     );
   });
 
-  it('should pass the messageBus to the parent constructor', () => {
+  it("should pass the messageBus to the parent constructor", () => {
     const mockMessageBus = {} as MessageBus;
-    const params = { task: 'Analyze data' };
+    const params = { task: "Analyze data" };
     const invocation = new SubagentInvocation<z.ZodUnknown>(
       params,
       testDefinition,
@@ -71,80 +67,62 @@ describe('SubagentInvocation', () => {
     expect((invocation as any).messageBus).toBe(mockMessageBus);
   });
 
-  describe('getDescription', () => {
-    it('should format the description with inputs', () => {
-      const params = { task: 'Analyze data', priority: 5 };
-      const invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        testDefinition,
-        mockConfig,
-      );
+  describe("getDescription", () => {
+    it("should format the description with inputs", () => {
+      const params = { task: "Analyze data", priority: 5 };
+      const invocation = new SubagentInvocation<z.ZodUnknown>(params, testDefinition, mockConfig);
       const description = invocation.getDescription();
       expect(description).toBe(
         "Running subagent 'MockAgent' with inputs: { task: Analyze data, priority: 5 }",
       );
     });
 
-    it('should truncate long input values', () => {
-      const longTask = 'A'.repeat(100);
+    it("should truncate long input values", () => {
+      const longTask = "A".repeat(100);
       const params = { task: longTask };
-      const invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        testDefinition,
-        mockConfig,
-      );
+      const invocation = new SubagentInvocation<z.ZodUnknown>(params, testDefinition, mockConfig);
       const description = invocation.getDescription();
       // Default INPUT_PREVIEW_MAX_LENGTH is 50
       expect(description).toBe(
-        `Running subagent 'MockAgent' with inputs: { task: ${'A'.repeat(50)} }`,
+        `Running subagent 'MockAgent' with inputs: { task: ${"A".repeat(50)} }`,
       );
     });
 
-    it('should truncate the overall description if it exceeds the limit', () => {
+    it("should truncate the overall description if it exceeds the limit", () => {
       // Create a definition and inputs that result in a very long description
       const longNameDef = {
         ...testDefinition,
-        name: 'VeryLongAgentNameThatTakesUpSpace',
+        name: "VeryLongAgentNameThatTakesUpSpace",
       };
       const params: AgentInputs = {};
       for (let i = 0; i < 20; i++) {
         params[`input${i}`] = `value${i}`;
       }
-      const invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        longNameDef,
-        mockConfig,
-      );
+      const invocation = new SubagentInvocation<z.ZodUnknown>(params, longNameDef, mockConfig);
       const description = invocation.getDescription();
       // Default DESCRIPTION_MAX_LENGTH is 200
       expect(description.length).toBe(200);
-      expect(
-        description.startsWith(
-          "Running subagent 'VeryLongAgentNameThatTakesUpSpace'",
-        ),
-      ).toBe(true);
+      expect(description.startsWith("Running subagent 'VeryLongAgentNameThatTakesUpSpace'")).toBe(
+        true,
+      );
     });
   });
 
-  describe('execute', () => {
+  describe("execute", () => {
     let signal: AbortSignal;
     let updateOutput: ReturnType<typeof vi.fn>;
-    const params = { task: 'Execute task' };
+    const params = { task: "Execute task" };
     let invocation: SubagentInvocation<z.ZodUnknown>;
 
     beforeEach(() => {
       signal = new AbortController().signal;
       updateOutput = vi.fn();
-      invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        testDefinition,
-        mockConfig,
-      );
+      invocation = new SubagentInvocation<z.ZodUnknown>(params, testDefinition, mockConfig);
     });
 
-    it('should initialize and run the executor successfully', async () => {
+    it("should initialize and run the executor successfully", async () => {
       const mockOutput = {
-        result: 'Analysis complete.',
+        result: "Analysis complete.",
         terminate_reason: AgentTerminateMode.GOAL,
       };
       mockExecutorInstance.run.mockResolvedValue(mockOutput);
@@ -156,7 +134,7 @@ describe('SubagentInvocation', () => {
         mockConfig,
         expect.any(Function),
       );
-      expect(updateOutput).toHaveBeenCalledWith('Subagent starting...\n');
+      expect(updateOutput).toHaveBeenCalledWith("Subagent starting...\n");
 
       expect(mockExecutorInstance.run).toHaveBeenCalledWith(params, signal);
 
@@ -167,90 +145,90 @@ describe('SubagentInvocation', () => {
           ),
         },
       ]);
-      expect(result.returnDisplay).toContain('Result:\nAnalysis complete.');
-      expect(result.returnDisplay).toContain('Termination Reason:\n GOAL');
+      expect(result.returnDisplay).toContain("Result:\nAnalysis complete.");
+      expect(result.returnDisplay).toContain("Termination Reason:\n GOAL");
     });
 
-    it('should stream THOUGHT_CHUNK activities from the executor', async () => {
+    it("should stream THOUGHT_CHUNK activities from the executor", async () => {
       mockExecutorInstance.run.mockImplementation(async () => {
         const onActivity = MockAgentExecutor.create.mock.calls[0][2];
 
         if (onActivity) {
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'THOUGHT_CHUNK',
-            data: { text: 'Analyzing...' },
+            agentName: "MockAgent",
+            type: "THOUGHT_CHUNK",
+            data: { text: "Analyzing..." },
           } as SubagentActivityEvent);
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'THOUGHT_CHUNK',
-            data: { text: ' Still thinking.' },
+            agentName: "MockAgent",
+            type: "THOUGHT_CHUNK",
+            data: { text: " Still thinking." },
           } as SubagentActivityEvent);
         }
-        return { result: 'Done', terminate_reason: AgentTerminateMode.GOAL };
+        return { result: "Done", terminate_reason: AgentTerminateMode.GOAL };
       });
 
       await invocation.execute(signal, updateOutput);
 
-      expect(updateOutput).toHaveBeenCalledWith('Subagent starting...\n');
-      expect(updateOutput).toHaveBeenCalledWith('🤖💭 Analyzing...');
-      expect(updateOutput).toHaveBeenCalledWith('🤖💭  Still thinking.');
+      expect(updateOutput).toHaveBeenCalledWith("Subagent starting...\n");
+      expect(updateOutput).toHaveBeenCalledWith("🤖💭 Analyzing...");
+      expect(updateOutput).toHaveBeenCalledWith("🤖💭  Still thinking.");
       expect(updateOutput).toHaveBeenCalledTimes(3); // Initial message + 2 thoughts
     });
 
-    it('should NOT stream other activities (e.g., TOOL_CALL_START, ERROR)', async () => {
+    it("should NOT stream other activities (e.g., TOOL_CALL_START, ERROR)", async () => {
       mockExecutorInstance.run.mockImplementation(async () => {
         const onActivity = MockAgentExecutor.create.mock.calls[0][2];
 
         if (onActivity) {
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'TOOL_CALL_START',
-            data: { name: 'ls' },
+            agentName: "MockAgent",
+            type: "TOOL_CALL_START",
+            data: { name: "ls" },
           } as SubagentActivityEvent);
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'ERROR',
-            data: { error: 'Failed' },
+            agentName: "MockAgent",
+            type: "ERROR",
+            data: { error: "Failed" },
           } as SubagentActivityEvent);
         }
-        return { result: 'Done', terminate_reason: AgentTerminateMode.GOAL };
+        return { result: "Done", terminate_reason: AgentTerminateMode.GOAL };
       });
 
       await invocation.execute(signal, updateOutput);
 
       // Should only contain the initial "Subagent starting..." message
       expect(updateOutput).toHaveBeenCalledTimes(1);
-      expect(updateOutput).toHaveBeenCalledWith('Subagent starting...\n');
+      expect(updateOutput).toHaveBeenCalledWith("Subagent starting...\n");
     });
 
-    it('should run successfully without an updateOutput callback', async () => {
+    it("should run successfully without an updateOutput callback", async () => {
       mockExecutorInstance.run.mockImplementation(async () => {
         const onActivity = MockAgentExecutor.create.mock.calls[0][2];
         if (onActivity) {
           // Ensure calling activity doesn't crash when updateOutput is undefined
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'testAgent',
-            type: 'THOUGHT_CHUNK',
-            data: { text: 'Thinking silently.' },
+            agentName: "testAgent",
+            type: "THOUGHT_CHUNK",
+            data: { text: "Thinking silently." },
           } as SubagentActivityEvent);
         }
-        return { result: 'Done', terminate_reason: AgentTerminateMode.GOAL };
+        return { result: "Done", terminate_reason: AgentTerminateMode.GOAL };
       });
 
       // Execute without the optional callback
       const result = await invocation.execute(signal);
       expect(result.error).toBeUndefined();
-      expect(result.returnDisplay).toContain('Result:\nDone');
+      expect(result.returnDisplay).toContain("Result:\nDone");
     });
 
-    it('should handle executor run failure', async () => {
-      const error = new Error('Model failed during execution.');
+    it("should handle executor run failure", async () => {
+      const error = new Error("Model failed during execution.");
       mockExecutorInstance.run.mockRejectedValue(error);
 
       const result = await invocation.execute(signal, updateOutput);
@@ -259,16 +237,12 @@ describe('SubagentInvocation', () => {
         message: error.message,
         type: ToolErrorType.EXECUTION_FAILED,
       });
-      expect(result.returnDisplay).toBe(
-        `Subagent Failed: MockAgent\nError: ${error.message}`,
-      );
-      expect(result.llmContent).toBe(
-        `Subagent 'MockAgent' failed. Error: ${error.message}`,
-      );
+      expect(result.returnDisplay).toBe(`Subagent Failed: MockAgent\nError: ${error.message}`);
+      expect(result.llmContent).toBe(`Subagent 'MockAgent' failed. Error: ${error.message}`);
     });
 
-    it('should handle executor creation failure', async () => {
-      const creationError = new Error('Failed to initialize tools.');
+    it("should handle executor creation failure", async () => {
+      const creationError = new Error("Failed to initialize tools.");
       MockAgentExecutor.create.mockRejectedValue(creationError);
 
       const result = await invocation.execute(signal, updateOutput);
@@ -285,23 +259,17 @@ describe('SubagentInvocation', () => {
      * This test verifies that the AbortSignal is correctly propagated and
      * that a rejection from the executor due to abortion is handled gracefully.
      */
-    it('should handle abortion signal during execution', async () => {
-      const abortError = new Error('Aborted');
+    it("should handle abortion signal during execution", async () => {
+      const abortError = new Error("Aborted");
       mockExecutorInstance.run.mockRejectedValue(abortError);
 
       const controller = new AbortController();
-      const executePromise = invocation.execute(
-        controller.signal,
-        updateOutput,
-      );
+      const executePromise = invocation.execute(controller.signal, updateOutput);
       controller.abort();
       const result = await executePromise;
 
-      expect(mockExecutorInstance.run).toHaveBeenCalledWith(
-        params,
-        controller.signal,
-      );
-      expect(result.error?.message).toBe('Aborted');
+      expect(mockExecutorInstance.run).toHaveBeenCalledWith(params, controller.signal);
+      expect(result.error?.message).toBe("Aborted");
       expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
     });
   });
diff --git a/packages/gemini-cli-core/src/agents/invocation.ts b/packages/gemini-cli-core/src/agents/invocation.ts
index cb49095cb..c712240cd 100644
--- a/packages/gemini-cli-core/src/agents/invocation.ts
+++ b/packages/gemini-cli-core/src/agents/invocation.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { AgentExecutor } from './executor.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
-import { BaseToolInvocation, type ToolResult } from '../tools/tools.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import type {
-  AgentDefinition,
-  AgentInputs,
-  SubagentActivityEvent,
-} from './types.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { type z } from 'zod';
+import { type z } from "zod";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { BaseToolInvocation, type ToolResult } from "../tools/tools.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { AgentExecutor } from "./executor.js";
+import type { AgentDefinition, AgentInputs, SubagentActivityEvent } from "./types.js";
 
 const INPUT_PREVIEW_MAX_LENGTH = 50;
 const DESCRIPTION_MAX_LENGTH = 200;
@@ -30,9 +26,10 @@ const DESCRIPTION_MAX_LENGTH = 200;
  * live output stream.
  * 4. Formatting the final result into a {@link ToolResult}.
  */
-export class SubagentInvocation<
-  TOutput extends z.ZodTypeAny,
-> extends BaseToolInvocation<AgentInputs, ToolResult> {
+export class SubagentInvocation<TOutput extends z.ZodTypeAny> extends BaseToolInvocation<
+  AgentInputs,
+  ToolResult
+> {
   /**
    * @param params The validated input parameters for the agent.
    * @param definition The definition object that configures the agent.
@@ -54,11 +51,8 @@ export class SubagentInvocation<
    */
   getDescription(): string {
     const inputSummary = Object.entries(this.params)
-      .map(
-        ([key, value]) =>
-          `${key}: ${String(value).slice(0, INPUT_PREVIEW_MAX_LENGTH)}`,
-      )
-      .join(', ');
+      .map(([key, value]) => `${key}: ${String(value).slice(0, INPUT_PREVIEW_MAX_LENGTH)}`)
+      .join(", ");
 
     const description = `Running subagent '${this.definition.name}' with inputs: { ${inputSummary} }`;
     return description.slice(0, DESCRIPTION_MAX_LENGTH);
@@ -78,7 +72,7 @@ export class SubagentInvocation<
   ): Promise<ToolResult> {
     try {
       if (updateOutput) {
-        updateOutput('Subagent starting...\n');
+        updateOutput("Subagent starting...\n");
       }
 
       // Create an activity callback to bridge the executor's events to the
@@ -86,19 +80,12 @@ export class SubagentInvocation<
       const onActivity = (activity: SubagentActivityEvent): void => {
         if (!updateOutput) return;
 
-        if (
-          activity.type === 'THOUGHT_CHUNK' &&
-          typeof activity.data['text'] === 'string'
-        ) {
-          updateOutput(`🤖💭 ${activity.data['text']}`);
+        if (activity.type === "THOUGHT_CHUNK" && typeof activity.data["text"] === "string") {
+          updateOutput(`🤖💭 ${activity.data["text"]}`);
         }
       };
 
-      const executor = await AgentExecutor.create(
-        this.definition,
-        this.config,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(this.definition, this.config, onActivity);
 
       const output = await executor.run(this.params, signal);
 
@@ -121,8 +108,7 @@ ${output.result}
         returnDisplay: displayContent,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
 
       return {
         llmContent: `Subagent '${this.definition.name}' failed. Error: ${errorMessage}`,
diff --git a/packages/gemini-cli-core/src/agents/registry.test.ts b/packages/gemini-cli-core/src/agents/registry.test.ts
index 8060815ac..384c1a39a 100644
--- a/packages/gemini-cli-core/src/agents/registry.test.ts
+++ b/packages/gemini-cli-core/src/agents/registry.test.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { AgentRegistry, getModelConfigAlias } from './registry.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import type { AgentDefinition } from './types.js';
-import type { Config } from '../config/config.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { AgentRegistry, getModelConfigAlias } from "./registry.js";
+import type { AgentDefinition } from "./types.js";
 
 // A test-only subclass to expose the protected `registerAgent` method.
 class TestableAgentRegistry extends AgentRegistry {
@@ -20,20 +20,20 @@ class TestableAgentRegistry extends AgentRegistry {
 
 // Define mock agent structures for testing registration logic
 const MOCK_AGENT_V1: AgentDefinition = {
-  name: 'MockAgent',
-  description: 'Mock Description V1',
+  name: "MockAgent",
+  description: "Mock Description V1",
   inputConfig: { inputs: {} },
-  modelConfig: { model: 'test', temp: 0, top_p: 1 },
+  modelConfig: { model: "test", temp: 0, top_p: 1 },
   runConfig: { max_time_minutes: 1 },
-  promptConfig: { systemPrompt: 'test' },
+  promptConfig: { systemPrompt: "test" },
 };
 
 const MOCK_AGENT_V2: AgentDefinition = {
   ...MOCK_AGENT_V1,
-  description: 'Mock Description V2 (Updated)',
+  description: "Mock Description V2 (Updated)",
 };
 
-describe('AgentRegistry', () => {
+describe("AgentRegistry", () => {
   let mockConfig: Config;
   let registry: TestableAgentRegistry;
 
@@ -47,7 +47,7 @@ describe('AgentRegistry', () => {
     vi.restoreAllMocks(); // Restore spies after each test
   });
 
-  describe('initialize', () => {
+  describe("initialize", () => {
     // TODO: Add this test once we actually have a built-in agent configured.
     // it('should load built-in agents upon initialization', async () => {
     //   expect(registry.getAllDefinitions()).toHaveLength(0);
@@ -58,12 +58,10 @@ describe('AgentRegistry', () => {
     //   expect(registry.getAllDefinitions()).toEqual([]);
     // });
 
-    it('should log the count of loaded agents in debug mode', async () => {
+    it("should log the count of loaded agents in debug mode", async () => {
       const debugConfig = makeFakeConfig({ debugMode: true });
       const debugRegistry = new TestableAgentRegistry(debugConfig);
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
       await debugRegistry.initialize();
 
@@ -73,30 +71,28 @@ describe('AgentRegistry', () => {
       );
     });
 
-    it('should use preview model for codebase investigator if main model is preview', async () => {
+    it("should use preview model for codebase investigator if main model is preview", async () => {
       const previewConfig = makeFakeConfig({
-        model: 'gemini-3-pro-preview',
+        model: "gemini-3-pro-preview",
         codebaseInvestigatorSettings: {
           enabled: true,
-          model: 'pro',
+          model: "pro",
         },
       });
       const previewRegistry = new TestableAgentRegistry(previewConfig);
 
       await previewRegistry.initialize();
 
-      const investigatorDef = previewRegistry.getDefinition(
-        'codebase_investigator',
-      );
+      const investigatorDef = previewRegistry.getDefinition("codebase_investigator");
       expect(investigatorDef).toBeDefined();
-      expect(investigatorDef?.modelConfig.model).toBe('gemini-3-pro-preview');
+      expect(investigatorDef?.modelConfig.model).toBe("gemini-3-pro-preview");
     });
   });
 
-  describe('registration logic', () => {
-    it('should register a valid agent definition', () => {
+  describe("registration logic", () => {
+    it("should register a valid agent definition", () => {
       registry.testRegisterAgent(MOCK_AGENT_V1);
-      expect(registry.getDefinition('MockAgent')).toEqual(MOCK_AGENT_V1);
+      expect(registry.getDefinition("MockAgent")).toEqual(MOCK_AGENT_V1);
       expect(
         mockConfig.modelConfigService.getResolvedConfig({
           model: getModelConfigAlias(MOCK_AGENT_V1),
@@ -114,87 +110,71 @@ describe('AgentRegistry', () => {
       });
     });
 
-    it('should handle special characters in agent names', () => {
+    it("should handle special characters in agent names", () => {
       const specialAgent = {
         ...MOCK_AGENT_V1,
-        name: 'Agent-123_$pecial.v2',
+        name: "Agent-123_$pecial.v2",
       };
       registry.testRegisterAgent(specialAgent);
-      expect(registry.getDefinition('Agent-123_$pecial.v2')).toEqual(
-        specialAgent,
-      );
+      expect(registry.getDefinition("Agent-123_$pecial.v2")).toEqual(specialAgent);
     });
 
-    it('should reject an agent definition missing a name', () => {
-      const invalidAgent = { ...MOCK_AGENT_V1, name: '' };
-      const debugWarnSpy = vi
-        .spyOn(debugLogger, 'warn')
-        .mockImplementation(() => {});
+    it("should reject an agent definition missing a name", () => {
+      const invalidAgent = { ...MOCK_AGENT_V1, name: "" };
+      const debugWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
       registry.testRegisterAgent(invalidAgent);
 
-      expect(registry.getDefinition('MockAgent')).toBeUndefined();
+      expect(registry.getDefinition("MockAgent")).toBeUndefined();
       expect(debugWarnSpy).toHaveBeenCalledWith(
-        '[AgentRegistry] Skipping invalid agent definition. Missing name or description.',
+        "[AgentRegistry] Skipping invalid agent definition. Missing name or description.",
       );
     });
 
-    it('should reject an agent definition missing a description', () => {
-      const invalidAgent = { ...MOCK_AGENT_V1, description: '' };
-      const debugWarnSpy = vi
-        .spyOn(debugLogger, 'warn')
-        .mockImplementation(() => {});
+    it("should reject an agent definition missing a description", () => {
+      const invalidAgent = { ...MOCK_AGENT_V1, description: "" };
+      const debugWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
       registry.testRegisterAgent(invalidAgent as AgentDefinition);
 
-      expect(registry.getDefinition('MockAgent')).toBeUndefined();
+      expect(registry.getDefinition("MockAgent")).toBeUndefined();
       expect(debugWarnSpy).toHaveBeenCalledWith(
-        '[AgentRegistry] Skipping invalid agent definition. Missing name or description.',
+        "[AgentRegistry] Skipping invalid agent definition. Missing name or description.",
       );
     });
 
-    it('should overwrite an existing agent definition', () => {
+    it("should overwrite an existing agent definition", () => {
       registry.testRegisterAgent(MOCK_AGENT_V1);
-      expect(registry.getDefinition('MockAgent')?.description).toBe(
-        'Mock Description V1',
-      );
+      expect(registry.getDefinition("MockAgent")?.description).toBe("Mock Description V1");
 
       registry.testRegisterAgent(MOCK_AGENT_V2);
-      expect(registry.getDefinition('MockAgent')?.description).toBe(
-        'Mock Description V2 (Updated)',
+      expect(registry.getDefinition("MockAgent")?.description).toBe(
+        "Mock Description V2 (Updated)",
       );
       expect(registry.getAllDefinitions()).toHaveLength(1);
     });
 
-    it('should log overwrites when in debug mode', () => {
+    it("should log overwrites when in debug mode", () => {
       const debugConfig = makeFakeConfig({ debugMode: true });
       const debugRegistry = new TestableAgentRegistry(debugConfig);
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
       debugRegistry.testRegisterAgent(MOCK_AGENT_V1);
       debugRegistry.testRegisterAgent(MOCK_AGENT_V2);
 
-      expect(debugLogSpy).toHaveBeenCalledWith(
-        `[AgentRegistry] Overriding agent 'MockAgent'`,
-      );
+      expect(debugLogSpy).toHaveBeenCalledWith(`[AgentRegistry] Overriding agent 'MockAgent'`);
     });
 
-    it('should not log overwrites when not in debug mode', () => {
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+    it("should not log overwrites when not in debug mode", () => {
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
       registry.testRegisterAgent(MOCK_AGENT_V1);
       registry.testRegisterAgent(MOCK_AGENT_V2);
 
-      expect(debugLogSpy).not.toHaveBeenCalledWith(
-        `[AgentRegistry] Overriding agent 'MockAgent'`,
-      );
+      expect(debugLogSpy).not.toHaveBeenCalledWith(`[AgentRegistry] Overriding agent 'MockAgent'`);
     });
 
-    it('should handle bulk registrations correctly', async () => {
+    it("should handle bulk registrations correctly", async () => {
       const promises = Array.from({ length: 100 }, (_, i) =>
         Promise.resolve(
           registry.testRegisterAgent({
@@ -209,10 +189,10 @@ describe('AgentRegistry', () => {
     });
   });
 
-  describe('accessors', () => {
+  describe("accessors", () => {
     const ANOTHER_AGENT: AgentDefinition = {
       ...MOCK_AGENT_V1,
-      name: 'AnotherAgent',
+      name: "AnotherAgent",
     };
 
     beforeEach(() => {
@@ -220,50 +200,40 @@ describe('AgentRegistry', () => {
       registry.testRegisterAgent(ANOTHER_AGENT);
     });
 
-    it('getDefinition should return the correct definition', () => {
-      expect(registry.getDefinition('MockAgent')).toEqual(MOCK_AGENT_V1);
-      expect(registry.getDefinition('AnotherAgent')).toEqual(ANOTHER_AGENT);
+    it("getDefinition should return the correct definition", () => {
+      expect(registry.getDefinition("MockAgent")).toEqual(MOCK_AGENT_V1);
+      expect(registry.getDefinition("AnotherAgent")).toEqual(ANOTHER_AGENT);
     });
 
-    it('getDefinition should return undefined for unknown agents', () => {
-      expect(registry.getDefinition('NonExistentAgent')).toBeUndefined();
+    it("getDefinition should return undefined for unknown agents", () => {
+      expect(registry.getDefinition("NonExistentAgent")).toBeUndefined();
     });
 
-    it('getAllDefinitions should return all registered definitions', () => {
+    it("getAllDefinitions should return all registered definitions", () => {
       const all = registry.getAllDefinitions();
       expect(all).toHaveLength(2);
-      expect(all).toEqual(
-        expect.arrayContaining([MOCK_AGENT_V1, ANOTHER_AGENT]),
-      );
+      expect(all).toEqual(expect.arrayContaining([MOCK_AGENT_V1, ANOTHER_AGENT]));
     });
   });
-  describe('getToolDescription', () => {
-    it('should return default message when no agents are registered', () => {
-      expect(registry.getToolDescription()).toContain(
-        'No agents are currently available',
-      );
+  describe("getToolDescription", () => {
+    it("should return default message when no agents are registered", () => {
+      expect(registry.getToolDescription()).toContain("No agents are currently available");
     });
 
-    it('should return formatted list of agents when agents are available', () => {
+    it("should return formatted list of agents when agents are available", () => {
       registry.testRegisterAgent(MOCK_AGENT_V1);
       registry.testRegisterAgent({
         ...MOCK_AGENT_V2,
-        name: 'AnotherAgent',
-        description: 'Another agent description',
+        name: "AnotherAgent",
+        description: "Another agent description",
       });
 
       const description = registry.getToolDescription();
 
-      expect(description).toContain(
-        'Delegates a task to a specialized sub-agent',
-      );
-      expect(description).toContain('Available agents:');
-      expect(description).toContain(
-        `- **${MOCK_AGENT_V1.name}**: ${MOCK_AGENT_V1.description}`,
-      );
-      expect(description).toContain(
-        `- **AnotherAgent**: Another agent description`,
-      );
+      expect(description).toContain("Delegates a task to a specialized sub-agent");
+      expect(description).toContain("Available agents:");
+      expect(description).toContain(`- **${MOCK_AGENT_V1.name}**: ${MOCK_AGENT_V1.description}`);
+      expect(description).toContain(`- **AnotherAgent**: Another agent description`);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/agents/registry.ts b/packages/gemini-cli-core/src/agents/registry.ts
index 927b14c8c..f9320bccc 100644
--- a/packages/gemini-cli-core/src/agents/registry.ts
+++ b/packages/gemini-cli-core/src/agents/registry.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { AgentDefinition } from './types.js';
-import { CodebaseInvestigatorAgent } from './codebase-investigator.js';
-import { type z } from 'zod';
-import { debugLogger } from '../utils/debugLogger.js';
+import { type z } from "zod";
+import type { Config } from "../config/config.js";
 import {
   DEFAULT_GEMINI_MODEL_AUTO,
   GEMINI_MODEL_ALIAS_PRO,
   PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
-import type { ModelConfigAlias } from '../services/modelConfigService.js';
+} from "../config/models.js";
+import type { ModelConfigAlias } from "../services/modelConfigService.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { CodebaseInvestigatorAgent } from "./codebase-investigator.js";
+import type { AgentDefinition } from "./types.js";
 
 /**
  * Returns the model config alias for a given agent definition.
@@ -42,9 +42,7 @@ export class AgentRegistry {
     this.loadBuiltInAgents();
 
     if (this.config.getDebugMode()) {
-      debugLogger.log(
-        `[AgentRegistry] Initialized with ${this.agents.size} agents.`,
-      );
+      debugLogger.log(`[AgentRegistry] Initialized with ${this.agents.size} agents.`);
     }
   }
 
@@ -53,17 +51,12 @@ export class AgentRegistry {
 
     // Only register the agent if it's enabled in the settings.
     if (investigatorSettings?.enabled) {
-      let model =
-        investigatorSettings.model ??
-        CodebaseInvestigatorAgent.modelConfig.model;
+      let model = investigatorSettings.model ?? CodebaseInvestigatorAgent.modelConfig.model;
 
       // If the user is using the preview model for the main agent, force the sub-agent to use it too
       // if it's configured to use 'pro' or 'auto'.
       if (this.config.getModel() === PREVIEW_GEMINI_MODEL) {
-        if (
-          model === GEMINI_MODEL_ALIAS_PRO ||
-          model === DEFAULT_GEMINI_MODEL_AUTO
-        ) {
+        if (model === GEMINI_MODEL_ALIAS_PRO || model === DEFAULT_GEMINI_MODEL_AUTO) {
           model = PREVIEW_GEMINI_MODEL;
         }
       }
@@ -83,8 +76,7 @@ export class AgentRegistry {
             investigatorSettings.maxTimeMinutes ??
             CodebaseInvestigatorAgent.runConfig.max_time_minutes,
           max_turns:
-            investigatorSettings.maxNumTurns ??
-            CodebaseInvestigatorAgent.runConfig.max_turns,
+            investigatorSettings.maxNumTurns ?? CodebaseInvestigatorAgent.runConfig.max_turns,
         },
       };
       this.registerAgent(agentDef);
@@ -165,12 +157,12 @@ export class AgentRegistry {
    */
   getToolDescription(): string {
     if (this.agents.size === 0) {
-      return 'Delegates a task to a specialized sub-agent. No agents are currently available.';
+      return "Delegates a task to a specialized sub-agent. No agents are currently available.";
     }
 
     const agentDescriptions = Array.from(this.agents.entries())
       .map(([name, def]) => `- **${name}**: ${def.description}`)
-      .join('\n');
+      .join("\n");
 
     return `Delegates a task to a specialized sub-agent.
 
@@ -184,12 +176,11 @@ ${agentDescriptions}`;
    */
   getDirectoryContext(): string {
     if (this.agents.size === 0) {
-      return 'No sub-agents are currently available.';
+      return "No sub-agents are currently available.";
     }
 
-    let context = '## Available Sub-Agents\n';
-    context +=
-      'Use `delegate_to_agent` for complex tasks requiring specialized analysis.\n\n';
+    let context = "## Available Sub-Agents\n";
+    context += "Use `delegate_to_agent` for complex tasks requiring specialized analysis.\n\n";
 
     for (const [name, def] of this.agents.entries()) {
       context += `- **${name}**: ${def.description}\n`;
diff --git a/packages/gemini-cli-core/src/agents/schema-utils.test.ts b/packages/gemini-cli-core/src/agents/schema-utils.test.ts
index 48ef90e0b..a0d9a4738 100644
--- a/packages/gemini-cli-core/src/agents/schema-utils.test.ts
+++ b/packages/gemini-cli-core/src/agents/schema-utils.test.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { convertInputConfigToJsonSchema } from './schema-utils.js';
-import type { InputConfig } from './types.js';
+import { describe, expect, it } from "vitest";
+import { convertInputConfigToJsonSchema } from "./schema-utils.js";
+import type { InputConfig } from "./types.js";
 
 const PRIMITIVE_TYPES_CONFIG: InputConfig = {
   inputs: {
     goal: {
-      type: 'string',
-      description: 'The primary objective',
+      type: "string",
+      description: "The primary objective",
       required: true,
     },
     max_retries: {
-      type: 'integer',
-      description: 'Maximum number of retries',
+      type: "integer",
+      description: "Maximum number of retries",
       required: false,
     },
     temperature: {
-      type: 'number',
-      description: 'The model temperature',
+      type: "number",
+      description: "The model temperature",
       required: true,
     },
     verbose: {
-      type: 'boolean',
-      description: 'Enable verbose logging',
+      type: "boolean",
+      description: "Enable verbose logging",
       required: false,
     },
   },
@@ -36,13 +36,13 @@ const PRIMITIVE_TYPES_CONFIG: InputConfig = {
 const ARRAY_TYPES_CONFIG: InputConfig = {
   inputs: {
     filenames: {
-      type: 'string[]',
-      description: 'A list of file paths',
+      type: "string[]",
+      description: "A list of file paths",
       required: true,
     },
     scores: {
-      type: 'number[]',
-      description: 'A list of scores',
+      type: "number[]",
+      description: "A list of scores",
       required: false,
     },
   },
@@ -51,8 +51,8 @@ const ARRAY_TYPES_CONFIG: InputConfig = {
 const NO_REQUIRED_FIELDS_CONFIG: InputConfig = {
   inputs: {
     optional_param: {
-      type: 'string',
-      description: 'An optional parameter',
+      type: "string",
+      description: "An optional parameter",
       required: false,
     },
   },
@@ -60,8 +60,8 @@ const NO_REQUIRED_FIELDS_CONFIG: InputConfig = {
 
 const ALL_REQUIRED_FIELDS_CONFIG: InputConfig = {
   inputs: {
-    paramA: { type: 'string', description: 'Parameter A', required: true },
-    paramB: { type: 'boolean', description: 'Parameter B', required: true },
+    paramA: { type: "string", description: "Parameter A", required: true },
+    paramB: { type: "boolean", description: "Parameter B", required: true },
   },
 };
 
@@ -73,90 +73,87 @@ const UNSUPPORTED_TYPE_CONFIG: InputConfig = {
   inputs: {
     invalid_param: {
       // @ts-expect-error - Intentionally testing an invalid type
-      type: 'date',
-      description: 'This type is not supported',
+      type: "date",
+      description: "This type is not supported",
       required: true,
     },
   },
 };
 
-describe('convertInputConfigToJsonSchema', () => {
-  describe('type conversion', () => {
-    it('should correctly convert an InputConfig with various primitive types', () => {
+describe("convertInputConfigToJsonSchema", () => {
+  describe("type conversion", () => {
+    it("should correctly convert an InputConfig with various primitive types", () => {
       const result = convertInputConfigToJsonSchema(PRIMITIVE_TYPES_CONFIG);
 
       expect(result).toEqual({
-        type: 'object',
+        type: "object",
         properties: {
-          goal: { type: 'string', description: 'The primary objective' },
+          goal: { type: "string", description: "The primary objective" },
           max_retries: {
-            type: 'integer',
-            description: 'Maximum number of retries',
+            type: "integer",
+            description: "Maximum number of retries",
           },
-          temperature: { type: 'number', description: 'The model temperature' },
-          verbose: { type: 'boolean', description: 'Enable verbose logging' },
+          temperature: { type: "number", description: "The model temperature" },
+          verbose: { type: "boolean", description: "Enable verbose logging" },
         },
-        required: ['goal', 'temperature'],
+        required: ["goal", "temperature"],
       });
     });
 
-    it('should correctly handle array types for strings and numbers', () => {
+    it("should correctly handle array types for strings and numbers", () => {
       const result = convertInputConfigToJsonSchema(ARRAY_TYPES_CONFIG);
 
       expect(result).toEqual({
-        type: 'object',
+        type: "object",
         properties: {
           filenames: {
-            type: 'array',
-            description: 'A list of file paths',
-            items: { type: 'string' },
+            type: "array",
+            description: "A list of file paths",
+            items: { type: "string" },
           },
           scores: {
-            type: 'array',
-            description: 'A list of scores',
-            items: { type: 'number' },
+            type: "array",
+            description: "A list of scores",
+            items: { type: "number" },
           },
         },
-        required: ['filenames'],
+        required: ["filenames"],
       });
     });
   });
 
-  describe('required field handling', () => {
-    it('should produce an undefined `required` field when no inputs are required', () => {
+  describe("required field handling", () => {
+    it("should produce an undefined `required` field when no inputs are required", () => {
       const result = convertInputConfigToJsonSchema(NO_REQUIRED_FIELDS_CONFIG);
 
-      expect(result.properties['optional_param']).toBeDefined();
+      expect(result.properties["optional_param"]).toBeDefined();
       // Per the implementation and JSON Schema spec, the `required` field
       // should be omitted if no properties are required.
       expect(result.required).toBeUndefined();
     });
 
-    it('should list all properties in `required` when all are marked as required', () => {
+    it("should list all properties in `required` when all are marked as required", () => {
       const result = convertInputConfigToJsonSchema(ALL_REQUIRED_FIELDS_CONFIG);
       expect(result.required).toHaveLength(2);
-      expect(result.required).toEqual(
-        expect.arrayContaining(['paramA', 'paramB']),
-      );
+      expect(result.required).toEqual(expect.arrayContaining(["paramA", "paramB"]));
     });
   });
 
-  describe('edge cases', () => {
-    it('should return a valid, empty schema for an empty input config', () => {
+  describe("edge cases", () => {
+    it("should return a valid, empty schema for an empty input config", () => {
       const result = convertInputConfigToJsonSchema(EMPTY_CONFIG);
 
       expect(result).toEqual({
-        type: 'object',
+        type: "object",
         properties: {},
         required: undefined,
       });
     });
   });
 
-  describe('error handling', () => {
-    it('should throw an informative error for an unsupported input type', () => {
-      const action = () =>
-        convertInputConfigToJsonSchema(UNSUPPORTED_TYPE_CONFIG);
+  describe("error handling", () => {
+    it("should throw an informative error for an unsupported input type", () => {
+      const action = () => convertInputConfigToJsonSchema(UNSUPPORTED_TYPE_CONFIG);
 
       expect(action).toThrow(/Unsupported input type 'date'/);
       expect(action).toThrow(/parameter 'invalid_param'/);
diff --git a/packages/gemini-cli-core/src/agents/schema-utils.ts b/packages/gemini-cli-core/src/agents/schema-utils.ts
index 13516ef4c..ad81c349a 100644
--- a/packages/gemini-cli-core/src/agents/schema-utils.ts
+++ b/packages/gemini-cli-core/src/agents/schema-utils.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { InputConfig } from './types.js';
+import type { InputConfig } from "./types.js";
 
 /**
  * Defines the structure for a JSON Schema object, used for tool function
  * declarations.
  */
 interface JsonSchemaObject {
-  type: 'object';
+  type: "object";
   properties: Record<string, JsonSchemaProperty>;
   required?: string[];
 }
@@ -20,9 +20,9 @@ interface JsonSchemaObject {
  * Defines the structure for a property within a {@link JsonSchemaObject}.
  */
 interface JsonSchemaProperty {
-  type: 'string' | 'number' | 'integer' | 'boolean' | 'array';
+  type: "string" | "number" | "integer" | "boolean" | "array";
   description: string;
-  items?: { type: 'string' | 'number' };
+  items?: { type: "string" | "number" };
 }
 
 /**
@@ -37,9 +37,7 @@ interface JsonSchemaProperty {
  * @throws An `Error` if an unsupported input type is encountered, ensuring
  * configuration errors are caught early.
  */
-export function convertInputConfigToJsonSchema(
-  inputConfig: InputConfig,
-): JsonSchemaObject {
+export function convertInputConfigToJsonSchema(inputConfig: InputConfig): JsonSchemaObject {
   const properties: Record<string, JsonSchemaProperty> = {};
   const required: string[] = [];
 
@@ -49,28 +47,28 @@ export function convertInputConfigToJsonSchema(
     };
 
     switch (definition.type) {
-      case 'string':
-      case 'number':
-      case 'integer':
-      case 'boolean':
+      case "string":
+      case "number":
+      case "integer":
+      case "boolean":
         schemaProperty.type = definition.type;
         break;
 
-      case 'string[]':
-        schemaProperty.type = 'array';
-        schemaProperty.items = { type: 'string' };
+      case "string[]":
+        schemaProperty.type = "array";
+        schemaProperty.items = { type: "string" };
         break;
 
-      case 'number[]':
-        schemaProperty.type = 'array';
-        schemaProperty.items = { type: 'number' };
+      case "number[]":
+        schemaProperty.type = "array";
+        schemaProperty.items = { type: "number" };
         break;
 
       default: {
         const exhaustiveCheck: never = definition.type;
         throw new Error(
           `Unsupported input type '${exhaustiveCheck}' for parameter '${name}'. ` +
-            'Supported types: string, number, integer, boolean, string[], number[]',
+            "Supported types: string, number, integer, boolean, string[], number[]",
         );
       }
     }
@@ -83,7 +81,7 @@ export function convertInputConfigToJsonSchema(
   }
 
   return {
-    type: 'object',
+    type: "object",
     properties,
     required: required.length > 0 ? required : undefined,
   };
diff --git a/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.test.ts b/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.test.ts
index f971dc516..5669434ee 100644
--- a/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.test.ts
+++ b/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.test.ts
@@ -4,57 +4,55 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { SubagentToolWrapper } from './subagent-tool-wrapper.js';
-import { SubagentInvocation } from './invocation.js';
-import { convertInputConfigToJsonSchema } from './schema-utils.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import type { AgentDefinition, AgentInputs } from './types.js';
-import type { Config } from '../config/config.js';
-import { Kind } from '../tools/tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { Kind } from "../tools/tools.js";
+import { SubagentInvocation } from "./invocation.js";
+import { convertInputConfigToJsonSchema } from "./schema-utils.js";
+import { SubagentToolWrapper } from "./subagent-tool-wrapper.js";
+import type { AgentDefinition, AgentInputs } from "./types.js";
 
 // Mock dependencies to isolate the SubagentToolWrapper class
-vi.mock('./invocation.js');
-vi.mock('./schema-utils.js');
+vi.mock("./invocation.js");
+vi.mock("./schema-utils.js");
 
 const MockedSubagentInvocation = vi.mocked(SubagentInvocation);
-const mockConvertInputConfigToJsonSchema = vi.mocked(
-  convertInputConfigToJsonSchema,
-);
+const mockConvertInputConfigToJsonSchema = vi.mocked(convertInputConfigToJsonSchema);
 
 // Define reusable test data
 let mockConfig: Config;
 
 const mockDefinition: AgentDefinition = {
-  name: 'TestAgent',
-  displayName: 'Test Agent Display Name',
-  description: 'An agent for testing.',
+  name: "TestAgent",
+  displayName: "Test Agent Display Name",
+  description: "An agent for testing.",
   inputConfig: {
     inputs: {
-      goal: { type: 'string', required: true, description: 'The goal.' },
+      goal: { type: "string", required: true, description: "The goal." },
       priority: {
-        type: 'number',
+        type: "number",
         required: false,
-        description: 'The priority.',
+        description: "The priority.",
       },
     },
   },
-  modelConfig: { model: 'gemini-test-model', temp: 0, top_p: 1 },
+  modelConfig: { model: "gemini-test-model", temp: 0, top_p: 1 },
   runConfig: { max_time_minutes: 5 },
-  promptConfig: { systemPrompt: 'You are a test agent.' },
+  promptConfig: { systemPrompt: "You are a test agent." },
 };
 
 const mockSchema = {
-  type: 'object',
+  type: "object",
   properties: {
-    goal: { type: 'string', description: 'The goal.' },
-    priority: { type: 'number', description: 'The priority.' },
+    goal: { type: "string", description: "The goal." },
+    priority: { type: "number", description: "The priority." },
   },
-  required: ['goal'],
+  required: ["goal"],
 };
 
-describe('SubagentToolWrapper', () => {
+describe("SubagentToolWrapper", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockConfig = makeFakeConfig();
@@ -63,8 +61,8 @@ describe('SubagentToolWrapper', () => {
     mockConvertInputConfigToJsonSchema.mockReturnValue(mockSchema as any);
   });
 
-  describe('constructor', () => {
-    it('should call convertInputConfigToJsonSchema with the correct agent inputConfig', () => {
+  describe("constructor", () => {
+    it("should call convertInputConfigToJsonSchema with the correct agent inputConfig", () => {
       new SubagentToolWrapper(mockDefinition, mockConfig);
 
       expect(convertInputConfigToJsonSchema).toHaveBeenCalledExactlyOnceWith(
@@ -72,7 +70,7 @@ describe('SubagentToolWrapper', () => {
       );
     });
 
-    it('should correctly configure the tool properties from the agent definition', () => {
+    it("should correctly configure the tool properties from the agent definition", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
 
       expect(wrapper.name).toBe(mockDefinition.name);
@@ -83,19 +81,16 @@ describe('SubagentToolWrapper', () => {
       expect(wrapper.canUpdateOutput).toBe(true);
     });
 
-    it('should fall back to the agent name for displayName if it is not provided', () => {
+    it("should fall back to the agent name for displayName if it is not provided", () => {
       const definitionWithoutDisplayName = {
         ...mockDefinition,
         displayName: undefined,
       };
-      const wrapper = new SubagentToolWrapper(
-        definitionWithoutDisplayName,
-        mockConfig,
-      );
+      const wrapper = new SubagentToolWrapper(definitionWithoutDisplayName, mockConfig);
       expect(wrapper.displayName).toBe(definitionWithoutDisplayName.name);
     });
 
-    it('should generate a valid tool schema using the definition and converted schema', () => {
+    it("should generate a valid tool schema using the definition and converted schema", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
       const schema = wrapper.schema;
 
@@ -105,10 +100,10 @@ describe('SubagentToolWrapper', () => {
     });
   });
 
-  describe('createInvocation', () => {
-    it('should create a SubagentInvocation with the correct parameters', () => {
+  describe("createInvocation", () => {
+    it("should create a SubagentInvocation with the correct parameters", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
-      const params: AgentInputs = { goal: 'Test the invocation', priority: 1 };
+      const params: AgentInputs = { goal: "Test the invocation", priority: 1 };
 
       // The public `build` method calls the protected `createInvocation` after validation
       const invocation = wrapper.build(params);
@@ -122,14 +117,10 @@ describe('SubagentToolWrapper', () => {
       );
     });
 
-    it('should pass the messageBus to the SubagentInvocation constructor', () => {
+    it("should pass the messageBus to the SubagentInvocation constructor", () => {
       const mockMessageBus = {} as MessageBus;
-      const wrapper = new SubagentToolWrapper(
-        mockDefinition,
-        mockConfig,
-        mockMessageBus,
-      );
-      const params: AgentInputs = { goal: 'Test the invocation', priority: 1 };
+      const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
+      const params: AgentInputs = { goal: "Test the invocation", priority: 1 };
 
       wrapper.build(params);
 
@@ -141,7 +132,7 @@ describe('SubagentToolWrapper', () => {
       );
     });
 
-    it('should throw a validation error for invalid parameters before creating an invocation', () => {
+    it("should throw a validation error for invalid parameters before creating an invocation", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
       // Missing the required 'goal' parameter
       const invalidParams = { priority: 1 };
diff --git a/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.ts b/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.ts
index ace4ee347..18dcaf889 100644
--- a/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.ts
+++ b/packages/gemini-cli-core/src/agents/subagent-tool-wrapper.ts
@@ -4,26 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  BaseDeclarativeTool,
-  Kind,
-  type ToolInvocation,
-  type ToolResult,
-} from '../tools/tools.js';
-import type { Config } from '../config/config.js';
-import type { AgentDefinition, AgentInputs } from './types.js';
-import { convertInputConfigToJsonSchema } from './schema-utils.js';
-import { SubagentInvocation } from './invocation.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { BaseDeclarativeTool, Kind, type ToolInvocation, type ToolResult } from "../tools/tools.js";
+import { SubagentInvocation } from "./invocation.js";
+import { convertInputConfigToJsonSchema } from "./schema-utils.js";
+import type { AgentDefinition, AgentInputs } from "./types.js";
 
 /**
  * A tool wrapper that dynamically exposes a subagent as a standard,
  * strongly-typed `DeclarativeTool`.
  */
-export class SubagentToolWrapper extends BaseDeclarativeTool<
-  AgentInputs,
-  ToolResult
-> {
+export class SubagentToolWrapper extends BaseDeclarativeTool<AgentInputs, ToolResult> {
   /**
    * Constructs the tool wrapper.
    *
@@ -40,9 +32,7 @@ export class SubagentToolWrapper extends BaseDeclarativeTool<
     messageBus?: MessageBus,
   ) {
     // Dynamically generate the JSON schema required for the tool definition.
-    const parameterSchema = convertInputConfigToJsonSchema(
-      definition.inputConfig,
-    );
+    const parameterSchema = convertInputConfigToJsonSchema(definition.inputConfig);
 
     super(
       definition.name,
@@ -65,14 +55,7 @@ export class SubagentToolWrapper extends BaseDeclarativeTool<
    * @param params The validated input parameters from the parent agent's call.
    * @returns A `ToolInvocation` instance ready for execution.
    */
-  protected createInvocation(
-    params: AgentInputs,
-  ): ToolInvocation<AgentInputs, ToolResult> {
-    return new SubagentInvocation(
-      params,
-      this.definition,
-      this.config,
-      this.messageBus,
-    );
+  protected createInvocation(params: AgentInputs): ToolInvocation<AgentInputs, ToolResult> {
+    return new SubagentInvocation(params, this.definition, this.config, this.messageBus);
   }
 }
diff --git a/packages/gemini-cli-core/src/agents/types.ts b/packages/gemini-cli-core/src/agents/types.ts
index 5a152ba8d..57efc9b8a 100644
--- a/packages/gemini-cli-core/src/agents/types.ts
+++ b/packages/gemini-cli-core/src/agents/types.ts
@@ -8,20 +8,20 @@
  * @fileoverview Defines the core configuration interfaces and types for the agent architecture.
  */
 
-import type { Content, FunctionDeclaration } from '@google/genai';
-import type { AnyDeclarativeTool } from '../tools/tools.js';
-import { type z } from 'zod';
+import type { Content, FunctionDeclaration } from "@google/genai";
+import { type z } from "zod";
+import type { AnyDeclarativeTool } from "../tools/tools.js";
 
 /**
  * Describes the possible termination modes for an agent.
  */
 export enum AgentTerminateMode {
-  ERROR = 'ERROR',
-  TIMEOUT = 'TIMEOUT',
-  GOAL = 'GOAL',
-  MAX_TURNS = 'MAX_TURNS',
-  ABORTED = 'ABORTED',
-  ERROR_NO_COMPLETE_TASK_CALL = 'ERROR_NO_COMPLETE_TASK_CALL',
+  ERROR = "ERROR",
+  TIMEOUT = "TIMEOUT",
+  GOAL = "GOAL",
+  MAX_TURNS = "MAX_TURNS",
+  ABORTED = "ABORTED",
+  ERROR_NO_COMPLETE_TASK_CALL = "ERROR_NO_COMPLETE_TASK_CALL",
 }
 
 /**
@@ -44,7 +44,7 @@ export type AgentInputs = Record<string, unknown>;
 export interface SubagentActivityEvent {
   isSubagentActivityEvent: true;
   agentName: string;
-  type: 'TOOL_CALL_START' | 'TOOL_CALL_END' | 'THOUGHT_CHUNK' | 'ERROR';
+  type: "TOOL_CALL_START" | "TOOL_CALL_END" | "THOUGHT_CHUNK" | "ERROR";
   data: Record<string, unknown>;
 }
 
@@ -114,13 +114,7 @@ export interface InputConfig {
     string,
     {
       description: string;
-      type:
-        | 'string'
-        | 'number'
-        | 'boolean'
-        | 'integer'
-        | 'string[]'
-        | 'number[]';
+      type: "string" | "number" | "boolean" | "integer" | "string[]" | "number[]";
       required: boolean;
     }
   >;
diff --git a/packages/gemini-cli-core/src/agents/utils.test.ts b/packages/gemini-cli-core/src/agents/utils.test.ts
index 348f8fe0b..7995c04cf 100644
--- a/packages/gemini-cli-core/src/agents/utils.test.ts
+++ b/packages/gemini-cli-core/src/agents/utils.test.ts
@@ -4,37 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { templateString } from './utils.js';
-import type { AgentInputs } from './types.js';
-
-describe('templateString', () => {
-  it('should replace a single placeholder with a string value', () => {
-    const template = 'Hello, ${name}!';
-    const inputs: AgentInputs = { name: 'World' };
+import { describe, expect, it } from "vitest";
+import type { AgentInputs } from "./types.js";
+import { templateString } from "./utils.js";
+
+describe("templateString", () => {
+  it("should replace a single placeholder with a string value", () => {
+    const template = "Hello, ${name}!";
+    const inputs: AgentInputs = { name: "World" };
     const result = templateString(template, inputs);
-    expect(result).toBe('Hello, World!');
+    expect(result).toBe("Hello, World!");
   });
 
-  it('should replace multiple unique placeholders', () => {
-    const template = 'User: ${user}, Role: ${role}';
-    const inputs: AgentInputs = { user: 'Alex', role: 'Admin' };
+  it("should replace multiple unique placeholders", () => {
+    const template = "User: ${user}, Role: ${role}";
+    const inputs: AgentInputs = { user: "Alex", role: "Admin" };
     const result = templateString(template, inputs);
-    expect(result).toBe('User: Alex, Role: Admin');
+    expect(result).toBe("User: Alex, Role: Admin");
   });
 
-  it('should replace multiple instances of the same placeholder', () => {
-    const template = '${greeting}, ${user}. Welcome, ${user}!';
-    const inputs: AgentInputs = { greeting: 'Hi', user: 'Sam' };
+  it("should replace multiple instances of the same placeholder", () => {
+    const template = "${greeting}, ${user}. Welcome, ${user}!";
+    const inputs: AgentInputs = { greeting: "Hi", user: "Sam" };
     const result = templateString(template, inputs);
-    expect(result).toBe('Hi, Sam. Welcome, Sam!');
+    expect(result).toBe("Hi, Sam. Welcome, Sam!");
   });
 
-  it('should handle various data types for input values', () => {
+  it("should handle various data types for input values", () => {
     const template =
-      'Name: ${name}, Age: ${age}, Active: ${isActive}, Plan: ${plan}, Score: ${score}';
+      "Name: ${name}, Age: ${age}, Active: ${isActive}, Plan: ${plan}, Score: ${score}";
     const inputs: AgentInputs = {
-      name: 'Jo',
+      name: "Jo",
       age: 30,
       isActive: true,
       plan: null,
@@ -42,44 +42,42 @@ describe('templateString', () => {
     };
     const result = templateString(template, inputs);
     // All values are converted to their string representations
-    expect(result).toBe(
-      'Name: Jo, Age: 30, Active: true, Plan: null, Score: undefined',
-    );
+    expect(result).toBe("Name: Jo, Age: 30, Active: true, Plan: null, Score: undefined");
   });
 
-  it('should return the original string if no placeholders are present', () => {
-    const template = 'This is a plain string with no placeholders.';
-    const inputs: AgentInputs = { key: 'value' };
+  it("should return the original string if no placeholders are present", () => {
+    const template = "This is a plain string with no placeholders.";
+    const inputs: AgentInputs = { key: "value" };
     const result = templateString(template, inputs);
-    expect(result).toBe('This is a plain string with no placeholders.');
+    expect(result).toBe("This is a plain string with no placeholders.");
   });
 
-  it('should correctly handle an empty template string', () => {
-    const template = '';
-    const inputs: AgentInputs = { key: 'value' };
+  it("should correctly handle an empty template string", () => {
+    const template = "";
+    const inputs: AgentInputs = { key: "value" };
     const result = templateString(template, inputs);
-    expect(result).toBe('');
+    expect(result).toBe("");
   });
 
-  it('should ignore extra keys in the inputs object that are not in the template', () => {
-    const template = 'Hello, ${name}.';
-    const inputs: AgentInputs = { name: 'Alice', extra: 'ignored' };
+  it("should ignore extra keys in the inputs object that are not in the template", () => {
+    const template = "Hello, ${name}.";
+    const inputs: AgentInputs = { name: "Alice", extra: "ignored" };
     const result = templateString(template, inputs);
-    expect(result).toBe('Hello, Alice.');
+    expect(result).toBe("Hello, Alice.");
   });
 
-  it('should throw an error if a required key is missing from the inputs', () => {
-    const template = 'The goal is ${goal}.';
-    const inputs: AgentInputs = { other_input: 'some value' };
+  it("should throw an error if a required key is missing from the inputs", () => {
+    const template = "The goal is ${goal}.";
+    const inputs: AgentInputs = { other_input: "some value" };
 
     expect(() => templateString(template, inputs)).toThrow(
-      'Template validation failed: Missing required input parameters: goal. Available inputs: other_input',
+      "Template validation failed: Missing required input parameters: goal. Available inputs: other_input",
     );
   });
 
-  it('should throw an error listing all missing keys if multiple are missing', () => {
-    const template = 'Analyze ${file} with ${tool}.';
-    const inputs: AgentInputs = { an_available_key: 'foo' };
+  it("should throw an error listing all missing keys if multiple are missing", () => {
+    const template = "Analyze ${file} with ${tool}.";
+    const inputs: AgentInputs = { an_available_key: "foo" };
 
     // Using a regex to allow for any order of missing keys in the error message
     expect(() => templateString(template, inputs)).toThrow(
@@ -87,29 +85,26 @@ describe('templateString', () => {
     );
   });
 
-  it('should be case-sensitive with placeholder keys', () => {
-    const template = 'Value: ${Key}';
-    const inputs: AgentInputs = { key: 'some value' }; // 'key' is lowercase
+  it("should be case-sensitive with placeholder keys", () => {
+    const template = "Value: ${Key}";
+    const inputs: AgentInputs = { key: "some value" }; // 'key' is lowercase
 
     expect(() => templateString(template, inputs)).toThrow(
-      'Template validation failed: Missing required input parameters: Key. Available inputs: key',
+      "Template validation failed: Missing required input parameters: Key. Available inputs: key",
     );
   });
 
-  it('should not replace malformed or incomplete placeholders', () => {
-    const template =
-      'This is {not_a_placeholder} and this is $$escaped. Test: ${valid}';
-    const inputs: AgentInputs = { valid: 'works' };
+  it("should not replace malformed or incomplete placeholders", () => {
+    const template = "This is {not_a_placeholder} and this is $$escaped. Test: ${valid}";
+    const inputs: AgentInputs = { valid: "works" };
     const result = templateString(template, inputs);
-    expect(result).toBe(
-      'This is {not_a_placeholder} and this is $$escaped. Test: works',
-    );
+    expect(result).toBe("This is {not_a_placeholder} and this is $$escaped. Test: works");
   });
 
-  it('should work correctly with an empty inputs object if the template has no placeholders', () => {
-    const template = 'Static text.';
+  it("should work correctly with an empty inputs object if the template has no placeholders", () => {
+    const template = "Static text.";
     const inputs: AgentInputs = {};
     const result = templateString(template, inputs);
-    expect(result).toBe('Static text.');
+    expect(result).toBe("Static text.");
   });
 });
diff --git a/packages/gemini-cli-core/src/agents/utils.ts b/packages/gemini-cli-core/src/agents/utils.ts
index 484c845e9..1016acaf2 100644
--- a/packages/gemini-cli-core/src/agents/utils.ts
+++ b/packages/gemini-cli-core/src/agents/utils.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AgentInputs } from './types.js';
+import type { AgentInputs } from "./types.js";
 
 /**
  * Replaces `${...}` placeholders in a template string with values from AgentInputs.
@@ -24,20 +24,16 @@ export function templateString(template: string, inputs: AgentInputs): string {
 
   // Check if all required keys exist in the inputs.
   const inputKeys = new Set(Object.keys(inputs));
-  const missingKeys = Array.from(requiredKeys).filter(
-    (key) => !inputKeys.has(key),
-  );
+  const missingKeys = Array.from(requiredKeys).filter((key) => !inputKeys.has(key));
 
   if (missingKeys.length > 0) {
     // Enhanced error message showing both missing and available keys
     throw new Error(
-      `Template validation failed: Missing required input parameters: ${missingKeys.join(', ')}. ` +
-        `Available inputs: ${Object.keys(inputs).join(', ')}`,
+      `Template validation failed: Missing required input parameters: ${missingKeys.join(", ")}. ` +
+        `Available inputs: ${Object.keys(inputs).join(", ")}`,
     );
   }
 
   // Perform the replacement using a replacer function.
-  return template.replace(placeholderRegex, (_match, key) =>
-    String(inputs[key]),
-  );
+  return template.replace(placeholderRegex, (_match, key) => String(inputs[key]));
 }
diff --git a/packages/gemini-cli-core/src/availability/errorClassification.ts b/packages/gemini-cli-core/src/availability/errorClassification.ts
index 1a50fe68d..f08a67111 100644
--- a/packages/gemini-cli-core/src/availability/errorClassification.ts
+++ b/packages/gemini-cli-core/src/availability/errorClassification.ts
@@ -4,22 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  TerminalQuotaError,
-  RetryableQuotaError,
-} from '../utils/googleQuotaErrors.js';
-import { ModelNotFoundError } from '../utils/httpErrors.js';
-import type { FailureKind } from './modelPolicy.js';
+import { RetryableQuotaError, TerminalQuotaError } from "../utils/googleQuotaErrors.js";
+import { ModelNotFoundError } from "../utils/httpErrors.js";
+import type { FailureKind } from "./modelPolicy.js";
 
 export function classifyFailureKind(error: unknown): FailureKind {
   if (error instanceof TerminalQuotaError) {
-    return 'terminal';
+    return "terminal";
   }
   if (error instanceof RetryableQuotaError) {
-    return 'transient';
+    return "transient";
   }
   if (error instanceof ModelNotFoundError) {
-    return 'not_found';
+    return "not_found";
   }
-  return 'unknown';
+  return "unknown";
 }
diff --git a/packages/gemini-cli-core/src/availability/modelAvailabilityService.test.ts b/packages/gemini-cli-core/src/availability/modelAvailabilityService.test.ts
index 32b8e000e..b30f56375 100644
--- a/packages/gemini-cli-core/src/availability/modelAvailabilityService.test.ts
+++ b/packages/gemini-cli-core/src/availability/modelAvailabilityService.test.ts
@@ -4,115 +4,103 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it, vi, beforeEach } from 'vitest';
-import { ModelAvailabilityService } from './modelAvailabilityService.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ModelAvailabilityService } from "./modelAvailabilityService.js";
 
-describe('ModelAvailabilityService', () => {
+describe("ModelAvailabilityService", () => {
   let service: ModelAvailabilityService;
-  const model = 'test-model';
+  const model = "test-model";
 
   beforeEach(() => {
     service = new ModelAvailabilityService();
     vi.useRealTimers();
   });
 
-  it('returns available snapshot when no state recorded', () => {
+  it("returns available snapshot when no state recorded", () => {
     expect(service.snapshot(model)).toEqual({ available: true });
   });
 
-  it('tracks retry-once-per-turn failures', () => {
+  it("tracks retry-once-per-turn failures", () => {
     service.markRetryOncePerTurn(model);
     expect(service.snapshot(model)).toEqual({ available: true });
 
     service.consumeStickyAttempt(model);
     expect(service.snapshot(model)).toEqual({
       available: false,
-      reason: 'retry_once_per_turn',
+      reason: "retry_once_per_turn",
     });
 
     service.resetTurn();
     expect(service.snapshot(model)).toEqual({ available: true });
   });
 
-  it('tracks terminal failures', () => {
-    service.markTerminal(model, 'quota');
+  it("tracks terminal failures", () => {
+    service.markTerminal(model, "quota");
     expect(service.snapshot(model)).toEqual({
       available: false,
-      reason: 'quota',
+      reason: "quota",
     });
   });
 
-  it('does not override terminal failure with sticky failure', () => {
-    service.markTerminal(model, 'quota');
+  it("does not override terminal failure with sticky failure", () => {
+    service.markTerminal(model, "quota");
     service.markRetryOncePerTurn(model);
     expect(service.snapshot(model)).toEqual({
       available: false,
-      reason: 'quota',
+      reason: "quota",
     });
   });
 
-  it('selects models respecting terminal and sticky states', () => {
-    const stickyModel = 'stick-model';
-    const healthyModel = 'healthy-model';
+  it("selects models respecting terminal and sticky states", () => {
+    const stickyModel = "stick-model";
+    const healthyModel = "healthy-model";
 
-    service.markTerminal(model, 'capacity');
+    service.markTerminal(model, "capacity");
     service.markRetryOncePerTurn(stickyModel);
 
-    const first = service.selectFirstAvailable([
-      model,
-      stickyModel,
-      healthyModel,
-    ]);
+    const first = service.selectFirstAvailable([model, stickyModel, healthyModel]);
     expect(first).toEqual({
       selectedModel: stickyModel,
       attempts: 1,
       skipped: [
         {
           model,
-          reason: 'capacity',
+          reason: "capacity",
         },
       ],
     });
 
     service.consumeStickyAttempt(stickyModel);
-    const second = service.selectFirstAvailable([
-      model,
-      stickyModel,
-      healthyModel,
-    ]);
+    const second = service.selectFirstAvailable([model, stickyModel, healthyModel]);
     expect(second).toEqual({
       selectedModel: healthyModel,
       skipped: [
         {
           model,
-          reason: 'capacity',
+          reason: "capacity",
         },
         {
           model: stickyModel,
-          reason: 'retry_once_per_turn',
+          reason: "retry_once_per_turn",
         },
       ],
     });
 
     service.resetTurn();
-    const third = service.selectFirstAvailable([
-      model,
-      stickyModel,
-      healthyModel,
-    ]);
+    const third = service.selectFirstAvailable([model, stickyModel, healthyModel]);
     expect(third).toEqual({
       selectedModel: stickyModel,
       attempts: 1,
       skipped: [
         {
           model,
-          reason: 'capacity',
+          reason: "capacity",
         },
       ],
     });
   });
 
-  it('preserves consumed state when marking retry-once-per-turn again', () => {
+  it("preserves consumed state when marking retry-once-per-turn again", () => {
     service.markRetryOncePerTurn(model);
     service.consumeStickyAttempt(model);
 
@@ -124,7 +112,7 @@ describe('ModelAvailabilityService', () => {
     expect(service.snapshot(model).available).toBe(false);
   });
 
-  it('clears consumed state when marked healthy', () => {
+  it("clears consumed state when marked healthy", () => {
     service.markRetryOncePerTurn(model);
     service.consumeStickyAttempt(model);
     expect(service.snapshot(model).available).toBe(false);
@@ -137,8 +125,8 @@ describe('ModelAvailabilityService', () => {
     expect(service.snapshot(model).available).toBe(true);
   });
 
-  it('resetTurn resets consumed state for multiple sticky models', () => {
-    const model2 = 'model-2';
+  it("resetTurn resets consumed state for multiple sticky models", () => {
+    const model2 = "model-2";
     service.markRetryOncePerTurn(model);
     service.markRetryOncePerTurn(model2);
 
@@ -154,12 +142,12 @@ describe('ModelAvailabilityService', () => {
     expect(service.snapshot(model2).available).toBe(true);
   });
 
-  it('resetTurn does not affect terminal models', () => {
-    service.markTerminal(model, 'quota');
+  it("resetTurn does not affect terminal models", () => {
+    service.markTerminal(model, "quota");
     service.resetTurn();
     expect(service.snapshot(model)).toEqual({
       available: false,
-      reason: 'quota',
+      reason: "quota",
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/availability/modelAvailabilityService.ts b/packages/gemini-cli-core/src/availability/modelAvailabilityService.ts
index 8c424c0d7..4722b83a0 100644
--- a/packages/gemini-cli-core/src/availability/modelAvailabilityService.ts
+++ b/packages/gemini-cli-core/src/availability/modelAvailabilityService.ts
@@ -6,20 +6,20 @@
 
 export type ModelId = string;
 
-export type TerminalUnavailabilityReason = 'quota' | 'capacity';
-export type TurnUnavailabilityReason = 'retry_once_per_turn';
+export type TerminalUnavailabilityReason = "quota" | "capacity";
+export type TurnUnavailabilityReason = "retry_once_per_turn";
 
 export type UnavailabilityReason =
   | TerminalUnavailabilityReason
   | TurnUnavailabilityReason
-  | 'unknown';
+  | "unknown";
 
-export type ModelHealthStatus = 'terminal' | 'sticky_retry';
+export type ModelHealthStatus = "terminal" | "sticky_retry";
 
 type HealthState =
-  | { status: 'terminal'; reason: TerminalUnavailabilityReason }
+  | { status: "terminal"; reason: TerminalUnavailabilityReason }
   | {
-      status: 'sticky_retry';
+      status: "sticky_retry";
       reason: TurnUnavailabilityReason;
       consumed: boolean;
     };
@@ -43,7 +43,7 @@ export class ModelAvailabilityService {
 
   markTerminal(model: ModelId, reason: TerminalUnavailabilityReason) {
     this.setState(model, {
-      status: 'terminal',
+      status: "terminal",
       reason,
     });
   }
@@ -55,27 +55,27 @@ export class ModelAvailabilityService {
   markRetryOncePerTurn(model: ModelId) {
     const currentState = this.health.get(model);
     // Do not override a terminal failure with a transient one.
-    if (currentState?.status === 'terminal') {
+    if (currentState?.status === "terminal") {
       return;
     }
 
     // Only reset consumption if we are not already in the sticky_retry state.
     // This prevents infinite loops if the model fails repeatedly in the same turn.
     let consumed = false;
-    if (currentState?.status === 'sticky_retry') {
+    if (currentState?.status === "sticky_retry") {
       consumed = currentState.consumed;
     }
 
     this.setState(model, {
-      status: 'sticky_retry',
-      reason: 'retry_once_per_turn',
+      status: "sticky_retry",
+      reason: "retry_once_per_turn",
       consumed,
     });
   }
 
   consumeStickyAttempt(model: ModelId) {
     const state = this.health.get(model);
-    if (state?.status === 'sticky_retry') {
+    if (state?.status === "sticky_retry") {
       this.setState(model, { ...state, consumed: true });
     }
   }
@@ -87,11 +87,11 @@ export class ModelAvailabilityService {
       return { available: true };
     }
 
-    if (state.status === 'terminal') {
+    if (state.status === "terminal") {
       return { available: false, reason: state.reason };
     }
 
-    if (state.status === 'sticky_retry' && state.consumed) {
+    if (state.status === "sticky_retry" && state.consumed) {
       return { available: false, reason: state.reason };
     }
 
@@ -99,17 +99,17 @@ export class ModelAvailabilityService {
   }
 
   selectFirstAvailable(models: ModelId[]): ModelSelectionResult {
-    const skipped: ModelSelectionResult['skipped'] = [];
+    const skipped: ModelSelectionResult["skipped"] = [];
 
     for (const model of models) {
       const snapshot = this.snapshot(model);
       if (snapshot.available) {
         const state = this.health.get(model);
         // A sticky model is being attempted, so note that.
-        const attempts = state?.status === 'sticky_retry' ? 1 : undefined;
+        const attempts = state?.status === "sticky_retry" ? 1 : undefined;
         return { selectedModel: model, skipped, attempts };
       } else {
-        skipped.push({ model, reason: snapshot.reason ?? 'unknown' });
+        skipped.push({ model, reason: snapshot.reason ?? "unknown" });
       }
     }
     return { selectedModel: null, skipped };
@@ -117,7 +117,7 @@ export class ModelAvailabilityService {
 
   resetTurn() {
     for (const [model, state] of this.health.entries()) {
-      if (state.status === 'sticky_retry') {
+      if (state.status === "sticky_retry") {
         this.setState(model, { ...state, consumed: false });
       }
     }
diff --git a/packages/gemini-cli-core/src/availability/modelPolicy.ts b/packages/gemini-cli-core/src/availability/modelPolicy.ts
index 199c13d7a..6e33211c5 100644
--- a/packages/gemini-cli-core/src/availability/modelPolicy.ts
+++ b/packages/gemini-cli-core/src/availability/modelPolicy.ts
@@ -8,17 +8,17 @@ import type {
   ModelAvailabilityService,
   ModelHealthStatus,
   ModelId,
-} from './modelAvailabilityService.js';
+} from "./modelAvailabilityService.js";
 
 /**
  * Whether to prompt the user or fallback silently on a model API failure.
  */
-export type FallbackAction = 'silent' | 'prompt';
+export type FallbackAction = "silent" | "prompt";
 
 /**
  * Type of possible errors from model API failures.
  */
-export type FailureKind = 'terminal' | 'transient' | 'not_found' | 'unknown';
+export type FailureKind = "terminal" | "transient" | "not_found" | "unknown";
 
 /**
  * Map from model API failure reason to user interaction.
@@ -28,9 +28,7 @@ export type ModelPolicyActionMap = Partial<Record<FailureKind, FallbackAction>>;
 /**
  * What state (e.g. Terminal, Sticky Retry) to set a model after failed API call.
  */
-export type ModelPolicyStateMap = Partial<
-  Record<FailureKind, ModelHealthStatus>
->;
+export type ModelPolicyStateMap = Partial<Record<FailureKind, ModelHealthStatus>>;
 
 /**
  * Defines the policy for a single model in the availability chain.
diff --git a/packages/gemini-cli-core/src/availability/policyCatalog.test.ts b/packages/gemini-cli-core/src/availability/policyCatalog.test.ts
index 092123ff6..7e9b9d9bb 100644
--- a/packages/gemini-cli-core/src/availability/policyCatalog.test.ts
+++ b/packages/gemini-cli-core/src/availability/policyCatalog.test.ts
@@ -4,90 +4,78 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL } from "../config/models.js";
 import {
   createDefaultPolicy,
   getModelPolicyChain,
   validateModelPolicyChain,
-} from './policyCatalog.js';
-import {
-  DEFAULT_GEMINI_MODEL,
-  PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
+} from "./policyCatalog.js";
 
-describe('policyCatalog', () => {
-  it('returns preview chain when preview enabled', () => {
+describe("policyCatalog", () => {
+  it("returns preview chain when preview enabled", () => {
     const chain = getModelPolicyChain({ previewEnabled: true });
     expect(chain[0]?.model).toBe(PREVIEW_GEMINI_MODEL);
     expect(chain).toHaveLength(3);
   });
 
-  it('returns default chain when preview disabled', () => {
+  it("returns default chain when preview disabled", () => {
     const chain = getModelPolicyChain({ previewEnabled: false });
     expect(chain[0]?.model).toBe(DEFAULT_GEMINI_MODEL);
     expect(chain).toHaveLength(2);
   });
 
-  it('marks preview transients as sticky retries', () => {
+  it("marks preview transients as sticky retries", () => {
     const [previewPolicy] = getModelPolicyChain({ previewEnabled: true });
     expect(previewPolicy.model).toBe(PREVIEW_GEMINI_MODEL);
-    expect(previewPolicy.stateTransitions.transient).toBe('sticky_retry');
+    expect(previewPolicy.stateTransitions.transient).toBe("sticky_retry");
   });
 
-  it('applies default actions and state transitions for unspecified kinds', () => {
+  it("applies default actions and state transitions for unspecified kinds", () => {
     const [previewPolicy] = getModelPolicyChain({ previewEnabled: true });
-    expect(previewPolicy.stateTransitions.not_found).toBe('terminal');
-    expect(previewPolicy.stateTransitions.unknown).toBe('terminal');
-    expect(previewPolicy.actions.unknown).toBe('prompt');
+    expect(previewPolicy.stateTransitions.not_found).toBe("terminal");
+    expect(previewPolicy.stateTransitions.unknown).toBe("terminal");
+    expect(previewPolicy.actions.unknown).toBe("prompt");
   });
 
-  it('clones policy maps so edits do not leak between calls', () => {
+  it("clones policy maps so edits do not leak between calls", () => {
     const firstCall = getModelPolicyChain({ previewEnabled: false });
-    firstCall[0]!.actions.terminal = 'silent';
+    firstCall[0]!.actions.terminal = "silent";
     const secondCall = getModelPolicyChain({ previewEnabled: false });
-    expect(secondCall[0]!.actions.terminal).toBe('prompt');
+    expect(secondCall[0]!.actions.terminal).toBe("prompt");
   });
 
-  it('passes when there is exactly one last-resort policy', () => {
+  it("passes when there is exactly one last-resort policy", () => {
     const validChain = [
-      createDefaultPolicy('test-model'),
-      { ...createDefaultPolicy('last-resort'), isLastResort: true },
+      createDefaultPolicy("test-model"),
+      { ...createDefaultPolicy("last-resort"), isLastResort: true },
     ];
     expect(() => validateModelPolicyChain(validChain)).not.toThrow();
   });
 
-  it('fails when no policies are marked last-resort', () => {
-    const chain = [
-      createDefaultPolicy('model-a'),
-      createDefaultPolicy('model-b'),
-    ];
-    expect(() => validateModelPolicyChain(chain)).toThrow(
-      'must include an `isLastResort`',
-    );
+  it("fails when no policies are marked last-resort", () => {
+    const chain = [createDefaultPolicy("model-a"), createDefaultPolicy("model-b")];
+    expect(() => validateModelPolicyChain(chain)).toThrow("must include an `isLastResort`");
   });
 
-  it('fails when a single-model chain is not last-resort', () => {
-    const chain = [createDefaultPolicy('lonely-model')];
-    expect(() => validateModelPolicyChain(chain)).toThrow(
-      'must include an `isLastResort`',
-    );
+  it("fails when a single-model chain is not last-resort", () => {
+    const chain = [createDefaultPolicy("lonely-model")];
+    expect(() => validateModelPolicyChain(chain)).toThrow("must include an `isLastResort`");
   });
 
-  it('fails when multiple policies are marked last-resort', () => {
+  it("fails when multiple policies are marked last-resort", () => {
     const chain = [
-      { ...createDefaultPolicy('model-a'), isLastResort: true },
-      { ...createDefaultPolicy('model-b'), isLastResort: true },
+      { ...createDefaultPolicy("model-a"), isLastResort: true },
+      { ...createDefaultPolicy("model-b"), isLastResort: true },
     ];
-    expect(() => validateModelPolicyChain(chain)).toThrow(
-      'must only have one `isLastResort`',
-    );
+    expect(() => validateModelPolicyChain(chain)).toThrow("must only have one `isLastResort`");
   });
 
-  it('createDefaultPolicy seeds default actions and states', () => {
-    const policy = createDefaultPolicy('custom');
-    expect(policy.actions.terminal).toBe('prompt');
-    expect(policy.actions.unknown).toBe('prompt');
-    expect(policy.stateTransitions.terminal).toBe('terminal');
-    expect(policy.stateTransitions.unknown).toBe('terminal');
+  it("createDefaultPolicy seeds default actions and states", () => {
+    const policy = createDefaultPolicy("custom");
+    expect(policy.actions.terminal).toBe("prompt");
+    expect(policy.actions.unknown).toBe("prompt");
+    expect(policy.stateTransitions.terminal).toBe("terminal");
+    expect(policy.stateTransitions.unknown).toBe("terminal");
   });
 });
diff --git a/packages/gemini-cli-core/src/availability/policyCatalog.ts b/packages/gemini-cli-core/src/availability/policyCatalog.ts
index 6a0d9d07c..73e7fc84e 100644
--- a/packages/gemini-cli-core/src/availability/policyCatalog.ts
+++ b/packages/gemini-cli-core/src/availability/policyCatalog.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { UserTierId } from "../code_assist/types.js";
+import {
+  DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  PREVIEW_GEMINI_MODEL,
+} from "../config/models.js";
 import type {
   ModelPolicy,
   ModelPolicyActionMap,
   ModelPolicyChain,
   ModelPolicyStateMap,
-} from './modelPolicy.js';
-import {
-  DEFAULT_GEMINI_FLASH_MODEL,
-  DEFAULT_GEMINI_MODEL,
-  PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
-import type { UserTierId } from '../code_assist/types.js';
+} from "./modelPolicy.js";
 
 // actions and stateTransitions are optional when defining ModelPolicy
-type PolicyConfig = Omit<ModelPolicy, 'actions' | 'stateTransitions'> & {
+type PolicyConfig = Omit<ModelPolicy, "actions" | "stateTransitions"> & {
   actions?: ModelPolicyActionMap;
   stateTransitions?: ModelPolicyStateMap;
 };
@@ -29,17 +29,17 @@ export interface ModelPolicyOptions {
 }
 
 const DEFAULT_ACTIONS: ModelPolicyActionMap = {
-  terminal: 'prompt',
-  transient: 'prompt',
-  not_found: 'prompt',
-  unknown: 'prompt',
+  terminal: "prompt",
+  transient: "prompt",
+  not_found: "prompt",
+  unknown: "prompt",
 };
 
 const DEFAULT_STATE: ModelPolicyStateMap = {
-  terminal: 'terminal',
-  transient: 'terminal',
-  not_found: 'terminal',
-  unknown: 'terminal',
+  terminal: "terminal",
+  transient: "terminal",
+  not_found: "terminal",
+  unknown: "terminal",
 };
 
 const DEFAULT_CHAIN: ModelPolicyChain = [
@@ -50,8 +50,8 @@ const DEFAULT_CHAIN: ModelPolicyChain = [
 const PREVIEW_CHAIN: ModelPolicyChain = [
   definePolicy({
     model: PREVIEW_GEMINI_MODEL,
-    stateTransitions: { transient: 'sticky_retry' },
-    actions: { transient: 'silent' },
+    stateTransitions: { transient: "sticky_retry" },
+    actions: { transient: "silent" },
   }),
   definePolicy({ model: DEFAULT_GEMINI_MODEL }),
   definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true }),
@@ -60,9 +60,7 @@ const PREVIEW_CHAIN: ModelPolicyChain = [
 /**
  * Returns the default ordered model policy chain for the user.
  */
-export function getModelPolicyChain(
-  options: ModelPolicyOptions,
-): ModelPolicyChain {
+export function getModelPolicyChain(options: ModelPolicyOptions): ModelPolicyChain {
   if (options.previewEnabled) {
     return cloneChain(PREVIEW_CHAIN);
   }
@@ -82,14 +80,14 @@ export function createDefaultPolicy(
 
 export function validateModelPolicyChain(chain: ModelPolicyChain): void {
   if (chain.length === 0) {
-    throw new Error('Model policy chain must include at least one model.');
+    throw new Error("Model policy chain must include at least one model.");
   }
   const lastResortCount = chain.filter((policy) => policy.isLastResort).length;
   if (lastResortCount === 0) {
-    throw new Error('Model policy chain must include an `isLastResort` model.');
+    throw new Error("Model policy chain must include an `isLastResort` model.");
   }
   if (lastResortCount > 1) {
-    throw new Error('Model policy chain must only have one `isLastResort`.');
+    throw new Error("Model policy chain must only have one `isLastResort`.");
   }
 }
 
diff --git a/packages/gemini-cli-core/src/availability/policyHelpers.test.ts b/packages/gemini-cli-core/src/availability/policyHelpers.test.ts
index 8a5455b09..86802130b 100644
--- a/packages/gemini-cli-core/src/availability/policyHelpers.test.ts
+++ b/packages/gemini-cli-core/src/availability/policyHelpers.test.ts
@@ -4,77 +4,73 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { createDefaultPolicy } from "./policyCatalog.js";
 import {
-  resolvePolicyChain,
-  buildFallbackPolicyContext,
   applyModelSelection,
-} from './policyHelpers.js';
-import { createDefaultPolicy } from './policyCatalog.js';
-import type { Config } from '../config/config.js';
+  buildFallbackPolicyContext,
+  resolvePolicyChain,
+} from "./policyHelpers.js";
 
 const createMockConfig = (overrides: Partial<Config> = {}): Config =>
   ({
     getPreviewFeatures: () => false,
     getUserTier: () => undefined,
-    getModel: () => 'gemini-2.5-pro',
+    getModel: () => "gemini-2.5-pro",
     isInFallbackMode: () => false,
     ...overrides,
   }) as unknown as Config;
 
-describe('policyHelpers', () => {
-  describe('resolvePolicyChain', () => {
-    it('inserts the active model when missing from the catalog', () => {
+describe("policyHelpers", () => {
+  describe("resolvePolicyChain", () => {
+    it("inserts the active model when missing from the catalog", () => {
       const config = createMockConfig({
-        getModel: () => 'custom-model',
+        getModel: () => "custom-model",
       });
       const chain = resolvePolicyChain(config);
       expect(chain).toHaveLength(1);
-      expect(chain[0]?.model).toBe('custom-model');
+      expect(chain[0]?.model).toBe("custom-model");
     });
 
-    it('leaves catalog order untouched when active model already present', () => {
+    it("leaves catalog order untouched when active model already present", () => {
       const config = createMockConfig({
-        getModel: () => 'gemini-2.5-pro',
+        getModel: () => "gemini-2.5-pro",
       });
       const chain = resolvePolicyChain(config);
-      expect(chain[0]?.model).toBe('gemini-2.5-pro');
+      expect(chain[0]?.model).toBe("gemini-2.5-pro");
     });
 
     it('returns the default chain when active model is "auto"', () => {
       const config = createMockConfig({
-        getModel: () => 'auto',
+        getModel: () => "auto",
       });
       const chain = resolvePolicyChain(config);
 
       // Expect default chain [Pro, Flash]
       expect(chain).toHaveLength(2);
-      expect(chain[0]?.model).toBe('gemini-2.5-pro');
-      expect(chain[1]?.model).toBe('gemini-2.5-flash');
+      expect(chain[0]?.model).toBe("gemini-2.5-pro");
+      expect(chain[1]?.model).toBe("gemini-2.5-flash");
     });
   });
 
-  describe('buildFallbackPolicyContext', () => {
-    it('returns remaining candidates after the failed model', () => {
-      const chain = [
-        createDefaultPolicy('a'),
-        createDefaultPolicy('b'),
-        createDefaultPolicy('c'),
-      ];
-      const context = buildFallbackPolicyContext(chain, 'b');
-      expect(context.failedPolicy?.model).toBe('b');
-      expect(context.candidates.map((p) => p.model)).toEqual(['c', 'a']);
+  describe("buildFallbackPolicyContext", () => {
+    it("returns remaining candidates after the failed model", () => {
+      const chain = [createDefaultPolicy("a"), createDefaultPolicy("b"), createDefaultPolicy("c")];
+      const context = buildFallbackPolicyContext(chain, "b");
+      expect(context.failedPolicy?.model).toBe("b");
+      expect(context.candidates.map((p) => p.model)).toEqual(["c", "a"]);
     });
 
-    it('returns full chain when model is not in policy list', () => {
-      const chain = [createDefaultPolicy('a'), createDefaultPolicy('b')];
-      const context = buildFallbackPolicyContext(chain, 'x');
+    it("returns full chain when model is not in policy list", () => {
+      const chain = [createDefaultPolicy("a"), createDefaultPolicy("b")];
+      const context = buildFallbackPolicyContext(chain, "x");
       expect(context.failedPolicy).toBeUndefined();
       expect(context.candidates).toEqual(chain);
     });
   });
 
-  describe('applyModelSelection', () => {
+  describe("applyModelSelection", () => {
     const mockModelConfigService = {
       getResolvedConfig: vi.fn(),
     };
@@ -84,9 +80,7 @@ describe('policyHelpers', () => {
       consumeStickyAttempt: vi.fn(),
     };
 
-    const createExtendedMockConfig = (
-      overrides: Partial<Config> = {},
-    ): Config => {
+    const createExtendedMockConfig = (overrides: Partial<Config> = {}): Config => {
       const defaults = {
         isModelAvailabilityServiceEnabled: () => true,
         getModelAvailabilityService: () => mockAvailabilityService,
@@ -100,84 +94,74 @@ describe('policyHelpers', () => {
       vi.clearAllMocks();
     });
 
-    it('returns requested model if availability service is disabled', () => {
+    it("returns requested model if availability service is disabled", () => {
       const config = createExtendedMockConfig({
         isModelAvailabilityServiceEnabled: () => false,
       });
-      const result = applyModelSelection(config, 'gemini-pro');
-      expect(result.model).toBe('gemini-pro');
+      const result = applyModelSelection(config, "gemini-pro");
+      expect(result.model).toBe("gemini-pro");
       expect(config.setActiveModel).not.toHaveBeenCalled();
     });
 
-    it('returns requested model if it is available', () => {
+    it("returns requested model if it is available", () => {
       const config = createExtendedMockConfig();
       mockAvailabilityService.selectFirstAvailable.mockReturnValue({
-        selectedModel: 'gemini-pro',
+        selectedModel: "gemini-pro",
       });
 
-      const result = applyModelSelection(config, 'gemini-pro');
-      expect(result.model).toBe('gemini-pro');
+      const result = applyModelSelection(config, "gemini-pro");
+      expect(result.model).toBe("gemini-pro");
       expect(result.maxAttempts).toBeUndefined();
-      expect(config.setActiveModel).toHaveBeenCalledWith('gemini-pro');
+      expect(config.setActiveModel).toHaveBeenCalledWith("gemini-pro");
     });
 
-    it('switches to backup model and updates config if requested is unavailable', () => {
+    it("switches to backup model and updates config if requested is unavailable", () => {
       const config = createExtendedMockConfig();
       mockAvailabilityService.selectFirstAvailable.mockReturnValue({
-        selectedModel: 'gemini-flash',
+        selectedModel: "gemini-flash",
       });
       mockModelConfigService.getResolvedConfig.mockReturnValue({
         generateContentConfig: { temperature: 0.1 },
       });
 
       const currentConfig = { temperature: 0.9, topP: 1 };
-      const result = applyModelSelection(config, 'gemini-pro', currentConfig);
+      const result = applyModelSelection(config, "gemini-pro", currentConfig);
 
-      expect(result.model).toBe('gemini-flash');
+      expect(result.model).toBe("gemini-flash");
       expect(result.config).toEqual({
         temperature: 0.1,
         topP: 1,
       });
 
       expect(mockModelConfigService.getResolvedConfig).toHaveBeenCalledWith({
-        model: 'gemini-flash',
+        model: "gemini-flash",
       });
-      expect(config.setActiveModel).toHaveBeenCalledWith('gemini-flash');
+      expect(config.setActiveModel).toHaveBeenCalledWith("gemini-flash");
     });
 
-    it('consumes sticky attempt if indicated', () => {
+    it("consumes sticky attempt if indicated", () => {
       const config = createExtendedMockConfig();
       mockAvailabilityService.selectFirstAvailable.mockReturnValue({
-        selectedModel: 'gemini-pro',
+        selectedModel: "gemini-pro",
         attempts: 1,
       });
 
-      const result = applyModelSelection(config, 'gemini-pro');
-      expect(mockAvailabilityService.consumeStickyAttempt).toHaveBeenCalledWith(
-        'gemini-pro',
-      );
+      const result = applyModelSelection(config, "gemini-pro");
+      expect(mockAvailabilityService.consumeStickyAttempt).toHaveBeenCalledWith("gemini-pro");
       expect(result.maxAttempts).toBe(1);
     });
 
-    it('does not consume sticky attempt if consumeAttempt is false', () => {
+    it("does not consume sticky attempt if consumeAttempt is false", () => {
       const config = createExtendedMockConfig();
       mockAvailabilityService.selectFirstAvailable.mockReturnValue({
-        selectedModel: 'gemini-pro',
+        selectedModel: "gemini-pro",
         attempts: 1,
       });
 
-      const result = applyModelSelection(
-        config,
-        'gemini-pro',
-        undefined,
-        undefined,
-        {
-          consumeAttempt: false,
-        },
-      );
-      expect(
-        mockAvailabilityService.consumeStickyAttempt,
-      ).not.toHaveBeenCalled();
+      const result = applyModelSelection(config, "gemini-pro", undefined, undefined, {
+        consumeAttempt: false,
+      });
+      expect(mockAvailabilityService.consumeStickyAttempt).not.toHaveBeenCalled();
       expect(result.maxAttempts).toBe(1);
     });
   });
diff --git a/packages/gemini-cli-core/src/availability/policyHelpers.ts b/packages/gemini-cli-core/src/availability/policyHelpers.ts
index ee0de8414..34af57a5c 100644
--- a/packages/gemini-cli-core/src/availability/policyHelpers.ts
+++ b/packages/gemini-cli-core/src/availability/policyHelpers.ts
@@ -4,27 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentConfig } from '@google/genai';
-import type { Config } from '../config/config.js';
+import type { GenerateContentConfig } from "@google/genai";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_MODEL, getEffectiveModel } from "../config/models.js";
+import type { ModelSelectionResult } from "./modelAvailabilityService.js";
 import type {
   FailureKind,
   FallbackAction,
   ModelPolicy,
   ModelPolicyChain,
   RetryAvailabilityContext,
-} from './modelPolicy.js';
-import { createDefaultPolicy, getModelPolicyChain } from './policyCatalog.js';
-import { DEFAULT_GEMINI_MODEL, getEffectiveModel } from '../config/models.js';
-import type { ModelSelectionResult } from './modelAvailabilityService.js';
+} from "./modelPolicy.js";
+import { createDefaultPolicy, getModelPolicyChain } from "./policyCatalog.js";
 
 /**
  * Resolves the active policy chain for the given config, ensuring the
  * user-selected active model is represented.
  */
-export function resolvePolicyChain(
-  config: Config,
-  preferredModel?: string,
-): ModelPolicyChain {
+export function resolvePolicyChain(config: Config, preferredModel?: string): ModelPolicyChain {
   const chain = getModelPolicyChain({
     previewEnabled: !!config.getPreviewFeatures(),
     userTier: config.getUserTier(),
@@ -33,13 +30,9 @@ export function resolvePolicyChain(
   // Switch to getActiveModel()
   const activeModel =
     preferredModel ??
-    getEffectiveModel(
-      config.isInFallbackMode(),
-      config.getModel(),
-      config.getPreviewFeatures(),
-    );
+    getEffectiveModel(config.isInFallbackMode(), config.getModel(), config.getPreviewFeatures());
 
-  if (activeModel === 'auto') {
+  if (activeModel === "auto") {
     return [...chain];
   }
 
@@ -75,11 +68,8 @@ export function buildFallbackPolicyContext(
   };
 }
 
-export function resolvePolicyAction(
-  failureKind: FailureKind,
-  policy: ModelPolicy,
-): FallbackAction {
-  return policy.actions?.[failureKind] ?? 'prompt';
+export function resolvePolicyAction(failureKind: FailureKind, policy: ModelPolicy): FallbackAction {
+  return policy.actions?.[failureKind] ?? "prompt";
 }
 
 /**
@@ -127,8 +117,7 @@ export function selectModelForAvailability(
 
   if (selection.selectedModel) return selection;
 
-  const backupModel =
-    chain.find((p) => p.isLastResort)?.model ?? DEFAULT_GEMINI_MODEL;
+  const backupModel = chain.find((p) => p.isLastResort)?.model ?? DEFAULT_GEMINI_MODEL;
 
   return { selectedModel: backupModel, skipped: [] };
 }
@@ -155,11 +144,10 @@ export function applyModelSelection(
 
   // If model changed, re-resolve config
   if (finalModel !== requestedModel) {
-    const { generateContentConfig } =
-      config.modelConfigService.getResolvedConfig({
-        overrideScope,
-        model: finalModel,
-      });
+    const { generateContentConfig } = config.modelConfigService.getResolvedConfig({
+      overrideScope,
+      model: finalModel,
+    });
 
     finalConfig = currentConfig
       ? { ...currentConfig, ...generateContentConfig }
@@ -189,12 +177,12 @@ export function applyAvailabilityTransition(
   const transition = context.policy.stateTransitions?.[failureKind];
   if (!transition) return;
 
-  if (transition === 'terminal') {
+  if (transition === "terminal") {
     context.service.markTerminal(
       context.policy.model,
-      failureKind === 'terminal' ? 'quota' : 'capacity',
+      failureKind === "terminal" ? "quota" : "capacity",
     );
-  } else if (transition === 'sticky_retry') {
+  } else if (transition === "sticky_retry") {
     context.service.markRetryOncePerTurn(context.policy.model);
   }
 }
diff --git a/packages/gemini-cli-core/src/availability/testUtils.ts b/packages/gemini-cli-core/src/availability/testUtils.ts
index 8b76c0f05..a8fe41630 100644
--- a/packages/gemini-cli-core/src/availability/testUtils.ts
+++ b/packages/gemini-cli-core/src/availability/testUtils.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import type {
-  ModelAvailabilityService,
-  ModelSelectionResult,
-} from './modelAvailabilityService.js';
+import { vi } from "vitest";
+import type { ModelAvailabilityService, ModelSelectionResult } from "./modelAvailabilityService.js";
 
 /**
  * Test helper to create a fully mocked ModelAvailabilityService.
diff --git a/packages/gemini-cli-core/src/code_assist/codeAssist.test.ts b/packages/gemini-cli-core/src/code_assist/codeAssist.test.ts
index 0974e2237..6f31f0887 100644
--- a/packages/gemini-cli-core/src/code_assist/codeAssist.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/codeAssist.test.ts
@@ -4,45 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { AuthType } from '../core/contentGenerator.js';
-import { getOauthClient } from './oauth2.js';
-import { setupUser } from './setup.js';
-import { CodeAssistServer } from './server.js';
-import {
-  createCodeAssistContentGenerator,
-  getCodeAssistServer,
-} from './codeAssist.js';
-import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from '../core/loggingContentGenerator.js';
-import { UserTierId } from './types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { LoggingContentGenerator } from "../core/loggingContentGenerator.js";
+import { createCodeAssistContentGenerator, getCodeAssistServer } from "./codeAssist.js";
+import { getOauthClient } from "./oauth2.js";
+import { CodeAssistServer } from "./server.js";
+import { setupUser } from "./setup.js";
+import { UserTierId } from "./types.js";
 
 // Mock dependencies
-vi.mock('./oauth2.js');
-vi.mock('./setup.js');
-vi.mock('./server.js');
-vi.mock('../core/loggingContentGenerator.js');
+vi.mock("./oauth2.js");
+vi.mock("./setup.js");
+vi.mock("./server.js");
+vi.mock("../core/loggingContentGenerator.js");
 
 const mockedGetOauthClient = vi.mocked(getOauthClient);
 const mockedSetupUser = vi.mocked(setupUser);
 const MockedCodeAssistServer = vi.mocked(CodeAssistServer);
 const MockedLoggingContentGenerator = vi.mocked(LoggingContentGenerator);
 
-describe('codeAssist', () => {
+describe("codeAssist", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  describe('createCodeAssistContentGenerator', () => {
+  describe("createCodeAssistContentGenerator", () => {
     const httpOptions = {};
     const mockConfig = {} as Config;
-    const mockAuthClient = { a: 'client' };
+    const mockAuthClient = { a: "client" };
     const mockUserData = {
-      projectId: 'test-project',
+      projectId: "test-project",
       userTier: UserTierId.FREE,
     };
 
-    it('should create a server for LOGIN_WITH_GOOGLE', async () => {
+    it("should create a server for LOGIN_WITH_GOOGLE", async () => {
       mockedGetOauthClient.mockResolvedValue(mockAuthClient as never);
       mockedSetupUser.mockResolvedValue(mockUserData);
 
@@ -50,25 +47,22 @@ describe('codeAssist', () => {
         httpOptions,
         AuthType.LOGIN_WITH_GOOGLE,
         mockConfig,
-        'session-123',
+        "session-123",
       );
 
-      expect(getOauthClient).toHaveBeenCalledWith(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfig,
-      );
+      expect(getOauthClient).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
       expect(setupUser).toHaveBeenCalledWith(mockAuthClient);
       expect(MockedCodeAssistServer).toHaveBeenCalledWith(
         mockAuthClient,
-        'test-project',
+        "test-project",
         httpOptions,
-        'session-123',
-        'free-tier',
+        "session-123",
+        "free-tier",
       );
       expect(generator).toBeInstanceOf(MockedCodeAssistServer);
     });
 
-    it('should create a server for COMPUTE_ADC', async () => {
+    it("should create a server for COMPUTE_ADC", async () => {
       mockedGetOauthClient.mockResolvedValue(mockAuthClient as never);
       mockedSetupUser.mockResolvedValue(mockUserData);
 
@@ -78,35 +72,32 @@ describe('codeAssist', () => {
         mockConfig,
       );
 
-      expect(getOauthClient).toHaveBeenCalledWith(
-        AuthType.COMPUTE_ADC,
-        mockConfig,
-      );
+      expect(getOauthClient).toHaveBeenCalledWith(AuthType.COMPUTE_ADC, mockConfig);
       expect(setupUser).toHaveBeenCalledWith(mockAuthClient);
       expect(MockedCodeAssistServer).toHaveBeenCalledWith(
         mockAuthClient,
-        'test-project',
+        "test-project",
         httpOptions,
         undefined, // No session ID
-        'free-tier',
+        "free-tier",
       );
       expect(generator).toBeInstanceOf(MockedCodeAssistServer);
     });
 
-    it('should throw an error for unsupported auth types', async () => {
+    it("should throw an error for unsupported auth types", async () => {
       await expect(
         createCodeAssistContentGenerator(
           httpOptions,
-          'api-key' as AuthType, // Use literal string to avoid enum resolution issues
+          "api-key" as AuthType, // Use literal string to avoid enum resolution issues
           mockConfig,
         ),
-      ).rejects.toThrow('Unsupported authType: api-key');
+      ).rejects.toThrow("Unsupported authType: api-key");
     });
   });
 
-  describe('getCodeAssistServer', () => {
-    it('should return the server if it is a CodeAssistServer', () => {
-      const mockServer = new MockedCodeAssistServer({} as never, '', {});
+  describe("getCodeAssistServer", () => {
+    it("should return the server if it is a CodeAssistServer", () => {
+      const mockServer = new MockedCodeAssistServer({} as never, "", {});
       const mockConfig = {
         getContentGenerator: () => mockServer,
       } as unknown as Config;
@@ -115,13 +106,10 @@ describe('codeAssist', () => {
       expect(server).toBe(mockServer);
     });
 
-    it('should unwrap and return the server if it is wrapped in a LoggingContentGenerator', () => {
-      const mockServer = new MockedCodeAssistServer({} as never, '', {});
-      const mockLogger = new MockedLoggingContentGenerator(
-        {} as never,
-        {} as never,
-      );
-      vi.spyOn(mockLogger, 'getWrapped').mockReturnValue(mockServer);
+    it("should unwrap and return the server if it is wrapped in a LoggingContentGenerator", () => {
+      const mockServer = new MockedCodeAssistServer({} as never, "", {});
+      const mockLogger = new MockedLoggingContentGenerator({} as never, {} as never);
+      vi.spyOn(mockLogger, "getWrapped").mockReturnValue(mockServer);
 
       const mockConfig = {
         getContentGenerator: () => mockLogger,
@@ -132,8 +120,8 @@ describe('codeAssist', () => {
       expect(mockLogger.getWrapped).toHaveBeenCalled();
     });
 
-    it('should return undefined if the content generator is not a CodeAssistServer', () => {
-      const mockGenerator = { a: 'generator' }; // Not a CodeAssistServer
+    it("should return undefined if the content generator is not a CodeAssistServer", () => {
+      const mockGenerator = { a: "generator" }; // Not a CodeAssistServer
       const mockConfig = {
         getContentGenerator: () => mockGenerator,
       } as unknown as Config;
@@ -142,15 +130,10 @@ describe('codeAssist', () => {
       expect(server).toBeUndefined();
     });
 
-    it('should return undefined if the wrapped generator is not a CodeAssistServer', () => {
-      const mockGenerator = { a: 'generator' }; // Not a CodeAssistServer
-      const mockLogger = new MockedLoggingContentGenerator(
-        {} as never,
-        {} as never,
-      );
-      vi.spyOn(mockLogger, 'getWrapped').mockReturnValue(
-        mockGenerator as never,
-      );
+    it("should return undefined if the wrapped generator is not a CodeAssistServer", () => {
+      const mockGenerator = { a: "generator" }; // Not a CodeAssistServer
+      const mockLogger = new MockedLoggingContentGenerator({} as never, {} as never);
+      vi.spyOn(mockLogger, "getWrapped").mockReturnValue(mockGenerator as never);
 
       const mockConfig = {
         getContentGenerator: () => mockLogger,
diff --git a/packages/gemini-cli-core/src/code_assist/codeAssist.ts b/packages/gemini-cli-core/src/code_assist/codeAssist.ts
index f8c9ac47b..012de5c2b 100644
--- a/packages/gemini-cli-core/src/code_assist/codeAssist.ts
+++ b/packages/gemini-cli-core/src/code_assist/codeAssist.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import { AuthType } from '../core/contentGenerator.js';
-import { getOauthClient } from './oauth2.js';
-import { setupUser } from './setup.js';
-import type { HttpOptions } from './server.js';
-import { CodeAssistServer } from './server.js';
-import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from '../core/loggingContentGenerator.js';
+import type { Config } from "../config/config.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { LoggingContentGenerator } from "../core/loggingContentGenerator.js";
+import { getOauthClient } from "./oauth2.js";
+import type { HttpOptions } from "./server.js";
+import { CodeAssistServer } from "./server.js";
+import { setupUser } from "./setup.js";
 
 export async function createCodeAssistContentGenerator(
   httpOptions: HttpOptions,
@@ -19,10 +19,7 @@ export async function createCodeAssistContentGenerator(
   config: Config,
   sessionId?: string,
 ): Promise<ContentGenerator> {
-  if (
-    authType === AuthType.LOGIN_WITH_GOOGLE ||
-    authType === AuthType.COMPUTE_ADC
-  ) {
+  if (authType === AuthType.LOGIN_WITH_GOOGLE || authType === AuthType.COMPUTE_ADC) {
     const authClient = await getOauthClient(authType, config);
     const userData = await setupUser(authClient);
     return new CodeAssistServer(
@@ -37,9 +34,7 @@ export async function createCodeAssistContentGenerator(
   throw new Error(`Unsupported authType: ${authType}`);
 }
 
-export function getCodeAssistServer(
-  config: Config,
-): CodeAssistServer | undefined {
+export function getCodeAssistServer(config: Config): CodeAssistServer | undefined {
   let server = config.getContentGenerator();
 
   // Unwrap LoggingContentGenerator if present
diff --git a/packages/gemini-cli-core/src/code_assist/converter.test.ts b/packages/gemini-cli-core/src/code_assist/converter.test.ts
index 17dba1e4d..3c2371874 100644
--- a/packages/gemini-cli-core/src/code_assist/converter.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/converter.test.ts
@@ -4,42 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import type { CaGenerateContentResponse } from './converter.js';
-import {
-  toGenerateContentRequest,
-  fromGenerateContentResponse,
-  toContents,
-} from './converter.js';
-import type {
-  ContentListUnion,
-  GenerateContentParameters,
-} from '@google/genai';
-import {
-  GenerateContentResponse,
-  FinishReason,
-  BlockedReason,
-  type Part,
-} from '@google/genai';
+import type { ContentListUnion, GenerateContentParameters } from "@google/genai";
+import { BlockedReason, FinishReason, GenerateContentResponse, type Part } from "@google/genai";
+import { describe, expect, it } from "vitest";
+import type { CaGenerateContentResponse } from "./converter.js";
+import { fromGenerateContentResponse, toContents, toGenerateContentRequest } from "./converter.js";
 
-describe('converter', () => {
-  describe('toCodeAssistRequest', () => {
-    it('should convert a simple request with project', () => {
+describe("converter", () => {
+  describe("toCodeAssistRequest", () => {
+    it("should convert a simple request with project", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: "gemini-pro",
+        contents: [{ role: "user", parts: [{ text: "Hello" }] }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq).toEqual({
-        model: 'gemini-pro',
-        project: 'my-project',
+        model: "gemini-pro",
+        project: "my-project",
         request: {
-          contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+          contents: [{ role: "user", parts: [{ text: "Hello" }] }],
           systemInstruction: undefined,
           cachedContent: undefined,
           tools: undefined,
@@ -47,28 +35,28 @@ describe('converter', () => {
           labels: undefined,
           safetySettings: undefined,
           generationConfig: undefined,
-          session_id: 'my-session',
+          session_id: "my-session",
         },
-        user_prompt_id: 'my-prompt',
+        user_prompt_id: "my-prompt",
       });
     });
 
-    it('should convert a request without a project', () => {
+    it("should convert a request without a project", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: "gemini-pro",
+        contents: [{ role: "user", parts: [{ text: "Hello" }] }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
+        "my-prompt",
         undefined,
-        'my-session',
+        "my-session",
       );
       expect(codeAssistReq).toEqual({
-        model: 'gemini-pro',
+        model: "gemini-pro",
         project: undefined,
         request: {
-          contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+          contents: [{ role: "user", parts: [{ text: "Hello" }] }],
           systemInstruction: undefined,
           cachedContent: undefined,
           tools: undefined,
@@ -76,28 +64,28 @@ describe('converter', () => {
           labels: undefined,
           safetySettings: undefined,
           generationConfig: undefined,
-          session_id: 'my-session',
+          session_id: "my-session",
         },
-        user_prompt_id: 'my-prompt',
+        user_prompt_id: "my-prompt",
       });
     });
 
-    it('should convert a request with sessionId', () => {
+    it("should convert a request with sessionId", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: "gemini-pro",
+        contents: [{ role: "user", parts: [{ text: "Hello" }] }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'session-123',
+        "my-prompt",
+        "my-project",
+        "session-123",
       );
       expect(codeAssistReq).toEqual({
-        model: 'gemini-pro',
-        project: 'my-project',
+        model: "gemini-pro",
+        project: "my-project",
         request: {
-          contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+          contents: [{ role: "user", parts: [{ text: "Hello" }] }],
           systemInstruction: undefined,
           cachedContent: undefined,
           tools: undefined,
@@ -105,69 +93,69 @@ describe('converter', () => {
           labels: undefined,
           safetySettings: undefined,
           generationConfig: undefined,
-          session_id: 'session-123',
+          session_id: "session-123",
         },
-        user_prompt_id: 'my-prompt',
+        user_prompt_id: "my-prompt",
       });
     });
 
-    it('should handle string content', () => {
+    it("should handle string content", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.contents).toEqual([
-        { role: 'user', parts: [{ text: 'Hello' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
       ]);
     });
 
-    it('should handle Part[] content', () => {
+    it("should handle Part[] content", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ text: 'Hello' }, { text: 'World' }],
+        model: "gemini-pro",
+        contents: [{ text: "Hello" }, { text: "World" }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.contents).toEqual([
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        { role: 'user', parts: [{ text: 'World' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
+        { role: "user", parts: [{ text: "World" }] },
       ]);
     });
 
-    it('should handle system instructions', () => {
+    it("should handle system instructions", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
         config: {
-          systemInstruction: 'You are a helpful assistant.',
+          systemInstruction: "You are a helpful assistant.",
         },
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.systemInstruction).toEqual({
-        role: 'user',
-        parts: [{ text: 'You are a helpful assistant.' }],
+        role: "user",
+        parts: [{ text: "You are a helpful assistant." }],
       });
     });
 
-    it('should handle generation config', () => {
+    it("should handle generation config", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
         config: {
           temperature: 0.8,
           topK: 40,
@@ -175,9 +163,9 @@ describe('converter', () => {
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.generationConfig).toEqual({
         temperature: 0.8,
@@ -185,30 +173,30 @@ describe('converter', () => {
       });
     });
 
-    it('should handle all generation config fields', () => {
+    it("should handle all generation config fields", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
         config: {
           temperature: 0.1,
           topP: 0.2,
           topK: 3,
           candidateCount: 4,
           maxOutputTokens: 5,
-          stopSequences: ['a'],
+          stopSequences: ["a"],
           responseLogprobs: true,
           logprobs: 6,
           presencePenalty: 0.7,
           frequencyPenalty: 0.8,
           seed: 9,
-          responseMimeType: 'application/json',
+          responseMimeType: "application/json",
         },
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.generationConfig).toEqual({
         temperature: 0.1,
@@ -216,27 +204,27 @@ describe('converter', () => {
         topK: 3,
         candidateCount: 4,
         maxOutputTokens: 5,
-        stopSequences: ['a'],
+        stopSequences: ["a"],
         responseLogprobs: true,
         logprobs: 6,
         presencePenalty: 0.7,
         frequencyPenalty: 0.8,
         seed: 9,
-        responseMimeType: 'application/json',
+        responseMimeType: "application/json",
       });
     });
   });
 
-  describe('fromCodeAssistResponse', () => {
-    it('should convert a simple response', () => {
+  describe("fromCodeAssistResponse", () => {
+    it("should convert a simple response", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [
             {
               index: 0,
               content: {
-                role: 'model',
-                parts: [{ text: 'Hi there!' }],
+                role: "model",
+                parts: [{ text: "Hi there!" }],
               },
               finishReason: FinishReason.STOP,
               safetyRatings: [],
@@ -249,7 +237,7 @@ describe('converter', () => {
       expect(genaiRes.candidates).toEqual(codeAssistRes.response.candidates);
     });
 
-    it('should handle prompt feedback and usage metadata', () => {
+    it("should handle prompt feedback and usage metadata", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
@@ -265,27 +253,23 @@ describe('converter', () => {
         },
       };
       const genaiRes = fromGenerateContentResponse(codeAssistRes);
-      expect(genaiRes.promptFeedback).toEqual(
-        codeAssistRes.response.promptFeedback,
-      );
-      expect(genaiRes.usageMetadata).toEqual(
-        codeAssistRes.response.usageMetadata,
-      );
+      expect(genaiRes.promptFeedback).toEqual(codeAssistRes.response.promptFeedback);
+      expect(genaiRes.usageMetadata).toEqual(codeAssistRes.response.usageMetadata);
     });
 
-    it('should handle automatic function calling history', () => {
+    it("should handle automatic function calling history", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
           automaticFunctionCallingHistory: [
             {
-              role: 'model',
+              role: "model",
               parts: [
                 {
                   functionCall: {
-                    name: 'test_function',
+                    name: "test_function",
                     args: {
-                      foo: 'bar',
+                      foo: "bar",
                     },
                   },
                 },
@@ -300,29 +284,29 @@ describe('converter', () => {
       );
     });
 
-    it('should handle modelVersion', () => {
+    it("should handle modelVersion", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
-          modelVersion: 'gemini-2.5-pro',
+          modelVersion: "gemini-2.5-pro",
         },
       };
       const genaiRes = fromGenerateContentResponse(codeAssistRes);
-      expect(genaiRes.modelVersion).toEqual('gemini-2.5-pro');
+      expect(genaiRes.modelVersion).toEqual("gemini-2.5-pro");
     });
 
-    it('should handle traceId', () => {
+    it("should handle traceId", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
         },
-        traceId: 'my-trace-id',
+        traceId: "my-trace-id",
       };
       const genaiRes = fromGenerateContentResponse(codeAssistRes);
-      expect(genaiRes.responseId).toEqual('my-trace-id');
+      expect(genaiRes.responseId).toEqual("my-trace-id");
     });
 
-    it('should handle missing traceId', () => {
+    it("should handle missing traceId", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
@@ -333,141 +317,135 @@ describe('converter', () => {
     });
   });
 
-  describe('toContents', () => {
-    it('should handle Content', () => {
+  describe("toContents", () => {
+    it("should handle Content", () => {
       const content: ContentListUnion = {
-        role: 'user',
-        parts: [{ text: 'hello' }],
+        role: "user",
+        parts: [{ text: "hello" }],
       };
-      expect(toContents(content)).toEqual([
-        { role: 'user', parts: [{ text: 'hello' }] },
-      ]);
+      expect(toContents(content)).toEqual([{ role: "user", parts: [{ text: "hello" }] }]);
     });
 
-    it('should handle array of Contents', () => {
+    it("should handle array of Contents", () => {
       const contents: ContentListUnion = [
-        { role: 'user', parts: [{ text: 'hello' }] },
-        { role: 'model', parts: [{ text: 'hi' }] },
+        { role: "user", parts: [{ text: "hello" }] },
+        { role: "model", parts: [{ text: "hi" }] },
       ];
       expect(toContents(contents)).toEqual([
-        { role: 'user', parts: [{ text: 'hello' }] },
-        { role: 'model', parts: [{ text: 'hi' }] },
+        { role: "user", parts: [{ text: "hello" }] },
+        { role: "model", parts: [{ text: "hi" }] },
       ]);
     });
 
-    it('should handle Part', () => {
-      const part: ContentListUnion = { text: 'a part' };
-      expect(toContents(part)).toEqual([
-        { role: 'user', parts: [{ text: 'a part' }] },
-      ]);
+    it("should handle Part", () => {
+      const part: ContentListUnion = { text: "a part" };
+      expect(toContents(part)).toEqual([{ role: "user", parts: [{ text: "a part" }] }]);
     });
 
-    it('should handle array of Parts', () => {
-      const parts = [{ text: 'part 1' }, 'part 2'];
+    it("should handle array of Parts", () => {
+      const parts = [{ text: "part 1" }, "part 2"];
       expect(toContents(parts)).toEqual([
-        { role: 'user', parts: [{ text: 'part 1' }] },
-        { role: 'user', parts: [{ text: 'part 2' }] },
+        { role: "user", parts: [{ text: "part 1" }] },
+        { role: "user", parts: [{ text: "part 2" }] },
       ]);
     });
 
-    it('should handle string', () => {
-      const str: ContentListUnion = 'a string';
-      expect(toContents(str)).toEqual([
-        { role: 'user', parts: [{ text: 'a string' }] },
-      ]);
+    it("should handle string", () => {
+      const str: ContentListUnion = "a string";
+      expect(toContents(str)).toEqual([{ role: "user", parts: [{ text: "a string" }] }]);
     });
 
-    it('should handle array of strings', () => {
-      const strings: ContentListUnion = ['string 1', 'string 2'];
+    it("should handle array of strings", () => {
+      const strings: ContentListUnion = ["string 1", "string 2"];
       expect(toContents(strings)).toEqual([
-        { role: 'user', parts: [{ text: 'string 1' }] },
-        { role: 'user', parts: [{ text: 'string 2' }] },
+        { role: "user", parts: [{ text: "string 1" }] },
+        { role: "user", parts: [{ text: "string 2" }] },
       ]);
     });
 
-    it('should convert thought parts to text parts for API compatibility', () => {
+    it("should convert thought parts to text parts for API compatibility", () => {
       const contentWithThought: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
-          { text: 'regular text' },
-          { thought: 'thinking about the problem' } as Part & {
+          { text: "regular text" },
+          { thought: "thinking about the problem" } as Part & {
             thought: string;
           },
-          { text: 'more text' },
+          { text: "more text" },
         ],
       };
       expect(toContents(contentWithThought)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
-            { text: 'regular text' },
-            { text: '[Thought: thinking about the problem]' },
-            { text: 'more text' },
+            { text: "regular text" },
+            { text: "[Thought: thinking about the problem]" },
+            { text: "more text" },
           ],
         },
       ]);
     });
 
-    it('should combine text and thought for text parts with thoughts', () => {
+    it("should combine text and thought for text parts with thoughts", () => {
       const contentWithTextAndThought: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
           {
-            text: 'Here is my response',
-            thought: 'I need to be careful here',
+            text: "Here is my response",
+            thought: "I need to be careful here",
           } as Part & { thought: string },
         ],
       };
       expect(toContents(contentWithTextAndThought)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
-              text: 'Here is my response\n[Thought: I need to be careful here]',
+              text: "Here is my response\n[Thought: I need to be careful here]",
             },
           ],
         },
       ]);
     });
 
-    it('should preserve non-thought properties while removing thought', () => {
+    it("should preserve non-thought properties while removing thought", () => {
       const contentWithComplexPart: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
           {
-            functionCall: { name: 'calculate', args: { x: 5, y: 10 } },
-            thought: 'Performing calculation',
+            functionCall: { name: "calculate", args: { x: 5, y: 10 } },
+            thought: "Performing calculation",
           } as Part & { thought: string },
         ],
       };
       expect(toContents(contentWithComplexPart)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
-              functionCall: { name: 'calculate', args: { x: 5, y: 10 } },
+              functionCall: { name: "calculate", args: { x: 5, y: 10 } },
             },
           ],
         },
       ]);
     });
 
-    it('should convert invalid text content to valid text part with thought', () => {
+    it("should convert invalid text content to valid text part with thought", () => {
       const contentWithInvalidText: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
           {
             text: 123, // Invalid - should be string
-            thought: 'Processing number',
+            thought: "Processing number",
           } as Part & { thought: string; text: number },
         ],
       };
       expect(toContents(contentWithInvalidText)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
-              text: '123\n[Thought: Processing number]',
+              text: "123\n[Thought: Processing number]",
             },
           ],
         },
diff --git a/packages/gemini-cli-core/src/code_assist/converter.ts b/packages/gemini-cli-core/src/code_assist/converter.ts
index 2b8b0a3a3..1612bf59f 100644
--- a/packages/gemini-cli-core/src/code_assist/converter.ts
+++ b/packages/gemini-cli-core/src/code_assist/converter.ts
@@ -5,28 +5,28 @@
  */
 
 import type {
+  Candidate,
   Content,
   ContentListUnion,
   ContentUnion,
-  GenerateContentConfig,
-  GenerateContentParameters,
   CountTokensParameters,
   CountTokensResponse,
+  GenerateContentConfig,
+  GenerateContentParameters,
+  GenerateContentResponsePromptFeedback,
+  GenerateContentResponseUsageMetadata,
   GenerationConfigRoutingConfig,
   MediaResolution,
-  Candidate,
   ModelSelectionConfig,
-  GenerateContentResponsePromptFeedback,
-  GenerateContentResponseUsageMetadata,
   Part,
-  SafetySetting,
   PartUnion,
+  SafetySetting,
   SpeechConfigUnion,
   ThinkingConfig,
-  ToolListUnion,
   ToolConfig,
-} from '@google/genai';
-import { GenerateContentResponse } from '@google/genai';
+  ToolListUnion,
+} from "@google/genai";
+import { GenerateContentResponse } from "@google/genai";
 
 export interface CAGenerateContentRequest {
   model: string;
@@ -97,20 +97,16 @@ export interface CaCountTokenResponse {
   totalTokens: number;
 }
 
-export function toCountTokenRequest(
-  req: CountTokensParameters,
-): CaCountTokenRequest {
+export function toCountTokenRequest(req: CountTokensParameters): CaCountTokenRequest {
   return {
     request: {
-      model: 'models/' + req.model,
+      model: "models/" + req.model,
       contents: toContents(req.contents),
     },
   };
 }
 
-export function fromCountTokenResponse(
-  res: CaCountTokenResponse,
-): CountTokensResponse {
+export function fromCountTokenResponse(res: CaCountTokenResponse): CountTokensResponse {
   return {
     totalTokens: res.totalTokens,
   };
@@ -181,29 +177,27 @@ function toContent(content: ContentUnion): Content {
   if (Array.isArray(content)) {
     // it's a PartsUnion[]
     return {
-      role: 'user',
+      role: "user",
       parts: toParts(content),
     };
   }
-  if (typeof content === 'string') {
+  if (typeof content === "string") {
     // it's a string
     return {
-      role: 'user',
+      role: "user",
       parts: [{ text: content }],
     };
   }
-  if ('parts' in content) {
+  if ("parts" in content) {
     // it's a Content - process parts to handle thought filtering
     return {
       ...content,
-      parts: content.parts
-        ? toParts(content.parts.filter((p) => p != null))
-        : [],
+      parts: content.parts ? toParts(content.parts.filter((p) => p != null)) : [],
     };
   }
   // it's a Part
   return {
-    role: 'user',
+    role: "user",
     parts: [toPart(content as Part)],
   };
 }
@@ -213,7 +207,7 @@ export function toParts(parts: PartUnion[]): Part[] {
 }
 
 function toPart(part: PartUnion): Part {
-  if (typeof part === 'string') {
+  if (typeof part === "string") {
     // it's a string
     return { text: part };
   }
@@ -221,17 +215,17 @@ function toPart(part: PartUnion): Part {
   // Handle thought parts for CountToken API compatibility
   // The CountToken API expects parts to have certain required "oneof" fields initialized,
   // but thought parts don't conform to this schema and cause API failures
-  if ('thought' in part && part.thought) {
+  if ("thought" in part && part.thought) {
     const thoughtText = `[Thought: ${part.thought}]`;
 
     const newPart = { ...part };
-    delete (newPart as Record<string, unknown>)['thought'];
+    delete (newPart as Record<string, unknown>)["thought"];
 
     const hasApiContent =
-      'functionCall' in newPart ||
-      'functionResponse' in newPart ||
-      'inlineData' in newPart ||
-      'fileData' in newPart;
+      "functionCall" in newPart ||
+      "functionResponse" in newPart ||
+      "inlineData" in newPart ||
+      "fileData" in newPart;
 
     if (hasApiContent) {
       // It's a functionCall or other non-text part. Just strip the thought.
@@ -241,10 +235,8 @@ function toPart(part: PartUnion): Part {
     // If no other valid API content, this must be a text part.
     // Combine existing text (if any) with the thought, preserving other properties.
     const text = (newPart as { text?: unknown }).text;
-    const existingText = text ? String(text) : '';
-    const combinedText = existingText
-      ? `${existingText}\n${thoughtText}`
-      : thoughtText;
+    const existingText = text ? String(text) : "";
+    const combinedText = existingText ? `${existingText}\n${thoughtText}` : thoughtText;
 
     return {
       ...newPart,
diff --git a/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.test.ts b/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.test.ts
index 311a88c37..53570a8e6 100644
--- a/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.test.ts
@@ -4,64 +4,64 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { ReleaseChannel, getReleaseChannel } from '../../utils/channel.js';
-import { getVersion } from '../../utils/version.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { getReleaseChannel, ReleaseChannel } from "../../utils/channel.js";
+import { getVersion } from "../../utils/version.js";
 
 // Mock dependencies before importing the module under test
-vi.mock('../../utils/channel.js', async () => {
-  const actual = await vi.importActual('../../utils/channel.js');
+vi.mock("../../utils/channel.js", async () => {
+  const actual = await vi.importActual("../../utils/channel.js");
   return {
     ...(actual as object),
     getReleaseChannel: vi.fn(),
   };
 });
 
-vi.mock('../../utils/version.js', async () => ({
+vi.mock("../../utils/version.js", async () => ({
   getVersion: vi.fn(),
 }));
 
-describe('client_metadata', () => {
+describe("client_metadata", () => {
   const originalPlatform = process.platform;
   const originalArch = process.arch;
-  const originalCliVersion = process.env['CLI_VERSION'];
+  const originalCliVersion = process.env["CLI_VERSION"];
   const originalNodeVersion = process.version;
 
   beforeEach(async () => {
     // Reset modules to clear the cached `clientMetadataPromise`
     vi.resetModules();
     // Re-import the module to get a fresh instance
-    await import('./client_metadata.js');
+    await import("./client_metadata.js");
     // Provide a default mock implementation for each test
     vi.mocked(getReleaseChannel).mockResolvedValue(ReleaseChannel.STABLE);
-    vi.mocked(getVersion).mockResolvedValue('0.0.0');
+    vi.mocked(getVersion).mockResolvedValue("0.0.0");
   });
 
   afterEach(() => {
     // Restore original process properties to avoid side-effects between tests
-    Object.defineProperty(process, 'platform', { value: originalPlatform });
-    Object.defineProperty(process, 'arch', { value: originalArch });
-    process.env['CLI_VERSION'] = originalCliVersion;
-    Object.defineProperty(process, 'version', { value: originalNodeVersion });
+    Object.defineProperty(process, "platform", { value: originalPlatform });
+    Object.defineProperty(process, "arch", { value: originalArch });
+    process.env["CLI_VERSION"] = originalCliVersion;
+    Object.defineProperty(process, "version", { value: originalNodeVersion });
     vi.clearAllMocks();
   });
 
-  describe('getPlatform', () => {
+  describe("getPlatform", () => {
     const testCases = [
-      { platform: 'darwin', arch: 'x64', expected: 'DARWIN_AMD64' },
-      { platform: 'darwin', arch: 'arm64', expected: 'DARWIN_ARM64' },
-      { platform: 'linux', arch: 'x64', expected: 'LINUX_AMD64' },
-      { platform: 'linux', arch: 'arm64', expected: 'LINUX_ARM64' },
-      { platform: 'win32', arch: 'x64', expected: 'WINDOWS_AMD64' },
-      { platform: 'sunos', arch: 'x64', expected: 'PLATFORM_UNSPECIFIED' },
-      { platform: 'win32', arch: 'arm', expected: 'PLATFORM_UNSPECIFIED' },
+      { platform: "darwin", arch: "x64", expected: "DARWIN_AMD64" },
+      { platform: "darwin", arch: "arm64", expected: "DARWIN_ARM64" },
+      { platform: "linux", arch: "x64", expected: "LINUX_AMD64" },
+      { platform: "linux", arch: "arm64", expected: "LINUX_ARM64" },
+      { platform: "win32", arch: "x64", expected: "WINDOWS_AMD64" },
+      { platform: "sunos", arch: "x64", expected: "PLATFORM_UNSPECIFIED" },
+      { platform: "win32", arch: "arm", expected: "PLATFORM_UNSPECIFIED" },
     ];
 
     for (const { platform, arch, expected } of testCases) {
       it(`should return ${expected} for platform ${platform} and arch ${arch}`, async () => {
-        Object.defineProperty(process, 'platform', { value: platform });
-        Object.defineProperty(process, 'arch', { value: arch });
-        const { getClientMetadata } = await import('./client_metadata.js');
+        Object.defineProperty(process, "platform", { value: platform });
+        Object.defineProperty(process, "arch", { value: arch });
+        const { getClientMetadata } = await import("./client_metadata.js");
 
         const metadata = await getClientMetadata();
         expect(metadata.platform).toBe(expected);
@@ -69,27 +69,27 @@ describe('client_metadata', () => {
     }
   });
 
-  describe('getClientMetadata', () => {
-    it('should use version from getCliVersion for ideVersion', async () => {
-      vi.mocked(getVersion).mockResolvedValue('1.2.3');
-      const { getClientMetadata } = await import('./client_metadata.js');
+  describe("getClientMetadata", () => {
+    it("should use version from getCliVersion for ideVersion", async () => {
+      vi.mocked(getVersion).mockResolvedValue("1.2.3");
+      const { getClientMetadata } = await import("./client_metadata.js");
 
       const metadata = await getClientMetadata();
-      expect(metadata.ideVersion).toBe('1.2.3');
+      expect(metadata.ideVersion).toBe("1.2.3");
     });
 
-    it('should call getReleaseChannel to get the update channel', async () => {
+    it("should call getReleaseChannel to get the update channel", async () => {
       vi.mocked(getReleaseChannel).mockResolvedValue(ReleaseChannel.NIGHTLY);
-      const { getClientMetadata } = await import('./client_metadata.js');
+      const { getClientMetadata } = await import("./client_metadata.js");
 
       const metadata = await getClientMetadata();
 
-      expect(metadata.updateChannel).toBe('nightly');
+      expect(metadata.updateChannel).toBe("nightly");
       expect(getReleaseChannel).toHaveBeenCalled();
     });
 
-    it('should cache the client metadata promise', async () => {
-      const { getClientMetadata } = await import('./client_metadata.js');
+    it("should cache the client metadata promise", async () => {
+      const { getClientMetadata } = await import("./client_metadata.js");
 
       const firstCall = await getClientMetadata();
       const secondCall = await getClientMetadata();
@@ -99,16 +99,16 @@ describe('client_metadata', () => {
       expect(getReleaseChannel).toHaveBeenCalledTimes(1);
     });
 
-    it('should always return the IDE name as IDE_UNSPECIFIED', async () => {
-      const { getClientMetadata } = await import('./client_metadata.js');
+    it("should always return the IDE name as IDE_UNSPECIFIED", async () => {
+      const { getClientMetadata } = await import("./client_metadata.js");
       const metadata = await getClientMetadata();
-      expect(metadata.ideName).toBe('IDE_UNSPECIFIED');
+      expect(metadata.ideName).toBe("IDE_UNSPECIFIED");
     });
 
-    it('should always return the pluginType as GEMINI', async () => {
-      const { getClientMetadata } = await import('./client_metadata.js');
+    it("should always return the pluginType as GEMINI", async () => {
+      const { getClientMetadata } = await import("./client_metadata.js");
       const metadata = await getClientMetadata();
-      expect(metadata.pluginType).toBe('GEMINI');
+      expect(metadata.pluginType).toBe("GEMINI");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.ts b/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.ts
index 982aa384f..e5f185aed 100644
--- a/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.ts
+++ b/packages/gemini-cli-core/src/code_assist/experiments/client_metadata.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getReleaseChannel } from '../../utils/channel.js';
-import type { ClientMetadata, ClientMetadataPlatform } from '../types.js';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
-import { getVersion } from '../../utils/version.js';
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { getReleaseChannel } from "../../utils/channel.js";
+import { getVersion } from "../../utils/version.js";
+import type { ClientMetadata, ClientMetadataPlatform } from "../types.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -20,22 +20,22 @@ function getPlatform(): ClientMetadataPlatform {
   const platform = process.platform;
   const arch = process.arch;
 
-  if (platform === 'darwin' && arch === 'x64') {
-    return 'DARWIN_AMD64';
+  if (platform === "darwin" && arch === "x64") {
+    return "DARWIN_AMD64";
   }
-  if (platform === 'darwin' && arch === 'arm64') {
-    return 'DARWIN_ARM64';
+  if (platform === "darwin" && arch === "arm64") {
+    return "DARWIN_ARM64";
   }
-  if (platform === 'linux' && arch === 'x64') {
-    return 'LINUX_AMD64';
+  if (platform === "linux" && arch === "x64") {
+    return "LINUX_AMD64";
   }
-  if (platform === 'linux' && arch === 'arm64') {
-    return 'LINUX_ARM64';
+  if (platform === "linux" && arch === "arm64") {
+    return "LINUX_ARM64";
   }
-  if (platform === 'win32' && arch === 'x64') {
-    return 'WINDOWS_AMD64';
+  if (platform === "win32" && arch === "x64") {
+    return "WINDOWS_AMD64";
   }
-  return 'PLATFORM_UNSPECIFIED';
+  return "PLATFORM_UNSPECIFIED";
 }
 
 /**
@@ -46,8 +46,8 @@ function getPlatform(): ClientMetadataPlatform {
 export async function getClientMetadata(): Promise<ClientMetadata> {
   if (!clientMetadataPromise) {
     clientMetadataPromise = (async () => ({
-      ideName: 'IDE_UNSPECIFIED',
-      pluginType: 'GEMINI',
+      ideName: "IDE_UNSPECIFIED",
+      pluginType: "GEMINI",
       ideVersion: await getVersion(),
       platform: getPlatform(),
       updateChannel: await getReleaseChannel(__dirname),
diff --git a/packages/gemini-cli-core/src/code_assist/experiments/experiments.test.ts b/packages/gemini-cli-core/src/code_assist/experiments/experiments.test.ts
index a4d9c85fc..5749b5cf2 100644
--- a/packages/gemini-cli-core/src/code_assist/experiments/experiments.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/experiments/experiments.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { CodeAssistServer } from '../server.js';
-import { getClientMetadata } from './client_metadata.js';
-import type { ListExperimentsResponse, Flag } from './types.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { CodeAssistServer } from "../server.js";
+import { getClientMetadata } from "./client_metadata.js";
+import type { Flag, ListExperimentsResponse } from "./types.js";
 
 // Mock dependencies before importing the module under test
-vi.mock('../server.js');
-vi.mock('./client_metadata.js');
+vi.mock("../server.js");
+vi.mock("./client_metadata.js");
 
-describe('experiments', () => {
+describe("experiments", () => {
   let mockServer: CodeAssistServer;
 
   beforeEach(() => {
@@ -22,10 +22,10 @@ describe('experiments', () => {
 
     // Mock the dependencies that `getExperiments` relies on
     vi.mocked(getClientMetadata).mockResolvedValue({
-      ideName: 'GEMINI_CLI',
-      ideVersion: '1.0.0',
-      platform: 'LINUX_AMD64',
-      updateChannel: 'stable',
+      ideName: "GEMINI_CLI",
+      ideVersion: "1.0.0",
+      platform: "LINUX_AMD64",
+      updateChannel: "stable",
     });
 
     // Create a mock instance of the server for each test
@@ -38,12 +38,12 @@ describe('experiments', () => {
     vi.clearAllMocks();
   });
 
-  it('should fetch and parse experiments from the server', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should fetch and parse experiments from the server", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {
       flags: [
         { flagId: 234, boolValue: true },
-        { flagId: 345, stringValue: 'value' },
+        { flagId: 345, stringValue: "value" },
       ],
       experimentIds: [123, 456],
     };
@@ -53,9 +53,7 @@ describe('experiments', () => {
 
     // Verify that the dependencies were called
     expect(getClientMetadata).toHaveBeenCalled();
-    expect(mockServer.listExperiments).toHaveBeenCalledWith(
-      await getClientMetadata(),
-    );
+    expect(mockServer.listExperiments).toHaveBeenCalledWith(await getClientMetadata());
 
     // Verify that the response was parsed correctly
     expect(experiments.flags[234]).toEqual({
@@ -64,13 +62,13 @@ describe('experiments', () => {
     });
     expect(experiments.flags[345]).toEqual({
       flagId: 345,
-      stringValue: 'value',
+      stringValue: "value",
     });
     expect(experiments.experimentIds).toEqual([123, 456]);
   });
 
-  it('should handle an empty or partial response from the server', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should handle an empty or partial response from the server", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {}; // No flags or experimentIds
     vi.mocked(mockServer.listExperiments).mockResolvedValue(mockApiResponse);
 
@@ -80,12 +78,12 @@ describe('experiments', () => {
     expect(experiments.experimentIds).toEqual([]);
   });
 
-  it('should ignore flags that are missing a name', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should ignore flags that are missing a name", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {
       flags: [
         { boolValue: true } as Flag, // No name
-        { flagId: 256, stringValue: 'value' },
+        { flagId: 256, stringValue: "value" },
       ],
     };
     vi.mocked(mockServer.listExperiments).mockResolvedValue(mockApiResponse);
@@ -94,11 +92,11 @@ describe('experiments', () => {
 
     expect(Object.keys(experiments.flags)).toHaveLength(1);
     expect(experiments.flags[256]).toBeDefined();
-    expect(experiments.flags['undefined']).toBeUndefined();
+    expect(experiments.flags["undefined"]).toBeUndefined();
   });
 
-  it('should cache the experiments promise to avoid multiple fetches', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should cache the experiments promise to avoid multiple fetches", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {
       experimentIds: [1, 2, 3],
     };
diff --git a/packages/gemini-cli-core/src/code_assist/experiments/experiments.ts b/packages/gemini-cli-core/src/code_assist/experiments/experiments.ts
index 90eae3667..5373eaed3 100644
--- a/packages/gemini-cli-core/src/code_assist/experiments/experiments.ts
+++ b/packages/gemini-cli-core/src/code_assist/experiments/experiments.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CodeAssistServer } from '../server.js';
-import { getClientMetadata } from './client_metadata.js';
-import type { ListExperimentsResponse, Flag } from './types.js';
+import type { CodeAssistServer } from "../server.js";
+import { getClientMetadata } from "./client_metadata.js";
+import type { Flag, ListExperimentsResponse } from "./types.js";
 
 export interface Experiments {
   flags: Record<string, Flag>;
@@ -20,9 +20,7 @@ let experimentsPromise: Promise<Experiments> | undefined;
  *
  * The experiments are cached so that they are only fetched once.
  */
-export async function getExperiments(
-  server: CodeAssistServer,
-): Promise<Experiments> {
+export async function getExperiments(server: CodeAssistServer): Promise<Experiments> {
   if (experimentsPromise) {
     return experimentsPromise;
   }
diff --git a/packages/gemini-cli-core/src/code_assist/experiments/flagNames.ts b/packages/gemini-cli-core/src/code_assist/experiments/flagNames.ts
index 5fa70e7c2..a5a61a98e 100644
--- a/packages/gemini-cli-core/src/code_assist/experiments/flagNames.ts
+++ b/packages/gemini-cli-core/src/code_assist/experiments/flagNames.ts
@@ -12,5 +12,4 @@ export const ExperimentFlags = {
   ENABLE_PREVIEW: 45740196,
 } as const;
 
-export type ExperimentFlagName =
-  (typeof ExperimentFlags)[keyof typeof ExperimentFlags];
+export type ExperimentFlagName = (typeof ExperimentFlags)[keyof typeof ExperimentFlags];
diff --git a/packages/gemini-cli-core/src/code_assist/experiments/types.ts b/packages/gemini-cli-core/src/code_assist/experiments/types.ts
index 510f3a7cb..b8602863c 100644
--- a/packages/gemini-cli-core/src/code_assist/experiments/types.ts
+++ b/packages/gemini-cli-core/src/code_assist/experiments/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ClientMetadata } from '../types.js';
+import type { ClientMetadata } from "../types.js";
 
 export interface ListExperimentsRequest {
   project: string;
diff --git a/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.test.ts b/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.test.ts
index fdde49662..9de7f648e 100644
--- a/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.test.ts
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type Credentials } from 'google-auth-library';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { OAuthCredentialStorage } from './oauth-credential-storage.js';
-import type { OAuthCredentials } from '../mcp/token-storage/types.js';
-import { coreEvents } from '../utils/events.js';
-
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { promises as fs } from 'node:fs';
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { type Credentials } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { OAuthCredentials } from "../mcp/token-storage/types.js";
+import { coreEvents } from "../utils/events.js";
+import { OAuthCredentialStorage } from "./oauth-credential-storage.js";
 
 // Mock external dependencies
 const mockHybridTokenStorage = vi.hoisted(() => ({
@@ -20,104 +19,90 @@ const mockHybridTokenStorage = vi.hoisted(() => ({
   setCredentials: vi.fn(),
   deleteCredentials: vi.fn(),
 }));
-vi.mock('../mcp/token-storage/hybrid-token-storage.js', () => ({
+vi.mock("../mcp/token-storage/hybrid-token-storage.js", () => ({
   HybridTokenStorage: vi.fn(() => mockHybridTokenStorage),
 }));
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   promises: {
     readFile: vi.fn(),
     rm: vi.fn(),
   },
 }));
-vi.mock('node:os');
-vi.mock('node:path');
-vi.mock('../utils/events.js', () => ({
+vi.mock("node:os");
+vi.mock("node:path");
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
     emitConsoleLog: vi.fn(),
   },
 }));
 
-describe('OAuthCredentialStorage', () => {
+describe("OAuthCredentialStorage", () => {
   const mockCredentials: Credentials = {
-    access_token: 'mock_access_token',
-    refresh_token: 'mock_refresh_token',
+    access_token: "mock_access_token",
+    refresh_token: "mock_refresh_token",
     expiry_date: Date.now() + 3600 * 1000,
-    token_type: 'Bearer',
-    scope: 'email profile',
+    token_type: "Bearer",
+    scope: "email profile",
   };
 
   const mockMcpCredentials: OAuthCredentials = {
-    serverName: 'main-account',
+    serverName: "main-account",
     token: {
-      accessToken: 'mock_access_token',
-      refreshToken: 'mock_refresh_token',
-      tokenType: 'Bearer',
-      scope: 'email profile',
+      accessToken: "mock_access_token",
+      refreshToken: "mock_refresh_token",
+      tokenType: "Bearer",
+      scope: "email profile",
       expiresAt: mockCredentials.expiry_date!,
     },
     updatedAt: expect.any(Number),
   };
 
-  const oldFilePath = '/mock/home/.gemini/oauth.json';
+  const oldFilePath = "/mock/home/.gemini/oauth.json";
 
   beforeEach(() => {
-    vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(null);
-    vi.spyOn(mockHybridTokenStorage, 'setCredentials').mockResolvedValue(
-      undefined,
-    );
-    vi.spyOn(mockHybridTokenStorage, 'deleteCredentials').mockResolvedValue(
-      undefined,
-    );
-
-    vi.spyOn(fs, 'readFile').mockRejectedValue(new Error('File not found'));
-    vi.spyOn(fs, 'rm').mockResolvedValue(undefined);
-
-    vi.spyOn(os, 'homedir').mockReturnValue('/mock/home');
-    vi.spyOn(path, 'join').mockReturnValue(oldFilePath);
+    vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+    vi.spyOn(mockHybridTokenStorage, "setCredentials").mockResolvedValue(undefined);
+    vi.spyOn(mockHybridTokenStorage, "deleteCredentials").mockResolvedValue(undefined);
+
+    vi.spyOn(fs, "readFile").mockRejectedValue(new Error("File not found"));
+    vi.spyOn(fs, "rm").mockResolvedValue(undefined);
+
+    vi.spyOn(os, "homedir").mockReturnValue("/mock/home");
+    vi.spyOn(path, "join").mockReturnValue(oldFilePath);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('loadCredentials', () => {
-    it('should load credentials from HybridTokenStorage if available', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        mockMcpCredentials,
-      );
+  describe("loadCredentials", () => {
+    it("should load credentials from HybridTokenStorage if available", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(mockMcpCredentials);
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
-      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith(
-        'main-account',
-      );
+      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith("main-account");
       expect(result).toEqual(mockCredentials);
     });
 
-    it('should fallback to migrateFromFileStorage if no credentials in HybridTokenStorage', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify(mockCredentials),
-      );
+    it("should fallback to migrateFromFileStorage if no credentials in HybridTokenStorage", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue(JSON.stringify(mockCredentials));
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
-      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith(
-        'main-account',
-      );
-      expect(fs.readFile).toHaveBeenCalledWith(oldFilePath, 'utf-8');
+      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith("main-account");
+      expect(fs.readFile).toHaveBeenCalledWith(oldFilePath, "utf-8");
       expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalled(); // Verify credentials were saved
       expect(fs.rm).toHaveBeenCalledWith(oldFilePath, { force: true }); // Verify old file was removed
       expect(result).toEqual(mockCredentials);
     });
 
-    it('should return null if no credentials found and no old file to migrate', async () => {
-      vi.spyOn(fs, 'readFile').mockRejectedValue({
-        message: 'File not found',
-        code: 'ENOENT',
+    it("should return null if no credentials found and no old file to migrate", async () => {
+      vi.spyOn(fs, "readFile").mockRejectedValue({
+        message: "File not found",
+        code: "ENOENT",
       });
 
       const result = await OAuthCredentialStorage.loadCredentials();
@@ -125,86 +110,70 @@ describe('OAuthCredentialStorage', () => {
       expect(result).toBeNull();
     });
 
-    it('should throw an error if loading fails', async () => {
-      const mockError = new Error('HybridTokenStorage error');
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockRejectedValue(
-        mockError,
-      );
+    it("should throw an error if loading fails", async () => {
+      const mockError = new Error("HybridTokenStorage error");
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockRejectedValue(mockError);
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Failed to load OAuth credentials',
+        "error",
+        "Failed to load OAuth credentials",
         mockError,
       );
     });
 
-    it('should throw an error if read file fails', async () => {
-      const mockError = new Error('Permission denied');
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockRejectedValue(mockError);
+    it("should throw an error if read file fails", async () => {
+      const mockError = new Error("Permission denied");
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockRejectedValue(mockError);
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Failed to load OAuth credentials',
+        "error",
+        "Failed to load OAuth credentials",
         mockError,
       );
     });
 
-    it('should not throw error if migration file removal failed', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify(mockCredentials),
-      );
-      vi.spyOn(OAuthCredentialStorage, 'saveCredentials').mockResolvedValue(
-        undefined,
-      );
-      vi.spyOn(fs, 'rm').mockRejectedValue(new Error('Deletion failed'));
+    it("should not throw error if migration file removal failed", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue(JSON.stringify(mockCredentials));
+      vi.spyOn(OAuthCredentialStorage, "saveCredentials").mockResolvedValue(undefined);
+      vi.spyOn(fs, "rm").mockRejectedValue(new Error("Deletion failed"));
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
       expect(result).toEqual(mockCredentials);
     });
 
-    it('should throw an error if the migration file contains invalid JSON', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue('invalid json');
+    it("should throw an error if the migration file contains invalid JSON", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue("invalid json");
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
     });
 
-    it('should not delete the old file if saving migrated credentials fails', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify(mockCredentials),
-      );
-      vi.spyOn(mockHybridTokenStorage, 'setCredentials').mockRejectedValue(
-        new Error('Save failed'),
+    it("should not delete the old file if saving migrated credentials fails", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue(JSON.stringify(mockCredentials));
+      vi.spyOn(mockHybridTokenStorage, "setCredentials").mockRejectedValue(
+        new Error("Save failed"),
       );
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
 
       expect(fs.rm).not.toHaveBeenCalled();
     });
 
-    it('should return credentials even if access_token is missing from storage', async () => {
+    it("should return credentials even if access_token is missing from storage", async () => {
       const partialMcpCredentials = {
         ...mockMcpCredentials,
         token: {
@@ -212,9 +181,7 @@ describe('OAuthCredentialStorage', () => {
           accessToken: undefined,
         },
       };
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        partialMcpCredentials,
-      );
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(partialMcpCredentials);
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
@@ -228,30 +195,26 @@ describe('OAuthCredentialStorage', () => {
     });
   });
 
-  describe('saveCredentials', () => {
-    it('should save credentials to HybridTokenStorage', async () => {
+  describe("saveCredentials", () => {
+    it("should save credentials to HybridTokenStorage", async () => {
       await OAuthCredentialStorage.saveCredentials(mockCredentials);
 
-      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(
-        mockMcpCredentials,
-      );
+      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(mockMcpCredentials);
     });
 
-    it('should throw an error if access_token is missing', async () => {
+    it("should throw an error if access_token is missing", async () => {
       const invalidCredentials: Credentials = {
         ...mockCredentials,
         access_token: undefined,
       };
-      await expect(
-        OAuthCredentialStorage.saveCredentials(invalidCredentials),
-      ).rejects.toThrow(
-        'Attempted to save credentials without an access token.',
+      await expect(OAuthCredentialStorage.saveCredentials(invalidCredentials)).rejects.toThrow(
+        "Attempted to save credentials without an access token.",
       );
     });
 
-    it('should handle saving credentials with null or undefined optional fields', async () => {
+    it("should handle saving credentials with null or undefined optional fields", async () => {
       const partialCredentials: Credentials = {
-        access_token: 'only_access_token',
+        access_token: "only_access_token",
         refresh_token: null, // test null
         scope: undefined, // test undefined
       };
@@ -259,11 +222,11 @@ describe('OAuthCredentialStorage', () => {
       await OAuthCredentialStorage.saveCredentials(partialCredentials);
 
       expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith({
-        serverName: 'main-account',
+        serverName: "main-account",
         token: {
-          accessToken: 'only_access_token',
+          accessToken: "only_access_token",
           refreshToken: undefined,
-          tokenType: 'Bearer', // default
+          tokenType: "Bearer", // default
           scope: undefined,
           expiresAt: undefined,
         },
@@ -272,41 +235,35 @@ describe('OAuthCredentialStorage', () => {
     });
   });
 
-  describe('clearCredentials', () => {
-    it('should delete credentials from HybridTokenStorage', async () => {
+  describe("clearCredentials", () => {
+    it("should delete credentials from HybridTokenStorage", async () => {
       await OAuthCredentialStorage.clearCredentials();
 
-      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith(
-        'main-account',
-      );
+      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith("main-account");
     });
 
-    it('should attempt to remove the old file-based storage', async () => {
+    it("should attempt to remove the old file-based storage", async () => {
       await OAuthCredentialStorage.clearCredentials();
 
       expect(fs.rm).toHaveBeenCalledWith(oldFilePath, { force: true });
     });
 
-    it('should not throw an error if deleting old file fails', async () => {
-      vi.spyOn(fs, 'rm').mockRejectedValue(new Error('File deletion failed'));
+    it("should not throw an error if deleting old file fails", async () => {
+      vi.spyOn(fs, "rm").mockRejectedValue(new Error("File deletion failed"));
 
-      await expect(
-        OAuthCredentialStorage.clearCredentials(),
-      ).resolves.toBeUndefined();
+      await expect(OAuthCredentialStorage.clearCredentials()).resolves.toBeUndefined();
     });
 
-    it('should throw an error if clearing from HybridTokenStorage fails', async () => {
-      const mockError = new Error('Deletion error');
-      vi.spyOn(mockHybridTokenStorage, 'deleteCredentials').mockRejectedValue(
-        mockError,
-      );
+    it("should throw an error if clearing from HybridTokenStorage fails", async () => {
+      const mockError = new Error("Deletion error");
+      vi.spyOn(mockHybridTokenStorage, "deleteCredentials").mockRejectedValue(mockError);
 
       await expect(OAuthCredentialStorage.clearCredentials()).rejects.toThrow(
-        'Failed to clear OAuth credentials',
+        "Failed to clear OAuth credentials",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Failed to clear OAuth credentials',
+        "error",
+        "Failed to clear OAuth credentials",
         mockError,
       );
     });
diff --git a/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.ts b/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.ts
index 2f1c78d1d..9aa6ceabd 100644
--- a/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.ts
+++ b/packages/gemini-cli-core/src/code_assist/oauth-credential-storage.ts
@@ -4,23 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type Credentials } from 'google-auth-library';
-import { HybridTokenStorage } from '../mcp/token-storage/hybrid-token-storage.js';
-import { OAUTH_FILE } from '../config/storage.js';
-import type { OAuthCredentials } from '../mcp/token-storage/types.js';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { promises as fs } from 'node:fs';
-import { GEMINI_DIR } from '../utils/paths.js';
-import { coreEvents } from '../utils/events.js';
-
-const KEYCHAIN_SERVICE_NAME = 'gemini-cli-oauth';
-const MAIN_ACCOUNT_KEY = 'main-account';
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { type Credentials } from "google-auth-library";
+import { OAUTH_FILE } from "../config/storage.js";
+import { HybridTokenStorage } from "../mcp/token-storage/hybrid-token-storage.js";
+import type { OAuthCredentials } from "../mcp/token-storage/types.js";
+import { coreEvents } from "../utils/events.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+
+const KEYCHAIN_SERVICE_NAME = "gemini-cli-oauth";
+const MAIN_ACCOUNT_KEY = "main-account";
 
 export class OAuthCredentialStorage {
-  private static storage: HybridTokenStorage = new HybridTokenStorage(
-    KEYCHAIN_SERVICE_NAME,
-  );
+  private static storage: HybridTokenStorage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME);
 
   /**
    * Load cached OAuth credentials
@@ -30,8 +28,7 @@ export class OAuthCredentialStorage {
       const credentials = await this.storage.getCredentials(MAIN_ACCOUNT_KEY);
 
       if (credentials?.token) {
-        const { accessToken, refreshToken, expiresAt, tokenType, scope } =
-          credentials.token;
+        const { accessToken, refreshToken, expiresAt, tokenType, scope } = credentials.token;
         // Convert from OAuthCredentials format to Google Credentials format
         const googleCreds: Credentials = {
           access_token: accessToken,
@@ -50,12 +47,8 @@ export class OAuthCredentialStorage {
       // Fallback: Try to migrate from old file-based storage
       return await this.migrateFromFileStorage();
     } catch (error: unknown) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to load OAuth credentials',
-        error,
-      );
-      throw new Error('Failed to load OAuth credentials', { cause: error });
+      coreEvents.emitFeedback("error", "Failed to load OAuth credentials", error);
+      throw new Error("Failed to load OAuth credentials", { cause: error });
     }
   }
 
@@ -64,7 +57,7 @@ export class OAuthCredentialStorage {
    */
   static async saveCredentials(credentials: Credentials): Promise<void> {
     if (!credentials.access_token) {
-      throw new Error('Attempted to save credentials without an access token.');
+      throw new Error("Attempted to save credentials without an access token.");
     }
 
     // Convert Google Credentials to OAuthCredentials format
@@ -73,7 +66,7 @@ export class OAuthCredentialStorage {
       token: {
         accessToken: credentials.access_token,
         refreshToken: credentials.refresh_token || undefined,
-        tokenType: credentials.token_type || 'Bearer',
+        tokenType: credentials.token_type || "Bearer",
         scope: credentials.scope || undefined,
         expiresAt: credentials.expiry_date || undefined,
       },
@@ -94,12 +87,8 @@ export class OAuthCredentialStorage {
       const oldFilePath = path.join(os.homedir(), GEMINI_DIR, OAUTH_FILE);
       await fs.rm(oldFilePath, { force: true }).catch(() => {});
     } catch (error: unknown) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to clear OAuth credentials',
-        error,
-      );
-      throw new Error('Failed to clear OAuth credentials', { cause: error });
+      coreEvents.emitFeedback("error", "Failed to clear OAuth credentials", error);
+      throw new Error("Failed to clear OAuth credentials", { cause: error });
     }
   }
 
@@ -111,13 +100,13 @@ export class OAuthCredentialStorage {
 
     let credsJson: string;
     try {
-      credsJson = await fs.readFile(oldFilePath, 'utf-8');
+      credsJson = await fs.readFile(oldFilePath, "utf-8");
     } catch (error: unknown) {
       if (
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'code' in error &&
-        error.code === 'ENOENT'
+        "code" in error &&
+        error.code === "ENOENT"
       ) {
         // File doesn't exist, so no migration.
         return null;
diff --git a/packages/gemini-cli-core/src/code_assist/oauth2.test.ts b/packages/gemini-cli-core/src/code_assist/oauth2.test.ts
index f5033f830..b02fc7d4c 100644
--- a/packages/gemini-cli-core/src/code_assist/oauth2.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/oauth2.test.ts
@@ -4,49 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Credentials } from 'google-auth-library';
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import crypto from "node:crypto";
+import * as fs from "node:fs";
+import http from "node:http";
+import * as os from "node:os";
+import * as path from "node:path";
+import readline from "node:readline";
+import type { Credentials } from "google-auth-library";
+import { Compute, GoogleAuth, OAuth2Client } from "google-auth-library";
+import open from "open";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { FORCE_ENCRYPTED_FILE_ENV_VAR } from "../mcp/token-storage/index.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import { writeToStdout } from "../utils/stdio.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
 import {
-  getOauthClient,
-  resetOauthClientForTesting,
+  authEvents,
   clearCachedCredentialFile,
   clearOauthClientCache,
-  authEvents,
-} from './oauth2.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
-import { OAuth2Client, Compute, GoogleAuth } from 'google-auth-library';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import http from 'node:http';
-import open from 'open';
-import crypto from 'node:crypto';
-import * as os from 'node:os';
-import { AuthType } from '../core/contentGenerator.js';
-import type { Config } from '../config/config.js';
-import readline from 'node:readline';
-import { FORCE_ENCRYPTED_FILE_ENV_VAR } from '../mcp/token-storage/index.js';
-import { GEMINI_DIR } from '../utils/paths.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { writeToStdout } from '../utils/stdio.js';
-
-vi.mock('os', async (importOriginal) => {
-  const os = await importOriginal<typeof import('os')>();
+  getOauthClient,
+  resetOauthClientForTesting,
+} from "./oauth2.js";
+
+vi.mock("os", async (importOriginal) => {
+  const os = await importOriginal<typeof import("os")>();
   return {
     ...os,
     homedir: vi.fn(),
   };
 });
 
-vi.mock('google-auth-library');
-vi.mock('http');
-vi.mock('open');
-vi.mock('crypto');
-vi.mock('node:readline');
-vi.mock('../utils/browser.js', () => ({
+vi.mock("google-auth-library");
+vi.mock("http");
+vi.mock("open");
+vi.mock("crypto");
+vi.mock("node:readline");
+vi.mock("../utils/browser.js", () => ({
   shouldAttemptBrowserLaunch: () => true,
 }));
-vi.mock('../utils/stdio.js', () => ({
+vi.mock("../utils/stdio.js", () => ({
   writeToStdout: vi.fn(),
   writeToStderr: vi.fn(),
   createWorkingStdio: vi.fn(() => ({
@@ -60,7 +60,7 @@ vi.mock('../utils/stdio.js', () => ({
   disableKittyKeyboardProtocol: vi.fn(),
 }));
 
-vi.mock('./oauth-credential-storage.js', () => ({
+vi.mock("./oauth-credential-storage.js", () => ({
   OAuthCredentialStorage: {
     saveCredentials: vi.fn(),
     loadCredentials: vi.fn(),
@@ -70,22 +70,20 @@ vi.mock('./oauth-credential-storage.js', () => ({
 
 const mockConfig = {
   getNoBrowser: () => false,
-  getProxy: () => 'http://test.proxy.com:8080',
+  getProxy: () => "http://test.proxy.com:8080",
   isBrowserLaunchSuppressed: () => false,
 } as unknown as Config;
 
 // Mock fetch globally
 global.fetch = vi.fn();
 
-describe('oauth2', () => {
-  describe('with encrypted flag false', () => {
+describe("oauth2", () => {
+  describe("with encrypted flag false", () => {
     let tempHomeDir: string;
 
     beforeEach(() => {
-      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = 'false';
-      tempHomeDir = fs.mkdtempSync(
-        path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-      );
+      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = "false";
+      tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
       vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
     });
     afterEach(() => {
@@ -95,21 +93,19 @@ describe('oauth2', () => {
       vi.unstubAllEnvs();
     });
 
-    it('should perform a web login', async () => {
-      const mockAuthUrl = 'https://example.com/auth';
-      const mockCode = 'test-code';
-      const mockState = 'test-state';
+    it("should perform a web login", async () => {
+      const mockAuthUrl = "https://example.com/auth";
+      const mockCode = "test-code";
+      const mockState = "test-state";
       const mockTokens = {
-        access_token: 'test-access-token',
-        refresh_token: 'test-refresh-token',
+        access_token: "test-access-token",
+        refresh_token: "test-refresh-token",
       };
 
       const mockGenerateAuthUrl = vi.fn().mockReturnValue(mockAuthUrl);
       const mockGetToken = vi.fn().mockResolvedValue({ tokens: mockTokens });
       const mockSetCredentials = vi.fn();
-      const mockGetAccessToken = vi
-        .fn()
-        .mockResolvedValue({ token: 'mock-access-token' });
+      const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "mock-access-token" });
       let tokensListener: ((tokens: Credentials) => void) | undefined;
       const mockOAuth2Client = {
         generateAuthUrl: mockGenerateAuthUrl,
@@ -118,24 +114,20 @@ describe('oauth2', () => {
         getAccessToken: mockGetAccessToken,
         credentials: mockTokens,
         on: vi.fn((event, listener) => {
-          if (event === 'tokens') {
+          if (event === "tokens") {
             tokensListener = listener;
           }
         }),
       } as unknown as OAuth2Client;
       vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-      vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-      vi.mocked(open).mockImplementation(
-        async () => ({ on: vi.fn() }) as never,
-      );
+      vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+      vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
       // Mock the UserInfo API response
       vi.mocked(global.fetch).mockResolvedValue({
         ok: true,
-        json: vi
-          .fn()
-          .mockResolvedValue({ email: 'test-google-account@gmail.com' }),
+        json: vi.fn().mockResolvedValue({ email: "test-google-account@gmail.com" }),
       } as unknown as Response);
 
       let requestCallback!: http.RequestListener<
@@ -144,9 +136,7 @@ describe('oauth2', () => {
       >;
 
       let serverListeningCallback: (value: unknown) => void;
-      const serverListeningPromise = new Promise(
-        (resolve) => (serverListeningCallback = resolve),
-      );
+      const serverListeningPromise = new Promise((resolve) => (serverListeningCallback = resolve));
 
       let capturedPort = 0;
       const mockHttpServer = {
@@ -173,10 +163,7 @@ describe('oauth2', () => {
         return mockHttpServer as unknown as http.Server;
       });
 
-      const clientPromise = getOauthClient(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfig,
-      );
+      const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
       // wait for server to start listening.
       await serverListeningPromise;
@@ -207,56 +194,48 @@ describe('oauth2', () => {
       }
 
       // Verify Google Account was cached
-      const googleAccountPath = path.join(
-        tempHomeDir,
-        GEMINI_DIR,
-        'google_accounts.json',
-      );
+      const googleAccountPath = path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
       expect(fs.existsSync(googleAccountPath)).toBe(true);
-      const cachedGoogleAccount = fs.readFileSync(googleAccountPath, 'utf-8');
+      const cachedGoogleAccount = fs.readFileSync(googleAccountPath, "utf-8");
       expect(JSON.parse(cachedGoogleAccount)).toEqual({
-        active: 'test-google-account@gmail.com',
+        active: "test-google-account@gmail.com",
         old: [],
       });
 
       // Verify the getCachedGoogleAccount function works
       const userAccountManager = new UserAccountManager();
-      expect(userAccountManager.getCachedGoogleAccount()).toBe(
-        'test-google-account@gmail.com',
-      );
+      expect(userAccountManager.getCachedGoogleAccount()).toBe("test-google-account@gmail.com");
     });
 
-    it('should clear credentials file', async () => {
+    it("should clear credentials file", async () => {
       // Setup initial state with files
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
 
       await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
-      await fs.promises.writeFile(credsPath, '{}');
+      await fs.promises.writeFile(credsPath, "{}");
 
       await clearCachedCredentialFile();
 
       expect(fs.existsSync(credsPath)).toBe(false);
     });
 
-    it('should emit post_auth event when loading cached credentials', async () => {
-      const cachedCreds = { refresh_token: 'cached-token' };
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+    it("should emit post_auth event when loading cached credentials", async () => {
+      const cachedCreds = { refresh_token: "cached-token" };
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
       await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
       await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
       const mockClient = {
         setCredentials: vi.fn(),
-        getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+        getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
         getTokenInfo: vi.fn().mockResolvedValue({}),
         on: vi.fn(),
       };
-      vi.mocked(OAuth2Client).mockImplementation(
-        () => mockClient as unknown as OAuth2Client,
-      );
+      vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
       const eventPromise = new Promise<void>((resolve) => {
-        authEvents.once('post_auth', (creds) => {
-          expect(creds.refresh_token).toBe('cached-token');
+        authEvents.once("post_auth", (creds) => {
+          expect(creds.refresh_token).toBe("cached-token");
           resolve();
         });
       });
@@ -265,30 +244,28 @@ describe('oauth2', () => {
       await eventPromise;
     });
 
-    it('should perform login with user code', async () => {
+    it("should perform login with user code", async () => {
       const mockConfigWithNoBrowser = {
         getNoBrowser: () => true,
-        getProxy: () => 'http://test.proxy.com:8080',
+        getProxy: () => "http://test.proxy.com:8080",
         isBrowserLaunchSuppressed: () => true,
       } as unknown as Config;
 
       const mockCodeVerifier = {
-        codeChallenge: 'test-challenge',
-        codeVerifier: 'test-verifier',
+        codeChallenge: "test-challenge",
+        codeVerifier: "test-verifier",
       };
-      const mockAuthUrl = 'https://example.com/auth-user-code';
-      const mockCode = 'test-user-code';
+      const mockAuthUrl = "https://example.com/auth-user-code";
+      const mockCode = "test-user-code";
 
       const mockTokens = {
-        access_token: 'test-access-token-user-code',
-        refresh_token: 'test-refresh-token-user-code',
+        access_token: "test-access-token-user-code",
+        refresh_token: "test-refresh-token-user-code",
       };
 
       const mockGenerateAuthUrl = vi.fn().mockReturnValue(mockAuthUrl);
       const mockGetToken = vi.fn().mockResolvedValue({ tokens: mockTokens });
-      const mockGenerateCodeVerifierAsync = vi
-        .fn()
-        .mockResolvedValue(mockCodeVerifier);
+      const mockGenerateCodeVerifierAsync = vi.fn().mockResolvedValue(mockCodeVerifier);
 
       const mockOAuth2Client = {
         generateAuthUrl: mockGenerateAuthUrl,
@@ -309,57 +286,50 @@ describe('oauth2', () => {
       };
       (readline.createInterface as Mock).mockReturnValue(mockReadline);
 
-      const client = await getOauthClient(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfigWithNoBrowser,
-      );
+      const client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfigWithNoBrowser);
 
       expect(client).toBe(mockOAuth2Client);
 
       // Verify the auth flow
       expect(mockGenerateCodeVerifierAsync).toHaveBeenCalled();
       expect(mockGenerateAuthUrl).toHaveBeenCalled();
-      expect(vi.mocked(writeToStdout)).toHaveBeenCalledWith(
-        expect.stringContaining(mockAuthUrl),
-      );
+      expect(vi.mocked(writeToStdout)).toHaveBeenCalledWith(expect.stringContaining(mockAuthUrl));
       expect(mockReadline.question).toHaveBeenCalledWith(
-        'Enter the authorization code: ',
+        "Enter the authorization code: ",
         expect.any(Function),
       );
       expect(mockGetToken).toHaveBeenCalledWith({
         code: mockCode,
         codeVerifier: mockCodeVerifier.codeVerifier,
-        redirect_uri: 'https://codeassist.google.com/authcode',
+        redirect_uri: "https://codeassist.google.com/authcode",
       });
       expect(mockOAuth2Client.setCredentials).toHaveBeenCalledWith(mockTokens);
     });
 
-    it('should cache Google Account when logging in with user code', async () => {
+    it("should cache Google Account when logging in with user code", async () => {
       const mockConfigWithNoBrowser = {
         getNoBrowser: () => true,
-        getProxy: () => 'http://test.proxy.com:8080',
+        getProxy: () => "http://test.proxy.com:8080",
         isBrowserLaunchSuppressed: () => true,
       } as unknown as Config;
 
       const mockCodeVerifier = {
-        codeChallenge: 'test-challenge',
-        codeVerifier: 'test-verifier',
+        codeChallenge: "test-challenge",
+        codeVerifier: "test-verifier",
       };
-      const mockAuthUrl = 'https://example.com/auth-user-code';
-      const mockCode = 'test-user-code';
+      const mockAuthUrl = "https://example.com/auth-user-code";
+      const mockCode = "test-user-code";
       const mockTokens = {
-        access_token: 'test-access-token-user-code',
-        refresh_token: 'test-refresh-token-user-code',
+        access_token: "test-access-token-user-code",
+        refresh_token: "test-refresh-token-user-code",
       };
 
       const mockGenerateAuthUrl = vi.fn().mockReturnValue(mockAuthUrl);
       const mockGetToken = vi.fn().mockResolvedValue({ tokens: mockTokens });
-      const mockGenerateCodeVerifierAsync = vi
-        .fn()
-        .mockResolvedValue(mockCodeVerifier);
+      const mockGenerateCodeVerifierAsync = vi.fn().mockResolvedValue(mockCodeVerifier);
       const mockGetAccessToken = vi
         .fn()
-        .mockResolvedValue({ token: 'test-access-token-user-code' });
+        .mockResolvedValue({ token: "test-access-token-user-code" });
 
       const mockOAuth2Client = {
         generateAuthUrl: mockGenerateAuthUrl,
@@ -374,7 +344,7 @@ describe('oauth2', () => {
       });
       vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-      vi.spyOn(crypto, 'randomBytes').mockReturnValue('test-state' as never);
+      vi.spyOn(crypto, "randomBytes").mockReturnValue("test-state" as never);
 
       const mockReadline = {
         question: vi.fn((_query, callback) => callback(mockCode)),
@@ -386,67 +356,53 @@ describe('oauth2', () => {
       // Mock User Info API
       vi.mocked(global.fetch).mockResolvedValue({
         ok: true,
-        json: vi
-          .fn()
-          .mockResolvedValue({ email: 'test-user-code-account@gmail.com' }),
+        json: vi.fn().mockResolvedValue({ email: "test-user-code-account@gmail.com" }),
       } as unknown as Response);
 
       await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfigWithNoBrowser);
 
       // Verify Google Account was cached
-      const googleAccountPath = path.join(
-        tempHomeDir,
-        GEMINI_DIR,
-        'google_accounts.json',
-      );
+      const googleAccountPath = path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
 
       expect(fs.existsSync(googleAccountPath)).toBe(true);
       if (fs.existsSync(googleAccountPath)) {
-        const cachedGoogleAccount = fs.readFileSync(googleAccountPath, 'utf-8');
+        const cachedGoogleAccount = fs.readFileSync(googleAccountPath, "utf-8");
         expect(JSON.parse(cachedGoogleAccount)).toEqual({
-          active: 'test-user-code-account@gmail.com',
+          active: "test-user-code-account@gmail.com",
           old: [],
         });
       }
     });
 
-    describe('in Cloud Shell', () => {
+    describe("in Cloud Shell", () => {
       const mockGetAccessToken = vi.fn();
       let mockComputeClient: Compute;
 
       beforeEach(() => {
-        mockGetAccessToken.mockResolvedValue({ token: 'test-access-token' });
+        mockGetAccessToken.mockResolvedValue({ token: "test-access-token" });
         mockComputeClient = {
-          credentials: { refresh_token: 'test-refresh-token' },
+          credentials: { refresh_token: "test-refresh-token" },
           getAccessToken: mockGetAccessToken,
         } as unknown as Compute;
 
-        (Compute as unknown as Mock).mockImplementation(
-          () => mockComputeClient,
-        );
+        (Compute as unknown as Mock).mockImplementation(() => mockComputeClient);
       });
 
-      it('should attempt to load cached credentials first', async () => {
-        const cachedCreds = { refresh_token: 'cached-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+      it("should attempt to load cached credentials first", async () => {
+        const cachedCreds = { refresh_token: "cached-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
         const mockClient = {
           setCredentials: vi.fn(),
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
           getTokenInfo: vi.fn().mockResolvedValue({}),
           on: vi.fn(),
         };
 
         // To mock the new OAuth2Client() inside the function
-        vi.mocked(OAuth2Client).mockImplementation(
-          () => mockClient as unknown as OAuth2Client,
-        );
+        vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
@@ -456,77 +412,62 @@ describe('oauth2', () => {
         expect(Compute).not.toHaveBeenCalled(); // Should not fetch new client if cache is valid
       });
 
-      it('should use Compute to get a client if no cached credentials exist', async () => {
+      it("should use Compute to get a client if no cached credentials exist", async () => {
         await getOauthClient(AuthType.COMPUTE_ADC, mockConfig);
 
         expect(Compute).toHaveBeenCalledWith({});
         expect(mockGetAccessToken).toHaveBeenCalled();
       });
 
-      it('should not cache the credentials after fetching them via ADC', async () => {
-        const newCredentials = { refresh_token: 'new-adc-token' };
+      it("should not cache the credentials after fetching them via ADC", async () => {
+        const newCredentials = { refresh_token: "new-adc-token" };
         mockComputeClient.credentials = newCredentials;
-        mockGetAccessToken.mockResolvedValue({ token: 'new-adc-token' });
+        mockGetAccessToken.mockResolvedValue({ token: "new-adc-token" });
 
         await getOauthClient(AuthType.COMPUTE_ADC, mockConfig);
 
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         expect(fs.existsSync(credsPath)).toBe(false);
       });
 
-      it('should return the Compute client on successful ADC authentication', async () => {
+      it("should return the Compute client on successful ADC authentication", async () => {
         const client = await getOauthClient(AuthType.COMPUTE_ADC, mockConfig);
         expect(client).toBe(mockComputeClient);
       });
 
-      it('should throw an error if ADC fails', async () => {
-        const testError = new Error('ADC Failed');
+      it("should throw an error if ADC fails", async () => {
+        const testError = new Error("ADC Failed");
         mockGetAccessToken.mockRejectedValue(testError);
 
-        await expect(
-          getOauthClient(AuthType.COMPUTE_ADC, mockConfig),
-        ).rejects.toThrow(
-          'Could not authenticate using metadata server application default credentials. Please select a different authentication method or ensure you are in a properly configured environment. Error: ADC Failed',
+        await expect(getOauthClient(AuthType.COMPUTE_ADC, mockConfig)).rejects.toThrow(
+          "Could not authenticate using metadata server application default credentials. Please select a different authentication method or ensure you are in a properly configured environment. Error: ADC Failed",
         );
       });
     });
 
-    describe('credential loading order', () => {
-      it('should prioritize default cached credentials over GOOGLE_APPLICATION_CREDENTIALS', async () => {
+    describe("credential loading order", () => {
+      it("should prioritize default cached credentials over GOOGLE_APPLICATION_CREDENTIALS", async () => {
         // Setup default cached credentials
-        const defaultCreds = { refresh_token: 'default-cached-token' };
-        const defaultCredsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const defaultCreds = { refresh_token: "default-cached-token" };
+        const defaultCredsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(defaultCredsPath), {
           recursive: true,
         });
-        await fs.promises.writeFile(
-          defaultCredsPath,
-          JSON.stringify(defaultCreds),
-        );
+        await fs.promises.writeFile(defaultCredsPath, JSON.stringify(defaultCreds));
 
         // Setup credentials via environment variable
-        const envCreds = { refresh_token: 'env-var-token' };
-        const envCredsPath = path.join(tempHomeDir, 'env_creds.json');
+        const envCreds = { refresh_token: "env-var-token" };
+        const envCredsPath = path.join(tempHomeDir, "env_creds.json");
         await fs.promises.writeFile(envCredsPath, JSON.stringify(envCreds));
-        vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
+        vi.stubEnv("GOOGLE_APPLICATION_CREDENTIALS", envCredsPath);
 
         const mockClient = {
           setCredentials: vi.fn(),
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
           getTokenInfo: vi.fn().mockResolvedValue({}),
           on: vi.fn(),
         };
-        vi.mocked(OAuth2Client).mockImplementation(
-          () => mockClient as unknown as OAuth2Client,
-        );
+        vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
@@ -535,22 +476,20 @@ describe('oauth2', () => {
         expect(mockClient.setCredentials).not.toHaveBeenCalledWith(envCreds);
       });
 
-      it('should fall back to GOOGLE_APPLICATION_CREDENTIALS if default cache is missing', async () => {
+      it("should fall back to GOOGLE_APPLICATION_CREDENTIALS if default cache is missing", async () => {
         // Setup credentials via environment variable
-        const envCreds = { refresh_token: 'env-var-token' };
-        const envCredsPath = path.join(tempHomeDir, 'env_creds.json');
+        const envCreds = { refresh_token: "env-var-token" };
+        const envCredsPath = path.join(tempHomeDir, "env_creds.json");
         await fs.promises.writeFile(envCredsPath, JSON.stringify(envCreds));
-        vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
+        vi.stubEnv("GOOGLE_APPLICATION_CREDENTIALS", envCredsPath);
 
         const mockClient = {
           setCredentials: vi.fn(),
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
           getTokenInfo: vi.fn().mockResolvedValue({}),
           on: vi.fn(),
         };
-        vi.mocked(OAuth2Client).mockImplementation(
-          () => mockClient as unknown as OAuth2Client,
-        );
+        vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
@@ -558,44 +497,32 @@ describe('oauth2', () => {
         expect(mockClient.setCredentials).toHaveBeenCalledWith(envCreds);
       });
 
-      it('should use GoogleAuth for BYOID credentials from GOOGLE_APPLICATION_CREDENTIALS', async () => {
+      it("should use GoogleAuth for BYOID credentials from GOOGLE_APPLICATION_CREDENTIALS", async () => {
         // Setup BYOID credentials via environment variable
         const byoidCredentials = {
-          type: 'external_account_authorized_user',
-          client_id: 'mock-client-id',
+          type: "external_account_authorized_user",
+          client_id: "mock-client-id",
         };
-        const envCredsPath = path.join(tempHomeDir, 'byoid_creds.json');
-        await fs.promises.writeFile(
-          envCredsPath,
-          JSON.stringify(byoidCredentials),
-        );
-        vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
+        const envCredsPath = path.join(tempHomeDir, "byoid_creds.json");
+        await fs.promises.writeFile(envCredsPath, JSON.stringify(byoidCredentials));
+        vi.stubEnv("GOOGLE_APPLICATION_CREDENTIALS", envCredsPath);
 
         // Mock GoogleAuth and its chain of calls
         const mockExternalAccountClient = {
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'byoid-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "byoid-token" }),
         };
-        const mockFromJSON = vi
-          .fn()
-          .mockResolvedValue(mockExternalAccountClient);
+        const mockFromJSON = vi.fn().mockResolvedValue(mockExternalAccountClient);
         const mockGoogleAuthInstance = {
           fromJSON: mockFromJSON,
         };
-        (GoogleAuth as unknown as Mock).mockImplementation(
-          () => mockGoogleAuthInstance,
-        );
+        (GoogleAuth as unknown as Mock).mockImplementation(() => mockGoogleAuthInstance);
 
         const mockOAuth2Client = {
           on: vi.fn(),
         };
-        (OAuth2Client as unknown as Mock).mockImplementation(
-          () => mockOAuth2Client,
-        );
+        (OAuth2Client as unknown as Mock).mockImplementation(() => mockOAuth2Client);
 
-        const client = await getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
         // Assert that GoogleAuth was used and the correct client was returned
         expect(GoogleAuth).toHaveBeenCalledWith({
@@ -606,15 +533,13 @@ describe('oauth2', () => {
       });
     });
 
-    describe('with GCP environment variables', () => {
-      it('should use GOOGLE_CLOUD_ACCESS_TOKEN when GOOGLE_GENAI_USE_GCA is true', async () => {
-        vi.stubEnv('GOOGLE_GENAI_USE_GCA', 'true');
-        vi.stubEnv('GOOGLE_CLOUD_ACCESS_TOKEN', 'gcp-access-token');
+    describe("with GCP environment variables", () => {
+      it("should use GOOGLE_CLOUD_ACCESS_TOKEN when GOOGLE_GENAI_USE_GCA is true", async () => {
+        vi.stubEnv("GOOGLE_GENAI_USE_GCA", "true");
+        vi.stubEnv("GOOGLE_CLOUD_ACCESS_TOKEN", "gcp-access-token");
 
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'gcp-access-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "gcp-access-token" });
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
           getAccessToken: mockGetAccessToken,
@@ -625,52 +550,38 @@ describe('oauth2', () => {
         // Mock the UserInfo API response for fetchAndCacheUserInfo
         (global.fetch as Mock).mockResolvedValue({
           ok: true,
-          json: vi
-            .fn()
-            .mockResolvedValue({ email: 'test-gcp-account@gmail.com' }),
+          json: vi.fn().mockResolvedValue({ email: "test-gcp-account@gmail.com" }),
         } as unknown as Response);
 
-        const client = await getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
         expect(client).toBe(mockOAuth2Client);
         expect(mockSetCredentials).toHaveBeenCalledWith({
-          access_token: 'gcp-access-token',
+          access_token: "gcp-access-token",
         });
 
         // Verify fetchAndCacheUserInfo was effectively called
         expect(mockGetAccessToken).toHaveBeenCalled();
-        expect(global.fetch).toHaveBeenCalledWith(
-          'https://www.googleapis.com/oauth2/v2/userinfo',
-          {
-            headers: {
-              Authorization: 'Bearer gcp-access-token',
-            },
+        expect(global.fetch).toHaveBeenCalledWith("https://www.googleapis.com/oauth2/v2/userinfo", {
+          headers: {
+            Authorization: "Bearer gcp-access-token",
           },
-        );
+        });
 
         // Verify Google Account was cached
-        const googleAccountPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'google_accounts.json',
-        );
-        const cachedContent = fs.readFileSync(googleAccountPath, 'utf-8');
+        const googleAccountPath = path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
+        const cachedContent = fs.readFileSync(googleAccountPath, "utf-8");
         expect(JSON.parse(cachedContent)).toEqual({
-          active: 'test-gcp-account@gmail.com',
+          active: "test-gcp-account@gmail.com",
           old: [],
         });
       });
 
-      it('should not use GCP token if GOOGLE_CLOUD_ACCESS_TOKEN is not set', async () => {
-        vi.stubEnv('GOOGLE_GENAI_USE_GCA', 'true');
+      it("should not use GCP token if GOOGLE_CLOUD_ACCESS_TOKEN is not set", async () => {
+        vi.stubEnv("GOOGLE_GENAI_USE_GCA", "true");
 
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'cached-access-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "cached-access-token" });
         const mockGetTokenInfo = vi.fn().mockResolvedValue({});
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
@@ -681,12 +592,8 @@ describe('oauth2', () => {
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         // Make it fall through to cached credentials path
-        const cachedCreds = { refresh_token: 'cached-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const cachedCreds = { refresh_token: "cached-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
@@ -697,13 +604,11 @@ describe('oauth2', () => {
         expect(mockSetCredentials).toHaveBeenCalledWith(cachedCreds);
       });
 
-      it('should not use GCP token if GOOGLE_GENAI_USE_GCA is not set', async () => {
-        vi.stubEnv('GOOGLE_CLOUD_ACCESS_TOKEN', 'gcp-access-token');
+      it("should not use GCP token if GOOGLE_GENAI_USE_GCA is not set", async () => {
+        vi.stubEnv("GOOGLE_CLOUD_ACCESS_TOKEN", "gcp-access-token");
 
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'cached-access-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "cached-access-token" });
         const mockGetTokenInfo = vi.fn().mockResolvedValue({});
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
@@ -714,12 +619,8 @@ describe('oauth2', () => {
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         // Make it fall through to cached credentials path
-        const cachedCreds = { refresh_token: 'cached-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const cachedCreds = { refresh_token: "cached-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
@@ -731,33 +632,31 @@ describe('oauth2', () => {
       });
     });
 
-    describe('error handling', () => {
-      it('should handle browser launch failure with FatalAuthenticationError', async () => {
-        const mockError = new Error('Browser launch failed');
+    describe("error handling", () => {
+      it("should handle browser launch failure with FatalAuthenticationError", async () => {
+        const mockError = new Error("Browser launch failed");
         (open as Mock).mockRejectedValue(mockError);
 
         const mockOAuth2Client = {
-          generateAuthUrl: vi.fn().mockReturnValue('https://example.com/auth'),
+          generateAuthUrl: vi.fn().mockReturnValue("https://example.com/auth"),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        await expect(
-          getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig),
-        ).rejects.toThrow('Failed to open browser: Browser launch failed');
+        await expect(getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig)).rejects.toThrow(
+          "Failed to open browser: Browser launch failed",
+        );
       });
 
-      it('should handle authentication timeout with proper error message', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
+      it("should handle authentication timeout with proper error message", async () => {
+        const mockAuthUrl = "https://example.com/auth";
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         const mockHttpServer = {
           listen: vi.fn(),
@@ -775,26 +674,22 @@ describe('oauth2', () => {
           (callback) => (callback(), {} as unknown as NodeJS.Timeout),
         ) as unknown as typeof setTimeout;
 
-        await expect(
-          getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig),
-        ).rejects.toThrow(
-          'Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. Please try again or use NO_BROWSER=true for manual authentication.',
+        await expect(getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig)).rejects.toThrow(
+          "Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. Please try again or use NO_BROWSER=true for manual authentication.",
         );
 
         global.setTimeout = originalSetTimeout;
       });
 
-      it('should handle OAuth callback errors with descriptive messages', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
+      it("should handle OAuth callback errors with descriptive messages", async () => {
+        const mockAuthUrl = "https://example.com/auth";
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -803,12 +698,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -818,15 +711,12 @@ describe('oauth2', () => {
           return mockHttpServer as unknown as http.Server;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         // Test OAuth error with description
         const mockReq = {
-          url: '/oauth2callback?error=access_denied&error_description=User+denied+access',
+          url: "/oauth2callback?error=access_denied&error_description=User+denied+access",
         } as http.IncomingMessage;
         const mockRes = {
           writeHead: vi.fn(),
@@ -836,22 +726,18 @@ describe('oauth2', () => {
         await expect(async () => {
           await requestCallback(mockReq, mockRes);
           await clientPromise;
-        }).rejects.toThrow(
-          'Google OAuth error: access_denied. User denied access',
-        );
+        }).rejects.toThrow("Google OAuth error: access_denied. User denied access");
       });
 
-      it('should handle OAuth error without description', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
+      it("should handle OAuth error without description", async () => {
+        const mockAuthUrl = "https://example.com/auth";
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -860,12 +746,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -875,15 +759,12 @@ describe('oauth2', () => {
           return mockHttpServer as unknown as http.Server;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         // Test OAuth error without description
         const mockReq = {
-          url: '/oauth2callback?error=server_error',
+          url: "/oauth2callback?error=server_error",
         } as http.IncomingMessage;
         const mockRes = {
           writeHead: vi.fn(),
@@ -893,29 +774,23 @@ describe('oauth2', () => {
         await expect(async () => {
           await requestCallback(mockReq, mockRes);
           await clientPromise;
-        }).rejects.toThrow(
-          'Google OAuth error: server_error. No additional details provided',
-        );
+        }).rejects.toThrow("Google OAuth error: server_error. No additional details provided");
       });
 
-      it('should handle token exchange failure with descriptive error', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
-        const mockCode = 'test-code';
-        const mockState = 'test-state';
+      it("should handle token exchange failure with descriptive error", async () => {
+        const mockAuthUrl = "https://example.com/auth";
+        const mockCode = "test-code";
+        const mockState = "test-state";
 
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
-          getToken: vi
-            .fn()
-            .mockRejectedValue(new Error('Token exchange failed')),
+          getToken: vi.fn().mockRejectedValue(new Error("Token exchange failed")),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -924,12 +799,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -939,10 +812,7 @@ describe('oauth2', () => {
           return mockHttpServer as unknown as http.Server;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         const mockReq = {
@@ -957,50 +827,42 @@ describe('oauth2', () => {
           await requestCallback(mockReq, mockRes);
           await clientPromise;
         }).rejects.toThrow(
-          'Failed to exchange authorization code for tokens: Token exchange failed',
+          "Failed to exchange authorization code for tokens: Token exchange failed",
         );
       });
 
-      it('should handle fetchAndCacheUserInfo failure gracefully', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
-        const mockCode = 'test-code';
-        const mockState = 'test-state';
+      it("should handle fetchAndCacheUserInfo failure gracefully", async () => {
+        const mockAuthUrl = "https://example.com/auth";
+        const mockCode = "test-code";
+        const mockState = "test-state";
         const mockTokens = {
-          access_token: 'test-access-token',
-          refresh_token: 'test-refresh-token',
+          access_token: "test-access-token",
+          refresh_token: "test-refresh-token",
         };
 
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           getToken: vi.fn().mockResolvedValue({ tokens: mockTokens }),
-          getAccessToken: vi
-            .fn()
-            .mockResolvedValue({ token: 'test-access-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-access-token" }),
           on: vi.fn(),
           credentials: {},
         } as unknown as OAuth2Client;
-        mockOAuth2Client.setCredentials = vi
-          .fn()
-          .mockImplementation((creds) => {
-            mockOAuth2Client.credentials = creds;
-          });
+        mockOAuth2Client.setCredentials = vi.fn().mockImplementation((creds) => {
+          mockOAuth2Client.credentials = creds;
+        });
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         // Mock fetch to fail
         vi.mocked(global.fetch).mockResolvedValue({
           ok: false,
           status: 500,
-          statusText: 'Internal Server Error',
+          statusText: "Internal Server Error",
         } as unknown as Response);
 
-        const consoleLogSpy = vi
-          .spyOn(debugLogger, 'log')
-          .mockImplementation(() => {});
+        const consoleLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -1009,12 +871,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -1024,10 +884,7 @@ describe('oauth2', () => {
           return mockHttpServer;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         const mockReq = {
@@ -1044,55 +901,49 @@ describe('oauth2', () => {
         // Authentication should succeed even if fetchAndCacheUserInfo fails
         expect(client).toBe(mockOAuth2Client);
         expect(consoleLogSpy).toHaveBeenCalledWith(
-          'Failed to fetch user info:',
+          "Failed to fetch user info:",
           500,
-          'Internal Server Error',
+          "Internal Server Error",
         );
 
         consoleLogSpy.mockRestore();
       });
 
-      it('should handle user code authentication failure with descriptive error', async () => {
+      it("should handle user code authentication failure with descriptive error", async () => {
         const mockConfigWithNoBrowser = {
           getNoBrowser: () => true,
-          getProxy: () => 'http://test.proxy.com:8080',
+          getProxy: () => "http://test.proxy.com:8080",
           isBrowserLaunchSuppressed: () => true,
         } as unknown as Config;
 
         const mockOAuth2Client = {
           generateCodeVerifierAsync: vi.fn().mockResolvedValue({
-            codeChallenge: 'test-challenge',
-            codeVerifier: 'test-verifier',
+            codeChallenge: "test-challenge",
+            codeVerifier: "test-verifier",
           }),
-          generateAuthUrl: vi.fn().mockReturnValue('https://example.com/auth'),
-          getToken: vi
-            .fn()
-            .mockRejectedValue(new Error('Invalid authorization code')),
+          generateAuthUrl: vi.fn().mockReturnValue("https://example.com/auth"),
+          getToken: vi.fn().mockRejectedValue(new Error("Invalid authorization code")),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         const mockReadline = {
-          question: vi.fn((_query, callback) => callback('invalid-code')),
+          question: vi.fn((_query, callback) => callback("invalid-code")),
           close: vi.fn(),
           on: vi.fn(),
         };
         (readline.createInterface as Mock).mockReturnValue(mockReadline);
 
-        const consoleLogSpy = vi
-          .spyOn(debugLogger, 'log')
-          .mockImplementation(() => {});
-        const consoleErrorSpy = vi
-          .spyOn(debugLogger, 'error')
-          .mockImplementation(() => {});
+        const consoleLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
+        const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
         await expect(
           getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfigWithNoBrowser),
-        ).rejects.toThrow('Failed to authenticate with user code.');
+        ).rejects.toThrow("Failed to authenticate with user code.");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
-          'Failed to authenticate with authorization code:',
-          'Invalid authorization code',
+          "Failed to authenticate with authorization code:",
+          "Invalid authorization code",
         );
 
         consoleLogSpy.mockRestore();
@@ -1100,50 +951,33 @@ describe('oauth2', () => {
       });
     });
 
-    describe('clearCachedCredentialFile', () => {
-      it('should clear cached credentials and Google account', async () => {
-        const cachedCreds = { refresh_token: 'test-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+    describe("clearCachedCredentialFile", () => {
+      it("should clear cached credentials and Google account", async () => {
+        const cachedCreds = { refresh_token: "test-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
-        const googleAccountPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'google_accounts.json',
-        );
-        const accountData = { active: 'test@example.com', old: [] };
-        await fs.promises.writeFile(
-          googleAccountPath,
-          JSON.stringify(accountData),
-        );
+        const googleAccountPath = path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
+        const accountData = { active: "test@example.com", old: [] };
+        await fs.promises.writeFile(googleAccountPath, JSON.stringify(accountData));
         const userAccountManager = new UserAccountManager();
 
         expect(fs.existsSync(credsPath)).toBe(true);
         expect(fs.existsSync(googleAccountPath)).toBe(true);
-        expect(userAccountManager.getCachedGoogleAccount()).toBe(
-          'test@example.com',
-        );
+        expect(userAccountManager.getCachedGoogleAccount()).toBe("test@example.com");
 
         await clearCachedCredentialFile();
         expect(fs.existsSync(credsPath)).toBe(false);
         expect(userAccountManager.getCachedGoogleAccount()).toBeNull();
-        const updatedAccountData = JSON.parse(
-          fs.readFileSync(googleAccountPath, 'utf-8'),
-        );
+        const updatedAccountData = JSON.parse(fs.readFileSync(googleAccountPath, "utf-8"));
         expect(updatedAccountData.active).toBeNull();
-        expect(updatedAccountData.old).toContain('test@example.com');
+        expect(updatedAccountData.old).toContain("test@example.com");
       });
 
-      it('should clear the in-memory OAuth client cache', async () => {
+      it("should clear the in-memory OAuth client cache", async () => {
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'test-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "test-token" });
         const mockGetTokenInfo = vi.fn().mockResolvedValue({});
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
@@ -1154,16 +988,9 @@ describe('oauth2', () => {
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         // Pre-populate credentials to make getOauthClient resolve quickly
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
-        await fs.promises.writeFile(
-          credsPath,
-          JSON.stringify({ refresh_token: 'token' }),
-        );
+        await fs.promises.writeFile(credsPath, JSON.stringify({ refresh_token: "token" }));
 
         // First call, should create a client
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
@@ -1182,13 +1009,11 @@ describe('oauth2', () => {
     });
   });
 
-  describe('with encrypted flag true', () => {
+  describe("with encrypted flag true", () => {
     let tempHomeDir: string;
     beforeEach(() => {
-      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = 'true';
-      tempHomeDir = fs.mkdtempSync(
-        path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-      );
+      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = "true";
+      tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
       (os.homedir as Mock).mockReturnValue(tempHomeDir);
     });
 
@@ -1199,21 +1024,19 @@ describe('oauth2', () => {
       vi.unstubAllEnvs();
     });
 
-    it('should save credentials using OAuthCredentialStorage during web login', async () => {
-      const { OAuthCredentialStorage } = await import(
-        './oauth-credential-storage.js'
-      );
-      const mockAuthUrl = 'https://example.com/auth';
-      const mockCode = 'test-code';
-      const mockState = 'test-state';
+    it("should save credentials using OAuthCredentialStorage during web login", async () => {
+      const { OAuthCredentialStorage } = await import("./oauth-credential-storage.js");
+      const mockAuthUrl = "https://example.com/auth";
+      const mockCode = "test-code";
+      const mockState = "test-state";
       const mockTokens = {
-        access_token: 'test-access-token',
-        refresh_token: 'test-refresh-token',
+        access_token: "test-access-token",
+        refresh_token: "test-refresh-token",
       };
 
       let onTokensCallback: (tokens: Credentials) => void = () => {};
       const mockOn = vi.fn((event, callback) => {
-        if (event === 'tokens') {
+        if (event === "tokens") {
           onTokensCallback = callback;
         }
       });
@@ -1227,31 +1050,23 @@ describe('oauth2', () => {
         generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
         getToken: mockGetToken,
         setCredentials: vi.fn(),
-        getAccessToken: vi
-          .fn()
-          .mockResolvedValue({ token: 'mock-access-token' }),
+        getAccessToken: vi.fn().mockResolvedValue({ token: "mock-access-token" }),
         on: mockOn,
         credentials: mockTokens,
       } as unknown as OAuth2Client;
       vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-      vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-      vi.mocked(open).mockImplementation(
-        async () => ({ on: vi.fn() }) as never,
-      );
+      vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+      vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
       (global.fetch as Mock).mockResolvedValue({
         ok: true,
-        json: vi
-          .fn()
-          .mockResolvedValue({ email: 'test-google-account@gmail.com' }),
+        json: vi.fn().mockResolvedValue({ email: "test-google-account@gmail.com" }),
       } as unknown as Response);
 
       let requestCallback!: http.RequestListener;
       let serverListeningCallback: (value: unknown) => void;
-      const serverListeningPromise = new Promise(
-        (resolve) => (serverListeningCallback = resolve),
-      );
+      const serverListeningPromise = new Promise((resolve) => (serverListeningCallback = resolve));
 
       let capturedPort = 0;
       const mockHttpServer = {
@@ -1275,10 +1090,7 @@ describe('oauth2', () => {
         return mockHttpServer as unknown as http.Server;
       });
 
-      const clientPromise = getOauthClient(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfig,
-      );
+      const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
       await serverListeningPromise;
 
@@ -1294,64 +1106,50 @@ describe('oauth2', () => {
 
       await clientPromise;
 
-      expect(
-        OAuthCredentialStorage.saveCredentials as Mock,
-      ).toHaveBeenCalledWith(mockTokens);
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+      expect(OAuthCredentialStorage.saveCredentials as Mock).toHaveBeenCalledWith(mockTokens);
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
       expect(fs.existsSync(credsPath)).toBe(false);
     });
 
-    it('should load credentials using OAuthCredentialStorage and not from file', async () => {
-      const { OAuthCredentialStorage } = await import(
-        './oauth-credential-storage.js'
-      );
-      const cachedCreds = { refresh_token: 'cached-encrypted-token' };
-      (OAuthCredentialStorage.loadCredentials as Mock).mockResolvedValue(
-        cachedCreds,
-      );
+    it("should load credentials using OAuthCredentialStorage and not from file", async () => {
+      const { OAuthCredentialStorage } = await import("./oauth-credential-storage.js");
+      const cachedCreds = { refresh_token: "cached-encrypted-token" };
+      (OAuthCredentialStorage.loadCredentials as Mock).mockResolvedValue(cachedCreds);
 
       // Create a dummy unencrypted credential file.
       // If the logic is correct, this file should be ignored.
-      const unencryptedCreds = { refresh_token: 'unencrypted-token' };
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+      const unencryptedCreds = { refresh_token: "unencrypted-token" };
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
       await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
       await fs.promises.writeFile(credsPath, JSON.stringify(unencryptedCreds));
 
       const mockClient = {
         setCredentials: vi.fn(),
-        getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+        getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
         getTokenInfo: vi.fn().mockResolvedValue({}),
         on: vi.fn(),
       };
 
-      vi.mocked(OAuth2Client).mockImplementation(
-        () => mockClient as unknown as OAuth2Client,
-      );
+      vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
       await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
       expect(OAuthCredentialStorage.loadCredentials as Mock).toHaveBeenCalled();
       expect(mockClient.setCredentials).toHaveBeenCalledWith(cachedCreds);
-      expect(mockClient.setCredentials).not.toHaveBeenCalledWith(
-        unencryptedCreds,
-      );
+      expect(mockClient.setCredentials).not.toHaveBeenCalledWith(unencryptedCreds);
     });
 
-    it('should clear credentials using OAuthCredentialStorage', async () => {
-      const { OAuthCredentialStorage } = await import(
-        './oauth-credential-storage.js'
-      );
+    it("should clear credentials using OAuthCredentialStorage", async () => {
+      const { OAuthCredentialStorage } = await import("./oauth-credential-storage.js");
 
       // Create a dummy unencrypted credential file. It should not be deleted.
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
       await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
-      await fs.promises.writeFile(credsPath, '{}');
+      await fs.promises.writeFile(credsPath, "{}");
 
       await clearCachedCredentialFile();
 
-      expect(
-        OAuthCredentialStorage.clearCredentials as Mock,
-      ).toHaveBeenCalled();
+      expect(OAuthCredentialStorage.clearCredentials as Mock).toHaveBeenCalled();
       expect(fs.existsSync(credsPath)).toBe(true); // The unencrypted file should remain
     });
   });
diff --git a/packages/gemini-cli-core/src/code_assist/oauth2.ts b/packages/gemini-cli-core/src/code_assist/oauth2.ts
index d2399083d..b20ba5cdf 100644
--- a/packages/gemini-cli-core/src/code_assist/oauth2.ts
+++ b/packages/gemini-cli-core/src/code_assist/oauth2.ts
@@ -4,47 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Credentials, AuthClient, JWTInput } from 'google-auth-library';
+import crypto from "node:crypto";
+import { EventEmitter } from "node:events";
+import { promises as fs } from "node:fs";
+import * as http from "node:http";
+import * as net from "node:net";
+import path from "node:path";
+import readline from "node:readline";
+import url from "node:url";
+import type { AuthClient, Credentials, JWTInput } from "google-auth-library";
+import { CodeChallengeMethod, Compute, GoogleAuth, OAuth2Client } from "google-auth-library";
+import open from "open";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { FORCE_ENCRYPTED_FILE_ENV_VAR } from "../mcp/token-storage/index.js";
+import { debugLogger } from "../utils/debugLogger.js";
 import {
-  OAuth2Client,
-  Compute,
-  CodeChallengeMethod,
-  GoogleAuth,
-} from 'google-auth-library';
-import * as http from 'node:http';
-import url from 'node:url';
-import crypto from 'node:crypto';
-import * as net from 'node:net';
-import { EventEmitter } from 'node:events';
-import open from 'open';
-import path from 'node:path';
-import { promises as fs } from 'node:fs';
-import type { Config } from '../config/config.js';
-import {
-  getErrorMessage,
   FatalAuthenticationError,
   FatalCancellationError,
-} from '../utils/errors.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
-import { AuthType } from '../core/contentGenerator.js';
-import readline from 'node:readline';
-import { Storage } from '../config/storage.js';
-import { OAuthCredentialStorage } from './oauth-credential-storage.js';
-import { FORCE_ENCRYPTED_FILE_ENV_VAR } from '../mcp/token-storage/index.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import {
-  writeToStdout,
-  createWorkingStdio,
-  writeToStderr,
-} from '../utils/stdio.js';
+  getErrorMessage,
+} from "../utils/errors.js";
+import { CoreEvent, coreEvents } from "../utils/events.js";
+import { createWorkingStdio, writeToStderr, writeToStdout } from "../utils/stdio.js";
 import {
-  enableLineWrapping,
-  disableMouseEvents,
   disableKittyKeyboardProtocol,
+  disableMouseEvents,
+  enableLineWrapping,
   enterAlternateScreen,
   exitAlternateScreen,
-} from '../utils/terminal.js';
-import { coreEvents, CoreEvent } from '../utils/events.js';
+} from "../utils/terminal.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
+import { OAuthCredentialStorage } from "./oauth-credential-storage.js";
 
 export const authEvents = new EventEmitter();
 
@@ -55,19 +46,18 @@ async function triggerPostAuthCallbacks(tokens: Credentials) {
     client_id: OAUTH_CLIENT_ID,
     client_secret: OAUTH_CLIENT_SECRET,
     refresh_token: tokens.refresh_token ?? undefined, // Ensure null is not passed
-    type: 'authorized_user',
+    type: "authorized_user",
     client_email: userAccountManager.getCachedGoogleAccount() ?? undefined,
   };
 
   // Execute all registered post-authentication callbacks.
-  authEvents.emit('post_auth', jwtInput);
+  authEvents.emit("post_auth", jwtInput);
 }
 
 const userAccountManager = new UserAccountManager();
 
 //  OAuth Client ID used to initiate OAuth2Client class.
-const OAUTH_CLIENT_ID =
-  '681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com';
+const OAUTH_CLIENT_ID = "681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com";
 
 // OAuth Secret value used to initiate OAuth2Client class.
 // Note: It's ok to save this in git because this is an installed application
@@ -75,20 +65,18 @@ const OAUTH_CLIENT_ID =
 // "The process results in a client ID and, in some cases, a client secret,
 // which you embed in the source code of your application. (In this context,
 // the client secret is obviously not treated as a secret.)"
-const OAUTH_CLIENT_SECRET = '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';
+const OAUTH_CLIENT_SECRET = "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";
 
 // OAuth Scopes for Cloud Code authorization.
 const OAUTH_SCOPE = [
-  'https://www.googleapis.com/auth/cloud-platform',
-  'https://www.googleapis.com/auth/userinfo.email',
-  'https://www.googleapis.com/auth/userinfo.profile',
+  "https://www.googleapis.com/auth/cloud-platform",
+  "https://www.googleapis.com/auth/userinfo.email",
+  "https://www.googleapis.com/auth/userinfo.profile",
 ];
 
 const HTTP_REDIRECT = 301;
-const SIGN_IN_SUCCESS_URL =
-  'https://developers.google.com/gemini-code-assist/auth_success_gemini';
-const SIGN_IN_FAILURE_URL =
-  'https://developers.google.com/gemini-code-assist/auth_failure_gemini';
+const SIGN_IN_SUCCESS_URL = "https://developers.google.com/gemini-code-assist/auth_success_gemini";
+const SIGN_IN_FAILURE_URL = "https://developers.google.com/gemini-code-assist/auth_failure_gemini";
 
 /**
  * An Authentication URL for updating the credentials of a Oauth2Client
@@ -103,19 +91,15 @@ export interface OauthWebLogin {
 const oauthClientPromises = new Map<AuthType, Promise<AuthClient>>();
 
 function getUseEncryptedStorageFlag() {
-  return process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === 'true';
+  return process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === "true";
 }
 
-async function initOauthClient(
-  authType: AuthType,
-  config: Config,
-): Promise<AuthClient> {
+async function initOauthClient(authType: AuthType, config: Config): Promise<AuthClient> {
   const credentials = await fetchCachedCredentials();
 
   if (
     credentials &&
-    (credentials as { type?: string }).type ===
-      'external_account_authorized_user'
+    (credentials as { type?: string }).type === "external_account_authorized_user"
   ) {
     const auth = new GoogleAuth({
       scopes: OAUTH_SCOPE,
@@ -126,7 +110,7 @@ async function initOauthClient(
     });
     const token = await byoidClient.getAccessToken();
     if (token) {
-      debugLogger.debug('Created BYOID auth client.');
+      debugLogger.debug("Created BYOID auth client.");
       return byoidClient;
     }
   }
@@ -140,18 +124,15 @@ async function initOauthClient(
   });
   const useEncryptedStorage = getUseEncryptedStorageFlag();
 
-  if (
-    process.env['GOOGLE_GENAI_USE_GCA'] &&
-    process.env['GOOGLE_CLOUD_ACCESS_TOKEN']
-  ) {
+  if (process.env["GOOGLE_GENAI_USE_GCA"] && process.env["GOOGLE_CLOUD_ACCESS_TOKEN"]) {
     client.setCredentials({
-      access_token: process.env['GOOGLE_CLOUD_ACCESS_TOKEN'],
+      access_token: process.env["GOOGLE_CLOUD_ACCESS_TOKEN"],
     });
     await fetchAndCacheUserInfo(client);
     return client;
   }
 
-  client.on('tokens', async (tokens: Credentials) => {
+  client.on("tokens", async (tokens: Credentials) => {
     if (useEncryptedStorage) {
       await OAuthCredentialStorage.saveCredentials(tokens);
     } else {
@@ -175,22 +156,16 @@ async function initOauthClient(
             await fetchAndCacheUserInfo(client);
           } catch (error) {
             // Non-fatal, continue with existing auth.
-            debugLogger.warn(
-              'Failed to fetch user info:',
-              getErrorMessage(error),
-            );
+            debugLogger.warn("Failed to fetch user info:", getErrorMessage(error));
           }
         }
-        debugLogger.log('Loaded cached credentials.');
+        debugLogger.log("Loaded cached credentials.");
         await triggerPostAuthCallbacks(credentials as Credentials);
 
         return client;
       }
     } catch (error) {
-      debugLogger.debug(
-        `Cached credentials are not valid:`,
-        getErrorMessage(error),
-      );
+      debugLogger.debug(`Cached credentials are not valid:`, getErrorMessage(error));
     }
   }
 
@@ -200,7 +175,7 @@ async function initOauthClient(
   if (authType === AuthType.COMPUTE_ADC) {
     try {
       debugLogger.log(
-        'Attempting to authenticate via metadata server application default credentials.',
+        "Attempting to authenticate via metadata server application default credentials.",
       );
 
       const computeClient = new Compute({
@@ -208,7 +183,7 @@ async function initOauthClient(
         // the service account email.
       });
       await computeClient.getAccessToken();
-      debugLogger.log('Authentication successful.');
+      debugLogger.log("Authentication successful.");
 
       // Do not cache creds in this case; note that Compute client will handle its own refresh
       return computeClient;
@@ -227,7 +202,7 @@ async function initOauthClient(
     // Enter alternate buffer
     enterAlternateScreen();
     // Clear screen and move cursor to top-left.
-    writeToStdout('\u001B[2J\u001B[H');
+    writeToStdout("\u001B[2J\u001B[H");
     disableMouseEvents();
     disableKittyKeyboardProtocol();
     enableLineWrapping();
@@ -237,8 +212,8 @@ async function initOauthClient(
         success = await authWithUserCode(client);
         if (!success) {
           writeToStderr(
-            '\nFailed to authenticate with user code.' +
-              (i === maxRetries - 1 ? '' : ' Retrying...\n'),
+            "\nFailed to authenticate with user code." +
+              (i === maxRetries - 1 ? "" : " Retrying...\n"),
           );
         }
       }
@@ -251,10 +226,8 @@ async function initOauthClient(
     }
 
     if (!success) {
-      writeToStderr('Failed to authenticate with user code.\n');
-      throw new FatalAuthenticationError(
-        'Failed to authenticate with user code.',
-      );
+      writeToStderr("Failed to authenticate with user code.\n");
+      throw new FatalAuthenticationError("Failed to authenticate with user code.");
     }
 
     // Retrieve and cache Google Account ID after successful user code auth
@@ -262,7 +235,7 @@ async function initOauthClient(
       await fetchAndCacheUserInfo(client);
     } catch (error) {
       debugLogger.warn(
-        'Failed to retrieve Google Account ID during authentication:',
+        "Failed to retrieve Google Account ID during authentication:",
         getErrorMessage(error),
       );
     }
@@ -272,7 +245,7 @@ async function initOauthClient(
     const webLogin = await authWithWeb(client);
 
     coreEvents.emit(CoreEvent.UserFeedback, {
-      severity: 'info',
+      severity: "info",
       message:
         `\n\nCode Assist login required.\n` +
         `Attempting to open authentication page in your browser.\n` +
@@ -288,9 +261,9 @@ async function initOauthClient(
       // Without this, if `open` fails to spawn a process (e.g., `xdg-open` is not found
       // in a minimal Docker container), it will emit an unhandled 'error' event,
       // causing the entire Node.js process to crash.
-      childProcess.on('error', (error) => {
+      childProcess.on("error", (error) => {
         coreEvents.emit(CoreEvent.UserFeedback, {
-          severity: 'error',
+          severity: "error",
           message:
             `Failed to open browser with error: ${getErrorMessage(error)}\n` +
             `Please try running again with NO_BROWSER=true set.`,
@@ -298,18 +271,16 @@ async function initOauthClient(
       });
     } catch (err) {
       coreEvents.emit(CoreEvent.UserFeedback, {
-        severity: 'error',
+        severity: "error",
         message:
           `Failed to open browser with error: ${getErrorMessage(err)}\n` +
           `Please try running again with NO_BROWSER=true set.`,
       });
-      throw new FatalAuthenticationError(
-        `Failed to open browser: ${getErrorMessage(err)}`,
-      );
+      throw new FatalAuthenticationError(`Failed to open browser: ${getErrorMessage(err)}`);
     }
     coreEvents.emit(CoreEvent.UserFeedback, {
-      severity: 'info',
-      message: 'Waiting for authentication...\n',
+      severity: "info",
+      message: "Waiting for authentication...\n",
     });
 
     // Add timeout to prevent infinite waiting when browser tab gets stuck
@@ -318,8 +289,8 @@ async function initOauthClient(
       setTimeout(() => {
         reject(
           new FatalAuthenticationError(
-            'Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. ' +
-              'Please try again or use NO_BROWSER=true for manual authentication.',
+            "Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. " +
+              "Please try again or use NO_BROWSER=true for manual authentication.",
           ),
         );
       }, authTimeout);
@@ -328,8 +299,8 @@ async function initOauthClient(
     await Promise.race([webLogin.loginCompletePromise, timeoutPromise]);
 
     coreEvents.emit(CoreEvent.UserFeedback, {
-      severity: 'info',
-      message: 'Authentication succeeded\n',
+      severity: "info",
+      message: "Authentication succeeded\n",
     });
 
     await triggerPostAuthCallbacks(client.credentials);
@@ -338,10 +309,7 @@ async function initOauthClient(
   return client;
 }
 
-export async function getOauthClient(
-  authType: AuthType,
-  config: Config,
-): Promise<AuthClient> {
+export async function getOauthClient(authType: AuthType, config: Config): Promise<AuthClient> {
   if (!oauthClientPromises.has(authType)) {
     oauthClientPromises.set(authType, initOauthClient(authType, config));
   }
@@ -350,21 +318,19 @@ export async function getOauthClient(
 
 async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
   try {
-    const redirectUri = 'https://codeassist.google.com/authcode';
+    const redirectUri = "https://codeassist.google.com/authcode";
     const codeVerifier = await client.generateCodeVerifierAsync();
-    const state = crypto.randomBytes(32).toString('hex');
+    const state = crypto.randomBytes(32).toString("hex");
     const authUrl: string = client.generateAuthUrl({
       redirect_uri: redirectUri,
-      access_type: 'offline',
+      access_type: "offline",
       scope: OAUTH_SCOPE,
       code_challenge_method: CodeChallengeMethod.S256,
       code_challenge: codeVerifier.codeChallenge,
       state,
     });
     writeToStdout(
-      'Please visit the following URL to authorize the application:\n\n' +
-        authUrl +
-        '\n\n',
+      "Please visit the following URL to authorize the application:\n\n" + authUrl + "\n\n",
     );
 
     const code = await new Promise<string>((resolve, _) => {
@@ -374,15 +340,15 @@ async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
         terminal: true,
       });
 
-      rl.question('Enter the authorization code: ', (code) => {
+      rl.question("Enter the authorization code: ", (code) => {
         rl.close();
         resolve(code.trim());
       });
     });
 
     if (!code) {
-      writeToStderr('Authorization code is required.\n');
-      debugLogger.error('Authorization code is required.');
+      writeToStderr("Authorization code is required.\n");
+      debugLogger.error("Authorization code is required.");
       return false;
     }
 
@@ -395,15 +361,10 @@ async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
       client.setCredentials(tokens);
     } catch (error) {
       writeToStderr(
-        'Failed to authenticate with authorization code:' +
-          getErrorMessage(error) +
-          '\n',
+        "Failed to authenticate with authorization code:" + getErrorMessage(error) + "\n",
       );
 
-      debugLogger.error(
-        'Failed to authenticate with authorization code:',
-        getErrorMessage(error),
-      );
+      debugLogger.error("Failed to authenticate with authorization code:", getErrorMessage(error));
       return false;
     }
     return true;
@@ -411,13 +372,8 @@ async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
     if (err instanceof FatalCancellationError) {
       throw err;
     }
-    writeToStderr(
-      'Failed to authenticate with user code:' + getErrorMessage(err) + '\n',
-    );
-    debugLogger.error(
-      'Failed to authenticate with user code:',
-      getErrorMessage(err),
-    );
+    writeToStderr("Failed to authenticate with user code:" + getErrorMessage(err) + "\n");
+    debugLogger.error("Failed to authenticate with user code:", getErrorMessage(err));
     return false;
   }
 }
@@ -425,16 +381,16 @@ async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
 async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
   const port = await getAvailablePort();
   // The hostname used for the HTTP server binding (e.g., '0.0.0.0' in Docker).
-  const host = process.env['OAUTH_CALLBACK_HOST'] || 'localhost';
+  const host = process.env["OAUTH_CALLBACK_HOST"] || "localhost";
   // The `redirectUri` sent to Google's authorization server MUST use a loopback IP literal
   // (i.e., 'localhost' or '127.0.0.1'). This is a strict security policy for credentials of
   // type 'Desktop app' or 'Web application' (when using loopback flow) to mitigate
   // authorization code interception attacks.
   const redirectUri = `http://localhost:${port}/oauth2callback`;
-  const state = crypto.randomBytes(32).toString('hex');
+  const state = crypto.randomBytes(32).toString("hex");
   const authUrl = client.generateAuthUrl({
     redirect_uri: redirectUri,
-    access_type: 'offline',
+    access_type: "offline",
     scope: OAUTH_SCOPE,
     state,
   });
@@ -442,41 +398,38 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
   const loginCompletePromise = new Promise<void>((resolve, reject) => {
     const server = http.createServer(async (req, res) => {
       try {
-        if (req.url!.indexOf('/oauth2callback') === -1) {
+        if (req.url!.indexOf("/oauth2callback") === -1) {
           res.writeHead(HTTP_REDIRECT, { Location: SIGN_IN_FAILURE_URL });
           res.end();
           reject(
             new FatalAuthenticationError(
-              'OAuth callback not received. Unexpected request: ' + req.url,
+              "OAuth callback not received. Unexpected request: " + req.url,
             ),
           );
         }
         // acquire the code from the querystring, and close the web server.
-        const qs = new url.URL(req.url!, 'http://localhost:3000').searchParams;
-        if (qs.get('error')) {
+        const qs = new url.URL(req.url!, "http://localhost:3000").searchParams;
+        if (qs.get("error")) {
           res.writeHead(HTTP_REDIRECT, { Location: SIGN_IN_FAILURE_URL });
           res.end();
 
-          const errorCode = qs.get('error');
-          const errorDescription =
-            qs.get('error_description') || 'No additional details provided';
+          const errorCode = qs.get("error");
+          const errorDescription = qs.get("error_description") || "No additional details provided";
           reject(
-            new FatalAuthenticationError(
-              `Google OAuth error: ${errorCode}. ${errorDescription}`,
-            ),
+            new FatalAuthenticationError(`Google OAuth error: ${errorCode}. ${errorDescription}`),
           );
-        } else if (qs.get('state') !== state) {
-          res.end('State mismatch. Possible CSRF attack');
+        } else if (qs.get("state") !== state) {
+          res.end("State mismatch. Possible CSRF attack");
 
           reject(
             new FatalAuthenticationError(
-              'OAuth state mismatch. Possible CSRF attack or browser session issue.',
+              "OAuth state mismatch. Possible CSRF attack or browser session issue.",
             ),
           );
-        } else if (qs.get('code')) {
+        } else if (qs.get("code")) {
           try {
             const { tokens } = await client.getToken({
-              code: qs.get('code')!,
+              code: qs.get("code")!,
               redirect_uri: redirectUri,
             });
             client.setCredentials(tokens);
@@ -486,7 +439,7 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
               await fetchAndCacheUserInfo(client);
             } catch (error) {
               debugLogger.warn(
-                'Failed to retrieve Google Account ID during authentication:',
+                "Failed to retrieve Google Account ID during authentication:",
                 getErrorMessage(error),
               );
               // Don't fail the auth flow if Google Account ID retrieval fails
@@ -507,7 +460,7 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
         } else {
           reject(
             new FatalAuthenticationError(
-              'No authorization code received from Google OAuth. Please try authenticating again.',
+              "No authorization code received from Google OAuth. Please try authenticating again.",
             ),
           );
         }
@@ -531,12 +484,8 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
       // Server started successfully
     });
 
-    server.on('error', (err) => {
-      reject(
-        new FatalAuthenticationError(
-          `OAuth callback server error: ${getErrorMessage(err)}`,
-        ),
-      );
+    server.on("error", (err) => {
+      reject(new FatalAuthenticationError(`OAuth callback server error: ${getErrorMessage(err)}`));
     });
   });
 
@@ -550,13 +499,11 @@ export function getAvailablePort(): Promise<number> {
   return new Promise((resolve, reject) => {
     let port = 0;
     try {
-      const portStr = process.env['OAUTH_CALLBACK_PORT'];
+      const portStr = process.env["OAUTH_CALLBACK_PORT"];
       if (portStr) {
         port = parseInt(portStr, 10);
         if (isNaN(port) || port <= 0 || port > 65535) {
-          return reject(
-            new Error(`Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`),
-          );
+          return reject(new Error(`Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`));
         }
         return resolve(port);
       }
@@ -565,21 +512,19 @@ export function getAvailablePort(): Promise<number> {
         const address = server.address()! as net.AddressInfo;
         port = address.port;
       });
-      server.on('listening', () => {
+      server.on("listening", () => {
         server.close();
         server.unref();
       });
-      server.on('error', (e) => reject(e));
-      server.on('close', () => resolve(port));
+      server.on("error", (e) => reject(e));
+      server.on("close", () => resolve(port));
     } catch (e) {
       reject(e);
     }
   });
 }
 
-async function fetchCachedCredentials(): Promise<
-  Credentials | JWTInput | null
-> {
+async function fetchCachedCredentials(): Promise<Credentials | JWTInput | null> {
   const useEncryptedStorage = getUseEncryptedStorageFlag();
   if (useEncryptedStorage) {
     return OAuthCredentialStorage.loadCredentials();
@@ -587,19 +532,16 @@ async function fetchCachedCredentials(): Promise<
 
   const pathsToTry = [
     Storage.getOAuthCredsPath(),
-    process.env['GOOGLE_APPLICATION_CREDENTIALS'],
+    process.env["GOOGLE_APPLICATION_CREDENTIALS"],
   ].filter((p): p is string => !!p);
 
   for (const keyFile of pathsToTry) {
     try {
-      const keyFileString = await fs.readFile(keyFile, 'utf-8');
+      const keyFileString = await fs.readFile(keyFile, "utf-8");
       return JSON.parse(keyFileString);
     } catch (error) {
       // Log specific error for debugging, but continue trying other paths
-      debugLogger.debug(
-        `Failed to load credentials from ${keyFile}:`,
-        getErrorMessage(error),
-      );
+      debugLogger.debug(`Failed to load credentials from ${keyFile}:`, getErrorMessage(error));
     }
   }
 
@@ -623,7 +565,7 @@ export async function clearCachedCredentialFile() {
     // Clear the in-memory OAuth client cache to force re-authentication
     clearOauthClientCache();
   } catch (e) {
-    debugLogger.warn('Failed to clear cached credentials:', e);
+    debugLogger.warn("Failed to clear cached credentials:", e);
   }
 }
 
@@ -634,28 +576,21 @@ async function fetchAndCacheUserInfo(client: OAuth2Client): Promise<void> {
       return;
     }
 
-    const response = await fetch(
-      'https://www.googleapis.com/oauth2/v2/userinfo',
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
+    const response = await fetch("https://www.googleapis.com/oauth2/v2/userinfo", {
+      headers: {
+        Authorization: `Bearer ${token}`,
       },
-    );
+    });
 
     if (!response.ok) {
-      debugLogger.log(
-        'Failed to fetch user info:',
-        response.status,
-        response.statusText,
-      );
+      debugLogger.log("Failed to fetch user info:", response.status, response.statusText);
       return;
     }
 
     const userInfo = await response.json();
     await userAccountManager.cacheGoogleAccount(userInfo.email);
   } catch (error) {
-    debugLogger.log('Error retrieving user info:', error);
+    debugLogger.log("Error retrieving user info:", error);
   }
 }
 
diff --git a/packages/gemini-cli-core/src/code_assist/server.test.ts b/packages/gemini-cli-core/src/code_assist/server.test.ts
index 281b46549..a9fba2d76 100644
--- a/packages/gemini-cli-core/src/code_assist/server.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/server.test.ts
@@ -4,38 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { beforeEach, describe, it, expect, vi, afterEach } from 'vitest';
-import { CodeAssistServer } from './server.js';
-import { OAuth2Client } from 'google-auth-library';
-import { UserTierId } from './types.js';
+import { OAuth2Client } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { CodeAssistServer } from "./server.js";
+import { UserTierId } from "./types.js";
 
-vi.mock('google-auth-library');
+vi.mock("google-auth-library");
 
-describe('CodeAssistServer', () => {
+describe("CodeAssistServer", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should be able to be constructed', () => {
+  it("should be able to be constructed", () => {
     const auth = new OAuth2Client();
-    const server = new CodeAssistServer(
-      auth,
-      'test-project',
-      {},
-      'test-session',
-      UserTierId.FREE,
-    );
+    const server = new CodeAssistServer(auth, "test-project", {}, "test-session", UserTierId.FREE);
     expect(server).toBeInstanceOf(CodeAssistServer);
   });
 
-  it('should call the generateContent endpoint', async () => {
+  it("should call the generateContent endpoint", async () => {
     const mockRequest = vi.fn();
     const client = { request: mockRequest } as unknown as OAuth2Client;
     const server = new CodeAssistServer(
       client,
-      'test-project',
-      { headers: { 'x-custom-header': 'test-value' } },
-      'test-session',
+      "test-project",
+      { headers: { "x-custom-header": "test-value" } },
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponseData = {
@@ -44,10 +38,10 @@ describe('CodeAssistServer', () => {
           {
             index: 0,
             content: {
-              role: 'model',
-              parts: [{ text: 'response' }],
+              role: "model",
+              parts: [{ text: "response" }],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
             safetyRatings: [],
           },
         ],
@@ -57,34 +51,32 @@ describe('CodeAssistServer', () => {
 
     const response = await server.generateContent(
       {
-        model: 'test-model',
-        contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+        model: "test-model",
+        contents: [{ role: "user", parts: [{ text: "request" }] }],
       },
-      'user-prompt-id',
+      "user-prompt-id",
     );
 
     expect(mockRequest).toHaveBeenCalledWith({
-      url: expect.stringContaining(':generateContent'),
-      method: 'POST',
+      url: expect.stringContaining(":generateContent"),
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
-        'x-custom-header': 'test-value',
+        "Content-Type": "application/json",
+        "x-custom-header": "test-value",
       },
-      responseType: 'json',
+      responseType: "json",
       body: expect.any(String),
       signal: undefined,
     });
 
     const requestBody = JSON.parse(mockRequest.mock.calls[0][0].body);
-    expect(requestBody.user_prompt_id).toBe('user-prompt-id');
-    expect(requestBody.project).toBe('test-project');
+    expect(requestBody.user_prompt_id).toBe("user-prompt-id");
+    expect(requestBody.project).toBe("test-project");
 
-    expect(response.candidates?.[0]?.content?.parts?.[0]?.text).toBe(
-      'response',
-    );
+    expect(response.candidates?.[0]?.content?.parts?.[0]?.text).toBe("response");
   });
 
-  describe('getMethodUrl', () => {
+  describe("getMethodUrl", () => {
     const originalEnv = process.env;
 
     beforeEach(() => {
@@ -97,62 +89,60 @@ describe('CodeAssistServer', () => {
       process.env = originalEnv;
     });
 
-    it('should construct the default URL correctly', () => {
+    it("should construct the default URL correctly", () => {
       const server = new CodeAssistServer({} as never);
-      const url = server.getMethodUrl('testMethod');
-      expect(url).toBe(
-        'https://cloudcode-pa.googleapis.com/v1internal:testMethod',
-      );
+      const url = server.getMethodUrl("testMethod");
+      expect(url).toBe("https://cloudcode-pa.googleapis.com/v1internal:testMethod");
     });
 
-    it('should use the CODE_ASSIST_ENDPOINT environment variable if set', () => {
-      process.env['CODE_ASSIST_ENDPOINT'] = 'https://custom-endpoint.com';
+    it("should use the CODE_ASSIST_ENDPOINT environment variable if set", () => {
+      process.env["CODE_ASSIST_ENDPOINT"] = "https://custom-endpoint.com";
       const server = new CodeAssistServer({} as never);
-      const url = server.getMethodUrl('testMethod');
-      expect(url).toBe('https://custom-endpoint.com/v1internal:testMethod');
+      const url = server.getMethodUrl("testMethod");
+      expect(url).toBe("https://custom-endpoint.com/v1internal:testMethod");
     });
   });
 
-  it('should call the generateContentStream endpoint and parse SSE', async () => {
+  it("should call the generateContentStream endpoint and parse SSE", async () => {
     const mockRequest = vi.fn();
     const client = { request: mockRequest } as unknown as OAuth2Client;
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
 
     // Create a mock readable stream
-    const { Readable } = await import('node:stream');
+    const { Readable } = await import("node:stream");
     const mockStream = new Readable({
       read() {},
     });
 
     const mockResponseData1 = {
-      response: { candidates: [{ content: { parts: [{ text: 'Hello' }] } }] },
+      response: { candidates: [{ content: { parts: [{ text: "Hello" }] } }] },
     };
     const mockResponseData2 = {
-      response: { candidates: [{ content: { parts: [{ text: ' World' }] } }] },
+      response: { candidates: [{ content: { parts: [{ text: " World" }] } }] },
     };
 
     mockRequest.mockResolvedValue({ data: mockStream });
 
     const stream = await server.generateContentStream(
       {
-        model: 'test-model',
-        contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+        model: "test-model",
+        contents: [{ role: "user", parts: [{ text: "request" }] }],
       },
-      'user-prompt-id',
+      "user-prompt-id",
     );
 
     // Push SSE data to the stream
     // Use setTimeout to ensure the stream processing has started
     setTimeout(() => {
-      mockStream.push('data: ' + JSON.stringify(mockResponseData1) + '\n\n');
-      mockStream.push('id: 123\n'); // Should be ignored
-      mockStream.push('data: ' + JSON.stringify(mockResponseData2) + '\n\n');
+      mockStream.push("data: " + JSON.stringify(mockResponseData1) + "\n\n");
+      mockStream.push("id: 123\n"); // Should be ignored
+      mockStream.push("data: " + JSON.stringify(mockResponseData2) + "\n\n");
       mockStream.push(null); // End the stream
     }, 0);
 
@@ -162,38 +152,38 @@ describe('CodeAssistServer', () => {
     }
 
     expect(mockRequest).toHaveBeenCalledWith({
-      url: expect.stringContaining(':streamGenerateContent'),
-      method: 'POST',
-      params: { alt: 'sse' },
-      responseType: 'stream',
+      url: expect.stringContaining(":streamGenerateContent"),
+      method: "POST",
+      params: { alt: "sse" },
+      responseType: "stream",
       body: expect.any(String),
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       signal: undefined,
     });
 
     expect(results).toHaveLength(2);
-    expect(results[0].candidates?.[0].content?.parts?.[0].text).toBe('Hello');
-    expect(results[1].candidates?.[0].content?.parts?.[0].text).toBe(' World');
+    expect(results[0].candidates?.[0].content?.parts?.[0].text).toBe("Hello");
+    expect(results[1].candidates?.[0].content?.parts?.[0].text).toBe(" World");
   });
 
-  it('should ignore malformed SSE data', async () => {
+  it("should ignore malformed SSE data", async () => {
     const mockRequest = vi.fn();
     const client = { request: mockRequest } as unknown as OAuth2Client;
     const server = new CodeAssistServer(client);
 
-    const { Readable } = await import('node:stream');
+    const { Readable } = await import("node:stream");
     const mockStream = new Readable({
       read() {},
     });
 
     mockRequest.mockResolvedValue({ data: mockStream });
 
-    const stream = await server.requestStreamingPost('testStream', {});
+    const stream = await server.requestStreamingPost("testStream", {});
 
     setTimeout(() => {
-      mockStream.push('this is a malformed line\n');
+      mockStream.push("this is a malformed line\n");
       mockStream.push(null);
     }, 0);
 
@@ -204,111 +194,105 @@ describe('CodeAssistServer', () => {
     expect(results).toHaveLength(0);
   });
 
-  it('should call the onboardUser endpoint', async () => {
+  it("should call the onboardUser endpoint", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
-      name: 'operations/123',
+      name: "operations/123",
       done: true,
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const response = await server.onboardUser({
-      tierId: 'test-tier',
-      cloudaicompanionProject: 'test-project',
+      tierId: "test-tier",
+      cloudaicompanionProject: "test-project",
       metadata: {},
     });
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'onboardUser',
-      expect.any(Object),
-    );
-    expect(response.name).toBe('operations/123');
+    expect(server.requestPost).toHaveBeenCalledWith("onboardUser", expect.any(Object));
+    expect(response.name).toBe("operations/123");
   });
 
-  it('should call the loadCodeAssist endpoint', async () => {
+  it("should call the loadCodeAssist endpoint", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
       currentTier: {
         id: UserTierId.FREE,
-        name: 'Free',
-        description: 'free tier',
+        name: "Free",
+        description: "free tier",
       },
       allowedTiers: [],
       ineligibleTiers: [],
-      cloudaicompanionProject: 'projects/test',
+      cloudaicompanionProject: "projects/test",
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const response = await server.loadCodeAssist({
       metadata: {},
     });
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'loadCodeAssist',
-      expect.any(Object),
-    );
+    expect(server.requestPost).toHaveBeenCalledWith("loadCodeAssist", expect.any(Object));
     expect(response).toEqual(mockResponse);
   });
 
-  it('should return 0 for countTokens', async () => {
+  it("should return 0 for countTokens", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
       totalTokens: 100,
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const response = await server.countTokens({
-      model: 'test-model',
-      contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+      model: "test-model",
+      contents: [{ role: "user", parts: [{ text: "request" }] }],
     });
     expect(response.totalTokens).toBe(100);
   });
 
-  it('should throw an error for embedContent', async () => {
+  it("should throw an error for embedContent", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     await expect(
       server.embedContent({
-        model: 'test-model',
-        contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+        model: "test-model",
+        contents: [{ role: "user", parts: [{ text: "request" }] }],
       }),
     ).rejects.toThrow();
   });
 
-  it('should handle VPC-SC errors when calling loadCodeAssist', async () => {
+  it("should handle VPC-SC errors when calling loadCodeAssist", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockVpcScError = {
@@ -317,101 +301,93 @@ describe('CodeAssistServer', () => {
           error: {
             details: [
               {
-                reason: 'SECURITY_POLICY_VIOLATED',
+                reason: "SECURITY_POLICY_VIOLATED",
               },
             ],
           },
         },
       },
     };
-    vi.spyOn(server, 'requestPost').mockRejectedValue(mockVpcScError);
+    vi.spyOn(server, "requestPost").mockRejectedValue(mockVpcScError);
 
     const response = await server.loadCodeAssist({
       metadata: {},
     });
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'loadCodeAssist',
-      expect.any(Object),
-    );
+    expect(server.requestPost).toHaveBeenCalledWith("loadCodeAssist", expect.any(Object));
     expect(response).toEqual({
       currentTier: { id: UserTierId.STANDARD },
     });
   });
 
-  it('should re-throw non-VPC-SC errors from loadCodeAssist', async () => {
+  it("should re-throw non-VPC-SC errors from loadCodeAssist", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(client);
-    const genericError = new Error('Something else went wrong');
-    vi.spyOn(server, 'requestPost').mockRejectedValue(genericError);
+    const genericError = new Error("Something else went wrong");
+    vi.spyOn(server, "requestPost").mockRejectedValue(genericError);
 
     await expect(server.loadCodeAssist({ metadata: {} })).rejects.toThrow(
-      'Something else went wrong',
+      "Something else went wrong",
     );
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'loadCodeAssist',
-      expect.any(Object),
-    );
+    expect(server.requestPost).toHaveBeenCalledWith("loadCodeAssist", expect.any(Object));
   });
 
-  it('should call the listExperiments endpoint with metadata', async () => {
+  it("should call the listExperiments endpoint with metadata", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
       experiments: [],
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const metadata = {
-      ideVersion: 'v0.1.0',
+      ideVersion: "v0.1.0",
     };
     const response = await server.listExperiments(metadata);
 
-    expect(server.requestPost).toHaveBeenCalledWith('listExperiments', {
-      project: 'test-project',
-      metadata: { ideVersion: 'v0.1.0', duetProject: 'test-project' },
+    expect(server.requestPost).toHaveBeenCalledWith("listExperiments", {
+      project: "test-project",
+      metadata: { ideVersion: "v0.1.0", duetProject: "test-project" },
     });
     expect(response).toEqual(mockResponse);
   });
 
-  it('should call the retrieveUserQuota endpoint', async () => {
+  it("should call the retrieveUserQuota endpoint", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
       buckets: [
         {
-          modelId: 'gemini-2.5-pro',
-          tokenType: 'REQUESTS',
+          modelId: "gemini-2.5-pro",
+          tokenType: "REQUESTS",
           remainingFraction: 0.75,
-          resetTime: '2025-10-22T16:01:15Z',
+          resetTime: "2025-10-22T16:01:15Z",
         },
       ],
     };
-    const requestPostSpy = vi
-      .spyOn(server, 'requestPost')
-      .mockResolvedValue(mockResponse);
+    const requestPostSpy = vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const req = {
-      project: 'projects/my-cloudcode-project',
-      userAgent: 'CloudCodePlugin/1.0 (gaghosh)',
+      project: "projects/my-cloudcode-project",
+      userAgent: "CloudCodePlugin/1.0 (gaghosh)",
     };
 
     const response = await server.retrieveUserQuota(req);
 
-    expect(requestPostSpy).toHaveBeenCalledWith('retrieveUserQuota', req);
+    expect(requestPostSpy).toHaveBeenCalledWith("retrieveUserQuota", req);
     expect(response).toEqual(mockResponse);
   });
 });
diff --git a/packages/gemini-cli-core/src/code_assist/server.ts b/packages/gemini-cli-core/src/code_assist/server.ts
index f345ff0fc..af7966695 100644
--- a/packages/gemini-cli-core/src/code_assist/server.ts
+++ b/packages/gemini-cli-core/src/code_assist/server.ts
@@ -4,23 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AuthClient } from 'google-auth-library';
-import type {
-  CodeAssistGlobalUserSettingResponse,
-  GoogleRpcResponse,
-  LoadCodeAssistRequest,
-  LoadCodeAssistResponse,
-  LongRunningOperationResponse,
-  OnboardUserRequest,
-  SetCodeAssistGlobalUserSettingRequest,
-  ClientMetadata,
-  RetrieveUserQuotaRequest,
-  RetrieveUserQuotaResponse,
-} from './types.js';
-import type {
-  ListExperimentsRequest,
-  ListExperimentsResponse,
-} from './experiments/types.js';
+import * as readline from "node:readline";
 import type {
   CountTokensParameters,
   CountTokensResponse,
@@ -28,20 +12,30 @@ import type {
   EmbedContentResponse,
   GenerateContentParameters,
   GenerateContentResponse,
-} from '@google/genai';
-import * as readline from 'node:readline';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import { UserTierId } from './types.js';
-import type {
-  CaCountTokenResponse,
-  CaGenerateContentResponse,
-} from './converter.js';
+} from "@google/genai";
+import type { AuthClient } from "google-auth-library";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import type { CaCountTokenResponse, CaGenerateContentResponse } from "./converter.js";
 import {
   fromCountTokenResponse,
   fromGenerateContentResponse,
   toCountTokenRequest,
   toGenerateContentRequest,
-} from './converter.js';
+} from "./converter.js";
+import type { ListExperimentsRequest, ListExperimentsResponse } from "./experiments/types.js";
+import type {
+  ClientMetadata,
+  CodeAssistGlobalUserSettingResponse,
+  GoogleRpcResponse,
+  LoadCodeAssistRequest,
+  LoadCodeAssistResponse,
+  LongRunningOperationResponse,
+  OnboardUserRequest,
+  RetrieveUserQuotaRequest,
+  RetrieveUserQuotaResponse,
+  SetCodeAssistGlobalUserSettingRequest,
+} from "./types.js";
+import { UserTierId } from "./types.js";
 
 /** HTTP options to be used in each of the requests. */
 export interface HttpOptions {
@@ -49,8 +43,8 @@ export interface HttpOptions {
   headers?: Record<string, string>;
 }
 
-export const CODE_ASSIST_ENDPOINT = 'https://cloudcode-pa.googleapis.com';
-export const CODE_ASSIST_API_VERSION = 'v1internal';
+export const CODE_ASSIST_ENDPOINT = "https://cloudcode-pa.googleapis.com";
+export const CODE_ASSIST_API_VERSION = "v1internal";
 
 export class CodeAssistServer implements ContentGenerator {
   constructor(
@@ -66,13 +60,8 @@ export class CodeAssistServer implements ContentGenerator {
     userPromptId: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     const resps = await this.requestStreamingPost<CaGenerateContentResponse>(
-      'streamGenerateContent',
-      toGenerateContentRequest(
-        req,
-        userPromptId,
-        this.projectId,
-        this.sessionId,
-      ),
+      "streamGenerateContent",
+      toGenerateContentRequest(req, userPromptId, this.projectId, this.sessionId),
       req.config?.abortSignal,
     );
     return (async function* (): AsyncGenerator<GenerateContentResponse> {
@@ -87,32 +76,20 @@ export class CodeAssistServer implements ContentGenerator {
     userPromptId: string,
   ): Promise<GenerateContentResponse> {
     const resp = await this.requestPost<CaGenerateContentResponse>(
-      'generateContent',
-      toGenerateContentRequest(
-        req,
-        userPromptId,
-        this.projectId,
-        this.sessionId,
-      ),
+      "generateContent",
+      toGenerateContentRequest(req, userPromptId, this.projectId, this.sessionId),
       req.config?.abortSignal,
     );
     return fromGenerateContentResponse(resp);
   }
 
-  async onboardUser(
-    req: OnboardUserRequest,
-  ): Promise<LongRunningOperationResponse> {
-    return this.requestPost<LongRunningOperationResponse>('onboardUser', req);
+  async onboardUser(req: OnboardUserRequest): Promise<LongRunningOperationResponse> {
+    return this.requestPost<LongRunningOperationResponse>("onboardUser", req);
   }
 
-  async loadCodeAssist(
-    req: LoadCodeAssistRequest,
-  ): Promise<LoadCodeAssistResponse> {
+  async loadCodeAssist(req: LoadCodeAssistRequest): Promise<LoadCodeAssistResponse> {
     try {
-      return await this.requestPost<LoadCodeAssistResponse>(
-        'loadCodeAssist',
-        req,
-      );
+      return await this.requestPost<LoadCodeAssistResponse>("loadCodeAssist", req);
     } catch (e) {
       if (isVpcScAffectedUser(e)) {
         return {
@@ -125,70 +102,55 @@ export class CodeAssistServer implements ContentGenerator {
   }
 
   async getCodeAssistGlobalUserSetting(): Promise<CodeAssistGlobalUserSettingResponse> {
-    return this.requestGet<CodeAssistGlobalUserSettingResponse>(
-      'getCodeAssistGlobalUserSetting',
-    );
+    return this.requestGet<CodeAssistGlobalUserSettingResponse>("getCodeAssistGlobalUserSetting");
   }
 
   async setCodeAssistGlobalUserSetting(
     req: SetCodeAssistGlobalUserSettingRequest,
   ): Promise<CodeAssistGlobalUserSettingResponse> {
     return this.requestPost<CodeAssistGlobalUserSettingResponse>(
-      'setCodeAssistGlobalUserSetting',
+      "setCodeAssistGlobalUserSetting",
       req,
     );
   }
 
   async countTokens(req: CountTokensParameters): Promise<CountTokensResponse> {
     const resp = await this.requestPost<CaCountTokenResponse>(
-      'countTokens',
+      "countTokens",
       toCountTokenRequest(req),
     );
     return fromCountTokenResponse(resp);
   }
 
-  async embedContent(
-    _req: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(_req: EmbedContentParameters): Promise<EmbedContentResponse> {
     throw Error();
   }
 
-  async listExperiments(
-    metadata: ClientMetadata,
-  ): Promise<ListExperimentsResponse> {
+  async listExperiments(metadata: ClientMetadata): Promise<ListExperimentsResponse> {
     if (!this.projectId) {
-      throw new Error('projectId is not defined for CodeAssistServer.');
+      throw new Error("projectId is not defined for CodeAssistServer.");
     }
     const projectId = this.projectId;
     const req: ListExperimentsRequest = {
       project: projectId,
       metadata: { ...metadata, duetProject: projectId },
     };
-    return this.requestPost<ListExperimentsResponse>('listExperiments', req);
+    return this.requestPost<ListExperimentsResponse>("listExperiments", req);
   }
 
-  async retrieveUserQuota(
-    req: RetrieveUserQuotaRequest,
-  ): Promise<RetrieveUserQuotaResponse> {
-    return this.requestPost<RetrieveUserQuotaResponse>(
-      'retrieveUserQuota',
-      req,
-    );
+  async retrieveUserQuota(req: RetrieveUserQuotaRequest): Promise<RetrieveUserQuotaResponse> {
+    return this.requestPost<RetrieveUserQuotaResponse>("retrieveUserQuota", req);
   }
 
-  async requestPost<T>(
-    method: string,
-    req: object,
-    signal?: AbortSignal,
-  ): Promise<T> {
+  async requestPost<T>(method: string, req: object, signal?: AbortSignal): Promise<T> {
     const res = await this.client.request({
       url: this.getMethodUrl(method),
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         ...this.httpOptions.headers,
       },
-      responseType: 'json',
+      responseType: "json",
       body: JSON.stringify(req),
       signal,
     });
@@ -198,12 +160,12 @@ export class CodeAssistServer implements ContentGenerator {
   async requestGet<T>(method: string, signal?: AbortSignal): Promise<T> {
     const res = await this.client.request({
       url: this.getMethodUrl(method),
-      method: 'GET',
+      method: "GET",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         ...this.httpOptions.headers,
       },
-      responseType: 'json',
+      responseType: "json",
       signal,
     });
     return res.data as T;
@@ -216,15 +178,15 @@ export class CodeAssistServer implements ContentGenerator {
   ): Promise<AsyncGenerator<T>> {
     const res = await this.client.request({
       url: this.getMethodUrl(method),
-      method: 'POST',
+      method: "POST",
       params: {
-        alt: 'sse',
+        alt: "sse",
       },
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         ...this.httpOptions.headers,
       },
-      responseType: 'stream',
+      responseType: "stream",
       body: JSON.stringify(req),
       signal,
     });
@@ -237,13 +199,13 @@ export class CodeAssistServer implements ContentGenerator {
 
       let bufferedLines: string[] = [];
       for await (const line of rl) {
-        if (line.startsWith('data: ')) {
+        if (line.startsWith("data: ")) {
           bufferedLines.push(line.slice(6).trim());
-        } else if (line === '') {
+        } else if (line === "") {
           if (bufferedLines.length === 0) {
             continue; // no data to yield
           }
-          yield JSON.parse(bufferedLines.join('\n')) as T;
+          yield JSON.parse(bufferedLines.join("\n")) as T;
           bufferedLines = []; // Reset the buffer after yielding
         }
         // Ignore other lines like comments or id fields
@@ -252,26 +214,21 @@ export class CodeAssistServer implements ContentGenerator {
   }
 
   getMethodUrl(method: string): string {
-    const endpoint =
-      process.env['CODE_ASSIST_ENDPOINT'] ?? CODE_ASSIST_ENDPOINT;
+    const endpoint = process.env["CODE_ASSIST_ENDPOINT"] ?? CODE_ASSIST_ENDPOINT;
     return `${endpoint}/${CODE_ASSIST_API_VERSION}:${method}`;
   }
 }
 
 function isVpcScAffectedUser(error: unknown): boolean {
-  if (error && typeof error === 'object' && 'response' in error) {
+  if (error && typeof error === "object" && "response" in error) {
     const gaxiosError = error as {
       response?: {
         data?: unknown;
       };
     };
-    const response = gaxiosError.response?.data as
-      | GoogleRpcResponse
-      | undefined;
+    const response = gaxiosError.response?.data as GoogleRpcResponse | undefined;
     if (Array.isArray(response?.error?.details)) {
-      return response.error.details.some(
-        (detail) => detail.reason === 'SECURITY_POLICY_VIOLATED',
-      );
+      return response.error.details.some((detail) => detail.reason === "SECURITY_POLICY_VIOLATED");
     }
   }
   return false;
diff --git a/packages/gemini-cli-core/src/code_assist/setup.test.ts b/packages/gemini-cli-core/src/code_assist/setup.test.ts
index 54ad7f249..5f2d0812c 100644
--- a/packages/gemini-cli-core/src/code_assist/setup.test.ts
+++ b/packages/gemini-cli-core/src/code_assist/setup.test.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { setupUser, ProjectIdRequiredError } from './setup.js';
-import { CodeAssistServer } from '../code_assist/server.js';
-import type { OAuth2Client } from 'google-auth-library';
-import type { GeminiUserTier } from './types.js';
-import { UserTierId } from './types.js';
+import type { OAuth2Client } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { CodeAssistServer } from "../code_assist/server.js";
+import { ProjectIdRequiredError, setupUser } from "./setup.js";
+import type { GeminiUserTier } from "./types.js";
+import { UserTierId } from "./types.js";
 
-vi.mock('../code_assist/server.js');
+vi.mock("../code_assist/server.js");
 
 const mockPaidTier: GeminiUserTier = {
   id: UserTierId.STANDARD,
-  name: 'paid',
-  description: 'Paid tier',
+  name: "paid",
+  description: "Paid tier",
   isDefault: true,
 };
 
 const mockFreeTier: GeminiUserTier = {
   id: UserTierId.FREE,
-  name: 'free',
-  description: 'Free tier',
+  name: "free",
+  description: "Free tier",
   isDefault: true,
 };
 
-describe('setupUser for existing user', () => {
+describe("setupUser for existing user", () => {
   let mockLoad: ReturnType<typeof vi.fn>;
   let mockOnboardUser: ReturnType<typeof vi.fn>;
 
@@ -38,7 +38,7 @@ describe('setupUser for existing user', () => {
       done: true,
       response: {
         cloudaicompanionProject: {
-          id: 'server-project',
+          id: "server-project",
         },
       },
     });
@@ -55,55 +55,41 @@ describe('setupUser for existing user', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT when set and project from server is undefined', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should use GOOGLE_CLOUD_PROJECT when set and project from server is undefined", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
       currentTier: mockPaidTier,
     });
     await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      'test-project',
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, "test-project", {}, "", undefined);
   });
 
-  it('should ignore GOOGLE_CLOUD_PROJECT when project from server is set', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should ignore GOOGLE_CLOUD_PROJECT when project from server is set", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
-      cloudaicompanionProject: 'server-project',
+      cloudaicompanionProject: "server-project",
       currentTier: mockPaidTier,
     });
     const projectId = await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      'test-project',
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, "test-project", {}, "", undefined);
     expect(projectId).toEqual({
-      projectId: 'server-project',
-      userTier: 'standard-tier',
+      projectId: "server-project",
+      userTier: "standard-tier",
     });
   });
 
-  it('should throw ProjectIdRequiredError when no project ID is available', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+  it("should throw ProjectIdRequiredError when no project ID is available", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
     // And the server itself requires a project ID internally
     vi.mocked(CodeAssistServer).mockImplementation(() => {
       throw new ProjectIdRequiredError();
     });
 
-    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(
-      ProjectIdRequiredError,
-    );
+    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(ProjectIdRequiredError);
   });
 });
 
-describe('setupUser for new user', () => {
+describe("setupUser for new user", () => {
   let mockLoad: ReturnType<typeof vi.fn>;
   let mockOnboardUser: ReturnType<typeof vi.fn>;
 
@@ -114,7 +100,7 @@ describe('setupUser for new user', () => {
       done: true,
       response: {
         cloudaicompanionProject: {
-          id: 'server-project',
+          id: "server-project",
         },
       },
     });
@@ -131,67 +117,55 @@ describe('setupUser for new user', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT when set and onboard a new paid user', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should use GOOGLE_CLOUD_PROJECT when set and onboard a new paid user", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockPaidTier],
     });
     const userData = await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      'test-project',
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, "test-project", {}, "", undefined);
     expect(mockLoad).toHaveBeenCalled();
     expect(mockOnboardUser).toHaveBeenCalledWith({
-      tierId: 'standard-tier',
-      cloudaicompanionProject: 'test-project',
+      tierId: "standard-tier",
+      cloudaicompanionProject: "test-project",
       metadata: {
-        ideType: 'IDE_UNSPECIFIED',
-        platform: 'PLATFORM_UNSPECIFIED',
-        pluginType: 'GEMINI',
-        duetProject: 'test-project',
+        ideType: "IDE_UNSPECIFIED",
+        platform: "PLATFORM_UNSPECIFIED",
+        pluginType: "GEMINI",
+        duetProject: "test-project",
       },
     });
     expect(userData).toEqual({
-      projectId: 'server-project',
-      userTier: 'standard-tier',
+      projectId: "server-project",
+      userTier: "standard-tier",
     });
   });
 
-  it('should onboard a new free user when GOOGLE_CLOUD_PROJECT is not set', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+  it("should onboard a new free user when GOOGLE_CLOUD_PROJECT is not set", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockFreeTier],
     });
     const userData = await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      undefined,
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, undefined, {}, "", undefined);
     expect(mockLoad).toHaveBeenCalled();
     expect(mockOnboardUser).toHaveBeenCalledWith({
-      tierId: 'free-tier',
+      tierId: "free-tier",
       cloudaicompanionProject: undefined,
       metadata: {
-        ideType: 'IDE_UNSPECIFIED',
-        platform: 'PLATFORM_UNSPECIFIED',
-        pluginType: 'GEMINI',
+        ideType: "IDE_UNSPECIFIED",
+        platform: "PLATFORM_UNSPECIFIED",
+        pluginType: "GEMINI",
       },
     });
     expect(userData).toEqual({
-      projectId: 'server-project',
-      userTier: 'free-tier',
+      projectId: "server-project",
+      userTier: "free-tier",
     });
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT when onboard response has no project ID', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should use GOOGLE_CLOUD_PROJECT when onboard response has no project ID", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockPaidTier],
     });
@@ -203,13 +177,13 @@ describe('setupUser for new user', () => {
     });
     const userData = await setupUser({} as OAuth2Client);
     expect(userData).toEqual({
-      projectId: 'test-project',
-      userTier: 'standard-tier',
+      projectId: "test-project",
+      userTier: "standard-tier",
     });
   });
 
-  it('should throw ProjectIdRequiredError when no project ID is available', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+  it("should throw ProjectIdRequiredError when no project ID is available", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockPaidTier],
     });
@@ -217,8 +191,6 @@ describe('setupUser for new user', () => {
       done: true,
       response: {},
     });
-    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(
-      ProjectIdRequiredError,
-    );
+    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(ProjectIdRequiredError);
   });
 });
diff --git a/packages/gemini-cli-core/src/code_assist/setup.ts b/packages/gemini-cli-core/src/code_assist/setup.ts
index d33c019d6..6ff0ec6df 100644
--- a/packages/gemini-cli-core/src/code_assist/setup.ts
+++ b/packages/gemini-cli-core/src/code_assist/setup.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { AuthClient } from "google-auth-library";
+import { CodeAssistServer } from "./server.js";
 import type {
   ClientMetadata,
   GeminiUserTier,
   LoadCodeAssistResponse,
   OnboardUserRequest,
-} from './types.js';
-import { UserTierId } from './types.js';
-import { CodeAssistServer } from './server.js';
-import type { AuthClient } from 'google-auth-library';
+} from "./types.js";
+import { UserTierId } from "./types.js";
 
 export class ProjectIdRequiredError extends Error {
   constructor() {
     super(
-      'This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID env var. See https://goo.gle/gemini-cli-auth-docs#workspace-gca',
+      "This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID env var. See https://goo.gle/gemini-cli-auth-docs#workspace-gca",
     );
   }
 }
@@ -34,14 +34,12 @@ export interface UserData {
  */
 export async function setupUser(client: AuthClient): Promise<UserData> {
   const projectId =
-    process.env['GOOGLE_CLOUD_PROJECT'] ||
-    process.env['GOOGLE_CLOUD_PROJECT_ID'] ||
-    undefined;
-  const caServer = new CodeAssistServer(client, projectId, {}, '', undefined);
+    process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || undefined;
+  const caServer = new CodeAssistServer(client, projectId, {}, "", undefined);
   const coreClientMetadata: ClientMetadata = {
-    ideType: 'IDE_UNSPECIFIED',
-    platform: 'PLATFORM_UNSPECIFIED',
-    pluginType: 'GEMINI',
+    ideType: "IDE_UNSPECIFIED",
+    platform: "PLATFORM_UNSPECIFIED",
+    pluginType: "GEMINI",
   };
 
   const loadRes = await caServer.loadCodeAssist({
@@ -119,8 +117,8 @@ function getOnboardTier(res: LoadCodeAssistResponse): GeminiUserTier {
     }
   }
   return {
-    name: '',
-    description: '',
+    name: "",
+    description: "",
     id: UserTierId.LEGACY,
     userDefinedCloudaicompanionProject: true,
   };
diff --git a/packages/gemini-cli-core/src/code_assist/types.ts b/packages/gemini-cli-core/src/code_assist/types.ts
index 36e2f3f2f..2ecb19a45 100644
--- a/packages/gemini-cli-core/src/code_assist/types.ts
+++ b/packages/gemini-cli-core/src/code_assist/types.ts
@@ -16,26 +16,26 @@ export interface ClientMetadata {
 }
 
 export type ClientMetadataIdeType =
-  | 'IDE_UNSPECIFIED'
-  | 'VSCODE'
-  | 'INTELLIJ'
-  | 'VSCODE_CLOUD_WORKSTATION'
-  | 'INTELLIJ_CLOUD_WORKSTATION'
-  | 'CLOUD_SHELL'
-  | 'GEMINI_CLI';
+  | "IDE_UNSPECIFIED"
+  | "VSCODE"
+  | "INTELLIJ"
+  | "VSCODE_CLOUD_WORKSTATION"
+  | "INTELLIJ_CLOUD_WORKSTATION"
+  | "CLOUD_SHELL"
+  | "GEMINI_CLI";
 export type ClientMetadataPlatform =
-  | 'PLATFORM_UNSPECIFIED'
-  | 'DARWIN_AMD64'
-  | 'DARWIN_ARM64'
-  | 'LINUX_AMD64'
-  | 'LINUX_ARM64'
-  | 'WINDOWS_AMD64';
+  | "PLATFORM_UNSPECIFIED"
+  | "DARWIN_AMD64"
+  | "DARWIN_ARM64"
+  | "LINUX_AMD64"
+  | "LINUX_ARM64"
+  | "WINDOWS_AMD64";
 export type ClientMetadataPluginType =
-  | 'PLUGIN_UNSPECIFIED'
-  | 'CLOUD_CODE'
-  | 'GEMINI'
-  | 'AIPLUGIN_INTELLIJ'
-  | 'AIPLUGIN_STUDIO';
+  | "PLUGIN_UNSPECIFIED"
+  | "CLOUD_CODE"
+  | "GEMINI"
+  | "AIPLUGIN_INTELLIJ"
+  | "AIPLUGIN_STUDIO";
 
 export interface LoadCodeAssistRequest {
   cloudaicompanionProject?: string;
@@ -88,14 +88,14 @@ export interface IneligibleTier {
  */
 export enum IneligibleTierReasonCode {
   // go/keep-sorted start
-  DASHER_USER = 'DASHER_USER',
-  INELIGIBLE_ACCOUNT = 'INELIGIBLE_ACCOUNT',
-  NON_USER_ACCOUNT = 'NON_USER_ACCOUNT',
-  RESTRICTED_AGE = 'RESTRICTED_AGE',
-  RESTRICTED_NETWORK = 'RESTRICTED_NETWORK',
-  UNKNOWN = 'UNKNOWN',
-  UNKNOWN_LOCATION = 'UNKNOWN_LOCATION',
-  UNSUPPORTED_LOCATION = 'UNSUPPORTED_LOCATION',
+  DASHER_USER = "DASHER_USER",
+  INELIGIBLE_ACCOUNT = "INELIGIBLE_ACCOUNT",
+  NON_USER_ACCOUNT = "NON_USER_ACCOUNT",
+  RESTRICTED_AGE = "RESTRICTED_AGE",
+  RESTRICTED_NETWORK = "RESTRICTED_NETWORK",
+  UNKNOWN = "UNKNOWN",
+  UNKNOWN_LOCATION = "UNKNOWN_LOCATION",
+  UNSUPPORTED_LOCATION = "UNSUPPORTED_LOCATION",
   // go/keep-sorted end
 }
 /**
@@ -104,9 +104,9 @@ export enum IneligibleTierReasonCode {
  * //depot/google3/cloud/developer_experience/cloudcode/pa/service/usertier.go;l=16
  */
 export enum UserTierId {
-  FREE = 'free-tier',
-  LEGACY = 'legacy-tier',
-  STANDARD = 'standard-tier',
+  FREE = "free-tier",
+  LEGACY = "legacy-tier",
+  STANDARD = "standard-tier",
 }
 
 /**
@@ -155,10 +155,10 @@ export interface OnboardUserResponse {
  * Error value is an additional value assigned to error responses from OnboardUser
  */
 export enum OnboardUserStatusCode {
-  Default = 'DEFAULT',
-  Notice = 'NOTICE',
-  Warning = 'WARNING',
-  Error = 'ERROR',
+  Default = "DEFAULT",
+  Notice = "NOTICE",
+  Warning = "WARNING",
+  Error = "ERROR",
 }
 
 /**
diff --git a/packages/gemini-cli-core/src/commands/extensions.test.ts b/packages/gemini-cli-core/src/commands/extensions.test.ts
index cc53123d5..55341da53 100644
--- a/packages/gemini-cli-core/src/commands/extensions.test.ts
+++ b/packages/gemini-cli-core/src/commands/extensions.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { listExtensions } from './extensions.js';
-import type { Config } from '../config/config.js';
+import { describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { listExtensions } from "./extensions.js";
 
-describe('listExtensions', () => {
-  it('should call config.getExtensions and return the result', () => {
-    const mockExtensions = [{ name: 'ext1' }, { name: 'ext2' }];
+describe("listExtensions", () => {
+  it("should call config.getExtensions and return the result", () => {
+    const mockExtensions = [{ name: "ext1" }, { name: "ext2" }];
     const mockConfig = {
       getExtensions: vi.fn().mockReturnValue(mockExtensions),
     } as unknown as Config;
diff --git a/packages/gemini-cli-core/src/commands/extensions.ts b/packages/gemini-cli-core/src/commands/extensions.ts
index c18593e64..789e64218 100644
--- a/packages/gemini-cli-core/src/commands/extensions.ts
+++ b/packages/gemini-cli-core/src/commands/extensions.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
 
 export function listExtensions(config: Config) {
   return config.getExtensions();
diff --git a/packages/gemini-cli-core/src/commands/restore.test.ts b/packages/gemini-cli-core/src/commands/restore.test.ts
index 4dcba5dd8..ae07111a8 100644
--- a/packages/gemini-cli-core/src/commands/restore.test.ts
+++ b/packages/gemini-cli-core/src/commands/restore.test.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { performRestore } from './restore.js';
-import { type ToolCallData } from '../utils/checkpointUtils.js';
-import type { GitService } from '../services/gitService.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { GitService } from "../services/gitService.js";
+import { type ToolCallData } from "../utils/checkpointUtils.js";
+import { performRestore } from "./restore.js";
 
-describe('performRestore', () => {
+describe("performRestore", () => {
   let mockGitService: GitService;
 
   beforeEach(() => {
@@ -21,23 +21,23 @@ describe('performRestore', () => {
       createFileSnapshot: vi.fn(),
       restoreProjectFromSnapshot: vi.fn(),
       storage: {},
-      getHistoryDir: vi.fn().mockReturnValue('mock-history-dir'),
+      getHistoryDir: vi.fn().mockReturnValue("mock-history-dir"),
       shadowGitRepository: {},
     } as unknown as GitService;
   });
 
-  it('should yield load_history if history and clientHistory are present', async () => {
+  it("should yield load_history if history and clientHistory are present", async () => {
     const toolCallData: ToolCallData = {
-      toolCall: { name: 'test', args: {} },
-      history: [{ some: 'history' }],
-      clientHistory: [{ role: 'user', parts: [{ text: 'hello' }] }],
+      toolCall: { name: "test", args: {} },
+      history: [{ some: "history" }],
+      clientHistory: [{ role: "user", parts: [{ text: "hello" }] }],
     };
 
     const generator = performRestore(toolCallData, undefined);
     const result = await generator.next();
 
     expect(result.value).toEqual({
-      type: 'load_history',
+      type: "load_history",
       history: toolCallData.history,
       clientHistory: toolCallData.clientHistory,
     });
@@ -47,23 +47,21 @@ describe('performRestore', () => {
     expect(nextResult.done).toBe(true);
   });
 
-  it('should call restoreProjectFromSnapshot and yield a message if commitHash and gitService are present', async () => {
+  it("should call restoreProjectFromSnapshot and yield a message if commitHash and gitService are present", async () => {
     const toolCallData: ToolCallData = {
-      toolCall: { name: 'test', args: {} },
-      commitHash: 'test-commit-hash',
+      toolCall: { name: "test", args: {} },
+      commitHash: "test-commit-hash",
     };
-    const spy = vi
-      .spyOn(mockGitService, 'restoreProjectFromSnapshot')
-      .mockResolvedValue(undefined);
+    const spy = vi.spyOn(mockGitService, "restoreProjectFromSnapshot").mockResolvedValue(undefined);
 
     const generator = performRestore(toolCallData, mockGitService);
     const result = await generator.next();
 
-    expect(spy).toHaveBeenCalledWith('test-commit-hash');
+    expect(spy).toHaveBeenCalledWith("test-commit-hash");
     expect(result.value).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'Restored project to the state before the tool call.',
+      type: "message",
+      messageType: "info",
+      content: "Restored project to the state before the tool call.",
     });
     expect(result.done).toBe(false);
 
@@ -73,22 +71,20 @@ describe('performRestore', () => {
 
   it('should yield an error message if restoreProjectFromSnapshot throws "unable to read tree" error', async () => {
     const toolCallData: ToolCallData = {
-      toolCall: { name: 'test', args: {} },
-      commitHash: 'invalid-commit-hash',
+      toolCall: { name: "test", args: {} },
+      commitHash: "invalid-commit-hash",
     };
     const spy = vi
-      .spyOn(mockGitService, 'restoreProjectFromSnapshot')
-      .mockRejectedValue(
-        new Error('fatal: unable to read tree invalid-commit-hash'),
-      );
+      .spyOn(mockGitService, "restoreProjectFromSnapshot")
+      .mockRejectedValue(new Error("fatal: unable to read tree invalid-commit-hash"));
 
     const generator = performRestore(toolCallData, mockGitService);
     const result = await generator.next();
 
-    expect(spy).toHaveBeenCalledWith('invalid-commit-hash');
+    expect(spy).toHaveBeenCalledWith("invalid-commit-hash");
     expect(result.value).toEqual({
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content:
         "The commit hash 'invalid-commit-hash' associated with this checkpoint could not be found in your Git repository. This can happen if the repository has been re-cloned, reset, or if old commits have been garbage collected. This checkpoint cannot be restored.",
     });
@@ -98,47 +94,43 @@ describe('performRestore', () => {
     expect(nextResult.done).toBe(true);
   });
 
-  it('should re-throw other errors from restoreProjectFromSnapshot', async () => {
+  it("should re-throw other errors from restoreProjectFromSnapshot", async () => {
     const toolCallData: ToolCallData = {
-      toolCall: { name: 'test', args: {} },
-      commitHash: 'some-commit-hash',
+      toolCall: { name: "test", args: {} },
+      commitHash: "some-commit-hash",
     };
-    const testError = new Error('something went wrong');
-    vi.spyOn(mockGitService, 'restoreProjectFromSnapshot').mockRejectedValue(
-      testError,
-    );
+    const testError = new Error("something went wrong");
+    vi.spyOn(mockGitService, "restoreProjectFromSnapshot").mockRejectedValue(testError);
 
     const generator = performRestore(toolCallData, mockGitService);
     await expect(generator.next()).rejects.toThrow(testError);
   });
 
-  it('should yield load_history then a message if both are present', async () => {
+  it("should yield load_history then a message if both are present", async () => {
     const toolCallData: ToolCallData = {
-      toolCall: { name: 'test', args: {} },
-      history: [{ some: 'history' }],
-      clientHistory: [{ role: 'user', parts: [{ text: 'hello' }] }],
-      commitHash: 'test-commit-hash',
+      toolCall: { name: "test", args: {} },
+      history: [{ some: "history" }],
+      clientHistory: [{ role: "user", parts: [{ text: "hello" }] }],
+      commitHash: "test-commit-hash",
     };
-    const spy = vi
-      .spyOn(mockGitService, 'restoreProjectFromSnapshot')
-      .mockResolvedValue(undefined);
+    const spy = vi.spyOn(mockGitService, "restoreProjectFromSnapshot").mockResolvedValue(undefined);
 
     const generator = performRestore(toolCallData, mockGitService);
 
     const historyResult = await generator.next();
     expect(historyResult.value).toEqual({
-      type: 'load_history',
+      type: "load_history",
       history: toolCallData.history,
       clientHistory: toolCallData.clientHistory,
     });
     expect(historyResult.done).toBe(false);
 
     const messageResult = await generator.next();
-    expect(spy).toHaveBeenCalledWith('test-commit-hash');
+    expect(spy).toHaveBeenCalledWith("test-commit-hash");
     expect(messageResult.value).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'Restored project to the state before the tool call.',
+      type: "message",
+      messageType: "info",
+      content: "Restored project to the state before the tool call.",
     });
     expect(messageResult.done).toBe(false);
 
@@ -146,20 +138,20 @@ describe('performRestore', () => {
     expect(nextResult.done).toBe(true);
   });
 
-  it('should yield error message if commitHash is present but gitService is undefined', async () => {
+  it("should yield error message if commitHash is present but gitService is undefined", async () => {
     const toolCallData: ToolCallData = {
-      toolCall: { name: 'test', args: {} },
-      commitHash: 'test-commit-hash',
+      toolCall: { name: "test", args: {} },
+      commitHash: "test-commit-hash",
     };
 
     const generator = performRestore(toolCallData, undefined);
     const result = await generator.next();
 
     expect(result.value).toEqual({
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content:
-        'Git service is not available, cannot restore checkpoint. Please ensure you are in a git repository.',
+        "Git service is not available, cannot restore checkpoint. Please ensure you are in a git repository.",
     });
     expect(result.done).toBe(false);
 
diff --git a/packages/gemini-cli-core/src/commands/restore.ts b/packages/gemini-cli-core/src/commands/restore.ts
index 06c201384..0ea2fb093 100644
--- a/packages/gemini-cli-core/src/commands/restore.ts
+++ b/packages/gemini-cli-core/src/commands/restore.ts
@@ -4,20 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GitService } from '../services/gitService.js';
-import type { CommandActionReturn } from './types.js';
-import { type ToolCallData } from '../utils/checkpointUtils.js';
+import type { GitService } from "../services/gitService.js";
+import { type ToolCallData } from "../utils/checkpointUtils.js";
+import type { CommandActionReturn } from "./types.js";
 
-export async function* performRestore<
-  HistoryType = unknown,
-  ArgsType = unknown,
->(
+export async function* performRestore<HistoryType = unknown, ArgsType = unknown>(
   toolCallData: ToolCallData<HistoryType, ArgsType>,
   gitService: GitService | undefined,
 ): AsyncGenerator<CommandActionReturn<HistoryType>> {
   if (toolCallData.history && toolCallData.clientHistory) {
     yield {
-      type: 'load_history',
+      type: "load_history",
       history: toolCallData.history,
       clientHistory: toolCallData.clientHistory,
     };
@@ -26,10 +23,10 @@ export async function* performRestore<
   if (toolCallData.commitHash) {
     if (!gitService) {
       yield {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content:
-          'Git service is not available, cannot restore checkpoint. Please ensure you are in a git repository.',
+          "Git service is not available, cannot restore checkpoint. Please ensure you are in a git repository.",
       };
       return;
     }
@@ -37,16 +34,16 @@ export async function* performRestore<
     try {
       await gitService.restoreProjectFromSnapshot(toolCallData.commitHash);
       yield {
-        type: 'message',
-        messageType: 'info',
-        content: 'Restored project to the state before the tool call.',
+        type: "message",
+        messageType: "info",
+        content: "Restored project to the state before the tool call.",
       };
     } catch (e) {
       const error = e as Error;
-      if (error.message.includes('unable to read tree')) {
+      if (error.message.includes("unable to read tree")) {
         yield {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: `The commit hash '${toolCallData.commitHash}' associated with this checkpoint could not be found in your Git repository. This can happen if the repository has been re-cloned, reset, or if old commits have been garbage collected. This checkpoint cannot be restored.`,
         };
         return;
diff --git a/packages/gemini-cli-core/src/commands/types.ts b/packages/gemini-cli-core/src/commands/types.ts
index 31491a27b..690a97233 100644
--- a/packages/gemini-cli-core/src/commands/types.ts
+++ b/packages/gemini-cli-core/src/commands/types.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content, PartListUnion } from '@google/genai';
+import type { Content, PartListUnion } from "@google/genai";
 /**
  * The return type for a command action that results in scheduling a tool call.
  */
 export interface ToolActionReturn {
-  type: 'tool';
+  type: "tool";
   toolName: string;
   toolArgs: Record<string, unknown>;
 }
@@ -19,8 +19,8 @@ export interface ToolActionReturn {
  * being displayed to the user.
  */
 export interface MessageActionReturn {
-  type: 'message';
-  messageType: 'info' | 'error';
+  type: "message";
+  messageType: "info" | "error";
   content: string;
 }
 
@@ -29,7 +29,7 @@ export interface MessageActionReturn {
  * the entire conversation history.
  */
 export interface LoadHistoryActionReturn<HistoryType = unknown> {
-  type: 'load_history';
+  type: "load_history";
   history: HistoryType;
   clientHistory: Content[]; // The history for the generative client
 }
@@ -39,7 +39,7 @@ export interface LoadHistoryActionReturn<HistoryType = unknown> {
  * content as a prompt to the Gemini model.
  */
 export interface SubmitPromptActionReturn {
-  type: 'submit_prompt';
+  type: "submit_prompt";
   content: PartListUnion;
 }
 
diff --git a/packages/gemini-cli-core/src/config/config.test.ts b/packages/gemini-cli-core/src/config/config.test.ts
index 2c5115196..3a9b80cf4 100644
--- a/packages/gemini-cli-core/src/config/config.test.ts
+++ b/packages/gemini-cli-core/src/config/config.test.ts
@@ -4,39 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Mock } from 'vitest';
-import type { ConfigParameters, SandboxConfig } from './config.js';
-import { Config, DEFAULT_FILE_FILTERING_OPTIONS } from './config.js';
-import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { ApprovalMode } from '../policy/types.js';
-import type { HookDefinition } from '../hooks/types.js';
-import { HookType, HookEventName } from '../hooks/types.js';
-import * as path from 'node:path';
-import { setGeminiMdFilename as mockSetGeminiMdFilename } from '../tools/memoryTool.js';
-import {
-  DEFAULT_TELEMETRY_TARGET,
-  DEFAULT_OTLP_ENDPOINT,
-} from '../telemetry/index.js';
-import type { ContentGeneratorConfig } from '../core/contentGenerator.js';
-import {
-  AuthType,
-  createContentGeneratorConfig,
-} from '../core/contentGenerator.js';
-import { GeminiClient } from '../core/client.js';
-import { GitService } from '../services/gitService.js';
-import { ShellTool } from '../tools/shell.js';
-import { ReadFileTool } from '../tools/read-file.js';
-import { GrepTool } from '../tools/grep.js';
-import { RipGrepTool, canUseRipgrep } from '../tools/ripGrep.js';
-import { logRipgrepFallback } from '../telemetry/loggers.js';
-import { RipgrepFallbackEvent } from '../telemetry/types.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { DEFAULT_MODEL_CONFIGS } from './defaultModelConfigs.js';
-
-vi.mock('fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs')>();
+import * as path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ExperimentFlags } from "../code_assist/experiments/flagNames.js";
+import { GeminiClient } from "../core/client.js";
+import type { ContentGeneratorConfig } from "../core/contentGenerator.js";
+import { AuthType, createContentGeneratorConfig } from "../core/contentGenerator.js";
+import type { HookDefinition } from "../hooks/types.js";
+import { HookEventName, HookType } from "../hooks/types.js";
+import { ApprovalMode } from "../policy/types.js";
+import { GitService } from "../services/gitService.js";
+import { DEFAULT_OTLP_ENDPOINT, DEFAULT_TELEMETRY_TARGET } from "../telemetry/index.js";
+import { logRipgrepFallback } from "../telemetry/loggers.js";
+import { RipgrepFallbackEvent } from "../telemetry/types.js";
+import { GrepTool } from "../tools/grep.js";
+import { setGeminiMdFilename as mockSetGeminiMdFilename } from "../tools/memoryTool.js";
+import { ReadFileTool } from "../tools/read-file.js";
+import { canUseRipgrep, RipGrepTool } from "../tools/ripGrep.js";
+import { ShellTool } from "../tools/shell.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { ConfigParameters, SandboxConfig } from "./config.js";
+import { Config, DEFAULT_FILE_FILTERING_OPTIONS } from "./config.js";
+import { DEFAULT_MODEL_CONFIGS } from "./defaultModelConfigs.js";
+
+vi.mock("fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("fs")>();
   return {
     ...actual,
     existsSync: vi.fn().mockReturnValue(true),
@@ -48,7 +42,7 @@ vi.mock('fs', async (importOriginal) => {
 });
 
 // Mock dependencies that might be called during Config construction or createServerConfig
-vi.mock('../tools/tool-registry', () => {
+vi.mock("../tools/tool-registry", () => {
   const ToolRegistryMock = vi.fn();
   ToolRegistryMock.prototype.registerTool = vi.fn();
   ToolRegistryMock.prototype.discoverAllTools = vi.fn();
@@ -59,43 +53,43 @@ vi.mock('../tools/tool-registry', () => {
   return { ToolRegistry: ToolRegistryMock };
 });
 
-vi.mock('../utils/memoryDiscovery.js', () => ({
+vi.mock("../utils/memoryDiscovery.js", () => ({
   loadServerHierarchicalMemory: vi.fn(),
 }));
 
 // Mock individual tools if their constructors are complex or have side effects
-vi.mock('../tools/ls');
-vi.mock('../tools/read-file');
-vi.mock('../tools/grep.js');
-vi.mock('../tools/ripGrep.js', () => ({
+vi.mock("../tools/ls");
+vi.mock("../tools/read-file");
+vi.mock("../tools/grep.js");
+vi.mock("../tools/ripGrep.js", () => ({
   canUseRipgrep: vi.fn(),
   RipGrepTool: class MockRipGrepTool {},
 }));
-vi.mock('../tools/glob');
-vi.mock('../tools/edit');
-vi.mock('../tools/shell');
-vi.mock('../tools/write-file');
-vi.mock('../tools/web-fetch');
-vi.mock('../tools/read-many-files');
-vi.mock('../tools/memoryTool', () => ({
+vi.mock("../tools/glob");
+vi.mock("../tools/edit");
+vi.mock("../tools/shell");
+vi.mock("../tools/write-file");
+vi.mock("../tools/web-fetch");
+vi.mock("../tools/read-many-files");
+vi.mock("../tools/memoryTool", () => ({
   MemoryTool: vi.fn(),
   setGeminiMdFilename: vi.fn(),
-  getCurrentGeminiMdFilename: vi.fn(() => 'GEMINI.md'), // Mock the original filename
-  DEFAULT_CONTEXT_FILENAME: 'GEMINI.md',
-  GEMINI_DIR: '.gemini',
+  getCurrentGeminiMdFilename: vi.fn(() => "GEMINI.md"), // Mock the original filename
+  DEFAULT_CONTEXT_FILENAME: "GEMINI.md",
+  GEMINI_DIR: ".gemini",
 }));
 
-vi.mock('../core/contentGenerator.js');
+vi.mock("../core/contentGenerator.js");
 
-vi.mock('../core/client.js', () => ({
+vi.mock("../core/client.js", () => ({
   GeminiClient: vi.fn().mockImplementation(() => ({
     initialize: vi.fn().mockResolvedValue(undefined),
     stripThoughtsFromHistory: vi.fn(),
   })),
 }));
 
-vi.mock('../telemetry/index.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../telemetry/index.js')>();
+vi.mock("../telemetry/index.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../telemetry/index.js")>();
   return {
     ...actual,
     initializeTelemetry: vi.fn(),
@@ -105,22 +99,21 @@ vi.mock('../telemetry/index.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../telemetry/loggers.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../telemetry/loggers.js')>();
+vi.mock("../telemetry/loggers.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../telemetry/loggers.js")>();
   return {
     ...actual,
     logRipgrepFallback: vi.fn(),
   };
 });
 
-vi.mock('../services/gitService.js', () => {
+vi.mock("../services/gitService.js", () => {
   const GitServiceMock = vi.fn();
   GitServiceMock.prototype.initialize = vi.fn();
   return { GitService: GitServiceMock };
 });
 
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn().mockResolvedValue({
       getConnectionStatus: vi.fn(),
@@ -130,7 +123,7 @@ vi.mock('../ide/ide-client.js', () => ({
   },
 }));
 
-vi.mock('../agents/registry.js', () => {
+vi.mock("../agents/registry.js", () => {
   const AgentRegistryMock = vi.fn();
   AgentRegistryMock.prototype.initialize = vi.fn();
   AgentRegistryMock.prototype.getAllDefinitions = vi.fn(() => []);
@@ -138,11 +131,11 @@ vi.mock('../agents/registry.js', () => {
   return { AgentRegistry: AgentRegistryMock };
 });
 
-vi.mock('../agents/delegate-to-agent-tool.js', () => ({
+vi.mock("../agents/delegate-to-agent-tool.js", () => ({
   DelegateToAgentTool: vi.fn(),
 }));
 
-vi.mock('../resources/resource-registry.js', () => ({
+vi.mock("../resources/resource-registry.js", () => ({
   ResourceRegistry: vi.fn(),
 }));
 
@@ -154,43 +147,43 @@ const mockCoreEvents = vi.hoisted(() => ({
 
 const mockSetGlobalProxy = vi.hoisted(() => vi.fn());
 
-vi.mock('../utils/events.js', () => ({
+vi.mock("../utils/events.js", () => ({
   coreEvents: mockCoreEvents,
 }));
 
-vi.mock('../utils/fetch.js', () => ({
+vi.mock("../utils/fetch.js", () => ({
   setGlobalProxy: mockSetGlobalProxy,
 }));
 
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import { uiTelemetryService } from '../telemetry/index.js';
-import { getCodeAssistServer } from '../code_assist/codeAssist.js';
-import { getExperiments } from '../code_assist/experiments/experiments.js';
-import type { CodeAssistServer } from '../code_assist/server.js';
+import { getCodeAssistServer } from "../code_assist/codeAssist.js";
+import { getExperiments } from "../code_assist/experiments/experiments.js";
+import type { CodeAssistServer } from "../code_assist/server.js";
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import { uiTelemetryService } from "../telemetry/index.js";
 
-vi.mock('../core/baseLlmClient.js');
-vi.mock('../core/tokenLimits.js', () => ({
+vi.mock("../core/baseLlmClient.js");
+vi.mock("../core/tokenLimits.js", () => ({
   tokenLimit: vi.fn(),
 }));
-vi.mock('../code_assist/codeAssist.js');
-vi.mock('../code_assist/experiments/experiments.js');
+vi.mock("../code_assist/codeAssist.js");
+vi.mock("../code_assist/experiments/experiments.js");
 
-describe('Server Config (config.ts)', () => {
-  const MODEL = 'gemini-pro';
+describe("Server Config (config.ts)", () => {
+  const MODEL = "gemini-pro";
   const SANDBOX: SandboxConfig = {
-    command: 'docker',
-    image: 'gemini-cli-sandbox',
+    command: "docker",
+    image: "gemini-cli-sandbox",
   };
-  const TARGET_DIR = '/path/to/target';
+  const TARGET_DIR = "/path/to/target";
   const DEBUG_MODE = false;
-  const QUESTION = 'test question';
-  const USER_MEMORY = 'Test User Memory';
+  const QUESTION = "test question";
+  const USER_MEMORY = "Test User Memory";
   const TELEMETRY_SETTINGS = { enabled: false };
-  const EMBEDDING_MODEL = 'gemini-embedding';
-  const SESSION_ID = 'test-session-id';
+  const EMBEDDING_MODEL = "gemini-embedding";
+  const SESSION_ID = "test-session-id";
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
+    cwd: "/tmp",
     embeddingModel: EMBEDDING_MODEL,
     sandbox: SANDBOX,
     targetDir: TARGET_DIR,
@@ -208,9 +201,9 @@ describe('Server Config (config.ts)', () => {
     vi.clearAllMocks();
   });
 
-  describe('initialize', () => {
-    it('should throw an error if checkpointing is enabled and GitService fails', async () => {
-      const gitError = new Error('Git is not installed');
+  describe("initialize", () => {
+    it("should throw an error if checkpointing is enabled and GitService fails", async () => {
+      const gitError = new Error("Git is not installed");
       (GitService.prototype.initialize as Mock).mockRejectedValue(gitError);
 
       const config = new Config({
@@ -221,8 +214,8 @@ describe('Server Config (config.ts)', () => {
       await expect(config.initialize()).rejects.toThrow(gitError);
     });
 
-    it('should not throw an error if checkpointing is disabled and GitService fails', async () => {
-      const gitError = new Error('Git is not installed');
+    it("should not throw an error if checkpointing is disabled and GitService fails", async () => {
+      const gitError = new Error("Git is not installed");
       (GitService.prototype.initialize as Mock).mockRejectedValue(gitError);
 
       const config = new Config({
@@ -233,20 +226,18 @@ describe('Server Config (config.ts)', () => {
       await expect(config.initialize()).resolves.toBeUndefined();
     });
 
-    it('should throw an error if initialized more than once', async () => {
+    it("should throw an error if initialized more than once", async () => {
       const config = new Config({
         ...baseParams,
         checkpointing: false,
       });
 
       await expect(config.initialize()).resolves.toBeUndefined();
-      await expect(config.initialize()).rejects.toThrow(
-        'Config was already initialized',
-      );
+      await expect(config.initialize()).rejects.toThrow("Config was already initialized");
     });
 
-    describe('getCompressionThreshold', () => {
-      it('should return the local compression threshold if it is set', async () => {
+    describe("getCompressionThreshold", () => {
+      it("should return the local compression threshold if it is set", async () => {
         const config = new Config({
           ...baseParams,
           compressionThreshold: 0.5,
@@ -254,7 +245,7 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getCompressionThreshold()).toBe(0.5);
       });
 
-      it('should return the remote experiment threshold if it is a positive number', async () => {
+      it("should return the remote experiment threshold if it is a positive number", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -268,7 +259,7 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getCompressionThreshold()).toBe(0.8);
       });
 
-      it('should return undefined if the remote experiment threshold is 0', async () => {
+      it("should return undefined if the remote experiment threshold is 0", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -282,14 +273,14 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getCompressionThreshold()).toBeUndefined();
       });
 
-      it('should return undefined if there are no experiments', async () => {
+      it("should return undefined if there are no experiments", async () => {
         const config = new Config(baseParams);
         expect(await config.getCompressionThreshold()).toBeUndefined();
       });
     });
 
-    describe('getUserCaching', () => {
-      it('should return the remote experiment flag when available', async () => {
+    describe("getUserCaching", () => {
+      it("should return the remote experiment flag when available", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -304,7 +295,7 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getUserCaching()).toBe(true);
       });
 
-      it('should return false when the remote flag is false', async () => {
+      it("should return false when the remote flag is false", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -319,24 +310,22 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getUserCaching()).toBe(false);
       });
 
-      it('should return undefined if there are no experiments', async () => {
+      it("should return undefined if there are no experiments", async () => {
         const config = new Config(baseParams);
         expect(await config.getUserCaching()).toBeUndefined();
       });
     });
   });
 
-  describe('refreshAuth', () => {
-    it('should refresh auth and update config', async () => {
+  describe("refreshAuth", () => {
+    it("should refresh auth and update config", async () => {
       const config = new Config(baseParams);
       const authType = AuthType.USE_GEMINI;
       const mockContentConfig = {
-        apiKey: 'test-key',
+        apiKey: "test-key",
       };
 
-      vi.mocked(createContentGeneratorConfig).mockResolvedValue(
-        mockContentConfig,
-      );
+      vi.mocked(createContentGeneratorConfig).mockResolvedValue(mockContentConfig);
 
       // Set fallback mode to true to ensure it gets reset
       config.setFallbackMode(true);
@@ -344,10 +333,7 @@ describe('Server Config (config.ts)', () => {
 
       await config.refreshAuth(authType);
 
-      expect(createContentGeneratorConfig).toHaveBeenCalledWith(
-        config,
-        authType,
-      );
+      expect(createContentGeneratorConfig).toHaveBeenCalledWith(config, authType);
       // Verify that contentGeneratorConfig is updated
       expect(config.getContentGeneratorConfig()).toEqual(mockContentConfig);
       expect(GeminiClient).toHaveBeenCalledWith(config);
@@ -355,10 +341,10 @@ describe('Server Config (config.ts)', () => {
       expect(config.isInFallbackMode()).toBe(false);
     });
 
-    it('should reset model availability status', async () => {
+    it("should reset model availability status", async () => {
       const config = new Config(baseParams);
       const service = config.getModelAvailabilityService();
-      const spy = vi.spyOn(service, 'reset');
+      const spy = vi.spyOn(service, "reset");
 
       vi.mocked(createContentGeneratorConfig).mockImplementation(
         async (_: Config, authType: AuthType | undefined) =>
@@ -370,7 +356,7 @@ describe('Server Config (config.ts)', () => {
       expect(spy).toHaveBeenCalled();
     });
 
-    it('should strip thoughts when switching from GenAI to Vertex', async () => {
+    it("should strip thoughts when switching from GenAI to Vertex", async () => {
       const config = new Config(baseParams);
 
       vi.mocked(createContentGeneratorConfig).mockImplementation(
@@ -382,12 +368,10 @@ describe('Server Config (config.ts)', () => {
 
       await config.refreshAuth(AuthType.LOGIN_WITH_GOOGLE);
 
-      expect(
-        config.getGeminiClient().stripThoughtsFromHistory,
-      ).toHaveBeenCalledWith();
+      expect(config.getGeminiClient().stripThoughtsFromHistory).toHaveBeenCalledWith();
     });
 
-    it('should strip thoughts when switching from GenAI to Vertex AI', async () => {
+    it("should strip thoughts when switching from GenAI to Vertex AI", async () => {
       const config = new Config(baseParams);
 
       vi.mocked(createContentGeneratorConfig).mockImplementation(
@@ -399,12 +383,10 @@ describe('Server Config (config.ts)', () => {
 
       await config.refreshAuth(AuthType.USE_VERTEX_AI);
 
-      expect(
-        config.getGeminiClient().stripThoughtsFromHistory,
-      ).toHaveBeenCalledWith();
+      expect(config.getGeminiClient().stripThoughtsFromHistory).toHaveBeenCalledWith();
     });
 
-    it('should not strip thoughts when switching from Vertex to GenAI', async () => {
+    it("should not strip thoughts when switching from Vertex to GenAI", async () => {
       const config = new Config(baseParams);
 
       vi.mocked(createContentGeneratorConfig).mockImplementation(
@@ -416,13 +398,11 @@ describe('Server Config (config.ts)', () => {
 
       await config.refreshAuth(AuthType.USE_GEMINI);
 
-      expect(
-        config.getGeminiClient().stripThoughtsFromHistory,
-      ).not.toHaveBeenCalledWith();
+      expect(config.getGeminiClient().stripThoughtsFromHistory).not.toHaveBeenCalledWith();
     });
   });
 
-  describe('Preview Features Logic in refreshAuth', () => {
+  describe("Preview Features Logic in refreshAuth", () => {
     beforeEach(() => {
       // Set up default mock behavior for these functions before each test
       vi.mocked(getCodeAssistServer).mockReturnValue(undefined);
@@ -432,7 +412,7 @@ describe('Server Config (config.ts)', () => {
       });
     });
 
-    it('should enable preview features for Google auth when remote flag is true', async () => {
+    it("should enable preview features for Google auth when remote flag is true", async () => {
       // Override the default mock for this specific test
       vi.mocked(getCodeAssistServer).mockReturnValue({} as CodeAssistServer); // Simulate Google auth by returning a truthy value
       vi.mocked(getExperiments).mockResolvedValue({
@@ -446,7 +426,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getPreviewFeatures()).toBe(true);
     });
 
-    it('should disable preview features for Google auth when remote flag is false', async () => {
+    it("should disable preview features for Google auth when remote flag is false", async () => {
       // Override the default mock
       vi.mocked(getCodeAssistServer).mockReturnValue({} as CodeAssistServer);
       vi.mocked(getExperiments).mockResolvedValue({
@@ -460,7 +440,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getPreviewFeatures()).toBe(undefined);
     });
 
-    it('should disable preview features for Google auth when remote flag is missing', async () => {
+    it("should disable preview features for Google auth when remote flag is missing", async () => {
       // Override the default mock for getCodeAssistServer, the getExperiments mock is already correct
       vi.mocked(getCodeAssistServer).mockReturnValue({} as CodeAssistServer);
       const config = new Config({ ...baseParams, previewFeatures: undefined });
@@ -468,8 +448,8 @@ describe('Server Config (config.ts)', () => {
       expect(config.getPreviewFeatures()).toBe(undefined);
     });
 
-    it('should not change preview features or model if it is already set to true', async () => {
-      const initialModel = 'some-other-model';
+    it("should not change preview features or model if it is already set to true", async () => {
+      const initialModel = "some-other-model";
       const config = new Config({
         ...baseParams,
         previewFeatures: true,
@@ -481,8 +461,8 @@ describe('Server Config (config.ts)', () => {
       expect(config.getModel()).toBe(initialModel);
     });
 
-    it('should not change preview features or model if it is already set to false', async () => {
-      const initialModel = 'some-other-model';
+    it("should not change preview features or model if it is already set to false", async () => {
+      const initialModel = "some-other-model";
       const config = new Config({
         ...baseParams,
         previewFeatures: false,
@@ -494,7 +474,7 @@ describe('Server Config (config.ts)', () => {
     });
   });
 
-  it('Config constructor should store userMemory correctly', () => {
+  it("Config constructor should store userMemory correctly", () => {
     const config = new Config(baseParams);
 
     expect(config.getUserMemory()).toBe(USER_MEMORY);
@@ -502,16 +482,16 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTargetDir()).toBe(path.resolve(TARGET_DIR)); // Check resolved path
   });
 
-  it('Config constructor should default userMemory to empty string if not provided', () => {
+  it("Config constructor should default userMemory to empty string if not provided", () => {
     const paramsWithoutMemory: ConfigParameters = { ...baseParams };
     delete paramsWithoutMemory.userMemory;
     const config = new Config(paramsWithoutMemory);
 
-    expect(config.getUserMemory()).toBe('');
+    expect(config.getUserMemory()).toBe("");
   });
 
-  it('Config constructor should call setGeminiMdFilename with contextFileName if provided', () => {
-    const contextFileName = 'CUSTOM_AGENTS.md';
+  it("Config constructor should call setGeminiMdFilename with contextFileName if provided", () => {
+    const contextFileName = "CUSTOM_AGENTS.md";
     const paramsWithContextFile: ConfigParameters = {
       ...baseParams,
       contextFileName,
@@ -520,19 +500,19 @@ describe('Server Config (config.ts)', () => {
     expect(mockSetGeminiMdFilename).toHaveBeenCalledWith(contextFileName);
   });
 
-  it('Config constructor should not call setGeminiMdFilename if contextFileName is not provided', () => {
+  it("Config constructor should not call setGeminiMdFilename if contextFileName is not provided", () => {
     new Config(baseParams); // baseParams does not have contextFileName
     expect(mockSetGeminiMdFilename).not.toHaveBeenCalled();
   });
 
-  it('should set default file filtering settings when not provided', () => {
+  it("should set default file filtering settings when not provided", () => {
     const config = new Config(baseParams);
     expect(config.getFileFilteringRespectGitIgnore()).toBe(
       DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
     );
   });
 
-  it('should set custom file filtering settings when provided', () => {
+  it("should set custom file filtering settings when provided", () => {
     const paramsWithFileFiltering: ConfigParameters = {
       ...baseParams,
       fileFiltering: {
@@ -543,8 +523,8 @@ describe('Server Config (config.ts)', () => {
     expect(config.getFileFilteringRespectGitIgnore()).toBe(false);
   });
 
-  it('should initialize WorkspaceContext with includeDirectories', () => {
-    const includeDirectories = ['dir1', 'dir2'];
+  it("should initialize WorkspaceContext with includeDirectories", () => {
+    const includeDirectories = ["dir1", "dir2"];
     const paramsWithIncludeDirs: ConfigParameters = {
       ...baseParams,
       includeDirectories,
@@ -561,7 +541,7 @@ describe('Server Config (config.ts)', () => {
     expect(config.getPendingIncludeDirectories()).toEqual(includeDirectories);
   });
 
-  it('Config constructor should set telemetry to true when provided as true', () => {
+  it("Config constructor should set telemetry to true when provided as true", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true },
@@ -570,7 +550,7 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryEnabled()).toBe(true);
   });
 
-  it('Config constructor should set telemetry to false when provided as false', () => {
+  it("Config constructor should set telemetry to false when provided as false", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: false },
@@ -579,14 +559,14 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryEnabled()).toBe(false);
   });
 
-  it('Config constructor should default telemetry to default value if not provided', () => {
+  it("Config constructor should default telemetry to default value if not provided", () => {
     const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
     delete paramsWithoutTelemetry.telemetry;
     const config = new Config(paramsWithoutTelemetry);
     expect(config.getTelemetryEnabled()).toBe(TELEMETRY_SETTINGS.enabled);
   });
 
-  it('Config constructor should set telemetry useCollector to true when provided', () => {
+  it("Config constructor should set telemetry useCollector to true when provided", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true, useCollector: true },
@@ -595,7 +575,7 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryUseCollector()).toBe(true);
   });
 
-  it('Config constructor should set telemetry useCollector to false when provided', () => {
+  it("Config constructor should set telemetry useCollector to false when provided", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true, useCollector: false },
@@ -604,7 +584,7 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryUseCollector()).toBe(false);
   });
 
-  it('Config constructor should default telemetry useCollector to false if not provided', () => {
+  it("Config constructor should default telemetry useCollector to false if not provided", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true },
@@ -613,14 +593,14 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryUseCollector()).toBe(false);
   });
 
-  it('should have a getFileService method that returns FileDiscoveryService', () => {
+  it("should have a getFileService method that returns FileDiscoveryService", () => {
     const config = new Config(baseParams);
     const fileService = config.getFileService();
     expect(fileService).toBeDefined();
   });
 
-  describe('Usage Statistics', () => {
-    it('defaults usage statistics to enabled if not specified', () => {
+  describe("Usage Statistics", () => {
+    it("defaults usage statistics to enabled if not specified", () => {
       const config = new Config({
         ...baseParams,
         usageStatisticsEnabled: undefined,
@@ -629,20 +609,20 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUsageStatisticsEnabled()).toBe(true);
     });
 
-    it.each([{ enabled: true }, { enabled: false }])(
-      'sets usage statistics based on the provided value (enabled: $enabled)',
-      ({ enabled }) => {
-        const config = new Config({
-          ...baseParams,
-          usageStatisticsEnabled: enabled,
-        });
-        expect(config.getUsageStatisticsEnabled()).toBe(enabled);
-      },
-    );
+    it.each([
+      { enabled: true },
+      { enabled: false },
+    ])("sets usage statistics based on the provided value (enabled: $enabled)", ({ enabled }) => {
+      const config = new Config({
+        ...baseParams,
+        usageStatisticsEnabled: enabled,
+      });
+      expect(config.getUsageStatisticsEnabled()).toBe(enabled);
+    });
   });
 
-  describe('Telemetry Settings', () => {
-    it('should return default telemetry target if not provided', () => {
+  describe("Telemetry Settings", () => {
+    it("should return default telemetry target if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
@@ -651,8 +631,8 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryTarget()).toBe(DEFAULT_TELEMETRY_TARGET);
     });
 
-    it('should return provided OTLP endpoint', () => {
-      const endpoint = 'http://custom.otel.collector:4317';
+    it("should return provided OTLP endpoint", () => {
+      const endpoint = "http://custom.otel.collector:4317";
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true, otlpEndpoint: endpoint },
@@ -661,7 +641,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryOtlpEndpoint()).toBe(endpoint);
     });
 
-    it('should return default OTLP endpoint if not provided', () => {
+    it("should return default OTLP endpoint if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
@@ -670,7 +650,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryOtlpEndpoint()).toBe(DEFAULT_OTLP_ENDPOINT);
     });
 
-    it('should return provided logPrompts setting', () => {
+    it("should return provided logPrompts setting", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true, logPrompts: false },
@@ -679,7 +659,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryLogPromptsEnabled()).toBe(false);
     });
 
-    it('should return default logPrompts setting (true) if not provided', () => {
+    it("should return default logPrompts setting (true) if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
@@ -688,60 +668,60 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryLogPromptsEnabled()).toBe(true);
     });
 
-    it('should return default logPrompts setting (true) if telemetry object is not provided', () => {
+    it("should return default logPrompts setting (true) if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
       expect(config.getTelemetryLogPromptsEnabled()).toBe(true);
     });
 
-    it('should return default telemetry target if telemetry object is not provided', () => {
+    it("should return default telemetry target if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
       expect(config.getTelemetryTarget()).toBe(DEFAULT_TELEMETRY_TARGET);
     });
 
-    it('should return default OTLP endpoint if telemetry object is not provided', () => {
+    it("should return default OTLP endpoint if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
       expect(config.getTelemetryOtlpEndpoint()).toBe(DEFAULT_OTLP_ENDPOINT);
     });
 
-    it('should return provided OTLP protocol', () => {
+    it("should return provided OTLP protocol", () => {
       const params: ConfigParameters = {
         ...baseParams,
-        telemetry: { enabled: true, otlpProtocol: 'http' },
+        telemetry: { enabled: true, otlpProtocol: "http" },
       };
       const config = new Config(params);
-      expect(config.getTelemetryOtlpProtocol()).toBe('http');
+      expect(config.getTelemetryOtlpProtocol()).toBe("http");
     });
 
-    it('should return default OTLP protocol if not provided', () => {
+    it("should return default OTLP protocol if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
       };
       const config = new Config(params);
-      expect(config.getTelemetryOtlpProtocol()).toBe('grpc');
+      expect(config.getTelemetryOtlpProtocol()).toBe("grpc");
     });
 
-    it('should return default OTLP protocol if telemetry object is not provided', () => {
+    it("should return default OTLP protocol if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
-      expect(config.getTelemetryOtlpProtocol()).toBe('grpc');
+      expect(config.getTelemetryOtlpProtocol()).toBe("grpc");
     });
   });
 
-  describe('UseRipgrep Configuration', () => {
-    it('should default useRipgrep to true when not provided', () => {
+  describe("UseRipgrep Configuration", () => {
+    it("should default useRipgrep to true when not provided", () => {
       const config = new Config(baseParams);
       expect(config.getUseRipgrep()).toBe(true);
     });
 
-    it('should set useRipgrep to false when provided as false', () => {
+    it("should set useRipgrep to false when provided as false", () => {
       const paramsWithRipgrep: ConfigParameters = {
         ...baseParams,
         useRipgrep: false,
@@ -750,7 +730,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseRipgrep()).toBe(false);
     });
 
-    it('should set useRipgrep to true when explicitly provided as true', () => {
+    it("should set useRipgrep to true when explicitly provided as true", () => {
       const paramsWithRipgrep: ConfigParameters = {
         ...baseParams,
         useRipgrep: true,
@@ -759,7 +739,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseRipgrep()).toBe(true);
     });
 
-    it('should default useRipgrep to true when undefined', () => {
+    it("should default useRipgrep to true when undefined", () => {
       const paramsWithUndefinedRipgrep: ConfigParameters = {
         ...baseParams,
         useRipgrep: undefined,
@@ -769,13 +749,13 @@ describe('Server Config (config.ts)', () => {
     });
   });
 
-  describe('Shell Tool Inactivity Timeout', () => {
-    it('should default to 300000ms (300 seconds) when not provided', () => {
+  describe("Shell Tool Inactivity Timeout", () => {
+    it("should default to 300000ms (300 seconds) when not provided", () => {
       const config = new Config(baseParams);
       expect(config.getShellToolInactivityTimeout()).toBe(300000);
     });
 
-    it('should convert provided seconds to milliseconds', () => {
+    it("should convert provided seconds to milliseconds", () => {
       const params: ConfigParameters = {
         ...baseParams,
         shellToolInactivityTimeout: 10, // 10 seconds
@@ -785,13 +765,13 @@ describe('Server Config (config.ts)', () => {
     });
   });
 
-  describe('ContinueOnFailedApiCall Configuration', () => {
-    it('should default continueOnFailedApiCall to false when not provided', () => {
+  describe("ContinueOnFailedApiCall Configuration", () => {
+    it("should default continueOnFailedApiCall to false when not provided", () => {
       const config = new Config(baseParams);
       expect(config.getContinueOnFailedApiCall()).toBe(true);
     });
 
-    it('should set continueOnFailedApiCall to true when provided as true', () => {
+    it("should set continueOnFailedApiCall to true when provided as true", () => {
       const paramsWithContinueOnFailedApiCall: ConfigParameters = {
         ...baseParams,
         continueOnFailedApiCall: true,
@@ -800,7 +780,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getContinueOnFailedApiCall()).toBe(true);
     });
 
-    it('should set continueOnFailedApiCall to false when explicitly provided as false', () => {
+    it("should set continueOnFailedApiCall to false when explicitly provided as false", () => {
       const paramsWithContinueOnFailedApiCall: ConfigParameters = {
         ...baseParams,
         continueOnFailedApiCall: false,
@@ -810,18 +790,18 @@ describe('Server Config (config.ts)', () => {
     });
   });
 
-  describe('createToolRegistry', () => {
-    it('should register a tool if coreTools contains an argument-specific pattern', async () => {
+  describe("createToolRegistry", () => {
+    it("should register a tool if coreTools contains an argument-specific pattern", async () => {
       const params: ConfigParameters = {
         ...baseParams,
-        coreTools: ['ShellTool(git status)'],
+        coreTools: ["ShellTool(git status)"],
       };
       const config = new Config(params);
       await config.initialize();
 
       // The ToolRegistry class is mocked, so we can inspect its prototype's methods.
       const registerToolMock = (
-        (await vi.importMock('../tools/tool-registry')) as {
+        (await vi.importMock("../tools/tool-registry")) as {
           ToolRegistry: { prototype: { registerTool: Mock } };
         }
       ).ToolRegistry.prototype.registerTool;
@@ -833,13 +813,13 @@ describe('Server Config (config.ts)', () => {
       expect(wasShellToolRegistered).toBe(true);
 
       // Check that registerTool was NOT called for ReadFileTool
-      const wasReadFileToolRegistered = (
-        registerToolMock as Mock
-      ).mock.calls.some((call) => call[0] instanceof vi.mocked(ReadFileTool));
+      const wasReadFileToolRegistered = (registerToolMock as Mock).mock.calls.some(
+        (call) => call[0] instanceof vi.mocked(ReadFileTool),
+      );
       expect(wasReadFileToolRegistered).toBe(false);
     });
 
-    it('should register subagents as tools when codebaseInvestigatorSettings.enabled is true', async () => {
+    it("should register subagents as tools when codebaseInvestigatorSettings.enabled is true", async () => {
       const params: ConfigParameters = {
         ...baseParams,
         codebaseInvestigatorSettings: { enabled: true },
@@ -847,22 +827,20 @@ describe('Server Config (config.ts)', () => {
       const config = new Config(params);
 
       const mockAgentDefinition = {
-        name: 'codebase-investigator',
-        description: 'Agent 1',
-        instructions: 'Inst 1',
+        name: "codebase-investigator",
+        description: "Agent 1",
+        instructions: "Inst 1",
       };
 
       const AgentRegistryMock = (
-        (await vi.importMock('../agents/registry.js')) as {
+        (await vi.importMock("../agents/registry.js")) as {
           AgentRegistry: Mock;
         }
       ).AgentRegistry;
-      AgentRegistryMock.prototype.getDefinition.mockReturnValue(
-        mockAgentDefinition,
-      );
+      AgentRegistryMock.prototype.getDefinition.mockReturnValue(mockAgentDefinition);
 
       const DelegateToAgentToolMock = (
-        (await vi.importMock('../agents/delegate-to-agent-tool.js')) as {
+        (await vi.importMock("../agents/delegate-to-agent-tool.js")) as {
           DelegateToAgentTool: Mock;
         }
       ).DelegateToAgentTool;
@@ -870,7 +848,7 @@ describe('Server Config (config.ts)', () => {
       await config.initialize();
 
       const registerToolMock = (
-        (await vi.importMock('../tools/tool-registry')) as {
+        (await vi.importMock("../tools/tool-registry")) as {
           ToolRegistry: { prototype: { registerTool: Mock } };
         }
       ).ToolRegistry.prototype.registerTool;
@@ -883,13 +861,11 @@ describe('Server Config (config.ts)', () => {
       );
 
       const calls = registerToolMock.mock.calls;
-      const registeredWrappers = calls.filter(
-        (call) => call[0] instanceof DelegateToAgentToolMock,
-      );
+      const registeredWrappers = calls.filter((call) => call[0] instanceof DelegateToAgentToolMock);
       expect(registeredWrappers).toHaveLength(1);
     });
 
-    it('should not register subagents as tools when codebaseInvestigatorSettings.enabled is false', async () => {
+    it("should not register subagents as tools when codebaseInvestigatorSettings.enabled is false", async () => {
       const params: ConfigParameters = {
         ...baseParams,
         codebaseInvestigatorSettings: { enabled: false },
@@ -897,7 +873,7 @@ describe('Server Config (config.ts)', () => {
       const config = new Config(params);
 
       const DelegateToAgentToolMock = (
-        (await vi.importMock('../agents/delegate-to-agent-tool.js')) as {
+        (await vi.importMock("../agents/delegate-to-agent-tool.js")) as {
           DelegateToAgentTool: Mock;
         }
       ).DelegateToAgentTool;
@@ -907,176 +883,158 @@ describe('Server Config (config.ts)', () => {
       expect(DelegateToAgentToolMock).not.toHaveBeenCalled();
     });
 
-    it('should not set default codebase investigator model in config (defaults in registry)', () => {
+    it("should not set default codebase investigator model in config (defaults in registry)", () => {
       const config = new Config(baseParams);
       expect(config.getCodebaseInvestigatorSettings()?.model).toBeUndefined();
     });
 
-    describe('with minified tool class names', () => {
+    describe("with minified tool class names", () => {
       beforeEach(() => {
-        Object.defineProperty(
-          vi.mocked(ShellTool).prototype.constructor,
-          'name',
-          {
-            value: '_ShellTool',
-            configurable: true,
-          },
-        );
+        Object.defineProperty(vi.mocked(ShellTool).prototype.constructor, "name", {
+          value: "_ShellTool",
+          configurable: true,
+        });
       });
 
       afterEach(() => {
-        Object.defineProperty(
-          vi.mocked(ShellTool).prototype.constructor,
-          'name',
-          {
-            value: 'ShellTool',
-          },
-        );
+        Object.defineProperty(vi.mocked(ShellTool).prototype.constructor, "name", {
+          value: "ShellTool",
+        });
       });
 
-      it('should register a tool if coreTools contains the non-minified class name', async () => {
+      it("should register a tool if coreTools contains the non-minified class name", async () => {
         const params: ConfigParameters = {
           ...baseParams,
-          coreTools: ['ShellTool'],
+          coreTools: ["ShellTool"],
         };
         const config = new Config(params);
         await config.initialize();
 
         const registerToolMock = (
-          (await vi.importMock('../tools/tool-registry')) as {
+          (await vi.importMock("../tools/tool-registry")) as {
             ToolRegistry: { prototype: { registerTool: Mock } };
           }
         ).ToolRegistry.prototype.registerTool;
 
-        const wasShellToolRegistered = (
-          registerToolMock as Mock
-        ).mock.calls.some((call) => call[0] instanceof vi.mocked(ShellTool));
+        const wasShellToolRegistered = (registerToolMock as Mock).mock.calls.some(
+          (call) => call[0] instanceof vi.mocked(ShellTool),
+        );
         expect(wasShellToolRegistered).toBe(true);
       });
 
-      it('should register a tool if coreTools contains an argument-specific pattern with the non-minified class name', async () => {
+      it("should register a tool if coreTools contains an argument-specific pattern with the non-minified class name", async () => {
         const params: ConfigParameters = {
           ...baseParams,
-          coreTools: ['ShellTool(git status)'],
+          coreTools: ["ShellTool(git status)"],
         };
         const config = new Config(params);
         await config.initialize();
 
         const registerToolMock = (
-          (await vi.importMock('../tools/tool-registry')) as {
+          (await vi.importMock("../tools/tool-registry")) as {
             ToolRegistry: { prototype: { registerTool: Mock } };
           }
         ).ToolRegistry.prototype.registerTool;
 
-        const wasShellToolRegistered = (
-          registerToolMock as Mock
-        ).mock.calls.some((call) => call[0] instanceof vi.mocked(ShellTool));
+        const wasShellToolRegistered = (registerToolMock as Mock).mock.calls.some(
+          (call) => call[0] instanceof vi.mocked(ShellTool),
+        );
         expect(wasShellToolRegistered).toBe(true);
       });
     });
   });
 
-  describe('getTruncateToolOutputThreshold', () => {
+  describe("getTruncateToolOutputThreshold", () => {
     beforeEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should return the calculated threshold when it is smaller than the default', () => {
+    it("should return the calculated threshold when it is smaller than the default", () => {
       const config = new Config(baseParams);
       vi.mocked(tokenLimit).mockReturnValue(32000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        1000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(1000);
       // 4 * (32000 - 1000) = 4 * 31000 = 124000
       // default is 4_000_000
       expect(config.getTruncateToolOutputThreshold()).toBe(124000);
     });
 
-    it('should return the default threshold when the calculated value is larger', () => {
+    it("should return the default threshold when the calculated value is larger", () => {
       const config = new Config(baseParams);
       vi.mocked(tokenLimit).mockReturnValue(2_000_000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        500_000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(500_000);
       // 4 * (2_000_000 - 500_000) = 4 * 1_500_000 = 6_000_000
       // default is 4_000_000
       expect(config.getTruncateToolOutputThreshold()).toBe(4_000_000);
     });
 
-    it('should use a custom truncateToolOutputThreshold if provided', () => {
+    it("should use a custom truncateToolOutputThreshold if provided", () => {
       const customParams = {
         ...baseParams,
         truncateToolOutputThreshold: 50000,
       };
       const config = new Config(customParams);
       vi.mocked(tokenLimit).mockReturnValue(8000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        2000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(2000);
       // 4 * (8000 - 2000) = 4 * 6000 = 24000
       // custom threshold is 50000
       expect(config.getTruncateToolOutputThreshold()).toBe(24000);
 
       vi.mocked(tokenLimit).mockReturnValue(32000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        1000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(1000);
       // 4 * (32000 - 1000) = 124000
       // custom threshold is 50000
       expect(config.getTruncateToolOutputThreshold()).toBe(50000);
     });
   });
 
-  describe('Proxy Configuration Error Handling', () => {
+  describe("Proxy Configuration Error Handling", () => {
     beforeEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should call setGlobalProxy when proxy is configured', () => {
+    it("should call setGlobalProxy when proxy is configured", () => {
       const paramsWithProxy: ConfigParameters = {
         ...baseParams,
-        proxy: 'http://proxy.example.com:8080',
+        proxy: "http://proxy.example.com:8080",
       };
       new Config(paramsWithProxy);
 
-      expect(mockSetGlobalProxy).toHaveBeenCalledWith(
-        'http://proxy.example.com:8080',
-      );
+      expect(mockSetGlobalProxy).toHaveBeenCalledWith("http://proxy.example.com:8080");
     });
 
-    it('should not call setGlobalProxy when proxy is not configured', () => {
+    it("should not call setGlobalProxy when proxy is not configured", () => {
       new Config(baseParams);
 
       expect(mockSetGlobalProxy).not.toHaveBeenCalled();
     });
 
-    it('should emit error feedback when setGlobalProxy throws an error', () => {
-      const proxyError = new Error('Invalid proxy URL');
+    it("should emit error feedback when setGlobalProxy throws an error", () => {
+      const proxyError = new Error("Invalid proxy URL");
       mockSetGlobalProxy.mockImplementation(() => {
         throw proxyError;
       });
 
       const paramsWithProxy: ConfigParameters = {
         ...baseParams,
-        proxy: 'invalid-proxy',
+        proxy: "invalid-proxy",
       };
       new Config(paramsWithProxy);
 
       expect(mockCoreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Invalid proxy configuration detected. Check debug drawer for more details (F12)',
+        "error",
+        "Invalid proxy configuration detected. Check debug drawer for more details (F12)",
         proxyError,
       );
     });
 
-    it('should not emit error feedback when setGlobalProxy succeeds', () => {
+    it("should not emit error feedback when setGlobalProxy succeeds", () => {
       mockSetGlobalProxy.mockImplementation(() => {
         // Success - no error thrown
       });
 
       const paramsWithProxy: ConfigParameters = {
         ...baseParams,
-        proxy: 'http://proxy.example.com:8080',
+        proxy: "http://proxy.example.com:8080",
       };
       new Config(paramsWithProxy);
 
@@ -1085,134 +1043,112 @@ describe('Server Config (config.ts)', () => {
   });
 });
 
-describe('setApprovalMode with folder trust', () => {
+describe("setApprovalMode with folder trust", () => {
   const baseParams: ConfigParameters = {
-    sessionId: 'test',
-    targetDir: '.',
+    sessionId: "test",
+    targetDir: ".",
     debugMode: false,
-    model: 'test-model',
-    cwd: '.',
+    model: "test-model",
+    cwd: ".",
   };
 
-  it('should throw an error when setting YOLO mode in an untrusted folder', () => {
+  it("should throw an error when setting YOLO mode in an untrusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(() => config.setApprovalMode(ApprovalMode.YOLO)).toThrow(
-      'Cannot enable privileged approval modes in an untrusted folder.',
+      "Cannot enable privileged approval modes in an untrusted folder.",
     );
   });
 
-  it('should throw an error when setting AUTO_EDIT mode in an untrusted folder', () => {
+  it("should throw an error when setting AUTO_EDIT mode in an untrusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(() => config.setApprovalMode(ApprovalMode.AUTO_EDIT)).toThrow(
-      'Cannot enable privileged approval modes in an untrusted folder.',
+      "Cannot enable privileged approval modes in an untrusted folder.",
     );
   });
 
-  it('should NOT throw an error when setting DEFAULT mode in an untrusted folder', () => {
+  it("should NOT throw an error when setting DEFAULT mode in an untrusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(() => config.setApprovalMode(ApprovalMode.DEFAULT)).not.toThrow();
   });
 
-  it('should NOT throw an error when setting any mode in a trusted folder', () => {
+  it("should NOT throw an error when setting any mode in a trusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true);
     expect(() => config.setApprovalMode(ApprovalMode.YOLO)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.AUTO_EDIT)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.DEFAULT)).not.toThrow();
   });
 
-  it('should NOT throw an error when setting any mode if trustedFolder is undefined', () => {
+  it("should NOT throw an error when setting any mode if trustedFolder is undefined", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true); // isTrustedFolder defaults to true
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true); // isTrustedFolder defaults to true
     expect(() => config.setApprovalMode(ApprovalMode.YOLO)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.AUTO_EDIT)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.DEFAULT)).not.toThrow();
   });
 
-  describe('registerCoreTools', () => {
+  describe("registerCoreTools", () => {
     beforeEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should register RipGrepTool when useRipgrep is true and it is available', async () => {
+    it("should register RipGrepTool when useRipgrep is true and it is available", async () => {
       (canUseRipgrep as Mock).mockResolvedValue(true);
       const config = new Config({ ...baseParams, useRipgrep: true });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(true);
       expect(wasGrepRegistered).toBe(false);
       expect(logRipgrepFallback).not.toHaveBeenCalled();
     });
 
-    it('should register GrepTool as a fallback when useRipgrep is true but it is not available', async () => {
+    it("should register GrepTool as a fallback when useRipgrep is true but it is not available", async () => {
       (canUseRipgrep as Mock).mockResolvedValue(false);
       const config = new Config({ ...baseParams, useRipgrep: true });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(false);
       expect(wasGrepRegistered).toBe(true);
-      expect(logRipgrepFallback).toHaveBeenCalledWith(
-        config,
-        expect.any(RipgrepFallbackEvent),
-      );
+      expect(logRipgrepFallback).toHaveBeenCalledWith(config, expect.any(RipgrepFallbackEvent));
       const event = (logRipgrepFallback as Mock).mock.calls[0][1];
       expect(event.error).toBeUndefined();
     });
 
-    it('should register GrepTool as a fallback when canUseRipgrep throws an error', async () => {
-      const error = new Error('ripGrep check failed');
+    it("should register GrepTool as a fallback when canUseRipgrep throws an error", async () => {
+      const error = new Error("ripGrep check failed");
       (canUseRipgrep as Mock).mockRejectedValue(error);
       const config = new Config({ ...baseParams, useRipgrep: true });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(false);
       expect(wasGrepRegistered).toBe(true);
-      expect(logRipgrepFallback).toHaveBeenCalledWith(
-        config,
-        expect.any(RipgrepFallbackEvent),
-      );
+      expect(logRipgrepFallback).toHaveBeenCalledWith(config, expect.any(RipgrepFallbackEvent));
       const event = (logRipgrepFallback as Mock).mock.calls[0][1];
       expect(event.error).toBe(String(error));
     });
 
-    it('should register GrepTool when useRipgrep is false', async () => {
+    it("should register GrepTool when useRipgrep is false", async () => {
       const config = new Config({ ...baseParams, useRipgrep: false });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(false);
       expect(wasGrepRegistered).toBe(true);
@@ -1222,55 +1158,55 @@ describe('setApprovalMode with folder trust', () => {
   });
 });
 
-describe('isYoloModeDisabled', () => {
+describe("isYoloModeDisabled", () => {
   const baseParams: ConfigParameters = {
-    sessionId: 'test',
-    targetDir: '.',
+    sessionId: "test",
+    targetDir: ".",
     debugMode: false,
-    model: 'test-model',
-    cwd: '.',
+    model: "test-model",
+    cwd: ".",
   };
 
-  it('should return false when yolo mode is not disabled and folder is trusted', () => {
+  it("should return false when yolo mode is not disabled and folder is trusted", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true);
     expect(config.isYoloModeDisabled()).toBe(false);
   });
 
-  it('should return true when yolo mode is disabled by parameter', () => {
+  it("should return true when yolo mode is disabled by parameter", () => {
     const config = new Config({ ...baseParams, disableYoloMode: true });
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true);
     expect(config.isYoloModeDisabled()).toBe(true);
   });
 
-  it('should return true when folder is untrusted', () => {
+  it("should return true when folder is untrusted", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(config.isYoloModeDisabled()).toBe(true);
   });
 
-  it('should return true when yolo is disabled and folder is untrusted', () => {
+  it("should return true when yolo is disabled and folder is untrusted", () => {
     const config = new Config({ ...baseParams, disableYoloMode: true });
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(config.isYoloModeDisabled()).toBe(true);
   });
 });
 
-describe('BaseLlmClient Lifecycle', () => {
-  const MODEL = 'gemini-pro';
+describe("BaseLlmClient Lifecycle", () => {
+  const MODEL = "gemini-pro";
   const SANDBOX: SandboxConfig = {
-    command: 'docker',
-    image: 'gemini-cli-sandbox',
+    command: "docker",
+    image: "gemini-cli-sandbox",
   };
-  const TARGET_DIR = '/path/to/target';
+  const TARGET_DIR = "/path/to/target";
   const DEBUG_MODE = false;
-  const QUESTION = 'test question';
-  const USER_MEMORY = 'Test User Memory';
+  const QUESTION = "test question";
+  const USER_MEMORY = "Test User Memory";
   const TELEMETRY_SETTINGS = { enabled: false };
-  const EMBEDDING_MODEL = 'gemini-embedding';
-  const SESSION_ID = 'test-session-id';
+  const EMBEDDING_MODEL = "gemini-embedding";
+  const SESSION_ID = "test-session-id";
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
+    cwd: "/tmp",
     embeddingModel: EMBEDDING_MODEL,
     sandbox: SANDBOX,
     targetDir: TARGET_DIR,
@@ -1283,49 +1219,44 @@ describe('BaseLlmClient Lifecycle', () => {
     usageStatisticsEnabled: false,
   };
 
-  it('should throw an error if getBaseLlmClient is called before refreshAuth', () => {
+  it("should throw an error if getBaseLlmClient is called before refreshAuth", () => {
     const config = new Config(baseParams);
     expect(() => config.getBaseLlmClient()).toThrow(
-      'BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.',
+      "BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.",
     );
   });
 
-  it('should successfully initialize BaseLlmClient after refreshAuth is called', async () => {
+  it("should successfully initialize BaseLlmClient after refreshAuth is called", async () => {
     const config = new Config(baseParams);
     const authType = AuthType.USE_GEMINI;
-    const mockContentConfig = { model: 'gemini-flash', apiKey: 'test-key' };
+    const mockContentConfig = { model: "gemini-flash", apiKey: "test-key" };
 
-    vi.mocked(createContentGeneratorConfig).mockResolvedValue(
-      mockContentConfig,
-    );
+    vi.mocked(createContentGeneratorConfig).mockResolvedValue(mockContentConfig);
 
     await config.refreshAuth(authType);
 
     // Should not throw
     const llmService = config.getBaseLlmClient();
     expect(llmService).toBeDefined();
-    expect(BaseLlmClient).toHaveBeenCalledWith(
-      config.getContentGenerator(),
-      config,
-    );
+    expect(BaseLlmClient).toHaveBeenCalledWith(config.getContentGenerator(), config);
   });
 });
 
-describe('Generation Config Merging (HACK)', () => {
-  const MODEL = 'gemini-pro';
+describe("Generation Config Merging (HACK)", () => {
+  const MODEL = "gemini-pro";
   const SANDBOX: SandboxConfig = {
-    command: 'docker',
-    image: 'gemini-cli-sandbox',
+    command: "docker",
+    image: "gemini-cli-sandbox",
   };
-  const TARGET_DIR = '/path/to/target';
+  const TARGET_DIR = "/path/to/target";
   const DEBUG_MODE = false;
-  const QUESTION = 'test question';
-  const USER_MEMORY = 'Test User Memory';
+  const QUESTION = "test question";
+  const USER_MEMORY = "Test User Memory";
   const TELEMETRY_SETTINGS = { enabled: false };
-  const EMBEDDING_MODEL = 'gemini-embedding';
-  const SESSION_ID = 'test-session-id';
+  const EMBEDDING_MODEL = "gemini-embedding";
+  const SESSION_ID = "test-session-id";
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
+    cwd: "/tmp",
     embeddingModel: EMBEDDING_MODEL,
     sandbox: SANDBOX,
     targetDir: TARGET_DIR,
@@ -1338,10 +1269,10 @@ describe('Generation Config Merging (HACK)', () => {
     usageStatisticsEnabled: false,
   };
 
-  it('should merge default aliases when user provides only overrides', () => {
+  it("should merge default aliases when user provides only overrides", () => {
     const userOverrides = [
       {
-        match: { model: 'test-model' },
+        match: { model: "test-model" },
         modelConfig: { generateContentConfig: { temperature: 0.1 } },
       },
     ];
@@ -1363,10 +1294,10 @@ describe('Generation Config Merging (HACK)', () => {
     expect(serviceConfig.overrides).toEqual(userOverrides);
   });
 
-  it('should merge default overrides when user provides only aliases', () => {
+  it("should merge default overrides when user provides only aliases", () => {
     const userAliases = {
-      'my-alias': {
-        modelConfig: { model: 'my-model' },
+      "my-alias": {
+        modelConfig: { model: "my-model" },
       },
     };
 
@@ -1387,10 +1318,10 @@ describe('Generation Config Merging (HACK)', () => {
     expect(serviceConfig.overrides).toEqual(DEFAULT_MODEL_CONFIGS.overrides);
   });
 
-  it('should use user-provided aliases if they exist', () => {
+  it("should use user-provided aliases if they exist", () => {
     const userAliases = {
-      'my-alias': {
-        modelConfig: { model: 'my-model' },
+      "my-alias": {
+        modelConfig: { model: "my-model" },
       },
     };
 
@@ -1409,7 +1340,7 @@ describe('Generation Config Merging (HACK)', () => {
     expect(serviceConfig.aliases).toEqual(userAliases);
   });
 
-  it('should use default generation config if none is provided', () => {
+  it("should use default generation config if none is provided", () => {
     const params: ConfigParameters = { ...baseParams };
 
     const config = new Config(params);
@@ -1421,22 +1352,22 @@ describe('Generation Config Merging (HACK)', () => {
   });
 });
 
-describe('Config getHooks', () => {
+describe("Config getHooks", () => {
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
-    targetDir: '/path/to/target',
+    cwd: "/tmp",
+    targetDir: "/path/to/target",
     debugMode: false,
-    sessionId: 'test-session-id',
-    model: 'gemini-pro',
+    sessionId: "test-session-id",
+    model: "gemini-pro",
     usageStatisticsEnabled: false,
   };
 
-  it('should return undefined when no hooks are provided', () => {
+  it("should return undefined when no hooks are provided", () => {
     const config = new Config(baseParams);
     expect(config.getHooks()).toBeUndefined();
   });
 
-  it('should return empty object when empty hooks are provided', () => {
+  it("should return empty object when empty hooks are provided", () => {
     const configWithEmptyHooks = new Config({
       ...baseParams,
       hooks: {},
@@ -1444,11 +1375,11 @@ describe('Config getHooks', () => {
     expect(configWithEmptyHooks.getHooks()).toEqual({});
   });
 
-  it('should return the hooks configuration when provided', () => {
+  it("should return the hooks configuration when provided", () => {
     const mockHooks: { [K in HookEventName]?: HookDefinition[] } = {
       [HookEventName.BeforeTool]: [
         {
-          matcher: 'write_file',
+          matcher: "write_file",
           hooks: [
             {
               type: HookType.Command,
@@ -1463,7 +1394,7 @@ describe('Config getHooks', () => {
           hooks: [
             {
               type: HookType.Command,
-              command: './hooks/after-tool.sh',
+              command: "./hooks/after-tool.sh",
               timeout: 10000,
             },
           ],
@@ -1481,41 +1412,21 @@ describe('Config getHooks', () => {
     expect(retrievedHooks).toBe(mockHooks); // Should return the same reference
   });
 
-  it('should return hooks with all supported event types', () => {
+  it("should return hooks with all supported event types", () => {
     const allEventHooks: { [K in HookEventName]?: HookDefinition[] } = {
-      [HookEventName.BeforeAgent]: [
-        { hooks: [{ type: HookType.Command, command: 'test1' }] },
-      ],
-      [HookEventName.AfterAgent]: [
-        { hooks: [{ type: HookType.Command, command: 'test2' }] },
-      ],
-      [HookEventName.BeforeTool]: [
-        { hooks: [{ type: HookType.Command, command: 'test3' }] },
-      ],
-      [HookEventName.AfterTool]: [
-        { hooks: [{ type: HookType.Command, command: 'test4' }] },
-      ],
-      [HookEventName.BeforeModel]: [
-        { hooks: [{ type: HookType.Command, command: 'test5' }] },
-      ],
-      [HookEventName.AfterModel]: [
-        { hooks: [{ type: HookType.Command, command: 'test6' }] },
-      ],
+      [HookEventName.BeforeAgent]: [{ hooks: [{ type: HookType.Command, command: "test1" }] }],
+      [HookEventName.AfterAgent]: [{ hooks: [{ type: HookType.Command, command: "test2" }] }],
+      [HookEventName.BeforeTool]: [{ hooks: [{ type: HookType.Command, command: "test3" }] }],
+      [HookEventName.AfterTool]: [{ hooks: [{ type: HookType.Command, command: "test4" }] }],
+      [HookEventName.BeforeModel]: [{ hooks: [{ type: HookType.Command, command: "test5" }] }],
+      [HookEventName.AfterModel]: [{ hooks: [{ type: HookType.Command, command: "test6" }] }],
       [HookEventName.BeforeToolSelection]: [
-        { hooks: [{ type: HookType.Command, command: 'test7' }] },
-      ],
-      [HookEventName.Notification]: [
-        { hooks: [{ type: HookType.Command, command: 'test8' }] },
-      ],
-      [HookEventName.SessionStart]: [
-        { hooks: [{ type: HookType.Command, command: 'test9' }] },
-      ],
-      [HookEventName.SessionEnd]: [
-        { hooks: [{ type: HookType.Command, command: 'test10' }] },
-      ],
-      [HookEventName.PreCompress]: [
-        { hooks: [{ type: HookType.Command, command: 'test11' }] },
+        { hooks: [{ type: HookType.Command, command: "test7" }] },
       ],
+      [HookEventName.Notification]: [{ hooks: [{ type: HookType.Command, command: "test8" }] }],
+      [HookEventName.SessionStart]: [{ hooks: [{ type: HookType.Command, command: "test9" }] }],
+      [HookEventName.SessionEnd]: [{ hooks: [{ type: HookType.Command, command: "test10" }] }],
+      [HookEventName.PreCompress]: [{ hooks: [{ type: HookType.Command, command: "test11" }] }],
     };
 
     const config = new Config({
@@ -1528,16 +1439,16 @@ describe('Config getHooks', () => {
     expect(Object.keys(retrievedHooks!)).toHaveLength(11); // All hook event types
   });
 
-  describe('setModel', () => {
-    it('should allow setting a pro (any) model and disable fallback mode', () => {
+  describe("setModel", () => {
+    it("should allow setting a pro (any) model and disable fallback mode", () => {
       const config = new Config(baseParams);
       const service = config.getModelAvailabilityService();
-      const spy = vi.spyOn(service, 'reset');
+      const spy = vi.spyOn(service, "reset");
 
       config.setFallbackMode(true);
       expect(config.isInFallbackMode()).toBe(true);
 
-      const proModel = 'gemini-2.5-pro';
+      const proModel = "gemini-2.5-pro";
       config.setModel(proModel);
 
       expect(config.getModel()).toBe(proModel);
@@ -1546,63 +1457,63 @@ describe('Config getHooks', () => {
       expect(spy).toHaveBeenCalled();
     });
 
-    it('should allow setting auto model from non-auto model and disable fallback mode', () => {
+    it("should allow setting auto model from non-auto model and disable fallback mode", () => {
       const config = new Config(baseParams);
       const service = config.getModelAvailabilityService();
-      const spy = vi.spyOn(service, 'reset');
+      const spy = vi.spyOn(service, "reset");
 
       config.setFallbackMode(true);
       expect(config.isInFallbackMode()).toBe(true);
 
-      config.setModel('auto');
+      config.setModel("auto");
 
-      expect(config.getModel()).toBe('auto');
+      expect(config.getModel()).toBe("auto");
       expect(config.isInFallbackMode()).toBe(false);
-      expect(mockCoreEvents.emitModelChanged).toHaveBeenCalledWith('auto');
+      expect(mockCoreEvents.emitModelChanged).toHaveBeenCalledWith("auto");
       expect(spy).toHaveBeenCalled();
     });
 
-    it('should allow setting auto model from auto model if it is in the fallback mode', () => {
+    it("should allow setting auto model from auto model if it is in the fallback mode", () => {
       const config = new Config({
-        cwd: '/tmp',
-        targetDir: '/path/to/target',
+        cwd: "/tmp",
+        targetDir: "/path/to/target",
         debugMode: false,
-        sessionId: 'test-session-id',
-        model: 'auto',
+        sessionId: "test-session-id",
+        model: "auto",
         usageStatisticsEnabled: false,
       });
       const service = config.getModelAvailabilityService();
-      const spy = vi.spyOn(service, 'reset');
+      const spy = vi.spyOn(service, "reset");
 
       config.setFallbackMode(true);
       expect(config.isInFallbackMode()).toBe(true);
 
-      config.setModel('auto');
+      config.setModel("auto");
 
-      expect(config.getModel()).toBe('auto');
+      expect(config.getModel()).toBe("auto");
       expect(config.isInFallbackMode()).toBe(false);
-      expect(mockCoreEvents.emitModelChanged).toHaveBeenCalledWith('auto');
+      expect(mockCoreEvents.emitModelChanged).toHaveBeenCalledWith("auto");
       expect(spy).toHaveBeenCalled();
     });
   });
 });
 
-describe('Config getExperiments', () => {
+describe("Config getExperiments", () => {
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
-    targetDir: '/path/to/target',
+    cwd: "/tmp",
+    targetDir: "/path/to/target",
     debugMode: false,
-    sessionId: 'test-session-id',
-    model: 'gemini-pro',
+    sessionId: "test-session-id",
+    model: "gemini-pro",
     usageStatisticsEnabled: false,
   };
 
-  it('should return undefined when no experiments are provided', () => {
+  it("should return undefined when no experiments are provided", () => {
     const config = new Config(baseParams);
     expect(config.getExperiments()).toBeUndefined();
   });
 
-  it('should return empty object when empty experiments are provided', () => {
+  it("should return empty object when empty experiments are provided", () => {
     const configWithEmptyExps = new Config({
       ...baseParams,
       experiments: { flags: {}, experimentIds: [] },
@@ -1613,7 +1524,7 @@ describe('Config getExperiments', () => {
     });
   });
 
-  it('should return the experiments configuration when provided', () => {
+  it("should return the experiments configuration when provided", () => {
     const mockExps = {
       flags: {
         testFlag: { boolValue: true },
@@ -1632,32 +1543,30 @@ describe('Config getExperiments', () => {
   });
 });
 
-describe('Config setExperiments logging', () => {
+describe("Config setExperiments logging", () => {
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
-    targetDir: '/path/to/target',
+    cwd: "/tmp",
+    targetDir: "/path/to/target",
     debugMode: false,
-    sessionId: 'test-session-id',
-    model: 'gemini-pro',
+    sessionId: "test-session-id",
+    model: "gemini-pro",
     usageStatisticsEnabled: false,
   };
 
-  it('logs a sorted, non-truncated summary of experiments when they are set', () => {
+  it("logs a sorted, non-truncated summary of experiments when they are set", () => {
     const config = new Config(baseParams);
-    const debugSpy = vi
-      .spyOn(debugLogger, 'debug')
-      .mockImplementation(() => {});
+    const debugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
     const experiments = {
       flags: {
         ZetaFlag: {
           boolValue: true,
-          stringValue: 'zeta',
+          stringValue: "zeta",
           int32ListValue: { values: [1, 2] },
         },
         AlphaFlag: {
           boolValue: false,
-          stringValue: 'alpha',
-          stringListValue: { values: ['a', 'b', 'c'] },
+          stringValue: "alpha",
+          stringListValue: { values: ["a", "b", "c"] },
         },
         MiddleFlag: {
           // Intentionally sparse to ensure undefined values are omitted
@@ -1670,43 +1579,41 @@ describe('Config setExperiments logging', () => {
 
     config.setExperiments(experiments);
 
-    const logCall = debugSpy.mock.calls.find(
-      ([message]) => message === 'Experiments loaded',
-    );
+    const logCall = debugSpy.mock.calls.find(([message]) => message === "Experiments loaded");
     expect(logCall).toBeDefined();
     const loggedSummary = logCall?.[1] as string;
-    expect(typeof loggedSummary).toBe('string');
-    expect(loggedSummary).toContain('experimentIds');
-    expect(loggedSummary).toContain('101');
-    expect(loggedSummary).toContain('AlphaFlag');
-    expect(loggedSummary).toContain('ZetaFlag');
-    const alphaIndex = loggedSummary.indexOf('AlphaFlag');
-    const zetaIndex = loggedSummary.indexOf('ZetaFlag');
+    expect(typeof loggedSummary).toBe("string");
+    expect(loggedSummary).toContain("experimentIds");
+    expect(loggedSummary).toContain("101");
+    expect(loggedSummary).toContain("AlphaFlag");
+    expect(loggedSummary).toContain("ZetaFlag");
+    const alphaIndex = loggedSummary.indexOf("AlphaFlag");
+    const zetaIndex = loggedSummary.indexOf("ZetaFlag");
     expect(alphaIndex).toBeGreaterThan(-1);
     expect(zetaIndex).toBeGreaterThan(-1);
     expect(alphaIndex).toBeLessThan(zetaIndex);
-    expect(loggedSummary).toContain('\n');
-    expect(loggedSummary).not.toContain('stringListLength: 0');
-    expect(loggedSummary).not.toContain('int32ListLength: 0');
+    expect(loggedSummary).toContain("\n");
+    expect(loggedSummary).not.toContain("stringListLength: 0");
+    expect(loggedSummary).not.toContain("int32ListLength: 0");
 
     debugSpy.mockRestore();
   });
 });
 
-describe('Availability Service Integration', () => {
-  const baseModel = 'test-model';
+describe("Availability Service Integration", () => {
+  const baseModel = "test-model";
   const baseParams: ConfigParameters = {
-    sessionId: 'test',
-    targetDir: '.',
+    sessionId: "test",
+    targetDir: ".",
     debugMode: false,
     model: baseModel,
-    cwd: '.',
+    cwd: ".",
   };
 
-  it('setActiveModel updates active model and emits event', async () => {
+  it("setActiveModel updates active model and emits event", async () => {
     const config = new Config(baseParams);
-    const model1 = 'model1';
-    const model2 = 'model2';
+    const model1 = "model1";
+    const model2 = "model2";
 
     config.setActiveModel(model1);
     expect(config.getActiveModel()).toBe(model1);
@@ -1717,15 +1624,15 @@ describe('Availability Service Integration', () => {
     expect(mockCoreEvents.emitModelChanged).toHaveBeenCalledWith(model2);
   });
 
-  it('getActiveModel defaults to configured model if not set', () => {
+  it("getActiveModel defaults to configured model if not set", () => {
     const config = new Config(baseParams);
     expect(config.getActiveModel()).toBe(baseModel);
   });
 
-  it('resetTurn delegates to availability service', () => {
+  it("resetTurn delegates to availability service", () => {
     const config = new Config(baseParams);
     const service = config.getModelAvailabilityService();
-    const spy = vi.spyOn(service, 'resetTurn');
+    const spy = vi.spyOn(service, "resetTurn");
 
     config.resetTurn();
     expect(spy).toHaveBeenCalled();
diff --git a/packages/gemini-cli-core/src/config/config.ts b/packages/gemini-cli-core/src/config/config.ts
index 36c53bb43..15366e840 100644
--- a/packages/gemini-cli-core/src/config/config.ts
+++ b/packages/gemini-cli-core/src/config/config.ts
@@ -4,94 +4,91 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import { inspect } from 'node:util';
-import process from 'node:process';
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../core/contentGenerator.js';
+import * as path from "node:path";
+import process from "node:process";
+import { inspect } from "node:util";
+import { ModelAvailabilityService } from "../availability/modelAvailabilityService.js";
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import { GeminiClient } from "../core/client.js";
+import type { ContentGenerator, ContentGeneratorConfig } from "../core/contentGenerator.js";
 import {
   AuthType,
   createContentGenerator,
   createContentGeneratorConfig,
-} from '../core/contentGenerator.js';
-import { PromptRegistry } from '../prompts/prompt-registry.js';
-import { ResourceRegistry } from '../resources/resource-registry.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { LSTool } from '../tools/ls.js';
-import { ReadFileTool } from '../tools/read-file.js';
-import { GrepTool } from '../tools/grep.js';
-import { canUseRipgrep, RipGrepTool } from '../tools/ripGrep.js';
-import { GlobTool } from '../tools/glob.js';
-import { EditTool } from '../tools/edit.js';
-import { SmartEditTool } from '../tools/smart-edit.js';
-import { ShellTool } from '../tools/shell.js';
-import { WriteFileTool } from '../tools/write-file.js';
-import { WebFetchTool } from '../tools/web-fetch.js';
-import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
-import { WebSearchTool } from '../tools/web-search.js';
-import { GeminiClient } from '../core/client.js';
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { HookDefinition, HookEventName } from '../hooks/types.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { GitService } from '../services/gitService.js';
-import type { TelemetryTarget } from '../telemetry/index.js';
+} from "../core/contentGenerator.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import type { FallbackModelHandler } from "../fallback/types.js";
+import type { HookDefinition, HookEventName } from "../hooks/types.js";
+import { ideContextStore } from "../ide/ideContext.js";
+import type { MCPOAuthConfig } from "../mcp/oauth-provider.js";
+import { OutputFormat } from "../output/types.js";
+import { PromptRegistry } from "../prompts/prompt-registry.js";
+import { ResourceRegistry } from "../resources/resource-registry.js";
+import { ModelRouterService } from "../routing/modelRouterService.js";
+import { ContextManager } from "../services/contextManager.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import type { FileSystemService } from "../services/fileSystemService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { GitService } from "../services/gitService.js";
+import type { ModelConfigServiceConfig } from "../services/modelConfigService.js";
+import { ModelConfigService } from "../services/modelConfigService.js";
+import type { TelemetryTarget } from "../telemetry/index.js";
 import {
-  initializeTelemetry,
-  DEFAULT_TELEMETRY_TARGET,
   DEFAULT_OTLP_ENDPOINT,
+  DEFAULT_TELEMETRY_TARGET,
+  initializeTelemetry,
   uiTelemetryService,
-} from '../telemetry/index.js';
-import { coreEvents } from '../utils/events.js';
-import { tokenLimit } from '../core/tokenLimits.js';
+} from "../telemetry/index.js";
+import { logRipgrepFallback } from "../telemetry/loggers.js";
+import { RipgrepFallbackEvent } from "../telemetry/types.js";
+import { EditTool } from "../tools/edit.js";
+import { GlobTool } from "../tools/glob.js";
+import { GrepTool } from "../tools/grep.js";
+import { LSTool } from "../tools/ls.js";
+import { MemoryTool, setGeminiMdFilename } from "../tools/memoryTool.js";
+import { ReadFileTool } from "../tools/read-file.js";
+import { canUseRipgrep, RipGrepTool } from "../tools/ripGrep.js";
+import { ShellTool } from "../tools/shell.js";
+import { SmartEditTool } from "../tools/smart-edit.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import { WebFetchTool } from "../tools/web-fetch.js";
+import { WebSearchTool } from "../tools/web-search.js";
+import { WriteFileTool } from "../tools/write-file.js";
+import { WriteTodosTool } from "../tools/write-todos.js";
+import { shouldAttemptBrowserLaunch } from "../utils/browser.js";
+import { coreEvents } from "../utils/events.js";
+import { DEFAULT_MODEL_CONFIGS } from "./defaultModelConfigs.js";
 import {
   DEFAULT_GEMINI_EMBEDDING_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_THINKING_MODE,
-} from './models.js';
-import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
-import type { MCPOAuthConfig } from '../mcp/oauth-provider.js';
-import { ideContextStore } from '../ide/ideContext.js';
-import { WriteTodosTool } from '../tools/write-todos.js';
-import type { FileSystemService } from '../services/fileSystemService.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { logRipgrepFallback } from '../telemetry/loggers.js';
-import { RipgrepFallbackEvent } from '../telemetry/types.js';
-import type { FallbackModelHandler } from '../fallback/types.js';
-import { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
-import { ModelRouterService } from '../routing/modelRouterService.js';
-import { OutputFormat } from '../output/types.js';
-import type { ModelConfigServiceConfig } from '../services/modelConfigService.js';
-import { ModelConfigService } from '../services/modelConfigService.js';
-import { DEFAULT_MODEL_CONFIGS } from './defaultModelConfigs.js';
-import { ContextManager } from '../services/contextManager.js';
+} from "./models.js";
 
 // Re-export OAuth config type
-export type { MCPOAuthConfig, AnyToolInvocation };
-import type { AnyToolInvocation } from '../tools/tools.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-import { Storage } from './storage.js';
-import type { ShellExecutionConfig } from '../services/shellExecutionService.js';
-import { FileExclusions } from '../utils/ignorePatterns.js';
-import type { EventEmitter } from 'node:events';
-import { MessageBus } from '../confirmation-bus/message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import type { PolicyEngineConfig } from '../policy/types.js';
-import { HookSystem } from '../hooks/index.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { getCodeAssistServer } from '../code_assist/codeAssist.js';
-import type { Experiments } from '../code_assist/experiments/experiments.js';
-import { AgentRegistry } from '../agents/registry.js';
-import { setGlobalProxy } from '../utils/fetch.js';
-import { DelegateToAgentTool } from '../agents/delegate-to-agent-tool.js';
-import { DELEGATE_TO_AGENT_TOOL_NAME } from '../tools/tool-names.js';
-import { getExperiments } from '../code_assist/experiments/experiments.js';
-import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { startupProfiler } from '../telemetry/startupProfiler.js';
-
-import { ApprovalMode } from '../policy/types.js';
+export type { AnyToolInvocation, MCPOAuthConfig };
+
+import type { EventEmitter } from "node:events";
+import { DelegateToAgentTool } from "../agents/delegate-to-agent-tool.js";
+import { AgentRegistry } from "../agents/registry.js";
+import { getCodeAssistServer } from "../code_assist/codeAssist.js";
+import type { Experiments } from "../code_assist/experiments/experiments.js";
+import { getExperiments } from "../code_assist/experiments/experiments.js";
+import { ExperimentFlags } from "../code_assist/experiments/flagNames.js";
+import type { UserTierId } from "../code_assist/types.js";
+import { MessageBus } from "../confirmation-bus/message-bus.js";
+import { HookSystem } from "../hooks/index.js";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import type { PolicyEngineConfig } from "../policy/types.js";
+import { ApprovalMode } from "../policy/types.js";
+import type { ShellExecutionConfig } from "../services/shellExecutionService.js";
+import { startupProfiler } from "../telemetry/startupProfiler.js";
+import { DELEGATE_TO_AGENT_TOOL_NAME } from "../tools/tool-names.js";
+import type { AnyToolInvocation } from "../tools/tools.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { setGlobalProxy } from "../utils/fetch.js";
+import { FileExclusions } from "../utils/ignorePatterns.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { Storage } from "./storage.js";
 
 export interface AccessibilitySettings {
   disableLoadingPhrases?: boolean;
@@ -110,7 +107,7 @@ export interface TelemetrySettings {
   enabled?: boolean;
   target?: TelemetryTarget;
   otlpEndpoint?: string;
-  otlpProtocol?: 'grpc' | 'http';
+  otlpProtocol?: "grpc" | "http";
   logPrompts?: boolean;
   outfile?: string;
   useCollector?: boolean;
@@ -150,30 +147,23 @@ export interface GeminiCLIExtension {
 
 export interface ExtensionInstallMetadata {
   source: string;
-  type: 'git' | 'local' | 'link' | 'github-release';
+  type: "git" | "local" | "link" | "github-release";
   releaseTag?: string; // Only present for github-release installs.
   ref?: string;
   autoUpdate?: boolean;
   allowPreRelease?: boolean;
 }
 
-import type { FileFilteringOptions } from './constants.js';
+import { McpClientManager } from "../tools/mcp-client-manager.js";
+import { type ExtensionLoader, SimpleExtensionLoader } from "../utils/extensionLoader.js";
+import type { FileFilteringOptions } from "./constants.js";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS,
   DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-} from './constants.js';
-
-import {
-  type ExtensionLoader,
-  SimpleExtensionLoader,
-} from '../utils/extensionLoader.js';
-import { McpClientManager } from '../tools/mcp-client-manager.js';
+} from "./constants.js";
 
 export type { FileFilteringOptions };
-export {
-  DEFAULT_FILE_FILTERING_OPTIONS,
-  DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-};
+export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS };
 
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 4_000_000;
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES = 1000;
@@ -197,7 +187,7 @@ export class MCPServerConfig {
     // When set to 'sse', uses SSEClientTransport
     // When omitted, auto-detects transport type
     // Note: 'httpUrl' is deprecated in favor of 'url' + 'type'
-    readonly type?: 'sse' | 'http',
+    readonly type?: "sse" | "http",
     // Common
     readonly timeout?: number,
     readonly trust?: boolean,
@@ -218,13 +208,13 @@ export class MCPServerConfig {
 }
 
 export enum AuthProviderType {
-  DYNAMIC_DISCOVERY = 'dynamic_discovery',
-  GOOGLE_CREDENTIALS = 'google_credentials',
-  SERVICE_ACCOUNT_IMPERSONATION = 'service_account_impersonation',
+  DYNAMIC_DISCOVERY = "dynamic_discovery",
+  GOOGLE_CREDENTIALS = "google_credentials",
+  SERVICE_ACCOUNT_IMPERSONATION = "service_account_impersonation",
 }
 
 export interface SandboxConfig {
-  command: 'docker' | 'podman' | 'sandbox-exec';
+  command: "docker" | "podman" | "sandbox-exec";
   image: string;
 }
 
@@ -280,7 +270,7 @@ export interface ConfigParameters {
   folderTrust?: boolean;
   ideMode?: boolean;
   loadMemoryFromIncludeDirectories?: boolean;
-  importFormat?: 'tree' | 'flat';
+  importFormat?: "tree" | "flat";
   discoveryMaxDirs?: number;
   compressionThreshold?: number;
   interactive?: boolean;
@@ -394,12 +384,10 @@ export class Config {
   private readonly enableExtensionReloading: boolean;
   fallbackModelHandler?: FallbackModelHandler;
   private quotaErrorOccurred: boolean = false;
-  private readonly summarizeToolOutput:
-    | Record<string, SummarizeToolOutputSettings>
-    | undefined;
+  private readonly summarizeToolOutput: Record<string, SummarizeToolOutputSettings> | undefined;
   private readonly experimentalZedIntegration: boolean = false;
   private readonly loadMemoryFromIncludeDirectories: boolean = false;
-  private readonly importFormat: 'tree' | 'flat';
+  private readonly importFormat: "tree" | "flat";
   private readonly discoveryMaxDirs: number;
   private readonly compressionThreshold: number | undefined;
   private readonly interactive: boolean;
@@ -434,9 +422,7 @@ export class Config {
   private readonly disableYoloMode: boolean;
   private pendingIncludeDirectories: string[];
   private readonly enableHooks: boolean;
-  private readonly hooks:
-    | { [K in HookEventName]?: HookDefinition[] }
-    | undefined;
+  private readonly hooks: { [K in HookEventName]?: HookDefinition[] } | undefined;
   private readonly disabledHooks: string[];
   private experiments: Experiments | undefined;
   private experimentsPromise: Promise<void> | undefined;
@@ -452,8 +438,7 @@ export class Config {
 
   constructor(params: ConfigParameters) {
     this.sessionId = params.sessionId;
-    this.embeddingModel =
-      params.embeddingModel ?? DEFAULT_GEMINI_EMBEDDING_MODEL;
+    this.embeddingModel = params.embeddingModel ?? DEFAULT_GEMINI_EMBEDDING_MODEL;
     this.fileSystemService = new StandardFileSystemService();
     this.sandbox = params.sandbox;
     this.targetDir = path.resolve(params.targetDir);
@@ -472,7 +457,7 @@ export class Config {
     this.mcpServers = params.mcpServers;
     this.allowedMcpServers = params.allowedMcpServers ?? [];
     this.blockedMcpServers = params.blockedMcpServers ?? [];
-    this.userMemory = params.userMemory ?? '';
+    this.userMemory = params.userMemory ?? "";
     this.geminiMdFileCount = params.geminiMdFileCount ?? 0;
     this.geminiMdFilePaths = params.geminiMdFilePaths ?? [];
     this.approvalMode = params.approvalMode ?? ApprovalMode.DEFAULT;
@@ -492,13 +477,11 @@ export class Config {
 
     this.fileFiltering = {
       respectGitIgnore:
-        params.fileFiltering?.respectGitIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        params.fileFiltering?.respectGitIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
       respectGeminiIgnore:
         params.fileFiltering?.respectGeminiIgnore ??
         DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-      enableRecursiveFileSearch:
-        params.fileFiltering?.enableRecursiveFileSearch ?? true,
+      enableRecursiveFileSearch: params.fileFiltering?.enableRecursiveFileSearch ?? true,
       disableFuzzySearch: params.fileFiltering?.disableFuzzySearch ?? false,
     };
     this.checkpointing = params.checkpointing ?? false;
@@ -508,32 +491,28 @@ export class Config {
     this.bugCommand = params.bugCommand;
     this.model = params.model;
     this._activeModel = params.model;
-    this.enableModelAvailabilityService =
-      params.enableModelAvailabilityService ?? false;
+    this.enableModelAvailabilityService = params.enableModelAvailabilityService ?? false;
     this.enableAgents = params.enableAgents ?? false;
     this.experimentalJitContext = params.experimentalJitContext ?? false;
     this.modelAvailabilityService = new ModelAvailabilityService();
     this.previewFeatures = params.previewFeatures ?? undefined;
     this.maxSessionTurns = params.maxSessionTurns ?? -1;
-    this.experimentalZedIntegration =
-      params.experimentalZedIntegration ?? false;
+    this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
     this.listSessions = params.listSessions ?? false;
     this.deleteSession = params.deleteSession;
     this.listExtensions = params.listExtensions ?? false;
-    this._extensionLoader =
-      params.extensionLoader ?? new SimpleExtensionLoader([]);
+    this._extensionLoader = params.extensionLoader ?? new SimpleExtensionLoader([]);
     this._enabledExtensions = params.enabledExtensions ?? [];
     this.noBrowser = params.noBrowser ?? false;
     this.summarizeToolOutput = params.summarizeToolOutput;
     this.folderTrust = params.folderTrust ?? false;
     this.ideMode = params.ideMode ?? false;
-    this.loadMemoryFromIncludeDirectories =
-      params.loadMemoryFromIncludeDirectories ?? false;
-    this.importFormat = params.importFormat ?? 'tree';
+    this.loadMemoryFromIncludeDirectories = params.loadMemoryFromIncludeDirectories ?? false;
+    this.importFormat = params.importFormat ?? "tree";
     this.discoveryMaxDirs = params.discoveryMaxDirs ?? 200;
     this.compressionThreshold = params.compressionThreshold;
     this.interactive = params.interactive ?? false;
-    this.ptyInfo = params.ptyInfo ?? 'child_process';
+    this.ptyInfo = params.ptyInfo ?? "child_process";
     this.trustedFolder = params.trustedFolder;
     this.useRipgrep = params.useRipgrep ?? true;
     this.enableInteractiveShell = params.enableInteractiveShell ?? false;
@@ -542,11 +521,10 @@ export class Config {
       terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
       terminalHeight: params.shellExecutionConfig?.terminalHeight ?? 24,
       showColor: params.shellExecutionConfig?.showColor ?? false,
-      pager: params.shellExecutionConfig?.pager ?? 'cat',
+      pager: params.shellExecutionConfig?.pager ?? "cat",
     };
     this.truncateToolOutputThreshold =
-      params.truncateToolOutputThreshold ??
-      DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
+      params.truncateToolOutputThreshold ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
     this.truncateToolOutputLines =
       params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
     this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
@@ -554,9 +532,7 @@ export class Config {
     this.useWriteTodos = params.useWriteTodos ?? true;
     this.enableHooks = params.enableHooks ?? false;
     this.disabledHooks =
-      (params.hooks && 'disabled' in params.hooks
-        ? params.hooks.disabled
-        : undefined) ?? [];
+      (params.hooks && "disabled" in params.hooks ? params.hooks.disabled : undefined) ?? [];
 
     // Enable MessageBus integration if:
     // 1. Explicitly enabled via setting, OR
@@ -564,22 +540,17 @@ export class Config {
     const hasHooks = params.hooks && Object.keys(params.hooks).length > 0;
     const hooksNeedMessageBus = this.enableHooks && hasHooks;
     this.enableMessageBusIntegration =
-      params.enableMessageBusIntegration ??
-      (hooksNeedMessageBus ? true : false);
+      params.enableMessageBusIntegration ?? (hooksNeedMessageBus ? true : false);
     this.codebaseInvestigatorSettings = {
       enabled: params.codebaseInvestigatorSettings?.enabled ?? true,
       maxNumTurns: params.codebaseInvestigatorSettings?.maxNumTurns ?? 10,
       maxTimeMinutes: params.codebaseInvestigatorSettings?.maxTimeMinutes ?? 3,
-      thinkingBudget:
-        params.codebaseInvestigatorSettings?.thinkingBudget ??
-        DEFAULT_THINKING_MODE,
+      thinkingBudget: params.codebaseInvestigatorSettings?.thinkingBudget ?? DEFAULT_THINKING_MODE,
       model: params.codebaseInvestigatorSettings?.model,
     };
     this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
-    this.enableShellOutputEfficiency =
-      params.enableShellOutputEfficiency ?? true;
-    this.shellToolInactivityTimeout =
-      (params.shellToolInactivityTimeout ?? 300) * 1000; // 5 minutes
+    this.enableShellOutputEfficiency = params.enableShellOutputEfficiency ?? true;
+    this.shellToolInactivityTimeout = (params.shellToolInactivityTimeout ?? 300) * 1000; // 5 minutes
     this.extensionManagement = params.extensionManagement ?? true;
     this.enableExtensionReloading = params.enableExtensionReloading ?? false;
     this.storage = new Storage(this.targetDir);
@@ -613,8 +584,8 @@ export class Config {
         setGlobalProxy(proxy);
       } catch (error) {
         coreEvents.emitFeedback(
-          'error',
-          'Invalid proxy configuration detected. Check debug drawer for more details (F12)',
+          "error",
+          "Invalid proxy configuration detected. Check debug drawer for more details (F12)",
           error,
         );
       }
@@ -655,12 +626,12 @@ export class Config {
    */
   async initialize(): Promise<void> {
     if (this.initialized) {
-      throw Error('Config was already initialized');
+      throw Error("Config was already initialized");
     }
     this.initialized = true;
 
     // Initialize centralized FileDiscoveryService
-    const discoverToolsHandle = startupProfiler.start('discover_tools');
+    const discoverToolsHandle = startupProfiler.start("discover_tools");
     this.getFileService();
     if (this.getCheckpointingEnabled()) {
       await this.getGitService();
@@ -673,12 +644,8 @@ export class Config {
 
     this.toolRegistry = await this.createToolRegistry();
     discoverToolsHandle?.end();
-    this.mcpClientManager = new McpClientManager(
-      this.toolRegistry,
-      this,
-      this.eventEmitter,
-    );
-    const initMcpHandle = startupProfiler.start('initialize_mcp_clients');
+    this.mcpClientManager = new McpClientManager(this.toolRegistry, this, this.eventEmitter);
+    const initMcpHandle = startupProfiler.start("initialize_mcp_clients");
     await Promise.all([
       await this.mcpClientManager.startConfiguredMcpServers(),
       await this.getExtensionLoader().start(this),
@@ -716,10 +683,7 @@ export class Config {
       this.geminiClient.stripThoughtsFromHistory();
     }
 
-    const newContentGeneratorConfig = await createContentGeneratorConfig(
-      this,
-      authMethod,
-    );
+    const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
     this.contentGenerator = await createContentGenerator(
       newContentGeneratorConfig,
       this,
@@ -749,7 +713,7 @@ export class Config {
           }
         })
         .catch((e) => {
-          debugLogger.error('Failed to fetch experiments', e);
+          debugLogger.error("Failed to fetch experiments", e);
         });
     } else {
       this.experiments = undefined;
@@ -782,13 +746,10 @@ export class Config {
     if (!this.baseLlmClient) {
       // Handle cases where initialization might be deferred or authentication failed
       if (this.contentGenerator) {
-        this.baseLlmClient = new BaseLlmClient(
-          this.getContentGenerator(),
-          this,
-        );
+        this.baseLlmClient = new BaseLlmClient(this.getContentGenerator(), this);
       } else {
         throw new Error(
-          'BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.',
+          "BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.",
         );
       }
     }
@@ -807,7 +768,7 @@ export class Config {
     return this.loadMemoryFromIncludeDirectories;
   }
 
-  getImportFormat(): 'tree' | 'flat' {
+  getImportFormat(): "tree" | "flat" {
     return this.importFormat;
   }
 
@@ -903,12 +864,12 @@ export class Config {
 
   isRestrictiveSandbox(): boolean {
     const sandboxConfig = this.getSandbox();
-    const seatbeltProfile = process.env['SEATBELT_PROFILE'];
+    const seatbeltProfile = process.env["SEATBELT_PROFILE"];
     return (
       !!sandboxConfig &&
-      sandboxConfig.command === 'sandbox-exec' &&
+      sandboxConfig.command === "sandbox-exec" &&
       !!seatbeltProfile &&
-      seatbeltProfile.startsWith('restrictive-')
+      seatbeltProfile.startsWith("restrictive-")
     );
   }
 
@@ -1028,11 +989,11 @@ export class Config {
   }
 
   getGlobalMemory(): string {
-    return this.contextManager?.getGlobalMemory() ?? '';
+    return this.contextManager?.getGlobalMemory() ?? "";
   }
 
   getEnvironmentMemory(): string {
-    return this.contextManager?.getEnvironmentMemory() ?? '';
+    return this.contextManager?.getEnvironmentMemory() ?? "";
   }
 
   getContextManager(): ContextManager | undefined {
@@ -1065,9 +1026,7 @@ export class Config {
 
   setApprovalMode(mode: ApprovalMode): void {
     if (!this.isTrustedFolder() && mode !== ApprovalMode.DEFAULT) {
-      throw new Error(
-        'Cannot enable privileged approval modes in an untrusted folder.',
-      );
+      throw new Error("Cannot enable privileged approval modes in an untrusted folder.");
     }
     this.approvalMode = mode;
   }
@@ -1104,8 +1063,8 @@ export class Config {
     return this.telemetrySettings.otlpEndpoint ?? DEFAULT_OTLP_ENDPOINT;
   }
 
-  getTelemetryOtlpProtocol(): 'grpc' | 'http' {
-    return this.telemetrySettings.otlpProtocol ?? 'grpc';
+  getTelemetryOtlpProtocol(): "grpc" | "http" {
+    return this.telemetrySettings.otlpProtocol ?? "grpc";
   }
 
   getTelemetryTarget(): TelemetryTarget {
@@ -1265,9 +1224,7 @@ export class Config {
     return this.getNoBrowser() || !shouldAttemptBrowserLaunch();
   }
 
-  getSummarizeToolOutputConfig():
-    | Record<string, SummarizeToolOutputSettings>
-    | undefined {
+  getSummarizeToolOutputConfig(): Record<string, SummarizeToolOutputSettings> | undefined {
     return this.summarizeToolOutput;
   }
 
@@ -1331,8 +1288,7 @@ export class Config {
     await this.ensureExperimentsLoaded();
 
     const remoteThreshold =
-      this.experiments?.flags[ExperimentFlags.CONTEXT_COMPRESSION_THRESHOLD]
-        ?.floatValue;
+      this.experiments?.flags[ExperimentFlags.CONTEXT_COMPRESSION_THRESHOLD]?.floatValue;
     if (remoteThreshold === 0) {
       return undefined;
     }
@@ -1348,17 +1304,13 @@ export class Config {
   async getBannerTextNoCapacityIssues(): Promise<string> {
     await this.ensureExperimentsLoaded();
     return (
-      this.experiments?.flags[ExperimentFlags.BANNER_TEXT_NO_CAPACITY_ISSUES]
-        ?.stringValue ?? ''
+      this.experiments?.flags[ExperimentFlags.BANNER_TEXT_NO_CAPACITY_ISSUES]?.stringValue ?? ""
     );
   }
 
   async getBannerTextCapacityIssues(): Promise<string> {
     await this.ensureExperimentsLoaded();
-    return (
-      this.experiments?.flags[ExperimentFlags.BANNER_TEXT_CAPACITY_ISSUES]
-        ?.stringValue ?? ''
-    );
+    return this.experiments?.flags[ExperimentFlags.BANNER_TEXT_CAPACITY_ISSUES]?.stringValue ?? "";
   }
 
   private async ensureExperimentsLoaded(): Promise<void> {
@@ -1368,16 +1320,12 @@ export class Config {
     try {
       await this.experimentsPromise;
     } catch (e) {
-      debugLogger.debug('Failed to fetch experiments', e);
+      debugLogger.debug("Failed to fetch experiments", e);
     }
   }
 
   isInteractiveShellEnabled(): boolean {
-    return (
-      this.interactive &&
-      this.ptyInfo !== 'child_process' &&
-      this.enableInteractiveShell
-    );
+    return this.interactive && this.ptyInfo !== "child_process" && this.enableInteractiveShell;
   }
 
   isInteractive(): boolean {
@@ -1418,10 +1366,8 @@ export class Config {
 
   setShellExecutionConfig(config: ShellExecutionConfig): void {
     this.shellExecutionConfig = {
-      terminalWidth:
-        config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
-      terminalHeight:
-        config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
+      terminalWidth: config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
+      terminalHeight: config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
       showColor: config.showColor ?? this.shellExecutionConfig.showColor,
       pager: config.pager ?? this.shellExecutionConfig.pager,
     };
@@ -1441,8 +1387,7 @@ export class Config {
   getTruncateToolOutputThreshold(): number {
     return Math.min(
       // Estimate remaining context window in characters (1 token ~= 4 chars).
-      4 *
-        (tokenLimit(this.model) - uiTelemetryService.getLastPromptTokenCount()),
+      4 * (tokenLimit(this.model) - uiTelemetryService.getLastPromptTokenCount()),
       this.truncateToolOutputThreshold,
     );
   }
@@ -1460,9 +1405,7 @@ export class Config {
   }
 
   getOutputFormat(): OutputFormat {
-    return this.outputSettings?.format
-      ? this.outputSettings.format
-      : OutputFormat.TEXT;
+    return this.outputSettings?.format ? this.outputSettings.format : OutputFormat.TEXT;
   }
 
   async getGitService(): Promise<GitService> {
@@ -1512,7 +1455,7 @@ export class Config {
       const toolName = ToolClass.Name || className;
       const coreTools = this.getCoreTools();
       // On some platforms, the className can be minified to _ClassName.
-      const normalizedClassName = className.replace(/^_+/, '');
+      const normalizedClassName = className.replace(/^_+/, "");
 
       let isEnabled = true; // Enabled by default if coreTools is not set.
       if (coreTools) {
@@ -1531,9 +1474,7 @@ export class Config {
         // the tool registry.
         const messageBusEnabled = this.getEnableMessageBusIntegration();
 
-        const toolArgs = messageBusEnabled
-          ? [...args, this.getMessageBus()]
-          : args;
+        const toolArgs = messageBusEnabled ? [...args, this.getMessageBus()] : args;
 
         registry.registerTool(new ToolClass(...toolArgs));
       }
@@ -1577,14 +1518,10 @@ export class Config {
 
     // Register Subagents as Tools
     // Register DelegateToAgentTool if agents are enabled
-    if (
-      this.isAgentsEnabled() ||
-      this.getCodebaseInvestigatorSettings().enabled
-    ) {
+    if (this.isAgentsEnabled() || this.getCodebaseInvestigatorSettings().enabled) {
       // Check if the delegate tool itself is allowed (if allowedTools is set)
       const allowedTools = this.getAllowedTools();
-      const isAllowed =
-        !allowedTools || allowedTools.includes(DELEGATE_TO_AGENT_TOOL_NAME);
+      const isAllowed = !allowedTools || allowedTools.includes(DELEGATE_TO_AGENT_TOOL_NAME);
 
       if (isAllowed) {
         const messageBusEnabled = this.getEnableMessageBusIntegration();
@@ -1640,24 +1577,24 @@ export class Config {
       .map(([flagId, flag]) => {
         const summary: Record<string, unknown> = { flagId };
         if (flag.boolValue !== undefined) {
-          summary['boolValue'] = flag.boolValue;
+          summary["boolValue"] = flag.boolValue;
         }
         if (flag.floatValue !== undefined) {
-          summary['floatValue'] = flag.floatValue;
+          summary["floatValue"] = flag.floatValue;
         }
         if (flag.intValue !== undefined) {
-          summary['intValue'] = flag.intValue;
+          summary["intValue"] = flag.intValue;
         }
         if (flag.stringValue !== undefined) {
-          summary['stringValue'] = flag.stringValue;
+          summary["stringValue"] = flag.stringValue;
         }
         const int32Length = flag.int32ListValue?.values?.length ?? 0;
         if (int32Length > 0) {
-          summary['int32ListLength'] = int32Length;
+          summary["int32ListLength"] = int32Length;
         }
         const stringListLength = flag.stringListValue?.values?.length ?? 0;
         if (stringListLength > 0) {
-          summary['stringListLength'] = stringListLength;
+          summary["stringListLength"] = stringListLength;
         }
         return summary;
       });
@@ -1672,7 +1609,7 @@ export class Config {
       breakLength: 80,
       compact: false,
     });
-    debugLogger.debug('Experiments loaded', summaryString);
+    debugLogger.debug("Experiments loaded", summaryString);
   }
 }
 // Export model constants for use in CLI
diff --git a/packages/gemini-cli-core/src/config/defaultModelConfigs.ts b/packages/gemini-cli-core/src/config/defaultModelConfigs.ts
index dd228ac4e..70cfe8832 100644
--- a/packages/gemini-cli-core/src/config/defaultModelConfigs.ts
+++ b/packages/gemini-cli-core/src/config/defaultModelConfigs.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ThinkingLevel } from '@google/genai';
-import type { ModelConfigServiceConfig } from '../services/modelConfigService.js';
-import { DEFAULT_THINKING_MODE } from './models.js';
+import { ThinkingLevel } from "@google/genai";
+import type { ModelConfigServiceConfig } from "../services/modelConfigService.js";
+import { DEFAULT_THINKING_MODE } from "./models.js";
 
 // The default model configs. We use `base` as the parent for all of our model
 // configs, while `chat-base`, a child of `base`, is the parent of the models
@@ -21,8 +21,8 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'chat-base': {
-      extends: 'base',
+    "chat-base": {
+      extends: "base",
       modelConfig: {
         generateContentConfig: {
           thinkingConfig: {
@@ -34,8 +34,8 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'chat-base-2.5': {
-      extends: 'chat-base',
+    "chat-base-2.5": {
+      extends: "chat-base",
       modelConfig: {
         generateContentConfig: {
           thinkingConfig: {
@@ -44,8 +44,8 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'chat-base-3': {
-      extends: 'chat-base',
+    "chat-base-3": {
+      extends: "chat-base",
       modelConfig: {
         generateContentConfig: {
           thinkingConfig: {
@@ -59,41 +59,41 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
     // ensure these model configs can be used interactively.
     // TODO(joshualitt): Introduce internal base configs for the various models,
     // note: we will have to think carefully about names.
-    'gemini-3-pro-preview': {
-      extends: 'chat-base-3',
+    "gemini-3-pro-preview": {
+      extends: "chat-base-3",
       modelConfig: {
-        model: 'gemini-3-pro-preview',
+        model: "gemini-3-pro-preview",
       },
     },
-    'gemini-2.5-pro': {
-      extends: 'chat-base-2.5',
+    "gemini-2.5-pro": {
+      extends: "chat-base-2.5",
       modelConfig: {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
       },
     },
-    'gemini-2.5-flash': {
-      extends: 'chat-base-2.5',
+    "gemini-2.5-flash": {
+      extends: "chat-base-2.5",
       modelConfig: {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
       },
     },
-    'gemini-2.5-flash-lite': {
-      extends: 'chat-base-2.5',
+    "gemini-2.5-flash-lite": {
+      extends: "chat-base-2.5",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
       },
     },
     // Bases for the internal model configs.
-    'gemini-2.5-flash-base': {
-      extends: 'base',
+    "gemini-2.5-flash-base": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
       },
     },
     classifier: {
-      extends: 'base',
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           maxOutputTokens: 1024,
           thinkingConfig: {
@@ -102,10 +102,10 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'prompt-completion': {
-      extends: 'base',
+    "prompt-completion": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           temperature: 0.3,
           maxOutputTokens: 16000,
@@ -115,10 +115,10 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'edit-corrector': {
-      extends: 'base',
+    "edit-corrector": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           thinkingConfig: {
             thinkingBudget: 0,
@@ -126,34 +126,34 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'summarizer-default': {
-      extends: 'base',
+    "summarizer-default": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           maxOutputTokens: 2000,
         },
       },
     },
-    'summarizer-shell': {
-      extends: 'base',
+    "summarizer-shell": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           maxOutputTokens: 2000,
         },
       },
     },
-    'web-search': {
-      extends: 'gemini-2.5-flash-base',
+    "web-search": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {
         generateContentConfig: {
           tools: [{ googleSearch: {} }],
         },
       },
     },
-    'web-fetch': {
-      extends: 'gemini-2.5-flash-base',
+    "web-fetch": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {
         generateContentConfig: {
           tools: [{ urlContext: {} }],
@@ -161,57 +161,57 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
       },
     },
     // TODO(joshualitt): During cleanup, make modelConfig optional.
-    'web-fetch-fallback': {
-      extends: 'gemini-2.5-flash-base',
+    "web-fetch-fallback": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
-    'loop-detection': {
-      extends: 'gemini-2.5-flash-base',
+    "loop-detection": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
-    'loop-detection-double-check': {
-      extends: 'base',
+    "loop-detection-double-check": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
       },
     },
-    'llm-edit-fixer': {
-      extends: 'gemini-2.5-flash-base',
+    "llm-edit-fixer": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
-    'next-speaker-checker': {
-      extends: 'gemini-2.5-flash-base',
+    "next-speaker-checker": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
-    'chat-compression-3-pro': {
+    "chat-compression-3-pro": {
       modelConfig: {
-        model: 'gemini-3-pro-preview',
+        model: "gemini-3-pro-preview",
       },
     },
-    'chat-compression-2.5-pro': {
+    "chat-compression-2.5-pro": {
       modelConfig: {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
       },
     },
-    'chat-compression-2.5-flash': {
+    "chat-compression-2.5-flash": {
       modelConfig: {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
       },
     },
-    'chat-compression-2.5-flash-lite': {
+    "chat-compression-2.5-flash-lite": {
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
       },
     },
-    'chat-compression-default': {
+    "chat-compression-default": {
       modelConfig: {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
       },
     },
   },
   overrides: [
     {
-      match: { model: 'chat-base', isRetry: true },
+      match: { model: "chat-base", isRetry: true },
       modelConfig: {
         generateContentConfig: {
           temperature: 1,
diff --git a/packages/gemini-cli-core/src/config/flashFallback.test.ts b/packages/gemini-cli-core/src/config/flashFallback.test.ts
index 5665a7e00..3a500ddd7 100644
--- a/packages/gemini-cli-core/src/config/flashFallback.test.ts
+++ b/packages/gemini-cli-core/src/config/flashFallback.test.ts
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { Config } from './config.js';
-import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL } from './models.js';
+import fs from "node:fs";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "./config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL } from "./models.js";
 
-import fs from 'node:fs';
+vi.mock("node:fs");
 
-vi.mock('node:fs');
-
-describe('Flash Model Fallback Configuration', () => {
+describe("Flash Model Fallback Configuration", () => {
   let config: Config;
 
   beforeEach(() => {
@@ -21,19 +20,17 @@ describe('Flash Model Fallback Configuration', () => {
       isDirectory: () => true,
     } as fs.Stats);
     config = new Config({
-      sessionId: 'test-session',
-      targetDir: '/test',
+      sessionId: "test-session",
+      targetDir: "/test",
       debugMode: false,
-      cwd: '/test',
+      cwd: "/test",
       model: DEFAULT_GEMINI_MODEL,
     });
 
     // Initialize contentGeneratorConfig for testing
-    (
-      config as unknown as { contentGeneratorConfig: unknown }
-    ).contentGeneratorConfig = {
+    (config as unknown as { contentGeneratorConfig: unknown }).contentGeneratorConfig = {
       model: DEFAULT_GEMINI_MODEL,
-      authType: 'oauth-personal',
+      authType: "oauth-personal",
     };
   });
 
@@ -41,14 +38,14 @@ describe('Flash Model Fallback Configuration', () => {
   // when setFallbackMode is marked as true. This is to decouple setting a model
   // with the fallback mechanism. This will be necessary we introduce more
   // intelligent model routing.
-  describe('setModel', () => {
-    it('should only mark as switched if contentGeneratorConfig exists', () => {
+  describe("setModel", () => {
+    it("should only mark as switched if contentGeneratorConfig exists", () => {
       // Create config without initializing contentGeneratorConfig
       const newConfig = new Config({
-        sessionId: 'test-session-2',
-        targetDir: '/test',
+        sessionId: "test-session-2",
+        targetDir: "/test",
         debugMode: false,
-        cwd: '/test',
+        cwd: "/test",
         model: DEFAULT_GEMINI_MODEL,
       });
 
@@ -58,38 +55,38 @@ describe('Flash Model Fallback Configuration', () => {
     });
   });
 
-  describe('getModel', () => {
-    it('should return contentGeneratorConfig model if available', () => {
+  describe("getModel", () => {
+    it("should return contentGeneratorConfig model if available", () => {
       // Simulate initialized content generator config
       config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
       expect(config.getModel()).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should fall back to initial model if contentGeneratorConfig is not available', () => {
+    it("should fall back to initial model if contentGeneratorConfig is not available", () => {
       // Test with fresh config where contentGeneratorConfig might not be set
       const newConfig = new Config({
-        sessionId: 'test-session-2',
-        targetDir: '/test',
+        sessionId: "test-session-2",
+        targetDir: "/test",
         debugMode: false,
-        cwd: '/test',
-        model: 'custom-model',
+        cwd: "/test",
+        model: "custom-model",
       });
 
-      expect(newConfig.getModel()).toBe('custom-model');
+      expect(newConfig.getModel()).toBe("custom-model");
     });
   });
 
-  describe('isInFallbackMode', () => {
-    it('should start as false for new session', () => {
+  describe("isInFallbackMode", () => {
+    it("should start as false for new session", () => {
       expect(config.isInFallbackMode()).toBe(false);
     });
 
-    it('should remain false if no model switch occurs', () => {
+    it("should remain false if no model switch occurs", () => {
       // Perform other operations that don't involve model switching
       expect(config.isInFallbackMode()).toBe(false);
     });
 
-    it('should persist switched state throughout session', () => {
+    it("should persist switched state throughout session", () => {
       config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
       // Setting state for fallback mode as is expected of clients
       config.setFallbackMode(true);
diff --git a/packages/gemini-cli-core/src/config/models.test.ts b/packages/gemini-cli-core/src/config/models.test.ts
index 48a6f8003..8a52c9ae5 100644
--- a/packages/gemini-cli-core/src/config/models.test.ts
+++ b/packages/gemini-cli-core/src/config/models.test.ts
@@ -4,220 +4,144 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
-  getEffectiveModel,
-  DEFAULT_GEMINI_MODEL,
-  PREVIEW_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
-  GEMINI_MODEL_ALIAS_PRO,
+  DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_MODEL,
   GEMINI_MODEL_ALIAS_FLASH,
   GEMINI_MODEL_ALIAS_FLASH_LITE,
-} from './models.js';
+  GEMINI_MODEL_ALIAS_PRO,
+  getEffectiveModel,
+  PREVIEW_GEMINI_MODEL,
+} from "./models.js";
 
-describe('getEffectiveModel', () => {
-  describe('When NOT in fallback mode', () => {
+describe("getEffectiveModel", () => {
+  describe("When NOT in fallback mode", () => {
     const isInFallbackMode = false;
 
-    it('should return the Pro model when Pro is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_MODEL,
-        false,
-      );
+    it("should return the Pro model when Pro is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_MODEL, false);
       expect(model).toBe(DEFAULT_GEMINI_MODEL);
     });
 
-    it('should return the Flash model when Flash is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_MODEL,
-        false,
-      );
+    it("should return the Flash model when Flash is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_MODEL, false);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should return the Lite model when Lite is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_LITE_MODEL,
-        false,
-      );
+    it("should return the Lite model when Lite is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_LITE_MODEL, false);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
     });
 
-    it('should return a custom model name when requested', () => {
-      const customModel = 'custom-model-v1';
+    it("should return a custom model name when requested", () => {
+      const customModel = "custom-model-v1";
       const model = getEffectiveModel(isInFallbackMode, customModel, false);
       expect(model).toBe(customModel);
     });
 
-    describe('with preview features', () => {
-      it('should return the preview model when pro alias is requested', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          GEMINI_MODEL_ALIAS_PRO,
-          true,
-        );
+    describe("with preview features", () => {
+      it("should return the preview model when pro alias is requested", () => {
+        const model = getEffectiveModel(isInFallbackMode, GEMINI_MODEL_ALIAS_PRO, true);
         expect(model).toBe(PREVIEW_GEMINI_MODEL);
       });
 
-      it('should return the default pro model when pro alias is requested and preview is off', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          GEMINI_MODEL_ALIAS_PRO,
-          false,
-        );
+      it("should return the default pro model when pro alias is requested and preview is off", () => {
+        const model = getEffectiveModel(isInFallbackMode, GEMINI_MODEL_ALIAS_PRO, false);
         expect(model).toBe(DEFAULT_GEMINI_MODEL);
       });
 
-      it('should return the flash model when flash is requested and preview is on', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          GEMINI_MODEL_ALIAS_FLASH,
-          true,
-        );
+      it("should return the flash model when flash is requested and preview is on", () => {
+        const model = getEffectiveModel(isInFallbackMode, GEMINI_MODEL_ALIAS_FLASH, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
       });
 
-      it('should return the flash model when lite is requested and preview is on', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          GEMINI_MODEL_ALIAS_FLASH_LITE,
-          true,
-        );
+      it("should return the flash model when lite is requested and preview is on", () => {
+        const model = getEffectiveModel(isInFallbackMode, GEMINI_MODEL_ALIAS_FLASH_LITE, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
       });
 
-      it('should return the flash model when the flash model name is explicitly requested and preview is on', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          DEFAULT_GEMINI_FLASH_MODEL,
-          true,
-        );
+      it("should return the flash model when the flash model name is explicitly requested and preview is on", () => {
+        const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_MODEL, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
       });
 
-      it('should return the lite model when the lite model name is requested and preview is on', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          DEFAULT_GEMINI_FLASH_LITE_MODEL,
-          true,
-        );
+      it("should return the lite model when the lite model name is requested and preview is on", () => {
+        const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_LITE_MODEL, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
       });
 
-      it('should return the default gemini model when the model is explicitly set and preview is on', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          DEFAULT_GEMINI_MODEL,
-          true,
-        );
+      it("should return the default gemini model when the model is explicitly set and preview is on", () => {
+        const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_MODEL, true);
         expect(model).toBe(DEFAULT_GEMINI_MODEL);
       });
     });
   });
 
-  describe('When IN fallback mode', () => {
+  describe("When IN fallback mode", () => {
     const isInFallbackMode = true;
 
-    it('should downgrade the Pro model to the Flash model', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_MODEL,
-        false,
-      );
+    it("should downgrade the Pro model to the Flash model", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_MODEL, false);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should return the Flash model when Flash is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_MODEL,
-        false,
-      );
+    it("should return the Flash model when Flash is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_MODEL, false);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should HONOR the Lite model when Lite is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_LITE_MODEL,
-        false,
-      );
+    it("should HONOR the Lite model when Lite is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_LITE_MODEL, false);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
     });
 
     it('should HONOR any model with "lite" in its name', () => {
-      const customLiteModel = 'gemini-2.5-custom-lite-vNext';
+      const customLiteModel = "gemini-2.5-custom-lite-vNext";
       const model = getEffectiveModel(isInFallbackMode, customLiteModel, false);
       expect(model).toBe(customLiteModel);
     });
 
-    it('should downgrade any other custom model to the Flash model', () => {
-      const customModel = 'custom-model-v1-unlisted';
+    it("should downgrade any other custom model to the Flash model", () => {
+      const customModel = "custom-model-v1-unlisted";
       const model = getEffectiveModel(isInFallbackMode, customModel, false);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    describe('with preview features', () => {
-      it('should downgrade the Pro alias to the Flash model', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          GEMINI_MODEL_ALIAS_PRO,
-          true,
-        );
+    describe("with preview features", () => {
+      it("should downgrade the Pro alias to the Flash model", () => {
+        const model = getEffectiveModel(isInFallbackMode, GEMINI_MODEL_ALIAS_PRO, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
       });
 
-      it('should return the Flash alias when requested', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          GEMINI_MODEL_ALIAS_FLASH,
-          true,
-        );
+      it("should return the Flash alias when requested", () => {
+        const model = getEffectiveModel(isInFallbackMode, GEMINI_MODEL_ALIAS_FLASH, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
       });
 
-      it('should return the Lite alias when requested', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          GEMINI_MODEL_ALIAS_FLASH_LITE,
-          true,
-        );
+      it("should return the Lite alias when requested", () => {
+        const model = getEffectiveModel(isInFallbackMode, GEMINI_MODEL_ALIAS_FLASH_LITE, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
       });
 
-      it('should downgrade the default Gemini model to the Flash model', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          DEFAULT_GEMINI_MODEL,
-          true,
-        );
+      it("should downgrade the default Gemini model to the Flash model", () => {
+        const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_MODEL, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
       });
 
-      it('should return the default Flash model when requested', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          DEFAULT_GEMINI_FLASH_MODEL,
-          true,
-        );
+      it("should return the default Flash model when requested", () => {
+        const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_MODEL, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
       });
 
-      it('should return the default Lite model when requested', () => {
-        const model = getEffectiveModel(
-          isInFallbackMode,
-          DEFAULT_GEMINI_FLASH_LITE_MODEL,
-          true,
-        );
+      it("should return the default Lite model when requested", () => {
+        const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_LITE_MODEL, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
       });
 
-      it('should downgrade any other custom model to the Flash model', () => {
-        const customModel = 'custom-model-v1-unlisted';
+      it("should downgrade any other custom model to the Flash model", () => {
+        const customModel = "custom-model-v1-unlisted";
         const model = getEffectiveModel(isInFallbackMode, customModel, true);
         expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
       });
diff --git a/packages/gemini-cli-core/src/config/models.ts b/packages/gemini-cli-core/src/config/models.ts
index 215019ef0..0a0b5f2ba 100644
--- a/packages/gemini-cli-core/src/config/models.ts
+++ b/packages/gemini-cli-core/src/config/models.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const PREVIEW_GEMINI_MODEL = 'gemini-3-pro-preview';
-export const DEFAULT_GEMINI_MODEL = 'gemini-2.5-pro';
-export const DEFAULT_GEMINI_FLASH_MODEL = 'gemini-2.5-flash';
-export const DEFAULT_GEMINI_FLASH_LITE_MODEL = 'gemini-2.5-flash-lite';
+export const PREVIEW_GEMINI_MODEL = "gemini-3-pro-preview";
+export const DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
+export const DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
+export const DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
 
 export const VALID_GEMINI_MODELS = new Set([
   PREVIEW_GEMINI_MODEL,
@@ -16,14 +16,14 @@ export const VALID_GEMINI_MODELS = new Set([
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
 ]);
 
-export const DEFAULT_GEMINI_MODEL_AUTO = 'auto';
+export const DEFAULT_GEMINI_MODEL_AUTO = "auto";
 
 // Model aliases for user convenience.
-export const GEMINI_MODEL_ALIAS_PRO = 'pro';
-export const GEMINI_MODEL_ALIAS_FLASH = 'flash';
-export const GEMINI_MODEL_ALIAS_FLASH_LITE = 'flash-lite';
+export const GEMINI_MODEL_ALIAS_PRO = "pro";
+export const GEMINI_MODEL_ALIAS_FLASH = "flash";
+export const GEMINI_MODEL_ALIAS_FLASH_LITE = "flash-lite";
 
-export const DEFAULT_GEMINI_EMBEDDING_MODEL = 'gemini-embedding-001';
+export const DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
 
 // Cap the thinking at 8192 to prevent run-away thinking loops.
 export const DEFAULT_THINKING_MODE = 8192;
@@ -43,9 +43,7 @@ export function resolveModel(
   switch (requestedModel) {
     case DEFAULT_GEMINI_MODEL_AUTO:
     case GEMINI_MODEL_ALIAS_PRO: {
-      return previewFeaturesEnabled
-        ? PREVIEW_GEMINI_MODEL
-        : DEFAULT_GEMINI_MODEL;
+      return previewFeaturesEnabled ? PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
     }
     case GEMINI_MODEL_ALIAS_FLASH: {
       return DEFAULT_GEMINI_FLASH_MODEL;
@@ -87,7 +85,7 @@ export function getEffectiveModel(
 
   // If a "lite" model is requested, honor it. This allows for variations of
   // lite models without needing to list them all as constants.
-  if (resolvedModel.includes('lite')) {
+  if (resolvedModel.includes("lite")) {
     return resolvedModel;
   }
 
diff --git a/packages/gemini-cli-core/src/config/storage.test.ts b/packages/gemini-cli-core/src/config/storage.test.ts
index 075eb9fb1..7f7f2615c 100644
--- a/packages/gemini-cli-core/src/config/storage.test.ts
+++ b/packages/gemini-cli-core/src/config/storage.test.ts
@@ -4,58 +4,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as os from "node:os";
+import * as path from "node:path";
+import { describe, expect, it, vi } from "vitest";
 
-vi.mock('fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs')>();
+vi.mock("fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("fs")>();
   return {
     ...actual,
     mkdirSync: vi.fn(),
   };
 });
 
-import { Storage } from './storage.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+import { GEMINI_DIR } from "../utils/paths.js";
+import { Storage } from "./storage.js";
 
-describe('Storage – getGlobalSettingsPath', () => {
-  it('returns path to ~/.gemini/settings.json', () => {
-    const expected = path.join(os.homedir(), GEMINI_DIR, 'settings.json');
+describe("Storage – getGlobalSettingsPath", () => {
+  it("returns path to ~/.gemini/settings.json", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "settings.json");
     expect(Storage.getGlobalSettingsPath()).toBe(expected);
   });
 });
 
-describe('Storage – additional helpers', () => {
-  const projectRoot = '/tmp/project';
+describe("Storage – additional helpers", () => {
+  const projectRoot = "/tmp/project";
   const storage = new Storage(projectRoot);
 
-  it('getWorkspaceSettingsPath returns project/.gemini/settings.json', () => {
-    const expected = path.join(projectRoot, GEMINI_DIR, 'settings.json');
+  it("getWorkspaceSettingsPath returns project/.gemini/settings.json", () => {
+    const expected = path.join(projectRoot, GEMINI_DIR, "settings.json");
     expect(storage.getWorkspaceSettingsPath()).toBe(expected);
   });
 
-  it('getUserCommandsDir returns ~/.gemini/commands', () => {
-    const expected = path.join(os.homedir(), GEMINI_DIR, 'commands');
+  it("getUserCommandsDir returns ~/.gemini/commands", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "commands");
     expect(Storage.getUserCommandsDir()).toBe(expected);
   });
 
-  it('getProjectCommandsDir returns project/.gemini/commands', () => {
-    const expected = path.join(projectRoot, GEMINI_DIR, 'commands');
+  it("getProjectCommandsDir returns project/.gemini/commands", () => {
+    const expected = path.join(projectRoot, GEMINI_DIR, "commands");
     expect(storage.getProjectCommandsDir()).toBe(expected);
   });
 
-  it('getMcpOAuthTokensPath returns ~/.gemini/mcp-oauth-tokens.json', () => {
-    const expected = path.join(
-      os.homedir(),
-      GEMINI_DIR,
-      'mcp-oauth-tokens.json',
-    );
+  it("getMcpOAuthTokensPath returns ~/.gemini/mcp-oauth-tokens.json", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "mcp-oauth-tokens.json");
     expect(Storage.getMcpOAuthTokensPath()).toBe(expected);
   });
 
-  it('getGlobalBinDir returns ~/.gemini/tmp/bin', () => {
-    const expected = path.join(os.homedir(), GEMINI_DIR, 'tmp', 'bin');
+  it("getGlobalBinDir returns ~/.gemini/tmp/bin", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "tmp", "bin");
     expect(Storage.getGlobalBinDir()).toBe(expected);
   });
 });
diff --git a/packages/gemini-cli-core/src/config/storage.ts b/packages/gemini-cli-core/src/config/storage.ts
index a98030c49..144f7cc1d 100644
--- a/packages/gemini-cli-core/src/config/storage.ts
+++ b/packages/gemini-cli-core/src/config/storage.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import * as os from 'node:os';
-import * as crypto from 'node:crypto';
-import * as fs from 'node:fs';
-import { GEMINI_DIR } from '../utils/paths.js';
+import * as crypto from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { GEMINI_DIR } from "../utils/paths.js";
 
-export const GOOGLE_ACCOUNTS_FILENAME = 'google_accounts.json';
-export const OAUTH_FILE = 'oauth_creds.json';
-const TMP_DIR_NAME = 'tmp';
-const BIN_DIR_NAME = 'bin';
+export const GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
+export const OAUTH_FILE = "oauth_creds.json";
+const TMP_DIR_NAME = "tmp";
+const BIN_DIR_NAME = "bin";
 
 export class Storage {
   private readonly targetDir: string;
@@ -31,15 +31,15 @@ export class Storage {
   }
 
   static getMcpOAuthTokensPath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'mcp-oauth-tokens.json');
+    return path.join(Storage.getGlobalGeminiDir(), "mcp-oauth-tokens.json");
   }
 
   static getGlobalSettingsPath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'settings.json');
+    return path.join(Storage.getGlobalGeminiDir(), "settings.json");
   }
 
   static getInstallationIdPath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'installation_id');
+    return path.join(Storage.getGlobalGeminiDir(), "installation_id");
   }
 
   static getGoogleAccountsPath(): string {
@@ -47,32 +47,32 @@ export class Storage {
   }
 
   static getUserCommandsDir(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'commands');
+    return path.join(Storage.getGlobalGeminiDir(), "commands");
   }
 
   static getGlobalMemoryFilePath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'memory.md');
+    return path.join(Storage.getGlobalGeminiDir(), "memory.md");
   }
 
   static getUserPoliciesDir(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'policies');
+    return path.join(Storage.getGlobalGeminiDir(), "policies");
   }
 
   static getSystemSettingsPath(): string {
-    if (process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH']) {
-      return process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
+    if (process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"]) {
+      return process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"];
     }
-    if (os.platform() === 'darwin') {
-      return '/Library/Application Support/GeminiCli/settings.json';
-    } else if (os.platform() === 'win32') {
-      return 'C:\\ProgramData\\gemini-cli\\settings.json';
+    if (os.platform() === "darwin") {
+      return "/Library/Application Support/GeminiCli/settings.json";
+    } else if (os.platform() === "win32") {
+      return "C:\\ProgramData\\gemini-cli\\settings.json";
     } else {
-      return '/etc/gemini-cli/settings.json';
+      return "/etc/gemini-cli/settings.json";
     }
   }
 
   static getSystemPoliciesDir(): string {
-    return path.join(path.dirname(Storage.getSystemSettingsPath()), 'policies');
+    return path.join(path.dirname(Storage.getSystemSettingsPath()), "policies");
   }
 
   static getGlobalTempDir(): string {
@@ -106,36 +106,36 @@ export class Storage {
   }
 
   private getFilePathHash(filePath: string): string {
-    return crypto.createHash('sha256').update(filePath).digest('hex');
+    return crypto.createHash("sha256").update(filePath).digest("hex");
   }
 
   getHistoryDir(): string {
     const hash = this.getFilePathHash(this.getProjectRoot());
-    const historyDir = path.join(Storage.getGlobalGeminiDir(), 'history');
+    const historyDir = path.join(Storage.getGlobalGeminiDir(), "history");
     return path.join(historyDir, hash);
   }
 
   getWorkspaceSettingsPath(): string {
-    return path.join(this.getGeminiDir(), 'settings.json');
+    return path.join(this.getGeminiDir(), "settings.json");
   }
 
   getProjectCommandsDir(): string {
-    return path.join(this.getGeminiDir(), 'commands');
+    return path.join(this.getGeminiDir(), "commands");
   }
 
   getProjectTempCheckpointsDir(): string {
-    return path.join(this.getProjectTempDir(), 'checkpoints');
+    return path.join(this.getProjectTempDir(), "checkpoints");
   }
 
   getExtensionsDir(): string {
-    return path.join(this.getGeminiDir(), 'extensions');
+    return path.join(this.getGeminiDir(), "extensions");
   }
 
   getExtensionsConfigPath(): string {
-    return path.join(this.getExtensionsDir(), 'gemini-extension.json');
+    return path.join(this.getExtensionsDir(), "gemini-extension.json");
   }
 
   getHistoryFilePath(): string {
-    return path.join(this.getProjectTempDir(), 'shell_history');
+    return path.join(this.getProjectTempDir(), "shell_history");
   }
 }
diff --git a/packages/gemini-cli-core/src/confirmation-bus/index.ts b/packages/gemini-cli-core/src/confirmation-bus/index.ts
index 379d9aa4d..2130cd553 100644
--- a/packages/gemini-cli-core/src/confirmation-bus/index.ts
+++ b/packages/gemini-cli-core/src/confirmation-bus/index.ts
@@ -4,5 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './message-bus.js';
-export * from './types.js';
+export * from "./message-bus.js";
+export * from "./types.js";
diff --git a/packages/gemini-cli-core/src/confirmation-bus/message-bus.test.ts b/packages/gemini-cli-core/src/confirmation-bus/message-bus.test.ts
index e240df153..1c8311c2f 100644
--- a/packages/gemini-cli-core/src/confirmation-bus/message-bus.test.ts
+++ b/packages/gemini-cli-core/src/confirmation-bus/message-bus.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { MessageBus } from './message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import { PolicyDecision } from '../policy/types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import { PolicyDecision } from "../policy/types.js";
+import { MessageBus } from "./message-bus.js";
 import {
   MessageBusType,
   type ToolConfirmationRequest,
   type ToolConfirmationResponse,
-  type ToolPolicyRejection,
   type ToolExecutionSuccess,
-} from './types.js';
+  type ToolPolicyRejection,
+} from "./types.js";
 
-describe('MessageBus', () => {
+describe("MessageBus", () => {
   let messageBus: MessageBus;
   let policyEngine: PolicyEngine;
 
@@ -25,114 +25,102 @@ describe('MessageBus', () => {
     messageBus = new MessageBus(policyEngine);
   });
 
-  describe('publish', () => {
-    it('should emit error for invalid message', async () => {
+  describe("publish", () => {
+    it("should emit error for invalid message", async () => {
       const errorHandler = vi.fn();
-      messageBus.on('error', errorHandler);
+      messageBus.on("error", errorHandler);
 
       // @ts-expect-error - Testing invalid message
-      await messageBus.publish({ invalid: 'message' });
+      await messageBus.publish({ invalid: "message" });
 
       expect(errorHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          message: expect.stringContaining('Invalid message structure'),
+          message: expect.stringContaining("Invalid message structure"),
         }),
       );
     });
 
-    it('should validate tool confirmation requests have correlationId', async () => {
+    it("should validate tool confirmation requests have correlationId", async () => {
       const errorHandler = vi.fn();
-      messageBus.on('error', errorHandler);
+      messageBus.on("error", errorHandler);
 
       // @ts-expect-error - Testing missing correlationId
       await messageBus.publish({
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test' },
+        toolCall: { name: "test" },
       });
 
       expect(errorHandler).toHaveBeenCalled();
     });
 
-    it('should emit confirmation response when policy allows', async () => {
-      vi.spyOn(policyEngine, 'check').mockResolvedValue({
+    it("should emit confirmation response when policy allows", async () => {
+      vi.spyOn(policyEngine, "check").mockResolvedValue({
         decision: PolicyDecision.ALLOW,
       });
 
       const responseHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        responseHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool', args: {} },
-        correlationId: '123',
+        toolCall: { name: "test-tool", args: {} },
+        correlationId: "123",
       };
 
       await messageBus.publish(request);
 
       const expectedResponse: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: '123',
+        correlationId: "123",
         confirmed: true,
       };
       expect(responseHandler).toHaveBeenCalledWith(expectedResponse);
     });
 
-    it('should emit rejection and response when policy denies', async () => {
-      vi.spyOn(policyEngine, 'check').mockResolvedValue({
+    it("should emit rejection and response when policy denies", async () => {
+      vi.spyOn(policyEngine, "check").mockResolvedValue({
         decision: PolicyDecision.DENY,
       });
 
       const responseHandler = vi.fn();
       const rejectionHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        responseHandler,
-      );
-      messageBus.subscribe(
-        MessageBusType.TOOL_POLICY_REJECTION,
-        rejectionHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
+      messageBus.subscribe(MessageBusType.TOOL_POLICY_REJECTION, rejectionHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool', args: {} },
-        correlationId: '123',
+        toolCall: { name: "test-tool", args: {} },
+        correlationId: "123",
       };
 
       await messageBus.publish(request);
 
       const expectedRejection: ToolPolicyRejection = {
         type: MessageBusType.TOOL_POLICY_REJECTION,
-        toolCall: { name: 'test-tool', args: {} },
+        toolCall: { name: "test-tool", args: {} },
       };
       expect(rejectionHandler).toHaveBeenCalledWith(expectedRejection);
 
       const expectedResponse: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: '123',
+        correlationId: "123",
         confirmed: false,
       };
       expect(responseHandler).toHaveBeenCalledWith(expectedResponse);
     });
 
-    it('should pass through to UI when policy says ASK_USER', async () => {
-      vi.spyOn(policyEngine, 'check').mockResolvedValue({
+    it("should pass through to UI when policy says ASK_USER", async () => {
+      vi.spyOn(policyEngine, "check").mockResolvedValue({
         decision: PolicyDecision.ASK_USER,
       });
 
       const requestHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        requestHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, requestHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool', args: {} },
-        correlationId: '123',
+        toolCall: { name: "test-tool", args: {} },
+        correlationId: "123",
       };
 
       await messageBus.publish(request);
@@ -140,17 +128,14 @@ describe('MessageBus', () => {
       expect(requestHandler).toHaveBeenCalledWith(request);
     });
 
-    it('should emit other message types directly', async () => {
+    it("should emit other message types directly", async () => {
       const successHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_EXECUTION_SUCCESS,
-        successHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, successHandler);
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test-tool' },
-        result: 'success',
+        toolCall: { name: "test-tool" },
+        result: "success",
       };
 
       await messageBus.publish(message);
@@ -159,15 +144,15 @@ describe('MessageBus', () => {
     });
   });
 
-  describe('subscribe/unsubscribe', () => {
-    it('should allow subscribing to specific message types', async () => {
+  describe("subscribe/unsubscribe", () => {
+    it("should allow subscribing to specific message types", async () => {
       const handler = vi.fn();
       messageBus.subscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, handler);
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test' },
-        result: 'test',
+        toolCall: { name: "test" },
+        result: "test",
       };
 
       await messageBus.publish(message);
@@ -175,15 +160,15 @@ describe('MessageBus', () => {
       expect(handler).toHaveBeenCalledWith(message);
     });
 
-    it('should allow unsubscribing from message types', async () => {
+    it("should allow unsubscribing from message types", async () => {
       const handler = vi.fn();
       messageBus.subscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, handler);
       messageBus.unsubscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, handler);
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test' },
-        result: 'test',
+        toolCall: { name: "test" },
+        result: "test",
       };
 
       await messageBus.publish(message);
@@ -191,7 +176,7 @@ describe('MessageBus', () => {
       expect(handler).not.toHaveBeenCalled();
     });
 
-    it('should support multiple subscribers for the same message type', async () => {
+    it("should support multiple subscribers for the same message type", async () => {
       const handler1 = vi.fn();
       const handler2 = vi.fn();
 
@@ -200,8 +185,8 @@ describe('MessageBus', () => {
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test' },
-        result: 'test',
+        toolCall: { name: "test" },
+        result: "test",
       };
 
       await messageBus.publish(message);
@@ -211,20 +196,20 @@ describe('MessageBus', () => {
     });
   });
 
-  describe('error handling', () => {
-    it('should not crash on errors during message processing', async () => {
+  describe("error handling", () => {
+    it("should not crash on errors during message processing", async () => {
       const errorHandler = vi.fn();
-      messageBus.on('error', errorHandler);
+      messageBus.on("error", errorHandler);
 
       // Mock policyEngine to throw an error
-      vi.spyOn(policyEngine, 'check').mockImplementation(async () => {
-        throw new Error('Policy check failed');
+      vi.spyOn(policyEngine, "check").mockImplementation(async () => {
+        throw new Error("Policy check failed");
       });
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool' },
-        correlationId: '123',
+        toolCall: { name: "test-tool" },
+        correlationId: "123",
       };
 
       // Should not throw
@@ -233,7 +218,7 @@ describe('MessageBus', () => {
       // Should emit error
       expect(errorHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          message: 'Policy check failed',
+          message: "Policy check failed",
         }),
       );
     });
diff --git a/packages/gemini-cli-core/src/confirmation-bus/message-bus.ts b/packages/gemini-cli-core/src/confirmation-bus/message-bus.ts
index c4d3911ec..1c9ff9c7f 100644
--- a/packages/gemini-cli-core/src/confirmation-bus/message-bus.ts
+++ b/packages/gemini-cli-core/src/confirmation-bus/message-bus.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { randomUUID } from 'node:crypto';
-import { EventEmitter } from 'node:events';
-import type { PolicyEngine } from '../policy/policy-engine.js';
-import { PolicyDecision, getHookSource } from '../policy/types.js';
+import { randomUUID } from "node:crypto";
+import { EventEmitter } from "node:events";
+import type { PolicyEngine } from "../policy/policy-engine.js";
+import { getHookSource, PolicyDecision } from "../policy/types.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
 import {
-  MessageBusType,
-  type Message,
   type HookExecutionRequest,
   type HookPolicyDecision,
-} from './types.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+  type Message,
+  MessageBusType,
+} from "./types.js";
 
 export class MessageBus extends EventEmitter {
   constructor(
@@ -32,7 +32,7 @@ export class MessageBus extends EventEmitter {
 
     if (
       message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST &&
-      !('correlationId' in message)
+      !("correlationId" in message)
     ) {
       return false;
     }
@@ -50,16 +50,11 @@ export class MessageBus extends EventEmitter {
     }
     try {
       if (!this.isValidMessage(message)) {
-        throw new Error(
-          `Invalid message structure: ${safeJsonStringify(message)}`,
-        );
+        throw new Error(`Invalid message structure: ${safeJsonStringify(message)}`);
       }
 
       if (message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
-        const { decision } = await this.policyEngine.check(
-          message.toolCall,
-          message.serverName,
-        );
+        const { decision } = await this.policyEngine.check(message.toolCall, message.serverName);
 
         switch (decision) {
           case PolicyDecision.ALLOW:
@@ -95,8 +90,7 @@ export class MessageBus extends EventEmitter {
         const decision = await this.policyEngine.checkHook(hookRequest);
 
         // Map decision to allow/deny for observability (ASK_USER treated as deny for hooks)
-        const effectiveDecision =
-          decision === PolicyDecision.ALLOW ? 'allow' : 'deny';
+        const effectiveDecision = decision === PolicyDecision.ALLOW ? "allow" : "deny";
 
         // Emit policy decision for observability
         this.emitMessage({
@@ -104,10 +98,7 @@ export class MessageBus extends EventEmitter {
           eventName: hookRequest.eventName,
           hookSource: getHookSource(hookRequest.input),
           decision: effectiveDecision,
-          reason:
-            decision !== PolicyDecision.ALLOW
-              ? 'Hook execution denied by policy'
-              : undefined,
+          reason: decision !== PolicyDecision.ALLOW ? "Hook execution denied by policy" : undefined,
         } as HookPolicyDecision);
 
         // If allowed, emit the request for hook system to handle
@@ -119,7 +110,7 @@ export class MessageBus extends EventEmitter {
             type: MessageBusType.HOOK_EXECUTION_RESPONSE,
             correlationId: hookRequest.correlationId,
             success: false,
-            error: new Error('Hook execution denied by policy'),
+            error: new Error("Hook execution denied by policy"),
           });
         }
       } else {
@@ -127,21 +118,15 @@ export class MessageBus extends EventEmitter {
         this.emitMessage(message);
       }
     } catch (error) {
-      this.emit('error', error);
+      this.emit("error", error);
     }
   }
 
-  subscribe<T extends Message>(
-    type: T['type'],
-    listener: (message: T) => void,
-  ): void {
+  subscribe<T extends Message>(type: T["type"], listener: (message: T) => void): void {
     this.on(type, listener);
   }
 
-  unsubscribe<T extends Message>(
-    type: T['type'],
-    listener: (message: T) => void,
-  ): void {
+  unsubscribe<T extends Message>(type: T["type"], listener: (message: T) => void): void {
     this.off(type, listener);
   }
 
@@ -151,8 +136,8 @@ export class MessageBus extends EventEmitter {
    * The correlation ID is generated internally and added to the request
    */
   async request<TRequest extends Message, TResponse extends Message>(
-    request: Omit<TRequest, 'correlationId'>,
-    responseType: TResponse['type'],
+    request: Omit<TRequest, "correlationId">,
+    responseType: TResponse["type"],
     timeoutMs: number = 60000,
   ): Promise<TResponse> {
     const correlationId = randomUUID();
@@ -170,10 +155,7 @@ export class MessageBus extends EventEmitter {
 
       const responseHandler = (response: TResponse) => {
         // Check if this response matches our request
-        if (
-          'correlationId' in response &&
-          response.correlationId === correlationId
-        ) {
+        if ("correlationId" in response && response.correlationId === correlationId) {
           cleanup();
           resolve(response);
         }
diff --git a/packages/gemini-cli-core/src/confirmation-bus/types.ts b/packages/gemini-cli-core/src/confirmation-bus/types.ts
index 7c1d01093..7593d7fc1 100644
--- a/packages/gemini-cli-core/src/confirmation-bus/types.ts
+++ b/packages/gemini-cli-core/src/confirmation-bus/types.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type FunctionCall } from '@google/genai';
+import { type FunctionCall } from "@google/genai";
 
 export enum MessageBusType {
-  TOOL_CONFIRMATION_REQUEST = 'tool-confirmation-request',
-  TOOL_CONFIRMATION_RESPONSE = 'tool-confirmation-response',
-  TOOL_POLICY_REJECTION = 'tool-policy-rejection',
-  TOOL_EXECUTION_SUCCESS = 'tool-execution-success',
-  TOOL_EXECUTION_FAILURE = 'tool-execution-failure',
-  UPDATE_POLICY = 'update-policy',
-  HOOK_EXECUTION_REQUEST = 'hook-execution-request',
-  HOOK_EXECUTION_RESPONSE = 'hook-execution-response',
-  HOOK_POLICY_DECISION = 'hook-policy-decision',
+  TOOL_CONFIRMATION_REQUEST = "tool-confirmation-request",
+  TOOL_CONFIRMATION_RESPONSE = "tool-confirmation-response",
+  TOOL_POLICY_REJECTION = "tool-policy-rejection",
+  TOOL_EXECUTION_SUCCESS = "tool-execution-success",
+  TOOL_EXECUTION_FAILURE = "tool-execution-failure",
+  UPDATE_POLICY = "update-policy",
+  HOOK_EXECUTION_REQUEST = "hook-execution-request",
+  HOOK_EXECUTION_RESPONSE = "hook-execution-response",
+  HOOK_POLICY_DECISION = "hook-policy-decision",
 }
 
 export interface ToolConfirmationRequest {
@@ -76,8 +76,8 @@ export interface HookExecutionResponse {
 export interface HookPolicyDecision {
   type: MessageBusType.HOOK_POLICY_DECISION;
   eventName: string;
-  hookSource: 'project' | 'user' | 'system' | 'extension';
-  decision: 'allow' | 'deny';
+  hookSource: "project" | "user" | "system" | "extension";
+  decision: "allow" | "deny";
   reason?: string;
 }
 
diff --git a/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.test.ts b/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.test.ts
index b0b0551f4..792e88c42 100644
--- a/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.test.ts
+++ b/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.test.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import {
-  loadApiKey,
-  saveApiKey,
-  clearApiKey,
-} from './apiKeyCredentialStorage.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { clearApiKey, loadApiKey, saveApiKey } from "./apiKeyCredentialStorage.js";
 
 const getCredentialsMock = vi.hoisted(() => vi.fn());
 const setCredentialsMock = vi.hoisted(() => vi.fn());
 const deleteCredentialsMock = vi.hoisted(() => vi.fn());
 
-vi.mock('../mcp/token-storage/hybrid-token-storage.js', () => ({
+vi.mock("../mcp/token-storage/hybrid-token-storage.js", () => ({
   HybridTokenStorage: vi.fn().mockImplementation(() => ({
     getCredentials: getCredentialsMock,
     setCredentials: setCredentialsMock,
@@ -23,66 +19,66 @@ vi.mock('../mcp/token-storage/hybrid-token-storage.js', () => ({
   })),
 }));
 
-describe('ApiKeyCredentialStorage', () => {
+describe("ApiKeyCredentialStorage", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should load an API key', async () => {
+  it("should load an API key", async () => {
     getCredentialsMock.mockResolvedValue({
-      serverName: 'default-api-key',
+      serverName: "default-api-key",
       token: {
-        accessToken: 'test-key',
-        tokenType: 'ApiKey',
+        accessToken: "test-key",
+        tokenType: "ApiKey",
       },
       updatedAt: Date.now(),
     });
 
     const apiKey = await loadApiKey();
-    expect(apiKey).toBe('test-key');
-    expect(getCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(apiKey).toBe("test-key");
+    expect(getCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 
-  it('should return null if no API key is stored', async () => {
+  it("should return null if no API key is stored", async () => {
     getCredentialsMock.mockResolvedValue(null);
     const apiKey = await loadApiKey();
     expect(apiKey).toBeNull();
-    expect(getCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(getCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 
-  it('should save an API key', async () => {
-    await saveApiKey('new-key');
+  it("should save an API key", async () => {
+    await saveApiKey("new-key");
     expect(setCredentialsMock).toHaveBeenCalledWith(
       expect.objectContaining({
-        serverName: 'default-api-key',
+        serverName: "default-api-key",
         token: expect.objectContaining({
-          accessToken: 'new-key',
-          tokenType: 'ApiKey',
+          accessToken: "new-key",
+          tokenType: "ApiKey",
         }),
       }),
     );
   });
 
-  it('should clear an API key when saving empty key', async () => {
-    await saveApiKey('');
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+  it("should clear an API key when saving empty key", async () => {
+    await saveApiKey("");
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
     expect(setCredentialsMock).not.toHaveBeenCalled();
   });
 
-  it('should clear an API key when saving null key', async () => {
+  it("should clear an API key when saving null key", async () => {
     await saveApiKey(null);
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
     expect(setCredentialsMock).not.toHaveBeenCalled();
   });
 
-  it('should clear an API key', async () => {
+  it("should clear an API key", async () => {
     await clearApiKey();
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 
-  it('should not throw when clearing an API key fails', async () => {
-    deleteCredentialsMock.mockRejectedValueOnce(new Error('Failed to delete'));
-    await expect(saveApiKey('')).resolves.not.toThrow();
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+  it("should not throw when clearing an API key fails", async () => {
+    deleteCredentialsMock.mockRejectedValueOnce(new Error("Failed to delete"));
+    await expect(saveApiKey("")).resolves.not.toThrow();
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 });
diff --git a/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.ts b/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.ts
index 4836ba075..24a3c3cbb 100644
--- a/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.ts
+++ b/packages/gemini-cli-core/src/core/apiKeyCredentialStorage.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { HybridTokenStorage } from '../mcp/token-storage/hybrid-token-storage.js';
-import type { OAuthCredentials } from '../mcp/token-storage/types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { HybridTokenStorage } from "../mcp/token-storage/hybrid-token-storage.js";
+import type { OAuthCredentials } from "../mcp/token-storage/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
 
-const KEYCHAIN_SERVICE_NAME = 'gemini-cli-api-key';
-const DEFAULT_API_KEY_ENTRY = 'default-api-key';
+const KEYCHAIN_SERVICE_NAME = "gemini-cli-api-key";
+const DEFAULT_API_KEY_ENTRY = "default-api-key";
 
 const storage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME);
 
@@ -27,7 +27,7 @@ export async function loadApiKey(): Promise<string | null> {
     return null;
   } catch (error: unknown) {
     // Log other errors but don't crash, just return null so user can re-enter key
-    debugLogger.error('Failed to load API key from storage:', error);
+    debugLogger.error("Failed to load API key from storage:", error);
     return null;
   }
 }
@@ -35,15 +35,13 @@ export async function loadApiKey(): Promise<string | null> {
 /**
  * Save API key
  */
-export async function saveApiKey(
-  apiKey: string | null | undefined,
-): Promise<void> {
-  if (!apiKey || apiKey.trim() === '') {
+export async function saveApiKey(apiKey: string | null | undefined): Promise<void> {
+  if (!apiKey || apiKey.trim() === "") {
     try {
       await storage.deleteCredentials(DEFAULT_API_KEY_ENTRY);
     } catch (error: unknown) {
       // Ignore errors when deleting, as it might not exist
-      debugLogger.warn('Failed to delete API key from storage:', error);
+      debugLogger.warn("Failed to delete API key from storage:", error);
     }
     return;
   }
@@ -53,7 +51,7 @@ export async function saveApiKey(
     serverName: DEFAULT_API_KEY_ENTRY,
     token: {
       accessToken: apiKey,
-      tokenType: 'ApiKey',
+      tokenType: "ApiKey",
     },
     updatedAt: Date.now(),
   };
@@ -68,6 +66,6 @@ export async function clearApiKey(): Promise<void> {
   try {
     await storage.deleteCredentials(DEFAULT_API_KEY_ENTRY);
   } catch (error: unknown) {
-    debugLogger.error('Failed to clear API key from storage:', error);
+    debugLogger.error("Failed to clear API key from storage:", error);
   }
 }
diff --git a/packages/gemini-cli-core/src/core/baseLlmClient.test.ts b/packages/gemini-cli-core/src/core/baseLlmClient.test.ts
index 4027b070e..47263258c 100644
--- a/packages/gemini-cli-core/src/core/baseLlmClient.test.ts
+++ b/packages/gemini-cli-core/src/core/baseLlmClient.test.ts
@@ -4,44 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mocked,
-  type Mock,
-} from 'vitest';
-
-import { BaseLlmClient, type GenerateJsonOptions } from './baseLlmClient.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import type { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
-import { createAvailabilityServiceMock } from '../availability/testUtils.js';
-import type { GenerateContentOptions } from './baseLlmClient.js';
-import type { GenerateContentResponse } from '@google/genai';
-import type { Config } from '../config/config.js';
-import { AuthType } from './contentGenerator.js';
-import { reportError } from '../utils/errorReporting.js';
-import { logMalformedJsonResponse } from '../telemetry/loggers.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import { MalformedJsonResponseEvent } from '../telemetry/types.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type { ModelConfigService } from '../services/modelConfigService.js';
-import { makeResolvedModelConfig } from '../services/modelConfigServiceTestUtils.js';
-
-vi.mock('../utils/errorReporting.js');
-vi.mock('../telemetry/loggers.js');
-vi.mock('../utils/errors.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../utils/errors.js')>();
+import type { GenerateContentResponse } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mock, type Mocked, vi } from "vitest";
+import type { ModelAvailabilityService } from "../availability/modelAvailabilityService.js";
+import { createAvailabilityServiceMock } from "../availability/testUtils.js";
+import type { Config } from "../config/config.js";
+import type { ModelConfigService } from "../services/modelConfigService.js";
+import { makeResolvedModelConfig } from "../services/modelConfigServiceTestUtils.js";
+import { logMalformedJsonResponse } from "../telemetry/loggers.js";
+import { MalformedJsonResponseEvent } from "../telemetry/types.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import type { GenerateContentOptions } from "./baseLlmClient.js";
+import { BaseLlmClient, type GenerateJsonOptions } from "./baseLlmClient.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { AuthType } from "./contentGenerator.js";
+
+vi.mock("../utils/errorReporting.js");
+vi.mock("../telemetry/loggers.js");
+vi.mock("../utils/errors.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/errors.js")>();
   return {
     ...actual,
     getErrorMessage: vi.fn((e) => (e instanceof Error ? e.message : String(e))),
   };
 });
 
-vi.mock('../utils/retry.js', () => ({
+vi.mock("../utils/retry.js", () => ({
   retryWithBackoff: vi.fn(async (fn, options) => {
     // Default implementation - just call the function
     const result = await fn();
@@ -55,10 +45,10 @@ vi.mock('../utils/retry.js', () => ({
         const responseText = result?.candidates?.[0]?.content?.parts?.[0]?.text;
         if (
           !responseText ||
-          responseText.trim() === '' ||
+          responseText.trim() === "" ||
           responseText.includes('{"color": "blue"')
         ) {
-          throw new Error('Retry attempts exhausted for invalid content');
+          throw new Error("Retry attempts exhausted for invalid content");
         }
       }
     }
@@ -83,10 +73,10 @@ const mockContentGenerator = {
 // Helper to create a mock GenerateContentResponse
 const createMockResponse = (text: string): GenerateContentResponse =>
   ({
-    candidates: [{ content: { role: 'model', parts: [{ text }] }, index: 0 }],
+    candidates: [{ content: { role: "model", parts: [{ text }] }, index: 0 }],
   }) as GenerateContentResponse;
 
-describe('BaseLlmClient', () => {
+describe("BaseLlmClient", () => {
   let client: BaseLlmClient;
   let abortController: AbortController;
   let defaultOptions: GenerateJsonOptions;
@@ -100,11 +90,9 @@ describe('BaseLlmClient', () => {
     );
 
     mockConfig = {
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getContentGeneratorConfig: vi
-        .fn()
-        .mockReturnValue({ authType: AuthType.USE_GEMINI }),
-      getEmbeddingModel: vi.fn().mockReturnValue('test-embedding-model'),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
+      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: AuthType.USE_GEMINI }),
+      getEmbeddingModel: vi.fn().mockReturnValue("test-embedding-model"),
       isInteractive: vi.fn().mockReturnValue(false),
       modelConfigService: {
         getResolvedConfig: vi
@@ -117,18 +105,18 @@ describe('BaseLlmClient', () => {
       getPreviewFeatures: vi.fn().mockReturnValue(false),
       getUserTier: vi.fn().mockReturnValue(undefined),
       isInFallbackMode: vi.fn().mockReturnValue(false),
-      getModel: vi.fn().mockReturnValue('test-model'),
-      getActiveModel: vi.fn().mockReturnValue('test-model'),
+      getModel: vi.fn().mockReturnValue("test-model"),
+      getActiveModel: vi.fn().mockReturnValue("test-model"),
     } as unknown as Mocked<Config>;
 
     client = new BaseLlmClient(mockContentGenerator, mockConfig);
     abortController = new AbortController();
     defaultOptions = {
-      modelConfigKey: { model: 'test-model' },
-      contents: [{ role: 'user', parts: [{ text: 'Give me a color.' }] }],
-      schema: { type: 'object', properties: { color: { type: 'string' } } },
+      modelConfigKey: { model: "test-model" },
+      contents: [{ role: "user", parts: [{ text: "Give me a color." }] }],
+      schema: { type: "object", properties: { color: { type: "string" } } },
       abortSignal: abortController.signal,
-      promptId: 'test-prompt-id',
+      promptId: "test-prompt-id",
     };
   });
 
@@ -136,14 +124,14 @@ describe('BaseLlmClient', () => {
     abortController.abort();
   });
 
-  describe('generateJson - Success Scenarios', () => {
-    it('should call generateContent with correct parameters, defaults, and utilize retry mechanism', async () => {
+  describe("generateJson - Success Scenarios", () => {
+    it("should call generateContent with correct parameters, defaults, and utilize retry mechanism", async () => {
       const mockResponse = createMockResponse('{"color": "blue"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
 
       const result = await client.generateJson(defaultOptions);
 
-      expect(result).toEqual({ color: 'blue' });
+      expect(result).toEqual({ color: "blue" });
 
       // Ensure the retry mechanism was engaged with shouldRetryOnContent
       expect(retryWithBackoff).toHaveBeenCalledTimes(1);
@@ -158,25 +146,25 @@ describe('BaseLlmClient', () => {
       expect(mockGenerateContent).toHaveBeenCalledTimes(1);
       expect(mockGenerateContent).toHaveBeenCalledWith(
         {
-          model: 'test-model',
+          model: "test-model",
           contents: defaultOptions.contents,
           config: {
             abortSignal: defaultOptions.abortSignal,
             responseJsonSchema: defaultOptions.schema,
-            responseMimeType: 'application/json',
+            responseMimeType: "application/json",
             temperature: 0,
             topP: 1,
             // Crucial: systemInstruction should NOT be in the config object if not provided
           },
         },
-        'test-prompt-id',
+        "test-prompt-id",
       );
     });
 
-    it('should include system instructions when provided', async () => {
+    it("should include system instructions when provided", async () => {
       const mockResponse = createMockResponse('{"color": "green"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
-      const systemInstruction = 'You are a helpful assistant.';
+      const systemInstruction = "You are a helpful assistant.";
 
       const options: GenerateJsonOptions = {
         ...defaultOptions,
@@ -195,10 +183,10 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should use the provided promptId', async () => {
+    it("should use the provided promptId", async () => {
       const mockResponse = createMockResponse('{"color": "yellow"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
-      const customPromptId = 'custom-id-123';
+      const customPromptId = "custom-id-123";
 
       const options: GenerateJsonOptions = {
         ...defaultOptions,
@@ -207,13 +195,10 @@ describe('BaseLlmClient', () => {
 
       await client.generateJson(options);
 
-      expect(mockGenerateContent).toHaveBeenCalledWith(
-        expect.any(Object),
-        customPromptId,
-      );
+      expect(mockGenerateContent).toHaveBeenCalledWith(expect.any(Object), customPromptId);
     });
 
-    it('should pass maxAttempts to retryWithBackoff when provided', async () => {
+    it("should pass maxAttempts to retryWithBackoff when provided", async () => {
       const mockResponse = createMockResponse('{"color": "cyan"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
       const customMaxAttempts = 3;
@@ -234,7 +219,7 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should call retryWithBackoff without maxAttempts when not provided', async () => {
+    it("should call retryWithBackoff without maxAttempts when not provided", async () => {
       const mockResponse = createMockResponse('{"color": "indigo"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
 
@@ -250,8 +235,8 @@ describe('BaseLlmClient', () => {
     });
   });
 
-  describe('generateJson - Content Validation and Retries', () => {
-    it('should validate content using shouldRetryOnContent function', async () => {
+  describe("generateJson - Content Validation and Retries", () => {
+    it("should validate content using shouldRetryOnContent function", async () => {
       const mockResponse = createMockResponse('{"color": "blue"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
 
@@ -273,25 +258,21 @@ describe('BaseLlmClient', () => {
       expect(shouldRetryOnContent!(mockResponse)).toBe(false);
 
       // Empty response should trigger retry
-      expect(shouldRetryOnContent!(createMockResponse(''))).toBe(true);
+      expect(shouldRetryOnContent!(createMockResponse(""))).toBe(true);
 
       // Invalid JSON should trigger retry
-      expect(
-        shouldRetryOnContent!(createMockResponse('{"color": "blue"')),
-      ).toBe(true);
+      expect(shouldRetryOnContent!(createMockResponse('{"color": "blue"'))).toBe(true);
     });
   });
 
-  describe('generateJson - Response Cleaning', () => {
-    it('should clean JSON wrapped in markdown backticks and log telemetry', async () => {
+  describe("generateJson - Response Cleaning", () => {
+    it("should clean JSON wrapped in markdown backticks and log telemetry", async () => {
       const malformedResponse = '```json\n{"color": "purple"}\n```';
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse(malformedResponse),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse(malformedResponse));
 
       const result = await client.generateJson(defaultOptions);
 
-      expect(result).toEqual({ color: 'purple' });
+      expect(result).toEqual({ color: "purple" });
       expect(logMalformedJsonResponse).toHaveBeenCalledWith(
         mockConfig,
         expect.any(MalformedJsonResponseEvent),
@@ -303,26 +284,22 @@ describe('BaseLlmClient', () => {
       expect(event.model).toBe(defaultOptions.modelConfigKey.model);
     });
 
-    it('should handle extra whitespace correctly without logging malformed telemetry', async () => {
+    it("should handle extra whitespace correctly without logging malformed telemetry", async () => {
       const responseWithWhitespace = '  \n  {"color": "orange"}  \n';
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse(responseWithWhitespace),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse(responseWithWhitespace));
 
       const result = await client.generateJson(defaultOptions);
 
-      expect(result).toEqual({ color: 'orange' });
+      expect(result).toEqual({ color: "orange" });
       expect(logMalformedJsonResponse).not.toHaveBeenCalled();
     });
 
-    it('should use the resolved model name when logging malformed JSON telemetry', async () => {
-      const aliasModel = 'fast-alias';
-      const resolvedModel = 'gemini-1.5-flash';
+    it("should use the resolved model name when logging malformed JSON telemetry", async () => {
+      const aliasModel = "fast-alias";
+      const resolvedModel = "gemini-1.5-flash";
 
       // Override the mock for this specific test to simulate resolution
-      (
-        mockConfig.modelConfigService.getResolvedConfig as unknown as Mock
-      ).mockReturnValue({
+      (mockConfig.modelConfigService.getResolvedConfig as unknown as Mock).mockReturnValue({
         model: resolvedModel,
         generateContentConfig: {
           temperature: 0,
@@ -331,9 +308,7 @@ describe('BaseLlmClient', () => {
       });
 
       const malformedResponse = '```json\n{"color": "red"}\n```';
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse(malformedResponse),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse(malformedResponse));
 
       const options = {
         ...defaultOptions,
@@ -342,7 +317,7 @@ describe('BaseLlmClient', () => {
 
       const result = await client.generateJson(options);
 
-      expect(result).toEqual({ color: 'red' });
+      expect(result).toEqual({ color: "red" });
 
       expect(logMalformedJsonResponse).toHaveBeenCalled();
       const calls = vi.mocked(logMalformedJsonResponse).mock.calls;
@@ -355,62 +330,62 @@ describe('BaseLlmClient', () => {
     });
   });
 
-  describe('generateJson - Error Handling', () => {
-    it('should throw and report error for empty response after retry exhaustion', async () => {
-      mockGenerateContent.mockResolvedValue(createMockResponse(''));
+  describe("generateJson - Error Handling", () => {
+    it("should throw and report error for empty response after retry exhaustion", async () => {
+      mockGenerateContent.mockResolvedValue(createMockResponse(""));
 
       await expect(client.generateJson(defaultOptions)).rejects.toThrow(
-        'Failed to generate content: Retry attempts exhausted for invalid content',
+        "Failed to generate content: Retry attempts exhausted for invalid content",
       );
 
       // Verify error reporting details
       expect(reportError).toHaveBeenCalledTimes(1);
       expect(reportError).toHaveBeenCalledWith(
         expect.any(Error),
-        'API returned invalid content after all retries.',
+        "API returned invalid content after all retries.",
         defaultOptions.contents,
-        'generateJson-invalid-content',
+        "generateJson-invalid-content",
       );
     });
 
-    it('should throw and report error for invalid JSON syntax after retry exhaustion', async () => {
+    it("should throw and report error for invalid JSON syntax after retry exhaustion", async () => {
       const invalidJson = '{"color": "blue"'; // missing closing brace
       mockGenerateContent.mockResolvedValue(createMockResponse(invalidJson));
 
       await expect(client.generateJson(defaultOptions)).rejects.toThrow(
-        'Failed to generate content: Retry attempts exhausted for invalid content',
+        "Failed to generate content: Retry attempts exhausted for invalid content",
       );
 
       expect(reportError).toHaveBeenCalledTimes(1);
       expect(reportError).toHaveBeenCalledWith(
         expect.any(Error),
-        'API returned invalid content after all retries.',
+        "API returned invalid content after all retries.",
         defaultOptions.contents,
-        'generateJson-invalid-content',
+        "generateJson-invalid-content",
       );
     });
 
-    it('should throw and report generic API errors', async () => {
-      const apiError = new Error('Service Unavailable (503)');
+    it("should throw and report generic API errors", async () => {
+      const apiError = new Error("Service Unavailable (503)");
       // Simulate the generator failing
       mockGenerateContent.mockRejectedValue(apiError);
 
       await expect(client.generateJson(defaultOptions)).rejects.toThrow(
-        'Failed to generate content: Service Unavailable (503)',
+        "Failed to generate content: Service Unavailable (503)",
       );
 
       // Verify generic error reporting
       expect(reportError).toHaveBeenCalledTimes(1);
       expect(reportError).toHaveBeenCalledWith(
         apiError,
-        'Error generating content via API.',
+        "Error generating content via API.",
         defaultOptions.contents,
-        'generateJson-api',
+        "generateJson-api",
       );
     });
 
-    it('should throw immediately without reporting if aborted', async () => {
-      const abortError = new DOMException('Aborted', 'AbortError');
+    it("should throw immediately without reporting if aborted", async () => {
+      const abortError = new DOMException("Aborted", "AbortError");
 
       // Simulate abortion happening during the API call
       mockGenerateContent.mockImplementation(() => {
@@ -430,20 +405,17 @@ describe('BaseLlmClient', () => {
     });
   });
 
-  describe('generateEmbedding', () => {
-    const texts = ['hello world', 'goodbye world'];
-    const testEmbeddingModel = 'test-embedding-model';
+  describe("generateEmbedding", () => {
+    const texts = ["hello world", "goodbye world"];
+    const testEmbeddingModel = "test-embedding-model";
 
-    it('should call embedContent with correct parameters and return embeddings', async () => {
+    it("should call embedContent with correct parameters and return embeddings", async () => {
       const mockEmbeddings = [
         [0.1, 0.2, 0.3],
         [0.4, 0.5, 0.6],
       ];
       mockEmbedContent.mockResolvedValue({
-        embeddings: [
-          { values: mockEmbeddings[0] },
-          { values: mockEmbeddings[1] },
-        ],
+        embeddings: [{ values: mockEmbeddings[0] }, { values: mockEmbeddings[1] }],
       });
 
       const result = await client.generateEmbedding(texts);
@@ -456,41 +428,41 @@ describe('BaseLlmClient', () => {
       expect(result).toEqual(mockEmbeddings);
     });
 
-    it('should return an empty array if an empty array is passed', async () => {
+    it("should return an empty array if an empty array is passed", async () => {
       const result = await client.generateEmbedding([]);
       expect(result).toEqual([]);
       expect(mockEmbedContent).not.toHaveBeenCalled();
     });
 
-    it('should throw an error if API response has no embeddings array', async () => {
+    it("should throw an error if API response has no embeddings array", async () => {
       mockEmbedContent.mockResolvedValue({});
 
       await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'No embeddings found in API response.',
+        "No embeddings found in API response.",
       );
     });
 
-    it('should throw an error if API response has an empty embeddings array', async () => {
+    it("should throw an error if API response has an empty embeddings array", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [],
       });
 
       await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'No embeddings found in API response.',
+        "No embeddings found in API response.",
       );
     });
 
-    it('should throw an error if API returns a mismatched number of embeddings', async () => {
+    it("should throw an error if API returns a mismatched number of embeddings", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [{ values: [1, 2, 3] }], // Only one for two texts
       });
 
       await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'API returned a mismatched number of embeddings. Expected 2, got 1.',
+        "API returned a mismatched number of embeddings. Expected 2, got 1.",
       );
     });
 
-    it('should throw an error if any embedding has nullish values', async () => {
+    it("should throw an error if any embedding has nullish values", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [{ values: [1, 2, 3] }, { values: undefined }], // Second one is bad
       });
@@ -500,7 +472,7 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should throw an error if any embedding has an empty values array', async () => {
+    it("should throw an error if any embedding has an empty values array", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [{ values: [] }, { values: [1, 2, 3] }], // First one is bad
       });
@@ -510,25 +482,23 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should propagate errors from the API call', async () => {
-      mockEmbedContent.mockRejectedValue(new Error('API Failure'));
+    it("should propagate errors from the API call", async () => {
+      mockEmbedContent.mockRejectedValue(new Error("API Failure"));
 
-      await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'API Failure',
-      );
+      await expect(client.generateEmbedding(texts)).rejects.toThrow("API Failure");
     });
   });
 
-  describe('generateContent', () => {
-    it('should call generateContent with correct parameters and utilize retry mechanism', async () => {
-      const mockResponse = createMockResponse('This is the content.');
+  describe("generateContent", () => {
+    it("should call generateContent with correct parameters and utilize retry mechanism", async () => {
+      const mockResponse = createMockResponse("This is the content.");
       mockGenerateContent.mockResolvedValue(mockResponse);
 
       const options = {
-        modelConfigKey: { model: 'test-model' },
-        contents: [{ role: 'user', parts: [{ text: 'Give me content.' }] }],
+        modelConfigKey: { model: "test-model" },
+        contents: [{ role: "user", parts: [{ text: "Give me content." }] }],
         abortSignal: abortController.signal,
-        promptId: 'content-prompt-id',
+        promptId: "content-prompt-id",
       };
 
       const result = await client.generateContent(options);
@@ -548,7 +518,7 @@ describe('BaseLlmClient', () => {
       expect(mockGenerateContent).toHaveBeenCalledTimes(1);
       expect(mockGenerateContent).toHaveBeenCalledWith(
         {
-          model: 'test-model',
+          model: "test-model",
           contents: options.contents,
           config: {
             abortSignal: options.abortSignal,
@@ -556,19 +526,19 @@ describe('BaseLlmClient', () => {
             topP: 1,
           },
         },
-        'content-prompt-id',
+        "content-prompt-id",
       );
     });
 
-    it('should validate content using shouldRetryOnContent function', async () => {
-      const mockResponse = createMockResponse('Some valid content.');
+    it("should validate content using shouldRetryOnContent function", async () => {
+      const mockResponse = createMockResponse("Some valid content.");
       mockGenerateContent.mockResolvedValue(mockResponse);
 
       const options = {
-        modelConfigKey: { model: 'test-model' },
-        contents: [{ role: 'user', parts: [{ text: 'Give me content.' }] }],
+        modelConfigKey: { model: "test-model" },
+        contents: [{ role: "user", parts: [{ text: "Give me content." }] }],
         abortSignal: abortController.signal,
-        promptId: 'content-prompt-id',
+        promptId: "content-prompt-id",
       };
 
       await client.generateContent(options);
@@ -580,120 +550,106 @@ describe('BaseLlmClient', () => {
       expect(shouldRetryOnContent!(mockResponse)).toBe(false);
 
       // Empty response should trigger retry
-      expect(shouldRetryOnContent!(createMockResponse(''))).toBe(true);
-      expect(shouldRetryOnContent!(createMockResponse('   '))).toBe(true);
+      expect(shouldRetryOnContent!(createMockResponse(""))).toBe(true);
+      expect(shouldRetryOnContent!(createMockResponse("   "))).toBe(true);
     });
 
-    it('should throw and report error for empty response after retry exhaustion', async () => {
-      mockGenerateContent.mockResolvedValue(createMockResponse(''));
+    it("should throw and report error for empty response after retry exhaustion", async () => {
+      mockGenerateContent.mockResolvedValue(createMockResponse(""));
       const options = {
-        modelConfigKey: { model: 'test-model' },
-        contents: [{ role: 'user', parts: [{ text: 'Give me content.' }] }],
+        modelConfigKey: { model: "test-model" },
+        contents: [{ role: "user", parts: [{ text: "Give me content." }] }],
         abortSignal: abortController.signal,
-        promptId: 'content-prompt-id',
+        promptId: "content-prompt-id",
       };
 
       await expect(client.generateContent(options)).rejects.toThrow(
-        'Failed to generate content: Retry attempts exhausted for invalid content',
+        "Failed to generate content: Retry attempts exhausted for invalid content",
       );
 
       // Verify error reporting details
       expect(reportError).toHaveBeenCalledTimes(1);
       expect(reportError).toHaveBeenCalledWith(
         expect.any(Error),
-        'API returned invalid content after all retries.',
+        "API returned invalid content after all retries.",
         options.contents,
-        'generateContent-invalid-content',
+        "generateContent-invalid-content",
       );
     });
   });
 
-  describe('Availability Service Integration', () => {
+  describe("Availability Service Integration", () => {
     let mockAvailabilityService: ModelAvailabilityService;
     let contentOptions: GenerateContentOptions;
     let jsonOptions: GenerateJsonOptions;
 
     beforeEach(() => {
-      mockConfig.isModelAvailabilityServiceEnabled = vi
-        .fn()
-        .mockReturnValue(true);
+      mockConfig.isModelAvailabilityServiceEnabled = vi.fn().mockReturnValue(true);
 
       mockAvailabilityService = createAvailabilityServiceMock({
-        selectedModel: 'test-model',
+        selectedModel: "test-model",
         skipped: [],
       });
 
       // Reflect setActiveModel into getActiveModel so availability-driven updates
       // are visible to the client under test.
-      mockConfig.getActiveModel = vi.fn().mockReturnValue('test-model');
+      mockConfig.getActiveModel = vi.fn().mockReturnValue("test-model");
       mockConfig.setActiveModel = vi.fn((model: string) => {
         vi.mocked(mockConfig.getActiveModel).mockReturnValue(model);
       });
 
-      vi.spyOn(mockConfig, 'getModelAvailabilityService').mockReturnValue(
-        mockAvailabilityService,
-      );
+      vi.spyOn(mockConfig, "getModelAvailabilityService").mockReturnValue(mockAvailabilityService);
 
       contentOptions = {
-        modelConfigKey: { model: 'test-model' },
-        contents: [{ role: 'user', parts: [{ text: 'Give me a color.' }] }],
+        modelConfigKey: { model: "test-model" },
+        contents: [{ role: "user", parts: [{ text: "Give me a color." }] }],
         abortSignal: abortController.signal,
-        promptId: 'content-prompt-id',
+        promptId: "content-prompt-id",
       };
 
       jsonOptions = {
         ...defaultOptions,
-        promptId: 'json-prompt-id',
+        promptId: "json-prompt-id",
       };
     });
 
-    it('should preserve legacy behavior when availability is disabled', async () => {
-      mockConfig.isModelAvailabilityServiceEnabled = vi
-        .fn()
-        .mockReturnValue(false);
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse('Some text response'),
-      );
+    it("should preserve legacy behavior when availability is disabled", async () => {
+      mockConfig.isModelAvailabilityServiceEnabled = vi.fn().mockReturnValue(false);
+      mockGenerateContent.mockResolvedValue(createMockResponse("Some text response"));
 
       await client.generateContent(contentOptions);
 
-      expect(
-        mockAvailabilityService.selectFirstAvailable,
-      ).not.toHaveBeenCalled();
+      expect(mockAvailabilityService.selectFirstAvailable).not.toHaveBeenCalled();
       expect(mockConfig.setActiveModel).not.toHaveBeenCalled();
       expect(mockAvailabilityService.markHealthy).not.toHaveBeenCalled();
     });
 
-    it('should mark model as healthy on success', async () => {
-      const successfulModel = 'gemini-pro';
+    it("should mark model as healthy on success", async () => {
+      const successfulModel = "gemini-pro";
       vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
         selectedModel: successfulModel,
         skipped: [],
       });
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse('Some text response'),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse("Some text response"));
 
       await client.generateContent({
         ...contentOptions,
         modelConfigKey: { model: successfulModel },
       });
 
-      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith(
-        successfulModel,
-      );
+      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith(successfulModel);
     });
 
-    it('marks the final attempted model healthy after a retry with availability enabled', async () => {
-      const firstModel = 'gemini-pro';
-      const fallbackModel = 'gemini-flash';
+    it("marks the final attempted model healthy after a retry with availability enabled", async () => {
+      const firstModel = "gemini-pro";
+      const fallbackModel = "gemini-flash";
       vi.mocked(mockAvailabilityService.selectFirstAvailable)
         .mockReturnValueOnce({ selectedModel: firstModel, skipped: [] })
         .mockReturnValueOnce({ selectedModel: fallbackModel, skipped: [] });
 
       mockGenerateContent
-        .mockResolvedValueOnce(createMockResponse('retry-me'))
-        .mockResolvedValueOnce(createMockResponse('final-response'));
+        .mockResolvedValueOnce(createMockResponse("retry-me"))
+        .mockResolvedValueOnce(createMockResponse("final-response"));
 
       // Run the real retryWithBackoff (with fake timers) to exercise the retry path
       vi.useFakeTimers();
@@ -715,25 +671,21 @@ describe('BaseLlmClient', () => {
 
       expect(mockConfig.setActiveModel).toHaveBeenCalledWith(firstModel);
       expect(mockConfig.setActiveModel).toHaveBeenCalledWith(fallbackModel);
-      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith(
-        fallbackModel,
-      );
+      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith(fallbackModel);
       expect(mockGenerateContent).toHaveBeenLastCalledWith(
         expect.objectContaining({ model: fallbackModel }),
         expect.any(String),
       );
     });
 
-    it('should consume sticky attempt if selection has attempts', async () => {
-      const stickyModel = 'gemini-pro-sticky';
+    it("should consume sticky attempt if selection has attempts", async () => {
+      const stickyModel = "gemini-pro-sticky";
       vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
         selectedModel: stickyModel,
         attempts: 1,
         skipped: [],
       });
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse('Some text response'),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse("Some text response"));
       vi.mocked(retryWithBackoff).mockImplementation(async (fn, options) => {
         const result = await fn();
         const context = options?.getAvailabilityContext?.();
@@ -748,24 +700,20 @@ describe('BaseLlmClient', () => {
         modelConfigKey: { model: stickyModel },
       });
 
-      expect(mockAvailabilityService.consumeStickyAttempt).toHaveBeenCalledWith(
-        stickyModel,
-      );
+      expect(mockAvailabilityService.consumeStickyAttempt).toHaveBeenCalledWith(stickyModel);
       expect(retryWithBackoff).toHaveBeenCalledWith(
         expect.any(Function),
         expect.objectContaining({ maxAttempts: 1 }),
       );
     });
 
-    it('should mark healthy and honor availability selection when using generateJson', async () => {
-      const availableModel = 'gemini-json-pro';
+    it("should mark healthy and honor availability selection when using generateJson", async () => {
+      const availableModel = "gemini-json-pro";
       vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
         selectedModel: availableModel,
         skipped: [],
       });
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse('{"color":"violet"}'),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse('{"color":"violet"}'));
       vi.mocked(retryWithBackoff).mockImplementation(async (fn, options) => {
         const result = await fn();
         const context = options?.getAvailabilityContext?.();
@@ -777,32 +725,24 @@ describe('BaseLlmClient', () => {
 
       const result = await client.generateJson(jsonOptions);
 
-      expect(result).toEqual({ color: 'violet' });
+      expect(result).toEqual({ color: "violet" });
       expect(mockConfig.setActiveModel).toHaveBeenCalledWith(availableModel);
-      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith(
-        availableModel,
-      );
+      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith(availableModel);
       expect(mockGenerateContent).toHaveBeenLastCalledWith(
         expect.objectContaining({ model: availableModel }),
         jsonOptions.promptId,
       );
     });
 
-    it('should refresh configuration when model changes mid-retry', async () => {
-      const firstModel = 'gemini-pro';
-      const fallbackModel = 'gemini-flash';
+    it("should refresh configuration when model changes mid-retry", async () => {
+      const firstModel = "gemini-pro";
+      const fallbackModel = "gemini-flash";
 
       // Provide distinct configs per model
-      const getResolvedConfigMock = vi.mocked(
-        mockConfig.modelConfigService.getResolvedConfig,
-      );
+      const getResolvedConfigMock = vi.mocked(mockConfig.modelConfigService.getResolvedConfig);
       getResolvedConfigMock
-        .mockReturnValueOnce(
-          makeResolvedModelConfig(firstModel, { temperature: 0.1 }),
-        )
-        .mockReturnValueOnce(
-          makeResolvedModelConfig(fallbackModel, { temperature: 0.9 }),
-        );
+        .mockReturnValueOnce(makeResolvedModelConfig(firstModel, { temperature: 0.1 }))
+        .mockReturnValueOnce(makeResolvedModelConfig(fallbackModel, { temperature: 0.9 }));
 
       // Availability selects the first model initially
       vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
@@ -817,8 +757,8 @@ describe('BaseLlmClient', () => {
 
       // First response empty -> triggers retry; second response valid
       mockGenerateContent
-        .mockResolvedValueOnce(createMockResponse(''))
-        .mockResolvedValueOnce(createMockResponse('final-response'));
+        .mockResolvedValueOnce(createMockResponse(""))
+        .mockResolvedValueOnce(createMockResponse("final-response"));
 
       // Custom retry to force two attempts
       vi.mocked(retryWithBackoff).mockImplementation(async (fn, options) => {
@@ -839,9 +779,9 @@ describe('BaseLlmClient', () => {
       expect(mockGenerateContent).toHaveBeenCalledTimes(2);
       const secondCall = mockGenerateContent.mock.calls[1]?.[0];
 
-      expect(
-        mockConfig.modelConfigService.getResolvedConfig,
-      ).toHaveBeenCalledWith({ model: fallbackModel });
+      expect(mockConfig.modelConfigService.getResolvedConfig).toHaveBeenCalledWith({
+        model: fallbackModel,
+      });
       expect(secondCall?.model).toBe(fallbackModel);
       expect(secondCall?.config?.temperature).toBe(0.9);
     });
diff --git a/packages/gemini-cli-core/src/core/baseLlmClient.ts b/packages/gemini-cli-core/src/core/baseLlmClient.ts
index 8313ee4bc..7ce6a92f2 100644
--- a/packages/gemini-cli-core/src/core/baseLlmClient.ts
+++ b/packages/gemini-cli-core/src/core/baseLlmClient.ts
@@ -6,24 +6,24 @@
 
 import type {
   Content,
-  Part,
   EmbedContentParameters,
-  GenerateContentResponse,
   GenerateContentParameters,
-} from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { reportError } from '../utils/errorReporting.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { logMalformedJsonResponse } from '../telemetry/loggers.js';
-import { MalformedJsonResponseEvent } from '../telemetry/types.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
+  GenerateContentResponse,
+  Part,
+} from "@google/genai";
 import {
   applyModelSelection,
   createAvailabilityContextProvider,
-} from '../availability/policyHelpers.js';
+} from "../availability/policyHelpers.js";
+import type { Config } from "../config/config.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import { logMalformedJsonResponse } from "../telemetry/loggers.js";
+import { MalformedJsonResponseEvent } from "../telemetry/types.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 
 const DEFAULT_MAX_ATTEMPTS = 5;
 
@@ -88,9 +88,7 @@ export class BaseLlmClient {
     private readonly config: Config,
   ) {}
 
-  async generateJson(
-    options: GenerateJsonOptions,
-  ): Promise<Record<string, unknown>> {
+  async generateJson(options: GenerateJsonOptions): Promise<Record<string, unknown>> {
     const {
       schema,
       modelConfigKey,
@@ -126,20 +124,18 @@ export class BaseLlmClient {
           ...generateContentConfig,
           ...(systemInstruction && { systemInstruction }),
           responseJsonSchema: schema,
-          responseMimeType: 'application/json',
+          responseMimeType: "application/json",
           abortSignal,
         },
       },
       promptId,
       maxAttempts,
       shouldRetryOnContent,
-      'generateJson',
+      "generateJson",
     );
 
     // If we are here, the content is valid (not empty and parsable).
-    return JSON.parse(
-      this.cleanJsonResponse(getResponseText(result)!.trim(), model),
-    );
+    return JSON.parse(this.cleanJsonResponse(getResponseText(result)!.trim(), model));
   }
 
   async generateEmbedding(texts: string[]): Promise<number[][]> {
@@ -151,13 +147,9 @@ export class BaseLlmClient {
       contents: texts,
     };
 
-    const embedContentResponse =
-      await this.contentGenerator.embedContent(embedModelParams);
-    if (
-      !embedContentResponse.embeddings ||
-      embedContentResponse.embeddings.length === 0
-    ) {
-      throw new Error('No embeddings found in API response.');
+    const embedContentResponse = await this.contentGenerator.embedContent(embedModelParams);
+    if (!embedContentResponse.embeddings || embedContentResponse.embeddings.length === 0) {
+      throw new Error("No embeddings found in API response.");
     }
 
     if (embedContentResponse.embeddings.length !== texts.length) {
@@ -178,29 +170,18 @@ export class BaseLlmClient {
   }
 
   private cleanJsonResponse(text: string, model: string): string {
-    const prefix = '```json';
-    const suffix = '```';
+    const prefix = "```json";
+    const suffix = "```";
     if (text.startsWith(prefix) && text.endsWith(suffix)) {
-      logMalformedJsonResponse(
-        this.config,
-        new MalformedJsonResponseEvent(model),
-      );
+      logMalformedJsonResponse(this.config, new MalformedJsonResponseEvent(model));
       return text.substring(prefix.length, text.length - suffix.length).trim();
     }
     return text;
   }
 
-  async generateContent(
-    options: GenerateContentOptions,
-  ): Promise<GenerateContentResponse> {
-    const {
-      modelConfigKey,
-      contents,
-      systemInstruction,
-      abortSignal,
-      promptId,
-      maxAttempts,
-    } = options;
+  async generateContent(options: GenerateContentOptions): Promise<GenerateContentResponse> {
+    const { modelConfigKey, contents, systemInstruction, abortSignal, promptId, maxAttempts } =
+      options;
 
     const { model, generateContentConfig } =
       this.config.modelConfigService.getResolvedConfig(modelConfigKey);
@@ -223,7 +204,7 @@ export class BaseLlmClient {
       promptId,
       maxAttempts,
       shouldRetryOnContent,
-      'generateContent',
+      "generateContent",
     );
   }
 
@@ -232,7 +213,7 @@ export class BaseLlmClient {
     promptId: string,
     maxAttempts: number | undefined,
     shouldRetryOnContent: (response: GenerateContentResponse) => boolean,
-    errorContext: 'generateJson' | 'generateContent',
+    errorContext: "generateJson" | "generateContent",
   ): Promise<GenerateContentResponse> {
     const abortSignal = requestParams.config?.abortSignal;
 
@@ -246,11 +227,7 @@ export class BaseLlmClient {
       model,
       config: newConfig,
       maxAttempts: availabilityMaxAttempts,
-    } = applyModelSelection(
-      this.config,
-      requestParams.model,
-      requestParams.config,
-    );
+    } = applyModelSelection(this.config, requestParams.model, requestParams.config);
     requestParams.model = model;
     if (newConfig) {
       requestParams.config = newConfig;
@@ -268,10 +245,9 @@ export class BaseLlmClient {
           if (activeModel !== requestParams.model) {
             requestParams.model = activeModel;
             // Re-resolve config if model changed during retry
-            const { generateContentConfig } =
-              this.config.modelConfigService.getResolvedConfig({
-                model: activeModel,
-              });
+            const { generateContentConfig } = this.config.modelConfigService.getResolvedConfig({
+              model: activeModel,
+            });
             requestParams.config = {
               ...requestParams.config,
               ...generateContentConfig,
@@ -283,8 +259,7 @@ export class BaseLlmClient {
 
       return await retryWithBackoff(apiCall, {
         shouldRetryOnContent,
-        maxAttempts:
-          availabilityMaxAttempts ?? maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+        maxAttempts: availabilityMaxAttempts ?? maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
         getAvailabilityContext,
       });
     } catch (error) {
@@ -293,10 +268,7 @@ export class BaseLlmClient {
       }
 
       // Check if the error is from exhausting retries, and report accordingly.
-      if (
-        error instanceof Error &&
-        error.message.includes('Retry attempts exhausted')
-      ) {
+      if (error instanceof Error && error.message.includes("Retry attempts exhausted")) {
         await reportError(
           error,
           `API returned invalid content after all retries.`,
diff --git a/packages/gemini-cli-core/src/core/client.test.ts b/packages/gemini-cli-core/src/core/client.test.ts
index e4aca47fc..a643aafc0 100644
--- a/packages/gemini-cli-core/src/core/client.test.ts
+++ b/packages/gemini-cli-core/src/core/client.test.ts
@@ -4,56 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-
-import type { Content, GenerateContentResponse, Part } from '@google/genai';
-import { GeminiClient } from './client.js';
+import type { Content, GenerateContentResponse, Part } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { ModelAvailabilityService } from "../availability/modelAvailabilityService.js";
+import * as policyCatalog from "../availability/policyCatalog.js";
+import { createAvailabilityServiceMock } from "../availability/testUtils.js";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { HookSystem } from "../hooks/hookSystem.js";
+import { ideContextStore } from "../ide/ideContext.js";
+import type { ModelRouterService } from "../routing/modelRouterService.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import type { ModelConfigKey, ResolvedModelConfig } from "../services/modelConfigService.js";
+import { ClearcutLogger } from "../telemetry/clearcut-logger/clearcut-logger.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import { setSimulate429 } from "../utils/testUtils.js";
+import { GeminiClient } from "./client.js";
 import {
   AuthType,
   type ContentGenerator,
   type ContentGeneratorConfig,
-} from './contentGenerator.js';
-import { type GeminiChat } from './geminiChat.js';
-import type { Config } from '../config/config.js';
-import {
-  CompressionStatus,
-  GeminiEventType,
-  Turn,
-  type ChatCompressionInfo,
-} from './turn.js';
-import { getCoreSystemPrompt } from './prompts.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { setSimulate429 } from '../utils/testUtils.js';
-import { tokenLimit } from './tokenLimits.js';
-import { ideContextStore } from '../ide/ideContext.js';
-import type { ModelRouterService } from '../routing/modelRouterService.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-import { createAvailabilityServiceMock } from '../availability/testUtils.js';
-import type { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
-import type {
-  ModelConfigKey,
-  ResolvedModelConfig,
-} from '../services/modelConfigService.js';
-import { ClearcutLogger } from '../telemetry/clearcut-logger/clearcut-logger.js';
-import { HookSystem } from '../hooks/hookSystem.js';
-import * as policyCatalog from '../availability/policyCatalog.js';
-
-vi.mock('../services/chatCompressionService.js');
+} from "./contentGenerator.js";
+import { type GeminiChat } from "./geminiChat.js";
+import { getCoreSystemPrompt } from "./prompts.js";
+import { tokenLimit } from "./tokenLimits.js";
+import { type ChatCompressionInfo, CompressionStatus, GeminiEventType, Turn } from "./turn.js";
+
+vi.mock("../services/chatCompressionService.js");
 
 // Mock fs module to prevent actual file system operations during tests
 const mockFileSystem = new Map<string, string>();
 
-vi.mock('node:fs', () => {
+vi.mock("node:fs", () => {
   const fsModule = {
     mkdirSync: vi.fn(),
     writeFileSync: vi.fn((path: string, data: string) => {
@@ -63,8 +46,8 @@ vi.mock('node:fs', () => {
       if (mockFileSystem.has(path)) {
         return mockFileSystem.get(path);
       }
-      throw Object.assign(new Error('ENOENT: no such file or directory'), {
-        code: 'ENOENT',
+      throw Object.assign(new Error("ENOENT: no such file or directory"), {
+        code: "ENOENT",
       });
     }),
     existsSync: vi.fn((path: string) => mockFileSystem.has(path)),
@@ -83,8 +66,8 @@ vi.mock('node:fs', () => {
 // --- Mocks ---
 const mockTurnRunFn = vi.fn();
 
-vi.mock('./turn', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./turn.js')>();
+vi.mock("./turn", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./turn.js")>();
   // Define a mock class that has the same shape as the real Turn
   class MockTurn {
     pendingToolCalls = [];
@@ -102,33 +85,32 @@ vi.mock('./turn', async (importOriginal) => {
   };
 });
 
-vi.mock('../config/config.js');
-vi.mock('./prompts');
-vi.mock('../utils/getFolderStructure', () => ({
-  getFolderStructure: vi.fn().mockResolvedValue('Mock Folder Structure'),
+vi.mock("../config/config.js");
+vi.mock("./prompts");
+vi.mock("../utils/getFolderStructure", () => ({
+  getFolderStructure: vi.fn().mockResolvedValue("Mock Folder Structure"),
 }));
-vi.mock('../utils/errorReporting', () => ({ reportError: vi.fn() }));
-vi.mock('../utils/nextSpeakerChecker', () => ({
+vi.mock("../utils/errorReporting", () => ({ reportError: vi.fn() }));
+vi.mock("../utils/nextSpeakerChecker", () => ({
   checkNextSpeaker: vi.fn().mockResolvedValue(null),
 }));
-vi.mock('../utils/generateContentResponseUtilities', () => ({
+vi.mock("../utils/generateContentResponseUtilities", () => ({
   getResponseText: (result: GenerateContentResponse) =>
-    result.candidates?.[0]?.content?.parts?.map((part) => part.text).join('') ||
-    undefined,
+    result.candidates?.[0]?.content?.parts?.map((part) => part.text).join("") || undefined,
 }));
-vi.mock('../telemetry/index.js', () => ({
+vi.mock("../telemetry/index.js", () => ({
   logApiRequest: vi.fn(),
   logApiResponse: vi.fn(),
   logApiError: vi.fn(),
 }));
-vi.mock('../ide/ideContext.js');
-vi.mock('../telemetry/uiTelemetry.js', () => ({
+vi.mock("../ide/ideContext.js");
+vi.mock("../telemetry/uiTelemetry.js", () => ({
   uiTelemetryService: {
     setLastPromptTokenCount: vi.fn(),
     getLastPromptTokenCount: vi.fn(),
   },
 }));
-vi.mock('../hooks/hookSystem.js');
+vi.mock("../hooks/hookSystem.js");
 
 /**
  * Array.fromAsync ponyfill, which will be available in es 2024.
@@ -143,7 +125,7 @@ async function fromAsync<T>(promise: AsyncGenerator<T>): Promise<readonly T[]> {
   return results;
 }
 
-describe('Gemini Client (client.ts)', () => {
+describe("Gemini Client (client.ts)", () => {
   let mockContentGenerator: ContentGenerator;
   let mockConfig: Config;
   let client: GeminiClient;
@@ -171,9 +153,7 @@ describe('Gemini Client (client.ts)', () => {
     setSimulate429(false);
 
     mockRouterService = {
-      route: vi
-        .fn()
-        .mockResolvedValue({ model: 'default-routed-model', reason: 'test' }),
+      route: vi.fn().mockResolvedValue({ model: "default-routed-model", reason: "test" }),
     };
 
     mockContentGenerator = {
@@ -190,28 +170,26 @@ describe('Gemini Client (client.ts)', () => {
       getFunctionDeclarations: vi.fn().mockReturnValue([]),
       getTool: vi.fn().mockReturnValue(null),
     };
-    const fileService = new FileDiscoveryService('/test/dir');
+    const fileService = new FileDiscoveryService("/test/dir");
     const contentGeneratorConfig: ContentGeneratorConfig = {
-      apiKey: 'test-key',
+      apiKey: "test-key",
       vertexai: false,
       authType: AuthType.USE_GEMINI,
     };
     mockConfig = {
-      getContentGeneratorConfig: vi
-        .fn()
-        .mockReturnValue(contentGeneratorConfig),
+      getContentGeneratorConfig: vi.fn().mockReturnValue(contentGeneratorConfig),
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
-      getModel: vi.fn().mockReturnValue('test-model'),
+      getModel: vi.fn().mockReturnValue("test-model"),
       getUserTier: vi.fn().mockReturnValue(undefined),
-      getEmbeddingModel: vi.fn().mockReturnValue('test-embedding-model'),
-      getApiKey: vi.fn().mockReturnValue('test-key'),
+      getEmbeddingModel: vi.fn().mockReturnValue("test-embedding-model"),
+      getApiKey: vi.fn().mockReturnValue("test-key"),
       getVertexAI: vi.fn().mockReturnValue(false),
-      getUserAgent: vi.fn().mockReturnValue('test-agent'),
-      getUserMemory: vi.fn().mockReturnValue(''),
+      getUserAgent: vi.fn().mockReturnValue("test-agent"),
+      getUserMemory: vi.fn().mockReturnValue(""),
 
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
       getProxy: vi.fn().mockReturnValue(undefined),
-      getWorkingDir: vi.fn().mockReturnValue('/test/dir'),
+      getWorkingDir: vi.fn().mockReturnValue("/test/dir"),
       getFileService: vi.fn().mockReturnValue(fileService),
       getMaxSessionTurns: vi.fn().mockReturnValue(0),
       getQuotaErrorOccurred: vi.fn().mockReturnValue(false),
@@ -223,7 +201,7 @@ describe('Gemini Client (client.ts)', () => {
       getDebugMode: vi.fn().mockReturnValue(false),
       getPreviewFeatures: vi.fn().mockReturnValue(false),
       getWorkspaceContext: vi.fn().mockReturnValue({
-        getDirectories: vi.fn().mockReturnValue(['/test/dir']),
+        getDirectories: vi.fn().mockReturnValue(["/test/dir"]),
       }),
       getGeminiClient: vi.fn(),
       getModelRouterService: vi
@@ -238,15 +216,15 @@ describe('Gemini Client (client.ts)', () => {
       getUseSmartEdit: vi.fn().mockReturnValue(false),
       getShowModelInfoInChat: vi.fn().mockReturnValue(false),
       getContinueOnFailedApiCall: vi.fn(),
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/temp"),
       },
       getContentGenerator: vi.fn().mockReturnValue(mockContentGenerator),
       getBaseLlmClient: vi.fn().mockReturnValue({
         generateJson: vi.fn().mockResolvedValue({
-          next_speaker: 'user',
-          reasoning: 'test',
+          next_speaker: "user",
+          reasoning: "test",
         }),
       }),
       modelConfigService: {
@@ -263,14 +241,12 @@ describe('Gemini Client (client.ts)', () => {
       isInteractive: vi.fn().mockReturnValue(false),
       getExperiments: () => {},
       isModelAvailabilityServiceEnabled: vi.fn().mockReturnValue(false),
-      getActiveModel: vi.fn().mockReturnValue('test-model'),
+      getActiveModel: vi.fn().mockReturnValue("test-model"),
       setActiveModel: vi.fn(),
       resetTurn: vi.fn(),
       getModelAvailabilityService: vi.fn(),
     } as unknown as Config;
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     client = new GeminiClient(mockConfig);
     await client.initialize();
@@ -283,16 +259,16 @@ describe('Gemini Client (client.ts)', () => {
     vi.restoreAllMocks();
   });
 
-  describe('addHistory', () => {
-    it('should call chat.addHistory with the provided content', async () => {
+  describe("addHistory", () => {
+    it("should call chat.addHistory with the provided content", async () => {
       const mockChat = {
         addHistory: vi.fn(),
       } as unknown as GeminiChat;
-      client['chat'] = mockChat;
+      client["chat"] = mockChat;
 
       const newContent = {
-        role: 'user',
-        parts: [{ text: 'New history item' }],
+        role: "user",
+        parts: [{ text: "New history item" }],
       };
       await client.addHistory(newContent);
 
@@ -300,19 +276,17 @@ describe('Gemini Client (client.ts)', () => {
     });
   });
 
-  describe('resetChat', () => {
-    it('should create a new chat session, clearing the old history', async () => {
+  describe("resetChat", () => {
+    it("should create a new chat session, clearing the old history", async () => {
       // 1. Get the initial chat instance and add some history.
       const initialChat = client.getChat();
       const initialHistory = await client.getHistory();
       await client.addHistory({
-        role: 'user',
-        parts: [{ text: 'some old message' }],
+        role: "user",
+        parts: [{ text: "some old message" }],
       });
       const historyWithOldMessage = await client.getHistory();
-      expect(historyWithOldMessage.length).toBeGreaterThan(
-        initialHistory.length,
-      );
+      expect(historyWithOldMessage.length).toBeGreaterThan(initialHistory.length);
 
       // 2. Call resetChat.
       await client.resetChat();
@@ -324,26 +298,24 @@ describe('Gemini Client (client.ts)', () => {
       // 4. Assert that the chat instance is new and the history is reset.
       expect(newChat).not.toBe(initialChat);
       expect(newHistory.length).toBe(initialHistory.length);
-      expect(JSON.stringify(newHistory)).not.toContain('some old message');
+      expect(JSON.stringify(newHistory)).not.toContain("some old message");
     });
   });
 
-  describe('startChat', () => {
-    it('should include environment context when resuming a session', async () => {
+  describe("startChat", () => {
+    it("should include environment context when resuming a session", async () => {
       const extraHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'Old message' }] },
-        { role: 'model', parts: [{ text: 'Old response' }] },
+        { role: "user", parts: [{ text: "Old message" }] },
+        { role: "model", parts: [{ text: "Old response" }] },
       ];
 
       const chat = await client.startChat(extraHistory);
       const history = chat.getHistory();
 
       // The first message should be the environment context
-      expect(history[0].role).toBe('user');
-      expect(history[0].parts?.[0]?.text).toContain('This is the Gemini CLI');
-      expect(history[0].parts?.[0]?.text).toContain(
-        "The project's temporary directory is:",
-      );
+      expect(history[0].role).toBe("user");
+      expect(history[0].parts?.[0]?.text).toContain("This is the Gemini CLI");
+      expect(history[0].parts?.[0]?.text).toContain("The project's temporary directory is:");
 
       // The subsequent messages should be the extra history
       expect(history[1]).toEqual(extraHistory[0]);
@@ -351,15 +323,15 @@ describe('Gemini Client (client.ts)', () => {
     });
   });
 
-  describe('tryCompressChat', () => {
+  describe("tryCompressChat", () => {
     const mockGetHistory = vi.fn();
 
     beforeEach(() => {
-      vi.mock('./tokenLimits', () => ({
+      vi.mock("./tokenLimits", () => ({
         tokenLimit: vi.fn(),
       }));
 
-      client['chat'] = {
+      client["chat"] = {
         getHistory: mockGetHistory,
         addHistory: vi.fn(),
         setHistory: vi.fn(),
@@ -369,8 +341,8 @@ describe('Gemini Client (client.ts)', () => {
 
     function setup({
       chatHistory = [
-        { role: 'user', parts: [{ text: 'Long conversation' }] },
-        { role: 'model', parts: [{ text: 'Long response' }] },
+        { role: "user", parts: [{ text: "Long conversation" }] },
+        { role: "model", parts: [{ text: "Long response" }] },
       ] as Content[],
       originalTokenCount = 1000,
       newTokenCount = 500,
@@ -381,22 +353,17 @@ describe('Gemini Client (client.ts)', () => {
         setHistory: vi.fn(),
         getLastPromptTokenCount: vi.fn().mockReturnValue(originalTokenCount),
       };
-      client['chat'] = mockOriginalChat as GeminiChat;
+      client["chat"] = mockOriginalChat as GeminiChat;
 
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        originalTokenCount,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(originalTokenCount);
 
       const newHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'Summary' }] },
-        { role: 'model', parts: [{ text: 'Got it' }] },
+        { role: "user", parts: [{ text: "Summary" }] },
+        { role: "model", parts: [{ text: "Got it" }] },
       ];
 
       vi.mocked(ChatCompressionService.prototype.compress).mockResolvedValue({
-        newHistory:
-          compressionStatus === CompressionStatus.COMPRESSED
-            ? newHistory
-            : null,
+        newHistory: compressionStatus === CompressionStatus.COMPRESSED ? newHistory : null,
         info: {
           originalTokenCount,
           newTokenCount,
@@ -410,9 +377,7 @@ describe('Gemini Client (client.ts)', () => {
         getLastPromptTokenCount: vi.fn().mockReturnValue(newTokenCount),
       };
 
-      client['startChat'] = vi
-        .fn()
-        .mockResolvedValue(mockNewChat as GeminiChat);
+      client["startChat"] = vi.fn().mockResolvedValue(mockNewChat as GeminiChat);
 
       return {
         client,
@@ -422,17 +387,16 @@ describe('Gemini Client (client.ts)', () => {
       };
     }
 
-    describe('when compression inflates the token count', () => {
-      it('allows compression to be forced/manual after a failure', async () => {
+    describe("when compression inflates the token count", () => {
+      it("allows compression to be forced/manual after a failure", async () => {
         // Call 1 (Fails): Setup with inflated tokens
         setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        await client.tryCompressChat('prompt-id-4', false); // Fails
+        await client.tryCompressChat("prompt-id-4", false); // Fails
 
         // Call 2 (Forced): Re-setup with compressed tokens
         const { estimatedNewTokenCount: compressedTokenCount } = setup({
@@ -441,7 +405,7 @@ describe('Gemini Client (client.ts)', () => {
           compressionStatus: CompressionStatus.COMPRESSED,
         });
 
-        const result = await client.tryCompressChat('prompt-id-4', true); // Forced
+        const result = await client.tryCompressChat("prompt-id-4", true); // Forced
 
         expect(result).toEqual({
           compressionStatus: CompressionStatus.COMPRESSED,
@@ -450,56 +414,48 @@ describe('Gemini Client (client.ts)', () => {
         });
       });
 
-      it('yields the result even if the compression inflated the tokens', async () => {
+      it("yields the result even if the compression inflated the tokens", async () => {
         const { client, estimatedNewTokenCount } = setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        const result = await client.tryCompressChat('prompt-id-4', false);
+        const result = await client.tryCompressChat("prompt-id-4", false);
 
         expect(result).toEqual({
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
           newTokenCount: estimatedNewTokenCount,
           originalTokenCount: 100,
         });
         // IMPORTANT: The change in client.ts means setLastPromptTokenCount is NOT called on failure
-        expect(
-          uiTelemetryService.setLastPromptTokenCount,
-        ).not.toHaveBeenCalled();
+        expect(uiTelemetryService.setLastPromptTokenCount).not.toHaveBeenCalled();
       });
 
-      it('does not manipulate the source chat', async () => {
+      it("does not manipulate the source chat", async () => {
         const { client, mockOriginalChat } = setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        await client.tryCompressChat('prompt-id-4', false);
+        await client.tryCompressChat("prompt-id-4", false);
 
         // On failure, the chat should NOT be replaced
-        expect(client['chat']).toBe(mockOriginalChat);
+        expect(client["chat"]).toBe(mockOriginalChat);
       });
 
-      it.skip('will not attempt to compress context after a failure', async () => {
+      it.skip("will not attempt to compress context after a failure", async () => {
         const { client } = setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        await client.tryCompressChat('prompt-id-4', false); // This fails and sets hasFailedCompressionAttempt = true
+        await client.tryCompressChat("prompt-id-4", false); // This fails and sets hasFailedCompressionAttempt = true
 
         // Mock the next call to return NOOP
-        vi.mocked(
-          ChatCompressionService.prototype.compress,
-        ).mockResolvedValueOnce({
+        vi.mocked(ChatCompressionService.prototype.compress).mockResolvedValueOnce({
           newHistory: null,
           info: {
             originalTokenCount: 0,
@@ -509,17 +465,13 @@ describe('Gemini Client (client.ts)', () => {
         });
 
         // This call should now be a NOOP
-        const result = await client.tryCompressChat('prompt-id-5', false);
+        const result = await client.tryCompressChat("prompt-id-5", false);
 
         expect(result.compressionStatus).toBe(CompressionStatus.NOOP);
-        expect(ChatCompressionService.prototype.compress).toHaveBeenCalledTimes(
-          2,
-        );
-        expect(
-          ChatCompressionService.prototype.compress,
-        ).toHaveBeenLastCalledWith(
+        expect(ChatCompressionService.prototype.compress).toHaveBeenCalledTimes(2);
+        expect(ChatCompressionService.prototype.compress).toHaveBeenLastCalledWith(
           expect.anything(),
-          'prompt-id-5',
+          "prompt-id-5",
           false,
           expect.anything(),
           expect.anything(),
@@ -527,18 +479,17 @@ describe('Gemini Client (client.ts)', () => {
         );
       });
     });
-    it('should correctly latch hasFailedCompressionAttempt flag', async () => {
+    it("should correctly latch hasFailedCompressionAttempt flag", async () => {
       // 1. Setup: Call setup() from this test file
       // This helper function mocks the compression service for us.
       const { client } = setup({
         originalTokenCount: 100,
         newTokenCount: 200, // Inflated
-        compressionStatus:
-          CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+        compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
       });
 
       // 2. Test Step 1: Trigger a non-forced failure
-      await client.tryCompressChat('prompt-1', false); // force = false
+      await client.tryCompressChat("prompt-1", false); // force = false
 
       // 3. Assert Step 1: Check that the flag became true
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -546,14 +497,14 @@ describe('Gemini Client (client.ts)', () => {
 
       // 4. Test Step 2: Trigger a forced failure
 
-      await client.tryCompressChat('prompt-2', true); // force = true
+      await client.tryCompressChat("prompt-2", true); // force = true
 
       // 5. Assert Step 2: Check that the flag REMAINS true
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       expect((client as any).hasFailedCompressionAttempt).toBe(true);
     });
 
-    it('should not trigger summarization if token count is below threshold', async () => {
+    it("should not trigger summarization if token count is below threshold", async () => {
       const MOCKED_TOKEN_LIMIT = 1000;
       const originalTokenCount = MOCKED_TOKEN_LIMIT * 0.699;
 
@@ -567,7 +518,7 @@ describe('Gemini Client (client.ts)', () => {
       });
 
       const initialChat = client.getChat();
-      const result = await client.tryCompressChat('prompt-id-2', false);
+      const result = await client.tryCompressChat("prompt-id-2", false);
       const newChat = client.getChat();
 
       expect(result).toEqual({
@@ -578,15 +529,15 @@ describe('Gemini Client (client.ts)', () => {
       expect(newChat).toBe(initialChat);
     });
 
-    it('should return NOOP if history is too short to compress', async () => {
+    it("should return NOOP if history is too short to compress", async () => {
       const { client } = setup({
-        chatHistory: [{ role: 'user', parts: [{ text: 'hi' }] }],
+        chatHistory: [{ role: "user", parts: [{ text: "hi" }] }],
         originalTokenCount: 50,
         newTokenCount: 50,
         compressionStatus: CompressionStatus.NOOP,
       });
 
-      const result = await client.tryCompressChat('prompt-id-noop', false);
+      const result = await client.tryCompressChat("prompt-id-noop", false);
 
       expect(result).toEqual({
         compressionStatus: CompressionStatus.NOOP,
@@ -596,12 +547,12 @@ describe('Gemini Client (client.ts)', () => {
     });
   });
 
-  describe('sendMessageStream', () => {
-    it('emits a compression event when the context was automatically compressed', async () => {
+  describe("sendMessageStream", () => {
+    it("emits a compression event when the context was automatically compressed", async () => {
       // Arrange
       mockTurnRunFn.mockReturnValue(
         (async function* () {
-          yield { type: 'content', value: 'Hello' };
+          yield { type: "content", value: "Hello" };
         })(),
       );
 
@@ -611,15 +562,13 @@ describe('Gemini Client (client.ts)', () => {
         newTokenCount: 500,
       };
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValueOnce(
-        compressionInfo,
-      );
+      vi.spyOn(client, "tryCompressChat").mockResolvedValueOnce(compressionInfo);
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-1',
+        "prompt-id-1",
       );
 
       const events = await fromAsync(stream);
@@ -633,64 +582,60 @@ describe('Gemini Client (client.ts)', () => {
 
     it.each([
       {
-        compressionStatus:
-          CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+        compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
       },
       { compressionStatus: CompressionStatus.NOOP },
-    ])(
-      'does not emit a compression event when the status is $compressionStatus',
-      async ({ compressionStatus }) => {
-        // Arrange
-        const mockStream = (async function* () {
-          yield { type: 'content', value: 'Hello' };
-        })();
-        mockTurnRunFn.mockReturnValue(mockStream);
+    ])("does not emit a compression event when the status is $compressionStatus", async ({
+      compressionStatus,
+    }) => {
+      // Arrange
+      const mockStream = (async function* () {
+        yield { type: "content", value: "Hello" };
+      })();
+      mockTurnRunFn.mockReturnValue(mockStream);
 
-        const compressionInfo: ChatCompressionInfo = {
-          compressionStatus,
-          originalTokenCount: 1000,
-          newTokenCount: 500,
-        };
+      const compressionInfo: ChatCompressionInfo = {
+        compressionStatus,
+        originalTokenCount: 1000,
+        newTokenCount: 500,
+      };
 
-        vi.spyOn(client, 'tryCompressChat').mockResolvedValueOnce(
-          compressionInfo,
-        );
+      vi.spyOn(client, "tryCompressChat").mockResolvedValueOnce(compressionInfo);
 
-        // Act
-        const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
-          new AbortController().signal,
-          'prompt-id-1',
-        );
+      // Act
+      const stream = client.sendMessageStream(
+        [{ text: "Hi" }],
+        new AbortController().signal,
+        "prompt-id-1",
+      );
 
-        const events = await fromAsync(stream);
+      const events = await fromAsync(stream);
 
-        // Assert
-        expect(events).not.toContainEqual({
-          type: GeminiEventType.ChatCompressed,
-          value: expect.anything(),
-        });
-      },
-    );
+      // Assert
+      expect(events).not.toContainEqual({
+        type: GeminiEventType.ChatCompressed,
+        value: expect.anything(),
+      });
+    });
 
-    it('should include editor context when ideMode is enabled', async () => {
+    it("should include editor context when ideMode is enabled", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/active/file.ts',
+              path: "/path/to/active/file.ts",
               timestamp: Date.now(),
               isActive: true,
-              selectedText: 'hello',
+              selectedText: "hello",
               cursor: { line: 5, character: 10 },
             },
             {
-              path: '/path/to/recent/file1.ts',
+              path: "/path/to/recent/file1.ts",
               timestamp: Date.now(),
             },
             {
-              path: '/path/to/recent/file2.ts',
+              path: "/path/to/recent/file2.ts",
               timestamp: Date.now(),
             },
           ],
@@ -699,7 +644,7 @@ describe('Gemini Client (client.ts)', () => {
 
       vi.mocked(mockConfig.getIdeMode).mockReturnValue(true);
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: 0,
         newTokenCount: 0,
         compressionStatus: CompressionStatus.COMPRESSED,
@@ -707,7 +652,7 @@ describe('Gemini Client (client.ts)', () => {
 
       mockTurnRunFn.mockReturnValue(
         (async function* () {
-          yield { type: 'content', value: 'Hello' };
+          yield { type: "content", value: "Hello" };
         })(),
       );
 
@@ -716,15 +661,15 @@ describe('Gemini Client (client.ts)', () => {
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       } as unknown as GeminiChat;
-      client['chat'] = mockChat;
+      client["chat"] = mockChat;
 
-      const initialRequest: Part[] = [{ text: 'Hi' }];
+      const initialRequest: Part[] = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -738,14 +683,14 @@ Here is the user's editor context as a JSON object. This is for your information
 ${JSON.stringify(
   {
     activeFile: {
-      path: '/path/to/active/file.ts',
+      path: "/path/to/active/file.ts",
       cursor: {
         line: 5,
         character: 10,
       },
-      selectedText: 'hello',
+      selectedText: "hello",
     },
-    otherOpenFiles: ['/path/to/recent/file1.ts', '/path/to/recent/file2.ts'],
+    otherOpenFiles: ["/path/to/recent/file1.ts", "/path/to/recent/file2.ts"],
   },
   null,
   2,
@@ -754,12 +699,12 @@ ${JSON.stringify(
       `.trim();
       const expectedRequest = [{ text: expectedContext }];
       expect(mockChat.addHistory).toHaveBeenCalledWith({
-        role: 'user',
+        role: "user",
         parts: expectedRequest,
       });
     });
 
-    it('should not add context if ideMode is enabled but no open files', async () => {
+    it("should not add context if ideMode is enabled but no open files", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
@@ -767,10 +712,10 @@ ${JSON.stringify(
         },
       });
 
-      vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -779,15 +724,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
+      const initialRequest = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -796,38 +741,38 @@ ${JSON.stringify(
       // Assert
       expect(ideContextStore.get).toHaveBeenCalled();
       expect(mockTurnRunFn).toHaveBeenCalledWith(
-        { model: 'default-routed-model' },
+        { model: "default-routed-model" },
         initialRequest,
         expect.any(AbortSignal),
       );
     });
 
-    it('should add context if ideMode is enabled and there is one active file', async () => {
+    it("should add context if ideMode is enabled and there is one active file", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/active/file.ts',
+              path: "/path/to/active/file.ts",
               timestamp: Date.now(),
               isActive: true,
-              selectedText: 'hello',
+              selectedText: "hello",
               cursor: { line: 5, character: 10 },
             },
           ],
         },
       });
 
-      vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: 0,
         newTokenCount: 0,
         compressionStatus: CompressionStatus.COMPRESSED,
       });
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -836,15 +781,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
+      const initialRequest = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -858,12 +803,12 @@ Here is the user's editor context as a JSON object. This is for your information
 ${JSON.stringify(
   {
     activeFile: {
-      path: '/path/to/active/file.ts',
+      path: "/path/to/active/file.ts",
       cursor: {
         line: 5,
         character: 10,
       },
-      selectedText: 'hello',
+      selectedText: "hello",
     },
   },
   null,
@@ -873,38 +818,38 @@ ${JSON.stringify(
       `.trim();
       const expectedRequest = [{ text: expectedContext }];
       expect(mockChat.addHistory).toHaveBeenCalledWith({
-        role: 'user',
+        role: "user",
         parts: expectedRequest,
       });
     });
 
-    it('should add context if ideMode is enabled and there are open files but no active file', async () => {
+    it("should add context if ideMode is enabled and there are open files but no active file", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/recent/file1.ts',
+              path: "/path/to/recent/file1.ts",
               timestamp: Date.now(),
             },
             {
-              path: '/path/to/recent/file2.ts',
+              path: "/path/to/recent/file2.ts",
               timestamp: Date.now(),
             },
           ],
         },
       });
 
-      vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: 0,
         newTokenCount: 0,
         compressionStatus: CompressionStatus.COMPRESSED,
       });
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -913,15 +858,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
+      const initialRequest = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -934,7 +879,7 @@ Here is the user's editor context as a JSON object. This is for your information
 \`\`\`json
 ${JSON.stringify(
   {
-    otherOpenFiles: ['/path/to/recent/file1.ts', '/path/to/recent/file2.ts'],
+    otherOpenFiles: ["/path/to/recent/file1.ts", "/path/to/recent/file2.ts"],
   },
   null,
   2,
@@ -943,40 +888,40 @@ ${JSON.stringify(
       `.trim();
       const expectedRequest = [{ text: expectedContext }];
       expect(mockChat.addHistory).toHaveBeenCalledWith({
-        role: 'user',
+        role: "user",
         parts: expectedRequest,
       });
     });
 
-    it('should use local estimation for text-only requests and NOT call countTokens', async () => {
-      const request = [{ text: 'Hello world' }];
-      const generator = client['getContentGeneratorOrFail']();
-      const countTokensSpy = vi.spyOn(generator, 'countTokens');
+    it("should use local estimation for text-only requests and NOT call countTokens", async () => {
+      const request = [{ text: "Hello world" }];
+      const generator = client["getContentGeneratorOrFail"]();
+      const countTokensSpy = vi.spyOn(generator, "countTokens");
 
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'test-prompt-id',
+        "test-prompt-id",
       );
       await stream.next(); // Trigger the generator
 
       expect(countTokensSpy).not.toHaveBeenCalled();
     });
 
-    it('should use countTokens API for requests with non-text parts', async () => {
+    it("should use countTokens API for requests with non-text parts", async () => {
       const request = [
-        { text: 'Describe this image' },
-        { inlineData: { mimeType: 'image/png', data: 'base64...' } },
+        { text: "Describe this image" },
+        { inlineData: { mimeType: "image/png", data: "base64..." } },
       ];
-      const generator = client['getContentGeneratorOrFail']();
+      const generator = client["getContentGeneratorOrFail"]();
       const countTokensSpy = vi
-        .spyOn(generator, 'countTokens')
+        .spyOn(generator, "countTokens")
         .mockResolvedValue({ totalTokens: 123 });
 
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'test-prompt-id',
+        "test-prompt-id",
       );
       await stream.next(); // Trigger the generator
 
@@ -985,8 +930,8 @@ ${JSON.stringify(
           contents: expect.arrayContaining([
             expect.objectContaining({
               parts: expect.arrayContaining([
-                { text: 'Describe this image' },
-                { inlineData: { mimeType: 'image/png', data: 'base64...' } },
+                { text: "Describe this image" },
+                { inlineData: { mimeType: "image/png", data: "base64..." } },
               ]),
             }),
           ]),
@@ -994,10 +939,10 @@ ${JSON.stringify(
       );
     });
 
-    it('should estimate CJK characters more conservatively (closer to 1 token/char)', async () => {
-      const request = [{ text: '你好世界' }]; // 4 chars
-      const generator = client['getContentGeneratorOrFail']();
-      const countTokensSpy = vi.spyOn(generator, 'countTokens');
+    it("should estimate CJK characters more conservatively (closer to 1 token/char)", async () => {
+      const request = [{ text: "你好世界" }]; // 4 chars
+      const generator = client["getContentGeneratorOrFail"]();
+      const countTokensSpy = vi.spyOn(generator, "countTokens");
 
       // 4 chars.
       // Old logic: 4/4 = 1.
@@ -1007,7 +952,7 @@ ${JSON.stringify(
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'test-prompt-id',
+        "test-prompt-id",
       );
       await stream.next();
 
@@ -1017,10 +962,10 @@ ${JSON.stringify(
       // The actual token calculation is unit tested in tokenCalculation.test.ts
     });
 
-    it('should return the turn instance after the stream is complete', async () => {
+    it("should return the turn instance after the stream is complete", async () => {
       // Arrange
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1029,13 +974,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-1',
+        "prompt-id-1",
       );
 
       // Consume the stream manually to get the final return value.
@@ -1052,23 +997,19 @@ ${JSON.stringify(
       expect(finalResult).toBeInstanceOf(Turn);
     });
 
-    it('should stop infinite loop after MAX_TURNS when nextSpeaker always returns model', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        true,
-      );
+    it("should stop infinite loop after MAX_TURNS when nextSpeaker always returns model", async () => {
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(true);
       // Get the mocked checkNextSpeaker function and configure it to trigger infinite loop
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
       mockCheckNextSpeaker.mockResolvedValue({
-        next_speaker: 'model',
-        reasoning: 'Test case - always continue',
+        next_speaker: "model",
+        reasoning: "Test case - always continue",
       });
 
       // Mock Turn to have no pending tool calls (which would allow nextSpeaker check)
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Continue...' };
+        yield { type: "content", value: "Continue..." };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1077,7 +1018,7 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Use a signal that never gets aborted
       const abortController = new AbortController();
@@ -1085,9 +1026,9 @@ ${JSON.stringify(
 
       // Act - Start the stream that should loop
       const stream = client.sendMessageStream(
-        [{ text: 'Start conversation' }],
+        [{ text: "Start conversation" }],
         signal,
-        'prompt-id-2',
+        "prompt-id-2",
       );
 
       // Count how many stream events we get
@@ -1106,9 +1047,7 @@ ${JSON.stringify(
         // Safety check to prevent actual infinite loop in test
         if (eventCount > 200) {
           abortController.abort();
-          throw new Error(
-            'Test exceeded expected event limit - possible actual infinite loop',
-          );
+          throw new Error("Test exceeded expected event limit - possible actual infinite loop");
         }
       }
 
@@ -1125,15 +1064,13 @@ ${JSON.stringify(
       expect(eventCount).toBeLessThan(200); // Should not exceed our safety limit
     });
 
-    it('should yield MaxSessionTurns and stop when session turn limit is reached', async () => {
+    it("should yield MaxSessionTurns and stop when session turn limit is reached", async () => {
       // Arrange
       const MAX_SESSION_TURNS = 5;
-      vi.spyOn(client['config'], 'getMaxSessionTurns').mockReturnValue(
-        MAX_SESSION_TURNS,
-      );
+      vi.spyOn(client["config"], "getMaxSessionTurns").mockReturnValue(MAX_SESSION_TURNS);
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1142,15 +1079,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act & Assert
       // Run up to the limit
       for (let i = 0; i < MAX_SESSION_TURNS; i++) {
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-id-4',
+          "prompt-id-4",
         );
         // consume stream
         for await (const _event of stream) {
@@ -1160,9 +1097,9 @@ ${JSON.stringify(
 
       // This call should exceed the limit
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-5',
+        "prompt-id-5",
       );
 
       const events = [];
@@ -1174,23 +1111,21 @@ ${JSON.stringify(
       expect(mockTurnRunFn).toHaveBeenCalledTimes(MAX_SESSION_TURNS);
     });
 
-    it('should respect MAX_TURNS limit even when turns parameter is set to a large value', async () => {
+    it("should respect MAX_TURNS limit even when turns parameter is set to a large value", async () => {
       // This test verifies that the infinite loop protection works even when
       // someone tries to bypass it by calling with a very large turns value
 
       // Get the mocked checkNextSpeaker function and configure it to trigger infinite loop
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
       mockCheckNextSpeaker.mockResolvedValue({
-        next_speaker: 'model',
-        reasoning: 'Test case - always continue',
+        next_speaker: "model",
+        reasoning: "Test case - always continue",
       });
 
       // Mock Turn to have no pending tool calls (which would allow nextSpeaker check)
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Continue...' };
+        yield { type: "content", value: "Continue..." };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1199,7 +1134,7 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Use a signal that never gets aborted
       const abortController = new AbortController();
@@ -1208,9 +1143,9 @@ ${JSON.stringify(
       // Act - Start the stream with an extremely high turns value
       // This simulates a case where the turns protection is bypassed
       const stream = client.sendMessageStream(
-        [{ text: 'Start conversation' }],
+        [{ text: "Start conversation" }],
         signal,
-        'prompt-id-3',
+        "prompt-id-3",
         Number.MAX_SAFE_INTEGER, // Bypass the MAX_TURNS protection
       );
 
@@ -1247,7 +1182,7 @@ ${JSON.stringify(
       expect(eventCount).toBeLessThanOrEqual(200); // Should have reasonable number of events
     });
 
-    it('should yield ContextWindowWillOverflow when the context window is about to overflow', async () => {
+    it("should yield ContextWindowWillOverflow when the context window is about to overflow", async () => {
       // Arrange
       const MOCKED_TOKEN_LIMIT = 1000;
       vi.mocked(tokenLimit).mockReturnValue(MOCKED_TOKEN_LIMIT);
@@ -1258,19 +1193,19 @@ ${JSON.stringify(
         getLastPromptTokenCount: vi.fn().mockReturnValue(lastPromptTokenCount),
         getHistory: vi.fn().mockReturnValue([]),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Remaining = 100. Threshold (95%) = 95.
       // We need a request > 95 tokens.
       // A string of length 400 is roughly 100 tokens.
-      const longText = 'a'.repeat(400);
+      const longText = "a".repeat(400);
       const request: Part[] = [{ text: longText }];
       // estimateTextOnlyLength counts only text content (400 chars), not JSON structure
       const estimatedRequestTokenCount = Math.floor(longText.length / 4);
       const remainingTokenCount = MOCKED_TOKEN_LIMIT - lastPromptTokenCount;
 
       // Mock tryCompressChat to not compress
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: lastPromptTokenCount,
         newTokenCount: lastPromptTokenCount,
         compressionStatus: CompressionStatus.NOOP,
@@ -1280,7 +1215,7 @@ ${JSON.stringify(
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'prompt-id-overflow',
+        "prompt-id-overflow",
       );
 
       const events = await fromAsync(stream);
@@ -1299,7 +1234,7 @@ ${JSON.stringify(
 
     it("should use the sticky model's token limit for the overflow check", async () => {
       // Arrange
-      const STICKY_MODEL = 'gemini-1.5-flash';
+      const STICKY_MODEL = "gemini-1.5-flash";
       const STICKY_MODEL_LIMIT = 1000;
       const CONFIG_MODEL_LIMIT = 2000;
 
@@ -1310,7 +1245,7 @@ ${JSON.stringify(
       });
 
       // Set the sticky model
-      client['currentSequenceModel'] = STICKY_MODEL;
+      client["currentSequenceModel"] = STICKY_MODEL;
 
       // Set token count
       const lastPromptTokenCount = 900;
@@ -1318,17 +1253,17 @@ ${JSON.stringify(
         getLastPromptTokenCount: vi.fn().mockReturnValue(lastPromptTokenCount),
         getHistory: vi.fn().mockReturnValue([]),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Remaining (sticky) = 100. Threshold (95%) = 95.
       // We need a request > 95 tokens.
-      const longText = 'a'.repeat(400);
+      const longText = "a".repeat(400);
       const request: Part[] = [{ text: longText }];
       // estimateTextOnlyLength counts only text content (400 chars), not JSON structure
       const estimatedRequestTokenCount = Math.floor(longText.length / 4);
       const remainingTokenCount = STICKY_MODEL_LIMIT - lastPromptTokenCount;
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: lastPromptTokenCount,
         newTokenCount: lastPromptTokenCount,
         compressionStatus: CompressionStatus.NOOP,
@@ -1338,7 +1273,7 @@ ${JSON.stringify(
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'test-session-id', // Use the same ID as the session to keep stickiness
+        "test-session-id", // Use the same ID as the session to keep stickiness
       );
 
       const events = await fromAsync(stream);
@@ -1356,7 +1291,7 @@ ${JSON.stringify(
       expect(mockTurnRunFn).not.toHaveBeenCalled();
     });
 
-    it('should not trigger overflow warning for requests with large binary data (PDFs/images)', async () => {
+    it("should not trigger overflow warning for requests with large binary data (PDFs/images)", async () => {
       // Arrange
       const MOCKED_TOKEN_LIMIT = 1000000; // 1M tokens
       vi.mocked(tokenLimit).mockReturnValue(MOCKED_TOKEN_LIMIT);
@@ -1366,24 +1301,24 @@ ${JSON.stringify(
         getLastPromptTokenCount: vi.fn().mockReturnValue(lastPromptTokenCount),
         getHistory: vi.fn().mockReturnValue([]),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Simulate a PDF file with large base64 data (11MB when encoded)
       // In the old implementation, this would incorrectly estimate ~2.7M tokens
       // In the new implementation, only the text part is counted
-      const largePdfBase64 = 'A'.repeat(11 * 1024 * 1024);
+      const largePdfBase64 = "A".repeat(11 * 1024 * 1024);
       const request: Part[] = [
-        { text: 'Please analyze this PDF document' }, // ~35 chars = ~8 tokens
+        { text: "Please analyze this PDF document" }, // ~35 chars = ~8 tokens
         {
           inlineData: {
-            mimeType: 'application/pdf',
+            mimeType: "application/pdf",
             data: largePdfBase64, // This should be ignored in token estimation
           },
         },
       ];
 
       // Mock tryCompressChat to not compress
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: lastPromptTokenCount,
         newTokenCount: lastPromptTokenCount,
         compressionStatus: CompressionStatus.NOOP,
@@ -1391,7 +1326,7 @@ ${JSON.stringify(
 
       // Mock Turn.run to simulate successful processing
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Analysis complete' };
+        yield { type: "content", value: "Analysis complete" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1399,7 +1334,7 @@ ${JSON.stringify(
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'prompt-id-pdf-test',
+        "prompt-id-pdf-test",
       );
 
       const events = await fromAsync(stream);
@@ -1416,14 +1351,12 @@ ${JSON.stringify(
       expect(mockTurnRunFn).toHaveBeenCalled();
     });
 
-    describe('Model Routing', () => {
+    describe("Model Routing", () => {
       let mockRouterService: { route: Mock };
 
       beforeEach(() => {
         mockRouterService = {
-          route: vi
-            .fn()
-            .mockResolvedValue({ model: 'routed-model', reason: 'test' }),
+          route: vi.fn().mockResolvedValue({ model: "routed-model", reason: "test" }),
         };
         vi.mocked(mockConfig.getModelRouterService).mockReturnValue(
           mockRouterService as unknown as ModelRouterService,
@@ -1431,7 +1364,7 @@ ${JSON.stringify(
 
         mockTurnRunFn.mockReturnValue(
           (async function* () {
-            yield { type: 'content', value: 'Hello' };
+            yield { type: "content", value: "Hello" };
           })(),
         );
 
@@ -1440,47 +1373,47 @@ ${JSON.stringify(
           getHistory: vi.fn().mockReturnValue([]),
           getLastPromptTokenCount: vi.fn(),
         };
-        client['chat'] = mockChat as GeminiChat;
+        client["chat"] = mockChat as GeminiChat;
       });
 
-      it('should use the model router service to select a model on the first turn', async () => {
+      it("should use the model router service to select a model on the first turn", async () => {
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream); // consume stream
 
         expect(mockConfig.getModelRouterService).toHaveBeenCalled();
         expect(mockRouterService.route).toHaveBeenCalled();
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          { model: 'routed-model' },
-          [{ text: 'Hi' }],
+          { model: "routed-model" },
+          [{ text: "Hi" }],
           expect.any(AbortSignal),
         );
       });
 
-      it('should use the same model for subsequent turns in the same prompt (stickiness)', async () => {
+      it("should use the same model for subsequent turns in the same prompt (stickiness)", async () => {
         // First turn
         let stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
         expect(mockRouterService.route).toHaveBeenCalledTimes(1);
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          { model: 'routed-model' },
-          [{ text: 'Hi' }],
+          { model: "routed-model" },
+          [{ text: "Hi" }],
           expect.any(AbortSignal),
         );
 
         // Second turn
         stream = client.sendMessageStream(
-          [{ text: 'Continue' }],
+          [{ text: "Continue" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
@@ -1488,37 +1421,37 @@ ${JSON.stringify(
         expect(mockRouterService.route).toHaveBeenCalledTimes(1);
         // Should stick to the first model
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          { model: 'routed-model' },
-          [{ text: 'Continue' }],
+          { model: "routed-model" },
+          [{ text: "Continue" }],
           expect.any(AbortSignal),
         );
       });
 
-      it('should reset the sticky model and re-route when the prompt_id changes', async () => {
+      it("should reset the sticky model and re-route when the prompt_id changes", async () => {
         // First prompt
         let stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
         expect(mockRouterService.route).toHaveBeenCalledTimes(1);
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          { model: 'routed-model' },
-          [{ text: 'Hi' }],
+          { model: "routed-model" },
+          [{ text: "Hi" }],
           expect.any(AbortSignal),
         );
 
         // New prompt
         mockRouterService.route.mockResolvedValue({
-          model: 'new-routed-model',
-          reason: 'test',
+          model: "new-routed-model",
+          reason: "test",
         });
         stream = client.sendMessageStream(
-          [{ text: 'A new topic' }],
+          [{ text: "A new topic" }],
           new AbortController().signal,
-          'prompt-2',
+          "prompt-2",
         );
         await fromAsync(stream);
 
@@ -1526,51 +1459,51 @@ ${JSON.stringify(
         expect(mockRouterService.route).toHaveBeenCalledTimes(2);
         // Should use the newly routed model
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          { model: 'new-routed-model' },
-          [{ text: 'A new topic' }],
+          { model: "new-routed-model" },
+          [{ text: "A new topic" }],
           expect.any(AbortSignal),
         );
       });
 
-      it('should use the fallback model and bypass routing when in fallback mode', async () => {
+      it("should use the fallback model and bypass routing when in fallback mode", async () => {
         vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
         mockRouterService.route.mockResolvedValue({
           model: DEFAULT_GEMINI_FLASH_MODEL,
-          reason: 'fallback',
+          reason: "fallback",
         });
 
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
         expect(mockTurnRunFn).toHaveBeenCalledWith(
           { model: DEFAULT_GEMINI_FLASH_MODEL },
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           expect.any(AbortSignal),
         );
       });
 
-      it('should stick to the fallback model for the entire sequence even if fallback mode ends', async () => {
+      it("should stick to the fallback model for the entire sequence even if fallback mode ends", async () => {
         // Start the sequence in fallback mode
         vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
         mockRouterService.route.mockResolvedValue({
           model: DEFAULT_GEMINI_FLASH_MODEL,
-          reason: 'fallback',
+          reason: "fallback",
         });
         let stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-fallback-stickiness',
+          "prompt-fallback-stickiness",
         );
         await fromAsync(stream);
 
         // First call should use fallback model
         expect(mockTurnRunFn).toHaveBeenCalledWith(
           { model: DEFAULT_GEMINI_FLASH_MODEL },
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           expect.any(AbortSignal),
         );
 
@@ -1579,9 +1512,9 @@ ${JSON.stringify(
 
         // Second call in the same sequence
         stream = client.sendMessageStream(
-          [{ text: 'Continue' }],
+          [{ text: "Continue" }],
           new AbortController().signal,
-          'prompt-fallback-stickiness',
+          "prompt-fallback-stickiness",
         );
         await fromAsync(stream);
 
@@ -1589,37 +1522,33 @@ ${JSON.stringify(
         expect(mockTurnRunFn).toHaveBeenCalledTimes(2); // Ensure it was called again
         expect(mockTurnRunFn).toHaveBeenLastCalledWith(
           { model: DEFAULT_GEMINI_FLASH_MODEL }, // Still the fallback model
-          [{ text: 'Continue' }],
+          [{ text: "Continue" }],
           expect.any(AbortSignal),
         );
       });
     });
 
     it('should recursively call sendMessageStream with "Please continue." when InvalidStream event is received', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        true,
-      );
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(true);
       // Arrange
       const mockStream1 = (async function* () {
         yield { type: GeminiEventType.InvalidStream };
       })();
       const mockStream2 = (async function* () {
-        yield { type: GeminiEventType.Content, value: 'Continued content' };
+        yield { type: GeminiEventType.Content, value: "Continued content" };
       })();
 
-      mockTurnRunFn
-        .mockReturnValueOnce(mockStream1)
-        .mockReturnValueOnce(mockStream2);
+      mockTurnRunFn.mockReturnValueOnce(mockStream1).mockReturnValueOnce(mockStream2);
 
       const mockChat: Partial<GeminiChat> = {
         addHistory: vi.fn(),
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
-      const promptId = 'prompt-id-invalid-stream';
+      const initialRequest = [{ text: "Hi" }];
+      const promptId = "prompt-id-invalid-stream";
       const signal = new AbortController().signal;
 
       // Act
@@ -1628,10 +1557,10 @@ ${JSON.stringify(
 
       // Assert
       expect(events).toEqual([
-        { type: GeminiEventType.ModelInfo, value: 'default-routed-model' },
+        { type: GeminiEventType.ModelInfo, value: "default-routed-model" },
         { type: GeminiEventType.InvalidStream },
-        { type: GeminiEventType.ModelInfo, value: 'default-routed-model' },
-        { type: GeminiEventType.Content, value: 'Continued content' },
+        { type: GeminiEventType.ModelInfo, value: "default-routed-model" },
+        { type: GeminiEventType.Content, value: "Continued content" },
       ]);
 
       // Verify that turn.run was called twice
@@ -1640,7 +1569,7 @@ ${JSON.stringify(
       // First call with original request
       expect(mockTurnRunFn).toHaveBeenNthCalledWith(
         1,
-        { model: 'default-routed-model' },
+        { model: "default-routed-model" },
         initialRequest,
         expect.any(AbortSignal),
       );
@@ -1648,16 +1577,14 @@ ${JSON.stringify(
       // Second call with "Please continue."
       expect(mockTurnRunFn).toHaveBeenNthCalledWith(
         2,
-        { model: 'default-routed-model' },
-        [{ text: 'System: Please continue.' }],
+        { model: "default-routed-model" },
+        [{ text: "System: Please continue." }],
         expect.any(AbortSignal),
       );
     });
 
     it('should not recursively call sendMessageStream with "Please continue." when InvalidStream event is received and flag is false', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        false,
-      );
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(false);
       // Arrange
       const mockStream1 = (async function* () {
         yield { type: GeminiEventType.InvalidStream };
@@ -1670,10 +1597,10 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
-      const promptId = 'prompt-id-invalid-stream';
+      const initialRequest = [{ text: "Hi" }];
+      const promptId = "prompt-id-invalid-stream";
       const signal = new AbortController().signal;
 
       // Act
@@ -1682,7 +1609,7 @@ ${JSON.stringify(
 
       // Assert
       expect(events).toEqual([
-        { type: GeminiEventType.ModelInfo, value: 'default-routed-model' },
+        { type: GeminiEventType.ModelInfo, value: "default-routed-model" },
         { type: GeminiEventType.InvalidStream },
       ]);
 
@@ -1690,10 +1617,8 @@ ${JSON.stringify(
       expect(mockTurnRunFn).toHaveBeenCalledTimes(1);
     });
 
-    it('should stop recursing after one retry when InvalidStream events are repeatedly received', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        true,
-      );
+    it("should stop recursing after one retry when InvalidStream events are repeatedly received", async () => {
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(true);
       // Arrange
       // Always return a new invalid stream
       mockTurnRunFn.mockImplementation(() =>
@@ -1707,10 +1632,10 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
-      const promptId = 'prompt-id-infinite-invalid-stream';
+      const initialRequest = [{ text: "Hi" }];
+      const promptId = "prompt-id-infinite-invalid-stream";
       const signal = new AbortController().signal;
 
       // Act
@@ -1730,19 +1655,19 @@ ${JSON.stringify(
       expect(mockTurnRunFn).toHaveBeenCalledTimes(2);
     });
 
-    describe('Editor context delta', () => {
+    describe("Editor context delta", () => {
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
 
       beforeEach(() => {
-        client['forceFullIdeContext'] = false; // Reset before each delta test
-        vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+        client["forceFullIdeContext"] = false; // Reset before each delta test
+        vi.spyOn(client, "tryCompressChat").mockResolvedValue({
           originalTokenCount: 0,
           newTokenCount: 0,
           compressionStatus: CompressionStatus.COMPRESSED,
         });
-        vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+        vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
         mockTurnRunFn.mockReturnValue(mockStream);
 
         const mockChat: Partial<GeminiChat> = {
@@ -1751,188 +1676,183 @@ ${JSON.stringify(
           // Assume history is not empty for delta checks
           getHistory: vi
             .fn()
-            .mockReturnValue([
-              { role: 'user', parts: [{ text: 'previous message' }] },
-            ]),
+            .mockReturnValue([{ role: "user", parts: [{ text: "previous message" }] }]),
           getLastPromptTokenCount: vi.fn(),
         };
-        client['chat'] = mockChat as GeminiChat;
+        client["chat"] = mockChat as GeminiChat;
       });
 
       const testCases = [
         {
-          description: 'sends delta when active file changes',
+          description: "sends delta when active file changes",
           previousActiveFile: {
-            path: '/path/to/old/file.ts',
+            path: "/path/to/old/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when cursor line changes',
+          description: "sends delta when cursor line changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 1, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when cursor character changes',
+          description: "sends delta when cursor character changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 1 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when selected text changes',
+          description: "sends delta when selected text changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'world',
+            selectedText: "world",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when selected text is added',
+          description: "sends delta when selected text is added",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when selected text is removed',
+          description: "sends delta when selected text is removed",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
           },
           shouldSendContext: true,
         },
         {
-          description: 'does not send context when nothing changes',
+          description: "does not send context when nothing changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: false,
         },
       ];
 
-      it.each(testCases)(
-        '$description',
-        async ({
-          previousActiveFile,
-          currentActiveFile,
-          shouldSendContext,
-        }) => {
-          // Setup previous context
-          client['lastSentIdeContext'] = {
-            workspaceState: {
-              openFiles: [
-                {
-                  path: previousActiveFile.path,
-                  cursor: previousActiveFile.cursor,
-                  selectedText: previousActiveFile.selectedText,
-                  isActive: true,
-                  timestamp: Date.now() - 1000,
-                },
-              ],
-            },
-          };
+      it.each(testCases)("$description", async ({
+        previousActiveFile,
+        currentActiveFile,
+        shouldSendContext,
+      }) => {
+        // Setup previous context
+        client["lastSentIdeContext"] = {
+          workspaceState: {
+            openFiles: [
+              {
+                path: previousActiveFile.path,
+                cursor: previousActiveFile.cursor,
+                selectedText: previousActiveFile.selectedText,
+                isActive: true,
+                timestamp: Date.now() - 1000,
+              },
+            ],
+          },
+        };
 
-          // Setup current context
-          vi.mocked(ideContextStore.get).mockReturnValue({
-            workspaceState: {
-              openFiles: [
-                {
-                  ...currentActiveFile,
-                  isActive: true,
-                  timestamp: Date.now(),
-                },
-              ],
-            },
-          });
+        // Setup current context
+        vi.mocked(ideContextStore.get).mockReturnValue({
+          workspaceState: {
+            openFiles: [
+              {
+                ...currentActiveFile,
+                isActive: true,
+                timestamp: Date.now(),
+              },
+            ],
+          },
+        });
 
-          const stream = client.sendMessageStream(
-            [{ text: 'Hi' }],
-            new AbortController().signal,
-            'prompt-id-delta',
-          );
-          for await (const _ of stream) {
-            // consume stream
-          }
+        const stream = client.sendMessageStream(
+          [{ text: "Hi" }],
+          new AbortController().signal,
+          "prompt-id-delta",
+        );
+        for await (const _ of stream) {
+          // consume stream
+        }
 
-          const mockChat = client['chat'] as unknown as {
-            addHistory: (typeof vi)['fn'];
-          };
+        const mockChat = client["chat"] as unknown as {
+          addHistory: (typeof vi)["fn"];
+        };
 
-          if (shouldSendContext) {
-            expect(mockChat.addHistory).toHaveBeenCalledWith(
-              expect.objectContaining({
-                parts: expect.arrayContaining([
-                  expect.objectContaining({
-                    text: expect.stringContaining(
-                      "Here is a summary of changes in the user's editor context",
-                    ),
-                  }),
-                ]),
-              }),
-            );
-          } else {
-            expect(mockChat.addHistory).not.toHaveBeenCalled();
-          }
-        },
-      );
+        if (shouldSendContext) {
+          expect(mockChat.addHistory).toHaveBeenCalledWith(
+            expect.objectContaining({
+              parts: expect.arrayContaining([
+                expect.objectContaining({
+                  text: expect.stringContaining(
+                    "Here is a summary of changes in the user's editor context",
+                  ),
+                }),
+              ]),
+            }),
+          );
+        } else {
+          expect(mockChat.addHistory).not.toHaveBeenCalled();
+        }
+      });
 
-      it('sends full context when history is cleared, even if editor state is unchanged', async () => {
+      it("sends full context when history is cleared, even if editor state is unchanged", async () => {
         const activeFile = {
-          path: '/path/to/active/file.ts',
+          path: "/path/to/active/file.ts",
           cursor: { line: 5, character: 10 },
-          selectedText: 'hello',
+          selectedText: "hello",
         };
 
         // Setup previous context
-        client['lastSentIdeContext'] = {
+        client["lastSentIdeContext"] = {
           workspaceState: {
             openFiles: [
               {
@@ -1949,23 +1869,21 @@ ${JSON.stringify(
         // Setup current context (same as previous)
         vi.mocked(ideContextStore.get).mockReturnValue({
           workspaceState: {
-            openFiles: [
-              { ...activeFile, isActive: true, timestamp: Date.now() },
-            ],
+            openFiles: [{ ...activeFile, isActive: true, timestamp: Date.now() }],
           },
         });
 
         // Make history empty
-        const mockChat = client['chat'] as unknown as {
-          getHistory: ReturnType<(typeof vi)['fn']>;
-          addHistory: ReturnType<(typeof vi)['fn']>;
+        const mockChat = client["chat"] as unknown as {
+          getHistory: ReturnType<(typeof vi)["fn"]>;
+          addHistory: ReturnType<(typeof vi)["fn"]>;
         };
         mockChat.getHistory.mockReturnValue([]);
 
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-id-history-cleared',
+          "prompt-id-history-cleared",
         );
         for await (const _ of stream) {
           // consume stream
@@ -1975,9 +1893,7 @@ ${JSON.stringify(
           expect.objectContaining({
             parts: expect.arrayContaining([
               expect.objectContaining({
-                text: expect.stringContaining(
-                  "Here is the user's editor context",
-                ),
+                text: expect.stringContaining("Here is the user's editor context"),
               }),
             ]),
           }),
@@ -1986,43 +1902,37 @@ ${JSON.stringify(
         // Also verify it's the full context, not a delta.
         const call = mockChat.addHistory.mock.calls[0][0];
         const contextText = call.parts[0].text;
-        const contextJson = JSON.parse(
-          contextText.match(/```json\n(.*)\n```/s)![1],
-        );
-        expect(contextJson).toHaveProperty('activeFile');
-        expect(contextJson.activeFile.path).toBe('/path/to/active/file.ts');
+        const contextJson = JSON.parse(contextText.match(/```json\n(.*)\n```/s)![1]);
+        expect(contextJson).toHaveProperty("activeFile");
+        expect(contextJson.activeFile.path).toBe("/path/to/active/file.ts");
       });
     });
 
-    describe('Availability Service Integration', () => {
+    describe("Availability Service Integration", () => {
       let mockAvailabilityService: ModelAvailabilityService;
 
       beforeEach(() => {
         mockAvailabilityService = createAvailabilityServiceMock();
 
-        vi.mocked(mockConfig.getModelAvailabilityService).mockReturnValue(
-          mockAvailabilityService,
-        );
-        vi.mocked(mockConfig.isModelAvailabilityServiceEnabled).mockReturnValue(
-          true,
-        );
+        vi.mocked(mockConfig.getModelAvailabilityService).mockReturnValue(mockAvailabilityService);
+        vi.mocked(mockConfig.isModelAvailabilityServiceEnabled).mockReturnValue(true);
         vi.mocked(mockConfig.setActiveModel).mockClear();
         mockRouterService.route.mockResolvedValue({
-          model: 'model-a',
-          reason: 'test',
+          model: "model-a",
+          reason: "test",
         });
         vi.mocked(mockConfig.getModelRouterService).mockReturnValue(
           mockRouterService as unknown as ModelRouterService,
         );
-        vi.spyOn(policyCatalog, 'getModelPolicyChain').mockReturnValue([
+        vi.spyOn(policyCatalog, "getModelPolicyChain").mockReturnValue([
           {
-            model: 'model-a',
+            model: "model-a",
             isLastResort: false,
             actions: {},
             stateTransitions: {},
           },
           {
-            model: 'model-b',
+            model: "model-b",
             isLastResort: true,
             actions: {},
             stateTransitions: {},
@@ -2031,109 +1941,93 @@ ${JSON.stringify(
 
         mockTurnRunFn.mockReturnValue(
           (async function* () {
-            yield { type: 'content', value: 'Hello' };
+            yield { type: "content", value: "Hello" };
           })(),
         );
       });
 
-      it('should select first available model, set active, and not consume sticky attempt (done lower in chain)', async () => {
-        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue(
-          {
-            selectedModel: 'model-a',
-            attempts: 1,
-            skipped: [],
-          },
-        );
+      it("should select first available model, set active, and not consume sticky attempt (done lower in chain)", async () => {
+        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
+          selectedModel: "model-a",
+          attempts: 1,
+          skipped: [],
+        });
 
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-avail',
+          "prompt-avail",
         );
         await fromAsync(stream);
 
-        expect(
-          mockAvailabilityService.selectFirstAvailable,
-        ).toHaveBeenCalledWith(['model-a', 'model-b']);
-        expect(mockConfig.setActiveModel).toHaveBeenCalledWith('model-a');
-        expect(
-          mockAvailabilityService.consumeStickyAttempt,
-        ).not.toHaveBeenCalled();
+        expect(mockAvailabilityService.selectFirstAvailable).toHaveBeenCalledWith([
+          "model-a",
+          "model-b",
+        ]);
+        expect(mockConfig.setActiveModel).toHaveBeenCalledWith("model-a");
+        expect(mockAvailabilityService.consumeStickyAttempt).not.toHaveBeenCalled();
         // Ensure turn.run used the selected model
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          expect.objectContaining({ model: 'model-a' }),
+          expect.objectContaining({ model: "model-a" }),
           expect.anything(),
           expect.anything(),
         );
       });
 
-      it('should default to last resort model if selection returns null', async () => {
-        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue(
-          {
-            selectedModel: null,
-            skipped: [],
-          },
-        );
+      it("should default to last resort model if selection returns null", async () => {
+        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
+          selectedModel: null,
+          skipped: [],
+        });
 
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-avail-fallback',
+          "prompt-avail-fallback",
         );
         await fromAsync(stream);
 
-        expect(mockConfig.setActiveModel).toHaveBeenCalledWith('model-b'); // Last resort
-        expect(
-          mockAvailabilityService.consumeStickyAttempt,
-        ).not.toHaveBeenCalled();
+        expect(mockConfig.setActiveModel).toHaveBeenCalledWith("model-b"); // Last resort
+        expect(mockAvailabilityService.consumeStickyAttempt).not.toHaveBeenCalled();
       });
 
-      it('should reset turn on new message stream', async () => {
-        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue(
-          {
-            selectedModel: 'model-a',
-            skipped: [],
-          },
-        );
+      it("should reset turn on new message stream", async () => {
+        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
+          selectedModel: "model-a",
+          skipped: [],
+        });
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-reset',
+          "prompt-reset",
         );
         await fromAsync(stream);
 
         expect(mockConfig.resetTurn).toHaveBeenCalled();
       });
 
-      it('should NOT reset turn on invalid stream retry', async () => {
-        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue(
-          {
-            selectedModel: 'model-a',
-            skipped: [],
-          },
-        );
+      it("should NOT reset turn on invalid stream retry", async () => {
+        vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
+          selectedModel: "model-a",
+          skipped: [],
+        });
         // We simulate a retry by calling sendMessageStream with isInvalidStreamRetry=true
         // But the public API doesn't expose that argument directly unless we use the private method or simulate the recursion.
         // We can simulate recursion by mocking turn run to return invalid stream once.
 
-        vi.spyOn(
-          client['config'],
-          'getContinueOnFailedApiCall',
-        ).mockReturnValue(true);
+        vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(true);
         const mockStream1 = (async function* () {
           yield { type: GeminiEventType.InvalidStream };
         })();
         const mockStream2 = (async function* () {
-          yield { type: 'content', value: 'ok' };
+          yield { type: "content", value: "ok" };
         })();
-        mockTurnRunFn
-          .mockReturnValueOnce(mockStream1)
-          .mockReturnValueOnce(mockStream2);
+        mockTurnRunFn.mockReturnValueOnce(mockStream1).mockReturnValueOnce(mockStream2);
 
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-retry',
+          "prompt-retry",
         );
         await fromAsync(stream);
 
@@ -2142,18 +2036,18 @@ ${JSON.stringify(
       });
     });
 
-    describe('IDE context with pending tool calls', () => {
+    describe("IDE context with pending tool calls", () => {
       let mockChat: Partial<GeminiChat>;
 
       beforeEach(() => {
-        vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+        vi.spyOn(client, "tryCompressChat").mockResolvedValue({
           originalTokenCount: 0,
           newTokenCount: 0,
           compressionStatus: CompressionStatus.COMPRESSED,
         });
 
         const mockStream = (async function* () {
-          yield { type: 'content', value: 'response' };
+          yield { type: "content", value: "response" };
         })();
         mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -2163,23 +2057,23 @@ ${JSON.stringify(
           setHistory: vi.fn(),
           getLastPromptTokenCount: vi.fn(),
         };
-        client['chat'] = mockChat as GeminiChat;
+        client["chat"] = mockChat as GeminiChat;
 
-        vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+        vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
         vi.mocked(ideContextStore.get).mockReturnValue({
           workspaceState: {
-            openFiles: [{ path: '/path/to/file.ts', timestamp: Date.now() }],
+            openFiles: [{ path: "/path/to/file.ts", timestamp: Date.now() }],
           },
         });
       });
 
-      it('should NOT add IDE context when a tool call is pending', async () => {
+      it("should NOT add IDE context when a tool call is pending", async () => {
         // Arrange: History ends with a functionCall from the model
         const historyWithPendingCall: Content[] = [
-          { role: 'user', parts: [{ text: 'Please use a tool.' }] },
+          { role: "user", parts: [{ text: "Please use a tool." }] },
           {
-            role: 'model',
-            parts: [{ functionCall: { name: 'some_tool', args: {} } }],
+            role: "model",
+            parts: [{ functionCall: { name: "some_tool", args: {} } }],
           },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(historyWithPendingCall);
@@ -2189,13 +2083,13 @@ ${JSON.stringify(
           [
             {
               functionResponse: {
-                name: 'some_tool',
+                name: "some_tool",
                 response: { success: true },
               },
             },
           ],
           new AbortController().signal,
-          'prompt-id-tool-response',
+          "prompt-id-tool-response",
         );
         for await (const _ of stream) {
           // consume stream to complete the call
@@ -2213,19 +2107,19 @@ ${JSON.stringify(
         );
       });
 
-      it('should add IDE context when no tool call is pending', async () => {
+      it("should add IDE context when no tool call is pending", async () => {
         // Arrange: History is normal, no pending calls
         const normalHistory: Content[] = [
-          { role: 'user', parts: [{ text: 'A normal message.' }] },
-          { role: 'model', parts: [{ text: 'A normal response.' }] },
+          { role: "user", parts: [{ text: "A normal message." }] },
+          { role: "model", parts: [{ text: "A normal response." }] },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(normalHistory);
 
         // Act
         const stream = client.sendMessageStream(
-          [{ text: 'Another normal message' }],
+          [{ text: "Another normal message" }],
           new AbortController().signal,
-          'prompt-id-normal',
+          "prompt-id-normal",
         );
         for await (const _ of stream) {
           // consume stream
@@ -2234,7 +2128,7 @@ ${JSON.stringify(
         // Assert: The IDE context message SHOULD have been added.
         expect(mockChat.addHistory).toHaveBeenCalledWith(
           expect.objectContaining({
-            role: 'user',
+            role: "user",
             parts: expect.arrayContaining([
               expect.objectContaining({
                 text: expect.stringContaining("user's editor context"),
@@ -2244,15 +2138,15 @@ ${JSON.stringify(
         );
       });
 
-      it('should send the latest IDE context on the next message after a skipped context', async () => {
+      it("should send the latest IDE context on the next message after a skipped context", async () => {
         // --- Step 1: A tool call is pending, context should be skipped ---
 
         // Arrange: History ends with a functionCall
         const historyWithPendingCall: Content[] = [
-          { role: 'user', parts: [{ text: 'Please use a tool.' }] },
+          { role: "user", parts: [{ text: "Please use a tool." }] },
           {
-            role: 'model',
-            parts: [{ functionCall: { name: 'some_tool', args: {} } }],
+            role: "model",
+            parts: [{ functionCall: { name: "some_tool", args: {} } }],
           },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(historyWithPendingCall);
@@ -2260,7 +2154,7 @@ ${JSON.stringify(
         // Arrange: Set the initial IDE context
         const initialIdeContext = {
           workspaceState: {
-            openFiles: [{ path: '/path/to/fileA.ts', timestamp: Date.now() }],
+            openFiles: [{ path: "/path/to/fileA.ts", timestamp: Date.now() }],
           },
         };
         vi.mocked(ideContextStore.get).mockReturnValue(initialIdeContext);
@@ -2270,13 +2164,13 @@ ${JSON.stringify(
           [
             {
               functionResponse: {
-                name: 'some_tool',
+                name: "some_tool",
                 response: { success: true },
               },
             },
           ],
           new AbortController().signal,
-          'prompt-id-tool-response',
+          "prompt-id-tool-response",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2299,36 +2193,34 @@ ${JSON.stringify(
         const historyAfterToolResponse: Content[] = [
           ...historyWithPendingCall,
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
                 functionResponse: {
-                  name: 'some_tool',
+                  name: "some_tool",
                   response: { success: true },
                 },
               },
             ],
           },
-          { role: 'model', parts: [{ text: 'The tool ran successfully.' }] },
+          { role: "model", parts: [{ text: "The tool ran successfully." }] },
         ];
-        vi.mocked(mockChat.getHistory!).mockReturnValue(
-          historyAfterToolResponse,
-        );
+        vi.mocked(mockChat.getHistory!).mockReturnValue(historyAfterToolResponse);
         vi.mocked(mockChat.addHistory!).mockClear(); // Clear previous calls for the next assertion
 
         // Arrange: The IDE context has now changed
         const newIdeContext = {
           workspaceState: {
-            openFiles: [{ path: '/path/to/fileB.ts', timestamp: Date.now() }],
+            openFiles: [{ path: "/path/to/fileB.ts", timestamp: Date.now() }],
           },
         };
         vi.mocked(ideContextStore.get).mockReturnValue(newIdeContext);
 
         // Act: Send a new, regular user message
         stream = client.sendMessageStream(
-          [{ text: 'Thanks!' }],
+          [{ text: "Thanks!" }],
           new AbortController().signal,
-          'prompt-id-final',
+          "prompt-id-final",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2344,19 +2236,19 @@ ${JSON.stringify(
           "Here is the user's editor context as a JSON object",
         );
         // Check that the sent context is the new one (fileB.ts)
-        expect(JSON.stringify(contextCall![0])).toContain('fileB.ts');
+        expect(JSON.stringify(contextCall![0])).toContain("fileB.ts");
         // Check that the sent context is NOT the old one (fileA.ts)
-        expect(JSON.stringify(contextCall![0])).not.toContain('fileA.ts');
+        expect(JSON.stringify(contextCall![0])).not.toContain("fileA.ts");
       });
 
-      it('should send a context DELTA on the next message after a skipped context', async () => {
+      it("should send a context DELTA on the next message after a skipped context", async () => {
         // --- Step 0: Establish an initial context ---
         vi.mocked(mockChat.getHistory!).mockReturnValue([]); // Start with empty history
         const contextA = {
           workspaceState: {
             openFiles: [
               {
-                path: '/path/to/fileA.ts',
+                path: "/path/to/fileA.ts",
                 isActive: true,
                 timestamp: Date.now(),
               },
@@ -2367,9 +2259,9 @@ ${JSON.stringify(
 
         // Act: Send a regular message to establish the initial context
         let stream = client.sendMessageStream(
-          [{ text: 'Initial message' }],
+          [{ text: "Initial message" }],
           new AbortController().signal,
-          'prompt-id-initial',
+          "prompt-id-initial",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2377,19 +2269,17 @@ ${JSON.stringify(
 
         // Assert: Full context for fileA.ts was sent and stored.
         const initialCall = vi.mocked(mockChat.addHistory!).mock.calls[0][0];
-        expect(JSON.stringify(initialCall)).toContain(
-          "user's editor context as a JSON object",
-        );
-        expect(JSON.stringify(initialCall)).toContain('fileA.ts');
+        expect(JSON.stringify(initialCall)).toContain("user's editor context as a JSON object");
+        expect(JSON.stringify(initialCall)).toContain("fileA.ts");
         // This implicitly tests that `lastSentIdeContext` is now set internally by the client.
         vi.mocked(mockChat.addHistory!).mockClear();
 
         // --- Step 1: A tool call is pending, context should be skipped ---
         const historyWithPendingCall: Content[] = [
-          { role: 'user', parts: [{ text: 'Please use a tool.' }] },
+          { role: "user", parts: [{ text: "Please use a tool." }] },
           {
-            role: 'model',
-            parts: [{ functionCall: { name: 'some_tool', args: {} } }],
+            role: "model",
+            parts: [{ functionCall: { name: "some_tool", args: {} } }],
           },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(historyWithPendingCall);
@@ -2399,7 +2289,7 @@ ${JSON.stringify(
           workspaceState: {
             openFiles: [
               {
-                path: '/path/to/fileB.ts',
+                path: "/path/to/fileB.ts",
                 isActive: true,
                 timestamp: Date.now(),
               },
@@ -2413,13 +2303,13 @@ ${JSON.stringify(
           [
             {
               functionResponse: {
-                name: 'some_tool',
+                name: "some_tool",
                 response: { success: true },
               },
             },
           ],
           new AbortController().signal,
-          'prompt-id-tool-response',
+          "prompt-id-tool-response",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2432,21 +2322,19 @@ ${JSON.stringify(
         const historyAfterToolResponse: Content[] = [
           ...historyWithPendingCall,
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
                 functionResponse: {
-                  name: 'some_tool',
+                  name: "some_tool",
                   response: { success: true },
                 },
               },
             ],
           },
-          { role: 'model', parts: [{ text: 'The tool ran successfully.' }] },
+          { role: "model", parts: [{ text: "The tool ran successfully." }] },
         ];
-        vi.mocked(mockChat.getHistory!).mockReturnValue(
-          historyAfterToolResponse,
-        );
+        vi.mocked(mockChat.getHistory!).mockReturnValue(historyAfterToolResponse);
 
         // Arrange: The IDE context has changed again
         const contextC = {
@@ -2454,7 +2342,7 @@ ${JSON.stringify(
             openFiles: [
               // fileA is now closed, fileC is open
               {
-                path: '/path/to/fileC.ts',
+                path: "/path/to/fileC.ts",
                 isActive: true,
                 timestamp: Date.now(),
               },
@@ -2465,9 +2353,9 @@ ${JSON.stringify(
 
         // Act: Send a new, regular user message
         stream = client.sendMessageStream(
-          [{ text: 'Thanks!' }],
+          [{ text: "Thanks!" }],
           new AbortController().signal,
-          'prompt-id-final',
+          "prompt-id-final",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2475,26 +2363,24 @@ ${JSON.stringify(
 
         // Assert: The DELTA context was sent
         const finalCall = vi.mocked(mockChat.addHistory!).mock.calls[0][0];
-        expect(JSON.stringify(finalCall)).toContain('summary of changes');
+        expect(JSON.stringify(finalCall)).toContain("summary of changes");
         // The delta should reflect fileA being closed and fileC being opened.
-        expect(JSON.stringify(finalCall)).toContain('filesClosed');
-        expect(JSON.stringify(finalCall)).toContain('fileA.ts');
-        expect(JSON.stringify(finalCall)).toContain('activeFileChanged');
-        expect(JSON.stringify(finalCall)).toContain('fileC.ts');
+        expect(JSON.stringify(finalCall)).toContain("filesClosed");
+        expect(JSON.stringify(finalCall)).toContain("fileA.ts");
+        expect(JSON.stringify(finalCall)).toContain("activeFileChanged");
+        expect(JSON.stringify(finalCall)).toContain("fileC.ts");
       });
     });
 
-    it('should not call checkNextSpeaker when turn.run() yields an error', async () => {
+    it("should not call checkNextSpeaker when turn.run() yields an error", async () => {
       // Arrange
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
 
       const mockStream = (async function* () {
         yield {
           type: GeminiEventType.Error,
-          value: { error: { message: 'test error' } },
+          value: { error: { message: "test error" } },
         };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
@@ -2504,13 +2390,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-error',
+        "prompt-id-error",
       );
       for await (const _ of stream) {
         // consume stream
@@ -2520,18 +2406,16 @@ ${JSON.stringify(
       expect(mockCheckNextSpeaker).not.toHaveBeenCalled();
     });
 
-    it('should not call checkNextSpeaker when turn.run() yields a value then an error', async () => {
+    it("should not call checkNextSpeaker when turn.run() yields a value then an error", async () => {
       // Arrange
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
 
       const mockStream = (async function* () {
-        yield { type: GeminiEventType.Content, value: 'some content' };
+        yield { type: GeminiEventType.Content, value: "some content" };
         yield {
           type: GeminiEventType.Error,
-          value: { error: { message: 'test error' } },
+          value: { error: { message: "test error" } },
         };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
@@ -2541,13 +2425,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-error',
+        "prompt-id-error",
       );
       for await (const _ of stream) {
         // consume stream
@@ -2557,10 +2441,10 @@ ${JSON.stringify(
       expect(mockCheckNextSpeaker).not.toHaveBeenCalled();
     });
 
-    it('should abort linked signal when loop is detected', async () => {
+    it("should abort linked signal when loop is detected", async () => {
       // Arrange
-      vi.spyOn(client['loopDetector'], 'turnStarted').mockResolvedValue(false);
-      vi.spyOn(client['loopDetector'], 'addAndCheck')
+      vi.spyOn(client["loopDetector"], "turnStarted").mockResolvedValue(false);
+      vi.spyOn(client["loopDetector"], "addAndCheck")
         .mockReturnValueOnce(false)
         .mockReturnValueOnce(true);
 
@@ -2568,8 +2452,8 @@ ${JSON.stringify(
       mockTurnRunFn.mockImplementation((_modelConfigKey, _request, signal) => {
         capturedSignal = signal;
         return (async function* () {
-          yield { type: 'content', value: 'First event' };
-          yield { type: 'content', value: 'Second event' };
+          yield { type: "content", value: "First event" };
+          yield { type: "content", value: "Second event" };
         })();
       });
 
@@ -2578,13 +2462,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-loop',
+        "prompt-id-loop",
       );
 
       const events = [];
@@ -2598,38 +2482,34 @@ ${JSON.stringify(
     });
   });
 
-  describe('generateContent', () => {
-    it('should call generateContent with the correct parameters', async () => {
-      const contents = [{ role: 'user', parts: [{ text: 'hello' }] }];
+  describe("generateContent", () => {
+    it("should call generateContent with the correct parameters", async () => {
+      const contents = [{ role: "user", parts: [{ text: "hello" }] }];
       const abortSignal = new AbortController().signal;
 
-      await client.generateContent(
-        { model: DEFAULT_GEMINI_FLASH_MODEL },
-        contents,
-        abortSignal,
-      );
+      await client.generateContent({ model: DEFAULT_GEMINI_FLASH_MODEL }, contents, abortSignal);
 
       expect(mockContentGenerator.generateContent).toHaveBeenCalledWith(
         {
           model: DEFAULT_GEMINI_FLASH_MODEL,
           config: {
             abortSignal,
-            systemInstruction: getCoreSystemPrompt({} as unknown as Config, ''),
+            systemInstruction: getCoreSystemPrompt({} as unknown as Config, ""),
             temperature: 0,
             topP: 1,
           },
           contents,
         },
-        'test-session-id',
+        "test-session-id",
       );
     });
 
-    it('should use current model from config for content generation', async () => {
-      const initialModel = client['config'].getModel();
-      const contents = [{ role: 'user', parts: [{ text: 'test' }] }];
-      const currentModel = initialModel + '-changed';
+    it("should use current model from config for content generation", async () => {
+      const initialModel = client["config"].getModel();
+      const contents = [{ role: "user", parts: [{ text: "test" }] }];
+      const currentModel = initialModel + "-changed";
 
-      vi.spyOn(client['config'], 'getModel').mockReturnValueOnce(currentModel);
+      vi.spyOn(client["config"], "getModel").mockReturnValueOnce(currentModel);
 
       await client.generateContent(
         { model: DEFAULT_GEMINI_FLASH_MODEL },
@@ -2648,29 +2528,25 @@ ${JSON.stringify(
           config: expect.any(Object),
           contents,
         },
-        'test-session-id',
+        "test-session-id",
       );
     });
 
-    it('should use the Flash model when fallback mode is active', async () => {
-      const contents = [{ role: 'user', parts: [{ text: 'hello' }] }];
+    it("should use the Flash model when fallback mode is active", async () => {
+      const contents = [{ role: "user", parts: [{ text: "hello" }] }];
       const abortSignal = new AbortController().signal;
-      const requestedModel = 'gemini-2.5-pro'; // A non-flash model
+      const requestedModel = "gemini-2.5-pro"; // A non-flash model
 
       // Mock config to be in fallback mode
-      vi.spyOn(client['config'], 'isInFallbackMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "isInFallbackMode").mockReturnValue(true);
 
-      await client.generateContent(
-        { model: requestedModel },
-        contents,
-        abortSignal,
-      );
+      await client.generateContent({ model: requestedModel }, contents, abortSignal);
 
       expect(mockGenerateContentFn).toHaveBeenCalledWith(
         expect.objectContaining({
           model: DEFAULT_GEMINI_FLASH_MODEL,
         }),
-        'test-session-id',
+        "test-session-id",
       );
     });
   });
diff --git a/packages/gemini-cli-core/src/core/client.ts b/packages/gemini-cli-core/src/core/client.ts
index 3ce8c1306..13c17c746 100644
--- a/packages/gemini-cli-core/src/core/client.ts
+++ b/packages/gemini-cli-core/src/core/client.ts
@@ -5,63 +5,44 @@
  */
 
 import type {
+  Content,
   GenerateContentConfig,
+  GenerateContentResponse,
   PartListUnion,
-  Content,
   Tool,
-  GenerateContentResponse,
-} from '@google/genai';
-import {
-  getDirectoryContextString,
-  getInitialChatHistory,
-} from '../utils/environmentContext.js';
-import type { ServerGeminiStreamEvent, ChatCompressionInfo } from './turn.js';
-import { CompressionStatus } from './turn.js';
-import { Turn, GeminiEventType } from './turn.js';
-import type { Config } from '../config/config.js';
-import { getCoreSystemPrompt } from './prompts.js';
-import { checkNextSpeaker } from '../utils/nextSpeakerChecker.js';
-import { reportError } from '../utils/errorReporting.js';
-import { GeminiChat } from './geminiChat.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { tokenLimit } from './tokenLimits.js';
-import type {
-  ChatRecordingService,
-  ResumedSessionData,
-} from '../services/chatRecordingService.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import {
-  DEFAULT_GEMINI_FLASH_MODEL,
-  getEffectiveModel,
-} from '../config/models.js';
-import { LoopDetectionService } from '../services/loopDetectionService.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-import { ideContextStore } from '../ide/ideContext.js';
-import {
-  logContentRetryFailure,
-  logNextSpeakerCheck,
-} from '../telemetry/loggers.js';
-import {
-  fireBeforeAgentHook,
-  fireAfterAgentHook,
-} from './clientHookTriggers.js';
-import {
-  ContentRetryFailureEvent,
-  NextSpeakerCheckEvent,
-} from '../telemetry/types.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-import type { IdeContext, File } from '../ide/types.js';
-import { handleFallback } from '../fallback/handler.js';
-import type { RoutingContext } from '../routing/routingStrategy.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
-import { calculateRequestTokenCount } from '../utils/tokenCalculation.js';
+} from "@google/genai";
 import {
   applyModelSelection,
   createAvailabilityContextProvider,
-} from '../availability/policyHelpers.js';
-import type { RetryAvailabilityContext } from '../utils/retry.js';
+} from "../availability/policyHelpers.js";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, getEffectiveModel } from "../config/models.js";
+import { handleFallback } from "../fallback/handler.js";
+import { ideContextStore } from "../ide/ideContext.js";
+import type { File, IdeContext } from "../ide/types.js";
+import type { RoutingContext } from "../routing/routingStrategy.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import type { ChatRecordingService, ResumedSessionData } from "../services/chatRecordingService.js";
+import { LoopDetectionService } from "../services/loopDetectionService.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import { logContentRetryFailure, logNextSpeakerCheck } from "../telemetry/loggers.js";
+import { ContentRetryFailureEvent, NextSpeakerCheckEvent } from "../telemetry/types.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getDirectoryContextString, getInitialChatHistory } from "../utils/environmentContext.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { checkNextSpeaker } from "../utils/nextSpeakerChecker.js";
+import type { RetryAvailabilityContext } from "../utils/retry.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import { calculateRequestTokenCount } from "../utils/tokenCalculation.js";
+import { fireAfterAgentHook, fireBeforeAgentHook } from "./clientHookTriggers.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { GeminiChat } from "./geminiChat.js";
+import { getCoreSystemPrompt } from "./prompts.js";
+import { tokenLimit } from "./tokenLimits.js";
+import type { ChatCompressionInfo, ServerGeminiStreamEvent } from "./turn.js";
+import { CompressionStatus, GeminiEventType, Turn } from "./turn.js";
 
 const MAX_TURNS = 100;
 
@@ -90,9 +71,7 @@ export class GeminiClient {
 
   private updateTelemetryTokenCount() {
     if (this.chat) {
-      uiTelemetryService.setLastPromptTokenCount(
-        this.chat.getLastPromptTokenCount(),
-      );
+      uiTelemetryService.setLastPromptTokenCount(this.chat.getLastPromptTokenCount());
     }
   }
 
@@ -103,7 +82,7 @@ export class GeminiClient {
 
   private getContentGeneratorOrFail(): ContentGenerator {
     if (!this.config.getContentGenerator()) {
-      throw new Error('Content generator not initialized');
+      throw new Error("Content generator not initialized");
     }
     return this.config.getContentGenerator();
   }
@@ -114,7 +93,7 @@ export class GeminiClient {
 
   getChat(): GeminiChat {
     if (!this.chat) {
-      throw new Error('Chat not initialized');
+      throw new Error("Chat not initialized");
     }
     return this.chat;
   }
@@ -148,10 +127,7 @@ export class GeminiClient {
     this.updateTelemetryTokenCount();
   }
 
-  async resumeChat(
-    history: Content[],
-    resumedSessionData?: ResumedSessionData,
-  ): Promise<void> {
+  async resumeChat(history: Content[], resumedSessionData?: ResumedSessionData): Promise<void> {
     this.chat = await this.startChat(history, resumedSessionData);
   }
 
@@ -173,7 +149,7 @@ export class GeminiClient {
     }
 
     this.getChat().addHistory({
-      role: 'user',
+      role: "user",
       parts: [{ text: await getDirectoryContextString(this.config) }],
     });
   }
@@ -204,20 +180,9 @@ export class GeminiClient {
     try {
       const userMemory = this.config.getUserMemory();
       const systemInstruction = getCoreSystemPrompt(this.config, userMemory);
-      return new GeminiChat(
-        this.config,
-        systemInstruction,
-        tools,
-        history,
-        resumedSessionData,
-      );
+      return new GeminiChat(this.config, systemInstruction, tools, history, resumedSessionData);
     } catch (error) {
-      await reportError(
-        error,
-        'Error initializing Gemini chat session.',
-        history,
-        'startChat',
-      );
+      await reportError(error, "Error initializing Gemini chat session.", history, "startChat");
       throw new Error(`Failed to initialize chat: ${getErrorMessage(error)}`);
     }
   }
@@ -235,14 +200,12 @@ export class GeminiClient {
       // Send full context as JSON
       const openFiles = currentIdeContext.workspaceState?.openFiles || [];
       const activeFile = openFiles.find((f) => f.isActive);
-      const otherOpenFiles = openFiles
-        .filter((f) => !f.isActive)
-        .map((f) => f.path);
+      const otherOpenFiles = openFiles.filter((f) => !f.isActive).map((f) => f.path);
 
       const contextData: Record<string, unknown> = {};
 
       if (activeFile) {
-        contextData['activeFile'] = {
+        contextData["activeFile"] = {
           path: activeFile.path,
           cursor: activeFile.cursor
             ? {
@@ -255,7 +218,7 @@ export class GeminiClient {
       }
 
       if (otherOpenFiles.length > 0) {
-        contextData['otherOpenFiles'] = otherOpenFiles;
+        contextData["otherOpenFiles"] = otherOpenFiles;
       }
 
       if (Object.keys(contextData).length === 0) {
@@ -265,13 +228,13 @@ export class GeminiClient {
       const jsonString = JSON.stringify(contextData, null, 2);
       const contextParts = [
         "Here is the user's editor context as a JSON object. This is for your information only.",
-        '```json',
+        "```json",
         jsonString,
-        '```',
+        "```",
       ];
 
       if (this.config.getDebugMode()) {
-        debugLogger.log(contextParts.join('\n'));
+        debugLogger.log(contextParts.join("\n"));
       }
       return {
         contextParts,
@@ -283,15 +246,10 @@ export class GeminiClient {
       const changes: Record<string, unknown> = {};
 
       const lastFiles = new Map(
-        (this.lastSentIdeContext.workspaceState?.openFiles || []).map(
-          (f: File) => [f.path, f],
-        ),
+        (this.lastSentIdeContext.workspaceState?.openFiles || []).map((f: File) => [f.path, f]),
       );
       const currentFiles = new Map(
-        (currentIdeContext.workspaceState?.openFiles || []).map((f: File) => [
-          f.path,
-          f,
-        ]),
+        (currentIdeContext.workspaceState?.openFiles || []).map((f: File) => [f.path, f]),
       );
 
       const openedFiles: string[] = [];
@@ -301,7 +259,7 @@ export class GeminiClient {
         }
       }
       if (openedFiles.length > 0) {
-        changes['filesOpened'] = openedFiles;
+        changes["filesOpened"] = openedFiles;
       }
 
       const closedFiles: string[] = [];
@@ -311,19 +269,19 @@ export class GeminiClient {
         }
       }
       if (closedFiles.length > 0) {
-        changes['filesClosed'] = closedFiles;
+        changes["filesClosed"] = closedFiles;
       }
 
-      const lastActiveFile = (
-        this.lastSentIdeContext.workspaceState?.openFiles || []
-      ).find((f: File) => f.isActive);
-      const currentActiveFile = (
-        currentIdeContext.workspaceState?.openFiles || []
-      ).find((f: File) => f.isActive);
+      const lastActiveFile = (this.lastSentIdeContext.workspaceState?.openFiles || []).find(
+        (f: File) => f.isActive,
+      );
+      const currentActiveFile = (currentIdeContext.workspaceState?.openFiles || []).find(
+        (f: File) => f.isActive,
+      );
 
       if (currentActiveFile) {
         if (!lastActiveFile || lastActiveFile.path !== currentActiveFile.path) {
-          changes['activeFileChanged'] = {
+          changes["activeFileChanged"] = {
             path: currentActiveFile.path,
             cursor: currentActiveFile.cursor
               ? {
@@ -342,7 +300,7 @@ export class GeminiClient {
               lastCursor.line !== currentCursor.line ||
               lastCursor.character !== currentCursor.character)
           ) {
-            changes['cursorMoved'] = {
+            changes["cursorMoved"] = {
               path: currentActiveFile.path,
               cursor: {
                 line: currentCursor.line,
@@ -351,17 +309,17 @@ export class GeminiClient {
             };
           }
 
-          const lastSelectedText = lastActiveFile.selectedText || '';
-          const currentSelectedText = currentActiveFile.selectedText || '';
+          const lastSelectedText = lastActiveFile.selectedText || "";
+          const currentSelectedText = currentActiveFile.selectedText || "";
           if (lastSelectedText !== currentSelectedText) {
-            changes['selectionChanged'] = {
+            changes["selectionChanged"] = {
               path: currentActiveFile.path,
               selectedText: currentSelectedText,
             };
           }
         }
       } else if (lastActiveFile) {
-        changes['activeFileChanged'] = {
+        changes["activeFileChanged"] = {
           path: null,
           previousPath: lastActiveFile.path,
         };
@@ -371,17 +329,17 @@ export class GeminiClient {
         return { contextParts: [], newIdeContext: currentIdeContext };
       }
 
-      delta['changes'] = changes;
+      delta["changes"] = changes;
       const jsonString = JSON.stringify(delta, null, 2);
       const contextParts = [
         "Here is a summary of changes in the user's editor context, in JSON format. This is for your information only.",
-        '```json',
+        "```json",
         jsonString,
-        '```',
+        "```",
       ];
 
       if (this.config.getDebugMode()) {
-        debugLogger.log(contextParts.join('\n'));
+        debugLogger.log(contextParts.join("\n"));
       }
       return {
         contextParts,
@@ -420,10 +378,7 @@ export class GeminiClient {
     if (hooksEnabled && messageBus) {
       const hookOutput = await fireBeforeAgentHook(messageBus, request);
 
-      if (
-        hookOutput?.isBlockingDecision() ||
-        hookOutput?.shouldStopExecution()
-      ) {
+      if (hookOutput?.isBlockingDecision() || hookOutput?.shouldStopExecution()) {
         yield {
           type: GeminiEventType.Error,
           value: {
@@ -496,12 +451,11 @@ export class GeminiClient {
     // in the conversation history . The IDE context is not discarded; it will
     // be included in the next regular message sent to the model.
     const history = this.getHistory();
-    const lastMessage =
-      history.length > 0 ? history[history.length - 1] : undefined;
+    const lastMessage = history.length > 0 ? history[history.length - 1] : undefined;
     const hasPendingToolCall =
       !!lastMessage &&
-      lastMessage.role === 'model' &&
-      (lastMessage.parts?.some((p) => 'functionCall' in p) || false);
+      lastMessage.role === "model" &&
+      (lastMessage.parts?.some((p) => "functionCall" in p) || false);
 
     if (this.config.getIdeMode() && !hasPendingToolCall) {
       const { contextParts, newIdeContext } = this.getIdeContextParts(
@@ -509,8 +463,8 @@ export class GeminiClient {
       );
       if (contextParts.length > 0) {
         this.getChat().addHistory({
-          role: 'user',
-          parts: [{ text: contextParts.join('\n') }],
+          role: "user",
+          parts: [{ text: contextParts.join("\n") }],
         });
       }
       this.lastSentIdeContext = newIdeContext;
@@ -577,13 +531,13 @@ export class GeminiClient {
               this.config,
               new ContentRetryFailureEvent(
                 4, // 2 initial + 2 after injections
-                'FAILED_AFTER_PROMPT_INJECTION',
+                "FAILED_AFTER_PROMPT_INJECTION",
                 modelToUse,
               ),
             );
             return turn;
           }
-          const nextRequest = [{ text: 'System: Please continue.' }];
+          const nextRequest = [{ text: "System: Please continue." }];
           yield* this.sendMessageStream(
             nextRequest,
             signal,
@@ -618,12 +572,12 @@ export class GeminiClient {
         this.config,
         new NextSpeakerCheckEvent(
           prompt_id,
-          turn.finishReason?.toString() || '',
-          nextSpeakerCheck?.next_speaker || '',
+          turn.finishReason?.toString() || "",
+          nextSpeakerCheck?.next_speaker || "",
         ),
       );
-      if (nextSpeakerCheck?.next_speaker === 'model') {
-        const nextRequest = [{ text: 'Please continue.' }];
+      if (nextSpeakerCheck?.next_speaker === "model") {
+        const nextRequest = [{ text: "Please continue." }];
         // This recursive call's events will be yielded out, and the final
         // turn object from the recursive call will be returned.
         return yield* this.sendMessageStream(
@@ -638,26 +592,14 @@ export class GeminiClient {
 
     // Fire AfterAgent hook through MessageBus (only if hooks are enabled)
     if (hooksEnabled && messageBus) {
-      const responseText = turn.getResponseText() || '[no response text]';
-      const hookOutput = await fireAfterAgentHook(
-        messageBus,
-        request,
-        responseText,
-      );
+      const responseText = turn.getResponseText() || "[no response text]";
+      const hookOutput = await fireAfterAgentHook(messageBus, request, responseText);
 
       // For AfterAgent hooks, blocking/stop execution should force continuation
-      if (
-        hookOutput?.isBlockingDecision() ||
-        hookOutput?.shouldStopExecution()
-      ) {
+      if (hookOutput?.isBlockingDecision() || hookOutput?.shouldStopExecution()) {
         const continueReason = hookOutput.getEffectiveReason();
         const continueRequest = [{ text: continueReason }];
-        yield* this.sendMessageStream(
-          continueRequest,
-          signal,
-          prompt_id,
-          boundedTurns - 1,
-        );
+        yield* this.sendMessageStream(continueRequest, signal, prompt_id, boundedTurns - 1);
       }
     }
 
@@ -669,17 +611,13 @@ export class GeminiClient {
     contents: Content[],
     abortSignal: AbortSignal,
   ): Promise<GenerateContentResponse> {
-    const desiredModelConfig =
-      this.config.modelConfigService.getResolvedConfig(modelConfigKey);
-    let {
-      model: currentAttemptModel,
-      generateContentConfig: currentAttemptGenerateContentConfig,
-    } = desiredModelConfig;
-    const fallbackModelConfig =
-      this.config.modelConfigService.getResolvedConfig({
-        ...modelConfigKey,
-        model: DEFAULT_GEMINI_FLASH_MODEL,
-      });
+    const desiredModelConfig = this.config.modelConfigService.getResolvedConfig(modelConfigKey);
+    let { model: currentAttemptModel, generateContentConfig: currentAttemptGenerateContentConfig } =
+      desiredModelConfig;
+    const fallbackModelConfig = this.config.modelConfigService.getResolvedConfig({
+      ...modelConfigKey,
+      model: DEFAULT_GEMINI_FLASH_MODEL,
+    });
 
     try {
       const userMemory = this.config.getUserMemory();
@@ -701,10 +639,7 @@ export class GeminiClient {
 
       // Define callback to refresh context based on currentAttemptModel which might be updated by fallback handler
       const getAvailabilityContext: () => RetryAvailabilityContext | undefined =
-        createAvailabilityContextProvider(
-          this.config,
-          () => currentAttemptModel,
-        );
+        createAvailabilityContextProvider(this.config, () => currentAttemptModel);
 
       const apiCall = () => {
         let modelConfigToUse = desiredModelConfig;
@@ -714,8 +649,7 @@ export class GeminiClient {
             ? fallbackModelConfig
             : desiredModelConfig;
           currentAttemptModel = modelConfigToUse.model;
-          currentAttemptGenerateContentConfig =
-            modelConfigToUse.generateContentConfig;
+          currentAttemptGenerateContentConfig = modelConfigToUse.generateContentConfig;
         } else {
           // AvailabilityService
           const active = this.config.getActiveModel();
@@ -726,8 +660,7 @@ export class GeminiClient {
               ...modelConfigKey,
               model: currentAttemptModel,
             });
-            currentAttemptGenerateContentConfig =
-              newConfig.generateContentConfig;
+            currentAttemptGenerateContentConfig = newConfig.generateContentConfig;
           }
         }
 
@@ -746,10 +679,7 @@ export class GeminiClient {
           this.lastPromptId,
         );
       };
-      const onPersistent429Callback = async (
-        authType?: string,
-        error?: unknown,
-      ) =>
+      const onPersistent429Callback = async (authType?: string, error?: unknown) =>
         // Pass the captured model to the centralized handler.
         handleFallback(this.config, currentAttemptModel, authType, error);
 
@@ -773,7 +703,7 @@ export class GeminiClient {
           requestContents: contents,
           requestConfig: currentAttemptGenerateContentConfig,
         },
-        'generateContent-api',
+        "generateContent-api",
       );
       throw new Error(
         `Failed to generate content with model ${currentAttemptModel}: ${getErrorMessage(error)}`,
@@ -781,10 +711,7 @@ export class GeminiClient {
     }
   }
 
-  async tryCompressChat(
-    prompt_id: string,
-    force: boolean = false,
-  ): Promise<ChatCompressionInfo> {
+  async tryCompressChat(prompt_id: string, force: boolean = false): Promise<ChatCompressionInfo> {
     // If the model is 'auto', we will use a placeholder model to check.
     // Compression occurs before we choose a model, so calling `count_tokens`
     // before the model is chosen would result in an error.
@@ -799,12 +726,8 @@ export class GeminiClient {
       this.hasFailedCompressionAttempt,
     );
 
-    if (
-      info.compressionStatus ===
-      CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT
-    ) {
-      this.hasFailedCompressionAttempt =
-        this.hasFailedCompressionAttempt || !force;
+    if (info.compressionStatus === CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT) {
+      this.hasFailedCompressionAttempt = this.hasFailedCompressionAttempt || !force;
     } else if (info.compressionStatus === CompressionStatus.COMPRESSED) {
       if (newHistory) {
         this.chat = await this.startChat(newHistory);
diff --git a/packages/gemini-cli-core/src/core/clientHookTriggers.ts b/packages/gemini-cli-core/src/core/clientHookTriggers.ts
index 0a6b9150a..89b664c98 100644
--- a/packages/gemini-cli-core/src/core/clientHookTriggers.ts
+++ b/packages/gemini-cli-core/src/core/clientHookTriggers.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { PartListUnion } from '@google/genai';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import type { PartListUnion } from "@google/genai";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
-  MessageBusType,
   type HookExecutionRequest,
   type HookExecutionResponse,
-} from '../confirmation-bus/types.js';
-import { createHookOutput, type DefaultHookOutput } from '../hooks/types.js';
-import { partToString } from '../utils/partUtils.js';
-import { debugLogger } from '../utils/debugLogger.js';
+  MessageBusType,
+} from "../confirmation-bus/types.js";
+import { createHookOutput, type DefaultHookOutput } from "../hooks/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { partToString } from "../utils/partUtils.js";
 
 /**
  * Fires the BeforeAgent hook and returns the hook output.
@@ -35,13 +35,10 @@ export async function fireBeforeAgentHook(
   try {
     const promptText = partToString(request);
 
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'BeforeAgent',
+        eventName: "BeforeAgent",
         input: {
           prompt: promptText,
         },
@@ -49,9 +46,7 @@ export async function fireBeforeAgentHook(
       MessageBusType.HOOK_EXECUTION_RESPONSE,
     );
 
-    return response.output
-      ? createHookOutput('BeforeAgent', response.output)
-      : undefined;
+    return response.output ? createHookOutput("BeforeAgent", response.output) : undefined;
   } catch (error) {
     debugLogger.warn(`BeforeAgent hook failed: ${error}`);
     return undefined;
@@ -79,13 +74,10 @@ export async function fireAfterAgentHook(
   try {
     const promptText = partToString(request);
 
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'AfterAgent',
+        eventName: "AfterAgent",
         input: {
           prompt: promptText,
           prompt_response: responseText,
@@ -95,9 +87,7 @@ export async function fireAfterAgentHook(
       MessageBusType.HOOK_EXECUTION_RESPONSE,
     );
 
-    return response.output
-      ? createHookOutput('AfterAgent', response.output)
-      : undefined;
+    return response.output ? createHookOutput("AfterAgent", response.output) : undefined;
   } catch (error) {
     debugLogger.warn(`AfterAgent hook failed: ${error}`);
     return undefined;
diff --git a/packages/gemini-cli-core/src/core/contentGenerator.test.ts b/packages/gemini-cli-core/src/core/contentGenerator.test.ts
index f5f46d7d6..2c626d9f2 100644
--- a/packages/gemini-cli-core/src/core/contentGenerator.test.ts
+++ b/packages/gemini-cli-core/src/core/contentGenerator.test.ts
@@ -4,38 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { ContentGenerator } from './contentGenerator.js';
+import { GoogleGenAI } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createCodeAssistContentGenerator } from "../code_assist/codeAssist.js";
+import type { Config } from "../config/config.js";
+import { loadApiKey } from "./apiKeyCredentialStorage.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 import {
-  createContentGenerator,
   AuthType,
+  createContentGenerator,
   createContentGeneratorConfig,
-} from './contentGenerator.js';
-import { createCodeAssistContentGenerator } from '../code_assist/codeAssist.js';
-import { GoogleGenAI } from '@google/genai';
-import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from './loggingContentGenerator.js';
-import { loadApiKey } from './apiKeyCredentialStorage.js';
-import { FakeContentGenerator } from './fakeContentGenerator.js';
-import { RecordingContentGenerator } from './recordingContentGenerator.js';
-
-vi.mock('../code_assist/codeAssist.js');
-vi.mock('@google/genai');
-vi.mock('./apiKeyCredentialStorage.js', () => ({
+} from "./contentGenerator.js";
+import { FakeContentGenerator } from "./fakeContentGenerator.js";
+import { LoggingContentGenerator } from "./loggingContentGenerator.js";
+import { RecordingContentGenerator } from "./recordingContentGenerator.js";
+
+vi.mock("../code_assist/codeAssist.js");
+vi.mock("@google/genai");
+vi.mock("./apiKeyCredentialStorage.js", () => ({
   loadApiKey: vi.fn(),
 }));
 
-vi.mock('./fakeContentGenerator.js');
+vi.mock("./fakeContentGenerator.js");
 
 const mockConfig = {
-  getModel: vi.fn().mockReturnValue('gemini-pro'),
+  getModel: vi.fn().mockReturnValue("gemini-pro"),
   getProxy: vi.fn().mockReturnValue(undefined),
   getUsageStatisticsEnabled: vi.fn().mockReturnValue(true),
   isInFallbackMode: vi.fn().mockReturnValue(false),
   getPreviewFeatures: vi.fn().mockReturnValue(false),
 } as unknown as Config;
 
-describe('createContentGenerator', () => {
+describe("createContentGenerator", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
@@ -44,12 +44,10 @@ describe('createContentGenerator', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should create a FakeContentGenerator', async () => {
+  it("should create a FakeContentGenerator", async () => {
     const mockGenerator = {} as unknown as ContentGenerator;
-    vi.mocked(FakeContentGenerator.fromFile).mockResolvedValue(
-      mockGenerator as never,
-    );
-    const fakeResponsesFile = 'fake/responses.yaml';
+    vi.mocked(FakeContentGenerator.fromFile).mockResolvedValue(mockGenerator as never);
+    const fakeResponsesFile = "fake/responses.yaml";
     const mockConfigWithFake = {
       fakeResponses: fakeResponsesFile,
     } as unknown as Config;
@@ -59,15 +57,13 @@ describe('createContentGenerator', () => {
       },
       mockConfigWithFake,
     );
-    expect(FakeContentGenerator.fromFile).toHaveBeenCalledWith(
-      fakeResponsesFile,
-    );
+    expect(FakeContentGenerator.fromFile).toHaveBeenCalledWith(fakeResponsesFile);
     expect(generator).toEqual(mockGenerator);
   });
 
-  it('should create a RecordingContentGenerator', async () => {
-    const fakeResponsesFile = 'fake/responses.yaml';
-    const recordResponsesFile = 'record/responses.yaml';
+  it("should create a RecordingContentGenerator", async () => {
+    const fakeResponsesFile = "fake/responses.yaml";
+    const recordResponsesFile = "record/responses.yaml";
     const mockConfigWithRecordResponses = {
       fakeResponses: fakeResponsesFile,
       recordResponses: recordResponsesFile,
@@ -81,11 +77,9 @@ describe('createContentGenerator', () => {
     expect(generator).toBeInstanceOf(RecordingContentGenerator);
   });
 
-  it('should create a CodeAssistContentGenerator when AuthType is LOGIN_WITH_GOOGLE', async () => {
+  it("should create a CodeAssistContentGenerator when AuthType is LOGIN_WITH_GOOGLE", async () => {
     const mockGenerator = {} as unknown as ContentGenerator;
-    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(
-      mockGenerator as never,
-    );
+    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(mockGenerator as never);
     const generator = await createContentGenerator(
       {
         authType: AuthType.LOGIN_WITH_GOOGLE,
@@ -93,16 +87,12 @@ describe('createContentGenerator', () => {
       mockConfig,
     );
     expect(createCodeAssistContentGenerator).toHaveBeenCalled();
-    expect(generator).toEqual(
-      new LoggingContentGenerator(mockGenerator, mockConfig),
-    );
+    expect(generator).toEqual(new LoggingContentGenerator(mockGenerator, mockConfig));
   });
 
-  it('should create a CodeAssistContentGenerator when AuthType is COMPUTE_ADC', async () => {
+  it("should create a CodeAssistContentGenerator when AuthType is COMPUTE_ADC", async () => {
     const mockGenerator = {} as unknown as ContentGenerator;
-    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(
-      mockGenerator as never,
-    );
+    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(mockGenerator as never);
     const generator = await createContentGenerator(
       {
         authType: AuthType.COMPUTE_ADC,
@@ -110,14 +100,12 @@ describe('createContentGenerator', () => {
       mockConfig,
     );
     expect(createCodeAssistContentGenerator).toHaveBeenCalled();
-    expect(generator).toEqual(
-      new LoggingContentGenerator(mockGenerator, mockConfig),
-    );
+    expect(generator).toEqual(new LoggingContentGenerator(mockGenerator, mockConfig));
   });
 
-  it('should create a GoogleGenAI content generator', async () => {
+  it("should create a GoogleGenAI content generator", async () => {
     const mockConfig = {
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getProxy: vi.fn().mockReturnValue(undefined),
       getUsageStatisticsEnabled: () => true,
       isInFallbackMode: vi.fn().mockReturnValue(false),
@@ -125,7 +113,7 @@ describe('createContentGenerator', () => {
     } as unknown as Config;
 
     // Set a fixed version for testing
-    vi.stubEnv('CLI_VERSION', '1.2.3');
+    vi.stubEnv("CLI_VERSION", "1.2.3");
 
     const mockGenerator = {
       models: {},
@@ -133,37 +121,32 @@ describe('createContentGenerator', () => {
     vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator as never);
     const generator = await createContentGenerator(
       {
-        apiKey: 'test-api-key',
+        apiKey: "test-api-key",
         authType: AuthType.USE_GEMINI,
       },
       mockConfig,
     );
     expect(GoogleGenAI).toHaveBeenCalledWith({
-      apiKey: 'test-api-key',
+      apiKey: "test-api-key",
       vertexai: undefined,
       httpOptions: {
         headers: {
-          'User-Agent': expect.stringContaining('GeminiCLI/1.2.3/gemini-pro'),
-          'x-gemini-api-privileged-user-id': expect.any(String),
+          "User-Agent": expect.stringContaining("GeminiCLI/1.2.3/gemini-pro"),
+          "x-gemini-api-privileged-user-id": expect.any(String),
         },
       },
     });
     expect(generator).toEqual(
-      new LoggingContentGenerator(
-        (mockGenerator as GoogleGenAI).models,
-        mockConfig,
-      ),
+      new LoggingContentGenerator((mockGenerator as GoogleGenAI).models, mockConfig),
     );
   });
 
-  it('should include custom headers from GEMINI_CLI_CUSTOM_HEADERS for Code Assist requests', async () => {
+  it("should include custom headers from GEMINI_CLI_CUSTOM_HEADERS for Code Assist requests", async () => {
     const mockGenerator = {} as unknown as ContentGenerator;
-    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(
-      mockGenerator as never,
-    );
+    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(mockGenerator as never);
     vi.stubEnv(
-      'GEMINI_CLI_CUSTOM_HEADERS',
-      'X-Test-Header: test-value, Another-Header: another value',
+      "GEMINI_CLI_CUSTOM_HEADERS",
+      "X-Test-Header: test-value, Another-Header: another value",
     );
 
     await createContentGenerator(
@@ -176,9 +159,9 @@ describe('createContentGenerator', () => {
     expect(createCodeAssistContentGenerator).toHaveBeenCalledWith(
       {
         headers: expect.objectContaining({
-          'User-Agent': expect.any(String),
-          'X-Test-Header': 'test-value',
-          'Another-Header': 'another value',
+          "User-Agent": expect.any(String),
+          "X-Test-Header": "test-value",
+          "Another-Header": "another value",
         }),
       },
       AuthType.LOGIN_WITH_GOOGLE,
@@ -187,9 +170,9 @@ describe('createContentGenerator', () => {
     );
   });
 
-  it('should include custom headers from GEMINI_CLI_CUSTOM_HEADERS for GoogleGenAI requests without inferring auth mechanism', async () => {
+  it("should include custom headers from GEMINI_CLI_CUSTOM_HEADERS for GoogleGenAI requests without inferring auth mechanism", async () => {
     const mockConfig = {
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getProxy: vi.fn().mockReturnValue(undefined),
       getUsageStatisticsEnabled: () => false,
       isInFallbackMode: vi.fn().mockReturnValue(false),
@@ -200,27 +183,24 @@ describe('createContentGenerator', () => {
       models: {},
     } as unknown as GoogleGenAI;
     vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator as never);
-    vi.stubEnv(
-      'GEMINI_CLI_CUSTOM_HEADERS',
-      'X-Test-Header: test, Another: value',
-    );
+    vi.stubEnv("GEMINI_CLI_CUSTOM_HEADERS", "X-Test-Header: test, Another: value");
 
     await createContentGenerator(
       {
-        apiKey: 'test-api-key',
+        apiKey: "test-api-key",
         authType: AuthType.USE_GEMINI,
       },
       mockConfig,
     );
 
     expect(GoogleGenAI).toHaveBeenCalledWith({
-      apiKey: 'test-api-key',
+      apiKey: "test-api-key",
       vertexai: undefined,
       httpOptions: {
         headers: expect.objectContaining({
-          'User-Agent': expect.any(String),
-          'X-Test-Header': 'test',
-          Another: 'value',
+          "User-Agent": expect.any(String),
+          "X-Test-Header": "test",
+          Another: "value",
         }),
       },
     });
@@ -235,9 +215,9 @@ describe('createContentGenerator', () => {
     );
   });
 
-  it('should pass api key as Authorization Header when GEMINI_API_KEY_AUTH_MECHANISM is set to bearer', async () => {
+  it("should pass api key as Authorization Header when GEMINI_API_KEY_AUTH_MECHANISM is set to bearer", async () => {
     const mockConfig = {
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getProxy: vi.fn().mockReturnValue(undefined),
       getUsageStatisticsEnabled: () => false,
       isInFallbackMode: vi.fn().mockReturnValue(false),
@@ -248,31 +228,31 @@ describe('createContentGenerator', () => {
       models: {},
     } as unknown as GoogleGenAI;
     vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator as never);
-    vi.stubEnv('GEMINI_API_KEY_AUTH_MECHANISM', 'bearer');
+    vi.stubEnv("GEMINI_API_KEY_AUTH_MECHANISM", "bearer");
 
     await createContentGenerator(
       {
-        apiKey: 'test-api-key',
+        apiKey: "test-api-key",
         authType: AuthType.USE_GEMINI,
       },
       mockConfig,
     );
 
     expect(GoogleGenAI).toHaveBeenCalledWith({
-      apiKey: 'test-api-key',
+      apiKey: "test-api-key",
       vertexai: undefined,
       httpOptions: {
         headers: expect.objectContaining({
-          'User-Agent': expect.any(String),
-          Authorization: 'Bearer test-api-key',
+          "User-Agent": expect.any(String),
+          Authorization: "Bearer test-api-key",
         }),
       },
     });
   });
 
-  it('should not pass api key as Authorization Header when GEMINI_API_KEY_AUTH_MECHANISM is not set (default behavior)', async () => {
+  it("should not pass api key as Authorization Header when GEMINI_API_KEY_AUTH_MECHANISM is not set (default behavior)", async () => {
     const mockConfig = {
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getProxy: vi.fn().mockReturnValue(undefined),
       getUsageStatisticsEnabled: () => false,
       isInFallbackMode: vi.fn().mockReturnValue(false),
@@ -287,18 +267,18 @@ describe('createContentGenerator', () => {
 
     await createContentGenerator(
       {
-        apiKey: 'test-api-key',
+        apiKey: "test-api-key",
         authType: AuthType.USE_GEMINI,
       },
       mockConfig,
     );
 
     expect(GoogleGenAI).toHaveBeenCalledWith({
-      apiKey: 'test-api-key',
+      apiKey: "test-api-key",
       vertexai: undefined,
       httpOptions: {
         headers: expect.objectContaining({
-          'User-Agent': expect.any(String),
+          "User-Agent": expect.any(String),
         }),
       },
     });
@@ -314,9 +294,9 @@ describe('createContentGenerator', () => {
     );
   });
 
-  it('should create a GoogleGenAI content generator with client install id logging disabled', async () => {
+  it("should create a GoogleGenAI content generator with client install id logging disabled", async () => {
     const mockConfig = {
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getUsageStatisticsEnabled: () => false,
       isInFallbackMode: vi.fn().mockReturnValue(false),
       getPreviewFeatures: vi.fn().mockReturnValue(false),
@@ -327,32 +307,29 @@ describe('createContentGenerator', () => {
     vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator as never);
     const generator = await createContentGenerator(
       {
-        apiKey: 'test-api-key',
+        apiKey: "test-api-key",
         authType: AuthType.USE_GEMINI,
       },
       mockConfig,
     );
     expect(GoogleGenAI).toHaveBeenCalledWith({
-      apiKey: 'test-api-key',
+      apiKey: "test-api-key",
       vertexai: undefined,
       httpOptions: {
         headers: {
-          'User-Agent': expect.any(String),
+          "User-Agent": expect.any(String),
         },
       },
     });
     expect(generator).toEqual(
-      new LoggingContentGenerator(
-        (mockGenerator as GoogleGenAI).models,
-        mockConfig,
-      ),
+      new LoggingContentGenerator((mockGenerator as GoogleGenAI).models, mockConfig),
     );
   });
 });
 
-describe('createContentGeneratorConfig', () => {
+describe("createContentGeneratorConfig", () => {
   const mockConfig = {
-    getModel: vi.fn().mockReturnValue('gemini-pro'),
+    getModel: vi.fn().mockReturnValue("gemini-pro"),
     setModel: vi.fn(),
     flashFallbackHandler: vi.fn(),
     getProxy: vi.fn(),
@@ -368,67 +345,49 @@ describe('createContentGeneratorConfig', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should configure for Gemini using GEMINI_API_KEY when set', async () => {
-    vi.stubEnv('GEMINI_API_KEY', 'env-gemini-key');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_GEMINI,
-    );
-    expect(config.apiKey).toBe('env-gemini-key');
+  it("should configure for Gemini using GEMINI_API_KEY when set", async () => {
+    vi.stubEnv("GEMINI_API_KEY", "env-gemini-key");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_GEMINI);
+    expect(config.apiKey).toBe("env-gemini-key");
     expect(config.vertexai).toBe(false);
   });
 
-  it('should not configure for Gemini if GEMINI_API_KEY is empty', async () => {
-    vi.stubEnv('GEMINI_API_KEY', '');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_GEMINI,
-    );
+  it("should not configure for Gemini if GEMINI_API_KEY is empty", async () => {
+    vi.stubEnv("GEMINI_API_KEY", "");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_GEMINI);
     expect(config.apiKey).toBeUndefined();
     expect(config.vertexai).toBeUndefined();
   });
 
-  it('should not configure for Gemini if GEMINI_API_KEY is not set and storage is empty', async () => {
-    vi.stubEnv('GEMINI_API_KEY', '');
+  it("should not configure for Gemini if GEMINI_API_KEY is not set and storage is empty", async () => {
+    vi.stubEnv("GEMINI_API_KEY", "");
     vi.mocked(loadApiKey).mockResolvedValue(null);
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_GEMINI,
-    );
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_GEMINI);
     expect(config.apiKey).toBeUndefined();
     expect(config.vertexai).toBeUndefined();
   });
 
-  it('should configure for Vertex AI using GOOGLE_API_KEY when set', async () => {
-    vi.stubEnv('GOOGLE_API_KEY', 'env-google-key');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_VERTEX_AI,
-    );
-    expect(config.apiKey).toBe('env-google-key');
+  it("should configure for Vertex AI using GOOGLE_API_KEY when set", async () => {
+    vi.stubEnv("GOOGLE_API_KEY", "env-google-key");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_VERTEX_AI);
+    expect(config.apiKey).toBe("env-google-key");
     expect(config.vertexai).toBe(true);
   });
 
-  it('should configure for Vertex AI using GCP project and location when set', async () => {
-    vi.stubEnv('GOOGLE_API_KEY', undefined);
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'env-gcp-project');
-    vi.stubEnv('GOOGLE_CLOUD_LOCATION', 'env-gcp-location');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_VERTEX_AI,
-    );
+  it("should configure for Vertex AI using GCP project and location when set", async () => {
+    vi.stubEnv("GOOGLE_API_KEY", undefined);
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "env-gcp-project");
+    vi.stubEnv("GOOGLE_CLOUD_LOCATION", "env-gcp-location");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_VERTEX_AI);
     expect(config.vertexai).toBe(true);
     expect(config.apiKey).toBeUndefined();
   });
 
-  it('should not configure for Vertex AI if required env vars are empty', async () => {
-    vi.stubEnv('GOOGLE_API_KEY', '');
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
-    vi.stubEnv('GOOGLE_CLOUD_LOCATION', '');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_VERTEX_AI,
-    );
+  it("should not configure for Vertex AI if required env vars are empty", async () => {
+    vi.stubEnv("GOOGLE_API_KEY", "");
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
+    vi.stubEnv("GOOGLE_CLOUD_LOCATION", "");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_VERTEX_AI);
     expect(config.apiKey).toBeUndefined();
     expect(config.vertexai).toBeUndefined();
   });
diff --git a/packages/gemini-cli-core/src/core/contentGenerator.ts b/packages/gemini-cli-core/src/core/contentGenerator.ts
index 6091d230c..88b1c6858 100644
--- a/packages/gemini-cli-core/src/core/contentGenerator.ts
+++ b/packages/gemini-cli-core/src/core/contentGenerator.ts
@@ -5,25 +5,24 @@
  */
 
 import type {
-  CountTokensResponse,
-  GenerateContentResponse,
-  GenerateContentParameters,
   CountTokensParameters,
-  EmbedContentResponse,
+  CountTokensResponse,
   EmbedContentParameters,
-} from '@google/genai';
-import { GoogleGenAI } from '@google/genai';
-import { createCodeAssistContentGenerator } from '../code_assist/codeAssist.js';
-import type { Config } from '../config/config.js';
-import { loadApiKey } from './apiKeyCredentialStorage.js';
-
-import type { UserTierId } from '../code_assist/types.js';
-import { LoggingContentGenerator } from './loggingContentGenerator.js';
-import { InstallationManager } from '../utils/installationManager.js';
-import { FakeContentGenerator } from './fakeContentGenerator.js';
-import { parseCustomHeaders } from '../utils/customHeaderUtils.js';
-import { RecordingContentGenerator } from './recordingContentGenerator.js';
-import { getVersion, getEffectiveModel } from '../index.js';
+  EmbedContentResponse,
+  GenerateContentParameters,
+  GenerateContentResponse,
+} from "@google/genai";
+import { GoogleGenAI } from "@google/genai";
+import { createCodeAssistContentGenerator } from "../code_assist/codeAssist.js";
+import type { UserTierId } from "../code_assist/types.js";
+import type { Config } from "../config/config.js";
+import { getEffectiveModel, getVersion } from "../index.js";
+import { parseCustomHeaders } from "../utils/customHeaderUtils.js";
+import { InstallationManager } from "../utils/installationManager.js";
+import { loadApiKey } from "./apiKeyCredentialStorage.js";
+import { FakeContentGenerator } from "./fakeContentGenerator.js";
+import { LoggingContentGenerator } from "./loggingContentGenerator.js";
+import { RecordingContentGenerator } from "./recordingContentGenerator.js";
 
 /**
  * Interface abstracting the core functionalities for generating content and counting tokens.
@@ -47,11 +46,11 @@ export interface ContentGenerator {
 }
 
 export enum AuthType {
-  LOGIN_WITH_GOOGLE = 'oauth-personal',
-  USE_GEMINI = 'gemini-api-key',
-  USE_VERTEX_AI = 'vertex-ai',
-  LEGACY_CLOUD_SHELL = 'cloud-shell',
-  COMPUTE_ADC = 'compute-default-credentials',
+  LOGIN_WITH_GOOGLE = "oauth-personal",
+  USE_GEMINI = "gemini-api-key",
+  USE_VERTEX_AI = "vertex-ai",
+  LEGACY_CLOUD_SHELL = "cloud-shell",
+  COMPUTE_ADC = "compute-default-credentials",
 }
 
 export type ContentGeneratorConfig = {
@@ -65,14 +64,11 @@ export async function createContentGeneratorConfig(
   config: Config,
   authType: AuthType | undefined,
 ): Promise<ContentGeneratorConfig> {
-  const geminiApiKey =
-    (await loadApiKey()) || process.env['GEMINI_API_KEY'] || undefined;
-  const googleApiKey = process.env['GOOGLE_API_KEY'] || undefined;
+  const geminiApiKey = (await loadApiKey()) || process.env["GEMINI_API_KEY"] || undefined;
+  const googleApiKey = process.env["GOOGLE_API_KEY"] || undefined;
   const googleCloudProject =
-    process.env['GOOGLE_CLOUD_PROJECT'] ||
-    process.env['GOOGLE_CLOUD_PROJECT_ID'] ||
-    undefined;
-  const googleCloudLocation = process.env['GOOGLE_CLOUD_LOCATION'] || undefined;
+    process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || undefined;
+  const googleCloudLocation = process.env["GOOGLE_CLOUD_LOCATION"] || undefined;
 
   const contentGeneratorConfig: ContentGeneratorConfig = {
     authType,
@@ -80,10 +76,7 @@ export async function createContentGeneratorConfig(
   };
 
   // If we are using Google auth or we are in Cloud Shell, there is nothing else to validate for now
-  if (
-    authType === AuthType.LOGIN_WITH_GOOGLE ||
-    authType === AuthType.COMPUTE_ADC
-  ) {
+  if (authType === AuthType.LOGIN_WITH_GOOGLE || authType === AuthType.COMPUTE_ADC) {
     return contentGeneratorConfig;
   }
 
@@ -122,25 +115,22 @@ export async function createContentGenerator(
       gcConfig.getModel(),
       gcConfig.getPreviewFeatures(),
     );
-    const customHeadersEnv =
-      process.env['GEMINI_CLI_CUSTOM_HEADERS'] || undefined;
+    const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || undefined;
     const userAgent = `GeminiCLI/${version}/${model} (${process.platform}; ${process.arch})`;
     const customHeadersMap = parseCustomHeaders(customHeadersEnv);
-    const apiKeyAuthMechanism =
-      process.env['GEMINI_API_KEY_AUTH_MECHANISM'] || 'x-goog-api-key';
+    const apiKeyAuthMechanism = process.env["GEMINI_API_KEY_AUTH_MECHANISM"] || "x-goog-api-key";
 
     const baseHeaders: Record<string, string> = {
       ...customHeadersMap,
-      'User-Agent': userAgent,
+      "User-Agent": userAgent,
     };
 
     if (
-      apiKeyAuthMechanism === 'bearer' &&
-      (config.authType === AuthType.USE_GEMINI ||
-        config.authType === AuthType.USE_VERTEX_AI) &&
+      apiKeyAuthMechanism === "bearer" &&
+      (config.authType === AuthType.USE_GEMINI || config.authType === AuthType.USE_VERTEX_AI) &&
       config.apiKey
     ) {
-      baseHeaders['Authorization'] = `Bearer ${config.apiKey}`;
+      baseHeaders["Authorization"] = `Bearer ${config.apiKey}`;
     }
     if (
       config.authType === AuthType.LOGIN_WITH_GOOGLE ||
@@ -148,41 +138,31 @@ export async function createContentGenerator(
     ) {
       const httpOptions = { headers: baseHeaders };
       return new LoggingContentGenerator(
-        await createCodeAssistContentGenerator(
-          httpOptions,
-          config.authType,
-          gcConfig,
-          sessionId,
-        ),
+        await createCodeAssistContentGenerator(httpOptions, config.authType, gcConfig, sessionId),
         gcConfig,
       );
     }
 
-    if (
-      config.authType === AuthType.USE_GEMINI ||
-      config.authType === AuthType.USE_VERTEX_AI
-    ) {
+    if (config.authType === AuthType.USE_GEMINI || config.authType === AuthType.USE_VERTEX_AI) {
       let headers: Record<string, string> = { ...baseHeaders };
       if (gcConfig?.getUsageStatisticsEnabled()) {
         const installationManager = new InstallationManager();
         const installationId = installationManager.getInstallationId();
         headers = {
           ...headers,
-          'x-gemini-api-privileged-user-id': `${installationId}`,
+          "x-gemini-api-privileged-user-id": `${installationId}`,
         };
       }
       const httpOptions = { headers };
 
       const googleGenAI = new GoogleGenAI({
-        apiKey: config.apiKey === '' ? undefined : config.apiKey,
+        apiKey: config.apiKey === "" ? undefined : config.apiKey,
         vertexai: config.vertexai,
         httpOptions,
       });
       return new LoggingContentGenerator(googleGenAI.models, gcConfig);
     }
-    throw new Error(
-      `Error creating contentGenerator: Unsupported authType: ${config.authType}`,
-    );
+    throw new Error(`Error creating contentGenerator: Unsupported authType: ${config.authType}`);
   })();
 
   if (gcConfig.recordResponses) {
diff --git a/packages/gemini-cli-core/src/core/coreToolHookTriggers.ts b/packages/gemini-cli-core/src/core/coreToolHookTriggers.ts
index 1d5bee2f7..edaf384eb 100644
--- a/packages/gemini-cli-core/src/core/coreToolHookTriggers.ts
+++ b/packages/gemini-cli-core/src/core/coreToolHookTriggers.ts
@@ -4,33 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
-  MessageBusType,
   type HookExecutionRequest,
   type HookExecutionResponse,
-} from '../confirmation-bus/types.js';
-import {
-  createHookOutput,
-  NotificationType,
-  type DefaultHookOutput,
-} from '../hooks/types.js';
-import type {
-  ToolCallConfirmationDetails,
-  ToolResult,
-} from '../tools/tools.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import type { AnsiOutput, ShellExecutionConfig } from '../index.js';
-import type { AnyToolInvocation } from '../tools/tools.js';
-import { ShellToolInvocation } from '../tools/shell.js';
+  MessageBusType,
+} from "../confirmation-bus/types.js";
+import { createHookOutput, type DefaultHookOutput, NotificationType } from "../hooks/types.js";
+import type { AnsiOutput, ShellExecutionConfig } from "../index.js";
+import { ShellToolInvocation } from "../tools/shell.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import type { AnyToolInvocation, ToolCallConfirmationDetails, ToolResult } from "../tools/tools.js";
+import { debugLogger } from "../utils/debugLogger.js";
 
 /**
  * Serializable representation of tool confirmation details for hooks.
  * Excludes function properties like onConfirm that can't be serialized.
  */
 interface SerializableConfirmationDetails {
-  type: 'edit' | 'exec' | 'mcp' | 'info';
+  type: "edit" | "exec" | "mcp" | "info";
   title: string;
   // Edit-specific fields
   fileName?: string;
@@ -64,7 +56,7 @@ function toSerializableDetails(
   };
 
   switch (details.type) {
-    case 'edit':
+    case "edit":
       return {
         ...base,
         fileName: details.fileName,
@@ -74,20 +66,20 @@ function toSerializableDetails(
         newContent: details.newContent,
         isModifying: details.isModifying,
       };
-    case 'exec':
+    case "exec":
       return {
         ...base,
         command: details.command,
         rootCommand: details.rootCommand,
       };
-    case 'mcp':
+    case "mcp":
       return {
         ...base,
         serverName: details.serverName,
         toolName: details.toolName,
         toolDisplayName: details.toolDisplayName,
       };
-    case 'info':
+    case "info":
       return {
         ...base,
         prompt: details.prompt,
@@ -101,17 +93,15 @@ function toSerializableDetails(
 /**
  * Gets the message to display in the notification hook for tool confirmation.
  */
-function getNotificationMessage(
-  confirmationDetails: ToolCallConfirmationDetails,
-): string {
+function getNotificationMessage(confirmationDetails: ToolCallConfirmationDetails): string {
   switch (confirmationDetails.type) {
-    case 'edit':
+    case "edit":
       return `Tool ${confirmationDetails.title} requires editing`;
-    case 'exec':
+    case "exec":
       return `Tool ${confirmationDetails.title} requires execution`;
-    case 'mcp':
+    case "mcp":
       return `Tool ${confirmationDetails.title} requires MCP`;
-    case 'info':
+    case "info":
       return `Tool ${confirmationDetails.title} requires information`;
     default:
       return `Tool requires confirmation`;
@@ -135,7 +125,7 @@ export async function fireToolNotificationHook(
     await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'Notification',
+        eventName: "Notification",
         input: {
           notification_type: NotificationType.ToolPermission,
           message,
@@ -145,10 +135,7 @@ export async function fireToolNotificationHook(
       MessageBusType.HOOK_EXECUTION_RESPONSE,
     );
   } catch (error) {
-    debugLogger.warn(
-      `Notification hook failed for ${confirmationDetails.title}:`,
-      error,
-    );
+    debugLogger.warn(`Notification hook failed for ${confirmationDetails.title}:`, error);
   }
 }
 
@@ -166,13 +153,10 @@ export async function fireBeforeToolHook(
   toolInput: Record<string, unknown>,
 ): Promise<DefaultHookOutput | undefined> {
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'BeforeTool',
+        eventName: "BeforeTool",
         input: {
           tool_name: toolName,
           tool_input: toolInput,
@@ -181,9 +165,7 @@ export async function fireBeforeToolHook(
       MessageBusType.HOOK_EXECUTION_RESPONSE,
     );
 
-    return response.output
-      ? createHookOutput('BeforeTool', response.output)
-      : undefined;
+    return response.output ? createHookOutput("BeforeTool", response.output) : undefined;
   } catch (error) {
     debugLogger.warn(`BeforeTool hook failed for ${toolName}:`, error);
     return undefined;
@@ -204,19 +186,16 @@ export async function fireAfterToolHook(
   toolName: string,
   toolInput: Record<string, unknown>,
   toolResponse: {
-    llmContent: ToolResult['llmContent'];
-    returnDisplay: ToolResult['returnDisplay'];
-    error: ToolResult['error'];
+    llmContent: ToolResult["llmContent"];
+    returnDisplay: ToolResult["returnDisplay"];
+    error: ToolResult["error"];
   },
 ): Promise<DefaultHookOutput | undefined> {
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'AfterTool',
+        eventName: "AfterTool",
         input: {
           tool_name: toolName,
           tool_input: toolInput,
@@ -226,9 +205,7 @@ export async function fireAfterToolHook(
       MessageBusType.HOOK_EXECUTION_RESPONSE,
     );
 
-    return response.output
-      ? createHookOutput('AfterTool', response.output)
-      : undefined;
+    return response.output ? createHookOutput("AfterTool", response.output) : undefined;
   } catch (error) {
     debugLogger.warn(`AfterTool hook failed for ${toolName}:`, error);
     return undefined;
@@ -262,11 +239,7 @@ export async function executeToolWithHooks(
 
   // Fire BeforeTool hook through MessageBus (only if hooks are enabled)
   if (hooksEnabled && messageBus) {
-    const beforeOutput = await fireBeforeToolHook(
-      messageBus,
-      toolName,
-      toolInput,
-    );
+    const beforeOutput = await fireBeforeToolHook(messageBus, toolName, toolInput);
 
     // Check if hook blocked the tool execution
     const blockingError = beforeOutput?.getBlockingError();
@@ -305,25 +278,16 @@ export async function executeToolWithHooks(
       setPidCallback,
     );
   } else {
-    toolResult = await invocation.execute(
-      signal,
-      liveOutputCallback,
-      shellExecutionConfig,
-    );
+    toolResult = await invocation.execute(signal, liveOutputCallback, shellExecutionConfig);
   }
 
   // Fire AfterTool hook through MessageBus (only if hooks are enabled)
   if (hooksEnabled && messageBus) {
-    const afterOutput = await fireAfterToolHook(
-      messageBus,
-      toolName,
-      toolInput,
-      {
-        llmContent: toolResult.llmContent,
-        returnDisplay: toolResult.returnDisplay,
-        error: toolResult.error,
-      },
-    );
+    const afterOutput = await fireAfterToolHook(messageBus, toolName, toolInput, {
+      llmContent: toolResult.llmContent,
+      returnDisplay: toolResult.returnDisplay,
+      error: toolResult.error,
+    });
 
     // Check if hook requested to stop entire agent execution
     if (afterOutput?.shouldStopExecution()) {
@@ -341,16 +305,13 @@ export async function executeToolWithHooks(
     // Add additional context from hooks to the tool result
     const additionalContext = afterOutput?.getAdditionalContext();
     if (additionalContext) {
-      if (typeof toolResult.llmContent === 'string') {
-        toolResult.llmContent += '\n\n' + additionalContext;
+      if (typeof toolResult.llmContent === "string") {
+        toolResult.llmContent += "\n\n" + additionalContext;
       } else if (Array.isArray(toolResult.llmContent)) {
-        toolResult.llmContent.push({ text: '\n\n' + additionalContext });
+        toolResult.llmContent.push({ text: "\n\n" + additionalContext });
       } else if (toolResult.llmContent) {
         // Handle single Part case by converting to an array
-        toolResult.llmContent = [
-          toolResult.llmContent,
-          { text: '\n\n' + additionalContext },
-        ];
+        toolResult.llmContent = [toolResult.llmContent, { text: "\n\n" + additionalContext }];
       } else {
         toolResult.llmContent = additionalContext;
       }
diff --git a/packages/gemini-cli-core/src/core/coreToolScheduler.test.ts b/packages/gemini-cli-core/src/core/coreToolScheduler.test.ts
index c53672181..706144676 100644
--- a/packages/gemini-cli-core/src/core/coreToolScheduler.test.ts
+++ b/packages/gemini-cli-core/src/core/coreToolScheduler.test.ts
@@ -4,77 +4,72 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type { Mock } from 'vitest';
-import type { ToolCall, WaitingToolCall } from './coreToolScheduler.js';
-import {
-  CoreToolScheduler,
-  convertToFunctionResponse,
-  truncateAndSaveToFile,
-} from './coreToolScheduler.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { Part, PartListUnion } from "@google/genai";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import type {
+  AnyToolInvocation,
+  Config,
   ToolCallConfirmationDetails,
   ToolConfirmationPayload,
   ToolInvocation,
-  ToolResult,
-  Config,
   ToolRegistry,
-  AnyToolInvocation,
-} from '../index.js';
+  ToolResult,
+} from "../index.js";
 import {
-  DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-  DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+  ApprovalMode,
   BaseDeclarativeTool,
   BaseToolInvocation,
-  ToolConfirmationOutcome,
-  Kind,
-  ApprovalMode,
+  DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
+  DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   HookSystem,
-} from '../index.js';
-import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
-import type { Part, PartListUnion } from '@google/genai';
+  Kind,
+  ToolConfirmationOutcome,
+} from "../index.js";
+import { createMockMessageBus } from "../test-utils/mock-message-bus.js";
 import {
+  MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
   MockModifiableTool,
   MockTool,
-  MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
-} from '../test-utils/mock-tool.js';
-import * as modifiableToolModule from '../tools/modifiable-tool.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isShellInvocationAllowlisted } from '../utils/shell-utils.js';
+} from "../test-utils/mock-tool.js";
+import * as modifiableToolModule from "../tools/modifiable-tool.js";
+import { isShellInvocationAllowlisted } from "../utils/shell-utils.js";
+import type { ToolCall, WaitingToolCall } from "./coreToolScheduler.js";
+import {
+  CoreToolScheduler,
+  convertToFunctionResponse,
+  truncateAndSaveToFile,
+} from "./coreToolScheduler.js";
 
-vi.mock('fs/promises', () => ({
+vi.mock("fs/promises", () => ({
   writeFile: vi.fn(),
 }));
 
 class TestApprovalTool extends BaseDeclarativeTool<{ id: string }, ToolResult> {
-  static readonly Name = 'testApprovalTool';
+  static readonly Name = "testApprovalTool";
 
   constructor(private config: Config) {
     super(
       TestApprovalTool.Name,
-      'TestApprovalTool',
-      'A tool for testing approval logic',
+      "TestApprovalTool",
+      "A tool for testing approval logic",
       Kind.Edit,
       {
-        properties: { id: { type: 'string' } },
-        required: ['id'],
-        type: 'object',
+        properties: { id: { type: "string" } },
+        required: ["id"],
+        type: "object",
       },
     );
   }
 
-  protected createInvocation(params: {
-    id: string;
-  }): ToolInvocation<{ id: string }, ToolResult> {
+  protected createInvocation(params: { id: string }): ToolInvocation<{ id: string }, ToolResult> {
     return new TestApprovalInvocation(this.config, params);
   }
 }
 
-class TestApprovalInvocation extends BaseToolInvocation<
-  { id: string },
-  ToolResult
-> {
+class TestApprovalInvocation extends BaseToolInvocation<{ id: string }, ToolResult> {
   constructor(
     private config: Config,
     params: { id: string },
@@ -86,22 +81,20 @@ class TestApprovalInvocation extends BaseToolInvocation<
     return `Test tool ${this.params.id}`;
   }
 
-  override async shouldConfirmExecute(): Promise<
-    ToolCallConfirmationDetails | false
-  > {
+  override async shouldConfirmExecute(): Promise<ToolCallConfirmationDetails | false> {
     // Need confirmation unless approval mode is AUTO_EDIT
     if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
       return false;
     }
 
     return {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Test Tool ${this.params.id}`,
       fileName: `test-${this.params.id}.txt`,
       filePath: `/test-${this.params.id}.txt`,
-      fileDiff: 'Test diff content',
-      originalContent: '',
-      newContent: 'Test content',
+      fileDiff: "Test diff content",
+      originalContent: "",
+      newContent: "Test content",
       onConfirm: async (outcome: ToolConfirmationOutcome) => {
         if (outcome === ToolConfirmationOutcome.ProceedAlways) {
           this.config.setApprovalMode(ApprovalMode.AUTO_EDIT);
@@ -138,29 +131,26 @@ class AbortDuringConfirmationInvocation extends BaseToolInvocation<
   }
 
   async execute(_abortSignal: AbortSignal): Promise<ToolResult> {
-    throw new Error('execute should not be called when confirmation fails');
+    throw new Error("execute should not be called when confirmation fails");
   }
 
   getDescription(): string {
-    return 'Abort during confirmation invocation';
+    return "Abort during confirmation invocation";
   }
 }
 
-class AbortDuringConfirmationTool extends BaseDeclarativeTool<
-  Record<string, unknown>,
-  ToolResult
-> {
+class AbortDuringConfirmationTool extends BaseDeclarativeTool<Record<string, unknown>, ToolResult> {
   constructor(
     private readonly abortController: AbortController,
     private readonly abortError: Error,
   ) {
     super(
-      'abortDuringConfirmationTool',
-      'Abort During Confirmation Tool',
-      'A tool that aborts while confirming execution.',
+      "abortDuringConfirmationTool",
+      "Abort During Confirmation Tool",
+      "A tool that aborts while confirming execution.",
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {},
       },
     );
@@ -169,17 +159,13 @@ class AbortDuringConfirmationTool extends BaseDeclarativeTool<
   protected createInvocation(
     params: Record<string, unknown>,
   ): ToolInvocation<Record<string, unknown>, ToolResult> {
-    return new AbortDuringConfirmationInvocation(
-      this.abortController,
-      this.abortError,
-      params,
-    );
+    return new AbortDuringConfirmationInvocation(this.abortController, this.abortError, params);
   }
 }
 
 async function waitForStatus(
   onToolCallsUpdate: Mock,
-  status: 'awaiting_approval' | 'executing' | 'success' | 'error' | 'cancelled',
+  status: "awaiting_approval" | "executing" | "success" | "error" | "cancelled",
   timeout = 5000,
 ): Promise<ToolCall> {
   return new Promise((resolve, reject) => {
@@ -191,9 +177,7 @@ async function waitForStatus(
           .map((toolCall: ToolCall) => toolCall.status);
         reject(
           new Error(
-            `Timed out waiting for status "${status}". Seen statuses: ${seenStatuses.join(
-              ', ',
-            )}`,
+            `Timed out waiting for status "${status}". Seen statuses: ${seenStatuses.join(", ")}`,
           ),
         );
         return;
@@ -229,25 +213,24 @@ function createMockConfig(overrides: Partial<Config> = {}): Config {
   } as unknown as ToolRegistry;
 
   const baseConfig = {
-    getSessionId: () => 'test-session-id',
+    getSessionId: () => "test-session-id",
     getUsageStatisticsEnabled: () => true,
     getDebugMode: () => false,
     getApprovalMode: () => ApprovalMode.DEFAULT,
     setApprovalMode: () => {},
     getAllowedTools: () => [],
     getContentGeneratorConfig: () => ({
-      model: 'test-model',
-      authType: 'oauth-personal',
+      model: "test-model",
+      authType: "oauth-personal",
     }),
     getShellExecutionConfig: () => ({
       terminalWidth: 90,
       terminalHeight: 30,
     }),
     storage: {
-      getProjectTempDir: () => '/tmp',
+      getProjectTempDir: () => "/tmp",
     },
-    getTruncateToolOutputThreshold: () =>
-      DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+    getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
     getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
     getToolRegistry: () => defaultToolRegistry,
     getUseSmartEdit: () => false,
@@ -262,10 +245,10 @@ function createMockConfig(overrides: Partial<Config> = {}): Config {
   return { ...baseConfig, ...overrides } as Config;
 }
 
-describe('CoreToolScheduler', () => {
-  it('should cancel a tool call if the signal is aborted before confirmation', async () => {
+describe("CoreToolScheduler", () => {
+  it("should cancel a tool call if the signal is aborted before confirmation", async () => {
     const mockTool = new MockTool({
-      name: 'mockTool',
+      name: "mockTool",
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
     const declarativeTool = mockTool;
@@ -295,40 +278,39 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockTool',
+      callId: "1",
+      name: "mockTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-1',
+      prompt_id: "prompt-id-1",
     };
 
     abortController.abort();
     await scheduler.schedule([request], abortController.signal);
 
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('cancelled');
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
+    expect(completedCalls[0].status).toBe("cancelled");
   });
 
-  it('should cancel all tools when cancelAll is called', async () => {
+  it("should cancel all tools when cancelAll is called", async () => {
     const mockTool1 = new MockTool({
-      name: 'mockTool1',
+      name: "mockTool1",
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
-    const mockTool2 = new MockTool({ name: 'mockTool2' });
-    const mockTool3 = new MockTool({ name: 'mockTool3' });
+    const mockTool2 = new MockTool({ name: "mockTool2" });
+    const mockTool3 = new MockTool({ name: "mockTool3" });
 
     const mockToolRegistry = {
       getTool: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getFunctionDeclarations: () => [],
@@ -336,9 +318,9 @@ describe('CoreToolScheduler', () => {
       discovery: {},
       registerTool: () => {},
       getToolByName: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getToolByDisplayName: () => undefined,
@@ -361,31 +343,31 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool1',
+        callId: "1",
+        name: "mockTool1",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '2',
-        name: 'mockTool2',
+        callId: "2",
+        name: "mockTool2",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '3',
-        name: 'mockTool3',
+        callId: "3",
+        name: "mockTool3",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
     ];
 
@@ -393,7 +375,7 @@ describe('CoreToolScheduler', () => {
     void scheduler.schedule(requests, abortController.signal);
 
     // Wait for the first tool to be awaiting approval
-    await waitForStatus(onToolCallsUpdate, 'awaiting_approval');
+    await waitForStatus(onToolCallsUpdate, "awaiting_approval");
 
     // Cancel all operations
     scheduler.cancelAll(abortController.signal);
@@ -403,34 +385,27 @@ describe('CoreToolScheduler', () => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
 
     expect(completedCalls).toHaveLength(3);
-    expect(completedCalls.find((c) => c.request.callId === '1')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '2')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '3')?.status).toBe(
-      'cancelled',
-    );
+    expect(completedCalls.find((c) => c.request.callId === "1")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "2")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "3")?.status).toBe("cancelled");
   });
 
-  it('should cancel all tools in a batch when one is cancelled via confirmation', async () => {
+  it("should cancel all tools in a batch when one is cancelled via confirmation", async () => {
     const mockTool1 = new MockTool({
-      name: 'mockTool1',
+      name: "mockTool1",
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
-    const mockTool2 = new MockTool({ name: 'mockTool2' });
-    const mockTool3 = new MockTool({ name: 'mockTool3' });
+    const mockTool2 = new MockTool({ name: "mockTool2" });
+    const mockTool3 = new MockTool({ name: "mockTool3" });
 
     const mockToolRegistry = {
       getTool: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getFunctionDeclarations: () => [],
@@ -438,9 +413,9 @@ describe('CoreToolScheduler', () => {
       discovery: {},
       registerTool: () => {},
       getToolByName: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getToolByDisplayName: () => undefined,
@@ -463,31 +438,31 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool1',
+        callId: "1",
+        name: "mockTool1",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '2',
-        name: 'mockTool2',
+        callId: "2",
+        name: "mockTool2",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '3',
-        name: 'mockTool3',
+        callId: "3",
+        name: "mockTool3",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
     ];
 
@@ -497,41 +472,29 @@ describe('CoreToolScheduler', () => {
     // Wait for the first tool to be awaiting approval
     const awaitingCall = (await waitForStatus(
       onToolCallsUpdate,
-      'awaiting_approval',
+      "awaiting_approval",
     )) as WaitingToolCall;
 
     // Cancel the first tool via its confirmation handler
-    await awaitingCall.confirmationDetails.onConfirm(
-      ToolConfirmationOutcome.Cancel,
-    );
+    await awaitingCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
     abortController.abort(); // User cancelling often involves an abort signal
 
     await vi.waitFor(() => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
 
     expect(completedCalls).toHaveLength(3);
-    expect(completedCalls.find((c) => c.request.callId === '1')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '2')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '3')?.status).toBe(
-      'cancelled',
-    );
+    expect(completedCalls.find((c) => c.request.callId === "1")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "2")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "3")?.status).toBe("cancelled");
   });
 
-  it('should mark tool call as cancelled when abort happens during confirmation error', async () => {
+  it("should mark tool call as cancelled when abort happens during confirmation error", async () => {
     const abortController = new AbortController();
-    const abortError = new Error('Abort requested during confirmation');
-    const declarativeTool = new AbortDuringConfirmationTool(
-      abortController,
-      abortError,
-    );
+    const abortError = new Error("Abort requested during confirmation");
+    const declarativeTool = new AbortDuringConfirmationTool(abortController, abortError);
 
     const mockToolRegistry = {
       getTool: () => declarativeTool,
@@ -559,34 +522,33 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const request = {
-      callId: 'abort-1',
-      name: 'abortDuringConfirmationTool',
+      callId: "abort-1",
+      name: "abortDuringConfirmationTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-abort',
+      prompt_id: "prompt-id-abort",
     };
 
     await scheduler.schedule([request], abortController.signal);
 
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('cancelled');
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
+    expect(completedCalls[0].status).toBe("cancelled");
     const statuses = onToolCallsUpdate.mock.calls.flatMap((call) =>
       (call[0] as ToolCall[]).map((toolCall) => toolCall.status),
     );
-    expect(statuses).not.toContain('error');
+    expect(statuses).not.toContain("error");
   });
 
-  describe('getToolSuggestion', () => {
-    it('should suggest the top N closest tool names for a typo', () => {
+  describe("getToolSuggestion", () => {
+    it("should suggest the top N closest tool names for a typo", () => {
       // Create mocked tool registry
       const mockToolRegistry = {
-        getAllToolNames: () => ['list_files', 'read_file', 'write_file'],
+        getAllToolNames: () => ["list_files", "read_file", "write_file"],
       } as unknown as ToolRegistry;
       const mockConfig = createMockConfig({
         getToolRegistry: () => mockToolRegistry,
@@ -596,22 +558,22 @@ describe('CoreToolScheduler', () => {
       // Create scheduler
       const scheduler = new CoreToolScheduler({
         config: mockConfig,
-        getPreferredEditor: () => 'vscode',
+        getPreferredEditor: () => "vscode",
       });
 
       // Test that the right tool is selected, with only 1 result, for typos
       // @ts-expect-error accessing private method
-      const misspelledTool = scheduler.getToolSuggestion('list_fils', 1);
+      const misspelledTool = scheduler.getToolSuggestion("list_fils", 1);
       expect(misspelledTool).toBe(' Did you mean "list_files"?');
 
       // Test that the right tool is selected, with only 1 result, for prefixes
       // @ts-expect-error accessing private method
-      const prefixedTool = scheduler.getToolSuggestion('github.list_files', 1);
+      const prefixedTool = scheduler.getToolSuggestion("github.list_files", 1);
       expect(prefixedTool).toBe(' Did you mean "list_files"?');
 
       // Test that the right tool is first
       // @ts-expect-error accessing private method
-      const suggestionMultiple = scheduler.getToolSuggestion('list_fils');
+      const suggestionMultiple = scheduler.getToolSuggestion("list_fils");
       expect(suggestionMultiple).toBe(
         ' Did you mean one of: "list_files", "read_file", "write_file"?',
       );
@@ -619,8 +581,8 @@ describe('CoreToolScheduler', () => {
   });
 });
 
-describe('CoreToolScheduler with payload', () => {
-  it('should update args and diff and execute tool when payload is provided', async () => {
+describe("CoreToolScheduler with payload", () => {
+  it("should update args and diff and execute tool when payload is provided", async () => {
     const mockTool = new MockModifiableTool();
     mockTool.executeFn = vi.fn();
     const declarativeTool = mockTool;
@@ -648,40 +610,35 @@ describe('CoreToolScheduler with payload', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockModifiableTool',
+      callId: "1",
+      name: "mockModifiableTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-2',
+      prompt_id: "prompt-id-2",
     };
 
     await scheduler.schedule([request], abortController.signal);
 
     const awaitingCall = (await waitForStatus(
       onToolCallsUpdate,
-      'awaiting_approval',
+      "awaiting_approval",
     )) as WaitingToolCall;
     const confirmationDetails = awaitingCall.confirmationDetails;
 
     if (confirmationDetails) {
-      const payload: ToolConfirmationPayload = { newContent: 'final version' };
-      await confirmationDetails.onConfirm(
-        ToolConfirmationOutcome.ProceedOnce,
-        payload,
-      );
+      const payload: ToolConfirmationPayload = { newContent: "final version" };
+      await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce, payload);
     }
 
     // Wait for the tool execution to complete
@@ -689,64 +646,63 @@ describe('CoreToolScheduler with payload', () => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('success');
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
+    expect(completedCalls[0].status).toBe("success");
     expect(mockTool.executeFn).toHaveBeenCalledWith({
-      newContent: 'final version',
+      newContent: "final version",
     });
   });
 });
 
-describe('convertToFunctionResponse', () => {
-  const toolName = 'testTool';
-  const callId = 'call1';
+describe("convertToFunctionResponse", () => {
+  const toolName = "testTool";
+  const callId = "call1";
 
-  it('should handle simple string llmContent', () => {
-    const llmContent = 'Simple text output';
+  it("should handle simple string llmContent", () => {
+    const llmContent = "Simple text output";
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Simple text output' },
+          response: { output: "Simple text output" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as a single Part with text', () => {
-    const llmContent: Part = { text: 'Text from Part object' };
+  it("should handle llmContent as a single Part with text", () => {
+    const llmContent: Part = { text: "Text from Part object" };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Text from Part object' },
+          response: { output: "Text from Part object" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as a PartListUnion array with a single text Part', () => {
-    const llmContent: PartListUnion = [{ text: 'Text from array' }];
+  it("should handle llmContent as a PartListUnion array with a single text Part", () => {
+    const llmContent: PartListUnion = [{ text: "Text from array" }];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Text from array' },
+          response: { output: "Text from array" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent with inlineData', () => {
+  it("should handle llmContent with inlineData", () => {
     const llmContent: Part = {
-      inlineData: { mimeType: 'image/png', data: 'base64...' },
+      inlineData: { mimeType: "image/png", data: "base64..." },
     };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -755,7 +711,7 @@ describe('convertToFunctionResponse', () => {
           name: toolName,
           id: callId,
           response: {
-            output: 'Binary content of type image/png was processed.',
+            output: "Binary content of type image/png was processed.",
           },
         },
       },
@@ -763,9 +719,9 @@ describe('convertToFunctionResponse', () => {
     ]);
   });
 
-  it('should handle llmContent with fileData', () => {
+  it("should handle llmContent with fileData", () => {
     const llmContent: Part = {
-      fileData: { mimeType: 'application/pdf', fileUri: 'gs://...' },
+      fileData: { mimeType: "application/pdf", fileUri: "gs://..." },
     };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -774,7 +730,7 @@ describe('convertToFunctionResponse', () => {
           name: toolName,
           id: callId,
           response: {
-            output: 'Binary content of type application/pdf was processed.',
+            output: "Binary content of type application/pdf was processed.",
           },
         },
       },
@@ -782,11 +738,11 @@ describe('convertToFunctionResponse', () => {
     ]);
   });
 
-  it('should handle llmContent as an array of multiple Parts (text and inlineData)', () => {
+  it("should handle llmContent as an array of multiple Parts (text and inlineData)", () => {
     const llmContent: PartListUnion = [
-      { text: 'Some textual description' },
-      { inlineData: { mimeType: 'image/jpeg', data: 'base64data...' } },
-      { text: 'Another text part' },
+      { text: "Some textual description" },
+      { inlineData: { mimeType: "image/jpeg", data: "base64data..." } },
+      { text: "Another text part" },
     ];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -794,16 +750,16 @@ describe('convertToFunctionResponse', () => {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
       ...llmContent,
     ]);
   });
 
-  it('should handle llmContent as an array with a single inlineData Part', () => {
+  it("should handle llmContent as an array with a single inlineData Part", () => {
     const llmContent: PartListUnion = [
-      { inlineData: { mimeType: 'image/gif', data: 'gifdata...' } },
+      { inlineData: { mimeType: "image/gif", data: "gifdata..." } },
     ];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -812,7 +768,7 @@ describe('convertToFunctionResponse', () => {
           name: toolName,
           id: callId,
           response: {
-            output: 'Binary content of type image/gif was processed.',
+            output: "Binary content of type image/gif was processed.",
           },
         },
       },
@@ -820,35 +776,35 @@ describe('convertToFunctionResponse', () => {
     ]);
   });
 
-  it('should handle llmContent as a generic Part (not text, inlineData, or fileData)', () => {
-    const llmContent: Part = { functionCall: { name: 'test', args: {} } };
+  it("should handle llmContent as a generic Part (not text, inlineData, or fileData)", () => {
+    const llmContent: Part = { functionCall: { name: "test", args: {} } };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
     ]);
   });
 
-  it('should handle empty string llmContent', () => {
-    const llmContent = '';
+  it("should handle empty string llmContent", () => {
+    const llmContent = "";
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: '' },
+          response: { output: "" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as an empty array', () => {
+  it("should handle llmContent as an empty array", () => {
     const llmContent: PartListUnion = [];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -856,13 +812,13 @@ describe('convertToFunctionResponse', () => {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as a Part with undefined inlineData/fileData/text', () => {
+  it("should handle llmContent as a Part with undefined inlineData/fileData/text", () => {
     const llmContent: Part = {}; // An empty part object
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -870,55 +826,48 @@ describe('convertToFunctionResponse', () => {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
     ]);
   });
 });
 
-class MockEditToolInvocation extends BaseToolInvocation<
-  Record<string, unknown>,
-  ToolResult
-> {
+class MockEditToolInvocation extends BaseToolInvocation<Record<string, unknown>, ToolResult> {
   constructor(params: Record<string, unknown>) {
     super(params);
   }
 
   getDescription(): string {
-    return 'A mock edit tool invocation';
+    return "A mock edit tool invocation";
   }
 
   override async shouldConfirmExecute(
     _abortSignal: AbortSignal,
   ): Promise<ToolCallConfirmationDetails | false> {
     return {
-      type: 'edit',
-      title: 'Confirm Edit',
-      fileName: 'test.txt',
-      filePath: 'test.txt',
-      fileDiff:
-        '--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content',
-      originalContent: 'old content',
-      newContent: 'new content',
+      type: "edit",
+      title: "Confirm Edit",
+      fileName: "test.txt",
+      filePath: "test.txt",
+      fileDiff: "--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content",
+      originalContent: "old content",
+      newContent: "new content",
       onConfirm: async () => {},
     };
   }
 
   async execute(_abortSignal: AbortSignal): Promise<ToolResult> {
     return {
-      llmContent: 'Edited successfully',
-      returnDisplay: 'Edited successfully',
+      llmContent: "Edited successfully",
+      returnDisplay: "Edited successfully",
     };
   }
 }
 
-class MockEditTool extends BaseDeclarativeTool<
-  Record<string, unknown>,
-  ToolResult
-> {
+class MockEditTool extends BaseDeclarativeTool<Record<string, unknown>, ToolResult> {
   constructor() {
-    super('mockEditTool', 'mockEditTool', 'A mock edit tool', Kind.Edit, {});
+    super("mockEditTool", "mockEditTool", "A mock edit tool", Kind.Edit, {});
   }
 
   protected createInvocation(
@@ -928,8 +877,8 @@ class MockEditTool extends BaseDeclarativeTool<
   }
 }
 
-describe('CoreToolScheduler edit cancellation', () => {
-  it('should preserve diff when an edit is cancelled', async () => {
+describe("CoreToolScheduler edit cancellation", () => {
+  it("should preserve diff when an edit is cancelled", async () => {
     const mockEditTool = new MockEditTool();
     const mockToolRegistry = {
       getTool: () => mockEditTool,
@@ -955,31 +904,29 @@ describe('CoreToolScheduler edit cancellation', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockEditTool',
+      callId: "1",
+      name: "mockEditTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-1',
+      prompt_id: "prompt-id-1",
     };
 
     await scheduler.schedule([request], abortController.signal);
 
     const awaitingCall = (await waitForStatus(
       onToolCallsUpdate,
-      'awaiting_approval',
+      "awaiting_approval",
     )) as WaitingToolCall;
 
     // Cancel the edit
@@ -989,31 +936,30 @@ describe('CoreToolScheduler edit cancellation', () => {
     }
 
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
 
-    expect(completedCalls[0].status).toBe('cancelled');
+    expect(completedCalls[0].status).toBe("cancelled");
 
     // Check that the diff is preserved
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const cancelledCall = completedCalls[0] as any;
     expect(cancelledCall.response.resultDisplay).toBeDefined();
     expect(cancelledCall.response.resultDisplay.fileDiff).toBe(
-      '--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content',
+      "--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content",
     );
-    expect(cancelledCall.response.resultDisplay.fileName).toBe('test.txt');
+    expect(cancelledCall.response.resultDisplay.fileName).toBe("test.txt");
   });
 });
 
-describe('CoreToolScheduler YOLO mode', () => {
-  it('should execute tool requiring confirmation directly without waiting', async () => {
+describe("CoreToolScheduler YOLO mode", () => {
+  it("should execute tool requiring confirmation directly without waiting", async () => {
     // Arrange
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Tool executed',
-      returnDisplay: 'Tool executed',
+      llmContent: "Tool executed",
+      returnDisplay: "Tool executed",
     });
     const mockTool = new MockTool({
-      name: 'mockTool',
+      name: "mockTool",
       execute: executeFn,
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
@@ -1046,24 +992,22 @@ describe('CoreToolScheduler YOLO mode', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockTool',
-      args: { param: 'value' },
+      callId: "1",
+      name: "mockTool",
+      args: { param: "value" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-yolo',
+      prompt_id: "prompt-id-yolo",
     };
 
     // Act
@@ -1076,41 +1020,35 @@ describe('CoreToolScheduler YOLO mode', () => {
 
     // Assert
     // 1. The tool's execute method was called directly.
-    expect(executeFn).toHaveBeenCalledWith({ param: 'value' });
+    expect(executeFn).toHaveBeenCalledWith({ param: "value" });
 
     // 2. The tool call status never entered 'awaiting_approval'.
     const statusUpdates = onToolCallsUpdate.mock.calls
       .map((call) => (call[0][0] as ToolCall)?.status)
       .filter(Boolean);
-    expect(statusUpdates).not.toContain('awaiting_approval');
-    expect(statusUpdates).toEqual([
-      'validating',
-      'scheduled',
-      'executing',
-      'success',
-    ]);
+    expect(statusUpdates).not.toContain("awaiting_approval");
+    expect(statusUpdates).toEqual(["validating", "scheduled", "executing", "success"]);
 
     // 3. The final callback indicates the tool call was successful.
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(1);
     const completedCall = completedCalls[0];
-    expect(completedCall.status).toBe('success');
-    if (completedCall.status === 'success') {
-      expect(completedCall.response.resultDisplay).toBe('Tool executed');
+    expect(completedCall.status).toBe("success");
+    if (completedCall.status === "success") {
+      expect(completedCall.response.resultDisplay).toBe("Tool executed");
     }
   });
 });
 
-describe('CoreToolScheduler request queueing', () => {
-  it('should queue a request if another is running', async () => {
+describe("CoreToolScheduler request queueing", () => {
+  it("should queue a request if another is running", async () => {
     let resolveFirstCall: (result: ToolResult) => void;
     const firstCallPromise = new Promise<ToolResult>((resolve) => {
       resolveFirstCall = resolve;
     });
 
     const executeFn = vi.fn().mockImplementation(() => firstCallPromise);
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
 
     const mockToolRegistry = {
@@ -1138,31 +1076,29 @@ describe('CoreToolScheduler request queueing', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request1 = {
-      callId: '1',
-      name: 'mockTool',
+      callId: "1",
+      name: "mockTool",
       args: { a: 1 },
       isClientInitiated: false,
-      prompt_id: 'prompt-1',
+      prompt_id: "prompt-1",
     };
     const request2 = {
-      callId: '2',
-      name: 'mockTool',
+      callId: "2",
+      name: "mockTool",
       args: { b: 2 },
       isClientInitiated: false,
-      prompt_id: 'prompt-2',
+      prompt_id: "prompt-2",
     };
 
     // Schedule the first call, which will pause execution.
@@ -1170,21 +1106,18 @@ describe('CoreToolScheduler request queueing', () => {
     scheduler.schedule([request1], abortController.signal);
 
     // Wait for the first call to be in the 'executing' state.
-    await waitForStatus(onToolCallsUpdate, 'executing');
+    await waitForStatus(onToolCallsUpdate, "executing");
 
     // Schedule the second call while the first is "running".
-    const schedulePromise2 = scheduler.schedule(
-      [request2],
-      abortController.signal,
-    );
+    const schedulePromise2 = scheduler.schedule([request2], abortController.signal);
 
     // Ensure the second tool call hasn't been executed yet.
     expect(executeFn).toHaveBeenCalledWith({ a: 1 });
 
     // Complete the first tool call.
     resolveFirstCall!({
-      llmContent: 'First call complete',
-      returnDisplay: 'First call complete',
+      llmContent: "First call complete",
+      returnDisplay: "First call complete",
     });
 
     // Wait for the second schedule promise to resolve.
@@ -1192,8 +1125,8 @@ describe('CoreToolScheduler request queueing', () => {
 
     // Let the second call finish.
     const secondCallResult = {
-      llmContent: 'Second call complete',
-      returnDisplay: 'Second call complete',
+      llmContent: "Second call complete",
+      returnDisplay: "Second call complete",
     };
     // Since the mock is shared, we need to resolve the current promise.
     // In a real scenario, a new promise would be created for the second call.
@@ -1211,18 +1144,18 @@ describe('CoreToolScheduler request queueing', () => {
     });
 
     // Verify the completion callbacks were called correctly.
-    expect(onAllToolCallsComplete.mock.calls[0][0][0].status).toBe('success');
-    expect(onAllToolCallsComplete.mock.calls[1][0][0].status).toBe('success');
+    expect(onAllToolCallsComplete.mock.calls[0][0][0].status).toBe("success");
+    expect(onAllToolCallsComplete.mock.calls[1][0][0].status).toBe("success");
   });
 
-  it('should auto-approve a tool call if it is on the allowedTools list', async () => {
+  it("should auto-approve a tool call if it is on the allowedTools list", async () => {
     // Arrange
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Tool executed',
-      returnDisplay: 'Tool executed',
+      llmContent: "Tool executed",
+      returnDisplay: "Tool executed",
     });
     const mockTool = new MockTool({
-      name: 'mockTool',
+      name: "mockTool",
       execute: executeFn,
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
@@ -1247,7 +1180,7 @@ describe('CoreToolScheduler request queueing', () => {
 
     // Configure the scheduler to auto-approve the specific tool call.
     const mockConfig = createMockConfig({
-      getAllowedTools: () => ['mockTool'], // Auto-approve this tool
+      getAllowedTools: () => ["mockTool"], // Auto-approve this tool
       getToolRegistry: () => toolRegistry,
       getShellExecutionConfig: () => ({
         terminalWidth: 80,
@@ -1258,24 +1191,22 @@ describe('CoreToolScheduler request queueing', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockTool',
-      args: { param: 'value' },
+      callId: "1",
+      name: "mockTool",
+      args: { param: "value" },
       isClientInitiated: false,
-      prompt_id: 'prompt-auto-approved',
+      prompt_id: "prompt-auto-approved",
     };
 
     // Act
@@ -1288,55 +1219,49 @@ describe('CoreToolScheduler request queueing', () => {
 
     // Assert
     // 1. The tool's execute method was called directly.
-    expect(executeFn).toHaveBeenCalledWith({ param: 'value' });
+    expect(executeFn).toHaveBeenCalledWith({ param: "value" });
 
     // 2. The tool call status never entered 'awaiting_approval'.
     const statusUpdates = onToolCallsUpdate.mock.calls
       .map((call) => (call[0][0] as ToolCall)?.status)
       .filter(Boolean);
-    expect(statusUpdates).not.toContain('awaiting_approval');
-    expect(statusUpdates).toEqual([
-      'validating',
-      'scheduled',
-      'executing',
-      'success',
-    ]);
+    expect(statusUpdates).not.toContain("awaiting_approval");
+    expect(statusUpdates).toEqual(["validating", "scheduled", "executing", "success"]);
 
     // 3. The final callback indicates the tool call was successful.
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(1);
     const completedCall = completedCalls[0];
-    expect(completedCall.status).toBe('success');
-    if (completedCall.status === 'success') {
-      expect(completedCall.response.resultDisplay).toBe('Tool executed');
+    expect(completedCall.status).toBe("success");
+    if (completedCall.status === "success") {
+      expect(completedCall.response.resultDisplay).toBe("Tool executed");
     }
   });
 
-  it('should require approval for a chained shell command even when prefix is allowlisted', async () => {
+  it("should require approval for a chained shell command even when prefix is allowlisted", async () => {
     expect(
       isShellInvocationAllowlisted(
         {
-          params: { command: 'git status && rm -rf /tmp/should-not-run' },
+          params: { command: "git status && rm -rf /tmp/should-not-run" },
         } as unknown as AnyToolInvocation,
-        ['run_shell_command(git)'],
+        ["run_shell_command(git)"],
       ),
     ).toBe(false);
 
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Shell command executed',
-      returnDisplay: 'Shell command executed',
+      llmContent: "Shell command executed",
+      returnDisplay: "Shell command executed",
     });
 
     const mockShellTool = new MockTool({
-      name: 'run_shell_command',
+      name: "run_shell_command",
       shouldConfirmExecute: (params) =>
         Promise.resolve({
-          type: 'exec',
-          title: 'Confirm Shell Command',
-          command: String(params['command'] ?? ''),
-          rootCommand: 'git',
+          type: "exec",
+          title: "Confirm Shell Command",
+          command: String(params["command"] ?? ""),
+          rootCommand: "git",
           onConfirm: async () => {},
         }),
       execute: () => executeFn({}),
@@ -1360,7 +1285,7 @@ describe('CoreToolScheduler request queueing', () => {
     const onToolCallsUpdate = vi.fn();
 
     const mockConfig = createMockConfig({
-      getAllowedTools: () => ['run_shell_command(git)'],
+      getAllowedTools: () => ["run_shell_command(git)"],
       getShellExecutionConfig: () => ({
         terminalWidth: 80,
         terminalHeight: 24,
@@ -1374,16 +1299,16 @@ describe('CoreToolScheduler request queueing', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: 'shell-1',
-      name: 'run_shell_command',
-      args: { command: 'git status && rm -rf /tmp/should-not-run' },
+      callId: "shell-1",
+      name: "run_shell_command",
+      args: { command: "git status && rm -rf /tmp/should-not-run" },
       isClientInitiated: false,
-      prompt_id: 'prompt-shell-auto-approved',
+      prompt_id: "prompt-shell-auto-approved",
     };
 
     await scheduler.schedule([request], abortController.signal);
@@ -1392,17 +1317,17 @@ describe('CoreToolScheduler request queueing', () => {
       .map((call) => (call[0][0] as ToolCall)?.status)
       .filter(Boolean);
 
-    expect(statusUpdates).toContain('awaiting_approval');
+    expect(statusUpdates).toContain("awaiting_approval");
     expect(executeFn).not.toHaveBeenCalled();
     expect(onAllToolCallsComplete).not.toHaveBeenCalled();
   }, 20000);
 
-  it('should handle two synchronous calls to schedule', async () => {
+  it("should handle two synchronous calls to schedule", async () => {
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Tool executed',
-      returnDisplay: 'Tool executed',
+      llmContent: "Tool executed",
+      returnDisplay: "Tool executed",
     });
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
     const mockToolRegistry = {
       getTool: () => declarativeTool,
@@ -1428,42 +1353,34 @@ describe('CoreToolScheduler request queueing', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const request1 = {
-      callId: '1',
-      name: 'mockTool',
+      callId: "1",
+      name: "mockTool",
       args: { a: 1 },
       isClientInitiated: false,
-      prompt_id: 'prompt-1',
+      prompt_id: "prompt-1",
     };
     const request2 = {
-      callId: '2',
-      name: 'mockTool',
+      callId: "2",
+      name: "mockTool",
       args: { b: 2 },
       isClientInitiated: false,
-      prompt_id: 'prompt-2',
+      prompt_id: "prompt-2",
     };
 
     // Schedule two calls synchronously.
-    const schedulePromise1 = scheduler.schedule(
-      [request1],
-      abortController.signal,
-    );
-    const schedulePromise2 = scheduler.schedule(
-      [request2],
-      abortController.signal,
-    );
+    const schedulePromise1 = scheduler.schedule([request1], abortController.signal);
+    const schedulePromise2 = scheduler.schedule([request2], abortController.signal);
 
     // Wait for both promises to resolve.
     await Promise.all([schedulePromise1, schedulePromise2]);
@@ -1477,7 +1394,7 @@ describe('CoreToolScheduler request queueing', () => {
     expect(onAllToolCallsComplete).toHaveBeenCalledTimes(2);
   });
 
-  it('should auto-approve remaining tool calls when first tool call is approved with ProceedAlways', async () => {
+  it("should auto-approve remaining tool calls when first tool call is approved with ProceedAlways", async () => {
     let approvalMode = ApprovalMode.DEFAULT;
     const mockConfig = createMockConfig({
       getApprovalMode: () => approvalMode,
@@ -1489,9 +1406,7 @@ describe('CoreToolScheduler request queueing', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const testTool = new TestApprovalTool(mockConfig);
     const toolRegistry = {
@@ -1519,9 +1434,7 @@ describe('CoreToolScheduler request queueing', () => {
 
     const onAllToolCallsComplete = vi.fn();
     const onToolCallsUpdate = vi.fn();
-    const pendingConfirmations: Array<
-      (outcome: ToolConfirmationOutcome) => void
-    > = [];
+    const pendingConfirmations: Array<(outcome: ToolConfirmationOutcome) => void> = [];
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
@@ -1530,22 +1443,20 @@ describe('CoreToolScheduler request queueing', () => {
         onToolCallsUpdate(toolCalls);
         // Capture confirmation handlers for awaiting_approval tools
         toolCalls.forEach((call) => {
-          if (call.status === 'awaiting_approval') {
+          if (call.status === "awaiting_approval") {
             const waitingCall = call as WaitingToolCall;
             if (waitingCall.confirmationDetails?.onConfirm) {
               const originalHandler = pendingConfirmations.find(
                 (h) => h === waitingCall.confirmationDetails.onConfirm,
               );
               if (!originalHandler) {
-                pendingConfirmations.push(
-                  waitingCall.confirmationDetails.onConfirm,
-                );
+                pendingConfirmations.push(waitingCall.confirmationDetails.onConfirm);
               }
             }
           }
         });
       },
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
@@ -1553,25 +1464,25 @@ describe('CoreToolScheduler request queueing', () => {
     // Schedule multiple tools that need confirmation
     const requests = [
       {
-        callId: '1',
-        name: 'testApprovalTool',
-        args: { id: 'first' },
+        callId: "1",
+        name: "testApprovalTool",
+        args: { id: "first" },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '2',
-        name: 'testApprovalTool',
-        args: { id: 'second' },
+        callId: "2",
+        name: "testApprovalTool",
+        args: { id: "second" },
         isClientInitiated: false,
-        prompt_id: 'prompt-2',
+        prompt_id: "prompt-2",
       },
       {
-        callId: '3',
-        name: 'testApprovalTool',
-        args: { id: 'third' },
+        callId: "3",
+        name: "testApprovalTool",
+        args: { id: "third" },
         isClientInitiated: false,
-        prompt_id: 'prompt-3',
+        prompt_id: "prompt-3",
       },
     ];
 
@@ -1582,11 +1493,11 @@ describe('CoreToolScheduler request queueing', () => {
       const calls = onToolCallsUpdate.mock.calls.at(-1)?.[0] as ToolCall[];
       // With the sequential scheduler, the update includes the active call and the queue.
       expect(calls?.length).toBe(3);
-      expect(calls?.[0].status).toBe('awaiting_approval');
-      expect(calls?.[0].request.callId).toBe('1');
+      expect(calls?.[0].status).toBe("awaiting_approval");
+      expect(calls?.[0].request.callId).toBe("1");
       // Check that the other two are in the queue (still in 'validating' state)
-      expect(calls?.[1].status).toBe('validating');
-      expect(calls?.[2].status).toBe('validating');
+      expect(calls?.[1].status).toBe("validating");
+      expect(calls?.[2].status).toBe("validating");
     });
 
     expect(pendingConfirmations.length).toBe(1);
@@ -1600,45 +1511,37 @@ describe('CoreToolScheduler request queueing', () => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock.calls.at(
-      -1,
-    )?.[0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls.at(-1)?.[0] as ToolCall[];
     expect(completedCalls?.length).toBe(3);
-    expect(completedCalls?.every((call) => call.status === 'success')).toBe(
-      true,
-    );
+    expect(completedCalls?.every((call) => call.status === "success")).toBe(true);
 
     // Verify approval mode was changed
     expect(approvalMode).toBe(ApprovalMode.AUTO_EDIT);
   });
 });
 
-describe('CoreToolScheduler Sequential Execution', () => {
-  it('should execute tool calls in a batch sequentially', async () => {
+describe("CoreToolScheduler Sequential Execution", () => {
+  it("should execute tool calls in a batch sequentially", async () => {
     // Arrange
     let firstCallFinished = false;
-    const executeFn = vi
-      .fn()
-      .mockImplementation(async (args: { call: number }) => {
-        if (args.call === 1) {
-          // First call, wait for a bit to simulate work
-          await new Promise((resolve) => setTimeout(resolve, 50));
-          firstCallFinished = true;
-          return { llmContent: 'First call done' };
-        }
-        if (args.call === 2) {
-          // Second call, should only happen after the first is finished
-          if (!firstCallFinished) {
-            throw new Error(
-              'Second tool call started before the first one finished!',
-            );
-          }
-          return { llmContent: 'Second call done' };
+    const executeFn = vi.fn().mockImplementation(async (args: { call: number }) => {
+      if (args.call === 1) {
+        // First call, wait for a bit to simulate work
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        firstCallFinished = true;
+        return { llmContent: "First call done" };
+      }
+      if (args.call === 2) {
+        // Second call, should only happen after the first is finished
+        if (!firstCallFinished) {
+          throw new Error("Second tool call started before the first one finished!");
         }
-        return { llmContent: 'default' };
-      });
+        return { llmContent: "Second call done" };
+      }
+      return { llmContent: "default" };
+    });
 
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
 
     const mockToolRegistry = {
@@ -1666,32 +1569,30 @@ describe('CoreToolScheduler Sequential Execution', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool',
+        callId: "1",
+        name: "mockTool",
         args: { call: 1 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '2',
-        name: 'mockTool',
+        callId: "2",
+        name: "mockTool",
         args: { call: 2 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
     ];
 
@@ -1712,38 +1613,35 @@ describe('CoreToolScheduler Sequential Execution', () => {
     expect(calls[1][0]).toEqual({ call: 2 });
 
     // The onAllToolCallsComplete should be called once with both results
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(2);
-    expect(completedCalls[0].status).toBe('success');
-    expect(completedCalls[1].status).toBe('success');
+    expect(completedCalls[0].status).toBe("success");
+    expect(completedCalls[1].status).toBe("success");
   });
 
-  it('should cancel subsequent tools when the signal is aborted.', async () => {
+  it("should cancel subsequent tools when the signal is aborted.", async () => {
     // Arrange
     const abortController = new AbortController();
     let secondCallStarted = false;
 
-    const executeFn = vi
-      .fn()
-      .mockImplementation(async (args: { call: number }) => {
-        if (args.call === 1) {
-          return { llmContent: 'First call done' };
-        }
-        if (args.call === 2) {
-          secondCallStarted = true;
-          // This call will be cancelled while it's "running".
-          await new Promise((resolve) => setTimeout(resolve, 100));
-          // It should not return a value because it will be cancelled.
-          return { llmContent: 'Second call should not complete' };
-        }
-        if (args.call === 3) {
-          return { llmContent: 'Third call done' };
-        }
-        return { llmContent: 'default' };
-      });
+    const executeFn = vi.fn().mockImplementation(async (args: { call: number }) => {
+      if (args.call === 1) {
+        return { llmContent: "First call done" };
+      }
+      if (args.call === 2) {
+        secondCallStarted = true;
+        // This call will be cancelled while it's "running".
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        // It should not return a value because it will be cancelled.
+        return { llmContent: "Second call should not complete" };
+      }
+      if (args.call === 3) {
+        return { llmContent: "Third call done" };
+      }
+      return { llmContent: "default" };
+    });
 
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
 
     const mockToolRegistry = {
@@ -1771,46 +1669,41 @@ describe('CoreToolScheduler Sequential Execution', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool',
+        callId: "1",
+        name: "mockTool",
         args: { call: 1 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '2',
-        name: 'mockTool',
+        callId: "2",
+        name: "mockTool",
         args: { call: 2 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '3',
-        name: 'mockTool',
+        callId: "3",
+        name: "mockTool",
         args: { call: 3 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
     ];
 
     // Act
-    const schedulePromise = scheduler.schedule(
-      requests,
-      abortController.signal,
-    );
+    const schedulePromise = scheduler.schedule(requests, abortController.signal);
 
     // Wait for the second call to start, then abort.
     await vi.waitFor(() => {
@@ -1830,28 +1723,27 @@ describe('CoreToolScheduler Sequential Execution', () => {
     expect(executeFn).toHaveBeenCalledWith({ call: 1 });
     expect(executeFn).toHaveBeenCalledWith({ call: 2 });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(3);
 
-    const call1 = completedCalls.find((c) => c.request.callId === '1');
-    const call2 = completedCalls.find((c) => c.request.callId === '2');
-    const call3 = completedCalls.find((c) => c.request.callId === '3');
+    const call1 = completedCalls.find((c) => c.request.callId === "1");
+    const call2 = completedCalls.find((c) => c.request.callId === "2");
+    const call3 = completedCalls.find((c) => c.request.callId === "3");
 
-    expect(call1?.status).toBe('success');
-    expect(call2?.status).toBe('cancelled');
-    expect(call3?.status).toBe('cancelled');
+    expect(call1?.status).toBe("success");
+    expect(call2?.status).toBe("cancelled");
+    expect(call3?.status).toBe("cancelled");
   });
 
-  it('should pass confirmation diff data into modifyWithEditor overrides', async () => {
+  it("should pass confirmation diff data into modifyWithEditor overrides", async () => {
     const modifyWithEditorSpy = vi
-      .spyOn(modifiableToolModule, 'modifyWithEditor')
+      .spyOn(modifiableToolModule, "modifyWithEditor")
       .mockResolvedValue({
-        updatedParams: { param: 'updated' },
-        updatedDiff: 'updated diff',
+        updatedParams: { param: "updated" },
+        updatedDiff: "updated diff",
       });
 
-    const mockModifiableTool = new MockModifiableTool('mockModifiableTool');
+    const mockModifiableTool = new MockModifiableTool("mockModifiableTool");
     const mockToolRegistry = {
       getTool: () => mockModifiableTool,
       getToolByName: () => mockModifiableTool,
@@ -1875,15 +1767,13 @@ describe('CoreToolScheduler Sequential Execution', () => {
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
     mockConfig.getEnableHooks = vi.fn().mockReturnValue(false);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
     });
 
     const abortController = new AbortController();
@@ -1891,11 +1781,11 @@ describe('CoreToolScheduler Sequential Execution', () => {
     await scheduler.schedule(
       [
         {
-          callId: '1',
-          name: 'mockModifiableTool',
+          callId: "1",
+          name: "mockModifiableTool",
           args: {},
           isClientInitiated: false,
-          prompt_id: 'prompt-1',
+          prompt_id: "prompt-1",
         },
       ],
       abortController.signal,
@@ -1903,7 +1793,7 @@ describe('CoreToolScheduler Sequential Execution', () => {
 
     const toolCall = (scheduler as unknown as { toolCalls: ToolCall[] })
       .toolCalls[0] as WaitingToolCall;
-    expect(toolCall.status).toBe('awaiting_approval');
+    expect(toolCall.status).toBe("awaiting_approval");
 
     const confirmationSignal = new AbortController().signal;
     await scheduler.handleConfirmationResponse(
@@ -1914,20 +1804,17 @@ describe('CoreToolScheduler Sequential Execution', () => {
     );
 
     expect(modifyWithEditorSpy).toHaveBeenCalled();
-    const overrides =
-      modifyWithEditorSpy.mock.calls[
-        modifyWithEditorSpy.mock.calls.length - 1
-      ][4];
+    const overrides = modifyWithEditorSpy.mock.calls[modifyWithEditorSpy.mock.calls.length - 1][4];
     expect(overrides).toEqual({
-      currentContent: 'originalContent',
-      proposedContent: 'newContent',
+      currentContent: "originalContent",
+      proposedContent: "newContent",
     });
 
     modifyWithEditorSpy.mockRestore();
   });
 });
 
-describe('truncateAndSaveToFile', () => {
+describe("truncateAndSaveToFile", () => {
   const mockWriteFile = vi.mocked(fs.writeFile);
   const THRESHOLD = 40_000;
   const TRUNCATE_LINES = 1000;
@@ -1936,10 +1823,10 @@ describe('truncateAndSaveToFile', () => {
     vi.clearAllMocks();
   });
 
-  it('should return content unchanged if below threshold', async () => {
-    const content = 'Short content';
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should return content unchanged if below threshold", async () => {
+    const content = "Short content";
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
     const result = await truncateAndSaveToFile(
       content,
@@ -1953,12 +1840,12 @@ describe('truncateAndSaveToFile', () => {
     expect(mockWriteFile).not.toHaveBeenCalled();
   });
 
-  it('should truncate content by lines when content has many lines', async () => {
+  it("should truncate content by lines when content has many lines", async () => {
     // Create content that exceeds 100,000 character threshold with many lines
-    const lines = Array(2000).fill('x'.repeat(100)); // 100 chars per line * 2000 lines = 200,000 chars
-    const content = lines.join('\n');
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+    const lines = Array(2000).fill("x".repeat(100)); // 100 chars per line * 2000 lines = 200,000 chars
+    const content = lines.join("\n");
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
     mockWriteFile.mockResolvedValue(undefined);
 
@@ -1970,9 +1857,7 @@ describe('truncateAndSaveToFile', () => {
       TRUNCATE_LINES,
     );
 
-    expect(result.outputFile).toBe(
-      path.join(projectTempDir, `${callId}.output`),
-    );
+    expect(result.outputFile).toBe(path.join(projectTempDir, `${callId}.output`));
     expect(mockWriteFile).toHaveBeenCalledWith(
       path.join(projectTempDir, `${callId}.output`),
       content,
@@ -1983,19 +1868,17 @@ describe('truncateAndSaveToFile', () => {
     const beginning = lines.slice(0, head);
     const end = lines.slice(-(TRUNCATE_LINES - head));
     const expectedTruncated =
-      beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
+      beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
 
-    expect(result.content).toContain(
-      'Tool output was too large and has been truncated',
-    );
-    expect(result.content).toContain('Truncated part of the output:');
+    expect(result.content).toContain("Tool output was too large and has been truncated");
+    expect(result.content).toContain("Truncated part of the output:");
     expect(result.content).toContain(expectedTruncated);
   });
 
-  it('should wrap and truncate content when content has few but long lines', async () => {
-    const content = 'a'.repeat(200_000); // A single very long line
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should wrap and truncate content when content has few but long lines", async () => {
+    const content = "a".repeat(200_000); // A single very long line
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
     const wrapWidth = 120;
 
     mockWriteFile.mockResolvedValue(undefined);
@@ -2005,7 +1888,7 @@ describe('truncateAndSaveToFile', () => {
     for (let i = 0; i < content.length; i += wrapWidth) {
       wrappedLines.push(content.substring(i, i + wrapWidth));
     }
-    const expectedFileContent = wrappedLines.join('\n');
+    const expectedFileContent = wrappedLines.join("\n");
 
     const result = await truncateAndSaveToFile(
       content,
@@ -2015,9 +1898,7 @@ describe('truncateAndSaveToFile', () => {
       TRUNCATE_LINES,
     );
 
-    expect(result.outputFile).toBe(
-      path.join(projectTempDir, `${callId}.output`),
-    );
+    expect(result.outputFile).toBe(path.join(projectTempDir, `${callId}.output`));
     // Check that the file was written with the wrapped content
     expect(mockWriteFile).toHaveBeenCalledWith(
       path.join(projectTempDir, `${callId}.output`),
@@ -2029,20 +1910,18 @@ describe('truncateAndSaveToFile', () => {
     const beginning = wrappedLines.slice(0, head);
     const end = wrappedLines.slice(-(TRUNCATE_LINES - head));
     const expectedTruncated =
-      beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
-    expect(result.content).toContain(
-      'Tool output was too large and has been truncated',
-    );
-    expect(result.content).toContain('Truncated part of the output:');
+      beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
+    expect(result.content).toContain("Tool output was too large and has been truncated");
+    expect(result.content).toContain("Truncated part of the output:");
     expect(result.content).toContain(expectedTruncated);
   });
 
-  it('should handle file write errors gracefully', async () => {
-    const content = 'a'.repeat(2_000_000);
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should handle file write errors gracefully", async () => {
+    const content = "a".repeat(2_000_000);
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
-    mockWriteFile.mockRejectedValue(new Error('File write failed'));
+    mockWriteFile.mockRejectedValue(new Error("File write failed"));
 
     const result = await truncateAndSaveToFile(
       content,
@@ -2053,16 +1932,14 @@ describe('truncateAndSaveToFile', () => {
     );
 
     expect(result.outputFile).toBeUndefined();
-    expect(result.content).toContain(
-      '[Note: Could not save full output to file]',
-    );
+    expect(result.content).toContain("[Note: Could not save full output to file]");
     expect(mockWriteFile).toHaveBeenCalled();
   });
 
-  it('should save to correct file path with call ID', async () => {
-    const content = 'a'.repeat(200_000);
-    const callId = 'unique-call-123';
-    const projectTempDir = '/custom/temp/dir';
+  it("should save to correct file path with call ID", async () => {
+    const content = "a".repeat(200_000);
+    const callId = "unique-call-123";
+    const projectTempDir = "/custom/temp/dir";
     const wrapWidth = 120;
 
     mockWriteFile.mockResolvedValue(undefined);
@@ -2072,7 +1949,7 @@ describe('truncateAndSaveToFile', () => {
     for (let i = 0; i < content.length; i += wrapWidth) {
       wrappedLines.push(content.substring(i, i + wrapWidth));
     }
-    const expectedFileContent = wrappedLines.join('\n');
+    const expectedFileContent = wrappedLines.join("\n");
 
     const result = await truncateAndSaveToFile(
       content,
@@ -2084,16 +1961,13 @@ describe('truncateAndSaveToFile', () => {
 
     const expectedPath = path.join(projectTempDir, `${callId}.output`);
     expect(result.outputFile).toBe(expectedPath);
-    expect(mockWriteFile).toHaveBeenCalledWith(
-      expectedPath,
-      expectedFileContent,
-    );
+    expect(mockWriteFile).toHaveBeenCalledWith(expectedPath, expectedFileContent);
   });
 
-  it('should include helpful instructions in truncated message', async () => {
-    const content = 'a'.repeat(2_000_000);
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should include helpful instructions in truncated message", async () => {
+    const content = "a".repeat(2_000_000);
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
     mockWriteFile.mockResolvedValue(undefined);
 
@@ -2105,22 +1979,16 @@ describe('truncateAndSaveToFile', () => {
       TRUNCATE_LINES,
     );
 
-    expect(result.content).toContain(
-      'read_file tool with the absolute file path above',
-    );
-    expect(result.content).toContain('read_file tool with offset=0, limit=100');
-    expect(result.content).toContain(
-      'read_file tool with offset=N to skip N lines',
-    );
-    expect(result.content).toContain(
-      'read_file tool with limit=M to read only M lines',
-    );
+    expect(result.content).toContain("read_file tool with the absolute file path above");
+    expect(result.content).toContain("read_file tool with offset=0, limit=100");
+    expect(result.content).toContain("read_file tool with offset=N to skip N lines");
+    expect(result.content).toContain("read_file tool with limit=M to read only M lines");
   });
 
-  it('should sanitize callId to prevent path traversal', async () => {
-    const content = 'a'.repeat(200_000);
-    const callId = '../../../../../etc/passwd';
-    const projectTempDir = '/tmp/safe_dir';
+  it("should sanitize callId to prevent path traversal", async () => {
+    const content = "a".repeat(200_000);
+    const callId = "../../../../../etc/passwd";
+    const projectTempDir = "/tmp/safe_dir";
     const wrapWidth = 120;
 
     mockWriteFile.mockResolvedValue(undefined);
@@ -2130,20 +1998,11 @@ describe('truncateAndSaveToFile', () => {
     for (let i = 0; i < content.length; i += wrapWidth) {
       wrappedLines.push(content.substring(i, i + wrapWidth));
     }
-    const expectedFileContent = wrappedLines.join('\n');
+    const expectedFileContent = wrappedLines.join("\n");
 
-    await truncateAndSaveToFile(
-      content,
-      callId,
-      projectTempDir,
-      THRESHOLD,
-      TRUNCATE_LINES,
-    );
+    await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
 
-    const expectedPath = path.join(projectTempDir, 'passwd.output');
-    expect(mockWriteFile).toHaveBeenCalledWith(
-      expectedPath,
-      expectedFileContent,
-    );
+    const expectedPath = path.join(projectTempDir, "passwd.output");
+    expect(mockWriteFile).toHaveBeenCalledWith(expectedPath, expectedFileContent);
   });
 });
diff --git a/packages/gemini-cli-core/src/core/coreToolScheduler.ts b/packages/gemini-cli-core/src/core/coreToolScheduler.ts
index 6464854e9..1cb4f911f 100644
--- a/packages/gemini-cli-core/src/core/coreToolScheduler.ts
+++ b/packages/gemini-cli-core/src/core/coreToolScheduler.ts
@@ -4,57 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { Part, PartListUnion } from "@google/genai";
+import * as Diff from "diff";
+import levenshtein from "fast-levenshtein";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import type { ToolConfirmationRequest } from "../confirmation-bus/types.js";
+import { MessageBusType } from "../confirmation-bus/types.js";
 import type {
+  AnsiOutput,
+  AnyDeclarativeTool,
+  AnyToolInvocation,
+  Config,
+  EditorType,
+  ToolCallConfirmationDetails,
   ToolCallRequestInfo,
   ToolCallResponseInfo,
-  ToolCallConfirmationDetails,
+  ToolConfirmationPayload,
   ToolResult,
   ToolResultDisplay,
-  EditorType,
-  Config,
-  ToolConfirmationPayload,
-  AnyDeclarativeTool,
-  AnyToolInvocation,
-  AnsiOutput,
-} from '../index.js';
+} from "../index.js";
 import {
-  ToolConfirmationOutcome,
   ApprovalMode,
   logToolCall,
-  ToolErrorType,
-  ToolCallEvent,
   logToolOutputTruncated,
-  ToolOutputTruncatedEvent,
   runInDevTraceSpan,
-} from '../index.js';
-import { READ_FILE_TOOL_NAME, SHELL_TOOL_NAME } from '../tools/tool-names.js';
-import type { Part, PartListUnion } from '@google/genai';
-import { getResponseTextFromParts } from '../utils/generateContentResponseUtilities.js';
-import type { ModifyContext } from '../tools/modifiable-tool.js';
-import {
-  isModifiableDeclarativeTool,
-  modifyWithEditor,
-} from '../tools/modifiable-tool.js';
-import * as Diff from 'diff';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import {
-  isShellInvocationAllowlisted,
-  SHELL_TOOL_NAMES,
-} from '../utils/shell-utils.js';
-import { doesToolInvocationMatch } from '../utils/tool-utils.js';
-import levenshtein from 'fast-levenshtein';
-import { ShellToolInvocation } from '../tools/shell.js';
-import type { ToolConfirmationRequest } from '../confirmation-bus/types.js';
-import { MessageBusType } from '../confirmation-bus/types.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import {
-  fireToolNotificationHook,
-  executeToolWithHooks,
-} from './coreToolHookTriggers.js';
+  ToolCallEvent,
+  ToolConfirmationOutcome,
+  ToolErrorType,
+  ToolOutputTruncatedEvent,
+} from "../index.js";
+import type { ModifyContext } from "../tools/modifiable-tool.js";
+import { isModifiableDeclarativeTool, modifyWithEditor } from "../tools/modifiable-tool.js";
+import { ShellToolInvocation } from "../tools/shell.js";
+import { READ_FILE_TOOL_NAME, SHELL_TOOL_NAME } from "../tools/tool-names.js";
+import { getResponseTextFromParts } from "../utils/generateContentResponseUtilities.js";
+import { isShellInvocationAllowlisted, SHELL_TOOL_NAMES } from "../utils/shell-utils.js";
+import { doesToolInvocationMatch } from "../utils/tool-utils.js";
+import { executeToolWithHooks, fireToolNotificationHook } from "./coreToolHookTriggers.js";
 
 export type ValidatingToolCall = {
-  status: 'validating';
+  status: "validating";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -63,7 +54,7 @@ export type ValidatingToolCall = {
 };
 
 export type ScheduledToolCall = {
-  status: 'scheduled';
+  status: "scheduled";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -72,7 +63,7 @@ export type ScheduledToolCall = {
 };
 
 export type ErroredToolCall = {
-  status: 'error';
+  status: "error";
   request: ToolCallRequestInfo;
   response: ToolCallResponseInfo;
   tool?: AnyDeclarativeTool;
@@ -81,7 +72,7 @@ export type ErroredToolCall = {
 };
 
 export type SuccessfulToolCall = {
-  status: 'success';
+  status: "success";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   response: ToolCallResponseInfo;
@@ -91,7 +82,7 @@ export type SuccessfulToolCall = {
 };
 
 export type ExecutingToolCall = {
-  status: 'executing';
+  status: "executing";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -102,7 +93,7 @@ export type ExecutingToolCall = {
 };
 
 export type CancelledToolCall = {
-  status: 'cancelled';
+  status: "cancelled";
   request: ToolCallRequestInfo;
   response: ToolCallResponseInfo;
   tool: AnyDeclarativeTool;
@@ -112,7 +103,7 @@ export type CancelledToolCall = {
 };
 
 export type WaitingToolCall = {
-  status: 'awaiting_approval';
+  status: "awaiting_approval";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -121,7 +112,7 @@ export type WaitingToolCall = {
   outcome?: ToolConfirmationOutcome;
 };
 
-export type Status = ToolCall['status'];
+export type Status = ToolCall["status"];
 
 export type ToolCall =
   | ValidatingToolCall
@@ -132,19 +123,11 @@ export type ToolCall =
   | CancelledToolCall
   | WaitingToolCall;
 
-export type CompletedToolCall =
-  | SuccessfulToolCall
-  | CancelledToolCall
-  | ErroredToolCall;
+export type CompletedToolCall = SuccessfulToolCall | CancelledToolCall | ErroredToolCall;
 
-export type ConfirmHandler = (
-  toolCall: WaitingToolCall,
-) => Promise<ToolConfirmationOutcome>;
+export type ConfirmHandler = (toolCall: WaitingToolCall) => Promise<ToolConfirmationOutcome>;
 
-export type OutputUpdateHandler = (
-  toolCallId: string,
-  outputChunk: string | AnsiOutput,
-) => void;
+export type OutputUpdateHandler = (toolCallId: string, outputChunk: string | AnsiOutput) => void;
 
 export type AllToolCallsCompleteHandler = (
   completedToolCalls: CompletedToolCall[],
@@ -155,11 +138,7 @@ export type ToolCallsUpdateHandler = (toolCalls: ToolCall[]) => void;
 /**
  * Formats tool output for a Gemini FunctionResponse.
  */
-function createFunctionResponsePart(
-  callId: string,
-  toolName: string,
-  output: string,
-): Part {
+function createFunctionResponsePart(callId: string, toolName: string, output: string): Part {
   return {
     functionResponse: {
       id: callId,
@@ -175,11 +154,9 @@ export function convertToFunctionResponse(
   llmContent: PartListUnion,
 ): Part[] {
   const contentToProcess =
-    Array.isArray(llmContent) && llmContent.length === 1
-      ? llmContent[0]
-      : llmContent;
+    Array.isArray(llmContent) && llmContent.length === 1 ? llmContent[0] : llmContent;
 
-  if (typeof contentToProcess === 'string') {
+  if (typeof contentToProcess === "string") {
     return [createFunctionResponsePart(callId, toolName, contentToProcess)];
   }
 
@@ -187,18 +164,17 @@ export function convertToFunctionResponse(
     const functionResponse = createFunctionResponsePart(
       callId,
       toolName,
-      'Tool execution succeeded.',
+      "Tool execution succeeded.",
     );
     return [functionResponse, ...toParts(contentToProcess)];
   }
 
   // After this point, contentToProcess is a single Part object.
   if (contentToProcess.functionResponse) {
-    if (contentToProcess.functionResponse.response?.['content']) {
+    if (contentToProcess.functionResponse.response?.["content"]) {
       const stringifiedOutput =
-        getResponseTextFromParts(
-          contentToProcess.functionResponse.response['content'] as Part[],
-        ) || '';
+        getResponseTextFromParts(contentToProcess.functionResponse.response["content"] as Part[]) ||
+        "";
       return [createFunctionResponsePart(callId, toolName, stringifiedOutput)];
     }
     // It's a functionResponse that we should pass through as is.
@@ -207,9 +183,7 @@ export function convertToFunctionResponse(
 
   if (contentToProcess.inlineData || contentToProcess.fileData) {
     const mimeType =
-      contentToProcess.inlineData?.mimeType ||
-      contentToProcess.fileData?.mimeType ||
-      'unknown';
+      contentToProcess.inlineData?.mimeType || contentToProcess.fileData?.mimeType || "unknown";
     const functionResponse = createFunctionResponsePart(
       callId,
       toolName,
@@ -219,21 +193,17 @@ export function convertToFunctionResponse(
   }
 
   if (contentToProcess.text !== undefined) {
-    return [
-      createFunctionResponsePart(callId, toolName, contentToProcess.text),
-    ];
+    return [createFunctionResponsePart(callId, toolName, contentToProcess.text)];
   }
 
   // Default case for other kinds of parts.
-  return [
-    createFunctionResponsePart(callId, toolName, 'Tool execution succeeded.'),
-  ];
+  return [createFunctionResponsePart(callId, toolName, "Tool execution succeeded.")];
 }
 
 function toParts(input: PartListUnion): Part[] {
   const parts: Part[] = [];
   for (const part of Array.isArray(input) ? input : [input]) {
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       parts.push({ text: part });
     } else if (part) {
       parts.push(part);
@@ -274,7 +244,7 @@ export async function truncateAndSaveToFile(
     return { content };
   }
 
-  let lines = content.split('\n');
+  let lines = content.split("\n");
   let fileContent = content;
 
   // If the content is long but has few lines, wrap it to enable line-based truncation.
@@ -291,14 +261,14 @@ export async function truncateAndSaveToFile(
       }
     }
     lines = wrappedLines;
-    fileContent = lines.join('\n');
+    fileContent = lines.join("\n");
   }
 
   const head = Math.floor(truncateLines / 5);
   const beginning = lines.slice(0, head);
   const end = lines.slice(-(truncateLines - head));
   const truncatedContent =
-    beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
+    beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
 
   // Sanitize callId to prevent path traversal.
   const safeFileName = `${path.basename(callId)}.output`;
@@ -321,8 +291,7 @@ ${truncatedContent}`,
     };
   } catch (_error) {
     return {
-      content:
-        truncatedContent + `\n[Note: Could not save full output to file]`,
+      content: truncatedContent + `\n[Note: Could not save full output to file]`,
     };
   }
 }
@@ -390,10 +359,7 @@ export class CoreToolScheduler {
           });
         };
 
-        messageBus.subscribe(
-          MessageBusType.TOOL_CONFIRMATION_REQUEST,
-          sharedHandler,
-        );
+        messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, sharedHandler);
 
         // Store the handler in the WeakMap so we don't subscribe again
         CoreToolScheduler.subscribedMessageBuses.set(messageBus, sharedHandler);
@@ -403,31 +369,31 @@ export class CoreToolScheduler {
 
   private setStatusInternal(
     targetCallId: string,
-    status: 'success',
+    status: "success",
     signal: AbortSignal,
     response: ToolCallResponseInfo,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'awaiting_approval',
+    status: "awaiting_approval",
     signal: AbortSignal,
     confirmationDetails: ToolCallConfirmationDetails,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'error',
+    status: "error",
     signal: AbortSignal,
     response: ToolCallResponseInfo,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'cancelled',
+    status: "cancelled",
     signal: AbortSignal,
     reason: string,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'executing' | 'scheduled' | 'validating',
+    status: "executing" | "scheduled" | "validating",
     signal: AbortSignal,
   ): void;
   private setStatusInternal(
@@ -439,9 +405,9 @@ export class CoreToolScheduler {
     this.toolCalls = this.toolCalls.map((currentCall) => {
       if (
         currentCall.request.callId !== targetCallId ||
-        currentCall.status === 'success' ||
-        currentCall.status === 'error' ||
-        currentCall.status === 'cancelled'
+        currentCall.status === "success" ||
+        currentCall.status === "error" ||
+        currentCall.status === "cancelled"
       ) {
         return currentCall;
       }
@@ -454,67 +420,60 @@ export class CoreToolScheduler {
       const outcome = currentCall.outcome;
 
       switch (newStatus) {
-        case 'success': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "success": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
           return {
             request: currentCall.request,
             tool: toolInstance,
             invocation,
-            status: 'success',
+            status: "success",
             response: auxiliaryData as ToolCallResponseInfo,
             durationMs,
             outcome,
           } as SuccessfulToolCall;
         }
-        case 'error': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "error": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
           return {
             request: currentCall.request,
-            status: 'error',
+            status: "error",
             tool: toolInstance,
             response: auxiliaryData as ToolCallResponseInfo,
             durationMs,
             outcome,
           } as ErroredToolCall;
         }
-        case 'awaiting_approval':
+        case "awaiting_approval":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'awaiting_approval',
+            status: "awaiting_approval",
             confirmationDetails: auxiliaryData as ToolCallConfirmationDetails,
             startTime: existingStartTime,
             outcome,
             invocation,
           } as WaitingToolCall;
-        case 'scheduled':
+        case "scheduled":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'scheduled',
+            status: "scheduled",
             startTime: existingStartTime,
             outcome,
             invocation,
           } as ScheduledToolCall;
-        case 'cancelled': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "cancelled": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
 
           // Preserve diff for cancelled edit operations
           let resultDisplay: ToolResultDisplay | undefined = undefined;
-          if (currentCall.status === 'awaiting_approval') {
+          if (currentCall.status === "awaiting_approval") {
             const waitingCall = currentCall as WaitingToolCall;
-            if (waitingCall.confirmationDetails.type === 'edit') {
+            if (waitingCall.confirmationDetails.type === "edit") {
               resultDisplay = {
                 fileDiff: waitingCall.confirmationDetails.fileDiff,
                 fileName: waitingCall.confirmationDetails.fileName,
-                originalContent:
-                  waitingCall.confirmationDetails.originalContent,
+                originalContent: waitingCall.confirmationDetails.originalContent,
                 newContent: waitingCall.confirmationDetails.newContent,
               };
             }
@@ -525,7 +484,7 @@ export class CoreToolScheduler {
             request: currentCall.request,
             tool: toolInstance,
             invocation,
-            status: 'cancelled',
+            status: "cancelled",
             response: {
               callId: currentCall.request.callId,
               responseParts: [
@@ -548,20 +507,20 @@ export class CoreToolScheduler {
             outcome,
           } as CancelledToolCall;
         }
-        case 'validating':
+        case "validating":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'validating',
+            status: "validating",
             startTime: existingStartTime,
             outcome,
             invocation,
           } as ValidatingToolCall;
-        case 'executing':
+        case "executing":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'executing',
+            status: "executing",
             startTime: existingStartTime,
             outcome,
             invocation,
@@ -579,14 +538,11 @@ export class CoreToolScheduler {
     this.toolCalls = this.toolCalls.map((call) => {
       // We should never be asked to set args on an ErroredToolCall, but
       // we guard for the case anyways.
-      if (call.request.callId !== targetCallId || call.status === 'error') {
+      if (call.request.callId !== targetCallId || call.status === "error") {
         return call;
       }
 
-      const invocationOrError = this.buildInvocation(
-        call.tool,
-        args as Record<string, unknown>,
-      );
+      const invocationOrError = this.buildInvocation(call.tool, args as Record<string, unknown>);
       if (invocationOrError instanceof Error) {
         const response = createErrorResponse(
           call.request,
@@ -595,7 +551,7 @@ export class CoreToolScheduler {
         );
         return {
           request: { ...call.request, args: args as Record<string, unknown> },
-          status: 'error',
+          status: "error",
           tool: call.tool,
           response,
         } as ErroredToolCall;
@@ -613,16 +569,12 @@ export class CoreToolScheduler {
     return (
       this.isFinalizingToolCalls ||
       this.toolCalls.some(
-        (call) =>
-          call.status === 'executing' || call.status === 'awaiting_approval',
+        (call) => call.status === "executing" || call.status === "awaiting_approval",
       )
     );
   }
 
-  private buildInvocation(
-    tool: AnyDeclarativeTool,
-    args: object,
-  ): AnyToolInvocation | Error {
+  private buildInvocation(tool: AnyDeclarativeTool, args: object): AnyToolInvocation | Error {
     try {
       return tool.build(args);
     } catch (e) {
@@ -653,12 +605,10 @@ export class CoreToolScheduler {
     const topNResults = matches.slice(0, topN);
 
     if (topNResults.length === 0) {
-      return '';
+      return "";
     }
 
-    const suggestedNames = topNResults
-      .map((match) => `"${match.name}"`)
-      .join(', ');
+    const suggestedNames = topNResults.map((match) => `"${match.name}"`).join(", ");
 
     if (topNResults.length > 1) {
       return ` Did you mean one of: ${suggestedNames}?`;
@@ -671,42 +621,37 @@ export class CoreToolScheduler {
     request: ToolCallRequestInfo | ToolCallRequestInfo[],
     signal: AbortSignal,
   ): Promise<void> {
-    return runInDevTraceSpan(
-      { name: 'schedule' },
-      async ({ metadata: spanMetadata }) => {
-        spanMetadata.input = request;
-        if (this.isRunning() || this.isScheduling) {
-          return new Promise((resolve, reject) => {
-            const abortHandler = () => {
-              // Find and remove the request from the queue
-              const index = this.requestQueue.findIndex(
-                (item) => item.request === request,
-              );
-              if (index > -1) {
-                this.requestQueue.splice(index, 1);
-                reject(new Error('Tool call cancelled while in queue.'));
-              }
-            };
+    return runInDevTraceSpan({ name: "schedule" }, async ({ metadata: spanMetadata }) => {
+      spanMetadata.input = request;
+      if (this.isRunning() || this.isScheduling) {
+        return new Promise((resolve, reject) => {
+          const abortHandler = () => {
+            // Find and remove the request from the queue
+            const index = this.requestQueue.findIndex((item) => item.request === request);
+            if (index > -1) {
+              this.requestQueue.splice(index, 1);
+              reject(new Error("Tool call cancelled while in queue."));
+            }
+          };
 
-            signal.addEventListener('abort', abortHandler, { once: true });
+          signal.addEventListener("abort", abortHandler, { once: true });
 
-            this.requestQueue.push({
-              request,
-              signal,
-              resolve: () => {
-                signal.removeEventListener('abort', abortHandler);
-                resolve();
-              },
-              reject: (reason?: Error) => {
-                signal.removeEventListener('abort', abortHandler);
-                reject(reason);
-              },
-            });
+          this.requestQueue.push({
+            request,
+            signal,
+            resolve: () => {
+              signal.removeEventListener("abort", abortHandler);
+              resolve();
+            },
+            reject: (reason?: Error) => {
+              signal.removeEventListener("abort", abortHandler);
+              reject(reason);
+            },
           });
-        }
-        return this._schedule(request, signal);
-      },
-    );
+        });
+      }
+      return this._schedule(request, signal);
+    });
   }
 
   cancelAll(signal: AbortSignal): void {
@@ -719,16 +664,16 @@ export class CoreToolScheduler {
       const activeCall = this.toolCalls[0];
       // Only cancel if it's in a cancellable state.
       if (
-        activeCall.status === 'awaiting_approval' ||
-        activeCall.status === 'executing' ||
-        activeCall.status === 'scheduled' ||
-        activeCall.status === 'validating'
+        activeCall.status === "awaiting_approval" ||
+        activeCall.status === "executing" ||
+        activeCall.status === "scheduled" ||
+        activeCall.status === "validating"
       ) {
         this.setStatusInternal(
           activeCall.request.callId,
-          'cancelled',
+          "cancelled",
           signal,
-          'User cancelled the operation.',
+          "User cancelled the operation.",
         );
       }
     }
@@ -749,59 +694,52 @@ export class CoreToolScheduler {
     try {
       if (this.isRunning()) {
         throw new Error(
-          'Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).',
+          "Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).",
         );
       }
       const requestsToProcess = Array.isArray(request) ? request : [request];
       this.completedToolCallsForBatch = [];
 
-      const newToolCalls: ToolCall[] = requestsToProcess.map(
-        (reqInfo): ToolCall => {
-          const toolInstance = this.config
-            .getToolRegistry()
-            .getTool(reqInfo.name);
-          if (!toolInstance) {
-            const suggestion = this.getToolSuggestion(reqInfo.name);
-            const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
-            return {
-              status: 'error',
-              request: reqInfo,
-              response: createErrorResponse(
-                reqInfo,
-                new Error(errorMessage),
-                ToolErrorType.TOOL_NOT_REGISTERED,
-              ),
-              durationMs: 0,
-            };
-          }
-
-          const invocationOrError = this.buildInvocation(
-            toolInstance,
-            reqInfo.args,
-          );
-          if (invocationOrError instanceof Error) {
-            return {
-              status: 'error',
-              request: reqInfo,
-              tool: toolInstance,
-              response: createErrorResponse(
-                reqInfo,
-                invocationOrError,
-                ToolErrorType.INVALID_TOOL_PARAMS,
-              ),
-              durationMs: 0,
-            };
-          }
+      const newToolCalls: ToolCall[] = requestsToProcess.map((reqInfo): ToolCall => {
+        const toolInstance = this.config.getToolRegistry().getTool(reqInfo.name);
+        if (!toolInstance) {
+          const suggestion = this.getToolSuggestion(reqInfo.name);
+          const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
+          return {
+            status: "error",
+            request: reqInfo,
+            response: createErrorResponse(
+              reqInfo,
+              new Error(errorMessage),
+              ToolErrorType.TOOL_NOT_REGISTERED,
+            ),
+            durationMs: 0,
+          };
+        }
 
+        const invocationOrError = this.buildInvocation(toolInstance, reqInfo.args);
+        if (invocationOrError instanceof Error) {
           return {
-            status: 'validating',
+            status: "error",
             request: reqInfo,
             tool: toolInstance,
-            invocation: invocationOrError,
-            startTime: Date.now(),
+            response: createErrorResponse(
+              reqInfo,
+              invocationOrError,
+              ToolErrorType.INVALID_TOOL_PARAMS,
+            ),
+            durationMs: 0,
           };
-        },
-      );
+        }
+
+        return {
+          status: "validating",
+          request: reqInfo,
+          tool: toolInstance,
+          invocation: invocationOrError,
+          startTime: Date.now(),
+        };
+      });
 
       this.toolCallQueue.push(...newToolCalls);
       await this._processNextInQueue(signal);
@@ -831,7 +769,7 @@ export class CoreToolScheduler {
     this.notifyToolCallsUpdate();
 
     // Handle tools that were already errored during creation.
-    if (toolCall.status === 'error') {
+    if (toolCall.status === "error") {
       // An error during validation means this "active" tool is already complete.
       // We need to check for batch completion to either finish or process the next in queue.
       await this.checkAndNotifyCompletion(signal);
@@ -839,38 +777,31 @@ export class CoreToolScheduler {
     }
 
     // This logic is moved from the old `for` loop in `_schedule`.
-    if (toolCall.status === 'validating') {
+    if (toolCall.status === "validating") {
       const { request: reqInfo, invocation } = toolCall;
 
       try {
         if (signal.aborted) {
           this.setStatusInternal(
             reqInfo.callId,
-            'cancelled',
+            "cancelled",
             signal,
-            'Tool call cancelled by user.',
+            "Tool call cancelled by user.",
           );
           // The completion check will handle the cascade.
           await this.checkAndNotifyCompletion(signal);
           return;
         }
 
-        const confirmationDetails =
-          await invocation.shouldConfirmExecute(signal);
+        const confirmationDetails = await invocation.shouldConfirmExecute(signal);
 
         if (!confirmationDetails) {
-          this.setToolCallOutcome(
-            reqInfo.callId,
-            ToolConfirmationOutcome.ProceedAlways,
-          );
-          this.setStatusInternal(reqInfo.callId, 'scheduled', signal);
+          this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+          this.setStatusInternal(reqInfo.callId, "scheduled", signal);
         } else {
           if (this.isAutoApproved(toolCall)) {
-            this.setToolCallOutcome(
-              reqInfo.callId,
-              ToolConfirmationOutcome.ProceedAlways,
-            );
-            this.setStatusInternal(reqInfo.callId, 'scheduled', signal);
+            this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+            this.setStatusInternal(reqInfo.callId, "scheduled", signal);
           } else {
             // Fire Notification hook before showing confirmation to user
             const messageBus = this.config.getMessageBus();
@@ -880,13 +811,10 @@ export class CoreToolScheduler {
             }
 
             // Allow IDE to resolve confirmation
-            if (
-              confirmationDetails.type === 'edit' &&
-              confirmationDetails.ideConfirmation
-            ) {
+            if (confirmationDetails.type === "edit" && confirmationDetails.ideConfirmation) {
               // eslint-disable-next-line @typescript-eslint/no-floating-promises
               confirmationDetails.ideConfirmation.then((resolution) => {
-                if (resolution.status === 'accepted') {
+                if (resolution.status === "accepted") {
                   // eslint-disable-next-line @typescript-eslint/no-floating-promises
                   this.handleConfirmationResponse(
                     reqInfo.callId,
@@ -909,10 +837,7 @@ export class CoreToolScheduler {
             const originalOnConfirm = confirmationDetails.onConfirm;
             const wrappedConfirmationDetails: ToolCallConfirmationDetails = {
               ...confirmationDetails,
-              onConfirm: (
-                outcome: ToolConfirmationOutcome,
-                payload?: ToolConfirmationPayload,
-              ) =>
+              onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) =>
                 this.handleConfirmationResponse(
                   reqInfo.callId,
                   originalOnConfirm,
@@ -923,7 +848,7 @@ export class CoreToolScheduler {
             };
             this.setStatusInternal(
               reqInfo.callId,
-              'awaiting_approval',
+              "awaiting_approval",
               signal,
               wrappedConfirmationDetails,
             );
@@ -933,15 +858,15 @@ export class CoreToolScheduler {
         if (signal.aborted) {
           this.setStatusInternal(
             reqInfo.callId,
-            'cancelled',
+            "cancelled",
             signal,
-            'Tool call cancelled by user.',
+            "Tool call cancelled by user.",
           );
           await this.checkAndNotifyCompletion(signal);
         } else {
           this.setStatusInternal(
             reqInfo.callId,
-            'error',
+            "error",
             signal,
             createErrorResponse(
               reqInfo,
@@ -964,10 +889,10 @@ export class CoreToolScheduler {
     payload?: ToolConfirmationPayload,
   ): Promise<void> {
     const toolCall = this.toolCalls.find(
-      (c) => c.request.callId === callId && c.status === 'awaiting_approval',
+      (c) => c.request.callId === callId && c.status === "awaiting_approval",
     );
 
-    if (toolCall && toolCall.status === 'awaiting_approval') {
+    if (toolCall && toolCall.status === "awaiting_approval") {
       await originalOnConfirm(outcome);
     }
 
@@ -986,16 +911,15 @@ export class CoreToolScheduler {
           return;
         }
 
-        this.setStatusInternal(callId, 'awaiting_approval', signal, {
+        this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
           isModifying: true,
         } as ToolCallConfirmationDetails);
 
         const contentOverrides =
-          waitingToolCall.confirmationDetails.type === 'edit'
+          waitingToolCall.confirmationDetails.type === "edit"
             ? {
-                currentContent:
-                  waitingToolCall.confirmationDetails.originalContent,
+                currentContent: waitingToolCall.confirmationDetails.originalContent,
                 proposedContent: waitingToolCall.confirmationDetails.newContent,
               }
             : undefined;
@@ -1010,7 +934,7 @@ export class CoreToolScheduler {
           contentOverrides,
         );
         this.setArgsInternal(callId, updatedParams);
-        this.setStatusInternal(callId, 'awaiting_approval', signal, {
+        this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
           fileDiff: updatedDiff,
           isModifying: false,
@@ -1019,13 +943,9 @@ export class CoreToolScheduler {
     } else {
       // If the client provided new content, apply it before scheduling.
       if (payload?.newContent && toolCall) {
-        await this._applyInlineModify(
-          toolCall as WaitingToolCall,
-          payload,
-          signal,
-        );
+        await this._applyInlineModify(toolCall as WaitingToolCall, payload, signal);
       }
-      this.setStatusInternal(callId, 'scheduled', signal);
+      this.setStatusInternal(callId, "scheduled", signal);
     }
     await this.attemptExecutionOfScheduledCalls(signal);
   }
@@ -1042,16 +962,14 @@ export class CoreToolScheduler {
     signal: AbortSignal,
   ): Promise<void> {
     if (
-      toolCall.confirmationDetails.type !== 'edit' ||
+      toolCall.confirmationDetails.type !== "edit" ||
       !isModifiableDeclarativeTool(toolCall.tool)
     ) {
       return;
     }
 
     const modifyContext = toolCall.tool.getModifyContext(signal);
-    const currentContent = await modifyContext.getCurrentContent(
-      toolCall.request.args,
-    );
+    const currentContent = await modifyContext.getCurrentContent(toolCall.request.args);
 
     const updatedParams = modifyContext.createUpdatedParams(
       currentContent,
@@ -1062,45 +980,36 @@ export class CoreToolScheduler {
       modifyContext.getFilePath(toolCall.request.args),
       currentContent,
       payload.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
     );
 
     this.setArgsInternal(toolCall.request.callId, updatedParams);
-    this.setStatusInternal(
-      toolCall.request.callId,
-      'awaiting_approval',
-      signal,
-      {
-        ...toolCall.confirmationDetails,
-        fileDiff: updatedDiff,
-      },
-    );
+    this.setStatusInternal(toolCall.request.callId, "awaiting_approval", signal, {
+      ...toolCall.confirmationDetails,
+      fileDiff: updatedDiff,
+    });
   }
 
-  private async attemptExecutionOfScheduledCalls(
-    signal: AbortSignal,
-  ): Promise<void> {
+  private async attemptExecutionOfScheduledCalls(signal: AbortSignal): Promise<void> {
     const allCallsFinalOrScheduled = this.toolCalls.every(
       (call) =>
-        call.status === 'scheduled' ||
-        call.status === 'cancelled' ||
-        call.status === 'success' ||
-        call.status === 'error',
+        call.status === "scheduled" ||
+        call.status === "cancelled" ||
+        call.status === "success" ||
+        call.status === "error",
     );
 
     if (allCallsFinalOrScheduled) {
-      const callsToExecute = this.toolCalls.filter(
-        (call) => call.status === 'scheduled',
-      );
+      const callsToExecute = this.toolCalls.filter((call) => call.status === "scheduled");
 
       for (const toolCall of callsToExecute) {
-        if (toolCall.status !== 'scheduled') continue;
+        if (toolCall.status !== "scheduled") continue;
 
         const scheduledCall = toolCall;
         const { callId, name: toolName } = scheduledCall.request;
         const invocation = scheduledCall.invocation;
-        this.setStatusInternal(callId, 'executing', signal);
+        this.setStatusInternal(callId, "executing", signal);
 
         const liveOutputCallback =
           scheduledCall.tool.canUpdateOutput && this.outputUpdateHandler
@@ -1109,7 +1018,7 @@ export class CoreToolScheduler {
                   this.outputUpdateHandler(callId, outputChunk);
                 }
                 this.toolCalls = this.toolCalls.map((tc) =>
-                  tc.request.callId === callId && tc.status === 'executing'
+                  tc.request.callId === callId && tc.status === "executing"
                     ? { ...tc, liveOutput: outputChunk }
                     : tc,
                 );
@@ -1124,7 +1033,7 @@ export class CoreToolScheduler {
         await runInDevTraceSpan(
           {
             name: toolCall.tool.name,
-            attributes: { type: 'tool-call' },
+            attributes: { type: "tool-call" },
           },
           async ({ metadata: spanMetadata }) => {
             spanMetadata.input = {
@@ -1138,9 +1047,7 @@ export class CoreToolScheduler {
             if (invocation instanceof ShellToolInvocation) {
               const setPidCallback = (pid: number) => {
                 this.toolCalls = this.toolCalls.map((tc) =>
-                  tc.request.callId === callId && tc.status === 'executing'
-                    ? { ...tc, pid }
-                    : tc,
+                  tc.request.callId === callId && tc.status === "executing" ? { ...tc, pid } : tc,
                 );
                 this.notifyToolCallsUpdate();
               };
@@ -1172,25 +1079,23 @@ export class CoreToolScheduler {
               if (signal.aborted) {
                 this.setStatusInternal(
                   callId,
-                  'cancelled',
+                  "cancelled",
                   signal,
-                  'User cancelled tool execution.',
+                  "User cancelled tool execution.",
                 );
               } else if (toolResult.error === undefined) {
                 let content = toolResult.llmContent;
                 let outputFile: string | undefined = undefined;
-                const contentLength =
-                  typeof content === 'string' ? content.length : undefined;
+                const contentLength = typeof content === "string" ? content.length : undefined;
                 if (
-                  typeof content === 'string' &&
+                  typeof content === "string" &&
                   toolName === SHELL_TOOL_NAME &&
                   this.config.getEnableToolOutputTruncation() &&
                   this.config.getTruncateToolOutputThreshold() > 0 &&
                   this.config.getTruncateToolOutputLines() > 0
                 ) {
                   const originalContentLength = content.length;
-                  const threshold =
-                    this.config.getTruncateToolOutputThreshold();
+                  const threshold = this.config.getTruncateToolOutputThreshold();
                   const lines = this.config.getTruncateToolOutputLines();
                   const truncatedResult = await truncateAndSaveToFile(
                     content,
@@ -1205,25 +1110,18 @@ export class CoreToolScheduler {
                   if (outputFile) {
                     logToolOutputTruncated(
                       this.config,
-                      new ToolOutputTruncatedEvent(
-                        scheduledCall.request.prompt_id,
-                        {
-                          toolName,
-                          originalContentLength,
-                          truncatedContentLength: content.length,
-                          threshold,
-                          lines,
-                        },
-                      ),
+                      new ToolOutputTruncatedEvent(scheduledCall.request.prompt_id, {
+                        toolName,
+                        originalContentLength,
+                        truncatedContentLength: content.length,
+                        threshold,
+                        lines,
+                      }),
                     );
                   }
                 }
 
-                const response = convertToFunctionResponse(
-                  toolName,
-                  callId,
-                  content,
-                );
+                const response = convertToFunctionResponse(toolName, callId, content);
                 const successResponse: ToolCallResponseInfo = {
                   callId,
                   responseParts: response,
@@ -1233,12 +1131,7 @@ export class CoreToolScheduler {
                   outputFile,
                   contentLength,
                 };
-                this.setStatusInternal(
-                  callId,
-                  'success',
-                  signal,
-                  successResponse,
-                );
+                this.setStatusInternal(callId, "success", signal, successResponse);
               } else {
                 // It is a failure
                 const error = new Error(toolResult.error.message);
@@ -1247,21 +1140,21 @@ export class CoreToolScheduler {
                   error,
                   toolResult.error.type,
                 );
-                this.setStatusInternal(callId, 'error', signal, errorResponse);
+                this.setStatusInternal(callId, "error", signal, errorResponse);
               }
             } catch (executionError: unknown) {
               spanMetadata.error = executionError;
               if (signal.aborted) {
                 this.setStatusInternal(
                   callId,
-                  'cancelled',
+                  "cancelled",
                   signal,
-                  'User cancelled tool execution.',
+                  "User cancelled tool execution.",
                 );
               } else {
                 this.setStatusInternal(
                   callId,
-                  'error',
+                  "error",
                   signal,
                   createErrorResponse(
                     scheduledCall.request,
@@ -1290,9 +1183,9 @@ export class CoreToolScheduler {
     } else {
       const activeCall = this.toolCalls[0];
       const isTerminal =
-        activeCall.status === 'success' ||
-        activeCall.status === 'error' ||
-        activeCall.status === 'cancelled';
+        activeCall.status === "success" ||
+        activeCall.status === "error" ||
+        activeCall.status === "cancelled";
 
       // If the active tool is not in a terminal state (e.g., it's 'executing' or 'awaiting_approval'),
       // then the scheduler is still busy or paused. We should not proceed.
@@ -1335,9 +1228,7 @@ export class CoreToolScheduler {
       // After completion of the entire batch, process the next item in the main request queue.
       if (this.requestQueue.length > 0) {
         const next = this.requestQueue.shift()!;
-        this._schedule(next.request, next.signal)
-          .then(next.resolve)
-          .catch(next.reject);
+        this._schedule(next.request, next.signal).then(next.resolve).catch(next.reject);
       }
     } else {
       // The batch is not yet complete, so continue processing the current batch sequence.
@@ -1349,21 +1240,20 @@ export class CoreToolScheduler {
     while (this.toolCallQueue.length > 0) {
       const queuedCall = this.toolCallQueue.shift()!;
       // Don't cancel tools that already errored during validation.
-      if (queuedCall.status === 'error') {
+      if (queuedCall.status === "error") {
         this.completedToolCallsForBatch.push(queuedCall);
         continue;
       }
       const durationMs =
-        'startTime' in queuedCall && queuedCall.startTime
+        "startTime" in queuedCall && queuedCall.startTime
           ? Date.now() - queuedCall.startTime
           : undefined;
-      const errorMessage =
-        '[Operation Cancelled] User cancelled the operation.';
+      const errorMessage = "[Operation Cancelled] User cancelled the operation.";
       this.completedToolCallsForBatch.push({
         request: queuedCall.request,
         tool: queuedCall.tool,
         invocation: queuedCall.invocation,
-        status: 'cancelled',
+        status: "cancelled",
         response: {
           callId: queuedCall.request.callId,
           responseParts: [
@@ -1415,7 +1305,7 @@ export class CoreToolScheduler {
 
     const allowedTools = this.config.getAllowedTools() || [];
     const { tool, invocation } = toolCall;
-    const toolName = typeof tool === 'string' ? tool : tool.name;
+    const toolName = typeof tool === "string" ? tool : tool.name;
 
     if (SHELL_TOOL_NAMES.includes(toolName)) {
       return isShellInvocationAllowlisted(invocation, allowedTools);
diff --git a/packages/gemini-cli-core/src/core/fakeContentGenerator.test.ts b/packages/gemini-cli-core/src/core/fakeContentGenerator.test.ts
index de8306e51..dbd381795 100644
--- a/packages/gemini-cli-core/src/core/fakeContentGenerator.test.ts
+++ b/packages/gemini-cli-core/src/core/fakeContentGenerator.test.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { promises } from "node:fs";
 import {
-  FakeContentGenerator,
-  type FakeResponse,
-} from './fakeContentGenerator.js';
-import { promises } from 'node:fs';
-import {
-  GenerateContentResponse,
+  type CountTokensParameters,
   type CountTokensResponse,
+  type EmbedContentParameters,
   type EmbedContentResponse,
   type GenerateContentParameters,
-  type CountTokensParameters,
-  type EmbedContentParameters,
-} from '@google/genai';
+  GenerateContentResponse,
+} from "@google/genai";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { FakeContentGenerator, type FakeResponse } from "./fakeContentGenerator.js";
 
-vi.mock('node:fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:fs')>();
+vi.mock("node:fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:fs")>();
   return {
     ...actual,
     promises: {
@@ -32,39 +29,33 @@ vi.mock('node:fs', async (importOriginal) => {
 
 const mockReadFile = vi.mocked(promises.readFile);
 
-describe('FakeContentGenerator', () => {
+describe("FakeContentGenerator", () => {
   const fakeGenerateContentResponse: FakeResponse = {
-    method: 'generateContent',
+    method: "generateContent",
     response: {
-      candidates: [
-        { content: { parts: [{ text: 'response1' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response1" }], role: "model" } }],
     } as GenerateContentResponse,
   };
 
   const fakeGenerateContentStreamResponse: FakeResponse = {
-    method: 'generateContentStream',
+    method: "generateContentStream",
     response: [
       {
-        candidates: [
-          { content: { parts: [{ text: 'chunk1' }], role: 'model' } },
-        ],
+        candidates: [{ content: { parts: [{ text: "chunk1" }], role: "model" } }],
       },
       {
-        candidates: [
-          { content: { parts: [{ text: 'chunk2' }], role: 'model' } },
-        ],
+        candidates: [{ content: { parts: [{ text: "chunk2" }], role: "model" } }],
       },
     ] as GenerateContentResponse[],
   };
 
   const fakeCountTokensResponse: FakeResponse = {
-    method: 'countTokens',
+    method: "countTokens",
     response: { totalTokens: 10 } as CountTokensResponse,
   };
 
   const fakeEmbedContentResponse: FakeResponse = {
-    method: 'embedContent',
+    method: "embedContent",
     response: {
       embeddings: [{ values: [1, 2, 3] }],
     } as EmbedContentResponse,
@@ -74,24 +65,16 @@ describe('FakeContentGenerator', () => {
     vi.resetAllMocks();
   });
 
-  it('should return responses for generateContent', async () => {
+  it("should return responses for generateContent", async () => {
     const generator = new FakeContentGenerator([fakeGenerateContentResponse]);
-    const response = await generator.generateContent(
-      {} as GenerateContentParameters,
-      'id',
-    );
+    const response = await generator.generateContent({} as GenerateContentParameters, "id");
     expect(response).instanceOf(GenerateContentResponse);
     expect(response).toEqual(fakeGenerateContentResponse.response);
   });
 
-  it('should return responses for generateContentStream', async () => {
-    const generator = new FakeContentGenerator([
-      fakeGenerateContentStreamResponse,
-    ]);
-    const stream = await generator.generateContentStream(
-      {} as GenerateContentParameters,
-      'id',
-    );
+  it("should return responses for generateContentStream", async () => {
+    const generator = new FakeContentGenerator([fakeGenerateContentStreamResponse]);
+    const stream = await generator.generateContentStream({} as GenerateContentParameters, "id");
     const responses = [];
     for await (const response of stream) {
       expect(response).instanceOf(GenerateContentResponse);
@@ -100,19 +83,19 @@ describe('FakeContentGenerator', () => {
     expect(responses).toEqual(fakeGenerateContentStreamResponse.response);
   });
 
-  it('should return responses for countTokens', async () => {
+  it("should return responses for countTokens", async () => {
     const generator = new FakeContentGenerator([fakeCountTokensResponse]);
     const response = await generator.countTokens({} as CountTokensParameters);
     expect(response).toEqual(fakeCountTokensResponse.response);
   });
 
-  it('should return responses for embedContent', async () => {
+  it("should return responses for embedContent", async () => {
     const generator = new FakeContentGenerator([fakeEmbedContentResponse]);
     const response = await generator.embedContent({} as EmbedContentParameters);
     expect(response).toEqual(fakeEmbedContentResponse.response);
   });
 
-  it('should handle a mixture of calls', async () => {
+  it("should handle a mixture of calls", async () => {
     const fakeResponses = [
       fakeGenerateContentResponse,
       fakeGenerateContentStreamResponse,
@@ -121,8 +104,8 @@ describe('FakeContentGenerator', () => {
     ];
     const generator = new FakeContentGenerator(fakeResponses);
     for (const fakeResponse of fakeResponses) {
-      const response = await generator[fakeResponse.method]({} as never, '');
-      if (fakeResponse.method === 'generateContentStream') {
+      const response = await generator[fakeResponse.method]({} as never, "");
+      if (fakeResponse.method === "generateContentStream") {
         const responses = [];
         for await (const item of response as AsyncGenerator<GenerateContentResponse>) {
           expect(item).instanceOf(GenerateContentResponse);
@@ -135,33 +118,30 @@ describe('FakeContentGenerator', () => {
     }
   });
 
-  it('should throw error when no more responses', async () => {
+  it("should throw error when no more responses", async () => {
     const generator = new FakeContentGenerator([fakeGenerateContentResponse]);
-    await generator.generateContent({} as GenerateContentParameters, 'id');
-    await expect(
-      generator.embedContent({} as EmbedContentParameters),
-    ).rejects.toThrowError('No more mock responses for embedContent');
-    await expect(
-      generator.countTokens({} as CountTokensParameters),
-    ).rejects.toThrowError('No more mock responses for countTokens');
+    await generator.generateContent({} as GenerateContentParameters, "id");
+    await expect(generator.embedContent({} as EmbedContentParameters)).rejects.toThrowError(
+      "No more mock responses for embedContent",
+    );
+    await expect(generator.countTokens({} as CountTokensParameters)).rejects.toThrowError(
+      "No more mock responses for countTokens",
+    );
     await expect(
-      generator.generateContentStream({} as GenerateContentParameters, 'id'),
-    ).rejects.toThrow('No more mock responses for generateContentStream');
+      generator.generateContentStream({} as GenerateContentParameters, "id"),
+    ).rejects.toThrow("No more mock responses for generateContentStream");
     await expect(
-      generator.generateContent({} as GenerateContentParameters, 'id'),
-    ).rejects.toThrowError('No more mock responses for generateContent');
+      generator.generateContent({} as GenerateContentParameters, "id"),
+    ).rejects.toThrowError("No more mock responses for generateContent");
   });
 
-  describe('fromFile', () => {
-    it('should create a generator from a file', async () => {
-      const fileContent = JSON.stringify(fakeGenerateContentResponse) + '\n';
+  describe("fromFile", () => {
+    it("should create a generator from a file", async () => {
+      const fileContent = JSON.stringify(fakeGenerateContentResponse) + "\n";
       mockReadFile.mockResolvedValue(fileContent);
 
-      const generator = await FakeContentGenerator.fromFile('fake-path.json');
-      const response = await generator.generateContent(
-        {} as GenerateContentParameters,
-        'id',
-      );
+      const generator = await FakeContentGenerator.fromFile("fake-path.json");
+      const response = await generator.generateContent({} as GenerateContentParameters, "id");
       expect(response).toEqual(fakeGenerateContentResponse.response);
     });
   });
diff --git a/packages/gemini-cli-core/src/core/fakeContentGenerator.ts b/packages/gemini-cli-core/src/core/fakeContentGenerator.ts
index a464c4f8f..61d525c8c 100644
--- a/packages/gemini-cli-core/src/core/fakeContentGenerator.ts
+++ b/packages/gemini-cli-core/src/core/fakeContentGenerator.ts
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { promises } from "node:fs";
 import {
-  GenerateContentResponse,
-  type CountTokensResponse,
-  type GenerateContentParameters,
   type CountTokensParameters,
-  EmbedContentResponse,
+  type CountTokensResponse,
   type EmbedContentParameters,
-} from '@google/genai';
-import { promises } from 'node:fs';
-import type { ContentGenerator } from './contentGenerator.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+  EmbedContentResponse,
+  type GenerateContentParameters,
+  GenerateContentResponse,
+} from "@google/genai";
+import type { UserTierId } from "../code_assist/types.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 
 export type FakeResponse =
   | {
-      method: 'generateContent';
+      method: "generateContent";
       response: GenerateContentResponse;
     }
   | {
-      method: 'generateContentStream';
+      method: "generateContentStream";
       response: GenerateContentResponse[];
     }
   | {
-      method: 'countTokens';
+      method: "countTokens";
       response: CountTokensResponse;
     }
   | {
-      method: 'embedContent';
+      method: "embedContent";
       response: EmbedContentResponse;
     };
 
@@ -46,23 +46,22 @@ export class FakeContentGenerator implements ContentGenerator {
   constructor(private readonly responses: FakeResponse[]) {}
 
   static async fromFile(filePath: string): Promise<FakeContentGenerator> {
-    const fileContent = await promises.readFile(filePath, 'utf-8');
+    const fileContent = await promises.readFile(filePath, "utf-8");
     const responses = fileContent
-      .split('\n')
-      .filter((line) => line.trim() !== '')
+      .split("\n")
+      .filter((line) => line.trim() !== "")
       .map((line) => JSON.parse(line) as FakeResponse);
     return new FakeContentGenerator(responses);
   }
 
   private getNextResponse<
-    M extends FakeResponse['method'],
-    R = Extract<FakeResponse, { method: M }>['response'],
+    M extends FakeResponse["method"],
+    R = Extract<FakeResponse, { method: M }>["response"],
   >(method: M, request: unknown): R {
     const response = this.responses[this.callCounter++];
     if (!response) {
       throw new Error(
-        `No more mock responses for ${method}, got request:\n` +
-          safeJsonStringify(request),
+        `No more mock responses for ${method}, got request:\n` + safeJsonStringify(request),
       );
     }
     if (response.method !== method) {
@@ -78,7 +77,7 @@ export class FakeContentGenerator implements ContentGenerator {
     _userPromptId: string,
   ): Promise<GenerateContentResponse> {
     return Object.setPrototypeOf(
-      this.getNextResponse('generateContent', request),
+      this.getNextResponse("generateContent", request),
       GenerateContentResponse.prototype,
     );
   }
@@ -87,29 +86,22 @@ export class FakeContentGenerator implements ContentGenerator {
     request: GenerateContentParameters,
     _userPromptId: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
-    const responses = this.getNextResponse('generateContentStream', request);
+    const responses = this.getNextResponse("generateContentStream", request);
     async function* stream() {
       for (const response of responses) {
-        yield Object.setPrototypeOf(
-          response,
-          GenerateContentResponse.prototype,
-        );
+        yield Object.setPrototypeOf(response, GenerateContentResponse.prototype);
       }
     }
     return stream();
   }
 
-  async countTokens(
-    request: CountTokensParameters,
-  ): Promise<CountTokensResponse> {
-    return this.getNextResponse('countTokens', request);
+  async countTokens(request: CountTokensParameters): Promise<CountTokensResponse> {
+    return this.getNextResponse("countTokens", request);
   }
 
-  async embedContent(
-    request: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse> {
     return Object.setPrototypeOf(
-      this.getNextResponse('embedContent', request),
+      this.getNextResponse("embedContent", request),
       EmbedContentResponse.prototype,
     );
   }
diff --git a/packages/gemini-cli-core/src/core/geminiChat.test.ts b/packages/gemini-cli-core/src/core/geminiChat.test.ts
index 7afdd00ec..b243067a2 100644
--- a/packages/gemini-cli-core/src/core/geminiChat.test.ts
+++ b/packages/gemini-cli-core/src/core/geminiChat.test.ts
@@ -4,40 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Content, GenerateContentResponse } from '@google/genai';
-import { ApiError, ThinkingLevel } from '@google/genai';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import {
-  GeminiChat,
-  InvalidStreamError,
-  StreamEventType,
-  SYNTHETIC_THOUGHT_SIGNATURE,
-  type StreamEvent,
-} from './geminiChat.js';
-import type { Config } from '../config/config.js';
-import { setSimulate429 } from '../utils/testUtils.js';
+import type { Content, GenerateContentResponse } from "@google/genai";
+import { ApiError, ThinkingLevel } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ModelAvailabilityService } from "../availability/modelAvailabilityService.js";
+import * as policyHelpers from "../availability/policyHelpers.js";
+import { createAvailabilityServiceMock } from "../availability/testUtils.js";
+import type { Config } from "../config/config.js";
 import {
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   DEFAULT_THINKING_MODE,
   PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
-import { AuthType } from './contentGenerator.js';
-import { TerminalQuotaError } from '../utils/googleQuotaErrors.js';
-import { retryWithBackoff, type RetryOptions } from '../utils/retry.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-import { HookSystem } from '../hooks/hookSystem.js';
-import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
-import { createAvailabilityServiceMock } from '../availability/testUtils.js';
-import type { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
-import * as policyHelpers from '../availability/policyHelpers.js';
-import { makeResolvedModelConfig } from '../services/modelConfigServiceTestUtils.js';
+} from "../config/models.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { HookSystem } from "../hooks/hookSystem.js";
+import { makeResolvedModelConfig } from "../services/modelConfigServiceTestUtils.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import { createMockMessageBus } from "../test-utils/mock-message-bus.js";
+import { TerminalQuotaError } from "../utils/googleQuotaErrors.js";
+import { type RetryOptions, retryWithBackoff } from "../utils/retry.js";
+import { setSimulate429 } from "../utils/testUtils.js";
+import { AuthType } from "./contentGenerator.js";
+import {
+  GeminiChat,
+  InvalidStreamError,
+  type StreamEvent,
+  StreamEventType,
+  SYNTHETIC_THOUGHT_SIGNATURE,
+} from "./geminiChat.js";
 
 // Mock fs module to prevent actual file system operations during tests
 const mockFileSystem = new Map<string, string>();
 
-vi.mock('node:fs', () => {
+vi.mock("node:fs", () => {
   const fsModule = {
     mkdirSync: vi.fn(),
     writeFileSync: vi.fn((path: string, data: string) => {
@@ -47,8 +47,8 @@ vi.mock('node:fs', () => {
       if (mockFileSystem.has(path)) {
         return mockFileSystem.get(path);
       }
-      throw Object.assign(new Error('ENOENT: no such file or directory'), {
-        code: 'ENOENT',
+      throw Object.assign(new Error("ENOENT: no such file or directory"), {
+        code: "ENOENT",
       });
     }),
     existsSync: vi.fn((path: string) => mockFileSystem.has(path)),
@@ -73,15 +73,15 @@ const { mockRetryWithBackoff } = vi.hoisted(() => ({
   mockRetryWithBackoff: vi.fn(),
 }));
 
-vi.mock('../utils/retry.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../utils/retry.js')>();
+vi.mock("../utils/retry.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/retry.js")>();
   return {
     ...actual,
     retryWithBackoff: mockRetryWithBackoff,
   };
 });
 
-vi.mock('../fallback/handler.js', () => ({
+vi.mock("../fallback/handler.js", () => ({
   handleFallback: mockHandleFallback,
 }));
 
@@ -90,18 +90,18 @@ const { mockLogContentRetry, mockLogContentRetryFailure } = vi.hoisted(() => ({
   mockLogContentRetryFailure: vi.fn(),
 }));
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logContentRetry: mockLogContentRetry,
   logContentRetryFailure: mockLogContentRetryFailure,
 }));
 
-vi.mock('../telemetry/uiTelemetry.js', () => ({
+vi.mock("../telemetry/uiTelemetry.js", () => ({
   uiTelemetryService: {
     setLastPromptTokenCount: vi.fn(),
   },
 }));
 
-describe('GeminiChat', () => {
+describe("GeminiChat", () => {
   let mockContentGenerator: ContentGenerator;
   let chat: GeminiChat;
   let mockConfig: Config;
@@ -128,24 +128,24 @@ describe('GeminiChat', () => {
       return result;
     });
     mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryLogPromptsEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
       getDebugMode: () => false,
       getPreviewFeatures: () => false,
       getContentGeneratorConfig: vi.fn().mockReturnValue({
-        authType: 'oauth-personal', // Ensure this is set for fallback tests
-        model: 'test-model',
+        authType: "oauth-personal", // Ensure this is set for fallback tests
+        model: "test-model",
       }),
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       setModel: vi.fn(),
       isInFallbackMode: vi.fn().mockReturnValue(false),
       getQuotaErrorOccurred: vi.fn().mockReturnValue(false),
       setQuotaErrorOccurred: vi.fn(),
       flashFallbackHandler: undefined,
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/temp"),
       },
       getToolRegistry: vi.fn().mockReturnValue({
         getTool: vi.fn(),
@@ -155,7 +155,7 @@ describe('GeminiChat', () => {
       getUserTier: vi.fn().mockReturnValue(undefined),
       modelConfigService: {
         getResolvedConfig: vi.fn().mockImplementation((modelConfigKey) => {
-          const thinkingConfig = modelConfigKey.model.startsWith('gemini-3')
+          const thinkingConfig = modelConfigKey.model.startsWith("gemini-3")
             ? {
                 thinkingLevel: ThinkingLevel.HIGH,
               }
@@ -178,7 +178,7 @@ describe('GeminiChat', () => {
       isInteractive: vi.fn().mockReturnValue(false),
       getEnableHooks: vi.fn().mockReturnValue(false),
       isModelAvailabilityServiceEnabled: vi.fn().mockReturnValue(false),
-      getActiveModel: vi.fn().mockReturnValue('gemini-pro'),
+      getActiveModel: vi.fn().mockReturnValue("gemini-pro"),
       setActiveModel: vi.fn(),
       getModelAvailabilityService: vi.fn(),
     } as unknown as Config;
@@ -191,9 +191,7 @@ describe('GeminiChat', () => {
     setSimulate429(false);
     // Reset history for each test by creating a new instance
     chat = new GeminiChat(mockConfig);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
   });
 
   afterEach(() => {
@@ -201,35 +199,35 @@ describe('GeminiChat', () => {
     vi.resetAllMocks();
   });
 
-  describe('constructor', () => {
-    it('should initialize lastPromptTokenCount based on history size', () => {
+  describe("constructor", () => {
+    it("should initialize lastPromptTokenCount based on history size", () => {
       const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        { role: 'model', parts: [{ text: 'Hi there' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
+        { role: "model", parts: [{ text: "Hi there" }] },
       ];
-      const chatWithHistory = new GeminiChat(mockConfig, '', [], history);
+      const chatWithHistory = new GeminiChat(mockConfig, "", [], history);
       // 'Hello': 5 chars * 0.25 = 1.25
       // 'Hi there': 8 chars * 0.25 = 2.0
       // Total: 3.25 -> floor(3.25) = 3
       expect(chatWithHistory.getLastPromptTokenCount()).toBe(3);
     });
 
-    it('should initialize lastPromptTokenCount for empty history', () => {
+    it("should initialize lastPromptTokenCount for empty history", () => {
       const chatEmpty = new GeminiChat(mockConfig);
       expect(chatEmpty.getLastPromptTokenCount()).toBe(0);
     });
   });
 
-  describe('sendMessageStream', () => {
-    it('should succeed if a tool call is followed by an empty part', async () => {
+  describe("sendMessageStream", () => {
+    it("should succeed if a tool call is followed by an empty part", async () => {
       // 1. Mock a stream that contains a tool call, then an invalid (empty) part.
       const streamWithToolCall = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ functionCall: { name: 'test_tool', args: {} } }],
+                role: "model",
+                parts: [{ functionCall: { name: "test_tool", args: {} } }],
               },
             },
           ],
@@ -239,24 +237,22 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: '' }],
+                role: "model",
+                parts: [{ text: "" }],
               },
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithToolCall,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithToolCall);
 
       // 2. Action & Assert: The stream processing should complete without throwing an error
       // because the presence of a tool call makes the empty final chunk acceptable.
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-tool-call-empty-end',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-tool-call-empty-end",
         new AbortController().signal,
       );
       await expect(
@@ -272,18 +268,18 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2); // user turn + model turn
       const modelTurn = history[1]!;
       expect(modelTurn?.parts?.length).toBe(1); // The empty part is discarded
-      expect(modelTurn?.parts![0]!.functionCall).toBeDefined();
+      expect(modelTurn!.parts![0]!.functionCall).toBeDefined();
     });
 
-    it('should fail if the stream ends with an empty part and has no finishReason', async () => {
+    it("should fail if the stream ends with an empty part and has no finishReason", async () => {
       // 1. Mock a stream that ends with an invalid part and has no finish reason.
       const streamWithNoFinish = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'Initial content...' }],
+                role: "model",
+                parts: [{ text: "Initial content..." }],
               },
             },
           ],
@@ -293,23 +289,21 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: '' }],
+                role: "model",
+                parts: [{ text: "" }],
               },
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithNoFinish,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithNoFinish);
 
       // 2. Action & Assert: The stream should fail because there's no finish reason.
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test message',
-        'prompt-id-no-finish-empty-end',
+        { model: "gemini-2.0-flash" },
+        "test message",
+        "prompt-id-no-finish-empty-end",
         new AbortController().signal,
       );
       await expect(
@@ -321,15 +315,15 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should succeed if the stream ends with an invalid part but has a finishReason and contained a valid part', async () => {
+    it("should succeed if the stream ends with an invalid part but has a finishReason and contained a valid part", async () => {
       // 1. Mock a stream that sends a valid chunk, then an invalid one, but has a finish reason.
       const streamWithInvalidEnd = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'Initial valid content...' }],
+                role: "model",
+                parts: [{ text: "Initial valid content..." }],
               },
             },
           ],
@@ -339,24 +333,22 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: '' }], // Invalid part
+                role: "model",
+                parts: [{ text: "" }], // Invalid part
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithInvalidEnd,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithInvalidEnd);
 
       // 2. Action & Assert: The stream should complete without throwing an error.
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-valid-then-invalid-end',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-valid-then-invalid-end",
         new AbortController().signal,
       );
       await expect(
@@ -372,16 +364,14 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2); // user turn + model turn
       const modelTurn = history[1]!;
       expect(modelTurn?.parts?.length).toBe(1);
-      expect(modelTurn?.parts![0]!.text).toBe('Initial valid content...');
+      expect(modelTurn!.parts![0]!.text).toBe("Initial valid content...");
     });
 
-    it('should consolidate subsequent text chunks after receiving an empty text chunk', async () => {
+    it("should consolidate subsequent text chunks after receiving an empty text chunk", async () => {
       // 1. Mock the API to return a stream where one chunk is just an empty text part.
       const multiChunkStream = (async function* () {
         yield {
-          candidates: [
-            { content: { role: 'model', parts: [{ text: 'Hello' }] } },
-          ],
+          candidates: [{ content: { role: "model", parts: [{ text: "Hello" }] } }],
         } as unknown as GenerateContentResponse;
         // FIX: The original test used { text: '' }, which is invalid.
         // A chunk can be empty but still valid. This chunk is now removed
@@ -389,22 +379,20 @@ describe('GeminiChat', () => {
         yield {
           candidates: [
             {
-              content: { role: 'model', parts: [{ text: ' World!' }] },
-              finishReason: 'STOP',
+              content: { role: "model", parts: [{ text: " World!" }] },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        multiChunkStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(multiChunkStream);
 
       // 2. Action: Send a message and consume the stream.
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-empty-chunk-consolidation',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-empty-chunk-consolidation",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -416,29 +404,25 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2);
       const modelTurn = history[1]!;
       expect(modelTurn?.parts?.length).toBe(1);
-      expect(modelTurn?.parts![0]!.text).toBe('Hello World!');
+      expect(modelTurn!.parts![0]!.text).toBe("Hello World!");
     });
 
-    it('should consolidate adjacent text parts that arrive in separate stream chunks', async () => {
+    it("should consolidate adjacent text parts that arrive in separate stream chunks", async () => {
       // 1. Mock the API to return a stream of multiple, adjacent text chunks.
       const multiChunkStream = (async function* () {
         yield {
-          candidates: [
-            { content: { role: 'model', parts: [{ text: 'This is the ' }] } },
-          ],
+          candidates: [{ content: { role: "model", parts: [{ text: "This is the " }] } }],
         } as unknown as GenerateContentResponse;
         yield {
-          candidates: [
-            { content: { role: 'model', parts: [{ text: 'first part.' }] } },
-          ],
+          candidates: [{ content: { role: "model", parts: [{ text: "first part." }] } }],
         } as unknown as GenerateContentResponse;
         // This function call should break the consolidation.
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ functionCall: { name: 'do_stuff', args: {} } }],
+                role: "model",
+                parts: [{ functionCall: { name: "do_stuff", args: {} } }],
               },
             },
           ],
@@ -447,23 +431,21 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'This is the second part.' }],
+                role: "model",
+                parts: [{ text: "This is the second part." }],
               },
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        multiChunkStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(multiChunkStream);
 
       // 2. Action: Send a message and consume the stream.
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-multi-chunk',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-multi-chunk",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -477,42 +459,40 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2);
 
       const modelTurn = history[1]!;
-      expect(modelTurn.role).toBe('model');
+      expect(modelTurn.role).toBe("model");
 
       // The model turn should have 3 distinct parts: the merged text, the function call, and the final text.
       expect(modelTurn?.parts?.length).toBe(3);
-      expect(modelTurn?.parts![0]!.text).toBe('This is the first part.');
+      expect(modelTurn!.parts![0]!.text).toBe("This is the first part.");
       expect(modelTurn.parts![1]!.functionCall).toBeDefined();
-      expect(modelTurn.parts![2]!.text).toBe('This is the second part.');
+      expect(modelTurn.parts![2]!.text).toBe("This is the second part.");
     });
-    it('should preserve text parts that stream in the same chunk as a thought', async () => {
+    it("should preserve text parts that stream in the same chunk as a thought", async () => {
       // 1. Mock the API to return a single chunk containing both a thought and visible text.
       const mixedContentStream = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
+                role: "model",
                 parts: [
-                  { thought: 'This is a thought.' },
-                  { text: 'This is the visible text that should not be lost.' },
+                  { thought: "This is a thought." },
+                  { text: "This is the visible text that should not be lost." },
                 ],
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        mixedContentStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(mixedContentStream);
 
       // 2. Action: Send a message and fully consume the stream to trigger history recording.
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-mixed-chunk',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-mixed-chunk",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -526,26 +506,24 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2);
 
       const modelTurn = history[1]!;
-      expect(modelTurn.role).toBe('model');
+      expect(modelTurn.role).toBe("model");
 
       // CRUCIAL ASSERTION:
       // The buggy code would fail here, resulting in parts.length being 0.
       // The corrected code will pass, preserving the single visible text part.
       expect(modelTurn?.parts?.length).toBe(1);
-      expect(modelTurn?.parts![0]!.text).toBe(
-        'This is the visible text that should not be lost.',
-      );
+      expect(modelTurn!.parts![0]!.text).toBe("This is the visible text that should not be lost.");
     });
 
-    it('should use maxAttempts=1 for retryWithBackoff when in Preview Model Fallback Mode', async () => {
+    it("should use maxAttempts=1 for retryWithBackoff when in Preview Model Fallback Mode", async () => {
       vi.mocked(mockConfig.isPreviewModelFallbackMode).mockReturnValue(true);
       vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
         (async function* () {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Success' }] },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Success" }] },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -554,8 +532,8 @@ describe('GeminiChat', () => {
 
       const stream = await chat.sendMessageStream(
         { model: PREVIEW_GEMINI_MODEL },
-        'test',
-        'prompt-id-fast-retry',
+        "test",
+        "prompt-id-fast-retry",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -570,15 +548,15 @@ describe('GeminiChat', () => {
       );
     });
 
-    it('should NOT use maxAttempts=1 for other models even in Preview Model Fallback Mode', async () => {
+    it("should NOT use maxAttempts=1 for other models even in Preview Model Fallback Mode", async () => {
       vi.mocked(mockConfig.isPreviewModelFallbackMode).mockReturnValue(true);
       vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
         (async function* () {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Success' }] },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Success" }] },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -587,8 +565,8 @@ describe('GeminiChat', () => {
 
       const stream = await chat.sendMessageStream(
         { model: DEFAULT_GEMINI_FLASH_MODEL },
-        'test',
-        'prompt-id-normal-retry',
+        "test",
+        "prompt-id-normal-retry",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -603,29 +581,27 @@ describe('GeminiChat', () => {
       );
     });
 
-    it('should pass DEFAULT_GEMINI_MODEL to handleFallback when Preview Model is bypassed (downgraded)', async () => {
+    it("should pass DEFAULT_GEMINI_MODEL to handleFallback when Preview Model is bypassed (downgraded)", async () => {
       // ARRANGE
       vi.mocked(mockConfig.isPreviewModelBypassMode).mockReturnValue(true);
       // Mock retryWithBackoff to simulate catching the error and calling onPersistent429
-      vi.mocked(retryWithBackoff).mockImplementation(
-        async (apiCall, options) => {
-          const onPersistent429 = options?.onPersistent429;
-          try {
-            await apiCall();
-          } catch (error) {
-            if (onPersistent429) {
-              await onPersistent429(AuthType.LOGIN_WITH_GOOGLE, error);
-            }
-            throw error;
+      vi.mocked(retryWithBackoff).mockImplementation(async (apiCall, options) => {
+        const onPersistent429 = options?.onPersistent429;
+        try {
+          await apiCall();
+        } catch (error) {
+          if (onPersistent429) {
+            await onPersistent429(AuthType.LOGIN_WITH_GOOGLE, error);
           }
-        },
-      );
+          throw error;
+        }
+      });
 
       // We need the API call to fail so retryWithBackoff calls the callback.
       vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(
-        new TerminalQuotaError('Simulated Quota Error', {
+        new TerminalQuotaError("Simulated Quota Error", {
           code: 429,
-          message: 'Simulated Quota Error',
+          message: "Simulated Quota Error",
           details: [],
         }),
       );
@@ -634,8 +610,8 @@ describe('GeminiChat', () => {
       const consumeStream = async () => {
         const stream = await chat.sendMessageStream(
           { model: PREVIEW_GEMINI_MODEL },
-          'test',
-          'prompt-id-bypass',
+          "test",
+          "prompt-id-bypass",
           new AbortController().signal,
         );
         // Consume the stream to trigger execution
@@ -644,7 +620,7 @@ describe('GeminiChat', () => {
         }
       };
 
-      await expect(consumeStream()).rejects.toThrow('Simulated Quota Error');
+      await expect(consumeStream()).rejects.toThrow("Simulated Quota Error");
 
       expect(retryWithBackoff).toHaveBeenCalled();
 
@@ -659,20 +635,20 @@ describe('GeminiChat', () => {
       );
     });
 
-    it('should throw an error when a tool call is followed by an empty stream response', async () => {
+    it("should throw an error when a tool call is followed by an empty stream response", async () => {
       // 1. Setup: A history where the model has just made a function call.
       const initialHistory: Content[] = [
         {
-          role: 'user',
-          parts: [{ text: 'Find a good Italian restaurant for me.' }],
+          role: "user",
+          parts: [{ text: "Find a good Italian restaurant for me." }],
         },
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
               functionCall: {
-                name: 'find_restaurant',
-                args: { cuisine: 'Italian' },
+                name: "find_restaurant",
+                args: { cuisine: "Italian" },
               },
             },
           ],
@@ -684,26 +660,24 @@ describe('GeminiChat', () => {
         yield {
           candidates: [
             {
-              content: { role: 'model', parts: [{ thought: true }] },
-              finishReason: 'STOP',
+              content: { role: "model", parts: [{ thought: true }] },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        emptyStreamResponse,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(emptyStreamResponse);
 
       // 3. Action: Send the function response back to the model and consume the stream.
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
+        { model: "gemini-2.0-flash" },
         {
           functionResponse: {
-            name: 'find_restaurant',
-            response: { name: 'Vesuvio' },
+            name: "find_restaurant",
+            response: { name: "Vesuvio" },
           },
         },
-        'prompt-id-stream-1',
+        "prompt-id-stream-1",
         new AbortController().signal,
       );
 
@@ -717,19 +691,19 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should succeed when there is a tool call without finish reason', async () => {
+    it("should succeed when there is a tool call without finish reason", async () => {
       // Setup: Stream with tool call but no finish reason
       const streamWithToolCall = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
+                role: "model",
                 parts: [
                   {
                     functionCall: {
-                      name: 'test_function',
-                      args: { param: 'value' },
+                      name: "test_function",
+                      args: { param: "value" },
                     },
                   },
                 ],
@@ -740,14 +714,12 @@ describe('GeminiChat', () => {
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithToolCall,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithToolCall);
 
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-1',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-1",
         new AbortController().signal,
       );
 
@@ -761,15 +733,15 @@ describe('GeminiChat', () => {
       ).resolves.not.toThrow();
     });
 
-    it('should throw InvalidStreamError when no tool call and no finish reason', async () => {
+    it("should throw InvalidStreamError when no tool call and no finish reason", async () => {
       // Setup: Stream with text but no finish reason and no tool call
       const streamWithoutFinishReason = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'some response' }],
+                role: "model",
+                parts: [{ text: "some response" }],
               },
               // No finishReason
             },
@@ -782,9 +754,9 @@ describe('GeminiChat', () => {
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test message',
-        'prompt-id-1',
+        { model: "gemini-2.0-flash" },
+        "test message",
+        "prompt-id-1",
         new AbortController().signal,
       );
 
@@ -797,17 +769,17 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should throw InvalidStreamError when no tool call and empty response text', async () => {
+    it("should throw InvalidStreamError when no tool call and empty response text", async () => {
       // Setup: Stream with finish reason but empty response (only thoughts)
       const streamWithEmptyResponse = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ thought: 'thinking...' }],
+                role: "model",
+                parts: [{ thought: "thinking..." }],
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
@@ -818,9 +790,9 @@ describe('GeminiChat', () => {
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test message',
-        'prompt-id-1',
+        { model: "gemini-2.0-flash" },
+        "test message",
+        "prompt-id-1",
         new AbortController().signal,
       );
 
@@ -833,30 +805,28 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should succeed when there is finish reason and response text', async () => {
+    it("should succeed when there is finish reason and response text", async () => {
       // Setup: Stream with both finish reason and text content
       const validStream = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'valid response' }],
+                role: "model",
+                parts: [{ text: "valid response" }],
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        validStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(validStream);
 
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-1',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-1",
         new AbortController().signal,
       );
 
@@ -870,17 +840,17 @@ describe('GeminiChat', () => {
       ).resolves.not.toThrow();
     });
 
-    it('should throw InvalidStreamError when finishReason is MALFORMED_FUNCTION_CALL', async () => {
+    it("should throw InvalidStreamError when finishReason is MALFORMED_FUNCTION_CALL", async () => {
       // Setup: Stream with MALFORMED_FUNCTION_CALL finish reason and empty response
       const streamWithMalformedFunctionCall = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
+                role: "model",
                 parts: [], // Empty parts
               },
-              finishReason: 'MALFORMED_FUNCTION_CALL',
+              finishReason: "MALFORMED_FUNCTION_CALL",
             },
           ],
         } as unknown as GenerateContentResponse;
@@ -891,9 +861,9 @@ describe('GeminiChat', () => {
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.5-pro' },
-        'test',
-        'prompt-id-malformed',
+        { model: "gemini-2.5-pro" },
+        "test",
+        "prompt-id-malformed",
         new AbortController().signal,
       );
 
@@ -907,7 +877,7 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should retry when finishReason is MALFORMED_FUNCTION_CALL', async () => {
+    it("should retry when finishReason is MALFORMED_FUNCTION_CALL", async () => {
       // 1. Mock the API to fail once with MALFORMED_FUNCTION_CALL, then succeed.
       vi.mocked(mockContentGenerator.generateContentStream)
         .mockImplementationOnce(async () =>
@@ -915,8 +885,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [], role: 'model' },
-                  finishReason: 'MALFORMED_FUNCTION_CALL',
+                  content: { parts: [], role: "model" },
+                  finishReason: "MALFORMED_FUNCTION_CALL",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -928,8 +898,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Success after retry' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Success after retry" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -938,9 +908,9 @@ describe('GeminiChat', () => {
 
       // 2. Send a message
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.5-pro' },
-        'test retry',
-        'prompt-id-retry-malformed',
+        { model: "gemini-2.5-pro" },
+        "test retry",
+        "prompt-id-retry-malformed",
         new AbortController().signal,
       );
       const events: StreamEvent[] = [];
@@ -950,9 +920,7 @@ describe('GeminiChat', () => {
 
       // 3. Assertions
       // Should be called twice (initial + retry)
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
       // Check for a retry event
       expect(events.some((e) => e.type === StreamEventType.RETRY)).toBe(true);
@@ -962,27 +930,26 @@ describe('GeminiChat', () => {
         events.some(
           (e) =>
             e.type === StreamEventType.CHUNK &&
-            e.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-              'Success after retry',
+            e.value.candidates?.[0]?.content?.parts?.[0]?.text === "Success after retry",
         ),
       ).toBe(true);
     });
 
-    it('should call generateContentStream with the correct parameters', async () => {
+    it("should call generateContentStream with the correct parameters", async () => {
       const response = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                parts: [{ text: 'response' }],
-                role: 'model',
+                parts: [{ text: "response" }],
+                role: "model",
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
               index: 0,
               safetyRatings: [],
             },
           ],
-          text: () => 'response',
+          text: () => "response",
           usageMetadata: {
             promptTokenCount: 42,
             candidatesTokenCount: 15,
@@ -990,14 +957,12 @@ describe('GeminiChat', () => {
           },
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        response,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(response);
 
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'hello',
-        'prompt-id-1',
+        { model: "test-model" },
+        "hello",
+        "prompt-id-1",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -1006,15 +971,15 @@ describe('GeminiChat', () => {
 
       expect(mockContentGenerator.generateContentStream).toHaveBeenCalledWith(
         {
-          model: 'test-model',
+          model: "test-model",
           contents: [
             {
-              role: 'user',
-              parts: [{ text: 'hello' }],
+              role: "user",
+              parts: [{ text: "hello" }],
             },
           ],
           config: {
-            systemInstruction: '',
+            systemInstruction: "",
             tools: [],
             temperature: 0,
             thinkingConfig: {
@@ -1023,29 +988,27 @@ describe('GeminiChat', () => {
             abortSignal: expect.any(AbortSignal),
           },
         },
-        'prompt-id-1',
+        "prompt-id-1",
       );
     });
 
-    it('should use thinkingLevel and remove thinkingBudget for gemini-3 models', async () => {
+    it("should use thinkingLevel and remove thinkingBudget for gemini-3 models", async () => {
       const response = (async function* () {
         yield {
           candidates: [
             {
-              content: { parts: [{ text: 'response' }], role: 'model' },
-              finishReason: 'STOP',
+              content: { parts: [{ text: "response" }], role: "model" },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        response,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(response);
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-3-test-only-model-string-for-testing' },
-        'hello',
-        'prompt-id-thinking-level',
+        { model: "gemini-3-test-only-model-string-for-testing" },
+        "hello",
+        "prompt-id-thinking-level",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -1054,7 +1017,7 @@ describe('GeminiChat', () => {
 
       expect(mockContentGenerator.generateContentStream).toHaveBeenCalledWith(
         expect.objectContaining({
-          model: 'gemini-3-test-only-model-string-for-testing',
+          model: "gemini-3-test-only-model-string-for-testing",
           config: expect.objectContaining({
             thinkingConfig: {
               thinkingBudget: undefined,
@@ -1062,29 +1025,27 @@ describe('GeminiChat', () => {
             },
           }),
         }),
-        'prompt-id-thinking-level',
+        "prompt-id-thinking-level",
       );
     });
 
-    it('should use thinkingBudget and remove thinkingLevel for non-gemini-3 models', async () => {
+    it("should use thinkingBudget and remove thinkingLevel for non-gemini-3 models", async () => {
       const response = (async function* () {
         yield {
           candidates: [
             {
-              content: { parts: [{ text: 'response' }], role: 'model' },
-              finishReason: 'STOP',
+              content: { parts: [{ text: "response" }], role: "model" },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        response,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(response);
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'hello',
-        'prompt-id-thinking-budget',
+        { model: "gemini-2.0-flash" },
+        "hello",
+        "prompt-id-thinking-budget",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -1093,7 +1054,7 @@ describe('GeminiChat', () => {
 
       expect(mockContentGenerator.generateContentStream).toHaveBeenCalledWith(
         expect.objectContaining({
-          model: 'gemini-2.0-flash',
+          model: "gemini-2.0-flash",
           config: expect.objectContaining({
             thinkingConfig: {
               thinkingBudget: DEFAULT_THINKING_MODE,
@@ -1101,16 +1062,16 @@ describe('GeminiChat', () => {
             },
           }),
         }),
-        'prompt-id-thinking-budget',
+        "prompt-id-thinking-budget",
       );
     });
   });
 
-  describe('addHistory', () => {
-    it('should add a new content item to the history', () => {
+  describe("addHistory", () => {
+    it("should add a new content item to the history", () => {
       const newContent: Content = {
-        role: 'user',
-        parts: [{ text: 'A new message' }],
+        role: "user",
+        parts: [{ text: "A new message" }],
       };
       chat.addHistory(newContent);
       const history = chat.getHistory();
@@ -1118,14 +1079,14 @@ describe('GeminiChat', () => {
       expect(history[0]).toEqual(newContent);
     });
 
-    it('should add multiple items correctly', () => {
+    it("should add multiple items correctly", () => {
       const content1: Content = {
-        role: 'user',
-        parts: [{ text: 'Message 1' }],
+        role: "user",
+        parts: [{ text: "Message 1" }],
       };
       const content2: Content = {
-        role: 'model',
-        parts: [{ text: 'Message 2' }],
+        role: "model",
+        parts: [{ text: "Message 2" }],
       };
       chat.addHistory(content1);
       chat.addHistory(content2);
@@ -1136,22 +1097,21 @@ describe('GeminiChat', () => {
     });
   });
 
-  describe('sendMessageStream with retries', () => {
-    it('should not retry on invalid content if model does not start with gemini-2', async () => {
+  describe("sendMessageStream with retries", () => {
+    it("should not retry on invalid content if model does not start with gemini-2", async () => {
       // Mock the stream to fail.
-      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(
-        async () =>
-          (async function* () {
-            yield {
-              candidates: [{ content: { parts: [{ text: '' }] } }],
-            } as unknown as GenerateContentResponse;
-          })(),
+      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(async () =>
+        (async function* () {
+          yield {
+            candidates: [{ content: { parts: [{ text: "" }] } }],
+          } as unknown as GenerateContentResponse;
+        })(),
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-1.5-pro' },
-        'test',
-        'prompt-id-no-retry',
+        { model: "gemini-1.5-pro" },
+        "test",
+        "prompt-id-no-retry",
         new AbortController().signal,
       );
 
@@ -1164,20 +1124,18 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
 
       // Should be called only 1 time (no retry)
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        1,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(1);
       expect(mockLogContentRetry).not.toHaveBeenCalled();
     });
 
-    it('should yield a RETRY event when an invalid stream is encountered', async () => {
+    it("should yield a RETRY event when an invalid stream is encountered", async () => {
       // ARRANGE: Mock the stream to fail once, then succeed.
       vi.mocked(mockContentGenerator.generateContentStream)
         .mockImplementationOnce(async () =>
           // First attempt: An invalid stream with an empty text part.
           (async function* () {
             yield {
-              candidates: [{ content: { parts: [{ text: '' }] } }],
+              candidates: [{ content: { parts: [{ text: "" }] } }],
             } as unknown as GenerateContentResponse;
           })(),
         )
@@ -1187,8 +1145,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Success' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Success" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -1197,9 +1155,9 @@ describe('GeminiChat', () => {
 
       // ACT: Send a message and collect all events from the stream.
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test message',
-        'prompt-id-yield-retry',
+        { model: "gemini-2.0-flash" },
+        "test message",
+        "prompt-id-yield-retry",
         new AbortController().signal,
       );
       const events: StreamEvent[] = [];
@@ -1213,14 +1171,14 @@ describe('GeminiChat', () => {
       expect(retryEvent).toBeDefined();
       expect(retryEvent?.type).toBe(StreamEventType.RETRY);
     });
-    it('should retry on invalid content, succeed, and report metrics', async () => {
+    it("should retry on invalid content, succeed, and report metrics", async () => {
       // Use mockImplementationOnce to provide a fresh, promise-wrapped generator for each attempt.
       vi.mocked(mockContentGenerator.generateContentStream)
         .mockImplementationOnce(async () =>
           // First call returns an invalid stream
           (async function* () {
             yield {
-              candidates: [{ content: { parts: [{ text: '' }] } }], // Invalid empty text part
+              candidates: [{ content: { parts: [{ text: "" }] } }], // Invalid empty text part
             } as unknown as GenerateContentResponse;
           })(),
         )
@@ -1230,8 +1188,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Successful response' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Successful response" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -1239,9 +1197,9 @@ describe('GeminiChat', () => {
         );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test',
-        'prompt-id-retry-success',
+        { model: "gemini-2.0-flash" },
+        "test",
+        "prompt-id-retry-success",
         new AbortController().signal,
       );
       const chunks: StreamEvent[] = [];
@@ -1252,9 +1210,7 @@ describe('GeminiChat', () => {
       // Assertions
       expect(mockLogContentRetry).toHaveBeenCalledTimes(1);
       expect(mockLogContentRetryFailure).not.toHaveBeenCalled();
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
       // Check for a retry event
       expect(chunks.some((c) => c.type === StreamEventType.RETRY)).toBe(true);
@@ -1264,8 +1220,7 @@ describe('GeminiChat', () => {
         chunks.some(
           (c) =>
             c.type === StreamEventType.CHUNK &&
-            c.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-              'Successful response',
+            c.value.candidates?.[0]?.content?.parts?.[0]?.text === "Successful response",
         ),
       ).toBe(true);
 
@@ -1273,26 +1228,26 @@ describe('GeminiChat', () => {
       const history = chat.getHistory();
       expect(history.length).toBe(2);
       expect(history[0]).toEqual({
-        role: 'user',
-        parts: [{ text: 'test' }],
+        role: "user",
+        parts: [{ text: "test" }],
       });
       expect(history[1]).toEqual({
-        role: 'model',
-        parts: [{ text: 'Successful response' }],
+        role: "model",
+        parts: [{ text: "Successful response" }],
       });
 
       // Verify that token counting is not called when usageMetadata is missing
       expect(uiTelemetryService.setLastPromptTokenCount).not.toHaveBeenCalled();
     });
 
-    it('should set temperature to 1 on retry', async () => {
+    it("should set temperature to 1 on retry", async () => {
       // Use mockImplementationOnce to provide a fresh, promise-wrapped generator for each attempt.
       vi.mocked(mockContentGenerator.generateContentStream)
         .mockImplementationOnce(async () =>
           // First call returns an invalid stream
           (async function* () {
             yield {
-              candidates: [{ content: { parts: [{ text: '' }] } }], // Invalid empty text part
+              candidates: [{ content: { parts: [{ text: "" }] } }], // Invalid empty text part
             } as unknown as GenerateContentResponse;
           })(),
         )
@@ -1302,8 +1257,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Successful response' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Successful response" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -1311,9 +1266,9 @@ describe('GeminiChat', () => {
         );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test message',
-        'prompt-id-retry-temperature',
+        { model: "gemini-2.0-flash" },
+        "test message",
+        "prompt-id-retry-temperature",
         new AbortController().signal,
       );
 
@@ -1321,58 +1276,51 @@ describe('GeminiChat', () => {
         // consume stream
       }
 
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
       // First call should have original temperature
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         1,
         expect.objectContaining({
           config: expect.objectContaining({
             temperature: 0,
           }),
         }),
-        'prompt-id-retry-temperature',
+        "prompt-id-retry-temperature",
       );
 
       // Second call (retry) should have temperature 1
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         2,
         expect.objectContaining({
           config: expect.objectContaining({
             temperature: 1,
           }),
         }),
-        'prompt-id-retry-temperature',
+        "prompt-id-retry-temperature",
       );
     });
 
-    it('should fail after all retries on persistent invalid content and report metrics', async () => {
-      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(
-        async () =>
-          (async function* () {
-            yield {
-              candidates: [
-                {
-                  content: {
-                    parts: [{ text: '' }],
-                    role: 'model',
-                  },
+    it("should fail after all retries on persistent invalid content and report metrics", async () => {
+      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(async () =>
+        (async function* () {
+          yield {
+            candidates: [
+              {
+                content: {
+                  parts: [{ text: "" }],
+                  role: "model",
                 },
-              ],
-            } as unknown as GenerateContentResponse;
-          })(),
+              },
+            ],
+          } as unknown as GenerateContentResponse;
+        })(),
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test',
-        'prompt-id-retry-fail',
+        { model: "gemini-2.0-flash" },
+        "test",
+        "prompt-id-retry-fail",
         new AbortController().signal,
       );
       await expect(async () => {
@@ -1382,9 +1330,7 @@ describe('GeminiChat', () => {
       }).rejects.toThrow(InvalidStreamError);
 
       // Should be called 2 times (initial + 1 retry)
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
       expect(mockLogContentRetry).toHaveBeenCalledTimes(1);
       expect(mockLogContentRetryFailure).toHaveBeenCalledTimes(1);
 
@@ -1392,12 +1338,12 @@ describe('GeminiChat', () => {
       const history = chat.getHistory();
       expect(history.length).toBe(1);
       expect(history[0]).toEqual({
-        role: 'user',
-        parts: [{ text: 'test' }],
+        role: "user",
+        parts: [{ text: "test" }],
       });
     });
 
-    describe('API error retry behavior', () => {
+    describe("API error retry behavior", () => {
       beforeEach(() => {
         // Use a more direct mock for retry testing
         mockRetryWithBackoff.mockImplementation(async (apiCall) => {
@@ -1407,10 +1353,7 @@ describe('GeminiChat', () => {
             // Simulate the logic of defaultShouldRetry for ApiError
             let shouldRetry = false;
             if (error instanceof ApiError && error.message) {
-              if (
-                error.status === 429 ||
-                (error.status >= 500 && error.status < 600)
-              ) {
+              if (error.status === 429 || (error.status >= 500 && error.status < 600)) {
                 shouldRetry = true;
               }
               // Explicitly don't retry on these
@@ -1428,17 +1371,15 @@ describe('GeminiChat', () => {
         });
       });
 
-      it('should not retry on 400 Bad Request errors', async () => {
-        const error400 = new ApiError({ message: 'Bad Request', status: 400 });
+      it("should not retry on 400 Bad Request errors", async () => {
+        const error400 = new ApiError({ message: "Bad Request", status: 400 });
 
-        vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(
-          error400,
-        );
+        vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(error400);
 
         const stream = await chat.sendMessageStream(
-          { model: 'gemini-2.0-flash' },
-          'test message',
-          'prompt-id-400',
+          { model: "gemini-2.0-flash" },
+          "test message",
+          "prompt-id-400",
           new AbortController().signal,
         );
 
@@ -1451,13 +1392,11 @@ describe('GeminiChat', () => {
         ).rejects.toThrow(error400);
 
         // Should only be called once (no retry)
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(1);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(1);
       });
 
-      it('should retry on 429 Rate Limit errors', async () => {
-        const error429 = new ApiError({ message: 'Rate Limited', status: 429 });
+      it("should retry on 429 Rate Limit errors", async () => {
+        const error429 = new ApiError({ message: "Rate Limited", status: 429 });
 
         vi.mocked(mockContentGenerator.generateContentStream)
           .mockRejectedValueOnce(error429)
@@ -1466,8 +1405,8 @@ describe('GeminiChat', () => {
               yield {
                 candidates: [
                   {
-                    content: { parts: [{ text: 'Success after retry' }] },
-                    finishReason: 'STOP',
+                    content: { parts: [{ text: "Success after retry" }] },
+                    finishReason: "STOP",
                   },
                 ],
               } as unknown as GenerateContentResponse;
@@ -1475,9 +1414,9 @@ describe('GeminiChat', () => {
           );
 
         const stream = await chat.sendMessageStream(
-          { model: 'test-model' },
-          'test message',
-          'prompt-id-429-retry',
+          { model: "test-model" },
+          "test message",
+          "prompt-id-429-retry",
           new AbortController().signal,
         );
 
@@ -1487,24 +1426,21 @@ describe('GeminiChat', () => {
         }
 
         // Should be called twice (initial + retry)
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(2);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
         // Should have successful content
         expect(
           events.some(
             (e) =>
               e.type === StreamEventType.CHUNK &&
-              e.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-                'Success after retry',
+              e.value.candidates?.[0]?.content?.parts?.[0]?.text === "Success after retry",
           ),
         ).toBe(true);
       });
 
-      it('should retry on 5xx server errors', async () => {
+      it("should retry on 5xx server errors", async () => {
         const error500 = new ApiError({
-          message: 'Internal Server Error 500',
+          message: "Internal Server Error 500",
           status: 500,
         });
 
@@ -1515,8 +1451,8 @@ describe('GeminiChat', () => {
               yield {
                 candidates: [
                   {
-                    content: { parts: [{ text: 'Recovered from 500' }] },
-                    finishReason: 'STOP',
+                    content: { parts: [{ text: "Recovered from 500" }] },
+                    finishReason: "STOP",
                   },
                 ],
               } as unknown as GenerateContentResponse;
@@ -1524,9 +1460,9 @@ describe('GeminiChat', () => {
           );
 
         const stream = await chat.sendMessageStream(
-          { model: 'test-model' },
-          'test message',
-          'prompt-id-500-retry',
+          { model: "test-model" },
+          "test message",
+          "prompt-id-500-retry",
           new AbortController().signal,
         );
 
@@ -1536,17 +1472,13 @@ describe('GeminiChat', () => {
         }
 
         // Should be called twice (initial + retry)
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(2);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
       });
 
-      it('should retry on specific fetch errors when configured', async () => {
+      it("should retry on specific fetch errors when configured", async () => {
         vi.mocked(mockConfig.getRetryFetchErrors).mockReturnValue(true);
 
-        const fetchError = new Error(
-          'exception TypeError: fetch failed sending request',
-        );
+        const fetchError = new Error("exception TypeError: fetch failed sending request");
 
         vi.mocked(mockContentGenerator.generateContentStream)
           .mockRejectedValueOnce(fetchError)
@@ -1555,8 +1487,8 @@ describe('GeminiChat', () => {
               yield {
                 candidates: [
                   {
-                    content: { parts: [{ text: 'Success after fetch error' }] },
-                    finishReason: 'STOP',
+                    content: { parts: [{ text: "Success after fetch error" }] },
+                    finishReason: "STOP",
                   },
                 ],
               } as unknown as GenerateContentResponse;
@@ -1570,9 +1502,7 @@ describe('GeminiChat', () => {
             if (
               options?.retryFetchErrors &&
               error instanceof Error &&
-              error.message.includes(
-                'exception TypeError: fetch failed sending request',
-              )
+              error.message.includes("exception TypeError: fetch failed sending request")
             ) {
               return await apiCall();
             }
@@ -1581,9 +1511,9 @@ describe('GeminiChat', () => {
         });
 
         const stream = await chat.sendMessageStream(
-          { model: 'test-model' },
-          'test message',
-          'prompt-id-fetch-error-retry',
+          { model: "test-model" },
+          "test message",
+          "prompt-id-fetch-error-retry",
           new AbortController().signal,
         );
 
@@ -1592,16 +1522,13 @@ describe('GeminiChat', () => {
           events.push(event);
         }
 
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(2);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
         expect(
           events.some(
             (e) =>
               e.type === StreamEventType.CHUNK &&
-              e.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-                'Success after fetch error',
+              e.value.candidates?.[0]?.content?.parts?.[0]?.text === "Success after fetch error",
           ),
         ).toBe(true);
       });
@@ -1612,11 +1539,11 @@ describe('GeminiChat', () => {
       });
     });
   });
-  it('should correctly retry and append to an existing history mid-conversation', async () => {
+  it("should correctly retry and append to an existing history mid-conversation", async () => {
     // 1. Setup
     const initialHistory: Content[] = [
-      { role: 'user', parts: [{ text: 'First question' }] },
-      { role: 'model', parts: [{ text: 'First answer' }] },
+      { role: "user", parts: [{ text: "First question" }] },
+      { role: "model", parts: [{ text: "First answer" }] },
     ];
     chat.setHistory(initialHistory);
 
@@ -1625,7 +1552,7 @@ describe('GeminiChat', () => {
       .mockImplementationOnce(async () =>
         (async function* () {
           yield {
-            candidates: [{ content: { parts: [{ text: '' }] } }],
+            candidates: [{ content: { parts: [{ text: "" }] } }],
           } as unknown as GenerateContentResponse;
         })(),
       )
@@ -1635,8 +1562,8 @@ describe('GeminiChat', () => {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Second answer' }] },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Second answer" }] },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -1645,9 +1572,9 @@ describe('GeminiChat', () => {
 
     // 3. Send a new message
     const stream = await chat.sendMessageStream(
-      { model: 'gemini-2.0-flash' },
-      'Second question',
-      'prompt-id-retry-existing',
+      { model: "gemini-2.0-flash" },
+      "Second question",
+      "prompt-id-retry-existing",
       new AbortController().signal,
     );
     for await (const _ of stream) {
@@ -1663,35 +1590,31 @@ describe('GeminiChat', () => {
 
     // Explicitly verify the structure of each part to satisfy TypeScript
     const turn1 = history[0];
-    if (!turn1?.parts?.[0] || !('text' in turn1.parts[0])) {
-      throw new Error('Test setup error: First turn is not a valid text part.');
+    if (!turn1?.parts?.[0] || !("text" in turn1.parts[0])) {
+      throw new Error("Test setup error: First turn is not a valid text part.");
     }
-    expect(turn1.parts[0].text).toBe('First question');
+    expect(turn1.parts[0].text).toBe("First question");
 
     const turn2 = history[1];
-    if (!turn2?.parts?.[0] || !('text' in turn2.parts[0])) {
-      throw new Error(
-        'Test setup error: Second turn is not a valid text part.',
-      );
+    if (!turn2?.parts?.[0] || !("text" in turn2.parts[0])) {
+      throw new Error("Test setup error: Second turn is not a valid text part.");
     }
-    expect(turn2.parts[0].text).toBe('First answer');
+    expect(turn2.parts[0].text).toBe("First answer");
 
     const turn3 = history[2];
-    if (!turn3?.parts?.[0] || !('text' in turn3.parts[0])) {
-      throw new Error('Test setup error: Third turn is not a valid text part.');
+    if (!turn3?.parts?.[0] || !("text" in turn3.parts[0])) {
+      throw new Error("Test setup error: Third turn is not a valid text part.");
     }
-    expect(turn3.parts[0].text).toBe('Second question');
+    expect(turn3.parts[0].text).toBe("Second question");
 
     const turn4 = history[3];
-    if (!turn4?.parts?.[0] || !('text' in turn4.parts[0])) {
-      throw new Error(
-        'Test setup error: Fourth turn is not a valid text part.',
-      );
+    if (!turn4?.parts?.[0] || !("text" in turn4.parts[0])) {
+      throw new Error("Test setup error: Fourth turn is not a valid text part.");
     }
-    expect(turn4.parts[0].text).toBe('Second answer');
+    expect(turn4.parts[0].text).toBe("Second answer");
   });
 
-  it('should retry if the model returns a completely empty stream (no chunks)', async () => {
+  it("should retry if the model returns a completely empty stream (no chunks)", async () => {
     // 1. Mock the API to return an empty stream first, then a valid one.
     vi.mocked(mockContentGenerator.generateContentStream)
       .mockImplementationOnce(
@@ -1706,9 +1629,9 @@ describe('GeminiChat', () => {
               candidates: [
                 {
                   content: {
-                    parts: [{ text: 'Successful response after empty' }],
+                    parts: [{ text: "Successful response after empty" }],
                   },
-                  finishReason: 'STOP',
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -1717,9 +1640,9 @@ describe('GeminiChat', () => {
 
     // 2. Call the method and consume the stream.
     const stream = await chat.sendMessageStream(
-      { model: 'gemini-2.0-flash' },
-      'test empty stream',
-      'prompt-id-empty-stream',
+      { model: "gemini-2.0-flash" },
+      "test empty stream",
+      "prompt-id-empty-stream",
       new AbortController().signal,
     );
     const chunks: StreamEvent[] = [];
@@ -1733,8 +1656,7 @@ describe('GeminiChat', () => {
       chunks.some(
         (c) =>
           c.type === StreamEventType.CHUNK &&
-          c.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-            'Successful response after empty',
+          c.value.candidates?.[0]?.content?.parts?.[0]?.text === "Successful response after empty",
       ),
     ).toBe(true);
 
@@ -1743,20 +1665,18 @@ describe('GeminiChat', () => {
 
     // Explicitly verify the structure of each part to satisfy TypeScript
     const turn1 = history[0];
-    if (!turn1?.parts?.[0] || !('text' in turn1.parts[0])) {
-      throw new Error('Test setup error: First turn is not a valid text part.');
+    if (!turn1?.parts?.[0] || !("text" in turn1.parts[0])) {
+      throw new Error("Test setup error: First turn is not a valid text part.");
     }
-    expect(turn1.parts[0].text).toBe('test empty stream');
+    expect(turn1.parts[0].text).toBe("test empty stream");
 
     const turn2 = history[1];
-    if (!turn2?.parts?.[0] || !('text' in turn2.parts[0])) {
-      throw new Error(
-        'Test setup error: Second turn is not a valid text part.',
-      );
+    if (!turn2?.parts?.[0] || !("text" in turn2.parts[0])) {
+      throw new Error("Test setup error: Second turn is not a valid text part.");
     }
-    expect(turn2.parts[0].text).toBe('Successful response after empty');
+    expect(turn2.parts[0].text).toBe("Successful response after empty");
   });
-  it('should queue a subsequent sendMessageStream call until the first stream is fully consumed', async () => {
+  it("should queue a subsequent sendMessageStream call until the first stream is fully consumed", async () => {
     // 1. Create a promise to manually control the stream's lifecycle
     let continueFirstStream: () => void;
     const firstStreamContinuePromise = new Promise<void>((resolve) => {
@@ -1766,16 +1686,14 @@ describe('GeminiChat', () => {
     // 2. Mock the API to return controllable async generators
     const firstStreamGenerator = (async function* () {
       yield {
-        candidates: [
-          { content: { parts: [{ text: 'first response part 1' }] } },
-        ],
+        candidates: [{ content: { parts: [{ text: "first response part 1" }] } }],
       } as unknown as GenerateContentResponse;
       await firstStreamContinuePromise; // Pause the stream
       yield {
         candidates: [
           {
-            content: { parts: [{ text: ' part 2' }] },
-            finishReason: 'STOP',
+            content: { parts: [{ text: " part 2" }] },
+            finishReason: "STOP",
           },
         ],
       } as unknown as GenerateContentResponse;
@@ -1785,8 +1703,8 @@ describe('GeminiChat', () => {
       yield {
         candidates: [
           {
-            content: { parts: [{ text: 'second response' }] },
-            finishReason: 'STOP',
+            content: { parts: [{ text: "second response" }] },
+            finishReason: "STOP",
           },
         ],
       } as unknown as GenerateContentResponse;
@@ -1798,9 +1716,9 @@ describe('GeminiChat', () => {
 
     // 3. Start the first stream and consume only the first chunk to pause it
     const firstStream = await chat.sendMessageStream(
-      { model: 'test-model' },
-      'first',
-      'prompt-1',
+      { model: "test-model" },
+      "first",
+      "prompt-1",
       new AbortController().signal,
     );
     const firstStreamIterator = firstStream[Symbol.asyncIterator]();
@@ -1808,9 +1726,9 @@ describe('GeminiChat', () => {
 
     // 4. While the first stream is paused, start the second call. It will block.
     const secondStreamPromise = chat.sendMessageStream(
-      { model: 'test-model' },
-      'second',
-      'prompt-2',
+      { model: "test-model" },
+      "second",
+      "prompt-2",
       new AbortController().signal,
     );
 
@@ -1840,38 +1758,35 @@ describe('GeminiChat', () => {
     expect(history.length).toBe(4);
 
     const turn4 = history[3];
-    if (!turn4?.parts?.[0] || !('text' in turn4.parts[0])) {
-      throw new Error(
-        'Test setup error: Fourth turn is not a valid text part.',
-      );
+    if (!turn4?.parts?.[0] || !("text" in turn4.parts[0])) {
+      throw new Error("Test setup error: Fourth turn is not a valid text part.");
     }
-    expect(turn4.parts[0].text).toBe('second response');
+    expect(turn4.parts[0].text).toBe("second response");
   });
 
-  describe('Model Resolution', () => {
+  describe("Model Resolution", () => {
     const mockResponse = {
       candidates: [
         {
-          content: { parts: [{ text: 'response' }], role: 'model' },
-          finishReason: 'STOP',
+          content: { parts: [{ text: "response" }], role: "model" },
+          finishReason: "STOP",
         },
       ],
     } as unknown as GenerateContentResponse;
 
-    it('should use the FLASH model when in fallback mode (sendMessageStream)', async () => {
-      vi.mocked(mockConfig.getModel).mockReturnValue('gemini-pro');
+    it("should use the FLASH model when in fallback mode (sendMessageStream)", async () => {
+      vi.mocked(mockConfig.getModel).mockReturnValue("gemini-pro");
       vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
-      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(
-        async () =>
-          (async function* () {
-            yield mockResponse;
-          })(),
+      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(async () =>
+        (async function* () {
+          yield mockResponse;
+        })(),
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test message',
-        'prompt-id-res3',
+        { model: "test-model" },
+        "test message",
+        "prompt-id-res3",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -1882,14 +1797,14 @@ describe('GeminiChat', () => {
         expect.objectContaining({
           model: DEFAULT_GEMINI_FLASH_MODEL,
         }),
-        'prompt-id-res3',
+        "prompt-id-res3",
       );
     });
   });
 
-  describe('Fallback Integration (Retries)', () => {
+  describe("Fallback Integration (Retries)", () => {
     const error429 = new ApiError({
-      message: 'API Error 429: Quota exceeded',
+      message: "API Error 429: Quota exceeded",
       status: 429,
     });
 
@@ -1905,10 +1820,7 @@ describe('GeminiChat', () => {
       } catch (error) {
         if (options.onPersistent429) {
           // We simulate the "persistent" trigger here for simplicity.
-          const shouldRetry = await options.onPersistent429(
-            options.authType,
-            error,
-          );
+          const shouldRetry = await options.onPersistent429(options.authType, error);
           if (shouldRetry) {
             return apiCall();
           }
@@ -1925,13 +1837,13 @@ describe('GeminiChat', () => {
       mockRetryWithBackoff.mockImplementation(async (apiCall) => apiCall());
     });
 
-    it('should call handleFallback with the specific failed model and retry if handler returns true', async () => {
+    it("should call handleFallback with the specific failed model and retry if handler returns true", async () => {
       const authType = AuthType.LOGIN_WITH_GOOGLE;
       vi.mocked(mockConfig.getContentGeneratorConfig).mockReturnValue({
         authType,
       });
 
-      const isInFallbackModeSpy = vi.spyOn(mockConfig, 'isInFallbackMode');
+      const isInFallbackModeSpy = vi.spyOn(mockConfig, "isInFallbackMode");
       isInFallbackModeSpy.mockReturnValue(false);
 
       vi.mocked(mockContentGenerator.generateContentStream)
@@ -1942,8 +1854,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Success on retry' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Success on retry" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -1956,9 +1868,9 @@ describe('GeminiChat', () => {
       });
 
       const stream = await chat.sendMessageStream(
-        { model: 'test-model' },
-        'trigger 429',
-        'prompt-id-fb1',
+        { model: "test-model" },
+        "trigger 429",
+        "prompt-id-fb1",
         new AbortController().signal,
       );
 
@@ -1967,23 +1879,16 @@ describe('GeminiChat', () => {
         // no-op
       }
 
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
       expect(mockHandleFallback).toHaveBeenCalledTimes(1);
-      expect(mockHandleFallback).toHaveBeenCalledWith(
-        mockConfig,
-        'test-model',
-        authType,
-        error429,
-      );
+      expect(mockHandleFallback).toHaveBeenCalledWith(mockConfig, "test-model", authType, error429);
 
       const history = chat.getHistory();
       const modelTurn = history[1]!;
-      expect(modelTurn.parts![0]!.text).toBe('Success on retry');
+      expect(modelTurn.parts![0]!.text).toBe("Success on retry");
     });
 
-    it('should switch to DEFAULT_GEMINI_FLASH_MODEL and use thinkingBudget when falling back from a gemini-3 model', async () => {
+    it("should switch to DEFAULT_GEMINI_FLASH_MODEL and use thinkingBudget when falling back from a gemini-3 model", async () => {
       // ARRANGE
       const authType = AuthType.LOGIN_WITH_GOOGLE;
       vi.mocked(mockConfig.getContentGeneratorConfig).mockReturnValue({
@@ -1991,7 +1896,7 @@ describe('GeminiChat', () => {
       });
 
       // Initial state: Not in fallback mode
-      const isInFallbackModeSpy = vi.spyOn(mockConfig, 'isInFallbackMode');
+      const isInFallbackModeSpy = vi.spyOn(mockConfig, "isInFallbackMode");
       isInFallbackModeSpy.mockReturnValue(false);
 
       // Mock API calls:
@@ -2004,8 +1909,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Fallback success' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Fallback success" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -2020,9 +1925,9 @@ describe('GeminiChat', () => {
 
       // ACT
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-3-test-model' }, // Start with a gemini-3 model
-        'test fallback thinking',
-        'prompt-id-fb3',
+        { model: "gemini-3-test-model" }, // Start with a gemini-3 model
+        "test fallback thinking",
+        "prompt-id-fb3",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -2030,17 +1935,13 @@ describe('GeminiChat', () => {
       }
 
       // ASSERT
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
       // First call: gemini-3 model, thinkingLevel set
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         1,
         expect.objectContaining({
-          model: 'gemini-3-test-model',
+          model: "gemini-3-test-model",
           config: expect.objectContaining({
             thinkingConfig: {
               thinkingBudget: undefined,
@@ -2048,13 +1949,11 @@ describe('GeminiChat', () => {
             },
           }),
         }),
-        'prompt-id-fb3',
+        "prompt-id-fb3",
       );
 
       // Second call: DEFAULT_GEMINI_FLASH_MODEL (due to fallback), thinkingBudget set (due to fix)
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         2,
         expect.objectContaining({
           model: DEFAULT_GEMINI_FLASH_MODEL,
@@ -2065,21 +1964,19 @@ describe('GeminiChat', () => {
             },
           }),
         }),
-        'prompt-id-fb3',
+        "prompt-id-fb3",
       );
     });
 
-    it('should stop retrying if handleFallback returns false (e.g., auth intent)', async () => {
-      vi.mocked(mockConfig.getModel).mockReturnValue('gemini-pro');
-      vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(
-        error429,
-      );
+    it("should stop retrying if handleFallback returns false (e.g., auth intent)", async () => {
+      vi.mocked(mockConfig.getModel).mockReturnValue("gemini-pro");
+      vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(error429);
       mockHandleFallback.mockResolvedValue(false);
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-2.0-flash' },
-        'test stop',
-        'prompt-id-fb2',
+        { model: "gemini-2.0-flash" },
+        "test stop",
+        "prompt-id-fb2",
         new AbortController().signal,
       );
 
@@ -2091,14 +1988,12 @@ describe('GeminiChat', () => {
         })(),
       ).rejects.toThrow(error429);
 
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        1,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(1);
       expect(mockHandleFallback).toHaveBeenCalledTimes(1);
     });
   });
 
-  it('should discard valid partial content from a failed attempt upon retry', async () => {
+  it("should discard valid partial content from a failed attempt upon retry", async () => {
     // Mock the stream to fail on the first attempt after yielding some valid content.
     vi.mocked(mockContentGenerator.generateContentStream)
       .mockImplementationOnce(async () =>
@@ -2108,13 +2003,13 @@ describe('GeminiChat', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'This valid part should be discarded' }],
+                  parts: [{ text: "This valid part should be discarded" }],
                 },
               },
             ],
           } as unknown as GenerateContentResponse;
           yield {
-            candidates: [{ content: { parts: [{ text: '' }] } }], // Invalid chunk triggers retry
+            candidates: [{ content: { parts: [{ text: "" }] } }], // Invalid chunk triggers retry
           } as unknown as GenerateContentResponse;
         })(),
       )
@@ -2125,9 +2020,9 @@ describe('GeminiChat', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'Successful final response' }],
+                  parts: [{ text: "Successful final response" }],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -2136,9 +2031,9 @@ describe('GeminiChat', () => {
 
     // Send a message and consume the stream
     const stream = await chat.sendMessageStream(
-      { model: 'gemini-2.0-flash' },
-      'test message',
-      'prompt-id-discard-test',
+      { model: "gemini-2.0-flash" },
+      "test message",
+      "prompt-id-discard-test",
       new AbortController().signal,
     );
     const events: StreamEvent[] = [];
@@ -2156,27 +2051,25 @@ describe('GeminiChat', () => {
 
     const modelTurn = history[1]!;
     // The model turn should only contain the text from the successful attempt
-    expect(modelTurn!.parts![0]!.text).toBe('Successful final response');
+    expect(modelTurn!.parts![0]!.text).toBe("Successful final response");
     // It should NOT contain any text from the failed attempt
-    expect(modelTurn!.parts![0]!.text).not.toContain(
-      'This valid part should be discarded',
-    );
+    expect(modelTurn!.parts![0]!.text).not.toContain("This valid part should be discarded");
   });
 
-  describe('stripThoughtsFromHistory', () => {
-    it('should strip thought signatures', () => {
+  describe("stripThoughtsFromHistory", () => {
+    it("should strip thought signatures", () => {
       chat.setHistory([
         {
-          role: 'user',
-          parts: [{ text: 'hello' }],
+          role: "user",
+          parts: [{ text: "hello" }],
         },
         {
-          role: 'model',
+          role: "model",
           parts: [
-            { text: 'thinking...', thoughtSignature: 'thought-123' },
+            { text: "thinking...", thoughtSignature: "thought-123" },
             {
-              functionCall: { name: 'test', args: {} },
-              thoughtSignature: 'thought-456',
+              functionCall: { name: "test", args: {} },
+              thoughtSignature: "thought-456",
             },
           ],
         },
@@ -2186,96 +2079,85 @@ describe('GeminiChat', () => {
 
       expect(chat.getHistory()).toEqual([
         {
-          role: 'user',
-          parts: [{ text: 'hello' }],
+          role: "user",
+          parts: [{ text: "hello" }],
         },
         {
-          role: 'model',
-          parts: [
-            { text: 'thinking...' },
-            { functionCall: { name: 'test', args: {} } },
-          ],
+          role: "model",
+          parts: [{ text: "thinking..." }, { functionCall: { name: "test", args: {} } }],
         },
       ]);
     });
   });
 
-  describe('Preview Model Fallback Logic', () => {
-    it('should reset previewModelBypassMode to false at the start of sendMessageStream', async () => {
+  describe("Preview Model Fallback Logic", () => {
+    it("should reset previewModelBypassMode to false at the start of sendMessageStream", async () => {
       const stream = (async function* () {
         yield {
           candidates: [
             {
-              content: { role: 'model', parts: [{ text: 'Success' }] },
-              finishReason: 'STOP',
+              content: { role: "model", parts: [{ text: "Success" }] },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        stream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(stream);
 
       await chat.sendMessageStream(
-        { model: 'test-model' },
-        'test',
-        'prompt-id-preview-model-reset',
+        { model: "test-model" },
+        "test",
+        "prompt-id-preview-model-reset",
         new AbortController().signal,
       );
 
       expect(mockConfig.setPreviewModelBypassMode).toHaveBeenCalledWith(false);
     });
 
-    it('should reset previewModelFallbackMode to false upon successful Preview Model usage', async () => {
+    it("should reset previewModelFallbackMode to false upon successful Preview Model usage", async () => {
       const stream = (async function* () {
         yield {
           candidates: [
             {
-              content: { role: 'model', parts: [{ text: 'Success' }] },
-              finishReason: 'STOP',
+              content: { role: "model", parts: [{ text: "Success" }] },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        stream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(stream);
 
       const resultStream = await chat.sendMessageStream(
         { model: PREVIEW_GEMINI_MODEL },
-        'test',
-        'prompt-id-preview-model-healing',
+        "test",
+        "prompt-id-preview-model-healing",
         new AbortController().signal,
       );
       for await (const _ of resultStream) {
         // consume stream
       }
 
-      expect(mockConfig.setPreviewModelFallbackMode).toHaveBeenCalledWith(
-        false,
-      );
+      expect(mockConfig.setPreviewModelFallbackMode).toHaveBeenCalledWith(false);
     });
-    it('should NOT reset previewModelFallbackMode if Preview Model was bypassed (downgraded)', async () => {
+    it("should NOT reset previewModelFallbackMode if Preview Model was bypassed (downgraded)", async () => {
       const stream = (async function* () {
         yield {
           candidates: [
             {
-              content: { role: 'model', parts: [{ text: 'Success' }] },
-              finishReason: 'STOP',
+              content: { role: "model", parts: [{ text: "Success" }] },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        stream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(stream);
       // Simulate bypass mode being active (downgrade happened)
       vi.mocked(mockConfig.isPreviewModelBypassMode).mockReturnValue(true);
 
       const resultStream = await chat.sendMessageStream(
         { model: PREVIEW_GEMINI_MODEL },
-        'test',
-        'prompt-id-bypass-no-healing',
+        "test",
+        "prompt-id-bypass-no-healing",
         new AbortController().signal,
       );
       for await (const _ of resultStream) {
@@ -2286,37 +2168,35 @@ describe('GeminiChat', () => {
     });
   });
 
-  describe('ensureActiveLoopHasThoughtSignatures', () => {
-    it('should add thoughtSignature to the first functionCall in each model turn of the active loop', () => {
-      const chat = new GeminiChat(mockConfig, '', [], []);
+  describe("ensureActiveLoopHasThoughtSignatures", () => {
+    it("should add thoughtSignature to the first functionCall in each model turn of the active loop", () => {
+      const chat = new GeminiChat(mockConfig, "", [], []);
       const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Old message' }] },
+        { role: "user", parts: [{ text: "Old message" }] },
         {
-          role: 'model',
-          parts: [{ functionCall: { name: 'old_tool', args: {} } }],
+          role: "model",
+          parts: [{ functionCall: { name: "old_tool", args: {} } }],
         },
-        { role: 'user', parts: [{ text: 'Find a restaurant' }] }, // active loop starts here
+        { role: "user", parts: [{ text: "Find a restaurant" }] }, // active loop starts here
         {
-          role: 'model',
+          role: "model",
           parts: [
-            { functionCall: { name: 'find_restaurant', args: {} } }, // This one gets a signature
-            { functionCall: { name: 'find_restaurant_2', args: {} } }, // This one does NOT
+            { functionCall: { name: "find_restaurant", args: {} } }, // This one gets a signature
+            { functionCall: { name: "find_restaurant_2", args: {} } }, // This one does NOT
           ],
         },
         {
-          role: 'user',
-          parts: [
-            { functionResponse: { name: 'find_restaurant', response: {} } },
-          ],
+          role: "user",
+          parts: [{ functionResponse: { name: "find_restaurant", response: {} } }],
         },
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
-              functionCall: { name: 'tool_with_sig', args: {} },
-              thoughtSignature: 'existing-sig',
+              functionCall: { name: "tool_with_sig", args: {} },
+              thoughtSignature: "existing-sig",
             },
-            { functionCall: { name: 'another_tool', args: {} } }, // This one does NOT get a signature
+            { functionCall: { name: "another_tool", args: {} } }, // This one does NOT get a signature
           ],
         },
       ];
@@ -2324,94 +2204,86 @@ describe('GeminiChat', () => {
       const newContents = chat.ensureActiveLoopHasThoughtSignatures(history);
 
       // Outside active loop - unchanged
-      expect(newContents[1]?.parts?.[0]).not.toHaveProperty('thoughtSignature');
+      expect(newContents[1]?.parts?.[0]).not.toHaveProperty("thoughtSignature");
 
       // Inside active loop, first model turn
       // First function call gets a signature
-      expect(newContents[3]?.parts?.[0]?.thoughtSignature).toBe(
-        SYNTHETIC_THOUGHT_SIGNATURE,
-      );
+      expect(newContents[3]?.parts?.[0]?.thoughtSignature).toBe(SYNTHETIC_THOUGHT_SIGNATURE);
       // Second function call does NOT
-      expect(newContents[3]?.parts?.[1]).not.toHaveProperty('thoughtSignature');
+      expect(newContents[3]?.parts?.[1]).not.toHaveProperty("thoughtSignature");
 
       // User functionResponse part - unchanged (this is not a model turn)
-      expect(newContents[4]?.parts?.[0]).not.toHaveProperty('thoughtSignature');
+      expect(newContents[4]?.parts?.[0]).not.toHaveProperty("thoughtSignature");
 
       // Inside active loop, second model turn
       // First function call already has a signature, so nothing changes
-      expect(newContents[5]?.parts?.[0]?.thoughtSignature).toBe('existing-sig');
+      expect(newContents[5]?.parts?.[0]?.thoughtSignature).toBe("existing-sig");
       // Second function call does NOT get a signature
-      expect(newContents[5]?.parts?.[1]).not.toHaveProperty('thoughtSignature');
+      expect(newContents[5]?.parts?.[1]).not.toHaveProperty("thoughtSignature");
     });
 
-    it('should not modify contents if there is no user text message', () => {
-      const chat = new GeminiChat(mockConfig, '', [], []);
+    it("should not modify contents if there is no user text message", () => {
+      const chat = new GeminiChat(mockConfig, "", [], []);
       const history: Content[] = [
         {
-          role: 'user',
-          parts: [{ functionResponse: { name: 'tool1', response: {} } }],
+          role: "user",
+          parts: [{ functionResponse: { name: "tool1", response: {} } }],
         },
         {
-          role: 'model',
-          parts: [{ functionCall: { name: 'tool2', args: {} } }],
+          role: "model",
+          parts: [{ functionCall: { name: "tool2", args: {} } }],
         },
       ];
       const newContents = chat.ensureActiveLoopHasThoughtSignatures(history);
       expect(newContents).toEqual(history);
-      expect(newContents[1]?.parts?.[0]).not.toHaveProperty('thoughtSignature');
+      expect(newContents[1]?.parts?.[0]).not.toHaveProperty("thoughtSignature");
     });
 
-    it('should handle an empty history', () => {
-      const chat = new GeminiChat(mockConfig, '', []);
+    it("should handle an empty history", () => {
+      const chat = new GeminiChat(mockConfig, "", []);
       const history: Content[] = [];
       const newContents = chat.ensureActiveLoopHasThoughtSignatures(history);
       expect(newContents).toEqual([]);
     });
 
-    it('should handle history with only a user message', () => {
-      const chat = new GeminiChat(mockConfig, '', []);
-      const history: Content[] = [{ role: 'user', parts: [{ text: 'Hello' }] }];
+    it("should handle history with only a user message", () => {
+      const chat = new GeminiChat(mockConfig, "", []);
+      const history: Content[] = [{ role: "user", parts: [{ text: "Hello" }] }];
       const newContents = chat.ensureActiveLoopHasThoughtSignatures(history);
       expect(newContents).toEqual(history);
     });
   });
 
-  describe('Availability Service Integration', () => {
+  describe("Availability Service Integration", () => {
     let mockAvailabilityService: ModelAvailabilityService;
 
     beforeEach(async () => {
       mockAvailabilityService = createAvailabilityServiceMock();
-      vi.mocked(mockConfig.getModelAvailabilityService).mockReturnValue(
-        mockAvailabilityService,
-      );
-      vi.mocked(mockConfig.isModelAvailabilityServiceEnabled).mockReturnValue(
-        true,
-      );
+      vi.mocked(mockConfig.getModelAvailabilityService).mockReturnValue(mockAvailabilityService);
+      vi.mocked(mockConfig.isModelAvailabilityServiceEnabled).mockReturnValue(true);
 
       // Stateful mock for activeModel
-      let activeModel = 'model-a';
-      vi.mocked(mockConfig.getActiveModel).mockImplementation(
-        () => activeModel,
-      );
+      let activeModel = "model-a";
+      vi.mocked(mockConfig.getActiveModel).mockImplementation(() => activeModel);
       vi.mocked(mockConfig.setActiveModel).mockImplementation((model) => {
         activeModel = model;
       });
 
-      vi.spyOn(policyHelpers, 'resolvePolicyChain').mockReturnValue([
+      vi.spyOn(policyHelpers, "resolvePolicyChain").mockReturnValue([
         {
-          model: 'model-a',
+          model: "model-a",
           isLastResort: false,
           actions: {},
           stateTransitions: {},
         },
         {
-          model: 'model-b',
+          model: "model-b",
           isLastResort: false,
           actions: {},
           stateTransitions: {},
         },
         {
-          model: 'model-c',
+          model: "model-c",
           isLastResort: true,
           actions: {},
           stateTransitions: {},
@@ -2419,21 +2291,21 @@ describe('GeminiChat', () => {
       ]);
     });
 
-    it('should mark healthy on successful stream', async () => {
+    it("should mark healthy on successful stream", async () => {
       vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
-        selectedModel: 'model-b',
+        selectedModel: "model-b",
         skipped: [],
       });
       // Simulate selection happening upstream
-      mockConfig.setActiveModel('model-b');
+      mockConfig.setActiveModel("model-b");
 
       vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
         (async function* () {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Response' }], role: 'model' },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Response" }], role: "model" },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -2441,23 +2313,21 @@ describe('GeminiChat', () => {
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-pro' },
-        'test',
-        'prompt-healthy',
+        { model: "gemini-pro" },
+        "test",
+        "prompt-healthy",
         new AbortController().signal,
       );
       for await (const _ of stream) {
         // consume
       }
 
-      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith(
-        'model-b',
-      );
+      expect(mockAvailabilityService.markHealthy).toHaveBeenCalledWith("model-b");
     });
 
-    it('caps retries to a single attempt when selection is sticky', async () => {
+    it("caps retries to a single attempt when selection is sticky", async () => {
       vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
-        selectedModel: 'model-a',
+        selectedModel: "model-a",
         attempts: 1,
         skipped: [],
       });
@@ -2467,8 +2337,8 @@ describe('GeminiChat', () => {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Response' }], role: 'model' },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Response" }], role: "model" },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -2476,9 +2346,9 @@ describe('GeminiChat', () => {
       );
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-pro' },
-        'test',
-        'prompt-sticky-once',
+        { model: "gemini-pro" },
+        "test",
+        "prompt-sticky-once",
         new AbortController().signal,
       );
       for await (const _ of stream) {
@@ -2489,28 +2359,24 @@ describe('GeminiChat', () => {
         expect.any(Function),
         expect.objectContaining({ maxAttempts: 1 }),
       );
-      expect(mockAvailabilityService.consumeStickyAttempt).toHaveBeenCalledWith(
-        'model-a',
-      );
+      expect(mockAvailabilityService.consumeStickyAttempt).toHaveBeenCalledWith("model-a");
     });
 
-    it('should pass attempted model to onPersistent429 callback which calls handleFallback', async () => {
+    it("should pass attempted model to onPersistent429 callback which calls handleFallback", async () => {
       vi.mocked(mockAvailabilityService.selectFirstAvailable).mockReturnValue({
-        selectedModel: 'model-a',
+        selectedModel: "model-a",
         skipped: [],
       });
       // Simulate selection happening upstream
-      mockConfig.setActiveModel('model-a');
+      mockConfig.setActiveModel("model-a");
 
       // Simulate retry logic behavior: catch error, call onPersistent429
-      const error = new TerminalQuotaError('Quota', {
+      const error = new TerminalQuotaError("Quota", {
         code: 429,
-        message: 'quota',
+        message: "quota",
         details: [],
       });
-      vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(
-        error,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(error);
 
       // We need retryWithBackoff to trigger the callback
       mockRetryWithBackoff.mockImplementation(async (apiCall, options) => {
@@ -2526,9 +2392,9 @@ describe('GeminiChat', () => {
 
       const consume = async () => {
         const stream = await chat.sendMessageStream(
-          { model: 'gemini-pro' },
-          'test',
-          'prompt-fallback-arg',
+          { model: "gemini-pro" },
+          "test",
+          "prompt-fallback-arg",
           new AbortController().signal,
         );
         for await (const _ of stream) {
@@ -2541,35 +2407,29 @@ describe('GeminiChat', () => {
       // handleFallback is called with the ATTEMPTED model (model-a), not the requested one (gemini-pro)
       expect(mockHandleFallback).toHaveBeenCalledWith(
         expect.anything(),
-        'model-a',
+        "model-a",
         expect.anything(),
         error,
       );
     });
 
-    it('re-resolves generateContentConfig when active model changes between retries', async () => {
+    it("re-resolves generateContentConfig when active model changes between retries", async () => {
       // Availability enabled with stateful active model
-      let activeModel = 'model-a';
-      vi.mocked(mockConfig.getActiveModel).mockImplementation(
-        () => activeModel,
-      );
+      let activeModel = "model-a";
+      vi.mocked(mockConfig.getActiveModel).mockImplementation(() => activeModel);
       vi.mocked(mockConfig.setActiveModel).mockImplementation((model) => {
         activeModel = model;
       });
 
       // Different configs per model
       vi.mocked(mockConfig.modelConfigService.getResolvedConfig)
-        .mockReturnValueOnce(
-          makeResolvedModelConfig('model-a', { temperature: 0.1 }),
-        )
-        .mockReturnValueOnce(
-          makeResolvedModelConfig('model-b', { temperature: 0.9 }),
-        );
+        .mockReturnValueOnce(makeResolvedModelConfig("model-a", { temperature: 0.1 }))
+        .mockReturnValueOnce(makeResolvedModelConfig("model-b", { temperature: 0.9 }));
 
       // First attempt uses model-a, then simulate availability switching to model-b
       mockRetryWithBackoff.mockImplementation(async (apiCall) => {
         await apiCall(); // first attempt
-        activeModel = 'model-b'; // simulate switch before retry
+        activeModel = "model-b"; // simulate switch before retry
         return apiCall(); // second attempt
       });
 
@@ -2578,8 +2438,8 @@ describe('GeminiChat', () => {
         yield {
           candidates: [
             {
-              content: { parts: [{ text: 'first' }], role: 'model' },
-              finishReason: 'STOP',
+              content: { parts: [{ text: "first" }], role: "model" },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
@@ -2588,8 +2448,8 @@ describe('GeminiChat', () => {
         yield {
           candidates: [
             {
-              content: { parts: [{ text: 'second' }], role: 'model' },
-              finishReason: 'STOP',
+              content: { parts: [{ text: "second" }], role: "model" },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
@@ -2599,9 +2459,9 @@ describe('GeminiChat', () => {
         .mockResolvedValueOnce(secondResponse);
 
       const stream = await chat.sendMessageStream(
-        { model: 'gemini-pro' },
-        'test',
-        'prompt-config-refresh',
+        { model: "gemini-pro" },
+        "test",
+        "prompt-config-refresh",
         new AbortController().signal,
       );
       // Consume to drive both attempts
@@ -2609,22 +2469,18 @@ describe('GeminiChat', () => {
         // consume
       }
 
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         1,
         expect.objectContaining({
-          model: 'model-a',
+          model: "model-a",
           config: expect.objectContaining({ temperature: 0.1 }),
         }),
         expect.any(String),
       );
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         2,
         expect.objectContaining({
-          model: 'model-b',
+          model: "model-b",
           config: expect.objectContaining({ temperature: 0.9 }),
         }),
         expect.any(String),
diff --git a/packages/gemini-cli-core/src/core/geminiChat.ts b/packages/gemini-cli-core/src/core/geminiChat.ts
index bec85a515..14bfc9cda 100644
--- a/packages/gemini-cli-core/src/core/geminiChat.ts
+++ b/packages/gemini-cli-core/src/core/geminiChat.ts
@@ -8,62 +8,52 @@
 // where function responses are not treated as "valid" responses: https://b.corp.google.com/issues/420354090
 
 import type {
-  GenerateContentResponse,
   Content,
-  Part,
-  Tool,
-  PartListUnion,
   GenerateContentConfig,
   GenerateContentParameters,
-} from '@google/genai';
-import { ThinkingLevel } from '@google/genai';
-import { toParts } from '../code_assist/converter.js';
-import { createUserContent, FinishReason } from '@google/genai';
-import { retryWithBackoff, isRetryableError } from '../utils/retry.js';
-import type { Config } from '../config/config.js';
+  GenerateContentResponse,
+  Part,
+  PartListUnion,
+  Tool,
+} from "@google/genai";
+import { createUserContent, FinishReason, ThinkingLevel } from "@google/genai";
+import {
+  applyModelSelection,
+  createAvailabilityContextProvider,
+} from "../availability/policyHelpers.js";
+import { toParts } from "../code_assist/converter.js";
+import type { Config } from "../config/config.js";
 import {
   DEFAULT_GEMINI_MODEL,
   DEFAULT_THINKING_MODE,
-  PREVIEW_GEMINI_MODEL,
   getEffectiveModel,
   isGemini2Model,
-} from '../config/models.js';
-import { hasCycleInSchema } from '../tools/tools.js';
-import type { StructuredError } from './turn.js';
-import type { CompletedToolCall } from './coreToolScheduler.js';
-import {
-  logContentRetry,
-  logContentRetryFailure,
-} from '../telemetry/loggers.js';
-import {
-  ChatRecordingService,
-  type ResumedSessionData,
-} from '../services/chatRecordingService.js';
-import {
-  ContentRetryEvent,
-  ContentRetryFailureEvent,
-} from '../telemetry/types.js';
-import { handleFallback } from '../fallback/handler.js';
-import { isFunctionResponse } from '../utils/messageInspectors.js';
-import { partListUnionToString } from './geminiRequest.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
-import { estimateTokenCountSync } from '../utils/tokenCalculation.js';
-import {
-  applyModelSelection,
-  createAvailabilityContextProvider,
-} from '../availability/policyHelpers.js';
+  PREVIEW_GEMINI_MODEL,
+} from "../config/models.js";
+import { handleFallback } from "../fallback/handler.js";
+import { ChatRecordingService, type ResumedSessionData } from "../services/chatRecordingService.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import { logContentRetry, logContentRetryFailure } from "../telemetry/loggers.js";
+import { ContentRetryEvent, ContentRetryFailureEvent } from "../telemetry/types.js";
+import { hasCycleInSchema } from "../tools/tools.js";
+import { isFunctionResponse } from "../utils/messageInspectors.js";
+import { isRetryableError, retryWithBackoff } from "../utils/retry.js";
+import { estimateTokenCountSync } from "../utils/tokenCalculation.js";
+import type { CompletedToolCall } from "./coreToolScheduler.js";
 import {
   fireAfterModelHook,
   fireBeforeModelHook,
   fireBeforeToolSelectionHook,
-} from './geminiChatHookTriggers.js';
+} from "./geminiChatHookTriggers.js";
+import { partListUnionToString } from "./geminiRequest.js";
+import type { StructuredError } from "./turn.js";
 
 export enum StreamEventType {
   /** A regular content chunk from the API. */
-  CHUNK = 'chunk',
+  CHUNK = "chunk",
   /** A signal that a retry is about to happen. The UI should discard any partial
    * content from the attempt that just failed. */
-  RETRY = 'retry',
+  RETRY = "retry",
 }
 
 export type StreamEvent =
@@ -85,7 +75,7 @@ const INVALID_CONTENT_RETRY_OPTIONS: ContentRetryOptions = {
   initialDelayMs: 500,
 };
 
-export const SYNTHETIC_THOUGHT_SIGNATURE = 'skip_thought_signature_validator';
+export const SYNTHETIC_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
 
 /**
  * Returns true if the response is valid, false otherwise.
@@ -103,7 +93,7 @@ function isValidResponse(response: GenerateContentResponse): boolean {
 
 export function isValidNonThoughtTextPart(part: Part): boolean {
   return (
-    typeof part.text === 'string' &&
+    typeof part.text === "string" &&
     !part.thought &&
     // Technically, the model should never generate parts that have text and
     //  any of these but we don't trust them so check anyways.
@@ -122,7 +112,7 @@ function isValidContent(content: Content): boolean {
     if (part === undefined || Object.keys(part).length === 0) {
       return false;
     }
-    if (!part.thought && part.text !== undefined && part.text === '') {
+    if (!part.thought && part.text !== undefined && part.text === "") {
       return false;
     }
   }
@@ -137,7 +127,7 @@ function isValidContent(content: Content): boolean {
  */
 function validateHistory(history: Content[]) {
   for (const content of history) {
-    if (content.role !== 'user' && content.role !== 'model') {
+    if (content.role !== "user" && content.role !== "model") {
       throw new Error(`Role must be user or model, but got ${content.role}.`);
     }
   }
@@ -159,13 +149,13 @@ function extractCuratedHistory(comprehensiveHistory: Content[]): Content[] {
   const length = comprehensiveHistory.length;
   let i = 0;
   while (i < length) {
-    if (comprehensiveHistory[i].role === 'user') {
+    if (comprehensiveHistory[i].role === "user") {
       curatedHistory.push(comprehensiveHistory[i]);
       i++;
     } else {
       const modelOutput: Content[] = [];
       let isValid = true;
-      while (i < length && comprehensiveHistory[i].role === 'model') {
+      while (i < length && comprehensiveHistory[i].role === "model") {
         modelOutput.push(comprehensiveHistory[i]);
         if (isValid && !isValidContent(comprehensiveHistory[i])) {
           isValid = false;
@@ -185,17 +175,14 @@ function extractCuratedHistory(comprehensiveHistory: Content[]): Content[] {
  * which should trigger a retry.
  */
 export class InvalidStreamError extends Error {
-  readonly type:
-    | 'NO_FINISH_REASON'
-    | 'NO_RESPONSE_TEXT'
-    | 'MALFORMED_FUNCTION_CALL';
+  readonly type: "NO_FINISH_REASON" | "NO_RESPONSE_TEXT" | "MALFORMED_FUNCTION_CALL";
 
   constructor(
     message: string,
-    type: 'NO_FINISH_REASON' | 'NO_RESPONSE_TEXT' | 'MALFORMED_FUNCTION_CALL',
+    type: "NO_FINISH_REASON" | "NO_RESPONSE_TEXT" | "MALFORMED_FUNCTION_CALL",
   ) {
     super(message);
-    this.name = 'InvalidStreamError';
+    this.name = "InvalidStreamError";
     this.type = type;
   }
 }
@@ -216,7 +203,7 @@ export class GeminiChat {
 
   constructor(
     private readonly config: Config,
-    private systemInstruction: string = '',
+    private systemInstruction: string = "",
     private tools: Tool[] = [],
     private history: Content[] = [],
     resumedSessionData?: ResumedSessionData,
@@ -224,9 +211,7 @@ export class GeminiChat {
     validateHistory(history);
     this.chatRecordingService = new ChatRecordingService(config);
     this.chatRecordingService.initialize(resumedSessionData);
-    this.lastPromptTokenCount = estimateTokenCountSync(
-      this.history.flatMap((c) => c.parts || []),
-    );
+    this.lastPromptTokenCount = estimateTokenCountSync(this.history.flatMap((c) => c.parts || []));
   }
 
   setSystemInstruction(sysInstr: string) {
@@ -288,7 +273,7 @@ export class GeminiChat {
       const userMessageContent = partListUnionToString(toParts(userMessage));
       this.chatRecordingService.recordMessage({
         model,
-        type: 'user',
+        type: "user",
         content: userMessageContent,
       });
     }
@@ -301,15 +286,12 @@ export class GeminiChat {
       this: GeminiChat,
     ): AsyncGenerator<StreamEvent, void, void> {
       try {
-        let lastError: unknown = new Error('Request failed after all retries.');
+        let lastError: unknown = new Error("Request failed after all retries.");
 
         let maxAttempts = INVALID_CONTENT_RETRY_OPTIONS.maxAttempts;
         // If we are in Preview Model Fallback Mode, we want to fail fast (1 attempt)
         // when probing the Preview Model.
-        if (
-          this.config.isPreviewModelFallbackMode() &&
-          model === PREVIEW_GEMINI_MODEL
-        ) {
+        if (this.config.isPreviewModelFallbackMode() && model === PREVIEW_GEMINI_MODEL) {
           maxAttempts = 1;
         }
 
@@ -345,29 +327,21 @@ export class GeminiChat {
             }
             lastError = error;
             const isContentError = error instanceof InvalidStreamError;
-            const isRetryable = isRetryableError(
-              error,
-              this.config.getRetryFetchErrors(),
-            );
+            const isRetryable = isRetryableError(error, this.config.getRetryFetchErrors());
 
-            if (
-              (isContentError && isGemini2Model(model)) ||
-              (isRetryable && !signal.aborted)
-            ) {
+            if ((isContentError && isGemini2Model(model)) || (isRetryable && !signal.aborted)) {
               // Check if we have more attempts left.
               if (attempt < maxAttempts - 1) {
                 const delayMs = INVALID_CONTENT_RETRY_OPTIONS.initialDelayMs;
                 const retryType = isContentError
                   ? (error as InvalidStreamError).type
-                  : 'NETWORK_ERROR';
+                  : "NETWORK_ERROR";
 
                 logContentRetry(
                   this.config,
                   new ContentRetryEvent(attempt, retryType, delayMs, model),
                 );
-                await new Promise((res) =>
-                  setTimeout(res, delayMs * (attempt + 1)),
-                );
+                await new Promise((res) => setTimeout(res, delayMs * (attempt + 1)));
                 continue;
               }
             }
@@ -376,10 +350,7 @@ export class GeminiChat {
         }
 
         if (lastError) {
-          if (
-            lastError instanceof InvalidStreamError &&
-            isGemini2Model(model)
-          ) {
+          if (lastError instanceof InvalidStreamError && isGemini2Model(model)) {
             logContentRetryFailure(
               this.config,
               new ContentRetryFailureEvent(
@@ -393,10 +364,7 @@ export class GeminiChat {
         } else {
           // Preview Model successfully used, disable fallback mode.
           // We only do this if we didn't bypass Preview Model (i.e. we actually used it).
-          if (
-            model === PREVIEW_GEMINI_MODEL &&
-            !this.config.isPreviewModelBypassMode()
-          ) {
+          if (model === PREVIEW_GEMINI_MODEL && !this.config.isPreviewModelBypassMode()) {
             this.config.setPreviewModelFallbackMode(false);
           }
         }
@@ -414,8 +382,7 @@ export class GeminiChat {
     requestContents: Content[],
     prompt_id: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
-    const contentsForPreviewModel =
-      this.ensureActiveLoopHasThoughtSignatures(requestContents);
+    const contentsForPreviewModel = this.ensureActiveLoopHasThoughtSignatures(requestContents);
 
     // Track final request parameters for AfterModel hooks
     const {
@@ -471,10 +438,7 @@ export class GeminiChat {
         // IF the effective model is currently Preview Model.
         // Note: In availability mode, this should ideally be handled by policy, but preserving
         // bypass logic for now as it handles specific transient behavior.
-        if (
-          this.config.isPreviewModelBypassMode() &&
-          modelToUse === PREVIEW_GEMINI_MODEL
-        ) {
+        if (this.config.isPreviewModelBypassMode() && modelToUse === PREVIEW_GEMINI_MODEL) {
           modelToUse = DEFAULT_GEMINI_MODEL;
         }
       }
@@ -489,7 +453,7 @@ export class GeminiChat {
       };
 
       // TODO(joshualitt): Clean this up with model configs.
-      if (modelToUse.startsWith('gemini-3')) {
+      if (modelToUse.startsWith("gemini-3")) {
         config.thinkingConfig = {
           ...config.thinkingConfig,
           thinkingLevel: ThinkingLevel.HIGH,
@@ -505,9 +469,7 @@ export class GeminiChat {
         delete config.thinkingConfig?.thinkingLevel;
       }
       let contentsToUse =
-        modelToUse === PREVIEW_GEMINI_MODEL
-          ? contentsForPreviewModel
-          : requestContents;
+        modelToUse === PREVIEW_GEMINI_MODEL ? contentsForPreviewModel : requestContents;
 
       // Fire BeforeModel and BeforeToolSelection hooks if enabled
       const hooksEnabled = this.config.getEnableHooks();
@@ -547,23 +509,17 @@ export class GeminiChat {
         }
 
         // Fire BeforeToolSelection hook
-        const toolSelectionResult = await fireBeforeToolSelectionHook(
-          messageBus,
-          {
-            model: modelToUse,
-            config,
-            contents: contentsToUse,
-          },
-        );
+        const toolSelectionResult = await fireBeforeToolSelectionHook(messageBus, {
+          model: modelToUse,
+          config,
+          contents: contentsToUse,
+        });
 
         // Apply tool configuration modifications
         if (toolSelectionResult.toolConfig) {
           config.toolConfig = toolSelectionResult.toolConfig;
         }
-        if (
-          toolSelectionResult.tools &&
-          Array.isArray(toolSelectionResult.tools)
-        ) {
+        if (toolSelectionResult.tools && Array.isArray(toolSelectionResult.tools)) {
           config.tools = toolSelectionResult.tools as Tool[];
         }
       }
@@ -583,10 +539,8 @@ export class GeminiChat {
       );
     };
 
-    const onPersistent429Callback = async (
-      authType?: string,
-      error?: unknown,
-    ) => handleFallback(this.config, lastModelToUse, authType, error);
+    const onPersistent429Callback = async (authType?: string, error?: unknown) =>
+      handleFallback(this.config, lastModelToUse, authType, error);
 
     const streamResponse = await retryWithBackoff(apiCall, {
       onPersistent429: onPersistent429Callback,
@@ -595,8 +549,7 @@ export class GeminiChat {
       signal: generateContentConfig.abortSignal,
       maxAttempts:
         availabilityMaxAttempts ??
-        (this.config.isPreviewModelFallbackMode() &&
-        model === PREVIEW_GEMINI_MODEL
+        (this.config.isPreviewModelFallbackMode() && model === PREVIEW_GEMINI_MODEL
           ? 1
           : undefined),
       getAvailabilityContext,
@@ -609,11 +562,7 @@ export class GeminiChat {
       contents: lastContentsToUse,
     };
 
-    return this.processStreamResponse(
-      lastModelToUse,
-      streamResponse,
-      originalRequest,
-    );
+    return this.processStreamResponse(lastModelToUse, streamResponse, originalRequest);
   }
 
   /**
@@ -640,9 +589,7 @@ export class GeminiChat {
    * chat session.
    */
   getHistory(curated: boolean = false): Content[] {
-    const history = curated
-      ? extractCuratedHistory(this.history)
-      : this.history;
+    const history = curated ? extractCuratedHistory(this.history) : this.history;
     // Deep copy the history to avoid mutating the history outside of the
     // chat session.
     return structuredClone(history);
@@ -671,7 +618,7 @@ export class GeminiChat {
       const newContent = { ...content };
       if (newContent.parts) {
         newContent.parts = newContent.parts.map((part) => {
-          if (part && typeof part === 'object' && 'thoughtSignature' in part) {
+          if (part && typeof part === "object" && "thoughtSignature" in part) {
             const newPart = { ...part };
             delete (newPart as { thoughtSignature?: string }).thoughtSignature;
             return newPart;
@@ -692,7 +639,7 @@ export class GeminiChat {
     let activeLoopStartIndex = -1;
     for (let i = requestContents.length - 1; i >= 0; i--) {
       const content = requestContents[i];
-      if (content.role === 'user' && content.parts?.some((part) => part.text)) {
+      if (content.role === "user" && content.parts?.some((part) => part.text)) {
         activeLoopStartIndex = i;
         break;
       }
@@ -709,7 +656,7 @@ export class GeminiChat {
     const newContents = requestContents.slice(); // Shallow copy the array
     for (let i = activeLoopStartIndex; i < newContents.length; i++) {
       const content = newContents[i];
-      if (content.role === 'model' && content.parts) {
+      if (content.role === "model" && content.parts) {
         const newParts = content.parts.slice();
         for (let j = 0; j < newParts.length; j++) {
           const part = newParts[j]!;
@@ -739,10 +686,7 @@ export class GeminiChat {
   async maybeIncludeSchemaDepthContext(error: StructuredError): Promise<void> {
     // Check for potentially problematic cyclic tools with cyclic schemas
     // and include a recommendation to remove potentially problematic tools.
-    if (
-      isSchemaDepthError(error.message) ||
-      isInvalidArgumentError(error.message)
-    ) {
+    if (isSchemaDepthError(error.message) || isInvalidArgumentError(error.message)) {
       const tools = this.config.getToolRegistry().getAllTools();
       const cyclicSchemaTools: string[] = [];
       for (const tool of tools) {
@@ -775,9 +719,7 @@ export class GeminiChat {
     let finishReason: FinishReason | undefined;
 
     for await (const chunk of streamResponse) {
-      const candidateWithReason = chunk?.candidates?.find(
-        (candidate) => candidate.finishReason,
-      );
+      const candidateWithReason = chunk?.candidates?.find((candidate) => candidate.finishReason);
       if (candidateWithReason) {
         finishReason = candidateWithReason.finishReason as FinishReason;
       }
@@ -793,9 +735,7 @@ export class GeminiChat {
             hasToolCall = true;
           }
 
-          modelResponseParts.push(
-            ...content.parts.filter((part) => !part.thought),
-          );
+          modelResponseParts.push(...content.parts.filter((part) => !part.thought));
         }
       }
 
@@ -811,11 +751,7 @@ export class GeminiChat {
       const hooksEnabled = this.config.getEnableHooks();
       const messageBus = this.config.getMessageBus();
       if (hooksEnabled && messageBus && originalRequest && chunk) {
-        const hookResult = await fireAfterModelHook(
-          messageBus,
-          originalRequest,
-          chunk,
-        );
+        const hookResult = await fireAfterModelHook(messageBus, originalRequest, chunk);
         yield hookResult.response;
       } else {
         yield chunk; // Yield every chunk to the UI immediately.
@@ -840,14 +776,14 @@ export class GeminiChat {
     const responseText = consolidatedParts
       .filter((part) => part.text)
       .map((part) => part.text)
-      .join('')
+      .join("")
       .trim();
 
     // Record model response text from the collected parts
     if (responseText) {
       this.chatRecordingService.recordMessage({
         model,
-        type: 'gemini',
+        type: "gemini",
         content: responseText,
       });
     }
@@ -863,25 +799,25 @@ export class GeminiChat {
     if (!hasToolCall) {
       if (!finishReason) {
         throw new InvalidStreamError(
-          'Model stream ended without a finish reason.',
-          'NO_FINISH_REASON',
+          "Model stream ended without a finish reason.",
+          "NO_FINISH_REASON",
         );
       }
       if (finishReason === FinishReason.MALFORMED_FUNCTION_CALL) {
         throw new InvalidStreamError(
-          'Model stream ended with malformed function call.',
-          'MALFORMED_FUNCTION_CALL',
+          "Model stream ended with malformed function call.",
+          "MALFORMED_FUNCTION_CALL",
         );
       }
       if (!responseText) {
         throw new InvalidStreamError(
-          'Model stream ended with empty response text.',
-          'NO_RESPONSE_TEXT',
+          "Model stream ended with empty response text.",
+          "NO_RESPONSE_TEXT",
         );
       }
     }
 
-    this.history.push({ role: 'model', parts: consolidatedParts });
+    this.history.push({ role: "model", parts: consolidatedParts });
   }
 
   getLastPromptTokenCount(): number {
@@ -899,21 +835,17 @@ export class GeminiChat {
    * Records completed tool calls with full metadata.
    * This is called by external components when tool calls complete, before sending responses to Gemini.
    */
-  recordCompletedToolCalls(
-    model: string,
-    toolCalls: CompletedToolCall[],
-  ): void {
+  recordCompletedToolCalls(model: string, toolCalls: CompletedToolCall[]): void {
     const toolCallRecords = toolCalls.map((call) => {
       const resultDisplayRaw = call.response?.resultDisplay;
-      const resultDisplay =
-        typeof resultDisplayRaw === 'string' ? resultDisplayRaw : undefined;
+      const resultDisplay = typeof resultDisplayRaw === "string" ? resultDisplayRaw : undefined;
 
       return {
         id: call.request.callId,
         name: call.request.name,
         args: call.request.args,
         result: call.response?.responseParts || null,
-        status: call.status as 'error' | 'success' | 'cancelled',
+        status: call.status as "error" | "success" | "cancelled",
         timestamp: new Date().toISOString(),
         resultDisplay,
       };
@@ -935,10 +867,8 @@ export class GeminiChat {
       // Extract subject and description using the same logic as turn.ts
       const rawText = thoughtPart.text;
       const subjectStringMatches = rawText.match(/\*\*(.*?)\*\*/s);
-      const subject = subjectStringMatches
-        ? subjectStringMatches[1].trim()
-        : '';
-      const description = rawText.replace(/\*\*(.*?)\*\*/s, '').trim();
+      const subject = subjectStringMatches ? subjectStringMatches[1].trim() : "";
+      const description = rawText.replace(/\*\*(.*?)\*\*/s, "").trim();
 
       this.chatRecordingService.recordThought({
         subject,
@@ -950,9 +880,9 @@ export class GeminiChat {
 
 /** Visible for Testing */
 export function isSchemaDepthError(errorMessage: string): boolean {
-  return errorMessage.includes('maximum schema depth exceeded');
+  return errorMessage.includes("maximum schema depth exceeded");
 }
 
 export function isInvalidArgumentError(errorMessage: string): boolean {
-  return errorMessage.includes('Request contains an invalid argument');
+  return errorMessage.includes("Request contains an invalid argument");
 }
diff --git a/packages/gemini-cli-core/src/core/geminiChatHookTriggers.ts b/packages/gemini-cli-core/src/core/geminiChatHookTriggers.ts
index 42d50a175..e8f6cbfdf 100644
--- a/packages/gemini-cli-core/src/core/geminiChatHookTriggers.ts
+++ b/packages/gemini-cli-core/src/core/geminiChatHookTriggers.ts
@@ -5,26 +5,26 @@
  */
 
 import type {
-  GenerateContentResponse,
-  GenerateContentParameters,
-  GenerateContentConfig,
   ContentListUnion,
+  GenerateContentConfig,
+  GenerateContentParameters,
+  GenerateContentResponse,
   ToolConfig,
   ToolListUnion,
-} from '@google/genai';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+} from "@google/genai";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
-  MessageBusType,
   type HookExecutionRequest,
   type HookExecutionResponse,
-} from '../confirmation-bus/types.js';
+  MessageBusType,
+} from "../confirmation-bus/types.js";
 import {
-  createHookOutput,
+  type AfterModelHookOutput,
   type BeforeModelHookOutput,
   type BeforeToolSelectionHookOutput,
-  type AfterModelHookOutput,
-} from '../hooks/types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+  createHookOutput,
+} from "../hooks/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
 
 /**
  * Result from firing the BeforeModel hook.
@@ -73,13 +73,10 @@ export async function fireBeforeModelHook(
   llmRequest: GenerateContentParameters,
 ): Promise<BeforeModelHookResult> {
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'BeforeModel',
+        eventName: "BeforeModel",
         input: {
           llm_request: llmRequest as unknown as Record<string, unknown>,
         },
@@ -89,7 +86,7 @@ export async function fireBeforeModelHook(
 
     // Reconstruct result from response
     const beforeResultFinalOutput = response.output
-      ? createHookOutput('BeforeModel', response.output)
+      ? createHookOutput("BeforeModel", response.output)
       : undefined;
 
     const hookOutput = beforeResultFinalOutput;
@@ -99,8 +96,7 @@ export async function fireBeforeModelHook(
     if (blockingError?.blocked || hookOutput?.shouldStopExecution()) {
       const beforeModelOutput = hookOutput as BeforeModelHookOutput;
       const syntheticResponse = beforeModelOutput.getSyntheticResponse();
-      const reason =
-        hookOutput?.getEffectiveReason() || 'Model call blocked by hook';
+      const reason = hookOutput?.getEffectiveReason() || "Model call blocked by hook";
 
       return {
         blocked: true,
@@ -112,8 +108,7 @@ export async function fireBeforeModelHook(
     // Apply modifications from hook
     if (hookOutput) {
       const beforeModelOutput = hookOutput as BeforeModelHookOutput;
-      const modifiedRequest =
-        beforeModelOutput.applyLLMRequestModifications(llmRequest);
+      const modifiedRequest = beforeModelOutput.applyLLMRequestModifications(llmRequest);
 
       return {
         blocked: false,
@@ -141,13 +136,10 @@ export async function fireBeforeToolSelectionHook(
   llmRequest: GenerateContentParameters,
 ): Promise<BeforeToolSelectionHookResult> {
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'BeforeToolSelection',
+        eventName: "BeforeToolSelection",
         input: {
           llm_request: llmRequest as unknown as Record<string, unknown>,
         },
@@ -157,18 +149,17 @@ export async function fireBeforeToolSelectionHook(
 
     // Reconstruct result from response
     const toolSelectionResultFinalOutput = response.output
-      ? createHookOutput('BeforeToolSelection', response.output)
+      ? createHookOutput("BeforeToolSelection", response.output)
       : undefined;
 
     // Apply tool configuration modifications
     if (toolSelectionResultFinalOutput) {
       const beforeToolSelectionOutput =
         toolSelectionResultFinalOutput as BeforeToolSelectionHookOutput;
-      const modifiedConfig =
-        beforeToolSelectionOutput.applyToolConfigModifications({
-          toolConfig: llmRequest.config?.toolConfig,
-          tools: llmRequest.config?.tools,
-        });
+      const modifiedConfig = beforeToolSelectionOutput.applyToolConfigModifications({
+        toolConfig: llmRequest.config?.toolConfig,
+        tools: llmRequest.config?.tools,
+      });
 
       return {
         toolConfig: modifiedConfig.toolConfig,
@@ -197,13 +188,10 @@ export async function fireAfterModelHook(
   chunk: GenerateContentResponse,
 ): Promise<AfterModelHookResult> {
   try {
-    const response = await messageBus.request<
-      HookExecutionRequest,
-      HookExecutionResponse
-    >(
+    const response = await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'AfterModel',
+        eventName: "AfterModel",
         input: {
           llm_request: originalRequest as unknown as Record<string, unknown>,
           llm_response: chunk as unknown as Record<string, unknown>,
@@ -214,7 +202,7 @@ export async function fireAfterModelHook(
 
     // Reconstruct result from response
     const afterResultFinalOutput = response.output
-      ? createHookOutput('AfterModel', response.output)
+      ? createHookOutput("AfterModel", response.output)
       : undefined;
 
     // Apply modifications from hook (handles both normal modifications and stop execution)
diff --git a/packages/gemini-cli-core/src/core/geminiChat_network_retry.test.ts b/packages/gemini-cli-core/src/core/geminiChat_network_retry.test.ts
index 71085188d..e3cdb44b9 100644
--- a/packages/gemini-cli-core/src/core/geminiChat_network_retry.test.ts
+++ b/packages/gemini-cli-core/src/core/geminiChat_network_retry.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { GenerateContentResponse } from '@google/genai';
-import { ApiError } from '@google/genai';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import { GeminiChat, StreamEventType, type StreamEvent } from './geminiChat.js';
-import type { Config } from '../config/config.js';
-import { setSimulate429 } from '../utils/testUtils.js';
-import { HookSystem } from '../hooks/hookSystem.js';
-import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+import type { GenerateContentResponse } from "@google/genai";
+import { ApiError } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { HookSystem } from "../hooks/hookSystem.js";
+import { createMockMessageBus } from "../test-utils/mock-message-bus.js";
+import { setSimulate429 } from "../utils/testUtils.js";
+import { GeminiChat, type StreamEvent, StreamEventType } from "./geminiChat.js";
 
 // Mock fs module
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   default: {
     mkdirSync: vi.fn(),
     writeFileSync: vi.fn(),
     readFileSync: vi.fn(() => {
-      const error = new Error('ENOENT');
-      (error as NodeJS.ErrnoException).code = 'ENOENT';
+      const error = new Error("ENOENT");
+      (error as NodeJS.ErrnoException).code = "ENOENT";
       throw error;
     }),
     existsSync: vi.fn(() => false),
@@ -32,8 +32,8 @@ const { mockRetryWithBackoff } = vi.hoisted(() => ({
   mockRetryWithBackoff: vi.fn(),
 }));
 
-vi.mock('../utils/retry.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../utils/retry.js')>();
+vi.mock("../utils/retry.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/retry.js")>();
   return {
     ...actual,
     retryWithBackoff: mockRetryWithBackoff,
@@ -46,12 +46,12 @@ const { mockLogContentRetry, mockLogContentRetryFailure } = vi.hoisted(() => ({
   mockLogContentRetryFailure: vi.fn(),
 }));
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logContentRetry: mockLogContentRetry,
   logContentRetryFailure: mockLogContentRetryFailure,
 }));
 
-describe('GeminiChat Network Retries', () => {
+describe("GeminiChat Network Retries", () => {
   let mockContentGenerator: ContentGenerator;
   let chat: GeminiChat;
   let mockConfig: Config;
@@ -68,21 +68,21 @@ describe('GeminiChat Network Retries', () => {
     mockRetryWithBackoff.mockImplementation(async (apiCall) => apiCall());
 
     mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryLogPromptsEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
       getDebugMode: () => false,
       getPreviewFeatures: () => false,
       getContentGeneratorConfig: vi.fn().mockReturnValue({
-        authType: 'oauth-personal',
-        model: 'test-model',
+        authType: "oauth-personal",
+        model: "test-model",
       }),
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       isInFallbackMode: vi.fn().mockReturnValue(false),
       getQuotaErrorOccurred: vi.fn().mockReturnValue(false),
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/temp"),
       },
       getToolRegistry: vi.fn().mockReturnValue({ getTool: vi.fn() }),
       getContentGenerator: vi.fn().mockReturnValue(mockContentGenerator),
@@ -103,9 +103,7 @@ describe('GeminiChat Network Retries', () => {
 
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
     setSimulate429(false);
     chat = new GeminiChat(mockConfig);
@@ -115,10 +113,10 @@ describe('GeminiChat Network Retries', () => {
     vi.restoreAllMocks();
   });
 
-  it('should retry when a 503 ApiError occurs during stream iteration', async () => {
+  it("should retry when a 503 ApiError occurs during stream iteration", async () => {
     // 1. Mock the API to yield one chunk, then throw a 503 error.
     const error503 = new ApiError({
-      message: 'Service Unavailable',
+      message: "Service Unavailable",
       status: 503,
     });
 
@@ -126,7 +124,7 @@ describe('GeminiChat Network Retries', () => {
       .mockImplementationOnce(async () =>
         (async function* () {
           yield {
-            candidates: [{ content: { parts: [{ text: 'First part' }] } }],
+            candidates: [{ content: { parts: [{ text: "First part" }] } }],
           } as unknown as GenerateContentResponse;
           throw error503;
         })(),
@@ -136,8 +134,8 @@ describe('GeminiChat Network Retries', () => {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Retry success' }] },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Retry success" }] },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -146,9 +144,9 @@ describe('GeminiChat Network Retries', () => {
 
     // 2. Execute sendMessageStream
     const stream = await chat.sendMessageStream(
-      { model: 'test-model' },
-      'test message',
-      'prompt-id-retry-network',
+      { model: "test-model" },
+      "test message",
+      "prompt-id-retry-network",
       new AbortController().signal,
     );
 
@@ -164,7 +162,7 @@ describe('GeminiChat Network Retries', () => {
     const firstChunk = events.find(
       (e) =>
         e.type === StreamEventType.CHUNK &&
-        e.value.candidates?.[0]?.content?.parts?.[0]?.text === 'First part',
+        e.value.candidates?.[0]?.content?.parts?.[0]?.text === "First part",
     );
     expect(firstChunk).toBeDefined();
 
@@ -174,7 +172,7 @@ describe('GeminiChat Network Retries', () => {
     const successChunk = events.find(
       (e) =>
         e.type === StreamEventType.CHUNK &&
-        e.value.candidates?.[0]?.content?.parts?.[0]?.text === 'Retry success',
+        e.value.candidates?.[0]?.content?.parts?.[0]?.text === "Retry success",
     );
     expect(successChunk).toBeDefined();
 
@@ -182,21 +180,21 @@ describe('GeminiChat Network Retries', () => {
     expect(mockLogContentRetry).toHaveBeenCalledWith(
       expect.anything(),
       expect.objectContaining({
-        error_type: 'NETWORK_ERROR',
+        error_type: "NETWORK_ERROR",
       }),
     );
   });
 
-  it('should retry on generic network error if retryFetchErrors is true', async () => {
+  it("should retry on generic network error if retryFetchErrors is true", async () => {
     vi.mocked(mockConfig.getRetryFetchErrors).mockReturnValue(true);
 
-    const fetchError = new Error('fetch failed: socket hang up');
+    const fetchError = new Error("fetch failed: socket hang up");
 
     vi.mocked(mockContentGenerator.generateContentStream)
       .mockImplementationOnce(async () =>
         (async function* () {
           yield {
-            candidates: [{ content: { parts: [{ text: '' }] } }],
+            candidates: [{ content: { parts: [{ text: "" }] } }],
           } as GenerateContentResponse; // Dummy yield
           throw fetchError;
         })(),
@@ -206,8 +204,8 @@ describe('GeminiChat Network Retries', () => {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Success' }] },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Success" }] },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -215,9 +213,9 @@ describe('GeminiChat Network Retries', () => {
       );
 
     const stream = await chat.sendMessageStream(
-      { model: 'test-model' },
-      'test message',
-      'prompt-id-retry-fetch',
+      { model: "test-model" },
+      "test message",
+      "prompt-id-retry-fetch",
       new AbortController().signal,
     );
 
@@ -232,32 +230,30 @@ describe('GeminiChat Network Retries', () => {
     const successChunk = events.find(
       (e) =>
         e.type === StreamEventType.CHUNK &&
-        e.value.candidates?.[0]?.content?.parts?.[0]?.text === 'Success',
+        e.value.candidates?.[0]?.content?.parts?.[0]?.text === "Success",
     );
     expect(successChunk).toBeDefined();
   });
 
-  it('should NOT retry on 400 ApiError', async () => {
+  it("should NOT retry on 400 ApiError", async () => {
     const error400 = new ApiError({
-      message: 'Bad Request',
+      message: "Bad Request",
       status: 400,
     });
 
-    vi.mocked(
-      mockContentGenerator.generateContentStream,
-    ).mockImplementationOnce(async () =>
+    vi.mocked(mockContentGenerator.generateContentStream).mockImplementationOnce(async () =>
       (async function* () {
         yield {
-          candidates: [{ content: { parts: [{ text: '' }] } }],
+          candidates: [{ content: { parts: [{ text: "" }] } }],
         } as GenerateContentResponse; // Dummy yield
         throw error400;
       })(),
     );
 
     const stream = await chat.sendMessageStream(
-      { model: 'test-model' },
-      'test message',
-      'prompt-id-no-retry',
+      { model: "test-model" },
+      "test message",
+      "prompt-id-no-retry",
       new AbortController().signal,
     );
 
diff --git a/packages/gemini-cli-core/src/core/geminiRequest.ts b/packages/gemini-cli-core/src/core/geminiRequest.ts
index f3c52fbb6..9eccea5cd 100644
--- a/packages/gemini-cli-core/src/core/geminiRequest.ts
+++ b/packages/gemini-cli-core/src/core/geminiRequest.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type PartListUnion } from '@google/genai';
-import { partToString } from '../utils/partUtils.js';
+import { type PartListUnion } from "@google/genai";
+import { partToString } from "../utils/partUtils.js";
 
 /**
  * Represents a request to be sent to the Gemini API.
diff --git a/packages/gemini-cli-core/src/core/logger.test.ts b/packages/gemini-cli-core/src/core/logger.test.ts
index 82c28c8f0..5c6f5e765 100644
--- a/packages/gemini-cli-core/src/core/logger.test.ts
+++ b/packages/gemini-cli-core/src/core/logger.test.ts
@@ -4,46 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  afterAll,
-} from 'vitest';
-import type { LogEntry } from './logger.js';
-import {
-  Logger,
-  MessageSenderType,
-  encodeTagName,
-  decodeTagName,
-} from './logger.js';
-import { AuthType } from './contentGenerator.js';
-import { Storage } from '../config/storage.js';
-import { promises as fs, existsSync } from 'node:fs';
-import path from 'node:path';
-import type { Content } from '@google/genai';
-
-import crypto from 'node:crypto';
-import os from 'node:os';
-import { GEMINI_DIR } from '../utils/paths.js';
-import { debugLogger } from '../utils/debugLogger.js';
-
-const TMP_DIR_NAME = 'tmp';
-const LOG_FILE_NAME = 'logs.json';
-const CHECKPOINT_FILE_NAME = 'checkpoint.json';
+import crypto from "node:crypto";
+import { existsSync, promises as fs } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import type { Content } from "@google/genai";
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Storage } from "../config/storage.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import { AuthType } from "./contentGenerator.js";
+import type { LogEntry } from "./logger.js";
+import { decodeTagName, encodeTagName, Logger, MessageSenderType } from "./logger.js";
+
+const TMP_DIR_NAME = "tmp";
+const LOG_FILE_NAME = "logs.json";
+const CHECKPOINT_FILE_NAME = "checkpoint.json";
 
 const projectDir = process.cwd();
-const hash = crypto.createHash('sha256').update(projectDir).digest('hex');
+const hash = crypto.createHash("sha256").update(projectDir).digest("hex");
 const TEST_GEMINI_DIR = path.join(os.homedir(), GEMINI_DIR, TMP_DIR_NAME, hash);
 
 const TEST_LOG_FILE_PATH = path.join(TEST_GEMINI_DIR, LOG_FILE_NAME);
-const TEST_CHECKPOINT_FILE_PATH = path.join(
-  TEST_GEMINI_DIR,
-  CHECKPOINT_FILE_NAME,
-);
+const TEST_CHECKPOINT_FILE_PATH = path.join(TEST_GEMINI_DIR, CHECKPOINT_FILE_NAME);
 
 async function cleanupLogAndCheckpointFiles() {
   try {
@@ -55,28 +38,28 @@ async function cleanupLogAndCheckpointFiles() {
 
 async function readLogFile(): Promise<LogEntry[]> {
   try {
-    const content = await fs.readFile(TEST_LOG_FILE_PATH, 'utf-8');
+    const content = await fs.readFile(TEST_LOG_FILE_PATH, "utf-8");
     return JSON.parse(content) as LogEntry[];
   } catch (error) {
-    if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
       return [];
     }
     throw error;
   }
 }
 
-vi.mock('../utils/session.js', () => ({
-  sessionId: 'test-session-id',
+vi.mock("../utils/session.js", () => ({
+  sessionId: "test-session-id",
 }));
 
-describe('Logger', () => {
+describe("Logger", () => {
   let logger: Logger;
-  const testSessionId = 'test-session-id';
+  const testSessionId = "test-session-id";
 
   beforeEach(async () => {
     vi.resetAllMocks();
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-01-01T12:00:00.000Z'));
+    vi.setSystemTime(new Date("2025-01-01T12:00:00.000Z"));
     // Clean up before the test
     await cleanupLogAndCheckpointFiles();
     // Ensure the directory exists for the test
@@ -100,8 +83,8 @@ describe('Logger', () => {
     await cleanupLogAndCheckpointFiles();
   });
 
-  describe('initialize', () => {
-    it('should create .gemini directory and an empty log file if none exist', async () => {
+  describe("initialize", () => {
+    it("should create .gemini directory and an empty log file if none exist", async () => {
       const dirExists = await fs
         .access(TEST_GEMINI_DIR)
         .then(() => true)
@@ -118,90 +101,79 @@ describe('Logger', () => {
       expect(logContent).toEqual([]);
     });
 
-    it('should load existing logs and set correct messageId for the current session', async () => {
-      const currentSessionId = 'session-123';
-      const anotherSessionId = 'session-456';
+    it("should load existing logs and set correct messageId for the current session", async () => {
+      const currentSessionId = "session-123";
+      const anotherSessionId = "session-456";
       const existingLogs: LogEntry[] = [
         {
           sessionId: currentSessionId,
           messageId: 0,
-          timestamp: new Date('2025-01-01T10:00:05.000Z').toISOString(),
+          timestamp: new Date("2025-01-01T10:00:05.000Z").toISOString(),
           type: MessageSenderType.USER,
-          message: 'Msg1',
+          message: "Msg1",
         },
         {
           sessionId: anotherSessionId,
           messageId: 5,
-          timestamp: new Date('2025-01-01T09:00:00.000Z').toISOString(),
+          timestamp: new Date("2025-01-01T09:00:00.000Z").toISOString(),
           type: MessageSenderType.USER,
-          message: 'OldMsg',
+          message: "OldMsg",
         },
         {
           sessionId: currentSessionId,
           messageId: 1,
-          timestamp: new Date('2025-01-01T10:00:10.000Z').toISOString(),
+          timestamp: new Date("2025-01-01T10:00:10.000Z").toISOString(),
           type: MessageSenderType.USER,
-          message: 'Msg2',
+          message: "Msg2",
         },
       ];
-      await fs.writeFile(
-        TEST_LOG_FILE_PATH,
-        JSON.stringify(existingLogs, null, 2),
-      );
-      const newLogger = new Logger(
-        currentSessionId,
-        new Storage(process.cwd()),
-      );
+      await fs.writeFile(TEST_LOG_FILE_PATH, JSON.stringify(existingLogs, null, 2));
+      const newLogger = new Logger(currentSessionId, new Storage(process.cwd()));
       await newLogger.initialize();
-      expect(newLogger['messageId']).toBe(2);
-      expect(newLogger['logs']).toEqual(existingLogs);
+      expect(newLogger["messageId"]).toBe(2);
+      expect(newLogger["logs"]).toEqual(existingLogs);
       newLogger.close();
     });
 
-    it('should set messageId to 0 for a new session if log file exists but has no logs for current session', async () => {
+    it("should set messageId to 0 for a new session if log file exists but has no logs for current session", async () => {
       const existingLogs: LogEntry[] = [
         {
-          sessionId: 'some-other-session',
+          sessionId: "some-other-session",
           messageId: 5,
           timestamp: new Date().toISOString(),
           type: MessageSenderType.USER,
-          message: 'OldMsg',
+          message: "OldMsg",
         },
       ];
-      await fs.writeFile(
-        TEST_LOG_FILE_PATH,
-        JSON.stringify(existingLogs, null, 2),
-      );
-      const newLogger = new Logger('a-new-session', new Storage(process.cwd()));
+      await fs.writeFile(TEST_LOG_FILE_PATH, JSON.stringify(existingLogs, null, 2));
+      const newLogger = new Logger("a-new-session", new Storage(process.cwd()));
       await newLogger.initialize();
-      expect(newLogger['messageId']).toBe(0);
+      expect(newLogger["messageId"]).toBe(0);
       newLogger.close();
     });
 
-    it('should be idempotent', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'test message');
-      const initialMessageId = logger['messageId'];
-      const initialLogCount = logger['logs'].length;
+    it("should be idempotent", async () => {
+      await logger.logMessage(MessageSenderType.USER, "test message");
+      const initialMessageId = logger["messageId"];
+      const initialLogCount = logger["logs"].length;
 
       await logger.initialize(); // Second call should not change state
 
-      expect(logger['messageId']).toBe(initialMessageId);
-      expect(logger['logs'].length).toBe(initialLogCount);
+      expect(logger["messageId"]).toBe(initialMessageId);
+      expect(logger["logs"].length).toBe(initialLogCount);
       const logsFromFile = await readLogFile();
       expect(logsFromFile.length).toBe(1);
     });
 
-    it('should handle invalid JSON in log file by backing it up and starting fresh', async () => {
-      await fs.writeFile(TEST_LOG_FILE_PATH, 'invalid json');
-      const consoleDebugSpy = vi
-        .spyOn(debugLogger, 'debug')
-        .mockImplementation(() => {});
+    it("should handle invalid JSON in log file by backing it up and starting fresh", async () => {
+      await fs.writeFile(TEST_LOG_FILE_PATH, "invalid json");
+      const consoleDebugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
 
       const newLogger = new Logger(testSessionId, new Storage(process.cwd()));
       await newLogger.initialize();
 
       expect(consoleDebugSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Invalid JSON in log file'),
+        expect.stringContaining("Invalid JSON in log file"),
         expect.any(SyntaxError),
       );
       const logContent = await readLogFile();
@@ -209,21 +181,15 @@ describe('Logger', () => {
       const dirContents = await fs.readdir(TEST_GEMINI_DIR);
       expect(
         dirContents.some(
-          (f) =>
-            f.startsWith(LOG_FILE_NAME + '.invalid_json') && f.endsWith('.bak'),
+          (f) => f.startsWith(LOG_FILE_NAME + ".invalid_json") && f.endsWith(".bak"),
         ),
       ).toBe(true);
       newLogger.close();
     });
 
-    it('should handle non-array JSON in log file by backing it up and starting fresh', async () => {
-      await fs.writeFile(
-        TEST_LOG_FILE_PATH,
-        JSON.stringify({ not: 'an array' }),
-      );
-      const consoleDebugSpy = vi
-        .spyOn(debugLogger, 'debug')
-        .mockImplementation(() => {});
+    it("should handle non-array JSON in log file by backing it up and starting fresh", async () => {
+      await fs.writeFile(TEST_LOG_FILE_PATH, JSON.stringify({ not: "an array" }));
+      const consoleDebugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
 
       const newLogger = new Logger(testSessionId, new Storage(process.cwd()));
       await newLogger.initialize();
@@ -236,172 +202,143 @@ describe('Logger', () => {
       const dirContents = await fs.readdir(TEST_GEMINI_DIR);
       expect(
         dirContents.some(
-          (f) =>
-            f.startsWith(LOG_FILE_NAME + '.malformed_array') &&
-            f.endsWith('.bak'),
+          (f) => f.startsWith(LOG_FILE_NAME + ".malformed_array") && f.endsWith(".bak"),
         ),
       ).toBe(true);
       newLogger.close();
     });
   });
 
-  describe('logMessage', () => {
-    it('should append a message to the log file and update in-memory logs', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'Hello, world!');
+  describe("logMessage", () => {
+    it("should append a message to the log file and update in-memory logs", async () => {
+      await logger.logMessage(MessageSenderType.USER, "Hello, world!");
       const logsFromFile = await readLogFile();
       expect(logsFromFile.length).toBe(1);
       expect(logsFromFile[0]).toMatchObject({
         sessionId: testSessionId,
         messageId: 0,
         type: MessageSenderType.USER,
-        message: 'Hello, world!',
-        timestamp: new Date('2025-01-01T12:00:00.000Z').toISOString(),
+        message: "Hello, world!",
+        timestamp: new Date("2025-01-01T12:00:00.000Z").toISOString(),
       });
-      expect(logger['logs'].length).toBe(1);
-      expect(logger['logs'][0]).toEqual(logsFromFile[0]);
-      expect(logger['messageId']).toBe(1);
+      expect(logger["logs"].length).toBe(1);
+      expect(logger["logs"][0]).toEqual(logsFromFile[0]);
+      expect(logger["messageId"]).toBe(1);
     });
 
-    it('should correctly increment messageId for subsequent messages in the same session', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'First');
+    it("should correctly increment messageId for subsequent messages in the same session", async () => {
+      await logger.logMessage(MessageSenderType.USER, "First");
       vi.advanceTimersByTime(1000);
-      await logger.logMessage(MessageSenderType.USER, 'Second');
+      await logger.logMessage(MessageSenderType.USER, "Second");
       const logs = await readLogFile();
       expect(logs.length).toBe(2);
       expect(logs[0].messageId).toBe(0);
       expect(logs[1].messageId).toBe(1);
       expect(logs[1].timestamp).not.toBe(logs[0].timestamp);
-      expect(logger['messageId']).toBe(2);
+      expect(logger["messageId"]).toBe(2);
     });
 
-    it('should handle logger not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should handle logger not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close(); // Ensure it's treated as uninitialized
-      const consoleDebugSpy = vi
-        .spyOn(debugLogger, 'debug')
-        .mockImplementation(() => {});
-      await uninitializedLogger.logMessage(MessageSenderType.USER, 'test');
+      const consoleDebugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
+      await uninitializedLogger.logMessage(MessageSenderType.USER, "test");
       expect(consoleDebugSpy).toHaveBeenCalledWith(
-        'Logger not initialized or session ID missing. Cannot log message.',
+        "Logger not initialized or session ID missing. Cannot log message.",
       );
       expect((await readLogFile()).length).toBe(0);
       uninitializedLogger.close();
     });
 
-    it('should simulate concurrent writes from different logger instances to the same file', async () => {
-      const concurrentSessionId = 'concurrent-session';
-      const logger1 = new Logger(
-        concurrentSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should simulate concurrent writes from different logger instances to the same file", async () => {
+      const concurrentSessionId = "concurrent-session";
+      const logger1 = new Logger(concurrentSessionId, new Storage(process.cwd()));
       await logger1.initialize();
 
-      const logger2 = new Logger(
-        concurrentSessionId,
-        new Storage(process.cwd()),
-      );
+      const logger2 = new Logger(concurrentSessionId, new Storage(process.cwd()));
       await logger2.initialize();
-      expect(logger2['sessionId']).toEqual(logger1['sessionId']);
+      expect(logger2["sessionId"]).toEqual(logger1["sessionId"]);
 
-      await logger1.logMessage(MessageSenderType.USER, 'L1M1');
+      await logger1.logMessage(MessageSenderType.USER, "L1M1");
       vi.advanceTimersByTime(10);
-      await logger2.logMessage(MessageSenderType.USER, 'L2M1');
+      await logger2.logMessage(MessageSenderType.USER, "L2M1");
       vi.advanceTimersByTime(10);
-      await logger1.logMessage(MessageSenderType.USER, 'L1M2');
+      await logger1.logMessage(MessageSenderType.USER, "L1M2");
       vi.advanceTimersByTime(10);
-      await logger2.logMessage(MessageSenderType.USER, 'L2M2');
+      await logger2.logMessage(MessageSenderType.USER, "L2M2");
 
       const logsFromFile = await readLogFile();
       expect(logsFromFile.length).toBe(4);
-      const messageIdsInFile = logsFromFile
-        .map((log) => log.messageId)
-        .sort((a, b) => a - b);
+      const messageIdsInFile = logsFromFile.map((log) => log.messageId).sort((a, b) => a - b);
       expect(messageIdsInFile).toEqual([0, 1, 2, 3]);
 
       const messagesInFile = logsFromFile
         .sort((a, b) => a.messageId - b.messageId)
         .map((l) => l.message);
-      expect(messagesInFile).toEqual(['L1M1', 'L2M1', 'L1M2', 'L2M2']);
+      expect(messagesInFile).toEqual(["L1M1", "L2M1", "L1M2", "L2M2"]);
 
       // Check internal state (next messageId each logger would use for that session)
-      expect(logger1['messageId']).toBe(3);
-      expect(logger2['messageId']).toBe(4);
+      expect(logger1["messageId"]).toBe(3);
+      expect(logger2["messageId"]).toBe(4);
 
       logger1.close();
       logger2.close();
     });
 
-    it('should not throw, not increment messageId, and log error if writing to file fails', async () => {
-      vi.spyOn(fs, 'writeFile').mockRejectedValueOnce(new Error('Disk full'));
-      const consoleDebugSpy = vi
-        .spyOn(debugLogger, 'debug')
-        .mockImplementation(() => {});
-      const initialMessageId = logger['messageId'];
-      const initialLogCount = logger['logs'].length;
+    it("should not throw, not increment messageId, and log error if writing to file fails", async () => {
+      vi.spyOn(fs, "writeFile").mockRejectedValueOnce(new Error("Disk full"));
+      const consoleDebugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
+      const initialMessageId = logger["messageId"];
+      const initialLogCount = logger["logs"].length;
 
-      await logger.logMessage(MessageSenderType.USER, 'test fail write');
+      await logger.logMessage(MessageSenderType.USER, "test fail write");
 
-      expect(consoleDebugSpy).toHaveBeenCalledWith(
-        'Error writing to log file:',
-        expect.any(Error),
-      );
-      expect(logger['messageId']).toBe(initialMessageId); // Not incremented
-      expect(logger['logs'].length).toBe(initialLogCount); // Log not added to in-memory cache
+      expect(consoleDebugSpy).toHaveBeenCalledWith("Error writing to log file:", expect.any(Error));
+      expect(logger["messageId"]).toBe(initialMessageId); // Not incremented
+      expect(logger["logs"].length).toBe(initialLogCount); // Log not added to in-memory cache
     });
   });
 
-  describe('getPreviousUserMessages', () => {
-    it('should retrieve all user messages from logs, sorted newest first', async () => {
-      const loggerSort = new Logger('session-1', new Storage(process.cwd()));
+  describe("getPreviousUserMessages", () => {
+    it("should retrieve all user messages from logs, sorted newest first", async () => {
+      const loggerSort = new Logger("session-1", new Storage(process.cwd()));
       await loggerSort.initialize();
-      await loggerSort.logMessage(MessageSenderType.USER, 'S1M0_ts100000');
+      await loggerSort.logMessage(MessageSenderType.USER, "S1M0_ts100000");
       vi.advanceTimersByTime(1000);
-      await loggerSort.logMessage(MessageSenderType.USER, 'S1M1_ts101000');
+      await loggerSort.logMessage(MessageSenderType.USER, "S1M1_ts101000");
       vi.advanceTimersByTime(1000);
       // Switch to a different session to log
-      const loggerSort2 = new Logger('session-2', new Storage(process.cwd()));
+      const loggerSort2 = new Logger("session-2", new Storage(process.cwd()));
       await loggerSort2.initialize();
-      await loggerSort2.logMessage(MessageSenderType.USER, 'S2M0_ts102000');
+      await loggerSort2.logMessage(MessageSenderType.USER, "S2M0_ts102000");
       vi.advanceTimersByTime(1000);
-      await loggerSort2.logMessage(
-        'model' as MessageSenderType,
-        'S2_Model_ts103000',
-      );
+      await loggerSort2.logMessage("model" as MessageSenderType, "S2_Model_ts103000");
       vi.advanceTimersByTime(1000);
-      await loggerSort2.logMessage(MessageSenderType.USER, 'S2M1_ts104000');
+      await loggerSort2.logMessage(MessageSenderType.USER, "S2M1_ts104000");
       loggerSort.close();
       loggerSort2.close();
 
-      const finalLogger = new Logger(
-        'final-session',
-        new Storage(process.cwd()),
-      );
+      const finalLogger = new Logger("final-session", new Storage(process.cwd()));
       await finalLogger.initialize();
 
       const messages = await finalLogger.getPreviousUserMessages();
       expect(messages).toEqual([
-        'S2M1_ts104000',
-        'S2M0_ts102000',
-        'S1M1_ts101000',
-        'S1M0_ts100000',
+        "S2M1_ts104000",
+        "S2M0_ts102000",
+        "S1M1_ts101000",
+        "S1M0_ts100000",
       ]);
       finalLogger.close();
     });
 
-    it('should return empty array if no user messages exist', async () => {
-      await logger.logMessage('system' as MessageSenderType, 'System boot');
+    it("should return empty array if no user messages exist", async () => {
+      await logger.logMessage("system" as MessageSenderType, "System boot");
       const messages = await logger.getPreviousUserMessages();
       expect(messages).toEqual([]);
     });
 
-    it('should return empty array if logger not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should return empty array if logger not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
       const messages = await uninitializedLogger.getPreviousUserMessages();
       expect(messages).toEqual([]);
@@ -409,112 +346,92 @@ describe('Logger', () => {
     });
   });
 
-  describe('saveCheckpoint', () => {
+  describe("saveCheckpoint", () => {
     const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
+      { role: "model", parts: [{ text: "Hi there" }] },
     ];
 
     it.each([
       {
-        tag: 'test-tag',
-        encodedTag: 'test-tag',
+        tag: "test-tag",
+        encodedTag: "test-tag",
       },
       {
-        tag: '你好世界',
-        encodedTag: '%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C',
+        tag: "你好世界",
+        encodedTag: "%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C",
       },
       {
-        tag: 'japanese-ひらがなひらがな形声',
+        tag: "japanese-ひらがなひらがな形声",
         encodedTag:
-          'japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0',
+          "japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0",
       },
       {
-        tag: '../../secret',
-        encodedTag: '..%2F..%2Fsecret',
+        tag: "../../secret",
+        encodedTag: "..%2F..%2Fsecret",
       },
-    ])('should save a checkpoint', async ({ tag, encodedTag }) => {
+    ])("should save a checkpoint", async ({ tag, encodedTag }) => {
       await logger.saveCheckpoint(
         { history: conversation, authType: AuthType.LOGIN_WITH_GOOGLE },
         tag,
       );
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
-      const fileContent = await fs.readFile(taggedFilePath, 'utf-8');
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
+      const fileContent = await fs.readFile(taggedFilePath, "utf-8");
       expect(JSON.parse(fileContent)).toEqual({
         history: conversation,
         authType: AuthType.LOGIN_WITH_GOOGLE,
       });
     });
 
-    it('should not throw if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should not throw if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
-      const consoleErrorSpy = vi
-        .spyOn(debugLogger, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
       await expect(
-        uninitializedLogger.saveCheckpoint({ history: conversation }, 'tag'),
+        uninitializedLogger.saveCheckpoint({ history: conversation }, "tag"),
       ).resolves.not.toThrow();
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.",
       );
     });
   });
 
-  describe('loadCheckpoint', () => {
+  describe("loadCheckpoint", () => {
     const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
+      { role: "model", parts: [{ text: "Hi there" }] },
     ];
 
     beforeEach(async () => {
-      await fs.writeFile(
-        TEST_CHECKPOINT_FILE_PATH,
-        JSON.stringify(conversation, null, 2),
-      );
+      await fs.writeFile(TEST_CHECKPOINT_FILE_PATH, JSON.stringify(conversation, null, 2));
     });
 
     it.each([
       {
-        tag: 'test-tag',
-        encodedTag: 'test-tag',
+        tag: "test-tag",
+        encodedTag: "test-tag",
       },
       {
-        tag: '你好世界',
-        encodedTag: '%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C',
+        tag: "你好世界",
+        encodedTag: "%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C",
       },
       {
-        tag: 'japanese-ひらがなひらがな形声',
+        tag: "japanese-ひらがなひらがな形声",
         encodedTag:
-          'japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0',
+          "japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0",
       },
       {
-        tag: '../../secret',
-        encodedTag: '..%2F..%2Fsecret',
+        tag: "../../secret",
+        encodedTag: "..%2F..%2Fsecret",
       },
-    ])('should load from a checkpoint', async ({ tag, encodedTag }) => {
+    ])("should load from a checkpoint", async ({ tag, encodedTag }) => {
       const taggedConversation = {
-        history: [
-          ...conversation,
-          { role: 'user', parts: [{ text: 'hello' }] },
-        ],
+        history: [...conversation, { role: "user", parts: [{ text: "hello" }] }],
         authType: AuthType.USE_GEMINI,
       };
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
-      await fs.writeFile(
-        taggedFilePath,
-        JSON.stringify(taggedConversation, null, 2),
-      );
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
+      await fs.writeFile(taggedFilePath, JSON.stringify(taggedConversation, null, 2));
 
       const loaded = await logger.loadCheckpoint(tag);
       expect(loaded).toEqual(taggedConversation);
@@ -522,84 +439,66 @@ describe('Logger', () => {
       expect(decodeTagName(encodedTag)).toBe(tag);
     });
 
-    it('should load a legacy checkpoint without authType', async () => {
-      const tag = 'legacy-tag';
-      const encodedTag = 'legacy-tag';
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
+    it("should load a legacy checkpoint without authType", async () => {
+      const tag = "legacy-tag";
+      const encodedTag = "legacy-tag";
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
       await fs.writeFile(taggedFilePath, JSON.stringify(conversation, null, 2));
 
       const loaded = await logger.loadCheckpoint(tag);
       expect(loaded).toEqual({ history: conversation });
     });
 
-    it('should return an empty history if a tagged checkpoint file does not exist', async () => {
-      const loaded = await logger.loadCheckpoint('nonexistent-tag');
+    it("should return an empty history if a tagged checkpoint file does not exist", async () => {
+      const loaded = await logger.loadCheckpoint("nonexistent-tag");
       expect(loaded).toEqual({ history: [] });
     });
 
-    it('should return an empty history if the checkpoint file does not exist', async () => {
+    it("should return an empty history if the checkpoint file does not exist", async () => {
       await fs.unlink(TEST_CHECKPOINT_FILE_PATH); // Ensure it's gone
-      const loaded = await logger.loadCheckpoint('missing');
+      const loaded = await logger.loadCheckpoint("missing");
       expect(loaded).toEqual({ history: [] });
     });
 
-    it('should return an empty history if the file contains invalid JSON', async () => {
-      const tag = 'invalid-json-tag';
-      const encodedTag = 'invalid-json-tag';
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
-      await fs.writeFile(taggedFilePath, 'invalid json');
-      const consoleErrorSpy = vi
-        .spyOn(debugLogger, 'error')
-        .mockImplementation(() => {});
+    it("should return an empty history if the file contains invalid JSON", async () => {
+      const tag = "invalid-json-tag";
+      const encodedTag = "invalid-json-tag";
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
+      await fs.writeFile(taggedFilePath, "invalid json");
+      const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
       const loadedCheckpoint = await logger.loadCheckpoint(tag);
       expect(loadedCheckpoint).toEqual({ history: [] });
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Failed to read or parse checkpoint file'),
+        expect.stringContaining("Failed to read or parse checkpoint file"),
         expect.any(Error),
       );
     });
 
-    it('should return an empty history if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should return an empty history if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
-      const consoleErrorSpy = vi
-        .spyOn(debugLogger, 'error')
-        .mockImplementation(() => {});
-      const loadedCheckpoint = await uninitializedLogger.loadCheckpoint('tag');
+      const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
+      const loadedCheckpoint = await uninitializedLogger.loadCheckpoint("tag");
       expect(loadedCheckpoint).toEqual({ history: [] });
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Logger not initialized or checkpoint file path not set. Cannot load checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot load checkpoint.",
       );
     });
   });
 
-  describe('deleteCheckpoint', () => {
-    const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Content to be deleted' }] },
-    ];
-    const tag = 'delete-me';
-    const encodedTag = 'delete-me';
+  describe("deleteCheckpoint", () => {
+    const conversation: Content[] = [{ role: "user", parts: [{ text: "Content to be deleted" }] }];
+    const tag = "delete-me";
+    const encodedTag = "delete-me";
     let taggedFilePath: string;
 
     beforeEach(async () => {
-      taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
+      taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
       // Create a file to be deleted
       await fs.writeFile(taggedFilePath, JSON.stringify(conversation));
     });
 
-    it('should delete the specified checkpoint file and return true', async () => {
+    it("should delete the specified checkpoint file and return true", async () => {
       const result = await logger.deleteCheckpoint(tag);
       expect(result).toBe(true);
 
@@ -607,17 +506,14 @@ describe('Logger', () => {
       await expect(fs.access(taggedFilePath)).rejects.toThrow(/ENOENT/);
     });
 
-    it('should delete both new and old checkpoint files if they exist', async () => {
-      const oldTag = 'delete-me(old)';
-      const oldStylePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${oldTag}.json`,
-      );
-      const newStylePath = logger['_checkpointPath'](oldTag);
+    it("should delete both new and old checkpoint files if they exist", async () => {
+      const oldTag = "delete-me(old)";
+      const oldStylePath = path.join(TEST_GEMINI_DIR, `checkpoint-${oldTag}.json`);
+      const newStylePath = logger["_checkpointPath"](oldTag);
 
       // Create both files
-      await fs.writeFile(oldStylePath, '{}');
-      await fs.writeFile(newStylePath, '{}');
+      await fs.writeFile(oldStylePath, "{}");
+      await fs.writeFile(newStylePath, "{}");
 
       // Verify both files exist before deletion
       expect(existsSync(oldStylePath)).toBe(true);
@@ -631,97 +527,78 @@ describe('Logger', () => {
       expect(existsSync(newStylePath)).toBe(false);
     });
 
-    it('should return false if the checkpoint file does not exist', async () => {
-      const result = await logger.deleteCheckpoint('non-existent-tag');
+    it("should return false if the checkpoint file does not exist", async () => {
+      const result = await logger.deleteCheckpoint("non-existent-tag");
       expect(result).toBe(false);
     });
 
-    it('should re-throw an error if file deletion fails for reasons other than not existing', async () => {
+    it("should re-throw an error if file deletion fails for reasons other than not existing", async () => {
       // Simulate a different error (e.g., permission denied)
-      vi.spyOn(fs, 'unlink').mockRejectedValueOnce(
-        Object.assign(new Error('EACCES: permission denied'), {
-          code: 'EACCES',
+      vi.spyOn(fs, "unlink").mockRejectedValueOnce(
+        Object.assign(new Error("EACCES: permission denied"), {
+          code: "EACCES",
         }),
       );
-      const consoleErrorSpy = vi
-        .spyOn(debugLogger, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
-      await expect(logger.deleteCheckpoint(tag)).rejects.toThrow(
-        'EACCES: permission denied',
-      );
+      await expect(logger.deleteCheckpoint(tag)).rejects.toThrow("EACCES: permission denied");
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         `Failed to delete checkpoint file ${taggedFilePath}:`,
         expect.any(Error),
       );
     });
 
-    it('should return false if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should return false if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
-      const consoleErrorSpy = vi
-        .spyOn(debugLogger, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
       const result = await uninitializedLogger.deleteCheckpoint(tag);
       expect(result).toBe(false);
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.",
       );
     });
   });
 
-  describe('checkpointExists', () => {
-    const tag = 'exists-test';
-    const encodedTag = 'exists-test';
+  describe("checkpointExists", () => {
+    const tag = "exists-test";
+    const encodedTag = "exists-test";
     let taggedFilePath: string;
 
     beforeEach(() => {
-      taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
+      taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
     });
 
-    it('should return true if the checkpoint file exists', async () => {
-      await fs.writeFile(taggedFilePath, '{}');
+    it("should return true if the checkpoint file exists", async () => {
+      await fs.writeFile(taggedFilePath, "{}");
       const exists = await logger.checkpointExists(tag);
       expect(exists).toBe(true);
     });
 
-    it('should return false if the checkpoint file does not exist', async () => {
-      const exists = await logger.checkpointExists('non-existent-tag');
+    it("should return false if the checkpoint file does not exist", async () => {
+      const exists = await logger.checkpointExists("non-existent-tag");
       expect(exists).toBe(false);
     });
 
-    it('should throw an error if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should throw an error if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
 
       await expect(uninitializedLogger.checkpointExists(tag)).rejects.toThrow(
-        'Logger not initialized. Cannot check for checkpoint existence.',
+        "Logger not initialized. Cannot check for checkpoint existence.",
       );
     });
 
-    it('should re-throw an error if fs.access fails for reasons other than not existing', async () => {
-      vi.spyOn(fs, 'access').mockRejectedValueOnce(
-        Object.assign(new Error('EACCES: permission denied'), {
-          code: 'EACCES',
+    it("should re-throw an error if fs.access fails for reasons other than not existing", async () => {
+      vi.spyOn(fs, "access").mockRejectedValueOnce(
+        Object.assign(new Error("EACCES: permission denied"), {
+          code: "EACCES",
         }),
       );
-      const consoleErrorSpy = vi
-        .spyOn(debugLogger, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
-      await expect(logger.checkpointExists(tag)).rejects.toThrow(
-        'EACCES: permission denied',
-      );
+      await expect(logger.checkpointExists(tag)).rejects.toThrow("EACCES: permission denied");
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         `Failed to check checkpoint existence for path for tag "${tag}":`,
         expect.any(Error),
@@ -729,49 +606,38 @@ describe('Logger', () => {
     });
   });
 
-  describe('Backward compatibility', () => {
+  describe("Backward compatibility", () => {
     const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
+      { role: "model", parts: [{ text: "Hi there" }] },
     ];
-    it('should load from a checkpoint with a raw special character tag', async () => {
-      const taggedConversation = [
-        ...conversation,
-        { role: 'user', parts: [{ text: 'hello' }] },
-      ];
-      const tag = 'special(char)';
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${tag}.json`,
-      );
-      await fs.writeFile(
-        taggedFilePath,
-        JSON.stringify(taggedConversation, null, 2),
-      );
+    it("should load from a checkpoint with a raw special character tag", async () => {
+      const taggedConversation = [...conversation, { role: "user", parts: [{ text: "hello" }] }];
+      const tag = "special(char)";
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${tag}.json`);
+      await fs.writeFile(taggedFilePath, JSON.stringify(taggedConversation, null, 2));
 
       const loaded = await logger.loadCheckpoint(tag);
       expect(loaded.history).toEqual(taggedConversation);
     });
   });
 
-  describe('close', () => {
-    it('should reset logger state', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'A message');
+  describe("close", () => {
+    it("should reset logger state", async () => {
+      await logger.logMessage(MessageSenderType.USER, "A message");
       logger.close();
-      const consoleDebugSpy = vi
-        .spyOn(debugLogger, 'debug')
-        .mockImplementation(() => {});
-      await logger.logMessage(MessageSenderType.USER, 'Another message');
+      const consoleDebugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
+      await logger.logMessage(MessageSenderType.USER, "Another message");
       expect(consoleDebugSpy).toHaveBeenCalledWith(
-        'Logger not initialized or session ID missing. Cannot log message.',
+        "Logger not initialized or session ID missing. Cannot log message.",
       );
       const messages = await logger.getPreviousUserMessages();
       expect(messages).toEqual([]);
-      expect(logger['initialized']).toBe(false);
-      expect(logger['logFilePath']).toBeUndefined();
-      expect(logger['logs']).toEqual([]);
-      expect(logger['sessionId']).toBeUndefined();
-      expect(logger['messageId']).toBe(0);
+      expect(logger["initialized"]).toBe(false);
+      expect(logger["logFilePath"]).toBeUndefined();
+      expect(logger["logs"]).toEqual([]);
+      expect(logger["sessionId"]).toBeUndefined();
+      expect(logger["messageId"]).toBe(0);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/core/logger.ts b/packages/gemini-cli-core/src/core/logger.ts
index 003891010..0601f1cd4 100644
--- a/packages/gemini-cli-core/src/core/logger.ts
+++ b/packages/gemini-cli-core/src/core/logger.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { promises as fs } from 'node:fs';
-import type { Content } from '@google/genai';
-import type { AuthType } from './contentGenerator.js';
-import type { Storage } from '../config/storage.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { coreEvents } from '../utils/events.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import type { Content } from "@google/genai";
+import type { Storage } from "../config/storage.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { coreEvents } from "../utils/events.js";
+import type { AuthType } from "./contentGenerator.js";
 
-const LOG_FILE_NAME = 'logs.json';
+const LOG_FILE_NAME = "logs.json";
 
 export enum MessageSenderType {
-  USER = 'user',
+  USER = "user",
 }
 
 export interface LogEntry {
@@ -61,9 +61,7 @@ export function decodeTagName(str: string): string {
     return decodeURIComponent(str);
   } catch (_e) {
     // Fallback for old, potentially malformed encoding
-    return str.replace(/%([0-9A-F]{2})/g, (_, hex) =>
-      String.fromCharCode(parseInt(hex, 16)),
-    );
+    return str.replace(/%([0-9A-F]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
   }
 }
 
@@ -84,29 +82,29 @@ export class Logger {
 
   private async _readLogFile(): Promise<LogEntry[]> {
     if (!this.logFilePath) {
-      throw new Error('Log file path not set during read attempt.');
+      throw new Error("Log file path not set during read attempt.");
     }
     try {
-      const fileContent = await fs.readFile(this.logFilePath, 'utf-8');
+      const fileContent = await fs.readFile(this.logFilePath, "utf-8");
       const parsedLogs = JSON.parse(fileContent);
       if (!Array.isArray(parsedLogs)) {
         debugLogger.debug(
           `Log file at ${this.logFilePath} is not a valid JSON array. Starting with empty logs.`,
         );
-        await this._backupCorruptedLogFile('malformed_array');
+        await this._backupCorruptedLogFile("malformed_array");
         return [];
       }
       return parsedLogs.filter(
         (entry) =>
-          typeof entry.sessionId === 'string' &&
-          typeof entry.messageId === 'number' &&
-          typeof entry.timestamp === 'string' &&
-          typeof entry.type === 'string' &&
-          typeof entry.message === 'string',
+          typeof entry.sessionId === "string" &&
+          typeof entry.messageId === "number" &&
+          typeof entry.timestamp === "string" &&
+          typeof entry.type === "string" &&
+          typeof entry.message === "string",
       ) as LogEntry[];
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         return [];
       }
       if (error instanceof SyntaxError) {
@@ -114,13 +112,10 @@ export class Logger {
           `Invalid JSON in log file ${this.logFilePath}. Backing up and starting fresh.`,
           error,
         );
-        await this._backupCorruptedLogFile('invalid_json');
+        await this._backupCorruptedLogFile("invalid_json");
         return [];
       }
-      debugLogger.debug(
-        `Failed to read or parse log file ${this.logFilePath}:`,
-        error,
-      );
+      debugLogger.debug(`Failed to read or parse log file ${this.logFilePath}:`, error);
       throw error;
     }
   }
@@ -154,38 +149,29 @@ export class Logger {
       }
       this.logs = await this._readLogFile();
       if (!fileExisted && this.logs.length === 0) {
-        await fs.writeFile(this.logFilePath, '[]', 'utf-8');
+        await fs.writeFile(this.logFilePath, "[]", "utf-8");
       }
-      const sessionLogs = this.logs.filter(
-        (entry) => entry.sessionId === this.sessionId,
-      );
+      const sessionLogs = this.logs.filter((entry) => entry.sessionId === this.sessionId);
       this.messageId =
-        sessionLogs.length > 0
-          ? Math.max(...sessionLogs.map((entry) => entry.messageId)) + 1
-          : 0;
+        sessionLogs.length > 0 ? Math.max(...sessionLogs.map((entry) => entry.messageId)) + 1 : 0;
       this.initialized = true;
     } catch (err) {
-      coreEvents.emitFeedback('error', 'Failed to initialize logger:', err);
+      coreEvents.emitFeedback("error", "Failed to initialize logger:", err);
       this.initialized = false;
     }
   }
 
-  private async _updateLogFile(
-    entryToAppend: LogEntry,
-  ): Promise<LogEntry | null> {
+  private async _updateLogFile(entryToAppend: LogEntry): Promise<LogEntry | null> {
     if (!this.logFilePath) {
-      debugLogger.debug('Log file path not set. Cannot persist log entry.');
-      throw new Error('Log file path not set during update attempt.');
+      debugLogger.debug("Log file path not set. Cannot persist log entry.");
+      throw new Error("Log file path not set during update attempt.");
     }
 
     let currentLogsOnDisk: LogEntry[];
     try {
       currentLogsOnDisk = await this._readLogFile();
     } catch (readError) {
-      debugLogger.debug(
-        'Critical error reading log file before append:',
-        readError,
-      );
+      debugLogger.debug("Critical error reading log file before append:", readError);
       throw readError;
     }
 
@@ -194,9 +180,7 @@ export class Logger {
       (e) => e.sessionId === entryToAppend.sessionId,
     );
     const nextMessageIdForSession =
-      sessionLogsOnDisk.length > 0
-        ? Math.max(...sessionLogsOnDisk.map((e) => e.messageId)) + 1
-        : 0;
+      sessionLogsOnDisk.length > 0 ? Math.max(...sessionLogsOnDisk.map((e) => e.messageId)) + 1 : 0;
 
     // Update the messageId of the entry we are about to append
     entryToAppend.messageId = nextMessageIdForSession;
@@ -223,15 +207,11 @@ export class Logger {
     currentLogsOnDisk.push(entryToAppend);
 
     try {
-      await fs.writeFile(
-        this.logFilePath,
-        JSON.stringify(currentLogsOnDisk, null, 2),
-        'utf-8',
-      );
+      await fs.writeFile(this.logFilePath, JSON.stringify(currentLogsOnDisk, null, 2), "utf-8");
       this.logs = currentLogsOnDisk;
       return entryToAppend; // Return the successfully appended entry
     } catch (error) {
-      debugLogger.debug('Error writing to log file:', error);
+      debugLogger.debug("Error writing to log file:", error);
       throw error;
     }
   }
@@ -250,9 +230,7 @@ export class Logger {
 
   async logMessage(type: MessageSenderType, message: string): Promise<void> {
     if (!this.initialized || this.sessionId === undefined) {
-      debugLogger.debug(
-        'Logger not initialized or session ID missing. Cannot log message.',
-      );
+      debugLogger.debug("Logger not initialized or session ID missing. Cannot log message.");
       return;
     }
 
@@ -280,10 +258,10 @@ export class Logger {
 
   private _checkpointPath(tag: string): string {
     if (!tag.length) {
-      throw new Error('No checkpoint tag specified.');
+      throw new Error("No checkpoint tag specified.");
     }
     if (!this.geminiDir) {
-      throw new Error('Checkpoint file path not set.');
+      throw new Error("Checkpoint file path not set.");
     }
     // Encode the tag to handle all special characters safely.
     const encodedTag = encodeTagName(tag);
@@ -298,7 +276,7 @@ export class Logger {
       return newPath; // Found it, use the new path.
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
+      if (nodeError.code !== "ENOENT") {
         throw error; // A real error occurred, rethrow it.
       }
       // It was not found, so we'll check the old path next.
@@ -311,7 +289,7 @@ export class Logger {
       return oldPath; // Found it, use the old path.
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
+      if (nodeError.code !== "ENOENT") {
         throw error; // A real error occurred, rethrow it.
       }
     }
@@ -323,30 +301,30 @@ export class Logger {
   async saveCheckpoint(checkpoint: Checkpoint, tag: string): Promise<void> {
     if (!this.initialized) {
       debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.",
       );
       return;
     }
     // Always save with the new encoded path.
     const path = this._checkpointPath(tag);
     try {
-      await fs.writeFile(path, JSON.stringify(checkpoint, null, 2), 'utf-8');
+      await fs.writeFile(path, JSON.stringify(checkpoint, null, 2), "utf-8");
     } catch (error) {
-      debugLogger.error('Error writing to checkpoint file:', error);
+      debugLogger.error("Error writing to checkpoint file:", error);
     }
   }
 
   async loadCheckpoint(tag: string): Promise<Checkpoint> {
     if (!this.initialized) {
       debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot load checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot load checkpoint.",
       );
       return { history: [] };
     }
 
     const path = await this._getCheckpointPath(tag);
     try {
-      const fileContent = await fs.readFile(path, 'utf-8');
+      const fileContent = await fs.readFile(path, "utf-8");
       const parsedContent = JSON.parse(fileContent);
 
       // Handle legacy format (just an array of Content)
@@ -355,9 +333,9 @@ export class Logger {
       }
 
       if (
-        typeof parsedContent === 'object' &&
+        typeof parsedContent === "object" &&
         parsedContent !== null &&
-        'history' in parsedContent
+        "history" in parsedContent
       ) {
         return parsedContent as Checkpoint;
       }
@@ -368,14 +346,11 @@ export class Logger {
       return { history: [] };
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         // This is okay, it just means the checkpoint doesn't exist in either format.
         return { history: [] };
       }
-      debugLogger.error(
-        `Failed to read or parse checkpoint file ${path}:`,
-        error,
-      );
+      debugLogger.error(`Failed to read or parse checkpoint file ${path}:`, error);
       return { history: [] };
     }
   }
@@ -383,7 +358,7 @@ export class Logger {
   async deleteCheckpoint(tag: string): Promise<boolean> {
     if (!this.initialized || !this.geminiDir) {
       debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.",
       );
       return false;
     }
@@ -397,11 +372,8 @@ export class Logger {
       deletedSomething = true;
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
-        debugLogger.error(
-          `Failed to delete checkpoint file ${newPath}:`,
-          error,
-        );
+      if (nodeError.code !== "ENOENT") {
+        debugLogger.error(`Failed to delete checkpoint file ${newPath}:`, error);
         throw error; // Rethrow unexpected errors
       }
       // It's okay if it doesn't exist.
@@ -415,11 +387,8 @@ export class Logger {
         deletedSomething = true;
       } catch (error) {
         const nodeError = error as NodeJS.ErrnoException;
-        if (nodeError.code !== 'ENOENT') {
-          debugLogger.error(
-            `Failed to delete checkpoint file ${oldPath}:`,
-            error,
-          );
+        if (nodeError.code !== "ENOENT") {
+          debugLogger.error(`Failed to delete checkpoint file ${oldPath}:`, error);
           throw error; // Rethrow unexpected errors
         }
         // It's okay if it doesn't exist.
@@ -431,9 +400,7 @@ export class Logger {
 
   async checkpointExists(tag: string): Promise<boolean> {
     if (!this.initialized) {
-      throw new Error(
-        'Logger not initialized. Cannot check for checkpoint existence.',
-      );
+      throw new Error("Logger not initialized. Cannot check for checkpoint existence.");
     }
     let filePath: string | undefined;
     try {
@@ -444,14 +411,12 @@ export class Logger {
       return true;
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         return false; // It truly doesn't exist in either format.
       }
       // A different error occurred.
       debugLogger.error(
-        `Failed to check checkpoint existence for ${
-          filePath ?? `path for tag "${tag}"`
-        }:`,
+        `Failed to check checkpoint existence for ${filePath ?? `path for tag "${tag}"`}:`,
         error,
       );
       throw error;
diff --git a/packages/gemini-cli-core/src/core/loggingContentGenerator.test.ts b/packages/gemini-cli-core/src/core/loggingContentGenerator.test.ts
index e591f86be..5aff44b52 100644
--- a/packages/gemini-cli-core/src/core/loggingContentGenerator.test.ts
+++ b/packages/gemini-cli-core/src/core/loggingContentGenerator.test.ts
@@ -8,7 +8,7 @@ const logApiRequest = vi.hoisted(() => vi.fn());
 const logApiResponse = vi.hoisted(() => vi.fn());
 const logApiError = vi.hoisted(() => vi.fn());
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logApiRequest,
   logApiResponse,
   logApiError,
@@ -18,21 +18,18 @@ const runInDevTraceSpan = vi.hoisted(() =>
   vi.fn(async (meta, fn) => fn({ metadata: {}, endSpan: vi.fn() })),
 );
 
-vi.mock('../telemetry/trace.js', () => ({
+vi.mock("../telemetry/trace.js", () => ({
   runInDevTraceSpan,
 }));
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type {
-  GenerateContentResponse,
-  EmbedContentResponse,
-} from '@google/genai';
-import type { ContentGenerator } from './contentGenerator.js';
-import { LoggingContentGenerator } from './loggingContentGenerator.js';
-import type { Config } from '../config/config.js';
-import { ApiRequestEvent } from '../telemetry/types.js';
-
-describe('LoggingContentGenerator', () => {
+import type { EmbedContentResponse, GenerateContentResponse } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { ApiRequestEvent } from "../telemetry/types.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { LoggingContentGenerator } from "./loggingContentGenerator.js";
+
+describe("LoggingContentGenerator", () => {
   let wrapped: ContentGenerator;
   let config: Config;
   let loggingContentGenerator: LoggingContentGenerator;
@@ -48,7 +45,7 @@ describe('LoggingContentGenerator', () => {
       getGoogleAIConfig: vi.fn(),
       getVertexAIConfig: vi.fn(),
       getContentGeneratorConfig: vi.fn().mockReturnValue({
-        authType: 'API_KEY',
+        authType: "API_KEY",
       }),
     } as unknown as Config;
     loggingContentGenerator = new LoggingContentGenerator(wrapped, config);
@@ -60,13 +57,13 @@ describe('LoggingContentGenerator', () => {
     vi.useRealTimers();
   });
 
-  describe('generateContent', () => {
-    it('should log request and response on success', async () => {
+  describe("generateContent", () => {
+    it("should log request and response on success", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
+      const userPromptId = "prompt-123";
       const response: GenerateContentResponse = {
         candidates: [],
         usageMetadata: {
@@ -81,63 +78,51 @@ describe('LoggingContentGenerator', () => {
         data: undefined,
       };
       vi.mocked(wrapped.generateContent).mockResolvedValue(response);
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const promise = loggingContentGenerator.generateContent(
-        req,
-        userPromptId,
-      );
+      const promise = loggingContentGenerator.generateContent(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
       await promise;
 
       expect(wrapped.generateContent).toHaveBeenCalledWith(req, userPromptId);
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
       expect(responseEvent.duration_ms).toBe(1000);
     });
 
-    it('should log error on failure', async () => {
+    it("should log error on failure", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
-      const error = new Error('test error');
+      const userPromptId = "prompt-123";
+      const error = new Error("test error");
       vi.mocked(wrapped.generateContent).mockRejectedValue(error);
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const promise = loggingContentGenerator.generateContent(
-        req,
-        userPromptId,
-      );
+      const promise = loggingContentGenerator.generateContent(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
       await expect(promise).rejects.toThrow(error);
 
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const errorEvent = vi.mocked(logApiError).mock.calls[0][1];
       expect(errorEvent.duration_ms).toBe(1000);
     });
   });
 
-  describe('generateContentStream', () => {
-    it('should log request and response on success', async () => {
+  describe("generateContentStream", () => {
+    it("should log request and response on success", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
+      const userPromptId = "prompt-123";
       const response = {
         candidates: [],
         usageMetadata: {
@@ -151,16 +136,11 @@ describe('LoggingContentGenerator', () => {
         yield response;
       }
 
-      vi.mocked(wrapped.generateContentStream).mockResolvedValue(
-        createAsyncGenerator(),
-      );
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const stream = await loggingContentGenerator.generateContentStream(
-        req,
-        userPromptId,
-      );
+      const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
@@ -168,40 +148,29 @@ describe('LoggingContentGenerator', () => {
         // consume stream
       }
 
-      expect(wrapped.generateContentStream).toHaveBeenCalledWith(
-        req,
-        userPromptId,
-      );
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(wrapped.generateContentStream).toHaveBeenCalledWith(req, userPromptId);
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
       expect(responseEvent.duration_ms).toBe(1000);
     });
 
-    it('should log error on failure', async () => {
+    it("should log error on failure", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
-      const error = new Error('test error');
+      const userPromptId = "prompt-123";
+      const error = new Error("test error");
 
       async function* createAsyncGenerator() {
         yield Promise.reject(error);
       }
 
-      vi.mocked(wrapped.generateContentStream).mockResolvedValue(
-        createAsyncGenerator(),
-      );
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const stream = await loggingContentGenerator.generateContentStream(
-        req,
-        userPromptId,
-      );
+      const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
@@ -211,24 +180,21 @@ describe('LoggingContentGenerator', () => {
         }
       }).rejects.toThrow(error);
 
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const errorEvent = vi.mocked(logApiError).mock.calls[0][1];
       expect(errorEvent.duration_ms).toBe(1000);
     });
   });
 
-  describe('getWrapped', () => {
-    it('should return the wrapped content generator', () => {
+  describe("getWrapped", () => {
+    it("should return the wrapped content generator", () => {
       expect(loggingContentGenerator.getWrapped()).toBe(wrapped);
     });
   });
 
-  describe('countTokens', () => {
-    it('should call the wrapped countTokens method', async () => {
-      const req = { contents: [], model: 'gemini-pro' };
+  describe("countTokens", () => {
+    it("should call the wrapped countTokens method", async () => {
+      const req = { contents: [], model: "gemini-pro" };
       const response = { totalTokens: 10 };
       vi.mocked(wrapped.countTokens).mockResolvedValue(response);
 
@@ -239,11 +205,11 @@ describe('LoggingContentGenerator', () => {
     });
   });
 
-  describe('embedContent', () => {
-    it('should call the wrapped embedContent method', async () => {
+  describe("embedContent", () => {
+    it("should call the wrapped embedContent method", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [] }],
+        model: "gemini-pro",
       };
       const response: EmbedContentResponse = { embeddings: [{ values: [] }] };
       vi.mocked(wrapped.embedContent).mockResolvedValue(response);
diff --git a/packages/gemini-cli-core/src/core/loggingContentGenerator.ts b/packages/gemini-cli-core/src/core/loggingContentGenerator.ts
index de16b8de6..f3c508781 100644
--- a/packages/gemini-cli-core/src/core/loggingContentGenerator.ts
+++ b/packages/gemini-cli-core/src/core/loggingContentGenerator.ts
@@ -13,26 +13,18 @@ import type {
   EmbedContentResponse,
   GenerateContentConfig,
   GenerateContentParameters,
-  GenerateContentResponseUsageMetadata,
   GenerateContentResponse,
-} from '@google/genai';
-import type { ServerDetails } from '../telemetry/types.js';
-import {
-  ApiRequestEvent,
-  ApiResponseEvent,
-  ApiErrorEvent,
-} from '../telemetry/types.js';
-import type { Config } from '../config/config.js';
-import {
-  logApiError,
-  logApiRequest,
-  logApiResponse,
-} from '../telemetry/loggers.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import { CodeAssistServer } from '../code_assist/server.js';
-import { toContents } from '../code_assist/converter.js';
-import { isStructuredError } from '../utils/quotaErrorDetection.js';
-import { runInDevTraceSpan, type SpanMetadata } from '../telemetry/trace.js';
+  GenerateContentResponseUsageMetadata,
+} from "@google/genai";
+import { toContents } from "../code_assist/converter.js";
+import { CodeAssistServer } from "../code_assist/server.js";
+import type { Config } from "../config/config.js";
+import { logApiError, logApiRequest, logApiResponse } from "../telemetry/loggers.js";
+import { runInDevTraceSpan, type SpanMetadata } from "../telemetry/trace.js";
+import type { ServerDetails } from "../telemetry/types.js";
+import { ApiErrorEvent, ApiRequestEvent, ApiResponseEvent } from "../telemetry/types.js";
+import { isStructuredError } from "../utils/quotaErrorDetection.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 
 interface StructuredError {
   status: number;
@@ -76,17 +68,13 @@ export class LoggingContentGenerator implements ContentGenerator {
 
   private _getEndpointUrl(
     req: GenerateContentParameters,
-    method: 'generateContent' | 'generateContentStream',
+    method: "generateContent" | "generateContentStream",
   ): ServerDetails {
     // Case 1: Authenticated with a Google account (`gcloud auth login`).
     // Requests are routed through the internal CodeAssistServer.
     if (this.wrapped instanceof CodeAssistServer) {
       const url = new URL(this.wrapped.getMethodUrl(method));
-      const port = url.port
-        ? parseInt(url.port, 10)
-        : url.protocol === 'https:'
-          ? 443
-          : 80;
+      const port = url.port ? parseInt(url.port, 10) : url.protocol === "https:" ? 443 : 80;
       return { address: url.hostname, port };
     }
 
@@ -94,11 +82,11 @@ export class LoggingContentGenerator implements ContentGenerator {
 
     // Case 2: Using an API key for Vertex AI.
     if (genConfig?.vertexai) {
-      const location = process.env['GOOGLE_CLOUD_LOCATION'];
+      const location = process.env["GOOGLE_CLOUD_LOCATION"];
       if (location) {
         return { address: `${location}-aiplatform.googleapis.com`, port: 443 };
       } else {
-        return { address: 'unknown', port: 0 };
+        return { address: "unknown", port: 0 };
       }
     }
 
@@ -151,7 +139,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     serverDetails?: ServerDetails,
   ): void {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    const errorType = error instanceof Error ? error.name : 'unknown';
+    const errorType = error instanceof Error ? error.name : "unknown";
 
     logApiError(
       this.config,
@@ -167,9 +155,7 @@ export class LoggingContentGenerator implements ContentGenerator {
         },
         this.config.getContentGeneratorConfig()?.authType,
         errorType,
-        isStructuredError(error)
-          ? (error as StructuredError).status
-          : undefined,
+        isStructuredError(error) ? (error as StructuredError).status : undefined,
       ),
     );
   }
@@ -180,26 +166,17 @@ export class LoggingContentGenerator implements ContentGenerator {
   ): Promise<GenerateContentResponse> {
     return runInDevTraceSpan(
       {
-        name: 'generateContent',
+        name: "generateContent",
       },
       async ({ metadata: spanMetadata }) => {
         spanMetadata.input = { request: req, userPromptId, model: req.model };
 
         const startTime = Date.now();
         const contents: Content[] = toContents(req.contents);
-        const serverDetails = this._getEndpointUrl(req, 'generateContent');
-        this.logApiRequest(
-          contents,
-          req.model,
-          userPromptId,
-          req.config,
-          serverDetails,
-        );
+        const serverDetails = this._getEndpointUrl(req, "generateContent");
+        this.logApiRequest(contents, req.model, userPromptId, req.config, serverDetails);
         try {
-          const response = await this.wrapped.generateContent(
-            req,
-            userPromptId,
-          );
+          const response = await this.wrapped.generateContent(req, userPromptId);
           spanMetadata.output = {
             response,
             usageMetadata: response.usageMetadata,
@@ -241,16 +218,13 @@ export class LoggingContentGenerator implements ContentGenerator {
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     return runInDevTraceSpan(
       {
-        name: 'generateContentStream',
+        name: "generateContentStream",
         noAutoEnd: true,
       },
       async ({ metadata: spanMetadata, endSpan }) => {
         spanMetadata.input = { request: req, userPromptId, model: req.model };
         const startTime = Date.now();
-        const serverDetails = this._getEndpointUrl(
-          req,
-          'generateContentStream',
-        );
+        const serverDetails = this._getEndpointUrl(req, "generateContentStream");
         this.logApiRequest(
           toContents(req.contents),
           req.model,
@@ -299,7 +273,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     const responses: GenerateContentResponse[] = [];
 
     let lastUsageMetadata: GenerateContentResponseUsageMetadata | undefined;
-    const serverDetails = this._getEndpointUrl(req, 'generateContentStream');
+    const serverDetails = this._getEndpointUrl(req, "generateContentStream");
     const requestContents: Content[] = toContents(req.contents);
     try {
       for await (const response of stream) {
@@ -352,12 +326,10 @@ export class LoggingContentGenerator implements ContentGenerator {
     return this.wrapped.countTokens(req);
   }
 
-  async embedContent(
-    req: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(req: EmbedContentParameters): Promise<EmbedContentResponse> {
     return runInDevTraceSpan(
       {
-        name: 'embedContent',
+        name: "embedContent",
       },
       async ({ metadata: spanMetadata }) => {
         spanMetadata.input = { request: req };
diff --git a/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.test.ts b/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.test.ts
index 27e1f774d..b1cbb6d0c 100644
--- a/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.test.ts
+++ b/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.test.ts
@@ -4,27 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type { Mock } from 'vitest';
-import { executeToolCall } from './nonInteractiveToolExecutor.js';
-import type {
-  ToolRegistry,
-  ToolCallRequestInfo,
-  ToolResult,
-  Config,
-} from '../index.js';
+import type { Part } from "@google/genai";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config, ToolCallRequestInfo, ToolRegistry, ToolResult } from "../index.js";
 import {
+  ApprovalMode,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-  ToolErrorType,
-  ApprovalMode,
   HookSystem,
-} from '../index.js';
-import type { Part } from '@google/genai';
-import { MockTool } from '../test-utils/mock-tool.js';
-import { createMockMessageBus } from '../test-utils/mock-message-bus.js';
+  ToolErrorType,
+} from "../index.js";
+import { createMockMessageBus } from "../test-utils/mock-message-bus.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { executeToolCall } from "./nonInteractiveToolExecutor.js";
 
-describe('executeToolCall', () => {
+describe("executeToolCall", () => {
   let mockToolRegistry: ToolRegistry;
   let mockTool: MockTool;
   let executeFn: Mock;
@@ -33,7 +28,7 @@ describe('executeToolCall', () => {
 
   beforeEach(() => {
     executeFn = vi.fn();
-    mockTool = new MockTool({ name: 'testTool', execute: executeFn });
+    mockTool = new MockTool({ name: "testTool", execute: executeFn });
 
     mockToolRegistry = {
       getTool: vi.fn(),
@@ -44,22 +39,21 @@ describe('executeToolCall', () => {
       getToolRegistry: () => mockToolRegistry,
       getApprovalMode: () => ApprovalMode.DEFAULT,
       getAllowedTools: () => [],
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getDebugMode: () => false,
       getContentGeneratorConfig: () => ({
-        model: 'test-model',
-        authType: 'oauth-personal',
+        model: "test-model",
+        authType: "oauth-personal",
       }),
       getShellExecutionConfig: () => ({
         terminalWidth: 90,
         terminalHeight: 30,
       }),
       storage: {
-        getProjectTempDir: () => '/tmp',
+        getProjectTempDir: () => "/tmp",
       },
-      getTruncateToolOutputThreshold: () =>
-        DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+      getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
       getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
       getUseSmartEdit: () => false,
       getGeminiClient: () => null, // No client needed for these tests
@@ -74,81 +68,66 @@ describe('executeToolCall', () => {
     // Use proper MessageBus mocking for Phase 3 preparation
     const mockMessageBus = createMockMessageBus();
     mockConfig.getMessageBus = vi.fn().mockReturnValue(mockMessageBus);
-    mockConfig.getHookSystem = vi
-      .fn()
-      .mockReturnValue(new HookSystem(mockConfig));
+    mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
     abortController = new AbortController();
   });
 
-  it('should execute a tool successfully', async () => {
+  it("should execute a tool successfully", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call1',
-      name: 'testTool',
-      args: { param1: 'value1' },
+      callId: "call1",
+      name: "testTool",
+      args: { param1: "value1" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-1',
+      prompt_id: "prompt-id-1",
     };
     const toolResult: ToolResult = {
-      llmContent: 'Tool executed successfully',
-      returnDisplay: 'Success!',
+      llmContent: "Tool executed successfully",
+      returnDisplay: "Success!",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
-    expect(mockToolRegistry.getTool).toHaveBeenCalledWith('testTool');
+    expect(mockToolRegistry.getTool).toHaveBeenCalledWith("testTool");
     expect(executeFn).toHaveBeenCalledWith(request.args);
     expect(response).toStrictEqual({
-      callId: 'call1',
+      callId: "call1",
       error: undefined,
       errorType: undefined,
       outputFile: undefined,
-      resultDisplay: 'Success!',
+      resultDisplay: "Success!",
       contentLength:
-        typeof toolResult.llmContent === 'string'
-          ? toolResult.llmContent.length
-          : undefined,
+        typeof toolResult.llmContent === "string" ? toolResult.llmContent.length : undefined,
       responseParts: [
         {
           functionResponse: {
-            name: 'testTool',
-            id: 'call1',
-            response: { output: 'Tool executed successfully' },
+            name: "testTool",
+            id: "call1",
+            response: { output: "Tool executed successfully" },
           },
         },
       ],
     });
   });
 
-  it('should return an error if tool is not found', async () => {
+  it("should return an error if tool is not found", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call2',
-      name: 'nonexistentTool',
+      callId: "call2",
+      name: "nonexistentTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-2',
+      prompt_id: "prompt-id-2",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(undefined);
-    vi.mocked(mockToolRegistry.getAllToolNames).mockReturnValue([
-      'testTool',
-      'anotherTool',
-    ]);
+    vi.mocked(mockToolRegistry.getAllToolNames).mockReturnValue(["testTool", "anotherTool"]);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     const expectedErrorMessage =
       'Tool "nonexistentTool" not found in registry. Tools must use the exact names that are registered. Did you mean one of: "testTool", "anotherTool"?';
     expect(response).toStrictEqual({
-      callId: 'call2',
+      callId: "call2",
       error: new Error(expectedErrorMessage),
       errorType: ToolErrorType.TOOL_NOT_REGISTERED,
       resultDisplay: expectedErrorMessage,
@@ -156,8 +135,8 @@ describe('executeToolCall', () => {
       responseParts: [
         {
           functionResponse: {
-            name: 'nonexistentTool',
-            id: 'call2',
+            name: "nonexistentTool",
+            id: "call2",
             response: {
               error: expectedErrorMessage,
             },
@@ -167,162 +146,146 @@ describe('executeToolCall', () => {
     });
   });
 
-  it('should return an error if tool validation fails', async () => {
+  it("should return an error if tool validation fails", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call3',
-      name: 'testTool',
-      args: { param1: 'invalid' },
+      callId: "call3",
+      name: "testTool",
+      args: { param1: "invalid" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-3',
+      prompt_id: "prompt-id-3",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-    vi.spyOn(mockTool, 'build').mockImplementation(() => {
-      throw new Error('Invalid parameters');
+    vi.spyOn(mockTool, "build").mockImplementation(() => {
+      throw new Error("Invalid parameters");
     });
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response).toStrictEqual({
-      callId: 'call3',
-      error: new Error('Invalid parameters'),
+      callId: "call3",
+      error: new Error("Invalid parameters"),
       errorType: ToolErrorType.INVALID_TOOL_PARAMS,
       responseParts: [
         {
           functionResponse: {
-            id: 'call3',
-            name: 'testTool',
+            id: "call3",
+            name: "testTool",
             response: {
-              error: 'Invalid parameters',
+              error: "Invalid parameters",
             },
           },
         },
       ],
-      resultDisplay: 'Invalid parameters',
-      contentLength: 'Invalid parameters'.length,
+      resultDisplay: "Invalid parameters",
+      contentLength: "Invalid parameters".length,
     });
   });
 
-  it('should return an error if tool execution fails', async () => {
+  it("should return an error if tool execution fails", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call4',
-      name: 'testTool',
-      args: { param1: 'value1' },
+      callId: "call4",
+      name: "testTool",
+      args: { param1: "value1" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-4',
+      prompt_id: "prompt-id-4",
     };
     const executionErrorResult: ToolResult = {
-      llmContent: 'Error: Execution failed',
-      returnDisplay: 'Execution failed',
+      llmContent: "Error: Execution failed",
+      returnDisplay: "Execution failed",
       error: {
-        message: 'Execution failed',
+        message: "Execution failed",
         type: ToolErrorType.EXECUTION_FAILED,
       },
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(executionErrorResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
     expect(response).toStrictEqual({
-      callId: 'call4',
-      error: new Error('Execution failed'),
+      callId: "call4",
+      error: new Error("Execution failed"),
       errorType: ToolErrorType.EXECUTION_FAILED,
       responseParts: [
         {
           functionResponse: {
-            id: 'call4',
-            name: 'testTool',
+            id: "call4",
+            name: "testTool",
             response: {
-              error: 'Execution failed',
+              error: "Execution failed",
             },
           },
         },
       ],
-      resultDisplay: 'Execution failed',
-      contentLength: 'Execution failed'.length,
+      resultDisplay: "Execution failed",
+      contentLength: "Execution failed".length,
     });
   });
 
-  it('should return an unhandled exception error if execution throws', async () => {
+  it("should return an unhandled exception error if execution throws", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call5',
-      name: 'testTool',
-      args: { param1: 'value1' },
+      callId: "call5",
+      name: "testTool",
+      args: { param1: "value1" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-5',
+      prompt_id: "prompt-id-5",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-    executeFn.mockRejectedValue(new Error('Something went very wrong'));
+    executeFn.mockRejectedValue(new Error("Something went very wrong"));
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response).toStrictEqual({
-      callId: 'call5',
-      error: new Error('Something went very wrong'),
+      callId: "call5",
+      error: new Error("Something went very wrong"),
       errorType: ToolErrorType.UNHANDLED_EXCEPTION,
-      resultDisplay: 'Something went very wrong',
-      contentLength: 'Something went very wrong'.length,
+      resultDisplay: "Something went very wrong",
+      contentLength: "Something went very wrong".length,
       responseParts: [
         {
           functionResponse: {
-            name: 'testTool',
-            id: 'call5',
-            response: { error: 'Something went very wrong' },
+            name: "testTool",
+            id: "call5",
+            response: { error: "Something went very wrong" },
           },
         },
       ],
     });
   });
 
-  it('should correctly format llmContent with inlineData', async () => {
+  it("should correctly format llmContent with inlineData", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call6',
-      name: 'testTool',
+      callId: "call6",
+      name: "testTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-6',
+      prompt_id: "prompt-id-6",
     };
     const imageDataPart: Part = {
-      inlineData: { mimeType: 'image/png', data: 'base64data' },
+      inlineData: { mimeType: "image/png", data: "base64data" },
     };
     const toolResult: ToolResult = {
       llmContent: [imageDataPart],
-      returnDisplay: 'Image processed',
+      returnDisplay: "Image processed",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response).toStrictEqual({
-      callId: 'call6',
+      callId: "call6",
       error: undefined,
       errorType: undefined,
       outputFile: undefined,
-      resultDisplay: 'Image processed',
+      resultDisplay: "Image processed",
       contentLength: undefined,
       responseParts: [
         {
           functionResponse: {
-            name: 'testTool',
-            id: 'call6',
+            name: "testTool",
+            id: "call6",
             response: {
-              output: 'Binary content of type image/png was processed.',
+              output: "Binary content of type image/png was processed.",
             },
           },
         },
@@ -331,54 +294,44 @@ describe('executeToolCall', () => {
     });
   });
 
-  it('should calculate contentLength for a string llmContent', async () => {
+  it("should calculate contentLength for a string llmContent", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call7',
-      name: 'testTool',
+      callId: "call7",
+      name: "testTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-7',
+      prompt_id: "prompt-id-7",
     };
     const toolResult: ToolResult = {
-      llmContent: 'This is a test string.',
-      returnDisplay: 'String returned',
+      llmContent: "This is a test string.",
+      returnDisplay: "String returned",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response.contentLength).toBe(
-      typeof toolResult.llmContent === 'string'
-        ? toolResult.llmContent.length
-        : undefined,
+      typeof toolResult.llmContent === "string" ? toolResult.llmContent.length : undefined,
     );
   });
 
-  it('should have undefined contentLength for array llmContent with no string parts', async () => {
+  it("should have undefined contentLength for array llmContent with no string parts", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call8',
-      name: 'testTool',
+      callId: "call8",
+      name: "testTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-8',
+      prompt_id: "prompt-id-8",
     };
     const toolResult: ToolResult = {
-      llmContent: [{ inlineData: { mimeType: 'image/png', data: 'fakedata' } }],
-      returnDisplay: 'Image data returned',
+      llmContent: [{ inlineData: { mimeType: "image/png", data: "fakedata" } }],
+      returnDisplay: "Image data returned",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response.contentLength).toBeUndefined();
   });
diff --git a/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.ts b/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.ts
index 2d9f0d0c2..b716178b0 100644
--- a/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.ts
+++ b/packages/gemini-cli-core/src/core/nonInteractiveToolExecutor.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolCallRequestInfo, Config } from '../index.js';
-import {
-  CoreToolScheduler,
-  type CompletedToolCall,
-} from './coreToolScheduler.js';
+import type { Config, ToolCallRequestInfo } from "../index.js";
+import { type CompletedToolCall, CoreToolScheduler } from "./coreToolScheduler.js";
 
 /**
  * Executes a single tool call non-interactively by leveraging the CoreToolScheduler.
@@ -26,7 +23,7 @@ export async function executeToolCall(
         if (completedToolCalls.length > 0) {
           resolve(completedToolCalls[0]);
         } else {
-          reject(new Error('No completed tool calls returned.'));
+          reject(new Error("No completed tool calls returned."));
         }
       },
     });
diff --git a/packages/gemini-cli-core/src/core/prompts.test.ts b/packages/gemini-cli-core/src/core/prompts.test.ts
index d5fb0a28f..e14a4b2c0 100644
--- a/packages/gemini-cli-core/src/core/prompts.test.ts
+++ b/packages/gemini-cli-core/src/core/prompts.test.ts
@@ -4,321 +4,284 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { getCoreSystemPrompt, resolvePathFromEnv } from './prompts.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import type { Config } from '../config/config.js';
-import { CodebaseInvestigatorAgent } from '../agents/codebase-investigator.js';
-import { GEMINI_DIR } from '../utils/paths.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import {
-  DEFAULT_GEMINI_MODEL,
-  getEffectiveModel,
-  PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { CodebaseInvestigatorAgent } from "../agents/codebase-investigator.js";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_MODEL, getEffectiveModel, PREVIEW_GEMINI_MODEL } from "../config/models.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import { getCoreSystemPrompt, resolvePathFromEnv } from "./prompts.js";
 
 // Mock tool names if they are dynamically generated or complex
-vi.mock('../tools/ls', () => ({ LSTool: { Name: 'list_directory' } }));
-vi.mock('../tools/edit', () => ({ EditTool: { Name: 'replace' } }));
-vi.mock('../tools/glob', () => ({ GlobTool: { Name: 'glob' } }));
-vi.mock('../tools/grep', () => ({ GrepTool: { Name: 'search_file_content' } }));
-vi.mock('../tools/read-file', () => ({ ReadFileTool: { Name: 'read_file' } }));
-vi.mock('../tools/read-many-files', () => ({
-  ReadManyFilesTool: { Name: 'read_many_files' },
+vi.mock("../tools/ls", () => ({ LSTool: { Name: "list_directory" } }));
+vi.mock("../tools/edit", () => ({ EditTool: { Name: "replace" } }));
+vi.mock("../tools/glob", () => ({ GlobTool: { Name: "glob" } }));
+vi.mock("../tools/grep", () => ({ GrepTool: { Name: "search_file_content" } }));
+vi.mock("../tools/read-file", () => ({ ReadFileTool: { Name: "read_file" } }));
+vi.mock("../tools/read-many-files", () => ({
+  ReadManyFilesTool: { Name: "read_many_files" },
 }));
-vi.mock('../tools/shell', () => ({
-  ShellTool: { Name: 'run_shell_command' },
+vi.mock("../tools/shell", () => ({
+  ShellTool: { Name: "run_shell_command" },
 }));
-vi.mock('../tools/write-file', () => ({
-  WriteFileTool: { Name: 'write_file' },
+vi.mock("../tools/write-file", () => ({
+  WriteFileTool: { Name: "write_file" },
 }));
-vi.mock('../agents/codebase-investigator.js', () => ({
-  CodebaseInvestigatorAgent: { name: 'codebase_investigator' },
+vi.mock("../agents/codebase-investigator.js", () => ({
+  CodebaseInvestigatorAgent: { name: "codebase_investigator" },
 }));
-vi.mock('../utils/gitUtils', () => ({
+vi.mock("../utils/gitUtils", () => ({
   isGitRepository: vi.fn(),
 }));
-vi.mock('node:fs');
-vi.mock('../config/models.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../config/models.js')>();
+vi.mock("node:fs");
+vi.mock("../config/models.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../config/models.js")>();
   return {
     ...actual,
     getEffectiveModel: vi.fn(),
   };
 });
 
-describe('Core System Prompt (prompts.ts)', () => {
+describe("Core System Prompt (prompts.ts)", () => {
   let mockConfig: Config;
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.stubEnv('GEMINI_SYSTEM_MD', undefined);
-    vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', undefined);
+    vi.stubEnv("GEMINI_SYSTEM_MD", undefined);
+    vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", undefined);
     mockConfig = {
       getToolRegistry: vi.fn().mockReturnValue({
         getAllToolNames: vi.fn().mockReturnValue([]),
       }),
       getEnableShellOutputEfficiency: vi.fn().mockReturnValue(true),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
       },
       isInteractive: vi.fn().mockReturnValue(true),
       isInteractiveShellEnabled: vi.fn().mockReturnValue(true),
-      getModel: vi.fn().mockReturnValue('auto'),
+      getModel: vi.fn().mockReturnValue("auto"),
       getPreviewFeatures: vi.fn().mockReturnValue(false),
       isInFallbackMode: vi.fn().mockReturnValue(false),
       getAgentRegistry: vi.fn().mockReturnValue({
-        getDirectoryContext: vi.fn().mockReturnValue('Mock Agent Directory'),
+        getDirectoryContext: vi.fn().mockReturnValue("Mock Agent Directory"),
       }),
     } as unknown as Config;
     vi.mocked(getEffectiveModel).mockReturnValue(DEFAULT_GEMINI_MODEL);
   });
 
-  it('should use chatty system prompt for preview model', () => {
+  it("should use chatty system prompt for preview model", () => {
     vi.mocked(getEffectiveModel).mockReturnValue(PREVIEW_GEMINI_MODEL);
     const prompt = getCoreSystemPrompt(mockConfig);
-    expect(prompt).toContain('You are an interactive CLI agent'); // Check for core content
-    expect(prompt).not.toContain('No Chitchat:');
+    expect(prompt).toContain("You are an interactive CLI agent"); // Check for core content
+    expect(prompt).not.toContain("No Chitchat:");
     expect(prompt).toMatchSnapshot();
   });
 
   it.each([
-    ['empty string', ''],
-    ['whitespace only', '   \n  \t '],
-  ])('should return the base prompt when userMemory is %s', (_, userMemory) => {
-    vi.stubEnv('SANDBOX', undefined);
+    ["empty string", ""],
+    ["whitespace only", "   \n  \t "],
+  ])("should return the base prompt when userMemory is %s", (_, userMemory) => {
+    vi.stubEnv("SANDBOX", undefined);
     const prompt = getCoreSystemPrompt(mockConfig, userMemory);
-    expect(prompt).not.toContain('---\n\n'); // Separator should not be present
-    expect(prompt).toContain('You are an interactive CLI agent'); // Check for core content
-    expect(prompt).toContain('No Chitchat:');
+    expect(prompt).not.toContain("---\n\n"); // Separator should not be present
+    expect(prompt).toContain("You are an interactive CLI agent"); // Check for core content
+    expect(prompt).toContain("No Chitchat:");
     expect(prompt).toMatchSnapshot(); // Use snapshot for base prompt structure
   });
 
-  it('should append userMemory with separator when provided', () => {
-    vi.stubEnv('SANDBOX', undefined);
-    const memory = 'This is custom user memory.\nBe extra polite.';
+  it("should append userMemory with separator when provided", () => {
+    vi.stubEnv("SANDBOX", undefined);
+    const memory = "This is custom user memory.\nBe extra polite.";
     const expectedSuffix = `\n\n---\n\n${memory}`;
     const prompt = getCoreSystemPrompt(mockConfig, memory);
 
     expect(prompt.endsWith(expectedSuffix)).toBe(true);
-    expect(prompt).toContain('You are an interactive CLI agent'); // Ensure base prompt follows
+    expect(prompt).toContain("You are an interactive CLI agent"); // Ensure base prompt follows
     expect(prompt).toMatchSnapshot(); // Snapshot the combined prompt
   });
 
   it.each([
-    ['true', '# Sandbox', ['# macOS Seatbelt', '# Outside of Sandbox']],
-    ['sandbox-exec', '# macOS Seatbelt', ['# Sandbox', '# Outside of Sandbox']],
-    [undefined, '# Outside of Sandbox', ['# Sandbox', '# macOS Seatbelt']],
-  ])(
-    'should include correct sandbox instructions for SANDBOX=%s',
-    (sandboxValue, expectedContains, expectedNotContains) => {
-      vi.stubEnv('SANDBOX', sandboxValue);
-      const prompt = getCoreSystemPrompt(mockConfig);
-      expect(prompt).toContain(expectedContains);
-      expectedNotContains.forEach((text) => expect(prompt).not.toContain(text));
-      expect(prompt).toMatchSnapshot();
-    },
-  );
+    ["true", "# Sandbox", ["# macOS Seatbelt", "# Outside of Sandbox"]],
+    ["sandbox-exec", "# macOS Seatbelt", ["# Sandbox", "# Outside of Sandbox"]],
+    [undefined, "# Outside of Sandbox", ["# Sandbox", "# macOS Seatbelt"]],
+  ])("should include correct sandbox instructions for SANDBOX=%s", (sandboxValue, expectedContains, expectedNotContains) => {
+    vi.stubEnv("SANDBOX", sandboxValue);
+    const prompt = getCoreSystemPrompt(mockConfig);
+    expect(prompt).toContain(expectedContains);
+    expectedNotContains.forEach((text) => expect(prompt).not.toContain(text));
+    expect(prompt).toMatchSnapshot();
+  });
 
   it.each([
     [true, true],
     [false, false],
-  ])(
-    'should handle git instructions when isGitRepository=%s',
-    (isGitRepo, shouldContainGit) => {
-      vi.stubEnv('SANDBOX', undefined);
-      vi.mocked(isGitRepository).mockReturnValue(isGitRepo);
-      const prompt = getCoreSystemPrompt(mockConfig);
-      shouldContainGit
-        ? expect(prompt).toContain('# Git Repository')
-        : expect(prompt).not.toContain('# Git Repository');
-      expect(prompt).toMatchSnapshot();
-    },
-  );
-
-  it('should return the interactive avoidance prompt when in non-interactive mode', () => {
-    vi.stubEnv('SANDBOX', undefined);
+  ])("should handle git instructions when isGitRepository=%s", (isGitRepo, shouldContainGit) => {
+    vi.stubEnv("SANDBOX", undefined);
+    vi.mocked(isGitRepository).mockReturnValue(isGitRepo);
+    const prompt = getCoreSystemPrompt(mockConfig);
+    shouldContainGit
+      ? expect(prompt).toContain("# Git Repository")
+      : expect(prompt).not.toContain("# Git Repository");
+    expect(prompt).toMatchSnapshot();
+  });
+
+  it("should return the interactive avoidance prompt when in non-interactive mode", () => {
+    vi.stubEnv("SANDBOX", undefined);
     mockConfig.isInteractive = vi.fn().mockReturnValue(false);
-    const prompt = getCoreSystemPrompt(mockConfig, '');
-    expect(prompt).toContain('**Interactive Commands:**'); // Check for interactive prompt
+    const prompt = getCoreSystemPrompt(mockConfig, "");
+    expect(prompt).toContain("**Interactive Commands:**"); // Check for interactive prompt
     expect(prompt).toMatchSnapshot(); // Use snapshot for base prompt structure
   });
 
   it.each([
     [[CodebaseInvestigatorAgent.name], true],
     [[], false],
-  ])(
-    'should handle CodebaseInvestigator with tools=%s',
-    (toolNames, expectCodebaseInvestigator) => {
-      const testConfig = {
-        getToolRegistry: vi.fn().mockReturnValue({
-          getAllToolNames: vi.fn().mockReturnValue(toolNames),
-        }),
-        getEnableShellOutputEfficiency: vi.fn().mockReturnValue(true),
-        storage: {
-          getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
-        },
-        isInteractive: vi.fn().mockReturnValue(false),
-        isInteractiveShellEnabled: vi.fn().mockReturnValue(false),
-        getModel: vi.fn().mockReturnValue('auto'),
-        getPreviewFeatures: vi.fn().mockReturnValue(false),
-        isInFallbackMode: vi.fn().mockReturnValue(false),
-        getAgentRegistry: vi.fn().mockReturnValue({
-          getDirectoryContext: vi.fn().mockReturnValue('Mock Agent Directory'),
-        }),
-      } as unknown as Config;
-
-      const prompt = getCoreSystemPrompt(testConfig);
-      if (expectCodebaseInvestigator) {
-        expect(prompt).toContain(
-          `your **first and primary action** must be to delegate to the '${CodebaseInvestigatorAgent.name}' agent`,
-        );
-        expect(prompt).toContain(`do not ignore the output of the agent`);
-        expect(prompt).not.toContain(
-          "Use 'search_file_content' and 'glob' search tools extensively",
-        );
-      } else {
-        expect(prompt).not.toContain(
-          `your **first and primary action** must be to delegate to the '${CodebaseInvestigatorAgent.name}' agent`,
-        );
-        expect(prompt).toContain(
-          "Use 'search_file_content' and 'glob' search tools extensively",
-        );
-      }
-    },
-  );
-
-  describe('GEMINI_SYSTEM_MD environment variable', () => {
-    it.each(['false', '0'])(
-      'should use default prompt when GEMINI_SYSTEM_MD is "%s"',
-      (value) => {
-        vi.stubEnv('GEMINI_SYSTEM_MD', value);
-        const prompt = getCoreSystemPrompt(mockConfig);
-        expect(fs.readFileSync).not.toHaveBeenCalled();
-        expect(prompt).not.toContain('custom system prompt');
+  ])("should handle CodebaseInvestigator with tools=%s", (toolNames, expectCodebaseInvestigator) => {
+    const testConfig = {
+      getToolRegistry: vi.fn().mockReturnValue({
+        getAllToolNames: vi.fn().mockReturnValue(toolNames),
+      }),
+      getEnableShellOutputEfficiency: vi.fn().mockReturnValue(true),
+      storage: {
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
       },
-    );
+      isInteractive: vi.fn().mockReturnValue(false),
+      isInteractiveShellEnabled: vi.fn().mockReturnValue(false),
+      getModel: vi.fn().mockReturnValue("auto"),
+      getPreviewFeatures: vi.fn().mockReturnValue(false),
+      isInFallbackMode: vi.fn().mockReturnValue(false),
+      getAgentRegistry: vi.fn().mockReturnValue({
+        getDirectoryContext: vi.fn().mockReturnValue("Mock Agent Directory"),
+      }),
+    } as unknown as Config;
 
-    it('should throw error if GEMINI_SYSTEM_MD points to a non-existent file', () => {
-      const customPath = '/non/existent/path/system.md';
-      vi.stubEnv('GEMINI_SYSTEM_MD', customPath);
+    const prompt = getCoreSystemPrompt(testConfig);
+    if (expectCodebaseInvestigator) {
+      expect(prompt).toContain(
+        `your **first and primary action** must be to delegate to the '${CodebaseInvestigatorAgent.name}' agent`,
+      );
+      expect(prompt).toContain(`do not ignore the output of the agent`);
+      expect(prompt).not.toContain("Use 'search_file_content' and 'glob' search tools extensively");
+    } else {
+      expect(prompt).not.toContain(
+        `your **first and primary action** must be to delegate to the '${CodebaseInvestigatorAgent.name}' agent`,
+      );
+      expect(prompt).toContain("Use 'search_file_content' and 'glob' search tools extensively");
+    }
+  });
+
+  describe("GEMINI_SYSTEM_MD environment variable", () => {
+    it.each(["false", "0"])('should use default prompt when GEMINI_SYSTEM_MD is "%s"', (value) => {
+      vi.stubEnv("GEMINI_SYSTEM_MD", value);
+      const prompt = getCoreSystemPrompt(mockConfig);
+      expect(fs.readFileSync).not.toHaveBeenCalled();
+      expect(prompt).not.toContain("custom system prompt");
+    });
+
+    it("should throw error if GEMINI_SYSTEM_MD points to a non-existent file", () => {
+      const customPath = "/non/existent/path/system.md";
+      vi.stubEnv("GEMINI_SYSTEM_MD", customPath);
       vi.mocked(fs.existsSync).mockReturnValue(false);
       expect(() => getCoreSystemPrompt(mockConfig)).toThrow(
         `missing system prompt file '${path.resolve(customPath)}'`,
       );
     });
 
-    it.each(['true', '1'])(
-      'should read from default path when GEMINI_SYSTEM_MD is "%s"',
-      (value) => {
-        const defaultPath = path.resolve(path.join(GEMINI_DIR, 'system.md'));
-        vi.stubEnv('GEMINI_SYSTEM_MD', value);
-        vi.mocked(fs.existsSync).mockReturnValue(true);
-        vi.mocked(fs.readFileSync).mockReturnValue('custom system prompt');
-
-        const prompt = getCoreSystemPrompt(mockConfig);
-        expect(fs.readFileSync).toHaveBeenCalledWith(defaultPath, 'utf8');
-        expect(prompt).toBe('custom system prompt');
-      },
-    );
+    it.each([
+      "true",
+      "1",
+    ])('should read from default path when GEMINI_SYSTEM_MD is "%s"', (value) => {
+      const defaultPath = path.resolve(path.join(GEMINI_DIR, "system.md"));
+      vi.stubEnv("GEMINI_SYSTEM_MD", value);
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(fs.readFileSync).mockReturnValue("custom system prompt");
+
+      const prompt = getCoreSystemPrompt(mockConfig);
+      expect(fs.readFileSync).toHaveBeenCalledWith(defaultPath, "utf8");
+      expect(prompt).toBe("custom system prompt");
+    });
 
-    it('should read from custom path when GEMINI_SYSTEM_MD provides one, preserving case', () => {
-      const customPath = path.resolve('/custom/path/SyStEm.Md');
-      vi.stubEnv('GEMINI_SYSTEM_MD', customPath);
+    it("should read from custom path when GEMINI_SYSTEM_MD provides one, preserving case", () => {
+      const customPath = path.resolve("/custom/path/SyStEm.Md");
+      vi.stubEnv("GEMINI_SYSTEM_MD", customPath);
       vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue('custom system prompt');
+      vi.mocked(fs.readFileSync).mockReturnValue("custom system prompt");
 
       const prompt = getCoreSystemPrompt(mockConfig);
-      expect(fs.readFileSync).toHaveBeenCalledWith(customPath, 'utf8');
-      expect(prompt).toBe('custom system prompt');
+      expect(fs.readFileSync).toHaveBeenCalledWith(customPath, "utf8");
+      expect(prompt).toBe("custom system prompt");
     });
 
-    it('should expand tilde in custom path when GEMINI_SYSTEM_MD is set', () => {
-      const homeDir = '/Users/test';
-      vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
-      const customPath = '~/custom/system.md';
-      const expectedPath = path.join(homeDir, 'custom/system.md');
-      vi.stubEnv('GEMINI_SYSTEM_MD', customPath);
+    it("should expand tilde in custom path when GEMINI_SYSTEM_MD is set", () => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
+      const customPath = "~/custom/system.md";
+      const expectedPath = path.join(homeDir, "custom/system.md");
+      vi.stubEnv("GEMINI_SYSTEM_MD", customPath);
       vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue('custom system prompt');
+      vi.mocked(fs.readFileSync).mockReturnValue("custom system prompt");
 
       const prompt = getCoreSystemPrompt(mockConfig);
-      expect(fs.readFileSync).toHaveBeenCalledWith(
-        path.resolve(expectedPath),
-        'utf8',
-      );
-      expect(prompt).toBe('custom system prompt');
+      expect(fs.readFileSync).toHaveBeenCalledWith(path.resolve(expectedPath), "utf8");
+      expect(prompt).toBe("custom system prompt");
     });
   });
 
-  describe('GEMINI_WRITE_SYSTEM_MD environment variable', () => {
-    it.each(['false', '0'])(
-      'should not write to file when GEMINI_WRITE_SYSTEM_MD is "%s"',
-      (value) => {
-        vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', value);
-        getCoreSystemPrompt(mockConfig);
-        expect(fs.writeFileSync).not.toHaveBeenCalled();
-      },
-    );
-
-    it.each(['true', '1'])(
-      'should write to default path when GEMINI_WRITE_SYSTEM_MD is "%s"',
-      (value) => {
-        const defaultPath = path.resolve(path.join(GEMINI_DIR, 'system.md'));
-        vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', value);
-        getCoreSystemPrompt(mockConfig);
-        expect(fs.writeFileSync).toHaveBeenCalledWith(
-          defaultPath,
-          expect.any(String),
-        );
-      },
-    );
+  describe("GEMINI_WRITE_SYSTEM_MD environment variable", () => {
+    it.each([
+      "false",
+      "0",
+    ])('should not write to file when GEMINI_WRITE_SYSTEM_MD is "%s"', (value) => {
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", value);
+      getCoreSystemPrompt(mockConfig);
+      expect(fs.writeFileSync).not.toHaveBeenCalled();
+    });
 
-    it('should write to custom path when GEMINI_WRITE_SYSTEM_MD provides one', () => {
-      const customPath = path.resolve('/custom/path/system.md');
-      vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', customPath);
+    it.each([
+      "true",
+      "1",
+    ])('should write to default path when GEMINI_WRITE_SYSTEM_MD is "%s"', (value) => {
+      const defaultPath = path.resolve(path.join(GEMINI_DIR, "system.md"));
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", value);
       getCoreSystemPrompt(mockConfig);
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        customPath,
-        expect.any(String),
-      );
+      expect(fs.writeFileSync).toHaveBeenCalledWith(defaultPath, expect.any(String));
+    });
+
+    it("should write to custom path when GEMINI_WRITE_SYSTEM_MD provides one", () => {
+      const customPath = path.resolve("/custom/path/system.md");
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", customPath);
+      getCoreSystemPrompt(mockConfig);
+      expect(fs.writeFileSync).toHaveBeenCalledWith(customPath, expect.any(String));
     });
 
     it.each([
-      ['~/custom/system.md', 'custom/system.md'],
-      ['~', ''],
-    ])(
-      'should expand tilde in custom path when GEMINI_WRITE_SYSTEM_MD is "%s"',
-      (customPath, relativePath) => {
-        const homeDir = '/Users/test';
-        vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
-        const expectedPath = relativePath
-          ? path.join(homeDir, relativePath)
-          : homeDir;
-        vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', customPath);
-        getCoreSystemPrompt(mockConfig);
-        expect(fs.writeFileSync).toHaveBeenCalledWith(
-          path.resolve(expectedPath),
-          expect.any(String),
-        );
-      },
-    );
+      ["~/custom/system.md", "custom/system.md"],
+      ["~", ""],
+    ])('should expand tilde in custom path when GEMINI_WRITE_SYSTEM_MD is "%s"', (customPath, relativePath) => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
+      const expectedPath = relativePath ? path.join(homeDir, relativePath) : homeDir;
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", customPath);
+      getCoreSystemPrompt(mockConfig);
+      expect(fs.writeFileSync).toHaveBeenCalledWith(path.resolve(expectedPath), expect.any(String));
+    });
   });
 });
 
-describe('resolvePathFromEnv helper function', () => {
+describe("resolvePathFromEnv helper function", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  describe('when envVar is undefined, empty, or whitespace', () => {
+  describe("when envVar is undefined, empty, or whitespace", () => {
     it.each([
-      ['undefined', undefined],
-      ['empty string', ''],
-      ['whitespace only', '   \n\t  '],
-    ])('should return null for %s', (_, input) => {
+      ["undefined", undefined],
+      ["empty string", ""],
+      ["whitespace only", "   \n\t  "],
+    ])("should return null for %s", (_, input) => {
       const result = resolvePathFromEnv(input);
       expect(result).toEqual({
         isSwitch: false,
@@ -328,15 +291,15 @@ describe('resolvePathFromEnv helper function', () => {
     });
   });
 
-  describe('when envVar is a boolean-like string', () => {
+  describe("when envVar is a boolean-like string", () => {
     it.each([
-      ['"0" as disabled switch', '0', '0', true],
-      ['"false" as disabled switch', 'false', 'false', true],
-      ['"1" as enabled switch', '1', '1', false],
-      ['"true" as enabled switch', 'true', 'true', false],
-      ['"FALSE" (case-insensitive)', 'FALSE', 'false', true],
-      ['"TRUE" (case-insensitive)', 'TRUE', 'true', false],
-    ])('should handle %s', (_, input, expectedValue, isDisabled) => {
+      ['"0" as disabled switch', "0", "0", true],
+      ['"false" as disabled switch', "false", "false", true],
+      ['"1" as enabled switch', "1", "1", false],
+      ['"true" as enabled switch', "true", "true", false],
+      ['"FALSE" (case-insensitive)', "FALSE", "false", true],
+      ['"TRUE" (case-insensitive)', "TRUE", "true", false],
+    ])("should handle %s", (_, input, expectedValue, isDisabled) => {
       const result = resolvePathFromEnv(input);
       expect(result).toEqual({
         isSwitch: true,
@@ -346,51 +309,47 @@ describe('resolvePathFromEnv helper function', () => {
     });
   });
 
-  describe('when envVar is a file path', () => {
-    it.each([['/absolute/path/file.txt'], ['relative/path/file.txt']])(
-      'should resolve path: %s',
-      (input) => {
-        const result = resolvePathFromEnv(input);
-        expect(result).toEqual({
-          isSwitch: false,
-          value: path.resolve(input),
-          isDisabled: false,
-        });
-      },
-    );
+  describe("when envVar is a file path", () => {
+    it.each([
+      ["/absolute/path/file.txt"],
+      ["relative/path/file.txt"],
+    ])("should resolve path: %s", (input) => {
+      const result = resolvePathFromEnv(input);
+      expect(result).toEqual({
+        isSwitch: false,
+        value: path.resolve(input),
+        isDisabled: false,
+      });
+    });
 
     it.each([
-      ['~/documents/file.txt', 'documents/file.txt'],
-      ['~', ''],
-    ])('should expand tilde path: %s', (input, homeRelativePath) => {
-      const homeDir = '/Users/test';
-      vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
+      ["~/documents/file.txt", "documents/file.txt"],
+      ["~", ""],
+    ])("should expand tilde path: %s", (input, homeRelativePath) => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
       const result = resolvePathFromEnv(input);
       expect(result).toEqual({
         isSwitch: false,
-        value: path.resolve(
-          homeRelativePath ? path.join(homeDir, homeRelativePath) : homeDir,
-        ),
+        value: path.resolve(homeRelativePath ? path.join(homeDir, homeRelativePath) : homeDir),
         isDisabled: false,
       });
     });
 
-    it('should handle os.homedir() errors gracefully', () => {
-      vi.spyOn(os, 'homedir').mockImplementation(() => {
-        throw new Error('Cannot resolve home directory');
+    it("should handle os.homedir() errors gracefully", () => {
+      vi.spyOn(os, "homedir").mockImplementation(() => {
+        throw new Error("Cannot resolve home directory");
       });
-      const consoleSpy = vi
-        .spyOn(debugLogger, 'warn')
-        .mockImplementation(() => {});
+      const consoleSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
-      const result = resolvePathFromEnv('~/documents/file.txt');
+      const result = resolvePathFromEnv("~/documents/file.txt");
       expect(result).toEqual({
         isSwitch: false,
         value: null,
         isDisabled: false,
       });
       expect(consoleSpy).toHaveBeenCalledWith(
-        'Could not resolve home directory for path: ~/documents/file.txt',
+        "Could not resolve home directory for path: ~/documents/file.txt",
         expect.any(Error),
       );
 
diff --git a/packages/gemini-cli-core/src/core/prompts.ts b/packages/gemini-cli-core/src/core/prompts.ts
index 4a6c74b87..f9fb64d6a 100644
--- a/packages/gemini-cli-core/src/core/prompts.ts
+++ b/packages/gemini-cli-core/src/core/prompts.ts
@@ -4,10 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import process from "node:process";
+import { CodebaseInvestigatorAgent } from "../agents/codebase-investigator.js";
+import type { Config } from "../config/config.js";
+import { getEffectiveModel, PREVIEW_GEMINI_MODEL } from "../config/models.js";
 import {
+  DELEGATE_TO_AGENT_TOOL_NAME,
   EDIT_TOOL_NAME,
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
@@ -16,16 +21,11 @@ import {
   SHELL_TOOL_NAME,
   WRITE_FILE_TOOL_NAME,
   WRITE_TODOS_TOOL_NAME,
-  DELEGATE_TO_AGENT_TOOL_NAME,
-} from '../tools/tool-names.js';
-import process from 'node:process';
-import { isGitRepository } from '../utils/gitUtils.js';
-import { CodebaseInvestigatorAgent } from '../agents/codebase-investigator.js';
-import type { Config } from '../config/config.js';
-import { GEMINI_DIR } from '../utils/paths.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { WriteTodosTool } from '../tools/write-todos.js';
-import { getEffectiveModel, PREVIEW_GEMINI_MODEL } from '../config/models.js';
+} from "../tools/tool-names.js";
+import { WriteTodosTool } from "../tools/write-todos.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import { GEMINI_DIR } from "../utils/paths.js";
 
 export function resolvePathFromEnv(envVar?: string): {
   isSwitch: boolean;
@@ -40,9 +40,9 @@ export function resolvePathFromEnv(envVar?: string): {
 
   const lowerEnvVar = trimmedEnvVar.toLowerCase();
   // Check if the input is a common boolean-like string.
-  if (['0', 'false', '1', 'true'].includes(lowerEnvVar)) {
+  if (["0", "false", "1", "true"].includes(lowerEnvVar)) {
     // If so, identify it as a "switch" and return its value.
-    const isDisabled = ['0', 'false'].includes(lowerEnvVar);
+    const isDisabled = ["0", "false"].includes(lowerEnvVar);
     return { isSwitch: true, value: lowerEnvVar, isDisabled };
   }
 
@@ -50,20 +50,17 @@ export function resolvePathFromEnv(envVar?: string): {
   let customPath = trimmedEnvVar;
 
   // Safely expand the tilde (~) character to the user's home directory.
-  if (customPath.startsWith('~/') || customPath === '~') {
+  if (customPath.startsWith("~/") || customPath === "~") {
     try {
       const home = os.homedir(); // This is the call that can throw an error.
-      if (customPath === '~') {
+      if (customPath === "~") {
         customPath = home;
       } else {
         customPath = path.join(home, customPath.slice(2));
       }
     } catch (error) {
       // If os.homedir() fails, we catch the error instead of crashing.
-      debugLogger.warn(
-        `Could not resolve home directory for path: ${trimmedEnvVar}`,
-        error,
-      );
+      debugLogger.warn(`Could not resolve home directory for path: ${trimmedEnvVar}`, error);
       // Return null to indicate the path resolution failed.
       return { isSwitch: false, value: null, isDisabled: false };
     }
@@ -77,18 +74,13 @@ export function resolvePathFromEnv(envVar?: string): {
   };
 }
 
-export function getCoreSystemPrompt(
-  config: Config,
-  userMemory?: string,
-): string {
+export function getCoreSystemPrompt(config: Config, userMemory?: string): string {
   // A flag to indicate whether the system prompt override is active.
   let systemMdEnabled = false;
   // The default path for the system prompt file. This can be overridden.
-  let systemMdPath = path.resolve(path.join(GEMINI_DIR, 'system.md'));
+  let systemMdPath = path.resolve(path.join(GEMINI_DIR, "system.md"));
   // Resolve the environment variable to get either a path or a switch value.
-  const systemMdResolution = resolvePathFromEnv(
-    process.env['GEMINI_SYSTEM_MD'],
-  );
+  const systemMdResolution = resolvePathFromEnv(process.env["GEMINI_SYSTEM_MD"]);
 
   // Proceed only if the environment variable is set and is not disabled.
   if (systemMdResolution.value && !systemMdResolution.isDisabled) {
@@ -133,10 +125,10 @@ export function getCoreSystemPrompt(
 
   let basePrompt: string;
   if (systemMdEnabled) {
-    basePrompt = fs.readFileSync(systemMdPath, 'utf8');
+    basePrompt = fs.readFileSync(systemMdPath, "utf8");
   } else {
     const promptConfig = {
-      preamble: `You are ${interactiveMode ? 'an interactive ' : 'a non-interactive '}CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
+      preamble: `You are ${interactiveMode ? "an interactive " : "a non-interactive "}CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
       coreMandates: `
 # Core Mandates
 
@@ -152,7 +144,7 @@ export function getCoreSystemPrompt(
         !interactiveMode
           ? `
   - **Continue the work** You are not to interact with the user. Do your best to complete the task at hand, using your best judgement and avoid asking user for any additional information.`
-          : ''
+          : ""
       }
 
 ${config.getAgentRegistry().getDirectoryContext()}`,
@@ -191,14 +183,14 @@ When requested to perform tasks like fixing bugs, adding features, refactoring,
       primaryWorkflows_suffix: `3. **Implement:** Use the available tools (e.g., '${EDIT_TOOL_NAME}', '${WRITE_FILE_TOOL_NAME}' '${SHELL_TOOL_NAME}' ...) to act on the plan, strictly adhering to the project's established conventions (detailed under 'Core 
 Mandates').
 4. **Verify (Tests):** If applicable and feasible, verify the changes using the project's testing procedures. Identify the correct test commands and frameworks by examining 'README' files, build/package configuration (e.g., 'package.json'), or existing test execution patterns. NEVER assume standard test commands.
-5. **Verify (Standards):** VERY IMPORTANT: After making code changes, execute the project-specific build, linting and type-checking commands (e.g., 'tsc', 'npm run lint', 'ruff check .') that you have identified for this project (or obtained from the user). This ensures code quality and adherence to standards.${interactiveMode ? " If unsure about these commands, you can ask the user if they'd like you to run them and if so how to." : ''}
+5. **Verify (Standards):** VERY IMPORTANT: After making code changes, execute the project-specific build, linting and type-checking commands (e.g., 'tsc', 'npm run lint', 'ruff check .') that you have identified for this project (or obtained from the user). This ensures code quality and adherence to standards.${interactiveMode ? " If unsure about these commands, you can ask the user if they'd like you to run them and if so how to." : ""}
 6. **Finalize:** After all verification passes, consider the task complete. Do not remove or revert any changes or created files (like tests). Await the user's next instruction.
 
 ## New Applications
 
 **Goal:** Autonomously implement and deliver a visually appealing, substantially complete, and functional prototype. Utilize all tools at your disposal to implement the application. Some tools you may especially find useful are '${WRITE_FILE_TOOL_NAME}', '${EDIT_TOOL_NAME}' and '${SHELL_TOOL_NAME}'.
 
-1. **Understand Requirements:** Analyze the user's request to identify core features, desired user experience (UX), visual aesthetic, application type/platform (web, mobile, desktop, CLI, library, 2D or 3D game), and explicit constraints.${interactiveMode ? ' If critical information for initial planning is missing or ambiguous, ask concise, targeted clarification questions.' : ''}
+1. **Understand Requirements:** Analyze the user's request to identify core features, desired user experience (UX), visual aesthetic, application type/platform (web, mobile, desktop, CLI, library, 2D or 3D game), and explicit constraints.${interactiveMode ? " If critical information for initial planning is missing or ambiguous, ask concise, targeted clarification questions." : ""}
 2. **Propose Plan:** Formulate an internal development plan. Present a clear, concise, high-level summary to the user. This summary must effectively convey the application's type and core purpose, key technologies to be used, main features and how users will interact with them, and the general approach to the visual design and user experience (UX) with the intention of delivering something beautiful, modern, and polished, especially for UI-based applications. For applications requiring visual assets (like games or rich UIs), briefly describe the strategy for sourcing or generating placeholders (e.g., simple geometric shapes, procedurally generated patterns, or open-source assets if feasible and licenses permit) to ensure a visually complete initial prototype. Ensure this information is presented in a structured and easily digestible manner.
   - When key technologies aren't specified, prefer the following:
   - **Websites (Frontend):** React (JavaScript/TypeScript) or Angular with Bootstrap CSS, incorporating Material Design principles for UI/UX.
@@ -236,7 +228,7 @@ IT IS CRITICAL TO FOLLOW THESE GUIDELINES TO AVOID EXCESSIVE TOKEN CONSUMPTION.
 - After the command runs, inspect the temp files (e.g. '<temp_dir>/out.log' and '<temp_dir>/err.log') using commands like 'grep', 'tail', 'head', ... (or platform equivalents). Remove the temp files when done.
 `;
   }
-  return '';
+  return "";
 })()}
 
 ## Tone and Style (CLI Interaction)
@@ -244,7 +236,7 @@ IT IS CRITICAL TO FOLLOW THESE GUIDELINES TO AVOID EXCESSIVE TOKEN CONSUMPTION.
 - **Minimal Output:** Aim for fewer than 3 lines of text output (excluding tool use/code generation) per response whenever practical. Focus strictly on the user's query.
 - **Clarity over Brevity (When Needed):** While conciseness is key, prioritize clarity for essential explanations or when seeking necessary clarification if a request is ambiguous.${(function () {
         if (isGemini3) {
-          return '';
+          return "";
         } else {
           return `
 - **No Chitchat:** Avoid conversational filler, preambles ("Okay, I will now..."), or postambles ("I have finished the changes..."). Get straight to the action or answer.`;
@@ -270,7 +262,7 @@ ${(function () {
 - **Interactive Commands:** Only execute non-interactive commands.`;
   }
 })()}
-- **Remembering Facts:** Use the '${MEMORY_TOOL_NAME}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information.${interactiveMode ? ` If unsure whether to save something, you can ask the user, "Should I remember that for you?"` : ''}
+- **Remembering Facts:** Use the '${MEMORY_TOOL_NAME}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information.${interactiveMode ? ` If unsure whether to save something, you can ask the user, "Should I remember that for you?"` : ""}
 - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward.
 
 ## Interaction Details
@@ -279,8 +271,8 @@ ${(function () {
       sandbox: `
 ${(function () {
   // Determine sandbox status based on environment variables
-  const isSandboxExec = process.env['SANDBOX'] === 'sandbox-exec';
-  const isGenericSandbox = !!process.env['SANDBOX']; // Check if SANDBOX is set to any non-empty value
+  const isSandboxExec = process.env["SANDBOX"] === "sandbox-exec";
+  const isGenericSandbox = !!process.env["SANDBOX"]; // Check if SANDBOX is set to any non-empty value
 
   if (isSandboxExec) {
     return `
@@ -316,40 +308,37 @@ ${(function () {
       interactiveMode
         ? `
 - Keep the user informed and ask for clarification or confirmation where needed.`
-        : ''
+        : ""
     }
 - After each commit, confirm that it was successful by running \`git status\`.
 - If a commit fails, never attempt to work around the issues without being asked to do so.
 - Never push changes to a remote repository without being asked explicitly by the user.
 `;
   }
-  return '';
+  return "";
 })()}`,
       finalReminder: `
 # Final Reminder
 Your core function is efficient and safe assistance. Balance extreme conciseness with the crucial need for clarity, especially regarding safety and potential system modifications. Always prioritize user control and project conventions. Never make assumptions about the contents of files; instead use '${READ_FILE_TOOL_NAME}' to ensure you aren't making broad assumptions. Finally, you are an agent - please keep going until the user's query is completely resolved.`,
     };
 
-    const orderedPrompts: Array<keyof typeof promptConfig> = [
-      'preamble',
-      'coreMandates',
-    ];
+    const orderedPrompts: Array<keyof typeof promptConfig> = ["preamble", "coreMandates"];
 
     if (enableCodebaseInvestigator && enableWriteTodosTool) {
-      orderedPrompts.push('primaryWorkflows_prefix_ci_todo');
+      orderedPrompts.push("primaryWorkflows_prefix_ci_todo");
     } else if (enableCodebaseInvestigator) {
-      orderedPrompts.push('primaryWorkflows_prefix_ci');
+      orderedPrompts.push("primaryWorkflows_prefix_ci");
     } else if (enableWriteTodosTool) {
-      orderedPrompts.push('primaryWorkflows_todo');
+      orderedPrompts.push("primaryWorkflows_todo");
     } else {
-      orderedPrompts.push('primaryWorkflows_prefix');
+      orderedPrompts.push("primaryWorkflows_prefix");
     }
     orderedPrompts.push(
-      'primaryWorkflows_suffix',
-      'operationalGuidelines',
-      'sandbox',
-      'git',
-      'finalReminder',
+      "primaryWorkflows_suffix",
+      "operationalGuidelines",
+      "sandbox",
+      "git",
+      "finalReminder",
     );
 
     // By default, all prompts are enabled. A prompt is disabled if its corresponding
@@ -357,16 +346,14 @@ Your core function is efficient and safe assistance. Balance extreme conciseness
     const enabledPrompts = orderedPrompts.filter((key) => {
       const envVar = process.env[`GEMINI_PROMPT_${key.toUpperCase()}`];
       const lowerEnvVar = envVar?.trim().toLowerCase();
-      return lowerEnvVar !== '0' && lowerEnvVar !== 'false';
+      return lowerEnvVar !== "0" && lowerEnvVar !== "false";
     });
 
-    basePrompt = enabledPrompts.map((key) => promptConfig[key]).join('\n');
+    basePrompt = enabledPrompts.map((key) => promptConfig[key]).join("\n");
   }
 
   // if GEMINI_WRITE_SYSTEM_MD is set (and not 0|false), write base system prompt to file
-  const writeSystemMdResolution = resolvePathFromEnv(
-    process.env['GEMINI_WRITE_SYSTEM_MD'],
-  );
+  const writeSystemMdResolution = resolvePathFromEnv(process.env["GEMINI_WRITE_SYSTEM_MD"]);
 
   // Check if the feature is enabled. This proceeds only if the environment
   // variable is set and is not explicitly '0' or 'false'.
@@ -380,9 +367,7 @@ Your core function is efficient and safe assistance. Balance extreme conciseness
   }
 
   const memorySuffix =
-    userMemory && userMemory.trim().length > 0
-      ? `\n\n---\n\n${userMemory.trim()}`
-      : '';
+    userMemory && userMemory.trim().length > 0 ? `\n\n---\n\n${userMemory.trim()}` : "";
 
   return `${basePrompt}${memorySuffix}`;
 }
diff --git a/packages/gemini-cli-core/src/core/recordingContentGenerator.test.ts b/packages/gemini-cli-core/src/core/recordingContentGenerator.test.ts
index c69c62ebf..94c824854 100644
--- a/packages/gemini-cli-core/src/core/recordingContentGenerator.test.ts
+++ b/packages/gemini-cli-core/src/core/recordingContentGenerator.test.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { appendFileSync } from "node:fs";
 import type {
-  GenerateContentResponse,
+  ContentEmbedding,
+  CountTokensParameters,
   CountTokensResponse,
+  EmbedContentParameters,
   EmbedContentResponse,
   GenerateContentParameters,
-  CountTokensParameters,
-  EmbedContentParameters,
-  ContentEmbedding,
-} from '@google/genai';
-import { appendFileSync } from 'node:fs';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import { RecordingContentGenerator } from './recordingContentGenerator.js';
-
-vi.mock('node:fs', () => ({
+  GenerateContentResponse,
+} from "@google/genai";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { RecordingContentGenerator } from "./recordingContentGenerator.js";
+
+vi.mock("node:fs", () => ({
   appendFileSync: vi.fn(),
 }));
 
-describe('RecordingContentGenerator', () => {
+describe("RecordingContentGenerator", () => {
   let mockRealGenerator: ContentGenerator;
   let recorder: RecordingContentGenerator;
-  const filePath = '/test/file/responses.json';
+  const filePath = "/test/file/responses.json";
 
   beforeEach(() => {
     mockRealGenerator = {
@@ -39,42 +39,33 @@ describe('RecordingContentGenerator', () => {
     vi.clearAllMocks();
   });
 
-  it('should record generateContent responses', async () => {
+  it("should record generateContent responses", async () => {
     const mockResponse = {
-      candidates: [
-        { content: { parts: [{ text: 'response' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response" }], role: "model" } }],
       usageMetadata: { totalTokenCount: 10 },
     } as GenerateContentResponse;
     (mockRealGenerator.generateContent as Mock).mockResolvedValue(mockResponse);
 
-    const response = await recorder.generateContent(
-      {} as GenerateContentParameters,
-      'id1',
-    );
+    const response = await recorder.generateContent({} as GenerateContentParameters, "id1");
     expect(response).toEqual(mockResponse);
-    expect(mockRealGenerator.generateContent).toHaveBeenCalledWith({}, 'id1');
+    expect(mockRealGenerator.generateContent).toHaveBeenCalledWith({}, "id1");
 
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'generateContent',
+        method: "generateContent",
         response: mockResponse,
-      }) + '\n',
+      }) + "\n",
     );
   });
 
-  it('should record generateContentStream responses', async () => {
+  it("should record generateContentStream responses", async () => {
     const mockResponse1 = {
-      candidates: [
-        { content: { parts: [{ text: 'response1' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response1" }], role: "model" } }],
       usageMetadata: { totalTokenCount: 10 },
     } as GenerateContentResponse;
     const mockResponse2 = {
-      candidates: [
-        { content: { parts: [{ text: 'response2' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response2" }], role: "model" } }],
       usageMetadata: { totalTokenCount: 20 },
     } as GenerateContentResponse;
 
@@ -83,35 +74,27 @@ describe('RecordingContentGenerator', () => {
       yield mockResponse2;
     }
 
-    (mockRealGenerator.generateContentStream as Mock).mockResolvedValue(
-      mockStream(),
-    );
+    (mockRealGenerator.generateContentStream as Mock).mockResolvedValue(mockStream());
 
-    const stream = await recorder.generateContentStream(
-      {} as GenerateContentParameters,
-      'id1',
-    );
+    const stream = await recorder.generateContentStream({} as GenerateContentParameters, "id1");
     const responses = [];
     for await (const response of stream) {
       responses.push(response);
     }
 
     expect(responses).toEqual([mockResponse1, mockResponse2]);
-    expect(mockRealGenerator.generateContentStream).toHaveBeenCalledWith(
-      {},
-      'id1',
-    );
+    expect(mockRealGenerator.generateContentStream).toHaveBeenCalledWith({}, "id1");
 
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'generateContentStream',
+        method: "generateContentStream",
         response: responses,
-      }) + '\n',
+      }) + "\n",
     );
   });
 
-  it('should record countTokens responses', async () => {
+  it("should record countTokens responses", async () => {
     const mockResponse = {
       totalTokens: 100,
       cachedContentTokenCount: 10,
@@ -125,13 +108,13 @@ describe('RecordingContentGenerator', () => {
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'countTokens',
+        method: "countTokens",
         response: mockResponse,
-      }) + '\n',
+      }) + "\n",
     );
   });
 
-  it('should record embedContent responses', async () => {
+  it("should record embedContent responses", async () => {
     const mockResponse = {
       embeddings: [{ values: [1, 2, 3] } as ContentEmbedding],
     } as EmbedContentResponse;
@@ -143,9 +126,9 @@ describe('RecordingContentGenerator', () => {
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'embedContent',
+        method: "embedContent",
         response: mockResponse,
-      }) + '\n',
+      }) + "\n",
     );
   });
 });
diff --git a/packages/gemini-cli-core/src/core/recordingContentGenerator.ts b/packages/gemini-cli-core/src/core/recordingContentGenerator.ts
index 27abcb418..a8e6e3817 100644
--- a/packages/gemini-cli-core/src/core/recordingContentGenerator.ts
+++ b/packages/gemini-cli-core/src/core/recordingContentGenerator.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { appendFileSync } from "node:fs";
 import type {
+  CountTokensParameters,
   CountTokensResponse,
+  EmbedContentParameters,
+  EmbedContentResponse,
   GenerateContentParameters,
   GenerateContentResponse,
-  CountTokensParameters,
-  EmbedContentResponse,
-  EmbedContentParameters,
-} from '@google/genai';
-import { appendFileSync } from 'node:fs';
-import type { ContentGenerator } from './contentGenerator.js';
-import type { FakeResponse } from './fakeContentGenerator.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+} from "@google/genai";
+import type { UserTierId } from "../code_assist/types.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import type { FakeResponse } from "./fakeContentGenerator.js";
 
 // A ContentGenerator that wraps another content generator and records all the
 // responses, with the ability to write them out to a file. These files are
@@ -36,12 +36,9 @@ export class RecordingContentGenerator implements ContentGenerator {
     request: GenerateContentParameters,
     userPromptId: string,
   ): Promise<GenerateContentResponse> {
-    const response = await this.realGenerator.generateContent(
-      request,
-      userPromptId,
-    );
+    const response = await this.realGenerator.generateContent(request, userPromptId);
     const recordedResponse: FakeResponse = {
-      method: 'generateContent',
+      method: "generateContent",
       response: {
         candidates: response.candidates,
         usageMetadata: response.usageMetadata,
@@ -56,14 +53,11 @@ export class RecordingContentGenerator implements ContentGenerator {
     userPromptId: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     const recordedResponse: FakeResponse = {
-      method: 'generateContentStream',
+      method: "generateContentStream",
       response: [],
     };
 
-    const realResponses = await this.realGenerator.generateContentStream(
-      request,
-      userPromptId,
-    );
+    const realResponses = await this.realGenerator.generateContentStream(request, userPromptId);
 
     async function* stream(filePath: string) {
       for await (const response of realResponses) {
@@ -79,12 +73,10 @@ export class RecordingContentGenerator implements ContentGenerator {
     return Promise.resolve(stream(this.filePath));
   }
 
-  async countTokens(
-    request: CountTokensParameters,
-  ): Promise<CountTokensResponse> {
+  async countTokens(request: CountTokensParameters): Promise<CountTokensResponse> {
     const response = await this.realGenerator.countTokens(request);
     const recordedResponse: FakeResponse = {
-      method: 'countTokens',
+      method: "countTokens",
       response: {
         totalTokens: response.totalTokens,
         cachedContentTokenCount: response.cachedContentTokenCount,
@@ -94,13 +86,11 @@ export class RecordingContentGenerator implements ContentGenerator {
     return response;
   }
 
-  async embedContent(
-    request: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse> {
     const response = await this.realGenerator.embedContent(request);
 
     const recordedResponse: FakeResponse = {
-      method: 'embedContent',
+      method: "embedContent",
       response: {
         embeddings: response.embeddings,
         metadata: response.metadata,
diff --git a/packages/gemini-cli-core/src/core/sessionHookTriggers.ts b/packages/gemini-cli-core/src/core/sessionHookTriggers.ts
index 8bd409b8d..bc85af874 100644
--- a/packages/gemini-cli-core/src/core/sessionHookTriggers.ts
+++ b/packages/gemini-cli-core/src/core/sessionHookTriggers.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
-  MessageBusType,
   type HookExecutionRequest,
   type HookExecutionResponse,
-} from '../confirmation-bus/types.js';
-import type {
-  SessionStartSource,
-  SessionEndReason,
-  PreCompressTrigger,
-} from '../hooks/types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+  MessageBusType,
+} from "../confirmation-bus/types.js";
+import type { PreCompressTrigger, SessionEndReason, SessionStartSource } from "../hooks/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
 
 /**
  * Fires the SessionStart hook.
@@ -31,7 +27,7 @@ export async function fireSessionStartHook(
     await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'SessionStart',
+        eventName: "SessionStart",
         input: {
           source,
         },
@@ -57,7 +53,7 @@ export async function fireSessionEndHook(
     await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'SessionEnd',
+        eventName: "SessionEnd",
         input: {
           reason,
         },
@@ -83,7 +79,7 @@ export async function firePreCompressHook(
     await messageBus.request<HookExecutionRequest, HookExecutionResponse>(
       {
         type: MessageBusType.HOOK_EXECUTION_REQUEST,
-        eventName: 'PreCompress',
+        eventName: "PreCompress",
         input: {
           trigger,
         },
diff --git a/packages/gemini-cli-core/src/core/tokenLimits.test.ts b/packages/gemini-cli-core/src/core/tokenLimits.test.ts
index 1bff09d31..5f2f9e3c8 100644
--- a/packages/gemini-cli-core/src/core/tokenLimits.test.ts
+++ b/packages/gemini-cli-core/src/core/tokenLimits.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { tokenLimit, DEFAULT_TOKEN_LIMIT } from './tokenLimits.js';
+import { describe, expect, it } from "vitest";
+import { DEFAULT_TOKEN_LIMIT, tokenLimit } from "./tokenLimits.js";
 
-describe('tokenLimit', () => {
-  it('should return the correct token limit for gemini-1.5-pro', () => {
-    expect(tokenLimit('gemini-1.5-pro')).toBe(2_097_152);
+describe("tokenLimit", () => {
+  it("should return the correct token limit for gemini-1.5-pro", () => {
+    expect(tokenLimit("gemini-1.5-pro")).toBe(2_097_152);
   });
 
-  it('should return the correct token limit for gemini-1.5-flash', () => {
-    expect(tokenLimit('gemini-1.5-flash')).toBe(1_048_576);
+  it("should return the correct token limit for gemini-1.5-flash", () => {
+    expect(tokenLimit("gemini-1.5-flash")).toBe(1_048_576);
   });
 
-  it('should return the default token limit for an unknown model', () => {
-    expect(tokenLimit('unknown-model')).toBe(DEFAULT_TOKEN_LIMIT);
+  it("should return the default token limit for an unknown model", () => {
+    expect(tokenLimit("unknown-model")).toBe(DEFAULT_TOKEN_LIMIT);
   });
 
-  it('should return the default token limit if no model is provided', () => {
+  it("should return the default token limit if no model is provided", () => {
     // @ts-expect-error testing invalid input
     expect(tokenLimit(undefined)).toBe(DEFAULT_TOKEN_LIMIT);
   });
 
-  it('should have the correct default token limit value', () => {
+  it("should have the correct default token limit value", () => {
     expect(DEFAULT_TOKEN_LIMIT).toBe(1_048_576);
   });
 });
diff --git a/packages/gemini-cli-core/src/core/tokenLimits.ts b/packages/gemini-cli-core/src/core/tokenLimits.ts
index d238cdb3a..16c0f3f4f 100644
--- a/packages/gemini-cli-core/src/core/tokenLimits.ts
+++ b/packages/gemini-cli-core/src/core/tokenLimits.ts
@@ -13,18 +13,18 @@ export function tokenLimit(model: Model): TokenCount {
   // Add other models as they become relevant or if specified by config
   // Pulled from https://ai.google.dev/gemini-api/docs/models
   switch (model) {
-    case 'gemini-1.5-pro':
+    case "gemini-1.5-pro":
       return 2_097_152;
-    case 'gemini-1.5-flash':
-    case 'gemini-2.5-pro-preview-05-06':
-    case 'gemini-2.5-pro-preview-06-05':
-    case 'gemini-2.5-pro':
-    case 'gemini-2.5-flash-preview-05-20':
-    case 'gemini-2.5-flash':
-    case 'gemini-2.5-flash-lite':
-    case 'gemini-2.0-flash':
+    case "gemini-1.5-flash":
+    case "gemini-2.5-pro-preview-05-06":
+    case "gemini-2.5-pro-preview-06-05":
+    case "gemini-2.5-pro":
+    case "gemini-2.5-flash-preview-05-20":
+    case "gemini-2.5-flash":
+    case "gemini-2.5-flash-lite":
+    case "gemini-2.0-flash":
       return 1_048_576;
-    case 'gemini-2.0-flash-preview-image-generation':
+    case "gemini-2.0-flash-preview-image-generation":
       return 32_000;
     default:
       return DEFAULT_TOKEN_LIMIT;
diff --git a/packages/gemini-cli-core/src/core/turn.test.ts b/packages/gemini-cli-core/src/core/turn.test.ts
index 3627ee927..9f3c53c2a 100644
--- a/packages/gemini-cli-core/src/core/turn.test.ts
+++ b/packages/gemini-cli-core/src/core/turn.test.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type {
-  ServerGeminiToolCallRequestEvent,
-  ServerGeminiErrorEvent,
-} from './turn.js';
-import { Turn, GeminiEventType } from './turn.js';
-import type { GenerateContentResponse, Part, Content } from '@google/genai';
-import { reportError } from '../utils/errorReporting.js';
-import type { GeminiChat } from './geminiChat.js';
-import { InvalidStreamError, StreamEventType } from './geminiChat.js';
+import type { Content, GenerateContentResponse, Part } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { reportError } from "../utils/errorReporting.js";
+import type { GeminiChat } from "./geminiChat.js";
+import { InvalidStreamError, StreamEventType } from "./geminiChat.js";
+import type { ServerGeminiErrorEvent, ServerGeminiToolCallRequestEvent } from "./turn.js";
+import { GeminiEventType, Turn } from "./turn.js";
 
 const mockSendMessageStream = vi.fn();
 const mockGetHistory = vi.fn();
 const mockMaybeIncludeSchemaDepthContext = vi.fn();
 
-vi.mock('@google/genai', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@google/genai')>();
+vi.mock("@google/genai", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@google/genai")>();
   const MockChat = vi.fn().mockImplementation(() => ({
     sendMessageStream: mockSendMessageStream,
     getHistory: mockGetHistory,
@@ -32,18 +29,17 @@ vi.mock('@google/genai', async (importOriginal) => {
   };
 });
 
-vi.mock('../utils/errorReporting', () => ({
+vi.mock("../utils/errorReporting", () => ({
   reportError: vi.fn(),
 }));
 
 // Use the actual implementation from partUtils now that it's provided.
-vi.mock('../utils/generateContentResponseUtilities', () => ({
+vi.mock("../utils/generateContentResponseUtilities", () => ({
   getResponseText: (resp: GenerateContentResponse) =>
-    resp.candidates?.[0]?.content?.parts?.map((part) => part.text).join('') ||
-    undefined,
+    resp.candidates?.[0]?.content?.parts?.map((part) => part.text).join("") || undefined,
 }));
 
-describe('Turn', () => {
+describe("Turn", () => {
   let turn: Turn;
   // Define a type for the mocked Chat instance for clarity
   type MockedChatInstance = {
@@ -60,7 +56,7 @@ describe('Turn', () => {
       getHistory: mockGetHistory,
       maybeIncludeSchemaDepthContext: mockMaybeIncludeSchemaDepthContext,
     };
-    turn = new Turn(mockChatInstance as unknown as GeminiChat, 'prompt-id-1');
+    turn = new Turn(mockChatInstance as unknown as GeminiChat, "prompt-id-1");
     mockGetHistory.mockReturnValue([]);
     mockSendMessageStream.mockResolvedValue((async function* () {})());
   });
@@ -69,35 +65,35 @@ describe('Turn', () => {
     vi.restoreAllMocks();
   });
 
-  describe('constructor', () => {
-    it('should initialize pendingToolCalls and debugResponses', () => {
+  describe("constructor", () => {
+    it("should initialize pendingToolCalls and debugResponses", () => {
       expect(turn.pendingToolCalls).toEqual([]);
       expect(turn.getDebugResponses()).toEqual([]);
     });
   });
 
-  describe('run', () => {
-    it('should yield content events for text parts', async () => {
+  describe("run", () => {
+    it("should yield content events for text parts", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: 'Hello' }] } }],
+            candidates: [{ content: { parts: [{ text: "Hello" }] } }],
           } as GenerateContentResponse,
         };
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: ' world' }] } }],
+            candidates: [{ content: { parts: [{ text: " world" }] } }],
           } as GenerateContentResponse,
         };
       })();
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Hi' }];
+      const reqParts: Part[] = [{ text: "Hi" }];
       for await (const event of turn.run(
-        { model: 'gemini' },
+        { model: "gemini" },
         reqParts,
         new AbortController().signal,
       )) {
@@ -105,34 +101,34 @@ describe('Turn', () => {
       }
 
       expect(mockSendMessageStream).toHaveBeenCalledWith(
-        { model: 'gemini' },
+        { model: "gemini" },
         reqParts,
-        'prompt-id-1',
+        "prompt-id-1",
         expect.any(AbortSignal),
       );
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Hello' },
-        { type: GeminiEventType.Content, value: ' world' },
+        { type: GeminiEventType.Content, value: "Hello" },
+        { type: GeminiEventType.Content, value: " world" },
       ]);
       expect(turn.getDebugResponses().length).toBe(2);
     });
 
-    it('should yield tool_call_request events for function calls', async () => {
+    it("should yield tool_call_request events for function calls", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             functionCalls: [
               {
-                id: 'fc1',
-                name: 'tool1',
-                args: { arg1: 'val1' },
+                id: "fc1",
+                name: "tool1",
+                args: { arg1: "val1" },
                 isClientInitiated: false,
               },
               {
-                name: 'tool2',
-                args: { arg2: 'val2' },
+                name: "tool2",
+                args: { arg2: "val2" },
                 isClientInitiated: false,
               }, // No ID
             ],
@@ -142,9 +138,9 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Use tools' }];
+      const reqParts: Part[] = [{ text: "Use tools" }];
       for await (const event of turn.run(
-        { model: 'gemini' },
+        { model: "gemini" },
         reqParts,
         new AbortController().signal,
       )) {
@@ -156,9 +152,9 @@ describe('Turn', () => {
       expect(event1.type).toBe(GeminiEventType.ToolCallRequest);
       expect(event1.value).toEqual(
         expect.objectContaining({
-          callId: 'fc1',
-          name: 'tool1',
-          args: { arg1: 'val1' },
+          callId: "fc1",
+          name: "tool1",
+          args: { arg1: "val1" },
           isClientInitiated: false,
         }),
       );
@@ -168,25 +164,23 @@ describe('Turn', () => {
       expect(event2.type).toBe(GeminiEventType.ToolCallRequest);
       expect(event2.value).toEqual(
         expect.objectContaining({
-          name: 'tool2',
-          args: { arg2: 'val2' },
+          name: "tool2",
+          args: { arg2: "val2" },
           isClientInitiated: false,
         }),
       );
-      expect(event2.value.callId).toEqual(
-        expect.stringMatching(/^tool2-\d{13}-\w{10,}$/),
-      );
+      expect(event2.value.callId).toEqual(expect.stringMatching(/^tool2-\d{13}-\w{10,}$/));
       expect(turn.pendingToolCalls[1]).toEqual(event2.value);
       expect(turn.getDebugResponses().length).toBe(1);
     });
 
-    it('should yield UserCancelled event if signal is aborted', async () => {
+    it("should yield UserCancelled event if signal is aborted", async () => {
       const abortController = new AbortController();
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: 'First part' }] } }],
+            candidates: [{ content: { parts: [{ text: "First part" }] } }],
           } as GenerateContentResponse,
         };
         abortController.abort();
@@ -196,7 +190,7 @@ describe('Turn', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'Second part - should not be processed' }],
+                  parts: [{ text: "Second part - should not be processed" }],
                 },
               },
             ],
@@ -206,32 +200,25 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test abort' }];
-      for await (const event of turn.run(
-        { model: 'gemini' },
-        reqParts,
-        abortController.signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Test abort" }];
+      for await (const event of turn.run({ model: "gemini" }, reqParts, abortController.signal)) {
         events.push(event);
       }
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'First part' },
+        { type: GeminiEventType.Content, value: "First part" },
         { type: GeminiEventType.UserCancelled },
       ]);
       expect(turn.getDebugResponses().length).toBe(1);
     });
 
-    it('should yield InvalidStream event if sendMessageStream throws InvalidStreamError', async () => {
-      const error = new InvalidStreamError(
-        'Test invalid stream',
-        'NO_FINISH_REASON',
-      );
+    it("should yield InvalidStream event if sendMessageStream throws InvalidStreamError", async () => {
+      const error = new InvalidStreamError("Test invalid stream", "NO_FINISH_REASON");
       mockSendMessageStream.mockRejectedValue(error);
-      const reqParts: Part[] = [{ text: 'Trigger invalid stream' }];
+      const reqParts: Part[] = [{ text: "Trigger invalid stream" }];
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
+        { model: "gemini" },
         reqParts,
         new AbortController().signal,
       )) {
@@ -243,18 +230,16 @@ describe('Turn', () => {
       expect(reportError).not.toHaveBeenCalled(); // Should not report as error
     });
 
-    it('should yield Error event and report if sendMessageStream throws', async () => {
-      const error = new Error('API Error');
+    it("should yield Error event and report if sendMessageStream throws", async () => {
+      const error = new Error("API Error");
       mockSendMessageStream.mockRejectedValue(error);
-      const reqParts: Part[] = [{ text: 'Trigger error' }];
-      const historyContent: Content[] = [
-        { role: 'model', parts: [{ text: 'Previous history' }] },
-      ];
+      const reqParts: Part[] = [{ text: "Trigger error" }];
+      const historyContent: Content[] = [{ role: "model", parts: [{ text: "Previous history" }] }];
       mockGetHistory.mockReturnValue(historyContent);
       mockMaybeIncludeSchemaDepthContext.mockResolvedValue(undefined);
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
+        { model: "gemini" },
         reqParts,
         new AbortController().signal,
       )) {
@@ -265,18 +250,18 @@ describe('Turn', () => {
       const errorEvent = events[0] as ServerGeminiErrorEvent;
       expect(errorEvent.type).toBe(GeminiEventType.Error);
       expect(errorEvent.value).toEqual({
-        error: { message: 'API Error', status: undefined },
+        error: { message: "API Error", status: undefined },
       });
       expect(turn.getDebugResponses().length).toBe(0);
       expect(reportError).toHaveBeenCalledWith(
         error,
-        'Error when talking to Gemini API',
-        [...historyContent, { role: 'user', parts: reqParts }],
-        'Turn.run-sendMessageStream',
+        "Error when talking to Gemini API",
+        [...historyContent, { role: "user", parts: reqParts }],
+        "Turn.run-sendMessageStream",
       );
     });
 
-    it('should handle function calls with undefined name or args', async () => {
+    it("should handle function calls with undefined name or args", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -284,9 +269,9 @@ describe('Turn', () => {
             candidates: [],
             functionCalls: [
               // Add `id` back to the mock to match what the code expects
-              { id: 'fc1', name: undefined, args: { arg1: 'val1' } },
-              { id: 'fc2', name: 'tool2', args: undefined },
-              { id: 'fc3', name: undefined, args: undefined },
+              { id: "fc1", name: undefined, args: { arg1: "val1" } },
+              { id: "fc2", name: "tool2", args: undefined },
+              { id: "fc3", name: undefined, args: undefined },
             ],
           },
         };
@@ -295,8 +280,8 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
-        [{ text: 'Test undefined tool parts' }],
+        { model: "gemini" },
+        [{ text: "Test undefined tool parts" }],
         new AbortController().signal,
       )) {
         events.push(event);
@@ -307,32 +292,31 @@ describe('Turn', () => {
       // Assertions for each specific tool call event
       const event1 = events[0] as ServerGeminiToolCallRequestEvent;
       expect(event1.value).toMatchObject({
-        callId: 'fc1',
-        name: 'undefined_tool_name',
-        args: { arg1: 'val1' },
+        callId: "fc1",
+        name: "undefined_tool_name",
+        args: { arg1: "val1" },
       });
 
       const event2 = events[1] as ServerGeminiToolCallRequestEvent;
       expect(event2.value).toMatchObject({
-        callId: 'fc2',
-        name: 'tool2',
+        callId: "fc2",
+        name: "tool2",
         args: {},
       });
 
       const event3 = events[2] as ServerGeminiToolCallRequestEvent;
       expect(event3.value).toMatchObject({
-        callId: 'fc3',
-        name: 'undefined_tool_name',
+        callId: "fc3",
+        name: "undefined_tool_name",
         args: {},
       });
     });
 
     it.each([
       {
-        description:
-          'should yield finished event when response has finish reason',
-        contentText: 'Partial response',
-        finishReason: 'STOP',
+        description: "should yield finished event when response has finish reason",
+        contentText: "Partial response",
+        finishReason: "STOP",
         usageMetadata: {
           promptTokenCount: 17,
           candidatesTokenCount: 50,
@@ -342,18 +326,18 @@ describe('Turn', () => {
         },
       },
       {
-        description: 'should yield finished event for MAX_TOKENS finish reason',
-        contentText: 'This is a long response that was cut off...',
-        finishReason: 'MAX_TOKENS',
+        description: "should yield finished event for MAX_TOKENS finish reason",
+        contentText: "This is a long response that was cut off...",
+        finishReason: "MAX_TOKENS",
         usageMetadata: undefined,
       },
       {
-        description: 'should yield finished event for SAFETY finish reason',
-        contentText: 'Content blocked',
-        finishReason: 'SAFETY',
+        description: "should yield finished event for SAFETY finish reason",
+        contentText: "Content blocked",
+        finishReason: "SAFETY",
         usageMetadata: undefined,
       },
-    ])('$description', async ({ contentText, finishReason, usageMetadata }) => {
+    ])("$description", async ({ contentText, finishReason, usageMetadata }) => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -372,8 +356,8 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
-        [{ text: 'Test' }],
+        { model: "gemini" },
+        [{ text: "Test" }],
         new AbortController().signal,
       )) {
         events.push(event);
@@ -388,7 +372,7 @@ describe('Turn', () => {
       ]);
     });
 
-    it('should yield finished event with undefined reason when there is no finish reason', async () => {
+    it("should yield finished event with undefined reason when there is no finish reason", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -396,7 +380,7 @@ describe('Turn', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'Response without finish reason' }],
+                  parts: [{ text: "Response without finish reason" }],
                 },
                 // No finishReason property
               },
@@ -407,9 +391,9 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test no finish reason' }];
+      const reqParts: Part[] = [{ text: "Test no finish reason" }];
       for await (const event of turn.run(
-        { model: 'gemini' },
+        { model: "gemini" },
         reqParts,
         new AbortController().signal,
       )) {
@@ -419,19 +403,19 @@ describe('Turn', () => {
       expect(events).toEqual([
         {
           type: GeminiEventType.Content,
-          value: 'Response without finish reason',
+          value: "Response without finish reason",
         },
       ]);
     });
 
-    it('should handle multiple responses with different finish reasons', async () => {
+    it("should handle multiple responses with different finish reasons", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'First part' }] },
+                content: { parts: [{ text: "First part" }] },
                 // No finish reason on first response
               },
             ],
@@ -442,8 +426,8 @@ describe('Turn', () => {
             type: StreamEventType.CHUNK,
             candidates: [
               {
-                content: { parts: [{ text: 'Second part' }] },
-                finishReason: 'OTHER',
+                content: { parts: [{ text: "Second part" }] },
+                finishReason: "OTHER",
               },
             ],
           },
@@ -452,9 +436,9 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test multiple responses' }];
+      const reqParts: Part[] = [{ text: "Test multiple responses" }];
       for await (const event of turn.run(
-        { model: 'gemini' },
+        { model: "gemini" },
         reqParts,
         new AbortController().signal,
       )) {
@@ -462,32 +446,32 @@ describe('Turn', () => {
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'First part' },
-        { type: GeminiEventType.Content, value: 'Second part' },
+        { type: GeminiEventType.Content, value: "First part" },
+        { type: GeminiEventType.Content, value: "Second part" },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'OTHER', usageMetadata: undefined },
+          value: { reason: "OTHER", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should yield citation and finished events when response has citationMetadata', async () => {
+    it("should yield citation and finished events when response has citationMetadata", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Source 1 Title',
+                      uri: "https://example.com/source1",
+                      title: "Source 1 Title",
                     },
                   ],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           },
@@ -497,47 +481,47 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
-        [{ text: 'Test citations' }],
+        { model: "gemini" },
+        [{ text: "Test citations" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
+        { type: GeminiEventType.Content, value: "Some text." },
         {
           type: GeminiEventType.Citation,
-          value: 'Citations:\n(Source 1 Title) https://example.com/source1',
+          value: "Citations:\n(Source 1 Title) https://example.com/source1",
         },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'STOP', usageMetadata: undefined },
+          value: { reason: "STOP", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should yield a single citation event for multiple citations in one response', async () => {
+    it("should yield a single citation event for multiple citations in one response", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source2',
-                      title: 'Title2',
+                      uri: "https://example.com/source2",
+                      title: "Title2",
                     },
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Title1',
+                      uri: "https://example.com/source1",
+                      title: "Title1",
                     },
                   ],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           },
@@ -547,40 +531,40 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
-        [{ text: 'test' }],
+        { model: "gemini" },
+        [{ text: "test" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
+        { type: GeminiEventType.Content, value: "Some text." },
         {
           type: GeminiEventType.Citation,
           value:
-            'Citations:\n(Title1) https://example.com/source1\n(Title2) https://example.com/source2',
+            "Citations:\n(Title1) https://example.com/source1\n(Title2) https://example.com/source2",
         },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'STOP', usageMetadata: undefined },
+          value: { reason: "STOP", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should not yield citation event if there is no finish reason', async () => {
+    it("should not yield citation event if there is no finish reason", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Source 1 Title',
+                      uri: "https://example.com/source1",
+                      title: "Source 1 Title",
                     },
                   ],
                 },
@@ -594,43 +578,39 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
-        [{ text: 'test' }],
+        { model: "gemini" },
+        [{ text: "test" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
-      expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
-      ]);
+      expect(events).toEqual([{ type: GeminiEventType.Content, value: "Some text." }]);
       // No Citation event (but we do get a Finished event with undefined reason)
-      expect(events.some((e) => e.type === GeminiEventType.Citation)).toBe(
-        false,
-      );
+      expect(events.some((e) => e.type === GeminiEventType.Citation)).toBe(false);
     });
 
-    it('should ignore citations without a URI', async () => {
+    it("should ignore citations without a URI", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Good Source',
+                      uri: "https://example.com/source1",
+                      title: "Good Source",
                     },
                     {
                       // uri is undefined
-                      title: 'Bad Source',
+                      title: "Bad Source",
                     },
                   ],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           },
@@ -640,27 +620,27 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
-        [{ text: 'test' }],
+        { model: "gemini" },
+        [{ text: "test" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
+        { type: GeminiEventType.Content, value: "Some text." },
         {
           type: GeminiEventType.Citation,
-          value: 'Citations:\n(Good Source) https://example.com/source1',
+          value: "Citations:\n(Good Source) https://example.com/source1",
         },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'STOP', usageMetadata: undefined },
+          value: { reason: "STOP", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should not crash when cancelled request has malformed error', async () => {
+    it("should not crash when cancelled request has malformed error", async () => {
       const abortController = new AbortController();
 
       const errorToThrow = {
@@ -675,13 +655,9 @@ describe('Turn', () => {
       });
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test malformed error handling' }];
+      const reqParts: Part[] = [{ text: "Test malformed error handling" }];
 
-      for await (const event of turn.run(
-        { model: 'gemini' },
-        reqParts,
-        abortController.signal,
-      )) {
+      for await (const event of turn.run({ model: "gemini" }, reqParts, abortController.signal)) {
         events.push(event);
       }
 
@@ -690,55 +666,51 @@ describe('Turn', () => {
       expect(reportError).not.toHaveBeenCalled();
     });
 
-    it('should yield a Retry event when it receives one from the chat stream', async () => {
+    it("should yield a Retry event when it receives one from the chat stream", async () => {
       const mockResponseStream = (async function* () {
         yield { type: StreamEventType.RETRY };
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: 'Success' }] } }],
+            candidates: [{ content: { parts: [{ text: "Success" }] } }],
           },
         };
       })();
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      for await (const event of turn.run(
-        { model: 'gemini' },
-        [],
-        new AbortController().signal,
-      )) {
+      for await (const event of turn.run({ model: "gemini" }, [], new AbortController().signal)) {
         events.push(event);
       }
 
       expect(events).toEqual([
         { type: GeminiEventType.Retry },
-        { type: GeminiEventType.Content, value: 'Success' },
+        { type: GeminiEventType.Content, value: "Success" },
       ]);
     });
 
     it.each([
       {
-        description: 'should yield content events with traceId',
-        part: { text: 'Hello' },
-        responseId: 'trace-123',
+        description: "should yield content events with traceId",
+        part: { text: "Hello" },
+        responseId: "trace-123",
         expectedEvent: {
           type: GeminiEventType.Content,
-          value: 'Hello',
-          traceId: 'trace-123',
+          value: "Hello",
+          traceId: "trace-123",
         },
       },
       {
-        description: 'should yield thought events with traceId',
-        part: { text: '[Thought: thinking]', thought: 'thinking' },
-        responseId: 'trace-456',
+        description: "should yield thought events with traceId",
+        part: { text: "[Thought: thinking]", thought: "thinking" },
+        responseId: "trace-456",
         expectedEvent: {
           type: GeminiEventType.Thought,
-          value: { subject: '', description: '[Thought: thinking]' },
-          traceId: 'trace-456',
+          value: { subject: "", description: "[Thought: thinking]" },
+          traceId: "trace-456",
         },
       },
-    ])('$description', async ({ part, responseId, expectedEvent }) => {
+    ])("$description", async ({ part, responseId, expectedEvent }) => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -752,8 +724,8 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        { model: 'gemini' },
-        [{ text: 'Hi' }],
+        { model: "gemini" },
+        [{ text: "Hi" }],
         new AbortController().signal,
       )) {
         events.push(event);
@@ -763,25 +735,21 @@ describe('Turn', () => {
     });
   });
 
-  describe('getDebugResponses', () => {
-    it('should return collected debug responses', async () => {
+  describe("getDebugResponses", () => {
+    it("should return collected debug responses", async () => {
       const resp1 = {
-        candidates: [{ content: { parts: [{ text: 'Debug 1' }] } }],
+        candidates: [{ content: { parts: [{ text: "Debug 1" }] } }],
       } as unknown as GenerateContentResponse;
       const resp2 = {
-        functionCalls: [{ name: 'debugTool' }],
+        functionCalls: [{ name: "debugTool" }],
       } as unknown as GenerateContentResponse;
       const mockResponseStream = (async function* () {
         yield { type: StreamEventType.CHUNK, value: resp1 };
         yield { type: StreamEventType.CHUNK, value: resp2 };
       })();
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
-      const reqParts: Part[] = [{ text: 'Hi' }];
-      for await (const _ of turn.run(
-        { model: 'gemini' },
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Hi" }];
+      for await (const _ of turn.run({ model: "gemini" }, reqParts, new AbortController().signal)) {
         // consume stream
       }
       expect(turn.getDebugResponses()).toEqual([resp1, resp2]);
diff --git a/packages/gemini-cli-core/src/core/turn.ts b/packages/gemini-cli-core/src/core/turn.ts
index e29eeef89..854c6f7e1 100644
--- a/packages/gemini-cli-core/src/core/turn.ts
+++ b/packages/gemini-cli-core/src/core/turn.ts
@@ -5,42 +5,31 @@
  */
 
 import type {
-  Part,
-  PartListUnion,
-  GenerateContentResponse,
+  FinishReason,
   FunctionCall,
   FunctionDeclaration,
-  FinishReason,
+  GenerateContentResponse,
   GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import type {
-  ToolCallConfirmationDetails,
-  ToolResult,
-  ToolResultDisplay,
-} from '../tools/tools.js';
-import type { ToolErrorType } from '../tools/tool-error.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { reportError } from '../utils/errorReporting.js';
-import {
-  getErrorMessage,
-  UnauthorizedError,
-  toFriendlyError,
-} from '../utils/errors.js';
-import type { GeminiChat } from './geminiChat.js';
-import { InvalidStreamError } from './geminiChat.js';
-import { parseThought, type ThoughtSummary } from '../utils/thoughtUtils.js';
-import { createUserContent } from '@google/genai';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
+  Part,
+  PartListUnion,
+} from "@google/genai";
+import { createUserContent } from "@google/genai";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import type { ToolErrorType } from "../tools/tool-error.js";
+import type { ToolCallConfirmationDetails, ToolResult, ToolResultDisplay } from "../tools/tools.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage, toFriendlyError, UnauthorizedError } from "../utils/errors.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { parseThought, type ThoughtSummary } from "../utils/thoughtUtils.js";
+import type { GeminiChat } from "./geminiChat.js";
+import { InvalidStreamError } from "./geminiChat.js";
 
 // Define a structure for tools passed to the server
 export interface ServerTool {
   name: string;
   schema: FunctionDeclaration;
   // The execute method signature might differ slightly or be wrapped
-  execute(
-    params: Record<string, unknown>,
-    signal?: AbortSignal,
-  ): Promise<ToolResult>;
+  execute(params: Record<string, unknown>, signal?: AbortSignal): Promise<ToolResult>;
   shouldConfirmExecute(
     params: Record<string, unknown>,
     abortSignal: AbortSignal,
@@ -48,22 +37,22 @@ export interface ServerTool {
 }
 
 export enum GeminiEventType {
-  Content = 'content',
-  ToolCallRequest = 'tool_call_request',
-  ToolCallResponse = 'tool_call_response',
-  ToolCallConfirmation = 'tool_call_confirmation',
-  UserCancelled = 'user_cancelled',
-  Error = 'error',
-  ChatCompressed = 'chat_compressed',
-  Thought = 'thought',
-  MaxSessionTurns = 'max_session_turns',
-  Finished = 'finished',
-  LoopDetected = 'loop_detected',
-  Citation = 'citation',
-  Retry = 'retry',
-  ContextWindowWillOverflow = 'context_window_will_overflow',
-  InvalidStream = 'invalid_stream',
-  ModelInfo = 'model_info',
+  Content = "content",
+  ToolCallRequest = "tool_call_request",
+  ToolCallResponse = "tool_call_response",
+  ToolCallConfirmation = "tool_call_confirmation",
+  UserCancelled = "user_cancelled",
+  Error = "error",
+  ChatCompressed = "chat_compressed",
+  Thought = "thought",
+  MaxSessionTurns = "max_session_turns",
+  Finished = "finished",
+  LoopDetected = "loop_detected",
+  Citation = "citation",
+  Retry = "retry",
+  ContextWindowWillOverflow = "context_window_will_overflow",
+  InvalidStream = "invalid_stream",
+  ModelInfo = "model_info",
 }
 
 export type ServerGeminiRetryEvent = {
@@ -258,7 +247,7 @@ export class Turn {
         }
 
         // Handle the new RETRY event
-        if (streamEvent.type === 'retry') {
+        if (streamEvent.type === "retry") {
           yield { type: GeminiEventType.Retry };
           continue; // Skip to the next event in the stream
         }
@@ -273,7 +262,7 @@ export class Turn {
 
         const thoughtPart = resp.candidates?.[0]?.content?.parts?.[0];
         if (thoughtPart?.thought) {
-          const thought = parseThought(thoughtPart.text ?? '');
+          const thought = parseThought(thoughtPart.text ?? "");
           yield {
             type: GeminiEventType.Thought,
             value: thought,
@@ -308,7 +297,7 @@ export class Turn {
           if (this.pendingCitations.size > 0) {
             yield {
               type: GeminiEventType.Citation,
-              value: `Citations:\n${[...this.pendingCitations].sort().join('\n')}`,
+              value: `Citations:\n${[...this.pendingCitations].sort().join("\n")}`,
             };
             this.pendingCitations.clear();
           }
@@ -340,21 +329,18 @@ export class Turn {
         throw error;
       }
 
-      const contextForReport = [
-        ...this.chat.getHistory(/*curated*/ true),
-        createUserContent(req),
-      ];
+      const contextForReport = [...this.chat.getHistory(/*curated*/ true), createUserContent(req)];
       await reportError(
         error,
-        'Error when talking to Gemini API',
+        "Error when talking to Gemini API",
         contextForReport,
-        'Turn.run-sendMessageStream',
+        "Turn.run-sendMessageStream",
       );
       const status =
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'status' in error &&
-        typeof (error as { status: unknown }).status === 'number'
+        "status" in error &&
+        typeof (error as { status: unknown }).status === "number"
           ? (error as { status: number }).status
           : undefined;
       const structuredError: StructuredError = {
@@ -367,13 +353,10 @@ export class Turn {
     }
   }
 
-  private handlePendingFunctionCall(
-    fnCall: FunctionCall,
-  ): ServerGeminiStreamEvent | null {
+  private handlePendingFunctionCall(fnCall: FunctionCall): ServerGeminiStreamEvent | null {
     const callId =
-      fnCall.id ??
-      `${fnCall.name}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-    const name = fnCall.name || 'undefined_tool_name';
+      fnCall.id ?? `${fnCall.name}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+    const name = fnCall.name || "undefined_tool_name";
     const args = (fnCall.args || {}) as Record<string, unknown>;
 
     const toolCallRequest: ToolCallRequestInfo = {
@@ -402,7 +385,7 @@ export class Turn {
     return this.debugResponses
       .map((response) => getResponseText(response))
       .filter((text): text is string => text !== null)
-      .join(' ');
+      .join(" ");
   }
 }
 
diff --git a/packages/gemini-cli-core/src/fallback/handler.test.ts b/packages/gemini-cli-core/src/fallback/handler.test.ts
index 29ba2d5b9..d05e9a534 100644
--- a/packages/gemini-cli-core/src/fallback/handler.test.ts
+++ b/packages/gemini-cli-core/src/fallback/handler.test.ts
@@ -5,49 +5,46 @@
  */
 
 import {
+  afterEach,
+  beforeEach,
   describe,
-  it,
   expect,
-  vi,
-  beforeEach,
+  it,
   type Mock,
   type MockInstance,
-  afterEach,
-} from 'vitest';
-import { handleFallback } from './handler.js';
-import type { Config } from '../config/config.js';
-import type { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
-import { createAvailabilityServiceMock } from '../availability/testUtils.js';
-import { AuthType } from '../core/contentGenerator.js';
+  vi,
+} from "vitest";
+import type { ModelAvailabilityService } from "../availability/modelAvailabilityService.js";
+import { createDefaultPolicy } from "../availability/policyCatalog.js";
+import * as policyHelpers from "../availability/policyHelpers.js";
+import { createAvailabilityServiceMock } from "../availability/testUtils.js";
+import type { Config } from "../config/config.js";
 import {
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
-import { logFlashFallback } from '../telemetry/index.js';
-import type { FallbackModelHandler } from './types.js';
-import { ModelNotFoundError } from '../utils/httpErrors.js';
-import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
-import { coreEvents } from '../utils/events.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import * as policyHelpers from '../availability/policyHelpers.js';
-import { createDefaultPolicy } from '../availability/policyCatalog.js';
-import {
-  RetryableQuotaError,
-  TerminalQuotaError,
-} from '../utils/googleQuotaErrors.js';
+} from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { logFlashFallback } from "../telemetry/index.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { coreEvents } from "../utils/events.js";
+import { RetryableQuotaError, TerminalQuotaError } from "../utils/googleQuotaErrors.js";
+import { ModelNotFoundError } from "../utils/httpErrors.js";
+import { openBrowserSecurely } from "../utils/secure-browser-launcher.js";
+import { handleFallback } from "./handler.js";
+import type { FallbackModelHandler } from "./types.js";
 
 // Mock the telemetry logger and event class
-vi.mock('../telemetry/index.js', () => ({
+vi.mock("../telemetry/index.js", () => ({
   logFlashFallback: vi.fn(),
   FlashFallbackEvent: class {},
 }));
-vi.mock('../utils/secure-browser-launcher.js', () => ({
+vi.mock("../utils/secure-browser-launcher.js", () => ({
   openBrowserSecurely: vi.fn(),
 }));
 
 // Mock debugLogger to prevent console pollution and allow spying
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: {
     warn: vi.fn(),
     error: vi.fn(),
@@ -85,7 +82,7 @@ const createMockConfig = (overrides: Partial<Config> = {}): Config =>
     ...overrides,
   }) as unknown as Config;
 
-describe('handleFallback', () => {
+describe("handleFallback", () => {
   let mockConfig: Config;
   let mockHandler: Mock<FallbackModelHandler>;
   let consoleErrorSpy: MockInstance;
@@ -104,8 +101,8 @@ describe('handleFallback', () => {
     // We mocked debugLogger, so we don't need to spy on console.error for handler failures
     // But tests might check console.error usage in legacy code if any?
     // The handler uses console.error in legacyHandleFallback.
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    fallbackEventSpy = vi.spyOn(coreEvents, 'emitFallbackModeChanged');
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    fallbackEventSpy = vi.spyOn(coreEvents, "emitFallbackModeChanged");
   });
 
   afterEach(() => {
@@ -113,19 +110,15 @@ describe('handleFallback', () => {
     fallbackEventSpy.mockRestore();
   });
 
-  it('should return null immediately if authType is not OAuth', async () => {
-    const result = await handleFallback(
-      mockConfig,
-      MOCK_PRO_MODEL,
-      AUTH_API_KEY,
-    );
+  it("should return null immediately if authType is not OAuth", async () => {
+    const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_API_KEY);
     expect(result).toBeNull();
     expect(mockHandler).not.toHaveBeenCalled();
     expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
   });
 
-  it('should still consult the handler if the failed model is the fallback model', async () => {
-    mockHandler.mockResolvedValue('stop');
+  it("should still consult the handler if the failed model is the fallback model", async () => {
+    mockHandler.mockResolvedValue("stop");
     const result = await handleFallback(
       mockConfig,
       FALLBACK_MODEL, // Failed model is Flash
@@ -135,27 +128,19 @@ describe('handleFallback', () => {
     expect(mockHandler).toHaveBeenCalled();
   });
 
-  it('should return null if no fallbackHandler is injected in config', async () => {
+  it("should return null if no fallbackHandler is injected in config", async () => {
     const configWithoutHandler = createMockConfig({
       fallbackModelHandler: undefined,
     });
-    const result = await handleFallback(
-      configWithoutHandler,
-      MOCK_PRO_MODEL,
-      AUTH_OAUTH,
-    );
+    const result = await handleFallback(configWithoutHandler, MOCK_PRO_MODEL, AUTH_OAUTH);
     expect(result).toBeNull();
   });
 
   describe('when handler returns "retry_always"', () => {
-    it('should activate fallback mode, log telemetry, and return true', async () => {
-      mockHandler.mockResolvedValue('retry_always');
+    it("should activate fallback mode, log telemetry, and return true", async () => {
+      mockHandler.mockResolvedValue("retry_always");
 
-      const result = await handleFallback(
-        mockConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBe(true);
       expect(mockConfig.setFallbackMode).toHaveBeenCalledWith(true);
@@ -164,14 +149,10 @@ describe('handleFallback', () => {
   });
 
   describe('when handler returns "stop"', () => {
-    it('should activate fallback mode, log telemetry, and return false', async () => {
-      mockHandler.mockResolvedValue('stop');
+    it("should activate fallback mode, log telemetry, and return false", async () => {
+      mockHandler.mockResolvedValue("stop");
 
-      const result = await handleFallback(
-        mockConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBe(false);
       expect(mockConfig.setFallbackMode).toHaveBeenCalledWith(true);
@@ -180,7 +161,7 @@ describe('handleFallback', () => {
   });
 
   it('should return false without toggling fallback when handler returns "retry_later"', async () => {
-    mockHandler.mockResolvedValue('retry_later');
+    mockHandler.mockResolvedValue("retry_later");
 
     const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
@@ -191,76 +172,59 @@ describe('handleFallback', () => {
   });
 
   it('should launch upgrade flow and avoid fallback mode when handler returns "upgrade"', async () => {
-    mockHandler.mockResolvedValue('upgrade');
+    mockHandler.mockResolvedValue("upgrade");
     vi.mocked(openBrowserSecurely).mockResolvedValue(undefined);
 
     const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
     expect(result).toBe(false);
-    expect(openBrowserSecurely).toHaveBeenCalledWith(
-      'https://goo.gle/set-up-gemini-code-assist',
-    );
+    expect(openBrowserSecurely).toHaveBeenCalledWith("https://goo.gle/set-up-gemini-code-assist");
     expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
     expect(logFlashFallback).not.toHaveBeenCalled();
     expect(fallbackEventSpy).not.toHaveBeenCalled();
   });
 
-  it('should log a warning and continue when upgrade flow fails to open a browser', async () => {
-    mockHandler.mockResolvedValue('upgrade');
-    const debugWarnSpy = vi.spyOn(debugLogger, 'warn');
-    const consoleWarnSpy = vi
-      .spyOn(console, 'warn')
-      .mockImplementation(() => {});
-    vi.mocked(openBrowserSecurely).mockRejectedValue(new Error('blocked'));
+  it("should log a warning and continue when upgrade flow fails to open a browser", async () => {
+    mockHandler.mockResolvedValue("upgrade");
+    const debugWarnSpy = vi.spyOn(debugLogger, "warn");
+    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.mocked(openBrowserSecurely).mockRejectedValue(new Error("blocked"));
 
     const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
     expect(result).toBe(false);
-    expect(debugWarnSpy).toHaveBeenCalledWith(
-      'Failed to open browser automatically:',
-      'blocked',
-    );
+    expect(debugWarnSpy).toHaveBeenCalledWith("Failed to open browser automatically:", "blocked");
     expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
     expect(fallbackEventSpy).not.toHaveBeenCalled();
     debugWarnSpy.mockRestore();
     consoleWarnSpy.mockRestore();
   });
 
-  describe('when handler returns an unexpected value', () => {
-    it('should log an error and return null', async () => {
+  describe("when handler returns an unexpected value", () => {
+    it("should log an error and return null", async () => {
       mockHandler.mockResolvedValue(null);
 
-      const result = await handleFallback(
-        mockConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBeNull();
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Fallback UI handler failed:',
-        new Error(
-          'Unexpected fallback intent received from fallbackModelHandler: "null"',
-        ),
+        "Fallback UI handler failed:",
+        new Error('Unexpected fallback intent received from fallbackModelHandler: "null"'),
       );
       expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
     });
   });
 
-  it('should pass the correct context (failedModel, fallbackModel, error) to the handler', async () => {
-    const mockError = new Error('Quota Exceeded');
-    mockHandler.mockResolvedValue('retry_always');
+  it("should pass the correct context (failedModel, fallbackModel, error) to the handler", async () => {
+    const mockError = new Error("Quota Exceeded");
+    mockHandler.mockResolvedValue("retry_always");
 
     await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH, mockError);
 
-    expect(mockHandler).toHaveBeenCalledWith(
-      MOCK_PRO_MODEL,
-      FALLBACK_MODEL,
-      mockError,
-    );
+    expect(mockHandler).toHaveBeenCalledWith(MOCK_PRO_MODEL, FALLBACK_MODEL, mockError);
   });
 
-  it('should not call setFallbackMode or log telemetry if already in fallback mode', async () => {
+  it("should not call setFallbackMode or log telemetry if already in fallback mode", async () => {
     // Setup config where fallback mode is already active
     const activeFallbackConfig = createMockConfig({
       fallbackModelHandler: mockHandler,
@@ -268,13 +232,9 @@ describe('handleFallback', () => {
       setFallbackMode: vi.fn(),
     });
 
-    mockHandler.mockResolvedValue('retry_always');
+    mockHandler.mockResolvedValue("retry_always");
 
-    const result = await handleFallback(
-      activeFallbackConfig,
-      MOCK_PRO_MODEL,
-      AUTH_OAUTH,
-    );
+    const result = await handleFallback(activeFallbackConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
     // Should still return true to allow the retry (which will use the active fallback mode)
     expect(result).toBe(true);
@@ -285,76 +245,51 @@ describe('handleFallback', () => {
     expect(logFlashFallback).not.toHaveBeenCalled();
   });
 
-  it('should catch errors from the handler, log an error, and return null', async () => {
-    const handlerError = new Error('UI interaction failed');
+  it("should catch errors from the handler, log an error, and return null", async () => {
+    const handlerError = new Error("UI interaction failed");
     mockHandler.mockRejectedValue(handlerError);
 
     const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
     expect(result).toBeNull();
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Fallback UI handler failed:',
-      handlerError,
-    );
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Fallback UI handler failed:", handlerError);
     expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
   });
 
-  describe('Preview Model Fallback Logic', () => {
+  describe("Preview Model Fallback Logic", () => {
     const previewModel = PREVIEW_GEMINI_MODEL;
 
-    it('should only set Preview Model bypass mode on retryable quota failure', async () => {
+    it("should only set Preview Model bypass mode on retryable quota failure", async () => {
       const mockGoogleApiError = {
         code: 429,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const retryableQuotaError = new RetryableQuotaError(
-        'Capacity error',
-        mockGoogleApiError,
-        5,
-      );
-      await handleFallback(
-        mockConfig,
-        previewModel,
-        AUTH_OAUTH,
-        retryableQuotaError,
-      );
+      const retryableQuotaError = new RetryableQuotaError("Capacity error", mockGoogleApiError, 5);
+      await handleFallback(mockConfig, previewModel, AUTH_OAUTH, retryableQuotaError);
       expect(mockConfig.setPreviewModelBypassMode).toHaveBeenCalledWith(true);
     });
 
-    it('should not set Preview Model bypass mode on non-retryable quota failure', async () => {
+    it("should not set Preview Model bypass mode on non-retryable quota failure", async () => {
       const mockGoogleApiError = {
         code: 429,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const terminalQuotaError = new TerminalQuotaError(
-        'quota error',
-        mockGoogleApiError,
-        5,
-      );
-      await handleFallback(
-        mockConfig,
-        previewModel,
-        AUTH_OAUTH,
-        terminalQuotaError,
-      );
+      const terminalQuotaError = new TerminalQuotaError("quota error", mockGoogleApiError, 5);
+      await handleFallback(mockConfig, previewModel, AUTH_OAUTH, terminalQuotaError);
 
       expect(mockConfig.setPreviewModelBypassMode).not.toHaveBeenCalled();
     });
 
-    it('should silently retry if Preview Model fallback mode is already active and error is retryable error', async () => {
-      vi.spyOn(mockConfig, 'isPreviewModelFallbackMode').mockReturnValue(true);
+    it("should silently retry if Preview Model fallback mode is already active and error is retryable error", async () => {
+      vi.spyOn(mockConfig, "isPreviewModelFallbackMode").mockReturnValue(true);
       const mockGoogleApiError = {
         code: 429,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const retryableQuotaError = new RetryableQuotaError(
-        'Capacity error',
-        mockGoogleApiError,
-        5,
-      );
+      const retryableQuotaError = new RetryableQuotaError("Capacity error", mockGoogleApiError, 5);
       const result = await handleFallback(
         mockConfig,
         previewModel,
@@ -367,17 +302,13 @@ describe('handleFallback', () => {
     });
 
     it('should activate Preview Model fallback mode when handler returns "retry_always" and is RetryableQuotaError', async () => {
-      mockHandler.mockResolvedValue('retry_always');
+      mockHandler.mockResolvedValue("retry_always");
       const mockGoogleApiError = {
         code: 429,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const retryableQuotaError = new RetryableQuotaError(
-        'Capacity error',
-        mockGoogleApiError,
-        5,
-      );
+      const retryableQuotaError = new RetryableQuotaError("Capacity error", mockGoogleApiError, 5);
       const result = await handleFallback(
         mockConfig,
         previewModel,
@@ -391,23 +322,14 @@ describe('handleFallback', () => {
     });
 
     it('should activate regular fallback when handler returns "retry_always" and is TerminalQuotaError', async () => {
-      mockHandler.mockResolvedValue('retry_always');
+      mockHandler.mockResolvedValue("retry_always");
       const mockGoogleApiError = {
         code: 503,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const terminalError = new TerminalQuotaError(
-        'Quota error',
-        mockGoogleApiError,
-        5,
-      );
-      const result = await handleFallback(
-        mockConfig,
-        previewModel,
-        AUTH_OAUTH,
-        terminalError,
-      );
+      const terminalError = new TerminalQuotaError("Quota error", mockGoogleApiError, 5);
+      const result = await handleFallback(mockConfig, previewModel, AUTH_OAUTH, terminalError);
 
       expect(result).toBe(true);
       expect(mockConfig.setPreviewModelFallbackMode).not.toBeCalled();
@@ -417,15 +339,11 @@ describe('handleFallback', () => {
     it('should NOT set fallback mode if user chooses "retry_once"', async () => {
       const mockGoogleApiError = {
         code: 429,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const terminalQuotaError = new TerminalQuotaError(
-        'quota error',
-        mockGoogleApiError,
-        5,
-      );
-      mockHandler.mockResolvedValue('retry_once');
+      const terminalQuotaError = new TerminalQuotaError("quota error", mockGoogleApiError, 5);
+      mockHandler.mockResolvedValue("retry_once");
 
       const result = await handleFallback(
         mockConfig,
@@ -440,21 +358,15 @@ describe('handleFallback', () => {
       expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
     });
 
-    it('should pass DEFAULT_GEMINI_MODEL as fallback when Preview Model fails with Retryable Error', async () => {
-      const mockFallbackHandler = vi.fn().mockResolvedValue('stop');
-      vi.mocked(mockConfig.fallbackModelHandler!).mockImplementation(
-        mockFallbackHandler,
-      );
+    it("should pass DEFAULT_GEMINI_MODEL as fallback when Preview Model fails with Retryable Error", async () => {
+      const mockFallbackHandler = vi.fn().mockResolvedValue("stop");
+      vi.mocked(mockConfig.fallbackModelHandler!).mockImplementation(mockFallbackHandler);
       const mockGoogleApiError = {
         code: 429,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const retryableQuotaError = new RetryableQuotaError(
-        'Capacity error',
-        mockGoogleApiError,
-        5,
-      );
+      const retryableQuotaError = new RetryableQuotaError("Capacity error", mockGoogleApiError, 5);
 
       await handleFallback(
         mockConfig,
@@ -470,12 +382,8 @@ describe('handleFallback', () => {
       );
     });
 
-    it('should pass DEFAULT_GEMINI_MODEL as fallback when Preview Model fails with other error', async () => {
-      await handleFallback(
-        mockConfig,
-        PREVIEW_GEMINI_MODEL,
-        AuthType.LOGIN_WITH_GOOGLE,
-      );
+    it("should pass DEFAULT_GEMINI_MODEL as fallback when Preview Model fails with other error", async () => {
+      await handleFallback(mockConfig, PREVIEW_GEMINI_MODEL, AuthType.LOGIN_WITH_GOOGLE);
 
       expect(mockConfig.fallbackModelHandler).toHaveBeenCalledWith(
         PREVIEW_GEMINI_MODEL,
@@ -484,17 +392,13 @@ describe('handleFallback', () => {
       );
     });
 
-    it('should pass DEFAULT_GEMINI_FLASH_MODEL as fallback when Preview Model fails with other error', async () => {
+    it("should pass DEFAULT_GEMINI_FLASH_MODEL as fallback when Preview Model fails with other error", async () => {
       const mockGoogleApiError = {
         code: 429,
-        message: 'mock error',
+        message: "mock error",
         details: [],
       };
-      const terminalQuotaError = new TerminalQuotaError(
-        'quota error',
-        mockGoogleApiError,
-        5,
-      );
+      const terminalQuotaError = new TerminalQuotaError("quota error", mockGoogleApiError, 5);
       await handleFallback(
         mockConfig,
         PREVIEW_GEMINI_MODEL,
@@ -510,8 +414,8 @@ describe('handleFallback', () => {
     });
   });
 
-  it('should return null if ModelNotFoundError occurs for a non-preview model', async () => {
-    const modelNotFoundError = new ModelNotFoundError('Not found');
+  it("should return null if ModelNotFoundError occurs for a non-preview model", async () => {
+    const modelNotFoundError = new ModelNotFoundError("Not found");
     const result = await handleFallback(
       mockConfig,
       DEFAULT_GEMINI_MODEL, // Not preview model
@@ -522,9 +426,9 @@ describe('handleFallback', () => {
     expect(mockHandler).not.toHaveBeenCalled();
   });
 
-  it('should consult handler if ModelNotFoundError occurs for preview model', async () => {
-    const modelNotFoundError = new ModelNotFoundError('Not found');
-    mockHandler.mockResolvedValue('retry_always');
+  it("should consult handler if ModelNotFoundError occurs for preview model", async () => {
+    const modelNotFoundError = new ModelNotFoundError("Not found");
+    mockHandler.mockResolvedValue("retry_always");
 
     const result = await handleFallback(
       mockConfig,
@@ -537,7 +441,7 @@ describe('handleFallback', () => {
     expect(mockHandler).toHaveBeenCalled();
   });
 
-  describe('policy-driven flow', () => {
+  describe("policy-driven flow", () => {
     let policyConfig: Config;
     let availability: ModelAvailabilityService;
     let policyHandler: Mock<FallbackModelHandler>;
@@ -548,23 +452,16 @@ describe('handleFallback', () => {
         selectedModel: DEFAULT_GEMINI_FLASH_MODEL,
         skipped: [],
       });
-      policyHandler = vi.fn().mockResolvedValue('retry_once');
+      policyHandler = vi.fn().mockResolvedValue("retry_once");
       policyConfig = createMockConfig();
-      vi.spyOn(
-        policyConfig,
-        'isModelAvailabilityServiceEnabled',
-      ).mockReturnValue(true);
-      vi.spyOn(policyConfig, 'getModelAvailabilityService').mockReturnValue(
-        availability,
-      );
-      vi.spyOn(policyConfig, 'getFallbackModelHandler').mockReturnValue(
-        policyHandler,
-      );
+      vi.spyOn(policyConfig, "isModelAvailabilityServiceEnabled").mockReturnValue(true);
+      vi.spyOn(policyConfig, "getModelAvailabilityService").mockReturnValue(availability);
+      vi.spyOn(policyConfig, "getFallbackModelHandler").mockReturnValue(policyHandler);
     });
 
-    it('uses availability selection with correct candidates when enabled', async () => {
-      vi.spyOn(policyConfig, 'getPreviewFeatures').mockReturnValue(true);
-      vi.spyOn(policyConfig, 'getModel').mockReturnValue(DEFAULT_GEMINI_MODEL);
+    it("uses availability selection with correct candidates when enabled", async () => {
+      vi.spyOn(policyConfig, "getPreviewFeatures").mockReturnValue(true);
+      vi.spyOn(policyConfig, "getModel").mockReturnValue(DEFAULT_GEMINI_MODEL);
 
       await handleFallback(policyConfig, DEFAULT_GEMINI_MODEL, AUTH_OAUTH);
 
@@ -574,11 +471,11 @@ describe('handleFallback', () => {
       ]);
     });
 
-    it('falls back to last resort when availability returns null', async () => {
+    it("falls back to last resort when availability returns null", async () => {
       availability.selectFirstAvailable = vi
         .fn()
         .mockReturnValue({ selectedModel: null, skipped: [] });
-      policyHandler.mockResolvedValue('retry_once');
+      policyHandler.mockResolvedValue("retry_once");
 
       await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
@@ -589,20 +486,18 @@ describe('handleFallback', () => {
       );
     });
 
-    it('executes silent policy action without invoking UI handler', async () => {
+    it("executes silent policy action without invoking UI handler", async () => {
       const proPolicy = createDefaultPolicy(MOCK_PRO_MODEL);
       const flashPolicy = createDefaultPolicy(DEFAULT_GEMINI_FLASH_MODEL);
       flashPolicy.actions = {
         ...flashPolicy.actions,
-        terminal: 'silent',
-        unknown: 'silent',
+        terminal: "silent",
+        unknown: "silent",
       };
       flashPolicy.isLastResort = true;
 
       const silentChain = [proPolicy, flashPolicy];
-      const chainSpy = vi
-        .spyOn(policyHelpers, 'resolvePolicyChain')
-        .mockReturnValue(silentChain);
+      const chainSpy = vi.spyOn(policyHelpers, "resolvePolicyChain").mockReturnValue(silentChain);
 
       try {
         availability.selectFirstAvailable = vi.fn().mockReturnValue({
@@ -610,17 +505,11 @@ describe('handleFallback', () => {
           skipped: [],
         });
 
-        const result = await handleFallback(
-          policyConfig,
-          MOCK_PRO_MODEL,
-          AUTH_OAUTH,
-        );
+        const result = await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
         expect(result).toBe(true);
         expect(policyConfig.getFallbackModelHandler).not.toHaveBeenCalled();
-        expect(policyConfig.setActiveModel).toHaveBeenCalledWith(
-          DEFAULT_GEMINI_FLASH_MODEL,
-        );
+        expect(policyConfig.setActiveModel).toHaveBeenCalledWith(DEFAULT_GEMINI_FLASH_MODEL);
         // Silent actions should not trigger the legacy fallback mode (via activateFallbackMode),
         // but setActiveModel might trigger it via legacy sync if it switches to Flash.
         // However, the test requirement is "doesn't emit fallback mode".
@@ -634,21 +523,17 @@ describe('handleFallback', () => {
       }
     });
 
-    it('wraps around to upgrade candidates if the current model was selected mid-chain (e.g. by router)', async () => {
+    it("wraps around to upgrade candidates if the current model was selected mid-chain (e.g. by router)", async () => {
       // Last-resort failure (Flash) in [Preview, Pro, Flash] checks Preview then Pro (all upstream).
-      vi.spyOn(policyConfig, 'getPreviewFeatures').mockReturnValue(true);
+      vi.spyOn(policyConfig, "getPreviewFeatures").mockReturnValue(true);
 
       availability.selectFirstAvailable = vi.fn().mockReturnValue({
         selectedModel: MOCK_PRO_MODEL,
         skipped: [],
       });
-      policyHandler.mockResolvedValue('retry_once');
+      policyHandler.mockResolvedValue("retry_once");
 
-      await handleFallback(
-        policyConfig,
-        DEFAULT_GEMINI_FLASH_MODEL,
-        AUTH_OAUTH,
-      );
+      await handleFallback(policyConfig, DEFAULT_GEMINI_FLASH_MODEL, AUTH_OAUTH);
 
       expect(availability.selectFirstAvailable).toHaveBeenCalledWith([
         PREVIEW_GEMINI_MODEL,
@@ -661,38 +546,28 @@ describe('handleFallback', () => {
       );
     });
 
-    it('logs and returns null when handler resolves to null', async () => {
+    it("logs and returns null when handler resolves to null", async () => {
       policyHandler.mockResolvedValue(null);
-      const debugLoggerErrorSpy = vi.spyOn(debugLogger, 'error');
-      const result = await handleFallback(
-        policyConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const debugLoggerErrorSpy = vi.spyOn(debugLogger, "error");
+      const result = await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBeNull();
       expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-        'Fallback handler failed:',
-        new Error(
-          'Unexpected fallback intent received from fallbackModelHandler: "null"',
-        ),
+        "Fallback handler failed:",
+        new Error('Unexpected fallback intent received from fallbackModelHandler: "null"'),
       );
       debugLoggerErrorSpy.mockRestore();
     });
 
-    it('successfully follows expected availability response for Preview Chain', async () => {
+    it("successfully follows expected availability response for Preview Chain", async () => {
       availability.selectFirstAvailable = vi
         .fn()
         .mockReturnValue({ selectedModel: DEFAULT_GEMINI_MODEL, skipped: [] });
-      policyHandler.mockResolvedValue('retry_once');
-      vi.spyOn(policyConfig, 'getPreviewFeatures').mockReturnValue(true);
-      vi.spyOn(policyConfig, 'getModel').mockReturnValue(PREVIEW_GEMINI_MODEL);
+      policyHandler.mockResolvedValue("retry_once");
+      vi.spyOn(policyConfig, "getPreviewFeatures").mockReturnValue(true);
+      vi.spyOn(policyConfig, "getModel").mockReturnValue(PREVIEW_GEMINI_MODEL);
 
-      const result = await handleFallback(
-        policyConfig,
-        PREVIEW_GEMINI_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(policyConfig, PREVIEW_GEMINI_MODEL, AUTH_OAUTH);
 
       expect(result).toBe(true);
       expect(availability.selectFirstAvailable).toHaveBeenCalledWith([
@@ -706,17 +581,13 @@ describe('handleFallback', () => {
       );
     });
 
-    it('short-circuits when the failed model is the last-resort policy AND candidates are unavailable', async () => {
+    it("short-circuits when the failed model is the last-resort policy AND candidates are unavailable", async () => {
       // Ensure short-circuit when wrapping to an unavailable upstream model.
       availability.selectFirstAvailable = vi
         .fn()
         .mockReturnValue({ selectedModel: null, skipped: [] });
 
-      const result = await handleFallback(
-        policyConfig,
-        DEFAULT_GEMINI_FLASH_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(policyConfig, DEFAULT_GEMINI_FLASH_MODEL, AUTH_OAUTH);
 
       expect(result).toBeNull();
       // Service called to check upstream; no UI handler since nothing selected.
@@ -725,13 +596,9 @@ describe('handleFallback', () => {
     });
 
     it('calls setActiveModel and logs telemetry when handler returns "retry_always"', async () => {
-      policyHandler.mockResolvedValue('retry_always');
+      policyHandler.mockResolvedValue("retry_always");
 
-      const result = await handleFallback(
-        policyConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBe(true);
       expect(policyConfig.setActiveModel).toHaveBeenCalledWith(FALLBACK_MODEL);
@@ -740,13 +607,9 @@ describe('handleFallback', () => {
     });
 
     it('calls setActiveModel when handler returns "stop"', async () => {
-      policyHandler.mockResolvedValue('stop');
+      policyHandler.mockResolvedValue("stop");
 
-      const result = await handleFallback(
-        policyConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBe(false);
       expect(policyConfig.setActiveModel).toHaveBeenCalledWith(FALLBACK_MODEL);
diff --git a/packages/gemini-cli-core/src/fallback/handler.ts b/packages/gemini-cli-core/src/fallback/handler.ts
index 93cab502f..986f1f59c 100644
--- a/packages/gemini-cli-core/src/fallback/handler.ts
+++ b/packages/gemini-cli-core/src/fallback/handler.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { AuthType } from '../core/contentGenerator.js';
+import { classifyFailureKind } from "../availability/errorClassification.js";
+import {
+  buildFallbackPolicyContext,
+  resolvePolicyAction,
+  resolvePolicyChain,
+} from "../availability/policyHelpers.js";
+import type { Config } from "../config/config.js";
 import {
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
-import { logFlashFallback, FlashFallbackEvent } from '../telemetry/index.js';
-import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { ModelNotFoundError } from '../utils/httpErrors.js';
-import { TerminalQuotaError } from '../utils/googleQuotaErrors.js';
-import { coreEvents } from '../utils/events.js';
-import type { FallbackIntent, FallbackRecommendation } from './types.js';
-import { classifyFailureKind } from '../availability/errorClassification.js';
-import {
-  buildFallbackPolicyContext,
-  resolvePolicyChain,
-  resolvePolicyAction,
-} from '../availability/policyHelpers.js';
-
-const UPGRADE_URL_PAGE = 'https://goo.gle/set-up-gemini-code-assist';
+} from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { FlashFallbackEvent, logFlashFallback } from "../telemetry/index.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import { TerminalQuotaError } from "../utils/googleQuotaErrors.js";
+import { ModelNotFoundError } from "../utils/httpErrors.js";
+import { openBrowserSecurely } from "../utils/secure-browser-launcher.js";
+import type { FallbackIntent, FallbackRecommendation } from "./types.js";
+
+const UPGRADE_URL_PAGE = "https://goo.gle/set-up-gemini-code-assist";
 
 export async function handleFallback(
   config: Config,
@@ -52,15 +52,11 @@ async function legacyHandleFallback(
   if (authType !== AuthType.LOGIN_WITH_GOOGLE) return null;
 
   // Guardrail: If it's a ModelNotFoundError but NOT the preview model, do not handle it.
-  if (
-    error instanceof ModelNotFoundError &&
-    failedModel !== PREVIEW_GEMINI_MODEL
-  ) {
+  if (error instanceof ModelNotFoundError && failedModel !== PREVIEW_GEMINI_MODEL) {
     return null;
   }
   const shouldActivatePreviewFallback =
-    failedModel === PREVIEW_GEMINI_MODEL &&
-    !(error instanceof TerminalQuotaError);
+    failedModel === PREVIEW_GEMINI_MODEL && !(error instanceof TerminalQuotaError);
   // Preview Model Specific Logic
   if (shouldActivatePreviewFallback) {
     // Always set bypass mode for the immediate retry, for non-TerminalQuotaErrors.
@@ -80,27 +76,16 @@ async function legacyHandleFallback(
 
   // Consult UI Handler for Intent
   const fallbackModelHandler = config.fallbackModelHandler;
-  if (typeof fallbackModelHandler !== 'function') return null;
+  if (typeof fallbackModelHandler !== "function") return null;
 
   try {
     // Pass the specific failed model to the UI handler.
-    const intent = await fallbackModelHandler(
-      failedModel,
-      fallbackModel,
-      error,
-    );
+    const intent = await fallbackModelHandler(failedModel, fallbackModel, error);
 
     // Process Intent and Update State
-    return await processIntent(
-      config,
-      intent,
-      failedModel,
-      fallbackModel,
-      authType,
-      error,
-    );
+    return await processIntent(config, intent, failedModel, fallbackModel, authType, error);
   } catch (handlerError) {
-    console.error('Fallback UI handler failed:', handlerError);
+    console.error("Fallback UI handler failed:", handlerError);
     return null;
   }
 }
@@ -119,10 +104,7 @@ async function handlePolicyDrivenFallback(
   }
 
   const chain = resolvePolicyChain(config);
-  const { failedPolicy, candidates } = buildFallbackPolicyContext(
-    chain,
-    failedModel,
-  );
+  const { failedPolicy, candidates } = buildFallbackPolicyContext(chain, failedModel);
 
   const failureKind = classifyFailureKind(error);
 
@@ -131,15 +113,11 @@ async function handlePolicyDrivenFallback(
   }
 
   const availability = config.getModelAvailabilityService();
-  const selection = availability.selectFirstAvailable(
-    candidates.map((policy) => policy.model),
-  );
+  const selection = availability.selectFirstAvailable(candidates.map((policy) => policy.model));
 
   const lastResortPolicy = candidates.find((policy) => policy.isLastResort);
   const fallbackModel = selection.selectedModel ?? lastResortPolicy?.model;
-  const selectedPolicy = candidates.find(
-    (policy) => policy.model === fallbackModel,
-  );
+  const selectedPolicy = candidates.find((policy) => policy.model === fallbackModel);
 
   if (!fallbackModel || fallbackModel === failedModel || !selectedPolicy) {
     return null;
@@ -148,15 +126,8 @@ async function handlePolicyDrivenFallback(
   // failureKind is already declared and calculated above
   const action = resolvePolicyAction(failureKind, selectedPolicy);
 
-  if (action === 'silent') {
-    return processIntent(
-      config,
-      'retry_always',
-      failedModel,
-      fallbackModel,
-      authType,
-      error,
-    );
+  if (action === "silent") {
+    return processIntent(config, "retry_always", failedModel, fallbackModel, authType, error);
   }
 
   // This will be used in the future when FallbackRecommendation is passed through UI
@@ -171,7 +142,7 @@ async function handlePolicyDrivenFallback(
   void recommendation;
 
   const handler = config.getFallbackModelHandler();
-  if (typeof handler !== 'function') {
+  if (typeof handler !== "function") {
     return null;
   }
 
@@ -186,7 +157,7 @@ async function handlePolicyDrivenFallback(
       error, // Pass the error so processIntent can handle preview-specific logic
     );
   } catch (handlerError) {
-    debugLogger.error('Fallback handler failed:', handlerError);
+    debugLogger.error("Fallback handler failed:", handlerError);
     return null;
   }
 }
@@ -195,10 +166,7 @@ async function handleUpgrade() {
   try {
     await openBrowserSecurely(UPGRADE_URL_PAGE);
   } catch (error) {
-    debugLogger.warn(
-      'Failed to open browser automatically:',
-      getErrorMessage(error),
-    );
+    debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error));
   }
 }
 
@@ -213,7 +181,7 @@ async function processIntent(
   const isAvailabilityEnabled = config.isModelAvailabilityServiceEnabled();
 
   switch (intent) {
-    case 'retry_always':
+    case "retry_always":
       if (isAvailabilityEnabled) {
         // TODO(telemetry): Implement generic fallback event logging. Existing
         // logFlashFallback is specific to a single Model.
@@ -221,10 +189,7 @@ async function processIntent(
       } else {
         // If the error is non-retryable, e.g. TerminalQuota Error, trigger a regular fallback to flash.
         // For all other errors, activate previewModel fallback.
-        if (
-          failedModel === PREVIEW_GEMINI_MODEL &&
-          !(error instanceof TerminalQuotaError)
-        ) {
+        if (failedModel === PREVIEW_GEMINI_MODEL && !(error instanceof TerminalQuotaError)) {
           activatePreviewModelFallbackMode(config);
         } else {
           activateFallbackMode(config, authType);
@@ -232,13 +197,13 @@ async function processIntent(
       }
       return true;
 
-    case 'retry_once':
+    case "retry_once":
       if (isAvailabilityEnabled) {
         config.setActiveModel(fallbackModel);
       }
       return true;
 
-    case 'stop':
+    case "stop":
       if (isAvailabilityEnabled) {
         // TODO(telemetry): Implement generic fallback event logging. Existing
         // logFlashFallback is specific to a single Model.
@@ -248,17 +213,15 @@ async function processIntent(
       }
       return false;
 
-    case 'retry_later':
+    case "retry_later":
       return false;
 
-    case 'upgrade':
+    case "upgrade":
       await handleUpgrade();
       return false;
 
     default:
-      throw new Error(
-        `Unexpected fallback intent received from fallbackModelHandler: "${intent}"`,
-      );
+      throw new Error(`Unexpected fallback intent received from fallbackModelHandler: "${intent}"`);
   }
 }
 
diff --git a/packages/gemini-cli-core/src/fallback/types.ts b/packages/gemini-cli-core/src/fallback/types.ts
index 223c3abbf..8d5a7d873 100644
--- a/packages/gemini-cli-core/src/fallback/types.ts
+++ b/packages/gemini-cli-core/src/fallback/types.ts
@@ -4,22 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ModelSelectionResult } from '../availability/modelAvailabilityService.js';
-import type {
-  FailureKind,
-  FallbackAction,
-  ModelPolicy,
-} from '../availability/modelPolicy.js';
+import type { ModelSelectionResult } from "../availability/modelAvailabilityService.js";
+import type { FailureKind, FallbackAction, ModelPolicy } from "../availability/modelPolicy.js";
 
 /**
  * Defines the intent returned by the UI layer during a fallback scenario.
  */
 export type FallbackIntent =
-  | 'retry_always' // Retry with fallback model and stick to it for future requests.
-  | 'retry_once' // Retry with fallback model for this request only.
-  | 'stop' // Switch to fallback for future requests, but stop the current request.
-  | 'retry_later' // Stop the current request and do not fallback. Intend to try again later with the same model.
-  | 'upgrade'; // Give user an option to upgrade the tier.
+  | "retry_always" // Retry with fallback model and stick to it for future requests.
+  | "retry_once" // Retry with fallback model for this request only.
+  | "stop" // Switch to fallback for future requests, but stop the current request.
+  | "retry_later" // Stop the current request and do not fallback. Intend to try again later with the same model.
+  | "upgrade"; // Give user an option to upgrade the tier.
 
 export interface FallbackRecommendation extends ModelSelectionResult {
   action: FallbackAction;
diff --git a/packages/gemini-cli-core/src/generated/git-commit.ts b/packages/gemini-cli-core/src/generated/git-commit.ts
index e560202e5..2edbe07a8 100644
--- a/packages/gemini-cli-core/src/generated/git-commit.ts
+++ b/packages/gemini-cli-core/src/generated/git-commit.ts
@@ -7,6 +7,6 @@
  * This file would normally be generated during the build process.
  */
 
-export const GIT_COMMIT_INFO = 'unknown';
+export const GIT_COMMIT_INFO = "unknown";
 
-export const CLI_VERSION = '0.1.0';
+export const CLI_VERSION = "0.1.0";
diff --git a/packages/gemini-cli-core/src/hooks/hookAggregator.test.ts b/packages/gemini-cli-core/src/hooks/hookAggregator.test.ts
index ea675464f..bf5af16d8 100644
--- a/packages/gemini-cli-core/src/hooks/hookAggregator.test.ts
+++ b/packages/gemini-cli-core/src/hooks/hookAggregator.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { HookAggregator } from './hookAggregator.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { HookAggregator } from "./hookAggregator.js";
 import type {
-  HookExecutionResult,
-  BeforeToolSelectionOutput,
   BeforeModelOutput,
+  BeforeToolSelectionOutput,
+  HookExecutionResult,
   HookOutput,
-} from './types.js';
-import { HookType, HookEventName } from './types.js';
+} from "./types.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Helper function to create proper HookExecutionResult objects
 function createHookExecutionResult(
@@ -28,28 +28,25 @@ function createHookExecutionResult(
     error,
     hookConfig: {
       type: HookType.Command,
-      command: 'test-command',
+      command: "test-command",
       timeout: 30000,
     },
     eventName: HookEventName.BeforeTool,
   };
 }
 
-describe('HookAggregator', () => {
+describe("HookAggregator", () => {
   let aggregator: HookAggregator;
 
   beforeEach(() => {
     aggregator = new HookAggregator();
   });
 
-  describe('aggregateResults', () => {
-    it('should handle empty results', () => {
+  describe("aggregateResults", () => {
+    it("should handle empty results", () => {
       const results: HookExecutionResult[] = [];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
       expect(aggregated.allOutputs).toHaveLength(0);
@@ -58,169 +55,145 @@ describe('HookAggregator', () => {
       expect(aggregated.finalOutput).toBeUndefined();
     });
 
-    it('should aggregate successful results', () => {
+    it("should aggregate successful results", () => {
       const results: HookExecutionResult[] = [
-        createHookExecutionResult(
-          { decision: 'allow', reason: 'Hook 1 approved' },
-          true,
-          100,
-        ),
-        createHookExecutionResult(
-          { decision: 'allow', reason: 'Hook 2 approved' },
-          true,
-          150,
-        ),
+        createHookExecutionResult({ decision: "allow", reason: "Hook 1 approved" }, true, 100),
+        createHookExecutionResult({ decision: "allow", reason: "Hook 2 approved" }, true, 150),
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
       expect(aggregated.allOutputs).toHaveLength(2);
       expect(aggregated.errors).toHaveLength(0);
       expect(aggregated.totalDuration).toBe(250);
-      expect(aggregated.finalOutput?.decision).toBe('allow');
-      expect(aggregated.finalOutput?.reason).toBe(
-        'Hook 1 approved\nHook 2 approved',
-      );
+      expect(aggregated.finalOutput?.decision).toBe("allow");
+      expect(aggregated.finalOutput?.reason).toBe("Hook 1 approved\nHook 2 approved");
     });
 
-    it('should handle errors in results', () => {
+    it("should handle errors in results", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: false,
-          error: new Error('Hook failed'),
+          error: new Error("Hook failed"),
           duration: 50,
         },
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'allow' },
+          output: { decision: "allow" },
           duration: 100,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(false);
       expect(aggregated.allOutputs).toHaveLength(1);
       expect(aggregated.errors).toHaveLength(1);
-      expect(aggregated.errors[0].message).toBe('Hook failed');
+      expect(aggregated.errors[0].message).toBe("Hook failed");
       expect(aggregated.totalDuration).toBe(150);
     });
 
-    it('should handle blocking decisions with OR logic', () => {
+    it("should handle blocking decisions with OR logic", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'allow', reason: 'Hook 1 allowed' },
+          output: { decision: "allow", reason: "Hook 1 allowed" },
           duration: 100,
         },
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'block', reason: 'Hook 2 blocked' },
+          output: { decision: "block", reason: "Hook 2 blocked" },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
-      expect(aggregated.finalOutput?.decision).toBe('block');
-      expect(aggregated.finalOutput?.reason).toBe(
-        'Hook 1 allowed\nHook 2 blocked',
-      );
+      expect(aggregated.finalOutput?.decision).toBe("block");
+      expect(aggregated.finalOutput?.reason).toBe("Hook 1 allowed\nHook 2 blocked");
     });
 
-    it('should handle continue=false with precedence', () => {
+    it("should handle continue=false with precedence", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'allow', continue: true },
+          output: { decision: "allow", continue: true },
           duration: 100,
         },
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
           output: {
-            decision: 'allow',
+            decision: "allow",
             continue: false,
-            stopReason: 'Stop requested',
+            stopReason: "Stop requested",
           },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
       expect(aggregated.finalOutput?.continue).toBe(false);
-      expect(aggregated.finalOutput?.stopReason).toBe('Stop requested');
+      expect(aggregated.finalOutput?.stopReason).toBe("Stop requested");
     });
   });
 
-  describe('BeforeToolSelection merge strategy', () => {
-    it('should merge tool configurations with NONE mode precedence', () => {
+  describe("BeforeToolSelection merge strategy", () => {
+    it("should merge tool configurations with NONE mode precedence", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'ANY',
-                allowedFunctionNames: ['tool1', 'tool2'],
+                mode: "ANY",
+                allowedFunctionNames: ["tool1", "tool2"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -229,16 +202,16 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'NONE',
+                mode: "NONE",
                 allowedFunctionNames: [],
               },
             },
@@ -247,34 +220,31 @@ describe('HookAggregator', () => {
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeToolSelection,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeToolSelection);
 
       expect(aggregated.success).toBe(true);
       const output = aggregated.finalOutput as BeforeToolSelectionOutput;
       const toolConfig = output.hookSpecificOutput?.toolConfig;
-      expect(toolConfig?.mode).toBe('NONE');
+      expect(toolConfig?.mode).toBe("NONE");
       expect(toolConfig?.allowedFunctionNames).toEqual([]);
     });
 
-    it('should merge tool configurations with ANY mode', () => {
+    it("should merge tool configurations with ANY mode", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'AUTO',
-                allowedFunctionNames: ['tool1'],
+                mode: "AUTO",
+                allowedFunctionNames: ["tool1"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -283,17 +253,17 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'ANY',
-                allowedFunctionNames: ['tool2', 'tool3'],
+                mode: "ANY",
+                allowedFunctionNames: ["tool2", "tool3"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -301,38 +271,31 @@ describe('HookAggregator', () => {
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeToolSelection,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeToolSelection);
 
       expect(aggregated.success).toBe(true);
       const output = aggregated.finalOutput as BeforeToolSelectionOutput;
       const toolConfig = output.hookSpecificOutput?.toolConfig;
-      expect(toolConfig?.mode).toBe('ANY');
-      expect(toolConfig?.allowedFunctionNames).toEqual([
-        'tool1',
-        'tool2',
-        'tool3',
-      ]);
+      expect(toolConfig?.mode).toBe("ANY");
+      expect(toolConfig?.allowedFunctionNames).toEqual(["tool1", "tool2", "tool3"]);
     });
 
-    it('should merge tool configurations with AUTO mode when all are AUTO', () => {
+    it("should merge tool configurations with AUTO mode when all are AUTO", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'AUTO',
-                allowedFunctionNames: ['tool1'],
+                mode: "AUTO",
+                allowedFunctionNames: ["tool1"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -341,17 +304,17 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'AUTO',
-                allowedFunctionNames: ['tool2'],
+                mode: "AUTO",
+                allowedFunctionNames: ["tool2"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -359,35 +322,32 @@ describe('HookAggregator', () => {
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeToolSelection,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeToolSelection);
 
       expect(aggregated.success).toBe(true);
       const output = aggregated.finalOutput as BeforeToolSelectionOutput;
       const toolConfig = output.hookSpecificOutput?.toolConfig;
-      expect(toolConfig?.mode).toBe('AUTO');
-      expect(toolConfig?.allowedFunctionNames).toEqual(['tool1', 'tool2']);
+      expect(toolConfig?.mode).toBe("AUTO");
+      expect(toolConfig?.allowedFunctionNames).toEqual(["tool1", "tool2"]);
     });
   });
 
-  describe('BeforeModel/AfterModel merge strategy', () => {
-    it('should use field replacement strategy', () => {
+  describe("BeforeModel/AfterModel merge strategy", () => {
+    it("should use field replacement strategy", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeModel,
           success: true,
           output: {
-            decision: 'allow',
+            decision: "allow",
             hookSpecificOutput: {
-              hookEventName: 'BeforeModel',
-              llm_request: { model: 'model1', config: {}, contents: [] },
+              hookEventName: "BeforeModel",
+              llm_request: { model: "model1", config: {}, contents: [] },
             },
           },
           duration: 100,
@@ -395,50 +355,47 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeModel,
           success: true,
           output: {
-            decision: 'block',
+            decision: "block",
             hookSpecificOutput: {
-              hookEventName: 'BeforeModel',
-              llm_request: { model: 'model2', config: {}, contents: [] },
+              hookEventName: "BeforeModel",
+              llm_request: { model: "model2", config: {}, contents: [] },
             },
           },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeModel,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeModel);
 
       expect(aggregated.success).toBe(true);
-      expect(aggregated.finalOutput?.decision).toBe('block'); // Later value wins
+      expect(aggregated.finalOutput?.decision).toBe("block"); // Later value wins
       const output = aggregated.finalOutput as BeforeModelOutput;
       const llmRequest = output.hookSpecificOutput?.llm_request;
-      expect(llmRequest?.['model']).toBe('model2'); // Later value wins
+      expect(llmRequest?.["model"]).toBe("model2"); // Later value wins
     });
   });
 
-  describe('extractAdditionalContext', () => {
-    it('should extract additional context from hook outputs', () => {
+  describe("extractAdditionalContext", () => {
+    it("should extract additional context from hook outputs", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.AfterTool,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'AfterTool',
-              additionalContext: 'Context from hook 1',
+              hookEventName: "AfterTool",
+              additionalContext: "Context from hook 1",
             },
           },
           duration: 100,
@@ -446,30 +403,27 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.AfterTool,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'AfterTool',
-              additionalContext: 'Context from hook 2',
+              hookEventName: "AfterTool",
+              additionalContext: "Context from hook 2",
             },
           },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.AfterTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.AfterTool);
 
       expect(aggregated.success).toBe(true);
-      expect(
-        aggregated.finalOutput?.hookSpecificOutput?.['additionalContext'],
-      ).toBe('Context from hook 1\nContext from hook 2');
+      expect(aggregated.finalOutput?.hookSpecificOutput?.["additionalContext"]).toBe(
+        "Context from hook 1\nContext from hook 2",
+      );
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/hooks/hookAggregator.ts b/packages/gemini-cli-core/src/hooks/hookAggregator.ts
index 16176d7cf..25019bd04 100644
--- a/packages/gemini-cli-core/src/hooks/hookAggregator.ts
+++ b/packages/gemini-cli-core/src/hooks/hookAggregator.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { FunctionCallingConfigMode } from '@google/genai';
-import type {
-  HookOutput,
-  HookExecutionResult,
-  BeforeToolSelectionOutput,
-} from './types.js';
+import { FunctionCallingConfigMode } from "@google/genai";
+import type { BeforeToolSelectionOutput, HookExecutionResult, HookOutput } from "./types.js";
 import {
-  DefaultHookOutput,
-  BeforeToolHookOutput,
+  AfterModelHookOutput,
   BeforeModelHookOutput,
+  BeforeToolHookOutput,
   BeforeToolSelectionHookOutput,
-  AfterModelHookOutput,
-} from './types.js';
-import { HookEventName } from './types.js';
+  DefaultHookOutput,
+  HookEventName,
+} from "./types.js";
 
 /**
  * Aggregated hook result
@@ -37,10 +33,7 @@ export class HookAggregator {
   /**
    * Aggregate results from multiple hook executions
    */
-  aggregateResults(
-    results: HookExecutionResult[],
-    eventName: HookEventName,
-  ): AggregatedHookResult {
+  aggregateResults(results: HookExecutionResult[], eventName: HookEventName): AggregatedHookResult {
     const allOutputs: HookOutput[] = [];
     const errors: Error[] = [];
     let totalDuration = 0;
@@ -79,10 +72,7 @@ export class HookAggregator {
    * Note: We always use the merge logic even for single hooks to ensure
    * consistent default behaviors (e.g., default decision='allow' for OR logic)
    */
-  private mergeOutputs(
-    outputs: HookOutput[],
-    eventName: HookEventName,
-  ): HookOutput | undefined {
+  private mergeOutputs(outputs: HookOutput[], eventName: HookEventName): HookOutput | undefined {
     if (outputs.length === 0) {
       return undefined;
     }
@@ -100,9 +90,7 @@ export class HookAggregator {
         return this.mergeWithFieldReplacement(outputs);
 
       case HookEventName.BeforeToolSelection:
-        return this.mergeToolSelectionOutputs(
-          outputs as BeforeToolSelectionOutput[],
-        );
+        return this.mergeToolSelectionOutputs(outputs as BeforeToolSelectionOutput[]);
 
       default:
         // For other events, use simple merge
@@ -164,27 +152,27 @@ export class HookAggregator {
 
     // Set final decision if no blocking decision was found
     if (!hasBlockDecision && !hasContinueFalse) {
-      merged.decision = 'allow';
+      merged.decision = "allow";
     }
 
     // Merge messages
     if (messages.length > 0) {
-      merged.stopReason = messages.join('\n');
+      merged.stopReason = messages.join("\n");
     }
 
     if (reasons.length > 0) {
-      merged.reason = reasons.join('\n');
+      merged.reason = reasons.join("\n");
     }
 
     if (systemMessages.length > 0) {
-      merged.systemMessage = systemMessages.join('\n');
+      merged.systemMessage = systemMessages.join("\n");
     }
 
     // Add merged additional context
     if (additionalContexts.length > 0) {
       merged.hookSpecificOutput = {
         ...(merged.hookSpecificOutput || {}),
-        additionalContext: additionalContexts.join('\n'),
+        additionalContext: additionalContexts.join("\n"),
       };
     }
 
@@ -241,9 +229,9 @@ export class HookAggregator {
       }
 
       // Check mode (using simplified HookToolConfig format)
-      if (toolConfig.mode === 'NONE') {
+      if (toolConfig.mode === "NONE") {
         hasNoneMode = true;
-      } else if (toolConfig.mode === 'ANY') {
+      } else if (toolConfig.mode === "ANY") {
         hasAnyMode = true;
       }
 
@@ -276,7 +264,7 @@ export class HookAggregator {
     }
 
     merged.hookSpecificOutput = {
-      hookEventName: 'BeforeToolSelection',
+      hookEventName: "BeforeToolSelection",
       toolConfig: {
         mode: finalMode,
         allowedFunctionNames: finalFunctionNames,
@@ -323,21 +311,15 @@ export class HookAggregator {
   /**
    * Extract additional context from hook-specific outputs
    */
-  private extractAdditionalContext(
-    output: HookOutput,
-    contexts: string[],
-  ): void {
+  private extractAdditionalContext(output: HookOutput, contexts: string[]): void {
     const specific = output.hookSpecificOutput;
     if (!specific) {
       return;
     }
 
     // Extract additionalContext from various hook types
-    if (
-      'additionalContext' in specific &&
-      typeof specific['additionalContext'] === 'string'
-    ) {
-      contexts.push(specific['additionalContext']);
+    if ("additionalContext" in specific && typeof specific["additionalContext"] === "string") {
+      contexts.push(specific["additionalContext"]);
     }
   }
 }
diff --git a/packages/gemini-cli-core/src/hooks/hookEventHandler.test.ts b/packages/gemini-cli-core/src/hooks/hookEventHandler.test.ts
index 107ad132a..4b1c69486 100644
--- a/packages/gemini-cli-core/src/hooks/hookEventHandler.test.ts
+++ b/packages/gemini-cli-core/src/hooks/hookEventHandler.test.ts
@@ -4,20 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { HookEventHandler } from './hookEventHandler.js';
-import type { Config } from '../config/config.js';
-import type { HookConfig } from './types.js';
-import type { Logger } from '@opentelemetry/api-logs';
-import type { HookPlanner } from './hookPlanner.js';
-import type { HookRunner } from './hookRunner.js';
-import type { HookAggregator } from './hookAggregator.js';
-import { HookEventName, HookType } from './types.js';
+import type { Logger } from "@opentelemetry/api-logs";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { HookAggregator } from "./hookAggregator.js";
+import { HookEventHandler } from "./hookEventHandler.js";
+import type { HookPlanner } from "./hookPlanner.js";
+import type { HookRunner } from "./hookRunner.js";
+import type { HookConfig } from "./types.js";
 import {
+  HookEventName,
+  type HookExecutionResult,
+  HookType,
   NotificationType,
   SessionStartSource,
-  type HookExecutionResult,
-} from './types.js';
+} from "./types.js";
 
 // Mock debugLogger
 const mockDebugLogger = vi.hoisted(() => ({
@@ -27,11 +28,11 @@ const mockDebugLogger = vi.hoisted(() => ({
   debug: vi.fn(),
 }));
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: mockDebugLogger,
 }));
 
-describe('HookEventHandler', () => {
+describe("HookEventHandler", () => {
   let hookEventHandler: HookEventHandler;
   let mockConfig: Config;
   let mockLogger: Logger;
@@ -43,13 +44,13 @@ describe('HookEventHandler', () => {
     vi.resetAllMocks();
 
     mockConfig = {
-      getSessionId: vi.fn().mockReturnValue('test-session'),
-      getWorkingDir: vi.fn().mockReturnValue('/test/project'),
+      getSessionId: vi.fn().mockReturnValue("test-session"),
+      getWorkingDir: vi.fn().mockReturnValue("/test/project"),
       getGeminiClient: vi.fn().mockReturnValue({
         getChatRecordingService: vi.fn().mockReturnValue({
           getConversationFilePath: vi
             .fn()
-            .mockReturnValue('/test/project/.gemini/tmp/chats/session.json'),
+            .mockReturnValue("/test/project/.gemini/tmp/chats/session.json"),
         }),
       }),
     } as unknown as Config;
@@ -78,13 +79,13 @@ describe('HookEventHandler', () => {
     );
   });
 
-  describe('fireBeforeToolEvent', () => {
-    it('should fire BeforeTool event with correct input', async () => {
+  describe("fireBeforeToolEvent", () => {
+    it("should fire BeforeTool event with correct input", async () => {
       const mockPlan = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: './test.sh',
+            command: "./test.sh",
           } as unknown as HookConfig,
           eventName: HookEventName.BeforeTool,
         },
@@ -95,7 +96,7 @@ describe('HookEventHandler', () => {
           duration: 100,
           hookConfig: {
             type: HookType.Command,
-            command: './test.sh',
+            command: "./test.sh",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
@@ -113,41 +114,36 @@ describe('HookEventHandler', () => {
         hookConfigs: mockPlan.map((p) => p.hookConfig),
         sequential: false,
       });
-      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(
-        mockResults,
-      );
-      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(
-        mockAggregated,
-      );
+      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(mockResults);
+      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(mockAggregated);
 
-      const result = await hookEventHandler.fireBeforeToolEvent('EditTool', {
-        file: 'test.txt',
+      const result = await hookEventHandler.fireBeforeToolEvent("EditTool", {
+        file: "test.txt",
       });
 
-      expect(mockHookPlanner.createExecutionPlan).toHaveBeenCalledWith(
-        HookEventName.BeforeTool,
-        { toolName: 'EditTool' },
-      );
+      expect(mockHookPlanner.createExecutionPlan).toHaveBeenCalledWith(HookEventName.BeforeTool, {
+        toolName: "EditTool",
+      });
 
       expect(mockHookRunner.executeHooksParallel).toHaveBeenCalledWith(
         [mockPlan[0].hookConfig],
         HookEventName.BeforeTool,
         expect.objectContaining({
-          session_id: 'test-session',
-          cwd: '/test/project',
-          hook_event_name: 'BeforeTool',
-          tool_name: 'EditTool',
-          tool_input: { file: 'test.txt' },
+          session_id: "test-session",
+          cwd: "/test/project",
+          hook_event_name: "BeforeTool",
+          tool_name: "EditTool",
+          tool_input: { file: "test.txt" },
         }),
       );
 
       expect(result).toBe(mockAggregated);
     });
 
-    it('should return empty result when no hooks to execute', async () => {
+    it("should return empty result when no hooks to execute", async () => {
       vi.mocked(mockHookPlanner.createExecutionPlan).mockReturnValue(null);
 
-      const result = await hookEventHandler.fireBeforeToolEvent('EditTool', {});
+      const result = await hookEventHandler.fireBeforeToolEvent("EditTool", {});
 
       expect(result.success).toBe(true);
       expect(result.allOutputs).toHaveLength(0);
@@ -155,27 +151,27 @@ describe('HookEventHandler', () => {
       expect(result.totalDuration).toBe(0);
     });
 
-    it('should handle execution errors gracefully', async () => {
+    it("should handle execution errors gracefully", async () => {
       vi.mocked(mockHookPlanner.createExecutionPlan).mockImplementation(() => {
-        throw new Error('Planning failed');
+        throw new Error("Planning failed");
       });
 
-      const result = await hookEventHandler.fireBeforeToolEvent('EditTool', {});
+      const result = await hookEventHandler.fireBeforeToolEvent("EditTool", {});
 
       expect(result.success).toBe(false);
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].message).toBe('Planning failed');
+      expect(result.errors[0].message).toBe("Planning failed");
       expect(mockDebugLogger.error).toHaveBeenCalled();
     });
   });
 
-  describe('fireAfterToolEvent', () => {
-    it('should fire AfterTool event with tool response', async () => {
+  describe("fireAfterToolEvent", () => {
+    it("should fire AfterTool event with tool response", async () => {
       const mockPlan = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: './after.sh',
+            command: "./after.sh",
           } as unknown as HookConfig,
           eventName: HookEventName.AfterTool,
         },
@@ -186,7 +182,7 @@ describe('HookEventHandler', () => {
           duration: 100,
           hookConfig: {
             type: HookType.Command,
-            command: './test.sh',
+            command: "./test.sh",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
@@ -204,27 +200,19 @@ describe('HookEventHandler', () => {
         hookConfigs: mockPlan.map((p) => p.hookConfig),
         sequential: false,
       });
-      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(
-        mockResults,
-      );
-      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(
-        mockAggregated,
-      );
+      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(mockResults);
+      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(mockAggregated);
 
-      const toolInput = { file: 'test.txt' };
-      const toolResponse = { success: true, content: 'File edited' };
+      const toolInput = { file: "test.txt" };
+      const toolResponse = { success: true, content: "File edited" };
 
-      const result = await hookEventHandler.fireAfterToolEvent(
-        'EditTool',
-        toolInput,
-        toolResponse,
-      );
+      const result = await hookEventHandler.fireAfterToolEvent("EditTool", toolInput, toolResponse);
 
       expect(mockHookRunner.executeHooksParallel).toHaveBeenCalledWith(
         [mockPlan[0].hookConfig],
         HookEventName.AfterTool,
         expect.objectContaining({
-          tool_name: 'EditTool',
+          tool_name: "EditTool",
           tool_input: toolInput,
           tool_response: toolResponse,
         }),
@@ -234,13 +222,13 @@ describe('HookEventHandler', () => {
     });
   });
 
-  describe('fireBeforeAgentEvent', () => {
-    it('should fire BeforeAgent event with prompt', async () => {
+  describe("fireBeforeAgentEvent", () => {
+    it("should fire BeforeAgent event with prompt", async () => {
       const mockPlan = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: './before_agent.sh',
+            command: "./before_agent.sh",
           } as unknown as HookConfig,
           eventName: HookEventName.BeforeAgent,
         },
@@ -251,7 +239,7 @@ describe('HookEventHandler', () => {
           duration: 100,
           hookConfig: {
             type: HookType.Command,
-            command: './test.sh',
+            command: "./test.sh",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
@@ -269,14 +257,10 @@ describe('HookEventHandler', () => {
         hookConfigs: mockPlan.map((p) => p.hookConfig),
         sequential: false,
       });
-      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(
-        mockResults,
-      );
-      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(
-        mockAggregated,
-      );
+      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(mockResults);
+      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(mockAggregated);
 
-      const prompt = 'Please help me with this task';
+      const prompt = "Please help me with this task";
 
       const result = await hookEventHandler.fireBeforeAgentEvent(prompt);
 
@@ -292,13 +276,13 @@ describe('HookEventHandler', () => {
     });
   });
 
-  describe('fireNotificationEvent', () => {
-    it('should fire Notification event', async () => {
+  describe("fireNotificationEvent", () => {
+    it("should fire Notification event", async () => {
       const mockPlan = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: './notification-hook.sh',
+            command: "./notification-hook.sh",
           } as HookConfig,
           eventName: HookEventName.Notification,
         },
@@ -309,7 +293,7 @@ describe('HookEventHandler', () => {
           duration: 50,
           hookConfig: {
             type: HookType.Command,
-            command: './notification-hook.sh',
+            command: "./notification-hook.sh",
             timeout: 30000,
           },
           eventName: HookEventName.Notification,
@@ -327,27 +311,23 @@ describe('HookEventHandler', () => {
         hookConfigs: mockPlan.map((p) => p.hookConfig),
         sequential: false,
       });
-      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(
-        mockResults,
-      );
-      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(
-        mockAggregated,
-      );
+      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(mockResults);
+      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(mockAggregated);
 
-      const message = 'Tool execution requires permission';
+      const message = "Tool execution requires permission";
 
       const result = await hookEventHandler.fireNotificationEvent(
         NotificationType.ToolPermission,
         message,
-        { type: 'ToolPermission', title: 'Test Permission' },
+        { type: "ToolPermission", title: "Test Permission" },
       );
 
       expect(mockHookRunner.executeHooksParallel).toHaveBeenCalledWith(
         [mockPlan[0].hookConfig],
         HookEventName.Notification,
         expect.objectContaining({
-          notification_type: 'ToolPermission',
-          details: { type: 'ToolPermission', title: 'Test Permission' },
+          notification_type: "ToolPermission",
+          details: { type: "ToolPermission", title: "Test Permission" },
         }),
       );
 
@@ -355,13 +335,13 @@ describe('HookEventHandler', () => {
     });
   });
 
-  describe('fireSessionStartEvent', () => {
-    it('should fire SessionStart event with source', async () => {
+  describe("fireSessionStartEvent", () => {
+    it("should fire SessionStart event with source", async () => {
       const mockPlan = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: './session_start.sh',
+            command: "./session_start.sh",
           } as unknown as HookConfig,
           eventName: HookEventName.SessionStart,
         },
@@ -372,7 +352,7 @@ describe('HookEventHandler', () => {
           duration: 200,
           hookConfig: {
             type: HookType.Command,
-            command: './session_start.sh',
+            command: "./session_start.sh",
             timeout: 30000,
           },
           eventName: HookEventName.SessionStart,
@@ -390,27 +370,20 @@ describe('HookEventHandler', () => {
         hookConfigs: mockPlan.map((p) => p.hookConfig),
         sequential: false,
       });
-      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(
-        mockResults,
-      );
-      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(
-        mockAggregated,
-      );
+      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(mockResults);
+      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(mockAggregated);
 
-      const result = await hookEventHandler.fireSessionStartEvent(
-        SessionStartSource.Startup,
-      );
+      const result = await hookEventHandler.fireSessionStartEvent(SessionStartSource.Startup);
 
-      expect(mockHookPlanner.createExecutionPlan).toHaveBeenCalledWith(
-        HookEventName.SessionStart,
-        { trigger: 'startup' },
-      );
+      expect(mockHookPlanner.createExecutionPlan).toHaveBeenCalledWith(HookEventName.SessionStart, {
+        trigger: "startup",
+      });
 
       expect(mockHookRunner.executeHooksParallel).toHaveBeenCalledWith(
         [mockPlan[0].hookConfig],
         HookEventName.SessionStart,
         expect.objectContaining({
-          source: 'startup',
+          source: "startup",
         }),
       );
 
@@ -418,13 +391,13 @@ describe('HookEventHandler', () => {
     });
   });
 
-  describe('fireBeforeModelEvent', () => {
-    it('should fire BeforeModel event with LLM request', async () => {
+  describe("fireBeforeModelEvent", () => {
+    it("should fire BeforeModel event with LLM request", async () => {
       const mockPlan = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: './model-hook.sh',
+            command: "./model-hook.sh",
           } as HookConfig,
           eventName: HookEventName.BeforeModel,
         },
@@ -435,7 +408,7 @@ describe('HookEventHandler', () => {
           duration: 150,
           hookConfig: {
             type: HookType.Command,
-            command: './model-hook.sh',
+            command: "./model-hook.sh",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeModel,
@@ -453,17 +426,13 @@ describe('HookEventHandler', () => {
         hookConfigs: mockPlan.map((p) => p.hookConfig),
         sequential: false,
       });
-      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(
-        mockResults,
-      );
-      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(
-        mockAggregated,
-      );
+      vi.mocked(mockHookRunner.executeHooksParallel).mockResolvedValue(mockResults);
+      vi.mocked(mockHookAggregator.aggregateResults).mockReturnValue(mockAggregated);
 
       const llmRequest = {
-        model: 'gemini-pro',
+        model: "gemini-pro",
         config: { temperature: 0.7 },
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        contents: [{ role: "user", parts: [{ text: "Hello" }] }],
       };
 
       const result = await hookEventHandler.fireBeforeModelEvent(llmRequest);
@@ -473,11 +442,11 @@ describe('HookEventHandler', () => {
         HookEventName.BeforeModel,
         expect.objectContaining({
           llm_request: expect.objectContaining({
-            model: 'gemini-pro',
+            model: "gemini-pro",
             messages: expect.arrayContaining([
               expect.objectContaining({
-                role: 'user',
-                content: 'Hello',
+                role: "user",
+                content: "Hello",
               }),
             ]),
           }),
@@ -488,13 +457,13 @@ describe('HookEventHandler', () => {
     });
   });
 
-  describe('createBaseInput', () => {
-    it('should create base input with correct fields', async () => {
+  describe("createBaseInput", () => {
+    it("should create base input with correct fields", async () => {
       const mockPlan = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: './test.sh',
+            command: "./test.sh",
           } as unknown as HookConfig,
           eventName: HookEventName.BeforeTool,
         },
@@ -513,16 +482,16 @@ describe('HookEventHandler', () => {
         totalDuration: 0,
       });
 
-      await hookEventHandler.fireBeforeToolEvent('TestTool', {});
+      await hookEventHandler.fireBeforeToolEvent("TestTool", {});
 
       expect(mockHookRunner.executeHooksParallel).toHaveBeenCalledWith(
         expect.any(Array),
         HookEventName.BeforeTool,
         expect.objectContaining({
-          session_id: 'test-session',
-          transcript_path: '/test/project/.gemini/tmp/chats/session.json',
-          cwd: '/test/project',
-          hook_event_name: 'BeforeTool',
+          session_id: "test-session",
+          transcript_path: "/test/project/.gemini/tmp/chats/session.json",
+          cwd: "/test/project",
+          hook_event_name: "BeforeTool",
           timestamp: expect.any(String),
         }),
       );
diff --git a/packages/gemini-cli-core/src/hooks/hookEventHandler.ts b/packages/gemini-cli-core/src/hooks/hookEventHandler.ts
index e0b2eb0cb..fa585274a 100644
--- a/packages/gemini-cli-core/src/hooks/hookEventHandler.ts
+++ b/packages/gemini-cli-core/src/hooks/hookEventHandler.ts
@@ -4,50 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Logger } from '@opentelemetry/api-logs';
-import type { Config } from '../config/config.js';
-import type { HookPlanner, HookEventContext } from './hookPlanner.js';
-import type { HookRunner } from './hookRunner.js';
-import type { HookAggregator, AggregatedHookResult } from './hookAggregator.js';
-import { HookEventName } from './types.js';
+import type { GenerateContentParameters, GenerateContentResponse } from "@google/genai";
+import type { Logger } from "@opentelemetry/api-logs";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { type HookExecutionRequest, MessageBusType } from "../confirmation-bus/types.js";
+import { logHookCall } from "../telemetry/loggers.js";
+import { HookCallEvent } from "../telemetry/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { AggregatedHookResult, HookAggregator } from "./hookAggregator.js";
+import type { HookEventContext, HookPlanner } from "./hookPlanner.js";
+import type { HookRunner } from "./hookRunner.js";
+import { defaultHookTranslator } from "./hookTranslator.js";
 import type {
-  HookInput,
-  BeforeToolInput,
+  AfterAgentInput,
+  AfterModelInput,
   AfterToolInput,
   BeforeAgentInput,
-  NotificationInput,
-  AfterAgentInput,
-  SessionStartInput,
-  SessionEndInput,
-  PreCompressInput,
   BeforeModelInput,
-  AfterModelInput,
+  BeforeToolInput,
   BeforeToolSelectionInput,
+  HookExecutionResult,
+  HookInput,
+  NotificationInput,
   NotificationType,
-  SessionStartSource,
-  SessionEndReason,
+  PreCompressInput,
   PreCompressTrigger,
-  HookExecutionResult,
-} from './types.js';
-import { defaultHookTranslator } from './hookTranslator.js';
-import type {
-  GenerateContentParameters,
-  GenerateContentResponse,
-} from '@google/genai';
-import { logHookCall } from '../telemetry/loggers.js';
-import { HookCallEvent } from '../telemetry/types.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import {
-  MessageBusType,
-  type HookExecutionRequest,
-} from '../confirmation-bus/types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+  SessionEndInput,
+  SessionEndReason,
+  SessionStartInput,
+  SessionStartSource,
+} from "./types.js";
+import { HookEventName } from "./types.js";
 
 /**
  * Validates that a value is a non-null object
  */
 function isObject(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null;
+  return typeof value === "object" && value !== null;
 }
 
 /**
@@ -57,17 +51,13 @@ function validateBeforeToolInput(input: Record<string, unknown>): {
   toolName: string;
   toolInput: Record<string, unknown>;
 } {
-  const toolName = input['tool_name'];
-  const toolInput = input['tool_input'];
-  if (typeof toolName !== 'string') {
-    throw new Error(
-      'Invalid input for BeforeTool hook event: tool_name must be a string',
-    );
+  const toolName = input["tool_name"];
+  const toolInput = input["tool_input"];
+  if (typeof toolName !== "string") {
+    throw new Error("Invalid input for BeforeTool hook event: tool_name must be a string");
   }
   if (!isObject(toolInput)) {
-    throw new Error(
-      'Invalid input for BeforeTool hook event: tool_input must be an object',
-    );
+    throw new Error("Invalid input for BeforeTool hook event: tool_input must be an object");
   }
   return { toolName, toolInput };
 }
@@ -80,23 +70,17 @@ function validateAfterToolInput(input: Record<string, unknown>): {
   toolInput: Record<string, unknown>;
   toolResponse: Record<string, unknown>;
 } {
-  const toolName = input['tool_name'];
-  const toolInput = input['tool_input'];
-  const toolResponse = input['tool_response'];
-  if (typeof toolName !== 'string') {
-    throw new Error(
-      'Invalid input for AfterTool hook event: tool_name must be a string',
-    );
+  const toolName = input["tool_name"];
+  const toolInput = input["tool_input"];
+  const toolResponse = input["tool_response"];
+  if (typeof toolName !== "string") {
+    throw new Error("Invalid input for AfterTool hook event: tool_name must be a string");
   }
   if (!isObject(toolInput)) {
-    throw new Error(
-      'Invalid input for AfterTool hook event: tool_input must be an object',
-    );
+    throw new Error("Invalid input for AfterTool hook event: tool_input must be an object");
   }
   if (!isObject(toolResponse)) {
-    throw new Error(
-      'Invalid input for AfterTool hook event: tool_response must be an object',
-    );
+    throw new Error("Invalid input for AfterTool hook event: tool_response must be an object");
   }
   return { toolName, toolInput, toolResponse };
 }
@@ -107,11 +91,9 @@ function validateAfterToolInput(input: Record<string, unknown>): {
 function validateBeforeAgentInput(input: Record<string, unknown>): {
   prompt: string;
 } {
-  const prompt = input['prompt'];
-  if (typeof prompt !== 'string') {
-    throw new Error(
-      'Invalid input for BeforeAgent hook event: prompt must be a string',
-    );
+  const prompt = input["prompt"];
+  if (typeof prompt !== "string") {
+    throw new Error("Invalid input for BeforeAgent hook event: prompt must be a string");
   }
   return { prompt };
 }
@@ -124,25 +106,20 @@ function validateAfterAgentInput(input: Record<string, unknown>): {
   promptResponse: string;
   stopHookActive: boolean;
 } {
-  const prompt = input['prompt'];
-  const promptResponse = input['prompt_response'];
-  const stopHookActive = input['stop_hook_active'];
-  if (typeof prompt !== 'string') {
-    throw new Error(
-      'Invalid input for AfterAgent hook event: prompt must be a string',
-    );
+  const prompt = input["prompt"];
+  const promptResponse = input["prompt_response"];
+  const stopHookActive = input["stop_hook_active"];
+  if (typeof prompt !== "string") {
+    throw new Error("Invalid input for AfterAgent hook event: prompt must be a string");
   }
-  if (typeof promptResponse !== 'string') {
-    throw new Error(
-      'Invalid input for AfterAgent hook event: prompt_response must be a string',
-    );
+  if (typeof promptResponse !== "string") {
+    throw new Error("Invalid input for AfterAgent hook event: prompt_response must be a string");
   }
   // stopHookActive defaults to false if not a boolean
   return {
     prompt,
     promptResponse,
-    stopHookActive:
-      typeof stopHookActive === 'boolean' ? stopHookActive : false,
+    stopHookActive: typeof stopHookActive === "boolean" ? stopHookActive : false,
   };
 }
 
@@ -153,11 +130,9 @@ function validateModelInput(
   input: Record<string, unknown>,
   eventName: string,
 ): { llmRequest: GenerateContentParameters } {
-  const llmRequest = input['llm_request'];
+  const llmRequest = input["llm_request"];
   if (!isObject(llmRequest)) {
-    throw new Error(
-      `Invalid input for ${eventName} hook event: llm_request must be an object`,
-    );
+    throw new Error(`Invalid input for ${eventName} hook event: llm_request must be an object`);
   }
   return { llmRequest: llmRequest as unknown as GenerateContentParameters };
 }
@@ -169,17 +144,13 @@ function validateAfterModelInput(input: Record<string, unknown>): {
   llmRequest: GenerateContentParameters;
   llmResponse: GenerateContentResponse;
 } {
-  const llmRequest = input['llm_request'];
-  const llmResponse = input['llm_response'];
+  const llmRequest = input["llm_request"];
+  const llmResponse = input["llm_response"];
   if (!isObject(llmRequest)) {
-    throw new Error(
-      'Invalid input for AfterModel hook event: llm_request must be an object',
-    );
+    throw new Error("Invalid input for AfterModel hook event: llm_request must be an object");
   }
   if (!isObject(llmResponse)) {
-    throw new Error(
-      'Invalid input for AfterModel hook event: llm_response must be an object',
-    );
+    throw new Error("Invalid input for AfterModel hook event: llm_response must be an object");
   }
   return {
     llmRequest: llmRequest as unknown as GenerateContentParameters,
@@ -195,23 +166,19 @@ function validateNotificationInput(input: Record<string, unknown>): {
   message: string;
   details: Record<string, unknown>;
 } {
-  const notificationType = input['notification_type'];
-  const message = input['message'];
-  const details = input['details'];
-  if (typeof notificationType !== 'string') {
+  const notificationType = input["notification_type"];
+  const message = input["message"];
+  const details = input["details"];
+  if (typeof notificationType !== "string") {
     throw new Error(
-      'Invalid input for Notification hook event: notification_type must be a string',
+      "Invalid input for Notification hook event: notification_type must be a string",
     );
   }
-  if (typeof message !== 'string') {
-    throw new Error(
-      'Invalid input for Notification hook event: message must be a string',
-    );
+  if (typeof message !== "string") {
+    throw new Error("Invalid input for Notification hook event: message must be a string");
   }
   if (!isObject(details)) {
-    throw new Error(
-      'Invalid input for Notification hook event: details must be an object',
-    );
+    throw new Error("Invalid input for Notification hook event: details must be an object");
   }
   return {
     notificationType: notificationType as NotificationType,
@@ -226,11 +193,9 @@ function validateNotificationInput(input: Record<string, unknown>): {
 function validateSessionStartInput(input: Record<string, unknown>): {
   source: SessionStartSource;
 } {
-  const source = input['source'];
-  if (typeof source !== 'string') {
-    throw new Error(
-      'Invalid input for SessionStart hook event: source must be a string',
-    );
+  const source = input["source"];
+  if (typeof source !== "string") {
+    throw new Error("Invalid input for SessionStart hook event: source must be a string");
   }
   return {
     source: source as SessionStartSource,
@@ -243,11 +208,9 @@ function validateSessionStartInput(input: Record<string, unknown>): {
 function validateSessionEndInput(input: Record<string, unknown>): {
   reason: SessionEndReason;
 } {
-  const reason = input['reason'];
-  if (typeof reason !== 'string') {
-    throw new Error(
-      'Invalid input for SessionEnd hook event: reason must be a string',
-    );
+  const reason = input["reason"];
+  if (typeof reason !== "string") {
+    throw new Error("Invalid input for SessionEnd hook event: reason must be a string");
   }
   return {
     reason: reason as SessionEndReason,
@@ -260,11 +223,9 @@ function validateSessionEndInput(input: Record<string, unknown>): {
 function validatePreCompressInput(input: Record<string, unknown>): {
   trigger: PreCompressTrigger;
 } {
-  const trigger = input['trigger'];
-  if (typeof trigger !== 'string') {
-    throw new Error(
-      'Invalid input for PreCompress hook event: trigger must be a string',
-    );
+  const trigger = input["trigger"];
+  if (typeof trigger !== "string") {
+    throw new Error("Invalid input for PreCompress hook event: trigger must be a string");
   }
   return {
     trigger: trigger as PreCompressTrigger,
@@ -395,9 +356,7 @@ export class HookEventHandler {
   /**
    * Fire a SessionStart event
    */
-  async fireSessionStartEvent(
-    source: SessionStartSource,
-  ): Promise<AggregatedHookResult> {
+  async fireSessionStartEvent(source: SessionStartSource): Promise<AggregatedHookResult> {
     const input: SessionStartInput = {
       ...this.createBaseInput(HookEventName.SessionStart),
       source,
@@ -410,9 +369,7 @@ export class HookEventHandler {
   /**
    * Fire a SessionEnd event
    */
-  async fireSessionEndEvent(
-    reason: SessionEndReason,
-  ): Promise<AggregatedHookResult> {
+  async fireSessionEndEvent(reason: SessionEndReason): Promise<AggregatedHookResult> {
     const input: SessionEndInput = {
       ...this.createBaseInput(HookEventName.SessionEnd),
       reason,
@@ -425,9 +382,7 @@ export class HookEventHandler {
   /**
    * Fire a PreCompress event
    */
-  async firePreCompressEvent(
-    trigger: PreCompressTrigger,
-  ): Promise<AggregatedHookResult> {
+  async firePreCompressEvent(trigger: PreCompressTrigger): Promise<AggregatedHookResult> {
     const input: PreCompressInput = {
       ...this.createBaseInput(HookEventName.PreCompress),
       trigger,
@@ -441,9 +396,7 @@ export class HookEventHandler {
    * Fire a BeforeModel event
    * Called by handleHookExecutionRequest - executes hooks directly
    */
-  async fireBeforeModelEvent(
-    llmRequest: GenerateContentParameters,
-  ): Promise<AggregatedHookResult> {
+  async fireBeforeModelEvent(llmRequest: GenerateContentParameters): Promise<AggregatedHookResult> {
     const input: BeforeModelInput = {
       ...this.createBaseInput(HookEventName.BeforeModel),
       llm_request: defaultHookTranslator.toHookLLMRequest(llmRequest),
@@ -508,22 +461,11 @@ export class HookEventHandler {
 
       // Execute hooks according to the plan's strategy
       const results = plan.sequential
-        ? await this.hookRunner.executeHooksSequential(
-            plan.hookConfigs,
-            eventName,
-            input,
-          )
-        : await this.hookRunner.executeHooksParallel(
-            plan.hookConfigs,
-            eventName,
-            input,
-          );
+        ? await this.hookRunner.executeHooksSequential(plan.hookConfigs, eventName, input)
+        : await this.hookRunner.executeHooksParallel(plan.hookConfigs, eventName, input);
 
       // Aggregate results
-      const aggregated = this.hookAggregator.aggregateResults(
-        results,
-        eventName,
-      );
+      const aggregated = this.hookAggregator.aggregateResults(results, eventName);
 
       // Process common hook output fields centrally
       this.processCommonHookOutputFields(aggregated);
@@ -550,10 +492,7 @@ export class HookEventHandler {
   private createBaseInput(eventName: HookEventName): HookInput {
     // Get the transcript path from the ChatRecordingService if available
     const transcriptPath =
-      this.config
-        .getGeminiClient()
-        ?.getChatRecordingService()
-        ?.getConversationFilePath() ?? '';
+      this.config.getGeminiClient()?.getChatRecordingService()?.getConversationFilePath() ?? "";
 
     return {
       session_id: this.config.getSessionId(),
@@ -620,9 +559,7 @@ export class HookEventHandler {
   /**
    * Process common hook output fields centrally
    */
-  private processCommonHookOutputFields(
-    aggregated: AggregatedHookResult,
-  ): void {
+  private processCommonHookOutputFields(aggregated: AggregatedHookResult): void {
     if (!aggregated.finalOutput) {
       return;
     }
@@ -652,13 +589,13 @@ export class HookEventHandler {
    * Get hook name from execution result for telemetry
    */
   private getHookNameFromResult(result: HookExecutionResult): string {
-    return result.hookConfig.command || 'unknown-command';
+    return result.hookConfig.command || "unknown-command";
   }
 
   /**
    * Get hook type from execution result for telemetry
    */
-  private getHookTypeFromResult(result: HookExecutionResult): 'command' {
+  private getHookTypeFromResult(result: HookExecutionResult): "command" {
     return result.hookConfig.type;
   }
 
@@ -670,9 +607,7 @@ export class HookEventHandler {
    * The request input only contains event-specific fields. This method adds
    * the common base fields (session_id, cwd, etc.) before routing.
    */
-  private async handleHookExecutionRequest(
-    request: HookExecutionRequest,
-  ): Promise<void> {
+  private async handleHookExecutionRequest(request: HookExecutionRequest): Promise<void> {
     try {
       // Add base fields to the input
       const enrichedInput = {
@@ -685,19 +620,13 @@ export class HookEventHandler {
       // Route to appropriate event handler based on eventName
       switch (request.eventName) {
         case HookEventName.BeforeTool: {
-          const { toolName, toolInput } =
-            validateBeforeToolInput(enrichedInput);
+          const { toolName, toolInput } = validateBeforeToolInput(enrichedInput);
           result = await this.fireBeforeToolEvent(toolName, toolInput);
           break;
         }
         case HookEventName.AfterTool: {
-          const { toolName, toolInput, toolResponse } =
-            validateAfterToolInput(enrichedInput);
-          result = await this.fireAfterToolEvent(
-            toolName,
-            toolInput,
-            toolResponse,
-          );
+          const { toolName, toolInput, toolResponse } = validateAfterToolInput(enrichedInput);
+          result = await this.fireAfterToolEvent(toolName, toolInput, toolResponse);
           break;
         }
         case HookEventName.BeforeAgent: {
@@ -706,60 +635,39 @@ export class HookEventHandler {
           break;
         }
         case HookEventName.AfterAgent: {
-          const { prompt, promptResponse, stopHookActive } =
-            validateAfterAgentInput(enrichedInput);
-          result = await this.fireAfterAgentEvent(
-            prompt,
-            promptResponse,
-            stopHookActive,
-          );
+          const { prompt, promptResponse, stopHookActive } = validateAfterAgentInput(enrichedInput);
+          result = await this.fireAfterAgentEvent(prompt, promptResponse, stopHookActive);
           break;
         }
         case HookEventName.BeforeModel: {
-          const { llmRequest } = validateModelInput(
-            enrichedInput,
-            'BeforeModel',
-          );
-          const translatedRequest =
-            defaultHookTranslator.toHookLLMRequest(llmRequest);
+          const { llmRequest } = validateModelInput(enrichedInput, "BeforeModel");
+          const translatedRequest = defaultHookTranslator.toHookLLMRequest(llmRequest);
           // Update the enrichedInput with translated request
-          enrichedInput['llm_request'] = translatedRequest;
+          enrichedInput["llm_request"] = translatedRequest;
           result = await this.fireBeforeModelEvent(llmRequest);
           break;
         }
         case HookEventName.AfterModel: {
-          const { llmRequest, llmResponse } =
-            validateAfterModelInput(enrichedInput);
-          const translatedRequest =
-            defaultHookTranslator.toHookLLMRequest(llmRequest);
-          const translatedResponse =
-            defaultHookTranslator.toHookLLMResponse(llmResponse);
+          const { llmRequest, llmResponse } = validateAfterModelInput(enrichedInput);
+          const translatedRequest = defaultHookTranslator.toHookLLMRequest(llmRequest);
+          const translatedResponse = defaultHookTranslator.toHookLLMResponse(llmResponse);
           // Update the enrichedInput with translated versions
-          enrichedInput['llm_request'] = translatedRequest;
-          enrichedInput['llm_response'] = translatedResponse;
+          enrichedInput["llm_request"] = translatedRequest;
+          enrichedInput["llm_response"] = translatedResponse;
           result = await this.fireAfterModelEvent(llmRequest, llmResponse);
           break;
         }
         case HookEventName.BeforeToolSelection: {
-          const { llmRequest } = validateModelInput(
-            enrichedInput,
-            'BeforeToolSelection',
-          );
-          const translatedRequest =
-            defaultHookTranslator.toHookLLMRequest(llmRequest);
+          const { llmRequest } = validateModelInput(enrichedInput, "BeforeToolSelection");
+          const translatedRequest = defaultHookTranslator.toHookLLMRequest(llmRequest);
           // Update the enrichedInput with translated request
-          enrichedInput['llm_request'] = translatedRequest;
+          enrichedInput["llm_request"] = translatedRequest;
           result = await this.fireBeforeToolSelectionEvent(llmRequest);
           break;
         }
         case HookEventName.Notification: {
-          const { notificationType, message, details } =
-            validateNotificationInput(enrichedInput);
-          result = await this.fireNotificationEvent(
-            notificationType,
-            message,
-            details,
-          );
+          const { notificationType, message, details } = validateNotificationInput(enrichedInput);
+          result = await this.fireNotificationEvent(notificationType, message, details);
           break;
         }
         case HookEventName.SessionStart: {
diff --git a/packages/gemini-cli-core/src/hooks/hookPlanner.test.ts b/packages/gemini-cli-core/src/hooks/hookPlanner.test.ts
index c408266ec..7901efa6a 100644
--- a/packages/gemini-cli-core/src/hooks/hookPlanner.test.ts
+++ b/packages/gemini-cli-core/src/hooks/hookPlanner.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { HookPlanner } from './hookPlanner.js';
-import type { HookRegistry, HookRegistryEntry } from './hookRegistry.js';
-import { HookEventName, HookType } from './types.js';
-import { ConfigSource } from './hookRegistry.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { HookPlanner } from "./hookPlanner.js";
+import type { HookRegistry, HookRegistryEntry } from "./hookRegistry.js";
+import { ConfigSource } from "./hookRegistry.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Mock debugLogger using vi.hoisted
 const mockDebugLogger = vi.hoisted(() => ({
@@ -18,11 +18,11 @@ const mockDebugLogger = vi.hoisted(() => ({
   debug: vi.fn(),
 }));
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: mockDebugLogger,
 }));
 
-describe('HookPlanner', () => {
+describe("HookPlanner", () => {
   let hookPlanner: HookPlanner;
   let mockHookRegistry: HookRegistry;
 
@@ -36,8 +36,8 @@ describe('HookPlanner', () => {
     hookPlanner = new HookPlanner(mockHookRegistry);
   });
 
-  describe('createExecutionPlan', () => {
-    it('should return empty plan when no hooks registered', () => {
+  describe("createExecutionPlan", () => {
+    it("should return empty plan when no hooks registered", () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue([]);
 
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool);
@@ -45,10 +45,10 @@ describe('HookPlanner', () => {
       expect(plan).toBeNull();
     });
 
-    it('should create plan for hooks without matchers', () => {
+    it("should create plan for hooks without matchers", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './hook1.sh' },
+          config: { type: HookType.Command, command: "./hook1.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
           enabled: true,
@@ -56,7 +56,7 @@ describe('HookPlanner', () => {
         {
           config: {
             type: HookType.Command,
-            command: './test-hook.sh',
+            command: "./test-hook.sh",
           },
           source: ConfigSource.User,
           eventName: HookEventName.BeforeTool,
@@ -70,21 +70,21 @@ describe('HookPlanner', () => {
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(2);
-      expect(plan!.hookConfigs[0].command).toBe('./hook1.sh');
-      expect(plan!.hookConfigs[1].command).toBe('./test-hook.sh');
+      expect(plan!.hookConfigs[0].command).toBe("./hook1.sh");
+      expect(plan!.hookConfigs[1].command).toBe("./test-hook.sh");
     });
 
-    it('should filter hooks by tool name matcher', () => {
+    it("should filter hooks by tool name matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './edit_hook.sh' },
+          config: { type: HookType.Command, command: "./edit_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: 'EditTool',
+          matcher: "EditTool",
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './general_hook.sh' },
+          config: { type: HookType.Command, command: "./general_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
           enabled: true,
@@ -95,27 +95,27 @@ describe('HookPlanner', () => {
 
       // Test with EditTool context
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: 'EditTool',
+        toolName: "EditTool",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(2); // Both should match (one specific, one general)
     });
 
-    it('should filter hooks by regex matcher', () => {
+    it("should filter hooks by regex matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './edit_hook.sh' },
+          config: { type: HookType.Command, command: "./edit_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: 'Edit|Write',
+          matcher: "Edit|Write",
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './read_hook.sh' },
+          config: { type: HookType.Command, command: "./read_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: 'ReadTool',
+          matcher: "ReadTool",
           enabled: true,
         },
       ];
@@ -123,47 +123,43 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       // Test with EditTool - should match first hook
-      const editPlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'EditTool' },
-      );
+      const editPlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "EditTool",
+      });
       expect(editPlan).not.toBeNull();
       expect(editPlan!.hookConfigs).toHaveLength(1);
-      expect(editPlan!.hookConfigs[0].command).toBe('./edit_hook.sh');
+      expect(editPlan!.hookConfigs[0].command).toBe("./edit_hook.sh");
 
       // Test with WriteTool - should match first hook
-      const writePlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'WriteTool' },
-      );
+      const writePlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "WriteTool",
+      });
       expect(writePlan).not.toBeNull();
       expect(writePlan!.hookConfigs).toHaveLength(1);
-      expect(writePlan!.hookConfigs[0].command).toBe('./edit_hook.sh');
+      expect(writePlan!.hookConfigs[0].command).toBe("./edit_hook.sh");
 
       // Test with ReadTool - should match second hook
-      const readPlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'ReadTool' },
-      );
+      const readPlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "ReadTool",
+      });
       expect(readPlan).not.toBeNull();
       expect(readPlan!.hookConfigs).toHaveLength(1);
-      expect(readPlan!.hookConfigs[0].command).toBe('./read_hook.sh');
+      expect(readPlan!.hookConfigs[0].command).toBe("./read_hook.sh");
 
       // Test with unmatched tool - should match no hooks
-      const otherPlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'OtherTool' },
-      );
+      const otherPlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "OtherTool",
+      });
       expect(otherPlan).toBeNull();
     });
 
-    it('should handle wildcard matcher', () => {
+    it("should handle wildcard matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './wildcard_hook.sh' },
+          config: { type: HookType.Command, command: "./wildcard_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: '*',
+          matcher: "*",
           enabled: true,
         },
       ];
@@ -171,23 +167,23 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: 'AnyTool',
+        toolName: "AnyTool",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(1);
     });
 
-    it('should handle empty string matcher', () => {
+    it("should handle empty string matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
           config: {
             type: HookType.Command,
-            command: './empty_matcher_hook.sh',
+            command: "./empty_matcher_hook.sh",
           },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: '',
+          matcher: "",
           enabled: true,
         },
       ];
@@ -195,23 +191,23 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: 'AnyTool',
+        toolName: "AnyTool",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(1);
     });
 
-    it('should handle invalid regex matcher gracefully', () => {
+    it("should handle invalid regex matcher gracefully", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
           config: {
             type: HookType.Command,
-            command: './invalid_regex_hook.sh',
+            command: "./invalid_regex_hook.sh",
           },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: '[invalid-regex',
+          matcher: "[invalid-regex",
           enabled: true,
         },
       ];
@@ -220,33 +216,30 @@ describe('HookPlanner', () => {
 
       // Should match when toolName exactly equals the invalid regex pattern
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: '[invalid-regex',
+        toolName: "[invalid-regex",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(1); // Should fall back to exact match
 
       // Should not match when toolName doesn't exactly equal the pattern
-      const planNoMatch = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        {
-          toolName: 'other-tool',
-        },
-      );
+      const planNoMatch = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "other-tool",
+      });
 
       expect(planNoMatch).toBeNull();
     });
 
-    it('should deduplicate identical hooks', () => {
+    it("should deduplicate identical hooks", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './same_hook.sh' },
+          config: { type: HookType.Command, command: "./same_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './same_hook.sh' },
+          config: { type: HookType.Command, command: "./same_hook.sh" },
           source: ConfigSource.User,
           eventName: HookEventName.BeforeTool,
           enabled: true,
@@ -254,7 +247,7 @@ describe('HookPlanner', () => {
         {
           config: {
             type: HookType.Command,
-            command: './test-hook.sh',
+            command: "./test-hook.sh",
           },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
@@ -263,7 +256,7 @@ describe('HookPlanner', () => {
         {
           config: {
             type: HookType.Command,
-            command: './test-hook.sh',
+            command: "./test-hook.sh",
           },
           source: ConfigSource.User,
           eventName: HookEventName.BeforeTool,
@@ -278,24 +271,24 @@ describe('HookPlanner', () => {
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(2); // Should be deduplicated to 2 unique hooks
       expect(mockDebugLogger.debug).toHaveBeenCalledWith(
-        expect.stringContaining('Deduplicated hook'),
+        expect.stringContaining("Deduplicated hook"),
       );
     });
 
-    it('should match trigger for session events', () => {
+    it("should match trigger for session events", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './startup_hook.sh' },
+          config: { type: HookType.Command, command: "./startup_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.SessionStart,
-          matcher: 'startup',
+          matcher: "startup",
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './resume_hook.sh' },
+          config: { type: HookType.Command, command: "./resume_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.SessionStart,
-          matcher: 'resume',
+          matcher: "resume",
           enabled: true,
         },
       ];
@@ -303,22 +296,20 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       // Test startup trigger
-      const startupPlan = hookPlanner.createExecutionPlan(
-        HookEventName.SessionStart,
-        { trigger: 'startup' },
-      );
+      const startupPlan = hookPlanner.createExecutionPlan(HookEventName.SessionStart, {
+        trigger: "startup",
+      });
       expect(startupPlan).not.toBeNull();
       expect(startupPlan!.hookConfigs).toHaveLength(1);
-      expect(startupPlan!.hookConfigs[0].command).toBe('./startup_hook.sh');
+      expect(startupPlan!.hookConfigs[0].command).toBe("./startup_hook.sh");
 
       // Test resume trigger
-      const resumePlan = hookPlanner.createExecutionPlan(
-        HookEventName.SessionStart,
-        { trigger: 'resume' },
-      );
+      const resumePlan = hookPlanner.createExecutionPlan(HookEventName.SessionStart, {
+        trigger: "resume",
+      });
       expect(resumePlan).not.toBeNull();
       expect(resumePlan!.hookConfigs).toHaveLength(1);
-      expect(resumePlan!.hookConfigs[0].command).toBe('./resume_hook.sh');
+      expect(resumePlan!.hookConfigs[0].command).toBe("./resume_hook.sh");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/hooks/hookPlanner.ts b/packages/gemini-cli-core/src/hooks/hookPlanner.ts
index 4a0f00a8e..ed7e4eb85 100644
--- a/packages/gemini-cli-core/src/hooks/hookPlanner.ts
+++ b/packages/gemini-cli-core/src/hooks/hookPlanner.ts
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HookRegistry, HookRegistryEntry } from './hookRegistry.js';
-import type { HookExecutionPlan } from './types.js';
-import type { HookEventName } from './types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { debugLogger } from "../utils/debugLogger.js";
+import type { HookRegistry, HookRegistryEntry } from "./hookRegistry.js";
+import type { HookEventName, HookExecutionPlan } from "./types.js";
 
 /**
  * Hook planner that selects matching hooks and creates execution plans
@@ -33,9 +32,7 @@ export class HookPlanner {
     }
 
     // Filter hooks by matcher
-    const matchingEntries = hookEntries.filter((entry) =>
-      this.matchesContext(entry, context),
-    );
+    const matchingEntries = hookEntries.filter((entry) => this.matchesContext(entry, context));
 
     if (matchingEntries.length === 0) {
       return null;
@@ -48,9 +45,7 @@ export class HookPlanner {
     const hookConfigs = deduplicatedEntries.map((entry) => entry.config);
 
     // Determine execution strategy - if ANY hook definition has sequential=true, run all sequentially
-    const sequential = deduplicatedEntries.some(
-      (entry) => entry.sequential === true,
-    );
+    const sequential = deduplicatedEntries.some((entry) => entry.sequential === true);
 
     const plan: HookExecutionPlan = {
       eventName,
@@ -59,7 +54,7 @@ export class HookPlanner {
     };
 
     debugLogger.debug(
-      `Created execution plan for ${eventName}: ${hookConfigs.length} hook(s) to execute ${sequential ? 'sequentially' : 'in parallel'}`,
+      `Created execution plan for ${eventName}: ${hookConfigs.length} hook(s) to execute ${sequential ? "sequentially" : "in parallel"}`,
     );
 
     return plan;
@@ -68,17 +63,14 @@ export class HookPlanner {
   /**
    * Check if a hook entry matches the given context
    */
-  private matchesContext(
-    entry: HookRegistryEntry,
-    context?: HookEventContext,
-  ): boolean {
+  private matchesContext(entry: HookRegistryEntry, context?: HookEventContext): boolean {
     if (!entry.matcher || !context) {
       return true; // No matcher means match all
     }
 
     const matcher = entry.matcher.trim();
 
-    if (matcher === '' || matcher === '*') {
+    if (matcher === "" || matcher === "*") {
       return true; // Empty string or wildcard matches all
     }
 
diff --git a/packages/gemini-cli-core/src/hooks/hookRegistry.test.ts b/packages/gemini-cli-core/src/hooks/hookRegistry.test.ts
index 093821ee1..28f4a7b63 100644
--- a/packages/gemini-cli-core/src/hooks/hookRegistry.test.ts
+++ b/packages/gemini-cli-core/src/hooks/hookRegistry.test.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs';
-import {
-  HookRegistry,
-  ConfigSource,
-  HookRegistryNotInitializedError,
-} from './hookRegistry.js';
-import type { Storage } from '../config/storage.js';
-import { HookEventName, HookType } from './types.js';
-import type { Config } from '../config/config.js';
-import type { HookDefinition } from './types.js';
+import * as fs from "node:fs";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { Storage } from "../config/storage.js";
+import { ConfigSource, HookRegistry, HookRegistryNotInitializedError } from "./hookRegistry.js";
+import type { HookDefinition } from "./types.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Mock fs
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   existsSync: vi.fn(),
   readFileSync: vi.fn(),
 }));
@@ -30,11 +26,11 @@ const mockDebugLogger = vi.hoisted(() => ({
   debug: vi.fn(),
 }));
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: mockDebugLogger,
 }));
 
-describe('HookRegistry', () => {
+describe("HookRegistry", () => {
   let hookRegistry: HookRegistry;
   let mockConfig: Config;
   let mockStorage: Storage;
@@ -43,7 +39,7 @@ describe('HookRegistry', () => {
     vi.resetAllMocks();
 
     mockStorage = {
-      getGeminiDir: vi.fn().mockReturnValue('/project/.gemini'),
+      getGeminiDir: vi.fn().mockReturnValue("/project/.gemini"),
     } as unknown as Storage;
 
     mockConfig = {
@@ -60,27 +56,27 @@ describe('HookRegistry', () => {
     vi.restoreAllMocks();
   });
 
-  describe('initialize', () => {
-    it('should initialize successfully with no hooks', async () => {
+  describe("initialize", () => {
+    it("should initialize successfully with no hooks", async () => {
       vi.mocked(fs.existsSync).mockReturnValue(false);
 
       await hookRegistry.initialize();
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.log).toHaveBeenCalledWith(
-        'Hook registry initialized with 0 hook entries',
+        "Hook registry initialized with 0 hook entries",
       );
     });
 
-    it('should load hooks from project configuration', async () => {
+    it("should load hooks from project configuration", async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
+            matcher: "EditTool",
             hooks: [
               {
-                type: 'command',
-                command: './hooks/check_style.sh',
+                type: "command",
+                command: "./hooks/check_style.sh",
                 timeout: 60,
               },
             ],
@@ -101,19 +97,19 @@ describe('HookRegistry', () => {
       expect(hooks).toHaveLength(1);
       expect(hooks[0].eventName).toBe(HookEventName.BeforeTool);
       expect(hooks[0].config.type).toBe(HookType.Command);
-      expect(hooks[0].config.command).toBe('./hooks/check_style.sh');
-      expect(hooks[0].matcher).toBe('EditTool');
+      expect(hooks[0].config.command).toBe("./hooks/check_style.sh");
+      expect(hooks[0].matcher).toBe("EditTool");
       expect(hooks[0].source).toBe(ConfigSource.Project);
     });
 
-    it('should load plugin hooks', async () => {
+    it("should load plugin hooks", async () => {
       const mockHooksConfig = {
         AfterTool: [
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/after-tool.sh',
+                type: "command",
+                command: "./hooks/after-tool.sh",
                 timeout: 30,
               },
             ],
@@ -134,17 +130,17 @@ describe('HookRegistry', () => {
       expect(hooks).toHaveLength(1);
       expect(hooks[0].eventName).toBe(HookEventName.AfterTool);
       expect(hooks[0].config.type).toBe(HookType.Command);
-      expect(hooks[0].config.command).toBe('./hooks/after-tool.sh');
+      expect(hooks[0].config.command).toBe("./hooks/after-tool.sh");
     });
 
-    it('should handle invalid configuration gracefully', async () => {
+    it("should handle invalid configuration gracefully", async () => {
       const invalidHooksConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'invalid-type', // Invalid hook type
-                command: './hooks/test.sh',
+                type: "invalid-type", // Invalid hook type
+                command: "./hooks/test.sh",
               },
             ],
           },
@@ -164,17 +160,17 @@ describe('HookRegistry', () => {
       expect(mockDebugLogger.warn).toHaveBeenCalled();
     });
 
-    it('should validate hook configurations', async () => {
+    it("should validate hook configurations", async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'invalid',
-                command: './hooks/test.sh',
+                type: "invalid",
+                command: "./hooks/test.sh",
               },
               {
-                type: 'command',
+                type: "command",
                 // Missing command field
               },
             ],
@@ -196,24 +192,24 @@ describe('HookRegistry', () => {
     });
   });
 
-  describe('getHooksForEvent', () => {
+  describe("getHooksForEvent", () => {
     beforeEach(async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
+            matcher: "EditTool",
             hooks: [
               {
-                type: 'command',
-                command: './hooks/edit_check.sh',
+                type: "command",
+                command: "./hooks/edit_check.sh",
               },
             ],
           },
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/general_check.sh',
+                type: "command",
+                command: "./hooks/general_check.sh",
               },
             ],
           },
@@ -222,8 +218,8 @@ describe('HookRegistry', () => {
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/after-tool.sh',
+                type: "command",
+                command: "./hooks/after-tool.sh",
               },
             ],
           },
@@ -240,26 +236,20 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
     });
 
-    it('should return hooks for specific event', () => {
-      const beforeToolHooks = hookRegistry.getHooksForEvent(
-        HookEventName.BeforeTool,
-      );
+    it("should return hooks for specific event", () => {
+      const beforeToolHooks = hookRegistry.getHooksForEvent(HookEventName.BeforeTool);
       expect(beforeToolHooks).toHaveLength(2);
 
-      const afterToolHooks = hookRegistry.getHooksForEvent(
-        HookEventName.AfterTool,
-      );
+      const afterToolHooks = hookRegistry.getHooksForEvent(HookEventName.AfterTool);
       expect(afterToolHooks).toHaveLength(1);
     });
 
-    it('should return empty array for events with no hooks', () => {
-      const notificationHooks = hookRegistry.getHooksForEvent(
-        HookEventName.Notification,
-      );
+    it("should return empty array for events with no hooks", () => {
+      const notificationHooks = hookRegistry.getHooksForEvent(HookEventName.Notification);
       expect(notificationHooks).toHaveLength(0);
     });
 
-    it('should throw error if not initialized', () => {
+    it("should throw error if not initialized", () => {
       const uninitializedRegistry = new HookRegistry(mockConfig);
 
       expect(() => {
@@ -268,15 +258,15 @@ describe('HookRegistry', () => {
     });
   });
 
-  describe('setHookEnabled', () => {
+  describe("setHookEnabled", () => {
     beforeEach(async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/test.sh',
+                type: "command",
+                command: "./hooks/test.sh",
               },
             ],
           },
@@ -293,8 +283,8 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
     });
 
-    it('should enable and disable hooks', () => {
-      const hookName = './hooks/test.sh';
+    it("should enable and disable hooks", () => {
+      const hookName = "./hooks/test.sh";
 
       // Initially enabled
       let hooks = hookRegistry.getHooksForEvent(HookEventName.BeforeTool);
@@ -311,18 +301,18 @@ describe('HookRegistry', () => {
       expect(hooks).toHaveLength(1);
     });
 
-    it('should warn when hook not found', () => {
-      hookRegistry.setHookEnabled('non-existent-hook', false);
+    it("should warn when hook not found", () => {
+      hookRegistry.setHookEnabled("non-existent-hook", false);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
         'No hooks found matching "non-existent-hook"',
       );
     });
   });
 
-  describe('malformed configuration handling', () => {
-    it('should handle non-array definitions gracefully', async () => {
+  describe("malformed configuration handling", () => {
+    it("should handle non-array definitions gracefully", async () => {
       const malformedConfig = {
-        BeforeTool: 'not-an-array', // Should be an array of HookDefinition
+        BeforeTool: "not-an-array", // Should be an array of HookDefinition
       };
 
       vi.mocked(mockConfig.getHooks).mockReturnValue(
@@ -334,12 +324,10 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
-      expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('is not an array'),
-      );
+      expect(mockDebugLogger.warn).toHaveBeenCalledWith(expect.stringContaining("is not an array"));
     });
 
-    it('should handle object instead of array for definitions', async () => {
+    it("should handle object instead of array for definitions", async () => {
       const malformedConfig = {
         AfterTool: { hooks: [] }, // Should be an array, not a single object
       };
@@ -353,12 +341,10 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
-      expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('is not an array'),
-      );
+      expect(mockDebugLogger.warn).toHaveBeenCalledWith(expect.stringContaining("is not an array"));
     });
 
-    it('should handle null definition gracefully', async () => {
+    it("should handle null definition gracefully", async () => {
       const malformedConfig = {
         BeforeTool: [null], // Invalid: null definition
       };
@@ -373,16 +359,16 @@ describe('HookRegistry', () => {
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook definition'),
+        expect.stringContaining("Discarding invalid hook definition"),
         null,
       );
     });
 
-    it('should handle definition without hooks array', async () => {
+    it("should handle definition without hooks array", async () => {
       const malformedConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
+            matcher: "EditTool",
             // Missing hooks array
           },
         ],
@@ -398,17 +384,17 @@ describe('HookRegistry', () => {
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook definition'),
-        expect.objectContaining({ matcher: 'EditTool' }),
+        expect.stringContaining("Discarding invalid hook definition"),
+        expect.objectContaining({ matcher: "EditTool" }),
       );
     });
 
-    it('should handle non-array hooks property', async () => {
+    it("should handle non-array hooks property", async () => {
       const malformedConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
-            hooks: 'not-an-array', // Should be an array
+            matcher: "EditTool",
+            hooks: "not-an-array", // Should be an array
           },
         ],
       };
@@ -423,17 +409,17 @@ describe('HookRegistry', () => {
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook definition'),
-        expect.objectContaining({ hooks: 'not-an-array', matcher: 'EditTool' }),
+        expect.stringContaining("Discarding invalid hook definition"),
+        expect.objectContaining({ hooks: "not-an-array", matcher: "EditTool" }),
       );
     });
 
-    it('should handle non-object hookConfig in hooks array', async () => {
+    it("should handle non-object hookConfig in hooks array", async () => {
       const malformedConfig = {
         BeforeTool: [
           {
             hooks: [
-              'not-an-object', // Should be an object
+              "not-an-object", // Should be an object
               42, // Should be an object
               null, // Should be an object
             ],
@@ -453,19 +439,19 @@ describe('HookRegistry', () => {
       expect(mockDebugLogger.warn).toHaveBeenCalledTimes(3); // One warning for each invalid hookConfig
     });
 
-    it('should handle mixed valid and invalid hook configurations', async () => {
+    it("should handle mixed valid and invalid hook configurations", async () => {
       const mixedConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'command',
-                command: './valid-hook.sh',
+                type: "command",
+                command: "./valid-hook.sh",
               },
-              'invalid-string',
+              "invalid-string",
               {
-                type: 'invalid-type',
-                command: './invalid-type.sh',
+                type: "invalid-type",
+                command: "./invalid-type.sh",
               },
             ],
           },
@@ -483,22 +469,22 @@ describe('HookRegistry', () => {
       // Should only load the valid hook
       const hooks = hookRegistry.getAllHooks();
       expect(hooks).toHaveLength(1);
-      expect(hooks[0].config.command).toBe('./valid-hook.sh');
+      expect(hooks[0].config.command).toBe("./valid-hook.sh");
 
       // Verify the warnings for invalid configurations
       // 1st warning: non-object hookConfig ('invalid-string')
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook configuration'),
-        'invalid-string',
+        expect.stringContaining("Discarding invalid hook configuration"),
+        "invalid-string",
       );
       // 2nd warning: validateHookConfig logs invalid type
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Invalid hook BeforeTool from project type'),
+        expect.stringContaining("Invalid hook BeforeTool from project type"),
       );
       // 3rd warning: processHookDefinition logs the failed hookConfig
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook configuration'),
-        expect.objectContaining({ type: 'invalid-type' }),
+        expect.stringContaining("Discarding invalid hook configuration"),
+        expect.objectContaining({ type: "invalid-type" }),
       );
     });
   });
diff --git a/packages/gemini-cli-core/src/hooks/hookRegistry.ts b/packages/gemini-cli-core/src/hooks/hookRegistry.ts
index 3d14e5162..493ebb73a 100644
--- a/packages/gemini-cli-core/src/hooks/hookRegistry.ts
+++ b/packages/gemini-cli-core/src/hooks/hookRegistry.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { HookDefinition, HookConfig } from './types.js';
-import { HookEventName } from './types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { HookConfig, HookDefinition } from "./types.js";
+import { HookEventName } from "./types.js";
 
 /**
  * Error thrown when attempting to use HookRegistry before initialization
  */
 export class HookRegistryNotInitializedError extends Error {
-  constructor(message = 'Hook registry not initialized') {
+  constructor(message = "Hook registry not initialized") {
     super(message);
-    this.name = 'HookRegistryNotInitializedError';
+    this.name = "HookRegistryNotInitializedError";
   }
 }
 
@@ -23,10 +23,10 @@ export class HookRegistryNotInitializedError extends Error {
  * Configuration source levels in precedence order (highest to lowest)
  */
 export enum ConfigSource {
-  Project = 'project',
-  User = 'user',
-  System = 'system',
-  Extensions = 'extensions',
+  Project = "project",
+  User = "user",
+  System = "system",
+  Extensions = "extensions",
 }
 
 /**
@@ -65,9 +65,7 @@ export class HookRegistry {
     this.processHooksFromConfig();
     this.initialized = true;
 
-    debugLogger.log(
-      `Hook registry initialized with ${this.entries.length} hook entries`,
-    );
+    debugLogger.log(`Hook registry initialized with ${this.entries.length} hook entries`);
   }
 
   /**
@@ -80,10 +78,7 @@ export class HookRegistry {
 
     return this.entries
       .filter((entry) => entry.eventName === eventName && entry.enabled)
-      .sort(
-        (a, b) =>
-          this.getSourcePriority(a.source) - this.getSourcePriority(b.source),
-      );
+      .sort((a, b) => this.getSourcePriority(a.source) - this.getSourcePriority(b.source));
   }
 
   /**
@@ -112,7 +107,7 @@ export class HookRegistry {
 
     if (updated.length > 0) {
       debugLogger.log(
-        `${enabled ? 'Enabled' : 'Disabled'} ${updated.length} hook(s) matching "${hookName}"`,
+        `${enabled ? "Enabled" : "Disabled"} ${updated.length} hook(s) matching "${hookName}"`,
       );
     } else {
       debugLogger.warn(`No hooks found matching "${hookName}"`);
@@ -123,7 +118,7 @@ export class HookRegistry {
    * Get hook name for display purposes
    */
   private getHookName(entry: HookRegistryEntry): string {
-    return entry.config.command || 'unknown-command';
+    return entry.config.command || "unknown-command";
   }
 
   /**
@@ -140,10 +135,7 @@ export class HookRegistry {
     const extensions = this.config.getExtensions() || [];
     for (const extension of extensions) {
       if (extension.isActive && extension.hooks) {
-        this.processHooksConfiguration(
-          extension.hooks,
-          ConfigSource.Extensions,
-        );
+        this.processHooksConfiguration(extension.hooks, ConfigSource.Extensions);
       }
     }
   }
@@ -184,11 +176,7 @@ export class HookRegistry {
     eventName: HookEventName,
     source: ConfigSource,
   ): void {
-    if (
-      !definition ||
-      typeof definition !== 'object' ||
-      !Array.isArray(definition.hooks)
-    ) {
+    if (!definition || typeof definition !== "object" || !Array.isArray(definition.hooks)) {
       debugLogger.warn(
         `Discarding invalid hook definition for ${eventName} from ${source}:`,
         definition,
@@ -202,7 +190,7 @@ export class HookRegistry {
     for (const hookConfig of definition.hooks) {
       if (
         hookConfig &&
-        typeof hookConfig === 'object' &&
+        typeof hookConfig === "object" &&
         this.validateHookConfig(hookConfig, eventName, source)
       ) {
         // Check if this hook is in the disabled list
@@ -237,17 +225,13 @@ export class HookRegistry {
     eventName: HookEventName,
     source: ConfigSource,
   ): boolean {
-    if (!config.type || !['command', 'plugin'].includes(config.type)) {
-      debugLogger.warn(
-        `Invalid hook ${eventName} from ${source} type: ${config.type}`,
-      );
+    if (!config.type || !["command", "plugin"].includes(config.type)) {
+      debugLogger.warn(`Invalid hook ${eventName} from ${source} type: ${config.type}`);
       return false;
     }
 
-    if (config.type === 'command' && !config.command) {
-      debugLogger.warn(
-        `Command hook ${eventName} from ${source} missing command field`,
-      );
+    if (config.type === "command" && !config.command) {
+      debugLogger.warn(`Command hook ${eventName} from ${source} missing command field`);
       return false;
     }
 
diff --git a/packages/gemini-cli-core/src/hooks/hookRunner.test.ts b/packages/gemini-cli-core/src/hooks/hookRunner.test.ts
index 8bb0c6859..c170bf783 100644
--- a/packages/gemini-cli-core/src/hooks/hookRunner.test.ts
+++ b/packages/gemini-cli-core/src/hooks/hookRunner.test.ts
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { spawn, type ChildProcessWithoutNullStreams } from 'node:child_process';
-import { HookRunner } from './hookRunner.js';
-import { HookEventName, HookType } from './types.js';
-import type { HookConfig } from './types.js';
-import type { HookInput } from './types.js';
-import type { Readable, Writable } from 'node:stream';
+import { type ChildProcessWithoutNullStreams, spawn } from "node:child_process";
+import type { Readable, Writable } from "node:stream";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { HookRunner } from "./hookRunner.js";
+import type { HookConfig, HookInput } from "./types.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Mock type for the child_process spawn
 type MockChildProcessWithoutNullStreams = ChildProcessWithoutNullStreams & {
@@ -20,7 +19,7 @@ type MockChildProcessWithoutNullStreams = ChildProcessWithoutNullStreams & {
 };
 
 // Mock child_process with importOriginal for partial mocking
-vi.mock('node:child_process', async (importOriginal) => {
+vi.mock("node:child_process", async (importOriginal) => {
   const actual = (await importOriginal()) as object;
   return {
     ...actual,
@@ -36,18 +35,18 @@ const mockConsole = {
   debug: vi.fn(),
 };
 
-vi.stubGlobal('console', mockConsole);
+vi.stubGlobal("console", mockConsole);
 
-describe('HookRunner', () => {
+describe("HookRunner", () => {
   let hookRunner: HookRunner;
   let mockSpawn: MockChildProcessWithoutNullStreams;
 
   const mockInput: HookInput = {
-    session_id: 'test-session',
-    transcript_path: '/path/to/transcript',
-    cwd: '/test/project',
-    hook_event_name: 'BeforeTool',
-    timestamp: '2025-01-01T00:00:00.000Z',
+    session_id: "test-session",
+    transcript_path: "/path/to/transcript",
+    cwd: "/test/project",
+    hook_event_name: "BeforeTool",
+    timestamp: "2025-01-01T00:00:00.000Z",
   };
 
   beforeEach(() => {
@@ -87,32 +86,29 @@ describe('HookRunner', () => {
     vi.restoreAllMocks();
   });
 
-  describe('executeHook', () => {
-    describe('command hooks', () => {
+  describe("executeHook", () => {
+    describe("command hooks", () => {
       const commandConfig: HookConfig = {
         type: HookType.Command,
-        command: './hooks/test.sh',
+        command: "./hooks/test.sh",
         timeout: 5000,
       };
 
-      it('should execute command hook successfully', async () => {
-        const mockOutput = { decision: 'allow', reason: 'All good' };
+      it("should execute command hook successfully", async () => {
+        const mockOutput = { decision: "allow", reason: "All good" };
 
         // Mock successful execution
         mockSpawn.mockStdoutOn.mockImplementation(
           (event: string, callback: (data: Buffer) => void) => {
-            if (event === 'data') {
-              setTimeout(
-                () => callback(Buffer.from(JSON.stringify(mockOutput))),
-                10,
-              );
+            if (event === "data") {
+              setTimeout(() => callback(Buffer.from(JSON.stringify(mockOutput))), 10);
             }
           },
         );
 
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               setTimeout(() => callback(0), 20);
             }
           },
@@ -127,17 +123,15 @@ describe('HookRunner', () => {
         expect(result.success).toBe(true);
         expect(result.output).toEqual(mockOutput);
         expect(result.exitCode).toBe(0);
-        expect(mockSpawn.stdin.write).toHaveBeenCalledWith(
-          JSON.stringify(mockInput),
-        );
+        expect(mockSpawn.stdin.write).toHaveBeenCalledWith(JSON.stringify(mockInput));
       });
 
-      it('should handle command hook failure', async () => {
-        const errorMessage = 'Command failed';
+      it("should handle command hook failure", async () => {
+        const errorMessage = "Command failed";
 
         mockSpawn.mockStderrOn.mockImplementation(
           (event: string, callback: (data: Buffer) => void) => {
-            if (event === 'data') {
+            if (event === "data") {
               setTimeout(() => callback(Buffer.from(errorMessage)), 10);
             }
           },
@@ -145,7 +139,7 @@ describe('HookRunner', () => {
 
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               setTimeout(() => callback(1), 20);
             }
           },
@@ -162,10 +156,10 @@ describe('HookRunner', () => {
         expect(result.stderr).toBe(errorMessage);
       });
 
-      it('should handle command hook timeout', async () => {
+      it("should handle command hook timeout", async () => {
         const shortTimeoutConfig: HookConfig = {
           type: HookType.Command,
-          command: './hooks/slow.sh',
+          command: "./hooks/slow.sh",
           timeout: 50, // Very short timeout for testing
         };
 
@@ -175,7 +169,7 @@ describe('HookRunner', () => {
         // Mock a hanging process that registers the close handler but doesn't call it initially
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               closeCallback = callback; // Store the callback but don't call it yet
             }
           },
@@ -201,37 +195,33 @@ describe('HookRunner', () => {
 
         expect(result.success).toBe(false);
         expect(killWasCalled).toBe(true);
-        expect(result.error?.message).toContain('timed out');
-        expect(mockSpawn.kill).toHaveBeenCalledWith('SIGTERM');
+        expect(result.error?.message).toContain("timed out");
+        expect(mockSpawn.kill).toHaveBeenCalledWith("SIGTERM");
       });
 
-      it('should expand environment variables in commands', async () => {
+      it("should expand environment variables in commands", async () => {
         const configWithEnvVar: HookConfig = {
           type: HookType.Command,
-          command: '$GEMINI_PROJECT_DIR/hooks/test.sh',
+          command: "$GEMINI_PROJECT_DIR/hooks/test.sh",
         };
 
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               setTimeout(() => callback(0), 10);
             }
           },
         );
 
-        await hookRunner.executeHook(
-          configWithEnvVar,
-          HookEventName.BeforeTool,
-          mockInput,
-        );
+        await hookRunner.executeHook(configWithEnvVar, HookEventName.BeforeTool, mockInput);
 
         expect(spawn).toHaveBeenCalledWith(
-          '/test/project/hooks/test.sh',
+          "/test/project/hooks/test.sh",
           expect.objectContaining({
             shell: true,
             env: expect.objectContaining({
-              GEMINI_PROJECT_DIR: '/test/project',
-              CLAUDE_PROJECT_DIR: '/test/project',
+              GEMINI_PROJECT_DIR: "/test/project",
+              CLAUDE_PROJECT_DIR: "/test/project",
             }),
           }),
         );
@@ -239,17 +229,17 @@ describe('HookRunner', () => {
     });
   });
 
-  describe('executeHooksParallel', () => {
-    it('should execute multiple hooks in parallel', async () => {
+  describe("executeHooksParallel", () => {
+    it("should execute multiple hooks in parallel", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       // Mock both commands to succeed
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 10);
           }
         },
@@ -266,16 +256,16 @@ describe('HookRunner', () => {
       expect(spawn).toHaveBeenCalledTimes(2);
     });
 
-    it('should handle mixed success and failure', async () => {
+    it("should handle mixed success and failure", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       let callCount = 0;
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             const exitCode = callCount++ === 0 ? 0 : 1; // First succeeds, second fails
             setTimeout(() => callback(exitCode), 10);
           }
@@ -294,11 +284,11 @@ describe('HookRunner', () => {
     });
   });
 
-  describe('executeHooksSequential', () => {
-    it('should execute multiple hooks in sequence', async () => {
+  describe("executeHooksSequential", () => {
+    it("should execute multiple hooks in sequence", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       const executionOrder: string[] = [];
@@ -306,9 +296,8 @@ describe('HookRunner', () => {
       // Mock both commands to succeed
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
-            const command =
-              vi.mocked(spawn).mock.calls[executionOrder.length][0];
+          if (event === "close") {
+            const command = vi.mocked(spawn).mock.calls[executionOrder.length][0];
             executionOrder.push(command);
             setTimeout(() => callback(0), 10);
           }
@@ -325,29 +314,29 @@ describe('HookRunner', () => {
       expect(results.every((r) => r.success)).toBe(true);
       expect(spawn).toHaveBeenCalledTimes(2);
       // Verify they were called sequentially
-      expect(executionOrder).toEqual(['./hook1.sh', './hook2.sh']);
+      expect(executionOrder).toEqual(["./hook1.sh", "./hook2.sh"]);
     });
 
-    it('should continue execution even if a hook fails', async () => {
+    it("should continue execution even if a hook fails", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
-        { type: HookType.Command, command: './hook3.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
+        { type: HookType.Command, command: "./hook3.sh" },
       ];
 
       let callCount = 0;
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data' && callCount === 1) {
+          if (event === "data" && callCount === 1) {
             // Second hook fails
-            setTimeout(() => callback(Buffer.from('Hook 2 failed')), 10);
+            setTimeout(() => callback(Buffer.from("Hook 2 failed")), 10);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             const exitCode = callCount++ === 1 ? 1 : 0; // Second fails, others succeed
             setTimeout(() => callback(exitCode), 20);
           }
@@ -367,33 +356,30 @@ describe('HookRunner', () => {
       expect(spawn).toHaveBeenCalledTimes(3);
     });
 
-    it('should pass modified input from one hook to the next for BeforeAgent', async () => {
+    it("should pass modified input from one hook to the next for BeforeAgent", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       const mockBeforeAgentInput = {
         ...mockInput,
-        prompt: 'Original prompt',
+        prompt: "Original prompt",
       };
 
       const mockOutput1 = {
-        decision: 'allow' as const,
+        decision: "allow" as const,
         hookSpecificOutput: {
-          additionalContext: 'Context from hook 1',
+          additionalContext: "Context from hook 1",
         },
       };
 
       let hookCallCount = 0;
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             if (hookCallCount === 0) {
-              setTimeout(
-                () => callback(Buffer.from(JSON.stringify(mockOutput1))),
-                10,
-              );
+              setTimeout(() => callback(Buffer.from(JSON.stringify(mockOutput1))), 10);
             }
           }
         },
@@ -401,7 +387,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             hookCallCount++;
             setTimeout(() => callback(0), 20);
           }
@@ -419,29 +405,27 @@ describe('HookRunner', () => {
       expect(results[0].output).toEqual(mockOutput1);
 
       // Verify that the second hook received modified input
-      const secondHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[1][0],
-      );
-      expect(secondHookInput.prompt).toContain('Original prompt');
-      expect(secondHookInput.prompt).toContain('Context from hook 1');
+      const secondHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[1][0]);
+      expect(secondHookInput.prompt).toContain("Original prompt");
+      expect(secondHookInput.prompt).toContain("Context from hook 1");
     });
 
-    it('should pass modified LLM request from one hook to the next for BeforeModel', async () => {
+    it("should pass modified LLM request from one hook to the next for BeforeModel", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       const mockBeforeModelInput = {
         ...mockInput,
         llm_request: {
-          model: 'gemini-1.5-pro',
-          messages: [{ role: 'user', content: 'Hello' }],
+          model: "gemini-1.5-pro",
+          messages: [{ role: "user", content: "Hello" }],
         },
       };
 
       const mockOutput1 = {
-        decision: 'allow' as const,
+        decision: "allow" as const,
         hookSpecificOutput: {
           llm_request: {
             temperature: 0.7,
@@ -452,12 +436,9 @@ describe('HookRunner', () => {
       let hookCallCount = 0;
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             if (hookCallCount === 0) {
-              setTimeout(
-                () => callback(Buffer.from(JSON.stringify(mockOutput1))),
-                10,
-              );
+              setTimeout(() => callback(Buffer.from(JSON.stringify(mockOutput1))), 10);
             }
           }
         },
@@ -465,7 +446,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             hookCallCount++;
             setTimeout(() => callback(0), 20);
           }
@@ -482,30 +463,28 @@ describe('HookRunner', () => {
       expect(results[0].success).toBe(true);
 
       // Verify that the second hook received modified input
-      const secondHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[1][0],
-      );
-      expect(secondHookInput.llm_request.model).toBe('gemini-1.5-pro');
+      const secondHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[1][0]);
+      expect(secondHookInput.llm_request.model).toBe("gemini-1.5-pro");
       expect(secondHookInput.llm_request.temperature).toBe(0.7);
     });
 
-    it('should not modify input if hook fails', async () => {
+    it("should not modify input if hook fails", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
-            setTimeout(() => callback(Buffer.from('Hook failed')), 10);
+          if (event === "data") {
+            setTimeout(() => callback(Buffer.from("Hook failed")), 10);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(1), 20); // All hooks fail
           }
         },
@@ -521,28 +500,24 @@ describe('HookRunner', () => {
       expect(results.every((r) => !r.success)).toBe(true);
 
       // Verify that both hooks received the same original input
-      const firstHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[0][0],
-      );
-      const secondHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[1][0],
-      );
+      const firstHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[0][0]);
+      const secondHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[1][0]);
       expect(firstHookInput).toEqual(secondHookInput);
     });
   });
 
-  describe('invalid JSON handling', () => {
+  describe("invalid JSON handling", () => {
     const commandConfig: HookConfig = {
       type: HookType.Command,
-      command: './hooks/test.sh',
+      command: "./hooks/test.sh",
     };
 
-    it('should handle invalid JSON output gracefully', async () => {
+    it("should handle invalid JSON output gracefully", async () => {
       const invalidJson = '{ "decision": "allow", incomplete';
 
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(invalidJson)), 10);
           }
         },
@@ -550,7 +525,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
@@ -566,17 +541,17 @@ describe('HookRunner', () => {
       expect(result.exitCode).toBe(0);
       // Should convert plain text to structured output
       expect(result.output).toEqual({
-        decision: 'allow',
+        decision: "allow",
         systemMessage: invalidJson,
       });
     });
 
-    it('should handle malformed JSON with exit code 0', async () => {
-      const malformedJson = 'not json at all';
+    it("should handle malformed JSON with exit code 0", async () => {
+      const malformedJson = "not json at all";
 
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(malformedJson)), 10);
           }
         },
@@ -584,7 +559,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
@@ -598,17 +573,17 @@ describe('HookRunner', () => {
 
       expect(result.success).toBe(true);
       expect(result.output).toEqual({
-        decision: 'allow',
+        decision: "allow",
         systemMessage: malformedJson,
       });
     });
 
-    it('should handle invalid JSON with exit code 1 (non-blocking error)', async () => {
-      const invalidJson = '{ broken json';
+    it("should handle invalid JSON with exit code 1 (non-blocking error)", async () => {
+      const invalidJson = "{ broken json";
 
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(invalidJson)), 10);
           }
         },
@@ -616,7 +591,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(1), 20);
           }
         },
@@ -631,17 +606,17 @@ describe('HookRunner', () => {
       expect(result.success).toBe(false);
       expect(result.exitCode).toBe(1);
       expect(result.output).toEqual({
-        decision: 'allow',
+        decision: "allow",
         systemMessage: `Warning: ${invalidJson}`,
       });
     });
 
-    it('should handle invalid JSON with exit code 2 (blocking error)', async () => {
+    it("should handle invalid JSON with exit code 2 (blocking error)", async () => {
       const invalidJson = '{ "error": incomplete';
 
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(invalidJson)), 10);
           }
         },
@@ -649,7 +624,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(2), 20);
           }
         },
@@ -664,23 +639,23 @@ describe('HookRunner', () => {
       expect(result.success).toBe(false);
       expect(result.exitCode).toBe(2);
       expect(result.output).toEqual({
-        decision: 'deny',
+        decision: "deny",
         reason: invalidJson,
       });
     });
 
-    it('should handle empty JSON output', async () => {
+    it("should handle empty JSON output", async () => {
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
-            setTimeout(() => callback(Buffer.from('')), 10);
+          if (event === "data") {
+            setTimeout(() => callback(Buffer.from("")), 10);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
@@ -697,13 +672,13 @@ describe('HookRunner', () => {
       expect(result.output).toBeUndefined();
     });
 
-    it('should handle double-encoded JSON string', async () => {
-      const mockOutput = { decision: 'allow', reason: 'All good' };
+    it("should handle double-encoded JSON string", async () => {
+      const mockOutput = { decision: "allow", reason: "All good" };
       const doubleEncodedJson = JSON.stringify(JSON.stringify(mockOutput));
 
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(doubleEncodedJson)), 10);
           }
         },
@@ -711,7 +686,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
diff --git a/packages/gemini-cli-core/src/hooks/hookRunner.ts b/packages/gemini-cli-core/src/hooks/hookRunner.ts
index 5c38041c4..1e3589f64 100644
--- a/packages/gemini-cli-core/src/hooks/hookRunner.ts
+++ b/packages/gemini-cli-core/src/hooks/hookRunner.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
-import type { HookConfig } from './types.js';
-import { HookEventName } from './types.js';
+import { spawn } from "node:child_process";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { LLMRequest } from "./hookTranslator.js";
 import type {
-  HookInput,
-  HookOutput,
-  HookExecutionResult,
   BeforeAgentInput,
   BeforeModelInput,
   BeforeModelOutput,
-} from './types.js';
-import type { LLMRequest } from './hookTranslator.js';
-import { debugLogger } from '../utils/debugLogger.js';
+  HookConfig,
+  HookExecutionResult,
+  HookInput,
+  HookOutput,
+} from "./types.js";
+import { HookEventName } from "./types.js";
 
 /**
  * Default timeout for hook execution (60 seconds)
@@ -47,15 +47,10 @@ export class HookRunner {
     const startTime = Date.now();
 
     try {
-      return await this.executeCommandHook(
-        hookConfig,
-        eventName,
-        input,
-        startTime,
-      );
+      return await this.executeCommandHook(hookConfig, eventName, input, startTime);
     } catch (error) {
       const duration = Date.now() - startTime;
-      const hookSource = hookConfig.command || 'unknown';
+      const hookSource = hookConfig.command || "unknown";
       const errorMessage = `Hook execution failed for event '${eventName}' (source: ${hookSource}): ${error}`;
       debugLogger.warn(`Hook execution error (non-fatal): ${errorMessage}`);
 
@@ -77,9 +72,7 @@ export class HookRunner {
     eventName: HookEventName,
     input: HookInput,
   ): Promise<HookExecutionResult[]> {
-    const promises = hookConfigs.map((config) =>
-      this.executeHook(config, eventName, input),
-    );
+    const promises = hookConfigs.map((config) => this.executeHook(config, eventName, input));
 
     return Promise.all(promises);
   }
@@ -101,11 +94,7 @@ export class HookRunner {
 
       // If the hook succeeded and has output, use it to modify the input for the next hook
       if (result.success && result.output) {
-        currentInput = this.applyHookOutputToInput(
-          currentInput,
-          result.output,
-          eventName,
-        );
+        currentInput = this.applyHookOutputToInput(currentInput, result.output, eventName);
       }
     }
 
@@ -127,33 +116,26 @@ export class HookRunner {
     if (hookOutput.hookSpecificOutput) {
       switch (eventName) {
         case HookEventName.BeforeAgent:
-          if ('additionalContext' in hookOutput.hookSpecificOutput) {
+          if ("additionalContext" in hookOutput.hookSpecificOutput) {
             // For BeforeAgent, we could modify the prompt with additional context
-            const additionalContext =
-              hookOutput.hookSpecificOutput['additionalContext'];
-            if (
-              typeof additionalContext === 'string' &&
-              'prompt' in modifiedInput
-            ) {
-              (modifiedInput as BeforeAgentInput).prompt +=
-                '\n\n' + additionalContext;
+            const additionalContext = hookOutput.hookSpecificOutput["additionalContext"];
+            if (typeof additionalContext === "string" && "prompt" in modifiedInput) {
+              (modifiedInput as BeforeAgentInput).prompt += "\n\n" + additionalContext;
             }
           }
           break;
 
         case HookEventName.BeforeModel:
-          if ('llm_request' in hookOutput.hookSpecificOutput) {
+          if ("llm_request" in hookOutput.hookSpecificOutput) {
             // For BeforeModel, we update the LLM request
             const hookBeforeModelOutput = hookOutput as BeforeModelOutput;
             if (
               hookBeforeModelOutput.hookSpecificOutput?.llm_request &&
-              'llm_request' in modifiedInput
+              "llm_request" in modifiedInput
             ) {
               // Merge the partial request with the existing request
-              const currentRequest = (modifiedInput as BeforeModelInput)
-                .llm_request;
-              const partialRequest =
-                hookBeforeModelOutput.hookSpecificOutput.llm_request;
+              const currentRequest = (modifiedInput as BeforeModelInput).llm_request;
+              const partialRequest = hookBeforeModelOutput.hookSpecificOutput.llm_request;
               (modifiedInput as BeforeModelInput).llm_request = {
                 ...currentRequest,
                 ...partialRequest,
@@ -184,10 +166,8 @@ export class HookRunner {
 
     return new Promise((resolve) => {
       if (!hookConfig.command) {
-        const errorMessage = 'Command hook missing command';
-        debugLogger.warn(
-          `Hook configuration error (non-fatal): ${errorMessage}`,
-        );
+        const errorMessage = "Command hook missing command";
+        debugLogger.warn(`Hook configuration error (non-fatal): ${errorMessage}`);
         resolve({
           hookConfig,
           eventName,
@@ -198,8 +178,8 @@ export class HookRunner {
         return;
       }
 
-      let stdout = '';
-      let stderr = '';
+      let stdout = "";
+      let stderr = "";
       let timedOut = false;
       const command = this.expandCommand(hookConfig.command, input);
 
@@ -213,28 +193,28 @@ export class HookRunner {
       const child = spawn(command, {
         env,
         cwd: input.cwd,
-        stdio: ['pipe', 'pipe', 'pipe'],
+        stdio: ["pipe", "pipe", "pipe"],
         shell: true,
       });
 
       // Set up timeout
       const timeoutHandle = setTimeout(() => {
         timedOut = true;
-        child.kill('SIGTERM');
+        child.kill("SIGTERM");
 
         // Force kill after 5 seconds
         setTimeout(() => {
           if (!child.killed) {
-            child.kill('SIGKILL');
+            child.kill("SIGKILL");
           }
         }, 5000);
       }, timeout);
 
       // Send input to stdin
       if (child.stdin) {
-        child.stdin.on('error', (err: NodeJS.ErrnoException) => {
+        child.stdin.on("error", (err: NodeJS.ErrnoException) => {
           // Ignore EPIPE errors which happen when the child process closes stdin early
-          if (err.code !== 'EPIPE') {
+          if (err.code !== "EPIPE") {
             debugLogger.warn(`Hook stdin error: ${err}`);
           }
         });
@@ -246,24 +226,24 @@ export class HookRunner {
           child.stdin.end();
         } catch (err) {
           // Ignore EPIPE errors which happen when the child process closes stdin early
-          if (err instanceof Error && 'code' in err && err.code !== 'EPIPE') {
+          if (err instanceof Error && "code" in err && err.code !== "EPIPE") {
             debugLogger.warn(`Hook stdin write error: ${err}`);
           }
         }
       }
 
       // Collect stdout
-      child.stdout?.on('data', (data: Buffer) => {
+      child.stdout?.on("data", (data: Buffer) => {
         stdout += data.toString();
       });
 
       // Collect stderr
-      child.stderr?.on('data', (data: Buffer) => {
+      child.stderr?.on("data", (data: Buffer) => {
         stderr += data.toString();
       });
 
       // Handle process exit
-      child.on('close', (exitCode) => {
+      child.on("close", (exitCode) => {
         clearTimeout(timeoutHandle);
         const duration = Date.now() - startTime;
 
@@ -285,7 +265,7 @@ export class HookRunner {
         if (exitCode === EXIT_CODE_SUCCESS && stdout.trim()) {
           try {
             let parsed = JSON.parse(stdout.trim());
-            if (typeof parsed === 'string') {
+            if (typeof parsed === "string") {
               // If the output is a string, parse it in case
               // it's double-encoded JSON string.
               parsed = JSON.parse(parsed);
@@ -318,7 +298,7 @@ export class HookRunner {
       });
 
       // Handle process errors
-      child.on('error', (error) => {
+      child.on("error", (error) => {
         clearTimeout(timeoutHandle);
         const duration = Date.now() - startTime;
 
@@ -347,26 +327,23 @@ export class HookRunner {
   /**
    * Convert plain text output to structured HookOutput
    */
-  private convertPlainTextToHookOutput(
-    text: string,
-    exitCode: number,
-  ): HookOutput {
+  private convertPlainTextToHookOutput(text: string, exitCode: number): HookOutput {
     if (exitCode === EXIT_CODE_SUCCESS) {
       // Success - treat as system message or additional context
       return {
-        decision: 'allow',
+        decision: "allow",
         systemMessage: text,
       };
     } else if (exitCode === EXIT_CODE_BLOCKING_ERROR) {
       // Blocking error
       return {
-        decision: 'deny',
+        decision: "deny",
         reason: text,
       };
     } else {
       // Non-blocking error (EXIT_CODE_NON_BLOCKING_ERROR or any other code)
       return {
-        decision: 'allow',
+        decision: "allow",
         systemMessage: `Warning: ${text}`,
       };
     }
diff --git a/packages/gemini-cli-core/src/hooks/hookSystem.test.ts b/packages/gemini-cli-core/src/hooks/hookSystem.test.ts
index 94a350ec4..f8bb8ace9 100644
--- a/packages/gemini-cli-core/src/hooks/hookSystem.test.ts
+++ b/packages/gemini-cli-core/src/hooks/hookSystem.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { HookSystem } from './hookSystem.js';
-import { Config } from '../config/config.js';
-import { HookType } from './types.js';
-import { spawn } from 'node:child_process';
-import type { ChildProcessWithoutNullStreams } from 'node:child_process';
-import type { Readable, Writable } from 'node:stream';
+import type { ChildProcessWithoutNullStreams } from "node:child_process";
+import { spawn } from "node:child_process";
+import type { Readable, Writable } from "node:stream";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { HookSystem } from "./hookSystem.js";
+import { HookType } from "./types.js";
 
 // Mock type for the child_process spawn
 type MockChildProcessWithoutNullStreams = ChildProcessWithoutNullStreams & {
@@ -20,7 +20,7 @@ type MockChildProcessWithoutNullStreams = ChildProcessWithoutNullStreams & {
 };
 
 // Mock child_process with importOriginal for partial mocking
-vi.mock('node:child_process', async (importOriginal) => {
+vi.mock("node:child_process", async (importOriginal) => {
   const actual = (await importOriginal()) as object;
   return {
     ...actual,
@@ -36,7 +36,7 @@ const mockDebugLogger = vi.hoisted(() => ({
   error: vi.fn(),
 }));
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: mockDebugLogger,
 }));
 
@@ -48,9 +48,9 @@ const mockConsole = {
   debug: vi.fn(),
 };
 
-vi.stubGlobal('console', mockConsole);
+vi.stubGlobal("console", mockConsole);
 
-describe('HookSystem Integration', () => {
+describe("HookSystem Integration", () => {
   let hookSystem: HookSystem;
   let config: Config;
   let mockSpawn: MockChildProcessWithoutNullStreams;
@@ -60,19 +60,19 @@ describe('HookSystem Integration', () => {
 
     // Create a real config with simple command hook configurations for testing
     config = new Config({
-      model: 'gemini-1.5-flash',
-      targetDir: '/tmp/test-hooks',
-      sessionId: 'test-session',
+      model: "gemini-1.5-flash",
+      targetDir: "/tmp/test-hooks",
+      sessionId: "test-session",
       debugMode: false,
-      cwd: '/tmp/test-hooks',
+      cwd: "/tmp/test-hooks",
       hooks: {
         BeforeTool: [
           {
-            matcher: 'TestTool',
+            matcher: "TestTool",
             hooks: [
               {
                 type: HookType.Command,
-                command: 'echo',
+                command: "echo",
                 timeout: 5000,
               },
             ],
@@ -82,8 +82,7 @@ describe('HookSystem Integration', () => {
     });
 
     // Provide getMessageBus mock for MessageBus integration tests
-    (config as unknown as { getMessageBus: () => unknown }).getMessageBus =
-      () => undefined;
+    (config as unknown as { getMessageBus: () => unknown }).getMessageBus = () => undefined;
 
     hookSystem = new HookSystem(config);
 
@@ -119,13 +118,11 @@ describe('HookSystem Integration', () => {
     // No cleanup needed
   });
 
-  describe('initialize', () => {
-    it('should initialize successfully', async () => {
+  describe("initialize", () => {
+    it("should initialize successfully", async () => {
       await hookSystem.initialize();
 
-      expect(mockDebugLogger.debug).toHaveBeenCalledWith(
-        'Hook system initialized successfully',
-      );
+      expect(mockDebugLogger.debug).toHaveBeenCalledWith("Hook system initialized successfully");
 
       // Verify system is initialized
       const status = hookSystem.getStatus();
@@ -133,31 +130,29 @@ describe('HookSystem Integration', () => {
       // Note: totalHooks might be 0 if hook validation rejects the test hooks
     });
 
-    it('should not initialize twice', async () => {
+    it("should not initialize twice", async () => {
       await hookSystem.initialize();
       await hookSystem.initialize(); // Second call should be no-op
 
       // The system logs both registry initialization and system initialization
-      expect(mockDebugLogger.debug).toHaveBeenCalledWith(
-        'Hook system initialized successfully',
-      );
+      expect(mockDebugLogger.debug).toHaveBeenCalledWith("Hook system initialized successfully");
     });
 
-    it('should handle initialization errors gracefully', async () => {
+    it("should handle initialization errors gracefully", async () => {
       // Create a config with invalid hooks to trigger initialization errors
       const invalidConfig = new Config({
-        model: 'gemini-1.5-flash',
-        targetDir: '/tmp/test-hooks-invalid',
-        sessionId: 'test-session-invalid',
+        model: "gemini-1.5-flash",
+        targetDir: "/tmp/test-hooks-invalid",
+        sessionId: "test-session-invalid",
         debugMode: false,
-        cwd: '/tmp/test-hooks-invalid',
+        cwd: "/tmp/test-hooks-invalid",
         hooks: {
           BeforeTool: [
             {
               hooks: [
                 {
-                  type: 'invalid-type' as HookType, // Invalid hook type for testing
-                  command: './test.sh',
+                  type: "invalid-type" as HookType, // Invalid hook type for testing
+                  command: "./test.sh",
                 },
               ],
             },
@@ -174,22 +169,22 @@ describe('HookSystem Integration', () => {
     });
   });
 
-  describe('getEventHandler', () => {
-    it('should return event bus when initialized', async () => {
+  describe("getEventHandler", () => {
+    it("should return event bus when initialized", async () => {
       await hookSystem.initialize();
 
       // Set up spawn mock behavior for successful execution
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
-            setTimeout(() => callback(Buffer.from('')), 5); // echo outputs empty
+          if (event === "data") {
+            setTimeout(() => callback(Buffer.from("")), 5); // echo outputs empty
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 10);
           }
         },
@@ -199,35 +194,33 @@ describe('HookSystem Integration', () => {
       expect(eventBus).toBeDefined();
 
       // Test that the event bus can actually fire events
-      const result = await eventBus.fireBeforeToolEvent('TestTool', {
-        test: 'data',
+      const result = await eventBus.fireBeforeToolEvent("TestTool", {
+        test: "data",
       });
       expect(result.success).toBe(true);
     });
 
-    it('should throw error when not initialized', () => {
-      expect(() => hookSystem.getEventHandler()).toThrow(
-        'Hook system not initialized',
-      );
+    it("should throw error when not initialized", () => {
+      expect(() => hookSystem.getEventHandler()).toThrow("Hook system not initialized");
     });
   });
 
-  describe('hook execution', () => {
-    it('should execute hooks and return results', async () => {
+  describe("hook execution", () => {
+    it("should execute hooks and return results", async () => {
       await hookSystem.initialize();
 
       // Set up spawn mock behavior for successful execution
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
-            setTimeout(() => callback(Buffer.from('')), 5); // echo outputs empty
+          if (event === "data") {
+            setTimeout(() => callback(Buffer.from("")), 5); // echo outputs empty
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 10);
           }
         },
@@ -236,8 +229,8 @@ describe('HookSystem Integration', () => {
       const eventBus = hookSystem.getEventHandler();
 
       // Test BeforeTool event with command hook
-      const result = await eventBus.fireBeforeToolEvent('TestTool', {
-        test: 'data',
+      const result = await eventBus.fireBeforeToolEvent("TestTool", {
+        test: "data",
       });
 
       expect(result.success).toBe(true);
@@ -245,14 +238,14 @@ describe('HookSystem Integration', () => {
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should handle no matching hooks', async () => {
+    it("should handle no matching hooks", async () => {
       await hookSystem.initialize();
 
       const eventBus = hookSystem.getEventHandler();
 
       // Test with a tool that doesn't match any hooks
-      const result = await eventBus.fireBeforeToolEvent('UnmatchedTool', {
-        test: 'data',
+      const result = await eventBus.fireBeforeToolEvent("UnmatchedTool", {
+        test: "data",
       });
 
       expect(result.success).toBe(true);
@@ -261,37 +254,37 @@ describe('HookSystem Integration', () => {
     });
   });
 
-  describe('system management', () => {
-    it('should return correct status when initialized', async () => {
+  describe("system management", () => {
+    it("should return correct status when initialized", async () => {
       await hookSystem.initialize();
 
       const status = hookSystem.getStatus();
 
       expect(status.initialized).toBe(true);
       // Note: totalHooks might be 0 if hook validation rejects the test hooks
-      expect(typeof status.totalHooks).toBe('number');
+      expect(typeof status.totalHooks).toBe("number");
     });
 
-    it('should return uninitialized status', () => {
+    it("should return uninitialized status", () => {
       const status = hookSystem.getStatus();
 
       expect(status.initialized).toBe(false);
     });
   });
 
-  describe('hook disabling via settings', () => {
-    it('should not execute disabled hooks from settings', async () => {
+  describe("hook disabling via settings", () => {
+    it("should not execute disabled hooks from settings", async () => {
       // Create config with two hooks, one enabled and one disabled via settings
       const configWithDisabled = new Config({
-        model: 'gemini-1.5-flash',
-        targetDir: '/tmp/test-hooks-disabled',
-        sessionId: 'test-session-disabled',
+        model: "gemini-1.5-flash",
+        targetDir: "/tmp/test-hooks-disabled",
+        sessionId: "test-session-disabled",
         debugMode: false,
-        cwd: '/tmp/test-hooks-disabled',
+        cwd: "/tmp/test-hooks-disabled",
         hooks: {
           BeforeTool: [
             {
-              matcher: 'TestTool',
+              matcher: "TestTool",
               hooks: [
                 {
                   type: HookType.Command,
@@ -310,9 +303,8 @@ describe('HookSystem Integration', () => {
         },
       });
 
-      (
-        configWithDisabled as unknown as { getMessageBus: () => unknown }
-      ).getMessageBus = () => undefined;
+      (configWithDisabled as unknown as { getMessageBus: () => unknown }).getMessageBus = () =>
+        undefined;
 
       const systemWithDisabled = new HookSystem(configWithDisabled);
       await systemWithDisabled.initialize();
@@ -321,24 +313,24 @@ describe('HookSystem Integration', () => {
       let executionCount = 0;
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             executionCount++;
-            setTimeout(() => callback(Buffer.from('output')), 5);
+            setTimeout(() => callback(Buffer.from("output")), 5);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 10);
           }
         },
       );
 
       const eventBus = systemWithDisabled.getEventHandler();
-      const result = await eventBus.fireBeforeToolEvent('TestTool', {
-        test: 'data',
+      const result = await eventBus.fireBeforeToolEvent("TestTool", {
+        test: "data",
       });
 
       expect(result.success).toBe(true);
@@ -347,19 +339,19 @@ describe('HookSystem Integration', () => {
     });
   });
 
-  describe('hook disabling via command', () => {
-    it('should disable hook when setHookEnabled is called', async () => {
+  describe("hook disabling via command", () => {
+    it("should disable hook when setHookEnabled is called", async () => {
       // Create config with a hook
       const configForDisabling = new Config({
-        model: 'gemini-1.5-flash',
-        targetDir: '/tmp/test-hooks-setEnabled',
-        sessionId: 'test-session-setEnabled',
+        model: "gemini-1.5-flash",
+        targetDir: "/tmp/test-hooks-setEnabled",
+        sessionId: "test-session-setEnabled",
         debugMode: false,
-        cwd: '/tmp/test-hooks-setEnabled',
+        cwd: "/tmp/test-hooks-setEnabled",
         hooks: {
           BeforeTool: [
             {
-              matcher: 'TestTool',
+              matcher: "TestTool",
               hooks: [
                 {
                   type: HookType.Command,
@@ -372,9 +364,8 @@ describe('HookSystem Integration', () => {
         },
       });
 
-      (
-        configForDisabling as unknown as { getMessageBus: () => unknown }
-      ).getMessageBus = () => undefined;
+      (configForDisabling as unknown as { getMessageBus: () => unknown }).getMessageBus = () =>
+        undefined;
 
       const systemForDisabling = new HookSystem(configForDisabling);
       await systemForDisabling.initialize();
@@ -383,24 +374,24 @@ describe('HookSystem Integration', () => {
       let executionCount = 0;
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             executionCount++;
-            setTimeout(() => callback(Buffer.from('output')), 5);
+            setTimeout(() => callback(Buffer.from("output")), 5);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 10);
           }
         },
       );
 
       const eventBus = systemForDisabling.getEventHandler();
-      const result1 = await eventBus.fireBeforeToolEvent('TestTool', {
-        test: 'data',
+      const result1 = await eventBus.fireBeforeToolEvent("TestTool", {
+        test: "data",
       });
 
       expect(result1.success).toBe(true);
@@ -413,8 +404,8 @@ describe('HookSystem Integration', () => {
       executionCount = 0;
 
       // Second execution - hook should NOT run
-      const result2 = await eventBus.fireBeforeToolEvent('TestTool', {
-        test: 'data',
+      const result2 = await eventBus.fireBeforeToolEvent("TestTool", {
+        test: "data",
       });
 
       expect(result2.success).toBe(true);
@@ -428,8 +419,8 @@ describe('HookSystem Integration', () => {
       executionCount = 0;
 
       // Third execution - hook should run again
-      const result3 = await eventBus.fireBeforeToolEvent('TestTool', {
-        test: 'data',
+      const result3 = await eventBus.fireBeforeToolEvent("TestTool", {
+        test: "data",
       });
 
       expect(result3.success).toBe(true);
diff --git a/packages/gemini-cli-core/src/hooks/hookSystem.ts b/packages/gemini-cli-core/src/hooks/hookSystem.ts
index 596b1ecef..f4b7b3b9f 100644
--- a/packages/gemini-cli-core/src/hooks/hookSystem.ts
+++ b/packages/gemini-cli-core/src/hooks/hookSystem.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { HookRegistry } from './hookRegistry.js';
-import { HookRunner } from './hookRunner.js';
-import { HookAggregator } from './hookAggregator.js';
-import { HookPlanner } from './hookPlanner.js';
-import { HookEventHandler } from './hookEventHandler.js';
-import type { HookRegistryEntry } from './hookRegistry.js';
-import { logs, type Logger } from '@opentelemetry/api-logs';
-import { SERVICE_NAME } from '../telemetry/constants.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { type Logger, logs } from "@opentelemetry/api-logs";
+import type { Config } from "../config/config.js";
+import { SERVICE_NAME } from "../telemetry/constants.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { HookAggregator } from "./hookAggregator.js";
+import { HookEventHandler } from "./hookEventHandler.js";
+import { HookPlanner } from "./hookPlanner.js";
+import type { HookRegistryEntry } from "./hookRegistry.js";
+import { HookRegistry } from "./hookRegistry.js";
+import { HookRunner } from "./hookRunner.js";
 
 /**
  * Main hook system that coordinates all hook-related functionality
@@ -55,7 +55,7 @@ export class HookSystem {
 
     await this.hookRegistry.initialize();
     this.initialized = true;
-    debugLogger.debug('Hook system initialized successfully');
+    debugLogger.debug("Hook system initialized successfully");
   }
 
   /**
@@ -63,7 +63,7 @@ export class HookSystem {
    */
   getEventHandler(): HookEventHandler {
     if (!this.initialized) {
-      throw new Error('Hook system not initialized');
+      throw new Error("Hook system not initialized");
     }
     return this.hookEventHandler;
   }
diff --git a/packages/gemini-cli-core/src/hooks/hookTranslator.test.ts b/packages/gemini-cli-core/src/hooks/hookTranslator.test.ts
index 785cadfc4..d68feff44 100644
--- a/packages/gemini-cli-core/src/hooks/hookTranslator.test.ts
+++ b/packages/gemini-cli-core/src/hooks/hookTranslator.test.ts
@@ -4,42 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import {
-  HookTranslatorGenAIv1,
-  defaultHookTranslator,
-  type LLMRequest,
-  type LLMResponse,
-  type HookToolConfig,
-} from './hookTranslator.js';
 import type {
+  ContentListUnion,
   GenerateContentParameters,
   GenerateContentResponse,
   ToolConfig,
-  ContentListUnion,
-} from '@google/genai';
+} from "@google/genai";
+import { beforeEach, describe, expect, it } from "vitest";
+import {
+  defaultHookTranslator,
+  type HookToolConfig,
+  HookTranslatorGenAIv1,
+  type LLMRequest,
+  type LLMResponse,
+} from "./hookTranslator.js";
 
-describe('HookTranslator', () => {
+describe("HookTranslator", () => {
   let translator: HookTranslatorGenAIv1;
 
   beforeEach(() => {
     translator = new HookTranslatorGenAIv1();
   });
 
-  describe('defaultHookTranslator', () => {
-    it('should be an instance of HookTranslatorGenAIv1', () => {
+  describe("defaultHookTranslator", () => {
+    it("should be an instance of HookTranslatorGenAIv1", () => {
       expect(defaultHookTranslator).toBeInstanceOf(HookTranslatorGenAIv1);
     });
   });
 
-  describe('LLM Request Translation', () => {
-    it('should convert SDK request to hook format', () => {
+  describe("LLM Request Translation", () => {
+    it("should convert SDK request to hook format", () => {
       const sdkRequest: GenerateContentParameters = {
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         contents: [
           {
-            role: 'user',
-            parts: [{ text: 'Hello world' }],
+            role: "user",
+            parts: [{ text: "Hello world" }],
           },
         ],
         config: {
@@ -51,11 +51,11 @@ describe('HookTranslator', () => {
       const hookRequest = translator.toHookLLMRequest(sdkRequest);
 
       expect(hookRequest).toEqual({
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         messages: [
           {
-            role: 'user',
-            content: 'Hello world',
+            role: "user",
+            content: "Hello world",
           },
         ],
         config: {
@@ -67,25 +67,25 @@ describe('HookTranslator', () => {
       });
     });
 
-    it('should handle string contents', () => {
+    it("should handle string contents", () => {
       const sdkRequest: GenerateContentParameters = {
-        model: 'gemini-1.5-flash',
-        contents: ['Simple string message'],
+        model: "gemini-1.5-flash",
+        contents: ["Simple string message"],
       } as unknown as GenerateContentParameters;
 
       const hookRequest = translator.toHookLLMRequest(sdkRequest);
 
       expect(hookRequest.messages).toEqual([
         {
-          role: 'user',
-          content: 'Simple string message',
+          role: "user",
+          content: "Simple string message",
         },
       ]);
     });
 
-    it('should handle conversion errors gracefully', () => {
+    it("should handle conversion errors gracefully", () => {
       const sdkRequest: GenerateContentParameters = {
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         contents: [null as unknown as ContentListUnion], // Invalid content
       } as unknown as GenerateContentParameters;
 
@@ -93,16 +93,16 @@ describe('HookTranslator', () => {
 
       // When contents are invalid, the translator skips them and returns empty messages
       expect(hookRequest.messages).toEqual([]);
-      expect(hookRequest.model).toBe('gemini-1.5-flash');
+      expect(hookRequest.model).toBe("gemini-1.5-flash");
     });
 
-    it('should convert hook request back to SDK format', () => {
+    it("should convert hook request back to SDK format", () => {
       const hookRequest: LLMRequest = {
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         messages: [
           {
-            role: 'user',
-            content: 'Hello world',
+            role: "user",
+            content: "Hello world",
           },
         ],
         config: {
@@ -113,27 +113,27 @@ describe('HookTranslator', () => {
 
       const sdkRequest = translator.fromHookLLMRequest(hookRequest);
 
-      expect(sdkRequest.model).toBe('gemini-1.5-flash');
+      expect(sdkRequest.model).toBe("gemini-1.5-flash");
       expect(sdkRequest.contents).toEqual([
         {
-          role: 'user',
-          parts: [{ text: 'Hello world' }],
+          role: "user",
+          parts: [{ text: "Hello world" }],
         },
       ]);
     });
   });
 
-  describe('LLM Response Translation', () => {
-    it('should convert SDK response to hook format', () => {
+  describe("LLM Response Translation", () => {
+    it("should convert SDK response to hook format", () => {
       const sdkResponse: GenerateContentResponse = {
-        text: 'Hello response',
+        text: "Hello response",
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'Hello response' }],
+              role: "model",
+              parts: [{ text: "Hello response" }],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
             index: 0,
           },
         ],
@@ -147,14 +147,14 @@ describe('HookTranslator', () => {
       const hookResponse = translator.toHookLLMResponse(sdkResponse);
 
       expect(hookResponse).toEqual({
-        text: 'Hello response',
+        text: "Hello response",
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['Hello response'],
+              role: "model",
+              parts: ["Hello response"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
             index: 0,
             safetyRatings: undefined,
           },
@@ -167,62 +167,60 @@ describe('HookTranslator', () => {
       });
     });
 
-    it('should convert hook response back to SDK format', () => {
+    it("should convert hook response back to SDK format", () => {
       const hookResponse: LLMResponse = {
-        text: 'Hello response',
+        text: "Hello response",
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['Hello response'],
+              role: "model",
+              parts: ["Hello response"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
 
       const sdkResponse = translator.fromHookLLMResponse(hookResponse);
 
-      expect(sdkResponse.text).toBe('Hello response');
+      expect(sdkResponse.text).toBe("Hello response");
       expect(sdkResponse.candidates).toHaveLength(1);
-      expect(sdkResponse.candidates?.[0]?.content?.parts?.[0]?.text).toBe(
-        'Hello response',
-      );
+      expect(sdkResponse.candidates?.[0]?.content?.parts?.[0]?.text).toBe("Hello response");
     });
   });
 
-  describe('Tool Config Translation', () => {
-    it('should convert SDK tool config to hook format', () => {
+  describe("Tool Config Translation", () => {
+    it("should convert SDK tool config to hook format", () => {
       const sdkToolConfig = {
         functionCallingConfig: {
-          mode: 'ANY',
-          allowedFunctionNames: ['tool1', 'tool2'],
+          mode: "ANY",
+          allowedFunctionNames: ["tool1", "tool2"],
         },
       } as unknown as ToolConfig;
 
       const hookToolConfig = translator.toHookToolConfig(sdkToolConfig);
 
       expect(hookToolConfig).toEqual({
-        mode: 'ANY',
-        allowedFunctionNames: ['tool1', 'tool2'],
+        mode: "ANY",
+        allowedFunctionNames: ["tool1", "tool2"],
       });
     });
 
-    it('should convert hook tool config back to SDK format', () => {
+    it("should convert hook tool config back to SDK format", () => {
       const hookToolConfig: HookToolConfig = {
-        mode: 'AUTO',
-        allowedFunctionNames: ['tool1', 'tool2'],
+        mode: "AUTO",
+        allowedFunctionNames: ["tool1", "tool2"],
       };
 
       const sdkToolConfig = translator.fromHookToolConfig(hookToolConfig);
 
       expect(sdkToolConfig.functionCallingConfig).toEqual({
-        mode: 'AUTO',
-        allowedFunctionNames: ['tool1', 'tool2'],
+        mode: "AUTO",
+        allowedFunctionNames: ["tool1", "tool2"],
       });
     });
 
-    it('should handle undefined tool config', () => {
+    it("should handle undefined tool config", () => {
       const sdkToolConfig = {} as ToolConfig;
 
       const hookToolConfig = translator.toHookToolConfig(sdkToolConfig);
diff --git a/packages/gemini-cli-core/src/hooks/hookTranslator.ts b/packages/gemini-cli-core/src/hooks/hookTranslator.ts
index 9cbcd903f..fe468e120 100644
--- a/packages/gemini-cli-core/src/hooks/hookTranslator.ts
+++ b/packages/gemini-cli-core/src/hooks/hookTranslator.ts
@@ -5,13 +5,13 @@
  */
 
 import type {
-  GenerateContentResponse,
-  GenerateContentParameters,
-  ToolConfig,
   FinishReason,
   FunctionCallingConfig,
-} from '@google/genai';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
+  GenerateContentParameters,
+  GenerateContentResponse,
+  ToolConfig,
+} from "@google/genai";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
 
 /**
  * Decoupled LLM request format - stable across Gemini CLI versions
@@ -19,7 +19,7 @@ import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
 export interface LLMRequest {
   model: string;
   messages: Array<{
-    role: 'user' | 'model' | 'system';
+    role: "user" | "model" | "system";
     content: string | Array<{ type: string; [key: string]: unknown }>;
   }>;
   config?: {
@@ -43,10 +43,10 @@ export interface LLMResponse {
   text?: string;
   candidates: Array<{
     content: {
-      role: 'model';
+      role: "model";
       parts: string[];
     };
-    finishReason?: 'STOP' | 'MAX_TOKENS' | 'SAFETY' | 'RECITATION' | 'OTHER';
+    finishReason?: "STOP" | "MAX_TOKENS" | "SAFETY" | "RECITATION" | "OTHER";
     index?: number;
     safetyRatings?: Array<{
       category: string;
@@ -65,7 +65,7 @@ export interface LLMResponse {
  * Decoupled tool configuration - stable across Gemini CLI versions
  */
 export interface HookToolConfig {
-  mode?: 'AUTO' | 'ANY' | 'NONE';
+  mode?: "AUTO" | "ANY" | "NONE";
   allowedFunctionNames?: string[];
 }
 
@@ -79,9 +79,7 @@ export abstract class HookTranslator {
     baseRequest?: GenerateContentParameters,
   ): GenerateContentParameters;
   abstract toHookLLMResponse(sdkResponse: GenerateContentResponse): LLMResponse;
-  abstract fromHookLLMResponse(
-    hookResponse: LLMResponse,
-  ): GenerateContentResponse;
+  abstract fromHookLLMResponse(hookResponse: LLMResponse): GenerateContentResponse;
   abstract toHookToolConfig(sdkToolConfig: ToolConfig): HookToolConfig;
   abstract fromHookToolConfig(hookToolConfig: HookToolConfig): ToolConfig;
 }
@@ -91,25 +89,18 @@ export abstract class HookTranslator {
  */
 function hasTextProperty(value: unknown): value is { text: string } {
   return (
-    typeof value === 'object' &&
+    typeof value === "object" &&
     value !== null &&
-    'text' in value &&
-    typeof (value as { text: unknown }).text === 'string'
+    "text" in value &&
+    typeof (value as { text: unknown }).text === "string"
   );
 }
 
 /**
  * Type guard to check if content has role and parts properties
  */
-function isContentWithParts(
-  content: unknown,
-): content is { role: string; parts: unknown } {
-  return (
-    typeof content === 'object' &&
-    content !== null &&
-    'role' in content &&
-    'parts' in content
-  );
+function isContentWithParts(content: unknown): content is { role: string; parts: unknown } {
+  return typeof content === "object" && content !== null && "role" in content && "parts" in content;
 }
 
 /**
@@ -126,7 +117,7 @@ function extractGenerationConfig(request: GenerateContentParameters):
   | undefined {
   // Access the config field which contains generation settings
   // Use type assertion after checking the field exists
-  if (request.config && typeof request.config === 'object') {
+  if (request.config && typeof request.config === "object") {
     const config = request.config as {
       temperature?: number;
       maxOutputTokens?: number;
@@ -159,7 +150,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
    * Future versions may expose additional content types if needed.
    */
   toHookLLMRequest(sdkRequest: GenerateContentParameters): LLMRequest {
-    const messages: LLMRequest['messages'] = [];
+    const messages: LLMRequest["messages"] = [];
 
     // Convert contents to messages format (simplified)
     if (sdkRequest.contents) {
@@ -168,28 +159,26 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
         : [sdkRequest.contents];
 
       for (const content of contents) {
-        if (typeof content === 'string') {
+        if (typeof content === "string") {
           messages.push({
-            role: 'user',
+            role: "user",
             content,
           });
         } else if (isContentWithParts(content)) {
           const role =
-            content.role === 'model'
-              ? ('model' as const)
-              : content.role === 'system'
-                ? ('system' as const)
-                : ('user' as const);
+            content.role === "model"
+              ? ("model" as const)
+              : content.role === "system"
+                ? ("system" as const)
+                : ("user" as const);
 
-          const parts = Array.isArray(content.parts)
-            ? content.parts
-            : [content.parts];
+          const parts = Array.isArray(content.parts) ? content.parts : [content.parts];
 
           // Extract only text parts - intentionally filtering out non-text content
           const textContent = parts
             .filter(hasTextProperty)
             .map((part) => part.text)
-            .join('');
+            .join("");
 
           // Only add message if there's text content
           if (textContent) {
@@ -226,13 +215,10 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
   ): GenerateContentParameters {
     // Convert hook messages back to SDK Content format
     const contents = hookRequest.messages.map((message) => ({
-      role: message.role === 'model' ? 'model' : message.role,
+      role: message.role === "model" ? "model" : message.role,
       parts: [
         {
-          text:
-            typeof message.content === 'string'
-              ? message.content
-              : String(message.content),
+          text: typeof message.content === "string" ? message.content : String(message.content),
         },
       ],
     }));
@@ -246,9 +232,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
 
     // Add generation config if it exists in the hook request
     if (hookRequest.config) {
-      const baseConfig = baseRequest
-        ? extractGenerationConfig(baseRequest)
-        : undefined;
+      const baseConfig = baseRequest ? extractGenerationConfig(baseRequest) : undefined;
 
       result.config = {
         ...baseConfig,
@@ -256,7 +240,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
         maxOutputTokens: hookRequest.config.maxOutputTokens,
         topP: hookRequest.config.topP,
         topK: hookRequest.config.topK,
-      } as GenerateContentParameters['config'];
+      } as GenerateContentParameters["config"];
     }
 
     return result;
@@ -271,29 +255,25 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
       candidates: (sdkResponse.candidates || []).map((candidate) => {
         // Extract text parts from the candidate
         const textParts =
-          candidate.content?.parts
-            ?.filter(hasTextProperty)
-            .map((part) => part.text) || [];
+          candidate.content?.parts?.filter(hasTextProperty).map((part) => part.text) || [];
 
         return {
           content: {
-            role: 'model' as const,
+            role: "model" as const,
             parts: textParts,
           },
-          finishReason:
-            candidate.finishReason as LLMResponse['candidates'][0]['finishReason'],
+          finishReason: candidate.finishReason as LLMResponse["candidates"][0]["finishReason"],
           index: candidate.index,
           safetyRatings: candidate.safetyRatings?.map((rating) => ({
-            category: String(rating.category || ''),
-            probability: String(rating.probability || ''),
+            category: String(rating.category || ""),
+            probability: String(rating.probability || ""),
           })),
         };
       }),
       usageMetadata: sdkResponse.usageMetadata
         ? {
             promptTokenCount: sdkResponse.usageMetadata.promptTokenCount,
-            candidatesTokenCount:
-              sdkResponse.usageMetadata.candidatesTokenCount,
+            candidatesTokenCount: sdkResponse.usageMetadata.candidatesTokenCount,
             totalTokenCount: sdkResponse.usageMetadata.totalTokenCount,
           }
         : undefined,
@@ -309,7 +289,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
       text: hookResponse.text,
       candidates: hookResponse.candidates.map((candidate) => ({
         content: {
-          role: 'model',
+          role: "model",
           parts: candidate.content.parts.map((part) => ({
             text: part,
           })),
@@ -329,9 +309,8 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
    */
   toHookToolConfig(sdkToolConfig: ToolConfig): HookToolConfig {
     return {
-      mode: sdkToolConfig.functionCallingConfig?.mode as HookToolConfig['mode'],
-      allowedFunctionNames:
-        sdkToolConfig.functionCallingConfig?.allowedFunctionNames,
+      mode: sdkToolConfig.functionCallingConfig?.mode as HookToolConfig["mode"],
+      allowedFunctionNames: sdkToolConfig.functionCallingConfig?.allowedFunctionNames,
     };
   }
 
diff --git a/packages/gemini-cli-core/src/hooks/index.ts b/packages/gemini-cli-core/src/hooks/index.ts
index a2346a397..ce83f32ec 100644
--- a/packages/gemini-cli-core/src/hooks/index.ts
+++ b/packages/gemini-cli-core/src/hooks/index.ts
@@ -4,26 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Export types
-export * from './types.js';
-
-// Export core components
-export { HookSystem } from './hookSystem.js';
-export { HookRegistry } from './hookRegistry.js';
-export { HookRunner } from './hookRunner.js';
-export { HookAggregator } from './hookAggregator.js';
-export { HookPlanner } from './hookPlanner.js';
-export { HookEventHandler } from './hookEventHandler.js';
-
-// Export interfaces and enums
-export type { HookRegistryEntry } from './hookRegistry.js';
-export { ConfigSource } from './hookRegistry.js';
-export type { AggregatedHookResult } from './hookAggregator.js';
-export type { HookEventContext } from './hookPlanner.js';
-
 // Export hook trigger functions
 export {
-  fireSessionStartHook,
-  fireSessionEndHook,
   firePreCompressHook,
-} from '../core/sessionHookTriggers.js';
+  fireSessionEndHook,
+  fireSessionStartHook,
+} from "../core/sessionHookTriggers.js";
+export type { AggregatedHookResult } from "./hookAggregator.js";
+export { HookAggregator } from "./hookAggregator.js";
+export { HookEventHandler } from "./hookEventHandler.js";
+export type { HookEventContext } from "./hookPlanner.js";
+export { HookPlanner } from "./hookPlanner.js";
+// Export interfaces and enums
+export type { HookRegistryEntry } from "./hookRegistry.js";
+export { ConfigSource, HookRegistry } from "./hookRegistry.js";
+export { HookRunner } from "./hookRunner.js";
+// Export core components
+export { HookSystem } from "./hookSystem.js";
+// Export types
+export * from "./types.js";
diff --git a/packages/gemini-cli-core/src/hooks/types.test.ts b/packages/gemini-cli-core/src/hooks/types.test.ts
index 8853b5a10..e01b30f0d 100644
--- a/packages/gemini-cli-core/src/hooks/types.test.ts
+++ b/packages/gemini-cli-core/src/hooks/types.test.ts
@@ -4,56 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
+import type { GenerateContentParameters, GenerateContentResponse, ToolConfig } from "@google/genai";
+import { describe, expect, it, vi } from "vitest";
+import type { LLMRequest, LLMResponse } from "./hookTranslator.js";
+import { defaultHookTranslator } from "./hookTranslator.js";
+import type { HookDecision } from "./types.js";
 import {
-  createHookOutput,
-  DefaultHookOutput,
-  BeforeToolHookOutput,
+  AfterModelHookOutput,
   BeforeModelHookOutput,
+  BeforeToolHookOutput,
   BeforeToolSelectionHookOutput,
-  AfterModelHookOutput,
+  createHookOutput,
+  DefaultHookOutput,
   HookEventName,
   HookType,
-} from './types.js';
-import { defaultHookTranslator } from './hookTranslator.js';
-import type {
-  GenerateContentParameters,
-  GenerateContentResponse,
-  ToolConfig,
-} from '@google/genai';
-import type { LLMRequest, LLMResponse } from './hookTranslator.js';
-import type { HookDecision } from './types.js';
-
-vi.mock('./hookTranslator.js', () => ({
+} from "./types.js";
+
+vi.mock("./hookTranslator.js", () => ({
   defaultHookTranslator: {
     fromHookLLMResponse: vi.fn(
       (response: LLMResponse) => response as unknown as GenerateContentResponse,
     ),
-    fromHookLLMRequest: vi.fn(
-      (request: LLMRequest, target: GenerateContentParameters) => ({
-        ...target,
-        ...request,
-      }),
-    ),
+    fromHookLLMRequest: vi.fn((request: LLMRequest, target: GenerateContentParameters) => ({
+      ...target,
+      ...request,
+    })),
     fromHookToolConfig: vi.fn((config: ToolConfig) => config),
   },
 }));
 
-describe('Hook Types', () => {
-  describe('HookEventName', () => {
-    it('should contain all required event names', () => {
+describe("Hook Types", () => {
+  describe("HookEventName", () => {
+    it("should contain all required event names", () => {
       const expectedEvents = [
-        'BeforeTool',
-        'AfterTool',
-        'BeforeAgent',
-        'Notification',
-        'AfterAgent',
-        'SessionStart',
-        'SessionEnd',
-        'PreCompress',
-        'BeforeModel',
-        'AfterModel',
-        'BeforeToolSelection',
+        "BeforeTool",
+        "AfterTool",
+        "BeforeAgent",
+        "Notification",
+        "AfterAgent",
+        "SessionStart",
+        "SessionEnd",
+        "PreCompress",
+        "BeforeModel",
+        "AfterModel",
+        "BeforeToolSelection",
       ];
 
       for (const event of expectedEvents) {
@@ -62,49 +56,49 @@ describe('Hook Types', () => {
     });
   });
 
-  describe('HookType', () => {
-    it('should contain command type', () => {
-      expect(HookType.Command).toBe('command');
+  describe("HookType", () => {
+    it("should contain command type", () => {
+      expect(HookType.Command).toBe("command");
     });
   });
 });
 
-describe('Hook Output Classes', () => {
-  describe('createHookOutput', () => {
-    it('should return DefaultHookOutput for unknown event names', () => {
-      const output = createHookOutput('UnknownEvent', {});
+describe("Hook Output Classes", () => {
+  describe("createHookOutput", () => {
+    it("should return DefaultHookOutput for unknown event names", () => {
+      const output = createHookOutput("UnknownEvent", {});
       expect(output).toBeInstanceOf(DefaultHookOutput);
       expect(output).not.toBeInstanceOf(BeforeModelHookOutput);
       expect(output).not.toBeInstanceOf(AfterModelHookOutput);
       expect(output).not.toBeInstanceOf(BeforeToolSelectionHookOutput);
     });
 
-    it('should return BeforeModelHookOutput for BeforeModel event', () => {
+    it("should return BeforeModelHookOutput for BeforeModel event", () => {
       const output = createHookOutput(HookEventName.BeforeModel, {});
       expect(output).toBeInstanceOf(BeforeModelHookOutput);
     });
 
-    it('should return AfterModelHookOutput for AfterModel event', () => {
+    it("should return AfterModelHookOutput for AfterModel event", () => {
       const output = createHookOutput(HookEventName.AfterModel, {});
       expect(output).toBeInstanceOf(AfterModelHookOutput);
     });
 
-    it('should return BeforeToolSelectionHookOutput for BeforeToolSelection event', () => {
+    it("should return BeforeToolSelectionHookOutput for BeforeToolSelection event", () => {
       const output = createHookOutput(HookEventName.BeforeToolSelection, {});
       expect(output).toBeInstanceOf(BeforeToolSelectionHookOutput);
     });
   });
 
-  describe('DefaultHookOutput', () => {
-    it('should construct with provided data', () => {
+  describe("DefaultHookOutput", () => {
+    it("should construct with provided data", () => {
       const data = {
         continue: false,
-        stopReason: 'test stop',
+        stopReason: "test stop",
         suppressOutput: true,
-        systemMessage: 'test system message',
-        decision: 'block' as HookDecision,
-        reason: 'test reason',
-        hookSpecificOutput: { key: 'value' },
+        systemMessage: "test system message",
+        decision: "block" as HookDecision,
+        reason: "test reason",
+        hookSpecificOutput: { key: "value" },
       };
       const output = new DefaultHookOutput(data);
       expect(output.continue).toBe(data.continue);
@@ -116,164 +110,159 @@ describe('Hook Output Classes', () => {
       expect(output.hookSpecificOutput).toEqual(data.hookSpecificOutput);
     });
 
-    it('should return false for isBlockingDecision if decision is not block or deny', () => {
-      const output1 = new DefaultHookOutput({ decision: 'approve' });
+    it("should return false for isBlockingDecision if decision is not block or deny", () => {
+      const output1 = new DefaultHookOutput({ decision: "approve" });
       expect(output1.isBlockingDecision()).toBe(false);
       const output2 = new DefaultHookOutput({ decision: undefined });
       expect(output2.isBlockingDecision()).toBe(false);
     });
 
-    it('should return true for isBlockingDecision if decision is block or deny', () => {
-      const output1 = new DefaultHookOutput({ decision: 'block' });
+    it("should return true for isBlockingDecision if decision is block or deny", () => {
+      const output1 = new DefaultHookOutput({ decision: "block" });
       expect(output1.isBlockingDecision()).toBe(true);
-      const output2 = new DefaultHookOutput({ decision: 'deny' });
+      const output2 = new DefaultHookOutput({ decision: "deny" });
       expect(output2.isBlockingDecision()).toBe(true);
     });
 
-    it('should return true for shouldStopExecution if continue is false', () => {
+    it("should return true for shouldStopExecution if continue is false", () => {
       const output = new DefaultHookOutput({ continue: false });
       expect(output.shouldStopExecution()).toBe(true);
     });
 
-    it('should return false for shouldStopExecution if continue is true or undefined', () => {
+    it("should return false for shouldStopExecution if continue is true or undefined", () => {
       const output1 = new DefaultHookOutput({ continue: true });
       expect(output1.shouldStopExecution()).toBe(false);
       const output2 = new DefaultHookOutput({});
       expect(output2.shouldStopExecution()).toBe(false);
     });
 
-    it('should return reason if available', () => {
-      const output = new DefaultHookOutput({ reason: 'specific reason' });
-      expect(output.getEffectiveReason()).toBe('specific reason');
+    it("should return reason if available", () => {
+      const output = new DefaultHookOutput({ reason: "specific reason" });
+      expect(output.getEffectiveReason()).toBe("specific reason");
     });
 
-    it('should return stopReason if reason is not available', () => {
-      const output = new DefaultHookOutput({ stopReason: 'stop reason' });
-      expect(output.getEffectiveReason()).toBe('stop reason');
+    it("should return stopReason if reason is not available", () => {
+      const output = new DefaultHookOutput({ stopReason: "stop reason" });
+      expect(output.getEffectiveReason()).toBe("stop reason");
     });
 
     it('should return "No reason provided" if neither reason nor stopReason are available', () => {
       const output = new DefaultHookOutput({});
-      expect(output.getEffectiveReason()).toBe('No reason provided');
+      expect(output.getEffectiveReason()).toBe("No reason provided");
     });
 
-    it('applyLLMRequestModifications should return target unchanged', () => {
+    it("applyLLMRequestModifications should return target unchanged", () => {
       const target: GenerateContentParameters = {
-        model: 'gemini-pro',
+        model: "gemini-pro",
         contents: [],
       };
       const output = new DefaultHookOutput({});
       expect(output.applyLLMRequestModifications(target)).toBe(target);
     });
 
-    it('applyToolConfigModifications should return target unchanged', () => {
+    it("applyToolConfigModifications should return target unchanged", () => {
       const target = { toolConfig: {}, tools: [] };
       const output = new DefaultHookOutput({});
       expect(output.applyToolConfigModifications(target)).toBe(target);
     });
 
-    it('getAdditionalContext should return additionalContext if present', () => {
+    it("getAdditionalContext should return additionalContext if present", () => {
       const output = new DefaultHookOutput({
-        hookSpecificOutput: { additionalContext: 'some context' },
+        hookSpecificOutput: { additionalContext: "some context" },
       });
-      expect(output.getAdditionalContext()).toBe('some context');
+      expect(output.getAdditionalContext()).toBe("some context");
     });
 
-    it('getAdditionalContext should return undefined if additionalContext is not present', () => {
+    it("getAdditionalContext should return undefined if additionalContext is not present", () => {
       const output = new DefaultHookOutput({
-        hookSpecificOutput: { other: 'value' },
+        hookSpecificOutput: { other: "value" },
       });
       expect(output.getAdditionalContext()).toBeUndefined();
     });
 
-    it('getAdditionalContext should return undefined if hookSpecificOutput is undefined', () => {
+    it("getAdditionalContext should return undefined if hookSpecificOutput is undefined", () => {
       const output = new DefaultHookOutput({});
       expect(output.getAdditionalContext()).toBeUndefined();
     });
 
-    it('getBlockingError should return blocked: true and reason if blocking decision', () => {
+    it("getBlockingError should return blocked: true and reason if blocking decision", () => {
       const output = new DefaultHookOutput({
-        decision: 'block',
-        reason: 'blocked by hook',
+        decision: "block",
+        reason: "blocked by hook",
       });
       expect(output.getBlockingError()).toEqual({
         blocked: true,
-        reason: 'blocked by hook',
+        reason: "blocked by hook",
       });
     });
 
-    it('getBlockingError should return blocked: false if not blocking decision', () => {
-      const output = new DefaultHookOutput({ decision: 'approve' });
-      expect(output.getBlockingError()).toEqual({ blocked: false, reason: '' });
+    it("getBlockingError should return blocked: false if not blocking decision", () => {
+      const output = new DefaultHookOutput({ decision: "approve" });
+      expect(output.getBlockingError()).toEqual({ blocked: false, reason: "" });
     });
   });
 
-  describe('BeforeToolHookOutput', () => {
-    it('isBlockingDecision should use permissionDecision from hookSpecificOutput', () => {
+  describe("BeforeToolHookOutput", () => {
+    it("isBlockingDecision should use permissionDecision from hookSpecificOutput", () => {
       const output1 = new BeforeToolHookOutput({
-        hookSpecificOutput: { permissionDecision: 'block' },
+        hookSpecificOutput: { permissionDecision: "block" },
       });
       expect(output1.isBlockingDecision()).toBe(true);
 
       const output2 = new BeforeToolHookOutput({
-        hookSpecificOutput: { permissionDecision: 'approve' },
+        hookSpecificOutput: { permissionDecision: "approve" },
       });
       expect(output2.isBlockingDecision()).toBe(false);
     });
 
-    it('getEffectiveReason should use permissionDecisionReason from hookSpecificOutput', () => {
+    it("getEffectiveReason should use permissionDecisionReason from hookSpecificOutput", () => {
       const output1 = new BeforeToolHookOutput({
-        hookSpecificOutput: { permissionDecisionReason: 'compat reason' },
+        hookSpecificOutput: { permissionDecisionReason: "compat reason" },
       });
-      expect(output1.getEffectiveReason()).toBe('compat reason');
+      expect(output1.getEffectiveReason()).toBe("compat reason");
 
       const output2 = new BeforeToolHookOutput({
-        reason: 'default reason',
-        hookSpecificOutput: { other: 'value' },
+        reason: "default reason",
+        hookSpecificOutput: { other: "value" },
       });
-      expect(output2.getEffectiveReason()).toBe('default reason');
+      expect(output2.getEffectiveReason()).toBe("default reason");
     });
   });
 
-  describe('BeforeModelHookOutput', () => {
-    it('getSyntheticResponse should return synthetic response if llm_response is present', () => {
+  describe("BeforeModelHookOutput", () => {
+    it("getSyntheticResponse should return synthetic response if llm_response is present", () => {
       const mockResponse: LLMResponse = { candidates: [] };
       const output = new BeforeModelHookOutput({
         hookSpecificOutput: { llm_response: mockResponse },
       });
       expect(output.getSyntheticResponse()).toEqual(mockResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        mockResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(mockResponse);
     });
 
-    it('getSyntheticResponse should return undefined if llm_response is not present', () => {
+    it("getSyntheticResponse should return undefined if llm_response is not present", () => {
       const output = new BeforeModelHookOutput({});
       expect(output.getSyntheticResponse()).toBeUndefined();
     });
 
-    it('applyLLMRequestModifications should apply modifications if llm_request is present', () => {
+    it("applyLLMRequestModifications should apply modifications if llm_request is present", () => {
       const target: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ parts: [{ text: 'original' }] }],
+        model: "gemini-pro",
+        contents: [{ parts: [{ text: "original" }] }],
       };
       const mockRequest: Partial<LLMRequest> = {
-        messages: [{ role: 'user', content: 'modified' }],
+        messages: [{ role: "user", content: "modified" }],
       };
       const output = new BeforeModelHookOutput({
         hookSpecificOutput: { llm_request: mockRequest },
       });
       const result = output.applyLLMRequestModifications(target);
       expect(result).toEqual({ ...target, ...mockRequest });
-      expect(defaultHookTranslator.fromHookLLMRequest).toHaveBeenCalledWith(
-        mockRequest,
-        target,
-      );
+      expect(defaultHookTranslator.fromHookLLMRequest).toHaveBeenCalledWith(mockRequest, target);
     });
 
-    it('applyLLMRequestModifications should return target unchanged if llm_request is not present', () => {
+    it("applyLLMRequestModifications should return target unchanged if llm_request is not present", () => {
       const target: GenerateContentParameters = {
-        model: 'gemini-pro',
+        model: "gemini-pro",
         contents: [],
       };
       const output = new BeforeModelHookOutput({});
@@ -281,29 +270,27 @@ describe('Hook Output Classes', () => {
     });
   });
 
-  describe('BeforeToolSelectionHookOutput', () => {
-    it('applyToolConfigModifications should apply modifications if toolConfig is present', () => {
+  describe("BeforeToolSelectionHookOutput", () => {
+    it("applyToolConfigModifications should apply modifications if toolConfig is present", () => {
       const target = { tools: [{ functionDeclarations: [] }] };
-      const mockToolConfig = { functionCallingConfig: { mode: 'ANY' } };
+      const mockToolConfig = { functionCallingConfig: { mode: "ANY" } };
       const output = new BeforeToolSelectionHookOutput({
         hookSpecificOutput: { toolConfig: mockToolConfig },
       });
       const result = output.applyToolConfigModifications(target);
       expect(result).toEqual({ ...target, toolConfig: mockToolConfig });
-      expect(defaultHookTranslator.fromHookToolConfig).toHaveBeenCalledWith(
-        mockToolConfig,
-      );
+      expect(defaultHookTranslator.fromHookToolConfig).toHaveBeenCalledWith(mockToolConfig);
     });
 
-    it('applyToolConfigModifications should return target unchanged if toolConfig is not present', () => {
+    it("applyToolConfigModifications should return target unchanged if toolConfig is not present", () => {
       const target = { toolConfig: {}, tools: [] };
       const output = new BeforeToolSelectionHookOutput({});
       expect(output.applyToolConfigModifications(target)).toBe(target);
     });
 
-    it('applyToolConfigModifications should initialize tools array if not present', () => {
+    it("applyToolConfigModifications should initialize tools array if not present", () => {
       const target = {};
-      const mockToolConfig = { functionCallingConfig: { mode: 'ANY' } };
+      const mockToolConfig = { functionCallingConfig: { mode: "ANY" } };
       const output = new BeforeToolSelectionHookOutput({
         hookSpecificOutput: { toolConfig: mockToolConfig },
       });
@@ -312,23 +299,21 @@ describe('Hook Output Classes', () => {
     });
   });
 
-  describe('AfterModelHookOutput', () => {
-    it('getModifiedResponse should return modified response if llm_response is present and has content', () => {
+  describe("AfterModelHookOutput", () => {
+    it("getModifiedResponse should return modified response if llm_response is present and has content", () => {
       const mockResponse: LLMResponse = {
-        candidates: [{ content: { role: 'model', parts: ['modified'] } }],
+        candidates: [{ content: { role: "model", parts: ["modified"] } }],
       };
       const output = new AfterModelHookOutput({
         hookSpecificOutput: { llm_response: mockResponse },
       });
       expect(output.getModifiedResponse()).toEqual(mockResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        mockResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(mockResponse);
     });
 
-    it('getModifiedResponse should return undefined if llm_response is present but no content', () => {
+    it("getModifiedResponse should return undefined if llm_response is present but no content", () => {
       const mockResponse: LLMResponse = {
-        candidates: [{ content: { role: 'model', parts: [] } }],
+        candidates: [{ content: { role: "model", parts: [] } }],
       };
       const output = new AfterModelHookOutput({
         hookSpecificOutput: { llm_response: mockResponse },
@@ -336,50 +321,46 @@ describe('Hook Output Classes', () => {
       expect(output.getModifiedResponse()).toBeUndefined();
     });
 
-    it('getModifiedResponse should return undefined if llm_response is not present', () => {
+    it("getModifiedResponse should return undefined if llm_response is not present", () => {
       const output = new AfterModelHookOutput({});
       expect(output.getModifiedResponse()).toBeUndefined();
     });
 
-    it('getModifiedResponse should return a synthetic stop response if shouldStopExecution is true', () => {
+    it("getModifiedResponse should return a synthetic stop response if shouldStopExecution is true", () => {
       const output = new AfterModelHookOutput({
         continue: false,
-        stopReason: 'stopped by hook',
+        stopReason: "stopped by hook",
       });
       const expectedResponse: LLMResponse = {
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['stopped by hook'],
+              role: "model",
+              parts: ["stopped by hook"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
       expect(output.getModifiedResponse()).toEqual(expectedResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        expectedResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(expectedResponse);
     });
 
-    it('getModifiedResponse should return a synthetic stop response with default reason if shouldStopExecution is true and no stopReason', () => {
+    it("getModifiedResponse should return a synthetic stop response with default reason if shouldStopExecution is true and no stopReason", () => {
       const output = new AfterModelHookOutput({ continue: false });
       const expectedResponse: LLMResponse = {
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['No reason provided'],
+              role: "model",
+              parts: ["No reason provided"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
       expect(output.getModifiedResponse()).toEqual(expectedResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        expectedResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(expectedResponse);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/hooks/types.ts b/packages/gemini-cli-core/src/hooks/types.ts
index c35be6448..4eb0467de 100644
--- a/packages/gemini-cli-core/src/hooks/types.ts
+++ b/packages/gemini-cli-core/src/hooks/types.ts
@@ -5,33 +5,29 @@
  */
 
 import type {
-  GenerateContentResponse,
-  GenerateContentParameters,
   ToolConfig as GenAIToolConfig,
+  GenerateContentParameters,
+  GenerateContentResponse,
   ToolListUnion,
-} from '@google/genai';
-import type {
-  LLMRequest,
-  LLMResponse,
-  HookToolConfig,
-} from './hookTranslator.js';
-import { defaultHookTranslator } from './hookTranslator.js';
+} from "@google/genai";
+import type { HookToolConfig, LLMRequest, LLMResponse } from "./hookTranslator.js";
+import { defaultHookTranslator } from "./hookTranslator.js";
 
 /**
  * Event names for the hook system
  */
 export enum HookEventName {
-  BeforeTool = 'BeforeTool',
-  AfterTool = 'AfterTool',
-  BeforeAgent = 'BeforeAgent',
-  Notification = 'Notification',
-  AfterAgent = 'AfterAgent',
-  SessionStart = 'SessionStart',
-  SessionEnd = 'SessionEnd',
-  PreCompress = 'PreCompress',
-  BeforeModel = 'BeforeModel',
-  AfterModel = 'AfterModel',
-  BeforeToolSelection = 'BeforeToolSelection',
+  BeforeTool = "BeforeTool",
+  AfterTool = "AfterTool",
+  BeforeAgent = "BeforeAgent",
+  Notification = "Notification",
+  AfterAgent = "AfterAgent",
+  SessionStart = "SessionStart",
+  SessionEnd = "SessionEnd",
+  PreCompress = "PreCompress",
+  BeforeModel = "BeforeModel",
+  AfterModel = "AfterModel",
+  BeforeToolSelection = "BeforeToolSelection",
 }
 
 /**
@@ -58,19 +54,13 @@ export interface HookDefinition {
  * Hook implementation types
  */
 export enum HookType {
-  Command = 'command',
+  Command = "command",
 }
 
 /**
  * Decision types for hook outputs
  */
-export type HookDecision =
-  | 'ask'
-  | 'block'
-  | 'deny'
-  | 'approve'
-  | 'allow'
-  | undefined;
+export type HookDecision = "ask" | "block" | "deny" | "approve" | "allow" | undefined;
 
 /**
  * Base hook input - common fields for all events
@@ -100,16 +90,13 @@ export interface HookOutput {
  * Factory function to create the appropriate hook output class based on event name
  * Returns DefaultHookOutput for all events since it contains all necessary methods
  */
-export function createHookOutput(
-  eventName: string,
-  data: Partial<HookOutput>,
-): DefaultHookOutput {
+export function createHookOutput(eventName: string, data: Partial<HookOutput>): DefaultHookOutput {
   switch (eventName) {
-    case 'BeforeModel':
+    case "BeforeModel":
       return new BeforeModelHookOutput(data);
-    case 'AfterModel':
+    case "AfterModel":
       return new AfterModelHookOutput(data);
-    case 'BeforeToolSelection':
+    case "BeforeToolSelection":
       return new BeforeToolSelectionHookOutput(data);
     default:
       return new DefaultHookOutput(data);
@@ -142,7 +129,7 @@ export class DefaultHookOutput implements HookOutput {
    * Check if this output represents a blocking decision
    */
   isBlockingDecision(): boolean {
-    return this.decision === 'block' || this.decision === 'deny';
+    return this.decision === "block" || this.decision === "deny";
   }
 
   /**
@@ -156,15 +143,13 @@ export class DefaultHookOutput implements HookOutput {
    * Get the effective reason for blocking or stopping
    */
   getEffectiveReason(): string {
-    return this.reason || this.stopReason || 'No reason provided';
+    return this.reason || this.stopReason || "No reason provided";
   }
 
   /**
    * Apply LLM request modifications (specific method for BeforeModel hooks)
    */
-  applyLLMRequestModifications(
-    target: GenerateContentParameters,
-  ): GenerateContentParameters {
+  applyLLMRequestModifications(target: GenerateContentParameters): GenerateContentParameters {
     // Base implementation - overridden by BeforeModelHookOutput
     return target;
   }
@@ -172,10 +157,7 @@ export class DefaultHookOutput implements HookOutput {
   /**
    * Apply tool config modifications (specific method for BeforeToolSelection hooks)
    */
-  applyToolConfigModifications(target: {
-    toolConfig?: GenAIToolConfig;
-    tools?: ToolListUnion;
-  }): {
+  applyToolConfigModifications(target: { toolConfig?: GenAIToolConfig; tools?: ToolListUnion }): {
     toolConfig?: GenAIToolConfig;
     tools?: ToolListUnion;
   } {
@@ -187,12 +169,9 @@ export class DefaultHookOutput implements HookOutput {
    * Get additional context for adding to responses
    */
   getAdditionalContext(): string | undefined {
-    if (
-      this.hookSpecificOutput &&
-      'additionalContext' in this.hookSpecificOutput
-    ) {
-      const context = this.hookSpecificOutput['additionalContext'];
-      return typeof context === 'string' ? context : undefined;
+    if (this.hookSpecificOutput && "additionalContext" in this.hookSpecificOutput) {
+      const context = this.hookSpecificOutput["additionalContext"];
+      return typeof context === "string" ? context : undefined;
     }
     return undefined;
   }
@@ -207,7 +186,7 @@ export class DefaultHookOutput implements HookOutput {
         reason: this.getEffectiveReason(),
       };
     }
-    return { blocked: false, reason: '' };
+    return { blocked: false, reason: "" };
   }
 }
 
@@ -221,10 +200,9 @@ export class BeforeToolHookOutput extends DefaultHookOutput {
   override getEffectiveReason(): string {
     // Check for compatibility fields first
     if (this.hookSpecificOutput) {
-      if ('permissionDecisionReason' in this.hookSpecificOutput) {
-        const compatReason =
-          this.hookSpecificOutput['permissionDecisionReason'];
-        if (typeof compatReason === 'string') {
+      if ("permissionDecisionReason" in this.hookSpecificOutput) {
+        const compatReason = this.hookSpecificOutput["permissionDecisionReason"];
+        if (typeof compatReason === "string") {
           return compatReason;
         }
       }
@@ -238,12 +216,9 @@ export class BeforeToolHookOutput extends DefaultHookOutput {
    */
   override isBlockingDecision(): boolean {
     // Check compatibility field first
-    if (
-      this.hookSpecificOutput &&
-      'permissionDecision' in this.hookSpecificOutput
-    ) {
-      const compatDecision = this.hookSpecificOutput['permissionDecision'];
-      if (compatDecision === 'block' || compatDecision === 'deny') {
+    if (this.hookSpecificOutput && "permissionDecision" in this.hookSpecificOutput) {
+      const compatDecision = this.hookSpecificOutput["permissionDecision"];
+      if (compatDecision === "block" || compatDecision === "deny") {
         return true;
       }
     }
@@ -260,10 +235,8 @@ export class BeforeModelHookOutput extends DefaultHookOutput {
    * Get synthetic LLM response if provided by hook
    */
   getSyntheticResponse(): GenerateContentResponse | undefined {
-    if (this.hookSpecificOutput && 'llm_response' in this.hookSpecificOutput) {
-      const hookResponse = this.hookSpecificOutput[
-        'llm_response'
-      ] as LLMResponse;
+    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
+      const hookResponse = this.hookSpecificOutput["llm_response"] as LLMResponse;
       if (hookResponse) {
         // Convert hook format to SDK format
         return defaultHookTranslator.fromHookLLMResponse(hookResponse);
@@ -278,10 +251,8 @@ export class BeforeModelHookOutput extends DefaultHookOutput {
   override applyLLMRequestModifications(
     target: GenerateContentParameters,
   ): GenerateContentParameters {
-    if (this.hookSpecificOutput && 'llm_request' in this.hookSpecificOutput) {
-      const hookRequest = this.hookSpecificOutput[
-        'llm_request'
-      ] as Partial<LLMRequest>;
+    if (this.hookSpecificOutput && "llm_request" in this.hookSpecificOutput) {
+      const hookRequest = this.hookSpecificOutput["llm_request"] as Partial<LLMRequest>;
       if (hookRequest) {
         // Convert hook format to SDK format
         const sdkRequest = defaultHookTranslator.fromHookLLMRequest(
@@ -309,14 +280,11 @@ export class BeforeToolSelectionHookOutput extends DefaultHookOutput {
     toolConfig?: GenAIToolConfig;
     tools?: ToolListUnion;
   }): { toolConfig?: GenAIToolConfig; tools?: ToolListUnion } {
-    if (this.hookSpecificOutput && 'toolConfig' in this.hookSpecificOutput) {
-      const hookToolConfig = this.hookSpecificOutput[
-        'toolConfig'
-      ] as HookToolConfig;
+    if (this.hookSpecificOutput && "toolConfig" in this.hookSpecificOutput) {
+      const hookToolConfig = this.hookSpecificOutput["toolConfig"] as HookToolConfig;
       if (hookToolConfig) {
         // Convert hook format to SDK format
-        const sdkToolConfig =
-          defaultHookTranslator.fromHookToolConfig(hookToolConfig);
+        const sdkToolConfig = defaultHookTranslator.fromHookToolConfig(hookToolConfig);
         return {
           ...target,
           tools: target.tools || [],
@@ -336,15 +304,11 @@ export class AfterModelHookOutput extends DefaultHookOutput {
    * Get modified LLM response if provided by hook
    */
   getModifiedResponse(): GenerateContentResponse | undefined {
-    if (this.hookSpecificOutput && 'llm_response' in this.hookSpecificOutput) {
-      const hookResponse = this.hookSpecificOutput[
-        'llm_response'
-      ] as Partial<LLMResponse>;
+    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
+      const hookResponse = this.hookSpecificOutput["llm_response"] as Partial<LLMResponse>;
       if (hookResponse?.candidates?.[0]?.content?.parts?.length) {
         // Convert hook format to SDK format
-        return defaultHookTranslator.fromHookLLMResponse(
-          hookResponse as LLMResponse,
-        );
+        return defaultHookTranslator.fromHookLLMResponse(hookResponse as LLMResponse);
       }
     }
 
@@ -354,10 +318,10 @@ export class AfterModelHookOutput extends DefaultHookOutput {
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [this.getEffectiveReason() || 'Execution stopped by hook'],
+              role: "model",
+              parts: [this.getEffectiveReason() || "Execution stopped by hook"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
@@ -381,7 +345,7 @@ export interface BeforeToolInput extends HookInput {
  */
 export interface BeforeToolOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeTool';
+    hookEventName: "BeforeTool";
     permissionDecision?: HookDecision;
     permissionDecisionReason?: string;
   };
@@ -401,7 +365,7 @@ export interface AfterToolInput extends HookInput {
  */
 export interface AfterToolOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'AfterTool';
+    hookEventName: "AfterTool";
     additionalContext?: string;
   };
 }
@@ -418,7 +382,7 @@ export interface BeforeAgentInput extends HookInput {
  */
 export interface BeforeAgentOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeAgent';
+    hookEventName: "BeforeAgent";
     additionalContext?: string;
   };
 }
@@ -427,7 +391,7 @@ export interface BeforeAgentOutput extends HookOutput {
  * Notification types
  */
 export enum NotificationType {
-  ToolPermission = 'ToolPermission',
+  ToolPermission = "ToolPermission",
 }
 
 /**
@@ -460,9 +424,9 @@ export interface AfterAgentInput extends HookInput {
  * SessionStart source types
  */
 export enum SessionStartSource {
-  Startup = 'startup',
-  Resume = 'resume',
-  Clear = 'clear',
+  Startup = "startup",
+  Resume = "resume",
+  Clear = "clear",
 }
 
 /**
@@ -477,7 +441,7 @@ export interface SessionStartInput extends HookInput {
  */
 export interface SessionStartOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'SessionStart';
+    hookEventName: "SessionStart";
     additionalContext?: string;
   };
 }
@@ -486,11 +450,11 @@ export interface SessionStartOutput extends HookOutput {
  * SessionEnd reason types
  */
 export enum SessionEndReason {
-  Exit = 'exit',
-  Clear = 'clear',
-  Logout = 'logout',
-  PromptInputExit = 'prompt_input_exit',
-  Other = 'other',
+  Exit = "exit",
+  Clear = "clear",
+  Logout = "logout",
+  PromptInputExit = "prompt_input_exit",
+  Other = "other",
 }
 
 /**
@@ -504,8 +468,8 @@ export interface SessionEndInput extends HookInput {
  * PreCompress trigger types
  */
 export enum PreCompressTrigger {
-  Manual = 'manual',
-  Auto = 'auto',
+  Manual = "manual",
+  Auto = "auto",
 }
 
 /**
@@ -535,7 +499,7 @@ export interface BeforeModelInput extends HookInput {
  */
 export interface BeforeModelOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeModel';
+    hookEventName: "BeforeModel";
     llm_request?: Partial<LLMRequest>;
     llm_response?: LLMResponse;
   };
@@ -554,7 +518,7 @@ export interface AfterModelInput extends HookInput {
  */
 export interface AfterModelOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'AfterModel';
+    hookEventName: "AfterModel";
     llm_response?: Partial<LLMResponse>;
   };
 }
@@ -571,7 +535,7 @@ export interface BeforeToolSelectionInput extends HookInput {
  */
 export interface BeforeToolSelectionOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeToolSelection';
+    hookEventName: "BeforeToolSelection";
     toolConfig?: HookToolConfig;
   };
 }
diff --git a/packages/gemini-cli-core/src/ide/constants.ts b/packages/gemini-cli-core/src/ide/constants.ts
index 2844a5d85..f1b74a375 100644
--- a/packages/gemini-cli-core/src/ide/constants.ts
+++ b/packages/gemini-cli-core/src/ide/constants.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const GEMINI_CLI_COMPANION_EXTENSION_NAME = 'Gemini CLI Companion';
+export const GEMINI_CLI_COMPANION_EXTENSION_NAME = "Gemini CLI Companion";
 export const IDE_MAX_OPEN_FILES = 10;
 export const IDE_MAX_SELECTED_TEXT_LENGTH = 16384; // 16 KiB limit
 export const IDE_REQUEST_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
diff --git a/packages/gemini-cli-core/src/ide/detect-ide.test.ts b/packages/gemini-cli-core/src/ide/detect-ide.test.ts
index 96bda36aa..6b7fbba5f 100644
--- a/packages/gemini-cli-core/src/ide/detect-ide.test.ts
+++ b/packages/gemini-cli-core/src/ide/detect-ide.test.ts
@@ -4,128 +4,124 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach } from 'vitest';
-import { detectIde, IDE_DEFINITIONS } from './detect-ide.js';
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { detectIde, IDE_DEFINITIONS } from "./detect-ide.js";
 
-describe('detectIde', () => {
-  const ideProcessInfo = { pid: 123, command: 'some/path/to/code' };
-  const ideProcessInfoNoCode = { pid: 123, command: 'some/path/to/fork' };
+describe("detectIde", () => {
+  const ideProcessInfo = { pid: 123, command: "some/path/to/code" };
+  const ideProcessInfoNoCode = { pid: 123, command: "some/path/to/fork" };
 
   afterEach(() => {
     vi.unstubAllEnvs();
     // Clear Cursor-specific environment variables that might interfere with tests
-    delete process.env['CURSOR_TRACE_ID'];
+    delete process.env["CURSOR_TRACE_ID"];
   });
 
-  it('should return undefined if TERM_PROGRAM is not vscode', () => {
-    vi.stubEnv('TERM_PROGRAM', '');
+  it("should return undefined if TERM_PROGRAM is not vscode", () => {
+    vi.stubEnv("TERM_PROGRAM", "");
     expect(detectIde(ideProcessInfo)).toBeUndefined();
   });
 
-  it('should detect Devin', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('__COG_BASHRC_SOURCED', '1');
+  it("should detect Devin", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("__COG_BASHRC_SOURCED", "1");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.devin);
   });
 
-  it('should detect Replit', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('REPLIT_USER', 'testuser');
+  it("should detect Replit", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("REPLIT_USER", "testuser");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.replit);
   });
 
-  it('should detect Cursor', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CURSOR_TRACE_ID', 'some-id');
+  it("should detect Cursor", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CURSOR_TRACE_ID", "some-id");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cursor);
   });
 
-  it('should detect Codespaces', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CODESPACES', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Codespaces", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CODESPACES", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.codespaces);
   });
 
-  it('should detect Cloud Shell via EDITOR_IN_CLOUD_SHELL', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('EDITOR_IN_CLOUD_SHELL', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Cloud Shell via EDITOR_IN_CLOUD_SHELL", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("EDITOR_IN_CLOUD_SHELL", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cloudshell);
   });
 
-  it('should detect Cloud Shell via CLOUD_SHELL', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CLOUD_SHELL', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Cloud Shell via CLOUD_SHELL", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CLOUD_SHELL", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cloudshell);
   });
 
-  it('should detect Trae', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('TERM_PRODUCT', 'Trae');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Trae", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("TERM_PRODUCT", "Trae");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.trae);
   });
 
-  it('should detect Firebase Studio via MONOSPACE_ENV', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('MONOSPACE_ENV', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Firebase Studio via MONOSPACE_ENV", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("MONOSPACE_ENV", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.firebasestudio);
   });
 
   it('should detect VSCode when no other IDE is detected and command includes "code"', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('MONOSPACE_ENV', '');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("MONOSPACE_ENV", "");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.vscode);
   });
 
   it('should detect VSCodeFork when no other IDE is detected and command does not include "code"', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('MONOSPACE_ENV', '');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("MONOSPACE_ENV", "");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfoNoCode)).toBe(IDE_DEFINITIONS.vscodefork);
   });
 
-  it('should detect AntiGravity', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('ANTIGRAVITY_CLI_ALIAS', 'agy');
+  it("should detect AntiGravity", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("ANTIGRAVITY_CLI_ALIAS", "agy");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.antigravity);
   });
 });
 
-describe('detectIde with ideInfoFromFile', () => {
-  const ideProcessInfo = { pid: 123, command: 'some/path/to/code' };
+describe("detectIde with ideInfoFromFile", () => {
+  const ideProcessInfo = { pid: 123, command: "some/path/to/code" };
 
   afterEach(() => {
     vi.unstubAllEnvs();
   });
 
-  it('should use the name and displayName from the file', () => {
+  it("should use the name and displayName from the file", () => {
     const ideInfoFromFile = {
-      name: 'custom-ide',
-      displayName: 'Custom IDE',
+      name: "custom-ide",
+      displayName: "Custom IDE",
     };
     expect(detectIde(ideProcessInfo, ideInfoFromFile)).toEqual(ideInfoFromFile);
   });
 
-  it('should fall back to env detection if name is missing', () => {
-    const ideInfoFromFile = { displayName: 'Custom IDE' };
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
-    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(
-      IDE_DEFINITIONS.vscode,
-    );
+  it("should fall back to env detection if name is missing", () => {
+    const ideInfoFromFile = { displayName: "Custom IDE" };
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
+    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(IDE_DEFINITIONS.vscode);
   });
 
-  it('should fall back to env detection if displayName is missing', () => {
-    const ideInfoFromFile = { name: 'custom-ide' };
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
-    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(
-      IDE_DEFINITIONS.vscode,
-    );
+  it("should fall back to env detection if displayName is missing", () => {
+    const ideInfoFromFile = { name: "custom-ide" };
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
+    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(IDE_DEFINITIONS.vscode);
   });
 });
diff --git a/packages/gemini-cli-core/src/ide/detect-ide.ts b/packages/gemini-cli-core/src/ide/detect-ide.ts
index c7945593b..16b609087 100644
--- a/packages/gemini-cli-core/src/ide/detect-ide.ts
+++ b/packages/gemini-cli-core/src/ide/detect-ide.ts
@@ -5,16 +5,16 @@
  */
 
 export const IDE_DEFINITIONS = {
-  devin: { name: 'devin', displayName: 'Devin' },
-  replit: { name: 'replit', displayName: 'Replit' },
-  cursor: { name: 'cursor', displayName: 'Cursor' },
-  cloudshell: { name: 'cloudshell', displayName: 'Cloud Shell' },
-  codespaces: { name: 'codespaces', displayName: 'GitHub Codespaces' },
-  firebasestudio: { name: 'firebasestudio', displayName: 'Firebase Studio' },
-  trae: { name: 'trae', displayName: 'Trae' },
-  vscode: { name: 'vscode', displayName: 'VS Code' },
-  vscodefork: { name: 'vscodefork', displayName: 'IDE' },
-  antigravity: { name: 'antigravity', displayName: 'Antigravity' },
+  devin: { name: "devin", displayName: "Devin" },
+  replit: { name: "replit", displayName: "Replit" },
+  cursor: { name: "cursor", displayName: "Cursor" },
+  cloudshell: { name: "cloudshell", displayName: "Cloud Shell" },
+  codespaces: { name: "codespaces", displayName: "GitHub Codespaces" },
+  firebasestudio: { name: "firebasestudio", displayName: "Firebase Studio" },
+  trae: { name: "trae", displayName: "Trae" },
+  vscode: { name: "vscode", displayName: "VS Code" },
+  vscodefork: { name: "vscodefork", displayName: "IDE" },
+  antigravity: { name: "antigravity", displayName: "Antigravity" },
 } as const;
 
 export interface IdeInfo {
@@ -23,32 +23,32 @@ export interface IdeInfo {
 }
 
 export function isCloudShell(): boolean {
-  return !!(process.env['EDITOR_IN_CLOUD_SHELL'] || process.env['CLOUD_SHELL']);
+  return !!(process.env["EDITOR_IN_CLOUD_SHELL"] || process.env["CLOUD_SHELL"]);
 }
 
 export function detectIdeFromEnv(): IdeInfo {
-  if (process.env['ANTIGRAVITY_CLI_ALIAS']) {
+  if (process.env["ANTIGRAVITY_CLI_ALIAS"]) {
     return IDE_DEFINITIONS.antigravity;
   }
-  if (process.env['__COG_BASHRC_SOURCED']) {
+  if (process.env["__COG_BASHRC_SOURCED"]) {
     return IDE_DEFINITIONS.devin;
   }
-  if (process.env['REPLIT_USER']) {
+  if (process.env["REPLIT_USER"]) {
     return IDE_DEFINITIONS.replit;
   }
-  if (process.env['CURSOR_TRACE_ID']) {
+  if (process.env["CURSOR_TRACE_ID"]) {
     return IDE_DEFINITIONS.cursor;
   }
-  if (process.env['CODESPACES']) {
+  if (process.env["CODESPACES"]) {
     return IDE_DEFINITIONS.codespaces;
   }
   if (isCloudShell()) {
     return IDE_DEFINITIONS.cloudshell;
   }
-  if (process.env['TERM_PRODUCT'] === 'Trae') {
+  if (process.env["TERM_PRODUCT"] === "Trae") {
     return IDE_DEFINITIONS.trae;
   }
-  if (process.env['MONOSPACE_ENV']) {
+  if (process.env["MONOSPACE_ENV"]) {
     return IDE_DEFINITIONS.firebasestudio;
   }
   return IDE_DEFINITIONS.vscode;
@@ -64,10 +64,7 @@ function verifyVSCode(
   if (ide.name !== IDE_DEFINITIONS.vscode.name) {
     return ide;
   }
-  if (
-    !ideProcessInfo.command ||
-    ideProcessInfo.command.toLowerCase().includes('code')
-  ) {
+  if (!ideProcessInfo.command || ideProcessInfo.command.toLowerCase().includes("code")) {
     return IDE_DEFINITIONS.vscode;
   }
   return IDE_DEFINITIONS.vscodefork;
@@ -88,7 +85,7 @@ export function detectIde(
   }
 
   // Only VSCode-based integrations are currently supported.
-  if (process.env['TERM_PROGRAM'] !== 'vscode') {
+  if (process.env["TERM_PROGRAM"] !== "vscode") {
     return undefined;
   }
 
diff --git a/packages/gemini-cli-core/src/ide/ide-client.test.ts b/packages/gemini-cli-core/src/ide/ide-client.test.ts
index 7ec7e5312..1be22541a 100644
--- a/packages/gemini-cli-core/src/ide/ide-client.test.ts
+++ b/packages/gemini-cli-core/src/ide/ide-client.test.ts
@@ -4,27 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mocked,
-  type Mock,
-} from 'vitest';
-import { IdeClient, IDEConnectionStatus } from './ide-client.js';
-import * as fs from 'node:fs';
-import { getIdeProcessInfo } from './process-utils.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { detectIde, IDE_DEFINITIONS } from './detect-ide.js';
-import * as os from 'node:os';
-import * as path from 'node:path';
-
-vi.mock('node:fs', async (importOriginal) => {
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { afterEach, beforeEach, describe, expect, it, type Mock, type Mocked, vi } from "vitest";
+import { detectIde, IDE_DEFINITIONS } from "./detect-ide.js";
+import { IDEConnectionStatus, IdeClient } from "./ide-client.js";
+import { getIdeProcessInfo } from "./process-utils.js";
+
+vi.mock("node:fs", async (importOriginal) => {
   const actual = await importOriginal<typeof fs>();
   return {
     ...(actual as object),
@@ -37,38 +28,37 @@ vi.mock('node:fs', async (importOriginal) => {
     existsSync: () => false,
   };
 });
-vi.mock('./process-utils.js');
-vi.mock('@modelcontextprotocol/sdk/client/index.js');
-vi.mock('@modelcontextprotocol/sdk/client/streamableHttp.js');
-vi.mock('@modelcontextprotocol/sdk/client/stdio.js');
-vi.mock('./detect-ide.js');
-vi.mock('node:os');
-
-describe('IdeClient', () => {
+vi.mock("./process-utils.js");
+vi.mock("@modelcontextprotocol/sdk/client/index.js");
+vi.mock("@modelcontextprotocol/sdk/client/streamableHttp.js");
+vi.mock("@modelcontextprotocol/sdk/client/stdio.js");
+vi.mock("./detect-ide.js");
+vi.mock("node:os");
+
+describe("IdeClient", () => {
   let mockClient: Mocked<Client>;
   let mockHttpTransport: Mocked<StreamableHTTPClientTransport>;
   let mockStdioTransport: Mocked<StdioClientTransport>;
 
   beforeEach(async () => {
     // Reset singleton instance for test isolation
-    (IdeClient as unknown as { instance: IdeClient | undefined }).instance =
-      undefined;
+    (IdeClient as unknown as { instance: IdeClient | undefined }).instance = undefined;
 
     // Mock environment variables
-    process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'] = '/test/workspace';
-    delete process.env['GEMINI_CLI_IDE_SERVER_PORT'];
-    delete process.env['GEMINI_CLI_IDE_SERVER_STDIO_COMMAND'];
-    delete process.env['GEMINI_CLI_IDE_SERVER_STDIO_ARGS'];
-    delete process.env['GEMINI_CLI_IDE_AUTH_TOKEN'];
+    process.env["GEMINI_CLI_IDE_WORKSPACE_PATH"] = "/test/workspace";
+    delete process.env["GEMINI_CLI_IDE_SERVER_PORT"];
+    delete process.env["GEMINI_CLI_IDE_SERVER_STDIO_COMMAND"];
+    delete process.env["GEMINI_CLI_IDE_SERVER_STDIO_ARGS"];
+    delete process.env["GEMINI_CLI_IDE_AUTH_TOKEN"];
 
     // Mock dependencies
-    vi.spyOn(process, 'cwd').mockReturnValue('/test/workspace/sub-dir');
+    vi.spyOn(process, "cwd").mockReturnValue("/test/workspace/sub-dir");
     vi.mocked(detectIde).mockReturnValue(IDE_DEFINITIONS.vscode);
     vi.mocked(getIdeProcessInfo).mockResolvedValue({
       pid: 12345,
-      command: 'test-ide',
+      command: "test-ide",
     });
-    vi.mocked(os.tmpdir).mockReturnValue('/tmp');
+    vi.mocked(os.tmpdir).mockReturnValue("/tmp");
 
     // Mock MCP client and transports
     mockClient = {
@@ -96,65 +86,55 @@ describe('IdeClient', () => {
     vi.restoreAllMocks();
   });
 
-  describe('connect', () => {
-    it('should connect using HTTP when port is provided in config file', async () => {
-      const config = { port: '8080' };
+  describe("connect", () => {
+    it("should connect using HTTP when port is provided in config file", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/', 'gemini-ide-server-12345.json'),
-        'utf8',
+        path.join("/tmp/", "gemini-ide-server-12345.json"),
+        "utf8",
       );
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:8080/mcp'),
+        new URL("http://127.0.0.1:8080/mcp"),
         expect.any(Object),
       );
       expect(mockClient.connect).toHaveBeenCalledWith(mockHttpTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should connect using stdio when stdio config is provided in file', async () => {
-      const config = { stdio: { command: 'test-cmd', args: ['--foo'] } };
+    it("should connect using stdio when stdio config is provided in file", async () => {
+      const config = { stdio: { command: "test-cmd", args: ["--foo"] } };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StdioClientTransport).toHaveBeenCalledWith({
-        command: 'test-cmd',
-        args: ['--foo'],
+        command: "test-cmd",
+        args: ["--foo"],
       });
       expect(mockClient.connect).toHaveBeenCalledWith(mockStdioTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should prioritize port over stdio when both are in config file', async () => {
+    it("should prioritize port over stdio when both are in config file", async () => {
       const config = {
-        port: '8080',
-        stdio: { command: 'test-cmd', args: ['--foo'] },
+        port: "8080",
+        stdio: { command: "test-cmd", args: ["--foo"] },
       };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
@@ -162,90 +142,68 @@ describe('IdeClient', () => {
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalled();
       expect(StdioClientTransport).not.toHaveBeenCalled();
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should connect using HTTP when port is provided in environment variables', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(
-        new Error('File not found'),
-      );
+    it("should connect using HTTP when port is provided in environment variables", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("File not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '9090';
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "9090";
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:9090/mcp'),
+        new URL("http://127.0.0.1:9090/mcp"),
         expect.any(Object),
       );
       expect(mockClient.connect).toHaveBeenCalledWith(mockHttpTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should connect using stdio when stdio config is in environment variables', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(
-        new Error('File not found'),
-      );
+    it("should connect using stdio when stdio config is in environment variables", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("File not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      process.env['GEMINI_CLI_IDE_SERVER_STDIO_COMMAND'] = 'env-cmd';
-      process.env['GEMINI_CLI_IDE_SERVER_STDIO_ARGS'] = '["--bar"]';
+      process.env["GEMINI_CLI_IDE_SERVER_STDIO_COMMAND"] = "env-cmd";
+      process.env["GEMINI_CLI_IDE_SERVER_STDIO_ARGS"] = '["--bar"]';
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StdioClientTransport).toHaveBeenCalledWith({
-        command: 'env-cmd',
-        args: ['--bar'],
+        command: "env-cmd",
+        args: ["--bar"],
       });
       expect(mockClient.connect).toHaveBeenCalledWith(mockStdioTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should prioritize file config over environment variables', async () => {
-      const config = { port: '8080' };
+    it("should prioritize file config over environment variables", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '9090';
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "9090";
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:8080/mcp'),
+        new URL("http://127.0.0.1:8080/mcp"),
         expect.any(Object),
       );
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should be disconnected if no config is found', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(
-        new Error('File not found'),
-      );
+    it("should be disconnected if no config is found", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("File not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
@@ -253,18 +211,14 @@ describe('IdeClient', () => {
 
       expect(StreamableHTTPClientTransport).not.toHaveBeenCalled();
       expect(StdioClientTransport).not.toHaveBeenCalled();
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Disconnected,
-      );
-      expect(ideClient.getConnectionStatus().details).toContain(
-        'Failed to connect',
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Disconnected);
+      expect(ideClient.getConnectionStatus().details).toContain("Failed to connect");
     });
   });
 
-  describe('getConnectionConfigFromFile', () => {
-    it('should return config from the specific pid file if it exists', async () => {
-      const config = { port: '1234', workspacePath: '/test/workspace' };
+  describe("getConnectionConfigFromFile", () => {
+    it("should return config from the specific pid file if it exists", async () => {
+      const config = { port: "1234", workspacePath: "/test/workspace" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
 
       const ideClient = await IdeClient.getInstance();
@@ -277,17 +231,15 @@ describe('IdeClient', () => {
 
       expect(result).toEqual(config);
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp', 'gemini-ide-server-12345.json'),
-        'utf8',
+        path.join("/tmp", "gemini-ide-server-12345.json"),
+        "utf8",
       );
     });
 
-    it('should return undefined if no config files are found', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error('not found'));
+    it("should return undefined if no config files are found", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
@@ -300,18 +252,14 @@ describe('IdeClient', () => {
       expect(result).toBeUndefined();
     });
 
-    it('should find and parse a single config file with the new naming scheme', async () => {
-      const config = { port: '5678', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      ); // For old path
+    it("should find and parse a single config file with the new naming scheme", async () => {
+      const config = { port: "5678", workspacePath: "/test/workspace" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found")); // For old path
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue(['gemini-ide-server-12345-123.json']);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-123.json"]);
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -324,37 +272,30 @@ describe('IdeClient', () => {
 
       expect(result).toEqual(config);
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'gemini-ide-server-12345-123.json'),
-        'utf8',
+        path.join("/tmp/gemini/ide", "gemini-ide-server-12345-123.json"),
+        "utf8",
       );
     });
 
-    it('should filter out configs with invalid workspace paths', async () => {
+    it("should filter out configs with invalid workspace paths", async () => {
       const validConfig = {
-        port: '5678',
-        workspacePath: '/test/workspace',
+        port: "5678",
+        workspacePath: "/test/workspace",
       };
       const invalidConfig = {
-        port: '1111',
-        workspacePath: '/invalid/workspace',
+        port: "1111",
+        workspacePath: "/invalid/workspace",
       };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(invalidConfig))
         .mockResolvedValueOnce(JSON.stringify(validConfig));
 
       const validateSpy = vi
-        .spyOn(IdeClient, 'validateWorkspacePath')
+        .spyOn(IdeClient, "validateWorkspacePath")
         .mockReturnValueOnce({ isValid: false })
         .mockReturnValueOnce({ isValid: true });
 
@@ -366,34 +307,21 @@ describe('IdeClient', () => {
       ).getConnectionConfigFromFile();
 
       expect(result).toEqual(validConfig);
-      expect(validateSpy).toHaveBeenCalledWith(
-        '/invalid/workspace',
-        '/test/workspace/sub-dir',
-      );
-      expect(validateSpy).toHaveBeenCalledWith(
-        '/test/workspace',
-        '/test/workspace/sub-dir',
-      );
+      expect(validateSpy).toHaveBeenCalledWith("/invalid/workspace", "/test/workspace/sub-dir");
+      expect(validateSpy).toHaveBeenCalledWith("/test/workspace", "/test/workspace/sub-dir");
     });
 
-    it('should return the first valid config when multiple workspaces are valid', async () => {
-      const config1 = { port: '1111', workspacePath: '/test/workspace' };
-      const config2 = { port: '2222', workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should return the first valid config when multiple workspaces are valid", async () => {
+      const config1 = { port: "1111", workspacePath: "/test/workspace" };
+      const config2 = { port: "2222", workspacePath: "/test/workspace2" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(config1))
         .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -407,25 +335,18 @@ describe('IdeClient', () => {
       expect(result).toEqual(config1);
     });
 
-    it('should prioritize the config matching the port from the environment variable', async () => {
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '2222';
-      const config1 = { port: '1111', workspacePath: '/test/workspace' };
-      const config2 = { port: '2222', workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should prioritize the config matching the port from the environment variable", async () => {
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "2222";
+      const config1 = { port: "1111", workspacePath: "/test/workspace" };
+      const config2 = { port: "2222", workspacePath: "/test/workspace2" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(config1))
         .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -439,23 +360,16 @@ describe('IdeClient', () => {
       expect(result).toEqual(config2);
     });
 
-    it('should handle invalid JSON in one of the config files', async () => {
-      const validConfig = { port: '2222', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should handle invalid JSON in one of the config files", async () => {
+      const validConfig = { port: "2222", workspacePath: "/test/workspace" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
-        .mockResolvedValueOnce('invalid json')
+        .mockResolvedValueOnce("invalid json")
         .mockResolvedValueOnce(JSON.stringify(validConfig));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -469,13 +383,9 @@ describe('IdeClient', () => {
       expect(result).toEqual(validConfig);
     });
 
-    it('should return undefined if readdir throws an error', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      vi.mocked(fs.promises.readdir).mockRejectedValue(
-        new Error('readdir failed'),
-      );
+    it("should return undefined if readdir throws an error", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
+      vi.mocked(fs.promises.readdir).mockRejectedValue(new Error("readdir failed"));
 
       const ideClient = await IdeClient.getInstance();
       const result = await (
@@ -487,24 +397,18 @@ describe('IdeClient', () => {
       expect(result).toBeUndefined();
     });
 
-    it('should ignore files with invalid names', async () => {
-      const validConfig = { port: '3333', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should ignore files with invalid names", async () => {
+      const validConfig = { port: "3333", workspacePath: "/test/workspace" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json', // valid
-        'not-a-config-file.txt', // invalid
-        'gemini-ide-server-asdf.json', // invalid
+        "gemini-ide-server-12345-111.json", // valid
+        "not-a-config-file.txt", // invalid
+        "gemini-ide-server-asdf.json", // invalid
       ]);
-      vi.mocked(fs.promises.readFile).mockResolvedValueOnce(
-        JSON.stringify(validConfig),
-      );
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.mocked(fs.promises.readFile).mockResolvedValueOnce(JSON.stringify(validConfig));
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -517,34 +421,27 @@ describe('IdeClient', () => {
 
       expect(result).toEqual(validConfig);
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'gemini-ide-server-12345-111.json'),
-        'utf8',
+        path.join("/tmp/gemini/ide", "gemini-ide-server-12345-111.json"),
+        "utf8",
       );
       expect(fs.promises.readFile).not.toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'not-a-config-file.txt'),
-        'utf8',
+        path.join("/tmp/gemini/ide", "not-a-config-file.txt"),
+        "utf8",
       );
     });
 
-    it('should match env port string to a number port in the config', async () => {
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '3333';
-      const config1 = { port: 1111, workspacePath: '/test/workspace' };
-      const config2 = { port: 3333, workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should match env port string to a number port in the config", async () => {
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "3333";
+      const config1 = { port: 1111, workspacePath: "/test/workspace" };
+      const config2 = { port: 3333, workspacePath: "/test/workspace2" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(config1))
         .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -559,96 +456,80 @@ describe('IdeClient', () => {
     });
   });
 
-  describe('isDiffingEnabled', () => {
-    it('should return false if not connected', async () => {
+  describe("isDiffingEnabled", () => {
+    it("should return false if not connected", async () => {
       const ideClient = await IdeClient.getInstance();
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return false if tool discovery fails', async () => {
-      const config = { port: '8080' };
+    it("should return false if tool discovery fails", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      mockClient.request.mockRejectedValue(new Error('Method not found'));
+      mockClient.request.mockRejectedValue(new Error("Method not found"));
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return false if diffing tools are not available', async () => {
-      const config = { port: '8080' };
+    it("should return false if diffing tools are not available", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
       mockClient.request.mockResolvedValue({
-        tools: [{ name: 'someOtherTool' }],
+        tools: [{ name: "someOtherTool" }],
       });
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return false if only openDiff tool is available', async () => {
-      const config = { port: '8080' };
+    it("should return false if only openDiff tool is available", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
       mockClient.request.mockResolvedValue({
-        tools: [{ name: 'openDiff' }],
+        tools: [{ name: "openDiff" }],
       });
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return true if connected and diffing tools are available', async () => {
-      const config = { port: '8080' };
+    it("should return true if connected and diffing tools are available", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
       mockClient.request.mockResolvedValue({
-        tools: [{ name: 'openDiff' }, { name: 'closeDiff' }],
+        tools: [{ name: "openDiff" }, { name: "closeDiff" }],
       });
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(true);
     });
   });
 
-  describe('resolveDiffFromCli', () => {
+  describe("resolveDiffFromCli", () => {
     beforeEach(async () => {
       // Ensure client is "connected" for these tests
       const ideClient = await IdeClient.getInstance();
@@ -667,30 +548,30 @@ describe('IdeClient', () => {
           ideClient as unknown as {
             closeDiff: () => Promise<string | undefined>;
           },
-          'closeDiff',
+          "closeDiff",
         )
-        .mockResolvedValue('final content from ide');
+        .mockResolvedValue("final content from ide");
 
-      const diffPromise = ideClient.openDiff('/test.txt', 'new content');
+      const diffPromise = ideClient.openDiff("/test.txt", "new content");
 
       // Yield to the event loop to allow the openDiff promise executor to run
       await new Promise((resolve) => setImmediate(resolve));
 
-      await ideClient.resolveDiffFromCli('/test.txt', 'accepted');
+      await ideClient.resolveDiffFromCli("/test.txt", "accepted");
 
       const result = await diffPromise;
 
       expect(result).toEqual({
-        status: 'accepted',
-        content: 'final content from ide',
+        status: "accepted",
+        content: "final content from ide",
       });
-      expect(closeDiffSpy).toHaveBeenCalledWith('/test.txt', {
+      expect(closeDiffSpy).toHaveBeenCalledWith("/test.txt", {
         suppressNotification: true,
       });
       expect(
-        (
-          ideClient as unknown as { diffResponses: Map<string, unknown> }
-        ).diffResponses.has('/test.txt'),
+        (ideClient as unknown as { diffResponses: Map<string, unknown> }).diffResponses.has(
+          "/test.txt",
+        ),
       ).toBe(false);
     });
 
@@ -701,96 +582,92 @@ describe('IdeClient', () => {
           ideClient as unknown as {
             closeDiff: () => Promise<string | undefined>;
           },
-          'closeDiff',
+          "closeDiff",
         )
         .mockResolvedValue(undefined);
 
-      const diffPromise = ideClient.openDiff('/test.txt', 'new content');
+      const diffPromise = ideClient.openDiff("/test.txt", "new content");
 
       // Yield to the event loop to allow the openDiff promise executor to run
       await new Promise((resolve) => setImmediate(resolve));
 
-      await ideClient.resolveDiffFromCli('/test.txt', 'rejected');
+      await ideClient.resolveDiffFromCli("/test.txt", "rejected");
 
       const result = await diffPromise;
 
       expect(result).toEqual({
-        status: 'rejected',
+        status: "rejected",
         content: undefined,
       });
-      expect(closeDiffSpy).toHaveBeenCalledWith('/test.txt', {
+      expect(closeDiffSpy).toHaveBeenCalledWith("/test.txt", {
         suppressNotification: true,
       });
       expect(
-        (
-          ideClient as unknown as { diffResponses: Map<string, unknown> }
-        ).diffResponses.has('/test.txt'),
+        (ideClient as unknown as { diffResponses: Map<string, unknown> }).diffResponses.has(
+          "/test.txt",
+        ),
       ).toBe(false);
     });
 
-    it('should do nothing if no diff is open for the given file path', async () => {
+    it("should do nothing if no diff is open for the given file path", async () => {
       const ideClient = await IdeClient.getInstance();
       const closeDiffSpy = vi
         .spyOn(
           ideClient as unknown as {
             closeDiff: () => Promise<string | undefined>;
           },
-          'closeDiff',
+          "closeDiff",
         )
         .mockResolvedValue(undefined);
 
       // No call to openDiff, so no resolver will exist.
-      await ideClient.resolveDiffFromCli('/non-existent.txt', 'accepted');
+      await ideClient.resolveDiffFromCli("/non-existent.txt", "accepted");
 
-      expect(closeDiffSpy).toHaveBeenCalledWith('/non-existent.txt', {
+      expect(closeDiffSpy).toHaveBeenCalledWith("/non-existent.txt", {
         suppressNotification: true,
       });
       // No crash should occur, and nothing should be in the map.
       expect(
-        (
-          ideClient as unknown as { diffResponses: Map<string, unknown> }
-        ).diffResponses.has('/non-existent.txt'),
+        (ideClient as unknown as { diffResponses: Map<string, unknown> }).diffResponses.has(
+          "/non-existent.txt",
+        ),
       ).toBe(false);
     });
   });
 
-  describe('closeDiff', () => {
+  describe("closeDiff", () => {
     beforeEach(async () => {
       const ideClient = await IdeClient.getInstance();
       (ideClient as unknown as { client: Client }).client = mockClient;
     });
 
-    it('should return undefined if client is not connected', async () => {
+    it("should return undefined if client is not connected", async () => {
       const ideClient = await IdeClient.getInstance();
-      (ideClient as unknown as { client: Client | undefined }).client =
-        undefined;
+      (ideClient as unknown as { client: Client | undefined }).client = undefined;
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should call client.request with correct arguments', async () => {
+    it("should call client.request with correct arguments", async () => {
       const ideClient = await IdeClient.getInstance();
       // Return a valid, empty response as the return value is not under test here.
       mockClient.request.mockResolvedValue({ isError: false, content: [] });
 
       await (
         ideClient as unknown as {
-          closeDiff: (
-            f: string,
-            o?: { suppressNotification?: boolean },
-          ) => Promise<void>;
+          closeDiff: (f: string, o?: { suppressNotification?: boolean }) => Promise<void>;
         }
-      ).closeDiff('/test.txt', { suppressNotification: true });
+      ).closeDiff("/test.txt", { suppressNotification: true });
 
       expect(mockClient.request).toHaveBeenCalledWith(
         expect.objectContaining({
           params: {
-            name: 'closeDiff',
+            name: "closeDiff",
             arguments: {
-              filePath: '/test.txt',
+              filePath: "/test.txt",
               suppressNotification: true,
             },
           },
@@ -800,89 +677,87 @@ describe('IdeClient', () => {
       );
     });
 
-    it('should return content from a valid JSON response', async () => {
+    it("should return content from a valid JSON response", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [
-          { type: 'text', text: JSON.stringify({ content: 'file content' }) },
-        ],
+        content: [{ type: "text", text: JSON.stringify({ content: "file content" }) }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<string> }
-      ).closeDiff('/test.txt');
-      expect(result).toBe('file content');
+      ).closeDiff("/test.txt");
+      expect(result).toBe("file content");
     });
 
-    it('should return undefined for a valid JSON response with null content', async () => {
+    it("should return undefined for a valid JSON response with null content", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [{ type: 'text', text: JSON.stringify({ content: null }) }],
+        content: [{ type: "text", text: JSON.stringify({ content: null }) }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if response is not valid JSON', async () => {
+    it("should return undefined if response is not valid JSON", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [{ type: 'text', text: 'not json' }],
+        content: [{ type: "text", text: "not json" }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if request result has isError: true', async () => {
+    it("should return undefined if request result has isError: true", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: true,
-        content: [{ type: 'text', text: 'An error occurred' }],
+        content: [{ type: "text", text: "An error occurred" }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if client.request throws', async () => {
+    it("should return undefined if client.request throws", async () => {
       const ideClient = await IdeClient.getInstance();
-      mockClient.request.mockRejectedValue(new Error('Request failed'));
+      mockClient.request.mockRejectedValue(new Error("Request failed"));
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if response has no text part', async () => {
+    it("should return undefined if response has no text part", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [{ type: 'other' }],
+        content: [{ type: "other" }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if response is falsy', async () => {
+    it("should return undefined if response is falsy", async () => {
       const ideClient = await IdeClient.getInstance();
       // Mocking with `null as any` to test the falsy path, as the mock
       // function is strictly typed.
@@ -891,27 +766,25 @@ describe('IdeClient', () => {
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
   });
 
-  describe('authentication', () => {
-    it('should connect with an auth token if provided in the discovery file', async () => {
-      const authToken = 'test-auth-token';
-      const config = { port: '8080', authToken };
+  describe("authentication", () => {
+    it("should connect with an auth token if provided in the discovery file", async () => {
+      const authToken = "test-auth-token";
+      const config = { port: "8080", authToken };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:8080/mcp'),
+        new URL("http://127.0.0.1:8080/mcp"),
         expect.objectContaining({
           requestInit: {
             headers: {
@@ -920,39 +793,31 @@ describe('IdeClient', () => {
           },
         }),
       );
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should connect with an auth token from environment variable if config file is missing', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(
-        new Error('File not found'),
-      );
+    it("should connect with an auth token from environment variable if config file is missing", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("File not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '9090';
-      process.env['GEMINI_CLI_IDE_AUTH_TOKEN'] = 'env-auth-token';
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "9090";
+      process.env["GEMINI_CLI_IDE_AUTH_TOKEN"] = "env-auth-token";
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:9090/mcp'),
+        new URL("http://127.0.0.1:9090/mcp"),
         expect.objectContaining({
           requestInit: {
             headers: {
-              Authorization: 'Bearer env-auth-token',
+              Authorization: "Bearer env-auth-token",
             },
           },
         }),
       );
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/ide/ide-client.ts b/packages/gemini-cli-core/src/ide/ide-client.ts
index 7523a09a9..0cefb2724 100644
--- a/packages/gemini-cli-core/src/ide/ide-client.ts
+++ b/packages/gemini-cli-core/src/ide/ide-client.ts
@@ -4,42 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { isSubpath } from '../utils/paths.js';
-import { detectIde, type IdeInfo } from '../ide/detect-ide.js';
-import { ideContextStore } from './ideContext.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { CallToolResultSchema, ListToolsResultSchema } from "@modelcontextprotocol/sdk/types.js";
+import { EnvHttpProxyAgent } from "undici";
+import { detectIde, type IdeInfo } from "../ide/detect-ide.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isSubpath } from "../utils/paths.js";
+import { IDE_REQUEST_TIMEOUT_MS } from "./constants.js";
+import { ideContextStore } from "./ideContext.js";
+import { getIdeProcessInfo } from "./process-utils.js";
 import {
   IdeContextNotificationSchema,
   IdeDiffAcceptedNotificationSchema,
   IdeDiffClosedNotificationSchema,
   IdeDiffRejectedNotificationSchema,
-} from './types.js';
-import { getIdeProcessInfo } from './process-utils.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { EnvHttpProxyAgent } from 'undici';
-import { ListToolsResultSchema } from '@modelcontextprotocol/sdk/types.js';
-import { IDE_REQUEST_TIMEOUT_MS } from './constants.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "./types.js";
 
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) => debugLogger.debug('[DEBUG] [IDEClient]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [IDEClient]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: (...args: any[]) => console.error('[ERROR] [IDEClient]', ...args),
+  error: (...args: any[]) => console.error("[ERROR] [IDEClient]", ...args),
 };
 
 export type DiffUpdateResult =
   | {
-      status: 'accepted';
+      status: "accepted";
       content?: string;
     }
   | {
-      status: 'rejected';
+      status: "rejected";
       content: undefined;
     };
 
@@ -49,9 +48,9 @@ export type IDEConnectionState = {
 };
 
 export enum IDEConnectionStatus {
-  Connected = 'connected',
-  Disconnected = 'disconnected',
-  Connecting = 'connecting',
+  Connected = "connected",
+  Disconnected = "disconnected",
+  Connecting = "connecting",
 }
 
 type StdioConfig = {
@@ -83,8 +82,7 @@ export class IdeClient {
   private client: Client | undefined = undefined;
   private state: IDEConnectionState = {
     status: IDEConnectionStatus.Disconnected,
-    details:
-      'IDE integration is currently disabled. To enable it, run /ide enable.',
+    details: "IDE integration is currently disabled. To enable it, run /ide enable.",
   };
   private currentIde: IdeInfo | undefined;
   private ideProcessInfo: { pid: number; command: string } | undefined;
@@ -111,10 +109,7 @@ export class IdeClient {
         const client = new IdeClient();
         client.ideProcessInfo = await getIdeProcessInfo();
         client.connectionConfig = await client.getConnectionConfigFromFile();
-        client.currentIde = detectIde(
-          client.ideProcessInfo,
-          client.connectionConfig?.ideInfo,
-        );
+        client.currentIde = detectIde(client.ideProcessInfo, client.connectionConfig?.ideInfo);
         return client;
       })();
     }
@@ -151,18 +146,12 @@ export class IdeClient {
     this.setState(IDEConnectionStatus.Connecting);
 
     this.connectionConfig = await this.getConnectionConfigFromFile();
-    this.authToken =
-      this.connectionConfig?.authToken ??
-      process.env['GEMINI_CLI_IDE_AUTH_TOKEN'];
+    this.authToken = this.connectionConfig?.authToken ?? process.env["GEMINI_CLI_IDE_AUTH_TOKEN"];
 
     const workspacePath =
-      this.connectionConfig?.workspacePath ??
-      process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];
+      this.connectionConfig?.workspacePath ?? process.env["GEMINI_CLI_IDE_WORKSPACE_PATH"];
 
-    const { isValid, error } = IdeClient.validateWorkspacePath(
-      workspacePath,
-      process.cwd(),
-    );
+    const { isValid, error } = IdeClient.validateWorkspacePath(workspacePath, process.cwd());
 
     if (!isValid) {
       this.setState(IDEConnectionStatus.Disconnected, error, logError);
@@ -171,17 +160,13 @@ export class IdeClient {
 
     if (this.connectionConfig) {
       if (this.connectionConfig.port) {
-        const connected = await this.establishHttpConnection(
-          this.connectionConfig.port,
-        );
+        const connected = await this.establishHttpConnection(this.connectionConfig.port);
         if (connected) {
           return;
         }
       }
       if (this.connectionConfig.stdio) {
-        const connected = await this.establishStdioConnection(
-          this.connectionConfig.stdio,
-        );
+        const connected = await this.establishStdioConnection(this.connectionConfig.stdio);
         if (connected) {
           return;
         }
@@ -229,22 +214,19 @@ export class IdeClient {
    *   whether the diff was 'accepted' or 'rejected' and including the final
    *   content if accepted.
    */
-  async openDiff(
-    filePath: string,
-    newContent: string,
-  ): Promise<DiffUpdateResult> {
+  async openDiff(filePath: string, newContent: string): Promise<DiffUpdateResult> {
     const release = await this.acquireMutex();
 
     const promise = new Promise<DiffUpdateResult>((resolve, reject) => {
       if (!this.client) {
         // The promise will be rejected, and the finally block below will release the mutex.
-        return reject(new Error('IDE client is not connected.'));
+        return reject(new Error("IDE client is not connected."));
       }
       this.diffResponses.set(filePath, resolve);
       this.client
         .request(
           {
-            method: 'tools/call',
+            method: "tools/call",
             params: {
               name: `openDiff`,
               arguments: {
@@ -258,15 +240,9 @@ export class IdeClient {
         )
         .then((parsedResultData) => {
           if (parsedResultData.isError) {
-            const textPart = parsedResultData.content.find(
-              (part) => part.type === 'text',
-            );
-            const errorMessage =
-              textPart?.text ?? `Tool 'openDiff' reported an error.`;
-            logger.debug(
-              `Request for openDiff ${filePath} failed with isError:`,
-              errorMessage,
-            );
+            const textPart = parsedResultData.content.find((part) => part.type === "text");
+            const errorMessage = textPart?.text ?? `Tool 'openDiff' reported an error.`;
+            logger.debug(`Request for openDiff ${filePath} failed with isError:`, errorMessage);
             this.diffResponses.delete(filePath);
             reject(new Error(errorMessage));
           }
@@ -322,7 +298,7 @@ export class IdeClient {
       }
       const resultData = await this.client.request(
         {
-          method: 'tools/call',
+          method: "tools/call",
           params: {
             name: `closeDiff`,
             arguments: {
@@ -340,34 +316,25 @@ export class IdeClient {
       }
 
       if (resultData.isError) {
-        const textPart = resultData.content.find(
-          (part) => part.type === 'text',
-        );
-        const errorMessage =
-          textPart?.text ?? `Tool 'closeDiff' reported an error.`;
-        logger.debug(
-          `Request for closeDiff ${filePath} failed with isError:`,
-          errorMessage,
-        );
+        const textPart = resultData.content.find((part) => part.type === "text");
+        const errorMessage = textPart?.text ?? `Tool 'closeDiff' reported an error.`;
+        logger.debug(`Request for closeDiff ${filePath} failed with isError:`, errorMessage);
         return undefined;
       }
 
-      const textPart = resultData.content.find((part) => part.type === 'text');
+      const textPart = resultData.content.find((part) => part.type === "text");
 
       if (textPart?.text) {
         try {
           const parsedJson = JSON.parse(textPart.text);
-          if (parsedJson && typeof parsedJson.content === 'string') {
+          if (parsedJson && typeof parsedJson.content === "string") {
             return parsedJson.content;
           }
           if (parsedJson && parsedJson.content === null) {
             return undefined;
           }
         } catch (_e) {
-          logger.debug(
-            `Invalid JSON in closeDiff response for ${filePath}:`,
-            textPart.text,
-          );
+          logger.debug(`Invalid JSON in closeDiff response for ${filePath}:`, textPart.text);
         }
       }
     } catch (err) {
@@ -378,7 +345,7 @@ export class IdeClient {
 
   // Closes the diff. Instead of waiting for a notification,
   // manually resolves the diff resolver as the desired outcome.
-  async resolveDiffFromCli(filePath: string, outcome: 'accepted' | 'rejected') {
+  async resolveDiffFromCli(filePath: string, outcome: "accepted" | "rejected") {
     const resolver = this.diffResponses.get(filePath);
     const content = await this.closeDiff(filePath, {
       // Suppress notification to avoid race where closing the diff rejects the
@@ -387,10 +354,10 @@ export class IdeClient {
     });
 
     if (resolver) {
-      if (outcome === 'accepted') {
-        resolver({ status: 'accepted', content });
+      if (outcome === "accepted") {
+        resolver({ status: "accepted", content });
       } else {
-        resolver({ status: 'rejected', content: undefined });
+        resolver({ status: "rejected", content: undefined });
       }
       this.diffResponses.delete(filePath);
     }
@@ -406,7 +373,7 @@ export class IdeClient {
     this.diffResponses.clear();
     this.setState(
       IDEConnectionStatus.Disconnected,
-      'IDE integration disabled. To enable it again, run /ide enable.',
+      "IDE integration disabled. To enable it again, run /ide enable.",
     );
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     this.client?.close();
@@ -428,8 +395,8 @@ export class IdeClient {
     return (
       !!this.client &&
       this.state.status === IDEConnectionStatus.Connected &&
-      this.availableTools.includes('openDiff') &&
-      this.availableTools.includes('closeDiff')
+      this.availableTools.includes("openDiff") &&
+      this.availableTools.includes("closeDiff")
     );
   }
 
@@ -438,9 +405,9 @@ export class IdeClient {
       return;
     }
     try {
-      logger.debug('Discovering tools from IDE...');
+      logger.debug("Discovering tools from IDE...");
       const response = await this.client.request(
-        { method: 'tools/list', params: {} },
+        { method: "tools/list", params: {} },
         ListToolsResultSchema,
       );
 
@@ -449,33 +416,24 @@ export class IdeClient {
 
       if (this.availableTools.length > 0) {
         logger.debug(
-          `Discovered ${this.availableTools.length} tools from IDE: ${this.availableTools.join(', ')}`,
+          `Discovered ${this.availableTools.length} tools from IDE: ${this.availableTools.join(", ")}`,
         );
       } else {
-        logger.debug(
-          'IDE supports tool discovery, but no tools are available.',
-        );
+        logger.debug("IDE supports tool discovery, but no tools are available.");
       }
     } catch (error) {
       // It's okay if this fails, the IDE might not support it.
       // Don't log an error if the method is not found, which is a common case.
-      if (
-        error instanceof Error &&
-        !error.message?.includes('Method not found')
-      ) {
+      if (error instanceof Error && !error.message?.includes("Method not found")) {
         logger.error(`Error discovering tools from IDE: ${error.message}`);
       } else {
-        logger.debug('IDE does not support tool discovery.');
+        logger.debug("IDE does not support tool discovery.");
       }
       this.availableTools = [];
     }
   }
 
-  private setState(
-    status: IDEConnectionStatus,
-    details?: string,
-    logToConsole = false,
-  ) {
+  private setState(status: IDEConnectionStatus, details?: string, logToConsole = false) {
     const isAlreadyDisconnected =
       this.state.status === IDEConnectionStatus.Disconnected &&
       status === IDEConnectionStatus.Disconnected;
@@ -514,7 +472,7 @@ export class IdeClient {
       };
     }
 
-    if (ideWorkspacePath === '') {
+    if (ideWorkspacePath === "") {
       return {
         isValid: false,
         error: `To use this feature, please open a workspace folder in your IDE and try again.`,
@@ -532,7 +490,7 @@ export class IdeClient {
       return {
         isValid: false,
         error: `Directory mismatch. Gemini CLI is running in a different location than the open workspace in the IDE. Please run the CLI from one of the following directories: ${ideWorkspacePaths.join(
-          ', ',
+          ", ",
         )}`,
       };
     }
@@ -540,7 +498,7 @@ export class IdeClient {
   }
 
   private getPortFromEnv(): string | undefined {
-    const port = process.env['GEMINI_CLI_IDE_SERVER_PORT'];
+    const port = process.env["GEMINI_CLI_IDE_SERVER_PORT"];
     if (!port) {
       return undefined;
     }
@@ -548,12 +506,12 @@ export class IdeClient {
   }
 
   private getStdioConfigFromEnv(): StdioConfig | undefined {
-    const command = process.env['GEMINI_CLI_IDE_SERVER_STDIO_COMMAND'];
+    const command = process.env["GEMINI_CLI_IDE_SERVER_STDIO_COMMAND"];
     if (!command) {
       return undefined;
     }
 
-    const argsStr = process.env['GEMINI_CLI_IDE_SERVER_STDIO_ARGS'];
+    const argsStr = process.env["GEMINI_CLI_IDE_SERVER_STDIO_ARGS"];
     let args: string[] = [];
     if (argsStr) {
       try {
@@ -561,12 +519,10 @@ export class IdeClient {
         if (Array.isArray(parsedArgs)) {
           args = parsedArgs;
         } else {
-          logger.error(
-            'GEMINI_CLI_IDE_SERVER_STDIO_ARGS must be a JSON array string.',
-          );
+          logger.error("GEMINI_CLI_IDE_SERVER_STDIO_ARGS must be a JSON array string.");
         }
       } catch (e) {
-        logger.error('Failed to parse GEMINI_CLI_IDE_SERVER_STDIO_ARGS:', e);
+        logger.error("Failed to parse GEMINI_CLI_IDE_SERVER_STDIO_ARGS:", e);
       }
     }
 
@@ -574,8 +530,7 @@ export class IdeClient {
   }
 
   private async getConnectionConfigFromFile(): Promise<
-    | (ConnectionConfig & { workspacePath?: string; ideInfo?: IdeInfo })
-    | undefined
+    (ConnectionConfig & { workspacePath?: string; ideInfo?: IdeInfo }) | undefined
   > {
     if (!this.ideProcessInfo) {
       return undefined;
@@ -583,11 +538,8 @@ export class IdeClient {
 
     // For backwards compatibility
     try {
-      const portFile = path.join(
-        os.tmpdir(),
-        `gemini-ide-server-${this.ideProcessInfo.pid}.json`,
-      );
-      const portFileContents = await fs.promises.readFile(portFile, 'utf8');
+      const portFile = path.join(os.tmpdir(), `gemini-ide-server-${this.ideProcessInfo.pid}.json`);
+      const portFileContents = await fs.promises.readFile(portFile, "utf8");
       return JSON.parse(portFileContents);
     } catch (_) {
       // For newer extension versions, the file name matches the pattern
@@ -596,12 +548,12 @@ export class IdeClient {
       // exist.
     }
 
-    const portFileDir = path.join(os.tmpdir(), 'gemini', 'ide');
+    const portFileDir = path.join(os.tmpdir(), "gemini", "ide");
     let portFiles;
     try {
       portFiles = await fs.promises.readdir(portFileDir);
     } catch (e) {
-      logger.debug('Failed to read IDE connection directory:', e);
+      logger.debug("Failed to read IDE connection directory:", e);
       return undefined;
     }
 
@@ -609,12 +561,8 @@ export class IdeClient {
       return undefined;
     }
 
-    const fileRegex = new RegExp(
-      `^gemini-ide-server-${this.ideProcessInfo.pid}-\\d+\\.json$`,
-    );
-    const matchingFiles = portFiles
-      .filter((file) => fileRegex.test(file))
-      .sort();
+    const fileRegex = new RegExp(`^gemini-ide-server-${this.ideProcessInfo.pid}-\\d+\\.json$`);
+    const matchingFiles = portFiles.filter((file) => fileRegex.test(file)).sort();
     if (matchingFiles.length === 0) {
       return undefined;
     }
@@ -622,19 +570,17 @@ export class IdeClient {
     let fileContents: string[];
     try {
       fileContents = await Promise.all(
-        matchingFiles.map((file) =>
-          fs.promises.readFile(path.join(portFileDir, file), 'utf8'),
-        ),
+        matchingFiles.map((file) => fs.promises.readFile(path.join(portFileDir, file), "utf8")),
       );
     } catch (e) {
-      logger.debug('Failed to read IDE connection config file(s):', e);
+      logger.debug("Failed to read IDE connection config file(s):", e);
       return undefined;
     }
     const parsedContents = fileContents.map((content) => {
       try {
         return JSON.parse(content);
       } catch (e) {
-        logger.debug('Failed to parse JSON from config file: ', e);
+        logger.debug("Failed to parse JSON from config file: ", e);
         return undefined;
       }
     });
@@ -643,10 +589,7 @@ export class IdeClient {
       if (!content) {
         return false;
       }
-      const { isValid } = IdeClient.validateWorkspacePath(
-        content.workspacePath,
-        process.cwd(),
-      );
+      const { isValid } = IdeClient.validateWorkspacePath(content.workspacePath, process.cwd());
       return isValid;
     });
 
@@ -660,9 +603,7 @@ export class IdeClient {
 
     const portFromEnv = this.getPortFromEnv();
     if (portFromEnv) {
-      const matchingPort = validWorkspaces.find(
-        (content) => String(content.port) === portFromEnv,
-      );
+      const matchingPort = validWorkspaces.find((content) => String(content.port) === portFromEnv);
       if (matchingPort) {
         return matchingPort;
       }
@@ -673,18 +614,18 @@ export class IdeClient {
 
   private createProxyAwareFetch() {
     // ignore proxy for '127.0.0.1' by default to allow connecting to the ide mcp server
-    const existingNoProxy = process.env['NO_PROXY'] || '';
+    const existingNoProxy = process.env["NO_PROXY"] || "";
     const agent = new EnvHttpProxyAgent({
-      noProxy: [existingNoProxy, '127.0.0.1'].filter(Boolean).join(','),
+      noProxy: [existingNoProxy, "127.0.0.1"].filter(Boolean).join(","),
     });
-    const undiciPromise = import('undici');
+    const undiciPromise = import("undici");
     return async (url: string | URL, init?: RequestInit): Promise<Response> => {
       const { fetch: fetchFn } = await undiciPromise;
       const fetchOptions: RequestInit & { dispatcher?: unknown } = {
         ...init,
         dispatcher: agent,
       };
-      const options = fetchOptions as unknown as import('undici').RequestInit;
+      const options = fetchOptions as unknown as import("undici").RequestInit;
       const response = await fetchFn(url, options);
       return new Response(response.body as ReadableStream<unknown> | null, {
         status: response.status,
@@ -699,18 +640,15 @@ export class IdeClient {
       return;
     }
 
-    this.client.setNotificationHandler(
-      IdeContextNotificationSchema,
-      (notification) => {
-        ideContextStore.set(notification.params);
-        const isTrusted = notification.params.workspaceState?.isTrusted;
-        if (isTrusted !== undefined) {
-          for (const listener of this.trustChangeListeners) {
-            listener(isTrusted);
-          }
+    this.client.setNotificationHandler(IdeContextNotificationSchema, (notification) => {
+      ideContextStore.set(notification.params);
+      const isTrusted = notification.params.workspaceState?.isTrusted;
+      if (isTrusted !== undefined) {
+        for (const listener of this.trustChangeListeners) {
+          listener(isTrusted);
         }
-      },
-    );
+      }
+    });
     this.client.onerror = (_error) => {
       const errorMessage = _error instanceof Error ? _error.message : `_error`;
       this.setState(
@@ -726,68 +664,57 @@ export class IdeClient {
         true,
       );
     };
-    this.client.setNotificationHandler(
-      IdeDiffAcceptedNotificationSchema,
-      (notification) => {
-        const { filePath, content } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'accepted', content });
-          this.diffResponses.delete(filePath);
-        } else {
-          logger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffAcceptedNotificationSchema, (notification) => {
+      const { filePath, content } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "accepted", content });
+        this.diffResponses.delete(filePath);
+      } else {
+        logger.debug(`No resolver found for ${filePath}`);
+      }
+    });
 
-    this.client.setNotificationHandler(
-      IdeDiffRejectedNotificationSchema,
-      (notification) => {
-        const { filePath } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'rejected', content: undefined });
-          this.diffResponses.delete(filePath);
-        } else {
-          logger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffRejectedNotificationSchema, (notification) => {
+      const { filePath } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "rejected", content: undefined });
+        this.diffResponses.delete(filePath);
+      } else {
+        logger.debug(`No resolver found for ${filePath}`);
+      }
+    });
 
     // For backwards compatibility. Newer extension versions will only send
     // IdeDiffRejectedNotificationSchema.
-    this.client.setNotificationHandler(
-      IdeDiffClosedNotificationSchema,
-      (notification) => {
-        const { filePath } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'rejected', content: undefined });
-          this.diffResponses.delete(filePath);
-        } else {
-          logger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffClosedNotificationSchema, (notification) => {
+      const { filePath } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "rejected", content: undefined });
+        this.diffResponses.delete(filePath);
+      } else {
+        logger.debug(`No resolver found for ${filePath}`);
+      }
+    });
   }
 
   private async establishHttpConnection(port: string): Promise<boolean> {
     let transport: StreamableHTTPClientTransport | undefined;
     try {
-      logger.debug('Attempting to connect to IDE via HTTP SSE');
+      logger.debug("Attempting to connect to IDE via HTTP SSE");
       this.client = new Client({
-        name: 'streamable-http-client',
+        name: "streamable-http-client",
         // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: "1.0.0",
       });
       transport = new StreamableHTTPClientTransport(
         new URL(`http://${getIdeServerHost()}:${port}/mcp`),
         {
           fetch: this.createProxyAwareFetch(),
           requestInit: {
-            headers: this.authToken
-              ? { Authorization: `Bearer ${this.authToken}` }
-              : {},
+            headers: this.authToken ? { Authorization: `Bearer ${this.authToken}` } : {},
           },
         },
       );
@@ -801,24 +728,21 @@ export class IdeClient {
         try {
           await transport.close();
         } catch (closeError) {
-          logger.debug('Failed to close transport:', closeError);
+          logger.debug("Failed to close transport:", closeError);
         }
       }
       return false;
     }
   }
 
-  private async establishStdioConnection({
-    command,
-    args,
-  }: StdioConfig): Promise<boolean> {
+  private async establishStdioConnection({ command, args }: StdioConfig): Promise<boolean> {
     let transport: StdioClientTransport | undefined;
     try {
-      logger.debug('Attempting to connect to IDE via stdio');
+      logger.debug("Attempting to connect to IDE via stdio");
       this.client = new Client({
-        name: 'stdio-client',
+        name: "stdio-client",
         // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: "1.0.0",
       });
 
       transport = new StdioClientTransport({
@@ -835,7 +759,7 @@ export class IdeClient {
         try {
           await transport.close();
         } catch (closeError) {
-          logger.debug('Failed to close transport:', closeError);
+          logger.debug("Failed to close transport:", closeError);
         }
       }
       return false;
@@ -844,7 +768,6 @@ export class IdeClient {
 }
 
 function getIdeServerHost() {
-  const isInContainer =
-    fs.existsSync('/.dockerenv') || fs.existsSync('/run/.containerenv');
-  return isInContainer ? 'host.docker.internal' : '127.0.0.1';
+  const isInContainer = fs.existsSync("/.dockerenv") || fs.existsSync("/run/.containerenv");
+  return isInContainer ? "host.docker.internal" : "127.0.0.1";
 }
diff --git a/packages/gemini-cli-core/src/ide/ide-installer.test.ts b/packages/gemini-cli-core/src/ide/ide-installer.test.ts
index ff19e6be2..42860bf1d 100644
--- a/packages/gemini-cli-core/src/ide/ide-installer.test.ts
+++ b/packages/gemini-cli-core/src/ide/ide-installer.test.ts
@@ -4,40 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
+import { vi } from "vitest";
 
-vi.mock('node:child_process', async (importOriginal) => {
-  const actual =
-    (await importOriginal()) as typeof import('node:child_process');
+vi.mock("node:child_process", async (importOriginal) => {
+  const actual = (await importOriginal()) as typeof import("node:child_process");
   return {
     ...actual,
     execSync: vi.fn(),
     spawnSync: vi.fn(() => ({ status: 0 })),
   };
 });
-vi.mock('fs');
-vi.mock('os');
+vi.mock("fs");
+vi.mock("os");
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { getIdeInstaller } from './ide-installer.js';
-import * as child_process from 'node:child_process';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { IDE_DEFINITIONS, type IdeInfo } from './detect-ide.js';
+import * as child_process from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { IDE_DEFINITIONS, type IdeInfo } from "./detect-ide.js";
+import { getIdeInstaller } from "./ide-installer.js";
 
-describe('ide-installer', () => {
-  const HOME_DIR = '/home/user';
+describe("ide-installer", () => {
+  const HOME_DIR = "/home/user";
 
   beforeEach(() => {
-    vi.spyOn(os, 'homedir').mockReturnValue(HOME_DIR);
+    vi.spyOn(os, "homedir").mockReturnValue(HOME_DIR);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('getIdeInstaller', () => {
+  describe("getIdeInstaller", () => {
     it.each([
       { ide: IDE_DEFINITIONS.vscode },
       { ide: IDE_DEFINITIONS.firebasestudio },
@@ -56,198 +55,176 @@ describe('ide-installer', () => {
     });
   });
 
-  describe('VsCodeInstaller', () => {
+  describe("VsCodeInstaller", () => {
     function setup({
       ide = IDE_DEFINITIONS.vscode,
       existsResult = false,
-      execSync = () => '',
-      platform = 'linux' as NodeJS.Platform,
+      execSync = () => "",
+      platform = "linux" as NodeJS.Platform,
     }: {
       ide?: IdeInfo;
       existsResult?: boolean;
       execSync?: () => string;
       platform?: NodeJS.Platform;
     } = {}) {
-      vi.spyOn(child_process, 'execSync').mockImplementation(execSync);
-      vi.spyOn(fs, 'existsSync').mockReturnValue(existsResult);
+      vi.spyOn(child_process, "execSync").mockImplementation(execSync);
+      vi.spyOn(fs, "existsSync").mockReturnValue(existsResult);
       const installer = getIdeInstaller(ide, platform)!;
 
       return { installer };
     }
 
-    describe('install', () => {
+    describe("install", () => {
       it.each([
         {
-          platform: 'win32' as NodeJS.Platform,
+          platform: "win32" as NodeJS.Platform,
           expectedLookupPaths: [
-            path.join('C:\\Program Files', 'Microsoft VS Code/bin/code.cmd'),
-            path.join(
-              HOME_DIR,
-              '/AppData/Local/Programs/Microsoft VS Code/bin/code.cmd',
-            ),
+            path.join("C:\\Program Files", "Microsoft VS Code/bin/code.cmd"),
+            path.join(HOME_DIR, "/AppData/Local/Programs/Microsoft VS Code/bin/code.cmd"),
           ],
         },
         {
-          platform: 'darwin' as NodeJS.Platform,
+          platform: "darwin" as NodeJS.Platform,
           expectedLookupPaths: [
-            '/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code',
-            path.join(HOME_DIR, 'Library/Application Support/Code/bin/code'),
+            "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code",
+            path.join(HOME_DIR, "Library/Application Support/Code/bin/code"),
           ],
         },
         {
-          platform: 'linux' as NodeJS.Platform,
-          expectedLookupPaths: ['/usr/share/code/bin/code'],
+          platform: "linux" as NodeJS.Platform,
+          expectedLookupPaths: ["/usr/share/code/bin/code"],
         },
-      ])(
-        'identifies the path to code cli on platform: $platform',
-        async ({ platform, expectedLookupPaths }) => {
-          const { installer } = setup({
-            platform,
-            execSync: () => {
-              throw new Error('Command not found'); // `code` is not in PATH
-            },
-          });
-          await installer.install();
-          for (const [idx, path] of expectedLookupPaths.entries()) {
-            expect(fs.existsSync).toHaveBeenNthCalledWith(idx + 1, path);
-          }
-        },
-      );
+      ])("identifies the path to code cli on platform: $platform", async ({
+        platform,
+        expectedLookupPaths,
+      }) => {
+        const { installer } = setup({
+          platform,
+          execSync: () => {
+            throw new Error("Command not found"); // `code` is not in PATH
+          },
+        });
+        await installer.install();
+        for (const [idx, path] of expectedLookupPaths.entries()) {
+          expect(fs.existsSync).toHaveBeenNthCalledWith(idx + 1, path);
+        }
+      });
 
-      it('installs the extension using code cli', async () => {
+      it("installs the extension using code cli", async () => {
         const { installer } = setup({
-          platform: 'linux',
+          platform: "linux",
         });
         await installer.install();
         expect(child_process.spawnSync).toHaveBeenCalledWith(
-          'code',
-          [
-            '--install-extension',
-            'google.gemini-cli-vscode-ide-companion',
-            '--force',
-          ],
-          { stdio: 'pipe', shell: false },
+          "code",
+          ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+          { stdio: "pipe", shell: false },
         );
       });
 
-      it('installs the extension using code cli on windows', async () => {
+      it("installs the extension using code cli on windows", async () => {
         const { installer } = setup({
-          platform: 'win32',
-          execSync: () => 'C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd',
+          platform: "win32",
+          execSync: () => "C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd",
         });
         await installer.install();
         expect(child_process.spawnSync).toHaveBeenCalledWith(
-          'C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd',
-          [
-            '--install-extension',
-            'google.gemini-cli-vscode-ide-companion',
-            '--force',
-          ],
-          { stdio: 'pipe', shell: true },
+          "C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd",
+          ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+          { stdio: "pipe", shell: true },
         );
       });
 
       it.each([
         {
           ide: IDE_DEFINITIONS.vscode,
-          expectedMessage:
-            'VS Code companion extension was installed successfully',
+          expectedMessage: "VS Code companion extension was installed successfully",
         },
         {
           ide: IDE_DEFINITIONS.firebasestudio,
-          expectedMessage:
-            'Firebase Studio companion extension was installed successfully',
+          expectedMessage: "Firebase Studio companion extension was installed successfully",
         },
-      ])(
-        'returns that the cli was installed successfully',
-        async ({ ide, expectedMessage }) => {
-          const { installer } = setup({ ide });
-          const result = await installer.install();
-          expect(result.success).toBe(true);
-          expect(result.message).toContain(expectedMessage);
-        },
-      );
+      ])("returns that the cli was installed successfully", async ({ ide, expectedMessage }) => {
+        const { installer } = setup({ ide });
+        const result = await installer.install();
+        expect(result.success).toBe(true);
+        expect(result.message).toContain(expectedMessage);
+      });
 
       it.each([
         {
           ide: IDE_DEFINITIONS.vscode,
-          expectedErr: 'VS Code CLI not found',
+          expectedErr: "VS Code CLI not found",
         },
         {
           ide: IDE_DEFINITIONS.firebasestudio,
-          expectedErr: 'Firebase Studio CLI not found',
+          expectedErr: "Firebase Studio CLI not found",
         },
-      ])(
-        'should return a failure message if $ide is not installed',
-        async ({ ide, expectedErr }) => {
-          const { installer } = setup({
-            ide,
-            execSync: () => {
-              throw new Error('Command not found');
-            },
-            existsResult: false,
-          });
-          const result = await installer.install();
-          expect(result.success).toBe(false);
-          expect(result.message).toContain(expectedErr);
-        },
-      );
+      ])("should return a failure message if $ide is not installed", async ({
+        ide,
+        expectedErr,
+      }) => {
+        const { installer } = setup({
+          ide,
+          execSync: () => {
+            throw new Error("Command not found");
+          },
+          existsResult: false,
+        });
+        const result = await installer.install();
+        expect(result.success).toBe(false);
+        expect(result.message).toContain(expectedErr);
+      });
     });
   });
 });
 
-describe('AntigravityInstaller', () => {
+describe("AntigravityInstaller", () => {
   function setup({
-    execSync = () => '',
-    platform = 'linux' as NodeJS.Platform,
+    execSync = () => "",
+    platform = "linux" as NodeJS.Platform,
   }: {
     execSync?: () => string;
     platform?: NodeJS.Platform;
   } = {}) {
-    vi.spyOn(child_process, 'execSync').mockImplementation(execSync);
+    vi.spyOn(child_process, "execSync").mockImplementation(execSync);
     const installer = getIdeInstaller(IDE_DEFINITIONS.antigravity, platform)!;
 
     return { installer };
   }
 
-  it('installs the extension using the alias', async () => {
-    vi.stubEnv('ANTIGRAVITY_CLI_ALIAS', 'agy');
+  it("installs the extension using the alias", async () => {
+    vi.stubEnv("ANTIGRAVITY_CLI_ALIAS", "agy");
     const { installer } = setup({});
     const result = await installer.install();
 
     expect(result.success).toBe(true);
     expect(child_process.spawnSync).toHaveBeenCalledWith(
-      'agy',
-      [
-        '--install-extension',
-        'google.gemini-cli-vscode-ide-companion',
-        '--force',
-      ],
-      { stdio: 'pipe', shell: false },
+      "agy",
+      ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+      { stdio: "pipe", shell: false },
     );
   });
 
-  it('returns a failure message if the alias is not set', async () => {
-    vi.stubEnv('ANTIGRAVITY_CLI_ALIAS', '');
+  it("returns a failure message if the alias is not set", async () => {
+    vi.stubEnv("ANTIGRAVITY_CLI_ALIAS", "");
     const { installer } = setup({});
     const result = await installer.install();
 
     expect(result.success).toBe(false);
-    expect(result.message).toContain(
-      'ANTIGRAVITY_CLI_ALIAS environment variable not set',
-    );
+    expect(result.message).toContain("ANTIGRAVITY_CLI_ALIAS environment variable not set");
   });
 
-  it('returns a failure message if the command is not found', async () => {
-    vi.stubEnv('ANTIGRAVITY_CLI_ALIAS', 'not-a-command');
+  it("returns a failure message if the command is not found", async () => {
+    vi.stubEnv("ANTIGRAVITY_CLI_ALIAS", "not-a-command");
     const { installer } = setup({
       execSync: () => {
-        throw new Error('Command not found');
+        throw new Error("Command not found");
       },
     });
     const result = await installer.install();
 
     expect(result.success).toBe(false);
-    expect(result.message).toContain('not-a-command not found');
+    expect(result.message).toContain("not-a-command not found");
   });
 });
diff --git a/packages/gemini-cli-core/src/ide/ide-installer.ts b/packages/gemini-cli-core/src/ide/ide-installer.ts
index f1fd50fa4..7b49169bd 100644
--- a/packages/gemini-cli-core/src/ide/ide-installer.ts
+++ b/packages/gemini-cli-core/src/ide/ide-installer.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as child_process from 'node:child_process';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import { IDE_DEFINITIONS, type IdeInfo } from './detect-ide.js';
-import { GEMINI_CLI_COMPANION_EXTENSION_NAME } from './constants.js';
+import * as child_process from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as process from "node:process";
+import { GEMINI_CLI_COMPANION_EXTENSION_NAME } from "./constants.js";
+import { IDE_DEFINITIONS, type IdeInfo } from "./detect-ide.js";
 
 export interface IdeInstaller {
   install(): Promise<InstallResult>;
@@ -27,11 +27,8 @@ async function findCommand(
 ): Promise<string | null> {
   // 1. Check PATH first.
   try {
-    if (platform === 'win32') {
-      const result = child_process
-        .execSync(`where.exe ${command}`)
-        .toString()
-        .trim();
+    if (platform === "win32") {
+      const result = child_process.execSync(`where.exe ${command}`).toString().trim();
       // `where.exe` can return multiple paths. Return the first one.
       const firstPath = result.split(/\r?\n/)[0];
       if (firstPath) {
@@ -39,7 +36,7 @@ async function findCommand(
       }
     } else {
       child_process.execSync(`command -v ${command}`, {
-        stdio: 'ignore',
+        stdio: "ignore",
       });
       return command;
     }
@@ -51,38 +48,30 @@ async function findCommand(
   const locations: string[] = [];
   const homeDir = os.homedir();
 
-  if (command === 'code' || command === 'code.cmd') {
-    if (platform === 'darwin') {
+  if (command === "code" || command === "code.cmd") {
+    if (platform === "darwin") {
       // macOS
       locations.push(
-        '/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code',
-        path.join(homeDir, 'Library/Application Support/Code/bin/code'),
+        "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code",
+        path.join(homeDir, "Library/Application Support/Code/bin/code"),
       );
-    } else if (platform === 'linux') {
+    } else if (platform === "linux") {
       // Linux
       locations.push(
-        '/usr/share/code/bin/code',
-        '/snap/bin/code',
-        path.join(homeDir, '.local/share/code/bin/code'),
+        "/usr/share/code/bin/code",
+        "/snap/bin/code",
+        path.join(homeDir, ".local/share/code/bin/code"),
       );
-    } else if (platform === 'win32') {
+    } else if (platform === "win32") {
       // Windows
       locations.push(
         path.join(
-          process.env['ProgramFiles'] || 'C:\\Program Files',
-          'Microsoft VS Code',
-          'bin',
-          'code.cmd',
-        ),
-        path.join(
-          homeDir,
-          'AppData',
-          'Local',
-          'Programs',
-          'Microsoft VS Code',
-          'bin',
-          'code.cmd',
+          process.env["ProgramFiles"] || "C:\\Program Files",
+          "Microsoft VS Code",
+          "bin",
+          "code.cmd",
         ),
+        path.join(homeDir, "AppData", "Local", "Programs", "Microsoft VS Code", "bin", "code.cmd"),
       );
     }
   }
@@ -103,7 +92,7 @@ class VsCodeInstaller implements IdeInstaller {
     readonly ideInfo: IdeInfo,
     readonly platform = process.platform,
   ) {
-    const command = platform === 'win32' ? 'code.cmd' : 'code';
+    const command = platform === "win32" ? "code.cmd" : "code";
     this.vsCodeCommand = findCommand(command, platform);
   }
 
@@ -119,18 +108,12 @@ class VsCodeInstaller implements IdeInstaller {
     try {
       const result = child_process.spawnSync(
         commandPath,
-        [
-          '--install-extension',
-          'google.gemini-cli-vscode-ide-companion',
-          '--force',
-        ],
-        { stdio: 'pipe', shell: this.platform === 'win32' },
+        ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+        { stdio: "pipe", shell: this.platform === "win32" },
       );
 
       if (result.status !== 0) {
-        throw new Error(
-          `Failed to install extension: ${result.stderr?.toString()}`,
-        );
+        throw new Error(`Failed to install extension: ${result.stderr?.toString()}`);
       }
 
       return {
@@ -153,11 +136,11 @@ class AntigravityInstaller implements IdeInstaller {
   ) {}
 
   async install(): Promise<InstallResult> {
-    const command = process.env['ANTIGRAVITY_CLI_ALIAS'];
+    const command = process.env["ANTIGRAVITY_CLI_ALIAS"];
     if (!command) {
       return {
         success: false,
-        message: 'ANTIGRAVITY_CLI_ALIAS environment variable not set.',
+        message: "ANTIGRAVITY_CLI_ALIAS environment variable not set.",
       };
     }
 
@@ -172,18 +155,12 @@ class AntigravityInstaller implements IdeInstaller {
     try {
       const result = child_process.spawnSync(
         commandPath,
-        [
-          '--install-extension',
-          'google.gemini-cli-vscode-ide-companion',
-          '--force',
-        ],
-        { stdio: 'pipe', shell: this.platform === 'win32' },
+        ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+        { stdio: "pipe", shell: this.platform === "win32" },
       );
 
       if (result.status !== 0) {
-        throw new Error(
-          `Failed to install extension: ${result.stderr?.toString()}`,
-        );
+        throw new Error(`Failed to install extension: ${result.stderr?.toString()}`);
       }
 
       return {
@@ -199,10 +176,7 @@ class AntigravityInstaller implements IdeInstaller {
   }
 }
 
-export function getIdeInstaller(
-  ide: IdeInfo,
-  platform = process.platform,
-): IdeInstaller | null {
+export function getIdeInstaller(ide: IdeInfo, platform = process.platform): IdeInstaller | null {
   switch (ide.name) {
     case IDE_DEFINITIONS.vscode.name:
     case IDE_DEFINITIONS.firebasestudio.name:
diff --git a/packages/gemini-cli-core/src/ide/ideContext.test.ts b/packages/gemini-cli-core/src/ide/ideContext.test.ts
index 0e3c7ec53..4fce60d21 100644
--- a/packages/gemini-cli-core/src/ide/ideContext.test.ts
+++ b/packages/gemini-cli-core/src/ide/ideContext.test.ts
@@ -4,21 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  IDE_MAX_OPEN_FILES,
-  IDE_MAX_SELECTED_TEXT_LENGTH,
-} from './constants.js';
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { IdeContextStore } from './ideContext.js';
-import {
-  type IdeContext,
-  FileSchema,
-  IdeContextSchema,
-  type File,
-} from './types.js';
-
-describe('ideContext', () => {
-  describe('createIdeContextStore', () => {
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { IDE_MAX_OPEN_FILES, IDE_MAX_SELECTED_TEXT_LENGTH } from "./constants.js";
+import { IdeContextStore } from "./ideContext.js";
+import { type File, FileSchema, type IdeContext, IdeContextSchema } from "./types.js";
+
+describe("ideContext", () => {
+  describe("createIdeContextStore", () => {
     let ideContextStore: IdeContextStore;
 
     beforeEach(() => {
@@ -30,18 +22,18 @@ describe('ideContext', () => {
       vi.restoreAllMocks();
     });
 
-    it('should return undefined initially for ide context', () => {
+    it("should return undefined initially for ide context", () => {
       expect(ideContextStore.get()).toBeUndefined();
     });
 
-    it('should set and retrieve the ide context', () => {
+    it("should set and retrieve the ide context", () => {
       const testFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/test/file.ts',
+              path: "/path/to/test/file.ts",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -54,14 +46,14 @@ describe('ideContext', () => {
       expect(activeFile).toEqual(testFile);
     });
 
-    it('should update the ide context when called multiple times', () => {
+    it("should update the ide context when called multiple times", () => {
       const firstFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/first.js',
+              path: "/path/to/first.js",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -73,7 +65,7 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/second.py',
+              path: "/path/to/second.py",
               isActive: true,
               cursor: { line: 20, character: 30 },
               timestamp: 0,
@@ -87,14 +79,14 @@ describe('ideContext', () => {
       expect(activeFile).toEqual(secondFile);
     });
 
-    it('should handle empty string for file path', () => {
+    it("should handle empty string for file path", () => {
       const testFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '',
+              path: "",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -104,7 +96,7 @@ describe('ideContext', () => {
       expect(ideContextStore.get()).toEqual(testFile);
     });
 
-    it('should notify subscribers when ide context changes', () => {
+    it("should notify subscribers when ide context changes", () => {
       const subscriber1 = vi.fn();
       const subscriber2 = vi.fn();
 
@@ -115,7 +107,7 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/subscribed.ts',
+              path: "/path/to/subscribed.ts",
               isActive: true,
               cursor: { line: 15, character: 25 },
               timestamp: 0,
@@ -135,9 +127,9 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/new.js',
+              path: "/path/to/new.js",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -151,7 +143,7 @@ describe('ideContext', () => {
       expect(subscriber2).toHaveBeenCalledWith(newFile);
     });
 
-    it('should stop notifying a subscriber after unsubscribe', () => {
+    it("should stop notifying a subscriber after unsubscribe", () => {
       const subscriber1 = vi.fn();
       const subscriber2 = vi.fn();
 
@@ -162,9 +154,9 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/file1.txt',
+              path: "/path/to/file1.txt",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -179,9 +171,9 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/file2.txt',
+              path: "/path/to/file2.txt",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -191,14 +183,14 @@ describe('ideContext', () => {
       expect(subscriber2).toHaveBeenCalledTimes(2);
     });
 
-    it('should clear the ide context', () => {
+    it("should clear the ide context", () => {
       const testFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/test/file.ts',
+              path: "/path/to/test/file.ts",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -214,7 +206,7 @@ describe('ideContext', () => {
       expect(ideContextStore.get()).toBeUndefined();
     });
 
-    it('should set the context and notify subscribers when no workspaceState is present', () => {
+    it("should set the context and notify subscribers when no workspaceState is present", () => {
       const subscriber = vi.fn();
       ideContextStore.subscribe(subscriber);
       const context: IdeContext = {};
@@ -223,7 +215,7 @@ describe('ideContext', () => {
       expect(subscriber).toHaveBeenCalledWith(context);
     });
 
-    it('should handle an empty openFiles array', () => {
+    it("should handle an empty openFiles array", () => {
       const context: IdeContext = {
         workspaceState: {
           openFiles: [],
@@ -233,45 +225,45 @@ describe('ideContext', () => {
       expect(ideContextStore.get()?.workspaceState?.openFiles).toEqual([]);
     });
 
-    it('should sort openFiles by timestamp in descending order', () => {
+    it("should sort openFiles by timestamp in descending order", () => {
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
-            { path: 'file1.ts', timestamp: 100, isActive: false },
-            { path: 'file2.ts', timestamp: 300, isActive: true },
-            { path: 'file3.ts', timestamp: 200, isActive: false },
+            { path: "file1.ts", timestamp: 100, isActive: false },
+            { path: "file2.ts", timestamp: 300, isActive: true },
+            { path: "file3.ts", timestamp: 200, isActive: false },
           ],
         },
       };
       ideContextStore.set(context);
       const openFiles = ideContextStore.get()?.workspaceState?.openFiles;
-      expect(openFiles?.[0]?.path).toBe('file2.ts');
-      expect(openFiles?.[1]?.path).toBe('file3.ts');
-      expect(openFiles?.[2]?.path).toBe('file1.ts');
+      expect(openFiles?.[0]?.path).toBe("file2.ts");
+      expect(openFiles?.[1]?.path).toBe("file3.ts");
+      expect(openFiles?.[2]?.path).toBe("file1.ts");
     });
 
-    it('should mark only the most recent file as active and clear other active files', () => {
+    it("should mark only the most recent file as active and clear other active files", () => {
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
             {
-              path: 'file1.ts',
+              path: "file1.ts",
               timestamp: 100,
               isActive: true,
-              selectedText: 'hello',
+              selectedText: "hello",
             },
             {
-              path: 'file2.ts',
+              path: "file2.ts",
               timestamp: 300,
               isActive: true,
               cursor: { line: 1, character: 1 },
-              selectedText: 'hello',
+              selectedText: "hello",
             },
             {
-              path: 'file3.ts',
+              path: "file3.ts",
               timestamp: 200,
               isActive: false,
-              selectedText: 'hello',
+              selectedText: "hello",
             },
           ],
         },
@@ -291,13 +283,13 @@ describe('ideContext', () => {
       expect(openFiles?.[2]?.selectedText).toBeUndefined();
     });
 
-    it('should truncate selectedText if it exceeds the max length', () => {
-      const longText = 'a'.repeat(IDE_MAX_SELECTED_TEXT_LENGTH + 10);
+    it("should truncate selectedText if it exceeds the max length", () => {
+      const longText = "a".repeat(IDE_MAX_SELECTED_TEXT_LENGTH + 10);
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
             {
-              path: 'file1.ts',
+              path: "file1.ts",
               timestamp: 100,
               isActive: true,
               selectedText: longText,
@@ -306,21 +298,18 @@ describe('ideContext', () => {
         },
       };
       ideContextStore.set(context);
-      const selectedText =
-        ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
-      expect(selectedText).toHaveLength(
-        IDE_MAX_SELECTED_TEXT_LENGTH + '... [TRUNCATED]'.length,
-      );
-      expect(selectedText?.endsWith('... [TRUNCATED]')).toBe(true);
+      const selectedText = ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
+      expect(selectedText).toHaveLength(IDE_MAX_SELECTED_TEXT_LENGTH + "... [TRUNCATED]".length);
+      expect(selectedText?.endsWith("... [TRUNCATED]")).toBe(true);
     });
 
-    it('should not truncate selectedText if it is within the max length', () => {
-      const shortText = 'a'.repeat(IDE_MAX_SELECTED_TEXT_LENGTH);
+    it("should not truncate selectedText if it is within the max length", () => {
+      const shortText = "a".repeat(IDE_MAX_SELECTED_TEXT_LENGTH);
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
             {
-              path: 'file1.ts',
+              path: "file1.ts",
               timestamp: 100,
               isActive: true,
               selectedText: shortText,
@@ -329,20 +318,16 @@ describe('ideContext', () => {
         },
       };
       ideContextStore.set(context);
-      const selectedText =
-        ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
+      const selectedText = ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
       expect(selectedText).toBe(shortText);
     });
 
-    it('should truncate the openFiles list if it exceeds the max length', () => {
-      const files: File[] = Array.from(
-        { length: IDE_MAX_OPEN_FILES + 5 },
-        (_, i) => ({
-          path: `file${i}.ts`,
-          timestamp: i,
-          isActive: false,
-        }),
-      );
+    it("should truncate the openFiles list if it exceeds the max length", () => {
+      const files: File[] = Array.from({ length: IDE_MAX_OPEN_FILES + 5 }, (_, i) => ({
+        path: `file${i}.ts`,
+        timestamp: i,
+        isActive: false,
+      }));
       const context: IdeContext = {
         workspaceState: {
           openFiles: files,
@@ -354,22 +339,22 @@ describe('ideContext', () => {
     });
   });
 
-  describe('FileSchema', () => {
-    it('should validate a file with only required fields', () => {
+  describe("FileSchema", () => {
+    it("should validate a file with only required fields", () => {
       const file = {
-        path: '/path/to/file.ts',
+        path: "/path/to/file.ts",
         timestamp: 12345,
       };
       const result = FileSchema.safeParse(file);
       expect(result.success).toBe(true);
     });
 
-    it('should validate a file with all fields', () => {
+    it("should validate a file with all fields", () => {
       const file = {
-        path: '/path/to/file.ts',
+        path: "/path/to/file.ts",
         timestamp: 12345,
         isActive: true,
-        selectedText: 'const x = 1;',
+        selectedText: "const x = 1;",
         cursor: {
           line: 10,
           character: 20,
@@ -379,7 +364,7 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should fail validation if path is missing', () => {
+    it("should fail validation if path is missing", () => {
       const file = {
         timestamp: 12345,
       };
@@ -387,23 +372,23 @@ describe('ideContext', () => {
       expect(result.success).toBe(false);
     });
 
-    it('should fail validation if timestamp is missing', () => {
+    it("should fail validation if timestamp is missing", () => {
       const file = {
-        path: '/path/to/file.ts',
+        path: "/path/to/file.ts",
       };
       const result = FileSchema.safeParse(file);
       expect(result.success).toBe(false);
     });
   });
 
-  describe('IdeContextSchema', () => {
-    it('should validate an empty context', () => {
+  describe("IdeContextSchema", () => {
+    it("should validate an empty context", () => {
       const context = {};
       const result = IdeContextSchema.safeParse(context);
       expect(result.success).toBe(true);
     });
 
-    it('should validate a context with an empty workspaceState', () => {
+    it("should validate a context with an empty workspaceState", () => {
       const context = {
         workspaceState: {},
       };
@@ -411,7 +396,7 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should validate a context with an empty openFiles array', () => {
+    it("should validate a context with an empty openFiles array", () => {
       const context = {
         workspaceState: {
           openFiles: [],
@@ -421,12 +406,12 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should validate a context with a valid file', () => {
+    it("should validate a context with a valid file", () => {
       const context = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/file.ts',
+              path: "/path/to/file.ts",
               timestamp: 12345,
             },
           ],
@@ -436,7 +421,7 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should fail validation with an invalid file', () => {
+    it("should fail validation with an invalid file", () => {
       const context = {
         workspaceState: {
           openFiles: [
diff --git a/packages/gemini-cli-core/src/ide/ideContext.ts b/packages/gemini-cli-core/src/ide/ideContext.ts
index 527d4135c..9ec0a1e3b 100644
--- a/packages/gemini-cli-core/src/ide/ideContext.ts
+++ b/packages/gemini-cli-core/src/ide/ideContext.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  IDE_MAX_OPEN_FILES,
-  IDE_MAX_SELECTED_TEXT_LENGTH,
-} from './constants.js';
-import type { IdeContext } from './types.js';
+import { IDE_MAX_OPEN_FILES, IDE_MAX_SELECTED_TEXT_LENGTH } from "./constants.js";
+import type { IdeContext } from "./types.js";
 
 type IdeContextSubscriber = (ideContext?: IdeContext) => void;
 
@@ -69,10 +66,8 @@ export class IdeContextStore {
           mostRecentFile.selectedText.length > IDE_MAX_SELECTED_TEXT_LENGTH
         ) {
           mostRecentFile.selectedText =
-            mostRecentFile.selectedText.substring(
-              0,
-              IDE_MAX_SELECTED_TEXT_LENGTH,
-            ) + '... [TRUNCATED]';
+            mostRecentFile.selectedText.substring(0, IDE_MAX_SELECTED_TEXT_LENGTH) +
+            "... [TRUNCATED]";
         }
       }
 
diff --git a/packages/gemini-cli-core/src/ide/process-utils.test.ts b/packages/gemini-cli-core/src/ide/process-utils.test.ts
index 9176dad49..e1fc44cdc 100644
--- a/packages/gemini-cli-core/src/ide/process-utils.test.ts
+++ b/packages/gemini-cli-core/src/ide/process-utils.test.ts
@@ -4,31 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  afterEach,
-  beforeEach,
-  type Mock,
-} from 'vitest';
-import { getIdeProcessInfo } from './process-utils.js';
-import os from 'node:os';
+import os from "node:os";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { getIdeProcessInfo } from "./process-utils.js";
 
 const mockedExec = vi.hoisted(() => vi.fn());
-vi.mock('node:util', () => ({
+vi.mock("node:util", () => ({
   promisify: vi.fn().mockReturnValue(mockedExec),
 }));
-vi.mock('node:os', () => ({
+vi.mock("node:os", () => ({
   default: {
     platform: vi.fn(),
   },
 }));
 
-describe('getIdeProcessInfo', () => {
+describe("getIdeProcessInfo", () => {
   beforeEach(() => {
-    Object.defineProperty(process, 'pid', { value: 1000, configurable: true });
+    Object.defineProperty(process, "pid", { value: 1000, configurable: true });
     mockedExec.mockReset();
   });
 
@@ -36,35 +28,35 @@ describe('getIdeProcessInfo', () => {
     vi.restoreAllMocks();
   });
 
-  describe('on Unix', () => {
-    it('should traverse up to find the shell and return grandparent process info', async () => {
-      (os.platform as Mock).mockReturnValue('linux');
+  describe("on Unix", () => {
+    it("should traverse up to find the shell and return grandparent process info", async () => {
+      (os.platform as Mock).mockReturnValue("linux");
       // process (1000) -> shell (800) -> IDE (700)
       mockedExec
-        .mockResolvedValueOnce({ stdout: '800 /bin/bash' }) // pid 1000 -> ppid 800 (shell)
-        .mockResolvedValueOnce({ stdout: '700 /usr/lib/vscode/code' }) // pid 800 -> ppid 700 (IDE)
-        .mockResolvedValueOnce({ stdout: '700 /usr/lib/vscode/code' }); // get command for pid 700
+        .mockResolvedValueOnce({ stdout: "800 /bin/bash" }) // pid 1000 -> ppid 800 (shell)
+        .mockResolvedValueOnce({ stdout: "700 /usr/lib/vscode/code" }) // pid 800 -> ppid 700 (IDE)
+        .mockResolvedValueOnce({ stdout: "700 /usr/lib/vscode/code" }); // get command for pid 700
 
       const result = await getIdeProcessInfo();
 
-      expect(result).toEqual({ pid: 700, command: '/usr/lib/vscode/code' });
+      expect(result).toEqual({ pid: 700, command: "/usr/lib/vscode/code" });
     });
 
-    it('should return parent process info if grandparent lookup fails', async () => {
-      (os.platform as Mock).mockReturnValue('linux');
+    it("should return parent process info if grandparent lookup fails", async () => {
+      (os.platform as Mock).mockReturnValue("linux");
       mockedExec
-        .mockResolvedValueOnce({ stdout: '800 /bin/bash' }) // pid 1000 -> ppid 800 (shell)
-        .mockRejectedValueOnce(new Error('ps failed')) // lookup for ppid of 800 fails
-        .mockResolvedValueOnce({ stdout: '800 /bin/bash' }); // get command for pid 800
+        .mockResolvedValueOnce({ stdout: "800 /bin/bash" }) // pid 1000 -> ppid 800 (shell)
+        .mockRejectedValueOnce(new Error("ps failed")) // lookup for ppid of 800 fails
+        .mockResolvedValueOnce({ stdout: "800 /bin/bash" }); // get command for pid 800
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 800, command: '/bin/bash' });
+      expect(result).toEqual({ pid: 800, command: "/bin/bash" });
     });
   });
 
-  describe('on Windows', () => {
-    it('should traverse up and find the great-grandchild of the root process', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+  describe("on Windows", () => {
+    it("should traverse up and find the great-grandchild of the root process", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       // process (1000) -> powershell (900) -> code (800) -> wininit (700) -> root (0)
       // Ancestors: [1000, 900, 800, 700]
       // Target (great-grandchild of root): 900
@@ -72,111 +64,111 @@ describe('getIdeProcessInfo', () => {
         {
           ProcessId: 1000,
           ParentProcessId: 900,
-          Name: 'node.exe',
-          CommandLine: 'node.exe',
+          Name: "node.exe",
+          CommandLine: "node.exe",
         },
         {
           ProcessId: 900,
           ParentProcessId: 800,
-          Name: 'powershell.exe',
-          CommandLine: 'powershell.exe',
+          Name: "powershell.exe",
+          CommandLine: "powershell.exe",
         },
         {
           ProcessId: 800,
           ParentProcessId: 700,
-          Name: 'code.exe',
-          CommandLine: 'code.exe',
+          Name: "code.exe",
+          CommandLine: "code.exe",
         },
         {
           ProcessId: 700,
           ParentProcessId: 0,
-          Name: 'wininit.exe',
-          CommandLine: 'wininit.exe',
+          Name: "wininit.exe",
+          CommandLine: "wininit.exe",
         },
       ];
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 900, command: 'powershell.exe' });
+      expect(result).toEqual({ pid: 900, command: "powershell.exe" });
       expect(mockedExec).toHaveBeenCalledWith(
-        expect.stringContaining('Get-CimInstance Win32_Process'),
+        expect.stringContaining("Get-CimInstance Win32_Process"),
         expect.anything(),
       );
     });
 
-    it('should handle short process chains', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle short process chains", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       // process (1000) -> root (0)
       const processes = [
         {
           ProcessId: 1000,
           ParentProcessId: 0,
-          Name: 'node.exe',
-          CommandLine: 'node.exe',
+          Name: "node.exe",
+          CommandLine: "node.exe",
         },
       ];
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: 'node.exe' });
+      expect(result).toEqual({ pid: 1000, command: "node.exe" });
     });
 
-    it('should handle PowerShell failure gracefully', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
-      mockedExec.mockRejectedValueOnce(new Error('PowerShell failed'));
+    it("should handle PowerShell failure gracefully", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
+      mockedExec.mockRejectedValueOnce(new Error("PowerShell failed"));
       // Fallback to getProcessInfo for current PID
-      mockedExec.mockResolvedValueOnce({ stdout: '' }); // ps command fails on windows
+      mockedExec.mockResolvedValueOnce({ stdout: "" }); // ps command fails on windows
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: '' });
+      expect(result).toEqual({ pid: 1000, command: "" });
     });
 
-    it('should handle malformed JSON output gracefully', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle malformed JSON output gracefully", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       mockedExec.mockResolvedValueOnce({ stdout: '{"invalid":json}' });
       // Fallback to getProcessInfo for current PID
-      mockedExec.mockResolvedValueOnce({ stdout: '' });
+      mockedExec.mockResolvedValueOnce({ stdout: "" });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: '' });
+      expect(result).toEqual({ pid: 1000, command: "" });
     });
 
-    it('should handle single process output from ConvertTo-Json', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle single process output from ConvertTo-Json", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       const process = {
         ProcessId: 1000,
         ParentProcessId: 0,
-        Name: 'node.exe',
-        CommandLine: 'node.exe',
+        Name: "node.exe",
+        CommandLine: "node.exe",
       };
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(process) });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: 'node.exe' });
+      expect(result).toEqual({ pid: 1000, command: "node.exe" });
     });
 
-    it('should handle missing process in map during traversal', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle missing process in map during traversal", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       // process (1000) -> parent (900) -> missing (800)
       const processes = [
         {
           ProcessId: 1000,
           ParentProcessId: 900,
-          Name: 'node.exe',
-          CommandLine: 'node.exe',
+          Name: "node.exe",
+          CommandLine: "node.exe",
         },
         {
           ProcessId: 900,
           ParentProcessId: 800,
-          Name: 'parent.exe',
-          CommandLine: 'parent.exe',
+          Name: "parent.exe",
+          CommandLine: "parent.exe",
         },
       ];
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
 
       const result = await getIdeProcessInfo();
       // Ancestors: [1000, 900]. Length < 3, returns last (900)
-      expect(result).toEqual({ pid: 900, command: 'parent.exe' });
+      expect(result).toEqual({ pid: 900, command: "parent.exe" });
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/ide/process-utils.ts b/packages/gemini-cli-core/src/ide/process-utils.ts
index 5c1ca570a..6a7cc1d98 100644
--- a/packages/gemini-cli-core/src/ide/process-utils.ts
+++ b/packages/gemini-cli-core/src/ide/process-utils.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
-import os from 'node:os';
-import path from 'node:path';
+import { exec } from "node:child_process";
+import os from "node:os";
+import path from "node:path";
+import { promisify } from "node:util";
 
 const execAsync = promisify(exec);
 
@@ -35,7 +35,7 @@ async function getProcessTableWindows(): Promise<Map<number, ProcessInfo>> {
   try {
     // Fetch ProcessId, ParentProcessId, Name, and CommandLine for all processes.
     const powershellCommand =
-      'Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress';
+      "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress";
     // Increase maxBuffer to handle large process lists (default is 1MB)
     const { stdout } = await execAsync(`powershell "${powershellCommand}"`, {
       maxBuffer: 10 * 1024 * 1024,
@@ -57,12 +57,12 @@ async function getProcessTableWindows(): Promise<Map<number, ProcessInfo>> {
     }
 
     for (const p of processes) {
-      if (p && typeof p.ProcessId === 'number') {
+      if (p && typeof p.ProcessId === "number") {
         processMap.set(p.ProcessId, {
           pid: p.ProcessId,
           parentPid: p.ParentProcessId || 0,
-          name: p.Name || '',
-          command: p.CommandLine || '',
+          name: p.Name || "",
+          command: p.CommandLine || "",
         });
       }
     }
@@ -88,13 +88,13 @@ async function getProcessInfo(pid: number): Promise<{
     const { stdout } = await execAsync(command);
     const trimmedStdout = stdout.trim();
     if (!trimmedStdout) {
-      return { parentPid: 0, name: '', command: '' };
+      return { parentPid: 0, name: "", command: "" };
     }
     const parts = trimmedStdout.split(/\s+/);
     const ppidString = parts[0];
     const parentPid = parseInt(ppidString, 10);
     const fullCommand = trimmedStdout.substring(ppidString.length).trim();
-    const processName = path.basename(fullCommand.split(' ')[0]);
+    const processName = path.basename(fullCommand.split(" ")[0]);
 
     return {
       parentPid: isNaN(parentPid) ? 1 : parentPid,
@@ -102,7 +102,7 @@ async function getProcessInfo(pid: number): Promise<{
       command: fullCommand,
     };
   } catch (_e) {
-    return { parentPid: 0, name: '', command: '' };
+    return { parentPid: 0, name: "", command: "" };
   }
 }
 
@@ -119,7 +119,7 @@ async function getIdeProcessInfoForUnix(): Promise<{
   pid: number;
   command: string;
 }> {
-  const shells = ['zsh', 'bash', 'sh', 'tcsh', 'csh', 'ksh', 'fish', 'dash'];
+  const shells = ["zsh", "bash", "sh", "tcsh", "csh", "ksh", "fish", "dash"];
   let currentPid = process.pid;
 
   for (let i = 0; i < MAX_TRAVERSAL_DEPTH; i++) {
@@ -218,7 +218,7 @@ export async function getIdeProcessInfo(): Promise<{
 }> {
   const platform = os.platform();
 
-  if (platform === 'win32') {
+  if (platform === "win32") {
     return getIdeProcessInfoForWindows();
   }
 
diff --git a/packages/gemini-cli-core/src/ide/types.ts b/packages/gemini-cli-core/src/ide/types.ts
index dbbce4462..8c54796c2 100644
--- a/packages/gemini-cli-core/src/ide/types.ts
+++ b/packages/gemini-cli-core/src/ide/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
+import { z } from "zod";
 
 /**
  * A file that is open in the IDE.
@@ -67,8 +67,8 @@ export type IdeContext = z.infer<typeof IdeContextSchema>;
  * A notification that the IDE context has been updated.
  */
 export const IdeContextNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/contextUpdate'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/contextUpdate"),
   params: IdeContextSchema,
 });
 
@@ -76,8 +76,8 @@ export const IdeContextNotificationSchema = z.object({
  * A notification that a diff has been accepted in the IDE.
  */
 export const IdeDiffAcceptedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffAccepted'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffAccepted"),
   params: z.object({
     /**
      * The absolute path to the file that was diffed.
@@ -94,8 +94,8 @@ export const IdeDiffAcceptedNotificationSchema = z.object({
  * A notification that a diff has been rejected in the IDE.
  */
 export const IdeDiffRejectedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffRejected'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffRejected"),
   params: z.object({
     /**
      * The absolute path to the file that was diffed.
@@ -111,8 +111,8 @@ export const IdeDiffRejectedNotificationSchema = z.object({
  * A notification that a diff has been closed in the IDE.
  */
 export const IdeDiffClosedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffClosed'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffClosed"),
   params: z.object({
     filePath: z.string(),
     content: z.string().optional(),
diff --git a/packages/gemini-cli-core/src/index.test.ts b/packages/gemini-cli-core/src/index.test.ts
index 154c96a6a..fe4cef878 100644
--- a/packages/gemini-cli-core/src/index.test.ts
+++ b/packages/gemini-cli-core/src/index.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 
-describe('placeholder tests', () => {
-  it('should pass', () => {
+describe("placeholder tests", () => {
+  it("should pass", () => {
     expect(true).toBe(true);
   });
 });
diff --git a/packages/gemini-cli-core/src/index.ts b/packages/gemini-cli-core/src/index.ts
index b268ea12d..f2fe6172a 100644
--- a/packages/gemini-cli-core/src/index.ts
+++ b/packages/gemini-cli-core/src/index.ts
@@ -4,158 +4,141 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Export config
-export * from './config/config.js';
-export * from './config/defaultModelConfigs.js';
-export * from './config/models.js';
-export * from './output/types.js';
-export * from './output/json-formatter.js';
-export * from './output/stream-json-formatter.js';
-export * from './policy/types.js';
-export * from './policy/policy-engine.js';
-export * from './policy/toml-loader.js';
-export * from './policy/config.js';
-export * from './confirmation-bus/types.js';
-export * from './confirmation-bus/message-bus.js';
-
+export * from "./code_assist/codeAssist.js";
+export * from "./code_assist/oauth2.js";
+export * from "./code_assist/server.js";
+export * from "./code_assist/types.js";
 // Export Commands logic
-export * from './commands/extensions.js';
-export * from './commands/restore.js';
-export * from './commands/types.js';
-
+export * from "./commands/extensions.js";
+export * from "./commands/restore.js";
+export * from "./commands/types.js";
+// Export config
+export * from "./config/config.js";
+export * from "./config/defaultModelConfigs.js";
+export * from "./config/models.js";
+export { Storage } from "./config/storage.js";
+export * from "./confirmation-bus/message-bus.js";
+export * from "./confirmation-bus/types.js";
+export * from "./core/apiKeyCredentialStorage.js";
 // Export Core Logic
-export * from './core/client.js';
-export * from './core/contentGenerator.js';
-export * from './core/loggingContentGenerator.js';
-export * from './core/geminiChat.js';
-export * from './core/logger.js';
-export * from './core/prompts.js';
-export * from './core/tokenLimits.js';
-export * from './core/turn.js';
-export * from './core/geminiRequest.js';
-export * from './core/coreToolScheduler.js';
-export * from './core/nonInteractiveToolExecutor.js';
-export * from './core/recordingContentGenerator.js';
-
-export * from './fallback/types.js';
-
-export * from './code_assist/codeAssist.js';
-export * from './code_assist/oauth2.js';
-export * from './code_assist/server.js';
-export * from './code_assist/types.js';
-export * from './core/apiKeyCredentialStorage.js';
-
-// Export utilities
-export * from './utils/paths.js';
-export * from './utils/schemaValidator.js';
-export * from './utils/errors.js';
-export * from './utils/exitCodes.js';
-export * from './utils/getFolderStructure.js';
-export * from './utils/memoryDiscovery.js';
-export * from './utils/getPty.js';
-export * from './utils/gitIgnoreParser.js';
-export * from './utils/gitUtils.js';
-export * from './utils/editor.js';
-export * from './utils/quotaErrorDetection.js';
-export * from './utils/userAccountManager.js';
-export * from './utils/googleQuotaErrors.js';
-export * from './utils/fileUtils.js';
-export * from './utils/retry.js';
-export * from './utils/shell-utils.js';
-export * from './utils/terminalSerializer.js';
-export * from './utils/systemEncoding.js';
-export * from './utils/textUtils.js';
-export * from './utils/formatters.js';
-export * from './utils/generateContentResponseUtilities.js';
-export * from './utils/filesearch/fileSearch.js';
-export * from './utils/errorParsing.js';
-export * from './utils/workspaceContext.js';
-export * from './utils/ignorePatterns.js';
-export * from './utils/partUtils.js';
-export * from './utils/promptIdContext.js';
-export * from './utils/thoughtUtils.js';
-export * from './utils/debugLogger.js';
-export * from './utils/events.js';
-export * from './utils/extensionLoader.js';
-export * from './utils/package.js';
-export * from './utils/version.js';
-export * from './utils/checkpointUtils.js';
-
-// Export services
-export * from './services/fileDiscoveryService.js';
-export * from './services/gitService.js';
-export * from './services/chatRecordingService.js';
-export * from './services/fileSystemService.js';
-export * from './services/sessionSummaryUtils.js';
-export * from './services/contextManager.js';
-
+export * from "./core/client.js";
+export * from "./core/contentGenerator.js";
+export * from "./core/coreToolScheduler.js";
+export * from "./core/geminiChat.js";
+export * from "./core/geminiRequest.js";
+export * from "./core/logger.js";
+export * from "./core/loggingContentGenerator.js";
+export * from "./core/nonInteractiveToolExecutor.js";
+export * from "./core/prompts.js";
+export * from "./core/recordingContentGenerator.js";
+export * from "./core/tokenLimits.js";
+export * from "./core/turn.js";
+export * from "./fallback/types.js";
+// Export hooks system
+export * from "./hooks/index.js";
+// Export hook types
+export * from "./hooks/types.js";
+export * from "./ide/constants.js";
+export { IDE_DEFINITIONS, type IdeInfo } from "./ide/detect-ide.js";
 // Export IDE specific logic
-export * from './ide/ide-client.js';
-export * from './ide/ideContext.js';
-export * from './ide/ide-installer.js';
-export { IDE_DEFINITIONS, type IdeInfo } from './ide/detect-ide.js';
-export * from './ide/constants.js';
-export * from './ide/types.js';
-
-// Export Shell Execution Service
-export * from './services/shellExecutionService.js';
-
-// Export base tool definitions
-export * from './tools/tools.js';
-export * from './tools/tool-error.js';
-export * from './tools/tool-registry.js';
-export * from './tools/tool-names.js';
-export * from './resources/resource-registry.js';
-
-// Export prompt logic
-export * from './prompts/mcp-prompts.js';
-
-// Export specific tool logic
-export * from './tools/read-file.js';
-export * from './tools/ls.js';
-export * from './tools/grep.js';
-export * from './tools/ripGrep.js';
-export * from './tools/glob.js';
-export * from './tools/edit.js';
-export * from './tools/write-file.js';
-export * from './tools/web-fetch.js';
-export * from './tools/memoryTool.js';
-export * from './tools/shell.js';
-export * from './tools/web-search.js';
-export * from './tools/read-many-files.js';
-export * from './tools/mcp-client.js';
-export * from './tools/mcp-tool.js';
-export * from './tools/write-todos.js';
-
+export * from "./ide/ide-client.js";
+export * from "./ide/ide-installer.js";
+export * from "./ide/ideContext.js";
+export * from "./ide/types.js";
+export type { MCPOAuthConfig } from "./mcp/oauth-provider.js";
 // MCP OAuth
-export { MCPOAuthProvider } from './mcp/oauth-provider.js';
-export type {
-  OAuthToken,
-  OAuthCredentials,
-} from './mcp/token-storage/types.js';
-export { MCPOAuthTokenStorage } from './mcp/oauth-token-storage.js';
-export type { MCPOAuthConfig } from './mcp/oauth-provider.js';
+export { MCPOAuthProvider } from "./mcp/oauth-provider.js";
+export { MCPOAuthTokenStorage } from "./mcp/oauth-token-storage.js";
 export type {
   OAuthAuthorizationServerMetadata,
   OAuthProtectedResourceMetadata,
-} from './mcp/oauth-utils.js';
-export { OAuthUtils } from './mcp/oauth-utils.js';
-
+} from "./mcp/oauth-utils.js";
+export { OAuthUtils } from "./mcp/oauth-utils.js";
+export type {
+  OAuthCredentials,
+  OAuthToken,
+} from "./mcp/token-storage/types.js";
+export * from "./output/json-formatter.js";
+export * from "./output/stream-json-formatter.js";
+export * from "./output/types.js";
+export * from "./policy/config.js";
+export * from "./policy/policy-engine.js";
+export * from "./policy/toml-loader.js";
+export * from "./policy/types.js";
+// Export prompt logic
+export * from "./prompts/mcp-prompts.js";
+export * from "./resources/resource-registry.js";
+export * from "./services/chatRecordingService.js";
+export * from "./services/contextManager.js";
+// Export services
+export * from "./services/fileDiscoveryService.js";
+export * from "./services/fileSystemService.js";
+export * from "./services/gitService.js";
+export * from "./services/sessionSummaryUtils.js";
+// Export Shell Execution Service
+export * from "./services/shellExecutionService.js";
 // Export telemetry functions
-export * from './telemetry/index.js';
-export { sessionId } from './utils/session.js';
-export * from './utils/browser.js';
-export { Storage } from './config/storage.js';
-
-// Export hooks system
-export * from './hooks/index.js';
-
+export * from "./telemetry/index.js";
 // Export test utils
-export * from './test-utils/index.js';
-
-// Export hook types
-export * from './hooks/types.js';
-
+export * from "./test-utils/index.js";
+export * from "./tools/edit.js";
+export * from "./tools/glob.js";
+export * from "./tools/grep.js";
+export * from "./tools/ls.js";
+export * from "./tools/mcp-client.js";
+export * from "./tools/mcp-tool.js";
+export * from "./tools/memoryTool.js";
+// Export specific tool logic
+export * from "./tools/read-file.js";
+export * from "./tools/read-many-files.js";
+export * from "./tools/ripGrep.js";
+export * from "./tools/shell.js";
+export * from "./tools/tool-error.js";
+export * from "./tools/tool-names.js";
+export * from "./tools/tool-registry.js";
+// Export base tool definitions
+export * from "./tools/tools.js";
+export * from "./tools/web-fetch.js";
+export * from "./tools/web-search.js";
+export * from "./tools/write-file.js";
+export * from "./tools/write-todos.js";
+export * from "./utils/browser.js";
+export * from "./utils/checkpointUtils.js";
+export * from "./utils/debugLogger.js";
+export * from "./utils/editor.js";
+export * from "./utils/errorParsing.js";
+export * from "./utils/errors.js";
+export * from "./utils/events.js";
+export * from "./utils/exitCodes.js";
+export * from "./utils/extensionLoader.js";
+export * from "./utils/filesearch/fileSearch.js";
+export * from "./utils/fileUtils.js";
+export * from "./utils/formatters.js";
+export * from "./utils/generateContentResponseUtilities.js";
+export * from "./utils/getFolderStructure.js";
+export * from "./utils/getPty.js";
+export * from "./utils/gitIgnoreParser.js";
+export * from "./utils/gitUtils.js";
+export * from "./utils/googleQuotaErrors.js";
+export * from "./utils/ignorePatterns.js";
+export * from "./utils/memoryDiscovery.js";
+export * from "./utils/package.js";
+export * from "./utils/partUtils.js";
+// Export utilities
+export * from "./utils/paths.js";
+export * from "./utils/promptIdContext.js";
+export * from "./utils/quotaErrorDetection.js";
+export * from "./utils/retry.js";
+export * from "./utils/schemaValidator.js";
+export { sessionId } from "./utils/session.js";
+export * from "./utils/shell-utils.js";
 // Export stdio utils
-export * from './utils/stdio.js';
-export * from './utils/terminal.js';
+export * from "./utils/stdio.js";
+export * from "./utils/systemEncoding.js";
+export * from "./utils/terminal.js";
+export * from "./utils/terminalSerializer.js";
+export * from "./utils/textUtils.js";
+export * from "./utils/thoughtUtils.js";
+export * from "./utils/userAccountManager.js";
+export * from "./utils/version.js";
+export * from "./utils/workspaceContext.js";
diff --git a/packages/gemini-cli-core/src/mcp/auth-provider.ts b/packages/gemini-cli-core/src/mcp/auth-provider.ts
index 6706a2130..301696f3e 100644
--- a/packages/gemini-cli-core/src/mcp/auth-provider.ts
+++ b/packages/gemini-cli-core/src/mcp/auth-provider.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
 
 /**
  * Extension of OAuthClientProvider that allows providers to inject custom headers
diff --git a/packages/gemini-cli-core/src/mcp/google-auth-provider.test.ts b/packages/gemini-cli-core/src/mcp/google-auth-provider.test.ts
index 8a25f15ad..051884b5c 100644
--- a/packages/gemini-cli-core/src/mcp/google-auth-provider.test.ts
+++ b/packages/gemini-cli-core/src/mcp/google-auth-provider.test.ts
@@ -4,43 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { GoogleAuth } from 'google-auth-library';
-import { GoogleCredentialProvider } from './google-auth-provider.js';
-import type { Mock } from 'vitest';
-import { vi, describe, beforeEach, it, expect } from 'vitest';
-import type { MCPServerConfig } from '../config/config.js';
+import { GoogleAuth } from "google-auth-library";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { MCPServerConfig } from "../config/config.js";
+import { GoogleCredentialProvider } from "./google-auth-provider.js";
 
-vi.mock('google-auth-library');
+vi.mock("google-auth-library");
 
-describe('GoogleCredentialProvider', () => {
+describe("GoogleCredentialProvider", () => {
   const validConfig = {
-    url: 'https://test.googleapis.com',
+    url: "https://test.googleapis.com",
     oauth: {
-      scopes: ['scope1', 'scope2'],
+      scopes: ["scope1", "scope2"],
     },
   } as MCPServerConfig;
 
-  it('should throw an error if no scopes are provided', () => {
+  it("should throw an error if no scopes are provided", () => {
     const config = {
-      url: 'https://test.googleapis.com',
+      url: "https://test.googleapis.com",
     } as MCPServerConfig;
     expect(() => new GoogleCredentialProvider(config)).toThrow(
-      'Scopes must be provided in the oauth config for Google Credentials provider',
+      "Scopes must be provided in the oauth config for Google Credentials provider",
     );
   });
 
-  it('should use scopes from the config if provided', () => {
+  it("should use scopes from the config if provided", () => {
     new GoogleCredentialProvider(validConfig);
     expect(GoogleAuth).toHaveBeenCalledWith({
-      scopes: ['scope1', 'scope2'],
+      scopes: ["scope1", "scope2"],
     });
   });
 
-  it('should throw an error for a non-allowlisted host', () => {
+  it("should throw an error for a non-allowlisted host", () => {
     const config = {
-      url: 'https://example.com',
+      url: "https://example.com",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     expect(() => new GoogleCredentialProvider(config)).toThrow(
@@ -48,31 +48,31 @@ describe('GoogleCredentialProvider', () => {
     );
   });
 
-  it('should allow luci.app', () => {
+  it("should allow luci.app", () => {
     const config = {
-      url: 'https://luci.app',
+      url: "https://luci.app",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     new GoogleCredentialProvider(config);
   });
 
-  it('should allow sub.luci.app', () => {
+  it("should allow sub.luci.app", () => {
     const config = {
-      url: 'https://sub.luci.app',
+      url: "https://sub.luci.app",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     new GoogleCredentialProvider(config);
   });
 
-  it('should not allow googleapis.com without a subdomain', () => {
+  it("should not allow googleapis.com without a subdomain", () => {
     const config = {
-      url: 'https://googleapis.com',
+      url: "https://googleapis.com",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     expect(() => new GoogleCredentialProvider(config)).toThrow(
@@ -80,7 +80,7 @@ describe('GoogleCredentialProvider', () => {
     );
   });
 
-  describe('with provider instance', () => {
+  describe("with provider instance", () => {
     let provider: GoogleCredentialProvider;
     let mockGetAccessToken: Mock;
     let mockClient: {
@@ -99,28 +99,28 @@ describe('GoogleCredentialProvider', () => {
       provider = new GoogleCredentialProvider(validConfig);
     });
 
-    it('should return credentials', async () => {
-      mockGetAccessToken.mockResolvedValue({ token: 'test-token' });
+    it("should return credentials", async () => {
+      mockGetAccessToken.mockResolvedValue({ token: "test-token" });
 
       const credentials = await provider.tokens();
-      expect(credentials?.access_token).toBe('test-token');
+      expect(credentials?.access_token).toBe("test-token");
     });
 
-    it('should return undefined if access token is not available', async () => {
+    it("should return undefined if access token is not available", async () => {
       mockGetAccessToken.mockResolvedValue({ token: null });
 
       const credentials = await provider.tokens();
       expect(credentials).toBeUndefined();
     });
 
-    it('should return a cached token if it is not expired', async () => {
+    it("should return a cached token if it is not expired", async () => {
       vi.useFakeTimers();
       mockClient.credentials = { expiry_date: Date.now() + 3600 * 1000 }; // 1 hour
-      mockGetAccessToken.mockResolvedValue({ token: 'test-token' });
+      mockGetAccessToken.mockResolvedValue({ token: "test-token" });
 
       // first call
       const firstTokens = await provider.tokens();
-      expect(firstTokens?.access_token).toBe('test-token');
+      expect(firstTokens?.access_token).toBe("test-token");
       expect(mockGetAccessToken).toHaveBeenCalledTimes(1);
 
       // second call
@@ -132,79 +132,75 @@ describe('GoogleCredentialProvider', () => {
       vi.useRealTimers();
     });
 
-    it('should fetch a new token if the cached token is expired', async () => {
+    it("should fetch a new token if the cached token is expired", async () => {
       vi.useFakeTimers();
 
       // first call
       mockClient.credentials = { expiry_date: Date.now() + 1000 }; // Expires in 1 second
-      mockGetAccessToken.mockResolvedValue({ token: 'expired-token' });
+      mockGetAccessToken.mockResolvedValue({ token: "expired-token" });
 
       const firstTokens = await provider.tokens();
-      expect(firstTokens?.access_token).toBe('expired-token');
+      expect(firstTokens?.access_token).toBe("expired-token");
       expect(mockGetAccessToken).toHaveBeenCalledTimes(1);
 
       // second call
       vi.advanceTimersByTime(1001); // Advance time past expiry
       mockClient.credentials = { expiry_date: Date.now() + 3600 * 1000 }; // New expiry
-      mockGetAccessToken.mockResolvedValue({ token: 'new-token' });
+      mockGetAccessToken.mockResolvedValue({ token: "new-token" });
 
       const newTokens = await provider.tokens();
-      expect(newTokens?.access_token).toBe('new-token');
+      expect(newTokens?.access_token).toBe("new-token");
       expect(mockGetAccessToken).toHaveBeenCalledTimes(2); // new fetch
 
       vi.useRealTimers();
     });
 
-    it('should return quota project ID', async () => {
-      mockClient['quotaProjectId'] = 'test-project-id';
+    it("should return quota project ID", async () => {
+      mockClient["quotaProjectId"] = "test-project-id";
       const quotaProjectId = await provider.getQuotaProjectId();
-      expect(quotaProjectId).toBe('test-project-id');
+      expect(quotaProjectId).toBe("test-project-id");
     });
 
-    it('should return request headers with quota project ID', async () => {
-      mockClient['quotaProjectId'] = 'test-project-id';
+    it("should return request headers with quota project ID", async () => {
+      mockClient["quotaProjectId"] = "test-project-id";
       const headers = await provider.getRequestHeaders();
       expect(headers).toEqual({
-        'X-Goog-User-Project': 'test-project-id',
+        "X-Goog-User-Project": "test-project-id",
       });
     });
 
-    it('should return empty request headers if quota project ID is missing', async () => {
-      mockClient['quotaProjectId'] = undefined;
+    it("should return empty request headers if quota project ID is missing", async () => {
+      mockClient["quotaProjectId"] = undefined;
       const headers = await provider.getRequestHeaders();
       expect(headers).toEqual({});
     });
 
-    it('should prioritize config headers over quota project ID', async () => {
-      mockClient['quotaProjectId'] = 'quota-project-id';
+    it("should prioritize config headers over quota project ID", async () => {
+      mockClient["quotaProjectId"] = "quota-project-id";
       const configWithHeaders = {
         ...validConfig,
         headers: {
-          'X-Goog-User-Project': 'config-project-id',
+          "X-Goog-User-Project": "config-project-id",
         },
       };
-      const providerWithHeaders = new GoogleCredentialProvider(
-        configWithHeaders,
-      );
+      const providerWithHeaders = new GoogleCredentialProvider(configWithHeaders);
       const headers = await providerWithHeaders.getRequestHeaders();
       expect(headers).toEqual({
-        'X-Goog-User-Project': 'config-project-id',
+        "X-Goog-User-Project": "config-project-id",
       });
     });
-    it('should prioritize config headers over quota project ID (case-insensitive)', async () => {
-      mockClient['quotaProjectId'] = 'quota-project-id';
+    it("should prioritize config headers over quota project ID (case-insensitive)", async () => {
+      mockClient["quotaProjectId"] = "quota-project-id";
       const configWithHeaders = {
         ...validConfig,
         headers: {
-          'x-goog-user-project': 'config-project-id',
+          "x-goog-user-project": "config-project-id",
         },
       };
-      const providerWithHeaders = new GoogleCredentialProvider(
-        configWithHeaders,
-      );
+      const providerWithHeaders = new GoogleCredentialProvider(configWithHeaders);
       const headers = await providerWithHeaders.getRequestHeaders();
       expect(headers).toEqual({
-        'x-goog-user-project': 'config-project-id',
+        "x-goog-user-project": "config-project-id",
       });
     });
   });
diff --git a/packages/gemini-cli-core/src/mcp/google-auth-provider.ts b/packages/gemini-cli-core/src/mcp/google-auth-provider.ts
index a4f61c313..6fb91de1c 100644
--- a/packages/gemini-cli-core/src/mcp/google-auth-provider.ts
+++ b/packages/gemini-cli-core/src/mcp/google-auth-provider.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { McpAuthProvider } from './auth-provider.js';
 import type {
   OAuthClientInformation,
   OAuthClientInformationFull,
   OAuthClientMetadata,
   OAuthTokens,
-} from '@modelcontextprotocol/sdk/shared/auth.js';
-import { GoogleAuth } from 'google-auth-library';
-import type { MCPServerConfig } from '../config/config.js';
-import { FIVE_MIN_BUFFER_MS } from './oauth-utils.js';
-import { coreEvents } from '../utils/events.js';
+} from "@modelcontextprotocol/sdk/shared/auth.js";
+import { GoogleAuth } from "google-auth-library";
+import type { MCPServerConfig } from "../config/config.js";
+import { coreEvents } from "../utils/events.js";
+import type { McpAuthProvider } from "./auth-provider.js";
+import { FIVE_MIN_BUFFER_MS } from "./oauth-utils.js";
 
 const ALLOWED_HOSTS = [/^.+\.googleapis\.com$/, /^(.*\.)?luci\.app$/];
 
@@ -24,35 +24,31 @@ export class GoogleCredentialProvider implements McpAuthProvider {
   private tokenExpiryTime?: number;
 
   // Properties required by OAuthClientProvider, with no-op values
-  readonly redirectUrl = '';
+  readonly redirectUrl = "";
   readonly clientMetadata: OAuthClientMetadata = {
-    client_name: 'Gemini CLI (Google ADC)',
+    client_name: "Gemini CLI (Google ADC)",
     redirect_uris: [],
     grant_types: [],
     response_types: [],
-    token_endpoint_auth_method: 'none',
+    token_endpoint_auth_method: "none",
   };
   private _clientInformation?: OAuthClientInformationFull;
 
   constructor(private readonly config?: MCPServerConfig) {
     const url = this.config?.url || this.config?.httpUrl;
     if (!url) {
-      throw new Error(
-        'URL must be provided in the config for Google Credentials provider',
-      );
+      throw new Error("URL must be provided in the config for Google Credentials provider");
     }
 
     const hostname = new URL(url).hostname;
     if (!ALLOWED_HOSTS.some((pattern) => pattern.test(hostname))) {
-      throw new Error(
-        `Host "${hostname}" is not an allowed host for Google Credential provider.`,
-      );
+      throw new Error(`Host "${hostname}" is not an allowed host for Google Credential provider.`);
     }
 
     const scopes = this.config?.oauth?.scopes;
     if (!scopes || scopes.length === 0) {
       throw new Error(
-        'Scopes must be provided in the oauth config for Google Credentials provider',
+        "Scopes must be provided in the oauth config for Google Credentials provider",
       );
     }
     this.auth = new GoogleAuth({
@@ -86,16 +82,13 @@ export class GoogleCredentialProvider implements McpAuthProvider {
     const accessTokenResponse = await client.getAccessToken();
 
     if (!accessTokenResponse.token) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to get access token from Google ADC',
-      );
+      coreEvents.emitFeedback("error", "Failed to get access token from Google ADC");
       return undefined;
     }
 
     const newToken: OAuthTokens = {
       access_token: accessTokenResponse.token,
-      token_type: 'Bearer',
+      token_type: "Bearer",
     };
 
     const expiryTime = client.credentials?.expiry_date;
@@ -121,7 +114,7 @@ export class GoogleCredentialProvider implements McpAuthProvider {
 
   codeVerifier(): string {
     // No-op
-    return '';
+    return "";
   }
   /**
    * Returns the project ID used for quota.
@@ -138,7 +131,7 @@ export class GoogleCredentialProvider implements McpAuthProvider {
     const headers: Record<string, string> = {};
     const configHeaders = this.config?.headers ?? {};
     const userProjectHeaderKey = Object.keys(configHeaders).find(
-      (key) => key.toLowerCase() === 'x-goog-user-project',
+      (key) => key.toLowerCase() === "x-goog-user-project",
     );
 
     // If the header is present in the config (case-insensitive check), use the
@@ -149,7 +142,7 @@ export class GoogleCredentialProvider implements McpAuthProvider {
     } else {
       const quotaProjectId = await this.getQuotaProjectId();
       if (quotaProjectId) {
-        headers['X-Goog-User-Project'] = quotaProjectId;
+        headers["X-Goog-User-Project"] = quotaProjectId;
       }
     }
     return headers;
diff --git a/packages/gemini-cli-core/src/mcp/oauth-provider.test.ts b/packages/gemini-cli-core/src/mcp/oauth-provider.test.ts
index 5ddc60706..cc4a9fffa 100644
--- a/packages/gemini-cli-core/src/mcp/oauth-provider.test.ts
+++ b/packages/gemini-cli-core/src/mcp/oauth-provider.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
+import { vi } from "vitest";
 
 // Mock dependencies AT THE TOP
 const mockOpenBrowserSecurely = vi.hoisted(() => vi.fn());
-vi.mock('../utils/secure-browser-launcher.js', () => ({
+vi.mock("../utils/secure-browser-launcher.js", () => ({
   openBrowserSecurely: mockOpenBrowserSecurely,
 }));
-vi.mock('node:crypto');
-vi.mock('./oauth-token-storage.js', () => {
+vi.mock("node:crypto");
+vi.mock("./oauth-token-storage.js", () => {
   const mockSaveToken = vi.fn();
   const mockGetCredentials = vi.fn();
   const mockIsTokenExpired = vi.fn();
@@ -27,30 +27,30 @@ vi.mock('./oauth-token-storage.js', () => {
     })),
   };
 });
-vi.mock('../utils/events.js', () => ({
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
     emitConsoleLog: vi.fn(),
   },
 }));
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as http from 'node:http';
-import * as crypto from 'node:crypto';
+import * as crypto from "node:crypto";
+import * as http from "node:http";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { coreEvents } from "../utils/events.js";
 import type {
   MCPOAuthConfig,
-  OAuthTokenResponse,
   OAuthClientRegistrationResponse,
-} from './oauth-provider.js';
-import { MCPOAuthProvider } from './oauth-provider.js';
-import type { OAuthToken } from './token-storage/types.js';
-import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
+  OAuthTokenResponse,
+} from "./oauth-provider.js";
+import { MCPOAuthProvider } from "./oauth-provider.js";
+import { MCPOAuthTokenStorage } from "./oauth-token-storage.js";
 import {
-  OAuthUtils,
   type OAuthAuthorizationServerMetadata,
   type OAuthProtectedResourceMetadata,
-} from './oauth-utils.js';
-import { coreEvents } from '../utils/events.js';
+  OAuthUtils,
+} from "./oauth-utils.js";
+import type { OAuthToken } from "./token-storage/types.js";
 
 // Mock fetch globally
 const mockFetch = vi.fn();
@@ -76,7 +76,7 @@ const createMockResponse = (options: {
     ok: options.ok,
     headers: {
       get: (name: string) => {
-        if (name.toLowerCase() === 'content-type') {
+        if (name.toLowerCase() === "content-type") {
           return options.contentType || null;
         }
         return null;
@@ -90,14 +90,14 @@ const createMockResponse = (options: {
 
   if (options.text !== undefined) {
     response.text =
-      typeof options.text === 'string'
+      typeof options.text === "string"
         ? () => Promise.resolve(options.text as string)
         : (options.text as () => Promise<string>);
   }
 
   if (options.json !== undefined) {
     response.json =
-      typeof options.json === 'function'
+      typeof options.json === "function"
         ? (options.json as () => Promise<unknown>)
         : () => Promise.resolve(options.json);
   }
@@ -110,65 +110,65 @@ const mockHttpServer = {
   listen: vi.fn(),
   close: vi.fn(),
   on: vi.fn(),
-  address: vi.fn(() => ({ address: 'localhost', family: 'IPv4', port: 7777 })),
+  address: vi.fn(() => ({ address: "localhost", family: "IPv4", port: 7777 })),
 };
-vi.mock('node:http', () => ({
+vi.mock("node:http", () => ({
   createServer: vi.fn(() => mockHttpServer),
 }));
 
-describe('MCPOAuthProvider', () => {
+describe("MCPOAuthProvider", () => {
   const mockConfig: MCPOAuthConfig = {
     enabled: true,
-    clientId: 'test-client-id',
-    clientSecret: 'test-client-secret',
-    authorizationUrl: 'https://auth.example.com/authorize',
-    tokenUrl: 'https://auth.example.com/token',
-    scopes: ['read', 'write'],
-    redirectUri: 'http://localhost:7777/oauth/callback',
-    audiences: ['https://api.example.com'],
+    clientId: "test-client-id",
+    clientSecret: "test-client-secret",
+    authorizationUrl: "https://auth.example.com/authorize",
+    tokenUrl: "https://auth.example.com/token",
+    scopes: ["read", "write"],
+    redirectUri: "http://localhost:7777/oauth/callback",
+    audiences: ["https://api.example.com"],
   };
 
   const mockToken: OAuthToken = {
-    accessToken: 'access_token_123',
-    refreshToken: 'refresh_token_456',
-    tokenType: 'Bearer',
-    scope: 'read write',
+    accessToken: "access_token_123",
+    refreshToken: "refresh_token_456",
+    tokenType: "Bearer",
+    scope: "read write",
     expiresAt: Date.now() + 3600000,
   };
 
   const mockTokenResponse: OAuthTokenResponse = {
-    access_token: 'access_token_123',
-    token_type: 'Bearer',
+    access_token: "access_token_123",
+    token_type: "Bearer",
     expires_in: 3600,
-    refresh_token: 'refresh_token_456',
-    scope: 'read write',
+    refresh_token: "refresh_token_456",
+    scope: "read write",
   };
 
   beforeEach(() => {
     vi.clearAllMocks();
     mockOpenBrowserSecurely.mockClear();
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
 
     // Mock crypto functions
     vi.mocked(crypto.randomBytes).mockImplementation((size: number) => {
-      if (size === 32) return Buffer.from('code_verifier_mock_32_bytes_long');
-      if (size === 16) return Buffer.from('state_mock_16_by');
+      if (size === 32) return Buffer.from("code_verifier_mock_32_bytes_long");
+      if (size === 16) return Buffer.from("state_mock_16_by");
       return Buffer.alloc(size);
     });
 
     vi.mocked(crypto.createHash).mockReturnValue({
       update: vi.fn().mockReturnThis(),
-      digest: vi.fn().mockReturnValue('code_challenge_mock'),
+      digest: vi.fn().mockReturnValue("code_challenge_mock"),
     } as unknown as crypto.Hash);
 
     // Mock randomBytes to return predictable values for state
     vi.mocked(crypto.randomBytes).mockImplementation((size) => {
       if (size === 32) {
-        return Buffer.from('mock_code_verifier_32_bytes_long_string');
+        return Buffer.from("mock_code_verifier_32_bytes_long_string");
       } else if (size === 16) {
-        return Buffer.from('mock_state_16_bytes');
+        return Buffer.from("mock_state_16_bytes");
       }
       return Buffer.alloc(size);
     });
@@ -183,8 +183,8 @@ describe('MCPOAuthProvider', () => {
     vi.restoreAllMocks();
   });
 
-  describe('authenticate', () => {
-    it('should perform complete OAuth flow with PKCE', async () => {
+  describe("authenticate", () => {
+    it("should perform complete OAuth flow with PKCE", async () => {
       // Mock HTTP server callback
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
@@ -197,16 +197,13 @@ describe('MCPOAuthProvider', () => {
         // Simulate OAuth callback
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -214,54 +211,52 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate('test-server', mockConfig);
+      const result = await authProvider.authenticate("test-server", mockConfig);
 
       expect(result).toEqual({
-        accessToken: 'access_token_123',
-        refreshToken: 'refresh_token_456',
-        tokenType: 'Bearer',
-        scope: 'read write',
+        accessToken: "access_token_123",
+        refreshToken: "refresh_token_456",
+        tokenType: "Bearer",
+        scope: "read write",
         expiresAt: expect.any(Number),
       });
 
-      expect(mockOpenBrowserSecurely).toHaveBeenCalledWith(
-        expect.stringContaining('authorize'),
-      );
+      expect(mockOpenBrowserSecurely).toHaveBeenCalledWith(expect.stringContaining("authorize"));
       const tokenStorage = new MCPOAuthTokenStorage();
       expect(tokenStorage.saveToken).toHaveBeenCalledWith(
-        'test-server',
-        expect.objectContaining({ accessToken: 'access_token_123' }),
-        'test-client-id',
-        'https://auth.example.com/token',
+        "test-server",
+        expect.objectContaining({ accessToken: "access_token_123" }),
+        "test-client-id",
+        "https://auth.example.com/token",
         undefined,
       );
     });
 
-    it('should handle OAuth discovery when no authorization URL provided', async () => {
+    it("should handle OAuth discovery when no authorization URL provided", async () => {
       // Use a mutable config object
       const configWithoutAuth: MCPOAuthConfig = {
         ...mockConfig,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
+        clientId: "test-client-id",
+        clientSecret: "test-client-secret",
       };
       delete configWithoutAuth.authorizationUrl;
       delete configWithoutAuth.tokenUrl;
 
       const mockResourceMetadata = {
-        authorization_servers: ['https://discovered.auth.com'],
+        authorization_servers: ["https://discovered.auth.com"],
       };
 
       const mockAuthServerMetadata = {
-        authorization_endpoint: 'https://discovered.auth.com/authorize',
-        token_endpoint: 'https://discovered.auth.com/token',
-        scopes_supported: ['read', 'write'],
+        authorization_endpoint: "https://discovered.auth.com/authorize",
+        token_endpoint: "https://discovered.auth.com/token",
+        scopes_supported: ["read", "write"],
       };
 
       // Mock HEAD request for WWW-Authenticate check
@@ -275,7 +270,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -283,7 +278,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -300,16 +295,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -317,7 +309,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -325,43 +317,43 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithoutAuth,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://discovered.auth.com/token',
+        "https://discovered.auth.com/token",
         expect.objectContaining({
-          method: 'POST',
+          method: "POST",
           headers: expect.objectContaining({
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "Content-Type": "application/x-www-form-urlencoded",
           }),
         }),
       );
     });
 
-    it('should perform dynamic client registration when no client ID is provided but registration URL is provided', async () => {
+    it("should perform dynamic client registration when no client ID is provided but registration URL is provided", async () => {
       const configWithoutClient: MCPOAuthConfig = {
         ...mockConfig,
-        registrationUrl: 'https://auth.example.com/register',
+        registrationUrl: "https://auth.example.com/register",
       };
       delete configWithoutClient.clientId;
 
       const mockRegistrationResponse: OAuthClientRegistrationResponse = {
-        client_id: 'dynamic_client_id',
-        client_secret: 'dynamic_client_secret',
-        redirect_uris: ['http://localhost:7777/oauth/callback'],
-        grant_types: ['authorization_code', 'refresh_token'],
-        response_types: ['code'],
-        token_endpoint_auth_method: 'none',
+        client_id: "dynamic_client_id",
+        client_secret: "dynamic_client_secret",
+        redirect_uris: ["http://localhost:7777/oauth/callback"],
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none",
       };
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockRegistrationResponse),
           json: mockRegistrationResponse,
         }),
@@ -378,16 +370,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -395,53 +384,50 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate(
-        'test-server',
-        configWithoutClient,
-      );
+      const result = await authProvider.authenticate("test-server", configWithoutClient);
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/register',
+        "https://auth.example.com/register",
         expect.objectContaining({
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
         }),
       );
     });
 
-    it('should perform OAuth discovery and dynamic client registration when no client ID or registration URL provided', async () => {
+    it("should perform OAuth discovery and dynamic client registration when no client ID or registration URL provided", async () => {
       const configWithoutClient: MCPOAuthConfig = { ...mockConfig };
       delete configWithoutClient.clientId;
 
       const mockRegistrationResponse: OAuthClientRegistrationResponse = {
-        client_id: 'dynamic_client_id',
-        client_secret: 'dynamic_client_secret',
-        redirect_uris: ['http://localhost:7777/oauth/callback'],
-        grant_types: ['authorization_code', 'refresh_token'],
-        response_types: ['code'],
-        token_endpoint_auth_method: 'none',
+        client_id: "dynamic_client_id",
+        client_secret: "dynamic_client_secret",
+        redirect_uris: ["http://localhost:7777/oauth/callback"],
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none",
       };
 
       const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
-        registration_endpoint: 'https://auth.example.com/register',
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
+        registration_endpoint: "https://auth.example.com/register",
       };
 
       mockFetch
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -449,7 +435,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockRegistrationResponse),
             json: mockRegistrationResponse,
           }),
@@ -466,16 +452,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -483,29 +466,26 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate(
-        'test-server',
-        configWithoutClient,
-      );
+      const result = await authProvider.authenticate("test-server", configWithoutClient);
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/register',
+        "https://auth.example.com/register",
         expect.objectContaining({
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
         }),
       );
     });
 
-    it('should perform OAuth discovery once and dynamic client registration when no client ID, authorization URL or registration URL provided', async () => {
+    it("should perform OAuth discovery once and dynamic client registration when no client ID, authorization URL or registration URL provided", async () => {
       const configWithoutClientAndAuthorizationUrl: MCPOAuthConfig = {
         ...mockConfig,
       };
@@ -513,24 +493,24 @@ describe('MCPOAuthProvider', () => {
       delete configWithoutClientAndAuthorizationUrl.authorizationUrl;
 
       const mockResourceMetadata: OAuthProtectedResourceMetadata = {
-        resource: 'https://api.example.com',
-        authorization_servers: ['https://auth.example.com'],
+        resource: "https://api.example.com",
+        authorization_servers: ["https://auth.example.com"],
       };
 
       const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
-        registration_endpoint: 'https://auth.example.com/register',
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
+        registration_endpoint: "https://auth.example.com/register",
       };
 
       const mockRegistrationResponse: OAuthClientRegistrationResponse = {
-        client_id: 'dynamic_client_id',
-        client_secret: 'dynamic_client_secret',
-        redirect_uris: ['http://localhost:7777/oauth/callback'],
-        grant_types: ['authorization_code', 'refresh_token'],
-        response_types: ['code'],
-        token_endpoint_auth_method: 'none',
+        client_id: "dynamic_client_id",
+        client_secret: "dynamic_client_secret",
+        redirect_uris: ["http://localhost:7777/oauth/callback"],
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none",
       };
 
       mockFetch
@@ -543,7 +523,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -551,7 +531,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -559,7 +539,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockRegistrationResponse),
             json: mockRegistrationResponse,
           }),
@@ -576,16 +556,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -593,7 +570,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -601,22 +578,22 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithoutClientAndAuthorizationUrl,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/register',
+        "https://auth.example.com/register",
         expect.objectContaining({
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
         }),
       );
     });
 
-    it('should handle OAuth callback errors', async () => {
+    it("should handle OAuth callback errors", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -627,26 +604,23 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?error=access_denied&error_description=User%20denied%20access',
+            url: "/oauth/callback?error=access_denied&error_description=User%20denied%20access",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('OAuth error: access_denied');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "OAuth error: access_denied",
+      );
     });
 
-    it('should handle state mismatch in callback', async () => {
+    it("should handle state mismatch in callback", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -657,26 +631,23 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=wrong_state',
+            url: "/oauth/callback?code=auth_code_123&state=wrong_state",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('State mismatch - possible CSRF attack');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "State mismatch - possible CSRF attack",
+      );
     });
 
-    it('should handle token exchange failure', async () => {
+    it("should handle token exchange failure", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -687,16 +658,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -704,18 +672,18 @@ describe('MCPOAuthProvider', () => {
         createMockResponse({
           ok: false,
           status: 400,
-          contentType: 'application/x-www-form-urlencoded',
-          text: 'error=invalid_grant&error_description=Invalid grant',
+          contentType: "application/x-www-form-urlencoded",
+          text: "error=invalid_grant&error_description=Invalid grant",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('Token exchange failed: invalid_grant - Invalid grant');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "Token exchange failed: invalid_grant - Invalid grant",
+      );
     });
 
-    it('should handle OAuth discovery failure', async () => {
+    it("should handle OAuth discovery failure", async () => {
       const configWithoutAuth: MCPOAuthConfig = { ...mockConfig };
       delete configWithoutAuth.authorizationUrl;
       delete configWithoutAuth.tokenUrl;
@@ -729,17 +697,11 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       await expect(
-        authProvider.authenticate(
-          'test-server',
-          configWithoutAuth,
-          'https://api.example.com',
-        ),
-      ).rejects.toThrow(
-        'Failed to discover OAuth configuration from MCP server',
-      );
+        authProvider.authenticate("test-server", configWithoutAuth, "https://api.example.com"),
+      ).rejects.toThrow("Failed to discover OAuth configuration from MCP server");
     });
 
-    it('should handle authorization server metadata discovery failure', async () => {
+    it("should handle authorization server metadata discovery failure", async () => {
       const configWithoutClient: MCPOAuthConfig = { ...mockConfig };
       delete configWithoutClient.clientId;
 
@@ -756,14 +718,12 @@ describe('MCPOAuthProvider', () => {
       });
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', configWithoutClient),
-      ).rejects.toThrow(
-        'Failed to fetch authorization server metadata for client registration',
+      await expect(authProvider.authenticate("test-server", configWithoutClient)).rejects.toThrow(
+        "Failed to fetch authorization server metadata for client registration",
       );
     });
 
-    it('should handle invalid callback request', async () => {
+    it("should handle invalid callback request", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -774,16 +734,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/invalid-path',
+            url: "/invalid-path",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 0);
       });
 
@@ -791,12 +748,12 @@ describe('MCPOAuthProvider', () => {
       // The test will timeout if the server does not handle the invalid request correctly.
       // We are testing that the server does not hang.
       await Promise.race([
-        authProvider.authenticate('test-server', mockConfig),
+        authProvider.authenticate("test-server", mockConfig),
         new Promise((resolve) => setTimeout(resolve, 1000)),
       ]);
     });
 
-    it('should handle token exchange failure with non-json response', async () => {
+    it("should handle token exchange failure with non-json response", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -807,16 +764,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -824,18 +778,18 @@ describe('MCPOAuthProvider', () => {
         createMockResponse({
           ok: false,
           status: 500,
-          contentType: 'text/html',
-          text: 'Internal Server Error',
+          contentType: "text/html",
+          text: "Internal Server Error",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('Token exchange failed: 500 - Internal Server Error');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "Token exchange failed: 500 - Internal Server Error",
+      );
     });
 
-    it('should handle token exchange with unexpected content type', async () => {
+    it("should handle token exchange with unexpected content type", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -846,39 +800,36 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'text/plain',
-          text: 'access_token=plain_text_token',
+          contentType: "text/plain",
+          text: "access_token=plain_text_token",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate('test-server', mockConfig);
-      expect(result.accessToken).toBe('plain_text_token');
+      const result = await authProvider.authenticate("test-server", mockConfig);
+      expect(result.accessToken).toBe("plain_text_token");
     });
 
-    it('should handle refresh token failure with non-json response', async () => {
+    it("should handle refresh token failure with non-json response", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: false,
           status: 500,
-          contentType: 'text/html',
-          text: 'Internal Server Error',
+          contentType: "text/html",
+          text: "Internal Server Error",
         }),
       );
 
@@ -886,32 +837,32 @@ describe('MCPOAuthProvider', () => {
       await expect(
         authProvider.refreshAccessToken(
           mockConfig,
-          'invalid_refresh_token',
-          'https://auth.example.com/token',
+          "invalid_refresh_token",
+          "https://auth.example.com/token",
         ),
-      ).rejects.toThrow('Token refresh failed: 500 - Internal Server Error');
+      ).rejects.toThrow("Token refresh failed: 500 - Internal Server Error");
     });
 
-    it('should handle refresh token with unexpected content type', async () => {
+    it("should handle refresh token with unexpected content type", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'text/plain',
-          text: 'access_token=plain_text_token',
+          contentType: "text/plain",
+          text: "access_token=plain_text_token",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.refreshAccessToken(
         mockConfig,
-        'refresh_token',
-        'https://auth.example.com/token',
+        "refresh_token",
+        "https://auth.example.com/token",
       );
-      expect(result.access_token).toBe('plain_text_token');
+      expect(result.access_token).toBe("plain_text_token");
     });
 
-    it('should continue authentication when browser fails to open', async () => {
-      mockOpenBrowserSecurely.mockRejectedValue(new Error('Browser not found'));
+    it("should continue authentication when browser fails to open", async () => {
+      mockOpenBrowserSecurely.mockRejectedValue(new Error("Browser not found"));
 
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
@@ -923,62 +874,54 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate('test-server', mockConfig);
+      const result = await authProvider.authenticate("test-server", mockConfig);
       expect(result).toBeDefined();
     });
 
-    it('should return null when token is expired and no refresh token is available', async () => {
+    it("should return null when token is expired and no refresh token is available", async () => {
       const expiredCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
           ...mockToken,
           refreshToken: undefined,
           expiresAt: Date.now() - 3600000,
         },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        expiredCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(expiredCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
     });
 
-    it('should handle callback timeout', async () => {
+    it("should handle callback timeout", async () => {
       vi.mocked(http.createServer).mockImplementation(
         () => mockHttpServer as unknown as http.Server,
       );
@@ -999,27 +942,27 @@ describe('MCPOAuthProvider', () => {
       }) as unknown as typeof setTimeout;
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('OAuth callback timeout');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "OAuth callback timeout",
+      );
 
       global.setTimeout = originalSetTimeout;
     });
   });
 
-  describe('refreshAccessToken', () => {
-    it('should refresh token successfully', async () => {
+  describe("refreshAccessToken", () => {
+    it("should refresh token successfully", async () => {
       const refreshResponse = {
-        access_token: 'new_access_token',
-        token_type: 'Bearer',
+        access_token: "new_access_token",
+        token_type: "Bearer",
         expires_in: 3600,
-        refresh_token: 'new_refresh_token',
+        refresh_token: "new_refresh_token",
       };
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(refreshResponse),
           json: refreshResponse,
         }),
@@ -1028,29 +971,29 @@ describe('MCPOAuthProvider', () => {
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.refreshAccessToken(
         mockConfig,
-        'old_refresh_token',
-        'https://auth.example.com/token',
+        "old_refresh_token",
+        "https://auth.example.com/token",
       );
 
       expect(result).toEqual(refreshResponse);
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/token',
+        "https://auth.example.com/token",
         expect.objectContaining({
-          method: 'POST',
+          method: "POST",
           headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            Accept: 'application/json, application/x-www-form-urlencoded',
+            "Content-Type": "application/x-www-form-urlencoded",
+            Accept: "application/json, application/x-www-form-urlencoded",
           },
-          body: expect.stringContaining('grant_type=refresh_token'),
+          body: expect.stringContaining("grant_type=refresh_token"),
         }),
       );
     });
 
-    it('should include client secret in refresh request when available', async () => {
+    it("should include client secret in refresh request when available", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1059,21 +1002,21 @@ describe('MCPOAuthProvider', () => {
       const authProvider = new MCPOAuthProvider();
       await authProvider.refreshAccessToken(
         mockConfig,
-        'refresh_token',
-        'https://auth.example.com/token',
+        "refresh_token",
+        "https://auth.example.com/token",
       );
 
       const fetchCall = mockFetch.mock.calls[0];
-      expect(fetchCall[1].body).toContain('client_secret=test-client-secret');
+      expect(fetchCall[1].body).toContain("client_secret=test-client-secret");
     });
 
-    it('should handle refresh token failure', async () => {
+    it("should handle refresh token failure", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: false,
           status: 400,
-          contentType: 'application/x-www-form-urlencoded',
-          text: 'error=invalid_request&error_description=Invalid refresh token',
+          contentType: "application/x-www-form-urlencoded",
+          text: "error=invalid_request&error_description=Invalid refresh token",
         }),
       );
 
@@ -1081,113 +1024,96 @@ describe('MCPOAuthProvider', () => {
       await expect(
         authProvider.refreshAccessToken(
           mockConfig,
-          'invalid_refresh_token',
-          'https://auth.example.com/token',
+          "invalid_refresh_token",
+          "https://auth.example.com/token",
         ),
-      ).rejects.toThrow(
-        'Token refresh failed: invalid_request - Invalid refresh token',
-      );
+      ).rejects.toThrow("Token refresh failed: invalid_request - Invalid refresh token");
     });
   });
 
-  describe('getValidToken', () => {
-    it('should return valid token when not expired', async () => {
+  describe("getValidToken", () => {
+    it("should return valid token when not expired", async () => {
       const validCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: mockToken,
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        validCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(validCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(false);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
-      expect(result).toBe('access_token_123');
+      expect(result).toBe("access_token_123");
     });
 
-    it('should refresh expired token and return new token', async () => {
+    it("should refresh expired token and return new token", async () => {
       const expiredCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: { ...mockToken, expiresAt: Date.now() - 3600000 },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        expiredCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(expiredCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
 
       const refreshResponse = {
-        access_token: 'new_access_token',
-        token_type: 'Bearer',
+        access_token: "new_access_token",
+        token_type: "Bearer",
         expires_in: 3600,
-        refresh_token: 'new_refresh_token',
+        refresh_token: "new_refresh_token",
       };
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(refreshResponse),
           json: refreshResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
-      expect(result).toBe('new_access_token');
+      expect(result).toBe("new_access_token");
       expect(tokenStorage.saveToken).toHaveBeenCalledWith(
-        'test-server',
-        expect.objectContaining({ accessToken: 'new_access_token' }),
-        'test-client-id',
-        'https://auth.example.com/token',
+        "test-server",
+        expect.objectContaining({ accessToken: "new_access_token" }),
+        "test-client-id",
+        "https://auth.example.com/token",
         undefined,
       );
     });
 
-    it('should return null when no credentials exist', async () => {
+    it("should return null when no credentials exist", async () => {
       const tokenStorage = new MCPOAuthTokenStorage();
       vi.mocked(tokenStorage.getCredentials).mockResolvedValue(null);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
     });
 
-    it('should handle refresh failure and remove invalid token', async () => {
+    it("should handle refresh failure and remove invalid token", async () => {
       const expiredCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: { ...mockToken, expiresAt: Date.now() - 3600000 },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        expiredCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(expiredCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
       vi.mocked(tokenStorage.deleteCredentials).mockResolvedValue(undefined);
 
@@ -1195,59 +1121,49 @@ describe('MCPOAuthProvider', () => {
         createMockResponse({
           ok: false,
           status: 400,
-          contentType: 'application/x-www-form-urlencoded',
-          text: 'error=invalid_request&error_description=Invalid refresh token',
+          contentType: "application/x-www-form-urlencoded",
+          text: "error=invalid_request&error_description=Invalid refresh token",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
-      expect(tokenStorage.deleteCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(tokenStorage.deleteCredentials).toHaveBeenCalledWith("test-server");
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        expect.stringContaining('Failed to refresh auth token'),
+        "error",
+        expect.stringContaining("Failed to refresh auth token"),
         expect.any(Error),
       );
     });
 
-    it('should return null for token without refresh capability', async () => {
+    it("should return null for token without refresh capability", async () => {
       const tokenWithoutRefresh = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
           ...mockToken,
           refreshToken: undefined,
           expiresAt: Date.now() - 3600000,
         },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        tokenWithoutRefresh,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(tokenWithoutRefresh);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
     });
   });
 
-  describe('PKCE parameter generation', () => {
-    it('should generate valid PKCE parameters', async () => {
+  describe("PKCE parameter generation", () => {
+    it("should generate valid PKCE parameters", async () => {
       // Test is implicit in the authenticate flow tests, but we can verify
       // the crypto mocks are called correctly
       let callbackHandler: unknown;
@@ -1260,39 +1176,36 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate('test-server', mockConfig);
+      await authProvider.authenticate("test-server", mockConfig);
 
       expect(crypto.randomBytes).toHaveBeenCalledWith(32); // code verifier
       expect(crypto.randomBytes).toHaveBeenCalledWith(16); // state
-      expect(crypto.createHash).toHaveBeenCalledWith('sha256');
+      expect(crypto.createHash).toHaveBeenCalledWith("sha256");
     });
   });
 
-  describe('Authorization URL building', () => {
-    it('should build correct authorization URL with all parameters', async () => {
+  describe("Authorization URL building", () => {
+    it("should build correct authorization URL with all parameters", async () => {
       // Mock to capture the URL that would be opened
       let capturedUrl: string | undefined;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
@@ -1310,46 +1223,39 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate(
-        'test-server',
-        mockConfig,
-        'https://auth.example.com',
-      );
+      await authProvider.authenticate("test-server", mockConfig, "https://auth.example.com");
 
       expect(capturedUrl).toBeDefined();
-      expect(capturedUrl!).toContain('response_type=code');
-      expect(capturedUrl!).toContain('client_id=test-client-id');
-      expect(capturedUrl!).toContain('code_challenge=code_challenge_mock');
-      expect(capturedUrl!).toContain('code_challenge_method=S256');
-      expect(capturedUrl!).toContain('scope=read+write');
-      expect(capturedUrl!).toContain('resource=https%3A%2F%2Fauth.example.com');
-      expect(capturedUrl!).toContain('audience=https%3A%2F%2Fapi.example.com');
+      expect(capturedUrl!).toContain("response_type=code");
+      expect(capturedUrl!).toContain("client_id=test-client-id");
+      expect(capturedUrl!).toContain("code_challenge=code_challenge_mock");
+      expect(capturedUrl!).toContain("code_challenge_method=S256");
+      expect(capturedUrl!).toContain("scope=read+write");
+      expect(capturedUrl!).toContain("resource=https%3A%2F%2Fauth.example.com");
+      expect(capturedUrl!).toContain("audience=https%3A%2F%2Fapi.example.com");
     });
 
-    it('should correctly append parameters to an authorization URL that already has query params', async () => {
+    it("should correctly append parameters to an authorization URL that already has query params", async () => {
       // Mock to capture the URL that would be opened
       let capturedUrl: string;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
@@ -1367,23 +1273,20 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1391,19 +1294,19 @@ describe('MCPOAuthProvider', () => {
 
       const configWithParamsInUrl = {
         ...mockConfig,
-        authorizationUrl: 'https://auth.example.com/authorize?audience=1234',
+        authorizationUrl: "https://auth.example.com/authorize?audience=1234",
       };
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate('test-server', configWithParamsInUrl);
+      await authProvider.authenticate("test-server", configWithParamsInUrl);
 
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('audience')).toBe('1234');
-      expect(url.searchParams.get('client_id')).toBe('test-client-id');
-      expect(url.search.startsWith('?audience=1234&')).toBe(true);
+      expect(url.searchParams.get("audience")).toBe("1234");
+      expect(url.searchParams.get("client_id")).toBe("test-client-id");
+      expect(url.search.startsWith("?audience=1234&")).toBe(true);
     });
 
-    it('should correctly append parameters to a URL with a fragment', async () => {
+    it("should correctly append parameters to a URL with a fragment", async () => {
       // Mock to capture the URL that would be opened
       let capturedUrl: string;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
@@ -1421,23 +1324,20 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1445,19 +1345,19 @@ describe('MCPOAuthProvider', () => {
 
       const configWithFragment = {
         ...mockConfig,
-        authorizationUrl: 'https://auth.example.com/authorize#login',
+        authorizationUrl: "https://auth.example.com/authorize#login",
       };
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate('test-server', configWithFragment);
+      await authProvider.authenticate("test-server", configWithFragment);
 
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('client_id')).toBe('test-client-id');
-      expect(url.hash).toBe('#login');
-      expect(url.pathname).toBe('/authorize');
+      expect(url.searchParams.get("client_id")).toBe("test-client-id");
+      expect(url.hash).toBe("#login");
+      expect(url.pathname).toBe("/authorize");
     });
 
-    it('should use user-configured scopes over discovered scopes', async () => {
+    it("should use user-configured scopes over discovered scopes", async () => {
       let capturedUrl: string | undefined;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
         capturedUrl = url;
@@ -1466,21 +1366,21 @@ describe('MCPOAuthProvider', () => {
 
       const configWithUserScopes: MCPOAuthConfig = {
         ...mockConfig,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
-        scopes: ['user-scope'],
+        clientId: "test-client-id",
+        clientSecret: "test-client-secret",
+        scopes: ["user-scope"],
       };
       delete configWithUserScopes.authorizationUrl;
       delete configWithUserScopes.tokenUrl;
 
       const mockResourceMetadata = {
-        authorization_servers: ['https://discovered.auth.com'],
+        authorization_servers: ["https://discovered.auth.com"],
       };
 
       const mockAuthServerMetadata = {
-        authorization_endpoint: 'https://discovered.auth.com/authorize',
-        token_endpoint: 'https://discovered.auth.com/token',
-        scopes_supported: ['discovered-scope'],
+        authorization_endpoint: "https://discovered.auth.com/authorize",
+        token_endpoint: "https://discovered.auth.com/token",
+        scopes_supported: ["discovered-scope"],
       };
 
       mockFetch
@@ -1488,7 +1388,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -1496,7 +1396,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -1513,13 +1413,10 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = { writeHead: vi.fn(), end: vi.fn() };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -1527,7 +1424,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1535,17 +1432,17 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithUserScopes,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(capturedUrl).toBeDefined();
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('scope')).toBe('user-scope');
+      expect(url.searchParams.get("scope")).toBe("user-scope");
     });
 
-    it('should use discovered scopes when no user-configured scopes are provided', async () => {
+    it("should use discovered scopes when no user-configured scopes are provided", async () => {
       let capturedUrl: string | undefined;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
         capturedUrl = url;
@@ -1554,21 +1451,21 @@ describe('MCPOAuthProvider', () => {
 
       const configWithoutScopes: MCPOAuthConfig = {
         ...mockConfig,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
+        clientId: "test-client-id",
+        clientSecret: "test-client-secret",
       };
       delete configWithoutScopes.scopes;
       delete configWithoutScopes.authorizationUrl;
       delete configWithoutScopes.tokenUrl;
 
       const mockResourceMetadata = {
-        authorization_servers: ['https://discovered.auth.com'],
+        authorization_servers: ["https://discovered.auth.com"],
       };
 
       const mockAuthServerMetadata = {
-        authorization_endpoint: 'https://discovered.auth.com/authorize',
-        token_endpoint: 'https://discovered.auth.com/token',
-        scopes_supported: ['discovered-scope-1', 'discovered-scope-2'],
+        authorization_endpoint: "https://discovered.auth.com/authorize",
+        token_endpoint: "https://discovered.auth.com/token",
+        scopes_supported: ["discovered-scope-1", "discovered-scope-2"],
       };
 
       mockFetch
@@ -1576,7 +1473,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -1584,7 +1481,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -1601,13 +1498,10 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = { writeHead: vi.fn(), end: vi.fn() };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -1615,7 +1509,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1623,109 +1517,93 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithoutScopes,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(capturedUrl).toBeDefined();
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('scope')).toBe(
-        'discovered-scope-1 discovered-scope-2',
-      );
+      expect(url.searchParams.get("scope")).toBe("discovered-scope-1 discovered-scope-2");
     });
   });
 
-  describe('issuer discovery conformance', () => {
+  describe("issuer discovery conformance", () => {
     const registrationMetadata: OAuthAuthorizationServerMetadata = {
-      issuer: 'http://localhost:8888/realms/my-realm',
-      authorization_endpoint:
-        'http://localhost:8888/realms/my-realm/protocol/openid-connect/auth',
-      token_endpoint:
-        'http://localhost:8888/realms/my-realm/protocol/openid-connect/token',
+      issuer: "http://localhost:8888/realms/my-realm",
+      authorization_endpoint: "http://localhost:8888/realms/my-realm/protocol/openid-connect/auth",
+      token_endpoint: "http://localhost:8888/realms/my-realm/protocol/openid-connect/token",
       registration_endpoint:
-        'http://localhost:8888/realms/my-realm/clients-registrations/openid-connect',
+        "http://localhost:8888/realms/my-realm/clients-registrations/openid-connect",
     };
 
-    it('falls back to path-based issuer when origin discovery fails', async () => {
+    it("falls back to path-based issuer when origin discovery fails", async () => {
       const authProvider = new MCPOAuthProvider();
       const providerWithAccess = authProvider as unknown as {
-        discoverAuthServerMetadataForRegistration: (
-          authorizationUrl: string,
-        ) => Promise<{
+        discoverAuthServerMetadataForRegistration: (authorizationUrl: string) => Promise<{
           issuerUrl: string;
           metadata: OAuthAuthorizationServerMetadata;
         }>;
       };
 
-      vi.spyOn(
-        OAuthUtils,
-        'discoverAuthorizationServerMetadata',
-      ).mockImplementation(async (issuer) => {
-        if (issuer === 'http://localhost:8888/realms/my-realm') {
-          return registrationMetadata;
-        }
-        return null;
-      });
+      vi.spyOn(OAuthUtils, "discoverAuthorizationServerMetadata").mockImplementation(
+        async (issuer) => {
+          if (issuer === "http://localhost:8888/realms/my-realm") {
+            return registrationMetadata;
+          }
+          return null;
+        },
+      );
 
-      const result =
-        await providerWithAccess.discoverAuthServerMetadataForRegistration(
-          'http://localhost:8888/realms/my-realm/protocol/openid-connect/auth',
-        );
+      const result = await providerWithAccess.discoverAuthServerMetadataForRegistration(
+        "http://localhost:8888/realms/my-realm/protocol/openid-connect/auth",
+      );
 
-      expect(
-        vi.mocked(OAuthUtils.discoverAuthorizationServerMetadata).mock.calls,
-      ).toEqual([
-        ['http://localhost:8888'],
-        ['http://localhost:8888/realms/my-realm'],
+      expect(vi.mocked(OAuthUtils.discoverAuthorizationServerMetadata).mock.calls).toEqual([
+        ["http://localhost:8888"],
+        ["http://localhost:8888/realms/my-realm"],
       ]);
-      expect(result.issuerUrl).toBe('http://localhost:8888/realms/my-realm');
+      expect(result.issuerUrl).toBe("http://localhost:8888/realms/my-realm");
       expect(result.metadata).toBe(registrationMetadata);
     });
 
-    it('trims versioned segments from authorization endpoints', async () => {
+    it("trims versioned segments from authorization endpoints", async () => {
       const authProvider = new MCPOAuthProvider();
       const providerWithAccess = authProvider as unknown as {
-        discoverAuthServerMetadataForRegistration: (
-          authorizationUrl: string,
-        ) => Promise<{
+        discoverAuthServerMetadataForRegistration: (authorizationUrl: string) => Promise<{
           issuerUrl: string;
           metadata: OAuthAuthorizationServerMetadata;
         }>;
       };
 
       const oktaMetadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.okta.local/oauth2/default',
-        authorization_endpoint:
-          'https://auth.okta.local/oauth2/default/v1/authorize',
-        token_endpoint: 'https://auth.okta.local/oauth2/default/v1/token',
-        registration_endpoint:
-          'https://auth.okta.local/oauth2/default/v1/register',
+        issuer: "https://auth.okta.local/oauth2/default",
+        authorization_endpoint: "https://auth.okta.local/oauth2/default/v1/authorize",
+        token_endpoint: "https://auth.okta.local/oauth2/default/v1/token",
+        registration_endpoint: "https://auth.okta.local/oauth2/default/v1/register",
       };
 
       const attempts: string[] = [];
-      vi.spyOn(
-        OAuthUtils,
-        'discoverAuthorizationServerMetadata',
-      ).mockImplementation(async (issuer) => {
-        attempts.push(issuer);
-        if (issuer === 'https://auth.okta.local/oauth2/default') {
-          return oktaMetadata;
-        }
-        return null;
-      });
+      vi.spyOn(OAuthUtils, "discoverAuthorizationServerMetadata").mockImplementation(
+        async (issuer) => {
+          attempts.push(issuer);
+          if (issuer === "https://auth.okta.local/oauth2/default") {
+            return oktaMetadata;
+          }
+          return null;
+        },
+      );
 
-      const result =
-        await providerWithAccess.discoverAuthServerMetadataForRegistration(
-          'https://auth.okta.local/oauth2/default/v1/authorize',
-        );
+      const result = await providerWithAccess.discoverAuthServerMetadataForRegistration(
+        "https://auth.okta.local/oauth2/default/v1/authorize",
+      );
 
       expect(attempts).toEqual([
-        'https://auth.okta.local',
-        'https://auth.okta.local/oauth2/default/v1',
-        'https://auth.okta.local/oauth2/default',
+        "https://auth.okta.local",
+        "https://auth.okta.local/oauth2/default/v1",
+        "https://auth.okta.local/oauth2/default",
       ]);
-      expect(result.issuerUrl).toBe('https://auth.okta.local/oauth2/default');
+      expect(result.issuerUrl).toBe("https://auth.okta.local/oauth2/default");
       expect(result.metadata).toBe(oktaMetadata);
     });
   });
diff --git a/packages/gemini-cli-core/src/mcp/oauth-provider.ts b/packages/gemini-cli-core/src/mcp/oauth-provider.ts
index 06f5a95cf..ca66de4e6 100644
--- a/packages/gemini-cli-core/src/mcp/oauth-provider.ts
+++ b/packages/gemini-cli-core/src/mcp/oauth-provider.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as http from 'node:http';
-import * as crypto from 'node:crypto';
-import type * as net from 'node:net';
-import { URL } from 'node:url';
-import type { EventEmitter } from 'node:events';
-import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
-import type { OAuthToken } from './token-storage/types.js';
-import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { OAuthUtils } from './oauth-utils.js';
-import { coreEvents } from '../utils/events.js';
-import { debugLogger } from '../utils/debugLogger.js';
-
-export const OAUTH_DISPLAY_MESSAGE_EVENT = 'oauth-display-message' as const;
+import * as crypto from "node:crypto";
+import type { EventEmitter } from "node:events";
+import * as http from "node:http";
+import type * as net from "node:net";
+import { URL } from "node:url";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import { openBrowserSecurely } from "../utils/secure-browser-launcher.js";
+import { MCPOAuthTokenStorage } from "./oauth-token-storage.js";
+import { OAuthUtils } from "./oauth-utils.js";
+import type { OAuthToken } from "./token-storage/types.js";
+
+export const OAUTH_DISPLAY_MESSAGE_EVENT = "oauth-display-message" as const;
 
 /**
  * OAuth configuration for an MCP server.
@@ -90,7 +90,7 @@ interface PKCEParams {
   state: string;
 }
 
-const REDIRECT_PATH = '/oauth/callback';
+const REDIRECT_PATH = "/oauth/callback";
 const HTTP_OK = 200;
 
 /**
@@ -116,22 +116,21 @@ export class MCPOAuthProvider {
     config: MCPOAuthConfig,
     redirectPort: number,
   ): Promise<OAuthClientRegistrationResponse> {
-    const redirectUri =
-      config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
 
     const registrationRequest: OAuthClientRegistrationRequest = {
-      client_name: 'Gemini CLI MCP Client',
+      client_name: "Gemini CLI MCP Client",
       redirect_uris: [redirectUri],
-      grant_types: ['authorization_code', 'refresh_token'],
-      response_types: ['code'],
-      token_endpoint_auth_method: 'none', // Public client
-      scope: config.scopes?.join(' ') || '',
+      grant_types: ["authorization_code", "refresh_token"],
+      response_types: ["code"],
+      token_endpoint_auth_method: "none", // Public client
+      scope: config.scopes?.join(" ") || "",
     };
 
     const response = await fetch(registrationUrl, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       body: JSON.stringify(registrationRequest),
     });
@@ -152,16 +151,12 @@ export class MCPOAuthProvider {
    * @param mcpServerUrl The MCP server URL
    * @returns OAuth configuration if discovered, null otherwise
    */
-  private async discoverOAuthFromMCPServer(
-    mcpServerUrl: string,
-  ): Promise<MCPOAuthConfig | null> {
+  private async discoverOAuthFromMCPServer(mcpServerUrl: string): Promise<MCPOAuthConfig | null> {
     // Use the full URL with path preserved for OAuth discovery
     return OAuthUtils.discoverOAuthConfig(mcpServerUrl);
   }
 
-  private async discoverAuthServerMetadataForRegistration(
-    authorizationUrl: string,
-  ): Promise<{
+  private async discoverAuthServerMetadataForRegistration(authorizationUrl: string): Promise<{
     issuerUrl: string;
     metadata: NonNullable<
       Awaited<ReturnType<typeof OAuthUtils.discoverAuthorizationServerMetadata>>
@@ -174,14 +169,14 @@ export class MCPOAuthProvider {
     // For example: http://localhost:8888/realms/my-realm/protocol/openid-connect/auth
     //           -> http://localhost:8888/realms/my-realm
     const oidcPatterns = [
-      '/protocol/openid-connect/auth',
-      '/protocol/openid-connect/authorize',
-      '/oauth2/authorize',
-      '/oauth/authorize',
-      '/authorize',
+      "/protocol/openid-connect/auth",
+      "/protocol/openid-connect/authorize",
+      "/oauth2/authorize",
+      "/oauth/authorize",
+      "/authorize",
     ];
 
-    let pathname = authUrl.pathname.replace(/\/$/, ''); // Trim trailing slash
+    let pathname = authUrl.pathname.replace(/\/$/, ""); // Trim trailing slash
     for (const pattern of oidcPatterns) {
       if (pathname.endsWith(pattern)) {
         pathname = pathname.slice(0, -pattern.length);
@@ -196,14 +191,12 @@ export class MCPOAuthProvider {
       issuerCandidates.add(`${authUrl.origin}${pathname}`);
 
       const versionSegmentPattern = /^v\d+(\.\d+)?$/i;
-      const segments = pathname.split('/').filter(Boolean);
+      const segments = pathname.split("/").filter(Boolean);
       const lastSegment = segments.at(-1);
       if (lastSegment && versionSegmentPattern.test(lastSegment)) {
         const withoutVersionPath = segments.slice(0, -1);
         if (withoutVersionPath.length) {
-          issuerCandidates.add(
-            `${authUrl.origin}/${withoutVersionPath.join('/')}`,
-          );
+          issuerCandidates.add(`${authUrl.origin}/${withoutVersionPath.join("/")}`);
         }
       }
     }
@@ -216,8 +209,7 @@ export class MCPOAuthProvider {
 
     for (const issuer of attemptedIssuers) {
       debugLogger.debug(`   Trying issuer URL: ${issuer}`);
-      const metadata =
-        await OAuthUtils.discoverAuthorizationServerMetadata(issuer);
+      const metadata = await OAuthUtils.discoverAuthorizationServerMetadata(issuer);
       if (metadata) {
         selectedIssuer = issuer;
         discoveredMetadata = metadata;
@@ -227,7 +219,7 @@ export class MCPOAuthProvider {
 
     if (!discoveredMetadata) {
       throw new Error(
-        `Failed to fetch authorization server metadata for client registration (attempted issuers: ${attemptedIssuers.join(', ')})`,
+        `Failed to fetch authorization server metadata for client registration (attempted issuers: ${attemptedIssuers.join(", ")})`,
       );
     }
 
@@ -245,16 +237,13 @@ export class MCPOAuthProvider {
    */
   private generatePKCEParams(): PKCEParams {
     // Generate code verifier (43-128 characters)
-    const codeVerifier = crypto.randomBytes(32).toString('base64url');
+    const codeVerifier = crypto.randomBytes(32).toString("base64url");
 
     // Generate code challenge using SHA256
-    const codeChallenge = crypto
-      .createHash('sha256')
-      .update(codeVerifier)
-      .digest('base64url');
+    const codeChallenge = crypto.createHash("sha256").update(codeVerifier).digest("base64url");
 
     // Generate state for CSRF protection
-    const state = crypto.randomBytes(16).toString('base64url');
+    const state = crypto.randomBytes(16).toString("base64url");
 
     return { codeVerifier, codeChallenge, state };
   }
@@ -277,59 +266,58 @@ export class MCPOAuthProvider {
       portReject = reject;
     });
 
-    const responsePromise = new Promise<OAuthAuthorizationResponse>(
-      (resolve, reject) => {
-        let serverPort: number;
+    const responsePromise = new Promise<OAuthAuthorizationResponse>((resolve, reject) => {
+      let serverPort: number;
 
-        const server = http.createServer(
-          async (req: http.IncomingMessage, res: http.ServerResponse) => {
-            try {
-              const url = new URL(req.url!, `http://localhost:${serverPort}`);
+      const server = http.createServer(
+        async (req: http.IncomingMessage, res: http.ServerResponse) => {
+          try {
+            const url = new URL(req.url!, `http://localhost:${serverPort}`);
 
-              if (url.pathname !== REDIRECT_PATH) {
-                res.writeHead(404);
-                res.end('Not found');
-                return;
-              }
+            if (url.pathname !== REDIRECT_PATH) {
+              res.writeHead(404);
+              res.end("Not found");
+              return;
+            }
 
-              const code = url.searchParams.get('code');
-              const state = url.searchParams.get('state');
-              const error = url.searchParams.get('error');
+            const code = url.searchParams.get("code");
+            const state = url.searchParams.get("state");
+            const error = url.searchParams.get("error");
 
-              if (error) {
-                res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
-                res.end(`
+            if (error) {
+              res.writeHead(HTTP_OK, { "Content-Type": "text/html" });
+              res.end(`
               <html>
                 <body>
                   <h1>Authentication Failed</h1>
-                  <p>Error: ${(error as string).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p>
-                  <p>${((url.searchParams.get('error_description') || '') as string).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p>
+                  <p>Error: ${(error as string).replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p>
+                  <p>${((url.searchParams.get("error_description") || "") as string).replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p>
                   <p>You can close this window.</p>
                 </body>
               </html>
             `);
-                server.close();
-                reject(new Error(`OAuth error: ${error}`));
-                return;
-              }
-
-              if (!code || !state) {
-                res.writeHead(400);
-                res.end('Missing code or state parameter');
-                return;
-              }
-
-              if (state !== expectedState) {
-                res.writeHead(400);
-                res.end('Invalid state parameter');
-                server.close();
-                reject(new Error('State mismatch - possible CSRF attack'));
-                return;
-              }
-
-              // Send success response to browser
-              res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
-              res.end(`
+              server.close();
+              reject(new Error(`OAuth error: ${error}`));
+              return;
+            }
+
+            if (!code || !state) {
+              res.writeHead(400);
+              res.end("Missing code or state parameter");
+              return;
+            }
+
+            if (state !== expectedState) {
+              res.writeHead(400);
+              res.end("Invalid state parameter");
+              server.close();
+              reject(new Error("State mismatch - possible CSRF attack"));
+              return;
+            }
+
+            // Send success response to browser
+            res.writeHead(HTTP_OK, { "Content-Type": "text/html" });
+            res.end(`
             <html>
               <body>
                 <h1>Authentication Successful!</h1>
@@ -339,55 +327,50 @@ export class MCPOAuthProvider {
             </html>
           `);
 
-              server.close();
-              resolve({ code, state });
-            } catch (error) {
-              server.close();
-              reject(error);
-            }
-          },
-        );
+            server.close();
+            resolve({ code, state });
+          } catch (error) {
+            server.close();
+            reject(error);
+          }
+        },
+      );
 
-        server.on('error', (error) => {
+      server.on("error", (error) => {
+        portReject(error);
+        reject(error);
+      });
+
+      // Determine which port to use (env var or OS-assigned)
+      const portStr = process.env["OAUTH_CALLBACK_PORT"];
+      let listenPort = 0; // Default to OS-assigned port
+      if (portStr) {
+        const envPort = parseInt(portStr, 10);
+        if (isNaN(envPort) || envPort <= 0 || envPort > 65535) {
+          const error = new Error(`Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`);
           portReject(error);
           reject(error);
-        });
-
-        // Determine which port to use (env var or OS-assigned)
-        const portStr = process.env['OAUTH_CALLBACK_PORT'];
-        let listenPort = 0; // Default to OS-assigned port
-        if (portStr) {
-          const envPort = parseInt(portStr, 10);
-          if (isNaN(envPort) || envPort <= 0 || envPort > 65535) {
-            const error = new Error(
-              `Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`,
-            );
-            portReject(error);
-            reject(error);
-            return;
-          }
-          listenPort = envPort;
+          return;
         }
+        listenPort = envPort;
+      }
 
-        server.listen(listenPort, () => {
-          const address = server.address() as net.AddressInfo;
-          serverPort = address.port;
-          debugLogger.log(
-            `OAuth callback server listening on port ${serverPort}`,
-          );
-          portResolve(serverPort); // Resolve port promise immediately
-        });
-
-        // Timeout after 5 minutes
-        setTimeout(
-          () => {
-            server.close();
-            reject(new Error('OAuth callback timeout'));
-          },
-          5 * 60 * 1000,
-        );
-      },
-    );
+      server.listen(listenPort, () => {
+        const address = server.address() as net.AddressInfo;
+        serverPort = address.port;
+        debugLogger.log(`OAuth callback server listening on port ${serverPort}`);
+        portResolve(serverPort); // Resolve port promise immediately
+      });
+
+      // Timeout after 5 minutes
+      setTimeout(
+        () => {
+          server.close();
+          reject(new Error("OAuth callback timeout"));
+        },
+        5 * 60 * 1000,
+      );
+    });
 
     return { port: portPromise, response: responsePromise };
   }
@@ -407,38 +390,32 @@ export class MCPOAuthProvider {
     redirectPort: number,
     mcpServerUrl?: string,
   ): string {
-    const redirectUri =
-      config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
 
     const params = new URLSearchParams({
       client_id: config.clientId!,
-      response_type: 'code',
+      response_type: "code",
       redirect_uri: redirectUri,
       state: pkceParams.state,
       code_challenge: pkceParams.codeChallenge,
-      code_challenge_method: 'S256',
+      code_challenge_method: "S256",
     });
 
     if (config.scopes && config.scopes.length > 0) {
-      params.append('scope', config.scopes.join(' '));
+      params.append("scope", config.scopes.join(" "));
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
     // Only add if we have an MCP server URL (indicates MCP OAuth flow, not standard OAuth)
     if (mcpServerUrl) {
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(mcpServerUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
@@ -466,11 +443,10 @@ export class MCPOAuthProvider {
     redirectPort: number,
     mcpServerUrl?: string,
   ): Promise<OAuthTokenResponse> {
-    const redirectUri =
-      config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
 
     const params = new URLSearchParams({
-      grant_type: 'authorization_code',
+      grant_type: "authorization_code",
       code,
       redirect_uri: redirectUri,
       code_verifier: codeVerifier,
@@ -478,11 +454,11 @@ export class MCPOAuthProvider {
     });
 
     if (config.clientSecret) {
-      params.append('client_secret', config.clientSecret);
+      params.append("client_secret", config.clientSecret);
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
@@ -490,52 +466,46 @@ export class MCPOAuthProvider {
     if (mcpServerUrl) {
       const resourceUrl = mcpServerUrl;
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(resourceUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(resourceUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
     const response = await fetch(config.tokenUrl!, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json, application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json, application/x-www-form-urlencoded",
       },
       body: params.toString(),
     });
 
     const responseText = await response.text();
-    const contentType = response.headers.get('content-type') || '';
+    const contentType = response.headers.get("content-type") || "";
 
     if (!response.ok) {
       // Try to parse error from form-urlencoded response
       let errorMessage: string | null = null;
       try {
         const errorParams = new URLSearchParams(responseText);
-        const error = errorParams.get('error');
-        const errorDescription = errorParams.get('error_description');
+        const error = errorParams.get("error");
+        const errorDescription = errorParams.get("error_description");
         if (error) {
-          errorMessage = `Token exchange failed: ${error} - ${errorDescription || 'No description'}`;
+          errorMessage = `Token exchange failed: ${error} - ${errorDescription || "No description"}`;
         }
       } catch {
         // Fall back to raw error
       }
       throw new Error(
-        errorMessage ||
-          `Token exchange failed: ${response.status} - ${responseText}`,
+        errorMessage || `Token exchange failed: ${response.status} - ${responseText}`,
       );
     }
 
     // Log unexpected content types for debugging
     if (
-      !contentType.includes('application/json') &&
-      !contentType.includes('application/x-www-form-urlencoded')
+      !contentType.includes("application/json") &&
+      !contentType.includes("application/x-www-form-urlencoded")
     ) {
       debugLogger.warn(
         `Token endpoint returned unexpected content-type: ${contentType}. ` +
@@ -550,18 +520,18 @@ export class MCPOAuthProvider {
     } catch {
       // Parse form-urlencoded response
       const tokenParams = new URLSearchParams(responseText);
-      const accessToken = tokenParams.get('access_token');
-      const tokenType = tokenParams.get('token_type') || 'Bearer';
-      const expiresIn = tokenParams.get('expires_in');
-      const refreshToken = tokenParams.get('refresh_token');
-      const scope = tokenParams.get('scope');
+      const accessToken = tokenParams.get("access_token");
+      const tokenType = tokenParams.get("token_type") || "Bearer";
+      const expiresIn = tokenParams.get("expires_in");
+      const refreshToken = tokenParams.get("refresh_token");
+      const scope = tokenParams.get("scope");
 
       if (!accessToken) {
         // Check for error in response
-        const error = tokenParams.get('error');
-        const errorDescription = tokenParams.get('error_description');
+        const error = tokenParams.get("error");
+        const errorDescription = tokenParams.get("error_description");
         throw new Error(
-          `Token exchange failed: ${error || 'no_access_token'} - ${errorDescription || responseText}`,
+          `Token exchange failed: ${error || "no_access_token"} - ${errorDescription || responseText}`,
         );
       }
 
@@ -591,73 +561,65 @@ export class MCPOAuthProvider {
     mcpServerUrl?: string,
   ): Promise<OAuthTokenResponse> {
     const params = new URLSearchParams({
-      grant_type: 'refresh_token',
+      grant_type: "refresh_token",
       refresh_token: refreshToken,
       client_id: config.clientId!,
     });
 
     if (config.clientSecret) {
-      params.append('client_secret', config.clientSecret);
+      params.append("client_secret", config.clientSecret);
     }
 
     if (config.scopes && config.scopes.length > 0) {
-      params.append('scope', config.scopes.join(' '));
+      params.append("scope", config.scopes.join(" "));
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
     // Only add if we have an MCP server URL (indicates MCP OAuth flow, not standard OAuth)
     if (mcpServerUrl) {
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(mcpServerUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
     const response = await fetch(tokenUrl, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json, application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json, application/x-www-form-urlencoded",
       },
       body: params.toString(),
     });
 
     const responseText = await response.text();
-    const contentType = response.headers.get('content-type') || '';
+    const contentType = response.headers.get("content-type") || "";
 
     if (!response.ok) {
       // Try to parse error from form-urlencoded response
       let errorMessage: string | null = null;
       try {
         const errorParams = new URLSearchParams(responseText);
-        const error = errorParams.get('error');
-        const errorDescription = errorParams.get('error_description');
+        const error = errorParams.get("error");
+        const errorDescription = errorParams.get("error_description");
         if (error) {
-          errorMessage = `Token refresh failed: ${error} - ${errorDescription || 'No description'}`;
+          errorMessage = `Token refresh failed: ${error} - ${errorDescription || "No description"}`;
         }
       } catch {
         // Fall back to raw error
       }
-      throw new Error(
-        errorMessage ||
-          `Token refresh failed: ${response.status} - ${responseText}`,
-      );
+      throw new Error(errorMessage || `Token refresh failed: ${response.status} - ${responseText}`);
     }
 
     // Log unexpected content types for debugging
     if (
-      !contentType.includes('application/json') &&
-      !contentType.includes('application/x-www-form-urlencoded')
+      !contentType.includes("application/json") &&
+      !contentType.includes("application/x-www-form-urlencoded")
     ) {
       debugLogger.warn(
         `Token refresh endpoint returned unexpected content-type: ${contentType}. ` +
@@ -672,18 +634,18 @@ export class MCPOAuthProvider {
     } catch {
       // Parse form-urlencoded response
       const tokenParams = new URLSearchParams(responseText);
-      const accessToken = tokenParams.get('access_token');
-      const tokenType = tokenParams.get('token_type') || 'Bearer';
-      const expiresIn = tokenParams.get('expires_in');
-      const refreshToken = tokenParams.get('refresh_token');
-      const scope = tokenParams.get('scope');
+      const accessToken = tokenParams.get("access_token");
+      const tokenType = tokenParams.get("token_type") || "Bearer";
+      const expiresIn = tokenParams.get("expires_in");
+      const refreshToken = tokenParams.get("refresh_token");
+      const scope = tokenParams.get("scope");
 
       if (!accessToken) {
         // Check for error in response
-        const error = tokenParams.get('error');
-        const errorDescription = tokenParams.get('error_description');
+        const error = tokenParams.get("error");
+        const errorDescription = tokenParams.get("error_description");
         throw new Error(
-          `Token refresh failed: ${error || 'unknown_error'} - ${errorDescription || responseText}`,
+          `Token refresh failed: ${error || "unknown_error"} - ${errorDescription || responseText}`,
         );
       }
 
@@ -729,22 +691,20 @@ export class MCPOAuthProvider {
       // First check if the server requires authentication via WWW-Authenticate header
       try {
         const headers: HeadersInit = OAuthUtils.isSSEEndpoint(mcpServerUrl)
-          ? { Accept: 'text/event-stream' }
-          : { Accept: 'application/json' };
+          ? { Accept: "text/event-stream" }
+          : { Accept: "application/json" };
 
         const response = await fetch(mcpServerUrl, {
-          method: 'HEAD',
+          method: "HEAD",
           headers,
         });
 
         if (response.status === 401 || response.status === 307) {
-          const wwwAuthenticate = response.headers.get('www-authenticate');
+          const wwwAuthenticate = response.headers.get("www-authenticate");
 
           if (wwwAuthenticate) {
             const discoveredConfig =
-              await OAuthUtils.discoverOAuthFromWWWAuthenticate(
-                wwwAuthenticate,
-              );
+              await OAuthUtils.discoverOAuthFromWWWAuthenticate(wwwAuthenticate);
             if (discoveredConfig) {
               // Merge discovered config with existing config, preserving clientId and clientSecret
               config = {
@@ -767,8 +727,7 @@ export class MCPOAuthProvider {
 
       // If we still don't have OAuth config, try the standard discovery
       if (!config.authorizationUrl) {
-        const discoveredConfig =
-          await this.discoverOAuthFromMCPServer(mcpServerUrl);
+        const discoveredConfig = await this.discoverOAuthFromMCPServer(mcpServerUrl);
         if (discoveredConfig) {
           // Merge discovered config with existing config, preserving clientId and clientSecret
           config = {
@@ -782,9 +741,7 @@ export class MCPOAuthProvider {
             clientSecret: config.clientSecret,
           };
         } else {
-          throw new Error(
-            'Failed to discover OAuth configuration from MCP server',
-          );
+          throw new Error("Failed to discover OAuth configuration from MCP server");
         }
       }
     }
@@ -809,54 +766,37 @@ export class MCPOAuthProvider {
       if (!registrationUrl) {
         // Extract server URL from authorization URL
         if (!config.authorizationUrl) {
-          throw new Error(
-            'Cannot perform dynamic registration without authorization URL',
-          );
+          throw new Error("Cannot perform dynamic registration without authorization URL");
         }
 
-        debugLogger.debug('→ Attempting dynamic client registration...');
+        debugLogger.debug("→ Attempting dynamic client registration...");
         const { metadata: authServerMetadata } =
-          await this.discoverAuthServerMetadataForRegistration(
-            config.authorizationUrl,
-          );
+          await this.discoverAuthServerMetadataForRegistration(config.authorizationUrl);
         registrationUrl = authServerMetadata.registration_endpoint;
       }
 
       // Register client if registration endpoint is available
       if (registrationUrl) {
-        const clientRegistration = await this.registerClient(
-          registrationUrl,
-          config,
-          redirectPort,
-        );
+        const clientRegistration = await this.registerClient(registrationUrl, config, redirectPort);
 
         config.clientId = clientRegistration.client_id;
         if (clientRegistration.client_secret) {
           config.clientSecret = clientRegistration.client_secret;
         }
 
-        debugLogger.debug('✓ Dynamic client registration successful');
+        debugLogger.debug("✓ Dynamic client registration successful");
       } else {
-        throw new Error(
-          'No client ID provided and dynamic registration not supported',
-        );
+        throw new Error("No client ID provided and dynamic registration not supported");
       }
     }
 
     // Validate configuration
     if (!config.clientId || !config.authorizationUrl || !config.tokenUrl) {
-      throw new Error(
-        'Missing required OAuth configuration after discovery and registration',
-      );
+      throw new Error("Missing required OAuth configuration after discovery and registration");
     }
 
     // Build authorization URL
-    const authUrl = this.buildAuthorizationUrl(
-      config,
-      pkceParams,
-      redirectPort,
-      mcpServerUrl,
-    );
+    const authUrl = this.buildAuthorizationUrl(config, pkceParams, redirectPort, mcpServerUrl);
 
     displayMessage(`→ Opening your browser for OAuth sign-in...
 
@@ -870,18 +810,13 @@ ${authUrl}
     try {
       await openBrowserSecurely(authUrl);
     } catch (error) {
-      debugLogger.warn(
-        'Failed to open browser automatically:',
-        getErrorMessage(error),
-      );
+      debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error));
     }
 
     // Wait for callback
     const { code } = await callbackServer.response;
 
-    debugLogger.debug(
-      '✓ Authorization code received, exchanging for tokens...',
-    );
+    debugLogger.debug("✓ Authorization code received, exchanging for tokens...");
 
     // Exchange code for tokens
     const tokenResponse = await this.exchangeCodeForToken(
@@ -894,12 +829,12 @@ ${authUrl}
 
     // Convert to our token format
     if (!tokenResponse.access_token) {
-      throw new Error('No access token received from token endpoint');
+      throw new Error("No access token received from token endpoint");
     }
 
     const token: OAuthToken = {
       accessToken: tokenResponse.access_token,
-      tokenType: tokenResponse.token_type || 'Bearer',
+      tokenType: tokenResponse.token_type || "Bearer",
       refreshToken: tokenResponse.refresh_token,
       scope: tokenResponse.scope,
     };
@@ -917,27 +852,23 @@ ${authUrl}
         config.tokenUrl,
         mcpServerUrl,
       );
-      debugLogger.debug('✓ Authentication successful! Token saved.');
+      debugLogger.debug("✓ Authentication successful! Token saved.");
 
       // Verify token was saved
       const savedToken = await this.tokenStorage.getCredentials(serverName);
       if (savedToken && savedToken.token && savedToken.token.accessToken) {
         // Avoid leaking token material; log a short SHA-256 fingerprint instead.
         const tokenFingerprint = crypto
-          .createHash('sha256')
+          .createHash("sha256")
           .update(savedToken.token.accessToken)
-          .digest('hex')
+          .digest("hex")
           .slice(0, 8);
-        debugLogger.debug(
-          `✓ Token verification successful (fingerprint: ${tokenFingerprint})`,
-        );
+        debugLogger.debug(`✓ Token verification successful (fingerprint: ${tokenFingerprint})`);
       } else {
-        debugLogger.warn(
-          'Token verification failed: token not found or invalid after save',
-        );
+        debugLogger.warn("Token verification failed: token not found or invalid after save");
       }
     } catch (saveError) {
-      debugLogger.error('Failed to save auth token.', saveError);
+      debugLogger.error("Failed to save auth token.", saveError);
       throw saveError;
     }
 
@@ -951,10 +882,7 @@ ${authUrl}
    * @param config OAuth configuration
    * @returns A valid access token or null if not authenticated
    */
-  async getValidToken(
-    serverName: string,
-    config: MCPOAuthConfig,
-  ): Promise<string | null> {
+  async getValidToken(serverName: string, config: MCPOAuthConfig): Promise<string | null> {
     debugLogger.debug(`Getting valid token for server: ${serverName}`);
     const credentials = await this.tokenStorage.getCredentials(serverName);
 
@@ -977,9 +905,7 @@ ${authUrl}
     // Try to refresh if we have a refresh token
     if (token.refreshToken && config.clientId && credentials.tokenUrl) {
       try {
-        debugLogger.log(
-          `Refreshing expired token for MCP server: ${serverName}`,
-        );
+        debugLogger.log(`Refreshing expired token for MCP server: ${serverName}`);
 
         const newTokenResponse = await this.refreshAccessToken(
           config,
@@ -1010,11 +936,7 @@ ${authUrl}
 
         return newToken.accessToken;
       } catch (error) {
-        coreEvents.emitFeedback(
-          'error',
-          'Failed to refresh auth token.',
-          error,
-        );
+        coreEvents.emitFeedback("error", "Failed to refresh auth token.", error);
         // Remove invalid token
         await this.tokenStorage.deleteCredentials(serverName);
       }
diff --git a/packages/gemini-cli-core/src/mcp/oauth-token-storage.test.ts b/packages/gemini-cli-core/src/mcp/oauth-token-storage.test.ts
index d882109ca..829d9d2de 100644
--- a/packages/gemini-cli-core/src/mcp/oauth-token-storage.test.ts
+++ b/packages/gemini-cli-core/src/mcp/oauth-token-storage.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { coreEvents } from '../utils/events.js';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
-import { FORCE_ENCRYPTED_FILE_ENV_VAR } from './token-storage/index.js';
-import type { OAuthCredentials, OAuthToken } from './token-storage/types.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { coreEvents } from "../utils/events.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import { MCPOAuthTokenStorage } from "./oauth-token-storage.js";
+import { FORCE_ENCRYPTED_FILE_ENV_VAR } from "./token-storage/index.js";
+import type { OAuthCredentials, OAuthToken } from "./token-storage/types.js";
 
 // Mock dependencies
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   promises: {
     readFile: vi.fn(),
     writeFile: vi.fn(),
@@ -23,18 +23,18 @@ vi.mock('node:fs', () => ({
   },
 }));
 
-vi.mock('node:path', () => ({
+vi.mock("node:path", () => ({
   dirname: vi.fn(),
   join: vi.fn(),
 }));
 
-vi.mock('../config/storage.js', () => ({
+vi.mock("../config/storage.js", () => ({
   Storage: {
     getMcpOAuthTokensPath: vi.fn(),
   },
 }));
 
-vi.mock('../utils/events.js', () => ({
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
@@ -48,34 +48,34 @@ const mockHybridTokenStorage = {
   clearAll: vi.fn(),
   getAllCredentials: vi.fn(),
 };
-vi.mock('./token-storage/hybrid-token-storage.js', () => ({
+vi.mock("./token-storage/hybrid-token-storage.js", () => ({
   HybridTokenStorage: vi.fn(() => mockHybridTokenStorage),
 }));
 
 const ONE_HR_MS = 3600000;
 
-describe('MCPOAuthTokenStorage', () => {
+describe("MCPOAuthTokenStorage", () => {
   let tokenStorage: MCPOAuthTokenStorage;
 
   const mockToken: OAuthToken = {
-    accessToken: 'access_token_123',
-    refreshToken: 'refresh_token_456',
-    tokenType: 'Bearer',
-    scope: 'read write',
+    accessToken: "access_token_123",
+    refreshToken: "refresh_token_456",
+    tokenType: "Bearer",
+    scope: "read write",
     expiresAt: Date.now() + ONE_HR_MS,
   };
 
   const mockCredentials: OAuthCredentials = {
-    serverName: 'test-server',
+    serverName: "test-server",
     token: mockToken,
-    clientId: 'test-client-id',
-    tokenUrl: 'https://auth.example.com/token',
+    clientId: "test-client-id",
+    tokenUrl: "https://auth.example.com/token",
     updatedAt: Date.now(),
   };
 
-  describe('with encrypted flag false', () => {
+  describe("with encrypted flag false", () => {
     beforeEach(() => {
-      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, 'false');
+      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, "false");
       tokenStorage = new MCPOAuthTokenStorage();
 
       vi.clearAllMocks();
@@ -86,9 +86,9 @@ describe('MCPOAuthTokenStorage', () => {
       vi.restoreAllMocks();
     });
 
-    describe('getAllCredentials', () => {
-      it('should return empty map when token file does not exist', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+    describe("getAllCredentials", () => {
+      it("should return empty map when token file does not exist", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
 
         const tokens = await tokenStorage.getAllCredentials();
 
@@ -96,214 +96,190 @@ describe('MCPOAuthTokenStorage', () => {
         expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
       });
 
-      it('should load tokens from file successfully', async () => {
+      it("should load tokens from file successfully", async () => {
         const tokensArray = [mockCredentials];
         vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify(tokensArray));
 
         const tokens = await tokenStorage.getAllCredentials();
 
         expect(tokens.size).toBe(1);
-        expect(tokens.get('test-server')).toEqual(mockCredentials);
+        expect(tokens.get("test-server")).toEqual(mockCredentials);
         expect(fs.readFile).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
-          'utf-8',
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
+          "utf-8",
         );
       });
 
-      it('should handle corrupted token file gracefully', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue('invalid json');
+      it("should handle corrupted token file gracefully", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue("invalid json");
 
         const tokens = await tokenStorage.getAllCredentials();
 
         expect(tokens.size).toBe(0);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          expect.stringContaining('Failed to load MCP OAuth tokens'),
+          "error",
+          expect.stringContaining("Failed to load MCP OAuth tokens"),
           expect.any(Error),
         );
       });
 
-      it('should handle file read errors other than ENOENT', async () => {
-        const error = new Error('Permission denied');
+      it("should handle file read errors other than ENOENT", async () => {
+        const error = new Error("Permission denied");
         vi.mocked(fs.readFile).mockRejectedValue(error);
 
         const tokens = await tokenStorage.getAllCredentials();
 
         expect(tokens.size).toBe(0);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to load MCP OAuth tokens: Permission denied',
+          "error",
+          "Failed to load MCP OAuth tokens: Permission denied",
           error,
         );
       });
     });
 
-    describe('saveToken', () => {
-      it('should save token with restricted permissions', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+    describe("saveToken", () => {
+      it("should save token with restricted permissions", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
         vi.mocked(fs.mkdir).mockResolvedValue(undefined);
         vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
-        await tokenStorage.saveToken(
-          'test-server',
-          mockToken,
-          'client-id',
-          'https://token.url',
-        );
+        await tokenStorage.saveToken("test-server", mockToken, "client-id", "https://token.url");
 
-        expect(fs.mkdir).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR),
-          { recursive: true },
-        );
+        expect(fs.mkdir).toHaveBeenCalledWith(path.join("/mock/home", GEMINI_DIR), {
+          recursive: true,
+        });
         expect(fs.writeFile).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
-          expect.stringContaining('test-server'),
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
+          expect.stringContaining("test-server"),
           { mode: 0o600 },
         );
       });
 
-      it('should update existing token for same server', async () => {
+      it("should update existing token for same server", async () => {
         const existingCredentials: OAuthCredentials = {
           ...mockCredentials,
-          serverName: 'existing-server',
+          serverName: "existing-server",
         };
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([existingCredentials]),
-        );
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([existingCredentials]));
         vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
         const newToken: OAuthToken = {
           ...mockToken,
-          accessToken: 'new_access_token',
+          accessToken: "new_access_token",
         };
-        await tokenStorage.saveToken('existing-server', newToken);
+        await tokenStorage.saveToken("existing-server", newToken);
 
         const writeCall = vi.mocked(fs.writeFile).mock.calls[0];
-        const savedData = JSON.parse(
-          writeCall[1] as string,
-        ) as OAuthCredentials[];
+        const savedData = JSON.parse(writeCall[1] as string) as OAuthCredentials[];
 
         expect(savedData).toHaveLength(1);
-        expect(savedData[0].token.accessToken).toBe('new_access_token');
-        expect(savedData[0].serverName).toBe('existing-server');
+        expect(savedData[0].token.accessToken).toBe("new_access_token");
+        expect(savedData[0].serverName).toBe("existing-server");
       });
 
-      it('should handle write errors gracefully', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+      it("should handle write errors gracefully", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
         vi.mocked(fs.mkdir).mockResolvedValue(undefined);
-        const writeError = new Error('Disk full');
+        const writeError = new Error("Disk full");
         vi.mocked(fs.writeFile).mockRejectedValue(writeError);
 
-        await expect(
-          tokenStorage.saveToken('test-server', mockToken),
-        ).rejects.toThrow('Disk full');
+        await expect(tokenStorage.saveToken("test-server", mockToken)).rejects.toThrow("Disk full");
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to save MCP OAuth token: Disk full',
+          "error",
+          "Failed to save MCP OAuth token: Disk full",
           writeError,
         );
       });
     });
 
-    describe('getCredentials', () => {
-      it('should return token for existing server', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+    describe("getCredentials", () => {
+      it("should return token for existing server", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
 
-        const result = await tokenStorage.getCredentials('test-server');
+        const result = await tokenStorage.getCredentials("test-server");
 
         expect(result).toEqual(mockCredentials);
       });
 
-      it('should return null for non-existent server', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+      it("should return null for non-existent server", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
 
-        const result = await tokenStorage.getCredentials('non-existent');
+        const result = await tokenStorage.getCredentials("non-existent");
 
         expect(result).toBeNull();
       });
 
-      it('should return null when no tokens file exists', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+      it("should return null when no tokens file exists", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
 
-        const result = await tokenStorage.getCredentials('test-server');
+        const result = await tokenStorage.getCredentials("test-server");
 
         expect(result).toBeNull();
       });
     });
 
-    describe('deleteCredentials', () => {
-      it('should remove token for specific server', async () => {
+    describe("deleteCredentials", () => {
+      it("should remove token for specific server", async () => {
         const credentials1: OAuthCredentials = {
           ...mockCredentials,
-          serverName: 'server1',
+          serverName: "server1",
         };
         const credentials2: OAuthCredentials = {
           ...mockCredentials,
-          serverName: 'server2',
+          serverName: "server2",
         };
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([credentials1, credentials2]),
-        );
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([credentials1, credentials2]));
         vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
-        await tokenStorage.deleteCredentials('server1');
+        await tokenStorage.deleteCredentials("server1");
 
         const writeCall = vi.mocked(fs.writeFile).mock.calls[0];
         const savedData = JSON.parse(writeCall[1] as string);
 
         expect(savedData).toHaveLength(1);
-        expect(savedData[0].serverName).toBe('server2');
+        expect(savedData[0].serverName).toBe("server2");
       });
 
-      it('should remove token file when no tokens remain', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+      it("should remove token file when no tokens remain", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
         vi.mocked(fs.unlink).mockResolvedValue(undefined);
 
-        await tokenStorage.deleteCredentials('test-server');
+        await tokenStorage.deleteCredentials("test-server");
 
         expect(fs.unlink).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
         );
         expect(fs.writeFile).not.toHaveBeenCalled();
       });
 
-      it('should handle removal of non-existent token gracefully', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+      it("should handle removal of non-existent token gracefully", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
 
-        await tokenStorage.deleteCredentials('non-existent');
+        await tokenStorage.deleteCredentials("non-existent");
 
         expect(fs.writeFile).not.toHaveBeenCalled();
         expect(fs.unlink).not.toHaveBeenCalled();
       });
 
-      it('should handle file operation errors gracefully', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
-        const unlinkError = new Error('Permission denied');
+      it("should handle file operation errors gracefully", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
+        const unlinkError = new Error("Permission denied");
         vi.mocked(fs.unlink).mockRejectedValue(unlinkError);
 
-        await tokenStorage.deleteCredentials('test-server');
+        await tokenStorage.deleteCredentials("test-server");
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to remove MCP OAuth token: Permission denied',
+          "error",
+          "Failed to remove MCP OAuth token: Permission denied",
           unlinkError,
         );
       });
     });
 
-    describe('isTokenExpired', () => {
-      it('should return false for token without expiry', () => {
+    describe("isTokenExpired", () => {
+      it("should return false for token without expiry", () => {
         const tokenWithoutExpiry: OAuthToken = { ...mockToken };
         delete tokenWithoutExpiry.expiresAt;
 
@@ -312,7 +288,7 @@ describe('MCPOAuthTokenStorage', () => {
         expect(result).toBe(false);
       });
 
-      it('should return false for valid token', () => {
+      it("should return false for valid token", () => {
         const futureToken: OAuthToken = {
           ...mockToken,
           expiresAt: Date.now() + ONE_HR_MS,
@@ -323,7 +299,7 @@ describe('MCPOAuthTokenStorage', () => {
         expect(result).toBe(false);
       });
 
-      it('should return true for expired token', () => {
+      it("should return true for expired token", () => {
         const expiredToken: OAuthToken = {
           ...mockToken,
           expiresAt: Date.now() - ONE_HR_MS,
@@ -334,7 +310,7 @@ describe('MCPOAuthTokenStorage', () => {
         expect(result).toBe(true);
       });
 
-      it('should return true for token expiring within buffer time', () => {
+      it("should return true for token expiring within buffer time", () => {
         const soonToExpireToken: OAuthToken = {
           ...mockToken,
           expiresAt: Date.now() + 60000, // 1 minute from now (within 5-minute buffer)
@@ -346,43 +322,43 @@ describe('MCPOAuthTokenStorage', () => {
       });
     });
 
-    describe('clearAll', () => {
-      it('should remove token file successfully', async () => {
+    describe("clearAll", () => {
+      it("should remove token file successfully", async () => {
         vi.mocked(fs.unlink).mockResolvedValue(undefined);
 
         await tokenStorage.clearAll();
 
         expect(fs.unlink).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
         );
       });
 
-      it('should handle non-existent file gracefully', async () => {
-        vi.mocked(fs.unlink).mockRejectedValue({ code: 'ENOENT' });
+      it("should handle non-existent file gracefully", async () => {
+        vi.mocked(fs.unlink).mockRejectedValue({ code: "ENOENT" });
 
         await tokenStorage.clearAll();
 
         expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
       });
 
-      it('should handle other file errors gracefully', async () => {
-        const unlinkError = new Error('Permission denied');
+      it("should handle other file errors gracefully", async () => {
+        const unlinkError = new Error("Permission denied");
         vi.mocked(fs.unlink).mockRejectedValue(unlinkError);
 
         await tokenStorage.clearAll();
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to clear MCP OAuth tokens: Permission denied',
+          "error",
+          "Failed to clear MCP OAuth tokens: Permission denied",
           unlinkError,
         );
       });
     });
   });
 
-  describe('with encrypted flag true', () => {
+  describe("with encrypted flag true", () => {
     beforeEach(() => {
-      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, 'true');
+      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, "true");
       tokenStorage = new MCPOAuthTokenStorage();
 
       vi.clearAllMocks();
@@ -393,73 +369,59 @@ describe('MCPOAuthTokenStorage', () => {
       vi.restoreAllMocks();
     });
 
-    it('should use HybridTokenStorage to list all credentials', async () => {
+    it("should use HybridTokenStorage to list all credentials", async () => {
       mockHybridTokenStorage.getAllCredentials.mockResolvedValue(new Map());
       const servers = await tokenStorage.getAllCredentials();
       expect(mockHybridTokenStorage.getAllCredentials).toHaveBeenCalled();
       expect(servers).toEqual(new Map());
     });
 
-    it('should use HybridTokenStorage to list servers', async () => {
-      mockHybridTokenStorage.listServers.mockResolvedValue(['server1']);
+    it("should use HybridTokenStorage to list servers", async () => {
+      mockHybridTokenStorage.listServers.mockResolvedValue(["server1"]);
       const servers = await tokenStorage.listServers();
       expect(mockHybridTokenStorage.listServers).toHaveBeenCalled();
-      expect(servers).toEqual(['server1']);
+      expect(servers).toEqual(["server1"]);
     });
 
-    it('should use HybridTokenStorage to set credentials', async () => {
+    it("should use HybridTokenStorage to set credentials", async () => {
       await tokenStorage.setCredentials(mockCredentials);
-      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(
-        mockCredentials,
-      );
+      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(mockCredentials);
     });
 
-    it('should use HybridTokenStorage to save a token', async () => {
-      const serverName = 'server1';
+    it("should use HybridTokenStorage to save a token", async () => {
+      const serverName = "server1";
       const now = Date.now();
-      vi.spyOn(Date, 'now').mockReturnValue(now);
+      vi.spyOn(Date, "now").mockReturnValue(now);
 
-      await tokenStorage.saveToken(
-        serverName,
-        mockToken,
-        'clientId',
-        'tokenUrl',
-        'mcpUrl',
-      );
+      await tokenStorage.saveToken(serverName, mockToken, "clientId", "tokenUrl", "mcpUrl");
 
       const expectedCredential: OAuthCredentials = {
         serverName,
         token: mockToken,
-        clientId: 'clientId',
-        tokenUrl: 'tokenUrl',
-        mcpServerUrl: 'mcpUrl',
+        clientId: "clientId",
+        tokenUrl: "tokenUrl",
+        mcpServerUrl: "mcpUrl",
         updatedAt: now,
       };
 
-      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(
-        expectedCredential,
-      );
+      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(expectedCredential);
       expect(path.dirname).toHaveBeenCalled();
       expect(fs.mkdir).toHaveBeenCalled();
     });
 
-    it('should use HybridTokenStorage to get credentials', async () => {
+    it("should use HybridTokenStorage to get credentials", async () => {
       mockHybridTokenStorage.getCredentials.mockResolvedValue(mockCredentials);
-      const result = await tokenStorage.getCredentials('server1');
-      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith(
-        'server1',
-      );
+      const result = await tokenStorage.getCredentials("server1");
+      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith("server1");
       expect(result).toBe(mockCredentials);
     });
 
-    it('should use HybridTokenStorage to delete credentials', async () => {
-      await tokenStorage.deleteCredentials('server1');
-      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith(
-        'server1',
-      );
+    it("should use HybridTokenStorage to delete credentials", async () => {
+      await tokenStorage.deleteCredentials("server1");
+      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith("server1");
     });
 
-    it('should use HybridTokenStorage to clear all tokens', async () => {
+    it("should use HybridTokenStorage to clear all tokens", async () => {
       await tokenStorage.clearAll();
       expect(mockHybridTokenStorage.clearAll).toHaveBeenCalled();
     });
diff --git a/packages/gemini-cli-core/src/mcp/oauth-token-storage.ts b/packages/gemini-cli-core/src/mcp/oauth-token-storage.ts
index fd11299c8..a73dad076 100644
--- a/packages/gemini-cli-core/src/mcp/oauth-token-storage.ts
+++ b/packages/gemini-cli-core/src/mcp/oauth-token-storage.ts
@@ -4,31 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { coreEvents } from '../utils/events.js';
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type {
-  OAuthToken,
-  OAuthCredentials,
-  TokenStorage,
-} from './token-storage/types.js';
-import { HybridTokenStorage } from './token-storage/hybrid-token-storage.js';
-import {
-  DEFAULT_SERVICE_NAME,
-  FORCE_ENCRYPTED_FILE_ENV_VAR,
-} from './token-storage/index.js';
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { Storage } from "../config/storage.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import { HybridTokenStorage } from "./token-storage/hybrid-token-storage.js";
+import { DEFAULT_SERVICE_NAME, FORCE_ENCRYPTED_FILE_ENV_VAR } from "./token-storage/index.js";
+import type { OAuthCredentials, OAuthToken, TokenStorage } from "./token-storage/types.js";
 
 /**
  * Class for managing MCP OAuth token storage and retrieval.
  */
 export class MCPOAuthTokenStorage implements TokenStorage {
-  private readonly hybridTokenStorage = new HybridTokenStorage(
-    DEFAULT_SERVICE_NAME,
-  );
-  private readonly useEncryptedFile =
-    process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === 'true';
+  private readonly hybridTokenStorage = new HybridTokenStorage(DEFAULT_SERVICE_NAME);
+  private readonly useEncryptedFile = process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === "true";
 
   /**
    * Get the path to the token storage file.
@@ -60,7 +50,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
 
     try {
       const tokenFile = this.getTokenFilePath();
-      const data = await fs.readFile(tokenFile, 'utf-8');
+      const data = await fs.readFile(tokenFile, "utf-8");
       const tokens = JSON.parse(data) as OAuthCredentials[];
 
       for (const credential of tokens) {
@@ -68,9 +58,9 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       }
     } catch (error) {
       // File doesn't exist or is invalid, return empty map
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Failed to load MCP OAuth tokens: ${getErrorMessage(error)}`,
           error,
         );
@@ -106,7 +96,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       );
     } catch (error) {
       coreEvents.emitFeedback(
-        'error',
+        "error",
         `Failed to save MCP OAuth token: ${getErrorMessage(error)}`,
         error,
       );
@@ -187,7 +177,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
         }
       } catch (error) {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Failed to remove MCP OAuth token: ${getErrorMessage(error)}`,
           error,
         );
@@ -222,9 +212,9 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       const tokenFile = this.getTokenFilePath();
       await fs.unlink(tokenFile);
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Failed to clear MCP OAuth tokens: ${getErrorMessage(error)}`,
           error,
         );
diff --git a/packages/gemini-cli-core/src/mcp/oauth-utils.test.ts b/packages/gemini-cli-core/src/mcp/oauth-utils.test.ts
index bec8ef9f4..9ad5482f9 100644
--- a/packages/gemini-cli-core/src/mcp/oauth-utils.test.ts
+++ b/packages/gemini-cli-core/src/mcp/oauth-utils.test.ts
@@ -4,153 +4,147 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type {
   OAuthAuthorizationServerMetadata,
   OAuthProtectedResourceMetadata,
-} from './oauth-utils.js';
-import { OAuthUtils } from './oauth-utils.js';
+} from "./oauth-utils.js";
+import { OAuthUtils } from "./oauth-utils.js";
 
 // Mock fetch globally
 const mockFetch = vi.fn();
 global.fetch = mockFetch;
 
-describe('OAuthUtils', () => {
+describe("OAuthUtils", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.spyOn(console, 'debug').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(console, 'log').mockImplementation(() => {});
+    vi.spyOn(console, "debug").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('buildWellKnownUrls', () => {
-    it('should build standard root-based URLs by default', () => {
-      const urls = OAuthUtils.buildWellKnownUrls('https://example.com/mcp');
+  describe("buildWellKnownUrls", () => {
+    it("should build standard root-based URLs by default", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com/mcp");
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server',
+        "https://example.com/.well-known/oauth-authorization-server",
       );
     });
 
-    it('should build path-based URLs when includePathSuffix is true', () => {
-      const urls = OAuthUtils.buildWellKnownUrls(
-        'https://example.com/mcp',
-        true,
-      );
+    it("should build path-based URLs when includePathSuffix is true", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com/mcp", true);
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource/mcp',
+        "https://example.com/.well-known/oauth-protected-resource/mcp",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server/mcp',
+        "https://example.com/.well-known/oauth-authorization-server/mcp",
       );
     });
 
-    it('should handle root path correctly', () => {
-      const urls = OAuthUtils.buildWellKnownUrls('https://example.com', true);
+    it("should handle root path correctly", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com", true);
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server',
+        "https://example.com/.well-known/oauth-authorization-server",
       );
     });
 
-    it('should handle trailing slash in path', () => {
-      const urls = OAuthUtils.buildWellKnownUrls(
-        'https://example.com/mcp/',
-        true,
-      );
+    it("should handle trailing slash in path", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com/mcp/", true);
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource/mcp',
+        "https://example.com/.well-known/oauth-protected-resource/mcp",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server/mcp',
+        "https://example.com/.well-known/oauth-authorization-server/mcp",
       );
     });
   });
 
-  describe('fetchProtectedResourceMetadata', () => {
+  describe("fetchProtectedResourceMetadata", () => {
     const mockResourceMetadata: OAuthProtectedResourceMetadata = {
-      resource: 'https://api.example.com',
-      authorization_servers: ['https://auth.example.com'],
-      bearer_methods_supported: ['header'],
+      resource: "https://api.example.com",
+      authorization_servers: ["https://auth.example.com"],
+      bearer_methods_supported: ["header"],
     };
 
-    it('should fetch protected resource metadata successfully', async () => {
+    it("should fetch protected resource metadata successfully", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: true,
         json: () => Promise.resolve(mockResourceMetadata),
       });
 
       const result = await OAuthUtils.fetchProtectedResourceMetadata(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
 
       expect(result).toEqual(mockResourceMetadata);
     });
 
-    it('should return null when fetch fails', async () => {
+    it("should return null when fetch fails", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: false,
       });
 
       const result = await OAuthUtils.fetchProtectedResourceMetadata(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
 
       expect(result).toBeNull();
     });
   });
 
-  describe('fetchAuthorizationServerMetadata', () => {
+  describe("fetchAuthorizationServerMetadata", () => {
     const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-      issuer: 'https://auth.example.com',
-      authorization_endpoint: 'https://auth.example.com/authorize',
-      token_endpoint: 'https://auth.example.com/token',
-      scopes_supported: ['read', 'write'],
+      issuer: "https://auth.example.com",
+      authorization_endpoint: "https://auth.example.com/authorize",
+      token_endpoint: "https://auth.example.com/token",
+      scopes_supported: ["read", "write"],
     };
 
-    it('should fetch authorization server metadata successfully', async () => {
+    it("should fetch authorization server metadata successfully", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: true,
         json: () => Promise.resolve(mockAuthServerMetadata),
       });
 
       const result = await OAuthUtils.fetchAuthorizationServerMetadata(
-        'https://auth.example.com/.well-known/oauth-authorization-server',
+        "https://auth.example.com/.well-known/oauth-authorization-server",
       );
 
       expect(result).toEqual(mockAuthServerMetadata);
     });
 
-    it('should return null when fetch fails', async () => {
+    it("should return null when fetch fails", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: false,
       });
 
       const result = await OAuthUtils.fetchAuthorizationServerMetadata(
-        'https://auth.example.com/.well-known/oauth-authorization-server',
+        "https://auth.example.com/.well-known/oauth-authorization-server",
       );
 
       expect(result).toBeNull();
     });
   });
 
-  describe('discoverAuthorizationServerMetadata', () => {
+  describe("discoverAuthorizationServerMetadata", () => {
     const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-      issuer: 'https://auth.example.com',
-      authorization_endpoint: 'https://auth.example.com/authorize',
-      token_endpoint: 'https://auth.example.com/token',
-      scopes_supported: ['read', 'write'],
+      issuer: "https://auth.example.com",
+      authorization_endpoint: "https://auth.example.com/authorize",
+      token_endpoint: "https://auth.example.com/token",
+      scopes_supported: ["read", "write"],
     };
 
-    it('should handle URLs without path components correctly', async () => {
+    it("should handle URLs without path components correctly", async () => {
       mockFetch
         .mockResolvedValueOnce({
           ok: false,
@@ -161,22 +155,22 @@ describe('OAuthUtils', () => {
         });
 
       const result = await OAuthUtils.discoverAuthorizationServerMetadata(
-        'https://auth.example.com/',
+        "https://auth.example.com/",
       );
 
       expect(result).toEqual(mockAuthServerMetadata);
 
       expect(mockFetch).nthCalledWith(
         1,
-        'https://auth.example.com/.well-known/oauth-authorization-server',
+        "https://auth.example.com/.well-known/oauth-authorization-server",
       );
       expect(mockFetch).nthCalledWith(
         2,
-        'https://auth.example.com/.well-known/openid-configuration',
+        "https://auth.example.com/.well-known/openid-configuration",
       );
     });
 
-    it('should handle URLs with path components correctly', async () => {
+    it("should handle URLs with path components correctly", async () => {
       mockFetch
         .mockResolvedValueOnce({
           ok: false,
@@ -190,49 +184,49 @@ describe('OAuthUtils', () => {
         });
 
       const result = await OAuthUtils.discoverAuthorizationServerMetadata(
-        'https://auth.example.com/mcp',
+        "https://auth.example.com/mcp",
       );
 
       expect(result).toEqual(mockAuthServerMetadata);
 
       expect(mockFetch).nthCalledWith(
         1,
-        'https://auth.example.com/.well-known/oauth-authorization-server/mcp',
+        "https://auth.example.com/.well-known/oauth-authorization-server/mcp",
       );
       expect(mockFetch).nthCalledWith(
         2,
-        'https://auth.example.com/.well-known/openid-configuration/mcp',
+        "https://auth.example.com/.well-known/openid-configuration/mcp",
       );
       expect(mockFetch).nthCalledWith(
         3,
-        'https://auth.example.com/mcp/.well-known/openid-configuration',
+        "https://auth.example.com/mcp/.well-known/openid-configuration",
       );
     });
   });
 
-  describe('metadataToOAuthConfig', () => {
-    it('should convert metadata to OAuth config', () => {
+  describe("metadataToOAuthConfig", () => {
+    it("should convert metadata to OAuth config", () => {
       const metadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
-        scopes_supported: ['read', 'write'],
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
+        scopes_supported: ["read", "write"],
       };
 
       const config = OAuthUtils.metadataToOAuthConfig(metadata);
 
       expect(config).toEqual({
-        authorizationUrl: 'https://auth.example.com/authorize',
-        tokenUrl: 'https://auth.example.com/token',
-        scopes: ['read', 'write'],
+        authorizationUrl: "https://auth.example.com/authorize",
+        tokenUrl: "https://auth.example.com/token",
+        scopes: ["read", "write"],
       });
     });
 
-    it('should handle empty scopes', () => {
+    it("should handle empty scopes", () => {
       const metadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
       };
 
       const config = OAuthUtils.metadataToOAuthConfig(metadata);
@@ -241,123 +235,111 @@ describe('OAuthUtils', () => {
     });
   });
 
-  describe('parseWWWAuthenticateHeader', () => {
-    it('should parse resource metadata URI from WWW-Authenticate header', () => {
+  describe("parseWWWAuthenticateHeader", () => {
+    it("should parse resource metadata URI from WWW-Authenticate header", () => {
       const header =
         'Bearer realm="example", resource_metadata="https://example.com/.well-known/oauth-protected-resource"';
       const result = OAuthUtils.parseWWWAuthenticateHeader(header);
-      expect(result).toBe(
-        'https://example.com/.well-known/oauth-protected-resource',
-      );
+      expect(result).toBe("https://example.com/.well-known/oauth-protected-resource");
     });
 
-    it('should return null when no resource metadata URI is found', () => {
+    it("should return null when no resource metadata URI is found", () => {
       const header = 'Bearer realm="example"';
       const result = OAuthUtils.parseWWWAuthenticateHeader(header);
       expect(result).toBeNull();
     });
   });
 
-  describe('extractBaseUrl', () => {
-    it('should extract base URL from MCP server URL', () => {
-      const result = OAuthUtils.extractBaseUrl('https://example.com/mcp/v1');
-      expect(result).toBe('https://example.com');
+  describe("extractBaseUrl", () => {
+    it("should extract base URL from MCP server URL", () => {
+      const result = OAuthUtils.extractBaseUrl("https://example.com/mcp/v1");
+      expect(result).toBe("https://example.com");
     });
 
-    it('should handle URLs with ports', () => {
-      const result = OAuthUtils.extractBaseUrl(
-        'https://example.com:8080/mcp/v1',
-      );
-      expect(result).toBe('https://example.com:8080');
+    it("should handle URLs with ports", () => {
+      const result = OAuthUtils.extractBaseUrl("https://example.com:8080/mcp/v1");
+      expect(result).toBe("https://example.com:8080");
     });
   });
 
-  describe('isSSEEndpoint', () => {
-    it('should return true for SSE endpoints', () => {
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/sse')).toBe(true);
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/api/v1/sse')).toBe(
-        true,
-      );
+  describe("isSSEEndpoint", () => {
+    it("should return true for SSE endpoints", () => {
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/sse")).toBe(true);
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/api/v1/sse")).toBe(true);
     });
 
-    it('should return true for non-MCP endpoints', () => {
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/api')).toBe(true);
+    it("should return true for non-MCP endpoints", () => {
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/api")).toBe(true);
     });
 
-    it('should return false for MCP endpoints', () => {
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/mcp')).toBe(false);
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/api/mcp/v1')).toBe(
-        false,
-      );
+    it("should return false for MCP endpoints", () => {
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/mcp")).toBe(false);
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/api/mcp/v1")).toBe(false);
     });
   });
 
-  describe('buildResourceParameter', () => {
-    it('should build resource parameter from endpoint URL', () => {
-      const result = OAuthUtils.buildResourceParameter(
-        'https://example.com/oauth/token',
-      );
-      expect(result).toBe('https://example.com/oauth/token');
+  describe("buildResourceParameter", () => {
+    it("should build resource parameter from endpoint URL", () => {
+      const result = OAuthUtils.buildResourceParameter("https://example.com/oauth/token");
+      expect(result).toBe("https://example.com/oauth/token");
     });
 
-    it('should handle URLs with ports', () => {
-      const result = OAuthUtils.buildResourceParameter(
-        'https://example.com:8080/oauth/token',
-      );
-      expect(result).toBe('https://example.com:8080/oauth/token');
+    it("should handle URLs with ports", () => {
+      const result = OAuthUtils.buildResourceParameter("https://example.com:8080/oauth/token");
+      expect(result).toBe("https://example.com:8080/oauth/token");
     });
 
-    it('should strip query parameters from the URL', () => {
+    it("should strip query parameters from the URL", () => {
       const result = OAuthUtils.buildResourceParameter(
-        'https://example.com/api/v1/data?user=123&scope=read',
+        "https://example.com/api/v1/data?user=123&scope=read",
       );
-      expect(result).toBe('https://example.com/api/v1/data');
+      expect(result).toBe("https://example.com/api/v1/data");
     });
 
-    it('should strip URL fragments from the URL', () => {
+    it("should strip URL fragments from the URL", () => {
       const result = OAuthUtils.buildResourceParameter(
-        'https://example.com/api/v1/data#section-one',
+        "https://example.com/api/v1/data#section-one",
       );
-      expect(result).toBe('https://example.com/api/v1/data');
+      expect(result).toBe("https://example.com/api/v1/data");
     });
 
-    it('should throw an error for invalid URLs', () => {
-      expect(() => OAuthUtils.buildResourceParameter('not-a-url')).toThrow();
+    it("should throw an error for invalid URLs", () => {
+      expect(() => OAuthUtils.buildResourceParameter("not-a-url")).toThrow();
     });
   });
 
-  describe('parseTokenExpiry', () => {
-    it('should return the expiry time in milliseconds for a valid token', () => {
+  describe("parseTokenExpiry", () => {
+    it("should return the expiry time in milliseconds for a valid token", () => {
       // Corresponds to a date of 2100-01-01T00:00:00Z
       const expiry = 4102444800;
       const payload = { exp: expiry };
-      const token = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+      const token = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBe(expiry * 1000);
     });
 
-    it('should return undefined for a token without an expiry time', () => {
+    it("should return undefined for a token without an expiry time", () => {
       const payload = { iat: 1678886400 };
-      const token = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+      const token = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined for a token with an invalid expiry time', () => {
-      const payload = { exp: 'not-a-number' };
-      const token = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+    it("should return undefined for a token with an invalid expiry time", () => {
+      const payload = { exp: "not-a-number" };
+      const token = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined for a malformed token', () => {
-      const token = 'not-a-valid-token';
+    it("should return undefined for a malformed token", () => {
+      const token = "not-a-valid-token";
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined for a token with invalid JSON in payload', () => {
-      const token = `header.${Buffer.from('{ not valid json').toString('base64')}.signature`;
+    it("should return undefined for a token with invalid JSON in payload", () => {
+      const token = `header.${Buffer.from("{ not valid json").toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
diff --git a/packages/gemini-cli-core/src/mcp/oauth-utils.ts b/packages/gemini-cli-core/src/mcp/oauth-utils.ts
index 0f4bd0b24..d29b1a62c 100644
--- a/packages/gemini-cli-core/src/mcp/oauth-utils.ts
+++ b/packages/gemini-cli-core/src/mcp/oauth-utils.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MCPOAuthConfig } from './oauth-provider.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import type { MCPOAuthConfig } from "./oauth-provider.js";
 
 /**
  * OAuth authorization server metadata as per RFC 8414.
@@ -56,19 +56,13 @@ export class OAuthUtils {
     if (!includePathSuffix) {
       // Standard discovery: use root-based well-known URLs
       return {
-        protectedResource: new URL(
-          '/.well-known/oauth-protected-resource',
-          base,
-        ).toString(),
-        authorizationServer: new URL(
-          '/.well-known/oauth-authorization-server',
-          base,
-        ).toString(),
+        protectedResource: new URL("/.well-known/oauth-protected-resource", base).toString(),
+        authorizationServer: new URL("/.well-known/oauth-authorization-server", base).toString(),
       };
     }
 
     // Path-based discovery: append path suffix to well-known URLs
-    const pathSuffix = serverUrl.pathname.replace(/\/$/, ''); // Remove trailing slash
+    const pathSuffix = serverUrl.pathname.replace(/\/$/, ""); // Remove trailing slash
     return {
       protectedResource: new URL(
         `/.well-known/oauth-protected-resource${pathSuffix}`,
@@ -133,9 +127,7 @@ export class OAuthUtils {
    * @param metadata The authorization server metadata
    * @returns The OAuth configuration
    */
-  static metadataToOAuthConfig(
-    metadata: OAuthAuthorizationServerMetadata,
-  ): MCPOAuthConfig {
+  static metadataToOAuthConfig(metadata: OAuthAuthorizationServerMetadata): MCPOAuthConfig {
     return {
       authorizationUrl: metadata.authorization_endpoint,
       tokenUrl: metadata.token_endpoint,
@@ -161,7 +153,7 @@ export class OAuthUtils {
 
     // With issuer URLs with path components, try the following well-known
     // endpoints in order:
-    if (authServerUrlObj.pathname !== '/') {
+    if (authServerUrlObj.pathname !== "/") {
       // 1. OAuth 2.0 Authorization Server Metadata with path insertion
       endpointsToTry.push(
         new URL(
@@ -172,18 +164,12 @@ export class OAuthUtils {
 
       // 2. OpenID Connect Discovery 1.0 with path insertion
       endpointsToTry.push(
-        new URL(
-          `/.well-known/openid-configuration${authServerUrlObj.pathname}`,
-          base,
-        ).toString(),
+        new URL(`/.well-known/openid-configuration${authServerUrlObj.pathname}`, base).toString(),
       );
 
       // 3. OpenID Connect Discovery 1.0 with path appending
       endpointsToTry.push(
-        new URL(
-          `${authServerUrlObj.pathname}/.well-known/openid-configuration`,
-          base,
-        ).toString(),
+        new URL(`${authServerUrlObj.pathname}/.well-known/openid-configuration`, base).toString(),
       );
     }
 
@@ -191,26 +177,19 @@ export class OAuthUtils {
     // discoveries, try the following well-known endpoints in order:
 
     // 1. OAuth 2.0 Authorization Server Metadata
-    endpointsToTry.push(
-      new URL('/.well-known/oauth-authorization-server', base).toString(),
-    );
+    endpointsToTry.push(new URL("/.well-known/oauth-authorization-server", base).toString());
 
     // 2. OpenID Connect Discovery 1.0
-    endpointsToTry.push(
-      new URL('/.well-known/openid-configuration', base).toString(),
-    );
+    endpointsToTry.push(new URL("/.well-known/openid-configuration", base).toString());
 
     for (const endpoint of endpointsToTry) {
-      const authServerMetadata =
-        await this.fetchAuthorizationServerMetadata(endpoint);
+      const authServerMetadata = await this.fetchAuthorizationServerMetadata(endpoint);
       if (authServerMetadata) {
         return authServerMetadata;
       }
     }
 
-    debugLogger.debug(
-      `Metadata discovery failed for authorization server ${authServerUrl}`,
-    );
+    debugLogger.debug(`Metadata discovery failed for authorization server ${authServerUrl}`);
     return null;
   }
 
@@ -220,9 +199,7 @@ export class OAuthUtils {
    * @param serverUrl The base URL of the server
    * @returns The discovered OAuth configuration or null if not available
    */
-  static async discoverOAuthConfig(
-    serverUrl: string,
-  ): Promise<MCPOAuthConfig | null> {
+  static async discoverOAuthConfig(serverUrl: string): Promise<MCPOAuthConfig | null> {
     try {
       // First try standard root-based discovery
       const wellKnownUrls = this.buildWellKnownUrls(serverUrl, false);
@@ -235,7 +212,7 @@ export class OAuthUtils {
       // If root discovery fails and we have a path, try path-based discovery
       if (!resourceMetadata) {
         const url = new URL(serverUrl);
-        if (url.pathname && url.pathname !== '/') {
+        if (url.pathname && url.pathname !== "/") {
           const pathBasedUrls = this.buildWellKnownUrls(serverUrl, true);
           resourceMetadata = await this.fetchProtectedResourceMetadata(
             pathBasedUrls.protectedResource,
@@ -246,14 +223,13 @@ export class OAuthUtils {
       if (resourceMetadata?.authorization_servers?.length) {
         // Use the first authorization server
         const authServerUrl = resourceMetadata.authorization_servers[0];
-        const authServerMetadata =
-          await this.discoverAuthorizationServerMetadata(authServerUrl);
+        const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
 
         if (authServerMetadata) {
           const config = this.metadataToOAuthConfig(authServerMetadata);
           if (authServerMetadata.registration_endpoint) {
             debugLogger.log(
-              'Dynamic client registration is supported at:',
+              "Dynamic client registration is supported at:",
               authServerMetadata.registration_endpoint,
             );
           }
@@ -263,14 +239,13 @@ export class OAuthUtils {
 
       // Fallback: try well-known endpoints at the base URL
       debugLogger.debug(`Trying OAuth discovery fallback at ${serverUrl}`);
-      const authServerMetadata =
-        await this.discoverAuthorizationServerMetadata(serverUrl);
+      const authServerMetadata = await this.discoverAuthorizationServerMetadata(serverUrl);
 
       if (authServerMetadata) {
         const config = this.metadataToOAuthConfig(authServerMetadata);
         if (authServerMetadata.registration_endpoint) {
           debugLogger.log(
-            'Dynamic client registration is supported at:',
+            "Dynamic client registration is supported at:",
             authServerMetadata.registration_endpoint,
           );
         }
@@ -279,9 +254,7 @@ export class OAuthUtils {
 
       return null;
     } catch (error) {
-      debugLogger.debug(
-        `Failed to discover OAuth configuration: ${getErrorMessage(error)}`,
-      );
+      debugLogger.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error)}`);
       return null;
     }
   }
@@ -310,21 +283,18 @@ export class OAuthUtils {
   static async discoverOAuthFromWWWAuthenticate(
     wwwAuthenticate: string,
   ): Promise<MCPOAuthConfig | null> {
-    const resourceMetadataUri =
-      this.parseWWWAuthenticateHeader(wwwAuthenticate);
+    const resourceMetadataUri = this.parseWWWAuthenticateHeader(wwwAuthenticate);
     if (!resourceMetadataUri) {
       return null;
     }
 
-    const resourceMetadata =
-      await this.fetchProtectedResourceMetadata(resourceMetadataUri);
+    const resourceMetadata = await this.fetchProtectedResourceMetadata(resourceMetadataUri);
     if (!resourceMetadata?.authorization_servers?.length) {
       return null;
     }
 
     const authServerUrl = resourceMetadata.authorization_servers[0];
-    const authServerMetadata =
-      await this.discoverAuthorizationServerMetadata(authServerUrl);
+    const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
 
     if (authServerMetadata) {
       return this.metadataToOAuthConfig(authServerMetadata);
@@ -351,7 +321,7 @@ export class OAuthUtils {
    * @returns True if the URL appears to be an SSE endpoint
    */
   static isSSEEndpoint(url: string): boolean {
-    return url.includes('/sse') || !url.includes('/mcp');
+    return url.includes("/sse") || !url.includes("/mcp");
   }
 
   /**
@@ -372,15 +342,13 @@ export class OAuthUtils {
    */
   static parseTokenExpiry(idToken: string): number | undefined {
     try {
-      const payload = JSON.parse(
-        Buffer.from(idToken.split('.')[1], 'base64').toString(),
-      );
+      const payload = JSON.parse(Buffer.from(idToken.split(".")[1], "base64").toString());
 
-      if (payload && typeof payload.exp === 'number') {
+      if (payload && typeof payload.exp === "number") {
         return payload.exp * 1000; // Convert seconds to milliseconds
       }
     } catch (e) {
-      console.error('Failed to parse ID token for expiry time with error:', e);
+      console.error("Failed to parse ID token for expiry time with error:", e);
     }
 
     // Return undefined if try block fails or 'exp' is missing/invalid
diff --git a/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.test.ts b/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.test.ts
index c86da645c..7232a3d9e 100644
--- a/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.test.ts
+++ b/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.test.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ServiceAccountImpersonationProvider } from './sa-impersonation-provider.js';
-import type { MCPServerConfig } from '../config/config.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { MCPServerConfig } from "../config/config.js";
+import { ServiceAccountImpersonationProvider } from "./sa-impersonation-provider.js";
 
 const mockRequest = vi.fn();
 const mockGetClient = vi.fn(() => ({
@@ -14,8 +14,8 @@ const mockGetClient = vi.fn(() => ({
 }));
 
 // Mock the google-auth-library to use a shared mock function
-vi.mock('google-auth-library', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('google-auth-library')>();
+vi.mock("google-auth-library", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("google-auth-library")>();
   return {
     ...actual,
     GoogleAuth: vi.fn().mockImplementation(() => ({
@@ -25,45 +25,45 @@ vi.mock('google-auth-library', async (importOriginal) => {
 });
 
 const defaultSAConfig: MCPServerConfig = {
-  url: 'https://my-iap-service.run.app',
-  targetAudience: 'my-audience',
-  targetServiceAccount: 'my-sa',
+  url: "https://my-iap-service.run.app",
+  targetAudience: "my-audience",
+  targetServiceAccount: "my-sa",
 };
 
-describe('ServiceAccountImpersonationProvider', () => {
+describe("ServiceAccountImpersonationProvider", () => {
   beforeEach(() => {
     // Reset mocks before each test
     vi.clearAllMocks();
   });
 
-  it('should throw an error if no URL is provided', () => {
+  it("should throw an error if no URL is provided", () => {
     const config: MCPServerConfig = {};
     expect(() => new ServiceAccountImpersonationProvider(config)).toThrow(
-      'A url or httpUrl must be provided for the Service Account Impersonation provider',
+      "A url or httpUrl must be provided for the Service Account Impersonation provider",
     );
   });
 
-  it('should throw an error if no targetAudience is provided', () => {
+  it("should throw an error if no targetAudience is provided", () => {
     const config: MCPServerConfig = {
-      url: 'https://my-iap-service.run.app',
+      url: "https://my-iap-service.run.app",
     };
     expect(() => new ServiceAccountImpersonationProvider(config)).toThrow(
-      'targetAudience must be provided for the Service Account Impersonation provider',
+      "targetAudience must be provided for the Service Account Impersonation provider",
     );
   });
 
-  it('should throw an error if no targetSA is provided', () => {
+  it("should throw an error if no targetSA is provided", () => {
     const config: MCPServerConfig = {
-      url: 'https://my-iap-service.run.app',
-      targetAudience: 'my-audience',
+      url: "https://my-iap-service.run.app",
+      targetAudience: "my-audience",
     };
     expect(() => new ServiceAccountImpersonationProvider(config)).toThrow(
-      'targetServiceAccount must be provided for the Service Account Impersonation provider',
+      "targetServiceAccount must be provided for the Service Account Impersonation provider",
     );
   });
 
-  it('should correctly get tokens for a valid config', async () => {
-    const mockToken = 'mock-id-token-123';
+  it("should correctly get tokens for a valid config", async () => {
+    const mockToken = "mock-id-token-123";
     mockRequest.mockResolvedValue({ data: { token: mockToken } });
 
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
@@ -71,10 +71,10 @@ describe('ServiceAccountImpersonationProvider', () => {
 
     expect(tokens).toBeDefined();
     expect(tokens?.access_token).toBe(mockToken);
-    expect(tokens?.token_type).toBe('Bearer');
+    expect(tokens?.token_type).toBe("Bearer");
   });
 
-  it('should return undefined if token acquisition fails', async () => {
+  it("should return undefined if token acquisition fails", async () => {
     mockRequest.mockResolvedValue({ data: { token: null } });
 
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
@@ -83,29 +83,29 @@ describe('ServiceAccountImpersonationProvider', () => {
     expect(tokens).toBeUndefined();
   });
 
-  it('should make a request with the correct parameters', async () => {
-    mockRequest.mockResolvedValue({ data: { token: 'test-token' } });
+  it("should make a request with the correct parameters", async () => {
+    mockRequest.mockResolvedValue({ data: { token: "test-token" } });
 
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
     await provider.tokens();
 
     expect(mockRequest).toHaveBeenCalledWith({
-      url: 'https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/my-sa:generateIdToken',
-      method: 'POST',
+      url: "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/my-sa:generateIdToken",
+      method: "POST",
       data: {
-        audience: 'my-audience',
+        audience: "my-audience",
         includeEmail: true,
       },
     });
   });
 
-  it('should return a cached token if it is not expired', async () => {
+  it("should return a cached token if it is not expired", async () => {
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
     vi.useFakeTimers();
 
     // jwt payload with exp set to 1 hour from now
     const payload = { exp: Math.floor(Date.now() / 1000) + 3600 };
-    const jwt = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+    const jwt = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
     mockRequest.mockResolvedValue({ data: { token: jwt } });
 
     const firstTokens = await provider.tokens();
@@ -123,13 +123,13 @@ describe('ServiceAccountImpersonationProvider', () => {
     vi.useRealTimers();
   });
 
-  it('should fetch a new token if the cached token is expired (using fake timers)', async () => {
+  it("should fetch a new token if the cached token is expired (using fake timers)", async () => {
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
     vi.useFakeTimers();
 
     // Get and cache a token that expires in 1 second
     const expiredPayload = { exp: Math.floor(Date.now() / 1000) + 1 };
-    const expiredJwt = `header.${Buffer.from(JSON.stringify(expiredPayload)).toString('base64')}.signature`;
+    const expiredJwt = `header.${Buffer.from(JSON.stringify(expiredPayload)).toString("base64")}.signature`;
 
     mockRequest.mockResolvedValue({ data: { token: expiredJwt } });
     const firstTokens = await provider.tokens();
@@ -138,7 +138,7 @@ describe('ServiceAccountImpersonationProvider', () => {
 
     // Prepare the mock for the *next* call
     const newPayload = { exp: Math.floor(Date.now() / 1000) + 3600 };
-    const newJwt = `header.${Buffer.from(JSON.stringify(newPayload)).toString('base64')}.signature`;
+    const newJwt = `header.${Buffer.from(JSON.stringify(newPayload)).toString("base64")}.signature`;
     mockRequest.mockResolvedValue({ data: { token: newJwt } });
 
     vi.advanceTimersByTime(1001);
diff --git a/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.ts b/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.ts
index 837601c0d..11bb695f7 100644
--- a/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.ts
+++ b/packages/gemini-cli-core/src/mcp/sa-impersonation-provider.ts
@@ -9,12 +9,12 @@ import type {
   OAuthClientInformationFull,
   OAuthClientMetadata,
   OAuthTokens,
-} from '@modelcontextprotocol/sdk/shared/auth.js';
-import { GoogleAuth } from 'google-auth-library';
-import { OAuthUtils, FIVE_MIN_BUFFER_MS } from './oauth-utils.js';
-import type { MCPServerConfig } from '../config/config.js';
-import type { McpAuthProvider } from './auth-provider.js';
-import { coreEvents } from '../utils/events.js';
+} from "@modelcontextprotocol/sdk/shared/auth.js";
+import { GoogleAuth } from "google-auth-library";
+import type { MCPServerConfig } from "../config/config.js";
+import { coreEvents } from "../utils/events.js";
+import type { McpAuthProvider } from "./auth-provider.js";
+import { FIVE_MIN_BUFFER_MS, OAuthUtils } from "./oauth-utils.js";
 
 function createIamApiUrl(targetSA: string): string {
   return `https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/${encodeURIComponent(
@@ -30,13 +30,13 @@ export class ServiceAccountImpersonationProvider implements McpAuthProvider {
   private tokenExpiryTime?: number;
 
   // Properties required by OAuthClientProvider, with no-op values
-  readonly redirectUrl = '';
+  readonly redirectUrl = "";
   readonly clientMetadata: OAuthClientMetadata = {
-    client_name: 'Gemini CLI (Service Account Impersonation)',
+    client_name: "Gemini CLI (Service Account Impersonation)",
     redirect_uris: [],
     grant_types: [],
     response_types: [],
-    token_endpoint_auth_method: 'none',
+    token_endpoint_auth_method: "none",
   };
   private _clientInformation?: OAuthClientInformationFull;
 
@@ -44,20 +44,20 @@ export class ServiceAccountImpersonationProvider implements McpAuthProvider {
     // This check is done in mcp-client.ts. This is just an additional check.
     if (!this.config.httpUrl && !this.config.url) {
       throw new Error(
-        'A url or httpUrl must be provided for the Service Account Impersonation provider',
+        "A url or httpUrl must be provided for the Service Account Impersonation provider",
       );
     }
 
     if (!config.targetAudience) {
       throw new Error(
-        'targetAudience must be provided for the Service Account Impersonation provider',
+        "targetAudience must be provided for the Service Account Impersonation provider",
       );
     }
     this.targetAudience = config.targetAudience;
 
     if (!config.targetServiceAccount) {
       throw new Error(
-        'targetServiceAccount must be provided for the Service Account Impersonation provider',
+        "targetServiceAccount must be provided for the Service Account Impersonation provider",
       );
     }
     this.targetServiceAccount = config.targetServiceAccount;
@@ -95,7 +95,7 @@ export class ServiceAccountImpersonationProvider implements McpAuthProvider {
     try {
       const res = await client.request<{ token: string }>({
         url,
-        method: 'POST',
+        method: "POST",
         data: {
           audience: this.targetAudience,
           includeEmail: true,
@@ -104,18 +104,11 @@ export class ServiceAccountImpersonationProvider implements McpAuthProvider {
       idToken = res.data.token;
 
       if (!idToken || idToken.length === 0) {
-        coreEvents.emitFeedback(
-          'error',
-          'Failed to obtain authentication token.',
-        );
+        coreEvents.emitFeedback("error", "Failed to obtain authentication token.");
         return undefined;
       }
     } catch (e) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to obtain authentication token.',
-        e as Error,
-      );
+      coreEvents.emitFeedback("error", "Failed to obtain authentication token.", e as Error);
       return undefined;
     }
 
@@ -126,7 +119,7 @@ export class ServiceAccountImpersonationProvider implements McpAuthProvider {
     // present an ID token.
     const newTokens: OAuthTokens = {
       access_token: idToken,
-      token_type: 'Bearer',
+      token_type: "Bearer",
     };
 
     if (expiryTime) {
@@ -151,6 +144,6 @@ export class ServiceAccountImpersonationProvider implements McpAuthProvider {
 
   codeVerifier(): string {
     // No-op
-    return '';
+    return "";
   }
 }
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.test.ts b/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.test.ts
index 7443ec3bd..ff8b4794d 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.test.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.test.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials, OAuthToken } from './types.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials, OAuthToken } from "./types.js";
 
 class TestTokenStorage extends BaseTokenStorage {
   private storage = new Map<string, OAuthCredentials>();
@@ -49,20 +49,20 @@ class TestTokenStorage extends BaseTokenStorage {
   }
 }
 
-describe('BaseTokenStorage', () => {
+describe("BaseTokenStorage", () => {
   let storage: TestTokenStorage;
 
   beforeEach(() => {
-    storage = new TestTokenStorage('gemini-cli-mcp-oauth');
+    storage = new TestTokenStorage("gemini-cli-mcp-oauth");
   });
 
-  describe('validateCredentials', () => {
-    it('should validate valid credentials', () => {
+  describe("validateCredentials", () => {
+    it("should validate valid credentials", () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -72,73 +72,69 @@ describe('BaseTokenStorage', () => {
 
     it.each([
       {
-        desc: 'missing server name',
+        desc: "missing server name",
         credentials: {
-          serverName: '',
+          serverName: "",
           token: {
-            accessToken: 'access-token',
-            tokenType: 'Bearer',
+            accessToken: "access-token",
+            tokenType: "Bearer",
           },
           updatedAt: Date.now(),
         },
-        expectedError: 'Server name is required',
+        expectedError: "Server name is required",
       },
       {
-        desc: 'missing token',
+        desc: "missing token",
         credentials: {
-          serverName: 'test-server',
+          serverName: "test-server",
           token: null as unknown as OAuthToken,
           updatedAt: Date.now(),
         },
-        expectedError: 'Token is required',
+        expectedError: "Token is required",
       },
       {
-        desc: 'missing access token',
+        desc: "missing access token",
         credentials: {
-          serverName: 'test-server',
+          serverName: "test-server",
           token: {
-            accessToken: '',
-            tokenType: 'Bearer',
+            accessToken: "",
+            tokenType: "Bearer",
           },
           updatedAt: Date.now(),
         },
-        expectedError: 'Access token is required',
+        expectedError: "Access token is required",
       },
       {
-        desc: 'missing token type',
+        desc: "missing token type",
         credentials: {
-          serverName: 'test-server',
+          serverName: "test-server",
           token: {
-            accessToken: 'access-token',
-            tokenType: '',
+            accessToken: "access-token",
+            tokenType: "",
           },
           updatedAt: Date.now(),
         },
-        expectedError: 'Token type is required',
+        expectedError: "Token type is required",
       },
-    ])('should throw for $desc', ({ credentials, expectedError }) => {
-      expect(() =>
-        storage.validateCredentials(credentials as OAuthCredentials),
-      ).toThrow(expectedError);
+    ])("should throw for $desc", ({ credentials, expectedError }) => {
+      expect(() => storage.validateCredentials(credentials as OAuthCredentials)).toThrow(
+        expectedError,
+      );
     });
   });
 
-  describe('isTokenExpired', () => {
+  describe("isTokenExpired", () => {
     it.each([
-      ['tokens without expiry', undefined, false],
-      ['valid tokens', Date.now() + 3600000, false],
-      ['expired tokens', Date.now() - 3600000, true],
-      [
-        'tokens within 5-minute buffer (4 minutes from now)',
-        Date.now() + 4 * 60 * 1000,
-        true,
-      ],
-    ])('should return %s for %s', (_, expiresAt, expected) => {
+      ["tokens without expiry", undefined, false],
+      ["valid tokens", Date.now() + 3600000, false],
+      ["expired tokens", Date.now() - 3600000, true],
+      ["tokens within 5-minute buffer (4 minutes from now)", Date.now() + 4 * 60 * 1000, true],
+    ])("should return %s for %s", (_, expiresAt, expected) => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
           ...(expiresAt !== undefined && { expiresAt }),
         },
         updatedAt: Date.now(),
@@ -148,24 +144,16 @@ describe('BaseTokenStorage', () => {
     });
   });
 
-  describe('sanitizeServerName', () => {
+  describe("sanitizeServerName", () => {
     it.each([
+      ["valid characters", "test-server.example_123", "test-server.example_123"],
       [
-        'valid characters',
-        'test-server.example_123',
-        'test-server.example_123',
-      ],
-      [
-        'invalid characters with underscore replacement',
-        'test@server#example',
-        'test_server_example',
-      ],
-      [
-        'special characters',
-        'test server/example:123',
-        'test_server_example_123',
+        "invalid characters with underscore replacement",
+        "test@server#example",
+        "test_server_example",
       ],
-    ])('should handle %s', (_, input, expected) => {
+      ["special characters", "test server/example:123", "test_server_example_123"],
+    ])("should handle %s", (_, input, expected) => {
       expect(storage.sanitizeServerName(input)).toBe(expected);
     });
   });
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.ts b/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.ts
index b36096fd8..410454b47 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/base-token-storage.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TokenStorage, OAuthCredentials } from './types.js';
+import type { OAuthCredentials, TokenStorage } from "./types.js";
 
 export abstract class BaseTokenStorage implements TokenStorage {
   protected readonly serviceName: string;
@@ -22,16 +22,16 @@ export abstract class BaseTokenStorage implements TokenStorage {
 
   protected validateCredentials(credentials: OAuthCredentials): void {
     if (!credentials.serverName) {
-      throw new Error('Server name is required');
+      throw new Error("Server name is required");
     }
     if (!credentials.token) {
-      throw new Error('Token is required');
+      throw new Error("Token is required");
     }
     if (!credentials.token.accessToken) {
-      throw new Error('Access token is required');
+      throw new Error("Access token is required");
     }
     if (!credentials.token.tokenType) {
-      throw new Error('Token type is required');
+      throw new Error("Token type is required");
     }
   }
 
@@ -44,6 +44,6 @@ export abstract class BaseTokenStorage implements TokenStorage {
   }
 
   protected sanitizeServerName(serverName: string): string {
-    return serverName.replace(/[^a-zA-Z0-9-_.]/g, '_');
+    return serverName.replace(/[^a-zA-Z0-9-_.]/g, "_");
   }
 }
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.test.ts b/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.test.ts
index 48050f37e..3d12b0005 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.test.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import { FileTokenStorage } from './file-token-storage.js';
-import type { OAuthCredentials } from './types.js';
-import { GEMINI_DIR } from '../../utils/paths.js';
-
-vi.mock('node:fs', () => ({
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GEMINI_DIR } from "../../utils/paths.js";
+import { FileTokenStorage } from "./file-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
+
+vi.mock("node:fs", () => ({
   promises: {
     readFile: vi.fn(),
     writeFile: vi.fn(),
@@ -20,18 +20,18 @@ vi.mock('node:fs', () => ({
   },
 }));
 
-vi.mock('node:os', () => ({
+vi.mock("node:os", () => ({
   default: {
-    homedir: vi.fn(() => '/home/test'),
-    hostname: vi.fn(() => 'test-host'),
-    userInfo: vi.fn(() => ({ username: 'test-user' })),
+    homedir: vi.fn(() => "/home/test"),
+    hostname: vi.fn(() => "test-host"),
+    userInfo: vi.fn(() => ({ username: "test-user" })),
   },
-  homedir: vi.fn(() => '/home/test'),
-  hostname: vi.fn(() => 'test-host'),
-  userInfo: vi.fn(() => ({ username: 'test-user' })),
+  homedir: vi.fn(() => "/home/test"),
+  hostname: vi.fn(() => "test-host"),
+  userInfo: vi.fn(() => ({ username: "test-user" })),
 }));
 
-describe('FileTokenStorage', () => {
+describe("FileTokenStorage", () => {
   let storage: FileTokenStorage;
   const mockFs = fs as unknown as {
     readFile: ReturnType<typeof vi.fn>;
@@ -40,104 +40,98 @@ describe('FileTokenStorage', () => {
     mkdir: ReturnType<typeof vi.fn>;
   };
   const existingCredentials: OAuthCredentials = {
-    serverName: 'existing-server',
+    serverName: "existing-server",
     token: {
-      accessToken: 'existing-token',
-      tokenType: 'Bearer',
+      accessToken: "existing-token",
+      tokenType: "Bearer",
     },
     updatedAt: Date.now() - 10000,
   };
 
   beforeEach(() => {
     vi.clearAllMocks();
-    storage = new FileTokenStorage('test-storage');
+    storage = new FileTokenStorage("test-storage");
   });
 
   afterEach(() => {
     vi.clearAllMocks();
   });
 
-  describe('getCredentials', () => {
-    it('should return null when file does not exist', async () => {
-      mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+  describe("getCredentials", () => {
+    it("should return null when file does not exist", async () => {
+      mockFs.readFile.mockRejectedValue({ code: "ENOENT" });
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
       expect(result).toBeNull();
     });
 
-    it('should return null for expired tokens', async () => {
+    it("should return null for expired tokens", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
           expiresAt: Date.now() - 3600000,
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'test-server': credentials }),
-      );
+      const encryptedData = storage["encrypt"](JSON.stringify({ "test-server": credentials }));
       mockFs.readFile.mockResolvedValue(encryptedData);
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
       expect(result).toBeNull();
     });
 
-    it('should return credentials for valid tokens', async () => {
+    it("should return credentials for valid tokens", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
           expiresAt: Date.now() + 3600000,
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'test-server': credentials }),
-      );
+      const encryptedData = storage["encrypt"](JSON.stringify({ "test-server": credentials }));
       mockFs.readFile.mockResolvedValue(encryptedData);
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
       expect(result).toEqual(credentials);
     });
 
-    it('should throw error for corrupted files', async () => {
-      mockFs.readFile.mockResolvedValue('corrupted-data');
+    it("should throw error for corrupted files", async () => {
+      mockFs.readFile.mockResolvedValue("corrupted-data");
 
-      await expect(storage.getCredentials('test-server')).rejects.toThrow(
-        'Token file corrupted',
-      );
+      await expect(storage.getCredentials("test-server")).rejects.toThrow("Token file corrupted");
     });
   });
 
-  describe('setCredentials', () => {
-    it('should save credentials with encryption', async () => {
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'existing-server': existingCredentials }),
+  describe("setCredentials", () => {
+    it("should save credentials with encryption", async () => {
+      const encryptedData = storage["encrypt"](
+        JSON.stringify({ "existing-server": existingCredentials }),
       );
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.mkdir.mockResolvedValue(undefined);
       mockFs.writeFile.mockResolvedValue(undefined);
 
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
       await storage.setCredentials(credentials);
 
-      expect(mockFs.mkdir).toHaveBeenCalledWith(
-        path.join('/home/test', GEMINI_DIR),
-        { recursive: true, mode: 0o700 },
-      );
+      expect(mockFs.mkdir).toHaveBeenCalledWith(path.join("/home/test", GEMINI_DIR), {
+        recursive: true,
+        mode: 0o700,
+      });
       expect(mockFs.writeFile).toHaveBeenCalled();
 
       const writeCall = mockFs.writeFile.mock.calls[0];
@@ -145,18 +139,18 @@ describe('FileTokenStorage', () => {
       expect(writeCall[2]).toEqual({ mode: 0o600 });
     });
 
-    it('should update existing credentials', async () => {
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'existing-server': existingCredentials }),
+    it("should update existing credentials", async () => {
+      const encryptedData = storage["encrypt"](
+        JSON.stringify({ "existing-server": existingCredentials }),
       );
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.writeFile.mockResolvedValue(undefined);
 
       const newCredentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'new-token',
-          tokenType: 'Bearer',
+          accessToken: "new-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -165,158 +159,154 @@ describe('FileTokenStorage', () => {
 
       expect(mockFs.writeFile).toHaveBeenCalled();
       const writeCall = mockFs.writeFile.mock.calls[0];
-      const decrypted = storage['decrypt'](writeCall[1]);
+      const decrypted = storage["decrypt"](writeCall[1]);
       const saved = JSON.parse(decrypted);
 
-      expect(saved['existing-server']).toEqual(existingCredentials);
-      expect(saved['test-server'].token.accessToken).toBe('new-token');
+      expect(saved["existing-server"]).toEqual(existingCredentials);
+      expect(saved["test-server"].token.accessToken).toBe("new-token");
     });
   });
 
-  describe('deleteCredentials', () => {
-    it('should throw when credentials do not exist', async () => {
-      mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+  describe("deleteCredentials", () => {
+    it("should throw when credentials do not exist", async () => {
+      mockFs.readFile.mockRejectedValue({ code: "ENOENT" });
 
-      await expect(storage.deleteCredentials('test-server')).rejects.toThrow(
-        'No credentials found for test-server',
+      await expect(storage.deleteCredentials("test-server")).rejects.toThrow(
+        "No credentials found for test-server",
       );
     });
 
-    it('should delete file when last credential is removed', async () => {
+    it("should delete file when last credential is removed", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'test-server': credentials }),
-      );
+      const encryptedData = storage["encrypt"](JSON.stringify({ "test-server": credentials }));
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.unlink.mockResolvedValue(undefined);
 
-      await storage.deleteCredentials('test-server');
+      await storage.deleteCredentials("test-server");
 
       expect(mockFs.unlink).toHaveBeenCalledWith(
-        path.join('/home/test', GEMINI_DIR, 'mcp-oauth-tokens-v2.json'),
+        path.join("/home/test", GEMINI_DIR, "mcp-oauth-tokens-v2.json"),
       );
     });
 
-    it('should update file when other credentials remain', async () => {
+    it("should update file when other credentials remain", async () => {
       const credentials1: OAuthCredentials = {
-        serverName: 'server1',
+        serverName: "server1",
         token: {
-          accessToken: 'token1',
-          tokenType: 'Bearer',
+          accessToken: "token1",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
       const credentials2: OAuthCredentials = {
-        serverName: 'server2',
+        serverName: "server2",
         token: {
-          accessToken: 'token2',
-          tokenType: 'Bearer',
+          accessToken: "token2",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
+      const encryptedData = storage["encrypt"](
         JSON.stringify({ server1: credentials1, server2: credentials2 }),
       );
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.writeFile.mockResolvedValue(undefined);
 
-      await storage.deleteCredentials('server1');
+      await storage.deleteCredentials("server1");
 
       expect(mockFs.writeFile).toHaveBeenCalled();
       expect(mockFs.unlink).not.toHaveBeenCalled();
 
       const writeCall = mockFs.writeFile.mock.calls[0];
-      const decrypted = storage['decrypt'](writeCall[1]);
+      const decrypted = storage["decrypt"](writeCall[1]);
       const saved = JSON.parse(decrypted);
 
-      expect(saved['server1']).toBeUndefined();
-      expect(saved['server2']).toEqual(credentials2);
+      expect(saved["server1"]).toBeUndefined();
+      expect(saved["server2"]).toEqual(credentials2);
     });
   });
 
-  describe('listServers', () => {
-    it('should return empty list when file does not exist', async () => {
-      mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+  describe("listServers", () => {
+    it("should return empty list when file does not exist", async () => {
+      mockFs.readFile.mockRejectedValue({ code: "ENOENT" });
 
       const result = await storage.listServers();
       expect(result).toEqual([]);
     });
 
-    it('should return list of server names', async () => {
+    it("should return list of server names", async () => {
       const credentials: Record<string, OAuthCredentials> = {
         server1: {
-          serverName: 'server1',
-          token: { accessToken: 'token1', tokenType: 'Bearer' },
+          serverName: "server1",
+          token: { accessToken: "token1", tokenType: "Bearer" },
           updatedAt: Date.now(),
         },
         server2: {
-          serverName: 'server2',
-          token: { accessToken: 'token2', tokenType: 'Bearer' },
+          serverName: "server2",
+          token: { accessToken: "token2", tokenType: "Bearer" },
           updatedAt: Date.now(),
         },
       };
 
-      const encryptedData = storage['encrypt'](JSON.stringify(credentials));
+      const encryptedData = storage["encrypt"](JSON.stringify(credentials));
       mockFs.readFile.mockResolvedValue(encryptedData);
 
       const result = await storage.listServers();
-      expect(result).toEqual(['server1', 'server2']);
+      expect(result).toEqual(["server1", "server2"]);
     });
   });
 
-  describe('clearAll', () => {
-    it('should delete the token file', async () => {
+  describe("clearAll", () => {
+    it("should delete the token file", async () => {
       mockFs.unlink.mockResolvedValue(undefined);
 
       await storage.clearAll();
 
       expect(mockFs.unlink).toHaveBeenCalledWith(
-        path.join('/home/test', GEMINI_DIR, 'mcp-oauth-tokens-v2.json'),
+        path.join("/home/test", GEMINI_DIR, "mcp-oauth-tokens-v2.json"),
       );
     });
 
-    it('should not throw when file does not exist', async () => {
-      mockFs.unlink.mockRejectedValue({ code: 'ENOENT' });
+    it("should not throw when file does not exist", async () => {
+      mockFs.unlink.mockRejectedValue({ code: "ENOENT" });
 
       await expect(storage.clearAll()).resolves.not.toThrow();
     });
   });
 
-  describe('encryption', () => {
-    it('should encrypt and decrypt data correctly', () => {
-      const original = 'test-data-123';
-      const encrypted = storage['encrypt'](original);
-      const decrypted = storage['decrypt'](encrypted);
+  describe("encryption", () => {
+    it("should encrypt and decrypt data correctly", () => {
+      const original = "test-data-123";
+      const encrypted = storage["encrypt"](original);
+      const decrypted = storage["decrypt"](encrypted);
 
       expect(decrypted).toBe(original);
       expect(encrypted).not.toBe(original);
       expect(encrypted).toMatch(/^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+$/);
     });
 
-    it('should produce different encrypted output each time', () => {
-      const original = 'test-data';
-      const encrypted1 = storage['encrypt'](original);
-      const encrypted2 = storage['encrypt'](original);
+    it("should produce different encrypted output each time", () => {
+      const original = "test-data";
+      const encrypted1 = storage["encrypt"](original);
+      const encrypted2 = storage["encrypt"](original);
 
       expect(encrypted1).not.toBe(encrypted2);
-      expect(storage['decrypt'](encrypted1)).toBe(original);
-      expect(storage['decrypt'](encrypted2)).toBe(original);
+      expect(storage["decrypt"](encrypted1)).toBe(original);
+      expect(storage["decrypt"](encrypted2)).toBe(original);
     });
 
-    it('should throw on invalid encrypted data format', () => {
-      expect(() => storage['decrypt']('invalid-data')).toThrow(
-        'Invalid encrypted data format',
-      );
+    it("should throw on invalid encrypted data format", () => {
+      expect(() => storage["decrypt"]("invalid-data")).toThrow("Invalid encrypted data format");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.ts b/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.ts
index a9e17b60d..3569af6ae 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/file-token-storage.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import * as crypto from 'node:crypto';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials } from './types.js';
-import { GEMINI_DIR } from '../../utils/paths.js';
+import * as crypto from "node:crypto";
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { GEMINI_DIR } from "../../utils/paths.js";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
 
 export class FileTokenStorage extends BaseTokenStorage {
   private readonly tokenFilePath: string;
@@ -19,46 +19,42 @@ export class FileTokenStorage extends BaseTokenStorage {
   constructor(serviceName: string) {
     super(serviceName);
     const configDir = path.join(os.homedir(), GEMINI_DIR);
-    this.tokenFilePath = path.join(configDir, 'mcp-oauth-tokens-v2.json');
+    this.tokenFilePath = path.join(configDir, "mcp-oauth-tokens-v2.json");
     this.encryptionKey = this.deriveEncryptionKey();
   }
 
   private deriveEncryptionKey(): Buffer {
     const salt = `${os.hostname()}-${os.userInfo().username}-gemini-cli`;
-    return crypto.scryptSync('gemini-cli-oauth', salt, 32);
+    return crypto.scryptSync("gemini-cli-oauth", salt, 32);
   }
 
   private encrypt(text: string): string {
     const iv = crypto.randomBytes(16);
-    const cipher = crypto.createCipheriv('aes-256-gcm', this.encryptionKey, iv);
+    const cipher = crypto.createCipheriv("aes-256-gcm", this.encryptionKey, iv);
 
-    let encrypted = cipher.update(text, 'utf8', 'hex');
-    encrypted += cipher.final('hex');
+    let encrypted = cipher.update(text, "utf8", "hex");
+    encrypted += cipher.final("hex");
 
     const authTag = cipher.getAuthTag();
 
-    return iv.toString('hex') + ':' + authTag.toString('hex') + ':' + encrypted;
+    return iv.toString("hex") + ":" + authTag.toString("hex") + ":" + encrypted;
   }
 
   private decrypt(encryptedData: string): string {
-    const parts = encryptedData.split(':');
+    const parts = encryptedData.split(":");
     if (parts.length !== 3) {
-      throw new Error('Invalid encrypted data format');
+      throw new Error("Invalid encrypted data format");
     }
 
-    const iv = Buffer.from(parts[0], 'hex');
-    const authTag = Buffer.from(parts[1], 'hex');
+    const iv = Buffer.from(parts[0], "hex");
+    const authTag = Buffer.from(parts[1], "hex");
     const encrypted = parts[2];
 
-    const decipher = crypto.createDecipheriv(
-      'aes-256-gcm',
-      this.encryptionKey,
-      iv,
-    );
+    const decipher = crypto.createDecipheriv("aes-256-gcm", this.encryptionKey, iv);
     decipher.setAuthTag(authTag);
 
-    let decrypted = decipher.update(encrypted, 'hex', 'utf8');
-    decrypted += decipher.final('utf8');
+    let decrypted = decipher.update(encrypted, "hex", "utf8");
+    decrypted += decipher.final("utf8");
 
     return decrypted;
   }
@@ -70,30 +66,26 @@ export class FileTokenStorage extends BaseTokenStorage {
 
   private async loadTokens(): Promise<Map<string, OAuthCredentials>> {
     try {
-      const data = await fs.readFile(this.tokenFilePath, 'utf-8');
+      const data = await fs.readFile(this.tokenFilePath, "utf-8");
       const decrypted = this.decrypt(data);
       const tokens = JSON.parse(decrypted) as Record<string, OAuthCredentials>;
       return new Map(Object.entries(tokens));
     } catch (error: unknown) {
       const err = error as NodeJS.ErrnoException & { message?: string };
-      if (err.code === 'ENOENT') {
+      if (err.code === "ENOENT") {
         return new Map();
       }
       if (
-        err.message?.includes('Invalid encrypted data format') ||
-        err.message?.includes(
-          'Unsupported state or unable to authenticate data',
-        )
+        err.message?.includes("Invalid encrypted data format") ||
+        err.message?.includes("Unsupported state or unable to authenticate data")
       ) {
-        throw new Error('Token file corrupted');
+        throw new Error("Token file corrupted");
       }
       throw error;
     }
   }
 
-  private async saveTokens(
-    tokens: Map<string, OAuthCredentials>,
-  ): Promise<void> {
+  private async saveTokens(tokens: Map<string, OAuthCredentials>): Promise<void> {
     await this.ensureDirectoryExists();
 
     const data = Object.fromEntries(tokens);
@@ -145,7 +137,7 @@ export class FileTokenStorage extends BaseTokenStorage {
         await fs.unlink(this.tokenFilePath);
       } catch (error: unknown) {
         const err = error as NodeJS.ErrnoException;
-        if (err.code !== 'ENOENT') {
+        if (err.code !== "ENOENT") {
           throw error;
         }
       }
@@ -177,7 +169,7 @@ export class FileTokenStorage extends BaseTokenStorage {
       await fs.unlink(this.tokenFilePath);
     } catch (error: unknown) {
       const err = error as NodeJS.ErrnoException;
-      if (err.code !== 'ENOENT') {
+      if (err.code !== "ENOENT") {
         throw error;
       }
     }
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.test.ts b/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.test.ts
index 5303d8477..857690aee 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.test.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { HybridTokenStorage } from './hybrid-token-storage.js';
-import { KeychainTokenStorage } from './keychain-token-storage.js';
-import { FileTokenStorage } from './file-token-storage.js';
-import { type OAuthCredentials, TokenStorageType } from './types.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { FileTokenStorage } from "./file-token-storage.js";
+import { HybridTokenStorage } from "./hybrid-token-storage.js";
+import { KeychainTokenStorage } from "./keychain-token-storage.js";
+import { type OAuthCredentials, TokenStorageType } from "./types.js";
 
-vi.mock('./keychain-token-storage.js', () => ({
+vi.mock("./keychain-token-storage.js", () => ({
   KeychainTokenStorage: vi.fn().mockImplementation(() => ({
     isAvailable: vi.fn(),
     getCredentials: vi.fn(),
@@ -22,7 +22,7 @@ vi.mock('./keychain-token-storage.js', () => ({
   })),
 }));
 
-vi.mock('./file-token-storage.js', () => ({
+vi.mock("./file-token-storage.js", () => ({
   FileTokenStorage: vi.fn().mockImplementation(() => ({
     getCredentials: vi.fn(),
     setCredentials: vi.fn(),
@@ -43,7 +43,7 @@ interface MockStorage {
   clearAll: ReturnType<typeof vi.fn>;
 }
 
-describe('HybridTokenStorage', () => {
+describe("HybridTokenStorage", () => {
   let storage: HybridTokenStorage;
   let mockKeychainStorage: MockStorage;
   let mockFileStorage: MockStorage;
@@ -73,99 +73,83 @@ describe('HybridTokenStorage', () => {
       clearAll: vi.fn(),
     };
 
-    (
-      KeychainTokenStorage as unknown as ReturnType<typeof vi.fn>
-    ).mockImplementation(() => mockKeychainStorage);
-    (
-      FileTokenStorage as unknown as ReturnType<typeof vi.fn>
-    ).mockImplementation(() => mockFileStorage);
+    (KeychainTokenStorage as unknown as ReturnType<typeof vi.fn>).mockImplementation(
+      () => mockKeychainStorage,
+    );
+    (FileTokenStorage as unknown as ReturnType<typeof vi.fn>).mockImplementation(
+      () => mockFileStorage,
+    );
 
-    storage = new HybridTokenStorage('test-service');
+    storage = new HybridTokenStorage("test-service");
   });
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  describe('storage selection', () => {
-    it('should use keychain when available', async () => {
+  describe("storage selection", () => {
+    it("should use keychain when available", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
-      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith("test-server");
       expect(await storage.getStorageType()).toBe(TokenStorageType.KEYCHAIN);
     });
 
-    it('should use file storage when GEMINI_FORCE_FILE_STORAGE is set', async () => {
-      process.env['GEMINI_FORCE_FILE_STORAGE'] = 'true';
+    it("should use file storage when GEMINI_FORCE_FILE_STORAGE is set", async () => {
+      process.env["GEMINI_FORCE_FILE_STORAGE"] = "true";
       mockFileStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).not.toHaveBeenCalled();
-      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
-      expect(await storage.getStorageType()).toBe(
-        TokenStorageType.ENCRYPTED_FILE,
-      );
+      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith("test-server");
+      expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
     });
 
-    it('should fall back to file storage when keychain is unavailable', async () => {
+    it("should fall back to file storage when keychain is unavailable", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(false);
       mockFileStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
-      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
-      expect(await storage.getStorageType()).toBe(
-        TokenStorageType.ENCRYPTED_FILE,
-      );
+      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith("test-server");
+      expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
     });
 
-    it('should fall back to file storage when keychain throws error', async () => {
-      mockKeychainStorage.isAvailable!.mockRejectedValue(
-        new Error('Keychain error'),
-      );
+    it("should fall back to file storage when keychain throws error", async () => {
+      mockKeychainStorage.isAvailable!.mockRejectedValue(new Error("Keychain error"));
       mockFileStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
-      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
-      expect(await storage.getStorageType()).toBe(
-        TokenStorageType.ENCRYPTED_FILE,
-      );
+      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith("test-server");
+      expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
     });
 
-    it('should cache storage selection', async () => {
+    it("should cache storage selection", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
-      await storage.getCredentials('another-server');
+      await storage.getCredentials("test-server");
+      await storage.getCredentials("another-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalledTimes(1);
     });
   });
 
-  describe('getCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("getCredentials", () => {
+    it("should delegate to selected storage", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -173,22 +157,20 @@ describe('HybridTokenStorage', () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.getCredentials.mockResolvedValue(credentials);
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
 
       expect(result).toEqual(credentials);
-      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith("test-server");
     });
   });
 
-  describe('setCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("setCredentials", () => {
+    it("should delegate to selected storage", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -198,28 +180,24 @@ describe('HybridTokenStorage', () => {
 
       await storage.setCredentials(credentials);
 
-      expect(mockKeychainStorage.setCredentials).toHaveBeenCalledWith(
-        credentials,
-      );
+      expect(mockKeychainStorage.setCredentials).toHaveBeenCalledWith(credentials);
     });
   });
 
-  describe('deleteCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("deleteCredentials", () => {
+    it("should delegate to selected storage", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.deleteCredentials.mockResolvedValue(undefined);
 
-      await storage.deleteCredentials('test-server');
+      await storage.deleteCredentials("test-server");
 
-      expect(mockKeychainStorage.deleteCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(mockKeychainStorage.deleteCredentials).toHaveBeenCalledWith("test-server");
     });
   });
 
-  describe('listServers', () => {
-    it('should delegate to selected storage', async () => {
-      const servers = ['server1', 'server2'];
+  describe("listServers", () => {
+    it("should delegate to selected storage", async () => {
+      const servers = ["server1", "server2"];
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.listServers.mockResolvedValue(servers);
 
@@ -230,22 +208,22 @@ describe('HybridTokenStorage', () => {
     });
   });
 
-  describe('getAllCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("getAllCredentials", () => {
+    it("should delegate to selected storage", async () => {
       const credentialsMap = new Map([
         [
-          'server1',
+          "server1",
           {
-            serverName: 'server1',
-            token: { accessToken: 'token1', tokenType: 'Bearer' },
+            serverName: "server1",
+            token: { accessToken: "token1", tokenType: "Bearer" },
             updatedAt: Date.now(),
           },
         ],
         [
-          'server2',
+          "server2",
           {
-            serverName: 'server2',
-            token: { accessToken: 'token2', tokenType: 'Bearer' },
+            serverName: "server2",
+            token: { accessToken: "token2", tokenType: "Bearer" },
             updatedAt: Date.now(),
           },
         ],
@@ -261,8 +239,8 @@ describe('HybridTokenStorage', () => {
     });
   });
 
-  describe('clearAll', () => {
-    it('should delegate to selected storage', async () => {
+  describe("clearAll", () => {
+    it("should delegate to selected storage", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.clearAll.mockResolvedValue(undefined);
 
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.ts b/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.ts
index d5e798cab..717ce5175 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/hybrid-token-storage.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseTokenStorage } from './base-token-storage.js';
-import { FileTokenStorage } from './file-token-storage.js';
-import type { TokenStorage, OAuthCredentials } from './types.js';
-import { TokenStorageType } from './types.js';
+import { BaseTokenStorage } from "./base-token-storage.js";
+import { FileTokenStorage } from "./file-token-storage.js";
+import type { OAuthCredentials, TokenStorage } from "./types.js";
+import { TokenStorageType } from "./types.js";
 
-const FORCE_FILE_STORAGE_ENV_VAR = 'GEMINI_FORCE_FILE_STORAGE';
+const FORCE_FILE_STORAGE_ENV_VAR = "GEMINI_FORCE_FILE_STORAGE";
 
 export class HybridTokenStorage extends BaseTokenStorage {
   private storage: TokenStorage | null = null;
@@ -21,13 +21,11 @@ export class HybridTokenStorage extends BaseTokenStorage {
   }
 
   private async initializeStorage(): Promise<TokenStorage> {
-    const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === 'true';
+    const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
 
     if (!forceFileStorage) {
       try {
-        const { KeychainTokenStorage } = await import(
-          './keychain-token-storage.js'
-        );
+        const { KeychainTokenStorage } = await import("./keychain-token-storage.js");
         const keychainStorage = new KeychainTokenStorage(this.serviceName);
 
         const isAvailable = await keychainStorage.isAvailable();
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/index.ts b/packages/gemini-cli-core/src/mcp/token-storage/index.ts
index 0b48a933a..ec4b4359e 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/index.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/index.ts
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './types.js';
-export * from './base-token-storage.js';
-export * from './file-token-storage.js';
-export * from './hybrid-token-storage.js';
+export * from "./base-token-storage.js";
+export * from "./file-token-storage.js";
+export * from "./hybrid-token-storage.js";
+export * from "./types.js";
 
-export const DEFAULT_SERVICE_NAME = 'gemini-cli-oauth';
-export const FORCE_ENCRYPTED_FILE_ENV_VAR =
-  'GEMINI_FORCE_ENCRYPTED_FILE_STORAGE';
+export const DEFAULT_SERVICE_NAME = "gemini-cli-oauth";
+export const FORCE_ENCRYPTED_FILE_ENV_VAR = "GEMINI_FORCE_ENCRYPTED_FILE_STORAGE";
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.test.ts b/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.test.ts
index 632387e23..f7147e94a 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.test.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { KeychainTokenStorage } from './keychain-token-storage.js';
-import type { OAuthCredentials } from './types.js';
-import { coreEvents } from '../../utils/events.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { coreEvents } from "../../utils/events.js";
+import type { KeychainTokenStorage } from "./keychain-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
 
 // Hoist the mock to be available in the vi.mock factory
 const mockKeytar = vi.hoisted(() => ({
@@ -17,36 +17,34 @@ const mockKeytar = vi.hoisted(() => ({
   findCredentials: vi.fn(),
 }));
 
-const mockServiceName = 'service-name';
-const mockCryptoRandomBytesString = 'random-string';
+const mockServiceName = "service-name";
+const mockCryptoRandomBytesString = "random-string";
 
 // Mock the dynamic import of 'keytar'
-vi.mock('keytar', () => ({
+vi.mock("keytar", () => ({
   default: mockKeytar,
 }));
 
-vi.mock('node:crypto', () => ({
+vi.mock("node:crypto", () => ({
   randomBytes: vi.fn(() => ({
     toString: vi.fn(() => mockCryptoRandomBytesString),
   })),
 }));
 
-vi.mock('../../utils/events.js', () => ({
+vi.mock("../../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
 }));
 
-describe('KeychainTokenStorage', () => {
+describe("KeychainTokenStorage", () => {
   let storage: KeychainTokenStorage;
 
   beforeEach(async () => {
     vi.resetAllMocks();
     // Reset the internal state of the keychain-token-storage module
     vi.resetModules();
-    const { KeychainTokenStorage } = await import(
-      './keychain-token-storage.js'
-    );
+    const { KeychainTokenStorage } = await import("./keychain-token-storage.js");
     storage = new KeychainTokenStorage(mockServiceName);
   });
 
@@ -56,19 +54,19 @@ describe('KeychainTokenStorage', () => {
   });
 
   const validCredentials = {
-    serverName: 'test-server',
+    serverName: "test-server",
     token: {
-      accessToken: 'access-token',
-      tokenType: 'Bearer',
+      accessToken: "access-token",
+      tokenType: "Bearer",
       expiresAt: Date.now() + 3600000,
     },
     updatedAt: Date.now(),
   } as OAuthCredentials;
 
-  describe('checkKeychainAvailability', () => {
-    it('should return true if keytar is available and functional', async () => {
+  describe("checkKeychainAvailability", () => {
+    it("should return true if keytar is available and functional", async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('test');
+      mockKeytar.getPassword.mockResolvedValue("test");
       mockKeytar.deletePassword.mockResolvedValue(true);
 
       const isAvailable = await storage.checkKeychainAvailability();
@@ -76,7 +74,7 @@ describe('KeychainTokenStorage', () => {
       expect(mockKeytar.setPassword).toHaveBeenCalledWith(
         mockServiceName,
         `__keychain_test__${mockCryptoRandomBytesString}`,
-        'test',
+        "test",
       );
       expect(mockKeytar.getPassword).toHaveBeenCalledWith(
         mockServiceName,
@@ -88,24 +86,24 @@ describe('KeychainTokenStorage', () => {
       );
     });
 
-    it('should return false if keytar fails to set password', async () => {
-      const error = new Error('write error');
+    it("should return false if keytar fails to set password", async () => {
+      const error = new Error("write error");
       mockKeytar.setPassword.mockRejectedValue(error);
       const isAvailable = await storage.checkKeychainAvailability();
       expect(isAvailable).toBe(false);
     });
 
-    it('should return false if retrieved password does not match', async () => {
+    it("should return false if retrieved password does not match", async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('wrong-password');
+      mockKeytar.getPassword.mockResolvedValue("wrong-password");
       mockKeytar.deletePassword.mockResolvedValue(true);
       const isAvailable = await storage.checkKeychainAvailability();
       expect(isAvailable).toBe(false);
     });
 
-    it('should cache the availability result', async () => {
+    it("should cache the availability result", async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('test');
+      mockKeytar.getPassword.mockResolvedValue("test");
       mockKeytar.deletePassword.mockResolvedValue(true);
 
       await storage.checkKeychainAvailability();
@@ -115,324 +113,300 @@ describe('KeychainTokenStorage', () => {
     });
   });
 
-  describe('with keychain unavailable', () => {
+  describe("with keychain unavailable", () => {
     beforeEach(async () => {
       // Force keychain to be unavailable
-      mockKeytar.setPassword.mockRejectedValue(new Error('keychain error'));
+      mockKeytar.setPassword.mockRejectedValue(new Error("keychain error"));
       await storage.checkKeychainAvailability();
     });
 
-    it('getCredentials should throw', async () => {
-      await expect(storage.getCredentials('server')).rejects.toThrow(
-        'Keychain is not available',
-      );
+    it("getCredentials should throw", async () => {
+      await expect(storage.getCredentials("server")).rejects.toThrow("Keychain is not available");
     });
 
-    it('setCredentials should throw', async () => {
+    it("setCredentials should throw", async () => {
       await expect(storage.setCredentials(validCredentials)).rejects.toThrow(
-        'Keychain is not available',
+        "Keychain is not available",
       );
     });
 
-    it('deleteCredentials should throw', async () => {
-      await expect(storage.deleteCredentials('server')).rejects.toThrow(
-        'Keychain is not available',
+    it("deleteCredentials should throw", async () => {
+      await expect(storage.deleteCredentials("server")).rejects.toThrow(
+        "Keychain is not available",
       );
     });
 
-    it('listServers should throw', async () => {
-      await expect(storage.listServers()).rejects.toThrow(
-        'Keychain is not available',
-      );
+    it("listServers should throw", async () => {
+      await expect(storage.listServers()).rejects.toThrow("Keychain is not available");
     });
 
-    it('getAllCredentials should throw', async () => {
-      await expect(storage.getAllCredentials()).rejects.toThrow(
-        'Keychain is not available',
-      );
+    it("getAllCredentials should throw", async () => {
+      await expect(storage.getAllCredentials()).rejects.toThrow("Keychain is not available");
     });
   });
 
-  describe('with keychain available', () => {
+  describe("with keychain available", () => {
     beforeEach(async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('test');
+      mockKeytar.getPassword.mockResolvedValue("test");
       mockKeytar.deletePassword.mockResolvedValue(true);
       await storage.checkKeychainAvailability();
       // Reset mocks after availability check
       vi.resetAllMocks();
     });
 
-    describe('getCredentials', () => {
-      it('should return null if no credentials are found', async () => {
+    describe("getCredentials", () => {
+      it("should return null if no credentials are found", async () => {
         mockKeytar.getPassword.mockResolvedValue(null);
-        const result = await storage.getCredentials('test-server');
+        const result = await storage.getCredentials("test-server");
         expect(result).toBeNull();
-        expect(mockKeytar.getPassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'test-server',
-        );
+        expect(mockKeytar.getPassword).toHaveBeenCalledWith(mockServiceName, "test-server");
       });
 
-      it('should return credentials if found and not expired', async () => {
-        mockKeytar.getPassword.mockResolvedValue(
-          JSON.stringify(validCredentials),
-        );
-        const result = await storage.getCredentials('test-server');
+      it("should return credentials if found and not expired", async () => {
+        mockKeytar.getPassword.mockResolvedValue(JSON.stringify(validCredentials));
+        const result = await storage.getCredentials("test-server");
         expect(result).toEqual(validCredentials);
       });
 
-      it('should return null if credentials have expired', async () => {
+      it("should return null if credentials have expired", async () => {
         const expiredCreds = {
           ...validCredentials,
           token: { ...validCredentials.token, expiresAt: Date.now() - 1000 },
         };
         mockKeytar.getPassword.mockResolvedValue(JSON.stringify(expiredCreds));
-        const result = await storage.getCredentials('test-server');
+        const result = await storage.getCredentials("test-server");
         expect(result).toBeNull();
       });
 
-      it('should throw if stored data is corrupted JSON', async () => {
-        mockKeytar.getPassword.mockResolvedValue('not-json');
-        await expect(storage.getCredentials('test-server')).rejects.toThrow(
-          'Failed to parse stored credentials for test-server',
+      it("should throw if stored data is corrupted JSON", async () => {
+        mockKeytar.getPassword.mockResolvedValue("not-json");
+        await expect(storage.getCredentials("test-server")).rejects.toThrow(
+          "Failed to parse stored credentials for test-server",
         );
       });
     });
 
-    describe('setCredentials', () => {
-      it('should save credentials to keychain', async () => {
+    describe("setCredentials", () => {
+      it("should save credentials to keychain", async () => {
         vi.useFakeTimers();
         mockKeytar.setPassword.mockResolvedValue(undefined);
         await storage.setCredentials(validCredentials);
         expect(mockKeytar.setPassword).toHaveBeenCalledWith(
           mockServiceName,
-          'test-server',
+          "test-server",
           JSON.stringify({ ...validCredentials, updatedAt: Date.now() }),
         );
       });
 
-      it('should throw if saving to keychain fails', async () => {
-        mockKeytar.setPassword.mockRejectedValue(
-          new Error('keychain write error'),
-        );
+      it("should throw if saving to keychain fails", async () => {
+        mockKeytar.setPassword.mockRejectedValue(new Error("keychain write error"));
         await expect(storage.setCredentials(validCredentials)).rejects.toThrow(
-          'keychain write error',
+          "keychain write error",
         );
       });
     });
 
-    describe('deleteCredentials', () => {
-      it('should delete credentials from keychain', async () => {
+    describe("deleteCredentials", () => {
+      it("should delete credentials from keychain", async () => {
         mockKeytar.deletePassword.mockResolvedValue(true);
-        await storage.deleteCredentials('test-server');
-        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'test-server',
-        );
+        await storage.deleteCredentials("test-server");
+        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, "test-server");
       });
 
-      it('should throw if no credentials were found to delete', async () => {
+      it("should throw if no credentials were found to delete", async () => {
         mockKeytar.deletePassword.mockResolvedValue(false);
-        await expect(storage.deleteCredentials('test-server')).rejects.toThrow(
-          'No credentials found for test-server',
+        await expect(storage.deleteCredentials("test-server")).rejects.toThrow(
+          "No credentials found for test-server",
         );
       });
 
-      it('should throw if deleting from keychain fails', async () => {
-        mockKeytar.deletePassword.mockRejectedValue(
-          new Error('keychain delete error'),
-        );
-        await expect(storage.deleteCredentials('test-server')).rejects.toThrow(
-          'keychain delete error',
+      it("should throw if deleting from keychain fails", async () => {
+        mockKeytar.deletePassword.mockRejectedValue(new Error("keychain delete error"));
+        await expect(storage.deleteCredentials("test-server")).rejects.toThrow(
+          "keychain delete error",
         );
       });
     });
 
-    describe('listServers', () => {
-      it('should return a list of server names', async () => {
+    describe("listServers", () => {
+      it("should return a list of server names", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
-          { account: 'server2', password: '' },
+          { account: "server1", password: "" },
+          { account: "server2", password: "" },
         ]);
         const result = await storage.listServers();
-        expect(result).toEqual(['server1', 'server2']);
+        expect(result).toEqual(["server1", "server2"]);
       });
 
-      it('should not include internal test keys in the server list', async () => {
+      it("should not include internal test keys in the server list", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
+          { account: "server1", password: "" },
           {
             account: `__keychain_test__${mockCryptoRandomBytesString}`,
-            password: '',
+            password: "",
           },
-          { account: 'server2', password: '' },
+          { account: "server2", password: "" },
         ]);
         const result = await storage.listServers();
-        expect(result).toEqual(['server1', 'server2']);
+        expect(result).toEqual(["server1", "server2"]);
       });
 
-      it('should return an empty array on error', async () => {
-        const error = new Error('find error');
+      it("should return an empty array on error", async () => {
+        const error = new Error("find error");
         mockKeytar.findCredentials.mockRejectedValue(error);
         const result = await storage.listServers();
         expect(result).toEqual([]);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to list servers from keychain',
+          "error",
+          "Failed to list servers from keychain",
           error,
         );
       });
     });
 
-    describe('getAllCredentials', () => {
-      it('should return a map of all valid credentials and emit feedback for invalid ones', async () => {
+    describe("getAllCredentials", () => {
+      it("should return a map of all valid credentials and emit feedback for invalid ones", async () => {
         const creds2 = {
           ...validCredentials,
-          serverName: 'server2',
+          serverName: "server2",
         };
         const expiredCreds = {
           ...validCredentials,
-          serverName: 'expired-server',
+          serverName: "expired-server",
           token: { ...validCredentials.token, expiresAt: Date.now() - 1000 },
         };
         const structurallyInvalidCreds = {
-          serverName: 'invalid-server',
+          serverName: "invalid-server",
         };
 
         mockKeytar.findCredentials.mockResolvedValue([
           {
-            account: 'test-server',
+            account: "test-server",
             password: JSON.stringify(validCredentials),
           },
-          { account: 'server2', password: JSON.stringify(creds2) },
+          { account: "server2", password: JSON.stringify(creds2) },
           {
-            account: 'expired-server',
+            account: "expired-server",
             password: JSON.stringify(expiredCreds),
           },
-          { account: 'bad-server', password: 'not-json' },
+          { account: "bad-server", password: "not-json" },
           {
-            account: 'invalid-server',
+            account: "invalid-server",
             password: JSON.stringify(structurallyInvalidCreds),
           },
         ]);
 
         const result = await storage.getAllCredentials();
         expect(result.size).toBe(2);
-        expect(result.get('test-server')).toEqual(validCredentials);
-        expect(result.get('server2')).toEqual(creds2);
-        expect(result.has('expired-server')).toBe(false);
-        expect(result.has('bad-server')).toBe(false);
-        expect(result.has('invalid-server')).toBe(false);
+        expect(result.get("test-server")).toEqual(validCredentials);
+        expect(result.get("server2")).toEqual(creds2);
+        expect(result.has("expired-server")).toBe(false);
+        expect(result.has("bad-server")).toBe(false);
+        expect(result.has("invalid-server")).toBe(false);
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to parse credentials for bad-server',
+          "error",
+          "Failed to parse credentials for bad-server",
           expect.any(SyntaxError),
         );
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to parse credentials for invalid-server',
+          "error",
+          "Failed to parse credentials for invalid-server",
           expect.any(Error),
         );
       });
 
-      it('should emit feedback and return empty map if findCredentials fails', async () => {
-        const error = new Error('find all error');
+      it("should emit feedback and return empty map if findCredentials fails", async () => {
+        const error = new Error("find all error");
         mockKeytar.findCredentials.mockRejectedValue(error);
 
         const result = await storage.getAllCredentials();
         expect(result.size).toBe(0);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to get all credentials from keychain',
+          "error",
+          "Failed to get all credentials from keychain",
           error,
         );
       });
     });
 
-    describe('clearAll', () => {
-      it('should delete all credentials for the service', async () => {
+    describe("clearAll", () => {
+      it("should delete all credentials for the service", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
-          { account: 'server2', password: '' },
+          { account: "server1", password: "" },
+          { account: "server2", password: "" },
         ]);
         mockKeytar.deletePassword.mockResolvedValue(true);
 
         await storage.clearAll();
 
         expect(mockKeytar.deletePassword).toHaveBeenCalledTimes(2);
-        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'server1',
-        );
-        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'server2',
-        );
+        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, "server1");
+        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, "server2");
       });
 
-      it('should throw an aggregated error if deletions fail', async () => {
+      it("should throw an aggregated error if deletions fail", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
-          { account: 'server2', password: '' },
+          { account: "server1", password: "" },
+          { account: "server2", password: "" },
         ]);
         mockKeytar.deletePassword
           .mockResolvedValueOnce(true)
-          .mockRejectedValueOnce(new Error('delete failed'));
+          .mockRejectedValueOnce(new Error("delete failed"));
 
         await expect(storage.clearAll()).rejects.toThrow(
-          'Failed to clear some credentials: delete failed',
+          "Failed to clear some credentials: delete failed",
         );
       });
     });
 
-    describe('Secrets', () => {
-      it('should set and get a secret', async () => {
+    describe("Secrets", () => {
+      it("should set and get a secret", async () => {
         mockKeytar.setPassword.mockResolvedValue(undefined);
-        mockKeytar.getPassword.mockResolvedValue('secret-value');
+        mockKeytar.getPassword.mockResolvedValue("secret-value");
 
-        await storage.setSecret('secret-key', 'secret-value');
-        const value = await storage.getSecret('secret-key');
+        await storage.setSecret("secret-key", "secret-value");
+        const value = await storage.getSecret("secret-key");
 
         expect(mockKeytar.setPassword).toHaveBeenCalledWith(
           mockServiceName,
-          '__secret__secret-key',
-          'secret-value',
+          "__secret__secret-key",
+          "secret-value",
         );
         expect(mockKeytar.getPassword).toHaveBeenCalledWith(
           mockServiceName,
-          '__secret__secret-key',
+          "__secret__secret-key",
         );
-        expect(value).toBe('secret-value');
+        expect(value).toBe("secret-value");
       });
 
-      it('should delete a secret', async () => {
+      it("should delete a secret", async () => {
         mockKeytar.deletePassword.mockResolvedValue(true);
-        await storage.deleteSecret('secret-key');
+        await storage.deleteSecret("secret-key");
         expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
           mockServiceName,
-          '__secret__secret-key',
+          "__secret__secret-key",
         );
       });
 
-      it('should list secrets', async () => {
+      it("should list secrets", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: '__secret__secret1', password: '' },
-          { account: '__secret__secret2', password: '' },
-          { account: 'server1', password: '' },
+          { account: "__secret__secret1", password: "" },
+          { account: "__secret__secret2", password: "" },
+          { account: "server1", password: "" },
         ]);
         const secrets = await storage.listSecrets();
-        expect(secrets).toEqual(['secret1', 'secret2']);
+        expect(secrets).toEqual(["secret1", "secret2"]);
       });
 
-      it('should not list secrets in listServers', async () => {
+      it("should not list secrets in listServers", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: '__secret__secret1', password: '' },
-          { account: 'server1', password: '' },
+          { account: "__secret__secret1", password: "" },
+          { account: "server1", password: "" },
         ]);
         const servers = await storage.listServers();
-        expect(servers).toEqual(['server1']);
+        expect(servers).toEqual(["server1"]);
       });
     });
   });
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.ts b/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.ts
index b8ea7b689..09e8af616 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/keychain-token-storage.ts
@@ -4,31 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as crypto from 'node:crypto';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials, SecretStorage } from './types.js';
-import { coreEvents } from '../../utils/events.js';
+import * as crypto from "node:crypto";
+import { coreEvents } from "../../utils/events.js";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials, SecretStorage } from "./types.js";
 
 interface Keytar {
   getPassword(service: string, account: string): Promise<string | null>;
-  setPassword(
-    service: string,
-    account: string,
-    password: string,
-  ): Promise<void>;
+  setPassword(service: string, account: string, password: string): Promise<void>;
   deletePassword(service: string, account: string): Promise<boolean>;
-  findCredentials(
-    service: string,
-  ): Promise<Array<{ account: string; password: string }>>;
+  findCredentials(service: string): Promise<Array<{ account: string; password: string }>>;
 }
 
-const KEYCHAIN_TEST_PREFIX = '__keychain_test__';
-const SECRET_PREFIX = '__secret__';
+const KEYCHAIN_TEST_PREFIX = "__keychain_test__";
+const SECRET_PREFIX = "__secret__";
 
-export class KeychainTokenStorage
-  extends BaseTokenStorage
-  implements SecretStorage
-{
+export class KeychainTokenStorage extends BaseTokenStorage implements SecretStorage {
   private keychainAvailable: boolean | null = null;
   private keytarModule: Keytar | null = null;
   private keytarLoadAttempted = false;
@@ -43,7 +34,7 @@ export class KeychainTokenStorage
 
     try {
       // Try to import keytar without any timeout - let the OS handle it
-      const moduleName = 'keytar';
+      const moduleName = "keytar";
       const module = await import(moduleName);
       this.keytarModule = module.default || module;
     } catch (_) {
@@ -54,12 +45,12 @@ export class KeychainTokenStorage
 
   async getCredentials(serverName: string): Promise<OAuthCredentials | null> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     try {
@@ -87,12 +78,12 @@ export class KeychainTokenStorage
 
   async setCredentials(credentials: OAuthCredentials): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     this.validateCredentials(credentials);
@@ -109,19 +100,16 @@ export class KeychainTokenStorage
 
   async deleteCredentials(serverName: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     const sanitizedName = this.sanitizeServerName(serverName);
-    const deleted = await keytar.deletePassword(
-      this.serviceName,
-      sanitizedName,
-    );
+    const deleted = await keytar.deletePassword(this.serviceName, sanitizedName);
 
     if (!deleted) {
       throw new Error(`No credentials found for ${serverName}`);
@@ -130,12 +118,12 @@ export class KeychainTokenStorage
 
   async listServers(): Promise<string[]> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     try {
@@ -148,33 +136,25 @@ export class KeychainTokenStorage
         )
         .map((cred: { account: string }) => cred.account);
     } catch (error) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to list servers from keychain',
-        error,
-      );
+      coreEvents.emitFeedback("error", "Failed to list servers from keychain", error);
       return [];
     }
   }
 
   async getAllCredentials(): Promise<Map<string, OAuthCredentials>> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     const result = new Map<string, OAuthCredentials>();
     try {
-      const credentials = (
-        await keytar.findCredentials(this.serviceName)
-      ).filter(
-        (c) =>
-          !c.account.startsWith(KEYCHAIN_TEST_PREFIX) &&
-          !c.account.startsWith(SECRET_PREFIX),
+      const credentials = (await keytar.findCredentials(this.serviceName)).filter(
+        (c) => !c.account.startsWith(KEYCHAIN_TEST_PREFIX) && !c.account.startsWith(SECRET_PREFIX),
       );
 
       for (const cred of credentials) {
@@ -185,18 +165,14 @@ export class KeychainTokenStorage
           }
         } catch (error) {
           coreEvents.emitFeedback(
-            'error',
+            "error",
             `Failed to parse credentials for ${cred.account}`,
             error,
           );
         }
       }
     } catch (error) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to get all credentials from keychain',
-        error,
-      );
+      coreEvents.emitFeedback("error", "Failed to get all credentials from keychain", error);
     }
 
     return result;
@@ -204,7 +180,7 @@ export class KeychainTokenStorage
 
   async clearAll(): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const servers = this.keytarModule
@@ -212,9 +188,7 @@ export class KeychainTokenStorage
           .findCredentials(this.serviceName)
           .then((creds) => creds.map((c) => c.account))
           .catch((error: Error) => {
-            throw new Error(
-              `Failed to list servers for clearing: ${error.message}`,
-            );
+            throw new Error(`Failed to list servers for clearing: ${error.message}`);
           })
       : [];
     const errors: Error[] = [];
@@ -229,7 +203,7 @@ export class KeychainTokenStorage
 
     if (errors.length > 0) {
       throw new Error(
-        `Failed to clear some credentials: ${errors.map((e) => e.message).join(', ')}`,
+        `Failed to clear some credentials: ${errors.map((e) => e.message).join(", ")}`,
       );
     }
   }
@@ -248,15 +222,12 @@ export class KeychainTokenStorage
         return false;
       }
 
-      const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto.randomBytes(8).toString('hex')}`;
-      const testPassword = 'test';
+      const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto.randomBytes(8).toString("hex")}`;
+      const testPassword = "test";
 
       await keytar.setPassword(this.serviceName, testAccount, testPassword);
       const retrieved = await keytar.getPassword(this.serviceName, testAccount);
-      const deleted = await keytar.deletePassword(
-        this.serviceName,
-        testAccount,
-      );
+      const deleted = await keytar.deletePassword(this.serviceName, testAccount);
 
       const success = deleted && retrieved === testPassword;
       this.keychainAvailable = success;
@@ -273,38 +244,35 @@ export class KeychainTokenStorage
 
   async setSecret(key: string, value: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     await keytar.setPassword(this.serviceName, `${SECRET_PREFIX}${key}`, value);
   }
 
   async getSecret(key: string): Promise<string | null> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     return keytar.getPassword(this.serviceName, `${SECRET_PREFIX}${key}`);
   }
 
   async deleteSecret(key: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
-    const deleted = await keytar.deletePassword(
-      this.serviceName,
-      `${SECRET_PREFIX}${key}`,
-    );
+    const deleted = await keytar.deletePassword(this.serviceName, `${SECRET_PREFIX}${key}`);
     if (!deleted) {
       throw new Error(`No secret found for key: ${key}`);
     }
@@ -312,11 +280,11 @@ export class KeychainTokenStorage
 
   async listSecrets(): Promise<string[]> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     try {
       const credentials = await keytar.findCredentials(this.serviceName);
@@ -324,7 +292,7 @@ export class KeychainTokenStorage
         .filter((cred) => cred.account.startsWith(SECRET_PREFIX))
         .map((cred) => cred.account.substring(SECRET_PREFIX.length));
     } catch (error) {
-      console.error('Failed to list secrets from keychain:', error);
+      console.error("Failed to list secrets from keychain:", error);
       return [];
     }
   }
diff --git a/packages/gemini-cli-core/src/mcp/token-storage/types.ts b/packages/gemini-cli-core/src/mcp/token-storage/types.ts
index b167e821d..0ec278d55 100644
--- a/packages/gemini-cli-core/src/mcp/token-storage/types.ts
+++ b/packages/gemini-cli-core/src/mcp/token-storage/types.ts
@@ -44,6 +44,6 @@ export interface SecretStorage {
 }
 
 export enum TokenStorageType {
-  KEYCHAIN = 'keychain',
-  ENCRYPTED_FILE = 'encrypted_file',
+  KEYCHAIN = "keychain",
+  ENCRYPTED_FILE = "encrypted_file",
 }
diff --git a/packages/gemini-cli-core/src/mocks/msw.ts b/packages/gemini-cli-core/src/mocks/msw.ts
index 4bf93138e..1a3d38f52 100644
--- a/packages/gemini-cli-core/src/mocks/msw.ts
+++ b/packages/gemini-cli-core/src/mocks/msw.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { setupServer } from 'msw/node';
+import { setupServer } from "msw/node";
 
 export const server = setupServer();
diff --git a/packages/gemini-cli-core/src/output/json-formatter.test.ts b/packages/gemini-cli-core/src/output/json-formatter.test.ts
index 7df4aa770..625cb56f6 100644
--- a/packages/gemini-cli-core/src/output/json-formatter.test.ts
+++ b/packages/gemini-cli-core/src/output/json-formatter.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { expect, describe, it } from 'vitest';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
-import { JsonFormatter } from './json-formatter.js';
-import type { JsonError } from './types.js';
+import { describe, expect, it } from "vitest";
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import { JsonFormatter } from "./json-formatter.js";
+import type { JsonError } from "./types.js";
 
-describe('JsonFormatter', () => {
-  it('should format the response as JSON', () => {
+describe("JsonFormatter", () => {
+  it("should format the response as JSON", () => {
     const formatter = new JsonFormatter();
-    const response = 'This is a test response.';
+    const response = "This is a test response.";
     const formatted = formatter.format(undefined, response);
     const expected = {
       response,
@@ -20,10 +20,10 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should format the response as JSON with a session ID', () => {
+  it("should format the response as JSON with a session ID", () => {
     const formatter = new JsonFormatter();
-    const response = 'This is a test response.';
-    const sessionId = 'test-session-id';
+    const response = "This is a test response.";
+    const sessionId = "test-session-id";
     const formatted = formatter.format(sessionId, response);
     const expected = {
       session_id: sessionId,
@@ -32,39 +32,37 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should strip ANSI escape sequences from response text', () => {
+  it("should strip ANSI escape sequences from response text", () => {
     const formatter = new JsonFormatter();
-    const responseWithAnsi =
-      '\x1B[31mRed text\x1B[0m and \x1B[32mGreen text\x1B[0m';
+    const responseWithAnsi = "\x1B[31mRed text\x1B[0m and \x1B[32mGreen text\x1B[0m";
     const formatted = formatter.format(undefined, responseWithAnsi);
     const parsed = JSON.parse(formatted);
-    expect(parsed.response).toBe('Red text and Green text');
+    expect(parsed.response).toBe("Red text and Green text");
   });
 
-  it('should strip control characters from response text', () => {
+  it("should strip control characters from response text", () => {
     const formatter = new JsonFormatter();
-    const responseWithControlChars =
-      'Text with\x07 bell\x08 and\x0B vertical tab';
+    const responseWithControlChars = "Text with\x07 bell\x08 and\x0B vertical tab";
     const formatted = formatter.format(undefined, responseWithControlChars);
     const parsed = JSON.parse(formatted);
     // Only ANSI codes are stripped, other control chars are preserved
-    expect(parsed.response).toBe('Text with\x07 bell\x08 and\x0B vertical tab');
+    expect(parsed.response).toBe("Text with\x07 bell\x08 and\x0B vertical tab");
   });
 
-  it('should preserve newlines and tabs in response text', () => {
+  it("should preserve newlines and tabs in response text", () => {
     const formatter = new JsonFormatter();
-    const responseWithWhitespace = 'Line 1\nLine 2\r\nLine 3\twith tab';
+    const responseWithWhitespace = "Line 1\nLine 2\r\nLine 3\twith tab";
     const formatted = formatter.format(undefined, responseWithWhitespace);
     const parsed = JSON.parse(formatted);
-    expect(parsed.response).toBe('Line 1\nLine 2\r\nLine 3\twith tab');
+    expect(parsed.response).toBe("Line 1\nLine 2\r\nLine 3\twith tab");
   });
 
-  it('should format the response as JSON with stats', () => {
+  it("should format the response as JSON with stats", () => {
     const formatter = new JsonFormatter();
-    const response = 'This is a test response.';
+    const response = "This is a test response.";
     const stats: SessionMetrics = {
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: {
             totalRequests: 2,
             totalErrors: 0,
@@ -79,7 +77,7 @@ describe('JsonFormatter', () => {
             tool: 0,
           },
         },
-        'gemini-2.5-flash': {
+        "gemini-2.5-flash": {
           api: {
             totalRequests: 2,
             totalErrors: 0,
@@ -134,11 +132,11 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should format error as JSON', () => {
+  it("should format error as JSON", () => {
     const formatter = new JsonFormatter();
     const error: JsonError = {
-      type: 'ValidationError',
-      message: 'Invalid input provided',
+      type: "ValidationError",
+      message: "Invalid input provided",
       code: 400,
     };
     const formatted = formatter.format(undefined, undefined, undefined, error);
@@ -148,13 +146,13 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should format response with error as JSON', () => {
+  it("should format response with error as JSON", () => {
     const formatter = new JsonFormatter();
-    const response = 'Partial response';
+    const response = "Partial response";
     const error: JsonError = {
-      type: 'TimeoutError',
-      message: 'Request timed out',
-      code: 'TIMEOUT',
+      type: "TimeoutError",
+      message: "Request timed out",
+      code: "TIMEOUT",
     };
     const formatted = formatter.format(undefined, response, undefined, error);
     const expected = {
@@ -164,62 +162,62 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should format error using formatError method', () => {
+  it("should format error using formatError method", () => {
     const formatter = new JsonFormatter();
-    const error = new Error('Something went wrong');
+    const error = new Error("Something went wrong");
     const formatted = formatter.formatError(error, 500);
     const parsed = JSON.parse(formatted);
 
     expect(parsed).toEqual({
       error: {
-        type: 'Error',
-        message: 'Something went wrong',
+        type: "Error",
+        message: "Something went wrong",
         code: 500,
       },
     });
   });
 
-  it('should format error using formatError method with a session ID', () => {
+  it("should format error using formatError method with a session ID", () => {
     const formatter = new JsonFormatter();
-    const error = new Error('Something went wrong');
-    const sessionId = 'test-session-id';
+    const error = new Error("Something went wrong");
+    const sessionId = "test-session-id";
     const formatted = formatter.formatError(error, 500, sessionId);
     const parsed = JSON.parse(formatted);
 
     expect(parsed).toEqual({
       session_id: sessionId,
       error: {
-        type: 'Error',
-        message: 'Something went wrong',
+        type: "Error",
+        message: "Something went wrong",
         code: 500,
       },
     });
   });
 
-  it('should format custom error using formatError method', () => {
+  it("should format custom error using formatError method", () => {
     class CustomError extends Error {
       constructor(message: string) {
         super(message);
-        this.name = 'CustomError';
+        this.name = "CustomError";
       }
     }
 
     const formatter = new JsonFormatter();
-    const error = new CustomError('Custom error occurred');
+    const error = new CustomError("Custom error occurred");
     const formatted = formatter.formatError(error, undefined);
     const parsed = JSON.parse(formatted);
 
     expect(parsed).toEqual({
       error: {
-        type: 'CustomError',
-        message: 'Custom error occurred',
+        type: "CustomError",
+        message: "Custom error occurred",
       },
     });
   });
 
-  it('should format complete JSON output with response, stats, and error', () => {
+  it("should format complete JSON output with response, stats, and error", () => {
     const formatter = new JsonFormatter();
-    const response = 'Partial response before error';
+    const response = "Partial response before error";
     const stats: SessionMetrics = {
       models: {},
       tools: {
@@ -241,8 +239,8 @@ describe('JsonFormatter', () => {
       },
     };
     const error: JsonError = {
-      type: 'ApiError',
-      message: 'Rate limit exceeded',
+      type: "ApiError",
+      message: "Rate limit exceeded",
       code: 429,
     };
 
@@ -255,19 +253,17 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should handle error messages containing JSON content', () => {
+  it("should handle error messages containing JSON content", () => {
     const formatter = new JsonFormatter();
-    const errorWithJson = new Error(
-      'API returned: {"error": "Invalid request", "code": 400}',
-    );
-    const formatted = formatter.formatError(errorWithJson, 'API_ERROR');
+    const errorWithJson = new Error('API returned: {"error": "Invalid request", "code": 400}');
+    const formatted = formatter.formatError(errorWithJson, "API_ERROR");
     const parsed = JSON.parse(formatted);
 
     expect(parsed).toEqual({
       error: {
-        type: 'Error',
+        type: "Error",
         message: 'API returned: {"error": "Invalid request", "code": 400}',
-        code: 'API_ERROR',
+        code: "API_ERROR",
       },
     });
 
@@ -275,7 +271,7 @@ describe('JsonFormatter', () => {
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should handle error messages with quotes and special characters', () => {
+  it("should handle error messages with quotes and special characters", () => {
     const formatter = new JsonFormatter();
     const errorWithQuotes = new Error('Error: "quoted text" and \\backslash');
     const formatted = formatter.formatError(errorWithQuotes);
@@ -283,7 +279,7 @@ describe('JsonFormatter', () => {
 
     expect(parsed).toEqual({
       error: {
-        type: 'Error',
+        type: "Error",
         message: 'Error: "quoted text" and \\backslash',
       },
     });
@@ -292,39 +288,37 @@ describe('JsonFormatter', () => {
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should handle error messages with control characters', () => {
+  it("should handle error messages with control characters", () => {
     const formatter = new JsonFormatter();
-    const errorWithControlChars = new Error('Error with\n newline and\t tab');
+    const errorWithControlChars = new Error("Error with\n newline and\t tab");
     const formatted = formatter.formatError(errorWithControlChars);
     const parsed = JSON.parse(formatted);
 
     // Should preserve newlines and tabs as they are common whitespace characters
-    expect(parsed.error.message).toBe('Error with\n newline and\t tab');
+    expect(parsed.error.message).toBe("Error with\n newline and\t tab");
 
     // Verify the entire output is valid JSON
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should strip ANSI escape sequences from error messages', () => {
+  it("should strip ANSI escape sequences from error messages", () => {
     const formatter = new JsonFormatter();
-    const errorWithAnsi = new Error('\x1B[31mRed error\x1B[0m message');
+    const errorWithAnsi = new Error("\x1B[31mRed error\x1B[0m message");
     const formatted = formatter.formatError(errorWithAnsi);
     const parsed = JSON.parse(formatted);
 
-    expect(parsed.error.message).toBe('Red error message');
+    expect(parsed.error.message).toBe("Red error message");
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should strip unsafe control characters from error messages', () => {
+  it("should strip unsafe control characters from error messages", () => {
     const formatter = new JsonFormatter();
-    const errorWithControlChars = new Error(
-      'Error\x07 with\x08 control\x0B chars',
-    );
+    const errorWithControlChars = new Error("Error\x07 with\x08 control\x0B chars");
     const formatted = formatter.formatError(errorWithControlChars);
     const parsed = JSON.parse(formatted);
 
     // Only ANSI codes are stripped, other control chars are preserved
-    expect(parsed.error.message).toBe('Error\x07 with\x08 control\x0B chars');
+    expect(parsed.error.message).toBe("Error\x07 with\x08 control\x0B chars");
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 });
diff --git a/packages/gemini-cli-core/src/output/json-formatter.ts b/packages/gemini-cli-core/src/output/json-formatter.ts
index dd3e558a6..cb3186a54 100644
--- a/packages/gemini-cli-core/src/output/json-formatter.ts
+++ b/packages/gemini-cli-core/src/output/json-formatter.ts
@@ -4,17 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
-import type { JsonError, JsonOutput } from './types.js';
+import stripAnsi from "strip-ansi";
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import type { JsonError, JsonOutput } from "./types.js";
 
 export class JsonFormatter {
-  format(
-    sessionId?: string,
-    response?: string,
-    stats?: SessionMetrics,
-    error?: JsonError,
-  ): string {
+  format(sessionId?: string, response?: string, stats?: SessionMetrics, error?: JsonError): string {
     const output: JsonOutput = {};
 
     if (sessionId) {
@@ -36,11 +31,7 @@ export class JsonFormatter {
     return JSON.stringify(output, null, 2);
   }
 
-  formatError(
-    error: Error,
-    code?: string | number,
-    sessionId?: string,
-  ): string {
+  formatError(error: Error, code?: string | number, sessionId?: string): string {
     const jsonError: JsonError = {
       type: error.constructor.name,
       message: stripAnsi(error.message),
diff --git a/packages/gemini-cli-core/src/output/stream-json-formatter.test.ts b/packages/gemini-cli-core/src/output/stream-json-formatter.test.ts
index 6e9d3c792..1181909e9 100644
--- a/packages/gemini-cli-core/src/output/stream-json-formatter.test.ts
+++ b/packages/gemini-cli-core/src/output/stream-json-formatter.test.ts
@@ -4,148 +4,146 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { StreamJsonFormatter } from './stream-json-formatter.js';
-import { JsonStreamEventType } from './types.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ToolCallDecision } from "../telemetry/tool-call-decision.js";
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import { StreamJsonFormatter } from "./stream-json-formatter.js";
 import type {
+  ErrorEvent,
   InitEvent,
   MessageEvent,
-  ToolUseEvent,
-  ToolResultEvent,
-  ErrorEvent,
   ResultEvent,
-} from './types.js';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
-import { ToolCallDecision } from '../telemetry/tool-call-decision.js';
+  ToolResultEvent,
+  ToolUseEvent,
+} from "./types.js";
+import { JsonStreamEventType } from "./types.js";
 
-describe('StreamJsonFormatter', () => {
+describe("StreamJsonFormatter", () => {
   let formatter: StreamJsonFormatter;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let stdoutWriteSpy: any;
 
   beforeEach(() => {
     formatter = new StreamJsonFormatter();
-    stdoutWriteSpy = vi
-      .spyOn(process.stdout, 'write')
-      .mockImplementation(() => true);
+    stdoutWriteSpy = vi.spyOn(process.stdout, "write").mockImplementation(() => true);
   });
 
   afterEach(() => {
     stdoutWriteSpy.mockRestore();
   });
 
-  describe('formatEvent', () => {
-    it('should format init event as JSONL', () => {
+  describe("formatEvent", () => {
+    it("should format init event as JSONL", () => {
       const event: InitEvent = {
         type: JsonStreamEventType.INIT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        session_id: 'test-session-123',
-        model: 'gemini-2.0-flash-exp',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        session_id: "test-session-123",
+        model: "gemini-2.0-flash-exp",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format user message event', () => {
+    it("should format user message event", () => {
       const event: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        role: 'user',
-        content: 'What is 2+2?',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        role: "user",
+        content: "What is 2+2?",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format assistant message event with delta', () => {
+    it("should format assistant message event with delta", () => {
       const event: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        role: 'assistant',
-        content: '4',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        role: "assistant",
+        content: "4",
         delta: true,
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       const parsed = JSON.parse(result.trim());
       expect(parsed.delta).toBe(true);
     });
 
-    it('should format tool_use event', () => {
+    it("should format tool_use event", () => {
       const event: ToolUseEvent = {
         type: JsonStreamEventType.TOOL_USE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        tool_name: 'Read',
-        tool_id: 'read-123',
-        parameters: { file_path: '/path/to/file.txt' },
+        timestamp: "2025-10-10T12:00:00.000Z",
+        tool_name: "Read",
+        tool_id: "read-123",
+        parameters: { file_path: "/path/to/file.txt" },
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format tool_result event (success)', () => {
+    it("should format tool_result event (success)", () => {
       const event: ToolResultEvent = {
         type: JsonStreamEventType.TOOL_RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        tool_id: 'read-123',
-        status: 'success',
-        output: 'File contents here',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        tool_id: "read-123",
+        status: "success",
+        output: "File contents here",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format tool_result event (error)', () => {
+    it("should format tool_result event (error)", () => {
       const event: ToolResultEvent = {
         type: JsonStreamEventType.TOOL_RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        tool_id: 'read-123',
-        status: 'error',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        tool_id: "read-123",
+        status: "error",
         error: {
-          type: 'FILE_NOT_FOUND',
-          message: 'File not found',
+          type: "FILE_NOT_FOUND",
+          message: "File not found",
         },
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format error event', () => {
+    it("should format error event", () => {
       const event: ErrorEvent = {
         type: JsonStreamEventType.ERROR,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        severity: 'warning',
-        message: 'Loop detected, stopping execution',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        severity: "warning",
+        message: "Loop detected, stopping execution",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format result event with success status', () => {
+    it("should format result event with success status", () => {
       const event: ResultEvent = {
         type: JsonStreamEventType.RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        status: 'success',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        status: "success",
         stats: {
           total_tokens: 100,
           input_tokens: 50,
@@ -157,18 +155,18 @@ describe('StreamJsonFormatter', () => {
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format result event with error status', () => {
+    it("should format result event with error status", () => {
       const event: ResultEvent = {
         type: JsonStreamEventType.RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        status: 'error',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        status: "error",
         error: {
-          type: 'MaxSessionTurnsError',
-          message: 'Maximum session turns exceeded',
+          type: "MaxSessionTurnsError",
+          message: "Maximum session turns exceeded",
         },
         stats: {
           total_tokens: 100,
@@ -181,76 +179,70 @@ describe('StreamJsonFormatter', () => {
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should produce minified JSON without pretty-printing', () => {
+    it("should produce minified JSON without pretty-printing", () => {
       const event: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        role: 'user',
-        content: 'Test',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        role: "user",
+        content: "Test",
       };
 
       const result = formatter.formatEvent(event);
 
       // Should not contain multiple spaces or newlines (except trailing)
-      expect(result).not.toContain('  ');
-      expect(result.split('\n').length).toBe(2); // JSON + trailing newline
+      expect(result).not.toContain("  ");
+      expect(result.split("\n").length).toBe(2); // JSON + trailing newline
     });
   });
 
-  describe('emitEvent', () => {
-    it('should write formatted event to stdout', () => {
+  describe("emitEvent", () => {
+    it("should write formatted event to stdout", () => {
       const event: InitEvent = {
         type: JsonStreamEventType.INIT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        session_id: 'test-session',
-        model: 'gemini-2.0-flash-exp',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        session_id: "test-session",
+        model: "gemini-2.0-flash-exp",
       };
 
       formatter.emitEvent(event);
 
       expect(stdoutWriteSpy).toHaveBeenCalledTimes(1);
-      expect(stdoutWriteSpy).toHaveBeenCalledWith(JSON.stringify(event) + '\n');
+      expect(stdoutWriteSpy).toHaveBeenCalledWith(JSON.stringify(event) + "\n");
     });
 
-    it('should emit multiple events sequentially', () => {
+    it("should emit multiple events sequentially", () => {
       const event1: InitEvent = {
         type: JsonStreamEventType.INIT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        session_id: 'test-session',
-        model: 'gemini-2.0-flash-exp',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        session_id: "test-session",
+        model: "gemini-2.0-flash-exp",
       };
 
       const event2: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:01.000Z',
-        role: 'user',
-        content: 'Hello',
+        timestamp: "2025-10-10T12:00:01.000Z",
+        role: "user",
+        content: "Hello",
       };
 
       formatter.emitEvent(event1);
       formatter.emitEvent(event2);
 
       expect(stdoutWriteSpy).toHaveBeenCalledTimes(2);
-      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(
-        1,
-        JSON.stringify(event1) + '\n',
-      );
-      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(
-        2,
-        JSON.stringify(event2) + '\n',
-      );
+      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(1, JSON.stringify(event1) + "\n");
+      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(2, JSON.stringify(event2) + "\n");
     });
   });
 
-  describe('convertToStreamStats', () => {
-    it('should aggregate token counts from single model', () => {
+  describe("convertToStreamStats", () => {
+    it("should aggregate token counts from single model", () => {
       const metrics: SessionMetrics = {
         models: {
-          'gemini-2.0-flash': {
+          "gemini-2.0-flash": {
             api: {
               totalRequests: 1,
               totalErrors: 0,
@@ -296,10 +288,10 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should aggregate token counts from multiple models', () => {
+    it("should aggregate token counts from multiple models", () => {
       const metrics: SessionMetrics = {
         models: {
-          'gemini-2.0-flash': {
+          "gemini-2.0-flash": {
             api: {
               totalRequests: 1,
               totalErrors: 0,
@@ -314,7 +306,7 @@ describe('StreamJsonFormatter', () => {
               tool: 0,
             },
           },
-          'gemini-1.5-pro': {
+          "gemini-1.5-pro": {
             api: {
               totalRequests: 1,
               totalErrors: 0,
@@ -360,7 +352,7 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should handle empty metrics', () => {
+    it("should handle empty metrics", () => {
       const metrics: SessionMetrics = {
         models: {},
         tools: {
@@ -393,7 +385,7 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should use session-level tool calls count', () => {
+    it("should use session-level tool calls count", () => {
       const metrics: SessionMetrics = {
         models: {},
         tools: {
@@ -445,7 +437,7 @@ describe('StreamJsonFormatter', () => {
       expect(result.tool_calls).toBe(3);
     });
 
-    it('should pass through duration unchanged', () => {
+    it("should pass through duration unchanged", () => {
       const metrics: SessionMetrics = {
         models: {},
         tools: {
@@ -473,44 +465,44 @@ describe('StreamJsonFormatter', () => {
     });
   });
 
-  describe('JSON validity', () => {
-    it('should produce valid JSON for all event types', () => {
+  describe("JSON validity", () => {
+    it("should produce valid JSON for all event types", () => {
       const events = [
         {
           type: JsonStreamEventType.INIT,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          session_id: 'test',
-          model: 'gemini-2.0-flash',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          session_id: "test",
+          model: "gemini-2.0-flash",
         } as InitEvent,
         {
           type: JsonStreamEventType.MESSAGE,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          role: 'user',
-          content: 'Test',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          role: "user",
+          content: "Test",
         } as MessageEvent,
         {
           type: JsonStreamEventType.TOOL_USE,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          tool_name: 'Read',
-          tool_id: 'read-1',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          tool_name: "Read",
+          tool_id: "read-1",
           parameters: {},
         } as ToolUseEvent,
         {
           type: JsonStreamEventType.TOOL_RESULT,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          tool_id: 'read-1',
-          status: 'success',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          tool_id: "read-1",
+          status: "success",
         } as ToolResultEvent,
         {
           type: JsonStreamEventType.ERROR,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          severity: 'error',
-          message: 'Test error',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          severity: "error",
+          message: "Test error",
         } as ErrorEvent,
         {
           type: JsonStreamEventType.RESULT,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          status: 'success',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          status: "success",
           stats: {
             total_tokens: 0,
             input_tokens: 0,
@@ -527,11 +519,11 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should preserve field types', () => {
+    it("should preserve field types", () => {
       const event: ResultEvent = {
         type: JsonStreamEventType.RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        status: 'success',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        status: "success",
         stats: {
           total_tokens: 100,
           input_tokens: 50,
@@ -544,11 +536,11 @@ describe('StreamJsonFormatter', () => {
       const formatted = formatter.formatEvent(event);
       const parsed = JSON.parse(formatted.trim());
 
-      expect(typeof parsed.stats.total_tokens).toBe('number');
-      expect(typeof parsed.stats.input_tokens).toBe('number');
-      expect(typeof parsed.stats.output_tokens).toBe('number');
-      expect(typeof parsed.stats.duration_ms).toBe('number');
-      expect(typeof parsed.stats.tool_calls).toBe('number');
+      expect(typeof parsed.stats.total_tokens).toBe("number");
+      expect(typeof parsed.stats.input_tokens).toBe("number");
+      expect(typeof parsed.stats.output_tokens).toBe("number");
+      expect(typeof parsed.stats.duration_ms).toBe("number");
+      expect(typeof parsed.stats.tool_calls).toBe("number");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/output/stream-json-formatter.ts b/packages/gemini-cli-core/src/output/stream-json-formatter.ts
index b42177b7f..cdf4c3fd5 100644
--- a/packages/gemini-cli-core/src/output/stream-json-formatter.ts
+++ b/packages/gemini-cli-core/src/output/stream-json-formatter.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { JsonStreamEvent, StreamStats } from './types.js';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import type { JsonStreamEvent, StreamStats } from "./types.js";
 
 /**
  * Formatter for streaming JSON output.
@@ -18,7 +18,7 @@ export class StreamJsonFormatter {
    * @returns JSON string with trailing newline
    */
   formatEvent(event: JsonStreamEvent): string {
-    return JSON.stringify(event) + '\n';
+    return JSON.stringify(event) + "\n";
   }
 
   /**
@@ -36,10 +36,7 @@ export class StreamJsonFormatter {
    * @param durationMs - The session duration in milliseconds
    * @returns Simplified stats for streaming output
    */
-  convertToStreamStats(
-    metrics: SessionMetrics,
-    durationMs: number,
-  ): StreamStats {
+  convertToStreamStats(metrics: SessionMetrics, durationMs: number): StreamStats {
     let totalTokens = 0;
     let inputTokens = 0;
     let outputTokens = 0;
diff --git a/packages/gemini-cli-core/src/output/types.ts b/packages/gemini-cli-core/src/output/types.ts
index 81de667b2..5b29708e5 100644
--- a/packages/gemini-cli-core/src/output/types.ts
+++ b/packages/gemini-cli-core/src/output/types.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
 
 export enum OutputFormat {
-  TEXT = 'text',
-  JSON = 'json',
-  STREAM_JSON = 'stream-json',
+  TEXT = "text",
+  JSON = "json",
+  STREAM_JSON = "stream-json",
 }
 
 export interface JsonError {
@@ -27,12 +27,12 @@ export interface JsonOutput {
 
 // Streaming JSON event types
 export enum JsonStreamEventType {
-  INIT = 'init',
-  MESSAGE = 'message',
-  TOOL_USE = 'tool_use',
-  TOOL_RESULT = 'tool_result',
-  ERROR = 'error',
-  RESULT = 'result',
+  INIT = "init",
+  MESSAGE = "message",
+  TOOL_USE = "tool_use",
+  TOOL_RESULT = "tool_result",
+  ERROR = "error",
+  RESULT = "result",
 }
 
 export interface BaseJsonStreamEvent {
@@ -48,7 +48,7 @@ export interface InitEvent extends BaseJsonStreamEvent {
 
 export interface MessageEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.MESSAGE;
-  role: 'user' | 'assistant';
+  role: "user" | "assistant";
   content: string;
   delta?: boolean;
 }
@@ -63,7 +63,7 @@ export interface ToolUseEvent extends BaseJsonStreamEvent {
 export interface ToolResultEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.TOOL_RESULT;
   tool_id: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
   output?: string;
   error?: {
     type: string;
@@ -73,7 +73,7 @@ export interface ToolResultEvent extends BaseJsonStreamEvent {
 
 export interface ErrorEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.ERROR;
-  severity: 'warning' | 'error';
+  severity: "warning" | "error";
   message: string;
 }
 
@@ -87,7 +87,7 @@ export interface StreamStats {
 
 export interface ResultEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.RESULT;
-  status: 'success' | 'error';
+  status: "success" | "error";
   error?: {
     type: string;
     message: string;
diff --git a/packages/gemini-cli-core/src/policy/config.test.ts b/packages/gemini-cli-core/src/policy/config.test.ts
index b8e76f73b..3bdfe002e 100644
--- a/packages/gemini-cli-core/src/policy/config.test.ts
+++ b/packages/gemini-cli-core/src/policy/config.test.ts
@@ -4,59 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
-
-import nodePath from 'node:path';
-
-import type { PolicySettings } from './types.js';
-import { ApprovalMode, PolicyDecision, InProcessCheckerType } from './types.js';
-
-import { Storage } from '../config/storage.js';
+import nodePath from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Storage } from "../config/storage.js";
+import type { PolicySettings } from "./types.js";
+import { ApprovalMode, InProcessCheckerType, PolicyDecision } from "./types.js";
 
 afterEach(() => {
   vi.clearAllMocks();
   vi.restoreAllMocks();
-  vi.doUnmock('node:fs/promises');
+  vi.doUnmock("node:fs/promises");
 });
 
-describe('createPolicyEngineConfig', () => {
+describe("createPolicyEngineConfig", () => {
   beforeEach(() => {
     // Mock Storage to avoid picking up real user/system policies from the host environment
-    vi.spyOn(Storage, 'getUserPoliciesDir').mockReturnValue(
-      '/non/existent/user/policies',
-    );
-    vi.spyOn(Storage, 'getSystemPoliciesDir').mockReturnValue(
-      '/non/existent/system/policies',
-    );
+    vi.spyOn(Storage, "getUserPoliciesDir").mockReturnValue("/non/existent/user/policies");
+    vi.spyOn(Storage, "getSystemPoliciesDir").mockReturnValue("/non/existent/system/policies");
   });
-  it('should return ASK_USER for write tools and ALLOW for read-only tools by default', async () => {
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+  it("should return ASK_USER for write tools and ALLOW for read-only tools by default", async () => {
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
     const mockReaddir = vi.fn(
-      async (
-        path: string | Buffer | URL,
-        options?: Parameters<typeof actualFs.readdir>[1],
-      ) => {
+      async (path: string | Buffer | URL, options?: Parameters<typeof actualFs.readdir>[1]) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies"))
         ) {
           // Return empty array for user policies
           return [] as unknown as Awaited<ReturnType<typeof actualFs.readdir>>;
         }
-        return actualFs.readdir(
-          path,
-          options as Parameters<typeof actualFs.readdir>[1],
-        );
+        return actualFs.readdir(path, options as Parameters<typeof actualFs.readdir>[1]);
       },
     );
 
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readdir: mockReaddir },
       readdir: mockReaddir,
@@ -67,20 +49,18 @@ describe('createPolicyEngineConfig', () => {
     // Let's see if we need to mock Storage.getUserPoliciesDir etc.
 
     vi.resetModules();
-    const { createPolicyEngineConfig } = await import('./config.js');
+    const { createPolicyEngineConfig } = await import("./config.js");
 
     const settings: PolicySettings = {};
     // Pass a dummy default policies dir to avoid it trying to resolve __dirname relative to the test file in a weird way
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     expect(config.defaultDecision).toBe(PolicyDecision.ASK_USER);
     // The order of the rules is not guaranteed, so we sort them by tool name.
-    config.rules?.sort((a, b) =>
-      (a.toolName ?? '').localeCompare(b.toolName ?? ''),
-    );
+    config.rules?.sort((a, b) => (a.toolName ?? "").localeCompare(b.toolName ?? ""));
 
     // Since we are mocking an empty policy directory, we expect NO rules from TOML.
     // Wait, the CLI test expected a bunch of default rules. Those must have come from
@@ -97,91 +77,85 @@ describe('createPolicyEngineConfig', () => {
 
     expect(config.rules).toEqual([]);
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should allow tools in tools.allowed', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow tools in tools.allowed", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      tools: { allowed: ['run_shell_command'] },
+      tools: { allowed: ["run_shell_command"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBeCloseTo(2.3, 5); // Command line allow
   });
 
-  it('should deny tools in tools.exclude', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should deny tools in tools.exclude", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      tools: { exclude: ['run_shell_command'] },
+      tools: { exclude: ["run_shell_command"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.DENY,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBeCloseTo(2.4, 5); // Command line exclude
   });
 
-  it('should allow tools from allowed MCP servers', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow tools from allowed MCP servers", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { allowed: ['my-server'] },
+      mcp: { allowed: ["my-server"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBe(2.1); // MCP allowed server
   });
 
-  it('should deny tools from excluded MCP servers', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should deny tools from excluded MCP servers", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { excluded: ['my-server'] },
+      mcp: { excluded: ["my-server"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.DENY,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBe(2.9); // MCP excluded server
   });
 
-  it('should allow tools from trusted MCP servers', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow tools from trusted MCP servers", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
       mcpServers: {
-        'trusted-server': {
+        "trusted-server": {
           trust: true,
         },
-        'untrusted-server': {
+        "untrusted-server": {
           trust: false,
         },
       },
@@ -189,35 +163,31 @@ describe('createPolicyEngineConfig', () => {
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const trustedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'trusted-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "trusted-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(trustedRule).toBeDefined();
     expect(trustedRule?.priority).toBe(2.2); // MCP trusted server
 
     // Untrusted server should not have an allow rule
     const untrustedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'untrusted-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "untrusted-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(untrustedRule).toBeUndefined();
   });
 
-  it('should handle multiple MCP server configurations together', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should handle multiple MCP server configurations together", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
       mcp: {
-        allowed: ['allowed-server'],
-        excluded: ['excluded-server'],
+        allowed: ["allowed-server"],
+        excluded: ["excluded-server"],
       },
       mcpServers: {
-        'trusted-server': {
+        "trusted-server": {
           trust: true,
         },
       },
@@ -225,109 +195,91 @@ describe('createPolicyEngineConfig', () => {
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     // Check allowed server
     const allowedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'allowed-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "allowed-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(allowedRule).toBeDefined();
     expect(allowedRule?.priority).toBe(2.1); // MCP allowed server
 
     // Check trusted server
     const trustedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'trusted-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "trusted-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(trustedRule).toBeDefined();
     expect(trustedRule?.priority).toBe(2.2); // MCP trusted server
 
     // Check excluded server
     const excludedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'excluded-server__*' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "excluded-server__*" && r.decision === PolicyDecision.DENY,
     );
     expect(excludedRule).toBeDefined();
     expect(excludedRule?.priority).toBe(2.9); // MCP excluded server
   });
 
-  it('should allow all tools in YOLO mode', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow all tools in YOLO mode", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {};
     const config = await createPolicyEngineConfig(settings, ApprovalMode.YOLO);
-    const rule = config.rules?.find(
-      (r) => r.decision === PolicyDecision.ALLOW && !r.toolName,
-    );
+    const rule = config.rules?.find((r) => r.decision === PolicyDecision.ALLOW && !r.toolName);
     expect(rule).toBeDefined();
     // Priority 999 in default tier → 1.999
     expect(rule?.priority).toBeCloseTo(1.999, 5);
   });
 
-  it('should allow edit tool in AUTO_EDIT mode', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow edit tool in AUTO_EDIT mode", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {};
-    const config = await createPolicyEngineConfig(
-      settings,
-      ApprovalMode.AUTO_EDIT,
-    );
+    const config = await createPolicyEngineConfig(settings, ApprovalMode.AUTO_EDIT);
     const rule = config.rules?.find(
-      (r) => r.toolName === 'replace' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "replace" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     // Priority 15 in default tier → 1.015
     expect(rule?.priority).toBeCloseTo(1.015, 5);
   });
 
-  it('should prioritize exclude over allow', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should prioritize exclude over allow", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      tools: { allowed: ['run_shell_command'], exclude: ['run_shell_command'] },
+      tools: { allowed: ["run_shell_command"], exclude: ["run_shell_command"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const denyRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.DENY,
     );
     const allowRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.ALLOW,
     );
     expect(denyRule).toBeDefined();
     expect(allowRule).toBeDefined();
     expect(denyRule!.priority).toBeGreaterThan(allowRule!.priority!);
   });
 
-  it('should prioritize specific tool allows over MCP server excludes', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should prioritize specific tool allows over MCP server excludes", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { excluded: ['my-server'] },
-      tools: { allowed: ['my-server__specific-tool'] },
+      mcp: { excluded: ["my-server"] },
+      tools: { allowed: ["my-server__specific-tool"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const serverDenyRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.DENY,
     );
     const toolAllowRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__specific-tool' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "my-server__specific-tool" && r.decision === PolicyDecision.ALLOW,
     );
 
     expect(serverDenyRule).toBeDefined();
@@ -339,31 +291,28 @@ describe('createPolicyEngineConfig', () => {
     // so server deny wins (this is expected behavior - server-level blocks are security critical)
   });
 
-  it('should handle MCP server allows and tool excludes', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should handle MCP server allows and tool excludes", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { allowed: ['my-server'] },
+      mcp: { allowed: ["my-server"] },
       mcpServers: {
-        'my-server': {
+        "my-server": {
           trust: true,
         },
       },
-      tools: { exclude: ['my-server__dangerous-tool'] },
+      tools: { exclude: ["my-server__dangerous-tool"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const serverAllowRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     const toolDenyRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__dangerous-tool' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "my-server__dangerous-tool" && r.decision === PolicyDecision.DENY,
     );
 
     expect(serverAllowRule).toBeDefined();
@@ -373,33 +322,30 @@ describe('createPolicyEngineConfig', () => {
     expect(toolDenyRule!.priority).toBeGreaterThan(serverAllowRule!.priority!);
   });
 
-  it('should handle complex priority scenarios correctly', async () => {
+  it("should handle complex priority scenarios correctly", async () => {
     const settings: PolicySettings = {
       tools: {
-        allowed: ['my-server__tool1', 'other-tool'], // Priority 2.3
-        exclude: ['my-server__tool2', 'glob'], // Priority 2.4
+        allowed: ["my-server__tool1", "other-tool"], // Priority 2.3
+        exclude: ["my-server__tool2", "glob"], // Priority 2.4
       },
       mcp: {
-        allowed: ['allowed-server'], // Priority 2.1
-        excluded: ['excluded-server'], // Priority 2.9
+        allowed: ["allowed-server"], // Priority 2.1
+        excluded: ["excluded-server"], // Priority 2.9
       },
       mcpServers: {
-        'trusted-server': {
+        "trusted-server": {
           trust: true, // Priority 90 -> 2.2
         },
       },
     };
 
     // Mock a default policy for 'glob' to test priority override
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
     const mockReaddir = vi.fn(async (p, _o) => {
-      if (typeof p === 'string' && p.includes('/tmp/mock/default/policies')) {
+      if (typeof p === "string" && p.includes("/tmp/mock/default/policies")) {
         return [
           {
-            name: 'default.toml',
+            name: "default.toml",
             isFile: () => true,
             isDirectory: () => false,
           },
@@ -408,34 +354,28 @@ describe('createPolicyEngineConfig', () => {
       return [];
     });
     const mockReadFile = vi.fn(async (p, _o) => {
-      if (typeof p === 'string' && p.includes('default.toml')) {
+      if (typeof p === "string" && p.includes("default.toml")) {
         return '[[rule]]\ntoolName = "glob"\ndecision = "allow"\npriority = 50\n';
       }
-      return '';
+      return "";
     });
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readdir: mockReaddir, readFile: mockReadFile },
       readdir: mockReaddir,
       readFile: mockReadFile,
     }));
     vi.resetModules();
-    const { createPolicyEngineConfig: createConfig } = await import(
-      './config.js'
-    );
+    const { createPolicyEngineConfig: createConfig } = await import("./config.js");
 
-    const config = await createConfig(
-      settings,
-      ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
-    );
+    const config = await createConfig(settings, ApprovalMode.DEFAULT, "/tmp/mock/default/policies");
 
     // Verify glob is denied even though default would allow it
     const globDenyRule = config.rules?.find(
-      (r) => r.toolName === 'glob' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "glob" && r.decision === PolicyDecision.DENY,
     );
     const globAllowRule = config.rules?.find(
-      (r) => r.toolName === 'glob' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "glob" && r.decision === PolicyDecision.ALLOW,
     );
     expect(globDenyRule).toBeDefined();
     expect(globAllowRule).toBeDefined();
@@ -455,25 +395,21 @@ describe('createPolicyEngineConfig', () => {
 
     // Check that the highest priority items are the excludes (user tier: 2.4 and 2.9)
     const highestPriorityExcludes = priorities?.filter(
-      (p) =>
-        Math.abs(p.priority! - 2.4) < 0.01 ||
-        Math.abs(p.priority! - 2.9) < 0.01,
+      (p) => Math.abs(p.priority! - 2.4) < 0.01 || Math.abs(p.priority! - 2.9) < 0.01,
     );
-    expect(
-      highestPriorityExcludes?.every((p) => p.decision === PolicyDecision.DENY),
-    ).toBe(true);
+    expect(highestPriorityExcludes?.every((p) => p.decision === PolicyDecision.DENY)).toBe(true);
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should handle MCP servers with undefined trust property', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should handle MCP servers with undefined trust property", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
       mcpServers: {
-        'no-trust-property': {
+        "no-trust-property": {
           // trust property is undefined/missing
         },
-        'explicit-false': {
+        "explicit-false": {
           trust: false,
         },
       },
@@ -481,42 +417,32 @@ describe('createPolicyEngineConfig', () => {
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     // Neither server should have an allow rule
     const noTrustRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'no-trust-property__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "no-trust-property__*" && r.decision === PolicyDecision.ALLOW,
     );
     const explicitFalseRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'explicit-false__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "explicit-false__*" && r.decision === PolicyDecision.ALLOW,
     );
 
     expect(noTrustRule).toBeUndefined();
     expect(explicitFalseRule).toBeUndefined();
   });
 
-  it('should have YOLO allow-all rule beat write tool rules in YOLO mode', async () => {
+  it("should have YOLO allow-all rule beat write tool rules in YOLO mode", async () => {
     vi.resetModules();
-    vi.doUnmock('node:fs/promises');
-    const { createPolicyEngineConfig: createConfig } = await import(
-      './config.js'
-    );
+    vi.doUnmock("node:fs/promises");
+    const { createPolicyEngineConfig: createConfig } = await import("./config.js");
     // Re-mock Storage after resetModules because it was reloaded
-    const { Storage: FreshStorage } = await import('../config/storage.js');
-    vi.spyOn(FreshStorage, 'getUserPoliciesDir').mockReturnValue(
-      '/non/existent/user/policies',
-    );
-    vi.spyOn(FreshStorage, 'getSystemPoliciesDir').mockReturnValue(
-      '/non/existent/system/policies',
-    );
+    const { Storage: FreshStorage } = await import("../config/storage.js");
+    vi.spyOn(FreshStorage, "getUserPoliciesDir").mockReturnValue("/non/existent/user/policies");
+    vi.spyOn(FreshStorage, "getSystemPoliciesDir").mockReturnValue("/non/existent/system/policies");
 
     const settings: PolicySettings = {
-      tools: { exclude: ['dangerous-tool'] },
+      tools: { exclude: ["dangerous-tool"] },
     };
     // Use default policy dir (no third arg) to load real yolo.toml and write.toml
     const config = await createConfig(settings, ApprovalMode.YOLO);
@@ -532,8 +458,7 @@ describe('createPolicyEngineConfig', () => {
     // Write tool ASK_USER rules are present (from write.toml)
     const writeToolRules = config.rules?.filter(
       (r) =>
-        ['run_shell_command'].includes(r.toolName || '') &&
-        r.decision === PolicyDecision.ASK_USER,
+        ["run_shell_command"].includes(r.toolName || "") && r.decision === PolicyDecision.ASK_USER,
     );
     expect(writeToolRules).toBeDefined();
     expect(writeToolRules?.length).toBeGreaterThan(0);
@@ -545,42 +470,30 @@ describe('createPolicyEngineConfig', () => {
 
     // Should still have the exclude rule (from settings, user tier)
     const excludeRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'dangerous-tool' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "dangerous-tool" && r.decision === PolicyDecision.DENY,
     );
     expect(excludeRule).toBeDefined();
     expect(excludeRule?.priority).toBeCloseTo(2.4, 5); // Command line exclude
   });
 
-  it('should support argsPattern in policy rules', async () => {
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+  it("should support argsPattern in policy rules", async () => {
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
     const mockReaddir = vi.fn(
-      async (
-        path: string | Buffer | URL,
-        options?: Parameters<typeof actualFs.readdir>[1],
-      ) => {
+      async (path: string | Buffer | URL, options?: Parameters<typeof actualFs.readdir>[1]) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies"))
         ) {
           return [
             {
-              name: 'write.toml',
+              name: "write.toml",
               isFile: () => true,
               isDirectory: () => false,
             },
           ] as unknown as Awaited<ReturnType<typeof actualFs.readdir>>;
         }
-        return actualFs.readdir(
-          path,
-          options as Parameters<typeof actualFs.readdir>[1],
-        );
+        return actualFs.readdir(path, options as Parameters<typeof actualFs.readdir>[1]);
       },
     );
 
@@ -590,10 +503,8 @@ describe('createPolicyEngineConfig', () => {
         options: Parameters<typeof actualFs.readFile>[1],
       ) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies/write.toml'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies/write.toml"))
         ) {
           return `
 [[rule]]
@@ -607,7 +518,7 @@ priority = 150
       },
     );
 
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readFile: mockReadFile, readdir: mockReaddir },
       readFile: mockReadFile,
@@ -615,19 +526,17 @@ priority = 150
     }));
 
     vi.resetModules();
-    const { createPolicyEngineConfig } = await import('./config.js');
+    const { createPolicyEngineConfig } = await import("./config.js");
 
     const settings: PolicySettings = {};
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     // Priority 150 in user tier → 2.150
@@ -639,38 +548,27 @@ priority = 150
     expect(rule?.argsPattern?.test('{"command":"git commit"}')).toBe(false);
     expect(rule?.argsPattern?.test('{"command":"git push"}')).toBe(false);
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should load safety_checker configuration from TOML', async () => {
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+  it("should load safety_checker configuration from TOML", async () => {
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
     const mockReaddir = vi.fn(
-      async (
-        path: string | Buffer | URL,
-        options?: Parameters<typeof actualFs.readdir>[1],
-      ) => {
+      async (path: string | Buffer | URL, options?: Parameters<typeof actualFs.readdir>[1]) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies"))
         ) {
           return [
             {
-              name: 'safety.toml',
+              name: "safety.toml",
               isFile: () => true,
               isDirectory: () => false,
             },
           ] as unknown as Awaited<ReturnType<typeof actualFs.readdir>>;
         }
-        return actualFs.readdir(
-          path,
-          options as Parameters<typeof actualFs.readdir>[1],
-        );
+        return actualFs.readdir(path, options as Parameters<typeof actualFs.readdir>[1]);
       },
     );
 
@@ -680,10 +578,8 @@ priority = 150
         options: Parameters<typeof actualFs.readFile>[1],
       ) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies/safety.toml'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies/safety.toml"))
         ) {
           return `
 [[rule]]
@@ -710,7 +606,7 @@ required_context = ["environment"]
       },
     );
 
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readFile: mockReadFile, readdir: mockReaddir },
       readFile: mockReadFile,
@@ -718,60 +614,49 @@ required_context = ["environment"]
     }));
 
     vi.resetModules();
-    const { createPolicyEngineConfig } = await import('./config.js');
+    const { createPolicyEngineConfig } = await import("./config.js");
 
     const settings: PolicySettings = {};
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const rule = config.rules?.find(
-      (r) => r.toolName === 'write_file' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "write_file" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
 
     const checker = config.checkers?.find(
-      (c) => c.toolName === 'write_file' && c.checker.type === 'in-process',
+      (c) => c.toolName === "write_file" && c.checker.type === "in-process",
     );
     expect(checker).toBeDefined();
-    expect(checker?.checker.type).toBe('in-process');
+    expect(checker?.checker.type).toBe("in-process");
     expect(checker?.checker.name).toBe(InProcessCheckerType.ALLOWED_PATH);
-    expect(checker?.checker.required_context).toEqual(['environment']);
+    expect(checker?.checker.required_context).toEqual(["environment"]);
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should reject invalid in-process checker names', async () => {
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+  it("should reject invalid in-process checker names", async () => {
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
     const mockReaddir = vi.fn(
-      async (
-        path: string | Buffer | URL,
-        options?: Parameters<typeof actualFs.readdir>[1],
-      ) => {
+      async (path: string | Buffer | URL, options?: Parameters<typeof actualFs.readdir>[1]) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies"))
         ) {
           return [
             {
-              name: 'invalid_safety.toml',
+              name: "invalid_safety.toml",
               isFile: () => true,
               isDirectory: () => false,
             },
           ] as unknown as Awaited<ReturnType<typeof actualFs.readdir>>;
         }
-        return actualFs.readdir(
-          path,
-          options as Parameters<typeof actualFs.readdir>[1],
-        );
+        return actualFs.readdir(path, options as Parameters<typeof actualFs.readdir>[1]);
       },
     );
 
@@ -781,12 +666,10 @@ required_context = ["environment"]
         options: Parameters<typeof actualFs.readFile>[1],
       ) => {
         if (
-          typeof path === 'string' &&
+          typeof path === "string" &&
           nodePath
             .normalize(path)
-            .includes(
-              nodePath.normalize('.gemini/policies/invalid_safety.toml'),
-            )
+            .includes(nodePath.normalize(".gemini/policies/invalid_safety.toml"))
         ) {
           return `
 [[rule]]
@@ -806,7 +689,7 @@ name = "invalid-name"
       },
     );
 
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readFile: mockReadFile, readdir: mockReaddir },
       readFile: mockReadFile,
@@ -814,45 +697,37 @@ name = "invalid-name"
     }));
 
     vi.resetModules();
-    const { createPolicyEngineConfig } = await import('./config.js');
+    const { createPolicyEngineConfig } = await import("./config.js");
 
     const settings: PolicySettings = {};
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     // The rule should be rejected because 'invalid-name' is not in the enum
-    const rule = config.rules?.find((r) => r.toolName === 'write_file');
+    const rule = config.rules?.find((r) => r.toolName === "write_file");
     expect(rule).toBeUndefined();
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should have default ASK_USER rule for discovered tools', async () => {
+  it("should have default ASK_USER rule for discovered tools", async () => {
     vi.resetModules();
-    vi.doUnmock('node:fs/promises');
-    const { createPolicyEngineConfig: createConfig } = await import(
-      './config.js'
-    );
+    vi.doUnmock("node:fs/promises");
+    const { createPolicyEngineConfig: createConfig } = await import("./config.js");
     // Re-mock Storage after resetModules because it was reloaded
-    const { Storage: FreshStorage } = await import('../config/storage.js');
-    vi.spyOn(FreshStorage, 'getUserPoliciesDir').mockReturnValue(
-      '/non/existent/user/policies',
-    );
-    vi.spyOn(FreshStorage, 'getSystemPoliciesDir').mockReturnValue(
-      '/non/existent/system/policies',
-    );
+    const { Storage: FreshStorage } = await import("../config/storage.js");
+    vi.spyOn(FreshStorage, "getUserPoliciesDir").mockReturnValue("/non/existent/user/policies");
+    vi.spyOn(FreshStorage, "getSystemPoliciesDir").mockReturnValue("/non/existent/system/policies");
 
     const settings: PolicySettings = {};
     // Use default policy dir to load real discovered.toml
     const config = await createConfig(settings, ApprovalMode.DEFAULT);
 
     const discoveredRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'discovered_tool_*' &&
-        r.decision === PolicyDecision.ASK_USER,
+      (r) => r.toolName === "discovered_tool_*" && r.decision === PolicyDecision.ASK_USER,
     );
     expect(discoveredRule).toBeDefined();
     // Priority 10 in default tier → 1.010
diff --git a/packages/gemini-cli-core/src/policy/config.ts b/packages/gemini-cli-core/src/policy/config.ts
index 6ea78d30c..8ea41cc3f 100644
--- a/packages/gemini-cli-core/src/policy/config.ts
+++ b/packages/gemini-cli-core/src/policy/config.ts
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { Storage } from '../config/storage.js';
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import { Storage } from "../config/storage.js";
+import { type MessageBus } from "../confirmation-bus/message-bus.js";
+import { MessageBusType, type UpdatePolicy } from "../confirmation-bus/types.js";
+import { coreEvents } from "../utils/events.js";
+import type { PolicyEngine } from "./policy-engine.js";
+import { loadPoliciesFromToml, type PolicyFileError } from "./toml-loader.js";
 import {
-  type PolicyEngineConfig,
+  type ApprovalMode,
   PolicyDecision,
+  type PolicyEngineConfig,
   type PolicyRule,
-  type ApprovalMode,
   type PolicySettings,
-} from './types.js';
-import type { PolicyEngine } from './policy-engine.js';
-import { loadPoliciesFromToml, type PolicyFileError } from './toml-loader.js';
-import {
-  MessageBusType,
-  type UpdatePolicy,
-} from '../confirmation-bus/types.js';
-import { type MessageBus } from '../confirmation-bus/message-bus.js';
-import { coreEvents } from '../utils/events.js';
+} from "./types.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-export const DEFAULT_CORE_POLICIES_DIR = path.join(__dirname, 'policies');
+export const DEFAULT_CORE_POLICIES_DIR = path.join(__dirname, "policies");
 
 // Policy tier constants for priority calculation
 export const DEFAULT_POLICY_TIER = 1;
@@ -60,10 +57,7 @@ export function getPolicyDirectories(defaultPoliciesDir?: string): string[] {
  * Determines the policy tier (1=default, 2=user, 3=admin) for a given directory.
  * This is used by the TOML loader to assign priority bands.
  */
-export function getPolicyTier(
-  dir: string,
-  defaultPoliciesDir?: string,
-): number {
+export function getPolicyTier(dir: string, defaultPoliciesDir?: string): number {
   const USER_POLICIES_DIR = Storage.getUserPoliciesDir();
   const ADMIN_POLICIES_DIR = Storage.getSystemPoliciesDir();
 
@@ -71,10 +65,7 @@ export function getPolicyTier(
   const normalizedUser = path.resolve(USER_POLICIES_DIR);
   const normalizedAdmin = path.resolve(ADMIN_POLICIES_DIR);
 
-  if (
-    defaultPoliciesDir &&
-    normalizedDir === path.resolve(defaultPoliciesDir)
-  ) {
+  if (defaultPoliciesDir && normalizedDir === path.resolve(defaultPoliciesDir)) {
     return DEFAULT_POLICY_TIER;
   }
   if (normalizedDir === path.resolve(DEFAULT_CORE_POLICIES_DIR)) {
@@ -126,7 +117,7 @@ export async function createPolicyEngineConfig(
   // coreEvents has a buffer that will display these once the UI is ready
   if (errors.length > 0) {
     for (const error of errors) {
-      coreEvents.emitFeedback('error', formatPolicyError(error));
+      coreEvents.emitFeedback("error", formatPolicyError(error));
     }
   }
 
@@ -199,9 +190,7 @@ export async function createPolicyEngineConfig(
   // MCP servers that are trusted in the settings.
   // Priority: 2.2 (user tier - persistent trusted servers)
   if (settings.mcpServers) {
-    for (const [serverName, serverConfig] of Object.entries(
-      settings.mcpServers,
-    )) {
+    for (const [serverName, serverConfig] of Object.entries(settings.mcpServers)) {
       if (serverConfig.trust) {
         // Trust all tools from this MCP server
         // Using pattern matching for MCP tool names which are formatted as "serverName__toolName"
@@ -233,23 +222,17 @@ export async function createPolicyEngineConfig(
   };
 }
 
-export function createPolicyUpdater(
-  policyEngine: PolicyEngine,
-  messageBus: MessageBus,
-) {
-  messageBus.subscribe(
-    MessageBusType.UPDATE_POLICY,
-    (message: UpdatePolicy) => {
-      const toolName = message.toolName;
-
-      policyEngine.addRule({
-        toolName,
-        decision: PolicyDecision.ALLOW,
-        // User tier (2) + high priority (950/1000) = 2.95
-        // This ensures user "always allow" selections are high priority
-        // but still lose to admin policies (3.xxx) and settings excludes (200)
-        priority: 2.95,
-      });
-    },
-  );
+export function createPolicyUpdater(policyEngine: PolicyEngine, messageBus: MessageBus) {
+  messageBus.subscribe(MessageBusType.UPDATE_POLICY, (message: UpdatePolicy) => {
+    const toolName = message.toolName;
+
+    policyEngine.addRule({
+      toolName,
+      decision: PolicyDecision.ALLOW,
+      // User tier (2) + high priority (950/1000) = 2.95
+      // This ensures user "always allow" selections are high priority
+      // but still lose to admin policies (3.xxx) and settings excludes (200)
+      priority: 2.95,
+    });
+  });
 }
diff --git a/packages/gemini-cli-core/src/policy/index.ts b/packages/gemini-cli-core/src/policy/index.ts
index 483640be8..3dc347de7 100644
--- a/packages/gemini-cli-core/src/policy/index.ts
+++ b/packages/gemini-cli-core/src/policy/index.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './policy-engine.js';
-export * from './types.js';
-export * from './toml-loader.js';
-export * from './config.js';
+export * from "./config.js";
+export * from "./policy-engine.js";
+export * from "./toml-loader.js";
+export * from "./types.js";
diff --git a/packages/gemini-cli-core/src/policy/policy-engine.test.ts b/packages/gemini-cli-core/src/policy/policy-engine.test.ts
index a58725f8f..c220cb112 100644
--- a/packages/gemini-cli-core/src/policy/policy-engine.test.ts
+++ b/packages/gemini-cli-core/src/policy/policy-engine.test.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { PolicyEngine } from './policy-engine.js';
+import type { FunctionCall } from "@google/genai";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { CheckerRunner } from "../safety/checker-runner.js";
+import { SafetyCheckDecision } from "../safety/protocol.js";
+import { PolicyEngine } from "./policy-engine.js";
 import {
+  InProcessCheckerType,
   PolicyDecision,
-  type PolicyRule,
   type PolicyEngineConfig,
+  type PolicyRule,
   type SafetyCheckerRule,
-  InProcessCheckerType,
-} from './types.js';
-import type { FunctionCall } from '@google/genai';
-import { SafetyCheckDecision } from '../safety/protocol.js';
-import type { CheckerRunner } from '../safety/checker-runner.js';
+} from "./types.js";
 
-describe('PolicyEngine', () => {
+describe("PolicyEngine", () => {
   let engine: PolicyEngine;
   let mockCheckerRunner: CheckerRunner;
 
@@ -28,23 +28,23 @@ describe('PolicyEngine', () => {
     engine = new PolicyEngine({}, mockCheckerRunner);
   });
 
-  describe('constructor', () => {
-    it('should use default config when none provided', async () => {
-      const { decision } = await engine.check({ name: 'test' }, undefined);
+  describe("constructor", () => {
+    it("should use default config when none provided", async () => {
+      const { decision } = await engine.check({ name: "test" }, undefined);
       expect(decision).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should respect custom default decision', async () => {
+    it("should respect custom default decision", async () => {
       engine = new PolicyEngine({ defaultDecision: PolicyDecision.DENY });
-      const { decision } = await engine.check({ name: 'test' }, undefined);
+      const { decision } = await engine.check({ name: "test" }, undefined);
       expect(decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should sort rules by priority', () => {
+    it("should sort rules by priority", () => {
       const rules: PolicyRule[] = [
-        { toolName: 'tool1', decision: PolicyDecision.DENY, priority: 1 },
-        { toolName: 'tool2', decision: PolicyDecision.ALLOW, priority: 10 },
-        { toolName: 'tool3', decision: PolicyDecision.ASK_USER, priority: 5 },
+        { toolName: "tool1", decision: PolicyDecision.DENY, priority: 1 },
+        { toolName: "tool2", decision: PolicyDecision.ALLOW, priority: 10 },
+        { toolName: "tool3", decision: PolicyDecision.ASK_USER, priority: 5 },
       ];
 
       engine = new PolicyEngine({ rules });
@@ -56,35 +56,33 @@ describe('PolicyEngine', () => {
     });
   });
 
-  describe('check', () => {
-    it('should match tool by name', async () => {
+  describe("check", () => {
+    it("should match tool by name", async () => {
       const rules: PolicyRule[] = [
-        { toolName: 'shell', decision: PolicyDecision.ALLOW },
-        { toolName: 'edit', decision: PolicyDecision.DENY },
+        { toolName: "shell", decision: PolicyDecision.ALLOW },
+        { toolName: "edit", decision: PolicyDecision.DENY },
       ];
 
       engine = new PolicyEngine({ rules });
 
-      expect((await engine.check({ name: 'shell' }, undefined)).decision).toBe(
+      expect((await engine.check({ name: "shell" }, undefined)).decision).toBe(
         PolicyDecision.ALLOW,
       );
-      expect((await engine.check({ name: 'edit' }, undefined)).decision).toBe(
-        PolicyDecision.DENY,
-      );
-      expect((await engine.check({ name: 'other' }, undefined)).decision).toBe(
+      expect((await engine.check({ name: "edit" }, undefined)).decision).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "other" }, undefined)).decision).toBe(
         PolicyDecision.ASK_USER,
       );
     });
 
-    it('should match by args pattern', async () => {
+    it("should match by args pattern", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'shell',
+          toolName: "shell",
           argsPattern: /rm -rf/,
           decision: PolicyDecision.DENY,
         },
         {
-          toolName: 'shell',
+          toolName: "shell",
           decision: PolicyDecision.ALLOW,
         },
       ];
@@ -92,93 +90,89 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       const dangerousCall: FunctionCall = {
-        name: 'shell',
-        args: { command: 'rm -rf /' },
+        name: "shell",
+        args: { command: "rm -rf /" },
       };
 
       const safeCall: FunctionCall = {
-        name: 'shell',
-        args: { command: 'ls -la' },
+        name: "shell",
+        args: { command: "ls -la" },
       };
 
-      expect((await engine.check(dangerousCall, undefined)).decision).toBe(
-        PolicyDecision.DENY,
-      );
-      expect((await engine.check(safeCall, undefined)).decision).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect((await engine.check(dangerousCall, undefined)).decision).toBe(PolicyDecision.DENY);
+      expect((await engine.check(safeCall, undefined)).decision).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should apply rules by priority', async () => {
+    it("should apply rules by priority", async () => {
       const rules: PolicyRule[] = [
-        { toolName: 'shell', decision: PolicyDecision.DENY, priority: 1 },
-        { toolName: 'shell', decision: PolicyDecision.ALLOW, priority: 10 },
+        { toolName: "shell", decision: PolicyDecision.DENY, priority: 1 },
+        { toolName: "shell", decision: PolicyDecision.ALLOW, priority: 10 },
       ];
 
       engine = new PolicyEngine({ rules });
 
       // Higher priority rule (ALLOW) should win
-      expect((await engine.check({ name: 'shell' }, undefined)).decision).toBe(
+      expect((await engine.check({ name: "shell" }, undefined)).decision).toBe(
         PolicyDecision.ALLOW,
       );
     });
 
-    it('should apply wildcard rules (no toolName)', async () => {
+    it("should apply wildcard rules (no toolName)", async () => {
       const rules: PolicyRule[] = [
         { decision: PolicyDecision.DENY }, // Applies to all tools
-        { toolName: 'safe-tool', decision: PolicyDecision.ALLOW, priority: 10 },
+        { toolName: "safe-tool", decision: PolicyDecision.ALLOW, priority: 10 },
       ];
 
       engine = new PolicyEngine({ rules });
 
-      expect(
-        (await engine.check({ name: 'safe-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'any-other-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "safe-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "any-other-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle non-interactive mode', async () => {
+    it("should handle non-interactive mode", async () => {
       const config: PolicyEngineConfig = {
         nonInteractive: true,
         rules: [
-          { toolName: 'interactive-tool', decision: PolicyDecision.ASK_USER },
-          { toolName: 'allowed-tool', decision: PolicyDecision.ALLOW },
+          { toolName: "interactive-tool", decision: PolicyDecision.ASK_USER },
+          { toolName: "allowed-tool", decision: PolicyDecision.ALLOW },
         ],
       };
 
       engine = new PolicyEngine(config);
 
       // ASK_USER should become DENY in non-interactive mode
-      expect(
-        (await engine.check({ name: 'interactive-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "interactive-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
       // ALLOW should remain ALLOW
-      expect(
-        (await engine.check({ name: 'allowed-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "allowed-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
       // Default ASK_USER should also become DENY
-      expect(
-        (await engine.check({ name: 'unknown-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "unknown-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
   });
 
-  describe('addRule', () => {
-    it('should add a new rule and maintain priority order', () => {
+  describe("addRule", () => {
+    it("should add a new rule and maintain priority order", () => {
       engine.addRule({
-        toolName: 'tool1',
+        toolName: "tool1",
         decision: PolicyDecision.ALLOW,
         priority: 5,
       });
       engine.addRule({
-        toolName: 'tool2',
+        toolName: "tool2",
         decision: PolicyDecision.DENY,
         priority: 10,
       });
       engine.addRule({
-        toolName: 'tool3',
+        toolName: "tool3",
         decision: PolicyDecision.ASK_USER,
         priority: 1,
       });
@@ -190,73 +184,73 @@ describe('PolicyEngine', () => {
       expect(rules[2].priority).toBe(1);
     });
 
-    it('should apply newly added rules', async () => {
-      expect(
-        (await engine.check({ name: 'new-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+    it("should apply newly added rules", async () => {
+      expect((await engine.check({ name: "new-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
 
-      engine.addRule({ toolName: 'new-tool', decision: PolicyDecision.ALLOW });
+      engine.addRule({ toolName: "new-tool", decision: PolicyDecision.ALLOW });
 
-      expect(
-        (await engine.check({ name: 'new-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "new-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
     });
   });
 
-  describe('removeRulesForTool', () => {
-    it('should remove rules for specific tool', () => {
-      engine.addRule({ toolName: 'tool1', decision: PolicyDecision.ALLOW });
-      engine.addRule({ toolName: 'tool2', decision: PolicyDecision.DENY });
+  describe("removeRulesForTool", () => {
+    it("should remove rules for specific tool", () => {
+      engine.addRule({ toolName: "tool1", decision: PolicyDecision.ALLOW });
+      engine.addRule({ toolName: "tool2", decision: PolicyDecision.DENY });
       engine.addRule({
-        toolName: 'tool1',
+        toolName: "tool1",
         decision: PolicyDecision.ASK_USER,
         priority: 10,
       });
 
       expect(engine.getRules()).toHaveLength(3);
 
-      engine.removeRulesForTool('tool1');
+      engine.removeRulesForTool("tool1");
 
       const remainingRules = engine.getRules();
       expect(remainingRules).toHaveLength(1);
-      expect(remainingRules.some((r) => r.toolName === 'tool1')).toBe(false);
-      expect(remainingRules.some((r) => r.toolName === 'tool2')).toBe(true);
+      expect(remainingRules.some((r) => r.toolName === "tool1")).toBe(false);
+      expect(remainingRules.some((r) => r.toolName === "tool2")).toBe(true);
     });
 
-    it('should handle removing non-existent tool', () => {
-      engine.addRule({ toolName: 'existing', decision: PolicyDecision.ALLOW });
+    it("should handle removing non-existent tool", () => {
+      engine.addRule({ toolName: "existing", decision: PolicyDecision.ALLOW });
 
-      expect(() => engine.removeRulesForTool('non-existent')).not.toThrow();
+      expect(() => engine.removeRulesForTool("non-existent")).not.toThrow();
       expect(engine.getRules()).toHaveLength(1);
     });
   });
 
-  describe('getRules', () => {
-    it('should return readonly array of rules', () => {
+  describe("getRules", () => {
+    it("should return readonly array of rules", () => {
       const rules: PolicyRule[] = [
-        { toolName: 'tool1', decision: PolicyDecision.ALLOW },
-        { toolName: 'tool2', decision: PolicyDecision.DENY },
+        { toolName: "tool1", decision: PolicyDecision.ALLOW },
+        { toolName: "tool2", decision: PolicyDecision.DENY },
       ];
 
       engine = new PolicyEngine({ rules });
 
       const retrievedRules = engine.getRules();
       expect(retrievedRules).toHaveLength(2);
-      expect(retrievedRules[0].toolName).toBe('tool1');
-      expect(retrievedRules[1].toolName).toBe('tool2');
+      expect(retrievedRules[0].toolName).toBe("tool1");
+      expect(retrievedRules[1].toolName).toBe("tool2");
     });
   });
 
-  describe('MCP server wildcard patterns', () => {
-    it('should match MCP server wildcard patterns', async () => {
+  describe("MCP server wildcard patterns", () => {
+    it("should match MCP server wildcard patterns", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'my-server__*',
+          toolName: "my-server__*",
           decision: PolicyDecision.ALLOW,
           priority: 10,
         },
         {
-          toolName: 'blocked-server__*',
+          toolName: "blocked-server__*",
           decision: PolicyDecision.DENY,
           priority: 20,
         },
@@ -265,46 +259,42 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Should match my-server tools
-      expect(
-        (await engine.check({ name: 'my-server__tool1' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'my-server__another_tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "my-server__tool1" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "my-server__another_tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // Should match blocked-server tools
-      expect(
-        (await engine.check({ name: 'blocked-server__tool1' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'blocked-server__dangerous' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "blocked-server__tool1" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "blocked-server__dangerous" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
 
       // Should not match other patterns
-      expect(
-        (await engine.check({ name: 'other-server__tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ASK_USER);
-      expect(
-        (await engine.check({ name: 'my-server-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER); // No __ separator
-      expect(
-        (await engine.check({ name: 'my-server' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER); // No tool name
+      expect((await engine.check({ name: "other-server__tool" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
+      expect((await engine.check({ name: "my-server-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      ); // No __ separator
+      expect((await engine.check({ name: "my-server" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      ); // No tool name
     });
 
-    it('should prioritize specific tool rules over server wildcards', async () => {
+    it("should prioritize specific tool rules over server wildcards", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'my-server__*',
+          toolName: "my-server__*",
           decision: PolicyDecision.ALLOW,
           priority: 10,
         },
         {
-          toolName: 'my-server__dangerous-tool',
+          toolName: "my-server__dangerous-tool",
           decision: PolicyDecision.DENY,
           priority: 20,
         },
@@ -313,77 +303,74 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Specific tool deny should override server allow
-      expect(
-        (await engine.check({ name: 'my-server__dangerous-tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'my-server__safe-tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "my-server__dangerous-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "my-server__safe-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
     });
 
-    it('should NOT match spoofed server names when using wildcards', async () => {
+    it("should NOT match spoofed server names when using wildcards", async () => {
       // Vulnerability: A rule for 'prefix__*' matches 'prefix__suffix__tool'
       // effectively allowing a server named 'prefix__suffix' to spoof 'prefix'.
       const rules: PolicyRule[] = [
         {
-          toolName: 'safe_server__*',
+          toolName: "safe_server__*",
           decision: PolicyDecision.ALLOW,
         },
       ];
       engine = new PolicyEngine({ rules });
 
       // A tool from a different server 'safe_server__malicious'
-      const spoofedToolCall = { name: 'safe_server__malicious__tool' };
+      const spoofedToolCall = { name: "safe_server__malicious__tool" };
 
       // CURRENT BEHAVIOR (FIXED): Matches because it starts with 'safe_server__' BUT serverName doesn't match 'safe_server'
       // We expect this to FAIL matching the ALLOW rule, thus falling back to default (ASK_USER)
-      expect(
-        (await engine.check(spoofedToolCall, 'safe_server__malicious'))
-          .decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check(spoofedToolCall, "safe_server__malicious")).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should verify tool name prefix even if serverName matches', async () => {
+    it("should verify tool name prefix even if serverName matches", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'safe_server__*',
+          toolName: "safe_server__*",
           decision: PolicyDecision.ALLOW,
         },
       ];
       engine = new PolicyEngine({ rules });
 
       // serverName matches, but tool name does not start with prefix
-      const invalidToolCall = { name: 'other_server__tool' };
-      expect(
-        (await engine.check(invalidToolCall, 'safe_server')).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      const invalidToolCall = { name: "other_server__tool" };
+      expect((await engine.check(invalidToolCall, "safe_server")).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should allow when both serverName and tool name prefix match', async () => {
+    it("should allow when both serverName and tool name prefix match", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'safe_server__*',
+          toolName: "safe_server__*",
           decision: PolicyDecision.ALLOW,
         },
       ];
       engine = new PolicyEngine({ rules });
 
-      const validToolCall = { name: 'safe_server__tool' };
-      expect((await engine.check(validToolCall, 'safe_server')).decision).toBe(
+      const validToolCall = { name: "safe_server__tool" };
+      expect((await engine.check(validToolCall, "safe_server")).decision).toBe(
         PolicyDecision.ALLOW,
       );
     });
   });
 
-  describe('complex scenarios', () => {
-    it('should handle multiple matching rules with different priorities', async () => {
+  describe("complex scenarios", () => {
+    it("should handle multiple matching rules with different priorities", async () => {
       const rules: PolicyRule[] = [
         { decision: PolicyDecision.DENY, priority: 0 }, // Default deny all
-        { toolName: 'shell', decision: PolicyDecision.ASK_USER, priority: 5 },
+        { toolName: "shell", decision: PolicyDecision.ASK_USER, priority: 5 },
         {
-          toolName: 'shell',
+          toolName: "shell",
           argsPattern: /"command":"ls/,
           decision: PolicyDecision.ALLOW,
           priority: 10,
@@ -394,34 +381,22 @@ describe('PolicyEngine', () => {
 
       // Matches highest priority rule (ls command)
       expect(
-        (
-          await engine.check(
-            { name: 'shell', args: { command: 'ls -la' } },
-            undefined,
-          )
-        ).decision,
+        (await engine.check({ name: "shell", args: { command: "ls -la" } }, undefined)).decision,
       ).toBe(PolicyDecision.ALLOW);
 
       // Matches middle priority rule (shell without ls)
       expect(
-        (
-          await engine.check(
-            { name: 'shell', args: { command: 'pwd' } },
-            undefined,
-          )
-        ).decision,
+        (await engine.check({ name: "shell", args: { command: "pwd" } }, undefined)).decision,
       ).toBe(PolicyDecision.ASK_USER);
 
       // Matches lowest priority rule (not shell)
-      expect((await engine.check({ name: 'edit' }, undefined)).decision).toBe(
-        PolicyDecision.DENY,
-      );
+      expect((await engine.check({ name: "edit" }, undefined)).decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should handle tools with no args', async () => {
+    it("should handle tools with no args", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'read',
+          toolName: "read",
           argsPattern: /secret/,
           decision: PolicyDecision.DENY,
         },
@@ -430,35 +405,25 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Tool call without args should not match pattern
-      expect((await engine.check({ name: 'read' }, undefined)).decision).toBe(
+      expect((await engine.check({ name: "read" }, undefined)).decision).toBe(
         PolicyDecision.ASK_USER,
       );
 
       // Tool call with args not matching pattern
       expect(
-        (
-          await engine.check(
-            { name: 'read', args: { file: 'public.txt' } },
-            undefined,
-          )
-        ).decision,
+        (await engine.check({ name: "read", args: { file: "public.txt" } }, undefined)).decision,
       ).toBe(PolicyDecision.ASK_USER);
 
       // Tool call with args matching pattern
       expect(
-        (
-          await engine.check(
-            { name: 'read', args: { file: 'secret.txt' } },
-            undefined,
-          )
-        ).decision,
+        (await engine.check({ name: "read", args: { file: "secret.txt" } }, undefined)).decision,
       ).toBe(PolicyDecision.DENY);
     });
 
-    it('should match args pattern regardless of property order', async () => {
+    it("should match args pattern regardless of property order", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'shell',
+          toolName: "shell",
           // Pattern matches the stable stringified format
           argsPattern: /"command":"rm[^"]*-rf/,
           decision: PolicyDecision.DENY,
@@ -468,30 +433,27 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Same args with different property order should both match
-      const args1 = { command: 'rm -rf /', path: '/home' };
-      const args2 = { path: '/home', command: 'rm -rf /' };
+      const args1 = { command: "rm -rf /", path: "/home" };
+      const args2 = { path: "/home", command: "rm -rf /" };
 
-      expect(
-        (await engine.check({ name: 'shell', args: args1 }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'shell', args: args2 }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "shell", args: args1 }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "shell", args: args2 }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
 
       // Verify safe command doesn't match
-      const safeArgs = { command: 'ls -la', path: '/home' };
-      expect(
-        (await engine.check({ name: 'shell', args: safeArgs }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      const safeArgs = { command: "ls -la", path: "/home" };
+      expect((await engine.check({ name: "shell", args: safeArgs }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should handle nested objects in args with stable stringification', async () => {
+    it("should handle nested objects in args with stable stringification", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'api',
+          toolName: "api",
           argsPattern: /"sensitive":true/,
           decision: PolicyDecision.DENY,
         },
@@ -501,26 +463,26 @@ describe('PolicyEngine', () => {
 
       // Nested objects with different key orders should match consistently
       const args1 = {
-        data: { sensitive: true, value: 'secret' },
-        method: 'POST',
+        data: { sensitive: true, value: "secret" },
+        method: "POST",
       };
       const args2 = {
-        method: 'POST',
-        data: { value: 'secret', sensitive: true },
+        method: "POST",
+        data: { value: "secret", sensitive: true },
       };
 
-      expect(
-        (await engine.check({ name: 'api', args: args1 }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'api', args: args2 }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "api", args: args1 }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "api", args: args2 }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle circular references without stack overflow', async () => {
+    it("should handle circular references without stack overflow", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /\[Circular\]/,
           decision: PolicyDecision.DENY,
         },
@@ -533,36 +495,33 @@ describe('PolicyEngine', () => {
         data?: Record<string, unknown>;
       };
       const circularArgs: CircularArgs = {
-        name: 'test',
+        name: "test",
         data: {},
       };
       // Create circular reference - TypeScript allows this since data is Record<string, unknown>
-      (circularArgs.data as Record<string, unknown>)['self'] =
-        circularArgs.data;
+      (circularArgs.data as Record<string, unknown>)["self"] = circularArgs.data;
 
       // Should not throw stack overflow error
       await expect(
-        engine.check({ name: 'test', args: circularArgs }, undefined),
+        engine.check({ name: "test", args: circularArgs }, undefined),
       ).resolves.not.toThrow();
 
       // Should detect the circular reference pattern
-      expect(
-        (await engine.check({ name: 'test', args: circularArgs }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "test", args: circularArgs }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
 
       // Non-circular object should not match
-      const normalArgs = { name: 'test', data: { value: 'normal' } };
-      expect(
-        (await engine.check({ name: 'test', args: normalArgs }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      const normalArgs = { name: "test", data: { value: "normal" } };
+      expect((await engine.check({ name: "test", args: normalArgs }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should handle deep circular references', async () => {
+    it("should handle deep circular references", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'deep',
+          toolName: "deep",
           argsPattern: /\[Circular\]/,
           decision: PolicyDecision.DENY,
         },
@@ -587,29 +546,28 @@ describe('PolicyEngine', () => {
       };
       // Create circular reference with proper type assertions
       const level3 = deepCircular.level1!.level2!.level3!;
-      level3['back'] = deepCircular.level1;
+      level3["back"] = deepCircular.level1;
 
       // Should handle without stack overflow
       await expect(
-        engine.check({ name: 'deep', args: deepCircular }, undefined),
+        engine.check({ name: "deep", args: deepCircular }, undefined),
       ).resolves.not.toThrow();
 
       // Should detect the circular reference
-      expect(
-        (await engine.check({ name: 'deep', args: deepCircular }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "deep", args: deepCircular }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle repeated non-circular objects correctly', async () => {
+    it("should handle repeated non-circular objects correctly", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /\[Circular\]/,
           decision: PolicyDecision.DENY,
         },
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"value":"shared"/,
           decision: PolicyDecision.ALLOW,
           priority: 10,
@@ -619,7 +577,7 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Create an object with repeated references but no cycles
-      const sharedObj = { value: 'shared' };
+      const sharedObj = { value: "shared" };
       const args = {
         first: sharedObj,
         second: sharedObj,
@@ -627,15 +585,15 @@ describe('PolicyEngine', () => {
       };
 
       // Should NOT mark repeated objects as circular, and should match the shared value pattern
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
     });
 
-    it('should omit undefined and function values from objects', async () => {
+    it("should omit undefined and function values from objects", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"definedValue":"test"/,
           decision: PolicyDecision.ALLOW,
         },
@@ -644,48 +602,48 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       const args = {
-        definedValue: 'test',
+        definedValue: "test",
         undefinedValue: undefined,
-        functionValue: () => 'hello',
+        functionValue: () => "hello",
         nullValue: null,
       };
 
       // Should match pattern with defined value, undefined and functions omitted
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // Check that the pattern would NOT match if undefined was included
       const rulesWithUndefined: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /undefinedValue/,
           decision: PolicyDecision.DENY,
         },
       ];
       engine = new PolicyEngine({ rules: rulesWithUndefined });
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
 
       // Check that the pattern would NOT match if function was included
       const rulesWithFunction: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /functionValue/,
           decision: PolicyDecision.DENY,
         },
       ];
       engine = new PolicyEngine({ rules: rulesWithFunction });
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should convert undefined and functions to null in arrays', async () => {
+    it("should convert undefined and functions to null in arrays", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /\["value",null,null,null\]/,
           decision: PolicyDecision.ALLOW,
         },
@@ -694,39 +652,38 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       const args = {
-        array: ['value', undefined, () => 'hello', null],
+        array: ["value", undefined, () => "hello", null],
       };
 
       // Should match pattern with undefined and functions converted to null
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
     });
 
-    it('should produce valid JSON for all inputs', async () => {
-      const testCases: Array<{ input: Record<string, unknown>; desc: string }> =
-        [
-          { input: { simple: 'string' }, desc: 'simple object' },
-          {
-            input: { nested: { deep: { value: 123 } } },
-            desc: 'nested object',
-          },
-          { input: { data: [1, 2, 3] }, desc: 'simple array' },
-          { input: { mixed: [1, { a: 'b' }, null] }, desc: 'mixed array' },
-          {
-            input: { undef: undefined, func: () => {}, normal: 'value' },
-            desc: 'object with undefined and function',
-          },
-          {
-            input: { data: ['a', undefined, () => {}, null] },
-            desc: 'array with undefined and function',
-          },
-        ];
+    it("should produce valid JSON for all inputs", async () => {
+      const testCases: Array<{ input: Record<string, unknown>; desc: string }> = [
+        { input: { simple: "string" }, desc: "simple object" },
+        {
+          input: { nested: { deep: { value: 123 } } },
+          desc: "nested object",
+        },
+        { input: { data: [1, 2, 3] }, desc: "simple array" },
+        { input: { mixed: [1, { a: "b" }, null] }, desc: "mixed array" },
+        {
+          input: { undef: undefined, func: () => {}, normal: "value" },
+          desc: "object with undefined and function",
+        },
+        {
+          input: { data: ["a", undefined, () => {}, null] },
+          desc: "array with undefined and function",
+        },
+      ];
 
       for (const { input } of testCases) {
         const rules: PolicyRule[] = [
           {
-            toolName: 'test',
+            toolName: "test",
             argsPattern: /.*/,
             decision: PolicyDecision.ALLOW,
           },
@@ -734,27 +691,24 @@ describe('PolicyEngine', () => {
         engine = new PolicyEngine({ rules });
 
         // Should not throw when checking (which internally uses stableStringify)
-        await expect(
-          engine.check({ name: 'test', args: input }, undefined),
-        ).resolves.not.toThrow();
+        await expect(engine.check({ name: "test", args: input }, undefined)).resolves.not.toThrow();
 
         // The check should succeed
-        expect(
-          (await engine.check({ name: 'test', args: input }, undefined))
-            .decision,
-        ).toBe(PolicyDecision.ALLOW);
+        expect((await engine.check({ name: "test", args: input }, undefined)).decision).toBe(
+          PolicyDecision.ALLOW,
+        );
       }
     });
 
-    it('should respect toJSON methods on objects', async () => {
+    it("should respect toJSON methods on objects", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"sanitized":"safe"/,
           decision: PolicyDecision.ALLOW,
         },
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"dangerous":"data"/,
           decision: PolicyDecision.DENY,
         },
@@ -765,21 +719,21 @@ describe('PolicyEngine', () => {
       // Object with toJSON that sanitizes output
       const args = {
         data: {
-          dangerous: 'data',
-          toJSON: () => ({ sanitized: 'safe' }),
+          dangerous: "data",
+          toJSON: () => ({ sanitized: "safe" }),
         },
       };
 
       // Should match the sanitized pattern, not the dangerous one
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
     });
 
-    it('should handle toJSON that returns primitives', async () => {
+    it("should handle toJSON that returns primitives", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"value":"string-value"/,
           decision: PolicyDecision.ALLOW,
         },
@@ -789,21 +743,21 @@ describe('PolicyEngine', () => {
 
       const args = {
         value: {
-          complex: 'object',
-          toJSON: () => 'string-value',
+          complex: "object",
+          toJSON: () => "string-value",
         },
       };
 
       // toJSON returns a string, which should be properly stringified
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
     });
 
-    it('should handle toJSON that throws an error', async () => {
+    it("should handle toJSON that throws an error", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"fallback":"value"/,
           decision: PolicyDecision.ALLOW,
         },
@@ -813,35 +767,35 @@ describe('PolicyEngine', () => {
 
       const args = {
         data: {
-          fallback: 'value',
+          fallback: "value",
           toJSON: () => {
-            throw new Error('toJSON error');
+            throw new Error("toJSON error");
           },
         },
       };
 
       // Should fall back to regular object serialization when toJSON throws
-      expect(
-        (await engine.check({ name: 'test', args }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "test", args }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
     });
   });
 
-  describe('safety checker integration', () => {
-    it('should call checker when rule allows and has safety_checker', async () => {
+  describe("safety checker integration", () => {
+    it("should call checker when rule allows and has safety_checker", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test-tool',
+          toolName: "test-tool",
           decision: PolicyDecision.ALLOW,
         },
       ];
       const checkers: SafetyCheckerRule[] = [
         {
-          toolName: 'test-tool',
+          toolName: "test-tool",
           checker: {
-            type: 'external',
-            name: 'test-checker',
-            config: { content: 'test-content' },
+            type: "external",
+            name: "test-checker",
+            config: { content: "test-content" },
           },
         },
       ];
@@ -850,95 +804,87 @@ describe('PolicyEngine', () => {
         decision: SafetyCheckDecision.ALLOW,
       });
 
-      const result = await engine.check(
-        { name: 'test-tool', args: { foo: 'bar' } },
-        undefined,
-      );
+      const result = await engine.check({ name: "test-tool", args: { foo: "bar" } }, undefined);
 
       expect(result.decision).toBe(PolicyDecision.ALLOW);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
-        { name: 'test-tool', args: { foo: 'bar' } },
+        { name: "test-tool", args: { foo: "bar" } },
         {
-          type: 'external',
-          name: 'test-checker',
-          config: { content: 'test-content' },
+          type: "external",
+          name: "test-checker",
+          config: { content: "test-content" },
         },
       );
     });
 
-    it('should handle checker errors as DENY', async () => {
+    it("should handle checker errors as DENY", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           decision: PolicyDecision.ALLOW,
         },
       ];
       const checkers: SafetyCheckerRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           checker: {
-            type: 'in-process',
+            type: "in-process",
             name: InProcessCheckerType.ALLOWED_PATH,
           },
         },
       ];
 
-      mockCheckerRunner.runChecker = vi
-        .fn()
-        .mockRejectedValue(new Error('Checker failed'));
+      mockCheckerRunner.runChecker = vi.fn().mockRejectedValue(new Error("Checker failed"));
 
       engine = new PolicyEngine({ rules, checkers }, mockCheckerRunner);
-      const { decision } = await engine.check({ name: 'test' }, undefined);
+      const { decision } = await engine.check({ name: "test" }, undefined);
 
       expect(decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should return DENY when checker denies', async () => {
+    it("should return DENY when checker denies", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test-tool',
+          toolName: "test-tool",
           decision: PolicyDecision.ALLOW,
         },
       ];
       const checkers: SafetyCheckerRule[] = [
         {
-          toolName: 'test-tool',
+          toolName: "test-tool",
           checker: {
-            type: 'external',
-            name: 'test-checker',
-            config: { content: 'test-content' },
+            type: "external",
+            name: "test-checker",
+            config: { content: "test-content" },
           },
         },
       ];
       engine = new PolicyEngine({ rules, checkers }, mockCheckerRunner);
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.DENY,
-        reason: 'test reason',
+        reason: "test reason",
       });
 
-      const result = await engine.check(
-        { name: 'test-tool', args: { foo: 'bar' } },
-        undefined,
-      );
+      const result = await engine.check({ name: "test-tool", args: { foo: "bar" } }, undefined);
 
       expect(result.decision).toBe(PolicyDecision.DENY);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalled();
     });
 
-    it('should not call checker if decision is not ALLOW', async () => {
+    it("should not call checker if decision is not ALLOW", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test-tool',
+          toolName: "test-tool",
           decision: PolicyDecision.ASK_USER,
         },
       ];
       const checkers: SafetyCheckerRule[] = [
         {
-          toolName: 'test-tool',
+          toolName: "test-tool",
           checker: {
-            type: 'external',
-            name: 'test-checker',
-            config: { content: 'test-content' },
+            type: "external",
+            name: "test-checker",
+            config: { content: "test-content" },
           },
         },
       ];
@@ -948,27 +894,24 @@ describe('PolicyEngine', () => {
         decision: SafetyCheckDecision.ALLOW,
       });
 
-      const result = await engine.check(
-        { name: 'test-tool', args: { foo: 'bar' } },
-        undefined,
-      );
+      const result = await engine.check({ name: "test-tool", args: { foo: "bar" } }, undefined);
 
       expect(result.decision).toBe(PolicyDecision.ASK_USER);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalled();
     });
 
-    it('should run checkers when rule allows', async () => {
+    it("should run checkers when rule allows", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           decision: PolicyDecision.ALLOW,
         },
       ];
       const checkers: SafetyCheckerRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           checker: {
-            type: 'in-process',
+            type: "in-process",
             name: InProcessCheckerType.ALLOWED_PATH,
           },
         },
@@ -979,101 +922,91 @@ describe('PolicyEngine', () => {
       });
 
       engine = new PolicyEngine({ rules, checkers }, mockCheckerRunner);
-      const { decision } = await engine.check({ name: 'test' }, undefined);
+      const { decision } = await engine.check({ name: "test" }, undefined);
 
       expect(decision).toBe(PolicyDecision.ALLOW);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledTimes(1);
     });
 
-    it('should not call checker if rule has no safety_checker', async () => {
+    it("should not call checker if rule has no safety_checker", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test-tool',
+          toolName: "test-tool",
           decision: PolicyDecision.ALLOW,
         },
       ];
       engine = new PolicyEngine({ rules }, mockCheckerRunner);
 
-      const result = await engine.check(
-        { name: 'test-tool', args: { foo: 'bar' } },
-        undefined,
-      );
+      const result = await engine.check({ name: "test-tool", args: { foo: "bar" } }, undefined);
 
       expect(result.decision).toBe(PolicyDecision.ALLOW);
       expect(mockCheckerRunner.runChecker).not.toHaveBeenCalled();
     });
   });
 
-  describe('serverName requirement', () => {
-    it('should require serverName for checks', async () => {
+  describe("serverName requirement", () => {
+    it("should require serverName for checks", async () => {
       // @ts-expect-error - intentionally testing missing serverName
-      expect((await engine.check({ name: 'test' })).decision).toBe(
+      expect((await engine.check({ name: "test" })).decision).toBe(PolicyDecision.ASK_USER);
+      // When serverName is provided (even undefined), it should work
+      expect((await engine.check({ name: "test" }, undefined)).decision).toBe(
         PolicyDecision.ASK_USER,
       );
-      // When serverName is provided (even undefined), it should work
-      expect((await engine.check({ name: 'test' }, undefined)).decision).toBe(
+      expect((await engine.check({ name: "test" }, "some-server")).decision).toBe(
         PolicyDecision.ASK_USER,
       );
-      expect(
-        (await engine.check({ name: 'test' }, 'some-server')).decision,
-      ).toBe(PolicyDecision.ASK_USER);
     });
-    it('should run multiple checkers in priority order and stop at first denial', async () => {
+    it("should run multiple checkers in priority order and stop at first denial", async () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           decision: PolicyDecision.ALLOW,
         },
       ];
       const checkers: SafetyCheckerRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           priority: 10,
-          checker: { type: 'external', name: 'checker1' },
+          checker: { type: "external", name: "checker1" },
         },
         {
-          toolName: 'test',
+          toolName: "test",
           priority: 20, // Should run first
-          checker: { type: 'external', name: 'checker2' },
+          checker: { type: "external", name: "checker2" },
         },
       ];
 
-      mockCheckerRunner.runChecker = vi
-        .fn()
-        .mockImplementation(async (_toolCall, config) => {
-          if (config.name === 'checker2') {
-            return {
-              decision: SafetyCheckDecision.DENY,
-              reason: 'checker2 denied',
-            };
-          }
-          return { decision: SafetyCheckDecision.ALLOW };
-        });
+      mockCheckerRunner.runChecker = vi.fn().mockImplementation(async (_toolCall, config) => {
+        if (config.name === "checker2") {
+          return {
+            decision: SafetyCheckDecision.DENY,
+            reason: "checker2 denied",
+          };
+        }
+        return { decision: SafetyCheckDecision.ALLOW };
+      });
 
       engine = new PolicyEngine({ rules, checkers }, mockCheckerRunner);
-      const { decision, rule } = await engine.check(
-        { name: 'test' },
-        undefined,
-      );
+      const { decision, rule } = await engine.check({ name: "test" }, undefined);
 
       expect(decision).toBe(PolicyDecision.DENY);
       expect(rule).toBeDefined();
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledTimes(1);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'checker2' }),
+        expect.objectContaining({ name: "checker2" }),
       );
     });
   });
 
-  describe('addChecker', () => {
-    it('should add a new checker and maintain priority order', () => {
+  describe("addChecker", () => {
+    it("should add a new checker and maintain priority order", () => {
       const checker1: SafetyCheckerRule = {
-        checker: { type: 'external', name: 'checker1' },
+        checker: { type: "external", name: "checker1" },
         priority: 5,
       };
       const checker2: SafetyCheckerRule = {
-        checker: { type: 'external', name: 'checker2' },
+        checker: { type: "external", name: "checker2" },
         priority: 10,
       };
 
@@ -1083,25 +1016,23 @@ describe('PolicyEngine', () => {
       const checkers = engine.getCheckers();
       expect(checkers).toHaveLength(2);
       expect(checkers[0].priority).toBe(10);
-      expect(checkers[0].checker.name).toBe('checker2');
+      expect(checkers[0].checker.name).toBe("checker2");
       expect(checkers[1].priority).toBe(5);
-      expect(checkers[1].checker.name).toBe('checker1');
+      expect(checkers[1].checker.name).toBe("checker1");
     });
   });
 
-  describe('checker matching logic', () => {
-    it('should match checkers using toolName and argsPattern', async () => {
-      const rules: PolicyRule[] = [
-        { toolName: 'tool', decision: PolicyDecision.ALLOW },
-      ];
+  describe("checker matching logic", () => {
+    it("should match checkers using toolName and argsPattern", async () => {
+      const rules: PolicyRule[] = [{ toolName: "tool", decision: PolicyDecision.ALLOW }];
       const matchingChecker: SafetyCheckerRule = {
-        checker: { type: 'external', name: 'matching' },
-        toolName: 'tool',
+        checker: { type: "external", name: "matching" },
+        toolName: "tool",
         argsPattern: /"safe":true/,
       };
       const nonMatchingChecker: SafetyCheckerRule = {
-        checker: { type: 'external', name: 'non-matching' },
-        toolName: 'other',
+        checker: { type: "external", name: "non-matching" },
+        toolName: "other",
       };
 
       engine = new PolicyEngine(
@@ -1113,51 +1044,44 @@ describe('PolicyEngine', () => {
         decision: SafetyCheckDecision.ALLOW,
       });
 
-      await engine.check({ name: 'tool', args: { safe: true } }, undefined);
+      await engine.check({ name: "tool", args: { safe: true } }, undefined);
 
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'matching' }),
+        expect.objectContaining({ name: "matching" }),
       );
       expect(mockCheckerRunner.runChecker).not.toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'non-matching' }),
+        expect.objectContaining({ name: "non-matching" }),
       );
     });
 
-    it('should support wildcard patterns for checkers', async () => {
-      const rules: PolicyRule[] = [
-        { toolName: 'server__tool', decision: PolicyDecision.ALLOW },
-      ];
+    it("should support wildcard patterns for checkers", async () => {
+      const rules: PolicyRule[] = [{ toolName: "server__tool", decision: PolicyDecision.ALLOW }];
       const wildcardChecker: SafetyCheckerRule = {
-        checker: { type: 'external', name: 'wildcard' },
-        toolName: 'server__*',
+        checker: { type: "external", name: "wildcard" },
+        toolName: "server__*",
       };
 
-      engine = new PolicyEngine(
-        { rules, checkers: [wildcardChecker] },
-        mockCheckerRunner,
-      );
+      engine = new PolicyEngine({ rules, checkers: [wildcardChecker] }, mockCheckerRunner);
 
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.ALLOW,
       });
 
-      await engine.check({ name: 'server__tool' }, 'server');
+      await engine.check({ name: "server__tool" }, "server");
 
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'wildcard' }),
+        expect.objectContaining({ name: "wildcard" }),
       );
     });
-    it('should run safety checkers when decision is ASK_USER and downgrade to DENY on failure', async () => {
-      const rules: PolicyRule[] = [
-        { toolName: 'tool', decision: PolicyDecision.ASK_USER },
-      ];
+    it("should run safety checkers when decision is ASK_USER and downgrade to DENY on failure", async () => {
+      const rules: PolicyRule[] = [{ toolName: "tool", decision: PolicyDecision.ASK_USER }];
       const checkers: SafetyCheckerRule[] = [
         {
           checker: {
-            type: 'in-process',
+            type: "in-process",
             name: InProcessCheckerType.ALLOWED_PATH,
           },
         },
@@ -1167,22 +1091,20 @@ describe('PolicyEngine', () => {
 
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.DENY,
-        reason: 'Safety check failed',
+        reason: "Safety check failed",
       });
 
-      const result = await engine.check({ name: 'tool' }, undefined);
+      const result = await engine.check({ name: "tool" }, undefined);
       expect(result.decision).toBe(PolicyDecision.DENY);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalled();
     });
 
-    it('should run safety checkers when decision is ASK_USER and keep ASK_USER on success', async () => {
-      const rules: PolicyRule[] = [
-        { toolName: 'tool', decision: PolicyDecision.ASK_USER },
-      ];
+    it("should run safety checkers when decision is ASK_USER and keep ASK_USER on success", async () => {
+      const rules: PolicyRule[] = [{ toolName: "tool", decision: PolicyDecision.ASK_USER }];
       const checkers: SafetyCheckerRule[] = [
         {
           checker: {
-            type: 'in-process',
+            type: "in-process",
             name: InProcessCheckerType.ALLOWED_PATH,
           },
         },
@@ -1194,19 +1116,17 @@ describe('PolicyEngine', () => {
         decision: SafetyCheckDecision.ALLOW,
       });
 
-      const result = await engine.check({ name: 'tool' }, undefined);
+      const result = await engine.check({ name: "tool" }, undefined);
       expect(result.decision).toBe(PolicyDecision.ASK_USER);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalled();
     });
 
-    it('should downgrade ALLOW to ASK_USER if checker returns ASK_USER', async () => {
-      const rules: PolicyRule[] = [
-        { toolName: 'tool', decision: PolicyDecision.ALLOW },
-      ];
+    it("should downgrade ALLOW to ASK_USER if checker returns ASK_USER", async () => {
+      const rules: PolicyRule[] = [{ toolName: "tool", decision: PolicyDecision.ALLOW }];
       const checkers: SafetyCheckerRule[] = [
         {
           checker: {
-            type: 'in-process',
+            type: "in-process",
             name: InProcessCheckerType.ALLOWED_PATH,
           },
         },
@@ -1216,121 +1136,116 @@ describe('PolicyEngine', () => {
 
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.ASK_USER,
-        reason: 'Suspicious path',
+        reason: "Suspicious path",
       });
 
-      const result = await engine.check({ name: 'tool' }, undefined);
+      const result = await engine.check({ name: "tool" }, undefined);
       expect(result.decision).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should DENY if checker returns ASK_USER in non-interactive mode', async () => {
-      const rules: PolicyRule[] = [
-        { toolName: 'tool', decision: PolicyDecision.ALLOW },
-      ];
+    it("should DENY if checker returns ASK_USER in non-interactive mode", async () => {
+      const rules: PolicyRule[] = [{ toolName: "tool", decision: PolicyDecision.ALLOW }];
       const checkers: SafetyCheckerRule[] = [
         {
           checker: {
-            type: 'in-process',
+            type: "in-process",
             name: InProcessCheckerType.ALLOWED_PATH,
           },
         },
       ];
 
-      engine = new PolicyEngine(
-        { rules, checkers, nonInteractive: true },
-        mockCheckerRunner,
-      );
+      engine = new PolicyEngine({ rules, checkers, nonInteractive: true }, mockCheckerRunner);
 
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.ASK_USER,
-        reason: 'Suspicious path',
+        reason: "Suspicious path",
       });
 
-      const result = await engine.check({ name: 'tool' }, undefined);
+      const result = await engine.check({ name: "tool" }, undefined);
       expect(result.decision).toBe(PolicyDecision.DENY);
     });
   });
 
-  describe('checkHook', () => {
-    it('should allow hooks by default', async () => {
+  describe("checkHook", () => {
+    it("should allow hooks by default", async () => {
       engine = new PolicyEngine({}, mockCheckerRunner);
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
       expect(decision).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should deny all hooks when allowHooks is false', async () => {
+    it("should deny all hooks when allowHooks is false", async () => {
       engine = new PolicyEngine({ allowHooks: false }, mockCheckerRunner);
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
       expect(decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should deny project hooks in untrusted folders', async () => {
+    it("should deny project hooks in untrusted folders", async () => {
       engine = new PolicyEngine({}, mockCheckerRunner);
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'project',
+        eventName: "BeforeTool",
+        hookSource: "project",
         trustedFolder: false,
       });
       expect(decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should allow project hooks in trusted folders', async () => {
+    it("should allow project hooks in trusted folders", async () => {
       engine = new PolicyEngine({}, mockCheckerRunner);
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'project',
+        eventName: "BeforeTool",
+        hookSource: "project",
         trustedFolder: true,
       });
       expect(decision).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should allow user hooks in untrusted folders', async () => {
+    it("should allow user hooks in untrusted folders", async () => {
       engine = new PolicyEngine({}, mockCheckerRunner);
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
         trustedFolder: false,
       });
       expect(decision).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should run hook checkers and deny on DENY decision', async () => {
+    it("should run hook checkers and deny on DENY decision", async () => {
       const hookCheckers = [
         {
-          eventName: 'BeforeTool',
-          checker: { type: 'external' as const, name: 'test-hook-checker' },
+          eventName: "BeforeTool",
+          checker: { type: "external" as const, name: "test-hook-checker" },
         },
       ];
       engine = new PolicyEngine({ hookCheckers }, mockCheckerRunner);
 
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.DENY,
-        reason: 'Hook checker denied',
+        reason: "Hook checker denied",
       });
 
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       expect(decision).toBe(PolicyDecision.DENY);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'hook:BeforeTool' }),
-        expect.objectContaining({ name: 'test-hook-checker' }),
+        expect.objectContaining({ name: "hook:BeforeTool" }),
+        expect.objectContaining({ name: "test-hook-checker" }),
       );
     });
 
-    it('should run hook checkers and allow on ALLOW decision', async () => {
+    it("should run hook checkers and allow on ALLOW decision", async () => {
       const hookCheckers = [
         {
-          eventName: 'BeforeTool',
-          checker: { type: 'external' as const, name: 'test-hook-checker' },
+          eventName: "BeforeTool",
+          checker: { type: "external" as const, name: "test-hook-checker" },
         },
       ];
       engine = new PolicyEngine({ hookCheckers }, mockCheckerRunner);
@@ -1340,67 +1255,64 @@ describe('PolicyEngine', () => {
       });
 
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       expect(decision).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should return ASK_USER when checker requests it', async () => {
+    it("should return ASK_USER when checker requests it", async () => {
       const hookCheckers = [
         {
-          checker: { type: 'external' as const, name: 'test-hook-checker' },
+          checker: { type: "external" as const, name: "test-hook-checker" },
         },
       ];
       engine = new PolicyEngine({ hookCheckers }, mockCheckerRunner);
 
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.ASK_USER,
-        reason: 'Needs confirmation',
+        reason: "Needs confirmation",
       });
 
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       expect(decision).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should return DENY for ASK_USER in non-interactive mode', async () => {
+    it("should return DENY for ASK_USER in non-interactive mode", async () => {
       const hookCheckers = [
         {
-          checker: { type: 'external' as const, name: 'test-hook-checker' },
+          checker: { type: "external" as const, name: "test-hook-checker" },
         },
       ];
-      engine = new PolicyEngine(
-        { hookCheckers, nonInteractive: true },
-        mockCheckerRunner,
-      );
+      engine = new PolicyEngine({ hookCheckers, nonInteractive: true }, mockCheckerRunner);
 
       vi.mocked(mockCheckerRunner.runChecker).mockResolvedValue({
         decision: SafetyCheckDecision.ASK_USER,
-        reason: 'Needs confirmation',
+        reason: "Needs confirmation",
       });
 
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       expect(decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should match hook checkers by eventName', async () => {
+    it("should match hook checkers by eventName", async () => {
       const hookCheckers = [
         {
-          eventName: 'AfterTool',
-          checker: { type: 'external' as const, name: 'after-tool-checker' },
+          eventName: "AfterTool",
+          checker: { type: "external" as const, name: "after-tool-checker" },
         },
         {
-          eventName: 'BeforeTool',
-          checker: { type: 'external' as const, name: 'before-tool-checker' },
+          eventName: "BeforeTool",
+          checker: { type: "external" as const, name: "before-tool-checker" },
         },
       ];
       engine = new PolicyEngine({ hookCheckers }, mockCheckerRunner);
@@ -1410,29 +1322,29 @@ describe('PolicyEngine', () => {
       });
 
       await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'before-tool-checker' }),
+        expect.objectContaining({ name: "before-tool-checker" }),
       );
       expect(mockCheckerRunner.runChecker).not.toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'after-tool-checker' }),
+        expect.objectContaining({ name: "after-tool-checker" }),
       );
     });
 
-    it('should match hook checkers by hookSource', async () => {
+    it("should match hook checkers by hookSource", async () => {
       const hookCheckers = [
         {
-          hookSource: 'project' as const,
-          checker: { type: 'external' as const, name: 'project-checker' },
+          hookSource: "project" as const,
+          checker: { type: "external" as const, name: "project-checker" },
         },
         {
-          hookSource: 'user' as const,
-          checker: { type: 'external' as const, name: 'user-checker' },
+          hookSource: "user" as const,
+          checker: { type: "external" as const, name: "user-checker" },
         },
       ];
       engine = new PolicyEngine({ hookCheckers }, mockCheckerRunner);
@@ -1442,99 +1354,95 @@ describe('PolicyEngine', () => {
       });
 
       await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'user-checker' }),
+        expect.objectContaining({ name: "user-checker" }),
       );
       expect(mockCheckerRunner.runChecker).not.toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'project-checker' }),
+        expect.objectContaining({ name: "project-checker" }),
       );
     });
 
-    it('should deny when hook checker throws an error', async () => {
+    it("should deny when hook checker throws an error", async () => {
       const hookCheckers = [
         {
-          checker: { type: 'external' as const, name: 'failing-checker' },
+          checker: { type: "external" as const, name: "failing-checker" },
         },
       ];
       engine = new PolicyEngine({ hookCheckers }, mockCheckerRunner);
 
-      vi.mocked(mockCheckerRunner.runChecker).mockRejectedValue(
-        new Error('Checker failed'),
-      );
+      vi.mocked(mockCheckerRunner.runChecker).mockRejectedValue(new Error("Checker failed"));
 
       const decision = await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       expect(decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should run hook checkers in priority order', async () => {
+    it("should run hook checkers in priority order", async () => {
       const hookCheckers = [
         {
           priority: 5,
-          checker: { type: 'external' as const, name: 'low-priority' },
+          checker: { type: "external" as const, name: "low-priority" },
         },
         {
           priority: 20,
-          checker: { type: 'external' as const, name: 'high-priority' },
+          checker: { type: "external" as const, name: "high-priority" },
         },
         {
           priority: 10,
-          checker: { type: 'external' as const, name: 'medium-priority' },
+          checker: { type: "external" as const, name: "medium-priority" },
         },
       ];
       engine = new PolicyEngine({ hookCheckers }, mockCheckerRunner);
 
-      vi.mocked(mockCheckerRunner.runChecker).mockImplementation(
-        async (_call, config) => {
-          if (config.name === 'high-priority') {
-            return { decision: SafetyCheckDecision.DENY, reason: 'denied' };
-          }
-          return { decision: SafetyCheckDecision.ALLOW };
-        },
-      );
+      vi.mocked(mockCheckerRunner.runChecker).mockImplementation(async (_call, config) => {
+        if (config.name === "high-priority") {
+          return { decision: SafetyCheckDecision.DENY, reason: "denied" };
+        }
+        return { decision: SafetyCheckDecision.ALLOW };
+      });
 
       await engine.checkHook({
-        eventName: 'BeforeTool',
-        hookSource: 'user',
+        eventName: "BeforeTool",
+        hookSource: "user",
       });
 
       // Should only call the high-priority checker (first in sorted order)
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledTimes(1);
       expect(mockCheckerRunner.runChecker).toHaveBeenCalledWith(
         expect.anything(),
-        expect.objectContaining({ name: 'high-priority' }),
+        expect.objectContaining({ name: "high-priority" }),
       );
     });
   });
 
-  describe('addHookChecker', () => {
-    it('should add a new hook checker and maintain priority order', () => {
+  describe("addHookChecker", () => {
+    it("should add a new hook checker and maintain priority order", () => {
       engine = new PolicyEngine({}, mockCheckerRunner);
 
       engine.addHookChecker({
         priority: 5,
-        checker: { type: 'external', name: 'checker1' },
+        checker: { type: "external", name: "checker1" },
       });
       engine.addHookChecker({
         priority: 10,
-        checker: { type: 'external', name: 'checker2' },
+        checker: { type: "external", name: "checker2" },
       });
 
       const checkers = engine.getHookCheckers();
       expect(checkers).toHaveLength(2);
       expect(checkers[0].priority).toBe(10);
-      expect(checkers[0].checker.name).toBe('checker2');
+      expect(checkers[0].checker.name).toBe("checker2");
       expect(checkers[1].priority).toBe(5);
-      expect(checkers[1].checker.name).toBe('checker1');
+      expect(checkers[1].checker.name).toBe("checker1");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/policy/policy-engine.ts b/packages/gemini-cli-core/src/policy/policy-engine.ts
index 295270d15..087230b07 100644
--- a/packages/gemini-cli-core/src/policy/policy-engine.ts
+++ b/packages/gemini-cli-core/src/policy/policy-engine.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type FunctionCall } from '@google/genai';
+import { type FunctionCall } from "@google/genai";
+import type { HookExecutionRequest } from "../confirmation-bus/types.js";
+import type { CheckerRunner } from "../safety/checker-runner.js";
+import { SafetyCheckDecision } from "../safety/protocol.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { stableStringify } from "./stable-stringify.js";
 import {
+  getHookSource,
+  type HookCheckerRule,
+  type HookExecutionContext,
   PolicyDecision,
   type PolicyEngineConfig,
   type PolicyRule,
   type SafetyCheckerRule,
-  type HookCheckerRule,
-  type HookExecutionContext,
-  getHookSource,
-} from './types.js';
-import { stableStringify } from './stable-stringify.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import type { CheckerRunner } from '../safety/checker-runner.js';
-import { SafetyCheckDecision } from '../safety/protocol.js';
-import type { HookExecutionRequest } from '../confirmation-bus/types.js';
+} from "./types.js";
 
 function ruleMatches(
   rule: PolicyRule | SafetyCheckerRule,
@@ -29,7 +29,7 @@ function ruleMatches(
   // Check tool name if specified
   if (rule.toolName) {
     // Support wildcard patterns: "serverName__*" matches "serverName__anyTool"
-    if (rule.toolName.endsWith('__*')) {
+    if (rule.toolName.endsWith("__*")) {
       const prefix = rule.toolName.slice(0, -3); // Remove "__*"
       if (serverName !== undefined) {
         // Robust check: if serverName is provided, it MUST match the prefix exactly.
@@ -39,7 +39,7 @@ function ruleMatches(
         }
       }
       // Always verify the prefix, even if serverName matched
-      if (!toolCall.name || !toolCall.name.startsWith(prefix + '__')) {
+      if (!toolCall.name || !toolCall.name.startsWith(prefix + "__")) {
         return false;
       }
     } else if (toolCall.name !== rule.toolName) {
@@ -54,10 +54,7 @@ function ruleMatches(
       return false;
     }
     // Use stable JSON stringification with sorted keys to ensure consistent matching
-    if (
-      stringifiedArgs === undefined ||
-      !rule.argsPattern.test(stringifiedArgs)
-    ) {
+    if (stringifiedArgs === undefined || !rule.argsPattern.test(stringifiedArgs)) {
       return false;
     }
   }
@@ -68,10 +65,7 @@ function ruleMatches(
 /**
  * Check if a hook checker rule matches a hook execution context.
  */
-function hookCheckerMatches(
-  rule: HookCheckerRule,
-  context: HookExecutionContext,
-): boolean {
+function hookCheckerMatches(rule: HookCheckerRule, context: HookExecutionContext): boolean {
   // Check event name if specified
   if (rule.eventName && rule.eventName !== context.eventName) {
     return false;
@@ -95,12 +89,8 @@ export class PolicyEngine {
   private readonly allowHooks: boolean;
 
   constructor(config: PolicyEngineConfig = {}, checkerRunner?: CheckerRunner) {
-    this.rules = (config.rules ?? []).sort(
-      (a, b) => (b.priority ?? 0) - (a.priority ?? 0),
-    );
-    this.checkers = (config.checkers ?? []).sort(
-      (a, b) => (b.priority ?? 0) - (a.priority ?? 0),
-    );
+    this.rules = (config.rules ?? []).sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
+    this.checkers = (config.checkers ?? []).sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
     this.hookCheckers = (config.hookCheckers ?? []).sort(
       (a, b) => (b.priority ?? 0) - (a.priority ?? 0),
     );
@@ -142,7 +132,7 @@ export class PolicyEngine {
     for (const rule of this.rules) {
       if (ruleMatches(rule, toolCall, stringifiedArgs, serverName)) {
         debugLogger.debug(
-          `[PolicyEngine.check] MATCHED rule: toolName=${rule.toolName}, decision=${rule.decision}, priority=${rule.priority}, argsPattern=${rule.argsPattern?.source || 'none'}`,
+          `[PolicyEngine.check] MATCHED rule: toolName=${rule.toolName}, decision=${rule.decision}, priority=${rule.priority}, argsPattern=${rule.argsPattern?.source || "none"}`,
         );
         matchedRule = rule;
         decision = this.applyNonInteractiveMode(rule.decision);
@@ -166,15 +156,10 @@ export class PolicyEngine {
             `[PolicyEngine.check] Running safety checker: ${checkerRule.checker.name}`,
           );
           try {
-            const result = await this.checkerRunner.runChecker(
-              toolCall,
-              checkerRule.checker,
-            );
+            const result = await this.checkerRunner.runChecker(toolCall, checkerRule.checker);
 
             if (result.decision === SafetyCheckDecision.DENY) {
-              debugLogger.debug(
-                `[PolicyEngine.check] Safety checker denied: ${result.reason}`,
-              );
+              debugLogger.debug(`[PolicyEngine.check] Safety checker denied: ${result.reason}`);
               return {
                 decision: PolicyDecision.DENY,
                 rule: matchedRule,
@@ -186,9 +171,7 @@ export class PolicyEngine {
               decision = PolicyDecision.ASK_USER;
             }
           } catch (error) {
-            debugLogger.debug(
-              `[PolicyEngine.check] Safety checker failed: ${error}`,
-            );
+            debugLogger.debug(`[PolicyEngine.check] Safety checker failed: ${error}`);
             return {
               decision: PolicyDecision.DENY,
               rule: matchedRule,
@@ -255,28 +238,26 @@ export class PolicyEngine {
    * Check if a hook execution is allowed based on the configured policies.
    * Runs hook-specific safety checkers if configured.
    */
-  async checkHook(
-    request: HookExecutionRequest | HookExecutionContext,
-  ): Promise<PolicyDecision> {
+  async checkHook(request: HookExecutionRequest | HookExecutionContext): Promise<PolicyDecision> {
     // If hooks are globally disabled, deny all hook executions
     if (!this.allowHooks) {
       return PolicyDecision.DENY;
     }
 
     const context: HookExecutionContext =
-      'input' in request
+      "input" in request
         ? {
             eventName: request.eventName,
             hookSource: getHookSource(request.input),
             trustedFolder:
-              typeof request.input['trusted_folder'] === 'boolean'
-                ? request.input['trusted_folder']
+              typeof request.input["trusted_folder"] === "boolean"
+                ? request.input["trusted_folder"]
                 : undefined,
           }
         : request;
 
     // In untrusted folders, deny project-level hooks
-    if (context.trustedFolder === false && context.hookSource === 'project') {
+    if (context.trustedFolder === false && context.hookSource === "project") {
       return PolicyDecision.DENY;
     }
 
@@ -298,15 +279,10 @@ export class PolicyEngine {
               },
             };
 
-            const result = await this.checkerRunner.runChecker(
-              syntheticCall,
-              checkerRule.checker,
-            );
+            const result = await this.checkerRunner.runChecker(syntheticCall, checkerRule.checker);
 
             if (result.decision === SafetyCheckDecision.DENY) {
-              debugLogger.debug(
-                `[PolicyEngine.checkHook] Hook checker denied: ${result.reason}`,
-              );
+              debugLogger.debug(`[PolicyEngine.checkHook] Hook checker denied: ${result.reason}`);
               return PolicyDecision.DENY;
             } else if (result.decision === SafetyCheckDecision.ASK_USER) {
               debugLogger.debug(
@@ -316,9 +292,7 @@ export class PolicyEngine {
               return this.applyNonInteractiveMode(PolicyDecision.ASK_USER);
             }
           } catch (error) {
-            debugLogger.debug(
-              `[PolicyEngine.checkHook] Hook checker failed: ${error}`,
-            );
+            debugLogger.debug(`[PolicyEngine.checkHook] Hook checker failed: ${error}`);
             return PolicyDecision.DENY;
           }
         }
diff --git a/packages/gemini-cli-core/src/policy/stable-stringify.ts b/packages/gemini-cli-core/src/policy/stable-stringify.ts
index 78db692ea..00c82a41b 100644
--- a/packages/gemini-cli-core/src/policy/stable-stringify.ts
+++ b/packages/gemini-cli-core/src/policy/stable-stringify.ts
@@ -60,15 +60,15 @@ export function stableStringify(obj: unknown): string {
   const stringify = (currentObj: unknown, ancestors: Set<unknown>): string => {
     // Handle primitives and null
     if (currentObj === undefined) {
-      return 'null'; // undefined in arrays becomes null in JSON
+      return "null"; // undefined in arrays becomes null in JSON
     }
     if (currentObj === null) {
-      return 'null';
+      return "null";
     }
-    if (typeof currentObj === 'function') {
-      return 'null'; // functions in arrays become null in JSON
+    if (typeof currentObj === "function") {
+      return "null"; // functions in arrays become null in JSON
     }
-    if (typeof currentObj !== 'object') {
+    if (typeof currentObj !== "object") {
       return JSON.stringify(currentObj);
     }
 
@@ -82,12 +82,12 @@ export function stableStringify(obj: unknown): string {
     try {
       // Check for toJSON method and use it if present
       const objWithToJSON = currentObj as { toJSON?: () => unknown };
-      if (typeof objWithToJSON.toJSON === 'function') {
+      if (typeof objWithToJSON.toJSON === "function") {
         try {
           const jsonValue = objWithToJSON.toJSON();
           // The result of toJSON needs to be stringified recursively
           if (jsonValue === null) {
-            return 'null';
+            return "null";
           }
           return stringify(jsonValue, ancestors);
         } catch {
@@ -98,12 +98,12 @@ export function stableStringify(obj: unknown): string {
       if (Array.isArray(currentObj)) {
         const items = currentObj.map((item) => {
           // undefined and functions in arrays become null
-          if (item === undefined || typeof item === 'function') {
-            return 'null';
+          if (item === undefined || typeof item === "function") {
+            return "null";
           }
           return stringify(item, ancestors);
         });
-        return '[' + items.join(',') + ']';
+        return "[" + items.join(",") + "]";
       }
 
       // Handle objects - sort keys and filter out undefined/function values
@@ -113,12 +113,12 @@ export function stableStringify(obj: unknown): string {
       for (const key of sortedKeys) {
         const value = (currentObj as Record<string, unknown>)[key];
         // Skip undefined and function values in objects (per JSON spec)
-        if (value !== undefined && typeof value !== 'function') {
-          pairs.push(JSON.stringify(key) + ':' + stringify(value, ancestors));
+        if (value !== undefined && typeof value !== "function") {
+          pairs.push(JSON.stringify(key) + ":" + stringify(value, ancestors));
         }
       }
 
-      return '{' + pairs.join(',') + '}';
+      return "{" + pairs.join(",") + "}";
     } finally {
       ancestors.delete(currentObj);
     }
diff --git a/packages/gemini-cli-core/src/policy/toml-loader.test.ts b/packages/gemini-cli-core/src/policy/toml-loader.test.ts
index 75c743dfd..080321012 100644
--- a/packages/gemini-cli-core/src/policy/toml-loader.test.ts
+++ b/packages/gemini-cli-core/src/policy/toml-loader.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { ApprovalMode, PolicyDecision } from './types.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { loadPoliciesFromToml } from './toml-loader.js';
-import type { PolicyLoadResult } from './toml-loader.js';
-
-describe('policy-toml-loader', () => {
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import type { PolicyLoadResult } from "./toml-loader.js";
+import { loadPoliciesFromToml } from "./toml-loader.js";
+import { ApprovalMode, PolicyDecision } from "./types.js";
+
+describe("policy-toml-loader", () => {
   let tempDir: string;
 
   beforeEach(async () => {
-    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'policy-test-'));
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "policy-test-"));
   });
 
   afterEach(async () => {
@@ -32,15 +32,15 @@ describe('policy-toml-loader', () => {
 
   async function runLoadPoliciesFromToml(
     tomlContent: string,
-    fileName = 'test.toml',
+    fileName = "test.toml",
   ): Promise<PolicyLoadResult> {
     await fs.writeFile(path.join(tempDir, fileName), tomlContent);
     const getPolicyTier = (_dir: string) => 1;
     return loadPoliciesFromToml(ApprovalMode.DEFAULT, [tempDir], getPolicyTier);
   }
 
-  describe('loadPoliciesFromToml', () => {
-    it('should load and parse a simple policy file', async () => {
+  describe("loadPoliciesFromToml", () => {
+    it("should load and parse a simple policy file", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -50,7 +50,7 @@ priority = 100
 
       expect(result.rules).toHaveLength(1);
       expect(result.rules[0]).toEqual({
-        toolName: 'glob',
+        toolName: "glob",
         decision: PolicyDecision.ALLOW,
         priority: 1.1, // tier 1 + 100/1000
       });
@@ -58,7 +58,7 @@ priority = 100
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should expand commandPrefix array to multiple rules', async () => {
+    it("should expand commandPrefix array to multiple rules", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -68,18 +68,14 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(2);
-      expect(result.rules[0].toolName).toBe('run_shell_command');
-      expect(result.rules[1].toolName).toBe('run_shell_command');
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git status"}'),
-      ).toBe(true);
-      expect(result.rules[1].argsPattern?.test('{"command":"git log"}')).toBe(
-        true,
-      );
+      expect(result.rules[0].toolName).toBe("run_shell_command");
+      expect(result.rules[1].toolName).toBe("run_shell_command");
+      expect(result.rules[0].argsPattern?.test('{"command":"git status"}')).toBe(true);
+      expect(result.rules[1].argsPattern?.test('{"command":"git log"}')).toBe(true);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should transform commandRegex to argsPattern', async () => {
+    it("should transform commandRegex to argsPattern", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -89,19 +85,13 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(1);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git status"}'),
-      ).toBe(true);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git log --all"}'),
-      ).toBe(true);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git branch"}'),
-      ).toBe(false);
+      expect(result.rules[0].argsPattern?.test('{"command":"git status"}')).toBe(true);
+      expect(result.rules[0].argsPattern?.test('{"command":"git log --all"}')).toBe(true);
+      expect(result.rules[0].argsPattern?.test('{"command":"git branch"}')).toBe(false);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should expand toolName array', async () => {
+    it("should expand toolName array", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = ["glob", "grep", "read"]
@@ -110,15 +100,11 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(3);
-      expect(result.rules.map((r) => r.toolName)).toEqual([
-        'glob',
-        'grep',
-        'read',
-      ]);
+      expect(result.rules.map((r) => r.toolName)).toEqual(["glob", "grep", "read"]);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should transform mcpName to composite toolName', async () => {
+    it("should transform mcpName to composite toolName", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 mcpName = "google-workspace"
@@ -128,12 +114,12 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(2);
-      expect(result.rules[0].toolName).toBe('google-workspace__calendar.list');
-      expect(result.rules[1].toolName).toBe('google-workspace__calendar.get');
+      expect(result.rules[0].toolName).toBe("google-workspace__calendar.list");
+      expect(result.rules[1].toolName).toBe("google-workspace__calendar.get");
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should filter rules by mode', async () => {
+    it("should filter rules by mode", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -150,11 +136,11 @@ modes = ["yolo"]
 
       // Only the first rule should be included (modes includes "default")
       expect(result.rules).toHaveLength(1);
-      expect(result.rules[0].toolName).toBe('glob');
+      expect(result.rules[0].toolName).toBe("glob");
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should handle TOML parse errors', async () => {
+    it("should handle TOML parse errors", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]
 toolName = "glob"
@@ -164,11 +150,11 @@ priority = 100
 
       expect(result.rules).toHaveLength(0);
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('toml_parse');
-      expect(result.errors[0].fileName).toBe('test.toml');
+      expect(result.errors[0].errorType).toBe("toml_parse");
+      expect(result.errors[0].fileName).toBe("test.toml");
     });
 
-    it('should handle schema validation errors', async () => {
+    it("should handle schema validation errors", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -177,11 +163,11 @@ priority = 100
 
       expect(result.rules).toHaveLength(0);
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('schema_validation');
-      expect(result.errors[0].details).toContain('decision');
+      expect(result.errors[0].errorType).toBe("schema_validation");
+      expect(result.errors[0].details).toContain("decision");
     });
 
-    it('should reject commandPrefix without run_shell_command', async () => {
+    it("should reject commandPrefix without run_shell_command", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -191,11 +177,11 @@ priority = 100
 `);
 
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('rule_validation');
-      expect(result.errors[0].details).toContain('run_shell_command');
+      expect(result.errors[0].errorType).toBe("rule_validation");
+      expect(result.errors[0].details).toContain("run_shell_command");
     });
 
-    it('should reject commandPrefix + argsPattern combination', async () => {
+    it("should reject commandPrefix + argsPattern combination", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -206,11 +192,11 @@ priority = 100
 `);
 
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('rule_validation');
-      expect(result.errors[0].details).toContain('mutually exclusive');
+      expect(result.errors[0].errorType).toBe("rule_validation");
+      expect(result.errors[0].details).toContain("mutually exclusive");
     });
 
-    it('should handle invalid regex patterns', async () => {
+    it("should handle invalid regex patterns", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -221,11 +207,11 @@ priority = 100
 
       expect(result.rules).toHaveLength(0);
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('regex_compilation');
-      expect(result.errors[0].details).toContain('git (status|branch');
+      expect(result.errors[0].errorType).toBe("regex_compilation");
+      expect(result.errors[0].details).toContain("git (status|branch");
     });
 
-    it('should escape regex special characters in commandPrefix', async () => {
+    it("should escape regex special characters in commandPrefix", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -236,18 +222,14 @@ priority = 100
 
       expect(result.rules).toHaveLength(1);
       // The regex should have escaped the * and .
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git log file.txt"}'),
-      ).toBe(false);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git log *.txt"}'),
-      ).toBe(true);
+      expect(result.rules[0].argsPattern?.test('{"command":"git log file.txt"}')).toBe(false);
+      expect(result.rules[0].argsPattern?.test('{"command":"git log *.txt"}')).toBe(true);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should handle a mix of valid and invalid policy files', async () => {
+    it("should handle a mix of valid and invalid policy files", async () => {
       await fs.writeFile(
-        path.join(tempDir, 'valid.toml'),
+        path.join(tempDir, "valid.toml"),
         `
 [[rule]]
 toolName = "glob"
@@ -257,7 +239,7 @@ priority = 100
       );
 
       await fs.writeFile(
-        path.join(tempDir, 'invalid.toml'),
+        path.join(tempDir, "invalid.toml"),
         `
 [[rule]]
 toolName = "grep"
@@ -267,22 +249,18 @@ priority = -1
       );
 
       const getPolicyTier = (_dir: string) => 1;
-      const result = await loadPoliciesFromToml(
-        ApprovalMode.DEFAULT,
-        [tempDir],
-        getPolicyTier,
-      );
+      const result = await loadPoliciesFromToml(ApprovalMode.DEFAULT, [tempDir], getPolicyTier);
 
       expect(result.rules).toHaveLength(1);
-      expect(result.rules[0].toolName).toBe('glob');
+      expect(result.rules[0].toolName).toBe("glob");
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].fileName).toBe('invalid.toml');
-      expect(result.errors[0].errorType).toBe('schema_validation');
+      expect(result.errors[0].fileName).toBe("invalid.toml");
+      expect(result.errors[0].errorType).toBe("schema_validation");
     });
   });
 
-  describe('Negative Tests', () => {
-    it('should return a schema_validation error if priority is missing', async () => {
+  describe("Negative Tests", () => {
+    it("should return a schema_validation error if priority is missing", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -290,11 +268,11 @@ decision = "allow"
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
     });
 
-    it('should return a schema_validation error if priority is a float', async () => {
+    it("should return a schema_validation error if priority is a float", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -303,12 +281,12 @@ priority = 1.5
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('integer');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain("integer");
     });
 
-    it('should return a schema_validation error if priority is negative', async () => {
+    it("should return a schema_validation error if priority is negative", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -317,12 +295,12 @@ priority = -1
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('>= 0');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain(">= 0");
     });
 
-    it('should return a schema_validation error if priority is much lower than 0', async () => {
+    it("should return a schema_validation error if priority is much lower than 0", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -331,12 +309,12 @@ priority = -9999
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('>= 0');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain(">= 0");
     });
 
-    it('should return a schema_validation error if priority is >= 1000', async () => {
+    it("should return a schema_validation error if priority is >= 1000", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -345,12 +323,12 @@ priority = 1000
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('<= 999');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain("<= 999");
     });
 
-    it('should return a schema_validation error if priority is much higher than 1000', async () => {
+    it("should return a schema_validation error if priority is much higher than 1000", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -359,12 +337,12 @@ priority = 9999
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('<= 999');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain("<= 999");
     });
 
-    it('should return a schema_validation error if decision is invalid', async () => {
+    it("should return a schema_validation error if decision is invalid", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -373,11 +351,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('decision');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("decision");
     });
 
-    it('should return a schema_validation error if toolName is not a string or array', async () => {
+    it("should return a schema_validation error if toolName is not a string or array", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = 123
@@ -386,11 +364,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('toolName');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("toolName");
     });
 
-    it('should return a rule_validation error if commandRegex is used with wrong toolName', async () => {
+    it("should return a rule_validation error if commandRegex is used with wrong toolName", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "not_shell"
@@ -400,11 +378,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('rule_validation');
-      expect(error.details).toContain('run_shell_command');
+      expect(error.errorType).toBe("rule_validation");
+      expect(error.details).toContain("run_shell_command");
     });
 
-    it('should return a rule_validation error if commandPrefix and commandRegex are combined', async () => {
+    it("should return a rule_validation error if commandPrefix and commandRegex are combined", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -415,11 +393,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('rule_validation');
-      expect(error.details).toContain('mutually exclusive');
+      expect(error.errorType).toBe("rule_validation");
+      expect(error.details).toContain("mutually exclusive");
     });
 
-    it('should return a regex_compilation error for invalid argsPattern', async () => {
+    it("should return a regex_compilation error for invalid argsPattern", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -429,26 +407,22 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('regex_compilation');
-      expect(error.message).toBe('Invalid regex pattern');
+      expect(error.errorType).toBe("regex_compilation");
+      expect(error.message).toBe("Invalid regex pattern");
     });
 
-    it('should return a file_read error if readdir fails', async () => {
+    it("should return a file_read error if readdir fails", async () => {
       // Create a file and pass it as a directory to trigger ENOTDIR
-      const filePath = path.join(tempDir, 'not-a-dir');
-      await fs.writeFile(filePath, 'content');
+      const filePath = path.join(tempDir, "not-a-dir");
+      await fs.writeFile(filePath, "content");
 
       const getPolicyTier = (_dir: string) => 1;
-      const result = await loadPoliciesFromToml(
-        ApprovalMode.DEFAULT,
-        [filePath],
-        getPolicyTier,
-      );
+      const result = await loadPoliciesFromToml(ApprovalMode.DEFAULT, [filePath], getPolicyTier);
 
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('file_read');
-      expect(error.message).toContain('Failed to read policy directory');
+      expect(error.errorType).toBe("file_read");
+      expect(error.message).toContain("Failed to read policy directory");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/policy/toml-loader.ts b/packages/gemini-cli-core/src/policy/toml-loader.ts
index ed63db092..c8fc91e0f 100644
--- a/packages/gemini-cli-core/src/policy/toml-loader.ts
+++ b/packages/gemini-cli-core/src/policy/toml-loader.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import fs from "node:fs/promises";
+import path from "node:path";
+import toml from "@iarna/toml";
+import { type ZodError, z } from "zod";
 import {
-  type PolicyRule,
-  PolicyDecision,
   type ApprovalMode,
+  InProcessCheckerType,
+  PolicyDecision,
+  type PolicyRule,
   type SafetyCheckerConfig,
   type SafetyCheckerRule,
-  InProcessCheckerType,
-} from './types.js';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import toml from '@iarna/toml';
-import { z, type ZodError } from 'zod';
+} from "./types.js";
 
 /**
  * Schema for a single policy rule in the TOML file (before transformation).
@@ -34,14 +34,14 @@ const PolicyRuleSchema = z.object({
   // - Tier 3 (admin): range [3.000, 3.999]
   priority: z
     .number({
-      required_error: 'priority is required',
-      invalid_type_error: 'priority must be a number',
+      required_error: "priority is required",
+      invalid_type_error: "priority must be a number",
     })
-    .int({ message: 'priority must be an integer' })
-    .min(0, { message: 'priority must be >= 0' })
+    .int({ message: "priority must be an integer" })
+    .min(0, { message: "priority must be >= 0" })
     .max(999, {
       message:
-        'priority must be <= 999 to prevent tier overflow. Priorities >= 1000 would jump to the next tier.',
+        "priority must be <= 999 to prevent tier overflow. Priorities >= 1000 would jump to the next tier.",
     }),
   modes: z.array(z.string()).optional(),
 });
@@ -57,15 +57,15 @@ const SafetyCheckerRuleSchema = z.object({
   commandRegex: z.string().optional(),
   priority: z.number().int().default(0),
   modes: z.array(z.string()).optional(),
-  checker: z.discriminatedUnion('type', [
+  checker: z.discriminatedUnion("type", [
     z.object({
-      type: z.literal('in-process'),
+      type: z.literal("in-process"),
       name: z.nativeEnum(InProcessCheckerType),
       required_context: z.array(z.string()).optional(),
       config: z.record(z.unknown()).optional(),
     }),
     z.object({
-      type: z.literal('external'),
+      type: z.literal("external"),
       name: z.string(),
       required_context: z.array(z.string()).optional(),
       config: z.record(z.unknown()).optional(),
@@ -90,11 +90,11 @@ type PolicyRuleToml = z.infer<typeof PolicyRuleSchema>;
  * Types of errors that can occur while loading policy files.
  */
 export type PolicyFileErrorType =
-  | 'file_read'
-  | 'toml_parse'
-  | 'schema_validation'
-  | 'rule_validation'
-  | 'regex_compilation';
+  | "file_read"
+  | "toml_parse"
+  | "schema_validation"
+  | "rule_validation"
+  | "regex_compilation";
 
 /**
  * Detailed error information for policy file loading failures.
@@ -102,7 +102,7 @@ export type PolicyFileErrorType =
 export interface PolicyFileError {
   filePath: string;
   fileName: string;
-  tier: 'default' | 'user' | 'admin';
+  tier: "default" | "user" | "admin";
   ruleIndex?: number;
   errorType: PolicyFileErrorType;
   message: string;
@@ -127,17 +127,17 @@ export interface PolicyLoadResult {
  * @returns The escaped string safe for use in a regex
  */
 function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
 /**
  * Converts a tier number to a human-readable tier name.
  */
-function getTierName(tier: number): 'default' | 'user' | 'admin' {
-  if (tier === 1) return 'default';
-  if (tier === 2) return 'user';
-  if (tier === 3) return 'admin';
-  return 'default';
+function getTierName(tier: number): "default" | "user" | "admin" {
+  if (tier === 1) return "default";
+  if (tier === 2) return "user";
+  if (tier === 3) return "admin";
+  return "default";
 }
 
 /**
@@ -146,10 +146,10 @@ function getTierName(tier: number): 'default' | 'user' | 'admin' {
 function formatSchemaError(error: ZodError, ruleIndex: number): string {
   const issues = error.issues
     .map((issue) => {
-      const path = issue.path.join('.');
+      const path = issue.path.join(".");
       return `  - Field "${path}": ${issue.message}`;
     })
-    .join('\n');
+    .join("\n");
   return `Invalid policy rule (rule #${ruleIndex + 1}):\n${issues}`;
 }
 
@@ -157,17 +157,14 @@ function formatSchemaError(error: ZodError, ruleIndex: number): string {
  * Validates shell command convenience syntax rules.
  * Returns an error message if invalid, or null if valid.
  */
-function validateShellCommandSyntax(
-  rule: PolicyRuleToml,
-  ruleIndex: number,
-): string | null {
+function validateShellCommandSyntax(rule: PolicyRuleToml, ruleIndex: number): string | null {
   const hasCommandPrefix = rule.commandPrefix !== undefined;
   const hasCommandRegex = rule.commandRegex !== undefined;
   const hasArgsPattern = rule.argsPattern !== undefined;
 
   if (hasCommandPrefix || hasCommandRegex) {
     // Must have exactly toolName = "run_shell_command"
-    if (rule.toolName !== 'run_shell_command' || Array.isArray(rule.toolName)) {
+    if (rule.toolName !== "run_shell_command" || Array.isArray(rule.toolName)) {
       return (
         `Rule #${ruleIndex + 1}: commandPrefix and commandRegex can only be used with toolName = "run_shell_command"\n` +
         `  Found: toolName = ${JSON.stringify(rule.toolName)}\n` +
@@ -242,11 +239,11 @@ export async function loadPoliciesFromToml(
     try {
       const dirEntries = await fs.readdir(dir, { withFileTypes: true });
       filesToLoad = dirEntries
-        .filter((entry) => entry.isFile() && entry.name.endsWith('.toml'))
+        .filter((entry) => entry.isFile() && entry.name.endsWith(".toml"))
         .map((entry) => entry.name);
     } catch (e) {
       const error = e as NodeJS.ErrnoException;
-      if (error.code === 'ENOENT') {
+      if (error.code === "ENOENT") {
         // Directory doesn't exist, skip it (not an error)
         continue;
       }
@@ -254,7 +251,7 @@ export async function loadPoliciesFromToml(
         filePath: dir,
         fileName: path.basename(dir),
         tier: tierName,
-        errorType: 'file_read',
+        errorType: "file_read",
         message: `Failed to read policy directory`,
         details: error.message,
       });
@@ -266,7 +263,7 @@ export async function loadPoliciesFromToml(
 
       try {
         // Read file
-        const fileContent = await fs.readFile(filePath, 'utf-8');
+        const fileContent = await fs.readFile(filePath, "utf-8");
 
         // Parse TOML
         let parsed: unknown;
@@ -278,11 +275,10 @@ export async function loadPoliciesFromToml(
             filePath,
             fileName: file,
             tier: tierName,
-            errorType: 'toml_parse',
-            message: 'TOML parsing failed',
+            errorType: "toml_parse",
+            message: "TOML parsing failed",
             details: error.message,
-            suggestion:
-              'Check for syntax errors like missing quotes, brackets, or commas',
+            suggestion: "Check for syntax errors like missing quotes, brackets, or commas",
           });
           continue;
         }
@@ -294,11 +290,11 @@ export async function loadPoliciesFromToml(
             filePath,
             fileName: file,
             tier: tierName,
-            errorType: 'schema_validation',
-            message: 'Schema validation failed',
+            errorType: "schema_validation",
+            message: "Schema validation failed",
             details: formatSchemaError(validationResult.error, 0),
             suggestion:
-              'Ensure all required fields (decision, priority) are present with correct types',
+              "Ensure all required fields (decision, priority) are present with correct types",
           });
           continue;
         }
@@ -314,8 +310,8 @@ export async function loadPoliciesFromToml(
               fileName: file,
               tier: tierName,
               ruleIndex: i,
-              errorType: 'rule_validation',
-              message: 'Invalid shell command syntax',
+              errorType: "rule_validation",
+              message: "Invalid shell command syntax",
               details: validationError,
             });
             // Continue to next rule, don't skip the entire file
@@ -348,9 +344,7 @@ export async function loadPoliciesFromToml(
             // Expand command prefixes to multiple patterns
             const argsPatterns: Array<string | undefined> =
               commandPrefixes.length > 0
-                ? commandPrefixes.map(
-                    (prefix) => `"command":"${escapeRegex(prefix)}`,
-                  )
+                ? commandPrefixes.map((prefix) => `"command":"${escapeRegex(prefix)}`)
                 : [effectiveArgsPattern];
 
             // For each argsPattern, expand toolName arrays
@@ -389,11 +383,11 @@ export async function loadPoliciesFromToml(
                       filePath,
                       fileName: file,
                       tier: tierName,
-                      errorType: 'regex_compilation',
-                      message: 'Invalid regex pattern',
+                      errorType: "regex_compilation",
+                      message: "Invalid regex pattern",
                       details: `Pattern: ${argsPattern}\nError: ${error.message}`,
                       suggestion:
-                        'Check regex syntax for errors like unmatched brackets or invalid escape sequences',
+                        "Check regex syntax for errors like unmatched brackets or invalid escape sequences",
                     });
                     // Skip this rule if regex compilation fails
                     return null;
@@ -409,9 +403,7 @@ export async function loadPoliciesFromToml(
         rules.push(...parsedRules);
 
         // Transform checkers
-        const parsedCheckers: SafetyCheckerRule[] = (
-          validationResult.data.safety_checker ?? []
-        )
+        const parsedCheckers: SafetyCheckerRule[] = (validationResult.data.safety_checker ?? [])
           .filter((checker) => {
             if (!checker.modes || checker.modes.length === 0) {
               return true;
@@ -433,9 +425,7 @@ export async function loadPoliciesFromToml(
 
             const argsPatterns: Array<string | undefined> =
               commandPrefixes.length > 0
-                ? commandPrefixes.map(
-                    (prefix) => `"command":"${escapeRegex(prefix)}`,
-                  )
+                ? commandPrefixes.map((prefix) => `"command":"${escapeRegex(prefix)}`)
                 : [effectiveArgsPattern];
 
             return argsPatterns.flatMap((argsPattern) => {
@@ -470,8 +460,8 @@ export async function loadPoliciesFromToml(
                       filePath,
                       fileName: file,
                       tier: tierName,
-                      errorType: 'regex_compilation',
-                      message: 'Invalid regex pattern in safety checker',
+                      errorType: "regex_compilation",
+                      message: "Invalid regex pattern in safety checker",
                       details: `Pattern: ${argsPattern}\nError: ${error.message}`,
                     });
                     return null;
@@ -488,13 +478,13 @@ export async function loadPoliciesFromToml(
       } catch (e) {
         const error = e as NodeJS.ErrnoException;
         // Catch-all for unexpected errors
-        if (error.code !== 'ENOENT') {
+        if (error.code !== "ENOENT") {
           errors.push({
             filePath,
             fileName: file,
             tier: tierName,
-            errorType: 'file_read',
-            message: 'Failed to read policy file',
+            errorType: "file_read",
+            message: "Failed to read policy file",
             details: error.message,
           });
         }
diff --git a/packages/gemini-cli-core/src/policy/types.ts b/packages/gemini-cli-core/src/policy/types.ts
index 410d9ff1c..ea8f49aaa 100644
--- a/packages/gemini-cli-core/src/policy/types.ts
+++ b/packages/gemini-cli-core/src/policy/types.ts
@@ -4,48 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SafetyCheckInput } from '../safety/protocol.js';
+import type { SafetyCheckInput } from "../safety/protocol.js";
 
 export enum PolicyDecision {
-  ALLOW = 'allow',
-  DENY = 'deny',
-  ASK_USER = 'ask_user',
+  ALLOW = "allow",
+  DENY = "deny",
+  ASK_USER = "ask_user",
 }
 
 /**
  * Valid sources for hook execution
  */
-export type HookSource = 'project' | 'user' | 'system' | 'extension';
+export type HookSource = "project" | "user" | "system" | "extension";
 
 /**
  * Array of valid hook source values for runtime validation
  */
-const VALID_HOOK_SOURCES: HookSource[] = [
-  'project',
-  'user',
-  'system',
-  'extension',
-];
+const VALID_HOOK_SOURCES: HookSource[] = ["project", "user", "system", "extension"];
 
 /**
  * Safely extract and validate hook source from input
  * Returns 'project' as default if the value is invalid or missing
  */
 export function getHookSource(input: Record<string, unknown>): HookSource {
-  const source = input['hook_source'];
-  if (
-    typeof source === 'string' &&
-    VALID_HOOK_SOURCES.includes(source as HookSource)
-  ) {
+  const source = input["hook_source"];
+  if (typeof source === "string" && VALID_HOOK_SOURCES.includes(source as HookSource)) {
     return source as HookSource;
   }
-  return 'project';
+  return "project";
 }
 
 export enum ApprovalMode {
-  DEFAULT = 'default',
-  AUTO_EDIT = 'autoEdit',
-  YOLO = 'yolo',
+  DEFAULT = "default",
+  AUTO_EDIT = "autoEdit",
+  YOLO = "yolo",
 }
 
 /**
@@ -67,32 +59,30 @@ export interface AllowedPathConfig {
  * Base interface for external checkers.
  */
 export interface ExternalCheckerConfig {
-  type: 'external';
+  type: "external";
   name: string;
   config?: unknown;
-  required_context?: Array<keyof SafetyCheckInput['context']>;
+  required_context?: Array<keyof SafetyCheckInput["context"]>;
 }
 
 export enum InProcessCheckerType {
-  ALLOWED_PATH = 'allowed-path',
+  ALLOWED_PATH = "allowed-path",
 }
 
 /**
  * Base interface for in-process checkers.
  */
 export interface InProcessCheckerConfig {
-  type: 'in-process';
+  type: "in-process";
   name: InProcessCheckerType;
   config?: AllowedPathConfig;
-  required_context?: Array<keyof SafetyCheckInput['context']>;
+  required_context?: Array<keyof SafetyCheckInput["context"]>;
 }
 
 /**
  * A discriminated union for all safety checker configurations.
  */
-export type SafetyCheckerConfig =
-  | ExternalCheckerConfig
-  | InProcessCheckerConfig;
+export type SafetyCheckerConfig = ExternalCheckerConfig | InProcessCheckerConfig;
 
 export interface PolicyRule {
   /**
diff --git a/packages/gemini-cli-core/src/prompts/mcp-prompts.test.ts b/packages/gemini-cli-core/src/prompts/mcp-prompts.test.ts
index 9ce9d22e7..22201d5bd 100644
--- a/packages/gemini-cli-core/src/prompts/mcp-prompts.test.ts
+++ b/packages/gemini-cli-core/src/prompts/mcp-prompts.test.ts
@@ -4,45 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { getMCPServerPrompts } from './mcp-prompts.js';
-import type { Config } from '../config/config.js';
-import { PromptRegistry } from './prompt-registry.js';
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
-
-describe('getMCPServerPrompts', () => {
-  it('should return prompts from the registry for a given server', () => {
+import { describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
+import { getMCPServerPrompts } from "./mcp-prompts.js";
+import { PromptRegistry } from "./prompt-registry.js";
+
+describe("getMCPServerPrompts", () => {
+  it("should return prompts from the registry for a given server", () => {
     const mockPrompts: DiscoveredMCPPrompt[] = [
       {
-        name: 'prompt1',
-        serverName: 'server1',
+        name: "prompt1",
+        serverName: "server1",
         invoke: async () => ({
-          messages: [
-            { role: 'assistant', content: { type: 'text', text: '' } },
-          ],
+          messages: [{ role: "assistant", content: { type: "text", text: "" } }],
         }),
       },
     ];
 
     const mockRegistry = new PromptRegistry();
-    vi.spyOn(mockRegistry, 'getPromptsByServer').mockReturnValue(mockPrompts);
+    vi.spyOn(mockRegistry, "getPromptsByServer").mockReturnValue(mockPrompts);
 
     const mockConfig = {
       getPromptRegistry: () => mockRegistry,
     } as unknown as Config;
 
-    const result = getMCPServerPrompts(mockConfig, 'server1');
+    const result = getMCPServerPrompts(mockConfig, "server1");
 
-    expect(mockRegistry.getPromptsByServer).toHaveBeenCalledWith('server1');
+    expect(mockRegistry.getPromptsByServer).toHaveBeenCalledWith("server1");
     expect(result).toEqual(mockPrompts);
   });
 
-  it('should return an empty array if there is no prompt registry', () => {
+  it("should return an empty array if there is no prompt registry", () => {
     const mockConfig = {
       getPromptRegistry: () => undefined,
     } as unknown as Config;
 
-    const result = getMCPServerPrompts(mockConfig, 'server1');
+    const result = getMCPServerPrompts(mockConfig, "server1");
 
     expect(result).toEqual([]);
   });
diff --git a/packages/gemini-cli-core/src/prompts/mcp-prompts.ts b/packages/gemini-cli-core/src/prompts/mcp-prompts.ts
index 01096cf06..6274ccb96 100644
--- a/packages/gemini-cli-core/src/prompts/mcp-prompts.ts
+++ b/packages/gemini-cli-core/src/prompts/mcp-prompts.ts
@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
+import type { Config } from "../config/config.js";
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
 
-export function getMCPServerPrompts(
-  config: Config,
-  serverName: string,
-): DiscoveredMCPPrompt[] {
+export function getMCPServerPrompts(config: Config, serverName: string): DiscoveredMCPPrompt[] {
   const promptRegistry = config.getPromptRegistry();
   if (!promptRegistry) {
     return [];
diff --git a/packages/gemini-cli-core/src/prompts/prompt-registry.test.ts b/packages/gemini-cli-core/src/prompts/prompt-registry.test.ts
index 9c6458e76..0975df91c 100644
--- a/packages/gemini-cli-core/src/prompts/prompt-registry.test.ts
+++ b/packages/gemini-cli-core/src/prompts/prompt-registry.test.ts
@@ -4,47 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { PromptRegistry } from './prompt-registry.js';
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { PromptRegistry } from "./prompt-registry.js";
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: {
     warn: vi.fn(),
   },
 }));
 
-describe('PromptRegistry', () => {
+describe("PromptRegistry", () => {
   let registry: PromptRegistry;
 
   const prompt1: DiscoveredMCPPrompt = {
-    name: 'prompt1',
-    serverName: 'server1',
+    name: "prompt1",
+    serverName: "server1",
     invoke: async () => ({
-      messages: [
-        { role: 'assistant', content: { type: 'text', text: 'response1' } },
-      ],
+      messages: [{ role: "assistant", content: { type: "text", text: "response1" } }],
     }),
   };
 
   const prompt2: DiscoveredMCPPrompt = {
-    name: 'prompt2',
-    serverName: 'server1',
+    name: "prompt2",
+    serverName: "server1",
     invoke: async () => ({
-      messages: [
-        { role: 'assistant', content: { type: 'text', text: 'response2' } },
-      ],
+      messages: [{ role: "assistant", content: { type: "text", text: "response2" } }],
     }),
   };
 
   const prompt3: DiscoveredMCPPrompt = {
-    name: 'prompt1',
-    serverName: 'server2',
+    name: "prompt1",
+    serverName: "server2",
     invoke: async () => ({
-      messages: [
-        { role: 'assistant', content: { type: 'text', text: 'response3' } },
-      ],
+      messages: [{ role: "assistant", content: { type: "text", text: "response3" } }],
     }),
   };
 
@@ -53,62 +47,62 @@ describe('PromptRegistry', () => {
     vi.clearAllMocks();
   });
 
-  it('should register a prompt', () => {
+  it("should register a prompt", () => {
     registry.registerPrompt(prompt1);
-    expect(registry.getPrompt('prompt1')).toEqual(prompt1);
+    expect(registry.getPrompt("prompt1")).toEqual(prompt1);
   });
 
-  it('should get all prompts, sorted by name', () => {
+  it("should get all prompts, sorted by name", () => {
     registry.registerPrompt(prompt2);
     registry.registerPrompt(prompt1);
     expect(registry.getAllPrompts()).toEqual([prompt1, prompt2]);
   });
 
-  it('should get a specific prompt by name', () => {
+  it("should get a specific prompt by name", () => {
     registry.registerPrompt(prompt1);
-    expect(registry.getPrompt('prompt1')).toEqual(prompt1);
-    expect(registry.getPrompt('non-existent')).toBeUndefined();
+    expect(registry.getPrompt("prompt1")).toEqual(prompt1);
+    expect(registry.getPrompt("non-existent")).toBeUndefined();
   });
 
-  it('should get prompts by server, sorted by name', () => {
+  it("should get prompts by server, sorted by name", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt2);
     registry.registerPrompt(prompt3); // different server
-    expect(registry.getPromptsByServer('server1')).toEqual([prompt1, prompt2]);
-    expect(registry.getPromptsByServer('server2')).toEqual([
-      { ...prompt3, name: 'server2_prompt1' },
+    expect(registry.getPromptsByServer("server1")).toEqual([prompt1, prompt2]);
+    expect(registry.getPromptsByServer("server2")).toEqual([
+      { ...prompt3, name: "server2_prompt1" },
     ]);
   });
 
-  it('should handle prompt name collision by renaming', () => {
+  it("should handle prompt name collision by renaming", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt3);
 
-    expect(registry.getPrompt('prompt1')).toEqual(prompt1);
-    const renamedPrompt = { ...prompt3, name: 'server2_prompt1' };
-    expect(registry.getPrompt('server2_prompt1')).toEqual(renamedPrompt);
+    expect(registry.getPrompt("prompt1")).toEqual(prompt1);
+    const renamedPrompt = { ...prompt3, name: "server2_prompt1" };
+    expect(registry.getPrompt("server2_prompt1")).toEqual(renamedPrompt);
     expect(debugLogger.warn).toHaveBeenCalledWith(
       'Prompt with name "prompt1" is already registered. Renaming to "server2_prompt1".',
     );
   });
 
-  it('should clear all prompts', () => {
+  it("should clear all prompts", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt2);
     registry.clear();
     expect(registry.getAllPrompts()).toEqual([]);
   });
 
-  it('should remove prompts by server', () => {
+  it("should remove prompts by server", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt2);
     registry.registerPrompt(prompt3);
-    registry.removePromptsByServer('server1');
+    registry.removePromptsByServer("server1");
 
-    const renamedPrompt = { ...prompt3, name: 'server2_prompt1' };
+    const renamedPrompt = { ...prompt3, name: "server2_prompt1" };
     expect(registry.getAllPrompts()).toEqual([renamedPrompt]);
-    expect(registry.getPrompt('prompt1')).toBeUndefined();
-    expect(registry.getPrompt('prompt2')).toBeUndefined();
-    expect(registry.getPrompt('server2_prompt1')).toEqual(renamedPrompt);
+    expect(registry.getPrompt("prompt1")).toBeUndefined();
+    expect(registry.getPrompt("prompt2")).toBeUndefined();
+    expect(registry.getPrompt("server2_prompt1")).toEqual(renamedPrompt);
   });
 });
diff --git a/packages/gemini-cli-core/src/prompts/prompt-registry.ts b/packages/gemini-cli-core/src/prompts/prompt-registry.ts
index 921d8bc41..3af4b69c9 100644
--- a/packages/gemini-cli-core/src/prompts/prompt-registry.ts
+++ b/packages/gemini-cli-core/src/prompts/prompt-registry.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
+import { debugLogger } from "../utils/debugLogger.js";
 
 export class PromptRegistry {
   private prompts: Map<string, DiscoveredMCPPrompt> = new Map();
@@ -30,9 +30,7 @@ export class PromptRegistry {
    * Returns an array of all registered and discovered prompt instances.
    */
   getAllPrompts(): DiscoveredMCPPrompt[] {
-    return Array.from(this.prompts.values()).sort((a, b) =>
-      a.name.localeCompare(b.name),
-    );
+    return Array.from(this.prompts.values()).sort((a, b) => a.name.localeCompare(b.name));
   }
 
   /**
diff --git a/packages/gemini-cli-core/src/resources/resource-registry.test.ts b/packages/gemini-cli-core/src/resources/resource-registry.test.ts
index 29b34d316..dfff23c2e 100644
--- a/packages/gemini-cli-core/src/resources/resource-registry.test.ts
+++ b/packages/gemini-cli-core/src/resources/resource-registry.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it, beforeEach } from 'vitest';
-import type { Resource } from '@modelcontextprotocol/sdk/types.js';
-import { ResourceRegistry } from './resource-registry.js';
+import type { Resource } from "@modelcontextprotocol/sdk/types.js";
+import { beforeEach, describe, expect, it } from "vitest";
+import { ResourceRegistry } from "./resource-registry.js";
 
-describe('ResourceRegistry', () => {
+describe("ResourceRegistry", () => {
   let registry: ResourceRegistry;
 
   beforeEach(() => {
@@ -16,61 +16,44 @@ describe('ResourceRegistry', () => {
   });
 
   const createResource = (overrides: Partial<Resource> = {}): Resource => ({
-    uri: 'file:///tmp/foo.txt',
-    name: 'foo',
-    description: 'example resource',
-    mimeType: 'text/plain',
+    uri: "file:///tmp/foo.txt",
+    name: "foo",
+    description: "example resource",
+    mimeType: "text/plain",
     ...overrides,
   });
 
-  it('stores resources per server', () => {
-    registry.setResourcesForServer('a', [createResource()]);
-    registry.setResourcesForServer('b', [createResource({ uri: 'foo' })]);
+  it("stores resources per server", () => {
+    registry.setResourcesForServer("a", [createResource()]);
+    registry.setResourcesForServer("b", [createResource({ uri: "foo" })]);
 
-    expect(
-      registry.getAllResources().filter((res) => res.serverName === 'a'),
-    ).toHaveLength(1);
-    expect(
-      registry.getAllResources().filter((res) => res.serverName === 'b'),
-    ).toHaveLength(1);
+    expect(registry.getAllResources().filter((res) => res.serverName === "a")).toHaveLength(1);
+    expect(registry.getAllResources().filter((res) => res.serverName === "b")).toHaveLength(1);
   });
 
-  it('clears resources for server before adding new ones', () => {
-    registry.setResourcesForServer('a', [
-      createResource(),
-      createResource({ uri: 'bar' }),
-    ]);
-    registry.setResourcesForServer('a', [createResource({ uri: 'baz' })]);
+  it("clears resources for server before adding new ones", () => {
+    registry.setResourcesForServer("a", [createResource(), createResource({ uri: "bar" })]);
+    registry.setResourcesForServer("a", [createResource({ uri: "baz" })]);
 
-    const resources = registry
-      .getAllResources()
-      .filter((res) => res.serverName === 'a');
+    const resources = registry.getAllResources().filter((res) => res.serverName === "a");
     expect(resources).toHaveLength(1);
-    expect(resources[0].uri).toBe('baz');
+    expect(resources[0].uri).toBe("baz");
   });
 
-  it('finds resources by serverName:uri identifier', () => {
-    registry.setResourcesForServer('a', [createResource()]);
-    registry.setResourcesForServer('b', [
-      createResource({ uri: 'file:///tmp/bar.txt' }),
-    ]);
+  it("finds resources by serverName:uri identifier", () => {
+    registry.setResourcesForServer("a", [createResource()]);
+    registry.setResourcesForServer("b", [createResource({ uri: "file:///tmp/bar.txt" })]);
 
-    expect(
-      registry.findResourceByUri('b:file:///tmp/bar.txt')?.serverName,
-    ).toBe('b');
-    expect(
-      registry.findResourceByUri('a:file:///tmp/foo.txt')?.serverName,
-    ).toBe('a');
-    expect(registry.findResourceByUri('a:file:///tmp/bar.txt')).toBeUndefined();
-    expect(registry.findResourceByUri('nonexistent')).toBeUndefined();
+    expect(registry.findResourceByUri("b:file:///tmp/bar.txt")?.serverName).toBe("b");
+    expect(registry.findResourceByUri("a:file:///tmp/foo.txt")?.serverName).toBe("a");
+    expect(registry.findResourceByUri("a:file:///tmp/bar.txt")).toBeUndefined();
+    expect(registry.findResourceByUri("nonexistent")).toBeUndefined();
   });
 
-  it('clears resources for a server', () => {
-    registry.setResourcesForServer('a', [createResource()]);
-    registry.removeResourcesByServer('a');
+  it("clears resources for a server", () => {
+    registry.setResourcesForServer("a", [createResource()]);
+    registry.removeResourcesByServer("a");
 
-    expect(
-      registry.getAllResources().filter((res) => res.serverName === 'a'),
-    ).toHaveLength(0);
+    expect(registry.getAllResources().filter((res) => res.serverName === "a")).toHaveLength(0);
   });
 });
diff --git a/packages/gemini-cli-core/src/resources/resource-registry.ts b/packages/gemini-cli-core/src/resources/resource-registry.ts
index 1c2c75450..f4019b521 100644
--- a/packages/gemini-cli-core/src/resources/resource-registry.ts
+++ b/packages/gemini-cli-core/src/resources/resource-registry.ts
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Resource } from '@modelcontextprotocol/sdk/types.js';
+import type { Resource } from "@modelcontextprotocol/sdk/types.js";
 
-const resourceKey = (serverName: string, uri: string): string =>
-  `${serverName}::${uri}`;
+const resourceKey = (serverName: string, uri: string): string => `${serverName}::${uri}`;
 
 export interface MCPResource extends Resource {
   serverName: string;
@@ -49,7 +48,7 @@ export class ResourceRegistry {
    * Format: serverName:uri (e.g., "myserver:file:///data.txt")
    */
   findResourceByUri(identifier: string): MCPResource | undefined {
-    const colonIndex = identifier.indexOf(':');
+    const colonIndex = identifier.indexOf(":");
     if (colonIndex <= 0) {
       return undefined;
     }
diff --git a/packages/gemini-cli-core/src/routing/modelRouterService.test.ts b/packages/gemini-cli-core/src/routing/modelRouterService.test.ts
index da1b659d7..84a638b91 100644
--- a/packages/gemini-cli-core/src/routing/modelRouterService.test.ts
+++ b/packages/gemini-cli-core/src/routing/modelRouterService.test.ts
@@ -4,34 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ModelRouterService } from './modelRouterService.js';
-import { Config } from '../config/config.js';
-import {
-  PREVIEW_GEMINI_MODEL,
-  DEFAULT_GEMINI_MODEL,
-} from '../config/models.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { RoutingContext, RoutingDecision } from './routingStrategy.js';
-import { DefaultStrategy } from './strategies/defaultStrategy.js';
-import { CompositeStrategy } from './strategies/compositeStrategy.js';
-import { FallbackStrategy } from './strategies/fallbackStrategy.js';
-import { OverrideStrategy } from './strategies/overrideStrategy.js';
-import { ClassifierStrategy } from './strategies/classifierStrategy.js';
-import { logModelRouting } from '../telemetry/loggers.js';
-import { ModelRoutingEvent } from '../telemetry/types.js';
-
-vi.mock('../config/config.js');
-vi.mock('../core/baseLlmClient.js');
-vi.mock('./strategies/defaultStrategy.js');
-vi.mock('./strategies/compositeStrategy.js');
-vi.mock('./strategies/fallbackStrategy.js');
-vi.mock('./strategies/overrideStrategy.js');
-vi.mock('./strategies/classifierStrategy.js');
-vi.mock('../telemetry/loggers.js');
-vi.mock('../telemetry/types.js');
-
-describe('ModelRouterService', () => {
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL } from "../config/models.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { logModelRouting } from "../telemetry/loggers.js";
+import { ModelRoutingEvent } from "../telemetry/types.js";
+import { ModelRouterService } from "./modelRouterService.js";
+import type { RoutingContext, RoutingDecision } from "./routingStrategy.js";
+import { ClassifierStrategy } from "./strategies/classifierStrategy.js";
+import { CompositeStrategy } from "./strategies/compositeStrategy.js";
+import { DefaultStrategy } from "./strategies/defaultStrategy.js";
+import { FallbackStrategy } from "./strategies/fallbackStrategy.js";
+import { OverrideStrategy } from "./strategies/overrideStrategy.js";
+
+vi.mock("../config/config.js");
+vi.mock("../core/baseLlmClient.js");
+vi.mock("./strategies/defaultStrategy.js");
+vi.mock("./strategies/compositeStrategy.js");
+vi.mock("./strategies/fallbackStrategy.js");
+vi.mock("./strategies/overrideStrategy.js");
+vi.mock("./strategies/classifierStrategy.js");
+vi.mock("../telemetry/loggers.js");
+vi.mock("../telemetry/types.js");
+
+describe("ModelRouterService", () => {
   let service: ModelRouterService;
   let mockConfig: Config;
   let mockBaseLlmClient: BaseLlmClient;
@@ -43,7 +40,7 @@ describe('ModelRouterService', () => {
 
     mockConfig = new Config({} as never);
     mockBaseLlmClient = {} as BaseLlmClient;
-    vi.spyOn(mockConfig, 'getBaseLlmClient').mockReturnValue(mockBaseLlmClient);
+    vi.spyOn(mockConfig, "getBaseLlmClient").mockReturnValue(mockBaseLlmClient);
 
     mockCompositeStrategy = new CompositeStrategy(
       [
@@ -52,27 +49,25 @@ describe('ModelRouterService', () => {
         new ClassifierStrategy(),
         new DefaultStrategy(),
       ],
-      'agent-router',
-    );
-    vi.mocked(CompositeStrategy).mockImplementation(
-      () => mockCompositeStrategy,
+      "agent-router",
     );
+    vi.mocked(CompositeStrategy).mockImplementation(() => mockCompositeStrategy);
 
     service = new ModelRouterService(mockConfig);
 
     mockContext = {
       history: [],
-      request: [{ text: 'test prompt' }],
+      request: [{ text: "test prompt" }],
       signal: new AbortController().signal,
     };
   });
 
-  it('should initialize with a CompositeStrategy', () => {
+  it("should initialize with a CompositeStrategy", () => {
     expect(CompositeStrategy).toHaveBeenCalled();
-    expect(service['strategy']).toBeInstanceOf(CompositeStrategy);
+    expect(service["strategy"]).toBeInstanceOf(CompositeStrategy);
   });
 
-  it('should initialize the CompositeStrategy with the correct child strategies in order', () => {
+  it("should initialize the CompositeStrategy with the correct child strategies in order", () => {
     // This test relies on the mock implementation detail of the constructor
     const compositeStrategyArgs = vi.mocked(CompositeStrategy).mock.calls[0];
     const childStrategies = compositeStrategyArgs[0];
@@ -82,132 +77,120 @@ describe('ModelRouterService', () => {
     expect(childStrategies[1]).toBeInstanceOf(OverrideStrategy);
     expect(childStrategies[2]).toBeInstanceOf(ClassifierStrategy);
     expect(childStrategies[3]).toBeInstanceOf(DefaultStrategy);
-    expect(compositeStrategyArgs[1]).toBe('agent-router');
+    expect(compositeStrategyArgs[1]).toBe("agent-router");
   });
 
-  describe('route()', () => {
+  describe("route()", () => {
     const strategyDecision: RoutingDecision = {
-      model: 'strategy-chosen-model',
+      model: "strategy-chosen-model",
       metadata: {
-        source: 'test-router/fallback',
+        source: "test-router/fallback",
         latencyMs: 10,
-        reasoning: 'Strategy reasoning',
+        reasoning: "Strategy reasoning",
       },
     };
 
-    it('should delegate routing to the composite strategy', async () => {
+    it("should delegate routing to the composite strategy", async () => {
       const strategySpy = vi
-        .spyOn(mockCompositeStrategy, 'route')
+        .spyOn(mockCompositeStrategy, "route")
         .mockResolvedValue(strategyDecision);
 
       const decision = await service.route(mockContext);
 
-      expect(strategySpy).toHaveBeenCalledWith(
-        mockContext,
-        mockConfig,
-        mockBaseLlmClient,
-      );
+      expect(strategySpy).toHaveBeenCalledWith(mockContext, mockConfig, mockBaseLlmClient);
       expect(decision).toEqual(strategyDecision);
     });
 
-    it('should log a telemetry event on a successful decision', async () => {
-      vi.spyOn(mockCompositeStrategy, 'route').mockResolvedValue(
-        strategyDecision,
-      );
+    it("should log a telemetry event on a successful decision", async () => {
+      vi.spyOn(mockCompositeStrategy, "route").mockResolvedValue(strategyDecision);
 
       await service.route(mockContext);
 
       expect(ModelRoutingEvent).toHaveBeenCalledWith(
-        'strategy-chosen-model',
-        'test-router/fallback',
+        "strategy-chosen-model",
+        "test-router/fallback",
         10,
-        'Strategy reasoning',
+        "Strategy reasoning",
         false,
         undefined,
       );
-      expect(logModelRouting).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(ModelRoutingEvent),
-      );
+      expect(logModelRouting).toHaveBeenCalledWith(mockConfig, expect.any(ModelRoutingEvent));
     });
 
-    it('should log a telemetry event and re-throw on a failed decision', async () => {
-      const testError = new Error('Strategy failed');
-      vi.spyOn(mockCompositeStrategy, 'route').mockRejectedValue(testError);
-      vi.spyOn(mockConfig, 'getModel').mockReturnValue('default-model');
+    it("should log a telemetry event and re-throw on a failed decision", async () => {
+      const testError = new Error("Strategy failed");
+      vi.spyOn(mockCompositeStrategy, "route").mockRejectedValue(testError);
+      vi.spyOn(mockConfig, "getModel").mockReturnValue("default-model");
 
       await expect(service.route(mockContext)).rejects.toThrow(testError);
 
       expect(ModelRoutingEvent).toHaveBeenCalledWith(
-        'default-model',
-        'router-exception',
+        "default-model",
+        "router-exception",
         expect.any(Number),
-        'An exception occurred during routing.',
+        "An exception occurred during routing.",
         true,
-        'Strategy failed',
-      );
-      expect(logModelRouting).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(ModelRoutingEvent),
+        "Strategy failed",
       );
+      expect(logModelRouting).toHaveBeenCalledWith(mockConfig, expect.any(ModelRoutingEvent));
     });
 
-    it('should upgrade to Preview Model when preview features are enabled and model is 2.5 Pro', async () => {
-      vi.spyOn(mockCompositeStrategy, 'route').mockResolvedValue({
+    it("should upgrade to Preview Model when preview features are enabled and model is 2.5 Pro", async () => {
+      vi.spyOn(mockCompositeStrategy, "route").mockResolvedValue({
         model: DEFAULT_GEMINI_MODEL,
-        metadata: { source: 'test', latencyMs: 0, reasoning: 'test' },
+        metadata: { source: "test", latencyMs: 0, reasoning: "test" },
       });
-      vi.spyOn(mockConfig, 'getPreviewFeatures').mockReturnValue(true);
-      vi.spyOn(mockConfig, 'isPreviewModelFallbackMode').mockReturnValue(false);
+      vi.spyOn(mockConfig, "getPreviewFeatures").mockReturnValue(true);
+      vi.spyOn(mockConfig, "isPreviewModelFallbackMode").mockReturnValue(false);
 
       const decision = await service.route(mockContext);
 
       expect(decision.model).toBe(PREVIEW_GEMINI_MODEL);
     });
 
-    it('should NOT upgrade to Preview Model when preview features are disabled', async () => {
-      vi.spyOn(mockCompositeStrategy, 'route').mockResolvedValue({
+    it("should NOT upgrade to Preview Model when preview features are disabled", async () => {
+      vi.spyOn(mockCompositeStrategy, "route").mockResolvedValue({
         model: DEFAULT_GEMINI_MODEL,
-        metadata: { source: 'test', latencyMs: 0, reasoning: 'test' },
+        metadata: { source: "test", latencyMs: 0, reasoning: "test" },
       });
-      vi.spyOn(mockConfig, 'getPreviewFeatures').mockReturnValue(false);
+      vi.spyOn(mockConfig, "getPreviewFeatures").mockReturnValue(false);
 
       const decision = await service.route(mockContext);
 
       expect(decision.model).toBe(DEFAULT_GEMINI_MODEL);
     });
 
-    it('should upgrade to Preview Model when preview features are enabled and model is explicitly set to Pro', async () => {
+    it("should upgrade to Preview Model when preview features are enabled and model is explicitly set to Pro", async () => {
       // Simulate OverrideStrategy returning Preview Model (as resolveModel would do for "pro")
-      vi.spyOn(mockCompositeStrategy, 'route').mockResolvedValue({
+      vi.spyOn(mockCompositeStrategy, "route").mockResolvedValue({
         model: PREVIEW_GEMINI_MODEL,
         metadata: {
-          source: 'override',
+          source: "override",
           latencyMs: 0,
-          reasoning: 'User selected',
+          reasoning: "User selected",
         },
       });
-      vi.spyOn(mockConfig, 'getPreviewFeatures').mockReturnValue(true);
-      vi.spyOn(mockConfig, 'isPreviewModelFallbackMode').mockReturnValue(false);
+      vi.spyOn(mockConfig, "getPreviewFeatures").mockReturnValue(true);
+      vi.spyOn(mockConfig, "isPreviewModelFallbackMode").mockReturnValue(false);
 
       const decision = await service.route(mockContext);
 
       expect(decision.model).toBe(PREVIEW_GEMINI_MODEL);
     });
 
-    it('should NOT upgrade to Preview Model when preview features are enabled and model is explicitly set to a specific string', async () => {
+    it("should NOT upgrade to Preview Model when preview features are enabled and model is explicitly set to a specific string", async () => {
       // Simulate OverrideStrategy returning a specific model (e.g. "gemini-2.5-pro")
       // This happens when user explicitly sets model to "gemini-2.5-pro" instead of "pro"
-      vi.spyOn(mockCompositeStrategy, 'route').mockResolvedValue({
+      vi.spyOn(mockCompositeStrategy, "route").mockResolvedValue({
         model: DEFAULT_GEMINI_MODEL,
         metadata: {
-          source: 'override',
+          source: "override",
           latencyMs: 0,
-          reasoning: 'User selected',
+          reasoning: "User selected",
         },
       });
-      vi.spyOn(mockConfig, 'getPreviewFeatures').mockReturnValue(true);
-      vi.spyOn(mockConfig, 'isPreviewModelFallbackMode').mockReturnValue(false);
+      vi.spyOn(mockConfig, "getPreviewFeatures").mockReturnValue(true);
+      vi.spyOn(mockConfig, "isPreviewModelFallbackMode").mockReturnValue(false);
 
       const decision = await service.route(mockContext);
 
@@ -215,13 +198,13 @@ describe('ModelRouterService', () => {
       expect(decision.model).toBe(DEFAULT_GEMINI_MODEL);
     });
 
-    it('should upgrade to Preview Model even if fallback mode is active (probing behavior)', async () => {
-      vi.spyOn(mockCompositeStrategy, 'route').mockResolvedValue({
+    it("should upgrade to Preview Model even if fallback mode is active (probing behavior)", async () => {
+      vi.spyOn(mockCompositeStrategy, "route").mockResolvedValue({
         model: DEFAULT_GEMINI_MODEL,
-        metadata: { source: 'default', latencyMs: 0, reasoning: 'Default' },
+        metadata: { source: "default", latencyMs: 0, reasoning: "Default" },
       });
-      vi.spyOn(mockConfig, 'getPreviewFeatures').mockReturnValue(true);
-      vi.spyOn(mockConfig, 'isPreviewModelFallbackMode').mockReturnValue(true);
+      vi.spyOn(mockConfig, "getPreviewFeatures").mockReturnValue(true);
+      vi.spyOn(mockConfig, "isPreviewModelFallbackMode").mockReturnValue(true);
 
       const decision = await service.route(mockContext);
 
diff --git a/packages/gemini-cli-core/src/routing/modelRouterService.ts b/packages/gemini-cli-core/src/routing/modelRouterService.ts
index ae8251783..ce8c62840 100644
--- a/packages/gemini-cli-core/src/routing/modelRouterService.ts
+++ b/packages/gemini-cli-core/src/routing/modelRouterService.ts
@@ -4,24 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import {
-  PREVIEW_GEMINI_MODEL,
-  DEFAULT_GEMINI_MODEL,
-} from '../config/models.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  TerminalStrategy,
-} from './routingStrategy.js';
-import { DefaultStrategy } from './strategies/defaultStrategy.js';
-import { ClassifierStrategy } from './strategies/classifierStrategy.js';
-import { CompositeStrategy } from './strategies/compositeStrategy.js';
-import { FallbackStrategy } from './strategies/fallbackStrategy.js';
-import { OverrideStrategy } from './strategies/overrideStrategy.js';
-
-import { logModelRouting } from '../telemetry/loggers.js';
-import { ModelRoutingEvent } from '../telemetry/types.js';
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL } from "../config/models.js";
+import { logModelRouting } from "../telemetry/loggers.js";
+import { ModelRoutingEvent } from "../telemetry/types.js";
+import type { RoutingContext, RoutingDecision, TerminalStrategy } from "./routingStrategy.js";
+import { ClassifierStrategy } from "./strategies/classifierStrategy.js";
+import { CompositeStrategy } from "./strategies/compositeStrategy.js";
+import { DefaultStrategy } from "./strategies/defaultStrategy.js";
+import { FallbackStrategy } from "./strategies/fallbackStrategy.js";
+import { OverrideStrategy } from "./strategies/overrideStrategy.js";
 
 /**
  * A centralized service for making model routing decisions.
@@ -45,7 +37,7 @@ export class ModelRouterService {
         new ClassifierStrategy(),
         new DefaultStrategy(),
       ],
-      'agent-router',
+      "agent-router",
     );
   }
 
@@ -60,11 +52,7 @@ export class ModelRouterService {
     let decision: RoutingDecision;
 
     try {
-      decision = await this.strategy.route(
-        context,
-        this.config,
-        this.config.getBaseLlmClient(),
-      );
+      decision = await this.strategy.route(context, this.config, this.config.getBaseLlmClient());
 
       // Unified Preview Model Logic:
       // If the decision is to use 'gemini-2.5-pro' and preview features are enabled,
@@ -72,15 +60,15 @@ export class ModelRouterService {
       if (
         decision.model === DEFAULT_GEMINI_MODEL &&
         this.config.getPreviewFeatures() &&
-        !decision.metadata.source.includes('override')
+        !decision.metadata.source.includes("override")
       ) {
         // We ALWAYS attempt to upgrade to Preview Model here.
         // If we are in fallback mode, the 'previewModelBypassMode' flag (handled in handler.ts/geminiChat.ts)
         // will ensure we downgrade to 2.5 Pro for the actual API call if needed.
         // This allows us to "probe" Preview Model periodically (i.e., every new request tries Preview Model first).
         decision.model = PREVIEW_GEMINI_MODEL;
-        decision.metadata.source += ' (Preview Model)';
-        decision.metadata.reasoning += ' (Upgraded to Preview Model)';
+        decision.metadata.source += " (Preview Model)";
+        decision.metadata.reasoning += " (Upgraded to Preview Model)";
       }
 
       const event = new ModelRoutingEvent(
@@ -103,9 +91,9 @@ export class ModelRouterService {
       decision = {
         model: this.config.getModel(),
         metadata: {
-          source: 'router-exception',
+          source: "router-exception",
           latencyMs: Date.now() - startTime,
-          reasoning: 'An exception occurred during routing.',
+          reasoning: "An exception occurred during routing.",
           error: error_message,
         },
       };
diff --git a/packages/gemini-cli-core/src/routing/routingStrategy.ts b/packages/gemini-cli-core/src/routing/routingStrategy.ts
index d5d8df8dc..e2cc98c4c 100644
--- a/packages/gemini-cli-core/src/routing/routingStrategy.ts
+++ b/packages/gemini-cli-core/src/routing/routingStrategy.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content, PartListUnion } from '@google/genai';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { Config } from '../config/config.js';
+import type { Content, PartListUnion } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
 
 /**
  * The output of a routing decision. It specifies which model to use and why.
diff --git a/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.test.ts b/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.test.ts
index d17414318..e926d5bf9 100644
--- a/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.test.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.test.ts
@@ -4,28 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ClassifierStrategy } from './classifierStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import {
-  isFunctionCall,
-  isFunctionResponse,
-} from '../../utils/messageInspectors.js';
-import {
-  DEFAULT_GEMINI_FLASH_MODEL,
-  DEFAULT_GEMINI_MODEL,
-} from '../../config/models.js';
-import { promptIdContext } from '../../utils/promptIdContext.js';
-import type { Content } from '@google/genai';
-import type { ResolvedModelConfig } from '../../services/modelConfigService.js';
-import { debugLogger } from '../../utils/debugLogger.js';
-
-vi.mock('../../core/baseLlmClient.js');
-vi.mock('../../utils/promptIdContext.js');
-
-describe('ClassifierStrategy', () => {
+import type { Content } from "@google/genai";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { ResolvedModelConfig } from "../../services/modelConfigService.js";
+import { debugLogger } from "../../utils/debugLogger.js";
+import { isFunctionCall, isFunctionResponse } from "../../utils/messageInspectors.js";
+import { promptIdContext } from "../../utils/promptIdContext.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { ClassifierStrategy } from "./classifierStrategy.js";
+
+vi.mock("../../core/baseLlmClient.js");
+vi.mock("../../utils/promptIdContext.js");
+
+describe("ClassifierStrategy", () => {
   let strategy: ClassifierStrategy;
   let mockContext: RoutingContext;
   let mockConfig: Config;
@@ -38,12 +32,12 @@ describe('ClassifierStrategy', () => {
     strategy = new ClassifierStrategy();
     mockContext = {
       history: [],
-      request: [{ text: 'simple task' }],
+      request: [{ text: "simple task" }],
       signal: new AbortController().signal,
     };
 
     mockResolvedConfig = {
-      model: 'classifier',
+      model: "classifier",
       generateContentConfig: {},
     } as unknown as ResolvedModelConfig;
     mockConfig = {
@@ -56,182 +50,146 @@ describe('ClassifierStrategy', () => {
       generateJson: vi.fn(),
     } as unknown as BaseLlmClient;
 
-    vi.mocked(promptIdContext.getStore).mockReturnValue('test-prompt-id');
+    vi.mocked(promptIdContext.getStore).mockReturnValue("test-prompt-id");
   });
 
-  it('should call generateJson with the correct parameters', async () => {
+  it("should call generateJson with the correct parameters", async () => {
     const mockApiResponse = {
-      reasoning: 'Simple task',
-      model_choice: 'flash',
+      reasoning: "Simple task",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
         modelConfigKey: { model: mockResolvedConfig.model },
-        promptId: 'test-prompt-id',
+        promptId: "test-prompt-id",
       }),
     );
   });
 
-  it('should route to FLASH model for a simple task', async () => {
+  it("should route to FLASH model for a simple task", async () => {
     const mockApiResponse = {
-      reasoning: 'This is a simple task.',
-      model_choice: 'flash',
+      reasoning: "This is a simple task.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledOnce();
     expect(decision).toEqual({
       model: DEFAULT_GEMINI_FLASH_MODEL,
       metadata: {
-        source: 'Classifier',
+        source: "Classifier",
         latencyMs: expect.any(Number),
         reasoning: mockApiResponse.reasoning,
       },
     });
   });
 
-  it('should route to PRO model for a complex task', async () => {
+  it("should route to PRO model for a complex task", async () => {
     const mockApiResponse = {
-      reasoning: 'This is a complex task.',
-      model_choice: 'pro',
+      reasoning: "This is a complex task.",
+      model_choice: "pro",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
-    mockContext.request = [{ text: 'how do I build a spaceship?' }];
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
+    mockContext.request = [{ text: "how do I build a spaceship?" }];
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledOnce();
     expect(decision).toEqual({
       model: DEFAULT_GEMINI_MODEL,
       metadata: {
-        source: 'Classifier',
+        source: "Classifier",
         latencyMs: expect.any(Number),
         reasoning: mockApiResponse.reasoning,
       },
     });
   });
 
-  it('should return null if the classifier API call fails', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(debugLogger, 'warn')
-      .mockImplementation(() => {});
-    const testError = new Error('API Failure');
+  it("should return null if the classifier API call fails", async () => {
+    const consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
+    const testError = new Error("API Failure");
     vi.mocked(mockBaseLlmClient.generateJson).mockRejectedValue(testError);
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(decision).toBeNull();
     expect(consoleWarnSpy).toHaveBeenCalled();
     consoleWarnSpy.mockRestore();
   });
 
-  it('should return null if the classifier returns a malformed JSON object', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(debugLogger, 'warn')
-      .mockImplementation(() => {});
+  it("should return null if the classifier returns a malformed JSON object", async () => {
+    const consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
     const malformedApiResponse = {
-      reasoning: 'This is a simple task.',
+      reasoning: "This is a simple task.",
       // model_choice is missing, which will cause a Zod parsing error.
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      malformedApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(malformedApiResponse);
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(decision).toBeNull();
     expect(consoleWarnSpy).toHaveBeenCalled();
     consoleWarnSpy.mockRestore();
   });
 
-  it('should filter out tool-related history before sending to classifier', async () => {
+  it("should filter out tool-related history before sending to classifier", async () => {
     mockContext.history = [
-      { role: 'user', parts: [{ text: 'call a tool' }] },
-      { role: 'model', parts: [{ functionCall: { name: 'test_tool' } }] },
+      { role: "user", parts: [{ text: "call a tool" }] },
+      { role: "model", parts: [{ functionCall: { name: "test_tool" } }] },
       {
-        role: 'user',
-        parts: [
-          { functionResponse: { name: 'test_tool', response: { ok: true } } },
-        ],
+        role: "user",
+        parts: [{ functionResponse: { name: "test_tool", response: { ok: true } } }],
       },
-      { role: 'user', parts: [{ text: 'another user turn' }] },
+      { role: "user", parts: [{ text: "another user turn" }] },
     ];
     const mockApiResponse = {
-      reasoning: 'Simple.',
-      model_choice: 'flash',
+      reasoning: "Simple.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
     const contents = generateJsonCall.contents;
 
     const expectedContents = [
-      { role: 'user', parts: [{ text: 'call a tool' }] },
-      { role: 'user', parts: [{ text: 'another user turn' }] },
-      { role: 'user', parts: [{ text: 'simple task' }] },
+      { role: "user", parts: [{ text: "call a tool" }] },
+      { role: "user", parts: [{ text: "another user turn" }] },
+      { role: "user", parts: [{ text: "simple task" }] },
     ];
 
     expect(contents).toEqual(expectedContents);
   });
 
-  it('should respect HISTORY_SEARCH_WINDOW and HISTORY_TURNS_FOR_CONTEXT', async () => {
+  it("should respect HISTORY_SEARCH_WINDOW and HISTORY_TURNS_FOR_CONTEXT", async () => {
     const longHistory: Content[] = [];
     for (let i = 0; i < 30; i++) {
-      longHistory.push({ role: 'user', parts: [{ text: `Message ${i}` }] });
+      longHistory.push({ role: "user", parts: [{ text: `Message ${i}` }] });
       // Add noise that should be filtered
       if (i % 2 === 0) {
         longHistory.push({
-          role: 'model',
-          parts: [{ functionCall: { name: 'noise', args: {} } }],
+          role: "model",
+          parts: [{ functionCall: { name: "noise", args: {} } }],
         });
       }
     }
     mockContext.history = longHistory;
     const mockApiResponse = {
-      reasoning: 'Simple.',
-      model_choice: 'flash',
+      reasoning: "Simple.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
     const contents = generateJsonCall.contents;
 
     // Manually calculate what the history should be
@@ -243,38 +201,28 @@ describe('ClassifierStrategy', () => {
     );
     const finalHistory = cleanHistory.slice(-HISTORY_TURNS_FOR_CONTEXT);
 
-    expect(contents).toEqual([
-      ...finalHistory,
-      { role: 'user', parts: mockContext.request },
-    ]);
+    expect(contents).toEqual([...finalHistory, { role: "user", parts: mockContext.request }]);
     // There should be 4 history items + the current request
     expect(contents).toHaveLength(5);
   });
 
-  it('should use a fallback promptId if not found in context', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(debugLogger, 'warn')
-      .mockImplementation(() => {});
+  it("should use a fallback promptId if not found in context", async () => {
+    const consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
     vi.mocked(promptIdContext.getStore).mockReturnValue(undefined);
     const mockApiResponse = {
-      reasoning: 'Simple.',
-      model_choice: 'flash',
+      reasoning: "Simple.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
 
-    expect(generateJsonCall.promptId).toMatch(
-      /^classifier-router-fallback-\d+-\w+$/,
-    );
+    expect(generateJsonCall.promptId).toMatch(/^classifier-router-fallback-\d+-\w+$/);
     expect(consoleWarnSpy).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Could not find promptId in context. This is unexpected. Using a fallback ID:',
+        "Could not find promptId in context. This is unexpected. Using a fallback ID:",
       ),
     );
     consoleWarnSpy.mockRestore();
diff --git a/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.ts b/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.ts
index 17a35b65c..5e030d321 100644
--- a/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/classifierStrategy.ts
@@ -4,33 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import { promptIdContext } from '../../utils/promptIdContext.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  RoutingStrategy,
-} from '../routingStrategy.js';
+import { createUserContent, Type } from "@google/genai";
+import { z } from "zod";
+import type { Config } from "../../config/config.js";
 import {
   GEMINI_MODEL_ALIAS_FLASH,
   GEMINI_MODEL_ALIAS_PRO,
   resolveModel,
-} from '../../config/models.js';
-import { createUserContent, Type } from '@google/genai';
-import type { Config } from '../../config/config.js';
-import {
-  isFunctionCall,
-  isFunctionResponse,
-} from '../../utils/messageInspectors.js';
-import { debugLogger } from '../../utils/debugLogger.js';
+} from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import { debugLogger } from "../../utils/debugLogger.js";
+import { isFunctionCall, isFunctionResponse } from "../../utils/messageInspectors.js";
+import { promptIdContext } from "../../utils/promptIdContext.js";
+import type { RoutingContext, RoutingDecision, RoutingStrategy } from "../routingStrategy.js";
 
 // The number of recent history turns to provide to the router for context.
 const HISTORY_TURNS_FOR_CONTEXT = 4;
 const HISTORY_SEARCH_WINDOW = 20;
 
-const FLASH_MODEL = 'flash';
-const PRO_MODEL = 'pro';
+const FLASH_MODEL = "flash";
+const PRO_MODEL = "pro";
 
 const CLASSIFIER_SYSTEM_PROMPT = `
 You are a specialized Task Routing AI. Your sole function is to analyze the user's request and classify its complexity. Choose between \`${FLASH_MODEL}\` (SIMPLE) or \`${PRO_MODEL}\` (COMPLEX).
@@ -112,14 +105,14 @@ const RESPONSE_SCHEMA = {
     reasoning: {
       type: Type.STRING,
       description:
-        'A brief, step-by-step explanation for the model choice, referencing the rubric.',
+        "A brief, step-by-step explanation for the model choice, referencing the rubric.",
     },
     model_choice: {
       type: Type.STRING,
       enum: [FLASH_MODEL, PRO_MODEL],
     },
   },
-  required: ['reasoning', 'model_choice'],
+  required: ["reasoning", "model_choice"],
 };
 
 const ClassifierResponseSchema = z.object({
@@ -128,7 +121,7 @@ const ClassifierResponseSchema = z.object({
 });
 
 export class ClassifierStrategy implements RoutingStrategy {
-  readonly name = 'classifier';
+  readonly name = "classifier";
 
   async route(
     context: RoutingContext,
@@ -159,7 +152,7 @@ export class ClassifierStrategy implements RoutingStrategy {
       const finalHistory = cleanHistory.slice(-HISTORY_TURNS_FOR_CONTEXT);
 
       const jsonResponse = await baseLlmClient.generateJson({
-        modelConfigKey: { model: 'classifier' },
+        modelConfigKey: { model: "classifier" },
         contents: [...finalHistory, createUserContent(context.request)],
         schema: RESPONSE_SCHEMA,
         systemInstruction: CLASSIFIER_SYSTEM_PROMPT,
@@ -174,24 +167,18 @@ export class ClassifierStrategy implements RoutingStrategy {
 
       if (routerResponse.model_choice === FLASH_MODEL) {
         return {
-          model: resolveModel(
-            GEMINI_MODEL_ALIAS_FLASH,
-            config.getPreviewFeatures(),
-          ),
+          model: resolveModel(GEMINI_MODEL_ALIAS_FLASH, config.getPreviewFeatures()),
           metadata: {
-            source: 'Classifier',
+            source: "Classifier",
             latencyMs,
             reasoning,
           },
         };
       } else {
         return {
-          model: resolveModel(
-            GEMINI_MODEL_ALIAS_PRO,
-            config.getPreviewFeatures(),
-          ),
+          model: resolveModel(GEMINI_MODEL_ALIAS_PRO, config.getPreviewFeatures()),
           metadata: {
-            source: 'Classifier',
+            source: "Classifier",
             reasoning,
             latencyMs,
           },
diff --git a/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.test.ts b/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.test.ts
index 7fb2c393b..981856a3b 100644
--- a/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.test.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { CompositeStrategy } from './compositeStrategy.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../../config/config.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
 import type {
   RoutingContext,
   RoutingDecision,
   RoutingStrategy,
   TerminalStrategy,
-} from '../routingStrategy.js';
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
+} from "../routingStrategy.js";
+import { CompositeStrategy } from "./compositeStrategy.js";
 
-describe('CompositeStrategy', () => {
+describe("CompositeStrategy", () => {
   let mockContext: RoutingContext;
   let mockConfig: Config;
   let mockBaseLlmClient: BaseLlmClient;
@@ -31,125 +31,96 @@ describe('CompositeStrategy', () => {
     mockBaseLlmClient = {} as BaseLlmClient;
 
     mockStrategy1 = {
-      name: 'strategy1',
+      name: "strategy1",
       route: vi.fn().mockResolvedValue(null),
     };
 
     mockStrategy2 = {
-      name: 'strategy2',
+      name: "strategy2",
       route: vi.fn().mockResolvedValue(null),
     };
 
     mockTerminalStrategy = {
-      name: 'terminal',
+      name: "terminal",
       route: vi.fn().mockResolvedValue({
-        model: 'terminal-model',
+        model: "terminal-model",
         metadata: {
-          source: 'terminal',
+          source: "terminal",
           latencyMs: 10,
-          reasoning: 'Terminal decision',
+          reasoning: "Terminal decision",
         },
       }),
     };
   });
 
-  it('should try strategies in order and return the first successful decision', async () => {
+  it("should try strategies in order and return the first successful decision", async () => {
     const decision: RoutingDecision = {
-      model: 'strategy2-model',
+      model: "strategy2-model",
       metadata: {
-        source: 'strategy2',
+        source: "strategy2",
         latencyMs: 20,
-        reasoning: 'Strategy 2 decided',
+        reasoning: "Strategy 2 decided",
       },
     };
-    vi.spyOn(mockStrategy2, 'route').mockResolvedValue(decision);
+    vi.spyOn(mockStrategy2, "route").mockResolvedValue(decision);
 
     const composite = new CompositeStrategy(
       [mockStrategy1, mockStrategy2, mockTerminalStrategy],
-      'test-router',
+      "test-router",
     );
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    expect(mockStrategy1.route).toHaveBeenCalledWith(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
-    expect(mockStrategy2.route).toHaveBeenCalledWith(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    expect(mockStrategy1.route).toHaveBeenCalledWith(mockContext, mockConfig, mockBaseLlmClient);
+    expect(mockStrategy2.route).toHaveBeenCalledWith(mockContext, mockConfig, mockBaseLlmClient);
     expect(mockTerminalStrategy.route).not.toHaveBeenCalled();
 
-    expect(result.model).toBe('strategy2-model');
-    expect(result.metadata.source).toBe('test-router/strategy2');
+    expect(result.model).toBe("strategy2-model");
+    expect(result.metadata.source).toBe("test-router/strategy2");
   });
 
-  it('should fall back to the terminal strategy if no other strategy provides a decision', async () => {
+  it("should fall back to the terminal strategy if no other strategy provides a decision", async () => {
     const composite = new CompositeStrategy(
       [mockStrategy1, mockStrategy2, mockTerminalStrategy],
-      'test-router',
+      "test-router",
     );
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockStrategy1.route).toHaveBeenCalledTimes(1);
     expect(mockStrategy2.route).toHaveBeenCalledTimes(1);
     expect(mockTerminalStrategy.route).toHaveBeenCalledTimes(1);
 
-    expect(result.model).toBe('terminal-model');
-    expect(result.metadata.source).toBe('test-router/terminal');
+    expect(result.model).toBe("terminal-model");
+    expect(result.metadata.source).toBe("test-router/terminal");
   });
 
-  it('should handle errors in non-terminal strategies and continue', async () => {
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    vi.spyOn(mockStrategy1, 'route').mockRejectedValue(
-      new Error('Strategy 1 failed'),
-    );
+  it("should handle errors in non-terminal strategies and continue", async () => {
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(mockStrategy1, "route").mockRejectedValue(new Error("Strategy 1 failed"));
 
-    const composite = new CompositeStrategy(
-      [mockStrategy1, mockTerminalStrategy],
-      'test-router',
-    );
+    const composite = new CompositeStrategy([mockStrategy1, mockTerminalStrategy], "test-router");
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "[Routing] Strategy 'strategy1' failed. Continuing to next strategy. Error:",
       expect.any(Error),
     );
-    expect(result.model).toBe('terminal-model');
+    expect(result.model).toBe("terminal-model");
     consoleErrorSpy.mockRestore();
   });
 
-  it('should re-throw an error from the terminal strategy', async () => {
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    const terminalError = new Error('Terminal strategy failed');
-    vi.spyOn(mockTerminalStrategy, 'route').mockRejectedValue(terminalError);
+  it("should re-throw an error from the terminal strategy", async () => {
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    const terminalError = new Error("Terminal strategy failed");
+    vi.spyOn(mockTerminalStrategy, "route").mockRejectedValue(terminalError);
 
     const composite = new CompositeStrategy([mockTerminalStrategy]);
 
-    await expect(
-      composite.route(mockContext, mockConfig, mockBaseLlmClient),
-    ).rejects.toThrow(terminalError);
+    await expect(composite.route(mockContext, mockConfig, mockBaseLlmClient)).rejects.toThrow(
+      terminalError,
+    );
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "[Routing] Critical Error: Terminal strategy 'terminal' failed. Routing cannot proceed. Error:",
@@ -158,57 +129,43 @@ describe('CompositeStrategy', () => {
     consoleErrorSpy.mockRestore();
   });
 
-  it('should correctly finalize the decision metadata', async () => {
+  it("should correctly finalize the decision metadata", async () => {
     const decision: RoutingDecision = {
-      model: 'some-model',
+      model: "some-model",
       metadata: {
-        source: 'child-source',
+        source: "child-source",
         latencyMs: 50,
-        reasoning: 'Child reasoning',
+        reasoning: "Child reasoning",
       },
     };
-    vi.spyOn(mockStrategy1, 'route').mockResolvedValue(decision);
+    vi.spyOn(mockStrategy1, "route").mockResolvedValue(decision);
 
-    const composite = new CompositeStrategy(
-      [mockStrategy1, mockTerminalStrategy],
-      'my-composite',
-    );
+    const composite = new CompositeStrategy([mockStrategy1, mockTerminalStrategy], "my-composite");
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    expect(result.model).toBe('some-model');
-    expect(result.metadata.source).toBe('my-composite/child-source');
-    expect(result.metadata.reasoning).toBe('Child reasoning');
+    expect(result.model).toBe("some-model");
+    expect(result.metadata.source).toBe("my-composite/child-source");
+    expect(result.metadata.reasoning).toBe("Child reasoning");
     // It should keep the child's latency
     expect(result.metadata.latencyMs).toBe(50);
   });
 
-  it('should calculate total latency if child latency is not provided', async () => {
+  it("should calculate total latency if child latency is not provided", async () => {
     const decision: RoutingDecision = {
-      model: 'some-model',
+      model: "some-model",
       metadata: {
-        source: 'child-source',
+        source: "child-source",
         // No latencyMs here
         latencyMs: 0,
-        reasoning: 'Child reasoning',
+        reasoning: "Child reasoning",
       },
     };
-    vi.spyOn(mockStrategy1, 'route').mockResolvedValue(decision);
+    vi.spyOn(mockStrategy1, "route").mockResolvedValue(decision);
 
-    const composite = new CompositeStrategy(
-      [mockStrategy1, mockTerminalStrategy],
-      'my-composite',
-    );
+    const composite = new CompositeStrategy([mockStrategy1, mockTerminalStrategy], "my-composite");
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(result.metadata.latencyMs).toBeGreaterThanOrEqual(0);
   });
diff --git a/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.ts b/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.ts
index 6aadc439d..48519aa4e 100644
--- a/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/compositeStrategy.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
+import type { Config } from "../../config/config.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
 import type {
   RoutingContext,
   RoutingDecision,
   RoutingStrategy,
   TerminalStrategy,
-} from '../routingStrategy.js';
+} from "../routingStrategy.js";
 
 /**
  * A strategy that attempts a list of child strategies in order (Chain of Responsibility).
@@ -26,10 +26,7 @@ export class CompositeStrategy implements TerminalStrategy {
    * @param strategies The strategies to try, in order of priority. The last strategy must be terminal.
    * @param name The name of this composite configuration (e.g., 'router' or 'composite').
    */
-  constructor(
-    strategies: [...RoutingStrategy[], TerminalStrategy],
-    name: string = 'composite',
-  ) {
+  constructor(strategies: [...RoutingStrategy[], TerminalStrategy], name: string = "composite") {
     this.strategies = strategies;
     this.name = name;
   }
@@ -43,13 +40,8 @@ export class CompositeStrategy implements TerminalStrategy {
 
     // Separate non-terminal strategies from the terminal one.
     // This separation allows TypeScript to understand the control flow guarantees.
-    const nonTerminalStrategies = this.strategies.slice(
-      0,
-      -1,
-    ) as RoutingStrategy[];
-    const terminalStrategy = this.strategies[
-      this.strategies.length - 1
-    ] as TerminalStrategy;
+    const nonTerminalStrategies = this.strategies.slice(0, -1) as RoutingStrategy[];
+    const terminalStrategy = this.strategies[this.strategies.length - 1] as TerminalStrategy;
 
     // Try non-terminal strategies, allowing them to fail gracefully.
     for (const strategy of nonTerminalStrategies) {
@@ -68,11 +60,7 @@ export class CompositeStrategy implements TerminalStrategy {
 
     // If no other strategy matched, execute the terminal strategy.
     try {
-      const decision = await terminalStrategy.route(
-        context,
-        config,
-        baseLlmClient,
-      );
+      const decision = await terminalStrategy.route(context, config, baseLlmClient);
 
       return this.finalizeDecision(decision, startTime);
     } catch (error) {
@@ -87,10 +75,7 @@ export class CompositeStrategy implements TerminalStrategy {
   /**
    * Helper function to enhance the decision metadata with composite information.
    */
-  private finalizeDecision(
-    decision: RoutingDecision,
-    startTime: number,
-  ): RoutingDecision {
+  private finalizeDecision(decision: RoutingDecision, startTime: number): RoutingDecision {
     const endTime = performance.now();
     const compositeSource = `${this.name}/${decision.metadata.source}`;
 
diff --git a/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.test.ts b/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.test.ts
index 1c739545a..8ae02e1e5 100644
--- a/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.test.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { DefaultStrategy } from './defaultStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import { DEFAULT_GEMINI_MODEL } from '../../config/models.js';
-import type { Config } from '../../config/config.js';
+import { describe, expect, it } from "vitest";
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { DefaultStrategy } from "./defaultStrategy.js";
 
-describe('DefaultStrategy', () => {
-  it('should always route to the default Gemini model', async () => {
+describe("DefaultStrategy", () => {
+  it("should always route to the default Gemini model", async () => {
     const strategy = new DefaultStrategy();
     const mockContext = {} as RoutingContext;
     const mockConfig = {} as Config;
@@ -23,7 +23,7 @@ describe('DefaultStrategy', () => {
     expect(decision).toEqual({
       model: DEFAULT_GEMINI_MODEL,
       metadata: {
-        source: 'default',
+        source: "default",
         latencyMs: 0,
         reasoning: `Routing to default model: ${DEFAULT_GEMINI_MODEL}`,
       },
diff --git a/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.ts b/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.ts
index dba7949f9..b350dbda4 100644
--- a/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/defaultStrategy.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  TerminalStrategy,
-} from '../routingStrategy.js';
-import { DEFAULT_GEMINI_MODEL } from '../../config/models.js';
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext, RoutingDecision, TerminalStrategy } from "../routingStrategy.js";
 
 export class DefaultStrategy implements TerminalStrategy {
-  readonly name = 'default';
+  readonly name = "default";
 
   async route(
     _context: RoutingContext,
diff --git a/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.test.ts b/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.test.ts
index 8723c483f..87059bcb1 100644
--- a/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.test.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.test.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { FallbackStrategy } from './fallbackStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type { Config } from '../../config/config.js';
+import { describe, expect, it } from "vitest";
+import type { Config } from "../../config/config.js";
 import {
-  DEFAULT_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
-} from '../../config/models.js';
+  DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_MODEL,
+} from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { FallbackStrategy } from "./fallbackStrategy.js";
 
-describe('FallbackStrategy', () => {
+describe("FallbackStrategy", () => {
   const strategy = new FallbackStrategy();
   const mockContext = {} as RoutingContext;
   const mockClient = {} as BaseLlmClient;
 
-  it('should return null when not in fallback mode', async () => {
+  it("should return null when not in fallback mode", async () => {
     const mockConfig = {
       isInFallbackMode: () => false,
       getModel: () => DEFAULT_GEMINI_MODEL,
@@ -31,60 +31,48 @@ describe('FallbackStrategy', () => {
     expect(decision).toBeNull();
   });
 
-  describe('when in fallback mode', () => {
-    it('should downgrade a pro model to the flash model', async () => {
+  describe("when in fallback mode", () => {
+    it("should downgrade a pro model to the flash model", async () => {
       const mockConfig = {
         isInFallbackMode: () => true,
         getModel: () => DEFAULT_GEMINI_MODEL,
         getPreviewFeatures: () => false,
       } as Config;
 
-      const decision = await strategy.route(
-        mockContext,
-        mockConfig,
-        mockClient,
-      );
+      const decision = await strategy.route(mockContext, mockConfig, mockClient);
 
       expect(decision).not.toBeNull();
       expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-      expect(decision?.metadata.source).toBe('fallback');
-      expect(decision?.metadata.reasoning).toContain('In fallback mode');
+      expect(decision?.metadata.source).toBe("fallback");
+      expect(decision?.metadata.reasoning).toContain("In fallback mode");
     });
 
-    it('should honor a lite model request', async () => {
+    it("should honor a lite model request", async () => {
       const mockConfig = {
         isInFallbackMode: () => true,
         getModel: () => DEFAULT_GEMINI_FLASH_LITE_MODEL,
         getPreviewFeatures: () => false,
       } as Config;
 
-      const decision = await strategy.route(
-        mockContext,
-        mockConfig,
-        mockClient,
-      );
+      const decision = await strategy.route(mockContext, mockConfig, mockClient);
 
       expect(decision).not.toBeNull();
       expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
-      expect(decision?.metadata.source).toBe('fallback');
+      expect(decision?.metadata.source).toBe("fallback");
     });
 
-    it('should use the flash model if flash is requested', async () => {
+    it("should use the flash model if flash is requested", async () => {
       const mockConfig = {
         isInFallbackMode: () => true,
         getModel: () => DEFAULT_GEMINI_FLASH_MODEL,
         getPreviewFeatures: () => false,
       } as Config;
 
-      const decision = await strategy.route(
-        mockContext,
-        mockConfig,
-        mockClient,
-      );
+      const decision = await strategy.route(mockContext, mockConfig, mockClient);
 
       expect(decision).not.toBeNull();
       expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-      expect(decision?.metadata.source).toBe('fallback');
+      expect(decision?.metadata.source).toBe("fallback");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.ts b/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.ts
index d61c92a5c..5a0d1b69e 100644
--- a/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/fallbackStrategy.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import { getEffectiveModel } from '../../config/models.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  RoutingStrategy,
-} from '../routingStrategy.js';
+import type { Config } from "../../config/config.js";
+import { getEffectiveModel } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext, RoutingDecision, RoutingStrategy } from "../routingStrategy.js";
 
 export class FallbackStrategy implements RoutingStrategy {
-  readonly name = 'fallback';
+  readonly name = "fallback";
 
   async route(
     _context: RoutingContext,
diff --git a/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.test.ts b/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.test.ts
index f1ec54098..94b86ddb4 100644
--- a/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.test.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { OverrideStrategy } from './overrideStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type { Config } from '../../config/config.js';
-import { DEFAULT_GEMINI_MODEL_AUTO } from '../../config/models.js';
-
-describe('OverrideStrategy', () => {
+import { describe, expect, it } from "vitest";
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL_AUTO } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { OverrideStrategy } from "./overrideStrategy.js";
+
+describe("OverrideStrategy", () => {
   const strategy = new OverrideStrategy();
   const mockContext = {} as RoutingContext;
   const mockClient = {} as BaseLlmClient;
 
-  it('should return null when the override model is auto', async () => {
+  it("should return null when the override model is auto", async () => {
     const mockConfig = {
       getModel: () => DEFAULT_GEMINI_MODEL_AUTO,
       getPreviewFeatures: () => false,
@@ -26,8 +26,8 @@ describe('OverrideStrategy', () => {
     expect(decision).toBeNull();
   });
 
-  it('should return a decision with the override model when one is specified', async () => {
-    const overrideModel = 'gemini-2.5-pro-custom';
+  it("should return a decision with the override model when one is specified", async () => {
+    const overrideModel = "gemini-2.5-pro-custom";
     const mockConfig = {
       getModel: () => overrideModel,
       getPreviewFeatures: () => false,
@@ -37,15 +37,13 @@ describe('OverrideStrategy', () => {
 
     expect(decision).not.toBeNull();
     expect(decision?.model).toBe(overrideModel);
-    expect(decision?.metadata.source).toBe('override');
-    expect(decision?.metadata.reasoning).toContain(
-      'Routing bypassed by forced model directive',
-    );
+    expect(decision?.metadata.source).toBe("override");
+    expect(decision?.metadata.reasoning).toContain("Routing bypassed by forced model directive");
     expect(decision?.metadata.reasoning).toContain(overrideModel);
   });
 
-  it('should handle different override model names', async () => {
-    const overrideModel = 'gemini-2.5-flash-experimental';
+  it("should handle different override model names", async () => {
+    const overrideModel = "gemini-2.5-flash-experimental";
     const mockConfig = {
       getModel: () => overrideModel,
       getPreviewFeatures: () => false,
diff --git a/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.ts b/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.ts
index 79050c01e..e1c966441 100644
--- a/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.ts
+++ b/packages/gemini-cli-core/src/routing/strategies/overrideStrategy.ts
@@ -4,23 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import {
-  DEFAULT_GEMINI_MODEL_AUTO,
-  resolveModel,
-} from '../../config/models.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  RoutingStrategy,
-} from '../routingStrategy.js';
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL_AUTO, resolveModel } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext, RoutingDecision, RoutingStrategy } from "../routingStrategy.js";
 
 /**
  * Handles cases where the user explicitly specifies a model (override).
  */
 export class OverrideStrategy implements RoutingStrategy {
-  readonly name = 'override';
+  readonly name = "override";
 
   async route(
     _context: RoutingContext,
diff --git a/packages/gemini-cli-core/src/safety/built-in.test.ts b/packages/gemini-cli-core/src/safety/built-in.test.ts
index d94092900..e28764319 100644
--- a/packages/gemini-cli-core/src/safety/built-in.test.ts
+++ b/packages/gemini-cli-core/src/safety/built-in.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { AllowedPathChecker } from './built-in.js';
-import type { SafetyCheckInput } from './protocol.js';
-import { SafetyCheckDecision } from './protocol.js';
-import type { FunctionCall } from '@google/genai';
-
-describe('AllowedPathChecker', () => {
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import type { FunctionCall } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { AllowedPathChecker } from "./built-in.js";
+import type { SafetyCheckInput } from "./protocol.js";
+import { SafetyCheckDecision } from "./protocol.js";
+
+describe("AllowedPathChecker", () => {
   let checker: AllowedPathChecker;
   let testRootDir: string;
   let mockCwd: string;
@@ -21,13 +21,10 @@ describe('AllowedPathChecker', () => {
 
   beforeEach(async () => {
     checker = new AllowedPathChecker();
-    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'safety-test-'));
-    mockCwd = path.join(testRootDir, 'home', 'user', 'project');
+    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "safety-test-"));
+    mockCwd = path.join(testRootDir, "home", "user", "project");
     await fs.mkdir(mockCwd, { recursive: true });
-    mockWorkspaces = [
-      mockCwd,
-      path.join(testRootDir, 'home', 'user', 'other-project'),
-    ];
+    mockWorkspaces = [mockCwd, path.join(testRootDir, "home", "user", "other-project")];
     await fs.mkdir(mockWorkspaces[1], { recursive: true });
   });
 
@@ -39,9 +36,9 @@ describe('AllowedPathChecker', () => {
     toolArgs: Record<string, unknown>,
     config?: Record<string, unknown>,
   ): SafetyCheckInput => ({
-    protocolVersion: '1.0.0',
+    protocolVersion: "1.0.0",
     toolCall: {
-      name: 'test_tool',
+      name: "test_tool",
       args: toolArgs,
     } as unknown as FunctionCall,
     context: {
@@ -53,9 +50,9 @@ describe('AllowedPathChecker', () => {
     config,
   });
 
-  it('should allow paths within CWD', async () => {
-    const filePath = path.join(mockCwd, 'file.txt');
-    await fs.writeFile(filePath, 'test content');
+  it("should allow paths within CWD", async () => {
+    const filePath = path.join(mockCwd, "file.txt");
+    await fs.writeFile(filePath, "test content");
     const input = createInput({
       path: filePath,
     });
@@ -63,9 +60,9 @@ describe('AllowedPathChecker', () => {
     expect(result.decision).toBe(SafetyCheckDecision.ALLOW);
   });
 
-  it('should allow paths within workspace roots', async () => {
-    const filePath = path.join(mockWorkspaces[1], 'data.json');
-    await fs.writeFile(filePath, 'test content');
+  it("should allow paths within workspace roots", async () => {
+    const filePath = path.join(mockWorkspaces[1], "data.json");
+    await fs.writeFile(filePath, "test content");
     const input = createInput({
       path: filePath,
     });
@@ -73,32 +70,32 @@ describe('AllowedPathChecker', () => {
     expect(result.decision).toBe(SafetyCheckDecision.ALLOW);
   });
 
-  it('should deny paths outside allowed areas', async () => {
-    const outsidePath = path.join(testRootDir, 'etc', 'passwd');
+  it("should deny paths outside allowed areas", async () => {
+    const outsidePath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(outsidePath), { recursive: true });
-    await fs.writeFile(outsidePath, 'secret');
+    await fs.writeFile(outsidePath, "secret");
     const input = createInput({ path: outsidePath });
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
-    expect(result.reason).toContain('outside of the allowed workspace');
+    expect(result.reason).toContain("outside of the allowed workspace");
   });
 
-  it('should deny paths using ../ to escape', async () => {
-    const secretPath = path.join(testRootDir, 'home', 'user', 'secret.txt');
-    await fs.writeFile(secretPath, 'secret');
+  it("should deny paths using ../ to escape", async () => {
+    const secretPath = path.join(testRootDir, "home", "user", "secret.txt");
+    await fs.writeFile(secretPath, "secret");
     const input = createInput({
-      path: path.join(mockCwd, '..', 'secret.txt'),
+      path: path.join(mockCwd, "..", "secret.txt"),
     });
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
   });
 
-  it('should check multiple path arguments', async () => {
-    const passwdPath = path.join(testRootDir, 'etc', 'passwd');
+  it("should check multiple path arguments", async () => {
+    const passwdPath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(passwdPath), { recursive: true });
-    await fs.writeFile(passwdPath, 'secret');
-    const srcPath = path.join(mockCwd, 'src.txt');
-    await fs.writeFile(srcPath, 'source content');
+    await fs.writeFile(passwdPath, "secret");
+    const srcPath = path.join(mockCwd, "src.txt");
+    await fs.writeFile(srcPath, "source content");
 
     const input = createInput({
       source: srcPath,
@@ -109,19 +106,19 @@ describe('AllowedPathChecker', () => {
     expect(result.reason).toContain(passwdPath);
   });
 
-  it('should handle non-existent paths gracefully if they are inside allowed dir', async () => {
+  it("should handle non-existent paths gracefully if they are inside allowed dir", async () => {
     const input = createInput({
-      path: path.join(mockCwd, 'new-file.txt'),
+      path: path.join(mockCwd, "new-file.txt"),
     });
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.ALLOW);
   });
 
-  it('should deny access if path contains a symlink pointing outside allowed directories', async () => {
-    const symlinkPath = path.join(mockCwd, 'symlink');
-    const targetPath = path.join(testRootDir, 'etc', 'passwd');
+  it("should deny access if path contains a symlink pointing outside allowed directories", async () => {
+    const symlinkPath = path.join(mockCwd, "symlink");
+    const targetPath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(targetPath), { recursive: true });
-    await fs.writeFile(targetPath, 'secret');
+    await fs.writeFile(targetPath, "secret");
 
     // Create symlink: mockCwd/symlink -> targetPath
     await fs.symlink(targetPath, symlinkPath);
@@ -129,15 +126,13 @@ describe('AllowedPathChecker', () => {
     const input = createInput({ path: symlinkPath });
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
-    expect(result.reason).toContain(
-      'outside of the allowed workspace directories',
-    );
+    expect(result.reason).toContain("outside of the allowed workspace directories");
   });
 
-  it('should allow access if path contains a symlink pointing INSIDE allowed directories', async () => {
-    const symlinkPath = path.join(mockCwd, 'symlink-inside');
-    const realFilePath = path.join(mockCwd, 'real-file');
-    await fs.writeFile(realFilePath, 'real content');
+  it("should allow access if path contains a symlink pointing INSIDE allowed directories", async () => {
+    const symlinkPath = path.join(mockCwd, "symlink-inside");
+    const realFilePath = path.join(mockCwd, "real-file");
+    await fs.writeFile(realFilePath, "real content");
 
     // Create symlink: mockCwd/symlink-inside -> mockCwd/real-file
     await fs.symlink(realFilePath, symlinkPath);
@@ -147,44 +142,38 @@ describe('AllowedPathChecker', () => {
     expect(result.decision).toBe(SafetyCheckDecision.ALLOW);
   });
 
-  it('should check explicitly included arguments', async () => {
-    const outsidePath = path.join(testRootDir, 'etc', 'passwd');
+  it("should check explicitly included arguments", async () => {
+    const outsidePath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(outsidePath), { recursive: true });
-    await fs.writeFile(outsidePath, 'secret');
-    const input = createInput(
-      { custom_arg: outsidePath },
-      { included_args: ['custom_arg'] },
-    );
+    await fs.writeFile(outsidePath, "secret");
+    const input = createInput({ custom_arg: outsidePath }, { included_args: ["custom_arg"] });
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
-    expect(result.reason).toContain('outside of the allowed workspace');
+    expect(result.reason).toContain("outside of the allowed workspace");
   });
 
-  it('should skip explicitly excluded arguments', async () => {
-    const outsidePath = path.join(testRootDir, 'etc', 'passwd');
+  it("should skip explicitly excluded arguments", async () => {
+    const outsidePath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(outsidePath), { recursive: true });
-    await fs.writeFile(outsidePath, 'secret');
+    await fs.writeFile(outsidePath, "secret");
     // Normally 'path' would be checked, but we exclude it
-    const input = createInput(
-      { path: outsidePath },
-      { excluded_args: ['path'] },
-    );
+    const input = createInput({ path: outsidePath }, { excluded_args: ["path"] });
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.ALLOW);
   });
 
-  it('should handle both included and excluded arguments', async () => {
-    const outsidePath = path.join(testRootDir, 'etc', 'passwd');
+  it("should handle both included and excluded arguments", async () => {
+    const outsidePath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(outsidePath), { recursive: true });
-    await fs.writeFile(outsidePath, 'secret');
+    await fs.writeFile(outsidePath, "secret");
     const input = createInput(
       {
         path: outsidePath, // Excluded
         custom_arg: outsidePath, // Included
       },
       {
-        excluded_args: ['path'],
-        included_args: ['custom_arg'],
+        excluded_args: ["path"],
+        included_args: ["custom_arg"],
       },
     );
     const result = await checker.check(input);
@@ -193,10 +182,10 @@ describe('AllowedPathChecker', () => {
     expect(result.reason).toContain(outsidePath);
   });
 
-  it('should check nested path arguments', async () => {
-    const outsidePath = path.join(testRootDir, 'etc', 'passwd');
+  it("should check nested path arguments", async () => {
+    const outsidePath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(outsidePath), { recursive: true });
-    await fs.writeFile(outsidePath, 'secret');
+    await fs.writeFile(outsidePath, "secret");
     const input = createInput({
       nested: {
         path: outsidePath,
@@ -205,38 +194,38 @@ describe('AllowedPathChecker', () => {
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
     expect(result.reason).toContain(outsidePath);
-    expect(result.reason).toContain('nested.path');
+    expect(result.reason).toContain("nested.path");
   });
 
-  it('should support dot notation for included_args', async () => {
-    const outsidePath = path.join(testRootDir, 'etc', 'passwd');
+  it("should support dot notation for included_args", async () => {
+    const outsidePath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(outsidePath), { recursive: true });
-    await fs.writeFile(outsidePath, 'secret');
+    await fs.writeFile(outsidePath, "secret");
     const input = createInput(
       {
         nested: {
           custom: outsidePath,
         },
       },
-      { included_args: ['nested.custom'] },
+      { included_args: ["nested.custom"] },
     );
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
     expect(result.reason).toContain(outsidePath);
-    expect(result.reason).toContain('nested.custom');
+    expect(result.reason).toContain("nested.custom");
   });
 
-  it('should support dot notation for excluded_args', async () => {
-    const outsidePath = path.join(testRootDir, 'etc', 'passwd');
+  it("should support dot notation for excluded_args", async () => {
+    const outsidePath = path.join(testRootDir, "etc", "passwd");
     await fs.mkdir(path.dirname(outsidePath), { recursive: true });
-    await fs.writeFile(outsidePath, 'secret');
+    await fs.writeFile(outsidePath, "secret");
     const input = createInput(
       {
         nested: {
           path: outsidePath,
         },
       },
-      { excluded_args: ['nested.path'] },
+      { excluded_args: ["nested.path"] },
     );
     const result = await checker.check(input);
     expect(result.decision).toBe(SafetyCheckDecision.ALLOW);
diff --git a/packages/gemini-cli-core/src/safety/built-in.ts b/packages/gemini-cli-core/src/safety/built-in.ts
index 57a22d55e..2eb68f9b2 100644
--- a/packages/gemini-cli-core/src/safety/built-in.ts
+++ b/packages/gemini-cli-core/src/safety/built-in.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import type { SafetyCheckInput, SafetyCheckResult } from './protocol.js';
-import { SafetyCheckDecision } from './protocol.js';
-import type { AllowedPathConfig } from '../policy/types.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { AllowedPathConfig } from "../policy/types.js";
+import type { SafetyCheckInput, SafetyCheckResult } from "./protocol.js";
+import { SafetyCheckDecision } from "./protocol.js";
 
 /**
  * Interface for all in-process safety checkers.
@@ -26,20 +26,13 @@ export class AllowedPathChecker implements InProcessChecker {
     const config = input.config as AllowedPathConfig | undefined;
 
     // Build list of allowed directories
-    const allowedDirs = [
-      context.environment.cwd,
-      ...context.environment.workspaces,
-    ];
+    const allowedDirs = [context.environment.cwd, ...context.environment.workspaces];
 
     // Find all arguments that look like paths
     const includedArgs = config?.included_args ?? [];
     const excludedArgs = config?.excluded_args ?? [];
 
-    const pathsToCheck = this.collectPathsToCheck(
-      toolCall.args,
-      includedArgs,
-      excludedArgs,
-    );
+    const pathsToCheck = this.collectPathsToCheck(toolCall.args, includedArgs, excludedArgs);
 
     // Check each path
     for (const { path: p, argName } of pathsToCheck) {
@@ -55,10 +48,7 @@ export class AllowedPathChecker implements InProcessChecker {
 
       const isAllowed = allowedDirs.some((dir) => {
         // Also resolve allowed directories to handle symlinks
-        const resolvedDir = this.safelyResolvePath(
-          dir,
-          context.environment.cwd,
-        );
+        const resolvedDir = this.safelyResolvePath(dir, context.environment.cwd);
         if (!resolvedDir) return false;
         return this.isPathAllowed(resolvedPath, resolvedDir);
       });
@@ -101,21 +91,18 @@ export class AllowedPathChecker implements InProcessChecker {
 
   private isPathAllowed(targetPath: string, allowedDir: string): boolean {
     const relative = path.relative(allowedDir, targetPath);
-    return (
-      relative === '' ||
-      (!relative.startsWith('..') && !path.isAbsolute(relative))
-    );
+    return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
   }
 
   private collectPathsToCheck(
     args: unknown,
     includedArgs: string[],
     excludedArgs: string[],
-    prefix = '',
+    prefix = "",
   ): Array<{ path: string; argName: string }> {
     const paths: Array<{ path: string; argName: string }> = [];
 
-    if (typeof args !== 'object' || args === null) {
+    if (typeof args !== "object" || args === null) {
       return paths;
     }
 
@@ -126,26 +113,19 @@ export class AllowedPathChecker implements InProcessChecker {
         continue;
       }
 
-      if (typeof value === 'string') {
+      if (typeof value === "string") {
         if (
           includedArgs.includes(fullKey) ||
-          key.includes('path') ||
-          key.includes('directory') ||
-          key.includes('file') ||
-          key === 'source' ||
-          key === 'destination'
+          key.includes("path") ||
+          key.includes("directory") ||
+          key.includes("file") ||
+          key === "source" ||
+          key === "destination"
         ) {
           paths.push({ path: value, argName: fullKey });
         }
-      } else if (typeof value === 'object') {
-        paths.push(
-          ...this.collectPathsToCheck(
-            value,
-            includedArgs,
-            excludedArgs,
-            fullKey,
-          ),
-        );
+      } else if (typeof value === "object") {
+        paths.push(...this.collectPathsToCheck(value, includedArgs, excludedArgs, fullKey));
       }
     }
 
diff --git a/packages/gemini-cli-core/src/safety/checker-runner.test.ts b/packages/gemini-cli-core/src/safety/checker-runner.test.ts
index cd3c0e18b..462ea8c36 100644
--- a/packages/gemini-cli-core/src/safety/checker-runner.test.ts
+++ b/packages/gemini-cli-core/src/safety/checker-runner.test.ts
@@ -4,42 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { spawn } from 'node:child_process';
-import { CheckerRunner } from './checker-runner.js';
-import { ContextBuilder } from './context-builder.js';
-import { CheckerRegistry } from './registry.js';
-import {
-  type InProcessCheckerConfig,
-  InProcessCheckerType,
-} from '../policy/types.js';
-import type { SafetyCheckResult } from './protocol.js';
-import { SafetyCheckDecision } from './protocol.js';
-import type { Config } from '../config/config.js';
+import { spawn } from "node:child_process";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { type InProcessCheckerConfig, InProcessCheckerType } from "../policy/types.js";
+import { CheckerRunner } from "./checker-runner.js";
+import { ContextBuilder } from "./context-builder.js";
+import type { SafetyCheckResult } from "./protocol.js";
+import { SafetyCheckDecision } from "./protocol.js";
+import { CheckerRegistry } from "./registry.js";
 
 // Mock dependencies
-vi.mock('./registry.js');
-vi.mock('./context-builder.js');
-vi.mock('node:child_process');
+vi.mock("./registry.js");
+vi.mock("./context-builder.js");
+vi.mock("node:child_process");
 
-describe('CheckerRunner', () => {
+describe("CheckerRunner", () => {
   let runner: CheckerRunner;
   let mockContextBuilder: ContextBuilder;
   let mockRegistry: CheckerRegistry;
 
-  const mockToolCall = { name: 'test_tool', args: {} };
+  const mockToolCall = { name: "test_tool", args: {} };
   const mockInProcessConfig: InProcessCheckerConfig = {
-    type: 'in-process',
+    type: "in-process",
     name: InProcessCheckerType.ALLOWED_PATH,
   };
 
   beforeEach(() => {
     mockContextBuilder = new ContextBuilder({} as Config);
-    mockRegistry = new CheckerRegistry('/mock/dist');
+    mockRegistry = new CheckerRegistry("/mock/dist");
     CheckerRegistry.prototype.resolveInProcess = vi.fn();
 
     runner = new CheckerRunner(mockContextBuilder, mockRegistry, {
-      checkersPath: '/mock/dist',
+      checkersPath: "/mock/dist",
     });
   });
 
@@ -47,7 +44,7 @@ describe('CheckerRunner', () => {
     vi.restoreAllMocks();
   });
 
-  it('should run in-process checker successfully', async () => {
+  it("should run in-process checker successfully", async () => {
     const mockResult: SafetyCheckResult = {
       decision: SafetyCheckDecision.ALLOW,
     };
@@ -56,35 +53,33 @@ describe('CheckerRunner', () => {
     };
     vi.mocked(mockRegistry.resolveInProcess).mockReturnValue(mockChecker);
     vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-      environment: { cwd: '/tmp', workspaces: [] },
+      environment: { cwd: "/tmp", workspaces: [] },
     });
 
     const result = await runner.runChecker(mockToolCall, mockInProcessConfig);
 
     expect(result).toEqual(mockResult);
-    expect(mockRegistry.resolveInProcess).toHaveBeenCalledWith(
-      InProcessCheckerType.ALLOWED_PATH,
-    );
+    expect(mockRegistry.resolveInProcess).toHaveBeenCalledWith(InProcessCheckerType.ALLOWED_PATH);
     expect(mockChecker.check).toHaveBeenCalled();
   });
 
-  it('should handle in-process checker errors', async () => {
+  it("should handle in-process checker errors", async () => {
     const mockChecker = {
-      check: vi.fn().mockRejectedValue(new Error('Checker failed')),
+      check: vi.fn().mockRejectedValue(new Error("Checker failed")),
     };
     vi.mocked(mockRegistry.resolveInProcess).mockReturnValue(mockChecker);
     vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-      environment: { cwd: '/tmp', workspaces: [] },
+      environment: { cwd: "/tmp", workspaces: [] },
     });
 
     const result = await runner.runChecker(mockToolCall, mockInProcessConfig);
 
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
-    expect(result.reason).toContain('Failed to run in-process checker');
-    expect(result.reason).toContain('Checker failed');
+    expect(result.reason).toContain("Failed to run in-process checker");
+    expect(result.reason).toContain("Checker failed");
   });
 
-  it('should respect timeout for in-process checkers', async () => {
+  it("should respect timeout for in-process checkers", async () => {
     vi.useFakeTimers();
     const mockChecker = {
       check: vi.fn().mockImplementation(async () => {
@@ -94,7 +89,7 @@ describe('CheckerRunner', () => {
     };
     vi.mocked(mockRegistry.resolveInProcess).mockReturnValue(mockChecker);
     vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-      environment: { cwd: '/tmp', workspaces: [] },
+      environment: { cwd: "/tmp", workspaces: [] },
     });
 
     const runPromise = runner.runChecker(mockToolCall, mockInProcessConfig);
@@ -102,34 +97,32 @@ describe('CheckerRunner', () => {
 
     const result = await runPromise;
     expect(result.decision).toBe(SafetyCheckDecision.DENY);
-    expect(result.reason).toContain('timed out');
+    expect(result.reason).toContain("timed out");
 
     vi.useRealTimers();
   });
 
-  it('should use minimal context when requested', async () => {
+  it("should use minimal context when requested", async () => {
     const configWithContext: InProcessCheckerConfig = {
       ...mockInProcessConfig,
-      required_context: ['environment'],
+      required_context: ["environment"],
     };
     const mockChecker = {
       check: vi.fn().mockResolvedValue({ decision: SafetyCheckDecision.ALLOW }),
     };
     vi.mocked(mockRegistry.resolveInProcess).mockReturnValue(mockChecker);
     vi.mocked(mockContextBuilder.buildMinimalContext).mockReturnValue({
-      environment: { cwd: '/tmp', workspaces: [] },
+      environment: { cwd: "/tmp", workspaces: [] },
     });
 
     await runner.runChecker(mockToolCall, configWithContext);
 
-    expect(mockContextBuilder.buildMinimalContext).toHaveBeenCalledWith([
-      'environment',
-    ]);
+    expect(mockContextBuilder.buildMinimalContext).toHaveBeenCalledWith(["environment"]);
     expect(mockContextBuilder.buildFullContext).not.toHaveBeenCalled();
   });
 
-  it('should pass config to in-process checker via toolCall', async () => {
-    const mockConfig = { included_args: ['foo'] };
+  it("should pass config to in-process checker via toolCall", async () => {
+    const mockConfig = { included_args: ["foo"] };
     const configWithConfig: InProcessCheckerConfig = {
       ...mockInProcessConfig,
       config: mockConfig,
@@ -142,7 +135,7 @@ describe('CheckerRunner', () => {
     };
     vi.mocked(mockRegistry.resolveInProcess).mockReturnValue(mockChecker);
     vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-      environment: { cwd: '/tmp', workspaces: [] },
+      environment: { cwd: "/tmp", workspaces: [] },
     });
 
     await runner.runChecker(mockToolCall, configWithConfig);
@@ -155,27 +148,23 @@ describe('CheckerRunner', () => {
     );
   });
 
-  describe('External Checkers', () => {
+  describe("External Checkers", () => {
     const mockExternalConfig = {
-      type: 'external' as const,
-      name: 'python-checker',
+      type: "external" as const,
+      name: "python-checker",
     };
 
-    it('should spawn external checker directly', async () => {
-      const mockCheckerPath = '/mock/dist/python-checker';
+    it("should spawn external checker directly", async () => {
+      const mockCheckerPath = "/mock/dist/python-checker";
       vi.mocked(mockRegistry.resolveExternal).mockReturnValue(mockCheckerPath);
       vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-        environment: { cwd: '/tmp', workspaces: [] },
+        environment: { cwd: "/tmp", workspaces: [] },
       });
 
       const mockStdout = {
         on: vi.fn().mockImplementation((event, callback) => {
-          if (event === 'data') {
-            callback(
-              Buffer.from(
-                JSON.stringify({ decision: SafetyCheckDecision.ALLOW }),
-              ),
-            );
+          if (event === "data") {
+            callback(Buffer.from(JSON.stringify({ decision: SafetyCheckDecision.ALLOW })));
           }
         }),
       };
@@ -184,7 +173,7 @@ describe('CheckerRunner', () => {
         stdout: mockStdout,
         stderr: { on: vi.fn() },
         on: vi.fn().mockImplementation((event, callback) => {
-          if (event === 'close') {
+          if (event === "close") {
             // Defer the close callback slightly to allow stdout 'data' to be registered
             setTimeout(() => callback(0), 0);
           }
@@ -197,19 +186,15 @@ describe('CheckerRunner', () => {
       const result = await runner.runChecker(mockToolCall, mockExternalConfig);
 
       expect(result.decision).toBe(SafetyCheckDecision.ALLOW);
-      expect(spawn).toHaveBeenCalledWith(
-        mockCheckerPath,
-        [],
-        expect.anything(),
-      );
+      expect(spawn).toHaveBeenCalledWith(mockCheckerPath, [], expect.anything());
     });
 
-    it('should include checker name in timeout error message', async () => {
+    it("should include checker name in timeout error message", async () => {
       vi.useFakeTimers();
-      const mockCheckerPath = '/mock/dist/python-checker';
+      const mockCheckerPath = "/mock/dist/python-checker";
       vi.mocked(mockRegistry.resolveExternal).mockReturnValue(mockCheckerPath);
       vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-        environment: { cwd: '/tmp', workspaces: [] },
+        environment: { cwd: "/tmp", workspaces: [] },
       });
 
       const mockChildProcess = {
@@ -227,19 +212,17 @@ describe('CheckerRunner', () => {
 
       const result = await runPromise;
       expect(result.decision).toBe(SafetyCheckDecision.DENY);
-      expect(result.reason).toContain(
-        'Safety checker "python-checker" timed out',
-      );
+      expect(result.reason).toContain('Safety checker "python-checker" timed out');
 
       vi.useRealTimers();
     });
 
-    it('should send SIGKILL if process ignores SIGTERM', async () => {
+    it("should send SIGKILL if process ignores SIGTERM", async () => {
       vi.useFakeTimers();
-      const mockCheckerPath = '/mock/dist/python-checker';
+      const mockCheckerPath = "/mock/dist/python-checker";
       vi.mocked(mockRegistry.resolveExternal).mockReturnValue(mockCheckerPath);
       vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-        environment: { cwd: '/tmp', workspaces: [] },
+        environment: { cwd: "/tmp", workspaces: [] },
       });
 
       const mockChildProcess = {
@@ -258,24 +241,24 @@ describe('CheckerRunner', () => {
       vi.advanceTimersByTime(5001);
 
       // Should have sent SIGTERM
-      expect(mockChildProcess.kill).toHaveBeenCalledWith('SIGTERM');
+      expect(mockChildProcess.kill).toHaveBeenCalledWith("SIGTERM");
 
       // Advance past cleanup timeout (5000ms)
       vi.advanceTimersByTime(5000);
 
       // Should have sent SIGKILL
-      expect(mockChildProcess.kill).toHaveBeenCalledWith('SIGKILL');
+      expect(mockChildProcess.kill).toHaveBeenCalledWith("SIGKILL");
 
       // Clean up promise
       await runPromise;
       vi.useRealTimers();
     });
 
-    it('should include checker name in non-zero exit code error message', async () => {
-      const mockCheckerPath = '/mock/dist/python-checker';
+    it("should include checker name in non-zero exit code error message", async () => {
+      const mockCheckerPath = "/mock/dist/python-checker";
       vi.mocked(mockRegistry.resolveExternal).mockReturnValue(mockCheckerPath);
       vi.mocked(mockContextBuilder.buildFullContext).mockReturnValue({
-        environment: { cwd: '/tmp', workspaces: [] },
+        environment: { cwd: "/tmp", workspaces: [] },
       });
 
       const mockChildProcess = {
@@ -283,7 +266,7 @@ describe('CheckerRunner', () => {
         stdout: { on: vi.fn() },
         stderr: { on: vi.fn() },
         on: vi.fn().mockImplementation((event, callback) => {
-          if (event === 'close') {
+          if (event === "close") {
             callback(1); // Exit code 1
           }
         }),
@@ -295,9 +278,7 @@ describe('CheckerRunner', () => {
       const result = await runner.runChecker(mockToolCall, mockExternalConfig);
 
       expect(result.decision).toBe(SafetyCheckDecision.DENY);
-      expect(result.reason).toContain(
-        'Safety checker "python-checker" exited with code 1',
-      );
+      expect(result.reason).toContain('Safety checker "python-checker" exited with code 1');
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/safety/checker-runner.ts b/packages/gemini-cli-core/src/safety/checker-runner.ts
index e9748cd5c..4357819d0 100644
--- a/packages/gemini-cli-core/src/safety/checker-runner.ts
+++ b/packages/gemini-cli-core/src/safety/checker-runner.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
-import type { FunctionCall } from '@google/genai';
+import { spawn } from "node:child_process";
+import type { FunctionCall } from "@google/genai";
 import type {
-  SafetyCheckerConfig,
-  InProcessCheckerConfig,
   ExternalCheckerConfig,
-} from '../policy/types.js';
-import type { SafetyCheckInput, SafetyCheckResult } from './protocol.js';
-import { SafetyCheckDecision } from './protocol.js';
-import type { CheckerRegistry } from './registry.js';
-import type { ContextBuilder } from './context-builder.js';
+  InProcessCheckerConfig,
+  SafetyCheckerConfig,
+} from "../policy/types.js";
+import type { ContextBuilder } from "./context-builder.js";
+import type { SafetyCheckInput, SafetyCheckResult } from "./protocol.js";
+import { SafetyCheckDecision } from "./protocol.js";
+import type { CheckerRegistry } from "./registry.js";
 
 /**
  * Configuration for the checker runner.
@@ -59,7 +59,7 @@ export class CheckerRunner {
     toolCall: FunctionCall,
     checkerConfig: SafetyCheckerConfig,
   ): Promise<SafetyCheckResult> {
-    if (checkerConfig.type === 'in-process') {
+    if (checkerConfig.type === "in-process") {
       return this.runInProcessChecker(toolCall, checkerConfig);
     }
     return this.runExternalChecker(toolCall, checkerConfig);
@@ -72,13 +72,11 @@ export class CheckerRunner {
     try {
       const checker = this.registry.resolveInProcess(checkerConfig.name);
       const context = checkerConfig.required_context
-        ? this.contextBuilder.buildMinimalContext(
-            checkerConfig.required_context,
-          )
+        ? this.contextBuilder.buildMinimalContext(checkerConfig.required_context)
         : this.contextBuilder.buildFullContext();
 
       const input: SafetyCheckInput = {
-        protocolVersion: '1.0.0',
+        protocolVersion: "1.0.0",
         toolCall,
         context,
         config: checkerConfig.config,
@@ -107,25 +105,19 @@ export class CheckerRunner {
 
       // Build the appropriate context
       const context = checkerConfig.required_context
-        ? this.contextBuilder.buildMinimalContext(
-            checkerConfig.required_context,
-          )
+        ? this.contextBuilder.buildMinimalContext(checkerConfig.required_context)
         : this.contextBuilder.buildFullContext();
 
       // Create the input payload
       const input: SafetyCheckInput = {
-        protocolVersion: '1.0.0',
+        protocolVersion: "1.0.0",
         toolCall,
         context,
         config: checkerConfig.config,
       };
 
       // Run the checker process
-      return await this.executeCheckerProcess(
-        checkerPath,
-        input,
-        checkerConfig.name,
-      );
+      return await this.executeCheckerProcess(checkerPath, input, checkerConfig.name);
     } catch (error) {
       // If anything goes wrong, deny the operation
       return {
@@ -147,11 +139,11 @@ export class CheckerRunner {
   ): Promise<SafetyCheckResult> {
     return new Promise((resolve) => {
       const child = spawn(checkerPath, [], {
-        stdio: ['pipe', 'pipe', 'pipe'],
+        stdio: ["pipe", "pipe", "pipe"],
       });
 
-      let stdout = '';
-      let stderr = '';
+      let stdout = "";
+      let stderr = "";
       let timeoutHandle: NodeJS.Timeout | null = null;
       let killed = false;
 
@@ -160,7 +152,7 @@ export class CheckerRunner {
       // Set up timeout
       timeoutHandle = setTimeout(() => {
         killed = true;
-        child.kill('SIGTERM');
+        child.kill("SIGTERM");
         resolve({
           decision: SafetyCheckDecision.DENY,
           reason: `Safety checker "${checkerName}" timed out after ${this.timeout}ms`,
@@ -169,26 +161,26 @@ export class CheckerRunner {
         // Fallback: if process doesn't exit after 5s, force kill
         setTimeout(() => {
           if (!exited) {
-            child.kill('SIGKILL');
+            child.kill("SIGKILL");
           }
         }, 5000).unref();
       }, this.timeout);
 
       // Collect output
       if (child.stdout) {
-        child.stdout.on('data', (data: Buffer) => {
+        child.stdout.on("data", (data: Buffer) => {
           stdout += data.toString();
         });
       }
 
       if (child.stderr) {
-        child.stderr.on('data', (data: Buffer) => {
+        child.stderr.on("data", (data: Buffer) => {
           stderr += data.toString();
         });
       }
 
       // Handle process completion
-      child.on('close', (code: number | null) => {
+      child.on("close", (code: number | null) => {
         exited = true;
         if (timeoutHandle) {
           clearTimeout(timeoutHandle);
@@ -204,7 +196,7 @@ export class CheckerRunner {
           resolve({
             decision: SafetyCheckDecision.DENY,
             reason: `Safety checker "${checkerName}" exited with code ${code}${
-              stderr ? `: ${stderr}` : ''
+              stderr ? `: ${stderr}` : ""
             }`,
           });
           return;
@@ -215,13 +207,8 @@ export class CheckerRunner {
           const result: SafetyCheckResult = JSON.parse(stdout);
 
           // Validate the result structure
-          if (
-            !result.decision ||
-            !Object.values(SafetyCheckDecision).includes(result.decision)
-          ) {
-            throw new Error(
-              'Invalid result: missing or invalid "decision" field',
-            );
+          if (!result.decision || !Object.values(SafetyCheckDecision).includes(result.decision)) {
+            throw new Error('Invalid result: missing or invalid "decision" field');
           }
 
           resolve(result);
@@ -229,16 +216,14 @@ export class CheckerRunner {
           resolve({
             decision: SafetyCheckDecision.DENY,
             reason: `Failed to parse output from safety checker "${checkerName}": ${
-              parseError instanceof Error
-                ? parseError.message
-                : String(parseError)
+              parseError instanceof Error ? parseError.message : String(parseError)
             }`,
           });
         }
       });
 
       // Handle process errors
-      child.on('error', (error: Error) => {
+      child.on("error", (error: Error) => {
         if (timeoutHandle) {
           clearTimeout(timeoutHandle);
         }
@@ -257,7 +242,7 @@ export class CheckerRunner {
           child.stdin.write(JSON.stringify(input));
           child.stdin.end();
         } else {
-          throw new Error('Failed to open stdin for checker process');
+          throw new Error("Failed to open stdin for checker process");
         }
       } catch (writeError) {
         if (timeoutHandle) {
@@ -268,9 +253,7 @@ export class CheckerRunner {
         resolve({
           decision: SafetyCheckDecision.DENY,
           reason: `Failed to write to stdin of safety checker "${checkerName}": ${
-            writeError instanceof Error
-              ? writeError.message
-              : String(writeError)
+            writeError instanceof Error ? writeError.message : String(writeError)
           }`,
         });
       }
diff --git a/packages/gemini-cli-core/src/safety/context-builder.test.ts b/packages/gemini-cli-core/src/safety/context-builder.test.ts
index 3ee9da432..aab7a1b81 100644
--- a/packages/gemini-cli-core/src/safety/context-builder.test.ts
+++ b/packages/gemini-cli-core/src/safety/context-builder.test.ts
@@ -4,51 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ContextBuilder } from './context-builder.js';
-import type { Config } from '../config/config.js';
-import type { ConversationTurn } from './protocol.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { ContextBuilder } from "./context-builder.js";
+import type { ConversationTurn } from "./protocol.js";
 
-describe('ContextBuilder', () => {
+describe("ContextBuilder", () => {
   let contextBuilder: ContextBuilder;
   let mockConfig: Config;
-  const mockHistory: ConversationTurn[] = [
-    { user: { text: 'hello' }, model: { text: 'hi' } },
-  ];
-  const mockCwd = '/home/user/project';
-  const mockWorkspaces = ['/home/user/project'];
+  const mockHistory: ConversationTurn[] = [{ user: { text: "hello" }, model: { text: "hi" } }];
+  const mockCwd = "/home/user/project";
+  const mockWorkspaces = ["/home/user/project"];
 
   beforeEach(() => {
-    vi.spyOn(process, 'cwd').mockReturnValue(mockCwd);
+    vi.spyOn(process, "cwd").mockReturnValue(mockCwd);
     mockConfig = {
       getWorkspaceContext: vi.fn().mockReturnValue({
         getDirectories: vi.fn().mockReturnValue(mockWorkspaces),
       }),
-      apiKey: 'secret-api-key',
-      somePublicConfig: 'public-value',
+      apiKey: "secret-api-key",
+      somePublicConfig: "public-value",
       nested: {
-        secretToken: 'hidden',
-        public: 'visible',
+        secretToken: "hidden",
+        public: "visible",
       },
     } as unknown as Config;
     contextBuilder = new ContextBuilder(mockConfig, mockHistory);
   });
 
-  it('should build full context with all fields', () => {
+  it("should build full context with all fields", () => {
     const context = contextBuilder.buildFullContext();
     expect(context.environment.cwd).toBe(mockCwd);
     expect(context.environment.workspaces).toEqual(mockWorkspaces);
     expect(context.history?.turns).toEqual(mockHistory);
   });
 
-  it('should build minimal context with only required keys', () => {
-    const context = contextBuilder.buildMinimalContext(['environment']);
-    expect(context).toHaveProperty('environment');
-    expect(context).not.toHaveProperty('config');
-    expect(context).not.toHaveProperty('history');
+  it("should build minimal context with only required keys", () => {
+    const context = contextBuilder.buildMinimalContext(["environment"]);
+    expect(context).toHaveProperty("environment");
+    expect(context).not.toHaveProperty("config");
+    expect(context).not.toHaveProperty("history");
   });
 
-  it('should handle missing history', () => {
+  it("should handle missing history", () => {
     contextBuilder = new ContextBuilder(mockConfig);
     const context = contextBuilder.buildFullContext();
     expect(context.history?.turns).toEqual([]);
diff --git a/packages/gemini-cli-core/src/safety/context-builder.ts b/packages/gemini-cli-core/src/safety/context-builder.ts
index 9c20a1d7a..5d5f896bf 100644
--- a/packages/gemini-cli-core/src/safety/context-builder.ts
+++ b/packages/gemini-cli-core/src/safety/context-builder.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SafetyCheckInput, ConversationTurn } from './protocol.js';
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
+import type { ConversationTurn, SafetyCheckInput } from "./protocol.js";
 
 /**
  * Builds context objects for safety checkers, ensuring sensitive data is filtered.
@@ -19,13 +19,11 @@ export class ContextBuilder {
   /**
    * Builds the full context object with all available data.
    */
-  buildFullContext(): SafetyCheckInput['context'] {
+  buildFullContext(): SafetyCheckInput["context"] {
     return {
       environment: {
         cwd: process.cwd(),
-        workspaces: this.config
-          .getWorkspaceContext()
-          .getDirectories() as string[],
+        workspaces: this.config.getWorkspaceContext().getDirectories() as string[],
       },
       history: {
         turns: this.conversationHistory,
@@ -37,10 +35,10 @@ export class ContextBuilder {
    * Builds a minimal context with only the specified keys.
    */
   buildMinimalContext(
-    requiredKeys: Array<keyof SafetyCheckInput['context']>,
-  ): SafetyCheckInput['context'] {
+    requiredKeys: Array<keyof SafetyCheckInput["context"]>,
+  ): SafetyCheckInput["context"] {
     const fullContext = this.buildFullContext();
-    const minimalContext: Partial<SafetyCheckInput['context']> = {};
+    const minimalContext: Partial<SafetyCheckInput["context"]> = {};
 
     for (const key of requiredKeys) {
       if (key in fullContext) {
@@ -49,6 +47,6 @@ export class ContextBuilder {
       }
     }
 
-    return minimalContext as SafetyCheckInput['context'];
+    return minimalContext as SafetyCheckInput["context"];
   }
 }
diff --git a/packages/gemini-cli-core/src/safety/protocol.ts b/packages/gemini-cli-core/src/safety/protocol.ts
index 5028bd689..1c1d271b3 100644
--- a/packages/gemini-cli-core/src/safety/protocol.ts
+++ b/packages/gemini-cli-core/src/safety/protocol.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FunctionCall } from '@google/genai';
+import type { FunctionCall } from "@google/genai";
 
 /**
  * Represents a single turn in the conversation between the user and the model.
@@ -29,7 +29,7 @@ export interface SafetyCheckInput {
    * for introducing breaking changes in the future while maintaining
    * support for older checkers.
    */
-  protocolVersion: '1.0.0';
+  protocolVersion: "1.0.0";
 
   /**
    * The specific tool call that is being validated.
@@ -70,9 +70,9 @@ export interface SafetyCheckInput {
  * The possible decisions a safety checker can make.
  */
 export enum SafetyCheckDecision {
-  ALLOW = 'allow',
-  DENY = 'deny',
-  ASK_USER = 'ask_user',
+  ALLOW = "allow",
+  DENY = "deny",
+  ASK_USER = "ask_user",
 }
 
 /**
diff --git a/packages/gemini-cli-core/src/safety/registry.test.ts b/packages/gemini-cli-core/src/safety/registry.test.ts
index b0f9d2674..3d96a1980 100644
--- a/packages/gemini-cli-core/src/safety/registry.test.ts
+++ b/packages/gemini-cli-core/src/safety/registry.test.ts
@@ -4,43 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { CheckerRegistry } from './registry.js';
-import { InProcessCheckerType } from '../policy/types.js';
-import { AllowedPathChecker } from './built-in.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { InProcessCheckerType } from "../policy/types.js";
+import { AllowedPathChecker } from "./built-in.js";
+import { CheckerRegistry } from "./registry.js";
 
-describe('CheckerRegistry', () => {
+describe("CheckerRegistry", () => {
   let registry: CheckerRegistry;
-  const mockCheckersPath = '/mock/checkers/path';
+  const mockCheckersPath = "/mock/checkers/path";
 
   beforeEach(() => {
     registry = new CheckerRegistry(mockCheckersPath);
   });
 
-  it('should resolve built-in in-process checkers', () => {
-    const checker = registry.resolveInProcess(
-      InProcessCheckerType.ALLOWED_PATH,
-    );
+  it("should resolve built-in in-process checkers", () => {
+    const checker = registry.resolveInProcess(InProcessCheckerType.ALLOWED_PATH);
     expect(checker).toBeInstanceOf(AllowedPathChecker);
   });
 
-  it('should throw for unknown in-process checkers', () => {
-    expect(() => registry.resolveInProcess('unknown-checker')).toThrow(
+  it("should throw for unknown in-process checkers", () => {
+    expect(() => registry.resolveInProcess("unknown-checker")).toThrow(
       'Unknown in-process checker "unknown-checker"',
     );
   });
 
-  it('should validate checker names', () => {
-    expect(() => registry.resolveInProcess('invalid name!')).toThrow(
-      'Invalid checker name',
-    );
-    expect(() => registry.resolveInProcess('../escape')).toThrow(
-      'Invalid checker name',
-    );
+  it("should validate checker names", () => {
+    expect(() => registry.resolveInProcess("invalid name!")).toThrow("Invalid checker name");
+    expect(() => registry.resolveInProcess("../escape")).toThrow("Invalid checker name");
   });
 
-  it('should throw for unknown external checkers (for now)', () => {
-    expect(() => registry.resolveExternal('some-external')).toThrow(
+  it("should throw for unknown external checkers (for now)", () => {
+    expect(() => registry.resolveExternal("some-external")).toThrow(
       'Unknown external checker "some-external"',
     );
   });
diff --git a/packages/gemini-cli-core/src/safety/registry.ts b/packages/gemini-cli-core/src/safety/registry.ts
index 2775a82fd..7c21b42ff 100644
--- a/packages/gemini-cli-core/src/safety/registry.ts
+++ b/packages/gemini-cli-core/src/safety/registry.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import { type InProcessChecker, AllowedPathChecker } from './built-in.js';
-import { InProcessCheckerType } from '../policy/types.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { InProcessCheckerType } from "../policy/types.js";
+import { AllowedPathChecker, type InProcessChecker } from "./built-in.js";
 
 /**
  * Registry for managing safety checker resolution.
@@ -17,10 +17,9 @@ export class CheckerRegistry {
     // No external built-ins for now
   ]);
 
-  private static readonly BUILT_IN_IN_PROCESS_CHECKERS = new Map<
-    string,
-    InProcessChecker
-  >([[InProcessCheckerType.ALLOWED_PATH, new AllowedPathChecker()]]);
+  private static readonly BUILT_IN_IN_PROCESS_CHECKERS = new Map<string, InProcessChecker>([
+    [InProcessCheckerType.ALLOWED_PATH, new AllowedPathChecker()],
+  ]);
 
   // Regex to validate checker names (alphanumeric and hyphens only)
   private static readonly VALID_NAME_PATTERN = /^[a-z0-9-]+$/;
@@ -66,12 +65,12 @@ export class CheckerRegistry {
     throw new Error(
       `Unknown in-process checker "${name}". Available: ${Array.from(
         CheckerRegistry.BUILT_IN_IN_PROCESS_CHECKERS.keys(),
-      ).join(', ')}`,
+      ).join(", ")}`,
     );
   }
 
   private static isValidCheckerName(name: string): boolean {
-    return this.VALID_NAME_PATTERN.test(name) && !name.includes('..');
+    return this.VALID_NAME_PATTERN.test(name) && !name.includes("..");
   }
 
   static getBuiltInCheckers(): string[] {
diff --git a/packages/gemini-cli-core/src/services/chatCompressionService.test.ts b/packages/gemini-cli-core/src/services/chatCompressionService.test.ts
index 7909f8bde..878a1c1fd 100644
--- a/packages/gemini-cli-core/src/services/chatCompressionService.test.ts
+++ b/packages/gemini-cli-core/src/services/chatCompressionService.test.ts
@@ -4,132 +4,118 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import type { Content, GenerateContentResponse } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import { CompressionStatus } from "../core/turn.js";
+import { getInitialChatHistory } from "../utils/environmentContext.js";
 import {
   ChatCompressionService,
   findCompressSplitPoint,
   modelStringToModelConfigAlias,
-} from './chatCompressionService.js';
-import type { Content, GenerateContentResponse } from '@google/genai';
-import { CompressionStatus } from '../core/turn.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import type { Config } from '../config/config.js';
-import { getInitialChatHistory } from '../utils/environmentContext.js';
-
-vi.mock('../core/tokenLimits.js');
-vi.mock('../telemetry/loggers.js');
-vi.mock('../utils/environmentContext.js');
-
-describe('findCompressSplitPoint', () => {
-  it('should throw an error for non-positive numbers', () => {
-    expect(() => findCompressSplitPoint([], 0)).toThrow(
-      'Fraction must be between 0 and 1',
-    );
+} from "./chatCompressionService.js";
+
+vi.mock("../core/tokenLimits.js");
+vi.mock("../telemetry/loggers.js");
+vi.mock("../utils/environmentContext.js");
+
+describe("findCompressSplitPoint", () => {
+  it("should throw an error for non-positive numbers", () => {
+    expect(() => findCompressSplitPoint([], 0)).toThrow("Fraction must be between 0 and 1");
   });
 
-  it('should throw an error for a fraction greater than or equal to 1', () => {
-    expect(() => findCompressSplitPoint([], 1)).toThrow(
-      'Fraction must be between 0 and 1',
-    );
+  it("should throw an error for a fraction greater than or equal to 1", () => {
+    expect(() => findCompressSplitPoint([], 1)).toThrow("Fraction must be between 0 and 1");
   });
 
-  it('should handle an empty history', () => {
+  it("should handle an empty history", () => {
     expect(findCompressSplitPoint([], 0.5)).toBe(0);
   });
 
-  it('should handle a fraction in the middle', () => {
+  it("should handle a fraction in the middle", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] }, // JSON length: 66 (19%)
-      { role: 'model', parts: [{ text: 'This is the second message.' }] }, // JSON length: 68 (40%)
-      { role: 'user', parts: [{ text: 'This is the third message.' }] }, // JSON length: 66 (60%)
-      { role: 'model', parts: [{ text: 'This is the fourth message.' }] }, // JSON length: 68 (80%)
-      { role: 'user', parts: [{ text: 'This is the fifth message.' }] }, // JSON length: 65 (100%)
+      { role: "user", parts: [{ text: "This is the first message." }] }, // JSON length: 66 (19%)
+      { role: "model", parts: [{ text: "This is the second message." }] }, // JSON length: 68 (40%)
+      { role: "user", parts: [{ text: "This is the third message." }] }, // JSON length: 66 (60%)
+      { role: "model", parts: [{ text: "This is the fourth message." }] }, // JSON length: 68 (80%)
+      { role: "user", parts: [{ text: "This is the fifth message." }] }, // JSON length: 65 (100%)
     ];
     expect(findCompressSplitPoint(history, 0.5)).toBe(4);
   });
 
-  it('should handle a fraction of last index', () => {
+  it("should handle a fraction of last index", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] }, // JSON length: 66 (19%)
-      { role: 'model', parts: [{ text: 'This is the second message.' }] }, // JSON length: 68 (40%)
-      { role: 'user', parts: [{ text: 'This is the third message.' }] }, // JSON length: 66 (60%)
-      { role: 'model', parts: [{ text: 'This is the fourth message.' }] }, // JSON length: 68 (80%)
-      { role: 'user', parts: [{ text: 'This is the fifth message.' }] }, // JSON length: 65 (100%)
+      { role: "user", parts: [{ text: "This is the first message." }] }, // JSON length: 66 (19%)
+      { role: "model", parts: [{ text: "This is the second message." }] }, // JSON length: 68 (40%)
+      { role: "user", parts: [{ text: "This is the third message." }] }, // JSON length: 66 (60%)
+      { role: "model", parts: [{ text: "This is the fourth message." }] }, // JSON length: 68 (80%)
+      { role: "user", parts: [{ text: "This is the fifth message." }] }, // JSON length: 65 (100%)
     ];
     expect(findCompressSplitPoint(history, 0.9)).toBe(4);
   });
 
-  it('should handle a fraction of after last index', () => {
+  it("should handle a fraction of after last index", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] }, // JSON length: 66 (24%)
-      { role: 'model', parts: [{ text: 'This is the second message.' }] }, // JSON length: 68 (50%)
-      { role: 'user', parts: [{ text: 'This is the third message.' }] }, // JSON length: 66 (74%)
-      { role: 'model', parts: [{ text: 'This is the fourth message.' }] }, // JSON length: 68 (100%)
+      { role: "user", parts: [{ text: "This is the first message." }] }, // JSON length: 66 (24%)
+      { role: "model", parts: [{ text: "This is the second message." }] }, // JSON length: 68 (50%)
+      { role: "user", parts: [{ text: "This is the third message." }] }, // JSON length: 66 (74%)
+      { role: "model", parts: [{ text: "This is the fourth message." }] }, // JSON length: 68 (100%)
     ];
     expect(findCompressSplitPoint(history, 0.8)).toBe(4);
   });
 
-  it('should return earlier splitpoint if no valid ones are after threshold', () => {
+  it("should return earlier splitpoint if no valid ones are after threshold", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] },
-      { role: 'model', parts: [{ text: 'This is the second message.' }] },
-      { role: 'user', parts: [{ text: 'This is the third message.' }] },
-      { role: 'model', parts: [{ functionCall: { name: 'foo', args: {} } }] },
+      { role: "user", parts: [{ text: "This is the first message." }] },
+      { role: "model", parts: [{ text: "This is the second message." }] },
+      { role: "user", parts: [{ text: "This is the third message." }] },
+      { role: "model", parts: [{ functionCall: { name: "foo", args: {} } }] },
     ];
     // Can't return 4 because the previous item has a function call.
     expect(findCompressSplitPoint(history, 0.99)).toBe(2);
   });
 
-  it('should handle a history with only one item', () => {
-    const historyWithEmptyParts: Content[] = [
-      { role: 'user', parts: [{ text: 'Message 1' }] },
-    ];
+  it("should handle a history with only one item", () => {
+    const historyWithEmptyParts: Content[] = [{ role: "user", parts: [{ text: "Message 1" }] }];
     expect(findCompressSplitPoint(historyWithEmptyParts, 0.5)).toBe(0);
   });
 
-  it('should handle history with weird parts', () => {
+  it("should handle history with weird parts", () => {
     const historyWithEmptyParts: Content[] = [
-      { role: 'user', parts: [{ text: 'Message 1' }] },
+      { role: "user", parts: [{ text: "Message 1" }] },
       {
-        role: 'model',
-        parts: [{ fileData: { fileUri: 'derp', mimeType: 'text/plain' } }],
+        role: "model",
+        parts: [{ fileData: { fileUri: "derp", mimeType: "text/plain" } }],
       },
-      { role: 'user', parts: [{ text: 'Message 2' }] },
+      { role: "user", parts: [{ text: "Message 2" }] },
     ];
     expect(findCompressSplitPoint(historyWithEmptyParts, 0.5)).toBe(2);
   });
 });
 
-describe('modelStringToModelConfigAlias', () => {
-  it('should return the default model for unexpected aliases', () => {
-    expect(modelStringToModelConfigAlias('gemini-flash-flash')).toBe(
-      'chat-compression-default',
-    );
+describe("modelStringToModelConfigAlias", () => {
+  it("should return the default model for unexpected aliases", () => {
+    expect(modelStringToModelConfigAlias("gemini-flash-flash")).toBe("chat-compression-default");
   });
 
-  it('should handle valid names', () => {
-    expect(modelStringToModelConfigAlias('gemini-3-pro-preview')).toBe(
-      'chat-compression-3-pro',
-    );
-    expect(modelStringToModelConfigAlias('gemini-2.5-pro')).toBe(
-      'chat-compression-2.5-pro',
-    );
-    expect(modelStringToModelConfigAlias('gemini-2.5-flash')).toBe(
-      'chat-compression-2.5-flash',
-    );
-    expect(modelStringToModelConfigAlias('gemini-2.5-flash-lite')).toBe(
-      'chat-compression-2.5-flash-lite',
+  it("should handle valid names", () => {
+    expect(modelStringToModelConfigAlias("gemini-3-pro-preview")).toBe("chat-compression-3-pro");
+    expect(modelStringToModelConfigAlias("gemini-2.5-pro")).toBe("chat-compression-2.5-pro");
+    expect(modelStringToModelConfigAlias("gemini-2.5-flash")).toBe("chat-compression-2.5-flash");
+    expect(modelStringToModelConfigAlias("gemini-2.5-flash-lite")).toBe(
+      "chat-compression-2.5-flash-lite",
     );
   });
 });
 
-describe('ChatCompressionService', () => {
+describe("ChatCompressionService", () => {
   let service: ChatCompressionService;
   let mockChat: GeminiChat;
   let mockConfig: Config;
-  const mockModel = 'gemini-2.5-pro';
-  const mockPromptId = 'test-prompt-id';
+  const mockModel = "gemini-2.5-pro";
+  const mockPromptId = "test-prompt-id";
 
   beforeEach(() => {
     service = new ChatCompressionService();
@@ -142,7 +128,7 @@ describe('ChatCompressionService', () => {
       candidates: [
         {
           content: {
-            parts: [{ text: 'Summary' }],
+            parts: [{ text: "Summary" }],
           },
         },
       ],
@@ -171,7 +157,7 @@ describe('ChatCompressionService', () => {
     vi.restoreAllMocks();
   });
 
-  it('should return NOOP if history is empty', async () => {
+  it("should return NOOP if history is empty", async () => {
     vi.mocked(mockChat.getHistory).mockReturnValue([]);
     const result = await service.compress(
       mockChat,
@@ -185,10 +171,8 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).toBeNull();
   });
 
-  it('should return NOOP if previously failed and not forced', async () => {
-    vi.mocked(mockChat.getHistory).mockReturnValue([
-      { role: 'user', parts: [{ text: 'hi' }] },
-    ]);
+  it("should return NOOP if previously failed and not forced", async () => {
+    vi.mocked(mockChat.getHistory).mockReturnValue([{ role: "user", parts: [{ text: "hi" }] }]);
     const result = await service.compress(
       mockChat,
       mockPromptId,
@@ -201,10 +185,8 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).toBeNull();
   });
 
-  it('should return NOOP if under token threshold and not forced', async () => {
-    vi.mocked(mockChat.getHistory).mockReturnValue([
-      { role: 'user', parts: [{ text: 'hi' }] },
-    ]);
+  it("should return NOOP if under token threshold and not forced", async () => {
+    vi.mocked(mockChat.getHistory).mockReturnValue([{ role: "user", parts: [{ text: "hi" }] }]);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(600);
     vi.mocked(tokenLimit).mockReturnValue(1000);
     // Threshold is 0.7 * 1000 = 700. 600 < 700, so NOOP.
@@ -221,12 +203,12 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).toBeNull();
   });
 
-  it('should compress if over token threshold', async () => {
+  it("should compress if over token threshold", async () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'msg1' }] },
-      { role: 'model', parts: [{ text: 'msg2' }] },
-      { role: 'user', parts: [{ text: 'msg3' }] },
-      { role: 'model', parts: [{ text: 'msg4' }] },
+      { role: "user", parts: [{ text: "msg1" }] },
+      { role: "model", parts: [{ text: "msg2" }] },
+      { role: "user", parts: [{ text: "msg3" }] },
+      { role: "model", parts: [{ text: "msg4" }] },
     ];
     vi.mocked(mockChat.getHistory).mockReturnValue(history);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(800);
@@ -243,16 +225,16 @@ describe('ChatCompressionService', () => {
 
     expect(result.info.compressionStatus).toBe(CompressionStatus.COMPRESSED);
     expect(result.newHistory).not.toBeNull();
-    expect(result.newHistory![0].parts![0].text).toBe('Summary');
+    expect(result.newHistory![0].parts![0].text).toBe("Summary");
     expect(mockConfig.getBaseLlmClient().generateContent).toHaveBeenCalled();
   });
 
-  it('should force compress even if under threshold', async () => {
+  it("should force compress even if under threshold", async () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'msg1' }] },
-      { role: 'model', parts: [{ text: 'msg2' }] },
-      { role: 'user', parts: [{ text: 'msg3' }] },
-      { role: 'model', parts: [{ text: 'msg4' }] },
+      { role: "user", parts: [{ text: "msg1" }] },
+      { role: "model", parts: [{ text: "msg2" }] },
+      { role: "user", parts: [{ text: "msg3" }] },
+      { role: "model", parts: [{ text: "msg4" }] },
     ];
     vi.mocked(mockChat.getHistory).mockReturnValue(history);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(100);
@@ -271,16 +253,16 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).not.toBeNull();
   });
 
-  it('should return FAILED if new token count is inflated', async () => {
+  it("should return FAILED if new token count is inflated", async () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'msg1' }] },
-      { role: 'model', parts: [{ text: 'msg2' }] },
+      { role: "user", parts: [{ text: "msg1" }] },
+      { role: "model", parts: [{ text: "msg2" }] },
     ];
     vi.mocked(mockChat.getHistory).mockReturnValue(history);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(10);
     vi.mocked(tokenLimit).mockReturnValue(1000);
 
-    const longSummary = 'a'.repeat(1000); // Long summary to inflate token count
+    const longSummary = "a".repeat(1000); // Long summary to inflate token count
     vi.mocked(mockConfig.getBaseLlmClient().generateContent).mockResolvedValue({
       candidates: [
         {
diff --git a/packages/gemini-cli-core/src/services/chatCompressionService.ts b/packages/gemini-cli-core/src/services/chatCompressionService.ts
index a85f1d619..2eec0cca3 100644
--- a/packages/gemini-cli-core/src/services/chatCompressionService.ts
+++ b/packages/gemini-cli-core/src/services/chatCompressionService.ts
@@ -4,25 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import { type ChatCompressionInfo, CompressionStatus } from '../core/turn.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import { getCompressionPrompt } from '../core/prompts.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { logChatCompression } from '../telemetry/loggers.js';
-import { makeChatCompressionEvent } from '../telemetry/types.js';
-import { getInitialChatHistory } from '../utils/environmentContext.js';
-import { calculateRequestTokenCount } from '../utils/tokenCalculation.js';
+import type { Content } from "@google/genai";
+import type { Config } from "../config/config.js";
 import {
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   PREVIEW_GEMINI_MODEL,
-} from '../config/models.js';
-import { firePreCompressHook } from '../core/sessionHookTriggers.js';
-import { PreCompressTrigger } from '../hooks/types.js';
+} from "../config/models.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import { getCompressionPrompt } from "../core/prompts.js";
+import { firePreCompressHook } from "../core/sessionHookTriggers.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import { type ChatCompressionInfo, CompressionStatus } from "../core/turn.js";
+import { PreCompressTrigger } from "../hooks/types.js";
+import { logChatCompression } from "../telemetry/loggers.js";
+import { makeChatCompressionEvent } from "../telemetry/types.js";
+import { getInitialChatHistory } from "../utils/environmentContext.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { calculateRequestTokenCount } from "../utils/tokenCalculation.js";
 
 /**
  * Default threshold for compression token count as a fraction of the model's
@@ -42,12 +42,9 @@ export const COMPRESSION_PRESERVE_THRESHOLD = 0.3;
  *
  * Exported for testing purposes.
  */
-export function findCompressSplitPoint(
-  contents: Content[],
-  fraction: number,
-): number {
+export function findCompressSplitPoint(contents: Content[], fraction: number): number {
   if (fraction <= 0 || fraction >= 1) {
-    throw new Error('Fraction must be between 0 and 1');
+    throw new Error("Fraction must be between 0 and 1");
   }
 
   const charCounts = contents.map((content) => JSON.stringify(content).length);
@@ -58,10 +55,7 @@ export function findCompressSplitPoint(
   let cumulativeCharCount = 0;
   for (let i = 0; i < contents.length; i++) {
     const content = contents[i];
-    if (
-      content.role === 'user' &&
-      !content.parts?.some((part) => !!part.functionResponse)
-    ) {
+    if (content.role === "user" && !content.parts?.some((part) => !!part.functionResponse)) {
       if (cumulativeCharCount >= targetCharCount) {
         return i;
       }
@@ -73,10 +67,7 @@ export function findCompressSplitPoint(
   // We found no split points after targetCharCount.
   // Check if it's safe to compress everything.
   const lastContent = contents[contents.length - 1];
-  if (
-    lastContent?.role === 'model' &&
-    !lastContent?.parts?.some((part) => part.functionCall)
-  ) {
+  if (lastContent?.role === "model" && !lastContent?.parts?.some((part) => part.functionCall)) {
     return contents.length;
   }
 
@@ -87,15 +78,15 @@ export function findCompressSplitPoint(
 export function modelStringToModelConfigAlias(model: string): string {
   switch (model) {
     case PREVIEW_GEMINI_MODEL:
-      return 'chat-compression-3-pro';
+      return "chat-compression-3-pro";
     case DEFAULT_GEMINI_MODEL:
-      return 'chat-compression-2.5-pro';
+      return "chat-compression-2.5-pro";
     case DEFAULT_GEMINI_FLASH_MODEL:
-      return 'chat-compression-2.5-flash';
+      return "chat-compression-2.5-flash";
     case DEFAULT_GEMINI_FLASH_LITE_MODEL:
-      return 'chat-compression-2.5-flash-lite';
+      return "chat-compression-2.5-flash-lite";
     default:
-      return 'chat-compression-default';
+      return "chat-compression-default";
   }
 }
 
@@ -111,10 +102,7 @@ export class ChatCompressionService {
     const curatedHistory = chat.getHistory(true);
 
     // Regardless of `force`, don't do anything if the history is empty.
-    if (
-      curatedHistory.length === 0 ||
-      (hasFailedCompressionAttempt && !force)
-    ) {
+    if (curatedHistory.length === 0 || (hasFailedCompressionAttempt && !force)) {
       return {
         newHistory: null,
         info: {
@@ -130,9 +118,7 @@ export class ChatCompressionService {
     const hooksEnabled = config.getEnableHooks();
     const messageBus = config.getMessageBus();
     if (hooksEnabled && messageBus) {
-      const trigger = force
-        ? PreCompressTrigger.Manual
-        : PreCompressTrigger.Auto;
+      const trigger = force ? PreCompressTrigger.Manual : PreCompressTrigger.Auto;
       await firePreCompressHook(messageBus, trigger);
     }
 
@@ -141,8 +127,7 @@ export class ChatCompressionService {
     // Don't compress if not forced and we are under the limit.
     if (!force) {
       const threshold =
-        (await config.getCompressionThreshold()) ??
-        DEFAULT_COMPRESSION_TOKEN_THRESHOLD;
+        (await config.getCompressionThreshold()) ?? DEFAULT_COMPRESSION_TOKEN_THRESHOLD;
       if (originalTokenCount < threshold * tokenLimit(model)) {
         return {
           newHistory: null,
@@ -155,10 +140,7 @@ export class ChatCompressionService {
       }
     }
 
-    const splitPoint = findCompressSplitPoint(
-      curatedHistory,
-      1 - COMPRESSION_PRESERVE_THRESHOLD,
-    );
+    const splitPoint = findCompressSplitPoint(curatedHistory, 1 - COMPRESSION_PRESERVE_THRESHOLD);
 
     const historyToCompress = curatedHistory.slice(0, splitPoint);
     const historyToKeep = curatedHistory.slice(splitPoint);
@@ -179,10 +161,10 @@ export class ChatCompressionService {
       contents: [
         ...historyToCompress,
         {
-          role: 'user',
+          role: "user",
           parts: [
             {
-              text: 'First, reason in your scratchpad. Then, generate the <state_snapshot>.',
+              text: "First, reason in your scratchpad. Then, generate the <state_snapshot>.",
             },
           ],
         },
@@ -192,16 +174,16 @@ export class ChatCompressionService {
       // TODO(joshualitt): wire up a sensible abort signal,
       abortSignal: new AbortController().signal,
     });
-    const summary = getResponseText(summaryResponse) ?? '';
+    const summary = getResponseText(summaryResponse) ?? "";
 
     const extraHistory: Content[] = [
       {
-        role: 'user',
+        role: "user",
         parts: [{ text: summary }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Got it. Thanks for the additional context!' }],
+        role: "model",
+        parts: [{ text: "Got it. Thanks for the additional context!" }],
       },
       ...historyToKeep,
     ];
@@ -229,8 +211,7 @@ export class ChatCompressionService {
         info: {
           originalTokenCount,
           newTokenCount,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         },
       };
     } else {
diff --git a/packages/gemini-cli-core/src/services/chatRecordingService.test.ts b/packages/gemini-cli-core/src/services/chatRecordingService.test.ts
index dcd77c986..f432e2b2a 100644
--- a/packages/gemini-cli-core/src/services/chatRecordingService.test.ts
+++ b/packages/gemini-cli-core/src/services/chatRecordingService.test.ts
@@ -4,32 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MockInstance } from 'vitest';
-import { expect, it, describe, vi, beforeEach, afterEach } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-import { randomUUID } from 'node:crypto';
-import type {
-  ConversationRecord,
-  ToolCallRecord,
-} from './chatRecordingService.js';
-import { ChatRecordingService } from './chatRecordingService.js';
-import type { Config } from '../config/config.js';
-import { getProjectHash } from '../utils/paths.js';
-
-vi.mock('node:fs');
-vi.mock('node:path');
-vi.mock('node:crypto', () => ({
+import { randomUUID } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import type { MockInstance } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { getProjectHash } from "../utils/paths.js";
+import type { ConversationRecord, ToolCallRecord } from "./chatRecordingService.js";
+import { ChatRecordingService } from "./chatRecordingService.js";
+
+vi.mock("node:fs");
+vi.mock("node:path");
+vi.mock("node:crypto", () => ({
   randomUUID: vi.fn(),
   createHash: vi.fn(() => ({
     update: vi.fn(() => ({
-      digest: vi.fn(() => 'mocked-hash'),
+      digest: vi.fn(() => "mocked-hash"),
     })),
   })),
 }));
-vi.mock('../utils/paths.js');
+vi.mock("../utils/paths.js");
 
-describe('ChatRecordingService', () => {
+describe("ChatRecordingService", () => {
   let chatRecordingService: ChatRecordingService;
   let mockConfig: Config;
 
@@ -38,70 +35,61 @@ describe('ChatRecordingService', () => {
 
   beforeEach(() => {
     mockConfig = {
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
       storage: {
-        getProjectTempDir: vi
-          .fn()
-          .mockReturnValue('/test/project/root/.gemini/tmp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/project/root/.gemini/tmp"),
       },
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getDebugMode: vi.fn().mockReturnValue(false),
       getToolRegistry: vi.fn().mockReturnValue({
         getTool: vi.fn().mockReturnValue({
-          displayName: 'Test Tool',
-          description: 'A test tool',
+          displayName: "Test Tool",
+          description: "A test tool",
           isOutputMarkdown: false,
         }),
       }),
     } as unknown as Config;
 
-    vi.mocked(getProjectHash).mockReturnValue('test-project-hash');
-    vi.mocked(randomUUID).mockReturnValue('this-is-a-test-uuid');
-    vi.mocked(path.join).mockImplementation((...args) => args.join('/'));
+    vi.mocked(getProjectHash).mockReturnValue("test-project-hash");
+    vi.mocked(randomUUID).mockReturnValue("this-is-a-test-uuid");
+    vi.mocked(path.join).mockImplementation((...args) => args.join("/"));
 
     chatRecordingService = new ChatRecordingService(mockConfig);
 
-    mkdirSyncSpy = vi
-      .spyOn(fs, 'mkdirSync')
-      .mockImplementation(() => undefined);
+    mkdirSyncSpy = vi.spyOn(fs, "mkdirSync").mockImplementation(() => undefined);
 
-    writeFileSyncSpy = vi
-      .spyOn(fs, 'writeFileSync')
-      .mockImplementation(() => undefined);
+    writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('initialize', () => {
-    it('should create a new session if none is provided', () => {
+  describe("initialize", () => {
+    it("should create a new session if none is provided", () => {
       chatRecordingService.initialize();
 
-      expect(mkdirSyncSpy).toHaveBeenCalledWith(
-        '/test/project/root/.gemini/tmp/chats',
-        { recursive: true },
-      );
+      expect(mkdirSyncSpy).toHaveBeenCalledWith("/test/project/root/.gemini/tmp/chats", {
+        recursive: true,
+      });
       expect(writeFileSyncSpy).not.toHaveBeenCalled();
     });
 
-    it('should resume from an existing session if provided', () => {
-      const readFileSyncSpy = vi.spyOn(fs, 'readFileSync').mockReturnValue(
+    it("should resume from an existing session if provided", () => {
+      const readFileSyncSpy = vi.spyOn(fs, "readFileSync").mockReturnValue(
         JSON.stringify({
-          sessionId: 'old-session-id',
-          projectHash: 'test-project-hash',
+          sessionId: "old-session-id",
+          projectHash: "test-project-hash",
           messages: [],
         }),
       );
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
 
       chatRecordingService.initialize({
-        filePath: '/test/project/root/.gemini/tmp/chats/session.json',
+        filePath: "/test/project/root/.gemini/tmp/chats/session.json",
         conversation: {
-          sessionId: 'old-session-id',
+          sessionId: "old-session-id",
         } as ConversationRecord,
       });
 
@@ -111,26 +99,24 @@ describe('ChatRecordingService', () => {
     });
   });
 
-  describe('recordMessage', () => {
+  describe("recordMessage", () => {
     beforeEach(() => {
       chatRecordingService.initialize();
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
+      vi.spyOn(fs, "readFileSync").mockReturnValue(
         JSON.stringify({
-          sessionId: 'test-session-id',
-          projectHash: 'test-project-hash',
+          sessionId: "test-session-id",
+          projectHash: "test-project-hash",
           messages: [],
         }),
       );
     });
 
-    it('should record a new message', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should record a new message", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       chatRecordingService.recordMessage({
-        type: 'user',
-        content: 'Hello',
-        model: 'gemini-pro',
+        type: "user",
+        content: "Hello",
+        model: "gemini-pro",
       });
       expect(mkdirSyncSpy).toHaveBeenCalled();
       expect(writeFileSyncSpy).toHaveBeenCalled();
@@ -138,34 +124,30 @@ describe('ChatRecordingService', () => {
         writeFileSyncSpy.mock.calls[0][1] as string,
       ) as ConversationRecord;
       expect(conversation.messages).toHaveLength(1);
-      expect(conversation.messages[0].content).toBe('Hello');
-      expect(conversation.messages[0].type).toBe('user');
+      expect(conversation.messages[0].content).toBe("Hello");
+      expect(conversation.messages[0].type).toBe("user");
     });
 
-    it('should create separate messages when recording multiple messages', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should create separate messages when recording multiple messages", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'user',
-            content: 'Hello',
+            id: "1",
+            type: "user",
+            content: "Hello",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       chatRecordingService.recordMessage({
-        type: 'user',
-        content: 'World',
-        model: 'gemini-pro',
+        type: "user",
+        content: "World",
+        model: "gemini-pro",
       });
 
       expect(mkdirSyncSpy).toHaveBeenCalled();
@@ -174,53 +156,47 @@ describe('ChatRecordingService', () => {
         writeFileSyncSpy.mock.calls[0][1] as string,
       ) as ConversationRecord;
       expect(conversation.messages).toHaveLength(2);
-      expect(conversation.messages[0].content).toBe('Hello');
-      expect(conversation.messages[1].content).toBe('World');
+      expect(conversation.messages[0].content).toBe("Hello");
+      expect(conversation.messages[1].content).toBe("World");
     });
   });
 
-  describe('recordThought', () => {
-    it('should queue a thought', () => {
+  describe("recordThought", () => {
+    it("should queue a thought", () => {
       chatRecordingService.initialize();
       chatRecordingService.recordThought({
-        subject: 'Thinking',
-        description: 'Thinking...',
+        subject: "Thinking",
+        description: "Thinking...",
       });
       // @ts-expect-error private property
       expect(chatRecordingService.queuedThoughts).toHaveLength(1);
       // @ts-expect-error private property
-      expect(chatRecordingService.queuedThoughts[0].subject).toBe('Thinking');
+      expect(chatRecordingService.queuedThoughts[0].subject).toBe("Thinking");
       // @ts-expect-error private property
-      expect(chatRecordingService.queuedThoughts[0].description).toBe(
-        'Thinking...',
-      );
+      expect(chatRecordingService.queuedThoughts[0].description).toBe("Thinking...");
     });
   });
 
-  describe('recordMessageTokens', () => {
+  describe("recordMessageTokens", () => {
     beforeEach(() => {
       chatRecordingService.initialize();
     });
 
-    it('should update the last message with token info', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should update the last message with token info", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'gemini',
-            content: 'Response',
+            id: "1",
+            type: "gemini",
+            content: "Response",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       chatRecordingService.recordMessageTokens({
         promptTokenCount: 1,
@@ -247,23 +223,21 @@ describe('ChatRecordingService', () => {
       });
     });
 
-    it('should queue token info if the last message already has tokens', () => {
+    it("should queue token info if the last message already has tokens", () => {
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'gemini',
-            content: 'Response',
+            id: "1",
+            type: "gemini",
+            content: "Response",
             timestamp: new Date().toISOString(),
             tokens: { input: 1, output: 1, total: 2, cached: 0 },
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       chatRecordingService.recordMessageTokens({
         promptTokenCount: 2,
@@ -284,39 +258,35 @@ describe('ChatRecordingService', () => {
     });
   });
 
-  describe('recordToolCalls', () => {
+  describe("recordToolCalls", () => {
     beforeEach(() => {
       chatRecordingService.initialize();
     });
 
-    it('should add new tool calls to the last message', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should add new tool calls to the last message", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'gemini',
-            content: '',
+            id: "1",
+            type: "gemini",
+            content: "",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       const toolCall: ToolCallRecord = {
-        id: 'tool-1',
-        name: 'testTool',
+        id: "tool-1",
+        name: "testTool",
         args: {},
-        status: 'awaiting_approval',
+        status: "awaiting_approval",
         timestamp: new Date().toISOString(),
       };
-      chatRecordingService.recordToolCalls('gemini-pro', [toolCall]);
+      chatRecordingService.recordToolCalls("gemini-pro", [toolCall]);
 
       expect(mkdirSyncSpy).toHaveBeenCalled();
       expect(writeFileSyncSpy).toHaveBeenCalled();
@@ -328,42 +298,38 @@ describe('ChatRecordingService', () => {
         toolCalls: [
           {
             ...toolCall,
-            displayName: 'Test Tool',
-            description: 'A test tool',
+            displayName: "Test Tool",
+            description: "A test tool",
             renderOutputAsMarkdown: false,
           },
         ],
       });
     });
 
-    it('should create a new message if the last message is not from gemini', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should create a new message if the last message is not from gemini", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: 'a-uuid',
-            type: 'user',
-            content: 'call a tool',
+            id: "a-uuid",
+            type: "user",
+            content: "call a tool",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       const toolCall: ToolCallRecord = {
-        id: 'tool-1',
-        name: 'testTool',
+        id: "tool-1",
+        name: "testTool",
         args: {},
-        status: 'awaiting_approval',
+        status: "awaiting_approval",
         timestamp: new Date().toISOString(),
       };
-      chatRecordingService.recordToolCalls('gemini-pro', [toolCall]);
+      chatRecordingService.recordToolCalls("gemini-pro", [toolCall]);
 
       expect(mkdirSyncSpy).toHaveBeenCalled();
       expect(writeFileSyncSpy).toHaveBeenCalled();
@@ -373,16 +339,16 @@ describe('ChatRecordingService', () => {
       expect(conversation.messages).toHaveLength(2);
       expect(conversation.messages[1]).toEqual({
         ...conversation.messages[1],
-        id: 'this-is-a-test-uuid',
-        model: 'gemini-pro',
-        type: 'gemini',
+        id: "this-is-a-test-uuid",
+        model: "gemini-pro",
+        type: "gemini",
         thoughts: [],
-        content: '',
+        content: "",
         toolCalls: [
           {
             ...toolCall,
-            displayName: 'Test Tool',
-            description: 'A test tool',
+            displayName: "Test Tool",
+            description: "A test tool",
             renderOutputAsMarkdown: false,
           },
         ],
@@ -390,14 +356,12 @@ describe('ChatRecordingService', () => {
     });
   });
 
-  describe('deleteSession', () => {
-    it('should delete the session file', () => {
-      const unlinkSyncSpy = vi
-        .spyOn(fs, 'unlinkSync')
-        .mockImplementation(() => undefined);
-      chatRecordingService.deleteSession('test-session-id');
+  describe("deleteSession", () => {
+    it("should delete the session file", () => {
+      const unlinkSyncSpy = vi.spyOn(fs, "unlinkSync").mockImplementation(() => undefined);
+      chatRecordingService.deleteSession("test-session-id");
       expect(unlinkSyncSpy).toHaveBeenCalledWith(
-        '/test/project/root/.gemini/tmp/chats/test-session-id.json',
+        "/test/project/root/.gemini/tmp/chats/test-session-id.json",
       );
     });
   });
diff --git a/packages/gemini-cli-core/src/services/chatRecordingService.ts b/packages/gemini-cli-core/src/services/chatRecordingService.ts
index 0f4dab0f4..63faeb0f3 100644
--- a/packages/gemini-cli-core/src/services/chatRecordingService.ts
+++ b/packages/gemini-cli-core/src/services/chatRecordingService.ts
@@ -4,20 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type Config } from '../config/config.js';
-import { type Status } from '../core/coreToolScheduler.js';
-import { type ThoughtSummary } from '../utils/thoughtUtils.js';
-import { getProjectHash } from '../utils/paths.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import type {
-  PartListUnion,
-  GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import { debugLogger } from '../utils/debugLogger.js';
-
-export const SESSION_FILE_PREFIX = 'session-';
+import { randomUUID } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import type { GenerateContentResponseUsageMetadata, PartListUnion } from "@google/genai";
+import { type Config } from "../config/config.js";
+import { type Status } from "../core/coreToolScheduler.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getProjectHash } from "../utils/paths.js";
+import { type ThoughtSummary } from "../utils/thoughtUtils.js";
+
+export const SESSION_FILE_PREFIX = "session-";
 
 /**
  * Token usage summary for a message or conversation.
@@ -62,10 +59,10 @@ export interface ToolCallRecord {
  */
 export type ConversationRecordExtra =
   | {
-      type: 'user' | 'info' | 'error' | 'warning';
+      type: "user" | "info" | "error" | "warning";
     }
   | {
-      type: 'gemini';
+      type: "gemini";
       toolCalls?: ToolCallRecord[];
       thoughts?: Array<ThoughtSummary & { timestamp: string }>;
       tokens?: TokensSummary | null;
@@ -143,20 +140,11 @@ export class ChatRecordingService {
         this.cachedLastConvData = null;
       } else {
         // Create new session
-        const chatsDir = path.join(
-          this.config.storage.getProjectTempDir(),
-          'chats',
-        );
+        const chatsDir = path.join(this.config.storage.getProjectTempDir(), "chats");
         fs.mkdirSync(chatsDir, { recursive: true });
 
-        const timestamp = new Date()
-          .toISOString()
-          .slice(0, 16)
-          .replace(/:/g, '-');
-        const filename = `${SESSION_FILE_PREFIX}${timestamp}-${this.sessionId.slice(
-          0,
-          8,
-        )}.json`;
+        const timestamp = new Date().toISOString().slice(0, 16).replace(/:/g, "-");
+        const filename = `${SESSION_FILE_PREFIX}${timestamp}-${this.sessionId.slice(0, 8)}.json`;
         this.conversationFile = path.join(chatsDir, filename);
 
         this.writeConversation({
@@ -172,21 +160,16 @@ export class ChatRecordingService {
       this.queuedThoughts = [];
       this.queuedTokens = null;
     } catch (error) {
-      debugLogger.error('Error initializing chat recording service:', error);
+      debugLogger.error("Error initializing chat recording service:", error);
       throw error;
     }
   }
 
-  private getLastMessage(
-    conversation: ConversationRecord,
-  ): MessageRecord | undefined {
+  private getLastMessage(conversation: ConversationRecord): MessageRecord | undefined {
     return conversation.messages.at(-1);
   }
 
-  private newMessage(
-    type: ConversationRecordExtra['type'],
-    content: PartListUnion,
-  ): MessageRecord {
+  private newMessage(type: ConversationRecordExtra["type"], content: PartListUnion): MessageRecord {
     return {
       id: randomUUID(),
       timestamp: new Date().toISOString(),
@@ -200,7 +183,7 @@ export class ChatRecordingService {
    */
   recordMessage(message: {
     model: string | undefined;
-    type: ConversationRecordExtra['type'];
+    type: ConversationRecordExtra["type"];
     content: PartListUnion;
   }): void {
     if (!this.conversationFile) return;
@@ -208,7 +191,7 @@ export class ChatRecordingService {
     try {
       this.updateConversation((conversation) => {
         const msg = this.newMessage(message.type, message.content);
-        if (msg.type === 'gemini') {
+        if (msg.type === "gemini") {
           // If it's a new Gemini message then incorporate any queued thoughts.
           conversation.messages.push({
             ...msg,
@@ -224,7 +207,7 @@ export class ChatRecordingService {
         }
       });
     } catch (error) {
-      debugLogger.error('Error saving message to chat history.', error);
+      debugLogger.error("Error saving message to chat history.", error);
       throw error;
     }
   }
@@ -241,7 +224,7 @@ export class ChatRecordingService {
         timestamp: new Date().toISOString(),
       });
     } catch (error) {
-      debugLogger.error('Error saving thought to chat history.', error);
+      debugLogger.error("Error saving thought to chat history.", error);
       throw error;
     }
   }
@@ -249,9 +232,7 @@ export class ChatRecordingService {
   /**
    * Updates the tokens for the last message in the conversation (which should be by Gemini).
    */
-  recordMessageTokens(
-    respUsageMetadata: GenerateContentResponseUsageMetadata,
-  ): void {
+  recordMessageTokens(respUsageMetadata: GenerateContentResponseUsageMetadata): void {
     if (!this.conversationFile) return;
 
     try {
@@ -267,7 +248,7 @@ export class ChatRecordingService {
         const lastMsg = this.getLastMessage(conversation);
         // If the last message already has token info, it's because this new token info is for a
         // new message that hasn't been recorded yet.
-        if (lastMsg && lastMsg.type === 'gemini' && !lastMsg.tokens) {
+        if (lastMsg && lastMsg.type === "gemini" && !lastMsg.tokens) {
           lastMsg.tokens = tokens;
           this.queuedTokens = null;
         } else {
@@ -275,10 +256,7 @@ export class ChatRecordingService {
         }
       });
     } catch (error) {
-      debugLogger.error(
-        'Error updating message tokens in chat history.',
-        error,
-      );
+      debugLogger.error("Error updating message tokens in chat history.", error);
       throw error;
     }
   }
@@ -297,7 +275,7 @@ export class ChatRecordingService {
       return {
         ...toolCall,
         displayName: toolInstance?.displayName || toolCall.name,
-        description: toolInstance?.description || '',
+        description: toolInstance?.description || "",
         renderOutputAsMarkdown: toolInstance?.isOutputMarkdown || false,
       };
     });
@@ -312,18 +290,14 @@ export class ChatRecordingService {
         // Also if there are any queued thoughts, it means this tool call(s) is from a new Gemini
         // message--because it's thought some more since we last, if ever, created a new Gemini
         // message from tool calls, when we dequeued the thoughts.
-        if (
-          !lastMsg ||
-          lastMsg.type !== 'gemini' ||
-          this.queuedThoughts.length > 0
-        ) {
+        if (!lastMsg || lastMsg.type !== "gemini" || this.queuedThoughts.length > 0) {
           const newMsg: MessageRecord = {
-            ...this.newMessage('gemini' as const, ''),
+            ...this.newMessage("gemini" as const, ""),
             // This isn't strictly necessary, but TypeScript apparently can't
             // tell that the first parameter to newMessage() becomes the
             // resulting message's type, and so it thinks that toolCalls may
             // not be present.  Confirming the type here satisfies it.
-            type: 'gemini' as const,
+            type: "gemini" as const,
             toolCalls: enrichedToolCalls,
             thoughts: this.queuedThoughts,
             model,
@@ -348,9 +322,7 @@ export class ChatRecordingService {
           }
           lastMsg.toolCalls = lastMsg.toolCalls.map((toolCall) => {
             // If there are multiple tool calls with the same ID, this will take the first one.
-            const incomingToolCall = toolCalls.find(
-              (tc) => tc.id === toolCall.id,
-            );
+            const incomingToolCall = toolCalls.find((tc) => tc.id === toolCall.id);
             if (incomingToolCall) {
               // Merge in the new data to keep preserve thoughts, etc., that were assigned to older
               // versions of the tool call.
@@ -362,9 +334,7 @@ export class ChatRecordingService {
 
           // Add any new tools calls that aren't in the message yet.
           for (const toolCall of enrichedToolCalls) {
-            const existingToolCall = lastMsg.toolCalls.find(
-              (tc) => tc.id === toolCall.id,
-            );
+            const existingToolCall = lastMsg.toolCalls.find((tc) => tc.id === toolCall.id);
             if (!existingToolCall) {
               lastMsg.toolCalls.push(toolCall);
             }
@@ -372,10 +342,7 @@ export class ChatRecordingService {
         }
       });
     } catch (error) {
-      debugLogger.error(
-        'Error adding tool call to message in chat history.',
-        error,
-      );
+      debugLogger.error("Error adding tool call to message in chat history.", error);
       throw error;
     }
   }
@@ -385,11 +352,11 @@ export class ChatRecordingService {
    */
   private readConversation(): ConversationRecord {
     try {
-      this.cachedLastConvData = fs.readFileSync(this.conversationFile!, 'utf8');
+      this.cachedLastConvData = fs.readFileSync(this.conversationFile!, "utf8");
       return JSON.parse(this.cachedLastConvData);
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        debugLogger.error('Error reading conversation file.', error);
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+        debugLogger.error("Error reading conversation file.", error);
         throw error;
       }
 
@@ -421,7 +388,7 @@ export class ChatRecordingService {
         fs.writeFileSync(this.conversationFile, newContent);
       }
     } catch (error) {
-      debugLogger.error('Error writing conversation file.', error);
+      debugLogger.error("Error writing conversation file.", error);
       throw error;
     }
   }
@@ -430,9 +397,7 @@ export class ChatRecordingService {
    * Convenient helper for updating the conversation without file reading and writing and time
    * updating boilerplate.
    */
-  private updateConversation(
-    updateFn: (conversation: ConversationRecord) => void,
-  ) {
+  private updateConversation(updateFn: (conversation: ConversationRecord) => void) {
     const conversation = this.readConversation();
     updateFn(conversation);
     this.writeConversation(conversation);
@@ -449,7 +414,7 @@ export class ChatRecordingService {
         conversation.summary = summary;
       });
     } catch (error) {
-      debugLogger.error('Error saving summary to chat history.', error);
+      debugLogger.error("Error saving summary to chat history.", error);
       // Don't throw - we want graceful degradation
     }
   }
@@ -463,7 +428,7 @@ export class ChatRecordingService {
     try {
       return this.readConversation();
     } catch (error) {
-      debugLogger.error('Error reading conversation for summary.', error);
+      debugLogger.error("Error reading conversation for summary.", error);
       return null;
     }
   }
@@ -481,14 +446,11 @@ export class ChatRecordingService {
    */
   deleteSession(sessionId: string): void {
     try {
-      const chatsDir = path.join(
-        this.config.storage.getProjectTempDir(),
-        'chats',
-      );
+      const chatsDir = path.join(this.config.storage.getProjectTempDir(), "chats");
       const sessionPath = path.join(chatsDir, `${sessionId}.json`);
       fs.unlinkSync(sessionPath);
     } catch (error) {
-      debugLogger.error('Error deleting session file.', error);
+      debugLogger.error("Error deleting session file.", error);
       throw error;
     }
   }
diff --git a/packages/gemini-cli-core/src/services/contextManager.test.ts b/packages/gemini-cli-core/src/services/contextManager.test.ts
index 4f33c9f62..7321d7798 100644
--- a/packages/gemini-cli-core/src/services/contextManager.test.ts
+++ b/packages/gemini-cli-core/src/services/contextManager.test.ts
@@ -4,16 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ContextManager } from './contextManager.js';
-import * as memoryDiscovery from '../utils/memoryDiscovery.js';
-import type { Config } from '../config/config.js';
-import type { ExtensionLoader } from '../utils/extensionLoader.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { ExtensionLoader } from "../utils/extensionLoader.js";
+import * as memoryDiscovery from "../utils/memoryDiscovery.js";
+import { ContextManager } from "./contextManager.js";
 
 // Mock memoryDiscovery module
-vi.mock('../utils/memoryDiscovery.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../utils/memoryDiscovery.js')>();
+vi.mock("../utils/memoryDiscovery.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/memoryDiscovery.js")>();
   return {
     ...actual,
     loadGlobalMemory: vi.fn(),
@@ -22,26 +21,24 @@ vi.mock('../utils/memoryDiscovery.js', async (importOriginal) => {
   };
 });
 
-describe('ContextManager', () => {
+describe("ContextManager", () => {
   let contextManager: ContextManager;
   let mockConfig: Config;
 
   beforeEach(() => {
     mockConfig = {
       getDebugMode: vi.fn().mockReturnValue(false),
-      getWorkingDir: vi.fn().mockReturnValue('/app'),
+      getWorkingDir: vi.fn().mockReturnValue("/app"),
     } as unknown as Config;
 
     contextManager = new ContextManager(mockConfig);
     vi.clearAllMocks();
   });
 
-  describe('loadGlobalMemory', () => {
-    it('should load and format global memory', async () => {
+  describe("loadGlobalMemory", () => {
+    it("should load and format global memory", async () => {
       const mockResult: memoryDiscovery.MemoryLoadResult = {
-        files: [
-          { path: '/home/user/.gemini/GEMINI.md', content: 'Global Content' },
-        ],
+        files: [{ path: "/home/user/.gemini/GEMINI.md", content: "Global Content" }],
       };
       vi.mocked(memoryDiscovery.loadGlobalMemory).mockResolvedValue(mockResult);
 
@@ -50,86 +47,69 @@ describe('ContextManager', () => {
       expect(memoryDiscovery.loadGlobalMemory).toHaveBeenCalledWith(false);
       // The path will be relative to CWD (/app), so it might contain ../
       expect(result).toMatch(/--- Context from: .*GEMINI.md ---/);
-      expect(result).toContain('Global Content');
-      expect(contextManager.getLoadedPaths()).toContain(
-        '/home/user/.gemini/GEMINI.md',
-      );
+      expect(result).toContain("Global Content");
+      expect(contextManager.getLoadedPaths()).toContain("/home/user/.gemini/GEMINI.md");
       expect(contextManager.getGlobalMemory()).toBe(result);
     });
   });
 
-  describe('loadEnvironmentMemory', () => {
-    it('should load and format environment memory', async () => {
+  describe("loadEnvironmentMemory", () => {
+    it("should load and format environment memory", async () => {
       const mockResult: memoryDiscovery.MemoryLoadResult = {
-        files: [{ path: '/app/GEMINI.md', content: 'Env Content' }],
+        files: [{ path: "/app/GEMINI.md", content: "Env Content" }],
       };
-      vi.mocked(memoryDiscovery.loadEnvironmentMemory).mockResolvedValue(
-        mockResult,
-      );
+      vi.mocked(memoryDiscovery.loadEnvironmentMemory).mockResolvedValue(mockResult);
       const mockExtensionLoader = {} as unknown as ExtensionLoader;
 
-      const result = await contextManager.loadEnvironmentMemory(
-        ['/app'],
-        mockExtensionLoader,
-      );
+      const result = await contextManager.loadEnvironmentMemory(["/app"], mockExtensionLoader);
 
       expect(memoryDiscovery.loadEnvironmentMemory).toHaveBeenCalledWith(
-        ['/app'],
+        ["/app"],
         mockExtensionLoader,
         false,
       );
-      expect(result).toContain('--- Context from: GEMINI.md ---');
-      expect(result).toContain('Env Content');
-      expect(contextManager.getLoadedPaths()).toContain('/app/GEMINI.md');
+      expect(result).toContain("--- Context from: GEMINI.md ---");
+      expect(result).toContain("Env Content");
+      expect(contextManager.getLoadedPaths()).toContain("/app/GEMINI.md");
       expect(contextManager.getEnvironmentMemory()).toBe(result);
     });
   });
 
-  describe('discoverContext', () => {
-    it('should discover and load new context', async () => {
+  describe("discoverContext", () => {
+    it("should discover and load new context", async () => {
       const mockResult: memoryDiscovery.MemoryLoadResult = {
-        files: [{ path: '/app/src/GEMINI.md', content: 'Src Content' }],
+        files: [{ path: "/app/src/GEMINI.md", content: "Src Content" }],
       };
-      vi.mocked(memoryDiscovery.loadJitSubdirectoryMemory).mockResolvedValue(
-        mockResult,
-      );
+      vi.mocked(memoryDiscovery.loadJitSubdirectoryMemory).mockResolvedValue(mockResult);
 
-      const result = await contextManager.discoverContext('/app/src/file.ts', [
-        '/app',
-      ]);
+      const result = await contextManager.discoverContext("/app/src/file.ts", ["/app"]);
 
       expect(memoryDiscovery.loadJitSubdirectoryMemory).toHaveBeenCalledWith(
-        '/app/src/file.ts',
-        ['/app'],
+        "/app/src/file.ts",
+        ["/app"],
         expect.any(Set),
         false,
       );
       expect(result).toMatch(/--- Context from: src[\\/]GEMINI\.md ---/);
-      expect(result).toContain('Src Content');
-      expect(contextManager.getLoadedPaths()).toContain('/app/src/GEMINI.md');
+      expect(result).toContain("Src Content");
+      expect(contextManager.getLoadedPaths()).toContain("/app/src/GEMINI.md");
     });
 
-    it('should return empty string if no new files found', async () => {
+    it("should return empty string if no new files found", async () => {
       const mockResult: memoryDiscovery.MemoryLoadResult = { files: [] };
-      vi.mocked(memoryDiscovery.loadJitSubdirectoryMemory).mockResolvedValue(
-        mockResult,
-      );
+      vi.mocked(memoryDiscovery.loadJitSubdirectoryMemory).mockResolvedValue(mockResult);
 
-      const result = await contextManager.discoverContext('/app/src/file.ts', [
-        '/app',
-      ]);
+      const result = await contextManager.discoverContext("/app/src/file.ts", ["/app"]);
 
-      expect(result).toBe('');
+      expect(result).toBe("");
     });
   });
 
-  describe('reset', () => {
-    it('should clear loaded paths and memory', async () => {
+  describe("reset", () => {
+    it("should clear loaded paths and memory", async () => {
       // Setup some state
       const mockResult: memoryDiscovery.MemoryLoadResult = {
-        files: [
-          { path: '/home/user/.gemini/GEMINI.md', content: 'Global Content' },
-        ],
+        files: [{ path: "/home/user/.gemini/GEMINI.md", content: "Global Content" }],
       };
       vi.mocked(memoryDiscovery.loadGlobalMemory).mockResolvedValue(mockResult);
       await contextManager.loadGlobalMemory();
@@ -141,8 +121,8 @@ describe('ContextManager', () => {
       contextManager.reset();
 
       expect(contextManager.getLoadedPaths().size).toBe(0);
-      expect(contextManager.getGlobalMemory()).toBe('');
-      expect(contextManager.getEnvironmentMemory()).toBe('');
+      expect(contextManager.getGlobalMemory()).toBe("");
+      expect(contextManager.getEnvironmentMemory()).toBe("");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/services/contextManager.ts b/packages/gemini-cli-core/src/services/contextManager.ts
index dd094a10d..a7a06efe8 100644
--- a/packages/gemini-cli-core/src/services/contextManager.ts
+++ b/packages/gemini-cli-core/src/services/contextManager.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { Config } from "../config/config.js";
+import type { ExtensionLoader } from "../utils/extensionLoader.js";
 import {
-  loadGlobalMemory,
+  concatenateInstructions,
   loadEnvironmentMemory,
+  loadGlobalMemory,
   loadJitSubdirectoryMemory,
-  concatenateInstructions,
-} from '../utils/memoryDiscovery.js';
-import type { ExtensionLoader } from '../utils/extensionLoader.js';
-import type { Config } from '../config/config.js';
+} from "../utils/memoryDiscovery.js";
 
 export class ContextManager {
   private readonly loadedPaths: Set<string> = new Set();
   private readonly config: Config;
-  private globalMemory: string = '';
-  private environmentMemory: string = '';
+  private globalMemory: string = "";
+  private environmentMemory: string = "";
 
   constructor(config: Config) {
     this.config = config;
@@ -60,10 +60,7 @@ export class ContextManager {
    * Discovers and loads context for a specific accessed path (Tier 3 - JIT).
    * Traverses upwards from the accessed path to the project root.
    */
-  async discoverContext(
-    accessedPath: string,
-    trustedRoots: string[],
-  ): Promise<string> {
+  async discoverContext(accessedPath: string, trustedRoots: string[]): Promise<string> {
     const result = await loadJitSubdirectoryMemory(
       accessedPath,
       trustedRoots,
@@ -72,7 +69,7 @@ export class ContextManager {
     );
 
     if (result.files.length === 0) {
-      return '';
+      return "";
     }
 
     this.markAsLoaded(result.files.map((f) => f.path));
@@ -101,8 +98,8 @@ export class ContextManager {
    */
   reset(): void {
     this.loadedPaths.clear();
-    this.globalMemory = '';
-    this.environmentMemory = '';
+    this.globalMemory = "";
+    this.environmentMemory = "";
   }
 
   getLoadedPaths(): ReadonlySet<string> {
diff --git a/packages/gemini-cli-core/src/services/fileDiscoveryService.test.ts b/packages/gemini-cli-core/src/services/fileDiscoveryService.test.ts
index 173e11458..6cfd86903 100644
--- a/packages/gemini-cli-core/src/services/fileDiscoveryService.test.ts
+++ b/packages/gemini-cli-core/src/services/fileDiscoveryService.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { FileDiscoveryService } from './fileDiscoveryService.js';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { FileDiscoveryService } from "./fileDiscoveryService.js";
 
-describe('FileDiscoveryService', () => {
+describe("FileDiscoveryService", () => {
   let testRootDir: string;
   let projectRoot: string;
 
-  async function createTestFile(filePath: string, content = '') {
+  async function createTestFile(filePath: string, content = "") {
     const fullPath = path.join(projectRoot, filePath);
     await fs.mkdir(path.dirname(fullPath), { recursive: true });
     await fs.writeFile(fullPath, content);
@@ -22,10 +22,8 @@ describe('FileDiscoveryService', () => {
   }
 
   beforeEach(async () => {
-    testRootDir = await fs.mkdtemp(
-      path.join(os.tmpdir(), 'file-discovery-test-'),
-    );
-    projectRoot = path.join(testRootDir, 'project');
+    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "file-discovery-test-"));
+    projectRoot = path.join(testRootDir, "project");
     await fs.mkdir(projectRoot, { recursive: true });
   });
 
@@ -33,65 +31,65 @@ describe('FileDiscoveryService', () => {
     await fs.rm(testRootDir, { recursive: true, force: true });
   });
 
-  describe('initialization', () => {
-    it('should initialize git ignore parser by default in a git repo', async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/');
+  describe("initialization", () => {
+    it("should initialize git ignore parser by default in a git repo", async () => {
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/");
 
       const service = new FileDiscoveryService(projectRoot);
       // Let's check the effect of the parser instead of mocking it.
-      expect(service.shouldIgnoreFile('node_modules/foo.js')).toBe(true);
-      expect(service.shouldIgnoreFile('src/foo.js')).toBe(false);
+      expect(service.shouldIgnoreFile("node_modules/foo.js")).toBe(true);
+      expect(service.shouldIgnoreFile("src/foo.js")).toBe(false);
     });
 
-    it('should not load git repo patterns when not in a git repo', async () => {
+    it("should not load git repo patterns when not in a git repo", async () => {
       // No .git directory
-      await createTestFile('.gitignore', 'node_modules/');
+      await createTestFile(".gitignore", "node_modules/");
       const service = new FileDiscoveryService(projectRoot);
 
       // .gitignore is not loaded in non-git repos
-      expect(service.shouldIgnoreFile('node_modules/foo.js')).toBe(false);
+      expect(service.shouldIgnoreFile("node_modules/foo.js")).toBe(false);
     });
 
-    it('should load .geminiignore patterns even when not in a git repo', async () => {
-      await createTestFile('.geminiignore', 'secrets.txt');
+    it("should load .geminiignore patterns even when not in a git repo", async () => {
+      await createTestFile(".geminiignore", "secrets.txt");
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(service.shouldIgnoreFile('secrets.txt')).toBe(true);
-      expect(service.shouldIgnoreFile('src/index.js')).toBe(false);
+      expect(service.shouldIgnoreFile("secrets.txt")).toBe(true);
+      expect(service.shouldIgnoreFile("src/index.js")).toBe(false);
     });
   });
 
-  describe('filterFiles', () => {
+  describe("filterFiles", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/\n.git/\ndist');
-      await createTestFile('.geminiignore', 'logs/');
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/\n.git/\ndist");
+      await createTestFile(".geminiignore", "logs/");
     });
 
-    it('should filter out git-ignored and gemini-ignored files by default', () => {
+    it("should filter out git-ignored and gemini-ignored files by default", () => {
       const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        'README.md',
-        '.git/config',
-        'dist/bundle.js',
-        'logs/latest.log',
+        "src/index.ts",
+        "node_modules/package/index.js",
+        "README.md",
+        ".git/config",
+        "dist/bundle.js",
+        "logs/latest.log",
       ].map((f) => path.join(projectRoot, f));
 
       const service = new FileDiscoveryService(projectRoot);
 
       expect(service.filterFiles(files)).toEqual(
-        ['src/index.ts', 'README.md'].map((f) => path.join(projectRoot, f)),
+        ["src/index.ts", "README.md"].map((f) => path.join(projectRoot, f)),
       );
     });
 
-    it('should not filter files when respectGitIgnore is false', () => {
+    it("should not filter files when respectGitIgnore is false", () => {
       const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        '.git/config',
-        'logs/latest.log',
+        "src/index.ts",
+        "node_modules/package/index.js",
+        ".git/config",
+        "logs/latest.log",
       ].map((f) => path.join(projectRoot, f));
 
       const service = new FileDiscoveryService(projectRoot);
@@ -102,18 +100,16 @@ describe('FileDiscoveryService', () => {
       });
 
       expect(filtered).toEqual(
-        ['src/index.ts', 'node_modules/package/index.js', '.git/config'].map(
-          (f) => path.join(projectRoot, f),
+        ["src/index.ts", "node_modules/package/index.js", ".git/config"].map((f) =>
+          path.join(projectRoot, f),
         ),
       );
     });
 
-    it('should not filter files when respectGeminiIgnore is false', () => {
-      const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        'logs/latest.log',
-      ].map((f) => path.join(projectRoot, f));
+    it("should not filter files when respectGeminiIgnore is false", () => {
+      const files = ["src/index.ts", "node_modules/package/index.js", "logs/latest.log"].map((f) =>
+        path.join(projectRoot, f),
+      );
 
       const service = new FileDiscoveryService(projectRoot);
 
@@ -123,47 +119,40 @@ describe('FileDiscoveryService', () => {
       });
 
       expect(filtered).toEqual(
-        ['src/index.ts', 'logs/latest.log'].map((f) =>
-          path.join(projectRoot, f),
-        ),
+        ["src/index.ts", "logs/latest.log"].map((f) => path.join(projectRoot, f)),
       );
     });
 
-    it('should handle empty file list', () => {
+    it("should handle empty file list", () => {
       const service = new FileDiscoveryService(projectRoot);
 
       expect(service.filterFiles([])).toEqual([]);
     });
   });
 
-  describe('filterFilesWithReport', () => {
+  describe("filterFilesWithReport", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/');
-      await createTestFile('.geminiignore', '*.log');
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/");
+      await createTestFile(".geminiignore", "*.log");
     });
 
-    it('should return filtered paths and correct ignored count', () => {
-      const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        'debug.log',
-        'README.md',
-      ].map((f) => path.join(projectRoot, f));
+    it("should return filtered paths and correct ignored count", () => {
+      const files = ["src/index.ts", "node_modules/package/index.js", "debug.log", "README.md"].map(
+        (f) => path.join(projectRoot, f),
+      );
 
       const service = new FileDiscoveryService(projectRoot);
       const report = service.filterFilesWithReport(files);
 
       expect(report.filteredPaths).toEqual(
-        ['src/index.ts', 'README.md'].map((f) => path.join(projectRoot, f)),
+        ["src/index.ts", "README.md"].map((f) => path.join(projectRoot, f)),
       );
       expect(report.ignoredCount).toBe(2);
     });
 
-    it('should handle no ignored files', () => {
-      const files = ['src/index.ts', 'README.md'].map((f) =>
-        path.join(projectRoot, f),
-      );
+    it("should handle no ignored files", () => {
+      const files = ["src/index.ts", "README.md"].map((f) => path.join(projectRoot, f));
 
       const service = new FileDiscoveryService(projectRoot);
       const report = service.filterFilesWithReport(files);
@@ -173,130 +162,106 @@ describe('FileDiscoveryService', () => {
     });
   });
 
-  describe('shouldGitIgnoreFile & shouldGeminiIgnoreFile', () => {
+  describe("shouldGitIgnoreFile & shouldGeminiIgnoreFile", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/');
-      await createTestFile('.geminiignore', '*.log');
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/");
+      await createTestFile(".geminiignore", "*.log");
     });
 
-    it('should return true for git-ignored files', () => {
+    it("should return true for git-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
       expect(
-        service.shouldIgnoreFile(
-          path.join(projectRoot, 'node_modules/package/index.js'),
-        ),
+        service.shouldIgnoreFile(path.join(projectRoot, "node_modules/package/index.js")),
       ).toBe(true);
     });
 
-    it('should return false for non-git-ignored files', () => {
+    it("should return false for non-git-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'src/index.ts')),
-      ).toBe(false);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "src/index.ts"))).toBe(false);
     });
 
-    it('should return true for gemini-ignored files', () => {
+    it("should return true for gemini-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'debug.log')),
-      ).toBe(true);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "debug.log"))).toBe(true);
     });
 
-    it('should return false for non-gemini-ignored files', () => {
+    it("should return false for non-gemini-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'src/index.ts')),
-      ).toBe(false);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "src/index.ts"))).toBe(false);
     });
   });
 
-  describe('edge cases', () => {
-    it('should handle relative project root paths', async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'ignored.txt');
-      const service = new FileDiscoveryService(
-        path.relative(process.cwd(), projectRoot),
-      );
+  describe("edge cases", () => {
+    it("should handle relative project root paths", async () => {
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "ignored.txt");
+      const service = new FileDiscoveryService(path.relative(process.cwd(), projectRoot));
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'ignored.txt')),
-      ).toBe(true);
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'not-ignored.txt')),
-      ).toBe(false);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "ignored.txt"))).toBe(true);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "not-ignored.txt"))).toBe(false);
     });
 
-    it('should handle filterFiles with undefined options', async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'ignored.txt');
+    it("should handle filterFiles with undefined options", async () => {
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "ignored.txt");
       const service = new FileDiscoveryService(projectRoot);
 
-      const files = ['src/index.ts', 'ignored.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["src/index.ts", "ignored.txt"].map((f) => path.join(projectRoot, f));
 
       expect(service.filterFiles(files, undefined)).toEqual([
-        path.join(projectRoot, 'src/index.ts'),
+        path.join(projectRoot, "src/index.ts"),
       ]);
     });
   });
-  describe('precedence (.geminiignore over .gitignore)', () => {
+  describe("precedence (.geminiignore over .gitignore)", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
+      await fs.mkdir(path.join(projectRoot, ".git"));
     });
 
-    it('should un-ignore a file in .geminiignore that is ignored in .gitignore', async () => {
-      await createTestFile('.gitignore', '*.txt');
-      await createTestFile('.geminiignore', '!important.txt');
+    it("should un-ignore a file in .geminiignore that is ignored in .gitignore", async () => {
+      await createTestFile(".gitignore", "*.txt");
+      await createTestFile(".geminiignore", "!important.txt");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['file.txt', 'important.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["file.txt", "important.txt"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files);
-      expect(filtered).toEqual([path.join(projectRoot, 'important.txt')]);
+      expect(filtered).toEqual([path.join(projectRoot, "important.txt")]);
     });
 
-    it('should un-ignore a directory in .geminiignore that is ignored in .gitignore', async () => {
-      await createTestFile('.gitignore', 'logs/');
-      await createTestFile('.geminiignore', '!logs/');
+    it("should un-ignore a directory in .geminiignore that is ignored in .gitignore", async () => {
+      await createTestFile(".gitignore", "logs/");
+      await createTestFile(".geminiignore", "!logs/");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['logs/app.log', 'other/app.log'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["logs/app.log", "other/app.log"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files);
       expect(filtered).toEqual(files);
     });
 
-    it('should extend ignore rules in .geminiignore', async () => {
-      await createTestFile('.gitignore', '*.log');
-      await createTestFile('.geminiignore', 'temp/');
+    it("should extend ignore rules in .geminiignore", async () => {
+      await createTestFile(".gitignore", "*.log");
+      await createTestFile(".geminiignore", "temp/");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['app.log', 'temp/file.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["app.log", "temp/file.txt"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files);
       expect(filtered).toEqual([]);
     });
 
-    it('should use .gitignore rules if respectGeminiIgnore is false', async () => {
-      await createTestFile('.gitignore', '*.txt');
-      await createTestFile('.geminiignore', '!important.txt');
+    it("should use .gitignore rules if respectGeminiIgnore is false", async () => {
+      await createTestFile(".gitignore", "*.txt");
+      await createTestFile(".geminiignore", "!important.txt");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['file.txt', 'important.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["file.txt", "important.txt"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files, {
         respectGitIgnore: true,
@@ -306,12 +271,12 @@ describe('FileDiscoveryService', () => {
       expect(filtered).toEqual([]);
     });
 
-    it('should use .geminiignore rules if respectGitIgnore is false', async () => {
-      await createTestFile('.gitignore', '*.txt');
-      await createTestFile('.geminiignore', '!important.txt\ntemp/');
+    it("should use .geminiignore rules if respectGitIgnore is false", async () => {
+      await createTestFile(".gitignore", "*.txt");
+      await createTestFile(".geminiignore", "!important.txt\ntemp/");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['file.txt', 'important.txt', 'temp/file.js'].map((f) =>
+      const files = ["file.txt", "important.txt", "temp/file.js"].map((f) =>
         path.join(projectRoot, f),
       );
 
@@ -323,9 +288,7 @@ describe('FileDiscoveryService', () => {
       // .gitignore is ignored, so *.txt is not applied.
       // .geminiignore un-ignores important.txt (which wasn't ignored anyway)
       // and ignores temp/
-      expect(filtered).toEqual(
-        ['file.txt', 'important.txt'].map((f) => path.join(projectRoot, f)),
-      );
+      expect(filtered).toEqual(["file.txt", "important.txt"].map((f) => path.join(projectRoot, f)));
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/services/fileDiscoveryService.ts b/packages/gemini-cli-core/src/services/fileDiscoveryService.ts
index 4ad2eb755..56f10fca5 100644
--- a/packages/gemini-cli-core/src/services/fileDiscoveryService.ts
+++ b/packages/gemini-cli-core/src/services/fileDiscoveryService.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GitIgnoreFilter } from '../utils/gitIgnoreParser.js';
-import type { GeminiIgnoreFilter } from '../utils/geminiIgnoreParser.js';
-import { GitIgnoreParser } from '../utils/gitIgnoreParser.js';
-import { GeminiIgnoreParser } from '../utils/geminiIgnoreParser.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import * as path from 'node:path';
+import * as path from "node:path";
+import type { GeminiIgnoreFilter } from "../utils/geminiIgnoreParser.js";
+import { GeminiIgnoreParser } from "../utils/geminiIgnoreParser.js";
+import type { GitIgnoreFilter } from "../utils/gitIgnoreParser.js";
+import { GitIgnoreParser } from "../utils/gitIgnoreParser.js";
+import { isGitRepository } from "../utils/gitUtils.js";
 
 export interface FilterFilesOptions {
   respectGitIgnore?: boolean;
@@ -37,10 +37,7 @@ export class FileDiscoveryService {
     if (this.gitIgnoreFilter) {
       const geminiPatterns = this.geminiIgnoreFilter.getPatterns();
       // Create combined parser: .gitignore + .geminiignore
-      this.combinedIgnoreFilter = new GitIgnoreParser(
-        this.projectRoot,
-        geminiPatterns,
-      );
+      this.combinedIgnoreFilter = new GitIgnoreParser(this.projectRoot, geminiPatterns);
     }
   }
 
@@ -50,11 +47,7 @@ export class FileDiscoveryService {
   filterFiles(filePaths: string[], options: FilterFilesOptions = {}): string[] {
     const { respectGitIgnore = true, respectGeminiIgnore = true } = options;
     return filePaths.filter((filePath) => {
-      if (
-        respectGitIgnore &&
-        respectGeminiIgnore &&
-        this.combinedIgnoreFilter
-      ) {
+      if (respectGitIgnore && respectGeminiIgnore && this.combinedIgnoreFilter) {
         return !this.combinedIgnoreFilter.isIgnored(filePath);
       }
 
@@ -91,10 +84,7 @@ export class FileDiscoveryService {
   /**
    * Unified method to check if a file should be ignored based on filtering options
    */
-  shouldIgnoreFile(
-    filePath: string,
-    options: FilterFilesOptions = {},
-  ): boolean {
+  shouldIgnoreFile(filePath: string, options: FilterFilesOptions = {}): boolean {
     return this.filterFiles([filePath], options).length === 0;
   }
 }
diff --git a/packages/gemini-cli-core/src/services/fileSystemService.test.ts b/packages/gemini-cli-core/src/services/fileSystemService.test.ts
index 4ca5c3329..90fb14f4f 100644
--- a/packages/gemini-cli-core/src/services/fileSystemService.test.ts
+++ b/packages/gemini-cli-core/src/services/fileSystemService.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'node:fs/promises';
-import { StandardFileSystemService } from './fileSystemService.js';
+import fs from "node:fs/promises";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { StandardFileSystemService } from "./fileSystemService.js";
 
-vi.mock('fs/promises');
+vi.mock("fs/promises");
 
-describe('StandardFileSystemService', () => {
+describe("StandardFileSystemService", () => {
   let fileSystem: StandardFileSystemService;
 
   beforeEach(() => {
@@ -22,38 +22,34 @@ describe('StandardFileSystemService', () => {
     vi.restoreAllMocks();
   });
 
-  describe('readTextFile', () => {
-    it('should read file content using fs', async () => {
-      const testContent = 'Hello, World!';
+  describe("readTextFile", () => {
+    it("should read file content using fs", async () => {
+      const testContent = "Hello, World!";
       vi.mocked(fs.readFile).mockResolvedValue(testContent);
 
-      const result = await fileSystem.readTextFile('/test/file.txt');
+      const result = await fileSystem.readTextFile("/test/file.txt");
 
-      expect(fs.readFile).toHaveBeenCalledWith('/test/file.txt', 'utf-8');
+      expect(fs.readFile).toHaveBeenCalledWith("/test/file.txt", "utf-8");
       expect(result).toBe(testContent);
     });
 
-    it('should propagate fs.readFile errors', async () => {
-      const error = new Error('ENOENT: File not found');
+    it("should propagate fs.readFile errors", async () => {
+      const error = new Error("ENOENT: File not found");
       vi.mocked(fs.readFile).mockRejectedValue(error);
 
-      await expect(fileSystem.readTextFile('/test/file.txt')).rejects.toThrow(
-        'ENOENT: File not found',
+      await expect(fileSystem.readTextFile("/test/file.txt")).rejects.toThrow(
+        "ENOENT: File not found",
       );
     });
   });
 
-  describe('writeTextFile', () => {
-    it('should write file content using fs', async () => {
+  describe("writeTextFile", () => {
+    it("should write file content using fs", async () => {
       vi.mocked(fs.writeFile).mockResolvedValue();
 
-      await fileSystem.writeTextFile('/test/file.txt', 'Hello, World!');
+      await fileSystem.writeTextFile("/test/file.txt", "Hello, World!");
 
-      expect(fs.writeFile).toHaveBeenCalledWith(
-        '/test/file.txt',
-        'Hello, World!',
-        'utf-8',
-      );
+      expect(fs.writeFile).toHaveBeenCalledWith("/test/file.txt", "Hello, World!", "utf-8");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/services/fileSystemService.ts b/packages/gemini-cli-core/src/services/fileSystemService.ts
index 946c227ab..082595569 100644
--- a/packages/gemini-cli-core/src/services/fileSystemService.ts
+++ b/packages/gemini-cli-core/src/services/fileSystemService.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
+import fs from "node:fs/promises";
 
 /**
  * Interface for file system operations that may be delegated to different implementations
@@ -32,10 +32,10 @@ export interface FileSystemService {
  */
 export class StandardFileSystemService implements FileSystemService {
   async readTextFile(filePath: string): Promise<string> {
-    return fs.readFile(filePath, 'utf-8');
+    return fs.readFile(filePath, "utf-8");
   }
 
   async writeTextFile(filePath: string, content: string): Promise<void> {
-    await fs.writeFile(filePath, content, 'utf-8');
+    await fs.writeFile(filePath, content, "utf-8");
   }
 }
diff --git a/packages/gemini-cli-core/src/services/gitService.test.ts b/packages/gemini-cli-core/src/services/gitService.test.ts
index 7923b7e64..bfe246849 100644
--- a/packages/gemini-cli-core/src/services/gitService.test.ts
+++ b/packages/gemini-cli-core/src/services/gitService.test.ts
@@ -4,24 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { GitService } from './gitService.js';
-import { Storage } from '../config/storage.js';
-import * as path from 'node:path';
-import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import { getProjectHash, GEMINI_DIR } from '../utils/paths.js';
-import { spawnAsync } from '../utils/shell-utils.js';
-
-vi.mock('../utils/shell-utils.js', () => ({
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { Storage } from "../config/storage.js";
+import { GEMINI_DIR, getProjectHash } from "../utils/paths.js";
+import { spawnAsync } from "../utils/shell-utils.js";
+import { GitService } from "./gitService.js";
+
+vi.mock("../utils/shell-utils.js", () => ({
   spawnAsync: vi.fn(),
 }));
 
@@ -33,7 +25,7 @@ const hoistedMockRaw = vi.hoisted(() => vi.fn());
 const hoistedMockAdd = vi.hoisted(() => vi.fn());
 const hoistedMockCommit = vi.hoisted(() => vi.fn());
 const hoistedMockStatus = vi.hoisted(() => vi.fn());
-vi.mock('simple-git', () => ({
+vi.mock("simple-git", () => ({
   simpleGit: hoistedMockSimpleGit.mockImplementation(() => ({
     checkIsRepo: hoistedMockCheckIsRepo,
     init: hoistedMockInit,
@@ -43,16 +35,16 @@ vi.mock('simple-git', () => ({
     status: hoistedMockStatus,
     env: hoistedMockEnv,
   })),
-  CheckRepoActions: { IS_REPO_ROOT: 'is-repo-root' },
+  CheckRepoActions: { IS_REPO_ROOT: "is-repo-root" },
 }));
 
 const hoistedIsGitRepositoryMock = vi.hoisted(() => vi.fn());
-vi.mock('../utils/gitUtils.js', () => ({
+vi.mock("../utils/gitUtils.js", () => ({
   isGitRepository: hoistedIsGitRepositoryMock,
 }));
 
 const hoistedMockHomedir = vi.hoisted(() => vi.fn());
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const actual = await importOriginal<typeof os>();
   return {
     ...actual,
@@ -60,7 +52,7 @@ vi.mock('os', async (importOriginal) => {
   };
 });
 
-describe('GitService', () => {
+describe("GitService", () => {
   let testRootDir: string;
   let projectRoot: string;
   let homedir: string;
@@ -68,9 +60,9 @@ describe('GitService', () => {
   let storage: Storage;
 
   beforeEach(async () => {
-    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'git-service-test-'));
-    projectRoot = path.join(testRootDir, 'project');
-    homedir = path.join(testRootDir, 'home');
+    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "git-service-test-"));
+    projectRoot = path.join(testRootDir, "project");
+    homedir = path.join(testRootDir, "home");
     await fs.mkdir(projectRoot, { recursive: true });
     await fs.mkdir(homedir, { recursive: true });
 
@@ -79,8 +71,8 @@ describe('GitService', () => {
     vi.clearAllMocks();
     hoistedIsGitRepositoryMock.mockReturnValue(true);
     (spawnAsync as Mock).mockResolvedValue({
-      stdout: 'git version 2.0.0',
-      stderr: '',
+      stdout: "git version 2.0.0",
+      stderr: "",
     });
 
     hoistedMockHomedir.mockReturnValue(homedir);
@@ -104,10 +96,10 @@ describe('GitService', () => {
     }));
     hoistedMockCheckIsRepo.mockResolvedValue(false);
     hoistedMockInit.mockResolvedValue(undefined);
-    hoistedMockRaw.mockResolvedValue('');
+    hoistedMockRaw.mockResolvedValue("");
     hoistedMockAdd.mockResolvedValue(undefined);
     hoistedMockCommit.mockResolvedValue({
-      commit: 'initial',
+      commit: "initial",
     });
     storage = new Storage(projectRoot);
   });
@@ -117,73 +109,71 @@ describe('GitService', () => {
     await fs.rm(testRootDir, { recursive: true, force: true });
   });
 
-  describe('constructor', () => {
-    it('should successfully create an instance', () => {
+  describe("constructor", () => {
+    it("should successfully create an instance", () => {
       expect(() => new GitService(projectRoot, storage)).not.toThrow();
     });
   });
 
-  describe('verifyGitAvailability', () => {
-    it('should resolve true if git --version command succeeds', async () => {
+  describe("verifyGitAvailability", () => {
+    it("should resolve true if git --version command succeeds", async () => {
       const service = new GitService(projectRoot, storage);
       await expect(service.verifyGitAvailability()).resolves.toBe(true);
-      expect(spawnAsync).toHaveBeenCalledWith('git', ['--version']);
+      expect(spawnAsync).toHaveBeenCalledWith("git", ["--version"]);
     });
 
-    it('should resolve false if git --version command fails', async () => {
-      (spawnAsync as Mock).mockRejectedValue(new Error('git not found'));
+    it("should resolve false if git --version command fails", async () => {
+      (spawnAsync as Mock).mockRejectedValue(new Error("git not found"));
       const service = new GitService(projectRoot, storage);
       await expect(service.verifyGitAvailability()).resolves.toBe(false);
     });
   });
 
-  describe('initialize', () => {
-    it('should throw an error if Git is not available', async () => {
-      (spawnAsync as Mock).mockRejectedValue(new Error('git not found'));
+  describe("initialize", () => {
+    it("should throw an error if Git is not available", async () => {
+      (spawnAsync as Mock).mockRejectedValue(new Error("git not found"));
       const service = new GitService(projectRoot, storage);
       await expect(service.initialize()).rejects.toThrow(
-        'Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.',
+        "Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.",
       );
     });
 
-    it('should call setupShadowGitRepository if Git is available', async () => {
+    it("should call setupShadowGitRepository if Git is available", async () => {
       const service = new GitService(projectRoot, storage);
-      const setupSpy = vi
-        .spyOn(service, 'setupShadowGitRepository')
-        .mockResolvedValue(undefined);
+      const setupSpy = vi.spyOn(service, "setupShadowGitRepository").mockResolvedValue(undefined);
 
       await service.initialize();
       expect(setupSpy).toHaveBeenCalled();
     });
   });
 
-  describe('setupShadowGitRepository', () => {
+  describe("setupShadowGitRepository", () => {
     let repoDir: string;
     let gitConfigPath: string;
 
     beforeEach(() => {
-      repoDir = path.join(homedir, GEMINI_DIR, 'history', hash);
-      gitConfigPath = path.join(repoDir, '.gitconfig');
+      repoDir = path.join(homedir, GEMINI_DIR, "history", hash);
+      gitConfigPath = path.join(repoDir, ".gitconfig");
     });
 
-    it('should create history and repository directories', async () => {
+    it("should create history and repository directories", async () => {
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
       const stats = await fs.stat(repoDir);
       expect(stats.isDirectory()).toBe(true);
     });
 
-    it('should create a .gitconfig file with the correct content', async () => {
+    it("should create a .gitconfig file with the correct content", async () => {
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
 
       const expectedConfigContent =
-        '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
-      const actualConfigContent = await fs.readFile(gitConfigPath, 'utf-8');
+        "[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n";
+      const actualConfigContent = await fs.readFile(gitConfigPath, "utf-8");
       expect(actualConfigContent).toBe(expectedConfigContent);
     });
 
-    it('should initialize git repo in historyDir if not already initialized', async () => {
+    it("should initialize git repo in historyDir if not already initialized", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(false);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
@@ -191,38 +181,38 @@ describe('GitService', () => {
       expect(hoistedMockInit).toHaveBeenCalled();
     });
 
-    it('should not initialize git repo if already initialized', async () => {
+    it("should not initialize git repo if already initialized", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(true);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
       expect(hoistedMockInit).not.toHaveBeenCalled();
     });
 
-    it('should copy .gitignore from projectRoot if it exists', async () => {
-      const gitignoreContent = 'node_modules/\n.env';
-      const visibleGitIgnorePath = path.join(projectRoot, '.gitignore');
+    it("should copy .gitignore from projectRoot if it exists", async () => {
+      const gitignoreContent = "node_modules/\n.env";
+      const visibleGitIgnorePath = path.join(projectRoot, ".gitignore");
       await fs.writeFile(visibleGitIgnorePath, gitignoreContent);
 
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
 
-      const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
-      const copiedContent = await fs.readFile(hiddenGitIgnorePath, 'utf-8');
+      const hiddenGitIgnorePath = path.join(repoDir, ".gitignore");
+      const copiedContent = await fs.readFile(hiddenGitIgnorePath, "utf-8");
       expect(copiedContent).toBe(gitignoreContent);
     });
 
-    it('should not create a .gitignore in shadow repo if project .gitignore does not exist', async () => {
+    it("should not create a .gitignore in shadow repo if project .gitignore does not exist", async () => {
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
 
-      const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
+      const hiddenGitIgnorePath = path.join(repoDir, ".gitignore");
       // An empty string is written if the file doesn't exist.
-      const content = await fs.readFile(hiddenGitIgnorePath, 'utf-8');
-      expect(content).toBe('');
+      const content = await fs.readFile(hiddenGitIgnorePath, "utf-8");
+      expect(content).toBe("");
     });
 
-    it('should throw an error if reading projectRoot .gitignore fails with other errors', async () => {
-      const visibleGitIgnorePath = path.join(projectRoot, '.gitignore');
+    it("should throw an error if reading projectRoot .gitignore fails with other errors", async () => {
+      const visibleGitIgnorePath = path.join(projectRoot, ".gitignore");
       // Create a directory instead of a file to cause a read error
       await fs.mkdir(visibleGitIgnorePath);
 
@@ -233,16 +223,16 @@ describe('GitService', () => {
       );
     });
 
-    it('should make an initial commit if no commits exist in history repo', async () => {
+    it("should make an initial commit if no commits exist in history repo", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(false);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
-      expect(hoistedMockCommit).toHaveBeenCalledWith('Initial commit', {
-        '--allow-empty': null,
+      expect(hoistedMockCommit).toHaveBeenCalledWith("Initial commit", {
+        "--allow-empty": null,
       });
     });
 
-    it('should not make an initial commit if commits already exist', async () => {
+    it("should not make an initial commit if commits already exist", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(true);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
@@ -250,40 +240,40 @@ describe('GitService', () => {
     });
   });
 
-  describe('createFileSnapshot', () => {
-    it('should commit with --no-verify flag', async () => {
+  describe("createFileSnapshot", () => {
+    it("should commit with --no-verify flag", async () => {
       hoistedMockStatus.mockResolvedValue({ isClean: () => false });
       const service = new GitService(projectRoot, storage);
       await service.initialize();
-      await service.createFileSnapshot('test commit');
-      expect(hoistedMockCommit).toHaveBeenCalledWith('test commit', {
-        '--no-verify': null,
+      await service.createFileSnapshot("test commit");
+      expect(hoistedMockCommit).toHaveBeenCalledWith("test commit", {
+        "--no-verify": null,
       });
     });
 
-    it('should create a new commit if there are staged changes', async () => {
+    it("should create a new commit if there are staged changes", async () => {
       hoistedMockStatus.mockResolvedValue({ isClean: () => false });
-      hoistedMockCommit.mockResolvedValue({ commit: 'new-commit-hash' });
+      hoistedMockCommit.mockResolvedValue({ commit: "new-commit-hash" });
       const service = new GitService(projectRoot, storage);
-      const commitHash = await service.createFileSnapshot('test message');
-      expect(hoistedMockAdd).toHaveBeenCalledWith('.');
+      const commitHash = await service.createFileSnapshot("test message");
+      expect(hoistedMockAdd).toHaveBeenCalledWith(".");
       expect(hoistedMockStatus).toHaveBeenCalled();
-      expect(hoistedMockCommit).toHaveBeenCalledWith('test message', {
-        '--no-verify': null,
+      expect(hoistedMockCommit).toHaveBeenCalledWith("test message", {
+        "--no-verify": null,
       });
-      expect(commitHash).toBe('new-commit-hash');
+      expect(commitHash).toBe("new-commit-hash");
     });
 
-    it('should return the current HEAD commit hash if there are no staged changes', async () => {
+    it("should return the current HEAD commit hash if there are no staged changes", async () => {
       hoistedMockStatus.mockResolvedValue({ isClean: () => true });
-      hoistedMockRaw.mockResolvedValue('current-head-hash');
+      hoistedMockRaw.mockResolvedValue("current-head-hash");
       const service = new GitService(projectRoot, storage);
-      const commitHash = await service.createFileSnapshot('test message');
-      expect(hoistedMockAdd).toHaveBeenCalledWith('.');
+      const commitHash = await service.createFileSnapshot("test message");
+      expect(hoistedMockAdd).toHaveBeenCalledWith(".");
       expect(hoistedMockStatus).toHaveBeenCalled();
       expect(hoistedMockCommit).not.toHaveBeenCalled();
-      expect(hoistedMockRaw).toHaveBeenCalledWith('rev-parse', 'HEAD');
-      expect(commitHash).toBe('current-head-hash');
+      expect(hoistedMockRaw).toHaveBeenCalledWith("rev-parse", "HEAD");
+      expect(commitHash).toBe("current-head-hash");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/services/gitService.ts b/packages/gemini-cli-core/src/services/gitService.ts
index cbda1ae1c..667b4c84a 100644
--- a/packages/gemini-cli-core/src/services/gitService.ts
+++ b/packages/gemini-cli-core/src/services/gitService.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isNodeError } from '../utils/errors.js';
-import { spawnAsync } from '../utils/shell-utils.js';
-import type { SimpleGit } from 'simple-git';
-import { simpleGit, CheckRepoActions } from 'simple-git';
-import type { Storage } from '../config/storage.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { SimpleGit } from "simple-git";
+import { CheckRepoActions, simpleGit } from "simple-git";
+import type { Storage } from "../config/storage.js";
+import { isNodeError } from "../utils/errors.js";
+import { spawnAsync } from "../utils/shell-utils.js";
 
 export class GitService {
   private projectRoot: string;
@@ -29,21 +29,21 @@ export class GitService {
     const gitAvailable = await this.verifyGitAvailability();
     if (!gitAvailable) {
       throw new Error(
-        'Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.',
+        "Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.",
       );
     }
     try {
       await this.setupShadowGitRepository();
     } catch (error) {
       throw new Error(
-        `Failed to initialize checkpointing: ${error instanceof Error ? error.message : 'Unknown error'}. Please check that Git is working properly or disable checkpointing.`,
+        `Failed to initialize checkpointing: ${error instanceof Error ? error.message : "Unknown error"}. Please check that Git is working properly or disable checkpointing.`,
       );
     }
   }
 
   async verifyGitAvailability(): Promise<boolean> {
     try {
-      await spawnAsync('git', ['--version']);
+      await spawnAsync("git", ["--version"]);
       return true;
     } catch (_error) {
       return false;
@@ -56,14 +56,14 @@ export class GitService {
    */
   async setupShadowGitRepository() {
     const repoDir = this.getHistoryDir();
-    const gitConfigPath = path.join(repoDir, '.gitconfig');
+    const gitConfigPath = path.join(repoDir, ".gitconfig");
 
     await fs.mkdir(repoDir, { recursive: true });
 
     // We don't want to inherit the user's name, email, or gpg signing
     // preferences for the shadow repository, so we create a dedicated gitconfig.
     const gitConfigContent =
-      '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
+      "[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n";
     await fs.writeFile(gitConfigPath, gitConfigContent);
 
     const repo = simpleGit(repoDir);
@@ -71,20 +71,20 @@ export class GitService {
 
     if (!isRepoDefined) {
       await repo.init(false, {
-        '--initial-branch': 'main',
+        "--initial-branch": "main",
       });
 
-      await repo.commit('Initial commit', { '--allow-empty': null });
+      await repo.commit("Initial commit", { "--allow-empty": null });
     }
 
-    const userGitIgnorePath = path.join(this.projectRoot, '.gitignore');
-    const shadowGitIgnorePath = path.join(repoDir, '.gitignore');
+    const userGitIgnorePath = path.join(this.projectRoot, ".gitignore");
+    const shadowGitIgnorePath = path.join(repoDir, ".gitignore");
 
-    let userGitIgnoreContent = '';
+    let userGitIgnoreContent = "";
     try {
-      userGitIgnoreContent = await fs.readFile(userGitIgnorePath, 'utf-8');
+      userGitIgnoreContent = await fs.readFile(userGitIgnorePath, "utf-8");
     } catch (error) {
-      if (isNodeError(error) && error.code !== 'ENOENT') {
+      if (isNodeError(error) && error.code !== "ENOENT") {
         throw error;
       }
     }
@@ -95,7 +95,7 @@ export class GitService {
   private get shadowGitRepository(): SimpleGit {
     const repoDir = this.getHistoryDir();
     return simpleGit(this.projectRoot).env({
-      GIT_DIR: path.join(repoDir, '.git'),
+      GIT_DIR: path.join(repoDir, ".git"),
       GIT_WORK_TREE: this.projectRoot,
       // Prevent git from using the user's global git config.
       HOME: repoDir,
@@ -104,34 +104,34 @@ export class GitService {
   }
 
   async getCurrentCommitHash(): Promise<string> {
-    const hash = await this.shadowGitRepository.raw('rev-parse', 'HEAD');
+    const hash = await this.shadowGitRepository.raw("rev-parse", "HEAD");
     return hash.trim();
   }
 
   async createFileSnapshot(message: string): Promise<string> {
     try {
       const repo = this.shadowGitRepository;
-      await repo.add('.');
+      await repo.add(".");
       const status = await repo.status();
       if (status.isClean()) {
         // If no changes are staged, return the current HEAD commit hash
         return await this.getCurrentCommitHash();
       }
       const commitResult = await repo.commit(message, {
-        '--no-verify': null,
+        "--no-verify": null,
       });
       return commitResult.commit;
     } catch (error) {
       throw new Error(
-        `Failed to create checkpoint snapshot: ${error instanceof Error ? error.message : 'Unknown error'}. Checkpointing may not be working properly.`,
+        `Failed to create checkpoint snapshot: ${error instanceof Error ? error.message : "Unknown error"}. Checkpointing may not be working properly.`,
       );
     }
   }
 
   async restoreProjectFromSnapshot(commitHash: string): Promise<void> {
     const repo = this.shadowGitRepository;
-    await repo.raw(['restore', '--source', commitHash, '.']);
+    await repo.raw(["restore", "--source", commitHash, "."]);
     // Removes any untracked files that were introduced post snapshot.
-    await repo.clean('f', ['-d']);
+    await repo.clean("f", ["-d"]);
   }
 }
diff --git a/packages/gemini-cli-core/src/services/loopDetectionService.test.ts b/packages/gemini-cli-core/src/services/loopDetectionService.test.ts
index 2f5419578..d4206cdd6 100644
--- a/packages/gemini-cli-core/src/services/loopDetectionService.test.ts
+++ b/packages/gemini-cli-core/src/services/loopDetectionService.test.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type { Content } from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { GeminiClient } from '../core/client.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
+import type { Content } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { GeminiClient } from "../core/client.js";
 import type {
   ServerGeminiContentEvent,
   ServerGeminiStreamEvent,
   ServerGeminiToolCallRequestEvent,
-} from '../core/turn.js';
-import { GeminiEventType } from '../core/turn.js';
-import * as loggers from '../telemetry/loggers.js';
-import { LoopType } from '../telemetry/types.js';
-import { LoopDetectionService } from './loopDetectionService.js';
+} from "../core/turn.js";
+import { GeminiEventType } from "../core/turn.js";
+import * as loggers from "../telemetry/loggers.js";
+import { LoopType } from "../telemetry/types.js";
+import { LoopDetectionService } from "./loopDetectionService.js";
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logLoopDetected: vi.fn(),
   logLoopDetectionDisabled: vi.fn(),
   logLlmLoopCheck: vi.fn(),
@@ -29,7 +29,7 @@ const TOOL_CALL_LOOP_THRESHOLD = 5;
 const CONTENT_LOOP_THRESHOLD = 10;
 const CONTENT_CHUNK_SIZE = 50;
 
-describe('LoopDetectionService', () => {
+describe("LoopDetectionService", () => {
   let service: LoopDetectionService;
   let mockConfig: Config;
 
@@ -50,9 +50,9 @@ describe('LoopDetectionService', () => {
     value: {
       name,
       args,
-      callId: 'test-id',
+      callId: "test-id",
       isClientInitiated: false,
-      prompt_id: 'test-prompt-id',
+      prompt_id: "test-prompt-id",
     },
   });
 
@@ -63,16 +63,16 @@ describe('LoopDetectionService', () => {
 
   const createRepetitiveContent = (id: number, length: number): string => {
     const baseString = `This is a unique sentence, id=${id}. `;
-    let content = '';
+    let content = "";
     while (content.length < length) {
       content += baseString;
     }
     return content.slice(0, length);
   };
 
-  describe('Tool Call Loop Detection', () => {
+  describe("Tool Call Loop Detection", () => {
     it(`should not detect a loop for fewer than TOOL_CALL_LOOP_THRESHOLD identical calls`, () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 1; i++) {
         expect(service.addAndCheck(event)).toBe(false);
       }
@@ -80,7 +80,7 @@ describe('LoopDetectionService', () => {
     });
 
     it(`should detect a loop on the TOOL_CALL_LOOP_THRESHOLD-th identical call`, () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 1; i++) {
         service.addAndCheck(event);
       }
@@ -88,8 +88,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect a loop on subsequent identical calls', () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+    it("should detect a loop on subsequent identical calls", () => {
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD; i++) {
         service.addAndCheck(event);
       }
@@ -97,15 +97,15 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop for different tool calls', () => {
-      const event1 = createToolCallRequestEvent('testTool', {
-        param: 'value1',
+    it("should not detect a loop for different tool calls", () => {
+      const event1 = createToolCallRequestEvent("testTool", {
+        param: "value1",
       });
-      const event2 = createToolCallRequestEvent('testTool', {
-        param: 'value2',
+      const event2 = createToolCallRequestEvent("testTool", {
+        param: "value2",
       });
-      const event3 = createToolCallRequestEvent('anotherTool', {
-        param: 'value1',
+      const event3 = createToolCallRequestEvent("anotherTool", {
+        param: "value1",
       });
 
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 2; i++) {
@@ -115,12 +115,12 @@ describe('LoopDetectionService', () => {
       }
     });
 
-    it('should not reset tool call counter for other event types', () => {
-      const toolCallEvent = createToolCallRequestEvent('testTool', {
-        param: 'value',
+    it("should not reset tool call counter for other event types", () => {
+      const toolCallEvent = createToolCallRequestEvent("testTool", {
+        param: "value",
       });
       const otherEvent = {
-        type: 'thought',
+        type: "thought",
       } as unknown as ServerGeminiStreamEvent;
 
       // Send events just below the threshold
@@ -136,18 +136,18 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop when disabled for session', () => {
+    it("should not detect a loop when disabled for session", () => {
       service.disableForSession();
       expect(loggers.logLoopDetectionDisabled).toHaveBeenCalledTimes(1);
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD; i++) {
         expect(service.addAndCheck(event)).toBe(false);
       }
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should stop reporting a loop if disabled after detection', () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+    it("should stop reporting a loop if disabled after detection", () => {
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD; i++) {
         service.addAndCheck(event);
       }
@@ -160,22 +160,19 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Content Loop Detection', () => {
+  describe("Content Loop Detection", () => {
     const generateRandomString = (length: number) => {
-      let result = '';
-      const characters =
-        'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+      let result = "";
+      const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
       const charactersLength = characters.length;
       for (let i = 0; i < length; i++) {
-        result += characters.charAt(
-          Math.floor(Math.random() * charactersLength),
-        );
+        result += characters.charAt(Math.floor(Math.random() * charactersLength));
       }
       return result;
     };
 
-    it('should not detect a loop for random content', () => {
-      service.reset('');
+    it("should not detect a loop for random content", () => {
+      service.reset("");
       for (let i = 0; i < 1000; i++) {
         const content = generateRandomString(10);
         const isLoop = service.addAndCheck(createContentEvent(content));
@@ -184,8 +181,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should detect a loop when a chunk of content repeats consecutively', () => {
-      service.reset('');
+    it("should detect a loop when a chunk of content repeats consecutively", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       let isLoop = false;
@@ -196,8 +193,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop if repetitions are very far apart', () => {
-      service.reset('');
+    it("should not detect a loop if repetitions are very far apart", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
       const fillerContent = generateRandomString(500);
 
@@ -210,8 +207,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should detect a loop with longer repeating patterns (e.g. ~150 chars)', () => {
-      service.reset('');
+    it("should detect a loop with longer repeating patterns (e.g. ~150 chars)", () => {
+      service.reset("");
       const longPattern = createRepetitiveContent(1, 150);
       expect(longPattern.length).toBe(150);
 
@@ -224,8 +221,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect the specific user-provided loop example', () => {
-      service.reset('');
+    it("should detect the specific user-provided loop example", () => {
+      service.reset("");
       const userPattern = `I will not output any text.
   I will just end the turn.
   I am done.
@@ -243,10 +240,10 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect the second specific user-provided loop example', () => {
-      service.reset('');
+    it("should detect the second specific user-provided loop example", () => {
+      service.reset("");
       const userPattern =
-        'I have added all the requested logs and verified the test file. I will now mark the task as complete.\n  ';
+        "I have added all the requested logs and verified the test file. I will now mark the task as complete.\n  ";
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
@@ -257,9 +254,9 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect a loop of alternating short phrases', () => {
-      service.reset('');
-      const alternatingPattern = 'Thinking... Done. ';
+    it("should detect a loop of alternating short phrases", () => {
+      service.reset("");
+      const alternatingPattern = "Thinking... Done. ";
 
       let isLoop = false;
       // Needs more iterations because the pattern is short relative to chunk size,
@@ -272,10 +269,10 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect a loop of repeated complex thought processes', () => {
-      service.reset('');
+    it("should detect a loop of repeated complex thought processes", () => {
+      service.reset("");
       const thoughtPattern =
-        'I need to check the file. The file does not exist. I will create the file. ';
+        "I need to check the file. The file does not exist. I will create the file. ";
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
@@ -287,25 +284,25 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Content Loop Detection with Code Blocks', () => {
-    it('should not detect a loop when repetitive content is inside a code block', () => {
-      service.reset('');
+  describe("Content Loop Detection with Code Blocks", () => {
+    it("should not detect a loop when repetitive content is inside a code block", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      service.addAndCheck(createContentEvent('```\n'));
+      service.addAndCheck(createContentEvent("```\n"));
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
         const isLoop = service.addAndCheck(createContentEvent(repeatedContent));
         expect(isLoop).toBe(false);
       }
 
-      const isLoop = service.addAndCheck(createContentEvent('\n```'));
+      const isLoop = service.addAndCheck(createContentEvent("\n```"));
       expect(isLoop).toBe(false);
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should not detect loops when content transitions into a code block', () => {
-      service.reset('');
+    it("should not detect loops when content transitions into a code block", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       // Add some repetitive content outside of code block
@@ -315,26 +312,24 @@ describe('LoopDetectionService', () => {
 
       // Now transition into a code block - this should prevent loop detection
       // even though we were already close to the threshold
-      const codeBlockStart = '```javascript\n';
+      const codeBlockStart = "```javascript\n";
       const isLoop = service.addAndCheck(createContentEvent(codeBlockStart));
       expect(isLoop).toBe(false);
 
       // Continue adding repetitive content inside the code block - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
-        const isLoopInside = service.addAndCheck(
-          createContentEvent(repeatedContent),
-        );
+        const isLoopInside = service.addAndCheck(createContentEvent(repeatedContent));
         expect(isLoopInside).toBe(false);
       }
 
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should skip loop detection when already inside a code block (this.inCodeBlock)', () => {
-      service.reset('');
+    it("should skip loop detection when already inside a code block (this.inCodeBlock)", () => {
+      service.reset("");
 
       // Start with content that puts us inside a code block
-      service.addAndCheck(createContentEvent('Here is some code:\n```\n'));
+      service.addAndCheck(createContentEvent("Here is some code:\n```\n"));
 
       // Verify we are now inside a code block and any content should be ignored for loop detection
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
@@ -346,45 +341,41 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should correctly track inCodeBlock state with multiple fence transitions', () => {
-      service.reset('');
+    it("should correctly track inCodeBlock state with multiple fence transitions", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       // Outside code block - should track content
-      service.addAndCheck(createContentEvent('Normal text '));
+      service.addAndCheck(createContentEvent("Normal text "));
 
       // Enter code block (1 fence) - should stop tracking
-      const enterResult = service.addAndCheck(createContentEvent('```\n'));
+      const enterResult = service.addAndCheck(createContentEvent("```\n"));
       expect(enterResult).toBe(false);
 
       // Inside code block - should not track loops
       for (let i = 0; i < 5; i++) {
-        const insideResult = service.addAndCheck(
-          createContentEvent(repeatedContent),
-        );
+        const insideResult = service.addAndCheck(createContentEvent(repeatedContent));
         expect(insideResult).toBe(false);
       }
 
       // Exit code block (2nd fence) - should reset tracking but still return false
-      const exitResult = service.addAndCheck(createContentEvent('```\n'));
+      const exitResult = service.addAndCheck(createContentEvent("```\n"));
       expect(exitResult).toBe(false);
 
       // Enter code block again (3rd fence) - should stop tracking again
-      const reenterResult = service.addAndCheck(
-        createContentEvent('```python\n'),
-      );
+      const reenterResult = service.addAndCheck(createContentEvent("```python\n"));
       expect(reenterResult).toBe(false);
 
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should detect a loop when repetitive content is outside a code block', () => {
-      service.reset('');
+    it("should detect a loop when repetitive content is outside a code block", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      service.addAndCheck(createContentEvent('```'));
-      service.addAndCheck(createContentEvent('\nsome code\n'));
-      service.addAndCheck(createContentEvent('```'));
+      service.addAndCheck(createContentEvent("```"));
+      service.addAndCheck(createContentEvent("\nsome code\n"));
+      service.addAndCheck(createContentEvent("```"));
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
@@ -394,23 +385,23 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle content with multiple code blocks and no loops', () => {
-      service.reset('');
-      service.addAndCheck(createContentEvent('```\ncode1\n```'));
-      service.addAndCheck(createContentEvent('\nsome text\n'));
-      const isLoop = service.addAndCheck(createContentEvent('```\ncode2\n```'));
+    it("should handle content with multiple code blocks and no loops", () => {
+      service.reset("");
+      service.addAndCheck(createContentEvent("```\ncode1\n```"));
+      service.addAndCheck(createContentEvent("\nsome text\n"));
+      const isLoop = service.addAndCheck(createContentEvent("```\ncode2\n```"));
 
       expect(isLoop).toBe(false);
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should handle content with mixed code blocks and looping text', () => {
-      service.reset('');
+    it("should handle content with mixed code blocks and looping text", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      service.addAndCheck(createContentEvent('```'));
-      service.addAndCheck(createContentEvent('\ncode1\n'));
-      service.addAndCheck(createContentEvent('```'));
+      service.addAndCheck(createContentEvent("```"));
+      service.addAndCheck(createContentEvent("\ncode1\n"));
+      service.addAndCheck(createContentEvent("```"));
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
@@ -421,25 +412,24 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop for a long code block with some repeating tokens', () => {
-      service.reset('');
-      const repeatingTokens =
-        'for (let i = 0; i < 10; i++) { console.log(i); }';
+    it("should not detect a loop for a long code block with some repeating tokens", () => {
+      service.reset("");
+      const repeatingTokens = "for (let i = 0; i < 10; i++) { console.log(i); }";
 
-      service.addAndCheck(createContentEvent('```\n'));
+      service.addAndCheck(createContentEvent("```\n"));
 
       for (let i = 0; i < 20; i++) {
         const isLoop = service.addAndCheck(createContentEvent(repeatingTokens));
         expect(isLoop).toBe(false);
       }
 
-      const isLoop = service.addAndCheck(createContentEvent('\n```'));
+      const isLoop = service.addAndCheck(createContentEvent("\n```"));
       expect(isLoop).toBe(false);
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a code fence is found', () => {
-      service.reset('');
+    it("should reset tracking when a code fence is found", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -447,7 +437,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should not trigger a loop because of the reset
-      service.addAndCheck(createContentEvent('```'));
+      service.addAndCheck(createContentEvent("```"));
 
       // We are now in a code block, so loop detection should be off.
       // Let's add the repeated content again, it should not trigger a loop.
@@ -459,8 +449,8 @@ describe('LoopDetectionService', () => {
 
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
-    it('should reset tracking when a table is detected', () => {
-      service.reset('');
+    it("should reset tracking when a table is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -468,7 +458,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('| Column 1 | Column 2 |'));
+      service.addAndCheck(createContentEvent("| Column 1 | Column 2 |"));
 
       // Add more repeated content after table - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -479,8 +469,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a list item is detected', () => {
-      service.reset('');
+    it("should reset tracking when a list item is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -488,7 +478,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('* List item'));
+      service.addAndCheck(createContentEvent("* List item"));
 
       // Add more repeated content after list - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -499,8 +489,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a heading is detected', () => {
-      service.reset('');
+    it("should reset tracking when a heading is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -508,7 +498,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('## Heading'));
+      service.addAndCheck(createContentEvent("## Heading"));
 
       // Add more repeated content after heading - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -519,8 +509,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a blockquote is detected', () => {
-      service.reset('');
+    it("should reset tracking when a blockquote is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -528,7 +518,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('> Quote text'));
+      service.addAndCheck(createContentEvent("> Quote text"));
 
       // Add more repeated content after blockquote - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -539,20 +529,20 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking for various list item formats', () => {
+    it("should reset tracking for various list item formats", () => {
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       // Test different list formats - make sure they start at beginning of line
       const listFormats = [
-        '* Bullet item',
-        '- Dash item',
-        '+ Plus item',
-        '1. Numbered item',
-        '42. Another numbered item',
+        "* Bullet item",
+        "- Dash item",
+        "+ Plus item",
+        "1. Numbered item",
+        "42. Another numbered item",
       ];
 
       listFormats.forEach((listFormat, index) => {
-        service.reset('');
+        service.reset("");
 
         // Build up to near threshold
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -560,17 +550,12 @@ describe('LoopDetectionService', () => {
         }
 
         // Reset should occur with list item - add newline to ensure it starts at beginning
-        service.addAndCheck(createContentEvent('\n' + listFormat));
+        service.addAndCheck(createContentEvent("\n" + listFormat));
 
         // Should not trigger loop after reset - use different content to avoid any cached state issues
-        const newRepeatedContent = createRepetitiveContent(
-          index + 100,
-          CONTENT_CHUNK_SIZE,
-        );
+        const newRepeatedContent = createRepetitiveContent(index + 100, CONTENT_CHUNK_SIZE);
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
-          const isLoop = service.addAndCheck(
-            createContentEvent(newRepeatedContent),
-          );
+          const isLoop = service.addAndCheck(createContentEvent(newRepeatedContent));
           expect(isLoop).toBe(false);
         }
       });
@@ -578,18 +563,13 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking for various table formats', () => {
+    it("should reset tracking for various table formats", () => {
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      const tableFormats = [
-        '| Column 1 | Column 2 |',
-        '|---|---|',
-        '|++|++|',
-        '+---+---+',
-      ];
+      const tableFormats = ["| Column 1 | Column 2 |", "|---|---|", "|++|++|", "+---+---+"];
 
       tableFormats.forEach((tableFormat, index) => {
-        service.reset('');
+        service.reset("");
 
         // Build up to near threshold
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -597,17 +577,12 @@ describe('LoopDetectionService', () => {
         }
 
         // Reset should occur with table format - add newline to ensure it starts at beginning
-        service.addAndCheck(createContentEvent('\n' + tableFormat));
+        service.addAndCheck(createContentEvent("\n" + tableFormat));
 
         // Should not trigger loop after reset - use different content to avoid any cached state issues
-        const newRepeatedContent = createRepetitiveContent(
-          index + 200,
-          CONTENT_CHUNK_SIZE,
-        );
+        const newRepeatedContent = createRepetitiveContent(index + 200, CONTENT_CHUNK_SIZE);
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
-          const isLoop = service.addAndCheck(
-            createContentEvent(newRepeatedContent),
-          );
+          const isLoop = service.addAndCheck(createContentEvent(newRepeatedContent));
           expect(isLoop).toBe(false);
         }
       });
@@ -615,20 +590,20 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking for various heading levels', () => {
+    it("should reset tracking for various heading levels", () => {
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       const headingFormats = [
-        '# H1 Heading',
-        '## H2 Heading',
-        '### H3 Heading',
-        '#### H4 Heading',
-        '##### H5 Heading',
-        '###### H6 Heading',
+        "# H1 Heading",
+        "## H2 Heading",
+        "### H3 Heading",
+        "#### H4 Heading",
+        "##### H5 Heading",
+        "###### H6 Heading",
       ];
 
       headingFormats.forEach((headingFormat, index) => {
-        service.reset('');
+        service.reset("");
 
         // Build up to near threshold
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -636,17 +611,12 @@ describe('LoopDetectionService', () => {
         }
 
         // Reset should occur with heading - add newline to ensure it starts at beginning
-        service.addAndCheck(createContentEvent('\n' + headingFormat));
+        service.addAndCheck(createContentEvent("\n" + headingFormat));
 
         // Should not trigger loop after reset - use different content to avoid any cached state issues
-        const newRepeatedContent = createRepetitiveContent(
-          index + 300,
-          CONTENT_CHUNK_SIZE,
-        );
+        const newRepeatedContent = createRepetitiveContent(index + 300, CONTENT_CHUNK_SIZE);
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
-          const isLoop = service.addAndCheck(
-            createContentEvent(newRepeatedContent),
-          );
+          const isLoop = service.addAndCheck(createContentEvent(newRepeatedContent));
           expect(isLoop).toBe(false);
         }
       });
@@ -655,17 +625,17 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Edge Cases', () => {
-    it('should handle empty content', () => {
-      const event = createContentEvent('');
+  describe("Edge Cases", () => {
+    it("should handle empty content", () => {
+      const event = createContentEvent("");
       expect(service.addAndCheck(event)).toBe(false);
     });
   });
 
-  describe('Divider Content Detection', () => {
-    it('should not detect a loop for repeating divider-like content', () => {
-      service.reset('');
-      const dividerContent = '-'.repeat(CONTENT_CHUNK_SIZE);
+  describe("Divider Content Detection", () => {
+    it("should not detect a loop for repeating divider-like content", () => {
+      service.reset("");
+      const dividerContent = "-".repeat(CONTENT_CHUNK_SIZE);
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
         isLoop = service.addAndCheck(createContentEvent(dividerContent));
@@ -674,9 +644,9 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should not detect a loop for repeating complex box-drawing dividers', () => {
-      service.reset('');
-      const dividerContent = '╭─'.repeat(CONTENT_CHUNK_SIZE / 2);
+    it("should not detect a loop for repeating complex box-drawing dividers", () => {
+      service.reset("");
+      const dividerContent = "╭─".repeat(CONTENT_CHUNK_SIZE / 2);
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
         isLoop = service.addAndCheck(createContentEvent(dividerContent));
@@ -686,11 +656,11 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Reset Functionality', () => {
-    it('tool call should reset content count', () => {
-      const contentEvent = createContentEvent('Some content.');
-      const toolEvent = createToolCallRequestEvent('testTool', {
-        param: 'value',
+  describe("Reset Functionality", () => {
+    it("tool call should reset content count", () => {
+      const contentEvent = createContentEvent("Some content.");
+      const toolEvent = createToolCallRequestEvent("testTool", {
+        param: "value",
       });
       for (let i = 0; i < 9; i++) {
         service.addAndCheck(contentEvent);
@@ -699,16 +669,14 @@ describe('LoopDetectionService', () => {
       service.addAndCheck(toolEvent);
 
       // Should start fresh
-      expect(service.addAndCheck(createContentEvent('Fresh content.'))).toBe(
-        false,
-      );
+      expect(service.addAndCheck(createContentEvent("Fresh content."))).toBe(false);
     });
   });
 
-  describe('General Behavior', () => {
-    it('should return false for unhandled event types', () => {
+  describe("General Behavior", () => {
+    it("should return false for unhandled event types", () => {
       const otherEvent = {
-        type: 'unhandled_event',
+        type: "unhandled_event",
       } as unknown as ServerGeminiStreamEvent;
       expect(service.addAndCheck(otherEvent)).toBe(false);
       expect(service.addAndCheck(otherEvent)).toBe(false);
@@ -716,7 +684,7 @@ describe('LoopDetectionService', () => {
   });
 });
 
-describe('LoopDetectionService LLM Checks', () => {
+describe("LoopDetectionService LLM Checks", () => {
   let service: LoopDetectionService;
   let mockConfig: Config;
   let mockGeminiClient: GeminiClient;
@@ -737,15 +705,15 @@ describe('LoopDetectionService LLM Checks', () => {
       getBaseLlmClient: () => mockBaseLlmClient,
       getDebugMode: () => false,
       getTelemetryEnabled: () => true,
-      getModel: vi.fn().mockReturnValue('cognitive-loop-v1'),
+      getModel: vi.fn().mockReturnValue("cognitive-loop-v1"),
       isInFallbackMode: vi.fn().mockReturnValue(false),
       modelConfigService: {
         getResolvedConfig: vi.fn().mockImplementation((key) => {
-          if (key.model === 'loop-detection') {
-            return { model: 'gemini-2.5-flash', generateContentConfig: {} };
+          if (key.model === "loop-detection") {
+            return { model: "gemini-2.5-flash", generateContentConfig: {} };
           }
           return {
-            model: 'cognitive-loop-v1',
+            model: "cognitive-loop-v1",
             generateContentConfig: {},
           };
         }),
@@ -768,12 +736,12 @@ describe('LoopDetectionService LLM Checks', () => {
     }
   };
 
-  it('should not trigger LLM check before LLM_CHECK_AFTER_TURNS', async () => {
+  it("should not trigger LLM check before LLM_CHECK_AFTER_TURNS", async () => {
     await advanceTurns(29);
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
-  it('should trigger LLM check on the 30th turn', async () => {
+  it("should trigger LLM check on the 30th turn", async () => {
     mockBaseLlmClient.generateJson = vi
       .fn()
       .mockResolvedValue({ unproductive_state_confidence: 0.1 });
@@ -781,7 +749,7 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
         systemInstruction: expect.any(String),
         contents: expect.any(Array),
         schema: expect.any(Object),
@@ -790,17 +758,17 @@ describe('LoopDetectionService LLM Checks', () => {
     );
   });
 
-  it('should detect a cognitive loop when confidence is high', async () => {
+  it("should detect a cognitive loop when confidence is high", async () => {
     // First check at turn 30
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValue({
       unproductive_state_confidence: 0.85,
-      unproductive_state_analysis: 'Repetitive actions',
+      unproductive_state_analysis: "Repetitive actions",
     });
     await advanceTurns(30);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
 
@@ -810,7 +778,7 @@ describe('LoopDetectionService LLM Checks', () => {
 
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValue({
       unproductive_state_confidence: 0.95,
-      unproductive_state_analysis: 'Repetitive actions',
+      unproductive_state_analysis: "Repetitive actions",
     });
     const finalResult = await service.turnStarted(abortController.signal); // This is turn 37
 
@@ -818,17 +786,17 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).toHaveBeenCalledWith(
       mockConfig,
       expect.objectContaining({
-        'event.name': 'loop_detected',
+        "event.name": "loop_detected",
         loop_type: LoopType.LLM_DETECTED_LOOP,
-        confirmed_by_model: 'cognitive-loop-v1',
+        confirmed_by_model: "cognitive-loop-v1",
       }),
     );
   });
 
-  it('should not detect a loop when confidence is low', async () => {
+  it("should not detect a loop when confidence is low", async () => {
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValue({
       unproductive_state_confidence: 0.5,
-      unproductive_state_analysis: 'Looks okay',
+      unproductive_state_analysis: "Looks okay",
     });
     await advanceTurns(30);
     const result = await service.turnStarted(abortController.signal);
@@ -836,7 +804,7 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).not.toHaveBeenCalled();
   });
 
-  it('should adjust the check interval based on confidence', async () => {
+  it("should adjust the check interval based on confidence", async () => {
     // Confidence is 0.0, so interval should be MAX_LLM_CHECK_INTERVAL (15)
     mockBaseLlmClient.generateJson = vi
       .fn()
@@ -851,17 +819,15 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(2);
   });
 
-  it('should handle errors from generateJson gracefully', async () => {
-    mockBaseLlmClient.generateJson = vi
-      .fn()
-      .mockRejectedValue(new Error('API error'));
+  it("should handle errors from generateJson gracefully", async () => {
+    mockBaseLlmClient.generateJson = vi.fn().mockRejectedValue(new Error("API error"));
     await advanceTurns(30);
     const result = await service.turnStarted(abortController.signal);
     expect(result).toBe(false);
     expect(loggers.logLoopDetected).not.toHaveBeenCalled();
   });
 
-  it('should not trigger LLM check when disabled for session', async () => {
+  it("should not trigger LLM check when disabled for session", async () => {
     service.disableForSession();
     expect(loggers.logLoopDetectionDisabled).toHaveBeenCalledTimes(1);
     await advanceTurns(30);
@@ -870,15 +836,15 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
-  it('should prepend user message if history starts with a function call', async () => {
+  it("should prepend user message if history starts with a function call", async () => {
     const functionCallHistory: Content[] = [
       {
-        role: 'model',
-        parts: [{ functionCall: { name: 'someTool', args: {} } }],
+        role: "model",
+        parts: [{ functionCall: { name: "someTool", args: {} } }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Some follow up text' }],
+        role: "model",
+        parts: [{ text: "Some follow up text" }],
       },
     ];
     vi.mocked(mockGeminiClient.getHistory).mockReturnValue(functionCallHistory);
@@ -890,17 +856,16 @@ describe('LoopDetectionService LLM Checks', () => {
     await advanceTurns(30);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
-    const calledArg = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const calledArg = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
     expect(calledArg.contents[0]).toEqual({
-      role: 'user',
-      parts: [{ text: 'Recent conversation history:' }],
+      role: "user",
+      parts: [{ text: "Recent conversation history:" }],
     });
     // Verify the original history follows
     expect(calledArg.contents[1]).toEqual(functionCallHistory[0]);
   });
 
-  it('should detect a loop when confidence is exactly equal to the threshold (0.9)', async () => {
+  it("should detect a loop when confidence is exactly equal to the threshold (0.9)", async () => {
     // Mock isInFallbackMode to false so it double checks
     vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(false);
 
@@ -908,11 +873,11 @@ describe('LoopDetectionService LLM Checks', () => {
       .fn()
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.9,
-        unproductive_state_analysis: 'Flash says loop',
+        unproductive_state_analysis: "Flash says loop",
       })
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.9,
-        unproductive_state_analysis: 'Main says loop',
+        unproductive_state_analysis: "Main says loop",
       });
 
     await advanceTurns(30);
@@ -922,13 +887,13 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection-double-check' },
+        modelConfigKey: { model: "loop-detection-double-check" },
       }),
     );
 
@@ -936,14 +901,14 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).toHaveBeenCalledWith(
       mockConfig,
       expect.objectContaining({
-        'event.name': 'loop_detected',
+        "event.name": "loop_detected",
         loop_type: LoopType.LLM_DETECTED_LOOP,
-        confirmed_by_model: 'cognitive-loop-v1',
+        confirmed_by_model: "cognitive-loop-v1",
       }),
     );
   });
 
-  it('should not detect a loop when Flash is confident (0.9) but Main model is not (0.89)', async () => {
+  it("should not detect a loop when Flash is confident (0.9) but Main model is not (0.89)", async () => {
     // Mock isInFallbackMode to false so it double checks
     vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(false);
 
@@ -951,11 +916,11 @@ describe('LoopDetectionService LLM Checks', () => {
       .fn()
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.9,
-        unproductive_state_analysis: 'Flash says loop',
+        unproductive_state_analysis: "Flash says loop",
       })
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.89,
-        unproductive_state_analysis: 'Main says no loop',
+        unproductive_state_analysis: "Main says no loop",
       });
 
     await advanceTurns(30);
@@ -964,13 +929,13 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection-double-check' },
+        modelConfigKey: { model: "loop-detection-double-check" },
       }),
     );
 
@@ -988,13 +953,13 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(3);
   });
 
-  it('should only call Flash model if in fallback mode', async () => {
+  it("should only call Flash model if in fallback mode", async () => {
     // Mock isInFallbackMode to true
     vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
 
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValueOnce({
       unproductive_state_confidence: 0.9,
-      unproductive_state_analysis: 'Flash says loop',
+      unproductive_state_analysis: "Flash says loop",
     });
 
     await advanceTurns(30);
@@ -1003,7 +968,7 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
 
@@ -1011,9 +976,9 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).toHaveBeenCalledWith(
       mockConfig,
       expect.objectContaining({
-        'event.name': 'loop_detected',
+        "event.name": "loop_detected",
         loop_type: LoopType.LLM_DETECTED_LOOP,
-        confirmed_by_model: 'gemini-2.5-flash',
+        confirmed_by_model: "gemini-2.5-flash",
       }),
     );
   });
diff --git a/packages/gemini-cli-core/src/services/loopDetectionService.ts b/packages/gemini-cli-core/src/services/loopDetectionService.ts
index da4974f64..e3f7bfec3 100644
--- a/packages/gemini-cli-core/src/services/loopDetectionService.ts
+++ b/packages/gemini-cli-core/src/services/loopDetectionService.ts
@@ -4,27 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import { createHash } from 'node:crypto';
-import type { ServerGeminiStreamEvent } from '../core/turn.js';
-import { GeminiEventType } from '../core/turn.js';
+import { createHash } from "node:crypto";
+import type { Content } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { ServerGeminiStreamEvent } from "../core/turn.js";
+import { GeminiEventType } from "../core/turn.js";
 import {
+  logLlmLoopCheck,
   logLoopDetected,
   logLoopDetectionDisabled,
-  logLlmLoopCheck,
-} from '../telemetry/loggers.js';
+} from "../telemetry/loggers.js";
 import {
+  LlmLoopCheckEvent,
   LoopDetectedEvent,
   LoopDetectionDisabledEvent,
   LoopType,
-  LlmLoopCheckEvent,
-} from '../telemetry/types.js';
-import type { Config } from '../config/config.js';
-import {
-  isFunctionCall,
-  isFunctionResponse,
-} from '../utils/messageInspectors.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "../telemetry/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isFunctionCall, isFunctionResponse } from "../utils/messageInspectors.js";
 
 const TOOL_CALL_LOOP_THRESHOLD = 5;
 const CONTENT_LOOP_THRESHOLD = 10;
@@ -63,7 +60,7 @@ const MAX_LLM_CHECK_INTERVAL = 15;
  * The confidence threshold above which the LLM is considered to have detected a loop.
  */
 const LLM_CONFIDENCE_THRESHOLD = 0.9;
-const DOUBLE_CHECK_MODEL_ALIAS = 'loop-detection-double-check';
+const DOUBLE_CHECK_MODEL_ALIAS = "loop-detection-double-check";
 
 const LOOP_DETECTION_SYSTEM_PROMPT = `You are a sophisticated AI diagnostic agent specializing in identifying when a conversational AI is stuck in an unproductive state. Your task is to analyze the provided conversation history and determine if the assistant has ceased to make meaningful progress.
 
@@ -77,20 +74,19 @@ Crucially, differentiate between a true unproductive state and legitimate, incre
 For example, a series of 'tool_A' or 'tool_B' tool calls that make small, distinct changes to the same file (like adding docstrings to functions one by one) is considered forward progress and is NOT a loop. A loop would be repeatedly replacing the same text with the same content, or cycling between a small set of files with no net change.`;
 
 const LOOP_DETECTION_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     unproductive_state_analysis: {
-      type: 'string',
-      description:
-        'Your reasoning on if the conversation is looping without forward progress.',
+      type: "string",
+      description: "Your reasoning on if the conversation is looping without forward progress.",
     },
     unproductive_state_confidence: {
-      type: 'number',
+      type: "number",
       description:
-        'A number between 0.0 and 1.0 representing your confidence that the conversation is in an unproductive state.',
+        "A number between 0.0 and 1.0 representing your confidence that the conversation is in an unproductive state.",
     },
   },
-  required: ['unproductive_state_analysis', 'unproductive_state_confidence'],
+  required: ["unproductive_state_analysis", "unproductive_state_confidence"],
 };
 
 /**
@@ -99,14 +95,14 @@ const LOOP_DETECTION_SCHEMA: Record<string, unknown> = {
  */
 export class LoopDetectionService {
   private readonly config: Config;
-  private promptId = '';
+  private promptId = "";
 
   // Tool call tracking
   private lastToolCallKey: string | null = null;
   private toolCallRepetitionCount: number = 0;
 
   // Content streaming tracking
-  private streamContentHistory = '';
+  private streamContentHistory = "";
   private contentStats = new Map<string, number[]>();
   private lastContentIndex = 0;
   private loopDetected = false;
@@ -129,16 +125,13 @@ export class LoopDetectionService {
    */
   disableForSession(): void {
     this.disabledForSession = true;
-    logLoopDetectionDisabled(
-      this.config,
-      new LoopDetectionDisabledEvent(this.promptId),
-    );
+    logLoopDetectionDisabled(this.config, new LoopDetectionDisabledEvent(this.promptId));
   }
 
   private getToolCallKey(toolCall: { name: string; args: object }): string {
     const argsString = JSON.stringify(toolCall.args);
     const keyString = `${toolCall.name}:${argsString}`;
-    return createHash('sha256').update(keyString).digest('hex');
+    return createHash("sha256").update(keyString).digest("hex");
   }
 
   /**
@@ -209,10 +202,7 @@ export class LoopDetectionService {
     if (this.toolCallRepetitionCount >= TOOL_CALL_LOOP_THRESHOLD) {
       logLoopDetected(
         this.config,
-        new LoopDetectedEvent(
-          LoopType.CONSECUTIVE_IDENTICAL_TOOL_CALLS,
-          this.promptId,
-        ),
+        new LoopDetectedEvent(LoopType.CONSECUTIVE_IDENTICAL_TOOL_CALLS, this.promptId),
       );
       return true;
     }
@@ -236,28 +226,19 @@ export class LoopDetectionService {
     // reset tracking to avoid analyzing content that spans across different element boundaries.
     const numFences = (content.match(/```/g) ?? []).length;
     const hasTable = /(^|\n)\s*(\|.*\||[|+-]{3,})/.test(content);
-    const hasListItem =
-      /(^|\n)\s*[*-+]\s/.test(content) || /(^|\n)\s*\d+\.\s/.test(content);
+    const hasListItem = /(^|\n)\s*[*-+]\s/.test(content) || /(^|\n)\s*\d+\.\s/.test(content);
     const hasHeading = /(^|\n)#+\s/.test(content);
     const hasBlockquote = /(^|\n)>\s/.test(content);
     const isDivider = /^[+-_=*\u2500-\u257F]+$/.test(content);
 
-    if (
-      numFences ||
-      hasTable ||
-      hasListItem ||
-      hasHeading ||
-      hasBlockquote ||
-      isDivider
-    ) {
+    if (numFences || hasTable || hasListItem || hasHeading || hasBlockquote || isDivider) {
       // Reset tracking when different content elements are detected to avoid analyzing content
       // that spans across different element boundaries.
       this.resetContentTracking();
     }
 
     const wasInCodeBlock = this.inCodeBlock;
-    this.inCodeBlock =
-      numFences % 2 === 0 ? this.inCodeBlock : !this.inCodeBlock;
+    this.inCodeBlock = numFences % 2 === 0 ? this.inCodeBlock : !this.inCodeBlock;
     if (wasInCodeBlock || this.inCodeBlock || isDivider) {
       return false;
     }
@@ -278,14 +259,9 @@ export class LoopDetectionService {
     }
 
     // Calculate how much content to remove from the beginning
-    const truncationAmount =
-      this.streamContentHistory.length - MAX_HISTORY_LENGTH;
-    this.streamContentHistory =
-      this.streamContentHistory.slice(truncationAmount);
-    this.lastContentIndex = Math.max(
-      0,
-      this.lastContentIndex - truncationAmount,
-    );
+    const truncationAmount = this.streamContentHistory.length - MAX_HISTORY_LENGTH;
+    this.streamContentHistory = this.streamContentHistory.slice(truncationAmount);
+    this.lastContentIndex = Math.max(0, this.lastContentIndex - truncationAmount);
 
     // Update all stored chunk indices to account for the truncation
     for (const [hash, oldIndices] of this.contentStats.entries()) {
@@ -317,15 +293,12 @@ export class LoopDetectionService {
         this.lastContentIndex,
         this.lastContentIndex + CONTENT_CHUNK_SIZE,
       );
-      const chunkHash = createHash('sha256').update(currentChunk).digest('hex');
+      const chunkHash = createHash("sha256").update(currentChunk).digest("hex");
 
       if (this.isLoopDetectedForChunk(currentChunk, chunkHash)) {
         logLoopDetected(
           this.config,
-          new LoopDetectedEvent(
-            LoopType.CHANTING_IDENTICAL_SENTENCES,
-            this.promptId,
-          ),
+          new LoopDetectedEvent(LoopType.CHANTING_IDENTICAL_SENTENCES, this.promptId),
         );
         return true;
       }
@@ -338,10 +311,7 @@ export class LoopDetectionService {
   }
 
   private hasMoreChunksToProcess(): boolean {
-    return (
-      this.lastContentIndex + CONTENT_CHUNK_SIZE <=
-      this.streamContentHistory.length
-    );
+    return this.lastContentIndex + CONTENT_CHUNK_SIZE <= this.streamContentHistory.length;
   }
 
   /**
@@ -374,8 +344,7 @@ export class LoopDetectionService {
 
     // Analyze the most recent occurrences to see if they're clustered closely together
     const recentIndices = existingIndices.slice(-CONTENT_LOOP_THRESHOLD);
-    const totalDistance =
-      recentIndices[recentIndices.length - 1] - recentIndices[0];
+    const totalDistance = recentIndices[recentIndices.length - 1] - recentIndices[0];
     const averageDistance = totalDistance / (CONTENT_LOOP_THRESHOLD - 1);
     const maxAllowedDistance = CONTENT_CHUNK_SIZE * 5;
 
@@ -386,10 +355,7 @@ export class LoopDetectionService {
    * Verifies that two chunks with the same hash actually contain identical content.
    * This prevents false positives from hash collisions.
    */
-  private isActualContentMatch(
-    currentChunk: string,
-    originalIndex: number,
-  ): boolean {
+  private isActualContentMatch(currentChunk: string, originalIndex: number): boolean {
     const originalChunk = this.streamContentHistory.substring(
       originalIndex,
       originalIndex + CONTENT_CHUNK_SIZE,
@@ -401,10 +367,7 @@ export class LoopDetectionService {
     // A function response must be preceded by a function call.
     // Continuously removes dangling function calls from the end of the history
     // until the last turn is not a function call.
-    while (
-      recentHistory.length > 0 &&
-      isFunctionCall(recentHistory[recentHistory.length - 1])
-    ) {
+    while (recentHistory.length > 0 && isFunctionCall(recentHistory[recentHistory.length - 1])) {
       recentHistory.pop();
     }
 
@@ -428,45 +391,30 @@ export class LoopDetectionService {
 
     const taskPrompt = `Please analyze the conversation history to determine the possibility that the conversation is stuck in a repetitive, non-productive state. Provide your response in the requested JSON format.`;
 
-    const contents = [
-      ...trimmedHistory,
-      { role: 'user', parts: [{ text: taskPrompt }] },
-    ];
+    const contents = [...trimmedHistory, { role: "user", parts: [{ text: taskPrompt }] }];
     if (contents.length > 0 && isFunctionCall(contents[0])) {
       contents.unshift({
-        role: 'user',
-        parts: [{ text: 'Recent conversation history:' }],
+        role: "user",
+        parts: [{ text: "Recent conversation history:" }],
       });
     }
 
-    const flashResult = await this.queryLoopDetectionModel(
-      'loop-detection',
-      contents,
-      signal,
-    );
+    const flashResult = await this.queryLoopDetectionModel("loop-detection", contents, signal);
 
     if (!flashResult) {
       return false;
     }
 
-    const flashConfidence = flashResult[
-      'unproductive_state_confidence'
-    ] as number;
+    const flashConfidence = flashResult["unproductive_state_confidence"] as number;
 
-    const doubleCheckModelName =
-      this.config.modelConfigService.getResolvedConfig({
-        model: DOUBLE_CHECK_MODEL_ALIAS,
-      }).model;
+    const doubleCheckModelName = this.config.modelConfigService.getResolvedConfig({
+      model: DOUBLE_CHECK_MODEL_ALIAS,
+    }).model;
 
     if (flashConfidence < LLM_CONFIDENCE_THRESHOLD) {
       logLlmLoopCheck(
         this.config,
-        new LlmLoopCheckEvent(
-          this.promptId,
-          flashConfidence,
-          doubleCheckModelName,
-          -1,
-        ),
+        new LlmLoopCheckEvent(this.promptId, flashConfidence, doubleCheckModelName, -1),
       );
       this.updateCheckInterval(flashConfidence);
       return false;
@@ -474,7 +422,7 @@ export class LoopDetectionService {
 
     if (this.config.isInFallbackMode()) {
       const flashModelName = this.config.modelConfigService.getResolvedConfig({
-        model: 'loop-detection',
+        model: "loop-detection",
       }).model;
       this.handleConfirmedLoop(flashResult, flashModelName);
       return true;
@@ -488,7 +436,7 @@ export class LoopDetectionService {
     );
 
     const mainModelConfidence = mainModelResult
-      ? (mainModelResult['unproductive_state_confidence'] as number)
+      ? (mainModelResult["unproductive_state_confidence"] as number)
       : 0;
 
     logLlmLoopCheck(
@@ -529,10 +477,7 @@ export class LoopDetectionService {
         maxAttempts: 2,
       })) as Record<string, unknown>;
 
-      if (
-        result &&
-        typeof result['unproductive_state_confidence'] === 'number'
-      ) {
+      if (result && typeof result["unproductive_state_confidence"] === "number") {
         return result;
       }
       return null;
@@ -542,31 +487,23 @@ export class LoopDetectionService {
     }
   }
 
-  private handleConfirmedLoop(
-    result: Record<string, unknown>,
-    modelName: string,
-  ): void {
+  private handleConfirmedLoop(result: Record<string, unknown>, modelName: string): void {
     if (
-      typeof result['unproductive_state_analysis'] === 'string' &&
-      result['unproductive_state_analysis']
+      typeof result["unproductive_state_analysis"] === "string" &&
+      result["unproductive_state_analysis"]
     ) {
-      debugLogger.warn(result['unproductive_state_analysis']);
+      debugLogger.warn(result["unproductive_state_analysis"]);
     }
     logLoopDetected(
       this.config,
-      new LoopDetectedEvent(
-        LoopType.LLM_DETECTED_LOOP,
-        this.promptId,
-        modelName,
-      ),
+      new LoopDetectedEvent(LoopType.LLM_DETECTED_LOOP, this.promptId, modelName),
     );
   }
 
   private updateCheckInterval(unproductive_state_confidence: number): void {
     this.llmCheckInterval = Math.round(
       MIN_LLM_CHECK_INTERVAL +
-        (MAX_LLM_CHECK_INTERVAL - MIN_LLM_CHECK_INTERVAL) *
-          (1 - unproductive_state_confidence),
+        (MAX_LLM_CHECK_INTERVAL - MIN_LLM_CHECK_INTERVAL) * (1 - unproductive_state_confidence),
     );
   }
 
@@ -588,7 +525,7 @@ export class LoopDetectionService {
 
   private resetContentTracking(resetHistory = true): void {
     if (resetHistory) {
-      this.streamContentHistory = '';
+      this.streamContentHistory = "";
     }
     this.contentStats.clear();
     this.lastContentIndex = 0;
diff --git a/packages/gemini-cli-core/src/services/modelConfig.golden.test.ts b/packages/gemini-cli-core/src/services/modelConfig.golden.test.ts
index 3b490a6da..98084f3f0 100644
--- a/packages/gemini-cli-core/src/services/modelConfig.golden.test.ts
+++ b/packages/gemini-cli-core/src/services/modelConfig.golden.test.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { ModelConfigService } from './modelConfigService.js';
-import { DEFAULT_MODEL_CONFIGS } from '../config/defaultModelConfigs.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { describe, expect, it } from "vitest";
+import { DEFAULT_MODEL_CONFIGS } from "../config/defaultModelConfigs.js";
+import { ModelConfigService } from "./modelConfigService.js";
 
 const GOLDEN_FILE_PATH = path.resolve(
   process.cwd(),
-  'src',
-  'services',
-  'test-data',
-  'resolved-aliases.golden.json',
+  "src",
+  "services",
+  "test-data",
+  "resolved-aliases.golden.json",
 );
 
 const RETRY_GOLDEN_FILE_PATH = path.resolve(
   process.cwd(),
-  'src',
-  'services',
-  'test-data',
-  'resolved-aliases-retry.golden.json',
+  "src",
+  "services",
+  "test-data",
+  "resolved-aliases-retry.golden.json",
 );
 
-describe('ModelConfigService Golden Test', () => {
-  it('should match the golden file for resolved default aliases', async () => {
+describe("ModelConfigService Golden Test", () => {
+  it("should match the golden file for resolved default aliases", async () => {
     const service = new ModelConfigService(DEFAULT_MODEL_CONFIGS);
     const aliases = Object.keys(DEFAULT_MODEL_CONFIGS.aliases ?? {});
 
@@ -38,25 +38,19 @@ describe('ModelConfigService Golden Test', () => {
         (service as any).internalGetResolvedConfig({ model: alias });
     }
 
-    if (process.env['UPDATE_GOLDENS']) {
+    if (process.env["UPDATE_GOLDENS"]) {
       await fs.mkdir(path.dirname(GOLDEN_FILE_PATH), { recursive: true });
-      await fs.writeFile(
-        GOLDEN_FILE_PATH,
-        JSON.stringify(resolvedAliases, null, 2),
-        'utf-8',
-      );
+      await fs.writeFile(GOLDEN_FILE_PATH, JSON.stringify(resolvedAliases, null, 2), "utf-8");
       // In update mode, we pass the test after writing the file.
       return;
     }
 
     let goldenContent: string;
     try {
-      goldenContent = await fs.readFile(GOLDEN_FILE_PATH, 'utf-8');
+      goldenContent = await fs.readFile(GOLDEN_FILE_PATH, "utf-8");
     } catch (e) {
-      if ((e as NodeJS.ErrnoException).code === 'ENOENT') {
-        throw new Error(
-          'Golden file not found. Run with `UPDATE_GOLDENS=true` to create it.',
-        );
+      if ((e as NodeJS.ErrnoException).code === "ENOENT") {
+        throw new Error("Golden file not found. Run with `UPDATE_GOLDENS=true` to create it.");
       }
       throw e;
     }
@@ -65,11 +59,11 @@ describe('ModelConfigService Golden Test', () => {
 
     expect(
       resolvedAliases,
-      'Golden file mismatch. If the new resolved aliases are correct, run the test with `UPDATE_GOLDENS=true` to regenerate the golden file.',
+      "Golden file mismatch. If the new resolved aliases are correct, run the test with `UPDATE_GOLDENS=true` to regenerate the golden file.",
     ).toEqual(goldenData);
   });
 
-  it('should match the golden file for resolved default aliases with isRetry=true', async () => {
+  it("should match the golden file for resolved default aliases with isRetry=true", async () => {
     const service = new ModelConfigService(DEFAULT_MODEL_CONFIGS);
     const aliases = Object.keys(DEFAULT_MODEL_CONFIGS.aliases ?? {});
 
@@ -83,25 +77,19 @@ describe('ModelConfigService Golden Test', () => {
         });
     }
 
-    if (process.env['UPDATE_GOLDENS']) {
+    if (process.env["UPDATE_GOLDENS"]) {
       await fs.mkdir(path.dirname(RETRY_GOLDEN_FILE_PATH), { recursive: true });
-      await fs.writeFile(
-        RETRY_GOLDEN_FILE_PATH,
-        JSON.stringify(resolvedAliases, null, 2),
-        'utf-8',
-      );
+      await fs.writeFile(RETRY_GOLDEN_FILE_PATH, JSON.stringify(resolvedAliases, null, 2), "utf-8");
       // In update mode, we pass the test after writing the file.
       return;
     }
 
     let goldenContent: string;
     try {
-      goldenContent = await fs.readFile(RETRY_GOLDEN_FILE_PATH, 'utf-8');
+      goldenContent = await fs.readFile(RETRY_GOLDEN_FILE_PATH, "utf-8");
     } catch (e) {
-      if ((e as NodeJS.ErrnoException).code === 'ENOENT') {
-        throw new Error(
-          'Golden file not found. Run with `UPDATE_GOLDENS=true` to create it.',
-        );
+      if ((e as NodeJS.ErrnoException).code === "ENOENT") {
+        throw new Error("Golden file not found. Run with `UPDATE_GOLDENS=true` to create it.");
       }
       throw e;
     }
@@ -110,7 +98,7 @@ describe('ModelConfigService Golden Test', () => {
 
     expect(
       resolvedAliases,
-      'Golden file mismatch. If the new resolved aliases are correct, run the test with `UPDATE_GOLDENS=true` to regenerate the golden file.',
+      "Golden file mismatch. If the new resolved aliases are correct, run the test with `UPDATE_GOLDENS=true` to regenerate the golden file.",
     ).toEqual(goldenData);
   });
 });
diff --git a/packages/gemini-cli-core/src/services/modelConfig.integration.test.ts b/packages/gemini-cli-core/src/services/modelConfig.integration.test.ts
index 7706f3307..647fa07ee 100644
--- a/packages/gemini-cli-core/src/services/modelConfig.integration.test.ts
+++ b/packages/gemini-cli-core/src/services/modelConfig.integration.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { ModelConfigService } from './modelConfigService.js';
-import type { ModelConfigServiceConfig } from './modelConfigService.js';
+import { describe, expect, it } from "vitest";
+import type { ModelConfigServiceConfig } from "./modelConfigService.js";
+import { ModelConfigService } from "./modelConfigService.js";
 
 // This test suite is designed to validate the end-to-end logic of the
 // ModelConfigService with a complex, realistic configuration.
 // It tests the interplay of global settings, alias inheritance, and overrides
 // of varying specificities.
-describe('ModelConfigService Integration', () => {
+describe("ModelConfigService Integration", () => {
   const complexConfig: ModelConfigServiceConfig = {
     aliases: {
       // Abstract base with no model
@@ -24,17 +24,17 @@ describe('ModelConfigService Integration', () => {
           },
         },
       },
-      'default-text-model': {
-        extends: 'base',
+      "default-text-model": {
+        extends: "base",
         modelConfig: {
-          model: 'gemini-1.5-pro-latest',
+          model: "gemini-1.5-pro-latest",
           generateContentConfig: {
             topK: 40, // Override base
           },
         },
       },
-      'creative-writer': {
-        extends: 'default-text-model',
+      "creative-writer": {
+        extends: "default-text-model",
         modelConfig: {
           generateContentConfig: {
             temperature: 0.9, // Override global
@@ -42,10 +42,10 @@ describe('ModelConfigService Integration', () => {
           },
         },
       },
-      'fast-classifier': {
-        extends: 'base',
+      "fast-classifier": {
+        extends: "base",
         modelConfig: {
-          model: 'gemini-1.5-flash-latest',
+          model: "gemini-1.5-flash-latest",
           generateContentConfig: {
             temperature: 0.1,
             candidateCount: 4,
@@ -56,7 +56,7 @@ describe('ModelConfigService Integration', () => {
     overrides: [
       // Broad override for all flash models
       {
-        match: { model: 'gemini-1.5-flash-latest' },
+        match: { model: "gemini-1.5-flash-latest" },
         modelConfig: {
           generateContentConfig: {
             maxOutputTokens: 2048,
@@ -65,17 +65,17 @@ describe('ModelConfigService Integration', () => {
       },
       // Specific override for the 'core' agent
       {
-        match: { overrideScope: 'core' },
+        match: { overrideScope: "core" },
         modelConfig: {
           generateContentConfig: {
             temperature: 0.5,
-            stopSequences: ['AGENT_STOP'],
+            stopSequences: ["AGENT_STOP"],
           },
         },
       },
       // Highly specific override for the 'fast-classifier' when used by the 'core' agent
       {
-        match: { model: 'fast-classifier', overrideScope: 'core' },
+        match: { model: "fast-classifier", overrideScope: "core" },
         modelConfig: {
           generateContentConfig: {
             temperature: 0.0,
@@ -85,9 +85,9 @@ describe('ModelConfigService Integration', () => {
       },
       // Override to provide a model for the abstract alias
       {
-        match: { model: 'base', overrideScope: 'core' },
+        match: { model: "base", overrideScope: "core" },
         modelConfig: {
-          model: 'gemini-1.5-pro-latest',
+          model: "gemini-1.5-pro-latest",
         },
       },
     ],
@@ -95,83 +95,83 @@ describe('ModelConfigService Integration', () => {
 
   const service = new ModelConfigService(complexConfig);
 
-  it('should resolve a simple model, applying core agent defaults', () => {
+  it("should resolve a simple model, applying core agent defaults", () => {
     const resolved = service.getResolvedConfig({
-      model: 'gemini-test-model',
+      model: "gemini-test-model",
     });
 
-    expect(resolved.model).toBe('gemini-test-model');
+    expect(resolved.model).toBe("gemini-test-model");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should correctly apply a simple inherited alias and merge with global defaults', () => {
+  it("should correctly apply a simple inherited alias and merge with global defaults", () => {
     const resolved = service.getResolvedConfig({
-      model: 'default-text-model',
+      model: "default-text-model",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from alias
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from alias
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
       topP: 0.95, // from base
       topK: 40, // from alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should resolve a multi-level inherited alias', () => {
+  it("should resolve a multi-level inherited alias", () => {
     const resolved = service.getResolvedConfig({
-      model: 'creative-writer',
+      model: "creative-writer",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from default-text-model
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from default-text-model
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
       topP: 0.95, // from base
       topK: 50, // from alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should apply an inherited alias and a broad model-based override', () => {
+  it("should apply an inherited alias and a broad model-based override", () => {
     const resolved = service.getResolvedConfig({
-      model: 'fast-classifier',
+      model: "fast-classifier",
       // No agent specified, so it should match core agent-specific rules
     });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest'); // from alias
+    expect(resolved.model).toBe("gemini-1.5-flash-latest"); // from alias
     expect(resolved.generateContentConfig).toEqual({
       topP: 0.95, // from base
       topK: 64, // from base
       candidateCount: 4, // from alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
       maxOutputTokens: 4096, // from most specific override
       temperature: 0.0, // from most specific override
     });
   });
 
-  it('should apply settings for an unknown model but a known agent', () => {
+  it("should apply settings for an unknown model but a known agent", () => {
     const resolved = service.getResolvedConfig({
-      model: 'gemini-test-model',
-      overrideScope: 'core',
+      model: "gemini-test-model",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-test-model');
+    expect(resolved.model).toBe("gemini-test-model");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should apply the most specific override for a known inherited alias and agent', () => {
+  it("should apply the most specific override for a known inherited alias and agent", () => {
     const resolved = service.getResolvedConfig({
-      model: 'fast-classifier',
-      overrideScope: 'core',
+      model: "fast-classifier",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       // Inherited from 'base'
       topP: 0.95,
@@ -179,50 +179,50 @@ describe('ModelConfigService Integration', () => {
       // From 'fast-classifier' alias
       candidateCount: 4,
       // From 'core' agent override
-      stopSequences: ['AGENT_STOP'],
+      stopSequences: ["AGENT_STOP"],
       // From most specific override (model+agent)
       temperature: 0.0,
       maxOutputTokens: 4096,
     });
   });
 
-  it('should correctly apply agent override on top of a multi-level inherited alias', () => {
+  it("should correctly apply agent override on top of a multi-level inherited alias", () => {
     const resolved = service.getResolvedConfig({
-      model: 'creative-writer',
-      overrideScope: 'core',
+      model: "creative-writer",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from default-text-model
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from default-text-model
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override (wins over alias)
       topP: 0.95, // from base
       topK: 50, // from creative-writer alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should resolve an abstract alias if a specific override provides the model', () => {
+  it("should resolve an abstract alias if a specific override provides the model", () => {
     const resolved = service.getResolvedConfig({
-      model: 'base',
-      overrideScope: 'core',
+      model: "base",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from override
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from override
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
       topP: 0.95, // from base alias
       topK: 64, // from base alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should not apply core agent overrides when a different agent is specified', () => {
+  it("should not apply core agent overrides when a different agent is specified", () => {
     const resolved = service.getResolvedConfig({
-      model: 'fast-classifier',
-      overrideScope: 'non-core-agent',
+      model: "fast-classifier",
+      overrideScope: "non-core-agent",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       candidateCount: 4, // from alias
       maxOutputTokens: 2048, // from override of model
@@ -232,14 +232,14 @@ describe('ModelConfigService Integration', () => {
     });
   });
 
-  it('should correctly merge static aliases, runtime aliases, and overrides', () => {
+  it("should correctly merge static aliases, runtime aliases, and overrides", () => {
     // Re-instantiate service for this isolated test to not pollute other tests
     const service = new ModelConfigService(complexConfig);
 
     // Register a runtime alias, simulating what AgentExecutor does.
     // This alias extends a static base and provides its own settings.
-    service.registerRuntimeModelConfig('agent-runtime:my-agent', {
-      extends: 'creative-writer', // extends a multi-level alias
+    service.registerRuntimeModelConfig("agent-runtime:my-agent", {
+      extends: "creative-writer", // extends a multi-level alias
       modelConfig: {
         generateContentConfig: {
           temperature: 0.1, // Overrides parent
@@ -250,12 +250,12 @@ describe('ModelConfigService Integration', () => {
 
     // Resolve the configuration for the runtime alias, with a matching agent scope
     const resolved = service.getResolvedConfig({
-      model: 'agent-runtime:my-agent',
-      overrideScope: 'core',
+      model: "agent-runtime:my-agent",
+      overrideScope: "core",
     });
 
     // Assert the final merged configuration.
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from 'default-text-model'
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from 'default-text-model'
     expect(resolved.generateContentConfig).toEqual({
       // from 'core' agent override, wins over runtime alias's 0.1 and creative-writer's 0.9
       temperature: 0.5,
@@ -266,7 +266,7 @@ describe('ModelConfigService Integration', () => {
       // from runtime alias
       maxOutputTokens: 8192,
       // from 'core' agent override
-      stopSequences: ['AGENT_STOP'],
+      stopSequences: ["AGENT_STOP"],
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/services/modelConfigService.test.ts b/packages/gemini-cli-core/src/services/modelConfigService.test.ts
index 8d08e4f77..04a00c831 100644
--- a/packages/gemini-cli-core/src/services/modelConfigService.test.ts
+++ b/packages/gemini-cli-core/src/services/modelConfigService.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import type { ModelConfigServiceConfig } from './modelConfigService.js';
-import { ModelConfigService } from './modelConfigService.js';
+import { describe, expect, it } from "vitest";
+import type { ModelConfigServiceConfig } from "./modelConfigService.js";
+import { ModelConfigService } from "./modelConfigService.js";
 
-describe('ModelConfigService', () => {
-  it('should resolve a basic alias to its model and settings', () => {
+describe("ModelConfigService", () => {
+  it("should resolve a basic alias to its model and settings", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
         classifier: {
           modelConfig: {
-            model: 'gemini-1.5-flash-latest',
+            model: "gemini-1.5-flash-latest",
             generateContentConfig: {
               temperature: 0,
               topP: 0.9,
@@ -25,21 +25,21 @@ describe('ModelConfigService', () => {
       overrides: [],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'classifier' });
+    const resolved = service.getResolvedConfig({ model: "classifier" });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0,
       topP: 0.9,
     });
   });
 
-  it('should apply a simple override on top of an alias', () => {
+  it("should apply a simple override on top of an alias", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
         classifier: {
           modelConfig: {
-            model: 'gemini-1.5-flash-latest',
+            model: "gemini-1.5-flash-latest",
             generateContentConfig: {
               temperature: 0,
               topP: 0.9,
@@ -49,7 +49,7 @@ describe('ModelConfigService', () => {
       },
       overrides: [
         {
-          match: { model: 'classifier' },
+          match: { model: "classifier" },
           modelConfig: {
             generateContentConfig: {
               temperature: 0.5,
@@ -60,9 +60,9 @@ describe('ModelConfigService', () => {
       ],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'classifier' });
+    const resolved = service.getResolvedConfig({ model: "classifier" });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5,
       topP: 0.9,
@@ -70,62 +70,62 @@ describe('ModelConfigService', () => {
     });
   });
 
-  it('should apply the most specific override rule', () => {
+  it("should apply the most specific override rule", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {},
       overrides: [
         {
-          match: { model: 'gemini-pro' },
+          match: { model: "gemini-pro" },
           modelConfig: { generateContentConfig: { temperature: 0.5 } },
         },
         {
-          match: { model: 'gemini-pro', overrideScope: 'my-agent' },
+          match: { model: "gemini-pro", overrideScope: "my-agent" },
           modelConfig: { generateContentConfig: { temperature: 0.1 } },
         },
       ],
     };
     const service = new ModelConfigService(config);
     const resolved = service.getResolvedConfig({
-      model: 'gemini-pro',
-      overrideScope: 'my-agent',
+      model: "gemini-pro",
+      overrideScope: "my-agent",
     });
 
-    expect(resolved.model).toBe('gemini-pro');
+    expect(resolved.model).toBe("gemini-pro");
     expect(resolved.generateContentConfig).toEqual({ temperature: 0.1 });
   });
 
-  it('should use the last override in case of a tie in specificity', () => {
+  it("should use the last override in case of a tie in specificity", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {},
       overrides: [
         {
-          match: { model: 'gemini-pro' },
+          match: { model: "gemini-pro" },
           modelConfig: {
             generateContentConfig: { temperature: 0.5, topP: 0.8 },
           },
         },
         {
-          match: { model: 'gemini-pro' },
+          match: { model: "gemini-pro" },
           modelConfig: { generateContentConfig: { temperature: 0.1 } },
         },
       ],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'gemini-pro' });
+    const resolved = service.getResolvedConfig({ model: "gemini-pro" });
 
-    expect(resolved.model).toBe('gemini-pro');
+    expect(resolved.model).toBe("gemini-pro");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.1,
       topP: 0.8,
     });
   });
 
-  it('should correctly pass through generation config from an alias', () => {
+  it("should correctly pass through generation config from an alias", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
-        'thinking-alias': {
+        "thinking-alias": {
           modelConfig: {
-            model: 'gemini-pro',
+            model: "gemini-pro",
             generateContentConfig: {
               candidateCount: 500,
             },
@@ -135,17 +135,17 @@ describe('ModelConfigService', () => {
       overrides: [],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'thinking-alias' });
+    const resolved = service.getResolvedConfig({ model: "thinking-alias" });
 
     expect(resolved.generateContentConfig).toEqual({ candidateCount: 500 });
   });
 
-  it('should let an override generation config win over an alias config', () => {
+  it("should let an override generation config win over an alias config", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
-        'thinking-alias': {
+        "thinking-alias": {
           modelConfig: {
-            model: 'gemini-pro',
+            model: "gemini-pro",
             generateContentConfig: {
               candidateCount: 500,
             },
@@ -154,7 +154,7 @@ describe('ModelConfigService', () => {
       },
       overrides: [
         {
-          match: { model: 'thinking-alias' },
+          match: { model: "thinking-alias" },
           modelConfig: {
             generateContentConfig: {
               candidateCount: 1000,
@@ -164,19 +164,19 @@ describe('ModelConfigService', () => {
       ],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'thinking-alias' });
+    const resolved = service.getResolvedConfig({ model: "thinking-alias" });
 
     expect(resolved.generateContentConfig).toEqual({
       candidateCount: 1000,
     });
   });
 
-  it('should merge settings from global, alias, and multiple matching overrides', () => {
+  it("should merge settings from global, alias, and multiple matching overrides", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
-        'test-alias': {
+        "test-alias": {
           modelConfig: {
-            model: 'gemini-test-model',
+            model: "gemini-test-model",
             generateContentConfig: {
               topP: 0.9,
               topK: 50,
@@ -186,7 +186,7 @@ describe('ModelConfigService', () => {
       },
       overrides: [
         {
-          match: { model: 'gemini-test-model' },
+          match: { model: "gemini-test-model" },
           modelConfig: {
             generateContentConfig: {
               topK: 40,
@@ -195,7 +195,7 @@ describe('ModelConfigService', () => {
           },
         },
         {
-          match: { overrideScope: 'test-agent' },
+          match: { overrideScope: "test-agent" },
           modelConfig: {
             generateContentConfig: {
               maxOutputTokens: 4096,
@@ -203,7 +203,7 @@ describe('ModelConfigService', () => {
           },
         },
         {
-          match: { model: 'gemini-test-model', overrideScope: 'test-agent' },
+          match: { model: "gemini-test-model", overrideScope: "test-agent" },
           modelConfig: {
             generateContentConfig: {
               temperature: 0.2,
@@ -215,11 +215,11 @@ describe('ModelConfigService', () => {
 
     const service = new ModelConfigService(config);
     const resolved = service.getResolvedConfig({
-      model: 'test-alias',
-      overrideScope: 'test-agent',
+      model: "test-alias",
+      overrideScope: "test-agent",
     });
 
-    expect(resolved.model).toBe('gemini-test-model');
+    expect(resolved.model).toBe("gemini-test-model");
     expect(resolved.generateContentConfig).toEqual({
       // From global, overridden by most specific override
       temperature: 0.2,
@@ -232,12 +232,12 @@ describe('ModelConfigService', () => {
     });
   });
 
-  it('should match an agent:core override when agent is undefined', () => {
+  it("should match an agent:core override when agent is undefined", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {},
       overrides: [
         {
-          match: { overrideScope: 'core' },
+          match: { overrideScope: "core" },
           modelConfig: {
             generateContentConfig: {
               temperature: 0.1,
@@ -249,63 +249,63 @@ describe('ModelConfigService', () => {
 
     const service = new ModelConfigService(config);
     const resolved = service.getResolvedConfig({
-      model: 'gemini-pro',
+      model: "gemini-pro",
       overrideScope: undefined, // Explicitly undefined
     });
 
-    expect(resolved.model).toBe('gemini-pro');
+    expect(resolved.model).toBe("gemini-pro");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.1,
     });
   });
 
-  describe('alias inheritance', () => {
+  describe("alias inheritance", () => {
     it('should resolve a simple "extends" chain', () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-1.5-pro-latest',
+              model: "gemini-1.5-pro-latest",
               generateContentConfig: {
                 temperature: 0.7,
                 topP: 0.9,
               },
             },
           },
-          'flash-variant': {
-            extends: 'base',
+          "flash-variant": {
+            extends: "base",
             modelConfig: {
-              model: 'gemini-1.5-flash-latest',
+              model: "gemini-1.5-flash-latest",
             },
           },
         },
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'flash-variant' });
+      const resolved = service.getResolvedConfig({ model: "flash-variant" });
 
-      expect(resolved.model).toBe('gemini-1.5-flash-latest');
+      expect(resolved.model).toBe("gemini-1.5-flash-latest");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0.7,
         topP: 0.9,
       });
     });
 
-    it('should override parent properties from child alias', () => {
+    it("should override parent properties from child alias", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-1.5-pro-latest',
+              model: "gemini-1.5-pro-latest",
               generateContentConfig: {
                 temperature: 0.7,
                 topP: 0.9,
               },
             },
           },
-          'flash-variant': {
-            extends: 'base',
+          "flash-variant": {
+            extends: "base",
             modelConfig: {
-              model: 'gemini-1.5-flash-latest',
+              model: "gemini-1.5-flash-latest",
               generateContentConfig: {
                 temperature: 0.2,
               },
@@ -314,9 +314,9 @@ describe('ModelConfigService', () => {
         },
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'flash-variant' });
+      const resolved = service.getResolvedConfig({ model: "flash-variant" });
 
-      expect(resolved.model).toBe('gemini-1.5-flash-latest');
+      expect(resolved.model).toBe("gemini-1.5-flash-latest");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0.2,
         topP: 0.9,
@@ -328,21 +328,21 @@ describe('ModelConfigService', () => {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-1.5-pro-latest',
+              model: "gemini-1.5-pro-latest",
               generateContentConfig: {
                 temperature: 0.7,
                 topP: 0.9,
               },
             },
           },
-          'base-flash': {
-            extends: 'base',
+          "base-flash": {
+            extends: "base",
             modelConfig: {
-              model: 'gemini-1.5-flash-latest',
+              model: "gemini-1.5-flash-latest",
             },
           },
-          'classifier-flash': {
-            extends: 'base-flash',
+          "classifier-flash": {
+            extends: "base-flash",
             modelConfig: {
               generateContentConfig: {
                 temperature: 0,
@@ -353,44 +353,44 @@ describe('ModelConfigService', () => {
       };
       const service = new ModelConfigService(config);
       const resolved = service.getResolvedConfig({
-        model: 'classifier-flash',
+        model: "classifier-flash",
       });
 
-      expect(resolved.model).toBe('gemini-1.5-flash-latest');
+      expect(resolved.model).toBe("gemini-1.5-flash-latest");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0,
         topP: 0.9,
       });
     });
 
-    it('should throw an error for circular dependencies', () => {
+    it("should throw an error for circular dependencies", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          a: { extends: 'b', modelConfig: {} },
-          b: { extends: 'a', modelConfig: {} },
+          a: { extends: "b", modelConfig: {} },
+          b: { extends: "a", modelConfig: {} },
         },
       };
       const service = new ModelConfigService(config);
-      expect(() => service.getResolvedConfig({ model: 'a' })).toThrow(
-        'Circular alias dependency: a -> b -> a',
+      expect(() => service.getResolvedConfig({ model: "a" })).toThrow(
+        "Circular alias dependency: a -> b -> a",
       );
     });
 
-    describe('abstract aliases', () => {
-      it('should allow an alias to extend an abstract alias without a model', () => {
+    describe("abstract aliases", () => {
+      it("should allow an alias to extend an abstract alias without a model", () => {
         const config: ModelConfigServiceConfig = {
           aliases: {
-            'abstract-base': {
+            "abstract-base": {
               modelConfig: {
                 generateContentConfig: {
                   temperature: 0.1,
                 },
               },
             },
-            'concrete-child': {
-              extends: 'abstract-base',
+            "concrete-child": {
+              extends: "abstract-base",
               modelConfig: {
-                model: 'gemini-1.5-pro-latest',
+                model: "gemini-1.5-pro-latest",
                 generateContentConfig: {
                   topP: 0.9,
                 },
@@ -399,19 +399,19 @@ describe('ModelConfigService', () => {
           },
         };
         const service = new ModelConfigService(config);
-        const resolved = service.getResolvedConfig({ model: 'concrete-child' });
+        const resolved = service.getResolvedConfig({ model: "concrete-child" });
 
-        expect(resolved.model).toBe('gemini-1.5-pro-latest');
+        expect(resolved.model).toBe("gemini-1.5-pro-latest");
         expect(resolved.generateContentConfig).toEqual({
           temperature: 0.1,
           topP: 0.9,
         });
       });
 
-      it('should throw an error if a resolved alias chain has no model', () => {
+      it("should throw an error if a resolved alias chain has no model", () => {
         const config: ModelConfigServiceConfig = {
           aliases: {
-            'abstract-base': {
+            "abstract-base": {
               modelConfig: {
                 generateContentConfig: { temperature: 0.7 },
               },
@@ -419,17 +419,15 @@ describe('ModelConfigService', () => {
           },
         };
         const service = new ModelConfigService(config);
-        expect(() =>
-          service.getResolvedConfig({ model: 'abstract-base' }),
-        ).toThrow(
+        expect(() => service.getResolvedConfig({ model: "abstract-base" })).toThrow(
           'Could not resolve a model name for alias "abstract-base". Please ensure the alias chain or a matching override specifies a model.',
         );
       });
 
-      it('should resolve an abstract alias if an override provides the model', () => {
+      it("should resolve an abstract alias if an override provides the model", () => {
         const config: ModelConfigServiceConfig = {
           aliases: {
-            'abstract-base': {
+            "abstract-base": {
               modelConfig: {
                 generateContentConfig: {
                   temperature: 0.1,
@@ -439,50 +437,50 @@ describe('ModelConfigService', () => {
           },
           overrides: [
             {
-              match: { model: 'abstract-base' },
+              match: { model: "abstract-base" },
               modelConfig: {
-                model: 'gemini-1.5-flash-latest',
+                model: "gemini-1.5-flash-latest",
               },
             },
           ],
         };
         const service = new ModelConfigService(config);
-        const resolved = service.getResolvedConfig({ model: 'abstract-base' });
+        const resolved = service.getResolvedConfig({ model: "abstract-base" });
 
-        expect(resolved.model).toBe('gemini-1.5-flash-latest');
+        expect(resolved.model).toBe("gemini-1.5-flash-latest");
         expect(resolved.generateContentConfig).toEqual({
           temperature: 0.1,
         });
       });
     });
 
-    it('should throw an error if an extended alias does not exist', () => {
+    it("should throw an error if an extended alias does not exist", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'bad-alias': {
-            extends: 'non-existent',
+          "bad-alias": {
+            extends: "non-existent",
             modelConfig: {},
           },
         },
       };
       const service = new ModelConfigService(config);
-      expect(() => service.getResolvedConfig({ model: 'bad-alias' })).toThrow(
+      expect(() => service.getResolvedConfig({ model: "bad-alias" })).toThrow(
         'Alias "non-existent" not found.',
       );
     });
   });
 
-  describe('deep merging', () => {
-    it('should deep merge nested config objects from aliases and overrides', () => {
+  describe("deep merging", () => {
+    it("should deep merge nested config objects from aliases and overrides", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'base-safe': {
+          "base-safe": {
             modelConfig: {
-              model: 'gemini-pro',
+              model: "gemini-pro",
               generateContentConfig: {
                 safetySettings: {
-                  HARM_CATEGORY_HARASSMENT: 'BLOCK_ONLY_HIGH',
-                  HARM_CATEGORY_HATE_SPEECH: 'BLOCK_ONLY_HIGH',
+                  HARM_CATEGORY_HARASSMENT: "BLOCK_ONLY_HIGH",
+                  HARM_CATEGORY_HATE_SPEECH: "BLOCK_ONLY_HIGH",
                   // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 } as any,
               },
@@ -491,12 +489,12 @@ describe('ModelConfigService', () => {
         },
         overrides: [
           {
-            match: { model: 'base-safe' },
+            match: { model: "base-safe" },
             modelConfig: {
               generateContentConfig: {
                 safetySettings: {
-                  HARM_CATEGORY_HATE_SPEECH: 'BLOCK_NONE',
-                  HARM_CATEGORY_SEXUALLY_EXPLICIT: 'BLOCK_MEDIUM_AND_ABOVE',
+                  HARM_CATEGORY_HATE_SPEECH: "BLOCK_NONE",
+                  HARM_CATEGORY_SEXUALLY_EXPLICIT: "BLOCK_MEDIUM_AND_ABOVE",
                   // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 } as any,
               },
@@ -505,86 +503,84 @@ describe('ModelConfigService', () => {
         ],
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'base-safe' });
+      const resolved = service.getResolvedConfig({ model: "base-safe" });
 
-      expect(resolved.model).toBe('gemini-pro');
+      expect(resolved.model).toBe("gemini-pro");
       expect(resolved.generateContentConfig.safetySettings).toEqual({
         // From alias
-        HARM_CATEGORY_HARASSMENT: 'BLOCK_ONLY_HIGH',
+        HARM_CATEGORY_HARASSMENT: "BLOCK_ONLY_HIGH",
         // From alias, overridden by override
-        HARM_CATEGORY_HATE_SPEECH: 'BLOCK_NONE',
+        HARM_CATEGORY_HATE_SPEECH: "BLOCK_NONE",
         // From override
-        HARM_CATEGORY_SEXUALLY_EXPLICIT: 'BLOCK_MEDIUM_AND_ABOVE',
+        HARM_CATEGORY_SEXUALLY_EXPLICIT: "BLOCK_MEDIUM_AND_ABOVE",
       });
     });
 
-    it('should not deeply merge merge arrays from aliases and overrides', () => {
+    it("should not deeply merge merge arrays from aliases and overrides", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-pro',
+              model: "gemini-pro",
               generateContentConfig: {
-                stopSequences: ['foo'],
+                stopSequences: ["foo"],
               },
             },
           },
         },
         overrides: [
           {
-            match: { model: 'base' },
+            match: { model: "base" },
             modelConfig: {
               generateContentConfig: {
-                stopSequences: ['overrideFoo'],
+                stopSequences: ["overrideFoo"],
               },
             },
           },
         ],
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'base' });
+      const resolved = service.getResolvedConfig({ model: "base" });
 
-      expect(resolved.model).toBe('gemini-pro');
-      expect(resolved.generateContentConfig.stopSequences).toEqual([
-        'overrideFoo',
-      ]);
+      expect(resolved.model).toBe("gemini-pro");
+      expect(resolved.generateContentConfig.stopSequences).toEqual(["overrideFoo"]);
     });
   });
 
-  describe('runtime aliases', () => {
-    it('should resolve a simple runtime-registered alias', () => {
+  describe("runtime aliases", () => {
+    it("should resolve a simple runtime-registered alias", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {},
         overrides: [],
       };
       const service = new ModelConfigService(config);
 
-      service.registerRuntimeModelConfig('runtime-alias', {
+      service.registerRuntimeModelConfig("runtime-alias", {
         modelConfig: {
-          model: 'gemini-runtime-model',
+          model: "gemini-runtime-model",
           generateContentConfig: {
             temperature: 0.123,
           },
         },
       });
 
-      const resolved = service.getResolvedConfig({ model: 'runtime-alias' });
+      const resolved = service.getResolvedConfig({ model: "runtime-alias" });
 
-      expect(resolved.model).toBe('gemini-runtime-model');
+      expect(resolved.model).toBe("gemini-runtime-model");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0.123,
       });
     });
   });
 
-  describe('custom aliases', () => {
-    it('should resolve a custom alias', () => {
+  describe("custom aliases", () => {
+    it("should resolve a custom alias", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {},
         customAliases: {
-          'my-custom-alias': {
+          "my-custom-alias": {
             modelConfig: {
-              model: 'gemini-custom',
+              model: "gemini-custom",
               generateContentConfig: {
                 temperature: 0.9,
               },
@@ -594,20 +590,20 @@ describe('ModelConfigService', () => {
         overrides: [],
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'my-custom-alias' });
+      const resolved = service.getResolvedConfig({ model: "my-custom-alias" });
 
-      expect(resolved.model).toBe('gemini-custom');
+      expect(resolved.model).toBe("gemini-custom");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0.9,
       });
     });
 
-    it('should allow custom aliases to override built-in aliases', () => {
+    it("should allow custom aliases to override built-in aliases", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'standard-alias': {
+          "standard-alias": {
             modelConfig: {
-              model: 'gemini-standard',
+              model: "gemini-standard",
               generateContentConfig: {
                 temperature: 0.5,
               },
@@ -615,9 +611,9 @@ describe('ModelConfigService', () => {
           },
         },
         customAliases: {
-          'standard-alias': {
+          "standard-alias": {
             modelConfig: {
-              model: 'gemini-custom-override',
+              model: "gemini-custom-override",
               generateContentConfig: {
                 temperature: 0.1,
               },
@@ -627,18 +623,18 @@ describe('ModelConfigService', () => {
         overrides: [],
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'standard-alias' });
+      const resolved = service.getResolvedConfig({ model: "standard-alias" });
 
-      expect(resolved.model).toBe('gemini-custom-override');
+      expect(resolved.model).toBe("gemini-custom-override");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0.1,
       });
     });
   });
 
-  describe('unrecognized models', () => {
-    it('should apply overrides to unrecognized model names', () => {
-      const unregisteredModelName = 'my-unregistered-model-v1';
+  describe("unrecognized models", () => {
+    it("should apply overrides to unrecognized model names", () => {
+      const unregisteredModelName = "my-unregistered-model-v1";
       const config: ModelConfigServiceConfig = {
         aliases: {}, // No aliases defined
         overrides: [
@@ -666,15 +662,15 @@ describe('ModelConfigService', () => {
       });
     });
 
-    it('should apply scoped overrides to unrecognized model names', () => {
-      const unregisteredModelName = 'my-unregistered-model-v1';
+    it("should apply scoped overrides to unrecognized model names", () => {
+      const unregisteredModelName = "my-unregistered-model-v1";
       const config: ModelConfigServiceConfig = {
         aliases: {},
         overrides: [
           {
             match: {
               model: unregisteredModelName,
-              overrideScope: 'special-agent',
+              overrideScope: "special-agent",
             },
             modelConfig: {
               generateContentConfig: {
@@ -688,7 +684,7 @@ describe('ModelConfigService', () => {
 
       const resolved = service.getResolvedConfig({
         model: unregisteredModelName,
-        overrideScope: 'special-agent',
+        overrideScope: "special-agent",
       });
 
       expect(resolved.model).toBe(unregisteredModelName);
@@ -698,45 +694,45 @@ describe('ModelConfigService', () => {
     });
   });
 
-  describe('custom overrides', () => {
-    it('should apply custom overrides on top of defaults', () => {
+  describe("custom overrides", () => {
+    it("should apply custom overrides on top of defaults", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'test-alias': {
+          "test-alias": {
             modelConfig: {
-              model: 'gemini-test',
+              model: "gemini-test",
               generateContentConfig: { temperature: 0.5 },
             },
           },
         },
         overrides: [
           {
-            match: { model: 'test-alias' },
+            match: { model: "test-alias" },
             modelConfig: { generateContentConfig: { temperature: 0.6 } },
           },
         ],
         customOverrides: [
           {
-            match: { model: 'test-alias' },
+            match: { model: "test-alias" },
             modelConfig: { generateContentConfig: { temperature: 0.7 } },
           },
         ],
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'test-alias' });
+      const resolved = service.getResolvedConfig({ model: "test-alias" });
 
       // Custom overrides should be appended to overrides, so they win
       expect(resolved.generateContentConfig.temperature).toBe(0.7);
     });
   });
 
-  describe('retry behavior', () => {
-    it('should apply retry-specific overrides when isRetry is true', () => {
+  describe("retry behavior", () => {
+    it("should apply retry-specific overrides when isRetry is true", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'test-model': {
+          "test-model": {
             modelConfig: {
-              model: 'gemini-test',
+              model: "gemini-test",
               generateContentConfig: {
                 temperature: 0.5,
               },
@@ -745,7 +741,7 @@ describe('ModelConfigService', () => {
         },
         overrides: [
           {
-            match: { model: 'test-model', isRetry: true },
+            match: { model: "test-model", isRetry: true },
             modelConfig: {
               generateContentConfig: {
                 temperature: 1.0,
@@ -757,23 +753,23 @@ describe('ModelConfigService', () => {
       const service = new ModelConfigService(config);
 
       // Normal request
-      const normal = service.getResolvedConfig({ model: 'test-model' });
+      const normal = service.getResolvedConfig({ model: "test-model" });
       expect(normal.generateContentConfig.temperature).toBe(0.5);
 
       // Retry request
       const retry = service.getResolvedConfig({
-        model: 'test-model',
+        model: "test-model",
         isRetry: true,
       });
       expect(retry.generateContentConfig.temperature).toBe(1.0);
     });
 
-    it('should prioritize retry overrides over generic overrides', () => {
+    it("should prioritize retry overrides over generic overrides", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'test-model': {
+          "test-model": {
             modelConfig: {
-              model: 'gemini-test',
+              model: "gemini-test",
               generateContentConfig: {
                 temperature: 0.5,
               },
@@ -783,7 +779,7 @@ describe('ModelConfigService', () => {
         overrides: [
           // Generic override for this model
           {
-            match: { model: 'test-model' },
+            match: { model: "test-model" },
             modelConfig: {
               generateContentConfig: {
                 temperature: 0.7,
@@ -792,7 +788,7 @@ describe('ModelConfigService', () => {
           },
           // Retry-specific override
           {
-            match: { model: 'test-model', isRetry: true },
+            match: { model: "test-model", isRetry: true },
             modelConfig: {
               generateContentConfig: {
                 temperature: 1.0,
@@ -804,12 +800,12 @@ describe('ModelConfigService', () => {
       const service = new ModelConfigService(config);
 
       // Normal request - hits generic override
-      const normal = service.getResolvedConfig({ model: 'test-model' });
+      const normal = service.getResolvedConfig({ model: "test-model" });
       expect(normal.generateContentConfig.temperature).toBe(0.7);
 
       // Retry request - hits retry override (more specific)
       const retry = service.getResolvedConfig({
-        model: 'test-model',
+        model: "test-model",
         isRetry: true,
       });
       expect(retry.generateContentConfig.temperature).toBe(1.0);
diff --git a/packages/gemini-cli-core/src/services/modelConfigService.ts b/packages/gemini-cli-core/src/services/modelConfigService.ts
index 0a642b7e6..2fba90ecd 100644
--- a/packages/gemini-cli-core/src/services/modelConfigService.ts
+++ b/packages/gemini-cli-core/src/services/modelConfigService.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentConfig } from '@google/genai';
+import type { GenerateContentConfig } from "@google/genai";
 
 // The primary key for the ModelConfig is the model string. However, we also
 // support a secondary key to limit the override scope, typically an agent name.
@@ -79,9 +79,7 @@ export class ModelConfigService {
     visited = new Set<string>(),
   ): ModelConfigAlias {
     if (visited.has(aliasName)) {
-      throw new Error(
-        `Circular alias dependency: ${[...visited, aliasName].join(' -> ')}`,
-      );
+      throw new Error(`Circular alias dependency: ${[...visited, aliasName].join(" -> ")}`);
     }
     visited.add(aliasName);
 
@@ -112,12 +110,7 @@ export class ModelConfigService {
     generateContentConfig: GenerateContentConfig;
   } {
     const config = this.config || {};
-    const {
-      aliases = {},
-      customAliases = {},
-      overrides = [],
-      customOverrides = [],
-    } = config;
+    const { aliases = {}, customAliases = {}, overrides = [], customOverrides = [] } = config;
     const allAliases = {
       ...aliases,
       ...customAliases,
@@ -156,14 +149,14 @@ export class ModelConfigService {
         }
 
         const isMatch = matchEntries.every(([key, value]) => {
-          if (key === 'model') {
+          if (key === "model") {
             return value === context.model || value === finalContext.model;
           }
-          if (key === 'overrideScope' && value === 'core') {
+          if (key === "overrideScope" && value === "core") {
             // The 'core' overrideScope is special. It should match if the
             // overrideScope is explicitly 'core' or if the overrideScope
             // is not specified.
-            return context.overrideScope === 'core' || !context.overrideScope;
+            return context.overrideScope === "core" || !context.overrideScope;
           }
           return finalContext[key as keyof ModelConfigKey] === value;
         });
@@ -198,10 +191,7 @@ export class ModelConfigService {
         baseModel = match.modelConfig.model;
       }
       if (match.modelConfig.generateContentConfig) {
-        resolvedConfig = this.deepMerge(
-          resolvedConfig,
-          match.modelConfig.generateContentConfig,
-        );
+        resolvedConfig = this.deepMerge(resolvedConfig, match.modelConfig.generateContentConfig);
       }
     }
 
@@ -227,7 +217,7 @@ export class ModelConfigService {
   }
 
   private isObject(item: unknown): item is Record<string, unknown> {
-    return !!item && typeof item === 'object' && !Array.isArray(item);
+    return !!item && typeof item === "object" && !Array.isArray(item);
   }
 
   private deepMerge(
diff --git a/packages/gemini-cli-core/src/services/modelConfigServiceTestUtils.ts b/packages/gemini-cli-core/src/services/modelConfigServiceTestUtils.ts
index f6d0b9fbf..219f85177 100644
--- a/packages/gemini-cli-core/src/services/modelConfigServiceTestUtils.ts
+++ b/packages/gemini-cli-core/src/services/modelConfigServiceTestUtils.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ResolvedModelConfig } from '../services/modelConfigService.js';
+import type { ResolvedModelConfig } from "../services/modelConfigService.js";
 
 /**
  * Creates a ResolvedModelConfig with sensible defaults, allowing overrides.
  */
 export const makeResolvedModelConfig = (
   model: string,
-  overrides: Partial<ResolvedModelConfig['generateContentConfig']> = {},
+  overrides: Partial<ResolvedModelConfig["generateContentConfig"]> = {},
 ): ResolvedModelConfig =>
   ({
     model,
diff --git a/packages/gemini-cli-core/src/services/sessionSummaryService.test.ts b/packages/gemini-cli-core/src/services/sessionSummaryService.test.ts
index c3362a63c..7df956f8c 100644
--- a/packages/gemini-cli-core/src/services/sessionSummaryService.test.ts
+++ b/packages/gemini-cli-core/src/services/sessionSummaryService.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { SessionSummaryService } from './sessionSummaryService.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { MessageRecord } from './chatRecordingService.js';
-import type { GenerateContentResponse } from '@google/genai';
+import type { GenerateContentResponse } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { MessageRecord } from "./chatRecordingService.js";
+import { SessionSummaryService } from "./sessionSummaryService.js";
 
-describe('SessionSummaryService', () => {
+describe("SessionSummaryService", () => {
   let service: SessionSummaryService;
   let mockBaseLlmClient: BaseLlmClient;
   let mockGenerateContent: ReturnType<typeof vi.fn>;
@@ -24,7 +24,7 @@ describe('SessionSummaryService', () => {
       candidates: [
         {
           content: {
-            parts: [{ text: 'Add dark mode to the app' }],
+            parts: [{ text: "Add dark mode to the app" }],
           },
         },
       ],
@@ -42,22 +42,22 @@ describe('SessionSummaryService', () => {
     vi.restoreAllMocks();
   });
 
-  describe('Basic Functionality', () => {
-    it('should generate summary for valid conversation', async () => {
+  describe("Basic Functionality", () => {
+    it("should generate summary for valid conversation", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'How do I add dark mode to my app?' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "How do I add dark mode to my app?" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini',
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "gemini",
           content: [
             {
-              text: 'To add dark mode, you need to create a theme provider and toggle state...',
+              text: "To add dark mode, you need to create a theme provider and toggle state...",
             },
           ],
         },
@@ -65,46 +65,46 @@ describe('SessionSummaryService', () => {
 
       const summary = await service.generateSummary({ messages });
 
-      expect(summary).toBe('Add dark mode to the app');
+      expect(summary).toBe("Add dark mode to the app");
       expect(mockGenerateContent).toHaveBeenCalledTimes(1);
       expect(mockGenerateContent).toHaveBeenCalledWith(
         expect.objectContaining({
-          modelConfigKey: { model: 'summarizer-default' },
+          modelConfigKey: { model: "summarizer-default" },
           contents: expect.arrayContaining([
             expect.objectContaining({
-              role: 'user',
+              role: "user",
               parts: expect.arrayContaining([
                 expect.objectContaining({
-                  text: expect.stringContaining('User: How do I add dark mode'),
+                  text: expect.stringContaining("User: How do I add dark mode"),
                 }),
               ]),
             }),
           ]),
-          promptId: 'session-summary-generation',
+          promptId: "session-summary-generation",
         }),
       );
     });
 
-    it('should return null for empty messages array', async () => {
+    it("should return null for empty messages array", async () => {
       const summary = await service.generateSummary({ messages: [] });
 
       expect(summary).toBeNull();
       expect(mockGenerateContent).not.toHaveBeenCalled();
     });
 
-    it('should return null when all messages have empty content', async () => {
+    it("should return null when all messages have empty content", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: '   ' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "   " }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini',
-          content: [{ text: '' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "gemini",
+          content: [{ text: "" }],
         },
       ];
 
@@ -114,11 +114,11 @@ describe('SessionSummaryService', () => {
       expect(mockGenerateContent).not.toHaveBeenCalled();
     });
 
-    it('should handle maxMessages limit correctly', async () => {
+    it("should handle maxMessages limit correctly", async () => {
       const messages: MessageRecord[] = Array.from({ length: 30 }, (_, i) => ({
         id: `${i}`,
-        timestamp: '2025-12-03T00:00:00Z',
-        type: i % 2 === 0 ? ('user' as const) : ('gemini' as const),
+        timestamp: "2025-12-03T00:00:00Z",
+        type: i % 2 === 0 ? ("user" as const) : ("gemini" as const),
         content: [{ text: `Message ${i}` }],
       }));
 
@@ -134,20 +134,20 @@ describe('SessionSummaryService', () => {
     });
   });
 
-  describe('Message Type Filtering', () => {
-    it('should include only user and gemini messages', async () => {
+  describe("Message Type Filtering", () => {
+    it("should include only user and gemini messages", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'User message' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "User message" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini',
-          content: [{ text: 'Gemini response' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "gemini",
+          content: [{ text: "Gemini response" }],
         },
       ];
 
@@ -157,29 +157,29 @@ describe('SessionSummaryService', () => {
       const callArgs = mockGenerateContent.mock.calls[0][0];
       const promptText = callArgs.contents[0].parts[0].text;
 
-      expect(promptText).toContain('User: User message');
-      expect(promptText).toContain('Assistant: Gemini response');
+      expect(promptText).toContain("User: User message");
+      expect(promptText).toContain("Assistant: Gemini response");
     });
 
-    it('should exclude info messages', async () => {
+    it("should exclude info messages", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'User message' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "User message" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'info',
-          content: [{ text: 'Info message should be excluded' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "info",
+          content: [{ text: "Info message should be excluded" }],
         },
         {
-          id: '3',
-          timestamp: '2025-12-03T00:02:00Z',
-          type: 'gemini',
-          content: [{ text: 'Gemini response' }],
+          id: "3",
+          timestamp: "2025-12-03T00:02:00Z",
+          type: "gemini",
+          content: [{ text: "Gemini response" }],
         },
       ];
 
@@ -189,30 +189,30 @@ describe('SessionSummaryService', () => {
       const callArgs = mockGenerateContent.mock.calls[0][0];
       const promptText = callArgs.contents[0].parts[0].text;
 
-      expect(promptText).toContain('User: User message');
-      expect(promptText).toContain('Assistant: Gemini response');
-      expect(promptText).not.toContain('Info message');
+      expect(promptText).toContain("User: User message");
+      expect(promptText).toContain("Assistant: Gemini response");
+      expect(promptText).not.toContain("Info message");
     });
 
-    it('should exclude error messages', async () => {
+    it("should exclude error messages", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'User message' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "User message" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'error',
-          content: [{ text: 'Error: something went wrong' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "error",
+          content: [{ text: "Error: something went wrong" }],
         },
         {
-          id: '3',
-          timestamp: '2025-12-03T00:02:00Z',
-          type: 'gemini',
-          content: [{ text: 'Gemini response' }],
+          id: "3",
+          timestamp: "2025-12-03T00:02:00Z",
+          type: "gemini",
+          content: [{ text: "Gemini response" }],
         },
       ];
 
@@ -222,28 +222,28 @@ describe('SessionSummaryService', () => {
       const callArgs = mockGenerateContent.mock.calls[0][0];
       const promptText = callArgs.contents[0].parts[0].text;
 
-      expect(promptText).not.toContain('Error: something went wrong');
+      expect(promptText).not.toContain("Error: something went wrong");
     });
 
-    it('should exclude warning messages', async () => {
+    it("should exclude warning messages", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'User message' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "User message" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'warning',
-          content: [{ text: 'Warning: deprecated API' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "warning",
+          content: [{ text: "Warning: deprecated API" }],
         },
         {
-          id: '3',
-          timestamp: '2025-12-03T00:02:00Z',
-          type: 'gemini',
-          content: [{ text: 'Gemini response' }],
+          id: "3",
+          timestamp: "2025-12-03T00:02:00Z",
+          type: "gemini",
+          content: [{ text: "Gemini response" }],
         },
       ];
 
@@ -253,40 +253,40 @@ describe('SessionSummaryService', () => {
       const callArgs = mockGenerateContent.mock.calls[0][0];
       const promptText = callArgs.contents[0].parts[0].text;
 
-      expect(promptText).not.toContain('Warning: deprecated API');
+      expect(promptText).not.toContain("Warning: deprecated API");
     });
 
-    it('should handle mixed message types correctly', async () => {
+    it("should handle mixed message types correctly", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'info',
-          content: [{ text: 'System info' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "info",
+          content: [{ text: "System info" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'user',
-          content: [{ text: 'User question' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "user",
+          content: [{ text: "User question" }],
         },
         {
-          id: '3',
-          timestamp: '2025-12-03T00:02:00Z',
-          type: 'error',
-          content: [{ text: 'Error occurred' }],
+          id: "3",
+          timestamp: "2025-12-03T00:02:00Z",
+          type: "error",
+          content: [{ text: "Error occurred" }],
         },
         {
-          id: '4',
-          timestamp: '2025-12-03T00:03:00Z',
-          type: 'gemini',
-          content: [{ text: 'Gemini answer' }],
+          id: "4",
+          timestamp: "2025-12-03T00:03:00Z",
+          type: "gemini",
+          content: [{ text: "Gemini answer" }],
         },
         {
-          id: '5',
-          timestamp: '2025-12-03T00:04:00Z',
-          type: 'warning',
-          content: [{ text: 'Warning message' }],
+          id: "5",
+          timestamp: "2025-12-03T00:04:00Z",
+          type: "warning",
+          content: [{ text: "Warning message" }],
         },
       ];
 
@@ -296,32 +296,32 @@ describe('SessionSummaryService', () => {
       const callArgs = mockGenerateContent.mock.calls[0][0];
       const promptText = callArgs.contents[0].parts[0].text;
 
-      expect(promptText).toContain('User: User question');
-      expect(promptText).toContain('Assistant: Gemini answer');
-      expect(promptText).not.toContain('System info');
-      expect(promptText).not.toContain('Error occurred');
-      expect(promptText).not.toContain('Warning message');
+      expect(promptText).toContain("User: User question");
+      expect(promptText).toContain("Assistant: Gemini answer");
+      expect(promptText).not.toContain("System info");
+      expect(promptText).not.toContain("Error occurred");
+      expect(promptText).not.toContain("Warning message");
     });
 
-    it('should return null when only system messages present', async () => {
+    it("should return null when only system messages present", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'info',
-          content: [{ text: 'Info message' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "info",
+          content: [{ text: "Info message" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'error',
-          content: [{ text: 'Error message' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "error",
+          content: [{ text: "Error message" }],
         },
         {
-          id: '3',
-          timestamp: '2025-12-03T00:02:00Z',
-          type: 'warning',
-          content: [{ text: 'Warning message' }],
+          id: "3",
+          timestamp: "2025-12-03T00:02:00Z",
+          type: "warning",
+          content: [{ text: "Warning message" }],
         },
       ];
 
@@ -332,8 +332,8 @@ describe('SessionSummaryService', () => {
     });
   });
 
-  describe('Timeout and Abort Handling', () => {
-    it('should timeout after specified duration', async () => {
+  describe("Timeout and Abort Handling", () => {
+    it("should timeout after specified duration", async () => {
       // Mock implementation that respects abort signal
       mockGenerateContent.mockImplementation(
         ({ abortSignal }) =>
@@ -341,15 +341,15 @@ describe('SessionSummaryService', () => {
             const timeoutId = setTimeout(
               () =>
                 resolve({
-                  candidates: [{ content: { parts: [{ text: 'Summary' }] } }],
+                  candidates: [{ content: { parts: [{ text: "Summary" }] } }],
                 }),
               10000,
             );
 
-            abortSignal?.addEventListener('abort', () => {
+            abortSignal?.addEventListener("abort", () => {
               clearTimeout(timeoutId);
-              const abortError = new Error('This operation was aborted');
-              abortError.name = 'AbortError';
+              const abortError = new Error("This operation was aborted");
+              abortError.name = "AbortError";
               reject(abortError);
             });
           }),
@@ -357,10 +357,10 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'Hello' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "Hello" }],
         },
       ];
 
@@ -377,17 +377,17 @@ describe('SessionSummaryService', () => {
       expect(summary).toBeNull();
     });
 
-    it('should detect AbortError by name only (not message)', async () => {
-      const abortError = new Error('Different abort message');
-      abortError.name = 'AbortError';
+    it("should detect AbortError by name only (not message)", async () => {
+      const abortError = new Error("Different abort message");
+      abortError.name = "AbortError";
       mockGenerateContent.mockRejectedValue(abortError);
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'Hello' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "Hello" }],
         },
       ];
 
@@ -397,15 +397,15 @@ describe('SessionSummaryService', () => {
       // Should handle it gracefully without throwing
     });
 
-    it('should handle API errors gracefully', async () => {
-      mockGenerateContent.mockRejectedValue(new Error('API Error'));
+    it("should handle API errors gracefully", async () => {
+      mockGenerateContent.mockRejectedValue(new Error("API Error"));
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'Hello' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "Hello" }],
         },
       ];
 
@@ -414,12 +414,12 @@ describe('SessionSummaryService', () => {
       expect(summary).toBeNull();
     });
 
-    it('should handle empty response from LLM', async () => {
+    it("should handle empty response from LLM", async () => {
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: '' }],
+              parts: [{ text: "" }],
             },
           },
         ],
@@ -427,10 +427,10 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'Hello' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "Hello" }],
         },
       ];
 
@@ -440,15 +440,15 @@ describe('SessionSummaryService', () => {
     });
   });
 
-  describe('Text Processing', () => {
-    it('should clean newlines and extra whitespace', async () => {
+  describe("Text Processing", () => {
+    it("should clean newlines and extra whitespace", async () => {
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
               parts: [
                 {
-                  text: 'Add dark mode\n\nto   the   app',
+                  text: "Add dark mode\n\nto   the   app",
                 },
               ],
             },
@@ -458,19 +458,19 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'Hello' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "Hello" }],
         },
       ];
 
       const summary = await service.generateSummary({ messages });
 
-      expect(summary).toBe('Add dark mode to the app');
+      expect(summary).toBe("Add dark mode to the app");
     });
 
-    it('should remove surrounding quotes', async () => {
+    it("should remove surrounding quotes", async () => {
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
@@ -483,32 +483,32 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'Hello' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "Hello" }],
         },
       ];
 
       const summary = await service.generateSummary({ messages });
 
-      expect(summary).toBe('Add dark mode to the app');
+      expect(summary).toBe("Add dark mode to the app");
     });
 
-    it('should handle messages longer than 500 chars', async () => {
-      const longMessage = 'a'.repeat(1000);
+    it("should handle messages longer than 500 chars", async () => {
+      const longMessage = "a".repeat(1000);
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
           content: [{ text: longMessage }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini',
-          content: [{ text: 'Response' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "gemini",
+          content: [{ text: "Response" }],
         },
       ];
 
@@ -519,25 +519,25 @@ describe('SessionSummaryService', () => {
       const promptText = callArgs.contents[0].parts[0].text;
 
       // Should be truncated to ~500 chars + "..."
-      expect(promptText).toContain('...');
-      expect(promptText).not.toContain('a'.repeat(600));
+      expect(promptText).toContain("...");
+      expect(promptText).not.toContain("a".repeat(600));
     });
 
-    it('should preserve important content in truncation', async () => {
+    it("should preserve important content in truncation", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'How do I add dark mode?' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "How do I add dark mode?" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini',
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "gemini",
           content: [
             {
-              text: 'Here is a detailed explanation...',
+              text: "Here is a detailed explanation...",
             },
           ],
         },
@@ -550,17 +550,17 @@ describe('SessionSummaryService', () => {
       const promptText = callArgs.contents[0].parts[0].text;
 
       // User question should be preserved
-      expect(promptText).toContain('User: How do I add dark mode?');
-      expect(promptText).toContain('Assistant: Here is a detailed explanation');
+      expect(promptText).toContain("User: How do I add dark mode?");
+      expect(promptText).toContain("Assistant: Here is a detailed explanation");
     });
   });
 
-  describe('Sliding Window Message Selection', () => {
-    it('should return all messages when fewer than 20 exist', async () => {
+  describe("Sliding Window Message Selection", () => {
+    it("should return all messages when fewer than 20 exist", async () => {
       const messages = Array.from({ length: 5 }, (_, i) => ({
         id: `${i}`,
-        timestamp: '2025-12-03T00:00:00Z',
-        type: i % 2 === 0 ? ('user' as const) : ('gemini' as const),
+        timestamp: "2025-12-03T00:00:00Z",
+        type: i % 2 === 0 ? ("user" as const) : ("gemini" as const),
         content: [{ text: `Message ${i}` }],
       }));
 
@@ -573,11 +573,11 @@ describe('SessionSummaryService', () => {
       expect(messageCount).toBe(5);
     });
 
-    it('should select first 10 + last 10 from 50 messages', async () => {
+    it("should select first 10 + last 10 from 50 messages", async () => {
       const messages = Array.from({ length: 50 }, (_, i) => ({
         id: `${i}`,
-        timestamp: '2025-12-03T00:00:00Z',
-        type: i % 2 === 0 ? ('user' as const) : ('gemini' as const),
+        timestamp: "2025-12-03T00:00:00Z",
+        type: i % 2 === 0 ? ("user" as const) : ("gemini" as const),
         content: [{ text: `Message ${i}` }],
       }));
 
@@ -587,25 +587,25 @@ describe('SessionSummaryService', () => {
       const promptText = callArgs.contents[0].parts[0].text;
 
       // Should include first 10
-      expect(promptText).toContain('Message 0');
-      expect(promptText).toContain('Message 9');
+      expect(promptText).toContain("Message 0");
+      expect(promptText).toContain("Message 9");
 
       // Should skip middle
-      expect(promptText).not.toContain('Message 25');
+      expect(promptText).not.toContain("Message 25");
 
       // Should include last 10
-      expect(promptText).toContain('Message 40');
-      expect(promptText).toContain('Message 49');
+      expect(promptText).toContain("Message 40");
+      expect(promptText).toContain("Message 49");
 
       const messageCount = (promptText.match(/Message \d+/g) || []).length;
       expect(messageCount).toBe(20);
     });
 
-    it('should return all messages when exactly 20 exist', async () => {
+    it("should return all messages when exactly 20 exist", async () => {
       const messages = Array.from({ length: 20 }, (_, i) => ({
         id: `${i}`,
-        timestamp: '2025-12-03T00:00:00Z',
-        type: i % 2 === 0 ? ('user' as const) : ('gemini' as const),
+        timestamp: "2025-12-03T00:00:00Z",
+        type: i % 2 === 0 ? ("user" as const) : ("gemini" as const),
         content: [{ text: `Message ${i}` }],
       }));
 
@@ -618,11 +618,11 @@ describe('SessionSummaryService', () => {
       expect(messageCount).toBe(20);
     });
 
-    it('should preserve message ordering in sliding window', async () => {
+    it("should preserve message ordering in sliding window", async () => {
       const messages = Array.from({ length: 30 }, (_, i) => ({
         id: `${i}`,
-        timestamp: '2025-12-03T00:00:00Z',
-        type: i % 2 === 0 ? ('user' as const) : ('gemini' as const),
+        timestamp: "2025-12-03T00:00:00Z",
+        type: i % 2 === 0 ? ("user" as const) : ("gemini" as const),
         content: [{ text: `Message ${i}` }],
       }));
 
@@ -632,7 +632,7 @@ describe('SessionSummaryService', () => {
       const promptText = callArgs.contents[0].parts[0].text;
 
       const matches = promptText.match(/Message (\d+)/g) || [];
-      const indices = matches.map((m: string) => parseInt(m.split(' ')[1], 10));
+      const indices = matches.map((m: string) => parseInt(m.split(" ")[1], 10));
 
       // Verify ordering is preserved
       for (let i = 1; i < indices.length; i++) {
@@ -640,33 +640,33 @@ describe('SessionSummaryService', () => {
       }
     });
 
-    it('should not count system messages when calculating window', async () => {
+    it("should not count system messages when calculating window", async () => {
       const messages: MessageRecord[] = [
         // First 10 user/gemini messages
         ...Array.from({ length: 10 }, (_, i) => ({
           id: `${i}`,
-          timestamp: '2025-12-03T00:00:00Z',
-          type: i % 2 === 0 ? ('user' as const) : ('gemini' as const),
+          timestamp: "2025-12-03T00:00:00Z",
+          type: i % 2 === 0 ? ("user" as const) : ("gemini" as const),
           content: [{ text: `Message ${i}` }],
         })),
         // System messages (should be filtered out)
         {
-          id: 'info1',
-          timestamp: '2025-12-03T00:10:00Z',
-          type: 'info' as const,
-          content: [{ text: 'Info' }],
+          id: "info1",
+          timestamp: "2025-12-03T00:10:00Z",
+          type: "info" as const,
+          content: [{ text: "Info" }],
         },
         {
-          id: 'warn1',
-          timestamp: '2025-12-03T00:11:00Z',
-          type: 'warning' as const,
-          content: [{ text: 'Warning' }],
+          id: "warn1",
+          timestamp: "2025-12-03T00:11:00Z",
+          type: "warning" as const,
+          content: [{ text: "Warning" }],
         },
         // Last 40 user/gemini messages
         ...Array.from({ length: 40 }, (_, i) => ({
           id: `${i + 10}`,
-          timestamp: '2025-12-03T00:12:00Z',
-          type: i % 2 === 0 ? ('user' as const) : ('gemini' as const),
+          timestamp: "2025-12-03T00:12:00Z",
+          type: i % 2 === 0 ? ("user" as const) : ("gemini" as const),
           content: [{ text: `Message ${i + 10}` }],
         })),
       ];
@@ -677,33 +677,33 @@ describe('SessionSummaryService', () => {
       const promptText = callArgs.contents[0].parts[0].text;
 
       // Should include early messages
-      expect(promptText).toContain('Message 0');
-      expect(promptText).toContain('Message 9');
+      expect(promptText).toContain("Message 0");
+      expect(promptText).toContain("Message 9");
 
       // Should include late messages
-      expect(promptText).toContain('Message 40');
-      expect(promptText).toContain('Message 49');
+      expect(promptText).toContain("Message 40");
+      expect(promptText).toContain("Message 49");
 
       // Should not include system messages
-      expect(promptText).not.toContain('Info');
-      expect(promptText).not.toContain('Warning');
+      expect(promptText).not.toContain("Info");
+      expect(promptText).not.toContain("Warning");
     });
   });
 
-  describe('Edge Cases', () => {
-    it('should handle conversation with only user messages', async () => {
+  describe("Edge Cases", () => {
+    it("should handle conversation with only user messages", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'First question' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "First question" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'user',
-          content: [{ text: 'Second question' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "user",
+          content: [{ text: "Second question" }],
         },
       ];
 
@@ -713,19 +713,19 @@ describe('SessionSummaryService', () => {
       expect(mockGenerateContent).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle conversation with only gemini messages', async () => {
+    it("should handle conversation with only gemini messages", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'gemini',
-          content: [{ text: 'First response' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "gemini",
+          content: [{ text: "First response" }],
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini',
-          content: [{ text: 'Second response' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "gemini",
+          content: [{ text: "Second response" }],
         },
       ];
 
@@ -735,16 +735,16 @@ describe('SessionSummaryService', () => {
       expect(mockGenerateContent).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle very long individual messages (>500 chars)', async () => {
+    it("should handle very long individual messages (>500 chars)", async () => {
       const longMessage =
         `This is a very long message that contains a lot of text and definitely exceeds the 500 character limit. `.repeat(
           10,
         );
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
           content: [{ text: longMessage }],
         },
       ];
@@ -756,18 +756,18 @@ describe('SessionSummaryService', () => {
       const promptText = callArgs.contents[0].parts[0].text;
 
       // Should contain the truncation marker
-      expect(promptText).toContain('...');
+      expect(promptText).toContain("...");
     });
 
-    it('should handle messages with special characters', async () => {
+    it("should handle messages with special characters", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
           content: [
             {
-              text: 'How to use <Component> with props={value} & state?',
+              text: "How to use <Component> with props={value} & state?",
             },
           ],
         },
@@ -779,19 +779,19 @@ describe('SessionSummaryService', () => {
       expect(mockGenerateContent).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle malformed message content', async () => {
+    it("should handle malformed message content", async () => {
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
           content: [], // Empty parts array
         },
         {
-          id: '2',
-          timestamp: '2025-12-03T00:01:00Z',
-          type: 'gemini',
-          content: [{ text: 'Valid response' }],
+          id: "2",
+          timestamp: "2025-12-03T00:01:00Z",
+          type: "gemini",
+          content: [{ text: "Valid response" }],
         },
       ];
 
@@ -802,13 +802,13 @@ describe('SessionSummaryService', () => {
     });
   });
 
-  describe('Internationalization Support', () => {
-    it('should preserve international characters (Chinese)', async () => {
+  describe("Internationalization Support", () => {
+    it("should preserve international characters (Chinese)", async () => {
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: '添加深色模式到应用' }],
+              parts: [{ text: "添加深色模式到应用" }],
             },
           },
         ],
@@ -816,24 +816,24 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'How do I add dark mode?' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "How do I add dark mode?" }],
         },
       ];
 
       const summary = await service.generateSummary({ messages });
 
-      expect(summary).toBe('添加深色模式到应用');
+      expect(summary).toBe("添加深色模式到应用");
     });
 
-    it('should preserve international characters (Arabic)', async () => {
+    it("should preserve international characters (Arabic)", async () => {
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: 'إضافة الوضع الداكن' }],
+              parts: [{ text: "إضافة الوضع الداكن" }],
             },
           },
         ],
@@ -841,24 +841,24 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'How do I add dark mode?' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "How do I add dark mode?" }],
         },
       ];
 
       const summary = await service.generateSummary({ messages });
 
-      expect(summary).toBe('إضافة الوضع الداكن');
+      expect(summary).toBe("إضافة الوضع الداكن");
     });
 
-    it('should preserve accented characters', async () => {
+    it("should preserve accented characters", async () => {
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: 'Añadir modo oscuro à la aplicación' }],
+              parts: [{ text: "Añadir modo oscuro à la aplicación" }],
             },
           },
         ],
@@ -866,24 +866,24 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'How do I add dark mode?' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "How do I add dark mode?" }],
         },
       ];
 
       const summary = await service.generateSummary({ messages });
 
-      expect(summary).toBe('Añadir modo oscuro à la aplicación');
+      expect(summary).toBe("Añadir modo oscuro à la aplicación");
     });
 
-    it('should preserve emojis in summaries', async () => {
+    it("should preserve emojis in summaries", async () => {
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: '🌙 Add dark mode 🎨 to the app ✨' }],
+              parts: [{ text: "🌙 Add dark mode 🎨 to the app ✨" }],
             },
           },
         ],
@@ -891,29 +891,29 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'How do I add dark mode?' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "How do I add dark mode?" }],
         },
       ];
 
       const summary = await service.generateSummary({ messages });
 
       // Emojis are preserved
-      expect(summary).toBe('🌙 Add dark mode 🎨 to the app ✨');
-      expect(summary).toContain('🌙');
-      expect(summary).toContain('🎨');
-      expect(summary).toContain('✨');
+      expect(summary).toBe("🌙 Add dark mode 🎨 to the app ✨");
+      expect(summary).toContain("🌙");
+      expect(summary).toContain("🎨");
+      expect(summary).toContain("✨");
     });
 
-    it('should preserve zero-width characters for language rendering', async () => {
+    it("should preserve zero-width characters for language rendering", async () => {
       // Arabic with Zero-Width Joiner (ZWJ) for proper ligatures
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: 'كلمة\u200Dمتصلة' }], // Contains ZWJ
+              parts: [{ text: "كلمة\u200Dمتصلة" }], // Contains ZWJ
             },
           },
         ],
@@ -921,18 +921,18 @@ describe('SessionSummaryService', () => {
 
       const messages: MessageRecord[] = [
         {
-          id: '1',
-          timestamp: '2025-12-03T00:00:00Z',
-          type: 'user',
-          content: [{ text: 'Test' }],
+          id: "1",
+          timestamp: "2025-12-03T00:00:00Z",
+          type: "user",
+          content: [{ text: "Test" }],
         },
       ];
 
       const summary = await service.generateSummary({ messages });
 
       // ZWJ is preserved (it's not considered whitespace)
-      expect(summary).toBe('كلمة\u200Dمتصلة');
-      expect(summary).toContain('\u200D'); // ZWJ should be preserved
+      expect(summary).toBe("كلمة\u200Dمتصلة");
+      expect(summary).toContain("\u200D"); // ZWJ should be preserved
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/services/sessionSummaryService.ts b/packages/gemini-cli-core/src/services/sessionSummaryService.ts
index 98ffd66fc..79bada48f 100644
--- a/packages/gemini-cli-core/src/services/sessionSummaryService.ts
+++ b/packages/gemini-cli-core/src/services/sessionSummaryService.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageRecord } from './chatRecordingService.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import { partListUnionToString } from '../core/geminiRequest.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import type { Content } from '@google/genai';
-import { getResponseText } from '../utils/partUtils.js';
+import type { Content } from "@google/genai";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { partListUnionToString } from "../core/geminiRequest.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getResponseText } from "../utils/partUtils.js";
+import type { MessageRecord } from "./chatRecordingService.js";
 
 const DEFAULT_MAX_MESSAGES = 20;
 const DEFAULT_TIMEOUT_MS = 5000;
@@ -50,20 +50,14 @@ export class SessionSummaryService {
    * Generate a 1-line summary of a chat session focusing on user intent.
    * Returns null if generation fails for any reason.
    */
-  async generateSummary(
-    options: GenerateSummaryOptions,
-  ): Promise<string | null> {
-    const {
-      messages,
-      maxMessages = DEFAULT_MAX_MESSAGES,
-      timeout = DEFAULT_TIMEOUT_MS,
-    } = options;
+  async generateSummary(options: GenerateSummaryOptions): Promise<string | null> {
+    const { messages, maxMessages = DEFAULT_MAX_MESSAGES, timeout = DEFAULT_TIMEOUT_MS } = options;
 
     try {
       // Filter to user/gemini messages only (exclude system messages)
       const filteredMessages = messages.filter((msg) => {
         // Skip system messages (info, error, warning)
-        if (msg.type !== 'user' && msg.type !== 'gemini') {
+        if (msg.type !== "user" && msg.type !== "gemini") {
           return false;
         }
         const content = partListUnionToString(msg.content);
@@ -85,25 +79,25 @@ export class SessionSummaryService {
       }
 
       if (relevantMessages.length === 0) {
-        debugLogger.debug('[SessionSummary] No messages to summarize');
+        debugLogger.debug("[SessionSummary] No messages to summarize");
         return null;
       }
 
       // Format conversation for the prompt
       const conversationText = relevantMessages
         .map((msg) => {
-          const role = msg.type === 'user' ? 'User' : 'Assistant';
+          const role = msg.type === "user" ? "User" : "Assistant";
           const content = partListUnionToString(msg.content);
           // Truncate very long messages to avoid token limit
           const truncated =
             content.length > MAX_MESSAGE_LENGTH
-              ? content.slice(0, MAX_MESSAGE_LENGTH) + '...'
+              ? content.slice(0, MAX_MESSAGE_LENGTH) + "..."
               : content;
           return `${role}: ${truncated}`;
         })
-        .join('\n\n');
+        .join("\n\n");
 
-      const prompt = SUMMARY_PROMPT.replace('{conversation}', conversationText);
+      const prompt = SUMMARY_PROMPT.replace("{conversation}", conversationText);
 
       // Create abort controller with timeout
       const abortController = new AbortController();
@@ -114,33 +108,33 @@ export class SessionSummaryService {
       try {
         const contents: Content[] = [
           {
-            role: 'user',
+            role: "user",
             parts: [{ text: prompt }],
           },
         ];
 
         const response = await this.baseLlmClient.generateContent({
-          modelConfigKey: { model: 'summarizer-default' },
+          modelConfigKey: { model: "summarizer-default" },
           contents,
           abortSignal: abortController.signal,
-          promptId: 'session-summary-generation',
+          promptId: "session-summary-generation",
         });
 
         const summary = getResponseText(response);
 
         if (!summary || summary.trim().length === 0) {
-          debugLogger.debug('[SessionSummary] Empty summary returned');
+          debugLogger.debug("[SessionSummary] Empty summary returned");
           return null;
         }
 
         // Clean the summary
         let cleanedSummary = summary
-          .replace(/\n+/g, ' ') // Collapse newlines to spaces
-          .replace(/\s+/g, ' ') // Normalize whitespace
+          .replace(/\n+/g, " ") // Collapse newlines to spaces
+          .replace(/\s+/g, " ") // Normalize whitespace
           .trim(); // Trim after all processing
 
         // Remove quotes if the model added them
-        cleanedSummary = cleanedSummary.replace(/^["']|["']$/g, '');
+        cleanedSummary = cleanedSummary.replace(/^["']|["']$/g, "");
 
         debugLogger.debug(`[SessionSummary] Generated: "${cleanedSummary}"`);
         return cleanedSummary;
@@ -149,8 +143,8 @@ export class SessionSummaryService {
       }
     } catch (error) {
       // Log the error but don't throw - we want graceful degradation
-      if (error instanceof Error && error.name === 'AbortError') {
-        debugLogger.debug('[SessionSummary] Timeout generating summary');
+      if (error instanceof Error && error.name === "AbortError") {
+        debugLogger.debug("[SessionSummary] Timeout generating summary");
       } else {
         debugLogger.debug(
           `[SessionSummary] Error generating summary: ${error instanceof Error ? error.message : String(error)}`,
diff --git a/packages/gemini-cli-core/src/services/sessionSummaryUtils.test.ts b/packages/gemini-cli-core/src/services/sessionSummaryUtils.test.ts
index 2314b7ca0..a4dc22238 100644
--- a/packages/gemini-cli-core/src/services/sessionSummaryUtils.test.ts
+++ b/packages/gemini-cli-core/src/services/sessionSummaryUtils.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { generateSummary, getPreviousSession } from './sessionSummaryUtils.js';
-import type { Config } from '../config/config.js';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { generateSummary, getPreviousSession } from "./sessionSummaryUtils.js";
 
 // Mock fs/promises
-vi.mock('node:fs/promises');
+vi.mock("node:fs/promises");
 const mockReaddir = fs.readdir as unknown as ReturnType<typeof vi.fn>;
 
 // Mock the SessionSummaryService module
-vi.mock('./sessionSummaryService.js', () => ({
+vi.mock("./sessionSummaryService.js", () => ({
   SessionSummaryService: vi.fn().mockImplementation(() => ({
     generateSummary: vi.fn(),
   })),
 }));
 
 // Mock the BaseLlmClient module
-vi.mock('../core/baseLlmClient.js', () => ({
+vi.mock("../core/baseLlmClient.js", () => ({
   BaseLlmClient: vi.fn(),
 }));
 
@@ -33,17 +33,17 @@ function createSessionWithUserMessages(
   options: { summary?: string; sessionId?: string } = {},
 ) {
   return JSON.stringify({
-    sessionId: options.sessionId ?? 'session-id',
+    sessionId: options.sessionId ?? "session-id",
     summary: options.summary,
     messages: Array.from({ length: count }, (_, i) => ({
       id: String(i + 1),
-      type: 'user',
+      type: "user",
       content: [{ text: `Message ${i + 1}` }],
     })),
   });
 }
 
-describe('sessionSummaryUtils', () => {
+describe("sessionSummaryUtils", () => {
   let mockConfig: Config;
   let mockContentGenerator: ContentGenerator;
   let mockGenerateSummary: ReturnType<typeof vi.fn>;
@@ -58,20 +58,16 @@ describe('sessionSummaryUtils', () => {
     mockConfig = {
       getContentGenerator: vi.fn().mockReturnValue(mockContentGenerator),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project"),
       },
     } as unknown as Config;
 
     // Setup mock generateSummary function
-    mockGenerateSummary = vi.fn().mockResolvedValue('Add dark mode to the app');
+    mockGenerateSummary = vi.fn().mockResolvedValue("Add dark mode to the app");
 
     // Import the mocked module to access the constructor
-    const { SessionSummaryService } = await import(
-      './sessionSummaryService.js'
-    );
-    (
-      SessionSummaryService as unknown as ReturnType<typeof vi.fn>
-    ).mockImplementation(() => ({
+    const { SessionSummaryService } = await import("./sessionSummaryService.js");
+    (SessionSummaryService as unknown as ReturnType<typeof vi.fn>).mockImplementation(() => ({
       generateSummary: mockGenerateSummary,
     }));
   });
@@ -80,16 +76,16 @@ describe('sessionSummaryUtils', () => {
     vi.restoreAllMocks();
   });
 
-  describe('getPreviousSession', () => {
-    it('should return null if chats directory does not exist', async () => {
-      vi.mocked(fs.access).mockRejectedValue(new Error('ENOENT'));
+  describe("getPreviousSession", () => {
+    it("should return null if chats directory does not exist", async () => {
+      vi.mocked(fs.access).mockRejectedValue(new Error("ENOENT"));
 
       const result = await getPreviousSession(mockConfig);
 
       expect(result).toBeNull();
     });
 
-    it('should return null if no session files exist', async () => {
+    it("should return null if no session files exist", async () => {
       vi.mocked(fs.access).mockResolvedValue(undefined);
       mockReaddir.mockResolvedValue([]);
 
@@ -98,11 +94,11 @@ describe('sessionSummaryUtils', () => {
       expect(result).toBeNull();
     });
 
-    it('should return null if most recent session already has summary', async () => {
+    it("should return null if most recent session already has summary", async () => {
       vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
+      mockReaddir.mockResolvedValue(["session-2024-01-01T10-00-abc12345.json"]);
       vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(5, { summary: 'Existing summary' }),
+        createSessionWithUserMessages(5, { summary: "Existing summary" }),
       );
 
       const result = await getPreviousSession(mockConfig);
@@ -110,61 +106,47 @@ describe('sessionSummaryUtils', () => {
       expect(result).toBeNull();
     });
 
-    it('should return null if most recent session has 1 or fewer user messages', async () => {
+    it("should return null if most recent session has 1 or fewer user messages", async () => {
       vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(1),
-      );
+      mockReaddir.mockResolvedValue(["session-2024-01-01T10-00-abc12345.json"]);
+      vi.mocked(fs.readFile).mockResolvedValue(createSessionWithUserMessages(1));
 
       const result = await getPreviousSession(mockConfig);
 
       expect(result).toBeNull();
     });
 
-    it('should return path if most recent session has more than 1 user message and no summary', async () => {
+    it("should return path if most recent session has more than 1 user message and no summary", async () => {
       vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
-      );
+      mockReaddir.mockResolvedValue(["session-2024-01-01T10-00-abc12345.json"]);
+      vi.mocked(fs.readFile).mockResolvedValue(createSessionWithUserMessages(2));
 
       const result = await getPreviousSession(mockConfig);
 
       expect(result).toBe(
-        path.join(
-          '/tmp/project',
-          'chats',
-          'session-2024-01-01T10-00-abc12345.json',
-        ),
+        path.join("/tmp/project", "chats", "session-2024-01-01T10-00-abc12345.json"),
       );
     });
 
-    it('should select most recently created session by filename', async () => {
+    it("should select most recently created session by filename", async () => {
       vi.mocked(fs.access).mockResolvedValue(undefined);
       mockReaddir.mockResolvedValue([
-        'session-2024-01-01T10-00-older000.json',
-        'session-2024-01-02T10-00-newer000.json',
+        "session-2024-01-01T10-00-older000.json",
+        "session-2024-01-02T10-00-newer000.json",
       ]);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
-      );
+      vi.mocked(fs.readFile).mockResolvedValue(createSessionWithUserMessages(2));
 
       const result = await getPreviousSession(mockConfig);
 
       expect(result).toBe(
-        path.join(
-          '/tmp/project',
-          'chats',
-          'session-2024-01-02T10-00-newer000.json',
-        ),
+        path.join("/tmp/project", "chats", "session-2024-01-02T10-00-newer000.json"),
       );
     });
 
-    it('should return null if most recent session file is corrupted', async () => {
+    it("should return null if most recent session file is corrupted", async () => {
       vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue('invalid json');
+      mockReaddir.mockResolvedValue(["session-2024-01-01T10-00-abc12345.json"]);
+      vi.mocked(fs.readFile).mockResolvedValue("invalid json");
 
       const result = await getPreviousSession(mockConfig);
 
@@ -172,25 +154,23 @@ describe('sessionSummaryUtils', () => {
     });
   });
 
-  describe('generateSummary', () => {
-    it('should not throw if getPreviousSession returns null', async () => {
-      vi.mocked(fs.access).mockRejectedValue(new Error('ENOENT'));
+  describe("generateSummary", () => {
+    it("should not throw if getPreviousSession returns null", async () => {
+      vi.mocked(fs.access).mockRejectedValue(new Error("ENOENT"));
 
       await expect(generateSummary(mockConfig)).resolves.not.toThrow();
     });
 
-    it('should generate and save summary for session needing one', async () => {
+    it("should generate and save summary for session needing one", async () => {
       const sessionPath = path.join(
-        '/tmp/project',
-        'chats',
-        'session-2024-01-01T10-00-abc12345.json',
+        "/tmp/project",
+        "chats",
+        "session-2024-01-01T10-00-abc12345.json",
       );
 
       vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
-      );
+      mockReaddir.mockResolvedValue(["session-2024-01-01T10-00-abc12345.json"]);
+      vi.mocked(fs.readFile).mockResolvedValue(createSessionWithUserMessages(2));
       vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
       await generateSummary(mockConfig);
@@ -199,17 +179,15 @@ describe('sessionSummaryUtils', () => {
       expect(fs.writeFile).toHaveBeenCalledTimes(1);
       expect(fs.writeFile).toHaveBeenCalledWith(
         sessionPath,
-        expect.stringContaining('Add dark mode to the app'),
+        expect.stringContaining("Add dark mode to the app"),
       );
     });
 
-    it('should handle errors gracefully without throwing', async () => {
+    it("should handle errors gracefully without throwing", async () => {
       vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
-      );
-      mockGenerateSummary.mockRejectedValue(new Error('API Error'));
+      mockReaddir.mockResolvedValue(["session-2024-01-01T10-00-abc12345.json"]);
+      vi.mocked(fs.readFile).mockResolvedValue(createSessionWithUserMessages(2));
+      mockGenerateSummary.mockRejectedValue(new Error("API Error"));
 
       await expect(generateSummary(mockConfig)).resolves.not.toThrow();
     });
diff --git a/packages/gemini-cli-core/src/services/sessionSummaryUtils.ts b/packages/gemini-cli-core/src/services/sessionSummaryUtils.ts
index ed51cecd2..129877dd5 100644
--- a/packages/gemini-cli-core/src/services/sessionSummaryUtils.ts
+++ b/packages/gemini-cli-core/src/services/sessionSummaryUtils.ts
@@ -4,43 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { SessionSummaryService } from './sessionSummaryService.js';
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import {
-  SESSION_FILE_PREFIX,
-  type ConversationRecord,
-} from './chatRecordingService.js';
-import fs from 'node:fs/promises';
-import path from 'node:path';
+import fs from "node:fs/promises";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { type ConversationRecord, SESSION_FILE_PREFIX } from "./chatRecordingService.js";
+import { SessionSummaryService } from "./sessionSummaryService.js";
 
 const MIN_MESSAGES_FOR_SUMMARY = 1;
 
 /**
  * Generates and saves a summary for a session file.
  */
-async function generateAndSaveSummary(
-  config: Config,
-  sessionPath: string,
-): Promise<void> {
+async function generateAndSaveSummary(config: Config, sessionPath: string): Promise<void> {
   // Read session file
-  const content = await fs.readFile(sessionPath, 'utf-8');
+  const content = await fs.readFile(sessionPath, "utf-8");
   const conversation: ConversationRecord = JSON.parse(content);
 
   // Skip if summary already exists
   if (conversation.summary) {
-    debugLogger.debug(
-      `[SessionSummary] Summary already exists for ${sessionPath}, skipping`,
-    );
+    debugLogger.debug(`[SessionSummary] Summary already exists for ${sessionPath}, skipping`);
     return;
   }
 
   // Skip if no messages
   if (conversation.messages.length === 0) {
-    debugLogger.debug(
-      `[SessionSummary] No messages to summarize in ${sessionPath}`,
-    );
+    debugLogger.debug(`[SessionSummary] No messages to summarize in ${sessionPath}`);
     return;
   }
 
@@ -48,7 +38,7 @@ async function generateAndSaveSummary(
   const contentGenerator = config.getContentGenerator();
   if (!contentGenerator) {
     debugLogger.debug(
-      '[SessionSummary] Content generator not available, skipping summary generation',
+      "[SessionSummary] Content generator not available, skipping summary generation",
     );
     return;
   }
@@ -61,21 +51,17 @@ async function generateAndSaveSummary(
   });
 
   if (!summary) {
-    debugLogger.warn(
-      `[SessionSummary] Failed to generate summary for ${sessionPath}`,
-    );
+    debugLogger.warn(`[SessionSummary] Failed to generate summary for ${sessionPath}`);
     return;
   }
 
   // Re-read the file before writing to handle race conditions
-  const freshContent = await fs.readFile(sessionPath, 'utf-8');
+  const freshContent = await fs.readFile(sessionPath, "utf-8");
   const freshConversation: ConversationRecord = JSON.parse(freshContent);
 
   // Check if summary was added by another process
   if (freshConversation.summary) {
-    debugLogger.debug(
-      `[SessionSummary] Summary was added by another process for ${sessionPath}`,
-    );
+    debugLogger.debug(`[SessionSummary] Summary was added by another process for ${sessionPath}`);
     return;
   }
 
@@ -83,37 +69,33 @@ async function generateAndSaveSummary(
   freshConversation.summary = summary;
   freshConversation.lastUpdated = new Date().toISOString();
   await fs.writeFile(sessionPath, JSON.stringify(freshConversation, null, 2));
-  debugLogger.debug(
-    `[SessionSummary] Saved summary for ${sessionPath}: "${summary}"`,
-  );
+  debugLogger.debug(`[SessionSummary] Saved summary for ${sessionPath}: "${summary}"`);
 }
 
 /**
  * Finds the most recently created session that needs a summary.
  * Returns the path if it needs a summary, null otherwise.
  */
-export async function getPreviousSession(
-  config: Config,
-): Promise<string | null> {
+export async function getPreviousSession(config: Config): Promise<string | null> {
   try {
-    const chatsDir = path.join(config.storage.getProjectTempDir(), 'chats');
+    const chatsDir = path.join(config.storage.getProjectTempDir(), "chats");
 
     // Check if chats directory exists
     try {
       await fs.access(chatsDir);
     } catch {
-      debugLogger.debug('[SessionSummary] No chats directory found');
+      debugLogger.debug("[SessionSummary] No chats directory found");
       return null;
     }
 
     // List session files
     const allFiles = await fs.readdir(chatsDir);
     const sessionFiles = allFiles.filter(
-      (f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith('.json'),
+      (f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith(".json"),
     );
 
     if (sessionFiles.length === 0) {
-      debugLogger.debug('[SessionSummary] No session files found');
+      debugLogger.debug("[SessionSummary] No session files found");
       return null;
     }
 
@@ -126,20 +108,16 @@ export async function getPreviousSession(
     const filePath = path.join(chatsDir, mostRecentFile);
 
     try {
-      const content = await fs.readFile(filePath, 'utf-8');
+      const content = await fs.readFile(filePath, "utf-8");
       const conversation: ConversationRecord = JSON.parse(content);
 
       if (conversation.summary) {
-        debugLogger.debug(
-          '[SessionSummary] Most recent session already has summary',
-        );
+        debugLogger.debug("[SessionSummary] Most recent session already has summary");
         return null;
       }
 
       // Only generate summaries for sessions with more than 1 user message
-      const userMessageCount = conversation.messages.filter(
-        (m) => m.type === 'user',
-      ).length;
+      const userMessageCount = conversation.messages.filter((m) => m.type === "user").length;
       if (userMessageCount <= MIN_MESSAGES_FOR_SUMMARY) {
         debugLogger.debug(
           `[SessionSummary] Most recent session has ${userMessageCount} user message(s), skipping (need more than ${MIN_MESSAGES_FOR_SUMMARY})`,
@@ -149,7 +127,7 @@ export async function getPreviousSession(
 
       return filePath;
     } catch {
-      debugLogger.debug('[SessionSummary] Could not read most recent session');
+      debugLogger.debug("[SessionSummary] Could not read most recent session");
       return null;
     }
   } catch (error) {
diff --git a/packages/gemini-cli-core/src/services/shellExecutionService.test.ts b/packages/gemini-cli-core/src/services/shellExecutionService.test.ts
index 84f41b43f..32c8a3c2c 100644
--- a/packages/gemini-cli-core/src/services/shellExecutionService.test.ts
+++ b/packages/gemini-cli-core/src/services/shellExecutionService.test.ts
@@ -4,24 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import EventEmitter from 'node:events';
-import type { Readable } from 'node:stream';
-import { type ChildProcess } from 'node:child_process';
-import type {
-  ShellOutputEvent,
-  ShellExecutionConfig,
-} from './shellExecutionService.js';
-import { ShellExecutionService } from './shellExecutionService.js';
-import type { AnsiOutput, AnsiToken } from '../utils/terminalSerializer.js';
+import { type ChildProcess } from "node:child_process";
+import EventEmitter from "node:events";
+import type { Readable } from "node:stream";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { AnsiOutput, AnsiToken } from "../utils/terminalSerializer.js";
+import type { ShellExecutionConfig, ShellOutputEvent } from "./shellExecutionService.js";
+import { ShellExecutionService } from "./shellExecutionService.js";
 
 // Hoisted Mocks
 const mockPtySpawn = vi.hoisted(() => vi.fn());
@@ -32,21 +21,20 @@ const mockGetPty = vi.hoisted(() => vi.fn());
 const mockSerializeTerminalToObject = vi.hoisted(() => vi.fn());
 
 // Top-level Mocks
-vi.mock('@lydell/node-pty', () => ({
+vi.mock("@lydell/node-pty", () => ({
   spawn: mockPtySpawn,
 }));
-vi.mock('node:child_process', async (importOriginal) => {
-  const actual =
-    (await importOriginal()) as typeof import('node:child_process');
+vi.mock("node:child_process", async (importOriginal) => {
+  const actual = (await importOriginal()) as typeof import("node:child_process");
   return {
     ...actual,
     spawn: mockCpSpawn,
   };
 });
-vi.mock('../utils/textUtils.js', () => ({
+vi.mock("../utils/textUtils.js", () => ({
   isBinary: mockIsBinary,
 }));
-vi.mock('os', () => ({
+vi.mock("os", () => ({
   default: {
     platform: mockPlatform,
     constants: {
@@ -64,64 +52,60 @@ vi.mock('os', () => ({
     },
   },
 }));
-vi.mock('../utils/getPty.js', () => ({
+vi.mock("../utils/getPty.js", () => ({
   getPty: mockGetPty,
 }));
-vi.mock('../utils/terminalSerializer.js', () => ({
+vi.mock("../utils/terminalSerializer.js", () => ({
   serializeTerminalToObject: mockSerializeTerminalToObject,
 }));
 
-const mockProcessKill = vi
-  .spyOn(process, 'kill')
-  .mockImplementation(() => true);
+const mockProcessKill = vi.spyOn(process, "kill").mockImplementation(() => true);
 
 const shellExecutionConfig: ShellExecutionConfig = {
   terminalWidth: 80,
   terminalHeight: 24,
-  pager: 'cat',
+  pager: "cat",
   showColor: false,
   disableDynamicLineTrimming: true,
 };
 
-const createMockSerializeTerminalToObjectReturnValue = (
-  text: string | string[],
-): AnsiOutput => {
-  const lines = Array.isArray(text) ? text : text.split('\n');
+const createMockSerializeTerminalToObjectReturnValue = (text: string | string[]): AnsiOutput => {
+  const lines = Array.isArray(text) ? text : text.split("\n");
   const len = (shellExecutionConfig.terminalHeight ?? 24) as number;
   const expected: AnsiOutput = Array.from({ length: len }, (_, i) => [
     {
-      text: (lines[i] || '').trim(),
+      text: (lines[i] || "").trim(),
       bold: false,
       italic: false,
       underline: false,
       dim: false,
       inverse: false,
-      fg: '#ffffff',
-      bg: '#000000',
+      fg: "#ffffff",
+      bg: "#000000",
     },
   ]);
   return expected;
 };
 
 const createExpectedAnsiOutput = (text: string | string[]): AnsiOutput => {
-  const lines = Array.isArray(text) ? text : text.split('\n');
+  const lines = Array.isArray(text) ? text : text.split("\n");
   const len = (shellExecutionConfig.terminalHeight ?? 24) as number;
   const expected: AnsiOutput = Array.from({ length: len }, (_, i) => [
     {
-      text: expect.stringMatching((lines[i] || '').trim()),
+      text: expect.stringMatching((lines[i] || "").trim()),
       bold: false,
       italic: false,
       underline: false,
       dim: false,
       inverse: false,
-      fg: '',
-      bg: '',
+      fg: "",
+      bg: "",
     } as AnsiToken,
   ]);
   return expected;
 };
 
-describe('ShellExecutionService', () => {
+describe("ShellExecutionService", () => {
   let mockPtyProcess: EventEmitter & {
     pid: number;
     kill: Mock;
@@ -145,10 +129,10 @@ describe('ShellExecutionService', () => {
     vi.clearAllMocks();
     mockSerializeTerminalToObject.mockReturnValue([]);
     mockIsBinary.mockReturnValue(false);
-    mockPlatform.mockReturnValue('linux');
+    mockPlatform.mockReturnValue("linux");
     mockGetPty.mockResolvedValue({
       module: { spawn: mockPtySpawn },
-      name: 'mock-pty',
+      name: "mock-pty",
     });
 
     onOutputEventMock = vi.fn();
@@ -184,16 +168,13 @@ describe('ShellExecutionService', () => {
   // Helper function to run a standard execution simulation
   const simulateExecution = async (
     command: string,
-    simulation: (
-      ptyProcess: typeof mockPtyProcess,
-      ac: AbortController,
-    ) => void | Promise<void>,
+    simulation: (ptyProcess: typeof mockPtyProcess, ac: AbortController) => void | Promise<void>,
     config = shellExecutionConfig,
   ) => {
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
       command,
-      '/test/dir',
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true,
@@ -206,120 +187,112 @@ describe('ShellExecutionService', () => {
     return { result, handle, abortController };
   };
 
-  describe('Successful Execution', () => {
-    it('should execute a command and capture output', async () => {
+  describe("Successful Execution", () => {
+    it("should execute a command and capture output", async () => {
       mockSerializeTerminalToObject.mockReturnValue(
-        createMockSerializeTerminalToObjectReturnValue('file1.txt'),
+        createMockSerializeTerminalToObjectReturnValue("file1.txt"),
       );
-      const { result, handle } = await simulateExecution('ls -l', (pty) => {
-        pty.onData.mock.calls[0][0]('file1.txt\n');
+      const { result, handle } = await simulateExecution("ls -l", (pty) => {
+        pty.onData.mock.calls[0][0]("file1.txt\n");
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
       expect(mockPtySpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l',
-        ],
+        "bash",
+        ["-c", "shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l"],
         expect.any(Object),
       );
       expect(result.exitCode).toBe(0);
       expect(result.signal).toBeNull();
       expect(result.error).toBeNull();
       expect(result.aborted).toBe(false);
-      expect(result.output.trim()).toBe('file1.txt');
+      expect(result.output.trim()).toBe("file1.txt");
       expect(handle.pid).toBe(12345);
 
       expect(onOutputEventMock).toHaveBeenCalledWith({
-        type: 'data',
-        chunk: createExpectedAnsiOutput('file1.txt'),
+        type: "data",
+        chunk: createExpectedAnsiOutput("file1.txt"),
       });
     });
 
-    it('should strip ANSI color codes from output', async () => {
+    it("should strip ANSI color codes from output", async () => {
       mockSerializeTerminalToObject.mockReturnValue(
-        createMockSerializeTerminalToObjectReturnValue('aredword'),
+        createMockSerializeTerminalToObjectReturnValue("aredword"),
       );
-      const { result } = await simulateExecution('ls --color=auto', (pty) => {
-        pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
+      const { result } = await simulateExecution("ls --color=auto", (pty) => {
+        pty.onData.mock.calls[0][0]("a\u001b[31mred\u001b[0mword");
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
-      expect(result.output.trim()).toBe('aredword');
+      expect(result.output.trim()).toBe("aredword");
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
-          chunk: createExpectedAnsiOutput('aredword'),
+          type: "data",
+          chunk: createExpectedAnsiOutput("aredword"),
         }),
       );
     });
 
-    it('should correctly decode multi-byte characters split across chunks', async () => {
+    it("should correctly decode multi-byte characters split across chunks", async () => {
       const { result } = await simulateExecution('echo "你好"', (pty) => {
-        const multiByteChar = '你好';
+        const multiByteChar = "你好";
         pty.onData.mock.calls[0][0](multiByteChar.slice(0, 1));
         pty.onData.mock.calls[0][0](multiByteChar.slice(1));
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
-      expect(result.output.trim()).toBe('你好');
+      expect(result.output.trim()).toBe("你好");
     });
 
-    it('should handle commands with no output', async () => {
+    it("should handle commands with no output", async () => {
       mockSerializeTerminalToObject.mockReturnValue(
-        createMockSerializeTerminalToObjectReturnValue(''),
+        createMockSerializeTerminalToObjectReturnValue(""),
       );
-      await simulateExecution('touch file', (pty) => {
+      await simulateExecution("touch file", (pty) => {
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          chunk: createExpectedAnsiOutput(''),
+          chunk: createExpectedAnsiOutput(""),
         }),
       );
     });
 
-    it('should capture large output (10000 lines)', async () => {
+    it("should capture large output (10000 lines)", async () => {
       const lineCount = 10000;
       const lines = Array.from({ length: lineCount }, (_, i) => `line ${i}`);
-      const expectedOutput = lines.join('\n');
-
-      const { result } = await simulateExecution(
-        'large-output-command',
-        (pty) => {
-          // Send data in chunks to simulate realistic streaming
-          // Use \r\n to ensure the terminal moves the cursor to the start of the line
-          const chunkSize = 1000;
-          for (let i = 0; i < lineCount; i += chunkSize) {
-            const chunk = lines.slice(i, i + chunkSize).join('\r\n') + '\r\n';
-            pty.onData.mock.calls[0][0](chunk);
-          }
-          pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
-        },
-      );
+      const expectedOutput = lines.join("\n");
+
+      const { result } = await simulateExecution("large-output-command", (pty) => {
+        // Send data in chunks to simulate realistic streaming
+        // Use \r\n to ensure the terminal moves the cursor to the start of the line
+        const chunkSize = 1000;
+        for (let i = 0; i < lineCount; i += chunkSize) {
+          const chunk = lines.slice(i, i + chunkSize).join("\r\n") + "\r\n";
+          pty.onData.mock.calls[0][0](chunk);
+        }
+        pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
+      });
 
       expect(result.exitCode).toBe(0);
       // The terminal buffer output includes trailing spaces for each line (up to terminal width).
       // We trim each line to match our expected simple string.
       const processedOutput = result.output
-        .split('\n')
+        .split("\n")
         .map((l) => l.trimEnd())
-        .join('\n')
+        .join("\n")
         .trim();
       expect(processedOutput).toBe(expectedOutput);
-      expect(result.output.split('\n').length).toBeGreaterThanOrEqual(
-        lineCount,
-      );
+      expect(result.output.split("\n").length).toBeGreaterThanOrEqual(lineCount);
     });
 
-    it('should not wrap long lines in the final output', async () => {
+    it("should not wrap long lines in the final output", async () => {
       // Set a small width to force wrapping
       const narrowConfig = { ...shellExecutionConfig, terminalWidth: 10 };
-      const longString = '123456789012345'; // 15 chars, should wrap at 10
+      const longString = "123456789012345"; // 15 chars, should wrap at 10
 
       const { result } = await simulateExecution(
-        'long-line-command',
+        "long-line-command",
         (pty) => {
           pty.onData.mock.calls[0][0](longString);
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
@@ -331,27 +304,27 @@ describe('ShellExecutionService', () => {
       expect(result.output.trim()).toBe(longString);
     });
 
-    it('should not add extra padding but preserve explicit trailing whitespace', async () => {
-      const { result } = await simulateExecution('cmd', (pty) => {
+    it("should not add extra padding but preserve explicit trailing whitespace", async () => {
+      const { result } = await simulateExecution("cmd", (pty) => {
         // "value" should not get terminal-width padding
         // "value2    " should keep its spaces
-        pty.onData.mock.calls[0][0]('value\r\nvalue2    ');
+        pty.onData.mock.calls[0][0]("value\r\nvalue2    ");
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
-      expect(result.output).toBe('value\nvalue2    ');
+      expect(result.output).toBe("value\nvalue2    ");
     });
 
-    it('should truncate output exceeding the scrollback limit', async () => {
+    it("should truncate output exceeding the scrollback limit", async () => {
       const scrollbackLimit = 100;
       const totalLines = 150;
       // Generate lines: "line 0", "line 1", ...
       const lines = Array.from({ length: totalLines }, (_, i) => `line ${i}`);
 
       const { result } = await simulateExecution(
-        'overflow-command',
+        "overflow-command",
         (pty) => {
-          const chunk = lines.join('\r\n') + '\r\n';
+          const chunk = lines.join("\r\n") + "\r\n";
           pty.onData.mock.calls[0][0](chunk);
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         },
@@ -369,7 +342,7 @@ describe('ShellExecutionService', () => {
 
       const outputLines = result.output
         .trim()
-        .split('\n')
+        .split("\n")
         .map((l) => l.trimEnd());
 
       // We expect the *start* of the output to be truncated.
@@ -379,19 +352,17 @@ describe('ShellExecutionService', () => {
 
       // Check that we lost some lines from the beginning
       expect(outputLines.length).toBeLessThan(totalLines);
-      expect(outputLines[0]).not.toBe('line 0');
+      expect(outputLines[0]).not.toBe("line 0");
 
       // Check that we have the *last* lines
-      expect(outputLines[outputLines.length - 1]).toBe(
-        `line ${totalLines - 1}`,
-      );
+      expect(outputLines[outputLines.length - 1]).toBe(`line ${totalLines - 1}`);
     });
 
-    it('should call onPid with the process id', async () => {
+    it("should call onPid with the process id", async () => {
       const abortController = new AbortController();
       const handle = await ShellExecutionService.execute(
-        'ls -l',
-        '/test/dir',
+        "ls -l",
+        "/test/dir",
         onOutputEventMock,
         abortController.signal,
         true,
@@ -403,9 +374,9 @@ describe('ShellExecutionService', () => {
     });
   });
 
-  describe('pty interaction', () => {
+  describe("pty interaction", () => {
     beforeEach(() => {
-      vi.spyOn(ShellExecutionService['activePtys'], 'get').mockReturnValue({
+      vi.spyOn(ShellExecutionService["activePtys"], "get").mockReturnValue({
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ptyProcess: mockPtyProcess as any,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -413,14 +384,14 @@ describe('ShellExecutionService', () => {
       });
     });
 
-    it('should write to the pty and trigger a render', async () => {
+    it("should write to the pty and trigger a render", async () => {
       vi.useFakeTimers();
-      await simulateExecution('interactive-app', (pty) => {
-        ShellExecutionService.writeToPty(pty.pid!, 'input');
+      await simulateExecution("interactive-app", (pty) => {
+        ShellExecutionService.writeToPty(pty.pid!, "input");
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
-      expect(mockPtyProcess.write).toHaveBeenCalledWith('input');
+      expect(mockPtyProcess.write).toHaveBeenCalledWith("input");
       // Use fake timers to check for the delayed render
       await vi.advanceTimersByTimeAsync(17);
       // The render will cause an output event
@@ -428,9 +399,9 @@ describe('ShellExecutionService', () => {
       vi.useRealTimers();
     });
 
-    it('should resize the pty and the headless terminal', async () => {
-      await simulateExecution('ls -l', (pty) => {
-        pty.onData.mock.calls[0][0]('file1.txt\n');
+    it("should resize the pty and the headless terminal", async () => {
+      await simulateExecution("ls -l", (pty) => {
+        pty.onData.mock.calls[0][0]("file1.txt\n");
         ShellExecutionService.resizePty(pty.pid!, 100, 40);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
@@ -439,12 +410,10 @@ describe('ShellExecutionService', () => {
       expect(mockHeadlessTerminal.resize).toHaveBeenCalledWith(100, 40);
     });
 
-    it('should not resize the pty if it is not active', async () => {
-      const isPtyActiveSpy = vi
-        .spyOn(ShellExecutionService, 'isPtyActive')
-        .mockReturnValue(false);
+    it("should not resize the pty if it is not active", async () => {
+      const isPtyActiveSpy = vi.spyOn(ShellExecutionService, "isPtyActive").mockReturnValue(false);
 
-      await simulateExecution('ls -l', (pty) => {
+      await simulateExecution("ls -l", (pty) => {
         ShellExecutionService.resizePty(pty.pid!, 100, 40);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
@@ -454,17 +423,15 @@ describe('ShellExecutionService', () => {
       isPtyActiveSpy.mockRestore();
     });
 
-    it('should ignore errors when resizing an exited pty', async () => {
-      const resizeError = new Error(
-        'Cannot resize a pty that has already exited',
-      );
+    it("should ignore errors when resizing an exited pty", async () => {
+      const resizeError = new Error("Cannot resize a pty that has already exited");
       mockPtyProcess.resize.mockImplementation(() => {
         throw resizeError;
       });
 
       // We don't expect this test to throw an error
       await expect(
-        simulateExecution('ls -l', (pty) => {
+        simulateExecution("ls -l", (pty) => {
           ShellExecutionService.resizePty(pty.pid!, 100, 40);
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         }),
@@ -473,23 +440,23 @@ describe('ShellExecutionService', () => {
       expect(mockPtyProcess.resize).toHaveBeenCalledWith(100, 40);
     });
 
-    it('should re-throw other errors during resize', async () => {
-      const otherError = new Error('Some other error');
+    it("should re-throw other errors during resize", async () => {
+      const otherError = new Error("Some other error");
       mockPtyProcess.resize.mockImplementation(() => {
         throw otherError;
       });
 
       await expect(
-        simulateExecution('ls -l', (pty) => {
+        simulateExecution("ls -l", (pty) => {
           ShellExecutionService.resizePty(pty.pid!, 100, 40);
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         }),
-      ).rejects.toThrow('Some other error');
+      ).rejects.toThrow("Some other error");
     });
 
-    it('should scroll the headless terminal', async () => {
-      await simulateExecution('ls -l', (pty) => {
-        pty.onData.mock.calls[0][0]('file1.txt\n');
+    it("should scroll the headless terminal", async () => {
+      await simulateExecution("ls -l", (pty) => {
+        pty.onData.mock.calls[0][0]("file1.txt\n");
         ShellExecutionService.scrollPty(pty.pid!, 10);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
@@ -497,10 +464,8 @@ describe('ShellExecutionService', () => {
       expect(mockHeadlessTerminal.scrollLines).toHaveBeenCalledWith(10);
     });
 
-    it('should not throw when resizing a pty that has already exited (Windows)', () => {
-      const resizeError = new Error(
-        'Cannot resize a pty that has already exited',
-      );
+    it("should not throw when resizing a pty that has already exited (Windows)", () => {
+      const resizeError = new Error("Cannot resize a pty that has already exited");
       mockPtyProcess.resize.mockImplementation(() => {
         throw resizeError;
       });
@@ -515,20 +480,20 @@ describe('ShellExecutionService', () => {
     });
   });
 
-  describe('Failed Execution', () => {
-    it('should capture a non-zero exit code', async () => {
-      const { result } = await simulateExecution('a-bad-command', (pty) => {
-        pty.onData.mock.calls[0][0]('command not found');
+  describe("Failed Execution", () => {
+    it("should capture a non-zero exit code", async () => {
+      const { result } = await simulateExecution("a-bad-command", (pty) => {
+        pty.onData.mock.calls[0][0]("command not found");
         pty.onExit.mock.calls[0][0]({ exitCode: 127, signal: null });
       });
 
       expect(result.exitCode).toBe(127);
-      expect(result.output.trim()).toBe('command not found');
+      expect(result.output.trim()).toBe("command not found");
       expect(result.error).toBeNull();
     });
 
-    it('should capture a termination signal', async () => {
-      const { result } = await simulateExecution('long-process', (pty) => {
+    it("should capture a termination signal", async () => {
+      const { result } = await simulateExecution("long-process", (pty) => {
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: 15 });
       });
 
@@ -536,16 +501,16 @@ describe('ShellExecutionService', () => {
       expect(result.signal).toBe(15);
     });
 
-    it('should handle a synchronous spawn error', async () => {
+    it("should handle a synchronous spawn error", async () => {
       mockGetPty.mockImplementation(() => null);
 
       mockCpSpawn.mockImplementation(() => {
-        throw new Error('Simulated PTY spawn error');
+        throw new Error("Simulated PTY spawn error");
       });
 
       const handle = await ShellExecutionService.execute(
-        'any-command',
-        '/test/dir',
+        "any-command",
+        "/test/dir",
         onOutputEventMock,
         new AbortController().signal,
         true,
@@ -554,31 +519,28 @@ describe('ShellExecutionService', () => {
       const result = await handle.result;
 
       expect(result.error).toBeInstanceOf(Error);
-      expect(result.error?.message).toContain('Simulated PTY spawn error');
+      expect(result.error?.message).toContain("Simulated PTY spawn error");
       expect(result.exitCode).toBe(1);
-      expect(result.output).toBe('');
+      expect(result.output).toBe("");
       expect(handle.pid).toBeUndefined();
     });
   });
 
-  describe('Aborting Commands', () => {
-    it('should abort a running process and set the aborted flag', async () => {
-      const { result } = await simulateExecution(
-        'sleep 10',
-        (pty, abortController) => {
-          abortController.abort();
-          pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
-        },
-      );
+  describe("Aborting Commands", () => {
+    it("should abort a running process and set the aborted flag", async () => {
+      const { result } = await simulateExecution("sleep 10", (pty, abortController) => {
+        abortController.abort();
+        pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
+      });
 
       expect(result.aborted).toBe(true);
       // The process kill is mocked, so we just check that the flag is set.
     });
 
-    it('should send SIGTERM and then SIGKILL on abort', async () => {
+    it("should send SIGTERM and then SIGKILL on abort", async () => {
       const sigkillPromise = new Promise<void>((resolve) => {
         mockProcessKill.mockImplementation((pid, signal) => {
-          if (signal === 'SIGKILL' && pid === -mockPtyProcess.pid) {
+          if (signal === "SIGKILL" && pid === -mockPtyProcess.pid) {
             resolve();
           }
           return true;
@@ -586,7 +548,7 @@ describe('ShellExecutionService', () => {
       });
 
       const { result } = await simulateExecution(
-        'long-running-process',
+        "long-running-process",
         async (pty, abortController) => {
           abortController.abort();
           await sigkillPromise; // Wait for SIGKILL to be sent before exiting.
@@ -599,10 +561,10 @@ describe('ShellExecutionService', () => {
       // Verify the calls were made in the correct order.
       const killCalls = mockProcessKill.mock.calls;
       const sigtermCallIndex = killCalls.findIndex(
-        (call) => call[0] === -mockPtyProcess.pid && call[1] === 'SIGTERM',
+        (call) => call[0] === -mockPtyProcess.pid && call[1] === "SIGTERM",
       );
       const sigkillCallIndex = killCalls.findIndex(
-        (call) => call[0] === -mockPtyProcess.pid && call[1] === 'SIGKILL',
+        (call) => call[0] === -mockPtyProcess.pid && call[1] === "SIGKILL",
       );
 
       expect(sigtermCallIndex).toBe(0);
@@ -612,18 +574,15 @@ describe('ShellExecutionService', () => {
       expect(result.signal).toBe(9);
     });
 
-    it('should resolve without waiting for the processing chain on abort', async () => {
-      const { result } = await simulateExecution(
-        'long-output',
-        (pty, abortController) => {
-          // Simulate a lot of data being in the queue to be processed
-          for (let i = 0; i < 1000; i++) {
-            pty.onData.mock.calls[0][0]('some data');
-          }
-          abortController.abort();
-          pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
-        },
-      );
+    it("should resolve without waiting for the processing chain on abort", async () => {
+      const { result } = await simulateExecution("long-output", (pty, abortController) => {
+        // Simulate a lot of data being in the queue to be processed
+        for (let i = 0; i < 1000; i++) {
+          pty.onData.mock.calls[0][0]("some data");
+        }
+        abortController.abort();
+        pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
+      });
 
       // The main assertion here is implicit: the `await` for the result above
       // should complete without timing out. This proves that the resolution
@@ -633,104 +592,93 @@ describe('ShellExecutionService', () => {
     });
   });
 
-  describe('Binary Output', () => {
-    it('should detect binary output and switch to progress events', async () => {
+  describe("Binary Output", () => {
+    it("should detect binary output and switch to progress events", async () => {
       mockIsBinary.mockReturnValueOnce(true);
       const binaryChunk1 = Buffer.from([0x89, 0x50, 0x4e, 0x47]);
       const binaryChunk2 = Buffer.from([0x0d, 0x0a, 0x1a, 0x0a]);
 
-      const { result } = await simulateExecution('cat image.png', (pty) => {
+      const { result } = await simulateExecution("cat image.png", (pty) => {
         pty.onData.mock.calls[0][0](binaryChunk1);
         pty.onData.mock.calls[0][0](binaryChunk2);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
-      expect(result.rawOutput).toEqual(
-        Buffer.concat([binaryChunk1, binaryChunk2]),
-      );
+      expect(result.rawOutput).toEqual(Buffer.concat([binaryChunk1, binaryChunk2]));
       expect(onOutputEventMock).toHaveBeenCalledTimes(3);
       expect(onOutputEventMock.mock.calls[0][0]).toEqual({
-        type: 'binary_detected',
+        type: "binary_detected",
       });
       expect(onOutputEventMock.mock.calls[1][0]).toEqual({
-        type: 'binary_progress',
+        type: "binary_progress",
         bytesReceived: 4,
       });
       expect(onOutputEventMock.mock.calls[2][0]).toEqual({
-        type: 'binary_progress',
+        type: "binary_progress",
         bytesReceived: 8,
       });
     });
 
-    it('should not emit data events after binary is detected', async () => {
+    it("should not emit data events after binary is detected", async () => {
       mockIsBinary.mockImplementation((buffer) => buffer.includes(0x00));
 
-      await simulateExecution('cat mixed_file', (pty) => {
+      await simulateExecution("cat mixed_file", (pty) => {
         pty.onData.mock.calls[0][0](Buffer.from([0x00, 0x01, 0x02]));
-        pty.onData.mock.calls[0][0](Buffer.from('more text'));
+        pty.onData.mock.calls[0][0](Buffer.from("more text"));
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
       const eventTypes = onOutputEventMock.mock.calls.map(
         (call: [ShellOutputEvent]) => call[0].type,
       );
-      expect(eventTypes).toEqual([
-        'binary_detected',
-        'binary_progress',
-        'binary_progress',
-      ]);
+      expect(eventTypes).toEqual(["binary_detected", "binary_progress", "binary_progress"]);
     });
   });
 
-  describe('Platform-Specific Behavior', () => {
-    it('should use powershell.exe on Windows', async () => {
-      mockPlatform.mockReturnValue('win32');
+  describe("Platform-Specific Behavior", () => {
+    it("should use powershell.exe on Windows", async () => {
+      mockPlatform.mockReturnValue("win32");
       await simulateExecution('dir "foo bar"', (pty) =>
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null }),
       );
 
       expect(mockPtySpawn).toHaveBeenCalledWith(
-        'powershell.exe',
-        ['-NoProfile', '-Command', 'dir "foo bar"'],
+        "powershell.exe",
+        ["-NoProfile", "-Command", 'dir "foo bar"'],
         expect.any(Object),
       );
     });
 
-    it('should use bash on Linux', async () => {
-      mockPlatform.mockReturnValue('linux');
+    it("should use bash on Linux", async () => {
+      mockPlatform.mockReturnValue("linux");
       await simulateExecution('ls "foo bar"', (pty) =>
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null }),
       );
 
       expect(mockPtySpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"',
-        ],
+        "bash",
+        ["-c", 'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"'],
         expect.any(Object),
       );
     });
   });
 
-  describe('AnsiOutput rendering', () => {
-    it('should call onOutputEvent with AnsiOutput when showColor is true', async () => {
+  describe("AnsiOutput rendering", () => {
+    it("should call onOutputEvent with AnsiOutput when showColor is true", async () => {
       const coloredShellExecutionConfig = {
         ...shellExecutionConfig,
         showColor: true,
-        defaultFg: '#ffffff',
-        defaultBg: '#000000',
+        defaultFg: "#ffffff",
+        defaultBg: "#000000",
         disableDynamicLineTrimming: true,
       };
-      const mockAnsiOutput = [
-        [{ text: 'hello', fg: '#ffffff', bg: '#000000' }],
-      ];
+      const mockAnsiOutput = [[{ text: "hello", fg: "#ffffff", bg: "#000000" }]];
       mockSerializeTerminalToObject.mockReturnValue(mockAnsiOutput);
 
       await simulateExecution(
-        'ls --color=auto',
+        "ls --color=auto",
         (pty) => {
-          pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
+          pty.onData.mock.calls[0][0]("a\u001b[31mred\u001b[0mword");
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         },
         coloredShellExecutionConfig,
@@ -742,20 +690,20 @@ describe('ShellExecutionService', () => {
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
+          type: "data",
           chunk: mockAnsiOutput,
         }),
       );
     });
 
-    it('should call onOutputEvent with AnsiOutput when showColor is false', async () => {
+    it("should call onOutputEvent with AnsiOutput when showColor is false", async () => {
       mockSerializeTerminalToObject.mockReturnValue(
-        createMockSerializeTerminalToObjectReturnValue('aredword'),
+        createMockSerializeTerminalToObjectReturnValue("aredword"),
       );
       await simulateExecution(
-        'ls --color=auto',
+        "ls --color=auto",
         (pty) => {
-          pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
+          pty.onData.mock.calls[0][0]("a\u001b[31mred\u001b[0mword");
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         },
         {
@@ -765,30 +713,24 @@ describe('ShellExecutionService', () => {
         },
       );
 
-      const expected = createExpectedAnsiOutput('aredword');
+      const expected = createExpectedAnsiOutput("aredword");
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
+          type: "data",
           chunk: expected,
         }),
       );
     });
 
-    it('should handle multi-line output correctly when showColor is false', async () => {
+    it("should handle multi-line output correctly when showColor is false", async () => {
       mockSerializeTerminalToObject.mockReturnValue(
-        createMockSerializeTerminalToObjectReturnValue([
-          'line 1',
-          'line 2',
-          'line 3',
-        ]),
+        createMockSerializeTerminalToObjectReturnValue(["line 1", "line 2", "line 3"]),
       );
       await simulateExecution(
-        'ls --color=auto',
+        "ls --color=auto",
         (pty) => {
-          pty.onData.mock.calls[0][0](
-            'line 1\n\u001b[32mline 2\u001b[0m\nline 3',
-          );
+          pty.onData.mock.calls[0][0]("line 1\n\u001b[32mline 2\u001b[0m\nline 3");
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         },
         {
@@ -798,11 +740,11 @@ describe('ShellExecutionService', () => {
         },
       );
 
-      const expected = createExpectedAnsiOutput(['line 1', 'line 2', 'line 3']);
+      const expected = createExpectedAnsiOutput(["line 1", "line 2", "line 3"]);
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
+          type: "data",
           chunk: expected,
         }),
       );
@@ -810,7 +752,7 @@ describe('ShellExecutionService', () => {
   });
 });
 
-describe('ShellExecutionService child_process fallback', () => {
+describe("ShellExecutionService child_process fallback", () => {
   let mockChildProcess: EventEmitter & Partial<ChildProcess>;
   let onOutputEventMock: Mock<(event: ShellOutputEvent) => void>;
 
@@ -818,18 +760,17 @@ describe('ShellExecutionService child_process fallback', () => {
     vi.clearAllMocks();
 
     mockIsBinary.mockReturnValue(false);
-    mockPlatform.mockReturnValue('linux');
+    mockPlatform.mockReturnValue("linux");
     mockGetPty.mockResolvedValue(null);
 
     onOutputEventMock = vi.fn();
 
-    mockChildProcess = new EventEmitter() as EventEmitter &
-      Partial<ChildProcess>;
+    mockChildProcess = new EventEmitter() as EventEmitter & Partial<ChildProcess>;
     mockChildProcess.stdout = new EventEmitter() as Readable;
     mockChildProcess.stderr = new EventEmitter() as Readable;
     mockChildProcess.kill = vi.fn();
 
-    Object.defineProperty(mockChildProcess, 'pid', {
+    Object.defineProperty(mockChildProcess, "pid", {
       value: 12345,
       configurable: true,
     });
@@ -845,7 +786,7 @@ describe('ShellExecutionService child_process fallback', () => {
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
       command,
-      '/test/dir',
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true,
@@ -858,88 +799,85 @@ describe('ShellExecutionService child_process fallback', () => {
     return { result, handle, abortController };
   };
 
-  describe('Successful Execution', () => {
-    it('should execute a command and capture stdout and stderr', async () => {
-      const { result, handle } = await simulateExecution('ls -l', (cp) => {
-        cp.stdout?.emit('data', Buffer.from('file1.txt\n'));
-        cp.stderr?.emit('data', Buffer.from('a warning'));
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+  describe("Successful Execution", () => {
+    it("should execute a command and capture stdout and stderr", async () => {
+      const { result, handle } = await simulateExecution("ls -l", (cp) => {
+        cp.stdout?.emit("data", Buffer.from("file1.txt\n"));
+        cp.stderr?.emit("data", Buffer.from("a warning"));
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
 
       expect(mockCpSpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l',
-        ],
+        "bash",
+        ["-c", "shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l"],
         expect.objectContaining({ shell: false, detached: true }),
       );
       expect(result.exitCode).toBe(0);
       expect(result.signal).toBeNull();
       expect(result.error).toBeNull();
       expect(result.aborted).toBe(false);
-      expect(result.output).toBe('file1.txt\na warning');
+      expect(result.output).toBe("file1.txt\na warning");
       expect(handle.pid).toBe(undefined);
 
       expect(onOutputEventMock).toHaveBeenCalledWith({
-        type: 'data',
-        chunk: 'file1.txt\na warning',
+        type: "data",
+        chunk: "file1.txt\na warning",
       });
     });
 
-    it('should strip ANSI color codes from output', async () => {
-      const { result } = await simulateExecution('ls --color=auto', (cp) => {
-        cp.stdout?.emit('data', Buffer.from('a\u001b[31mred\u001b[0mword'));
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+    it("should strip ANSI color codes from output", async () => {
+      const { result } = await simulateExecution("ls --color=auto", (cp) => {
+        cp.stdout?.emit("data", Buffer.from("a\u001b[31mred\u001b[0mword"));
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
 
-      expect(result.output.trim()).toBe('aredword');
+      expect(result.output.trim()).toBe("aredword");
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
-          chunk: 'aredword',
+          type: "data",
+          chunk: "aredword",
         }),
       );
     });
 
-    it('should correctly decode multi-byte characters split across chunks', async () => {
+    it("should correctly decode multi-byte characters split across chunks", async () => {
       const { result } = await simulateExecution('echo "你好"', (cp) => {
-        const multiByteChar = Buffer.from('你好', 'utf-8');
-        cp.stdout?.emit('data', multiByteChar.slice(0, 2));
-        cp.stdout?.emit('data', multiByteChar.slice(2));
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+        const multiByteChar = Buffer.from("你好", "utf-8");
+        cp.stdout?.emit("data", multiByteChar.slice(0, 2));
+        cp.stdout?.emit("data", multiByteChar.slice(2));
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
-      expect(result.output.trim()).toBe('你好');
+      expect(result.output.trim()).toBe("你好");
     });
 
-    it('should handle commands with no output', async () => {
-      const { result } = await simulateExecution('touch file', (cp) => {
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+    it("should handle commands with no output", async () => {
+      const { result } = await simulateExecution("touch file", (cp) => {
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
 
-      expect(result.output.trim()).toBe('');
+      expect(result.output.trim()).toBe("");
       expect(onOutputEventMock).not.toHaveBeenCalled();
     });
 
-    it.skip('should truncate stdout using a sliding window and show a warning', async () => {
+    it.skip("should truncate stdout using a sliding window and show a warning", async () => {
       const MAX_SIZE = 16 * 1024 * 1024;
-      const chunk1 = 'a'.repeat(MAX_SIZE / 2 - 5);
-      const chunk2 = 'b'.repeat(MAX_SIZE / 2 - 5);
-      const chunk3 = 'c'.repeat(20);
-
-      const { result } = await simulateExecution('large-output', (cp) => {
-        cp.stdout?.emit('data', Buffer.from(chunk1));
-        cp.stdout?.emit('data', Buffer.from(chunk2));
-        cp.stdout?.emit('data', Buffer.from(chunk3));
-        cp.emit('exit', 0, null);
+      const chunk1 = "a".repeat(MAX_SIZE / 2 - 5);
+      const chunk2 = "b".repeat(MAX_SIZE / 2 - 5);
+      const chunk3 = "c".repeat(20);
+
+      const { result } = await simulateExecution("large-output", (cp) => {
+        cp.stdout?.emit("data", Buffer.from(chunk1));
+        cp.stdout?.emit("data", Buffer.from(chunk2));
+        cp.stdout?.emit("data", Buffer.from(chunk3));
+        cp.emit("exit", 0, null);
       });
 
       const truncationMessage =
-        '[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to 16MB.]';
+        "[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to 16MB.]";
       expect(result.output).toContain(truncationMessage);
 
       const outputWithoutMessage = result.output
@@ -949,53 +887,51 @@ describe('ShellExecutionService child_process fallback', () => {
       expect(outputWithoutMessage.length).toBe(MAX_SIZE);
 
       const expectedStart = (chunk1 + chunk2 + chunk3).slice(-MAX_SIZE);
-      expect(
-        outputWithoutMessage.startsWith(expectedStart.substring(0, 10)),
-      ).toBe(true);
-      expect(outputWithoutMessage.endsWith('c'.repeat(20))).toBe(true);
+      expect(outputWithoutMessage.startsWith(expectedStart.substring(0, 10))).toBe(true);
+      expect(outputWithoutMessage.endsWith("c".repeat(20))).toBe(true);
     }, 120000);
   });
 
-  describe('Failed Execution', () => {
-    it('should capture a non-zero exit code and format output correctly', async () => {
-      const { result } = await simulateExecution('a-bad-command', (cp) => {
-        cp.stderr?.emit('data', Buffer.from('command not found'));
-        cp.emit('exit', 127, null);
-        cp.emit('close', 127, null);
+  describe("Failed Execution", () => {
+    it("should capture a non-zero exit code and format output correctly", async () => {
+      const { result } = await simulateExecution("a-bad-command", (cp) => {
+        cp.stderr?.emit("data", Buffer.from("command not found"));
+        cp.emit("exit", 127, null);
+        cp.emit("close", 127, null);
       });
 
       expect(result.exitCode).toBe(127);
-      expect(result.output.trim()).toBe('command not found');
+      expect(result.output.trim()).toBe("command not found");
       expect(result.error).toBeNull();
     });
 
-    it('should capture a termination signal', async () => {
-      const { result } = await simulateExecution('long-process', (cp) => {
-        cp.emit('exit', null, 'SIGTERM');
-        cp.emit('close', null, 'SIGTERM');
+    it("should capture a termination signal", async () => {
+      const { result } = await simulateExecution("long-process", (cp) => {
+        cp.emit("exit", null, "SIGTERM");
+        cp.emit("close", null, "SIGTERM");
       });
 
       expect(result.exitCode).toBeNull();
       expect(result.signal).toBe(15);
     });
 
-    it('should handle a spawn error', async () => {
-      const spawnError = new Error('spawn EACCES');
-      const { result } = await simulateExecution('protected-cmd', (cp) => {
-        cp.emit('error', spawnError);
-        cp.emit('exit', 1, null);
-        cp.emit('close', 1, null);
+    it("should handle a spawn error", async () => {
+      const spawnError = new Error("spawn EACCES");
+      const { result } = await simulateExecution("protected-cmd", (cp) => {
+        cp.emit("error", spawnError);
+        cp.emit("exit", 1, null);
+        cp.emit("close", 1, null);
       });
 
       expect(result.error).toBe(spawnError);
       expect(result.exitCode).toBe(1);
     });
 
-    it('handles errors that do not fire the exit event', async () => {
-      const error = new Error('spawn abc ENOENT');
-      const { result } = await simulateExecution('touch cat.jpg', (cp) => {
-        cp.emit('error', error); // No exit event is fired.
-        cp.emit('close', 1, null);
+    it("handles errors that do not fire the exit event", async () => {
+      const error = new Error("spawn abc ENOENT");
+      const { result } = await simulateExecution("touch cat.jpg", (cp) => {
+        cp.emit("error", error); // No exit event is fired.
+        cp.emit("close", 1, null);
       });
 
       expect(result.error).toBe(error);
@@ -1003,68 +939,59 @@ describe('ShellExecutionService child_process fallback', () => {
     });
   });
 
-  describe('Aborting Commands', () => {
+  describe("Aborting Commands", () => {
     describe.each([
       {
-        platform: 'linux',
-        expectedSignal: 'SIGTERM',
-        expectedExit: { signal: 'SIGKILL' as const },
+        platform: "linux",
+        expectedSignal: "SIGTERM",
+        expectedExit: { signal: "SIGKILL" as const },
       },
       {
-        platform: 'win32',
-        expectedCommand: 'taskkill',
+        platform: "win32",
+        expectedCommand: "taskkill",
         expectedExit: { code: 1 },
       },
-    ])(
-      'on $platform',
-      ({ platform, expectedSignal, expectedCommand, expectedExit }) => {
-        it('should abort a running process and set the aborted flag', async () => {
-          mockPlatform.mockReturnValue(platform);
-
-          const { result } = await simulateExecution(
-            'sleep 10',
-            (cp, abortController) => {
-              abortController.abort();
-              if (expectedExit.signal) {
-                cp.emit('exit', null, expectedExit.signal);
-                cp.emit('close', null, expectedExit.signal);
-              }
-              if (typeof expectedExit.code === 'number') {
-                cp.emit('exit', expectedExit.code, null);
-                cp.emit('close', expectedExit.code, null);
-              }
-            },
-          );
-
-          expect(result.aborted).toBe(true);
-
-          if (platform === 'linux') {
-            expect(mockProcessKill).toHaveBeenCalledWith(
-              -mockChildProcess.pid!,
-              expectedSignal,
-            );
-          } else {
-            expect(mockCpSpawn).toHaveBeenCalledWith(expectedCommand, [
-              '/pid',
-              String(mockChildProcess.pid),
-              '/f',
-              '/t',
-            ]);
+    ])("on $platform", ({ platform, expectedSignal, expectedCommand, expectedExit }) => {
+      it("should abort a running process and set the aborted flag", async () => {
+        mockPlatform.mockReturnValue(platform);
+
+        const { result } = await simulateExecution("sleep 10", (cp, abortController) => {
+          abortController.abort();
+          if (expectedExit.signal) {
+            cp.emit("exit", null, expectedExit.signal);
+            cp.emit("close", null, expectedExit.signal);
+          }
+          if (typeof expectedExit.code === "number") {
+            cp.emit("exit", expectedExit.code, null);
+            cp.emit("close", expectedExit.code, null);
           }
         });
-      },
-    );
 
-    it('should gracefully attempt SIGKILL on linux if SIGTERM fails', async () => {
-      mockPlatform.mockReturnValue('linux');
+        expect(result.aborted).toBe(true);
+
+        if (platform === "linux") {
+          expect(mockProcessKill).toHaveBeenCalledWith(-mockChildProcess.pid!, expectedSignal);
+        } else {
+          expect(mockCpSpawn).toHaveBeenCalledWith(expectedCommand, [
+            "/pid",
+            String(mockChildProcess.pid),
+            "/f",
+            "/t",
+          ]);
+        }
+      });
+    });
+
+    it("should gracefully attempt SIGKILL on linux if SIGTERM fails", async () => {
+      mockPlatform.mockReturnValue("linux");
       vi.useFakeTimers();
 
       // Don't await the result inside the simulation block for this specific test.
       // We need to control the timeline manually.
       const abortController = new AbortController();
       const handle = await ShellExecutionService.execute(
-        'unresponsive_process',
-        '/test/dir',
+        "unresponsive_process",
+        "/test/dir",
         onOutputEventMock,
         abortController.signal,
         true,
@@ -1074,23 +1001,17 @@ describe('ShellExecutionService child_process fallback', () => {
       abortController.abort();
 
       // Check the first kill signal
-      expect(mockProcessKill).toHaveBeenCalledWith(
-        -mockChildProcess.pid!,
-        'SIGTERM',
-      );
+      expect(mockProcessKill).toHaveBeenCalledWith(-mockChildProcess.pid!, "SIGTERM");
 
       // Now, advance time past the timeout
       await vi.advanceTimersByTimeAsync(250);
 
       // Check the second kill signal
-      expect(mockProcessKill).toHaveBeenCalledWith(
-        -mockChildProcess.pid!,
-        'SIGKILL',
-      );
+      expect(mockProcessKill).toHaveBeenCalledWith(-mockChildProcess.pid!, "SIGKILL");
 
       // Finally, simulate the process exiting and await the result
-      mockChildProcess.emit('exit', null, 'SIGKILL');
-      mockChildProcess.emit('close', null, 'SIGKILL');
+      mockChildProcess.emit("exit", null, "SIGKILL");
+      mockChildProcess.emit("close", null, "SIGKILL");
       const result = await handle.result;
 
       vi.useRealTimers();
@@ -1100,54 +1021,50 @@ describe('ShellExecutionService child_process fallback', () => {
     });
   });
 
-  describe('Binary Output', () => {
-    it('should detect binary output and switch to progress events', async () => {
+  describe("Binary Output", () => {
+    it("should detect binary output and switch to progress events", async () => {
       mockIsBinary.mockReturnValueOnce(true);
       const binaryChunk1 = Buffer.from([0x89, 0x50, 0x4e, 0x47]);
       const binaryChunk2 = Buffer.from([0x0d, 0x0a, 0x1a, 0x0a]);
 
-      const { result } = await simulateExecution('cat image.png', (cp) => {
-        cp.stdout?.emit('data', binaryChunk1);
-        cp.stdout?.emit('data', binaryChunk2);
-        cp.emit('exit', 0, null);
+      const { result } = await simulateExecution("cat image.png", (cp) => {
+        cp.stdout?.emit("data", binaryChunk1);
+        cp.stdout?.emit("data", binaryChunk2);
+        cp.emit("exit", 0, null);
       });
 
-      expect(result.rawOutput).toEqual(
-        Buffer.concat([binaryChunk1, binaryChunk2]),
-      );
+      expect(result.rawOutput).toEqual(Buffer.concat([binaryChunk1, binaryChunk2]));
       expect(onOutputEventMock).toHaveBeenCalledTimes(1);
       expect(onOutputEventMock.mock.calls[0][0]).toEqual({
-        type: 'binary_detected',
+        type: "binary_detected",
       });
     });
 
-    it('should not emit data events after binary is detected', async () => {
+    it("should not emit data events after binary is detected", async () => {
       mockIsBinary.mockImplementation((buffer) => buffer.includes(0x00));
 
-      await simulateExecution('cat mixed_file', (cp) => {
-        cp.stdout?.emit('data', Buffer.from('some text'));
-        cp.stdout?.emit('data', Buffer.from([0x00, 0x01, 0x02]));
-        cp.stdout?.emit('data', Buffer.from('more text'));
-        cp.emit('exit', 0, null);
+      await simulateExecution("cat mixed_file", (cp) => {
+        cp.stdout?.emit("data", Buffer.from("some text"));
+        cp.stdout?.emit("data", Buffer.from([0x00, 0x01, 0x02]));
+        cp.stdout?.emit("data", Buffer.from("more text"));
+        cp.emit("exit", 0, null);
       });
 
       const eventTypes = onOutputEventMock.mock.calls.map(
         (call: [ShellOutputEvent]) => call[0].type,
       );
-      expect(eventTypes).toEqual(['binary_detected']);
+      expect(eventTypes).toEqual(["binary_detected"]);
     });
   });
 
-  describe('Platform-Specific Behavior', () => {
-    it('should use powershell.exe on Windows', async () => {
-      mockPlatform.mockReturnValue('win32');
-      await simulateExecution('dir "foo bar"', (cp) =>
-        cp.emit('exit', 0, null),
-      );
+  describe("Platform-Specific Behavior", () => {
+    it("should use powershell.exe on Windows", async () => {
+      mockPlatform.mockReturnValue("win32");
+      await simulateExecution('dir "foo bar"', (cp) => cp.emit("exit", 0, null));
 
       expect(mockCpSpawn).toHaveBeenCalledWith(
-        'powershell.exe',
-        ['-NoProfile', '-Command', 'dir "foo bar"'],
+        "powershell.exe",
+        ["-NoProfile", "-Command", 'dir "foo bar"'],
         expect.objectContaining({
           shell: false,
           detached: false,
@@ -1156,16 +1073,13 @@ describe('ShellExecutionService child_process fallback', () => {
       );
     });
 
-    it('should use bash and detached process group on Linux', async () => {
-      mockPlatform.mockReturnValue('linux');
-      await simulateExecution('ls "foo bar"', (cp) => cp.emit('exit', 0, null));
+    it("should use bash and detached process group on Linux", async () => {
+      mockPlatform.mockReturnValue("linux");
+      await simulateExecution('ls "foo bar"', (cp) => cp.emit("exit", 0, null));
 
       expect(mockCpSpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"',
-        ],
+        "bash",
+        ["-c", 'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"'],
         expect.objectContaining({
           shell: false,
           detached: true,
@@ -1175,7 +1089,7 @@ describe('ShellExecutionService child_process fallback', () => {
   });
 });
 
-describe('ShellExecutionService execution method selection', () => {
+describe("ShellExecutionService execution method selection", () => {
   let onOutputEventMock: Mock<(event: ShellOutputEvent) => void>;
   let mockPtyProcess: EventEmitter & {
     pid: number;
@@ -1210,28 +1124,27 @@ describe('ShellExecutionService execution method selection', () => {
     mockPtySpawn.mockReturnValue(mockPtyProcess);
     mockGetPty.mockResolvedValue({
       module: { spawn: mockPtySpawn },
-      name: 'mock-pty',
+      name: "mock-pty",
     });
 
     // Mock for child_process
-    mockChildProcess = new EventEmitter() as EventEmitter &
-      Partial<ChildProcess>;
+    mockChildProcess = new EventEmitter() as EventEmitter & Partial<ChildProcess>;
     mockChildProcess.stdout = new EventEmitter() as Readable;
     mockChildProcess.stderr = new EventEmitter() as Readable;
     mockChildProcess.kill = vi.fn();
-    Object.defineProperty(mockChildProcess, 'pid', {
+    Object.defineProperty(mockChildProcess, "pid", {
       value: 54321,
       configurable: true,
     });
     mockCpSpawn.mockReturnValue(mockChildProcess);
   });
 
-  it('should use node-pty when shouldUseNodePty is true and pty is available', async () => {
+  it("should use node-pty when shouldUseNodePty is true and pty is available", async () => {
     mockSerializeTerminalToObject.mockReturnValue([]);
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
-      'test command',
-      '/test/dir',
+      "test command",
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true, // shouldUseNodePty
@@ -1245,14 +1158,14 @@ describe('ShellExecutionService execution method selection', () => {
     expect(mockGetPty).toHaveBeenCalled();
     expect(mockPtySpawn).toHaveBeenCalled();
     expect(mockCpSpawn).not.toHaveBeenCalled();
-    expect(result.executionMethod).toBe('mock-pty');
+    expect(result.executionMethod).toBe("mock-pty");
   });
 
-  it('should use child_process when shouldUseNodePty is false', async () => {
+  it("should use child_process when shouldUseNodePty is false", async () => {
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
-      'test command',
-      '/test/dir',
+      "test command",
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       false, // shouldUseNodePty
@@ -1260,22 +1173,22 @@ describe('ShellExecutionService execution method selection', () => {
     );
 
     // Simulate exit to allow promise to resolve
-    mockChildProcess.emit('exit', 0, null);
+    mockChildProcess.emit("exit", 0, null);
     const result = await handle.result;
 
     expect(mockGetPty).not.toHaveBeenCalled();
     expect(mockPtySpawn).not.toHaveBeenCalled();
     expect(mockCpSpawn).toHaveBeenCalled();
-    expect(result.executionMethod).toBe('child_process');
+    expect(result.executionMethod).toBe("child_process");
   });
 
-  it('should fall back to child_process if pty is not available even if shouldUseNodePty is true', async () => {
+  it("should fall back to child_process if pty is not available even if shouldUseNodePty is true", async () => {
     mockGetPty.mockResolvedValue(null);
 
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
-      'test command',
-      '/test/dir',
+      "test command",
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true, // shouldUseNodePty
@@ -1283,17 +1196,17 @@ describe('ShellExecutionService execution method selection', () => {
     );
 
     // Simulate exit to allow promise to resolve
-    mockChildProcess.emit('exit', 0, null);
+    mockChildProcess.emit("exit", 0, null);
     const result = await handle.result;
 
     expect(mockGetPty).toHaveBeenCalled();
     expect(mockPtySpawn).not.toHaveBeenCalled();
     expect(mockCpSpawn).toHaveBeenCalled();
-    expect(result.executionMethod).toBe('child_process');
+    expect(result.executionMethod).toBe("child_process");
   });
 });
 
-describe('ShellExecutionService environment variables', () => {
+describe("ShellExecutionService environment variables", () => {
   let mockPtyProcess: EventEmitter & {
     pid: number;
     kill: Mock;
@@ -1327,16 +1240,15 @@ describe('ShellExecutionService environment variables', () => {
     mockPtySpawn.mockReturnValue(mockPtyProcess);
     mockGetPty.mockResolvedValue({
       module: { spawn: mockPtySpawn },
-      name: 'mock-pty',
+      name: "mock-pty",
     });
 
     // Mock for child_process
-    mockChildProcess = new EventEmitter() as EventEmitter &
-      Partial<ChildProcess>;
+    mockChildProcess = new EventEmitter() as EventEmitter & Partial<ChildProcess>;
     mockChildProcess.stdout = new EventEmitter() as Readable;
     mockChildProcess.stderr = new EventEmitter() as Readable;
     mockChildProcess.kill = vi.fn();
-    Object.defineProperty(mockChildProcess, 'pid', {
+    Object.defineProperty(mockChildProcess, "pid", {
       value: 54321,
       configurable: true,
     });
@@ -1345,11 +1257,11 @@ describe('ShellExecutionService environment variables', () => {
     // Default exit behavior for mocks
     mockPtyProcess.onExit.mockImplementationOnce(({ exitCode, signal }) => {
       // Small delay to allow async ops to complete
-      setTimeout(() => mockPtyProcess.emit('exit', { exitCode, signal }), 0);
+      setTimeout(() => mockPtyProcess.emit("exit", { exitCode, signal }), 0);
     });
-    mockChildProcess.on('exit', (code, signal) => {
+    mockChildProcess.on("exit", (code, signal) => {
       // Small delay to allow async ops to complete
-      setTimeout(() => mockChildProcess.emit('close', code, signal), 0);
+      setTimeout(() => mockChildProcess.emit("close", code, signal), 0);
     });
   });
 
@@ -1358,22 +1270,20 @@ describe('ShellExecutionService environment variables', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should use a sanitized environment when in a GitHub run', async () => {
+  it("should use a sanitized environment when in a GitHub run", async () => {
     // Mock the environment to simulate a GitHub Actions run
-    vi.stubEnv('GITHUB_SHA', 'test-sha');
-    vi.stubEnv('MY_SENSITIVE_VAR', 'secret-value'); // This should be stripped out
-    vi.stubEnv('PATH', '/test/path'); // An essential var that should be kept
-    vi.stubEnv('GEMINI_CLI_TEST_VAR', 'test-value'); // A test var that should be kept
+    vi.stubEnv("GITHUB_SHA", "test-sha");
+    vi.stubEnv("MY_SENSITIVE_VAR", "secret-value"); // This should be stripped out
+    vi.stubEnv("PATH", "/test/path"); // An essential var that should be kept
+    vi.stubEnv("GEMINI_CLI_TEST_VAR", "test-value"); // A test var that should be kept
 
     vi.resetModules();
-    const { ShellExecutionService } = await import(
-      './shellExecutionService.js'
-    );
+    const { ShellExecutionService } = await import("./shellExecutionService.js");
 
     // Test pty path
     await ShellExecutionService.execute(
-      'test-pty-command',
-      '/',
+      "test-pty-command",
+      "/",
       vi.fn(),
       new AbortController().signal,
       true,
@@ -1381,9 +1291,9 @@ describe('ShellExecutionService environment variables', () => {
     );
 
     const ptyEnv = mockPtySpawn.mock.calls[0][2].env;
-    expect(ptyEnv).not.toHaveProperty('MY_SENSITIVE_VAR');
-    expect(ptyEnv).toHaveProperty('PATH', '/test/path');
-    expect(ptyEnv).toHaveProperty('GEMINI_CLI_TEST_VAR', 'test-value');
+    expect(ptyEnv).not.toHaveProperty("MY_SENSITIVE_VAR");
+    expect(ptyEnv).toHaveProperty("PATH", "/test/path");
+    expect(ptyEnv).toHaveProperty("GEMINI_CLI_TEST_VAR", "test-value");
 
     // Ensure pty process exits for next test
     mockPtyProcess.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
@@ -1392,8 +1302,8 @@ describe('ShellExecutionService environment variables', () => {
     // Test child_process path
     mockGetPty.mockResolvedValue(null); // Force fallback
     await ShellExecutionService.execute(
-      'test-cp-command',
-      '/',
+      "test-cp-command",
+      "/",
       vi.fn(),
       new AbortController().signal,
       true,
@@ -1401,29 +1311,27 @@ describe('ShellExecutionService environment variables', () => {
     );
 
     const cpEnv = mockCpSpawn.mock.calls[0][2].env;
-    expect(cpEnv).not.toHaveProperty('MY_SENSITIVE_VAR');
-    expect(cpEnv).toHaveProperty('PATH', '/test/path');
-    expect(cpEnv).toHaveProperty('GEMINI_CLI_TEST_VAR', 'test-value');
+    expect(cpEnv).not.toHaveProperty("MY_SENSITIVE_VAR");
+    expect(cpEnv).toHaveProperty("PATH", "/test/path");
+    expect(cpEnv).toHaveProperty("GEMINI_CLI_TEST_VAR", "test-value");
 
     // Ensure child_process exits
-    mockChildProcess.emit('exit', 0, null);
-    mockChildProcess.emit('close', 0, null);
+    mockChildProcess.emit("exit", 0, null);
+    mockChildProcess.emit("close", 0, null);
     await new Promise(process.nextTick);
   });
 
-  it('should include the full process.env when not in a GitHub run', async () => {
-    vi.stubEnv('MY_TEST_VAR', 'test-value');
-    vi.stubEnv('GITHUB_SHA', '');
-    vi.stubEnv('SURFACE', '');
+  it("should include the full process.env when not in a GitHub run", async () => {
+    vi.stubEnv("MY_TEST_VAR", "test-value");
+    vi.stubEnv("GITHUB_SHA", "");
+    vi.stubEnv("SURFACE", "");
     vi.resetModules();
-    const { ShellExecutionService } = await import(
-      './shellExecutionService.js'
-    );
+    const { ShellExecutionService } = await import("./shellExecutionService.js");
 
     // Test pty path
     await ShellExecutionService.execute(
-      'test-pty-command-no-github',
-      '/',
+      "test-pty-command-no-github",
+      "/",
       vi.fn(),
       new AbortController().signal,
       true,
@@ -1431,8 +1339,8 @@ describe('ShellExecutionService environment variables', () => {
     );
     expect(mockPtySpawn).toHaveBeenCalled();
     const ptyEnv = mockPtySpawn.mock.calls[0][2].env;
-    expect(ptyEnv).toHaveProperty('MY_TEST_VAR', 'test-value');
-    expect(ptyEnv).toHaveProperty('GEMINI_CLI', '1');
+    expect(ptyEnv).toHaveProperty("MY_TEST_VAR", "test-value");
+    expect(ptyEnv).toHaveProperty("GEMINI_CLI", "1");
 
     // Ensure pty process exits
     mockPtyProcess.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
@@ -1441,8 +1349,8 @@ describe('ShellExecutionService environment variables', () => {
     // Test child_process path (forcing fallback by making pty unavailable)
     mockGetPty.mockResolvedValue(null);
     await ShellExecutionService.execute(
-      'test-cp-command-no-github',
-      '/',
+      "test-cp-command-no-github",
+      "/",
       vi.fn(),
       new AbortController().signal,
       true, // Still tries pty, but it will fall back
@@ -1450,12 +1358,12 @@ describe('ShellExecutionService environment variables', () => {
     );
     expect(mockCpSpawn).toHaveBeenCalled();
     const cpEnv = mockCpSpawn.mock.calls[0][2].env;
-    expect(cpEnv).toHaveProperty('MY_TEST_VAR', 'test-value');
-    expect(cpEnv).toHaveProperty('GEMINI_CLI', '1');
+    expect(cpEnv).toHaveProperty("MY_TEST_VAR", "test-value");
+    expect(cpEnv).toHaveProperty("GEMINI_CLI", "1");
 
     // Ensure child_process exits
-    mockChildProcess.emit('exit', 0, null);
-    mockChildProcess.emit('close', 0, null);
+    mockChildProcess.emit("exit", 0, null);
+    mockChildProcess.emit("close", 0, null);
     await new Promise(process.nextTick);
   });
 });
diff --git a/packages/gemini-cli-core/src/services/shellExecutionService.ts b/packages/gemini-cli-core/src/services/shellExecutionService.ts
index f917a2999..42dfbe290 100644
--- a/packages/gemini-cli-core/src/services/shellExecutionService.ts
+++ b/packages/gemini-cli-core/src/services/shellExecutionService.ts
@@ -4,21 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import type { PtyImplementation } from '../utils/getPty.js';
-import { getPty } from '../utils/getPty.js';
-import { spawn as cpSpawn } from 'node:child_process';
-import { TextDecoder } from 'node:util';
-import os from 'node:os';
-import type { IPty } from '@lydell/node-pty';
-import { getCachedEncodingForBuffer } from '../utils/systemEncoding.js';
-import { getShellConfiguration, type ShellType } from '../utils/shell-utils.js';
-import { isBinary } from '../utils/textUtils.js';
-import pkg from '@xterm/headless';
-import {
-  serializeTerminalToObject,
-  type AnsiOutput,
-} from '../utils/terminalSerializer.js';
+import { spawn as cpSpawn } from "node:child_process";
+import os from "node:os";
+import { TextDecoder } from "node:util";
+import type { IPty } from "@lydell/node-pty";
+import pkg from "@xterm/headless";
+import stripAnsi from "strip-ansi";
+import type { PtyImplementation } from "../utils/getPty.js";
+import { getPty } from "../utils/getPty.js";
+import { getShellConfiguration, type ShellType } from "../utils/shell-utils.js";
+import { getCachedEncodingForBuffer } from "../utils/systemEncoding.js";
+import { type AnsiOutput, serializeTerminalToObject } from "../utils/terminalSerializer.js";
+import { isBinary } from "../utils/textUtils.js";
+
 const { Terminal } = pkg;
 
 const SIGKILL_TIMEOUT_MS = 200;
@@ -29,11 +27,11 @@ const MAX_CHILD_PROCESS_BUFFER_SIZE = 16 * 1024 * 1024; // 16MB
 // we capture significant output from long-running commands.
 export const SCROLLBACK_LIMIT = 300000;
 
-const BASH_SHOPT_OPTIONS = 'promptvars nullglob extglob nocaseglob dotglob';
+const BASH_SHOPT_OPTIONS = "promptvars nullglob extglob nocaseglob dotglob";
 const BASH_SHOPT_GUARD = `shopt -u ${BASH_SHOPT_OPTIONS};`;
 
 function ensurePromptvarsDisabled(command: string, shell: ShellType): string {
-  if (shell !== 'bash') {
+  if (shell !== "bash") {
     return command;
   }
 
@@ -62,7 +60,7 @@ export interface ShellExecutionResult {
   /** The process ID of the spawned shell. */
   pid: number | undefined;
   /** The method used to execute the shell command. */
-  executionMethod: 'lydell-node-pty' | 'node-pty' | 'child_process' | 'none';
+  executionMethod: "lydell-node-pty" | "node-pty" | "child_process" | "none";
 }
 
 /** A handle for an ongoing shell execution. */
@@ -91,17 +89,17 @@ export interface ShellExecutionConfig {
 export type ShellOutputEvent =
   | {
       /** The event contains a chunk of output data. */
-      type: 'data';
+      type: "data";
       /** The decoded string chunk. */
       chunk: string | AnsiOutput;
     }
   | {
       /** Signals that the output stream has been identified as binary. */
-      type: 'binary_detected';
+      type: "binary_detected";
     }
   | {
       /** Provides progress updates for a binary stream. */
-      type: 'binary_progress';
+      type: "binary_progress";
       /** The total number of bytes received so far. */
       bytesReceived: number;
     };
@@ -141,16 +139,15 @@ const getFullBufferText = (terminal: pkg.Terminal): string => {
   }
 
   // Remove trailing empty lines
-  while (lines.length > 0 && lines[lines.length - 1] === '') {
+  while (lines.length > 0 && lines[lines.length - 1] === "") {
     lines.pop();
   }
 
-  return lines.join('\n');
+  return lines.join("\n");
 };
 
 function getSanitizedEnv(): NodeJS.ProcessEnv {
-  const isRunningInGithub =
-    process.env['GITHUB_SHA'] || process.env['SURFACE'] === 'Github';
+  const isRunningInGithub = process.env["GITHUB_SHA"] || process.env["SURFACE"] === "Github";
 
   if (!isRunningInGithub) {
     // For local runs, we want to preserve the user's full environment.
@@ -161,27 +158,27 @@ function getSanitizedEnv(): NodeJS.ProcessEnv {
   const env: NodeJS.ProcessEnv = {};
   const essentialVars = [
     // Cross-platform
-    'PATH',
+    "PATH",
     // Windows specific
-    'Path',
-    'SYSTEMROOT',
-    'SystemRoot',
-    'COMSPEC',
-    'ComSpec',
-    'PATHEXT',
-    'WINDIR',
-    'TEMP',
-    'TMP',
-    'USERPROFILE',
-    'SYSTEMDRIVE',
-    'SystemDrive',
+    "Path",
+    "SYSTEMROOT",
+    "SystemRoot",
+    "COMSPEC",
+    "ComSpec",
+    "PATHEXT",
+    "WINDIR",
+    "TEMP",
+    "TMP",
+    "USERPROFILE",
+    "SYSTEMDRIVE",
+    "SystemDrive",
     // Unix/Linux/macOS specific
-    'HOME',
-    'LANG',
-    'SHELL',
-    'TMPDIR',
-    'USER',
-    'LOGNAME',
+    "HOME",
+    "LANG",
+    "SHELL",
+    "TMPDIR",
+    "USER",
+    "LOGNAME",
   ];
 
   for (const key of essentialVars) {
@@ -192,7 +189,7 @@ function getSanitizedEnv(): NodeJS.ProcessEnv {
 
   // Always carry over test-specific variables for our own integration tests.
   for (const key in process.env) {
-    if (key.startsWith('GEMINI_CLI_TEST')) {
+    if (key.startsWith("GEMINI_CLI_TEST")) {
       env[key] = process.env[key];
     }
   }
@@ -244,12 +241,7 @@ export class ShellExecutionService {
       }
     }
 
-    return this.childProcessFallback(
-      commandToExecute,
-      cwd,
-      onOutputEvent,
-      abortSignal,
-    );
+    return this.childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal);
   }
 
   private static appendAndTruncate(
@@ -289,23 +281,23 @@ export class ShellExecutionService {
     abortSignal: AbortSignal,
   ): ShellExecutionHandle {
     try {
-      const isWindows = os.platform() === 'win32';
+      const isWindows = os.platform() === "win32";
       const { executable, argsPrefix, shell } = getShellConfiguration();
       const guardedCommand = ensurePromptvarsDisabled(commandToExecute, shell);
       const spawnArgs = [...argsPrefix, guardedCommand];
 
       const child = cpSpawn(executable, spawnArgs, {
         cwd,
-        stdio: ['ignore', 'pipe', 'pipe'],
+        stdio: ["ignore", "pipe", "pipe"],
         windowsVerbatimArguments: isWindows ? false : undefined,
         shell: false,
         detached: !isWindows,
         env: {
           ...getSanitizedEnv(),
-          GEMINI_CLI: '1',
-          TERM: 'xterm-256color',
-          PAGER: 'cat',
-          GIT_PAGER: 'cat',
+          GEMINI_CLI: "1",
+          TERM: "xterm-256color",
+          PAGER: "cat",
+          GIT_PAGER: "cat",
         },
       });
 
@@ -313,8 +305,8 @@ export class ShellExecutionService {
         let stdoutDecoder: TextDecoder | null = null;
         let stderrDecoder: TextDecoder | null = null;
 
-        let stdout = '';
-        let stderr = '';
+        let stdout = "";
+        let stderr = "";
         let stdoutTruncated = false;
         let stderrTruncated = false;
         const outputChunks: Buffer[] = [];
@@ -325,15 +317,15 @@ export class ShellExecutionService {
         const MAX_SNIFF_SIZE = 4096;
         let sniffedBytes = 0;
 
-        const handleOutput = (data: Buffer, stream: 'stdout' | 'stderr') => {
+        const handleOutput = (data: Buffer, stream: "stdout" | "stderr") => {
           if (!stdoutDecoder || !stderrDecoder) {
             const encoding = getCachedEncodingForBuffer(data);
             try {
               stdoutDecoder = new TextDecoder(encoding);
               stderrDecoder = new TextDecoder(encoding);
             } catch {
-              stdoutDecoder = new TextDecoder('utf-8');
-              stderrDecoder = new TextDecoder('utf-8');
+              stdoutDecoder = new TextDecoder("utf-8");
+              stderrDecoder = new TextDecoder("utf-8");
             }
           }
 
@@ -349,10 +341,10 @@ export class ShellExecutionService {
           }
 
           if (isStreamingRawContent) {
-            const decoder = stream === 'stdout' ? stdoutDecoder : stderrDecoder;
+            const decoder = stream === "stdout" ? stdoutDecoder : stderrDecoder;
             const decodedChunk = decoder.decode(data, { stream: true });
 
-            if (stream === 'stdout') {
+            if (stream === "stdout") {
               const { newBuffer, truncated } = this.appendAndTruncate(
                 stdout,
                 decodedChunk,
@@ -376,15 +368,11 @@ export class ShellExecutionService {
           }
         };
 
-        const handleExit = (
-          code: number | null,
-          signal: NodeJS.Signals | null,
-        ) => {
+        const handleExit = (code: number | null, signal: NodeJS.Signals | null) => {
           const { finalBuffer } = cleanup();
           // Ensure we don't add an extra newline if stdout already ends with one.
-          const separator = stdout.endsWith('\n') ? '' : '\n';
-          let combinedOutput =
-            stdout + (stderr ? (stdout ? separator : '') + stderr : '');
+          const separator = stdout.endsWith("\n") ? "" : "\n";
+          let combinedOutput = stdout + (stderr ? (stdout ? separator : "") + stderr : "");
 
           if (stdoutTruncated || stderrTruncated) {
             const truncationMessage = `\n[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to ${
@@ -397,10 +385,10 @@ export class ShellExecutionService {
 
           if (isStreamingRawContent) {
             if (finalStrippedOutput) {
-              onOutputEvent({ type: 'data', chunk: finalStrippedOutput });
+              onOutputEvent({ type: "data", chunk: finalStrippedOutput });
             }
           } else {
-            onOutputEvent({ type: 'binary_detected' });
+            onOutputEvent({ type: "binary_detected" });
           }
 
           resolve({
@@ -411,13 +399,13 @@ export class ShellExecutionService {
             error,
             aborted: abortSignal.aborted,
             pid: undefined,
-            executionMethod: 'child_process',
+            executionMethod: "child_process",
           });
         };
 
-        child.stdout.on('data', (data) => handleOutput(data, 'stdout'));
-        child.stderr.on('data', (data) => handleOutput(data, 'stderr'));
-        child.on('error', (err) => {
+        child.stdout.on("data", (data) => handleOutput(data, "stdout"));
+        child.stderr.on("data", (data) => handleOutput(data, "stderr"));
+        child.on("error", (err) => {
           error = err;
           handleExit(1, null);
         });
@@ -425,24 +413,24 @@ export class ShellExecutionService {
         const abortHandler = async () => {
           if (child.pid && !exited) {
             if (isWindows) {
-              cpSpawn('taskkill', ['/pid', child.pid.toString(), '/f', '/t']);
+              cpSpawn("taskkill", ["/pid", child.pid.toString(), "/f", "/t"]);
             } else {
               try {
-                process.kill(-child.pid, 'SIGTERM');
+                process.kill(-child.pid, "SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
-                  process.kill(-child.pid, 'SIGKILL');
+                  process.kill(-child.pid, "SIGKILL");
                 }
               } catch (_e) {
-                if (!exited) child.kill('SIGKILL');
+                if (!exited) child.kill("SIGKILL");
               }
             }
           }
         };
 
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
 
-        child.on('exit', (code, signal) => {
+        child.on("exit", (code, signal) => {
           if (child.pid) {
             this.activePtys.delete(child.pid);
           }
@@ -451,7 +439,7 @@ export class ShellExecutionService {
 
         function cleanup() {
           exited = true;
-          abortSignal.removeEventListener('abort', abortHandler);
+          abortSignal.removeEventListener("abort", abortHandler);
           if (stdoutDecoder) {
             const remaining = stdoutDecoder.decode();
             if (remaining) {
@@ -478,13 +466,13 @@ export class ShellExecutionService {
         pid: undefined,
         result: Promise.resolve({
           error,
-          rawOutput: Buffer.from(''),
-          output: '',
+          rawOutput: Buffer.from(""),
+          output: "",
           exitCode: 1,
           signal: null,
           aborted: false,
           pid: undefined,
-          executionMethod: 'none',
+          executionMethod: "none",
         }),
       };
     }
@@ -500,7 +488,7 @@ export class ShellExecutionService {
   ): ShellExecutionHandle {
     if (!ptyInfo) {
       // This should not happen, but as a safeguard...
-      throw new Error('PTY implementation not found');
+      throw new Error("PTY implementation not found");
     }
     try {
       const cols = shellExecutionConfig.terminalWidth ?? 80;
@@ -511,15 +499,15 @@ export class ShellExecutionService {
 
       const ptyProcess = ptyInfo.module.spawn(executable, args, {
         cwd,
-        name: 'xterm',
+        name: "xterm",
         cols,
         rows,
         env: {
           ...getSanitizedEnv(),
-          GEMINI_CLI: '1',
-          TERM: 'xterm-256color',
-          PAGER: shellExecutionConfig.pager ?? 'cat',
-          GIT_PAGER: shellExecutionConfig.pager ?? 'cat',
+          GEMINI_CLI: "1",
+          TERM: "xterm-256color",
+          PAGER: shellExecutionConfig.pager ?? "cat",
+          GIT_PAGER: shellExecutionConfig.pager ?? "cat",
         },
         handleFlowControl: true,
       });
@@ -571,13 +559,12 @@ export class ShellExecutionService {
           if (shellExecutionConfig.showColor) {
             newOutput = serializeTerminalToObject(headlessTerminal);
           } else {
-            newOutput = (serializeTerminalToObject(headlessTerminal) || []).map(
-              (line) =>
-                line.map((token) => {
-                  token.fg = '';
-                  token.bg = '';
-                  return token;
-                }),
+            newOutput = (serializeTerminalToObject(headlessTerminal) || []).map((line) =>
+              line.map((token) => {
+                token.fg = "";
+                token.bg = "";
+                return token;
+              }),
             );
           }
 
@@ -587,7 +574,7 @@ export class ShellExecutionService {
             if (
               line
                 .map((segment) => segment.text)
-                .join('')
+                .join("")
                 .trim().length > 0
             ) {
               lastNonEmptyLine = i;
@@ -609,7 +596,7 @@ export class ShellExecutionService {
           if (JSON.stringify(output) !== JSON.stringify(finalOutput)) {
             output = finalOutput;
             onOutputEvent({
-              type: 'data',
+              type: "data",
               chunk: finalOutput,
             });
           }
@@ -649,7 +636,7 @@ export class ShellExecutionService {
                   try {
                     decoder = new TextDecoder(encoding);
                   } catch {
-                    decoder = new TextDecoder('utf-8');
+                    decoder = new TextDecoder("utf-8");
                   }
                 }
 
@@ -661,7 +648,7 @@ export class ShellExecutionService {
 
                   if (isBinary(sniffBuffer)) {
                     isStreamingRawContent = false;
-                    onOutputEvent({ type: 'binary_detected' });
+                    onOutputEvent({ type: "binary_detected" });
                   }
                 }
 
@@ -678,12 +665,9 @@ export class ShellExecutionService {
                     resolve();
                   });
                 } else {
-                  const totalBytes = outputChunks.reduce(
-                    (sum, chunk) => sum + chunk.length,
-                    0,
-                  );
+                  const totalBytes = outputChunks.reduce((sum, chunk) => sum + chunk.length, 0);
                   onOutputEvent({
-                    type: 'binary_progress',
+                    type: "binary_progress",
                     bytesReceived: totalBytes,
                   });
                   resolve();
@@ -693,92 +677,88 @@ export class ShellExecutionService {
         };
 
         ptyProcess.onData((data: string) => {
-          const bufferData = Buffer.from(data, 'utf-8');
+          const bufferData = Buffer.from(data, "utf-8");
           handleOutput(bufferData);
         });
 
-        ptyProcess.onExit(
-          ({ exitCode, signal }: { exitCode: number; signal?: number }) => {
-            exited = true;
-            abortSignal.removeEventListener('abort', abortHandler);
-            this.activePtys.delete(ptyProcess.pid);
-
-            const finalize = () => {
-              render(true);
-              const finalBuffer = Buffer.concat(outputChunks);
-
-              resolve({
-                rawOutput: finalBuffer,
-                output: getFullBufferText(headlessTerminal),
-                exitCode,
-                signal: signal ?? null,
-                error,
-                aborted: abortSignal.aborted,
-                pid: ptyProcess.pid,
-                executionMethod:
-                  (ptyInfo?.name as 'node-pty' | 'lydell-node-pty') ??
-                  'node-pty',
-              });
-            };
+        ptyProcess.onExit(({ exitCode, signal }: { exitCode: number; signal?: number }) => {
+          exited = true;
+          abortSignal.removeEventListener("abort", abortHandler);
+          this.activePtys.delete(ptyProcess.pid);
+
+          const finalize = () => {
+            render(true);
+            const finalBuffer = Buffer.concat(outputChunks);
+
+            resolve({
+              rawOutput: finalBuffer,
+              output: getFullBufferText(headlessTerminal),
+              exitCode,
+              signal: signal ?? null,
+              error,
+              aborted: abortSignal.aborted,
+              pid: ptyProcess.pid,
+              executionMethod: (ptyInfo?.name as "node-pty" | "lydell-node-pty") ?? "node-pty",
+            });
+          };
+
+          if (abortSignal.aborted) {
+            finalize();
+            return;
+          }
 
+          const processingComplete = processingChain.then(() => "processed");
+          const abortFired = new Promise<"aborted">((res) => {
             if (abortSignal.aborted) {
-              finalize();
+              res("aborted");
               return;
             }
-
-            const processingComplete = processingChain.then(() => 'processed');
-            const abortFired = new Promise<'aborted'>((res) => {
-              if (abortSignal.aborted) {
-                res('aborted');
-                return;
-              }
-              abortSignal.addEventListener('abort', () => res('aborted'), {
-                once: true,
-              });
+            abortSignal.addEventListener("abort", () => res("aborted"), {
+              once: true,
             });
+          });
 
-            // eslint-disable-next-line @typescript-eslint/no-floating-promises
-            Promise.race([processingComplete, abortFired]).then(() => {
-              finalize();
-            });
-          },
-        );
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
+          Promise.race([processingComplete, abortFired]).then(() => {
+            finalize();
+          });
+        });
 
         const abortHandler = async () => {
           if (ptyProcess.pid && !exited) {
-            if (os.platform() === 'win32') {
+            if (os.platform() === "win32") {
               ptyProcess.kill();
             } else {
               try {
                 // Kill the entire process group
-                process.kill(-ptyProcess.pid, 'SIGTERM');
+                process.kill(-ptyProcess.pid, "SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
-                  process.kill(-ptyProcess.pid, 'SIGKILL');
+                  process.kill(-ptyProcess.pid, "SIGKILL");
                 }
               } catch (_e) {
                 // Fallback to killing just the process if the group kill fails
-                ptyProcess.kill('SIGTERM');
+                ptyProcess.kill("SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
-                  ptyProcess.kill('SIGKILL');
+                  ptyProcess.kill("SIGKILL");
                 }
               }
             }
           }
         };
 
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
       });
 
       return { pid: ptyProcess.pid, result };
     } catch (e) {
       const error = e as Error;
-      if (error.message.includes('posix_spawnp failed')) {
+      if (error.message.includes("posix_spawnp failed")) {
         onOutputEvent({
-          type: 'data',
+          type: "data",
           chunk:
-            '[GEMINI_CLI_WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n',
+            "[GEMINI_CLI_WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n",
         });
         throw e;
       } else {
@@ -786,13 +766,13 @@ export class ShellExecutionService {
           pid: undefined,
           result: Promise.resolve({
             error,
-            rawOutput: Buffer.from(''),
-            output: '',
+            rawOutput: Buffer.from(""),
+            output: "",
             exitCode: 1,
             signal: null,
             aborted: false,
             pid: undefined,
-            executionMethod: 'none',
+            executionMethod: "none",
           }),
         };
       }
@@ -847,9 +827,9 @@ export class ShellExecutionService {
         // Ignore errors if the pty has already exited, which can happen
         // due to a race condition between the exit event and this call.
         const err = e as { code?: string; message?: string };
-        const isEsrch = err.code === 'ESRCH';
+        const isEsrch = err.code === "ESRCH";
         const isWindowsPtyError = err.message?.includes(
-          'Cannot resize a pty that has already exited',
+          "Cannot resize a pty that has already exited",
         );
 
         if (isEsrch || isWindowsPtyError) {
@@ -884,7 +864,7 @@ export class ShellExecutionService {
       } catch (e) {
         // Ignore errors if the pty has already exited, which can happen
         // due to a race condition between the exit event and this call.
-        if (e instanceof Error && 'code' in e && e.code === 'ESRCH') {
+        if (e instanceof Error && "code" in e && e.code === "ESRCH") {
           // ignore
         } else {
           throw e;
diff --git a/packages/gemini-cli-core/src/telemetry/activity-detector.test.ts b/packages/gemini-cli-core/src/telemetry/activity-detector.test.ts
index dd5d56e5a..3469b08ae 100644
--- a/packages/gemini-cli-core/src/telemetry/activity-detector.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/activity-detector.test.ts
@@ -4,41 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   ActivityDetector,
   getActivityDetector,
-  recordUserActivity,
   isUserActive,
-} from './activity-detector.js';
+  recordUserActivity,
+} from "./activity-detector.js";
 
-describe('ActivityDetector', () => {
+describe("ActivityDetector", () => {
   let detector: ActivityDetector;
 
   beforeEach(() => {
     detector = new ActivityDetector(1000); // 1 second idle threshold for testing
   });
 
-  describe('constructor', () => {
-    it('should initialize with default idle threshold', () => {
+  describe("constructor", () => {
+    it("should initialize with default idle threshold", () => {
       const defaultDetector = new ActivityDetector();
       expect(defaultDetector).toBeInstanceOf(ActivityDetector);
     });
 
-    it('should initialize with custom idle threshold', () => {
+    it("should initialize with custom idle threshold", () => {
       const customDetector = new ActivityDetector(5000);
       expect(customDetector).toBeInstanceOf(ActivityDetector);
     });
   });
 
-  describe('recordActivity', () => {
+  describe("recordActivity", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should update last activity time', () => {
+    it("should update last activity time", () => {
       const beforeTime = detector.getLastActivityTime();
       vi.advanceTimersByTime(100);
 
@@ -49,30 +49,30 @@ describe('ActivityDetector', () => {
     });
   });
 
-  describe('isUserActive', () => {
+  describe("isUserActive", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should return true immediately after construction', () => {
+    it("should return true immediately after construction", () => {
       expect(detector.isUserActive()).toBe(true);
     });
 
-    it('should return true within idle threshold', () => {
+    it("should return true within idle threshold", () => {
       detector.recordActivity();
       expect(detector.isUserActive()).toBe(true);
     });
 
-    it('should return false after idle threshold', () => {
+    it("should return false after idle threshold", () => {
       // Advance time beyond idle threshold
       vi.advanceTimersByTime(2000); // 2 seconds, threshold is 1 second
 
       expect(detector.isUserActive()).toBe(false);
     });
 
-    it('should return true again after recording new activity', () => {
+    it("should return true again after recording new activity", () => {
       // Go idle
       vi.advanceTimersByTime(2000);
       expect(detector.isUserActive()).toBe(false);
@@ -83,14 +83,14 @@ describe('ActivityDetector', () => {
     });
   });
 
-  describe('getTimeSinceLastActivity', () => {
+  describe("getTimeSinceLastActivity", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should return time elapsed since last activity', () => {
+    it("should return time elapsed since last activity", () => {
       detector.recordActivity();
       vi.advanceTimersByTime(500);
 
@@ -99,8 +99,8 @@ describe('ActivityDetector', () => {
     });
   });
 
-  describe('getLastActivityTime', () => {
-    it('should return the timestamp of last activity', () => {
+  describe("getLastActivityTime", () => {
+    it("should return the timestamp of last activity", () => {
       const before = Date.now();
       detector.recordActivity();
       const activityTime = detector.getLastActivityTime();
@@ -112,30 +112,30 @@ describe('ActivityDetector', () => {
   });
 });
 
-describe('Global Activity Detector Functions', () => {
-  describe('global instance', () => {
-    it('should expose a global ActivityDetector via getActivityDetector', () => {
+describe("Global Activity Detector Functions", () => {
+  describe("global instance", () => {
+    it("should expose a global ActivityDetector via getActivityDetector", () => {
       const detector = getActivityDetector();
       expect(detector).toBeInstanceOf(ActivityDetector);
     });
   });
 
-  describe('getActivityDetector', () => {
-    it('should always return the global instance', () => {
+  describe("getActivityDetector", () => {
+    it("should always return the global instance", () => {
       const detector = getActivityDetector();
       const detectorAgain = getActivityDetector();
       expect(detectorAgain).toBe(detector);
     });
   });
 
-  describe('recordUserActivity', () => {
+  describe("recordUserActivity", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should record activity on existing detector', () => {
+    it("should record activity on existing detector", () => {
       const detector = getActivityDetector()!;
       const beforeTime = detector.getLastActivityTime();
       vi.advanceTimersByTime(100);
@@ -147,14 +147,14 @@ describe('Global Activity Detector Functions', () => {
     });
   });
 
-  describe('isUserActive', () => {
+  describe("isUserActive", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should reflect global detector state', () => {
+    it("should reflect global detector state", () => {
       expect(isUserActive()).toBe(true);
       // Default idle threshold is 30s; advance beyond it
       vi.advanceTimersByTime(31000);
diff --git a/packages/gemini-cli-core/src/telemetry/activity-monitor.test.ts b/packages/gemini-cli-core/src/telemetry/activity-monitor.test.ts
index 8d20daa30..5079e87cc 100644
--- a/packages/gemini-cli-core/src/telemetry/activity-monitor.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/activity-monitor.test.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { ActivityEvent } from "./activity-monitor.js";
 import {
   ActivityMonitor,
   DEFAULT_ACTIVITY_CONFIG,
-  initializeActivityMonitor,
   getActivityMonitor,
+  initializeActivityMonitor,
   recordGlobalActivity,
   startGlobalActivityMonitoring,
   stopGlobalActivityMonitoring,
-} from './activity-monitor.js';
-import { ActivityType } from './activity-types.js';
-import type { ActivityEvent } from './activity-monitor.js';
-import type { Config } from '../config/config.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "./activity-monitor.js";
+import { ActivityType } from "./activity-types.js";
 
 // Mock the dependencies
-vi.mock('./metrics.js', () => ({
+vi.mock("./metrics.js", () => ({
   isPerformanceMonitoringActive: vi.fn(() => true),
 }));
 
-vi.mock('./memory-monitor.js', () => ({
+vi.mock("./memory-monitor.js", () => ({
   getMemoryMonitor: vi.fn(() => ({
     takeSnapshot: vi.fn(() => ({
       timestamp: Date.now(),
@@ -38,14 +38,14 @@ vi.mock('./memory-monitor.js', () => ({
   })),
 }));
 
-describe('ActivityMonitor', () => {
+describe("ActivityMonitor", () => {
   let activityMonitor: ActivityMonitor;
   let mockConfig: Config;
 
   beforeEach(() => {
     vi.clearAllMocks();
     mockConfig = {
-      getSessionId: () => 'test-session-123',
+      getSessionId: () => "test-session-123",
     } as Config;
     activityMonitor = new ActivityMonitor();
   });
@@ -54,14 +54,14 @@ describe('ActivityMonitor', () => {
     activityMonitor.stop();
   });
 
-  describe('constructor', () => {
-    it('should initialize with default config', () => {
+  describe("constructor", () => {
+    it("should initialize with default config", () => {
       const monitor = new ActivityMonitor();
       expect(monitor).toBeDefined();
       expect(monitor.isMonitoringActive()).toBe(false);
     });
 
-    it('should initialize with custom config', () => {
+    it("should initialize with custom config", () => {
       const customConfig = {
         ...DEFAULT_ACTIVITY_CONFIG,
         snapshotThrottleMs: 2000,
@@ -71,8 +71,8 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('start and stop', () => {
-    it('should start and stop monitoring', () => {
+  describe("start and stop", () => {
+    it("should start and stop monitoring", () => {
       expect(activityMonitor.isMonitoringActive()).toBe(false);
 
       activityMonitor.start(mockConfig);
@@ -82,7 +82,7 @@ describe('ActivityMonitor', () => {
       expect(activityMonitor.isMonitoringActive()).toBe(false);
     });
 
-    it('should not start monitoring when already active', () => {
+    it("should not start monitoring when already active", () => {
       activityMonitor.start(mockConfig);
       expect(activityMonitor.isMonitoringActive()).toBe(true);
 
@@ -92,35 +92,28 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('recordActivity', () => {
+  describe("recordActivity", () => {
     beforeEach(() => {
       activityMonitor.start(mockConfig);
     });
 
-    it('should record activity events', () => {
-      activityMonitor.recordActivity(
-        ActivityType.USER_INPUT_START,
-        'test-context',
-      );
+    it("should record activity events", () => {
+      activityMonitor.recordActivity(ActivityType.USER_INPUT_START, "test-context");
 
       const stats = activityMonitor.getActivityStats();
       expect(stats.totalEvents).toBe(2); // includes the start event
       expect(stats.eventTypes[ActivityType.USER_INPUT_START]).toBe(1);
     });
 
-    it('should include metadata in activity events', () => {
-      const metadata = { key: 'value', count: 42 };
-      activityMonitor.recordActivity(
-        ActivityType.MESSAGE_ADDED,
-        'test-context',
-        metadata,
-      );
+    it("should include metadata in activity events", () => {
+      const metadata = { key: "value", count: 42 };
+      activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED, "test-context", metadata);
 
       const recentActivity = activityMonitor.getRecentActivity(1);
       expect(recentActivity[0].metadata).toEqual(metadata);
     });
 
-    it('should not record activity when monitoring is disabled', () => {
+    it("should not record activity when monitoring is disabled", () => {
       activityMonitor.updateConfig({ enabled: false });
 
       activityMonitor.recordActivity(ActivityType.USER_INPUT_START);
@@ -129,15 +122,12 @@ describe('ActivityMonitor', () => {
       expect(stats.totalEvents).toBe(1); // only the start event
     });
 
-    it('should limit event buffer size', () => {
+    it("should limit event buffer size", () => {
       activityMonitor.updateConfig({ maxEventBuffer: 3 });
 
       // Record more events than buffer size
       for (let i = 0; i < 5; i++) {
-        activityMonitor.recordActivity(
-          ActivityType.USER_INPUT_START,
-          `event-${i}`,
-        );
+        activityMonitor.recordActivity(ActivityType.USER_INPUT_START, `event-${i}`);
       }
 
       const stats = activityMonitor.getActivityStats();
@@ -145,7 +135,7 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('listeners', () => {
+  describe("listeners", () => {
     let listenerCallCount: number;
     let lastEvent: ActivityEvent | null;
 
@@ -155,21 +145,21 @@ describe('ActivityMonitor', () => {
       activityMonitor.start(mockConfig);
     });
 
-    it('should notify listeners of activity events', () => {
+    it("should notify listeners of activity events", () => {
       const listener = (event: ActivityEvent) => {
         listenerCallCount++;
         lastEvent = event;
       };
 
       activityMonitor.addListener(listener);
-      activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED, 'test');
+      activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED, "test");
 
       expect(listenerCallCount).toBe(1);
       expect(lastEvent?.type).toBe(ActivityType.MESSAGE_ADDED);
-      expect(lastEvent?.context).toBe('test');
+      expect(lastEvent?.context).toBe("test");
     });
 
-    it('should remove listeners correctly', () => {
+    it("should remove listeners correctly", () => {
       const listener = () => {
         listenerCallCount++;
       };
@@ -183,18 +173,16 @@ describe('ActivityMonitor', () => {
       expect(listenerCallCount).toBe(1); // Should not increase
     });
 
-    it('should handle listener errors gracefully', () => {
+    it("should handle listener errors gracefully", () => {
       const faultyListener = () => {
-        throw new Error('Listener error');
+        throw new Error("Listener error");
       };
       const goodListener = () => {
         listenerCallCount++;
       };
 
       // Spy on console.debug to check error handling
-      const debugSpy = vi
-        .spyOn(debugLogger, 'debug')
-        .mockImplementation(() => {});
+      const debugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
 
       activityMonitor.addListener(faultyListener);
       activityMonitor.addListener(goodListener);
@@ -208,12 +196,12 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('getActivityStats', () => {
+  describe("getActivityStats", () => {
     beforeEach(() => {
       activityMonitor.start(mockConfig);
     });
 
-    it('should return correct activity statistics', () => {
+    it("should return correct activity statistics", () => {
       activityMonitor.recordActivity(ActivityType.USER_INPUT_START);
       activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED);
       activityMonitor.recordActivity(ActivityType.USER_INPUT_START);
@@ -225,7 +213,7 @@ describe('ActivityMonitor', () => {
       expect(stats.timeRange).toBeDefined();
     });
 
-    it('should return null time range for empty buffer', () => {
+    it("should return null time range for empty buffer", () => {
       const emptyMonitor = new ActivityMonitor();
       const stats = emptyMonitor.getActivityStats();
       expect(stats.totalEvents).toBe(0);
@@ -233,8 +221,8 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('updateConfig', () => {
-    it('should update configuration correctly', () => {
+  describe("updateConfig", () => {
+    it("should update configuration correctly", () => {
       const newConfig = { snapshotThrottleMs: 2000 };
       activityMonitor.updateConfig(newConfig);
 
@@ -244,12 +232,12 @@ describe('ActivityMonitor', () => {
   });
 });
 
-describe('Global activity monitoring functions', () => {
+describe("Global activity monitoring functions", () => {
   let mockConfig: Config;
 
   beforeEach(() => {
     mockConfig = {
-      getSessionId: () => 'test-session-456',
+      getSessionId: () => "test-session-456",
     } as Config;
     vi.clearAllMocks();
   });
@@ -258,32 +246,32 @@ describe('Global activity monitoring functions', () => {
     stopGlobalActivityMonitoring();
   });
 
-  describe('initializeActivityMonitor', () => {
-    it('should create global monitor instance', () => {
+  describe("initializeActivityMonitor", () => {
+    it("should create global monitor instance", () => {
       const monitor = initializeActivityMonitor();
       expect(monitor).toBeDefined();
       expect(getActivityMonitor()).toBe(monitor);
     });
 
-    it('should return same instance on subsequent calls', () => {
+    it("should return same instance on subsequent calls", () => {
       const monitor1 = initializeActivityMonitor();
       const monitor2 = initializeActivityMonitor();
       expect(monitor1).toBe(monitor2);
     });
   });
 
-  describe('recordGlobalActivity', () => {
-    it('should record activity through global monitor', () => {
+  describe("recordGlobalActivity", () => {
+    it("should record activity through global monitor", () => {
       startGlobalActivityMonitoring(mockConfig);
 
-      recordGlobalActivity(ActivityType.TOOL_CALL_SCHEDULED, 'global-test');
+      recordGlobalActivity(ActivityType.TOOL_CALL_SCHEDULED, "global-test");
 
       const monitor = getActivityMonitor();
       const stats = monitor?.getActivityStats();
       expect(stats?.totalEvents).toBeGreaterThan(0);
     });
 
-    it('should handle missing global monitor gracefully', () => {
+    it("should handle missing global monitor gracefully", () => {
       stopGlobalActivityMonitoring();
 
       // Should not throw error
@@ -293,15 +281,15 @@ describe('Global activity monitoring functions', () => {
     });
   });
 
-  describe('startGlobalActivityMonitoring', () => {
-    it('should start global monitoring with default config', () => {
+  describe("startGlobalActivityMonitoring", () => {
+    it("should start global monitoring with default config", () => {
       startGlobalActivityMonitoring(mockConfig);
 
       const monitor = getActivityMonitor();
       expect(monitor?.isMonitoringActive()).toBe(true);
     });
 
-    it('should start global monitoring with custom config', () => {
+    it("should start global monitoring with custom config", () => {
       const customConfig = {
         ...DEFAULT_ACTIVITY_CONFIG,
         snapshotThrottleMs: 3000,
@@ -314,8 +302,8 @@ describe('Global activity monitoring functions', () => {
     });
   });
 
-  describe('stopGlobalActivityMonitoring', () => {
-    it('should stop global monitoring', () => {
+  describe("stopGlobalActivityMonitoring", () => {
+    it("should stop global monitoring", () => {
       startGlobalActivityMonitoring(mockConfig);
       expect(getActivityMonitor()?.isMonitoringActive()).toBe(true);
 
@@ -323,7 +311,7 @@ describe('Global activity monitoring functions', () => {
       expect(getActivityMonitor()?.isMonitoringActive()).toBe(false);
     });
 
-    it('should handle missing global monitor gracefully', () => {
+    it("should handle missing global monitor gracefully", () => {
       expect(() => {
         stopGlobalActivityMonitoring();
       }).not.toThrow();
diff --git a/packages/gemini-cli-core/src/telemetry/activity-monitor.ts b/packages/gemini-cli-core/src/telemetry/activity-monitor.ts
index 2c9393bdb..fe609aeb7 100644
--- a/packages/gemini-cli-core/src/telemetry/activity-monitor.ts
+++ b/packages/gemini-cli-core/src/telemetry/activity-monitor.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { isPerformanceMonitoringActive } from './metrics.js';
-import { getMemoryMonitor } from './memory-monitor.js';
-import { ActivityType } from './activity-types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { ActivityType } from "./activity-types.js";
+import { getMemoryMonitor } from "./memory-monitor.js";
+import { isPerformanceMonitoringActive } from "./metrics.js";
 
 /**
  * Activity event data structure
@@ -86,10 +86,7 @@ export class ActivityMonitor {
     this.addListener(this.memoryMonitoringListener);
 
     // Record activity monitoring start
-    this.recordActivity(
-      ActivityType.MANUAL_TRIGGER,
-      'activity_monitoring_start',
-    );
+    this.recordActivity(ActivityType.MANUAL_TRIGGER, "activity_monitoring_start");
   }
 
   /**
@@ -125,11 +122,7 @@ export class ActivityMonitor {
   /**
    * Record a user activity event
    */
-  recordActivity(
-    type: ActivityType,
-    context?: string,
-    metadata?: Record<string, unknown>,
-  ): void {
+  recordActivity(type: ActivityType, context?: string, metadata?: Record<string, unknown>): void {
     if (!this.isActive || !this.config.enabled) {
       return;
     }
@@ -153,7 +146,7 @@ export class ActivityMonitor {
         listener(event);
       } catch (error) {
         // Silently catch listener errors to avoid disrupting the application
-        debugLogger.debug('ActivityMonitor listener error:', error);
+        debugLogger.debug("ActivityMonitor listener error:", error);
       }
     });
   }
@@ -201,10 +194,7 @@ export class ActivityMonitor {
   /**
    * Handle memory monitoring for activity events
    */
-  private handleMemoryMonitoringActivity(
-    event: ActivityEvent,
-    config: Config,
-  ): void {
+  private handleMemoryMonitoringActivity(event: ActivityEvent, config: Config): void {
     // Check if this activity type should trigger memory monitoring
     if (!this.config.triggerActivities.includes(event.type)) {
       return;
@@ -243,9 +233,7 @@ let globalActivityMonitor: ActivityMonitor | null = null;
 /**
  * Initialize global activity monitor
  */
-export function initializeActivityMonitor(
-  config?: ActivityMonitorConfig,
-): ActivityMonitor {
+export function initializeActivityMonitor(config?: ActivityMonitorConfig): ActivityMonitor {
   if (!globalActivityMonitor) {
     globalActivityMonitor = new ActivityMonitor(config);
   }
diff --git a/packages/gemini-cli-core/src/telemetry/activity-types.ts b/packages/gemini-cli-core/src/telemetry/activity-types.ts
index c970a725c..aff0ff822 100644
--- a/packages/gemini-cli-core/src/telemetry/activity-types.ts
+++ b/packages/gemini-cli-core/src/telemetry/activity-types.ts
@@ -8,13 +8,13 @@
  * Types of user activities that can be tracked
  */
 export enum ActivityType {
-  USER_INPUT_START = 'user_input_start',
-  USER_INPUT_END = 'user_input_end',
-  MESSAGE_ADDED = 'message_added',
-  TOOL_CALL_SCHEDULED = 'tool_call_scheduled',
-  TOOL_CALL_COMPLETED = 'tool_call_completed',
-  STREAM_START = 'stream_start',
-  STREAM_END = 'stream_end',
-  HISTORY_UPDATED = 'history_updated',
-  MANUAL_TRIGGER = 'manual_trigger',
+  USER_INPUT_START = "user_input_start",
+  USER_INPUT_END = "user_input_end",
+  MESSAGE_ADDED = "message_added",
+  TOOL_CALL_SCHEDULED = "tool_call_scheduled",
+  TOOL_CALL_COMPLETED = "tool_call_completed",
+  STREAM_START = "stream_start",
+  STREAM_END = "stream_end",
+  HISTORY_UPDATED = "history_updated",
+  MANUAL_TRIGGER = "manual_trigger",
 }
diff --git a/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts b/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts
index 5c5f3d57a..71d2bc1a9 100644
--- a/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts
@@ -4,39 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import 'vitest';
+import "vitest";
+import { HttpResponse, http } from "msw";
+import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
+import { AgentTerminateMode } from "../../agents/types.js";
+import type { ConfigParameters } from "../../config/config.js";
+import type { ContentGeneratorConfig } from "../../core/contentGenerator.js";
+import { AuthType } from "../../core/contentGenerator.js";
+import type { SuccessfulToolCall } from "../../core/coreToolScheduler.js";
+import { CLI_VERSION, GIT_COMMIT_INFO } from "../../generated/git-commit.js";
+import { server } from "../../mocks/msw.js";
+import { makeFakeConfig } from "../../test-utils/config.js";
+import { InstallationManager } from "../../utils/installationManager.js";
+import { UserAccountManager } from "../../utils/userAccountManager.js";
 import {
-  vi,
-  describe,
-  it,
-  expect,
-  afterEach,
-  beforeAll,
-  afterAll,
-} from 'vitest';
-import type { LogEvent, LogEventEntry } from './clearcut-logger.js';
-import { ClearcutLogger, EventNames, TEST_ONLY } from './clearcut-logger.js';
-import type { ContentGeneratorConfig } from '../../core/contentGenerator.js';
-import { AuthType } from '../../core/contentGenerator.js';
-import type { SuccessfulToolCall } from '../../core/coreToolScheduler.js';
-import type { ConfigParameters } from '../../config/config.js';
-import { EventMetadataKey } from './event-metadata-key.js';
-import { makeFakeConfig } from '../../test-utils/config.js';
-import { http, HttpResponse } from 'msw';
-import { server } from '../../mocks/msw.js';
-import {
-  UserPromptEvent,
-  makeChatCompressionEvent,
+  AgentFinishEvent,
+  AgentStartEvent,
   ModelRoutingEvent,
+  makeChatCompressionEvent,
   ToolCallEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
+  UserPromptEvent,
   WebFetchFallbackAttemptEvent,
-} from '../types.js';
-import { AgentTerminateMode } from '../../agents/types.js';
-import { GIT_COMMIT_INFO, CLI_VERSION } from '../../generated/git-commit.js';
-import { UserAccountManager } from '../../utils/userAccountManager.js';
-import { InstallationManager } from '../../utils/installationManager.js';
+} from "../types.js";
+import type { LogEvent, LogEventEntry } from "./clearcut-logger.js";
+import { ClearcutLogger, EventNames, TEST_ONLY } from "./clearcut-logger.js";
+import { EventMetadataKey } from "./event-metadata-key.js";
 
 interface CustomMatchers<R = unknown> {
   toHaveMetadataValue: ([key, value]: [EventMetadataKey, string]) => R;
@@ -45,7 +37,7 @@ interface CustomMatchers<R = unknown> {
   toHaveGwsExperiments: (exps: number[]) => R;
 }
 
-declare module 'vitest' {
+declare module "vitest" {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-object-type
   interface Matchers<T = any> extends CustomMatchers<T> {}
 }
@@ -57,17 +49,13 @@ expect.extend({
     const pass = event.event_name === (name as unknown as string);
     return {
       pass,
-      message: () =>
-        `event name ${event.event_name} does${isNot ? ' not ' : ''} match ${name}}`,
+      message: () => `event name ${event.event_name} does${isNot ? " not " : ""} match ${name}}`,
     };
   },
 
-  toHaveMetadataValue(
-    received: LogEventEntry[],
-    [key, value]: [EventMetadataKey, string],
-  ) {
+  toHaveMetadataValue(received: LogEventEntry[], [key, value]: [EventMetadataKey, string]) {
     const event = JSON.parse(received[0].source_extension_json) as LogEvent;
-    const metadata = event['event_metadata'][0];
+    const metadata = event["event_metadata"][0];
     const data = metadata.find((m) => m.gemini_cli_key === key)?.value;
 
     const pass = data !== undefined && data === value;
@@ -81,20 +69,19 @@ expect.extend({
   toHaveMetadataKey(received: LogEventEntry[], key: EventMetadataKey) {
     const { isNot } = this;
     const event = JSON.parse(received[0].source_extension_json) as LogEvent;
-    const metadata = event['event_metadata'][0];
+    const metadata = event["event_metadata"][0];
 
     const pass = metadata.some((m) => m.gemini_cli_key === key);
 
     return {
       pass,
-      message: () =>
-        `event ${received} ${isNot ? 'has' : 'does not have'} the metadata key ${key}`,
+      message: () => `event ${received} ${isNot ? "has" : "does not have"} the metadata key ${key}`,
     };
   },
 });
 
-vi.mock('../../utils/userAccountManager.js');
-vi.mock('../../utils/installationManager.js');
+vi.mock("../../utils/userAccountManager.js");
+vi.mock("../../utils/installationManager.js");
 
 const mockUserAccount = vi.mocked(UserAccountManager.prototype);
 const mockInstallMgr = vi.mocked(InstallationManager.prototype);
@@ -112,20 +99,20 @@ afterAll(() => {
   server.close();
 });
 
-describe('ClearcutLogger', () => {
+describe("ClearcutLogger", () => {
   const NEXT_WAIT_MS = 1234;
-  const CLEARCUT_URL = 'https://play.googleapis.com/log';
-  const MOCK_DATE = new Date('2025-01-02T00:00:00.000Z');
+  const CLEARCUT_URL = "https://play.googleapis.com/log";
+  const MOCK_DATE = new Date("2025-01-02T00:00:00.000Z");
   const EXAMPLE_RESPONSE = `["${NEXT_WAIT_MS}",null,[[["ANDROID_BACKUP",0],["BATTERY_STATS",0],["SMART_SETUP",0],["TRON",0]],-3334737594024971225],[]]`;
 
   // A helper to get the internal events array for testing
   const getEvents = (l: ClearcutLogger): LogEventEntry[][] =>
-    l['events'].toArray() as LogEventEntry[][];
+    l["events"].toArray() as LogEventEntry[][];
 
-  const getEventsSize = (l: ClearcutLogger): number => l['events'].size;
+  const getEventsSize = (l: ClearcutLogger): number => l["events"].size;
 
   const requeueFailedEvents = (l: ClearcutLogger, events: LogEventEntry[][]) =>
-    l['requeueFailedEvents'](events);
+    l["requeueFailedEvents"](events);
 
   afterEach(() => {
     vi.unstubAllEnvs();
@@ -138,11 +125,9 @@ describe('ClearcutLogger', () => {
       },
     } as unknown as Partial<ConfigParameters>,
     lifetimeGoogleAccounts = 1,
-    cachedGoogleAccount = 'test@google.com',
+    cachedGoogleAccount = "test@google.com",
   } = {}) {
-    server.resetHandlers(
-      http.post(CLEARCUT_URL, () => HttpResponse.text(EXAMPLE_RESPONSE)),
-    );
+    server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.text(EXAMPLE_RESPONSE)));
 
     vi.useFakeTimers();
     vi.setSystemTime(MOCK_DATE);
@@ -153,12 +138,8 @@ describe('ClearcutLogger', () => {
     ClearcutLogger.clearInstance();
 
     mockUserAccount.getCachedGoogleAccount.mockReturnValue(cachedGoogleAccount);
-    mockUserAccount.getLifetimeGoogleAccounts.mockReturnValue(
-      lifetimeGoogleAccounts,
-    );
-    mockInstallMgr.getInstallationId = vi
-      .fn()
-      .mockReturnValue('test-installation-id');
+    mockUserAccount.getLifetimeGoogleAccounts.mockReturnValue(lifetimeGoogleAccounts);
+    mockInstallMgr.getInstallationId = vi.fn().mockReturnValue("test-installation-id");
 
     const logger = ClearcutLogger.getInstance(loggerConfig);
 
@@ -171,27 +152,27 @@ describe('ClearcutLogger', () => {
     vi.restoreAllMocks();
   });
 
-  describe('getInstance', () => {
+  describe("getInstance", () => {
     it.each([
       { usageStatisticsEnabled: false, expectedValue: undefined },
       {
         usageStatisticsEnabled: true,
         expectedValue: expect.any(ClearcutLogger),
       },
-    ])(
-      'returns an instance if usage statistics are enabled',
-      ({ usageStatisticsEnabled, expectedValue }) => {
-        ClearcutLogger.clearInstance();
-        const { logger } = setup({
-          config: {
-            usageStatisticsEnabled,
-          },
-        });
-        expect(logger).toEqual(expectedValue);
-      },
-    );
+    ])("returns an instance if usage statistics are enabled", ({
+      usageStatisticsEnabled,
+      expectedValue,
+    }) => {
+      ClearcutLogger.clearInstance();
+      const { logger } = setup({
+        config: {
+          usageStatisticsEnabled,
+        },
+      });
+      expect(logger).toEqual(expectedValue);
+    });
 
-    it('is a singleton', () => {
+    it("is a singleton", () => {
       ClearcutLogger.clearInstance();
       const { loggerConfig } = setup();
       const logger1 = ClearcutLogger.getInstance(loggerConfig);
@@ -200,8 +181,8 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('createLogEvent', () => {
-    it('logs the total number of google accounts', () => {
+  describe("createLogEvent", () => {
+    it("logs the total number of google accounts", () => {
       const { logger } = setup({
         lifetimeGoogleAccounts: 9001,
       });
@@ -210,19 +191,19 @@ describe('ClearcutLogger', () => {
 
       expect(event?.event_metadata[0]).toContainEqual({
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
-        value: '9001',
+        value: "9001",
       });
     });
 
-    it('logs default metadata', () => {
+    it("logs default metadata", () => {
       // Define expected values
-      const session_id = 'my-session-id';
+      const session_id = "my-session-id";
       const auth_type = AuthType.USE_GEMINI;
       const google_accounts = 123;
-      const surface = 'ide-1234';
+      const surface = "ide-1234";
       const cli_version = CLI_VERSION;
       const git_commit_hash = GIT_COMMIT_INFO;
-      const prompt_id = 'my-prompt-123';
+      const prompt_id = "my-prompt-123";
 
       // Setup logger with expected values
       const { logger, loggerConfig } = setup({
@@ -230,11 +211,11 @@ describe('ClearcutLogger', () => {
         config: { sessionId: session_id },
       });
 
-      vi.spyOn(loggerConfig, 'getContentGeneratorConfig').mockReturnValue({
+      vi.spyOn(loggerConfig, "getContentGeneratorConfig").mockReturnValue({
         authType: auth_type,
       } as ContentGeneratorConfig);
       logger?.logNewPromptEvent(new UserPromptEvent(1, prompt_id)); // prompt_id == session_id before this
-      vi.stubEnv('SURFACE', surface);
+      vi.stubEnv("SURFACE", surface);
 
       // Create log event
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
@@ -282,7 +263,7 @@ describe('ClearcutLogger', () => {
       );
     });
 
-    it('logs the current nodejs version', () => {
+    it("logs the current nodejs version", () => {
       const { logger } = setup({});
 
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
@@ -293,13 +274,13 @@ describe('ClearcutLogger', () => {
       });
     });
 
-    it('logs all user settings', () => {
+    it("logs all user settings", () => {
       const { logger } = setup({
         config: { useSmartEdit: true },
       });
 
-      vi.stubEnv('TERM_PROGRAM', 'vscode');
-      vi.stubEnv('SURFACE', 'ide-1234');
+      vi.stubEnv("TERM_PROGRAM", "vscode");
+      vi.stubEnv("SURFACE", "ide-1234");
 
       const event = logger?.createLogEvent(EventNames.TOOL_CALL, []);
 
@@ -317,148 +298,138 @@ describe('ClearcutLogger', () => {
 
     it.each<SurfaceDetectionTestCase>([
       {
-        name: 'github action',
-        env: { GITHUB_SHA: '8675309' },
-        expected: 'GitHub',
+        name: "github action",
+        env: { GITHUB_SHA: "8675309" },
+        expected: "GitHub",
       },
       {
-        name: 'Cloud Shell via EDITOR_IN_CLOUD_SHELL',
-        env: { EDITOR_IN_CLOUD_SHELL: 'true' },
-        expected: 'cloudshell',
+        name: "Cloud Shell via EDITOR_IN_CLOUD_SHELL",
+        env: { EDITOR_IN_CLOUD_SHELL: "true" },
+        expected: "cloudshell",
       },
       {
-        name: 'Cloud Shell via CLOUD_SHELL',
-        env: { CLOUD_SHELL: 'true' },
-        expected: 'cloudshell',
+        name: "Cloud Shell via CLOUD_SHELL",
+        env: { CLOUD_SHELL: "true" },
+        expected: "cloudshell",
       },
       {
-        name: 'VSCode via TERM_PROGRAM',
+        name: "VSCode via TERM_PROGRAM",
         env: {
-          TERM_PROGRAM: 'vscode',
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
-          MONOSPACE_ENV: '',
+          MONOSPACE_ENV: "",
         },
-        expected: 'vscode',
+        expected: "vscode",
       },
       {
-        name: 'SURFACE env var',
-        env: { SURFACE: 'ide-1234' },
-        expected: 'ide-1234',
+        name: "SURFACE env var",
+        env: { SURFACE: "ide-1234" },
+        expected: "ide-1234",
       },
       {
-        name: 'SURFACE env var takes precedence',
-        env: { TERM_PROGRAM: 'vscode', SURFACE: 'ide-1234' },
-        expected: 'ide-1234',
+        name: "SURFACE env var takes precedence",
+        env: { TERM_PROGRAM: "vscode", SURFACE: "ide-1234" },
+        expected: "ide-1234",
       },
       {
-        name: 'Cursor',
+        name: "Cursor",
         env: {
-          CURSOR_TRACE_ID: 'abc123',
-          TERM_PROGRAM: 'vscode',
+          CURSOR_TRACE_ID: "abc123",
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
         },
-        expected: 'cursor',
+        expected: "cursor",
       },
       {
-        name: 'Firebase Studio',
+        name: "Firebase Studio",
         env: {
-          MONOSPACE_ENV: 'true',
-          TERM_PROGRAM: 'vscode',
+          MONOSPACE_ENV: "true",
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
         },
-        expected: 'firebasestudio',
+        expected: "firebasestudio",
       },
       {
-        name: 'Devin',
+        name: "Devin",
         env: {
-          __COG_BASHRC_SOURCED: 'true',
-          TERM_PROGRAM: 'vscode',
+          __COG_BASHRC_SOURCED: "true",
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
         },
-        expected: 'devin',
+        expected: "devin",
       },
       {
-        name: 'unidentified',
+        name: "unidentified",
         env: {
           GITHUB_SHA: undefined,
           TERM_PROGRAM: undefined,
           SURFACE: undefined,
         },
-        expected: 'SURFACE_NOT_SET',
-      },
-    ])(
-      'logs the current surface as $expected from $name',
-      ({ env, expected }) => {
-        const { logger } = setup({});
-        for (const [key, value] of Object.entries(env)) {
-          vi.stubEnv(key, value);
-        }
-        const event = logger?.createLogEvent(EventNames.API_ERROR, []);
-        expect(event?.event_metadata[0]).toContainEqual({
-          gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
-          value: expected,
-        });
+        expected: "SURFACE_NOT_SET",
       },
-    );
+    ])("logs the current surface as $expected from $name", ({ env, expected }) => {
+      const { logger } = setup({});
+      for (const [key, value] of Object.entries(env)) {
+        vi.stubEnv(key, value);
+      }
+      const event = logger?.createLogEvent(EventNames.API_ERROR, []);
+      expect(event?.event_metadata[0]).toContainEqual({
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
+        value: expected,
+      });
+    });
   });
 
-  describe('GH_WORKFLOW_NAME metadata', () => {
-    it('includes workflow name when GH_WORKFLOW_NAME is set', () => {
+  describe("GH_WORKFLOW_NAME metadata", () => {
+    it("includes workflow name when GH_WORKFLOW_NAME is set", () => {
       const { logger } = setup({});
-      vi.stubEnv('GH_WORKFLOW_NAME', 'test-workflow');
+      vi.stubEnv("GH_WORKFLOW_NAME", "test-workflow");
 
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
       expect(event?.event_metadata[0]).toContainEqual({
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_GH_WORKFLOW_NAME,
-        value: 'test-workflow',
+        value: "test-workflow",
       });
     });
 
-    it('does not include workflow name when GH_WORKFLOW_NAME is not set', () => {
+    it("does not include workflow name when GH_WORKFLOW_NAME is not set", () => {
       const { logger } = setup({});
-      vi.stubEnv('GH_WORKFLOW_NAME', undefined);
+      vi.stubEnv("GH_WORKFLOW_NAME", undefined);
 
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
       const hasWorkflowName = event?.event_metadata[0].some(
-        (item) =>
-          item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_WORKFLOW_NAME,
+        (item) => item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_WORKFLOW_NAME,
       );
       expect(hasWorkflowName).toBe(false);
     });
   });
 
-  describe('GITHUB_REPOSITORY metadata', () => {
-    it('includes hashed repository when GITHUB_REPOSITORY is set', () => {
-      vi.stubEnv('GITHUB_REPOSITORY', 'google/gemini-cli');
+  describe("GITHUB_REPOSITORY metadata", () => {
+    it("includes hashed repository when GITHUB_REPOSITORY is set", () => {
+      vi.stubEnv("GITHUB_REPOSITORY", "google/gemini-cli");
       const { logger } = setup({});
 
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
       const repositoryMetadata = event?.event_metadata[0].find(
-        (item) =>
-          item.gemini_cli_key ===
-          EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
+        (item) => item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
       );
       expect(repositoryMetadata).toBeDefined();
       expect(repositoryMetadata?.value).toMatch(/^[a-f0-9]{64}$/);
-      expect(repositoryMetadata?.value).not.toBe('google/gemini-cli');
+      expect(repositoryMetadata?.value).not.toBe("google/gemini-cli");
     });
 
-    it('hashes repository name consistently', () => {
-      vi.stubEnv('GITHUB_REPOSITORY', 'google/gemini-cli');
+    it("hashes repository name consistently", () => {
+      vi.stubEnv("GITHUB_REPOSITORY", "google/gemini-cli");
       const { logger } = setup({});
 
       const event1 = logger?.createLogEvent(EventNames.API_ERROR, []);
       const event2 = logger?.createLogEvent(EventNames.API_ERROR, []);
 
       const hash1 = event1?.event_metadata[0].find(
-        (item) =>
-          item.gemini_cli_key ===
-          EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
+        (item) => item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
       )?.value;
       const hash2 = event2?.event_metadata[0].find(
-        (item) =>
-          item.gemini_cli_key ===
-          EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
+        (item) => item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
       )?.value;
 
       expect(hash1).toBeDefined();
@@ -466,24 +437,20 @@ describe('ClearcutLogger', () => {
       expect(hash1).toBe(hash2);
     });
 
-    it('produces different hashes for different repositories', () => {
-      vi.stubEnv('GITHUB_REPOSITORY', 'google/gemini-cli');
+    it("produces different hashes for different repositories", () => {
+      vi.stubEnv("GITHUB_REPOSITORY", "google/gemini-cli");
       const { logger: logger1 } = setup({});
       const event1 = logger1?.createLogEvent(EventNames.API_ERROR, []);
       const hash1 = event1?.event_metadata[0].find(
-        (item) =>
-          item.gemini_cli_key ===
-          EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
+        (item) => item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
       )?.value;
 
-      vi.stubEnv('GITHUB_REPOSITORY', 'google/other-repo');
+      vi.stubEnv("GITHUB_REPOSITORY", "google/other-repo");
       ClearcutLogger.clearInstance();
       const { logger: logger2 } = setup({});
       const event2 = logger2?.createLogEvent(EventNames.API_ERROR, []);
       const hash2 = event2?.event_metadata[0].find(
-        (item) =>
-          item.gemini_cli_key ===
-          EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
+        (item) => item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
       )?.value;
 
       expect(hash1).toBeDefined();
@@ -491,22 +458,20 @@ describe('ClearcutLogger', () => {
       expect(hash1).not.toBe(hash2);
     });
 
-    it('does not include repository when GITHUB_REPOSITORY is not set', () => {
-      vi.stubEnv('GITHUB_REPOSITORY', undefined);
+    it("does not include repository when GITHUB_REPOSITORY is not set", () => {
+      vi.stubEnv("GITHUB_REPOSITORY", undefined);
       const { logger } = setup({});
 
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
       const hasRepository = event?.event_metadata[0].some(
-        (item) =>
-          item.gemini_cli_key ===
-          EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
+        (item) => item.gemini_cli_key === EventMetadataKey.GEMINI_CLI_GH_REPOSITORY_NAME_HASH,
       );
       expect(hasRepository).toBe(false);
     });
   });
 
-  describe('logChatCompressionEvent', () => {
-    it('logs an event with proper fields', () => {
+  describe("logChatCompressionEvent", () => {
+    it("logs an event with proper fields", () => {
       const { logger } = setup();
       logger?.logChatCompressionEvent(
         makeChatCompressionEvent({
@@ -520,22 +485,22 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.CHAT_COMPRESSION);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_COMPRESSION_TOKENS_BEFORE,
-        '9001',
+        "9001",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_COMPRESSION_TOKENS_AFTER,
-        '8000',
+        "8000",
       ]);
     });
   });
 
-  describe('logRipgrepFallbackEvent', () => {
-    it('logs an event with the proper name', () => {
+  describe("logRipgrepFallbackEvent", () => {
+    it("logs an event with the proper name", () => {
       const { logger } = setup();
       // Spy on flushToClearcut to prevent it from clearing the queue
       const flushSpy = vi
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .spyOn(logger!, 'flushToClearcut' as any)
+        .spyOn(logger!, "flushToClearcut" as any)
         .mockResolvedValue({ nextRequestWaitMs: 0 });
 
       logger?.logRipgrepFallbackEvent();
@@ -547,14 +512,14 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('enqueueLogEvent', () => {
-    it('should add events to the queue', () => {
+  describe("enqueueLogEvent", () => {
+    it("should add events to the queue", () => {
       const { logger } = setup();
       logger!.enqueueLogEvent(logger!.createLogEvent(EventNames.API_ERROR));
       expect(getEventsSize(logger!)).toBe(1);
     });
 
-    it('should evict the oldest event when the queue is full', () => {
+    it("should evict the oldest event when the queue is full", () => {
       const { logger } = setup();
 
       for (let i = 0; i < TEST_ONLY.MAX_EVENTS; i++) {
@@ -570,10 +535,7 @@ describe('ClearcutLogger', () => {
 
       let events = getEvents(logger!);
       expect(events.length).toBe(TEST_ONLY.MAX_EVENTS);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '0',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "0"]);
 
       // This should push out the first event
       logger!.enqueueLogEvent(
@@ -586,10 +548,7 @@ describe('ClearcutLogger', () => {
       );
       events = getEvents(logger!);
       expect(events.length).toBe(TEST_ONLY.MAX_EVENTS);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '1',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "1"]);
 
       expect(events.at(TEST_ONLY.MAX_EVENTS - 1)).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
@@ -598,11 +557,11 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('flushToClearcut', () => {
-    it('allows for usage with a configured proxy agent', async () => {
+  describe("flushToClearcut", () => {
+    it("allows for usage with a configured proxy agent", async () => {
       const { logger } = setup({
         config: {
-          proxy: 'http://mycoolproxy.whatever.com:3128',
+          proxy: "http://mycoolproxy.whatever.com:3128",
         },
       });
 
@@ -613,7 +572,7 @@ describe('ClearcutLogger', () => {
       expect(response.nextRequestWaitMs).toBe(NEXT_WAIT_MS);
     });
 
-    it('should clear events on successful flush', async () => {
+    it("should clear events on successful flush", async () => {
       const { logger } = setup();
 
       logger!.enqueueLogEvent(logger!.createLogEvent(EventNames.API_ERROR));
@@ -623,7 +582,7 @@ describe('ClearcutLogger', () => {
       expect(response.nextRequestWaitMs).toBe(NEXT_WAIT_MS);
     });
 
-    it('should handle a network error and requeue events', async () => {
+    it("should handle a network error and requeue events", async () => {
       const { logger } = setup();
 
       server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.error()));
@@ -641,7 +600,7 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.API_REQUEST);
     });
 
-    it('should handle an HTTP error and requeue events', async () => {
+    it("should handle an HTTP error and requeue events", async () => {
       const { logger } = setup();
 
       server.resetHandlers(
@@ -649,7 +608,7 @@ describe('ClearcutLogger', () => {
           CLEARCUT_URL,
           () =>
             new HttpResponse(
-              { 'the system is down': true },
+              { "the system is down": true },
               {
                 status: 500,
               },
@@ -669,8 +628,8 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('requeueFailedEvents logic', () => {
-    it('should limit the number of requeued events to max_retry_events', () => {
+  describe("requeueFailedEvents logic", () => {
+    it("should limit the number of requeued events to max_retry_events", () => {
       const { logger } = setup();
       const eventsToLogCount = TEST_ONLY.MAX_RETRY_EVENTS + 5;
       const eventsToSend: LogEventEntry[][] = [];
@@ -686,16 +645,14 @@ describe('ClearcutLogger', () => {
       requeueFailedEvents(logger!, eventsToSend);
 
       expect(getEventsSize(logger!)).toBe(TEST_ONLY.MAX_RETRY_EVENTS);
-      const firstRequeuedEvent = JSON.parse(
-        getEvents(logger!)[0][0].source_extension_json,
-      ) as { event_id: string };
+      const firstRequeuedEvent = JSON.parse(getEvents(logger!)[0][0].source_extension_json) as {
+        event_id: string;
+      };
       // The last `maxRetryEvents` are kept. The oldest of those is at index `eventsToLogCount - maxRetryEvents`.
-      expect(firstRequeuedEvent.event_id).toBe(
-        eventsToLogCount - TEST_ONLY.MAX_RETRY_EVENTS,
-      );
+      expect(firstRequeuedEvent.event_id).toBe(eventsToLogCount - TEST_ONLY.MAX_RETRY_EVENTS);
     });
 
-    it('should not requeue more events than available space in the queue', () => {
+    it("should not requeue more events than available space in the queue", () => {
       const { logger } = setup();
       const maxEvents = TEST_ONLY.MAX_EVENTS;
       const spaceToLeave = 5;
@@ -726,21 +683,21 @@ describe('ClearcutLogger', () => {
       // startIndex = max(0, 10 - 5) = 5.
       // Loop unshifts events from index 9 down to 5.
       // The first element in the deque is the one with id 'failed_5'.
-      const firstRequeuedEvent = JSON.parse(
-        getEvents(logger!)[0][0].source_extension_json,
-      ) as { event_id: string };
-      expect(firstRequeuedEvent.event_id).toBe('failed_5');
+      const firstRequeuedEvent = JSON.parse(getEvents(logger!)[0][0].source_extension_json) as {
+        event_id: string;
+      };
+      expect(firstRequeuedEvent.event_id).toBe("failed_5");
     });
   });
 
-  describe('logModelRoutingEvent', () => {
-    it('logs a successful routing event', () => {
+  describe("logModelRoutingEvent", () => {
+    it("logs a successful routing event", () => {
       const { logger } = setup();
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default-strategy',
+        "gemini-pro",
+        "default-strategy",
         123,
-        'some reasoning',
+        "some reasoning",
         false,
         undefined,
       );
@@ -752,31 +709,28 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.MODEL_ROUTING);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION,
-        'gemini-pro',
+        "gemini-pro",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION_SOURCE,
-        'default-strategy',
+        "default-strategy",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_LATENCY_MS,
-        '123',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE,
-        'false',
+        "123",
       ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE, "false"]);
     });
 
-    it('logs a failed routing event with a reason', () => {
+    it("logs a failed routing event with a reason", () => {
       const { logger } = setup();
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'router-exception',
+        "gemini-pro",
+        "router-exception",
         234,
-        'some reasoning',
+        "some reasoning",
         true,
-        'Something went wrong',
+        "Something went wrong",
       );
 
       logger?.logModelRoutingEvent(event);
@@ -786,52 +740,43 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.MODEL_ROUTING);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION,
-        'gemini-pro',
+        "gemini-pro",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION_SOURCE,
-        'router-exception',
+        "router-exception",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_LATENCY_MS,
-        '234',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE,
-        'true',
+        "234",
       ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE, "true"]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE_REASON,
-        'Something went wrong',
+        "Something went wrong",
       ]);
     });
   });
 
-  describe('logAgentStartEvent', () => {
-    it('logs an event with proper fields', () => {
+  describe("logAgentStartEvent", () => {
+    it("logs an event with proper fields", () => {
       const { logger } = setup();
-      const event = new AgentStartEvent('agent-123', 'TestAgent');
+      const event = new AgentStartEvent("agent-123", "TestAgent");
 
       logger?.logAgentStartEvent(event);
 
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.AGENT_START);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_ID,
-        'agent-123',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_NAME,
-        'TestAgent',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_ID, "agent-123"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_NAME, "TestAgent"]);
     });
   });
 
-  describe('logExperiments', () => {
-    it('logs an event with gws_experiment field containing exp ids', () => {
+  describe("logExperiments", () => {
+    it("logs an event with gws_experiment field containing exp ids", () => {
       const { logger } = setup();
-      const event = new AgentStartEvent('agent-123', 'TestAgent');
+      const event = new AgentStartEvent("agent-123", "TestAgent");
 
       logger?.logAgentStartEvent(event);
 
@@ -840,17 +785,17 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.AGENT_START);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_EXPERIMENT_IDS,
-        '123,456,789',
+        "123,456,789",
       ]);
     });
   });
 
-  describe('logAgentFinishEvent', () => {
-    it('logs an event with proper fields (success)', () => {
+  describe("logAgentFinishEvent", () => {
+    it("logs an event with proper fields (success)", () => {
       const { logger } = setup();
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -861,33 +806,24 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.AGENT_FINISH);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_ID,
-        'agent-123',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_NAME,
-        'TestAgent',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_ID, "agent-123"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_NAME, "TestAgent"]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AGENT_DURATION_MS,
-        '1000',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_TURN_COUNT,
-        '5',
+        "1000",
       ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_TURN_COUNT, "5"]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AGENT_TERMINATE_REASON,
-        'GOAL',
+        "GOAL",
       ]);
     });
 
-    it('logs an event with proper fields (error)', () => {
+    it("logs an event with proper fields (error)", () => {
       const { logger } = setup();
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         500,
         2,
         AgentTerminateMode.ERROR,
@@ -900,16 +836,16 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.AGENT_FINISH);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AGENT_TERMINATE_REASON,
-        'ERROR',
+        "ERROR",
       ]);
     });
   });
 
-  describe('logToolCallEvent', () => {
-    it('logs an event with all diff metadata', () => {
+  describe("logToolCallEvent", () => {
+    it("logs an event with all diff metadata", () => {
       const { logger } = setup();
       const completedToolCall = {
-        request: { name: 'test', args: {}, prompt_id: 'prompt-123' },
+        request: { name: "test", args: {}, prompt_id: "prompt-123" },
         response: {
           resultDisplay: {
             diffStat: {
@@ -924,7 +860,7 @@ describe('ClearcutLogger', () => {
             },
           },
         },
-        status: 'success',
+        status: "success",
       } as SuccessfulToolCall;
 
       logger?.logToolCallEvent(new ToolCallEvent(completedToolCall));
@@ -932,44 +868,20 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.TOOL_CALL);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '1',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES,
-        '2',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS,
-        '3',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS,
-        '4',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES,
-        '5',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES,
-        '6',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS,
-        '7',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS,
-        '8',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "1"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES, "2"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS, "3"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS, "4"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES, "5"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES, "6"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS, "7"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS, "8"]);
     });
 
-    it('logs an event with partial diff metadata', () => {
+    it("logs an event with partial diff metadata", () => {
       const { logger } = setup();
       const completedToolCall = {
-        request: { name: 'test', args: {}, prompt_id: 'prompt-123' },
+        request: { name: "test", args: {}, prompt_id: "prompt-123" },
         response: {
           resultDisplay: {
             diffStat: {
@@ -980,7 +892,7 @@ describe('ClearcutLogger', () => {
             },
           },
         },
-        status: 'success',
+        status: "success",
       } as SuccessfulToolCall;
 
       logger?.logToolCallEvent(new ToolCallEvent(completedToolCall));
@@ -988,44 +900,24 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.TOOL_CALL);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '1',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES,
-        '2',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS,
-        '3',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS,
-        '4',
-      ]);
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES,
-      );
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES,
-      );
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS,
-      );
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS,
-      );
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "1"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES, "2"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS, "3"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS, "4"]);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS);
     });
 
-    it('does not log diff metadata if diffStat is not present', () => {
+    it("does not log diff metadata if diffStat is not present", () => {
       const { logger } = setup();
       const completedToolCall = {
-        request: { name: 'test', args: {}, prompt_id: 'prompt-123' },
+        request: { name: "test", args: {}, prompt_id: "prompt-123" },
         response: {
           resultDisplay: {},
         },
-        status: 'success',
+        status: "success",
       } as SuccessfulToolCall;
 
       logger?.logToolCallEvent(new ToolCallEvent(completedToolCall));
@@ -1033,29 +925,27 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.TOOL_CALL);
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-      );
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES);
     });
   });
 
-  describe('flushIfNeeded', () => {
-    it('should not flush if the interval has not passed', () => {
+  describe("flushIfNeeded", () => {
+    it("should not flush if the interval has not passed", () => {
       const { logger } = setup();
       const flushSpy = vi
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .spyOn(logger!, 'flushToClearcut' as any)
+        .spyOn(logger!, "flushToClearcut" as any)
         .mockResolvedValue({ nextRequestWaitMs: 0 });
 
       logger!.flushIfNeeded();
       expect(flushSpy).not.toHaveBeenCalled();
     });
 
-    it('should flush if the interval has passed', async () => {
+    it("should flush if the interval has passed", async () => {
       const { logger } = setup();
       const flushSpy = vi
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .spyOn(logger!, 'flushToClearcut' as any)
+        .spyOn(logger!, "flushToClearcut" as any)
         .mockResolvedValue({ nextRequestWaitMs: 0 });
 
       // Advance time by more than the flush interval
@@ -1066,10 +956,10 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('logWebFetchFallbackAttemptEvent', () => {
-    it('logs an event with the proper name and reason', () => {
+  describe("logWebFetchFallbackAttemptEvent", () => {
+    it("logs an event with the proper name and reason", () => {
       const { logger } = setup();
-      const event = new WebFetchFallbackAttemptEvent('private_ip');
+      const event = new WebFetchFallbackAttemptEvent("private_ip");
 
       logger?.logWebFetchFallbackAttemptEvent(event);
 
@@ -1078,7 +968,7 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.WEB_FETCH_FALLBACK_ATTEMPT);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_WEB_FETCH_FALLBACK_REASON,
-        'private_ip',
+        "private_ip",
       ]);
     });
   });
diff --git a/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.ts b/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.ts
index b5f663950..34358fcde 100644
--- a/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.ts
+++ b/packages/gemini-cli-core/src/telemetry/clearcut-logger/clearcut-logger.ts
@@ -4,97 +4,93 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createHash } from 'node:crypto';
-import { HttpsProxyAgent } from 'https-proxy-agent';
+import { createHash } from "node:crypto";
+import { HttpsProxyAgent } from "https-proxy-agent";
+import { FixedDeque } from "mnemonist";
+import type { Config } from "../../config/config.js";
+import { CLI_VERSION, GIT_COMMIT_INFO } from "../../generated/git-commit.js";
+import { detectIdeFromEnv, IDE_DEFINITIONS, isCloudShell } from "../../ide/detect-ide.js";
+import { debugLogger } from "../../utils/debugLogger.js";
+import { InstallationManager } from "../../utils/installationManager.js";
+import {
+  safeJsonStringify,
+  safeJsonStringifyBooleanValuesOnly,
+} from "../../utils/safeJsonStringify.js";
+import { UserAccountManager } from "../../utils/userAccountManager.js";
 import type {
-  StartSessionEvent,
-  UserPromptEvent,
-  ToolCallEvent,
+  AgentFinishEvent,
+  AgentStartEvent,
+  ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
-  ApiErrorEvent,
-  LoopDetectedEvent,
-  NextSpeakerCheckEvent,
-  SlashCommandEvent,
-  MalformedJsonResponseEvent,
-  IdeConnectionEvent,
-  ConversationFinishedEvent,
   ChatCompressionEvent,
-  FileOperationEvent,
-  InvalidChunkEvent,
   ContentRetryEvent,
   ContentRetryFailureEvent,
+  ConversationFinishedEvent,
+  ExtensionDisableEvent,
+  ExtensionEnableEvent,
   ExtensionInstallEvent,
-  ToolOutputTruncatedEvent,
   ExtensionUninstallEvent,
+  ExtensionUpdateEvent,
+  FileOperationEvent,
+  IdeConnectionEvent,
+  InvalidChunkEvent,
+  LlmLoopCheckEvent,
+  LoopDetectedEvent,
+  MalformedJsonResponseEvent,
   ModelRoutingEvent,
-  ExtensionEnableEvent,
   ModelSlashCommandEvent,
-  ExtensionDisableEvent,
-  SmartEditStrategyEvent,
-  SmartEditCorrectionEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
+  NextSpeakerCheckEvent,
   RecoveryAttemptEvent,
+  SlashCommandEvent,
+  SmartEditCorrectionEvent,
+  SmartEditStrategyEvent,
+  StartSessionEvent,
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
+  UserPromptEvent,
   WebFetchFallbackAttemptEvent,
-  ExtensionUpdateEvent,
-  LlmLoopCheckEvent,
-} from '../types.js';
-import { EventMetadataKey } from './event-metadata-key.js';
-import type { Config } from '../../config/config.js';
-import { InstallationManager } from '../../utils/installationManager.js';
-import { UserAccountManager } from '../../utils/userAccountManager.js';
-import {
-  safeJsonStringify,
-  safeJsonStringifyBooleanValuesOnly,
-} from '../../utils/safeJsonStringify.js';
-import { FixedDeque } from 'mnemonist';
-import { GIT_COMMIT_INFO, CLI_VERSION } from '../../generated/git-commit.js';
-import {
-  IDE_DEFINITIONS,
-  detectIdeFromEnv,
-  isCloudShell,
-} from '../../ide/detect-ide.js';
-import { debugLogger } from '../../utils/debugLogger.js';
+} from "../types.js";
+import { EventMetadataKey } from "./event-metadata-key.js";
 
 export enum EventNames {
-  START_SESSION = 'start_session',
-  NEW_PROMPT = 'new_prompt',
-  TOOL_CALL = 'tool_call',
-  FILE_OPERATION = 'file_operation',
-  API_REQUEST = 'api_request',
-  API_RESPONSE = 'api_response',
-  API_ERROR = 'api_error',
-  END_SESSION = 'end_session',
-  FLASH_FALLBACK = 'flash_fallback',
-  RIPGREP_FALLBACK = 'ripgrep_fallback',
-  LOOP_DETECTED = 'loop_detected',
-  LOOP_DETECTION_DISABLED = 'loop_detection_disabled',
-  NEXT_SPEAKER_CHECK = 'next_speaker_check',
-  SLASH_COMMAND = 'slash_command',
-  MALFORMED_JSON_RESPONSE = 'malformed_json_response',
-  IDE_CONNECTION = 'ide_connection',
-  KITTY_SEQUENCE_OVERFLOW = 'kitty_sequence_overflow',
-  CHAT_COMPRESSION = 'chat_compression',
-  CONVERSATION_FINISHED = 'conversation_finished',
-  INVALID_CHUNK = 'invalid_chunk',
-  CONTENT_RETRY = 'content_retry',
-  CONTENT_RETRY_FAILURE = 'content_retry_failure',
-  EXTENSION_ENABLE = 'extension_enable',
-  EXTENSION_DISABLE = 'extension_disable',
-  EXTENSION_INSTALL = 'extension_install',
-  EXTENSION_UNINSTALL = 'extension_uninstall',
-  EXTENSION_UPDATE = 'extension_update',
-  TOOL_OUTPUT_TRUNCATED = 'tool_output_truncated',
-  MODEL_ROUTING = 'model_routing',
-  MODEL_SLASH_COMMAND = 'model_slash_command',
-  SMART_EDIT_STRATEGY = 'smart_edit_strategy',
-  SMART_EDIT_CORRECTION = 'smart_edit_correction',
-  AGENT_START = 'agent_start',
-  AGENT_FINISH = 'agent_finish',
-  RECOVERY_ATTEMPT = 'recovery_attempt',
-  WEB_FETCH_FALLBACK_ATTEMPT = 'web_fetch_fallback_attempt',
-  LLM_LOOP_CHECK = 'llm_loop_check',
+  START_SESSION = "start_session",
+  NEW_PROMPT = "new_prompt",
+  TOOL_CALL = "tool_call",
+  FILE_OPERATION = "file_operation",
+  API_REQUEST = "api_request",
+  API_RESPONSE = "api_response",
+  API_ERROR = "api_error",
+  END_SESSION = "end_session",
+  FLASH_FALLBACK = "flash_fallback",
+  RIPGREP_FALLBACK = "ripgrep_fallback",
+  LOOP_DETECTED = "loop_detected",
+  LOOP_DETECTION_DISABLED = "loop_detection_disabled",
+  NEXT_SPEAKER_CHECK = "next_speaker_check",
+  SLASH_COMMAND = "slash_command",
+  MALFORMED_JSON_RESPONSE = "malformed_json_response",
+  IDE_CONNECTION = "ide_connection",
+  KITTY_SEQUENCE_OVERFLOW = "kitty_sequence_overflow",
+  CHAT_COMPRESSION = "chat_compression",
+  CONVERSATION_FINISHED = "conversation_finished",
+  INVALID_CHUNK = "invalid_chunk",
+  CONTENT_RETRY = "content_retry",
+  CONTENT_RETRY_FAILURE = "content_retry_failure",
+  EXTENSION_ENABLE = "extension_enable",
+  EXTENSION_DISABLE = "extension_disable",
+  EXTENSION_INSTALL = "extension_install",
+  EXTENSION_UNINSTALL = "extension_uninstall",
+  EXTENSION_UPDATE = "extension_update",
+  TOOL_OUTPUT_TRUNCATED = "tool_output_truncated",
+  MODEL_ROUTING = "model_routing",
+  MODEL_SLASH_COMMAND = "model_slash_command",
+  SMART_EDIT_STRATEGY = "smart_edit_strategy",
+  SMART_EDIT_CORRECTION = "smart_edit_correction",
+  AGENT_START = "agent_start",
+  AGENT_FINISH = "agent_finish",
+  RECOVERY_ATTEMPT = "recovery_attempt",
+  WEB_FETCH_FALLBACK_ATTEMPT = "web_fetch_fallback_attempt",
+  LLM_LOOP_CHECK = "llm_loop_check",
 }
 
 export interface LogResponse {
@@ -112,7 +108,7 @@ export interface EventValue {
 }
 
 export interface LogEvent {
-  console_type: 'GEMINI_CLI';
+  console_type: "GEMINI_CLI";
   application: number;
   event_name: string;
   event_metadata: EventValue[][];
@@ -121,7 +117,7 @@ export interface LogEvent {
 }
 
 export interface LogRequest {
-  log_source_name: 'CONCORD';
+  log_source_name: "CONCORD";
   request_time_ms: number;
   log_event: LogEventEntry[][];
 }
@@ -136,16 +132,16 @@ export interface LogRequest {
  * methods might have in their runtimes.
  */
 function determineSurface(): string {
-  if (process.env['SURFACE']) {
-    return process.env['SURFACE'];
+  if (process.env["SURFACE"]) {
+    return process.env["SURFACE"];
   } else if (isCloudShell()) {
     return IDE_DEFINITIONS.cloudshell.name;
-  } else if (process.env['GITHUB_SHA']) {
-    return 'GitHub';
-  } else if (process.env['TERM_PROGRAM'] === 'vscode') {
+  } else if (process.env["GITHUB_SHA"]) {
+    return "GitHub";
+  } else if (process.env["TERM_PROGRAM"] === "vscode") {
     return detectIdeFromEnv().name || IDE_DEFINITIONS.vscode.name;
   } else {
-    return 'SURFACE_NOT_SET';
+    return "SURFACE_NOT_SET";
   }
 }
 
@@ -153,20 +149,20 @@ function determineSurface(): string {
  * Determines the GitHub Actions workflow name if the CLI is running in a GitHub Actions environment.
  */
 function determineGHWorkflowName(): string | undefined {
-  return process.env['GH_WORKFLOW_NAME'];
+  return process.env["GH_WORKFLOW_NAME"];
 }
 
 /**
  * Determines the GitHub repository name if the CLI is running in a GitHub Actions environment.
  */
 function determineGHRepositoryName(): string | undefined {
-  return process.env['GITHUB_REPOSITORY'];
+  return process.env["GITHUB_REPOSITORY"];
 }
 
 /**
  * Clearcut URL to send logging events to.
  */
-const CLEARCUT_URL = 'https://play.googleapis.com/log?format=json&hasfast=true';
+const CLEARCUT_URL = "https://play.googleapis.com/log?format=json&hasfast=true";
 
 /**
  * Interval in which buffered events are sent to clearcut.
@@ -191,7 +187,7 @@ export class ClearcutLogger {
   private static instance: ClearcutLogger;
   private config?: Config;
   private sessionData: EventValue[] = [];
-  private promptId: string = '';
+  private promptId: string = "";
   private readonly installationManager: InstallationManager;
   private readonly userAccountManager: UserAccountManager;
   private readonly hashedGHRepositoryName?: string;
@@ -221,21 +217,18 @@ export class ClearcutLogger {
   private constructor(config: Config) {
     this.config = config;
     this.events = new FixedDeque<LogEventEntry[]>(Array, MAX_EVENTS);
-    this.promptId = config?.getSessionId() ?? '';
+    this.promptId = config?.getSessionId() ?? "";
     this.installationManager = new InstallationManager();
     this.userAccountManager = new UserAccountManager();
 
     const ghRepositoryName = determineGHRepositoryName();
     if (ghRepositoryName) {
-      this.hashedGHRepositoryName = createHash('sha256')
-        .update(ghRepositoryName)
-        .digest('hex');
+      this.hashedGHRepositoryName = createHash("sha256").update(ghRepositoryName).digest("hex");
     }
   }
 
   static getInstance(config?: Config): ClearcutLogger | undefined {
-    if (config === undefined || !config?.getUsageStatisticsEnabled())
-      return undefined;
+    if (config === undefined || !config?.getUsageStatisticsEnabled()) return undefined;
     if (!ClearcutLogger.instance) {
       ClearcutLogger.instance = new ClearcutLogger(config);
     }
@@ -275,14 +268,12 @@ export class ClearcutLogger {
       this.enqueueHelper(event);
     } catch (error) {
       if (this.config?.getDebugMode()) {
-        console.error('ClearcutLogger: Failed to enqueue log event.', error);
+        console.error("ClearcutLogger: Failed to enqueue log event.", error);
       }
     }
   }
 
-  async enqueueLogEventAfterExperimentsLoadAsync(
-    event: LogEvent,
-  ): Promise<void> {
+  async enqueueLogEventAfterExperimentsLoadAsync(event: LogEvent): Promise<void> {
     try {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.config?.getExperimentsAsync().then((experiments) => {
@@ -290,7 +281,7 @@ export class ClearcutLogger {
           const exp_id_data: EventValue[] = [
             {
               gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXPERIMENT_IDS,
-              value: experiments.experimentIds.toString() ?? 'NA',
+              value: experiments.experimentIds.toString() ?? "NA",
             },
           ];
           event.event_metadata = [[...event.event_metadata[0], ...exp_id_data]];
@@ -300,15 +291,12 @@ export class ClearcutLogger {
       });
     } catch (error) {
       if (this.config?.getDebugMode()) {
-        console.error('ClearcutLogger: Failed to enqueue log event.', error);
+        console.error("ClearcutLogger: Failed to enqueue log event.", error);
       }
     }
   }
 
-  createBasicLogEvent(
-    eventName: EventNames,
-    data: EventValue[] = [],
-  ): LogEvent {
+  createBasicLogEvent(eventName: EventNames, data: EventValue[] = []): LogEvent {
     const email = this.userAccountManager.getCachedGoogleAccount();
     const surface = determineSurface();
     const ghWorkflowName = determineGHWorkflowName();
@@ -348,7 +336,7 @@ export class ClearcutLogger {
     }
 
     const logEvent: LogEvent = {
-      console_type: 'GEMINI_CLI',
+      console_type: "GEMINI_CLI",
       application: 102, // GEMINI_CLI
       event_name: eventName as string,
       event_metadata: [baseMetadata],
@@ -381,16 +369,14 @@ export class ClearcutLogger {
     }
 
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
   async flushToClearcut(): Promise<LogResponse> {
     if (this.flushing) {
       if (this.config?.getDebugMode()) {
-        debugLogger.debug(
-          'ClearcutLogger: Flush already in progress, marking pending flush.',
-        );
+        debugLogger.debug("ClearcutLogger: Flush already in progress, marking pending flush.");
       }
       this.pendingFlush = true;
       return Promise.resolve({});
@@ -398,14 +384,14 @@ export class ClearcutLogger {
     this.flushing = true;
 
     if (this.config?.getDebugMode()) {
-      debugLogger.log('Flushing log events to Clearcut.');
+      debugLogger.log("Flushing log events to Clearcut.");
     }
     const eventsToSend = this.events.toArray() as LogEventEntry[][];
     this.events.clear();
 
     const request: LogRequest[] = [
       {
-        log_source_name: 'CONCORD',
+        log_source_name: "CONCORD",
         request_time_ms: Date.now(),
         log_event: eventsToSend,
       },
@@ -415,10 +401,10 @@ export class ClearcutLogger {
 
     try {
       const response = await fetch(CLEARCUT_URL, {
-        method: 'POST',
+        method: "POST",
         body: safeJsonStringify(request),
         headers: {
-          'Content-Type': 'application/json',
+          "Content-Type": "application/json",
         },
       });
 
@@ -443,7 +429,7 @@ export class ClearcutLogger {
       }
     } catch (e: unknown) {
       if (this.config?.getDebugMode()) {
-        console.error('Error flushing log events:', e as Error);
+        console.error("Error flushing log events:", e as Error);
       }
 
       // Re-queue failed events for retry
@@ -458,7 +444,7 @@ export class ClearcutLogger {
       // Fire and forget the pending flush
       this.flushToClearcut().catch((error) => {
         if (this.config?.getDebugMode()) {
-          debugLogger.debug('Error in pending flush to Clearcut:', error);
+          debugLogger.debug("Error in pending flush to Clearcut:", error);
         }
       });
     }
@@ -473,8 +459,7 @@ export class ClearcutLogger {
         value: event.model,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_EMBEDDING_MODEL,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EMBEDDING_MODEL,
         value: event.embedding_model,
       },
       {
@@ -490,23 +475,19 @@ export class ClearcutLogger {
         value: event.approval_mode,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_API_KEY_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_API_KEY_ENABLED,
         value: event.api_key_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
         value: event.vertex_ai_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_DEBUG_MODE_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_DEBUG_MODE_ENABLED,
         value: event.debug_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
         value: event.vertex_ai_enabled.toString(),
       },
       {
@@ -514,13 +495,11 @@ export class ClearcutLogger {
         value: event.mcp_servers,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
         value: event.vertex_ai_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_TELEMETRY_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_TELEMETRY_ENABLED,
         value: event.telemetry_enabled.toString(),
       },
       {
@@ -529,24 +508,19 @@ export class ClearcutLogger {
         value: event.telemetry_log_user_prompts_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_SERVERS_COUNT,
-        value: event.mcp_servers_count
-          ? event.mcp_servers_count.toString()
-          : '',
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_SERVERS_COUNT,
+        value: event.mcp_servers_count ? event.mcp_servers_count.toString() : "",
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS_COUNT,
-        value: event.mcp_tools_count?.toString() ?? '',
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS_COUNT,
+        value: event.mcp_tools_count?.toString() ?? "",
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS,
-        value: event.mcp_tools ? event.mcp_tools : '',
+        value: event.mcp_tools ? event.mcp_tools : "",
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT,
         value: event.extensions_count.toString(),
       },
       // We deliberately do not log the names of extensions here, to be safe.
@@ -563,7 +537,7 @@ export class ClearcutLogger {
       this.createLogEvent(EventNames.START_SESSION, data),
     ).then(() => {
       this.flushToClearcut().catch((error) => {
-        debugLogger.debug('Error flushing to Clearcut:', error);
+        debugLogger.debug("Error flushing to Clearcut:", error);
       });
     });
   }
@@ -713,28 +687,23 @@ export class ClearcutLogger {
         value: JSON.stringify(event.duration_ms),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
         value: JSON.stringify(event.usage.input_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
         value: JSON.stringify(event.usage.output_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
         value: JSON.stringify(event.usage.cached_content_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
         value: JSON.stringify(event.usage.thoughts_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
         value: JSON.stringify(event.usage.tool_token_count),
       },
     ];
@@ -779,22 +748,20 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.CHAT_COMPRESSION, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.CHAT_COMPRESSION, data));
   }
 
   logFlashFallbackEvent(): void {
     this.enqueueLogEvent(this.createLogEvent(EventNames.FLASH_FALLBACK, []));
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
   logRipgrepFallbackEvent(): void {
     this.enqueueLogEvent(this.createLogEvent(EventNames.RIPGREP_FALLBACK, []));
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -808,8 +775,7 @@ export class ClearcutLogger {
 
     if (event.confirmed_by_model) {
       data.push({
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_LOOP_DETECTED_CONFIRMED_BY_MODEL,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_LOOP_DETECTED_CONFIRMED_BY_MODEL,
         value: event.confirmed_by_model,
       });
     }
@@ -821,9 +787,7 @@ export class ClearcutLogger {
   logLoopDetectionDisabledEvent(): void {
     const data: EventValue[] = [];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.LOOP_DETECTION_DISABLED, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.LOOP_DETECTION_DISABLED, data));
     this.flushIfNeeded();
   }
 
@@ -839,9 +803,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.NEXT_SPEAKER_CHECK, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.NEXT_SPEAKER_CHECK, data));
     this.flushIfNeeded();
   }
 
@@ -881,15 +843,12 @@ export class ClearcutLogger {
   logMalformedJsonResponseEvent(event: MalformedJsonResponseEvent): void {
     const data: EventValue[] = [
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_MALFORMED_JSON_RESPONSE_MODEL,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_MALFORMED_JSON_RESPONSE_MODEL,
         value: JSON.stringify(event.model),
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.MALFORMED_JSON_RESPONSE, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.MALFORMED_JSON_RESPONSE, data));
     this.flushIfNeeded();
   }
 
@@ -907,7 +866,7 @@ export class ClearcutLogger {
       this.createLogEvent(EventNames.START_SESSION, data),
     ).then(() => {
       this.flushToClearcut().catch((error) => {
-        debugLogger.debug('Error flushing to Clearcut:', error);
+        debugLogger.debug("Error flushing to Clearcut:", error);
       });
     });
   }
@@ -916,7 +875,7 @@ export class ClearcutLogger {
     const data: EventValue[] = [
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
-        value: this.config?.getSessionId() ?? '',
+        value: this.config?.getSessionId() ?? "",
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONVERSATION_TURN_COUNT,
@@ -928,9 +887,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.CONVERSATION_FINISHED, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.CONVERSATION_FINISHED, data));
     this.flushIfNeeded();
   }
 
@@ -938,7 +895,7 @@ export class ClearcutLogger {
     // Flush immediately on session end.
     this.enqueueLogEvent(this.createLogEvent(EventNames.END_SESSION, []));
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -959,8 +916,7 @@ export class ClearcutLogger {
   logContentRetryEvent(event: ContentRetryEvent): void {
     const data: EventValue[] = [
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
         value: String(event.attempt_number),
       },
       {
@@ -984,13 +940,11 @@ export class ClearcutLogger {
   logContentRetryFailureEvent(event: ContentRetryFailureEvent): void {
     const data: EventValue[] = [
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
         value: String(event.total_attempts),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_FINAL_ERROR_TYPE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_FINAL_ERROR_TYPE,
         value: event.final_error_type,
       },
       {
@@ -1001,15 +955,12 @@ export class ClearcutLogger {
 
     if (event.total_duration_ms) {
       data.push({
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
         value: String(event.total_duration_ms),
       });
     }
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.CONTENT_RETRY_FAILURE, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.CONTENT_RETRY_FAILURE, data));
     this.flushIfNeeded();
   }
 
@@ -1037,17 +988,13 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_INSTALL, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_INSTALL, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
-  async logExtensionUninstallEvent(
-    event: ExtensionUninstallEvent,
-  ): Promise<void> {
+  async logExtensionUninstallEvent(event: ExtensionUninstallEvent): Promise<void> {
     const data: EventValue[] = [
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
@@ -1063,11 +1010,9 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_UNINSTALL, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UNINSTALL, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1099,11 +1044,9 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_UPDATE, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UPDATE, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1114,18 +1057,15 @@ export class ClearcutLogger {
         value: JSON.stringify(event.tool_name),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
         value: JSON.stringify(event.original_content_length),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
         value: JSON.stringify(event.truncated_content_length),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
         value: JSON.stringify(event.threshold),
       },
       {
@@ -1134,9 +1074,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.TOOL_OUTPUT_TRUNCATED, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.TOOL_OUTPUT_TRUNCATED, data));
     this.flushIfNeeded();
   }
 
@@ -1182,17 +1120,14 @@ export class ClearcutLogger {
         value: event.extension_id,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
         value: event.setting_scope,
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_ENABLE, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_ENABLE, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1204,9 +1139,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.MODEL_SLASH_COMMAND, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.MODEL_SLASH_COMMAND, data));
     this.flushIfNeeded();
   }
 
@@ -1221,17 +1154,14 @@ export class ClearcutLogger {
         value: event.extension_id,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
         value: event.setting_scope,
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_DISABLE, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_DISABLE, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1243,9 +1173,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.SMART_EDIT_STRATEGY, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_STRATEGY, data));
     this.flushIfNeeded();
   }
 
@@ -1257,9 +1185,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.SMART_EDIT_CORRECTION, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_CORRECTION, data));
     this.flushIfNeeded();
   }
 
@@ -1335,9 +1261,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.RECOVERY_ATTEMPT, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.RECOVERY_ATTEMPT, data));
     this.flushIfNeeded();
   }
 
@@ -1349,9 +1273,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.WEB_FETCH_FALLBACK_ATTEMPT, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.WEB_FETCH_FALLBACK_ATTEMPT, data));
     this.flushIfNeeded();
   }
 
@@ -1362,8 +1284,7 @@ export class ClearcutLogger {
         value: event.prompt_id,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_FLASH_CONFIDENCE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_FLASH_CONFIDENCE,
         value: event.flash_confidence.toString(),
       },
       {
@@ -1371,8 +1292,7 @@ export class ClearcutLogger {
         value: event.main_model,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_MAIN_MODEL_CONFIDENCE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_MAIN_MODEL_CONFIDENCE,
         value: event.main_model_confidence.toString(),
       },
     ];
@@ -1389,13 +1309,11 @@ export class ClearcutLogger {
     const defaultLogMetadata: EventValue[] = [
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
-        value: this.config?.getSessionId() ?? '',
+        value: this.config?.getSessionId() ?? "",
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_AUTH_TYPE,
-        value: JSON.stringify(
-          this.config?.getContentGeneratorConfig()?.authType,
-        ),
+        value: JSON.stringify(this.config?.getContentGeneratorConfig()?.authType),
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
@@ -1415,13 +1333,13 @@ export class ClearcutLogger {
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_INTERACTIVE,
-        value: this.config?.isInteractive().toString() ?? 'false',
+        value: this.config?.isInteractive().toString() ?? "false",
       },
     ];
     if (this.config?.getExperiments()) {
       defaultLogMetadata.push({
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXPERIMENT_IDS,
-        value: this.config?.getExperiments()?.experimentIds.toString() ?? 'NA',
+        value: this.config?.getExperiments()?.experimentIds.toString() ?? "NA",
       });
     }
     return [...data, ...defaultLogMetadata];
@@ -1432,10 +1350,10 @@ export class ClearcutLogger {
     if (!proxyUrl) return undefined;
     // undici which is widely used in the repo can only support http & https proxy protocol,
     // https://github.com/nodejs/undici/issues/2224
-    if (proxyUrl.startsWith('http')) {
+    if (proxyUrl.startsWith("http")) {
       return new HttpsProxyAgent(proxyUrl);
     } else {
-      throw new Error('Unsupported proxy type');
+      throw new Error("Unsupported proxy type");
     }
   }
 
@@ -1468,17 +1386,13 @@ export class ClearcutLogger {
 
     if (numEventsToRequeue === 0) {
       if (this.config?.getDebugMode()) {
-        debugLogger.debug(
-          `ClearcutLogger: No events re-queued (queue size: ${this.events.size})`,
-        );
+        debugLogger.debug(`ClearcutLogger: No events re-queued (queue size: ${this.events.size})`);
       }
       return;
     }
 
     // Get the most recent events to re-queue
-    const eventsToRequeue = eventsToRetry.slice(
-      eventsToRetry.length - numEventsToRequeue,
-    );
+    const eventsToRequeue = eventsToRetry.slice(eventsToRetry.length - numEventsToRequeue);
 
     // Prepend events to the front of the deque to be retried first.
     // We iterate backwards to maintain the original order of the failed events.
diff --git a/packages/gemini-cli-core/src/telemetry/config.test.ts b/packages/gemini-cli-core/src/telemetry/config.test.ts
index 232aa2746..42440cbac 100644
--- a/packages/gemini-cli-core/src/telemetry/config.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/config.test.ts
@@ -4,106 +4,102 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
   parseBooleanEnvFlag,
   parseTelemetryTargetValue,
   resolveTelemetrySettings,
-} from './config.js';
-import { TelemetryTarget } from './index.js';
+} from "./config.js";
+import { TelemetryTarget } from "./index.js";
 
-describe('telemetry/config helpers', () => {
-  describe('parseBooleanEnvFlag', () => {
-    it('returns undefined for undefined', () => {
+describe("telemetry/config helpers", () => {
+  describe("parseBooleanEnvFlag", () => {
+    it("returns undefined for undefined", () => {
       expect(parseBooleanEnvFlag(undefined)).toBeUndefined();
     });
 
-    it('parses true values', () => {
-      expect(parseBooleanEnvFlag('true')).toBe(true);
-      expect(parseBooleanEnvFlag('1')).toBe(true);
+    it("parses true values", () => {
+      expect(parseBooleanEnvFlag("true")).toBe(true);
+      expect(parseBooleanEnvFlag("1")).toBe(true);
     });
 
-    it('parses false/other values as false', () => {
-      expect(parseBooleanEnvFlag('false')).toBe(false);
-      expect(parseBooleanEnvFlag('0')).toBe(false);
-      expect(parseBooleanEnvFlag('TRUE')).toBe(false);
-      expect(parseBooleanEnvFlag('random')).toBe(false);
-      expect(parseBooleanEnvFlag('')).toBe(false);
+    it("parses false/other values as false", () => {
+      expect(parseBooleanEnvFlag("false")).toBe(false);
+      expect(parseBooleanEnvFlag("0")).toBe(false);
+      expect(parseBooleanEnvFlag("TRUE")).toBe(false);
+      expect(parseBooleanEnvFlag("random")).toBe(false);
+      expect(parseBooleanEnvFlag("")).toBe(false);
     });
   });
 
-  describe('parseTelemetryTargetValue', () => {
-    it('parses string values', () => {
-      expect(parseTelemetryTargetValue('local')).toBe(TelemetryTarget.LOCAL);
-      expect(parseTelemetryTargetValue('gcp')).toBe(TelemetryTarget.GCP);
+  describe("parseTelemetryTargetValue", () => {
+    it("parses string values", () => {
+      expect(parseTelemetryTargetValue("local")).toBe(TelemetryTarget.LOCAL);
+      expect(parseTelemetryTargetValue("gcp")).toBe(TelemetryTarget.GCP);
     });
 
-    it('accepts enum values', () => {
-      expect(parseTelemetryTargetValue(TelemetryTarget.LOCAL)).toBe(
-        TelemetryTarget.LOCAL,
-      );
-      expect(parseTelemetryTargetValue(TelemetryTarget.GCP)).toBe(
-        TelemetryTarget.GCP,
-      );
+    it("accepts enum values", () => {
+      expect(parseTelemetryTargetValue(TelemetryTarget.LOCAL)).toBe(TelemetryTarget.LOCAL);
+      expect(parseTelemetryTargetValue(TelemetryTarget.GCP)).toBe(TelemetryTarget.GCP);
     });
 
-    it('returns undefined for unknown', () => {
-      expect(parseTelemetryTargetValue('other')).toBeUndefined();
+    it("returns undefined for unknown", () => {
+      expect(parseTelemetryTargetValue("other")).toBeUndefined();
       expect(parseTelemetryTargetValue(undefined)).toBeUndefined();
     });
   });
 
-  describe('resolveTelemetrySettings', () => {
-    it('falls back to settings when no argv/env provided', async () => {
+  describe("resolveTelemetrySettings", () => {
+    it("falls back to settings when no argv/env provided", async () => {
       const settings = {
         enabled: false,
         target: TelemetryTarget.LOCAL,
-        otlpEndpoint: 'http://localhost:4317',
-        otlpProtocol: 'grpc' as const,
+        otlpEndpoint: "http://localhost:4317",
+        otlpProtocol: "grpc" as const,
         logPrompts: false,
-        outfile: 'settings.log',
+        outfile: "settings.log",
         useCollector: false,
       };
       const resolved = await resolveTelemetrySettings({ settings });
       expect(resolved).toEqual(settings);
     });
 
-    it('uses env over settings and argv over env', async () => {
+    it("uses env over settings and argv over env", async () => {
       const settings = {
         enabled: false,
         target: TelemetryTarget.LOCAL,
-        otlpEndpoint: 'http://settings:4317',
-        otlpProtocol: 'grpc' as const,
+        otlpEndpoint: "http://settings:4317",
+        otlpProtocol: "grpc" as const,
         logPrompts: false,
-        outfile: 'settings.log',
+        outfile: "settings.log",
         useCollector: false,
       };
       const env = {
-        GEMINI_TELEMETRY_ENABLED: '1',
-        GEMINI_TELEMETRY_TARGET: 'gcp',
-        GEMINI_TELEMETRY_OTLP_ENDPOINT: 'http://env:4317',
-        GEMINI_TELEMETRY_OTLP_PROTOCOL: 'http',
-        GEMINI_TELEMETRY_LOG_PROMPTS: 'true',
-        GEMINI_TELEMETRY_OUTFILE: 'env.log',
-        GEMINI_TELEMETRY_USE_COLLECTOR: 'true',
+        GEMINI_TELEMETRY_ENABLED: "1",
+        GEMINI_TELEMETRY_TARGET: "gcp",
+        GEMINI_TELEMETRY_OTLP_ENDPOINT: "http://env:4317",
+        GEMINI_TELEMETRY_OTLP_PROTOCOL: "http",
+        GEMINI_TELEMETRY_LOG_PROMPTS: "true",
+        GEMINI_TELEMETRY_OUTFILE: "env.log",
+        GEMINI_TELEMETRY_USE_COLLECTOR: "true",
       } as Record<string, string>;
       const argv = {
         telemetry: false,
-        telemetryTarget: 'local',
-        telemetryOtlpEndpoint: 'http://argv:4317',
-        telemetryOtlpProtocol: 'grpc',
+        telemetryTarget: "local",
+        telemetryOtlpEndpoint: "http://argv:4317",
+        telemetryOtlpProtocol: "grpc",
         telemetryLogPrompts: false,
-        telemetryOutfile: 'argv.log',
+        telemetryOutfile: "argv.log",
       };
 
       const resolvedEnv = await resolveTelemetrySettings({ env, settings });
       expect(resolvedEnv).toEqual({
         enabled: true,
         target: TelemetryTarget.GCP,
-        otlpEndpoint: 'http://env:4317',
-        otlpProtocol: 'http',
+        otlpEndpoint: "http://env:4317",
+        otlpProtocol: "http",
         logPrompts: true,
-        outfile: 'env.log',
+        outfile: "env.log",
         useCollector: true,
       });
 
@@ -115,16 +111,16 @@ describe('telemetry/config helpers', () => {
       expect(resolvedArgv).toEqual({
         enabled: false,
         target: TelemetryTarget.LOCAL,
-        otlpEndpoint: 'http://argv:4317',
-        otlpProtocol: 'grpc',
+        otlpEndpoint: "http://argv:4317",
+        otlpProtocol: "grpc",
         logPrompts: false,
-        outfile: 'argv.log',
+        outfile: "argv.log",
         useCollector: true, // from env as no argv option
         useCliAuth: undefined,
       });
     });
 
-    it('resolves useCliAuth from settings', async () => {
+    it("resolves useCliAuth from settings", async () => {
       const settings = {
         useCliAuth: true,
       };
@@ -132,52 +128,44 @@ describe('telemetry/config helpers', () => {
       expect(resolved.useCliAuth).toBe(true);
     });
 
-    it('resolves useCliAuth from env', async () => {
+    it("resolves useCliAuth from env", async () => {
       const env = {
-        GEMINI_TELEMETRY_USE_CLI_AUTH: 'true',
+        GEMINI_TELEMETRY_USE_CLI_AUTH: "true",
       };
       const resolved = await resolveTelemetrySettings({ env });
       expect(resolved.useCliAuth).toBe(true);
     });
 
-    it('env overrides settings for useCliAuth', async () => {
+    it("env overrides settings for useCliAuth", async () => {
       const settings = {
         useCliAuth: false,
       };
       const env = {
-        GEMINI_TELEMETRY_USE_CLI_AUTH: 'true',
+        GEMINI_TELEMETRY_USE_CLI_AUTH: "true",
       };
       const resolved = await resolveTelemetrySettings({ env, settings });
       expect(resolved.useCliAuth).toBe(true);
     });
 
-    it('falls back to OTEL_EXPORTER_OTLP_ENDPOINT when GEMINI var is missing', async () => {
+    it("falls back to OTEL_EXPORTER_OTLP_ENDPOINT when GEMINI var is missing", async () => {
       const settings = {};
       const env = {
-        OTEL_EXPORTER_OTLP_ENDPOINT: 'http://otel:4317',
+        OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel:4317",
       } as Record<string, string>;
       const resolved = await resolveTelemetrySettings({ env, settings });
-      expect(resolved.otlpEndpoint).toBe('http://otel:4317');
+      expect(resolved.otlpEndpoint).toBe("http://otel:4317");
     });
 
-    it('throws on unknown protocol values', async () => {
-      const env = { GEMINI_TELEMETRY_OTLP_PROTOCOL: 'unknown' } as Record<
-        string,
-        string
-      >;
+    it("throws on unknown protocol values", async () => {
+      const env = { GEMINI_TELEMETRY_OTLP_PROTOCOL: "unknown" } as Record<string, string>;
       await expect(resolveTelemetrySettings({ env })).rejects.toThrow(
         /Invalid telemetry OTLP protocol/i,
       );
     });
 
-    it('throws on unknown target values', async () => {
-      const env = { GEMINI_TELEMETRY_TARGET: 'unknown' } as Record<
-        string,
-        string
-      >;
-      await expect(resolveTelemetrySettings({ env })).rejects.toThrow(
-        /Invalid telemetry target/i,
-      );
+    it("throws on unknown target values", async () => {
+      const env = { GEMINI_TELEMETRY_TARGET: "unknown" } as Record<string, string>;
+      await expect(resolveTelemetrySettings({ env })).rejects.toThrow(/Invalid telemetry target/i);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/telemetry/config.ts b/packages/gemini-cli-core/src/telemetry/config.ts
index 5569d4137..83086937a 100644
--- a/packages/gemini-cli-core/src/telemetry/config.ts
+++ b/packages/gemini-cli-core/src/telemetry/config.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TelemetrySettings } from '../config/config.js';
-import { FatalConfigError } from '../utils/errors.js';
-import { TelemetryTarget } from './index.js';
+import type { TelemetrySettings } from "../config/config.js";
+import { FatalConfigError } from "../utils/errors.js";
+import { TelemetryTarget } from "./index.js";
 
 /**
  * Parse a boolean environment flag. Accepts 'true'/'1' as true.
  */
-export function parseBooleanEnvFlag(
-  value: string | undefined,
-): boolean | undefined {
+export function parseBooleanEnvFlag(value: string | undefined): boolean | undefined {
   if (value === undefined) return undefined;
-  return value === 'true' || value === '1';
+  return value === "true" || value === "1";
 }
 
 /**
@@ -25,10 +23,10 @@ export function parseTelemetryTargetValue(
   value: string | TelemetryTarget | undefined,
 ): TelemetryTarget | undefined {
   if (value === undefined) return undefined;
-  if (value === TelemetryTarget.LOCAL || value === 'local') {
+  if (value === TelemetryTarget.LOCAL || value === "local") {
     return TelemetryTarget.LOCAL;
   }
-  if (value === TelemetryTarget.GCP || value === 'gcp') {
+  if (value === TelemetryTarget.GCP || value === "gcp") {
     return TelemetryTarget.GCP;
   }
   return undefined;
@@ -56,57 +54,45 @@ export async function resolveTelemetrySettings(options: {
   const settings = options.settings ?? {};
 
   const enabled =
-    argv.telemetry ??
-    parseBooleanEnvFlag(env['GEMINI_TELEMETRY_ENABLED']) ??
-    settings.enabled;
+    argv.telemetry ?? parseBooleanEnvFlag(env["GEMINI_TELEMETRY_ENABLED"]) ?? settings.enabled;
 
   const rawTarget =
     (argv.telemetryTarget as string | TelemetryTarget | undefined) ??
-    env['GEMINI_TELEMETRY_TARGET'] ??
+    env["GEMINI_TELEMETRY_TARGET"] ??
     (settings.target as string | TelemetryTarget | undefined);
   const target = parseTelemetryTargetValue(rawTarget);
   if (rawTarget !== undefined && target === undefined) {
     throw new FatalConfigError(
-      `Invalid telemetry target: ${String(
-        rawTarget,
-      )}. Valid values are: local, gcp`,
+      `Invalid telemetry target: ${String(rawTarget)}. Valid values are: local, gcp`,
     );
   }
 
   const otlpEndpoint =
     argv.telemetryOtlpEndpoint ??
-    env['GEMINI_TELEMETRY_OTLP_ENDPOINT'] ??
-    env['OTEL_EXPORTER_OTLP_ENDPOINT'] ??
+    env["GEMINI_TELEMETRY_OTLP_ENDPOINT"] ??
+    env["OTEL_EXPORTER_OTLP_ENDPOINT"] ??
     settings.otlpEndpoint;
 
   const rawProtocol =
     (argv.telemetryOtlpProtocol as string | undefined) ??
-    env['GEMINI_TELEMETRY_OTLP_PROTOCOL'] ??
+    env["GEMINI_TELEMETRY_OTLP_PROTOCOL"] ??
     settings.otlpProtocol;
-  const otlpProtocol = (['grpc', 'http'] as const).find(
-    (p) => p === rawProtocol,
-  );
+  const otlpProtocol = (["grpc", "http"] as const).find((p) => p === rawProtocol);
   if (rawProtocol !== undefined && otlpProtocol === undefined) {
     throw new FatalConfigError(
-      `Invalid telemetry OTLP protocol: ${String(
-        rawProtocol,
-      )}. Valid values are: grpc, http`,
+      `Invalid telemetry OTLP protocol: ${String(rawProtocol)}. Valid values are: grpc, http`,
     );
   }
 
   const logPrompts =
     argv.telemetryLogPrompts ??
-    parseBooleanEnvFlag(env['GEMINI_TELEMETRY_LOG_PROMPTS']) ??
+    parseBooleanEnvFlag(env["GEMINI_TELEMETRY_LOG_PROMPTS"]) ??
     settings.logPrompts;
 
-  const outfile =
-    argv.telemetryOutfile ??
-    env['GEMINI_TELEMETRY_OUTFILE'] ??
-    settings.outfile;
+  const outfile = argv.telemetryOutfile ?? env["GEMINI_TELEMETRY_OUTFILE"] ?? settings.outfile;
 
   const useCollector =
-    parseBooleanEnvFlag(env['GEMINI_TELEMETRY_USE_COLLECTOR']) ??
-    settings.useCollector;
+    parseBooleanEnvFlag(env["GEMINI_TELEMETRY_USE_COLLECTOR"]) ?? settings.useCollector;
 
   return {
     enabled,
@@ -116,8 +102,6 @@ export async function resolveTelemetrySettings(options: {
     logPrompts,
     outfile,
     useCollector,
-    useCliAuth:
-      parseBooleanEnvFlag(env['GEMINI_TELEMETRY_USE_CLI_AUTH']) ??
-      settings.useCliAuth,
+    useCliAuth: parseBooleanEnvFlag(env["GEMINI_TELEMETRY_USE_CLI_AUTH"]) ?? settings.useCliAuth,
   };
 }
diff --git a/packages/gemini-cli-core/src/telemetry/constants.ts b/packages/gemini-cli-core/src/telemetry/constants.ts
index 1d2b7751a..00624b67e 100644
--- a/packages/gemini-cli-core/src/telemetry/constants.ts
+++ b/packages/gemini-cli-core/src/telemetry/constants.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const SERVICE_NAME = 'gemini-cli';
+export const SERVICE_NAME = "gemini-cli";
diff --git a/packages/gemini-cli-core/src/telemetry/file-exporters.ts b/packages/gemini-cli-core/src/telemetry/file-exporters.ts
index 55fe64103..db7c60ea5 100644
--- a/packages/gemini-cli-core/src/telemetry/file-exporters.ts
+++ b/packages/gemini-cli-core/src/telemetry/file-exporters.ts
@@ -4,29 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import type { ExportResult } from '@opentelemetry/core';
-import { ExportResultCode } from '@opentelemetry/core';
-import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
-import type {
-  ReadableLogRecord,
-  LogRecordExporter,
-} from '@opentelemetry/sdk-logs';
-import type {
-  ResourceMetrics,
-  PushMetricExporter,
-} from '@opentelemetry/sdk-metrics';
-import { AggregationTemporality } from '@opentelemetry/sdk-metrics';
+import * as fs from "node:fs";
+import type { ExportResult } from "@opentelemetry/core";
+import { ExportResultCode } from "@opentelemetry/core";
+import type { LogRecordExporter, ReadableLogRecord } from "@opentelemetry/sdk-logs";
+import type { PushMetricExporter, ResourceMetrics } from "@opentelemetry/sdk-metrics";
+import { AggregationTemporality } from "@opentelemetry/sdk-metrics";
+import type { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
 
 class FileExporter {
   protected writeStream: fs.WriteStream;
 
   constructor(filePath: string) {
-    this.writeStream = fs.createWriteStream(filePath, { flags: 'a' });
+    this.writeStream = fs.createWriteStream(filePath, { flags: "a" });
   }
 
   protected serialize(data: unknown): string {
-    return JSON.stringify(data, null, 2) + '\n';
+    return JSON.stringify(data, null, 2) + "\n";
   }
 
   shutdown(): Promise<void> {
@@ -37,11 +31,8 @@ class FileExporter {
 }
 
 export class FileSpanExporter extends FileExporter implements SpanExporter {
-  export(
-    spans: ReadableSpan[],
-    resultCallback: (result: ExportResult) => void,
-  ): void {
-    const data = spans.map((span) => this.serialize(span)).join('');
+  export(spans: ReadableSpan[], resultCallback: (result: ExportResult) => void): void {
+    const data = spans.map((span) => this.serialize(span)).join("");
     this.writeStream.write(data, (err) => {
       resultCallback({
         code: err ? ExportResultCode.FAILED : ExportResultCode.SUCCESS,
@@ -52,11 +43,8 @@ export class FileSpanExporter extends FileExporter implements SpanExporter {
 }
 
 export class FileLogExporter extends FileExporter implements LogRecordExporter {
-  export(
-    logs: ReadableLogRecord[],
-    resultCallback: (result: ExportResult) => void,
-  ): void {
-    const data = logs.map((log) => this.serialize(log)).join('');
+  export(logs: ReadableLogRecord[], resultCallback: (result: ExportResult) => void): void {
+    const data = logs.map((log) => this.serialize(log)).join("");
     this.writeStream.write(data, (err) => {
       resultCallback({
         code: err ? ExportResultCode.FAILED : ExportResultCode.SUCCESS,
@@ -66,14 +54,8 @@ export class FileLogExporter extends FileExporter implements LogRecordExporter {
   }
 }
 
-export class FileMetricExporter
-  extends FileExporter
-  implements PushMetricExporter
-{
-  export(
-    metrics: ResourceMetrics,
-    resultCallback: (result: ExportResult) => void,
-  ): void {
+export class FileMetricExporter extends FileExporter implements PushMetricExporter {
+  export(metrics: ResourceMetrics, resultCallback: (result: ExportResult) => void): void {
     const data = this.serialize(metrics);
     this.writeStream.write(data, (err) => {
       resultCallback({
diff --git a/packages/gemini-cli-core/src/telemetry/gcp-exporters.test.ts b/packages/gemini-cli-core/src/telemetry/gcp-exporters.test.ts
index 6415104d5..6fb56054a 100644
--- a/packages/gemini-cli-core/src/telemetry/gcp-exporters.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/gcp-exporters.test.ts
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ExportResultCode } from '@opentelemetry/core';
-import type { ReadableLogRecord } from '@opentelemetry/sdk-logs';
-import {
-  GcpTraceExporter,
-  GcpMetricExporter,
-  GcpLogExporter,
-} from './gcp-exporters.js';
-
-const mockLogEntry = { test: 'entry' };
+import { ExportResultCode } from "@opentelemetry/core";
+import type { ReadableLogRecord } from "@opentelemetry/sdk-logs";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { GcpLogExporter, GcpMetricExporter, GcpTraceExporter } from "./gcp-exporters.js";
+
+const mockLogEntry = { test: "entry" };
 const mockLogWrite = vi.fn().mockResolvedValue(undefined);
 const mockLog = {
   entry: vi.fn().mockReturnValue(mockLogEntry),
   write: mockLogWrite,
 };
 const mockLogging = {
-  projectId: 'test-project',
+  projectId: "test-project",
   log: vi.fn().mockReturnValue(mockLog),
 };
 
-vi.mock('@google-cloud/opentelemetry-cloud-trace-exporter', () => ({
+vi.mock("@google-cloud/opentelemetry-cloud-trace-exporter", () => ({
   TraceExporter: vi.fn().mockImplementation(() => ({
     export: vi.fn(),
     shutdown: vi.fn(),
@@ -32,7 +28,7 @@ vi.mock('@google-cloud/opentelemetry-cloud-trace-exporter', () => ({
   })),
 }));
 
-vi.mock('@google-cloud/opentelemetry-cloud-monitoring-exporter', () => ({
+vi.mock("@google-cloud/opentelemetry-cloud-monitoring-exporter", () => ({
   MetricExporter: vi.fn().mockImplementation(() => ({
     export: vi.fn(),
     shutdown: vi.fn(),
@@ -40,73 +36,73 @@ vi.mock('@google-cloud/opentelemetry-cloud-monitoring-exporter', () => ({
   })),
 }));
 
-vi.mock('@google-cloud/logging', () => ({
+vi.mock("@google-cloud/logging", () => ({
   Logging: vi.fn().mockImplementation(() => mockLogging),
 }));
 
-describe('GCP Exporters', () => {
-  describe('GcpTraceExporter', () => {
-    it('should create a trace exporter with correct configuration', () => {
-      const exporter = new GcpTraceExporter('test-project');
+describe("GCP Exporters", () => {
+  describe("GcpTraceExporter", () => {
+    it("should create a trace exporter with correct configuration", () => {
+      const exporter = new GcpTraceExporter("test-project");
       expect(exporter).toBeDefined();
     });
 
-    it('should create a trace exporter without project ID', () => {
+    it("should create a trace exporter without project ID", () => {
       const exporter = new GcpTraceExporter();
       expect(exporter).toBeDefined();
     });
   });
 
-  describe('GcpMetricExporter', () => {
-    it('should create a metric exporter with correct configuration', () => {
-      const exporter = new GcpMetricExporter('test-project');
+  describe("GcpMetricExporter", () => {
+    it("should create a metric exporter with correct configuration", () => {
+      const exporter = new GcpMetricExporter("test-project");
       expect(exporter).toBeDefined();
     });
 
-    it('should create a metric exporter without project ID', () => {
+    it("should create a metric exporter without project ID", () => {
       const exporter = new GcpMetricExporter();
       expect(exporter).toBeDefined();
     });
   });
 
-  describe('GcpLogExporter', () => {
+  describe("GcpLogExporter", () => {
     let exporter: GcpLogExporter;
 
     beforeEach(() => {
       vi.clearAllMocks();
       mockLogWrite.mockResolvedValue(undefined);
       mockLog.entry.mockReturnValue(mockLogEntry);
-      exporter = new GcpLogExporter('test-project');
+      exporter = new GcpLogExporter("test-project");
     });
 
-    describe('constructor', () => {
-      it('should create a log exporter with project ID', () => {
+    describe("constructor", () => {
+      it("should create a log exporter with project ID", () => {
         expect(exporter).toBeDefined();
-        expect(mockLogging.log).toHaveBeenCalledWith('gemini_cli');
+        expect(mockLogging.log).toHaveBeenCalledWith("gemini_cli");
       });
 
-      it('should create a log exporter without project ID', () => {
+      it("should create a log exporter without project ID", () => {
         const exporterNoProject = new GcpLogExporter();
         expect(exporterNoProject).toBeDefined();
       });
     });
 
-    describe('export', () => {
-      it('should export logs successfully', async () => {
+    describe("export", () => {
+      it("should export logs successfully", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
             severityNumber: 9,
-            severityText: 'INFO',
-            body: 'Test log message',
+            severityText: "INFO",
+            body: "Test log message",
             attributes: {
-              'session.id': 'test-session',
-              'custom.attribute': 'value',
+              "session.id": "test-session",
+              "custom.attribute": "value",
             },
             resource: {
               attributes: {
-                'service.name': 'test-service',
+                "service.name": "test-service",
               },
             },
           } as unknown as ReadableLogRecord,
@@ -120,20 +116,20 @@ describe('GCP Exporters', () => {
 
         expect(mockLog.entry).toHaveBeenCalledWith(
           expect.objectContaining({
-            severity: 'INFO',
+            severity: "INFO",
             timestamp: expect.any(Date),
             resource: {
-              type: 'global',
+              type: "global",
               labels: {
-                project_id: 'test-project',
+                project_id: "test-project",
               },
             },
           }),
           expect.objectContaining({
-            message: 'Test log message',
-            'session.id': 'test-session',
-            'custom.attribute': 'value',
-            'service.name': 'test-service',
+            message: "Test log message",
+            "session.id": "test-session",
+            "custom.attribute": "value",
+            "service.name": "test-service",
           }),
         );
 
@@ -143,16 +139,16 @@ describe('GCP Exporters', () => {
         });
       });
 
-      it('should handle export failures', async () => {
+      it("should handle export failures", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
-        const error = new Error('Write failed');
+        const error = new Error("Write failed");
         mockLogWrite.mockRejectedValueOnce(error);
 
         const callback = vi.fn();
@@ -167,17 +163,17 @@ describe('GCP Exporters', () => {
         });
       });
 
-      it('should handle synchronous errors', () => {
+      it("should handle synchronous errors", () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
         mockLog.entry.mockImplementation(() => {
-          throw new Error('Entry creation failed');
+          throw new Error("Entry creation failed");
         });
 
         const callback = vi.fn();
@@ -191,17 +187,17 @@ describe('GCP Exporters', () => {
       });
     });
 
-    describe('severity mapping', () => {
-      it('should map OpenTelemetry severity numbers to Cloud Logging levels', () => {
+    describe("severity mapping", () => {
+      it("should map OpenTelemetry severity numbers to Cloud Logging levels", () => {
         const testCases = [
-          { severityNumber: undefined, expected: 'DEFAULT' },
-          { severityNumber: 1, expected: 'DEFAULT' },
-          { severityNumber: 5, expected: 'DEBUG' },
-          { severityNumber: 9, expected: 'INFO' },
-          { severityNumber: 13, expected: 'WARNING' },
-          { severityNumber: 17, expected: 'ERROR' },
-          { severityNumber: 21, expected: 'CRITICAL' },
-          { severityNumber: 25, expected: 'CRITICAL' },
+          { severityNumber: undefined, expected: "DEFAULT" },
+          { severityNumber: 1, expected: "DEFAULT" },
+          { severityNumber: 5, expected: "DEBUG" },
+          { severityNumber: 9, expected: "INFO" },
+          { severityNumber: 13, expected: "WARNING" },
+          { severityNumber: 17, expected: "ERROR" },
+          { severityNumber: 21, expected: "CRITICAL" },
+          { severityNumber: 25, expected: "CRITICAL" },
         ];
 
         testCases.forEach(({ severityNumber, expected }) => {
@@ -210,7 +206,7 @@ describe('GCP Exporters', () => {
               hrTime: [1234567890, 123456789],
               hrTimeObserved: [1234567890, 123456789],
               severityNumber,
-              body: 'Test message',
+              body: "Test message",
             } as unknown as ReadableLogRecord,
           ];
 
@@ -229,17 +225,17 @@ describe('GCP Exporters', () => {
       });
     });
 
-    describe('forceFlush', () => {
-      it('should resolve immediately when no pending writes exist', async () => {
+    describe("forceFlush", () => {
+      it("should resolve immediately when no pending writes exist", async () => {
         await expect(exporter.forceFlush()).resolves.toBeUndefined();
       });
 
-      it('should wait for pending writes to complete', async () => {
+      it("should wait for pending writes to complete", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -262,12 +258,12 @@ describe('GCP Exporters', () => {
         await expect(flushPromise).resolves.toBeUndefined();
       });
 
-      it('should handle multiple pending writes', async () => {
+      it("should handle multiple pending writes", async () => {
         const mockLogRecords1: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message 1',
+            body: "Test log message 1",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -275,7 +271,7 @@ describe('GCP Exporters', () => {
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message 2',
+            body: "Test log message 2",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -288,9 +284,7 @@ describe('GCP Exporters', () => {
           resolveWrite2 = resolve;
         });
 
-        mockLogWrite
-          .mockReturnValueOnce(writePromise1)
-          .mockReturnValueOnce(writePromise2);
+        mockLogWrite.mockReturnValueOnce(writePromise1).mockReturnValueOnce(writePromise2);
 
         const callback = vi.fn();
 
@@ -308,16 +302,16 @@ describe('GCP Exporters', () => {
         await expect(flushPromise).resolves.toBeUndefined();
       });
 
-      it('should handle write failures gracefully', async () => {
+      it("should handle write failures gracefully", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
-        const error = new Error('Write failed');
+        const error = new Error("Write failed");
         mockLogWrite.mockRejectedValueOnce(error);
 
         const callback = vi.fn();
@@ -334,27 +328,27 @@ describe('GCP Exporters', () => {
       });
     });
 
-    describe('shutdown', () => {
-      it('should call forceFlush', async () => {
-        const forceFlushSpy = vi.spyOn(exporter, 'forceFlush');
+    describe("shutdown", () => {
+      it("should call forceFlush", async () => {
+        const forceFlushSpy = vi.spyOn(exporter, "forceFlush");
 
         await exporter.shutdown();
 
         expect(forceFlushSpy).toHaveBeenCalled();
       });
 
-      it('should handle shutdown gracefully', async () => {
-        const forceFlushSpy = vi.spyOn(exporter, 'forceFlush');
+      it("should handle shutdown gracefully", async () => {
+        const forceFlushSpy = vi.spyOn(exporter, "forceFlush");
 
         await expect(exporter.shutdown()).resolves.toBeUndefined();
         expect(forceFlushSpy).toHaveBeenCalled();
       });
-      it('should wait for pending writes before shutting down', async () => {
+      it("should wait for pending writes before shutting down", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -377,12 +371,12 @@ describe('GCP Exporters', () => {
         await expect(shutdownPromise).resolves.toBeUndefined();
       });
 
-      it('should clear pending writes array after shutdown', async () => {
+      it("should clear pending writes array after shutdown", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
diff --git a/packages/gemini-cli-core/src/telemetry/gcp-exporters.ts b/packages/gemini-cli-core/src/telemetry/gcp-exporters.ts
index 16b83ff46..fab408ab6 100644
--- a/packages/gemini-cli-core/src/telemetry/gcp-exporters.ts
+++ b/packages/gemini-cli-core/src/telemetry/gcp-exporters.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type JWTInput } from 'google-auth-library';
-import { TraceExporter } from '@google-cloud/opentelemetry-cloud-trace-exporter';
-import { MetricExporter } from '@google-cloud/opentelemetry-cloud-monitoring-exporter';
-import { Logging } from '@google-cloud/logging';
-import type { Log } from '@google-cloud/logging';
-import { hrTimeToMilliseconds } from '@opentelemetry/core';
-import type { ExportResult } from '@opentelemetry/core';
-import { ExportResultCode } from '@opentelemetry/core';
-import type {
-  ReadableLogRecord,
-  LogRecordExporter,
-} from '@opentelemetry/sdk-logs';
+import type { Log } from "@google-cloud/logging";
+import { Logging } from "@google-cloud/logging";
+import { MetricExporter } from "@google-cloud/opentelemetry-cloud-monitoring-exporter";
+import { TraceExporter } from "@google-cloud/opentelemetry-cloud-trace-exporter";
+import type { ExportResult } from "@opentelemetry/core";
+import { ExportResultCode, hrTimeToMilliseconds } from "@opentelemetry/core";
+import type { LogRecordExporter, ReadableLogRecord } from "@opentelemetry/sdk-logs";
+import { type JWTInput } from "google-auth-library";
 
 /**
  * Google Cloud Trace exporter that extends the official trace exporter
@@ -38,7 +34,7 @@ export class GcpMetricExporter extends MetricExporter {
     super({
       projectId,
       credentials,
-      prefix: 'custom.googleapis.com/gemini_cli',
+      prefix: "custom.googleapis.com/gemini_cli",
     });
   }
 }
@@ -53,13 +49,10 @@ export class GcpLogExporter implements LogRecordExporter {
 
   constructor(projectId?: string, credentials?: JWTInput) {
     this.logging = new Logging({ projectId, credentials });
-    this.log = this.logging.log('gemini_cli');
+    this.log = this.logging.log("gemini_cli");
   }
 
-  export(
-    logs: ReadableLogRecord[],
-    resultCallback: (result: ExportResult) => void,
-  ): void {
+  export(logs: ReadableLogRecord[], resultCallback: (result: ExportResult) => void): void {
     try {
       const entries = logs.map((log) => {
         const entry = this.log.entry(
@@ -67,7 +60,7 @@ export class GcpLogExporter implements LogRecordExporter {
             severity: this.mapSeverityToCloudLogging(log.severityNumber),
             timestamp: new Date(hrTimeToMilliseconds(log.hrTime)),
             resource: {
-              type: 'global',
+              type: "global",
               labels: {
                 project_id: this.logging.projectId,
               },
@@ -121,15 +114,15 @@ export class GcpLogExporter implements LogRecordExporter {
   }
 
   private mapSeverityToCloudLogging(severityNumber?: number): string {
-    if (!severityNumber) return 'DEFAULT';
+    if (!severityNumber) return "DEFAULT";
 
     // Map OpenTelemetry severity numbers to Cloud Logging severity levels
     // https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber
-    if (severityNumber >= 21) return 'CRITICAL';
-    if (severityNumber >= 17) return 'ERROR';
-    if (severityNumber >= 13) return 'WARNING';
-    if (severityNumber >= 9) return 'INFO';
-    if (severityNumber >= 5) return 'DEBUG';
-    return 'DEFAULT';
+    if (severityNumber >= 21) return "CRITICAL";
+    if (severityNumber >= 17) return "ERROR";
+    if (severityNumber >= 13) return "WARNING";
+    if (severityNumber >= 9) return "INFO";
+    if (severityNumber >= 5) return "DEBUG";
+    return "DEFAULT";
   }
 }
diff --git a/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.test.ts b/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.test.ts
index 568b2a797..cebe3c4c0 100644
--- a/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.test.ts
@@ -4,184 +4,182 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { HighWaterMarkTracker } from './high-water-mark-tracker.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
 
-describe('HighWaterMarkTracker', () => {
+describe("HighWaterMarkTracker", () => {
   let tracker: HighWaterMarkTracker;
 
   beforeEach(() => {
     tracker = new HighWaterMarkTracker(5); // 5% threshold
   });
 
-  describe('constructor', () => {
-    it('should initialize with default values', () => {
+  describe("constructor", () => {
+    it("should initialize with default values", () => {
       const defaultTracker = new HighWaterMarkTracker();
       expect(defaultTracker).toBeInstanceOf(HighWaterMarkTracker);
     });
 
-    it('should initialize with custom values', () => {
+    it("should initialize with custom values", () => {
       const customTracker = new HighWaterMarkTracker(10);
       expect(customTracker).toBeInstanceOf(HighWaterMarkTracker);
     });
 
-    it('should throw on negative threshold', () => {
+    it("should throw on negative threshold", () => {
       expect(() => new HighWaterMarkTracker(-1)).toThrow(
-        'growthThresholdPercent must be non-negative.',
+        "growthThresholdPercent must be non-negative.",
       );
     });
   });
 
-  describe('shouldRecordMetric', () => {
-    it('should return true for first measurement', () => {
-      const result = tracker.shouldRecordMetric('heap_used', 1000000);
+  describe("shouldRecordMetric", () => {
+    it("should return true for first measurement", () => {
+      const result = tracker.shouldRecordMetric("heap_used", 1000000);
       expect(result).toBe(true);
     });
 
-    it('should return false for small increases', () => {
+    it("should return false for small increases", () => {
       // Set initial high-water mark
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Small increase (less than 5%)
-      const result = tracker.shouldRecordMetric('heap_used', 1030000); // 3% increase
+      const result = tracker.shouldRecordMetric("heap_used", 1030000); // 3% increase
       expect(result).toBe(false);
     });
 
-    it('should return true for significant increases', () => {
+    it("should return true for significant increases", () => {
       // Set initial high-water mark
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Add several readings to build up smoothing window
-      tracker.shouldRecordMetric('heap_used', 1100000); // 10% increase
-      tracker.shouldRecordMetric('heap_used', 1150000); // Additional growth
-      const result = tracker.shouldRecordMetric('heap_used', 1200000); // Sustained growth
+      tracker.shouldRecordMetric("heap_used", 1100000); // 10% increase
+      tracker.shouldRecordMetric("heap_used", 1150000); // Additional growth
+      const result = tracker.shouldRecordMetric("heap_used", 1200000); // Sustained growth
       expect(result).toBe(true);
     });
 
-    it('should handle decreasing values correctly', () => {
+    it("should handle decreasing values correctly", () => {
       // Set initial high-water mark
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Decrease (should not trigger)
-      const result = tracker.shouldRecordMetric('heap_used', 900000); // 10% decrease
+      const result = tracker.shouldRecordMetric("heap_used", 900000); // 10% decrease
       expect(result).toBe(false);
     });
 
-    it('should update high-water mark when threshold exceeded', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
+    it("should update high-water mark when threshold exceeded", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
-      const beforeMark = tracker.getHighWaterMark('heap_used');
+      const beforeMark = tracker.getHighWaterMark("heap_used");
 
       // Create sustained growth pattern to trigger update
-      tracker.shouldRecordMetric('heap_used', 1100000);
-      tracker.shouldRecordMetric('heap_used', 1150000);
-      tracker.shouldRecordMetric('heap_used', 1200000);
+      tracker.shouldRecordMetric("heap_used", 1100000);
+      tracker.shouldRecordMetric("heap_used", 1150000);
+      tracker.shouldRecordMetric("heap_used", 1200000);
 
-      const afterMark = tracker.getHighWaterMark('heap_used');
+      const afterMark = tracker.getHighWaterMark("heap_used");
 
       expect(afterMark).toBeGreaterThan(beforeMark);
     });
 
-    it('should handle multiple metric types independently', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+    it("should handle multiple metric types independently", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
-      expect(tracker.getHighWaterMark('heap_used')).toBeGreaterThan(0);
-      expect(tracker.getHighWaterMark('rss')).toBeGreaterThan(0);
-      expect(tracker.getHighWaterMark('heap_used')).not.toBe(
-        tracker.getHighWaterMark('rss'),
-      );
+      expect(tracker.getHighWaterMark("heap_used")).toBeGreaterThan(0);
+      expect(tracker.getHighWaterMark("rss")).toBeGreaterThan(0);
+      expect(tracker.getHighWaterMark("heap_used")).not.toBe(tracker.getHighWaterMark("rss"));
     });
   });
 
-  describe('smoothing functionality', () => {
-    it('should reduce noise from garbage collection spikes', () => {
+  describe("smoothing functionality", () => {
+    it("should reduce noise from garbage collection spikes", () => {
       // Establish baseline
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Single spike (should be smoothed out)
-      const result = tracker.shouldRecordMetric('heap_used', 2000000);
+      const result = tracker.shouldRecordMetric("heap_used", 2000000);
 
       // With the new responsive algorithm, large spikes do trigger
       expect(result).toBe(true);
     });
 
-    it('should eventually respond to sustained growth', () => {
+    it("should eventually respond to sustained growth", () => {
       // Establish baseline
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Sustained growth pattern
-      tracker.shouldRecordMetric('heap_used', 1100000);
-      tracker.shouldRecordMetric('heap_used', 1150000);
-      const result = tracker.shouldRecordMetric('heap_used', 1200000);
+      tracker.shouldRecordMetric("heap_used", 1100000);
+      tracker.shouldRecordMetric("heap_used", 1150000);
+      const result = tracker.shouldRecordMetric("heap_used", 1200000);
 
       expect(result).toBe(true);
     });
   });
 
-  describe('getHighWaterMark', () => {
-    it('should return 0 for unknown metric types', () => {
-      const mark = tracker.getHighWaterMark('unknown_metric');
+  describe("getHighWaterMark", () => {
+    it("should return 0 for unknown metric types", () => {
+      const mark = tracker.getHighWaterMark("unknown_metric");
       expect(mark).toBe(0);
     });
 
-    it('should return correct value for known metric types', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      const mark = tracker.getHighWaterMark('heap_used');
+    it("should return correct value for known metric types", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      const mark = tracker.getHighWaterMark("heap_used");
       expect(mark).toBeGreaterThan(0);
     });
   });
 
-  describe('getAllHighWaterMarks', () => {
-    it('should return empty object initially', () => {
+  describe("getAllHighWaterMarks", () => {
+    it("should return empty object initially", () => {
       const marks = tracker.getAllHighWaterMarks();
       expect(marks).toEqual({});
     });
 
-    it('should return all recorded marks', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+    it("should return all recorded marks", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
       const marks = tracker.getAllHighWaterMarks();
       expect(Object.keys(marks)).toHaveLength(2);
-      expect(marks['heap_used']).toBeGreaterThan(0);
-      expect(marks['rss']).toBeGreaterThan(0);
+      expect(marks["heap_used"]).toBeGreaterThan(0);
+      expect(marks["rss"]).toBeGreaterThan(0);
     });
   });
 
-  describe('resetHighWaterMark', () => {
-    it('should reset specific metric type', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+  describe("resetHighWaterMark", () => {
+    it("should reset specific metric type", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
-      tracker.resetHighWaterMark('heap_used');
+      tracker.resetHighWaterMark("heap_used");
 
-      expect(tracker.getHighWaterMark('heap_used')).toBe(0);
-      expect(tracker.getHighWaterMark('rss')).toBeGreaterThan(0);
+      expect(tracker.getHighWaterMark("heap_used")).toBe(0);
+      expect(tracker.getHighWaterMark("rss")).toBeGreaterThan(0);
     });
   });
 
-  describe('resetAllHighWaterMarks', () => {
-    it('should reset all metrics', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+  describe("resetAllHighWaterMarks", () => {
+    it("should reset all metrics", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
       tracker.resetAllHighWaterMarks();
 
-      expect(tracker.getHighWaterMark('heap_used')).toBe(0);
-      expect(tracker.getHighWaterMark('rss')).toBe(0);
+      expect(tracker.getHighWaterMark("heap_used")).toBe(0);
+      expect(tracker.getHighWaterMark("rss")).toBe(0);
       expect(tracker.getAllHighWaterMarks()).toEqual({});
     });
   });
 
-  describe('time-based cleanup', () => {
-    it('should clean up old readings', () => {
+  describe("time-based cleanup", () => {
+    it("should clean up old readings", () => {
       vi.useFakeTimers();
 
       // Add readings
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Advance time significantly
       vi.advanceTimersByTime(15000); // 15 seconds
@@ -190,7 +188,7 @@ describe('HighWaterMarkTracker', () => {
       tracker.cleanup(10000); // 10 seconds
 
       // Entry should be removed
-      expect(tracker.getHighWaterMark('heap_used')).toBe(0);
+      expect(tracker.getHighWaterMark("heap_used")).toBe(0);
 
       vi.useRealTimers();
     });
diff --git a/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.ts b/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.ts
index 7317650bb..981ee0746 100644
--- a/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.ts
+++ b/packages/gemini-cli-core/src/telemetry/high-water-mark-tracker.ts
@@ -15,7 +15,7 @@ export class HighWaterMarkTracker {
 
   constructor(growthThresholdPercent: number = 5) {
     if (growthThresholdPercent < 0) {
-      throw new Error('growthThresholdPercent must be non-negative.');
+      throw new Error("growthThresholdPercent must be non-negative.");
     }
     this.growthThresholdPercent = growthThresholdPercent;
   }
@@ -41,8 +41,7 @@ export class HighWaterMarkTracker {
     }
 
     // Check if current value exceeds threshold
-    const thresholdValue =
-      currentWaterMark * (1 + this.growthThresholdPercent / 100);
+    const thresholdValue = currentWaterMark * (1 + this.growthThresholdPercent / 100);
 
     if (currentValue > thresholdValue) {
       // Update high-water mark
diff --git a/packages/gemini-cli-core/src/telemetry/index.ts b/packages/gemini-cli-core/src/telemetry/index.ts
index 11bc00773..031b501e3 100644
--- a/packages/gemini-cli-core/src/telemetry/index.ts
+++ b/packages/gemini-cli-core/src/telemetry/index.ts
@@ -5,137 +5,137 @@
  */
 
 export enum TelemetryTarget {
-  GCP = 'gcp',
-  LOCAL = 'local',
+  GCP = "gcp",
+  LOCAL = "local",
 }
 
 const DEFAULT_TELEMETRY_TARGET = TelemetryTarget.LOCAL;
-const DEFAULT_OTLP_ENDPOINT = 'http://localhost:4317';
+const DEFAULT_OTLP_ENDPOINT = "http://localhost:4317";
 
-export { DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT };
+export { SpanStatusCode, ValueType } from "@opentelemetry/api";
+export { SemanticAttributes } from "@opentelemetry/semantic-conventions";
 export {
-  initializeTelemetry,
-  shutdownTelemetry,
-  flushTelemetry,
-  isTelemetrySdkInitialized,
-} from './sdk.js';
+  ActivityDetector,
+  getActivityDetector,
+  isUserActive,
+  recordUserActivity,
+} from "./activity-detector.js";
+export {
+  ActivityMonitor,
+  getActivityMonitor,
+  initializeActivityMonitor,
+  startGlobalActivityMonitoring,
+  stopGlobalActivityMonitoring,
+} from "./activity-monitor.js";
+export { ActivityType } from "./activity-types.js";
 export {
-  resolveTelemetrySettings,
   parseBooleanEnvFlag,
   parseTelemetryTargetValue,
-} from './config.js';
+  resolveTelemetrySettings,
+} from "./config.js";
 export {
-  GcpTraceExporter,
-  GcpMetricExporter,
   GcpLogExporter,
-} from './gcp-exporters.js';
+  GcpMetricExporter,
+  GcpTraceExporter,
+} from "./gcp-exporters.js";
+export { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
 export {
-  logCliConfiguration,
-  logUserPrompt,
-  logToolCall,
-  logApiRequest,
   logApiError,
+  logApiRequest,
   logApiResponse,
-  logFlashFallback,
-  logSlashCommand,
-  logConversationFinishedEvent,
   logChatCompression,
-  logToolOutputTruncated,
+  logCliConfiguration,
+  logConversationFinishedEvent,
   logExtensionEnable,
   logExtensionInstallEvent,
   logExtensionUninstall,
   logExtensionUpdateEvent,
+  logFlashFallback,
+  logSlashCommand,
+  logToolCall,
+  logToolOutputTruncated,
+  logUserPrompt,
   logWebFetchFallbackAttempt,
-} from './loggers.js';
-export type { SlashCommandEvent, ChatCompressionEvent } from './types.js';
+} from "./loggers.js";
+export type { MemorySnapshot, ProcessMetrics } from "./memory-monitor.js";
 export {
-  SlashCommandStatus,
-  EndSessionEvent,
-  UserPromptEvent,
-  ApiRequestEvent,
-  ApiErrorEvent,
-  ApiResponseEvent,
-  FlashFallbackEvent,
-  StartSessionEvent,
-  ToolCallEvent,
-  ConversationFinishedEvent,
-  ToolOutputTruncatedEvent,
-  WebFetchFallbackAttemptEvent,
-  ToolCallDecision,
-} from './types.js';
-export { makeSlashCommandEvent, makeChatCompressionEvent } from './types.js';
-export type { TelemetryEvent } from './types.js';
-export { SpanStatusCode, ValueType } from '@opentelemetry/api';
-export { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-export * from './uiTelemetry.js';
-export {
-  MemoryMonitor,
-  initializeMemoryMonitor,
   getMemoryMonitor,
+  initializeMemoryMonitor,
+  MemoryMonitor,
   recordCurrentMemoryUsage,
   startGlobalMemoryMonitoring,
   stopGlobalMemoryMonitoring,
-} from './memory-monitor.js';
-export type { MemorySnapshot, ProcessMetrics } from './memory-monitor.js';
-export { HighWaterMarkTracker } from './high-water-mark-tracker.js';
-export { RateLimiter } from './rate-limiter.js';
-export { ActivityType } from './activity-types.js';
+} from "./memory-monitor.js";
 export {
-  ActivityDetector,
-  getActivityDetector,
-  recordUserActivity,
-  isUserActive,
-} from './activity-detector.js';
-export {
-  ActivityMonitor,
-  initializeActivityMonitor,
-  getActivityMonitor,
-  startGlobalActivityMonitoring,
-  stopGlobalActivityMonitoring,
-} from './activity-monitor.js';
-export {
-  // Core metrics functions
-  recordToolCallMetrics,
-  recordTokenUsageMetrics,
-  recordApiResponseMetrics,
+  ApiRequestPhase,
+  FileOperation,
+  // OpenTelemetry Semantic Convention types
+  GenAiOperationName,
+  GenAiProviderName,
+  GenAiTokenType,
+  getConventionAttributes,
+  isPerformanceMonitoringActive,
+  MemoryMetricType,
+  // Performance monitoring types
+  PerformanceMetricType,
   recordApiErrorMetrics,
-  recordFileOperationMetric,
-  recordInvalidChunk,
+  recordApiRequestBreakdown,
+  recordApiResponseMetrics,
+  recordBaselineComparison,
   recordContentRetry,
   recordContentRetryFailure,
-  recordModelRoutingMetrics,
+  recordCpuUsage,
+  recordCustomApiResponseMetrics,
   // Custom metrics for token usage and API responses
   recordCustomTokenUsageMetrics,
-  recordCustomApiResponseMetrics,
   recordExitFail,
+  recordFileOperationMetric,
+  recordFlickerFrame,
+  recordGenAiClientOperationDuration,
   // OpenTelemetry GenAI semantic convention for token usage and operation duration
   recordGenAiClientTokenUsage,
-  recordGenAiClientOperationDuration,
-  getConventionAttributes,
-  // Performance monitoring functions
-  recordStartupPerformance,
+  recordInvalidChunk,
   recordMemoryUsage,
-  recordCpuUsage,
-  recordToolQueueDepth,
-  recordToolExecutionBreakdown,
-  recordTokenEfficiency,
-  recordApiRequestBreakdown,
-  recordPerformanceScore,
+  recordModelRoutingMetrics,
   recordPerformanceRegression,
-  recordBaselineComparison,
-  isPerformanceMonitoringActive,
-  recordFlickerFrame,
+  recordPerformanceScore,
   recordSlowRender,
-  // Performance monitoring types
-  PerformanceMetricType,
-  MemoryMetricType,
+  // Performance monitoring functions
+  recordStartupPerformance,
+  recordTokenEfficiency,
+  recordTokenUsageMetrics,
+  // Core metrics functions
+  recordToolCallMetrics,
+  recordToolExecutionBreakdown,
+  recordToolQueueDepth,
   ToolExecutionPhase,
-  ApiRequestPhase,
-  FileOperation,
-  // OpenTelemetry Semantic Convention types
-  GenAiOperationName,
-  GenAiProviderName,
-  GenAiTokenType,
-} from './metrics.js';
-export { runInDevTraceSpan, type SpanMetadata } from './trace.js';
-export { startupProfiler, StartupProfiler } from './startupProfiler.js';
+} from "./metrics.js";
+export { RateLimiter } from "./rate-limiter.js";
+export {
+  flushTelemetry,
+  initializeTelemetry,
+  isTelemetrySdkInitialized,
+  shutdownTelemetry,
+} from "./sdk.js";
+export { StartupProfiler, startupProfiler } from "./startupProfiler.js";
+export { runInDevTraceSpan, type SpanMetadata } from "./trace.js";
+export type { ChatCompressionEvent, SlashCommandEvent, TelemetryEvent } from "./types.js";
+export {
+  ApiErrorEvent,
+  ApiRequestEvent,
+  ApiResponseEvent,
+  ConversationFinishedEvent,
+  EndSessionEvent,
+  FlashFallbackEvent,
+  makeChatCompressionEvent,
+  makeSlashCommandEvent,
+  SlashCommandStatus,
+  StartSessionEvent,
+  ToolCallDecision,
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
+  UserPromptEvent,
+  WebFetchFallbackAttemptEvent,
+} from "./types.js";
+export * from "./uiTelemetry.js";
+export { DEFAULT_OTLP_ENDPOINT, DEFAULT_TELEMETRY_TARGET };
diff --git a/packages/gemini-cli-core/src/telemetry/integration.test.circular.ts b/packages/gemini-cli-core/src/telemetry/integration.test.circular.ts
index 9ff8a58ec..12aacf72b 100644
--- a/packages/gemini-cli-core/src/telemetry/integration.test.circular.ts
+++ b/packages/gemini-cli-core/src/telemetry/integration.test.circular.ts
@@ -8,28 +8,28 @@
  * Integration test to verify circular reference handling with proxy agents
  */
 
-import { describe, it, expect } from 'vitest';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
-import type { Config } from '../config/config.js';
+import { describe, expect, it } from "vitest";
+import type { Config } from "../config/config.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
 
-describe('Circular Reference Integration Test', () => {
-  it('should handle HttpsProxyAgent-like circular references in clearcut logging', () => {
+describe("Circular Reference Integration Test", () => {
+  it("should handle HttpsProxyAgent-like circular references in clearcut logging", () => {
     // Create a mock config with proxy
     const mockConfig = {
       getTelemetryEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
-      getSessionId: () => 'test-session',
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding',
+      getSessionId: () => "test-session",
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding",
       getDebugMode: () => false,
-      getProxy: () => 'http://proxy.example.com:8080',
+      getProxy: () => "http://proxy.example.com:8080",
     } as unknown as Config;
 
     // Simulate the structure that causes the circular reference error
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const proxyAgentLike: any = {
       sockets: {},
-      options: { proxy: 'http://proxy.example.com:8080' },
+      options: { proxy: "http://proxy.example.com:8080" },
     };
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -41,13 +41,13 @@ describe('Circular Reference Integration Test', () => {
     };
 
     socketLike._httpMessage.socket = socketLike; // Create circular reference
-    proxyAgentLike.sockets['cloudcode-pa.googleapis.com:443'] = [socketLike];
+    proxyAgentLike.sockets["cloudcode-pa.googleapis.com:443"] = [socketLike];
 
     // Create an event that would contain this circular structure
     const problematicEvent = {
-      error: new Error('Network error'),
+      error: new Error("Network error"),
       function_args: {
-        filePath: '/test/file.txt',
+        filePath: "/test/file.txt",
         httpAgent: proxyAgentLike, // This would cause the circular reference
       },
     };
diff --git a/packages/gemini-cli-core/src/telemetry/loggers.test.circular.ts b/packages/gemini-cli-core/src/telemetry/loggers.test.circular.ts
index 2f82743de..2d93625f6 100644
--- a/packages/gemini-cli-core/src/telemetry/loggers.test.circular.ts
+++ b/packages/gemini-cli-core/src/telemetry/loggers.test.circular.ts
@@ -8,26 +8,23 @@
  * Test to verify circular reference handling in telemetry logging
  */
 
-import { describe, it, expect } from 'vitest';
-import { logToolCall } from './loggers.js';
-import { ToolCallEvent } from './types.js';
-import type { Config } from '../config/config.js';
-import type { CompletedToolCall } from '../core/coreToolScheduler.js';
-import type {
-  ToolCallRequestInfo,
-  ToolCallResponseInfo,
-} from '../core/turn.js';
-import { MockTool } from '../test-utils/mock-tool.js';
-
-describe('Circular Reference Handling', () => {
-  it('should handle circular references in tool function arguments', () => {
+import { describe, expect, it } from "vitest";
+import type { Config } from "../config/config.js";
+import type { CompletedToolCall } from "../core/coreToolScheduler.js";
+import type { ToolCallRequestInfo, ToolCallResponseInfo } from "../core/turn.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { logToolCall } from "./loggers.js";
+import { ToolCallEvent } from "./types.js";
+
+describe("Circular Reference Handling", () => {
+  it("should handle circular references in tool function arguments", () => {
     // Create a mock config
     const mockConfig = {
       getTelemetryEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
-      getSessionId: () => 'test-session',
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding',
+      getSessionId: () => "test-session",
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding",
       getDebugMode: () => false,
     } as unknown as Config;
 
@@ -38,30 +35,28 @@ describe('Circular Reference Handling', () => {
       agent: null,
     };
     circularObject.agent = circularObject; // Create circular reference
-    circularObject.sockets['test-host'] = [
-      { _httpMessage: { agent: circularObject } },
-    ];
+    circularObject.sockets["test-host"] = [{ _httpMessage: { agent: circularObject } }];
 
     // Create a mock CompletedToolCall with circular references in function_args
     const mockRequest: ToolCallRequestInfo = {
-      callId: 'test-call-id',
-      name: 'ReadFile',
+      callId: "test-call-id",
+      name: "ReadFile",
       args: circularObject, // This would cause the original error
       isClientInitiated: false,
-      prompt_id: 'test-prompt-id',
+      prompt_id: "test-prompt-id",
     };
 
     const mockResponse: ToolCallResponseInfo = {
-      callId: 'test-call-id',
-      responseParts: [{ text: 'test result' }],
+      callId: "test-call-id",
+      responseParts: [{ text: "test result" }],
       resultDisplay: undefined,
       error: undefined, // undefined means success
       errorType: undefined,
     };
 
-    const tool = new MockTool({ name: 'mock-tool' });
+    const tool = new MockTool({ name: "mock-tool" });
     const mockCompletedToolCall: CompletedToolCall = {
-      status: 'success',
+      status: "success",
       request: mockRequest,
       response: mockResponse,
       tool,
@@ -77,40 +72,40 @@ describe('Circular Reference Handling', () => {
     }).not.toThrow();
   });
 
-  it('should handle normal objects without circular references', () => {
+  it("should handle normal objects without circular references", () => {
     const mockConfig = {
       getTelemetryEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
-      getSessionId: () => 'test-session',
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding',
+      getSessionId: () => "test-session",
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding",
       getDebugMode: () => false,
     } as unknown as Config;
 
     const normalObject = {
-      filePath: '/test/path',
-      options: { encoding: 'utf8' },
+      filePath: "/test/path",
+      options: { encoding: "utf8" },
     };
 
     const mockRequest: ToolCallRequestInfo = {
-      callId: 'test-call-id',
-      name: 'ReadFile',
+      callId: "test-call-id",
+      name: "ReadFile",
       args: normalObject,
       isClientInitiated: false,
-      prompt_id: 'test-prompt-id',
+      prompt_id: "test-prompt-id",
     };
 
     const mockResponse: ToolCallResponseInfo = {
-      callId: 'test-call-id',
-      responseParts: [{ text: 'test result' }],
+      callId: "test-call-id",
+      responseParts: [{ text: "test result" }],
       resultDisplay: undefined,
       error: undefined, // undefined means success
       errorType: undefined,
     };
 
-    const tool = new MockTool({ name: 'mock-tool' });
+    const tool = new MockTool({ name: "mock-tool" });
     const mockCompletedToolCall: CompletedToolCall = {
-      status: 'success',
+      status: "success",
       request: mockRequest,
       response: mockResponse,
       tool,
diff --git a/packages/gemini-cli-core/src/telemetry/loggers.test.ts b/packages/gemini-cli-core/src/telemetry/loggers.test.ts
index 27897b2f2..8b6ce2f7e 100644
--- a/packages/gemini-cli-core/src/telemetry/loggers.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/loggers.test.ts
@@ -4,12 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {
+  type CallableTool,
+  FinishReason,
+  type GenerateContentResponseUsageMetadata,
+} from "@google/genai";
+import { logs } from "@opentelemetry/api-logs";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { AgentTerminateMode } from "../agents/types.js";
+import type { Config } from "../config/config.js";
+import { type GeminiCLIExtension } from "../config/config.js";
 import type {
   AnyToolInvocation,
   CompletedToolCall,
   ContentGeneratorConfig,
   ErroredToolCall,
-} from '../index.js';
+} from "../index.js";
 import {
   AuthType,
   EditTool,
@@ -17,96 +27,86 @@ import {
   ToolConfirmationOutcome,
   ToolErrorType,
   ToolRegistry,
-} from '../index.js';
-import { OutputFormat } from '../output/types.js';
-import { logs } from '@opentelemetry/api-logs';
-import type { Config } from '../config/config.js';
+} from "../index.js";
+import { OutputFormat } from "../output/types.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { DiscoveredMCPTool } from "../tools/mcp-tool.js";
+import { InstallationManager } from "../utils/installationManager.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
 import {
+  logAgentFinish,
+  logAgentStart,
   logApiError,
   logApiRequest,
   logApiResponse,
+  logChatCompression,
   logCliConfiguration,
-  logUserPrompt,
-  logToolCall,
+  logExtensionDisable,
+  logExtensionEnable,
+  logExtensionInstallEvent,
+  logExtensionUninstall,
+  logExtensionUpdateEvent,
+  logFileOperation,
   logFlashFallback,
-  logChatCompression,
   logMalformedJsonResponse,
-  logFileOperation,
+  logModelRouting,
   logRipgrepFallback,
+  logToolCall,
   logToolOutputTruncated,
-  logModelRouting,
-  logExtensionEnable,
-  logExtensionDisable,
-  logExtensionInstallEvent,
-  logExtensionUninstall,
-  logAgentStart,
-  logAgentFinish,
+  logUserPrompt,
   logWebFetchFallbackAttempt,
-  logExtensionUpdateEvent,
-} from './loggers.js';
-import { ToolCallDecision } from './tool-call-decision.js';
+} from "./loggers.js";
+import * as metrics from "./metrics.js";
+import { FileOperation } from "./metrics.js";
+import * as sdk from "./sdk.js";
+import { ToolCallDecision } from "./tool-call-decision.js";
 import {
+  AgentFinishEvent,
+  AgentStartEvent,
+  ApiErrorEvent,
+  ApiRequestEvent,
+  ApiResponseEvent,
+  EVENT_AGENT_FINISH,
+  EVENT_AGENT_START,
   EVENT_API_ERROR,
   EVENT_API_REQUEST,
   EVENT_API_RESPONSE,
   EVENT_CLI_CONFIG,
-  EVENT_TOOL_CALL,
-  EVENT_USER_PROMPT,
-  EVENT_FLASH_FALLBACK,
-  EVENT_MALFORMED_JSON_RESPONSE,
-  EVENT_FILE_OPERATION,
-  EVENT_RIPGREP_FALLBACK,
-  EVENT_MODEL_ROUTING,
-  EVENT_EXTENSION_ENABLE,
   EVENT_EXTENSION_DISABLE,
+  EVENT_EXTENSION_ENABLE,
   EVENT_EXTENSION_INSTALL,
   EVENT_EXTENSION_UNINSTALL,
+  EVENT_EXTENSION_UPDATE,
+  EVENT_FILE_OPERATION,
+  EVENT_FLASH_FALLBACK,
+  EVENT_MALFORMED_JSON_RESPONSE,
+  EVENT_MODEL_ROUTING,
+  EVENT_RIPGREP_FALLBACK,
+  EVENT_TOOL_CALL,
   EVENT_TOOL_OUTPUT_TRUNCATED,
-  EVENT_AGENT_START,
-  EVENT_AGENT_FINISH,
+  EVENT_USER_PROMPT,
   EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
-  ApiErrorEvent,
-  ApiRequestEvent,
-  ApiResponseEvent,
-  StartSessionEvent,
-  ToolCallEvent,
-  UserPromptEvent,
+  ExtensionDisableEvent,
+  ExtensionEnableEvent,
+  ExtensionInstallEvent,
+  ExtensionUninstallEvent,
+  ExtensionUpdateEvent,
+  FileOperationEvent,
   FlashFallbackEvent,
-  RipgrepFallbackEvent,
   MalformedJsonResponseEvent,
+  ModelRoutingEvent,
   makeChatCompressionEvent,
-  FileOperationEvent,
+  RipgrepFallbackEvent,
+  StartSessionEvent,
+  ToolCallEvent,
   ToolOutputTruncatedEvent,
-  ModelRoutingEvent,
-  ExtensionEnableEvent,
-  ExtensionDisableEvent,
-  ExtensionInstallEvent,
-  ExtensionUninstallEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
+  UserPromptEvent,
   WebFetchFallbackAttemptEvent,
-  ExtensionUpdateEvent,
-  EVENT_EXTENSION_UPDATE,
-} from './types.js';
-import * as metrics from './metrics.js';
-import { FileOperation } from './metrics.js';
-import * as sdk from './sdk.js';
-import { vi, describe, beforeEach, it, expect, afterEach } from 'vitest';
-import { type GeminiCLIExtension } from '../config/config.js';
-import {
-  FinishReason,
-  type CallableTool,
-  type GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
-import * as uiTelemetry from './uiTelemetry.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
-import { InstallationManager } from '../utils/installationManager.js';
-import { AgentTerminateMode } from '../agents/types.js';
-
-describe('loggers', () => {
+} from "./types.js";
+import * as uiTelemetry from "./uiTelemetry.js";
+
+describe("loggers", () => {
   const mockLogger = {
     emit: vi.fn(),
   };
@@ -116,31 +116,27 @@ describe('loggers', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.spyOn(sdk, 'isTelemetrySdkInitialized').mockReturnValue(true);
-    vi.spyOn(sdk, 'bufferTelemetryEvent').mockImplementation((cb) => cb());
-    vi.spyOn(logs, 'getLogger').mockReturnValue(mockLogger);
-    vi.spyOn(uiTelemetry.uiTelemetryService, 'addEvent').mockImplementation(
-      mockUiEvent.addEvent,
+    vi.spyOn(sdk, "isTelemetrySdkInitialized").mockReturnValue(true);
+    vi.spyOn(sdk, "bufferTelemetryEvent").mockImplementation((cb) => cb());
+    vi.spyOn(logs, "getLogger").mockReturnValue(mockLogger);
+    vi.spyOn(uiTelemetry.uiTelemetryService, "addEvent").mockImplementation(mockUiEvent.addEvent);
+    vi.spyOn(UserAccountManager.prototype, "getCachedGoogleAccount").mockReturnValue(
+      "test-user@example.com",
+    );
+    vi.spyOn(InstallationManager.prototype, "getInstallationId").mockReturnValue(
+      "test-installation-id",
     );
-    vi.spyOn(
-      UserAccountManager.prototype,
-      'getCachedGoogleAccount',
-    ).mockReturnValue('test-user@example.com');
-    vi.spyOn(
-      InstallationManager.prototype,
-      'getInstallationId',
-    ).mockReturnValue('test-installation-id');
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-01-01T00:00:00.000Z'));
+    vi.setSystemTime(new Date("2025-01-01T00:00:00.000Z"));
   });
 
-  describe('logChatCompression', () => {
+  describe("logChatCompression", () => {
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordChatCompressionMetrics');
-      vi.spyOn(ClearcutLogger.prototype, 'logChatCompressionEvent');
+      vi.spyOn(metrics, "recordChatCompressionMetrics");
+      vi.spyOn(ClearcutLogger.prototype, "logChatCompressionEvent");
     });
 
-    it('logs the chat compression event to Clearcut', () => {
+    it("logs the chat compression event to Clearcut", () => {
       const mockConfig = makeFakeConfig();
 
       const event = makeChatCompressionEvent({
@@ -150,12 +146,10 @@ describe('loggers', () => {
 
       logChatCompression(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logChatCompressionEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logChatCompressionEvent).toHaveBeenCalledWith(event);
     });
 
-    it('records the chat compression event to OTEL', () => {
+    it("records the chat compression event to OTEL", () => {
       const mockConfig = makeFakeConfig();
 
       logChatCompression(
@@ -166,25 +160,25 @@ describe('loggers', () => {
         }),
       );
 
-      expect(metrics.recordChatCompressionMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        { tokens_before: 9001, tokens_after: 9000 },
-      );
+      expect(metrics.recordChatCompressionMetrics).toHaveBeenCalledWith(mockConfig, {
+        tokens_before: 9001,
+        tokens_after: 9000,
+      });
     });
   });
 
-  describe('logCliConfiguration', () => {
-    it('should log the cli configuration', () => {
+  describe("logCliConfiguration", () => {
+    it("should log the cli configuration", () => {
       const mockConfig = {
-        getSessionId: () => 'test-session-id',
-        getModel: () => 'test-model',
-        getEmbeddingModel: () => 'test-embedding-model',
+        getSessionId: () => "test-session-id",
+        getModel: () => "test-model",
+        getEmbeddingModel: () => "test-embedding-model",
         getSandbox: () => true,
-        getCoreTools: () => ['ls', 'read-file'],
-        getApprovalMode: () => 'default',
+        getCoreTools: () => ["ls", "read-file"],
+        getApprovalMode: () => "default",
         getContentGeneratorConfig: () => ({
-          model: 'test-model',
-          apiKey: 'test-api-key',
+          model: "test-model",
+          apiKey: "test-api-key",
           authType: AuthType.USE_VERTEX_AI,
         }),
         getTelemetryEnabled: () => true,
@@ -194,21 +188,21 @@ describe('loggers', () => {
         getFileFilteringAllowBuildArtifacts: () => false,
         getDebugMode: () => true,
         getMcpServers: () => {
-          throw new Error('Should not call');
+          throw new Error("Should not call");
         },
-        getQuestion: () => 'test-question',
-        getTargetDir: () => 'target-dir',
-        getProxy: () => 'http://test.proxy.com:8080',
+        getQuestion: () => "test-question",
+        getTargetDir: () => "target-dir",
+        getProxy: () => "http://test.proxy.com:8080",
         getOutputFormat: () => OutputFormat.JSON,
         getExtensions: () =>
           [
-            { name: 'ext-one', id: 'id-one' },
-            { name: 'ext-two', id: 'id-two' },
+            { name: "ext-one", id: "id-one" },
+            { name: "ext-two", id: "id-two" },
           ] as GeminiCLIExtension[],
         getMcpClientManager: () => ({
           getMcpServers: () => ({
-            'test-server': {
-              command: 'test-command',
+            "test-server": {
+              command: "test-command",
             },
           }),
         }),
@@ -219,113 +213,103 @@ describe('loggers', () => {
       logCliConfiguration(mockConfig, startSessionEvent);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'CLI configuration loaded.',
+        body: "CLI configuration loaded.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_CLI_CONFIG,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_CLI_CONFIG,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
-          embedding_model: 'test-embedding-model',
+          model: "test-model",
+          embedding_model: "test-embedding-model",
           sandbox_enabled: true,
-          core_tools_enabled: 'ls,read-file',
-          approval_mode: 'default',
+          core_tools_enabled: "ls,read-file",
+          approval_mode: "default",
           api_key_enabled: true,
           vertex_ai_enabled: true,
           log_user_prompts_enabled: true,
           file_filtering_respect_git_ignore: true,
           debug_mode: true,
-          mcp_servers: 'test-server',
+          mcp_servers: "test-server",
           mcp_servers_count: 1,
           mcp_tools: undefined,
           mcp_tools_count: undefined,
-          output_format: 'json',
-          extension_ids: 'id-one,id-two',
+          output_format: "json",
+          extension_ids: "id-one,id-two",
           extensions_count: 2,
-          extensions: 'ext-one,ext-two',
-          auth_type: 'vertex-ai',
+          extensions: "ext-one,ext-two",
+          auth_type: "vertex-ai",
         },
       });
     });
   });
 
-  describe('logUserPrompt', () => {
+  describe("logUserPrompt", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
-    it('should log a user prompt', () => {
-      const event = new UserPromptEvent(
-        11,
-        'prompt-id-8',
-        AuthType.USE_VERTEX_AI,
-        'test-prompt',
-      );
+    it("should log a user prompt", () => {
+      const event = new UserPromptEvent(11, "prompt-id-8", AuthType.USE_VERTEX_AI, "test-prompt");
 
       logUserPrompt(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'User prompt. Length: 11.',
+        body: "User prompt. Length: 11.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_USER_PROMPT,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_USER_PROMPT,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
           prompt_length: 11,
-          prompt: 'test-prompt',
-          prompt_id: 'prompt-id-8',
-          auth_type: 'vertex-ai',
+          prompt: "test-prompt",
+          prompt_id: "prompt-id-8",
+          auth_type: "vertex-ai",
         },
       });
     });
 
-    it('should not log prompt if disabled', () => {
+    it("should not log prompt if disabled", () => {
       const mockConfig = {
-        getSessionId: () => 'test-session-id',
+        getSessionId: () => "test-session-id",
         getTelemetryEnabled: () => true,
         getTelemetryLogPromptsEnabled: () => false,
-        getTargetDir: () => 'target-dir',
+        getTargetDir: () => "target-dir",
         getUsageStatisticsEnabled: () => true,
         isInteractive: () => false,
       } as unknown as Config;
-      const event = new UserPromptEvent(
-        11,
-        'prompt-id-9',
-        AuthType.COMPUTE_ADC,
-        'test-prompt',
-      );
+      const event = new UserPromptEvent(11, "prompt-id-9", AuthType.COMPUTE_ADC, "test-prompt");
 
       logUserPrompt(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'User prompt. Length: 11.',
+        body: "User prompt. Length: 11.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_USER_PROMPT,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_USER_PROMPT,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
           prompt_length: 11,
-          prompt_id: 'prompt-id-9',
-          auth_type: 'compute-default-credentials',
+          prompt_id: "prompt-id-9",
+          auth_type: "compute-default-credentials",
         },
       });
     });
   });
 
-  describe('logApiResponse', () => {
+  describe("logApiResponse", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
@@ -338,15 +322,15 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordApiResponseMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordApiResponseMetrics").mockImplementation(
         mockMetrics.recordApiResponseMetrics,
       );
-      vi.spyOn(metrics, 'recordTokenUsageMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordTokenUsageMetrics").mockImplementation(
         mockMetrics.recordTokenUsageMetrics,
       );
     });
 
-    it('should log an API response with all fields', () => {
+    it("should log an API response with all fields", () => {
       const usageData: GenerateContentResponseUsageMetadata = {
         promptTokenCount: 17,
         candidatesTokenCount: 50,
@@ -355,44 +339,44 @@ describe('loggers', () => {
         toolUsePromptTokenCount: 2,
       };
       const event = new ApiResponseEvent(
-        'test-model',
+        "test-model",
         100,
         {
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
           contents: [
             {
-              role: 'user',
-              parts: [{ text: 'Hello' }],
+              role: "user",
+              parts: [{ text: "Hello" }],
             },
           ],
           generate_content_config: {
             temperature: 1,
             topP: 2,
             topK: 3,
-            responseMimeType: 'text/plain',
+            responseMimeType: "text/plain",
             candidateCount: 1,
             seed: 678,
             frequencyPenalty: 10,
             maxOutputTokens: 8000,
             presencePenalty: 6,
-            stopSequences: ['stop', 'please stop'],
+            stopSequences: ["stop", "please stop"],
             systemInstruction: {
-              role: 'model',
-              parts: [{ text: 'be nice' }],
+              role: "model",
+              parts: [{ text: "be nice" }],
             },
           },
           server: {
-            address: 'foo.com',
+            address: "foo.com",
             port: 8080,
           },
         },
         {
-          response_id: '',
+          response_id: "",
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'candidate 1' }],
+                role: "model",
+                parts: [{ text: "candidate 1" }],
               },
               finishReason: FinishReason.STOP,
             },
@@ -400,108 +384,95 @@ describe('loggers', () => {
         },
         AuthType.LOGIN_WITH_GOOGLE,
         usageData,
-        'test-response',
+        "test-response",
       );
 
       logApiResponse(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'API response from test-model. Status: 200. Duration: 100ms.',
+        body: "API response from test-model. Status: 200. Duration: 100ms.",
         attributes: expect.objectContaining({
-          'event.name': EVENT_API_RESPONSE,
-          prompt_id: 'prompt-id-1',
-          finish_reasons: ['stop'],
+          "event.name": EVENT_API_RESPONSE,
+          prompt_id: "prompt-id-1",
+          finish_reasons: ["stop"],
         }),
       });
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'GenAI operation details from test-model. Status: 200. Duration: 100ms.',
+        body: "GenAI operation details from test-model. Status: 200. Duration: 100ms.",
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'test-model',
-          'gen_ai.request.temperature': 1,
-          'gen_ai.request.top_p': 2,
-          'gen_ai.request.top_k': 3,
-          'gen_ai.input.messages':
-            '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
-          'gen_ai.output.messages':
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.request.temperature": 1,
+          "gen_ai.request.top_p": 2,
+          "gen_ai.request.top_k": 3,
+          "gen_ai.input.messages": '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
+          "gen_ai.output.messages":
             '[{"finish_reason":"stop","role":"system","parts":[{"type":"text","content":"candidate 1"}]}]',
-          'gen_ai.response.finish_reasons': ['stop'],
-          'gen_ai.response.model': 'test-model',
-          'gen_ai.usage.input_tokens': 17,
-          'gen_ai.usage.output_tokens': 50,
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.output.type': 'text',
-          'gen_ai.request.choice.count': 1,
-          'gen_ai.request.seed': 678,
-          'gen_ai.request.frequency_penalty': 10,
-          'gen_ai.request.presence_penalty': 6,
-          'gen_ai.request.max_tokens': 8000,
-          'server.address': 'foo.com',
-          'server.port': 8080,
-          'gen_ai.request.stop_sequences': ['stop', 'please stop'],
-          'gen_ai.system_instructions': '[{"type":"text","content":"be nice"}]',
+          "gen_ai.response.finish_reasons": ["stop"],
+          "gen_ai.response.model": "test-model",
+          "gen_ai.usage.input_tokens": 17,
+          "gen_ai.usage.output_tokens": 50,
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.output.type": "text",
+          "gen_ai.request.choice.count": 1,
+          "gen_ai.request.seed": 678,
+          "gen_ai.request.frequency_penalty": 10,
+          "gen_ai.request.presence_penalty": 6,
+          "gen_ai.request.max_tokens": 8000,
+          "server.address": "foo.com",
+          "server.port": 8080,
+          "gen_ai.request.stop_sequences": ["stop", "please stop"],
+          "gen_ai.system_instructions": '[{"type":"text","content":"be nice"}]',
         }),
       });
 
-      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          model: 'test-model',
-          status_code: 200,
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-          },
+      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        model: "test-model",
+        status_code: 200,
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
         },
-      );
+      });
 
       // Verify token usage calls for all token types
-      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        17,
-        {
-          model: 'test-model',
-          type: 'input',
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-          },
+      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(mockConfig, 17, {
+        model: "test-model",
+        type: "input",
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
         },
-      );
+      });
 
-      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        50,
-        {
-          model: 'test-model',
-          type: 'output',
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-          },
+      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(mockConfig, 50, {
+        model: "test-model",
+        type: "output",
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
         },
-      );
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_API_RESPONSE,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_API_RESPONSE,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
   });
 
-  describe('logApiError', () => {
+  describe("logApiError", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
@@ -515,50 +486,50 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordApiResponseMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordApiResponseMetrics").mockImplementation(
         mockMetrics.recordApiResponseMetrics,
       );
-      vi.spyOn(metrics, 'recordApiErrorMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordApiErrorMetrics").mockImplementation(
         mockMetrics.recordApiErrorMetrics,
       );
     });
 
-    it('should log an API error with all fields', () => {
+    it("should log an API error with all fields", () => {
       const event = new ApiErrorEvent(
-        'test-model',
+        "test-model",
         'UNAVAILABLE. {"error":{"code":503,"message":"The model is overloaded. Please try again later.","status":"UNAVAILABLE"}}',
         100,
         {
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
           contents: [
             {
-              role: 'user',
-              parts: [{ text: 'Hello' }],
+              role: "user",
+              parts: [{ text: "Hello" }],
             },
           ],
           generate_content_config: {
             temperature: 1,
             topP: 2,
             topK: 3,
-            responseMimeType: 'text/plain',
+            responseMimeType: "text/plain",
             candidateCount: 1,
             seed: 678,
             frequencyPenalty: 10,
             maxOutputTokens: 8000,
             presencePenalty: 6,
-            stopSequences: ['stop', 'please stop'],
+            stopSequences: ["stop", "please stop"],
             systemInstruction: {
-              role: 'model',
-              parts: [{ text: 'be nice' }],
+              role: "model",
+              parts: [{ text: "be nice" }],
             },
           },
           server: {
-            address: 'foo.com',
+            address: "foo.com",
             port: 8080,
           },
         },
         AuthType.LOGIN_WITH_GOOGLE,
-        'ApiError',
+        "ApiError",
         503,
       );
 
@@ -567,73 +538,64 @@ describe('loggers', () => {
       expect(mockLogger.emit).toHaveBeenCalledWith({
         body: 'API error for test-model. Error: UNAVAILABLE. {"error":{"code":503,"message":"The model is overloaded. Please try again later.","status":"UNAVAILABLE"}}. Duration: 100ms.',
         attributes: expect.objectContaining({
-          'event.name': EVENT_API_ERROR,
-          prompt_id: 'prompt-id-1',
+          "event.name": EVENT_API_ERROR,
+          prompt_id: "prompt-id-1",
         }),
       });
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
         body: 'GenAI operation error details from test-model. Error: UNAVAILABLE. {"error":{"code":503,"message":"The model is overloaded. Please try again later.","status":"UNAVAILABLE"}}. Duration: 100ms.',
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'test-model',
-          'gen_ai.request.temperature': 1,
-          'gen_ai.request.top_p': 2,
-          'gen_ai.request.top_k': 3,
-          'gen_ai.input.messages':
-            '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.output.type': 'text',
-          'gen_ai.request.choice.count': 1,
-          'gen_ai.request.seed': 678,
-          'gen_ai.request.frequency_penalty': 10,
-          'gen_ai.request.presence_penalty': 6,
-          'gen_ai.request.max_tokens': 8000,
-          'server.address': 'foo.com',
-          'server.port': 8080,
-          'gen_ai.request.stop_sequences': ['stop', 'please stop'],
-          'gen_ai.system_instructions': '[{"type":"text","content":"be nice"}]',
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.request.temperature": 1,
+          "gen_ai.request.top_p": 2,
+          "gen_ai.request.top_k": 3,
+          "gen_ai.input.messages": '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.output.type": "text",
+          "gen_ai.request.choice.count": 1,
+          "gen_ai.request.seed": 678,
+          "gen_ai.request.frequency_penalty": 10,
+          "gen_ai.request.presence_penalty": 6,
+          "gen_ai.request.max_tokens": 8000,
+          "server.address": "foo.com",
+          "server.port": 8080,
+          "gen_ai.request.stop_sequences": ["stop", "please stop"],
+          "gen_ai.system_instructions": '[{"type":"text","content":"be nice"}]',
         }),
       });
 
-      expect(mockMetrics.recordApiErrorMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          model: 'test-model',
-          status_code: 503,
-          error_type: 'ApiError',
-        },
-      );
+      expect(mockMetrics.recordApiErrorMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        model: "test-model",
+        status_code: 503,
+        error_type: "ApiError",
+      });
 
-      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          model: 'test-model',
-          status_code: 503,
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-            'error.type': 'ApiError',
-          },
+      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        model: "test-model",
+        status_code: 503,
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
+          "error.type": "ApiError",
         },
-      );
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_API_ERROR,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_API_ERROR,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
   });
 
-  describe('logApiRequest', () => {
+  describe("logApiRequest", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
@@ -643,73 +605,73 @@ describe('loggers', () => {
       }),
     } as Config;
 
-    it('should log an API request with request_text', () => {
+    it("should log an API request with request_text", () => {
       const event = new ApiRequestEvent(
-        'test-model',
+        "test-model",
         {
-          prompt_id: 'prompt-id-7',
+          prompt_id: "prompt-id-7",
           contents: [],
         },
-        'This is a test request',
+        "This is a test request",
       );
 
       logApiRequest(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenNthCalledWith(1, {
-        body: 'API request to test-model.',
+        body: "API request to test-model.",
         attributes: expect.objectContaining({
-          'event.name': EVENT_API_REQUEST,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "event.name": EVENT_API_REQUEST,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
-          request_text: 'This is a test request',
-          prompt_id: 'prompt-id-7',
+          model: "test-model",
+          request_text: "This is a test request",
+          prompt_id: "prompt-id-7",
         }),
       });
 
       expect(mockLogger.emit).toHaveBeenNthCalledWith(2, {
-        body: 'GenAI operation request details from test-model.',
+        body: "GenAI operation request details from test-model.",
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'test-model',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.provider.name": "gcp.vertex_ai",
         }),
       });
     });
 
-    it('should log an API request without request_text', () => {
-      const event = new ApiRequestEvent('test-model', {
-        prompt_id: 'prompt-id-6',
+    it("should log an API request without request_text", () => {
+      const event = new ApiRequestEvent("test-model", {
+        prompt_id: "prompt-id-6",
         contents: [],
       });
 
       logApiRequest(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenNthCalledWith(1, {
-        body: 'API request to test-model.',
+        body: "API request to test-model.",
         attributes: expect.objectContaining({
-          'event.name': EVENT_API_REQUEST,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "event.name": EVENT_API_REQUEST,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
-          prompt_id: 'prompt-id-6',
+          model: "test-model",
+          prompt_id: "prompt-id-6",
         }),
       });
 
       expect(mockLogger.emit).toHaveBeenNthCalledWith(2, {
-        body: 'GenAI operation request details from test-model.',
+        body: "GenAI operation request details from test-model.",
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'test-model',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.provider.name": "gcp.vertex_ai",
         }),
       });
     });
 
-    it('should log an API request with full semantic details when logPrompts is enabled', () => {
+    it("should log an API request with full semantic details when logPrompts is enabled", () => {
       const mockConfigWithPrompts = {
-        getSessionId: () => 'test-session-id',
-        getTargetDir: () => 'target-dir',
+        getSessionId: () => "test-session-id",
+        getTargetDir: () => "target-dir",
         getUsageStatisticsEnabled: () => true,
         getTelemetryEnabled: () => true,
         getTelemetryLogPromptsEnabled: () => true, // Enabled
@@ -720,36 +682,32 @@ describe('loggers', () => {
       } as Config;
 
       const promptDetails = {
-        prompt_id: 'prompt-id-semantic-1',
+        prompt_id: "prompt-id-semantic-1",
         contents: [
           {
-            role: 'user',
-            parts: [{ text: 'Semantic request test' }],
+            role: "user",
+            parts: [{ text: "Semantic request test" }],
           },
         ],
         generate_content_config: {
           temperature: 0.5,
           topP: 0.8,
           topK: 10,
-          responseMimeType: 'application/json',
+          responseMimeType: "application/json",
           candidateCount: 1,
-          stopSequences: ['end'],
+          stopSequences: ["end"],
           systemInstruction: {
-            role: 'model',
-            parts: [{ text: 'be helpful' }],
+            role: "model",
+            parts: [{ text: "be helpful" }],
           },
         },
         server: {
-          address: 'semantic-api.example.com',
+          address: "semantic-api.example.com",
           port: 8080,
         },
       };
 
-      const event = new ApiRequestEvent(
-        'test-model',
-        promptDetails,
-        'Full semantic request',
-      );
+      const event = new ApiRequestEvent("test-model", promptDetails, "Full semantic request");
 
       logApiRequest(mockConfigWithPrompts, event);
 
@@ -758,45 +716,43 @@ describe('loggers', () => {
 
       // Verify the first (original) log record
       expect(mockLogger.emit).toHaveBeenNthCalledWith(1, {
-        body: 'API request to test-model.',
+        body: "API request to test-model.",
         attributes: expect.objectContaining({
-          'event.name': EVENT_API_REQUEST,
-          prompt_id: 'prompt-id-semantic-1',
+          "event.name": EVENT_API_REQUEST,
+          prompt_id: "prompt-id-semantic-1",
         }),
       });
 
       // Verify the second (semantic) log record
       expect(mockLogger.emit).toHaveBeenNthCalledWith(2, {
-        body: 'GenAI operation request details from test-model.',
+        body: "GenAI operation request details from test-model.",
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'test-model',
-          'gen_ai.request.temperature': 0.5,
-          'gen_ai.request.top_p': 0.8,
-          'gen_ai.request.top_k': 10,
-          'gen_ai.input.messages': JSON.stringify([
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.request.temperature": 0.5,
+          "gen_ai.request.top_p": 0.8,
+          "gen_ai.request.top_k": 10,
+          "gen_ai.input.messages": JSON.stringify([
             {
-              role: 'user',
-              parts: [{ type: 'text', content: 'Semantic request test' }],
+              role: "user",
+              parts: [{ type: "text", content: "Semantic request test" }],
             },
           ]),
-          'server.address': 'semantic-api.example.com',
-          'server.port': 8080,
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.output.type': 'json',
-          'gen_ai.request.stop_sequences': ['end'],
-          'gen_ai.system_instructions': JSON.stringify([
-            { type: 'text', content: 'be helpful' },
-          ]),
+          "server.address": "semantic-api.example.com",
+          "server.port": 8080,
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.output.type": "json",
+          "gen_ai.request.stop_sequences": ["end"],
+          "gen_ai.system_instructions": JSON.stringify([{ type: "text", content: "be helpful" }]),
         }),
       });
     });
 
-    it('should log an API request with semantic details, but without prompts when logPrompts is disabled', () => {
+    it("should log an API request with semantic details, but without prompts when logPrompts is disabled", () => {
       const mockConfigWithoutPrompts = {
-        getSessionId: () => 'test-session-id',
-        getTargetDir: () => 'target-dir',
+        getSessionId: () => "test-session-id",
+        getTargetDir: () => "target-dir",
         getUsageStatisticsEnabled: () => true,
         getTelemetryEnabled: () => true,
         getTelemetryLogPromptsEnabled: () => false, // Disabled
@@ -807,21 +763,21 @@ describe('loggers', () => {
       } as Config;
 
       const promptDetails = {
-        prompt_id: 'prompt-id-semantic-2',
+        prompt_id: "prompt-id-semantic-2",
         contents: [
           {
-            role: 'user',
-            parts: [{ text: 'This prompt should be hidden' }],
+            role: "user",
+            parts: [{ text: "This prompt should be hidden" }],
           },
         ],
         generate_content_config: {},
-        model: 'gemini-1.0-pro',
+        model: "gemini-1.0-pro",
       };
 
       const event = new ApiRequestEvent(
-        'gemini-1.0-pro',
+        "gemini-1.0-pro",
         promptDetails,
-        'Request with hidden prompt',
+        "Request with hidden prompt",
       );
 
       logApiRequest(mockConfigWithoutPrompts, event);
@@ -833,24 +789,20 @@ describe('loggers', () => {
       const semanticLogCall = mockLogger.emit.mock.calls[1][0];
 
       // Assert on the body
-      expect(semanticLogCall.body).toBe(
-        'GenAI operation request details from gemini-1.0-pro.',
-      );
+      expect(semanticLogCall.body).toBe("GenAI operation request details from gemini-1.0-pro.");
 
       // Assert on specific attributes
       const attributes = semanticLogCall.attributes;
-      expect(attributes['event.name']).toBe(
-        'gen_ai.client.inference.operation.details',
-      );
-      expect(attributes['gen_ai.request.model']).toBe('gemini-1.0-pro');
-      expect(attributes['gen_ai.provider.name']).toBe('gcp.vertex_ai');
+      expect(attributes["event.name"]).toBe("gen_ai.client.inference.operation.details");
+      expect(attributes["gen_ai.request.model"]).toBe("gemini-1.0-pro");
+      expect(attributes["gen_ai.provider.name"]).toBe("gcp.vertex_ai");
       // Ensure prompt messages are NOT included
-      expect(attributes['gen_ai.input.messages']).toBeUndefined();
+      expect(attributes["gen_ai.input.messages"]).toBeUndefined();
     });
 
-    it('should correctly derive model from prompt details if available in semantic log', () => {
+    it("should correctly derive model from prompt details if available in semantic log", () => {
       const mockConfig = {
-        getSessionId: () => 'test-session-id',
+        getSessionId: () => "test-session-id",
         getTelemetryEnabled: () => true,
         getTelemetryLogPromptsEnabled: () => true,
         isInteractive: () => false,
@@ -861,150 +813,145 @@ describe('loggers', () => {
       } as Config;
 
       const promptDetails = {
-        prompt_id: 'prompt-id-semantic-3',
+        prompt_id: "prompt-id-semantic-3",
         contents: [],
-        model: 'my-custom-model',
+        model: "my-custom-model",
       };
 
       const event = new ApiRequestEvent(
-        'my-custom-model',
+        "my-custom-model",
         promptDetails,
-        'Request with custom model',
+        "Request with custom model",
       );
 
       logApiRequest(mockConfig, event);
 
       // Verify the second (semantic) log record
       expect(mockLogger.emit).toHaveBeenNthCalledWith(2, {
-        body: 'GenAI operation request details from my-custom-model.',
+        body: "GenAI operation request details from my-custom-model.",
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'my-custom-model',
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "my-custom-model",
         }),
       });
     });
   });
 
-  describe('logFlashFallback', () => {
+  describe("logFlashFallback", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
-    it('should log flash fallback event', () => {
+    it("should log flash fallback event", () => {
       const event = new FlashFallbackEvent(AuthType.USE_VERTEX_AI);
 
       logFlashFallback(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Switching to flash as Fallback.',
+        body: "Switching to flash as Fallback.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_FLASH_FALLBACK,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_FLASH_FALLBACK,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          auth_type: 'vertex-ai',
+          auth_type: "vertex-ai",
         },
       });
     });
   });
 
-  describe('logRipgrepFallback', () => {
+  describe("logRipgrepFallback", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logRipgrepFallbackEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logRipgrepFallbackEvent");
     });
 
-    it('should log ripgrep fallback event', () => {
+    it("should log ripgrep fallback event", () => {
       const event = new RipgrepFallbackEvent();
 
       logRipgrepFallback(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logRipgrepFallbackEvent,
-      ).toHaveBeenCalled();
+      expect(ClearcutLogger.prototype.logRipgrepFallbackEvent).toHaveBeenCalled();
 
       const emittedEvent = mockLogger.emit.mock.calls[0][0];
-      expect(emittedEvent.body).toBe('Switching to grep as fallback.');
+      expect(emittedEvent.body).toBe("Switching to grep as fallback.");
       expect(emittedEvent.attributes).toEqual(
         expect.objectContaining({
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_RIPGREP_FALLBACK,
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_RIPGREP_FALLBACK,
           error: undefined,
         }),
       );
     });
 
-    it('should log ripgrep fallback event with an error', () => {
-      const event = new RipgrepFallbackEvent('rg not found');
+    it("should log ripgrep fallback event with an error", () => {
+      const event = new RipgrepFallbackEvent("rg not found");
 
       logRipgrepFallback(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logRipgrepFallbackEvent,
-      ).toHaveBeenCalled();
+      expect(ClearcutLogger.prototype.logRipgrepFallbackEvent).toHaveBeenCalled();
 
       const emittedEvent = mockLogger.emit.mock.calls[0][0];
-      expect(emittedEvent.body).toBe('Switching to grep as fallback.');
+      expect(emittedEvent.body).toBe("Switching to grep as fallback.");
       expect(emittedEvent.attributes).toEqual(
         expect.objectContaining({
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_RIPGREP_FALLBACK,
-          error: 'rg not found',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_RIPGREP_FALLBACK,
+          error: "rg not found",
         }),
       );
     });
   });
 
-  describe('logToolCall', () => {
+  describe("logToolCall", () => {
     const cfg1 = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getGeminiClient: () => mockGeminiClient,
     } as Config;
     const cfg2 = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
-      getProxy: () => 'http://test.proxy.com:8080',
-      getContentGeneratorConfig: () =>
-        ({ model: 'test-model' }) as ContentGeneratorConfig,
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding-model',
-      getWorkingDir: () => 'test-working-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
+      getProxy: () => "http://test.proxy.com:8080",
+      getContentGeneratorConfig: () => ({ model: "test-model" }) as ContentGeneratorConfig,
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding-model",
+      getWorkingDir: () => "test-working-dir",
       getSandbox: () => true,
-      getCoreTools: () => ['ls', 'read-file'],
-      getApprovalMode: () => 'default',
+      getCoreTools: () => ["ls", "read-file"],
+      getApprovalMode: () => "default",
       getTelemetryLogPromptsEnabled: () => true,
       getFileFilteringRespectGitIgnore: () => true,
       getFileFilteringAllowBuildArtifacts: () => false,
       getDebugMode: () => true,
       getMcpServers: () => ({
-        'test-server': {
-          command: 'test-command',
+        "test-server": {
+          command: "test-command",
         },
       }),
-      getQuestion: () => 'test-question',
+      getQuestion: () => "test-question",
       getToolRegistry: () => new ToolRegistry(cfg1),
 
-      getUserMemory: () => 'user-memory',
+      getUserMemory: () => "user-memory",
     } as unknown as Config;
 
     const mockGeminiClient = new GeminiClient(cfg2);
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getGeminiClient: () => mockGeminiClient,
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
@@ -1018,37 +965,35 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordToolCallMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordToolCallMetrics").mockImplementation(
         mockMetrics.recordToolCallMetrics,
       );
-      vi.spyOn(metrics, 'recordLinesChanged').mockImplementation(
-        mockMetrics.recordLinesChanged,
-      );
+      vi.spyOn(metrics, "recordLinesChanged").mockImplementation(mockMetrics.recordLinesChanged);
       mockLogger.emit.mockReset();
     });
 
-    it('should log a tool call with all fields', () => {
+    it("should log a tool call with all fields", () => {
       const tool = new EditTool(mockConfig);
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: {
-            fileDiff: 'diff',
-            fileName: 'file.txt',
-            originalContent: 'old content',
-            newContent: 'new content',
+            fileDiff: "diff",
+            fileName: "file.txt",
+            originalContent: "old content",
+            newContent: "new content",
             diffStat: {
               model_added_lines: 1,
               model_removed_lines: 2,
@@ -1074,18 +1019,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Decision: accept. Success: true. Duration: 100ms.',
+        body: "Tool call: test-function. Decision: accept. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1094,8 +1039,8 @@ describe('loggers', () => {
           duration_ms: 100,
           success: true,
           decision: ToolCallDecision.ACCEPT,
-          prompt_id: 'prompt-id-1',
-          tool_type: 'native',
+          prompt_id: "prompt-id-1",
+          tool_type: "native",
           error: undefined,
           error_type: undefined,
           mcp_server_name: undefined,
@@ -1114,52 +1059,42 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: true,
-          decision: ToolCallDecision.ACCEPT,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: true,
+        decision: ToolCallDecision.ACCEPT,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
 
-      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(
-        mockConfig,
-        1,
-        'added',
-        { function_name: 'test-function' },
-      );
-      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(
-        mockConfig,
-        2,
-        'removed',
-        { function_name: 'test-function' },
-      );
+      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(mockConfig, 1, "added", {
+        function_name: "test-function",
+      });
+      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(mockConfig, 2, "removed", {
+        function_name: "test-function",
+      });
     });
-    it('should log a tool call with a reject decision', () => {
+    it("should log a tool call with a reject decision", () => {
       const call: ErroredToolCall = {
-        status: 'error',
+        status: "error",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-2',
+          prompt_id: "prompt-id-2",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -1173,18 +1108,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Decision: reject. Success: false. Duration: 100ms.',
+        body: "Tool call: test-function. Decision: reject. Success: false. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1193,8 +1128,8 @@ describe('loggers', () => {
           duration_ms: 100,
           success: false,
           decision: ToolCallDecision.REJECT,
-          prompt_id: 'prompt-id-2',
-          tool_type: 'native',
+          prompt_id: "prompt-id-2",
+          tool_type: "native",
           error: undefined,
           error_type: undefined,
           mcp_server_name: undefined,
@@ -1204,40 +1139,36 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: false,
-          decision: ToolCallDecision.REJECT,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: false,
+        decision: ToolCallDecision.REJECT,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a tool call with a modify decision', () => {
+    it("should log a tool call with a modify decision", () => {
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-3',
+          prompt_id: "prompt-id-3",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -1253,18 +1184,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Decision: modify. Success: true. Duration: 100ms.',
+        body: "Tool call: test-function. Decision: modify. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1273,8 +1204,8 @@ describe('loggers', () => {
           duration_ms: 100,
           success: true,
           decision: ToolCallDecision.MODIFY,
-          prompt_id: 'prompt-id-3',
-          tool_type: 'native',
+          prompt_id: "prompt-id-3",
+          tool_type: "native",
           error: undefined,
           error_type: undefined,
           mcp_server_name: undefined,
@@ -1284,40 +1215,36 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: true,
-          decision: ToolCallDecision.MODIFY,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: true,
+        decision: ToolCallDecision.MODIFY,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a tool call without a decision', () => {
+    it("should log a tool call without a decision", () => {
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-4',
+          prompt_id: "prompt-id-4",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -1332,18 +1259,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Success: true. Duration: 100ms.',
+        body: "Tool call: test-function. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1351,8 +1278,8 @@ describe('loggers', () => {
           ),
           duration_ms: 100,
           success: true,
-          prompt_id: 'prompt-id-4',
-          tool_type: 'native',
+          prompt_id: "prompt-id-4",
+          tool_type: "native",
           decision: undefined,
           error: undefined,
           error_type: undefined,
@@ -1363,41 +1290,37 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: true,
-          decision: undefined,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: true,
+        decision: undefined,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a failed tool call with an error', () => {
-      const errorMessage = 'test-error';
+    it("should log a failed tool call with an error", () => {
+      const errorMessage = "test-error";
       const call: ErroredToolCall = {
-        status: 'error',
+        status: "error",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-5',
+          prompt_id: "prompt-id-5",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: new Error(errorMessage),
           errorType: ToolErrorType.UNKNOWN,
@@ -1410,18 +1333,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Success: false. Duration: 100ms.',
+        body: "Tool call: test-function. Success: false. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1429,12 +1352,12 @@ describe('loggers', () => {
           ),
           duration_ms: 100,
           success: false,
-          error: 'test-error',
-          'error.message': 'test-error',
+          error: "test-error",
+          "error.message": "test-error",
           error_type: ToolErrorType.UNKNOWN,
-          'error.type': ToolErrorType.UNKNOWN,
-          prompt_id: 'prompt-id-5',
-          tool_type: 'native',
+          "error.type": ToolErrorType.UNKNOWN,
+          prompt_id: "prompt-id-5",
+          tool_type: "native",
           decision: undefined,
           mcp_server_name: undefined,
           extension_id: undefined,
@@ -1443,57 +1366,53 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: false,
-          decision: undefined,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: false,
+        decision: undefined,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a tool call with mcp_server_name for MCP tools', () => {
+    it("should log a tool call with mcp_server_name for MCP tools", () => {
       const mockMcpTool = new DiscoveredMCPTool(
         {} as CallableTool,
-        'mock_mcp_server',
-        'mock_mcp_tool',
-        'tool description',
+        "mock_mcp_server",
+        "mock_mcp_tool",
+        "tool description",
         {
-          type: 'object',
+          type: "object",
           properties: {
-            arg1: { type: 'string' },
-            arg2: { type: 'number' },
+            arg1: { type: "string" },
+            arg2: { type: "number" },
           },
-          required: ['arg1', 'arg2'],
+          required: ["arg1", "arg2"],
         },
         false,
         undefined,
         undefined,
-        'test-extension',
-        'test-extension-id',
+        "test-extension",
+        "test-extension-id",
       );
 
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'mock_mcp_tool',
-          args: { arg1: 'value1', arg2: 2 },
-          callId: 'test-call-id',
+          name: "mock_mcp_tool",
+          args: { arg1: "value1", arg2: 2 },
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id',
+          prompt_id: "prompt-id",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -1506,20 +1425,20 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: mock_mcp_tool. Success: true. Duration: 100ms.',
+        body: "Tool call: mock_mcp_tool. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
-          extension_name: 'test-extension',
-          extension_id: 'test-extension-id',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
+          extension_name: "test-extension",
+          extension_id: "test-extension-id",
           interactive: false,
-          function_name: 'mock_mcp_tool',
+          function_name: "mock_mcp_tool",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1527,9 +1446,9 @@ describe('loggers', () => {
           ),
           duration_ms: 100,
           success: true,
-          prompt_id: 'prompt-id',
-          tool_type: 'mcp',
-          mcp_server_name: 'mock_mcp_server',
+          prompt_id: "prompt-id",
+          tool_type: "mcp",
+          mcp_server_name: "mock_mcp_server",
           decision: undefined,
           error: undefined,
           error_type: undefined,
@@ -1540,40 +1459,38 @@ describe('loggers', () => {
     });
   });
 
-  describe('logMalformedJsonResponse', () => {
+  describe("logMalformedJsonResponse", () => {
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logMalformedJsonResponseEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logMalformedJsonResponseEvent");
     });
 
-    it('logs the event to Clearcut and OTEL', () => {
+    it("logs the event to Clearcut and OTEL", () => {
       const mockConfig = makeFakeConfig();
-      const event = new MalformedJsonResponseEvent('test-model');
+      const event = new MalformedJsonResponseEvent("test-model");
 
       logMalformedJsonResponse(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logMalformedJsonResponseEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logMalformedJsonResponseEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Malformed JSON response from test-model.',
+        body: "Malformed JSON response from test-model.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_MALFORMED_JSON_RESPONSE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_MALFORMED_JSON_RESPONSE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
+          model: "test-model",
         },
       });
     });
   });
 
-  describe('logFileOperation', () => {
+  describe("logFileOperation", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
@@ -1585,64 +1502,61 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordFileOperationMetric').mockImplementation(
+      vi.spyOn(metrics, "recordFileOperationMetric").mockImplementation(
         mockMetrics.recordFileOperationMetric,
       );
     });
 
-    it('should log a file operation event', () => {
+    it("should log a file operation event", () => {
       const event = new FileOperationEvent(
-        'test-tool',
+        "test-tool",
         FileOperation.READ,
         10,
-        'text/plain',
-        '.txt',
-        'typescript',
+        "text/plain",
+        ".txt",
+        "typescript",
       );
 
       logFileOperation(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'File operation: read. Lines: 10.',
+        body: "File operation: read. Lines: 10.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_FILE_OPERATION,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_FILE_OPERATION,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          tool_name: 'test-tool',
-          operation: 'read',
+          tool_name: "test-tool",
+          operation: "read",
           lines: 10,
-          mimetype: 'text/plain',
-          extension: '.txt',
-          programming_language: 'typescript',
+          mimetype: "text/plain",
+          extension: ".txt",
+          programming_language: "typescript",
         },
       });
 
-      expect(mockMetrics.recordFileOperationMetric).toHaveBeenCalledWith(
-        mockConfig,
-        {
-          operation: 'read',
-          lines: 10,
-          mimetype: 'text/plain',
-          extension: '.txt',
-          programming_language: 'typescript',
-        },
-      );
+      expect(mockMetrics.recordFileOperationMetric).toHaveBeenCalledWith(mockConfig, {
+        operation: "read",
+        lines: 10,
+        mimetype: "text/plain",
+        extension: ".txt",
+        programming_language: "typescript",
+      });
     });
   });
 
-  describe('logToolOutputTruncated', () => {
+  describe("logToolOutputTruncated", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
-    it('should log a tool output truncated event', () => {
-      const event = new ToolOutputTruncatedEvent('prompt-id-1', {
-        toolName: 'test-tool',
+    it("should log a tool output truncated event", () => {
+      const event = new ToolOutputTruncatedEvent("prompt-id-1", {
+        toolName: "test-tool",
         originalContentLength: 1000,
         truncatedContentLength: 100,
         threshold: 500,
@@ -1652,17 +1566,17 @@ describe('loggers', () => {
       logToolOutputTruncated(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool output truncated for test-tool.',
+        body: "Tool output truncated for test-tool.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_OUTPUT_TRUNCATED,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
-          eventName: 'tool_output_truncated',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_OUTPUT_TRUNCATED,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
+          eventName: "tool_output_truncated",
           interactive: false,
-          prompt_id: 'prompt-id-1',
-          tool_name: 'test-tool',
+          prompt_id: "prompt-id-1",
+          tool_name: "test-tool",
           original_content_length: 1000,
           truncated_content_length: 100,
           threshold: 500,
@@ -1672,77 +1586,70 @@ describe('loggers', () => {
     });
   });
 
-  describe('logModelRouting', () => {
+  describe("logModelRouting", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logModelRoutingEvent');
-      vi.spyOn(metrics, 'recordModelRoutingMetrics');
+      vi.spyOn(ClearcutLogger.prototype, "logModelRoutingEvent");
+      vi.spyOn(metrics, "recordModelRoutingMetrics");
     });
 
-    it('should log the event to Clearcut and OTEL, and record metrics', () => {
+    it("should log the event to Clearcut and OTEL, and record metrics", () => {
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         100,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
 
       logModelRouting(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logModelRoutingEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logModelRoutingEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Model routing decision. Model: gemini-pro, Source: default',
+        body: "Model routing decision. Model: gemini-pro, Source: default",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
           ...event,
-          'event.name': EVENT_MODEL_ROUTING,
+          "event.name": EVENT_MODEL_ROUTING,
           interactive: false,
         },
       });
 
-      expect(metrics.recordModelRoutingMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        event,
-      );
+      expect(metrics.recordModelRoutingMetrics).toHaveBeenCalledWith(mockConfig, event);
     });
 
-    it('should only log to Clearcut if OTEL SDK is not initialized', () => {
-      vi.spyOn(sdk, 'isTelemetrySdkInitialized').mockReturnValue(false);
-      vi.spyOn(sdk, 'bufferTelemetryEvent').mockImplementation(() => {});
+    it("should only log to Clearcut if OTEL SDK is not initialized", () => {
+      vi.spyOn(sdk, "isTelemetrySdkInitialized").mockReturnValue(false);
+      vi.spyOn(sdk, "bufferTelemetryEvent").mockImplementation(() => {});
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         100,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
 
       logModelRouting(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logModelRoutingEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logModelRoutingEvent).toHaveBeenCalledWith(event);
       expect(mockLogger.emit).not.toHaveBeenCalled();
       expect(metrics.recordModelRoutingMetrics).not.toHaveBeenCalled();
     });
   });
 
-  describe('logExtensionInstall', () => {
+  describe("logExtensionInstall", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getContentGeneratorConfig: () => null,
       getUseSmartEdit: () => null,
@@ -1750,49 +1657,41 @@ describe('loggers', () => {
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionInstallEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionInstallEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension install event', async () => {
-      const event = new ExtensionInstallEvent(
-        'testing',
-        'testing-id',
-        '0.1.0',
-        'git',
-        'success',
-      );
+    it("should log extension install event", async () => {
+      const event = new ExtensionInstallEvent("testing", "testing-id", "0.1.0", "git", "success");
 
       await logExtensionInstallEvent(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionInstallEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionInstallEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Installed extension testing',
+        body: "Installed extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_INSTALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_INSTALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          extension_version: '0.1.0',
-          extension_source: 'git',
-          status: 'success',
+          extension_name: "testing",
+          extension_version: "0.1.0",
+          extension_source: "git",
+          status: "success",
         },
       });
     });
   });
 
-  describe('logExtensionUpdate', async () => {
+  describe("logExtensionUpdate", async () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getContentGeneratorConfig: () => null,
       getUseSmartEdit: () => null,
@@ -1800,51 +1699,49 @@ describe('loggers', () => {
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionUpdateEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionUpdateEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension update event', async () => {
+    it("should log extension update event", async () => {
       const event = new ExtensionUpdateEvent(
-        'testing',
-        'testing-id',
-        '0.1.0',
-        '0.1.1',
-        'git',
-        'success',
+        "testing",
+        "testing-id",
+        "0.1.0",
+        "0.1.1",
+        "git",
+        "success",
       );
 
       await logExtensionUpdateEvent(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionUpdateEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionUpdateEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Updated extension testing',
+        body: "Updated extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_UPDATE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_UPDATE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          extension_version: '0.1.0',
-          extension_previous_version: '0.1.1',
-          extension_source: 'git',
-          status: 'success',
+          extension_name: "testing",
+          extension_version: "0.1.0",
+          extension_previous_version: "0.1.1",
+          extension_source: "git",
+          status: "success",
         },
       });
     });
   });
 
-  describe('logExtensionUninstall', async () => {
+  describe("logExtensionUninstall", async () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getContentGeneratorConfig: () => null,
       getUseSmartEdit: () => null,
@@ -1852,173 +1749,161 @@ describe('loggers', () => {
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionUninstallEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionUninstallEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
-    it('should log extension uninstall event', async () => {
-      const event = new ExtensionUninstallEvent(
-        'testing',
-        'testing-id',
-        'success',
-      );
+    it("should log extension uninstall event", async () => {
+      const event = new ExtensionUninstallEvent("testing", "testing-id", "success");
 
       await logExtensionUninstall(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionUninstallEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionUninstallEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Uninstalled extension testing',
+        body: "Uninstalled extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_UNINSTALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_UNINSTALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          status: 'success',
+          extension_name: "testing",
+          status: "success",
         },
       });
     });
   });
 
-  describe('logExtensionEnable', async () => {
+  describe("logExtensionEnable", async () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionEnableEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionEnableEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension enable event', async () => {
-      const event = new ExtensionEnableEvent('testing', 'testing-id', 'user');
+    it("should log extension enable event", async () => {
+      const event = new ExtensionEnableEvent("testing", "testing-id", "user");
 
       await logExtensionEnable(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionEnableEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionEnableEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Enabled extension testing',
+        body: "Enabled extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_ENABLE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_ENABLE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          setting_scope: 'user',
+          extension_name: "testing",
+          setting_scope: "user",
         },
       });
     });
   });
 
-  describe('logExtensionDisable', () => {
+  describe("logExtensionDisable", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionDisableEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionDisableEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension disable event', async () => {
-      const event = new ExtensionDisableEvent('testing', 'testing-id', 'user');
+    it("should log extension disable event", async () => {
+      const event = new ExtensionDisableEvent("testing", "testing-id", "user");
 
       await logExtensionDisable(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionDisableEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionDisableEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Disabled extension testing',
+        body: "Disabled extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_DISABLE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_DISABLE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          setting_scope: 'user',
+          extension_name: "testing",
+          setting_scope: "user",
         },
       });
     });
   });
 
-  describe('logAgentStart', () => {
+  describe("logAgentStart", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logAgentStartEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logAgentStartEvent");
     });
 
-    it('should log agent start event', () => {
-      const event = new AgentStartEvent('agent-123', 'TestAgent');
+    it("should log agent start event", () => {
+      const event = new AgentStartEvent("agent-123", "TestAgent");
 
       logAgentStart(mockConfig, event);
 
-      expect(ClearcutLogger.prototype.logAgentStartEvent).toHaveBeenCalledWith(
-        event,
-      );
+      expect(ClearcutLogger.prototype.logAgentStartEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Agent TestAgent started. ID: agent-123',
+        body: "Agent TestAgent started. ID: agent-123",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_AGENT_START,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_AGENT_START,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          agent_id: 'agent-123',
-          agent_name: 'TestAgent',
+          agent_id: "agent-123",
+          agent_name: "TestAgent",
         },
       });
     });
   });
 
-  describe('logAgentFinish', () => {
+  describe("logAgentFinish", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logAgentFinishEvent');
-      vi.spyOn(metrics, 'recordAgentRunMetrics');
+      vi.spyOn(ClearcutLogger.prototype, "logAgentFinishEvent");
+      vi.spyOn(metrics, "recordAgentRunMetrics");
     });
 
-    it('should log agent finish event and record metrics', () => {
+    it("should log agent finish event and record metrics", () => {
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -2026,74 +1911,65 @@ describe('loggers', () => {
 
       logAgentFinish(mockConfig, event);
 
-      expect(ClearcutLogger.prototype.logAgentFinishEvent).toHaveBeenCalledWith(
-        event,
-      );
+      expect(ClearcutLogger.prototype.logAgentFinishEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Agent TestAgent finished. Reason: GOAL. Duration: 1000ms. Turns: 5.',
+        body: "Agent TestAgent finished. Reason: GOAL. Duration: 1000ms. Turns: 5.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_AGENT_FINISH,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_AGENT_FINISH,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          agent_id: 'agent-123',
-          agent_name: 'TestAgent',
+          agent_id: "agent-123",
+          agent_name: "TestAgent",
           duration_ms: 1000,
           turn_count: 5,
-          terminate_reason: 'GOAL',
+          terminate_reason: "GOAL",
         },
       });
 
-      expect(metrics.recordAgentRunMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        event,
-      );
+      expect(metrics.recordAgentRunMetrics).toHaveBeenCalledWith(mockConfig, event);
     });
   });
 
-  describe('logWebFetchFallbackAttempt', () => {
+  describe("logWebFetchFallbackAttempt", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logWebFetchFallbackAttemptEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logWebFetchFallbackAttemptEvent");
     });
 
-    it('should log web fetch fallback attempt event', () => {
-      const event = new WebFetchFallbackAttemptEvent('private_ip');
+    it("should log web fetch fallback attempt event", () => {
+      const event = new WebFetchFallbackAttemptEvent("private_ip");
 
       logWebFetchFallbackAttempt(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logWebFetchFallbackAttemptEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logWebFetchFallbackAttemptEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Web fetch fallback attempt. Reason: private_ip',
+        body: "Web fetch fallback attempt. Reason: private_ip",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          reason: 'private_ip',
+          reason: "private_ip",
         },
       });
     });
   });
-  describe('Telemetry Buffering', () => {
-    it('should buffer events when SDK is not initialized', () => {
-      vi.spyOn(sdk, 'isTelemetrySdkInitialized').mockReturnValue(false);
-      const bufferSpy = vi
-        .spyOn(sdk, 'bufferTelemetryEvent')
-        .mockImplementation(() => {});
+  describe("Telemetry Buffering", () => {
+    it("should buffer events when SDK is not initialized", () => {
+      vi.spyOn(sdk, "isTelemetrySdkInitialized").mockReturnValue(false);
+      const bufferSpy = vi.spyOn(sdk, "bufferTelemetryEvent").mockImplementation(() => {});
 
       const mockConfig = makeFakeConfig();
       const event = new StartSessionEvent(mockConfig);
diff --git a/packages/gemini-cli-core/src/telemetry/loggers.ts b/packages/gemini-cli-core/src/telemetry/loggers.ts
index 8a2c08f2a..8cfc844fd 100644
--- a/packages/gemini-cli-core/src/telemetry/loggers.ts
+++ b/packages/gemini-cli-core/src/telemetry/loggers.ts
@@ -4,81 +4,74 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { LogRecord } from '@opentelemetry/api-logs';
-import { logs } from '@opentelemetry/api-logs';
-import type { Config } from '../config/config.js';
-import { SERVICE_NAME } from './constants.js';
+import type { LogRecord } from "@opentelemetry/api-logs";
+import { logs } from "@opentelemetry/api-logs";
+import type { Config } from "../config/config.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
+import { SERVICE_NAME } from "./constants.js";
 import {
-  EVENT_API_ERROR,
-  EVENT_API_RESPONSE,
-  EVENT_TOOL_CALL,
-} from './types.js';
+  getConventionAttributes,
+  recordAgentRunMetrics,
+  recordApiErrorMetrics,
+  recordApiResponseMetrics,
+  recordChatCompressionMetrics,
+  recordContentRetry,
+  recordContentRetryFailure,
+  recordFileOperationMetric,
+  recordHookCallMetrics,
+  recordInvalidChunk,
+  recordLinesChanged,
+  recordModelRoutingMetrics,
+  recordModelSlashCommand,
+  recordRecoveryAttemptMetrics,
+  recordTokenUsageMetrics,
+  recordToolCallMetrics,
+} from "./metrics.js";
+import { bufferTelemetryEvent } from "./sdk.js";
 import type {
+  AgentFinishEvent,
+  AgentStartEvent,
   ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
-  FileOperationEvent,
-  IdeConnectionEvent,
-  StartSessionEvent,
-  ToolCallEvent,
-  UserPromptEvent,
-  FlashFallbackEvent,
-  NextSpeakerCheckEvent,
-  LoopDetectedEvent,
-  LoopDetectionDisabledEvent,
-  SlashCommandEvent,
-  ConversationFinishedEvent,
   ChatCompressionEvent,
-  MalformedJsonResponseEvent,
-  InvalidChunkEvent,
   ContentRetryEvent,
   ContentRetryFailureEvent,
-  RipgrepFallbackEvent,
-  ToolOutputTruncatedEvent,
-  ModelRoutingEvent,
+  ConversationFinishedEvent,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
-  ExtensionUninstallEvent,
   ExtensionInstallEvent,
-  ModelSlashCommandEvent,
-  SmartEditStrategyEvent,
-  SmartEditCorrectionEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
-  RecoveryAttemptEvent,
-  WebFetchFallbackAttemptEvent,
+  ExtensionUninstallEvent,
   ExtensionUpdateEvent,
-  LlmLoopCheckEvent,
+  FileOperationEvent,
+  FlashFallbackEvent,
   HookCallEvent,
+  IdeConnectionEvent,
+  InvalidChunkEvent,
+  LlmLoopCheckEvent,
+  LoopDetectedEvent,
+  LoopDetectionDisabledEvent,
+  MalformedJsonResponseEvent,
+  ModelRoutingEvent,
+  ModelSlashCommandEvent,
+  NextSpeakerCheckEvent,
+  RecoveryAttemptEvent,
+  RipgrepFallbackEvent,
+  SlashCommandEvent,
+  SmartEditCorrectionEvent,
+  SmartEditStrategyEvent,
+  StartSessionEvent,
   StartupStatsEvent,
-} from './types.js';
-import {
-  recordApiErrorMetrics,
-  recordToolCallMetrics,
-  recordChatCompressionMetrics,
-  recordFileOperationMetric,
-  recordInvalidChunk,
-  recordContentRetry,
-  recordContentRetryFailure,
-  recordModelRoutingMetrics,
-  recordModelSlashCommand,
-  getConventionAttributes,
-  recordTokenUsageMetrics,
-  recordApiResponseMetrics,
-  recordAgentRunMetrics,
-  recordRecoveryAttemptMetrics,
-  recordLinesChanged,
-  recordHookCallMetrics,
-} from './metrics.js';
-import { bufferTelemetryEvent } from './sdk.js';
-import type { UiEvent } from './uiTelemetry.js';
-import { uiTelemetryService } from './uiTelemetry.js';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
+  UserPromptEvent,
+  WebFetchFallbackAttemptEvent,
+} from "./types.js";
+import { EVENT_API_ERROR, EVENT_API_RESPONSE, EVENT_TOOL_CALL } from "./types.js";
+import type { UiEvent } from "./uiTelemetry.js";
+import { uiTelemetryService } from "./uiTelemetry.js";
 
-export function logCliConfiguration(
-  config: Config,
-  event: StartSessionEvent,
-): void {
+export function logCliConfiguration(config: Config, event: StartSessionEvent): void {
   ClearcutLogger.getInstance(config)?.logStartSessionEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -106,8 +99,8 @@ export function logUserPrompt(config: Config, event: UserPromptEvent): void {
 export function logToolCall(config: Config, event: ToolCallEvent): void {
   const uiEvent = {
     ...event,
-    'event.name': EVENT_TOOL_CALL,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_TOOL_CALL,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   ClearcutLogger.getInstance(config)?.logToolCallEvent(event);
@@ -126,15 +119,15 @@ export function logToolCall(config: Config, event: ToolCallEvent): void {
     });
 
     if (event.metadata) {
-      const added = event.metadata['model_added_lines'];
-      if (typeof added === 'number' && added > 0) {
-        recordLinesChanged(config, added, 'added', {
+      const added = event.metadata["model_added_lines"];
+      if (typeof added === "number" && added > 0) {
+        recordLinesChanged(config, added, "added", {
           function_name: event.function_name,
         });
       }
-      const removed = event.metadata['model_removed_lines'];
-      if (typeof removed === 'number' && removed > 0) {
-        recordLinesChanged(config, removed, 'removed', {
+      const removed = event.metadata["model_removed_lines"];
+      if (typeof removed === "number" && removed > 0) {
+        recordLinesChanged(config, removed, "removed", {
           function_name: event.function_name,
         });
       }
@@ -142,10 +135,7 @@ export function logToolCall(config: Config, event: ToolCallEvent): void {
   });
 }
 
-export function logToolOutputTruncated(
-  config: Config,
-  event: ToolOutputTruncatedEvent,
-): void {
+export function logToolOutputTruncated(config: Config, event: ToolOutputTruncatedEvent): void {
   ClearcutLogger.getInstance(config)?.logToolOutputTruncatedEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -157,10 +147,7 @@ export function logToolOutputTruncated(
   });
 }
 
-export function logFileOperation(
-  config: Config,
-  event: FileOperationEvent,
-): void {
+export function logFileOperation(config: Config, event: FileOperationEvent): void {
   ClearcutLogger.getInstance(config)?.logFileOperationEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -189,10 +176,7 @@ export function logApiRequest(config: Config, event: ApiRequestEvent): void {
   });
 }
 
-export function logFlashFallback(
-  config: Config,
-  event: FlashFallbackEvent,
-): void {
+export function logFlashFallback(config: Config, event: FlashFallbackEvent): void {
   ClearcutLogger.getInstance(config)?.logFlashFallbackEvent();
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -204,10 +188,7 @@ export function logFlashFallback(
   });
 }
 
-export function logRipgrepFallback(
-  config: Config,
-  event: RipgrepFallbackEvent,
-): void {
+export function logRipgrepFallback(config: Config, event: RipgrepFallbackEvent): void {
   ClearcutLogger.getInstance(config)?.logRipgrepFallbackEvent();
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -222,8 +203,8 @@ export function logRipgrepFallback(
 export function logApiError(config: Config, event: ApiErrorEvent): void {
   const uiEvent = {
     ...event,
-    'event.name': EVENT_API_ERROR,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_API_ERROR,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   ClearcutLogger.getInstance(config)?.logApiErrorEvent(event);
@@ -244,7 +225,7 @@ export function logApiError(config: Config, event: ApiErrorEvent): void {
       status_code: event.status_code,
       genAiAttributes: {
         ...getConventionAttributes(event),
-        'error.type': event.error_type || 'unknown',
+        "error.type": event.error_type || "unknown",
       },
     });
   });
@@ -253,8 +234,8 @@ export function logApiError(config: Config, event: ApiErrorEvent): void {
 export function logApiResponse(config: Config, event: ApiResponseEvent): void {
   const uiEvent = {
     ...event,
-    'event.name': EVENT_API_RESPONSE,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_API_RESPONSE,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   ClearcutLogger.getInstance(config)?.logApiResponseEvent(event);
@@ -272,11 +253,11 @@ export function logApiResponse(config: Config, event: ApiResponseEvent): void {
     });
 
     const tokenUsageData = [
-      { count: event.usage.input_token_count, type: 'input' as const },
-      { count: event.usage.output_token_count, type: 'output' as const },
-      { count: event.usage.cached_content_token_count, type: 'cache' as const },
-      { count: event.usage.thoughts_token_count, type: 'thought' as const },
-      { count: event.usage.tool_token_count, type: 'tool' as const },
+      { count: event.usage.input_token_count, type: "input" as const },
+      { count: event.usage.output_token_count, type: "output" as const },
+      { count: event.usage.cached_content_token_count, type: "cache" as const },
+      { count: event.usage.thoughts_token_count, type: "thought" as const },
+      { count: event.usage.tool_token_count, type: "tool" as const },
     ];
 
     for (const { count, type } of tokenUsageData) {
@@ -289,10 +270,7 @@ export function logApiResponse(config: Config, event: ApiResponseEvent): void {
   });
 }
 
-export function logLoopDetected(
-  config: Config,
-  event: LoopDetectedEvent,
-): void {
+export function logLoopDetected(config: Config, event: LoopDetectedEvent): void {
   ClearcutLogger.getInstance(config)?.logLoopDetectedEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -304,10 +282,7 @@ export function logLoopDetected(
   });
 }
 
-export function logLoopDetectionDisabled(
-  config: Config,
-  event: LoopDetectionDisabledEvent,
-): void {
+export function logLoopDetectionDisabled(config: Config, event: LoopDetectionDisabledEvent): void {
   ClearcutLogger.getInstance(config)?.logLoopDetectionDisabledEvent();
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -319,10 +294,7 @@ export function logLoopDetectionDisabled(
   });
 }
 
-export function logNextSpeakerCheck(
-  config: Config,
-  event: NextSpeakerCheckEvent,
-): void {
+export function logNextSpeakerCheck(config: Config, event: NextSpeakerCheckEvent): void {
   ClearcutLogger.getInstance(config)?.logNextSpeakerCheck(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -334,10 +306,7 @@ export function logNextSpeakerCheck(
   });
 }
 
-export function logSlashCommand(
-  config: Config,
-  event: SlashCommandEvent,
-): void {
+export function logSlashCommand(config: Config, event: SlashCommandEvent): void {
   ClearcutLogger.getInstance(config)?.logSlashCommandEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -349,10 +318,7 @@ export function logSlashCommand(
   });
 }
 
-export function logIdeConnection(
-  config: Config,
-  event: IdeConnectionEvent,
-): void {
+export function logIdeConnection(config: Config, event: IdeConnectionEvent): void {
   ClearcutLogger.getInstance(config)?.logIdeConnectionEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -379,10 +345,7 @@ export function logConversationFinishedEvent(
   });
 }
 
-export function logChatCompression(
-  config: Config,
-  event: ChatCompressionEvent,
-): void {
+export function logChatCompression(config: Config, event: ChatCompressionEvent): void {
   ClearcutLogger.getInstance(config)?.logChatCompressionEvent(event);
 
   const logger = logs.getLogger(SERVICE_NAME);
@@ -398,10 +361,7 @@ export function logChatCompression(
   });
 }
 
-export function logMalformedJsonResponse(
-  config: Config,
-  event: MalformedJsonResponseEvent,
-): void {
+export function logMalformedJsonResponse(config: Config, event: MalformedJsonResponseEvent): void {
   ClearcutLogger.getInstance(config)?.logMalformedJsonResponseEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -413,10 +373,7 @@ export function logMalformedJsonResponse(
   });
 }
 
-export function logInvalidChunk(
-  config: Config,
-  event: InvalidChunkEvent,
-): void {
+export function logInvalidChunk(config: Config, event: InvalidChunkEvent): void {
   ClearcutLogger.getInstance(config)?.logInvalidChunkEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -429,10 +386,7 @@ export function logInvalidChunk(
   });
 }
 
-export function logContentRetry(
-  config: Config,
-  event: ContentRetryEvent,
-): void {
+export function logContentRetry(config: Config, event: ContentRetryEvent): void {
   ClearcutLogger.getInstance(config)?.logContentRetryEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -445,10 +399,7 @@ export function logContentRetry(
   });
 }
 
-export function logContentRetryFailure(
-  config: Config,
-  event: ContentRetryFailureEvent,
-): void {
+export function logContentRetryFailure(config: Config, event: ContentRetryFailureEvent): void {
   ClearcutLogger.getInstance(config)?.logContentRetryFailureEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -461,10 +412,7 @@ export function logContentRetryFailure(
   });
 }
 
-export function logModelRouting(
-  config: Config,
-  event: ModelRoutingEvent,
-): void {
+export function logModelRouting(config: Config, event: ModelRoutingEvent): void {
   ClearcutLogger.getInstance(config)?.logModelRoutingEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -477,10 +425,7 @@ export function logModelRouting(
   });
 }
 
-export function logModelSlashCommand(
-  config: Config,
-  event: ModelSlashCommandEvent,
-): void {
+export function logModelSlashCommand(config: Config, event: ModelSlashCommandEvent): void {
   ClearcutLogger.getInstance(config)?.logModelSlashCommandEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -568,10 +513,7 @@ export async function logExtensionDisable(
   });
 }
 
-export function logSmartEditStrategy(
-  config: Config,
-  event: SmartEditStrategyEvent,
-): void {
+export function logSmartEditStrategy(config: Config, event: SmartEditStrategyEvent): void {
   ClearcutLogger.getInstance(config)?.logSmartEditStrategyEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -583,10 +525,7 @@ export function logSmartEditStrategy(
   });
 }
 
-export function logSmartEditCorrectionEvent(
-  config: Config,
-  event: SmartEditCorrectionEvent,
-): void {
+export function logSmartEditCorrectionEvent(config: Config, event: SmartEditCorrectionEvent): void {
   ClearcutLogger.getInstance(config)?.logSmartEditCorrectionEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -624,10 +563,7 @@ export function logAgentFinish(config: Config, event: AgentFinishEvent): void {
   });
 }
 
-export function logRecoveryAttempt(
-  config: Config,
-  event: RecoveryAttemptEvent,
-): void {
+export function logRecoveryAttempt(config: Config, event: RecoveryAttemptEvent): void {
   ClearcutLogger.getInstance(config)?.logRecoveryAttemptEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -656,10 +592,7 @@ export function logWebFetchFallbackAttempt(
   });
 }
 
-export function logLlmLoopCheck(
-  config: Config,
-  event: LlmLoopCheckEvent,
-): void {
+export function logLlmLoopCheck(config: Config, event: LlmLoopCheckEvent): void {
   ClearcutLogger.getInstance(config)?.logLlmLoopCheckEvent(event);
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
@@ -690,10 +623,7 @@ export function logHookCall(config: Config, event: HookCallEvent): void {
   });
 }
 
-export function logStartupStats(
-  config: Config,
-  event: StartupStatsEvent,
-): void {
+export function logStartupStats(config: Config, event: StartupStatsEvent): void {
   bufferTelemetryEvent(() => {
     const logger = logs.getLogger(SERVICE_NAME);
     const logRecord: LogRecord = {
diff --git a/packages/gemini-cli-core/src/telemetry/memory-monitor.test.ts b/packages/gemini-cli-core/src/telemetry/memory-monitor.test.ts
index fce811975..7b070e4b4 100644
--- a/packages/gemini-cli-core/src/telemetry/memory-monitor.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/memory-monitor.test.ts
@@ -4,44 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import v8 from 'node:v8';
-import process from 'node:process';
+import process from "node:process";
+import v8 from "node:v8";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
 import {
-  MemoryMonitor,
-  initializeMemoryMonitor,
+  _resetGlobalMemoryMonitorForTests,
   getMemoryMonitor,
+  initializeMemoryMonitor,
+  MemoryMonitor,
   recordCurrentMemoryUsage,
   startGlobalMemoryMonitoring,
   stopGlobalMemoryMonitoring,
-  _resetGlobalMemoryMonitorForTests,
-} from './memory-monitor.js';
-import type { Config } from '../config/config.js';
-import { recordMemoryUsage, isPerformanceMonitoringActive } from './metrics.js';
-import { HighWaterMarkTracker } from './high-water-mark-tracker.js';
-import { RateLimiter } from './rate-limiter.js';
+} from "./memory-monitor.js";
+import { isPerformanceMonitoringActive, recordMemoryUsage } from "./metrics.js";
+import { RateLimiter } from "./rate-limiter.js";
 
 // Mock dependencies
-vi.mock('./metrics.js', () => ({
+vi.mock("./metrics.js", () => ({
   recordMemoryUsage: vi.fn(),
   isPerformanceMonitoringActive: vi.fn(),
   MemoryMetricType: {
-    HEAP_USED: 'heap_used',
-    HEAP_TOTAL: 'heap_total',
-    EXTERNAL: 'external',
-    RSS: 'rss',
+    HEAP_USED: "heap_used",
+    HEAP_TOTAL: "heap_total",
+    EXTERNAL: "external",
+    RSS: "rss",
   },
 }));
 
 // Mock Node.js modules
-vi.mock('node:v8', () => ({
+vi.mock("node:v8", () => ({
   default: {
     getHeapStatistics: vi.fn(),
     getHeapSpaceStatistics: vi.fn(),
   },
 }));
 
-vi.mock('node:process', () => ({
+vi.mock("node:process", () => ({
   default: {
     memoryUsage: vi.fn(),
     cpuUsage: vi.fn(),
@@ -50,9 +50,7 @@ vi.mock('node:process', () => ({
 }));
 
 const mockRecordMemoryUsage = vi.mocked(recordMemoryUsage);
-const mockIsPerformanceMonitoringActive = vi.mocked(
-  isPerformanceMonitoringActive,
-);
+const mockIsPerformanceMonitoringActive = vi.mocked(isPerformanceMonitoringActive);
 const mockV8GetHeapStatistics = vi.mocked(v8.getHeapStatistics);
 const mockV8GetHeapSpaceStatistics = vi.mocked(v8.getHeapSpaceStatistics);
 const mockProcessMemoryUsage = vi.mocked(process.memoryUsage);
@@ -61,7 +59,7 @@ const mockProcessUptime = vi.mocked(process.uptime);
 
 // Mock config object
 const mockConfig = {
-  getSessionId: () => 'test-session-id',
+  getSessionId: () => "test-session-id",
   getTelemetryEnabled: () => true,
 } as unknown as Config;
 
@@ -93,14 +91,14 @@ const mockHeapStatistics = {
 
 const mockHeapSpaceStatistics = [
   {
-    space_name: 'new_space',
+    space_name: "new_space",
     space_size: 8388608,
     space_used_size: 4194304,
     space_available_size: 4194304,
     physical_space_size: 8388608,
   },
   {
-    space_name: 'old_space',
+    space_name: "old_space",
     space_size: 16777216,
     space_used_size: 8388608,
     space_available_size: 8388608,
@@ -113,10 +111,10 @@ const mockCpuUsage = {
   system: 500000, // 0.5 seconds
 };
 
-describe('MemoryMonitor', () => {
+describe("MemoryMonitor", () => {
   beforeEach(() => {
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-01-01T00:00:00.000Z'));
+    vi.setSystemTime(new Date("2025-01-01T00:00:00.000Z"));
 
     // Setup default mocks
     mockIsPerformanceMonitoringActive.mockReturnValue(true);
@@ -134,19 +132,19 @@ describe('MemoryMonitor', () => {
     _resetGlobalMemoryMonitorForTests();
   });
 
-  describe('MemoryMonitor Class', () => {
-    describe('constructor', () => {
-      it('should create a new MemoryMonitor instance without config to avoid multi-session attribution', () => {
+  describe("MemoryMonitor Class", () => {
+    describe("constructor", () => {
+      it("should create a new MemoryMonitor instance without config to avoid multi-session attribution", () => {
         const monitor = new MemoryMonitor();
         expect(monitor).toBeInstanceOf(MemoryMonitor);
       });
     });
 
-    describe('takeSnapshot', () => {
-      it('should take a memory snapshot and record metrics when performance monitoring is active', () => {
+    describe("takeSnapshot", () => {
+      it("should take a memory snapshot and record metrics when performance monitoring is active", () => {
         const monitor = new MemoryMonitor();
 
-        const snapshot = monitor.takeSnapshot('test_context', mockConfig);
+        const snapshot = monitor.takeSnapshot("test_context", mockConfig);
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -159,45 +157,29 @@ describe('MemoryMonitor', () => {
         });
 
         // Verify metrics were recorded
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_context',
-          },
-        );
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapTotal,
-          {
-            memory_type: 'heap_total',
-            component: 'test_context',
-          },
-        );
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.external,
-          {
-            memory_type: 'external',
-            component: 'test_context',
-          },
-        );
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.rss,
-          {
-            memory_type: 'rss',
-            component: 'test_context',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_context",
+        });
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapTotal, {
+          memory_type: "heap_total",
+          component: "test_context",
+        });
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.external, {
+          memory_type: "external",
+          component: "test_context",
+        });
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.rss, {
+          memory_type: "rss",
+          component: "test_context",
+        });
       });
 
-      it('should not record metrics when performance monitoring is inactive', () => {
+      it("should not record metrics when performance monitoring is inactive", () => {
         mockIsPerformanceMonitoringActive.mockReturnValue(false);
         const monitor = new MemoryMonitor();
 
-        const snapshot = monitor.takeSnapshot('test_context', mockConfig);
+        const snapshot = monitor.takeSnapshot("test_context", mockConfig);
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -214,8 +196,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getCurrentMemoryUsage', () => {
-      it('should return current memory usage without recording metrics', () => {
+    describe("getCurrentMemoryUsage", () => {
+      it("should return current memory usage without recording metrics", () => {
         const monitor = new MemoryMonitor();
 
         const usage = monitor.getCurrentMemoryUsage();
@@ -235,8 +217,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('start and stop', () => {
-      it('should start and stop memory monitoring with proper lifecycle', () => {
+    describe("start and stop", () => {
+      it("should start and stop memory monitoring with proper lifecycle", () => {
         const monitor = new MemoryMonitor();
         const intervalMs = 1000;
 
@@ -244,43 +226,31 @@ describe('MemoryMonitor', () => {
         monitor.start(mockConfig, intervalMs);
 
         // Verify initial snapshot was taken
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
 
         // Fast-forward time to trigger periodic snapshot
         vi.advanceTimersByTime(intervalMs);
 
         // Verify monitoring_start snapshot was taken (multiple metrics)
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          expect.any(Number),
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, expect.any(Number), {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
 
         // Stop monitoring
         monitor.stop(mockConfig);
 
         // Verify final snapshot was taken
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_stop',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_stop",
+        });
       });
 
-      it('should not start monitoring when performance monitoring is inactive', () => {
+      it("should not start monitoring when performance monitoring is inactive", () => {
         mockIsPerformanceMonitoringActive.mockReturnValue(false);
         const monitor = new MemoryMonitor();
 
@@ -290,7 +260,7 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage).not.toHaveBeenCalled();
       });
 
-      it('should not start monitoring when already running', () => {
+      it("should not start monitoring when already running", () => {
         const monitor = new MemoryMonitor();
 
         // Start monitoring twice
@@ -303,14 +273,14 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage).toHaveBeenCalledTimes(initialCallCount);
       });
 
-      it('should handle stop when not running', () => {
+      it("should handle stop when not running", () => {
         const monitor = new MemoryMonitor();
 
         // Should not throw error
         expect(() => monitor.stop(mockConfig)).not.toThrow();
       });
 
-      it('should stop without taking final snapshot when no config provided', () => {
+      it("should stop without taking final snapshot when no config provided", () => {
         const monitor = new MemoryMonitor();
 
         monitor.start(mockConfig, 1000);
@@ -322,15 +292,9 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage).toHaveBeenCalledTimes(callsBeforeStop);
       });
 
-      it('should periodically cleanup tracker state to prevent growth', () => {
-        const trackerCleanupSpy = vi.spyOn(
-          HighWaterMarkTracker.prototype,
-          'cleanup',
-        );
-        const rateLimiterCleanupSpy = vi.spyOn(
-          RateLimiter.prototype,
-          'cleanup',
-        );
+      it("should periodically cleanup tracker state to prevent growth", () => {
+        const trackerCleanupSpy = vi.spyOn(HighWaterMarkTracker.prototype, "cleanup");
+        const rateLimiterCleanupSpy = vi.spyOn(RateLimiter.prototype, "cleanup");
 
         const monitor = new MemoryMonitor();
         monitor.start(mockConfig, 1000);
@@ -351,12 +315,12 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getMemoryGrowth', () => {
-      it('should calculate memory growth between snapshots', () => {
+    describe("getMemoryGrowth", () => {
+      it("should calculate memory growth between snapshots", () => {
         const monitor = new MemoryMonitor();
 
         // Take initial snapshot
-        monitor.takeSnapshot('initial', mockConfig);
+        monitor.takeSnapshot("initial", mockConfig);
 
         // Change memory usage
         const newMemoryUsage = {
@@ -377,7 +341,7 @@ describe('MemoryMonitor', () => {
         });
       });
 
-      it('should return null when no previous snapshot exists', () => {
+      it("should return null when no previous snapshot exists", () => {
         const monitor = new MemoryMonitor();
 
         const growth = monitor.getMemoryGrowth();
@@ -386,8 +350,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('checkMemoryThreshold', () => {
-      it('should return true when memory usage exceeds threshold', () => {
+    describe("checkMemoryThreshold", () => {
+      it("should return true when memory usage exceeds threshold", () => {
         const monitor = new MemoryMonitor();
         const thresholdMB = 10; // 10MB threshold
 
@@ -396,7 +360,7 @@ describe('MemoryMonitor', () => {
         expect(exceeds).toBe(true); // heapUsed is ~15MB
       });
 
-      it('should return false when memory usage is below threshold', () => {
+      it("should return false when memory usage is below threshold", () => {
         const monitor = new MemoryMonitor();
         const thresholdMB = 20; // 20MB threshold
 
@@ -406,8 +370,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getMemoryUsageSummary', () => {
-      it('should return memory usage summary in MB with proper rounding', () => {
+    describe("getMemoryUsageSummary", () => {
+      it("should return memory usage summary in MB with proper rounding", () => {
         const monitor = new MemoryMonitor();
 
         const summary = monitor.getMemoryUsageSummary();
@@ -422,8 +386,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getHeapStatistics', () => {
-      it('should return V8 heap statistics', () => {
+    describe("getHeapStatistics", () => {
+      it("should return V8 heap statistics", () => {
         const monitor = new MemoryMonitor();
 
         const stats = monitor.getHeapStatistics();
@@ -433,8 +397,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getHeapSpaceStatistics', () => {
-      it('should return V8 heap space statistics', () => {
+    describe("getHeapSpaceStatistics", () => {
+      it("should return V8 heap space statistics", () => {
         const monitor = new MemoryMonitor();
 
         const stats = monitor.getHeapSpaceStatistics();
@@ -444,8 +408,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getProcessMetrics', () => {
-      it('should return process CPU and memory metrics', () => {
+    describe("getProcessMetrics", () => {
+      it("should return process CPU and memory metrics", () => {
         const monitor = new MemoryMonitor();
 
         const metrics = monitor.getProcessMetrics();
@@ -458,14 +422,11 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('recordComponentMemoryUsage', () => {
-      it('should record memory usage for specific component', () => {
+    describe("recordComponentMemoryUsage", () => {
+      it("should record memory usage for specific component", () => {
         const monitor = new MemoryMonitor();
 
-        const snapshot = monitor.recordComponentMemoryUsage(
-          mockConfig,
-          'test_component',
-        );
+        const snapshot = monitor.recordComponentMemoryUsage(mockConfig, "test_component");
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -477,38 +438,26 @@ describe('MemoryMonitor', () => {
           heapSizeLimit: mockHeapStatistics.heap_size_limit,
         });
 
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_component',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_component",
+        });
       });
 
-      it('should record memory usage for component with operation', () => {
+      it("should record memory usage for component with operation", () => {
         const monitor = new MemoryMonitor();
 
-        monitor.recordComponentMemoryUsage(
-          mockConfig,
-          'test_component',
-          'test_operation',
-        );
-
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_component_test_operation',
-          },
-        );
+        monitor.recordComponentMemoryUsage(mockConfig, "test_component", "test_operation");
+
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_component_test_operation",
+        });
       });
     });
 
-    describe('destroy', () => {
-      it('should stop monitoring and cleanup resources', () => {
+    describe("destroy", () => {
+      it("should stop monitoring and cleanup resources", () => {
         const monitor = new MemoryMonitor();
 
         monitor.start(mockConfig, 1000);
@@ -523,9 +472,9 @@ describe('MemoryMonitor', () => {
     });
   });
 
-  describe('Global Memory Monitor Functions', () => {
-    describe('initializeMemoryMonitor', () => {
-      it('should create singleton instance', () => {
+  describe("Global Memory Monitor Functions", () => {
+    describe("initializeMemoryMonitor", () => {
+      it("should create singleton instance", () => {
         const monitor1 = initializeMemoryMonitor();
         const monitor2 = initializeMemoryMonitor();
 
@@ -534,13 +483,13 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getMemoryMonitor', () => {
-      it('should return null when not initialized', () => {
+    describe("getMemoryMonitor", () => {
+      it("should return null when not initialized", () => {
         _resetGlobalMemoryMonitorForTests();
         expect(getMemoryMonitor()).toBeNull();
       });
 
-      it('should return initialized monitor', () => {
+      it("should return initialized monitor", () => {
         const initialized = initializeMemoryMonitor();
         const retrieved = getMemoryMonitor();
 
@@ -548,9 +497,9 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('recordCurrentMemoryUsage', () => {
-      it('should initialize monitor and take snapshot', () => {
-        const snapshot = recordCurrentMemoryUsage(mockConfig, 'test_context');
+    describe("recordCurrentMemoryUsage", () => {
+      it("should initialize monitor and take snapshot", () => {
+        const snapshot = recordCurrentMemoryUsage(mockConfig, "test_context");
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -562,58 +511,42 @@ describe('MemoryMonitor', () => {
           heapSizeLimit: mockHeapStatistics.heap_size_limit,
         });
 
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_context',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_context",
+        });
       });
     });
 
-    describe('startGlobalMemoryMonitoring', () => {
-      it('should initialize and start global monitoring', () => {
+    describe("startGlobalMemoryMonitoring", () => {
+      it("should initialize and start global monitoring", () => {
         startGlobalMemoryMonitoring(mockConfig, 1000);
 
         // Verify initial snapshot
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
 
         // Fast-forward and verify monitoring snapshot
         vi.advanceTimersByTime(1000);
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          expect.any(Number),
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, expect.any(Number), {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
       });
     });
 
-    describe('stopGlobalMemoryMonitoring', () => {
-      it('should stop global monitoring when monitor exists', () => {
+    describe("stopGlobalMemoryMonitoring", () => {
+      it("should stop global monitoring when monitor exists", () => {
         startGlobalMemoryMonitoring(mockConfig, 1000);
         stopGlobalMemoryMonitoring(mockConfig);
 
         // Verify final snapshot
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_stop',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_stop",
+        });
 
         // Verify no more periodic snapshots
         const callsAfterStop = mockRecordMemoryUsage.mock.calls.length;
@@ -621,48 +554,42 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage.mock.calls.length).toBe(callsAfterStop);
       });
 
-      it('should handle stop when no global monitor exists', () => {
+      it("should handle stop when no global monitor exists", () => {
         expect(() => stopGlobalMemoryMonitoring(mockConfig)).not.toThrow();
       });
     });
   });
 
-  describe('Error Scenarios', () => {
-    it('should handle process.memoryUsage() errors gracefully', () => {
+  describe("Error Scenarios", () => {
+    it("should handle process.memoryUsage() errors gracefully", () => {
       mockProcessMemoryUsage.mockImplementation(() => {
-        throw new Error('Memory access error');
+        throw new Error("Memory access error");
       });
 
       const monitor = new MemoryMonitor();
 
-      expect(() => monitor.getCurrentMemoryUsage()).toThrow(
-        'Memory access error',
-      );
+      expect(() => monitor.getCurrentMemoryUsage()).toThrow("Memory access error");
     });
 
-    it('should handle v8.getHeapStatistics() errors gracefully', () => {
+    it("should handle v8.getHeapStatistics() errors gracefully", () => {
       mockV8GetHeapStatistics.mockImplementation(() => {
-        throw new Error('Heap statistics error');
+        throw new Error("Heap statistics error");
       });
 
       const monitor = new MemoryMonitor();
 
-      expect(() => monitor.getCurrentMemoryUsage()).toThrow(
-        'Heap statistics error',
-      );
+      expect(() => monitor.getCurrentMemoryUsage()).toThrow("Heap statistics error");
     });
 
-    it('should handle metric recording errors gracefully', () => {
+    it("should handle metric recording errors gracefully", () => {
       mockRecordMemoryUsage.mockImplementation(() => {
-        throw new Error('Metric recording error');
+        throw new Error("Metric recording error");
       });
 
       const monitor = new MemoryMonitor();
 
       // Should propagate error if metric recording fails
-      expect(() => monitor.takeSnapshot('test', mockConfig)).toThrow(
-        'Metric recording error',
-      );
+      expect(() => monitor.takeSnapshot("test", mockConfig)).toThrow("Metric recording error");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/telemetry/memory-monitor.ts b/packages/gemini-cli-core/src/telemetry/memory-monitor.ts
index e005bd73c..6fd1fe9af 100644
--- a/packages/gemini-cli-core/src/telemetry/memory-monitor.ts
+++ b/packages/gemini-cli-core/src/telemetry/memory-monitor.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import v8 from 'node:v8';
-import process from 'node:process';
-import type { Config } from '../config/config.js';
-import { bytesToMB } from '../utils/formatters.js';
-import { isUserActive } from './activity-detector.js';
-import { HighWaterMarkTracker } from './high-water-mark-tracker.js';
-import {
-  recordMemoryUsage,
-  MemoryMetricType,
-  isPerformanceMonitoringActive,
-} from './metrics.js';
-import { RateLimiter } from './rate-limiter.js';
+import process from "node:process";
+import v8 from "node:v8";
+import type { Config } from "../config/config.js";
+import { bytesToMB } from "../utils/formatters.js";
+import { isUserActive } from "./activity-detector.js";
+import { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
+import { isPerformanceMonitoringActive, MemoryMetricType, recordMemoryUsage } from "./metrics.js";
+import { RateLimiter } from "./rate-limiter.js";
 
 export interface MemorySnapshot {
   timestamp: number;
@@ -64,7 +60,7 @@ export class MemoryMonitor {
     this.isRunning = true;
 
     // Take initial snapshot
-    this.takeSnapshot('monitoring_start', config);
+    this.takeSnapshot("monitoring_start", config);
 
     // Set up periodic monitoring with enhanced logic
     this.intervalId = setInterval(() => {
@@ -80,7 +76,7 @@ export class MemoryMonitor {
 
     if (!this.useEnhancedMonitoring) {
       // Fall back to original behavior
-      this.takeSnapshot('periodic', config);
+      this.takeSnapshot("periodic", config);
       return;
     }
 
@@ -93,29 +89,23 @@ export class MemoryMonitor {
     const currentMemory = this.getCurrentMemoryUsage();
 
     // Check if RSS has grown significantly (5% threshold)
-    const shouldRecordRss = this.highWaterMarkTracker.shouldRecordMetric(
-      'rss',
-      currentMemory.rss,
-    );
+    const shouldRecordRss = this.highWaterMarkTracker.shouldRecordMetric("rss", currentMemory.rss);
     const shouldRecordHeap = this.highWaterMarkTracker.shouldRecordMetric(
-      'heap_used',
+      "heap_used",
       currentMemory.heapUsed,
     );
 
     // Also check rate limiting
-    const canRecordPeriodic = this.rateLimiter.shouldRecord('periodic_memory');
-    const canRecordHighWater = this.rateLimiter.shouldRecord(
-      'high_water_memory',
-      true,
-    ); // High priority
+    const canRecordPeriodic = this.rateLimiter.shouldRecord("periodic_memory");
+    const canRecordHighWater = this.rateLimiter.shouldRecord("high_water_memory", true); // High priority
 
     // Record if we have significant growth and aren't rate limited
     if ((shouldRecordRss || shouldRecordHeap) && canRecordHighWater) {
-      const context = shouldRecordRss ? 'rss_growth' : 'heap_growth';
+      const context = shouldRecordRss ? "rss_growth" : "heap_growth";
       this.takeSnapshot(context, config);
     } else if (canRecordPeriodic) {
       // Occasionally record even without growth for baseline tracking
-      this.takeSnapshotWithoutRecording('periodic_check', config);
+      this.takeSnapshotWithoutRecording("periodic_check", config);
     }
   }
 
@@ -124,10 +114,7 @@ export class MemoryMonitor {
    */
   private performPeriodicCleanup(): void {
     const now = Date.now();
-    if (
-      now - this.lastCleanupTimestamp <
-      MemoryMonitor.STATE_CLEANUP_INTERVAL_MS
-    ) {
+    if (now - this.lastCleanupTimestamp < MemoryMonitor.STATE_CLEANUP_INTERVAL_MS) {
       return;
     }
 
@@ -151,7 +138,7 @@ export class MemoryMonitor {
 
     // Take final snapshot if config is provided
     if (config) {
-      this.takeSnapshot('monitoring_stop', config);
+      this.takeSnapshot("monitoring_stop", config);
     }
     this.isRunning = false;
   }
@@ -200,10 +187,7 @@ export class MemoryMonitor {
   /**
    * Take a memory snapshot without recording metrics (for internal tracking)
    */
-  private takeSnapshotWithoutRecording(
-    _context: string,
-    _config: Config,
-  ): MemorySnapshot {
+  private takeSnapshotWithoutRecording(_context: string, _config: Config): MemorySnapshot {
     const memUsage = process.memoryUsage();
     const heapStats = v8.getHeapStatistics();
 
@@ -218,11 +202,8 @@ export class MemoryMonitor {
     };
 
     // Update internal tracking but don't record metrics
-    this.highWaterMarkTracker.shouldRecordMetric('rss', snapshot.rss);
-    this.highWaterMarkTracker.shouldRecordMetric(
-      'heap_used',
-      snapshot.heapUsed,
-    );
+    this.highWaterMarkTracker.shouldRecordMetric("rss", snapshot.rss);
+    this.highWaterMarkTracker.shouldRecordMetric("heap_used", snapshot.heapUsed);
 
     this.lastSnapshot = snapshot;
     return snapshot;
@@ -297,10 +278,7 @@ export class MemoryMonitor {
     component: string,
     operation?: string,
   ): MemorySnapshot {
-    const snapshot = this.takeSnapshot(
-      operation ? `${component}_${operation}` : component,
-      config,
-    );
+    const snapshot = this.takeSnapshot(operation ? `${component}_${operation}` : component, config);
     return snapshot;
   }
 
@@ -362,11 +340,8 @@ export class MemoryMonitor {
   /**
    * Force record memory metrics (bypasses rate limiting for critical events)
    */
-  forceRecordMemory(
-    config: Config,
-    context: string = 'forced',
-  ): MemorySnapshot {
-    this.rateLimiter.forceRecord('forced_memory');
+  forceRecordMemory(config: Config, context: string = "forced"): MemorySnapshot {
+    this.rateLimiter.forceRecord("forced_memory");
     return this.takeSnapshot(context, config);
   }
 
@@ -410,10 +385,7 @@ export function getMemoryMonitor(): MemoryMonitor | null {
 /**
  * Record memory usage for current operation
  */
-export function recordCurrentMemoryUsage(
-  config: Config,
-  context: string,
-): MemorySnapshot {
+export function recordCurrentMemoryUsage(config: Config, context: string): MemorySnapshot {
   const monitor = initializeMemoryMonitor();
   return monitor.takeSnapshot(context, config);
 }
@@ -421,10 +393,7 @@ export function recordCurrentMemoryUsage(
 /**
  * Start global memory monitoring
  */
-export function startGlobalMemoryMonitoring(
-  config: Config,
-  intervalMs: number = 10000,
-): void {
+export function startGlobalMemoryMonitoring(config: Config, intervalMs: number = 10000): void {
   const monitor = initializeMemoryMonitor();
   monitor.start(config, intervalMs);
 }
diff --git a/packages/gemini-cli-core/src/telemetry/metrics.test.ts b/packages/gemini-cli-core/src/telemetry/metrics.test.ts
index e86f81424..494d5dab0 100644
--- a/packages/gemini-cli-core/src/telemetry/metrics.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/metrics.test.ts
@@ -4,37 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import type {
-  Counter,
-  Meter,
-  Attributes,
-  Context,
-  Histogram,
-} from '@opentelemetry/api';
-import type { Config } from '../config/config.js';
-import {
-  FileOperation,
-  MemoryMetricType,
-  ToolExecutionPhase,
-  ApiRequestPhase,
-} from './metrics.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ModelRoutingEvent, AgentFinishEvent } from './types.js';
-import { AgentTerminateMode } from '../agents/types.js';
-
-const mockCounterAddFn: Mock<
-  (value: number, attributes?: Attributes, context?: Context) => void
-> = vi.fn();
+import type { Attributes, Context, Counter, Histogram, Meter } from "@opentelemetry/api";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { AgentTerminateMode } from "../agents/types.js";
+import type { Config } from "../config/config.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { ApiRequestPhase, FileOperation, MemoryMetricType, ToolExecutionPhase } from "./metrics.js";
+import { AgentFinishEvent, ModelRoutingEvent } from "./types.js";
+
+const mockCounterAddFn: Mock<(value: number, attributes?: Attributes, context?: Context) => void> =
+  vi.fn();
 const mockHistogramRecordFn: Mock<
   (value: number, attributes?: Attributes, context?: Context) => void
 > = vi.fn();
 
-const mockCreateCounterFn: Mock<(name: string, options?: unknown) => Counter> =
-  vi.fn();
-const mockCreateHistogramFn: Mock<
-  (name: string, options?: unknown) => Histogram
-> = vi.fn();
+const mockCreateCounterFn: Mock<(name: string, options?: unknown) => Counter> = vi.fn();
+const mockCreateHistogramFn: Mock<(name: string, options?: unknown) => Histogram> = vi.fn();
 
 const mockCounterInstance: Counter = {
   add: mockCounterAddFn,
@@ -70,78 +55,73 @@ function originalOtelMockFactory() {
   } as const;
 }
 
-vi.mock('@opentelemetry/api');
-vi.mock('./telemetryAttributes.js');
-
-describe('Telemetry Metrics', () => {
-  let initializeMetricsModule: typeof import('./metrics.js').initializeMetrics;
-  let recordTokenUsageMetricsModule: typeof import('./metrics.js').recordTokenUsageMetrics;
-  let recordFileOperationMetricModule: typeof import('./metrics.js').recordFileOperationMetric;
-  let recordChatCompressionMetricsModule: typeof import('./metrics.js').recordChatCompressionMetrics;
-  let recordModelRoutingMetricsModule: typeof import('./metrics.js').recordModelRoutingMetrics;
-  let recordStartupPerformanceModule: typeof import('./metrics.js').recordStartupPerformance;
-  let recordMemoryUsageModule: typeof import('./metrics.js').recordMemoryUsage;
-  let recordCpuUsageModule: typeof import('./metrics.js').recordCpuUsage;
-  let recordToolQueueDepthModule: typeof import('./metrics.js').recordToolQueueDepth;
-  let recordToolExecutionBreakdownModule: typeof import('./metrics.js').recordToolExecutionBreakdown;
-  let recordTokenEfficiencyModule: typeof import('./metrics.js').recordTokenEfficiency;
-  let recordApiRequestBreakdownModule: typeof import('./metrics.js').recordApiRequestBreakdown;
-  let recordPerformanceScoreModule: typeof import('./metrics.js').recordPerformanceScore;
-  let recordPerformanceRegressionModule: typeof import('./metrics.js').recordPerformanceRegression;
-  let recordBaselineComparisonModule: typeof import('./metrics.js').recordBaselineComparison;
-  let recordGenAiClientTokenUsageModule: typeof import('./metrics.js').recordGenAiClientTokenUsage;
-  let recordGenAiClientOperationDurationModule: typeof import('./metrics.js').recordGenAiClientOperationDuration;
-  let recordFlickerFrameModule: typeof import('./metrics.js').recordFlickerFrame;
-  let recordExitFailModule: typeof import('./metrics.js').recordExitFail;
-  let recordAgentRunMetricsModule: typeof import('./metrics.js').recordAgentRunMetrics;
-  let recordLinesChangedModule: typeof import('./metrics.js').recordLinesChanged;
-  let recordSlowRenderModule: typeof import('./metrics.js').recordSlowRender;
+vi.mock("@opentelemetry/api");
+vi.mock("./telemetryAttributes.js");
+
+describe("Telemetry Metrics", () => {
+  let initializeMetricsModule: typeof import("./metrics.js").initializeMetrics;
+  let recordTokenUsageMetricsModule: typeof import("./metrics.js").recordTokenUsageMetrics;
+  let recordFileOperationMetricModule: typeof import("./metrics.js").recordFileOperationMetric;
+  let recordChatCompressionMetricsModule: typeof import("./metrics.js").recordChatCompressionMetrics;
+  let recordModelRoutingMetricsModule: typeof import("./metrics.js").recordModelRoutingMetrics;
+  let recordStartupPerformanceModule: typeof import("./metrics.js").recordStartupPerformance;
+  let recordMemoryUsageModule: typeof import("./metrics.js").recordMemoryUsage;
+  let recordCpuUsageModule: typeof import("./metrics.js").recordCpuUsage;
+  let recordToolQueueDepthModule: typeof import("./metrics.js").recordToolQueueDepth;
+  let recordToolExecutionBreakdownModule: typeof import("./metrics.js").recordToolExecutionBreakdown;
+  let recordTokenEfficiencyModule: typeof import("./metrics.js").recordTokenEfficiency;
+  let recordApiRequestBreakdownModule: typeof import("./metrics.js").recordApiRequestBreakdown;
+  let recordPerformanceScoreModule: typeof import("./metrics.js").recordPerformanceScore;
+  let recordPerformanceRegressionModule: typeof import("./metrics.js").recordPerformanceRegression;
+  let recordBaselineComparisonModule: typeof import("./metrics.js").recordBaselineComparison;
+  let recordGenAiClientTokenUsageModule: typeof import("./metrics.js").recordGenAiClientTokenUsage;
+  let recordGenAiClientOperationDurationModule: typeof import("./metrics.js").recordGenAiClientOperationDuration;
+  let recordFlickerFrameModule: typeof import("./metrics.js").recordFlickerFrame;
+  let recordExitFailModule: typeof import("./metrics.js").recordExitFail;
+  let recordAgentRunMetricsModule: typeof import("./metrics.js").recordAgentRunMetrics;
+  let recordLinesChangedModule: typeof import("./metrics.js").recordLinesChanged;
+  let recordSlowRenderModule: typeof import("./metrics.js").recordSlowRender;
 
   beforeEach(async () => {
     vi.resetModules();
-    vi.doMock('@opentelemetry/api', () => {
+    vi.doMock("@opentelemetry/api", () => {
       const actualApi = originalOtelMockFactory();
       (actualApi.metrics.getMeter as Mock).mockReturnValue(mockMeterInstance);
       return actualApi;
     });
 
-    const { getCommonAttributes } = await import('./telemetryAttributes.js');
+    const { getCommonAttributes } = await import("./telemetryAttributes.js");
     (getCommonAttributes as Mock).mockReturnValue({
-      'session.id': 'test-session-id',
-      'installation.id': 'test-installation-id',
-      'user.email': 'test@example.com',
+      "session.id": "test-session-id",
+      "installation.id": "test-installation-id",
+      "user.email": "test@example.com",
     });
 
-    const metricsJsModule = await import('./metrics.js');
+    const metricsJsModule = await import("./metrics.js");
     initializeMetricsModule = metricsJsModule.initializeMetrics;
     recordTokenUsageMetricsModule = metricsJsModule.recordTokenUsageMetrics;
     recordFileOperationMetricModule = metricsJsModule.recordFileOperationMetric;
-    recordChatCompressionMetricsModule =
-      metricsJsModule.recordChatCompressionMetrics;
+    recordChatCompressionMetricsModule = metricsJsModule.recordChatCompressionMetrics;
     recordModelRoutingMetricsModule = metricsJsModule.recordModelRoutingMetrics;
     recordStartupPerformanceModule = metricsJsModule.recordStartupPerformance;
     recordMemoryUsageModule = metricsJsModule.recordMemoryUsage;
     recordCpuUsageModule = metricsJsModule.recordCpuUsage;
     recordToolQueueDepthModule = metricsJsModule.recordToolQueueDepth;
-    recordToolExecutionBreakdownModule =
-      metricsJsModule.recordToolExecutionBreakdown;
+    recordToolExecutionBreakdownModule = metricsJsModule.recordToolExecutionBreakdown;
     recordTokenEfficiencyModule = metricsJsModule.recordTokenEfficiency;
     recordApiRequestBreakdownModule = metricsJsModule.recordApiRequestBreakdown;
     recordPerformanceScoreModule = metricsJsModule.recordPerformanceScore;
-    recordPerformanceRegressionModule =
-      metricsJsModule.recordPerformanceRegression;
+    recordPerformanceRegressionModule = metricsJsModule.recordPerformanceRegression;
     recordBaselineComparisonModule = metricsJsModule.recordBaselineComparison;
-    recordGenAiClientTokenUsageModule =
-      metricsJsModule.recordGenAiClientTokenUsage;
-    recordGenAiClientOperationDurationModule =
-      metricsJsModule.recordGenAiClientOperationDuration;
+    recordGenAiClientTokenUsageModule = metricsJsModule.recordGenAiClientTokenUsage;
+    recordGenAiClientOperationDurationModule = metricsJsModule.recordGenAiClientOperationDuration;
     recordFlickerFrameModule = metricsJsModule.recordFlickerFrame;
     recordExitFailModule = metricsJsModule.recordExitFail;
     recordAgentRunMetricsModule = metricsJsModule.recordAgentRunMetrics;
     recordLinesChangedModule = metricsJsModule.recordLinesChanged;
     recordSlowRenderModule = metricsJsModule.recordSlowRender;
 
-    const otelApiModule = await import('@opentelemetry/api');
+    const otelApiModule = await import("@opentelemetry/api");
 
     mockCounterAddFn.mockClear();
     mockCreateCounterFn.mockClear();
@@ -154,14 +134,14 @@ describe('Telemetry Metrics', () => {
     mockCreateHistogramFn.mockReturnValue(mockHistogramInstance);
   });
 
-  describe('recordFlickerFrame', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordFlickerFrame", () => {
+    it("does not record metrics if not initialized", () => {
       const config = makeFakeConfig({});
       recordFlickerFrameModule(config);
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('records a flicker frame event when initialized', () => {
+    it("records a flicker frame event when initialized", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
       recordFlickerFrameModule(config);
@@ -169,21 +149,21 @@ describe('Telemetry Metrics', () => {
       // Called for session, then for flicker
       expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
       expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('recordExitFail', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordExitFail", () => {
+    it("does not record metrics if not initialized", () => {
       const config = makeFakeConfig({});
       recordExitFailModule(config);
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('records a exit fail event when initialized', () => {
+    it("records a exit fail event when initialized", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
       recordExitFailModule(config);
@@ -191,52 +171,52 @@ describe('Telemetry Metrics', () => {
       // Called for session, then for exit fail
       expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
       expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('recordSlowRender', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordSlowRender", () => {
+    it("does not record metrics if not initialized", () => {
       const config = makeFakeConfig({});
       recordSlowRenderModule(config, 123);
       expect(mockHistogramRecordFn).not.toHaveBeenCalled();
     });
 
-    it('records a slow render event when initialized', () => {
+    it("records a slow render event when initialized", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
       recordSlowRenderModule(config, 123);
 
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(123, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('initializeMetrics', () => {
+  describe("initializeMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should apply common attributes including email', () => {
+    it("should apply common attributes including email", () => {
       initializeMetricsModule(mockConfig);
 
       expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('recordChatCompressionMetrics', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordChatCompressionMetrics", () => {
+    it("does not record metrics if not initialized", () => {
       const lol = makeFakeConfig({});
 
       recordChatCompressionMetricsModule(lol, {
@@ -247,7 +227,7 @@ describe('Telemetry Metrics', () => {
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('records token compression with the correct attributes', () => {
+    it("records token compression with the correct attributes", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
 
@@ -257,108 +237,109 @@ describe('Telemetry Metrics', () => {
       });
 
       expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
         tokens_after: 100,
         tokens_before: 200,
       });
     });
   });
 
-  describe('recordTokenUsageMetrics', () => {
+  describe("recordTokenUsageMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record metrics if not initialized', () => {
+    it("should not record metrics if not initialized", () => {
       recordTokenUsageMetricsModule(mockConfig, 100, {
-        model: 'gemini-pro',
-        type: 'input',
+        model: "gemini-pro",
+        type: "input",
       });
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
     it.each([
-      { type: 'input', tokens: 100, model: 'gemini-pro' },
-      { type: 'output', tokens: 50, model: 'gemini-pro' },
-      { type: 'thought', tokens: 25, model: 'gemini-pro' },
-      { type: 'cache', tokens: 75, model: 'gemini-pro' },
-      { type: 'tool', tokens: 125, model: 'gemini-pro' },
-      { type: 'input', tokens: 200, model: 'gemini-different-model' },
-    ])(
-      'should record token usage for $type type with $tokens tokens for model $model',
-      ({ type, tokens, model }) => {
-        initializeMetricsModule(mockConfig);
-        mockCounterAddFn.mockClear();
+      { type: "input", tokens: 100, model: "gemini-pro" },
+      { type: "output", tokens: 50, model: "gemini-pro" },
+      { type: "thought", tokens: 25, model: "gemini-pro" },
+      { type: "cache", tokens: 75, model: "gemini-pro" },
+      { type: "tool", tokens: 125, model: "gemini-pro" },
+      { type: "input", tokens: 200, model: "gemini-different-model" },
+    ])("should record token usage for $type type with $tokens tokens for model $model", ({
+      type,
+      tokens,
+      model,
+    }) => {
+      initializeMetricsModule(mockConfig);
+      mockCounterAddFn.mockClear();
 
-        recordTokenUsageMetricsModule(mockConfig, tokens, {
-          model,
-          type: type as 'input' | 'output' | 'thought' | 'cache' | 'tool',
-        });
+      recordTokenUsageMetricsModule(mockConfig, tokens, {
+        model,
+        type: type as "input" | "output" | "thought" | "cache" | "tool",
+      });
 
-        expect(mockCounterAddFn).toHaveBeenCalledWith(tokens, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model,
-          type,
-        });
-      },
-    );
+      expect(mockCounterAddFn).toHaveBeenCalledWith(tokens, {
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        model,
+        type,
+      });
+    });
   });
 
-  describe('recordLinesChanged metric', () => {
+  describe("recordLinesChanged metric", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record lines added/removed if not initialized', () => {
-      recordLinesChangedModule(mockConfig, 10, 'added', {
-        function_name: 'fn',
+    it("should not record lines added/removed if not initialized", () => {
+      recordLinesChangedModule(mockConfig, 10, "added", {
+        function_name: "fn",
       });
-      recordLinesChangedModule(mockConfig, 5, 'removed', {
-        function_name: 'fn',
+      recordLinesChangedModule(mockConfig, 5, "removed", {
+        function_name: "fn",
       });
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('should record lines added with function_name after initialization', () => {
+    it("should record lines added with function_name after initialization", () => {
       initializeMetricsModule(mockConfig);
       mockCounterAddFn.mockClear();
-      recordLinesChangedModule(mockConfig, 10, 'added', {
-        function_name: 'my-fn',
+      recordLinesChangedModule(mockConfig, 10, "added", {
+        function_name: "my-fn",
       });
       expect(mockCounterAddFn).toHaveBeenCalledWith(10, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        type: 'added',
-        function_name: 'my-fn',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        type: "added",
+        function_name: "my-fn",
       });
     });
 
-    it('should record lines removed with function_name after initialization', () => {
+    it("should record lines removed with function_name after initialization", () => {
       initializeMetricsModule(mockConfig);
       mockCounterAddFn.mockClear();
-      recordLinesChangedModule(mockConfig, 7, 'removed', {
-        function_name: 'my-fn',
+      recordLinesChangedModule(mockConfig, 7, "removed", {
+        function_name: "my-fn",
       });
       expect(mockCounterAddFn).toHaveBeenCalledWith(7, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        type: 'removed',
-        function_name: 'my-fn',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        type: "removed",
+        function_name: "my-fn",
       });
     });
   });
 
-  describe('recordFileOperationMetric', () => {
+  describe("recordFileOperationMetric", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
@@ -376,49 +357,49 @@ describe('Telemetry Metrics', () => {
 
     it.each<FileOperationTestCase>([
       {
-        name: 'should not record metrics if not initialized',
+        name: "should not record metrics if not initialized",
         initialized: false,
         attributes: {
           operation: FileOperation.CREATE,
           lines: 10,
-          mimetype: 'text/plain',
-          extension: 'txt',
+          mimetype: "text/plain",
+          extension: "txt",
         },
         shouldCall: false,
       },
       {
-        name: 'should record file creation with all attributes',
+        name: "should record file creation with all attributes",
         initialized: true,
         attributes: {
           operation: FileOperation.CREATE,
           lines: 10,
-          mimetype: 'text/plain',
-          extension: 'txt',
+          mimetype: "text/plain",
+          extension: "txt",
         },
         shouldCall: true,
       },
       {
-        name: 'should record file read with minimal attributes',
+        name: "should record file read with minimal attributes",
         initialized: true,
         attributes: { operation: FileOperation.READ },
         shouldCall: true,
       },
       {
-        name: 'should record file update with some attributes',
+        name: "should record file update with some attributes",
         initialized: true,
         attributes: {
           operation: FileOperation.UPDATE,
-          mimetype: 'application/javascript',
+          mimetype: "application/javascript",
         },
         shouldCall: true,
       },
       {
-        name: 'should record file update with no optional attributes',
+        name: "should record file update with no optional attributes",
         initialized: true,
         attributes: { operation: FileOperation.UPDATE },
         shouldCall: true,
       },
-    ])('$name', ({ initialized, attributes, shouldCall }) => {
+    ])("$name", ({ initialized, attributes, shouldCall }) => {
       if (initialized) {
         initializeMetricsModule(mockConfig);
         // The session start event also calls the counter.
@@ -429,9 +410,9 @@ describe('Telemetry Metrics', () => {
 
       if (shouldCall) {
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
           ...attributes,
         });
       } else {
@@ -440,18 +421,18 @@ describe('Telemetry Metrics', () => {
     });
   });
 
-  describe('recordModelRoutingMetrics', () => {
+  describe("recordModelRoutingMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record metrics if not initialized', () => {
+    it("should not record metrics if not initialized", () => {
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         100,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
@@ -460,70 +441,70 @@ describe('Telemetry Metrics', () => {
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('should record latency for a successful routing decision', () => {
+    it("should record latency for a successful routing decision", () => {
       initializeMetricsModule(mockConfig);
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         150,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
       recordModelRoutingMetricsModule(mockConfig, event);
 
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        'routing.decision_model': 'gemini-pro',
-        'routing.decision_source': 'default',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        "routing.decision_model": "gemini-pro",
+        "routing.decision_source": "default",
       });
       // The session counter is called once on init
       expect(mockCounterAddFn).toHaveBeenCalledTimes(1);
     });
 
-    it('should record latency and failure for a failed routing decision', () => {
+    it("should record latency and failure for a failed routing decision", () => {
       initializeMetricsModule(mockConfig);
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'classifier',
+        "gemini-pro",
+        "classifier",
         200,
-        'test-reason',
+        "test-reason",
         true,
-        'test-error',
+        "test-error",
       );
       recordModelRoutingMetricsModule(mockConfig, event);
 
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(200, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        'routing.decision_model': 'gemini-pro',
-        'routing.decision_source': 'classifier',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        "routing.decision_model": "gemini-pro",
+        "routing.decision_source": "classifier",
       });
 
       expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
       expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        'routing.decision_source': 'classifier',
-        'routing.error_message': 'test-error',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        "routing.decision_source": "classifier",
+        "routing.error_message": "test-error",
       });
     });
   });
 
-  describe('recordAgentRunMetrics', () => {
+  describe("recordAgentRunMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record metrics if not initialized', () => {
+    it("should not record metrics if not initialized", () => {
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -533,14 +514,14 @@ describe('Telemetry Metrics', () => {
       expect(mockHistogramRecordFn).not.toHaveBeenCalled();
     });
 
-    it('should record agent run metrics', () => {
+    it("should record agent run metrics", () => {
       initializeMetricsModule(mockConfig);
       mockCounterAddFn.mockClear();
       mockHistogramRecordFn.mockClear();
 
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -549,232 +530,232 @@ describe('Telemetry Metrics', () => {
 
       // Verify agent run counter
       expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        agent_name: 'TestAgent',
-        terminate_reason: 'GOAL',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        agent_name: "TestAgent",
+        terminate_reason: "GOAL",
       });
 
       // Verify agent duration histogram
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(1000, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        agent_name: 'TestAgent',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        agent_name: "TestAgent",
       });
 
       // Verify agent turns histogram
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(5, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        agent_name: 'TestAgent',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        agent_name: "TestAgent",
       });
     });
   });
 
-  describe('OpenTelemetry GenAI Semantic Convention Metrics', () => {
+  describe("OpenTelemetry GenAI Semantic Convention Metrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    describe('recordGenAiClientTokenUsage', () => {
-      it('should not record metrics when not initialized', () => {
+    describe("recordGenAiClientTokenUsage", () => {
+      it("should not record metrics when not initialized", () => {
         recordGenAiClientTokenUsageModule(mockConfig, 100, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.token.type': 'input',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.token.type": "input",
         });
 
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record input token usage with correct attributes', () => {
+      it("should record input token usage with correct attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientTokenUsageModule(mockConfig, 150, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
       });
 
-      it('should record output token usage with correct attributes', () => {
+      it("should record output token usage with correct attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientTokenUsageModule(mockConfig, 75, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'output',
-          'gen_ai.request.model': 'gemini-pro',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "output",
+          "gen_ai.request.model": "gemini-pro",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(75, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'output',
-          'gen_ai.request.model': 'gemini-pro',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "output",
+          "gen_ai.request.model": "gemini-pro",
         });
       });
 
-      it('should record token usage with optional attributes', () => {
+      it("should record token usage with optional attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientTokenUsageModule(mockConfig, 200, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'text-embedding-004',
-          'server.address': 'aiplatform.googleapis.com',
-          'server.port': 443,
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "text-embedding-004",
+          "server.address": "aiplatform.googleapis.com",
+          "server.port": 443,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(200, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'text-embedding-004',
-          'server.address': 'aiplatform.googleapis.com',
-          'server.port': 443,
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "text-embedding-004",
+          "server.address": "aiplatform.googleapis.com",
+          "server.port": 443,
         });
       });
     });
 
-    describe('recordGenAiClientOperationDuration', () => {
-      it('should not record metrics when not initialized', () => {
+    describe("recordGenAiClientOperationDuration", () => {
+      it("should not record metrics when not initialized", () => {
         recordGenAiClientOperationDurationModule(mockConfig, 2.5, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
         });
 
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record successful operation duration with correct attributes', () => {
+      it("should record successful operation duration with correct attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 1.25, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(1.25, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
       });
 
-      it('should record failed operation duration with error type', () => {
+      it("should record failed operation duration with error type", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 3.75, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-pro',
-          'error.type': 'quota_exceeded',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-pro",
+          "error.type": "quota_exceeded",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(3.75, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-pro',
-          'error.type': 'quota_exceeded',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-pro",
+          "error.type": "quota_exceeded",
         });
       });
 
-      it('should record operation duration with server details', () => {
+      it("should record operation duration with server details", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 0.95, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-1.5-pro',
-          'gen_ai.response.model': 'gemini-1.5-pro-001',
-          'server.address': 'us-central1-aiplatform.googleapis.com',
-          'server.port': 443,
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-1.5-pro",
+          "gen_ai.response.model": "gemini-1.5-pro-001",
+          "server.address": "us-central1-aiplatform.googleapis.com",
+          "server.port": 443,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(0.95, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-1.5-pro',
-          'gen_ai.response.model': 'gemini-1.5-pro-001',
-          'server.address': 'us-central1-aiplatform.googleapis.com',
-          'server.port': 443,
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-1.5-pro",
+          "gen_ai.response.model": "gemini-1.5-pro-001",
+          "server.address": "us-central1-aiplatform.googleapis.com",
+          "server.port": 443,
         });
       });
 
-      it('should handle minimal required attributes', () => {
+      it("should handle minimal required attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 2.1, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(2.1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
         });
       });
     });
   });
 
-  describe('Performance Monitoring Metrics', () => {
+  describe("Performance Monitoring Metrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    describe('recordStartupPerformance', () => {
-      it('should not record metrics when performance monitoring is disabled', async () => {
+    describe("recordStartupPerformance", () => {
+      it("should not record metrics when performance monitoring is disabled", async () => {
         // Re-import with performance monitoring disabled by mocking the config
         const mockConfigDisabled = {
-          getSessionId: () => 'test-session-id',
+          getSessionId: () => "test-session-id",
           getTelemetryEnabled: () => false, // Disable telemetry to disable performance monitoring
         } as unknown as Config;
 
@@ -782,101 +763,98 @@ describe('Telemetry Metrics', () => {
         mockHistogramRecordFn.mockClear();
 
         recordStartupPerformanceModule(mockConfigDisabled, 100, {
-          phase: 'settings_loading',
+          phase: "settings_loading",
           details: {
-            auth_type: 'gemini',
+            auth_type: "gemini",
           },
         });
 
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record startup performance with phase and details', () => {
+      it("should record startup performance with phase and details", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordStartupPerformanceModule(mockConfig, 150, {
-          phase: 'settings_loading',
+          phase: "settings_loading",
           details: {
-            auth_type: 'gemini',
+            auth_type: "gemini",
             telemetry_enabled: true,
             settings_sources: 2,
           },
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          phase: 'settings_loading',
-          auth_type: 'gemini',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          phase: "settings_loading",
+          auth_type: "gemini",
           telemetry_enabled: true,
           settings_sources: 2,
         });
       });
 
-      it('should record startup performance without details', () => {
+      it("should record startup performance without details", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
-        recordStartupPerformanceModule(mockConfig, 50, { phase: 'cleanup' });
+        recordStartupPerformanceModule(mockConfig, 50, { phase: "cleanup" });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(50, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          phase: 'cleanup',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          phase: "cleanup",
         });
       });
 
-      it('should handle floating-point duration values from performance.now()', () => {
+      it("should handle floating-point duration values from performance.now()", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         // Test with realistic floating-point values that performance.now() would return
         const floatingPointDuration = 123.45678;
         recordStartupPerformanceModule(mockConfig, floatingPointDuration, {
-          phase: 'total_startup',
+          phase: "total_startup",
           details: {
             is_tty: true,
             has_question: false,
           },
         });
 
-        expect(mockHistogramRecordFn).toHaveBeenCalledWith(
-          floatingPointDuration,
-          {
-            'session.id': 'test-session-id',
-            'installation.id': 'test-installation-id',
-            'user.email': 'test@example.com',
-            phase: 'total_startup',
-            is_tty: true,
-            has_question: false,
-          },
-        );
+        expect(mockHistogramRecordFn).toHaveBeenCalledWith(floatingPointDuration, {
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          phase: "total_startup",
+          is_tty: true,
+          has_question: false,
+        });
       });
     });
 
-    describe('recordMemoryUsage', () => {
+    describe("recordMemoryUsage", () => {
       it.each([
         {
           memory_type: MemoryMetricType.HEAP_USED,
-          component: 'startup',
+          component: "startup",
           value: 15728640,
         },
         {
           memory_type: MemoryMetricType.HEAP_TOTAL,
-          component: 'api_call',
+          component: "api_call",
           value: 31457280,
         },
         {
           memory_type: MemoryMetricType.EXTERNAL,
-          component: 'tool_execution',
+          component: "tool_execution",
           value: 2097152,
         },
         {
           memory_type: MemoryMetricType.RSS,
-          component: 'memory_monitor',
+          component: "memory_monitor",
           value: 41943040,
         },
         {
@@ -884,348 +862,342 @@ describe('Telemetry Metrics', () => {
           component: undefined,
           value: 15728640,
         },
-      ])(
-        'should record memory usage for $memory_type',
-        ({ memory_type, component, value }) => {
-          initializeMetricsModule(mockConfig);
-          mockHistogramRecordFn.mockClear();
-
-          recordMemoryUsageModule(mockConfig, value, {
-            memory_type,
-            component,
-          });
-
-          const expectedAttributes: Record<string, unknown> = {
-            'session.id': 'test-session-id',
-            'installation.id': 'test-installation-id',
-            'user.email': 'test@example.com',
-            memory_type,
-          };
-
-          if (component) {
-            expectedAttributes['component'] = component;
-          }
-
-          expect(mockHistogramRecordFn).toHaveBeenCalledWith(
-            value,
-            expectedAttributes,
-          );
-        },
-      );
+      ])("should record memory usage for $memory_type", ({ memory_type, component, value }) => {
+        initializeMetricsModule(mockConfig);
+        mockHistogramRecordFn.mockClear();
+
+        recordMemoryUsageModule(mockConfig, value, {
+          memory_type,
+          component,
+        });
+
+        const expectedAttributes: Record<string, unknown> = {
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          memory_type,
+        };
+
+        if (component) {
+          expectedAttributes["component"] = component;
+        }
+
+        expect(mockHistogramRecordFn).toHaveBeenCalledWith(value, expectedAttributes);
+      });
     });
 
-    describe('recordCpuUsage', () => {
-      it('should record CPU usage percentage', () => {
+    describe("recordCpuUsage", () => {
+      it("should record CPU usage percentage", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordCpuUsageModule(mockConfig, 85.5, {
-          component: 'tool_execution',
+          component: "tool_execution",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(85.5, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          component: 'tool_execution',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          component: "tool_execution",
         });
       });
 
-      it('should record CPU usage without component', () => {
+      it("should record CPU usage without component", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordCpuUsageModule(mockConfig, 42.3, {});
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(42.3, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
         });
       });
     });
 
-    describe('recordToolQueueDepth', () => {
-      it('should record tool queue depth', () => {
+    describe("recordToolQueueDepth", () => {
+      it("should record tool queue depth", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolQueueDepthModule(mockConfig, 3);
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(3, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
         });
       });
 
-      it('should record zero queue depth', () => {
+      it("should record zero queue depth", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolQueueDepthModule(mockConfig, 0);
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(0, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
         });
       });
     });
 
-    describe('recordToolExecutionBreakdown', () => {
-      it('should record tool execution breakdown for all phases', () => {
+    describe("recordToolExecutionBreakdown", () => {
+      it("should record tool execution breakdown for all phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolExecutionBreakdownModule(mockConfig, 25, {
-          function_name: 'Read',
+          function_name: "Read",
           phase: ToolExecutionPhase.VALIDATION,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(25, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Read',
-          phase: 'validation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Read",
+          phase: "validation",
         });
       });
 
-      it('should record execution breakdown for different phases', () => {
+      it("should record execution breakdown for different phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolExecutionBreakdownModule(mockConfig, 50, {
-          function_name: 'Bash',
+          function_name: "Bash",
           phase: ToolExecutionPhase.PREPARATION,
         });
         recordToolExecutionBreakdownModule(mockConfig, 1500, {
-          function_name: 'Bash',
+          function_name: "Bash",
           phase: ToolExecutionPhase.EXECUTION,
         });
         recordToolExecutionBreakdownModule(mockConfig, 75, {
-          function_name: 'Bash',
+          function_name: "Bash",
           phase: ToolExecutionPhase.RESULT_PROCESSING,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledTimes(3); // One for each call
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(1, 50, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Bash',
-          phase: 'preparation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Bash",
+          phase: "preparation",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 1500, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Bash',
-          phase: 'execution',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Bash",
+          phase: "execution",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 75, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Bash',
-          phase: 'result_processing',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Bash",
+          phase: "result_processing",
         });
       });
     });
 
-    describe('recordTokenEfficiency', () => {
-      it('should record token efficiency metrics', () => {
+    describe("recordTokenEfficiency", () => {
+      it("should record token efficiency metrics", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordTokenEfficiencyModule(mockConfig, 0.85, {
-          model: 'gemini-pro',
-          metric: 'cache_hit_rate',
-          context: 'api_request',
+          model: "gemini-pro",
+          metric: "cache_hit_rate",
+          context: "api_request",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(0.85, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          metric: 'cache_hit_rate',
-          context: 'api_request',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          metric: "cache_hit_rate",
+          context: "api_request",
         });
       });
 
-      it('should record token efficiency without context', () => {
+      it("should record token efficiency without context", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordTokenEfficiencyModule(mockConfig, 125.5, {
-          model: 'gemini-pro',
-          metric: 'tokens_per_operation',
+          model: "gemini-pro",
+          metric: "tokens_per_operation",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(125.5, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          metric: 'tokens_per_operation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          metric: "tokens_per_operation",
         });
       });
     });
 
-    describe('recordApiRequestBreakdown', () => {
-      it('should record API request breakdown for all phases', () => {
+    describe("recordApiRequestBreakdown", () => {
+      it("should record API request breakdown for all phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordApiRequestBreakdownModule(mockConfig, 15, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.REQUEST_PREPARATION,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(15, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'request_preparation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "request_preparation",
         });
       });
 
-      it('should record API request breakdown for different phases', () => {
+      it("should record API request breakdown for different phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordApiRequestBreakdownModule(mockConfig, 250, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.NETWORK_LATENCY,
         });
         recordApiRequestBreakdownModule(mockConfig, 100, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.RESPONSE_PROCESSING,
         });
         recordApiRequestBreakdownModule(mockConfig, 50, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.TOKEN_PROCESSING,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledTimes(3); // One for each call
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(1, 250, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'network_latency',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "network_latency",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 100, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'response_processing',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "response_processing",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 50, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'token_processing',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "token_processing",
         });
       });
     });
 
-    describe('recordPerformanceScore', () => {
-      it('should record performance score with category and baseline', () => {
+    describe("recordPerformanceScore", () => {
+      it("should record performance score with category and baseline", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceScoreModule(mockConfig, 85.5, {
-          category: 'memory_efficiency',
+          category: "memory_efficiency",
           baseline: 80.0,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(85.5, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          category: 'memory_efficiency',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          category: "memory_efficiency",
           baseline: 80.0,
         });
       });
 
-      it('should record performance score without baseline', () => {
+      it("should record performance score without baseline", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceScoreModule(mockConfig, 92.3, {
-          category: 'overall_performance',
+          category: "overall_performance",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(92.3, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          category: 'overall_performance',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          category: "overall_performance",
         });
       });
     });
 
-    describe('recordPerformanceRegression', () => {
-      it('should record performance regression with baseline comparison', () => {
+    describe("recordPerformanceRegression", () => {
+      it("should record performance regression with baseline comparison", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'startup_time',
+          metric: "startup_time",
           current_value: 1200,
           baseline_value: 1000,
-          severity: 'medium',
+          severity: "medium",
         });
 
         // Verify regression counter
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'startup_time',
-          severity: 'medium',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "startup_time",
+          severity: "medium",
           current_value: 1200,
           baseline_value: 1000,
         });
 
         // Verify baseline comparison histogram (20% increase)
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(20, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'startup_time',
-          severity: 'medium',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "startup_time",
+          severity: "medium",
           current_value: 1200,
           baseline_value: 1000,
         });
       });
 
-      it('should handle zero baseline value gracefully', () => {
+      it("should handle zero baseline value gracefully", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'memory_usage',
+          metric: "memory_usage",
           current_value: 100,
           baseline_value: 0,
-          severity: 'high',
+          severity: "high",
         });
 
         // Verify regression counter still recorded
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'memory_usage',
-          severity: 'high',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "memory_usage",
+          severity: "high",
           current_value: 100,
           baseline_value: 0,
         });
@@ -1234,219 +1206,198 @@ describe('Telemetry Metrics', () => {
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record different severity levels', () => {
+      it("should record different severity levels", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
 
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'api_latency',
+          metric: "api_latency",
           current_value: 500,
           baseline_value: 400,
-          severity: 'low',
+          severity: "low",
         });
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'cpu_usage',
+          metric: "cpu_usage",
           current_value: 90,
           baseline_value: 70,
-          severity: 'high',
+          severity: "high",
         });
 
         expect(mockCounterAddFn).toHaveBeenNthCalledWith(1, 1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'api_latency',
-          severity: 'low',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "api_latency",
+          severity: "low",
           current_value: 500,
           baseline_value: 400,
         });
         expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'cpu_usage',
-          severity: 'high',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "cpu_usage",
+          severity: "high",
           current_value: 90,
           baseline_value: 70,
         });
       });
     });
 
-    describe('recordBaselineComparison', () => {
-      it('should record baseline comparison with percentage change', () => {
+    describe("recordBaselineComparison", () => {
+      it("should record baseline comparison with percentage change", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordBaselineComparisonModule(mockConfig, {
-          metric: 'memory_usage',
+          metric: "memory_usage",
           current_value: 120,
           baseline_value: 100,
-          category: 'performance_tracking',
+          category: "performance_tracking",
         });
 
         // 20% increase: (120 - 100) / 100 * 100 = 20%
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(20, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'memory_usage',
-          category: 'performance_tracking',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "memory_usage",
+          category: "performance_tracking",
           current_value: 120,
           baseline_value: 100,
         });
       });
 
-      it('should handle negative percentage change (improvement)', () => {
+      it("should handle negative percentage change (improvement)", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordBaselineComparisonModule(mockConfig, {
-          metric: 'startup_time',
+          metric: "startup_time",
           current_value: 800,
           baseline_value: 1000,
-          category: 'optimization',
+          category: "optimization",
         });
 
         // 20% decrease: (800 - 1000) / 1000 * 100 = -20%
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(-20, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'startup_time',
-          category: 'optimization',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "startup_time",
+          category: "optimization",
           current_value: 800,
           baseline_value: 1000,
         });
       });
 
-      it('should skip recording when baseline is zero', async () => {
+      it("should skip recording when baseline is zero", async () => {
         // Access the actual mocked module
-        const mockedModule = (await vi.importMock('@opentelemetry/api')) as {
+        const mockedModule = (await vi.importMock("@opentelemetry/api")) as {
           diag: { warn: ReturnType<typeof vi.fn> };
         };
-        const diagSpy = vi.spyOn(mockedModule.diag, 'warn');
+        const diagSpy = vi.spyOn(mockedModule.diag, "warn");
 
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordBaselineComparisonModule(mockConfig, {
-          metric: 'new_metric',
+          metric: "new_metric",
           current_value: 50,
           baseline_value: 0,
-          category: 'testing',
+          category: "testing",
         });
 
-        expect(diagSpy).toHaveBeenCalledWith(
-          'Baseline value is zero, skipping comparison.',
-        );
+        expect(diagSpy).toHaveBeenCalledWith("Baseline value is zero, skipping comparison.");
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
     });
 
-    describe('recordHookCallMetrics', () => {
-      let recordHookCallMetricsModule: typeof import('./metrics.js').recordHookCallMetrics;
+    describe("recordHookCallMetrics", () => {
+      let recordHookCallMetricsModule: typeof import("./metrics.js").recordHookCallMetrics;
 
       beforeEach(async () => {
-        recordHookCallMetricsModule = (await import('./metrics.js'))
-          .recordHookCallMetrics;
+        recordHookCallMetricsModule = (await import("./metrics.js")).recordHookCallMetrics;
       });
 
-      it('should record hook call metrics with counter and histogram', () => {
+      it("should record hook call metrics with counter and histogram", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
         mockHistogramRecordFn.mockClear();
 
-        recordHookCallMetricsModule(
-          mockConfig,
-          'BeforeTool',
-          'test-hook',
-          150,
-          true,
-        );
+        recordHookCallMetricsModule(mockConfig, "BeforeTool", "test-hook", 150, true);
 
         // Verify counter recorded
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          hook_event_name: 'BeforeTool',
-          hook_name: 'test-hook',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          hook_event_name: "BeforeTool",
+          hook_name: "test-hook",
           success: true,
         });
 
         // Verify histogram recorded
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          hook_event_name: 'BeforeTool',
-          hook_name: 'test-hook',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          hook_event_name: "BeforeTool",
+          hook_name: "test-hook",
           success: true,
         });
       });
 
-      it('should always sanitize hook names regardless of content', () => {
+      it("should always sanitize hook names regardless of content", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
 
         // Test with a command that has sensitive information
         recordHookCallMetricsModule(
           mockConfig,
-          'BeforeTool',
-          '/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123',
+          "BeforeTool",
+          "/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123",
           150,
           true,
         );
 
         // Verify hook name is sanitized (detailed sanitization tested in hook-call-event.test.ts)
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          hook_event_name: 'BeforeTool',
-          hook_name: 'check-secrets.sh', // Sanitized
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          hook_event_name: "BeforeTool",
+          hook_name: "check-secrets.sh", // Sanitized
           success: true,
         });
       });
 
-      it('should track both success and failure', () => {
+      it("should track both success and failure", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
 
         // Success case
-        recordHookCallMetricsModule(
-          mockConfig,
-          'BeforeTool',
-          'test-hook',
-          100,
-          true,
-        );
+        recordHookCallMetricsModule(mockConfig, "BeforeTool", "test-hook", 100, true);
 
         expect(mockCounterAddFn).toHaveBeenNthCalledWith(
           1,
           1,
           expect.objectContaining({
-            hook_event_name: 'BeforeTool',
-            hook_name: 'test-hook',
+            hook_event_name: "BeforeTool",
+            hook_name: "test-hook",
             success: true,
           }),
         );
 
         // Failure case
-        recordHookCallMetricsModule(
-          mockConfig,
-          'AfterTool',
-          'test-hook',
-          150,
-          false,
-        );
+        recordHookCallMetricsModule(mockConfig, "AfterTool", "test-hook", 150, false);
 
         expect(mockCounterAddFn).toHaveBeenNthCalledWith(
           2,
           1,
           expect.objectContaining({
-            hook_event_name: 'AfterTool',
-            hook_name: 'test-hook',
+            hook_event_name: "AfterTool",
+            hook_name: "test-hook",
             success: false,
           }),
         );
diff --git a/packages/gemini-cli-core/src/telemetry/metrics.ts b/packages/gemini-cli-core/src/telemetry/metrics.ts
index 648fb046c..3e228e1b8 100644
--- a/packages/gemini-cli-core/src/telemetry/metrics.ts
+++ b/packages/gemini-cli-core/src/telemetry/metrics.ts
@@ -4,68 +4,64 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Attributes, Meter, Counter, Histogram } from '@opentelemetry/api';
-import { diag, metrics, ValueType } from '@opentelemetry/api';
-import { SERVICE_NAME } from './constants.js';
-import type { Config } from '../config/config.js';
+import type { Attributes, Counter, Histogram, Meter } from "@opentelemetry/api";
+import { diag, metrics, ValueType } from "@opentelemetry/api";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { SERVICE_NAME } from "./constants.js";
+import { sanitizeHookName } from "./sanitize.js";
+import { getCommonAttributes } from "./telemetryAttributes.js";
 import type {
+  AgentFinishEvent,
   ModelRoutingEvent,
   ModelSlashCommandEvent,
-  AgentFinishEvent,
   RecoveryAttemptEvent,
-} from './types.js';
-import { AuthType } from '../core/contentGenerator.js';
-import { getCommonAttributes } from './telemetryAttributes.js';
-import { sanitizeHookName } from './sanitize.js';
-
-const EVENT_CHAT_COMPRESSION = 'gemini_cli.chat_compression';
-const TOOL_CALL_COUNT = 'gemini_cli.tool.call.count';
-const TOOL_CALL_LATENCY = 'gemini_cli.tool.call.latency';
-const API_REQUEST_COUNT = 'gemini_cli.api.request.count';
-const API_REQUEST_LATENCY = 'gemini_cli.api.request.latency';
-const TOKEN_USAGE = 'gemini_cli.token.usage';
-const SESSION_COUNT = 'gemini_cli.session.count';
-const FILE_OPERATION_COUNT = 'gemini_cli.file.operation.count';
-const LINES_CHANGED = 'gemini_cli.lines.changed';
-const INVALID_CHUNK_COUNT = 'gemini_cli.chat.invalid_chunk.count';
-const CONTENT_RETRY_COUNT = 'gemini_cli.chat.content_retry.count';
-const CONTENT_RETRY_FAILURE_COUNT =
-  'gemini_cli.chat.content_retry_failure.count';
-const MODEL_ROUTING_LATENCY = 'gemini_cli.model_routing.latency';
-const MODEL_ROUTING_FAILURE_COUNT = 'gemini_cli.model_routing.failure.count';
-const MODEL_SLASH_COMMAND_CALL_COUNT =
-  'gemini_cli.slash_command.model.call_count';
-const EVENT_HOOK_CALL_COUNT = 'gemini_cli.hook_call.count';
-const EVENT_HOOK_CALL_LATENCY = 'gemini_cli.hook_call.latency';
+} from "./types.js";
+
+const EVENT_CHAT_COMPRESSION = "gemini_cli.chat_compression";
+const TOOL_CALL_COUNT = "gemini_cli.tool.call.count";
+const TOOL_CALL_LATENCY = "gemini_cli.tool.call.latency";
+const API_REQUEST_COUNT = "gemini_cli.api.request.count";
+const API_REQUEST_LATENCY = "gemini_cli.api.request.latency";
+const TOKEN_USAGE = "gemini_cli.token.usage";
+const SESSION_COUNT = "gemini_cli.session.count";
+const FILE_OPERATION_COUNT = "gemini_cli.file.operation.count";
+const LINES_CHANGED = "gemini_cli.lines.changed";
+const INVALID_CHUNK_COUNT = "gemini_cli.chat.invalid_chunk.count";
+const CONTENT_RETRY_COUNT = "gemini_cli.chat.content_retry.count";
+const CONTENT_RETRY_FAILURE_COUNT = "gemini_cli.chat.content_retry_failure.count";
+const MODEL_ROUTING_LATENCY = "gemini_cli.model_routing.latency";
+const MODEL_ROUTING_FAILURE_COUNT = "gemini_cli.model_routing.failure.count";
+const MODEL_SLASH_COMMAND_CALL_COUNT = "gemini_cli.slash_command.model.call_count";
+const EVENT_HOOK_CALL_COUNT = "gemini_cli.hook_call.count";
+const EVENT_HOOK_CALL_LATENCY = "gemini_cli.hook_call.latency";
 
 // Agent Metrics
-const AGENT_RUN_COUNT = 'gemini_cli.agent.run.count';
-const AGENT_DURATION_MS = 'gemini_cli.agent.duration';
-const AGENT_TURNS = 'gemini_cli.agent.turns';
-const AGENT_RECOVERY_ATTEMPT_COUNT = 'gemini_cli.agent.recovery_attempt.count';
-const AGENT_RECOVERY_ATTEMPT_DURATION =
-  'gemini_cli.agent.recovery_attempt.duration';
+const AGENT_RUN_COUNT = "gemini_cli.agent.run.count";
+const AGENT_DURATION_MS = "gemini_cli.agent.duration";
+const AGENT_TURNS = "gemini_cli.agent.turns";
+const AGENT_RECOVERY_ATTEMPT_COUNT = "gemini_cli.agent.recovery_attempt.count";
+const AGENT_RECOVERY_ATTEMPT_DURATION = "gemini_cli.agent.recovery_attempt.duration";
 
 // OpenTelemetry GenAI Semantic Convention Metrics
-const GEN_AI_CLIENT_TOKEN_USAGE = 'gen_ai.client.token.usage';
-const GEN_AI_CLIENT_OPERATION_DURATION = 'gen_ai.client.operation.duration';
+const GEN_AI_CLIENT_TOKEN_USAGE = "gen_ai.client.token.usage";
+const GEN_AI_CLIENT_OPERATION_DURATION = "gen_ai.client.operation.duration";
 
 // Performance Monitoring Metrics
-const STARTUP_TIME = 'gemini_cli.startup.duration';
-const MEMORY_USAGE = 'gemini_cli.memory.usage';
-const CPU_USAGE = 'gemini_cli.cpu.usage';
-const TOOL_QUEUE_DEPTH = 'gemini_cli.tool.queue.depth';
-const TOOL_EXECUTION_BREAKDOWN = 'gemini_cli.tool.execution.breakdown';
-const TOKEN_EFFICIENCY = 'gemini_cli.token.efficiency';
-const API_REQUEST_BREAKDOWN = 'gemini_cli.api.request.breakdown';
-const PERFORMANCE_SCORE = 'gemini_cli.performance.score';
-const REGRESSION_DETECTION = 'gemini_cli.performance.regression';
-const REGRESSION_PERCENTAGE_CHANGE =
-  'gemini_cli.performance.regression.percentage_change';
-const BASELINE_COMPARISON = 'gemini_cli.performance.baseline.comparison';
-const FLICKER_FRAME_COUNT = 'gemini_cli.ui.flicker.count';
-const SLOW_RENDER_LATENCY = 'gemini_cli.ui.slow_render.latency';
-const EXIT_FAIL_COUNT = 'gemini_cli.exit.fail.count';
+const STARTUP_TIME = "gemini_cli.startup.duration";
+const MEMORY_USAGE = "gemini_cli.memory.usage";
+const CPU_USAGE = "gemini_cli.cpu.usage";
+const TOOL_QUEUE_DEPTH = "gemini_cli.tool.queue.depth";
+const TOOL_EXECUTION_BREAKDOWN = "gemini_cli.tool.execution.breakdown";
+const TOKEN_EFFICIENCY = "gemini_cli.token.efficiency";
+const API_REQUEST_BREAKDOWN = "gemini_cli.api.request.breakdown";
+const PERFORMANCE_SCORE = "gemini_cli.performance.score";
+const REGRESSION_DETECTION = "gemini_cli.performance.regression";
+const REGRESSION_PERCENTAGE_CHANGE = "gemini_cli.performance.regression.percentage_change";
+const BASELINE_COMPARISON = "gemini_cli.performance.baseline.comparison";
+const FLICKER_FRAME_COUNT = "gemini_cli.ui.flicker.count";
+const SLOW_RENDER_LATENCY = "gemini_cli.ui.slow_render.latency";
+const EXIT_FAIL_COUNT = "gemini_cli.exit.fail.count";
 
 const baseMetricDefinition = {
   getCommonAttributes,
@@ -73,18 +69,18 @@ const baseMetricDefinition = {
 
 const COUNTER_DEFINITIONS = {
   [TOOL_CALL_COUNT]: {
-    description: 'Counts tool calls, tagged by function name and success.',
+    description: "Counts tool calls, tagged by function name and success.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (toolCallCounter = c),
     attributes: {} as {
       function_name: string;
       success: boolean;
-      decision?: 'accept' | 'reject' | 'modify' | 'auto_accept';
-      tool_type?: 'native' | 'mcp';
+      decision?: "accept" | "reject" | "modify" | "auto_accept";
+      tool_type?: "native" | "mcp";
     },
   },
   [API_REQUEST_COUNT]: {
-    description: 'Counts API requests, tagged by model and status.',
+    description: "Counts API requests, tagged by model and status.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (apiRequestCounter = c),
     attributes: {} as {
@@ -94,22 +90,22 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [TOKEN_USAGE]: {
-    description: 'Counts the total number of tokens used.',
+    description: "Counts the total number of tokens used.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (tokenUsageCounter = c),
     attributes: {} as {
       model: string;
-      type: 'input' | 'output' | 'thought' | 'cache' | 'tool';
+      type: "input" | "output" | "thought" | "cache" | "tool";
     },
   },
   [SESSION_COUNT]: {
-    description: 'Count of CLI sessions started.',
+    description: "Count of CLI sessions started.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (sessionCounter = c),
     attributes: {} as Record<string, never>,
   },
   [FILE_OPERATION_COUNT]: {
-    description: 'Counts file operations (create, read, update).',
+    description: "Counts file operations (create, read, update).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (fileOperationCounter = c),
     attributes: {} as {
@@ -121,51 +117,51 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [LINES_CHANGED]: {
-    description: 'Number of lines changed (from file diffs).',
+    description: "Number of lines changed (from file diffs).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (linesChangedCounter = c),
     attributes: {} as {
       function_name?: string;
-      type: 'added' | 'removed';
+      type: "added" | "removed";
     },
   },
   [INVALID_CHUNK_COUNT]: {
-    description: 'Counts invalid chunks received from a stream.',
+    description: "Counts invalid chunks received from a stream.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (invalidChunkCounter = c),
     attributes: {} as Record<string, never>,
   },
   [CONTENT_RETRY_COUNT]: {
-    description: 'Counts retries due to content errors (e.g., empty stream).',
+    description: "Counts retries due to content errors (e.g., empty stream).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (contentRetryCounter = c),
     attributes: {} as Record<string, never>,
   },
   [CONTENT_RETRY_FAILURE_COUNT]: {
-    description: 'Counts occurrences of all content retries failing.',
+    description: "Counts occurrences of all content retries failing.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (contentRetryFailureCounter = c),
     attributes: {} as Record<string, never>,
   },
   [MODEL_ROUTING_FAILURE_COUNT]: {
-    description: 'Counts model routing failures.',
+    description: "Counts model routing failures.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (modelRoutingFailureCounter = c),
     attributes: {} as {
-      'routing.decision_source': string;
-      'routing.error_message': string;
+      "routing.decision_source": string;
+      "routing.error_message": string;
     },
   },
   [MODEL_SLASH_COMMAND_CALL_COUNT]: {
-    description: 'Counts model slash command calls.',
+    description: "Counts model slash command calls.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (modelSlashCommandCallCounter = c),
     attributes: {} as {
-      'slash_command.model.model_name': string;
+      "slash_command.model.model_name": string;
     },
   },
   [EVENT_CHAT_COMPRESSION]: {
-    description: 'Counts chat compression events.',
+    description: "Counts chat compression events.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (chatCompressionCounter = c),
     attributes: {} as {
@@ -174,7 +170,7 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [AGENT_RUN_COUNT]: {
-    description: 'Counts agent runs, tagged by name and termination reason.',
+    description: "Counts agent runs, tagged by name and termination reason.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (agentRunCounter = c),
     attributes: {} as {
@@ -183,7 +179,7 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [AGENT_RECOVERY_ATTEMPT_COUNT]: {
-    description: 'Counts agent recovery attempts.',
+    description: "Counts agent recovery attempts.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (agentRecoveryAttemptCounter = c),
     attributes: {} as {
@@ -193,20 +189,19 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [FLICKER_FRAME_COUNT]: {
-    description:
-      'Counts UI frames that flicker (render taller than the terminal).',
+    description: "Counts UI frames that flicker (render taller than the terminal).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (flickerFrameCounter = c),
     attributes: {} as Record<string, never>,
   },
   [EXIT_FAIL_COUNT]: {
-    description: 'Counts CLI exit failures.',
+    description: "Counts CLI exit failures.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (exitFailCounter = c),
     attributes: {} as Record<string, never>,
   },
   [EVENT_HOOK_CALL_COUNT]: {
-    description: 'Counts hook calls, tagged by hook event name and success.',
+    description: "Counts hook calls, tagged by hook event name and success.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (hookCallCounter = c),
     attributes: {} as {
@@ -219,8 +214,8 @@ const COUNTER_DEFINITIONS = {
 
 const HISTOGRAM_DEFINITIONS = {
   [TOOL_CALL_LATENCY]: {
-    description: 'Latency of tool calls in milliseconds.',
-    unit: 'ms',
+    description: "Latency of tool calls in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (toolCallLatencyHistogram = h),
     attributes: {} as {
@@ -228,8 +223,8 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [API_REQUEST_LATENCY]: {
-    description: 'Latency of API requests in milliseconds.',
-    unit: 'ms',
+    description: "Latency of API requests in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (apiRequestLatencyHistogram = h),
     attributes: {} as {
@@ -237,18 +232,18 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [MODEL_ROUTING_LATENCY]: {
-    description: 'Latency of model routing decisions in milliseconds.',
-    unit: 'ms',
+    description: "Latency of model routing decisions in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (modelRoutingLatencyHistogram = h),
     attributes: {} as {
-      'routing.decision_model': string;
-      'routing.decision_source': string;
+      "routing.decision_model": string;
+      "routing.decision_source": string;
     },
   },
   [AGENT_DURATION_MS]: {
-    description: 'Duration of agent runs in milliseconds.',
-    unit: 'ms',
+    description: "Duration of agent runs in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (agentDurationHistogram = h),
     attributes: {} as {
@@ -256,15 +251,15 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [SLOW_RENDER_LATENCY]: {
-    description: 'Counts UI frames that take too long to render.',
-    unit: 'ms',
+    description: "Counts UI frames that take too long to render.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (slowRenderHistogram = h),
     attributes: {} as Record<string, never>,
   },
   [AGENT_TURNS]: {
-    description: 'Number of turns taken by agents.',
-    unit: 'turns',
+    description: "Number of turns taken by agents.",
+    unit: "turns",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (agentTurnsHistogram = h),
     attributes: {} as {
@@ -272,8 +267,8 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [AGENT_RECOVERY_ATTEMPT_DURATION]: {
-    description: 'Duration of agent recovery attempts in milliseconds.',
-    unit: 'ms',
+    description: "Duration of agent recovery attempts in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (agentRecoveryAttemptDurationHistogram = h),
     attributes: {} as {
@@ -281,38 +276,38 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [GEN_AI_CLIENT_TOKEN_USAGE]: {
-    description: 'Number of input and output tokens used.',
-    unit: 'token',
+    description: "Number of input and output tokens used.",
+    unit: "token",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (genAiClientTokenUsageHistogram = h),
     attributes: {} as {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.token.type': 'input' | 'output';
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.token.type": "input" | "output";
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
     },
   },
   [GEN_AI_CLIENT_OPERATION_DURATION]: {
-    description: 'GenAI operation duration.',
-    unit: 's',
+    description: "GenAI operation duration.",
+    unit: "s",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (genAiClientOperationDurationHistogram = h),
     attributes: {} as {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
-      'error.type'?: string;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
+      "error.type"?: string;
     },
   },
   [EVENT_HOOK_CALL_LATENCY]: {
-    description: 'Latency of hook calls in milliseconds.',
-    unit: 'ms',
+    description: "Latency of hook calls in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (c: Histogram) => (hookCallLatencyHistogram = c),
     attributes: {} as {
@@ -325,12 +320,12 @@ const HISTOGRAM_DEFINITIONS = {
 
 const PERFORMANCE_COUNTER_DEFINITIONS = {
   [REGRESSION_DETECTION]: {
-    description: 'Performance regression detection events.',
+    description: "Performance regression detection events.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (regressionDetectionCounter = c),
     attributes: {} as {
       metric: string;
-      severity: 'low' | 'medium' | 'high';
+      severity: "low" | "medium" | "high";
       current_value: number;
       baseline_value: number;
     },
@@ -339,9 +334,8 @@ const PERFORMANCE_COUNTER_DEFINITIONS = {
 
 const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
   [STARTUP_TIME]: {
-    description:
-      'CLI startup time in milliseconds, broken down by initialization phase.',
-    unit: 'ms',
+    description: "CLI startup time in milliseconds, broken down by initialization phase.",
+    unit: "ms",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (startupTimeHistogram = h),
     attributes: {} as {
@@ -350,8 +344,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [MEMORY_USAGE]: {
-    description: 'Memory usage in bytes.',
-    unit: 'bytes',
+    description: "Memory usage in bytes.",
+    unit: "bytes",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (memoryUsageGauge = h),
     attributes: {} as {
@@ -360,8 +354,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [CPU_USAGE]: {
-    description: 'CPU usage percentage.',
-    unit: 'percent',
+    description: "CPU usage percentage.",
+    unit: "percent",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (cpuUsageGauge = h),
     attributes: {} as {
@@ -369,15 +363,15 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [TOOL_QUEUE_DEPTH]: {
-    description: 'Number of tools in execution queue.',
-    unit: 'count',
+    description: "Number of tools in execution queue.",
+    unit: "count",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (toolQueueDepthGauge = h),
     attributes: {} as Record<string, never>,
   },
   [TOOL_EXECUTION_BREAKDOWN]: {
-    description: 'Tool execution time breakdown by phase in milliseconds.',
-    unit: 'ms',
+    description: "Tool execution time breakdown by phase in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (toolExecutionBreakdownHistogram = h),
     attributes: {} as {
@@ -386,9 +380,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [TOKEN_EFFICIENCY]: {
-    description:
-      'Token efficiency metrics (tokens per operation, cache hit rate, etc.).',
-    unit: 'ratio',
+    description: "Token efficiency metrics (tokens per operation, cache hit rate, etc.).",
+    unit: "ratio",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (tokenEfficiencyHistogram = h),
     attributes: {} as {
@@ -398,8 +391,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [API_REQUEST_BREAKDOWN]: {
-    description: 'API request time breakdown by phase in milliseconds.',
-    unit: 'ms',
+    description: "API request time breakdown by phase in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (apiRequestBreakdownHistogram = h),
     attributes: {} as {
@@ -408,8 +401,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [PERFORMANCE_SCORE]: {
-    description: 'Composite performance score (0-100).',
-    unit: 'score',
+    description: "Composite performance score (0-100).",
+    unit: "score",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (performanceScoreGauge = h),
     attributes: {} as {
@@ -418,22 +411,20 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [REGRESSION_PERCENTAGE_CHANGE]: {
-    description:
-      'Percentage change compared to baseline for detected regressions.',
-    unit: 'percent',
+    description: "Percentage change compared to baseline for detected regressions.",
+    unit: "percent",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (regressionPercentageChangeHistogram = h),
     attributes: {} as {
       metric: string;
-      severity: 'low' | 'medium' | 'high';
+      severity: "low" | "medium" | "high";
       current_value: number;
       baseline_value: number;
     },
   },
   [BASELINE_COMPARISON]: {
-    description:
-      'Performance comparison to established baseline (percentage change).',
-    unit: 'percent',
+    description: "Performance comparison to established baseline (percentage change).",
+    unit: "percent",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (baselineComparisonHistogram = h),
     attributes: {} as {
@@ -452,58 +443,58 @@ type AllMetricDefs = typeof COUNTER_DEFINITIONS &
 
 export type MetricDefinitions = {
   [K in keyof AllMetricDefs]: {
-    attributes: AllMetricDefs[K]['attributes'];
+    attributes: AllMetricDefs[K]["attributes"];
   };
 };
 
 export enum FileOperation {
-  CREATE = 'create',
-  READ = 'read',
-  UPDATE = 'update',
+  CREATE = "create",
+  READ = "read",
+  UPDATE = "update",
 }
 
 export enum PerformanceMetricType {
-  STARTUP = 'startup',
-  MEMORY = 'memory',
-  CPU = 'cpu',
-  TOOL_EXECUTION = 'tool_execution',
-  API_REQUEST = 'api_request',
-  TOKEN_EFFICIENCY = 'token_efficiency',
+  STARTUP = "startup",
+  MEMORY = "memory",
+  CPU = "cpu",
+  TOOL_EXECUTION = "tool_execution",
+  API_REQUEST = "api_request",
+  TOKEN_EFFICIENCY = "token_efficiency",
 }
 
 export enum MemoryMetricType {
-  HEAP_USED = 'heap_used',
-  HEAP_TOTAL = 'heap_total',
-  EXTERNAL = 'external',
-  RSS = 'rss',
+  HEAP_USED = "heap_used",
+  HEAP_TOTAL = "heap_total",
+  EXTERNAL = "external",
+  RSS = "rss",
 }
 
 export enum ToolExecutionPhase {
-  VALIDATION = 'validation',
-  PREPARATION = 'preparation',
-  EXECUTION = 'execution',
-  RESULT_PROCESSING = 'result_processing',
+  VALIDATION = "validation",
+  PREPARATION = "preparation",
+  EXECUTION = "execution",
+  RESULT_PROCESSING = "result_processing",
 }
 
 export enum ApiRequestPhase {
-  REQUEST_PREPARATION = 'request_preparation',
-  NETWORK_LATENCY = 'network_latency',
-  RESPONSE_PROCESSING = 'response_processing',
-  TOKEN_PROCESSING = 'token_processing',
+  REQUEST_PREPARATION = "request_preparation",
+  NETWORK_LATENCY = "network_latency",
+  RESPONSE_PROCESSING = "response_processing",
+  TOKEN_PROCESSING = "token_processing",
 }
 
 export enum GenAiOperationName {
-  GENERATE_CONTENT = 'generate_content',
+  GENERATE_CONTENT = "generate_content",
 }
 
 export enum GenAiProviderName {
-  GCP_GEN_AI = 'gcp.gen_ai',
-  GCP_VERTEX_AI = 'gcp.vertex_ai',
+  GCP_GEN_AI = "gcp.gen_ai",
+  GCP_VERTEX_AI = "gcp.vertex_ai",
 }
 
 export enum GenAiTokenType {
-  INPUT = 'input',
-  OUTPUT = 'output',
+  INPUT = "input",
+  OUTPUT = "output",
 }
 
 let cliMeter: Meter | undefined;
@@ -566,11 +557,9 @@ export function initializeMetrics(config: Config): void {
   if (!meter) return;
 
   // Initialize core metrics
-  Object.entries(COUNTER_DEFINITIONS).forEach(
-    ([name, { description, valueType, assign }]) => {
-      assign(meter.createCounter(name, { description, valueType }));
-    },
-  );
+  Object.entries(COUNTER_DEFINITIONS).forEach(([name, { description, valueType, assign }]) => {
+    assign(meter.createCounter(name, { description, valueType }));
+  });
 
   Object.entries(HISTOGRAM_DEFINITIONS).forEach(
     ([name, { description, unit, valueType, assign }]) => {
@@ -589,7 +578,7 @@ export function initializeMetrics(config: Config): void {
 
 export function recordChatCompressionMetrics(
   config: Config,
-  attributes: MetricDefinitions[typeof EVENT_CHAT_COMPRESSION]['attributes'],
+  attributes: MetricDefinitions[typeof EVENT_CHAT_COMPRESSION]["attributes"],
 ) {
   if (!chatCompressionCounter || !isMetricsInitialized) return;
   chatCompressionCounter.add(1, {
@@ -601,10 +590,9 @@ export function recordChatCompressionMetrics(
 export function recordToolCallMetrics(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof TOOL_CALL_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof TOOL_CALL_COUNT]["attributes"],
 ): void {
-  if (!toolCallCounter || !toolCallLatencyHistogram || !isMetricsInitialized)
-    return;
+  if (!toolCallCounter || !toolCallLatencyHistogram || !isMetricsInitialized) return;
 
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
@@ -620,7 +608,7 @@ export function recordToolCallMetrics(
 export function recordCustomTokenUsageMetrics(
   config: Config,
   tokenCount: number,
-  attributes: MetricDefinitions[typeof TOKEN_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof TOKEN_USAGE]["attributes"],
 ): void {
   if (!tokenUsageCounter || !isMetricsInitialized) return;
   tokenUsageCounter.add(tokenCount, {
@@ -632,18 +620,13 @@ export function recordCustomTokenUsageMetrics(
 export function recordCustomApiResponseMetrics(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]["attributes"],
 ): void {
-  if (
-    !apiRequestCounter ||
-    !apiRequestLatencyHistogram ||
-    !isMetricsInitialized
-  )
-    return;
+  if (!apiRequestCounter || !apiRequestLatencyHistogram || !isMetricsInitialized) return;
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
     model: attributes.model,
-    status_code: attributes.status_code ?? 'ok',
+    status_code: attributes.status_code ?? "ok",
   };
   apiRequestCounter.add(1, metricAttributes);
   apiRequestLatencyHistogram.record(durationMs, {
@@ -655,19 +638,14 @@ export function recordCustomApiResponseMetrics(
 export function recordApiErrorMetrics(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]["attributes"],
 ): void {
-  if (
-    !apiRequestCounter ||
-    !apiRequestLatencyHistogram ||
-    !isMetricsInitialized
-  )
-    return;
+  if (!apiRequestCounter || !apiRequestLatencyHistogram || !isMetricsInitialized) return;
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
     model: attributes.model,
-    status_code: attributes.status_code ?? 'error',
-    error_type: attributes.error_type ?? 'unknown',
+    status_code: attributes.status_code ?? "error",
+    error_type: attributes.error_type ?? "unknown",
   };
   apiRequestCounter.add(1, metricAttributes);
   apiRequestLatencyHistogram.record(durationMs, {
@@ -678,7 +656,7 @@ export function recordApiErrorMetrics(
 
 export function recordFileOperationMetric(
   config: Config,
-  attributes: MetricDefinitions[typeof FILE_OPERATION_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof FILE_OPERATION_COUNT]["attributes"],
 ): void {
   if (!fileOperationCounter || !isMetricsInitialized) return;
   fileOperationCounter.add(1, {
@@ -690,7 +668,7 @@ export function recordFileOperationMetric(
 export function recordLinesChanged(
   config: Config,
   lines: number,
-  changeType: 'added' | 'removed',
+  changeType: "added" | "removed",
   attributes?: { function_name?: string },
 ): void {
   if (!linesChangedCounter || !isMetricsInitialized) return;
@@ -751,59 +729,37 @@ export function recordContentRetry(config: Config): void {
  */
 export function recordContentRetryFailure(config: Config): void {
   if (!contentRetryFailureCounter || !isMetricsInitialized) return;
-  contentRetryFailureCounter.add(
-    1,
-    baseMetricDefinition.getCommonAttributes(config),
-  );
+  contentRetryFailureCounter.add(1, baseMetricDefinition.getCommonAttributes(config));
 }
 
-export function recordModelSlashCommand(
-  config: Config,
-  event: ModelSlashCommandEvent,
-): void {
+export function recordModelSlashCommand(config: Config, event: ModelSlashCommandEvent): void {
   if (!modelSlashCommandCallCounter || !isMetricsInitialized) return;
   modelSlashCommandCallCounter.add(1, {
     ...baseMetricDefinition.getCommonAttributes(config),
-    'slash_command.model.model_name': event.model_name,
+    "slash_command.model.model_name": event.model_name,
   });
 }
 
-export function recordModelRoutingMetrics(
-  config: Config,
-  event: ModelRoutingEvent,
-): void {
-  if (
-    !modelRoutingLatencyHistogram ||
-    !modelRoutingFailureCounter ||
-    !isMetricsInitialized
-  )
-    return;
+export function recordModelRoutingMetrics(config: Config, event: ModelRoutingEvent): void {
+  if (!modelRoutingLatencyHistogram || !modelRoutingFailureCounter || !isMetricsInitialized) return;
 
   modelRoutingLatencyHistogram.record(event.routing_latency_ms, {
     ...baseMetricDefinition.getCommonAttributes(config),
-    'routing.decision_model': event.decision_model,
-    'routing.decision_source': event.decision_source,
+    "routing.decision_model": event.decision_model,
+    "routing.decision_source": event.decision_source,
   });
 
   if (event.failed) {
     modelRoutingFailureCounter.add(1, {
       ...baseMetricDefinition.getCommonAttributes(config),
-      'routing.decision_source': event.decision_source,
-      'routing.error_message': event.error_message,
+      "routing.decision_source": event.decision_source,
+      "routing.error_message": event.error_message,
     });
   }
 }
 
-export function recordAgentRunMetrics(
-  config: Config,
-  event: AgentFinishEvent,
-): void {
-  if (
-    !agentRunCounter ||
-    !agentDurationHistogram ||
-    !agentTurnsHistogram ||
-    !isMetricsInitialized
-  )
+export function recordAgentRunMetrics(config: Config, event: AgentFinishEvent): void {
+  if (!agentRunCounter || !agentDurationHistogram || !agentTurnsHistogram || !isMetricsInitialized)
     return;
 
   const commonAttributes = baseMetricDefinition.getCommonAttributes(config);
@@ -825,10 +781,7 @@ export function recordAgentRunMetrics(
   });
 }
 
-export function recordRecoveryAttemptMetrics(
-  config: Config,
-  event: RecoveryAttemptEvent,
-): void {
+export function recordRecoveryAttemptMetrics(config: Config, event: RecoveryAttemptEvent): void {
   if (
     !agentRecoveryAttemptCounter ||
     !agentRecoveryAttemptDurationHistogram ||
@@ -856,7 +809,7 @@ export function recordRecoveryAttemptMetrics(
 export function recordGenAiClientTokenUsage(
   config: Config,
   tokenCount: number,
-  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_TOKEN_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_TOKEN_USAGE]["attributes"],
 ): void {
   if (!genAiClientTokenUsageHistogram || !isMetricsInitialized) return;
 
@@ -871,7 +824,7 @@ export function recordGenAiClientTokenUsage(
 export function recordGenAiClientOperationDuration(
   config: Config,
   durationSeconds: number,
-  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_OPERATION_DURATION]['attributes'],
+  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_OPERATION_DURATION]["attributes"],
 ): void {
   if (!genAiClientOperationDurationHistogram || !isMetricsInitialized) return;
 
@@ -880,29 +833,23 @@ export function recordGenAiClientOperationDuration(
     ...attributes,
   };
 
-  genAiClientOperationDurationHistogram.record(
-    durationSeconds,
-    metricAttributes,
-  );
+  genAiClientOperationDurationHistogram.record(durationSeconds, metricAttributes);
 }
 
-export function getConventionAttributes(event: {
-  model: string;
-  auth_type?: string;
-}): {
-  'gen_ai.operation.name': GenAiOperationName;
-  'gen_ai.provider.name': GenAiProviderName;
-  'gen_ai.request.model': string;
-  'gen_ai.response.model': string;
+export function getConventionAttributes(event: { model: string; auth_type?: string }): {
+  "gen_ai.operation.name": GenAiOperationName;
+  "gen_ai.provider.name": GenAiProviderName;
+  "gen_ai.request.model": string;
+  "gen_ai.response.model": string;
 } {
   const operationName = getGenAiOperationName();
   const provider = getGenAiProvider(event.auth_type);
 
   return {
-    'gen_ai.operation.name': operationName,
-    'gen_ai.provider.name': provider,
-    'gen_ai.request.model': event.model,
-    'gen_ai.response.model': event.model,
+    "gen_ai.operation.name": operationName,
+    "gen_ai.provider.name": provider,
+    "gen_ai.request.model": event.model,
+    "gen_ai.response.model": event.model,
   };
 }
 
@@ -954,7 +901,7 @@ export function initializePerformanceMonitoring(config: Config): void {
 export function recordStartupPerformance(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof STARTUP_TIME]['attributes'],
+  attributes: MetricDefinitions[typeof STARTUP_TIME]["attributes"],
 ): void {
   if (!startupTimeHistogram || !isPerformanceMonitoringEnabled) return;
 
@@ -970,7 +917,7 @@ export function recordStartupPerformance(
 export function recordMemoryUsage(
   config: Config,
   bytes: number,
-  attributes: MetricDefinitions[typeof MEMORY_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof MEMORY_USAGE]["attributes"],
 ): void {
   if (!memoryUsageGauge || !isPerformanceMonitoringEnabled) return;
 
@@ -985,7 +932,7 @@ export function recordMemoryUsage(
 export function recordCpuUsage(
   config: Config,
   percentage: number,
-  attributes: MetricDefinitions[typeof CPU_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof CPU_USAGE]["attributes"],
 ): void {
   if (!cpuUsageGauge || !isPerformanceMonitoringEnabled) return;
 
@@ -1010,10 +957,9 @@ export function recordToolQueueDepth(config: Config, queueDepth: number): void {
 export function recordToolExecutionBreakdown(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof TOOL_EXECUTION_BREAKDOWN]['attributes'],
+  attributes: MetricDefinitions[typeof TOOL_EXECUTION_BREAKDOWN]["attributes"],
 ): void {
-  if (!toolExecutionBreakdownHistogram || !isPerformanceMonitoringEnabled)
-    return;
+  if (!toolExecutionBreakdownHistogram || !isPerformanceMonitoringEnabled) return;
 
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
@@ -1026,7 +972,7 @@ export function recordToolExecutionBreakdown(
 export function recordTokenEfficiency(
   config: Config,
   value: number,
-  attributes: MetricDefinitions[typeof TOKEN_EFFICIENCY]['attributes'],
+  attributes: MetricDefinitions[typeof TOKEN_EFFICIENCY]["attributes"],
 ): void {
   if (!tokenEfficiencyHistogram || !isPerformanceMonitoringEnabled) return;
 
@@ -1041,7 +987,7 @@ export function recordTokenEfficiency(
 export function recordApiRequestBreakdown(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof API_REQUEST_BREAKDOWN]['attributes'],
+  attributes: MetricDefinitions[typeof API_REQUEST_BREAKDOWN]["attributes"],
 ): void {
   if (!apiRequestBreakdownHistogram || !isPerformanceMonitoringEnabled) return;
 
@@ -1056,7 +1002,7 @@ export function recordApiRequestBreakdown(
 export function recordPerformanceScore(
   config: Config,
   score: number,
-  attributes: MetricDefinitions[typeof PERFORMANCE_SCORE]['attributes'],
+  attributes: MetricDefinitions[typeof PERFORMANCE_SCORE]["attributes"],
 ): void {
   if (!performanceScoreGauge || !isPerformanceMonitoringEnabled) return;
 
@@ -1070,7 +1016,7 @@ export function recordPerformanceScore(
 
 export function recordPerformanceRegression(
   config: Config,
-  attributes: MetricDefinitions[typeof REGRESSION_DETECTION]['attributes'],
+  attributes: MetricDefinitions[typeof REGRESSION_DETECTION]["attributes"],
 ): void {
   if (!regressionDetectionCounter || !isPerformanceMonitoringEnabled) return;
 
@@ -1083,30 +1029,23 @@ export function recordPerformanceRegression(
 
   if (attributes.baseline_value !== 0 && regressionPercentageChangeHistogram) {
     const percentageChange =
-      ((attributes.current_value - attributes.baseline_value) /
-        attributes.baseline_value) *
-      100;
-    regressionPercentageChangeHistogram.record(
-      percentageChange,
-      metricAttributes,
-    );
+      ((attributes.current_value - attributes.baseline_value) / attributes.baseline_value) * 100;
+    regressionPercentageChangeHistogram.record(percentageChange, metricAttributes);
   }
 }
 
 export function recordBaselineComparison(
   config: Config,
-  attributes: MetricDefinitions[typeof BASELINE_COMPARISON]['attributes'],
+  attributes: MetricDefinitions[typeof BASELINE_COMPARISON]["attributes"],
 ): void {
   if (!baselineComparisonHistogram || !isPerformanceMonitoringEnabled) return;
 
   if (attributes.baseline_value === 0) {
-    diag.warn('Baseline value is zero, skipping comparison.');
+    diag.warn("Baseline value is zero, skipping comparison.");
     return;
   }
   const percentageChange =
-    ((attributes.current_value - attributes.baseline_value) /
-      attributes.baseline_value) *
-    100;
+    ((attributes.current_value - attributes.baseline_value) / attributes.baseline_value) * 100;
 
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
@@ -1129,14 +1068,14 @@ export function recordTokenUsageMetrics(
   tokenCount: number,
   attributes: {
     model: string;
-    type: 'input' | 'output' | 'thought' | 'cache' | 'tool';
+    type: "input" | "output" | "thought" | "cache" | "tool";
     genAiAttributes?: {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
     };
   },
 ): void {
@@ -1145,13 +1084,10 @@ export function recordTokenUsageMetrics(
     type: attributes.type,
   });
 
-  if (
-    (attributes.type === 'input' || attributes.type === 'output') &&
-    attributes.genAiAttributes
-  ) {
+  if ((attributes.type === "input" || attributes.type === "output") && attributes.genAiAttributes) {
     recordGenAiClientTokenUsage(config, tokenCount, {
       ...attributes.genAiAttributes,
-      'gen_ai.token.type': attributes.type,
+      "gen_ai.token.type": attributes.type,
     });
   }
 }
@@ -1166,13 +1102,13 @@ export function recordApiResponseMetrics(
     model: string;
     status_code?: number | string;
     genAiAttributes?: {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
-      'error.type'?: string;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
+      "error.type"?: string;
     };
   },
 ): void {
@@ -1196,8 +1132,7 @@ export function recordHookCallMetrics(
   durationMs: number,
   success: boolean,
 ): void {
-  if (!hookCallCounter || !hookCallLatencyHistogram || !isMetricsInitialized)
-    return;
+  if (!hookCallCounter || !hookCallLatencyHistogram || !isMetricsInitialized) return;
 
   // Always sanitize hook names in metrics (metrics are aggregated and exposed)
   const sanitizedHookName = sanitizeHookName(hookName);
diff --git a/packages/gemini-cli-core/src/telemetry/rate-limiter.test.ts b/packages/gemini-cli-core/src/telemetry/rate-limiter.test.ts
index 11e946904..2ebf297c1 100644
--- a/packages/gemini-cli-core/src/telemetry/rate-limiter.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/rate-limiter.test.ts
@@ -4,171 +4,166 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { RateLimiter } from './rate-limiter.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { RateLimiter } from "./rate-limiter.js";
 
-describe('RateLimiter', () => {
+describe("RateLimiter", () => {
   let rateLimiter: RateLimiter;
 
   beforeEach(() => {
     rateLimiter = new RateLimiter(1000); // 1 second interval for testing
   });
 
-  describe('constructor', () => {
-    it('should initialize with default interval', () => {
+  describe("constructor", () => {
+    it("should initialize with default interval", () => {
       const defaultLimiter = new RateLimiter();
       expect(defaultLimiter).toBeInstanceOf(RateLimiter);
     });
 
-    it('should initialize with custom interval', () => {
+    it("should initialize with custom interval", () => {
       const customLimiter = new RateLimiter(5000);
       expect(customLimiter).toBeInstanceOf(RateLimiter);
     });
 
-    it('should throw on negative interval', () => {
-      expect(() => new RateLimiter(-1)).toThrow(
-        'minIntervalMs must be non-negative.',
-      );
+    it("should throw on negative interval", () => {
+      expect(() => new RateLimiter(-1)).toThrow("minIntervalMs must be non-negative.");
     });
   });
 
-  describe('shouldRecord', () => {
-    it('should allow first recording', () => {
-      const result = rateLimiter.shouldRecord('test_metric');
+  describe("shouldRecord", () => {
+    it("should allow first recording", () => {
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(true);
     });
 
-    it('should block immediate subsequent recordings', () => {
-      rateLimiter.shouldRecord('test_metric'); // First call
-      const result = rateLimiter.shouldRecord('test_metric'); // Immediate second call
+    it("should block immediate subsequent recordings", () => {
+      rateLimiter.shouldRecord("test_metric"); // First call
+      const result = rateLimiter.shouldRecord("test_metric"); // Immediate second call
       expect(result).toBe(false);
     });
 
-    it('should allow recording after interval', () => {
+    it("should allow recording after interval", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric'); // First call
+      rateLimiter.shouldRecord("test_metric"); // First call
 
       // Advance time past interval
       vi.advanceTimersByTime(1500);
 
-      const result = rateLimiter.shouldRecord('test_metric');
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
 
-    it('should handle different metric keys independently', () => {
-      rateLimiter.shouldRecord('metric_a'); // First call for metric_a
+    it("should handle different metric keys independently", () => {
+      rateLimiter.shouldRecord("metric_a"); // First call for metric_a
 
-      const resultA = rateLimiter.shouldRecord('metric_a'); // Second call for metric_a
-      const resultB = rateLimiter.shouldRecord('metric_b'); // First call for metric_b
+      const resultA = rateLimiter.shouldRecord("metric_a"); // Second call for metric_a
+      const resultB = rateLimiter.shouldRecord("metric_b"); // First call for metric_b
 
       expect(resultA).toBe(false); // Should be blocked
       expect(resultB).toBe(true); // Should be allowed
     });
 
-    it('should use shorter interval for high priority events', () => {
+    it("should use shorter interval for high priority events", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric', true); // High priority
+      rateLimiter.shouldRecord("test_metric", true); // High priority
 
       // Advance time by half the normal interval
       vi.advanceTimersByTime(500);
 
-      const result = rateLimiter.shouldRecord('test_metric', true);
+      const result = rateLimiter.shouldRecord("test_metric", true);
       expect(result).toBe(true); // Should be allowed due to high priority
 
       vi.useRealTimers();
     });
 
-    it('should still block high priority events if interval not met', () => {
+    it("should still block high priority events if interval not met", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric', true); // High priority
+      rateLimiter.shouldRecord("test_metric", true); // High priority
 
       // Advance time by less than half interval
       vi.advanceTimersByTime(300);
 
-      const result = rateLimiter.shouldRecord('test_metric', true);
+      const result = rateLimiter.shouldRecord("test_metric", true);
       expect(result).toBe(false); // Should still be blocked
 
       vi.useRealTimers();
     });
   });
 
-  describe('forceRecord', () => {
-    it('should update last record time', () => {
-      const before = rateLimiter.getTimeUntilNextAllowed('test_metric');
+  describe("forceRecord", () => {
+    it("should update last record time", () => {
+      const before = rateLimiter.getTimeUntilNextAllowed("test_metric");
 
-      rateLimiter.forceRecord('test_metric');
+      rateLimiter.forceRecord("test_metric");
 
-      const after = rateLimiter.getTimeUntilNextAllowed('test_metric');
+      const after = rateLimiter.getTimeUntilNextAllowed("test_metric");
       expect(after).toBeGreaterThan(before);
     });
 
-    it('should block subsequent recordings after force record', () => {
-      rateLimiter.forceRecord('test_metric');
+    it("should block subsequent recordings after force record", () => {
+      rateLimiter.forceRecord("test_metric");
 
-      const result = rateLimiter.shouldRecord('test_metric');
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(false);
     });
   });
 
-  describe('getTimeUntilNextAllowed', () => {
-    it('should return 0 for new metric', () => {
-      const time = rateLimiter.getTimeUntilNextAllowed('new_metric');
+  describe("getTimeUntilNextAllowed", () => {
+    it("should return 0 for new metric", () => {
+      const time = rateLimiter.getTimeUntilNextAllowed("new_metric");
       expect(time).toBe(0);
     });
 
-    it('should return correct time after recording', () => {
+    it("should return correct time after recording", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric');
+      rateLimiter.shouldRecord("test_metric");
 
       // Advance time partially
       vi.advanceTimersByTime(300);
 
-      const timeRemaining = rateLimiter.getTimeUntilNextAllowed('test_metric');
+      const timeRemaining = rateLimiter.getTimeUntilNextAllowed("test_metric");
       expect(timeRemaining).toBeCloseTo(700, -1); // Approximately 700ms remaining
 
       vi.useRealTimers();
     });
 
-    it('should return 0 after interval has passed', () => {
+    it("should return 0 after interval has passed", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric');
+      rateLimiter.shouldRecord("test_metric");
 
       // Advance time past interval
       vi.advanceTimersByTime(1500);
 
-      const timeRemaining = rateLimiter.getTimeUntilNextAllowed('test_metric');
+      const timeRemaining = rateLimiter.getTimeUntilNextAllowed("test_metric");
       expect(timeRemaining).toBe(0);
 
       vi.useRealTimers();
     });
 
-    it('should account for high priority interval', () => {
+    it("should account for high priority interval", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('hp_metric', true);
+      rateLimiter.shouldRecord("hp_metric", true);
 
       // After 300ms, with 1000ms base interval, half rounded is 500ms
       vi.advanceTimersByTime(300);
 
-      const timeRemaining = rateLimiter.getTimeUntilNextAllowed(
-        'hp_metric',
-        true,
-      );
+      const timeRemaining = rateLimiter.getTimeUntilNextAllowed("hp_metric", true);
       expect(timeRemaining).toBeCloseTo(200, -1);
 
       vi.useRealTimers();
     });
   });
 
-  describe('getStats', () => {
-    it('should return empty stats initially', () => {
+  describe("getStats", () => {
+    it("should return empty stats initially", () => {
       const stats = rateLimiter.getStats();
       expect(stats).toEqual({
         totalMetrics: 0,
@@ -178,14 +173,14 @@ describe('RateLimiter', () => {
       });
     });
 
-    it('should return correct stats after recordings', () => {
+    it("should return correct stats after recordings", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('metric_a');
+      rateLimiter.shouldRecord("metric_a");
       vi.advanceTimersByTime(500);
-      rateLimiter.shouldRecord('metric_b');
+      rateLimiter.shouldRecord("metric_b");
       vi.advanceTimersByTime(500);
-      rateLimiter.shouldRecord('metric_c');
+      rateLimiter.shouldRecord("metric_c");
 
       const stats = rateLimiter.getStats();
       expect(stats.totalMetrics).toBe(3);
@@ -194,8 +189,8 @@ describe('RateLimiter', () => {
       vi.useRealTimers();
     });
 
-    it('should handle single recording correctly', () => {
-      rateLimiter.shouldRecord('test_metric');
+    it("should handle single recording correctly", () => {
+      rateLimiter.shouldRecord("test_metric");
 
       const stats = rateLimiter.getStats();
       expect(stats.totalMetrics).toBe(1);
@@ -203,10 +198,10 @@ describe('RateLimiter', () => {
     });
   });
 
-  describe('reset', () => {
-    it('should clear all rate limiting state', () => {
-      rateLimiter.shouldRecord('metric_a');
-      rateLimiter.shouldRecord('metric_b');
+  describe("reset", () => {
+    it("should clear all rate limiting state", () => {
+      rateLimiter.shouldRecord("metric_a");
+      rateLimiter.shouldRecord("metric_b");
 
       rateLimiter.reset();
 
@@ -214,16 +209,16 @@ describe('RateLimiter', () => {
       expect(stats.totalMetrics).toBe(0);
 
       // Should allow immediate recording after reset
-      const result = rateLimiter.shouldRecord('metric_a');
+      const result = rateLimiter.shouldRecord("metric_a");
       expect(result).toBe(true);
     });
   });
 
-  describe('cleanup', () => {
-    it('should remove old entries', () => {
+  describe("cleanup", () => {
+    it("should remove old entries", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('old_metric');
+      rateLimiter.shouldRecord("old_metric");
 
       // Advance time beyond cleanup threshold
       vi.advanceTimersByTime(4000000); // More than 1 hour
@@ -231,16 +226,16 @@ describe('RateLimiter', () => {
       rateLimiter.cleanup(3600000); // 1 hour cleanup
 
       // Should allow immediate recording of old metric after cleanup
-      const result = rateLimiter.shouldRecord('old_metric');
+      const result = rateLimiter.shouldRecord("old_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
 
-    it('should preserve recent entries', () => {
+    it("should preserve recent entries", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('recent_metric');
+      rateLimiter.shouldRecord("recent_metric");
 
       // Advance time but not beyond cleanup threshold
       vi.advanceTimersByTime(1800000); // 30 minutes
@@ -248,44 +243,44 @@ describe('RateLimiter', () => {
       rateLimiter.cleanup(3600000); // 1 hour cleanup
 
       // Should no longer be rate limited after 30 minutes (way past 1 minute default interval)
-      const result = rateLimiter.shouldRecord('recent_metric');
+      const result = rateLimiter.shouldRecord("recent_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
 
-    it('should use default cleanup age', () => {
+    it("should use default cleanup age", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric');
+      rateLimiter.shouldRecord("test_metric");
 
       // Advance time beyond default cleanup (1 hour)
       vi.advanceTimersByTime(4000000);
 
       rateLimiter.cleanup(); // Use default age
 
-      const result = rateLimiter.shouldRecord('test_metric');
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
   });
 
-  describe('edge cases', () => {
-    it('should handle zero interval', () => {
+  describe("edge cases", () => {
+    it("should handle zero interval", () => {
       const zeroLimiter = new RateLimiter(0);
 
-      zeroLimiter.shouldRecord('test_metric');
-      const result = zeroLimiter.shouldRecord('test_metric');
+      zeroLimiter.shouldRecord("test_metric");
+      const result = zeroLimiter.shouldRecord("test_metric");
 
       expect(result).toBe(true); // Should allow with zero interval
     });
 
-    it('should handle very large intervals', () => {
+    it("should handle very large intervals", () => {
       const longLimiter = new RateLimiter(Number.MAX_SAFE_INTEGER);
 
-      longLimiter.shouldRecord('test_metric');
-      const timeRemaining = longLimiter.getTimeUntilNextAllowed('test_metric');
+      longLimiter.shouldRecord("test_metric");
+      const timeRemaining = longLimiter.getTimeUntilNextAllowed("test_metric");
 
       expect(timeRemaining).toBeGreaterThan(1000000);
     });
diff --git a/packages/gemini-cli-core/src/telemetry/rate-limiter.ts b/packages/gemini-cli-core/src/telemetry/rate-limiter.ts
index 076887cd3..3d380143c 100644
--- a/packages/gemini-cli-core/src/telemetry/rate-limiter.ts
+++ b/packages/gemini-cli-core/src/telemetry/rate-limiter.ts
@@ -15,7 +15,7 @@ export class RateLimiter {
 
   constructor(minIntervalMs: number = 60000) {
     if (minIntervalMs < 0) {
-      throw new Error('minIntervalMs must be non-negative.');
+      throw new Error("minIntervalMs must be non-negative.");
     }
     this.minIntervalMs = minIntervalMs;
   }
@@ -54,10 +54,7 @@ export class RateLimiter {
   /**
    * Get time until next allowed recording for a metric
    */
-  getTimeUntilNextAllowed(
-    metricKey: string,
-    isHighPriority: boolean = false,
-  ): number {
+  getTimeUntilNextAllowed(metricKey: string, isHighPriority: boolean = false): number {
     const now = Date.now();
     const lastRecordTime = this.lastRecordTimes.get(metricKey) || 0;
     const interval = isHighPriority
@@ -91,8 +88,7 @@ export class RateLimiter {
     const oldest = Math.min(...recordTimes);
     const newest = Math.max(...recordTimes);
     const totalSpan = newest - oldest;
-    const averageInterval =
-      recordTimes.length > 1 ? totalSpan / (recordTimes.length - 1) : 0;
+    const averageInterval = recordTimes.length > 1 ? totalSpan / (recordTimes.length - 1) : 0;
 
     return {
       totalMetrics: recordTimes.length,
diff --git a/packages/gemini-cli-core/src/telemetry/sanitize.test.ts b/packages/gemini-cli-core/src/telemetry/sanitize.test.ts
index d60dc3bd7..d8a7a9abf 100644
--- a/packages/gemini-cli-core/src/telemetry/sanitize.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/sanitize.test.ts
@@ -12,9 +12,9 @@
  * API keys, credentials, file paths, and command arguments.
  */
 
-import { describe, it, expect } from 'vitest';
-import { HookCallEvent, EVENT_HOOK_CALL } from './types.js';
-import type { Config } from '../config/config.js';
+import { describe, expect, it } from "vitest";
+import type { Config } from "../config/config.js";
+import { EVENT_HOOK_CALL, HookCallEvent } from "./types.js";
 
 /**
  * Create a mock config for testing.
@@ -25,51 +25,51 @@ import type { Config } from '../config/config.js';
 function createMockConfig(logPromptsEnabled: boolean): Config {
   return {
     getTelemetryLogPromptsEnabled: () => logPromptsEnabled,
-    getSessionId: () => 'test-session-id',
-    getModel: () => 'gemini-1.5-flash',
+    getSessionId: () => "test-session-id",
+    getModel: () => "gemini-1.5-flash",
     isInteractive: () => true,
     getUserEmail: () => undefined,
   } as unknown as Config;
 }
 
-describe('Telemetry Sanitization', () => {
-  describe('HookCallEvent', () => {
-    describe('constructor', () => {
-      it('should create an event with all fields', () => {
+describe("Telemetry Sanitization", () => {
+  describe("HookCallEvent", () => {
+    describe("constructor", () => {
+      it("should create an event with all fields", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'test-hook',
-          { tool_name: 'ReadFile' },
+          "BeforeTool",
+          "command",
+          "test-hook",
+          { tool_name: "ReadFile" },
           100,
           true,
-          { decision: 'allow' },
+          { decision: "allow" },
           0,
-          'output',
-          'error',
+          "output",
+          "error",
           undefined,
         );
 
-        expect(event['event.name']).toBe('hook_call');
-        expect(event.hook_event_name).toBe('BeforeTool');
-        expect(event.hook_type).toBe('command');
-        expect(event.hook_name).toBe('test-hook');
-        expect(event.hook_input).toEqual({ tool_name: 'ReadFile' });
-        expect(event.hook_output).toEqual({ decision: 'allow' });
+        expect(event["event.name"]).toBe("hook_call");
+        expect(event.hook_event_name).toBe("BeforeTool");
+        expect(event.hook_type).toBe("command");
+        expect(event.hook_name).toBe("test-hook");
+        expect(event.hook_input).toEqual({ tool_name: "ReadFile" });
+        expect(event.hook_output).toEqual({ decision: "allow" });
         expect(event.exit_code).toBe(0);
-        expect(event.stdout).toBe('output');
-        expect(event.stderr).toBe('error');
+        expect(event.stdout).toBe("output");
+        expect(event.stderr).toBe("error");
         expect(event.duration_ms).toBe(100);
         expect(event.success).toBe(true);
         expect(event.error).toBeUndefined();
       });
 
-      it('should create an event with minimal fields', () => {
+      it("should create an event with minimal fields", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'test-hook',
-          { tool_name: 'ReadFile' },
+          "BeforeTool",
+          "command",
+          "test-hook",
+          { tool_name: "ReadFile" },
           100,
           true,
         );
@@ -82,282 +82,264 @@ describe('Telemetry Sanitization', () => {
       });
     });
 
-    describe('toOpenTelemetryAttributes with logPrompts=true', () => {
+    describe("toOpenTelemetryAttributes with logPrompts=true", () => {
       const config = createMockConfig(true);
 
-      it('should include all fields when logPrompts is enabled', () => {
+      it("should include all fields when logPrompts is enabled", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          '/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123',
-          { tool_name: 'ReadFile', args: { file: 'secret.txt' } },
+          "BeforeTool",
+          "command",
+          "/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123",
+          { tool_name: "ReadFile", args: { file: "secret.txt" } },
           100,
           true,
-          { decision: 'allow' },
+          { decision: "allow" },
           0,
-          'hook executed successfully',
-          'no errors',
+          "hook executed successfully",
+          "no errors",
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
 
-        expect(attributes['event.name']).toBe(EVENT_HOOK_CALL);
-        expect(attributes['hook_event_name']).toBe('BeforeTool');
-        expect(attributes['hook_type']).toBe('command');
+        expect(attributes["event.name"]).toBe(EVENT_HOOK_CALL);
+        expect(attributes["hook_event_name"]).toBe("BeforeTool");
+        expect(attributes["hook_type"]).toBe("command");
         // With logPrompts=true, full hook name is included
-        expect(attributes['hook_name']).toBe(
-          '/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123',
+        expect(attributes["hook_name"]).toBe(
+          "/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123",
         );
-        expect(attributes['duration_ms']).toBe(100);
-        expect(attributes['success']).toBe(true);
-        expect(attributes['exit_code']).toBe(0);
+        expect(attributes["duration_ms"]).toBe(100);
+        expect(attributes["success"]).toBe(true);
+        expect(attributes["exit_code"]).toBe(0);
         // PII-sensitive fields should be included
-        expect(attributes['hook_input']).toBeDefined();
-        expect(attributes['hook_output']).toBeDefined();
-        expect(attributes['stdout']).toBe('hook executed successfully');
-        expect(attributes['stderr']).toBe('no errors');
+        expect(attributes["hook_input"]).toBeDefined();
+        expect(attributes["hook_output"]).toBeDefined();
+        expect(attributes["stdout"]).toBe("hook executed successfully");
+        expect(attributes["stderr"]).toBe("no errors");
       });
 
-      it('should include hook_input and hook_output as JSON strings', () => {
+      it("should include hook_input and hook_output as JSON strings", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'test-hook',
-          { tool_name: 'ReadFile', args: { file: 'test.txt' } },
+          "BeforeTool",
+          "command",
+          "test-hook",
+          { tool_name: "ReadFile", args: { file: "test.txt" } },
           100,
           true,
-          { decision: 'allow', reason: 'approved' },
+          { decision: "allow", reason: "approved" },
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
 
         // Should be JSON stringified
-        expect(typeof attributes['hook_input']).toBe('string');
-        expect(typeof attributes['hook_output']).toBe('string');
+        expect(typeof attributes["hook_input"]).toBe("string");
+        expect(typeof attributes["hook_output"]).toBe("string");
 
-        const parsedInput = JSON.parse(attributes['hook_input'] as string);
+        const parsedInput = JSON.parse(attributes["hook_input"] as string);
         expect(parsedInput).toEqual({
-          tool_name: 'ReadFile',
-          args: { file: 'test.txt' },
+          tool_name: "ReadFile",
+          args: { file: "test.txt" },
         });
 
-        const parsedOutput = JSON.parse(attributes['hook_output'] as string);
-        expect(parsedOutput).toEqual({ decision: 'allow', reason: 'approved' });
+        const parsedOutput = JSON.parse(attributes["hook_output"] as string);
+        expect(parsedOutput).toEqual({ decision: "allow", reason: "approved" });
       });
     });
 
-    describe('toOpenTelemetryAttributes with logPrompts=false', () => {
+    describe("toOpenTelemetryAttributes with logPrompts=false", () => {
       const config = createMockConfig(false);
 
-      it('should exclude PII-sensitive fields when logPrompts is disabled', () => {
+      it("should exclude PII-sensitive fields when logPrompts is disabled", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          '/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123',
-          { tool_name: 'ReadFile', args: { file: 'secret.txt' } },
+          "BeforeTool",
+          "command",
+          "/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123",
+          { tool_name: "ReadFile", args: { file: "secret.txt" } },
           100,
           true,
-          { decision: 'allow' },
+          { decision: "allow" },
           0,
-          'hook executed successfully',
-          'no errors',
+          "hook executed successfully",
+          "no errors",
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
 
-        expect(attributes['event.name']).toBe(EVENT_HOOK_CALL);
-        expect(attributes['hook_event_name']).toBe('BeforeTool');
-        expect(attributes['hook_type']).toBe('command');
-        expect(attributes['duration_ms']).toBe(100);
-        expect(attributes['success']).toBe(true);
-        expect(attributes['exit_code']).toBe(0);
+        expect(attributes["event.name"]).toBe(EVENT_HOOK_CALL);
+        expect(attributes["hook_event_name"]).toBe("BeforeTool");
+        expect(attributes["hook_type"]).toBe("command");
+        expect(attributes["duration_ms"]).toBe(100);
+        expect(attributes["success"]).toBe(true);
+        expect(attributes["exit_code"]).toBe(0);
         // PII-sensitive fields should NOT be included
-        expect(attributes['hook_input']).toBeUndefined();
-        expect(attributes['hook_output']).toBeUndefined();
-        expect(attributes['stdout']).toBeUndefined();
-        expect(attributes['stderr']).toBeUndefined();
+        expect(attributes["hook_input"]).toBeUndefined();
+        expect(attributes["hook_output"]).toBeUndefined();
+        expect(attributes["stdout"]).toBeUndefined();
+        expect(attributes["stderr"]).toBeUndefined();
       });
 
-      it('should sanitize hook_name when logPrompts is disabled', () => {
+      it("should sanitize hook_name when logPrompts is disabled", () => {
         const testCases = [
           {
-            input: '/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123',
-            expected: 'check-secrets.sh',
-            description: 'full path with arguments',
+            input: "/path/to/.gemini/hooks/check-secrets.sh --api-key=abc123",
+            expected: "check-secrets.sh",
+            description: "full path with arguments",
           },
           {
-            input: 'python /home/user/script.py --token=xyz',
-            expected: 'python',
-            description: 'command with script path and token',
+            input: "python /home/user/script.py --token=xyz",
+            expected: "python",
+            description: "command with script path and token",
           },
           {
-            input: 'node index.js',
-            expected: 'node',
-            description: 'simple command with file',
+            input: "node index.js",
+            expected: "node",
+            description: "simple command with file",
           },
           {
             input: '/usr/bin/bash -c "echo $SECRET"',
-            expected: 'bash',
-            description: 'path with inline script',
+            expected: "bash",
+            description: "path with inline script",
           },
           {
-            input: 'C:\\Windows\\System32\\cmd.exe /c secret.bat',
-            expected: 'cmd.exe',
-            description: 'Windows path with arguments',
+            input: "C:\\Windows\\System32\\cmd.exe /c secret.bat",
+            expected: "cmd.exe",
+            description: "Windows path with arguments",
           },
           {
-            input: './hooks/local-hook.sh',
-            expected: 'local-hook.sh',
-            description: 'relative path',
+            input: "./hooks/local-hook.sh",
+            expected: "local-hook.sh",
+            description: "relative path",
           },
           {
-            input: 'simple-command',
-            expected: 'simple-command',
-            description: 'command without path or args',
+            input: "simple-command",
+            expected: "simple-command",
+            description: "command without path or args",
           },
           {
-            input: '',
-            expected: 'unknown-command',
-            description: 'empty string',
+            input: "",
+            expected: "unknown-command",
+            description: "empty string",
           },
           {
-            input: '   ',
-            expected: 'unknown-command',
-            description: 'whitespace only',
+            input: "   ",
+            expected: "unknown-command",
+            description: "whitespace only",
           },
         ];
 
         for (const testCase of testCases) {
           const event = new HookCallEvent(
-            'BeforeTool',
-            'command',
+            "BeforeTool",
+            "command",
             testCase.input,
-            { tool_name: 'ReadFile' },
+            { tool_name: "ReadFile" },
             100,
             true,
           );
 
           const attributes = event.toOpenTelemetryAttributes(config);
 
-          expect(attributes['hook_name']).toBe(testCase.expected);
+          expect(attributes["hook_name"]).toBe(testCase.expected);
         }
       });
 
-      it('should still include error field even when logPrompts is disabled', () => {
+      it("should still include error field even when logPrompts is disabled", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'test-hook',
-          { tool_name: 'ReadFile' },
+          "BeforeTool",
+          "command",
+          "test-hook",
+          { tool_name: "ReadFile" },
           100,
           false,
           undefined,
           undefined,
           undefined,
           undefined,
-          'Hook execution failed',
+          "Hook execution failed",
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
 
         // Error should be included for debugging
-        expect(attributes['error']).toBe('Hook execution failed');
+        expect(attributes["error"]).toBe("Hook execution failed");
         // But other PII fields should not
-        expect(attributes['hook_input']).toBeUndefined();
-        expect(attributes['stdout']).toBeUndefined();
+        expect(attributes["hook_input"]).toBeUndefined();
+        expect(attributes["stdout"]).toBeUndefined();
       });
     });
 
-    describe('sanitizeHookName edge cases', () => {
+    describe("sanitizeHookName edge cases", () => {
       const config = createMockConfig(false);
 
-      it('should handle commands with multiple spaces', () => {
+      it("should handle commands with multiple spaces", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'python   script.py   --arg1   --arg2',
+          "BeforeTool",
+          "command",
+          "python   script.py   --arg1   --arg2",
           {},
           100,
           true,
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
-        expect(attributes['hook_name']).toBe('python');
+        expect(attributes["hook_name"]).toBe("python");
       });
 
-      it('should handle mixed path separators', () => {
+      it("should handle mixed path separators", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          '/path/to\\mixed\\separators.sh',
+          "BeforeTool",
+          "command",
+          "/path/to\\mixed\\separators.sh",
           {},
           100,
           true,
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
-        expect(attributes['hook_name']).toBe('separators.sh');
+        expect(attributes["hook_name"]).toBe("separators.sh");
       });
 
-      it('should handle trailing slashes', () => {
+      it("should handle trailing slashes", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          '/path/to/directory/',
+          "BeforeTool",
+          "command",
+          "/path/to/directory/",
           {},
           100,
           true,
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
-        expect(attributes['hook_name']).toBe('unknown-command');
+        expect(attributes["hook_name"]).toBe("unknown-command");
       });
     });
 
-    describe('toLogBody', () => {
-      it('should format success message correctly', () => {
-        const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'test-hook',
-          {},
-          150,
-          true,
-        );
+    describe("toLogBody", () => {
+      it("should format success message correctly", () => {
+        const event = new HookCallEvent("BeforeTool", "command", "test-hook", {}, 150, true);
 
-        expect(event.toLogBody()).toBe(
-          'Hook call BeforeTool.test-hook succeeded in 150ms',
-        );
+        expect(event.toLogBody()).toBe("Hook call BeforeTool.test-hook succeeded in 150ms");
       });
 
-      it('should format failure message correctly', () => {
-        const event = new HookCallEvent(
-          'AfterTool',
-          'command',
-          'validation-hook',
-          {},
-          75,
-          false,
-        );
+      it("should format failure message correctly", () => {
+        const event = new HookCallEvent("AfterTool", "command", "validation-hook", {}, 75, false);
 
-        expect(event.toLogBody()).toBe(
-          'Hook call AfterTool.validation-hook failed in 75ms',
-        );
+        expect(event.toLogBody()).toBe("Hook call AfterTool.validation-hook failed in 75ms");
       });
     });
 
-    describe('integration scenarios', () => {
-      it('should handle enterprise scenario with full logging', () => {
+    describe("integration scenarios", () => {
+      it("should handle enterprise scenario with full logging", () => {
         const enterpriseConfig = createMockConfig(true);
 
         const event = new HookCallEvent(
-          'BeforeModel',
-          'command',
-          '$GEMINI_PROJECT_DIR/.gemini/hooks/add-context.sh',
+          "BeforeModel",
+          "command",
+          "$GEMINI_PROJECT_DIR/.gemini/hooks/add-context.sh",
           {
             llm_request: {
-              model: 'gemini-1.5-flash',
-              messages: [{ role: 'user', content: 'Hello' }],
+              model: "gemini-1.5-flash",
+              messages: [{ role: "user", content: "Hello" }],
             },
           },
           250,
@@ -366,38 +348,36 @@ describe('Telemetry Sanitization', () => {
             hookSpecificOutput: {
               llm_request: {
                 messages: [
-                  { role: 'user', content: 'Hello' },
-                  { role: 'system', content: 'Additional context...' },
+                  { role: "user", content: "Hello" },
+                  { role: "system", content: "Additional context..." },
                 ],
               },
             },
           },
           0,
-          'Context added successfully',
+          "Context added successfully",
         );
 
         const attributes = event.toOpenTelemetryAttributes(enterpriseConfig);
 
         // In enterprise mode, everything is logged
-        expect(attributes['hook_name']).toBe(
-          '$GEMINI_PROJECT_DIR/.gemini/hooks/add-context.sh',
-        );
-        expect(attributes['hook_input']).toBeDefined();
-        expect(attributes['hook_output']).toBeDefined();
-        expect(attributes['stdout']).toBe('Context added successfully');
+        expect(attributes["hook_name"]).toBe("$GEMINI_PROJECT_DIR/.gemini/hooks/add-context.sh");
+        expect(attributes["hook_input"]).toBeDefined();
+        expect(attributes["hook_output"]).toBeDefined();
+        expect(attributes["stdout"]).toBe("Context added successfully");
       });
 
-      it('should handle public telemetry scenario with minimal logging', () => {
+      it("should handle public telemetry scenario with minimal logging", () => {
         const publicConfig = createMockConfig(false);
 
         const event = new HookCallEvent(
-          'BeforeModel',
-          'command',
-          '$GEMINI_PROJECT_DIR/.gemini/hooks/add-context.sh',
+          "BeforeModel",
+          "command",
+          "$GEMINI_PROJECT_DIR/.gemini/hooks/add-context.sh",
           {
             llm_request: {
-              model: 'gemini-1.5-flash',
-              messages: [{ role: 'user', content: 'Hello' }],
+              model: "gemini-1.5-flash",
+              messages: [{ role: "user", content: "Hello" }],
             },
           },
           250,
@@ -406,37 +386,37 @@ describe('Telemetry Sanitization', () => {
             hookSpecificOutput: {
               llm_request: {
                 messages: [
-                  { role: 'user', content: 'Hello' },
-                  { role: 'system', content: 'Additional context...' },
+                  { role: "user", content: "Hello" },
+                  { role: "system", content: "Additional context..." },
                 ],
               },
             },
           },
           0,
-          'Context added successfully',
+          "Context added successfully",
         );
 
         const attributes = event.toOpenTelemetryAttributes(publicConfig);
 
         // In public mode, only metadata
-        expect(attributes['hook_name']).toBe('add-context.sh');
-        expect(attributes['hook_input']).toBeUndefined();
-        expect(attributes['hook_output']).toBeUndefined();
-        expect(attributes['stdout']).toBeUndefined();
+        expect(attributes["hook_name"]).toBe("add-context.sh");
+        expect(attributes["hook_input"]).toBeUndefined();
+        expect(attributes["hook_output"]).toBeUndefined();
+        expect(attributes["stdout"]).toBeUndefined();
         // But metadata is still there
-        expect(attributes['hook_event_name']).toBe('BeforeModel');
-        expect(attributes['duration_ms']).toBe(250);
-        expect(attributes['success']).toBe(true);
+        expect(attributes["hook_event_name"]).toBe("BeforeModel");
+        expect(attributes["duration_ms"]).toBe(250);
+        expect(attributes["success"]).toBe(true);
       });
     });
 
-    describe('real-world sensitive command examples', () => {
+    describe("real-world sensitive command examples", () => {
       const config = createMockConfig(false);
 
-      it('should sanitize commands with API keys', () => {
+      it("should sanitize commands with API keys", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
+          "BeforeTool",
+          "command",
           'curl https://api.example.com -H "Authorization: Bearer sk-abc123xyz"',
           {},
           100,
@@ -444,49 +424,49 @@ describe('Telemetry Sanitization', () => {
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
-        expect(attributes['hook_name']).toBe('curl');
+        expect(attributes["hook_name"]).toBe("curl");
       });
 
-      it('should sanitize commands with database credentials', () => {
+      it("should sanitize commands with database credentials", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'psql postgresql://user:password@localhost/db',
+          "BeforeTool",
+          "command",
+          "psql postgresql://user:password@localhost/db",
           {},
           100,
           true,
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
-        expect(attributes['hook_name']).toBe('psql');
+        expect(attributes["hook_name"]).toBe("psql");
       });
 
-      it('should sanitize commands with environment variables containing secrets', () => {
+      it("should sanitize commands with environment variables containing secrets", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'AWS_SECRET_KEY=abc123 aws s3 ls',
+          "BeforeTool",
+          "command",
+          "AWS_SECRET_KEY=abc123 aws s3 ls",
           {},
           100,
           true,
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
-        expect(attributes['hook_name']).toBe('AWS_SECRET_KEY=abc123');
+        expect(attributes["hook_name"]).toBe("AWS_SECRET_KEY=abc123");
       });
 
-      it('should sanitize Python scripts with file paths', () => {
+      it("should sanitize Python scripts with file paths", () => {
         const event = new HookCallEvent(
-          'BeforeTool',
-          'command',
-          'python /home/john.doe/projects/secret-scanner/scan.py --config=/etc/secrets.yml',
+          "BeforeTool",
+          "command",
+          "python /home/john.doe/projects/secret-scanner/scan.py --config=/etc/secrets.yml",
           {},
           100,
           true,
         );
 
         const attributes = event.toOpenTelemetryAttributes(config);
-        expect(attributes['hook_name']).toBe('python');
+        expect(attributes["hook_name"]).toBe("python");
       });
     });
   });
diff --git a/packages/gemini-cli-core/src/telemetry/sanitize.ts b/packages/gemini-cli-core/src/telemetry/sanitize.ts
index 986425eef..24738ba4c 100644
--- a/packages/gemini-cli-core/src/telemetry/sanitize.ts
+++ b/packages/gemini-cli-core/src/telemetry/sanitize.ts
@@ -26,26 +26,26 @@
 export function sanitizeHookName(hookName: string): string {
   // Handle empty or whitespace-only strings
   if (!hookName || !hookName.trim()) {
-    return 'unknown-command';
+    return "unknown-command";
   }
 
   // Split by spaces to get command parts
   const parts = hookName.trim().split(/\s+/);
   if (parts.length === 0) {
-    return 'unknown-command';
+    return "unknown-command";
   }
 
   // Get the first part (the command)
   const command = parts[0];
   if (!command) {
-    return 'unknown-command';
+    return "unknown-command";
   }
 
   // If it's a path, extract just the basename
-  if (command.includes('/') || command.includes('\\')) {
+  if (command.includes("/") || command.includes("\\")) {
     const pathParts = command.split(/[/\\]/);
     const basename = pathParts[pathParts.length - 1];
-    return basename || 'unknown-command';
+    return basename || "unknown-command";
   }
 
   return command;
diff --git a/packages/gemini-cli-core/src/telemetry/sdk.test.ts b/packages/gemini-cli-core/src/telemetry/sdk.test.ts
index c17f8b159..3e01dbe90 100644
--- a/packages/gemini-cli-core/src/telemetry/sdk.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/sdk.test.ts
@@ -4,46 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Config } from '../config/config.js';
-import {
-  initializeTelemetry,
-  shutdownTelemetry,
-  bufferTelemetryEvent,
-} from './sdk.js';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
-import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc';
-import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
-import { OTLPTraceExporter as OTLPTraceExporterHttp } from '@opentelemetry/exporter-trace-otlp-http';
-import { OTLPLogExporter as OTLPLogExporterHttp } from '@opentelemetry/exporter-logs-otlp-http';
-import { OTLPMetricExporter as OTLPMetricExporterHttp } from '@opentelemetry/exporter-metrics-otlp-http';
-import { ConsoleSpanExporter } from '@opentelemetry/sdk-trace-node';
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { GoogleAuth, type JWTInput } from 'google-auth-library';
-import {
-  GcpTraceExporter,
-  GcpLogExporter,
-  GcpMetricExporter,
-} from './gcp-exporters.js';
-import { TelemetryTarget } from './index.js';
-
-import * as os from 'node:os';
-import * as path from 'node:path';
-
-import { authEvents } from '../code_assist/oauth2.js';
-import { debugLogger } from '../utils/debugLogger.js';
-
-vi.mock('@opentelemetry/exporter-trace-otlp-grpc');
-vi.mock('@opentelemetry/exporter-logs-otlp-grpc');
-vi.mock('@opentelemetry/exporter-metrics-otlp-grpc');
-vi.mock('@opentelemetry/exporter-trace-otlp-http');
-vi.mock('@opentelemetry/exporter-logs-otlp-http');
-vi.mock('@opentelemetry/exporter-metrics-otlp-http');
-vi.mock('@opentelemetry/sdk-trace-node');
-vi.mock('@opentelemetry/sdk-node');
-vi.mock('./gcp-exporters.js');
-vi.mock('google-auth-library');
-vi.mock('../utils/debugLogger.js', () => ({
+import * as os from "node:os";
+import * as path from "node:path";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-grpc";
+import { OTLPLogExporter as OTLPLogExporterHttp } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
+import { OTLPMetricExporter as OTLPMetricExporterHttp } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
+import { OTLPTraceExporter as OTLPTraceExporterHttp } from "@opentelemetry/exporter-trace-otlp-http";
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import { ConsoleSpanExporter } from "@opentelemetry/sdk-trace-node";
+import { GoogleAuth, type JWTInput } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { authEvents } from "../code_assist/oauth2.js";
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { GcpLogExporter, GcpMetricExporter, GcpTraceExporter } from "./gcp-exporters.js";
+import { TelemetryTarget } from "./index.js";
+import { bufferTelemetryEvent, initializeTelemetry, shutdownTelemetry } from "./sdk.js";
+
+vi.mock("@opentelemetry/exporter-trace-otlp-grpc");
+vi.mock("@opentelemetry/exporter-logs-otlp-grpc");
+vi.mock("@opentelemetry/exporter-metrics-otlp-grpc");
+vi.mock("@opentelemetry/exporter-trace-otlp-http");
+vi.mock("@opentelemetry/exporter-logs-otlp-http");
+vi.mock("@opentelemetry/exporter-metrics-otlp-http");
+vi.mock("@opentelemetry/sdk-trace-node");
+vi.mock("@opentelemetry/sdk-node");
+vi.mock("./gcp-exporters.js");
+vi.mock("google-auth-library");
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: {
     log: vi.fn(),
     error: vi.fn(),
@@ -52,7 +42,7 @@ vi.mock('../utils/debugLogger.js', () => ({
   },
 }));
 
-describe('Telemetry SDK', () => {
+describe("Telemetry SDK", () => {
   let mockConfig: Config;
   const mockGetApplicationDefault = vi.fn();
 
@@ -66,13 +56,13 @@ describe('Telemetry SDK', () => {
     );
     mockConfig = {
       getTelemetryEnabled: () => true,
-      getTelemetryOtlpEndpoint: () => 'http://localhost:4317',
-      getTelemetryOtlpProtocol: () => 'grpc',
-      getTelemetryTarget: () => 'local',
+      getTelemetryOtlpEndpoint: () => "http://localhost:4317",
+      getTelemetryOtlpProtocol: () => "grpc",
+      getTelemetryTarget: () => "local",
       getTelemetryUseCollector: () => false,
       getTelemetryOutfile: () => undefined,
       getDebugMode: () => false,
-      getSessionId: () => 'test-session',
+      getSessionId: () => "test-session",
       getTelemetryUseCliAuth: () => false,
       isInteractive: () => false,
     } as unknown as Config;
@@ -82,127 +72,115 @@ describe('Telemetry SDK', () => {
     await shutdownTelemetry(mockConfig);
   });
 
-  it('should use gRPC exporters when protocol is grpc', async () => {
+  it("should use gRPC exporters when protocol is grpc", async () => {
     await initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPLogExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPMetricExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(NodeSDK.prototype.start).toHaveBeenCalled();
   });
 
-  it('should use HTTP exporters when protocol is http', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryEnabled').mockReturnValue(true);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpProtocol').mockReturnValue('http');
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'http://localhost:4318',
-    );
+  it("should use HTTP exporters when protocol is http", async () => {
+    vi.spyOn(mockConfig, "getTelemetryEnabled").mockReturnValue(true);
+    vi.spyOn(mockConfig, "getTelemetryOtlpProtocol").mockReturnValue("http");
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("http://localhost:4318");
 
     await initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporterHttp).toHaveBeenCalledWith({
-      url: 'http://localhost:4318/',
+      url: "http://localhost:4318/",
     });
     expect(OTLPLogExporterHttp).toHaveBeenCalledWith({
-      url: 'http://localhost:4318/',
+      url: "http://localhost:4318/",
     });
     expect(OTLPMetricExporterHttp).toHaveBeenCalledWith({
-      url: 'http://localhost:4318/',
+      url: "http://localhost:4318/",
     });
     expect(NodeSDK.prototype.start).toHaveBeenCalled();
   });
 
-  it('should parse gRPC endpoint correctly', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'https://my-collector.com',
-    );
+  it("should parse gRPC endpoint correctly", async () => {
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("https://my-collector.com");
     await initializeTelemetry(mockConfig);
     expect(OTLPTraceExporter).toHaveBeenCalledWith(
-      expect.objectContaining({ url: 'https://my-collector.com' }),
+      expect.objectContaining({ url: "https://my-collector.com" }),
     );
   });
 
-  it('should parse HTTP endpoint correctly', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryOtlpProtocol').mockReturnValue('http');
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'https://my-collector.com',
-    );
+  it("should parse HTTP endpoint correctly", async () => {
+    vi.spyOn(mockConfig, "getTelemetryOtlpProtocol").mockReturnValue("http");
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("https://my-collector.com");
     await initializeTelemetry(mockConfig);
     expect(OTLPTraceExporterHttp).toHaveBeenCalledWith(
-      expect.objectContaining({ url: 'https://my-collector.com/' }),
+      expect.objectContaining({ url: "https://my-collector.com/" }),
     );
   });
 
-  it('should use direct GCP exporters when target is gcp, project ID is set, and useCollector is false', async () => {
+  it("should use direct GCP exporters when target is gcp, project ID is set, and useCollector is false", async () => {
     mockGetApplicationDefault.mockResolvedValue(undefined); // Simulate ADC available
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(false);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
-    const originalEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = 'test-project';
+    const originalEnv = process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = "test-project";
 
     try {
       await initializeTelemetry(mockConfig);
 
-      expect(GcpTraceExporter).toHaveBeenCalledWith('test-project', undefined);
-      expect(GcpLogExporter).toHaveBeenCalledWith('test-project', undefined);
-      expect(GcpMetricExporter).toHaveBeenCalledWith('test-project', undefined);
+      expect(GcpTraceExporter).toHaveBeenCalledWith("test-project", undefined);
+      expect(GcpLogExporter).toHaveBeenCalledWith("test-project", undefined);
+      expect(GcpMetricExporter).toHaveBeenCalledWith("test-project", undefined);
       expect(NodeSDK.prototype.start).toHaveBeenCalled();
     } finally {
       if (originalEnv) {
-        process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalEnv;
+        process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = originalEnv;
       } else {
-        delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
+        delete process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
       }
     }
   });
 
-  it('should use OTLP exporters when target is gcp but useCollector is true', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(true);
+  it("should use OTLP exporters when target is gcp but useCollector is true", async () => {
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(true);
 
     await initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPLogExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPMetricExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
   });
 
-  it('should use GCP exporters even when project ID environment variable is not set', async () => {
+  it("should use GCP exporters even when project ID environment variable is not set", async () => {
     mockGetApplicationDefault.mockResolvedValue(undefined); // Simulate ADC available
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(false);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
-    const originalOtlpEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    const originalGoogleEnv = process.env['GOOGLE_CLOUD_PROJECT'];
-    delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    delete process.env['GOOGLE_CLOUD_PROJECT'];
+    const originalOtlpEnv = process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    const originalGoogleEnv = process.env["GOOGLE_CLOUD_PROJECT"];
+    delete process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    delete process.env["GOOGLE_CLOUD_PROJECT"];
 
     try {
       await initializeTelemetry(mockConfig);
@@ -213,59 +191,46 @@ describe('Telemetry SDK', () => {
       expect(NodeSDK.prototype.start).toHaveBeenCalled();
     } finally {
       if (originalOtlpEnv) {
-        process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalOtlpEnv;
+        process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = originalOtlpEnv;
       }
       if (originalGoogleEnv) {
-        process.env['GOOGLE_CLOUD_PROJECT'] = originalGoogleEnv;
+        process.env["GOOGLE_CLOUD_PROJECT"] = originalGoogleEnv;
       }
     }
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT as fallback when OTLP_GOOGLE_CLOUD_PROJECT is not set', async () => {
+  it("should use GOOGLE_CLOUD_PROJECT as fallback when OTLP_GOOGLE_CLOUD_PROJECT is not set", async () => {
     mockGetApplicationDefault.mockResolvedValue(undefined); // Simulate ADC available
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(false);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
-    const originalOtlpEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    const originalGoogleEnv = process.env['GOOGLE_CLOUD_PROJECT'];
-    delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'fallback-project';
+    const originalOtlpEnv = process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    const originalGoogleEnv = process.env["GOOGLE_CLOUD_PROJECT"];
+    delete process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    process.env["GOOGLE_CLOUD_PROJECT"] = "fallback-project";
 
     try {
       await initializeTelemetry(mockConfig);
 
-      expect(GcpTraceExporter).toHaveBeenCalledWith(
-        'fallback-project',
-        undefined,
-      );
-      expect(GcpLogExporter).toHaveBeenCalledWith(
-        'fallback-project',
-        undefined,
-      );
-      expect(GcpMetricExporter).toHaveBeenCalledWith(
-        'fallback-project',
-        undefined,
-      );
+      expect(GcpTraceExporter).toHaveBeenCalledWith("fallback-project", undefined);
+      expect(GcpLogExporter).toHaveBeenCalledWith("fallback-project", undefined);
+      expect(GcpMetricExporter).toHaveBeenCalledWith("fallback-project", undefined);
       expect(NodeSDK.prototype.start).toHaveBeenCalled();
     } finally {
       if (originalOtlpEnv) {
-        process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalOtlpEnv;
+        process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = originalOtlpEnv;
       }
       if (originalGoogleEnv) {
-        process.env['GOOGLE_CLOUD_PROJECT'] = originalGoogleEnv;
+        process.env["GOOGLE_CLOUD_PROJECT"] = originalGoogleEnv;
       } else {
-        delete process.env['GOOGLE_CLOUD_PROJECT'];
+        delete process.env["GOOGLE_CLOUD_PROJECT"];
       }
     }
   });
 
-  it('should not use OTLP exporters when telemetryOutfile is set', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryOutfile').mockReturnValue(
-      path.join(os.tmpdir(), 'test.log'),
-    );
+  it("should not use OTLP exporters when telemetryOutfile is set", async () => {
+    vi.spyOn(mockConfig, "getTelemetryOutfile").mockReturnValue(path.join(os.tmpdir(), "test.log"));
     await initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporter).not.toHaveBeenCalled();
@@ -277,12 +242,10 @@ describe('Telemetry SDK', () => {
     expect(NodeSDK.prototype.start).toHaveBeenCalled();
   });
 
-  it('should defer initialization when useCliAuth is true and no credentials are provided', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryUseCliAuth').mockReturnValue(true);
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+  it("should defer initialization when useCliAuth is true and no credentials are provided", async () => {
+    vi.spyOn(mockConfig, "getTelemetryUseCliAuth").mockReturnValue(true);
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
     // 1. Initial state: No credentials.
     // Should NOT initialize any exporters.
@@ -294,16 +257,14 @@ describe('Telemetry SDK', () => {
 
     // Verify deferral log
     expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining('deferring telemetry initialization'),
+      expect.stringContaining("deferring telemetry initialization"),
     );
   });
 
-  it('should initialize with GCP exporters when credentials are provided via post_auth', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryUseCliAuth').mockReturnValue(true);
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+  it("should initialize with GCP exporters when credentials are provided via post_auth", async () => {
+    vi.spyOn(mockConfig, "getTelemetryUseCliAuth").mockReturnValue(true);
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
     // 1. Initial state: No credentials.
     await initializeTelemetry(mockConfig);
@@ -312,41 +273,36 @@ describe('Telemetry SDK', () => {
     expect(GcpTraceExporter).not.toHaveBeenCalled();
 
     // 2. Set project ID and emit post_auth event
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
+    process.env["GOOGLE_CLOUD_PROJECT"] = "test-project";
 
     const mockCredentials = {
-      client_email: 'test@example.com',
-      private_key: '-----BEGIN PRIVATE KEY-----\n...',
-      type: 'authorized_user',
+      client_email: "test@example.com",
+      private_key: "-----BEGIN PRIVATE KEY-----\n...",
+      type: "authorized_user",
     };
 
     // Emit the event directly
-    authEvents.emit('post_auth', mockCredentials);
+    authEvents.emit("post_auth", mockCredentials);
 
     // Wait for the event handler to process.
     await vi.waitFor(() => {
       // Check if debugLogger was called, which indicates the listener ran
-      expect(debugLogger.log).toHaveBeenCalledWith(
-        'Telemetry reinit with credentials.',
-      );
+      expect(debugLogger.log).toHaveBeenCalledWith("Telemetry reinit with credentials.");
 
       // Should use GCP exporters now with the project ID
-      expect(GcpTraceExporter).toHaveBeenCalledWith(
-        'test-project',
-        mockCredentials,
-      );
+      expect(GcpTraceExporter).toHaveBeenCalledWith("test-project", mockCredentials);
     });
   });
 
-  describe('bufferTelemetryEvent', () => {
-    it('should execute immediately if SDK is initialized', async () => {
+  describe("bufferTelemetryEvent", () => {
+    it("should execute immediately if SDK is initialized", async () => {
       await initializeTelemetry(mockConfig);
       const callback = vi.fn();
       bufferTelemetryEvent(callback);
       expect(callback).toHaveBeenCalled();
     });
 
-    it('should buffer if SDK is not initialized, and flush on initialization', async () => {
+    it("should buffer if SDK is not initialized, and flush on initialization", async () => {
       const callback = vi.fn();
       bufferTelemetryEvent(callback);
       expect(callback).not.toHaveBeenCalled();
@@ -356,9 +312,9 @@ describe('Telemetry SDK', () => {
     });
   });
 
-  it('should disable telemetry and log error if useCollector and useCliAuth are both true', async () => {
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(true);
-    vi.spyOn(mockConfig, 'getTelemetryUseCliAuth').mockReturnValue(true);
+  it("should disable telemetry and log error if useCollector and useCliAuth are both true", async () => {
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(true);
+    vi.spyOn(mockConfig, "getTelemetryUseCliAuth").mockReturnValue(true);
 
     await initializeTelemetry(mockConfig);
 
@@ -369,9 +325,9 @@ describe('Telemetry SDK', () => {
     );
     expect(NodeSDK.prototype.start).not.toHaveBeenCalled();
   });
-  it('should log error when re-initializing with different credentials', async () => {
-    const creds1 = { client_email: 'user1@example.com' };
-    const creds2 = { client_email: 'user2@example.com' };
+  it("should log error when re-initializing with different credentials", async () => {
+    const creds1 = { client_email: "user1@example.com" };
+    const creds2 = { client_email: "user2@example.com" };
 
     // 1. Initialize with first account
     await initializeTelemetry(mockConfig, creds1 as JWTInput);
@@ -382,13 +338,13 @@ describe('Telemetry SDK', () => {
     // 3. Verify error log
     expect(debugLogger.error).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Telemetry credentials have changed (from user1@example.com to user2@example.com)',
+        "Telemetry credentials have changed (from user1@example.com to user2@example.com)",
       ),
     );
   });
 
-  it('should NOT log error when re-initializing with SAME credentials', async () => {
-    const creds1 = { client_email: 'user1@example.com' };
+  it("should NOT log error when re-initializing with SAME credentials", async () => {
+    const creds1 = { client_email: "user1@example.com" };
 
     // 1. Initialize with first account
     await initializeTelemetry(mockConfig, creds1 as JWTInput);
@@ -398,7 +354,7 @@ describe('Telemetry SDK', () => {
 
     // 3. Verify NO error log
     expect(debugLogger.error).not.toHaveBeenCalledWith(
-      expect.stringContaining('Telemetry credentials have changed'),
+      expect.stringContaining("Telemetry credentials have changed"),
     );
   });
 });
diff --git a/packages/gemini-cli-core/src/telemetry/sdk.ts b/packages/gemini-cli-core/src/telemetry/sdk.ts
index b3bc2d596..b02799891 100644
--- a/packages/gemini-cli-core/src/telemetry/sdk.ts
+++ b/packages/gemini-cli-core/src/telemetry/sdk.ts
@@ -4,55 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  DiagLogLevel,
-  diag,
-  trace,
-  context,
-  metrics,
-  propagation,
-} from '@opentelemetry/api';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
-import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc';
-import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
-import { OTLPTraceExporter as OTLPTraceExporterHttp } from '@opentelemetry/exporter-trace-otlp-http';
-import { OTLPLogExporter as OTLPLogExporterHttp } from '@opentelemetry/exporter-logs-otlp-http';
-import { OTLPMetricExporter as OTLPMetricExporterHttp } from '@opentelemetry/exporter-metrics-otlp-http';
-import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base';
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-import { resourceFromAttributes } from '@opentelemetry/resources';
-import {
-  BatchSpanProcessor,
-  ConsoleSpanExporter,
-} from '@opentelemetry/sdk-trace-node';
-import {
-  BatchLogRecordProcessor,
-  ConsoleLogRecordExporter,
-} from '@opentelemetry/sdk-logs';
-import {
-  ConsoleMetricExporter,
-  PeriodicExportingMetricReader,
-} from '@opentelemetry/sdk-metrics';
-import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
-import type { JWTInput } from 'google-auth-library';
-import type { Config } from '../config/config.js';
-import { SERVICE_NAME } from './constants.js';
-import { initializeMetrics } from './metrics.js';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
-import {
-  FileLogExporter,
-  FileMetricExporter,
-  FileSpanExporter,
-} from './file-exporters.js';
-import {
-  GcpTraceExporter,
-  GcpMetricExporter,
-  GcpLogExporter,
-} from './gcp-exporters.js';
-import { TelemetryTarget } from './index.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { authEvents } from '../code_assist/oauth2.js';
+import { context, DiagLogLevel, diag, metrics, propagation, trace } from "@opentelemetry/api";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-grpc";
+import { OTLPLogExporter as OTLPLogExporterHttp } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
+import { OTLPMetricExporter as OTLPMetricExporterHttp } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
+import { OTLPTraceExporter as OTLPTraceExporterHttp } from "@opentelemetry/exporter-trace-otlp-http";
+import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { CompressionAlgorithm } from "@opentelemetry/otlp-exporter-base";
+import { resourceFromAttributes } from "@opentelemetry/resources";
+import { BatchLogRecordProcessor, ConsoleLogRecordExporter } from "@opentelemetry/sdk-logs";
+import { ConsoleMetricExporter, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import { BatchSpanProcessor, ConsoleSpanExporter } from "@opentelemetry/sdk-trace-node";
+import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
+import type { JWTInput } from "google-auth-library";
+import { authEvents } from "../code_assist/oauth2.js";
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
+import { SERVICE_NAME } from "./constants.js";
+import { FileLogExporter, FileMetricExporter, FileSpanExporter } from "./file-exporters.js";
+import { GcpLogExporter, GcpMetricExporter, GcpTraceExporter } from "./gcp-exporters.js";
+import { TelemetryTarget } from "./index.js";
+import { initializeMetrics } from "./metrics.js";
 
 // For troubleshooting, set the log level to DiagLogLevel.DEBUG
 class DiagLoggerAdapter {
@@ -84,8 +60,7 @@ let spanProcessor: BatchSpanProcessor | undefined;
 let logRecordProcessor: BatchLogRecordProcessor | undefined;
 let telemetryInitialized = false;
 let callbackRegistered = false;
-let authListener: ((newCredentials: JWTInput) => Promise<void>) | undefined =
-  undefined;
+let authListener: ((newCredentials: JWTInput) => Promise<void>) | undefined = undefined;
 const telemetryBuffer: Array<() => void | Promise<void>> = [];
 let activeTelemetryEmail: string | undefined;
 
@@ -110,7 +85,7 @@ async function flushTelemetryBuffer(): Promise<void> {
       try {
         await fn();
       } catch (e) {
-        debugLogger.error('Error executing buffered telemetry event', e);
+        debugLogger.error("Error executing buffered telemetry event", e);
       }
     }
   }
@@ -118,17 +93,17 @@ async function flushTelemetryBuffer(): Promise<void> {
 
 function parseOtlpEndpoint(
   otlpEndpointSetting: string | undefined,
-  protocol: 'grpc' | 'http',
+  protocol: "grpc" | "http",
 ): string | undefined {
   if (!otlpEndpointSetting) {
     return undefined;
   }
   // Trim leading/trailing quotes that might come from env variables
-  const trimmedEndpoint = otlpEndpointSetting.replace(/^["']|["']$/g, '');
+  const trimmedEndpoint = otlpEndpointSetting.replace(/^["']|["']$/g, "");
 
   try {
     const url = new URL(trimmedEndpoint);
-    if (protocol === 'grpc') {
+    if (protocol === "grpc") {
       // OTLP gRPC exporters expect an endpoint in the format scheme://host:port
       // The `origin` property provides this, stripping any path, query, or hash.
       return url.origin;
@@ -136,15 +111,12 @@ function parseOtlpEndpoint(
     // For http, use the full href.
     return url.href;
   } catch (error) {
-    diag.error('Invalid OTLP endpoint URL provided:', trimmedEndpoint, error);
+    diag.error("Invalid OTLP endpoint URL provided:", trimmedEndpoint, error);
     return undefined;
   }
 }
 
-export async function initializeTelemetry(
-  config: Config,
-  credentials?: JWTInput,
-): Promise<void> {
+export async function initializeTelemetry(config: Config, credentials?: JWTInput): Promise<void> {
   if (!config.getTelemetryEnabled()) {
     return;
   }
@@ -165,8 +137,8 @@ export async function initializeTelemetry(
   if (config.getTelemetryUseCollector() && config.getTelemetryUseCliAuth()) {
     debugLogger.error(
       'Telemetry configuration error: "useCollector" and "useCliAuth" cannot both be true. ' +
-        'CLI authentication is only supported with in-process exporters. ' +
-        'Disabling telemetry.',
+        "CLI authentication is only supported with in-process exporters. " +
+        "Disabling telemetry.",
     );
     return;
   }
@@ -179,14 +151,14 @@ export async function initializeTelemetry(
       callbackRegistered = true;
       authListener = async (newCredentials: JWTInput) => {
         if (config.getTelemetryEnabled() && config.getTelemetryUseCliAuth()) {
-          debugLogger.log('Telemetry reinit with credentials.');
+          debugLogger.log("Telemetry reinit with credentials.");
           await initializeTelemetry(config, newCredentials);
         }
       };
-      authEvents.on('post_auth', authListener);
+      authEvents.on("post_auth", authListener);
     }
     debugLogger.log(
-      'CLI auth is requested but no credentials, deferring telemetry initialization.',
+      "CLI auth is requested but no credentials, deferring telemetry initialization.",
     );
     return;
   }
@@ -194,7 +166,7 @@ export async function initializeTelemetry(
   const resource = resourceFromAttributes({
     [SemanticResourceAttributes.SERVICE_NAME]: SERVICE_NAME,
     [SemanticResourceAttributes.SERVICE_VERSION]: process.version,
-    'session.id': config.getSessionId(),
+    "session.id": config.getSessionId(),
   });
 
   const otlpEndpoint = config.getTelemetryOtlpEndpoint();
@@ -207,10 +179,8 @@ export async function initializeTelemetry(
   const useOtlp = !!parsedEndpoint && !telemetryOutfile;
 
   const gcpProjectId =
-    process.env['OTLP_GOOGLE_CLOUD_PROJECT'] ||
-    process.env['GOOGLE_CLOUD_PROJECT'];
-  const useDirectGcpExport =
-    telemetryTarget === TelemetryTarget.GCP && !useCollector;
+    process.env["OTLP_GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT"];
+  const useDirectGcpExport = telemetryTarget === TelemetryTarget.GCP && !useCollector;
 
   let spanExporter:
     | OTLPTraceExporter
@@ -228,10 +198,10 @@ export async function initializeTelemetry(
 
   if (useDirectGcpExport) {
     debugLogger.log(
-      'Creating GCP exporters with projectId:',
+      "Creating GCP exporters with projectId:",
       gcpProjectId,
-      'using',
-      credentials ? 'provided credentials' : 'ADC',
+      "using",
+      credentials ? "provided credentials" : "ADC",
     );
     spanExporter = new GcpTraceExporter(gcpProjectId, credentials);
     logExporter = new GcpLogExporter(gcpProjectId, credentials);
@@ -240,7 +210,7 @@ export async function initializeTelemetry(
       exportIntervalMillis: 30000,
     });
   } else if (useOtlp) {
-    if (otlpProtocol === 'http') {
+    if (otlpProtocol === "http") {
       spanExporter = new OTLPTraceExporterHttp({
         url: parsedEndpoint,
       });
@@ -302,24 +272,24 @@ export async function initializeTelemetry(
   try {
     await sdk.start();
     if (config.getDebugMode()) {
-      debugLogger.log('OpenTelemetry SDK started successfully.');
+      debugLogger.log("OpenTelemetry SDK started successfully.");
     }
     telemetryInitialized = true;
     activeTelemetryEmail = credentials?.client_email;
     initializeMetrics(config);
     void flushTelemetryBuffer();
   } catch (error) {
-    console.error('Error starting OpenTelemetry SDK:', error);
+    console.error("Error starting OpenTelemetry SDK:", error);
   }
 
   // Note: We don't use process.on('exit') here because that callback is synchronous
   // and won't wait for the async shutdownTelemetry() to complete.
   // Instead, telemetry shutdown is handled in runExitCleanup() in cleanup.ts
-  process.on('SIGTERM', () => {
+  process.on("SIGTERM", () => {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     shutdownTelemetry(config);
   });
-  process.on('SIGINT', () => {
+  process.on("SIGINT", () => {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     shutdownTelemetry(config);
   });
@@ -335,22 +305,16 @@ export async function flushTelemetry(config: Config): Promise<void> {
   }
   try {
     // Force flush all pending telemetry to disk
-    await Promise.all([
-      spanProcessor.forceFlush(),
-      logRecordProcessor.forceFlush(),
-    ]);
+    await Promise.all([spanProcessor.forceFlush(), logRecordProcessor.forceFlush()]);
     if (config.getDebugMode()) {
-      debugLogger.log('OpenTelemetry SDK flushed successfully.');
+      debugLogger.log("OpenTelemetry SDK flushed successfully.");
     }
   } catch (error) {
-    console.error('Error flushing SDK:', error);
+    console.error("Error flushing SDK:", error);
   }
 }
 
-export async function shutdownTelemetry(
-  config: Config,
-  fromProcessExit = true,
-): Promise<void> {
+export async function shutdownTelemetry(config: Config, fromProcessExit = true): Promise<void> {
   if (!telemetryInitialized || !sdk) {
     return;
   }
@@ -358,10 +322,10 @@ export async function shutdownTelemetry(
     await ClearcutLogger.getInstance()?.shutdown();
     await sdk.shutdown();
     if (config.getDebugMode() && fromProcessExit) {
-      debugLogger.log('OpenTelemetry SDK shut down successfully.');
+      debugLogger.log("OpenTelemetry SDK shut down successfully.");
     }
   } catch (error) {
-    console.error('Error shutting down SDK:', error);
+    console.error("Error shutting down SDK:", error);
   } finally {
     telemetryInitialized = false;
     sdk = undefined;
@@ -374,7 +338,7 @@ export async function shutdownTelemetry(
     propagation.disable();
     diag.disable();
     if (authListener) {
-      authEvents.off('post_auth', authListener);
+      authEvents.off("post_auth", authListener);
       authListener = undefined;
     }
     callbackRegistered = false;
diff --git a/packages/gemini-cli-core/src/telemetry/semantic.test.ts b/packages/gemini-cli-core/src/telemetry/semantic.test.ts
index 6ea4cf3a3..5736b3d37 100644
--- a/packages/gemini-cli-core/src/telemetry/semantic.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/semantic.test.ts
@@ -4,154 +4,148 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { type Candidate, type Content, FinishReason, Language, Outcome } from "@google/genai";
+import { describe, expect, it } from "vitest";
 import {
+  OTelFinishReason,
+  OTelOutputType,
   toChatMessage,
+  toFinishReasons,
   toInputMessages,
-  toSystemInstruction,
   toOutputMessages,
-  toFinishReasons,
-  OTelFinishReason,
   toOutputType,
-  OTelOutputType,
-} from './semantic.js';
-import {
-  Language,
-  type Content,
-  Outcome,
-  type Candidate,
-  FinishReason,
-} from '@google/genai';
+  toSystemInstruction,
+} from "./semantic.js";
 
-describe('toChatMessage', () => {
-  it('should correctly handle text parts', () => {
+describe("toChatMessage", () => {
+  it("should correctly handle text parts", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'Hello' }],
+      role: "user",
+      parts: [{ text: "Hello" }],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'user',
+      role: "user",
       parts: [
         {
-          type: 'text',
-          content: 'Hello',
+          type: "text",
+          content: "Hello",
         },
       ],
     });
   });
 
-  it('should correctly handle function call parts', () => {
+  it("should correctly handle function call parts", () => {
     const content: Content = {
-      role: 'model',
+      role: "model",
       parts: [
         {
           functionCall: {
-            name: 'test-function',
+            name: "test-function",
             args: {
-              arg1: 'test-value',
+              arg1: "test-value",
             },
-            id: '12345',
+            id: "12345",
           },
           // include field not specified in semantic specification that could be present
-          thoughtSignature: '1234',
+          thoughtSignature: "1234",
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'tool_call',
-          name: 'test-function',
+          type: "tool_call",
+          name: "test-function",
           arguments: '{"arg1":"test-value"}',
-          id: '12345',
+          id: "12345",
         },
       ],
     });
   });
 
-  it('should correctly handle function response parts', () => {
+  it("should correctly handle function response parts", () => {
     const content: Content = {
-      role: 'user',
+      role: "user",
       parts: [
         {
           functionResponse: {
-            name: 'test-function',
+            name: "test-function",
             response: {
-              result: 'success',
+              result: "success",
             },
-            id: '12345',
+            id: "12345",
           },
           // include field not specified in semantic specification that could be present
           fileData: {
-            displayName: 'greatfile',
+            displayName: "greatfile",
           },
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'user',
+      role: "user",
       parts: [
         {
-          type: 'tool_call_response',
+          type: "tool_call_response",
           response: '{"result":"success"}',
-          id: '12345',
+          id: "12345",
         },
       ],
     });
   });
 
-  it('should correctly handle reasoning parts with text', () => {
+  it("should correctly handle reasoning parts with text", () => {
     const content: Content = {
-      role: 'system',
-      parts: [{ text: 'Hmm', thought: true }],
+      role: "system",
+      parts: [{ text: "Hmm", thought: true }],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'reasoning',
-          content: 'Hmm',
+          type: "reasoning",
+          content: "Hmm",
         },
       ],
     });
   });
 
-  it('should correctly handle reasoning parts without text', () => {
+  it("should correctly handle reasoning parts without text", () => {
     const content: Content = {
-      role: 'system',
+      role: "system",
       parts: [
         {
           thought: true,
           // include field not specified in semantic specification that could be present
           inlineData: {
-            displayName: 'wowdata',
+            displayName: "wowdata",
           },
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'reasoning',
-          content: '',
+          type: "reasoning",
+          content: "",
         },
       ],
     });
   });
 
-  it('should correctly handle text parts that are not reasoning parts', () => {
+  it("should correctly handle text parts that are not reasoning parts", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'what a nice day', thought: false }],
+      role: "user",
+      parts: [{ text: "what a nice day", thought: false }],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'user',
+      role: "user",
       parts: [
         {
-          type: 'text',
-          content: 'what a nice day',
+          type: "text",
+          content: "what a nice day",
         },
       ],
     });
@@ -159,7 +153,7 @@ describe('toChatMessage', () => {
 
   it('should correctly handle "generic" parts', () => {
     const content: Content = {
-      role: 'model',
+      role: "model",
       parts: [
         {
           executableCode: {
@@ -170,7 +164,7 @@ describe('toChatMessage', () => {
         {
           codeExecutionResult: {
             outcome: Outcome.OUTCOME_OK,
-            output: 'foo',
+            output: "foo",
           },
           // include field not specified in semantic specification that could be present
           videoMetadata: {
@@ -180,17 +174,17 @@ describe('toChatMessage', () => {
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'executableCode',
+          type: "executableCode",
           code: 'print("foo")',
-          language: 'PYTHON',
+          language: "PYTHON",
         },
         {
-          type: 'codeExecutionResult',
-          outcome: 'OUTCOME_OK',
-          output: 'foo',
+          type: "codeExecutionResult",
+          outcome: "OUTCOME_OK",
+          output: "foo",
           videoMetadata: {
             fps: 5,
           },
@@ -199,24 +193,24 @@ describe('toChatMessage', () => {
     });
   });
 
-  it('should correctly handle unknown parts', () => {
+  it("should correctly handle unknown parts", () => {
     const content: Content = {
-      role: 'model',
+      role: "model",
       parts: [
         {
           fileData: {
-            displayName: 'superfile',
+            displayName: "superfile",
           },
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'unknown',
+          type: "unknown",
           fileData: {
-            displayName: 'superfile',
+            displayName: "superfile",
           },
         },
       ],
@@ -224,76 +218,76 @@ describe('toChatMessage', () => {
   });
 });
 
-describe('toSystemInstruction', () => {
-  it('should correctly handle a string', () => {
-    const content = 'Hello';
+describe("toSystemInstruction", () => {
+  it("should correctly handle a string", () => {
+    const content = "Hello";
     expect(toSystemInstruction(content)).toEqual([
       {
-        type: 'text',
-        content: 'Hello',
+        type: "text",
+        content: "Hello",
       },
     ]);
   });
 
-  it('should correctly handle a Content object with a text part', () => {
+  it("should correctly handle a Content object with a text part", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'Hello' }],
+      role: "user",
+      parts: [{ text: "Hello" }],
     };
     expect(toSystemInstruction(content)).toEqual([
       {
-        type: 'text',
-        content: 'Hello',
+        type: "text",
+        content: "Hello",
       },
     ]);
   });
 
-  it('should correctly handle a Content object with multiple parts', () => {
+  it("should correctly handle a Content object with multiple parts", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'Hello' }, { text: 'Hmm', thought: true }],
+      role: "user",
+      parts: [{ text: "Hello" }, { text: "Hmm", thought: true }],
     };
     expect(toSystemInstruction(content)).toEqual([
       {
-        type: 'text',
-        content: 'Hello',
+        type: "text",
+        content: "Hello",
       },
       {
-        type: 'reasoning',
-        content: 'Hmm',
+        type: "reasoning",
+        content: "Hmm",
       },
     ]);
   });
 });
 
-describe('toInputMessages', () => {
-  it('should correctly convert an array of Content objects', () => {
+describe("toInputMessages", () => {
+  it("should correctly convert an array of Content objects", () => {
     const contents: Content[] = [
       {
-        role: 'user',
-        parts: [{ text: 'Hello' }],
+        role: "user",
+        parts: [{ text: "Hello" }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Hi there!' }],
+        role: "model",
+        parts: [{ text: "Hi there!" }],
       },
     ];
     expect(toInputMessages(contents)).toEqual([
       {
-        role: 'user',
+        role: "user",
         parts: [
           {
-            type: 'text',
-            content: 'Hello',
+            type: "text",
+            content: "Hello",
           },
         ],
       },
       {
-        role: 'system',
+        role: "system",
         parts: [
           {
-            type: 'text',
-            content: 'Hi there!',
+            type: "text",
+            content: "Hi there!",
           },
         ],
       },
@@ -301,44 +295,44 @@ describe('toInputMessages', () => {
   });
 });
 
-describe('toOutputMessages', () => {
-  it('should correctly convert an array of Candidate objects', () => {
+describe("toOutputMessages", () => {
+  it("should correctly convert an array of Candidate objects", () => {
     const candidates: Candidate[] = [
       {
         index: 0,
         finishReason: FinishReason.STOP,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the first candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the first candidate." }],
         },
       },
       {
         index: 1,
         finishReason: FinishReason.MAX_TOKENS,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the second candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the second candidate." }],
         },
       },
     ];
     expect(toOutputMessages(candidates)).toEqual([
       {
-        role: 'system',
-        finish_reason: 'stop',
+        role: "system",
+        finish_reason: "stop",
         parts: [
           {
-            type: 'text',
-            content: 'This is the first candidate.',
+            type: "text",
+            content: "This is the first candidate.",
           },
         ],
       },
       {
-        role: 'system',
-        finish_reason: 'length',
+        role: "system",
+        finish_reason: "length",
         parts: [
           {
-            type: 'text',
-            content: 'This is the second candidate.',
+            type: "text",
+            content: "This is the second candidate.",
           },
         ],
       },
@@ -346,53 +340,53 @@ describe('toOutputMessages', () => {
   });
 });
 
-describe('toFinishReasons', () => {
-  it('should return an empty array if candidates is undefined', () => {
+describe("toFinishReasons", () => {
+  it("should return an empty array if candidates is undefined", () => {
     expect(toFinishReasons(undefined)).toEqual([]);
   });
 
-  it('should return an empty array if candidates is an empty array', () => {
+  it("should return an empty array if candidates is an empty array", () => {
     expect(toFinishReasons([])).toEqual([]);
   });
 
-  it('should correctly convert a single candidate', () => {
+  it("should correctly convert a single candidate", () => {
     const candidates: Candidate[] = [
       {
         index: 0,
         finishReason: FinishReason.STOP,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the first candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the first candidate." }],
         },
       },
     ];
     expect(toFinishReasons(candidates)).toEqual([OTelFinishReason.STOP]);
   });
 
-  it('should correctly convert multiple candidates', () => {
+  it("should correctly convert multiple candidates", () => {
     const candidates: Candidate[] = [
       {
         index: 0,
         finishReason: FinishReason.STOP,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the first candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the first candidate." }],
         },
       },
       {
         index: 1,
         finishReason: FinishReason.MAX_TOKENS,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the second candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the second candidate." }],
         },
       },
       {
         index: 2,
         finishReason: FinishReason.SAFETY,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the third candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the third candidate." }],
         },
       },
     ];
@@ -404,22 +398,20 @@ describe('toFinishReasons', () => {
   });
 });
 
-describe('toOutputType', () => {
-  it('should return TEXT for text/plain', () => {
-    expect(toOutputType('text/plain')).toBe(OTelOutputType.TEXT);
+describe("toOutputType", () => {
+  it("should return TEXT for text/plain", () => {
+    expect(toOutputType("text/plain")).toBe(OTelOutputType.TEXT);
   });
 
-  it('should return JSON for application/json', () => {
-    expect(toOutputType('application/json')).toBe(OTelOutputType.JSON);
+  it("should return JSON for application/json", () => {
+    expect(toOutputType("application/json")).toBe(OTelOutputType.JSON);
   });
 
-  it('should return the custom mime type for other strings', () => {
-    expect(toOutputType('application/vnd.custom-type')).toBe(
-      'application/vnd.custom-type',
-    );
+  it("should return the custom mime type for other strings", () => {
+    expect(toOutputType("application/vnd.custom-type")).toBe("application/vnd.custom-type");
   });
 
-  it('should return undefined for undefined input', () => {
+  it("should return undefined for undefined input", () => {
     expect(toOutputType(undefined)).toBeUndefined();
   });
 });
diff --git a/packages/gemini-cli-core/src/telemetry/semantic.ts b/packages/gemini-cli-core/src/telemetry/semantic.ts
index 6192a6e94..5dcfe4b13 100644
--- a/packages/gemini-cli-core/src/telemetry/semantic.ts
+++ b/packages/gemini-cli-core/src/telemetry/semantic.ts
@@ -11,14 +11,8 @@
  * @see https://github.com/open-telemetry/semantic-conventions/blob/8b4f210f43136e57c1f6f47292eb6d38e3bf30bb/docs/gen-ai/gen-ai-events.md
  */
 
-import { FinishReason } from '@google/genai';
-import type {
-  Candidate,
-  Content,
-  ContentUnion,
-  Part,
-  PartUnion,
-} from '@google/genai';
+import type { Candidate, Content, ContentUnion, Part, PartUnion } from "@google/genai";
+import { FinishReason } from "@google/genai";
 
 export function toInputMessages(contents: Content[]): InputMessages {
   const messages: ChatMessage[] = [];
@@ -30,22 +24,19 @@ export function toInputMessages(contents: Content[]): InputMessages {
 
 function isPart(value: unknown): value is Part {
   return (
-    typeof value === 'object' &&
-    value !== null &&
-    !Array.isArray(value) &&
-    !('parts' in value)
+    typeof value === "object" && value !== null && !Array.isArray(value) && !("parts" in value)
   );
 }
 
 function toPart(part: PartUnion): Part {
-  if (typeof part === 'string') {
+  if (typeof part === "string") {
     return { text: part };
   }
   return part;
 }
 
 function toContent(content: ContentUnion): Content | undefined {
-  if (typeof content === 'string') {
+  if (typeof content === "string") {
     // 1. It's a string
     return {
       parts: [toPart(content)],
@@ -55,7 +46,7 @@ function toContent(content: ContentUnion): Content | undefined {
     return {
       parts: content.map(toPart),
     };
-  } else if ('parts' in content) {
+  } else if ("parts" in content) {
     // 3. It's a Content object
     return content;
   } else if (isPart(content)) {
@@ -110,9 +101,9 @@ export function toFinishReasons(candidates?: Candidate[]): OTelFinishReason[] {
 export function toOutputType(requested_mime?: string): string | undefined {
   switch (requested_mime) {
     // explicitly support the known good values of responseMimeType
-    case 'text/plain':
+    case "text/plain":
       return OTelOutputType.TEXT;
-    case 'application/json':
+    case "application/json":
       return OTelOutputType.JSON;
     default:
       // if none of the well-known values applies, a custom value may be used
@@ -139,7 +130,7 @@ export function toOTelPart(part: Part): AnyPart {
     if (part.text) {
       return new ReasoningPart(part.text);
     } else {
-      return new ReasoningPart('');
+      return new ReasoningPart("");
     }
   } else if (part.text) {
     return new TextPart(part.text);
@@ -156,14 +147,14 @@ export function toOTelPart(part: Part): AnyPart {
     );
   } else if (part.executableCode) {
     const { executableCode, ...unexpectedData } = part;
-    return new GenericPart('executableCode', {
+    return new GenericPart("executableCode", {
       code: executableCode.code,
       language: executableCode.language,
       ...unexpectedData,
     });
   } else if (part.codeExecutionResult) {
     const { codeExecutionResult, ...unexpectedData } = part;
-    return new GenericPart('codeExecutionResult', {
+    return new GenericPart("codeExecutionResult", {
       outcome: codeExecutionResult.outcome,
       output: codeExecutionResult.output,
       ...unexpectedData,
@@ -171,28 +162,28 @@ export function toOTelPart(part: Part): AnyPart {
   }
   // Assuming the above cases capture all the expected parts
   // but adding a fallthrough just in case.
-  return new GenericPart('unknown', { ...part });
+  return new GenericPart("unknown", { ...part });
 }
 
 export enum OTelRole {
-  SYSTEM = 'system',
-  USER = 'user',
-  ASSISTANT = 'assistant',
-  TOOL = 'tool',
+  SYSTEM = "system",
+  USER = "user",
+  ASSISTANT = "assistant",
+  TOOL = "tool",
 }
 
 export function toOTelRole(role?: string): OTelRole {
   switch (role?.toLowerCase()) {
-    case 'system':
+    case "system":
       return OTelRole.SYSTEM;
     // Our APIs seem to frequently use 'model'
-    case 'model':
+    case "model":
       return OTelRole.SYSTEM;
-    case 'user':
+    case "user":
       return OTelRole.USER;
-    case 'assistant':
+    case "assistant":
       return OTelRole.ASSISTANT;
-    case 'tool':
+    case "tool":
       return OTelRole.TOOL;
     default:
       return OTelRole.SYSTEM;
@@ -202,18 +193,18 @@ export function toOTelRole(role?: string): OTelRole {
 export type InputMessages = ChatMessage[];
 
 export enum OTelOutputType {
-  IMAGE = 'image',
-  JSON = 'json',
-  SPEECH = 'speech',
-  TEXT = 'text',
+  IMAGE = "image",
+  JSON = "json",
+  SPEECH = "speech",
+  TEXT = "text",
 }
 
 export enum OTelFinishReason {
-  STOP = 'stop',
-  LENGTH = 'length',
-  CONTENT_FILTER = 'content_filter',
-  TOOL_CALL = 'tool_call',
-  ERROR = 'error',
+  STOP = "stop",
+  LENGTH = "length",
+  CONTENT_FILTER = "content_filter",
+  TOOL_CALL = "tool_call",
+  ERROR = "error",
 }
 
 export function toOTelFinishReason(finishReason?: string): OTelFinishReason {
@@ -271,7 +262,7 @@ export interface ChatMessage {
 }
 
 export class TextPart {
-  readonly type = 'text';
+  readonly type = "text";
   content: string;
 
   constructor(content: string) {
@@ -280,7 +271,7 @@ export class TextPart {
 }
 
 export class ToolCallRequestPart {
-  readonly type = 'tool_call';
+  readonly type = "tool_call";
   name?: string;
   id?: string;
   arguments?: string;
@@ -293,7 +284,7 @@ export class ToolCallRequestPart {
 }
 
 export class ToolCallResponsePart {
-  readonly type = 'tool_call_response';
+  readonly type = "tool_call_response";
   response?: string;
   id?: string;
 
@@ -304,7 +295,7 @@ export class ToolCallResponsePart {
 }
 
 export class ReasoningPart {
-  readonly type = 'reasoning';
+  readonly type = "reasoning";
   content: string;
 
   constructor(content: string) {
diff --git a/packages/gemini-cli-core/src/telemetry/startupProfiler.test.ts b/packages/gemini-cli-core/src/telemetry/startupProfiler.test.ts
index 5a4597486..0a72ae615 100644
--- a/packages/gemini-cli-core/src/telemetry/startupProfiler.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/startupProfiler.test.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { StartupProfiler } from './startupProfiler.js';
-import type { Config } from '../config/config.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { StartupProfiler } from "./startupProfiler.js";
 
 // Mock the metrics module
-vi.mock('./metrics.js', () => ({
+vi.mock("./metrics.js", () => ({
   recordStartupPerformance: vi.fn(),
 }));
 
 // Mock loggers module
-vi.mock('./loggers.js', () => ({
+vi.mock("./loggers.js", () => ({
   logStartupStats: vi.fn(),
 }));
 
 // Mock os module
-vi.mock('node:os', () => ({
-  platform: vi.fn(() => 'darwin'),
-  arch: vi.fn(() => 'x64'),
-  release: vi.fn(() => '22.6.0'),
+vi.mock("node:os", () => ({
+  platform: vi.fn(() => "darwin"),
+  arch: vi.fn(() => "x64"),
+  release: vi.fn(() => "22.6.0"),
 }));
 
 // Mock fs module
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   existsSync: vi.fn(() => false),
   createWriteStream: vi.fn(() => ({
     write: vi.fn(),
@@ -34,7 +34,7 @@ vi.mock('node:fs', () => ({
   })),
 }));
 
-describe('StartupProfiler', () => {
+describe("StartupProfiler", () => {
   let profiler: StartupProfiler;
   let mockConfig: Config;
   let recordStartupPerformance: ReturnType<typeof vi.fn>;
@@ -44,23 +44,22 @@ describe('StartupProfiler', () => {
     vi.resetAllMocks();
 
     // Get the mocked function
-    const metricsModule = await import('./metrics.js');
-    recordStartupPerformance =
-      metricsModule.recordStartupPerformance as ReturnType<typeof vi.fn>;
+    const metricsModule = await import("./metrics.js");
+    recordStartupPerformance = metricsModule.recordStartupPerformance as ReturnType<typeof vi.fn>;
 
-    const loggersModule = await import('./loggers.js');
+    const loggersModule = await import("./loggers.js");
     logStartupStats = loggersModule.logStartupStats as ReturnType<typeof vi.fn>;
 
     // Create a fresh profiler instance
     profiler = StartupProfiler.getInstance();
 
     // Clear any existing phases and performance entries
-    profiler['phases'].clear();
+    profiler["phases"].clear();
     performance.clearMarks();
     performance.clearMeasures();
 
     mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
   });
@@ -69,83 +68,81 @@ describe('StartupProfiler', () => {
     vi.restoreAllMocks();
   });
 
-  describe('getInstance', () => {
-    it('should return a singleton instance', () => {
+  describe("getInstance", () => {
+    it("should return a singleton instance", () => {
       const instance1 = StartupProfiler.getInstance();
       const instance2 = StartupProfiler.getInstance();
       expect(instance1).toBe(instance2);
     });
   });
 
-  describe('start', () => {
-    it('should create a performance mark for a phase', () => {
-      profiler.start('test_phase');
+  describe("start", () => {
+    it("should create a performance mark for a phase", () => {
+      profiler.start("test_phase");
 
-      const phase = profiler['phases'].get('test_phase');
+      const phase = profiler["phases"].get("test_phase");
       expect(phase).toBeDefined();
-      expect(phase?.name).toBe('test_phase');
+      expect(phase?.name).toBe("test_phase");
 
       // Verify performance mark was created
-      const marks = performance.getEntriesByType('mark');
-      const startMark = marks.find(
-        (m) => m.name === 'startup:test_phase:start',
-      );
+      const marks = performance.getEntriesByType("mark");
+      const startMark = marks.find((m) => m.name === "startup:test_phase:start");
       expect(startMark).toBeDefined();
     });
 
-    it('should record start time with details', () => {
-      const details = { key: 'value', count: 42 };
-      profiler.start('test_phase', details);
+    it("should record start time with details", () => {
+      const details = { key: "value", count: 42 };
+      profiler.start("test_phase", details);
 
-      const phase = profiler['phases'].get('test_phase');
+      const phase = profiler["phases"].get("test_phase");
       expect(phase?.details).toEqual(details);
     });
 
-    it('should return undefined when starting a phase that is already active', () => {
-      profiler.start('test_phase');
-      const handle = profiler.start('test_phase');
+    it("should return undefined when starting a phase that is already active", () => {
+      profiler.start("test_phase");
+      const handle = profiler.start("test_phase");
       expect(handle).toBeUndefined();
     });
   });
 
-  describe('end', () => {
-    it('should create a performance measure for a started phase', () => {
-      const handle = profiler.start('test_phase');
+  describe("end", () => {
+    it("should create a performance measure for a started phase", () => {
+      const handle = profiler.start("test_phase");
       handle?.end();
 
       // Verify performance measure was created
-      const measures = performance.getEntriesByType('measure');
-      const measure = measures.find((m) => m.name === 'test_phase');
+      const measures = performance.getEntriesByType("measure");
+      const measure = measures.find((m) => m.name === "test_phase");
       expect(measure).toBeDefined();
       expect(measure?.duration).toBeGreaterThan(0);
     });
 
-    it('should merge details when ending a phase', () => {
-      const handle = profiler.start('test_phase', { initial: 'value' });
-      handle?.end({ additional: 'data' });
+    it("should merge details when ending a phase", () => {
+      const handle = profiler.start("test_phase", { initial: "value" });
+      handle?.end({ additional: "data" });
 
-      const phase = profiler['phases'].get('test_phase');
+      const phase = profiler["phases"].get("test_phase");
       expect(phase?.details).toEqual({
-        initial: 'value',
-        additional: 'data',
+        initial: "value",
+        additional: "data",
       });
     });
 
-    it('should overwrite details with same key', () => {
-      const handle = profiler.start('test_phase', { key: 'original' });
-      handle?.end({ key: 'updated' });
+    it("should overwrite details with same key", () => {
+      const handle = profiler.start("test_phase", { key: "original" });
+      handle?.end({ key: "updated" });
 
-      const phase = profiler['phases'].get('test_phase');
-      expect(phase?.details).toEqual({ key: 'updated' });
+      const phase = profiler["phases"].get("test_phase");
+      expect(phase?.details).toEqual({ key: "updated" });
     });
   });
 
-  describe('flush', () => {
-    it('should call recordStartupPerformance for each completed phase', () => {
-      const handle1 = profiler.start('phase1');
+  describe("flush", () => {
+    it("should call recordStartupPerformance for each completed phase", () => {
+      const handle1 = profiler.start("phase1");
       handle1?.end();
 
-      const handle2 = profiler.start('phase2');
+      const handle2 = profiler.start("phase2");
       handle2?.end();
 
       profiler.flush(mockConfig);
@@ -153,15 +150,15 @@ describe('StartupProfiler', () => {
       expect(recordStartupPerformance).toHaveBeenCalledTimes(2);
     });
 
-    it('should not record phases without duration', () => {
-      profiler.start('incomplete_phase');
+    it("should not record phases without duration", () => {
+      profiler.start("incomplete_phase");
       profiler.flush(mockConfig);
 
       expect(recordStartupPerformance).not.toHaveBeenCalled();
     });
 
-    it('should include common details in all metrics', () => {
-      const handle = profiler.start('test_phase');
+    it("should include common details in all metrics", () => {
+      const handle = profiler.start("test_phase");
       handle?.end();
 
       profiler.flush(mockConfig);
@@ -170,11 +167,11 @@ describe('StartupProfiler', () => {
         mockConfig,
         expect.any(Number),
         expect.objectContaining({
-          phase: 'test_phase',
+          phase: "test_phase",
           details: expect.objectContaining({
-            os_platform: 'darwin',
-            os_arch: 'x64',
-            os_release: '22.6.0',
+            os_platform: "darwin",
+            os_arch: "x64",
+            os_release: "22.6.0",
             is_docker: false,
             cpu_usage_user: expect.any(Number),
             cpu_usage_system: expect.any(Number),
@@ -183,8 +180,8 @@ describe('StartupProfiler', () => {
       );
     });
 
-    it('should merge phase-specific details with common details', () => {
-      const handle = profiler.start('test_phase', { custom: 'value' });
+    it("should merge phase-specific details with common details", () => {
+      const handle = profiler.start("test_phase", { custom: "value" });
       handle?.end();
 
       profiler.flush(mockConfig);
@@ -193,29 +190,29 @@ describe('StartupProfiler', () => {
         mockConfig,
         expect.any(Number),
         expect.objectContaining({
-          phase: 'test_phase',
+          phase: "test_phase",
           details: expect.objectContaining({
-            custom: 'value',
-            os_platform: 'darwin',
+            custom: "value",
+            os_platform: "darwin",
           }),
         }),
       );
     });
 
-    it('should clear phases after flushing', () => {
-      const handle = profiler.start('test_phase');
+    it("should clear phases after flushing", () => {
+      const handle = profiler.start("test_phase");
       handle?.end();
 
       profiler.flush(mockConfig);
 
-      expect(profiler['phases'].size).toBe(0);
+      expect(profiler["phases"].size).toBe(0);
     });
 
-    it('should detect Docker environment', async () => {
-      const fs = await import('node:fs');
+    it("should detect Docker environment", async () => {
+      const fs = await import("node:fs");
       (fs.existsSync as ReturnType<typeof vi.fn>).mockReturnValue(true);
 
-      const handle = profiler.start('test_phase');
+      const handle = profiler.start("test_phase");
       handle?.end();
 
       profiler.flush(mockConfig);
@@ -231,14 +228,14 @@ describe('StartupProfiler', () => {
       );
     });
 
-    it('should calculate CPU usage correctly', () => {
-      const cpuUsageSpy = vi.spyOn(process, 'cpuUsage');
+    it("should calculate CPU usage correctly", () => {
+      const cpuUsageSpy = vi.spyOn(process, "cpuUsage");
       // Mock start usage
       cpuUsageSpy.mockReturnValueOnce({ user: 1000, system: 500 });
       // Mock diff usage (this is what process.cpuUsage(startUsage) returns)
       cpuUsageSpy.mockReturnValueOnce({ user: 100, system: 50 });
 
-      const handle = profiler.start('cpu_test_phase');
+      const handle = profiler.start("cpu_test_phase");
       handle?.end();
 
       profiler.flush(mockConfig);
@@ -247,7 +244,7 @@ describe('StartupProfiler', () => {
         mockConfig,
         expect.any(Number),
         expect.objectContaining({
-          phase: 'cpu_test_phase',
+          phase: "cpu_test_phase",
           details: expect.objectContaining({
             cpu_usage_user: 100,
             cpu_usage_system: 50,
@@ -257,18 +254,18 @@ describe('StartupProfiler', () => {
     });
   });
 
-  describe('integration scenarios', () => {
-    it('should handle a complete startup profiling workflow', () => {
+  describe("integration scenarios", () => {
+    it("should handle a complete startup profiling workflow", () => {
       // Simulate startup sequence
-      const totalHandle = profiler.start('total_startup');
+      const totalHandle = profiler.start("total_startup");
 
-      const settingsHandle = profiler.start('load_settings');
+      const settingsHandle = profiler.start("load_settings");
       settingsHandle?.end();
 
-      const argsHandle = profiler.start('parse_arguments');
+      const argsHandle = profiler.start("parse_arguments");
       argsHandle?.end();
 
-      const appHandle = profiler.start('initialize_app');
+      const appHandle = profiler.start("initialize_app");
       appHandle?.end();
 
       totalHandle?.end();
@@ -279,22 +276,21 @@ describe('StartupProfiler', () => {
       expect(recordStartupPerformance).toHaveBeenCalledWith(
         mockConfig,
         expect.any(Number),
-        expect.objectContaining({ phase: 'total_startup' }),
+        expect.objectContaining({ phase: "total_startup" }),
       );
     });
 
-    it('should handle nested timing correctly', () => {
-      const outerHandle = profiler.start('outer');
-      const innerHandle = profiler.start('inner');
+    it("should handle nested timing correctly", () => {
+      const outerHandle = profiler.start("outer");
+      const innerHandle = profiler.start("inner");
       innerHandle?.end();
       outerHandle?.end();
 
       profiler.flush(mockConfig);
 
-      const calls = (recordStartupPerformance as ReturnType<typeof vi.fn>).mock
-        .calls;
-      const outerCall = calls.find((call) => call[2].phase === 'outer');
-      const innerCall = calls.find((call) => call[2].phase === 'inner');
+      const calls = (recordStartupPerformance as ReturnType<typeof vi.fn>).mock.calls;
+      const outerCall = calls.find((call) => call[2].phase === "outer");
+      const innerCall = calls.find((call) => call[2].phase === "inner");
 
       expect(outerCall).toBeDefined();
       expect(innerCall).toBeDefined();
@@ -303,31 +299,31 @@ describe('StartupProfiler', () => {
     });
   });
 
-  describe('sanity checking', () => {
-    it('should return undefined when starting a phase that is already active', () => {
-      profiler.start('test_phase');
-      const handle = profiler.start('test_phase');
+  describe("sanity checking", () => {
+    it("should return undefined when starting a phase that is already active", () => {
+      profiler.start("test_phase");
+      const handle = profiler.start("test_phase");
       expect(handle).toBeUndefined();
     });
 
-    it('should allow restarting a phase after it has ended', () => {
-      const handle1 = profiler.start('test_phase');
+    it("should allow restarting a phase after it has ended", () => {
+      const handle1 = profiler.start("test_phase");
       handle1?.end();
 
       // Should not throw
-      expect(() => profiler.start('test_phase')).not.toThrow();
+      expect(() => profiler.start("test_phase")).not.toThrow();
     });
 
-    it('should not throw error when ending a phase that is already ended', () => {
-      const handle = profiler.start('test_phase');
+    it("should not throw error when ending a phase that is already ended", () => {
+      const handle = profiler.start("test_phase");
       handle?.end();
 
       // Calling end() again on the same handle should not throw
       expect(() => handle?.end()).not.toThrow();
     });
 
-    it('should not record metrics for incomplete phases', () => {
-      profiler.start('incomplete_phase');
+    it("should not record metrics for incomplete phases", () => {
+      profiler.start("incomplete_phase");
       // Never call end()
 
       profiler.flush(mockConfig);
@@ -335,11 +331,11 @@ describe('StartupProfiler', () => {
       expect(recordStartupPerformance).not.toHaveBeenCalled();
     });
 
-    it('should handle mix of complete and incomplete phases', () => {
-      const completeHandle = profiler.start('complete_phase');
+    it("should handle mix of complete and incomplete phases", () => {
+      const completeHandle = profiler.start("complete_phase");
       completeHandle?.end();
 
-      profiler.start('incomplete_phase');
+      profiler.start("incomplete_phase");
       // Never call end()
 
       profiler.flush(mockConfig);
@@ -349,11 +345,11 @@ describe('StartupProfiler', () => {
       expect(recordStartupPerformance).toHaveBeenCalledWith(
         mockConfig,
         expect.any(Number),
-        expect.objectContaining({ phase: 'complete_phase' }),
+        expect.objectContaining({ phase: "complete_phase" }),
       );
     });
-    it('should log startup stats event', () => {
-      const handle = profiler.start('test_phase');
+    it("should log startup stats event", () => {
+      const handle = profiler.start("test_phase");
       handle?.end();
 
       profiler.flush(mockConfig);
@@ -363,14 +359,14 @@ describe('StartupProfiler', () => {
         expect.objectContaining({
           phases: expect.arrayContaining([
             expect.objectContaining({
-              name: 'test_phase',
+              name: "test_phase",
               duration_ms: expect.any(Number),
               start_time_usec: expect.any(Number),
               end_time_usec: expect.any(Number),
             }),
           ]),
-          os_platform: 'darwin',
-          os_release: '22.6.0',
+          os_platform: "darwin",
+          os_release: "22.6.0",
           is_docker: false,
         }),
       );
diff --git a/packages/gemini-cli-core/src/telemetry/startupProfiler.ts b/packages/gemini-cli-core/src/telemetry/startupProfiler.ts
index 07776cfe3..df14c9b8d 100644
--- a/packages/gemini-cli-core/src/telemetry/startupProfiler.ts
+++ b/packages/gemini-cli-core/src/telemetry/startupProfiler.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { performance } from 'node:perf_hooks';
-import * as os from 'node:os';
-import * as fs from 'node:fs';
-import type { Config } from '../config/config.js';
-import { recordStartupPerformance } from './metrics.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { StartupStatsEvent, type StartupPhaseStats } from './types.js';
-import { logStartupStats } from './loggers.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import { performance } from "node:perf_hooks";
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { logStartupStats } from "./loggers.js";
+import { recordStartupPerformance } from "./metrics.js";
+import { type StartupPhaseStats, StartupStatsEvent } from "./types.js";
 
 interface StartupPhase {
   name: string;
@@ -107,15 +107,10 @@ export class StartupProfiler {
    * Marks the end of a phase and calculates duration.
    * This is now a private method; callers should use the handle returned by start().
    */
-  private _end(
-    phase: StartupPhase,
-    details?: Record<string, string | number | boolean>,
-  ): void {
+  private _end(phase: StartupPhase, details?: Record<string, string | number | boolean>): void {
     // Error if ending a phase that's already ended.
     if (phase.ended) {
-      debugLogger.warn(
-        `[STARTUP] Cannot end phase '${phase.name}': phase was already ended.`,
-      );
+      debugLogger.warn(`[STARTUP] Cannot end phase '${phase.name}': phase was already ended.`);
       return;
     }
 
@@ -145,21 +140,17 @@ export class StartupProfiler {
    * Flushes buffered metrics to the telemetry system.
    */
   flush(config: Config): void {
-    debugLogger.log(
-      '[STARTUP] StartupProfiler.flush() called with',
-      this.phases.size,
-      'phases',
-    );
+    debugLogger.log("[STARTUP] StartupProfiler.flush() called with", this.phases.size, "phases");
 
     const commonDetails = {
       os_platform: os.platform(),
       os_arch: os.arch(),
       os_release: os.release(),
-      is_docker: fs.existsSync('/.dockerenv'),
+      is_docker: fs.existsSync("/.dockerenv"),
     };
 
     // Get all performance measures.
-    const measures = performance.getEntriesByType('measure');
+    const measures = performance.getEntriesByType("measure");
 
     for (const phase of this.phases.values()) {
       // Warn about incomplete phases.
@@ -182,9 +173,9 @@ export class StartupProfiler {
         };
 
         debugLogger.log(
-          '[STARTUP] Recording metric for phase:',
+          "[STARTUP] Recording metric for phase:",
           phase.name,
-          'duration:',
+          "duration:",
           measure.duration,
         );
         recordStartupPerformance(config, measure.duration, {
@@ -192,10 +183,7 @@ export class StartupProfiler {
           details,
         });
       } else {
-        debugLogger.log(
-          '[STARTUP] Skipping phase without measure:',
-          phase.name,
-        );
+        debugLogger.log("[STARTUP] Skipping phase without measure:", phase.name);
       }
     }
 
@@ -211,9 +199,7 @@ export class StartupProfiler {
           cpu_usage_user_usec: phase.cpuUsage.user,
           cpu_usage_system_usec: phase.cpuUsage.system,
           start_time_usec: (performance.timeOrigin + measure.startTime) * 1000,
-          end_time_usec:
-            (performance.timeOrigin + measure.startTime + measure.duration) *
-            1000,
+          end_time_usec: (performance.timeOrigin + measure.startTime + measure.duration) * 1000,
         });
       }
     }
@@ -225,7 +211,7 @@ export class StartupProfiler {
           startupPhases,
           os.platform(),
           os.release(),
-          fs.existsSync('/.dockerenv'),
+          fs.existsSync("/.dockerenv"),
         ),
       );
     }
diff --git a/packages/gemini-cli-core/src/telemetry/telemetry-utils.test.ts b/packages/gemini-cli-core/src/telemetry/telemetry-utils.test.ts
index 4240ae666..b726af9ca 100644
--- a/packages/gemini-cli-core/src/telemetry/telemetry-utils.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/telemetry-utils.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { getProgrammingLanguage } from './telemetry-utils.js';
+import { describe, expect, it } from "vitest";
+import { getProgrammingLanguage } from "./telemetry-utils.js";
 
-describe('getProgrammingLanguage', () => {
+describe("getProgrammingLanguage", () => {
   type ProgrammingLanguageTestCase = {
     name: string;
     args: Record<string, string>;
@@ -16,32 +16,32 @@ describe('getProgrammingLanguage', () => {
 
   it.each<ProgrammingLanguageTestCase>([
     {
-      name: 'file_path is present',
-      args: { file_path: 'src/test.ts' },
-      expected: 'TypeScript',
+      name: "file_path is present",
+      args: { file_path: "src/test.ts" },
+      expected: "TypeScript",
     },
     {
-      name: 'absolute_path is present',
-      args: { absolute_path: 'src/test.py' },
-      expected: 'Python',
+      name: "absolute_path is present",
+      args: { absolute_path: "src/test.py" },
+      expected: "Python",
     },
-    { name: 'path is present', args: { path: 'src/test.go' }, expected: 'Go' },
+    { name: "path is present", args: { path: "src/test.go" }, expected: "Go" },
     {
-      name: 'no file path is present',
+      name: "no file path is present",
       args: {},
       expected: undefined,
     },
     {
-      name: 'unknown file extensions',
-      args: { file_path: 'src/test.unknown' },
+      name: "unknown file extensions",
+      args: { file_path: "src/test.unknown" },
       expected: undefined,
     },
     {
-      name: 'files with no extension',
-      args: { file_path: 'src/test' },
+      name: "files with no extension",
+      args: { file_path: "src/test" },
       expected: undefined,
     },
-  ])('should return $expected when $name', ({ args, expected }) => {
+  ])("should return $expected when $name", ({ args, expected }) => {
     const language = getProgrammingLanguage(args);
     expect(language).toBe(expected);
   });
diff --git a/packages/gemini-cli-core/src/telemetry/telemetry-utils.ts b/packages/gemini-cli-core/src/telemetry/telemetry-utils.ts
index d2a0ffe83..0b2f9c552 100644
--- a/packages/gemini-cli-core/src/telemetry/telemetry-utils.ts
+++ b/packages/gemini-cli-core/src/telemetry/telemetry-utils.ts
@@ -4,13 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
 
-export function getProgrammingLanguage(
-  args: Record<string, unknown>,
-): string | undefined {
-  const filePath = args['file_path'] || args['path'] || args['absolute_path'];
-  if (typeof filePath === 'string') {
+export function getProgrammingLanguage(args: Record<string, unknown>): string | undefined {
+  const filePath = args["file_path"] || args["path"] || args["absolute_path"];
+  if (typeof filePath === "string") {
     return getLanguageFromFilePath(filePath);
   }
   return undefined;
diff --git a/packages/gemini-cli-core/src/telemetry/telemetry.test.ts b/packages/gemini-cli-core/src/telemetry/telemetry.test.ts
index 735dd29b5..0e34dd58f 100644
--- a/packages/gemini-cli-core/src/telemetry/telemetry.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/telemetry.test.ts
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import {
-  initializeTelemetry,
-  shutdownTelemetry,
-  isTelemetrySdkInitialized,
-} from './sdk.js';
-import { Config } from '../config/config.js';
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { GoogleAuth } from 'google-auth-library';
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import { GoogleAuth } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { initializeTelemetry, isTelemetrySdkInitialized, shutdownTelemetry } from "./sdk.js";
 
-vi.mock('@opentelemetry/sdk-node');
-vi.mock('../config/config.js');
-vi.mock('google-auth-library');
+vi.mock("@opentelemetry/sdk-node");
+vi.mock("../config/config.js");
+vi.mock("google-auth-library");
 
-describe('telemetry', () => {
+describe("telemetry", () => {
   let mockConfig: Config;
   let mockNodeSdk: NodeSDK;
   const mockGetApplicationDefault = vi.fn();
@@ -34,17 +30,15 @@ describe('telemetry', () => {
     mockGetApplicationDefault.mockResolvedValue(undefined); // Simulate ADC available
 
     mockConfig = new Config({
-      sessionId: 'test-session-id',
-      model: 'test-model',
-      targetDir: '/test/dir',
+      sessionId: "test-session-id",
+      model: "test-model",
+      targetDir: "/test/dir",
       debugMode: false,
-      cwd: '/test/dir',
+      cwd: "/test/dir",
     });
-    vi.spyOn(mockConfig, 'getTelemetryEnabled').mockReturnValue(true);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'http://localhost:4317',
-    );
-    vi.spyOn(mockConfig, 'getSessionId').mockReturnValue('test-session-id');
+    vi.spyOn(mockConfig, "getTelemetryEnabled").mockReturnValue(true);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("http://localhost:4317");
+    vi.spyOn(mockConfig, "getSessionId").mockReturnValue("test-session-id");
     mockNodeSdk = {
       start: vi.fn(),
       shutdown: vi.fn().mockResolvedValue(undefined),
@@ -59,13 +53,13 @@ describe('telemetry', () => {
     }
   });
 
-  it('should initialize the telemetry service', async () => {
+  it("should initialize the telemetry service", async () => {
     await initializeTelemetry(mockConfig);
     expect(NodeSDK).toHaveBeenCalled();
     expect(mockNodeSdk.start).toHaveBeenCalled();
   });
 
-  it('should shutdown the telemetry service', async () => {
+  it("should shutdown the telemetry service", async () => {
     await initializeTelemetry(mockConfig);
     await shutdownTelemetry(mockConfig);
 
diff --git a/packages/gemini-cli-core/src/telemetry/telemetryAttributes.ts b/packages/gemini-cli-core/src/telemetry/telemetryAttributes.ts
index 83593021f..87355305c 100644
--- a/packages/gemini-cli-core/src/telemetry/telemetryAttributes.ts
+++ b/packages/gemini-cli-core/src/telemetry/telemetryAttributes.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Attributes } from '@opentelemetry/api';
-import type { Config } from '../config/config.js';
-import { InstallationManager } from '../utils/installationManager.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
+import type { Attributes } from "@opentelemetry/api";
+import type { Config } from "../config/config.js";
+import { InstallationManager } from "../utils/installationManager.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
 
 const userAccountManager = new UserAccountManager();
 const installationManager = new InstallationManager();
@@ -15,9 +15,9 @@ const installationManager = new InstallationManager();
 export function getCommonAttributes(config: Config): Attributes {
   const email = userAccountManager.getCachedGoogleAccount();
   return {
-    'session.id': config.getSessionId(),
-    'installation.id': installationManager.getInstallationId(),
+    "session.id": config.getSessionId(),
+    "installation.id": installationManager.getInstallationId(),
     interactive: config.isInteractive(),
-    ...(email && { 'user.email': email }),
+    ...(email && { "user.email": email }),
   };
 }
diff --git a/packages/gemini-cli-core/src/telemetry/tool-call-decision.ts b/packages/gemini-cli-core/src/telemetry/tool-call-decision.ts
index 167df10a3..b71c5aeba 100644
--- a/packages/gemini-cli-core/src/telemetry/tool-call-decision.ts
+++ b/packages/gemini-cli-core/src/telemetry/tool-call-decision.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ToolConfirmationOutcome } from '../tools/tools.js';
+import { ToolConfirmationOutcome } from "../tools/tools.js";
 
 export enum ToolCallDecision {
-  ACCEPT = 'accept',
-  REJECT = 'reject',
-  MODIFY = 'modify',
-  AUTO_ACCEPT = 'auto_accept',
+  ACCEPT = "accept",
+  REJECT = "reject",
+  MODIFY = "modify",
+  AUTO_ACCEPT = "auto_accept",
 }
 
-export function getDecisionFromOutcome(
-  outcome: ToolConfirmationOutcome,
-): ToolCallDecision {
+export function getDecisionFromOutcome(outcome: ToolConfirmationOutcome): ToolCallDecision {
   switch (outcome) {
     case ToolConfirmationOutcome.ProceedOnce:
       return ToolCallDecision.ACCEPT;
diff --git a/packages/gemini-cli-core/src/telemetry/trace.ts b/packages/gemini-cli-core/src/telemetry/trace.ts
index 3c84a3b67..8df5db113 100644
--- a/packages/gemini-cli-core/src/telemetry/trace.ts
+++ b/packages/gemini-cli-core/src/telemetry/trace.ts
@@ -5,16 +5,16 @@
  */
 
 import {
+  type AttributeValue,
   diag,
+  type SpanOptions,
   SpanStatusCode,
   trace,
-  type AttributeValue,
-  type SpanOptions,
-} from '@opentelemetry/api';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+} from "@opentelemetry/api";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
 
-const TRACER_NAME = 'gemini-cli';
-const TRACER_VERSION = 'v1';
+const TRACER_NAME = "gemini-cli";
+const TRACER_VERSION = "v1";
 
 /**
  * Metadata for a span.
@@ -52,15 +52,10 @@ export interface SpanMetadata {
  */
 export async function runInDevTraceSpan<R>(
   opts: SpanOptions & { name: string; noAutoEnd?: boolean },
-  fn: ({
-    metadata,
-  }: {
-    metadata: SpanMetadata;
-    endSpan: () => void;
-  }) => Promise<R>,
+  fn: ({ metadata }: { metadata: SpanMetadata; endSpan: () => void }) => Promise<R>,
 ): Promise<R> {
   const { name: spanName, noAutoEnd, ...restOfSpanOpts } = opts;
-  if (process.env['GEMINI_DEV_TRACING'] !== 'true') {
+  if (process.env["GEMINI_DEV_TRACING"] !== "true") {
     // If GEMINI_DEV_TRACING env var not set, we do not trace.
     return fn({
       metadata: {
@@ -82,10 +77,10 @@ export async function runInDevTraceSpan<R>(
     const endSpan = () => {
       try {
         if (meta.input !== undefined) {
-          span.setAttribute('input-json', safeJsonStringify(meta.input));
+          span.setAttribute("input-json", safeJsonStringify(meta.input));
         }
         if (meta.output !== undefined) {
-          span.setAttribute('output-json', safeJsonStringify(meta.output));
+          span.setAttribute("output-json", safeJsonStringify(meta.output));
         }
         for (const [key, value] of Object.entries(meta.attributes)) {
           span.setAttribute(key, value as AttributeValue);
@@ -103,7 +98,7 @@ export async function runInDevTraceSpan<R>(
         }
       } catch (e) {
         // Log the error but don't rethrow, to ensure span.end() is called.
-        diag.error('Error setting span attributes in endSpan', e);
+        diag.error("Error setting span attributes in endSpan", e);
         span.setStatus({
           code: SpanStatusCode.ERROR,
           message: `Error in endSpan: ${getErrorMessage(e)}`,
@@ -142,7 +137,7 @@ function getErrorMessage(e: unknown): string {
   if (e instanceof Error) {
     return e.message;
   }
-  if (typeof e === 'string') {
+  if (typeof e === "string") {
     return e;
   }
   return safeJsonStringify(e);
diff --git a/packages/gemini-cli-core/src/telemetry/types.ts b/packages/gemini-cli-core/src/telemetry/types.ts
index 136896771..f3eca3c13 100644
--- a/packages/gemini-cli-core/src/telemetry/types.ts
+++ b/packages/gemini-cli-core/src/telemetry/types.ts
@@ -9,50 +9,47 @@ import type {
   Content,
   GenerateContentConfig,
   GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { ApprovalMode } from '../policy/types.js';
-
-import type { CompletedToolCall } from '../core/coreToolScheduler.js';
-import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
-import type { FileDiff } from '../tools/tools.js';
-import { AuthType } from '../core/contentGenerator.js';
-import type { LogAttributes, LogRecord } from '@opentelemetry/api-logs';
-import {
-  getDecisionFromOutcome,
-  ToolCallDecision,
-} from './tool-call-decision.js';
-import { getConventionAttributes, type FileOperation } from './metrics.js';
+} from "@google/genai";
+import type { LogAttributes, LogRecord } from "@opentelemetry/api-logs";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import type { CompletedToolCall } from "../core/coreToolScheduler.js";
+import type { ApprovalMode } from "../policy/types.js";
+import { DiscoveredMCPTool } from "../tools/mcp-tool.js";
+import type { FileDiff } from "../tools/tools.js";
+import { type FileOperation, getConventionAttributes } from "./metrics.js";
+import { getDecisionFromOutcome, ToolCallDecision } from "./tool-call-decision.js";
+
 export { ToolCallDecision };
-import type { ToolRegistry } from '../tools/tool-registry.js';
-import type { OutputFormat } from '../output/types.js';
-import type { AgentTerminateMode } from '../agents/types.js';
-
-import { getCommonAttributes } from './telemetryAttributes.js';
-import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import type { OTelFinishReason } from './semantic.js';
+
+import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
+import type { AgentTerminateMode } from "../agents/types.js";
+import type { OutputFormat } from "../output/types.js";
+import type { ToolRegistry } from "../tools/tool-registry.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { sanitizeHookName } from "./sanitize.js";
+import type { OTelFinishReason } from "./semantic.js";
 import {
+  toFinishReasons,
   toInputMessages,
   toOutputMessages,
-  toFinishReasons,
   toOutputType,
   toSystemInstruction,
-} from './semantic.js';
-import { sanitizeHookName } from './sanitize.js';
+} from "./semantic.js";
+import { getCommonAttributes } from "./telemetryAttributes.js";
 
 export interface BaseTelemetryEvent {
-  'event.name': string;
+  "event.name": string;
   /** Current timestamp in ISO 8601 format */
-  'event.timestamp': string;
+  "event.timestamp": string;
 }
 
 type CommonFields = keyof BaseTelemetryEvent;
 
-export const EVENT_CLI_CONFIG = 'gemini_cli.config';
+export const EVENT_CLI_CONFIG = "gemini_cli.config";
 export class StartSessionEvent implements BaseTelemetryEvent {
-  'event.name': 'cli_config';
-  'event.timestamp': string;
+  "event.name": "cli_config";
+  "event.timestamp": string;
   model: string;
   embedding_model: string;
   sandbox_enabled: boolean;
@@ -76,8 +73,7 @@ export class StartSessionEvent implements BaseTelemetryEvent {
 
   constructor(config: Config, toolRegistry?: ToolRegistry) {
     const generatorConfig = config.getContentGeneratorConfig();
-    const mcpServers =
-      config.getMcpClientManager()?.getMcpServers() ?? config.getMcpServers();
+    const mcpServers = config.getMcpClientManager()?.getMcpServers() ?? config.getMcpServers();
 
     let useGemini = false;
     let useVertex = false;
@@ -86,46 +82,41 @@ export class StartSessionEvent implements BaseTelemetryEvent {
       useVertex = generatorConfig.authType === AuthType.USE_VERTEX_AI;
     }
 
-    this['event.name'] = 'cli_config';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "cli_config";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = config.getModel();
     this.embedding_model = config.getEmbeddingModel();
-    this.sandbox_enabled =
-      typeof config.getSandbox() === 'string' || !!config.getSandbox();
-    this.core_tools_enabled = (config.getCoreTools() ?? []).join(',');
+    this.sandbox_enabled = typeof config.getSandbox() === "string" || !!config.getSandbox();
+    this.core_tools_enabled = (config.getCoreTools() ?? []).join(",");
     this.approval_mode = config.getApprovalMode();
     this.api_key_enabled = useGemini || useVertex;
     this.vertex_ai_enabled = useVertex;
     this.debug_enabled = config.getDebugMode();
-    this.mcp_servers = mcpServers ? Object.keys(mcpServers).join(',') : '';
+    this.mcp_servers = mcpServers ? Object.keys(mcpServers).join(",") : "";
     this.telemetry_enabled = config.getTelemetryEnabled();
-    this.telemetry_log_user_prompts_enabled =
-      config.getTelemetryLogPromptsEnabled();
-    this.file_filtering_respect_git_ignore =
-      config.getFileFilteringRespectGitIgnore();
+    this.telemetry_log_user_prompts_enabled = config.getTelemetryLogPromptsEnabled();
+    this.file_filtering_respect_git_ignore = config.getFileFilteringRespectGitIgnore();
     this.mcp_servers_count = mcpServers ? Object.keys(mcpServers).length : 0;
     this.output_format = config.getOutputFormat();
     const extensions = config.getExtensions();
     this.extensions_count = extensions.length;
-    this.extensions = extensions.map((e) => e.name).join(',');
-    this.extension_ids = extensions.map((e) => e.id).join(',');
+    this.extensions = extensions.map((e) => e.name).join(",");
+    this.extension_ids = extensions.map((e) => e.id).join(",");
     this.auth_type = generatorConfig?.authType;
     if (toolRegistry) {
       const mcpTools = toolRegistry
         .getAllTools()
         .filter((tool) => tool instanceof DiscoveredMCPTool);
       this.mcp_tools_count = mcpTools.length;
-      this.mcp_tools = mcpTools
-        .map((tool) => (tool as DiscoveredMCPTool).name)
-        .join(',');
+      this.mcp_tools = mcpTools.map((tool) => (tool as DiscoveredMCPTool).name).join(",");
     }
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CLI_CONFIG,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CLI_CONFIG,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
       embedding_model: this.embedding_model,
       sandbox_enabled: this.sandbox_enabled,
@@ -149,52 +140,47 @@ export class StartSessionEvent implements BaseTelemetryEvent {
   }
 
   toLogBody(): string {
-    return 'CLI configuration loaded.';
+    return "CLI configuration loaded.";
   }
 }
 
 export class EndSessionEvent implements BaseTelemetryEvent {
-  'event.name': 'end_session';
-  'event.timestamp': string;
+  "event.name": "end_session";
+  "event.timestamp": string;
   session_id?: string;
 
   constructor(config?: Config) {
-    this['event.name'] = 'end_session';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "end_session";
+    this["event.timestamp"] = new Date().toISOString();
     this.session_id = config?.getSessionId();
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': this['event.name'],
-      'event.timestamp': this['event.timestamp'],
+      "event.name": this["event.name"],
+      "event.timestamp": this["event.timestamp"],
       session_id: this.session_id,
     };
   }
 
   toLogBody(): string {
-    return 'Session ended.';
+    return "Session ended.";
   }
 }
 
-export const EVENT_USER_PROMPT = 'gemini_cli.user_prompt';
+export const EVENT_USER_PROMPT = "gemini_cli.user_prompt";
 export class UserPromptEvent implements BaseTelemetryEvent {
-  'event.name': 'user_prompt';
-  'event.timestamp': string;
+  "event.name": "user_prompt";
+  "event.timestamp": string;
   prompt_length: number;
   prompt_id: string;
   auth_type?: string;
   prompt?: string;
 
-  constructor(
-    prompt_length: number,
-    prompt_Id: string,
-    auth_type?: string,
-    prompt?: string,
-  ) {
-    this['event.name'] = 'user_prompt';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(prompt_length: number, prompt_Id: string, auth_type?: string, prompt?: string) {
+    this["event.name"] = "user_prompt";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_length = prompt_length;
     this.prompt_id = prompt_Id;
     this.auth_type = auth_type;
@@ -204,18 +190,18 @@ export class UserPromptEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_USER_PROMPT,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_USER_PROMPT,
+      "event.timestamp": this["event.timestamp"],
       prompt_length: this.prompt_length,
       prompt_id: this.prompt_id,
     };
 
     if (this.auth_type) {
-      attributes['auth_type'] = this.auth_type;
+      attributes["auth_type"] = this.auth_type;
     }
 
     if (config.getTelemetryLogPromptsEnabled()) {
-      attributes['prompt'] = this.prompt;
+      attributes["prompt"] = this.prompt;
     }
     return attributes;
   }
@@ -225,10 +211,10 @@ export class UserPromptEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_TOOL_CALL = 'gemini_cli.tool_call';
+export const EVENT_TOOL_CALL = "gemini_cli.tool_call";
 export class ToolCallEvent implements BaseTelemetryEvent {
-  'event.name': 'tool_call';
-  'event.timestamp': string;
+  "event.name": "tool_call";
+  "event.timestamp": string;
   function_name: string;
   function_args: Record<string, unknown>;
   duration_ms: number;
@@ -237,7 +223,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
   error?: string;
   error_type?: string;
   prompt_id: string;
-  tool_type: 'native' | 'mcp';
+  tool_type: "native" | "mcp";
   content_length?: number;
   mcp_server_name?: string;
   extension_name?: string;
@@ -253,7 +239,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
     duration_ms: number,
     success: boolean,
     prompt_id: string,
-    tool_type: 'native' | 'mcp',
+    tool_type: "native" | "mcp",
     error?: string,
   );
   constructor(
@@ -263,41 +249,36 @@ export class ToolCallEvent implements BaseTelemetryEvent {
     duration_ms?: number,
     success?: boolean,
     prompt_id?: string,
-    tool_type?: 'native' | 'mcp',
+    tool_type?: "native" | "mcp",
     error?: string,
   ) {
-    this['event.name'] = 'tool_call';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "tool_call";
+    this["event.timestamp"] = new Date().toISOString();
 
     if (call) {
       this.function_name = call.request.name;
       this.function_args = call.request.args;
       this.duration_ms = call.durationMs ?? 0;
-      this.success = call.status === 'success';
-      this.decision = call.outcome
-        ? getDecisionFromOutcome(call.outcome)
-        : undefined;
+      this.success = call.status === "success";
+      this.decision = call.outcome ? getDecisionFromOutcome(call.outcome) : undefined;
       this.error = call.response.error?.message;
       this.error_type = call.response.errorType;
       this.prompt_id = call.request.prompt_id;
       this.content_length = call.response.contentLength;
-      if (
-        typeof call.tool !== 'undefined' &&
-        call.tool instanceof DiscoveredMCPTool
-      ) {
-        this.tool_type = 'mcp';
+      if (typeof call.tool !== "undefined" && call.tool instanceof DiscoveredMCPTool) {
+        this.tool_type = "mcp";
         this.mcp_server_name = call.tool.serverName;
         this.extension_name = call.tool.extensionName;
         this.extension_id = call.tool.extensionId;
       } else {
-        this.tool_type = 'native';
+        this.tool_type = "native";
       }
 
       if (
-        call.status === 'success' &&
-        typeof call.response.resultDisplay === 'object' &&
+        call.status === "success" &&
+        typeof call.response.resultDisplay === "object" &&
         call.response.resultDisplay !== null &&
-        'diffStat' in call.response.resultDisplay
+        "diffStat" in call.response.resultDisplay
       ) {
         const diffStat = (call.response.resultDisplay as FileDiff).diffStat;
         if (diffStat) {
@@ -327,8 +308,8 @@ export class ToolCallEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_TOOL_CALL,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_TOOL_CALL,
+      "event.timestamp": this["event.timestamp"],
       function_name: this.function_name,
       function_args: safeJsonStringify(this.function_args, 2),
       duration_ms: this.duration_ms,
@@ -344,36 +325,32 @@ export class ToolCallEvent implements BaseTelemetryEvent {
     };
 
     if (this.error) {
-      attributes['error'] = this.error;
-      attributes['error.message'] = this.error;
+      attributes["error"] = this.error;
+      attributes["error.message"] = this.error;
       if (this.error_type) {
-        attributes['error_type'] = this.error_type;
-        attributes['error.type'] = this.error_type;
+        attributes["error_type"] = this.error_type;
+        attributes["error.type"] = this.error_type;
       }
     }
     return attributes;
   }
 
   toLogBody(): string {
-    return `Tool call: ${this.function_name}${this.decision ? `. Decision: ${this.decision}` : ''}. Success: ${this.success}. Duration: ${this.duration_ms}ms.`;
+    return `Tool call: ${this.function_name}${this.decision ? `. Decision: ${this.decision}` : ""}. Success: ${this.success}. Duration: ${this.duration_ms}ms.`;
   }
 }
 
-export const EVENT_API_REQUEST = 'gemini_cli.api_request';
+export const EVENT_API_REQUEST = "gemini_cli.api_request";
 export class ApiRequestEvent implements BaseTelemetryEvent {
-  'event.name': 'api_request';
-  'event.timestamp': string;
+  "event.name": "api_request";
+  "event.timestamp": string;
   model: string;
   prompt: GenAIPromptDetails;
   request_text?: string;
 
-  constructor(
-    model: string,
-    prompt_details: GenAIPromptDetails,
-    request_text?: string,
-  ) {
-    this['event.name'] = 'api_request';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(model: string, prompt_details: GenAIPromptDetails, request_text?: string) {
+    this["event.name"] = "api_request";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
     this.prompt = prompt_details;
     this.request_text = request_text;
@@ -382,8 +359,8 @@ export class ApiRequestEvent implements BaseTelemetryEvent {
   toLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_API_REQUEST,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_API_REQUEST,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
       prompt_id: this.prompt.prompt_id,
       request_text: this.request_text,
@@ -392,28 +369,25 @@ export class ApiRequestEvent implements BaseTelemetryEvent {
   }
 
   toSemanticLogRecord(config: Config): LogRecord {
-    const { 'gen_ai.response.model': _, ...requestConventionAttributes } =
-      getConventionAttributes({
-        model: this.model,
-        auth_type: config.getContentGeneratorConfig()?.authType,
-      });
+    const { "gen_ai.response.model": _, ...requestConventionAttributes } = getConventionAttributes({
+      model: this.model,
+      auth_type: config.getContentGeneratorConfig()?.authType,
+    });
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_GEN_AI_OPERATION_DETAILS,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_GEN_AI_OPERATION_DETAILS,
+      "event.timestamp": this["event.timestamp"],
       ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
       ...requestConventionAttributes,
     };
 
     if (this.prompt.server) {
-      attributes['server.address'] = this.prompt.server.address;
-      attributes['server.port'] = this.prompt.server.port;
+      attributes["server.address"] = this.prompt.server.address;
+      attributes["server.port"] = this.prompt.server.port;
     }
 
     if (config.getTelemetryLogPromptsEnabled() && this.prompt.contents) {
-      attributes['gen_ai.input.messages'] = JSON.stringify(
-        toInputMessages(this.prompt.contents),
-      );
+      attributes["gen_ai.input.messages"] = JSON.stringify(toInputMessages(this.prompt.contents));
     }
 
     const logRecord: LogRecord = {
@@ -425,10 +399,10 @@ export class ApiRequestEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_API_ERROR = 'gemini_cli.api_error';
+export const EVENT_API_ERROR = "gemini_cli.api_error";
 export class ApiErrorEvent implements BaseTelemetryEvent {
-  'event.name': 'api_error';
-  'event.timestamp': string;
+  "event.name": "api_error";
+  "event.timestamp": string;
   model: string;
   prompt: GenAIPromptDetails;
   error: string;
@@ -446,8 +420,8 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
     error_type?: string,
     status_code?: number | string,
   ) {
-    this['event.name'] = 'api_error';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_error";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
     this.error = error;
     this.error_type = error_type;
@@ -460,9 +434,9 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
   toLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_API_ERROR,
-      'event.timestamp': this['event.timestamp'],
-      ['error.message']: this.error,
+      "event.name": EVENT_API_ERROR,
+      "event.timestamp": this["event.timestamp"],
+      ["error.message"]: this.error,
       model_name: this.model,
       duration: this.duration_ms,
       model: this.model,
@@ -474,9 +448,9 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
     };
 
     if (this.error_type) {
-      attributes['error.type'] = this.error_type;
+      attributes["error.type"] = this.error_type;
     }
-    if (typeof this.status_code === 'number') {
+    if (typeof this.status_code === "number") {
       attributes[SemanticAttributes.HTTP_STATUS_CODE] = this.status_code;
     }
     const logRecord: LogRecord = {
@@ -489,21 +463,19 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
   toSemanticLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_GEN_AI_OPERATION_DETAILS,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_GEN_AI_OPERATION_DETAILS,
+      "event.timestamp": this["event.timestamp"],
       ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
       ...getConventionAttributes(this),
     };
 
     if (this.prompt.server) {
-      attributes['server.address'] = this.prompt.server.address;
-      attributes['server.port'] = this.prompt.server.port;
+      attributes["server.address"] = this.prompt.server.address;
+      attributes["server.port"] = this.prompt.server.port;
     }
 
     if (config.getTelemetryLogPromptsEnabled() && this.prompt.contents) {
-      attributes['gen_ai.input.messages'] = JSON.stringify(
-        toInputMessages(this.prompt.contents),
-      );
+      attributes["gen_ai.input.messages"] = JSON.stringify(toInputMessages(this.prompt.contents));
     }
 
     const logRecord: LogRecord = {
@@ -541,36 +513,31 @@ export interface GenAIUsageDetails {
   total_token_count: number;
 }
 
-export const EVENT_API_RESPONSE = 'gemini_cli.api_response';
-export const EVENT_GEN_AI_OPERATION_DETAILS =
-  'gen_ai.client.inference.operation.details';
+export const EVENT_API_RESPONSE = "gemini_cli.api_response";
+export const EVENT_GEN_AI_OPERATION_DETAILS = "gen_ai.client.inference.operation.details";
 
-function toGenerateContentConfigAttributes(
-  config?: GenerateContentConfig,
-): LogAttributes {
+function toGenerateContentConfigAttributes(config?: GenerateContentConfig): LogAttributes {
   if (!config) {
     return {};
   }
   return {
-    'gen_ai.request.temperature': config.temperature,
-    'gen_ai.request.top_p': config.topP,
-    'gen_ai.request.top_k': config.topK,
-    'gen_ai.request.choice.count': config.candidateCount,
-    'gen_ai.request.seed': config.seed,
-    'gen_ai.request.frequency_penalty': config.frequencyPenalty,
-    'gen_ai.request.presence_penalty': config.presencePenalty,
-    'gen_ai.request.max_tokens': config.maxOutputTokens,
-    'gen_ai.output.type': toOutputType(config.responseMimeType),
-    'gen_ai.request.stop_sequences': config.stopSequences,
-    'gen_ai.system_instructions': JSON.stringify(
-      toSystemInstruction(config.systemInstruction),
-    ),
+    "gen_ai.request.temperature": config.temperature,
+    "gen_ai.request.top_p": config.topP,
+    "gen_ai.request.top_k": config.topK,
+    "gen_ai.request.choice.count": config.candidateCount,
+    "gen_ai.request.seed": config.seed,
+    "gen_ai.request.frequency_penalty": config.frequencyPenalty,
+    "gen_ai.request.presence_penalty": config.presencePenalty,
+    "gen_ai.request.max_tokens": config.maxOutputTokens,
+    "gen_ai.output.type": toOutputType(config.responseMimeType),
+    "gen_ai.request.stop_sequences": config.stopSequences,
+    "gen_ai.system_instructions": JSON.stringify(toSystemInstruction(config.systemInstruction)),
   };
 }
 
 export class ApiResponseEvent implements BaseTelemetryEvent {
-  'event.name': 'api_response';
-  'event.timestamp': string;
+  "event.name": "api_response";
+  "event.timestamp": string;
   status_code?: number | string;
   duration_ms: number;
   response_text?: string;
@@ -591,8 +558,8 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
     usage_data?: GenerateContentResponseUsageMetadata,
     response_text?: string,
   ) {
-    this['event.name'] = 'api_response';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_response";
+    this["event.timestamp"] = new Date().toISOString();
     this.duration_ms = duration_ms;
     this.status_code = 200;
     this.response_text = response_text;
@@ -615,8 +582,8 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
   toLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_API_RESPONSE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_API_RESPONSE,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
       duration_ms: this.duration_ms,
       input_token_count: this.usage.input_token_count,
@@ -631,15 +598,15 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
       finish_reasons: this.finish_reasons,
     };
     if (this.response_text) {
-      attributes['response_text'] = this.response_text;
+      attributes["response_text"] = this.response_text;
     }
     if (this.status_code) {
-      if (typeof this.status_code === 'number') {
+      if (typeof this.status_code === "number") {
         attributes[SemanticAttributes.HTTP_STATUS_CODE] = this.status_code;
       }
     }
     const logRecord: LogRecord = {
-      body: `API response from ${this.model}. Status: ${this.status_code || 'N/A'}. Duration: ${this.duration_ms}ms.`,
+      body: `API response from ${this.model}. Status: ${this.status_code || "N/A"}. Duration: ${this.duration_ms}ms.`,
       attributes,
     };
     return logRecord;
@@ -648,35 +615,31 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
   toSemanticLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_GEN_AI_OPERATION_DETAILS,
-      'event.timestamp': this['event.timestamp'],
-      'gen_ai.response.id': this.response.response_id,
-      'gen_ai.response.finish_reasons': this.finish_reasons,
-      'gen_ai.output.messages': JSON.stringify(
-        toOutputMessages(this.response.candidates),
-      ),
+      "event.name": EVENT_GEN_AI_OPERATION_DETAILS,
+      "event.timestamp": this["event.timestamp"],
+      "gen_ai.response.id": this.response.response_id,
+      "gen_ai.response.finish_reasons": this.finish_reasons,
+      "gen_ai.output.messages": JSON.stringify(toOutputMessages(this.response.candidates)),
       ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
       ...getConventionAttributes(this),
     };
 
     if (this.prompt.server) {
-      attributes['server.address'] = this.prompt.server.address;
-      attributes['server.port'] = this.prompt.server.port;
+      attributes["server.address"] = this.prompt.server.address;
+      attributes["server.port"] = this.prompt.server.port;
     }
 
     if (config.getTelemetryLogPromptsEnabled() && this.prompt.contents) {
-      attributes['gen_ai.input.messages'] = JSON.stringify(
-        toInputMessages(this.prompt.contents),
-      );
+      attributes["gen_ai.input.messages"] = JSON.stringify(toInputMessages(this.prompt.contents));
     }
 
     if (this.usage) {
-      attributes['gen_ai.usage.input_tokens'] = this.usage.input_token_count;
-      attributes['gen_ai.usage.output_tokens'] = this.usage.output_token_count;
+      attributes["gen_ai.usage.input_tokens"] = this.usage.input_token_count;
+      attributes["gen_ai.usage.output_tokens"] = this.usage.output_token_count;
     }
 
     const logRecord: LogRecord = {
-      body: `GenAI operation details from ${this.model}. Status: ${this.status_code || 'N/A'}. Duration: ${this.duration_ms}ms.`,
+      body: `GenAI operation details from ${this.model}. Status: ${this.status_code || "N/A"}. Duration: ${this.duration_ms}ms.`,
       attributes,
     };
 
@@ -684,23 +647,23 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_FLASH_FALLBACK = 'gemini_cli.flash_fallback';
+export const EVENT_FLASH_FALLBACK = "gemini_cli.flash_fallback";
 export class FlashFallbackEvent implements BaseTelemetryEvent {
-  'event.name': 'flash_fallback';
-  'event.timestamp': string;
+  "event.name": "flash_fallback";
+  "event.timestamp": string;
   auth_type: string;
 
   constructor(auth_type: string) {
-    this['event.name'] = 'flash_fallback';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "flash_fallback";
+    this["event.timestamp"] = new Date().toISOString();
     this.auth_type = auth_type;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_FLASH_FALLBACK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_FLASH_FALLBACK,
+      "event.timestamp": this["event.timestamp"],
       auth_type: this.auth_type,
     };
   }
@@ -710,21 +673,21 @@ export class FlashFallbackEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_RIPGREP_FALLBACK = 'gemini_cli.ripgrep_fallback';
+export const EVENT_RIPGREP_FALLBACK = "gemini_cli.ripgrep_fallback";
 export class RipgrepFallbackEvent implements BaseTelemetryEvent {
-  'event.name': 'ripgrep_fallback';
-  'event.timestamp': string;
+  "event.name": "ripgrep_fallback";
+  "event.timestamp": string;
 
   constructor(public error?: string) {
-    this['event.name'] = 'ripgrep_fallback';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "ripgrep_fallback";
+    this["event.timestamp"] = new Date().toISOString();
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_RIPGREP_FALLBACK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_RIPGREP_FALLBACK,
+      "event.timestamp": this["event.timestamp"],
       error: this.error,
     };
   }
@@ -735,25 +698,21 @@ export class RipgrepFallbackEvent implements BaseTelemetryEvent {
 }
 
 export enum LoopType {
-  CONSECUTIVE_IDENTICAL_TOOL_CALLS = 'consecutive_identical_tool_calls',
-  CHANTING_IDENTICAL_SENTENCES = 'chanting_identical_sentences',
-  LLM_DETECTED_LOOP = 'llm_detected_loop',
+  CONSECUTIVE_IDENTICAL_TOOL_CALLS = "consecutive_identical_tool_calls",
+  CHANTING_IDENTICAL_SENTENCES = "chanting_identical_sentences",
+  LLM_DETECTED_LOOP = "llm_detected_loop",
 }
 
 export class LoopDetectedEvent implements BaseTelemetryEvent {
-  'event.name': 'loop_detected';
-  'event.timestamp': string;
+  "event.name": "loop_detected";
+  "event.timestamp": string;
   loop_type: LoopType;
   prompt_id: string;
   confirmed_by_model?: string;
 
-  constructor(
-    loop_type: LoopType,
-    prompt_id: string,
-    confirmed_by_model?: string,
-  ) {
-    this['event.name'] = 'loop_detected';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(loop_type: LoopType, prompt_id: string, confirmed_by_model?: string) {
+    this["event.name"] = "loop_detected";
+    this["event.timestamp"] = new Date().toISOString();
     this.loop_type = loop_type;
     this.prompt_id = prompt_id;
     this.confirmed_by_model = confirmed_by_model;
@@ -762,40 +721,40 @@ export class LoopDetectedEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': this['event.name'],
-      'event.timestamp': this['event.timestamp'],
+      "event.name": this["event.name"],
+      "event.timestamp": this["event.timestamp"],
       loop_type: this.loop_type,
       prompt_id: this.prompt_id,
     };
 
     if (this.confirmed_by_model) {
-      attributes['confirmed_by_model'] = this.confirmed_by_model;
+      attributes["confirmed_by_model"] = this.confirmed_by_model;
     }
 
     return attributes;
   }
 
   toLogBody(): string {
-    return `Loop detected. Type: ${this.loop_type}.${this.confirmed_by_model ? ` Confirmed by: ${this.confirmed_by_model}` : ''}`;
+    return `Loop detected. Type: ${this.loop_type}.${this.confirmed_by_model ? ` Confirmed by: ${this.confirmed_by_model}` : ""}`;
   }
 }
 
 export class LoopDetectionDisabledEvent implements BaseTelemetryEvent {
-  'event.name': 'loop_detection_disabled';
-  'event.timestamp': string;
+  "event.name": "loop_detection_disabled";
+  "event.timestamp": string;
   prompt_id: string;
 
   constructor(prompt_id: string) {
-    this['event.name'] = 'loop_detection_disabled';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "loop_detection_disabled";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': this['event.name'],
-      'event.timestamp': this['event.timestamp'],
+      "event.name": this["event.name"],
+      "event.timestamp": this["event.timestamp"],
       prompt_id: this.prompt_id,
     };
   }
@@ -805,17 +764,17 @@ export class LoopDetectionDisabledEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_NEXT_SPEAKER_CHECK = 'gemini_cli.next_speaker_check';
+export const EVENT_NEXT_SPEAKER_CHECK = "gemini_cli.next_speaker_check";
 export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
-  'event.name': 'next_speaker_check';
-  'event.timestamp': string;
+  "event.name": "next_speaker_check";
+  "event.timestamp": string;
   prompt_id: string;
   finish_reason: string;
   result: string;
 
   constructor(prompt_id: string, finish_reason: string, result: string) {
-    this['event.name'] = 'next_speaker_check';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "next_speaker_check";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
     this.finish_reason = finish_reason;
     this.result = result;
@@ -824,8 +783,8 @@ export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_NEXT_SPEAKER_CHECK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_NEXT_SPEAKER_CHECK,
+      "event.timestamp": this["event.timestamp"],
       prompt_id: this.prompt_id,
       finish_reason: this.finish_reason,
       result: this.result,
@@ -837,10 +796,10 @@ export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_SLASH_COMMAND = 'gemini_cli.slash_command';
+export const EVENT_SLASH_COMMAND = "gemini_cli.slash_command";
 export interface SlashCommandEvent extends BaseTelemetryEvent {
-  'event.name': 'slash_command';
-  'event.timestamp': string;
+  "event.name": "slash_command";
+  "event.timestamp": string;
   command: string;
   subcommand?: string;
   status?: SlashCommandStatus;
@@ -856,11 +815,11 @@ export function makeSlashCommandEvent({
   extension_id,
 }: Omit<
   SlashCommandEvent,
-  CommonFields | 'toOpenTelemetryAttributes' | 'toLogBody'
+  CommonFields | "toOpenTelemetryAttributes" | "toLogBody"
 >): SlashCommandEvent {
   return {
-    'event.name': 'slash_command',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "slash_command",
+    "event.timestamp": new Date().toISOString(),
     command,
     subcommand,
     status,
@@ -868,8 +827,8 @@ export function makeSlashCommandEvent({
     toOpenTelemetryAttributes(config: Config): LogAttributes {
       return {
         ...getCommonAttributes(config),
-        'event.name': EVENT_SLASH_COMMAND,
-        'event.timestamp': this['event.timestamp'],
+        "event.name": EVENT_SLASH_COMMAND,
+        "event.timestamp": this["event.timestamp"],
         command: this.command,
         subcommand: this.subcommand,
         status: this.status,
@@ -883,14 +842,14 @@ export function makeSlashCommandEvent({
 }
 
 export enum SlashCommandStatus {
-  SUCCESS = 'success',
-  ERROR = 'error',
+  SUCCESS = "success",
+  ERROR = "error",
 }
 
-export const EVENT_CHAT_COMPRESSION = 'gemini_cli.chat_compression';
+export const EVENT_CHAT_COMPRESSION = "gemini_cli.chat_compression";
 export interface ChatCompressionEvent extends BaseTelemetryEvent {
-  'event.name': 'chat_compression';
-  'event.timestamp': string;
+  "event.name": "chat_compression";
+  "event.timestamp": string;
   tokens_before: number;
   tokens_after: number;
   toOpenTelemetryAttributes(config: Config): LogAttributes;
@@ -902,18 +861,18 @@ export function makeChatCompressionEvent({
   tokens_after,
 }: Omit<
   ChatCompressionEvent,
-  CommonFields | 'toOpenTelemetryAttributes' | 'toLogBody'
+  CommonFields | "toOpenTelemetryAttributes" | "toLogBody"
 >): ChatCompressionEvent {
   return {
-    'event.name': 'chat_compression',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "chat_compression",
+    "event.timestamp": new Date().toISOString(),
     tokens_before,
     tokens_after,
     toOpenTelemetryAttributes(config: Config): LogAttributes {
       return {
         ...getCommonAttributes(config),
-        'event.name': EVENT_CHAT_COMPRESSION,
-        'event.timestamp': this['event.timestamp'],
+        "event.name": EVENT_CHAT_COMPRESSION,
+        "event.timestamp": this["event.timestamp"],
         tokens_before: this.tokens_before,
         tokens_after: this.tokens_after,
       };
@@ -924,24 +883,23 @@ export function makeChatCompressionEvent({
   };
 }
 
-export const EVENT_MALFORMED_JSON_RESPONSE =
-  'gemini_cli.malformed_json_response';
+export const EVENT_MALFORMED_JSON_RESPONSE = "gemini_cli.malformed_json_response";
 export class MalformedJsonResponseEvent implements BaseTelemetryEvent {
-  'event.name': 'malformed_json_response';
-  'event.timestamp': string;
+  "event.name": "malformed_json_response";
+  "event.timestamp": string;
   model: string;
 
   constructor(model: string) {
-    this['event.name'] = 'malformed_json_response';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "malformed_json_response";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_MALFORMED_JSON_RESPONSE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_MALFORMED_JSON_RESPONSE,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
     };
   }
@@ -952,27 +910,27 @@ export class MalformedJsonResponseEvent implements BaseTelemetryEvent {
 }
 
 export enum IdeConnectionType {
-  START = 'start',
-  SESSION = 'session',
+  START = "start",
+  SESSION = "session",
 }
 
-export const EVENT_IDE_CONNECTION = 'gemini_cli.ide_connection';
+export const EVENT_IDE_CONNECTION = "gemini_cli.ide_connection";
 export class IdeConnectionEvent {
-  'event.name': 'ide_connection';
-  'event.timestamp': string;
+  "event.name": "ide_connection";
+  "event.timestamp": string;
   connection_type: IdeConnectionType;
 
   constructor(connection_type: IdeConnectionType) {
-    this['event.name'] = 'ide_connection';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "ide_connection";
+    this["event.timestamp"] = new Date().toISOString();
     this.connection_type = connection_type;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_IDE_CONNECTION,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_IDE_CONNECTION,
+      "event.timestamp": this["event.timestamp"],
       connection_type: this.connection_type,
     };
   }
@@ -982,16 +940,16 @@ export class IdeConnectionEvent {
   }
 }
 
-export const EVENT_CONVERSATION_FINISHED = 'gemini_cli.conversation_finished';
+export const EVENT_CONVERSATION_FINISHED = "gemini_cli.conversation_finished";
 export class ConversationFinishedEvent {
-  'event_name': 'conversation_finished';
-  'event.timestamp': string; // ISO 8601;
+  event_name: "conversation_finished";
+  "event.timestamp": string; // ISO 8601;
   approvalMode: ApprovalMode;
   turnCount: number;
 
   constructor(approvalMode: ApprovalMode, turnCount: number) {
-    this['event_name'] = 'conversation_finished';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event_name"] = "conversation_finished";
+    this["event.timestamp"] = new Date().toISOString();
     this.approvalMode = approvalMode;
     this.turnCount = turnCount;
   }
@@ -999,8 +957,8 @@ export class ConversationFinishedEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CONVERSATION_FINISHED,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CONVERSATION_FINISHED,
+      "event.timestamp": this["event.timestamp"],
       approvalMode: this.approvalMode,
       turnCount: this.turnCount,
     };
@@ -1011,10 +969,10 @@ export class ConversationFinishedEvent {
   }
 }
 
-export const EVENT_FILE_OPERATION = 'gemini_cli.file_operation';
+export const EVENT_FILE_OPERATION = "gemini_cli.file_operation";
 export class FileOperationEvent implements BaseTelemetryEvent {
-  'event.name': 'file_operation';
-  'event.timestamp': string;
+  "event.name": "file_operation";
+  "event.timestamp": string;
   tool_name: string;
   operation: FileOperation;
   lines?: number;
@@ -1030,8 +988,8 @@ export class FileOperationEvent implements BaseTelemetryEvent {
     extension?: string,
     programming_language?: string,
   ) {
-    this['event.name'] = 'file_operation';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "file_operation";
+    this["event.timestamp"] = new Date().toISOString();
     this.tool_name = tool_name;
     this.operation = operation;
     this.lines = lines;
@@ -1043,23 +1001,23 @@ export class FileOperationEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_FILE_OPERATION,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_FILE_OPERATION,
+      "event.timestamp": this["event.timestamp"],
       tool_name: this.tool_name,
       operation: this.operation,
     };
 
     if (this.lines) {
-      attributes['lines'] = this.lines;
+      attributes["lines"] = this.lines;
     }
     if (this.mimetype) {
-      attributes['mimetype'] = this.mimetype;
+      attributes["mimetype"] = this.mimetype;
     }
     if (this.extension) {
-      attributes['extension'] = this.extension;
+      attributes["extension"] = this.extension;
     }
     if (this.programming_language) {
-      attributes['programming_language'] = this.programming_language;
+      attributes["programming_language"] = this.programming_language;
     }
     return attributes;
   }
@@ -1069,28 +1027,28 @@ export class FileOperationEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_INVALID_CHUNK = 'gemini_cli.chat.invalid_chunk';
+export const EVENT_INVALID_CHUNK = "gemini_cli.chat.invalid_chunk";
 // Add these new event interfaces
 export class InvalidChunkEvent implements BaseTelemetryEvent {
-  'event.name': 'invalid_chunk';
-  'event.timestamp': string;
+  "event.name": "invalid_chunk";
+  "event.timestamp": string;
   error_message?: string; // Optional: validation error details
 
   constructor(error_message?: string) {
-    this['event.name'] = 'invalid_chunk';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "invalid_chunk";
+    this["event.timestamp"] = new Date().toISOString();
     this.error_message = error_message;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_INVALID_CHUNK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_INVALID_CHUNK,
+      "event.timestamp": this["event.timestamp"],
     };
 
     if (this.error_message) {
-      attributes['error.message'] = this.error_message;
+      attributes["error.message"] = this.error_message;
     }
     return attributes;
   }
@@ -1100,23 +1058,18 @@ export class InvalidChunkEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_CONTENT_RETRY = 'gemini_cli.chat.content_retry';
+export const EVENT_CONTENT_RETRY = "gemini_cli.chat.content_retry";
 export class ContentRetryEvent implements BaseTelemetryEvent {
-  'event.name': 'content_retry';
-  'event.timestamp': string;
+  "event.name": "content_retry";
+  "event.timestamp": string;
   attempt_number: number;
   error_type: string; // e.g., 'EmptyStreamError'
   retry_delay_ms: number;
   model: string;
 
-  constructor(
-    attempt_number: number,
-    error_type: string,
-    retry_delay_ms: number,
-    model: string,
-  ) {
-    this['event.name'] = 'content_retry';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(attempt_number: number, error_type: string, retry_delay_ms: number, model: string) {
+    this["event.name"] = "content_retry";
+    this["event.timestamp"] = new Date().toISOString();
     this.attempt_number = attempt_number;
     this.error_type = error_type;
     this.retry_delay_ms = retry_delay_ms;
@@ -1126,8 +1079,8 @@ export class ContentRetryEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CONTENT_RETRY,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CONTENT_RETRY,
+      "event.timestamp": this["event.timestamp"],
       attempt_number: this.attempt_number,
       error_type: this.error_type,
       retry_delay_ms: this.retry_delay_ms,
@@ -1140,11 +1093,10 @@ export class ContentRetryEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_CONTENT_RETRY_FAILURE =
-  'gemini_cli.chat.content_retry_failure';
+export const EVENT_CONTENT_RETRY_FAILURE = "gemini_cli.chat.content_retry_failure";
 export class ContentRetryFailureEvent implements BaseTelemetryEvent {
-  'event.name': 'content_retry_failure';
-  'event.timestamp': string;
+  "event.name": "content_retry_failure";
+  "event.timestamp": string;
   total_attempts: number;
   final_error_type: string;
   total_duration_ms?: number; // Optional: total time spent retrying
@@ -1156,8 +1108,8 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
     model: string,
     total_duration_ms?: number,
   ) {
-    this['event.name'] = 'content_retry_failure';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "content_retry_failure";
+    this["event.timestamp"] = new Date().toISOString();
     this.total_attempts = total_attempts;
     this.final_error_type = final_error_type;
     this.total_duration_ms = total_duration_ms;
@@ -1167,8 +1119,8 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CONTENT_RETRY_FAILURE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CONTENT_RETRY_FAILURE,
+      "event.timestamp": this["event.timestamp"],
       total_attempts: this.total_attempts,
       final_error_type: this.final_error_type,
       total_duration_ms: this.total_duration_ms,
@@ -1181,10 +1133,10 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_MODEL_ROUTING = 'gemini_cli.model_routing';
+export const EVENT_MODEL_ROUTING = "gemini_cli.model_routing";
 export class ModelRoutingEvent implements BaseTelemetryEvent {
-  'event.name': 'model_routing';
-  'event.timestamp': string;
+  "event.name": "model_routing";
+  "event.timestamp": string;
   decision_model: string;
   decision_source: string;
   routing_latency_ms: number;
@@ -1200,8 +1152,8 @@ export class ModelRoutingEvent implements BaseTelemetryEvent {
     failed: boolean,
     error_message: string | undefined,
   ) {
-    this['event.name'] = 'model_routing';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "model_routing";
+    this["event.timestamp"] = new Date().toISOString();
     this.decision_model = decision_model;
     this.decision_source = decision_source;
     this.routing_latency_ms = routing_latency_ms;
@@ -1213,8 +1165,8 @@ export class ModelRoutingEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_MODEL_ROUTING,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_MODEL_ROUTING,
+      "event.timestamp": this["event.timestamp"],
       decision_model: this.decision_model,
       decision_source: this.decision_source,
       routing_latency_ms: this.routing_latency_ms,
@@ -1229,25 +1181,25 @@ export class ModelRoutingEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_INSTALL = 'gemini_cli.extension_install';
+export const EVENT_EXTENSION_INSTALL = "gemini_cli.extension_install";
 export class ExtensionInstallEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_install';
-  'event.timestamp': string;
+  "event.name": "extension_install";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   extension_version: string;
   extension_source: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
   constructor(
     extension_name: string,
     extension_id: string,
     extension_version: string,
     extension_source: string,
-    status: 'success' | 'error',
+    status: "success" | "error",
   ) {
-    this['event.name'] = 'extension_install';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_install";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.extension_version = extension_version;
@@ -1258,8 +1210,8 @@ export class ExtensionInstallEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_INSTALL,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_INSTALL,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       extension_version: this.extension_version,
       extension_source: this.extension_source,
@@ -1272,11 +1224,11 @@ export class ExtensionInstallEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_TOOL_OUTPUT_TRUNCATED = 'gemini_cli.tool_output_truncated';
+export const EVENT_TOOL_OUTPUT_TRUNCATED = "gemini_cli.tool_output_truncated";
 export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
-  readonly eventName = 'tool_output_truncated';
-  readonly 'event.timestamp' = new Date().toISOString();
-  'event.name': string;
+  readonly eventName = "tool_output_truncated";
+  readonly "event.timestamp" = new Date().toISOString();
+  "event.name": string;
   tool_name: string;
   original_content_length: number;
   truncated_content_length: number;
@@ -1294,7 +1246,7 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
       lines: number;
     },
   ) {
-    this['event.name'] = this.eventName;
+    this["event.name"] = this.eventName;
     this.prompt_id = prompt_id;
     this.tool_name = details.toolName;
     this.original_content_length = details.originalContentLength;
@@ -1306,9 +1258,9 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_TOOL_OUTPUT_TRUNCATED,
+      "event.name": EVENT_TOOL_OUTPUT_TRUNCATED,
       eventName: this.eventName,
-      'event.timestamp': this['event.timestamp'],
+      "event.timestamp": this["event.timestamp"],
       tool_name: this.tool_name,
       original_content_length: this.original_content_length,
       truncated_content_length: this.truncated_content_length,
@@ -1323,21 +1275,17 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_UNINSTALL = 'gemini_cli.extension_uninstall';
+export const EVENT_EXTENSION_UNINSTALL = "gemini_cli.extension_uninstall";
 export class ExtensionUninstallEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_uninstall';
-  'event.timestamp': string;
+  "event.name": "extension_uninstall";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
-  constructor(
-    extension_name: string,
-    extension_id: string,
-    status: 'success' | 'error',
-  ) {
-    this['event.name'] = 'extension_uninstall';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(extension_name: string, extension_id: string, status: "success" | "error") {
+    this["event.name"] = "extension_uninstall";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.status = status;
@@ -1346,8 +1294,8 @@ export class ExtensionUninstallEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_UNINSTALL,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_UNINSTALL,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       status: this.status,
     };
@@ -1358,16 +1306,16 @@ export class ExtensionUninstallEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_UPDATE = 'gemini_cli.extension_update';
+export const EVENT_EXTENSION_UPDATE = "gemini_cli.extension_update";
 export class ExtensionUpdateEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_update';
-  'event.timestamp': string;
+  "event.name": "extension_update";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   extension_previous_version: string;
   extension_version: string;
   extension_source: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
   constructor(
     extension_name: string,
@@ -1375,10 +1323,10 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
     extension_version: string,
     extension_previous_version: string,
     extension_source: string,
-    status: 'success' | 'error',
+    status: "success" | "error",
   ) {
-    this['event.name'] = 'extension_update';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_update";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.extension_version = extension_version;
@@ -1390,8 +1338,8 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_UPDATE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_UPDATE,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       extension_version: this.extension_version,
       extension_previous_version: this.extension_previous_version,
@@ -1405,21 +1353,17 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_ENABLE = 'gemini_cli.extension_enable';
+export const EVENT_EXTENSION_ENABLE = "gemini_cli.extension_enable";
 export class ExtensionEnableEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_enable';
-  'event.timestamp': string;
+  "event.name": "extension_enable";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   setting_scope: string;
 
-  constructor(
-    extension_name: string,
-    extension_id: string,
-    settingScope: string,
-  ) {
-    this['event.name'] = 'extension_enable';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(extension_name: string, extension_id: string, settingScope: string) {
+    this["event.name"] = "extension_enable";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.setting_scope = settingScope;
@@ -1428,8 +1372,8 @@ export class ExtensionEnableEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_ENABLE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_ENABLE,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       setting_scope: this.setting_scope,
     };
@@ -1440,23 +1384,23 @@ export class ExtensionEnableEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_MODEL_SLASH_COMMAND = 'gemini_cli.slash_command.model';
+export const EVENT_MODEL_SLASH_COMMAND = "gemini_cli.slash_command.model";
 export class ModelSlashCommandEvent implements BaseTelemetryEvent {
-  'event.name': 'model_slash_command';
-  'event.timestamp': string;
+  "event.name": "model_slash_command";
+  "event.timestamp": string;
   model_name: string;
 
   constructor(model_name: string) {
-    this['event.name'] = 'model_slash_command';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "model_slash_command";
+    this["event.timestamp"] = new Date().toISOString();
     this.model_name = model_name;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_MODEL_SLASH_COMMAND,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_MODEL_SLASH_COMMAND,
+      "event.timestamp": this["event.timestamp"],
       model_name: this.model_name,
     };
   }
@@ -1466,10 +1410,10 @@ export class ModelSlashCommandEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_LLM_LOOP_CHECK = 'gemini_cli.llm_loop_check';
+export const EVENT_LLM_LOOP_CHECK = "gemini_cli.llm_loop_check";
 export class LlmLoopCheckEvent implements BaseTelemetryEvent {
-  'event.name': 'llm_loop_check';
-  'event.timestamp': string;
+  "event.name": "llm_loop_check";
+  "event.timestamp": string;
   prompt_id: string;
   flash_confidence: number;
   main_model: string;
@@ -1481,8 +1425,8 @@ export class LlmLoopCheckEvent implements BaseTelemetryEvent {
     main_model: string,
     main_model_confidence: number,
   ) {
-    this['event.name'] = 'llm_loop_check';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "llm_loop_check";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
     this.flash_confidence = flash_confidence;
     this.main_model = main_model;
@@ -1492,8 +1436,8 @@ export class LlmLoopCheckEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_LLM_LOOP_CHECK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_LLM_LOOP_CHECK,
+      "event.timestamp": this["event.timestamp"],
       prompt_id: this.prompt_id,
       flash_confidence: this.flash_confidence,
       main_model: this.main_model,
@@ -1541,21 +1485,17 @@ export type TelemetryEvent =
   | StartupStatsEvent
   | WebFetchFallbackAttemptEvent;
 
-export const EVENT_EXTENSION_DISABLE = 'gemini_cli.extension_disable';
+export const EVENT_EXTENSION_DISABLE = "gemini_cli.extension_disable";
 export class ExtensionDisableEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_disable';
-  'event.timestamp': string;
+  "event.name": "extension_disable";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   setting_scope: string;
 
-  constructor(
-    extension_name: string,
-    extension_id: string,
-    settingScope: string,
-  ) {
-    this['event.name'] = 'extension_disable';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(extension_name: string, extension_id: string, settingScope: string) {
+    this["event.name"] = "extension_disable";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.setting_scope = settingScope;
@@ -1564,8 +1504,8 @@ export class ExtensionDisableEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_DISABLE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_DISABLE,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       setting_scope: this.setting_scope,
     };
@@ -1576,23 +1516,23 @@ export class ExtensionDisableEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_SMART_EDIT_STRATEGY = 'gemini_cli.smart_edit_strategy';
+export const EVENT_SMART_EDIT_STRATEGY = "gemini_cli.smart_edit_strategy";
 export class SmartEditStrategyEvent implements BaseTelemetryEvent {
-  'event.name': 'smart_edit_strategy';
-  'event.timestamp': string;
+  "event.name": "smart_edit_strategy";
+  "event.timestamp": string;
   strategy: string;
 
   constructor(strategy: string) {
-    this['event.name'] = 'smart_edit_strategy';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "smart_edit_strategy";
+    this["event.timestamp"] = new Date().toISOString();
     this.strategy = strategy;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_SMART_EDIT_STRATEGY,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_SMART_EDIT_STRATEGY,
+      "event.timestamp": this["event.timestamp"],
       strategy: this.strategy,
     };
   }
@@ -1602,23 +1542,23 @@ export class SmartEditStrategyEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_SMART_EDIT_CORRECTION = 'gemini_cli.smart_edit_correction';
+export const EVENT_SMART_EDIT_CORRECTION = "gemini_cli.smart_edit_correction";
 export class SmartEditCorrectionEvent implements BaseTelemetryEvent {
-  'event.name': 'smart_edit_correction';
-  'event.timestamp': string;
-  correction: 'success' | 'failure';
+  "event.name": "smart_edit_correction";
+  "event.timestamp": string;
+  correction: "success" | "failure";
 
-  constructor(correction: 'success' | 'failure') {
-    this['event.name'] = 'smart_edit_correction';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(correction: "success" | "failure") {
+    this["event.name"] = "smart_edit_correction";
+    this["event.timestamp"] = new Date().toISOString();
     this.correction = correction;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_SMART_EDIT_CORRECTION,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_SMART_EDIT_CORRECTION,
+      "event.timestamp": this["event.timestamp"],
       correction: this.correction,
     };
   }
@@ -1637,10 +1577,10 @@ export interface StartupPhaseStats {
   end_time_usec: number;
 }
 
-export const EVENT_STARTUP_STATS = 'gemini_cli.startup_stats';
+export const EVENT_STARTUP_STATS = "gemini_cli.startup_stats";
 export class StartupStatsEvent implements BaseTelemetryEvent {
-  'event.name': 'startup_stats';
-  'event.timestamp': string;
+  "event.name": "startup_stats";
+  "event.timestamp": string;
   phases: StartupPhaseStats[];
   os_platform: string;
   os_release: string;
@@ -1652,8 +1592,8 @@ export class StartupStatsEvent implements BaseTelemetryEvent {
     os_release: string,
     is_docker: boolean,
   ) {
-    this['event.name'] = 'startup_stats';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "startup_stats";
+    this["event.timestamp"] = new Date().toISOString();
     this.phases = phases;
     this.os_platform = os_platform;
     this.os_release = os_release;
@@ -1663,8 +1603,8 @@ export class StartupStatsEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_STARTUP_STATS,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_STARTUP_STATS,
+      "event.timestamp": this["event.timestamp"],
       phases: JSON.stringify(this.phases),
       os_platform: this.os_platform,
       os_release: this.os_release,
@@ -1678,16 +1618,13 @@ export class StartupStatsEvent implements BaseTelemetryEvent {
 }
 
 abstract class BaseAgentEvent implements BaseTelemetryEvent {
-  abstract 'event.name':
-    | 'agent_start'
-    | 'agent_finish'
-    | 'agent_recovery_attempt';
-  'event.timestamp': string;
+  abstract "event.name": "agent_start" | "agent_finish" | "agent_recovery_attempt";
+  "event.timestamp": string;
   agent_id: string;
   agent_name: string;
 
   constructor(agent_id: string, agent_name: string) {
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.timestamp"] = new Date().toISOString();
     this.agent_id = agent_id;
     this.agent_name = agent_name;
   }
@@ -1695,7 +1632,7 @@ abstract class BaseAgentEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.timestamp': this['event.timestamp'],
+      "event.timestamp": this["event.timestamp"],
       agent_id: this.agent_id,
       agent_name: this.agent_name,
     };
@@ -1704,9 +1641,9 @@ abstract class BaseAgentEvent implements BaseTelemetryEvent {
   abstract toLogBody(): string;
 }
 
-export const EVENT_AGENT_START = 'gemini_cli.agent.start';
+export const EVENT_AGENT_START = "gemini_cli.agent.start";
 export class AgentStartEvent extends BaseAgentEvent {
-  'event.name' = 'agent_start' as const;
+  "event.name" = "agent_start" as const;
 
   constructor(agent_id: string, agent_name: string) {
     super(agent_id, agent_name);
@@ -1715,7 +1652,7 @@ export class AgentStartEvent extends BaseAgentEvent {
   override toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...super.toOpenTelemetryAttributes(config),
-      'event.name': EVENT_AGENT_START,
+      "event.name": EVENT_AGENT_START,
     };
   }
 
@@ -1724,9 +1661,9 @@ export class AgentStartEvent extends BaseAgentEvent {
   }
 }
 
-export const EVENT_AGENT_FINISH = 'gemini_cli.agent.finish';
+export const EVENT_AGENT_FINISH = "gemini_cli.agent.finish";
 export class AgentFinishEvent extends BaseAgentEvent {
-  'event.name' = 'agent_finish' as const;
+  "event.name" = "agent_finish" as const;
   duration_ms: number;
   turn_count: number;
   terminate_reason: AgentTerminateMode;
@@ -1747,7 +1684,7 @@ export class AgentFinishEvent extends BaseAgentEvent {
   override toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...super.toOpenTelemetryAttributes(config),
-      'event.name': EVENT_AGENT_FINISH,
+      "event.name": EVENT_AGENT_FINISH,
       duration_ms: this.duration_ms,
       turn_count: this.turn_count,
       terminate_reason: this.terminate_reason,
@@ -1759,9 +1696,9 @@ export class AgentFinishEvent extends BaseAgentEvent {
   }
 }
 
-export const EVENT_AGENT_RECOVERY_ATTEMPT = 'gemini_cli.agent.recovery_attempt';
+export const EVENT_AGENT_RECOVERY_ATTEMPT = "gemini_cli.agent.recovery_attempt";
 export class RecoveryAttemptEvent extends BaseAgentEvent {
-  'event.name' = 'agent_recovery_attempt' as const;
+  "event.name" = "agent_recovery_attempt" as const;
   reason: AgentTerminateMode;
   duration_ms: number;
   success: boolean;
@@ -1785,7 +1722,7 @@ export class RecoveryAttemptEvent extends BaseAgentEvent {
   override toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...super.toOpenTelemetryAttributes(config),
-      'event.name': EVENT_AGENT_RECOVERY_ATTEMPT,
+      "event.name": EVENT_AGENT_RECOVERY_ATTEMPT,
       reason: this.reason,
       duration_ms: this.duration_ms,
       success: this.success,
@@ -1798,24 +1735,23 @@ export class RecoveryAttemptEvent extends BaseAgentEvent {
   }
 }
 
-export const EVENT_WEB_FETCH_FALLBACK_ATTEMPT =
-  'gemini_cli.web_fetch_fallback_attempt';
+export const EVENT_WEB_FETCH_FALLBACK_ATTEMPT = "gemini_cli.web_fetch_fallback_attempt";
 export class WebFetchFallbackAttemptEvent implements BaseTelemetryEvent {
-  'event.name': 'web_fetch_fallback_attempt';
-  'event.timestamp': string;
-  reason: 'private_ip' | 'primary_failed';
+  "event.name": "web_fetch_fallback_attempt";
+  "event.timestamp": string;
+  reason: "private_ip" | "primary_failed";
 
-  constructor(reason: 'private_ip' | 'primary_failed') {
-    this['event.name'] = 'web_fetch_fallback_attempt';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(reason: "private_ip" | "primary_failed") {
+    this["event.name"] = "web_fetch_fallback_attempt";
+    this["event.timestamp"] = new Date().toISOString();
     this.reason = reason;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
+      "event.timestamp": this["event.timestamp"],
       reason: this.reason,
     };
   }
@@ -1825,12 +1761,12 @@ export class WebFetchFallbackAttemptEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_HOOK_CALL = 'gemini_cli.hook_call';
+export const EVENT_HOOK_CALL = "gemini_cli.hook_call";
 export class HookCallEvent implements BaseTelemetryEvent {
-  'event.name': string;
-  'event.timestamp': string;
+  "event.name": string;
+  "event.timestamp": string;
   hook_event_name: string;
-  hook_type: 'command';
+  hook_type: "command";
   hook_name: string;
   hook_input: Record<string, unknown>;
   hook_output?: Record<string, unknown>;
@@ -1843,7 +1779,7 @@ export class HookCallEvent implements BaseTelemetryEvent {
 
   constructor(
     hookEventName: string,
-    hookType: 'command',
+    hookType: "command",
     hookName: string,
     hookInput: Record<string, unknown>,
     durationMs: number,
@@ -1854,8 +1790,8 @@ export class HookCallEvent implements BaseTelemetryEvent {
     stderr?: string,
     error?: string,
   ) {
-    this['event.name'] = 'hook_call';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "hook_call";
+    this["event.timestamp"] = new Date().toISOString();
     this.hook_event_name = hookEventName;
     this.hook_type = hookType;
     this.hook_name = hookName;
@@ -1872,8 +1808,8 @@ export class HookCallEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_HOOK_CALL,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_HOOK_CALL,
+      "event.timestamp": this["event.timestamp"],
       hook_event_name: this.hook_event_name,
       hook_type: this.hook_type,
       // Sanitize hook_name unless full logging is enabled
@@ -1887,15 +1823,15 @@ export class HookCallEvent implements BaseTelemetryEvent {
 
     // Only include potentially sensitive data if telemetry logging of prompts is enabled
     if (config.getTelemetryLogPromptsEnabled()) {
-      attributes['hook_input'] = safeJsonStringify(this.hook_input, 2);
-      attributes['hook_output'] = safeJsonStringify(this.hook_output, 2);
-      attributes['stdout'] = this.stdout;
-      attributes['stderr'] = this.stderr;
+      attributes["hook_input"] = safeJsonStringify(this.hook_input, 2);
+      attributes["hook_output"] = safeJsonStringify(this.hook_output, 2);
+      attributes["stdout"] = this.stdout;
+      attributes["stderr"] = this.stderr;
     }
 
     if (this.error) {
       // Always log errors
-      attributes['error'] = this.error;
+      attributes["error"] = this.error;
     }
 
     return attributes;
@@ -1903,7 +1839,7 @@ export class HookCallEvent implements BaseTelemetryEvent {
 
   toLogBody(): string {
     const hookId = `${this.hook_event_name}.${this.hook_name}`;
-    const status = `${this.success ? 'succeeded' : 'failed'}`;
+    const status = `${this.success ? "succeeded" : "failed"}`;
     return `Hook call ${hookId} ${status} in ${this.duration_ms}ms`;
   }
 }
diff --git a/packages/gemini-cli-core/src/telemetry/uiTelemetry.test.ts b/packages/gemini-cli-core/src/telemetry/uiTelemetry.test.ts
index aa06e87a9..1f8f79392 100644
--- a/packages/gemini-cli-core/src/telemetry/uiTelemetry.test.ts
+++ b/packages/gemini-cli-core/src/telemetry/uiTelemetry.test.ts
@@ -4,24 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { UiTelemetryService } from './uiTelemetry.js';
-import { ToolCallDecision } from './tool-call-decision.js';
-import type { ApiErrorEvent, ApiResponseEvent } from './types.js';
-import { ToolCallEvent } from './types.js';
-import {
-  EVENT_API_ERROR,
-  EVENT_API_RESPONSE,
-  EVENT_TOOL_CALL,
-} from './types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import type {
   CompletedToolCall,
   ErroredToolCall,
   SuccessfulToolCall,
-} from '../core/coreToolScheduler.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import { ToolConfirmationOutcome } from '../tools/tools.js';
-import { MockTool } from '../test-utils/mock-tool.js';
+} from "../core/coreToolScheduler.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { ToolConfirmationOutcome } from "../tools/tools.js";
+import { ToolCallDecision } from "./tool-call-decision.js";
+import type { ApiErrorEvent, ApiResponseEvent } from "./types.js";
+import { EVENT_API_ERROR, EVENT_API_RESPONSE, EVENT_TOOL_CALL, ToolCallEvent } from "./types.js";
+import { UiTelemetryService } from "./uiTelemetry.js";
 
 const createFakeCompletedToolCall = (
   name: string,
@@ -33,18 +28,18 @@ const createFakeCompletedToolCall = (
   const request = {
     callId: `call_${name}_${Date.now()}`,
     name,
-    args: { foo: 'bar' },
+    args: { foo: "bar" },
     isClientInitiated: false,
-    prompt_id: 'prompt-id-1',
+    prompt_id: "prompt-id-1",
   };
   const tool = new MockTool({ name });
 
   if (success) {
     return {
-      status: 'success',
+      status: "success",
       request,
       tool,
-      invocation: tool.build({ param: 'test' }),
+      invocation: tool.build({ param: "test" }),
       response: {
         callId: request.callId,
         responseParts: [
@@ -52,20 +47,20 @@ const createFakeCompletedToolCall = (
             functionResponse: {
               id: request.callId,
               name,
-              response: { output: 'Success!' },
+              response: { output: "Success!" },
             },
           },
         ],
         error: undefined,
         errorType: undefined,
-        resultDisplay: 'Success!',
+        resultDisplay: "Success!",
       },
       durationMs: duration,
       outcome,
     } as SuccessfulToolCall;
   } else {
     return {
-      status: 'error',
+      status: "error",
       request,
       tool,
       response: {
@@ -75,13 +70,13 @@ const createFakeCompletedToolCall = (
             functionResponse: {
               id: request.callId,
               name,
-              response: { error: 'Tool failed' },
+              response: { error: "Tool failed" },
             },
           },
         ],
-        error: error || new Error('Tool failed'),
+        error: error || new Error("Tool failed"),
         errorType: ToolErrorType.UNKNOWN,
-        resultDisplay: 'Failure!',
+        resultDisplay: "Failure!",
       },
       durationMs: duration,
       outcome,
@@ -89,14 +84,14 @@ const createFakeCompletedToolCall = (
   }
 };
 
-describe('UiTelemetryService', () => {
+describe("UiTelemetryService", () => {
   let service: UiTelemetryService;
 
   beforeEach(() => {
     service = new UiTelemetryService();
   });
 
-  it('should have correct initial metrics', () => {
+  it("should have correct initial metrics", () => {
     const metrics = service.getMetrics();
     expect(metrics).toEqual({
       models: {},
@@ -121,13 +116,13 @@ describe('UiTelemetryService', () => {
     expect(service.getLastPromptTokenCount()).toBe(0);
   });
 
-  it('should emit an update event when an event is added', () => {
+  it("should emit an update event when an event is added", () => {
     const spy = vi.fn();
-    service.on('update', spy);
+    service.on("update", spy);
 
     const event = {
-      'event.name': EVENT_API_RESPONSE,
-      model: 'gemini-2.5-pro',
+      "event.name": EVENT_API_RESPONSE,
+      model: "gemini-2.5-pro",
       duration_ms: 500,
       usage: {
         input_token_count: 10,
@@ -137,7 +132,7 @@ describe('UiTelemetryService', () => {
         thoughts_token_count: 2,
         tool_token_count: 3,
       },
-    } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+    } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
     service.addEvent(event);
 
@@ -147,11 +142,11 @@ describe('UiTelemetryService', () => {
     expect(lastPromptTokenCount).toBe(0);
   });
 
-  describe('API Response Event Processing', () => {
-    it('should process a single ApiResponseEvent', () => {
+  describe("API Response Event Processing", () => {
+    it("should process a single ApiResponseEvent", () => {
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -161,12 +156,12 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 2,
           tool_token_count: 3,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 1,
           totalErrors: 0,
@@ -184,10 +179,10 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should aggregate multiple ApiResponseEvents for the same model', () => {
+    it("should aggregate multiple ApiResponseEvents for the same model", () => {
       const event1 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -198,11 +193,11 @@ describe('UiTelemetryService', () => {
           tool_token_count: 3,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
       const event2 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 600,
         usage: {
           input_token_count: 15,
@@ -213,14 +208,14 @@ describe('UiTelemetryService', () => {
           tool_token_count: 6,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
 
       service.addEvent(event1);
       service.addEvent(event2);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 2,
           totalErrors: 0,
@@ -238,10 +233,10 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should handle ApiResponseEvents for different models', () => {
+    it("should handle ApiResponseEvents for different models", () => {
       const event1 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -252,11 +247,11 @@ describe('UiTelemetryService', () => {
           tool_token_count: 3,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
       const event2 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-flash',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-flash",
         duration_ms: 1000,
         usage: {
           input_token_count: 100,
@@ -267,34 +262,34 @@ describe('UiTelemetryService', () => {
           tool_token_count: 30,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
 
       service.addEvent(event1);
       service.addEvent(event2);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toBeDefined();
-      expect(metrics.models['gemini-2.5-flash']).toBeDefined();
-      expect(metrics.models['gemini-2.5-pro'].api.totalRequests).toBe(1);
-      expect(metrics.models['gemini-2.5-flash'].api.totalRequests).toBe(1);
+      expect(metrics.models["gemini-2.5-pro"]).toBeDefined();
+      expect(metrics.models["gemini-2.5-flash"]).toBeDefined();
+      expect(metrics.models["gemini-2.5-pro"].api.totalRequests).toBe(1);
+      expect(metrics.models["gemini-2.5-flash"].api.totalRequests).toBe(1);
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
   });
 
-  describe('API Error Event Processing', () => {
-    it('should process a single ApiErrorEvent', () => {
+  describe("API Error Event Processing", () => {
+    it("should process a single ApiErrorEvent", () => {
       const event = {
-        'event.name': EVENT_API_ERROR,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_ERROR,
+        model: "gemini-2.5-pro",
         duration_ms: 300,
-        error: 'Something went wrong',
-      } as ApiErrorEvent & { 'event.name': typeof EVENT_API_ERROR };
+        error: "Something went wrong",
+      } as ApiErrorEvent & { "event.name": typeof EVENT_API_ERROR };
 
       service.addEvent(event);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 1,
           totalErrors: 1,
@@ -311,10 +306,10 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should aggregate ApiErrorEvents and ApiResponseEvents', () => {
+    it("should aggregate ApiErrorEvents and ApiResponseEvents", () => {
       const responseEvent = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -325,20 +320,20 @@ describe('UiTelemetryService', () => {
           tool_token_count: 3,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
       const errorEvent = {
-        'event.name': EVENT_API_ERROR,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_ERROR,
+        model: "gemini-2.5-pro",
         duration_ms: 300,
-        error: 'Something went wrong',
-      } as ApiErrorEvent & { 'event.name': typeof EVENT_API_ERROR };
+        error: "Something went wrong",
+      } as ApiErrorEvent & { "event.name": typeof EVENT_API_ERROR };
 
       service.addEvent(responseEvent);
       service.addEvent(errorEvent);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 2,
           totalErrors: 1,
@@ -356,18 +351,18 @@ describe('UiTelemetryService', () => {
     });
   });
 
-  describe('Tool Call Event Processing', () => {
-    it('should process a single successful ToolCallEvent', () => {
+  describe("Tool Call Event Processing", () => {
+    it("should process a single successful ToolCallEvent", () => {
       const toolCall = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         true,
         150,
         ToolConfirmationOutcome.ProceedOnce,
       );
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -377,7 +372,7 @@ describe('UiTelemetryService', () => {
       expect(tools.totalFail).toBe(0);
       expect(tools.totalDurationMs).toBe(150);
       expect(tools.totalDecisions[ToolCallDecision.ACCEPT]).toBe(1);
-      expect(tools.byName['test_tool']).toEqual({
+      expect(tools.byName["test_tool"]).toEqual({
         count: 1,
         success: 1,
         fail: 0,
@@ -391,17 +386,17 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should process a single failed ToolCallEvent', () => {
+    it("should process a single failed ToolCallEvent", () => {
       const toolCall = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         false,
         200,
         ToolConfirmationOutcome.Cancel,
       );
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -411,7 +406,7 @@ describe('UiTelemetryService', () => {
       expect(tools.totalFail).toBe(1);
       expect(tools.totalDurationMs).toBe(200);
       expect(tools.totalDecisions[ToolCallDecision.REJECT]).toBe(1);
-      expect(tools.byName['test_tool']).toEqual({
+      expect(tools.byName["test_tool"]).toEqual({
         count: 1,
         success: 0,
         fail: 1,
@@ -425,33 +420,31 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should process a ToolCallEvent with modify decision', () => {
+    it("should process a ToolCallEvent with modify decision", () => {
       const toolCall = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         true,
         250,
         ToolConfirmationOutcome.ModifyWithEditor,
       );
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
 
       expect(tools.totalDecisions[ToolCallDecision.MODIFY]).toBe(1);
-      expect(tools.byName['test_tool'].decisions[ToolCallDecision.MODIFY]).toBe(
-        1,
-      );
+      expect(tools.byName["test_tool"].decisions[ToolCallDecision.MODIFY]).toBe(1);
     });
 
-    it('should process a ToolCallEvent without a decision', () => {
-      const toolCall = createFakeCompletedToolCall('test_tool', true, 100);
+    it("should process a ToolCallEvent without a decision", () => {
+      const toolCall = createFakeCompletedToolCall("test_tool", true, 100);
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -462,7 +455,7 @@ describe('UiTelemetryService', () => {
         [ToolCallDecision.MODIFY]: 0,
         [ToolCallDecision.AUTO_ACCEPT]: 0,
       });
-      expect(tools.byName['test_tool'].decisions).toEqual({
+      expect(tools.byName["test_tool"].decisions).toEqual({
         [ToolCallDecision.ACCEPT]: 0,
         [ToolCallDecision.REJECT]: 0,
         [ToolCallDecision.MODIFY]: 0,
@@ -470,15 +463,15 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should aggregate multiple ToolCallEvents for the same tool', () => {
+    it("should aggregate multiple ToolCallEvents for the same tool", () => {
       const toolCall1 = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         true,
         100,
         ToolConfirmationOutcome.ProceedOnce,
       );
       const toolCall2 = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         false,
         150,
         ToolConfirmationOutcome.Cancel,
@@ -486,12 +479,12 @@ describe('UiTelemetryService', () => {
 
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall1)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall2)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -502,7 +495,7 @@ describe('UiTelemetryService', () => {
       expect(tools.totalDurationMs).toBe(250);
       expect(tools.totalDecisions[ToolCallDecision.ACCEPT]).toBe(1);
       expect(tools.totalDecisions[ToolCallDecision.REJECT]).toBe(1);
-      expect(tools.byName['test_tool']).toEqual({
+      expect(tools.byName["test_tool"]).toEqual({
         count: 2,
         success: 1,
         fail: 1,
@@ -516,17 +509,17 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should handle ToolCallEvents for different tools', () => {
-      const toolCall1 = createFakeCompletedToolCall('tool_A', true, 100);
-      const toolCall2 = createFakeCompletedToolCall('tool_B', false, 200);
+    it("should handle ToolCallEvents for different tools", () => {
+      const toolCall1 = createFakeCompletedToolCall("tool_A", true, 100);
+      const toolCall2 = createFakeCompletedToolCall("tool_B", false, 200);
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall1)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall2)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -534,19 +527,19 @@ describe('UiTelemetryService', () => {
       expect(tools.totalCalls).toBe(2);
       expect(tools.totalSuccess).toBe(1);
       expect(tools.totalFail).toBe(1);
-      expect(tools.byName['tool_A']).toBeDefined();
-      expect(tools.byName['tool_B']).toBeDefined();
-      expect(tools.byName['tool_A'].count).toBe(1);
-      expect(tools.byName['tool_B'].count).toBe(1);
+      expect(tools.byName["tool_A"]).toBeDefined();
+      expect(tools.byName["tool_B"]).toBeDefined();
+      expect(tools.byName["tool_A"].count).toBe(1);
+      expect(tools.byName["tool_B"].count).toBe(1);
     });
   });
 
-  describe('resetLastPromptTokenCount', () => {
-    it('should reset the last prompt token count to 0', () => {
+  describe("resetLastPromptTokenCount", () => {
+    it("should reset the last prompt token count to 0", () => {
       // First, set up some initial token count
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -556,7 +549,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
       expect(service.getLastPromptTokenCount()).toBe(0);
@@ -566,14 +559,14 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should emit an update event when resetLastPromptTokenCount is called', () => {
+    it("should emit an update event when resetLastPromptTokenCount is called", () => {
       const spy = vi.fn();
-      service.on('update', spy);
+      service.on("update", spy);
 
       // Set up initial token count
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -583,7 +576,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
       spy.mockClear(); // Clear the spy to focus on the reset call
@@ -596,11 +589,11 @@ describe('UiTelemetryService', () => {
       expect(lastPromptTokenCount).toBe(0);
     });
 
-    it('should not affect other metrics when resetLastPromptTokenCount is called', () => {
+    it("should not affect other metrics when resetLastPromptTokenCount is called", () => {
       // Set up initial state with some metrics
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -610,7 +603,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
 
@@ -627,14 +620,14 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should work correctly when called multiple times', () => {
+    it("should work correctly when called multiple times", () => {
       const spy = vi.fn();
-      service.on('update', spy);
+      service.on("update", spy);
 
       // Set up initial token count
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -644,7 +637,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
       expect(service.getLastPromptTokenCount()).toBe(0);
@@ -661,17 +654,17 @@ describe('UiTelemetryService', () => {
     });
   });
 
-  describe('Tool Call Event with Line Count Metadata', () => {
-    it('should aggregate valid line count metadata', () => {
-      const toolCall = createFakeCompletedToolCall('test_tool', true, 100);
+  describe("Tool Call Event with Line Count Metadata", () => {
+    it("should aggregate valid line count metadata", () => {
+      const toolCall = createFakeCompletedToolCall("test_tool", true, 100);
       const event = {
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
+        "event.name": EVENT_TOOL_CALL,
         metadata: {
           model_added_lines: 10,
           model_removed_lines: 5,
         },
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL };
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL };
 
       service.addEvent(event);
 
@@ -680,16 +673,16 @@ describe('UiTelemetryService', () => {
       expect(metrics.files.totalLinesRemoved).toBe(5);
     });
 
-    it('should ignore null/undefined values in line count metadata', () => {
-      const toolCall = createFakeCompletedToolCall('test_tool', true, 100);
+    it("should ignore null/undefined values in line count metadata", () => {
+      const toolCall = createFakeCompletedToolCall("test_tool", true, 100);
       const event = {
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
+        "event.name": EVENT_TOOL_CALL,
         metadata: {
           model_added_lines: null,
           model_removed_lines: undefined,
         },
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL };
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL };
 
       service.addEvent(event);
 
diff --git a/packages/gemini-cli-core/src/telemetry/uiTelemetry.ts b/packages/gemini-cli-core/src/telemetry/uiTelemetry.ts
index 79cb957d7..d038dbfdf 100644
--- a/packages/gemini-cli-core/src/telemetry/uiTelemetry.ts
+++ b/packages/gemini-cli-core/src/telemetry/uiTelemetry.ts
@@ -4,24 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
-import {
-  EVENT_API_ERROR,
-  EVENT_API_RESPONSE,
-  EVENT_TOOL_CALL,
-} from './types.js';
-
-import { ToolCallDecision } from './tool-call-decision.js';
-import type {
-  ApiErrorEvent,
-  ApiResponseEvent,
-  ToolCallEvent,
-} from './types.js';
+import { EventEmitter } from "node:events";
+import { ToolCallDecision } from "./tool-call-decision.js";
+import type { ApiErrorEvent, ApiResponseEvent, ToolCallEvent } from "./types.js";
+import { EVENT_API_ERROR, EVENT_API_RESPONSE, EVENT_TOOL_CALL } from "./types.js";
 
 export type UiEvent =
-  | (ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE })
-  | (ApiErrorEvent & { 'event.name': typeof EVENT_API_ERROR })
-  | (ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+  | (ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE })
+  | (ApiErrorEvent & { "event.name": typeof EVENT_API_ERROR })
+  | (ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
 export interface ToolCallStats {
   count: number;
@@ -115,7 +106,7 @@ export class UiTelemetryService extends EventEmitter {
   #lastPromptTokenCount = 0;
 
   addEvent(event: UiEvent) {
-    switch (event['event.name']) {
+    switch (event["event.name"]) {
       case EVENT_API_RESPONSE:
         this.processApiResponse(event);
         break;
@@ -130,7 +121,7 @@ export class UiTelemetryService extends EventEmitter {
         return;
     }
 
-    this.emit('update', {
+    this.emit("update", {
       metrics: this.#metrics,
       lastPromptTokenCount: this.#lastPromptTokenCount,
     });
@@ -146,7 +137,7 @@ export class UiTelemetryService extends EventEmitter {
 
   setLastPromptTokenCount(lastPromptTokenCount: number): void {
     this.#lastPromptTokenCount = lastPromptTokenCount;
-    this.emit('update', {
+    this.emit("update", {
       metrics: this.#metrics,
       lastPromptTokenCount: this.#lastPromptTokenCount,
     });
@@ -222,11 +213,11 @@ export class UiTelemetryService extends EventEmitter {
 
     // Aggregate line count data from metadata
     if (event.metadata) {
-      if (event.metadata['model_added_lines'] !== undefined) {
-        files.totalLinesAdded += event.metadata['model_added_lines'];
+      if (event.metadata["model_added_lines"] !== undefined) {
+        files.totalLinesAdded += event.metadata["model_added_lines"];
       }
-      if (event.metadata['model_removed_lines'] !== undefined) {
-        files.totalLinesRemoved += event.metadata['model_removed_lines'];
+      if (event.metadata["model_removed_lines"] !== undefined) {
+        files.totalLinesRemoved += event.metadata["model_removed_lines"];
       }
     }
   }
diff --git a/packages/gemini-cli-core/src/test-utils/config.ts b/packages/gemini-cli-core/src/test-utils/config.ts
index 880599d9b..cb228a103 100644
--- a/packages/gemini-cli-core/src/test-utils/config.ts
+++ b/packages/gemini-cli-core/src/test-utils/config.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ConfigParameters } from '../config/config.js';
-import { Config } from '../config/config.js';
+import type { ConfigParameters } from "../config/config.js";
+import { Config } from "../config/config.js";
 
 /**
  * Default parameters used for {@link FAKE_CONFIG}
@@ -13,11 +13,11 @@ import { Config } from '../config/config.js';
 export const DEFAULT_CONFIG_PARAMETERS: ConfigParameters = {
   usageStatisticsEnabled: true,
   debugMode: false,
-  sessionId: 'test-session-id',
+  sessionId: "test-session-id",
   proxy: undefined,
-  model: 'gemini-9001-super-duper',
-  targetDir: '/',
-  cwd: '/',
+  model: "gemini-9001-super-duper",
+  targetDir: "/",
+  cwd: "/",
 };
 
 /**
diff --git a/packages/gemini-cli-core/src/test-utils/index.ts b/packages/gemini-cli-core/src/test-utils/index.ts
index 6146d39d3..afcb672ae 100644
--- a/packages/gemini-cli-core/src/test-utils/index.ts
+++ b/packages/gemini-cli-core/src/test-utils/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './mock-tool.js';
+export * from "./mock-tool.js";
diff --git a/packages/gemini-cli-core/src/test-utils/mock-message-bus.ts b/packages/gemini-cli-core/src/test-utils/mock-message-bus.ts
index 3423cc3dc..3f978a764 100644
--- a/packages/gemini-cli-core/src/test-utils/mock-message-bus.ts
+++ b/packages/gemini-cli-core/src/test-utils/mock-message-bus.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { vi } from "vitest";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
-  MessageBusType,
-  type Message,
   type HookExecutionRequest,
   type HookExecutionResponse,
-} from '../confirmation-bus/types.js';
+  type Message,
+  MessageBusType,
+} from "../confirmation-bus/types.js";
 
 /**
  * Mock MessageBus for testing hook execution through MessageBus
  */
 export class MockMessageBus {
-  private subscriptions = new Map<
-    MessageBusType,
-    Set<(message: Message) => void>
-  >();
+  private subscriptions = new Map<MessageBusType, Set<(message: Message) => void>>();
   publishedMessages: Message[] = [];
   hookRequests: HookExecutionRequest[] = [];
   hookResponses: HookExecutionResponse[] = [];
@@ -41,8 +38,8 @@ export class MockMessageBus {
         correlationId: (message as HookExecutionRequest).correlationId,
         success: true,
         output: {
-          decision: 'allow',
-          reason: 'Mock hook execution successful',
+          decision: "allow",
+          reason: "Mock hook execution successful",
         },
       };
       this.hookResponses.push(response);
@@ -55,26 +52,22 @@ export class MockMessageBus {
   /**
    * Mock subscribe method that stores listeners
    */
-  subscribe = vi.fn(
-    <T extends Message>(type: T['type'], listener: (message: T) => void) => {
-      if (!this.subscriptions.has(type)) {
-        this.subscriptions.set(type, new Set());
-      }
-      this.subscriptions.get(type)!.add(listener as (message: Message) => void);
-    },
-  );
+  subscribe = vi.fn(<T extends Message>(type: T["type"], listener: (message: T) => void) => {
+    if (!this.subscriptions.has(type)) {
+      this.subscriptions.set(type, new Set());
+    }
+    this.subscriptions.get(type)!.add(listener as (message: Message) => void);
+  });
 
   /**
    * Mock unsubscribe method
    */
-  unsubscribe = vi.fn(
-    <T extends Message>(type: T['type'], listener: (message: T) => void) => {
-      const listeners = this.subscriptions.get(type);
-      if (listeners) {
-        listeners.delete(listener as (message: Message) => void);
-      }
-    },
-  );
+  unsubscribe = vi.fn(<T extends Message>(type: T["type"], listener: (message: T) => void) => {
+    const listeners = this.subscriptions.get(type);
+    if (listeners) {
+      listeners.delete(listener as (message: Message) => void);
+    }
+  });
 
   /**
    * Emit a message to subscribers (for testing)
@@ -133,17 +126,10 @@ export class MockMessageBus {
   /**
    * Verify that a hook execution request was published
    */
-  expectHookRequest(
-    eventName: string,
-    input?: Partial<Record<string, unknown>>,
-  ) {
-    const request = this.hookRequests.find(
-      (req) => req.eventName === eventName,
-    );
+  expectHookRequest(eventName: string, input?: Partial<Record<string, unknown>>) {
+    const request = this.hookRequests.find((req) => req.eventName === eventName);
     if (!request) {
-      throw new Error(
-        `Expected hook request for event "${eventName}" but none was found`,
-      );
+      throw new Error(`Expected hook request for event "${eventName}" but none was found`);
     }
 
     if (input) {
@@ -170,8 +156,6 @@ export function createMockMessageBus(): MessageBus {
 /**
  * Get the MockMessageBus instance from a mocked MessageBus
  */
-export function getMockMessageBusInstance(
-  messageBus: MessageBus,
-): MockMessageBus {
+export function getMockMessageBusInstance(messageBus: MessageBus): MockMessageBus {
   return messageBus as unknown as MockMessageBus;
 }
diff --git a/packages/gemini-cli-core/src/test-utils/mock-tool.ts b/packages/gemini-cli-core/src/test-utils/mock-tool.ts
index cdfc649d4..a31642fe0 100644
--- a/packages/gemini-cli-core/src/test-utils/mock-tool.ts
+++ b/packages/gemini-cli-core/src/test-utils/mock-tool.ts
@@ -4,20 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from '../tools/modifiable-tool.js';
-import type {
-  ToolCallConfirmationDetails,
-  ToolInvocation,
-  ToolResult,
-} from '../tools/tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-} from '../tools/tools.js';
+import type { ModifiableDeclarativeTool, ModifyContext } from "../tools/modifiable-tool.js";
+import type { ToolCallConfirmationDetails, ToolInvocation, ToolResult } from "../tools/tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "../tools/tools.js";
 
 interface MockToolOptions {
   name: string;
@@ -37,10 +26,7 @@ interface MockToolOptions {
   params?: object;
 }
 
-class MockToolInvocation extends BaseToolInvocation<
-  { [key: string]: unknown },
-  ToolResult
-> {
+class MockToolInvocation extends BaseToolInvocation<{ [key: string]: unknown }, ToolResult> {
   constructor(
     private readonly tool: MockTool,
     params: { [key: string]: unknown },
@@ -48,10 +34,7 @@ class MockToolInvocation extends BaseToolInvocation<
     super(params);
   }
 
-  execute(
-    signal: AbortSignal,
-    updateOutput?: (output: string) => void,
-  ): Promise<ToolResult> {
+  execute(signal: AbortSignal, updateOutput?: (output: string) => void): Promise<ToolResult> {
     if (updateOutput) {
       return this.tool.execute(this.params, signal, updateOutput);
     } else {
@@ -73,10 +56,7 @@ class MockToolInvocation extends BaseToolInvocation<
 /**
  * A highly configurable mock tool for testing purposes.
  */
-export class MockTool extends BaseDeclarativeTool<
-  { [key: string]: unknown },
-  ToolResult
-> {
+export class MockTool extends BaseDeclarativeTool<{ [key: string]: unknown }, ToolResult> {
   shouldConfirmExecute: (
     params: { [key: string]: unknown },
     signal: AbortSignal,
@@ -124,10 +104,10 @@ export class MockTool extends BaseDeclarativeTool<
 
 export const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE = () =>
   Promise.resolve({
-    type: 'exec' as const,
-    title: 'Confirm mockTool',
-    command: 'mockTool',
-    rootCommand: 'mockTool',
+    type: "exec" as const,
+    title: "Confirm mockTool",
+    command: "mockTool",
+    rootCommand: "mockTool",
     onConfirm: async () => {},
   });
 
@@ -157,13 +137,13 @@ export class MockModifiableToolInvocation extends BaseToolInvocation<
   ): Promise<ToolCallConfirmationDetails | false> {
     if (this.tool.shouldConfirm) {
       return {
-        type: 'edit',
-        title: 'Confirm Mock Tool',
-        fileName: 'test.txt',
-        filePath: 'test.txt',
-        fileDiff: 'diff',
-        originalContent: 'originalContent',
-        newContent: 'newContent',
+        type: "edit",
+        title: "Confirm Mock Tool",
+        fileName: "test.txt",
+        filePath: "test.txt",
+        fileDiff: "diff",
+        originalContent: "originalContent",
+        newContent: "newContent",
         onConfirm: async () => {},
       };
     }
@@ -184,24 +164,21 @@ export class MockModifiableTool
 {
   // Should be overridden in test file. Functionality will be updated in follow
   // up PR which has MockModifiableTool expect MockTool
-  executeFn: (params: Record<string, unknown>) => ToolResult | undefined = () =>
-    undefined;
+  executeFn: (params: Record<string, unknown>) => ToolResult | undefined = () => undefined;
   shouldConfirm = true;
 
-  constructor(name = 'mockModifiableTool') {
-    super(name, name, 'A mock modifiable tool for testing.', Kind.Other, {
-      type: 'object',
-      properties: { param: { type: 'string' } },
+  constructor(name = "mockModifiableTool") {
+    super(name, name, "A mock modifiable tool for testing.", Kind.Other, {
+      type: "object",
+      properties: { param: { type: "string" } },
     });
   }
 
-  getModifyContext(
-    _abortSignal: AbortSignal,
-  ): ModifyContext<Record<string, unknown>> {
+  getModifyContext(_abortSignal: AbortSignal): ModifyContext<Record<string, unknown>> {
     return {
-      getFilePath: () => 'test.txt',
-      getCurrentContent: async () => 'old content',
-      getProposedContent: async () => 'new content',
+      getFilePath: () => "test.txt",
+      getCurrentContent: async () => "old content",
+      getProposedContent: async () => "new content",
       createUpdatedParams: (
         _oldContent: string,
         modifiedProposedContent: string,
diff --git a/packages/gemini-cli-core/src/test-utils/mockWorkspaceContext.ts b/packages/gemini-cli-core/src/test-utils/mockWorkspaceContext.ts
index 67c614e9f..4327d96e4 100644
--- a/packages/gemini-cli-core/src/test-utils/mockWorkspaceContext.ts
+++ b/packages/gemini-cli-core/src/test-utils/mockWorkspaceContext.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import type { WorkspaceContext } from '../utils/workspaceContext.js';
+import { vi } from "vitest";
+import type { WorkspaceContext } from "../utils/workspaceContext.js";
 
 /**
  * Creates a mock WorkspaceContext for testing
@@ -24,9 +24,7 @@ export function createMockWorkspaceContext(
     getDirectories: vi.fn().mockReturnValue(allDirs),
     isPathWithinWorkspace: vi
       .fn()
-      .mockImplementation((path: string) =>
-        allDirs.some((dir) => path.startsWith(dir)),
-      ),
+      .mockImplementation((path: string) => allDirs.some((dir) => path.startsWith(dir))),
   } as unknown as WorkspaceContext;
 
   return mockWorkspaceContext;
diff --git a/packages/gemini-cli-core/src/tools/base-tool-invocation.test.ts b/packages/gemini-cli-core/src/tools/base-tool-invocation.test.ts
index f25bc8828..d9d62068b 100644
--- a/packages/gemini-cli-core/src/tools/base-tool-invocation.test.ts
+++ b/packages/gemini-cli-core/src/tools/base-tool-invocation.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { BaseToolInvocation, type ToolResult } from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
   type Message,
   MessageBusType,
   type ToolConfirmationRequest,
   type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
+} from "../confirmation-bus/types.js";
+import { BaseToolInvocation, type ToolResult } from "./tools.js";
 
 class TestBaseToolInvocation extends BaseToolInvocation<object, ToolResult> {
   getDescription(): string {
-    return 'test description';
+    return "test description";
   }
   async execute(): Promise<ToolResult> {
-    return { llmContent: [], returnDisplay: '' };
+    return { llmContent: [], returnDisplay: "" };
   }
 }
 
-describe('BaseToolInvocation', () => {
+describe("BaseToolInvocation", () => {
   let messageBus: MessageBus;
   let abortController: AbortController;
 
@@ -36,50 +36,34 @@ describe('BaseToolInvocation', () => {
     abortController = new AbortController();
   });
 
-  it('should propagate serverName to ToolConfirmationRequest', async () => {
-    const serverName = 'test-server';
-    const tool = new TestBaseToolInvocation(
-      {},
-      messageBus,
-      'test-tool',
-      'Test Tool',
-      serverName,
-    );
+  it("should propagate serverName to ToolConfirmationRequest", async () => {
+    const serverName = "test-server";
+    const tool = new TestBaseToolInvocation({}, messageBus, "test-tool", "Test Tool", serverName);
 
     let capturedRequest: ToolConfirmationRequest | undefined;
-    vi.mocked(messageBus.publish).mockImplementation(
-      async (request: Message) => {
-        if (request.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
-          capturedRequest = request;
-        }
-      },
-    );
+    vi.mocked(messageBus.publish).mockImplementation(async (request: Message) => {
+      if (request.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
+        capturedRequest = request;
+      }
+    });
 
-    let responseHandler:
-      | ((response: ToolConfirmationResponse) => void)
-      | undefined;
+    let responseHandler: ((response: ToolConfirmationResponse) => void) | undefined;
     vi.mocked(messageBus.subscribe).mockImplementation(
       (type: MessageBusType, handler: (message: Message) => void) => {
         if (type === MessageBusType.TOOL_CONFIRMATION_RESPONSE) {
-          responseHandler = handler as (
-            response: ToolConfirmationResponse,
-          ) => void;
+          responseHandler = handler as (response: ToolConfirmationResponse) => void;
         }
       },
     );
 
-    const confirmationPromise = tool.shouldConfirmExecute(
-      abortController.signal,
-    );
+    const confirmationPromise = tool.shouldConfirmExecute(abortController.signal);
 
     // Wait for microtasks to ensure publish is called
     await new Promise((resolve) => setTimeout(resolve, 0));
 
     expect(messageBus.publish).toHaveBeenCalledTimes(1);
     expect(capturedRequest).toBeDefined();
-    expect(capturedRequest?.type).toBe(
-      MessageBusType.TOOL_CONFIRMATION_REQUEST,
-    );
+    expect(capturedRequest?.type).toBe(MessageBusType.TOOL_CONFIRMATION_REQUEST);
     expect(capturedRequest?.serverName).toBe(serverName);
 
     // Simulate response to finish the promise cleanly
@@ -94,30 +78,26 @@ describe('BaseToolInvocation', () => {
     await confirmationPromise;
   });
 
-  it('should NOT propagate serverName if not provided', async () => {
+  it("should NOT propagate serverName if not provided", async () => {
     const tool = new TestBaseToolInvocation(
       {},
       messageBus,
-      'test-tool',
-      'Test Tool',
+      "test-tool",
+      "Test Tool",
       // no serverName
     );
 
     let capturedRequest: ToolConfirmationRequest | undefined;
-    vi.mocked(messageBus.publish).mockImplementation(
-      async (request: Message) => {
-        if (request.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
-          capturedRequest = request;
-        }
-      },
-    );
+    vi.mocked(messageBus.publish).mockImplementation(async (request: Message) => {
+      if (request.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
+        capturedRequest = request;
+      }
+    });
 
     // We need to mock subscribe to avoid hanging if we want to await the promise,
     // but for this test we just need to check publish.
     // We'll abort to clean up.
-    const confirmationPromise = tool.shouldConfirmExecute(
-      abortController.signal,
-    );
+    const confirmationPromise = tool.shouldConfirmExecute(abortController.signal);
 
     await new Promise((resolve) => setTimeout(resolve, 0));
 
diff --git a/packages/gemini-cli-core/src/tools/diffOptions.test.ts b/packages/gemini-cli-core/src/tools/diffOptions.test.ts
index cf6fe89b2..2aa12a1d3 100644
--- a/packages/gemini-cli-core/src/tools/diffOptions.test.ts
+++ b/packages/gemini-cli-core/src/tools/diffOptions.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it } from 'vitest';
-import { getDiffStat } from './diffOptions.js';
+import { describe, expect, it } from "vitest";
+import { getDiffStat } from "./diffOptions.js";
 
-describe('getDiffStat', () => {
-  const fileName = 'test.txt';
+describe("getDiffStat", () => {
+  const fileName = "test.txt";
 
-  it('should return 0 for all stats when there are no changes', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\n';
-    const userStr = 'line1\nline2\n';
+  it("should return 0 for all stats when there are no changes", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\n";
+    const userStr = "line1\nline2\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 0,
@@ -27,10 +27,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report model additions', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\nline3\n';
+  it("should correctly report model additions", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\nline3\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -44,10 +44,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report model removals', () => {
-    const oldStr = 'line1\nline2\nline3\n';
-    const aiStr = 'line1\nline3\n';
-    const userStr = 'line1\nline3\n';
+  it("should correctly report model removals", () => {
+    const oldStr = "line1\nline2\nline3\n";
+    const aiStr = "line1\nline3\n";
+    const userStr = "line1\nline3\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 0,
@@ -61,10 +61,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report model modifications', () => {
-    const oldStr = 'line1\nline2\nline3\n';
-    const aiStr = 'line1\nline_two\nline3\n';
-    const userStr = 'line1\nline_two\nline3\n';
+  it("should correctly report model modifications", () => {
+    const oldStr = "line1\nline2\nline3\n";
+    const aiStr = "line1\nline_two\nline3\n";
+    const userStr = "line1\nline_two\nline3\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -78,10 +78,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report user additions', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\nline3\nline4\n';
+  it("should correctly report user additions", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\nline3\nline4\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -95,10 +95,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report user removals', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\n';
+  it("should correctly report user removals", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -112,10 +112,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report user modifications', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\nline_three\n';
+  it("should correctly report user modifications", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\nline_three\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -129,10 +129,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should handle complex changes from both model and user', () => {
-    const oldStr = 'line1\nline2\nline3\nline4\n';
-    const aiStr = 'line_one\nline2\nline_three\nline4\n';
-    const userStr = 'line_one\nline_two\nline_three\nline4\nline5\n';
+  it("should handle complex changes from both model and user", () => {
+    const oldStr = "line1\nline2\nline3\nline4\n";
+    const aiStr = "line_one\nline2\nline_three\nline4\n";
+    const userStr = "line_one\nline_two\nline_three\nline4\nline5\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 2,
@@ -146,10 +146,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should report a single line modification as one addition and one removal', () => {
-    const oldStr = 'hello world';
-    const aiStr = 'hello universe';
-    const userStr = 'hello universe';
+  it("should report a single line modification as one addition and one removal", () => {
+    const oldStr = "hello world";
+    const aiStr = "hello universe";
+    const userStr = "hello universe";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
diff --git a/packages/gemini-cli-core/src/tools/diffOptions.ts b/packages/gemini-cli-core/src/tools/diffOptions.ts
index ad0738ba0..c916f83ed 100644
--- a/packages/gemini-cli-core/src/tools/diffOptions.ts
+++ b/packages/gemini-cli-core/src/tools/diffOptions.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Diff from 'diff';
-import type { DiffStat } from './tools.js';
+import * as Diff from "diff";
+import type { DiffStat } from "./tools.js";
 
 export const DEFAULT_DIFF_OPTIONS: Diff.PatchOptions = {
   context: 3,
@@ -26,10 +26,10 @@ export function getDiffStat(
 
     patch.hunks.forEach((hunk: Diff.Hunk) => {
       hunk.lines.forEach((line: string) => {
-        if (line.startsWith('+')) {
+        if (line.startsWith("+")) {
           addedLines++;
           addedChars += line.length - 1;
-        } else if (line.startsWith('-')) {
+        } else if (line.startsWith("-")) {
           removedLines++;
           removedChars += line.length - 1;
         }
@@ -43,8 +43,8 @@ export function getDiffStat(
     fileName,
     oldStr,
     aiStr,
-    'Current',
-    'Proposed',
+    "Current",
+    "Proposed",
     DEFAULT_DIFF_OPTIONS,
   );
   const modelStats = getStats(modelPatch);
@@ -54,8 +54,8 @@ export function getDiffStat(
     fileName,
     aiStr,
     userStr,
-    'Proposed',
-    'User',
+    "Proposed",
+    "User",
     DEFAULT_DIFF_OPTIONS,
   );
   const userStats = getStats(userPatch);
diff --git a/packages/gemini-cli-core/src/tools/edit.test.ts b/packages/gemini-cli-core/src/tools/edit.test.ts
index 1f301c212..81148e3d6 100644
--- a/packages/gemini-cli-core/src/tools/edit.test.ts
+++ b/packages/gemini-cli-core/src/tools/edit.test.ts
@@ -10,29 +10,29 @@ const mockEnsureCorrectEdit = vi.hoisted(() => vi.fn());
 const mockGenerateJson = vi.hoisted(() => vi.fn());
 const mockOpenDiff = vi.hoisted(() => vi.fn());
 
-import { IdeClient } from '../ide/ide-client.js';
+import { IdeClient } from "../ide/ide-client.js";
 
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn(),
   },
 }));
 
-vi.mock('../utils/editCorrector.js', () => ({
+vi.mock("../utils/editCorrector.js", () => ({
   ensureCorrectEdit: mockEnsureCorrectEdit,
 }));
 
-vi.mock('../core/client.js', () => ({
+vi.mock("../core/client.js", () => ({
   GeminiClient: vi.fn().mockImplementation(() => ({
     generateJson: mockGenerateJson,
   })),
 }));
 
-vi.mock('../utils/editor.js', () => ({
+vi.mock("../utils/editor.js", () => ({
   openDiff: mockOpenDiff,
 }));
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
@@ -44,23 +44,23 @@ interface EditFileParameterSchema {
   };
 }
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { EditToolParams } from './edit.js';
-import { applyReplacement, EditTool } from './edit.js';
-import type { FileDiff } from './tools.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import type { Content, Part, SchemaUnion } from '@google/genai';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-describe('EditTool', () => {
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import type { Content, Part, SchemaUnion } from "@google/genai";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { ApprovalMode } from "../policy/types.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import type { EditToolParams } from "./edit.js";
+import { applyReplacement, EditTool } from "./edit.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { FileDiff } from "./tools.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+
+describe("EditTool", () => {
   let tool: EditTool;
   let tempDir: string;
   let rootDir: string;
@@ -70,8 +70,8 @@ describe('EditTool', () => {
 
   beforeEach(() => {
     vi.restoreAllMocks();
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'edit-tool-test-'));
-    rootDir = path.join(tempDir, 'root');
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "edit-tool-test-"));
+    rootDir = path.join(tempDir, "root");
     fs.mkdirSync(rootDir);
 
     geminiClient = {
@@ -94,8 +94,8 @@ describe('EditTool', () => {
       // getGeminiConfig: () => ({ apiKey: 'test-api-key' }), // This was not a real Config method
       // Add other properties/methods of Config if EditTool uses them
       // Minimal other methods to satisfy Config type if needed by EditTool constructor or other direct uses:
-      getApiKey: () => 'test-api-key',
-      getModel: () => 'test-model',
+      getApiKey: () => "test-api-key",
+      getModel: () => "test-model",
       getSandbox: () => false,
       getDebugMode: () => false,
       getQuestion: () => undefined,
@@ -104,8 +104,8 @@ describe('EditTool', () => {
       getToolCallCommand: () => undefined,
       getMcpServerCommand: () => undefined,
       getMcpServers: () => undefined,
-      getUserAgent: () => 'test-agent',
-      getUserMemory: () => '',
+      getUserAgent: () => "test-agent",
+      getUserMemory: () => "",
       setUserMemory: vi.fn(),
       getGeminiMdFileCount: () => 0,
       setGeminiMdFileCount: vi.fn(),
@@ -120,62 +120,53 @@ describe('EditTool', () => {
 
     // Reset mocks and set default implementation for ensureCorrectEdit
     mockEnsureCorrectEdit.mockReset();
-    mockEnsureCorrectEdit.mockImplementation(
-      async (_, currentContent, params) => {
-        let occurrences = 0;
-        if (params.old_string && currentContent) {
-          // Simple string counting for the mock
-          let index = currentContent.indexOf(params.old_string);
-          while (index !== -1) {
-            occurrences++;
-            index = currentContent.indexOf(params.old_string, index + 1);
-          }
-        } else if (params.old_string === '') {
-          occurrences = 0; // Creating a new file
+    mockEnsureCorrectEdit.mockImplementation(async (_, currentContent, params) => {
+      let occurrences = 0;
+      if (params.old_string && currentContent) {
+        // Simple string counting for the mock
+        let index = currentContent.indexOf(params.old_string);
+        while (index !== -1) {
+          occurrences++;
+          index = currentContent.indexOf(params.old_string, index + 1);
         }
-        return Promise.resolve({ params, occurrences });
-      },
-    );
+      } else if (params.old_string === "") {
+        occurrences = 0; // Creating a new file
+      }
+      return Promise.resolve({ params, occurrences });
+    });
 
     // Default mock for generateJson to return the snippet unchanged
     mockGenerateJson.mockReset();
-    mockGenerateJson.mockImplementation(
-      async (contents: Content[], schema: SchemaUnion) => {
-        // The problematic_snippet is the last part of the user's content
-        const userContent = contents.find((c: Content) => c.role === 'user');
-        let promptText = '';
-        if (userContent && userContent.parts) {
-          promptText = userContent.parts
-            .filter((p: Part) => typeof (p as any).text === 'string')
-            .map((p: Part) => (p as any).text)
-            .join('\n');
-        }
-        const snippetMatch = promptText.match(
-          /Problematic target snippet:\n```\n([\s\S]*?)\n```/,
-        );
-        const problematicSnippet =
-          snippetMatch && snippetMatch[1] ? snippetMatch[1] : '';
+    mockGenerateJson.mockImplementation(async (contents: Content[], schema: SchemaUnion) => {
+      // The problematic_snippet is the last part of the user's content
+      const userContent = contents.find((c: Content) => c.role === "user");
+      let promptText = "";
+      if (userContent && userContent.parts) {
+        promptText = userContent.parts
+          .filter((p: Part) => typeof (p as any).text === "string")
+          .map((p: Part) => (p as any).text)
+          .join("\n");
+      }
+      const snippetMatch = promptText.match(/Problematic target snippet:\n```\n([\s\S]*?)\n```/);
+      const problematicSnippet = snippetMatch && snippetMatch[1] ? snippetMatch[1] : "";
 
-        if (((schema as any).properties as any)?.corrected_target_snippet) {
-          return Promise.resolve({
-            corrected_target_snippet: problematicSnippet,
-          });
-        }
-        if (((schema as any).properties as any)?.corrected_new_string) {
-          // For new_string correction, we might need more sophisticated logic,
-          // but for now, returning original is a safe default if not specified by a test.
-          const originalNewStringMatch = promptText.match(
-            /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
-          );
-          const originalNewString =
-            originalNewStringMatch && originalNewStringMatch[1]
-              ? originalNewStringMatch[1]
-              : '';
-          return Promise.resolve({ corrected_new_string: originalNewString });
-        }
-        return Promise.resolve({}); // Default empty object if schema doesn't match
-      },
-    );
+      if (((schema as any).properties as any)?.corrected_target_snippet) {
+        return Promise.resolve({
+          corrected_target_snippet: problematicSnippet,
+        });
+      }
+      if (((schema as any).properties as any)?.corrected_new_string) {
+        // For new_string correction, we might need more sophisticated logic,
+        // but for now, returning original is a safe default if not specified by a test.
+        const originalNewStringMatch = promptText.match(
+          /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
+        );
+        const originalNewString =
+          originalNewStringMatch && originalNewStringMatch[1] ? originalNewStringMatch[1] : "";
+        return Promise.resolve({ corrected_new_string: originalNewString });
+      }
+      return Promise.resolve({}); // Default empty object if schema doesn't match
+    });
 
     tool = new EditTool(mockConfig);
   });
@@ -184,146 +175,142 @@ describe('EditTool', () => {
     fs.rmSync(tempDir, { recursive: true, force: true });
   });
 
-  describe('applyReplacement', () => {
-    it('should return newString if isNewFile is true', () => {
-      expect(applyReplacement(null, 'old', 'new', true)).toBe('new');
-      expect(applyReplacement('existing', 'old', 'new', true)).toBe('new');
+  describe("applyReplacement", () => {
+    it("should return newString if isNewFile is true", () => {
+      expect(applyReplacement(null, "old", "new", true)).toBe("new");
+      expect(applyReplacement("existing", "old", "new", true)).toBe("new");
     });
 
-    it('should return newString if currentContent is null and oldString is empty (defensive)', () => {
-      expect(applyReplacement(null, '', 'new', false)).toBe('new');
+    it("should return newString if currentContent is null and oldString is empty (defensive)", () => {
+      expect(applyReplacement(null, "", "new", false)).toBe("new");
     });
 
-    it('should return empty string if currentContent is null and oldString is not empty (defensive)', () => {
-      expect(applyReplacement(null, 'old', 'new', false)).toBe('');
+    it("should return empty string if currentContent is null and oldString is not empty (defensive)", () => {
+      expect(applyReplacement(null, "old", "new", false)).toBe("");
     });
 
-    it('should replace oldString with newString in currentContent', () => {
-      expect(applyReplacement('hello old world old', 'old', 'new', false)).toBe(
-        'hello new world new',
+    it("should replace oldString with newString in currentContent", () => {
+      expect(applyReplacement("hello old world old", "old", "new", false)).toBe(
+        "hello new world new",
       );
     });
 
-    it('should return currentContent if oldString is empty and not a new file', () => {
-      expect(applyReplacement('hello world', '', 'new', false)).toBe(
-        'hello world',
-      );
+    it("should return currentContent if oldString is empty and not a new file", () => {
+      expect(applyReplacement("hello world", "", "new", false)).toBe("hello world");
     });
 
     it.each([
       {
-        name: '$ literal',
+        name: "$ literal",
         current: "price is $100 and pattern end is ' '",
-        oldStr: 'price is $100',
-        newStr: 'price is $200',
+        oldStr: "price is $100",
+        newStr: "price is $200",
         expected: "price is $200 and pattern end is ' '",
       },
       {
         name: "$' literal",
-        current: 'foo',
-        oldStr: 'foo',
+        current: "foo",
+        oldStr: "foo",
         newStr: "bar$'baz",
         expected: "bar$'baz",
       },
       {
-        name: '$& literal',
-        current: 'hello world',
-        oldStr: 'hello',
-        newStr: '$&-replacement',
-        expected: '$&-replacement world',
+        name: "$& literal",
+        current: "hello world",
+        oldStr: "hello",
+        newStr: "$&-replacement",
+        expected: "$&-replacement world",
       },
       {
-        name: '$` literal',
-        current: 'prefix-middle-suffix',
-        oldStr: 'middle',
-        newStr: 'new$`content',
-        expected: 'prefix-new$`content-suffix',
+        name: "$` literal",
+        current: "prefix-middle-suffix",
+        oldStr: "middle",
+        newStr: "new$`content",
+        expected: "prefix-new$`content-suffix",
       },
       {
-        name: '$1, $2 capture groups literal',
-        current: 'test string',
-        oldStr: 'test',
-        newStr: '$1$2replacement',
-        expected: '$1$2replacement string',
+        name: "$1, $2 capture groups literal",
+        current: "test string",
+        oldStr: "test",
+        newStr: "$1$2replacement",
+        expected: "$1$2replacement string",
       },
       {
-        name: 'normal strings without problematic $',
-        current: 'normal text replacement',
-        oldStr: 'text',
-        newStr: 'string',
-        expected: 'normal string replacement',
+        name: "normal strings without problematic $",
+        current: "normal text replacement",
+        oldStr: "text",
+        newStr: "string",
+        expected: "normal string replacement",
       },
       {
-        name: 'multiple occurrences with $ sequences',
-        current: 'foo bar foo baz',
-        oldStr: 'foo',
+        name: "multiple occurrences with $ sequences",
+        current: "foo bar foo baz",
+        oldStr: "foo",
         newStr: "test$'end",
         expected: "test$'end bar test$'end baz",
       },
       {
-        name: 'complex regex patterns with $ at end',
+        name: "complex regex patterns with $ at end",
         current: "| select('match', '^[sv]d[a-z]$')",
         oldStr: "'^[sv]d[a-z]$'",
         newStr: "'^[sv]d[a-z]$' # updated",
         expected: "| select('match', '^[sv]d[a-z]$' # updated)",
       },
       {
-        name: 'empty replacement with problematic $',
-        current: 'test content',
-        oldStr: 'nothing',
+        name: "empty replacement with problematic $",
+        current: "test content",
+        oldStr: "nothing",
         newStr: "replacement$'text",
-        expected: 'test content',
+        expected: "test content",
       },
       {
-        name: '$$ (escaped dollar)',
-        current: 'price value',
-        oldStr: 'value',
-        newStr: '$$100',
-        expected: 'price $$100',
+        name: "$$ (escaped dollar)",
+        current: "price value",
+        oldStr: "value",
+        newStr: "$$100",
+        expected: "price $$100",
       },
-    ])('should handle $name', ({ current, oldStr, newStr, expected }) => {
+    ])("should handle $name", ({ current, oldStr, newStr, expected }) => {
       const result = applyReplacement(current, oldStr, newStr, false);
       expect(result).toBe(expected);
     });
   });
 
-  describe('validateToolParams', () => {
-    it('should return null for valid params', () => {
+  describe("validateToolParams", () => {
+    it("should return null for valid params", () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'test.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "test.txt"),
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return error for path outside root', () => {
+    it("should return error for path outside root", () => {
       const params: EditToolParams = {
-        file_path: path.join(tempDir, 'outside-root.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(tempDir, "outside-root.txt"),
+        old_string: "old",
+        new_string: "new",
       };
       const error = tool.validateToolParams(params);
-      expect(error).toContain(
-        'File path must be within one of the workspace directories',
-      );
+      expect(error).toContain("File path must be within one of the workspace directories");
     });
   });
 
-  describe('shouldConfirmExecute', () => {
-    const testFile = 'edit_me.txt';
+  describe("shouldConfirmExecute", () => {
+    const testFile = "edit_me.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should resolve relative path and request confirmation', async () => {
-      fs.writeFileSync(filePath, 'some old content here');
+    it("should resolve relative path and request confirmation", async () => {
+      fs.writeFileSync(filePath, "some old content here");
       const params: EditToolParams = {
         file_path: testFile, // relative path
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       // ensureCorrectEdit will be called by shouldConfirmExecute
       mockEnsureCorrectEdit.mockResolvedValueOnce({
@@ -331,9 +318,7 @@ describe('EditTool', () => {
         occurrences: 1,
       });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Edit: ${testFile}`,
@@ -343,19 +328,17 @@ describe('EditTool', () => {
       );
     });
 
-    it('should request confirmation for valid edit', async () => {
-      fs.writeFileSync(filePath, 'some old content here');
+    it("should request confirmation for valid edit", async () => {
+      fs.writeFileSync(filePath, "some old content here");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       // ensureCorrectEdit will be called by shouldConfirmExecute
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 1 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Edit: ${testFile}`,
@@ -365,52 +348,46 @@ describe('EditTool', () => {
       );
     });
 
-    it('should return false if old_string is not found (ensureCorrectEdit returns 0)', async () => {
-      fs.writeFileSync(filePath, 'some content here');
+    it("should return false if old_string is not found (ensureCorrectEdit returns 0)", async () => {
+      fs.writeFileSync(filePath, "some content here");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'not_found',
-        new_string: 'new',
+        old_string: "not_found",
+        new_string: "new",
       };
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 0 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toBe(false);
     });
 
-    it('should return false if multiple occurrences of old_string are found (ensureCorrectEdit returns > 1)', async () => {
-      fs.writeFileSync(filePath, 'old old content here');
+    it("should return false if multiple occurrences of old_string are found (ensureCorrectEdit returns > 1)", async () => {
+      fs.writeFileSync(filePath, "old old content here");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 2 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toBe(false);
     });
 
-    it('should request confirmation for creating a new file (empty old_string)', async () => {
-      const newFileName = 'new_file.txt';
+    it("should request confirmation for creating a new file (empty old_string)", async () => {
+      const newFileName = "new_file.txt";
       const newFilePath = path.join(rootDir, newFileName);
       const params: EditToolParams = {
         file_path: newFilePath,
-        old_string: '',
-        new_string: 'new file content',
+        old_string: "",
+        new_string: "new file content",
       };
       // ensureCorrectEdit might not be called if old_string is empty,
       // as shouldConfirmExecute handles this for diff generation.
       // If it is called, it should return 0 occurrences for a new file.
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 0 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Edit: ${newFileName}`,
@@ -420,14 +397,14 @@ describe('EditTool', () => {
       );
     });
 
-    it('should use corrected params from ensureCorrectEdit for diff generation', async () => {
-      const originalContent = 'This is the original string to be replaced.';
-      const originalOldString = 'original string';
-      const originalNewString = 'new string';
+    it("should use corrected params from ensureCorrectEdit for diff generation", async () => {
+      const originalContent = "This is the original string to be replaced.";
+      const originalOldString = "original string";
+      const originalNewString = "new string";
 
-      const correctedOldString = 'original string to be replaced'; // More specific
-      const correctedNewString = 'completely new string'; // Different replacement
-      const expectedFinalContent = 'This is the completely new string.';
+      const correctedOldString = "original string to be replaced"; // More specific
+      const correctedNewString = "completely new string"; // Different replacement
+      const expectedFinalContent = "This is the completely new string.";
 
       fs.writeFileSync(filePath, originalContent);
       const params: EditToolParams = {
@@ -439,23 +416,21 @@ describe('EditTool', () => {
       // The main beforeEach already calls mockEnsureCorrectEdit.mockReset()
       // Set a specific mock for this test case
       let mockCalled = false;
-      mockEnsureCorrectEdit.mockImplementationOnce(
-        async (_, content, p, client, baseClient) => {
-          mockCalled = true;
-          expect(content).toBe(originalContent);
-          expect(p).toBe(params);
-          expect(client).toBe(geminiClient);
-          expect(baseClient).toBe(baseLlmClient);
-          return {
-            params: {
-              file_path: filePath,
-              old_string: correctedOldString,
-              new_string: correctedNewString,
-            },
-            occurrences: 1,
-          };
-        },
-      );
+      mockEnsureCorrectEdit.mockImplementationOnce(async (_, content, p, client, baseClient) => {
+        mockCalled = true;
+        expect(content).toBe(originalContent);
+        expect(p).toBe(params);
+        expect(client).toBe(geminiClient);
+        expect(baseClient).toBe(baseLlmClient);
+        return {
+          params: {
+            file_path: filePath,
+            old_string: correctedOldString,
+            new_string: correctedNewString,
+          },
+          occurrences: 1,
+        };
+      });
       const invocation = tool.build(params);
       const confirmation = (await invocation.shouldConfirmExecute(
         new AbortController().signal,
@@ -482,20 +457,20 @@ describe('EditTool', () => {
       expect(patchedContent).toBe(expectedFinalContent);
     });
 
-    it('should rethrow calculateEdit errors when the abort signal is triggered', async () => {
-      const filePath = path.join(rootDir, 'abort-confirmation.txt');
+    it("should rethrow calculateEdit errors when the abort signal is triggered", async () => {
+      const filePath = path.join(rootDir, "abort-confirmation.txt");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error('Abort requested');
+      const abortError = new Error("Abort requested");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -503,16 +478,16 @@ describe('EditTool', () => {
           throw abortError;
         });
 
-      await expect(
-        invocation.shouldConfirmExecute(abortController.signal),
-      ).rejects.toBe(abortError);
+      await expect(invocation.shouldConfirmExecute(abortController.signal)).rejects.toBe(
+        abortError,
+      );
 
       calculateSpy.mockRestore();
     });
   });
 
-  describe('execute', () => {
-    const testFile = 'execute_me.txt';
+  describe("execute", () => {
+    const testFile = "execute_me.txt";
     let filePath: string;
 
     beforeEach(() => {
@@ -526,54 +501,52 @@ describe('EditTool', () => {
             occurrences++;
             index = content.indexOf(params.old_string, index + 1);
           }
-        } else if (params.old_string === '') {
+        } else if (params.old_string === "") {
           occurrences = 0;
         }
         return { params, occurrences };
       });
     });
 
-    it('should resolve relative path and execute successfully', async () => {
-      const initialContent = 'This is some old text.';
-      const newContent = 'This is some new text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should resolve relative path and execute successfully", async () => {
+      const initialContent = "This is some old text.";
+      const newContent = "This is some new text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: testFile, // relative path
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(newContent);
     });
 
-    it('should throw error if file path is empty', async () => {
+    it("should throw error if file path is empty", async () => {
       const params: EditToolParams = {
-        file_path: '',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: "",
+        old_string: "old",
+        new_string: "new",
       };
-      expect(() => tool.build(params)).toThrow(
-        /The 'file_path' parameter must be non-empty./,
-      );
+      expect(() => tool.build(params)).toThrow(/The 'file_path' parameter must be non-empty./);
     });
 
-    it('should reject when calculateEdit fails after an abort signal', async () => {
+    it("should reject when calculateEdit fails after an abort signal", async () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'abort-execute.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "abort-execute.txt"),
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error('Abort requested during execute');
+      const abortError = new Error("Abort requested during execute");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -581,21 +554,19 @@ describe('EditTool', () => {
           throw abortError;
         });
 
-      await expect(invocation.execute(abortController.signal)).rejects.toBe(
-        abortError,
-      );
+      await expect(invocation.execute(abortController.signal)).rejects.toBe(abortError);
 
       calculateSpy.mockRestore();
     });
 
-    it('should edit an existing file and return diff with fileName', async () => {
-      const initialContent = 'This is some old text.';
-      const newContent = 'This is some new text.'; // old -> new
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should edit an existing file and return diff with fileName", async () => {
+      const initialContent = "This is some old text.";
+      const newContent = "This is some new text."; // old -> new
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
 
       // Specific mock for this test's execution path in calculateEdit
@@ -606,32 +577,30 @@ describe('EditTool', () => {
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(newContent);
       const display = result.returnDisplay as FileDiff;
       expect(display.fileDiff).toMatch(initialContent);
       expect(display.fileDiff).toMatch(newContent);
       expect(display.fileName).toBe(testFile);
     });
 
-    it('should create a new file if old_string is empty and file does not exist, and return created message', async () => {
-      const newFileName = 'brand_new_file.txt';
+    it("should create a new file if old_string is empty and file does not exist, and return created message", async () => {
+      const newFileName = "brand_new_file.txt";
       const newFilePath = path.join(rootDir, newFileName);
-      const fileContent = 'Content for the new file.';
+      const fileContent = "Content for the new file.";
       const params: EditToolParams = {
         file_path: newFilePath,
-        old_string: '',
+        old_string: "",
         new_string: fileContent,
       };
 
-      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(
-        ApprovalMode.AUTO_EDIT,
-      );
+      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Created new file/);
       expect(fs.existsSync(newFilePath)).toBe(true);
-      expect(fs.readFileSync(newFilePath, 'utf8')).toBe(fileContent);
+      expect(fs.readFileSync(newFilePath, "utf8")).toBe(fileContent);
 
       const display = result.returnDisplay as FileDiff;
       expect(display.fileDiff).toMatch(/\+Content for the new file\./);
@@ -648,48 +617,40 @@ describe('EditTool', () => {
       });
     });
 
-    it('should return error if old_string is not found in file', async () => {
-      fs.writeFileSync(filePath, 'Some content.', 'utf8');
+    it("should return error if old_string is not found in file", async () => {
+      fs.writeFileSync(filePath, "Some content.", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'nonexistent',
-        new_string: 'replacement',
+        old_string: "nonexistent",
+        new_string: "replacement",
       };
       // The default mockEnsureCorrectEdit will return 0 occurrences for 'nonexistent'
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.llmContent).toMatch(
-        /0 occurrences found for old_string in/,
-      );
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, could not find the string to replace./,
-      );
+      expect(result.llmContent).toMatch(/0 occurrences found for old_string in/);
+      expect(result.returnDisplay).toMatch(/Failed to edit, could not find the string to replace./);
     });
 
-    it('should return error if multiple occurrences of old_string are found', async () => {
-      fs.writeFileSync(filePath, 'multiple old old strings', 'utf8');
+    it("should return error if multiple occurrences of old_string are found", async () => {
+      fs.writeFileSync(filePath, "multiple old old strings", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       // The default mockEnsureCorrectEdit will return 2 occurrences for 'old'
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.llmContent).toMatch(
-        /Expected 1 occurrence but found 2 for old_string in file/,
-      );
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, expected 1 occurrence but found 2/,
-      );
+      expect(result.llmContent).toMatch(/Expected 1 occurrence but found 2 for old_string in file/);
+      expect(result.returnDisplay).toMatch(/Failed to edit, expected 1 occurrence but found 2/);
     });
 
-    it('should successfully replace multiple occurrences when expected_replacements specified', async () => {
-      fs.writeFileSync(filePath, 'old text\nold text\nold text', 'utf8');
+    it("should successfully replace multiple occurrences when expected_replacements specified", async () => {
+      fs.writeFileSync(filePath, "old text\nold text\nold text", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
         expected_replacements: 3,
       };
 
@@ -697,9 +658,7 @@ describe('EditTool', () => {
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(
-        'new text\nnew text\nnew text',
-      );
+      expect(fs.readFileSync(filePath, "utf8")).toBe("new text\nnew text\nnew text");
       const display = result.returnDisplay as FileDiff;
 
       expect(display.fileDiff).toMatch(/-old text\n-old text\n-old text/);
@@ -717,12 +676,12 @@ describe('EditTool', () => {
       });
     });
 
-    it('should return error if expected_replacements does not match actual occurrences', async () => {
-      fs.writeFileSync(filePath, 'old text old text', 'utf8');
+    it("should return error if expected_replacements does not match actual occurrences", async () => {
+      fs.writeFileSync(filePath, "old text old text", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
         expected_replacements: 3, // Expecting 3 but only 2 exist
       };
       const invocation = tool.build(params);
@@ -730,46 +689,38 @@ describe('EditTool', () => {
       expect(result.llmContent).toMatch(
         /Expected 3 occurrences but found 2 for old_string in file/,
       );
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, expected 3 occurrences but found 2/,
-      );
+      expect(result.returnDisplay).toMatch(/Failed to edit, expected 3 occurrences but found 2/);
     });
 
-    it('should return error if trying to create a file that already exists (empty old_string)', async () => {
-      fs.writeFileSync(filePath, 'Existing content', 'utf8');
+    it("should return error if trying to create a file that already exists (empty old_string)", async () => {
+      fs.writeFileSync(filePath, "Existing content", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: '',
-        new_string: 'new content',
+        old_string: "",
+        new_string: "new content",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toMatch(/File already exists, cannot create/);
-      expect(result.returnDisplay).toMatch(
-        /Attempted to create a file that already exists/,
-      );
+      expect(result.returnDisplay).toMatch(/Attempted to create a file that already exists/);
     });
 
-    it('should include modification message when proposed content is modified', async () => {
-      const initialContent = 'Line 1\nold line\nLine 3\nLine 4\nLine 5\n';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should include modification message when proposed content is modified", async () => {
+      const initialContent = "Line 1\nold line\nLine 3\nLine 4\nLine 5\n";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
         modified_by_user: true,
-        ai_proposed_content: 'Line 1\nAI line\nLine 3\nLine 4\nLine 5\n',
+        ai_proposed_content: "Line 1\nAI line\nLine 3\nLine 4\nLine 5\n",
       };
 
-      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(
-        ApprovalMode.AUTO_EDIT,
-      );
+      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.llmContent).toMatch(
-        /User modified the `new_string` content/,
-      );
+      expect(result.llmContent).toMatch(/User modified the `new_string` content/);
       expect((result.returnDisplay as FileDiff).diffStat).toStrictEqual({
         model_added_lines: 1,
         model_removed_lines: 1,
@@ -784,46 +735,39 @@ describe('EditTool', () => {
 
     it.each([
       {
-        name: 'modified_by_user is false',
+        name: "modified_by_user is false",
         modifiedByUser: false,
       },
       {
-        name: 'modified_by_user is not provided',
+        name: "modified_by_user is not provided",
         modifiedByUser: undefined,
       },
-    ])(
-      'should not include modification message when $name',
-      async ({ modifiedByUser }) => {
-        const initialContent = 'This is some old text.';
-        fs.writeFileSync(filePath, initialContent, 'utf8');
-        const params: EditToolParams = {
-          file_path: filePath,
-          old_string: 'old',
-          new_string: 'new',
-          ...(modifiedByUser !== undefined && {
-            modified_by_user: modifiedByUser,
-          }),
-        };
+    ])("should not include modification message when $name", async ({ modifiedByUser }) => {
+      const initialContent = "This is some old text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
+      const params: EditToolParams = {
+        file_path: filePath,
+        old_string: "old",
+        new_string: "new",
+        ...(modifiedByUser !== undefined && {
+          modified_by_user: modifiedByUser,
+        }),
+      };
 
-        (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(
-          ApprovalMode.AUTO_EDIT,
-        );
-        const invocation = tool.build(params);
-        const result = await invocation.execute(new AbortController().signal);
+      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
+      const invocation = tool.build(params);
+      const result = await invocation.execute(new AbortController().signal);
 
-        expect(result.llmContent).not.toMatch(
-          /User modified the `new_string` content/,
-        );
-      },
-    );
+      expect(result.llmContent).not.toMatch(/User modified the `new_string` content/);
+    });
 
-    it('should return error if old_string and new_string are identical', async () => {
-      const initialContent = 'This is some identical text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should return error if old_string and new_string are identical", async () => {
+      const initialContent = "This is some identical text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'identical',
-        new_string: 'identical',
+        old_string: "identical",
+        new_string: "identical",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
@@ -831,16 +775,16 @@ describe('EditTool', () => {
       expect(result.returnDisplay).toMatch(/No changes to apply/);
     });
 
-    it('should return EDIT_NO_CHANGE error if replacement results in identical content', async () => {
+    it("should return EDIT_NO_CHANGE error if replacement results in identical content", async () => {
       // This can happen if ensureCorrectEdit finds a fuzzy match, but the literal
       // string replacement with `replaceAll` results in no change.
-      const initialContent = 'line 1\nline  2\nline 3'; // Note the double space
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+      const initialContent = "line 1\nline  2\nline 3"; // Note the double space
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
         // old_string has a single space, so it won't be found by replaceAll
-        old_string: 'line 1\nline 2\nline 3',
-        new_string: 'line 1\nnew line 2\nline 3',
+        old_string: "line 1\nline 2\nline 3",
+        new_string: "line 1\nnew line 2\nline 3",
       };
 
       // Mock ensureCorrectEdit to simulate it finding a match (e.g., via fuzzy matching)
@@ -855,12 +799,12 @@ describe('EditTool', () => {
         /No changes to apply. The new content is identical to the current content./,
       );
       // Ensure the file was not actually changed
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(initialContent);
     });
   });
 
-  describe('Error Scenarios', () => {
-    const testFile = 'error_test.txt';
+  describe("Error Scenarios", () => {
+    const testFile = "error_test.txt";
     let filePath: string;
 
     beforeEach(() => {
@@ -869,124 +813,119 @@ describe('EditTool', () => {
 
     it.each([
       {
-        name: 'FILE_NOT_FOUND error',
+        name: "FILE_NOT_FOUND error",
         setup: () => {},
-        params: { file_path: '', old_string: 'any', new_string: 'new' },
+        params: { file_path: "", old_string: "any", new_string: "new" },
         expectedError: ToolErrorType.FILE_NOT_FOUND,
         isAsyncTest: true,
       },
       {
-        name: 'ATTEMPT_TO_CREATE_EXISTING_FILE error',
-        setup: (fp: string) => fs.writeFileSync(fp, 'existing content', 'utf8'),
-        params: { file_path: '', old_string: '', new_string: 'new content' },
+        name: "ATTEMPT_TO_CREATE_EXISTING_FILE error",
+        setup: (fp: string) => fs.writeFileSync(fp, "existing content", "utf8"),
+        params: { file_path: "", old_string: "", new_string: "new content" },
         expectedError: ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
         isAsyncTest: true,
       },
       {
-        name: 'NO_OCCURRENCE_FOUND error',
-        setup: (fp: string) => fs.writeFileSync(fp, 'content', 'utf8'),
-        params: { file_path: '', old_string: 'not-found', new_string: 'new' },
+        name: "NO_OCCURRENCE_FOUND error",
+        setup: (fp: string) => fs.writeFileSync(fp, "content", "utf8"),
+        params: { file_path: "", old_string: "not-found", new_string: "new" },
         expectedError: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
         isAsyncTest: true,
       },
       {
-        name: 'EXPECTED_OCCURRENCE_MISMATCH error',
-        setup: (fp: string) => fs.writeFileSync(fp, 'one one two', 'utf8'),
+        name: "EXPECTED_OCCURRENCE_MISMATCH error",
+        setup: (fp: string) => fs.writeFileSync(fp, "one one two", "utf8"),
         params: {
-          file_path: '',
-          old_string: 'one',
-          new_string: 'new',
+          file_path: "",
+          old_string: "one",
+          new_string: "new",
           expected_replacements: 3,
         },
         expectedError: ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
         isAsyncTest: true,
       },
       {
-        name: 'NO_CHANGE error',
-        setup: (fp: string) => fs.writeFileSync(fp, 'content', 'utf8'),
-        params: { file_path: '', old_string: 'content', new_string: 'content' },
+        name: "NO_CHANGE error",
+        setup: (fp: string) => fs.writeFileSync(fp, "content", "utf8"),
+        params: { file_path: "", old_string: "content", new_string: "content" },
         expectedError: ToolErrorType.EDIT_NO_CHANGE,
         isAsyncTest: true,
       },
       {
-        name: 'relative path (should not throw)',
+        name: "relative path (should not throw)",
         setup: () => {},
         params: {
-          file_path: 'relative/path.txt',
-          old_string: 'a',
-          new_string: 'b',
+          file_path: "relative/path.txt",
+          old_string: "a",
+          new_string: "b",
         },
         expectedError: null,
         isAsyncTest: false,
       },
       {
-        name: 'FILE_WRITE_FAILURE on write error',
+        name: "FILE_WRITE_FAILURE on write error",
         setup: (fp: string) => {
-          fs.writeFileSync(fp, 'content', 'utf8');
-          fs.chmodSync(fp, '444');
+          fs.writeFileSync(fp, "content", "utf8");
+          fs.chmodSync(fp, "444");
         },
         params: {
-          file_path: '',
-          old_string: 'content',
-          new_string: 'new content',
+          file_path: "",
+          old_string: "content",
+          new_string: "new content",
         },
         expectedError: ToolErrorType.FILE_WRITE_FAILURE,
         isAsyncTest: true,
       },
-    ])(
-      'should return $name',
-      async ({ setup, params, expectedError, isAsyncTest }) => {
-        const testParams = {
-          ...params,
-          file_path: params.file_path || filePath,
-        };
-        setup(filePath);
-
-        if (!isAsyncTest) {
-          expect(() => tool.build(testParams)).not.toThrow();
-        } else {
-          const invocation = tool.build(testParams);
-          const result = await invocation.execute(new AbortController().signal);
-          expect(result.error?.type).toBe(expectedError);
-        }
-      },
-    );
+    ])("should return $name", async ({ setup, params, expectedError, isAsyncTest }) => {
+      const testParams = {
+        ...params,
+        file_path: params.file_path || filePath,
+      };
+      setup(filePath);
+
+      if (!isAsyncTest) {
+        expect(() => tool.build(testParams)).not.toThrow();
+      } else {
+        const invocation = tool.build(testParams);
+        const result = await invocation.execute(new AbortController().signal);
+        expect(result.error?.type).toBe(expectedError);
+      }
+    });
   });
 
-  describe('getDescription', () => {
+  describe("getDescription", () => {
     it.each([
       {
-        name: 'identical strings (no change)',
-        fileName: 'test.txt',
-        oldStr: 'identical_string',
-        newStr: 'identical_string',
-        expected: 'No file changes to test.txt',
+        name: "identical strings (no change)",
+        fileName: "test.txt",
+        oldStr: "identical_string",
+        newStr: "identical_string",
+        expected: "No file changes to test.txt",
       },
       {
-        name: 'different strings (full)',
-        fileName: 'test.txt',
-        oldStr: 'this is the old string value',
-        newStr: 'this is the new string value',
-        expected:
-          'test.txt: this is the old string value => this is the new string value',
+        name: "different strings (full)",
+        fileName: "test.txt",
+        oldStr: "this is the old string value",
+        newStr: "this is the new string value",
+        expected: "test.txt: this is the old string value => this is the new string value",
       },
       {
-        name: 'very short strings',
-        fileName: 'short.txt',
-        oldStr: 'old',
-        newStr: 'new',
-        expected: 'short.txt: old => new',
+        name: "very short strings",
+        fileName: "short.txt",
+        oldStr: "old",
+        newStr: "new",
+        expected: "short.txt: old => new",
       },
       {
-        name: 'long strings (truncated)',
-        fileName: 'long.txt',
-        oldStr:
-          'this is a very long old string that will definitely be truncated',
-        newStr: 'this is a very long new string that will also be truncated',
+        name: "long strings (truncated)",
+        fileName: "long.txt",
+        oldStr: "this is a very long old string that will definitely be truncated",
+        newStr: "this is a very long new string that will also be truncated",
         expected:
-          'long.txt: this is a very long old string... => this is a very long new string...',
+          "long.txt: this is a very long old string... => this is a very long new string...",
       },
-    ])('should handle $name', ({ fileName, oldStr, newStr, expected }) => {
+    ])("should handle $name", ({ fileName, oldStr, newStr, expected }) => {
       const params: EditToolParams = {
         file_path: path.join(rootDir, fileName),
         old_string: oldStr,
@@ -997,60 +936,56 @@ describe('EditTool', () => {
     });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should validate paths are within workspace root', () => {
+  describe("workspace boundary validation", () => {
+    it("should validate paths are within workspace root", () => {
       const validPath = {
-        file_path: path.join(rootDir, 'file.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "file.txt"),
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(validPath)).toBeNull();
     });
 
-    it('should reject paths outside workspace root', () => {
+    it("should reject paths outside workspace root", () => {
       const invalidPath = {
-        file_path: '/etc/passwd',
-        old_string: 'root',
-        new_string: 'hacked',
+        file_path: "/etc/passwd",
+        old_string: "root",
+        new_string: "hacked",
       };
       const error = tool.validateToolParams(invalidPath);
-      expect(error).toContain(
-        'File path must be within one of the workspace directories',
-      );
+      expect(error).toContain("File path must be within one of the workspace directories");
       expect(error).toContain(rootDir);
     });
   });
 
-  describe('constructor', () => {
+  describe("constructor", () => {
     afterEach(() => {
       vi.restoreAllMocks();
     });
 
-    it('should use windows-style path examples on windows', () => {
-      vi.spyOn(process, 'platform', 'get').mockReturnValue('win32');
+    it("should use windows-style path examples on windows", () => {
+      vi.spyOn(process, "platform", "get").mockReturnValue("win32");
 
       const tool = new EditTool({} as unknown as Config);
       const schema = tool.schema;
       expect(
-        (schema.parametersJsonSchema as EditFileParameterSchema).properties
-          .file_path.description,
-      ).toBe('The path to the file to modify.');
+        (schema.parametersJsonSchema as EditFileParameterSchema).properties.file_path.description,
+      ).toBe("The path to the file to modify.");
     });
 
-    it('should use unix-style path examples on non-windows platforms', () => {
-      vi.spyOn(process, 'platform', 'get').mockReturnValue('linux');
+    it("should use unix-style path examples on non-windows platforms", () => {
+      vi.spyOn(process, "platform", "get").mockReturnValue("linux");
 
       const tool = new EditTool({} as unknown as Config);
       const schema = tool.schema;
       expect(
-        (schema.parametersJsonSchema as EditFileParameterSchema).properties
-          .file_path.description,
-      ).toBe('The path to the file to modify.');
+        (schema.parametersJsonSchema as EditFileParameterSchema).properties.file_path.description,
+      ).toBe("The path to the file to modify.");
     });
   });
 
-  describe('IDE mode', () => {
-    const testFile = 'edit_me.txt';
+  describe("IDE mode", () => {
+    const testFile = "edit_me.txt";
     let filePath: string;
     let ideClient: any;
 
@@ -1064,33 +999,31 @@ describe('EditTool', () => {
       (mockConfig as any).getIdeMode = () => true;
     });
 
-    it('should call ideClient.openDiff and update params on confirmation', async () => {
-      const initialContent = 'some old content here';
-      const newContent = 'some new content here';
-      const modifiedContent = 'some modified content here';
+    it("should call ideClient.openDiff and update params on confirmation", async () => {
+      const initialContent = "some old content here";
+      const newContent = "some new content here";
+      const modifiedContent = "some modified content here";
       fs.writeFileSync(filePath, initialContent);
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       mockEnsureCorrectEdit.mockResolvedValueOnce({
-        params: { ...params, old_string: 'old', new_string: 'new' },
+        params: { ...params, old_string: "old", new_string: "new" },
         occurrences: 1,
       });
       ideClient.openDiff.mockResolvedValueOnce({
-        status: 'accepted',
+        status: "accepted",
         content: modifiedContent,
       });
 
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(ideClient.openDiff).toHaveBeenCalledWith(filePath, newContent);
 
-      if (confirmation && 'onConfirm' in confirmation) {
+      if (confirmation && "onConfirm" in confirmation) {
         await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
       }
 
@@ -1099,8 +1032,8 @@ describe('EditTool', () => {
     });
   });
 
-  describe('multiple file edits', () => {
-    it('should perform multiple removals and report correct diff stats', async () => {
+  describe("multiple file edits", () => {
+    it("should perform multiple removals and report correct diff stats", async () => {
       const numFiles = 10;
       const files: Array<{
         path: string;
@@ -1115,23 +1048,17 @@ describe('EditTool', () => {
         const fileName = `test-file-${i}.txt`;
         const filePath = path.join(rootDir, fileName);
         const numLines = Math.floor(Math.random() * 6) + 5; // 5 to 10 lines
-        const lines = Array.from(
-          { length: numLines },
-          (_, j) => `File ${i}, Line ${j + 1}`,
-        );
-        const content = lines.join('\n') + '\n';
+        const lines = Array.from({ length: numLines }, (_, j) => `File ${i}, Line ${j + 1}`);
+        const content = lines.join("\n") + "\n";
 
         // Determine which lines to remove (2 or 3 lines)
         const numLinesToRemove = Math.floor(Math.random() * 2) + 2; // 2 or 3
         expectedLinesRemoved.push(numLinesToRemove);
         const startLineToRemove = 1; // Start removing from the second line
-        const linesToRemove = lines.slice(
-          startLineToRemove,
-          startLineToRemove + numLinesToRemove,
-        );
-        const toRemove = linesToRemove.join('\n') + '\n';
+        const linesToRemove = lines.slice(startLineToRemove, startLineToRemove + numLinesToRemove);
+        const toRemove = linesToRemove.join("\n") + "\n";
 
-        fs.writeFileSync(filePath, content, 'utf8');
+        fs.writeFileSync(filePath, content, "utf8");
         files.push({
           path: filePath,
           initialContent: content,
@@ -1144,20 +1071,18 @@ describe('EditTool', () => {
         const params: EditToolParams = {
           file_path: file.path,
           old_string: file.toRemove,
-          new_string: '', // Removing the content
+          new_string: "", // Removing the content
         };
         const invocation = tool.build(params);
         const result = await invocation.execute(new AbortController().signal);
 
         if (
           result.returnDisplay &&
-          typeof result.returnDisplay === 'object' &&
-          'diffStat' in result.returnDisplay &&
+          typeof result.returnDisplay === "object" &&
+          "diffStat" in result.returnDisplay &&
           result.returnDisplay.diffStat
         ) {
-          actualLinesRemoved.push(
-            result.returnDisplay.diffStat?.model_removed_lines,
-          );
+          actualLinesRemoved.push(result.returnDisplay.diffStat?.model_removed_lines);
         } else if (result.error) {
           console.error(`Edit failed for ${file.path}:`, result.error);
         }
@@ -1165,21 +1090,15 @@ describe('EditTool', () => {
 
       // 3. Assert that the content was removed from each file
       for (const file of files) {
-        const finalContent = fs.readFileSync(file.path, 'utf8');
-        const expectedContent = file.initialContent.replace(file.toRemove, '');
+        const finalContent = fs.readFileSync(file.path, "utf8");
+        const expectedContent = file.initialContent.replace(file.toRemove, "");
         expect(finalContent).toBe(expectedContent);
         expect(finalContent).not.toContain(file.toRemove);
       }
 
       // 4. Assert that the total number of removed lines matches the diffStat total
-      const totalExpectedRemoved = expectedLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
-      const totalActualRemoved = actualLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
+      const totalExpectedRemoved = expectedLinesRemoved.reduce((sum, current) => sum + current, 0);
+      const totalActualRemoved = actualLinesRemoved.reduce((sum, current) => sum + current, 0);
       expect(totalActualRemoved).toBe(totalExpectedRemoved);
     });
   });
diff --git a/packages/gemini-cli-core/src/tools/edit.ts b/packages/gemini-cli-core/src/tools/edit.ts
index 4ffd0dbf7..40762454a 100644
--- a/packages/gemini-cli-core/src/tools/edit.ts
+++ b/packages/gemini-cli-core/src/tools/edit.ts
@@ -4,44 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as Diff from 'diff';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+
+import { ensureCorrectEdit } from "../utils/editCorrector.js";
+import { isNodeError } from "../utils/errors.js";
+import { getSpecificMimeType } from "../utils/fileUtils.js";
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { safeLiteralReplace } from "../utils/textUtils.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from "./tool-names.js";
 import type {
   ToolCallConfirmationDetails,
   ToolEditConfirmationDetails,
   ToolInvocation,
   ToolLocation,
   ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { isNodeError } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import { ensureCorrectEdit } from '../utils/editCorrector.js';
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getSpecificMimeType } from '../utils/fileUtils.js';
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { safeLiteralReplace } from '../utils/textUtils.js';
-import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 export function applyReplacement(
   currentContent: string | null,
@@ -54,10 +46,10 @@ export function applyReplacement(
   }
   if (currentContent === null) {
     // Should not happen if not a new file, but defensively return empty or newString if oldString is also empty
-    return oldString === '' ? newString : '';
+    return oldString === "" ? newString : "";
   }
   // If oldString is empty and it's not a new file, do not modify the content.
-  if (oldString === '' && !isNewFile) {
+  if (oldString === "" && !isNewFile) {
     return currentContent;
   }
 
@@ -123,10 +115,7 @@ class EditToolInvocation
     displayName?: string,
   ) {
     super(params, messageBus, toolName, displayName);
-    this.resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.file_path,
-    );
+    this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
   }
 
   override toolLocations(): ToolLocation[] {
@@ -150,26 +139,22 @@ class EditToolInvocation
     let finalNewString = params.new_string;
     let finalOldString = params.old_string;
     let occurrences = 0;
-    let error:
-      | { display: string; raw: string; type: ToolErrorType }
-      | undefined = undefined;
+    let error: { display: string; raw: string; type: ToolErrorType } | undefined = undefined;
 
     try {
-      currentContent = await this.config
-        .getFileSystemService()
-        .readTextFile(this.resolvedPath);
+      currentContent = await this.config.getFileSystemService().readTextFile(this.resolvedPath);
       // Normalize line endings to LF for consistent processing.
-      currentContent = currentContent.replace(/\r\n/g, '\n');
+      currentContent = currentContent.replace(/\r\n/g, "\n");
       fileExists = true;
     } catch (err: unknown) {
-      if (!isNodeError(err) || err.code !== 'ENOENT') {
+      if (!isNodeError(err) || err.code !== "ENOENT") {
         // Rethrow unexpected FS errors (permissions, etc.)
         throw err;
       }
       fileExists = false;
     }
 
-    if (params.old_string === '' && !fileExists) {
+    if (params.old_string === "" && !fileExists) {
       // Creating a new file
       isNewFile = true;
     } else if (!fileExists) {
@@ -193,7 +178,7 @@ class EditToolInvocation
       finalNewString = correctedEdit.params.new_string;
       occurrences = correctedEdit.occurrences;
 
-      if (params.old_string === '') {
+      if (params.old_string === "") {
         // Error: Trying to create a file that already exists
         error = {
           display: `Failed to edit. Attempted to create a file that already exists.`,
@@ -207,8 +192,7 @@ class EditToolInvocation
           type: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
         };
       } else if (occurrences !== expectedReplacements) {
-        const occurrenceTerm =
-          expectedReplacements === 1 ? 'occurrence' : 'occurrences';
+        const occurrenceTerm = expectedReplacements === 1 ? "occurrence" : "occurrences";
 
         error = {
           display: `Failed to edit, expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences}.`,
@@ -232,18 +216,12 @@ class EditToolInvocation
     }
 
     const newContent = !error
-      ? applyReplacement(
-          currentContent,
-          finalOldString,
-          finalNewString,
-          isNewFile,
-        )
-      : (currentContent ?? '');
+      ? applyReplacement(currentContent, finalOldString, finalNewString, isNewFile)
+      : (currentContent ?? "");
 
     if (!error && fileExists && currentContent === newContent) {
       error = {
-        display:
-          'No changes to apply. The new content is identical to the current content.',
+        display: "No changes to apply. The new content is identical to the current content.",
         raw: `No changes to apply. The new content is identical to the current content in file: ${this.resolvedPath}`,
         type: ToolErrorType.EDIT_NO_CHANGE,
       };
@@ -289,10 +267,10 @@ class EditToolInvocation
     const fileName = path.basename(this.resolvedPath);
     const fileDiff = Diff.createPatch(
       fileName,
-      editData.currentContent ?? '',
+      editData.currentContent ?? "",
       editData.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
     const ideClient = await IdeClient.getInstance();
@@ -302,7 +280,7 @@ class EditToolInvocation
         : undefined;
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Edit: ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`,
       fileName,
       filePath: this.resolvedPath,
@@ -316,10 +294,10 @@ class EditToolInvocation
 
         if (ideConfirmation) {
           const result = await ideConfirmation;
-          if (result.status === 'accepted' && result.content) {
+          if (result.status === "accepted" && result.content) {
             // TODO(chrstn): See https://github.com/google-gemini/gemini-cli/pull/5618#discussion_r2255413084
             // for info on a possible race condition where the file is modified on disk while being edited.
-            this.params.old_string = editData.currentContent ?? '';
+            this.params.old_string = editData.currentContent ?? "";
             this.params.new_string = result.content;
           }
         }
@@ -330,20 +308,17 @@ class EditToolInvocation
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
-    if (this.params.old_string === '') {
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
+    if (this.params.old_string === "") {
       return `Create ${shortenPath(relativePath)}`;
     }
 
     const oldStringSnippet =
-      this.params.old_string.split('\n')[0].substring(0, 30) +
-      (this.params.old_string.length > 30 ? '...' : '');
+      this.params.old_string.split("\n")[0].substring(0, 30) +
+      (this.params.old_string.length > 30 ? "..." : "");
     const newStringSnippet =
-      this.params.new_string.split('\n')[0].substring(0, 30) +
-      (this.params.new_string.length > 30 ? '...' : '');
+      this.params.new_string.split("\n")[0].substring(0, 30) +
+      (this.params.new_string.length > 30 ? "..." : "");
 
     if (this.params.old_string === this.params.new_string) {
       return `No file changes to ${shortenPath(relativePath)}`;
@@ -393,21 +368,20 @@ class EditToolInvocation
         .writeTextFile(this.resolvedPath, editData.newContent);
 
       const fileName = path.basename(this.resolvedPath);
-      const originallyProposedContent =
-        this.params.ai_proposed_content || editData.newContent;
+      const originallyProposedContent = this.params.ai_proposed_content || editData.newContent;
       const diffStat = getDiffStat(
         fileName,
-        editData.currentContent ?? '',
+        editData.currentContent ?? "",
         originallyProposedContent,
         editData.newContent,
       );
 
       const fileDiff = Diff.createPatch(
         fileName,
-        editData.currentContent ?? '', // Should not be null here if not isNewFile
+        editData.currentContent ?? "", // Should not be null here if not isNewFile
         editData.newContent,
-        'Current',
-        'Proposed',
+        "Current",
+        "Proposed",
         DEFAULT_DIFF_OPTIONS,
       );
       const displayResult = {
@@ -422,16 +396,14 @@ class EditToolInvocation
       const mimetype = getSpecificMimeType(this.resolvedPath);
       const programmingLanguage = getLanguageFromFilePath(this.resolvedPath);
       const extension = path.extname(this.resolvedPath);
-      const operation = editData.isNewFile
-        ? FileOperation.CREATE
-        : FileOperation.UPDATE;
+      const operation = editData.isNewFile ? FileOperation.CREATE : FileOperation.UPDATE;
 
       logFileOperation(
         this.config,
         new FileOperationEvent(
           EDIT_TOOL_NAME,
           operation,
-          editData.newContent.split('\n').length,
+          editData.newContent.split("\n").length,
           mimetype,
           extension,
           programmingLanguage,
@@ -450,7 +422,7 @@ class EditToolInvocation
       }
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -492,7 +464,7 @@ export class EditTool
   ) {
     super(
       EditTool.Name,
-      'Edit',
+      "Edit",
       `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
 
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
@@ -508,28 +480,28 @@ Expectation for required parameters:
       {
         properties: {
           file_path: {
-            description: 'The path to the file to modify.',
-            type: 'string',
+            description: "The path to the file to modify.",
+            type: "string",
           },
           old_string: {
             description:
-              'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
-            type: 'string',
+              "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            type: "string",
           },
           new_string: {
             description:
-              'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
-            type: 'string',
+              "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
+            type: "string",
           },
           expected_replacements: {
-            type: 'number',
+            type: "number",
             description:
-              'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
+              "Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.",
             minimum: 1,
           },
         },
-        required: ['file_path', 'old_string', 'new_string'],
-        type: 'object',
+        required: ["file_path", "old_string", "new_string"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -542,21 +514,16 @@ Expectation for required parameters:
    * @param params Parameters to validate
    * @returns Error message string or null if valid
    */
-  protected override validateToolParamValues(
-    params: EditToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: EditToolParams): string | null {
     if (!params.file_path) {
       return "The 'file_path' parameter must be non-empty.";
     }
 
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      params.file_path,
-    );
+    const resolvedPath = path.resolve(this.config.getTargetDir(), params.file_path);
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
 
     return null;
@@ -578,8 +545,7 @@ Expectation for required parameters:
   }
 
   getModifyContext(_: AbortSignal): ModifyContext<EditToolParams> {
-    const resolvePath = (filePath: string) =>
-      path.resolve(this.config.getTargetDir(), filePath);
+    const resolvePath = (filePath: string) => path.resolve(this.config.getTargetDir(), filePath);
 
     return {
       getFilePath: (params: EditToolParams) => params.file_path,
@@ -589,8 +555,8 @@ Expectation for required parameters:
             .getFileSystemService()
             .readTextFile(resolvePath(params.file_path));
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       getProposedContent: async (params: EditToolParams): Promise<string> => {
@@ -602,11 +568,11 @@ Expectation for required parameters:
             currentContent,
             params.old_string,
             params.new_string,
-            params.old_string === '' && currentContent === '',
+            params.old_string === "" && currentContent === "",
           );
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       createUpdatedParams: (
diff --git a/packages/gemini-cli-core/src/tools/glob.test.ts b/packages/gemini-cli-core/src/tools/glob.test.ts
index 4c6548008..5ab9f5621 100644
--- a/packages/gemini-cli-core/src/tools/glob.test.ts
+++ b/packages/gemini-cli-core/src/tools/glob.test.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GlobToolParams, GlobPath } from './glob.js';
-import { GlobTool, sortFileEntries } from './glob.js';
-import { partListUnionToString } from '../core/geminiRequest.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import type { Config } from '../config/config.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { ToolErrorType } from './tool-error.js';
-import * as glob from 'glob';
-
-vi.mock('glob', { spy: true });
-
-describe('GlobTool', () => {
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import * as glob from "glob";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { partListUnionToString } from "../core/geminiRequest.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import type { GlobPath, GlobToolParams } from "./glob.js";
+import { GlobTool, sortFileEntries } from "./glob.js";
+import { ToolErrorType } from "./tool-error.js";
+
+vi.mock("glob", { spy: true });
+
+describe("GlobTool", () => {
   let tempRootDir: string; // This will be the rootDirectory for the GlobTool instance
   let globTool: GlobTool;
   const abortSignal = new AbortController().signal;
@@ -41,32 +41,29 @@ describe('GlobTool', () => {
 
   beforeEach(async () => {
     // Create a unique root directory for each test run
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'glob-tool-root-'));
-    await fs.writeFile(path.join(tempRootDir, '.git'), ''); // Fake git repo
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "glob-tool-root-"));
+    await fs.writeFile(path.join(tempRootDir, ".git"), ""); // Fake git repo
     globTool = new GlobTool(mockConfig);
 
     // Create some test files and directories within this root
     // Top-level files
-    await fs.writeFile(path.join(tempRootDir, 'fileA.txt'), 'contentA');
-    await fs.writeFile(path.join(tempRootDir, 'FileB.TXT'), 'contentB'); // Different case for testing
+    await fs.writeFile(path.join(tempRootDir, "fileA.txt"), "contentA");
+    await fs.writeFile(path.join(tempRootDir, "FileB.TXT"), "contentB"); // Different case for testing
 
     // Subdirectory and files within it
-    await fs.mkdir(path.join(tempRootDir, 'sub'));
-    await fs.writeFile(path.join(tempRootDir, 'sub', 'fileC.md'), 'contentC');
-    await fs.writeFile(path.join(tempRootDir, 'sub', 'FileD.MD'), 'contentD'); // Different case
+    await fs.mkdir(path.join(tempRootDir, "sub"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "fileC.md"), "contentC");
+    await fs.writeFile(path.join(tempRootDir, "sub", "FileD.MD"), "contentD"); // Different case
 
     // Deeper subdirectory
-    await fs.mkdir(path.join(tempRootDir, 'sub', 'deep'));
-    await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'deep', 'fileE.log'),
-      'contentE',
-    );
+    await fs.mkdir(path.join(tempRootDir, "sub", "deep"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "deep", "fileE.log"), "contentE");
 
     // Files for mtime sorting test
-    await fs.writeFile(path.join(tempRootDir, 'older.sortme'), 'older_content');
+    await fs.writeFile(path.join(tempRootDir, "older.sortme"), "older_content");
     // Ensure a noticeable difference in modification time
     await new Promise((resolve) => setTimeout(resolve, 50));
-    await fs.writeFile(path.join(tempRootDir, 'newer.sortme'), 'newer_content');
+    await fs.writeFile(path.join(tempRootDir, "newer.sortme"), "newer_content");
   });
 
   afterEach(async () => {
@@ -74,132 +71,116 @@ describe('GlobTool', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  describe('execute', () => {
-    it('should find files matching a simple pattern in the root', async () => {
-      const params: GlobToolParams = { pattern: '*.txt' };
+  describe("execute", () => {
+    it("should find files matching a simple pattern in the root", async () => {
+      const params: GlobToolParams = { pattern: "*.txt" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
-      expect(result.returnDisplay).toBe('Found 2 matching file(s)');
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "FileB.TXT"));
+      expect(result.returnDisplay).toBe("Found 2 matching file(s)");
     });
 
-    it('should find files case-sensitively when case_sensitive is true', async () => {
-      const params: GlobToolParams = { pattern: '*.txt', case_sensitive: true };
+    it("should find files case-sensitively when case_sensitive is true", async () => {
+      const params: GlobToolParams = { pattern: "*.txt", case_sensitive: true };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).not.toContain(
-        path.join(tempRootDir, 'FileB.TXT'),
-      );
+      expect(result.llmContent).toContain("Found 1 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).not.toContain(path.join(tempRootDir, "FileB.TXT"));
     });
 
-    it('should find files case-insensitively by default (pattern: *.TXT)', async () => {
-      const params: GlobToolParams = { pattern: '*.TXT' };
+    it("should find files case-insensitively by default (pattern: *.TXT)", async () => {
+      const params: GlobToolParams = { pattern: "*.TXT" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "FileB.TXT"));
     });
 
-    it('should find files case-insensitively when case_sensitive is false (pattern: *.TXT)', async () => {
+    it("should find files case-insensitively when case_sensitive is false (pattern: *.TXT)", async () => {
       const params: GlobToolParams = {
-        pattern: '*.TXT',
+        pattern: "*.TXT",
         case_sensitive: false,
       };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "FileB.TXT"));
     });
 
-    it('should find files using a pattern that includes a subdirectory', async () => {
-      const params: GlobToolParams = { pattern: 'sub/*.md' };
+    it("should find files using a pattern that includes a subdirectory", async () => {
+      const params: GlobToolParams = { pattern: "sub/*.md" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'fileC.md'),
-      );
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'FileD.MD'),
-      );
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "fileC.md"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "FileD.MD"));
     });
 
-    it('should find files in a specified relative path (relative to rootDir)', async () => {
-      const params: GlobToolParams = { pattern: '*.md', dir_path: 'sub' };
+    it("should find files in a specified relative path (relative to rootDir)", async () => {
+      const params: GlobToolParams = { pattern: "*.md", dir_path: "sub" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'fileC.md'),
-      );
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'FileD.MD'),
-      );
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "fileC.md"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "FileD.MD"));
     });
 
-    it('should find files using a deep globstar pattern (e.g., **/*.log)', async () => {
-      const params: GlobToolParams = { pattern: '**/*.log' };
+    it("should find files using a deep globstar pattern (e.g., **/*.log)", async () => {
+      const params: GlobToolParams = { pattern: "**/*.log" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'deep', 'fileE.log'),
-      );
+      expect(result.llmContent).toContain("Found 1 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "deep", "fileE.log"));
     });
 
     it('should return "No files found" message when pattern matches nothing', async () => {
-      const params: GlobToolParams = { pattern: '*.nonexistent' };
+      const params: GlobToolParams = { pattern: "*.nonexistent" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'No files found matching pattern "*.nonexistent"',
-      );
-      expect(result.returnDisplay).toBe('No files found');
+      expect(result.llmContent).toContain('No files found matching pattern "*.nonexistent"');
+      expect(result.returnDisplay).toBe("No files found");
     });
 
-    it('should find files with special characters in the name', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file[1].txt'), 'content');
-      const params: GlobToolParams = { pattern: 'file[1].txt' };
+    it("should find files with special characters in the name", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file[1].txt"), "content");
+      const params: GlobToolParams = { pattern: "file[1].txt" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'file[1].txt'),
-      );
+      expect(result.llmContent).toContain("Found 1 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "file[1].txt"));
     });
 
-    it('should find files with special characters like [] and () in the path', async () => {
+    it("should find files with special characters like [] and () in the path", async () => {
       const filePath = path.join(
         tempRootDir,
-        'src/app/[test]/(dashboard)/testing/components/code.tsx',
+        "src/app/[test]/(dashboard)/testing/components/code.tsx",
       );
       await fs.mkdir(path.dirname(filePath), { recursive: true });
-      await fs.writeFile(filePath, 'content');
+      await fs.writeFile(filePath, "content");
 
       const params: GlobToolParams = {
-        pattern: 'src/app/[test]/(dashboard)/testing/components/code.tsx',
+        pattern: "src/app/[test]/(dashboard)/testing/components/code.tsx",
       };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
+      expect(result.llmContent).toContain("Found 1 file(s)");
       expect(result.llmContent).toContain(filePath);
     });
 
-    it('should correctly sort files by modification time (newest first)', async () => {
-      const params: GlobToolParams = { pattern: '*.sortme' };
+    it("should correctly sort files by modification time (newest first)", async () => {
+      const params: GlobToolParams = { pattern: "*.sortme" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
       const llmContent = partListUnionToString(result.llmContent);
 
-      expect(llmContent).toContain('Found 2 file(s)');
+      expect(llmContent).toContain("Found 2 file(s)");
       // Ensure llmContent is a string for TypeScript type checking
-      expect(typeof llmContent).toBe('string');
+      expect(typeof llmContent).toBe("string");
 
       const filesListed = llmContent
         .trim()
@@ -209,99 +190,93 @@ describe('GlobTool', () => {
         .filter(Boolean);
 
       expect(filesListed).toHaveLength(2);
-      expect(path.resolve(filesListed[0])).toBe(
-        path.resolve(tempRootDir, 'newer.sortme'),
-      );
-      expect(path.resolve(filesListed[1])).toBe(
-        path.resolve(tempRootDir, 'older.sortme'),
-      );
+      expect(path.resolve(filesListed[0])).toBe(path.resolve(tempRootDir, "newer.sortme"));
+      expect(path.resolve(filesListed[1])).toBe(path.resolve(tempRootDir, "older.sortme"));
     });
 
-    it('should return a PATH_NOT_IN_WORKSPACE error if path is outside workspace', async () => {
+    it("should return a PATH_NOT_IN_WORKSPACE error if path is outside workspace", async () => {
       // Bypassing validation to test execute method directly
-      vi.spyOn(globTool, 'validateToolParams').mockReturnValue(null);
-      const params: GlobToolParams = { pattern: '*.txt', dir_path: '/etc' };
+      vi.spyOn(globTool, "validateToolParams").mockReturnValue(null);
+      const params: GlobToolParams = { pattern: "*.txt", dir_path: "/etc" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.error?.type).toBe(ToolErrorType.PATH_NOT_IN_WORKSPACE);
-      expect(result.returnDisplay).toBe('Path is not within workspace');
+      expect(result.returnDisplay).toBe("Path is not within workspace");
     });
 
-    it('should return a GLOB_EXECUTION_ERROR on glob failure', async () => {
-      vi.mocked(glob.glob).mockRejectedValue(new Error('Glob failed'));
-      const params: GlobToolParams = { pattern: '*.txt' };
+    it("should return a GLOB_EXECUTION_ERROR on glob failure", async () => {
+      vi.mocked(glob.glob).mockRejectedValue(new Error("Glob failed"));
+      const params: GlobToolParams = { pattern: "*.txt" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.error?.type).toBe(ToolErrorType.GLOB_EXECUTION_ERROR);
-      expect(result.llmContent).toContain(
-        'Error during glob search operation: Glob failed',
-      );
+      expect(result.llmContent).toContain("Error during glob search operation: Glob failed");
       // Reset glob.
       vi.mocked(glob.glob).mockReset();
     });
   });
 
-  describe('validateToolParams', () => {
+  describe("validateToolParams", () => {
     it.each([
       {
-        name: 'should return null for valid parameters (pattern only)',
-        params: { pattern: '*.js' },
+        name: "should return null for valid parameters (pattern only)",
+        params: { pattern: "*.js" },
         expected: null,
       },
       {
-        name: 'should return null for valid parameters (pattern and dir_path)',
-        params: { pattern: '*.js', dir_path: 'sub' },
+        name: "should return null for valid parameters (pattern and dir_path)",
+        params: { pattern: "*.js", dir_path: "sub" },
         expected: null,
       },
       {
-        name: 'should return null for valid parameters (pattern, dir_path, and case_sensitive)',
-        params: { pattern: '*.js', dir_path: 'sub', case_sensitive: true },
+        name: "should return null for valid parameters (pattern, dir_path, and case_sensitive)",
+        params: { pattern: "*.js", dir_path: "sub", case_sensitive: true },
         expected: null,
       },
       {
-        name: 'should return error if pattern is missing (schema validation)',
-        params: { dir_path: '.' },
+        name: "should return error if pattern is missing (schema validation)",
+        params: { dir_path: "." },
         expected: `params must have required property 'pattern'`,
       },
       {
-        name: 'should return error if pattern is an empty string',
-        params: { pattern: '' },
+        name: "should return error if pattern is an empty string",
+        params: { pattern: "" },
         expected: "The 'pattern' parameter cannot be empty.",
       },
       {
-        name: 'should return error if pattern is only whitespace',
-        params: { pattern: '   ' },
+        name: "should return error if pattern is only whitespace",
+        params: { pattern: "   " },
         expected: "The 'pattern' parameter cannot be empty.",
       },
       {
-        name: 'should return error if dir_path is not a string (schema validation)',
-        params: { pattern: '*.ts', dir_path: 123 },
-        expected: 'params/dir_path must be string',
+        name: "should return error if dir_path is not a string (schema validation)",
+        params: { pattern: "*.ts", dir_path: 123 },
+        expected: "params/dir_path must be string",
       },
       {
-        name: 'should return error if case_sensitive is not a boolean (schema validation)',
-        params: { pattern: '*.ts', case_sensitive: 'true' },
-        expected: 'params/case_sensitive must be boolean',
+        name: "should return error if case_sensitive is not a boolean (schema validation)",
+        params: { pattern: "*.ts", case_sensitive: "true" },
+        expected: "params/case_sensitive must be boolean",
       },
       {
         name: "should return error if search path resolves outside the tool's root directory",
         params: {
-          pattern: '*.txt',
-          dir_path: '../../../../../../../../../../tmp',
+          pattern: "*.txt",
+          dir_path: "../../../../../../../../../../tmp",
         },
-        expected: 'resolves outside the allowed workspace directories',
+        expected: "resolves outside the allowed workspace directories",
       },
       {
-        name: 'should return error if specified search path does not exist',
-        params: { pattern: '*.txt', dir_path: 'nonexistent_subdir' },
-        expected: 'Search path does not exist',
+        name: "should return error if specified search path does not exist",
+        params: { pattern: "*.txt", dir_path: "nonexistent_subdir" },
+        expected: "Search path does not exist",
       },
       {
-        name: 'should return error if specified search path is a file, not a directory',
-        params: { pattern: '*.txt', dir_path: 'fileA.txt' },
-        expected: 'Search path is not a directory',
+        name: "should return error if specified search path is a file, not a directory",
+        params: { pattern: "*.txt", dir_path: "fileA.txt" },
+        expected: "Search path is not a directory",
       },
-    ])('$name', ({ params, expected }) => {
+    ])("$name", ({ params, expected }) => {
       // @ts-expect-error - We're intentionally creating invalid params for testing
       const result = globTool.validateToolParams(params);
       if (expected === null) {
@@ -312,39 +287,37 @@ describe('GlobTool', () => {
     });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should validate search paths are within workspace boundaries', () => {
-      const validPath = { pattern: '*.ts', dir_path: 'sub' };
-      const invalidPath = { pattern: '*.ts', dir_path: '../..' };
+  describe("workspace boundary validation", () => {
+    it("should validate search paths are within workspace boundaries", () => {
+      const validPath = { pattern: "*.ts", dir_path: "sub" };
+      const invalidPath = { pattern: "*.ts", dir_path: "../.." };
 
       expect(globTool.validateToolParams(validPath)).toBeNull();
       expect(globTool.validateToolParams(invalidPath)).toContain(
-        'resolves outside the allowed workspace directories',
+        "resolves outside the allowed workspace directories",
       );
     });
 
-    it('should provide clear error messages when path is outside workspace', () => {
-      const invalidPath = { pattern: '*.ts', dir_path: '/etc' };
+    it("should provide clear error messages when path is outside workspace", () => {
+      const invalidPath = { pattern: "*.ts", dir_path: "/etc" };
       const error = globTool.validateToolParams(invalidPath);
 
-      expect(error).toContain(
-        'resolves outside the allowed workspace directories',
-      );
+      expect(error).toContain("resolves outside the allowed workspace directories");
       expect(error).toContain(tempRootDir);
     });
 
-    it('should work with paths in workspace subdirectories', async () => {
-      const params: GlobToolParams = { pattern: '*.md', dir_path: 'sub' };
+    it("should work with paths in workspace subdirectories", async () => {
+      const params: GlobToolParams = { pattern: "*.md", dir_path: "sub" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain('fileC.md');
-      expect(result.llmContent).toContain('FileD.MD');
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain("fileC.md");
+      expect(result.llmContent).toContain("FileD.MD");
     });
   });
 
-  describe('ignore file handling', () => {
+  describe("ignore file handling", () => {
     interface IgnoreFileTestCase {
       name: string;
       ignoreFile: { name: string; content: string };
@@ -357,77 +330,71 @@ describe('GlobTool', () => {
 
     it.each<IgnoreFileTestCase>([
       {
-        name: 'should respect .gitignore files by default',
-        ignoreFile: { name: '.gitignore', content: '*.ignored.txt' },
-        filesToCreate: ['a.ignored.txt', 'b.notignored.txt'],
-        globToolParams: { pattern: '*.txt' },
-        expectedCountMessage: 'Found 3 file(s)',
-        notExpectedToContain: ['a.ignored.txt'],
+        name: "should respect .gitignore files by default",
+        ignoreFile: { name: ".gitignore", content: "*.ignored.txt" },
+        filesToCreate: ["a.ignored.txt", "b.notignored.txt"],
+        globToolParams: { pattern: "*.txt" },
+        expectedCountMessage: "Found 3 file(s)",
+        notExpectedToContain: ["a.ignored.txt"],
       },
       {
-        name: 'should respect .geminiignore files by default',
-        ignoreFile: { name: '.geminiignore', content: '*.geminiignored.txt' },
-        filesToCreate: ['a.geminiignored.txt', 'b.notignored.txt'],
-        globToolParams: { pattern: '*.txt' },
-        expectedCountMessage: 'Found 3 file(s)',
-        notExpectedToContain: ['a.geminiignored.txt'],
+        name: "should respect .geminiignore files by default",
+        ignoreFile: { name: ".geminiignore", content: "*.geminiignored.txt" },
+        filesToCreate: ["a.geminiignored.txt", "b.notignored.txt"],
+        globToolParams: { pattern: "*.txt" },
+        expectedCountMessage: "Found 3 file(s)",
+        notExpectedToContain: ["a.geminiignored.txt"],
       },
       {
-        name: 'should not respect .gitignore when respect_git_ignore is false',
-        ignoreFile: { name: '.gitignore', content: '*.ignored.txt' },
-        filesToCreate: ['a.ignored.txt'],
-        globToolParams: { pattern: '*.txt', respect_git_ignore: false },
-        expectedCountMessage: 'Found 3 file(s)',
-        expectedToContain: ['a.ignored.txt'],
+        name: "should not respect .gitignore when respect_git_ignore is false",
+        ignoreFile: { name: ".gitignore", content: "*.ignored.txt" },
+        filesToCreate: ["a.ignored.txt"],
+        globToolParams: { pattern: "*.txt", respect_git_ignore: false },
+        expectedCountMessage: "Found 3 file(s)",
+        expectedToContain: ["a.ignored.txt"],
       },
       {
-        name: 'should not respect .geminiignore when respect_gemini_ignore is false',
-        ignoreFile: { name: '.geminiignore', content: '*.geminiignored.txt' },
-        filesToCreate: ['a.geminiignored.txt'],
-        globToolParams: { pattern: '*.txt', respect_gemini_ignore: false },
-        expectedCountMessage: 'Found 3 file(s)',
-        expectedToContain: ['a.geminiignored.txt'],
+        name: "should not respect .geminiignore when respect_gemini_ignore is false",
+        ignoreFile: { name: ".geminiignore", content: "*.geminiignored.txt" },
+        filesToCreate: ["a.geminiignored.txt"],
+        globToolParams: { pattern: "*.txt", respect_gemini_ignore: false },
+        expectedCountMessage: "Found 3 file(s)",
+        expectedToContain: ["a.geminiignored.txt"],
       },
-    ])(
-      '$name',
-      async ({
-        ignoreFile,
-        filesToCreate,
-        globToolParams,
-        expectedCountMessage,
-        expectedToContain,
-        notExpectedToContain,
-      }) => {
-        await fs.writeFile(
-          path.join(tempRootDir, ignoreFile.name),
-          ignoreFile.content,
-        );
-        for (const file of filesToCreate) {
-          await fs.writeFile(path.join(tempRootDir, file), 'content');
-        }
+    ])("$name", async ({
+      ignoreFile,
+      filesToCreate,
+      globToolParams,
+      expectedCountMessage,
+      expectedToContain,
+      notExpectedToContain,
+    }) => {
+      await fs.writeFile(path.join(tempRootDir, ignoreFile.name), ignoreFile.content);
+      for (const file of filesToCreate) {
+        await fs.writeFile(path.join(tempRootDir, file), "content");
+      }
 
-        const invocation = globTool.build(globToolParams);
-        const result = await invocation.execute(abortSignal);
+      const invocation = globTool.build(globToolParams);
+      const result = await invocation.execute(abortSignal);
 
-        expect(result.llmContent).toContain(expectedCountMessage);
+      expect(result.llmContent).toContain(expectedCountMessage);
 
-        if (expectedToContain) {
-          for (const file of expectedToContain) {
-            expect(result.llmContent).toContain(file);
-          }
+      if (expectedToContain) {
+        for (const file of expectedToContain) {
+          expect(result.llmContent).toContain(file);
         }
-        if (notExpectedToContain) {
-          for (const file of notExpectedToContain) {
-            expect(result.llmContent).not.toContain(file);
-          }
+      }
+      if (notExpectedToContain) {
+        for (const file of notExpectedToContain) {
+          expect(result.llmContent).not.toContain(file);
         }
-      },
-    );
+      }
+    });
   });
 });
 
-describe('sortFileEntries', () => {
-  const nowTimestamp = new Date('2024-01-15T12:00:00.000Z').getTime();
+describe("sortFileEntries", () => {
+  const nowTimestamp = new Date("2024-01-15T12:00:00.000Z").getTime();
   const oneDayInMs = 24 * 60 * 60 * 1000;
 
   const createFileEntry = (fullpath: string, mtimeDate: Date): GlobPath => ({
@@ -437,100 +404,93 @@ describe('sortFileEntries', () => {
 
   const testCases = [
     {
-      name: 'should sort a mix of recent and older files correctly',
+      name: "should sort a mix of recent and older files correctly",
       entries: [
         {
-          name: 'older_zebra.txt',
+          name: "older_zebra.txt",
           mtime: new Date(nowTimestamp - (oneDayInMs + 2 * 60 * 60 * 1000)),
         },
         {
-          name: 'recent_alpha.txt',
+          name: "recent_alpha.txt",
           mtime: new Date(nowTimestamp - 1 * 60 * 60 * 1000),
         },
         {
-          name: 'older_apple.txt',
+          name: "older_apple.txt",
           mtime: new Date(nowTimestamp - (oneDayInMs + 1 * 60 * 60 * 1000)),
         },
         {
-          name: 'recent_beta.txt',
+          name: "recent_beta.txt",
           mtime: new Date(nowTimestamp - 2 * 60 * 60 * 1000),
         },
         {
-          name: 'older_banana.txt',
+          name: "older_banana.txt",
           mtime: new Date(nowTimestamp - (oneDayInMs + 1 * 60 * 60 * 1000)),
         },
       ],
       expected: [
-        'recent_alpha.txt',
-        'recent_beta.txt',
-        'older_apple.txt',
-        'older_banana.txt',
-        'older_zebra.txt',
+        "recent_alpha.txt",
+        "recent_beta.txt",
+        "older_apple.txt",
+        "older_banana.txt",
+        "older_zebra.txt",
       ],
     },
     {
-      name: 'should sort only recent files by mtime descending',
+      name: "should sort only recent files by mtime descending",
       entries: [
-        { name: 'c.txt', mtime: new Date(nowTimestamp - 2000) },
-        { name: 'a.txt', mtime: new Date(nowTimestamp - 3000) },
-        { name: 'b.txt', mtime: new Date(nowTimestamp - 1000) },
+        { name: "c.txt", mtime: new Date(nowTimestamp - 2000) },
+        { name: "a.txt", mtime: new Date(nowTimestamp - 3000) },
+        { name: "b.txt", mtime: new Date(nowTimestamp - 1000) },
       ],
-      expected: ['b.txt', 'c.txt', 'a.txt'],
+      expected: ["b.txt", "c.txt", "a.txt"],
     },
     {
-      name: 'should sort only older files alphabetically by path',
+      name: "should sort only older files alphabetically by path",
       entries: [
-        { name: 'zebra.txt', mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
-        { name: 'apple.txt', mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
-        { name: 'banana.txt', mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
+        { name: "zebra.txt", mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
+        { name: "apple.txt", mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
+        { name: "banana.txt", mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
       ],
-      expected: ['apple.txt', 'banana.txt', 'zebra.txt'],
+      expected: ["apple.txt", "banana.txt", "zebra.txt"],
     },
     {
-      name: 'should handle an empty array',
+      name: "should handle an empty array",
       entries: [],
       expected: [],
     },
     {
-      name: 'should correctly sort files when mtimes are identical for recent files',
+      name: "should correctly sort files when mtimes are identical for recent files",
       entries: [
-        { name: 'b.txt', mtime: new Date(nowTimestamp - 1000) },
-        { name: 'a.txt', mtime: new Date(nowTimestamp - 1000) },
+        { name: "b.txt", mtime: new Date(nowTimestamp - 1000) },
+        { name: "a.txt", mtime: new Date(nowTimestamp - 1000) },
       ],
-      expectedUnordered: ['a.txt', 'b.txt'],
+      expectedUnordered: ["a.txt", "b.txt"],
     },
     {
-      name: 'should use recencyThresholdMs parameter correctly',
+      name: "should use recencyThresholdMs parameter correctly",
       recencyThresholdMs: 1000,
       entries: [
-        { name: 'older_file.txt', mtime: new Date(nowTimestamp - 1001) },
-        { name: 'recent_file.txt', mtime: new Date(nowTimestamp - 999) },
+        { name: "older_file.txt", mtime: new Date(nowTimestamp - 1001) },
+        { name: "recent_file.txt", mtime: new Date(nowTimestamp - 999) },
       ],
-      expected: ['recent_file.txt', 'older_file.txt'],
+      expected: ["recent_file.txt", "older_file.txt"],
     },
   ];
 
-  it.each(testCases)(
-    '$name',
-    ({ entries, expected, expectedUnordered, recencyThresholdMs }) => {
-      const globPaths = entries.map((e) => createFileEntry(e.name, e.mtime));
-      const sorted = sortFileEntries(
-        globPaths,
-        nowTimestamp,
-        recencyThresholdMs ?? oneDayInMs,
-      );
-      const sortedPaths = sorted.map((e) => e.fullpath());
-
-      if (expected) {
-        expect(sortedPaths).toEqual(expected);
-      } else if (expectedUnordered) {
-        expect(sortedPaths).toHaveLength(expectedUnordered.length);
-        for (const path of expectedUnordered) {
-          expect(sortedPaths).toContain(path);
-        }
-      } else {
-        throw new Error('Test case must have expected or expectedUnordered');
+  it.each(testCases)("$name", ({ entries, expected, expectedUnordered, recencyThresholdMs }) => {
+    const globPaths = entries.map((e) => createFileEntry(e.name, e.mtime));
+    const sorted = sortFileEntries(globPaths, nowTimestamp, recencyThresholdMs ?? oneDayInMs);
+    const sortedPaths = sorted.map((e) => e.fullpath());
+
+    if (expected) {
+      expect(sortedPaths).toEqual(expected);
+    } else if (expectedUnordered) {
+      expect(sortedPaths).toHaveLength(expectedUnordered.length);
+      for (const path of expectedUnordered) {
+        expect(sortedPaths).toContain(path);
       }
-    },
-  );
+    } else {
+      throw new Error("Test case must have expected or expectedUnordered");
+    }
+  });
 });
diff --git a/packages/gemini-cli-core/src/tools/glob.ts b/packages/gemini-cli-core/src/tools/glob.ts
index e505d3bf2..187b74244 100644
--- a/packages/gemini-cli-core/src/tools/glob.ts
+++ b/packages/gemini-cli-core/src/tools/glob.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs';
-import path from 'node:path';
-import { glob, escape } from 'glob';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { shortenPath, makeRelative } from '../utils/paths.js';
-import { type Config } from '../config/config.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { ToolErrorType } from './tool-error.js';
-import { GLOB_TOOL_NAME } from './tool-names.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import fs from "node:fs";
+import path from "node:path";
+import { escape as escapeGlob, glob } from "glob";
+import { type Config } from "../config/config.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { GLOB_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 // Subset of 'Path' interface provided by 'glob' that we can implement for testing
 export interface GlobPath {
@@ -84,10 +84,7 @@ export interface GlobToolParams {
   respect_gemini_ignore?: boolean;
 }
 
-class GlobToolInvocation extends BaseToolInvocation<
-  GlobToolParams,
-  ToolResult
-> {
+class GlobToolInvocation extends BaseToolInvocation<GlobToolParams, ToolResult> {
   constructor(
     private config: Config,
     params: GlobToolParams,
@@ -101,10 +98,7 @@ class GlobToolInvocation extends BaseToolInvocation<
   getDescription(): string {
     let description = `'${this.params.pattern}'`;
     if (this.params.dir_path) {
-      const searchDir = path.resolve(
-        this.config.getTargetDir(),
-        this.params.dir_path || '.',
-      );
+      const searchDir = path.resolve(this.config.getTargetDir(), this.params.dir_path || ".");
       const relativePath = makeRelative(searchDir, this.config.getTargetDir());
       description += ` within ${shortenPath(relativePath)}`;
     }
@@ -119,10 +113,7 @@ class GlobToolInvocation extends BaseToolInvocation<
       // If a specific path is provided, resolve it and check if it's within workspace
       let searchDirectories: readonly string[];
       if (this.params.dir_path) {
-        const searchDirAbsolute = path.resolve(
-          this.config.getTargetDir(),
-          this.params.dir_path,
-        );
+        const searchDirAbsolute = path.resolve(this.config.getTargetDir(), this.params.dir_path);
         if (!workspaceContext.isPathWithinWorkspace(searchDirAbsolute)) {
           const rawError = `Error: Path "${this.params.dir_path}" is not within any workspace directory`;
           return {
@@ -149,7 +140,7 @@ class GlobToolInvocation extends BaseToolInvocation<
         let pattern = this.params.pattern;
         const fullPath = path.join(searchDir, pattern);
         if (fs.existsSync(fullPath)) {
-          pattern = escape(pattern);
+          pattern = escapeGlob(pattern);
         }
 
         const entries = (await glob(pattern, {
@@ -171,17 +162,16 @@ class GlobToolInvocation extends BaseToolInvocation<
         path.relative(this.config.getTargetDir(), p.fullpath()),
       );
 
-      const { filteredPaths, ignoredCount } =
-        fileDiscovery.filterFilesWithReport(relativePaths, {
-          respectGitIgnore:
-            this.params?.respect_git_ignore ??
-            this.config.getFileFilteringOptions().respectGitIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
-          respectGeminiIgnore:
-            this.params?.respect_gemini_ignore ??
-            this.config.getFileFilteringOptions().respectGeminiIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-        });
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
+        respectGitIgnore:
+          this.params?.respect_git_ignore ??
+          this.config.getFileFilteringOptions().respectGitIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        respectGeminiIgnore:
+          this.params?.respect_gemini_ignore ??
+          this.config.getFileFilteringOptions().respectGeminiIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+      });
 
       const filteredAbsolutePaths = new Set(
         filteredPaths.map((p) => path.resolve(this.config.getTargetDir(), p)),
@@ -212,16 +202,10 @@ class GlobToolInvocation extends BaseToolInvocation<
       const nowTimestamp = new Date().getTime();
 
       // Sort the filtered entries using the new helper function
-      const sortedEntries = sortFileEntries(
-        filteredEntries,
-        nowTimestamp,
-        oneDayInMs,
-      );
+      const sortedEntries = sortFileEntries(filteredEntries, nowTimestamp, oneDayInMs);
 
-      const sortedAbsolutePaths = sortedEntries.map((entry) =>
-        entry.fullpath(),
-      );
-      const fileListDescription = sortedAbsolutePaths.join('\n');
+      const sortedAbsolutePaths = sortedEntries.map((entry) => entry.fullpath());
+      const fileListDescription = sortedAbsolutePaths.join("\n");
       const fileCount = sortedAbsolutePaths.length;
 
       let resultMessage = `Found ${fileCount} file(s) matching "${this.params.pattern}"`;
@@ -266,39 +250,38 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
   ) {
     super(
       GlobTool.Name,
-      'FindFiles',
-      'Efficiently finds files matching specific glob patterns (e.g., `src/**/*.ts`, `**/*.md`), returning absolute paths sorted by modification time (newest first). Ideal for quickly locating files based on their name or path structure, especially in large codebases.',
+      "FindFiles",
+      "Efficiently finds files matching specific glob patterns (e.g., `src/**/*.ts`, `**/*.md`), returning absolute paths sorted by modification time (newest first). Ideal for quickly locating files based on their name or path structure, especially in large codebases.",
       Kind.Search,
       {
         properties: {
           pattern: {
-            description:
-              "The glob pattern to match against (e.g., '**/*.py', 'docs/*.md').",
-            type: 'string',
+            description: "The glob pattern to match against (e.g., '**/*.py', 'docs/*.md').",
+            type: "string",
           },
           dir_path: {
             description:
-              'Optional: The absolute path to the directory to search within. If omitted, searches the root directory.',
-            type: 'string',
+              "Optional: The absolute path to the directory to search within. If omitted, searches the root directory.",
+            type: "string",
           },
           case_sensitive: {
             description:
-              'Optional: Whether the search should be case-sensitive. Defaults to false.',
-            type: 'boolean',
+              "Optional: Whether the search should be case-sensitive. Defaults to false.",
+            type: "boolean",
           },
           respect_git_ignore: {
             description:
-              'Optional: Whether to respect .gitignore patterns when finding files. Only available in git repositories. Defaults to true.',
-            type: 'boolean',
+              "Optional: Whether to respect .gitignore patterns when finding files. Only available in git repositories. Defaults to true.",
+            type: "boolean",
           },
           respect_gemini_ignore: {
             description:
-              'Optional: Whether to respect .geminiignore patterns when finding files. Defaults to true.',
-            type: 'boolean',
+              "Optional: Whether to respect .geminiignore patterns when finding files. Defaults to true.",
+            type: "boolean",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
       true,
       false,
@@ -309,18 +292,13 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
   /**
    * Validates the parameters for the tool.
    */
-  protected override validateToolParamValues(
-    params: GlobToolParams,
-  ): string | null {
-    const searchDirAbsolute = path.resolve(
-      this.config.getTargetDir(),
-      params.dir_path || '.',
-    );
+  protected override validateToolParamValues(params: GlobToolParams): string | null {
+    const searchDirAbsolute = path.resolve(this.config.getTargetDir(), params.dir_path || ".");
 
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(searchDirAbsolute)) {
       const directories = workspaceContext.getDirectories();
-      return `Search path ("${searchDirAbsolute}") resolves outside the allowed workspace directories: ${directories.join(', ')}`;
+      return `Search path ("${searchDirAbsolute}") resolves outside the allowed workspace directories: ${directories.join(", ")}`;
     }
 
     const targetDir = searchDirAbsolute || this.config.getTargetDir();
@@ -335,11 +313,7 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
       return `Error accessing search path: ${e}`;
     }
 
-    if (
-      !params.pattern ||
-      typeof params.pattern !== 'string' ||
-      params.pattern.trim() === ''
-    ) {
+    if (!params.pattern || typeof params.pattern !== "string" || params.pattern.trim() === "") {
       return "The 'pattern' parameter cannot be empty.";
     }
 
@@ -352,12 +326,6 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<GlobToolParams, ToolResult> {
-    return new GlobToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new GlobToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-cli-core/src/tools/grep.test.ts b/packages/gemini-cli-core/src/tools/grep.test.ts
index ded3d0d31..218878dff 100644
--- a/packages/gemini-cli-core/src/tools/grep.test.ts
+++ b/packages/gemini-cli-core/src/tools/grep.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { GrepToolParams } from './grep.js';
-import { GrepTool } from './grep.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { ToolErrorType } from './tool-error.js';
-import * as glob from 'glob';
-
-vi.mock('glob', { spy: true });
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import * as glob from "glob";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import type { GrepToolParams } from "./grep.js";
+import { GrepTool } from "./grep.js";
+import { ToolErrorType } from "./tool-error.js";
+
+vi.mock("glob", { spy: true });
 
 // Mock the child_process module to control grep/git grep behavior
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   spawn: vi.fn(() => ({
     on: (event: string, cb: (...args: unknown[]) => void) => {
-      if (event === 'error' || event === 'close') {
+      if (event === "error" || event === "close") {
         // Simulate command not found or error for git grep and system grep
         // to force it to fall back to JS implementation.
         setTimeout(() => cb(1), 0); // cb(1) for error/close
@@ -32,7 +32,7 @@ vi.mock('child_process', () => ({
   })),
 }));
 
-describe('GrepTool', () => {
+describe("GrepTool", () => {
   let tempRootDir: string;
   let grepTool: GrepTool;
   const abortSignal = new AbortController().signal;
@@ -46,26 +46,20 @@ describe('GrepTool', () => {
   } as unknown as Config;
 
   beforeEach(async () => {
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'grep-tool-root-'));
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-root-"));
     grepTool = new GrepTool(mockConfig);
 
     // Create some test files and directories
+    await fs.writeFile(path.join(tempRootDir, "fileA.txt"), "hello world\nsecond line with world");
     await fs.writeFile(
-      path.join(tempRootDir, 'fileA.txt'),
-      'hello world\nsecond line with world',
-    );
-    await fs.writeFile(
-      path.join(tempRootDir, 'fileB.js'),
+      path.join(tempRootDir, "fileB.js"),
       'const foo = "bar";\nfunction baz() { return "hello"; }',
     );
-    await fs.mkdir(path.join(tempRootDir, 'sub'));
-    await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileC.txt'),
-      'another world in sub dir',
-    );
+    await fs.mkdir(path.join(tempRootDir, "sub"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "fileC.txt"), "another world in sub dir");
     await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileD.md'),
-      '# Markdown file\nThis is a test.',
+      path.join(tempRootDir, "sub", "fileD.md"),
+      "# Markdown file\nThis is a test.",
     );
   });
 
@@ -73,171 +67,152 @@ describe('GrepTool', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  describe('validateToolParams', () => {
-    it('should return null for valid params (pattern only)', () => {
-      const params: GrepToolParams = { pattern: 'hello' };
+  describe("validateToolParams", () => {
+    it("should return null for valid params (pattern only)", () => {
+      const params: GrepToolParams = { pattern: "hello" };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return null for valid params (pattern and path)', () => {
-      const params: GrepToolParams = { pattern: 'hello', dir_path: '.' };
+    it("should return null for valid params (pattern and path)", () => {
+      const params: GrepToolParams = { pattern: "hello", dir_path: "." };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return null for valid params (pattern, path, and include)', () => {
+    it("should return null for valid params (pattern, path, and include)", () => {
       const params: GrepToolParams = {
-        pattern: 'hello',
-        dir_path: '.',
-        include: '*.txt',
+        pattern: "hello",
+        dir_path: ".",
+        include: "*.txt",
       };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return error if pattern is missing', () => {
-      const params = { dir_path: '.' } as unknown as GrepToolParams;
+    it("should return error if pattern is missing", () => {
+      const params = { dir_path: "." } as unknown as GrepToolParams;
       expect(grepTool.validateToolParams(params)).toBe(
         `params must have required property 'pattern'`,
       );
     });
 
-    it('should return error for invalid regex pattern', () => {
-      const params: GrepToolParams = { pattern: '[[' };
-      expect(grepTool.validateToolParams(params)).toContain(
-        'Invalid regular expression pattern',
-      );
+    it("should return error for invalid regex pattern", () => {
+      const params: GrepToolParams = { pattern: "[[" };
+      expect(grepTool.validateToolParams(params)).toContain("Invalid regular expression pattern");
     });
 
-    it('should return error if path does not exist', () => {
+    it("should return error if path does not exist", () => {
       const params: GrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'nonexistent',
+        pattern: "hello",
+        dir_path: "nonexistent",
       };
       // Check for the core error message, as the full path might vary
-      expect(grepTool.validateToolParams(params)).toContain(
-        'Failed to access path stats for',
-      );
-      expect(grepTool.validateToolParams(params)).toContain('nonexistent');
+      expect(grepTool.validateToolParams(params)).toContain("Failed to access path stats for");
+      expect(grepTool.validateToolParams(params)).toContain("nonexistent");
     });
 
-    it('should return error if path is a file, not a directory', async () => {
-      const filePath = path.join(tempRootDir, 'fileA.txt');
-      const params: GrepToolParams = { pattern: 'hello', dir_path: filePath };
-      expect(grepTool.validateToolParams(params)).toContain(
-        `Path is not a directory: ${filePath}`,
-      );
+    it("should return error if path is a file, not a directory", async () => {
+      const filePath = path.join(tempRootDir, "fileA.txt");
+      const params: GrepToolParams = { pattern: "hello", dir_path: filePath };
+      expect(grepTool.validateToolParams(params)).toContain(`Path is not a directory: ${filePath}`);
     });
   });
 
-  describe('execute', () => {
-    it('should find matches for a simple pattern in all files', async () => {
-      const params: GrepToolParams = { pattern: 'world' };
+  describe("execute", () => {
+    it("should find matches for a simple pattern in all files", async () => {
+      const params: GrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 3 matches for pattern "world" in the workspace directory',
       );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain(
-        `File: ${path.join('sub', 'fileC.txt')}`,
-      );
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 3 matches');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain(`File: ${path.join("sub", "fileC.txt")}`);
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 3 matches");
     });
 
-    it('should find matches in a specific path', async () => {
-      const params: GrepToolParams = { pattern: 'world', dir_path: 'sub' };
+    it("should find matches in a specific path", async () => {
+      const params: GrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt'); // Path relative to 'sub'
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt"); // Path relative to 'sub'
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob', async () => {
-      const params: GrepToolParams = { pattern: 'hello', include: '*.js' };
+    it("should find matches with an include glob", async () => {
+      const params: GrepToolParams = { pattern: "hello", include: "*.js" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in the workspace directory (filter: "*.js"):',
       );
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob and path', async () => {
-      await fs.writeFile(
-        path.join(tempRootDir, 'sub', 'another.js'),
-        'const greeting = "hello";',
-      );
+    it("should find matches with an include glob and path", async () => {
+      await fs.writeFile(path.join(tempRootDir, "sub", "another.js"), 'const greeting = "hello";');
       const params: GrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'sub',
-        include: '*.js',
+        pattern: "hello",
+        dir_path: "sub",
+        include: "*.js",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in path "sub" (filter: "*.js")',
       );
-      expect(result.llmContent).toContain('File: another.js');
+      expect(result.llmContent).toContain("File: another.js");
       expect(result.llmContent).toContain('L1: const greeting = "hello";');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
     it('should return "No matches found" when pattern does not exist', async () => {
-      const params: GrepToolParams = { pattern: 'nonexistentpattern' };
+      const params: GrepToolParams = { pattern: "nonexistentpattern" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'No matches found for pattern "nonexistentpattern" in the workspace directory.',
       );
-      expect(result.returnDisplay).toBe('No matches found');
+      expect(result.returnDisplay).toBe("No matches found");
     });
 
-    it('should handle regex special characters correctly', async () => {
-      const params: GrepToolParams = { pattern: 'foo.*bar' }; // Matches 'const foo = "bar";'
+    it("should handle regex special characters correctly", async () => {
+      const params: GrepToolParams = { pattern: "foo.*bar" }; // Matches 'const foo = "bar";'
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "foo.*bar" in the workspace directory:',
       );
-      expect(result.llmContent).toContain('File: fileB.js');
+      expect(result.llmContent).toContain("File: fileB.js");
       expect(result.llmContent).toContain('L1: const foo = "bar";');
     });
 
-    it('should be case-insensitive by default (JS fallback)', async () => {
-      const params: GrepToolParams = { pattern: 'HELLO' };
+    it("should be case-insensitive by default (JS fallback)", async () => {
+      const params: GrepToolParams = { pattern: "HELLO" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 2 matches for pattern "HELLO" in the workspace directory:',
       );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
     });
 
-    it('should throw an error if params are invalid', async () => {
-      const params = { dir_path: '.' } as unknown as GrepToolParams; // Invalid: pattern missing
-      expect(() => grepTool.build(params)).toThrow(
-        /params must have required property 'pattern'/,
-      );
+    it("should throw an error if params are invalid", async () => {
+      const params = { dir_path: "." } as unknown as GrepToolParams; // Invalid: pattern missing
+      expect(() => grepTool.build(params)).toThrow(/params must have required property 'pattern'/);
     });
 
-    it('should return a GREP_EXECUTION_ERROR on failure', async () => {
-      vi.mocked(glob.globStream).mockRejectedValue(new Error('Glob failed'));
-      const params: GrepToolParams = { pattern: 'hello' };
+    it("should return a GREP_EXECUTION_ERROR on failure", async () => {
+      vi.mocked(glob.globStream).mockRejectedValue(new Error("Glob failed"));
+      const params: GrepToolParams = { pattern: "hello" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.error?.type).toBe(ToolErrorType.GREP_EXECUTION_ERROR);
@@ -245,79 +220,64 @@ describe('GrepTool', () => {
     });
   });
 
-  describe('multi-directory workspace', () => {
-    it('should search across all workspace directories when no path is specified', async () => {
+  describe("multi-directory workspace", () => {
+    it("should search across all workspace directories when no path is specified", async () => {
       // Create additional directory with test files
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
-      await fs.writeFile(
-        path.join(secondDir, 'other.txt'),
-        'hello from second directory\nworld in second',
-      );
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
       await fs.writeFile(
-        path.join(secondDir, 'another.js'),
-        'function world() { return "test"; }',
+        path.join(secondDir, "other.txt"),
+        "hello from second directory\nworld in second",
       );
+      await fs.writeFile(path.join(secondDir, "another.js"), 'function world() { return "test"; }');
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getFileExclusions: () => ({
           getGlobExcludes: () => [],
         }),
       } as unknown as Config;
 
       const multiDirGrepTool = new GrepTool(multiDirConfig);
-      const params: GrepToolParams = { pattern: 'world' };
+      const params: GrepToolParams = { pattern: "world" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should find matches in both directories
-      expect(result.llmContent).toContain(
-        'Found 5 matches for pattern "world"',
-      );
+      expect(result.llmContent).toContain('Found 5 matches for pattern "world"');
 
       // Matches from first directory
-      expect(result.llmContent).toContain('fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain('fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain("fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain("fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Matches from second directory (with directory name prefix)
       const secondDirName = path.basename(secondDir);
-      expect(result.llmContent).toContain(
-        `File: ${path.join(secondDirName, 'other.txt')}`,
-      );
-      expect(result.llmContent).toContain('L2: world in second');
-      expect(result.llmContent).toContain(
-        `File: ${path.join(secondDirName, 'another.js')}`,
-      );
-      expect(result.llmContent).toContain('L1: function world()');
+      expect(result.llmContent).toContain(`File: ${path.join(secondDirName, "other.txt")}`);
+      expect(result.llmContent).toContain("L2: world in second");
+      expect(result.llmContent).toContain(`File: ${path.join(secondDirName, "another.js")}`);
+      expect(result.llmContent).toContain("L1: function world()");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
     });
 
-    it('should search only specified path within workspace directories', async () => {
+    it("should search only specified path within workspace directories", async () => {
       // Create additional directory
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
-      await fs.mkdir(path.join(secondDir, 'sub'));
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
+      await fs.mkdir(path.join(secondDir, "sub"));
       await fs.writeFile(
-        path.join(secondDir, 'sub', 'test.txt'),
-        'hello from second sub directory',
+        path.join(secondDir, "sub", "test.txt"),
+        "hello from second sub directory",
       );
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getFileExclusions: () => ({
           getGlobExcludes: () => [],
         }),
@@ -326,90 +286,83 @@ describe('GrepTool', () => {
       const multiDirGrepTool = new GrepTool(multiDirConfig);
 
       // Search only in the 'sub' directory of the first workspace
-      const params: GrepToolParams = { pattern: 'world', dir_path: 'sub' };
+      const params: GrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should only find matches in the specified sub directory
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Should not contain matches from second directory
-      expect(result.llmContent).not.toContain('test.txt');
+      expect(result.llmContent).not.toContain("test.txt");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
     });
   });
 
-  describe('getDescription', () => {
-    it('should generate correct description with pattern only', () => {
-      const params: GrepToolParams = { pattern: 'testPattern' };
+  describe("getDescription", () => {
+    it("should generate correct description with pattern only", () => {
+      const params: GrepToolParams = { pattern: "testPattern" };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern'");
     });
 
-    it('should generate correct description with pattern and include', () => {
+    it("should generate correct description with pattern and include", () => {
       const params: GrepToolParams = {
-        pattern: 'testPattern',
-        include: '*.ts',
+        pattern: "testPattern",
+        include: "*.ts",
       };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' in *.ts");
     });
 
-    it('should generate correct description with pattern and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: GrepToolParams = {
-        pattern: 'testPattern',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
       // The path will be relative to the tempRootDir, so we check for containment.
       expect(invocation.getDescription()).toContain("'testPattern' within");
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
 
-    it('should indicate searching across all workspace directories when no path specified', () => {
+    it("should indicate searching across all workspace directories when no path specified", () => {
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, ['/another/dir']),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, ["/another/dir"]),
         getFileExclusions: () => ({
           getGlobExcludes: () => [],
         }),
       } as unknown as Config;
 
       const multiDirGrepTool = new GrepTool(multiDirConfig);
-      const params: GrepToolParams = { pattern: 'testPattern' };
+      const params: GrepToolParams = { pattern: "testPattern" };
       const invocation = multiDirGrepTool.build(params);
-      expect(invocation.getDescription()).toBe(
-        "'testPattern' across all workspace directories",
-      );
+      expect(invocation.getDescription()).toBe("'testPattern' across all workspace directories");
     });
 
-    it('should generate correct description with pattern, include, and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern, include, and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: GrepToolParams = {
-        pattern: 'testPattern',
-        include: '*.ts',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        include: "*.ts",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toContain(
-        "'testPattern' in *.ts within",
-      );
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain("'testPattern' in *.ts within");
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
 
-    it('should use ./ for root path in description', () => {
-      const params: GrepToolParams = { pattern: 'testPattern', dir_path: '.' };
+    it("should use ./ for root path in description", () => {
+      const params: GrepToolParams = { pattern: "testPattern", dir_path: "." };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' within ./");
     });
diff --git a/packages/gemini-cli-core/src/tools/grep.ts b/packages/gemini-cli-core/src/tools/grep.ts
index 3d492bec4..8e6348728 100644
--- a/packages/gemini-cli-core/src/tools/grep.ts
+++ b/packages/gemini-cli-core/src/tools/grep.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import { EOL } from 'node:os';
-import { spawn } from 'node:child_process';
-import { globStream } from 'glob';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import type { Config } from '../config/config.js';
-import type { FileExclusions } from '../utils/ignorePatterns.js';
-import { ToolErrorType } from './tool-error.js';
-import { GREP_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import { EOL } from "node:os";
+import path from "node:path";
+import { globStream } from "glob";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import type { FileExclusions } from "../utils/ignorePatterns.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { GREP_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 // --- Interfaces ---
 
@@ -53,10 +53,7 @@ interface GrepMatch {
   line: string;
 }
 
-class GrepToolInvocation extends BaseToolInvocation<
-  GrepToolParams,
-  ToolResult
-> {
+class GrepToolInvocation extends BaseToolInvocation<GrepToolParams, ToolResult> {
   private readonly fileExclusions: FileExclusions;
 
   constructor(
@@ -89,7 +86,7 @@ class GrepToolInvocation extends BaseToolInvocation<
     if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
       const directories = workspaceContext.getDirectories();
       throw new Error(
-        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(", ")}`,
       );
     }
 
@@ -100,12 +97,10 @@ class GrepToolInvocation extends BaseToolInvocation<
         throw new Error(`Path is not a directory: ${targetPath}`);
       }
     } catch (error: unknown) {
-      if (isNodeError(error) && error.code !== 'ENOENT') {
+      if (isNodeError(error) && error.code !== "ENOENT") {
         throw new Error(`Path does not exist: ${targetPath}`);
       }
-      throw new Error(
-        `Failed to access path stats for ${targetPath}: ${error}`,
-      );
+      throw new Error(`Failed to access path stats for ${targetPath}: ${error}`);
     }
 
     return targetPath;
@@ -115,7 +110,7 @@ class GrepToolInvocation extends BaseToolInvocation<
     try {
       const workspaceContext = this.config.getWorkspaceContext();
       const searchDirAbs = this.resolveAndValidatePath(this.params.dir_path);
-      const searchDirDisplay = this.params.dir_path || '.';
+      const searchDirDisplay = this.params.dir_path || ".";
 
       // Determine which directories to search
       let searchDirectories: readonly string[];
@@ -152,15 +147,13 @@ class GrepToolInvocation extends BaseToolInvocation<
       if (searchDirAbs === null) {
         const numDirs = workspaceContext.getDirectories().length;
         searchLocationDescription =
-          numDirs > 1
-            ? `across ${numDirs} workspace directories`
-            : `in the workspace directory`;
+          numDirs > 1 ? `across ${numDirs} workspace directories` : `in the workspace directory`;
       } else {
         searchLocationDescription = `in path "${searchDirDisplay}"`;
       }
 
       if (allMatches.length === 0) {
-        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}.`;
+        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}.`;
         return { llmContent: noMatchMsg, returnDisplay: `No matches found` };
       }
 
@@ -179,9 +172,9 @@ class GrepToolInvocation extends BaseToolInvocation<
       );
 
       const matchCount = allMatches.length;
-      const matchTerm = matchCount === 1 ? 'match' : 'matches';
+      const matchTerm = matchCount === 1 ? "match" : "matches";
 
-      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}:
+      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}:
 ---
 `;
 
@@ -191,7 +184,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           const trimmedLine = match.line.trim();
           llmContent += `L${match.lineNumber}: ${trimmedLine}\n`;
         });
-        llmContent += '---\n';
+        llmContent += "---\n";
       }
 
       return {
@@ -219,20 +212,16 @@ class GrepToolInvocation extends BaseToolInvocation<
    */
   private isCommandAvailable(command: string): Promise<boolean> {
     return new Promise((resolve) => {
-      const checkCommand = process.platform === 'win32' ? 'where' : 'command';
-      const checkArgs =
-        process.platform === 'win32' ? [command] : ['-v', command];
+      const checkCommand = process.platform === "win32" ? "where" : "command";
+      const checkArgs = process.platform === "win32" ? [command] : ["-v", command];
       try {
         const child = spawn(checkCommand, checkArgs, {
-          stdio: 'ignore',
+          stdio: "ignore",
           shell: true,
         });
-        child.on('close', (code) => resolve(code === 0));
-        child.on('error', (err) => {
-          debugLogger.debug(
-            `[GrepTool] Failed to start process for '${command}':`,
-            err.message,
-          );
+        child.on("close", (code) => resolve(code === 0));
+        child.on("error", (err) => {
+          debugLogger.debug(`[GrepTool] Failed to start process for '${command}':`, err.message);
           resolve(false);
         });
       } catch {
@@ -259,19 +248,16 @@ class GrepToolInvocation extends BaseToolInvocation<
       if (!line.trim()) continue;
 
       // Find the index of the first colon.
-      const firstColonIndex = line.indexOf(':');
+      const firstColonIndex = line.indexOf(":");
       if (firstColonIndex === -1) continue; // Malformed
 
       // Find the index of the second colon, searching *after* the first one.
-      const secondColonIndex = line.indexOf(':', firstColonIndex + 1);
+      const secondColonIndex = line.indexOf(":", firstColonIndex + 1);
       if (secondColonIndex === -1) continue; // Malformed
 
       // Extract parts based on the found colon indices
       const filePathRaw = line.substring(0, firstColonIndex);
-      const lineNumberStr = line.substring(
-        firstColonIndex + 1,
-        secondColonIndex,
-      );
+      const lineNumberStr = line.substring(firstColonIndex + 1, secondColonIndex);
       const lineContent = line.substring(secondColonIndex + 1);
 
       const lineNumber = parseInt(lineNumberStr, 10);
@@ -300,20 +286,11 @@ class GrepToolInvocation extends BaseToolInvocation<
       description += ` in ${this.params.include}`;
     }
     if (this.params.dir_path) {
-      const resolvedPath = path.resolve(
-        this.config.getTargetDir(),
-        this.params.dir_path,
-      );
-      if (
-        resolvedPath === this.config.getTargetDir() ||
-        this.params.dir_path === '.'
-      ) {
+      const resolvedPath = path.resolve(this.config.getTargetDir(), this.params.dir_path);
+      if (resolvedPath === this.config.getTargetDir() || this.params.dir_path === ".") {
         description += ` within ./`;
       } else {
-        const relativePath = makeRelative(
-          resolvedPath,
-          this.config.getTargetDir(),
-        );
+        const relativePath = makeRelative(resolvedPath, this.config.getTargetDir());
         description += ` within ${shortenPath(relativePath)}`;
       }
     } else {
@@ -339,88 +316,74 @@ class GrepToolInvocation extends BaseToolInvocation<
     signal: AbortSignal;
   }): Promise<GrepMatch[]> {
     const { pattern, path: absolutePath, include } = options;
-    let strategyUsed = 'none';
+    let strategyUsed = "none";
 
     try {
       // --- Strategy 1: git grep ---
       const isGit = isGitRepository(absolutePath);
-      const gitAvailable = isGit && (await this.isCommandAvailable('git'));
+      const gitAvailable = isGit && (await this.isCommandAvailable("git"));
 
       if (gitAvailable) {
-        strategyUsed = 'git grep';
-        const gitArgs = [
-          'grep',
-          '--untracked',
-          '-n',
-          '-E',
-          '--ignore-case',
-          pattern,
-        ];
+        strategyUsed = "git grep";
+        const gitArgs = ["grep", "--untracked", "-n", "-E", "--ignore-case", pattern];
         if (include) {
-          gitArgs.push('--', include);
+          gitArgs.push("--", include);
         }
 
         try {
           const output = await new Promise<string>((resolve, reject) => {
-            const child = spawn('git', gitArgs, {
+            const child = spawn("git", gitArgs, {
               cwd: absolutePath,
               windowsHide: true,
             });
             const stdoutChunks: Buffer[] = [];
             const stderrChunks: Buffer[] = [];
 
-            child.stdout.on('data', (chunk) => stdoutChunks.push(chunk));
-            child.stderr.on('data', (chunk) => stderrChunks.push(chunk));
-            child.on('error', (err) =>
+            child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
+            child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
+            child.on("error", (err) =>
               reject(new Error(`Failed to start git grep: ${err.message}`)),
             );
-            child.on('close', (code) => {
-              const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-              const stderrData = Buffer.concat(stderrChunks).toString('utf8');
+            child.on("close", (code) => {
+              const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+              const stderrData = Buffer.concat(stderrChunks).toString("utf8");
               if (code === 0) resolve(stdoutData);
               else if (code === 1)
-                resolve(''); // No matches
-              else
-                reject(
-                  new Error(`git grep exited with code ${code}: ${stderrData}`),
-                );
+                resolve(""); // No matches
+              else reject(new Error(`git grep exited with code ${code}: ${stderrData}`));
             });
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (gitError: unknown) {
           debugLogger.debug(
-            `GrepLogic: git grep failed: ${getErrorMessage(
-              gitError,
-            )}. Falling back...`,
+            `GrepLogic: git grep failed: ${getErrorMessage(gitError)}. Falling back...`,
           );
         }
       }
 
       // --- Strategy 2: System grep ---
-      debugLogger.debug(
-        'GrepLogic: System grep is being considered as fallback strategy.',
-      );
+      debugLogger.debug("GrepLogic: System grep is being considered as fallback strategy.");
 
-      const grepAvailable = await this.isCommandAvailable('grep');
+      const grepAvailable = await this.isCommandAvailable("grep");
       if (grepAvailable) {
-        strategyUsed = 'system grep';
-        const grepArgs = ['-r', '-n', '-H', '-E', '-I'];
+        strategyUsed = "system grep";
+        const grepArgs = ["-r", "-n", "-H", "-E", "-I"];
         // Extract directory names from exclusion patterns for grep --exclude-dir
         const globExcludes = this.fileExclusions.getGlobExcludes();
         const commonExcludes = globExcludes
           .map((pattern) => {
             let dir = pattern;
-            if (dir.startsWith('**/')) {
+            if (dir.startsWith("**/")) {
               dir = dir.substring(3);
             }
-            if (dir.endsWith('/**')) {
+            if (dir.endsWith("/**")) {
               dir = dir.slice(0, -3);
-            } else if (dir.endsWith('/')) {
+            } else if (dir.endsWith("/")) {
               dir = dir.slice(0, -1);
             }
 
             // Only consider patterns that are likely directories. This filters out file patterns.
-            if (dir && !dir.includes('/') && !dir.includes('*')) {
+            if (dir && !dir.includes("/") && !dir.includes("*")) {
               return dir;
             }
             return null;
@@ -431,11 +394,11 @@ class GrepToolInvocation extends BaseToolInvocation<
           grepArgs.push(`--include=${include}`);
         }
         grepArgs.push(pattern);
-        grepArgs.push('.');
+        grepArgs.push(".");
 
         try {
           const output = await new Promise<string>((resolve, reject) => {
-            const child = spawn('grep', grepArgs, {
+            const child = spawn("grep", grepArgs, {
               cwd: absolutePath,
               windowsHide: true,
             });
@@ -447,7 +410,7 @@ class GrepToolInvocation extends BaseToolInvocation<
               const stderrStr = chunk.toString();
               // Suppress common harmless stderr messages
               if (
-                !stderrStr.includes('Permission denied') &&
+                !stderrStr.includes("Permission denied") &&
                 !/grep:.*: Is a directory/i.test(stderrStr)
               ) {
                 stderrChunks.push(chunk);
@@ -458,56 +421,46 @@ class GrepToolInvocation extends BaseToolInvocation<
               reject(new Error(`Failed to start system grep: ${err.message}`));
             };
             const onClose = (code: number | null) => {
-              const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-              const stderrData = Buffer.concat(stderrChunks)
-                .toString('utf8')
-                .trim();
+              const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+              const stderrData = Buffer.concat(stderrChunks).toString("utf8").trim();
               cleanup();
               if (code === 0) resolve(stdoutData);
               else if (code === 1)
-                resolve(''); // No matches
+                resolve(""); // No matches
               else {
                 if (stderrData)
-                  reject(
-                    new Error(
-                      `System grep exited with code ${code}: ${stderrData}`,
-                    ),
-                  );
-                else resolve(''); // Exit code > 1 but no stderr, likely just suppressed errors
+                  reject(new Error(`System grep exited with code ${code}: ${stderrData}`));
+                else resolve(""); // Exit code > 1 but no stderr, likely just suppressed errors
               }
             };
 
             const cleanup = () => {
-              child.stdout.removeListener('data', onData);
-              child.stderr.removeListener('data', onStderr);
-              child.removeListener('error', onError);
-              child.removeListener('close', onClose);
+              child.stdout.removeListener("data", onData);
+              child.stderr.removeListener("data", onStderr);
+              child.removeListener("error", onError);
+              child.removeListener("close", onClose);
               if (child.connected) {
                 child.disconnect();
               }
             };
 
-            child.stdout.on('data', onData);
-            child.stderr.on('data', onStderr);
-            child.on('error', onError);
-            child.on('close', onClose);
+            child.stdout.on("data", onData);
+            child.stderr.on("data", onStderr);
+            child.on("error", onError);
+            child.on("close", onClose);
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (grepError: unknown) {
           debugLogger.debug(
-            `GrepLogic: System grep failed: ${getErrorMessage(
-              grepError,
-            )}. Falling back...`,
+            `GrepLogic: System grep failed: ${getErrorMessage(grepError)}. Falling back...`,
           );
         }
       }
 
       // --- Strategy 3: Pure JavaScript Fallback ---
-      debugLogger.debug(
-        'GrepLogic: Falling back to JavaScript grep implementation.',
-      );
-      strategyUsed = 'javascript fallback';
-      const globPattern = include ? include : '**/*';
+      debugLogger.debug("GrepLogic: Falling back to JavaScript grep implementation.");
+      strategyUsed = "javascript fallback";
+      const globPattern = include ? include : "**/*";
       const ignorePatterns = this.fileExclusions.getGlobExcludes();
 
       const filesStream = globStream(globPattern, {
@@ -519,20 +472,19 @@ class GrepToolInvocation extends BaseToolInvocation<
         signal: options.signal,
       });
 
-      const regex = new RegExp(pattern, 'i');
+      const regex = new RegExp(pattern, "i");
       const allMatches: GrepMatch[] = [];
 
       for await (const filePath of filesStream) {
         const fileAbsolutePath = filePath as string;
         try {
-          const content = await fsPromises.readFile(fileAbsolutePath, 'utf8');
+          const content = await fsPromises.readFile(fileAbsolutePath, "utf8");
           const lines = content.split(/\r?\n/);
           lines.forEach((line, index) => {
             if (regex.test(line)) {
               allMatches.push({
                 filePath:
-                  path.relative(absolutePath, fileAbsolutePath) ||
-                  path.basename(fileAbsolutePath),
+                  path.relative(absolutePath, fileAbsolutePath) || path.basename(fileAbsolutePath),
                 lineNumber: index + 1,
                 line,
               });
@@ -540,7 +492,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           });
         } catch (readError: unknown) {
           // Ignore errors like permission denied or file gone during read
-          if (!isNodeError(readError) || readError.code !== 'ENOENT') {
+          if (!isNodeError(readError) || readError.code !== "ENOENT") {
             debugLogger.debug(
               `GrepLogic: Could not read/process ${fileAbsolutePath}: ${getErrorMessage(
                 readError,
@@ -575,29 +527,29 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
   ) {
     super(
       GrepTool.Name,
-      'SearchText',
-      'Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.',
+      "SearchText",
+      "Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.",
       Kind.Search,
       {
         properties: {
           pattern: {
             description:
               "The regular expression (regex) pattern to search for within file contents (e.g., 'function\\s+myFunction', 'import\\s+\\{.*\\}\\s+from\\s+.*').",
-            type: 'string',
+            type: "string",
           },
           dir_path: {
             description:
-              'Optional: The absolute path to the directory to search within. If omitted, searches the current working directory.',
-            type: 'string',
+              "Optional: The absolute path to the directory to search within. If omitted, searches the current working directory.",
+            type: "string",
           },
           include: {
             description:
               "Optional: A glob pattern to filter which files are searched (e.g., '*.js', '*.{ts,tsx}', 'src/**'). If omitted, searches all files (respecting potential global ignores).",
-            type: 'string',
+            type: "string",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
       true,
       false,
@@ -624,7 +576,7 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
     if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
       const directories = workspaceContext.getDirectories();
       throw new Error(
-        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(", ")}`,
       );
     }
 
@@ -635,12 +587,10 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
         throw new Error(`Path is not a directory: ${targetPath}`);
       }
     } catch (error: unknown) {
-      if (isNodeError(error) && error.code !== 'ENOENT') {
+      if (isNodeError(error) && error.code !== "ENOENT") {
         throw new Error(`Path does not exist: ${targetPath}`);
       }
-      throw new Error(
-        `Failed to access path stats for ${targetPath}: ${error}`,
-      );
+      throw new Error(`Failed to access path stats for ${targetPath}: ${error}`);
     }
 
     return targetPath;
@@ -651,9 +601,7 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
    * @param params Parameters to validate
    * @returns An error message string if invalid, null otherwise
    */
-  protected override validateToolParamValues(
-    params: GrepToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: GrepToolParams): string | null {
     try {
       new RegExp(params.pattern);
     } catch (error) {
@@ -678,12 +626,6 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<GrepToolParams, ToolResult> {
-    return new GrepToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new GrepToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-cli-core/src/tools/ls.test.ts b/packages/gemini-cli-core/src/tools/ls.test.ts
index 63a84aea4..969eb162b 100644
--- a/packages/gemini-cli-core/src/tools/ls.test.ts
+++ b/packages/gemini-cli-core/src/tools/ls.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import os from 'node:os';
-import { LSTool } from './ls.js';
-import type { Config } from '../config/config.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { ToolErrorType } from './tool-error.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-describe('LSTool', () => {
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { LSTool } from "./ls.js";
+import { ToolErrorType } from "./tool-error.js";
+
+describe("LSTool", () => {
   let lsTool: LSTool;
   let tempRootDir: string;
   let tempSecondaryDir: string;
@@ -23,15 +23,12 @@ describe('LSTool', () => {
 
   beforeEach(async () => {
     const realTmp = await fs.realpath(os.tmpdir());
-    tempRootDir = await fs.mkdtemp(path.join(realTmp, 'ls-tool-root-'));
-    tempSecondaryDir = await fs.mkdtemp(
-      path.join(realTmp, 'ls-tool-secondary-'),
-    );
+    tempRootDir = await fs.mkdtemp(path.join(realTmp, "ls-tool-root-"));
+    tempSecondaryDir = await fs.mkdtemp(path.join(realTmp, "ls-tool-secondary-"));
 
     mockConfig = {
       getTargetDir: () => tempRootDir,
-      getWorkspaceContext: () =>
-        new WorkspaceContext(tempRootDir, [tempSecondaryDir]),
+      getWorkspaceContext: () => new WorkspaceContext(tempRootDir, [tempSecondaryDir]),
       getFileService: () => new FileDiscoveryService(tempRootDir),
       getFileFilteringOptions: () => ({
         respectGitIgnore: true,
@@ -47,9 +44,9 @@ describe('LSTool', () => {
     await fs.rm(tempSecondaryDir, { recursive: true, force: true });
   });
 
-  describe('parameter validation', () => {
-    it('should accept valid absolute paths within workspace', async () => {
-      const testPath = path.join(tempRootDir, 'src');
+  describe("parameter validation", () => {
+    it("should accept valid absolute paths within workspace", async () => {
+      const testPath = path.join(tempRootDir, "src");
       await fs.mkdir(testPath);
 
       const invocation = lsTool.build({ dir_path: testPath });
@@ -57,8 +54,8 @@ describe('LSTool', () => {
       expect(invocation).toBeDefined();
     });
 
-    it('should accept relative paths', async () => {
-      const testPath = path.join(tempRootDir, 'src');
+    it("should accept relative paths", async () => {
+      const testPath = path.join(tempRootDir, "src");
       await fs.mkdir(testPath);
 
       const relativePath = path.relative(tempRootDir, testPath);
@@ -67,14 +64,14 @@ describe('LSTool', () => {
       expect(invocation).toBeDefined();
     });
 
-    it('should reject paths outside workspace with clear error message', () => {
-      expect(() => lsTool.build({ dir_path: '/etc/passwd' })).toThrow(
+    it("should reject paths outside workspace with clear error message", () => {
+      expect(() => lsTool.build({ dir_path: "/etc/passwd" })).toThrow(
         `Path must be within one of the workspace directories: ${tempRootDir}, ${tempSecondaryDir}`,
       );
     });
 
-    it('should accept paths in secondary workspace directory', async () => {
-      const testPath = path.join(tempSecondaryDir, 'lib');
+    it("should accept paths in secondary workspace directory", async () => {
+      const testPath = path.join(tempSecondaryDir, "lib");
       await fs.mkdir(testPath);
 
       const invocation = lsTool.build({ dir_path: testPath });
@@ -83,163 +80,155 @@ describe('LSTool', () => {
     });
   });
 
-  describe('execute', () => {
-    it('should list files in a directory', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.mkdir(path.join(tempRootDir, 'subdir'));
-      await fs.writeFile(
-        path.join(tempSecondaryDir, 'secondary-file.txt'),
-        'secondary',
-      );
+  describe("execute", () => {
+    it("should list files in a directory", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.mkdir(path.join(tempRootDir, "subdir"));
+      await fs.writeFile(path.join(tempSecondaryDir, "secondary-file.txt"), "secondary");
 
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('[DIR] subdir');
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.returnDisplay).toBe('Listed 2 item(s).');
+      expect(result.llmContent).toContain("[DIR] subdir");
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.returnDisplay).toBe("Listed 2 item(s).");
     });
 
-    it('should list files from secondary workspace directory', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.mkdir(path.join(tempRootDir, 'subdir'));
-      await fs.writeFile(
-        path.join(tempSecondaryDir, 'secondary-file.txt'),
-        'secondary',
-      );
+    it("should list files from secondary workspace directory", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.mkdir(path.join(tempRootDir, "subdir"));
+      await fs.writeFile(path.join(tempSecondaryDir, "secondary-file.txt"), "secondary");
 
       const invocation = lsTool.build({ dir_path: tempSecondaryDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('secondary-file.txt');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("secondary-file.txt");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
     });
 
-    it('should handle empty directories', async () => {
-      const emptyDir = path.join(tempRootDir, 'empty');
+    it("should handle empty directories", async () => {
+      const emptyDir = path.join(tempRootDir, "empty");
       await fs.mkdir(emptyDir);
       const invocation = lsTool.build({ dir_path: emptyDir });
       const result = await invocation.execute(abortSignal);
 
       expect(result.llmContent).toBe(`Directory ${emptyDir} is empty.`);
-      expect(result.returnDisplay).toBe('Directory is empty.');
+      expect(result.returnDisplay).toBe("Directory is empty.");
     });
 
-    it('should respect ignore patterns', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'file2.log'), 'content1');
+    it("should respect ignore patterns", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "file2.log"), "content1");
 
       const invocation = lsTool.build({
         dir_path: tempRootDir,
-        ignore: ['*.log'],
+        ignore: ["*.log"],
       });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('file2.log');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("file2.log");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
     });
 
-    it('should respect gitignore patterns', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'file2.log'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, '.git'), '');
-      await fs.writeFile(path.join(tempRootDir, '.gitignore'), '*.log');
+    it("should respect gitignore patterns", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "file2.log"), "content1");
+      await fs.writeFile(path.join(tempRootDir, ".git"), "");
+      await fs.writeFile(path.join(tempRootDir, ".gitignore"), "*.log");
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('file2.log');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("file2.log");
       // .git is always ignored by default.
-      expect(result.returnDisplay).toBe('Listed 2 item(s). (2 ignored)');
+      expect(result.returnDisplay).toBe("Listed 2 item(s). (2 ignored)");
     });
 
-    it('should respect geminiignore patterns', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'file2.log'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, '.geminiignore'), '*.log');
+    it("should respect geminiignore patterns", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "file2.log"), "content1");
+      await fs.writeFile(path.join(tempRootDir, ".geminiignore"), "*.log");
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('file2.log');
-      expect(result.returnDisplay).toBe('Listed 2 item(s). (1 ignored)');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("file2.log");
+      expect(result.returnDisplay).toBe("Listed 2 item(s). (1 ignored)");
     });
 
-    it('should handle non-directory paths', async () => {
-      const testPath = path.join(tempRootDir, 'file1.txt');
-      await fs.writeFile(testPath, 'content1');
+    it("should handle non-directory paths", async () => {
+      const testPath = path.join(tempRootDir, "file1.txt");
+      await fs.writeFile(testPath, "content1");
 
       const invocation = lsTool.build({ dir_path: testPath });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Path is not a directory');
-      expect(result.returnDisplay).toBe('Error: Path is not a directory.');
+      expect(result.llmContent).toContain("Path is not a directory");
+      expect(result.returnDisplay).toBe("Error: Path is not a directory.");
       expect(result.error?.type).toBe(ToolErrorType.PATH_IS_NOT_A_DIRECTORY);
     });
 
-    it('should handle non-existent paths', async () => {
-      const testPath = path.join(tempRootDir, 'does-not-exist');
+    it("should handle non-existent paths", async () => {
+      const testPath = path.join(tempRootDir, "does-not-exist");
       const invocation = lsTool.build({ dir_path: testPath });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Error listing directory');
-      expect(result.returnDisplay).toBe('Error: Failed to list directory.');
+      expect(result.llmContent).toContain("Error listing directory");
+      expect(result.returnDisplay).toBe("Error: Failed to list directory.");
       expect(result.error?.type).toBe(ToolErrorType.LS_EXECUTION_ERROR);
     });
 
-    it('should sort directories first, then files alphabetically', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'a-file.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'b-file.txt'), 'content1');
-      await fs.mkdir(path.join(tempRootDir, 'x-dir'));
-      await fs.mkdir(path.join(tempRootDir, 'y-dir'));
+    it("should sort directories first, then files alphabetically", async () => {
+      await fs.writeFile(path.join(tempRootDir, "a-file.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "b-file.txt"), "content1");
+      await fs.mkdir(path.join(tempRootDir, "x-dir"));
+      await fs.mkdir(path.join(tempRootDir, "y-dir"));
 
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      const lines = (
-        typeof result.llmContent === 'string' ? result.llmContent : ''
-      )
-        .split('\n')
+      const lines = (typeof result.llmContent === "string" ? result.llmContent : "")
+        .split("\n")
         .filter(Boolean);
       const entries = lines.slice(1); // Skip header
 
-      expect(entries[0]).toBe('[DIR] x-dir');
-      expect(entries[1]).toBe('[DIR] y-dir');
-      expect(entries[2]).toBe('a-file.txt');
-      expect(entries[3]).toBe('b-file.txt');
+      expect(entries[0]).toBe("[DIR] x-dir");
+      expect(entries[1]).toBe("[DIR] y-dir");
+      expect(entries[2]).toBe("a-file.txt");
+      expect(entries[3]).toBe("b-file.txt");
     });
 
-    it('should handle permission errors gracefully', async () => {
-      const restrictedDir = path.join(tempRootDir, 'restricted');
+    it("should handle permission errors gracefully", async () => {
+      const restrictedDir = path.join(tempRootDir, "restricted");
       await fs.mkdir(restrictedDir);
 
       // To simulate a permission error in a cross-platform way,
       // we mock fs.readdir to throw an error.
-      const error = new Error('EACCES: permission denied');
-      vi.spyOn(fs, 'readdir').mockRejectedValueOnce(error);
+      const error = new Error("EACCES: permission denied");
+      vi.spyOn(fs, "readdir").mockRejectedValueOnce(error);
 
       const invocation = lsTool.build({ dir_path: restrictedDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Error listing directory');
-      expect(result.llmContent).toContain('permission denied');
-      expect(result.returnDisplay).toBe('Error: Failed to list directory.');
+      expect(result.llmContent).toContain("Error listing directory");
+      expect(result.llmContent).toContain("permission denied");
+      expect(result.returnDisplay).toBe("Error: Failed to list directory.");
       expect(result.error?.type).toBe(ToolErrorType.LS_EXECUTION_ERROR);
     });
 
-    it('should handle errors accessing individual files during listing', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      const problematicFile = path.join(tempRootDir, 'problematic.txt');
-      await fs.writeFile(problematicFile, 'content2');
+    it("should handle errors accessing individual files during listing", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      const problematicFile = path.join(tempRootDir, "problematic.txt");
+      await fs.writeFile(problematicFile, "content2");
 
       // To simulate an error on a single file in a cross-platform way,
       // we mock fs.stat to throw for a specific file. This avoids
       // platform-specific behavior with things like dangling symlinks.
       const originalStat = fs.stat;
-      const statSpy = vi.spyOn(fs, 'stat').mockImplementation(async (p) => {
+      const statSpy = vi.spyOn(fs, "stat").mockImplementation(async (p) => {
         if (p.toString() === problematicFile) {
-          throw new Error('Simulated stat error');
+          throw new Error("Simulated stat error");
         }
         return originalStat(p);
       });
@@ -248,28 +237,28 @@ describe('LSTool', () => {
       const result = await invocation.execute(abortSignal);
 
       // Should still list the other files
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('problematic.txt');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("problematic.txt");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
 
       statSpy.mockRestore();
     });
   });
 
-  describe('getDescription', () => {
-    it('should return shortened relative path', () => {
-      const deeplyNestedDir = path.join(tempRootDir, 'deeply', 'nested');
+  describe("getDescription", () => {
+    it("should return shortened relative path", () => {
+      const deeplyNestedDir = path.join(tempRootDir, "deeply", "nested");
       const params = {
-        dir_path: path.join(deeplyNestedDir, 'directory'),
+        dir_path: path.join(deeplyNestedDir, "directory"),
       };
       const invocation = lsTool.build(params);
       const description = invocation.getDescription();
-      expect(description).toBe(path.join('deeply', 'nested', 'directory'));
+      expect(description).toBe(path.join("deeply", "nested", "directory"));
     });
 
-    it('should handle paths in secondary workspace', () => {
+    it("should handle paths in secondary workspace", () => {
       const params = {
-        dir_path: path.join(tempSecondaryDir, 'lib'),
+        dir_path: path.join(tempSecondaryDir, "lib"),
       };
       const invocation = lsTool.build(params);
       const description = invocation.getDescription();
@@ -278,39 +267,36 @@ describe('LSTool', () => {
     });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should accept paths in primary workspace directory', async () => {
-      const testPath = path.join(tempRootDir, 'src');
+  describe("workspace boundary validation", () => {
+    it("should accept paths in primary workspace directory", async () => {
+      const testPath = path.join(tempRootDir, "src");
       await fs.mkdir(testPath);
       const params = { dir_path: testPath };
       expect(lsTool.build(params)).toBeDefined();
     });
 
-    it('should accept paths in secondary workspace directory', async () => {
-      const testPath = path.join(tempSecondaryDir, 'lib');
+    it("should accept paths in secondary workspace directory", async () => {
+      const testPath = path.join(tempSecondaryDir, "lib");
       await fs.mkdir(testPath);
       const params = { dir_path: testPath };
       expect(lsTool.build(params)).toBeDefined();
     });
 
-    it('should reject paths outside all workspace directories', () => {
-      const params = { dir_path: '/etc/passwd' };
+    it("should reject paths outside all workspace directories", () => {
+      const params = { dir_path: "/etc/passwd" };
       expect(() => lsTool.build(params)).toThrow(
-        'Path must be within one of the workspace directories',
+        "Path must be within one of the workspace directories",
       );
     });
 
-    it('should list files from secondary workspace directory', async () => {
-      await fs.writeFile(
-        path.join(tempSecondaryDir, 'secondary-file.txt'),
-        'secondary',
-      );
+    it("should list files from secondary workspace directory", async () => {
+      await fs.writeFile(path.join(tempSecondaryDir, "secondary-file.txt"), "secondary");
 
       const invocation = lsTool.build({ dir_path: tempSecondaryDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('secondary-file.txt');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("secondary-file.txt");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/tools/ls.ts b/packages/gemini-cli-core/src/tools/ls.ts
index 34a78038f..ea5885080 100644
--- a/packages/gemini-cli-core/src/tools/ls.ts
+++ b/packages/gemini-cli-core/src/tools/ls.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import type { Config } from '../config/config.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { ToolErrorType } from './tool-error.js';
-import { LS_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import fs from "node:fs/promises";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { LS_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Parameters for the LS tool
@@ -93,9 +93,9 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
     for (const pattern of patterns) {
       // Convert glob pattern to RegExp
       const regexPattern = pattern
-        .replace(/[.+^${}()|[\]\\]/g, '\\$&')
-        .replace(/\*/g, '.*')
-        .replace(/\?/g, '.');
+        .replace(/[.+^${}()|[\]\\]/g, "\\$&")
+        .replace(/\*/g, ".*")
+        .replace(/\?/g, ".");
       const regex = new RegExp(`^${regexPattern}$`);
       if (regex.test(filename)) {
         return true;
@@ -109,19 +109,12 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
    * @returns A string describing the file being read
    */
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.dir_path,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.params.dir_path, this.config.getTargetDir());
     return shortenPath(relativePath);
   }
 
   // Helper for consistent error formatting
-  private errorResult(
-    llmContent: string,
-    returnDisplay: string,
-    type: ToolErrorType,
-  ): ToolResult {
+  private errorResult(llmContent: string, returnDisplay: string, type: ToolErrorType): ToolResult {
     return {
       llmContent,
       // Keep returnDisplay simpler in core logic
@@ -138,10 +131,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
    * @returns Result of the LS operation
    */
   async execute(_signal: AbortSignal): Promise<ToolResult> {
-    const resolvedDirPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.dir_path,
-    );
+    const resolvedDirPath = path.resolve(this.config.getTargetDir(), this.params.dir_path);
     try {
       const stats = await fs.stat(resolvedDirPath);
       if (!stats) {
@@ -171,24 +161,20 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       }
 
       const relativePaths = files.map((file) =>
-        path.relative(
-          this.config.getTargetDir(),
-          path.join(resolvedDirPath, file),
-        ),
+        path.relative(this.config.getTargetDir(), path.join(resolvedDirPath, file)),
       );
 
       const fileDiscovery = this.config.getFileService();
-      const { filteredPaths, ignoredCount } =
-        fileDiscovery.filterFilesWithReport(relativePaths, {
-          respectGitIgnore:
-            this.params.file_filtering_options?.respect_git_ignore ??
-            this.config.getFileFilteringOptions().respectGitIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
-          respectGeminiIgnore:
-            this.params.file_filtering_options?.respect_gemini_ignore ??
-            this.config.getFileFilteringOptions().respectGeminiIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-        });
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
+        respectGitIgnore:
+          this.params.file_filtering_options?.respect_git_ignore ??
+          this.config.getFileFilteringOptions().respectGitIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        respectGeminiIgnore:
+          this.params.file_filtering_options?.respect_gemini_ignore ??
+          this.config.getFileFilteringOptions().respectGeminiIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+      });
 
       const entries = [];
       for (const relativePath of filteredPaths) {
@@ -223,8 +209,8 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
 
       // Create formatted content for LLM
       const directoryContent = entries
-        .map((entry) => `${entry.isDirectory ? '[DIR] ' : ''}${entry.name}`)
-        .join('\n');
+        .map((entry) => `${entry.isDirectory ? "[DIR] " : ""}${entry.name}`)
+        .join("\n");
 
       let resultMessage = `Directory listing for ${resolvedDirPath}:\n${directoryContent}`;
       if (ignoredCount > 0) {
@@ -244,7 +230,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       const errorMsg = `Error listing directory: ${error instanceof Error ? error.message : String(error)}`;
       return this.errorResult(
         errorMsg,
-        'Failed to list directory.',
+        "Failed to list directory.",
         ToolErrorType.LS_EXECUTION_ERROR,
       );
     }
@@ -263,42 +249,42 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
   ) {
     super(
       LSTool.Name,
-      'ReadFolder',
-      'Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.',
+      "ReadFolder",
+      "Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.",
       Kind.Search,
       {
         properties: {
           dir_path: {
-            description: 'The path to the directory to list',
-            type: 'string',
+            description: "The path to the directory to list",
+            type: "string",
           },
           ignore: {
-            description: 'List of glob patterns to ignore',
+            description: "List of glob patterns to ignore",
             items: {
-              type: 'string',
+              type: "string",
             },
-            type: 'array',
+            type: "array",
           },
           file_filtering_options: {
             description:
-              'Optional: Whether to respect ignore patterns from .gitignore or .geminiignore',
-            type: 'object',
+              "Optional: Whether to respect ignore patterns from .gitignore or .geminiignore",
+            type: "object",
             properties: {
               respect_git_ignore: {
                 description:
-                  'Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.',
-                type: 'boolean',
+                  "Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.",
+                type: "boolean",
               },
               respect_gemini_ignore: {
                 description:
-                  'Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.',
-                type: 'boolean',
+                  "Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.",
+                type: "boolean",
               },
             },
           },
         },
-        required: ['dir_path'],
-        type: 'object',
+        required: ["dir_path"],
+        type: "object",
       },
       true,
       false,
@@ -311,19 +297,12 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
    * @param params Parameters to validate
    * @returns An error message string if invalid, null otherwise
    */
-  protected override validateToolParamValues(
-    params: LSToolParams,
-  ): string | null {
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      params.dir_path,
-    );
+  protected override validateToolParamValues(params: LSToolParams): string | null {
+    const resolvedPath = path.resolve(this.config.getTargetDir(), params.dir_path);
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
       const directories = workspaceContext.getDirectories();
-      return `Path must be within one of the workspace directories: ${directories.join(
-        ', ',
-      )}`;
+      return `Path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
     return null;
   }
@@ -334,12 +313,6 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<LSToolParams, ToolResult> {
-    return new LSToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new LSToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-cli-core/src/tools/mcp-client-manager.test.ts b/packages/gemini-cli-core/src/tools/mcp-client-manager.test.ts
index 0ff201e8e..04109d979 100644
--- a/packages/gemini-cli-core/src/tools/mcp-client-manager.test.ts
+++ b/packages/gemini-cli-core/src/tools/mcp-client-manager.test.ts
@@ -4,29 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  afterEach,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-  type MockedObject,
-} from 'vitest';
-import { McpClientManager } from './mcp-client-manager.js';
-import { McpClient } from './mcp-client.js';
-import type { ToolRegistry } from './tool-registry.js';
-import type { Config } from '../config/config.js';
-
-vi.mock('./mcp-client.js', async () => {
-  const originalModule = await vi.importActual('./mcp-client.js');
+import { afterEach, beforeEach, describe, expect, it, type MockedObject, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { McpClient } from "./mcp-client.js";
+import { McpClientManager } from "./mcp-client-manager.js";
+import type { ToolRegistry } from "./tool-registry.js";
+
+vi.mock("./mcp-client.js", async () => {
+  const originalModule = await vi.importActual("./mcp-client.js");
   return {
     ...originalModule,
     McpClient: vi.fn(),
   };
 });
 
-describe('McpClientManager', () => {
+describe("McpClientManager", () => {
   let mockedMcpClient: MockedObject<McpClient>;
   let mockConfig: MockedObject<Config>;
   let toolRegistry: ToolRegistry;
@@ -49,7 +41,7 @@ describe('McpClientManager', () => {
       getWorkspaceContext: () => {},
       getAllowedMcpServers: vi.fn().mockReturnValue([]),
       getBlockedMcpServers: vi.fn().mockReturnValue([]),
-      getMcpServerCommand: vi.fn().mockReturnValue(''),
+      getMcpServerCommand: vi.fn().mockReturnValue(""),
       getGeminiClient: vi.fn().mockReturnValue({
         isInitialized: vi.fn(),
       }),
@@ -61,9 +53,9 @@ describe('McpClientManager', () => {
     vi.restoreAllMocks();
   });
 
-  it('should discover tools from all configured', async () => {
+  it("should discover tools from all configured", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
     const manager = new McpClientManager(toolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
@@ -71,9 +63,9 @@ describe('McpClientManager', () => {
     expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
   });
 
-  it('should not discover tools if folder is not trusted', async () => {
+  it("should not discover tools if folder is not trusted", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
     mockConfig.isTrustedFolder.mockReturnValue(false);
     const manager = new McpClientManager(toolRegistry, mockConfig);
@@ -82,79 +74,77 @@ describe('McpClientManager', () => {
     expect(mockedMcpClient.discover).not.toHaveBeenCalled();
   });
 
-  it('should not start blocked servers', async () => {
+  it("should not start blocked servers", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
-    mockConfig.getBlockedMcpServers.mockReturnValue(['test-server']);
+    mockConfig.getBlockedMcpServers.mockReturnValue(["test-server"]);
     const manager = new McpClientManager(toolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
     expect(mockedMcpClient.connect).not.toHaveBeenCalled();
     expect(mockedMcpClient.discover).not.toHaveBeenCalled();
   });
 
-  it('should only start allowed servers if allow list is not empty', async () => {
+  it("should only start allowed servers if allow list is not empty", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
-      'another-server': {},
+      "test-server": {},
+      "another-server": {},
     });
-    mockConfig.getAllowedMcpServers.mockReturnValue(['another-server']);
+    mockConfig.getAllowedMcpServers.mockReturnValue(["another-server"]);
     const manager = new McpClientManager(toolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
     expect(mockedMcpClient.connect).toHaveBeenCalledOnce();
     expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
   });
 
-  it('should start servers from extensions', async () => {
+  it("should start servers from extensions", async () => {
     const manager = new McpClientManager(toolRegistry, mockConfig);
     await manager.startExtension({
-      name: 'test-extension',
+      name: "test-extension",
       mcpServers: {
-        'test-server': {},
+        "test-server": {},
       },
       isActive: true,
-      version: '1.0.0',
-      path: '/some-path',
+      version: "1.0.0",
+      path: "/some-path",
       contextFiles: [],
-      id: '123',
+      id: "123",
     });
     expect(mockedMcpClient.connect).toHaveBeenCalledOnce();
     expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
   });
 
-  it('should not start servers from disabled extensions', async () => {
+  it("should not start servers from disabled extensions", async () => {
     const manager = new McpClientManager(toolRegistry, mockConfig);
     await manager.startExtension({
-      name: 'test-extension',
+      name: "test-extension",
       mcpServers: {
-        'test-server': {},
+        "test-server": {},
       },
       isActive: false,
-      version: '1.0.0',
-      path: '/some-path',
+      version: "1.0.0",
+      path: "/some-path",
       contextFiles: [],
-      id: '123',
+      id: "123",
     });
     expect(mockedMcpClient.connect).not.toHaveBeenCalled();
     expect(mockedMcpClient.discover).not.toHaveBeenCalled();
   });
 
-  it('should add blocked servers to the blockedMcpServers list', async () => {
+  it("should add blocked servers to the blockedMcpServers list", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
-    mockConfig.getBlockedMcpServers.mockReturnValue(['test-server']);
+    mockConfig.getBlockedMcpServers.mockReturnValue(["test-server"]);
     const manager = new McpClientManager(toolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
-    expect(manager.getBlockedMcpServers()).toEqual([
-      { name: 'test-server', extensionName: '' },
-    ]);
+    expect(manager.getBlockedMcpServers()).toEqual([{ name: "test-server", extensionName: "" }]);
   });
 
-  describe('restart', () => {
-    it('should restart all running servers', async () => {
+  describe("restart", () => {
+    it("should restart all running servers", async () => {
       mockConfig.getMcpServers.mockReturnValue({
-        'test-server': {},
+        "test-server": {},
       });
       mockedMcpClient.getServerConfig.mockReturnValue({});
       const manager = new McpClientManager(toolRegistry, mockConfig);
@@ -170,10 +160,10 @@ describe('McpClientManager', () => {
     });
   });
 
-  describe('restartServer', () => {
-    it('should restart the specified server', async () => {
+  describe("restartServer", () => {
+    it("should restart the specified server", async () => {
       mockConfig.getMcpServers.mockReturnValue({
-        'test-server': {},
+        "test-server": {},
       });
       mockedMcpClient.getServerConfig.mockReturnValue({});
       const manager = new McpClientManager(toolRegistry, mockConfig);
@@ -182,23 +172,23 @@ describe('McpClientManager', () => {
       expect(mockedMcpClient.connect).toHaveBeenCalledTimes(1);
       expect(mockedMcpClient.discover).toHaveBeenCalledTimes(1);
 
-      await manager.restartServer('test-server');
+      await manager.restartServer("test-server");
 
       expect(mockedMcpClient.disconnect).toHaveBeenCalledTimes(1);
       expect(mockedMcpClient.connect).toHaveBeenCalledTimes(2);
       expect(mockedMcpClient.discover).toHaveBeenCalledTimes(2);
     });
 
-    it('should throw an error if the server does not exist', async () => {
+    it("should throw an error if the server does not exist", async () => {
       const manager = new McpClientManager(toolRegistry, mockConfig);
-      await expect(manager.restartServer('non-existent')).rejects.toThrow(
+      await expect(manager.restartServer("non-existent")).rejects.toThrow(
         'No MCP server registered with the name "non-existent"',
       );
     });
   });
 
-  describe('getMcpInstructions', () => {
-    it('should not return instructions for servers that do not have instructions', async () => {
+  describe("getMcpInstructions", () => {
+    it("should not return instructions for servers that do not have instructions", async () => {
       vi.mocked(McpClient).mockImplementation(
         (name, config) =>
           ({
@@ -209,9 +199,7 @@ describe('McpClientManager', () => {
             getInstructions: vi
               .fn()
               .mockReturnValue(
-                name === 'server-with-instructions'
-                  ? `Instructions for ${name}`
-                  : '',
+                name === "server-with-instructions" ? `Instructions for ${name}` : "",
               ),
           }) as unknown as McpClient,
       );
@@ -219,19 +207,15 @@ describe('McpClientManager', () => {
       const manager = new McpClientManager({} as ToolRegistry, mockConfig);
 
       mockConfig.getMcpServers.mockReturnValue({
-        'server-with-instructions': {},
-        'server-without-instructions': {},
+        "server-with-instructions": {},
+        "server-without-instructions": {},
       });
       await manager.startConfiguredMcpServers();
 
       const instructions = manager.getMcpInstructions();
 
-      expect(instructions).toContain(
-        "# Instructions for MCP Server 'server-with-instructions'",
-      );
-      expect(instructions).toContain(
-        'Instructions for server-with-instructions',
-      );
+      expect(instructions).toContain("# Instructions for MCP Server 'server-with-instructions'");
+      expect(instructions).toContain("Instructions for server-with-instructions");
 
       expect(instructions).not.toContain(
         "# Instructions for MCP Server 'server-without-instructions'",
diff --git a/packages/gemini-cli-core/src/tools/mcp-client-manager.ts b/packages/gemini-cli-core/src/tools/mcp-client-manager.ts
index fbc3b3e42..5ffbbefaa 100644
--- a/packages/gemini-cli-core/src/tools/mcp-client-manager.ts
+++ b/packages/gemini-cli-core/src/tools/mcp-client-manager.ts
@@ -4,21 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  Config,
-  GeminiCLIExtension,
-  MCPServerConfig,
-} from '../config/config.js';
-import type { ToolRegistry } from './tool-registry.js';
-import {
-  McpClient,
-  MCPDiscoveryState,
-  populateMcpServerCommand,
-} from './mcp-client.js';
-import { getErrorMessage, isAuthenticationError } from '../utils/errors.js';
-import type { EventEmitter } from 'node:events';
-import { coreEvents } from '../utils/events.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { EventEmitter } from "node:events";
+import type { Config, GeminiCLIExtension, MCPServerConfig } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage, isAuthenticationError } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import { MCPDiscoveryState, McpClient, populateMcpServerCommand } from "./mcp-client.js";
+import type { ToolRegistry } from "./tool-registry.js";
 
 /**
  * Manages the lifecycle of multiple MCP clients, including local child processes.
@@ -38,11 +30,7 @@ export class McpClientManager {
     extensionName: string;
   }> = [];
 
-  constructor(
-    toolRegistry: ToolRegistry,
-    cliConfig: Config,
-    eventEmitter?: EventEmitter,
-  ) {
+  constructor(toolRegistry: ToolRegistry, cliConfig: Config, eventEmitter?: EventEmitter) {
     this.toolRegistry = toolRegistry;
     this.cliConfig = cliConfig;
     this.eventEmitter = eventEmitter;
@@ -66,9 +54,7 @@ export class McpClientManager {
   async stopExtension(extension: GeminiCLIExtension) {
     debugLogger.log(`Unloading extension: ${extension.name}`);
     await Promise.all(
-      Object.keys(extension.mcpServers ?? {}).map(
-        this.disconnectClient.bind(this),
-      ),
+      Object.keys(extension.mcpServers ?? {}).map(this.disconnectClient.bind(this)),
     );
   }
 
@@ -93,19 +79,11 @@ export class McpClientManager {
 
   private isAllowedMcpServer(name: string) {
     const allowedNames = this.cliConfig.getAllowedMcpServers();
-    if (
-      allowedNames &&
-      allowedNames.length > 0 &&
-      allowedNames.indexOf(name) === -1
-    ) {
+    if (allowedNames && allowedNames.length > 0 && allowedNames.indexOf(name) === -1) {
       return false;
     }
     const blockedNames = this.cliConfig.getBlockedMcpServers();
-    if (
-      blockedNames &&
-      blockedNames.length > 0 &&
-      blockedNames.indexOf(name) !== -1
-    ) {
+    if (blockedNames && blockedNames.length > 0 && blockedNames.indexOf(name) !== -1) {
       return false;
     }
     return true;
@@ -116,12 +94,10 @@ export class McpClientManager {
     if (existing) {
       try {
         this.clients.delete(name);
-        this.eventEmitter?.emit('mcp-client-update', this.clients);
+        this.eventEmitter?.emit("mcp-client-update", this.clients);
         await existing.disconnect();
       } catch (error) {
-        debugLogger.warn(
-          `Error stopping client '${name}': ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Error stopping client '${name}': ${getErrorMessage(error)}`);
       } finally {
         // This is required to update the content generator configuration with the
         // new tool configuration.
@@ -133,15 +109,12 @@ export class McpClientManager {
     }
   }
 
-  maybeDiscoverMcpServer(
-    name: string,
-    config: MCPServerConfig,
-  ): Promise<void> | void {
+  maybeDiscoverMcpServer(name: string, config: MCPServerConfig): Promise<void> | void {
     if (!this.isAllowedMcpServer(name)) {
       if (!this.blockedMcpServers.find((s) => s.name === name)) {
         this.blockedMcpServers?.push({
           name,
-          extensionName: config.extension?.name ?? '',
+          extensionName: config.extension?.name ?? "",
         });
       }
       return;
@@ -154,9 +127,7 @@ export class McpClientManager {
     }
     const existing = this.clients.get(name);
     if (existing && existing.getServerConfig().extension !== config.extension) {
-      const extensionText = config.extension
-        ? ` from extension "${config.extension.name}"`
-        : '';
+      const extensionText = config.extension ? ` from extension "${config.extension.name}"` : "";
       debugLogger.warn(
         `Skipping MCP config for server with name "${name}"${extensionText} as it already exists.`,
       );
@@ -183,7 +154,7 @@ export class McpClientManager {
               this.cliConfig,
               this.cliConfig.getDebugMode(),
               async () => {
-                debugLogger.log('Tools changed, updating Gemini context...');
+                debugLogger.log("Tools changed, updating Gemini context...");
                 const geminiClient = this.cliConfig.getGeminiClient();
                 if (geminiClient.isInitialized()) {
                   await geminiClient.setTools();
@@ -192,21 +163,21 @@ export class McpClientManager {
             );
           if (!existing) {
             this.clients.set(name, client);
-            this.eventEmitter?.emit('mcp-client-update', this.clients);
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
           }
           try {
             await client.connect();
             await client.discover(this.cliConfig);
-            this.eventEmitter?.emit('mcp-client-update', this.clients);
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
           } catch (error) {
-            this.eventEmitter?.emit('mcp-client-update', this.clients);
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
             // Check if this is a 401/auth error - if so, don't show as red error
             // (the info message was already shown in mcp-client.ts)
             if (!isAuthenticationError(error)) {
               // Log the error but don't let a single failed server stop the others
               const errorMessage = getErrorMessage(error);
               coreEvents.emitFeedback(
-                'error',
+                "error",
                 `Error during discovery for MCP server '${name}': ${errorMessage}`,
                 error,
               );
@@ -225,14 +196,12 @@ export class McpClientManager {
     });
 
     if (this.discoveryPromise) {
-      this.discoveryPromise = this.discoveryPromise.then(
-        () => currentDiscoveryPromise,
-      );
+      this.discoveryPromise = this.discoveryPromise.then(() => currentDiscoveryPromise);
     } else {
       this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
       this.discoveryPromise = currentDiscoveryPromise;
     }
-    this.eventEmitter?.emit('mcp-client-update', this.clients);
+    this.eventEmitter?.emit("mcp-client-update", this.clients);
     const currentPromise = this.discoveryPromise;
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     currentPromise.then((_) => {
@@ -268,11 +237,9 @@ export class McpClientManager {
       this.cliConfig.getMcpServerCommand(),
     );
 
-    this.eventEmitter?.emit('mcp-client-update', this.clients);
+    this.eventEmitter?.emit("mcp-client-update", this.clients);
     await Promise.all(
-      Object.entries(servers).map(([name, config]) =>
-        this.maybeDiscoverMcpServer(name, config),
-      ),
+      Object.entries(servers).map(([name, config]) => this.maybeDiscoverMcpServer(name, config)),
     );
   }
 
@@ -285,9 +252,7 @@ export class McpClientManager {
         try {
           await this.maybeDiscoverMcpServer(name, client.getServerConfig());
         } catch (error) {
-          debugLogger.error(
-            `Error restarting client '${name}': ${getErrorMessage(error)}`,
-          );
+          debugLogger.error(`Error restarting client '${name}': ${getErrorMessage(error)}`);
         }
       }),
     );
@@ -309,19 +274,13 @@ export class McpClientManager {
    * This is the cleanup method to be called on application exit.
    */
   async stop(): Promise<void> {
-    const disconnectionPromises = Array.from(this.clients.entries()).map(
-      async ([name, client]) => {
-        try {
-          await client.disconnect();
-        } catch (error) {
-          coreEvents.emitFeedback(
-            'error',
-            `Error stopping client '${name}':`,
-            error,
-          );
-        }
-      },
-    );
+    const disconnectionPromises = Array.from(this.clients.entries()).map(async ([name, client]) => {
+      try {
+        await client.disconnect();
+      } catch (error) {
+        coreEvents.emitFeedback("error", `Error stopping client '${name}':`, error);
+      }
+    });
 
     await Promise.all(disconnectionPromises);
     this.clients.clear();
@@ -347,11 +306,9 @@ export class McpClientManager {
     for (const [name, client] of this.clients) {
       const clientInstructions = client.getInstructions();
       if (clientInstructions) {
-        instructions.push(
-          `# Instructions for MCP Server '${name}'\n${clientInstructions}`,
-        );
+        instructions.push(`# Instructions for MCP Server '${name}'\n${clientInstructions}`);
       }
     }
-    return instructions.join('\n\n');
+    return instructions.join("\n\n");
   }
 }
diff --git a/packages/gemini-cli-core/src/tools/mcp-client.test.ts b/packages/gemini-cli-core/src/tools/mcp-client.test.ts
index 192025689..5084c69e2 100644
--- a/packages/gemini-cli-core/src/tools/mcp-client.test.ts
+++ b/packages/gemini-cli-core/src/tools/mcp-client.test.ts
@@ -4,23 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as ClientLib from '@modelcontextprotocol/sdk/client/index.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
-import * as SdkClientStdioLib from '@modelcontextprotocol/sdk/client/stdio.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as ClientLib from "@modelcontextprotocol/sdk/client/index.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import * as SdkClientStdioLib from "@modelcontextprotocol/sdk/client/stdio.js";
 import {
   StreamableHTTPClientTransport,
   StreamableHTTPError,
-} from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { AuthProviderType, type Config } from '../config/config.js';
-import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
-import { MCPOAuthProvider } from '../mcp/oauth-provider.js';
-import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
-import { OAuthUtils } from '../mcp/oauth-utils.js';
-import type { PromptRegistry } from '../prompts/prompt-registry.js';
-import { ToolListChangedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';
-
-import { WorkspaceContext } from '../utils/workspaceContext.js';
+} from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { ToolListChangedNotificationSchema } from "@modelcontextprotocol/sdk/types.js";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { AuthProviderType, type Config } from "../config/config.js";
+import { GoogleCredentialProvider } from "../mcp/google-auth-provider.js";
+import { MCPOAuthProvider } from "../mcp/oauth-provider.js";
+import { MCPOAuthTokenStorage } from "../mcp/oauth-token-storage.js";
+import { OAuthUtils } from "../mcp/oauth-utils.js";
+import type { PromptRegistry } from "../prompts/prompt-registry.js";
+import type { ResourceRegistry } from "../resources/resource-registry.js";
+import { coreEvents } from "../utils/events.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
 import {
   connectToMcpServer,
   createTransport,
@@ -28,40 +32,34 @@ import {
   isEnabled,
   McpClient,
   populateMcpServerCommand,
-} from './mcp-client.js';
-import type { ToolRegistry } from './tool-registry.js';
-import type { ResourceRegistry } from '../resources/resource-registry.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { coreEvents } from '../utils/events.js';
-
-vi.mock('@modelcontextprotocol/sdk/client/stdio.js');
-vi.mock('@modelcontextprotocol/sdk/client/index.js');
-vi.mock('@google/genai');
-vi.mock('../mcp/oauth-provider.js');
-vi.mock('../mcp/oauth-token-storage.js');
-vi.mock('../mcp/oauth-utils.js');
-vi.mock('google-auth-library');
-import { GoogleAuth } from 'google-auth-library';
-
-vi.mock('../utils/events.js', () => ({
+} from "./mcp-client.js";
+import type { ToolRegistry } from "./tool-registry.js";
+
+vi.mock("@modelcontextprotocol/sdk/client/stdio.js");
+vi.mock("@modelcontextprotocol/sdk/client/index.js");
+vi.mock("@google/genai");
+vi.mock("../mcp/oauth-provider.js");
+vi.mock("../mcp/oauth-token-storage.js");
+vi.mock("../mcp/oauth-utils.js");
+vi.mock("google-auth-library");
+
+import { GoogleAuth } from "google-auth-library";
+
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
     emitConsoleLog: vi.fn(),
   },
 }));
 
-describe('mcp-client', () => {
+describe("mcp-client", () => {
   let workspaceContext: WorkspaceContext;
   let testWorkspace: string;
 
   beforeEach(() => {
     // create a tmp dir for this test
     // Create a unique temporary directory for the workspace to avoid conflicts
-    testWorkspace = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-agent-test-'),
-    );
+    testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-agent-test-"));
     workspaceContext = new WorkspaceContext(testWorkspace);
   });
 
@@ -69,8 +67,8 @@ describe('mcp-client', () => {
     vi.restoreAllMocks();
   });
 
-  describe('McpClient', () => {
-    it('should discover tools', async () => {
+  describe("McpClient", () => {
+    it("should discover tools", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -83,9 +81,9 @@ describe('mcp-client', () => {
         listTools: vi.fn().mockResolvedValue({
           tools: [
             {
-              name: 'testFunction',
+              name: "testFunction",
               inputSchema: {
-                type: 'object',
+                type: "object",
                 properties: {},
               },
             },
@@ -96,10 +94,8 @@ describe('mcp-client', () => {
         }),
         request: vi.fn().mockResolvedValue({}),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -116,9 +112,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -129,16 +125,11 @@ describe('mcp-client', () => {
       );
       await client.connect();
       await client.discover({} as Config);
-      expect(mockedClient.listTools).toHaveBeenCalledWith(
-        {},
-        { timeout: 600000 },
-      );
+      expect(mockedClient.listTools).toHaveBeenCalledWith({}, { timeout: 600000 });
     });
 
-    it('should not skip tools even if a parameter is missing a type', async () => {
-      const consoleWarnSpy = vi
-        .spyOn(console, 'warn')
-        .mockImplementation(() => {});
+    it("should not skip tools even if a parameter is missing a type", async () => {
+      const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -152,20 +143,20 @@ describe('mcp-client', () => {
         listTools: vi.fn().mockResolvedValue({
           tools: [
             {
-              name: 'validTool',
+              name: "validTool",
               inputSchema: {
-                type: 'object',
+                type: "object",
                 properties: {
-                  param1: { type: 'string' },
+                  param1: { type: "string" },
                 },
               },
             },
             {
-              name: 'invalidTool',
+              name: "invalidTool",
               inputSchema: {
-                type: 'object',
+                type: "object",
                 properties: {
-                  param1: { description: 'a param with no type' },
+                  param1: { description: "a param with no type" },
                 },
               },
             },
@@ -176,10 +167,8 @@ describe('mcp-client', () => {
         }),
         request: vi.fn().mockResolvedValue({}),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -196,9 +185,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -214,7 +203,7 @@ describe('mcp-client', () => {
       consoleWarnSpy.mockRestore();
     });
 
-    it('should handle errors when discovering prompts', async () => {
+    it("should handle errors when discovering prompts", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -225,13 +214,11 @@ describe('mcp-client', () => {
         setNotificationHandler: vi.fn(),
         getServerCapabilities: vi.fn().mockReturnValue({ prompts: {} }),
         listTools: vi.fn().mockResolvedValue({ tools: [] }),
-        listPrompts: vi.fn().mockRejectedValue(new Error('Test error')),
+        listPrompts: vi.fn().mockRejectedValue(new Error("Test error")),
         request: vi.fn().mockResolvedValue({}),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -247,9 +234,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -260,16 +247,16 @@ describe('mcp-client', () => {
       );
       await client.connect();
       await expect(client.discover({} as Config)).rejects.toThrow(
-        'No prompts, tools, or resources found on the server.',
+        "No prompts, tools, or resources found on the server.",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
+        "error",
         `Error discovering prompts from test-server: Test error`,
         expect.any(Error),
       );
     });
 
-    it('should not discover tools if server does not support them', async () => {
+    it("should not discover tools if server does not support them", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -282,10 +269,8 @@ describe('mcp-client', () => {
         listPrompts: vi.fn().mockResolvedValue({ prompts: [] }),
         request: vi.fn().mockResolvedValue({}),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -302,9 +287,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -315,11 +300,11 @@ describe('mcp-client', () => {
       );
       await client.connect();
       await expect(client.discover({} as Config)).rejects.toThrow(
-        'No prompts, tools, or resources found on the server.',
+        "No prompts, tools, or resources found on the server.",
       );
     });
 
-    it('should discover tools if server supports them', async () => {
+    it("should discover tools if server supports them", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -332,19 +317,17 @@ describe('mcp-client', () => {
         listTools: vi.fn().mockResolvedValue({
           tools: [
             {
-              name: 'testTool',
-              description: 'A test tool',
-              inputSchema: { type: 'object', properties: {} },
+              name: "testTool",
+              description: "A test tool",
+              inputSchema: { type: "object", properties: {} },
             },
           ],
         }),
         listPrompts: vi.fn().mockResolvedValue({ prompts: [] }),
         request: vi.fn().mockResolvedValue({}),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -361,9 +344,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -377,7 +360,7 @@ describe('mcp-client', () => {
       expect(mockedToolRegistry.registerTool).toHaveBeenCalledOnce();
     });
 
-    it('should discover tools with $defs and $ref in schema', async () => {
+    it("should discover tools with $defs and $ref in schema", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -390,19 +373,19 @@ describe('mcp-client', () => {
         listTools: vi.fn().mockResolvedValue({
           tools: [
             {
-              name: 'toolWithDefs',
-              description: 'A tool using $defs',
+              name: "toolWithDefs",
+              description: "A tool using $defs",
               inputSchema: {
-                type: 'object',
+                type: "object",
                 properties: {
                   param1: {
-                    $ref: '#/$defs/MyType',
+                    $ref: "#/$defs/MyType",
                   },
                 },
                 $defs: {
                   MyType: {
-                    type: 'string',
-                    description: 'A defined type',
+                    type: "string",
+                    description: "A defined type",
                   },
                 },
               },
@@ -414,10 +397,8 @@ describe('mcp-client', () => {
         }),
         request: vi.fn().mockResolvedValue({}),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -434,9 +415,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -448,25 +429,24 @@ describe('mcp-client', () => {
       await client.connect();
       await client.discover({} as Config);
       expect(mockedToolRegistry.registerTool).toHaveBeenCalledOnce();
-      const registeredTool = vi.mocked(mockedToolRegistry.registerTool).mock
-        .calls[0][0];
+      const registeredTool = vi.mocked(mockedToolRegistry.registerTool).mock.calls[0][0];
       expect(registeredTool.schema.parametersJsonSchema).toEqual({
-        type: 'object',
+        type: "object",
         properties: {
           param1: {
-            $ref: '#/$defs/MyType',
+            $ref: "#/$defs/MyType",
           },
         },
         $defs: {
           MyType: {
-            type: 'string',
-            description: 'A defined type',
+            type: "string",
+            description: "A defined type",
           },
         },
       });
     });
 
-    it('should discover resources when a server only exposes resources', async () => {
+    it("should discover resources when a server only exposes resources", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -477,14 +457,14 @@ describe('mcp-client', () => {
         setNotificationHandler: vi.fn(),
         getServerCapabilities: vi.fn().mockReturnValue({ resources: {} }),
         request: vi.fn().mockImplementation(({ method }) => {
-          if (method === 'resources/list') {
+          if (method === "resources/list") {
             return Promise.resolve({
               resources: [
                 {
-                  uri: 'file:///tmp/resource.txt',
-                  name: 'resource',
-                  description: 'Test Resource',
-                  mimeType: 'text/plain',
+                  uri: "file:///tmp/resource.txt",
+                  name: "resource",
+                  description: "Test Resource",
+                  mimeType: "text/plain",
                 },
               ],
             });
@@ -493,7 +473,7 @@ describe('mcp-client', () => {
         }),
       } as unknown as ClientLib.Client;
       vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -510,9 +490,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -523,22 +503,17 @@ describe('mcp-client', () => {
       );
       await client.connect();
       await client.discover({} as Config);
-      expect(resourceRegistry.setResourcesForServer).toHaveBeenCalledWith(
-        'test-server',
-        [
-          expect.objectContaining({
-            uri: 'file:///tmp/resource.txt',
-            name: 'resource',
-          }),
-        ],
-      );
+      expect(resourceRegistry.setResourcesForServer).toHaveBeenCalledWith("test-server", [
+        expect.objectContaining({
+          uri: "file:///tmp/resource.txt",
+          name: "resource",
+        }),
+      ]);
     });
 
-    it('refreshes registry when resource list change notification is received', async () => {
+    it("refreshes registry when resource list change notification is received", async () => {
       let listCallCount = 0;
-      let resourceListHandler:
-        | ((notification: unknown) => Promise<void> | void)
-        | undefined;
+      let resourceListHandler: ((notification: unknown) => Promise<void> | void) | undefined;
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -549,17 +524,15 @@ describe('mcp-client', () => {
         setNotificationHandler: vi.fn((_, handler) => {
           resourceListHandler = handler;
         }),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ resources: { listChanged: true } }),
+        getServerCapabilities: vi.fn().mockReturnValue({ resources: { listChanged: true } }),
         request: vi.fn().mockImplementation(({ method }) => {
-          if (method === 'resources/list') {
+          if (method === "resources/list") {
             listCallCount += 1;
             if (listCallCount === 1) {
               return Promise.resolve({
                 resources: [
                   {
-                    uri: 'file:///tmp/one.txt',
+                    uri: "file:///tmp/one.txt",
                   },
                 ],
               });
@@ -567,7 +540,7 @@ describe('mcp-client', () => {
             return Promise.resolve({
               resources: [
                 {
-                  uri: 'file:///tmp/two.txt',
+                  uri: "file:///tmp/two.txt",
                 },
               ],
             });
@@ -576,7 +549,7 @@ describe('mcp-client', () => {
         }),
       } as unknown as ClientLib.Client;
       vi.mocked(ClientLib.Client).mockReturnValue(mockedClient);
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -593,9 +566,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         promptRegistry,
@@ -611,21 +584,20 @@ describe('mcp-client', () => {
       expect(resourceListHandler).toBeDefined();
 
       await resourceListHandler?.({
-        method: 'notifications/resources/list_changed',
+        method: "notifications/resources/list_changed",
       });
 
-      expect(resourceRegistry.setResourcesForServer).toHaveBeenLastCalledWith(
-        'test-server',
-        [expect.objectContaining({ uri: 'file:///tmp/two.txt' })],
-      );
+      expect(resourceRegistry.setResourcesForServer).toHaveBeenLastCalledWith("test-server", [
+        expect.objectContaining({ uri: "file:///tmp/two.txt" }),
+      ]);
 
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'info',
-        'Resources updated for server: test-server',
+        "info",
+        "Resources updated for server: test-server",
       );
     });
 
-    it('should remove tools and prompts on disconnect', async () => {
+    it("should remove tools and prompts on disconnect", async () => {
       const mockedClient = {
         connect: vi.fn(),
         close: vi.fn(),
@@ -633,27 +605,23 @@ describe('mcp-client', () => {
         registerCapabilities: vi.fn(),
         setRequestHandler: vi.fn(),
         setNotificationHandler: vi.fn(),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: {}, prompts: {} }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: {}, prompts: {} }),
         listPrompts: vi.fn().mockResolvedValue({
-          prompts: [{ id: 'prompt1', text: 'a prompt' }],
+          prompts: [{ id: "prompt1", text: "a prompt" }],
         }),
         request: vi.fn().mockResolvedValue({}),
         listTools: vi.fn().mockResolvedValue({
           tools: [
             {
-              name: 'testTool',
-              description: 'A test tool',
-              inputSchema: { type: 'object', properties: {} },
+              name: "testTool",
+              description: "A test tool",
+              inputSchema: { type: "object", properties: {} },
             },
           ],
         }),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedToolRegistry = {
@@ -673,9 +641,9 @@ describe('mcp-client', () => {
         removeResourcesByServer: vi.fn(),
       } as unknown as ResourceRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         mockedPromptRegistry,
@@ -699,33 +667,29 @@ describe('mcp-client', () => {
     });
   });
 
-  describe('Dynamic Tool Updates', () => {
-    it('should set up notification handler if server supports tool list changes', async () => {
+  describe("Dynamic Tool Updates", () => {
+    it("should set up notification handler if server supports tool list changes", async () => {
       const mockedClient = {
         connect: vi.fn(),
         getStatus: vi.fn(),
         registerCapabilities: vi.fn(),
         setRequestHandler: vi.fn(),
         // Capability enables the listener
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: { listChanged: true } }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: { listChanged: true } }),
         setNotificationHandler: vi.fn(),
         listTools: vi.fn().mockResolvedValue({ tools: [] }),
         listPrompts: vi.fn().mockResolvedValue({ prompts: [] }),
         request: vi.fn().mockResolvedValue({}),
       };
 
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
 
       const client = new McpClient(
-        'test-server',
-        { command: 'test-command' },
+        "test-server",
+        { command: "test-command" },
         {} as ToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -742,7 +706,7 @@ describe('mcp-client', () => {
       );
     });
 
-    it('should NOT set up notification handler if server lacks capability', async () => {
+    it("should NOT set up notification handler if server lacks capability", async () => {
       const mockedClient = {
         connect: vi.fn(),
         getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }), // No listChanged
@@ -752,16 +716,14 @@ describe('mcp-client', () => {
         setRequestHandler: vi.fn().mockResolvedValue({}),
       };
 
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
 
       const client = new McpClient(
-        'test-server',
-        { command: 'test-command' },
+        "test-server",
+        { command: "test-command" },
         {} as ToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -775,19 +737,17 @@ describe('mcp-client', () => {
       expect(mockedClient.setNotificationHandler).not.toHaveBeenCalled();
     });
 
-    it('should refresh tools and notify manager when notification is received', async () => {
+    it("should refresh tools and notify manager when notification is received", async () => {
       // Setup mocks
       const mockedClient = {
         connect: vi.fn(),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: { listChanged: true } }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: { listChanged: true } }),
         setNotificationHandler: vi.fn(),
         listTools: vi.fn().mockResolvedValue({
           tools: [
             {
-              name: 'newTool',
-              inputSchema: { type: 'object', properties: {} },
+              name: "newTool",
+              inputSchema: { type: "object", properties: {} },
             },
           ],
         }),
@@ -797,10 +757,8 @@ describe('mcp-client', () => {
         setRequestHandler: vi.fn().mockResolvedValue({}),
       };
 
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
 
@@ -815,8 +773,8 @@ describe('mcp-client', () => {
 
       // Initialize client with onToolsUpdated callback
       const client = new McpClient(
-        'test-server',
-        { command: 'test-command' },
+        "test-server",
+        { command: "test-command" },
         mockedToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -830,17 +788,14 @@ describe('mcp-client', () => {
       await client.connect();
 
       // 2. Extract the callback passed to setNotificationHandler
-      const notificationCallback =
-        mockedClient.setNotificationHandler.mock.calls[0][1];
+      const notificationCallback = mockedClient.setNotificationHandler.mock.calls[0][1];
 
       // 3. Trigger the notification manually
       await notificationCallback();
 
       // 4. Assertions
       // It should clear old tools
-      expect(mockedToolRegistry.removeMcpToolsByServer).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(mockedToolRegistry.removeMcpToolsByServer).toHaveBeenCalledWith("test-server");
 
       // It should fetch new tools (listTools called inside discoverTools)
       expect(mockedClient.listTools).toHaveBeenCalled();
@@ -853,29 +808,25 @@ describe('mcp-client', () => {
 
       // It should emit feedback event
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'info',
-        'Tools updated for server: test-server',
+        "info",
+        "Tools updated for server: test-server",
       );
     });
 
-    it('should handle errors during tool refresh gracefully', async () => {
+    it("should handle errors during tool refresh gracefully", async () => {
       const mockedClient = {
         connect: vi.fn(),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: { listChanged: true } }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: { listChanged: true } }),
         setNotificationHandler: vi.fn(),
         // Simulate error during discovery
-        listTools: vi.fn().mockRejectedValue(new Error('Network blip')),
+        listTools: vi.fn().mockRejectedValue(new Error("Network blip")),
         request: vi.fn().mockResolvedValue({}),
         registerCapabilities: vi.fn().mockResolvedValue({}),
         setRequestHandler: vi.fn().mockResolvedValue({}),
       };
 
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
 
@@ -885,8 +836,8 @@ describe('mcp-client', () => {
       } as unknown as ToolRegistry;
 
       const client = new McpClient(
-        'test-server',
-        { command: 'test-command' },
+        "test-server",
+        { command: "test-command" },
         mockedToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -897,8 +848,7 @@ describe('mcp-client', () => {
 
       await client.connect();
 
-      const notificationCallback =
-        mockedClient.setNotificationHandler.mock.calls[0][1];
+      const notificationCallback = mockedClient.setNotificationHandler.mock.calls[0][1];
 
       // Trigger notification - should fail internally but catch the error
       await notificationCallback();
@@ -908,23 +858,21 @@ describe('mcp-client', () => {
 
       // Should NOT emit success feedback
       expect(coreEvents.emitFeedback).not.toHaveBeenCalledWith(
-        'info',
-        expect.stringContaining('Tools updated'),
+        "info",
+        expect.stringContaining("Tools updated"),
       );
     });
 
-    it('should handle concurrent updates from multiple servers', async () => {
+    it("should handle concurrent updates from multiple servers", async () => {
       const createMockSdkClient = (toolName: string) => ({
         connect: vi.fn(),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: { listChanged: true } }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: { listChanged: true } }),
         setNotificationHandler: vi.fn(),
         listTools: vi.fn().mockResolvedValue({
           tools: [
             {
               name: toolName,
-              inputSchema: { type: 'object', properties: {} },
+              inputSchema: { type: "object", properties: {} },
             },
           ],
         }),
@@ -934,14 +882,14 @@ describe('mcp-client', () => {
         setRequestHandler: vi.fn().mockResolvedValue({}),
       });
 
-      const mockClientA = createMockSdkClient('tool-from-A');
-      const mockClientB = createMockSdkClient('tool-from-B');
+      const mockClientA = createMockSdkClient("tool-from-A");
+      const mockClientB = createMockSdkClient("tool-from-B");
 
       vi.mocked(ClientLib.Client)
         .mockReturnValueOnce(mockClientA as unknown as ClientLib.Client)
         .mockReturnValueOnce(mockClientB as unknown as ClientLib.Client);
 
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
 
@@ -955,8 +903,8 @@ describe('mcp-client', () => {
       const onToolsUpdatedSpy = vi.fn().mockResolvedValue(undefined);
 
       const clientA = new McpClient(
-        'server-A',
-        { command: 'cmd-a' },
+        "server-A",
+        { command: "cmd-a" },
         mockedToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -967,8 +915,8 @@ describe('mcp-client', () => {
       );
 
       const clientB = new McpClient(
-        'server-B',
-        { command: 'cmd-b' },
+        "server-B",
+        { command: "cmd-b" },
         mockedToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -987,12 +935,8 @@ describe('mcp-client', () => {
       // Trigger burst updates simultaneously
       await Promise.all([handlerA(), handlerB()]);
 
-      expect(mockedToolRegistry.removeMcpToolsByServer).toHaveBeenCalledWith(
-        'server-A',
-      );
-      expect(mockedToolRegistry.removeMcpToolsByServer).toHaveBeenCalledWith(
-        'server-B',
-      );
+      expect(mockedToolRegistry.removeMcpToolsByServer).toHaveBeenCalledWith("server-A");
+      expect(mockedToolRegistry.removeMcpToolsByServer).toHaveBeenCalledWith("server-B");
 
       // Verify fetching happened on both clients
       expect(mockClientA.listTools).toHaveBeenCalled();
@@ -1005,24 +949,22 @@ describe('mcp-client', () => {
       expect(onToolsUpdatedSpy).toHaveBeenCalledTimes(2);
     });
 
-    it('should abort discovery and log error if timeout is exceeded during refresh', async () => {
+    it("should abort discovery and log error if timeout is exceeded during refresh", async () => {
       vi.useFakeTimers();
 
       const mockedClient = {
         connect: vi.fn(),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: { listChanged: true } }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: { listChanged: true } }),
         setNotificationHandler: vi.fn(),
         // Mock listTools to simulate a long running process that respects the abort signal
         listTools: vi.fn().mockImplementation(
           async (params, options) =>
             new Promise((resolve, reject) => {
               if (options?.signal?.aborted) {
-                return reject(new Error('Operation aborted'));
+                return reject(new Error("Operation aborted"));
               }
-              options?.signal?.addEventListener('abort', () => {
-                reject(new Error('Operation aborted'));
+              options?.signal?.addEventListener("abort", () => {
+                reject(new Error("Operation aborted"));
               });
               // Intentionally do not resolve immediately to simulate lag
             }),
@@ -1033,10 +975,8 @@ describe('mcp-client', () => {
         setRequestHandler: vi.fn().mockResolvedValue({}),
       };
 
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
 
@@ -1048,9 +988,9 @@ describe('mcp-client', () => {
       } as unknown as ToolRegistry;
 
       const client = new McpClient(
-        'test-server',
+        "test-server",
         // Set a short timeout
-        { command: 'test-command', timeout: 100 },
+        { command: "test-command", timeout: 100 },
         mockedToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -1061,8 +1001,7 @@ describe('mcp-client', () => {
 
       await client.connect();
 
-      const notificationCallback =
-        mockedClient.setNotificationHandler.mock.calls[0][1];
+      const notificationCallback = mockedClient.setNotificationHandler.mock.calls[0][1];
 
       const refreshPromise = notificationCallback();
 
@@ -1082,12 +1021,10 @@ describe('mcp-client', () => {
       vi.useRealTimers();
     });
 
-    it('should pass abort signal to onToolsUpdated callback', async () => {
+    it("should pass abort signal to onToolsUpdated callback", async () => {
       const mockedClient = {
         connect: vi.fn(),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: { listChanged: true } }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: { listChanged: true } }),
         setNotificationHandler: vi.fn(),
         listTools: vi.fn().mockResolvedValue({ tools: [] }),
         listPrompts: vi.fn().mockResolvedValue({ prompts: [] }),
@@ -1096,10 +1033,8 @@ describe('mcp-client', () => {
         setRequestHandler: vi.fn().mockResolvedValue({}),
       };
 
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
 
@@ -1113,8 +1048,8 @@ describe('mcp-client', () => {
       const onToolsUpdatedSpy = vi.fn().mockResolvedValue(undefined);
 
       const client = new McpClient(
-        'test-server',
-        { command: 'test-command' },
+        "test-server",
+        { command: "test-command" },
         mockedToolRegistry,
         {} as PromptRegistry,
         {} as ResourceRegistry,
@@ -1126,8 +1061,7 @@ describe('mcp-client', () => {
 
       await client.connect();
 
-      const notificationCallback =
-        mockedClient.setNotificationHandler.mock.calls[0][1];
+      const notificationCallback = mockedClient.setNotificationHandler.mock.calls[0][1];
 
       await notificationCallback();
 
@@ -1139,197 +1073,197 @@ describe('mcp-client', () => {
     });
   });
 
-  describe('appendMcpServerCommand', () => {
-    it('should do nothing if no MCP servers or command are configured', () => {
+  describe("appendMcpServerCommand", () => {
+    it("should do nothing if no MCP servers or command are configured", () => {
       const out = populateMcpServerCommand({}, undefined);
       expect(out).toEqual({});
     });
 
-    it('should discover tools via mcpServerCommand', () => {
-      const commandString = 'command --arg1 value1';
+    it("should discover tools via mcpServerCommand", () => {
+      const commandString = "command --arg1 value1";
       const out = populateMcpServerCommand({}, commandString);
       expect(out).toEqual({
         mcp: {
-          command: 'command',
-          args: ['--arg1', 'value1'],
+          command: "command",
+          args: ["--arg1", "value1"],
         },
       });
     });
 
-    it('should handle error if mcpServerCommand parsing fails', () => {
-      expect(() => populateMcpServerCommand({}, 'derp && herp')).toThrowError();
+    it("should handle error if mcpServerCommand parsing fails", () => {
+      expect(() => populateMcpServerCommand({}, "derp && herp")).toThrowError();
     });
   });
 
-  describe('createTransport', () => {
-    describe('should connect via httpUrl', () => {
-      it('without headers', async () => {
+  describe("createTransport", () => {
+    describe("should connect via httpUrl", () => {
+      it("without headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test-server',
+            httpUrl: "http://test-server",
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: { headers: {} },
         });
       });
 
-      it('with headers', async () => {
+      it("with headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test-server',
-            headers: { Authorization: 'derp' },
+            httpUrl: "http://test-server",
+            headers: { Authorization: "derp" },
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: {
-            headers: { Authorization: 'derp' },
+            headers: { Authorization: "derp" },
           },
         });
       });
     });
 
-    describe('should connect via url', () => {
-      it('without headers', async () => {
+    describe("should connect via url", () => {
+      it("without headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
+            url: "http://test-server",
           },
           false,
         );
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: { headers: {} },
         });
       });
 
-      it('with headers', async () => {
+      it("with headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
-            headers: { Authorization: 'derp' },
+            url: "http://test-server",
+            headers: { Authorization: "derp" },
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: {
-            headers: { Authorization: 'derp' },
+            headers: { Authorization: "derp" },
           },
         });
       });
 
       it('with type="http" creates StreamableHTTPClientTransport', async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
-            type: 'http',
+            url: "http://test-server",
+            type: "http",
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: { headers: {} },
         });
       });
 
       it('with type="sse" creates SSEClientTransport', async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
-            type: 'sse',
+            url: "http://test-server",
+            type: "sse",
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(SSEClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: { headers: {} },
         });
       });
 
-      it('without type defaults to StreamableHTTPClientTransport', async () => {
+      it("without type defaults to StreamableHTTPClientTransport", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
+            url: "http://test-server",
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: { headers: {} },
         });
       });
 
       it('with type="http" and headers applies headers correctly', async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
-            type: 'http',
-            headers: { Authorization: 'Bearer token' },
+            url: "http://test-server",
+            type: "http",
+            headers: { Authorization: "Bearer token" },
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: {
-            headers: { Authorization: 'Bearer token' },
+            headers: { Authorization: "Bearer token" },
           },
         });
       });
 
       it('with type="sse" and headers applies headers correctly', async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
-            type: 'sse',
-            headers: { 'X-API-Key': 'key123' },
+            url: "http://test-server",
+            type: "sse",
+            headers: { "X-API-Key": "key123" },
           },
           false,
         );
 
         expect(transport).toBeInstanceOf(SSEClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server'),
+          _url: new URL("http://test-server"),
           _requestInit: {
-            headers: { 'X-API-Key': 'key123' },
+            headers: { "X-API-Key": "key123" },
           },
         });
       });
 
-      it('httpUrl takes priority over url when both are present', async () => {
+      it("httpUrl takes priority over url when both are present", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test-server-http',
-            url: 'http://test-server-url',
+            httpUrl: "http://test-server-http",
+            url: "http://test-server-url",
           },
           false,
         );
@@ -1337,59 +1271,59 @@ describe('mcp-client', () => {
         // httpUrl should take priority and create HTTP transport
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         expect(transport).toMatchObject({
-          _url: new URL('http://test-server-http'),
+          _url: new URL("http://test-server-http"),
           _requestInit: { headers: {} },
         });
       });
     });
 
-    it('should connect via command', async () => {
+    it("should connect via command", async () => {
       const mockedTransport = vi
-        .spyOn(SdkClientStdioLib, 'StdioClientTransport')
+        .spyOn(SdkClientStdioLib, "StdioClientTransport")
         .mockReturnValue({} as SdkClientStdioLib.StdioClientTransport);
 
       await createTransport(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
-          args: ['--foo', 'bar'],
-          env: { FOO: 'bar' },
-          cwd: 'test/cwd',
+          command: "test-command",
+          args: ["--foo", "bar"],
+          env: { FOO: "bar" },
+          cwd: "test/cwd",
         },
         false,
       );
 
       expect(mockedTransport).toHaveBeenCalledWith({
-        command: 'test-command',
-        args: ['--foo', 'bar'],
-        cwd: 'test/cwd',
-        env: { ...process.env, FOO: 'bar' },
-        stderr: 'pipe',
+        command: "test-command",
+        args: ["--foo", "bar"],
+        cwd: "test/cwd",
+        env: { ...process.env, FOO: "bar" },
+        stderr: "pipe",
       });
     });
 
-    describe('useGoogleCredentialProvider', () => {
+    describe("useGoogleCredentialProvider", () => {
       beforeEach(() => {
         // Mock GoogleAuth client
         const mockClient = {
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
-          quotaProjectId: 'myproject',
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
+          quotaProjectId: "myproject",
         };
 
         GoogleAuth.prototype.getClient = vi.fn().mockResolvedValue(mockClient);
       });
 
-      it('should use GoogleCredentialProvider when specified', async () => {
+      it("should use GoogleCredentialProvider when specified", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test.googleapis.com',
+            httpUrl: "http://test.googleapis.com",
             authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
             oauth: {
-              scopes: ['scope1'],
+              scopes: ["scope1"],
             },
             headers: {
-              'X-Goog-User-Project': 'myproject',
+              "X-Goog-User-Project": "myproject",
             },
           },
           false,
@@ -1400,28 +1334,25 @@ describe('mcp-client', () => {
         const authProvider = (transport as any)._authProvider;
         expect(authProvider).toBeInstanceOf(GoogleCredentialProvider);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const googUserProject = (transport as any)._requestInit?.headers?.[
-          'X-Goog-User-Project'
-        ];
-        expect(googUserProject).toBe('myproject');
+        const googUserProject = (transport as any)._requestInit?.headers?.["X-Goog-User-Project"];
+        expect(googUserProject).toBe("myproject");
       });
 
-      it('should use headers from GoogleCredentialProvider', async () => {
+      it("should use headers from GoogleCredentialProvider", async () => {
         const mockGetRequestHeaders = vi.fn().mockResolvedValue({
-          'X-Goog-User-Project': 'provider-project',
+          "X-Goog-User-Project": "provider-project",
         });
-        vi.spyOn(
-          GoogleCredentialProvider.prototype,
-          'getRequestHeaders',
-        ).mockImplementation(mockGetRequestHeaders);
+        vi.spyOn(GoogleCredentialProvider.prototype, "getRequestHeaders").mockImplementation(
+          mockGetRequestHeaders,
+        );
 
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test.googleapis.com',
+            httpUrl: "http://test.googleapis.com",
             authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
             oauth: {
-              scopes: ['scope1'],
+              scopes: ["scope1"],
             },
           },
           false,
@@ -1431,28 +1362,27 @@ describe('mcp-client', () => {
         expect(mockGetRequestHeaders).toHaveBeenCalled();
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const headers = (transport as any)._requestInit?.headers;
-        expect(headers['X-Goog-User-Project']).toBe('provider-project');
+        expect(headers["X-Goog-User-Project"]).toBe("provider-project");
       });
 
-      it('should prioritize provider headers over config headers', async () => {
+      it("should prioritize provider headers over config headers", async () => {
         const mockGetRequestHeaders = vi.fn().mockResolvedValue({
-          'X-Goog-User-Project': 'provider-project',
+          "X-Goog-User-Project": "provider-project",
         });
-        vi.spyOn(
-          GoogleCredentialProvider.prototype,
-          'getRequestHeaders',
-        ).mockImplementation(mockGetRequestHeaders);
+        vi.spyOn(GoogleCredentialProvider.prototype, "getRequestHeaders").mockImplementation(
+          mockGetRequestHeaders,
+        );
 
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test.googleapis.com',
+            httpUrl: "http://test.googleapis.com",
             authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
             oauth: {
-              scopes: ['scope1'],
+              scopes: ["scope1"],
             },
             headers: {
-              'X-Goog-User-Project': 'config-project',
+              "X-Goog-User-Project": "config-project",
             },
           },
           false,
@@ -1461,18 +1391,18 @@ describe('mcp-client', () => {
         expect(transport).toBeInstanceOf(StreamableHTTPClientTransport);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const headers = (transport as any)._requestInit?.headers;
-        expect(headers['X-Goog-User-Project']).toBe('provider-project');
+        expect(headers["X-Goog-User-Project"]).toBe("provider-project");
       });
 
-      it('should use GoogleCredentialProvider with SSE transport', async () => {
+      it("should use GoogleCredentialProvider with SSE transport", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test.googleapis.com',
-            type: 'sse',
+            url: "http://test.googleapis.com",
+            type: "sse",
             authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
             oauth: {
-              scopes: ['scope1'],
+              scopes: ["scope1"],
             },
           },
           false,
@@ -1484,102 +1414,98 @@ describe('mcp-client', () => {
         expect(authProvider).toBeInstanceOf(GoogleCredentialProvider);
       });
 
-      it('should throw an error if no URL is provided with GoogleCredentialProvider', async () => {
+      it("should throw an error if no URL is provided with GoogleCredentialProvider", async () => {
         await expect(
           createTransport(
-            'test-server',
+            "test-server",
             {
               authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
               oauth: {
-                scopes: ['scope1'],
+                scopes: ["scope1"],
               },
             },
             false,
           ),
-        ).rejects.toThrow(
-          'URL must be provided in the config for Google Credentials provider',
-        );
+        ).rejects.toThrow("URL must be provided in the config for Google Credentials provider");
       });
     });
   });
-  describe('isEnabled', () => {
-    const funcDecl = { name: 'myTool' };
-    const serverName = 'myServer';
+  describe("isEnabled", () => {
+    const funcDecl = { name: "myTool" };
+    const serverName = "myServer";
 
-    it('should return true if no include or exclude lists are provided', () => {
+    it("should return true if no include or exclude lists are provided", () => {
       const mcpServerConfig = {};
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
     });
 
-    it('should return false if the tool is in the exclude list', () => {
-      const mcpServerConfig = { excludeTools: ['myTool'] };
+    it("should return false if the tool is in the exclude list", () => {
+      const mcpServerConfig = { excludeTools: ["myTool"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
     });
 
-    it('should return true if the tool is in the include list', () => {
-      const mcpServerConfig = { includeTools: ['myTool'] };
+    it("should return true if the tool is in the include list", () => {
+      const mcpServerConfig = { includeTools: ["myTool"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
     });
 
-    it('should return true if the tool is in the include list with parentheses', () => {
-      const mcpServerConfig = { includeTools: ['myTool()'] };
+    it("should return true if the tool is in the include list with parentheses", () => {
+      const mcpServerConfig = { includeTools: ["myTool()"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
     });
 
-    it('should return false if the include list exists but does not contain the tool', () => {
-      const mcpServerConfig = { includeTools: ['anotherTool'] };
+    it("should return false if the include list exists but does not contain the tool", () => {
+      const mcpServerConfig = { includeTools: ["anotherTool"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
     });
 
-    it('should return false if the tool is in both the include and exclude lists', () => {
+    it("should return false if the tool is in both the include and exclude lists", () => {
       const mcpServerConfig = {
-        includeTools: ['myTool'],
-        excludeTools: ['myTool'],
+        includeTools: ["myTool"],
+        excludeTools: ["myTool"],
       };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
     });
 
-    it('should return false if the function declaration has no name', () => {
+    it("should return false if the function declaration has no name", () => {
       const namelessFuncDecl = {};
       const mcpServerConfig = {};
-      expect(isEnabled(namelessFuncDecl, serverName, mcpServerConfig)).toBe(
-        false,
-      );
+      expect(isEnabled(namelessFuncDecl, serverName, mcpServerConfig)).toBe(false);
     });
   });
 
-  describe('hasNetworkTransport', () => {
-    it('should return true if only url is provided', () => {
-      const config = { url: 'http://example.com' };
+  describe("hasNetworkTransport", () => {
+    it("should return true if only url is provided", () => {
+      const config = { url: "http://example.com" };
       expect(hasNetworkTransport(config)).toBe(true);
     });
 
-    it('should return true if only httpUrl is provided', () => {
-      const config = { httpUrl: 'http://example.com' };
+    it("should return true if only httpUrl is provided", () => {
+      const config = { httpUrl: "http://example.com" };
       expect(hasNetworkTransport(config)).toBe(true);
     });
 
-    it('should return true if both url and httpUrl are provided', () => {
+    it("should return true if both url and httpUrl are provided", () => {
       const config = {
-        url: 'http://example.com/sse',
-        httpUrl: 'http://example.com/http',
+        url: "http://example.com/sse",
+        httpUrl: "http://example.com/http",
       };
       expect(hasNetworkTransport(config)).toBe(true);
     });
 
-    it('should return false if neither url nor httpUrl is provided', () => {
-      const config = { command: 'do-something' };
+    it("should return false if neither url nor httpUrl is provided", () => {
+      const config = { command: "do-something" };
       expect(hasNetworkTransport(config)).toBe(false);
     });
 
-    it('should return false for an empty config object', () => {
+    it("should return false for an empty config object", () => {
       const config = {};
       expect(hasNetworkTransport(config)).toBe(false);
     });
   });
 });
 
-describe('connectToMcpServer with OAuth', () => {
+describe("connectToMcpServer with OAuth", () => {
   let mockedClient: ClientLib.Client;
   let workspaceContext: WorkspaceContext;
   let testWorkspace: string;
@@ -1597,22 +1523,20 @@ describe('connectToMcpServer with OAuth', () => {
     } as unknown as ClientLib.Client;
     vi.mocked(ClientLib.Client).mockImplementation(() => mockedClient);
 
-    testWorkspace = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-agent-test-'),
-    );
+    testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-agent-test-"));
     workspaceContext = new WorkspaceContext(testWorkspace);
 
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
 
     mockTokenStorage = {
-      getCredentials: vi.fn().mockResolvedValue({ clientId: 'test-client' }),
+      getCredentials: vi.fn().mockResolvedValue({ clientId: "test-client" }),
     } as unknown as MCPOAuthTokenStorage;
     vi.mocked(MCPOAuthTokenStorage).mockReturnValue(mockTokenStorage);
     mockAuthProvider = {
       authenticate: vi.fn().mockResolvedValue(undefined),
-      getValidToken: vi.fn().mockResolvedValue('test-access-token'),
+      getValidToken: vi.fn().mockResolvedValue("test-access-token"),
       tokenStorage: mockTokenStorage,
     } as unknown as MCPOAuthProvider;
     vi.mocked(MCPOAuthProvider).mockReturnValue(mockAuthProvider);
@@ -1622,37 +1546,32 @@ describe('connectToMcpServer with OAuth', () => {
     vi.clearAllMocks();
   });
 
-  it('should handle automatic OAuth flow on 401 with www-authenticate header', async () => {
-    const serverUrl = 'http://test-server.com/';
-    const authUrl = 'http://auth.example.com/auth';
-    const tokenUrl = 'http://auth.example.com/token';
+  it("should handle automatic OAuth flow on 401 with www-authenticate header", async () => {
+    const serverUrl = "http://test-server.com/";
+    const authUrl = "http://auth.example.com/auth";
+    const tokenUrl = "http://auth.example.com/token";
     const wwwAuthHeader = `Bearer realm="test", resource_metadata="http://test-server.com/.well-known/oauth-protected-resource"`;
 
     vi.mocked(mockedClient.connect).mockRejectedValueOnce(
-      new StreamableHTTPError(
-        401,
-        `Unauthorized\nwww-authenticate: ${wwwAuthHeader}`,
-      ),
+      new StreamableHTTPError(401, `Unauthorized\nwww-authenticate: ${wwwAuthHeader}`),
     );
 
     vi.mocked(OAuthUtils.discoverOAuthConfig).mockResolvedValue({
       authorizationUrl: authUrl,
       tokenUrl,
-      scopes: ['test-scope'],
+      scopes: ["test-scope"],
     });
 
     // We need this to be an any type because we dig into its private state.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let capturedTransport: any;
-    vi.mocked(mockedClient.connect).mockImplementationOnce(
-      async (transport) => {
-        capturedTransport = transport;
-        return Promise.resolve();
-      },
-    );
+    vi.mocked(mockedClient.connect).mockImplementationOnce(async (transport) => {
+      capturedTransport = transport;
+      return Promise.resolve();
+    });
 
     const client = await connectToMcpServer(
-      'test-server',
+      "test-server",
       { httpUrl: serverUrl, oauth: { enabled: true } },
       false,
       workspaceContext,
@@ -1662,41 +1581,36 @@ describe('connectToMcpServer with OAuth', () => {
     expect(mockedClient.connect).toHaveBeenCalledTimes(2);
     expect(mockAuthProvider.authenticate).toHaveBeenCalledOnce();
 
-    const authHeader =
-      capturedTransport._requestInit?.headers?.['Authorization'];
-    expect(authHeader).toBe('Bearer test-access-token');
+    const authHeader = capturedTransport._requestInit?.headers?.["Authorization"];
+    expect(authHeader).toBe("Bearer test-access-token");
   });
 
-  it('should discover oauth config if not in www-authenticate header', async () => {
-    const serverUrl = 'http://test-server.com';
-    const authUrl = 'http://auth.example.com/auth';
-    const tokenUrl = 'http://auth.example.com/token';
+  it("should discover oauth config if not in www-authenticate header", async () => {
+    const serverUrl = "http://test-server.com";
+    const authUrl = "http://auth.example.com/auth";
+    const tokenUrl = "http://auth.example.com/token";
 
     vi.mocked(mockedClient.connect).mockRejectedValueOnce(
-      new StreamableHTTPError(401, 'Unauthorized'),
+      new StreamableHTTPError(401, "Unauthorized"),
     );
 
     vi.mocked(OAuthUtils.discoverOAuthConfig).mockResolvedValue({
       authorizationUrl: authUrl,
       tokenUrl,
-      scopes: ['test-scope'],
+      scopes: ["test-scope"],
     });
-    vi.mocked(mockAuthProvider.getValidToken).mockResolvedValue(
-      'test-access-token-from-discovery',
-    );
+    vi.mocked(mockAuthProvider.getValidToken).mockResolvedValue("test-access-token-from-discovery");
 
     // We need this to be an any type because we dig into its private state.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let capturedTransport: any;
-    vi.mocked(mockedClient.connect).mockImplementationOnce(
-      async (transport) => {
-        capturedTransport = transport;
-        return Promise.resolve();
-      },
-    );
+    vi.mocked(mockedClient.connect).mockImplementationOnce(async (transport) => {
+      capturedTransport = transport;
+      return Promise.resolve();
+    });
 
     const client = await connectToMcpServer(
-      'test-server',
+      "test-server",
       { httpUrl: serverUrl, oauth: { enabled: true } },
       false,
       workspaceContext,
@@ -1707,13 +1621,12 @@ describe('connectToMcpServer with OAuth', () => {
     expect(mockAuthProvider.authenticate).toHaveBeenCalledOnce();
     expect(OAuthUtils.discoverOAuthConfig).toHaveBeenCalledWith(serverUrl);
 
-    const authHeader =
-      capturedTransport._requestInit?.headers?.['Authorization'];
-    expect(authHeader).toBe('Bearer test-access-token-from-discovery');
+    const authHeader = capturedTransport._requestInit?.headers?.["Authorization"];
+    expect(authHeader).toBe("Bearer test-access-token-from-discovery");
   });
 });
 
-describe('connectToMcpServer - HTTP→SSE fallback', () => {
+describe("connectToMcpServer - HTTP→SSE fallback", () => {
   let mockedClient: ClientLib.Client;
   let workspaceContext: WorkspaceContext;
   let testWorkspace: string;
@@ -1729,14 +1642,12 @@ describe('connectToMcpServer - HTTP→SSE fallback', () => {
     } as unknown as ClientLib.Client;
     vi.mocked(ClientLib.Client).mockImplementation(() => mockedClient);
 
-    testWorkspace = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-agent-test-'),
-    );
+    testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-agent-test-"));
     workspaceContext = new WorkspaceContext(testWorkspace);
 
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -1744,49 +1655,45 @@ describe('connectToMcpServer - HTTP→SSE fallback', () => {
   });
 
   it('should NOT trigger fallback when type="http" is explicit', async () => {
-    vi.mocked(mockedClient.connect).mockRejectedValueOnce(
-      new Error('Connection failed'),
-    );
+    vi.mocked(mockedClient.connect).mockRejectedValueOnce(new Error("Connection failed"));
 
     await expect(
       connectToMcpServer(
-        'test-server',
-        { url: 'http://test-server', type: 'http' },
+        "test-server",
+        { url: "http://test-server", type: "http" },
         false,
         workspaceContext,
       ),
-    ).rejects.toThrow('Connection failed');
+    ).rejects.toThrow("Connection failed");
 
     // Should only try once (no fallback)
     expect(mockedClient.connect).toHaveBeenCalledTimes(1);
   });
 
   it('should NOT trigger fallback when type="sse" is explicit', async () => {
-    vi.mocked(mockedClient.connect).mockRejectedValueOnce(
-      new Error('Connection failed'),
-    );
+    vi.mocked(mockedClient.connect).mockRejectedValueOnce(new Error("Connection failed"));
 
     await expect(
       connectToMcpServer(
-        'test-server',
-        { url: 'http://test-server', type: 'sse' },
+        "test-server",
+        { url: "http://test-server", type: "sse" },
         false,
         workspaceContext,
       ),
-    ).rejects.toThrow('Connection failed');
+    ).rejects.toThrow("Connection failed");
 
     // Should only try once (no fallback)
     expect(mockedClient.connect).toHaveBeenCalledTimes(1);
   });
 
-  it('should trigger fallback when url provided without type and HTTP fails', async () => {
+  it("should trigger fallback when url provided without type and HTTP fails", async () => {
     vi.mocked(mockedClient.connect)
-      .mockRejectedValueOnce(new StreamableHTTPError(500, 'Server error'))
+      .mockRejectedValueOnce(new StreamableHTTPError(500, "Server error"))
       .mockResolvedValueOnce(undefined);
 
     const client = await connectToMcpServer(
-      'test-server',
-      { url: 'http://test-server' },
+      "test-server",
+      { url: "http://test-server" },
       false,
       workspaceContext,
     );
@@ -1796,34 +1703,29 @@ describe('connectToMcpServer - HTTP→SSE fallback', () => {
     expect(mockedClient.connect).toHaveBeenCalledTimes(2);
   });
 
-  it('should throw original HTTP error when both HTTP and SSE fail (non-401)', async () => {
-    const httpError = new StreamableHTTPError(500, 'Server error');
-    const sseError = new Error('SSE connection failed');
+  it("should throw original HTTP error when both HTTP and SSE fail (non-401)", async () => {
+    const httpError = new StreamableHTTPError(500, "Server error");
+    const sseError = new Error("SSE connection failed");
 
     vi.mocked(mockedClient.connect)
       .mockRejectedValueOnce(httpError)
       .mockRejectedValueOnce(sseError);
 
     await expect(
-      connectToMcpServer(
-        'test-server',
-        { url: 'http://test-server' },
-        false,
-        workspaceContext,
-      ),
-    ).rejects.toThrow('Server error');
+      connectToMcpServer("test-server", { url: "http://test-server" }, false, workspaceContext),
+    ).rejects.toThrow("Server error");
 
     expect(mockedClient.connect).toHaveBeenCalledTimes(2);
   });
 
-  it('should handle HTTP 404 followed by SSE success', async () => {
+  it("should handle HTTP 404 followed by SSE success", async () => {
     vi.mocked(mockedClient.connect)
-      .mockRejectedValueOnce(new StreamableHTTPError(404, 'Not Found'))
+      .mockRejectedValueOnce(new StreamableHTTPError(404, "Not Found"))
       .mockResolvedValueOnce(undefined);
 
     const client = await connectToMcpServer(
-      'test-server',
-      { url: 'http://test-server' },
+      "test-server",
+      { url: "http://test-server" },
       false,
       workspaceContext,
     );
@@ -1833,7 +1735,7 @@ describe('connectToMcpServer - HTTP→SSE fallback', () => {
   });
 });
 
-describe('connectToMcpServer - OAuth with transport fallback', () => {
+describe("connectToMcpServer - OAuth with transport fallback", () => {
   let mockedClient: ClientLib.Client;
   let workspaceContext: WorkspaceContext;
   let testWorkspace: string;
@@ -1851,31 +1753,29 @@ describe('connectToMcpServer - OAuth with transport fallback', () => {
     } as unknown as ClientLib.Client;
     vi.mocked(ClientLib.Client).mockImplementation(() => mockedClient);
 
-    testWorkspace = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-agent-test-'),
-    );
+    testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-agent-test-"));
     workspaceContext = new WorkspaceContext(testWorkspace);
 
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
 
     mockTokenStorage = {
-      getCredentials: vi.fn().mockResolvedValue({ clientId: 'test-client' }),
+      getCredentials: vi.fn().mockResolvedValue({ clientId: "test-client" }),
     } as unknown as MCPOAuthTokenStorage;
     vi.mocked(MCPOAuthTokenStorage).mockReturnValue(mockTokenStorage);
 
     mockAuthProvider = {
       authenticate: vi.fn().mockResolvedValue(undefined),
-      getValidToken: vi.fn().mockResolvedValue('test-access-token'),
+      getValidToken: vi.fn().mockResolvedValue("test-access-token"),
       tokenStorage: mockTokenStorage,
     } as unknown as MCPOAuthProvider;
     vi.mocked(MCPOAuthProvider).mockReturnValue(mockAuthProvider);
 
     vi.mocked(OAuthUtils.discoverOAuthConfig).mockResolvedValue({
-      authorizationUrl: 'http://auth.example.com/auth',
-      tokenUrl: 'http://auth.example.com/token',
-      scopes: ['test-scope'],
+      authorizationUrl: "http://auth.example.com/auth",
+      tokenUrl: "http://auth.example.com/token",
+      scopes: ["test-scope"],
     });
   });
 
@@ -1883,16 +1783,16 @@ describe('connectToMcpServer - OAuth with transport fallback', () => {
     vi.clearAllMocks();
   });
 
-  it('should handle HTTP 404 → SSE 401 → OAuth → SSE+OAuth succeeds', async () => {
+  it("should handle HTTP 404 → SSE 401 → OAuth → SSE+OAuth succeeds", async () => {
     // Tests that OAuth flow works when SSE (not HTTP) requires auth
     vi.mocked(mockedClient.connect)
-      .mockRejectedValueOnce(new StreamableHTTPError(404, 'Not Found'))
-      .mockRejectedValueOnce(new StreamableHTTPError(401, 'Unauthorized'))
+      .mockRejectedValueOnce(new StreamableHTTPError(404, "Not Found"))
+      .mockRejectedValueOnce(new StreamableHTTPError(401, "Unauthorized"))
       .mockResolvedValueOnce(undefined);
 
     const client = await connectToMcpServer(
-      'test-server',
-      { url: 'http://test-server', oauth: { enabled: true } },
+      "test-server",
+      { url: "http://test-server", oauth: { enabled: true } },
       false,
       workspaceContext,
     );
diff --git a/packages/gemini-cli-core/src/tools/mcp-client.ts b/packages/gemini-cli-core/src/tools/mcp-client.ts
index 86f0043a7..73b42447c 100644
--- a/packages/gemini-cli-core/src/tools/mcp-client.ts
+++ b/packages/gemini-cli-core/src/tools/mcp-client.ts
@@ -4,62 +4,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { AjvJsonSchemaValidator } from '@modelcontextprotocol/sdk/validation/ajv';
-import type {
-  jsonSchemaValidator,
-  JsonSchemaType,
-  JsonSchemaValidator,
-} from '@modelcontextprotocol/sdk/validation/types.js';
-import type { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import type { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
+import { basename } from "node:path";
+import { pathToFileURL } from "node:url";
+import type { CallableTool, FunctionCall, Part, Tool } from "@google/genai";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { SSEClientTransportOptions } from "@modelcontextprotocol/sdk/client/sse.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import type { StreamableHTTPClientTransportOptions } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import type {
   GetPromptResult,
   Prompt,
   ReadResourceResult,
   Resource,
-} from '@modelcontextprotocol/sdk/types.js';
+} from "@modelcontextprotocol/sdk/types.js";
 import {
   ListResourcesResultSchema,
   ListRootsRequestSchema,
+  type Tool as McpTool,
   ReadResourceResultSchema,
   ResourceListChangedNotificationSchema,
   ToolListChangedNotificationSchema,
-  type Tool as McpTool,
-} from '@modelcontextprotocol/sdk/types.js';
-import { parse } from 'shell-quote';
-import type { Config, MCPServerConfig } from '../config/config.js';
-import { AuthProviderType } from '../config/config.js';
-import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
-import { ServiceAccountImpersonationProvider } from '../mcp/sa-impersonation-provider.js';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-
-import type { CallableTool, FunctionCall, Part, Tool } from '@google/genai';
-import { basename } from 'node:path';
-import { pathToFileURL } from 'node:url';
-import type { McpAuthProvider } from '../mcp/auth-provider.js';
-import { MCPOAuthProvider } from '../mcp/oauth-provider.js';
-import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
-import { OAuthUtils } from '../mcp/oauth-utils.js';
-import type { PromptRegistry } from '../prompts/prompt-registry.js';
-import {
-  getErrorMessage,
-  isAuthenticationError,
-  UnauthorizedError,
-} from '../utils/errors.js';
+} from "@modelcontextprotocol/sdk/types.js";
+import { AjvJsonSchemaValidator } from "@modelcontextprotocol/sdk/validation/ajv";
 import type {
-  Unsubscribe,
-  WorkspaceContext,
-} from '../utils/workspaceContext.js';
-import type { ToolRegistry } from './tool-registry.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { coreEvents } from '../utils/events.js';
-import type { ResourceRegistry } from '../resources/resource-registry.js';
+  JsonSchemaType,
+  JsonSchemaValidator,
+  jsonSchemaValidator,
+} from "@modelcontextprotocol/sdk/validation/types.js";
+import { parse } from "shell-quote";
+import type { Config, MCPServerConfig } from "../config/config.js";
+import { AuthProviderType } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import type { McpAuthProvider } from "../mcp/auth-provider.js";
+import { GoogleCredentialProvider } from "../mcp/google-auth-provider.js";
+import { MCPOAuthProvider } from "../mcp/oauth-provider.js";
+import { MCPOAuthTokenStorage } from "../mcp/oauth-token-storage.js";
+import { OAuthUtils } from "../mcp/oauth-utils.js";
+import { ServiceAccountImpersonationProvider } from "../mcp/sa-impersonation-provider.js";
+import type { PromptRegistry } from "../prompts/prompt-registry.js";
+import type { ResourceRegistry } from "../resources/resource-registry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage, isAuthenticationError, UnauthorizedError } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import type { Unsubscribe, WorkspaceContext } from "../utils/workspaceContext.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import type { ToolRegistry } from "./tool-registry.js";
 
 export const MCP_DEFAULT_TIMEOUT_MSEC = 10 * 60 * 1000; // default to 10 minutes
 
@@ -73,13 +65,13 @@ export type DiscoveredMCPPrompt = Prompt & {
  */
 export enum MCPServerStatus {
   /** Server is disconnected or experiencing errors */
-  DISCONNECTED = 'disconnected',
+  DISCONNECTED = "disconnected",
   /** Server is actively disconnecting */
-  DISCONNECTING = 'disconnecting',
+  DISCONNECTING = "disconnecting",
   /** Server is in the process of connecting */
-  CONNECTING = 'connecting',
+  CONNECTING = "connecting",
   /** Server is connected and ready to use */
-  CONNECTED = 'connected',
+  CONNECTED = "connected",
 }
 
 /**
@@ -87,11 +79,11 @@ export enum MCPServerStatus {
  */
 export enum MCPDiscoveryState {
   /** Discovery has not started yet */
-  NOT_STARTED = 'not_started',
+  NOT_STARTED = "not_started",
   /** Discovery is currently in progress */
-  IN_PROGRESS = 'in_progress',
+  IN_PROGRESS = "in_progress",
   /** Discovery has completed (with or without errors) */
-  COMPLETED = 'completed',
+  COMPLETED = "completed",
 }
 
 /**
@@ -147,11 +139,7 @@ export class McpClient {
           return;
         }
         if (originalOnError) originalOnError(error);
-        coreEvents.emitFeedback(
-          'error',
-          `MCP ERROR (${this.serverName})`,
-          error,
-        );
+        coreEvents.emitFeedback("error", `MCP ERROR (${this.serverName})`, error);
         this.updateStatus(MCPServerStatus.DISCONNECTED);
       };
       this.updateStatus(MCPServerStatus.CONNECTED);
@@ -173,7 +161,7 @@ export class McpClient {
     this.updateResourceRegistry(resources);
 
     if (prompts.length === 0 && tools.length === 0 && resources.length === 0) {
-      throw new Error('No prompts, tools, or resources found on the server.');
+      throw new Error("No prompts, tools, or resources found on the server.");
     }
 
     for (const tool of tools) {
@@ -259,7 +247,7 @@ export class McpClient {
     this.assertConnected();
     return this.client!.request(
       {
-        method: 'resources/read',
+        method: "resources/read",
         params: { uri },
       },
       ReadResourceResultSchema,
@@ -282,15 +270,10 @@ export class McpClient {
         `Server '${this.serverName}' supports tool updates. Listening for changes...`,
       );
 
-      this.client.setNotificationHandler(
-        ToolListChangedNotificationSchema,
-        async () => {
-          debugLogger.log(
-            `🔔 Received tool update notification from '${this.serverName}'`,
-          );
-          await this.refreshTools();
-        },
-      );
+      this.client.setNotificationHandler(ToolListChangedNotificationSchema, async () => {
+        debugLogger.log(`🔔 Received tool update notification from '${this.serverName}'`);
+        await this.refreshTools();
+      });
     }
 
     if (capabilities?.resources?.listChanged) {
@@ -298,15 +281,10 @@ export class McpClient {
         `Server '${this.serverName}' supports resource updates. Listening for changes...`,
       );
 
-      this.client.setNotificationHandler(
-        ResourceListChangedNotificationSchema,
-        async () => {
-          debugLogger.log(
-            `🔔 Received resource update notification from '${this.serverName}'`,
-          );
-          await this.refreshResources();
-        },
-      );
+      this.client.setNotificationHandler(ResourceListChangedNotificationSchema, async () => {
+        debugLogger.log(`🔔 Received resource update notification from '${this.serverName}'`);
+        await this.refreshResources();
+      });
     }
   }
 
@@ -342,9 +320,7 @@ export class McpClient {
         try {
           newResources = await this.discoverResources();
         } catch (err) {
-          debugLogger.error(
-            `Resource discovery failed during refresh: ${getErrorMessage(err)}`,
-          );
+          debugLogger.error(`Resource discovery failed during refresh: ${getErrorMessage(err)}`);
           clearTimeout(timeoutId);
           break;
         }
@@ -353,10 +329,7 @@ export class McpClient {
 
         clearTimeout(timeoutId);
 
-        coreEvents.emitFeedback(
-          'info',
-          `Resources updated for server: ${this.serverName}`,
-        );
+        coreEvents.emitFeedback("info", `Resources updated for server: ${this.serverName}`);
       } while (this.pendingResourceRefresh);
     } catch (error) {
       debugLogger.error(
@@ -410,9 +383,7 @@ export class McpClient {
             signal: abortController.signal,
           });
         } catch (err) {
-          debugLogger.error(
-            `Discovery failed during refresh: ${getErrorMessage(err)}`,
-          );
+          debugLogger.error(`Discovery failed during refresh: ${getErrorMessage(err)}`);
           clearTimeout(timeoutId);
           break;
         }
@@ -430,10 +401,7 @@ export class McpClient {
 
         clearTimeout(timeoutId);
 
-        coreEvents.emitFeedback(
-          'info',
-          `Tools updated for server: ${this.serverName}`,
-        );
+        coreEvents.emitFeedback("info", `Tools updated for server: ${this.serverName}`);
       } while (this.pendingToolRefresh);
     } catch (error) {
       debugLogger.error(
@@ -464,27 +432,20 @@ export const mcpServerRequiresOAuth: Map<string, boolean> = new Map();
 /**
  * Event listeners for MCP server status changes
  */
-type StatusChangeListener = (
-  serverName: string,
-  status: MCPServerStatus,
-) => void;
+type StatusChangeListener = (serverName: string, status: MCPServerStatus) => void;
 const statusChangeListeners: StatusChangeListener[] = [];
 
 /**
  * Add a listener for MCP server status changes
  */
-export function addMCPStatusChangeListener(
-  listener: StatusChangeListener,
-): void {
+export function addMCPStatusChangeListener(listener: StatusChangeListener): void {
   statusChangeListeners.push(listener);
 }
 
 /**
  * Remove a listener for MCP server status changes
  */
-export function removeMCPStatusChangeListener(
-  listener: StatusChangeListener,
-): void {
+export function removeMCPStatusChangeListener(listener: StatusChangeListener): void {
   const index = statusChangeListeners.indexOf(listener);
   if (index !== -1) {
     statusChangeListeners.splice(index, 1);
@@ -494,10 +455,7 @@ export function removeMCPStatusChangeListener(
 /**
  * Update the status of an MCP server
  */
-export function updateMCPServerStatus(
-  serverName: string,
-  status: MCPServerStatus,
-): void {
+export function updateMCPServerStatus(serverName: string, status: MCPServerStatus): void {
   serverStatuses.set(serverName, status);
   // Notify all listeners
   for (const listener of statusChangeListeners) {
@@ -570,22 +528,19 @@ async function handleAutomaticOAuth(
 
     // Always try to parse the resource metadata URI from the www-authenticate header
     let oauthConfig;
-    const resourceMetadataUri =
-      OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
+    const resourceMetadataUri = OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
     if (resourceMetadataUri) {
       oauthConfig = await OAuthUtils.discoverOAuthConfig(resourceMetadataUri);
     } else if (hasNetworkTransport(mcpServerConfig)) {
       // Fallback: try to discover OAuth config from the base URL
-      const serverUrl = new URL(
-        mcpServerConfig.httpUrl || mcpServerConfig.url!,
-      );
+      const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url!);
       const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
       oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
     }
 
     if (!oauthConfig) {
       coreEvents.emitFeedback(
-        'error',
+        "error",
         `Could not configure OAuth for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`,
       );
       return false;
@@ -604,19 +559,15 @@ async function handleAutomaticOAuth(
     // Perform OAuth authentication
     // Pass the server URL for proper discovery
     const serverUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
-    debugLogger.log(
-      `Starting OAuth authentication for server '${mcpServerName}'...`,
-    );
+    debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
     const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
     await authProvider.authenticate(mcpServerName, oauthAuthConfig, serverUrl);
 
-    debugLogger.log(
-      `OAuth authentication successful for server '${mcpServerName}'`,
-    );
+    debugLogger.log(`OAuth authentication successful for server '${mcpServerName}'`);
     return true;
   } catch (error) {
     coreEvents.emitFeedback(
-      'error',
+      "error",
       `Failed to handle automatic OAuth for server '${mcpServerName}': ${getErrorMessage(error)}`,
       error,
     );
@@ -647,18 +598,11 @@ function createTransportRequestInit(
  *
  * @param mcpServerConfig The MCP server configuration
  */
-function createAuthProvider(
-  mcpServerConfig: MCPServerConfig,
-): McpAuthProvider | undefined {
-  if (
-    mcpServerConfig.authProviderType ===
-    AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION
-  ) {
+function createAuthProvider(mcpServerConfig: MCPServerConfig): McpAuthProvider | undefined {
+  if (mcpServerConfig.authProviderType === AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION) {
     return new ServiceAccountImpersonationProvider(mcpServerConfig);
   }
-  if (
-    mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS
-  ) {
+  if (mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS) {
     return new GoogleCredentialProvider(mcpServerConfig);
   }
   return undefined;
@@ -681,16 +625,14 @@ async function createTransportWithOAuth(
     const headers: Record<string, string> = {
       Authorization: `Bearer ${accessToken}`,
     };
-    const transportOptions:
-      | StreamableHTTPClientTransportOptions
-      | SSEClientTransportOptions = {
+    const transportOptions: StreamableHTTPClientTransportOptions | SSEClientTransportOptions = {
       requestInit: createTransportRequestInit(mcpServerConfig, headers),
     };
 
     return createUrlTransport(mcpServerName, mcpServerConfig, transportOptions);
   } catch (error) {
     coreEvents.emitFeedback(
-      'error',
+      "error",
       `Failed to create OAuth transport for server '${mcpServerName}': ${getErrorMessage(error)}`,
       error,
     );
@@ -722,17 +664,16 @@ export async function discoverMcpTools(
   try {
     mcpServers = populateMcpServerCommand(mcpServers, mcpServerCommand);
 
-    const discoveryPromises = Object.entries(mcpServers).map(
-      ([mcpServerName, mcpServerConfig]) =>
-        connectAndDiscover(
-          mcpServerName,
-          mcpServerConfig,
-          toolRegistry,
-          promptRegistry,
-          debugMode,
-          workspaceContext,
-          cliConfig,
-        ),
+    const discoveryPromises = Object.entries(mcpServers).map(([mcpServerName, mcpServerConfig]) =>
+      connectAndDiscover(
+        mcpServerName,
+        mcpServerConfig,
+        toolRegistry,
+        promptRegistry,
+        debugMode,
+        workspaceContext,
+        cliConfig,
+      ),
     );
     await Promise.all(discoveryPromises);
   } finally {
@@ -759,9 +700,9 @@ class LenientJsonSchemaValidator implements jsonSchemaValidator {
     } catch (error) {
       debugLogger.warn(
         `Failed to compile MCP tool output schema (${
-          (schema as Record<string, unknown>)?.['$id'] ?? '<no $id>'
+          (schema as Record<string, unknown>)?.["$id"] ?? "<no $id>"
         }): ${error instanceof Error ? error.message : String(error)}. ` +
-          'Skipping output validation for this tool.',
+          "Skipping output validation for this tool.",
       );
       return (input: unknown) => ({
         valid: true as const,
@@ -780,11 +721,11 @@ export function populateMcpServerCommand(
   if (mcpServerCommand) {
     const cmd = mcpServerCommand;
     const args = parse(cmd, process.env) as string[];
-    if (args.some((arg) => typeof arg !== 'string')) {
-      throw new Error('failed to parse mcpServerCommand: ' + cmd);
+    if (args.some((arg) => typeof arg !== "string")) {
+      throw new Error("failed to parse mcpServerCommand: " + cmd);
     }
     // use generic server name 'mcp'
-    mcpServers['mcp'] = {
+    mcpServers["mcp"] = {
       command: args[0],
       args: args.slice(1),
     };
@@ -823,16 +764,12 @@ export async function connectAndDiscover(
     );
 
     mcpClient.onerror = (error) => {
-      coreEvents.emitFeedback('error', `MCP ERROR (${mcpServerName}):`, error);
+      coreEvents.emitFeedback("error", `MCP ERROR (${mcpServerName}):`, error);
       updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
     };
 
     // Attempt to discover both prompts and tools
-    const prompts = await discoverPrompts(
-      mcpServerName,
-      mcpClient,
-      promptRegistry,
-    );
+    const prompts = await discoverPrompts(mcpServerName, mcpClient, promptRegistry);
     const tools = await discoverTools(
       mcpServerName,
       mcpServerConfig,
@@ -844,7 +781,7 @@ export async function connectAndDiscover(
 
     // If we have neither prompts nor tools, it's a failed discovery
     if (prompts.length === 0 && tools.length === 0) {
-      throw new Error('No prompts or tools found on the server.');
+      throw new Error("No prompts or tools found on the server.");
     }
 
     // If we found anything, the server is connected
@@ -861,10 +798,8 @@ export async function connectAndDiscover(
       mcpClient.close();
     }
     coreEvents.emitFeedback(
-      'error',
-      `Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(
-        error,
-      )}`,
+      "error",
+      `Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(error)}`,
       error,
     );
     updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
@@ -914,8 +849,8 @@ export async function discoverTools(
           mcpCallableTool,
           mcpServerName,
           toolDef.name,
-          toolDef.description ?? '',
-          toolDef.inputSchema ?? { type: 'object', properties: {} },
+          toolDef.description ?? "",
+          toolDef.inputSchema ?? { type: "object", properties: {} },
           mcpServerConfig.trust,
           undefined,
           cliConfig,
@@ -927,7 +862,7 @@ export async function discoverTools(
         discoveredTools.push(tool);
       } catch (error) {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Error discovering tool: '${
             toolDef.name
           }' from MCP server '${mcpServerName}': ${(error as Error).message}`,
@@ -937,15 +872,10 @@ export async function discoverTools(
     }
     return discoveredTools;
   } catch (error) {
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       coreEvents.emitFeedback(
-        'error',
-        `Error discovering tools from ${mcpServerName}: ${getErrorMessage(
-          error,
-        )}`,
+        "error",
+        `Error discovering tools from ${mcpServerName}: ${getErrorMessage(error)}`,
         error,
       );
     }
@@ -975,7 +905,7 @@ class McpCallableTool implements CallableTool {
   async callTool(functionCalls: FunctionCall[]): Promise<Part[]> {
     // We only expect one function call at a time for MCP tools in this context
     if (functionCalls.length !== 1) {
-      throw new Error('McpCallableTool only supports single function call');
+      throw new Error("McpCallableTool only supports single function call");
     }
     const call = functionCalls[0];
 
@@ -1046,15 +976,10 @@ export async function discoverPrompts(
   } catch (error) {
     // It's okay if this fails, not all servers will have prompts.
     // Don't log an error if the method is not found, which is a common case.
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       coreEvents.emitFeedback(
-        'error',
-        `Error discovering prompts from ${mcpServerName}: ${getErrorMessage(
-          error,
-        )}`,
+        "error",
+        `Error discovering prompts from ${mcpServerName}: ${getErrorMessage(error)}`,
         error,
       );
     }
@@ -1074,17 +999,14 @@ export async function discoverResources(
   return resources;
 }
 
-async function listResources(
-  mcpServerName: string,
-  mcpClient: Client,
-): Promise<Resource[]> {
+async function listResources(mcpServerName: string, mcpClient: Client): Promise<Resource[]> {
   const resources: Resource[] = [];
   let cursor: string | undefined;
   try {
     do {
       const response = await mcpClient.request(
         {
-          method: 'resources/list',
+          method: "resources/list",
           params: cursor ? { cursor } : {},
         },
         ListResourcesResultSchema,
@@ -1093,14 +1015,12 @@ async function listResources(
       cursor = response.nextCursor ?? undefined;
     } while (cursor);
   } catch (error) {
-    if (error instanceof Error && error.message?.includes('Method not found')) {
+    if (error instanceof Error && error.message?.includes("Method not found")) {
       return [];
     }
     coreEvents.emitFeedback(
-      'error',
-      `Error discovering resources from ${mcpServerName}: ${getErrorMessage(
-        error,
-      )}`,
+      "error",
+      `Error discovering resources from ${mcpServerName}: ${getErrorMessage(error)}`,
       error,
     );
     throw error;
@@ -1138,12 +1058,9 @@ export async function invokeMcpPrompt(
 
     return response;
   } catch (error) {
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       coreEvents.emitFeedback(
-        'error',
+        "error",
         `Error invoking prompt '${promptName}' from ${mcpServerName} ${promptParams}: ${getErrorMessage(
           error,
         )}`,
@@ -1239,7 +1156,7 @@ async function showAuthRequiredMessage(serverName: string): Promise<never> {
     ? `MCP server '${serverName}' rejected stored OAuth token. Please re-authenticate using: /mcp auth ${serverName}`
     : `MCP server '${serverName}' requires authentication using: /mcp auth ${serverName}`;
 
-  coreEvents.emitFeedback('info', message);
+  coreEvents.emitFeedback("info", message);
   throw new UnauthorizedError(message);
 }
 
@@ -1262,52 +1179,33 @@ async function retryWithOAuth(
 ): Promise<void> {
   if (httpReturned404) {
     // HTTP returned 404, only try SSE
-    debugLogger.log(
-      `Retrying SSE connection to '${serverName}' with OAuth token...`,
-    );
+    debugLogger.log(`Retrying SSE connection to '${serverName}' with OAuth token...`);
     await connectWithSSETransport(client, config, accessToken);
-    debugLogger.log(
-      `Successfully connected to '${serverName}' using SSE with OAuth.`,
-    );
+    debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
     return;
   }
 
   // HTTP returned 401, try HTTP with OAuth first
   debugLogger.log(`Retrying connection to '${serverName}' with OAuth token...`);
 
-  const httpTransport = await createTransportWithOAuth(
-    serverName,
-    config,
-    accessToken,
-  );
+  const httpTransport = await createTransportWithOAuth(serverName, config, accessToken);
   if (!httpTransport) {
-    throw new Error(
-      `Failed to create OAuth transport for server '${serverName}'`,
-    );
+    throw new Error(`Failed to create OAuth transport for server '${serverName}'`);
   }
 
   try {
     await client.connect(httpTransport, {
       timeout: config.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
     });
-    debugLogger.log(
-      `Successfully connected to '${serverName}' using HTTP with OAuth.`,
-    );
+    debugLogger.log(`Successfully connected to '${serverName}' using HTTP with OAuth.`);
   } catch (httpError) {
     await httpTransport.close();
 
     // If HTTP+OAuth returns 404 and auto-detection enabled, try SSE+OAuth
-    if (
-      String(httpError).includes('404') &&
-      config.url &&
-      !config.type &&
-      !config.httpUrl
-    ) {
+    if (String(httpError).includes("404") && config.url && !config.type && !config.httpUrl) {
       debugLogger.log(`HTTP with OAuth returned 404, trying SSE with OAuth...`);
       await connectWithSSETransport(client, config, accessToken);
-      debugLogger.log(
-        `Successfully connected to '${serverName}' using SSE with OAuth.`,
-      );
+      debugLogger.log(`Successfully connected to '${serverName}' using SSE with OAuth.`);
     } else {
       throw httpError;
     }
@@ -1332,8 +1230,8 @@ export async function connectToMcpServer(
 ): Promise<Client> {
   const mcpClient = new Client(
     {
-      name: 'gemini-cli-mcp-client',
-      version: '0.0.1',
+      name: "gemini-cli-mcp-client",
+      version: "0.0.1",
     },
     {
       // Use a tolerant validator so bad output schemas don't block discovery.
@@ -1360,11 +1258,11 @@ export async function connectToMcpServer(
     };
   });
 
-  let unlistenDirectories: Unsubscribe | undefined =
-    workspaceContext.onDirectoriesChanged(async () => {
+  let unlistenDirectories: Unsubscribe | undefined = workspaceContext.onDirectoriesChanged(
+    async () => {
       try {
         await mcpClient.notification({
-          method: 'notifications/roots/list_changed',
+          method: "notifications/roots/list_changed",
         });
       } catch (_) {
         // If this fails, its almost certainly because the connection was closed
@@ -1372,7 +1270,8 @@ export async function connectToMcpServer(
         unlistenDirectories?.();
         unlistenDirectories = undefined;
       }
-    });
+    },
+  );
 
   // Attempt to pro-actively unsubscribe if the mcp client closes. This API is
   // very brittle though so we don't have any guarantees, hence the try/catch
@@ -1391,11 +1290,7 @@ export async function connectToMcpServer(
   let sseError: Error | null = null; // Track SSE fallback error
 
   try {
-    const transport = await createTransport(
-      mcpServerName,
-      mcpServerConfig,
-      debugMode,
-    );
+    const transport = await createTransport(mcpServerName, mcpServerConfig, debugMode);
     try {
       await mcpClient.connect(transport, {
         timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
@@ -1421,7 +1316,7 @@ export async function connectToMcpServer(
       !mcpServerConfig.httpUrl
     ) {
       // Check if HTTP returned 404 - if so, we know it's not an HTTP server
-      httpReturned404 = String(firstAttemptError).includes('404');
+      httpReturned404 = String(firstAttemptError).includes("404");
 
       const logMessage = httpReturned404
         ? `HTTP returned 404, trying SSE transport...`
@@ -1453,9 +1348,7 @@ export async function connectToMcpServer(
           error = sseError;
           // Continue to OAuth handling below
         } else {
-          debugLogger.log(
-            `MCP server '${mcpServerName}': SSE fallback also failed.`,
-          );
+          debugLogger.log(`MCP server '${mcpServerName}': SSE fallback also failed.`);
           // Both failed without 401, throw the original error
           throw firstAttemptError;
         }
@@ -1480,30 +1373,28 @@ export async function connectToMcpServer(
 
       // If we didn't get the header from the error string, try to get it from the server
       if (!wwwAuthenticate && hasNetworkTransport(mcpServerConfig)) {
-        debugLogger.log(
-          `No www-authenticate header in error, trying to fetch it from server...`,
-        );
+        debugLogger.log(`No www-authenticate header in error, trying to fetch it from server...`);
         try {
           const urlToFetch = mcpServerConfig.httpUrl || mcpServerConfig.url!;
 
           // Determine correct Accept header based on what transport failed
           let acceptHeader: string;
           if (mcpServerConfig.httpUrl) {
-            acceptHeader = 'application/json';
-          } else if (mcpServerConfig.type === 'http') {
-            acceptHeader = 'application/json';
-          } else if (mcpServerConfig.type === 'sse') {
-            acceptHeader = 'text/event-stream';
+            acceptHeader = "application/json";
+          } else if (mcpServerConfig.type === "http") {
+            acceptHeader = "application/json";
+          } else if (mcpServerConfig.type === "sse") {
+            acceptHeader = "text/event-stream";
           } else if (httpReturned404) {
             // HTTP failed with 404, SSE returned 401 - use SSE header
-            acceptHeader = 'text/event-stream';
+            acceptHeader = "text/event-stream";
           } else {
             // HTTP returned 401 - use HTTP header
-            acceptHeader = 'application/json';
+            acceptHeader = "application/json";
           }
 
           const response = await fetch(urlToFetch, {
-            method: 'HEAD',
+            method: "HEAD",
             headers: {
               Accept: acceptHeader,
             },
@@ -1511,26 +1402,20 @@ export async function connectToMcpServer(
           });
 
           if (response.status === 401) {
-            wwwAuthenticate = response.headers.get('www-authenticate');
+            wwwAuthenticate = response.headers.get("www-authenticate");
             if (wwwAuthenticate) {
-              debugLogger.log(
-                `Found www-authenticate header from server: ${wwwAuthenticate}`,
-              );
+              debugLogger.log(`Found www-authenticate header from server: ${wwwAuthenticate}`);
             }
           }
         } catch (fetchError) {
           debugLogger.debug(
-            `Failed to fetch www-authenticate header: ${getErrorMessage(
-              fetchError,
-            )}`,
+            `Failed to fetch www-authenticate header: ${getErrorMessage(fetchError)}`,
           );
         }
       }
 
       if (wwwAuthenticate) {
-        debugLogger.log(
-          `Received 401 with www-authenticate header: ${wwwAuthenticate}`,
-        );
+        debugLogger.log(`Received 401 with www-authenticate header: ${wwwAuthenticate}`);
 
         // Try automatic OAuth discovery and authentication
         const oauthSuccess = await handleAutomaticOAuth(
@@ -1542,9 +1427,7 @@ export async function connectToMcpServer(
           // Retry connection with OAuth token
           const accessToken = await getStoredOAuthToken(mcpServerName);
           if (!accessToken) {
-            throw new Error(
-              `Failed to get OAuth token for server '${mcpServerName}'`,
-            );
+            throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
           }
 
           await retryWithOAuth(
@@ -1556,9 +1439,7 @@ export async function connectToMcpServer(
           );
           return mcpClient;
         } else {
-          throw new Error(
-            `Failed to handle automatic OAuth for server '${mcpServerName}'`,
-          );
+          throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
         }
       } else {
         // No www-authenticate header found, but we got a 401
@@ -1570,14 +1451,10 @@ export async function connectToMcpServer(
         }
 
         // For SSE/HTTP servers, try to discover OAuth configuration from the base URL
-        debugLogger.log(
-          `🔍 Attempting OAuth discovery for '${mcpServerName}'...`,
-        );
+        debugLogger.log(`🔍 Attempting OAuth discovery for '${mcpServerName}'...`);
 
         if (hasNetworkTransport(mcpServerConfig)) {
-          const serverUrl = new URL(
-            mcpServerConfig.httpUrl || mcpServerConfig.url!,
-          );
+          const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url!);
           const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
 
           // Try to discover OAuth configuration from the base URL
@@ -1597,26 +1474,15 @@ export async function connectToMcpServer(
 
             // Perform OAuth authentication
             // Pass the server URL for proper discovery
-            const authServerUrl =
-              mcpServerConfig.httpUrl || mcpServerConfig.url;
-            debugLogger.log(
-              `Starting OAuth authentication for server '${mcpServerName}'...`,
-            );
-            const authProvider = new MCPOAuthProvider(
-              new MCPOAuthTokenStorage(),
-            );
-            await authProvider.authenticate(
-              mcpServerName,
-              oauthAuthConfig,
-              authServerUrl,
-            );
+            const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
+            debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
+            const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
+            await authProvider.authenticate(mcpServerName, oauthAuthConfig, authServerUrl);
 
             // Retry connection with OAuth token
             const accessToken = await getStoredOAuthToken(mcpServerName);
             if (!accessToken) {
-              throw new Error(
-                `Failed to get OAuth token for server '${mcpServerName}'`,
-              );
+              throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
             }
 
             // Create transport with OAuth token
@@ -1626,9 +1492,7 @@ export async function connectToMcpServer(
               accessToken,
             );
             if (!oauthTransport) {
-              throw new Error(
-                `Failed to create OAuth transport for server '${mcpServerName}'`,
-              );
+              throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
             }
 
             await mcpClient.connect(oauthTransport, {
@@ -1662,9 +1526,7 @@ export async function connectToMcpServer(
 function createUrlTransport(
   mcpServerName: string,
   mcpServerConfig: MCPServerConfig,
-  transportOptions:
-    | StreamableHTTPClientTransportOptions
-    | SSEClientTransportOptions,
+  transportOptions: StreamableHTTPClientTransportOptions | SSEClientTransportOptions,
 ): StreamableHTTPClientTransport | SSEClientTransport {
   // Priority 1: httpUrl (deprecated)
   if (mcpServerConfig.httpUrl) {
@@ -1674,33 +1536,21 @@ function createUrlTransport(
           `Using deprecated 'httpUrl'. Please migrate to 'url' with 'type: "http"'.`,
       );
     }
-    return new StreamableHTTPClientTransport(
-      new URL(mcpServerConfig.httpUrl),
-      transportOptions,
-    );
+    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
   }
 
   // Priority 2 & 3: url with explicit type
   if (mcpServerConfig.url && mcpServerConfig.type) {
-    if (mcpServerConfig.type === 'http') {
-      return new StreamableHTTPClientTransport(
-        new URL(mcpServerConfig.url),
-        transportOptions,
-      );
-    } else if (mcpServerConfig.type === 'sse') {
-      return new SSEClientTransport(
-        new URL(mcpServerConfig.url),
-        transportOptions,
-      );
+    if (mcpServerConfig.type === "http") {
+      return new StreamableHTTPClientTransport(new URL(mcpServerConfig.url), transportOptions);
+    } else if (mcpServerConfig.type === "sse") {
+      return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
     }
   }
 
   // Priority 4: url without type (default to HTTP)
   if (mcpServerConfig.url) {
-    return new StreamableHTTPClientTransport(
-      new URL(mcpServerConfig.url),
-      transportOptions,
-    );
+    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.url), transportOptions);
   }
 
   throw new Error(`No URL configured for MCP server '${mcpServerName}'`);
@@ -1714,26 +1564,16 @@ export async function createTransport(
 ): Promise<Transport> {
   const noUrl = !mcpServerConfig.url && !mcpServerConfig.httpUrl;
   if (noUrl) {
-    if (
-      mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS
-    ) {
-      throw new Error(
-        `URL must be provided in the config for Google Credentials provider`,
-      );
+    if (mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS) {
+      throw new Error(`URL must be provided in the config for Google Credentials provider`);
     }
-    if (
-      mcpServerConfig.authProviderType ===
-      AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION
-    ) {
-      throw new Error(
-        `No URL configured for ServiceAccountImpersonation MCP Server`,
-      );
+    if (mcpServerConfig.authProviderType === AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION) {
+      throw new Error(`No URL configured for ServiceAccountImpersonation MCP Server`);
     }
   }
   if (mcpServerConfig.httpUrl || mcpServerConfig.url) {
     const authProvider = createAuthProvider(mcpServerConfig);
-    const headers: Record<string, string> =
-      (await authProvider?.getRequestHeaders?.()) ?? {};
+    const headers: Record<string, string> = (await authProvider?.getRequestHeaders?.()) ?? {};
 
     if (authProvider === undefined) {
       // Check if we have OAuth configuration or stored tokens
@@ -1741,15 +1581,12 @@ export async function createTransport(
       if (mcpServerConfig.oauth?.enabled && mcpServerConfig.oauth) {
         const tokenStorage = new MCPOAuthTokenStorage();
         const mcpAuthProvider = new MCPOAuthProvider(tokenStorage);
-        accessToken = await mcpAuthProvider.getValidToken(
-          mcpServerName,
-          mcpServerConfig.oauth,
-        );
+        accessToken = await mcpAuthProvider.getValidToken(mcpServerName, mcpServerConfig.oauth);
 
         if (!accessToken) {
           // Emit info message (not error) since this is expected behavior
           coreEvents.emitFeedback(
-            'info',
+            "info",
             `MCP server '${mcpServerName}' requires authentication using: /mcp auth ${mcpServerName}`,
           );
         }
@@ -1757,19 +1594,15 @@ export async function createTransport(
         // Check if we have stored OAuth tokens for this server (from previous authentication)
         accessToken = await getStoredOAuthToken(mcpServerName);
         if (accessToken) {
-          debugLogger.log(
-            `Found stored OAuth token for server '${mcpServerName}'`,
-          );
+          debugLogger.log(`Found stored OAuth token for server '${mcpServerName}'`);
         }
       }
       if (accessToken) {
-        headers['Authorization'] = `Bearer ${accessToken}`;
+        headers["Authorization"] = `Bearer ${accessToken}`;
       }
     }
 
-    const transportOptions:
-      | StreamableHTTPClientTransportOptions
-      | SSEClientTransportOptions = {
+    const transportOptions: StreamableHTTPClientTransportOptions | SSEClientTransportOptions = {
       requestInit: createTransportRequestInit(mcpServerConfig, headers),
       authProvider,
     };
@@ -1786,15 +1619,12 @@ export async function createTransport(
         ...(mcpServerConfig.env || {}),
       } as Record<string, string>,
       cwd: mcpServerConfig.cwd,
-      stderr: 'pipe',
+      stderr: "pipe",
     });
     if (debugMode) {
-      transport.stderr!.on('data', (data) => {
+      transport.stderr!.on("data", (data) => {
         const stderrStr = data.toString().trim();
-        debugLogger.debug(
-          `[DEBUG] [MCP STDERR (${mcpServerName})]: `,
-          stderrStr,
-        );
+        debugLogger.debug(`[DEBUG] [MCP STDERR (${mcpServerName})]: `, stderrStr);
       });
     }
     return transport;
@@ -1830,8 +1660,6 @@ export function isEnabled(
 
   return (
     !includeTools ||
-    includeTools.some(
-      (tool) => tool === funcDecl.name || tool.startsWith(`${funcDecl.name}(`),
-    )
+    includeTools.some((tool) => tool === funcDecl.name || tool.startsWith(`${funcDecl.name}(`))
   );
 }
diff --git a/packages/gemini-cli-core/src/tools/mcp-tool.test.ts b/packages/gemini-cli-core/src/tools/mcp-tool.test.ts
index fbd0d25dc..a17fc355c 100644
--- a/packages/gemini-cli-core/src/tools/mcp-tool.test.ts
+++ b/packages/gemini-cli-core/src/tools/mcp-tool.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { CallableTool, Part } from "@google/genai";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mocked } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import { DiscoveredMCPTool, generateValidName } from './mcp-tool.js'; // Added getStringifiedResultForDisplay
-import type { ToolResult } from './tools.js';
-import { ToolConfirmationOutcome } from './tools.js'; // Added ToolConfirmationOutcome
-import type { CallableTool, Part } from '@google/genai';
-import { ToolErrorType } from './tool-error.js';
+import type { Mocked } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { DiscoveredMCPTool, generateValidName } from "./mcp-tool.js"; // Added getStringifiedResultForDisplay
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolResult } from "./tools.js";
+import { ToolConfirmationOutcome } from "./tools.js"; // Added ToolConfirmationOutcome
 
 // Mock @google/genai mcpToTool and CallableTool
 // We only need to mock the parts of CallableTool that DiscoveredMCPTool uses.
@@ -25,10 +25,7 @@ const mockCallableToolInstance: Mocked<CallableTool> = {
   // Add other methods if DiscoveredMCPTool starts using them
 };
 
-const createSdkResponse = (
-  toolName: string,
-  response: Record<string, any>,
-): Part[] => [
+const createSdkResponse = (toolName: string, response: Record<string, any>): Part[] => [
   {
     functionResponse: {
       name: toolName,
@@ -37,47 +34,42 @@ const createSdkResponse = (
   },
 ];
 
-describe('generateValidName', () => {
-  it('should return a valid name for a simple function', () => {
-    expect(generateValidName('myFunction')).toBe('myFunction');
+describe("generateValidName", () => {
+  it("should return a valid name for a simple function", () => {
+    expect(generateValidName("myFunction")).toBe("myFunction");
   });
 
-  it('should replace invalid characters with underscores', () => {
-    expect(generateValidName('invalid-name with spaces')).toBe(
-      'invalid-name_with_spaces',
-    );
+  it("should replace invalid characters with underscores", () => {
+    expect(generateValidName("invalid-name with spaces")).toBe("invalid-name_with_spaces");
   });
 
-  it('should truncate long names', () => {
-    expect(generateValidName('x'.repeat(80))).toBe(
-      'xxxxxxxxxxxxxxxxxxxxxxxxxxxx___xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+  it("should truncate long names", () => {
+    expect(generateValidName("x".repeat(80))).toBe(
+      "xxxxxxxxxxxxxxxxxxxxxxxxxxxx___xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
     );
   });
 
-  it('should handle names with only invalid characters', () => {
-    expect(generateValidName('!@#$%^&*()')).toBe('__________');
+  it("should handle names with only invalid characters", () => {
+    expect(generateValidName("!@#$%^&*()")).toBe("__________");
   });
 
   it.each([
-    { length: 63, expected: 63, description: 'exactly 63 characters' },
-    { length: 64, expected: 63, description: 'exactly 64 characters' },
-    { length: 80, expected: 63, description: 'longer than 64 characters' },
-  ])(
-    'should handle names that are $description long',
-    ({ length, expected }) => {
-      expect(generateValidName('a'.repeat(length)).length).toBe(expected);
-    },
-  );
+    { length: 63, expected: 63, description: "exactly 63 characters" },
+    { length: 64, expected: 63, description: "exactly 64 characters" },
+    { length: 80, expected: 63, description: "longer than 64 characters" },
+  ])("should handle names that are $description long", ({ length, expected }) => {
+    expect(generateValidName("a".repeat(length)).length).toBe(expected);
+  });
 });
 
-describe('DiscoveredMCPTool', () => {
-  const serverName = 'mock-mcp-server';
-  const serverToolName = 'actual-server-tool-name';
-  const baseDescription = 'A test MCP tool.';
+describe("DiscoveredMCPTool", () => {
+  const serverName = "mock-mcp-server";
+  const serverToolName = "actual-server-tool-name";
+  const baseDescription = "A test MCP tool.";
   const inputSchema: Record<string, unknown> = {
-    type: 'object' as const,
-    properties: { param: { type: 'string' } },
-    required: ['param'],
+    type: "object" as const,
+    properties: { param: { type: "string" } },
+    required: ["param"],
   };
 
   let tool: DiscoveredMCPTool;
@@ -93,7 +85,7 @@ describe('DiscoveredMCPTool', () => {
       inputSchema,
     );
     // Clear allowlist before each relevant test, especially for shouldConfirmExecute
-    const invocation = tool.build({ param: 'mock' }) as any;
+    const invocation = tool.build({ param: "mock" }) as any;
     invocation.constructor.allowlist.clear();
   });
 
@@ -101,8 +93,8 @@ describe('DiscoveredMCPTool', () => {
     vi.restoreAllMocks();
   });
 
-  describe('constructor', () => {
-    it('should set properties correctly', () => {
+  describe("constructor", () => {
+    it("should set properties correctly", () => {
       expect(tool.name).toBe(serverToolName);
       expect(tool.schema.name).toBe(serverToolName);
       expect(tool.schema.description).toBe(baseDescription);
@@ -112,16 +104,16 @@ describe('DiscoveredMCPTool', () => {
     });
   });
 
-  describe('execute', () => {
-    it('should call mcpTool.callTool with correct parameters and format display output', async () => {
-      const params = { param: 'testValue' };
+  describe("execute", () => {
+    it("should call mcpTool.callTool with correct parameters and format display output", async () => {
+      const params = { param: "testValue" };
       const mockToolSuccessResultObject = {
         success: true,
-        details: 'executed',
+        details: "executed",
       };
       const mockFunctionResponseContent = [
         {
-          type: 'text',
+          type: "text",
           text: JSON.stringify(mockToolSuccessResultObject),
         },
       ];
@@ -136,94 +128,79 @@ describe('DiscoveredMCPTool', () => {
       mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
 
       const invocation = tool.build(params);
-      const toolResult: ToolResult = await invocation.execute(
-        new AbortController().signal,
-      );
+      const toolResult: ToolResult = await invocation.execute(new AbortController().signal);
 
-      expect(mockCallTool).toHaveBeenCalledWith([
-        { name: serverToolName, args: params },
-      ]);
+      expect(mockCallTool).toHaveBeenCalledWith([{ name: serverToolName, args: params }]);
 
-      const stringifiedResponseContent = JSON.stringify(
-        mockToolSuccessResultObject,
-      );
-      expect(toolResult.llmContent).toEqual([
-        { text: stringifiedResponseContent },
-      ]);
+      const stringifiedResponseContent = JSON.stringify(mockToolSuccessResultObject);
+      expect(toolResult.llmContent).toEqual([{ text: stringifiedResponseContent }]);
       expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
     });
 
-    it('should handle empty result from getStringifiedResultForDisplay', async () => {
-      const params = { param: 'testValue' };
+    it("should handle empty result from getStringifiedResultForDisplay", async () => {
+      const params = { param: "testValue" };
       const mockMcpToolResponsePartsEmpty: Part[] = [];
       mockCallTool.mockResolvedValue(mockMcpToolResponsePartsEmpty);
       const invocation = tool.build(params);
-      const toolResult: ToolResult = await invocation.execute(
-        new AbortController().signal,
-      );
-      expect(toolResult.returnDisplay).toBe('```json\n[]\n```');
-      expect(toolResult.llmContent).toEqual([
-        { text: '[Error: Could not parse tool response]' },
-      ]);
+      const toolResult: ToolResult = await invocation.execute(new AbortController().signal);
+      expect(toolResult.returnDisplay).toBe("```json\n[]\n```");
+      expect(toolResult.llmContent).toEqual([{ text: "[Error: Could not parse tool response]" }]);
     });
 
-    it('should propagate rejection if mcpTool.callTool rejects', async () => {
-      const params = { param: 'failCase' };
-      const expectedError = new Error('MCP call failed');
+    it("should propagate rejection if mcpTool.callTool rejects", async () => {
+      const params = { param: "failCase" };
+      const expectedError = new Error("MCP call failed");
       mockCallTool.mockRejectedValue(expectedError);
 
       const invocation = tool.build(params);
-      await expect(
-        invocation.execute(new AbortController().signal),
-      ).rejects.toThrow(expectedError);
+      await expect(invocation.execute(new AbortController().signal)).rejects.toThrow(expectedError);
     });
 
     it.each([
-      { isErrorValue: true, description: 'true (bool)' },
-      { isErrorValue: 'true', description: '"true" (str)' },
-    ])(
-      'should return a structured error if MCP tool reports an error',
-      async ({ isErrorValue }) => {
-        const tool = new DiscoveredMCPTool(
-          mockCallableToolInstance,
-          serverName,
-          serverToolName,
-          baseDescription,
-          inputSchema,
-        );
-        const params = { param: 'isErrorTrueCase' };
-        const functionCall = {
-          name: serverToolName,
-          args: params,
-        };
-
-        const errorResponse = { isError: isErrorValue };
-        const mockMcpToolResponseParts: Part[] = [
-          {
-            functionResponse: {
-              name: serverToolName,
-              response: { error: errorResponse },
-            },
+      { isErrorValue: true, description: "true (bool)" },
+      { isErrorValue: "true", description: '"true" (str)' },
+    ])("should return a structured error if MCP tool reports an error", async ({
+      isErrorValue,
+    }) => {
+      const tool = new DiscoveredMCPTool(
+        mockCallableToolInstance,
+        serverName,
+        serverToolName,
+        baseDescription,
+        inputSchema,
+      );
+      const params = { param: "isErrorTrueCase" };
+      const functionCall = {
+        name: serverToolName,
+        args: params,
+      };
+
+      const errorResponse = { isError: isErrorValue };
+      const mockMcpToolResponseParts: Part[] = [
+        {
+          functionResponse: {
+            name: serverToolName,
+            response: { error: errorResponse },
           },
-        ];
-        mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
-        const expectedErrorMessage = `MCP tool '${
-          serverToolName
-        }' reported tool error for function call: ${safeJsonStringify(
-          functionCall,
-        )} with response: ${safeJsonStringify(mockMcpToolResponseParts)}`;
-        const invocation = tool.build(params);
-        const result = await invocation.execute(new AbortController().signal);
+        },
+      ];
+      mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
+      const expectedErrorMessage = `MCP tool '${
+        serverToolName
+      }' reported tool error for function call: ${safeJsonStringify(
+        functionCall,
+      )} with response: ${safeJsonStringify(mockMcpToolResponseParts)}`;
+      const invocation = tool.build(params);
+      const result = await invocation.execute(new AbortController().signal);
 
-        expect(result.error?.type).toBe(ToolErrorType.MCP_TOOL_ERROR);
-        expect(result.llmContent).toBe(expectedErrorMessage);
-        expect(result.returnDisplay).toContain(
-          `Error: MCP tool '${serverToolName}' reported an error.`,
-        );
-      },
-    );
+      expect(result.error?.type).toBe(ToolErrorType.MCP_TOOL_ERROR);
+      expect(result.llmContent).toBe(expectedErrorMessage);
+      expect(result.returnDisplay).toContain(
+        `Error: MCP tool '${serverToolName}' reported an error.`,
+      );
+    });
 
-    it('should return a structured error if MCP tool reports a top-level isError (spec compliant)', async () => {
+    it("should return a structured error if MCP tool reports a top-level isError (spec compliant)", async () => {
       const tool = new DiscoveredMCPTool(
         mockCallableToolInstance,
         serverName,
@@ -231,7 +208,7 @@ describe('DiscoveredMCPTool', () => {
         baseDescription,
         inputSchema,
       );
-      const params = { param: 'isErrorTopLevelCase' };
+      const params = { param: "isErrorTopLevelCase" };
       const functionCall = {
         name: serverToolName,
         args: params,
@@ -262,66 +239,59 @@ describe('DiscoveredMCPTool', () => {
     });
 
     it.each([
-      { isErrorValue: false, description: 'false (bool)' },
-      { isErrorValue: 'false', description: '"false" (str)' },
-    ])(
-      'should consider a ToolResult with isError ${description} to be a success',
-      async ({ isErrorValue }) => {
-        const tool = new DiscoveredMCPTool(
-          mockCallableToolInstance,
-          serverName,
-          serverToolName,
-          baseDescription,
-          inputSchema,
-        );
-        const params = { param: 'isErrorFalseCase' };
-        const mockToolSuccessResultObject = {
-          success: true,
-          details: 'executed',
-        };
-        const mockFunctionResponseContent = [
-          {
-            type: 'text',
-            text: JSON.stringify(mockToolSuccessResultObject),
-          },
-        ];
-
-        const errorResponse = { isError: isErrorValue };
-        const mockMcpToolResponseParts: Part[] = [
-          {
-            functionResponse: {
-              name: serverToolName,
-              response: {
-                error: errorResponse,
-                content: mockFunctionResponseContent,
-              },
+      { isErrorValue: false, description: "false (bool)" },
+      { isErrorValue: "false", description: '"false" (str)' },
+    ])("should consider a ToolResult with isError ${description} to be a success", async ({
+      isErrorValue,
+    }) => {
+      const tool = new DiscoveredMCPTool(
+        mockCallableToolInstance,
+        serverName,
+        serverToolName,
+        baseDescription,
+        inputSchema,
+      );
+      const params = { param: "isErrorFalseCase" };
+      const mockToolSuccessResultObject = {
+        success: true,
+        details: "executed",
+      };
+      const mockFunctionResponseContent = [
+        {
+          type: "text",
+          text: JSON.stringify(mockToolSuccessResultObject),
+        },
+      ];
+
+      const errorResponse = { isError: isErrorValue };
+      const mockMcpToolResponseParts: Part[] = [
+        {
+          functionResponse: {
+            name: serverToolName,
+            response: {
+              error: errorResponse,
+              content: mockFunctionResponseContent,
             },
           },
-        ];
-        mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
+        },
+      ];
+      mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
 
-        const invocation = tool.build(params);
-        const toolResult = await invocation.execute(
-          new AbortController().signal,
-        );
+      const invocation = tool.build(params);
+      const toolResult = await invocation.execute(new AbortController().signal);
 
-        const stringifiedResponseContent = JSON.stringify(
-          mockToolSuccessResultObject,
-        );
-        expect(toolResult.llmContent).toEqual([
-          { text: stringifiedResponseContent },
-        ]);
-        expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
-      },
-    );
+      const stringifiedResponseContent = JSON.stringify(mockToolSuccessResultObject);
+      expect(toolResult.llmContent).toEqual([{ text: stringifiedResponseContent }]);
+      expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
+    });
 
-    it('should handle a simple text response correctly', async () => {
-      const params = { param: 'test' };
-      const successMessage = 'This is a success message.';
+    it("should handle a simple text response correctly", async () => {
+      const params = { param: "test" };
+      const successMessage = "This is a success message.";
 
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
-          content: [{ type: 'text', text: successMessage }],
+          content: [{ type: "text", text: successMessage }],
         }),
       );
 
@@ -335,20 +305,18 @@ describe('DiscoveredMCPTool', () => {
       expect(toolResult.returnDisplay).toBe(successMessage);
 
       // 3. Verify that the underlying callTool was made correctly.
-      expect(mockCallTool).toHaveBeenCalledWith([
-        { name: serverToolName, args: params },
-      ]);
+      expect(mockCallTool).toHaveBeenCalledWith([{ name: serverToolName, args: params }]);
     });
 
-    it('should handle an AudioBlock response', async () => {
-      const params = { param: 'play' };
+    it("should handle an AudioBlock response", async () => {
+      const params = { param: "play" };
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
           content: [
             {
-              type: 'audio',
-              data: 'BASE64_AUDIO_DATA',
-              mimeType: 'audio/mp3',
+              type: "audio",
+              data: "BASE64_AUDIO_DATA",
+              mimeType: "audio/mp3",
             },
           ],
         }),
@@ -363,24 +331,24 @@ describe('DiscoveredMCPTool', () => {
         },
         {
           inlineData: {
-            mimeType: 'audio/mp3',
-            data: 'BASE64_AUDIO_DATA',
+            mimeType: "audio/mp3",
+            data: "BASE64_AUDIO_DATA",
           },
         },
       ]);
-      expect(toolResult.returnDisplay).toBe('[Audio: audio/mp3]');
+      expect(toolResult.returnDisplay).toBe("[Audio: audio/mp3]");
     });
 
-    it('should handle a ResourceLinkBlock response', async () => {
-      const params = { param: 'get' };
+    it("should handle a ResourceLinkBlock response", async () => {
+      const params = { param: "get" };
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
           content: [
             {
-              type: 'resource_link',
-              uri: 'file:///path/to/thing',
-              name: 'resource-name',
-              title: 'My Resource',
+              type: "resource_link",
+              uri: "file:///path/to/thing",
+              name: "resource-name",
+              title: "My Resource",
             },
           ],
         }),
@@ -391,25 +359,23 @@ describe('DiscoveredMCPTool', () => {
 
       expect(toolResult.llmContent).toEqual([
         {
-          text: 'Resource Link: My Resource at file:///path/to/thing',
+          text: "Resource Link: My Resource at file:///path/to/thing",
         },
       ]);
-      expect(toolResult.returnDisplay).toBe(
-        '[Link to My Resource: file:///path/to/thing]',
-      );
+      expect(toolResult.returnDisplay).toBe("[Link to My Resource: file:///path/to/thing]");
     });
 
-    it('should handle an embedded text ResourceBlock response', async () => {
-      const params = { param: 'get' };
+    it("should handle an embedded text ResourceBlock response", async () => {
+      const params = { param: "get" };
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
           content: [
             {
-              type: 'resource',
+              type: "resource",
               resource: {
-                uri: 'file:///path/to/text.txt',
-                text: 'This is the text content.',
-                mimeType: 'text/plain',
+                uri: "file:///path/to/text.txt",
+                text: "This is the text content.",
+                mimeType: "text/plain",
               },
             },
           ],
@@ -419,23 +385,21 @@ describe('DiscoveredMCPTool', () => {
       const invocation = tool.build(params);
       const toolResult = await invocation.execute(new AbortController().signal);
 
-      expect(toolResult.llmContent).toEqual([
-        { text: 'This is the text content.' },
-      ]);
-      expect(toolResult.returnDisplay).toBe('This is the text content.');
+      expect(toolResult.llmContent).toEqual([{ text: "This is the text content." }]);
+      expect(toolResult.returnDisplay).toBe("This is the text content.");
     });
 
-    it('should handle an embedded binary ResourceBlock response', async () => {
-      const params = { param: 'get' };
+    it("should handle an embedded binary ResourceBlock response", async () => {
+      const params = { param: "get" };
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
           content: [
             {
-              type: 'resource',
+              type: "resource",
               resource: {
-                uri: 'file:///path/to/data.bin',
-                blob: 'BASE64_BINARY_DATA',
-                mimeType: 'application/octet-stream',
+                uri: "file:///path/to/data.bin",
+                blob: "BASE64_BINARY_DATA",
+                mimeType: "application/octet-stream",
               },
             },
           ],
@@ -451,28 +415,26 @@ describe('DiscoveredMCPTool', () => {
         },
         {
           inlineData: {
-            mimeType: 'application/octet-stream',
-            data: 'BASE64_BINARY_DATA',
+            mimeType: "application/octet-stream",
+            data: "BASE64_BINARY_DATA",
           },
         },
       ]);
-      expect(toolResult.returnDisplay).toBe(
-        '[Embedded Resource: application/octet-stream]',
-      );
+      expect(toolResult.returnDisplay).toBe("[Embedded Resource: application/octet-stream]");
     });
 
-    it('should handle a mix of content block types', async () => {
-      const params = { param: 'complex' };
+    it("should handle a mix of content block types", async () => {
+      const params = { param: "complex" };
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
           content: [
-            { type: 'text', text: 'First part.' },
+            { type: "text", text: "First part." },
             {
-              type: 'image',
-              data: 'BASE64_IMAGE_DATA',
-              mimeType: 'image/jpeg',
+              type: "image",
+              data: "BASE64_IMAGE_DATA",
+              mimeType: "image/jpeg",
             },
-            { type: 'text', text: 'Second part.' },
+            { type: "text", text: "Second part." },
           ],
         }),
       );
@@ -481,30 +443,28 @@ describe('DiscoveredMCPTool', () => {
       const toolResult = await invocation.execute(new AbortController().signal);
 
       expect(toolResult.llmContent).toEqual([
-        { text: 'First part.' },
+        { text: "First part." },
         {
           text: `[Tool '${serverToolName}' provided the following image data with mime-type: image/jpeg]`,
         },
         {
           inlineData: {
-            mimeType: 'image/jpeg',
-            data: 'BASE64_IMAGE_DATA',
+            mimeType: "image/jpeg",
+            data: "BASE64_IMAGE_DATA",
           },
         },
-        { text: 'Second part.' },
+        { text: "Second part." },
       ]);
-      expect(toolResult.returnDisplay).toBe(
-        'First part.\n[Image: image/jpeg]\nSecond part.',
-      );
+      expect(toolResult.returnDisplay).toBe("First part.\n[Image: image/jpeg]\nSecond part.");
     });
 
-    it('should ignore unknown content block types', async () => {
-      const params = { param: 'test' };
+    it("should ignore unknown content block types", async () => {
+      const params = { param: "test" };
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
           content: [
-            { type: 'text', text: 'Valid part.' },
-            { type: 'future_block', data: 'some-data' },
+            { type: "text", text: "Valid part." },
+            { type: "future_block", data: "some-data" },
           ],
         }),
       );
@@ -512,36 +472,34 @@ describe('DiscoveredMCPTool', () => {
       const invocation = tool.build(params);
       const toolResult = await invocation.execute(new AbortController().signal);
 
-      expect(toolResult.llmContent).toEqual([{ text: 'Valid part.' }]);
-      expect(toolResult.returnDisplay).toBe(
-        'Valid part.\n[Unknown content type: future_block]',
-      );
+      expect(toolResult.llmContent).toEqual([{ text: "Valid part." }]);
+      expect(toolResult.returnDisplay).toBe("Valid part.\n[Unknown content type: future_block]");
     });
 
-    it('should handle a complex mix of content block types', async () => {
-      const params = { param: 'super-complex' };
+    it("should handle a complex mix of content block types", async () => {
+      const params = { param: "super-complex" };
       mockCallTool.mockResolvedValue(
         createSdkResponse(serverToolName, {
           content: [
-            { type: 'text', text: 'Here is a resource.' },
+            { type: "text", text: "Here is a resource." },
             {
-              type: 'resource_link',
-              uri: 'file:///path/to/resource',
-              name: 'resource-name',
-              title: 'My Resource',
+              type: "resource_link",
+              uri: "file:///path/to/resource",
+              name: "resource-name",
+              title: "My Resource",
             },
             {
-              type: 'resource',
+              type: "resource",
               resource: {
-                uri: 'file:///path/to/text.txt',
-                text: 'Embedded text content.',
-                mimeType: 'text/plain',
+                uri: "file:///path/to/text.txt",
+                text: "Embedded text content.",
+                mimeType: "text/plain",
               },
             },
             {
-              type: 'image',
-              data: 'BASE64_IMAGE_DATA',
-              mimeType: 'image/jpeg',
+              type: "image",
+              data: "BASE64_IMAGE_DATA",
+              mimeType: "image/jpeg",
             },
           ],
         }),
@@ -551,47 +509,45 @@ describe('DiscoveredMCPTool', () => {
       const toolResult = await invocation.execute(new AbortController().signal);
 
       expect(toolResult.llmContent).toEqual([
-        { text: 'Here is a resource.' },
+        { text: "Here is a resource." },
         {
-          text: 'Resource Link: My Resource at file:///path/to/resource',
+          text: "Resource Link: My Resource at file:///path/to/resource",
         },
-        { text: 'Embedded text content.' },
+        { text: "Embedded text content." },
         {
           text: `[Tool '${serverToolName}' provided the following image data with mime-type: image/jpeg]`,
         },
         {
           inlineData: {
-            mimeType: 'image/jpeg',
-            data: 'BASE64_IMAGE_DATA',
+            mimeType: "image/jpeg",
+            data: "BASE64_IMAGE_DATA",
           },
         },
       ]);
       expect(toolResult.returnDisplay).toBe(
-        'Here is a resource.\n[Link to My Resource: file:///path/to/resource]\nEmbedded text content.\n[Image: image/jpeg]',
+        "Here is a resource.\n[Link to My Resource: file:///path/to/resource]\nEmbedded text content.\n[Image: image/jpeg]",
       );
     });
 
-    describe('AbortSignal support', () => {
+    describe("AbortSignal support", () => {
       const MOCK_TOOL_DELAY = 1000;
       const ABORT_DELAY = 50;
 
-      it('should abort immediately if signal is already aborted', async () => {
-        const params = { param: 'test' };
+      it("should abort immediately if signal is already aborted", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
         controller.abort();
 
         const invocation = tool.build(params);
 
-        await expect(invocation.execute(controller.signal)).rejects.toThrow(
-          'Tool call aborted',
-        );
+        await expect(invocation.execute(controller.signal)).rejects.toThrow("Tool call aborted");
 
         // Tool should not be called if signal is already aborted
         expect(mockCallTool).not.toHaveBeenCalled();
       });
 
-      it('should abort during tool execution', async () => {
-        const params = { param: 'test' };
+      it("should abort during tool execution", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
 
         // Mock a delayed response to simulate long-running tool
@@ -604,7 +560,7 @@ describe('DiscoveredMCPTool', () => {
                     functionResponse: {
                       name: serverToolName,
                       response: {
-                        content: [{ type: 'text', text: 'Success' }],
+                        content: [{ type: "text", text: "Success" }],
                       },
                     },
                   },
@@ -619,31 +575,29 @@ describe('DiscoveredMCPTool', () => {
         // Abort after a short delay to simulate cancellation during execution
         setTimeout(() => controller.abort(), ABORT_DELAY);
 
-        await expect(promise).rejects.toThrow('Tool call aborted');
+        await expect(promise).rejects.toThrow("Tool call aborted");
       });
 
-      it('should complete successfully if not aborted', async () => {
-        const params = { param: 'test' };
+      it("should complete successfully if not aborted", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
 
         mockCallTool.mockResolvedValue(
           createSdkResponse(serverToolName, {
-            content: [{ type: 'text', text: 'Success' }],
+            content: [{ type: "text", text: "Success" }],
           }),
         );
 
         const invocation = tool.build(params);
         const result = await invocation.execute(controller.signal);
 
-        expect(result.llmContent).toEqual([{ text: 'Success' }]);
-        expect(result.returnDisplay).toBe('Success');
-        expect(mockCallTool).toHaveBeenCalledWith([
-          { name: serverToolName, args: params },
-        ]);
+        expect(result.llmContent).toEqual([{ text: "Success" }]);
+        expect(result.returnDisplay).toBe("Success");
+        expect(mockCallTool).toHaveBeenCalledWith([{ name: serverToolName, args: params }]);
       });
 
-      it('should handle tool error even when abort signal is provided', async () => {
-        const params = { param: 'test' };
+      it("should handle tool error even when abort signal is provided", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
 
         mockCallTool.mockResolvedValue(
@@ -659,69 +613,64 @@ describe('DiscoveredMCPTool', () => {
         );
       });
 
-      it('should handle callTool rejection with abort signal', async () => {
-        const params = { param: 'test' };
+      it("should handle callTool rejection with abort signal", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
-        const expectedError = new Error('Network error');
+        const expectedError = new Error("Network error");
 
         mockCallTool.mockRejectedValue(expectedError);
 
         const invocation = tool.build(params);
 
-        await expect(invocation.execute(controller.signal)).rejects.toThrow(
-          expectedError,
-        );
+        await expect(invocation.execute(controller.signal)).rejects.toThrow(expectedError);
       });
 
       it.each([
         {
-          name: 'successful completion',
+          name: "successful completion",
           setup: () => {
             mockCallTool.mockResolvedValue(
               createSdkResponse(serverToolName, {
-                content: [{ type: 'text', text: 'Success' }],
+                content: [{ type: "text", text: "Success" }],
               }),
             );
           },
           expectError: false,
         },
         {
-          name: 'error',
+          name: "error",
           setup: () => {
-            mockCallTool.mockRejectedValue(new Error('Tool execution failed'));
+            mockCallTool.mockRejectedValue(new Error("Tool execution failed"));
           },
           expectError: true,
         },
-      ])(
-        'should cleanup event listeners properly on $name',
-        async ({ setup, expectError }) => {
-          const params = { param: 'test' };
-          const controller = new AbortController();
-
-          setup();
-
-          const invocation = tool.build(params);
-
-          if (expectError) {
-            try {
-              await invocation.execute(controller.signal);
-            } catch (_error) {
-              // Expected error
-            }
-          } else {
+      ])("should cleanup event listeners properly on $name", async ({ setup, expectError }) => {
+        const params = { param: "test" };
+        const controller = new AbortController();
+
+        setup();
+
+        const invocation = tool.build(params);
+
+        if (expectError) {
+          try {
             await invocation.execute(controller.signal);
+          } catch (_error) {
+            // Expected error
           }
+        } else {
+          await invocation.execute(controller.signal);
+        }
 
-          // Verify cleanup by aborting after execution
-          controller.abort();
-          expect(controller.signal.aborted).toBe(true);
-        },
-      );
+        // Verify cleanup by aborting after execution
+        controller.abort();
+        expect(controller.signal.aborted).toBe(true);
+      });
     });
   });
 
-  describe('shouldConfirmExecute', () => {
-    it('should return false if trust is true', async () => {
+  describe("shouldConfirmExecute", () => {
+    it("should return false if trust is true", async () => {
       const trustedTool = new DiscoveredMCPTool(
         mockCallableToolInstance,
         serverName,
@@ -732,110 +681,87 @@ describe('DiscoveredMCPTool', () => {
         undefined,
         { isTrustedFolder: () => true } as any,
       );
-      const invocation = trustedTool.build({ param: 'mock' });
-      expect(
-        await invocation.shouldConfirmExecute(new AbortController().signal),
-      ).toBe(false);
+      const invocation = trustedTool.build({ param: "mock" });
+      expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
     });
 
-    it('should return false if server is allowlisted', async () => {
-      const invocation = tool.build({ param: 'mock' }) as any;
+    it("should return false if server is allowlisted", async () => {
+      const invocation = tool.build({ param: "mock" }) as any;
       invocation.constructor.allowlist.add(serverName);
-      expect(
-        await invocation.shouldConfirmExecute(new AbortController().signal),
-      ).toBe(false);
+      expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
     });
 
-    it('should return false if tool is allowlisted', async () => {
+    it("should return false if tool is allowlisted", async () => {
       const toolAllowlistKey = `${serverName}.${serverToolName}`;
-      const invocation = tool.build({ param: 'mock' }) as any;
+      const invocation = tool.build({ param: "mock" }) as any;
       invocation.constructor.allowlist.add(toolAllowlistKey);
-      expect(
-        await invocation.shouldConfirmExecute(new AbortController().signal),
-      ).toBe(false);
+      expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
     });
 
-    it('should return confirmation details if not trusted and not allowlisted', async () => {
-      const invocation = tool.build({ param: 'mock' });
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+    it("should return confirmation details if not trusted and not allowlisted", async () => {
+      const invocation = tool.build({ param: "mock" });
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
-      if (confirmation && confirmation.type === 'mcp') {
+      if (confirmation && confirmation.type === "mcp") {
         // Type guard for ToolMcpConfirmationDetails
-        expect(confirmation.type).toBe('mcp');
+        expect(confirmation.type).toBe("mcp");
         expect(confirmation.serverName).toBe(serverName);
         expect(confirmation.toolName).toBe(serverToolName);
       } else if (confirmation) {
         // Handle other possible confirmation types if necessary, or strengthen test if only MCP is expected
-        throw new Error(
-          'Confirmation was not of expected type MCP or was false',
-        );
+        throw new Error("Confirmation was not of expected type MCP or was false");
       } else {
-        throw new Error(
-          'Confirmation details not in expected format or was false',
-        );
+        throw new Error("Confirmation details not in expected format or was false");
       }
     });
 
     it.each([
       {
         outcome: ToolConfirmationOutcome.ProceedAlwaysServer,
-        description: 'add server to allowlist on ProceedAlwaysServer',
+        description: "add server to allowlist on ProceedAlwaysServer",
         shouldAddServer: true,
         shouldAddTool: false,
       },
       {
         outcome: ToolConfirmationOutcome.ProceedAlwaysTool,
-        description: 'add tool to allowlist on ProceedAlwaysTool',
+        description: "add tool to allowlist on ProceedAlwaysTool",
         shouldAddServer: false,
         shouldAddTool: true,
       },
       {
         outcome: ToolConfirmationOutcome.Cancel,
-        description: 'handle Cancel confirmation outcome',
+        description: "handle Cancel confirmation outcome",
         shouldAddServer: false,
         shouldAddTool: false,
       },
       {
         outcome: ToolConfirmationOutcome.ProceedOnce,
-        description: 'handle ProceedOnce confirmation outcome',
+        description: "handle ProceedOnce confirmation outcome",
         shouldAddServer: false,
         shouldAddTool: false,
       },
-    ])(
-      'should $description',
-      async ({ outcome, shouldAddServer, shouldAddTool }) => {
-        const toolAllowlistKey = `${serverName}.${serverToolName}`;
-        const invocation = tool.build({ param: 'mock' }) as any;
-        const confirmation = await invocation.shouldConfirmExecute(
-          new AbortController().signal,
-        );
+    ])("should $description", async ({ outcome, shouldAddServer, shouldAddTool }) => {
+      const toolAllowlistKey = `${serverName}.${serverToolName}`;
+      const invocation = tool.build({ param: "mock" }) as any;
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
-        expect(confirmation).not.toBe(false);
-        if (
-          confirmation &&
-          typeof confirmation === 'object' &&
-          'onConfirm' in confirmation &&
-          typeof confirmation.onConfirm === 'function'
-        ) {
-          await confirmation.onConfirm(outcome);
-          expect(invocation.constructor.allowlist.has(serverName)).toBe(
-            shouldAddServer,
-          );
-          expect(invocation.constructor.allowlist.has(toolAllowlistKey)).toBe(
-            shouldAddTool,
-          );
-        } else {
-          throw new Error(
-            'Confirmation details or onConfirm not in expected format',
-          );
-        }
-      },
-    );
+      expect(confirmation).not.toBe(false);
+      if (
+        confirmation &&
+        typeof confirmation === "object" &&
+        "onConfirm" in confirmation &&
+        typeof confirmation.onConfirm === "function"
+      ) {
+        await confirmation.onConfirm(outcome);
+        expect(invocation.constructor.allowlist.has(serverName)).toBe(shouldAddServer);
+        expect(invocation.constructor.allowlist.has(toolAllowlistKey)).toBe(shouldAddTool);
+      } else {
+        throw new Error("Confirmation details or onConfirm not in expected format");
+      }
+    });
   });
 
-  describe('shouldConfirmExecute with folder trust', () => {
+  describe("shouldConfirmExecute with folder trust", () => {
     const mockConfig = (isTrusted: boolean | undefined) => ({
       isTrustedFolder: () => isTrusted,
     });
@@ -845,23 +771,21 @@ describe('DiscoveredMCPTool', () => {
         trust: true,
         isTrusted: true,
         shouldConfirm: false,
-        description: 'return false if trust is true and folder is trusted',
+        description: "return false if trust is true and folder is trusted",
       },
       {
         trust: true,
         isTrusted: false,
         shouldConfirm: true,
-        description:
-          'return confirmation details if trust is true but folder is not trusted',
+        description: "return confirmation details if trust is true but folder is not trusted",
       },
       {
         trust: false,
         isTrusted: true,
         shouldConfirm: true,
-        description:
-          'return confirmation details if trust is false, even if folder is trusted',
+        description: "return confirmation details if trust is false, even if folder is trusted",
       },
-    ])('should $description', async ({ trust, isTrusted, shouldConfirm }) => {
+    ])("should $description", async ({ trust, isTrusted, shouldConfirm }) => {
       const testTool = new DiscoveredMCPTool(
         mockCallableToolInstance,
         serverName,
@@ -872,23 +796,21 @@ describe('DiscoveredMCPTool', () => {
         undefined,
         mockConfig(isTrusted) as any,
       );
-      const invocation = testTool.build({ param: 'mock' });
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const invocation = testTool.build({ param: "mock" });
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       if (shouldConfirm) {
         expect(confirmation).not.toBe(false);
-        expect(confirmation).toHaveProperty('type', 'mcp');
+        expect(confirmation).toHaveProperty("type", "mcp");
       } else {
         expect(confirmation).toBe(false);
       }
     });
   });
 
-  describe('DiscoveredMCPToolInvocation', () => {
-    it('should return the stringified params from getDescription', () => {
-      const params = { param: 'testValue', param2: 'anotherOne' };
+  describe("DiscoveredMCPToolInvocation", () => {
+    it("should return the stringified params from getDescription", () => {
+      const params = { param: "testValue", param2: "anotherOne" };
       const invocation = tool.build(params);
       const description = invocation.getDescription();
       expect(description).toBe('{"param":"testValue","param2":"anotherOne"}');
diff --git a/packages/gemini-cli-core/src/tools/mcp-tool.ts b/packages/gemini-cli-core/src/tools/mcp-tool.ts
index 176c6332f..85c06380f 100644
--- a/packages/gemini-cli-core/src/tools/mcp-tool.ts
+++ b/packages/gemini-cli-core/src/tools/mcp-tool.ts
@@ -4,40 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+import type { CallableTool, FunctionCall, Part } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { ToolErrorType } from "./tool-error.js";
 import type {
   ToolCallConfirmationDetails,
   ToolInvocation,
   ToolMcpConfirmationDetails,
   ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { CallableTool, FunctionCall, Part } from '@google/genai';
-import { ToolErrorType } from './tool-error.js';
-import type { Config } from '../config/config.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 type ToolParams = Record<string, unknown>;
 
 // Discriminated union for MCP Content Blocks to ensure type safety.
 type McpTextBlock = {
-  type: 'text';
+  type: "text";
   text: string;
 };
 
 type McpMediaBlock = {
-  type: 'image' | 'audio';
+  type: "image" | "audio";
   mimeType: string;
   data: string;
 };
 
 type McpResourceBlock = {
-  type: 'resource';
+  type: "resource";
   resource: {
     text?: string;
     blob?: string;
@@ -46,22 +41,15 @@ type McpResourceBlock = {
 };
 
 type McpResourceLinkBlock = {
-  type: 'resource_link';
+  type: "resource_link";
   uri: string;
   title?: string;
   name?: string;
 };
 
-type McpContentBlock =
-  | McpTextBlock
-  | McpMediaBlock
-  | McpResourceBlock
-  | McpResourceLinkBlock;
+type McpContentBlock = McpTextBlock | McpMediaBlock | McpResourceBlock | McpResourceLinkBlock;
 
-class DiscoveredMCPToolInvocation extends BaseToolInvocation<
-  ToolParams,
-  ToolResult
-> {
+class DiscoveredMCPToolInvocation extends BaseToolInvocation<ToolParams, ToolResult> {
   private static readonly allowlist: Set<string> = new Set();
 
   constructor(
@@ -78,13 +66,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     // This enables server wildcards (e.g., "google-workspace__*")
     // while still allowing specific tool rules
 
-    super(
-      params,
-      messageBus,
-      `${serverName}__${serverToolName}`,
-      displayName,
-      serverName,
-    );
+    super(params, messageBus, `${serverName}__${serverToolName}`, displayName, serverName);
   }
 
   protected override async getConfirmationDetails(
@@ -105,8 +87,8 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     }
 
     const confirmationDetails: ToolMcpConfirmationDetails = {
-      type: 'mcp',
-      title: 'Confirm MCP Tool Execution',
+      type: "mcp",
+      title: "Confirm MCP Tool Execution",
       serverName: this.serverName,
       toolName: this.serverToolName, // Display original tool name in confirmation
       toolDisplayName: this.displayName, // Display global registry name exposed to model and user
@@ -135,7 +117,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     if (response) {
       // Check for top-level isError (MCP Spec compliant)
       const isErrorTop = (response as { isError?: boolean | string }).isError;
-      if (isErrorTop === true || isErrorTop === 'true') {
+      if (isErrorTop === true || isErrorTop === "true") {
         return true;
       }
 
@@ -143,7 +125,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
       const error = (response as { error?: McpError })?.error;
       const isError = error?.isError;
 
-      if (error && (isError === true || isError === 'true')) {
+      if (error && (isError === true || isError === "true")) {
         return true;
       }
     }
@@ -161,21 +143,21 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     // Race MCP tool call with abort signal to respect cancellation
     const rawResponseParts = await new Promise<Part[]>((resolve, reject) => {
       if (signal.aborted) {
-        const error = new Error('Tool call aborted');
-        error.name = 'AbortError';
+        const error = new Error("Tool call aborted");
+        error.name = "AbortError";
         reject(error);
         return;
       }
       const onAbort = () => {
         cleanup();
-        const error = new Error('Tool call aborted');
-        error.name = 'AbortError';
+        const error = new Error("Tool call aborted");
+        error.name = "AbortError";
         reject(error);
       };
       const cleanup = () => {
-        signal.removeEventListener('abort', onAbort);
+        signal.removeEventListener("abort", onAbort);
       };
-      signal.addEventListener('abort', onAbort, { once: true });
+      signal.addEventListener("abort", onAbort, { once: true });
 
       this.mcpTool
         .callTool(functionCalls)
@@ -219,10 +201,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class DiscoveredMCPTool extends BaseDeclarativeTool<
-  ToolParams,
-  ToolResult
-> {
+export class DiscoveredMCPTool extends BaseDeclarativeTool<ToolParams, ToolResult> {
   constructor(
     private readonly mcpTool: CallableTool,
     readonly serverName: string,
@@ -293,10 +272,7 @@ function transformTextBlock(block: McpTextBlock): Part {
   return { text: block.text };
 }
 
-function transformImageAudioBlock(
-  block: McpMediaBlock,
-  toolName: string,
-): Part[] {
+function transformImageAudioBlock(block: McpMediaBlock, toolName: string): Part[] {
   return [
     {
       text: `[Tool '${toolName}' provided the following ${
@@ -312,16 +288,13 @@ function transformImageAudioBlock(
   ];
 }
 
-function transformResourceBlock(
-  block: McpResourceBlock,
-  toolName: string,
-): Part | Part[] | null {
+function transformResourceBlock(block: McpResourceBlock, toolName: string): Part | Part[] | null {
   const resource = block.resource;
   if (resource?.text) {
     return { text: resource.text };
   }
   if (resource?.blob) {
-    const mimeType = resource.mimeType || 'application/octet-stream';
+    const mimeType = resource.mimeType || "application/octet-stream";
     return [
       {
         text: `[Tool '${toolName}' provided the following embedded resource with mime-type: ${mimeType}]`,
@@ -351,30 +324,28 @@ function transformResourceLinkBlock(block: McpResourceLinkBlock): Part {
  */
 function transformMcpContentToParts(sdkResponse: Part[]): Part[] {
   const funcResponse = sdkResponse?.[0]?.functionResponse;
-  const mcpContent = funcResponse?.response?.['content'] as McpContentBlock[];
-  const toolName = funcResponse?.name || 'unknown tool';
+  const mcpContent = funcResponse?.response?.["content"] as McpContentBlock[];
+  const toolName = funcResponse?.name || "unknown tool";
 
   if (!Array.isArray(mcpContent)) {
-    return [{ text: '[Error: Could not parse tool response]' }];
+    return [{ text: "[Error: Could not parse tool response]" }];
   }
 
-  const transformed = mcpContent.flatMap(
-    (block: McpContentBlock): Part | Part[] | null => {
-      switch (block.type) {
-        case 'text':
-          return transformTextBlock(block);
-        case 'image':
-        case 'audio':
-          return transformImageAudioBlock(block, toolName);
-        case 'resource':
-          return transformResourceBlock(block, toolName);
-        case 'resource_link':
-          return transformResourceLinkBlock(block);
-        default:
-          return null;
-      }
-    },
-  );
+  const transformed = mcpContent.flatMap((block: McpContentBlock): Part | Part[] | null => {
+    switch (block.type) {
+      case "text":
+        return transformTextBlock(block);
+      case "image":
+      case "audio":
+        return transformImageAudioBlock(block, toolName);
+      case "resource":
+        return transformResourceBlock(block, toolName);
+      case "resource_link":
+        return transformResourceLinkBlock(block);
+      default:
+        return null;
+    }
+  });
 
   return transformed.filter((part): part is Part => part !== null);
 }
@@ -388,49 +359,44 @@ function transformMcpContentToParts(sdkResponse: Part[]): Part[] {
  * @returns A formatted string representing the tool's output.
  */
 function getStringifiedResultForDisplay(rawResponse: Part[]): string {
-  const mcpContent = rawResponse?.[0]?.functionResponse?.response?.[
-    'content'
-  ] as McpContentBlock[];
+  const mcpContent = rawResponse?.[0]?.functionResponse?.response?.["content"] as McpContentBlock[];
 
   if (!Array.isArray(mcpContent)) {
-    return '```json\n' + JSON.stringify(rawResponse, null, 2) + '\n```';
+    return "```json\n" + JSON.stringify(rawResponse, null, 2) + "\n```";
   }
 
   const displayParts = mcpContent.map((block: McpContentBlock): string => {
     switch (block.type) {
-      case 'text':
+      case "text":
         return block.text;
-      case 'image':
+      case "image":
         return `[Image: ${block.mimeType}]`;
-      case 'audio':
+      case "audio":
         return `[Audio: ${block.mimeType}]`;
-      case 'resource_link':
+      case "resource_link":
         return `[Link to ${block.title || block.name}: ${block.uri}]`;
-      case 'resource':
+      case "resource":
         if (block.resource?.text) {
           return block.resource.text;
         }
-        return `[Embedded Resource: ${
-          block.resource?.mimeType || 'unknown type'
-        }]`;
+        return `[Embedded Resource: ${block.resource?.mimeType || "unknown type"}]`;
       default:
         return `[Unknown content type: ${(block as { type: string }).type}]`;
     }
   });
 
-  return displayParts.join('\n');
+  return displayParts.join("\n");
 }
 
 /** Visible for testing */
 export function generateValidName(name: string) {
   // Replace invalid characters (based on 400 error message from Gemini API) with underscores
-  let validToolname = name.replace(/[^a-zA-Z0-9_.-]/g, '_');
+  let validToolname = name.replace(/[^a-zA-Z0-9_.-]/g, "_");
 
   // If longer than 63 characters, replace middle with '___'
   // (Gemini API says max length 64, but actual limit seems to be 63)
   if (validToolname.length > 63) {
-    validToolname =
-      validToolname.slice(0, 28) + '___' + validToolname.slice(-32);
+    validToolname = validToolname.slice(0, 28) + "___" + validToolname.slice(-32);
   }
   return validToolname;
 }
diff --git a/packages/gemini-cli-core/src/tools/memoryTool.test.ts b/packages/gemini-cli-core/src/tools/memoryTool.test.ts
index fb251d37e..a4955c272 100644
--- a/packages/gemini-cli-core/src/tools/memoryTool.test.ts
+++ b/packages/gemini-cli-core/src/tools/memoryTool.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GEMINI_DIR } from "../utils/paths.js";
 import {
+  DEFAULT_CONTEXT_FILENAME,
+  getAllGeminiMdFilenames,
+  getCurrentGeminiMdFilename,
   MemoryTool,
   setGeminiMdFilename,
-  getCurrentGeminiMdFilename,
-  getAllGeminiMdFilenames,
-  DEFAULT_CONTEXT_FILENAME,
-} from './memoryTool.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+} from "./memoryTool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolConfirmationOutcome } from "./tools.js";
 
 // Mock dependencies
-vi.mock(import('node:fs/promises'), async (importOriginal) => {
+vi.mock(import("node:fs/promises"), async (importOriginal) => {
   const actual = await importOriginal();
   return {
     ...actual,
@@ -30,31 +30,28 @@ vi.mock(import('node:fs/promises'), async (importOriginal) => {
   };
 });
 
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   mkdirSync: vi.fn(),
 }));
 
-vi.mock('os');
+vi.mock("os");
 
-const MEMORY_SECTION_HEADER = '## Gemini Added Memories';
+const MEMORY_SECTION_HEADER = "## Gemini Added Memories";
 
 // Define a type for our fsAdapter to ensure consistency
 interface FsAdapter {
-  readFile: (path: string, encoding: 'utf-8') => Promise<string>;
-  writeFile: (path: string, data: string, encoding: 'utf-8') => Promise<void>;
-  mkdir: (
-    path: string,
-    options: { recursive: boolean },
-  ) => Promise<string | undefined>;
+  readFile: (path: string, encoding: "utf-8") => Promise<string>;
+  writeFile: (path: string, data: string, encoding: "utf-8") => Promise<void>;
+  mkdir: (path: string, options: { recursive: boolean }) => Promise<string | undefined>;
 }
 
-describe('MemoryTool', () => {
+describe("MemoryTool", () => {
   const mockAbortSignal = new AbortController().signal;
 
   const mockFsAdapter: {
-    readFile: Mock<FsAdapter['readFile']>;
-    writeFile: Mock<FsAdapter['writeFile']>;
-    mkdir: Mock<FsAdapter['mkdir']>;
+    readFile: Mock<FsAdapter["readFile"]>;
+    writeFile: Mock<FsAdapter["writeFile"]>;
+    mkdir: Mock<FsAdapter["mkdir"]>;
   } = {
     readFile: vi.fn(),
     writeFile: vi.fn(),
@@ -62,12 +59,10 @@ describe('MemoryTool', () => {
   };
 
   beforeEach(() => {
-    vi.mocked(os.homedir).mockReturnValue(path.join('/mock', 'home'));
+    vi.mocked(os.homedir).mockReturnValue(path.join("/mock", "home"));
     mockFsAdapter.readFile.mockReset();
     mockFsAdapter.writeFile.mockReset().mockResolvedValue(undefined);
-    mockFsAdapter.mkdir
-      .mockReset()
-      .mockResolvedValue(undefined as string | undefined);
+    mockFsAdapter.mkdir.mockReset().mockResolvedValue(undefined as string | undefined);
   });
 
   afterEach(() => {
@@ -76,73 +71,66 @@ describe('MemoryTool', () => {
     setGeminiMdFilename(DEFAULT_CONTEXT_FILENAME);
   });
 
-  describe('setGeminiMdFilename', () => {
-    it('should update currentGeminiMdFilename when a valid new name is provided', () => {
-      const newName = 'CUSTOM_CONTEXT.md';
+  describe("setGeminiMdFilename", () => {
+    it("should update currentGeminiMdFilename when a valid new name is provided", () => {
+      const newName = "CUSTOM_CONTEXT.md";
       setGeminiMdFilename(newName);
       expect(getCurrentGeminiMdFilename()).toBe(newName);
     });
 
-    it('should not update currentGeminiMdFilename if the new name is empty or whitespace', () => {
+    it("should not update currentGeminiMdFilename if the new name is empty or whitespace", () => {
       const initialName = getCurrentGeminiMdFilename(); // Get current before trying to change
-      setGeminiMdFilename('  ');
+      setGeminiMdFilename("  ");
       expect(getCurrentGeminiMdFilename()).toBe(initialName);
 
-      setGeminiMdFilename('');
+      setGeminiMdFilename("");
       expect(getCurrentGeminiMdFilename()).toBe(initialName);
     });
 
-    it('should handle an array of filenames', () => {
-      const newNames = ['CUSTOM_CONTEXT.md', 'ANOTHER_CONTEXT.md'];
+    it("should handle an array of filenames", () => {
+      const newNames = ["CUSTOM_CONTEXT.md", "ANOTHER_CONTEXT.md"];
       setGeminiMdFilename(newNames);
-      expect(getCurrentGeminiMdFilename()).toBe('CUSTOM_CONTEXT.md');
+      expect(getCurrentGeminiMdFilename()).toBe("CUSTOM_CONTEXT.md");
       expect(getAllGeminiMdFilenames()).toEqual(newNames);
     });
   });
 
-  describe('performAddMemoryEntry (static method)', () => {
+  describe("performAddMemoryEntry (static method)", () => {
     let testFilePath: string;
 
     beforeEach(() => {
-      testFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        DEFAULT_CONTEXT_FILENAME,
-      );
+      testFilePath = path.join(os.homedir(), GEMINI_DIR, DEFAULT_CONTEXT_FILENAME);
     });
 
-    it('should create section and save a fact if file does not exist', async () => {
-      mockFsAdapter.readFile.mockRejectedValue({ code: 'ENOENT' }); // Simulate file not found
-      const fact = 'The sky is blue';
+    it("should create section and save a fact if file does not exist", async () => {
+      mockFsAdapter.readFile.mockRejectedValue({ code: "ENOENT" }); // Simulate file not found
+      const fact = "The sky is blue";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
-      expect(mockFsAdapter.mkdir).toHaveBeenCalledWith(
-        path.dirname(testFilePath),
-        {
-          recursive: true,
-        },
-      );
+      expect(mockFsAdapter.mkdir).toHaveBeenCalledWith(path.dirname(testFilePath), {
+        recursive: true,
+      });
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
       const writeFileCall = mockFsAdapter.writeFile.mock.calls[0];
       expect(writeFileCall[0]).toBe(testFilePath);
       const expectedContent = `${MEMORY_SECTION_HEADER}\n- ${fact}\n`;
       expect(writeFileCall[1]).toBe(expectedContent);
-      expect(writeFileCall[2]).toBe('utf-8');
+      expect(writeFileCall[2]).toBe("utf-8");
     });
 
-    it('should create section and save a fact if file is empty', async () => {
-      mockFsAdapter.readFile.mockResolvedValue(''); // Simulate empty file
-      const fact = 'The sky is blue';
+    it("should create section and save a fact if file is empty", async () => {
+      mockFsAdapter.readFile.mockResolvedValue(""); // Simulate empty file
+      const fact = "The sky is blue";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
       const writeFileCall = mockFsAdapter.writeFile.mock.calls[0];
       const expectedContent = `${MEMORY_SECTION_HEADER}\n- ${fact}\n`;
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should add a fact to an existing section', async () => {
+    it("should add a fact to an existing section", async () => {
       const initialContent = `Some preamble.\n\n${MEMORY_SECTION_HEADER}\n- Existing fact 1\n`;
       mockFsAdapter.readFile.mockResolvedValue(initialContent);
-      const fact = 'New fact 2';
+      const fact = "New fact 2";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
@@ -151,10 +139,10 @@ describe('MemoryTool', () => {
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should add a fact to an existing empty section', async () => {
+    it("should add a fact to an existing empty section", async () => {
       const initialContent = `Some preamble.\n\n${MEMORY_SECTION_HEADER}\n`; // Empty section
       mockFsAdapter.readFile.mockResolvedValue(initialContent);
-      const fact = 'First fact in section';
+      const fact = "First fact in section";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
@@ -163,10 +151,10 @@ describe('MemoryTool', () => {
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should add a fact when other ## sections exist and preserve spacing', async () => {
+    it("should add a fact when other ## sections exist and preserve spacing", async () => {
       const initialContent = `${MEMORY_SECTION_HEADER}\n- Fact 1\n\n## Another Section\nSome other text.`;
       mockFsAdapter.readFile.mockResolvedValue(initialContent);
-      const fact = 'Fact 2';
+      const fact = "Fact 2";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
@@ -176,26 +164,26 @@ describe('MemoryTool', () => {
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should correctly trim and add a fact that starts with a dash', async () => {
+    it("should correctly trim and add a fact that starts with a dash", async () => {
       mockFsAdapter.readFile.mockResolvedValue(`${MEMORY_SECTION_HEADER}\n`);
-      const fact = '- - My fact with dashes';
+      const fact = "- - My fact with dashes";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
       const writeFileCall = mockFsAdapter.writeFile.mock.calls[0];
       const expectedContent = `${MEMORY_SECTION_HEADER}\n- My fact with dashes\n`;
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should handle error from fsAdapter.writeFile', async () => {
-      mockFsAdapter.readFile.mockResolvedValue('');
-      mockFsAdapter.writeFile.mockRejectedValue(new Error('Disk full'));
-      const fact = 'This will fail';
+    it("should handle error from fsAdapter.writeFile", async () => {
+      mockFsAdapter.readFile.mockResolvedValue("");
+      mockFsAdapter.writeFile.mockRejectedValue(new Error("Disk full"));
+      const fact = "This will fail";
       await expect(
         MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter),
-      ).rejects.toThrow('[MemoryTool] Failed to add memory entry: Disk full');
+      ).rejects.toThrow("[MemoryTool] Failed to add memory entry: Disk full");
     });
   });
 
-  describe('execute (instance method)', () => {
+  describe("execute (instance method)", () => {
     let memoryTool: MemoryTool;
     let performAddMemoryEntrySpy: Mock<typeof MemoryTool.performAddMemoryEntry>;
 
@@ -203,36 +191,32 @@ describe('MemoryTool', () => {
       memoryTool = new MemoryTool();
       // Spy on the static method for these tests
       performAddMemoryEntrySpy = vi
-        .spyOn(MemoryTool, 'performAddMemoryEntry')
-        .mockResolvedValue(undefined) as Mock<
-        typeof MemoryTool.performAddMemoryEntry
-      >;
+        .spyOn(MemoryTool, "performAddMemoryEntry")
+        .mockResolvedValue(undefined) as Mock<typeof MemoryTool.performAddMemoryEntry>;
       // Cast needed as spyOn returns MockInstance
     });
 
-    it('should have correct name, displayName, description, and schema', () => {
-      expect(memoryTool.name).toBe('save_memory');
-      expect(memoryTool.displayName).toBe('SaveMemory');
-      expect(memoryTool.description).toContain(
-        'Saves a specific piece of information',
-      );
+    it("should have correct name, displayName, description, and schema", () => {
+      expect(memoryTool.name).toBe("save_memory");
+      expect(memoryTool.displayName).toBe("SaveMemory");
+      expect(memoryTool.description).toContain("Saves a specific piece of information");
       expect(memoryTool.schema).toBeDefined();
-      expect(memoryTool.schema.name).toBe('save_memory');
+      expect(memoryTool.schema.name).toBe("save_memory");
       expect(memoryTool.schema.parametersJsonSchema).toStrictEqual({
-        type: 'object',
+        type: "object",
         properties: {
           fact: {
-            type: 'string',
+            type: "string",
             description:
-              'The specific fact or piece of information to remember. Should be a clear, self-contained statement.',
+              "The specific fact or piece of information to remember. Should be a clear, self-contained statement.",
           },
         },
-        required: ['fact'],
+        required: ["fact"],
       });
     });
 
-    it('should call performAddMemoryEntry with correct parameters and return success', async () => {
-      const params = { fact: 'The sky is blue' };
+    it("should call performAddMemoryEntry with correct parameters and return success", async () => {
+      const params = { fact: "The sky is blue" };
       const invocation = memoryTool.build(params);
       const result = await invocation.execute(mockAbortSignal);
       // Use getCurrentGeminiMdFilename for the default expectation before any setGeminiMdFilename calls in a test
@@ -255,14 +239,12 @@ describe('MemoryTool', () => {
         expectedFsArgument,
       );
       const successMessage = `Okay, I've remembered that: "${params.fact}"`;
-      expect(result.llmContent).toBe(
-        JSON.stringify({ success: true, message: successMessage }),
-      );
+      expect(result.llmContent).toBe(JSON.stringify({ success: true, message: successMessage }));
       expect(result.returnDisplay).toBe(successMessage);
     });
 
-    it('should return an error if fact is empty', async () => {
-      const params = { fact: ' ' }; // Empty fact
+    it("should return an error if fact is empty", async () => {
+      const params = { fact: " " }; // Empty fact
       expect(memoryTool.validateToolParams(params)).toBe(
         'Parameter "fact" must be a non-empty string.',
       );
@@ -271,11 +253,9 @@ describe('MemoryTool', () => {
       );
     });
 
-    it('should handle errors from performAddMemoryEntry', async () => {
-      const params = { fact: 'This will fail' };
-      const underlyingError = new Error(
-        '[MemoryTool] Failed to add memory entry: Disk full',
-      );
+    it("should handle errors from performAddMemoryEntry", async () => {
+      const params = { fact: "This will fail" };
+      const underlyingError = new Error("[MemoryTool] Failed to add memory entry: Disk full");
       performAddMemoryEntrySpy.mockRejectedValue(underlyingError);
 
       const invocation = memoryTool.build(params);
@@ -287,59 +267,49 @@ describe('MemoryTool', () => {
           error: `Failed to save memory. Detail: ${underlyingError.message}`,
         }),
       );
-      expect(result.returnDisplay).toBe(
-        `Error saving memory: ${underlyingError.message}`,
-      );
-      expect(result.error?.type).toBe(
-        ToolErrorType.MEMORY_TOOL_EXECUTION_ERROR,
-      );
+      expect(result.returnDisplay).toBe(`Error saving memory: ${underlyingError.message}`);
+      expect(result.error?.type).toBe(ToolErrorType.MEMORY_TOOL_EXECUTION_ERROR);
     });
   });
 
-  describe('shouldConfirmExecute', () => {
+  describe("shouldConfirmExecute", () => {
     let memoryTool: MemoryTool;
 
     beforeEach(() => {
       memoryTool = new MemoryTool();
       // Clear the allowlist before each test
-      const invocation = memoryTool.build({ fact: 'mock-fact' });
+      const invocation = memoryTool.build({ fact: "mock-fact" });
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (invocation.constructor as any).allowlist.clear();
       // Mock fs.readFile to return empty string (file doesn't exist)
-      vi.mocked(fs.readFile).mockResolvedValue('');
+      vi.mocked(fs.readFile).mockResolvedValue("");
     });
 
-    it('should return confirmation details when memory file is not allowlisted', async () => {
-      const params = { fact: 'Test fact' };
+    it("should return confirmation details when memory file is not allowlisted", async () => {
+      const params = { fact: "Test fact" };
       const invocation = memoryTool.build(params);
       const result = await invocation.shouldConfirmExecute(mockAbortSignal);
 
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
-        const expectedPath = path.join('~', GEMINI_DIR, 'GEMINI.md');
+      if (result && result.type === "edit") {
+        const expectedPath = path.join("~", GEMINI_DIR, "GEMINI.md");
         expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
-        expect(result.fileName).toContain(
-          path.join('mock', 'home', GEMINI_DIR),
-        );
-        expect(result.fileName).toContain('GEMINI.md');
-        expect(result.fileDiff).toContain('Index: GEMINI.md');
-        expect(result.fileDiff).toContain('+## Gemini Added Memories');
-        expect(result.fileDiff).toContain('+- Test fact');
-        expect(result.originalContent).toBe('');
-        expect(result.newContent).toContain('## Gemini Added Memories');
-        expect(result.newContent).toContain('- Test fact');
+        expect(result.fileName).toContain(path.join("mock", "home", GEMINI_DIR));
+        expect(result.fileName).toContain("GEMINI.md");
+        expect(result.fileDiff).toContain("Index: GEMINI.md");
+        expect(result.fileDiff).toContain("+## Gemini Added Memories");
+        expect(result.fileDiff).toContain("+- Test fact");
+        expect(result.originalContent).toBe("");
+        expect(result.newContent).toContain("## Gemini Added Memories");
+        expect(result.newContent).toContain("- Test fact");
       }
     });
 
-    it('should return false when memory file is already allowlisted', async () => {
-      const params = { fact: 'Test fact' };
-      const memoryFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        getCurrentGeminiMdFilename(),
-      );
+    it("should return false when memory file is already allowlisted", async () => {
+      const params = { fact: "Test fact" };
+      const memoryFilePath = path.join(os.homedir(), GEMINI_DIR, getCurrentGeminiMdFilename());
 
       const invocation = memoryTool.build(params);
       // Add the memory file to the allowlist
@@ -351,13 +321,9 @@ describe('MemoryTool', () => {
       expect(result).toBe(false);
     });
 
-    it('should add memory file to allowlist when ProceedAlways is confirmed', async () => {
-      const params = { fact: 'Test fact' };
-      const memoryFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        getCurrentGeminiMdFilename(),
-      );
+    it("should add memory file to allowlist when ProceedAlways is confirmed", async () => {
+      const params = { fact: "Test fact" };
+      const memoryFilePath = path.join(os.homedir(), GEMINI_DIR, getCurrentGeminiMdFilename());
 
       const invocation = memoryTool.build(params);
       const result = await invocation.shouldConfirmExecute(mockAbortSignal);
@@ -365,7 +331,7 @@ describe('MemoryTool', () => {
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
+      if (result && result.type === "edit") {
         // Simulate the onConfirm callback
         await result.onConfirm(ToolConfirmationOutcome.ProceedAlways);
 
@@ -377,13 +343,9 @@ describe('MemoryTool', () => {
       }
     });
 
-    it('should not add memory file to allowlist when other outcomes are confirmed', async () => {
-      const params = { fact: 'Test fact' };
-      const memoryFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        getCurrentGeminiMdFilename(),
-      );
+    it("should not add memory file to allowlist when other outcomes are confirmed", async () => {
+      const params = { fact: "Test fact" };
+      const memoryFilePath = path.join(os.homedir(), GEMINI_DIR, getCurrentGeminiMdFilename());
 
       const invocation = memoryTool.build(params);
       const result = await invocation.shouldConfirmExecute(mockAbortSignal);
@@ -391,7 +353,7 @@ describe('MemoryTool', () => {
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
+      if (result && result.type === "edit") {
         // Simulate the onConfirm callback with different outcomes
         await result.onConfirm(ToolConfirmationOutcome.ProceedOnce);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -403,10 +365,9 @@ describe('MemoryTool', () => {
       }
     });
 
-    it('should handle existing memory file with content', async () => {
-      const params = { fact: 'New fact' };
-      const existingContent =
-        'Some existing content.\n\n## Gemini Added Memories\n- Old fact\n';
+    it("should handle existing memory file with content", async () => {
+      const params = { fact: "New fact" };
+      const existingContent = "Some existing content.\n\n## Gemini Added Memories\n- Old fact\n";
 
       // Mock fs.readFile to return existing content
       vi.mocked(fs.readFile).mockResolvedValue(existingContent);
@@ -417,14 +378,14 @@ describe('MemoryTool', () => {
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
-        const expectedPath = path.join('~', GEMINI_DIR, 'GEMINI.md');
+      if (result && result.type === "edit") {
+        const expectedPath = path.join("~", GEMINI_DIR, "GEMINI.md");
         expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
-        expect(result.fileDiff).toContain('Index: GEMINI.md');
-        expect(result.fileDiff).toContain('+- New fact');
+        expect(result.fileDiff).toContain("Index: GEMINI.md");
+        expect(result.fileDiff).toContain("+- New fact");
         expect(result.originalContent).toBe(existingContent);
-        expect(result.newContent).toContain('- Old fact');
-        expect(result.newContent).toContain('- New fact');
+        expect(result.newContent).toContain("- Old fact");
+        expect(result.newContent).toContain("- New fact");
       }
     });
   });
diff --git a/packages/gemini-cli-core/src/tools/memoryTool.ts b/packages/gemini-cli-core/src/tools/memoryTool.ts
index da4a54c11..65d48354a 100644
--- a/packages/gemini-cli-core/src/tools/memoryTool.ts
+++ b/packages/gemini-cli-core/src/tools/memoryTool.ts
@@ -4,42 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolEditConfirmationDetails, ToolResult } from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { FunctionDeclaration } from '@google/genai';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import * as Diff from 'diff';
-import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
-import { tildeifyPath } from '../utils/paths.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { ToolErrorType } from './tool-error.js';
-import { MEMORY_TOOL_NAME } from './tool-names.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FunctionDeclaration } from "@google/genai";
+import * as Diff from "diff";
+import { Storage } from "../config/storage.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { tildeifyPath } from "../utils/paths.js";
+import { DEFAULT_DIFF_OPTIONS } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { MEMORY_TOOL_NAME } from "./tool-names.js";
+import type { ToolEditConfirmationDetails, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 const memoryToolSchemaData: FunctionDeclaration = {
   name: MEMORY_TOOL_NAME,
   description:
-    'Saves a specific piece of information or fact to your long-term memory. Use this when the user explicitly asks you to remember something, or when they state a clear, concise fact that seems important to retain for future interactions.',
+    "Saves a specific piece of information or fact to your long-term memory. Use this when the user explicitly asks you to remember something, or when they state a clear, concise fact that seems important to retain for future interactions.",
   parametersJsonSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       fact: {
-        type: 'string',
+        type: "string",
         description:
-          'The specific fact or piece of information to remember. Should be a clear, self-contained statement.',
+          "The specific fact or piece of information to remember. Should be a clear, self-contained statement.",
       },
     },
-    required: ['fact'],
+    required: ["fact"],
   },
 };
 
@@ -61,8 +53,8 @@ Do NOT use this tool:
 
 - \`fact\` (string, required): The specific fact or piece of information to remember. This should be a clear, self-contained statement. For example, if the user says "My favorite color is blue", the fact would be "My favorite color is blue".`;
 
-export const DEFAULT_CONTEXT_FILENAME = 'GEMINI.md';
-export const MEMORY_SECTION_HEADER = '## Gemini Added Memories';
+export const DEFAULT_CONTEXT_FILENAME = "GEMINI.md";
+export const MEMORY_SECTION_HEADER = "## Gemini Added Memories";
 
 // This variable will hold the currently configured filename for GEMINI.md context files.
 // It defaults to DEFAULT_CONTEXT_FILENAME but can be overridden by setGeminiMdFilename.
@@ -73,7 +65,7 @@ export function setGeminiMdFilename(newFilename: string | string[]): void {
     if (newFilename.length > 0) {
       currentGeminiMdFilename = newFilename.map((name) => name.trim());
     }
-  } else if (newFilename && newFilename.trim() !== '') {
+  } else if (newFilename && newFilename.trim() !== "") {
     currentGeminiMdFilename = newFilename.trim();
   }
 }
@@ -106,12 +98,10 @@ export function getGlobalMemoryFilePath(): string {
  * Ensures proper newline separation before appending content.
  */
 function ensureNewlineSeparation(currentContent: string): string {
-  if (currentContent.length === 0) return '';
-  if (currentContent.endsWith('\n\n') || currentContent.endsWith('\r\n\r\n'))
-    return '';
-  if (currentContent.endsWith('\n') || currentContent.endsWith('\r\n'))
-    return '\n';
-  return '\n\n';
+  if (currentContent.length === 0) return "";
+  if (currentContent.endsWith("\n\n") || currentContent.endsWith("\r\n\r\n")) return "";
+  if (currentContent.endsWith("\n") || currentContent.endsWith("\r\n")) return "\n";
+  return "\n\n";
 }
 
 /**
@@ -119,11 +109,11 @@ function ensureNewlineSeparation(currentContent: string): string {
  */
 async function readMemoryFileContent(): Promise<string> {
   try {
-    return await fs.readFile(getGlobalMemoryFilePath(), 'utf-8');
+    return await fs.readFile(getGlobalMemoryFilePath(), "utf-8");
   } catch (err) {
     const error = err as Error & { code?: string };
-    if (!(error instanceof Error) || error.code !== 'ENOENT') throw err;
-    return '';
+    if (!(error instanceof Error) || error.code !== "ENOENT") throw err;
+    return "";
   }
 }
 
@@ -132,7 +122,7 @@ async function readMemoryFileContent(): Promise<string> {
  */
 function computeNewContent(currentContent: string, fact: string): string {
   let processedText = fact.trim();
-  processedText = processedText.replace(/^(-+\s*)+/, '').trim();
+  processedText = processedText.replace(/^(-+\s*)+/, "").trim();
   const newMemoryItem = `- ${processedText}`;
 
   const headerIndex = currentContent.indexOf(MEMORY_SECTION_HEADER);
@@ -140,24 +130,16 @@ function computeNewContent(currentContent: string, fact: string): string {
   if (headerIndex === -1) {
     // Header not found, append header and then the entry
     const separator = ensureNewlineSeparation(currentContent);
-    return (
-      currentContent +
-      `${separator}${MEMORY_SECTION_HEADER}\n${newMemoryItem}\n`
-    );
+    return currentContent + `${separator}${MEMORY_SECTION_HEADER}\n${newMemoryItem}\n`;
   } else {
     // Header found, find where to insert the new memory entry
     const startOfSectionContent = headerIndex + MEMORY_SECTION_HEADER.length;
-    let endOfSectionIndex = currentContent.indexOf(
-      '\n## ',
-      startOfSectionContent,
-    );
+    let endOfSectionIndex = currentContent.indexOf("\n## ", startOfSectionContent);
     if (endOfSectionIndex === -1) {
       endOfSectionIndex = currentContent.length; // End of file
     }
 
-    const beforeSectionMarker = currentContent
-      .substring(0, startOfSectionContent)
-      .trimEnd();
+    const beforeSectionMarker = currentContent.substring(0, startOfSectionContent).trimEnd();
     let sectionContent = currentContent
       .substring(startOfSectionContent, endOfSectionIndex)
       .trimEnd();
@@ -166,15 +148,12 @@ function computeNewContent(currentContent: string, fact: string): string {
     sectionContent += `\n${newMemoryItem}`;
     return (
       `${beforeSectionMarker}\n${sectionContent.trimStart()}\n${afterSectionMarker}`.trimEnd() +
-      '\n'
+      "\n"
     );
   }
 }
 
-class MemoryToolInvocation extends BaseToolInvocation<
-  SaveMemoryParams,
-  ToolResult
-> {
+class MemoryToolInvocation extends BaseToolInvocation<SaveMemoryParams, ToolResult> {
   private static readonly allowlist: Set<string> = new Set();
 
   constructor(
@@ -209,13 +188,13 @@ class MemoryToolInvocation extends BaseToolInvocation<
       fileName,
       currentContent,
       newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Memory Save: ${tildeifyPath(memoryFilePath)}`,
       fileName: memoryFilePath,
       filePath: memoryFilePath,
@@ -240,11 +219,7 @@ class MemoryToolInvocation extends BaseToolInvocation<
         await fs.mkdir(path.dirname(getGlobalMemoryFilePath()), {
           recursive: true,
         });
-        await fs.writeFile(
-          getGlobalMemoryFilePath(),
-          modified_content,
-          'utf-8',
-        );
+        await fs.writeFile(getGlobalMemoryFilePath(), modified_content, "utf-8");
         const successMessage = `Okay, I've updated the memory file with your modifications.`;
         return {
           llmContent: JSON.stringify({
@@ -255,15 +230,11 @@ class MemoryToolInvocation extends BaseToolInvocation<
         };
       } else {
         // Use the normal memory entry logic
-        await MemoryTool.performAddMemoryEntry(
-          fact,
-          getGlobalMemoryFilePath(),
-          {
-            readFile: fs.readFile,
-            writeFile: fs.writeFile,
-            mkdir: fs.mkdir,
-          },
-        );
+        await MemoryTool.performAddMemoryEntry(fact, getGlobalMemoryFilePath(), {
+          readFile: fs.readFile,
+          writeFile: fs.writeFile,
+          mkdir: fs.mkdir,
+        });
         const successMessage = `Okay, I've remembered that: "${fact}"`;
         return {
           llmContent: JSON.stringify({
@@ -274,11 +245,8 @@ class MemoryToolInvocation extends BaseToolInvocation<
         };
       }
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      console.warn(
-        `[MemoryTool] Error executing save_memory for fact "${fact}": ${errorMessage}`,
-      );
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.warn(`[MemoryTool] Error executing save_memory for fact "${fact}": ${errorMessage}`);
       return {
         llmContent: JSON.stringify({
           success: false,
@@ -303,7 +271,7 @@ export class MemoryTool
   constructor(messageBus?: MessageBus) {
     super(
       MemoryTool.Name,
-      'SaveMemory',
+      "SaveMemory",
       memoryToolDescription,
       Kind.Think,
       memoryToolSchemaData.parametersJsonSchema as Record<string, unknown>,
@@ -313,10 +281,8 @@ export class MemoryTool
     );
   }
 
-  protected override validateToolParamValues(
-    params: SaveMemoryParams,
-  ): string | null {
-    if (params.fact.trim() === '') {
+  protected override validateToolParamValues(params: SaveMemoryParams): string | null {
+    if (params.fact.trim() === "") {
       return 'Parameter "fact" must be a non-empty string.';
     }
 
@@ -341,35 +307,25 @@ export class MemoryTool
     text: string,
     memoryFilePath: string,
     fsAdapter: {
-      readFile: (path: string, encoding: 'utf-8') => Promise<string>;
-      writeFile: (
-        path: string,
-        data: string,
-        encoding: 'utf-8',
-      ) => Promise<void>;
-      mkdir: (
-        path: string,
-        options: { recursive: boolean },
-      ) => Promise<string | undefined>;
+      readFile: (path: string, encoding: "utf-8") => Promise<string>;
+      writeFile: (path: string, data: string, encoding: "utf-8") => Promise<void>;
+      mkdir: (path: string, options: { recursive: boolean }) => Promise<string | undefined>;
     },
   ): Promise<void> {
     try {
       await fsAdapter.mkdir(path.dirname(memoryFilePath), { recursive: true });
-      let currentContent = '';
+      let currentContent = "";
       try {
-        currentContent = await fsAdapter.readFile(memoryFilePath, 'utf-8');
+        currentContent = await fsAdapter.readFile(memoryFilePath, "utf-8");
       } catch (_e) {
         // File doesn't exist, which is fine. currentContent will be empty.
       }
 
       const newContent = computeNewContent(currentContent, text);
 
-      await fsAdapter.writeFile(memoryFilePath, newContent, 'utf-8');
+      await fsAdapter.writeFile(memoryFilePath, newContent, "utf-8");
     } catch (error) {
-      console.error(
-        `[MemoryTool] Error adding memory entry to ${memoryFilePath}:`,
-        error,
-      );
+      console.error(`[MemoryTool] Error adding memory entry to ${memoryFilePath}:`, error);
       throw new Error(
         `[MemoryTool] Failed to add memory entry: ${error instanceof Error ? error.message : String(error)}`,
       );
diff --git a/packages/gemini-cli-core/src/tools/message-bus-integration.test.ts b/packages/gemini-cli-core/src/tools/message-bus-integration.test.ts
index 2ee38b0d2..f5626d00a 100644
--- a/packages/gemini-cli-core/src/tools/message-bus-integration.test.ts
+++ b/packages/gemini-cli-core/src/tools/message-bus-integration.test.ts
@@ -4,31 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  vi,
-  type Mock,
-} from 'vitest';
-import {
-  BaseToolInvocation,
-  BaseDeclarativeTool,
-  Kind,
-  type ToolResult,
-} from './tools.js';
-import { MessageBus } from '../confirmation-bus/message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import {
-  MessageBusType,
-  type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { MessageBus } from "../confirmation-bus/message-bus.js";
+import { MessageBusType, type ToolConfirmationResponse } from "../confirmation-bus/types.js";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, type ToolResult } from "./tools.js";
 
 // Mock crypto module
-vi.mock('node:crypto', () => ({
+vi.mock("node:crypto", () => ({
   randomUUID: vi.fn(),
 }));
 
@@ -53,17 +37,15 @@ class TestToolInvocation extends BaseToolInvocation<TestParams, TestResult> {
     };
   }
 
-  override async shouldConfirmExecute(
-    abortSignal: AbortSignal,
-  ): Promise<false> {
+  override async shouldConfirmExecute(abortSignal: AbortSignal): Promise<false> {
     // This conditional is here to allow testing of the case where there is no message bus.
     if (this.messageBus) {
       const decision = await this.getMessageBusDecision(abortSignal);
-      if (decision === 'ALLOW') {
+      if (decision === "ALLOW") {
         return false;
       }
-      if (decision === 'DENY') {
-        throw new Error('Tool execution denied by policy');
+      if (decision === "DENY") {
+        throw new Error("Tool execution denied by policy");
       }
     }
     return false;
@@ -73,16 +55,16 @@ class TestToolInvocation extends BaseToolInvocation<TestParams, TestResult> {
 class TestTool extends BaseDeclarativeTool<TestParams, TestResult> {
   constructor(messageBus?: MessageBus) {
     super(
-      'test-tool',
-      'Test Tool',
-      'A test tool for message bus integration',
+      "test-tool",
+      "Test Tool",
+      "A test tool for message bus integration",
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {
-          testParam: { type: 'string' },
+          testParam: { type: "string" },
         },
-        required: ['testParam'],
+        required: ["testParam"],
       },
       true,
       false,
@@ -95,7 +77,7 @@ class TestTool extends BaseDeclarativeTool<TestParams, TestResult> {
   }
 }
 
-describe('Message Bus Integration', () => {
+describe("Message Bus Integration", () => {
   let policyEngine: PolicyEngine;
   let messageBus: MessageBus;
   let mockUUID: Mock;
@@ -105,36 +87,34 @@ describe('Message Bus Integration', () => {
     policyEngine = new PolicyEngine();
     messageBus = new MessageBus(policyEngine);
     mockUUID = vi.mocked(randomUUID);
-    mockUUID.mockReturnValue('test-correlation-id');
+    mockUUID.mockReturnValue("test-correlation-id");
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('BaseToolInvocation with MessageBus', () => {
-    it('should use message bus for confirmation when available', async () => {
+  describe("BaseToolInvocation with MessageBus", () => {
+    it("should use message bus for confirmation when available", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Mock message bus publish and subscribe
-      const publishSpy = vi.spyOn(messageBus, 'publish');
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const unsubscribeSpy = vi.spyOn(messageBus, 'unsubscribe');
+      const publishSpy = vi.spyOn(messageBus, "publish");
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const unsubscribeSpy = vi.spyOn(messageBus, "unsubscribe");
 
       // Start confirmation process
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Verify confirmation request was published
       expect(publishSpy).toHaveBeenCalledWith({
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
         toolCall: {
-          name: 'TestToolInvocation',
-          args: { testParam: 'test-value' },
+          name: "TestToolInvocation",
+          args: { testParam: "test-value" },
         },
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
       });
 
       // Verify subscription to response
@@ -147,7 +127,7 @@ describe('Message Bus Integration', () => {
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const response: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
         confirmed: true,
       };
 
@@ -158,41 +138,35 @@ describe('Message Bus Integration', () => {
       expect(unsubscribeSpy).toHaveBeenCalled();
     });
 
-    it('should reject promise when confirmation is denied', async () => {
+    it("should reject promise when confirmation is denied", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Simulate denial response
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const response: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
         confirmed: false,
       };
 
       responseHandler(response);
 
       // Should reject with error when denied
-      await expect(confirmationPromise).rejects.toThrow(
-        'Tool execution denied by policy',
-      );
+      await expect(confirmationPromise).rejects.toThrow("Tool execution denied by policy");
     });
 
-    it('should handle timeout', async () => {
+    it("should handle timeout", async () => {
       vi.useFakeTimers();
 
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Fast-forward past timeout
       vi.advanceTimersByTime(30000);
@@ -203,49 +177,41 @@ describe('Message Bus Integration', () => {
       vi.useRealTimers();
     });
 
-    it('should handle abort signal', async () => {
+    it("should handle abort signal", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       const abortController = new AbortController();
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        abortController.signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(abortController.signal);
 
       // Abort the operation
       abortController.abort();
 
-      await expect(confirmationPromise).rejects.toThrow(
-        'Tool execution denied by policy',
-      );
+      await expect(confirmationPromise).rejects.toThrow("Tool execution denied by policy");
     });
 
-    it('should fall back to default behavior when no message bus', async () => {
+    it("should fall back to default behavior when no message bus", async () => {
       const tool = new TestTool(); // No message bus
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(result).toBe(false);
     });
 
-    it('should ignore responses with wrong correlation ID', async () => {
+    it("should ignore responses with wrong correlation ID", async () => {
       vi.useFakeTimers();
 
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Send response with wrong correlation ID
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const wrongResponse: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'wrong-id',
+        correlationId: "wrong-id",
         confirmed: true,
       };
 
@@ -260,41 +226,39 @@ describe('Message Bus Integration', () => {
     });
   });
 
-  describe('Backward Compatibility', () => {
-    it('should work with existing tools that do not use message bus', async () => {
+  describe("Backward Compatibility", () => {
+    it("should work with existing tools that do not use message bus", async () => {
       const tool = new TestTool(); // No message bus
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Should execute normally
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.testValue).toBe('test-value');
-      expect(result.llmContent).toBe('Executed with test-value');
+      expect(result.testValue).toBe("test-value");
+      expect(result.llmContent).toBe("Executed with test-value");
     });
 
-    it('should work with tools that have message bus but use default confirmation', async () => {
+    it("should work with tools that have message bus but use default confirmation", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Should execute normally even with message bus available
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.testValue).toBe('test-value');
-      expect(result.llmContent).toBe('Executed with test-value');
+      expect(result.testValue).toBe("test-value");
+      expect(result.llmContent).toBe("Executed with test-value");
     });
   });
 
-  describe('Error Handling', () => {
-    it('should handle message bus publish errors gracefully', async () => {
+  describe("Error Handling", () => {
+    it("should handle message bus publish errors gracefully", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Mock publish to throw error
-      vi.spyOn(messageBus, 'publish').mockImplementation(() => {
-        throw new Error('Message bus error');
+      vi.spyOn(messageBus, "publish").mockImplementation(() => {
+        throw new Error("Message bus error");
       });
 
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(result).toBe(false); // Should gracefully fall back
     });
   });
diff --git a/packages/gemini-cli-core/src/tools/modifiable-tool.test.ts b/packages/gemini-cli-core/src/tools/modifiable-tool.test.ts
index 3cecccf55..c2db6c15d 100644
--- a/packages/gemini-cli-core/src/tools/modifiable-tool.test.ts
+++ b/packages/gemini-cli-core/src/tools/modifiable-tool.test.ts
@@ -4,35 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import type {
-  ModifyContext,
-  ModifiableDeclarativeTool,
-} from './modifiable-tool.js';
-import {
-  modifyWithEditor,
-  isModifiableDeclarativeTool,
-} from './modifiable-tool.js';
-import { DEFAULT_GUI_EDITOR } from '../utils/editor.js';
-import fs from 'node:fs';
-import fsp from 'node:fs/promises';
-import os from 'node:os';
-import * as path from 'node:path';
-import { debugLogger } from '../utils/debugLogger.js';
+import fs from "node:fs";
+import fsp from "node:fs/promises";
+import os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "../utils/debugLogger.js";
+import { DEFAULT_GUI_EDITOR } from "../utils/editor.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { isModifiableDeclarativeTool, modifyWithEditor } from "./modifiable-tool.js";
 
 // Mock dependencies
 const mockOpenDiff = vi.hoisted(() => vi.fn());
 const mockCreatePatch = vi.hoisted(() => vi.fn());
 
-vi.mock('../utils/editor.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../utils/editor.js')>();
+vi.mock("../utils/editor.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/editor.js")>();
   return {
     ...actual,
     openDiff: mockOpenDiff,
   };
 });
 
-vi.mock('diff', () => ({
+vi.mock("diff", () => ({
   createPatch: mockCreatePatch,
 }));
 
@@ -42,7 +36,7 @@ interface TestParams {
   modifiedContent?: string;
 }
 
-describe('modifyWithEditor', () => {
+describe("modifyWithEditor", () => {
   let testProjectDir: string;
   let mockModifyContext: ModifyContext<TestParams>;
   let mockParams: TestParams;
@@ -54,17 +48,15 @@ describe('modifyWithEditor', () => {
   beforeEach(async () => {
     vi.resetAllMocks();
 
-    testProjectDir = await fsp.mkdtemp(
-      path.join(os.tmpdir(), 'modifiable-tool-test-'),
-    );
+    testProjectDir = await fsp.mkdtemp(path.join(os.tmpdir(), "modifiable-tool-test-"));
     abortSignal = new AbortController().signal;
 
-    currentContent = 'original content\nline 2\nline 3';
-    proposedContent = 'modified content\nline 2\nline 3';
-    modifiedContent = 'user modified content\nline 2\nline 3\nnew line';
+    currentContent = "original content\nline 2\nline 3";
+    proposedContent = "modified content\nline 2\nline 3";
+    modifiedContent = "user modified content\nline 2\nline 3\nnew line";
     mockParams = {
-      filePath: path.join(testProjectDir, 'test.txt'),
-      someOtherParam: 'value',
+      filePath: path.join(testProjectDir, "test.txt"),
+      someOtherParam: "value",
     };
 
     mockModifyContext = {
@@ -81,10 +73,10 @@ describe('modifyWithEditor', () => {
     };
 
     mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
-      await fsp.writeFile(newPath, modifiedContent, 'utf8');
+      await fsp.writeFile(newPath, modifiedContent, "utf8");
     });
 
-    mockCreatePatch.mockReturnValue('mock diff content');
+    mockCreatePatch.mockReturnValue("mock diff content");
   });
 
   afterEach(async () => {
@@ -92,9 +84,9 @@ describe('modifyWithEditor', () => {
     await fsp.rm(testProjectDir, { recursive: true, force: true });
   });
 
-  describe('successful modification', () => {
+  describe("successful modification", () => {
     const assertMode = (mode: number, expected: number): void => {
-      if (process.platform === 'win32') {
+      if (process.platform === "win32") {
         // Windows reports POSIX modes as 0o666 regardless of requested bits.
         // At minimum confirm the owner read/write bits are present.
         expect(mode & 0o600).toBe(0o600);
@@ -103,7 +95,7 @@ describe('modifyWithEditor', () => {
       expect(mode & 0o777).toBe(expected);
     };
 
-    it('should successfully modify content with VSCode editor', async () => {
+    it("should successfully modify content with VSCode editor", async () => {
       const result = await modifyWithEditor(
         mockParams,
         mockModifyContext,
@@ -111,12 +103,8 @@ describe('modifyWithEditor', () => {
         abortSignal,
       );
 
-      expect(mockModifyContext.getCurrentContent).toHaveBeenCalledWith(
-        mockParams,
-      );
-      expect(mockModifyContext.getProposedContent).toHaveBeenCalledWith(
-        mockParams,
-      );
+      expect(mockModifyContext.getCurrentContent).toHaveBeenCalledWith(mockParams);
+      expect(mockModifyContext.getProposedContent).toHaveBeenCalledWith(mockParams);
       expect(mockModifyContext.getFilePath).toHaveBeenCalledWith(mockParams);
 
       expect(mockOpenDiff).toHaveBeenCalledOnce();
@@ -132,8 +120,8 @@ describe('modifyWithEditor', () => {
         path.basename(mockParams.filePath),
         currentContent,
         modifiedContent,
-        'Current',
-        'Proposed',
+        "Current",
+        "Proposed",
         expect.objectContaining({
           context: 3,
           ignoreWhitespace: true,
@@ -150,11 +138,11 @@ describe('modifyWithEditor', () => {
           modifiedContent,
           oldContent: currentContent,
         },
-        updatedDiff: 'mock diff content',
+        updatedDiff: "mock diff content",
       });
     });
 
-    it('should create temp directory and files with restrictive permissions', async () => {
+    it("should create temp directory and files with restrictive permissions", async () => {
       mockOpenDiff.mockImplementation(async (oldPath, newPath) => {
         const diffDir = path.dirname(oldPath);
         expect(diffDir).toBe(path.dirname(newPath));
@@ -167,15 +155,10 @@ describe('modifyWithEditor', () => {
         assertMode(oldStats.mode, 0o600);
         assertMode(newStats.mode, 0o600);
 
-        await fsp.writeFile(newPath, modifiedContent, 'utf8');
+        await fsp.writeFile(newPath, modifiedContent, "utf8");
       });
 
-      await modifyWithEditor(
-        mockParams,
-        mockModifyContext,
-        DEFAULT_GUI_EDITOR,
-        abortSignal,
-      );
+      await modifyWithEditor(mockParams, mockModifyContext, DEFAULT_GUI_EDITOR, abortSignal);
 
       const [oldFilePath] = mockOpenDiff.mock.calls[0];
       const diffDir = path.dirname(oldFilePath);
@@ -184,9 +167,9 @@ describe('modifyWithEditor', () => {
     });
   });
 
-  it('should handle missing old temp file gracefully', async () => {
+  it("should handle missing old temp file gracefully", async () => {
     mockOpenDiff.mockImplementation(async (oldPath, newPath) => {
-      await fsp.writeFile(newPath, modifiedContent, 'utf8');
+      await fsp.writeFile(newPath, modifiedContent, "utf8");
       await fsp.unlink(oldPath);
     });
 
@@ -199,10 +182,10 @@ describe('modifyWithEditor', () => {
 
     expect(mockCreatePatch).toHaveBeenCalledWith(
       path.basename(mockParams.filePath),
-      '',
+      "",
       modifiedContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       expect.objectContaining({
         context: 3,
         ignoreWhitespace: true,
@@ -210,10 +193,10 @@ describe('modifyWithEditor', () => {
     );
 
     expect(result.updatedParams).toBeDefined();
-    expect(result.updatedDiff).toBe('mock diff content');
+    expect(result.updatedDiff).toBe("mock diff content");
   });
 
-  it('should handle missing new temp file gracefully', async () => {
+  it("should handle missing new temp file gracefully", async () => {
     mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
       await fsp.unlink(newPath);
     });
@@ -228,9 +211,9 @@ describe('modifyWithEditor', () => {
     expect(mockCreatePatch).toHaveBeenCalledWith(
       path.basename(mockParams.filePath),
       currentContent,
-      '',
-      'Current',
-      'Proposed',
+      "",
+      "Current",
+      "Proposed",
       expect.objectContaining({
         context: 3,
         ignoreWhitespace: true,
@@ -238,25 +221,19 @@ describe('modifyWithEditor', () => {
     );
 
     expect(result.updatedParams).toBeDefined();
-    expect(result.updatedDiff).toBe('mock diff content');
+    expect(result.updatedDiff).toBe("mock diff content");
   });
 
-  it('should honor override content values when provided', async () => {
-    const overrideCurrent = 'override current content';
-    const overrideProposed = 'override proposed content';
+  it("should honor override content values when provided", async () => {
+    const overrideCurrent = "override current content";
+    const overrideProposed = "override proposed content";
     mockModifyContext.getCurrentContent = vi.fn();
     mockModifyContext.getProposedContent = vi.fn();
 
-    await modifyWithEditor(
-      mockParams,
-      mockModifyContext,
-      DEFAULT_GUI_EDITOR,
-      abortSignal,
-      {
-        currentContent: overrideCurrent,
-        proposedContent: overrideProposed,
-      },
-    );
+    await modifyWithEditor(mockParams, mockModifyContext, DEFAULT_GUI_EDITOR, abortSignal, {
+      currentContent: overrideCurrent,
+      proposedContent: overrideProposed,
+    });
 
     expect(mockModifyContext.getCurrentContent).not.toHaveBeenCalled();
     expect(mockModifyContext.getProposedContent).not.toHaveBeenCalled();
@@ -264,53 +241,42 @@ describe('modifyWithEditor', () => {
       path.basename(mockParams.filePath),
       overrideCurrent,
       modifiedContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       expect.any(Object),
     );
   });
 
-  it('should treat null override as explicit empty content', async () => {
+  it("should treat null override as explicit empty content", async () => {
     mockModifyContext.getCurrentContent = vi.fn();
     mockModifyContext.getProposedContent = vi.fn();
 
-    await modifyWithEditor(
-      mockParams,
-      mockModifyContext,
-      DEFAULT_GUI_EDITOR,
-      abortSignal,
-      {
-        currentContent: null,
-        proposedContent: 'override proposed content',
-      },
-    );
+    await modifyWithEditor(mockParams, mockModifyContext, DEFAULT_GUI_EDITOR, abortSignal, {
+      currentContent: null,
+      proposedContent: "override proposed content",
+    });
 
     expect(mockModifyContext.getCurrentContent).not.toHaveBeenCalled();
     expect(mockModifyContext.getProposedContent).not.toHaveBeenCalled();
     expect(mockCreatePatch).toHaveBeenCalledWith(
       path.basename(mockParams.filePath),
-      '',
+      "",
       modifiedContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       expect.any(Object),
     );
   });
 
-  it('should clean up temp files even if editor fails', async () => {
-    const editorError = new Error('Editor failed to open');
+  it("should clean up temp files even if editor fails", async () => {
+    const editorError = new Error("Editor failed to open");
     mockOpenDiff.mockRejectedValue(editorError);
 
-    const writeSpy = vi.spyOn(fs, 'writeFileSync');
+    const writeSpy = vi.spyOn(fs, "writeFileSync");
 
     await expect(
-      modifyWithEditor(
-        mockParams,
-        mockModifyContext,
-        DEFAULT_GUI_EDITOR,
-        abortSignal,
-      ),
-    ).rejects.toThrow('Editor failed to open');
+      modifyWithEditor(mockParams, mockModifyContext, DEFAULT_GUI_EDITOR, abortSignal),
+    ).rejects.toThrow("Editor failed to open");
 
     expect(writeSpy).toHaveBeenCalledTimes(2);
     const oldFilePath = writeSpy.mock.calls[0][0] as string;
@@ -322,95 +288,74 @@ describe('modifyWithEditor', () => {
     writeSpy.mockRestore();
   });
 
-  it('should handle temp file cleanup errors gracefully', async () => {
-    const consoleErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
-    vi.spyOn(fs, 'unlinkSync').mockImplementation(() => {
-      throw new Error('Failed to delete file');
+  it("should handle temp file cleanup errors gracefully", async () => {
+    const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
+    vi.spyOn(fs, "unlinkSync").mockImplementation(() => {
+      throw new Error("Failed to delete file");
     });
-    vi.spyOn(fs, 'rmdirSync').mockImplementation(() => {
-      throw new Error('Failed to delete directory');
+    vi.spyOn(fs, "rmdirSync").mockImplementation(() => {
+      throw new Error("Failed to delete directory");
     });
 
-    await modifyWithEditor(
-      mockParams,
-      mockModifyContext,
-      DEFAULT_GUI_EDITOR,
-      abortSignal,
-    );
+    await modifyWithEditor(mockParams, mockModifyContext, DEFAULT_GUI_EDITOR, abortSignal);
 
     expect(consoleErrorSpy).toHaveBeenCalledTimes(3);
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Error deleting temp diff file:'),
+      expect.stringContaining("Error deleting temp diff file:"),
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Error deleting temp diff directory:'),
+      expect.stringContaining("Error deleting temp diff directory:"),
     );
 
     consoleErrorSpy.mockRestore();
   });
 
-  it('should create temp files with correct naming with extension', async () => {
-    const testFilePath = path.join(
-      testProjectDir,
-      'subfolder',
-      'test-file.txt',
-    );
+  it("should create temp files with correct naming with extension", async () => {
+    const testFilePath = path.join(testProjectDir, "subfolder", "test-file.txt");
     mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
 
-    await modifyWithEditor(
-      mockParams,
-      mockModifyContext,
-      DEFAULT_GUI_EDITOR,
-      abortSignal,
-    );
+    await modifyWithEditor(mockParams, mockModifyContext, DEFAULT_GUI_EDITOR, abortSignal);
 
     expect(mockOpenDiff).toHaveBeenCalledOnce();
     const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
     expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+\.txt$/);
     expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+\.txt$/);
 
-    const diffDirPrefix = path.join(os.tmpdir(), 'gemini-cli-tool-modify-');
+    const diffDirPrefix = path.join(os.tmpdir(), "gemini-cli-tool-modify-");
     expect(path.dirname(oldFilePath).startsWith(diffDirPrefix)).toBe(true);
     expect(path.dirname(newFilePath).startsWith(diffDirPrefix)).toBe(true);
   });
 
-  it('should create temp files with correct naming without extension', async () => {
-    const testFilePath = path.join(testProjectDir, 'subfolder', 'test-file');
+  it("should create temp files with correct naming without extension", async () => {
+    const testFilePath = path.join(testProjectDir, "subfolder", "test-file");
     mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
 
-    await modifyWithEditor(
-      mockParams,
-      mockModifyContext,
-      DEFAULT_GUI_EDITOR,
-      abortSignal,
-    );
+    await modifyWithEditor(mockParams, mockModifyContext, DEFAULT_GUI_EDITOR, abortSignal);
 
     expect(mockOpenDiff).toHaveBeenCalledOnce();
     const [oldFilePath, newFilePath] = mockOpenDiff.mock.calls[0];
     expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+$/);
     expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+$/);
 
-    const diffDirPrefix = path.join(os.tmpdir(), 'gemini-cli-tool-modify-');
+    const diffDirPrefix = path.join(os.tmpdir(), "gemini-cli-tool-modify-");
     expect(path.dirname(oldFilePath).startsWith(diffDirPrefix)).toBe(true);
     expect(path.dirname(newFilePath).startsWith(diffDirPrefix)).toBe(true);
   });
 });
 
-describe('isModifiableTool', () => {
-  it('should return true for objects with getModifyContext method', () => {
+describe("isModifiableTool", () => {
+  it("should return true for objects with getModifyContext method", () => {
     const mockTool = {
-      name: 'test-tool',
+      name: "test-tool",
       getModifyContext: vi.fn(),
     } as unknown as ModifiableDeclarativeTool<TestParams>;
 
     expect(isModifiableDeclarativeTool(mockTool)).toBe(true);
   });
 
-  it('should return false for objects without getModifyContext method', () => {
+  it("should return false for objects without getModifyContext method", () => {
     const mockTool = {
-      name: 'test-tool',
+      name: "test-tool",
     } as unknown as ModifiableDeclarativeTool<TestParams>;
 
     expect(isModifiableDeclarativeTool(mockTool)).toBe(false);
diff --git a/packages/gemini-cli-core/src/tools/modifiable-tool.ts b/packages/gemini-cli-core/src/tools/modifiable-tool.ts
index 47463235a..f83918e60 100644
--- a/packages/gemini-cli-core/src/tools/modifiable-tool.ts
+++ b/packages/gemini-cli-core/src/tools/modifiable-tool.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { EditorType } from '../utils/editor.js';
-import { openDiff } from '../utils/editor.js';
-import os from 'node:os';
-import path from 'node:path';
-import fs from 'node:fs';
-import * as Diff from 'diff';
-import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
-import { isNodeError } from '../utils/errors.js';
-import type {
-  AnyDeclarativeTool,
-  DeclarativeTool,
-  ToolResult,
-} from './tools.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import * as Diff from "diff";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { EditorType } from "../utils/editor.js";
+import { openDiff } from "../utils/editor.js";
+import { isNodeError } from "../utils/errors.js";
+import { DEFAULT_DIFF_OPTIONS } from "./diffOptions.js";
+import type { AnyDeclarativeTool, DeclarativeTool, ToolResult } from "./tools.js";
 
 /**
  * A declarative tool that supports a modify operation.
@@ -57,7 +53,7 @@ export interface ModifyContentOverrides {
 export function isModifiableDeclarativeTool(
   tool: AnyDeclarativeTool,
 ): tool is ModifiableDeclarativeTool<object> {
-  return 'getModifyContext' in tool;
+  return "getModifyContext" in tool;
 }
 
 function createTempFilesForModify(
@@ -65,38 +61,27 @@ function createTempFilesForModify(
   proposedContent: string,
   file_path: string,
 ): { oldPath: string; newPath: string; dirPath: string } {
-  const diffDir = fs.mkdtempSync(
-    path.join(os.tmpdir(), 'gemini-cli-tool-modify-'),
-  );
+  const diffDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-tool-modify-"));
 
   try {
     fs.chmodSync(diffDir, 0o700);
   } catch (e) {
-    debugLogger.error(
-      `Error setting permissions on temp diff directory: ${diffDir}`,
-      e,
-    );
+    debugLogger.error(`Error setting permissions on temp diff directory: ${diffDir}`, e);
     throw e;
   }
 
   const ext = path.extname(file_path);
   const fileName = path.basename(file_path, ext);
   const timestamp = Date.now();
-  const tempOldPath = path.join(
-    diffDir,
-    `gemini-cli-modify-${fileName}-old-${timestamp}${ext}`,
-  );
-  const tempNewPath = path.join(
-    diffDir,
-    `gemini-cli-modify-${fileName}-new-${timestamp}${ext}`,
-  );
+  const tempOldPath = path.join(diffDir, `gemini-cli-modify-${fileName}-old-${timestamp}${ext}`);
+  const tempNewPath = path.join(diffDir, `gemini-cli-modify-${fileName}-new-${timestamp}${ext}`);
 
   fs.writeFileSync(tempOldPath, currentContent, {
-    encoding: 'utf8',
+    encoding: "utf8",
     mode: 0o600,
   });
   fs.writeFileSync(tempNewPath, proposedContent, {
-    encoding: 'utf8',
+    encoding: "utf8",
     mode: 0o600,
   });
 
@@ -109,45 +94,37 @@ function getUpdatedParams<ToolParams>(
   originalParams: ToolParams,
   modifyContext: ModifyContext<ToolParams>,
 ): { updatedParams: ToolParams; updatedDiff: string } {
-  let oldContent = '';
-  let newContent = '';
+  let oldContent = "";
+  let newContent = "";
 
   try {
-    oldContent = fs.readFileSync(tmpOldPath, 'utf8');
+    oldContent = fs.readFileSync(tmpOldPath, "utf8");
   } catch (err) {
-    if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-    oldContent = '';
+    if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+    oldContent = "";
   }
 
   try {
-    newContent = fs.readFileSync(tempNewPath, 'utf8');
+    newContent = fs.readFileSync(tempNewPath, "utf8");
   } catch (err) {
-    if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-    newContent = '';
+    if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+    newContent = "";
   }
 
-  const updatedParams = modifyContext.createUpdatedParams(
-    oldContent,
-    newContent,
-    originalParams,
-  );
+  const updatedParams = modifyContext.createUpdatedParams(oldContent, newContent, originalParams);
   const updatedDiff = Diff.createPatch(
     path.basename(modifyContext.getFilePath(originalParams)),
     oldContent,
     newContent,
-    'Current',
-    'Proposed',
+    "Current",
+    "Proposed",
     DEFAULT_DIFF_OPTIONS,
   );
 
   return { updatedParams, updatedDiff };
 }
 
-function deleteTempFiles(
-  oldPath: string,
-  newPath: string,
-  dirPath: string,
-): void {
+function deleteTempFiles(oldPath: string, newPath: string, dirPath: string): void {
   try {
     fs.unlinkSync(oldPath);
   } catch {
@@ -178,33 +155,26 @@ export async function modifyWithEditor<ToolParams>(
   _abortSignal: AbortSignal,
   overrides?: ModifyContentOverrides,
 ): Promise<ModifyResult<ToolParams>> {
-  const hasCurrentOverride =
-    overrides !== undefined && 'currentContent' in overrides;
-  const hasProposedOverride =
-    overrides !== undefined && 'proposedContent' in overrides;
+  const hasCurrentOverride = overrides !== undefined && "currentContent" in overrides;
+  const hasProposedOverride = overrides !== undefined && "proposedContent" in overrides;
 
   const currentContent = hasCurrentOverride
-    ? (overrides!.currentContent ?? '')
+    ? (overrides!.currentContent ?? "")
     : await modifyContext.getCurrentContent(originalParams);
 
   const proposedContent = hasProposedOverride
-    ? (overrides!.proposedContent ?? '')
+    ? (overrides!.proposedContent ?? "")
     : await modifyContext.getProposedContent(originalParams);
 
   const { oldPath, newPath, dirPath } = createTempFilesForModify(
-    currentContent ?? '',
-    proposedContent ?? '',
+    currentContent ?? "",
+    proposedContent ?? "",
     modifyContext.getFilePath(originalParams),
   );
 
   try {
     await openDiff(oldPath, newPath, editorType);
-    const result = getUpdatedParams(
-      oldPath,
-      newPath,
-      originalParams,
-      modifyContext,
-    );
+    const result = getUpdatedParams(oldPath, newPath, originalParams, modifyContext);
 
     return result;
   } finally {
diff --git a/packages/gemini-cli-core/src/tools/read-file.test.ts b/packages/gemini-cli-core/src/tools/read-file.test.ts
index ccc07fd28..218b10619 100644
--- a/packages/gemini-cli-core/src/tools/read-file.test.ts
+++ b/packages/gemini-cli-core/src/tools/read-file.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { ReadFileToolParams } from './read-file.js';
-import { ReadFileTool } from './read-file.js';
-import { ToolErrorType } from './tool-error.js';
-import path from 'node:path';
-import os from 'node:os';
-import fs from 'node:fs';
-import fsp from 'node:fs/promises';
-import type { Config } from '../config/config.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-vi.mock('../telemetry/loggers.js', () => ({
+import fs from "node:fs";
+import fsp from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import type { ReadFileToolParams } from "./read-file.js";
+import { ReadFileTool } from "./read-file.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
-describe('ReadFileTool', () => {
+describe("ReadFileTool", () => {
   let tempRootDir: string;
   let tool: ReadFileTool;
   const abortSignal = new AbortController().signal;
@@ -31,7 +31,7 @@ describe('ReadFileTool', () => {
   beforeEach(async () => {
     // Create a unique temporary root directory for each test run
     const realTmp = await fsp.realpath(os.tmpdir());
-    tempRootDir = await fsp.mkdtemp(path.join(realTmp, 'read-file-tool-root-'));
+    tempRootDir = await fsp.mkdtemp(path.join(realTmp, "read-file-tool-root-"));
 
     const mockConfigInstance = {
       getFileService: () => new FileDiscoveryService(tempRootDir),
@@ -43,7 +43,7 @@ describe('ReadFileTool', () => {
         respectGeminiIgnore: true,
       }),
       storage: {
-        getProjectTempDir: () => path.join(tempRootDir, '.temp'),
+        getProjectTempDir: () => path.join(tempRootDir, ".temp"),
       },
       isInteractive: () => false,
     } as unknown as Config;
@@ -57,182 +57,156 @@ describe('ReadFileTool', () => {
     }
   });
 
-  describe('build', () => {
-    it('should return an invocation for valid params (absolute path within root)', () => {
+  describe("build", () => {
+    it("should return an invocation for valid params (absolute path within root)", () => {
       const params: ReadFileToolParams = {
-        file_path: path.join(tempRootDir, 'test.txt'),
+        file_path: path.join(tempRootDir, "test.txt"),
       };
       const result = tool.build(params);
-      expect(typeof result).not.toBe('string');
+      expect(typeof result).not.toBe("string");
     });
 
-    it('should return an invocation for valid params (relative path within root)', () => {
+    it("should return an invocation for valid params (relative path within root)", () => {
       const params: ReadFileToolParams = {
-        file_path: 'test.txt',
+        file_path: "test.txt",
       };
       const result = tool.build(params);
-      expect(typeof result).not.toBe('string');
-      const invocation = result as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
-      expect(invocation.toolLocations()[0].path).toBe(
-        path.join(tempRootDir, 'test.txt'),
-      );
+      expect(typeof result).not.toBe("string");
+      const invocation = result as ToolInvocation<ReadFileToolParams, ToolResult>;
+      expect(invocation.toolLocations()[0].path).toBe(path.join(tempRootDir, "test.txt"));
     });
 
-    it('should throw error if path is outside root', () => {
+    it("should throw error if path is outside root", () => {
       const params: ReadFileToolParams = {
-        file_path: '/outside/root.txt',
+        file_path: "/outside/root.txt",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories/,
       );
     });
 
-    it('should allow access to files in project temp directory', () => {
-      const tempDir = path.join(tempRootDir, '.temp');
+    it("should allow access to files in project temp directory", () => {
+      const tempDir = path.join(tempRootDir, ".temp");
       const params: ReadFileToolParams = {
-        file_path: path.join(tempDir, 'temp-file.txt'),
+        file_path: path.join(tempDir, "temp-file.txt"),
       };
       const result = tool.build(params);
-      expect(typeof result).not.toBe('string');
+      expect(typeof result).not.toBe("string");
     });
 
-    it('should show temp directory in error message when path is outside workspace and temp dir', () => {
+    it("should show temp directory in error message when path is outside workspace and temp dir", () => {
       const params: ReadFileToolParams = {
-        file_path: '/completely/outside/path.txt',
+        file_path: "/completely/outside/path.txt",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories.*or within the project temp directory/,
       );
     });
 
-    it('should throw error if path is empty', () => {
+    it("should throw error if path is empty", () => {
       const params: ReadFileToolParams = {
-        file_path: '',
+        file_path: "",
       };
-      expect(() => tool.build(params)).toThrow(
-        /The 'file_path' parameter must be non-empty./,
-      );
+      expect(() => tool.build(params)).toThrow(/The 'file_path' parameter must be non-empty./);
     });
 
-    it('should throw error if offset is negative', () => {
+    it("should throw error if offset is negative", () => {
       const params: ReadFileToolParams = {
-        file_path: path.join(tempRootDir, 'test.txt'),
+        file_path: path.join(tempRootDir, "test.txt"),
         offset: -1,
       };
-      expect(() => tool.build(params)).toThrow(
-        'Offset must be a non-negative number',
-      );
+      expect(() => tool.build(params)).toThrow("Offset must be a non-negative number");
     });
 
-    it('should throw error if limit is zero or negative', () => {
+    it("should throw error if limit is zero or negative", () => {
       const params: ReadFileToolParams = {
-        file_path: path.join(tempRootDir, 'test.txt'),
+        file_path: path.join(tempRootDir, "test.txt"),
         limit: 0,
       };
-      expect(() => tool.build(params)).toThrow(
-        'Limit must be a positive number',
-      );
+      expect(() => tool.build(params)).toThrow("Limit must be a positive number");
     });
   });
 
-  describe('getDescription', () => {
-    it('should return relative path without limit/offset', () => {
-      const subDir = path.join(tempRootDir, 'sub', 'dir');
+  describe("getDescription", () => {
+    it("should return relative path without limit/offset", () => {
+      const subDir = path.join(tempRootDir, "sub", "dir");
       const params: ReadFileToolParams = {
-        file_path: path.join(subDir, 'file.txt'),
+        file_path: path.join(subDir, "file.txt"),
       };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      expect(
-        (
-          invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-        ).getDescription(),
-      ).toBe(path.join('sub', 'dir', 'file.txt'));
+      expect(typeof invocation).not.toBe("string");
+      expect((invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription()).toBe(
+        path.join("sub", "dir", "file.txt"),
+      );
     });
 
-    it('should return shortened path when file path is deep', () => {
+    it("should return shortened path when file path is deep", () => {
       const deepPath = path.join(
         tempRootDir,
-        'very',
-        'deep',
-        'directory',
-        'structure',
-        'that',
-        'exceeds',
-        'the',
-        'normal',
-        'limit',
-        'file.txt',
+        "very",
+        "deep",
+        "directory",
+        "structure",
+        "that",
+        "exceeds",
+        "the",
+        "normal",
+        "limit",
+        "file.txt",
       );
       const params: ReadFileToolParams = { file_path: deepPath };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      const desc = (
-        invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-      ).getDescription();
-      expect(desc).toContain('...');
-      expect(desc).toContain('file.txt');
+      expect(typeof invocation).not.toBe("string");
+      const desc = (invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription();
+      expect(desc).toContain("...");
+      expect(desc).toContain("file.txt");
     });
 
-    it('should handle non-normalized file paths correctly', () => {
-      const subDir = path.join(tempRootDir, 'sub', 'dir');
+    it("should handle non-normalized file paths correctly", () => {
+      const subDir = path.join(tempRootDir, "sub", "dir");
       const params: ReadFileToolParams = {
-        file_path: path.join(subDir, '..', 'dir', 'file.txt'),
+        file_path: path.join(subDir, "..", "dir", "file.txt"),
       };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      expect(
-        (
-          invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-        ).getDescription(),
-      ).toBe(path.join('sub', 'dir', 'file.txt'));
+      expect(typeof invocation).not.toBe("string");
+      expect((invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription()).toBe(
+        path.join("sub", "dir", "file.txt"),
+      );
     });
 
-    it('should return . if path is the root directory', () => {
+    it("should return . if path is the root directory", () => {
       const params: ReadFileToolParams = { file_path: tempRootDir };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      expect(
-        (
-          invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-        ).getDescription(),
-      ).toBe('.');
+      expect(typeof invocation).not.toBe("string");
+      expect((invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription()).toBe(
+        ".",
+      );
     });
   });
 
-  describe('execute', () => {
-    it('should successfully read a file with a relative path', async () => {
-      const filePath = path.join(tempRootDir, 'textfile.txt');
-      const fileContent = 'This is a test file.';
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
-      const params: ReadFileToolParams = { file_path: 'textfile.txt' };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+  describe("execute", () => {
+    it("should successfully read a file with a relative path", async () => {
+      const filePath = path.join(tempRootDir, "textfile.txt");
+      const fileContent = "This is a test file.";
+      await fsp.writeFile(filePath, fileContent, "utf-8");
+      const params: ReadFileToolParams = { file_path: "textfile.txt" };
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       expect(await invocation.execute(abortSignal)).toEqual({
         llmContent: fileContent,
-        returnDisplay: '',
+        returnDisplay: "",
       });
     });
 
-    it('should return error if file does not exist', async () => {
-      const filePath = path.join(tempRootDir, 'nonexistent.txt');
+    it("should return error if file does not exist", async () => {
+      const filePath = path.join(tempRootDir, "nonexistent.txt");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result).toEqual({
-        llmContent:
-          'Could not read file because no file was found at the specified path.',
-        returnDisplay: 'File not found.',
+        llmContent: "Could not read file because no file was found at the specified path.",
+        returnDisplay: "File not found.",
         error: {
           message: `File not found: ${filePath}`,
           type: ToolErrorType.FILE_NOT_FOUND,
@@ -240,36 +214,29 @@ describe('ReadFileTool', () => {
       });
     });
 
-    it('should return success result for a text file', async () => {
-      const filePath = path.join(tempRootDir, 'textfile.txt');
-      const fileContent = 'This is a test file.';
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
+    it("should return success result for a text file", async () => {
+      const filePath = path.join(tempRootDir, "textfile.txt");
+      const fileContent = "This is a test file.";
+      await fsp.writeFile(filePath, fileContent, "utf-8");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       expect(await invocation.execute(abortSignal)).toEqual({
         llmContent: fileContent,
-        returnDisplay: '',
+        returnDisplay: "",
       });
     });
 
-    it('should return error if path is a directory', async () => {
-      const dirPath = path.join(tempRootDir, 'directory');
+    it("should return error if path is a directory", async () => {
+      const dirPath = path.join(tempRootDir, "directory");
       await fsp.mkdir(dirPath);
       const params: ReadFileToolParams = { file_path: dirPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result).toEqual({
-        llmContent:
-          'Could not read file because the provided path is a directory, not a file.',
-        returnDisplay: 'Path is a directory.',
+        llmContent: "Could not read file because the provided path is a directory, not a file.",
+        returnDisplay: "Path is a directory.",
         error: {
           message: `Path is a directory, not a file: ${dirPath}`,
           type: ToolErrorType.TARGET_IS_DIRECTORY,
@@ -277,209 +244,163 @@ describe('ReadFileTool', () => {
       });
     });
 
-    it('should return error for a file that is too large', async () => {
-      const filePath = path.join(tempRootDir, 'largefile.txt');
+    it("should return error for a file that is too large", async () => {
+      const filePath = path.join(tempRootDir, "largefile.txt");
       // 21MB of content exceeds 20MB limit
-      const largeContent = 'x'.repeat(21 * 1024 * 1024);
-      await fsp.writeFile(filePath, largeContent, 'utf-8');
+      const largeContent = "x".repeat(21 * 1024 * 1024);
+      await fsp.writeFile(filePath, largeContent, "utf-8");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result).toHaveProperty('error');
+      expect(result).toHaveProperty("error");
       expect(result.error?.type).toBe(ToolErrorType.FILE_TOO_LARGE);
-      expect(result.error?.message).toContain(
-        'File size exceeds the 20MB limit',
-      );
+      expect(result.error?.message).toContain("File size exceeds the 20MB limit");
     });
 
-    it('should handle text file with lines exceeding maximum length', async () => {
-      const filePath = path.join(tempRootDir, 'longlines.txt');
-      const longLine = 'a'.repeat(2500); // Exceeds MAX_LINE_LENGTH_TEXT_FILE (2000)
+    it("should handle text file with lines exceeding maximum length", async () => {
+      const filePath = path.join(tempRootDir, "longlines.txt");
+      const longLine = "a".repeat(2500); // Exceeds MAX_LINE_LENGTH_TEXT_FILE (2000)
       const fileContent = `Short line\n${longLine}\nAnother short line`;
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
+      await fsp.writeFile(filePath, fileContent, "utf-8");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'IMPORTANT: The file content has been truncated',
-      );
-      expect(result.llmContent).toContain('--- FILE CONTENT (truncated) ---');
-      expect(result.returnDisplay).toContain('some lines were shortened');
+      expect(result.llmContent).toContain("IMPORTANT: The file content has been truncated");
+      expect(result.llmContent).toContain("--- FILE CONTENT (truncated) ---");
+      expect(result.returnDisplay).toContain("some lines were shortened");
     });
 
-    it('should handle image file and return appropriate content', async () => {
-      const imagePath = path.join(tempRootDir, 'image.png');
+    it("should handle image file and return appropriate content", async () => {
+      const imagePath = path.join(tempRootDir, "image.png");
       // Minimal PNG header
-      const pngHeader = Buffer.from([
-        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-      ]);
+      const pngHeader = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
       await fsp.writeFile(imagePath, pngHeader);
       const params: ReadFileToolParams = { file_path: imagePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toEqual({
         inlineData: {
-          data: pngHeader.toString('base64'),
-          mimeType: 'image/png',
+          data: pngHeader.toString("base64"),
+          mimeType: "image/png",
         },
       });
-      expect(result.returnDisplay).toBe('Read image file: image.png');
+      expect(result.returnDisplay).toBe("Read image file: image.png");
     });
 
-    it('should handle PDF file and return appropriate content', async () => {
-      const pdfPath = path.join(tempRootDir, 'document.pdf');
+    it("should handle PDF file and return appropriate content", async () => {
+      const pdfPath = path.join(tempRootDir, "document.pdf");
       // Minimal PDF header
-      const pdfHeader = Buffer.from('%PDF-1.4');
+      const pdfHeader = Buffer.from("%PDF-1.4");
       await fsp.writeFile(pdfPath, pdfHeader);
       const params: ReadFileToolParams = { file_path: pdfPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toEqual({
         inlineData: {
-          data: pdfHeader.toString('base64'),
-          mimeType: 'application/pdf',
+          data: pdfHeader.toString("base64"),
+          mimeType: "application/pdf",
         },
       });
-      expect(result.returnDisplay).toBe('Read pdf file: document.pdf');
+      expect(result.returnDisplay).toBe("Read pdf file: document.pdf");
     });
 
-    it('should handle binary file and skip content', async () => {
-      const binPath = path.join(tempRootDir, 'binary.bin');
+    it("should handle binary file and skip content", async () => {
+      const binPath = path.join(tempRootDir, "binary.bin");
       // Binary data with null bytes
       const binaryData = Buffer.from([0x00, 0xff, 0x00, 0xff]);
       await fsp.writeFile(binPath, binaryData);
       const params: ReadFileToolParams = { file_path: binPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toBe(
-        'Cannot display content of binary file: binary.bin',
-      );
-      expect(result.returnDisplay).toBe('Skipped binary file: binary.bin');
+      expect(result.llmContent).toBe("Cannot display content of binary file: binary.bin");
+      expect(result.returnDisplay).toBe("Skipped binary file: binary.bin");
     });
 
-    it('should handle SVG file as text', async () => {
-      const svgPath = path.join(tempRootDir, 'image.svg');
+    it("should handle SVG file as text", async () => {
+      const svgPath = path.join(tempRootDir, "image.svg");
       const svgContent = '<svg><circle cx="50" cy="50" r="40"/></svg>';
-      await fsp.writeFile(svgPath, svgContent, 'utf-8');
+      await fsp.writeFile(svgPath, svgContent, "utf-8");
       const params: ReadFileToolParams = { file_path: svgPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toBe(svgContent);
-      expect(result.returnDisplay).toBe('Read SVG as text: image.svg');
+      expect(result.returnDisplay).toBe("Read SVG as text: image.svg");
     });
 
-    it('should handle large SVG file', async () => {
-      const svgPath = path.join(tempRootDir, 'large.svg');
+    it("should handle large SVG file", async () => {
+      const svgPath = path.join(tempRootDir, "large.svg");
       // Create SVG content larger than 1MB
-      const largeContent = '<svg>' + 'x'.repeat(1024 * 1024 + 1) + '</svg>';
-      await fsp.writeFile(svgPath, largeContent, 'utf-8');
+      const largeContent = "<svg>" + "x".repeat(1024 * 1024 + 1) + "</svg>";
+      await fsp.writeFile(svgPath, largeContent, "utf-8");
       const params: ReadFileToolParams = { file_path: svgPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toBe(
-        'Cannot display content of SVG file larger than 1MB: large.svg',
-      );
-      expect(result.returnDisplay).toBe(
-        'Skipped large SVG file (>1MB): large.svg',
+        "Cannot display content of SVG file larger than 1MB: large.svg",
       );
+      expect(result.returnDisplay).toBe("Skipped large SVG file (>1MB): large.svg");
     });
 
-    it('should handle empty file', async () => {
-      const emptyPath = path.join(tempRootDir, 'empty.txt');
-      await fsp.writeFile(emptyPath, '', 'utf-8');
+    it("should handle empty file", async () => {
+      const emptyPath = path.join(tempRootDir, "empty.txt");
+      await fsp.writeFile(emptyPath, "", "utf-8");
       const params: ReadFileToolParams = { file_path: emptyPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toBe('');
-      expect(result.returnDisplay).toBe('');
+      expect(result.llmContent).toBe("");
+      expect(result.returnDisplay).toBe("");
     });
 
-    it('should support offset and limit for text files', async () => {
-      const filePath = path.join(tempRootDir, 'paginated.txt');
+    it("should support offset and limit for text files", async () => {
+      const filePath = path.join(tempRootDir, "paginated.txt");
       const lines = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
-      const fileContent = lines.join('\n');
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
+      const fileContent = lines.join("\n");
+      await fsp.writeFile(filePath, fileContent, "utf-8");
 
       const params: ReadFileToolParams = {
         file_path: filePath,
         offset: 5, // Start from line 6
         limit: 3,
       };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'IMPORTANT: The file content has been truncated',
-      );
-      expect(result.llmContent).toContain(
-        'Status: Showing lines 6-8 of 20 total lines',
-      );
-      expect(result.llmContent).toContain('Line 6');
-      expect(result.llmContent).toContain('Line 7');
-      expect(result.llmContent).toContain('Line 8');
-      expect(result.returnDisplay).toBe(
-        'Read lines 6-8 of 20 from paginated.txt',
-      );
+      expect(result.llmContent).toContain("IMPORTANT: The file content has been truncated");
+      expect(result.llmContent).toContain("Status: Showing lines 6-8 of 20 total lines");
+      expect(result.llmContent).toContain("Line 6");
+      expect(result.llmContent).toContain("Line 7");
+      expect(result.llmContent).toContain("Line 8");
+      expect(result.returnDisplay).toBe("Read lines 6-8 of 20 from paginated.txt");
     });
 
-    it('should successfully read files from project temp directory', async () => {
-      const tempDir = path.join(tempRootDir, '.temp');
+    it("should successfully read files from project temp directory", async () => {
+      const tempDir = path.join(tempRootDir, ".temp");
       await fsp.mkdir(tempDir, { recursive: true });
-      const tempFilePath = path.join(tempDir, 'temp-output.txt');
-      const tempFileContent = 'This is temporary output content';
-      await fsp.writeFile(tempFilePath, tempFileContent, 'utf-8');
+      const tempFilePath = path.join(tempDir, "temp-output.txt");
+      const tempFileContent = "This is temporary output content";
+      await fsp.writeFile(tempFilePath, tempFileContent, "utf-8");
 
       const params: ReadFileToolParams = { file_path: tempFilePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toBe(tempFileContent);
-      expect(result.returnDisplay).toBe('');
+      expect(result.returnDisplay).toBe("");
     });
 
-    describe('with .geminiignore', () => {
+    describe("with .geminiignore", () => {
       beforeEach(async () => {
         await fsp.writeFile(
-          path.join(tempRootDir, '.geminiignore'),
-          ['foo.*', 'ignored/'].join('\n'),
+          path.join(tempRootDir, ".geminiignore"),
+          ["foo.*", "ignored/"].join("\n"),
         );
         const mockConfigInstance = {
           getFileService: () => new FileDiscoveryService(tempRootDir),
@@ -491,15 +412,15 @@ describe('ReadFileTool', () => {
             respectGeminiIgnore: true,
           }),
           storage: {
-            getProjectTempDir: () => path.join(tempRootDir, '.temp'),
+            getProjectTempDir: () => path.join(tempRootDir, ".temp"),
           },
         } as unknown as Config;
         tool = new ReadFileTool(mockConfigInstance);
       });
 
-      it('should throw error if path is ignored by a .geminiignore pattern', async () => {
-        const ignoredFilePath = path.join(tempRootDir, 'foo.bar');
-        await fsp.writeFile(ignoredFilePath, 'content', 'utf-8');
+      it("should throw error if path is ignored by a .geminiignore pattern", async () => {
+        const ignoredFilePath = path.join(tempRootDir, "foo.bar");
+        await fsp.writeFile(ignoredFilePath, "content", "utf-8");
         const params: ReadFileToolParams = {
           file_path: ignoredFilePath,
         };
@@ -507,11 +428,11 @@ describe('ReadFileTool', () => {
         expect(() => tool.build(params)).toThrow(expectedError);
       });
 
-      it('should throw error if file is in an ignored directory', async () => {
-        const ignoredDirPath = path.join(tempRootDir, 'ignored');
+      it("should throw error if file is in an ignored directory", async () => {
+        const ignoredDirPath = path.join(tempRootDir, "ignored");
         await fsp.mkdir(ignoredDirPath, { recursive: true });
-        const ignoredFilePath = path.join(ignoredDirPath, 'file.txt');
-        await fsp.writeFile(ignoredFilePath, 'content', 'utf-8');
+        const ignoredFilePath = path.join(ignoredDirPath, "file.txt");
+        await fsp.writeFile(ignoredFilePath, "content", "utf-8");
         const params: ReadFileToolParams = {
           file_path: ignoredFilePath,
         };
@@ -519,14 +440,14 @@ describe('ReadFileTool', () => {
         expect(() => tool.build(params)).toThrow(expectedError);
       });
 
-      it('should allow reading non-ignored files', async () => {
-        const allowedFilePath = path.join(tempRootDir, 'allowed.txt');
-        await fsp.writeFile(allowedFilePath, 'content', 'utf-8');
+      it("should allow reading non-ignored files", async () => {
+        const allowedFilePath = path.join(tempRootDir, "allowed.txt");
+        await fsp.writeFile(allowedFilePath, "content", "utf-8");
         const params: ReadFileToolParams = {
           file_path: allowedFilePath,
         };
         const invocation = tool.build(params);
-        expect(typeof invocation).not.toBe('string');
+        expect(typeof invocation).not.toBe("string");
       });
     });
   });
diff --git a/packages/gemini-cli-core/src/tools/read-file.ts b/packages/gemini-cli-core/src/tools/read-file.ts
index 4c0aed956..0e18724f5 100644
--- a/packages/gemini-cli-core/src/tools/read-file.ts
+++ b/packages/gemini-cli-core/src/tools/read-file.ts
@@ -4,23 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import path from 'node:path';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import type { ToolInvocation, ToolLocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-
-import type { PartUnion } from '@google/genai';
-import {
-  processSingleFileContent,
-  getSpecificMimeType,
-} from '../utils/fileUtils.js';
-import type { Config } from '../config/config.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getProgrammingLanguage } from '../telemetry/telemetry-utils.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { READ_FILE_TOOL_NAME } from './tool-names.js';
+import path from "node:path";
+import type { PartUnion } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { getProgrammingLanguage } from "../telemetry/telemetry-utils.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { getSpecificMimeType, processSingleFileContent } from "../utils/fileUtils.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { READ_FILE_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolLocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Parameters for the ReadFile tool
@@ -42,10 +38,7 @@ export interface ReadFileToolParams {
   limit?: number;
 }
 
-class ReadFileToolInvocation extends BaseToolInvocation<
-  ReadFileToolParams,
-  ToolResult
-> {
+class ReadFileToolInvocation extends BaseToolInvocation<ReadFileToolParams, ToolResult> {
   private readonly resolvedPath: string;
   constructor(
     private config: Config,
@@ -55,17 +48,11 @@ class ReadFileToolInvocation extends BaseToolInvocation<
     _toolDisplayName?: string,
   ) {
     super(params, messageBus, _toolName, _toolDisplayName);
-    this.resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.file_path,
-    );
+    this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.resolvedPath,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.resolvedPath, this.config.getTargetDir());
     return shortenPath(relativePath);
   }
 
@@ -85,7 +72,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
     if (result.error) {
       return {
         llmContent: result.llmContent,
-        returnDisplay: result.returnDisplay || 'Error reading file',
+        returnDisplay: result.returnDisplay || "Error reading file",
         error: {
           message: result.error,
           type: result.errorType,
@@ -97,9 +84,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
     if (result.isTruncated) {
       const [start, end] = result.linesShown!;
       const total = result.originalLineCount!;
-      const nextOffset = this.params.offset
-        ? this.params.offset + end - start + 1
-        : end;
+      const nextOffset = this.params.offset ? this.params.offset + end - start + 1 : end;
       llmContent = `
 IMPORTANT: The file content has been truncated.
 Status: Showing lines ${start}-${end} of ${total} total lines.
@@ -108,13 +93,11 @@ Action: To read more of the file, you can use the 'offset' and 'limit' parameter
 --- FILE CONTENT (truncated) ---
 ${result.llmContent}`;
     } else {
-      llmContent = result.llmContent || '';
+      llmContent = result.llmContent || "";
     }
 
     const lines =
-      typeof result.llmContent === 'string'
-        ? result.llmContent.split('\n').length
-        : undefined;
+      typeof result.llmContent === "string" ? result.llmContent.split("\n").length : undefined;
     const mimetype = getSpecificMimeType(this.resolvedPath);
     const programming_language = getProgrammingLanguage({
       file_path: this.resolvedPath,
@@ -133,7 +116,7 @@ ${result.llmContent}`;
 
     return {
       llmContent,
-      returnDisplay: result.returnDisplay || '',
+      returnDisplay: result.returnDisplay || "",
     };
   }
 }
@@ -141,10 +124,7 @@ ${result.llmContent}`;
 /**
  * Implementation of the ReadFile tool logic
  */
-export class ReadFileTool extends BaseDeclarativeTool<
-  ReadFileToolParams,
-  ToolResult
-> {
+export class ReadFileTool extends BaseDeclarativeTool<ReadFileToolParams, ToolResult> {
   static readonly Name = READ_FILE_TOOL_NAME;
 
   constructor(
@@ -153,28 +133,28 @@ export class ReadFileTool extends BaseDeclarativeTool<
   ) {
     super(
       ReadFileTool.Name,
-      'ReadFile',
+      "ReadFile",
       `Reads and returns the content of a specified file. If the file is large, the content will be truncated. The tool's response will clearly indicate if truncation has occurred and will provide details on how to read more of the file using the 'offset' and 'limit' parameters. Handles text, images (PNG, JPG, GIF, WEBP, SVG, BMP), audio files (MP3, WAV, AIFF, AAC, OGG, FLAC), and PDF files. For text files, it can read specific line ranges.`,
       Kind.Read,
       {
         properties: {
           file_path: {
-            description: 'The path to the file to read.',
-            type: 'string',
+            description: "The path to the file to read.",
+            type: "string",
           },
           offset: {
             description:
               "Optional: For text files, the 0-based line number to start reading from. Requires 'limit' to be set. Use for paginating through large files.",
-            type: 'number',
+            type: "number",
           },
           limit: {
             description:
               "Optional: For text files, maximum number of lines to read. Use with 'offset' to paginate through large files. If omitted, reads the entire file (if feasible, up to a default limit).",
-            type: 'number',
+            type: "number",
           },
         },
-        required: ['file_path'],
-        type: 'object',
+        required: ["file_path"],
+        type: "object",
       },
       true,
       false,
@@ -182,36 +162,28 @@ export class ReadFileTool extends BaseDeclarativeTool<
     );
   }
 
-  protected override validateToolParamValues(
-    params: ReadFileToolParams,
-  ): string | null {
-    if (params.file_path.trim() === '') {
+  protected override validateToolParamValues(params: ReadFileToolParams): string | null {
+    if (params.file_path.trim() === "") {
       return "The 'file_path' parameter must be non-empty.";
     }
 
     const workspaceContext = this.config.getWorkspaceContext();
     const projectTempDir = this.config.storage.getProjectTempDir();
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      params.file_path,
-    );
+    const resolvedPath = path.resolve(this.config.getTargetDir(), params.file_path);
     const resolvedProjectTempDir = path.resolve(projectTempDir);
     const isWithinTempDir =
       resolvedPath.startsWith(resolvedProjectTempDir + path.sep) ||
       resolvedPath === resolvedProjectTempDir;
 
-    if (
-      !workspaceContext.isPathWithinWorkspace(resolvedPath) &&
-      !isWithinTempDir
-    ) {
+    if (!workspaceContext.isPathWithinWorkspace(resolvedPath) && !isWithinTempDir) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(', ')} or within the project temp directory: ${projectTempDir}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")} or within the project temp directory: ${projectTempDir}`;
     }
     if (params.offset !== undefined && params.offset < 0) {
-      return 'Offset must be a non-negative number';
+      return "Offset must be a non-negative number";
     }
     if (params.limit !== undefined && params.limit <= 0) {
-      return 'Limit must be a positive number';
+      return "Limit must be a positive number";
     }
 
     const fileService = this.config.getFileService();
@@ -229,12 +201,6 @@ export class ReadFileTool extends BaseDeclarativeTool<
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<ReadFileToolParams, ToolResult> {
-    return new ReadFileToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new ReadFileToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-cli-core/src/tools/read-many-files.test.ts b/packages/gemini-cli-core/src/tools/read-many-files.test.ts
index 20a06763c..761e97d3f 100644
--- a/packages/gemini-cli-core/src/tools/read-many-files.test.ts
+++ b/packages/gemini-cli-core/src/tools/read-many-files.test.ts
@@ -4,42 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import type { Mock } from 'vitest';
-import { mockControl } from '../__mocks__/fs/promises.js';
-import { ReadManyFilesTool } from './read-many-files.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import path from 'node:path';
-import fs from 'node:fs'; // Actual fs for setup
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { ToolErrorType } from './tool-error.js';
-import {
-  COMMON_IGNORE_PATTERNS,
-  DEFAULT_FILE_EXCLUDES,
-} from '../utils/ignorePatterns.js';
-import * as glob from 'glob';
-
-vi.mock('glob', { spy: true });
-
-vi.mock('mime', () => {
+import fs from "node:fs"; // Actual fs for setup
+import os from "node:os";
+import path from "node:path";
+import * as glob from "glob";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { mockControl } from "../__mocks__/fs/promises.js";
+import type { Config } from "../config/config.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { COMMON_IGNORE_PATTERNS, DEFAULT_FILE_EXCLUDES } from "../utils/ignorePatterns.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { ReadManyFilesTool } from "./read-many-files.js";
+import { ToolErrorType } from "./tool-error.js";
+
+vi.mock("glob", { spy: true });
+
+vi.mock("mime", () => {
   const getType = (filename: string) => {
-    if (filename.endsWith('.ts') || filename.endsWith('.js')) {
-      return 'text/plain';
+    if (filename.endsWith(".ts") || filename.endsWith(".js")) {
+      return "text/plain";
     }
-    if (filename.endsWith('.png')) {
-      return 'image/png';
+    if (filename.endsWith(".png")) {
+      return "image/png";
     }
-    if (filename.endsWith('.pdf')) {
-      return 'application/pdf';
+    if (filename.endsWith(".pdf")) {
+      return "application/pdf";
     }
-    if (filename.endsWith('.mp3') || filename.endsWith('.wav')) {
-      return 'audio/mpeg';
+    if (filename.endsWith(".mp3") || filename.endsWith(".wav")) {
+      return "audio/mpeg";
     }
-    if (filename.endsWith('.mp4') || filename.endsWith('.mov')) {
-      return 'video/mp4';
+    if (filename.endsWith(".mp4") || filename.endsWith(".mov")) {
+      return "video/mp4";
     }
     return false;
   };
@@ -51,24 +48,22 @@ vi.mock('mime', () => {
   };
 });
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
-describe('ReadManyFilesTool', () => {
+describe("ReadManyFilesTool", () => {
   let tool: ReadManyFilesTool;
   let tempRootDir: string;
   let tempDirOutsideRoot: string;
   let mockReadFileFn: Mock;
 
   beforeEach(async () => {
-    tempRootDir = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'read-many-files-root-')),
-    );
+    tempRootDir = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "read-many-files-root-")));
     tempDirOutsideRoot = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'read-many-files-external-')),
+      fs.mkdtempSync(path.join(os.tmpdir(), "read-many-files-external-")),
     );
-    fs.writeFileSync(path.join(tempRootDir, '.geminiignore'), 'foo.*');
+    fs.writeFileSync(path.join(tempRootDir, ".geminiignore"), "foo.*");
     const fileService = new FileDiscoveryService(tempRootDir);
     const mockConfig = {
       getFileService: () => fileService,
@@ -97,38 +92,30 @@ describe('ReadManyFilesTool', () => {
 
     mockReadFileFn.mockImplementation(
       async (filePath: fs.PathLike, options?: Record<string, unknown>) => {
-        const fp =
-          typeof filePath === 'string'
-            ? filePath
-            : (filePath as Buffer).toString();
+        const fp = typeof filePath === "string" ? filePath : (filePath as Buffer).toString();
 
         if (fs.existsSync(fp)) {
-          const originalFs = await vi.importActual<typeof fs>('fs');
+          const originalFs = await vi.importActual<typeof fs>("fs");
           return originalFs.promises.readFile(fp, options);
         }
 
-        if (fp.endsWith('nonexistent-file.txt')) {
-          const err = new Error(
-            `ENOENT: no such file or directory, open '${fp}'`,
-          );
-          (err as NodeJS.ErrnoException).code = 'ENOENT';
+        if (fp.endsWith("nonexistent-file.txt")) {
+          const err = new Error(`ENOENT: no such file or directory, open '${fp}'`);
+          (err as NodeJS.ErrnoException).code = "ENOENT";
           throw err;
         }
-        if (fp.endsWith('unreadable.txt')) {
+        if (fp.endsWith("unreadable.txt")) {
           const err = new Error(`EACCES: permission denied, open '${fp}'`);
-          (err as NodeJS.ErrnoException).code = 'EACCES';
+          (err as NodeJS.ErrnoException).code = "EACCES";
           throw err;
         }
-        if (fp.endsWith('.png'))
+        if (fp.endsWith(".png"))
           return Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); // PNG header
-        if (fp.endsWith('.pdf')) return Buffer.from('%PDF-1.4...'); // PDF start
-        if (fp.endsWith('binary.bin'))
-          return Buffer.from([0x00, 0x01, 0x02, 0x00, 0x03]);
-
-        const err = new Error(
-          `ENOENT: no such file or directory, open '${fp}' (unmocked path)`,
-        );
-        (err as NodeJS.ErrnoException).code = 'ENOENT';
+        if (fp.endsWith(".pdf")) return Buffer.from("%PDF-1.4..."); // PDF start
+        if (fp.endsWith("binary.bin")) return Buffer.from([0x00, 0x01, 0x02, 0x00, 0x03]);
+
+        const err = new Error(`ENOENT: no such file or directory, open '${fp}' (unmocked path)`);
+        (err as NodeJS.ErrnoException).code = "ENOENT";
         throw err;
       },
     );
@@ -143,78 +130,72 @@ describe('ReadManyFilesTool', () => {
     }
   });
 
-  describe('build', () => {
-    it('should return an invocation for valid relative paths within root', () => {
-      const params = { include: ['file1.txt', 'subdir/file2.txt'] };
+  describe("build", () => {
+    it("should return an invocation for valid relative paths within root", () => {
+      const params = { include: ["file1.txt", "subdir/file2.txt"] };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should return an invocation for valid glob patterns within root', () => {
-      const params = { include: ['*.txt', 'subdir/**/*.js'] };
+    it("should return an invocation for valid glob patterns within root", () => {
+      const params = { include: ["*.txt", "subdir/**/*.js"] };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should return an invocation for paths trying to escape the root (e.g., ../) as execute handles this', () => {
-      const params = { include: ['../outside.txt'] };
+    it("should return an invocation for paths trying to escape the root (e.g., ../) as execute handles this", () => {
+      const params = { include: ["../outside.txt"] };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should return an invocation for absolute paths as execute handles this', () => {
+    it("should return an invocation for absolute paths as execute handles this", () => {
       const params = {
-        include: [path.join(tempDirOutsideRoot, 'absolute.txt')],
+        include: [path.join(tempDirOutsideRoot, "absolute.txt")],
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should throw error if paths array is empty', () => {
+    it("should throw error if paths array is empty", () => {
       const params = { include: [] };
-      expect(() => tool.build(params)).toThrow(
-        'params/include must NOT have fewer than 1 items',
-      );
+      expect(() => tool.build(params)).toThrow("params/include must NOT have fewer than 1 items");
     });
 
-    it('should return an invocation for valid exclude and include patterns', () => {
+    it("should return an invocation for valid exclude and include patterns", () => {
       const params = {
-        exclude: ['**/*.test.ts'],
-        include: ['src/**/*.ts', 'src/utils/*.ts'],
+        exclude: ["**/*.test.ts"],
+        include: ["src/**/*.ts", "src/utils/*.ts"],
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should throw error if paths array contains an empty string', () => {
-      const params = { include: ['file1.txt', ''] };
+    it("should throw error if paths array contains an empty string", () => {
+      const params = { include: ["file1.txt", ""] };
       expect(() => tool.build(params)).toThrow(
-        'params/include/1 must NOT have fewer than 1 characters',
+        "params/include/1 must NOT have fewer than 1 characters",
       );
     });
 
-    it('should throw error if include array contains non-string elements', () => {
+    it("should throw error if include array contains non-string elements", () => {
       const params = {
-        include: ['*.ts', 123] as string[],
+        include: ["*.ts", 123] as string[],
       };
-      expect(() => tool.build(params)).toThrow(
-        'params/include/1 must be string',
-      );
+      expect(() => tool.build(params)).toThrow("params/include/1 must be string");
     });
 
-    it('should throw error if exclude array contains non-string elements', () => {
+    it("should throw error if exclude array contains non-string elements", () => {
       const params = {
-        include: ['file1.txt'],
-        exclude: ['*.log', {}] as string[],
+        include: ["file1.txt"],
+        exclude: ["*.log", {}] as string[],
       };
-      expect(() => tool.build(params)).toThrow(
-        'params/exclude/1 must be string',
-      );
+      expect(() => tool.build(params)).toThrow("params/exclude/1 must be string");
     });
   });
 
-  describe('execute', () => {
-    const createFile = (filePath: string, content = '') => {
+  describe("execute", () => {
+    const createFile = (filePath: string, content = "") => {
       const fullPath = path.join(tempRootDir, filePath);
       fs.mkdirSync(path.dirname(fullPath), { recursive: true });
       fs.writeFileSync(fullPath, content);
@@ -225,267 +206,235 @@ describe('ReadManyFilesTool', () => {
       fs.writeFileSync(fullPath, data);
     };
 
-    it('should read a single specified file', async () => {
-      createFile('file1.txt', 'Content of file1');
-      const params = { include: ['file1.txt'] };
+    it("should read a single specified file", async () => {
+      createFile("file1.txt", "Content of file1");
+      const params = { include: ["file1.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      const expectedPath = path.join(tempRootDir, 'file1.txt');
+      const expectedPath = path.join(tempRootDir, "file1.txt");
       expect(result.llmContent).toEqual([
         `--- ${expectedPath} ---\n\nContent of file1\n\n`,
         `\n--- End of content ---`,
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should read multiple specified files', async () => {
-      createFile('file1.txt', 'Content1');
-      createFile('subdir/file2.js', 'Content2');
-      const params = { include: ['file1.txt', 'subdir/file2.js'] };
+    it("should read multiple specified files", async () => {
+      createFile("file1.txt", "Content1");
+      createFile("subdir/file2.js", "Content2");
+      const params = { include: ["file1.txt", "subdir/file2.js"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath1 = path.join(tempRootDir, 'file1.txt');
-      const expectedPath2 = path.join(tempRootDir, 'subdir/file2.js');
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`),
-        ),
-      ).toBe(true);
+      const expectedPath1 = path.join(tempRootDir, "file1.txt");
+      const expectedPath2 = path.join(tempRootDir, "subdir/file2.js");
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`))).toBe(
+        true,
+      );
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
     });
 
-    it('should handle glob patterns', async () => {
-      createFile('file.txt', 'Text file');
-      createFile('another.txt', 'Another text');
-      createFile('sub/data.json', '{}');
-      const params = { include: ['*.txt'] };
+    it("should handle glob patterns", async () => {
+      createFile("file.txt", "Text file");
+      createFile("another.txt", "Another text");
+      createFile("sub/data.json", "{}");
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath1 = path.join(tempRootDir, 'file.txt');
-      const expectedPath2 = path.join(tempRootDir, 'another.txt');
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nText file\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\nAnother text\n\n`),
-        ),
-      ).toBe(true);
-      expect(content.find((c) => c.includes('sub/data.json'))).toBeUndefined();
+      const expectedPath1 = path.join(tempRootDir, "file.txt");
+      const expectedPath2 = path.join(tempRootDir, "another.txt");
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nText file\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\nAnother text\n\n`))).toBe(
+        true,
+      );
+      expect(content.find((c) => c.includes("sub/data.json"))).toBeUndefined();
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
     });
 
-    it('should respect exclude patterns', async () => {
-      createFile('src/main.ts', 'Main content');
-      createFile('src/main.test.ts', 'Test content');
-      const params = { include: ['src/**/*.ts'], exclude: ['**/*.test.ts'] };
+    it("should respect exclude patterns", async () => {
+      createFile("src/main.ts", "Main content");
+      createFile("src/main.test.ts", "Test content");
+      const params = { include: ["src/**/*.ts"], exclude: ["**/*.test.ts"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath = path.join(tempRootDir, 'src/main.ts');
+      const expectedPath = path.join(tempRootDir, "src/main.ts");
       expect(content).toEqual([
         `--- ${expectedPath} ---\n\nMain content\n\n`,
         `\n--- End of content ---`,
       ]);
-      expect(
-        content.find((c) => c.includes('src/main.test.ts')),
-      ).toBeUndefined();
+      expect(content.find((c) => c.includes("src/main.test.ts"))).toBeUndefined();
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should handle nonexistent specific files gracefully', async () => {
-      const params = { include: ['nonexistent-file.txt'] };
+    it("should handle nonexistent specific files gracefully", async () => {
+      const params = { include: ["nonexistent-file.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
-        'No files matching the criteria were found or all were skipped.',
+        "No files matching the criteria were found or all were skipped.",
       ]);
       expect(result.returnDisplay).toContain(
-        'No files were read and concatenated based on the criteria.',
+        "No files were read and concatenated based on the criteria.",
       );
     });
 
-    it('should use default excludes', async () => {
-      createFile('node_modules/some-lib/index.js', 'lib code');
-      createFile('src/app.js', 'app code');
-      const params = { include: ['**/*.js'] };
+    it("should use default excludes", async () => {
+      createFile("node_modules/some-lib/index.js", "lib code");
+      createFile("src/app.js", "app code");
+      const params = { include: ["**/*.js"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath = path.join(tempRootDir, 'src/app.js');
+      const expectedPath = path.join(tempRootDir, "src/app.js");
       expect(content).toEqual([
         `--- ${expectedPath} ---\n\napp code\n\n`,
         `\n--- End of content ---`,
       ]);
-      expect(
-        content.find((c) => c.includes('node_modules/some-lib/index.js')),
-      ).toBeUndefined();
+      expect(content.find((c) => c.includes("node_modules/some-lib/index.js"))).toBeUndefined();
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should NOT use default excludes if useDefaultExcludes is false', async () => {
-      createFile('node_modules/some-lib/index.js', 'lib code');
-      createFile('src/app.js', 'app code');
-      const params = { include: ['**/*.js'], useDefaultExcludes: false };
+    it("should NOT use default excludes if useDefaultExcludes is false", async () => {
+      createFile("node_modules/some-lib/index.js", "lib code");
+      createFile("src/app.js", "app code");
+      const params = { include: ["**/*.js"], useDefaultExcludes: false };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath1 = path.join(
-        tempRootDir,
-        'node_modules/some-lib/index.js',
+      const expectedPath1 = path.join(tempRootDir, "node_modules/some-lib/index.js");
+      const expectedPath2 = path.join(tempRootDir, "src/app.js");
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nlib code\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\napp code\n\n`))).toBe(
+        true,
       );
-      const expectedPath2 = path.join(tempRootDir, 'src/app.js');
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nlib code\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\napp code\n\n`),
-        ),
-      ).toBe(true);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
     });
 
-    it('should include images as inlineData parts if explicitly requested by extension', async () => {
-      createBinaryFile(
-        'image.png',
-        Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]),
-      );
-      const params = { include: ['*.png'] }; // Explicitly requesting .png
+    it("should include images as inlineData parts if explicitly requested by extension", async () => {
+      createBinaryFile("image.png", Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]));
+      const params = { include: ["*.png"] }; // Explicitly requesting .png
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from([
-              0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-            ]).toString('base64'),
-            mimeType: 'image/png',
+            data: Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]).toString("base64"),
+            mimeType: "image/png",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should include images as inlineData parts if explicitly requested by name', async () => {
+    it("should include images as inlineData parts if explicitly requested by name", async () => {
       createBinaryFile(
-        'myExactImage.png',
+        "myExactImage.png",
         Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]),
       );
-      const params = { include: ['myExactImage.png'] }; // Explicitly requesting by full name
+      const params = { include: ["myExactImage.png"] }; // Explicitly requesting by full name
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from([
-              0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-            ]).toString('base64'),
-            mimeType: 'image/png',
+            data: Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]).toString("base64"),
+            mimeType: "image/png",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
     });
 
-    it('should skip PDF files if not explicitly requested by extension or name', async () => {
-      createBinaryFile('document.pdf', Buffer.from('%PDF-1.4...'));
-      createFile('notes.txt', 'text notes');
-      const params = { include: ['*'] }; // Generic glob, not specific to .pdf
+    it("should skip PDF files if not explicitly requested by extension or name", async () => {
+      createBinaryFile("document.pdf", Buffer.from("%PDF-1.4..."));
+      createFile("notes.txt", "text notes");
+      const params = { include: ["*"] }; // Generic glob, not specific to .pdf
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath = path.join(tempRootDir, 'notes.txt');
+      const expectedPath = path.join(tempRootDir, "notes.txt");
       expect(
         content.some(
-          (c) =>
-            typeof c === 'string' &&
-            c.includes(`--- ${expectedPath} ---\n\ntext notes\n\n`),
+          (c) => typeof c === "string" && c.includes(`--- ${expectedPath} ---\n\ntext notes\n\n`),
         ),
       ).toBe(true);
-      expect(result.returnDisplay).toContain('**Skipped 1 item(s):**');
+      expect(result.returnDisplay).toContain("**Skipped 1 item(s):**");
       expect(result.returnDisplay).toContain(
-        '- `document.pdf` (Reason: asset file (image/pdf/audio) was not explicitly requested by name or extension)',
+        "- `document.pdf` (Reason: asset file (image/pdf/audio) was not explicitly requested by name or extension)",
       );
     });
 
-    it('should include PDF files as inlineData parts if explicitly requested by extension', async () => {
-      createBinaryFile('important.pdf', Buffer.from('%PDF-1.4...'));
-      const params = { include: ['*.pdf'] }; // Explicitly requesting .pdf files
+    it("should include PDF files as inlineData parts if explicitly requested by extension", async () => {
+      createBinaryFile("important.pdf", Buffer.from("%PDF-1.4..."));
+      const params = { include: ["*.pdf"] }; // Explicitly requesting .pdf files
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from('%PDF-1.4...').toString('base64'),
-            mimeType: 'application/pdf',
+            data: Buffer.from("%PDF-1.4...").toString("base64"),
+            mimeType: "application/pdf",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
     });
 
-    it('should include PDF files as inlineData parts if explicitly requested by name', async () => {
-      createBinaryFile('report-final.pdf', Buffer.from('%PDF-1.4...'));
-      const params = { include: ['report-final.pdf'] };
+    it("should include PDF files as inlineData parts if explicitly requested by name", async () => {
+      createBinaryFile("report-final.pdf", Buffer.from("%PDF-1.4..."));
+      const params = { include: ["report-final.pdf"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from('%PDF-1.4...').toString('base64'),
-            mimeType: 'application/pdf',
+            data: Buffer.from("%PDF-1.4...").toString("base64"),
+            mimeType: "application/pdf",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
     });
 
-    it('should return error if path is ignored by a .geminiignore pattern', async () => {
-      createFile('foo.bar', '');
-      createFile('bar.ts', '');
-      createFile('foo.quux', '');
-      const params = { include: ['foo.bar', 'bar.ts', 'foo.quux'] };
+    it("should return error if path is ignored by a .geminiignore pattern", async () => {
+      createFile("foo.bar", "");
+      createFile("bar.ts", "");
+      createFile("foo.quux", "");
+      const params = { include: ["foo.bar", "bar.ts", "foo.quux"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.returnDisplay).not.toContain('foo.bar');
-      expect(result.returnDisplay).not.toContain('foo.quux');
-      expect(result.returnDisplay).toContain('bar.ts');
+      expect(result.returnDisplay).not.toContain("foo.bar");
+      expect(result.returnDisplay).not.toContain("foo.quux");
+      expect(result.returnDisplay).toContain("bar.ts");
     });
 
-    it('should read files from multiple workspace directories', async () => {
-      const tempDir1 = fs.realpathSync(
-        fs.mkdtempSync(path.join(os.tmpdir(), 'multi-dir-1-')),
-      );
-      const tempDir2 = fs.realpathSync(
-        fs.mkdtempSync(path.join(os.tmpdir(), 'multi-dir-2-')),
-      );
+    it("should read files from multiple workspace directories", async () => {
+      const tempDir1 = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "multi-dir-1-")));
+      const tempDir2 = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "multi-dir-2-")));
       const fileService = new FileDiscoveryService(tempDir1);
       const mockConfig = {
         getFileService: () => fileService,
@@ -507,69 +456,59 @@ describe('ReadManyFilesTool', () => {
       } as Partial<Config> as Config;
       tool = new ReadManyFilesTool(mockConfig);
 
-      fs.writeFileSync(path.join(tempDir1, 'file1.txt'), 'Content1');
-      fs.writeFileSync(path.join(tempDir2, 'file2.txt'), 'Content2');
+      fs.writeFileSync(path.join(tempDir1, "file1.txt"), "Content1");
+      fs.writeFileSync(path.join(tempDir2, "file2.txt"), "Content2");
 
-      const params = { include: ['*.txt'] };
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
       if (!Array.isArray(content)) {
         throw new Error(`llmContent is not an array: ${content}`);
       }
-      const expectedPath1 = path.join(tempDir1, 'file1.txt');
-      const expectedPath2 = path.join(tempDir2, 'file2.txt');
+      const expectedPath1 = path.join(tempDir1, "file1.txt");
+      const expectedPath2 = path.join(tempDir2, "file2.txt");
 
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`),
-        ),
-      ).toBe(true);
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`))).toBe(
+        true,
+      );
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
 
       fs.rmSync(tempDir1, { recursive: true, force: true });
       fs.rmSync(tempDir2, { recursive: true, force: true });
     });
 
-    it('should add a warning for truncated files', async () => {
-      createFile('file1.txt', 'Content1');
+    it("should add a warning for truncated files", async () => {
+      createFile("file1.txt", "Content1");
       // Create a file that will be "truncated" by making it long
-      const longContent = Array.from({ length: 2500 }, (_, i) => `L${i}`).join(
-        '\n',
-      );
-      createFile('large-file.txt', longContent);
+      const longContent = Array.from({ length: 2500 }, (_, i) => `L${i}`).join("\n");
+      createFile("large-file.txt", longContent);
 
-      const params = { include: ['*.txt'] };
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
 
-      const normalFileContent = content.find((c) => c.includes('file1.txt'));
-      const truncatedFileContent = content.find((c) =>
-        c.includes('large-file.txt'),
-      );
+      const normalFileContent = content.find((c) => c.includes("file1.txt"));
+      const truncatedFileContent = content.find((c) => c.includes("large-file.txt"));
 
-      expect(normalFileContent).not.toContain(
-        '[WARNING: This file was truncated.',
-      );
+      expect(normalFileContent).not.toContain("[WARNING: This file was truncated.");
       expect(truncatedFileContent).toContain(
         "[WARNING: This file was truncated. To view the full content, use the 'read_file' tool on this specific file.]",
       );
       // Check that the actual content is still there but truncated
-      expect(truncatedFileContent).toContain('L200');
-      expect(truncatedFileContent).not.toContain('L2400');
+      expect(truncatedFileContent).toContain("L200");
+      expect(truncatedFileContent).not.toContain("L2400");
     });
 
-    it('should read files with special characters like [] and () in the path', async () => {
-      const filePath = 'src/app/[test]/(dashboard)/testing/components/code.tsx';
-      createFile(filePath, 'Content of receive-detail');
+    it("should read files with special characters like [] and () in the path", async () => {
+      const filePath = "src/app/[test]/(dashboard)/testing/components/code.tsx";
+      createFile(filePath, "Content of receive-detail");
       const params = { include: [filePath] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
@@ -583,16 +522,16 @@ Content of receive-detail
         `\n--- End of content ---`,
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should read files with special characters in the name', async () => {
-      createFile('file[1].txt', 'Content of file[1]');
-      const params = { include: ['file[1].txt'] };
+    it("should read files with special characters in the name", async () => {
+      createFile("file[1].txt", "Content of file[1]");
+      const params = { include: ["file[1].txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      const expectedPath = path.join(tempRootDir, 'file[1].txt');
+      const expectedPath = path.join(tempRootDir, "file[1].txt");
       expect(result.llmContent).toEqual([
         `--- ${expectedPath} ---
 
@@ -602,35 +541,33 @@ Content of file[1]
         `\n--- End of content ---`,
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
   });
 
-  describe('Error handling', () => {
-    it('should return an INVALID_TOOL_PARAMS error if no paths are provided', async () => {
+  describe("Error handling", () => {
+    it("should return an INVALID_TOOL_PARAMS error if no paths are provided", async () => {
       const params = { include: [] };
       expect(() => {
         tool.build(params);
-      }).toThrow('params/include must NOT have fewer than 1 items');
+      }).toThrow("params/include must NOT have fewer than 1 items");
     });
 
-    it('should return a READ_MANY_FILES_SEARCH_ERROR on glob failure', async () => {
-      vi.mocked(glob.glob).mockRejectedValue(new Error('Glob failed'));
-      const params = { include: ['*.txt'] };
+    it("should return a READ_MANY_FILES_SEARCH_ERROR on glob failure", async () => {
+      vi.mocked(glob.glob).mockRejectedValue(new Error("Glob failed"));
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.error?.type).toBe(
-        ToolErrorType.READ_MANY_FILES_SEARCH_ERROR,
-      );
-      expect(result.llmContent).toBe('Error during file search: Glob failed');
+      expect(result.error?.type).toBe(ToolErrorType.READ_MANY_FILES_SEARCH_ERROR);
+      expect(result.llmContent).toBe("Error during file search: Glob failed");
       // Reset glob.
       vi.mocked(glob.glob).mockReset();
     });
   });
 
-  describe('Batch Processing', () => {
-    const createMultipleFiles = (count: number, contentPrefix = 'Content') => {
+  describe("Batch Processing", () => {
+    const createMultipleFiles = (count: number, contentPrefix = "Content") => {
       const files: string[] = [];
       for (let i = 0; i < count; i++) {
         const fileName = `file${i}.txt`;
@@ -640,27 +577,24 @@ Content of file[1]
       return files;
     };
 
-    const createFile = (filePath: string, content = '') => {
+    const createFile = (filePath: string, content = "") => {
       const fullPath = path.join(tempRootDir, filePath);
       fs.mkdirSync(path.dirname(fullPath), { recursive: true });
       fs.writeFileSync(fullPath, content);
     };
 
-    it('should process files in parallel', async () => {
+    it("should process files in parallel", async () => {
       // Mock detectFileType to add artificial delay to simulate I/O
-      const detectFileTypeSpy = vi.spyOn(
-        await import('../utils/fileUtils.js'),
-        'detectFileType',
-      );
+      const detectFileTypeSpy = vi.spyOn(await import("../utils/fileUtils.js"), "detectFileType");
 
       // Create files
       const fileCount = 4;
-      const files = createMultipleFiles(fileCount, 'Batch test');
+      const files = createMultipleFiles(fileCount, "Batch test");
 
       // Mock with 10ms delay per file to simulate I/O operations
       detectFileTypeSpy.mockImplementation(async (_filePath: string) => {
         await new Promise((resolve) => setTimeout(resolve, 10));
-        return 'text';
+        return "text";
       });
 
       const params = { include: files };
@@ -672,25 +606,25 @@ Content of file[1]
       const content = result.llmContent as string[];
       expect(content).toHaveLength(fileCount + 1);
       for (let i = 0; i < fileCount; i++) {
-        expect(content.join('')).toContain(`Batch test ${i}`);
+        expect(content.join("")).toContain(`Batch test ${i}`);
       }
 
       // Cleanup mock
       detectFileTypeSpy.mockRestore();
     });
 
-    it('should handle batch processing errors gracefully', async () => {
+    it("should handle batch processing errors gracefully", async () => {
       // Create mix of valid and problematic files
-      createFile('valid1.txt', 'Valid content 1');
-      createFile('valid2.txt', 'Valid content 2');
-      createFile('valid3.txt', 'Valid content 3');
+      createFile("valid1.txt", "Valid content 1");
+      createFile("valid2.txt", "Valid content 2");
+      createFile("valid3.txt", "Valid content 3");
 
       const params = {
         include: [
-          'valid1.txt',
-          'valid2.txt',
-          'nonexistent-file.txt', // This will fail
-          'valid3.txt',
+          "valid1.txt",
+          "valid2.txt",
+          "nonexistent-file.txt", // This will fail
+          "valid3.txt",
         ],
       };
 
@@ -700,36 +634,33 @@ Content of file[1]
 
       // Should successfully process valid files despite one failure
       expect(content.length).toBeGreaterThanOrEqual(3);
-      expect(result.returnDisplay).toContain('Successfully read');
+      expect(result.returnDisplay).toContain("Successfully read");
 
       // Verify valid files were processed
-      const expectedPath1 = path.join(tempRootDir, 'valid1.txt');
-      const expectedPath3 = path.join(tempRootDir, 'valid3.txt');
+      const expectedPath1 = path.join(tempRootDir, "valid1.txt");
+      const expectedPath3 = path.join(tempRootDir, "valid3.txt");
       expect(content.some((c) => c.includes(expectedPath1))).toBe(true);
       expect(content.some((c) => c.includes(expectedPath3))).toBe(true);
     });
 
-    it('should execute file operations concurrently', async () => {
+    it("should execute file operations concurrently", async () => {
       // Track execution order to verify concurrency
       const executionOrder: string[] = [];
-      const detectFileTypeSpy = vi.spyOn(
-        await import('../utils/fileUtils.js'),
-        'detectFileType',
-      );
+      const detectFileTypeSpy = vi.spyOn(await import("../utils/fileUtils.js"), "detectFileType");
 
-      const files = ['file1.txt', 'file2.txt', 'file3.txt'];
-      files.forEach((file) => createFile(file, 'test content'));
+      const files = ["file1.txt", "file2.txt", "file3.txt"];
+      files.forEach((file) => createFile(file, "test content"));
 
       // Mock to track concurrent vs sequential execution
       detectFileTypeSpy.mockImplementation(async (filePath: string) => {
-        const fileName = filePath.split('/').pop() || '';
+        const fileName = filePath.split("/").pop() || "";
         executionOrder.push(`start:${fileName}`);
 
         // Add delay to make timing differences visible
         await new Promise((resolve) => setTimeout(resolve, 50));
 
         executionOrder.push(`end:${fileName}`);
-        return 'text';
+        return "text";
       });
 
       const invocation = tool.build({ include: files });
@@ -739,15 +670,11 @@ Content of file[1]
       // In parallel execution: all "start:" events should come before all "end:" events
       // In sequential execution: "start:file1", "end:file1", "start:file2", "end:file2", etc.
 
-      const startEvents = executionOrder.filter((e) =>
-        e.startsWith('start:'),
-      ).length;
-      const firstEndIndex = executionOrder.findIndex((e) =>
-        e.startsWith('end:'),
-      );
+      const startEvents = executionOrder.filter((e) => e.startsWith("start:")).length;
+      const firstEndIndex = executionOrder.findIndex((e) => e.startsWith("end:"));
       const startsBeforeFirstEnd = executionOrder
         .slice(0, firstEndIndex)
-        .filter((e) => e.startsWith('start:')).length;
+        .filter((e) => e.startsWith("start:")).length;
 
       // For parallel processing, ALL start events should happen before the first end event
       expect(startsBeforeFirstEnd).toBe(startEvents); // Should PASS with parallel implementation
diff --git a/packages/gemini-cli-core/src/tools/read-many-files.ts b/packages/gemini-cli-core/src/tools/read-many-files.ts
index 85c6c4b4a..177cf62e5 100644
--- a/packages/gemini-cli-core/src/tools/read-many-files.ts
+++ b/packages/gemini-cli-core/src/tools/read-many-files.ts
@@ -4,31 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { getErrorMessage } from '../utils/errors.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { glob, escape } from 'glob';
-import type { ProcessedFileReadResult } from '../utils/fileUtils.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { PartListUnion } from "@google/genai";
+import { escape as escapeGlob, glob } from "glob";
+import { type Config, DEFAULT_FILE_FILTERING_OPTIONS } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { getProgrammingLanguage } from "../telemetry/telemetry-utils.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { getErrorMessage } from "../utils/errors.js";
+import type { ProcessedFileReadResult } from "../utils/fileUtils.js";
 import {
-  detectFileType,
-  processSingleFileContent,
   DEFAULT_ENCODING,
+  detectFileType,
   getSpecificMimeType,
-} from '../utils/fileUtils.js';
-import type { PartListUnion } from '@google/genai';
-import {
-  type Config,
-  DEFAULT_FILE_FILTERING_OPTIONS,
-} from '../config/config.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getProgrammingLanguage } from '../telemetry/telemetry-utils.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { ToolErrorType } from './tool-error.js';
-import { READ_MANY_FILES_TOOL_NAME } from './tool-names.js';
+  processSingleFileContent,
+} from "../utils/fileUtils.js";
+import { ToolErrorType } from "./tool-error.js";
+import { READ_MANY_FILES_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Parameters for the ReadManyFilesTool.
@@ -97,13 +94,10 @@ function getDefaultExcludes(config?: Config): string[] {
   return config?.getFileExclusions().getReadManyFilesExcludes() ?? [];
 }
 
-const DEFAULT_OUTPUT_SEPARATOR_FORMAT = '--- {filePath} ---';
-const DEFAULT_OUTPUT_TERMINATOR = '\n--- End of content ---';
+const DEFAULT_OUTPUT_SEPARATOR_FORMAT = "--- {filePath} ---";
+const DEFAULT_OUTPUT_TERMINATOR = "\n--- End of content ---";
 
-class ReadManyFilesToolInvocation extends BaseToolInvocation<
-  ReadManyFilesParams,
-  ToolResult
-> {
+class ReadManyFilesToolInvocation extends BaseToolInvocation<ReadManyFilesParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: ReadManyFilesParams,
@@ -116,7 +110,7 @@ class ReadManyFilesToolInvocation extends BaseToolInvocation<
 
   getDescription(): string {
     const pathDesc = `using patterns: 
-${this.params.include.join('`, `')}
+${this.params.include.join("`, `")}
  (within target directory: 
 ${this.config.getTargetDir()}
 ) `;
@@ -124,25 +118,22 @@ ${this.config.getTargetDir()}
     // Determine the final list of exclusion patterns exactly as in execute method
     const paramExcludes = this.params.exclude || [];
     const paramUseDefaultExcludes = this.params.useDefaultExcludes !== false;
-    const finalExclusionPatternsForDescription: string[] =
-      paramUseDefaultExcludes
-        ? [...getDefaultExcludes(this.config), ...paramExcludes]
-        : [...paramExcludes];
+    const finalExclusionPatternsForDescription: string[] = paramUseDefaultExcludes
+      ? [...getDefaultExcludes(this.config), ...paramExcludes]
+      : [...paramExcludes];
 
     const excludeDesc = `Excluding: ${
       finalExclusionPatternsForDescription.length > 0
         ? `patterns like 
 ${finalExclusionPatternsForDescription
   .slice(0, 2)
-  .join(
-    '`, `',
-  )}${finalExclusionPatternsForDescription.length > 2 ? '...`' : '`'}`
-        : 'none specified'
+  .join("`, `")}${finalExclusionPatternsForDescription.length > 2 ? "...`" : "`"}`
+        : "none specified"
     }`;
 
     return `Will attempt to read and concatenate files ${pathDesc}. ${excludeDesc}. File encoding: ${DEFAULT_ENCODING}. Separator: "${DEFAULT_OUTPUT_SEPARATOR_FORMAT.replace(
-      '{filePath}',
-      'path/to/file.ext',
+      "{filePath}",
+      "path/to/file.ext",
     )}".`;
   }
 
@@ -165,10 +156,10 @@ ${finalExclusionPatternsForDescription
       for (const dir of workspaceDirs) {
         const processedPatterns = [];
         for (const p of include) {
-          const normalizedP = p.replace(/\\/g, '/');
+          const normalizedP = p.replace(/\\/g, "/");
           const fullPath = path.join(dir, normalizedP);
           if (fs.existsSync(fullPath)) {
-            processedPatterns.push(escape(normalizedP));
+            processedPatterns.push(escapeGlob(normalizedP));
           } else {
             // The path does not exist or is not a file, so we treat it as a glob pattern.
             processedPatterns.push(normalizedP);
@@ -193,25 +184,22 @@ ${finalExclusionPatternsForDescription
       );
 
       const fileDiscovery = this.config.getFileService();
-      const { filteredPaths, ignoredCount } =
-        fileDiscovery.filterFilesWithReport(relativeEntries, {
-          respectGitIgnore:
-            this.params.file_filtering_options?.respect_git_ignore ??
-            this.config.getFileFilteringOptions().respectGitIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
-          respectGeminiIgnore:
-            this.params.file_filtering_options?.respect_gemini_ignore ??
-            this.config.getFileFilteringOptions().respectGeminiIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-        });
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativeEntries, {
+        respectGitIgnore:
+          this.params.file_filtering_options?.respect_git_ignore ??
+          this.config.getFileFilteringOptions().respectGitIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        respectGeminiIgnore:
+          this.params.file_filtering_options?.respect_gemini_ignore ??
+          this.config.getFileFilteringOptions().respectGeminiIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+      });
 
       for (const relativePath of filteredPaths) {
         // Security check: ensure the glob library didn't return something outside the workspace.
 
         const fullPath = path.resolve(this.config.getTargetDir(), relativePath);
-        if (
-          !this.config.getWorkspaceContext().isPathWithinWorkspace(fullPath)
-        ) {
+        if (!this.config.getWorkspaceContext().isPathWithinWorkspace(fullPath)) {
           skippedFiles.push({
             path: fullPath,
             reason: `Security: Glob library returned path outside workspace. Path: ${fullPath}`,
@@ -225,7 +213,7 @@ ${finalExclusionPatternsForDescription
       if (ignoredCount > 0) {
         skippedFiles.push({
           path: `${ignoredCount} file(s)`,
-          reason: 'ignored by project ignore files',
+          reason: "ignored by project ignore files",
         });
       }
     } catch (error) {
@@ -247,20 +235,13 @@ ${finalExclusionPatternsForDescription
         try {
           const relativePathForDisplay = path
             .relative(this.config.getTargetDir(), filePath)
-            .replace(/\\/g, '/');
+            .replace(/\\/g, "/");
 
           const fileType = await detectFileType(filePath);
 
-          if (
-            fileType === 'image' ||
-            fileType === 'pdf' ||
-            fileType === 'audio'
-          ) {
+          if (fileType === "image" || fileType === "pdf" || fileType === "audio") {
             const fileExtension = path.extname(filePath).toLowerCase();
-            const fileNameWithoutExtension = path.basename(
-              filePath,
-              fileExtension,
-            );
+            const fileNameWithoutExtension = path.basename(filePath, fileExtension);
             const requestedExplicitly = include.some(
               (pattern: string) =>
                 pattern.toLowerCase().includes(fileExtension) ||
@@ -273,7 +254,7 @@ ${finalExclusionPatternsForDescription
                 filePath,
                 relativePathForDisplay,
                 reason:
-                  'asset file (image/pdf/audio) was not explicitly requested by name or extension',
+                  "asset file (image/pdf/audio) was not explicitly requested by name or extension",
               };
             }
           }
@@ -303,7 +284,7 @@ ${finalExclusionPatternsForDescription
         } catch (error) {
           const relativePathForDisplay = path
             .relative(this.config.getTargetDir(), filePath)
-            .replace(/\\/g, '/');
+            .replace(/\\/g, "/");
 
           return {
             success: false,
@@ -318,7 +299,7 @@ ${finalExclusionPatternsForDescription
     const results = await Promise.allSettled(fileProcessingPromises);
 
     for (const result of results) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         const fileResult = result.value;
 
         if (!fileResult.success) {
@@ -329,15 +310,11 @@ ${finalExclusionPatternsForDescription
           });
         } else {
           // Handle successfully processed files
-          const { filePath, relativePathForDisplay, fileReadResult } =
-            fileResult;
+          const { filePath, relativePathForDisplay, fileReadResult } = fileResult;
 
-          if (typeof fileReadResult.llmContent === 'string') {
-            const separator = DEFAULT_OUTPUT_SEPARATOR_FORMAT.replace(
-              '{filePath}',
-              filePath,
-            );
-            let fileContentForLlm = '';
+          if (typeof fileReadResult.llmContent === "string") {
+            const separator = DEFAULT_OUTPUT_SEPARATOR_FORMAT.replace("{filePath}", filePath);
+            let fileContentForLlm = "";
             if (fileReadResult.isTruncated) {
               fileContentForLlm += `[WARNING: This file was truncated. To view the full content, use the 'read_file' tool on this specific file.]\n\n`;
             }
@@ -351,8 +328,8 @@ ${finalExclusionPatternsForDescription
           processedFilesRelativePaths.push(relativePathForDisplay);
 
           const lines =
-            typeof fileReadResult.llmContent === 'string'
-              ? fileReadResult.llmContent.split('\n').length
+            typeof fileReadResult.llmContent === "string"
+              ? fileReadResult.llmContent.split("\n").length
               : undefined;
           const mimetype = getSpecificMimeType(filePath);
           const programming_language = getProgrammingLanguage({
@@ -373,7 +350,7 @@ ${finalExclusionPatternsForDescription
       } else {
         // Handle Promise rejection (unexpected errors)
         skippedFiles.push({
-          path: 'unknown',
+          path: "unknown",
           reason: `Unexpected error: ${result.reason}`,
         });
       }
@@ -384,14 +361,10 @@ ${finalExclusionPatternsForDescription
       displayMessage += `Successfully read and concatenated content from **${processedFilesRelativePaths.length} file(s)**.\n`;
       if (processedFilesRelativePaths.length <= 10) {
         displayMessage += `\n**Processed Files:**\n`;
-        processedFilesRelativePaths.forEach(
-          (p) => (displayMessage += `- \`${p}\`\n`),
-        );
+        processedFilesRelativePaths.forEach((p) => (displayMessage += `- \`${p}\`\n`));
       } else {
         displayMessage += `\n**Processed Files (first 10 shown):**\n`;
-        processedFilesRelativePaths
-          .slice(0, 10)
-          .forEach((p) => (displayMessage += `- \`${p}\`\n`));
+        processedFilesRelativePaths.slice(0, 10).forEach((p) => (displayMessage += `- \`${p}\`\n`));
         displayMessage += `- ...and ${processedFilesRelativePaths.length - 10} more.\n`;
       }
     }
@@ -407,25 +380,18 @@ ${finalExclusionPatternsForDescription
       }
       skippedFiles
         .slice(0, 5)
-        .forEach(
-          (f) => (displayMessage += `- \`${f.path}\` (Reason: ${f.reason})\n`),
-        );
+        .forEach((f) => (displayMessage += `- \`${f.path}\` (Reason: ${f.reason})\n`));
       if (skippedFiles.length > 5) {
         displayMessage += `- ...and ${skippedFiles.length - 5} more.\n`;
       }
-    } else if (
-      processedFilesRelativePaths.length === 0 &&
-      skippedFiles.length === 0
-    ) {
+    } else if (processedFilesRelativePaths.length === 0 && skippedFiles.length === 0) {
       displayMessage += `No files were read and concatenated based on the criteria.\n`;
     }
 
     if (contentParts.length > 0) {
       contentParts.push(DEFAULT_OUTPUT_TERMINATOR);
     } else {
-      contentParts.push(
-        'No files matching the criteria were found or all were skipped.',
-      );
+      contentParts.push("No files matching the criteria were found or all were skipped.");
     }
     return {
       llmContent: contentParts,
@@ -439,10 +405,7 @@ ${finalExclusionPatternsForDescription
  * within a specified target directory. The content is concatenated.
  * It is intended to run in an environment with access to the local file system (e.g., a Node.js backend).
  */
-export class ReadManyFilesTool extends BaseDeclarativeTool<
-  ReadManyFilesParams,
-  ToolResult
-> {
+export class ReadManyFilesTool extends BaseDeclarativeTool<ReadManyFilesParams, ToolResult> {
   static readonly Name = READ_MANY_FILES_TOOL_NAME;
 
   constructor(
@@ -450,12 +413,12 @@ export class ReadManyFilesTool extends BaseDeclarativeTool<
     messageBus?: MessageBus,
   ) {
     const parameterSchema = {
-      type: 'object',
+      type: "object",
       properties: {
         include: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'string',
+            type: "string",
             minLength: 1,
           },
           minItems: 1,
@@ -463,9 +426,9 @@ export class ReadManyFilesTool extends BaseDeclarativeTool<
             'An array of glob patterns or paths. Examples: ["src/**/*.ts"], ["README.md", "docs/"]',
         },
         exclude: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'string',
+            type: "string",
             minLength: 1,
           },
           description:
@@ -473,41 +436,40 @@ export class ReadManyFilesTool extends BaseDeclarativeTool<
           default: [],
         },
         recursive: {
-          type: 'boolean',
+          type: "boolean",
           description:
-            'Optional. Whether to search recursively (primarily controlled by `**` in glob patterns). Defaults to true.',
+            "Optional. Whether to search recursively (primarily controlled by `**` in glob patterns). Defaults to true.",
           default: true,
         },
         useDefaultExcludes: {
-          type: 'boolean',
+          type: "boolean",
           description:
-            'Optional. Whether to apply a list of default exclusion patterns (e.g., node_modules, .git, binary files). Defaults to true.',
+            "Optional. Whether to apply a list of default exclusion patterns (e.g., node_modules, .git, binary files). Defaults to true.",
           default: true,
         },
         file_filtering_options: {
-          description:
-            'Whether to respect ignore patterns from .gitignore or .geminiignore',
-          type: 'object',
+          description: "Whether to respect ignore patterns from .gitignore or .geminiignore",
+          type: "object",
           properties: {
             respect_git_ignore: {
               description:
-                'Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.',
-              type: 'boolean',
+                "Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.",
+              type: "boolean",
             },
             respect_gemini_ignore: {
               description:
-                'Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.',
-              type: 'boolean',
+                "Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.",
+              type: "boolean",
             },
           },
         },
       },
-      required: ['include'],
+      required: ["include"],
     };
 
     super(
       ReadManyFilesTool.Name,
-      'ReadManyFiles',
+      "ReadManyFiles",
       `Reads content from multiple files specified by glob patterns within a configured target directory. For text files, it concatenates their content into a single string. It is primarily designed for text-based files. However, it can also process image (e.g., .png, .jpg), audio (e.g., .mp3, .wav), and PDF (.pdf) files if their file names or extensions are explicitly included in the 'include' argument. For these explicitly requested non-text files, their data is read and included in a format suitable for model consumption (e.g., base64 encoded).
 
 This tool is useful when you need to understand or analyze a collection of files, such as:
diff --git a/packages/gemini-cli-core/src/tools/ripGrep.test.ts b/packages/gemini-cli-core/src/tools/ripGrep.test.ts
index 24b2de35b..01a03bb29 100644
--- a/packages/gemini-cli-core/src/tools/ripGrep.test.ts
+++ b/packages/gemini-cli-core/src/tools/ripGrep.test.ts
@@ -4,54 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  afterAll,
-  vi,
-} from 'vitest';
-import type { RipGrepToolParams } from './ripGrep.js';
-import { canUseRipgrep, RipGrepTool, ensureRgPath } from './ripGrep.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { Storage } from '../config/storage.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import type { ChildProcess } from 'node:child_process';
-import { spawn } from 'node:child_process';
-import { downloadRipGrep } from '@joshua.litt/get-ripgrep';
+import type { ChildProcess } from "node:child_process";
+import { spawn } from "node:child_process";
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { downloadRipGrep } from "@joshua.litt/get-ripgrep";
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import type { RipGrepToolParams } from "./ripGrep.js";
+import { canUseRipgrep, ensureRgPath, RipGrepTool } from "./ripGrep.js";
+
 // Mock dependencies for canUseRipgrep
-vi.mock('@joshua.litt/get-ripgrep', () => ({
+vi.mock("@joshua.litt/get-ripgrep", () => ({
   downloadRipGrep: vi.fn(),
 }));
 
 // Mock child_process for ripgrep calls
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   spawn: vi.fn(),
 }));
 
 const mockSpawn = vi.mocked(spawn);
 const downloadRipGrepMock = vi.mocked(downloadRipGrep);
 const originalGetGlobalBinDir = Storage.getGlobalBinDir.bind(Storage);
-const storageSpy = vi.spyOn(Storage, 'getGlobalBinDir');
+const storageSpy = vi.spyOn(Storage, "getGlobalBinDir");
 
 function getRipgrepBinaryName() {
-  return process.platform === 'win32' ? 'rg.exe' : 'rg';
+  return process.platform === "win32" ? "rg.exe" : "rg";
 }
 
-describe('canUseRipgrep', () => {
+describe("canUseRipgrep", () => {
   let tempRootDir: string;
   let binDir: string;
 
   beforeEach(async () => {
     downloadRipGrepMock.mockReset();
     downloadRipGrepMock.mockResolvedValue(undefined);
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
-    binDir = path.join(tempRootDir, 'bin');
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "ripgrep-bin-"));
+    binDir = path.join(tempRootDir, "bin");
     await fs.mkdir(binDir, { recursive: true });
     storageSpy.mockImplementation(() => binDir);
   });
@@ -61,20 +54,20 @@ describe('canUseRipgrep', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  it('should return true if ripgrep already exists', async () => {
+  it("should return true if ripgrep already exists", async () => {
     const existingPath = path.join(binDir, getRipgrepBinaryName());
-    await fs.writeFile(existingPath, '');
+    await fs.writeFile(existingPath, "");
 
     const result = await canUseRipgrep();
     expect(result).toBe(true);
     expect(downloadRipGrepMock).not.toHaveBeenCalled();
   });
 
-  it('should download ripgrep and return true if it does not exist initially', async () => {
+  it("should download ripgrep and return true if it does not exist initially", async () => {
     const expectedPath = path.join(binDir, getRipgrepBinaryName());
 
     downloadRipGrepMock.mockImplementation(async () => {
-      await fs.writeFile(expectedPath, '');
+      await fs.writeFile(expectedPath, "");
     });
 
     const result = await canUseRipgrep();
@@ -84,29 +77,29 @@ describe('canUseRipgrep', () => {
     await expect(fs.access(expectedPath)).resolves.toBeUndefined();
   });
 
-  it('should return false if download fails and file does not exist', async () => {
+  it("should return false if download fails and file does not exist", async () => {
     const result = await canUseRipgrep();
 
     expect(result).toBe(false);
     expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
   });
 
-  it('should propagate errors from downloadRipGrep', async () => {
-    const error = new Error('Download failed');
+  it("should propagate errors from downloadRipGrep", async () => {
+    const error = new Error("Download failed");
     downloadRipGrepMock.mockRejectedValue(error);
 
     await expect(canUseRipgrep()).rejects.toThrow(error);
     expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
   });
 
-  it('should only download once when called concurrently', async () => {
+  it("should only download once when called concurrently", async () => {
     const expectedPath = path.join(binDir, getRipgrepBinaryName());
 
     downloadRipGrepMock.mockImplementation(
       () =>
         new Promise<void>((resolve, reject) => {
           setTimeout(() => {
-            fs.writeFile(expectedPath, '')
+            fs.writeFile(expectedPath, "")
               .then(() => resolve())
               .catch(reject);
           }, 0);
@@ -125,15 +118,15 @@ describe('canUseRipgrep', () => {
   });
 });
 
-describe('ensureRgPath', () => {
+describe("ensureRgPath", () => {
   let tempRootDir: string;
   let binDir: string;
 
   beforeEach(async () => {
     downloadRipGrepMock.mockReset();
     downloadRipGrepMock.mockResolvedValue(undefined);
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
-    binDir = path.join(tempRootDir, 'bin');
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "ripgrep-bin-"));
+    binDir = path.join(tempRootDir, "bin");
     await fs.mkdir(binDir, { recursive: true });
     storageSpy.mockImplementation(() => binDir);
   });
@@ -143,20 +136,20 @@ describe('ensureRgPath', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  it('should return rg path if ripgrep already exists', async () => {
+  it("should return rg path if ripgrep already exists", async () => {
     const existingPath = path.join(binDir, getRipgrepBinaryName());
-    await fs.writeFile(existingPath, '');
+    await fs.writeFile(existingPath, "");
 
     const rgPath = await ensureRgPath();
     expect(rgPath).toBe(existingPath);
     expect(downloadRipGrep).not.toHaveBeenCalled();
   });
 
-  it('should return rg path if ripgrep is downloaded successfully', async () => {
+  it("should return rg path if ripgrep is downloaded successfully", async () => {
     const expectedPath = path.join(binDir, getRipgrepBinaryName());
 
     downloadRipGrepMock.mockImplementation(async () => {
-      await fs.writeFile(expectedPath, '');
+      await fs.writeFile(expectedPath, "");
     });
 
     const rgPath = await ensureRgPath();
@@ -165,24 +158,24 @@ describe('ensureRgPath', () => {
     await expect(fs.access(expectedPath)).resolves.toBeUndefined();
   });
 
-  it('should throw an error if ripgrep cannot be used after download attempt', async () => {
-    await expect(ensureRgPath()).rejects.toThrow('Cannot use ripgrep.');
+  it("should throw an error if ripgrep cannot be used after download attempt", async () => {
+    await expect(ensureRgPath()).rejects.toThrow("Cannot use ripgrep.");
     expect(downloadRipGrep).toHaveBeenCalledTimes(1);
   });
 
-  it('should propagate errors from downloadRipGrep', async () => {
-    const error = new Error('Download failed');
+  it("should propagate errors from downloadRipGrep", async () => {
+    const error = new Error("Download failed");
     downloadRipGrepMock.mockRejectedValue(error);
 
     await expect(ensureRgPath()).rejects.toThrow(error);
     expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
   });
 
-  it.runIf(process.platform === 'win32')(
-    'should detect ripgrep when only rg.exe exists on Windows',
+  it.runIf(process.platform === "win32")(
+    "should detect ripgrep when only rg.exe exists on Windows",
     async () => {
-      const expectedRgExePath = path.join(binDir, 'rg.exe');
-      await fs.writeFile(expectedRgExePath, '');
+      const expectedRgExePath = path.join(binDir, "rg.exe");
+      await fs.writeFile(expectedRgExePath, "");
 
       const rgPath = await ensureRgPath();
       expect(rgPath).toBe(expectedRgExePath);
@@ -194,11 +187,7 @@ describe('ensureRgPath', () => {
 
 // Helper function to create mock spawn implementations
 function createMockSpawn(
-  options: {
-    outputData?: string;
-    exitCode?: number;
-    signal?: string;
-  } = {},
+  options: { outputData?: string; exitCode?: number; signal?: string } = {},
 ) {
   const { outputData, exitCode = 0, signal } = options;
 
@@ -220,12 +209,10 @@ function createMockSpawn(
     // Set up event listeners immediately
     setTimeout(() => {
       const stdoutDataHandler = mockProcess.stdout.on.mock.calls.find(
-        (call) => call[0] === 'data',
+        (call) => call[0] === "data",
       )?.[1];
 
-      const closeHandler = mockProcess.on.mock.calls.find(
-        (call) => call[0] === 'close',
-      )?.[1];
+      const closeHandler = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
       if (stdoutDataHandler && outputData) {
         stdoutDataHandler(Buffer.from(outputData));
@@ -240,7 +227,7 @@ function createMockSpawn(
   };
 }
 
-describe('RipGrepTool', () => {
+describe("RipGrepTool", () => {
   let tempRootDir: string;
   let tempBinRoot: string;
   let binDir: string;
@@ -258,33 +245,27 @@ describe('RipGrepTool', () => {
     downloadRipGrepMock.mockReset();
     downloadRipGrepMock.mockResolvedValue(undefined);
     mockSpawn.mockReset();
-    tempBinRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
-    binDir = path.join(tempBinRoot, 'bin');
+    tempBinRoot = await fs.mkdtemp(path.join(os.tmpdir(), "ripgrep-bin-"));
+    binDir = path.join(tempBinRoot, "bin");
     await fs.mkdir(binDir, { recursive: true });
-    const binaryName = process.platform === 'win32' ? 'rg.exe' : 'rg';
+    const binaryName = process.platform === "win32" ? "rg.exe" : "rg";
     ripgrepBinaryPath = path.join(binDir, binaryName);
-    await fs.writeFile(ripgrepBinaryPath, '');
+    await fs.writeFile(ripgrepBinaryPath, "");
     storageSpy.mockImplementation(() => binDir);
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'grep-tool-root-'));
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-root-"));
     grepTool = new RipGrepTool(mockConfig);
 
     // Create some test files and directories
+    await fs.writeFile(path.join(tempRootDir, "fileA.txt"), "hello world\nsecond line with world");
     await fs.writeFile(
-      path.join(tempRootDir, 'fileA.txt'),
-      'hello world\nsecond line with world',
-    );
-    await fs.writeFile(
-      path.join(tempRootDir, 'fileB.js'),
+      path.join(tempRootDir, "fileB.js"),
       'const foo = "bar";\nfunction baz() { return "hello"; }',
     );
-    await fs.mkdir(path.join(tempRootDir, 'sub'));
-    await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileC.txt'),
-      'another world in sub dir',
-    );
+    await fs.mkdir(path.join(tempRootDir, "sub"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "fileC.txt"), "another world in sub dir");
     await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileD.md'),
-      '# Markdown file\nThis is a test.',
+      path.join(tempRootDir, "sub", "fileD.md"),
+      "# Markdown file\nThis is a test.",
     );
   });
 
@@ -294,179 +275,163 @@ describe('RipGrepTool', () => {
     await fs.rm(tempBinRoot, { recursive: true, force: true });
   });
 
-  describe('validateToolParams', () => {
+  describe("validateToolParams", () => {
     it.each([
       {
-        name: 'pattern only',
-        params: { pattern: 'hello' },
+        name: "pattern only",
+        params: { pattern: "hello" },
         expected: null,
       },
       {
-        name: 'pattern and path',
-        params: { pattern: 'hello', dir_path: '.' },
+        name: "pattern and path",
+        params: { pattern: "hello", dir_path: "." },
         expected: null,
       },
       {
-        name: 'pattern, path, and include',
-        params: { pattern: 'hello', dir_path: '.', include: '*.txt' },
+        name: "pattern, path, and include",
+        params: { pattern: "hello", dir_path: ".", include: "*.txt" },
         expected: null,
       },
       {
-        name: 'invalid regex pattern',
-        params: { pattern: '[[' },
+        name: "invalid regex pattern",
+        params: { pattern: "[[" },
         expected: null,
       },
-    ])(
-      'should return null for valid params ($name)',
-      ({ params, expected }) => {
-        expect(grepTool.validateToolParams(params)).toBe(expected);
-      },
-    );
+    ])("should return null for valid params ($name)", ({ params, expected }) => {
+      expect(grepTool.validateToolParams(params)).toBe(expected);
+    });
 
-    it('should return error if pattern is missing', () => {
-      const params = { dir_path: '.' } as unknown as RipGrepToolParams;
+    it("should return error if pattern is missing", () => {
+      const params = { dir_path: "." } as unknown as RipGrepToolParams;
       expect(grepTool.validateToolParams(params)).toBe(
         `params must have required property 'pattern'`,
       );
     });
 
-    it('should return error if path does not exist', () => {
+    it("should return error if path does not exist", () => {
       const params: RipGrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'nonexistent',
+        pattern: "hello",
+        dir_path: "nonexistent",
       };
       // Check for the core error message, as the full path might vary
-      expect(grepTool.validateToolParams(params)).toContain(
-        'Path does not exist',
-      );
-      expect(grepTool.validateToolParams(params)).toContain('nonexistent');
+      expect(grepTool.validateToolParams(params)).toContain("Path does not exist");
+      expect(grepTool.validateToolParams(params)).toContain("nonexistent");
     });
 
-    it('should allow path to be a file', async () => {
-      const filePath = path.join(tempRootDir, 'fileA.txt');
+    it("should allow path to be a file", async () => {
+      const filePath = path.join(tempRootDir, "fileA.txt");
       const params: RipGrepToolParams = {
-        pattern: 'hello',
+        pattern: "hello",
         dir_path: filePath,
       };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
   });
 
-  describe('execute', () => {
-    it('should find matches for a simple pattern in all files', async () => {
+  describe("execute", () => {
+    it("should find matches for a simple pattern in all files", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 1,
-                lines: { text: 'hello world\n' },
+                lines: { text: "hello world\n" },
               },
             }) +
-            '\n' +
+            "\n" +
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 2,
-                lines: { text: 'second line with world\n' },
+                lines: { text: "second line with world\n" },
               },
             }) +
-            '\n' +
+            "\n" +
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'sub/fileC.txt' },
+                path: { text: "sub/fileC.txt" },
                 line_number: 1,
-                lines: { text: 'another world in sub dir\n' },
+                lines: { text: "another world in sub dir\n" },
               },
             }) +
-            '\n',
+            "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 3 matches for pattern "world" in path "."',
-      );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain(
-        `File: ${path.join('sub', 'fileC.txt')}`,
-      );
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 3 matches');
+      expect(result.llmContent).toContain('Found 3 matches for pattern "world" in path "."');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain(`File: ${path.join("sub", "fileC.txt")}`);
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 3 matches");
     });
 
-    it('should find matches in a specific path', async () => {
+    it("should find matches in a specific path", async () => {
       // Setup specific mock for this test - searching in 'sub' should only return matches from that directory
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileC.txt' },
+                path: { text: "fileC.txt" },
                 line_number: 1,
-                lines: { text: 'another world in sub dir\n' },
+                lines: { text: "another world in sub dir\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'world', dir_path: 'sub' };
+      const params: RipGrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt'); // Path relative to 'sub'
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt"); // Path relative to 'sub'
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob', async () => {
+    it("should find matches with an include glob", async () => {
       // Setup specific mock for this test
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileB.js' },
+                path: { text: "fileB.js" },
                 line_number: 2,
                 lines: { text: 'function baz() { return "hello"; }\n' },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'hello', include: '*.js' };
+      const params: RipGrepToolParams = { pattern: "hello", include: "*.js" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in path "." (filter: "*.js"):',
       );
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob and path', async () => {
-      await fs.writeFile(
-        path.join(tempRootDir, 'sub', 'another.js'),
-        'const greeting = "hello";',
-      );
+    it("should find matches with an include glob and path", async () => {
+      await fs.writeFile(path.join(tempRootDir, "sub", "another.js"), 'const greeting = "hello";');
 
       // Setup specific mock for this test - searching for 'hello' in 'sub' with '*.js' filter
       mockSpawn.mockImplementationOnce(() => {
@@ -485,25 +450,21 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             // Only return match from the .js file in sub directory
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'another.js' },
+                    path: { text: "another.js" },
                     line_number: 1,
                     lines: { text: 'const greeting = "hello";\n' },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -516,18 +477,18 @@ describe('RipGrepTool', () => {
       });
 
       const params: RipGrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'sub',
-        include: '*.js',
+        pattern: "hello",
+        dir_path: "sub",
+        include: "*.js",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in path "sub" (filter: "*.js")',
       );
-      expect(result.llmContent).toContain('File: another.js');
+      expect(result.llmContent).toContain("File: another.js");
       expect(result.llmContent).toContain('L1: const greeting = "hello";');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
     it('should return "No matches found" when pattern does not exist', async () => {
@@ -538,32 +499,30 @@ describe('RipGrepTool', () => {
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'nonexistentpattern' };
+      const params: RipGrepToolParams = { pattern: "nonexistentpattern" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'No matches found for pattern "nonexistentpattern" in path ".".',
       );
-      expect(result.returnDisplay).toBe('No matches found');
+      expect(result.returnDisplay).toBe("No matches found");
     });
 
-    it('should return an error from ripgrep for invalid regex pattern', async () => {
+    it("should return an error from ripgrep for invalid regex pattern", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           exitCode: 2,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: '[[' };
+      const params: RipGrepToolParams = { pattern: "[[" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('ripgrep exited with code 2');
-      expect(result.returnDisplay).toContain(
-        'Error: ripgrep exited with code 2',
-      );
+      expect(result.llmContent).toContain("ripgrep exited with code 2");
+      expect(result.returnDisplay).toContain("Error: ripgrep exited with code 2");
     });
 
-    it('should handle regex special characters correctly', async () => {
+    it("should handle regex special characters correctly", async () => {
       // Setup specific mock for this test - regex pattern 'foo.*bar' should match 'const foo = "bar";'
       mockSpawn.mockImplementationOnce(() => {
         const mockProcess = {
@@ -581,25 +540,21 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             // Return match for the regex pattern
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'fileB.js' },
+                    path: { text: "fileB.js" },
                     line_number: 1,
                     lines: { text: 'const foo = "bar";\n' },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -611,17 +566,15 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'foo.*bar' }; // Matches 'const foo = "bar";'
+      const params: RipGrepToolParams = { pattern: "foo.*bar" }; // Matches 'const foo = "bar";'
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "foo.*bar" in path ".":',
-      );
-      expect(result.llmContent).toContain('File: fileB.js');
+      expect(result.llmContent).toContain('Found 1 match for pattern "foo.*bar" in path ".":');
+      expect(result.llmContent).toContain("File: fileB.js");
       expect(result.llmContent).toContain('L1: const foo = "bar";');
     });
 
-    it('should be case-insensitive by default (JS fallback)', async () => {
+    it("should be case-insensitive by default (JS fallback)", async () => {
       // Setup specific mock for this test - case insensitive search for 'HELLO'
       mockSpawn.mockImplementationOnce(() => {
         const mockProcess = {
@@ -639,35 +592,31 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             // Return case-insensitive matches for 'HELLO'
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'fileA.txt' },
+                    path: { text: "fileA.txt" },
                     line_number: 1,
-                    lines: { text: 'hello world\n' },
+                    lines: { text: "hello world\n" },
                   },
                 }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'fileB.js' },
+                      path: { text: "fileB.js" },
                       line_number: 2,
                       lines: { text: 'function baz() { return "hello"; }\n' },
                     },
                   }) +
-                  '\n',
+                  "\n",
               ),
             );
           }
@@ -679,61 +628,49 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'HELLO' };
+      const params: RipGrepToolParams = { pattern: "HELLO" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 2 matches for pattern "HELLO" in path ".":',
-      );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
+      expect(result.llmContent).toContain('Found 2 matches for pattern "HELLO" in path ".":');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
     });
 
-    it('should throw an error if params are invalid', async () => {
-      const params = { dir_path: '.' } as unknown as RipGrepToolParams; // Invalid: pattern missing
-      expect(() => grepTool.build(params)).toThrow(
-        /params must have required property 'pattern'/,
-      );
+    it("should throw an error if params are invalid", async () => {
+      const params = { dir_path: "." } as unknown as RipGrepToolParams; // Invalid: pattern missing
+      expect(() => grepTool.build(params)).toThrow(/params must have required property 'pattern'/);
     });
 
-    it('should throw an error if ripgrep is not available', async () => {
+    it("should throw an error if ripgrep is not available", async () => {
       await fs.rm(ripgrepBinaryPath, { force: true });
       downloadRipGrepMock.mockResolvedValue(undefined);
 
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
 
       expect(await invocation.execute(abortSignal)).toStrictEqual({
-        llmContent: 'Error during grep search operation: Cannot use ripgrep.',
-        returnDisplay: 'Error: Cannot use ripgrep.',
+        llmContent: "Error during grep search operation: Cannot use ripgrep.",
+        returnDisplay: "Error: Cannot use ripgrep.",
       });
     });
   });
 
-  describe('multi-directory workspace', () => {
-    it('should search only CWD when no path is specified (default behavior)', async () => {
+  describe("multi-directory workspace", () => {
+    it("should search only CWD when no path is specified (default behavior)", async () => {
       // Create additional directory with test files
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
       await fs.writeFile(
-        path.join(secondDir, 'other.txt'),
-        'hello from second directory\nworld in second',
-      );
-      await fs.writeFile(
-        path.join(secondDir, 'another.js'),
-        'function world() { return "test"; }',
+        path.join(secondDir, "other.txt"),
+        "hello from second directory\nworld in second",
       );
+      await fs.writeFile(path.join(secondDir, "another.js"), 'function world() { return "test"; }');
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getDebugMode: () => false,
       } as unknown as Config;
 
@@ -758,65 +695,63 @@ describe('RipGrepTool', () => {
 
         setTimeout(() => {
           const stdoutDataHandler = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
+            (call) => call[0] === "data",
           )?.[1];
 
-          const closeHandler = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const closeHandler = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
-          let outputData = '';
+          let outputData = "";
           if (callCount === 1) {
             // First directory (tempRootDir)
             outputData =
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'fileA.txt' },
+                  path: { text: "fileA.txt" },
                   line_number: 1,
-                  lines: { text: 'hello world\n' },
+                  lines: { text: "hello world\n" },
                 },
               }) +
-              '\n' +
+              "\n" +
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'fileA.txt' },
+                  path: { text: "fileA.txt" },
                   line_number: 2,
-                  lines: { text: 'second line with world\n' },
+                  lines: { text: "second line with world\n" },
                 },
               }) +
-              '\n' +
+              "\n" +
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'sub/fileC.txt' },
+                  path: { text: "sub/fileC.txt" },
                   line_number: 1,
-                  lines: { text: 'another world in sub dir\n' },
+                  lines: { text: "another world in sub dir\n" },
                 },
               }) +
-              '\n';
+              "\n";
           } else if (callCount === 2) {
             // Second directory (secondDir)
             outputData =
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'other.txt' },
+                  path: { text: "other.txt" },
                   line_number: 2,
-                  lines: { text: 'world in second\n' },
+                  lines: { text: "world in second\n" },
                 },
               }) +
-              '\n' +
+              "\n" +
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'another.js' },
+                  path: { text: "another.js" },
                   line_number: 1,
                   lines: { text: 'function world() { return "test"; }\n' },
                 },
               }) +
-              '\n';
+              "\n";
           }
 
           if (stdoutDataHandler && outputData) {
@@ -832,49 +767,44 @@ describe('RipGrepTool', () => {
       });
 
       const multiDirGrepTool = new RipGrepTool(multiDirConfig);
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should find matches in CWD only (default behavior now)
-      expect(result.llmContent).toContain(
-        'Found 3 matches for pattern "world" in path "."',
-      );
+      expect(result.llmContent).toContain('Found 3 matches for pattern "world" in path "."');
 
       // Matches from first directory
-      expect(result.llmContent).toContain('fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain('fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain("fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain("fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Should NOT find matches from second directory
-      expect(result.llmContent).not.toContain('other.txt');
-      expect(result.llmContent).not.toContain('world in second');
-      expect(result.llmContent).not.toContain('another.js');
-      expect(result.llmContent).not.toContain('function world()');
+      expect(result.llmContent).not.toContain("other.txt");
+      expect(result.llmContent).not.toContain("world in second");
+      expect(result.llmContent).not.toContain("another.js");
+      expect(result.llmContent).not.toContain("function world()");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
       mockSpawn.mockClear();
     });
 
-    it('should search only specified path within workspace directories', async () => {
+    it("should search only specified path within workspace directories", async () => {
       // Create additional directory
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
-      await fs.mkdir(path.join(secondDir, 'sub'));
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
+      await fs.mkdir(path.join(secondDir, "sub"));
       await fs.writeFile(
-        path.join(secondDir, 'sub', 'test.txt'),
-        'hello from second sub directory',
+        path.join(secondDir, "sub", "test.txt"),
+        "hello from second sub directory",
       );
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getDebugMode: () => false,
       } as unknown as Config;
 
@@ -895,24 +825,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'fileC.txt' },
+                    path: { text: "fileC.txt" },
                     line_number: 1,
-                    lines: { text: 'another world in sub dir\n' },
+                    lines: { text: "another world in sub dir\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -927,29 +853,27 @@ describe('RipGrepTool', () => {
       const multiDirGrepTool = new RipGrepTool(multiDirConfig);
 
       // Search only in the 'sub' directory of the first workspace
-      const params: RipGrepToolParams = { pattern: 'world', dir_path: 'sub' };
+      const params: RipGrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should only find matches in the specified sub directory
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Should not contain matches from second directory
-      expect(result.llmContent).not.toContain('test.txt');
+      expect(result.llmContent).not.toContain("test.txt");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
     });
   });
 
-  describe('abort signal handling', () => {
-    it('should handle AbortSignal during search', async () => {
+  describe("abort signal handling", () => {
+    it("should handle AbortSignal during search", async () => {
       const controller = new AbortController();
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
 
       controller.abort();
@@ -958,7 +882,7 @@ describe('RipGrepTool', () => {
       expect(result).toBeDefined();
     });
 
-    it('should abort streaming search when signal is triggered', async () => {
+    it("should abort streaming search when signal is triggered", async () => {
       // Setup specific mock for this test - simulate process being killed due to abort
       mockSpawn.mockImplementationOnce(() => {
         const mockProcess = {
@@ -977,13 +901,11 @@ describe('RipGrepTool', () => {
 
         // Simulate process being aborted - use setTimeout to ensure handlers are registered first
         setTimeout(() => {
-          const closeHandler = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const closeHandler = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (closeHandler) {
             // Simulate process killed by signal (code is null, signal is SIGTERM)
-            closeHandler(null, 'SIGTERM');
+            closeHandler(null, "SIGTERM");
           }
         }, 0);
 
@@ -991,7 +913,7 @@ describe('RipGrepTool', () => {
       });
 
       const controller = new AbortController();
-      const params: RipGrepToolParams = { pattern: 'test' };
+      const params: RipGrepToolParams = { pattern: "test" };
       const invocation = grepTool.build(params);
 
       // Abort immediately before starting the search
@@ -999,55 +921,50 @@ describe('RipGrepTool', () => {
 
       const result = await invocation.execute(controller.signal);
       expect(result.llmContent).toContain(
-        'Error during grep search operation: ripgrep exited with code null',
-      );
-      expect(result.returnDisplay).toContain(
-        'Error: ripgrep exited with code null',
+        "Error during grep search operation: ripgrep exited with code null",
       );
+      expect(result.returnDisplay).toContain("Error: ripgrep exited with code null");
     });
   });
 
-  describe('error handling and edge cases', () => {
-    it('should handle workspace boundary violations', () => {
+  describe("error handling and edge cases", () => {
+    it("should handle workspace boundary violations", () => {
       const params: RipGrepToolParams = {
-        pattern: 'test',
-        dir_path: '../outside',
+        pattern: "test",
+        dir_path: "../outside",
       };
       expect(() => grepTool.build(params)).toThrow(/Path validation failed/);
     });
 
     it.each([
       {
-        name: 'empty directories',
+        name: "empty directories",
         setup: async () => {
-          const emptyDir = path.join(tempRootDir, 'empty');
+          const emptyDir = path.join(tempRootDir, "empty");
           await fs.mkdir(emptyDir);
-          return { pattern: 'test', dir_path: 'empty' };
+          return { pattern: "test", dir_path: "empty" };
         },
       },
       {
-        name: 'empty files',
+        name: "empty files",
         setup: async () => {
-          await fs.writeFile(path.join(tempRootDir, 'empty.txt'), '');
-          return { pattern: 'anything' };
+          await fs.writeFile(path.join(tempRootDir, "empty.txt"), "");
+          return { pattern: "anything" };
         },
       },
-    ])('should handle $name gracefully', async ({ setup }) => {
+    ])("should handle $name gracefully", async ({ setup }) => {
       mockSpawn.mockImplementationOnce(createMockSpawn({ exitCode: 1 }));
 
       const params = await setup();
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('No matches found');
+      expect(result.llmContent).toContain("No matches found");
     });
 
-    it('should handle special characters in file names', async () => {
-      const specialFileName = 'file with spaces & symbols!.txt';
-      await fs.writeFile(
-        path.join(tempRootDir, specialFileName),
-        'hello world with special chars',
-      );
+    it("should handle special characters in file names", async () => {
+      const specialFileName = "file with spaces & symbols!.txt";
+      await fs.writeFile(path.join(tempRootDir, specialFileName), "hello world with special chars");
 
       // Setup specific mock for this test - searching for 'world' should find the file with special characters
       mockSpawn.mockImplementationOnce(() => {
@@ -1066,24 +983,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
                     path: { text: specialFileName },
                     line_number: 1,
-                    lines: { text: 'hello world with special chars\n' },
+                    lines: { text: "hello world with special chars\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1095,21 +1008,18 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       expect(result.llmContent).toContain(specialFileName);
-      expect(result.llmContent).toContain('hello world with special chars');
+      expect(result.llmContent).toContain("hello world with special chars");
     });
 
-    it('should handle deeply nested directories', async () => {
-      const deepPath = path.join(tempRootDir, 'a', 'b', 'c', 'd', 'e');
+    it("should handle deeply nested directories", async () => {
+      const deepPath = path.join(tempRootDir, "a", "b", "c", "d", "e");
       await fs.mkdir(deepPath, { recursive: true });
-      await fs.writeFile(
-        path.join(deepPath, 'deep.txt'),
-        'content in deep directory',
-      );
+      await fs.writeFile(path.join(deepPath, "deep.txt"), "content in deep directory");
 
       // Setup specific mock for this test - searching for 'deep' should find the deeply nested file
       mockSpawn.mockImplementationOnce(() => {
@@ -1128,24 +1038,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'a/b/c/d/e/deep.txt' },
+                    path: { text: "a/b/c/d/e/deep.txt" },
                     line_number: 1,
-                    lines: { text: 'content in deep directory\n' },
+                    lines: { text: "content in deep directory\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1157,19 +1063,19 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'deep' };
+      const params: RipGrepToolParams = { pattern: "deep" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('deep.txt');
-      expect(result.llmContent).toContain('content in deep directory');
+      expect(result.llmContent).toContain("deep.txt");
+      expect(result.llmContent).toContain("content in deep directory");
     });
   });
 
-  describe('regex pattern validation', () => {
-    it('should handle complex regex patterns', async () => {
+  describe("regex pattern validation", () => {
+    it("should handle complex regex patterns", async () => {
       await fs.writeFile(
-        path.join(tempRootDir, 'code.js'),
+        path.join(tempRootDir, "code.js"),
         'function getName() { return "test"; }\nconst getValue = () => "value";',
       );
 
@@ -1190,24 +1096,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'code.js' },
+                    path: { text: "code.js" },
                     line_number: 1,
                     lines: { text: 'function getName() { return "test"; }\n' },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1219,18 +1121,18 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'function\\s+\\w+\\s*\\(' };
+      const params: RipGrepToolParams = { pattern: "function\\s+\\w+\\s*\\(" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('function getName()');
-      expect(result.llmContent).not.toContain('const getValue');
+      expect(result.llmContent).toContain("function getName()");
+      expect(result.llmContent).not.toContain("const getValue");
     });
 
-    it('should handle case sensitivity correctly in JS fallback', async () => {
+    it("should handle case sensitivity correctly in JS fallback", async () => {
       await fs.writeFile(
-        path.join(tempRootDir, 'case.txt'),
-        'Hello World\nhello world\nHELLO WORLD',
+        path.join(tempRootDir, "case.txt"),
+        "Hello World\nhello world\nHELLO WORLD",
       );
 
       // Setup specific mock for this test - case insensitive search should match all variants
@@ -1250,43 +1152,39 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'case.txt' },
+                    path: { text: "case.txt" },
                     line_number: 1,
-                    lines: { text: 'Hello World\n' },
+                    lines: { text: "Hello World\n" },
                   },
                 }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'case.txt' },
+                      path: { text: "case.txt" },
                       line_number: 2,
-                      lines: { text: 'hello world\n' },
+                      lines: { text: "hello world\n" },
                     },
                   }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'case.txt' },
+                      path: { text: "case.txt" },
                       line_number: 3,
-                      lines: { text: 'HELLO WORLD\n' },
+                      lines: { text: "HELLO WORLD\n" },
                     },
                   }) +
-                  '\n',
+                  "\n",
               ),
             );
           }
@@ -1298,19 +1196,19 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'hello' };
+      const params: RipGrepToolParams = { pattern: "hello" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Hello World');
-      expect(result.llmContent).toContain('hello world');
-      expect(result.llmContent).toContain('HELLO WORLD');
+      expect(result.llmContent).toContain("Hello World");
+      expect(result.llmContent).toContain("hello world");
+      expect(result.llmContent).toContain("HELLO WORLD");
     });
 
-    it('should handle escaped regex special characters', async () => {
+    it("should handle escaped regex special characters", async () => {
       await fs.writeFile(
-        path.join(tempRootDir, 'special.txt'),
-        'Price: $19.99\nRegex: [a-z]+ pattern\nEmail: test@example.com',
+        path.join(tempRootDir, "special.txt"),
+        "Price: $19.99\nRegex: [a-z]+ pattern\nEmail: test@example.com",
       );
 
       // Setup specific mock for this test - escaped regex pattern should match price format
@@ -1330,24 +1228,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'special.txt' },
+                    path: { text: "special.txt" },
                     line_number: 1,
-                    lines: { text: 'Price: $19.99\n' },
+                    lines: { text: "Price: $19.99\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1359,27 +1253,21 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: '\\$\\d+\\.\\d+' };
+      const params: RipGrepToolParams = { pattern: "\\$\\d+\\.\\d+" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Price: $19.99');
-      expect(result.llmContent).not.toContain('Email: test@example.com');
+      expect(result.llmContent).toContain("Price: $19.99");
+      expect(result.llmContent).not.toContain("Email: test@example.com");
     });
   });
 
-  describe('include pattern filtering', () => {
-    it('should handle multiple file extensions in include pattern', async () => {
-      await fs.writeFile(
-        path.join(tempRootDir, 'test.ts'),
-        'typescript content',
-      );
-      await fs.writeFile(path.join(tempRootDir, 'test.tsx'), 'tsx content');
-      await fs.writeFile(
-        path.join(tempRootDir, 'test.js'),
-        'javascript content',
-      );
-      await fs.writeFile(path.join(tempRootDir, 'test.txt'), 'text content');
+  describe("include pattern filtering", () => {
+    it("should handle multiple file extensions in include pattern", async () => {
+      await fs.writeFile(path.join(tempRootDir, "test.ts"), "typescript content");
+      await fs.writeFile(path.join(tempRootDir, "test.tsx"), "tsx content");
+      await fs.writeFile(path.join(tempRootDir, "test.js"), "javascript content");
+      await fs.writeFile(path.join(tempRootDir, "test.txt"), "text content");
 
       // Setup specific mock for this test - include pattern should filter to only ts/tsx files
       mockSpawn.mockImplementationOnce(() => {
@@ -1398,34 +1286,30 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'test.ts' },
+                    path: { text: "test.ts" },
                     line_number: 1,
-                    lines: { text: 'typescript content\n' },
+                    lines: { text: "typescript content\n" },
                   },
                 }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'test.tsx' },
+                      path: { text: "test.tsx" },
                       line_number: 1,
-                      lines: { text: 'tsx content\n' },
+                      lines: { text: "tsx content\n" },
                     },
                   }) +
-                  '\n',
+                  "\n",
               ),
             );
           }
@@ -1438,25 +1322,22 @@ describe('RipGrepTool', () => {
       });
 
       const params: RipGrepToolParams = {
-        pattern: 'content',
-        include: '*.{ts,tsx}',
+        pattern: "content",
+        include: "*.{ts,tsx}",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('test.ts');
-      expect(result.llmContent).toContain('test.tsx');
-      expect(result.llmContent).not.toContain('test.js');
-      expect(result.llmContent).not.toContain('test.txt');
+      expect(result.llmContent).toContain("test.ts");
+      expect(result.llmContent).toContain("test.tsx");
+      expect(result.llmContent).not.toContain("test.js");
+      expect(result.llmContent).not.toContain("test.txt");
     });
 
-    it('should handle directory patterns in include', async () => {
-      await fs.mkdir(path.join(tempRootDir, 'src'), { recursive: true });
-      await fs.writeFile(
-        path.join(tempRootDir, 'src', 'main.ts'),
-        'source code',
-      );
-      await fs.writeFile(path.join(tempRootDir, 'other.ts'), 'other code');
+    it("should handle directory patterns in include", async () => {
+      await fs.mkdir(path.join(tempRootDir, "src"), { recursive: true });
+      await fs.writeFile(path.join(tempRootDir, "src", "main.ts"), "source code");
+      await fs.writeFile(path.join(tempRootDir, "other.ts"), "other code");
 
       // Setup specific mock for this test - include pattern should filter to only src/** files
       mockSpawn.mockImplementationOnce(() => {
@@ -1475,24 +1356,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'src/main.ts' },
+                    path: { text: "src/main.ts" },
                     line_number: 1,
-                    lines: { text: 'source code\n' },
+                    lines: { text: "source code\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1505,168 +1382,159 @@ describe('RipGrepTool', () => {
       });
 
       const params: RipGrepToolParams = {
-        pattern: 'code',
-        include: 'src/**',
+        pattern: "code",
+        include: "src/**",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('main.ts');
-      expect(result.llmContent).not.toContain('other.ts');
+      expect(result.llmContent).toContain("main.ts");
+      expect(result.llmContent).not.toContain("other.ts");
     });
   });
 
-  describe('advanced search options', () => {
-    it('should handle case_sensitive parameter', async () => {
+  describe("advanced search options", () => {
+    it("should handle case_sensitive parameter", async () => {
       // Case-insensitive search (default)
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 1,
-                lines: { text: 'hello world\n' },
+                lines: { text: "hello world\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
-      let params: RipGrepToolParams = { pattern: 'HELLO' };
+      let params: RipGrepToolParams = { pattern: "HELLO" };
       let invocation = grepTool.build(params);
       let result = await invocation.execute(abortSignal);
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.arrayContaining(['--ignore-case']),
+        expect.arrayContaining(["--ignore-case"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "HELLO"');
-      expect(result.llmContent).toContain('L1: hello world');
+      expect(result.llmContent).toContain("L1: hello world");
 
       // Case-sensitive search
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 1,
-                lines: { text: 'HELLO world\n' },
+                lines: { text: "HELLO world\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
-      params = { pattern: 'HELLO', case_sensitive: true };
+      params = { pattern: "HELLO", case_sensitive: true };
       invocation = grepTool.build(params);
       result = await invocation.execute(abortSignal);
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.not.arrayContaining(['--ignore-case']),
+        expect.not.arrayContaining(["--ignore-case"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "HELLO"');
-      expect(result.llmContent).toContain('L1: HELLO world');
+      expect(result.llmContent).toContain("L1: HELLO world");
     });
 
     it.each([
       {
-        name: 'fixed_strings parameter',
-        params: { pattern: 'hello.world', fixed_strings: true },
+        name: "fixed_strings parameter",
+        params: { pattern: "hello.world", fixed_strings: true },
         mockOutput: {
-          path: { text: 'fileA.txt' },
+          path: { text: "fileA.txt" },
           line_number: 1,
-          lines: { text: 'hello.world\n' },
+          lines: { text: "hello.world\n" },
         },
-        expectedArgs: ['--fixed-strings'],
-        expectedPattern: 'hello.world',
-      },
-    ])(
-      'should handle $name',
-      async ({ params, mockOutput, expectedArgs, expectedPattern }) => {
-        mockSpawn.mockImplementationOnce(
-          createMockSpawn({
-            outputData:
-              JSON.stringify({ type: 'match', data: mockOutput }) + '\n',
-            exitCode: 0,
-          }),
-        );
-
-        const invocation = grepTool.build(params);
-        const result = await invocation.execute(abortSignal);
-
-        expect(mockSpawn).toHaveBeenLastCalledWith(
-          expect.anything(),
-          expect.arrayContaining(expectedArgs),
-          expect.anything(),
-        );
-        expect(result.llmContent).toContain(
-          `Found 1 match for pattern "${expectedPattern}"`,
-        );
+        expectedArgs: ["--fixed-strings"],
+        expectedPattern: "hello.world",
       },
-    );
+    ])("should handle $name", async ({ params, mockOutput, expectedArgs, expectedPattern }) => {
+      mockSpawn.mockImplementationOnce(
+        createMockSpawn({
+          outputData: JSON.stringify({ type: "match", data: mockOutput }) + "\n",
+          exitCode: 0,
+        }),
+      );
+
+      const invocation = grepTool.build(params);
+      const result = await invocation.execute(abortSignal);
 
-    it('should handle no_ignore parameter', async () => {
+      expect(mockSpawn).toHaveBeenLastCalledWith(
+        expect.anything(),
+        expect.arrayContaining(expectedArgs),
+        expect.anything(),
+      );
+      expect(result.llmContent).toContain(`Found 1 match for pattern "${expectedPattern}"`);
+    });
+
+    it("should handle no_ignore parameter", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'ignored.log' },
+                path: { text: "ignored.log" },
                 line_number: 1,
-                lines: { text: 'secret log entry\n' },
+                lines: { text: "secret log entry\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'secret', no_ignore: true };
+      const params: RipGrepToolParams = { pattern: "secret", no_ignore: true };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.arrayContaining(['--no-ignore']),
+        expect.arrayContaining(["--no-ignore"]),
         expect.anything(),
       );
 
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.not.arrayContaining(['--glob', '!node_modules']),
+        expect.not.arrayContaining(["--glob", "!node_modules"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "secret"');
-      expect(result.llmContent).toContain('File: ignored.log');
-      expect(result.llmContent).toContain('L1: secret log entry');
+      expect(result.llmContent).toContain("File: ignored.log");
+      expect(result.llmContent).toContain("L1: secret log entry");
     });
 
-    it('should handle context parameters', async () => {
+    it("should handle context parameters", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 2,
-                lines: { text: 'second line with world\n' },
-                lines_before: [{ text: 'hello world\n' }],
-                lines_after: [
-                  { text: 'third line\n' },
-                  { text: 'fourth line\n' },
-                ],
+                lines: { text: "second line with world\n" },
+                lines_before: [{ text: "hello world\n" }],
+                lines_after: [{ text: "third line\n" }, { text: "fourth line\n" }],
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
       const params: RipGrepToolParams = {
-        pattern: 'world',
+        pattern: "world",
         context: 1,
         after: 2,
         before: 1,
@@ -1676,88 +1544,75 @@ describe('RipGrepTool', () => {
 
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.arrayContaining([
-          '--context',
-          '1',
-          '--after-context',
-          '2',
-          '--before-context',
-          '1',
-        ]),
+        expect.arrayContaining(["--context", "1", "--after-context", "2", "--before-context", "1"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "world"');
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L2: second line with world');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L2: second line with world");
       // Note: Ripgrep JSON output for context lines doesn't include line numbers for context lines directly
       // The current parsing only extracts the matched line, so we only assert on that.
     });
   });
 
-  describe('getDescription', () => {
+  describe("getDescription", () => {
     it.each([
       {
-        name: 'pattern only',
-        params: { pattern: 'testPattern' },
+        name: "pattern only",
+        params: { pattern: "testPattern" },
         expected: "'testPattern' within ./",
       },
       {
-        name: 'pattern and include',
-        params: { pattern: 'testPattern', include: '*.ts' },
+        name: "pattern and include",
+        params: { pattern: "testPattern", include: "*.ts" },
         expected: "'testPattern' in *.ts within ./",
       },
       {
-        name: 'root path in description',
-        params: { pattern: 'testPattern', dir_path: '.' },
+        name: "root path in description",
+        params: { pattern: "testPattern", dir_path: "." },
         expected: "'testPattern' within ./",
       },
-    ])(
-      'should generate correct description with $name',
-      ({ params, expected }) => {
-        const invocation = grepTool.build(params);
-        expect(invocation.getDescription()).toBe(expected);
-      },
-    );
+    ])("should generate correct description with $name", ({ params, expected }) => {
+      const invocation = grepTool.build(params);
+      expect(invocation.getDescription()).toBe(expected);
+    });
 
-    it('should generate correct description with pattern and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: RipGrepToolParams = {
-        pattern: 'testPattern',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toContain("'testPattern' within");
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
 
-    it('should use ./ when no path is specified (defaults to CWD)', () => {
+    it("should use ./ when no path is specified (defaults to CWD)", () => {
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, ['/another/dir']),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, ["/another/dir"]),
         getDebugMode: () => false,
       } as unknown as Config;
 
       const multiDirGrepTool = new RipGrepTool(multiDirConfig);
-      const params: RipGrepToolParams = { pattern: 'testPattern' };
+      const params: RipGrepToolParams = { pattern: "testPattern" };
       const invocation = multiDirGrepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' within ./");
     });
 
-    it('should generate correct description with pattern, include, and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern, include, and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: RipGrepToolParams = {
-        pattern: 'testPattern',
-        include: '*.ts',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        include: "*.ts",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toContain(
-        "'testPattern' in *.ts within",
-      );
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain("'testPattern' in *.ts within");
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/tools/ripGrep.ts b/packages/gemini-cli-core/src/tools/ripGrep.ts
index 674fedb55..f78f40162 100644
--- a/packages/gemini-cli-core/src/tools/ripGrep.ts
+++ b/packages/gemini-cli-core/src/tools/ripGrep.ts
@@ -4,30 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs';
-import path from 'node:path';
-import { spawn } from 'node:child_process';
-import { downloadRipGrep } from '@joshua.litt/get-ripgrep';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { SchemaValidator } from '../utils/schemaValidator.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { fileExists } from '../utils/fileUtils.js';
-import { Storage } from '../config/storage.js';
-import { GREP_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import {
-  FileExclusions,
-  COMMON_DIRECTORY_EXCLUDES,
-} from '../utils/ignorePatterns.js';
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { downloadRipGrep } from "@joshua.litt/get-ripgrep";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { fileExists } from "../utils/fileUtils.js";
+import { COMMON_DIRECTORY_EXCLUDES, FileExclusions } from "../utils/ignorePatterns.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { SchemaValidator } from "../utils/schemaValidator.js";
+import { GREP_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 const DEFAULT_TOTAL_MAX_MATCHES = 20000;
 
 function getRgCandidateFilenames(): readonly string[] {
-  return process.platform === 'win32' ? ['rg.exe', 'rg'] : ['rg'];
+  return process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
 }
 
 async function resolveExistingRgPath(): Promise<string | null> {
@@ -76,7 +73,7 @@ export async function ensureRgPath(): Promise<string> {
   if (downloadedPath) {
     return downloadedPath;
   }
-  throw new Error('Cannot use ripgrep.');
+  throw new Error("Cannot use ripgrep.");
 }
 
 /**
@@ -86,10 +83,7 @@ export async function ensureRgPath(): Promise<string> {
  * @returns The absolute path if valid and exists, or null if no path specified.
  * @throws {Error} If path is outside root, doesn't exist, or isn't a directory/file.
  */
-function resolveAndValidatePath(
-  config: Config,
-  relativePath?: string,
-): string | null {
+function resolveAndValidatePath(config: Config, relativePath?: string): string | null {
   if (!relativePath) {
     return null;
   }
@@ -102,7 +96,7 @@ function resolveAndValidatePath(
   if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
     const directories = workspaceContext.getDirectories();
     throw new Error(
-      `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+      `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(", ")}`,
     );
   }
 
@@ -110,12 +104,10 @@ function resolveAndValidatePath(
   try {
     const stats = fs.statSync(targetPath);
     if (!stats.isDirectory() && !stats.isFile()) {
-      throw new Error(
-        `Path is not a valid directory or file: ${targetPath} (CWD: ${targetDir})`,
-      );
+      throw new Error(`Path is not a valid directory or file: ${targetPath} (CWD: ${targetDir})`);
     }
   } catch (error: unknown) {
-    if (isNodeError(error) && error.code === 'ENOENT') {
+    if (isNodeError(error) && error.code === "ENOENT") {
       throw new Error(`Path does not exist: ${targetPath} (CWD: ${targetDir})`);
     }
     throw new Error(`Failed to access path stats for ${targetPath}: ${error}`);
@@ -183,10 +175,7 @@ interface GrepMatch {
   line: string;
 }
 
-class GrepToolInvocation extends BaseToolInvocation<
-  RipGrepToolParams,
-  ToolResult
-> {
+class GrepToolInvocation extends BaseToolInvocation<RipGrepToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: RipGrepToolParams,
@@ -201,7 +190,7 @@ class GrepToolInvocation extends BaseToolInvocation<
     try {
       // Default to '.' if path is explicitly undefined/null.
       // This forces CWD search instead of 'all workspaces' search by default.
-      const pathParam = this.params.dir_path || '.';
+      const pathParam = this.params.dir_path || ".";
 
       const searchDirAbs = resolveAndValidatePath(this.config, pathParam);
       const searchDirDisplay = pathParam;
@@ -230,7 +219,7 @@ class GrepToolInvocation extends BaseToolInvocation<
 
       const searchLocationDescription = `in path "${searchDirDisplay}"`;
       if (allMatches.length === 0) {
-        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}.`;
+        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}.`;
         return { llmContent: noMatchMsg, returnDisplay: `No matches found` };
       }
 
@@ -250,9 +239,9 @@ class GrepToolInvocation extends BaseToolInvocation<
       );
 
       const matchCount = allMatches.length;
-      const matchTerm = matchCount === 1 ? 'match' : 'matches';
+      const matchTerm = matchCount === 1 ? "match" : "matches";
 
-      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}`;
+      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}`;
 
       if (wasTruncated) {
         llmContent += ` (results limited to ${totalMaxMatches} matches for performance)`;
@@ -266,7 +255,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           const trimmedLine = match.line.trim();
           llmContent += `L${match.lineNumber}: ${trimmedLine}\n`;
         });
-        llmContent += '---\n';
+        llmContent += "---\n";
       }
 
       let displayMessage = `Found ${matchCount} ${matchTerm}`;
@@ -288,21 +277,18 @@ class GrepToolInvocation extends BaseToolInvocation<
     }
   }
 
-  private parseRipgrepJsonOutput(
-    output: string,
-    basePath: string,
-  ): GrepMatch[] {
+  private parseRipgrepJsonOutput(output: string, basePath: string): GrepMatch[] {
     const results: GrepMatch[] = [];
     if (!output) return results;
 
-    const lines = output.trim().split('\n');
+    const lines = output.trim().split("\n");
 
     for (const line of lines) {
       if (!line.trim()) continue;
 
       try {
         const json = JSON.parse(line);
-        if (json.type === 'match') {
+        if (json.type === "match") {
           const match = json.data;
           // Defensive check: ensure text properties exist (skips binary/invalid encoding)
           if (match.path?.text && match.lines?.text) {
@@ -347,49 +333,49 @@ class GrepToolInvocation extends BaseToolInvocation<
       no_ignore,
     } = options;
 
-    const rgArgs = ['--json'];
+    const rgArgs = ["--json"];
 
     if (!case_sensitive) {
-      rgArgs.push('--ignore-case');
+      rgArgs.push("--ignore-case");
     }
 
     if (fixed_strings) {
-      rgArgs.push('--fixed-strings');
+      rgArgs.push("--fixed-strings");
       rgArgs.push(pattern);
     } else {
-      rgArgs.push('--regexp', pattern);
+      rgArgs.push("--regexp", pattern);
     }
 
     if (context) {
-      rgArgs.push('--context', context.toString());
+      rgArgs.push("--context", context.toString());
     }
     if (after) {
-      rgArgs.push('--after-context', after.toString());
+      rgArgs.push("--after-context", after.toString());
     }
     if (before) {
-      rgArgs.push('--before-context', before.toString());
+      rgArgs.push("--before-context", before.toString());
     }
     if (no_ignore) {
-      rgArgs.push('--no-ignore');
+      rgArgs.push("--no-ignore");
     }
 
     if (include) {
-      rgArgs.push('--glob', include);
+      rgArgs.push("--glob", include);
     }
 
     if (!no_ignore) {
       const fileExclusions = new FileExclusions(this.config);
       const excludes = fileExclusions.getGlobExcludes([
         ...COMMON_DIRECTORY_EXCLUDES,
-        '*.log',
-        '*.tmp',
+        "*.log",
+        "*.tmp",
       ]);
       excludes.forEach((exclude) => {
-        rgArgs.push('--glob', `!${exclude}`);
+        rgArgs.push("--glob", `!${exclude}`);
       });
     }
 
-    rgArgs.push('--threads', '4');
+    rgArgs.push("--threads", "4");
     rgArgs.push(absolutePath);
 
     try {
@@ -408,13 +394,13 @@ class GrepToolInvocation extends BaseToolInvocation<
           }
         };
 
-        options.signal.addEventListener('abort', cleanup, { once: true });
+        options.signal.addEventListener("abort", cleanup, { once: true });
 
-        child.stdout.on('data', (chunk) => stdoutChunks.push(chunk));
-        child.stderr.on('data', (chunk) => stderrChunks.push(chunk));
+        child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
+        child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
 
-        child.on('error', (err) => {
-          options.signal.removeEventListener('abort', cleanup);
+        child.on("error", (err) => {
+          options.signal.removeEventListener("abort", cleanup);
           reject(
             new Error(
               `Failed to start ripgrep: ${err.message}. Please ensure @lvce-editor/ripgrep is properly installed.`,
@@ -422,19 +408,17 @@ class GrepToolInvocation extends BaseToolInvocation<
           );
         });
 
-        child.on('close', (code) => {
-          options.signal.removeEventListener('abort', cleanup);
-          const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-          const stderrData = Buffer.concat(stderrChunks).toString('utf8');
+        child.on("close", (code) => {
+          options.signal.removeEventListener("abort", cleanup);
+          const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+          const stderrData = Buffer.concat(stderrChunks).toString("utf8");
 
           if (code === 0) {
             resolve(stdoutData);
           } else if (code === 1) {
-            resolve(''); // No matches found
+            resolve(""); // No matches found
           } else {
-            reject(
-              new Error(`ripgrep exited with code ${code}: ${stderrData}`),
-            );
+            reject(new Error(`ripgrep exited with code ${code}: ${stderrData}`));
           }
         });
       });
@@ -456,15 +440,12 @@ class GrepToolInvocation extends BaseToolInvocation<
     if (this.params.include) {
       description += ` in ${this.params.include}`;
     }
-    const pathParam = this.params.dir_path || '.';
+    const pathParam = this.params.dir_path || ".";
     const resolvedPath = path.resolve(this.config.getTargetDir(), pathParam);
-    if (resolvedPath === this.config.getTargetDir() || pathParam === '.') {
+    if (resolvedPath === this.config.getTargetDir() || pathParam === ".") {
       description += ` within ./`;
     } else {
-      const relativePath = makeRelative(
-        resolvedPath,
-        this.config.getTargetDir(),
-      );
+      const relativePath = makeRelative(resolvedPath, this.config.getTargetDir());
       description += ` within ${shortenPath(relativePath)}`;
     }
     return description;
@@ -474,10 +455,7 @@ class GrepToolInvocation extends BaseToolInvocation<
 /**
  * Implementation of the Grep tool logic (moved from CLI)
  */
-export class RipGrepTool extends BaseDeclarativeTool<
-  RipGrepToolParams,
-  ToolResult
-> {
+export class RipGrepTool extends BaseDeclarativeTool<RipGrepToolParams, ToolResult> {
   static readonly Name = GREP_TOOL_NAME;
 
   constructor(
@@ -486,7 +464,7 @@ export class RipGrepTool extends BaseDeclarativeTool<
   ) {
     super(
       RipGrepTool.Name,
-      'SearchText',
+      "SearchText",
       'FAST, optimized search powered by `ripgrep`. PREFERRED over standard `run_shell_command("grep ...")` due to better performance and automatic output limiting (max 20k matches).',
       Kind.Search,
       {
@@ -494,51 +472,51 @@ export class RipGrepTool extends BaseDeclarativeTool<
           pattern: {
             description:
               "The pattern to search for. By default, treated as a Rust-flavored regular expression. Use '\\b' for precise symbol matching (e.g., '\\bMatchMe\\b').",
-            type: 'string',
+            type: "string",
           },
           dir_path: {
             description:
               "Directory or file to search. Directories are searched recursively. Relative paths are resolved against current working directory. Defaults to current working directory ('.') if omitted.",
-            type: 'string',
+            type: "string",
           },
           include: {
             description:
               "Glob pattern to filter files (e.g., '*.ts', 'src/**'). Recommended for large repositories to reduce noise. Defaults to all files if omitted.",
-            type: 'string',
+            type: "string",
           },
           case_sensitive: {
             description:
-              'If true, search is case-sensitive. Defaults to false (ignore case) if omitted.',
-            type: 'boolean',
+              "If true, search is case-sensitive. Defaults to false (ignore case) if omitted.",
+            type: "boolean",
           },
           fixed_strings: {
             description:
-              'If true, treats the `pattern` as a literal string instead of a regular expression. Defaults to false (basic regex) if omitted.',
-            type: 'boolean',
+              "If true, treats the `pattern` as a literal string instead of a regular expression. Defaults to false (basic regex) if omitted.",
+            type: "boolean",
           },
           context: {
             description:
-              'Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.',
-            type: 'integer',
+              "Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.",
+            type: "integer",
           },
           after: {
             description:
-              'Show this many lines after each match (equivalent to grep -A). Defaults to 0 if omitted.',
-            type: 'integer',
+              "Show this many lines after each match (equivalent to grep -A). Defaults to 0 if omitted.",
+            type: "integer",
           },
           before: {
             description:
-              'Show this many lines before each match (equivalent to grep -B). Defaults to 0 if omitted.',
-            type: 'integer',
+              "Show this many lines before each match (equivalent to grep -B). Defaults to 0 if omitted.",
+            type: "integer",
           },
           no_ignore: {
             description:
-              'If true, searches all files including those usually ignored (like in .gitignore, build/, dist/, etc). Defaults to false if omitted.',
-            type: 'boolean',
+              "If true, searches all files including those usually ignored (like in .gitignore, build/, dist/, etc). Defaults to false if omitted.",
+            type: "boolean",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -552,10 +530,7 @@ export class RipGrepTool extends BaseDeclarativeTool<
    * @returns An error message string if invalid, null otherwise
    */
   override validateToolParams(params: RipGrepToolParams): string | null {
-    const errors = SchemaValidator.validate(
-      this.schema.parametersJsonSchema,
-      params,
-    );
+    const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
     if (errors) {
       return errors;
     }
@@ -578,12 +553,6 @@ export class RipGrepTool extends BaseDeclarativeTool<
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<RipGrepToolParams, ToolResult> {
-    return new GrepToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new GrepToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-cli-core/src/tools/shell.test.ts b/packages/gemini-cli-core/src/tools/shell.test.ts
index 0a948a4ad..18d66dec3 100644
--- a/packages/gemini-cli-core/src/tools/shell.test.ts
+++ b/packages/gemini-cli-core/src/tools/shell.test.ts
@@ -4,25 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeAll,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
 
 const mockPlatform = vi.hoisted(() => vi.fn());
 
 const mockShellExecutionService = vi.hoisted(() => vi.fn());
-vi.mock('../services/shellExecutionService.js', () => ({
+vi.mock("../services/shellExecutionService.js", () => ({
   ShellExecutionService: { execute: mockShellExecutionService },
 }));
 
-vi.mock('node:os', async (importOriginal) => {
+vi.mock("node:os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof os>();
   return {
     ...actualOs,
@@ -33,35 +24,31 @@ vi.mock('node:os', async (importOriginal) => {
     platform: mockPlatform,
   };
 });
-vi.mock('crypto');
-vi.mock('../utils/summarizer.js');
-
-import {
-  initializeShellParsers,
-  isCommandAllowed,
-} from '../utils/shell-utils.js';
-import { ShellTool } from './shell.js';
-import { type Config } from '../config/config.js';
+vi.mock("crypto");
+vi.mock("../utils/summarizer.js");
+
+import * as crypto from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import { EOL } from "node:os";
+import * as path from "node:path";
+import { type Config } from "../config/config.js";
 import {
   type ShellExecutionResult,
   type ShellOutputEvent,
-} from '../services/shellExecutionService.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import { EOL } from 'node:os';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import * as summarizer from '../utils/summarizer.js';
-import { ToolErrorType } from './tool-error.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { OUTPUT_UPDATE_INTERVAL_MS } from './shell.js';
-import { SHELL_TOOL_NAME } from './tool-names.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-const originalComSpec = process.env['ComSpec'];
-const itWindowsOnly = process.platform === 'win32' ? it : it.skip;
-
-describe('ShellTool', () => {
+} from "../services/shellExecutionService.js";
+import { initializeShellParsers, isCommandAllowed } from "../utils/shell-utils.js";
+import * as summarizer from "../utils/summarizer.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { OUTPUT_UPDATE_INTERVAL_MS, ShellTool } from "./shell.js";
+import { ToolErrorType } from "./tool-error.js";
+import { SHELL_TOOL_NAME } from "./tool-names.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+
+const originalComSpec = process.env["ComSpec"];
+const itWindowsOnly = process.platform === "win32" ? it : it.skip;
+
+describe("ShellTool", () => {
   beforeAll(async () => {
     await initializeShellParsers();
   });
@@ -75,20 +62,18 @@ describe('ShellTool', () => {
   beforeEach(() => {
     vi.clearAllMocks();
 
-    tempRootDir = fs.mkdtempSync(path.join(os.tmpdir(), 'shell-test-'));
-    fs.mkdirSync(path.join(tempRootDir, 'subdir'));
+    tempRootDir = fs.mkdtempSync(path.join(os.tmpdir(), "shell-test-"));
+    fs.mkdirSync(path.join(tempRootDir, "subdir"));
 
     mockConfig = {
       getAllowedTools: vi.fn().mockReturnValue([]),
-      getApprovalMode: vi.fn().mockReturnValue('strict'),
+      getApprovalMode: vi.fn().mockReturnValue("strict"),
       getCoreTools: vi.fn().mockReturnValue([]),
       getExcludeTools: vi.fn().mockReturnValue(new Set([])),
       getDebugMode: vi.fn().mockReturnValue(false),
       getTargetDir: vi.fn().mockReturnValue(tempRootDir),
       getSummarizeToolOutputConfig: vi.fn().mockReturnValue(undefined),
-      getWorkspaceContext: vi
-        .fn()
-        .mockReturnValue(new WorkspaceContext(tempRootDir)),
+      getWorkspaceContext: vi.fn().mockReturnValue(new WorkspaceContext(tempRootDir)),
       getGeminiClient: vi.fn(),
       getEnableInteractiveShell: vi.fn().mockReturnValue(false),
       isInteractive: vi.fn().mockReturnValue(true),
@@ -97,12 +82,9 @@ describe('ShellTool', () => {
 
     shellTool = new ShellTool(mockConfig);
 
-    mockPlatform.mockReturnValue('linux');
-    (vi.mocked(crypto.randomBytes) as Mock).mockReturnValue(
-      Buffer.from('abcdef', 'hex'),
-    );
-    process.env['ComSpec'] =
-      'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe';
+    mockPlatform.mockReturnValue("linux");
+    (vi.mocked(crypto.randomBytes) as Mock).mockReturnValue(Buffer.from("abcdef", "hex"));
+    process.env["ComSpec"] = "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe";
 
     // Capture the output callback to simulate streaming events from the service
     mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
@@ -121,96 +103,85 @@ describe('ShellTool', () => {
       fs.rmSync(tempRootDir, { recursive: true, force: true });
     }
     if (originalComSpec === undefined) {
-      delete process.env['ComSpec'];
+      delete process.env["ComSpec"];
     } else {
-      process.env['ComSpec'] = originalComSpec;
+      process.env["ComSpec"] = originalComSpec;
     }
   });
 
-  describe('isCommandAllowed', () => {
-    it('should allow a command if no restrictions are provided', () => {
+  describe("isCommandAllowed", () => {
+    it("should allow a command if no restrictions are provided", () => {
       (mockConfig.getCoreTools as Mock).mockReturnValue(undefined);
       (mockConfig.getExcludeTools as Mock).mockReturnValue(undefined);
-      expect(isCommandAllowed('goodCommand --safe', mockConfig).allowed).toBe(
-        true,
-      );
+      expect(isCommandAllowed("goodCommand --safe", mockConfig).allowed).toBe(true);
     });
 
-    it('should allow a command with command substitution using $()', () => {
-      const evaluation = isCommandAllowed(
-        'echo $(goodCommand --safe)',
-        mockConfig,
-      );
+    it("should allow a command with command substitution using $()", () => {
+      const evaluation = isCommandAllowed("echo $(goodCommand --safe)", mockConfig);
       expect(evaluation.allowed).toBe(true);
       expect(evaluation.reason).toBeUndefined();
     });
   });
 
-  describe('build', () => {
-    it('should return an invocation for a valid command', () => {
-      const invocation = shellTool.build({ command: 'goodCommand --safe' });
+  describe("build", () => {
+    it("should return an invocation for a valid command", () => {
+      const invocation = shellTool.build({ command: "goodCommand --safe" });
       expect(invocation).toBeDefined();
     });
 
-    it('should throw an error for an empty command', () => {
-      expect(() => shellTool.build({ command: ' ' })).toThrow(
-        'Command cannot be empty.',
-      );
+    it("should throw an error for an empty command", () => {
+      expect(() => shellTool.build({ command: " " })).toThrow("Command cannot be empty.");
     });
 
-    it('should return an invocation for a valid relative directory path', () => {
+    it("should return an invocation for a valid relative directory path", () => {
       const invocation = shellTool.build({
-        command: 'ls',
-        dir_path: 'subdir',
+        command: "ls",
+        dir_path: "subdir",
       });
       expect(invocation).toBeDefined();
     });
 
-    it('should throw an error for a directory outside the workspace', () => {
-      const outsidePath = path.resolve(tempRootDir, '../outside');
-      expect(() =>
-        shellTool.build({ command: 'ls', dir_path: outsidePath }),
-      ).toThrow(
+    it("should throw an error for a directory outside the workspace", () => {
+      const outsidePath = path.resolve(tempRootDir, "../outside");
+      expect(() => shellTool.build({ command: "ls", dir_path: outsidePath })).toThrow(
         `Directory '${outsidePath}' is not within any of the registered workspace directories.`,
       );
     });
 
-    it('should return an invocation for a valid absolute directory path', () => {
+    it("should return an invocation for a valid absolute directory path", () => {
       const invocation = shellTool.build({
-        command: 'ls',
-        dir_path: path.join(tempRootDir, 'subdir'),
+        command: "ls",
+        dir_path: path.join(tempRootDir, "subdir"),
       });
       expect(invocation).toBeDefined();
     });
   });
 
-  describe('execute', () => {
+  describe("execute", () => {
     const mockAbortSignal = new AbortController().signal;
 
-    const resolveShellExecution = (
-      result: Partial<ShellExecutionResult> = {},
-    ) => {
+    const resolveShellExecution = (result: Partial<ShellExecutionResult> = {}) => {
       const fullResult: ShellExecutionResult = {
-        rawOutput: Buffer.from(result.output || ''),
-        output: 'Success',
+        rawOutput: Buffer.from(result.output || ""),
+        output: "Success",
         exitCode: 0,
         signal: null,
         error: null,
         aborted: false,
         pid: 12345,
-        executionMethod: 'child_process',
+        executionMethod: "child_process",
         ...result,
       };
       resolveExecutionPromise(fullResult);
     };
 
-    it('should wrap command on linux and parse pgrep output', async () => {
-      const invocation = shellTool.build({ command: 'my-command &' });
+    it("should wrap command on linux and parse pgrep output", async () => {
+      const invocation = shellTool.build({ command: "my-command &" });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution({ pid: 54321 });
 
       // Simulate pgrep output file creation by the shell command
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       fs.writeFileSync(tmpFile, `54321${EOL}54322${EOL}`);
 
       const result = await promise;
@@ -222,24 +193,24 @@ describe('ShellTool', () => {
         expect.any(Function),
         expect.any(AbortSignal),
         false,
-        { pager: 'cat' },
+        { pager: "cat" },
       );
-      expect(result.llmContent).toContain('Background PIDs: 54322');
+      expect(result.llmContent).toContain("Background PIDs: 54322");
       // The file should be deleted by the tool
       expect(fs.existsSync(tmpFile)).toBe(false);
     });
 
-    it('should use the provided absolute directory as cwd', async () => {
-      const subdir = path.join(tempRootDir, 'subdir');
+    it("should use the provided absolute directory as cwd", async () => {
+      const subdir = path.join(tempRootDir, "subdir");
       const invocation = shellTool.build({
-        command: 'ls',
+        command: "ls",
         dir_path: subdir,
       });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution();
       await promise;
 
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       const wrappedCommand = `{ ls; }; __code=$?; pgrep -g 0 >${tmpFile} 2>&1; exit $__code;`;
       expect(mockShellExecutionService).toHaveBeenCalledWith(
         wrappedCommand,
@@ -247,83 +218,83 @@ describe('ShellTool', () => {
         expect.any(Function),
         expect.any(AbortSignal),
         false,
-        { pager: 'cat' },
+        { pager: "cat" },
       );
     });
 
-    it('should use the provided relative directory as cwd', async () => {
+    it("should use the provided relative directory as cwd", async () => {
       const invocation = shellTool.build({
-        command: 'ls',
-        dir_path: 'subdir',
+        command: "ls",
+        dir_path: "subdir",
       });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution();
       await promise;
 
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       const wrappedCommand = `{ ls; }; __code=$?; pgrep -g 0 >${tmpFile} 2>&1; exit $__code;`;
       expect(mockShellExecutionService).toHaveBeenCalledWith(
         wrappedCommand,
-        path.join(tempRootDir, 'subdir'),
+        path.join(tempRootDir, "subdir"),
         expect.any(Function),
         expect.any(AbortSignal),
         false,
-        { pager: 'cat' },
+        { pager: "cat" },
       );
     });
 
     itWindowsOnly(
-      'should not wrap command on windows',
+      "should not wrap command on windows",
       async () => {
-        mockPlatform.mockReturnValue('win32');
-        const invocation = shellTool.build({ command: 'dir' });
+        mockPlatform.mockReturnValue("win32");
+        const invocation = shellTool.build({ command: "dir" });
         const promise = invocation.execute(mockAbortSignal);
         resolveShellExecution({
-          rawOutput: Buffer.from(''),
-          output: '',
+          rawOutput: Buffer.from(""),
+          output: "",
           exitCode: 0,
           signal: null,
           error: null,
           aborted: false,
           pid: 12345,
-          executionMethod: 'child_process',
+          executionMethod: "child_process",
         });
         await promise;
         expect(mockShellExecutionService).toHaveBeenCalledWith(
-          'dir',
+          "dir",
           tempRootDir,
           expect.any(Function),
           expect.any(AbortSignal),
           false,
-          { pager: 'cat' },
+          { pager: "cat" },
         );
       },
       20000,
     );
 
-    it('should format error messages correctly', async () => {
-      const error = new Error('wrapped command failed');
-      const invocation = shellTool.build({ command: 'user-command' });
+    it("should format error messages correctly", async () => {
+      const error = new Error("wrapped command failed");
+      const invocation = shellTool.build({ command: "user-command" });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution({
         error,
         exitCode: 1,
-        output: 'err',
-        rawOutput: Buffer.from('err'),
+        output: "err",
+        rawOutput: Buffer.from("err"),
         signal: null,
         aborted: false,
         pid: 12345,
-        executionMethod: 'child_process',
+        executionMethod: "child_process",
       });
 
       const result = await promise;
-      expect(result.llmContent).toContain('Error: wrapped command failed');
-      expect(result.llmContent).not.toContain('pgrep');
+      expect(result.llmContent).toContain("Error: wrapped command failed");
+      expect(result.llmContent).not.toContain("pgrep");
     });
 
-    it('should return a SHELL_EXECUTE_ERROR for a command failure', async () => {
-      const error = new Error('command failed');
-      const invocation = shellTool.build({ command: 'user-command' });
+    it("should return a SHELL_EXECUTE_ERROR for a command failure", async () => {
+      const error = new Error("command failed");
+      const invocation = shellTool.build({ command: "user-command" });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution({
         error,
@@ -334,61 +305,57 @@ describe('ShellTool', () => {
 
       expect(result.error).toBeDefined();
       expect(result.error?.type).toBe(ToolErrorType.SHELL_EXECUTE_ERROR);
-      expect(result.error?.message).toBe('command failed');
+      expect(result.error?.message).toBe("command failed");
     });
 
-    it('should throw an error for invalid parameters', () => {
-      expect(() => shellTool.build({ command: '' })).toThrow(
-        'Command cannot be empty.',
-      );
+    it("should throw an error for invalid parameters", () => {
+      expect(() => shellTool.build({ command: "" })).toThrow("Command cannot be empty.");
     });
 
-    it('should summarize output when configured', async () => {
+    it("should summarize output when configured", async () => {
       (mockConfig.getSummarizeToolOutputConfig as Mock).mockReturnValue({
         [SHELL_TOOL_NAME]: { tokenBudget: 1000 },
       });
-      vi.mocked(summarizer.summarizeToolOutput).mockResolvedValue(
-        'summarized output',
-      );
+      vi.mocked(summarizer.summarizeToolOutput).mockResolvedValue("summarized output");
 
-      const invocation = shellTool.build({ command: 'ls' });
+      const invocation = shellTool.build({ command: "ls" });
       const promise = invocation.execute(mockAbortSignal);
       resolveExecutionPromise({
-        output: 'long output',
-        rawOutput: Buffer.from('long output'),
+        output: "long output",
+        rawOutput: Buffer.from("long output"),
         exitCode: 0,
         signal: null,
         error: null,
         aborted: false,
         pid: 12345,
-        executionMethod: 'child_process',
+        executionMethod: "child_process",
       });
 
       const result = await promise;
 
       expect(summarizer.summarizeToolOutput).toHaveBeenCalledWith(
         mockConfig,
-        { model: 'summarizer-shell' },
+        { model: "summarizer-shell" },
         expect.any(String),
         mockConfig.getGeminiClient(),
         mockAbortSignal,
       );
-      expect(result.llmContent).toBe('summarized output');
-      expect(result.returnDisplay).toBe('long output');
+      expect(result.llmContent).toBe("summarized output");
+      expect(result.returnDisplay).toBe("long output");
     });
 
-    it('should NOT start a timeout if timeoutMs is <= 0', async () => {
+    it("should NOT start a timeout if timeoutMs is <= 0", async () => {
       // Mock the timeout config to be 0
       (mockConfig.getShellToolInactivityTimeout as Mock).mockReturnValue(0);
 
       vi.useFakeTimers();
 
-      const invocation = shellTool.build({ command: 'sleep 10' });
+      const invocation = shellTool.build({ command: "sleep 10" });
       const promise = invocation.execute(mockAbortSignal);
 
       // Verify no timeout logic is triggered even after a long time
       resolveShellExecution({
-        output: 'finished',
+        output: "finished",
         exitCode: 0,
       });
 
@@ -401,44 +368,44 @@ describe('ShellTool', () => {
       vi.useRealTimers();
     });
 
-    it('should clean up the temp file on synchronous execution error', async () => {
-      const error = new Error('sync spawn error');
+    it("should clean up the temp file on synchronous execution error", async () => {
+      const error = new Error("sync spawn error");
       mockShellExecutionService.mockImplementation(() => {
         // Create the temp file before throwing to simulate it being left behind
-        const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
-        fs.writeFileSync(tmpFile, '');
+        const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
+        fs.writeFileSync(tmpFile, "");
         throw error;
       });
 
-      const invocation = shellTool.build({ command: 'a-command' });
+      const invocation = shellTool.build({ command: "a-command" });
       await expect(invocation.execute(mockAbortSignal)).rejects.toThrow(error);
 
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       expect(fs.existsSync(tmpFile)).toBe(false);
     });
 
-    describe('Streaming to `updateOutput`', () => {
+    describe("Streaming to `updateOutput`", () => {
       let updateOutputMock: Mock;
       beforeEach(() => {
-        vi.useFakeTimers({ toFake: ['Date'] });
+        vi.useFakeTimers({ toFake: ["Date"] });
         updateOutputMock = vi.fn();
       });
       afterEach(() => {
         vi.useRealTimers();
       });
 
-      it('should immediately show binary detection message and throttle progress', async () => {
-        const invocation = shellTool.build({ command: 'cat img' });
+      it("should immediately show binary detection message and throttle progress", async () => {
+        const invocation = shellTool.build({ command: "cat img" });
         const promise = invocation.execute(mockAbortSignal, updateOutputMock);
 
-        mockShellOutputCallback({ type: 'binary_detected' });
+        mockShellOutputCallback({ type: "binary_detected" });
         expect(updateOutputMock).toHaveBeenCalledOnce();
         expect(updateOutputMock).toHaveBeenCalledWith(
-          '[Binary output detected. Halting stream...]',
+          "[Binary output detected. Halting stream...]",
         );
 
         mockShellOutputCallback({
-          type: 'binary_progress',
+          type: "binary_progress",
           bytesReceived: 1024,
         });
         expect(updateOutputMock).toHaveBeenCalledOnce();
@@ -448,127 +415,109 @@ describe('ShellTool', () => {
 
         // Send a SECOND progress event. This one will trigger the flush.
         mockShellOutputCallback({
-          type: 'binary_progress',
+          type: "binary_progress",
           bytesReceived: 2048,
         });
 
         // Now it should be called a second time with the latest progress.
         expect(updateOutputMock).toHaveBeenCalledTimes(2);
         expect(updateOutputMock).toHaveBeenLastCalledWith(
-          '[Receiving binary output... 2.0 KB received]',
+          "[Receiving binary output... 2.0 KB received]",
         );
 
         resolveExecutionPromise({
-          rawOutput: Buffer.from(''),
-          output: '',
+          rawOutput: Buffer.from(""),
+          output: "",
           exitCode: 0,
           signal: null,
           error: null,
           aborted: false,
           pid: 12345,
-          executionMethod: 'child_process',
+          executionMethod: "child_process",
         });
         await promise;
       });
     });
   });
 
-  describe('shouldConfirmExecute', () => {
+  describe("shouldConfirmExecute", () => {
     it('should request confirmation for a new command and allowlist it on "Always"', async () => {
-      const params = { command: 'npm install' };
+      const params = { command: "npm install" };
       const invocation = shellTool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(confirmation).not.toBe(false);
-      expect(confirmation && confirmation.type).toBe('exec');
+      expect(confirmation && confirmation.type).toBe("exec");
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      await (confirmation as any).onConfirm(
-        ToolConfirmationOutcome.ProceedAlways,
-      );
+      await (confirmation as any).onConfirm(ToolConfirmationOutcome.ProceedAlways);
 
       // Should now be allowlisted
-      const secondInvocation = shellTool.build({ command: 'npm test' });
+      const secondInvocation = shellTool.build({ command: "npm test" });
       const secondConfirmation = await secondInvocation.shouldConfirmExecute(
         new AbortController().signal,
       );
       expect(secondConfirmation).toBe(false);
     });
 
-    it('should throw an error if validation fails', () => {
-      expect(() => shellTool.build({ command: '' })).toThrow();
+    it("should throw an error if validation fails", () => {
+      expect(() => shellTool.build({ command: "" })).toThrow();
     });
 
-    describe('in non-interactive mode', () => {
+    describe("in non-interactive mode", () => {
       beforeEach(() => {
         (mockConfig.isInteractive as Mock).mockReturnValue(false);
       });
 
-      it('should not throw an error or block for an allowed command', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue(['ShellTool(wc)']);
-        const invocation = shellTool.build({ command: 'wc -l foo.txt' });
-        const confirmation = await invocation.shouldConfirmExecute(
-          new AbortController().signal,
-        );
+      it("should not throw an error or block for an allowed command", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc)"]);
+        const invocation = shellTool.build({ command: "wc -l foo.txt" });
+        const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
         expect(confirmation).toBe(false);
       });
 
-      it('should not throw an error or block for an allowed command with arguments', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(wc -l)',
-        ]);
-        const invocation = shellTool.build({ command: 'wc -l foo.txt' });
-        const confirmation = await invocation.shouldConfirmExecute(
-          new AbortController().signal,
-        );
+      it("should not throw an error or block for an allowed command with arguments", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc -l)"]);
+        const invocation = shellTool.build({ command: "wc -l foo.txt" });
+        const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
         expect(confirmation).toBe(false);
       });
 
-      it('should throw an error for command that is not allowed', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(wc -l)',
-        ]);
-        const invocation = shellTool.build({ command: 'madeupcommand' });
-        await expect(
-          invocation.shouldConfirmExecute(new AbortController().signal),
-        ).rejects.toThrow('madeupcommand');
+      it("should throw an error for command that is not allowed", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc -l)"]);
+        const invocation = shellTool.build({ command: "madeupcommand" });
+        await expect(invocation.shouldConfirmExecute(new AbortController().signal)).rejects.toThrow(
+          "madeupcommand",
+        );
       });
 
-      it('should throw an error for a command that is a prefix of an allowed command', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(wc -l)',
-        ]);
-        const invocation = shellTool.build({ command: 'wc' });
-        await expect(
-          invocation.shouldConfirmExecute(new AbortController().signal),
-        ).rejects.toThrow('wc');
+      it("should throw an error for a command that is a prefix of an allowed command", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc -l)"]);
+        const invocation = shellTool.build({ command: "wc" });
+        await expect(invocation.shouldConfirmExecute(new AbortController().signal)).rejects.toThrow(
+          "wc",
+        );
       });
 
-      it('should require all segments of a chained command to be allowlisted', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(echo)',
-        ]);
+      it("should require all segments of a chained command to be allowlisted", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(echo)"]);
         const invocation = shellTool.build({ command: 'echo "foo" && ls -l' });
-        await expect(
-          invocation.shouldConfirmExecute(new AbortController().signal),
-        ).rejects.toThrow(
+        await expect(invocation.shouldConfirmExecute(new AbortController().signal)).rejects.toThrow(
           'Command "echo "foo" && ls -l" is not in the list of allowed tools for non-interactive mode.',
         );
       });
     });
   });
 
-  describe('getDescription', () => {
-    it('should return the windows description when on windows', () => {
-      mockPlatform.mockReturnValue('win32');
+  describe("getDescription", () => {
+    it("should return the windows description when on windows", () => {
+      mockPlatform.mockReturnValue("win32");
       const shellTool = new ShellTool(mockConfig);
       expect(shellTool.description).toMatchSnapshot();
     });
 
-    it('should return the non-windows description when not on windows', () => {
-      mockPlatform.mockReturnValue('linux');
+    it("should return the non-windows description when not on windows", () => {
+      mockPlatform.mockReturnValue("linux");
       const shellTool = new ShellTool(mockConfig);
       expect(shellTool.description).toMatchSnapshot();
     });
diff --git a/packages/gemini-cli-core/src/tools/shell.ts b/packages/gemini-cli-core/src/tools/shell.ts
index b0d6324ad..c599b2e1d 100644
--- a/packages/gemini-cli-core/src/tools/shell.ts
+++ b/packages/gemini-cli-core/src/tools/shell.ts
@@ -4,45 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import os, { EOL } from 'node:os';
-import crypto from 'node:crypto';
-import type { Config } from '../config/config.js';
-import { debugLogger, type AnyToolInvocation } from '../index.js';
-import { ToolErrorType } from './tool-error.js';
-import type {
-  ToolInvocation,
-  ToolResult,
-  ToolCallConfirmationDetails,
-  ToolExecuteConfirmationDetails,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  ToolConfirmationOutcome,
-  Kind,
-} from './tools.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import { getErrorMessage } from '../utils/errors.js';
-import { summarizeToolOutput } from '../utils/summarizer.js';
-import type {
-  ShellExecutionConfig,
-  ShellOutputEvent,
-} from '../services/shellExecutionService.js';
-import { ShellExecutionService } from '../services/shellExecutionService.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
+import crypto from "node:crypto";
+import fs from "node:fs";
+import os, { EOL } from "node:os";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { type AnyToolInvocation, debugLogger } from "../index.js";
+import { ApprovalMode } from "../policy/types.js";
+import type { ShellExecutionConfig, ShellOutputEvent } from "../services/shellExecutionService.js";
+import { ShellExecutionService } from "../services/shellExecutionService.js";
+
+import { getErrorMessage } from "../utils/errors.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
 import {
   getCommandRoots,
   initializeShellParsers,
   isCommandAllowed,
   isShellInvocationAllowlisted,
   stripShellWrapper,
-} from '../utils/shell-utils.js';
-import { SHELL_TOOL_NAME } from './tool-names.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+} from "../utils/shell-utils.js";
+import { summarizeToolOutput } from "../utils/summarizer.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { ToolErrorType } from "./tool-error.js";
+import { SHELL_TOOL_NAME } from "./tool-names.js";
+import type {
+  ToolCallConfirmationDetails,
+  ToolExecuteConfirmationDetails,
+  ToolInvocation,
+  ToolResult,
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 
@@ -52,10 +44,7 @@ export interface ShellToolParams {
   dir_path?: string;
 }
 
-export class ShellToolInvocation extends BaseToolInvocation<
-  ShellToolParams,
-  ToolResult
-> {
+export class ShellToolInvocation extends BaseToolInvocation<ShellToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: ShellToolParams,
@@ -78,7 +67,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
     }
     // append optional (description), replacing any line breaks with spaces
     if (this.params.description) {
-      description += ` (${this.params.description.replace(/\n/g, ' ')})`;
+      description += ` (${this.params.description.replace(/\n/g, " ")})`;
     }
     return description;
   }
@@ -93,10 +82,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
     // waiting for user input. If a tool is not fully allowed (e.g. via
     // --allowed-tools="ShellTool(wc)"), we should throw an error instead of
     // prompting for confirmation. This check is skipped in YOLO mode.
-    if (
-      !this.config.isInteractive() &&
-      this.config.getApprovalMode() !== ApprovalMode.YOLO
-    ) {
+    if (!this.config.isInteractive() && this.config.getApprovalMode() !== ApprovalMode.YOLO) {
       if (this.isInvocationAllowlisted(command)) {
         // If it's an allowed shell command, we don't need to confirm execution.
         return false;
@@ -107,19 +93,17 @@ export class ShellToolInvocation extends BaseToolInvocation<
       );
     }
 
-    const commandsToConfirm = rootCommands.filter(
-      (command) => !this.allowlist.has(command),
-    );
+    const commandsToConfirm = rootCommands.filter((command) => !this.allowlist.has(command));
 
     if (commandsToConfirm.length === 0) {
       return false; // already approved and allowlisted
     }
 
     const confirmationDetails: ToolExecuteConfirmationDetails = {
-      type: 'exec',
-      title: 'Confirm Shell Command',
+      type: "exec",
+      title: "Confirm Shell Command",
       command: this.params.command,
-      rootCommand: commandsToConfirm.join(', '),
+      rootCommand: commandsToConfirm.join(", "),
       onConfirm: async (outcome: ToolConfirmationOutcome) => {
         if (outcome === ToolConfirmationOutcome.ProceedAlways) {
           commandsToConfirm.forEach((command) => this.allowlist.add(command));
@@ -139,15 +123,13 @@ export class ShellToolInvocation extends BaseToolInvocation<
 
     if (signal.aborted) {
       return {
-        llmContent: 'Command was cancelled by user before it could start.',
-        returnDisplay: 'Command cancelled by user.',
+        llmContent: "Command was cancelled by user before it could start.",
+        returnDisplay: "Command cancelled by user.",
       };
     }
 
-    const isWindows = os.platform() === 'win32';
-    const tempFileName = `shell_pgrep_${crypto
-      .randomBytes(6)
-      .toString('hex')}.tmp`;
+    const isWindows = os.platform() === "win32";
+    const tempFileName = `shell_pgrep_${crypto.randomBytes(6).toString("hex")}.tmp`;
     const tempFilePath = path.join(os.tmpdir(), tempFileName);
 
     const timeoutMs = this.config.getShellToolInactivityTimeout();
@@ -166,7 +148,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
         : (() => {
             // wrap command to append subprocess pids (via pgrep) to temporary file
             let command = strippedCommand.trim();
-            if (!command.endsWith('&')) command += ';';
+            if (!command.endsWith("&")) command += ";";
             return `{ ${command} }; __code=$?; pgrep -g 0 >${tempFilePath} 2>&1; exit $__code;`;
           })();
 
@@ -174,7 +156,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
         ? path.resolve(this.config.getTargetDir(), this.params.dir_path)
         : this.config.getTargetDir();
 
-      let cumulativeOutput: string | AnsiOutput = '';
+      let cumulativeOutput: string | AnsiOutput = "";
       let lastUpdateTime = Date.now();
       let isBinaryStream = false;
 
@@ -188,61 +170,59 @@ export class ShellToolInvocation extends BaseToolInvocation<
         }, timeoutMs);
       };
 
-      signal.addEventListener('abort', onAbort, { once: true });
-      timeoutController.signal.addEventListener('abort', onAbort, {
+      signal.addEventListener("abort", onAbort, { once: true });
+      timeoutController.signal.addEventListener("abort", onAbort, {
         once: true,
       });
 
       // Start timeout
       resetTimeout();
 
-      const { result: resultPromise, pid } =
-        await ShellExecutionService.execute(
-          commandToExecute,
-          cwd,
-          (event: ShellOutputEvent) => {
-            resetTimeout(); // Reset timeout on any event
-            if (!updateOutput) {
-              return;
-            }
-
-            let shouldUpdate = false;
+      const { result: resultPromise, pid } = await ShellExecutionService.execute(
+        commandToExecute,
+        cwd,
+        (event: ShellOutputEvent) => {
+          resetTimeout(); // Reset timeout on any event
+          if (!updateOutput) {
+            return;
+          }
 
-            switch (event.type) {
-              case 'data':
-                if (isBinaryStream) break;
-                cumulativeOutput = event.chunk;
+          let shouldUpdate = false;
+
+          switch (event.type) {
+            case "data":
+              if (isBinaryStream) break;
+              cumulativeOutput = event.chunk;
+              shouldUpdate = true;
+              break;
+            case "binary_detected":
+              isBinaryStream = true;
+              cumulativeOutput = "[Binary output detected. Halting stream...]";
+              shouldUpdate = true;
+              break;
+            case "binary_progress":
+              isBinaryStream = true;
+              cumulativeOutput = `[Receiving binary output... ${formatMemoryUsage(
+                event.bytesReceived,
+              )} received]`;
+              if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
                 shouldUpdate = true;
-                break;
-              case 'binary_detected':
-                isBinaryStream = true;
-                cumulativeOutput =
-                  '[Binary output detected. Halting stream...]';
-                shouldUpdate = true;
-                break;
-              case 'binary_progress':
-                isBinaryStream = true;
-                cumulativeOutput = `[Receiving binary output... ${formatMemoryUsage(
-                  event.bytesReceived,
-                )} received]`;
-                if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
-                  shouldUpdate = true;
-                }
-                break;
-              default: {
-                throw new Error('An unhandled ShellOutputEvent was found.');
               }
+              break;
+            default: {
+              throw new Error("An unhandled ShellOutputEvent was found.");
             }
+          }
 
-            if (shouldUpdate) {
-              updateOutput(cumulativeOutput);
-              lastUpdateTime = Date.now();
-            }
-          },
-          combinedController.signal,
-          this.config.getEnableInteractiveShell(),
-          { ...shellExecutionConfig, pager: 'cat' },
-        );
+          if (shouldUpdate) {
+            updateOutput(cumulativeOutput);
+            lastUpdateTime = Date.now();
+          }
+        },
+        combinedController.signal,
+        this.config.getEnableInteractiveShell(),
+        { ...shellExecutionConfig, pager: "cat" },
+      );
 
       if (pid && setPidCallback) {
         setPidCallback(pid);
@@ -251,12 +231,9 @@ export class ShellToolInvocation extends BaseToolInvocation<
       const result = await resultPromise;
 
       const backgroundPIDs: number[] = [];
-      if (os.platform() !== 'win32') {
+      if (os.platform() !== "win32") {
         if (fs.existsSync(tempFilePath)) {
-          const pgrepLines = fs
-            .readFileSync(tempFilePath, 'utf8')
-            .split(EOL)
-            .filter(Boolean);
+          const pgrepLines = fs.readFileSync(tempFilePath, "utf8").split(EOL).filter(Boolean);
           for (const line of pgrepLines) {
             if (!/^\d+$/.test(line)) {
               debugLogger.error(`pgrep: ${line}`);
@@ -268,13 +245,13 @@ export class ShellToolInvocation extends BaseToolInvocation<
           }
         } else {
           if (!signal.aborted) {
-            debugLogger.error('missing pgrep output');
+            debugLogger.error("missing pgrep output");
           }
         }
       }
 
-      let llmContent = '';
-      let timeoutMessage = '';
+      let llmContent = "";
+      let timeoutMessage = "";
       if (result.aborted) {
         if (timeoutController.signal.aborted) {
           timeoutMessage = `Command was automatically cancelled because it exceeded the timeout of ${(
@@ -282,36 +259,33 @@ export class ShellToolInvocation extends BaseToolInvocation<
           ).toFixed(1)} minutes without output.`;
           llmContent = timeoutMessage;
         } else {
-          llmContent =
-            'Command was cancelled by user before it could complete.';
+          llmContent = "Command was cancelled by user before it could complete.";
         }
         if (result.output.trim()) {
           llmContent += ` Below is the output before it was cancelled:\n${result.output}`;
         } else {
-          llmContent += ' There was no output before it was cancelled.';
+          llmContent += " There was no output before it was cancelled.";
         }
       } else {
         // Create a formatted error string for display, replacing the wrapper command
         // with the user-facing command.
         const finalError = result.error
           ? result.error.message.replace(commandToExecute, this.params.command)
-          : '(none)';
+          : "(none)";
 
         llmContent = [
           `Command: ${this.params.command}`,
-          `Directory: ${this.params.dir_path || '(root)'}`,
-          `Output: ${result.output || '(empty)'}`,
+          `Directory: ${this.params.dir_path || "(root)"}`,
+          `Output: ${result.output || "(empty)"}`,
           `Error: ${finalError}`, // Use the cleaned error string.
-          `Exit Code: ${result.exitCode ?? '(none)'}`,
-          `Signal: ${result.signal ?? '(none)'}`,
-          `Background PIDs: ${
-            backgroundPIDs.length ? backgroundPIDs.join(', ') : '(none)'
-          }`,
-          `Process Group PGID: ${result.pid ?? '(none)'}`,
-        ].join('\n');
+          `Exit Code: ${result.exitCode ?? "(none)"}`,
+          `Signal: ${result.signal ?? "(none)"}`,
+          `Background PIDs: ${backgroundPIDs.length ? backgroundPIDs.join(", ") : "(none)"}`,
+          `Process Group PGID: ${result.pid ?? "(none)"}`,
+        ].join("\n");
       }
 
-      let returnDisplayMessage = '';
+      let returnDisplayMessage = "";
       if (this.config.getDebugMode()) {
         returnDisplayMessage = llmContent;
       } else {
@@ -322,14 +296,12 @@ export class ShellToolInvocation extends BaseToolInvocation<
             if (timeoutMessage) {
               returnDisplayMessage = timeoutMessage;
             } else {
-              returnDisplayMessage = 'Command cancelled by user.';
+              returnDisplayMessage = "Command cancelled by user.";
             }
           } else if (result.signal) {
             returnDisplayMessage = `Command terminated by signal: ${result.signal}`;
           } else if (result.error) {
-            returnDisplayMessage = `Command failed: ${getErrorMessage(
-              result.error,
-            )}`;
+            returnDisplayMessage = `Command failed: ${getErrorMessage(result.error)}`;
           } else if (result.exitCode !== null && result.exitCode !== 0) {
             returnDisplayMessage = `Command exited with code: ${result.exitCode}`;
           }
@@ -350,7 +322,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
       if (summarizeConfig && summarizeConfig[SHELL_TOOL_NAME]) {
         const summary = await summarizeToolOutput(
           this.config,
-          { model: 'summarizer-shell' },
+          { model: "summarizer-shell" },
           llmContent,
           this.config.getGeminiClient(),
           signal,
@@ -369,8 +341,8 @@ export class ShellToolInvocation extends BaseToolInvocation<
       };
     } finally {
       if (timeoutTimer) clearTimeout(timeoutTimer);
-      signal.removeEventListener('abort', onAbort);
-      timeoutController.signal.removeEventListener('abort', onAbort);
+      signal.removeEventListener("abort", onAbort);
+      timeoutController.signal.removeEventListener("abort", onAbort);
       if (fs.existsSync(tempFilePath)) {
         fs.unlinkSync(tempFilePath);
       }
@@ -403,7 +375,7 @@ function getShellToolDescription(): string {
       Background PIDs: List of background processes started or \`(none)\`.
       Process Group PGID: Process group started or \`(none)\``;
 
-  if (os.platform() === 'win32') {
+  if (os.platform() === "win32") {
     return `This tool executes a given shell command as \`powershell.exe -NoProfile -Command <command>\`. Command can start background processes using PowerShell constructs such as \`Start-Process -NoNewWindow\` or \`Start-Job\`.${returnedInfo}`;
   } else {
     return `This tool executes a given shell command as \`bash -c <command>\`. Command can start background processes using \`&\`. Command is executed as a subprocess that leads its own process group. Command process group can be terminated as \`kill -- -PGID\` or signaled as \`kill -s SIGNAL -- -PGID\`.${returnedInfo}`;
@@ -411,17 +383,14 @@ function getShellToolDescription(): string {
 }
 
 function getCommandDescription(): string {
-  if (os.platform() === 'win32') {
-    return 'Exact command to execute as `powershell.exe -NoProfile -Command <command>`';
+  if (os.platform() === "win32") {
+    return "Exact command to execute as `powershell.exe -NoProfile -Command <command>`";
   } else {
-    return 'Exact bash command to execute as `bash -c <command>`';
+    return "Exact bash command to execute as `bash -c <command>`";
   }
 }
 
-export class ShellTool extends BaseDeclarativeTool<
-  ShellToolParams,
-  ToolResult
-> {
+export class ShellTool extends BaseDeclarativeTool<ShellToolParams, ToolResult> {
   static readonly Name = SHELL_TOOL_NAME;
 
   private allowlist: Set<string> = new Set();
@@ -435,28 +404,28 @@ export class ShellTool extends BaseDeclarativeTool<
     });
     super(
       ShellTool.Name,
-      'Shell',
+      "Shell",
       getShellToolDescription(),
       Kind.Execute,
       {
-        type: 'object',
+        type: "object",
         properties: {
           command: {
-            type: 'string',
+            type: "string",
             description: getCommandDescription(),
           },
           description: {
-            type: 'string',
+            type: "string",
             description:
-              'Brief description of the command for the user. Be specific and concise. Ideally a single sentence. Can be up to 3 sentences for clarity. No line breaks.',
+              "Brief description of the command for the user. Be specific and concise. Ideally a single sentence. Can be up to 3 sentences for clarity. No line breaks.",
           },
           dir_path: {
-            type: 'string',
+            type: "string",
             description:
-              '(OPTIONAL) The path of the directory to run the command in. If not provided, the project root directory is used. Must be a directory within the workspace and must already exist.',
+              "(OPTIONAL) The path of the directory to run the command in. If not provided, the project root directory is used. Must be a directory within the workspace and must already exist.",
           },
         },
-        required: ['command'],
+        required: ["command"],
       },
       false, // output is not markdown
       true, // output can be updated
@@ -464,31 +433,24 @@ export class ShellTool extends BaseDeclarativeTool<
     );
   }
 
-  protected override validateToolParamValues(
-    params: ShellToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: ShellToolParams): string | null {
     if (!params.command.trim()) {
-      return 'Command cannot be empty.';
+      return "Command cannot be empty.";
     }
 
     const commandCheck = isCommandAllowed(params.command, this.config);
     if (!commandCheck.allowed) {
       if (!commandCheck.reason) {
-        debugLogger.error(
-          'Unexpected: isCommandAllowed returned false without a reason',
-        );
+        debugLogger.error("Unexpected: isCommandAllowed returned false without a reason");
         return `Command is not allowed: ${params.command}`;
       }
       return commandCheck.reason;
     }
     if (getCommandRoots(params.command).length === 0) {
-      return 'Could not identify command root to obtain permission from user.';
+      return "Could not identify command root to obtain permission from user.";
     }
     if (params.dir_path) {
-      const resolvedPath = path.resolve(
-        this.config.getTargetDir(),
-        params.dir_path,
-      );
+      const resolvedPath = path.resolve(this.config.getTargetDir(), params.dir_path);
       const workspaceContext = this.config.getWorkspaceContext();
       if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
         return `Directory '${resolvedPath}' is not within any of the registered workspace directories.`;
diff --git a/packages/gemini-cli-core/src/tools/smart-edit.test.ts b/packages/gemini-cli-core/src/tools/smart-edit.test.ts
index 2a003f0b8..d0c0223d7 100644
--- a/packages/gemini-cli-core/src/tools/smart-edit.test.ts
+++ b/packages/gemini-cli-core/src/tools/smart-edit.test.ts
@@ -10,56 +10,44 @@ const mockFixLLMEditWithInstruction = vi.hoisted(() => vi.fn());
 const mockGenerateJson = vi.hoisted(() => vi.fn());
 const mockOpenDiff = vi.hoisted(() => vi.fn());
 
-import { IdeClient } from '../ide/ide-client.js';
+import { IdeClient } from "../ide/ide-client.js";
 
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn(),
   },
 }));
 
-vi.mock('../utils/llm-edit-fixer.js', () => ({
+vi.mock("../utils/llm-edit-fixer.js", () => ({
   FixLLMEditWithInstruction: mockFixLLMEditWithInstruction,
 }));
 
-vi.mock('../core/client.js', () => ({
+vi.mock("../core/client.js", () => ({
   GeminiClient: vi.fn().mockImplementation(() => ({
     generateJson: mockGenerateJson,
     getHistory: vi.fn().mockResolvedValue([]),
   })),
 }));
 
-vi.mock('../utils/editor.js', () => ({
+vi.mock("../utils/editor.js", () => ({
   openDiff: mockOpenDiff,
 }));
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  vi,
-  type Mock,
-} from 'vitest';
-import {
-  SmartEditTool,
-  type EditToolParams,
-  calculateReplacement,
-} from './smart-edit.js';
-import { type FileDiff, ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import { ApprovalMode } from '../policy/types.js';
-import { type Config } from '../config/config.js';
-import { type Content, type Part, type SchemaUnion } from '@google/genai';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-
-describe('SmartEditTool', () => {
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { type Content, type Part, type SchemaUnion } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { ApprovalMode } from "../policy/types.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import { calculateReplacement, type EditToolParams, SmartEditTool } from "./smart-edit.js";
+import { ToolErrorType } from "./tool-error.js";
+import { type FileDiff, ToolConfirmationOutcome } from "./tools.js";
+
+describe("SmartEditTool", () => {
   let tool: SmartEditTool;
   let tempDir: string;
   let rootDir: string;
@@ -70,8 +58,8 @@ describe('SmartEditTool', () => {
 
   beforeEach(() => {
     vi.restoreAllMocks();
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'smart-edit-tool-test-'));
-    rootDir = path.join(tempDir, 'root');
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "smart-edit-tool-test-"));
+    rootDir = path.join(tempDir, "root");
     fs.mkdirSync(rootDir);
 
     geminiClient = {
@@ -87,8 +75,8 @@ describe('SmartEditTool', () => {
 
     mockConfig = {
       getUsageStatisticsEnabled: vi.fn(() => true),
-      getSessionId: vi.fn(() => 'mock-session-id'),
-      getContentGeneratorConfig: vi.fn(() => ({ authType: 'mock' })),
+      getSessionId: vi.fn(() => "mock-session-id"),
+      getContentGeneratorConfig: vi.fn(() => ({ authType: "mock" })),
       getUseSmartEdit: vi.fn(() => false),
       getProxy: vi.fn(() => undefined),
       getGeminiClient: vi.fn().mockReturnValue(geminiClient),
@@ -99,8 +87,8 @@ describe('SmartEditTool', () => {
       getWorkspaceContext: () => createMockWorkspaceContext(rootDir),
       getFileSystemService: () => fileSystemService,
       getIdeMode: () => false,
-      getApiKey: () => 'test-api-key',
-      getModel: () => 'test-model',
+      getApiKey: () => "test-api-key",
+      getModel: () => "test-model",
       getSandbox: () => false,
       getDebugMode: () => false,
       getQuestion: () => undefined,
@@ -109,8 +97,8 @@ describe('SmartEditTool', () => {
       getToolCallCommand: () => undefined,
       getMcpServerCommand: () => undefined,
       getMcpServers: () => undefined,
-      getUserAgent: () => 'test-agent',
-      getUserMemory: () => '',
+      getUserAgent: () => "test-agent",
+      getUserMemory: () => "",
       setUserMemory: vi.fn(),
       getGeminiMdFileCount: () => 0,
       setGeminiMdFileCount: vi.fn(),
@@ -125,46 +113,39 @@ describe('SmartEditTool', () => {
     mockFixLLMEditWithInstruction.mockReset();
     mockFixLLMEditWithInstruction.mockResolvedValue({
       noChangesRequired: false,
-      search: '',
-      replace: '',
-      explanation: 'LLM fix failed',
+      search: "",
+      replace: "",
+      explanation: "LLM fix failed",
     });
 
     mockGenerateJson.mockReset();
-    mockGenerateJson.mockImplementation(
-      async (contents: Content[], schema: SchemaUnion) => {
-        const userContent = contents.find((c: Content) => c.role === 'user');
-        let promptText = '';
-        if (userContent && userContent.parts) {
-          promptText = userContent.parts
-            .filter((p: Part) => typeof (p as any).text === 'string')
-            .map((p: Part) => (p as any).text)
-            .join('\n');
-        }
-        const snippetMatch = promptText.match(
-          /Problematic target snippet:\n```\n([\s\S]*?)\n```/,
-        );
-        const problematicSnippet =
-          snippetMatch && snippetMatch[1] ? snippetMatch[1] : '';
+    mockGenerateJson.mockImplementation(async (contents: Content[], schema: SchemaUnion) => {
+      const userContent = contents.find((c: Content) => c.role === "user");
+      let promptText = "";
+      if (userContent && userContent.parts) {
+        promptText = userContent.parts
+          .filter((p: Part) => typeof (p as any).text === "string")
+          .map((p: Part) => (p as any).text)
+          .join("\n");
+      }
+      const snippetMatch = promptText.match(/Problematic target snippet:\n```\n([\s\S]*?)\n```/);
+      const problematicSnippet = snippetMatch && snippetMatch[1] ? snippetMatch[1] : "";
 
-        if (((schema as any).properties as any)?.corrected_target_snippet) {
-          return Promise.resolve({
-            corrected_target_snippet: problematicSnippet,
-          });
-        }
-        if (((schema as any).properties as any)?.corrected_new_string) {
-          const originalNewStringMatch = promptText.match(
-            /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
-          );
-          const originalNewString =
-            originalNewStringMatch && originalNewStringMatch[1]
-              ? originalNewStringMatch[1]
-              : '';
-          return Promise.resolve({ corrected_new_string: originalNewString });
-        }
-        return Promise.resolve({});
-      },
-    );
+      if (((schema as any).properties as any)?.corrected_target_snippet) {
+        return Promise.resolve({
+          corrected_target_snippet: problematicSnippet,
+        });
+      }
+      if (((schema as any).properties as any)?.corrected_new_string) {
+        const originalNewStringMatch = promptText.match(
+          /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
+        );
+        const originalNewString =
+          originalNewStringMatch && originalNewStringMatch[1] ? originalNewStringMatch[1] : "";
+        return Promise.resolve({ corrected_new_string: originalNewString });
+      }
+      return Promise.resolve({});
+    });
 
     tool = new SmartEditTool(mockConfig);
   });
@@ -173,92 +154,88 @@ describe('SmartEditTool', () => {
     fs.rmSync(tempDir, { recursive: true, force: true });
   });
 
-  describe('calculateReplacement', () => {
+  describe("calculateReplacement", () => {
     const abortSignal = new AbortController().signal;
 
     it.each([
       {
-        name: 'perform an exact replacement',
-        content: 'hello world',
-        old_string: 'world',
-        new_string: 'moon',
-        expected: 'hello moon',
+        name: "perform an exact replacement",
+        content: "hello world",
+        old_string: "world",
+        new_string: "moon",
+        expected: "hello moon",
         occurrences: 1,
       },
       {
-        name: 'perform a flexible, whitespace-insensitive replacement',
-        content: '  hello\n    world\n',
-        old_string: 'hello\nworld',
-        new_string: 'goodbye\nmoon',
-        expected: '  goodbye\n  moon\n',
+        name: "perform a flexible, whitespace-insensitive replacement",
+        content: "  hello\n    world\n",
+        old_string: "hello\nworld",
+        new_string: "goodbye\nmoon",
+        expected: "  goodbye\n  moon\n",
         occurrences: 1,
       },
       {
-        name: 'return 0 occurrences if no match is found',
-        content: 'hello world',
-        old_string: 'nomatch',
-        new_string: 'moon',
-        expected: 'hello world',
+        name: "return 0 occurrences if no match is found",
+        content: "hello world",
+        old_string: "nomatch",
+        new_string: "moon",
+        expected: "hello world",
         occurrences: 0,
       },
-    ])(
-      'should $name',
-      async ({ content, old_string, new_string, expected, occurrences }) => {
-        const result = await calculateReplacement(mockConfig, {
-          params: {
-            file_path: 'test.txt',
-            instruction: 'test',
-            old_string,
-            new_string,
-          },
-          currentContent: content,
-          abortSignal,
-        });
-        expect(result.newContent).toBe(expected);
-        expect(result.occurrences).toBe(occurrences);
-      },
-    );
+    ])("should $name", async ({ content, old_string, new_string, expected, occurrences }) => {
+      const result = await calculateReplacement(mockConfig, {
+        params: {
+          file_path: "test.txt",
+          instruction: "test",
+          old_string,
+          new_string,
+        },
+        currentContent: content,
+        abortSignal,
+      });
+      expect(result.newContent).toBe(expected);
+      expect(result.occurrences).toBe(occurrences);
+    });
 
-    it('should perform a regex-based replacement for flexible intra-line whitespace', async () => {
+    it("should perform a regex-based replacement for flexible intra-line whitespace", async () => {
       // This case would fail with the previous exact and line-trimming flexible logic
       // because the whitespace *within* the line is different.
-      const content = '  function  myFunc( a, b ) {\n    return a + b;\n  }';
+      const content = "  function  myFunc( a, b ) {\n    return a + b;\n  }";
       const result = await calculateReplacement(mockConfig, {
         params: {
-          file_path: 'test.js',
-          instruction: 'test',
-          old_string: 'function myFunc(a, b) {', // Note the normalized whitespace
-          new_string: 'const yourFunc = (a, b) => {',
+          file_path: "test.js",
+          instruction: "test",
+          old_string: "function myFunc(a, b) {", // Note the normalized whitespace
+          new_string: "const yourFunc = (a, b) => {",
         },
         currentContent: content,
         abortSignal,
       });
 
       // The indentation from the original line should be preserved and applied to the new string.
-      const expectedContent =
-        '  const yourFunc = (a, b) => {\n    return a + b;\n  }';
+      const expectedContent = "  const yourFunc = (a, b) => {\n    return a + b;\n  }";
       expect(result.newContent).toBe(expectedContent);
       expect(result.occurrences).toBe(1);
     });
   });
 
-  describe('validateToolParams', () => {
-    it('should return null for valid params', () => {
+  describe("validateToolParams", () => {
+    it("should return null for valid params", () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'test.txt'),
-        instruction: 'An instruction',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "test.txt"),
+        instruction: "An instruction",
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return an error if path is outside the workspace', () => {
+    it("should return an error if path is outside the workspace", () => {
       const params: EditToolParams = {
-        file_path: path.join(os.tmpdir(), 'outside.txt'),
-        instruction: 'An instruction',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(os.tmpdir(), "outside.txt"),
+        instruction: "An instruction",
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(params)).toMatch(
         /must be within one of the workspace directories/,
@@ -266,30 +243,28 @@ describe('SmartEditTool', () => {
     });
   });
 
-  describe('execute', () => {
-    const testFile = 'execute_me.txt';
+  describe("execute", () => {
+    const testFile = "execute_me.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should reject when calculateEdit fails after an abort signal', async () => {
+    it("should reject when calculateEdit fails after an abort signal", async () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'abort-execute.txt'),
-        instruction: 'Abort during execute',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "abort-execute.txt"),
+        instruction: "Abort during execute",
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error(
-        'Abort requested during smart edit execution',
-      );
+      const abortError = new Error("Abort requested during smart edit execution");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -297,68 +272,64 @@ describe('SmartEditTool', () => {
           throw abortError;
         });
 
-      await expect(invocation.execute(abortController.signal)).rejects.toBe(
-        abortError,
-      );
+      await expect(invocation.execute(abortController.signal)).rejects.toBe(abortError);
 
       calculateSpy.mockRestore();
     });
 
-    it('should edit an existing file and return diff with fileName', async () => {
-      const initialContent = 'This is some old text.';
-      const newContent = 'This is some new text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should edit an existing file and return diff with fileName", async () => {
+      const initialContent = "This is some old text.";
+      const newContent = "This is some new text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace old with new',
-        old_string: 'old',
-        new_string: 'new',
+        instruction: "Replace old with new",
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(newContent);
       const display = result.returnDisplay as FileDiff;
       expect(display.fileDiff).toMatch(initialContent);
       expect(display.fileDiff).toMatch(newContent);
       expect(display.fileName).toBe(testFile);
     });
 
-    it('should return error if old_string is not found in file', async () => {
-      fs.writeFileSync(filePath, 'Some content.', 'utf8');
+    it("should return error if old_string is not found in file", async () => {
+      fs.writeFileSync(filePath, "Some content.", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace non-existent text',
-        old_string: 'nonexistent',
-        new_string: 'replacement',
+        instruction: "Replace non-existent text",
+        old_string: "nonexistent",
+        new_string: "replacement",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toMatch(/0 occurrences found for old_string/);
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, could not find the string to replace./,
-      );
+      expect(result.returnDisplay).toMatch(/Failed to edit, could not find the string to replace./);
       expect(mockFixLLMEditWithInstruction).toHaveBeenCalled();
     });
 
-    it('should succeed if FixLLMEditWithInstruction corrects the params', async () => {
-      const initialContent = 'This is some original text.';
-      const finalContent = 'This is some brand new text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should succeed if FixLLMEditWithInstruction corrects the params", async () => {
+      const initialContent = "This is some original text.";
+      const finalContent = "This is some brand new text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace original with brand new',
-        old_string: 'wrong text', // This will fail first
-        new_string: 'brand new text',
+        instruction: "Replace original with brand new",
+        old_string: "wrong text", // This will fail first
+        new_string: "brand new text",
       };
 
       mockFixLLMEditWithInstruction.mockResolvedValueOnce({
         noChangesRequired: false,
-        search: 'original text', // The corrected search string
-        replace: 'brand new text',
-        explanation: 'Corrected the search string to match the file content.',
+        search: "original text", // The corrected search string
+        replace: "brand new text",
+        explanation: "Corrected the search string to match the file content.",
       });
 
       const invocation = tool.build(params);
@@ -366,99 +337,93 @@ describe('SmartEditTool', () => {
 
       expect(result.error).toBeUndefined();
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(finalContent);
       expect(mockFixLLMEditWithInstruction).toHaveBeenCalledTimes(1);
     });
 
-    it('should preserve CRLF line endings when editing a file', async () => {
-      const initialContent = 'line one\r\nline two\r\n';
-      const newContent = 'line one\r\nline three\r\n';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should preserve CRLF line endings when editing a file", async () => {
+      const initialContent = "line one\r\nline two\r\n";
+      const newContent = "line one\r\nline three\r\n";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace two with three',
-        old_string: 'line two',
-        new_string: 'line three',
+        instruction: "Replace two with three",
+        old_string: "line two",
+        new_string: "line three",
       };
 
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
-      const finalContent = fs.readFileSync(filePath, 'utf8');
+      const finalContent = fs.readFileSync(filePath, "utf8");
       expect(finalContent).toBe(newContent);
     });
 
-    it('should create a new file with CRLF line endings if new_string has them', async () => {
-      const newContentWithCRLF = 'new line one\r\nnew line two\r\n';
+    it("should create a new file with CRLF line endings if new_string has them", async () => {
+      const newContentWithCRLF = "new line one\r\nnew line two\r\n";
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Create a new file',
-        old_string: '',
+        instruction: "Create a new file",
+        old_string: "",
         new_string: newContentWithCRLF,
       };
 
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
-      const finalContent = fs.readFileSync(filePath, 'utf8');
+      const finalContent = fs.readFileSync(filePath, "utf8");
       expect(finalContent).toBe(newContentWithCRLF);
     });
 
-    it('should return NO_CHANGE if FixLLMEditWithInstruction determines no changes are needed', async () => {
-      const initialContent = 'The price is $100.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should return NO_CHANGE if FixLLMEditWithInstruction determines no changes are needed", async () => {
+      const initialContent = "The price is $100.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Ensure the price is $100',
-        old_string: 'price is $50', // Incorrect old string
-        new_string: 'price is $100',
+        instruction: "Ensure the price is $100",
+        old_string: "price is $50", // Incorrect old string
+        new_string: "price is $100",
       };
 
       mockFixLLMEditWithInstruction.mockResolvedValueOnce({
         noChangesRequired: true,
-        search: '',
-        replace: '',
-        explanation: 'The price is already correctly set to $100.',
+        search: "",
+        replace: "",
+        explanation: "The price is already correctly set to $100.",
       });
 
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.error?.type).toBe(
-        ToolErrorType.EDIT_NO_CHANGE_LLM_JUDGEMENT,
-      );
-      expect(result.llmContent).toMatch(
-        /A secondary check by an LLM determined/,
-      );
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent); // File is unchanged
+      expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_CHANGE_LLM_JUDGEMENT);
+      expect(result.llmContent).toMatch(/A secondary check by an LLM determined/);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(initialContent); // File is unchanged
     });
   });
 
-  describe('self-correction with content refresh to pull in external edits', () => {
-    const testFile = 'test.txt';
+  describe("self-correction with content refresh to pull in external edits", () => {
+    const testFile = "test.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should use refreshed file content for self-correction if file was modified externally', async () => {
-      const initialContent = 'This is the original content.';
-      const externallyModifiedContent =
-        'This is the externally modified content.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should use refreshed file content for self-correction if file was modified externally", async () => {
+      const initialContent = "This is the original content.";
+      const externallyModifiedContent = "This is the externally modified content.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
 
       const params: EditToolParams = {
         file_path: filePath,
-        instruction:
-          'Replace "externally modified content" with "externally modified string"',
-        old_string: 'externally modified content', // This will fail the first attempt, triggering self-correction.
-        new_string: 'externally modified string',
+        instruction: 'Replace "externally modified content" with "externally modified string"',
+        old_string: "externally modified content", // This will fail the first attempt, triggering self-correction.
+        new_string: "externally modified string",
       };
 
       // Spy on `readTextFile` to simulate an external file change between reads.
       const readTextFileSpy = vi
-        .spyOn(fileSystemService, 'readTextFile')
+        .spyOn(fileSystemService, "readTextFile")
         .mockResolvedValueOnce(initialContent) // First call in `calculateEdit`
         .mockResolvedValueOnce(externallyModifiedContent); // Second call in `attemptSelfCorrection`
 
@@ -474,7 +439,7 @@ describe('SmartEditTool', () => {
         params.old_string,
         params.new_string,
         expect.stringContaining(
-          'However, the file has been modified by either the user or an external process',
+          "However, the file has been modified by either the user or an external process",
         ), // errorForLlmEditFixer
         externallyModifiedContent, // The new content for correction
         expect.any(Object), // baseLlmClient
@@ -483,8 +448,8 @@ describe('SmartEditTool', () => {
     });
   });
 
-  describe('Error Scenarios', () => {
-    const testFile = 'error_test.txt';
+  describe("Error Scenarios", () => {
+    const testFile = "error_test.txt";
     let filePath: string;
 
     beforeEach(() => {
@@ -493,46 +458,43 @@ describe('SmartEditTool', () => {
 
     it.each([
       {
-        name: 'FILE_NOT_FOUND',
+        name: "FILE_NOT_FOUND",
         setup: () => {}, // no file created
-        params: { old_string: 'any', new_string: 'new' },
+        params: { old_string: "any", new_string: "new" },
         expectedError: ToolErrorType.FILE_NOT_FOUND,
       },
       {
-        name: 'ATTEMPT_TO_CREATE_EXISTING_FILE',
-        setup: (fp: string) => fs.writeFileSync(fp, 'existing content', 'utf8'),
-        params: { old_string: '', new_string: 'new content' },
+        name: "ATTEMPT_TO_CREATE_EXISTING_FILE",
+        setup: (fp: string) => fs.writeFileSync(fp, "existing content", "utf8"),
+        params: { old_string: "", new_string: "new content" },
         expectedError: ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
       },
       {
-        name: 'NO_OCCURRENCE_FOUND',
-        setup: (fp: string) => fs.writeFileSync(fp, 'content', 'utf8'),
-        params: { old_string: 'not-found', new_string: 'new' },
+        name: "NO_OCCURRENCE_FOUND",
+        setup: (fp: string) => fs.writeFileSync(fp, "content", "utf8"),
+        params: { old_string: "not-found", new_string: "new" },
         expectedError: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
       },
       {
-        name: 'EXPECTED_OCCURRENCE_MISMATCH',
-        setup: (fp: string) => fs.writeFileSync(fp, 'one one two', 'utf8'),
-        params: { old_string: 'one', new_string: 'new' },
+        name: "EXPECTED_OCCURRENCE_MISMATCH",
+        setup: (fp: string) => fs.writeFileSync(fp, "one one two", "utf8"),
+        params: { old_string: "one", new_string: "new" },
         expectedError: ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
       },
-    ])(
-      'should return $name error',
-      async ({ setup, params, expectedError }) => {
-        setup(filePath);
-        const invocation = tool.build({
-          file_path: filePath,
-          instruction: 'test',
-          ...params,
-        });
-        const result = await invocation.execute(new AbortController().signal);
-        expect(result.error?.type).toBe(expectedError);
-      },
-    );
+    ])("should return $name error", async ({ setup, params, expectedError }) => {
+      setup(filePath);
+      const invocation = tool.build({
+        file_path: filePath,
+        instruction: "test",
+        ...params,
+      });
+      const result = await invocation.execute(new AbortController().signal);
+      expect(result.error?.type).toBe(expectedError);
+    });
   });
 
-  describe('expected_replacements', () => {
-    const testFile = 'replacements_test.txt';
+  describe("expected_replacements", () => {
+    const testFile = "replacements_test.txt";
     let filePath: string;
 
     beforeEach(() => {
@@ -541,53 +503,47 @@ describe('SmartEditTool', () => {
 
     it.each([
       {
-        name: 'succeed when occurrences match expected_replacements',
-        content: 'foo foo foo',
+        name: "succeed when occurrences match expected_replacements",
+        content: "foo foo foo",
         expected: 3,
         shouldSucceed: true,
-        finalContent: 'bar bar bar',
+        finalContent: "bar bar bar",
       },
       {
-        name: 'fail when occurrences do not match expected_replacements',
-        content: 'foo foo foo',
+        name: "fail when occurrences do not match expected_replacements",
+        content: "foo foo foo",
         expected: 2,
         shouldSucceed: false,
       },
       {
-        name: 'default to 1 expected replacement if not specified',
-        content: 'foo foo',
+        name: "default to 1 expected replacement if not specified",
+        content: "foo foo",
         expected: undefined,
         shouldSucceed: false,
       },
-    ])(
-      'should $name',
-      async ({ content, expected, shouldSucceed, finalContent }) => {
-        fs.writeFileSync(filePath, content, 'utf8');
-        const params: EditToolParams = {
-          file_path: filePath,
-          instruction: 'Replace all foo with bar',
-          old_string: 'foo',
-          new_string: 'bar',
-          ...(expected !== undefined && { expected_replacements: expected }),
-        };
-        const invocation = tool.build(params);
-        const result = await invocation.execute(new AbortController().signal);
+    ])("should $name", async ({ content, expected, shouldSucceed, finalContent }) => {
+      fs.writeFileSync(filePath, content, "utf8");
+      const params: EditToolParams = {
+        file_path: filePath,
+        instruction: "Replace all foo with bar",
+        old_string: "foo",
+        new_string: "bar",
+        ...(expected !== undefined && { expected_replacements: expected }),
+      };
+      const invocation = tool.build(params);
+      const result = await invocation.execute(new AbortController().signal);
 
-        if (shouldSucceed) {
-          expect(result.error).toBeUndefined();
-          if (finalContent)
-            expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
-        } else {
-          expect(result.error?.type).toBe(
-            ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
-          );
-        }
-      },
-    );
+      if (shouldSucceed) {
+        expect(result.error).toBeUndefined();
+        if (finalContent) expect(fs.readFileSync(filePath, "utf8")).toBe(finalContent);
+      } else {
+        expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
+      }
+    });
   });
 
-  describe('IDE mode', () => {
-    const testFile = 'edit_me.txt';
+  describe("IDE mode", () => {
+    const testFile = "edit_me.txt";
     let filePath: string;
     let ideClient: any;
 
@@ -601,31 +557,29 @@ describe('SmartEditTool', () => {
       (mockConfig as any).getIdeMode = () => true;
     });
 
-    it('should call ideClient.openDiff and update params on confirmation', async () => {
-      const initialContent = 'some old content here';
-      const newContent = 'some new content here';
-      const modifiedContent = 'some modified content here';
+    it("should call ideClient.openDiff and update params on confirmation", async () => {
+      const initialContent = "some old content here";
+      const newContent = "some new content here";
+      const modifiedContent = "some modified content here";
       fs.writeFileSync(filePath, initialContent);
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'test',
-        old_string: 'old',
-        new_string: 'new',
+        instruction: "test",
+        old_string: "old",
+        new_string: "new",
       };
 
       ideClient.openDiff.mockResolvedValueOnce({
-        status: 'accepted',
+        status: "accepted",
         content: modifiedContent,
       });
 
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(ideClient.openDiff).toHaveBeenCalledWith(filePath, newContent);
 
-      if (confirmation && 'onConfirm' in confirmation) {
+      if (confirmation && "onConfirm" in confirmation) {
         await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
       }
 
@@ -634,24 +588,22 @@ describe('SmartEditTool', () => {
     });
   });
 
-  describe('shouldConfirmExecute', () => {
-    it('should rethrow calculateEdit errors when the abort signal is triggered', async () => {
-      const filePath = path.join(rootDir, 'abort-confirmation.txt');
+  describe("shouldConfirmExecute", () => {
+    it("should rethrow calculateEdit errors when the abort signal is triggered", async () => {
+      const filePath = path.join(rootDir, "abort-confirmation.txt");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Abort during confirmation',
-        old_string: 'old',
-        new_string: 'new',
+        instruction: "Abort during confirmation",
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error(
-        'Abort requested during smart edit confirmation',
-      );
+      const abortError = new Error("Abort requested during smart edit confirmation");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -659,16 +611,16 @@ describe('SmartEditTool', () => {
           throw abortError;
         });
 
-      await expect(
-        invocation.shouldConfirmExecute(abortController.signal),
-      ).rejects.toBe(abortError);
+      await expect(invocation.shouldConfirmExecute(abortController.signal)).rejects.toBe(
+        abortError,
+      );
 
       calculateSpy.mockRestore();
     });
   });
 
-  describe('multiple file edits', () => {
-    it('should perform multiple removals and report correct diff stats', async () => {
+  describe("multiple file edits", () => {
+    it("should perform multiple removals and report correct diff stats", async () => {
       const numFiles = 10;
       const files: Array<{
         path: string;
@@ -683,23 +635,17 @@ describe('SmartEditTool', () => {
         const fileName = `test-file-${i}.txt`;
         const filePath = path.join(rootDir, fileName);
         const numLines = Math.floor(Math.random() * 6) + 5; // 5 to 10 lines
-        const lines = Array.from(
-          { length: numLines },
-          (_, j) => `File ${i}, Line ${j + 1}`,
-        );
-        const content = lines.join('\n') + '\n';
+        const lines = Array.from({ length: numLines }, (_, j) => `File ${i}, Line ${j + 1}`);
+        const content = lines.join("\n") + "\n";
 
         // Determine which lines to remove (2 or 3 lines)
         const numLinesToRemove = Math.floor(Math.random() * 2) + 2; // 2 or 3
         expectedLinesRemoved.push(numLinesToRemove);
         const startLineToRemove = 1; // Start removing from the second line
-        const linesToRemove = lines.slice(
-          startLineToRemove,
-          startLineToRemove + numLinesToRemove,
-        );
-        const toRemove = linesToRemove.join('\n') + '\n';
+        const linesToRemove = lines.slice(startLineToRemove, startLineToRemove + numLinesToRemove);
+        const toRemove = linesToRemove.join("\n") + "\n";
 
-        fs.writeFileSync(filePath, content, 'utf8');
+        fs.writeFileSync(filePath, content, "utf8");
         files.push({
           path: filePath,
           initialContent: content,
@@ -713,21 +659,19 @@ describe('SmartEditTool', () => {
           file_path: file.path,
           instruction: `Remove lines from the file`,
           old_string: file.toRemove,
-          new_string: '', // Removing the content
-          ai_proposed_string: '',
+          new_string: "", // Removing the content
+          ai_proposed_string: "",
         };
         const invocation = tool.build(params);
         const result = await invocation.execute(new AbortController().signal);
 
         if (
           result.returnDisplay &&
-          typeof result.returnDisplay === 'object' &&
-          'diffStat' in result.returnDisplay &&
+          typeof result.returnDisplay === "object" &&
+          "diffStat" in result.returnDisplay &&
           result.returnDisplay.diffStat
         ) {
-          actualLinesRemoved.push(
-            result.returnDisplay.diffStat?.model_removed_lines,
-          );
+          actualLinesRemoved.push(result.returnDisplay.diffStat?.model_removed_lines);
         } else if (result.error) {
           console.error(`Edit failed for ${file.path}:`, result.error);
         }
@@ -735,21 +679,15 @@ describe('SmartEditTool', () => {
 
       // 3. Assert that the content was removed from each file
       for (const file of files) {
-        const finalContent = fs.readFileSync(file.path, 'utf8');
-        const expectedContent = file.initialContent.replace(file.toRemove, '');
+        const finalContent = fs.readFileSync(file.path, "utf8");
+        const expectedContent = file.initialContent.replace(file.toRemove, "");
         expect(finalContent).toBe(expectedContent);
         expect(finalContent).not.toContain(file.toRemove);
       }
 
       // 4. Assert that the total number of removed lines matches the diffStat total
-      const totalExpectedRemoved = expectedLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
-      const totalActualRemoved = actualLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
+      const totalExpectedRemoved = expectedLinesRemoved.reduce((sum, current) => sum + current, 0);
+      const totalActualRemoved = actualLinesRemoved.reduce((sum, current) => sum + current, 0);
       expect(totalActualRemoved).toBe(totalExpectedRemoved);
     });
   });
diff --git a/packages/gemini-cli-core/src/tools/smart-edit.ts b/packages/gemini-cli-core/src/tools/smart-edit.ts
index 86d412b40..896a7ded6 100644
--- a/packages/gemini-cli-core/src/tools/smart-edit.ts
+++ b/packages/gemini-cli-core/src/tools/smart-edit.ts
@@ -4,10 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import * as Diff from 'diff';
+import * as crypto from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logSmartEditCorrectionEvent, logSmartEditStrategy } from "../telemetry/loggers.js";
+import { SmartEditCorrectionEvent, SmartEditStrategyEvent } from "../telemetry/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isNodeError } from "../utils/errors.js";
+import { FixLLMEditWithInstruction } from "../utils/llm-edit-fixer.js";
+import { correctPath } from "../utils/pathCorrector.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { safeLiteralReplace } from "../utils/textUtils.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import { applyReplacement } from "./edit.js";
+import { type ModifiableDeclarativeTool, type ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from "./tool-names.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -19,31 +36,8 @@ import {
   type ToolLocation,
   type ToolResult,
   type ToolResultDisplay,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { isNodeError } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import {
-  type ModifiableDeclarativeTool,
-  type ModifyContext,
-} from './modifiable-tool.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { FixLLMEditWithInstruction } from '../utils/llm-edit-fixer.js';
-import { applyReplacement } from './edit.js';
-import { safeLiteralReplace } from '../utils/textUtils.js';
-import { SmartEditStrategyEvent } from '../telemetry/types.js';
-import { logSmartEditStrategy } from '../telemetry/loggers.js';
-import { SmartEditCorrectionEvent } from '../telemetry/types.js';
-import { logSmartEditCorrectionEvent } from '../telemetry/loggers.js';
-
-import { correctPath } from '../utils/pathCorrector.js';
-import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "./tools.js";
+
 interface ReplacementContext {
   params: EditToolParams;
   currentContent: string;
@@ -63,18 +57,15 @@ interface ReplacementResult {
  * @returns A hex-encoded hash string.
  */
 function hashContent(content: string): string {
-  return crypto.createHash('sha256').update(content).digest('hex');
+  return crypto.createHash("sha256").update(content).digest("hex");
 }
 
-function restoreTrailingNewline(
-  originalContent: string,
-  modifiedContent: string,
-): string {
-  const hadTrailingNewline = originalContent.endsWith('\n');
-  if (hadTrailingNewline && !modifiedContent.endsWith('\n')) {
-    return modifiedContent + '\n';
-  } else if (!hadTrailingNewline && modifiedContent.endsWith('\n')) {
-    return modifiedContent.replace(/\n$/, '');
+function restoreTrailingNewline(originalContent: string, modifiedContent: string): string {
+  const hadTrailingNewline = originalContent.endsWith("\n");
+  if (hadTrailingNewline && !modifiedContent.endsWith("\n")) {
+    return modifiedContent + "\n";
+  } else if (!hadTrailingNewline && modifiedContent.endsWith("\n")) {
+    return modifiedContent.replace(/\n$/, "");
   }
   return modifiedContent;
 }
@@ -85,7 +76,7 @@ function restoreTrailingNewline(
  * @returns The escaped string.
  */
 function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
 }
 
 async function calculateExactReplacement(
@@ -95,16 +86,12 @@ async function calculateExactReplacement(
   const { old_string, new_string } = params;
 
   const normalizedCode = currentContent;
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
   const exactOccurrences = normalizedCode.split(normalizedSearch).length - 1;
   if (exactOccurrences > 0) {
-    let modifiedCode = safeLiteralReplace(
-      normalizedCode,
-      normalizedSearch,
-      normalizedReplace,
-    );
+    let modifiedCode = safeLiteralReplace(normalizedCode, normalizedSearch, normalizedReplace);
     modifiedCode = restoreTrailingNewline(currentContent, modifiedCode);
     return {
       newContent: modifiedCode,
@@ -124,14 +111,12 @@ async function calculateFlexibleReplacement(
   const { old_string, new_string } = params;
 
   const normalizedCode = currentContent;
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
   const sourceLines = normalizedCode.match(/.*(?:\n|$)/g)?.slice(0, -1) ?? [];
-  const searchLinesStripped = normalizedSearch
-    .split('\n')
-    .map((line: string) => line.trim());
-  const replaceLines = normalizedReplace.split('\n');
+  const searchLinesStripped = normalizedSearch.split("\n").map((line: string) => line.trim());
+  const replaceLines = normalizedReplace.split("\n");
 
   let flexibleOccurrences = 0;
   let i = 0;
@@ -146,15 +131,9 @@ async function calculateFlexibleReplacement(
       flexibleOccurrences++;
       const firstLineInMatch = window[0];
       const indentationMatch = firstLineInMatch.match(/^(\s*)/);
-      const indentation = indentationMatch ? indentationMatch[1] : '';
-      const newBlockWithIndent = replaceLines.map(
-        (line: string) => `${indentation}${line}`,
-      );
-      sourceLines.splice(
-        i,
-        searchLinesStripped.length,
-        newBlockWithIndent.join('\n'),
-      );
+      const indentation = indentationMatch ? indentationMatch[1] : "";
+      const newBlockWithIndent = replaceLines.map((line: string) => `${indentation}${line}`);
+      sourceLines.splice(i, searchLinesStripped.length, newBlockWithIndent.join("\n"));
       i += replaceLines.length;
     } else {
       i++;
@@ -162,7 +141,7 @@ async function calculateFlexibleReplacement(
   }
 
   if (flexibleOccurrences > 0) {
-    let modifiedCode = sourceLines.join('');
+    let modifiedCode = sourceLines.join("");
     modifiedCode = restoreTrailingNewline(currentContent, modifiedCode);
     return {
       newContent: modifiedCode,
@@ -182,12 +161,12 @@ async function calculateRegexReplacement(
   const { old_string, new_string } = params;
 
   // Normalize line endings for consistent processing.
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
   // This logic is ported from your Python implementation.
   // It builds a flexible, multi-line regex from a search string.
-  const delimiters = ['(', ')', ':', '[', ']', '{', '}', '>', '<', '='];
+  const delimiters = ["(", ")", ":", "[", "]", "{", "}", ">", "<", "="];
 
   let processedString = normalizedSearch;
   for (const delim of delimiters) {
@@ -203,12 +182,12 @@ async function calculateRegexReplacement(
 
   const escapedTokens = tokens.map(escapeRegex);
   // Join tokens with `\s*` to allow for flexible whitespace between them.
-  const pattern = escapedTokens.join('\\s*');
+  const pattern = escapedTokens.join("\\s*");
 
   // The final pattern captures leading whitespace (indentation) and then matches the token pattern.
   // 'm' flag enables multi-line mode, so '^' matches the start of any line.
   const finalPattern = `^(\\s*)${pattern}`;
-  const flexibleRegex = new RegExp(finalPattern, 'm');
+  const flexibleRegex = new RegExp(finalPattern, "m");
 
   const match = flexibleRegex.exec(currentContent);
 
@@ -216,18 +195,13 @@ async function calculateRegexReplacement(
     return null;
   }
 
-  const indentation = match[1] || '';
-  const newLines = normalizedReplace.split('\n');
-  const newBlockWithIndent = newLines
-    .map((line) => `${indentation}${line}`)
-    .join('\n');
+  const indentation = match[1] || "";
+  const newLines = normalizedReplace.split("\n");
+  const newBlockWithIndent = newLines.map((line) => `${indentation}${line}`).join("\n");
 
   // Use replace with the regex to substitute the matched content.
   // Since the regex doesn't have the 'g' flag, it will only replace the first occurrence.
-  const modifiedCode = currentContent.replace(
-    flexibleRegex,
-    newBlockWithIndent,
-  );
+  const modifiedCode = currentContent.replace(flexibleRegex, newBlockWithIndent);
 
   return {
     newContent: restoreTrailingNewline(currentContent, modifiedCode),
@@ -242,10 +216,10 @@ async function calculateRegexReplacement(
  * @param content The string content to analyze.
  * @returns '\r\n' for Windows-style, '\n' for Unix-style.
  */
-function detectLineEnding(content: string): '\r\n' | '\n' {
+function detectLineEnding(content: string): "\r\n" | "\n" {
   // If a Carriage Return is found, assume Windows-style endings.
   // This is a simple but effective heuristic.
-  return content.includes('\r\n') ? '\r\n' : '\n';
+  return content.includes("\r\n") ? "\r\n" : "\n";
 }
 
 export async function calculateReplacement(
@@ -254,10 +228,10 @@ export async function calculateReplacement(
 ): Promise<ReplacementResult> {
   const { currentContent, params } = context;
   const { old_string, new_string } = params;
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
-  if (normalizedSearch === '') {
+  if (normalizedSearch === "") {
     return {
       newContent: currentContent,
       occurrences: 0,
@@ -268,21 +242,21 @@ export async function calculateReplacement(
 
   const exactResult = await calculateExactReplacement(context);
   if (exactResult) {
-    const event = new SmartEditStrategyEvent('exact');
+    const event = new SmartEditStrategyEvent("exact");
     logSmartEditStrategy(config, event);
     return exactResult;
   }
 
   const flexibleResult = await calculateFlexibleReplacement(context);
   if (flexibleResult) {
-    const event = new SmartEditStrategyEvent('flexible');
+    const event = new SmartEditStrategyEvent("flexible");
     logSmartEditStrategy(config, event);
     return flexibleResult;
   }
 
   const regexResult = await calculateRegexReplacement(context);
   if (regexResult) {
-    const event = new SmartEditStrategyEvent('regex');
+    const event = new SmartEditStrategyEvent("regex");
     logSmartEditStrategy(config, event);
     return regexResult;
   }
@@ -302,8 +276,7 @@ export function getErrorReplaceResult(
   finalOldString: string,
   finalNewString: string,
 ) {
-  let error: { display: string; raw: string; type: ToolErrorType } | undefined =
-    undefined;
+  let error: { display: string; raw: string; type: ToolErrorType } | undefined = undefined;
   if (occurrences === 0) {
     error = {
       display: `Failed to edit, could not find the string to replace.`,
@@ -311,8 +284,7 @@ export function getErrorReplaceResult(
       type: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
     };
   } else if (occurrences !== expectedReplacements) {
-    const occurrenceTerm =
-      expectedReplacements === 1 ? 'occurrence' : 'occurrences';
+    const occurrenceTerm = expectedReplacements === 1 ? "occurrence" : "occurrences";
 
     error = {
       display: `Failed to edit, expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences}.`,
@@ -376,7 +348,7 @@ interface CalculatedEdit {
   occurrences: number;
   error?: { display: string; raw: string; type: ToolErrorType };
   isNewFile: boolean;
-  originalLineEnding: '\r\n' | '\n';
+  originalLineEnding: "\r\n" | "\n";
 }
 
 class EditToolInvocation
@@ -402,7 +374,7 @@ class EditToolInvocation
     currentContent: string,
     initialError: { display: string; raw: string; type: ToolErrorType },
     abortSignal: AbortSignal,
-    originalLineEnding: '\r\n' | '\n',
+    originalLineEnding: "\r\n" | "\n",
   ): Promise<CalculatedEdit> {
     // In order to keep from clobbering edits made outside our system,
     // check if the file has been modified since we first read it.
@@ -410,15 +382,13 @@ class EditToolInvocation
     let contentForLlmEditFixer = currentContent;
 
     const initialContentHash = hashContent(currentContent);
-    const onDiskContent = await this.config
-      .getFileSystemService()
-      .readTextFile(params.file_path);
-    const onDiskContentHash = hashContent(onDiskContent.replace(/\r\n/g, '\n'));
+    const onDiskContent = await this.config.getFileSystemService().readTextFile(params.file_path);
+    const onDiskContentHash = hashContent(onDiskContent.replace(/\r\n/g, "\n"));
 
     if (initialContentHash !== onDiskContentHash) {
       // The file has changed on disk since we first read it.
       // Use the latest content for the correction attempt.
-      contentForLlmEditFixer = onDiskContent.replace(/\r\n/g, '\n');
+      contentForLlmEditFixer = onDiskContent.replace(/\r\n/g, "\n");
       errorForLlmEditFixer = `The initial edit attempt failed with the following error: "${initialError.raw}". However, the file has been modified by either the user or an external process since that edit attempt. The file content provided to you is the latest version. Please base your correction on this new content.`;
     }
 
@@ -479,7 +449,7 @@ class EditToolInvocation
 
     if (secondError) {
       // The fix failed, log failure and return the original error
-      const event = new SmartEditCorrectionEvent('failure');
+      const event = new SmartEditCorrectionEvent("failure");
       logSmartEditCorrectionEvent(this.config, event);
 
       return {
@@ -492,7 +462,7 @@ class EditToolInvocation
       };
     }
 
-    const event = new SmartEditCorrectionEvent('success');
+    const event = new SmartEditCorrectionEvent("success");
     logSmartEditCorrectionEvent(this.config, event);
 
     return {
@@ -518,23 +488,21 @@ class EditToolInvocation
     const expectedReplacements = params.expected_replacements ?? 1;
     let currentContent: string | null = null;
     let fileExists = false;
-    let originalLineEnding: '\r\n' | '\n' = '\n'; // Default for new files
+    let originalLineEnding: "\r\n" | "\n" = "\n"; // Default for new files
 
     try {
-      currentContent = await this.config
-        .getFileSystemService()
-        .readTextFile(params.file_path);
+      currentContent = await this.config.getFileSystemService().readTextFile(params.file_path);
       originalLineEnding = detectLineEnding(currentContent);
-      currentContent = currentContent.replace(/\r\n/g, '\n');
+      currentContent = currentContent.replace(/\r\n/g, "\n");
       fileExists = true;
     } catch (err: unknown) {
-      if (!isNodeError(err) || err.code !== 'ENOENT') {
+      if (!isNodeError(err) || err.code !== "ENOENT") {
         throw err;
       }
       fileExists = false;
     }
 
-    const isNewFile = params.old_string === '' && !fileExists;
+    const isNewFile = params.old_string === "" && !fileExists;
 
     if (isNewFile) {
       return {
@@ -551,7 +519,7 @@ class EditToolInvocation
     if (!fileExists) {
       return {
         currentContent,
-        newContent: '',
+        newContent: "",
         occurrences: 0,
         isNewFile: false,
         error: {
@@ -566,7 +534,7 @@ class EditToolInvocation
     if (currentContent === null) {
       return {
         currentContent,
-        newContent: '',
+        newContent: "",
         occurrences: 0,
         isNewFile: false,
         error: {
@@ -578,7 +546,7 @@ class EditToolInvocation
       };
     }
 
-    if (params.old_string === '') {
+    if (params.old_string === "") {
       return {
         currentContent,
         newContent: currentContent,
@@ -659,10 +627,10 @@ class EditToolInvocation
     const fileName = path.basename(this.params.file_path);
     const fileDiff = Diff.createPatch(
       fileName,
-      editData.currentContent ?? '',
+      editData.currentContent ?? "",
       editData.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
     const ideClient = await IdeClient.getInstance();
@@ -672,7 +640,7 @@ class EditToolInvocation
         : undefined;
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Edit: ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`,
       fileName,
       filePath: this.params.file_path,
@@ -686,10 +654,10 @@ class EditToolInvocation
 
         if (ideConfirmation) {
           const result = await ideConfirmation;
-          if (result.status === 'accepted' && result.content) {
+          if (result.status === "accepted" && result.content) {
             // TODO(chrstn): See https://github.com/google-gemini/gemini-cli/pull/5618#discussion_r2255413084
             // for info on a possible race condition where the file is modified on disk while being edited.
-            this.params.old_string = editData.currentContent ?? '';
+            this.params.old_string = editData.currentContent ?? "";
             this.params.new_string = result.content;
           }
         }
@@ -700,20 +668,17 @@ class EditToolInvocation
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
-    if (this.params.old_string === '') {
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
+    if (this.params.old_string === "") {
       return `Create ${shortenPath(relativePath)}`;
     }
 
     const oldStringSnippet =
-      this.params.old_string.split('\n')[0].substring(0, 30) +
-      (this.params.old_string.length > 30 ? '...' : '');
+      this.params.old_string.split("\n")[0].substring(0, 30) +
+      (this.params.old_string.length > 30 ? "..." : "");
     const newStringSnippet =
-      this.params.new_string.split('\n')[0].substring(0, 30) +
-      (this.params.new_string.length > 30 ? '...' : '');
+      this.params.new_string.split("\n")[0].substring(0, 30) +
+      (this.params.new_string.length > 30 ? "..." : "");
 
     if (this.params.old_string === this.params.new_string) {
       return `No file changes to ${shortenPath(relativePath)}`;
@@ -761,12 +726,10 @@ class EditToolInvocation
       let finalContent = editData.newContent;
 
       // Restore original line endings if they were CRLF
-      if (!editData.isNewFile && editData.originalLineEnding === '\r\n') {
-        finalContent = finalContent.replace(/\n/g, '\r\n');
+      if (!editData.isNewFile && editData.originalLineEnding === "\r\n") {
+        finalContent = finalContent.replace(/\n/g, "\r\n");
       }
-      await this.config
-        .getFileSystemService()
-        .writeTextFile(this.params.file_path, finalContent);
+      await this.config.getFileSystemService().writeTextFile(this.params.file_path, finalContent);
 
       let displayResult: ToolResultDisplay;
       if (editData.isNewFile) {
@@ -777,16 +740,16 @@ class EditToolInvocation
         const fileName = path.basename(this.params.file_path);
         const fileDiff = Diff.createPatch(
           fileName,
-          editData.currentContent ?? '', // Should not be null here if not isNewFile
+          editData.currentContent ?? "", // Should not be null here if not isNewFile
           editData.newContent,
-          'Current',
-          'Proposed',
+          "Current",
+          "Proposed",
           DEFAULT_DIFF_OPTIONS,
         );
 
         const diffStat = getDiffStat(
           fileName,
-          editData.currentContent ?? '',
+          editData.currentContent ?? "",
           editData.newContent,
           this.params.new_string,
         );
@@ -811,7 +774,7 @@ class EditToolInvocation
       }
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -853,7 +816,7 @@ export class SmartEditTool
   ) {
     super(
       SmartEditTool.Name,
-      'Edit',
+      "Edit",
       `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
       
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
@@ -870,8 +833,8 @@ export class SmartEditTool
       {
         properties: {
           file_path: {
-            description: 'The path to the file to modify.',
-            type: 'string',
+            description: "The path to the file to modify.",
+            type: "string",
           },
           instruction: {
             description: `A clear, semantic instruction for the code change, acting as a high-quality prompt for an expert LLM assistant. It must be self-contained and explain the goal of the change.
@@ -889,27 +852,27 @@ A good instruction should concisely answer:
 - "Fix the bug." (Doesn't explain the bug or the fix)
 - "Replace the line with this new line." (Brittle, just repeats the other parameters)
 `,
-            type: 'string',
+            type: "string",
           },
           old_string: {
             description:
-              'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
-            type: 'string',
+              "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            type: "string",
           },
           new_string: {
             description:
-              'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
-            type: 'string',
+              "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
+            type: "string",
           },
           expected_replacements: {
-            type: 'number',
+            type: "number",
             description:
-              'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
+              "Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.",
             minimum: 1,
           },
         },
-        required: ['file_path', 'instruction', 'old_string', 'new_string'],
-        type: 'object',
+        required: ["file_path", "instruction", "old_string", "new_string"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -922,9 +885,7 @@ A good instruction should concisely answer:
    * @param params Parameters to validate
    * @returns Error message string or null if valid
    */
-  protected override validateToolParamValues(
-    params: EditToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: EditToolParams): string | null {
     if (!params.file_path) {
       return "The 'file_path' parameter must be non-empty.";
     }
@@ -943,15 +904,13 @@ A good instruction should concisely answer:
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(params.file_path)) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
 
     return null;
   }
 
-  protected createInvocation(
-    params: EditToolParams,
-  ): ToolInvocation<EditToolParams, ToolResult> {
+  protected createInvocation(params: EditToolParams): ToolInvocation<EditToolParams, ToolResult> {
     return new EditToolInvocation(
       this.config,
       params,
@@ -966,12 +925,10 @@ A good instruction should concisely answer:
       getFilePath: (params: EditToolParams) => params.file_path,
       getCurrentContent: async (params: EditToolParams): Promise<string> => {
         try {
-          return await this.config
-            .getFileSystemService()
-            .readTextFile(params.file_path);
+          return await this.config.getFileSystemService().readTextFile(params.file_path);
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       getProposedContent: async (params: EditToolParams): Promise<string> => {
@@ -983,11 +940,11 @@ A good instruction should concisely answer:
             currentContent,
             params.old_string,
             params.new_string,
-            params.old_string === '' && currentContent === '',
+            params.old_string === "" && currentContent === "",
           );
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       createUpdatedParams: (
diff --git a/packages/gemini-cli-core/src/tools/tool-error.ts b/packages/gemini-cli-core/src/tools/tool-error.ts
index 50ce99f2e..44d284ee9 100644
--- a/packages/gemini-cli-core/src/tools/tool-error.ts
+++ b/packages/gemini-cli-core/src/tools/tool-error.ts
@@ -13,64 +13,64 @@
  */
 export enum ToolErrorType {
   // General Errors
-  INVALID_TOOL_PARAMS = 'invalid_tool_params',
-  UNKNOWN = 'unknown',
-  UNHANDLED_EXCEPTION = 'unhandled_exception',
-  TOOL_NOT_REGISTERED = 'tool_not_registered',
-  EXECUTION_FAILED = 'execution_failed',
+  INVALID_TOOL_PARAMS = "invalid_tool_params",
+  UNKNOWN = "unknown",
+  UNHANDLED_EXCEPTION = "unhandled_exception",
+  TOOL_NOT_REGISTERED = "tool_not_registered",
+  EXECUTION_FAILED = "execution_failed",
 
   // File System Errors
-  FILE_NOT_FOUND = 'file_not_found',
-  FILE_WRITE_FAILURE = 'file_write_failure',
-  READ_CONTENT_FAILURE = 'read_content_failure',
-  ATTEMPT_TO_CREATE_EXISTING_FILE = 'attempt_to_create_existing_file',
-  FILE_TOO_LARGE = 'file_too_large',
-  PERMISSION_DENIED = 'permission_denied',
-  NO_SPACE_LEFT = 'no_space_left',
-  TARGET_IS_DIRECTORY = 'target_is_directory',
-  PATH_NOT_IN_WORKSPACE = 'path_not_in_workspace',
-  SEARCH_PATH_NOT_FOUND = 'search_path_not_found',
-  SEARCH_PATH_NOT_A_DIRECTORY = 'search_path_not_a_directory',
+  FILE_NOT_FOUND = "file_not_found",
+  FILE_WRITE_FAILURE = "file_write_failure",
+  READ_CONTENT_FAILURE = "read_content_failure",
+  ATTEMPT_TO_CREATE_EXISTING_FILE = "attempt_to_create_existing_file",
+  FILE_TOO_LARGE = "file_too_large",
+  PERMISSION_DENIED = "permission_denied",
+  NO_SPACE_LEFT = "no_space_left",
+  TARGET_IS_DIRECTORY = "target_is_directory",
+  PATH_NOT_IN_WORKSPACE = "path_not_in_workspace",
+  SEARCH_PATH_NOT_FOUND = "search_path_not_found",
+  SEARCH_PATH_NOT_A_DIRECTORY = "search_path_not_a_directory",
 
   // Edit-specific Errors
-  EDIT_PREPARATION_FAILURE = 'edit_preparation_failure',
-  EDIT_NO_OCCURRENCE_FOUND = 'edit_no_occurrence_found',
-  EDIT_EXPECTED_OCCURRENCE_MISMATCH = 'edit_expected_occurrence_mismatch',
-  EDIT_NO_CHANGE = 'edit_no_change',
-  EDIT_NO_CHANGE_LLM_JUDGEMENT = 'edit_no_change_llm_judgement',
+  EDIT_PREPARATION_FAILURE = "edit_preparation_failure",
+  EDIT_NO_OCCURRENCE_FOUND = "edit_no_occurrence_found",
+  EDIT_EXPECTED_OCCURRENCE_MISMATCH = "edit_expected_occurrence_mismatch",
+  EDIT_NO_CHANGE = "edit_no_change",
+  EDIT_NO_CHANGE_LLM_JUDGEMENT = "edit_no_change_llm_judgement",
 
   // Glob-specific Errors
-  GLOB_EXECUTION_ERROR = 'glob_execution_error',
+  GLOB_EXECUTION_ERROR = "glob_execution_error",
 
   // Grep-specific Errors
-  GREP_EXECUTION_ERROR = 'grep_execution_error',
+  GREP_EXECUTION_ERROR = "grep_execution_error",
 
   // Ls-specific Errors
-  LS_EXECUTION_ERROR = 'ls_execution_error',
-  PATH_IS_NOT_A_DIRECTORY = 'path_is_not_a_directory',
+  LS_EXECUTION_ERROR = "ls_execution_error",
+  PATH_IS_NOT_A_DIRECTORY = "path_is_not_a_directory",
 
   // MCP-specific Errors
-  MCP_TOOL_ERROR = 'mcp_tool_error',
+  MCP_TOOL_ERROR = "mcp_tool_error",
 
   // Memory-specific Errors
-  MEMORY_TOOL_EXECUTION_ERROR = 'memory_tool_execution_error',
+  MEMORY_TOOL_EXECUTION_ERROR = "memory_tool_execution_error",
 
   // ReadManyFiles-specific Errors
-  READ_MANY_FILES_SEARCH_ERROR = 'read_many_files_search_error',
+  READ_MANY_FILES_SEARCH_ERROR = "read_many_files_search_error",
 
   // Shell errors
-  SHELL_EXECUTE_ERROR = 'shell_execute_error',
+  SHELL_EXECUTE_ERROR = "shell_execute_error",
 
   // DiscoveredTool-specific Errors
-  DISCOVERED_TOOL_EXECUTION_ERROR = 'discovered_tool_execution_error',
+  DISCOVERED_TOOL_EXECUTION_ERROR = "discovered_tool_execution_error",
 
   // WebFetch-specific Errors
-  WEB_FETCH_NO_URL_IN_PROMPT = 'web_fetch_no_url_in_prompt',
-  WEB_FETCH_FALLBACK_FAILED = 'web_fetch_fallback_failed',
-  WEB_FETCH_PROCESSING_ERROR = 'web_fetch_processing_error',
+  WEB_FETCH_NO_URL_IN_PROMPT = "web_fetch_no_url_in_prompt",
+  WEB_FETCH_FALLBACK_FAILED = "web_fetch_fallback_failed",
+  WEB_FETCH_PROCESSING_ERROR = "web_fetch_processing_error",
 
   // WebSearch-specific Errors
-  WEB_SEARCH_FAILED = 'web_search_failed',
+  WEB_SEARCH_FAILED = "web_search_failed",
 }
 
 /**
diff --git a/packages/gemini-cli-core/src/tools/tool-names.ts b/packages/gemini-cli-core/src/tools/tool-names.ts
index b76b42900..8e3b27fd4 100644
--- a/packages/gemini-cli-core/src/tools/tool-names.ts
+++ b/packages/gemini-cli-core/src/tools/tool-names.ts
@@ -8,17 +8,17 @@
 // This prevents circular dependencies that can occur when other modules (like agents)
 // need to reference a tool's name without importing the tool's implementation.
 
-export const GLOB_TOOL_NAME = 'glob';
-export const WRITE_TODOS_TOOL_NAME = 'write_todos';
-export const WRITE_FILE_TOOL_NAME = 'write_file';
-export const WEB_SEARCH_TOOL_NAME = 'google_web_search';
-export const WEB_FETCH_TOOL_NAME = 'web_fetch';
-export const EDIT_TOOL_NAME = 'replace';
-export const SHELL_TOOL_NAME = 'run_shell_command';
-export const GREP_TOOL_NAME = 'search_file_content';
-export const READ_MANY_FILES_TOOL_NAME = 'read_many_files';
-export const READ_FILE_TOOL_NAME = 'read_file';
-export const LS_TOOL_NAME = 'list_directory';
-export const MEMORY_TOOL_NAME = 'save_memory';
+export const GLOB_TOOL_NAME = "glob";
+export const WRITE_TODOS_TOOL_NAME = "write_todos";
+export const WRITE_FILE_TOOL_NAME = "write_file";
+export const WEB_SEARCH_TOOL_NAME = "google_web_search";
+export const WEB_FETCH_TOOL_NAME = "web_fetch";
+export const EDIT_TOOL_NAME = "replace";
+export const SHELL_TOOL_NAME = "run_shell_command";
+export const GREP_TOOL_NAME = "search_file_content";
+export const READ_MANY_FILES_TOOL_NAME = "read_many_files";
+export const READ_FILE_TOOL_NAME = "read_file";
+export const LS_TOOL_NAME = "list_directory";
+export const MEMORY_TOOL_NAME = "save_memory";
 export const EDIT_TOOL_NAMES = new Set([EDIT_TOOL_NAME, WRITE_FILE_TOOL_NAME]);
-export const DELEGATE_TO_AGENT_TOOL_NAME = 'delegate_to_agent';
+export const DELEGATE_TO_AGENT_TOOL_NAME = "delegate_to_agent";
diff --git a/packages/gemini-cli-core/src/tools/tool-registry.test.ts b/packages/gemini-cli-core/src/tools/tool-registry.test.ts
index 19ab2643d..7837910ec 100644
--- a/packages/gemini-cli-core/src/tools/tool-registry.test.ts
+++ b/packages/gemini-cli-core/src/tools/tool-registry.test.ts
@@ -4,33 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import type { CallableTool, FunctionDeclaration } from "@google/genai";
+import { mcpToTool } from "@google/genai";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mocked, MockInstance } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { ConfigParameters } from '../config/config.js';
-import { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import {
-  ToolRegistry,
-  DiscoveredTool,
-  DISCOVERED_TOOL_PREFIX,
-} from './tool-registry.js';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-import type { FunctionDeclaration, CallableTool } from '@google/genai';
-import { mcpToTool } from '@google/genai';
-import { spawn } from 'node:child_process';
-
-import fs from 'node:fs';
-import { MockTool } from '../test-utils/mock-tool.js';
-import { ToolErrorType } from './tool-error.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-
-vi.mock('node:fs');
+import type { Mocked, MockInstance } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ConfigParameters } from "../config/config.js";
+import { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { ApprovalMode } from "../policy/types.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { DISCOVERED_TOOL_PREFIX, DiscoveredTool, ToolRegistry } from "./tool-registry.js";
+
+vi.mock("node:fs");
 
 // Mock node:child_process
-vi.mock('node:child_process', async () => {
-  const actual = await vi.importActual('node:child_process');
+vi.mock("node:child_process", async () => {
+  const actual = await vi.importActual("node:child_process");
   return {
     ...actual,
     execSync: vi.fn(),
@@ -44,7 +38,7 @@ const mockMcpClientOnError = vi.fn();
 const mockStdioTransportClose = vi.fn();
 const mockSseTransportClose = vi.fn();
 
-vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
+vi.mock("@modelcontextprotocol/sdk/client/index.js", () => {
   const MockClient = vi.fn().mockImplementation(() => ({
     connect: mockMcpClientConnect,
     set onerror(handler: any) {
@@ -54,7 +48,7 @@ vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
   return { Client: MockClient };
 });
 
-vi.mock('@modelcontextprotocol/sdk/client/stdio.js', () => {
+vi.mock("@modelcontextprotocol/sdk/client/stdio.js", () => {
   const MockStdioClientTransport = vi.fn().mockImplementation(() => ({
     stderr: {
       on: vi.fn(),
@@ -64,7 +58,7 @@ vi.mock('@modelcontextprotocol/sdk/client/stdio.js', () => {
   return { StdioClientTransport: MockStdioClientTransport };
 });
 
-vi.mock('@modelcontextprotocol/sdk/client/sse.js', () => {
+vi.mock("@modelcontextprotocol/sdk/client/sse.js", () => {
   const MockSSEClientTransport = vi.fn().mockImplementation(() => ({
     close: mockSseTransportClose,
   }));
@@ -72,9 +66,8 @@ vi.mock('@modelcontextprotocol/sdk/client/sse.js', () => {
 });
 
 // Mock @google/genai mcpToTool
-vi.mock('@google/genai', async () => {
-  const actualGenai =
-    await vi.importActual<typeof import('@google/genai')>('@google/genai');
+vi.mock("@google/genai", async () => {
+  const actualGenai = await vi.importActual<typeof import("@google/genai")>("@google/genai");
   return {
     ...actualGenai,
     mcpToTool: vi.fn().mockImplementation(() => ({
@@ -85,9 +78,7 @@ vi.mock('@google/genai', async () => {
 });
 
 // Helper to create a mock CallableTool for specific test needs
-const createMockCallableTool = (
-  toolDeclarations: FunctionDeclaration[],
-): Mocked<CallableTool> => ({
+const createMockCallableTool = (toolDeclarations: FunctionDeclaration[]): Mocked<CallableTool> => ({
   tool: vi.fn().mockResolvedValue({ functionDeclarations: toolDeclarations }),
   callTool: vi.fn(),
 });
@@ -109,18 +100,14 @@ const createDiscoveryProcess = (toolDeclarations: FunctionDeclaration[]) => {
   };
 
   mockProcess.stdout.on.mockImplementation((event, callback) => {
-    if (event === 'data') {
-      callback(
-        Buffer.from(
-          JSON.stringify([{ functionDeclarations: toolDeclarations }]),
-        ),
-      );
+    if (event === "data") {
+      callback(Buffer.from(JSON.stringify([{ functionDeclarations: toolDeclarations }])));
     }
     return mockProcess as any;
   });
 
   mockProcess.on.mockImplementation((event, callback) => {
-    if (event === 'close') {
+    if (event === "close") {
       callback(0);
     }
     return mockProcess as any;
@@ -143,14 +130,14 @@ const createExecutionProcess = (exitCode: number, stderrMessage?: string) => {
 
   if (stderrMessage) {
     mockProcess.stderr.on.mockImplementation((event, callback) => {
-      if (event === 'data') {
+      if (event === "data") {
         callback(Buffer.from(stderrMessage));
       }
     });
   }
 
   mockProcess.on.mockImplementation((event, callback) => {
-    if (event === 'close') {
+    if (event === "close") {
       callback(exitCode);
     }
   });
@@ -159,25 +146,23 @@ const createExecutionProcess = (exitCode: number, stderrMessage?: string) => {
 };
 
 const baseConfigParams: ConfigParameters = {
-  cwd: '/tmp',
-  model: 'test-model',
-  embeddingModel: 'test-embedding-model',
+  cwd: "/tmp",
+  model: "test-model",
+  embeddingModel: "test-embedding-model",
   sandbox: undefined,
-  targetDir: '/test/dir',
+  targetDir: "/test/dir",
   debugMode: false,
-  userMemory: '',
+  userMemory: "",
   geminiMdFileCount: 0,
   approvalMode: ApprovalMode.DEFAULT,
-  sessionId: 'test-session-id',
+  sessionId: "test-session-id",
 };
 
-describe('ToolRegistry', () => {
+describe("ToolRegistry", () => {
   let config: Config;
   let toolRegistry: ToolRegistry;
   let mockConfigGetToolDiscoveryCommand: ReturnType<typeof vi.spyOn>;
-  let mockConfigGetExcludedTools: MockInstance<
-    typeof Config.prototype.getExcludeTools
-  >;
+  let mockConfigGetExcludedTools: MockInstance<typeof Config.prototype.getExcludeTools>;
 
   beforeEach(() => {
     vi.mocked(fs.existsSync).mockReturnValue(true);
@@ -186,10 +171,10 @@ describe('ToolRegistry', () => {
     } as fs.Stats);
     config = new Config(baseConfigParams);
     toolRegistry = new ToolRegistry(config);
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(console, 'debug').mockImplementation(() => {});
-    vi.spyOn(console, 'log').mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(console, "debug").mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
 
     mockMcpClientConnect.mockReset().mockResolvedValue(undefined);
     mockStdioTransportClose.mockReset();
@@ -197,14 +182,11 @@ describe('ToolRegistry', () => {
     vi.mocked(mcpToTool).mockClear();
     vi.mocked(mcpToTool).mockReturnValue(createMockCallableTool([]));
 
-    mockConfigGetToolDiscoveryCommand = vi.spyOn(
-      config,
-      'getToolDiscoveryCommand',
-    );
-    mockConfigGetExcludedTools = vi.spyOn(config, 'getExcludeTools');
-    vi.spyOn(config, 'getMcpServers');
-    vi.spyOn(config, 'getMcpServerCommand');
-    vi.spyOn(config, 'getPromptRegistry').mockReturnValue({
+    mockConfigGetToolDiscoveryCommand = vi.spyOn(config, "getToolDiscoveryCommand");
+    mockConfigGetExcludedTools = vi.spyOn(config, "getExcludeTools");
+    vi.spyOn(config, "getMcpServers");
+    vi.spyOn(config, "getMcpServerCommand");
+    vi.spyOn(config, "getPromptRegistry").mockReturnValue({
       clear: vi.fn(),
       removePromptsByServer: vi.fn(),
     } as any);
@@ -214,55 +196,51 @@ describe('ToolRegistry', () => {
     vi.restoreAllMocks();
   });
 
-  describe('registerTool', () => {
-    it('should register a new tool', () => {
-      const tool = new MockTool({ name: 'mock-tool' });
+  describe("registerTool", () => {
+    it("should register a new tool", () => {
+      const tool = new MockTool({ name: "mock-tool" });
       toolRegistry.registerTool(tool);
-      expect(toolRegistry.getTool('mock-tool')).toBe(tool);
+      expect(toolRegistry.getTool("mock-tool")).toBe(tool);
     });
   });
 
-  describe('excluded tools', () => {
+  describe("excluded tools", () => {
     const simpleTool = new MockTool({
-      name: 'tool-a',
-      displayName: 'Tool a',
+      name: "tool-a",
+      displayName: "Tool a",
     });
     const excludedTool = new ExcludedMockTool({
-      name: 'excluded-tool-class',
-      displayName: 'Excluded Tool Class',
+      name: "excluded-tool-class",
+      displayName: "Excluded Tool Class",
     });
-    const mcpTool = createMCPTool(
-      'mcp-server',
-      'excluded-mcp-tool',
-      'description',
-    );
+    const mcpTool = createMCPTool("mcp-server", "excluded-mcp-tool", "description");
     const allowedTool = new MockTool({
-      name: 'allowed-tool',
-      displayName: 'Allowed Tool',
+      name: "allowed-tool",
+      displayName: "Allowed Tool",
     });
 
     it.each([
       {
-        name: 'should match simple names',
+        name: "should match simple names",
         tools: [simpleTool],
-        excludedTools: ['tool-a'],
+        excludedTools: ["tool-a"],
       },
       {
-        name: 'should match simple MCP tool names, when qualified or unqualified',
+        name: "should match simple MCP tool names, when qualified or unqualified",
         tools: [mcpTool, mcpTool.asFullyQualifiedTool()],
         excludedTools: [mcpTool.name],
       },
       {
-        name: 'should match qualified MCP tool names when qualified or unqualified',
+        name: "should match qualified MCP tool names when qualified or unqualified",
         tools: [mcpTool, mcpTool.asFullyQualifiedTool()],
         excludedTools: [`${mcpTool.getFullyQualifiedPrefix()}${mcpTool.name}`],
       },
       {
-        name: 'should match class names',
+        name: "should match class names",
         tools: [excludedTool],
-        excludedTools: ['ExcludedMockTool'],
+        excludedTools: ["ExcludedMockTool"],
       },
-    ])('$name', ({ tools, excludedTools }) => {
+    ])("$name", ({ tools, excludedTools }) => {
       toolRegistry.registerTool(allowedTool);
       for (const tool of tools) {
         toolRegistry.registerTool(tool);
@@ -276,24 +254,20 @@ describe('ToolRegistry', () => {
       );
       for (const tool of tools) {
         expect(toolRegistry.getTool(tool.name)).toBeUndefined();
-        expect(
-          toolRegistry.getFunctionDeclarationsFiltered([tool.name]),
-        ).toHaveLength(0);
+        expect(toolRegistry.getFunctionDeclarationsFiltered([tool.name])).toHaveLength(0);
         if (tool instanceof DiscoveredMCPTool) {
-          expect(toolRegistry.getToolsByServer(tool.serverName)).toHaveLength(
-            0,
-          );
+          expect(toolRegistry.getToolsByServer(tool.serverName)).toHaveLength(0);
         }
       }
     });
   });
 
-  describe('getAllTools', () => {
-    it('should return all registered tools sorted alphabetically by displayName', () => {
+  describe("getAllTools", () => {
+    it("should return all registered tools sorted alphabetically by displayName", () => {
       // Register tools with displayNames in non-alphabetical order
-      const toolC = new MockTool({ name: 'c-tool', displayName: 'Tool C' });
-      const toolA = new MockTool({ name: 'a-tool', displayName: 'Tool A' });
-      const toolB = new MockTool({ name: 'b-tool', displayName: 'Tool B' });
+      const toolC = new MockTool({ name: "c-tool", displayName: "Tool C" });
+      const toolA = new MockTool({ name: "a-tool", displayName: "Tool A" });
+      const toolB = new MockTool({ name: "b-tool", displayName: "Tool B" });
 
       toolRegistry.registerTool(toolC);
       toolRegistry.registerTool(toolA);
@@ -303,16 +277,16 @@ describe('ToolRegistry', () => {
       const displayNames = allTools.map((t) => t.displayName);
 
       // Assert that the returned array is sorted by displayName
-      expect(displayNames).toEqual(['Tool A', 'Tool B', 'Tool C']);
+      expect(displayNames).toEqual(["Tool A", "Tool B", "Tool C"]);
     });
   });
 
-  describe('getAllToolNames', () => {
-    it('should return all registered tool names', () => {
+  describe("getAllToolNames", () => {
+    it("should return all registered tool names", () => {
       // Register tools with displayNames in non-alphabetical order
-      const toolC = new MockTool({ name: 'c-tool', displayName: 'Tool C' });
-      const toolA = new MockTool({ name: 'a-tool', displayName: 'Tool A' });
-      const toolB = new MockTool({ name: 'b-tool', displayName: 'Tool B' });
+      const toolC = new MockTool({ name: "c-tool", displayName: "Tool C" });
+      const toolA = new MockTool({ name: "a-tool", displayName: "Tool A" });
+      const toolB = new MockTool({ name: "b-tool", displayName: "Tool B" });
 
       toolRegistry.registerTool(toolC);
       toolRegistry.registerTool(toolA);
@@ -321,24 +295,24 @@ describe('ToolRegistry', () => {
       const toolNames = toolRegistry.getAllToolNames();
 
       // Assert that the returned array contains all tool names
-      expect(toolNames).toEqual(['c-tool', 'a-tool', 'b-tool']);
+      expect(toolNames).toEqual(["c-tool", "a-tool", "b-tool"]);
     });
   });
 
-  describe('getToolsByServer', () => {
-    it('should return an empty array if no tools match the server name', () => {
-      toolRegistry.registerTool(new MockTool({ name: 'mock-tool' }));
-      expect(toolRegistry.getToolsByServer('any-mcp-server')).toEqual([]);
+  describe("getToolsByServer", () => {
+    it("should return an empty array if no tools match the server name", () => {
+      toolRegistry.registerTool(new MockTool({ name: "mock-tool" }));
+      expect(toolRegistry.getToolsByServer("any-mcp-server")).toEqual([]);
     });
 
-    it('should return only tools matching the server name, sorted by name', async () => {
-      const server1Name = 'mcp-server-uno';
-      const server2Name = 'mcp-server-dos';
-      const mcpTool1_c = createMCPTool(server1Name, 'zebra-tool', 'd1');
-      const mcpTool1_a = createMCPTool(server1Name, 'apple-tool', 'd2');
-      const mcpTool1_b = createMCPTool(server1Name, 'banana-tool', 'd3');
-      const mcpTool2 = createMCPTool(server2Name, 'tool-on-server2', 'd4');
-      const nonMcpTool = new MockTool({ name: 'regular-tool' });
+    it("should return only tools matching the server name, sorted by name", async () => {
+      const server1Name = "mcp-server-uno";
+      const server2Name = "mcp-server-dos";
+      const mcpTool1_c = createMCPTool(server1Name, "zebra-tool", "d1");
+      const mcpTool1_a = createMCPTool(server1Name, "apple-tool", "d2");
+      const mcpTool1_b = createMCPTool(server1Name, "banana-tool", "d3");
+      const mcpTool2 = createMCPTool(server2Name, "tool-on-server2", "d4");
+      const nonMcpTool = new MockTool({ name: "regular-tool" });
 
       toolRegistry.registerTool(mcpTool1_c);
       toolRegistry.registerTool(mcpTool1_a);
@@ -351,7 +325,7 @@ describe('ToolRegistry', () => {
 
       // Assert that the array has the correct tools and is sorted by name
       expect(toolsFromServer1).toHaveLength(3);
-      expect(toolNames).toEqual(['apple-tool', 'banana-tool', 'zebra-tool']);
+      expect(toolNames).toEqual(["apple-tool", "banana-tool", "zebra-tool"]);
 
       // Assert that all returned tools are indeed from the correct server
       for (const tool of toolsFromServer1) {
@@ -365,19 +339,19 @@ describe('ToolRegistry', () => {
     });
   });
 
-  describe('sortTools', () => {
-    it('should sort tools by priority: built-in, discovered, then MCP (by server name)', () => {
-      const builtIn1 = new MockTool({ name: 'builtin-1' });
-      const builtIn2 = new MockTool({ name: 'builtin-2' });
+  describe("sortTools", () => {
+    it("should sort tools by priority: built-in, discovered, then MCP (by server name)", () => {
+      const builtIn1 = new MockTool({ name: "builtin-1" });
+      const builtIn2 = new MockTool({ name: "builtin-2" });
       const discovered1 = new DiscoveredTool(
         config,
-        'discovered-1',
-        DISCOVERED_TOOL_PREFIX + 'discovered-1',
-        'desc',
+        "discovered-1",
+        DISCOVERED_TOOL_PREFIX + "discovered-1",
+        "desc",
         {},
       );
-      const mcpZebra = createMCPTool('zebra-server', 'mcp-zebra', 'desc');
-      const mcpApple = createMCPTool('apple-server', 'mcp-apple', 'desc');
+      const mcpZebra = createMCPTool("zebra-server", "mcp-zebra", "desc");
+      const mcpApple = createMCPTool("apple-server", "mcp-apple", "desc");
 
       // Register in mixed order
       toolRegistry.registerTool(mcpZebra);
@@ -389,100 +363,87 @@ describe('ToolRegistry', () => {
       toolRegistry.sortTools();
 
       expect(toolRegistry.getAllToolNames()).toEqual([
-        'builtin-1',
-        'builtin-2',
-        DISCOVERED_TOOL_PREFIX + 'discovered-1',
-        'mcp-apple',
-        'mcp-zebra',
+        "builtin-1",
+        "builtin-2",
+        DISCOVERED_TOOL_PREFIX + "discovered-1",
+        "mcp-apple",
+        "mcp-zebra",
       ]);
     });
   });
 
-  describe('discoverTools', () => {
-    it('should will preserve tool parametersJsonSchema during discovery from command', async () => {
-      const discoveryCommand = 'my-discovery-command';
+  describe("discoverTools", () => {
+    it("should will preserve tool parametersJsonSchema during discovery from command", async () => {
+      const discoveryCommand = "my-discovery-command";
       mockConfigGetToolDiscoveryCommand.mockReturnValue(discoveryCommand);
 
       const unsanitizedToolDeclaration: FunctionDeclaration = {
-        name: 'tool-with-bad-format',
-        description: 'A tool with an invalid format property',
+        name: "tool-with-bad-format",
+        description: "A tool with an invalid format property",
         parametersJsonSchema: {
-          type: 'object',
+          type: "object",
           properties: {
             some_string: {
-              type: 'string',
-              format: 'uuid', // This is an unsupported format
+              type: "string",
+              format: "uuid", // This is an unsupported format
             },
           },
         },
       };
 
       const mockSpawn = vi.mocked(spawn);
-      mockSpawn.mockReturnValue(
-        createDiscoveryProcess([unsanitizedToolDeclaration]) as any,
-      );
+      mockSpawn.mockReturnValue(createDiscoveryProcess([unsanitizedToolDeclaration]) as any);
 
       await toolRegistry.discoverAllTools();
 
-      const discoveredTool = toolRegistry.getTool(
-        DISCOVERED_TOOL_PREFIX + 'tool-with-bad-format',
-      );
+      const discoveredTool = toolRegistry.getTool(DISCOVERED_TOOL_PREFIX + "tool-with-bad-format");
       expect(discoveredTool).toBeDefined();
 
-      const registeredParams = (discoveredTool as DiscoveredTool).schema
-        .parametersJsonSchema;
+      const registeredParams = (discoveredTool as DiscoveredTool).schema.parametersJsonSchema;
       expect(registeredParams).toStrictEqual({
-        type: 'object',
+        type: "object",
         properties: {
           some_string: {
-            type: 'string',
-            format: 'uuid',
+            type: "string",
+            format: "uuid",
           },
         },
       });
     });
 
-    it('should return a DISCOVERED_TOOL_EXECUTION_ERROR on tool failure', async () => {
-      const discoveryCommand = 'my-discovery-command';
+    it("should return a DISCOVERED_TOOL_EXECUTION_ERROR on tool failure", async () => {
+      const discoveryCommand = "my-discovery-command";
       mockConfigGetToolDiscoveryCommand.mockReturnValue(discoveryCommand);
-      vi.spyOn(config, 'getToolCallCommand').mockReturnValue('my-call-command');
+      vi.spyOn(config, "getToolCallCommand").mockReturnValue("my-call-command");
 
       const toolDeclaration: FunctionDeclaration = {
-        name: 'failing-tool',
-        description: 'A tool that fails',
+        name: "failing-tool",
+        description: "A tool that fails",
         parametersJsonSchema: {
-          type: 'object',
+          type: "object",
           properties: {},
         },
       };
 
       const mockSpawn = vi.mocked(spawn);
-      mockSpawn.mockReturnValueOnce(
-        createDiscoveryProcess([toolDeclaration]) as any,
-      );
+      mockSpawn.mockReturnValueOnce(createDiscoveryProcess([toolDeclaration]) as any);
 
       await toolRegistry.discoverAllTools();
-      const discoveredTool = toolRegistry.getTool(
-        DISCOVERED_TOOL_PREFIX + 'failing-tool',
-      );
+      const discoveredTool = toolRegistry.getTool(DISCOVERED_TOOL_PREFIX + "failing-tool");
       expect(discoveredTool).toBeDefined();
 
-      mockSpawn.mockReturnValueOnce(
-        createExecutionProcess(1, 'Something went wrong') as any,
-      );
+      mockSpawn.mockReturnValueOnce(createExecutionProcess(1, "Something went wrong") as any);
 
       const invocation = (discoveredTool as DiscoveredTool).build({});
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.error?.type).toBe(
-        ToolErrorType.DISCOVERED_TOOL_EXECUTION_ERROR,
-      );
-      expect(result.llmContent).toContain('Stderr: Something went wrong');
-      expect(result.llmContent).toContain('Exit Code: 1');
+      expect(result.error?.type).toBe(ToolErrorType.DISCOVERED_TOOL_EXECUTION_ERROR);
+      expect(result.llmContent).toContain("Stderr: Something went wrong");
+      expect(result.llmContent).toContain("Exit Code: 1");
     });
 
-    it('should pass MessageBus to DiscoveredTool and its invocations', async () => {
-      const discoveryCommand = 'my-discovery-command';
+    it("should pass MessageBus to DiscoveredTool and its invocations", async () => {
+      const discoveryCommand = "my-discovery-command";
       mockConfigGetToolDiscoveryCommand.mockReturnValue(discoveryCommand);
 
       const mockMessageBus = {
@@ -493,20 +454,16 @@ describe('ToolRegistry', () => {
       toolRegistry.setMessageBus(mockMessageBus);
 
       const toolDeclaration: FunctionDeclaration = {
-        name: 'policy-test-tool',
-        description: 'tests policy',
-        parametersJsonSchema: { type: 'object', properties: {} },
+        name: "policy-test-tool",
+        description: "tests policy",
+        parametersJsonSchema: { type: "object", properties: {} },
       };
 
       const mockSpawn = vi.mocked(spawn);
-      mockSpawn.mockReturnValueOnce(
-        createDiscoveryProcess([toolDeclaration]) as any,
-      );
+      mockSpawn.mockReturnValueOnce(createDiscoveryProcess([toolDeclaration]) as any);
 
       await toolRegistry.discoverAllTools();
-      const tool = toolRegistry.getTool(
-        DISCOVERED_TOOL_PREFIX + 'policy-test-tool',
-      );
+      const tool = toolRegistry.getTool(DISCOVERED_TOOL_PREFIX + "policy-test-tool");
       expect(tool).toBeDefined();
       expect((tool as any).messageBus).toBe(mockMessageBus);
 
@@ -515,16 +472,16 @@ describe('ToolRegistry', () => {
     });
   });
 
-  describe('DiscoveredToolInvocation', () => {
-    it('should return the stringified params from getDescription', () => {
+  describe("DiscoveredToolInvocation", () => {
+    it("should return the stringified params from getDescription", () => {
       const tool = new DiscoveredTool(
         config,
-        'test-tool',
-        DISCOVERED_TOOL_PREFIX + 'test-tool',
-        'A test tool',
+        "test-tool",
+        DISCOVERED_TOOL_PREFIX + "test-tool",
+        "A test tool",
         {},
       );
-      const params = { param: 'testValue' };
+      const params = { param: "testValue" };
       const invocation = tool.build(params);
       const description = invocation.getDescription();
       expect(description).toBe(JSON.stringify(params));
diff --git a/packages/gemini-cli-core/src/tools/tool-registry.ts b/packages/gemini-cli-core/src/tools/tool-registry.ts
index c59e82e93..95f11ecbd 100644
--- a/packages/gemini-cli-core/src/tools/tool-registry.ts
+++ b/packages/gemini-cli-core/src/tools/tool-registry.ts
@@ -4,32 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FunctionDeclaration } from '@google/genai';
-import type {
-  AnyDeclarativeTool,
-  ToolResult,
-  ToolInvocation,
-} from './tools.js';
-import { Kind, BaseDeclarativeTool, BaseToolInvocation } from './tools.js';
-import type { Config } from '../config/config.js';
-import { spawn } from 'node:child_process';
-import { StringDecoder } from 'node:string_decoder';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-import { parse } from 'shell-quote';
-import { ToolErrorType } from './tool-error.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { coreEvents } from '../utils/events.js';
-
-export const DISCOVERED_TOOL_PREFIX = 'discovered_tool_';
+import { spawn } from "node:child_process";
+import { StringDecoder } from "node:string_decoder";
+import type { FunctionDeclaration } from "@google/genai";
+import { parse } from "shell-quote";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { coreEvents } from "../utils/events.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { AnyDeclarativeTool, ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+export const DISCOVERED_TOOL_PREFIX = "discovered_tool_";
 
 type ToolParams = Record<string, unknown>;
 
-class DiscoveredToolInvocation extends BaseToolInvocation<
-  ToolParams,
-  ToolResult
-> {
+class DiscoveredToolInvocation extends BaseToolInvocation<ToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     private readonly originalToolName: string,
@@ -53,8 +46,8 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
     child.stdin.write(JSON.stringify(this.params));
     child.stdin.end();
 
-    let stdout = '';
-    let stderr = '';
+    let stdout = "";
+    let stderr = "";
     let error: Error | null = null;
     let code: number | null = null;
     let signal: NodeJS.Signals | null = null;
@@ -72,10 +65,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
         error = err;
       };
 
-      const onClose = (
-        _code: number | null,
-        _signal: NodeJS.Signals | null,
-      ) => {
+      const onClose = (_code: number | null, _signal: NodeJS.Signals | null) => {
         code = _code;
         signal = _signal;
         cleanup();
@@ -83,30 +73,30 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
       };
 
       const cleanup = () => {
-        child.stdout.removeListener('data', onStdout);
-        child.stderr.removeListener('data', onStderr);
-        child.removeListener('error', onError);
-        child.removeListener('close', onClose);
+        child.stdout.removeListener("data", onStdout);
+        child.stderr.removeListener("data", onStderr);
+        child.removeListener("error", onError);
+        child.removeListener("close", onClose);
         if (child.connected) {
           child.disconnect();
         }
       };
 
-      child.stdout.on('data', onStdout);
-      child.stderr.on('data', onStderr);
-      child.on('error', onError);
-      child.on('close', onClose);
+      child.stdout.on("data", onStdout);
+      child.stderr.on("data", onStderr);
+      child.on("error", onError);
+      child.on("close", onClose);
     });
 
     // if there is any error, non-zero exit code, signal, or stderr, return error details instead of stdout
     if (error || code !== 0 || signal || stderr) {
       const llmContent = [
-        `Stdout: ${stdout || '(empty)'}`,
-        `Stderr: ${stderr || '(empty)'}`,
-        `Error: ${error ?? '(none)'}`,
-        `Exit Code: ${code ?? '(none)'}`,
-        `Signal: ${signal ?? '(none)'}`,
-      ].join('\n');
+        `Stdout: ${stdout || "(empty)"}`,
+        `Stderr: ${stderr || "(empty)"}`,
+        `Error: ${error ?? "(none)"}`,
+        `Exit Code: ${code ?? "(none)"}`,
+        `Signal: ${signal ?? "(none)"}`,
+      ].join("\n");
       return {
         llmContent,
         returnDisplay: llmContent,
@@ -124,10 +114,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class DiscoveredTool extends BaseDeclarativeTool<
-  ToolParams,
-  ToolResult
-> {
+export class DiscoveredTool extends BaseDeclarativeTool<ToolParams, ToolResult> {
   private readonly originalName: string;
 
   constructor(
@@ -221,9 +208,7 @@ export class ToolRegistry {
         tool = tool.asFullyQualifiedTool();
       } else {
         // Decide on behavior: throw error, log warning, or allow overwrite
-        debugLogger.warn(
-          `Tool with name "${tool.name}" is already registered. Overwriting.`,
-        );
+        debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
       }
     }
     this.allKnownTools.set(tool.name, tool);
@@ -306,15 +291,13 @@ export class ToolRegistry {
     try {
       const cmdParts = parse(discoveryCmd);
       if (cmdParts.length === 0) {
-        throw new Error(
-          'Tool discovery command is empty or contains only whitespace.',
-        );
+        throw new Error("Tool discovery command is empty or contains only whitespace.");
       }
       const proc = spawn(cmdParts[0] as string, cmdParts.slice(1) as string[]);
-      let stdout = '';
-      const stdoutDecoder = new StringDecoder('utf8');
-      let stderr = '';
-      const stderrDecoder = new StringDecoder('utf8');
+      let stdout = "";
+      const stdoutDecoder = new StringDecoder("utf8");
+      let stderr = "";
+      const stderrDecoder = new StringDecoder("utf8");
       let sizeLimitExceeded = false;
       const MAX_STDOUT_SIZE = 10 * 1024 * 1024; // 10MB limit
       const MAX_STDERR_SIZE = 10 * 1024 * 1024; // 10MB limit
@@ -322,7 +305,7 @@ export class ToolRegistry {
       let stdoutByteLength = 0;
       let stderrByteLength = 0;
 
-      proc.stdout.on('data', (data) => {
+      proc.stdout.on("data", (data) => {
         if (sizeLimitExceeded) return;
         if (stdoutByteLength + data.length > MAX_STDOUT_SIZE) {
           sizeLimitExceeded = true;
@@ -333,7 +316,7 @@ export class ToolRegistry {
         stdout += stdoutDecoder.write(data);
       });
 
-      proc.stderr.on('data', (data) => {
+      proc.stderr.on("data", (data) => {
         if (sizeLimitExceeded) return;
         if (stderrByteLength + data.length > MAX_STDERR_SIZE) {
           sizeLimitExceeded = true;
@@ -345,8 +328,8 @@ export class ToolRegistry {
       });
 
       await new Promise<void>((resolve, reject) => {
-        proc.on('error', reject);
-        proc.on('close', (code) => {
+        proc.on("error", reject);
+        proc.on("close", (code) => {
           stdout += stdoutDecoder.end();
           stderr += stderrDecoder.end();
 
@@ -360,13 +343,11 @@ export class ToolRegistry {
 
           if (code !== 0) {
             coreEvents.emitFeedback(
-              'error',
+              "error",
               `Tool discovery command failed with code ${code}.`,
               stderr,
             );
-            return reject(
-              new Error(`Tool discovery command failed with exit code ${code}`),
-            );
+            return reject(new Error(`Tool discovery command failed with exit code ${code}`));
           }
           resolve();
         });
@@ -377,18 +358,16 @@ export class ToolRegistry {
       const discoveredItems = JSON.parse(stdout.trim());
 
       if (!discoveredItems || !Array.isArray(discoveredItems)) {
-        throw new Error(
-          'Tool discovery command did not return a JSON array of tools.',
-        );
+        throw new Error("Tool discovery command did not return a JSON array of tools.");
       }
 
       for (const tool of discoveredItems) {
-        if (tool && typeof tool === 'object') {
-          if (Array.isArray(tool['function_declarations'])) {
-            functions.push(...tool['function_declarations']);
-          } else if (Array.isArray(tool['functionDeclarations'])) {
-            functions.push(...tool['functionDeclarations']);
-          } else if (tool['name']) {
+        if (tool && typeof tool === "object") {
+          if (Array.isArray(tool["function_declarations"])) {
+            functions.push(...tool["function_declarations"]);
+          } else if (Array.isArray(tool["functionDeclarations"])) {
+            functions.push(...tool["functionDeclarations"]);
+          } else if (tool["name"]) {
             functions.push(tool as FunctionDeclaration);
           }
         }
@@ -396,12 +375,12 @@ export class ToolRegistry {
       // register each function as a tool
       for (const func of functions) {
         if (!func.name) {
-          debugLogger.warn('Discovered a tool with no name. Skipping.');
+          debugLogger.warn("Discovered a tool with no name. Skipping.");
           continue;
         }
         const parameters =
           func.parametersJsonSchema &&
-          typeof func.parametersJsonSchema === 'object' &&
+          typeof func.parametersJsonSchema === "object" &&
           !Array.isArray(func.parametersJsonSchema)
             ? func.parametersJsonSchema
             : {};
@@ -410,7 +389,7 @@ export class ToolRegistry {
             this.config,
             func.name,
             DISCOVERED_TOOL_PREFIX + func.name,
-            func.description ?? '',
+            func.description ?? "",
             parameters as Record<string, unknown>,
             this.messageBus,
           ),
@@ -441,19 +420,14 @@ export class ToolRegistry {
    * @param excludeTools (optional, helps performance for repeated calls)
    * @returns Whether or not the `tool` is not excluded.
    */
-  private isActiveTool(
-    tool: AnyDeclarativeTool,
-    excludeTools?: Set<string>,
-  ): boolean {
+  private isActiveTool(tool: AnyDeclarativeTool, excludeTools?: Set<string>): boolean {
     excludeTools ??= this.config.getExcludeTools() ?? new Set([]);
-    const normalizedClassName = tool.constructor.name.replace(/^_+/, '');
+    const normalizedClassName = tool.constructor.name.replace(/^_+/, "");
     const possibleNames = [tool.name, normalizedClassName];
     if (tool instanceof DiscoveredMCPTool) {
       // Check both the unqualified and qualified name for MCP tools.
       if (tool.name.startsWith(tool.getFullyQualifiedPrefix())) {
-        possibleNames.push(
-          tool.name.substring(tool.getFullyQualifiedPrefix().length),
-        );
+        possibleNames.push(tool.name.substring(tool.getFullyQualifiedPrefix().length));
       } else {
         possibleNames.push(`${tool.getFullyQualifiedPrefix()}${tool.name}`);
       }
@@ -503,9 +477,7 @@ export class ToolRegistry {
    * Returns an array of all registered and discovered tool instances.
    */
   getAllTools(): AnyDeclarativeTool[] {
-    return this.getActiveTools().sort((a, b) =>
-      a.displayName.localeCompare(b.displayName),
-    );
+    return this.getActiveTools().sort((a, b) => a.displayName.localeCompare(b.displayName));
   }
 
   /**
diff --git a/packages/gemini-cli-core/src/tools/tools.test.ts b/packages/gemini-cli-core/src/tools/tools.test.ts
index 38827268c..f20953596 100644
--- a/packages/gemini-cli-core/src/tools/tools.test.ts
+++ b/packages/gemini-cli-core/src/tools/tools.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { DeclarativeTool, hasCycleInSchema, Kind } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
+import { describe, expect, it, vi } from "vitest";
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { DeclarativeTool, hasCycleInSchema, Kind } from "./tools.js";
 
 class TestToolInvocation implements ToolInvocation<object, ToolResult> {
   constructor(
@@ -16,7 +16,7 @@ class TestToolInvocation implements ToolInvocation<object, ToolResult> {
   ) {}
 
   getDescription(): string {
-    return 'A test invocation';
+    return "A test invocation";
   }
 
   toolLocations() {
@@ -36,7 +36,7 @@ class TestTool extends DeclarativeTool<object, ToolResult> {
   private readonly buildFn: (params: object) => TestToolInvocation;
 
   constructor(buildFn: (params: object) => TestToolInvocation) {
-    super('test-tool', 'Test Tool', 'A tool for testing', Kind.Other, {});
+    super("test-tool", "Test Tool", "A tool for testing", Kind.Other, {});
     this.buildFn = buildFn;
   }
 
@@ -45,17 +45,17 @@ class TestTool extends DeclarativeTool<object, ToolResult> {
   }
 }
 
-describe('DeclarativeTool', () => {
-  describe('validateBuildAndExecute', () => {
+describe("DeclarativeTool", () => {
+  describe("validateBuildAndExecute", () => {
     const abortSignal = new AbortController().signal;
 
-    it('should return INVALID_TOOL_PARAMS error if build fails', async () => {
-      const buildError = new Error('Invalid build parameters');
+    it("should return INVALID_TOOL_PARAMS error if build fails", async () => {
+      const buildError = new Error("Invalid build parameters");
       const buildFn = vi.fn().mockImplementation(() => {
         throw buildError;
       });
       const tool = new TestTool(buildFn);
-      const params = { foo: 'bar' };
+      const params = { foo: "bar" };
 
       const result = await tool.validateBuildAndExecute(params, abortSignal);
 
@@ -70,13 +70,13 @@ describe('DeclarativeTool', () => {
       });
     });
 
-    it('should return EXECUTION_FAILED error if execute fails', async () => {
-      const executeError = new Error('Execution failed');
+    it("should return EXECUTION_FAILED error if execute fails", async () => {
+      const executeError = new Error("Execution failed");
       const executeFn = vi.fn().mockRejectedValue(executeError);
       const invocation = new TestToolInvocation({}, executeFn);
       const buildFn = vi.fn().mockReturnValue(invocation);
       const tool = new TestTool(buildFn);
-      const params = { foo: 'bar' };
+      const params = { foo: "bar" };
 
       const result = await tool.validateBuildAndExecute(params, abortSignal);
 
@@ -92,16 +92,16 @@ describe('DeclarativeTool', () => {
       });
     });
 
-    it('should return the result of execute on success', async () => {
+    it("should return the result of execute on success", async () => {
       const successResult: ToolResult = {
-        llmContent: 'Success!',
-        returnDisplay: 'Success!',
+        llmContent: "Success!",
+        returnDisplay: "Success!",
       };
       const executeFn = vi.fn().mockResolvedValue(successResult);
       const invocation = new TestToolInvocation({}, executeFn);
       const buildFn = vi.fn().mockReturnValue(invocation);
       const tool = new TestTool(buildFn);
-      const params = { foo: 'bar' };
+      const params = { foo: "bar" };
 
       const result = await tool.validateBuildAndExecute(params, abortSignal);
 
@@ -112,26 +112,26 @@ describe('DeclarativeTool', () => {
   });
 });
 
-describe('hasCycleInSchema', () => {
-  it('should detect a simple direct cycle', () => {
+describe("hasCycleInSchema", () => {
+  it("should detect a simple direct cycle", () => {
     const schema = {
       properties: {
         data: {
-          $ref: '#/properties/data',
+          $ref: "#/properties/data",
         },
       },
     };
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should detect a cycle from object properties referencing parent properties', () => {
+  it("should detect a cycle from object properties referencing parent properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         data: {
-          type: 'object',
+          type: "object",
           properties: {
-            child: { $ref: '#/properties/data' },
+            child: { $ref: "#/properties/data" },
           },
         },
       },
@@ -139,16 +139,16 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should detect a cycle from array items referencing parent properties', () => {
+  it("should detect a cycle from array items referencing parent properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         data: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              child: { $ref: '#/properties/data/items' },
+              child: { $ref: "#/properties/data/items" },
             },
           },
         },
@@ -157,20 +157,20 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should detect a cycle between sibling properties', () => {
+  it("should detect a cycle between sibling properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         a: {
-          type: 'object',
+          type: "object",
           properties: {
-            child: { $ref: '#/properties/b' },
+            child: { $ref: "#/properties/b" },
           },
         },
         b: {
-          type: 'object',
+          type: "object",
           properties: {
-            child: { $ref: '#/properties/a' },
+            child: { $ref: "#/properties/a" },
           },
         },
       },
@@ -178,19 +178,19 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should not detect a cycle in a valid schema', () => {
+  it("should not detect a cycle in a valid schema", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
-        name: { type: 'string' },
-        address: { $ref: '#/definitions/address' },
+        name: { type: "string" },
+        address: { $ref: "#/definitions/address" },
       },
       definitions: {
         address: {
-          type: 'object',
+          type: "object",
           properties: {
-            street: { type: 'string' },
-            city: { type: 'string' },
+            street: { type: "string" },
+            city: { type: "string" },
           },
         },
       },
@@ -198,33 +198,33 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(false);
   });
 
-  it('should handle non-cyclic sibling refs', () => {
+  it("should handle non-cyclic sibling refs", () => {
     const schema = {
       properties: {
-        a: { $ref: '#/definitions/stringDef' },
-        b: { $ref: '#/definitions/stringDef' },
+        a: { $ref: "#/definitions/stringDef" },
+        b: { $ref: "#/definitions/stringDef" },
       },
       definitions: {
-        stringDef: { type: 'string' },
+        stringDef: { type: "string" },
       },
     };
     expect(hasCycleInSchema(schema)).toBe(false);
   });
 
-  it('should handle nested but not cyclic refs', () => {
+  it("should handle nested but not cyclic refs", () => {
     const schema = {
       properties: {
-        a: { $ref: '#/definitions/defA' },
+        a: { $ref: "#/definitions/defA" },
       },
       definitions: {
-        defA: { properties: { b: { $ref: '#/definitions/defB' } } },
-        defB: { type: 'string' },
+        defA: { properties: { b: { $ref: "#/definitions/defB" } } },
+        defB: { type: "string" },
       },
     };
     expect(hasCycleInSchema(schema)).toBe(false);
   });
 
-  it('should return false for an empty schema', () => {
+  it("should return false for an empty schema", () => {
     expect(hasCycleInSchema({})).toBe(false);
   });
 });
diff --git a/packages/gemini-cli-core/src/tools/tools.ts b/packages/gemini-cli-core/src/tools/tools.ts
index 4455ace26..6478dd002 100644
--- a/packages/gemini-cli-core/src/tools/tools.ts
+++ b/packages/gemini-cli-core/src/tools/tools.ts
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FunctionDeclaration, PartListUnion } from '@google/genai';
-import { ToolErrorType } from './tool-error.js';
-import type { DiffUpdateResult } from '../ide/ide-client.js';
-import type { ShellExecutionConfig } from '../services/shellExecutionService.js';
-import { SchemaValidator } from '../utils/schemaValidator.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
+import type { FunctionDeclaration, PartListUnion } from "@google/genai";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
   MessageBusType,
   type ToolConfirmationRequest,
   type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
+} from "../confirmation-bus/types.js";
+import type { DiffUpdateResult } from "../ide/ide-client.js";
+import type { ShellExecutionConfig } from "../services/shellExecutionService.js";
+import { SchemaValidator } from "../utils/schemaValidator.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { ToolErrorType } from "./tool-error.js";
 
 /**
  * Represents a validated and ready-to-execute tool call.
  * An instance of this is created by a `ToolBuilder`.
  */
-export interface ToolInvocation<
-  TParams extends object,
-  TResult extends ToolResult,
-> {
+export interface ToolInvocation<TParams extends object, TResult extends ToolResult> {
   /**
    * The validated parameters for this specific invocation.
    */
@@ -48,9 +45,7 @@ export interface ToolInvocation<
    * Determines if the tool should prompt for confirmation before execution.
    * @returns Confirmation details or false if no confirmation is needed.
    */
-  shouldConfirmExecute(
-    abortSignal: AbortSignal,
-  ): Promise<ToolCallConfirmationDetails | false>;
+  shouldConfirmExecute(abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
 
   /**
    * Executes the tool with the validated parameters.
@@ -68,10 +63,8 @@ export interface ToolInvocation<
 /**
  * A convenience base class for ToolInvocation.
  */
-export abstract class BaseToolInvocation<
-  TParams extends object,
-  TResult extends ToolResult,
-> implements ToolInvocation<TParams, TResult>
+export abstract class BaseToolInvocation<TParams extends object, TResult extends ToolResult>
+  implements ToolInvocation<TParams, TResult>
 {
   constructor(
     readonly params: TParams,
@@ -92,19 +85,17 @@ export abstract class BaseToolInvocation<
   ): Promise<ToolCallConfirmationDetails | false> {
     if (this.messageBus) {
       const decision = await this.getMessageBusDecision(abortSignal);
-      if (decision === 'ALLOW') {
+      if (decision === "ALLOW") {
         return false;
       }
 
-      if (decision === 'DENY') {
+      if (decision === "DENY") {
         throw new Error(
-          `Tool execution for "${
-            this._toolDisplayName || this._toolName
-          }" denied by policy.`,
+          `Tool execution for "${this._toolDisplayName || this._toolName}" denied by policy.`,
         );
       }
 
-      if (decision === 'ASK_USER') {
+      if (decision === "ASK_USER") {
         return this.getConfirmationDetails(abortSignal);
       }
     }
@@ -125,7 +116,7 @@ export abstract class BaseToolInvocation<
     }
 
     const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
+      type: "info",
       title: `Confirm: ${this._toolDisplayName || this._toolName}`,
       prompt: this.getDescription(),
       onConfirm: async (outcome: ToolConfirmationOutcome) => {
@@ -145,11 +136,11 @@ export abstract class BaseToolInvocation<
 
   protected getMessageBusDecision(
     abortSignal: AbortSignal,
-  ): Promise<'ALLOW' | 'DENY' | 'ASK_USER'> {
+  ): Promise<"ALLOW" | "DENY" | "ASK_USER"> {
     if (!this.messageBus) {
       // If there's no message bus, we can't make a decision, so we allow.
       // The legacy confirmation flow will still apply if the tool needs it.
-      return Promise.resolve('ALLOW');
+      return Promise.resolve("ALLOW");
     }
 
     const correlationId = randomUUID();
@@ -158,9 +149,9 @@ export abstract class BaseToolInvocation<
       args: this.params as Record<string, unknown>,
     };
 
-    return new Promise<'ALLOW' | 'DENY' | 'ASK_USER'>((resolve) => {
+    return new Promise<"ALLOW" | "DENY" | "ASK_USER">((resolve) => {
       if (!this.messageBus) {
-        resolve('ALLOW');
+        resolve("ALLOW");
         return;
       }
 
@@ -171,20 +162,17 @@ export abstract class BaseToolInvocation<
           clearTimeout(timeoutId);
           timeoutId = undefined;
         }
-        abortSignal.removeEventListener('abort', abortHandler);
-        this.messageBus?.unsubscribe(
-          MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-          responseHandler,
-        );
+        abortSignal.removeEventListener("abort", abortHandler);
+        this.messageBus?.unsubscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
       };
 
       const abortHandler = () => {
         cleanup();
-        resolve('DENY');
+        resolve("DENY");
       };
 
       if (abortSignal.aborted) {
-        resolve('DENY');
+        resolve("DENY");
         return;
       }
 
@@ -192,26 +180,23 @@ export abstract class BaseToolInvocation<
         if (response.correlationId === correlationId) {
           cleanup();
           if (response.requiresUserConfirmation) {
-            resolve('ASK_USER');
+            resolve("ASK_USER");
           } else if (response.confirmed) {
-            resolve('ALLOW');
+            resolve("ALLOW");
           } else {
-            resolve('DENY');
+            resolve("DENY");
           }
         }
       };
 
-      abortSignal.addEventListener('abort', abortHandler);
+      abortSignal.addEventListener("abort", abortHandler);
 
       timeoutId = setTimeout(() => {
         cleanup();
-        resolve('ASK_USER'); // Default to ASK_USER on timeout
+        resolve("ASK_USER"); // Default to ASK_USER on timeout
       }, 30000);
 
-      this.messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        responseHandler,
-      );
+      this.messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
@@ -225,7 +210,7 @@ export abstract class BaseToolInvocation<
         this.messageBus.publish(request);
       } catch (_error) {
         cleanup();
-        resolve('ALLOW');
+        resolve("ALLOW");
       }
     });
   }
@@ -245,10 +230,7 @@ export type AnyToolInvocation = ToolInvocation<object, ToolResult>;
 /**
  * Interface for a tool builder that validates parameters and creates invocations.
  */
-export interface ToolBuilder<
-  TParams extends object,
-  TResult extends ToolResult,
-> {
+export interface ToolBuilder<TParams extends object, TResult extends ToolResult> {
   /**
    * The internal name of the tool (used for API calls).
    */
@@ -296,10 +278,8 @@ export interface ToolBuilder<
  * New base class for tools that separates validation from execution.
  * New tools should extend this class.
  */
-export abstract class DeclarativeTool<
-  TParams extends object,
-  TResult extends ToolResult,
-> implements ToolBuilder<TParams, TResult>
+export abstract class DeclarativeTool<TParams extends object, TResult extends ToolResult>
+  implements ToolBuilder<TParams, TResult>
 {
   constructor(
     readonly name: string,
@@ -366,9 +346,7 @@ export abstract class DeclarativeTool<
    * @param params The raw, untrusted parameters from the model.
    * @returns A `ToolInvocation` instance.
    */
-  private silentBuild(
-    params: TParams,
-  ): ToolInvocation<TParams, TResult> | Error {
+  private silentBuild(params: TParams): ToolInvocation<TParams, TResult> | Error {
     try {
       return this.build(params);
     } catch (e) {
@@ -386,10 +364,7 @@ export abstract class DeclarativeTool<
    * @params abortSignal a signal to abort.
    * @returns The result of the tool execution.
    */
-  async validateBuildAndExecute(
-    params: TParams,
-    abortSignal: AbortSignal,
-  ): Promise<ToolResult> {
+  async validateBuildAndExecute(params: TParams, abortSignal: AbortSignal): Promise<ToolResult> {
     const invocationOrError = this.silentBuild(params);
     if (invocationOrError instanceof Error) {
       const errorMessage = invocationOrError.message;
@@ -406,8 +381,7 @@ export abstract class DeclarativeTool<
     try {
       return await invocationOrError.execute(abortSignal);
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       return {
         llmContent: `Error: Tool call execution failed. Reason: ${errorMessage}`,
         returnDisplay: errorMessage,
@@ -435,19 +409,11 @@ export abstract class BaseDeclarativeTool<
     if (validationError) {
       throw new Error(validationError);
     }
-    return this.createInvocation(
-      params,
-      this.messageBus,
-      this.name,
-      this.displayName,
-    );
+    return this.createInvocation(params, this.messageBus, this.name, this.displayName);
   }
 
   override validateToolParams(params: TParams): string | null {
-    const errors = SchemaValidator.validate(
-      this.schema.parametersJsonSchema,
-      params,
-    );
+    const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
 
     if (errors) {
       return errors;
@@ -480,11 +446,11 @@ export type AnyDeclarativeTool = DeclarativeTool<object, ToolResult>;
  */
 export function isTool(obj: unknown): obj is AnyDeclarativeTool {
   return (
-    typeof obj === 'object' &&
+    typeof obj === "object" &&
     obj !== null &&
-    'name' in obj &&
-    'build' in obj &&
-    typeof (obj as AnyDeclarativeTool).build === 'function'
+    "name" in obj &&
+    "build" in obj &&
+    typeof (obj as AnyDeclarativeTool).build === "function"
   );
 }
 
@@ -520,17 +486,13 @@ export interface ToolResult {
  */
 export function hasCycleInSchema(schema: object): boolean {
   function resolveRef(ref: string): object | null {
-    if (!ref.startsWith('#/')) {
+    if (!ref.startsWith("#/")) {
       return null;
     }
-    const path = ref.substring(2).split('/');
+    const path = ref.substring(2).split("/");
     let current: unknown = schema;
     for (const segment of path) {
-      if (
-        typeof current !== 'object' ||
-        current === null ||
-        !Object.prototype.hasOwnProperty.call(current, segment)
-      ) {
+      if (typeof current !== "object" || current === null || !Object.hasOwn(current, segment)) {
         return null;
       }
       current = (current as Record<string, unknown>)[segment];
@@ -538,12 +500,8 @@ export function hasCycleInSchema(schema: object): boolean {
     return current as object;
   }
 
-  function traverse(
-    node: unknown,
-    visitedRefs: Set<string>,
-    pathRefs: Set<string>,
-  ): boolean {
-    if (typeof node !== 'object' || node === null) {
+  function traverse(node: unknown, visitedRefs: Set<string>, pathRefs: Set<string>): boolean {
+    if (typeof node !== "object" || node === null) {
       return false;
     }
 
@@ -556,9 +514,9 @@ export function hasCycleInSchema(schema: object): boolean {
       return false;
     }
 
-    if ('$ref' in node && typeof node.$ref === 'string') {
+    if ("$ref" in node && typeof node.$ref === "string") {
       const ref = node.$ref;
-      if (ref === '#' || ref === '#/' || pathRefs.has(ref)) {
+      if (ref === "#" || ref === "#/" || pathRefs.has(ref)) {
         // A ref to just '#/' is always a cycle.
         return true; // Cycle detected!
       }
@@ -579,14 +537,8 @@ export function hasCycleInSchema(schema: object): boolean {
 
     // Crawl all the properties of node
     for (const key in node) {
-      if (Object.prototype.hasOwnProperty.call(node, key)) {
-        if (
-          traverse(
-            (node as Record<string, unknown>)[key],
-            visitedRefs,
-            pathRefs,
-          )
-        ) {
+      if (Object.hasOwn(node, key)) {
+        if (traverse((node as Record<string, unknown>)[key], visitedRefs, pathRefs)) {
           return true;
         }
       }
@@ -604,7 +556,7 @@ export interface TodoList {
 
 export type ToolResultDisplay = string | FileDiff | AnsiOutput | TodoList;
 
-export type TodoStatus = 'pending' | 'in_progress' | 'completed' | 'cancelled';
+export type TodoStatus = "pending" | "in_progress" | "completed" | "cancelled";
 
 export interface Todo {
   description: string;
@@ -631,12 +583,9 @@ export interface DiffStat {
 }
 
 export interface ToolEditConfirmationDetails {
-  type: 'edit';
+  type: "edit";
   title: string;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
   fileName: string;
   filePath: string;
   fileDiff: string;
@@ -653,7 +602,7 @@ export interface ToolConfirmationPayload {
 }
 
 export interface ToolExecuteConfirmationDetails {
-  type: 'exec';
+  type: "exec";
   title: string;
   onConfirm: (outcome: ToolConfirmationOutcome) => Promise<void>;
   command: string;
@@ -661,7 +610,7 @@ export interface ToolExecuteConfirmationDetails {
 }
 
 export interface ToolMcpConfirmationDetails {
-  type: 'mcp';
+  type: "mcp";
   title: string;
   serverName: string;
   toolName: string;
@@ -670,7 +619,7 @@ export interface ToolMcpConfirmationDetails {
 }
 
 export interface ToolInfoConfirmationDetails {
-  type: 'info';
+  type: "info";
   title: string;
   onConfirm: (outcome: ToolConfirmationOutcome) => Promise<void>;
   prompt: string;
@@ -684,33 +633,28 @@ export type ToolCallConfirmationDetails =
   | ToolInfoConfirmationDetails;
 
 export enum ToolConfirmationOutcome {
-  ProceedOnce = 'proceed_once',
-  ProceedAlways = 'proceed_always',
-  ProceedAlwaysServer = 'proceed_always_server',
-  ProceedAlwaysTool = 'proceed_always_tool',
-  ModifyWithEditor = 'modify_with_editor',
-  Cancel = 'cancel',
+  ProceedOnce = "proceed_once",
+  ProceedAlways = "proceed_always",
+  ProceedAlwaysServer = "proceed_always_server",
+  ProceedAlwaysTool = "proceed_always_tool",
+  ModifyWithEditor = "modify_with_editor",
+  Cancel = "cancel",
 }
 
 export enum Kind {
-  Read = 'read',
-  Edit = 'edit',
-  Delete = 'delete',
-  Move = 'move',
-  Search = 'search',
-  Execute = 'execute',
-  Think = 'think',
-  Fetch = 'fetch',
-  Other = 'other',
+  Read = "read",
+  Edit = "edit",
+  Delete = "delete",
+  Move = "move",
+  Search = "search",
+  Execute = "execute",
+  Think = "think",
+  Fetch = "fetch",
+  Other = "other",
 }
 
 // Function kinds that have side effects
-export const MUTATOR_KINDS: Kind[] = [
-  Kind.Edit,
-  Kind.Delete,
-  Kind.Move,
-  Kind.Execute,
-] as const;
+export const MUTATOR_KINDS: Kind[] = [Kind.Edit, Kind.Delete, Kind.Move, Kind.Execute] as const;
 
 export interface ToolLocation {
   // Absolute path to the file
diff --git a/packages/gemini-cli-core/src/tools/web-fetch.test.ts b/packages/gemini-cli-core/src/tools/web-fetch.test.ts
index f37db3d55..0a229d8e6 100644
--- a/packages/gemini-cli-core/src/tools/web-fetch.test.ts
+++ b/packages/gemini-cli-core/src/tools/web-fetch.test.ts
@@ -4,41 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { WebFetchTool, parsePrompt } from './web-fetch.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import * as fetchUtils from '../utils/fetch.js';
-import { MessageBus } from '../confirmation-bus/message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import {
-  MessageBusType,
-  type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
-import { randomUUID } from 'node:crypto';
-import {
-  logWebFetchFallbackAttempt,
-  WebFetchFallbackAttemptEvent,
-} from '../telemetry/index.js';
-import { convert } from 'html-to-text';
+import { randomUUID } from "node:crypto";
+import { convert } from "html-to-text";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { MessageBus } from "../confirmation-bus/message-bus.js";
+import { MessageBusType, type ToolConfirmationResponse } from "../confirmation-bus/types.js";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logWebFetchFallbackAttempt, WebFetchFallbackAttemptEvent } from "../telemetry/index.js";
+import * as fetchUtils from "../utils/fetch.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+import { parsePrompt, WebFetchTool } from "./web-fetch.js";
 
 const mockGenerateContent = vi.fn();
 const mockGetGeminiClient = vi.fn(() => ({
   generateContent: mockGenerateContent,
 }));
 
-vi.mock('html-to-text', () => ({
+vi.mock("html-to-text", () => ({
   convert: vi.fn((text) => `Converted: ${text}`),
 }));
 
-vi.mock('../telemetry/index.js', () => ({
+vi.mock("../telemetry/index.js", () => ({
   logWebFetchFallbackAttempt: vi.fn(),
   WebFetchFallbackAttemptEvent: vi.fn(),
 }));
 
-vi.mock('../utils/fetch.js', async (importOriginal) => {
+vi.mock("../utils/fetch.js", async (importOriginal) => {
   const actual = await importOriginal<typeof fetchUtils>();
   return {
     ...actual,
@@ -47,55 +41,55 @@ vi.mock('../utils/fetch.js', async (importOriginal) => {
   };
 });
 
-vi.mock('node:crypto', () => ({
+vi.mock("node:crypto", () => ({
   randomUUID: vi.fn(),
 }));
 
-describe('parsePrompt', () => {
-  it('should extract valid URLs separated by whitespace', () => {
-    const prompt = 'Go to https://example.com and http://google.com';
+describe("parsePrompt", () => {
+  it("should extract valid URLs separated by whitespace", () => {
+    const prompt = "Go to https://example.com and http://google.com";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(errors).toHaveLength(0);
     expect(validUrls).toHaveLength(2);
-    expect(validUrls[0]).toBe('https://example.com/');
-    expect(validUrls[1]).toBe('http://google.com/');
+    expect(validUrls[0]).toBe("https://example.com/");
+    expect(validUrls[1]).toBe("http://google.com/");
   });
 
-  it('should accept URLs with trailing punctuation', () => {
-    const prompt = 'Check https://example.com.';
+  it("should accept URLs with trailing punctuation", () => {
+    const prompt = "Check https://example.com.";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(errors).toHaveLength(0);
     expect(validUrls).toHaveLength(1);
-    expect(validUrls[0]).toBe('https://example.com./');
+    expect(validUrls[0]).toBe("https://example.com./");
   });
 
   it.each([
     {
-      name: 'URLs wrapped in punctuation',
-      prompt: 'Read (https://example.com)',
-      expectedErrorContent: ['Malformed URL detected', '(https://example.com)'],
+      name: "URLs wrapped in punctuation",
+      prompt: "Read (https://example.com)",
+      expectedErrorContent: ["Malformed URL detected", "(https://example.com)"],
     },
     {
-      name: 'unsupported protocols (httpshttps://)',
-      prompt: 'Summarize httpshttps://github.com/JuliaLang/julia/issues/58346',
+      name: "unsupported protocols (httpshttps://)",
+      prompt: "Summarize httpshttps://github.com/JuliaLang/julia/issues/58346",
       expectedErrorContent: [
-        'Unsupported protocol',
-        'httpshttps://github.com/JuliaLang/julia/issues/58346',
+        "Unsupported protocol",
+        "httpshttps://github.com/JuliaLang/julia/issues/58346",
       ],
     },
     {
-      name: 'unsupported protocols (ftp://)',
-      prompt: 'ftp://example.com/file.txt',
-      expectedErrorContent: ['Unsupported protocol'],
+      name: "unsupported protocols (ftp://)",
+      prompt: "ftp://example.com/file.txt",
+      expectedErrorContent: ["Unsupported protocol"],
     },
     {
-      name: 'malformed URLs (http://)',
-      prompt: 'http://',
-      expectedErrorContent: ['Malformed URL detected'],
+      name: "malformed URLs (http://)",
+      prompt: "http://",
+      expectedErrorContent: ["Malformed URL detected"],
     },
-  ])('should detect $name as errors', ({ prompt, expectedErrorContent }) => {
+  ])("should detect $name as errors", ({ prompt, expectedErrorContent }) => {
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(0);
@@ -105,26 +99,26 @@ describe('parsePrompt', () => {
     });
   });
 
-  it('should handle prompts with no URLs', () => {
-    const prompt = 'hello world';
+  it("should handle prompts with no URLs", () => {
+    const prompt = "hello world";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(0);
     expect(errors).toHaveLength(0);
   });
 
-  it('should handle mixed valid and invalid URLs', () => {
-    const prompt = 'Valid: https://google.com, Invalid: ftp://bad.com';
+  it("should handle mixed valid and invalid URLs", () => {
+    const prompt = "Valid: https://google.com, Invalid: ftp://bad.com";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(1);
-    expect(validUrls[0]).toBe('https://google.com,/');
+    expect(validUrls[0]).toBe("https://google.com,/");
     expect(errors).toHaveLength(1);
-    expect(errors[0]).toContain('ftp://bad.com');
+    expect(errors[0]).toContain("ftp://bad.com");
   });
 });
 
-describe('WebFetchTool', () => {
+describe("WebFetchTool", () => {
   let mockConfig: Config;
 
   beforeEach(() => {
@@ -145,72 +139,68 @@ describe('WebFetchTool', () => {
     } as unknown as Config;
   });
 
-  describe('validateToolParamValues', () => {
+  describe("validateToolParamValues", () => {
     it.each([
       {
-        name: 'empty prompt',
-        prompt: '',
+        name: "empty prompt",
+        prompt: "",
         expectedError: "The 'prompt' parameter cannot be empty",
       },
       {
-        name: 'prompt with no URLs',
-        prompt: 'hello world',
+        name: "prompt with no URLs",
+        prompt: "hello world",
         expectedError: "The 'prompt' must contain at least one valid URL",
       },
       {
-        name: 'prompt with malformed URLs',
-        prompt: 'fetch httpshttps://example.com',
-        expectedError: 'Error(s) in prompt URLs:',
+        name: "prompt with malformed URLs",
+        prompt: "fetch httpshttps://example.com",
+        expectedError: "Error(s) in prompt URLs:",
       },
-    ])('should throw if $name', ({ prompt, expectedError }) => {
+    ])("should throw if $name", ({ prompt, expectedError }) => {
       const tool = new WebFetchTool(mockConfig);
       expect(() => tool.build({ prompt })).toThrow(expectedError);
     });
 
-    it('should pass if prompt contains at least one valid URL', () => {
+    it("should pass if prompt contains at least one valid URL", () => {
       const tool = new WebFetchTool(mockConfig);
-      expect(() =>
-        tool.build({ prompt: 'fetch https://example.com' }),
-      ).not.toThrow();
+      expect(() => tool.build({ prompt: "fetch https://example.com" })).not.toThrow();
     });
   });
 
-  describe('execute', () => {
-    it('should return WEB_FETCH_FALLBACK_FAILED on fallback fetch failure', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockRejectedValue(
-        new Error('fetch failed'),
-      );
+  describe("execute", () => {
+    it("should return WEB_FETCH_FALLBACK_FAILED on fallback fetch failure", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(true);
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockRejectedValue(new Error("fetch failed"));
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://private.ip' };
+      const params = { prompt: "fetch https://private.ip" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.WEB_FETCH_FALLBACK_FAILED);
     });
 
-    it('should return WEB_FETCH_PROCESSING_ERROR on general processing failure', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
-      mockGenerateContent.mockRejectedValue(new Error('API error'));
+    it("should return WEB_FETCH_PROCESSING_ERROR on general processing failure", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
+      mockGenerateContent.mockRejectedValue(new Error("API error"));
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://public.ip' };
+      const params = { prompt: "fetch https://public.ip" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.WEB_FETCH_PROCESSING_ERROR);
     });
 
-    it('should log telemetry when falling back due to private IP', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
+    it("should log telemetry when falling back due to private IP", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(true);
       // Mock fetchWithTimeout to succeed so fallback proceeds
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
-        text: () => Promise.resolve('some content'),
+        text: () => Promise.resolve("some content"),
       } as Response);
       mockGenerateContent.mockResolvedValue({
-        candidates: [{ content: { parts: [{ text: 'fallback response' }] } }],
+        candidates: [{ content: { parts: [{ text: "fallback response" }] } }],
       });
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://private.ip' };
+      const params = { prompt: "fetch https://private.ip" };
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
@@ -218,27 +208,27 @@ describe('WebFetchTool', () => {
         mockConfig,
         expect.any(WebFetchFallbackAttemptEvent),
       );
-      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith('private_ip');
+      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith("private_ip");
     });
 
-    it('should log telemetry when falling back due to primary fetch failure', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
+    it("should log telemetry when falling back due to primary fetch failure", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
       // Mock primary fetch to return empty response, triggering fallback
       mockGenerateContent.mockResolvedValueOnce({
         candidates: [],
       });
       // Mock fetchWithTimeout to succeed so fallback proceeds
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
-        text: () => Promise.resolve('some content'),
+        text: () => Promise.resolve("some content"),
       } as Response);
       // Mock fallback LLM call
       mockGenerateContent.mockResolvedValueOnce({
-        candidates: [{ content: { parts: [{ text: 'fallback response' }] } }],
+        candidates: [{ content: { parts: [{ text: "fallback response" }] } }],
       });
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://public.ip' };
+      const params = { prompt: "fetch https://public.ip" };
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
@@ -246,16 +236,14 @@ describe('WebFetchTool', () => {
         mockConfig,
         expect.any(WebFetchFallbackAttemptEvent),
       );
-      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith(
-        'primary_failed',
-      );
+      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith("primary_failed");
     });
   });
 
-  describe('execute (fallback)', () => {
+  describe("execute (fallback)", () => {
     beforeEach(() => {
       // Force fallback by mocking primary fetch to fail
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
       mockGenerateContent.mockResolvedValueOnce({
         candidates: [],
       });
@@ -263,94 +251,86 @@ describe('WebFetchTool', () => {
 
     it.each([
       {
-        name: 'HTML content using html-to-text',
-        content: '<html><body><h1>Hello</h1></body></html>',
-        contentType: 'text/html; charset=utf-8',
+        name: "HTML content using html-to-text",
+        content: "<html><body><h1>Hello</h1></body></html>",
+        contentType: "text/html; charset=utf-8",
         shouldConvert: true,
       },
       {
-        name: 'raw text for JSON content',
+        name: "raw text for JSON content",
         content: '{"key": "value"}',
-        contentType: 'application/json',
+        contentType: "application/json",
         shouldConvert: false,
       },
       {
-        name: 'raw text for plain text content',
-        content: 'Just some text.',
-        contentType: 'text/plain',
+        name: "raw text for plain text content",
+        content: "Just some text.",
+        contentType: "text/plain",
         shouldConvert: false,
       },
       {
-        name: 'content with no Content-Type header as HTML',
-        content: '<p>No header</p>',
+        name: "content with no Content-Type header as HTML",
+        content: "<p>No header</p>",
         contentType: null,
         shouldConvert: true,
       },
-    ])(
-      'should handle $name',
-      async ({ content, contentType, shouldConvert }) => {
-        const headers = contentType
-          ? new Headers({ 'content-type': contentType })
-          : new Headers();
-
-        vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
-          ok: true,
-          headers,
-          text: () => Promise.resolve(content),
-        } as Response);
-
-        // Mock fallback LLM call to return the content passed to it
-        mockGenerateContent.mockImplementationOnce(async (_, req) => ({
-          candidates: [
-            { content: { parts: [{ text: req[0].parts[0].text }] } },
+    ])("should handle $name", async ({ content, contentType, shouldConvert }) => {
+      const headers = contentType ? new Headers({ "content-type": contentType }) : new Headers();
+
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
+        ok: true,
+        headers,
+        text: () => Promise.resolve(content),
+      } as Response);
+
+      // Mock fallback LLM call to return the content passed to it
+      mockGenerateContent.mockImplementationOnce(async (_, req) => ({
+        candidates: [{ content: { parts: [{ text: req[0].parts[0].text }] } }],
+      }));
+
+      const tool = new WebFetchTool(mockConfig);
+      const params = { prompt: "fetch https://example.com" };
+      const invocation = tool.build(params);
+      const result = await invocation.execute(new AbortController().signal);
+
+      if (shouldConvert) {
+        expect(convert).toHaveBeenCalledWith(content, {
+          wordwrap: false,
+          selectors: [
+            { selector: "a", options: { ignoreHref: true } },
+            { selector: "img", format: "skip" },
           ],
-        }));
-
-        const tool = new WebFetchTool(mockConfig);
-        const params = { prompt: 'fetch https://example.com' };
-        const invocation = tool.build(params);
-        const result = await invocation.execute(new AbortController().signal);
-
-        if (shouldConvert) {
-          expect(convert).toHaveBeenCalledWith(content, {
-            wordwrap: false,
-            selectors: [
-              { selector: 'a', options: { ignoreHref: true } },
-              { selector: 'img', format: 'skip' },
-            ],
-          });
-          expect(result.llmContent).toContain(`Converted: ${content}`);
-        } else {
-          expect(convert).not.toHaveBeenCalled();
-          expect(result.llmContent).toContain(content);
-        }
-      },
-    );
+        });
+        expect(result.llmContent).toContain(`Converted: ${content}`);
+      } else {
+        expect(convert).not.toHaveBeenCalled();
+        expect(result.llmContent).toContain(content);
+      }
+    });
   });
 
-  describe('shouldConfirmExecute', () => {
-    it('should return confirmation details with the correct prompt and parsed urls', async () => {
+  describe("shouldConfirmExecute", () => {
+    it("should return confirmation details with the correct prompt and parsed urls", async () => {
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
         new AbortController().signal,
       );
 
       expect(confirmationDetails).toEqual({
-        type: 'info',
-        title: 'Confirm Web Fetch',
-        prompt: 'fetch https://example.com',
-        urls: ['https://example.com/'],
+        type: "info",
+        title: "Confirm Web Fetch",
+        prompt: "fetch https://example.com",
+        urls: ["https://example.com/"],
         onConfirm: expect.any(Function),
       });
     });
 
-    it('should convert github urls to raw format', async () => {
+    it("should convert github urls to raw format", async () => {
       const tool = new WebFetchTool(mockConfig);
       const params = {
-        prompt:
-          'fetch https://github.com/google/gemini-react/blob/main/README.md',
+        prompt: "fetch https://github.com/google/gemini-react/blob/main/README.md",
       };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
@@ -358,23 +338,18 @@ describe('WebFetchTool', () => {
       );
 
       expect(confirmationDetails).toEqual({
-        type: 'info',
-        title: 'Confirm Web Fetch',
-        prompt:
-          'fetch https://github.com/google/gemini-react/blob/main/README.md',
-        urls: [
-          'https://raw.githubusercontent.com/google/gemini-react/main/README.md',
-        ],
+        type: "info",
+        title: "Confirm Web Fetch",
+        prompt: "fetch https://github.com/google/gemini-react/blob/main/README.md",
+        urls: ["https://raw.githubusercontent.com/google/gemini-react/main/README.md"],
         onConfirm: expect.any(Function),
       });
     });
 
-    it('should return false if approval mode is AUTO_EDIT', async () => {
-      vi.spyOn(mockConfig, 'getApprovalMode').mockReturnValue(
-        ApprovalMode.AUTO_EDIT,
-      );
+    it("should return false if approval mode is AUTO_EDIT", async () => {
+      vi.spyOn(mockConfig, "getApprovalMode").mockReturnValue(ApprovalMode.AUTO_EDIT);
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
         new AbortController().signal,
@@ -383,9 +358,9 @@ describe('WebFetchTool', () => {
       expect(confirmationDetails).toBe(false);
     });
 
-    it('should call setApprovalMode when onConfirm is called with ProceedAlways', async () => {
+    it("should call setApprovalMode when onConfirm is called with ProceedAlways", async () => {
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
         new AbortController().signal,
@@ -393,35 +368,31 @@ describe('WebFetchTool', () => {
 
       if (
         confirmationDetails &&
-        typeof confirmationDetails === 'object' &&
-        'onConfirm' in confirmationDetails
+        typeof confirmationDetails === "object" &&
+        "onConfirm" in confirmationDetails
       ) {
-        await confirmationDetails.onConfirm(
-          ToolConfirmationOutcome.ProceedAlways,
-        );
+        await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedAlways);
       }
 
-      expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(
-        ApprovalMode.AUTO_EDIT,
-      );
+      expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
     });
   });
 
-  describe('Message Bus Integration', () => {
+  describe("Message Bus Integration", () => {
     let policyEngine: PolicyEngine;
     let messageBus: MessageBus;
     let mockUUID: Mock;
 
     const createToolWithMessageBus = (bus?: MessageBus) => {
       const tool = new WebFetchTool(mockConfig, bus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       return { tool, invocation: tool.build(params) };
     };
 
     const simulateMessageBusResponse = (
       subscribeSpy: ReturnType<typeof vi.spyOn>,
       confirmed: boolean,
-      correlationId = 'test-correlation-id',
+      correlationId = "test-correlation-id",
     ) => {
       const responseHandler = subscribeSpy.mock.calls[0][1] as (
         response: ToolConfirmationResponse,
@@ -438,26 +409,24 @@ describe('WebFetchTool', () => {
       policyEngine = new PolicyEngine();
       messageBus = new MessageBus(policyEngine);
       mockUUID = vi.mocked(randomUUID);
-      mockUUID.mockReturnValue('test-correlation-id');
+      mockUUID.mockReturnValue("test-correlation-id");
     });
 
-    it('should use message bus for confirmation when available', async () => {
+    it("should use message bus for confirmation when available", async () => {
       const { invocation } = createToolWithMessageBus(messageBus);
-      const publishSpy = vi.spyOn(messageBus, 'publish');
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const unsubscribeSpy = vi.spyOn(messageBus, 'unsubscribe');
+      const publishSpy = vi.spyOn(messageBus, "publish");
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const unsubscribeSpy = vi.spyOn(messageBus, "unsubscribe");
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(publishSpy).toHaveBeenCalledWith({
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
         toolCall: {
-          name: 'web_fetch',
-          args: { prompt: 'fetch https://example.com' },
+          name: "web_fetch",
+          args: { prompt: "fetch https://example.com" },
         },
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
       });
 
       expect(subscribeSpy).toHaveBeenCalledWith(
@@ -472,13 +441,11 @@ describe('WebFetchTool', () => {
       expect(unsubscribeSpy).toHaveBeenCalled();
     });
 
-    it('should reject promise when confirmation is denied via message bus', async () => {
+    it("should reject promise when confirmation is denied via message bus", async () => {
       const { invocation } = createToolWithMessageBus(messageBus);
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       simulateMessageBusResponse(subscribeSpy, false);
 
@@ -487,27 +454,23 @@ describe('WebFetchTool', () => {
       );
     });
 
-    it('should handle timeout gracefully', async () => {
+    it("should handle timeout gracefully", async () => {
       vi.useFakeTimers();
       const { invocation } = createToolWithMessageBus(messageBus);
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       await vi.advanceTimersByTimeAsync(30000);
       const result = await confirmationPromise;
       expect(result).not.toBe(false);
-      expect(result).toHaveProperty('type', 'info');
+      expect(result).toHaveProperty("type", "info");
 
       vi.useRealTimers();
     });
 
-    it('should handle abort signal during confirmation', async () => {
+    it("should handle abort signal during confirmation", async () => {
       const { invocation } = createToolWithMessageBus(messageBus);
       const abortController = new AbortController();
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        abortController.signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(abortController.signal);
 
       abortController.abort();
 
@@ -516,65 +479,57 @@ describe('WebFetchTool', () => {
       );
     });
 
-    it('should fall back to legacy confirmation when no message bus', async () => {
+    it("should fall back to legacy confirmation when no message bus", async () => {
       const { invocation } = createToolWithMessageBus(); // No message bus
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(result).not.toBe(false);
-      expect(result).toHaveProperty('type', 'info');
+      expect(result).toHaveProperty("type", "info");
     });
 
-    it('should ignore responses with wrong correlation ID', async () => {
+    it("should ignore responses with wrong correlation ID", async () => {
       vi.useFakeTimers();
       const { invocation } = createToolWithMessageBus(messageBus);
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
-      simulateMessageBusResponse(subscribeSpy, true, 'wrong-id');
+      simulateMessageBusResponse(subscribeSpy, true, "wrong-id");
 
       await vi.advanceTimersByTimeAsync(30000);
       const result = await confirmationPromise;
       expect(result).not.toBe(false);
-      expect(result).toHaveProperty('type', 'info');
+      expect(result).toHaveProperty("type", "info");
 
       vi.useRealTimers();
     });
 
-    it('should handle message bus publish errors gracefully', async () => {
+    it("should handle message bus publish errors gracefully", async () => {
       const { invocation } = createToolWithMessageBus(messageBus);
-      vi.spyOn(messageBus, 'publish').mockImplementation(() => {
-        throw new Error('Message bus error');
+      vi.spyOn(messageBus, "publish").mockImplementation(() => {
+        throw new Error("Message bus error");
       });
 
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(result).toBe(false);
     });
 
-    it('should execute normally after confirmation approval', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
+    it("should execute normally after confirmation approval", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: 'Fetched content from https://example.com' }],
-              role: 'model',
+              parts: [{ text: "Fetched content from https://example.com" }],
+              role: "model",
             },
           },
         ],
       });
 
       const { invocation } = createToolWithMessageBus(messageBus);
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       simulateMessageBusResponse(subscribeSpy, true);
 
@@ -582,7 +537,7 @@ describe('WebFetchTool', () => {
 
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error).toBeUndefined();
-      expect(result.llmContent).toContain('Fetched content');
+      expect(result.llmContent).toContain("Fetched content");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/tools/web-fetch.ts b/packages/gemini-cli-core/src/tools/web-fetch.ts
index a1836c37e..e401ba675 100644
--- a/packages/gemini-cli-core/src/tools/web-fetch.ts
+++ b/packages/gemini-cli-core/src/tools/web-fetch.ts
@@ -4,32 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ToolCallConfirmationDetails,
-  ToolInvocation,
-  ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { ToolErrorType } from './tool-error.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { fetchWithTimeout, isPrivateIp } from '../utils/fetch.js';
-import { convert } from 'html-to-text';
-import {
-  logWebFetchFallbackAttempt,
-  WebFetchFallbackAttemptEvent,
-} from '../telemetry/index.js';
-import { WEB_FETCH_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { retryWithBackoff } from '../utils/retry.js';
+import { convert } from "html-to-text";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logWebFetchFallbackAttempt, WebFetchFallbackAttemptEvent } from "../telemetry/index.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { fetchWithTimeout, isPrivateIp } from "../utils/fetch.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import { ToolErrorType } from "./tool-error.js";
+import { WEB_FETCH_TOOL_NAME } from "./tool-names.js";
+import type { ToolCallConfirmationDetails, ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 const URL_FETCH_TIMEOUT_MS = 10000;
 const MAX_CONTENT_LENGTH = 100000;
@@ -49,13 +37,13 @@ export function parsePrompt(text: string): {
     if (!token) continue;
 
     // Heuristic to check if the url appears to contain URL-like chars.
-    if (token.includes('://')) {
+    if (token.includes("://")) {
       try {
         // Validate with new URL()
         const url = new URL(token);
 
         // Allowlist protocols
-        if (['http:', 'https:'].includes(url.protocol)) {
+        if (["http:", "https:"].includes(url.protocol)) {
           validUrls.push(url.href);
         } else {
           errors.push(
@@ -107,10 +95,7 @@ interface ErrorWithStatus extends Error {
   status?: number;
 }
 
-class WebFetchToolInvocation extends BaseToolInvocation<
-  WebFetchToolParams,
-  ToolResult
-> {
+class WebFetchToolInvocation extends BaseToolInvocation<WebFetchToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: WebFetchToolParams,
@@ -127,10 +112,8 @@ class WebFetchToolInvocation extends BaseToolInvocation<
     let url = urls[0];
 
     // Convert GitHub blob URL to raw URL
-    if (url.includes('github.com') && url.includes('/blob/')) {
-      url = url
-        .replace('github.com', 'raw.githubusercontent.com')
-        .replace('/blob/', '/');
+    if (url.includes("github.com") && url.includes("/blob/")) {
+      url = url.replace("github.com", "raw.githubusercontent.com").replace("/blob/", "/");
     }
 
     try {
@@ -152,19 +135,16 @@ class WebFetchToolInvocation extends BaseToolInvocation<
       );
 
       const rawContent = await response.text();
-      const contentType = response.headers.get('content-type') || '';
+      const contentType = response.headers.get("content-type") || "";
       let textContent: string;
 
       // Only use html-to-text if content type is HTML, or if no content type is provided (assume HTML)
-      if (
-        contentType.toLowerCase().includes('text/html') ||
-        contentType === ''
-      ) {
+      if (contentType.toLowerCase().includes("text/html") || contentType === "") {
         textContent = convert(rawContent, {
           wordwrap: false,
           selectors: [
-            { selector: 'a', options: { ignoreHref: true } },
-            { selector: 'img', format: 'skip' },
+            { selector: "a", options: { ignoreHref: true } },
+            { selector: "img", format: "skip" },
           ],
         });
       } else {
@@ -184,11 +164,11 @@ ${textContent}
 ---
 `;
       const result = await geminiClient.generateContent(
-        { model: 'web-fetch-fallback' },
-        [{ role: 'user', parts: [{ text: fallbackPrompt }] }],
+        { model: "web-fetch-fallback" },
+        [{ role: "user", parts: [{ text: fallbackPrompt }] }],
         signal,
       );
-      const resultText = getResponseText(result) || '';
+      const resultText = getResponseText(result) || "";
       return {
         llmContent: resultText,
         returnDisplay: `Content for ${url} processed using fallback fetch.`,
@@ -210,7 +190,7 @@ ${textContent}
   getDescription(): string {
     const displayPrompt =
       this.params.prompt.length > 100
-        ? this.params.prompt.substring(0, 97) + '...'
+        ? this.params.prompt.substring(0, 97) + "..."
         : this.params.prompt;
     return `Processing URLs and instructions from prompt: "${displayPrompt}"`;
   }
@@ -227,16 +207,14 @@ ${textContent}
     // URL and the actual URL to be fetched.
     const { validUrls } = parsePrompt(this.params.prompt);
     const urls = validUrls.map((url) => {
-      if (url.includes('github.com') && url.includes('/blob/')) {
-        return url
-          .replace('github.com', 'raw.githubusercontent.com')
-          .replace('/blob/', '/');
+      if (url.includes("github.com") && url.includes("/blob/")) {
+        return url.replace("github.com", "raw.githubusercontent.com").replace("/blob/", "/");
       }
       return url;
     });
 
     const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
+      type: "info",
       title: `Confirm Web Fetch`,
       prompt: this.params.prompt,
       urls,
@@ -256,10 +234,7 @@ ${textContent}
     const isPrivate = isPrivateIp(url);
 
     if (isPrivate) {
-      logWebFetchFallbackAttempt(
-        this.config,
-        new WebFetchFallbackAttemptEvent('private_ip'),
-      );
+      logWebFetchFallbackAttempt(this.config, new WebFetchFallbackAttemptEvent("private_ip"));
       return this.executeFallback(signal);
     }
 
@@ -267,25 +242,20 @@ ${textContent}
 
     try {
       const response = await geminiClient.generateContent(
-        { model: 'web-fetch' },
-        [{ role: 'user', parts: [{ text: userPrompt }] }],
+        { model: "web-fetch" },
+        [{ role: "user", parts: [{ text: userPrompt }] }],
         signal, // Pass signal
       );
 
       debugLogger.debug(
-        `[WebFetchTool] Full response for prompt "${userPrompt.substring(
-          0,
-          50,
-        )}...":`,
+        `[WebFetchTool] Full response for prompt "${userPrompt.substring(0, 50)}...":`,
         JSON.stringify(response, null, 2),
       );
 
-      let responseText = getResponseText(response) || '';
+      let responseText = getResponseText(response) || "";
       const urlContextMeta = response.candidates?.[0]?.urlContextMetadata;
       const groundingMetadata = response.candidates?.[0]?.groundingMetadata;
-      const sources = groundingMetadata?.groundingChunks as
-        | GroundingChunkItem[]
-        | undefined;
+      const sources = groundingMetadata?.groundingChunks as GroundingChunkItem[] | undefined;
       const groundingSupports = groundingMetadata?.groundingSupports as
         | GroundingSupportItem[]
         | undefined;
@@ -293,14 +263,9 @@ ${textContent}
       // Error Handling
       let processingError = false;
 
-      if (
-        urlContextMeta?.urlMetadata &&
-        urlContextMeta.urlMetadata.length > 0
-      ) {
-        const allStatuses = urlContextMeta.urlMetadata.map(
-          (m) => m.urlRetrievalStatus,
-        );
-        if (allStatuses.every((s) => s !== 'URL_RETRIEVAL_STATUS_SUCCESS')) {
+      if (urlContextMeta?.urlMetadata && urlContextMeta.urlMetadata.length > 0) {
+        const allStatuses = urlContextMeta.urlMetadata.map((m) => m.urlRetrievalStatus);
+        if (allStatuses.every((s) => s !== "URL_RETRIEVAL_STATUS_SUCCESS")) {
           processingError = true;
         }
       } else if (!responseText.trim() && !sources?.length) {
@@ -308,28 +273,21 @@ ${textContent}
         processingError = true;
       }
 
-      if (
-        !processingError &&
-        !responseText.trim() &&
-        (!sources || sources.length === 0)
-      ) {
+      if (!processingError && !responseText.trim() && (!sources || sources.length === 0)) {
         // Successfully retrieved some URL (or no specific error from urlContextMeta), but no usable text or grounding data.
         processingError = true;
       }
 
       if (processingError) {
-        logWebFetchFallbackAttempt(
-          this.config,
-          new WebFetchFallbackAttemptEvent('primary_failed'),
-        );
+        logWebFetchFallbackAttempt(this.config, new WebFetchFallbackAttemptEvent("primary_failed"));
         return await this.executeFallback(signal);
       }
 
       const sourceListFormatted: string[] = [];
       if (sources && sources.length > 0) {
         sources.forEach((source: GroundingChunkItem, index: number) => {
-          const title = source.web?.title || 'Untitled';
-          const uri = source.web?.uri || 'Unknown URI'; // Fallback if URI is missing
+          const title = source.web?.title || "Untitled";
+          const uri = source.web?.uri || "Unknown URI"; // Fallback if URI is missing
           sourceListFormatted.push(`[${index + 1}] ${title} (${uri})`);
         });
 
@@ -339,7 +297,7 @@ ${textContent}
             if (support.segment && support.groundingChunkIndices) {
               const citationMarker = support.groundingChunkIndices
                 .map((chunkIndex: number) => `[${chunkIndex + 1}]`)
-                .join('');
+                .join("");
               insertions.push({
                 index: support.segment.endIndex,
                 marker: citationMarker,
@@ -348,18 +306,18 @@ ${textContent}
           });
 
           insertions.sort((a, b) => b.index - a.index);
-          const responseChars = responseText.split('');
+          const responseChars = responseText.split("");
           insertions.forEach((insertion) => {
             responseChars.splice(insertion.index, 0, insertion.marker);
           });
-          responseText = responseChars.join('');
+          responseText = responseChars.join("");
         }
 
         if (sourceListFormatted.length > 0) {
           responseText += `
 
 Sources:
-${sourceListFormatted.join('\n')}`;
+${sourceListFormatted.join("\n")}`;
         }
       }
 
@@ -394,10 +352,7 @@ ${sourceListFormatted.join('\n')}`;
 /**
  * Implementation of the WebFetch tool logic
  */
-export class WebFetchTool extends BaseDeclarativeTool<
-  WebFetchToolParams,
-  ToolResult
-> {
+export class WebFetchTool extends BaseDeclarativeTool<WebFetchToolParams, ToolResult> {
   static readonly Name = WEB_FETCH_TOOL_NAME;
 
   constructor(
@@ -406,7 +361,7 @@ export class WebFetchTool extends BaseDeclarativeTool<
   ) {
     super(
       WebFetchTool.Name,
-      'WebFetch',
+      "WebFetch",
       "Processes content from URL(s), including local and private network addresses (e.g., localhost), embedded in a prompt. Include up to 20 URLs and instructions (e.g., summarize, extract specific data) directly in the 'prompt' parameter.",
       Kind.Fetch,
       {
@@ -414,11 +369,11 @@ export class WebFetchTool extends BaseDeclarativeTool<
           prompt: {
             description:
               'A comprehensive prompt that includes the URL(s) (up to 20) to fetch and specific instructions on how to process their content (e.g., "Summarize https://example.com/article and extract key points from https://another.com/data"). All URLs to be fetched must be valid and complete, starting with "http://" or "https://", and be fully-formed with a valid hostname (e.g., a domain name like "example.com" or an IP address). For example, "https://example.com" is valid, but "example.com" is not.',
-            type: 'string',
+            type: "string",
           },
         },
-        required: ['prompt'],
-        type: 'object',
+        required: ["prompt"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -426,17 +381,15 @@ export class WebFetchTool extends BaseDeclarativeTool<
     );
   }
 
-  protected override validateToolParamValues(
-    params: WebFetchToolParams,
-  ): string | null {
-    if (!params.prompt || params.prompt.trim() === '') {
+  protected override validateToolParamValues(params: WebFetchToolParams): string | null {
+    if (!params.prompt || params.prompt.trim() === "") {
       return "The 'prompt' parameter cannot be empty and must contain URL(s) and instructions.";
     }
 
     const { validUrls, errors } = parsePrompt(params.prompt);
 
     if (errors.length > 0) {
-      return `Error(s) in prompt URLs:\n- ${errors.join('\n- ')}`;
+      return `Error(s) in prompt URLs:\n- ${errors.join("\n- ")}`;
     }
 
     if (validUrls.length === 0) {
@@ -452,12 +405,6 @@ export class WebFetchTool extends BaseDeclarativeTool<
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<WebFetchToolParams, ToolResult> {
-    return new WebFetchToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new WebFetchToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-cli-core/src/tools/web-search.test.ts b/packages/gemini-cli-core/src/tools/web-search.test.ts
index 560e17e4c..11d7eb4e2 100644
--- a/packages/gemini-cli-core/src/tools/web-search.test.ts
+++ b/packages/gemini-cli-core/src/tools/web-search.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { WebSearchToolParams } from './web-search.js';
-import { WebSearchTool } from './web-search.js';
-import type { Config } from '../config/config.js';
-import { GeminiClient } from '../core/client.js';
-import { ToolErrorType } from './tool-error.js';
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { GeminiClient } from "../core/client.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { WebSearchToolParams } from "./web-search.js";
+import { WebSearchTool } from "./web-search.js";
 
 // Mock GeminiClient and Config constructor
-vi.mock('../core/client.js');
-vi.mock('../config/config.js');
+vi.mock("../core/client.js");
+vi.mock("../config/config.js");
 
-describe('WebSearchTool', () => {
+describe("WebSearchTool", () => {
   const abortSignal = new AbortController().signal;
   let mockGeminiClient: GeminiClient;
   let tool: WebSearchTool;
@@ -40,48 +40,42 @@ describe('WebSearchTool', () => {
     vi.restoreAllMocks();
   });
 
-  describe('build', () => {
-    it('should return an invocation for a valid query', () => {
-      const params: WebSearchToolParams = { query: 'test query' };
+  describe("build", () => {
+    it("should return an invocation for a valid query", () => {
+      const params: WebSearchToolParams = { query: "test query" };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
       expect(invocation.params).toEqual(params);
     });
 
-    it('should throw an error for an empty query', () => {
-      const params: WebSearchToolParams = { query: '' };
-      expect(() => tool.build(params)).toThrow(
-        "The 'query' parameter cannot be empty.",
-      );
+    it("should throw an error for an empty query", () => {
+      const params: WebSearchToolParams = { query: "" };
+      expect(() => tool.build(params)).toThrow("The 'query' parameter cannot be empty.");
     });
 
-    it('should throw an error for a query with only whitespace', () => {
-      const params: WebSearchToolParams = { query: '   ' };
-      expect(() => tool.build(params)).toThrow(
-        "The 'query' parameter cannot be empty.",
-      );
+    it("should throw an error for a query with only whitespace", () => {
+      const params: WebSearchToolParams = { query: "   " };
+      expect(() => tool.build(params)).toThrow("The 'query' parameter cannot be empty.");
     });
   });
 
-  describe('getDescription', () => {
-    it('should return a description of the search', () => {
-      const params: WebSearchToolParams = { query: 'test query' };
+  describe("getDescription", () => {
+    it("should return a description of the search", () => {
+      const params: WebSearchToolParams = { query: "test query" };
       const invocation = tool.build(params);
-      expect(invocation.getDescription()).toBe(
-        'Searching the web for: "test query"',
-      );
+      expect(invocation.getDescription()).toBe('Searching the web for: "test query"');
     });
   });
 
-  describe('execute', () => {
-    it('should return search results for a successful query', async () => {
-      const params: WebSearchToolParams = { query: 'successful query' };
+  describe("execute", () => {
+    it("should return search results for a successful query", async () => {
+      const params: WebSearchToolParams = { query: "successful query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'Here are your results.' }],
+              role: "model",
+              parts: [{ text: "Here are your results." }],
             },
           },
         ],
@@ -93,20 +87,18 @@ describe('WebSearchTool', () => {
       expect(result.llmContent).toBe(
         'Web search results for "successful query":\n\nHere are your results.',
       );
-      expect(result.returnDisplay).toBe(
-        'Search results for "successful query" returned.',
-      );
+      expect(result.returnDisplay).toBe('Search results for "successful query" returned.');
       expect(result.sources).toBeUndefined();
     });
 
-    it('should handle no search results found', async () => {
-      const params: WebSearchToolParams = { query: 'no results query' };
+    it("should handle no search results found", async () => {
+      const params: WebSearchToolParams = { query: "no results query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: '' }],
+              role: "model",
+              parts: [{ text: "" }],
             },
           },
         ],
@@ -118,36 +110,36 @@ describe('WebSearchTool', () => {
       expect(result.llmContent).toBe(
         'No search results or information found for query: "no results query"',
       );
-      expect(result.returnDisplay).toBe('No information found.');
+      expect(result.returnDisplay).toBe("No information found.");
     });
 
-    it('should return a WEB_SEARCH_FAILED error on failure', async () => {
-      const params: WebSearchToolParams = { query: 'error query' };
-      const testError = new Error('API Failure');
+    it("should return a WEB_SEARCH_FAILED error on failure", async () => {
+      const params: WebSearchToolParams = { query: "error query" };
+      const testError = new Error("API Failure");
       (mockGeminiClient.generateContent as Mock).mockRejectedValue(testError);
 
       const invocation = tool.build(params);
       const result = await invocation.execute(abortSignal);
 
       expect(result.error?.type).toBe(ToolErrorType.WEB_SEARCH_FAILED);
-      expect(result.llmContent).toContain('Error:');
-      expect(result.llmContent).toContain('API Failure');
-      expect(result.returnDisplay).toBe('Error performing web search.');
+      expect(result.llmContent).toContain("Error:");
+      expect(result.llmContent).toContain("API Failure");
+      expect(result.returnDisplay).toBe("Error performing web search.");
     });
 
-    it('should correctly format results with sources and citations', async () => {
-      const params: WebSearchToolParams = { query: 'grounding query' };
+    it("should correctly format results with sources and citations", async () => {
+      const params: WebSearchToolParams = { query: "grounding query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'This is a test response.' }],
+              role: "model",
+              parts: [{ text: "This is a test response." }],
             },
             groundingMetadata: {
               groundingChunks: [
-                { web: { uri: 'https://example.com', title: 'Example Site' } },
-                { web: { uri: 'https://google.com', title: 'Google' } },
+                { web: { uri: "https://example.com", title: "Example Site" } },
+                { web: { uri: "https://google.com", title: "Google" } },
               ],
               groundingSupports: [
                 {
@@ -176,39 +168,37 @@ Sources:
 [2] Google (https://google.com)`;
 
       expect(result.llmContent).toBe(expectedLlmContent);
-      expect(result.returnDisplay).toBe(
-        'Search results for "grounding query" returned.',
-      );
+      expect(result.returnDisplay).toBe('Search results for "grounding query" returned.');
       expect(result.sources).toHaveLength(2);
     });
 
-    it('should insert markers at correct byte positions for multibyte text', async () => {
-      const params: WebSearchToolParams = { query: 'multibyte query' };
+    it("should insert markers at correct byte positions for multibyte text", async () => {
+      const params: WebSearchToolParams = { query: "multibyte query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'こんにちは! Gemini CLI✨️' }],
+              role: "model",
+              parts: [{ text: "こんにちは! Gemini CLI✨️" }],
             },
             groundingMetadata: {
               groundingChunks: [
                 {
                   web: {
-                    title: 'Japanese Greeting',
-                    uri: 'https://example.test/japanese-greeting',
+                    title: "Japanese Greeting",
+                    uri: "https://example.test/japanese-greeting",
                   },
                 },
                 {
                   web: {
-                    title: 'google-gemini/gemini-cli',
-                    uri: 'https://github.com/google-gemini/gemini-cli',
+                    title: "google-gemini/gemini-cli",
+                    uri: "https://github.com/google-gemini/gemini-cli",
                   },
                 },
                 {
                   web: {
-                    title: 'Gemini CLI: your open-source AI agent',
-                    uri: 'https://blog.google/technology/developers/introducing-gemini-cli-open-source-ai-agent/',
+                    title: "Gemini CLI: your open-source AI agent",
+                    uri: "https://blog.google/technology/developers/introducing-gemini-cli-open-source-ai-agent/",
                   },
                 },
               ],
@@ -248,9 +238,7 @@ Sources:
 [3] Gemini CLI: your open-source AI agent (https://blog.google/technology/developers/introducing-gemini-cli-open-source-ai-agent/)`;
 
       expect(result.llmContent).toBe(expectedLlmContent);
-      expect(result.returnDisplay).toBe(
-        'Search results for "multibyte query" returned.',
-      );
+      expect(result.returnDisplay).toBe('Search results for "multibyte query" returned.');
       expect(result.sources).toHaveLength(3);
     });
   });
diff --git a/packages/gemini-cli-core/src/tools/web-search.ts b/packages/gemini-cli-core/src/tools/web-search.ts
index c85ca02a6..11cc5351a 100644
--- a/packages/gemini-cli-core/src/tools/web-search.ts
+++ b/packages/gemini-cli-core/src/tools/web-search.ts
@@ -4,16 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { WEB_SEARCH_TOOL_NAME } from './tool-names.js';
-import type { GroundingMetadata } from '@google/genai';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-
-import { getErrorMessage } from '../utils/errors.js';
-import { type Config } from '../config/config.js';
-import { getResponseText } from '../utils/partUtils.js';
+import type { GroundingMetadata } from "@google/genai";
+import { type Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { ToolErrorType } from "./tool-error.js";
+import { WEB_SEARCH_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 interface GroundingChunkWeb {
   uri?: string;
@@ -53,14 +52,11 @@ export interface WebSearchToolParams {
  */
 export interface WebSearchToolResult extends ToolResult {
   sources?: GroundingMetadata extends { groundingChunks: GroundingChunkItem[] }
-    ? GroundingMetadata['groundingChunks']
+    ? GroundingMetadata["groundingChunks"]
     : GroundingChunkItem[];
 }
 
-class WebSearchToolInvocation extends BaseToolInvocation<
-  WebSearchToolParams,
-  WebSearchToolResult
-> {
+class WebSearchToolInvocation extends BaseToolInvocation<WebSearchToolParams, WebSearchToolResult> {
   constructor(
     private readonly config: Config,
     params: WebSearchToolParams,
@@ -80,16 +76,14 @@ class WebSearchToolInvocation extends BaseToolInvocation<
 
     try {
       const response = await geminiClient.generateContent(
-        { model: 'web-search' },
-        [{ role: 'user', parts: [{ text: this.params.query }] }],
+        { model: "web-search" },
+        [{ role: "user", parts: [{ text: this.params.query }] }],
         signal,
       );
 
       const responseText = getResponseText(response);
       const groundingMetadata = response.candidates?.[0]?.groundingMetadata;
-      const sources = groundingMetadata?.groundingChunks as
-        | GroundingChunkItem[]
-        | undefined;
+      const sources = groundingMetadata?.groundingChunks as GroundingChunkItem[] | undefined;
       const groundingSupports = groundingMetadata?.groundingSupports as
         | GroundingSupportItem[]
         | undefined;
@@ -97,7 +91,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
       if (!responseText || !responseText.trim()) {
         return {
           llmContent: `No search results or information found for query: "${this.params.query}"`,
-          returnDisplay: 'No information found.',
+          returnDisplay: "No information found.",
         };
       }
 
@@ -106,8 +100,8 @@ class WebSearchToolInvocation extends BaseToolInvocation<
 
       if (sources && sources.length > 0) {
         sources.forEach((source: GroundingChunkItem, index: number) => {
-          const title = source.web?.title || 'Untitled';
-          const uri = source.web?.uri || 'No URI';
+          const title = source.web?.title || "Untitled";
+          const uri = source.web?.uri || "No URI";
           sourceListFormatted.push(`[${index + 1}] ${title} (${uri})`);
         });
 
@@ -117,7 +111,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
             if (support.segment && support.groundingChunkIndices) {
               const citationMarker = support.groundingChunkIndices
                 .map((chunkIndex: number) => `[${chunkIndex + 1}]`)
-                .join('');
+                .join("");
               insertions.push({
                 index: support.segment.endIndex,
                 marker: citationMarker,
@@ -153,8 +147,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
         }
 
         if (sourceListFormatted.length > 0) {
-          modifiedResponseText +=
-            '\n\nSources:\n' + sourceListFormatted.join('\n');
+          modifiedResponseText += "\n\nSources:\n" + sourceListFormatted.join("\n");
         }
       }
 
@@ -183,10 +176,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
 /**
  * A tool to perform web searches using Google Search via the Gemini API.
  */
-export class WebSearchTool extends BaseDeclarativeTool<
-  WebSearchToolParams,
-  WebSearchToolResult
-> {
+export class WebSearchTool extends BaseDeclarativeTool<WebSearchToolParams, WebSearchToolResult> {
   static readonly Name = WEB_SEARCH_TOOL_NAME;
 
   constructor(
@@ -195,18 +185,18 @@ export class WebSearchTool extends BaseDeclarativeTool<
   ) {
     super(
       WebSearchTool.Name,
-      'GoogleSearch',
-      'Performs a web search using Google Search (via the Gemini API) and returns the results. This tool is useful for finding information on the internet based on a query.',
+      "GoogleSearch",
+      "Performs a web search using Google Search (via the Gemini API) and returns the results. This tool is useful for finding information on the internet based on a query.",
       Kind.Search,
       {
-        type: 'object',
+        type: "object",
         properties: {
           query: {
-            type: 'string',
-            description: 'The search query to find information on the web.',
+            type: "string",
+            description: "The search query to find information on the web.",
           },
         },
-        required: ['query'],
+        required: ["query"],
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -219,10 +209,8 @@ export class WebSearchTool extends BaseDeclarativeTool<
    * @param params The parameters to validate
    * @returns An error message string if validation fails, null if valid
    */
-  protected override validateToolParamValues(
-    params: WebSearchToolParams,
-  ): string | null {
-    if (!params.query || params.query.trim() === '') {
+  protected override validateToolParamValues(params: WebSearchToolParams): string | null {
+    if (!params.query || params.query.trim() === "") {
       return "The 'query' parameter cannot be empty.";
     }
     return null;
diff --git a/packages/gemini-cli-core/src/tools/write-file.test.ts b/packages/gemini-cli-core/src/tools/write-file.test.ts
index 3cb0f7e74..6a94bd20e 100644
--- a/packages/gemini-cli-core/src/tools/write-file.test.ts
+++ b/packages/gemini-cli-core/src/tools/write-file.test.ts
@@ -4,50 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  vi,
-  type Mocked,
-} from 'vitest';
-import type { WriteFileToolParams } from './write-file.js';
-import { getCorrectedFileContent, WriteFileTool } from './write-file.js';
-import { ToolErrorType } from './tool-error.js';
-import type {
-  FileDiff,
-  ToolEditConfirmationDetails,
-  ToolInvocation,
-  ToolResult,
-} from './tools.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { type EditToolParams } from './edit.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import type { ToolRegistry } from './tool-registry.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import { GeminiClient } from '../core/client.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { CorrectedEditResult } from '../utils/editCorrector.js';
-import {
-  ensureCorrectEdit,
-  ensureCorrectFileContent,
-} from '../utils/editCorrector.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import type { DiffUpdateResult } from '../ide/ide-client.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-const rootDir = path.resolve(os.tmpdir(), 'gemini-cli-test-root');
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { GeminiClient } from "../core/client.js";
+import type { DiffUpdateResult } from "../ide/ide-client.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import type { CorrectedEditResult } from "../utils/editCorrector.js";
+import { ensureCorrectEdit, ensureCorrectFileContent } from "../utils/editCorrector.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { type EditToolParams } from "./edit.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolRegistry } from "./tool-registry.js";
+import type { FileDiff, ToolEditConfirmationDetails, ToolInvocation, ToolResult } from "./tools.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+import type { WriteFileToolParams } from "./write-file.js";
+import { getCorrectedFileContent, WriteFileTool } from "./write-file.js";
+
+const rootDir = path.resolve(os.tmpdir(), "gemini-cli-test-root");
 
 // --- MOCKS ---
-vi.mock('../core/client.js');
-vi.mock('../utils/editCorrector.js');
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../core/client.js");
+vi.mock("../utils/editCorrector.js");
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn(),
   },
@@ -63,12 +47,8 @@ const mockIdeClient = {
 
 // Wire up the mocked functions to be used by the actual module imports
 vi.mocked(ensureCorrectEdit).mockImplementation(mockEnsureCorrectEdit);
-vi.mocked(ensureCorrectFileContent).mockImplementation(
-  mockEnsureCorrectFileContent,
-);
-vi.mocked(IdeClient.getInstance).mockResolvedValue(
-  mockIdeClient as unknown as IdeClient,
-);
+vi.mocked(ensureCorrectFileContent).mockImplementation(mockEnsureCorrectFileContent);
+vi.mocked(IdeClient.getInstance).mockResolvedValue(mockIdeClient as unknown as IdeClient);
 
 // Mock Config
 const fsService = new StandardFileSystemService();
@@ -81,8 +61,8 @@ const mockConfigInternal = {
   getFileSystemService: () => fsService,
   getIdeMode: vi.fn(() => false),
   getWorkspaceContext: () => new WorkspaceContext(rootDir),
-  getApiKey: () => 'test-key',
-  getModel: () => 'test-model',
+  getApiKey: () => "test-key",
+  getModel: () => "test-model",
   getSandbox: () => false,
   getDebugMode: () => false,
   getQuestion: () => undefined,
@@ -91,8 +71,8 @@ const mockConfigInternal = {
   getToolCallCommand: () => undefined,
   getMcpServerCommand: () => undefined,
   getMcpServers: () => undefined,
-  getUserAgent: () => 'test-agent',
-  getUserMemory: () => '',
+  getUserAgent: () => "test-agent",
+  getUserMemory: () => "",
   setUserMemory: vi.fn(),
   getGeminiMdFileCount: () => 0,
   setGeminiMdFileCount: vi.fn(),
@@ -105,31 +85,27 @@ const mockConfigInternal = {
 };
 const mockConfig = mockConfigInternal as unknown as Config;
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
 // --- END MOCKS ---
 
-describe('WriteFileTool', () => {
+describe("WriteFileTool", () => {
   let tool: WriteFileTool;
   let tempDir: string;
 
   beforeEach(() => {
     vi.clearAllMocks();
     // Create a unique temporary directory for files created outside the root
-    tempDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'write-file-test-external-'),
-    );
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "write-file-test-external-"));
     // Ensure the rootDir for the tool exists
     if (!fs.existsSync(rootDir)) {
       fs.mkdirSync(rootDir, { recursive: true });
     }
 
     // Setup GeminiClient mock
-    mockGeminiClientInstance = new (vi.mocked(GeminiClient))(
-      mockConfig,
-    ) as Mocked<GeminiClient>;
+    mockGeminiClientInstance = new (vi.mocked(GeminiClient))(mockConfig) as Mocked<GeminiClient>;
     vi.mocked(GeminiClient).mockImplementation(() => mockGeminiClientInstance);
 
     // Setup BaseLlmClient mock
@@ -138,17 +114,11 @@ describe('WriteFileTool', () => {
     } as unknown as Mocked<BaseLlmClient>;
 
     vi.mocked(ensureCorrectEdit).mockImplementation(mockEnsureCorrectEdit);
-    vi.mocked(ensureCorrectFileContent).mockImplementation(
-      mockEnsureCorrectFileContent,
-    );
+    vi.mocked(ensureCorrectFileContent).mockImplementation(mockEnsureCorrectFileContent);
 
     // Now that mock instances are initialized, set the mock implementations for config getters
-    mockConfigInternal.getGeminiClient.mockReturnValue(
-      mockGeminiClientInstance,
-    );
-    mockConfigInternal.getBaseLlmClient.mockReturnValue(
-      mockBaseLlmClientInstance,
-    );
+    mockConfigInternal.getGeminiClient.mockReturnValue(mockGeminiClientInstance);
+    mockConfigInternal.getBaseLlmClient.mockReturnValue(mockBaseLlmClientInstance);
 
     tool = new WriteFileTool(mockConfig);
 
@@ -169,10 +139,10 @@ describe('WriteFileTool', () => {
         signal?: AbortSignal,
       ): Promise<CorrectedEditResult> => {
         if (signal?.aborted) {
-          return Promise.reject(new Error('Aborted'));
+          return Promise.reject(new Error("Aborted"));
         }
         return Promise.resolve({
-          params: { ...params, new_string: params.new_string ?? '' },
+          params: { ...params, new_string: params.new_string ?? "" },
           occurrences: 1,
         });
       },
@@ -184,9 +154,9 @@ describe('WriteFileTool', () => {
         signal?: AbortSignal,
       ): Promise<string> => {
         if (signal?.aborted) {
-          return Promise.reject(new Error('Aborted'));
+          return Promise.reject(new Error("Aborted"));
         }
-        return Promise.resolve(content ?? '');
+        return Promise.resolve(content ?? "");
       },
     );
   });
@@ -202,76 +172,74 @@ describe('WriteFileTool', () => {
     vi.clearAllMocks();
   });
 
-  describe('build', () => {
-    it('should return an invocation for a valid absolute path within root', () => {
+  describe("build", () => {
+    it("should return an invocation for a valid absolute path within root", () => {
       const params = {
-        file_path: path.join(rootDir, 'test.txt'),
-        content: 'hello',
+        file_path: path.join(rootDir, "test.txt"),
+        content: "hello",
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
       expect(invocation.params).toEqual(params);
     });
 
-    it('should return an invocation for a valid relative path within root', () => {
+    it("should return an invocation for a valid relative path within root", () => {
       const params = {
-        file_path: 'test.txt',
-        content: 'hello',
+        file_path: "test.txt",
+        content: "hello",
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
       expect(invocation.params).toEqual(params);
     });
 
-    it('should throw an error for a path outside root', () => {
-      const outsidePath = path.resolve(tempDir, 'outside-root.txt');
+    it("should throw an error for a path outside root", () => {
+      const outsidePath = path.resolve(tempDir, "outside-root.txt");
       const params = {
         file_path: outsidePath,
-        content: 'hello',
+        content: "hello",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories/,
       );
     });
 
-    it('should throw an error if path is a directory', () => {
-      const dirAsFilePath = path.join(rootDir, 'a_directory');
+    it("should throw an error if path is a directory", () => {
+      const dirAsFilePath = path.join(rootDir, "a_directory");
       fs.mkdirSync(dirAsFilePath);
       const params = {
         file_path: dirAsFilePath,
-        content: 'hello',
+        content: "hello",
       };
-      expect(() => tool.build(params)).toThrow(
-        `Path is a directory, not a file: ${dirAsFilePath}`,
-      );
+      expect(() => tool.build(params)).toThrow(`Path is a directory, not a file: ${dirAsFilePath}`);
     });
 
-    it('should throw an error if the content is null', () => {
-      const dirAsFilePath = path.join(rootDir, 'a_directory');
+    it("should throw an error if the content is null", () => {
+      const dirAsFilePath = path.join(rootDir, "a_directory");
       fs.mkdirSync(dirAsFilePath);
       const params = {
         file_path: dirAsFilePath,
         content: null,
       } as unknown as WriteFileToolParams; // Intentionally non-conforming
-      expect(() => tool.build(params)).toThrow('params/content must be string');
+      expect(() => tool.build(params)).toThrow("params/content must be string");
     });
 
-    it('should throw error if the file_path is empty', () => {
-      const dirAsFilePath = path.join(rootDir, 'a_directory');
+    it("should throw error if the file_path is empty", () => {
+      const dirAsFilePath = path.join(rootDir, "a_directory");
       fs.mkdirSync(dirAsFilePath);
       const params = {
-        file_path: '',
-        content: '',
+        file_path: "",
+        content: "",
       };
       expect(() => tool.build(params)).toThrow(`Missing or empty "file_path"`);
     });
   });
 
-  describe('getCorrectedFileContent', () => {
-    it('should call ensureCorrectFileContent for a new file', async () => {
-      const filePath = path.join(rootDir, 'new_corrected_file.txt');
-      const proposedContent = 'Proposed new content.';
-      const correctedContent = 'Corrected new content.';
+  describe("getCorrectedFileContent", () => {
+    it("should call ensureCorrectFileContent for a new file", async () => {
+      const filePath = path.join(rootDir, "new_corrected_file.txt");
+      const proposedContent = "Proposed new content.";
+      const correctedContent = "Corrected new content.";
       const abortSignal = new AbortController().signal;
       // Ensure the mock is set for this specific test case if needed, or rely on beforeEach
       mockEnsureCorrectFileContent.mockResolvedValue(correctedContent);
@@ -290,18 +258,18 @@ describe('WriteFileTool', () => {
       );
       expect(mockEnsureCorrectEdit).not.toHaveBeenCalled();
       expect(result.correctedContent).toBe(correctedContent);
-      expect(result.originalContent).toBe('');
+      expect(result.originalContent).toBe("");
       expect(result.fileExists).toBe(false);
       expect(result.error).toBeUndefined();
     });
 
-    it('should call ensureCorrectEdit for an existing file', async () => {
-      const filePath = path.join(rootDir, 'existing_corrected_file.txt');
-      const originalContent = 'Original existing content.';
-      const proposedContent = 'Proposed replacement content.';
-      const correctedProposedContent = 'Corrected replacement content.';
+    it("should call ensureCorrectEdit for an existing file", async () => {
+      const filePath = path.join(rootDir, "existing_corrected_file.txt");
+      const originalContent = "Original existing content.";
+      const proposedContent = "Proposed replacement content.";
+      const correctedProposedContent = "Corrected replacement content.";
       const abortSignal = new AbortController().signal;
-      fs.writeFileSync(filePath, originalContent, 'utf8');
+      fs.writeFileSync(filePath, originalContent, "utf8");
 
       // Ensure this mock is active and returns the correct structure
       mockEnsureCorrectEdit.mockResolvedValue({
@@ -339,16 +307,14 @@ describe('WriteFileTool', () => {
       expect(result.error).toBeUndefined();
     });
 
-    it('should return error if reading an existing file fails (e.g. permissions)', async () => {
-      const filePath = path.join(rootDir, 'unreadable_file.txt');
-      const proposedContent = 'some content';
+    it("should return error if reading an existing file fails (e.g. permissions)", async () => {
+      const filePath = path.join(rootDir, "unreadable_file.txt");
+      const proposedContent = "some content";
       const abortSignal = new AbortController().signal;
-      fs.writeFileSync(filePath, 'content', { mode: 0o000 });
+      fs.writeFileSync(filePath, "content", { mode: 0o000 });
 
-      const readError = new Error('Permission denied');
-      vi.spyOn(fsService, 'readTextFile').mockImplementationOnce(() =>
-        Promise.reject(readError),
-      );
+      const readError = new Error("Permission denied");
+      vi.spyOn(fsService, "readTextFile").mockImplementationOnce(() => Promise.reject(readError));
 
       const result = await getCorrectedFileContent(
         mockConfig,
@@ -361,10 +327,10 @@ describe('WriteFileTool', () => {
       expect(mockEnsureCorrectEdit).not.toHaveBeenCalled();
       expect(mockEnsureCorrectFileContent).not.toHaveBeenCalled();
       expect(result.correctedContent).toBe(proposedContent);
-      expect(result.originalContent).toBe('');
+      expect(result.originalContent).toBe("");
       expect(result.fileExists).toBe(true);
       expect(result.error).toEqual({
-        message: 'Permission denied',
+        message: "Permission denied",
         code: undefined,
       });
 
@@ -372,18 +338,16 @@ describe('WriteFileTool', () => {
     });
   });
 
-  describe('shouldConfirmExecute', () => {
+  describe("shouldConfirmExecute", () => {
     const abortSignal = new AbortController().signal;
 
-    it('should return false if _getCorrectedFileContent returns an error', async () => {
-      const filePath = path.join(rootDir, 'confirm_error_file.txt');
-      const params = { file_path: filePath, content: 'test content' };
-      fs.writeFileSync(filePath, 'original', { mode: 0o000 });
+    it("should return false if _getCorrectedFileContent returns an error", async () => {
+      const filePath = path.join(rootDir, "confirm_error_file.txt");
+      const params = { file_path: filePath, content: "test content" };
+      fs.writeFileSync(filePath, "original", { mode: 0o000 });
 
-      const readError = new Error('Simulated read error for confirmation');
-      vi.spyOn(fsService, 'readTextFile').mockImplementationOnce(() =>
-        Promise.reject(readError),
-      );
+      const readError = new Error("Simulated read error for confirmation");
+      vi.spyOn(fsService, "readTextFile").mockImplementationOnce(() => Promise.reject(readError));
 
       const invocation = tool.build(params);
       const confirmation = await invocation.shouldConfirmExecute(abortSignal);
@@ -392,10 +356,10 @@ describe('WriteFileTool', () => {
       fs.chmodSync(filePath, 0o600);
     });
 
-    it('should request confirmation with diff for a new file (with corrected content)', async () => {
-      const filePath = path.join(rootDir, 'confirm_new_file.txt');
-      const proposedContent = 'Proposed new content for confirmation.';
-      const correctedContent = 'Corrected new content for confirmation.';
+    it("should request confirmation with diff for a new file (with corrected content)", async () => {
+      const filePath = path.join(rootDir, "confirm_new_file.txt");
+      const proposedContent = "Proposed new content for confirmation.";
+      const correctedContent = "Corrected new content for confirmation.";
       mockEnsureCorrectFileContent.mockResolvedValue(correctedContent); // Ensure this mock is active
 
       const params = { file_path: filePath, content: proposedContent };
@@ -412,25 +376,20 @@ describe('WriteFileTool', () => {
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Write: ${path.basename(filePath)}`,
-          fileName: 'confirm_new_file.txt',
+          fileName: "confirm_new_file.txt",
           fileDiff: expect.stringContaining(correctedContent),
         }),
       );
-      expect(confirmation.fileDiff).toMatch(
-        /--- confirm_new_file.txt\tCurrent/,
-      );
-      expect(confirmation.fileDiff).toMatch(
-        /\+\+\+ confirm_new_file.txt\tProposed/,
-      );
+      expect(confirmation.fileDiff).toMatch(/--- confirm_new_file.txt\tCurrent/);
+      expect(confirmation.fileDiff).toMatch(/\+\+\+ confirm_new_file.txt\tProposed/);
     });
 
-    it('should request confirmation with diff for an existing file (with corrected content)', async () => {
-      const filePath = path.join(rootDir, 'confirm_existing_file.txt');
-      const originalContent = 'Original content for confirmation.';
-      const proposedContent = 'Proposed replacement for confirmation.';
-      const correctedProposedContent =
-        'Corrected replacement for confirmation.';
-      fs.writeFileSync(filePath, originalContent, 'utf8');
+    it("should request confirmation with diff for an existing file (with corrected content)", async () => {
+      const filePath = path.join(rootDir, "confirm_existing_file.txt");
+      const originalContent = "Original content for confirmation.";
+      const proposedContent = "Proposed replacement for confirmation.";
+      const correctedProposedContent = "Corrected replacement for confirmation.";
+      fs.writeFileSync(filePath, originalContent, "utf8");
 
       mockEnsureCorrectEdit.mockResolvedValue({
         params: {
@@ -462,29 +421,29 @@ describe('WriteFileTool', () => {
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Write: ${path.basename(filePath)}`,
-          fileName: 'confirm_existing_file.txt',
+          fileName: "confirm_existing_file.txt",
           fileDiff: expect.stringContaining(correctedProposedContent),
         }),
       );
       expect(confirmation.fileDiff).toMatch(
-        originalContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
+        originalContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"),
       );
     });
 
-    describe('with IDE integration', () => {
+    describe("with IDE integration", () => {
       beforeEach(() => {
         // Enable IDE mode and set connection status for these tests
         mockConfigInternal.getIdeMode.mockReturnValue(true);
         mockIdeClient.isDiffingEnabled.mockReturnValue(true);
         mockIdeClient.openDiff.mockResolvedValue({
-          status: 'accepted',
-          content: 'ide-modified-content',
+          status: "accepted",
+          content: "ide-modified-content",
         });
       });
 
-      it('should call openDiff and await it when in IDE mode and connected', async () => {
-        const filePath = path.join(rootDir, 'ide_confirm_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+      it("should call openDiff and await it when in IDE mode and connected", async () => {
+        const filePath = path.join(rootDir, "ide_confirm_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         const confirmation = (await invocation.shouldConfirmExecute(
@@ -493,17 +452,17 @@ describe('WriteFileTool', () => {
 
         expect(mockIdeClient.openDiff).toHaveBeenCalledWith(
           filePath,
-          'test', // The corrected content
+          "test", // The corrected content
         );
         // Ensure the promise is awaited by checking the result
         expect(confirmation.ideConfirmation).toBeDefined();
         await confirmation.ideConfirmation; // Should resolve
       });
 
-      it('should not call openDiff if not in IDE mode', async () => {
+      it("should not call openDiff if not in IDE mode", async () => {
         mockConfigInternal.getIdeMode.mockReturnValue(false);
-        const filePath = path.join(rootDir, 'ide_disabled_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+        const filePath = path.join(rootDir, "ide_disabled_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         await invocation.shouldConfirmExecute(abortSignal);
@@ -511,10 +470,10 @@ describe('WriteFileTool', () => {
         expect(mockIdeClient.openDiff).not.toHaveBeenCalled();
       });
 
-      it('should not call openDiff if IDE is not connected', async () => {
+      it("should not call openDiff if IDE is not connected", async () => {
         mockIdeClient.isDiffingEnabled.mockReturnValue(false);
-        const filePath = path.join(rootDir, 'ide_disconnected_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+        const filePath = path.join(rootDir, "ide_disconnected_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         await invocation.shouldConfirmExecute(abortSignal);
@@ -522,9 +481,9 @@ describe('WriteFileTool', () => {
         expect(mockIdeClient.openDiff).not.toHaveBeenCalled();
       });
 
-      it('should update params.content with IDE content when onConfirm is called', async () => {
-        const filePath = path.join(rootDir, 'ide_onconfirm_file.txt');
-        const params = { file_path: filePath, content: 'original-content' };
+      it("should update params.content with IDE content when onConfirm is called", async () => {
+        const filePath = path.join(rootDir, "ide_onconfirm_file.txt");
+        const params = { file_path: filePath, content: "original-content" };
         const invocation = tool.build(params);
 
         // This is the key part: get the confirmation details
@@ -539,20 +498,20 @@ describe('WriteFileTool', () => {
         await confirmation.onConfirm!(ToolConfirmationOutcome.ProceedOnce);
 
         // Now, check if the original `params` object (captured by the invocation) was modified
-        expect(invocation.params.content).toBe('ide-modified-content');
+        expect(invocation.params.content).toBe("ide-modified-content");
       });
 
-      it('should not await ideConfirmation promise', async () => {
+      it("should not await ideConfirmation promise", async () => {
         const IDE_DIFF_DELAY_MS = 50;
-        const filePath = path.join(rootDir, 'ide_no_await_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+        const filePath = path.join(rootDir, "ide_no_await_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         let diffPromiseResolved = false;
         const diffPromise = new Promise<DiffUpdateResult>((resolve) => {
           setTimeout(() => {
             diffPromiseResolved = true;
-            resolve({ status: 'accepted', content: 'ide-modified-content' });
+            resolve({ status: "accepted", content: "ide-modified-content" });
           }, IDE_DIFF_DELAY_MS);
         });
         mockIdeClient.openDiff.mockReturnValue(diffPromise);
@@ -574,7 +533,7 @@ describe('WriteFileTool', () => {
     });
   });
 
-  describe('execute', () => {
+  describe("execute", () => {
     const abortSignal = new AbortController().signal;
 
     async function confirmExecution(
@@ -583,18 +542,18 @@ describe('WriteFileTool', () => {
     ) {
       const confirmDetails = await invocation.shouldConfirmExecute(signal);
       if (
-        typeof confirmDetails === 'object' &&
-        'onConfirm' in confirmDetails &&
+        typeof confirmDetails === "object" &&
+        "onConfirm" in confirmDetails &&
         confirmDetails.onConfirm
       ) {
         await confirmDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
       }
     }
 
-    it('should write a new file with a relative path', async () => {
-      const relativePath = 'execute_relative_new_file.txt';
+    it("should write a new file with a relative path", async () => {
+      const relativePath = "execute_relative_new_file.txt";
       const filePath = path.join(rootDir, relativePath);
-      const content = 'Content for relative path file.';
+      const content = "Content for relative path file.";
       mockEnsureCorrectFileContent.mockResolvedValue(content);
 
       const params = { file_path: relativePath, content };
@@ -602,43 +561,40 @@ describe('WriteFileTool', () => {
 
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toMatch(
-        /Successfully created and wrote to new file/,
-      );
+      expect(result.llmContent).toMatch(/Successfully created and wrote to new file/);
       expect(fs.existsSync(filePath)).toBe(true);
       const writtenContent = await fsService.readTextFile(filePath);
       expect(writtenContent).toBe(content);
     });
 
-    it('should return error if _getCorrectedFileContent returns an error during execute', async () => {
-      const filePath = path.join(rootDir, 'execute_error_file.txt');
-      const params = { file_path: filePath, content: 'test content' };
-      fs.writeFileSync(filePath, 'original', { mode: 0o000 });
+    it("should return error if _getCorrectedFileContent returns an error during execute", async () => {
+      const filePath = path.join(rootDir, "execute_error_file.txt");
+      const params = { file_path: filePath, content: "test content" };
+      fs.writeFileSync(filePath, "original", { mode: 0o000 });
 
-      vi.spyOn(fsService, 'readTextFile').mockImplementationOnce(() => {
-        const readError = new Error('Simulated read error for execute');
+      vi.spyOn(fsService, "readTextFile").mockImplementationOnce(() => {
+        const readError = new Error("Simulated read error for execute");
         return Promise.reject(readError);
       });
 
       const invocation = tool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Error checking existing file');
+      expect(result.llmContent).toContain("Error checking existing file");
       expect(result.returnDisplay).toMatch(
         /Error checking existing file: Simulated read error for execute/,
       );
       expect(result.error).toEqual({
-        message:
-          'Error checking existing file: Simulated read error for execute',
+        message: "Error checking existing file: Simulated read error for execute",
         type: ToolErrorType.FILE_WRITE_FAILURE,
       });
 
       fs.chmodSync(filePath, 0o600);
     });
 
-    it('should write a new file with corrected content and return diff', async () => {
-      const filePath = path.join(rootDir, 'execute_new_corrected_file.txt');
-      const proposedContent = 'Proposed new content for execute.';
-      const correctedContent = 'Corrected new content for execute.';
+    it("should write a new file with corrected content and return diff", async () => {
+      const filePath = path.join(rootDir, "execute_new_corrected_file.txt");
+      const proposedContent = "Proposed new content for execute.";
+      const correctedContent = "Corrected new content for execute.";
       mockEnsureCorrectFileContent.mockResolvedValue(correctedContent);
 
       const params = { file_path: filePath, content: proposedContent };
@@ -653,34 +609,23 @@ describe('WriteFileTool', () => {
         mockBaseLlmClientInstance,
         abortSignal,
       );
-      expect(result.llmContent).toMatch(
-        /Successfully created and wrote to new file/,
-      );
+      expect(result.llmContent).toMatch(/Successfully created and wrote to new file/);
       expect(fs.existsSync(filePath)).toBe(true);
       const writtenContent = await fsService.readTextFile(filePath);
       expect(writtenContent).toBe(correctedContent);
       const display = result.returnDisplay as FileDiff;
-      expect(display.fileName).toBe('execute_new_corrected_file.txt');
-      expect(display.fileDiff).toMatch(
-        /--- execute_new_corrected_file.txt\tOriginal/,
-      );
-      expect(display.fileDiff).toMatch(
-        /\+\+\+ execute_new_corrected_file.txt\tWritten/,
-      );
-      expect(display.fileDiff).toMatch(
-        correctedContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
-      );
+      expect(display.fileName).toBe("execute_new_corrected_file.txt");
+      expect(display.fileDiff).toMatch(/--- execute_new_corrected_file.txt\tOriginal/);
+      expect(display.fileDiff).toMatch(/\+\+\+ execute_new_corrected_file.txt\tWritten/);
+      expect(display.fileDiff).toMatch(correctedContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"));
     });
 
-    it('should overwrite an existing file with corrected content and return diff', async () => {
-      const filePath = path.join(
-        rootDir,
-        'execute_existing_corrected_file.txt',
-      );
-      const initialContent = 'Initial content for execute.';
-      const proposedContent = 'Proposed overwrite for execute.';
-      const correctedProposedContent = 'Corrected overwrite for execute.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should overwrite an existing file with corrected content and return diff", async () => {
+      const filePath = path.join(rootDir, "execute_existing_corrected_file.txt");
+      const initialContent = "Initial content for execute.";
+      const proposedContent = "Proposed overwrite for execute.";
+      const correctedProposedContent = "Corrected overwrite for execute.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
 
       mockEnsureCorrectEdit.mockResolvedValue({
         params: {
@@ -714,19 +659,17 @@ describe('WriteFileTool', () => {
       const writtenContent = await fsService.readTextFile(filePath);
       expect(writtenContent).toBe(correctedProposedContent);
       const display = result.returnDisplay as FileDiff;
-      expect(display.fileName).toBe('execute_existing_corrected_file.txt');
+      expect(display.fileName).toBe("execute_existing_corrected_file.txt");
+      expect(display.fileDiff).toMatch(initialContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"));
       expect(display.fileDiff).toMatch(
-        initialContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
-      );
-      expect(display.fileDiff).toMatch(
-        correctedProposedContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
+        correctedProposedContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"),
       );
     });
 
-    it('should create directory if it does not exist', async () => {
-      const dirPath = path.join(rootDir, 'new_dir_for_write');
-      const filePath = path.join(dirPath, 'file_in_new_dir.txt');
-      const content = 'Content in new directory';
+    it("should create directory if it does not exist", async () => {
+      const dirPath = path.join(rootDir, "new_dir_for_write");
+      const filePath = path.join(dirPath, "file_in_new_dir.txt");
+      const content = "Content in new directory";
       mockEnsureCorrectFileContent.mockResolvedValue(content); // Ensure this mock is active
 
       const params = { file_path: filePath, content };
@@ -739,62 +682,62 @@ describe('WriteFileTool', () => {
       expect(fs.existsSync(dirPath)).toBe(true);
       expect(fs.statSync(dirPath).isDirectory()).toBe(true);
       expect(fs.existsSync(filePath)).toBe(true);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(content);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(content);
     });
 
     it.each([
       {
         modified_by_user: true,
         shouldIncludeMessage: true,
-        testCase: 'when modified_by_user is true',
+        testCase: "when modified_by_user is true",
       },
       {
         modified_by_user: false,
         shouldIncludeMessage: false,
-        testCase: 'when modified_by_user is false',
+        testCase: "when modified_by_user is false",
       },
       {
         modified_by_user: undefined,
         shouldIncludeMessage: false,
-        testCase: 'when modified_by_user is not provided',
+        testCase: "when modified_by_user is not provided",
       },
-    ])(
-      'should $testCase include modification message',
-      async ({ modified_by_user, shouldIncludeMessage }) => {
-        const filePath = path.join(rootDir, `new_file_${modified_by_user}.txt`);
-        const content = 'New file content';
-        mockEnsureCorrectFileContent.mockResolvedValue(content);
-
-        const params: WriteFileToolParams = {
-          file_path: filePath,
-          content,
-          ...(modified_by_user !== undefined && { modified_by_user }),
-        };
-        const invocation = tool.build(params);
-        const result = await invocation.execute(abortSignal);
+    ])("should $testCase include modification message", async ({
+      modified_by_user,
+      shouldIncludeMessage,
+    }) => {
+      const filePath = path.join(rootDir, `new_file_${modified_by_user}.txt`);
+      const content = "New file content";
+      mockEnsureCorrectFileContent.mockResolvedValue(content);
 
-        if (shouldIncludeMessage) {
-          expect(result.llmContent).toMatch(/User modified the `content`/);
-        } else {
-          expect(result.llmContent).not.toMatch(/User modified the `content`/);
-        }
-      },
-    );
+      const params: WriteFileToolParams = {
+        file_path: filePath,
+        content,
+        ...(modified_by_user !== undefined && { modified_by_user }),
+      };
+      const invocation = tool.build(params);
+      const result = await invocation.execute(abortSignal);
+
+      if (shouldIncludeMessage) {
+        expect(result.llmContent).toMatch(/User modified the `content`/);
+      } else {
+        expect(result.llmContent).not.toMatch(/User modified the `content`/);
+      }
+    });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should validate paths are within workspace root', () => {
+  describe("workspace boundary validation", () => {
+    it("should validate paths are within workspace root", () => {
       const params = {
-        file_path: path.join(rootDir, 'file.txt'),
-        content: 'test content',
+        file_path: path.join(rootDir, "file.txt"),
+        content: "test content",
       };
       expect(() => tool.build(params)).not.toThrow();
     });
 
-    it('should reject paths outside workspace root', () => {
+    it("should reject paths outside workspace root", () => {
       const params = {
-        file_path: '/etc/passwd',
-        content: 'malicious',
+        file_path: "/etc/passwd",
+        content: "malicious",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories/,
@@ -802,95 +745,92 @@ describe('WriteFileTool', () => {
     });
   });
 
-  describe('specific error types for write failures', () => {
+  describe("specific error types for write failures", () => {
     const abortSignal = new AbortController().signal;
 
     it.each([
       {
-        errorCode: 'EACCES',
+        errorCode: "EACCES",
         errorType: ToolErrorType.PERMISSION_DENIED,
-        errorMessage: 'Permission denied',
-        expectedMessagePrefix: 'Permission denied writing to file',
+        errorMessage: "Permission denied",
+        expectedMessagePrefix: "Permission denied writing to file",
         mockFsExistsSync: false,
         restoreAllMocks: false,
       },
       {
-        errorCode: 'ENOSPC',
+        errorCode: "ENOSPC",
         errorType: ToolErrorType.NO_SPACE_LEFT,
-        errorMessage: 'No space left on device',
-        expectedMessagePrefix: 'No space left on device',
+        errorMessage: "No space left on device",
+        expectedMessagePrefix: "No space left on device",
         mockFsExistsSync: false,
         restoreAllMocks: false,
       },
       {
-        errorCode: 'EISDIR',
+        errorCode: "EISDIR",
         errorType: ToolErrorType.TARGET_IS_DIRECTORY,
-        errorMessage: 'Is a directory',
-        expectedMessagePrefix: 'Target is a directory, not a file',
+        errorMessage: "Is a directory",
+        expectedMessagePrefix: "Target is a directory, not a file",
         mockFsExistsSync: true,
         restoreAllMocks: false,
       },
       {
         errorCode: undefined,
         errorType: ToolErrorType.FILE_WRITE_FAILURE,
-        errorMessage: 'Generic write error',
-        expectedMessagePrefix: 'Error writing to file',
+        errorMessage: "Generic write error",
+        expectedMessagePrefix: "Error writing to file",
         mockFsExistsSync: false,
         restoreAllMocks: true,
       },
-    ])(
-      'should return $errorType error when write fails with $errorCode',
-      async ({
-        errorCode,
-        errorType,
-        errorMessage,
-        expectedMessagePrefix,
-        mockFsExistsSync,
-        restoreAllMocks,
-      }) => {
-        const filePath = path.join(rootDir, `${errorType}_file.txt`);
-        const content = 'test content';
-
-        if (restoreAllMocks) {
-          vi.restoreAllMocks();
+    ])("should return $errorType error when write fails with $errorCode", async ({
+      errorCode,
+      errorType,
+      errorMessage,
+      expectedMessagePrefix,
+      mockFsExistsSync,
+      restoreAllMocks,
+    }) => {
+      const filePath = path.join(rootDir, `${errorType}_file.txt`);
+      const content = "test content";
+
+      if (restoreAllMocks) {
+        vi.restoreAllMocks();
+      }
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      let existsSyncSpy: any;
+
+      try {
+        if (mockFsExistsSync) {
+          const originalExistsSync = fs.existsSync;
+          existsSyncSpy = vi
+            .spyOn(fs, "existsSync")
+            .mockImplementation((path) =>
+              path === filePath ? false : originalExistsSync(path as string),
+            );
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let existsSyncSpy: any;
-
-        try {
-          if (mockFsExistsSync) {
-            const originalExistsSync = fs.existsSync;
-            existsSyncSpy = vi
-              .spyOn(fs, 'existsSync')
-              .mockImplementation((path) =>
-                path === filePath ? false : originalExistsSync(path as string),
-              );
-          }
-
-          vi.spyOn(fsService, 'writeTextFile').mockImplementationOnce(() => {
-            const error = new Error(errorMessage) as NodeJS.ErrnoException;
-            if (errorCode) error.code = errorCode;
-            return Promise.reject(error);
-          });
-
-          const params = { file_path: filePath, content };
-          const invocation = tool.build(params);
-          const result = await invocation.execute(abortSignal);
-
-          expect(result.error?.type).toBe(errorType);
-          const errorSuffix = errorCode ? ` (${errorCode})` : '';
-          const expectedMessage = errorCode
-            ? `${expectedMessagePrefix}: ${filePath}${errorSuffix}`
-            : `${expectedMessagePrefix}: ${errorMessage}`;
-          expect(result.llmContent).toContain(expectedMessage);
-          expect(result.returnDisplay).toContain(expectedMessage);
-        } finally {
-          if (existsSyncSpy) {
-            existsSyncSpy.mockRestore();
-          }
+        vi.spyOn(fsService, "writeTextFile").mockImplementationOnce(() => {
+          const error = new Error(errorMessage) as NodeJS.ErrnoException;
+          if (errorCode) error.code = errorCode;
+          return Promise.reject(error);
+        });
+
+        const params = { file_path: filePath, content };
+        const invocation = tool.build(params);
+        const result = await invocation.execute(abortSignal);
+
+        expect(result.error?.type).toBe(errorType);
+        const errorSuffix = errorCode ? ` (${errorCode})` : "";
+        const expectedMessage = errorCode
+          ? `${expectedMessagePrefix}: ${filePath}${errorSuffix}`
+          : `${expectedMessagePrefix}: ${errorMessage}`;
+        expect(result.llmContent).toContain(expectedMessage);
+        expect(result.returnDisplay).toContain(expectedMessage);
+      } finally {
+        if (existsSyncSpy) {
+          existsSyncSpy.mockRestore();
         }
-      },
-    );
+      }
+    });
   });
 });
diff --git a/packages/gemini-cli-core/src/tools/write-file.ts b/packages/gemini-cli-core/src/tools/write-file.ts
index ad9a6a758..b48d33a45 100644
--- a/packages/gemini-cli-core/src/tools/write-file.ts
+++ b/packages/gemini-cli-core/src/tools/write-file.ts
@@ -4,13 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import * as Diff from 'diff';
-import { WRITE_FILE_TOOL_NAME } from './tool-names.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
+import fs from "node:fs";
+import path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { ensureCorrectEdit, ensureCorrectFileContent } from "../utils/editCorrector.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { getSpecificMimeType } from "../utils/fileUtils.js";
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { WRITE_FILE_TOOL_NAME } from "./tool-names.js";
 import type {
   FileDiff,
   ToolCallConfirmationDetails,
@@ -18,32 +30,8 @@ import type {
   ToolInvocation,
   ToolLocation,
   ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import {
-  ensureCorrectEdit,
-  ensureCorrectFileContent,
-} from '../utils/editCorrector.js';
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getSpecificMimeType } from '../utils/fileUtils.js';
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 /**
  * Parameters for the WriteFile tool
@@ -83,23 +71,21 @@ export async function getCorrectedFileContent(
   proposedContent: string,
   abortSignal: AbortSignal,
 ): Promise<GetCorrectedFileContentResult> {
-  let originalContent = '';
+  let originalContent = "";
   let fileExists = false;
   let correctedContent = proposedContent;
 
   try {
-    originalContent = await config
-      .getFileSystemService()
-      .readTextFile(filePath);
+    originalContent = await config.getFileSystemService().readTextFile(filePath);
     fileExists = true; // File exists and was read
   } catch (err) {
-    if (isNodeError(err) && err.code === 'ENOENT') {
+    if (isNodeError(err) && err.code === "ENOENT") {
       fileExists = false;
-      originalContent = '';
+      originalContent = "";
     } else {
       // File exists but could not be read (permissions, etc.)
       fileExists = true; // Mark as existing but problematic
-      originalContent = ''; // Can't use its content
+      originalContent = ""; // Can't use its content
       const error = {
         message: getErrorMessage(err),
         code: isNodeError(err) ? err.code : undefined,
@@ -139,10 +125,7 @@ export async function getCorrectedFileContent(
   return { originalContent, correctedContent, fileExists };
 }
 
-class WriteFileToolInvocation extends BaseToolInvocation<
-  WriteFileToolParams,
-  ToolResult
-> {
+class WriteFileToolInvocation extends BaseToolInvocation<WriteFileToolParams, ToolResult> {
   private readonly resolvedPath: string;
 
   constructor(
@@ -153,10 +136,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
     displayName?: string,
   ) {
     super(params, messageBus, toolName, displayName);
-    this.resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.file_path,
-    );
+    this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
   }
 
   override toolLocations(): ToolLocation[] {
@@ -164,10 +144,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
   }
 
   override getDescription(): string {
-    const relativePath = makeRelative(
-      this.resolvedPath,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.resolvedPath, this.config.getTargetDir());
     return `Writing to ${shortenPath(relativePath)}`;
   }
 
@@ -191,18 +168,15 @@ class WriteFileToolInvocation extends BaseToolInvocation<
     }
 
     const { originalContent, correctedContent } = correctedContentResult;
-    const relativePath = makeRelative(
-      this.resolvedPath,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.resolvedPath, this.config.getTargetDir());
     const fileName = path.basename(this.resolvedPath);
 
     const fileDiff = Diff.createPatch(
       fileName,
       originalContent, // Original content (empty if new file or unreadable)
       correctedContent, // Content after potential correction
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
 
@@ -213,7 +187,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         : undefined;
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Write: ${shortenPath(relativePath)}`,
       fileName,
       filePath: this.resolvedPath,
@@ -227,7 +201,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
 
         if (ideConfirmation) {
           const result = await ideConfirmation;
-          if (result.status === 'accepted' && result.content) {
+          if (result.status === "accepted" && result.content) {
             this.params.content = result.content;
           }
         }
@@ -261,17 +235,12 @@ class WriteFileToolInvocation extends BaseToolInvocation<
       };
     }
 
-    const {
-      originalContent,
-      correctedContent: fileContent,
-      fileExists,
-    } = correctedContentResult;
+    const { originalContent, correctedContent: fileContent, fileExists } = correctedContentResult;
     // fileExists is true if the file existed (and was readable or unreadable but caught by readError).
     // fileExists is false if the file did not exist (ENOENT).
     const isNewFile =
       !fileExists ||
-      (correctedContentResult.error !== undefined &&
-        !correctedContentResult.fileExists);
+      (correctedContentResult.error !== undefined && !correctedContentResult.fileExists);
 
     try {
       const dirName = path.dirname(this.resolvedPath);
@@ -279,9 +248,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         fs.mkdirSync(dirName, { recursive: true });
       }
 
-      await this.config
-        .getFileSystemService()
-        .writeTextFile(this.resolvedPath, fileContent);
+      await this.config.getFileSystemService().writeTextFile(this.resolvedPath, fileContent);
 
       // Generate diff for display result
       const fileName = path.basename(this.resolvedPath);
@@ -289,15 +256,15 @@ class WriteFileToolInvocation extends BaseToolInvocation<
       // but for the diff, we want to show the original content as it was before the write if possible.
       // However, if it was unreadable, currentContentForDiff will be empty.
       const currentContentForDiff = correctedContentResult.error
-        ? '' // Or some indicator of unreadable content
+        ? "" // Or some indicator of unreadable content
         : originalContent;
 
       const fileDiff = Diff.createPatch(
         fileName,
         currentContentForDiff,
         fileContent,
-        'Original',
-        'Written',
+        "Original",
+        "Written",
         DEFAULT_DIFF_OPTIONS,
       );
 
@@ -315,9 +282,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
           : `Successfully overwrote file: ${this.resolvedPath}.`,
       ];
       if (modified_by_user) {
-        llmSuccessMessageParts.push(
-          `User modified the \`content\` to be: ${content}`,
-        );
+        llmSuccessMessageParts.push(`User modified the \`content\` to be: ${content}`);
       }
 
       // Log file operation for telemetry (without diff_stat to avoid double-counting)
@@ -331,7 +296,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         new FileOperationEvent(
           WRITE_FILE_TOOL_NAME,
           operation,
-          fileContent.split('\n').length,
+          fileContent.split("\n").length,
           mimetype,
           extension,
           programmingLanguage,
@@ -347,7 +312,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
       };
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -360,20 +325,20 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         errorMsg = `Error writing to file '${this.resolvedPath}': ${error.message} (${error.code})`;
 
         // Log specific error types for better debugging
-        if (error.code === 'EACCES') {
+        if (error.code === "EACCES") {
           errorMsg = `Permission denied writing to file: ${this.resolvedPath} (${error.code})`;
           errorType = ToolErrorType.PERMISSION_DENIED;
-        } else if (error.code === 'ENOSPC') {
+        } else if (error.code === "ENOSPC") {
           errorMsg = `No space left on device: ${this.resolvedPath} (${error.code})`;
           errorType = ToolErrorType.NO_SPACE_LEFT;
-        } else if (error.code === 'EISDIR') {
+        } else if (error.code === "EISDIR") {
           errorMsg = `Target is a directory, not a file: ${this.resolvedPath} (${error.code})`;
           errorType = ToolErrorType.TARGET_IS_DIRECTORY;
         }
 
         // Include stack trace in debug mode for better troubleshooting
         if (this.config.getDebugMode() && error.stack) {
-          console.error('Write file error stack:', error.stack);
+          console.error("Write file error stack:", error.stack);
         }
       } else if (error instanceof Error) {
         errorMsg = `Error writing to file: ${error.message}`;
@@ -408,7 +373,7 @@ export class WriteFileTool
   ) {
     super(
       WriteFileTool.Name,
-      'WriteFile',
+      "WriteFile",
       `Writes content to a specified file in the local filesystem.
 
       The user has the ability to modify \`content\`. If modified, this will be stated in the response.`,
@@ -416,16 +381,16 @@ export class WriteFileTool
       {
         properties: {
           file_path: {
-            description: 'The path to the file to write to.',
-            type: 'string',
+            description: "The path to the file to write to.",
+            type: "string",
           },
           content: {
-            description: 'The content to write to the file.',
-            type: 'string',
+            description: "The content to write to the file.",
+            type: "string",
           },
         },
-        required: ['file_path', 'content'],
-        type: 'object',
+        required: ["file_path", "content"],
+        type: "object",
       },
       true,
       false,
@@ -433,9 +398,7 @@ export class WriteFileTool
     );
   }
 
-  protected override validateToolParamValues(
-    params: WriteFileToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: WriteFileToolParams): string | null {
     const filePath = params.file_path;
 
     if (!filePath) {
@@ -447,9 +410,7 @@ export class WriteFileTool
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(
-        ', ',
-      )}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
 
     try {
@@ -480,9 +441,7 @@ export class WriteFileTool
     );
   }
 
-  getModifyContext(
-    abortSignal: AbortSignal,
-  ): ModifyContext<WriteFileToolParams> {
+  getModifyContext(abortSignal: AbortSignal): ModifyContext<WriteFileToolParams> {
     return {
       getFilePath: (params: WriteFileToolParams) => params.file_path,
       getCurrentContent: async (params: WriteFileToolParams) => {
diff --git a/packages/gemini-cli-core/src/tools/write-todos.test.ts b/packages/gemini-cli-core/src/tools/write-todos.test.ts
index 9c2bc36fa..e5319d182 100644
--- a/packages/gemini-cli-core/src/tools/write-todos.test.ts
+++ b/packages/gemini-cli-core/src/tools/write-todos.test.ts
@@ -4,73 +4,73 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it } from 'vitest';
-import { WriteTodosTool, type WriteTodosToolParams } from './write-todos.js';
+import { describe, expect, it } from "vitest";
+import { WriteTodosTool, type WriteTodosToolParams } from "./write-todos.js";
 
-describe('WriteTodosTool', () => {
+describe("WriteTodosTool", () => {
   const tool = new WriteTodosTool();
   const signal = new AbortController().signal;
 
-  describe('validation', () => {
-    it('should not throw for valid parameters', async () => {
+  describe("validation", () => {
+    it("should not throw for valid parameters", async () => {
       const params: WriteTodosToolParams = {
         todos: [
-          { description: 'Task 1', status: 'pending' },
-          { description: 'Task 2', status: 'in_progress' },
-          { description: 'Task 3', status: 'completed' },
+          { description: "Task 1", status: "pending" },
+          { description: "Task 2", status: "in_progress" },
+          { description: "Task 3", status: "completed" },
         ],
       };
       await expect(tool.buildAndExecute(params, signal)).resolves.toBeDefined();
     });
 
-    it('should not throw for an empty list', async () => {
+    it("should not throw for an empty list", async () => {
       const params: WriteTodosToolParams = {
         todos: [],
       };
       await expect(tool.buildAndExecute(params, signal)).resolves.toBeDefined();
     });
 
-    it('should throw an error if todos is not an array', async () => {
+    it("should throw an error if todos is not an array", async () => {
       const params = {
-        todos: 'not-an-array',
+        todos: "not-an-array",
       } as unknown as WriteTodosToolParams;
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'params/todos must be array',
+        "params/todos must be array",
       );
     });
 
-    it('should throw an error if a todo item is not an object', async () => {
+    it("should throw an error if a todo item is not an object", async () => {
       const params = {
-        todos: ['not-an-object'],
+        todos: ["not-an-object"],
       } as unknown as WriteTodosToolParams;
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'params/todos/0 must be object',
+        "params/todos/0 must be object",
       );
     });
 
-    it('should throw an error if a todo description is missing or empty', async () => {
+    it("should throw an error if a todo description is missing or empty", async () => {
       const params: WriteTodosToolParams = {
-        todos: [{ description: '  ', status: 'pending' }],
+        todos: [{ description: "  ", status: "pending" }],
       };
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'Each todo must have a non-empty description string',
+        "Each todo must have a non-empty description string",
       );
     });
 
-    it('should throw an error if a todo status is invalid', async () => {
+    it("should throw an error if a todo status is invalid", async () => {
       const params = {
-        todos: [{ description: 'Task 1', status: 'invalid-status' }],
+        todos: [{ description: "Task 1", status: "invalid-status" }],
       } as unknown as WriteTodosToolParams;
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'params/todos/0/status must be equal to one of the allowed values',
+        "params/todos/0/status must be equal to one of the allowed values",
       );
     });
 
-    it('should throw an error if more than one task is in_progress', async () => {
+    it("should throw an error if more than one task is in_progress", async () => {
       const params: WriteTodosToolParams = {
         todos: [
-          { description: 'Task 1', status: 'in_progress' },
-          { description: 'Task 2', status: 'in_progress' },
+          { description: "Task 1", status: "in_progress" },
+          { description: "Task 2", status: "in_progress" },
         ],
       };
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
@@ -79,22 +79,22 @@ describe('WriteTodosTool', () => {
     });
   });
 
-  describe('execute', () => {
-    it('should return a success message for clearing the list', async () => {
+  describe("execute", () => {
+    it("should return a success message for clearing the list", async () => {
       const params: WriteTodosToolParams = {
         todos: [],
       };
       const result = await tool.buildAndExecute(params, signal);
-      expect(result.llmContent).toBe('Successfully cleared the todo list.');
+      expect(result.llmContent).toBe("Successfully cleared the todo list.");
       expect(result.returnDisplay).toEqual({ todos: [] });
     });
 
-    it('should return a formatted todo list on success', async () => {
+    it("should return a formatted todo list on success", async () => {
       const params: WriteTodosToolParams = {
         todos: [
-          { description: 'First task', status: 'completed' },
-          { description: 'Second task', status: 'in_progress' },
-          { description: 'Third task', status: 'pending' },
+          { description: "First task", status: "completed" },
+          { description: "Second task", status: "in_progress" },
+          { description: "Third task", status: "pending" },
         ],
       };
       const result = await tool.buildAndExecute(params, signal);
diff --git a/packages/gemini-cli-core/src/tools/write-todos.ts b/packages/gemini-cli-core/src/tools/write-todos.ts
index a418fac23..eeb20d726 100644
--- a/packages/gemini-cli-core/src/tools/write-todos.ts
+++ b/packages/gemini-cli-core/src/tools/write-todos.ts
@@ -4,23 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolInvocation } from './tools.js';
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { WRITE_TODOS_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation } from "./tools.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   Kind,
   type Todo,
   type ToolResult,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { WRITE_TODOS_TOOL_NAME } from './tool-names.js';
+} from "./tools.js";
 
-const TODO_STATUSES = [
-  'pending',
-  'in_progress',
-  'completed',
-  'cancelled',
-] as const;
+const TODO_STATUSES = ["pending", "in_progress", "completed", "cancelled"] as const;
 
 // Inspired by langchain/deepagents.
 export const WRITE_TODOS_DESCRIPTION = `This tool can help you list out the current subtasks that are required to be completed for a given user request. The list of subtasks helps you keep track of the current task, organize complex queries and help ensure that you don't miss any steps. With this list, the user can also see the current progress you are making in executing a given task.
@@ -95,10 +90,7 @@ export interface WriteTodosToolParams {
   todos: Todo[];
 }
 
-class WriteTodosToolInvocation extends BaseToolInvocation<
-  WriteTodosToolParams,
-  ToolResult
-> {
+class WriteTodosToolInvocation extends BaseToolInvocation<WriteTodosToolParams, ToolResult> {
   constructor(
     params: WriteTodosToolParams,
     messageBus?: MessageBus,
@@ -111,7 +103,7 @@ class WriteTodosToolInvocation extends BaseToolInvocation<
   getDescription(): string {
     const count = this.params.todos?.length ?? 0;
     if (count === 0) {
-      return 'Cleared todo list';
+      return "Cleared todo list";
     }
     return `Set ${count} todo(s)`;
   }
@@ -122,15 +114,13 @@ class WriteTodosToolInvocation extends BaseToolInvocation<
   ): Promise<ToolResult> {
     const todos = this.params.todos ?? [];
     const todoListString = todos
-      .map(
-        (todo, index) => `${index + 1}. [${todo.status}] ${todo.description}`,
-      )
-      .join('\n');
+      .map((todo, index) => `${index + 1}. [${todo.status}] ${todo.description}`)
+      .join("\n");
 
     const llmContent =
       todos.length > 0
         ? `Successfully updated the todo list. The current list is now:\n${todoListString}`
-        : 'Successfully cleared the todo list.';
+        : "Successfully cleared the todo list.";
 
     return {
       llmContent,
@@ -139,48 +129,38 @@ class WriteTodosToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class WriteTodosTool extends BaseDeclarativeTool<
-  WriteTodosToolParams,
-  ToolResult
-> {
+export class WriteTodosTool extends BaseDeclarativeTool<WriteTodosToolParams, ToolResult> {
   static readonly Name = WRITE_TODOS_TOOL_NAME;
 
   constructor() {
-    super(
-      WriteTodosTool.Name,
-      'WriteTodos',
-      WRITE_TODOS_DESCRIPTION,
-      Kind.Other,
-      {
-        type: 'object',
-        properties: {
-          todos: {
-            type: 'array',
-            description:
-              'The complete list of todo items. This will replace the existing list.',
-            items: {
-              type: 'object',
-              description: 'A single todo item.',
-              properties: {
-                description: {
-                  type: 'string',
-                  description: 'The description of the task.',
-                },
-                status: {
-                  type: 'string',
-                  description: 'The current status of the task.',
-                  enum: TODO_STATUSES,
-                },
+    super(WriteTodosTool.Name, "WriteTodos", WRITE_TODOS_DESCRIPTION, Kind.Other, {
+      type: "object",
+      properties: {
+        todos: {
+          type: "array",
+          description: "The complete list of todo items. This will replace the existing list.",
+          items: {
+            type: "object",
+            description: "A single todo item.",
+            properties: {
+              description: {
+                type: "string",
+                description: "The description of the task.",
+              },
+              status: {
+                type: "string",
+                description: "The current status of the task.",
+                enum: TODO_STATUSES,
               },
-              required: ['description', 'status'],
-              additionalProperties: false,
             },
+            required: ["description", "status"],
+            additionalProperties: false,
           },
         },
-        required: ['todos'],
-        additionalProperties: false,
       },
-    );
+      required: ["todos"],
+      additionalProperties: false,
+    });
   }
 
   override get schema() {
@@ -189,55 +169,51 @@ export class WriteTodosTool extends BaseDeclarativeTool<
       description: this.description,
       parametersJsonSchema: this.parameterSchema,
       responseJsonSchema: {
-        type: 'object',
+        type: "object",
         properties: {
           todos: {
-            type: 'array',
+            type: "array",
             items: {
-              type: 'object',
+              type: "object",
               properties: {
                 description: {
-                  type: 'string',
+                  type: "string",
                 },
                 status: {
-                  type: 'string',
+                  type: "string",
                   enum: TODO_STATUSES,
                 },
               },
-              required: ['description', 'status'],
+              required: ["description", "status"],
               additionalProperties: false,
             },
           },
         },
-        required: ['todos'],
+        required: ["todos"],
         additionalProperties: false,
       },
     };
   }
 
-  protected override validateToolParamValues(
-    params: WriteTodosToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: WriteTodosToolParams): string | null {
     const todos = params?.todos;
     if (!params || !Array.isArray(todos)) {
-      return '`todos` parameter must be an array';
+      return "`todos` parameter must be an array";
     }
 
     for (const todo of todos) {
-      if (typeof todo !== 'object' || todo === null) {
-        return 'Each todo item must be an object';
+      if (typeof todo !== "object" || todo === null) {
+        return "Each todo item must be an object";
       }
-      if (typeof todo.description !== 'string' || !todo.description.trim()) {
-        return 'Each todo must have a non-empty description string';
+      if (typeof todo.description !== "string" || !todo.description.trim()) {
+        return "Each todo must have a non-empty description string";
       }
       if (!TODO_STATUSES.includes(todo.status)) {
-        return `Each todo must have a valid status (${TODO_STATUSES.join(', ')})`;
+        return `Each todo must have a valid status (${TODO_STATUSES.join(", ")})`;
       }
     }
 
-    const inProgressCount = todos.filter(
-      (todo: Todo) => todo.status === 'in_progress',
-    ).length;
+    const inProgressCount = todos.filter((todo: Todo) => todo.status === "in_progress").length;
 
     if (inProgressCount > 1) {
       return 'Invalid parameters: Only one task can be "in_progress" at a time.';
@@ -252,11 +228,6 @@ export class WriteTodosTool extends BaseDeclarativeTool<
     _toolName?: string,
     _displayName?: string,
   ): ToolInvocation<WriteTodosToolParams, ToolResult> {
-    return new WriteTodosToolInvocation(
-      params,
-      _messageBus,
-      _toolName,
-      _displayName,
-    );
+    return new WriteTodosToolInvocation(params, _messageBus, _toolName, _displayName);
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/bfsFileSearch.test.ts b/packages/gemini-cli-core/src/utils/bfsFileSearch.test.ts
index c194090fb..a52e90e8e 100644
--- a/packages/gemini-cli-core/src/utils/bfsFileSearch.test.ts
+++ b/packages/gemini-cli-core/src/utils/bfsFileSearch.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fsPromises from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { bfsFileSearch, bfsFileSearchSync } from './bfsFileSearch.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-
-describe('bfsFileSearch', () => {
+import * as fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { bfsFileSearch, bfsFileSearchSync } from "./bfsFileSearch.js";
+
+describe("bfsFileSearch", () => {
   let testRootDir: string;
 
   async function createEmptyDir(...pathSegments: string[]) {
@@ -28,105 +28,88 @@ describe('bfsFileSearch', () => {
   }
 
   beforeEach(async () => {
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'bfs-file-search-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "bfs-file-search-test-"));
   });
 
   afterEach(async () => {
     await fsPromises.rm(testRootDir, { recursive: true, force: true });
   });
 
-  it('should find a file in the root directory', async () => {
-    const targetFilePath = await createTestFile('content', 'target.txt');
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should find a file in the root directory", async () => {
+    const targetFilePath = await createTestFile("content", "target.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should find a file in a nested directory', async () => {
-    const targetFilePath = await createTestFile(
-      'content',
-      'a',
-      'b',
-      'target.txt',
-    );
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should find a file in a nested directory", async () => {
+    const targetFilePath = await createTestFile("content", "a", "b", "target.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should find multiple files with the same name', async () => {
-    const targetFilePath1 = await createTestFile('content1', 'a', 'target.txt');
-    const targetFilePath2 = await createTestFile('content2', 'b', 'target.txt');
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should find multiple files with the same name", async () => {
+    const targetFilePath1 = await createTestFile("content1", "a", "target.txt");
+    const targetFilePath2 = await createTestFile("content2", "b", "target.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     result.sort();
     expect(result).toEqual([targetFilePath1, targetFilePath2].sort());
   });
 
-  it('should return an empty array if no file is found', async () => {
-    await createTestFile('content', 'other.txt');
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should return an empty array if no file is found", async () => {
+    await createTestFile("content", "other.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([]);
   });
 
-  it('should ignore directories specified in ignoreDirs', async () => {
-    await createTestFile('content', 'ignored', 'target.txt');
-    const targetFilePath = await createTestFile(
-      'content',
-      'not-ignored',
-      'target.txt',
-    );
+  it("should ignore directories specified in ignoreDirs", async () => {
+    await createTestFile("content", "ignored", "target.txt");
+    const targetFilePath = await createTestFile("content", "not-ignored", "target.txt");
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'target.txt',
-      ignoreDirs: ['ignored'],
+      fileName: "target.txt",
+      ignoreDirs: ["ignored"],
     });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should respect the maxDirs limit and not find the file', async () => {
-    await createTestFile('content', 'a', 'b', 'c', 'target.txt');
+  it("should respect the maxDirs limit and not find the file", async () => {
+    await createTestFile("content", "a", "b", "c", "target.txt");
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'target.txt',
+      fileName: "target.txt",
       maxDirs: 3,
     });
     expect(result).toEqual([]);
   });
 
-  it('should respect the maxDirs limit and find the file', async () => {
-    const targetFilePath = await createTestFile(
-      'content',
-      'a',
-      'b',
-      'c',
-      'target.txt',
-    );
+  it("should respect the maxDirs limit and find the file", async () => {
+    const targetFilePath = await createTestFile("content", "a", "b", "c", "target.txt");
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'target.txt',
+      fileName: "target.txt",
       maxDirs: 4,
     });
     expect(result).toEqual([targetFilePath]);
   });
 
-  describe('with FileDiscoveryService', () => {
+  describe("with FileDiscoveryService", () => {
     let projectRoot: string;
 
     beforeEach(async () => {
-      projectRoot = await createEmptyDir('project');
+      projectRoot = await createEmptyDir("project");
     });
 
-    it('should ignore gitignored files', async () => {
-      await createEmptyDir('project', '.git');
-      await createTestFile('node_modules/', 'project', '.gitignore');
-      await createTestFile('content', 'project', 'node_modules', 'target.txt');
+    it("should ignore gitignored files", async () => {
+      await createEmptyDir("project", ".git");
+      await createTestFile("node_modules/", "project", ".gitignore");
+      await createTestFile("content", "project", "node_modules", "target.txt");
       const targetFilePath = await createTestFile(
-        'content',
-        'project',
-        'not-ignored',
-        'target.txt',
+        "content",
+        "project",
+        "not-ignored",
+        "target.txt",
       );
 
       const fileService = new FileDiscoveryService(projectRoot);
       const result = await bfsFileSearch(projectRoot, {
-        fileName: 'target.txt',
+        fileName: "target.txt",
         fileService,
         fileFilteringOptions: {
           respectGitIgnore: true,
@@ -137,19 +120,19 @@ describe('bfsFileSearch', () => {
       expect(result).toEqual([targetFilePath]);
     });
 
-    it('should ignore geminiignored files', async () => {
-      await createTestFile('node_modules/', 'project', '.geminiignore');
-      await createTestFile('content', 'project', 'node_modules', 'target.txt');
+    it("should ignore geminiignored files", async () => {
+      await createTestFile("node_modules/", "project", ".geminiignore");
+      await createTestFile("content", "project", "node_modules", "target.txt");
       const targetFilePath = await createTestFile(
-        'content',
-        'project',
-        'not-ignored',
-        'target.txt',
+        "content",
+        "project",
+        "not-ignored",
+        "target.txt",
       );
 
       const fileService = new FileDiscoveryService(projectRoot);
       const result = await bfsFileSearch(projectRoot, {
-        fileName: 'target.txt',
+        fileName: "target.txt",
         fileService,
         fileFilteringOptions: {
           respectGitIgnore: false,
@@ -160,25 +143,15 @@ describe('bfsFileSearch', () => {
       expect(result).toEqual([targetFilePath]);
     });
 
-    it('should not ignore files if respect flags are false', async () => {
-      await createEmptyDir('project', '.git');
-      await createTestFile('node_modules/', 'project', '.gitignore');
-      const target1 = await createTestFile(
-        'content',
-        'project',
-        'node_modules',
-        'target.txt',
-      );
-      const target2 = await createTestFile(
-        'content',
-        'project',
-        'not-ignored',
-        'target.txt',
-      );
+    it("should not ignore files if respect flags are false", async () => {
+      await createEmptyDir("project", ".git");
+      await createTestFile("node_modules/", "project", ".gitignore");
+      const target1 = await createTestFile("content", "project", "node_modules", "target.txt");
+      const target2 = await createTestFile("content", "project", "not-ignored", "target.txt");
 
       const fileService = new FileDiscoveryService(projectRoot);
       const result = await bfsFileSearch(projectRoot, {
-        fileName: 'target.txt',
+        fileName: "target.txt",
         fileService,
         fileFilteringOptions: {
           respectGitIgnore: false,
@@ -190,7 +163,7 @@ describe('bfsFileSearch', () => {
     });
   });
 
-  it('should find all files in a complex directory structure', async () => {
+  it("should find all files in a complex directory structure", async () => {
     // Create a complex directory structure to test correctness at scale
     // without flaky performance checks.
     const numDirs = 50;
@@ -200,26 +173,22 @@ describe('bfsFileSearch', () => {
     const dirCreationPromises: Array<Promise<unknown>> = [];
     for (let i = 0; i < numDirs; i++) {
       dirCreationPromises.push(createEmptyDir(`dir${i}`));
-      dirCreationPromises.push(createEmptyDir(`dir${i}`, 'subdir1'));
-      dirCreationPromises.push(createEmptyDir(`dir${i}`, 'subdir2'));
-      dirCreationPromises.push(createEmptyDir(`dir${i}`, 'subdir1', 'deep'));
+      dirCreationPromises.push(createEmptyDir(`dir${i}`, "subdir1"));
+      dirCreationPromises.push(createEmptyDir(`dir${i}`, "subdir2"));
+      dirCreationPromises.push(createEmptyDir(`dir${i}`, "subdir1", "deep"));
     }
     await Promise.all(dirCreationPromises);
 
     const fileCreationPromises: Array<Promise<string>> = [];
     for (let i = 0; i < numTargetDirs; i++) {
       // Add target files in some directories
-      fileCreationPromises.push(
-        createTestFile('content', `dir${i}`, 'GEMINI.md'),
-      );
-      fileCreationPromises.push(
-        createTestFile('content', `dir${i}`, 'subdir1', 'GEMINI.md'),
-      );
+      fileCreationPromises.push(createTestFile("content", `dir${i}`, "GEMINI.md"));
+      fileCreationPromises.push(createTestFile("content", `dir${i}`, "subdir1", "GEMINI.md"));
     }
     const expectedFiles = await Promise.all(fileCreationPromises);
 
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'GEMINI.md',
+      fileName: "GEMINI.md",
       // Provide a generous maxDirs limit to ensure it doesn't prematurely stop
       // in this large test case. Total dirs created is 200.
       maxDirs: 250,
@@ -231,7 +200,7 @@ describe('bfsFileSearch', () => {
   });
 });
 
-describe('bfsFileSearchSync', () => {
+describe("bfsFileSearchSync", () => {
   let testRootDir: string;
 
   async function createEmptyDir(...pathSegments: string[]) {
@@ -248,70 +217,54 @@ describe('bfsFileSearchSync', () => {
   }
 
   beforeEach(async () => {
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'bfs-file-search-sync-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "bfs-file-search-sync-test-"));
   });
 
   afterEach(async () => {
     await fsPromises.rm(testRootDir, { recursive: true, force: true });
   });
 
-  it('should find a file in the root directory synchronously', async () => {
-    const targetFilePath = await createTestFile('content', 'target.txt');
-    const result = bfsFileSearchSync(testRootDir, { fileName: 'target.txt' });
+  it("should find a file in the root directory synchronously", async () => {
+    const targetFilePath = await createTestFile("content", "target.txt");
+    const result = bfsFileSearchSync(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should find a file in a nested directory synchronously', async () => {
-    const targetFilePath = await createTestFile(
-      'content',
-      'a',
-      'b',
-      'target.txt',
-    );
-    const result = bfsFileSearchSync(testRootDir, { fileName: 'target.txt' });
+  it("should find a file in a nested directory synchronously", async () => {
+    const targetFilePath = await createTestFile("content", "a", "b", "target.txt");
+    const result = bfsFileSearchSync(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should respect the maxDirs limit and not find the file synchronously', async () => {
-    await createTestFile('content', 'a', 'b', 'c', 'target.txt');
+  it("should respect the maxDirs limit and not find the file synchronously", async () => {
+    await createTestFile("content", "a", "b", "c", "target.txt");
     const result = bfsFileSearchSync(testRootDir, {
-      fileName: 'target.txt',
+      fileName: "target.txt",
       maxDirs: 3,
     });
     expect(result).toEqual([]);
   });
 
-  it('should ignore directories synchronously', async () => {
-    await createTestFile('content', 'ignored', 'target.txt');
-    const targetFilePath = await createTestFile(
-      'content',
-      'not-ignored',
-      'target.txt',
-    );
+  it("should ignore directories synchronously", async () => {
+    await createTestFile("content", "ignored", "target.txt");
+    const targetFilePath = await createTestFile("content", "not-ignored", "target.txt");
     const result = bfsFileSearchSync(testRootDir, {
-      fileName: 'target.txt',
-      ignoreDirs: ['ignored'],
+      fileName: "target.txt",
+      ignoreDirs: ["ignored"],
     });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should work with FileDiscoveryService synchronously', async () => {
-    const projectRoot = await createEmptyDir('project');
-    await createEmptyDir('project', '.git');
-    await createTestFile('node_modules/', 'project', '.gitignore');
-    await createTestFile('content', 'project', 'node_modules', 'target.txt');
-    const targetFilePath = await createTestFile(
-      'content',
-      'project',
-      'not-ignored',
-      'target.txt',
-    );
+  it("should work with FileDiscoveryService synchronously", async () => {
+    const projectRoot = await createEmptyDir("project");
+    await createEmptyDir("project", ".git");
+    await createTestFile("node_modules/", "project", ".gitignore");
+    await createTestFile("content", "project", "node_modules", "target.txt");
+    const targetFilePath = await createTestFile("content", "project", "not-ignored", "target.txt");
 
     const fileService = new FileDiscoveryService(projectRoot);
     const result = bfsFileSearchSync(projectRoot, {
-      fileName: 'target.txt',
+      fileName: "target.txt",
       fileService,
       fileFilteringOptions: {
         respectGitIgnore: true,
diff --git a/packages/gemini-cli-core/src/utils/bfsFileSearch.ts b/packages/gemini-cli-core/src/utils/bfsFileSearch.ts
index 781e988d3..319ac0c03 100644
--- a/packages/gemini-cli-core/src/utils/bfsFileSearch.ts
+++ b/packages/gemini-cli-core/src/utils/bfsFileSearch.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as fsSync from 'node:fs';
-import * as path from 'node:path';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { debugLogger } from './debugLogger.js';
+import * as fsSync from "node:fs";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FileFilteringOptions } from "../config/constants.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { debugLogger } from "./debugLogger.js";
+
 // Simple console logger for now.
 // TODO: Integrate with a more robust server-side logger.
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) =>
-    debugLogger.debug('[DEBUG] [BfsFileSearch]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [BfsFileSearch]", ...args),
 };
 
 interface BfsFileSearchOptions {
@@ -68,9 +68,7 @@ export async function bfsFileSearch(
     if (currentBatch.length === 0) continue;
 
     if (debug) {
-      logger.debug(
-        `Scanning [${scannedDirCount}/${maxDirs}]: batch of ${currentBatch.length}`,
-      );
+      logger.debug(`Scanning [${scannedDirCount}/${maxDirs}]: batch of ${currentBatch.length}`);
     }
 
     // Read directories in parallel instead of one by one
@@ -80,10 +78,8 @@ export async function bfsFileSearch(
         return { currentDir, entries };
       } catch (error) {
         // Warn user that a directory could not be read, as this affects search results.
-        const message = (error as Error)?.message ?? 'Unknown error';
-        debugLogger.warn(
-          `[WARN] Skipping unreadable directory: ${currentDir} (${message})`,
-        );
+        const message = (error as Error)?.message ?? "Unknown error";
+        debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
         if (debug) {
           logger.debug(`Full error for ${currentDir}:`, error);
         }
@@ -94,14 +90,7 @@ export async function bfsFileSearch(
     const results = await Promise.all(readPromises);
 
     for (const { currentDir, entries } of results) {
-      processDirEntries(
-        currentDir,
-        entries,
-        options,
-        ignoreDirsSet,
-        queue,
-        foundFiles,
-      );
+      processDirEntries(currentDir, entries, options, ignoreDirsSet, queue, foundFiles);
     }
   }
 
@@ -115,10 +104,7 @@ export async function bfsFileSearch(
  * @param options Configuration for the search.
  * @returns An array of paths where the file was found.
  */
-export function bfsFileSearchSync(
-  rootDir: string,
-  options: BfsFileSearchOptions,
-): string[] {
+export function bfsFileSearchSync(rootDir: string, options: BfsFileSearchOptions): string[] {
   const { ignoreDirs = [], maxDirs = Infinity, debug = false } = options;
   const foundFiles: string[] = [];
   const queue: string[] = [rootDir];
@@ -137,26 +123,15 @@ export function bfsFileSearchSync(
       scannedDirCount++;
 
       if (debug) {
-        logger.debug(
-          `Scanning Sync [${scannedDirCount}/${maxDirs}]: ${currentDir}`,
-        );
+        logger.debug(`Scanning Sync [${scannedDirCount}/${maxDirs}]: ${currentDir}`);
       }
 
       try {
         const entries = fsSync.readdirSync(currentDir, { withFileTypes: true });
-        processDirEntries(
-          currentDir,
-          entries,
-          options,
-          ignoreDirsSet,
-          queue,
-          foundFiles,
-        );
+        processDirEntries(currentDir, entries, options, ignoreDirsSet, queue, foundFiles);
       } catch (error) {
-        const message = (error as Error)?.message ?? 'Unknown error';
-        debugLogger.warn(
-          `[WARN] Skipping unreadable directory: ${currentDir} (${message})`,
-        );
+        const message = (error as Error)?.message ?? "Unknown error";
+        debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
       }
     }
   }
diff --git a/packages/gemini-cli-core/src/utils/browser.ts b/packages/gemini-cli-core/src/utils/browser.ts
index 35ee74611..10b4b9a19 100644
--- a/packages/gemini-cli-core/src/utils/browser.ts
+++ b/packages/gemini-cli-core/src/utils/browser.ts
@@ -14,29 +14,26 @@
 export function shouldAttemptBrowserLaunch(): boolean {
   // A list of browser names that indicate we should not attempt to open a
   // web browser for the user.
-  const browserBlocklist = ['www-browser'];
-  const browserEnv = process.env['BROWSER'];
+  const browserBlocklist = ["www-browser"];
+  const browserEnv = process.env["BROWSER"];
   if (browserEnv && browserBlocklist.includes(browserEnv)) {
     return false;
   }
   // Common environment variables used in CI/CD or other non-interactive shells.
-  if (
-    process.env['CI'] ||
-    process.env['DEBIAN_FRONTEND'] === 'noninteractive'
-  ) {
+  if (process.env["CI"] || process.env["DEBIAN_FRONTEND"] === "noninteractive") {
     return false;
   }
 
   // The presence of SSH_CONNECTION indicates a remote session.
   // We should not attempt to launch a browser unless a display is explicitly available
   // (checked below for Linux).
-  const isSSH = !!process.env['SSH_CONNECTION'];
+  const isSSH = !!process.env["SSH_CONNECTION"];
 
   // On Linux, the presence of a display server is a strong indicator of a GUI.
-  if (process.platform === 'linux') {
+  if (process.platform === "linux") {
     // These are environment variables that can indicate a running compositor on
     // Linux.
-    const displayVariables = ['DISPLAY', 'WAYLAND_DISPLAY', 'MIR_SOCKET'];
+    const displayVariables = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"];
     const hasDisplay = displayVariables.some((v) => !!process.env[v]);
     if (!hasDisplay) {
       return false;
@@ -45,7 +42,7 @@ export function shouldAttemptBrowserLaunch(): boolean {
 
   // If in an SSH session on a non-Linux OS (e.g., macOS), don't launch browser.
   // The Linux case is handled above (it's allowed if DISPLAY is set).
-  if (isSSH && process.platform !== 'linux') {
+  if (isSSH && process.platform !== "linux") {
     return false;
   }
 
diff --git a/packages/gemini-cli-core/src/utils/channel.test.ts b/packages/gemini-cli-core/src/utils/channel.test.ts
index 8dc554e4d..a53818da2 100644
--- a/packages/gemini-cli-core/src/utils/channel.test.ts
+++ b/packages/gemini-cli-core/src/utils/channel.test.ts
@@ -4,212 +4,200 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import {
-  ReleaseChannel,
+  _clearCache,
   getReleaseChannel,
   isNightly,
   isPreview,
   isStable,
-  _clearCache,
-} from './channel.js';
-import * as packageJson from './package.js';
+  ReleaseChannel,
+} from "./channel.js";
+import * as packageJson from "./package.js";
 
-vi.mock('./package.js', () => ({
+vi.mock("./package.js", () => ({
   getPackageJson: vi.fn(),
 }));
 
-describe('channel', () => {
+describe("channel", () => {
   beforeEach(() => {
     vi.resetAllMocks();
     _clearCache();
   });
 
-  describe('isStable', () => {
-    it('should return true for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("isStable", () => {
+    it("should return true for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(true);
+      await expect(isStable("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return false for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return false for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return false for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+    it("should return false if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return false if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
   });
 
-  describe('isNightly', () => {
-    it('should return false for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("isNightly", () => {
+    it("should return false for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(false);
+      await expect(isNightly("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return true for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return true for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(true);
+      await expect(isNightly("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return false for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return false for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(false);
+      await expect(isNightly("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return true if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(isNightly('/test/dir')).resolves.toBe(true);
+    it("should return true if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(isNightly("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return true if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return true if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(true);
+      await expect(isNightly("/test/dir")).resolves.toBe(true);
     });
   });
 
-  describe('isPreview', () => {
-    it('should return false for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("isPreview", () => {
+    it("should return false for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return false for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return true for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return true for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(true);
+      await expect(isPreview("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return false if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+    it("should return false if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return false if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
   });
 
-  describe('getReleaseChannel', () => {
-    it('should return STABLE for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("getReleaseChannel", () => {
+    it("should return STABLE for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.STABLE,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.STABLE);
     });
 
-    it('should return NIGHTLY for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return NIGHTLY for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.NIGHTLY,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.NIGHTLY);
     });
 
-    it('should return PREVIEW for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return PREVIEW for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.PREVIEW,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.PREVIEW);
     });
 
-    it('should return NIGHTLY if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.NIGHTLY,
-      );
+    it("should return NIGHTLY if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.NIGHTLY);
     });
 
-    it('should return NIGHTLY if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return NIGHTLY if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.NIGHTLY,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.NIGHTLY);
     });
   });
 
-  describe('memoization', () => {
-    it('should only call getPackageJson once for the same cwd', async () => {
+  describe("memoization", () => {
+    it("should only call getPackageJson once for the same cwd", async () => {
       const spy = vi
-        .spyOn(packageJson, 'getPackageJson')
-        .mockResolvedValue({ name: 'test', version: '1.0.0' });
+        .spyOn(packageJson, "getPackageJson")
+        .mockResolvedValue({ name: "test", version: "1.0.0" });
 
-      await expect(isStable('/test/dir')).resolves.toBe(true);
-      await expect(isNightly('/test/dir')).resolves.toBe(false);
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.STABLE,
-      );
+      await expect(isStable("/test/dir")).resolves.toBe(true);
+      await expect(isNightly("/test/dir")).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.STABLE);
 
       expect(spy).toHaveBeenCalledTimes(1);
     });
 
-    it('should call getPackageJson again for a different cwd', async () => {
+    it("should call getPackageJson again for a different cwd", async () => {
       const spy = vi
-        .spyOn(packageJson, 'getPackageJson')
-        .mockResolvedValue({ name: 'test', version: '1.0.0' });
+        .spyOn(packageJson, "getPackageJson")
+        .mockResolvedValue({ name: "test", version: "1.0.0" });
 
-      await expect(isStable('/test/dir1')).resolves.toBe(true);
-      await expect(isStable('/test/dir2')).resolves.toBe(true);
+      await expect(isStable("/test/dir1")).resolves.toBe(true);
+      await expect(isStable("/test/dir2")).resolves.toBe(true);
 
       expect(spy).toHaveBeenCalledTimes(2);
     });
diff --git a/packages/gemini-cli-core/src/utils/channel.ts b/packages/gemini-cli-core/src/utils/channel.ts
index 09b654b76..5e3a1d388 100644
--- a/packages/gemini-cli-core/src/utils/channel.ts
+++ b/packages/gemini-cli-core/src/utils/channel.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getPackageJson } from './package.js';
+import { getPackageJson } from "./package.js";
 
 export enum ReleaseChannel {
-  NIGHTLY = 'nightly',
-  PREVIEW = 'preview',
-  STABLE = 'stable',
+  NIGHTLY = "nightly",
+  PREVIEW = "preview",
+  STABLE = "stable",
 }
 
 const cache = new Map<string, ReleaseChannel>();
@@ -28,12 +28,12 @@ export async function getReleaseChannel(cwd: string): Promise<ReleaseChannel> {
   }
 
   const packageJson = await getPackageJson(cwd);
-  const version = packageJson?.version ?? '';
+  const version = packageJson?.version ?? "";
 
   let channel: ReleaseChannel;
-  if (version.includes('nightly') || version === '') {
+  if (version.includes("nightly") || version === "") {
     channel = ReleaseChannel.NIGHTLY;
-  } else if (version.includes('preview')) {
+  } else if (version.includes("preview")) {
     channel = ReleaseChannel.PREVIEW;
   } else {
     channel = ReleaseChannel.STABLE;
diff --git a/packages/gemini-cli-core/src/utils/checkpointUtils.test.ts b/packages/gemini-cli-core/src/utils/checkpointUtils.test.ts
index 2a0d198f3..39588396d 100644
--- a/packages/gemini-cli-core/src/utils/checkpointUtils.test.ts
+++ b/packages/gemini-cli-core/src/utils/checkpointUtils.test.ts
@@ -4,90 +4,90 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { z } from 'zod';
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { z } from "zod";
+import type { GeminiClient } from "../core/client.js";
+import type { ToolCallRequestInfo } from "../core/turn.js";
+import type { GitService } from "../services/gitService.js";
 import {
-  getToolCallDataSchema,
-  generateCheckpointFileName,
   formatCheckpointDisplayList,
+  generateCheckpointFileName,
+  getCheckpointInfoList,
+  getToolCallDataSchema,
   getTruncatedCheckpointNames,
   processRestorableToolCalls,
-  getCheckpointInfoList,
-} from './checkpointUtils.js';
-import type { GitService } from '../services/gitService.js';
-import type { GeminiClient } from '../core/client.js';
-import type { ToolCallRequestInfo } from '../core/turn.js';
-
-describe('checkpoint utils', () => {
-  describe('getToolCallDataSchema', () => {
-    it('should return a schema that validates a basic tool call data object', () => {
+} from "./checkpointUtils.js";
+
+describe("checkpoint utils", () => {
+  describe("getToolCallDataSchema", () => {
+    it("should return a schema that validates a basic tool call data object", () => {
       const schema = getToolCallDataSchema();
       const validData = {
-        toolCall: { name: 'test-tool', args: { foo: 'bar' } },
+        toolCall: { name: "test-tool", args: { foo: "bar" } },
       };
       const result = schema.safeParse(validData);
       expect(result.success).toBe(true);
     });
 
-    it('should validate with an optional history schema', () => {
+    it("should validate with an optional history schema", () => {
       const historyItemSchema = z.object({ id: z.number(), event: z.string() });
       const schema = getToolCallDataSchema(historyItemSchema);
       const validData = {
-        history: [{ id: 1, event: 'start' }],
-        toolCall: { name: 'test-tool', args: {} },
+        history: [{ id: 1, event: "start" }],
+        toolCall: { name: "test-tool", args: {} },
       };
       const result = schema.safeParse(validData);
       expect(result.success).toBe(true);
     });
 
-    it('should fail validation if history items do not match the schema', () => {
+    it("should fail validation if history items do not match the schema", () => {
       const historyItemSchema = z.object({ id: z.number(), event: z.string() });
       const schema = getToolCallDataSchema(historyItemSchema);
       const invalidData = {
-        history: [{ id: '1', event: 'start' }], // id should be a number
-        toolCall: { name: 'test-tool', args: {} },
+        history: [{ id: "1", event: "start" }], // id should be a number
+        toolCall: { name: "test-tool", args: {} },
       };
       const result = schema.safeParse(invalidData);
       expect(result.success).toBe(false);
     });
 
-    it('should validate clientHistory with the correct schema', () => {
+    it("should validate clientHistory with the correct schema", () => {
       const schema = getToolCallDataSchema();
       const validData = {
-        clientHistory: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        toolCall: { name: 'test-tool', args: {} },
+        clientHistory: [{ role: "user", parts: [{ text: "Hello" }] }],
+        toolCall: { name: "test-tool", args: {} },
       };
       const result = schema.safeParse(validData);
       expect(result.success).toBe(true);
     });
   });
 
-  describe('generateCheckpointFileName', () => {
-    it('should generate a filename with timestamp, basename, and tool name', () => {
+  describe("generateCheckpointFileName", () => {
+    it("should generate a filename with timestamp, basename, and tool name", () => {
       vi.useFakeTimers();
-      vi.setSystemTime(new Date('2025-01-01T12:00:00.000Z'));
+      vi.setSystemTime(new Date("2025-01-01T12:00:00.000Z"));
       const toolCall = {
-        callId: '1',
-        name: 'replace',
-        args: { file_path: '/path/to/my-file.txt' },
+        callId: "1",
+        name: "replace",
+        args: { file_path: "/path/to/my-file.txt" },
         isClientInitiated: false,
-        prompt_id: 'p1',
+        prompt_id: "p1",
       } as ToolCallRequestInfo;
 
-      const expected = '2025-01-01T12-00-00_000Z-my-file.txt-replace';
+      const expected = "2025-01-01T12-00-00_000Z-my-file.txt-replace";
       const actual = generateCheckpointFileName(toolCall);
       expect(actual).toBe(expected);
 
       vi.useRealTimers();
     });
 
-    it('should return null if file_path is not in the tool arguments', () => {
+    it("should return null if file_path is not in the tool arguments", () => {
       const toolCall = {
-        callId: '1',
-        name: 'replace',
-        args: { some_other_arg: 'value' },
+        callId: "1",
+        name: "replace",
+        args: { some_other_arg: "value" },
         isClientInitiated: false,
-        prompt_id: 'p1',
+        prompt_id: "p1",
       } as ToolCallRequestInfo;
 
       const actual = generateCheckpointFileName(toolCall);
@@ -95,35 +95,35 @@ describe('checkpoint utils', () => {
     });
   });
 
-  describe('formatCheckpointDisplayList and getTruncatedCheckpointNames', () => {
+  describe("formatCheckpointDisplayList and getTruncatedCheckpointNames", () => {
     const filenames = [
-      '2025-01-01T12-00-00_000Z-my-file.txt-replace.json',
-      '2025-01-01T13-00-00_000Z-another.js-write_file.json',
-      'no-extension-file',
+      "2025-01-01T12-00-00_000Z-my-file.txt-replace.json",
+      "2025-01-01T13-00-00_000Z-another.js-write_file.json",
+      "no-extension-file",
     ];
 
-    it('getTruncatedCheckpointNames should remove the .json extension', () => {
+    it("getTruncatedCheckpointNames should remove the .json extension", () => {
       const expected = [
-        '2025-01-01T12-00-00_000Z-my-file.txt-replace',
-        '2025-01-01T13-00-00_000Z-another.js-write_file',
-        'no-extension-file',
+        "2025-01-01T12-00-00_000Z-my-file.txt-replace",
+        "2025-01-01T13-00-00_000Z-another.js-write_file",
+        "no-extension-file",
       ];
       const actual = getTruncatedCheckpointNames(filenames);
       expect(actual).toEqual(expected);
     });
 
-    it('formatCheckpointDisplayList should return a newline-separated string of truncated names', () => {
+    it("formatCheckpointDisplayList should return a newline-separated string of truncated names", () => {
       const expected = [
-        '2025-01-01T12-00-00_000Z-my-file.txt-replace',
-        '2025-01-01T13-00-00_000Z-another.js-write_file',
-        'no-extension-file',
-      ].join('\n');
+        "2025-01-01T12-00-00_000Z-my-file.txt-replace",
+        "2025-01-01T13-00-00_000Z-another.js-write_file",
+        "no-extension-file",
+      ].join("\n");
       const actual = formatCheckpointDisplayList(filenames);
       expect(actual).toEqual(expected);
     });
   });
 
-  describe('processRestorableToolCalls', () => {
+  describe("processRestorableToolCalls", () => {
     const mockGitService = {
       createFileSnapshot: vi.fn(),
       getCurrentCommitHash: vi.fn(),
@@ -137,62 +137,56 @@ describe('checkpoint utils', () => {
       vi.clearAllMocks();
     });
 
-    it('should create checkpoints for restorable tool calls', async () => {
+    it("should create checkpoints for restorable tool calls", async () => {
       const toolCalls = [
         {
-          callId: '1',
-          name: 'replace',
-          args: { file_path: 'a.txt' },
-          prompt_id: 'p1',
+          callId: "1",
+          name: "replace",
+          args: { file_path: "a.txt" },
+          prompt_id: "p1",
           isClientInitiated: false,
         },
       ] as ToolCallRequestInfo[];
 
-      (mockGitService.createFileSnapshot as Mock).mockResolvedValue('hash123');
-      (mockGeminiClient.getHistory as Mock).mockResolvedValue([
-        { role: 'user', parts: [] },
-      ]);
+      (mockGitService.createFileSnapshot as Mock).mockResolvedValue("hash123");
+      (mockGeminiClient.getHistory as Mock).mockResolvedValue([{ role: "user", parts: [] }]);
 
       const { checkpointsToWrite, toolCallToCheckpointMap, errors } =
         await processRestorableToolCalls(
           toolCalls,
           mockGitService,
           mockGeminiClient,
-          'history-data',
+          "history-data",
         );
 
       expect(errors).toHaveLength(0);
       expect(checkpointsToWrite.size).toBe(1);
-      expect(toolCallToCheckpointMap.get('1')).toBeDefined();
+      expect(toolCallToCheckpointMap.get("1")).toBeDefined();
 
       const fileName = checkpointsToWrite.values().next().value;
       expect(fileName).toBeDefined();
       const fileContent = JSON.parse(fileName!);
 
-      expect(fileContent.commitHash).toBe('hash123');
-      expect(fileContent.history).toBe('history-data');
-      expect(fileContent.clientHistory).toEqual([{ role: 'user', parts: [] }]);
-      expect(fileContent.toolCall.name).toBe('replace');
-      expect(fileContent.messageId).toBe('p1');
+      expect(fileContent.commitHash).toBe("hash123");
+      expect(fileContent.history).toBe("history-data");
+      expect(fileContent.clientHistory).toEqual([{ role: "user", parts: [] }]);
+      expect(fileContent.toolCall.name).toBe("replace");
+      expect(fileContent.messageId).toBe("p1");
     });
 
-    it('should handle git snapshot failure by using current commit hash', async () => {
+    it("should handle git snapshot failure by using current commit hash", async () => {
       const toolCalls = [
         {
-          callId: '1',
-          name: 'replace',
-          args: { file_path: 'a.txt' },
-          prompt_id: 'p1',
+          callId: "1",
+          name: "replace",
+          args: { file_path: "a.txt" },
+          prompt_id: "p1",
           isClientInitiated: false,
         },
       ] as ToolCallRequestInfo[];
 
-      (mockGitService.createFileSnapshot as Mock).mockRejectedValue(
-        new Error('Snapshot failed'),
-      );
-      (mockGitService.getCurrentCommitHash as Mock).mockResolvedValue(
-        'fallback-hash',
-      );
+      (mockGitService.createFileSnapshot as Mock).mockRejectedValue(new Error("Snapshot failed"));
+      (mockGitService.getCurrentCommitHash as Mock).mockResolvedValue("fallback-hash");
 
       const { checkpointsToWrite, errors } = await processRestorableToolCalls(
         toolCalls,
@@ -201,25 +195,25 @@ describe('checkpoint utils', () => {
       );
 
       expect(errors).toHaveLength(1);
-      expect(errors[0]).toContain('Failed to create new snapshot');
+      expect(errors[0]).toContain("Failed to create new snapshot");
       expect(checkpointsToWrite.size).toBe(1);
       const value = checkpointsToWrite.values().next().value;
       expect(value).toBeDefined();
       const fileContent = JSON.parse(value!);
-      expect(fileContent.commitHash).toBe('fallback-hash');
+      expect(fileContent.commitHash).toBe("fallback-hash");
     });
 
-    it('should skip tool calls with no file_path', async () => {
+    it("should skip tool calls with no file_path", async () => {
       const toolCalls = [
         {
-          callId: '1',
-          name: 'replace',
-          args: { not_a_path: 'a.txt' },
-          prompt_id: 'p1',
+          callId: "1",
+          name: "replace",
+          args: { not_a_path: "a.txt" },
+          prompt_id: "p1",
           isClientInitiated: false,
         },
       ] as ToolCallRequestInfo[];
-      (mockGitService.createFileSnapshot as Mock).mockResolvedValue('hash123');
+      (mockGitService.createFileSnapshot as Mock).mockResolvedValue("hash123");
 
       const { checkpointsToWrite, errors } = await processRestorableToolCalls(
         toolCalls,
@@ -228,28 +222,22 @@ describe('checkpoint utils', () => {
       );
 
       expect(errors).toHaveLength(1);
-      expect(errors[0]).toContain(
-        'Skipping restorable tool call due to missing file_path',
-      );
+      expect(errors[0]).toContain("Skipping restorable tool call due to missing file_path");
       expect(checkpointsToWrite.size).toBe(0);
     });
 
-    it('should log an error if git snapshot fails and then skip the tool call', async () => {
+    it("should log an error if git snapshot fails and then skip the tool call", async () => {
       const toolCalls = [
         {
-          callId: '1',
-          name: 'replace',
-          args: { file_path: 'a.txt' },
-          prompt_id: 'p1',
+          callId: "1",
+          name: "replace",
+          args: { file_path: "a.txt" },
+          prompt_id: "p1",
           isClientInitiated: false,
         },
       ] as ToolCallRequestInfo[];
-      (mockGitService.createFileSnapshot as Mock).mockRejectedValue(
-        new Error('Snapshot failed'),
-      );
-      (mockGitService.getCurrentCommitHash as Mock).mockResolvedValue(
-        undefined,
-      );
+      (mockGitService.createFileSnapshot as Mock).mockRejectedValue(new Error("Snapshot failed"));
+      (mockGitService.getCurrentCommitHash as Mock).mockResolvedValue(undefined);
 
       const { checkpointsToWrite, errors } = await processRestorableToolCalls(
         toolCalls,
@@ -258,46 +246,46 @@ describe('checkpoint utils', () => {
       );
 
       expect(errors).toHaveLength(2);
-      expect(errors[0]).toContain('Failed to create new snapshot');
-      expect(errors[1]).toContain('Failed to create snapshot for replace');
+      expect(errors[0]).toContain("Failed to create new snapshot");
+      expect(errors[1]).toContain("Failed to create snapshot for replace");
       expect(checkpointsToWrite.size).toBe(0);
     });
   });
 
-  describe('getCheckpointInfoList', () => {
-    it('should parse valid checkpoint files and return a list of info', () => {
+  describe("getCheckpointInfoList", () => {
+    it("should parse valid checkpoint files and return a list of info", () => {
       const checkpointFiles = new Map([
-        ['checkpoint1.json', JSON.stringify({ messageId: 'msg1' })],
-        ['checkpoint2.json', JSON.stringify({ messageId: 'msg2' })],
+        ["checkpoint1.json", JSON.stringify({ messageId: "msg1" })],
+        ["checkpoint2.json", JSON.stringify({ messageId: "msg2" })],
       ]);
 
       const expected = [
-        { messageId: 'msg1', checkpoint: 'checkpoint1' },
-        { messageId: 'msg2', checkpoint: 'checkpoint2' },
+        { messageId: "msg1", checkpoint: "checkpoint1" },
+        { messageId: "msg2", checkpoint: "checkpoint2" },
       ];
 
       const actual = getCheckpointInfoList(checkpointFiles);
       expect(actual).toEqual(expected);
     });
 
-    it('should ignore files with invalid JSON', () => {
+    it("should ignore files with invalid JSON", () => {
       const checkpointFiles = new Map([
-        ['checkpoint1.json', JSON.stringify({ messageId: 'msg1' })],
-        ['invalid.json', 'not-json'],
+        ["checkpoint1.json", JSON.stringify({ messageId: "msg1" })],
+        ["invalid.json", "not-json"],
       ]);
 
-      const expected = [{ messageId: 'msg1', checkpoint: 'checkpoint1' }];
+      const expected = [{ messageId: "msg1", checkpoint: "checkpoint1" }];
       const actual = getCheckpointInfoList(checkpointFiles);
       expect(actual).toEqual(expected);
     });
 
-    it('should ignore files that are missing a messageId', () => {
+    it("should ignore files that are missing a messageId", () => {
       const checkpointFiles = new Map([
-        ['checkpoint1.json', JSON.stringify({ messageId: 'msg1' })],
-        ['no-msg-id.json', JSON.stringify({ other_prop: 'value' })],
+        ["checkpoint1.json", JSON.stringify({ messageId: "msg1" })],
+        ["no-msg-id.json", JSON.stringify({ other_prop: "value" })],
       ]);
 
-      const expected = [{ messageId: 'msg1', checkpoint: 'checkpoint1' }];
+      const expected = [{ messageId: "msg1", checkpoint: "checkpoint1" }];
       const actual = getCheckpointInfoList(checkpointFiles);
       expect(actual).toEqual(expected);
     });
diff --git a/packages/gemini-cli-core/src/utils/checkpointUtils.ts b/packages/gemini-cli-core/src/utils/checkpointUtils.ts
index 550853118..e5f1ed4e8 100644
--- a/packages/gemini-cli-core/src/utils/checkpointUtils.ts
+++ b/packages/gemini-cli-core/src/utils/checkpointUtils.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import type { GitService } from '../services/gitService.js';
-import type { GeminiClient } from '../core/client.js';
-import { getErrorMessage } from './errors.js';
-import { z } from 'zod';
-import type { Content } from '@google/genai';
-import type { ToolCallRequestInfo } from '../core/turn.js';
+import * as path from "node:path";
+import type { Content } from "@google/genai";
+import { z } from "zod";
+import type { GeminiClient } from "../core/client.js";
+import type { ToolCallRequestInfo } from "../core/turn.js";
+import type { GitService } from "../services/gitService.js";
+import { getErrorMessage } from "./errors.js";
 
 export interface ToolCallData<HistoryType = unknown, ArgsType = unknown> {
   history?: HistoryType;
@@ -45,20 +45,15 @@ export function getToolCallDataSchema(historyItemSchema?: z.ZodTypeAny) {
   });
 }
 
-export function generateCheckpointFileName(
-  toolCall: ToolCallRequestInfo,
-): string | null {
+export function generateCheckpointFileName(toolCall: ToolCallRequestInfo): string | null {
   const toolArgs = toolCall.args as Record<string, unknown>;
-  const toolFilePath = toolArgs['file_path'] as string;
+  const toolFilePath = toolArgs["file_path"] as string;
 
   if (!toolFilePath) {
     return null;
   }
 
-  const timestamp = new Date()
-    .toISOString()
-    .replace(/:/g, '-')
-    .replace(/\./g, '_');
+  const timestamp = new Date().toISOString().replace(/:/g, "-").replace(/\./g, "_");
   const toolName = toolCall.name;
   const fileName = path.basename(toolFilePath);
 
@@ -66,17 +61,17 @@ export function generateCheckpointFileName(
 }
 
 export function formatCheckpointDisplayList(filenames: string[]): string {
-  return getTruncatedCheckpointNames(filenames).join('\n');
+  return getTruncatedCheckpointNames(filenames).join("\n");
 }
 
 export function getTruncatedCheckpointNames(filenames: string[]): string[] {
   return filenames.map((file) => {
-    const components = file.split('.');
+    const components = file.split(".");
     if (components.length <= 1) {
       return file;
     }
     components.pop();
-    return components.join('.');
+    return components.join(".");
   });
 }
 
@@ -98,9 +93,7 @@ export async function processRestorableToolCalls<HistoryType>(
     try {
       let commitHash: string | undefined;
       try {
-        commitHash = await gitService.createFileSnapshot(
-          `Snapshot for ${toolCall.name}`,
-        );
+        commitHash = await gitService.createFileSnapshot(`Snapshot for ${toolCall.name}`);
       } catch (error) {
         errors.push(
           `Failed to create new snapshot for ${
@@ -119,9 +112,7 @@ export async function processRestorableToolCalls<HistoryType>(
 
       const checkpointFileName = generateCheckpointFileName(toolCall);
       if (!checkpointFileName) {
-        errors.push(
-          `Skipping restorable tool call due to missing file_path: ${toolCall.name}`,
-        );
+        errors.push(`Skipping restorable tool call due to missing file_path: ${toolCall.name}`);
         continue;
       }
 
@@ -139,16 +130,9 @@ export async function processRestorableToolCalls<HistoryType>(
 
       const fileName = `${checkpointFileName}.json`;
       checkpointsToWrite.set(fileName, JSON.stringify(checkpointData, null, 2));
-      toolCallToCheckpointMap.set(
-        toolCall.callId,
-        fileName.replace('.json', ''),
-      );
+      toolCallToCheckpointMap.set(toolCall.callId, fileName.replace(".json", ""));
     } catch (error) {
-      errors.push(
-        `Failed to create checkpoint for ${toolCall.name}: ${getErrorMessage(
-          error,
-        )}`,
-      );
+      errors.push(`Failed to create checkpoint for ${toolCall.name}: ${getErrorMessage(error)}`);
     }
   }
 
@@ -160,9 +144,7 @@ export interface CheckpointInfo {
   checkpoint: string;
 }
 
-export function getCheckpointInfoList(
-  checkpointFiles: Map<string, string>,
-): CheckpointInfo[] {
+export function getCheckpointInfoList(checkpointFiles: Map<string, string>): CheckpointInfo[] {
   const checkpointInfoList: CheckpointInfo[] = [];
 
   for (const [file, content] of checkpointFiles) {
@@ -171,7 +153,7 @@ export function getCheckpointInfoList(
       if (toolCallData.messageId) {
         checkpointInfoList.push({
           messageId: toolCallData.messageId,
-          checkpoint: file.replace('.json', ''),
+          checkpoint: file.replace(".json", ""),
         });
       }
     } catch (_e) {
diff --git a/packages/gemini-cli-core/src/utils/customHeaderUtils.test.ts b/packages/gemini-cli-core/src/utils/customHeaderUtils.test.ts
index 7cae6331e..1ff9b98ec 100644
--- a/packages/gemini-cli-core/src/utils/customHeaderUtils.test.ts
+++ b/packages/gemini-cli-core/src/utils/customHeaderUtils.test.ts
@@ -4,88 +4,86 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { parseCustomHeaders } from './customHeaderUtils.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { parseCustomHeaders } from "./customHeaderUtils.js";
 
-describe('parseCustomHeaders', () => {
+describe("parseCustomHeaders", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should return an empty object if input is undefined', () => {
+  it("should return an empty object if input is undefined", () => {
     expect(parseCustomHeaders(undefined)).toEqual({});
   });
 
-  it('should return an empty object if input is empty string', () => {
-    expect(parseCustomHeaders('')).toEqual({});
+  it("should return an empty object if input is empty string", () => {
+    expect(parseCustomHeaders("")).toEqual({});
   });
 
-  it('should parse a single header correctly', () => {
-    const input = 'Authorization: Bearer abc123';
+  it("should parse a single header correctly", () => {
+    const input = "Authorization: Bearer abc123";
     expect(parseCustomHeaders(input)).toEqual({
-      Authorization: 'Bearer abc123',
+      Authorization: "Bearer abc123",
     });
   });
 
-  it('should parse multiple headers separated by commas', () => {
-    const input =
-      'Authorization: Bearer abc123, Content-Type: application/json';
+  it("should parse multiple headers separated by commas", () => {
+    const input = "Authorization: Bearer abc123, Content-Type: application/json";
     expect(parseCustomHeaders(input)).toEqual({
-      Authorization: 'Bearer abc123',
-      'Content-Type': 'application/json',
+      Authorization: "Bearer abc123",
+      "Content-Type": "application/json",
     });
   });
 
-  it('should ignore entries without colon', () => {
-    const input = 'Authorization Bearer abc123, Content-Type: application/json';
+  it("should ignore entries without colon", () => {
+    const input = "Authorization Bearer abc123, Content-Type: application/json";
     expect(parseCustomHeaders(input)).toEqual({
-      'Content-Type': 'application/json',
+      "Content-Type": "application/json",
     });
   });
 
-  it('should trim whitespace around names and values', () => {
-    const input =
-      '  Authorization  :   Bearer abc123  ,  Content-Type : application/json  ';
+  it("should trim whitespace around names and values", () => {
+    const input = "  Authorization  :   Bearer abc123  ,  Content-Type : application/json  ";
     expect(parseCustomHeaders(input)).toEqual({
-      Authorization: 'Bearer abc123',
-      'Content-Type': 'application/json',
+      Authorization: "Bearer abc123",
+      "Content-Type": "application/json",
     });
   });
 
-  it('should handle headers with colons in the value', () => {
-    const input = 'X-Custom: value:with:colons, Authorization: Bearer xyz';
+  it("should handle headers with colons in the value", () => {
+    const input = "X-Custom: value:with:colons, Authorization: Bearer xyz";
     expect(parseCustomHeaders(input)).toEqual({
-      'X-Custom': 'value:with:colons',
-      Authorization: 'Bearer xyz',
+      "X-Custom": "value:with:colons",
+      Authorization: "Bearer xyz",
     });
   });
 
-  it('should skip headers with empty name', () => {
-    const input = ': no-name, Authorization: Bearer abc';
+  it("should skip headers with empty name", () => {
+    const input = ": no-name, Authorization: Bearer abc";
     expect(parseCustomHeaders(input)).toEqual({
-      Authorization: 'Bearer abc',
+      Authorization: "Bearer abc",
     });
   });
 
-  it('should skip completely empty entries', () => {
-    const input = ', , Authorization: Bearer abc';
+  it("should skip completely empty entries", () => {
+    const input = ", , Authorization: Bearer abc";
     expect(parseCustomHeaders(input)).toEqual({
-      Authorization: 'Bearer abc',
+      Authorization: "Bearer abc",
     });
   });
 
-  it('should handle Authorization Bearer with different casing', () => {
-    const input = 'authorization: Bearer token123';
+  it("should handle Authorization Bearer with different casing", () => {
+    const input = "authorization: Bearer token123";
     expect(parseCustomHeaders(input)).toEqual({
-      authorization: 'Bearer token123',
+      authorization: "Bearer token123",
     });
   });
 
-  it('should handle values with commas correctly', () => {
-    const input = 'X-Header: value,with,commas, Authorization: Bearer abc';
+  it("should handle values with commas correctly", () => {
+    const input = "X-Header: value,with,commas, Authorization: Bearer abc";
     expect(parseCustomHeaders(input)).toEqual({
-      'X-Header': 'value,with,commas',
-      Authorization: 'Bearer abc',
+      "X-Header": "value,with,commas",
+      Authorization: "Bearer abc",
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/customHeaderUtils.ts b/packages/gemini-cli-core/src/utils/customHeaderUtils.ts
index d367e2783..0d32681e0 100644
--- a/packages/gemini-cli-core/src/utils/customHeaderUtils.ts
+++ b/packages/gemini-cli-core/src/utils/customHeaderUtils.ts
@@ -7,9 +7,7 @@
 /**
  * Parses custom headers and returns a map of key and vallues
  */
-export function parseCustomHeaders(
-  envValue: string | undefined,
-): Record<string, string> {
+export function parseCustomHeaders(envValue: string | undefined): Record<string, string> {
   const headers: Record<string, string> = {};
   if (!envValue) {
     return headers;
@@ -23,7 +21,7 @@ export function parseCustomHeaders(
       continue;
     }
 
-    const separatorIndex = trimmedEntry.indexOf(':');
+    const separatorIndex = trimmedEntry.indexOf(":");
     if (separatorIndex === -1) {
       continue;
     }
diff --git a/packages/gemini-cli-core/src/utils/debugLogger.test.ts b/packages/gemini-cli-core/src/utils/debugLogger.test.ts
index 26788f433..901a5657b 100644
--- a/packages/gemini-cli-core/src/utils/debugLogger.test.ts
+++ b/packages/gemini-cli-core/src/utils/debugLogger.test.ts
@@ -4,72 +4,72 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach } from 'vitest';
-import { debugLogger } from './debugLogger.js';
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
 
-describe('DebugLogger', () => {
+describe("DebugLogger", () => {
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should call console.log with the correct arguments', () => {
-    const spy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    const message = 'This is a log message';
-    const data = { key: 'value' };
+  it("should call console.log with the correct arguments", () => {
+    const spy = vi.spyOn(console, "log").mockImplementation(() => {});
+    const message = "This is a log message";
+    const data = { key: "value" };
     debugLogger.log(message, data);
     expect(spy).toHaveBeenCalledWith(message, data);
     expect(spy).toHaveBeenCalledTimes(1);
   });
 
-  it('should call console.warn with the correct arguments', () => {
-    const spy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-    const message = 'This is a warning message';
+  it("should call console.warn with the correct arguments", () => {
+    const spy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const message = "This is a warning message";
     const data = [1, 2, 3];
     debugLogger.warn(message, data);
     expect(spy).toHaveBeenCalledWith(message, data);
     expect(spy).toHaveBeenCalledTimes(1);
   });
 
-  it('should call console.error with the correct arguments', () => {
-    const spy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    const message = 'This is an error message';
-    const error = new Error('Something went wrong');
+  it("should call console.error with the correct arguments", () => {
+    const spy = vi.spyOn(console, "error").mockImplementation(() => {});
+    const message = "This is an error message";
+    const error = new Error("Something went wrong");
     debugLogger.error(message, error);
     expect(spy).toHaveBeenCalledWith(message, error);
     expect(spy).toHaveBeenCalledTimes(1);
   });
 
-  it('should call console.debug with the correct arguments', () => {
-    const spy = vi.spyOn(console, 'debug').mockImplementation(() => {});
-    const message = 'This is a debug message';
-    const obj = { a: { b: 'c' } };
+  it("should call console.debug with the correct arguments", () => {
+    const spy = vi.spyOn(console, "debug").mockImplementation(() => {});
+    const message = "This is a debug message";
+    const obj = { a: { b: "c" } };
     debugLogger.debug(message, obj);
     expect(spy).toHaveBeenCalledWith(message, obj);
     expect(spy).toHaveBeenCalledTimes(1);
   });
 
-  it('should handle multiple arguments correctly for all methods', () => {
-    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    const debugSpy = vi.spyOn(console, 'debug').mockImplementation(() => {});
+  it("should handle multiple arguments correctly for all methods", () => {
+    const logSpy = vi.spyOn(console, "log").mockImplementation(() => {});
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    const debugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
 
-    debugLogger.log('one', 2, true);
-    expect(logSpy).toHaveBeenCalledWith('one', 2, true);
+    debugLogger.log("one", 2, true);
+    expect(logSpy).toHaveBeenCalledWith("one", 2, true);
 
-    debugLogger.warn('one', 2, false);
-    expect(warnSpy).toHaveBeenCalledWith('one', 2, false);
+    debugLogger.warn("one", 2, false);
+    expect(warnSpy).toHaveBeenCalledWith("one", 2, false);
 
-    debugLogger.error('one', 2, null);
-    expect(errorSpy).toHaveBeenCalledWith('one', 2, null);
+    debugLogger.error("one", 2, null);
+    expect(errorSpy).toHaveBeenCalledWith("one", 2, null);
 
-    debugLogger.debug('one', 2, undefined);
-    expect(debugSpy).toHaveBeenCalledWith('one', 2, undefined);
+    debugLogger.debug("one", 2, undefined);
+    expect(debugSpy).toHaveBeenCalledWith("one", 2, undefined);
   });
 
-  it('should handle calls with no arguments', () => {
-    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+  it("should handle calls with no arguments", () => {
+    const logSpy = vi.spyOn(console, "log").mockImplementation(() => {});
+    const warnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
     debugLogger.log();
     expect(logSpy).toHaveBeenCalledWith();
diff --git a/packages/gemini-cli-core/src/utils/debugLogger.ts b/packages/gemini-cli-core/src/utils/debugLogger.ts
index 15ed154f9..ff7f93b3d 100644
--- a/packages/gemini-cli-core/src/utils/debugLogger.ts
+++ b/packages/gemini-cli-core/src/utils/debugLogger.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as util from 'node:util';
+import * as fs from "node:fs";
+import * as util from "node:util";
 
 /**
  * A simple, centralized logger for developer-facing debug messages.
@@ -23,15 +23,15 @@ class DebugLogger {
   private logStream: fs.WriteStream | undefined;
 
   constructor() {
-    this.logStream = process.env['GEMINI_DEBUG_LOG_FILE']
-      ? fs.createWriteStream(process.env['GEMINI_DEBUG_LOG_FILE'], {
-          flags: 'a',
+    this.logStream = process.env["GEMINI_DEBUG_LOG_FILE"]
+      ? fs.createWriteStream(process.env["GEMINI_DEBUG_LOG_FILE"], {
+          flags: "a",
         })
       : undefined;
     // Handle potential errors with the stream
-    this.logStream?.on('error', (err) => {
+    this.logStream?.on("error", (err) => {
       // Log to console as a fallback, but don't crash the app
-      console.error('Error writing to debug log stream:', err);
+      console.error("Error writing to debug log stream:", err);
     });
   }
 
@@ -45,22 +45,22 @@ class DebugLogger {
   }
 
   log(...args: unknown[]): void {
-    this.writeToFile('LOG', args);
+    this.writeToFile("LOG", args);
     console.log(...args);
   }
 
   warn(...args: unknown[]): void {
-    this.writeToFile('WARN', args);
+    this.writeToFile("WARN", args);
     console.warn(...args);
   }
 
   error(...args: unknown[]): void {
-    this.writeToFile('ERROR', args);
+    this.writeToFile("ERROR", args);
     console.error(...args);
   }
 
   debug(...args: unknown[]): void {
-    this.writeToFile('DEBUG', args);
+    this.writeToFile("DEBUG", args);
     console.debug(...args);
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/delay.test.ts b/packages/gemini-cli-core/src/utils/delay.test.ts
index 2f9a4d070..b1ce18699 100644
--- a/packages/gemini-cli-core/src/utils/delay.test.ts
+++ b/packages/gemini-cli-core/src/utils/delay.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest';
-import { delay } from './delay.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { delay } from "./delay.js";
 
-describe('abortableDelay', () => {
+describe("abortableDelay", () => {
   beforeEach(() => {
     vi.useFakeTimers();
   });
@@ -17,13 +17,13 @@ describe('abortableDelay', () => {
     vi.restoreAllMocks();
   });
 
-  it('resolves after the specified duration without a signal', async () => {
+  it("resolves after the specified duration without a signal", async () => {
     const promise = delay(100);
     await vi.advanceTimersByTimeAsync(100);
     await expect(promise).resolves.toBeUndefined();
   });
 
-  it('resolves when a non-aborted signal is provided', async () => {
+  it("resolves when a non-aborted signal is provided", async () => {
     const controller = new AbortController();
     const promise = delay(200, controller.signal);
 
@@ -32,17 +32,17 @@ describe('abortableDelay', () => {
     await expect(promise).resolves.toBeUndefined();
   });
 
-  it('rejects immediately if the signal is already aborted', async () => {
+  it("rejects immediately if the signal is already aborted", async () => {
     const controller = new AbortController();
     controller.abort();
 
     await expect(delay(50, controller.signal)).rejects.toMatchObject({
-      name: 'AbortError',
-      message: 'Aborted',
+      name: "AbortError",
+      message: "Aborted",
     });
   });
 
-  it('rejects if the signal aborts while waiting', async () => {
+  it("rejects if the signal aborts while waiting", async () => {
     const controller = new AbortController();
     const promise = delay(500, controller.signal);
 
@@ -50,20 +50,18 @@ describe('abortableDelay', () => {
     controller.abort();
 
     await expect(promise).rejects.toMatchObject({
-      name: 'AbortError',
-      message: 'Aborted',
+      name: "AbortError",
+      message: "Aborted",
     });
   });
 
-  it('cleans up signal listeners after resolving', async () => {
+  it("cleans up signal listeners after resolving", async () => {
     const removeEventListener = vi.fn();
     const mockSignal = {
       aborted: false,
-      addEventListener: vi
-        .fn()
-        .mockImplementation((_type: string, listener: () => void) => {
-          mockSignal.__listener = listener;
-        }),
+      addEventListener: vi.fn().mockImplementation((_type: string, listener: () => void) => {
+        mockSignal.__listener = listener;
+      }),
       removeEventListener,
       __listener: undefined as (() => void) | undefined,
     } as unknown as AbortSignal & { __listener?: () => void };
@@ -78,12 +76,9 @@ describe('abortableDelay', () => {
   });
 
   // Technically unnecessary due to `onceTrue` but good sanity check
-  it('cleans up signal listeners when aborted before completion', async () => {
+  it("cleans up signal listeners when aborted before completion", async () => {
     const controller = new AbortController();
-    const removeEventListenerSpy = vi.spyOn(
-      controller.signal,
-      'removeEventListener',
-    );
+    const removeEventListenerSpy = vi.spyOn(controller.signal, "removeEventListener");
 
     const promise = delay(400, controller.signal);
 
@@ -91,13 +86,13 @@ describe('abortableDelay', () => {
     controller.abort();
 
     await expect(promise).rejects.toMatchObject({
-      name: 'AbortError',
+      name: "AbortError",
     });
     expect(removeEventListenerSpy).toHaveBeenCalledTimes(1);
   });
 
-  it('cleans up timeout when aborted before completion', async () => {
-    const clearTimeoutSpy = vi.spyOn(global, 'clearTimeout');
+  it("cleans up timeout when aborted before completion", async () => {
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
     const controller = new AbortController();
     const promise = delay(400, controller.signal);
 
@@ -105,7 +100,7 @@ describe('abortableDelay', () => {
     controller.abort();
 
     await expect(promise).rejects.toMatchObject({
-      name: 'AbortError',
+      name: "AbortError",
     });
     expect(clearTimeoutSpy).toHaveBeenCalled();
   });
diff --git a/packages/gemini-cli-core/src/utils/delay.ts b/packages/gemini-cli-core/src/utils/delay.ts
index d48db4951..c8e0e0bda 100644
--- a/packages/gemini-cli-core/src/utils/delay.ts
+++ b/packages/gemini-cli-core/src/utils/delay.ts
@@ -8,8 +8,8 @@
  * Factory to create a standard abort error for delay helpers.
  */
 export function createAbortError(): Error {
-  const abortError = new Error('Aborted');
-  abortError.name = 'AbortError';
+  const abortError = new Error("Aborted");
+  abortError.name = "AbortError";
   return abortError;
 }
 
@@ -34,15 +34,15 @@ export function delay(ms: number, signal?: AbortSignal): Promise<void> {
   return new Promise((resolve, reject) => {
     const onAbort = () => {
       clearTimeout(timeoutId);
-      signal.removeEventListener('abort', onAbort);
+      signal.removeEventListener("abort", onAbort);
       reject(createAbortError());
     };
 
     const timeoutId = setTimeout(() => {
-      signal.removeEventListener('abort', onAbort);
+      signal.removeEventListener("abort", onAbort);
       resolve();
     }, ms);
 
-    signal.addEventListener('abort', onAbort, { once: true });
+    signal.addEventListener("abort", onAbort, { once: true });
   });
 }
diff --git a/packages/gemini-cli-core/src/utils/editCorrector.test.ts b/packages/gemini-cli-core/src/utils/editCorrector.test.ts
index 5d955e4e9..2ab615b45 100644
--- a/packages/gemini-cli-core/src/utils/editCorrector.test.ts
+++ b/packages/gemini-cli-core/src/utils/editCorrector.test.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, type Mocked } from 'vitest';
-import * as fs from 'node:fs';
-import { EDIT_TOOL_NAME } from '../tools/tool-names.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { EDIT_TOOL_NAME } from "../tools/tool-names.js";
 
 // MOCKS
 let callCount = 0;
@@ -19,7 +19,7 @@ let mockGenerateJson: any;
 let mockStartChat: any;
 let mockSendMessageStream: any;
 
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   statSync: vi.fn(),
   mkdirSync: vi.fn(),
   createWriteStream: vi.fn(() => ({
@@ -28,135 +28,116 @@ vi.mock('fs', () => ({
   })),
 }));
 
-vi.mock('../core/client.js', () => ({
-  GeminiClient: vi.fn().mockImplementation(function (
-    this: any,
-    _config: Config,
-  ) {
+vi.mock("../core/client.js", () => ({
+  GeminiClient: vi.fn().mockImplementation(function (this: any, _config: Config) {
     this.startChat = (...params: any[]) => mockStartChat(...params);
-    this.sendMessageStream = (...params: any[]) =>
-      mockSendMessageStream(...params);
+    this.sendMessageStream = (...params: any[]) => mockSendMessageStream(...params);
     return this;
   }),
 }));
+
 // END MOCKS
 
+import type { Config } from "../config/config.js";
+import { GeminiClient } from "../core/client.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
 import {
   countOccurrences,
   ensureCorrectEdit,
   ensureCorrectFileContent,
-  unescapeStringForGeminiBug,
   resetEditCorrectorCaches_TEST_ONLY,
-} from './editCorrector.js';
-import { GeminiClient } from '../core/client.js';
-import type { Config } from '../config/config.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
+  unescapeStringForGeminiBug,
+} from "./editCorrector.js";
 
-vi.mock('../tools/tool-registry.js');
+vi.mock("../tools/tool-registry.js");
 
-describe('editCorrector', () => {
-  describe('countOccurrences', () => {
-    it('should return 0 for empty string', () => {
-      expect(countOccurrences('', 'a')).toBe(0);
+describe("editCorrector", () => {
+  describe("countOccurrences", () => {
+    it("should return 0 for empty string", () => {
+      expect(countOccurrences("", "a")).toBe(0);
     });
-    it('should return 0 for empty substring', () => {
-      expect(countOccurrences('abc', '')).toBe(0);
+    it("should return 0 for empty substring", () => {
+      expect(countOccurrences("abc", "")).toBe(0);
     });
-    it('should return 0 if substring is not found', () => {
-      expect(countOccurrences('abc', 'd')).toBe(0);
+    it("should return 0 if substring is not found", () => {
+      expect(countOccurrences("abc", "d")).toBe(0);
     });
-    it('should return 1 if substring is found once', () => {
-      expect(countOccurrences('abc', 'b')).toBe(1);
+    it("should return 1 if substring is found once", () => {
+      expect(countOccurrences("abc", "b")).toBe(1);
     });
-    it('should return correct count for multiple occurrences', () => {
-      expect(countOccurrences('ababa', 'a')).toBe(3);
-      expect(countOccurrences('ababab', 'ab')).toBe(3);
+    it("should return correct count for multiple occurrences", () => {
+      expect(countOccurrences("ababa", "a")).toBe(3);
+      expect(countOccurrences("ababab", "ab")).toBe(3);
     });
-    it('should count non-overlapping occurrences', () => {
-      expect(countOccurrences('aaaaa', 'aa')).toBe(2);
-      expect(countOccurrences('ababab', 'aba')).toBe(1);
+    it("should count non-overlapping occurrences", () => {
+      expect(countOccurrences("aaaaa", "aa")).toBe(2);
+      expect(countOccurrences("ababab", "aba")).toBe(1);
     });
-    it('should correctly count occurrences when substring is longer', () => {
-      expect(countOccurrences('abc', 'abcdef')).toBe(0);
+    it("should correctly count occurrences when substring is longer", () => {
+      expect(countOccurrences("abc", "abcdef")).toBe(0);
     });
-    it('should be case-sensitive', () => {
-      expect(countOccurrences('abcABC', 'a')).toBe(1);
-      expect(countOccurrences('abcABC', 'A')).toBe(1);
+    it("should be case-sensitive", () => {
+      expect(countOccurrences("abcABC", "a")).toBe(1);
+      expect(countOccurrences("abcABC", "A")).toBe(1);
     });
   });
 
-  describe('unescapeStringForGeminiBug', () => {
-    it('should unescape common sequences', () => {
-      expect(unescapeStringForGeminiBug('\\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('\\t')).toBe('\t');
+  describe("unescapeStringForGeminiBug", () => {
+    it("should unescape common sequences", () => {
+      expect(unescapeStringForGeminiBug("\\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("\\t")).toBe("\t");
       expect(unescapeStringForGeminiBug("\\'")).toBe("'");
       expect(unescapeStringForGeminiBug('\\"')).toBe('"');
-      expect(unescapeStringForGeminiBug('\\`')).toBe('`');
+      expect(unescapeStringForGeminiBug("\\`")).toBe("`");
     });
-    it('should handle multiple escaped sequences', () => {
-      expect(unescapeStringForGeminiBug('Hello\\nWorld\\tTest')).toBe(
-        'Hello\nWorld\tTest',
-      );
+    it("should handle multiple escaped sequences", () => {
+      expect(unescapeStringForGeminiBug("Hello\\nWorld\\tTest")).toBe("Hello\nWorld\tTest");
     });
-    it('should not alter already correct sequences', () => {
-      expect(unescapeStringForGeminiBug('\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('Correct string')).toBe(
-        'Correct string',
-      );
+    it("should not alter already correct sequences", () => {
+      expect(unescapeStringForGeminiBug("\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("Correct string")).toBe("Correct string");
     });
-    it('should handle mixed correct and incorrect sequences', () => {
-      expect(unescapeStringForGeminiBug('\\nCorrect\t\\`')).toBe(
-        '\nCorrect\t`',
-      );
+    it("should handle mixed correct and incorrect sequences", () => {
+      expect(unescapeStringForGeminiBug("\\nCorrect\t\\`")).toBe("\nCorrect\t`");
     });
-    it('should handle backslash followed by actual newline character', () => {
-      expect(unescapeStringForGeminiBug('\\\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('First line\\\nSecond line')).toBe(
-        'First line\nSecond line',
+    it("should handle backslash followed by actual newline character", () => {
+      expect(unescapeStringForGeminiBug("\\\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("First line\\\nSecond line")).toBe(
+        "First line\nSecond line",
       );
     });
-    it('should handle multiple backslashes before an escapable character (aggressive unescaping)', () => {
-      expect(unescapeStringForGeminiBug('\\\\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('\\\\\\t')).toBe('\t');
-      expect(unescapeStringForGeminiBug('\\\\\\\\`')).toBe('`');
-    });
-    it('should return empty string for empty input', () => {
-      expect(unescapeStringForGeminiBug('')).toBe('');
+    it("should handle multiple backslashes before an escapable character (aggressive unescaping)", () => {
+      expect(unescapeStringForGeminiBug("\\\\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("\\\\\\t")).toBe("\t");
+      expect(unescapeStringForGeminiBug("\\\\\\\\`")).toBe("`");
     });
-    it('should not alter strings with no targeted escape sequences', () => {
-      expect(unescapeStringForGeminiBug('abc def')).toBe('abc def');
-      expect(unescapeStringForGeminiBug('C:\\Folder\\File')).toBe(
-        'C:\\Folder\\File',
-      );
+    it("should return empty string for empty input", () => {
+      expect(unescapeStringForGeminiBug("")).toBe("");
     });
-    it('should correctly process strings with some targeted escapes', () => {
-      expect(unescapeStringForGeminiBug('C:\\Users\\name')).toBe(
-        'C:\\Users\name',
-      );
+    it("should not alter strings with no targeted escape sequences", () => {
+      expect(unescapeStringForGeminiBug("abc def")).toBe("abc def");
+      expect(unescapeStringForGeminiBug("C:\\Folder\\File")).toBe("C:\\Folder\\File");
     });
-    it('should handle complex cases with mixed slashes and characters', () => {
-      expect(
-        unescapeStringForGeminiBug('\\\\\\\nLine1\\\nLine2\\tTab\\\\`Tick\\"'),
-      ).toBe('\nLine1\nLine2\tTab`Tick"');
+    it("should correctly process strings with some targeted escapes", () => {
+      expect(unescapeStringForGeminiBug("C:\\Users\\name")).toBe("C:\\Users\name");
     });
-    it('should handle escaped backslashes', () => {
-      expect(unescapeStringForGeminiBug('\\\\')).toBe('\\');
-      expect(unescapeStringForGeminiBug('C:\\\\Users')).toBe('C:\\Users');
-      expect(unescapeStringForGeminiBug('path\\\\to\\\\file')).toBe(
-        'path\to\\file',
+    it("should handle complex cases with mixed slashes and characters", () => {
+      expect(unescapeStringForGeminiBug('\\\\\\\nLine1\\\nLine2\\tTab\\\\`Tick\\"')).toBe(
+        '\nLine1\nLine2\tTab`Tick"',
       );
     });
-    it('should handle escaped backslashes mixed with other escapes (aggressive unescaping)', () => {
-      expect(unescapeStringForGeminiBug('line1\\\\\\nline2')).toBe(
-        'line1\nline2',
-      );
-      expect(unescapeStringForGeminiBug('quote\\\\"text\\\\nline')).toBe(
-        'quote"text\nline',
-      );
+    it("should handle escaped backslashes", () => {
+      expect(unescapeStringForGeminiBug("\\\\")).toBe("\\");
+      expect(unescapeStringForGeminiBug("C:\\\\Users")).toBe("C:\\Users");
+      expect(unescapeStringForGeminiBug("path\\\\to\\\\file")).toBe("path\to\\file");
+    });
+    it("should handle escaped backslashes mixed with other escapes (aggressive unescaping)", () => {
+      expect(unescapeStringForGeminiBug("line1\\\\\\nline2")).toBe("line1\nline2");
+      expect(unescapeStringForGeminiBug('quote\\\\"text\\\\nline')).toBe('quote"text\nline');
     });
   });
 
-  describe('ensureCorrectEdit', () => {
+  describe("ensureCorrectEdit", () => {
     let mockGeminiClientInstance: Mocked<GeminiClient>;
     let mockBaseLlmClientInstance: Mocked<BaseLlmClient>;
     let mockToolRegistry: Mocked<ToolRegistry>;
@@ -166,10 +147,10 @@ describe('editCorrector', () => {
     beforeEach(() => {
       mockToolRegistry = new ToolRegistry({} as Config) as Mocked<ToolRegistry>;
       const configParams = {
-        apiKey: 'test-api-key',
-        model: 'test-model',
+        apiKey: "test-api-key",
+        model: "test-model",
         sandbox: false as boolean | string,
-        targetDir: '/test',
+        targetDir: "/test",
         debugMode: false,
         question: undefined as string | undefined,
 
@@ -178,8 +159,8 @@ describe('editCorrector', () => {
         toolCallCommand: undefined as string | undefined,
         mcpServerCommand: undefined as string | undefined,
         mcpServers: undefined as Record<string, any> | undefined,
-        userAgent: 'test-agent',
-        userMemory: '',
+        userAgent: "test-agent",
+        userMemory: "",
         geminiMdFileCount: 0,
         alwaysSkipModificationConfirmation: false,
       };
@@ -219,31 +200,27 @@ describe('editCorrector', () => {
 
       callCount = 0;
       mockResponses.length = 0;
-      mockGenerateJson = vi
-        .fn()
-        .mockImplementation((_contents, _schema, signal) => {
-          // Check if the signal is aborted. If so, throw an error or return a specific response.
-          if (signal && signal.aborted) {
-            return Promise.reject(new Error('Aborted')); // Or some other specific error/response
-          }
-          const response = mockResponses[callCount];
-          callCount++;
-          if (response === undefined) return Promise.resolve({});
-          return Promise.resolve(response);
-        });
+      mockGenerateJson = vi.fn().mockImplementation((_contents, _schema, signal) => {
+        // Check if the signal is aborted. If so, throw an error or return a specific response.
+        if (signal && signal.aborted) {
+          return Promise.reject(new Error("Aborted")); // Or some other specific error/response
+        }
+        const response = mockResponses[callCount];
+        callCount++;
+        if (response === undefined) return Promise.resolve({});
+        return Promise.resolve(response);
+      });
       mockStartChat = vi.fn();
       mockSendMessageStream = vi.fn();
 
-      mockGeminiClientInstance = new GeminiClient(
-        mockConfigInstance,
-      ) as Mocked<GeminiClient>;
+      mockGeminiClientInstance = new GeminiClient(mockConfigInstance) as Mocked<GeminiClient>;
       mockGeminiClientInstance.getHistory = vi.fn().mockResolvedValue([]);
       mockBaseLlmClientInstance = {
         generateJson: mockGenerateJson,
         config: {
           generationConfigService: {
             getResolvedConfig: vi.fn().mockReturnValue({
-              model: 'edit-corrector',
+              model: "edit-corrector",
               generateContentConfig: {},
             }),
           },
@@ -252,19 +229,19 @@ describe('editCorrector', () => {
       resetEditCorrectorCaches_TEST_ONLY();
     });
 
-    describe('Scenario Group 1: originalParams.old_string matches currentContent directly', () => {
-      it('Test 1.1: old_string (no literal \\), new_string (escaped by Gemini) -> new_string unescaped', async () => {
-        const currentContent = 'This is a test string to find me.';
+    describe("Scenario Group 1: originalParams.old_string matches currentContent directly", () => {
+      it("Test 1.1: old_string (no literal \\), new_string (escaped by Gemini) -> new_string unescaped", async () => {
+        const currentContent = "This is a test string to find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
+          file_path: "/test/file.txt",
+          old_string: "find me",
           new_string: 'replace with \\"this\\"',
         };
         mockResponses.push({
           corrected_new_string_escaping: 'replace with "this"',
         });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -273,18 +250,18 @@ describe('editCorrector', () => {
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(1);
         expect(result.params.new_string).toBe('replace with "this"');
-        expect(result.params.old_string).toBe('find me');
+        expect(result.params.old_string).toBe("find me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 1.2: old_string (no literal \\), new_string (correctly formatted) -> new_string unchanged', async () => {
-        const currentContent = 'This is a test string to find me.';
+      it("Test 1.2: old_string (no literal \\), new_string (correctly formatted) -> new_string unchanged", async () => {
+        const currentContent = "This is a test string to find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
-          new_string: 'replace with this',
+          file_path: "/test/file.txt",
+          old_string: "find me",
+          new_string: "replace with this",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -292,22 +269,22 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with this');
-        expect(result.params.old_string).toBe('find me');
+        expect(result.params.new_string).toBe("replace with this");
+        expect(result.params.old_string).toBe("find me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 1.3: old_string (with literal \\), new_string (escaped by Gemini) -> new_string unchanged (still escaped)', async () => {
-        const currentContent = 'This is a test string to find\\me.';
+      it("Test 1.3: old_string (with literal \\), new_string (escaped by Gemini) -> new_string unchanged (still escaped)", async () => {
+        const currentContent = "This is a test string to find\\me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find\\me',
+          file_path: "/test/file.txt",
+          old_string: "find\\me",
           new_string: 'replace with \\"this\\"',
         };
         mockResponses.push({
           corrected_new_string_escaping: 'replace with "this"',
         });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -316,18 +293,18 @@ describe('editCorrector', () => {
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(1);
         expect(result.params.new_string).toBe('replace with "this"');
-        expect(result.params.old_string).toBe('find\\me');
+        expect(result.params.old_string).toBe("find\\me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 1.4: old_string (with literal \\), new_string (correctly formatted) -> new_string unchanged', async () => {
-        const currentContent = 'This is a test string to find\\me.';
+      it("Test 1.4: old_string (with literal \\), new_string (correctly formatted) -> new_string unchanged", async () => {
+        const currentContent = "This is a test string to find\\me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find\\me',
-          new_string: 'replace with this',
+          file_path: "/test/file.txt",
+          old_string: "find\\me",
+          new_string: "replace with this",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -335,23 +312,23 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with this');
-        expect(result.params.old_string).toBe('find\\me');
+        expect(result.params.new_string).toBe("replace with this");
+        expect(result.params.old_string).toBe("find\\me");
         expect(result.occurrences).toBe(1);
       });
     });
 
-    describe('Scenario Group 2: originalParams.old_string does NOT match, but unescapeStringForGeminiBug(originalParams.old_string) DOES match', () => {
-      it('Test 2.1: old_string (over-escaped, no intended literal \\), new_string (escaped by Gemini) -> new_string unescaped', async () => {
+    describe("Scenario Group 2: originalParams.old_string does NOT match, but unescapeStringForGeminiBug(originalParams.old_string) DOES match", () => {
+      it("Test 2.1: old_string (over-escaped, no intended literal \\), new_string (escaped by Gemini) -> new_string unescaped", async () => {
         const currentContent = 'This is a test string to find "me".';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'find \\"me\\"',
           new_string: 'replace with \\"this\\"',
         };
         mockResponses.push({ corrected_new_string: 'replace with "this"' });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -363,15 +340,15 @@ describe('editCorrector', () => {
         expect(result.params.old_string).toBe('find "me"');
         expect(result.occurrences).toBe(1);
       });
-      it('Test 2.2: old_string (over-escaped, no intended literal \\), new_string (correctly formatted) -> new_string unescaped (harmlessly)', async () => {
+      it("Test 2.2: old_string (over-escaped, no intended literal \\), new_string (correctly formatted) -> new_string unescaped (harmlessly)", async () => {
         const currentContent = 'This is a test string to find "me".';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'find \\"me\\"',
-          new_string: 'replace with this',
+          new_string: "replace with this",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -379,19 +356,19 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with this');
+        expect(result.params.new_string).toBe("replace with this");
         expect(result.params.old_string).toBe('find "me"');
         expect(result.occurrences).toBe(1);
       });
-      it('Test 2.3: old_string (over-escaped, with intended literal \\), new_string (simple) -> new_string corrected', async () => {
-        const currentContent = 'This is a test string to find \\me.';
+      it("Test 2.3: old_string (over-escaped, with intended literal \\), new_string (simple) -> new_string corrected", async () => {
+        const currentContent = "This is a test string to find \\me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find \\\\me',
-          new_string: 'replace with foobar',
+          file_path: "/test/file.txt",
+          old_string: "find \\\\me",
+          new_string: "replace with foobar",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -399,24 +376,24 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with foobar');
-        expect(result.params.old_string).toBe('find \\me');
+        expect(result.params.new_string).toBe("replace with foobar");
+        expect(result.params.old_string).toBe("find \\me");
         expect(result.occurrences).toBe(1);
       });
     });
 
-    describe('Scenario Group 3: LLM Correction Path', () => {
-      it('Test 3.1: old_string (no literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is double unescaped', async () => {
-        const currentContent = 'This is a test string to corrected find me.';
+    describe("Scenario Group 3: LLM Correction Path", () => {
+      it("Test 3.1: old_string (no literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is double unescaped", async () => {
+        const currentContent = "This is a test string to corrected find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
+          file_path: "/test/file.txt",
+          old_string: "find me",
           new_string: 'replace with \\\\"this\\\\"',
         };
         const llmNewString = 'LLM says replace with "that"';
         mockResponses.push({ corrected_new_string_escaping: llmNewString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -425,22 +402,22 @@ describe('editCorrector', () => {
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(1);
         expect(result.params.new_string).toBe(llmNewString);
-        expect(result.params.old_string).toBe('find me');
+        expect(result.params.old_string).toBe("find me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 3.2: old_string (with literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is unescaped once', async () => {
-        const currentContent = 'This is a test string to corrected find me.';
+      it("Test 3.2: old_string (with literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is unescaped once", async () => {
+        const currentContent = "This is a test string to corrected find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find\\me',
+          file_path: "/test/file.txt",
+          old_string: "find\\me",
           new_string: 'replace with \\\\"this\\\\"',
         };
-        const llmCorrectedOldString = 'corrected find me';
+        const llmCorrectedOldString = "corrected find me";
         const llmNewString = 'LLM says replace with "that"';
         mockResponses.push({ corrected_target_snippet: llmCorrectedOldString });
         mockResponses.push({ corrected_new_string: llmNewString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -452,17 +429,17 @@ describe('editCorrector', () => {
         expect(result.params.old_string).toBe(llmCorrectedOldString);
         expect(result.occurrences).toBe(1);
       });
-      it('Test 3.3: old_string needs LLM, new_string is fine -> old_string corrected, new_string original', async () => {
-        const currentContent = 'This is a test string to be corrected.';
+      it("Test 3.3: old_string needs LLM, new_string is fine -> old_string corrected, new_string original", async () => {
+        const currentContent = "This is a test string to be corrected.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'fiiind me',
+          file_path: "/test/file.txt",
+          old_string: "fiiind me",
           new_string: 'replace with "this"',
         };
-        const llmCorrectedOldString = 'to be corrected';
+        const llmCorrectedOldString = "to be corrected";
         mockResponses.push({ corrected_target_snippet: llmCorrectedOldString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -474,11 +451,11 @@ describe('editCorrector', () => {
         expect(result.params.old_string).toBe(llmCorrectedOldString);
         expect(result.occurrences).toBe(1);
       });
-      it('Test 3.4: LLM correction path, correctNewString returns the originalNewString it was passed (which was unescaped) -> final new_string is unescaped', async () => {
-        const currentContent = 'This is a test string to corrected find me.';
+      it("Test 3.4: LLM correction path, correctNewString returns the originalNewString it was passed (which was unescaped) -> final new_string is unescaped", async () => {
+        const currentContent = "This is a test string to corrected find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
+          file_path: "/test/file.txt",
+          old_string: "find me",
           new_string: 'replace with \\\\"this\\\\"',
         };
         const newStringForLLMAndReturnedByLLM = 'replace with "this"';
@@ -486,7 +463,7 @@ describe('editCorrector', () => {
           corrected_new_string_escaping: newStringForLLMAndReturnedByLLM,
         });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -499,17 +476,17 @@ describe('editCorrector', () => {
       });
     });
 
-    describe('Scenario Group 4: No Match Found / Multiple Matches', () => {
-      it('Test 4.1: No version of old_string (original, unescaped, LLM-corrected) matches -> returns original params, 0 occurrences', async () => {
-        const currentContent = 'This content has nothing to find.';
+    describe("Scenario Group 4: No Match Found / Multiple Matches", () => {
+      it("Test 4.1: No version of old_string (original, unescaped, LLM-corrected) matches -> returns original params, 0 occurrences", async () => {
+        const currentContent = "This content has nothing to find.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'nonexistent string',
-          new_string: 'some new string',
+          file_path: "/test/file.txt",
+          old_string: "nonexistent string",
+          new_string: "some new string",
         };
-        mockResponses.push({ corrected_target_snippet: 'still nonexistent' });
+        mockResponses.push({ corrected_target_snippet: "still nonexistent" });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -520,16 +497,15 @@ describe('editCorrector', () => {
         expect(result.params).toEqual(originalParams);
         expect(result.occurrences).toBe(0);
       });
-      it('Test 4.2: unescapedOldStringAttempt results in >1 occurrences -> returns original params, count occurrences', async () => {
-        const currentContent =
-          'This content has find "me" and also find "me" again.';
+      it("Test 4.2: unescapedOldStringAttempt results in >1 occurrences -> returns original params, count occurrences", async () => {
+        const currentContent = 'This content has find "me" and also find "me" again.';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'find "me"',
-          new_string: 'some new string',
+          new_string: "some new string",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -542,11 +518,11 @@ describe('editCorrector', () => {
       });
     });
 
-    describe('Scenario Group 5: Specific unescapeStringForGeminiBug checks (integrated into ensureCorrectEdit)', () => {
-      it('Test 5.1: old_string needs LLM to become currentContent, new_string also needs correction', async () => {
+    describe("Scenario Group 5: Specific unescapeStringForGeminiBug checks (integrated into ensureCorrectEdit)", () => {
+      it("Test 5.1: old_string needs LLM to become currentContent, new_string also needs correction", async () => {
         const currentContent = 'const x = "a\nbc\\"def\\"';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'const x = \\"a\\nbc\\\\"def\\\\"',
           new_string: 'const y = \\"new\\nval\\\\"content\\\\"',
         };
@@ -554,7 +530,7 @@ describe('editCorrector', () => {
         mockResponses.push({ corrected_target_snippet: currentContent });
         mockResponses.push({ corrected_new_string: expectedFinalNewString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -568,29 +544,28 @@ describe('editCorrector', () => {
       });
     });
 
-    describe('Scenario Group 6: Concurrent Edits', () => {
-      it('Test 6.1: should return early if file was modified by another process', async () => {
-        const filePath = '/test/file.txt';
-        const currentContent =
-          'This content has been modified by someone else.';
+    describe("Scenario Group 6: Concurrent Edits", () => {
+      it("Test 6.1: should return early if file was modified by another process", async () => {
+        const filePath = "/test/file.txt";
+        const currentContent = "This content has been modified by someone else.";
         const originalParams = {
           file_path: filePath,
-          old_string: 'nonexistent string',
-          new_string: 'some new string',
+          old_string: "nonexistent string",
+          new_string: "some new string",
         };
 
         const now = Date.now();
         const lastEditTime = now - 5000; // 5 seconds ago
 
         // Mock the file's modification time to be recent
-        vi.spyOn(fs, 'statSync').mockReturnValue({
+        vi.spyOn(fs, "statSync").mockReturnValue({
           mtimeMs: now,
         } as fs.Stats);
 
         // Mock the last edit timestamp from our history to be in the past
         const history = [
           {
-            role: 'model',
+            role: "model",
             parts: [
               {
                 functionResponse: {
@@ -606,9 +581,7 @@ describe('editCorrector', () => {
             ],
           },
         ];
-        (mockGeminiClientInstance.getHistory as Mock).mockResolvedValue(
-          history,
-        );
+        (mockGeminiClientInstance.getHistory as Mock).mockResolvedValue(history);
 
         const result = await ensureCorrectEdit(
           filePath,
@@ -625,31 +598,29 @@ describe('editCorrector', () => {
     });
   });
 
-  describe('ensureCorrectFileContent', () => {
+  describe("ensureCorrectFileContent", () => {
     let mockBaseLlmClientInstance: Mocked<BaseLlmClient>;
     const abortSignal = new AbortController().signal;
 
     beforeEach(() => {
       callCount = 0;
       mockResponses.length = 0;
-      mockGenerateJson = vi
-        .fn()
-        .mockImplementation((_contents, _schema, signal) => {
-          if (signal && signal.aborted) {
-            return Promise.reject(new Error('Aborted'));
-          }
-          const response = mockResponses[callCount];
-          callCount++;
-          if (response === undefined) return Promise.resolve({});
-          return Promise.resolve(response);
-        });
+      mockGenerateJson = vi.fn().mockImplementation((_contents, _schema, signal) => {
+        if (signal && signal.aborted) {
+          return Promise.reject(new Error("Aborted"));
+        }
+        const response = mockResponses[callCount];
+        callCount++;
+        if (response === undefined) return Promise.resolve({});
+        return Promise.resolve(response);
+      });
 
       mockBaseLlmClientInstance = {
         generateJson: mockGenerateJson,
         config: {
           generationConfigService: {
             getResolvedConfig: vi.fn().mockReturnValue({
-              model: 'edit-corrector',
+              model: "edit-corrector",
               generateContentConfig: {},
             }),
           },
@@ -658,8 +629,8 @@ describe('editCorrector', () => {
       resetEditCorrectorCaches_TEST_ONLY();
     });
 
-    it('should return content unchanged if no escaping issues detected', async () => {
-      const content = 'This is normal content without escaping issues';
+    it("should return content unchanged if no escaping issues detected", async () => {
+      const content = "This is normal content without escaping issues";
       const result = await ensureCorrectFileContent(
         content,
         mockBaseLlmClientInstance,
@@ -669,7 +640,7 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(0);
     });
 
-    it('should call correctStringEscaping for potentially escaped content', async () => {
+    it("should call correctStringEscaping for potentially escaped content", async () => {
       const content = 'console.log(\\"Hello World\\");';
       const correctedContent = 'console.log("Hello World");';
       mockResponses.push({
@@ -686,7 +657,7 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle correctStringEscaping returning corrected content via correct property name', async () => {
+    it("should handle correctStringEscaping returning corrected content via correct property name", async () => {
       // This test specifically verifies the property name fix
       const content = 'const message = \\"Hello\\nWorld\\";';
       const correctedContent = 'const message = "Hello\nWorld";';
@@ -706,7 +677,7 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     });
 
-    it('should return original content if LLM correction fails', async () => {
+    it("should return original content if LLM correction fails", async () => {
       const content = 'console.log(\\"Hello World\\");';
       // Mock empty response to simulate LLM failure
       mockResponses.push({});
@@ -721,11 +692,9 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle various escape sequences that need correction', async () => {
-      const content =
-        'const obj = { name: \\"John\\", age: 30, bio: \\"Developer\\nEngineer\\" };';
-      const correctedContent =
-        'const obj = { name: "John", age: 30, bio: "Developer\nEngineer" };';
+    it("should handle various escape sequences that need correction", async () => {
+      const content = 'const obj = { name: \\"John\\", age: 30, bio: \\"Developer\\nEngineer\\" };';
+      const correctedContent = 'const obj = { name: "John", age: 30, bio: "Developer\nEngineer" };';
 
       mockResponses.push({
         corrected_string_escaping: correctedContent,
diff --git a/packages/gemini-cli-core/src/utils/editCorrector.ts b/packages/gemini-cli-core/src/utils/editCorrector.ts
index 46a374ec1..1047b79ae 100644
--- a/packages/gemini-cli-core/src/utils/editCorrector.ts
+++ b/packages/gemini-cli-core/src/utils/editCorrector.ts
@@ -4,24 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import type { GeminiClient } from '../core/client.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { EditToolParams } from '../tools/edit.js';
+import * as fs from "node:fs";
+import type { Content } from "@google/genai";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { GeminiClient } from "../core/client.js";
+import type { EditToolParams } from "../tools/edit.js";
 import {
   EDIT_TOOL_NAME,
   GREP_TOOL_NAME,
   READ_FILE_TOOL_NAME,
   READ_MANY_FILES_TOOL_NAME,
   WRITE_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { LruCache } from './LruCache.js';
-import {
-  isFunctionResponse,
-  isFunctionCall,
-} from '../utils/messageInspectors.js';
-import * as fs from 'node:fs';
-import { promptIdContext } from './promptIdContext.js';
+} from "../tools/tool-names.js";
+import { isFunctionCall, isFunctionResponse } from "../utils/messageInspectors.js";
+import { LruCache } from "./LruCache.js";
+import { promptIdContext } from "./promptIdContext.js";
 
 const CODE_CORRECTION_SYSTEM_PROMPT = `
 You are an expert code-editing assistant. Your task is to analyze a failed edit attempt and provide a corrected version of the text snippets.
@@ -38,9 +35,7 @@ function getPromptId(): string {
 const MAX_CACHE_SIZE = 50;
 
 // Cache for ensureCorrectEdit results
-const editCorrectionCache = new LruCache<string, CorrectedEditResult>(
-  MAX_CACHE_SIZE,
-);
+const editCorrectionCache = new LruCache<string, CorrectedEditResult>(MAX_CACHE_SIZE);
 
 // Cache for ensureCorrectFileContent results
 const fileContentCorrectionCache = new LruCache<string, string>(MAX_CACHE_SIZE);
@@ -69,7 +64,7 @@ export interface CorrectedEditResult {
  * @returns -1 if the timestamp could not be extracted, else the timestamp (as a number)
  */
 function getTimestampFromFunctionId(fcnId: string): number {
-  const idParts = fcnId.split('-');
+  const idParts = fcnId.split("-");
   if (idParts.length > 2) {
     const timestamp = parseInt(idParts[1], 10);
     if (!isNaN(timestamp)) {
@@ -86,10 +81,7 @@ function getTimestampFromFunctionId(fcnId: string): number {
  * @param client the geminiClient, so that we can get the history
  * @returns a DateTime (as a number) of when the last edit occurred, or -1 if no edit was found.
  */
-async function findLastEditTimestamp(
-  filePath: string,
-  client: GeminiClient,
-): Promise<number> {
+async function findLastEditTimestamp(filePath: string, client: GeminiClient): Promise<number> {
   const history = (await client.getHistory()) ?? [];
 
   // Tools that may reference the file path in their FunctionResponse `output`.
@@ -126,9 +118,9 @@ async function findLastEditTimestamp(
         toolsInResp.has(part.functionResponse.name)
       ) {
         const { response } = part.functionResponse;
-        if (response && !('error' in response) && 'output' in response) {
+        if (response && !("error" in response) && "output" in response) {
           id = part.functionResponse.id;
-          content = response['output'];
+          content = response["output"];
         }
       }
 
@@ -140,8 +132,8 @@ async function findLastEditTimestamp(
       // as the best guess to if error/failed occurred with the response.
       const stringified = JSON.stringify(content);
       if (
-        !stringified.includes('Error') && // only applicable for functionResponse
-        !stringified.includes('Failed') && // only applicable for functionResponse
+        !stringified.includes("Error") && // only applicable for functionResponse
+        !stringified.includes("Failed") && // only applicable for functionResponse
         stringified.includes(filePath)
       ) {
         return getTimestampFromFunctionId(id);
@@ -179,8 +171,7 @@ export async function ensureCorrectEdit(
 
   let finalNewString = originalParams.new_string;
   const newStringPotentiallyEscaped =
-    unescapeStringForGeminiBug(originalParams.new_string) !==
-    originalParams.new_string;
+    unescapeStringForGeminiBug(originalParams.new_string) !== originalParams.new_string;
 
   const expectedReplacements = originalParams.expected_replacements ?? 1;
 
@@ -228,9 +219,7 @@ export async function ensureCorrectEdit(
     return result;
   } else {
     // occurrences is 0 or some other unexpected state initially
-    const unescapedOldStringAttempt = unescapeStringForGeminiBug(
-      originalParams.old_string,
-    );
+    const unescapedOldStringAttempt = unescapeStringForGeminiBug(originalParams.old_string);
     occurrences = countOccurrences(currentContent, unescapedOldStringAttempt);
 
     if (occurrences === expectedReplacements) {
@@ -249,10 +238,7 @@ export async function ensureCorrectEdit(
         // In order to keep from clobbering edits made outside our system,
         // let's check if there was a more recent edit to the file than what
         // our system has done
-        const lastEditedByUsTime = await findLastEditTimestamp(
-          filePath,
-          geminiClient,
-        );
+        const lastEditedByUsTime = await findLastEditTimestamp(filePath, geminiClient);
 
         // Add a 1-second buffer to account for timing inaccuracies. If the file
         // was modified more than a second after the last edit tool was run, we
@@ -279,10 +265,7 @@ export async function ensureCorrectEdit(
         unescapedOldStringAttempt,
         abortSignal,
       );
-      const llmOldOccurrences = countOccurrences(
-        currentContent,
-        llmCorrectedOldString,
-      );
+      const llmOldOccurrences = countOccurrences(currentContent, llmCorrectedOldString);
 
       if (llmOldOccurrences === expectedReplacements) {
         finalOldString = llmCorrectedOldString;
@@ -352,33 +335,28 @@ export async function ensureCorrectFileContent(
     return cachedResult;
   }
 
-  const contentPotentiallyEscaped =
-    unescapeStringForGeminiBug(content) !== content;
+  const contentPotentiallyEscaped = unescapeStringForGeminiBug(content) !== content;
   if (!contentPotentiallyEscaped) {
     fileContentCorrectionCache.set(content, content);
     return content;
   }
 
-  const correctedContent = await correctStringEscaping(
-    content,
-    baseLlmClient,
-    abortSignal,
-  );
+  const correctedContent = await correctStringEscaping(content, baseLlmClient, abortSignal);
   fileContentCorrectionCache.set(content, correctedContent);
   return correctedContent;
 }
 
 // Define the expected JSON schema for the LLM response for old_string correction
 const OLD_STRING_CORRECTION_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_target_snippet: {
-      type: 'string',
+      type: "string",
       description:
-        'The corrected version of the target snippet that exactly and uniquely matches a segment within the provided file content.',
+        "The corrected version of the target snippet that exactly and uniquely matches a segment within the provided file content.",
     },
   },
-  required: ['corrected_target_snippet'],
+  required: ["corrected_target_snippet"],
 };
 
 export async function correctOldStringMismatch(
@@ -402,17 +380,17 @@ File Content:
 ${fileContent}
 \`\`\`
 
-For example, if the problematic target snippet was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and the file content had content that looked like "\nconst greeting = \`Hello ${'\\`'}\${name}${'\\`'}\`;", then corrected_target_snippet should likely be "\nconst greeting = \`Hello ${'\\`'}\${name}${'\\`'}\`;" to fix the incorrect escaping to match the original file content.
+For example, if the problematic target snippet was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and the file content had content that looked like "\nconst greeting = \`Hello ${"\\`"}\${name}${"\\`"}\`;", then corrected_target_snippet should likely be "\nconst greeting = \`Hello ${"\\`"}\${name}${"\\`"}\`;" to fix the incorrect escaping to match the original file content.
 If the differences are only in whitespace or formatting, apply similar whitespace/formatting changes to the corrected_target_snippet.
 
 Return ONLY the corrected target snippet in the specified JSON format with the key 'corrected_target_snippet'. If no clear, unique match can be found, return an empty string for 'corrected_target_snippet'.
 `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: OLD_STRING_CORRECTION_SCHEMA,
       abortSignal,
@@ -422,10 +400,10 @@ Return ONLY the corrected target snippet in the specified JSON format with the k
 
     if (
       result &&
-      typeof result['corrected_target_snippet'] === 'string' &&
-      result['corrected_target_snippet'].length > 0
+      typeof result["corrected_target_snippet"] === "string" &&
+      result["corrected_target_snippet"].length > 0
     ) {
-      return result['corrected_target_snippet'];
+      return result["corrected_target_snippet"];
     } else {
       return problematicSnippet;
     }
@@ -434,10 +412,7 @@ Return ONLY the corrected target snippet in the specified JSON format with the k
       throw error;
     }
 
-    console.error(
-      'Error during LLM call for old string snippet correction:',
-      error,
-    );
+    console.error("Error during LLM call for old string snippet correction:", error);
 
     return problematicSnippet;
   }
@@ -445,15 +420,15 @@ Return ONLY the corrected target snippet in the specified JSON format with the k
 
 // Define the expected JSON schema for the new_string correction LLM response
 const NEW_STRING_CORRECTION_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_new_string: {
-      type: 'string',
+      type: "string",
       description:
-        'The original_new_string adjusted to be a suitable replacement for the corrected_old_string, while maintaining the original intent of the change.',
+        "The original_new_string adjusted to be a suitable replacement for the corrected_old_string, while maintaining the original intent of the change.",
     },
   },
-  required: ['corrected_new_string'],
+  required: ["corrected_new_string"],
 };
 
 /**
@@ -491,17 +466,17 @@ ${originalNewString}
 
 Task: Based on the differences between original_old_string and corrected_old_string, and the content of original_new_string, generate a corrected_new_string. This corrected_new_string should be what original_new_string would have been if it was designed to replace corrected_old_string directly, while maintaining the spirit of the original transformation.
 
-For example, if original_old_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and corrected_old_string is "\nconst greeting = \`Hello ${'\\`'}\${name}${'\\`'}\`;", and original_new_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name} \${lastName}\\\\\`\`;", then corrected_new_string should likely be "\nconst greeting = \`Hello ${'\\`'}\${name} \${lastName}${'\\`'}\`;" to fix the incorrect escaping.
+For example, if original_old_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and corrected_old_string is "\nconst greeting = \`Hello ${"\\`"}\${name}${"\\`"}\`;", and original_new_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name} \${lastName}\\\\\`\`;", then corrected_new_string should likely be "\nconst greeting = \`Hello ${"\\`"}\${name} \${lastName}${"\\`"}\`;" to fix the incorrect escaping.
 If the differences are only in whitespace or formatting, apply similar whitespace/formatting changes to the corrected_new_string.
 
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string'. If no adjustment is deemed necessary or possible, return the original_new_string.
   `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: NEW_STRING_CORRECTION_SCHEMA,
       abortSignal,
@@ -511,10 +486,10 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
 
     if (
       result &&
-      typeof result['corrected_new_string'] === 'string' &&
-      result['corrected_new_string'].length > 0
+      typeof result["corrected_new_string"] === "string" &&
+      result["corrected_new_string"].length > 0
     ) {
-      return result['corrected_new_string'];
+      return result["corrected_new_string"];
     } else {
       return originalNewString;
     }
@@ -523,21 +498,21 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
       throw error;
     }
 
-    console.error('Error during LLM call for new_string correction:', error);
+    console.error("Error during LLM call for new_string correction:", error);
     return originalNewString;
   }
 }
 
 const CORRECT_NEW_STRING_ESCAPING_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_new_string_escaping: {
-      type: 'string',
+      type: "string",
       description:
-        'The new_string with corrected escaping, ensuring it is a proper replacement for the old_string, especially considering potential over-escaping issues from previous LLM generations.',
+        "The new_string with corrected escaping, ensuring it is a proper replacement for the old_string, especially considering potential over-escaping issues from previous LLM generations.",
     },
   },
-  required: ['corrected_new_string_escaping'],
+  required: ["corrected_new_string_escaping"],
 };
 
 export async function correctNewStringEscaping(
@@ -567,11 +542,11 @@ If potentially_problematic_new_string is console.log(\\"Hello World\\"), it shou
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_new_string.
   `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: CORRECT_NEW_STRING_ESCAPING_SCHEMA,
       abortSignal,
@@ -581,10 +556,10 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
 
     if (
       result &&
-      typeof result['corrected_new_string_escaping'] === 'string' &&
-      result['corrected_new_string_escaping'].length > 0
+      typeof result["corrected_new_string_escaping"] === "string" &&
+      result["corrected_new_string_escaping"].length > 0
     ) {
-      return result['corrected_new_string_escaping'];
+      return result["corrected_new_string_escaping"];
     } else {
       return potentiallyProblematicNewString;
     }
@@ -593,24 +568,21 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
       throw error;
     }
 
-    console.error(
-      'Error during LLM call for new_string escaping correction:',
-      error,
-    );
+    console.error("Error during LLM call for new_string escaping correction:", error);
     return potentiallyProblematicNewString;
   }
 }
 
 const CORRECT_STRING_ESCAPING_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_string_escaping: {
-      type: 'string',
+      type: "string",
       description:
-        'The string with corrected escaping, ensuring it is valid, specially considering potential over-escaping issues from previous LLM generations.',
+        "The string with corrected escaping, ensuring it is valid, specially considering potential over-escaping issues from previous LLM generations.",
     },
   },
-  required: ['corrected_string_escaping'],
+  required: ["corrected_string_escaping"],
 };
 
 export async function correctStringEscaping(
@@ -634,11 +606,11 @@ If potentially_problematic_string is console.log(\\"Hello World\\"), it should b
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_string.
   `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: CORRECT_STRING_ESCAPING_SCHEMA,
       abortSignal,
@@ -648,10 +620,10 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
 
     if (
       result &&
-      typeof result['corrected_string_escaping'] === 'string' &&
-      result['corrected_string_escaping'].length > 0
+      typeof result["corrected_string_escaping"] === "string" &&
+      result["corrected_string_escaping"].length > 0
     ) {
-      return result['corrected_string_escaping'];
+      return result["corrected_string_escaping"];
     } else {
       return potentiallyProblematicString;
     }
@@ -660,10 +632,7 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
       throw error;
     }
 
-    console.error(
-      'Error during LLM call for string escaping correction:',
-      error,
-    );
+    console.error("Error during LLM call for string escaping correction:", error);
     return potentiallyProblematicString;
   }
 }
@@ -676,10 +645,7 @@ function trimPairIfPossible(
 ) {
   const trimmedTargetString = target.trim();
   if (target.length !== trimmedTargetString.length) {
-    const trimmedTargetOccurrences = countOccurrences(
-      currentContent,
-      trimmedTargetString,
-    );
+    const trimmedTargetOccurrences = countOccurrences(currentContent, trimmedTargetString);
 
     if (trimmedTargetOccurrences === expectedReplacements) {
       const trimmedReactiveString = trimIfTargetTrims.trim();
@@ -710,43 +676,40 @@ export function unescapeStringForGeminiBug(inputString: string): string {
   //        string might have something like "\\\n" (a literal backslash followed by a newline).
   // g : Global flag, to replace all occurrences.
 
-  return inputString.replace(
-    /\\+(n|t|r|'|"|`|\\|\n)/g,
-    (match, capturedChar) => {
-      // 'match' is the entire erroneous sequence, e.g., if the input (in memory) was "\\\\`", match is "\\\\`".
-      // 'capturedChar' is the character that determines the true meaning, e.g., '`'.
-
-      switch (capturedChar) {
-        case 'n':
-          return '\n'; // Correctly escaped: \n (newline character)
-        case 't':
-          return '\t'; // Correctly escaped: \t (tab character)
-        case 'r':
-          return '\r'; // Correctly escaped: \r (carriage return character)
-        case "'":
-          return "'"; // Correctly escaped: ' (apostrophe character)
-        case '"':
-          return '"'; // Correctly escaped: " (quotation mark character)
-        case '`':
-          return '`'; // Correctly escaped: ` (backtick character)
-        case '\\': // This handles when 'capturedChar' is a literal backslash
-          return '\\'; // Replace escaped backslash (e.g., "\\\\") with single backslash
-        case '\n': // This handles when 'capturedChar' is an actual newline
-          return '\n'; // Replace the whole erroneous sequence (e.g., "\\\n" in memory) with a clean newline
-        default:
-          // This fallback should ideally not be reached if the regex captures correctly.
-          // It would return the original matched sequence if an unexpected character was captured.
-          return match;
-      }
-    },
-  );
+  return inputString.replace(/\\+(n|t|r|'|"|`|\\|\n)/g, (match, capturedChar) => {
+    // 'match' is the entire erroneous sequence, e.g., if the input (in memory) was "\\\\`", match is "\\\\`".
+    // 'capturedChar' is the character that determines the true meaning, e.g., '`'.
+
+    switch (capturedChar) {
+      case "n":
+        return "\n"; // Correctly escaped: \n (newline character)
+      case "t":
+        return "\t"; // Correctly escaped: \t (tab character)
+      case "r":
+        return "\r"; // Correctly escaped: \r (carriage return character)
+      case "'":
+        return "'"; // Correctly escaped: ' (apostrophe character)
+      case '"':
+        return '"'; // Correctly escaped: " (quotation mark character)
+      case "`":
+        return "`"; // Correctly escaped: ` (backtick character)
+      case "\\": // This handles when 'capturedChar' is a literal backslash
+        return "\\"; // Replace escaped backslash (e.g., "\\\\") with single backslash
+      case "\n": // This handles when 'capturedChar' is an actual newline
+        return "\n"; // Replace the whole erroneous sequence (e.g., "\\\n" in memory) with a clean newline
+      default:
+        // This fallback should ideally not be reached if the regex captures correctly.
+        // It would return the original matched sequence if an unexpected character was captured.
+        return match;
+    }
+  });
 }
 
 /**
  * Counts occurrences of a substring in a string
  */
 export function countOccurrences(str: string, substr: string): number {
-  if (substr === '') {
+  if (substr === "") {
     return 0;
   }
   let count = 0;
diff --git a/packages/gemini-cli-core/src/utils/editor.test.ts b/packages/gemini-cli-core/src/utils/editor.test.ts
index 52520ee71..511c5970e 100644
--- a/packages/gemini-cli-core/src/utils/editor.test.ts
+++ b/packages/gemini-cli-core/src/utils/editor.test.ts
@@ -4,27 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { execSync, spawn, spawnSync } from "node:child_process";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
 import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import {
+  allowEditorTypeInSandbox,
   checkHasEditorType,
+  type EditorType,
   getDiffCommand,
-  openDiff,
-  allowEditorTypeInSandbox,
   isEditorAvailable,
-  type EditorType,
-} from './editor.js';
-import { execSync, spawn, spawnSync } from 'node:child_process';
-import { debugLogger } from './debugLogger.js';
+  openDiff,
+} from "./editor.js";
 
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   execSync: vi.fn(),
   spawn: vi.fn(),
   spawnSync: vi.fn(() => ({ error: null, status: 0 })),
@@ -32,11 +24,11 @@ vi.mock('child_process', () => ({
 
 const originalPlatform = process.platform;
 
-describe('editor utils', () => {
+describe("editor utils", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.unstubAllEnvs();
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
       writable: true,
     });
@@ -45,38 +37,38 @@ describe('editor utils', () => {
   afterEach(() => {
     vi.restoreAllMocks();
     vi.unstubAllEnvs();
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
       writable: true,
     });
   });
 
-  describe('checkHasEditorType', () => {
+  describe("checkHasEditorType", () => {
     const testCases: Array<{
       editor: EditorType;
       commands: string[];
       win32Commands: string[];
     }> = [
-      { editor: 'vscode', commands: ['code'], win32Commands: ['code.cmd'] },
+      { editor: "vscode", commands: ["code"], win32Commands: ["code.cmd"] },
       {
-        editor: 'vscodium',
-        commands: ['codium'],
-        win32Commands: ['codium.cmd'],
+        editor: "vscodium",
+        commands: ["codium"],
+        win32Commands: ["codium.cmd"],
       },
       {
-        editor: 'windsurf',
-        commands: ['windsurf'],
-        win32Commands: ['windsurf'],
+        editor: "windsurf",
+        commands: ["windsurf"],
+        win32Commands: ["windsurf"],
       },
-      { editor: 'cursor', commands: ['cursor'], win32Commands: ['cursor'] },
-      { editor: 'vim', commands: ['vim'], win32Commands: ['vim'] },
-      { editor: 'neovim', commands: ['nvim'], win32Commands: ['nvim'] },
-      { editor: 'zed', commands: ['zed', 'zeditor'], win32Commands: ['zed'] },
-      { editor: 'emacs', commands: ['emacs'], win32Commands: ['emacs.exe'] },
+      { editor: "cursor", commands: ["cursor"], win32Commands: ["cursor"] },
+      { editor: "vim", commands: ["vim"], win32Commands: ["vim"] },
+      { editor: "neovim", commands: ["nvim"], win32Commands: ["nvim"] },
+      { editor: "zed", commands: ["zed", "zeditor"], win32Commands: ["zed"] },
+      { editor: "emacs", commands: ["emacs"], win32Commands: ["emacs.exe"] },
       {
-        editor: 'antigravity',
-        commands: ['agy'],
-        win32Commands: ['agy.cmd'],
+        editor: "antigravity",
+        commands: ["agy"],
+        win32Commands: ["agy.cmd"],
       },
     ];
 
@@ -84,19 +76,17 @@ describe('editor utils', () => {
       describe(`${editor}`, () => {
         // Non-windows tests
         it(`should return true if first command "${commands[0]}" exists on non-windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'linux' });
-          (execSync as Mock).mockReturnValue(
-            Buffer.from(`/usr/bin/${commands[0]}`),
-          );
+          Object.defineProperty(process, "platform", { value: "linux" });
+          (execSync as Mock).mockReturnValue(Buffer.from(`/usr/bin/${commands[0]}`));
           expect(checkHasEditorType(editor)).toBe(true);
           expect(execSync).toHaveBeenCalledWith(`command -v ${commands[0]}`, {
-            stdio: 'ignore',
+            stdio: "ignore",
           });
         });
 
         if (commands.length > 1) {
           it(`should return true if first command doesn't exist but second command "${commands[1]}" exists on non-windows`, () => {
-            Object.defineProperty(process, 'platform', { value: 'linux' });
+            Object.defineProperty(process, "platform", { value: "linux" });
             (execSync as Mock)
               .mockImplementationOnce(() => {
                 throw new Error(); // first command not found
@@ -108,7 +98,7 @@ describe('editor utils', () => {
         }
 
         it(`should return false if none of the commands exist on non-windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'linux' });
+          Object.defineProperty(process, "platform", { value: "linux" });
           (execSync as Mock).mockImplementation(() => {
             throw new Error(); // all commands not found
           });
@@ -118,36 +108,31 @@ describe('editor utils', () => {
 
         // Windows tests
         it(`should return true if first command "${win32Commands[0]}" exists on windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'win32' });
+          Object.defineProperty(process, "platform", { value: "win32" });
           (execSync as Mock).mockReturnValue(
             Buffer.from(`C:\\Program Files\\...\\${win32Commands[0]}`),
           );
           expect(checkHasEditorType(editor)).toBe(true);
-          expect(execSync).toHaveBeenCalledWith(
-            `where.exe ${win32Commands[0]}`,
-            {
-              stdio: 'ignore',
-            },
-          );
+          expect(execSync).toHaveBeenCalledWith(`where.exe ${win32Commands[0]}`, {
+            stdio: "ignore",
+          });
         });
 
         if (win32Commands.length > 1) {
           it(`should return true if first command doesn't exist but second command "${win32Commands[1]}" exists on windows`, () => {
-            Object.defineProperty(process, 'platform', { value: 'win32' });
+            Object.defineProperty(process, "platform", { value: "win32" });
             (execSync as Mock)
               .mockImplementationOnce(() => {
                 throw new Error(); // first command not found
               })
-              .mockReturnValueOnce(
-                Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`),
-              ); // second command found
+              .mockReturnValueOnce(Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`)); // second command found
             expect(checkHasEditorType(editor)).toBe(true);
             expect(execSync).toHaveBeenCalledTimes(2);
           });
         }
 
         it(`should return false if none of the commands exist on windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'win32' });
+          Object.defineProperty(process, "platform", { value: "win32" });
           (execSync as Mock).mockImplementation(() => {
             throw new Error(); // all commands not found
           });
@@ -158,118 +143,114 @@ describe('editor utils', () => {
     }
   });
 
-  describe('getDiffCommand', () => {
+  describe("getDiffCommand", () => {
     const guiEditors: Array<{
       editor: EditorType;
       commands: string[];
       win32Commands: string[];
     }> = [
-      { editor: 'vscode', commands: ['code'], win32Commands: ['code.cmd'] },
+      { editor: "vscode", commands: ["code"], win32Commands: ["code.cmd"] },
       {
-        editor: 'vscodium',
-        commands: ['codium'],
-        win32Commands: ['codium.cmd'],
+        editor: "vscodium",
+        commands: ["codium"],
+        win32Commands: ["codium.cmd"],
       },
       {
-        editor: 'windsurf',
-        commands: ['windsurf'],
-        win32Commands: ['windsurf'],
+        editor: "windsurf",
+        commands: ["windsurf"],
+        win32Commands: ["windsurf"],
       },
-      { editor: 'cursor', commands: ['cursor'], win32Commands: ['cursor'] },
-      { editor: 'zed', commands: ['zed', 'zeditor'], win32Commands: ['zed'] },
+      { editor: "cursor", commands: ["cursor"], win32Commands: ["cursor"] },
+      { editor: "zed", commands: ["zed", "zeditor"], win32Commands: ["zed"] },
       {
-        editor: 'antigravity',
-        commands: ['agy'],
-        win32Commands: ['agy.cmd'],
+        editor: "antigravity",
+        commands: ["agy"],
+        win32Commands: ["agy.cmd"],
       },
     ];
 
     for (const { editor, commands, win32Commands } of guiEditors) {
       // Non-windows tests
       it(`should use first command "${commands[0]}" when it exists on non-windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'linux' });
-        (execSync as Mock).mockReturnValue(
-          Buffer.from(`/usr/bin/${commands[0]}`),
-        );
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        Object.defineProperty(process, "platform", { value: "linux" });
+        (execSync as Mock).mockReturnValue(Buffer.from(`/usr/bin/${commands[0]}`));
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: commands[0],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
 
       if (commands.length > 1) {
         it(`should use second command "${commands[1]}" when first doesn't exist on non-windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'linux' });
+          Object.defineProperty(process, "platform", { value: "linux" });
           (execSync as Mock)
             .mockImplementationOnce(() => {
               throw new Error(); // first command not found
             })
             .mockReturnValueOnce(Buffer.from(`/usr/bin/${commands[1]}`)); // second command found
 
-          const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+          const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
           expect(diffCommand).toEqual({
             command: commands[1],
-            args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+            args: ["--wait", "--diff", "old.txt", "new.txt"],
           });
         });
       }
 
       it(`should fall back to last command "${commands[commands.length - 1]}" when none exist on non-windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'linux' });
+        Object.defineProperty(process, "platform", { value: "linux" });
         (execSync as Mock).mockImplementation(() => {
           throw new Error(); // all commands not found
         });
 
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: commands[commands.length - 1],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
 
       // Windows tests
       it(`should use first command "${win32Commands[0]}" when it exists on windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'win32' });
+        Object.defineProperty(process, "platform", { value: "win32" });
         (execSync as Mock).mockReturnValue(
           Buffer.from(`C:\\Program Files\\...\\${win32Commands[0]}`),
         );
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: win32Commands[0],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
 
       if (win32Commands.length > 1) {
         it(`should use second command "${win32Commands[1]}" when first doesn't exist on windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'win32' });
+          Object.defineProperty(process, "platform", { value: "win32" });
           (execSync as Mock)
             .mockImplementationOnce(() => {
               throw new Error(); // first command not found
             })
-            .mockReturnValueOnce(
-              Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`),
-            ); // second command found
+            .mockReturnValueOnce(Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`)); // second command found
 
-          const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+          const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
           expect(diffCommand).toEqual({
             command: win32Commands[1],
-            args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+            args: ["--wait", "--diff", "old.txt", "new.txt"],
           });
         });
       }
 
       it(`should fall back to last command "${win32Commands[win32Commands.length - 1]}" when none exist on windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'win32' });
+        Object.defineProperty(process, "platform", { value: "win32" });
         (execSync as Mock).mockImplementation(() => {
           throw new Error(); // all commands not found
         });
 
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: win32Commands[win32Commands.length - 1],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
     }
@@ -278,179 +259,155 @@ describe('editor utils', () => {
       editor: EditorType;
       command: string;
     }> = [
-      { editor: 'vim', command: 'vim' },
-      { editor: 'neovim', command: 'nvim' },
+      { editor: "vim", command: "vim" },
+      { editor: "neovim", command: "nvim" },
     ];
 
     for (const { editor, command } of terminalEditors) {
       it(`should return the correct command for ${editor}`, () => {
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command,
           args: [
-            '-d',
-            '-i',
-            'NONE',
-            '-c',
-            'wincmd h | set readonly | wincmd l',
-            '-c',
-            'highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000',
-            '-c',
-            'set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
-            '-c',
-            'wincmd h | setlocal statusline=OLD\\ FILE',
-            '-c',
-            'wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
-            '-c',
-            'autocmd BufWritePost * wqa',
-            'old.txt',
-            'new.txt',
+            "-d",
+            "-i",
+            "NONE",
+            "-c",
+            "wincmd h | set readonly | wincmd l",
+            "-c",
+            "highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000",
+            "-c",
+            "set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
+            "-c",
+            "wincmd h | setlocal statusline=OLD\\ FILE",
+            "-c",
+            "wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
+            "-c",
+            "autocmd BufWritePost * wqa",
+            "old.txt",
+            "new.txt",
           ],
         });
       });
     }
 
-    it('should return the correct command for emacs', () => {
-      const command = getDiffCommand('old.txt', 'new.txt', 'emacs');
+    it("should return the correct command for emacs", () => {
+      const command = getDiffCommand("old.txt", "new.txt", "emacs");
       expect(command).toEqual({
-        command: 'emacs',
-        args: ['--eval', '(ediff "old.txt" "new.txt")'],
+        command: "emacs",
+        args: ["--eval", '(ediff "old.txt" "new.txt")'],
       });
     });
 
-    it('should return null for an unsupported editor', () => {
+    it("should return null for an unsupported editor", () => {
       // @ts-expect-error Testing unsupported editor
-      const command = getDiffCommand('old.txt', 'new.txt', 'foobar');
+      const command = getDiffCommand("old.txt", "new.txt", "foobar");
       expect(command).toBeNull();
     });
   });
 
-  describe('openDiff', () => {
-    const guiEditors: EditorType[] = [
-      'vscode',
-      'vscodium',
-      'windsurf',
-      'cursor',
-      'zed',
-    ];
+  describe("openDiff", () => {
+    const guiEditors: EditorType[] = ["vscode", "vscodium", "windsurf", "cursor", "zed"];
 
     for (const editor of guiEditors) {
       it(`should call spawn for ${editor}`, async () => {
         const mockSpawnOn = vi.fn((event, cb) => {
-          if (event === 'close') {
+          if (event === "close") {
             cb(0);
           }
         });
         (spawn as Mock).mockReturnValue({ on: mockSpawnOn });
 
-        await openDiff('old.txt', 'new.txt', editor);
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor)!;
-        expect(spawn).toHaveBeenCalledWith(
-          diffCommand.command,
-          diffCommand.args,
-          {
-            stdio: 'inherit',
-            shell: process.platform === 'win32',
-          },
-        );
-        expect(mockSpawnOn).toHaveBeenCalledWith('close', expect.any(Function));
-        expect(mockSpawnOn).toHaveBeenCalledWith('error', expect.any(Function));
+        await openDiff("old.txt", "new.txt", editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor)!;
+        expect(spawn).toHaveBeenCalledWith(diffCommand.command, diffCommand.args, {
+          stdio: "inherit",
+          shell: process.platform === "win32",
+        });
+        expect(mockSpawnOn).toHaveBeenCalledWith("close", expect.any(Function));
+        expect(mockSpawnOn).toHaveBeenCalledWith("error", expect.any(Function));
       });
 
       it(`should reject if spawn for ${editor} fails`, async () => {
-        const mockError = new Error('spawn error');
+        const mockError = new Error("spawn error");
         const mockSpawnOn = vi.fn((event, cb) => {
-          if (event === 'error') {
+          if (event === "error") {
             cb(mockError);
           }
         });
         (spawn as Mock).mockReturnValue({ on: mockSpawnOn });
 
-        await expect(openDiff('old.txt', 'new.txt', editor)).rejects.toThrow(
-          'spawn error',
-        );
+        await expect(openDiff("old.txt", "new.txt", editor)).rejects.toThrow("spawn error");
       });
 
       it(`should reject if ${editor} exits with non-zero code`, async () => {
         const mockSpawnOn = vi.fn((event, cb) => {
-          if (event === 'close') {
+          if (event === "close") {
             cb(1);
           }
         });
         (spawn as Mock).mockReturnValue({ on: mockSpawnOn });
 
-        await expect(openDiff('old.txt', 'new.txt', editor)).rejects.toThrow(
+        await expect(openDiff("old.txt", "new.txt", editor)).rejects.toThrow(
           `${editor} exited with code 1`,
         );
       });
     }
 
-    const terminalEditors: EditorType[] = ['vim', 'neovim', 'emacs'];
+    const terminalEditors: EditorType[] = ["vim", "neovim", "emacs"];
 
     for (const editor of terminalEditors) {
       it(`should call spawnSync for ${editor}`, async () => {
-        await openDiff('old.txt', 'new.txt', editor);
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor)!;
-        expect(spawnSync).toHaveBeenCalledWith(
-          diffCommand.command,
-          diffCommand.args,
-          {
-            stdio: 'inherit',
-          },
-        );
+        await openDiff("old.txt", "new.txt", editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor)!;
+        expect(spawnSync).toHaveBeenCalledWith(diffCommand.command, diffCommand.args, {
+          stdio: "inherit",
+        });
       });
     }
 
-    it('should log an error if diff command is not available', async () => {
-      const consoleErrorSpy = vi
-        .spyOn(debugLogger, 'error')
-        .mockImplementation(() => {});
+    it("should log an error if diff command is not available", async () => {
+      const consoleErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
       // @ts-expect-error Testing unsupported editor
-      await openDiff('old.txt', 'new.txt', 'foobar');
+      await openDiff("old.txt", "new.txt", "foobar");
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'No diff tool available. Install a supported editor.',
+        "No diff tool available. Install a supported editor.",
       );
     });
   });
 
-  describe('allowEditorTypeInSandbox', () => {
-    it('should allow vim in sandbox mode', () => {
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(allowEditorTypeInSandbox('vim')).toBe(true);
+  describe("allowEditorTypeInSandbox", () => {
+    it("should allow vim in sandbox mode", () => {
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(allowEditorTypeInSandbox("vim")).toBe(true);
     });
 
-    it('should allow vim when not in sandbox mode', () => {
-      expect(allowEditorTypeInSandbox('vim')).toBe(true);
+    it("should allow vim when not in sandbox mode", () => {
+      expect(allowEditorTypeInSandbox("vim")).toBe(true);
     });
 
-    it('should allow emacs in sandbox mode', () => {
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(allowEditorTypeInSandbox('emacs')).toBe(true);
+    it("should allow emacs in sandbox mode", () => {
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(allowEditorTypeInSandbox("emacs")).toBe(true);
     });
 
-    it('should allow emacs when not in sandbox mode', () => {
-      expect(allowEditorTypeInSandbox('emacs')).toBe(true);
+    it("should allow emacs when not in sandbox mode", () => {
+      expect(allowEditorTypeInSandbox("emacs")).toBe(true);
     });
 
-    it('should allow neovim in sandbox mode', () => {
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(allowEditorTypeInSandbox('neovim')).toBe(true);
+    it("should allow neovim in sandbox mode", () => {
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(allowEditorTypeInSandbox("neovim")).toBe(true);
     });
 
-    it('should allow neovim when not in sandbox mode', () => {
-      expect(allowEditorTypeInSandbox('neovim')).toBe(true);
+    it("should allow neovim when not in sandbox mode", () => {
+      expect(allowEditorTypeInSandbox("neovim")).toBe(true);
     });
 
-    const guiEditors: EditorType[] = [
-      'vscode',
-      'vscodium',
-      'windsurf',
-      'cursor',
-      'zed',
-    ];
+    const guiEditors: EditorType[] = ["vscode", "vscodium", "windsurf", "cursor", "zed"];
     for (const editor of guiEditors) {
       it(`should not allow ${editor} in sandbox mode`, () => {
-        vi.stubEnv('SANDBOX', 'sandbox');
+        vi.stubEnv("SANDBOX", "sandbox");
         expect(allowEditorTypeInSandbox(editor)).toBe(false);
       });
 
@@ -460,53 +417,53 @@ describe('editor utils', () => {
     }
   });
 
-  describe('isEditorAvailable', () => {
-    it('should return false for undefined editor', () => {
+  describe("isEditorAvailable", () => {
+    it("should return false for undefined editor", () => {
       expect(isEditorAvailable(undefined)).toBe(false);
     });
 
-    it('should return false for empty string editor', () => {
-      expect(isEditorAvailable('')).toBe(false);
+    it("should return false for empty string editor", () => {
+      expect(isEditorAvailable("")).toBe(false);
     });
 
-    it('should return false for invalid editor type', () => {
-      expect(isEditorAvailable('invalid-editor')).toBe(false);
+    it("should return false for invalid editor type", () => {
+      expect(isEditorAvailable("invalid-editor")).toBe(false);
     });
 
-    it('should return true for vscode when installed and not in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/code'));
-      expect(isEditorAvailable('vscode')).toBe(true);
+    it("should return true for vscode when installed and not in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/code"));
+      expect(isEditorAvailable("vscode")).toBe(true);
     });
 
-    it('should return false for vscode when not installed and not in sandbox mode', () => {
+    it("should return false for vscode when not installed and not in sandbox mode", () => {
       (execSync as Mock).mockImplementation(() => {
         throw new Error();
       });
-      expect(isEditorAvailable('vscode')).toBe(false);
+      expect(isEditorAvailable("vscode")).toBe(false);
     });
 
-    it('should return false for vscode when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/code'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('vscode')).toBe(false);
+    it("should return false for vscode when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/code"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("vscode")).toBe(false);
     });
 
-    it('should return true for vim when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/vim'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('vim')).toBe(true);
+    it("should return true for vim when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/vim"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("vim")).toBe(true);
     });
 
-    it('should return true for emacs when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/emacs'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('emacs')).toBe(true);
+    it("should return true for emacs when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/emacs"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("emacs")).toBe(true);
     });
 
-    it('should return true for neovim when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/nvim'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('neovim')).toBe(true);
+    it("should return true for neovim when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/nvim"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("neovim")).toBe(true);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/editor.ts b/packages/gemini-cli-core/src/utils/editor.ts
index a4ca04b29..e397e9466 100644
--- a/packages/gemini-cli-core/src/utils/editor.ts
+++ b/packages/gemini-cli-core/src/utils/editor.ts
@@ -4,26 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync, spawn, spawnSync } from 'node:child_process';
-import { debugLogger } from './debugLogger.js';
-import { coreEvents, CoreEvent } from './events.js';
-
-const GUI_EDITORS = [
-  'vscode',
-  'vscodium',
-  'windsurf',
-  'cursor',
-  'zed',
-  'antigravity',
-] as const;
-const TERMINAL_EDITORS = ['vim', 'neovim', 'emacs'] as const;
+import { execSync, spawn, spawnSync } from "node:child_process";
+import { debugLogger } from "./debugLogger.js";
+import { CoreEvent, coreEvents } from "./events.js";
+
+const GUI_EDITORS = ["vscode", "vscodium", "windsurf", "cursor", "zed", "antigravity"] as const;
+const TERMINAL_EDITORS = ["vim", "neovim", "emacs"] as const;
 const EDITORS = [...GUI_EDITORS, ...TERMINAL_EDITORS] as const;
 
 const GUI_EDITORS_SET = new Set<string>(GUI_EDITORS);
 const TERMINAL_EDITORS_SET = new Set<string>(TERMINAL_EDITORS);
 const EDITORS_SET = new Set<string>(EDITORS);
 
-export const DEFAULT_GUI_EDITOR: GuiEditorType = 'vscode';
+export const DEFAULT_GUI_EDITOR: GuiEditorType = "vscode";
 
 export type GuiEditorType = (typeof GUI_EDITORS)[number];
 export type TerminalEditorType = (typeof TERMINAL_EDITORS)[number];
@@ -33,22 +26,20 @@ export function isGuiEditor(editor: EditorType): editor is GuiEditorType {
   return GUI_EDITORS_SET.has(editor);
 }
 
-export function isTerminalEditor(
-  editor: EditorType,
-): editor is TerminalEditorType {
+export function isTerminalEditor(editor: EditorType): editor is TerminalEditorType {
   return TERMINAL_EDITORS_SET.has(editor);
 }
 
 export const EDITOR_DISPLAY_NAMES: Record<EditorType, string> = {
-  vscode: 'VS Code',
-  vscodium: 'VSCodium',
-  windsurf: 'Windsurf',
-  cursor: 'Cursor',
-  vim: 'Vim',
-  neovim: 'Neovim',
-  zed: 'Zed',
-  emacs: 'Emacs',
-  antigravity: 'Antigravity',
+  vscode: "VS Code",
+  vscodium: "VSCodium",
+  windsurf: "Windsurf",
+  cursor: "Cursor",
+  vim: "Vim",
+  neovim: "Neovim",
+  zed: "Zed",
+  emacs: "Emacs",
+  antigravity: "Antigravity",
 };
 
 export function getEditorDisplayName(editor: EditorType): string {
@@ -66,10 +57,9 @@ interface DiffCommand {
 
 function commandExists(cmd: string): boolean {
   try {
-    execSync(
-      process.platform === 'win32' ? `where.exe ${cmd}` : `command -v ${cmd}`,
-      { stdio: 'ignore' },
-    );
+    execSync(process.platform === "win32" ? `where.exe ${cmd}` : `command -v ${cmd}`, {
+      stdio: "ignore",
+    });
     return true;
   } catch {
     return false;
@@ -80,30 +70,26 @@ function commandExists(cmd: string): boolean {
  * Editor command configurations for different platforms.
  * Each editor can have multiple possible command names, listed in order of preference.
  */
-const editorCommands: Record<
-  EditorType,
-  { win32: string[]; default: string[] }
-> = {
-  vscode: { win32: ['code.cmd'], default: ['code'] },
-  vscodium: { win32: ['codium.cmd'], default: ['codium'] },
-  windsurf: { win32: ['windsurf'], default: ['windsurf'] },
-  cursor: { win32: ['cursor'], default: ['cursor'] },
-  vim: { win32: ['vim'], default: ['vim'] },
-  neovim: { win32: ['nvim'], default: ['nvim'] },
-  zed: { win32: ['zed'], default: ['zed', 'zeditor'] },
-  emacs: { win32: ['emacs.exe'], default: ['emacs'] },
-  antigravity: { win32: ['agy.cmd'], default: ['agy'] },
+const editorCommands: Record<EditorType, { win32: string[]; default: string[] }> = {
+  vscode: { win32: ["code.cmd"], default: ["code"] },
+  vscodium: { win32: ["codium.cmd"], default: ["codium"] },
+  windsurf: { win32: ["windsurf"], default: ["windsurf"] },
+  cursor: { win32: ["cursor"], default: ["cursor"] },
+  vim: { win32: ["vim"], default: ["vim"] },
+  neovim: { win32: ["nvim"], default: ["nvim"] },
+  zed: { win32: ["zed"], default: ["zed", "zeditor"] },
+  emacs: { win32: ["emacs.exe"], default: ["emacs"] },
+  antigravity: { win32: ["agy.cmd"], default: ["agy"] },
 };
 
 export function checkHasEditorType(editor: EditorType): boolean {
   const commandConfig = editorCommands[editor];
-  const commands =
-    process.platform === 'win32' ? commandConfig.win32 : commandConfig.default;
+  const commands = process.platform === "win32" ? commandConfig.win32 : commandConfig.default;
   return commands.some((cmd) => commandExists(cmd));
 }
 
 export function allowEditorTypeInSandbox(editor: EditorType): boolean {
-  const notUsingSandbox = !process.env['SANDBOX'];
+  const notUsingSandbox = !process.env["SANDBOX"];
   if (isGuiEditor(editor)) {
     return notUsingSandbox;
   }
@@ -134,53 +120,51 @@ export function getDiffCommand(
     return null;
   }
   const commandConfig = editorCommands[editor];
-  const commands =
-    process.platform === 'win32' ? commandConfig.win32 : commandConfig.default;
+  const commands = process.platform === "win32" ? commandConfig.win32 : commandConfig.default;
   const command =
-    commands.slice(0, -1).find((cmd) => commandExists(cmd)) ||
-    commands[commands.length - 1];
+    commands.slice(0, -1).find((cmd) => commandExists(cmd)) || commands[commands.length - 1];
 
   switch (editor) {
-    case 'vscode':
-    case 'vscodium':
-    case 'windsurf':
-    case 'cursor':
-    case 'zed':
-    case 'antigravity':
-      return { command, args: ['--wait', '--diff', oldPath, newPath] };
-    case 'vim':
-    case 'neovim':
+    case "vscode":
+    case "vscodium":
+    case "windsurf":
+    case "cursor":
+    case "zed":
+    case "antigravity":
+      return { command, args: ["--wait", "--diff", oldPath, newPath] };
+    case "vim":
+    case "neovim":
       return {
         command,
         args: [
-          '-d',
+          "-d",
           // skip viminfo file to avoid E138 errors
-          '-i',
-          'NONE',
+          "-i",
+          "NONE",
           // make the left window read-only and the right window editable
-          '-c',
-          'wincmd h | set readonly | wincmd l',
+          "-c",
+          "wincmd h | set readonly | wincmd l",
           // set up colors for diffs
-          '-c',
-          'highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000',
+          "-c",
+          "highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000",
           // Show helpful messages
-          '-c',
-          'set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
-          '-c',
-          'wincmd h | setlocal statusline=OLD\\ FILE',
-          '-c',
-          'wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
+          "-c",
+          "set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
+          "-c",
+          "wincmd h | setlocal statusline=OLD\\ FILE",
+          "-c",
+          "wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
           // Auto close all windows when one is closed
-          '-c',
-          'autocmd BufWritePost * wqa',
+          "-c",
+          "autocmd BufWritePost * wqa",
           oldPath,
           newPath,
         ],
       };
-    case 'emacs':
+    case "emacs":
       return {
-        command: 'emacs',
-        args: ['--eval', `(ediff "${oldPath}" "${newPath}")`],
+        command: "emacs",
+        args: ["--eval", `(ediff "${oldPath}" "${newPath}")`],
       };
     default:
       return null;
@@ -199,14 +183,14 @@ export async function openDiff(
 ): Promise<void> {
   const diffCommand = getDiffCommand(oldPath, newPath, editor);
   if (!diffCommand) {
-    debugLogger.error('No diff tool available. Install a supported editor.');
+    debugLogger.error("No diff tool available. Install a supported editor.");
     return;
   }
 
   if (isTerminalEditor(editor)) {
     try {
       const result = spawnSync(diffCommand.command, diffCommand.args, {
-        stdio: 'inherit',
+        stdio: "inherit",
       });
       if (result.error) {
         throw result.error;
@@ -222,11 +206,11 @@ export async function openDiff(
 
   return new Promise<void>((resolve, reject) => {
     const childProcess = spawn(diffCommand.command, diffCommand.args, {
-      stdio: 'inherit',
-      shell: process.platform === 'win32',
+      stdio: "inherit",
+      shell: process.platform === "win32",
     });
 
-    childProcess.on('close', (code) => {
+    childProcess.on("close", (code) => {
       if (code === 0) {
         resolve();
       } else {
@@ -234,7 +218,7 @@ export async function openDiff(
       }
     });
 
-    childProcess.on('error', (error) => {
+    childProcess.on("error", (error) => {
       reject(error);
     });
   });
diff --git a/packages/gemini-cli-core/src/utils/environmentContext.test.ts b/packages/gemini-cli-core/src/utils/environmentContext.test.ts
index 609c03d82..54273cd90 100644
--- a/packages/gemini-cli-core/src/utils/environmentContext.test.ts
+++ b/packages/gemini-cli-core/src/utils/environmentContext.test.ts
@@ -4,84 +4,72 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import {
-  getEnvironmentContext,
-  getDirectoryContextString,
-} from './environmentContext.js';
-import type { Config } from '../config/config.js';
-import type { Storage } from '../config/storage.js';
-import { getFolderStructure } from './getFolderStructure.js';
-
-vi.mock('../config/config.js');
-vi.mock('./getFolderStructure.js', () => ({
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { Storage } from "../config/storage.js";
+import { getDirectoryContextString, getEnvironmentContext } from "./environmentContext.js";
+import { getFolderStructure } from "./getFolderStructure.js";
+
+vi.mock("../config/config.js");
+vi.mock("./getFolderStructure.js", () => ({
   getFolderStructure: vi.fn(),
 }));
-vi.mock('../tools/read-many-files.js');
+vi.mock("../tools/read-many-files.js");
 
-describe('getDirectoryContextString', () => {
+describe("getDirectoryContextString", () => {
   let mockConfig: Partial<Config>;
 
   beforeEach(() => {
     mockConfig = {
       getWorkspaceContext: vi.fn().mockReturnValue({
-        getDirectories: vi.fn().mockReturnValue(['/test/dir']),
+        getDirectories: vi.fn().mockReturnValue(["/test/dir"]),
       }),
       getFileService: vi.fn(),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
       } as unknown as Storage,
     };
-    vi.mocked(getFolderStructure).mockResolvedValue('Mock Folder Structure');
+    vi.mocked(getFolderStructure).mockResolvedValue("Mock Folder Structure");
   });
 
   afterEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should return context string for a single directory', async () => {
+  it("should return context string for a single directory", async () => {
     const contextString = await getDirectoryContextString(mockConfig as Config);
+    expect(contextString).toContain("I'm currently working in the directory: /test/dir");
     expect(contextString).toContain(
-      "I'm currently working in the directory: /test/dir",
-    );
-    expect(contextString).toContain(
-      'Here is the folder structure of the current working directories:\n\nMock Folder Structure',
+      "Here is the folder structure of the current working directories:\n\nMock Folder Structure",
     );
   });
 
-  it('should return context string for multiple directories', async () => {
-    (
-      vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock
-    ).mockReturnValue(['/test/dir1', '/test/dir2']);
+  it("should return context string for multiple directories", async () => {
+    (vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock).mockReturnValue([
+      "/test/dir1",
+      "/test/dir2",
+    ]);
     vi.mocked(getFolderStructure)
-      .mockResolvedValueOnce('Structure 1')
-      .mockResolvedValueOnce('Structure 2');
+      .mockResolvedValueOnce("Structure 1")
+      .mockResolvedValueOnce("Structure 2");
 
     const contextString = await getDirectoryContextString(mockConfig as Config);
     expect(contextString).toContain(
       "I'm currently working in the following directories:\n  - /test/dir1\n  - /test/dir2",
     );
     expect(contextString).toContain(
-      'Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2',
+      "Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2",
     );
   });
 });
 
-describe('getEnvironmentContext', () => {
+describe("getEnvironmentContext", () => {
   let mockConfig: Partial<Config>;
   let mockToolRegistry: { getTool: Mock };
 
   beforeEach(() => {
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-08-05T12:00:00Z'));
+    vi.setSystemTime(new Date("2025-08-05T12:00:00Z"));
 
     mockToolRegistry = {
       getTool: vi.fn(),
@@ -89,17 +77,17 @@ describe('getEnvironmentContext', () => {
 
     mockConfig = {
       getWorkspaceContext: vi.fn().mockReturnValue({
-        getDirectories: vi.fn().mockReturnValue(['/test/dir']),
+        getDirectories: vi.fn().mockReturnValue(["/test/dir"]),
       }),
       getFileService: vi.fn(),
 
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
       } as unknown as Storage,
     };
 
-    vi.mocked(getFolderStructure).mockResolvedValue('Mock Folder Structure');
+    vi.mocked(getFolderStructure).mockResolvedValue("Mock Folder Structure");
   });
 
   afterEach(() => {
@@ -107,7 +95,7 @@ describe('getEnvironmentContext', () => {
     vi.resetAllMocks();
   });
 
-  it('should return basic environment context for a single directory', async () => {
+  it("should return basic environment context for a single directory", async () => {
     const parts = await getEnvironmentContext(mockConfig as Config);
 
     expect(parts.length).toBe(1);
@@ -116,24 +104,23 @@ describe('getEnvironmentContext', () => {
     expect(context).toContain("Today's date is");
     expect(context).toContain("(formatted according to the user's locale)");
     expect(context).toContain(`My operating system is: ${process.platform}`);
+    expect(context).toContain("I'm currently working in the directory: /test/dir");
     expect(context).toContain(
-      "I'm currently working in the directory: /test/dir",
-    );
-    expect(context).toContain(
-      'Here is the folder structure of the current working directories:\n\nMock Folder Structure',
+      "Here is the folder structure of the current working directories:\n\nMock Folder Structure",
     );
-    expect(getFolderStructure).toHaveBeenCalledWith('/test/dir', {
+    expect(getFolderStructure).toHaveBeenCalledWith("/test/dir", {
       fileService: undefined,
     });
   });
 
-  it('should return basic environment context for multiple directories', async () => {
-    (
-      vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock
-    ).mockReturnValue(['/test/dir1', '/test/dir2']);
+  it("should return basic environment context for multiple directories", async () => {
+    (vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock).mockReturnValue([
+      "/test/dir1",
+      "/test/dir2",
+    ]);
     vi.mocked(getFolderStructure)
-      .mockResolvedValueOnce('Structure 1')
-      .mockResolvedValueOnce('Structure 2');
+      .mockResolvedValueOnce("Structure 1")
+      .mockResolvedValueOnce("Structure 2");
 
     const parts = await getEnvironmentContext(mockConfig as Config);
 
@@ -144,15 +131,15 @@ describe('getEnvironmentContext', () => {
       "I'm currently working in the following directories:\n  - /test/dir1\n  - /test/dir2",
     );
     expect(context).toContain(
-      'Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2',
+      "Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2",
     );
     expect(getFolderStructure).toHaveBeenCalledTimes(2);
   });
 
-  it('should handle read_many_files returning no content', async () => {
+  it("should handle read_many_files returning no content", async () => {
     const mockReadManyFilesTool = {
       build: vi.fn().mockReturnValue({
-        execute: vi.fn().mockResolvedValue({ llmContent: '' }),
+        execute: vi.fn().mockResolvedValue({ llmContent: "" }),
       }),
     };
     mockToolRegistry.getTool.mockReturnValue(mockReadManyFilesTool);
@@ -162,7 +149,7 @@ describe('getEnvironmentContext', () => {
     expect(parts.length).toBe(1); // No extra part added
   });
 
-  it('should handle read_many_files tool not being found', async () => {
+  it("should handle read_many_files tool not being found", async () => {
     mockToolRegistry.getTool.mockReturnValue(null);
 
     const parts = await getEnvironmentContext(mockConfig as Config);
diff --git a/packages/gemini-cli-core/src/utils/environmentContext.ts b/packages/gemini-cli-core/src/utils/environmentContext.ts
index 162c2e596..bb51f6f1e 100644
--- a/packages/gemini-cli-core/src/utils/environmentContext.ts
+++ b/packages/gemini-cli-core/src/utils/environmentContext.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Part, Content } from '@google/genai';
-import type { Config } from '../config/config.js';
-import { getFolderStructure } from './getFolderStructure.js';
+import type { Content, Part } from "@google/genai";
+import type { Config } from "../config/config.js";
+import { getFolderStructure } from "./getFolderStructure.js";
 
 /**
  * Generates a string describing the current workspace directories and their structures.
  * @param {Config} config - The runtime configuration and services.
  * @returns {Promise<string>} A promise that resolves to the directory context string.
  */
-export async function getDirectoryContextString(
-  config: Config,
-): Promise<string> {
+export async function getDirectoryContextString(config: Config): Promise<string> {
   const workspaceContext = config.getWorkspaceContext();
   const workspaceDirectories = workspaceContext.getDirectories();
 
@@ -27,13 +25,13 @@ export async function getDirectoryContextString(
     ),
   );
 
-  const folderStructure = folderStructures.join('\n');
+  const folderStructure = folderStructures.join("\n");
 
   let workingDirPreamble: string;
   if (workspaceDirectories.length === 1) {
     workingDirPreamble = `I'm currently working in the directory: ${workspaceDirectories[0]}`;
   } else {
-    const dirList = workspaceDirectories.map((dir) => `  - ${dir}`).join('\n');
+    const dirList = workspaceDirectories.map((dir) => `  - ${dir}`).join("\n");
     workingDirPreamble = `I'm currently working in the following directories:\n${dirList}`;
   }
 
@@ -52,10 +50,10 @@ ${folderStructure}`;
  */
 export async function getEnvironmentContext(config: Config): Promise<Part[]> {
   const today = new Date().toLocaleDateString(undefined, {
-    weekday: 'long',
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
+    weekday: "long",
+    year: "numeric",
+    month: "long",
+    day: "numeric",
   });
   const platform = process.platform;
   const directoryContext = await getDirectoryContextString(config);
@@ -79,7 +77,7 @@ export async function getInitialChatHistory(
   extraHistory?: Content[],
 ): Promise<Content[]> {
   const envParts = await getEnvironmentContext(config);
-  const envContextString = envParts.map((part) => part.text || '').join('\n\n');
+  const envContextString = envParts.map((part) => part.text || "").join("\n\n");
 
   const allSetupText = `
 ${envContextString}
@@ -91,7 +89,7 @@ My setup is complete. I will provide my first command in the next turn.
 
   return [
     {
-      role: 'user',
+      role: "user",
       parts: [{ text: allSetupText }],
     },
     ...(extraHistory ?? []),
diff --git a/packages/gemini-cli-core/src/utils/errorParsing.test.ts b/packages/gemini-cli-core/src/utils/errorParsing.test.ts
index 291145d2e..8e565a4a9 100644
--- a/packages/gemini-cli-core/src/utils/errorParsing.test.ts
+++ b/packages/gemini-cli-core/src/utils/errorParsing.test.ts
@@ -4,76 +4,70 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseAndFormatApiError } from './errorParsing.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { AuthType } from '../core/contentGenerator.js';
-import type { StructuredError } from '../core/turn.js';
+import { describe, expect, it } from "vitest";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import type { StructuredError } from "../core/turn.js";
+import { parseAndFormatApiError } from "./errorParsing.js";
 
-describe('parseAndFormatApiError', () => {
-  const vertexMessage = 'request a quota increase through Vertex';
-  const geminiMessage = 'request a quota increase through AI Studio';
+describe("parseAndFormatApiError", () => {
+  const vertexMessage = "request a quota increase through Vertex";
+  const geminiMessage = "request a quota increase through AI Studio";
 
-  it('should format a valid API error JSON', () => {
+  it("should format a valid API error JSON", () => {
     const errorMessage =
       'got status: 400 Bad Request. {"error":{"code":400,"message":"API key not valid. Please pass a valid API key.","status":"INVALID_ARGUMENT"}}';
     const expected =
-      '[API Error: API key not valid. Please pass a valid API key. (Status: INVALID_ARGUMENT)]';
+      "[API Error: API key not valid. Please pass a valid API key. (Status: INVALID_ARGUMENT)]";
     expect(parseAndFormatApiError(errorMessage)).toBe(expected);
   });
 
-  it('should format a 429 API error with the default message', () => {
+  it("should format a 429 API error with the default message", () => {
     const errorMessage =
       'got status: 429 Too Many Requests. {"error":{"code":429,"message":"Rate limit exceeded","status":"RESOURCE_EXHAUSTED"}}';
     const result = parseAndFormatApiError(
       errorMessage,
       undefined,
       undefined,
-      'gemini-2.5-pro',
+      "gemini-2.5-pro",
       DEFAULT_GEMINI_FLASH_MODEL,
     );
-    expect(result).toContain('[API Error: Rate limit exceeded');
+    expect(result).toContain("[API Error: Rate limit exceeded");
     expect(result).toContain(
-      'Possible quota limitations in place or slow response times detected. Switching to the gemini-2.5-flash model',
+      "Possible quota limitations in place or slow response times detected. Switching to the gemini-2.5-flash model",
     );
   });
 
-  it('should format a 429 API error with the vertex message', () => {
+  it("should format a 429 API error with the vertex message", () => {
     const errorMessage =
       'got status: 429 Too Many Requests. {"error":{"code":429,"message":"Rate limit exceeded","status":"RESOURCE_EXHAUSTED"}}';
     const result = parseAndFormatApiError(errorMessage, AuthType.USE_VERTEX_AI);
-    expect(result).toContain('[API Error: Rate limit exceeded');
+    expect(result).toContain("[API Error: Rate limit exceeded");
     expect(result).toContain(vertexMessage);
   });
 
-  it('should return the original message if it is not a JSON error', () => {
-    const errorMessage = 'This is a plain old error message';
-    expect(parseAndFormatApiError(errorMessage)).toBe(
-      `[API Error: ${errorMessage}]`,
-    );
+  it("should return the original message if it is not a JSON error", () => {
+    const errorMessage = "This is a plain old error message";
+    expect(parseAndFormatApiError(errorMessage)).toBe(`[API Error: ${errorMessage}]`);
   });
 
-  it('should return the original message for malformed JSON', () => {
+  it("should return the original message for malformed JSON", () => {
     const errorMessage = '[Stream Error: {"error": "malformed}';
-    expect(parseAndFormatApiError(errorMessage)).toBe(
-      `[API Error: ${errorMessage}]`,
-    );
+    expect(parseAndFormatApiError(errorMessage)).toBe(`[API Error: ${errorMessage}]`);
   });
 
-  it('should handle JSON that does not match the ApiError structure', () => {
+  it("should handle JSON that does not match the ApiError structure", () => {
     const errorMessage = '[Stream Error: {"not_an_error": "some other json"}]';
-    expect(parseAndFormatApiError(errorMessage)).toBe(
-      `[API Error: ${errorMessage}]`,
-    );
+    expect(parseAndFormatApiError(errorMessage)).toBe(`[API Error: ${errorMessage}]`);
   });
 
-  it('should format a nested API error', () => {
+  it("should format a nested API error", () => {
     const nestedErrorMessage = JSON.stringify({
       error: {
         code: 429,
         message:
           "Gemini 2.5 Pro Preview doesn't have a free quota tier. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.",
-        status: 'RESOURCE_EXHAUSTED',
+        status: "RESOURCE_EXHAUSTED",
       },
     });
 
@@ -81,37 +75,37 @@ describe('parseAndFormatApiError', () => {
       error: {
         code: 429,
         message: nestedErrorMessage,
-        status: 'Too Many Requests',
+        status: "Too Many Requests",
       },
     });
 
     const result = parseAndFormatApiError(errorMessage, AuthType.USE_GEMINI);
-    expect(result).toContain('Gemini 2.5 Pro Preview');
+    expect(result).toContain("Gemini 2.5 Pro Preview");
     expect(result).toContain(geminiMessage);
   });
 
-  it('should format a StructuredError', () => {
+  it("should format a StructuredError", () => {
     const error: StructuredError = {
-      message: 'A structured error occurred',
+      message: "A structured error occurred",
       status: 500,
     };
-    const expected = '[API Error: A structured error occurred]';
+    const expected = "[API Error: A structured error occurred]";
     expect(parseAndFormatApiError(error)).toBe(expected);
   });
 
-  it('should format a 429 StructuredError with the vertex message', () => {
+  it("should format a 429 StructuredError with the vertex message", () => {
     const error: StructuredError = {
-      message: 'Rate limit exceeded',
+      message: "Rate limit exceeded",
       status: 429,
     };
     const result = parseAndFormatApiError(error, AuthType.USE_VERTEX_AI);
-    expect(result).toContain('[API Error: Rate limit exceeded]');
+    expect(result).toContain("[API Error: Rate limit exceeded]");
     expect(result).toContain(vertexMessage);
   });
 
-  it('should handle an unknown error type', () => {
+  it("should handle an unknown error type", () => {
     const error = 12345;
-    const expected = '[API Error: An unknown error occurred.]';
+    const expected = "[API Error: An unknown error occurred.]";
     expect(parseAndFormatApiError(error)).toBe(expected);
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/errorParsing.ts b/packages/gemini-cli-core/src/utils/errorParsing.ts
index bad61ea9e..2f27ecff6 100644
--- a/packages/gemini-cli-core/src/utils/errorParsing.ts
+++ b/packages/gemini-cli-core/src/utils/errorParsing.ts
@@ -4,24 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isApiError, isStructuredError } from './quotaErrorDetection.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { AuthType } from '../core/contentGenerator.js';
+import type { UserTierId } from "../code_assist/types.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { isApiError, isStructuredError } from "./quotaErrorDetection.js";
 
 const RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI =
-  '\nPlease wait and try again later. To increase your limits, request a quota increase through AI Studio, or switch to another /auth method';
+  "\nPlease wait and try again later. To increase your limits, request a quota increase through AI Studio, or switch to another /auth method";
 const RATE_LIMIT_ERROR_MESSAGE_VERTEX =
-  '\nPlease wait and try again later. To increase your limits, request a quota increase through Vertex, or switch to another /auth method';
-const getRateLimitErrorMessageDefault = (
-  fallbackModel: string = DEFAULT_GEMINI_FLASH_MODEL,
-) =>
+  "\nPlease wait and try again later. To increase your limits, request a quota increase through Vertex, or switch to another /auth method";
+const getRateLimitErrorMessageDefault = (fallbackModel: string = DEFAULT_GEMINI_FLASH_MODEL) =>
   `\nPossible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session.`;
 
-function getRateLimitMessage(
-  authType?: AuthType,
-  fallbackModel?: string,
-): string {
+function getRateLimitMessage(authType?: AuthType, fallbackModel?: string): string {
   switch (authType) {
     case AuthType.USE_GEMINI:
       return RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI;
@@ -48,8 +43,8 @@ export function parseAndFormatApiError(
   }
 
   // The error message might be a string containing a JSON object.
-  if (typeof error === 'string') {
-    const jsonStart = error.indexOf('{');
+  if (typeof error === "string") {
+    const jsonStart = error.indexOf("{");
     if (jsonStart === -1) {
       return `[API Error: ${error}]`; // Not a JSON error, return as is.
     }
@@ -81,5 +76,5 @@ export function parseAndFormatApiError(
     return `[API Error: ${error}]`;
   }
 
-  return '[API Error: An unknown error occurred.]';
+  return "[API Error: An unknown error occurred.]";
 }
diff --git a/packages/gemini-cli-core/src/utils/errorReporting.test.ts b/packages/gemini-cli-core/src/utils/errorReporting.test.ts
index 6b92c2499..8f334a96e 100644
--- a/packages/gemini-cli-core/src/utils/errorReporting.test.ts
+++ b/packages/gemini-cli-core/src/utils/errorReporting.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-import { reportError } from './errorReporting.js';
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { reportError } from "./errorReporting.js";
 
 // Use a type alias for SpyInstance as it's not directly exported
 type SpyInstance = ReturnType<typeof vi.spyOn>;
 
-describe('reportError', () => {
+describe("reportError", () => {
   let consoleErrorSpy: SpyInstance;
   let testDir: string;
-  const MOCK_TIMESTAMP = '2025-01-01T00-00-00-000Z';
+  const MOCK_TIMESTAMP = "2025-01-01T00-00-00-000Z";
 
   beforeEach(async () => {
     // Create a temporary directory for logs
-    testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-report-test-'));
+    testDir = await fs.mkdtemp(path.join(os.tmpdir(), "gemini-report-test-"));
     vi.resetAllMocks();
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(Date.prototype, 'toISOString').mockReturnValue(MOCK_TIMESTAMP);
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(Date.prototype, "toISOString").mockReturnValue(MOCK_TIMESTAMP);
   });
 
   afterEach(async () => {
@@ -35,22 +35,22 @@ describe('reportError', () => {
   const getExpectedReportPath = (type: string) =>
     path.join(testDir, `gemini-client-error-${type}-${MOCK_TIMESTAMP}.json`);
 
-  it('should generate a report and log the path', async () => {
-    const error = new Error('Test error');
-    error.stack = 'Test stack';
-    const baseMessage = 'An error occurred.';
-    const context = { data: 'test context' };
-    const type = 'test-type';
+  it("should generate a report and log the path", async () => {
+    const error = new Error("Test error");
+    error.stack = "Test stack";
+    const baseMessage = "An error occurred.";
+    const context = { data: "test context" };
+    const type = "test-type";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, context, type, testDir);
 
     // Verify the file was written
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Test error', stack: 'Test stack' },
+      error: { message: "Test error", stack: "Test stack" },
       context,
     });
 
@@ -60,19 +60,19 @@ describe('reportError', () => {
     );
   });
 
-  it('should handle errors that are plain objects with a message property', async () => {
-    const error = { message: 'Test plain object error' };
-    const baseMessage = 'Another error.';
-    const type = 'general';
+  it("should handle errors that are plain objects with a message property", async () => {
+    const error = { message: "Test plain object error" };
+    const baseMessage = "Another error.";
+    const type = "general";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, undefined, type, testDir);
 
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Test plain object error' },
+      error: { message: "Test plain object error" },
     });
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -80,19 +80,19 @@ describe('reportError', () => {
     );
   });
 
-  it('should handle string errors', async () => {
-    const error = 'Just a string error';
-    const baseMessage = 'String error occurred.';
-    const type = 'general';
+  it("should handle string errors", async () => {
+    const error = "Just a string error";
+    const baseMessage = "String error occurred.";
+    const type = "general";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, undefined, type, testDir);
 
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Just a string error' },
+      error: { message: "Just a string error" },
     });
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -100,12 +100,12 @@ describe('reportError', () => {
     );
   });
 
-  it('should log fallback message if writing report fails', async () => {
-    const error = new Error('Main error');
-    const baseMessage = 'Failed operation.';
-    const context = ['some context'];
-    const type = 'general';
-    const nonExistentDir = path.join(testDir, 'non-existent-dir');
+  it("should log fallback message if writing report fails", async () => {
+    const error = new Error("Main error");
+    const baseMessage = "Failed operation.";
+    const context = ["some context"];
+    const type = "general";
+    const nonExistentDir = path.join(testDir, "non-existent-dir");
 
     await reportError(error, baseMessage, context, type, nonExistentDir);
 
@@ -114,27 +114,25 @@ describe('reportError', () => {
       expect.any(Error), // The actual write error
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Original error that triggered report generation:',
+      "Original error that triggered report generation:",
       error,
     );
-    expect(consoleErrorSpy).toHaveBeenCalledWith('Original context:', context);
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Original context:", context);
   });
 
-  it('should handle stringification failure of report content (e.g. BigInt in context)', async () => {
-    const error = new Error('Main error');
-    error.stack = 'Main stack';
-    const baseMessage = 'Failed operation with BigInt.';
+  it("should handle stringification failure of report content (e.g. BigInt in context)", async () => {
+    const error = new Error("Main error");
+    error.stack = "Main stack";
+    const baseMessage = "Failed operation with BigInt.";
     const context = { a: BigInt(1) }; // BigInt cannot be stringified by JSON.stringify
-    const type = 'bigint-fail';
-    const stringifyError = new TypeError(
-      'Do not know how to serialize a BigInt',
-    );
+    const type = "bigint-fail";
+    const stringifyError = new TypeError("Do not know how to serialize a BigInt");
     const expectedMinimalReportPath = getExpectedReportPath(type);
 
     // Simulate JSON.stringify throwing an error for the full report
     const originalJsonStringify = JSON.stringify;
     let callCount = 0;
-    vi.spyOn(JSON, 'stringify').mockImplementation((value, replacer, space) => {
+    vi.spyOn(JSON, "stringify").mockImplementation((value, replacer, space) => {
       callCount++;
       if (callCount === 1) {
         // First call is for the full report content
@@ -151,15 +149,15 @@ describe('reportError', () => {
       stringifyError,
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Original error that triggered report generation:',
+      "Original error that triggered report generation:",
       error,
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Original context could not be stringified or included in report.',
+      "Original context could not be stringified or included in report.",
     );
 
     // Check that it writes a minimal report
-    const reportContent = await fs.readFile(expectedMinimalReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedMinimalReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
     expect(parsedReport).toEqual({
       error: { message: error.message, stack: error.stack },
@@ -170,20 +168,20 @@ describe('reportError', () => {
     );
   });
 
-  it('should generate a report without context if context is not provided', async () => {
-    const error = new Error('Error without context');
-    error.stack = 'No context stack';
-    const baseMessage = 'Simple error.';
-    const type = 'general';
+  it("should generate a report without context if context is not provided", async () => {
+    const error = new Error("Error without context");
+    error.stack = "No context stack";
+    const baseMessage = "Simple error.";
+    const type = "general";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, undefined, type, testDir);
 
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Error without context', stack: 'No context stack' },
+      error: { message: "Error without context", stack: "No context stack" },
     });
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
diff --git a/packages/gemini-cli-core/src/utils/errorReporting.ts b/packages/gemini-cli-core/src/utils/errorReporting.ts
index 9743d3241..bf7bc27f3 100644
--- a/packages/gemini-cli-core/src/utils/errorReporting.ts
+++ b/packages/gemini-cli-core/src/utils/errorReporting.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-import type { Content } from '@google/genai';
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import type { Content } from "@google/genai";
 
 interface ErrorReportData {
   error: { message: string; stack?: string } | { message: string };
@@ -26,21 +26,17 @@ export async function reportError(
   error: Error | unknown,
   baseMessage: string,
   context?: Content[] | Record<string, unknown> | unknown[],
-  type = 'general',
+  type = "general",
   reportingDir = os.tmpdir(), // for testing
 ): Promise<void> {
-  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
   const reportFileName = `gemini-client-error-${type}-${timestamp}.json`;
   const reportPath = path.join(reportingDir, reportFileName);
 
   let errorToReport: { message: string; stack?: string };
   if (error instanceof Error) {
     errorToReport = { message: error.message, stack: error.stack };
-  } else if (
-    typeof error === 'object' &&
-    error !== null &&
-    'message' in error
-  ) {
+  } else if (typeof error === "object" && error !== null && "message" in error) {
     errorToReport = {
       message: String((error as { message: unknown }).message),
     };
@@ -63,11 +59,9 @@ export async function reportError(
       `${baseMessage} Could not stringify report content (likely due to context):`,
       stringifyError,
     );
-    console.error('Original error that triggered report generation:', error);
+    console.error("Original error that triggered report generation:", error);
     if (context) {
-      console.error(
-        'Original context could not be stringified or included in report.',
-      );
+      console.error("Original context could not be stringified or included in report.");
     }
     // Fallback: try to report only the error if context was the issue
     try {
@@ -96,21 +90,21 @@ export async function reportError(
       writeError,
     );
     // Log the original error as a fallback if report writing fails
-    console.error('Original error that triggered report generation:', error);
+    console.error("Original error that triggered report generation:", error);
     if (context) {
       // Context was stringifiable, but writing the file failed.
       // We already have stringifiedReportContent, but it might be too large for console.
       // So, we try to log the original context object, and if that fails, its stringified version (truncated).
       try {
-        console.error('Original context:', context);
+        console.error("Original context:", context);
       } catch {
         try {
           console.error(
-            'Original context (stringified, truncated):',
+            "Original context (stringified, truncated):",
             JSON.stringify(context).substring(0, 1000),
           );
         } catch {
-          console.error('Original context could not be logged or stringified.');
+          console.error("Original context could not be logged or stringified.");
         }
       }
     }
diff --git a/packages/gemini-cli-core/src/utils/errors.test.ts b/packages/gemini-cli-core/src/utils/errors.test.ts
index 8ee1bcfd7..e9402db50 100644
--- a/packages/gemini-cli-core/src/utils/errors.test.ts
+++ b/packages/gemini-cli-core/src/utils/errors.test.ts
@@ -4,115 +4,115 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
-  isAuthenticationError,
-  UnauthorizedError,
-  toFriendlyError,
   BadRequestError,
   ForbiddenError,
-} from './errors.js';
+  isAuthenticationError,
+  toFriendlyError,
+  UnauthorizedError,
+} from "./errors.js";
 
-describe('isAuthenticationError', () => {
-  it('should detect error with code: 401 property (MCP SDK style)', () => {
-    const error = { code: 401, message: 'Unauthorized' };
+describe("isAuthenticationError", () => {
+  it("should detect error with code: 401 property (MCP SDK style)", () => {
+    const error = { code: 401, message: "Unauthorized" };
     expect(isAuthenticationError(error)).toBe(true);
   });
 
-  it('should detect UnauthorizedError instance', () => {
-    const error = new UnauthorizedError('Authentication required');
+  it("should detect UnauthorizedError instance", () => {
+    const error = new UnauthorizedError("Authentication required");
     expect(isAuthenticationError(error)).toBe(true);
   });
 
-  it('should return false for 404 errors', () => {
-    const error = { code: 404, message: 'Not Found' };
+  it("should return false for 404 errors", () => {
+    const error = { code: 404, message: "Not Found" };
     expect(isAuthenticationError(error)).toBe(false);
   });
 
-  it('should handle null and undefined gracefully', () => {
+  it("should handle null and undefined gracefully", () => {
     expect(isAuthenticationError(null)).toBe(false);
     expect(isAuthenticationError(undefined)).toBe(false);
   });
 
-  it('should handle non-error objects', () => {
-    expect(isAuthenticationError('string error')).toBe(false);
+  it("should handle non-error objects", () => {
+    expect(isAuthenticationError("string error")).toBe(false);
     expect(isAuthenticationError(123)).toBe(false);
     expect(isAuthenticationError({})).toBe(false);
   });
 
-  it('should detect 401 in various message formats', () => {
-    expect(isAuthenticationError(new Error('401 Unauthorized'))).toBe(true);
-    expect(isAuthenticationError(new Error('HTTP 401'))).toBe(true);
-    expect(isAuthenticationError(new Error('Status code: 401'))).toBe(true);
+  it("should detect 401 in various message formats", () => {
+    expect(isAuthenticationError(new Error("401 Unauthorized"))).toBe(true);
+    expect(isAuthenticationError(new Error("HTTP 401"))).toBe(true);
+    expect(isAuthenticationError(new Error("Status code: 401"))).toBe(true);
   });
 });
 
-describe('toFriendlyError', () => {
-  it('should return BadRequestError for 400', () => {
+describe("toFriendlyError", () => {
+  it("should return BadRequestError for 400", () => {
     const error = {
       response: {
         data: {
           error: {
             code: 400,
-            message: 'Bad Request',
+            message: "Bad Request",
           },
         },
       },
     };
     const result = toFriendlyError(error);
     expect(result).toBeInstanceOf(BadRequestError);
-    expect((result as BadRequestError).message).toBe('Bad Request');
+    expect((result as BadRequestError).message).toBe("Bad Request");
   });
 
-  it('should return UnauthorizedError for 401', () => {
+  it("should return UnauthorizedError for 401", () => {
     const error = {
       response: {
         data: {
           error: {
             code: 401,
-            message: 'Unauthorized',
+            message: "Unauthorized",
           },
         },
       },
     };
     const result = toFriendlyError(error);
     expect(result).toBeInstanceOf(UnauthorizedError);
-    expect((result as UnauthorizedError).message).toBe('Unauthorized');
+    expect((result as UnauthorizedError).message).toBe("Unauthorized");
   });
 
-  it('should return ForbiddenError for 403', () => {
+  it("should return ForbiddenError for 403", () => {
     const error = {
       response: {
         data: {
           error: {
             code: 403,
-            message: 'Forbidden',
+            message: "Forbidden",
           },
         },
       },
     };
     const result = toFriendlyError(error);
     expect(result).toBeInstanceOf(ForbiddenError);
-    expect((result as ForbiddenError).message).toBe('Forbidden');
+    expect((result as ForbiddenError).message).toBe("Forbidden");
   });
 
-  it('should parse stringified JSON data', () => {
+  it("should parse stringified JSON data", () => {
     const error = {
       response: {
         data: JSON.stringify({
           error: {
             code: 400,
-            message: 'Parsed Message',
+            message: "Parsed Message",
           },
         }),
       },
     };
     const result = toFriendlyError(error);
     expect(result).toBeInstanceOf(BadRequestError);
-    expect((result as BadRequestError).message).toBe('Parsed Message');
+    expect((result as BadRequestError).message).toBe("Parsed Message");
   });
 
-  it('should return original error if response data is undefined', () => {
+  it("should return original error if response data is undefined", () => {
     const error = {
       response: {
         data: undefined,
@@ -121,23 +121,23 @@ describe('toFriendlyError', () => {
     expect(toFriendlyError(error)).toBe(error);
   });
 
-  it('should return original error if error object is missing in data', () => {
+  it("should return original error if error object is missing in data", () => {
     const error = {
       response: {
         data: {
-          somethingElse: 'value',
+          somethingElse: "value",
         },
       },
     };
     expect(toFriendlyError(error)).toBe(error);
   });
 
-  it('should return original error if error code or message is missing', () => {
+  it("should return original error if error code or message is missing", () => {
     const errorNoCode = {
       response: {
         data: {
           error: {
-            message: 'No Code',
+            message: "No Code",
           },
         },
       },
@@ -156,13 +156,13 @@ describe('toFriendlyError', () => {
     expect(toFriendlyError(errorNoMessage)).toBe(errorNoMessage);
   });
 
-  it('should return original error for unknown codes', () => {
+  it("should return original error for unknown codes", () => {
     const error = {
       response: {
         data: {
           error: {
             code: 500,
-            message: 'Internal Server Error',
+            message: "Internal Server Error",
           },
         },
       },
@@ -170,8 +170,8 @@ describe('toFriendlyError', () => {
     expect(toFriendlyError(error)).toBe(error);
   });
 
-  it('should return original error if not a Gaxios error object', () => {
-    const error = new Error('Regular Error');
+  it("should return original error if not a Gaxios error object", () => {
+    const error = new Error("Regular Error");
     expect(toFriendlyError(error)).toBe(error);
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/errors.ts b/packages/gemini-cli-core/src/utils/errors.ts
index 8db1153d9..44a73189d 100644
--- a/packages/gemini-cli-core/src/utils/errors.ts
+++ b/packages/gemini-cli-core/src/utils/errors.ts
@@ -11,7 +11,7 @@ interface GaxiosError {
 }
 
 export function isNodeError(error: unknown): error is NodeJS.ErrnoException {
-  return error instanceof Error && 'code' in error;
+  return error instanceof Error && "code" in error;
 }
 
 export function getErrorMessage(error: unknown): string {
@@ -21,7 +21,7 @@ export function getErrorMessage(error: unknown): string {
   try {
     return String(error);
   } catch {
-    return 'Failed to get error details';
+    return "Failed to get error details";
   }
 }
 
@@ -71,9 +71,9 @@ export class FatalCancellationError extends FatalError {
 }
 
 export class CanceledError extends Error {
-  constructor(message = 'The operation was canceled.') {
+  constructor(message = "The operation was canceled.") {
     super(message);
-    this.name = 'CanceledError';
+    this.name = "CanceledError";
   }
 }
 
@@ -89,7 +89,7 @@ interface ResponseData {
 }
 
 export function toFriendlyError(error: unknown): unknown {
-  if (error && typeof error === 'object' && 'response' in error) {
+  if (error && typeof error === "object" && "response" in error) {
     const gaxiosError = error as GaxiosError;
     const data = parseResponseData(gaxiosError);
     if (data && data.error && data.error.message && data.error.code) {
@@ -112,7 +112,7 @@ export function toFriendlyError(error: unknown): unknown {
 
 function parseResponseData(error: GaxiosError): ResponseData | undefined {
   // Inexplicably, Gaxios sometimes doesn't JSONify the response data.
-  if (typeof error.response?.data === 'string') {
+  if (typeof error.response?.data === "string") {
     try {
       return JSON.parse(error.response?.data) as ResponseData;
     } catch {
@@ -132,7 +132,7 @@ function parseResponseData(error: GaxiosError): ResponseData | undefined {
 export function isAuthenticationError(error: unknown): boolean {
   // Check for MCP SDK errors with code property
   // (SseError and StreamableHTTPError both have numeric 'code' property)
-  if (error && typeof error === 'object' && 'code' in error) {
+  if (error && typeof error === "object" && "code" in error) {
     const errorCode = (error as { code: unknown }).code;
     if (errorCode === 401) {
       return true;
@@ -140,10 +140,7 @@ export function isAuthenticationError(error: unknown): boolean {
   }
 
   // Check for UnauthorizedError class (from MCP SDK or our own)
-  if (
-    error instanceof Error &&
-    error.constructor.name === 'UnauthorizedError'
-  ) {
+  if (error instanceof Error && error.constructor.name === "UnauthorizedError") {
     return true;
   }
 
@@ -154,7 +151,7 @@ export function isAuthenticationError(error: unknown): boolean {
   // Fallback: Check for MCP SDK's plain Error messages with HTTP 401
   // The SDK sometimes throws: new Error(`Error POSTing to endpoint (HTTP 401): ...`)
   const message = getErrorMessage(error);
-  if (message.includes('401')) {
+  if (message.includes("401")) {
     return true;
   }
 
diff --git a/packages/gemini-cli-core/src/utils/events.test.ts b/packages/gemini-cli-core/src/utils/events.test.ts
index 497bec398..0e5dfbd26 100644
--- a/packages/gemini-cli-core/src/utils/events.test.ts
+++ b/packages/gemini-cli-core/src/utils/events.test.ts
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import {
-  CoreEventEmitter,
-  CoreEvent,
-  type UserFeedbackPayload,
-} from './events.js';
-
-describe('CoreEventEmitter', () => {
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { CoreEvent, CoreEventEmitter, type UserFeedbackPayload } from "./events.js";
+
+describe("CoreEventEmitter", () => {
   let events: CoreEventEmitter;
 
   beforeEach(() => {
     events = new CoreEventEmitter();
   });
 
-  it('should emit feedback immediately when a listener is present', () => {
+  it("should emit feedback immediately when a listener is present", () => {
     const listener = vi.fn();
     events.on(CoreEvent.UserFeedback, listener);
 
     const payload = {
-      severity: 'info' as const,
-      message: 'Test message',
+      severity: "info" as const,
+      message: "Test message",
     };
 
     events.emitFeedback(payload.severity, payload.message);
@@ -33,11 +29,11 @@ describe('CoreEventEmitter', () => {
     expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
   });
 
-  it('should buffer feedback when no listener is present', () => {
+  it("should buffer feedback when no listener is present", () => {
     const listener = vi.fn();
     const payload = {
-      severity: 'warning' as const,
-      message: 'Buffered message',
+      severity: "warning" as const,
+      message: "Buffered message",
     };
 
     // Emit while no listeners attached
@@ -52,12 +48,12 @@ describe('CoreEventEmitter', () => {
     expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
   });
 
-  it('should respect the backlog size limit and maintain FIFO order', () => {
+  it("should respect the backlog size limit and maintain FIFO order", () => {
     const listener = vi.fn();
     const MAX_BACKLOG_SIZE = 10000;
 
     for (let i = 0; i < MAX_BACKLOG_SIZE + 10; i++) {
-      events.emitFeedback('info', `Message ${i}`);
+      events.emitFeedback("info", `Message ${i}`);
     }
 
     events.on(CoreEvent.UserFeedback, listener);
@@ -65,16 +61,16 @@ describe('CoreEventEmitter', () => {
 
     expect(listener).toHaveBeenCalledTimes(MAX_BACKLOG_SIZE);
     // Verify strictly that the FIRST call was Message 10 (0-9 dropped)
-    expect(listener.mock.calls[0][0]).toMatchObject({ message: 'Message 10' });
+    expect(listener.mock.calls[0][0]).toMatchObject({ message: "Message 10" });
     // Verify strictly that the LAST call was Message 109
     expect(listener.mock.lastCall?.[0]).toMatchObject({
       message: `Message ${MAX_BACKLOG_SIZE + 9}`,
     });
   });
 
-  it('should clear the backlog after draining', () => {
+  it("should clear the backlog after draining", () => {
     const listener = vi.fn();
-    events.emitFeedback('error', 'Test error');
+    events.emitFeedback("error", "Test error");
 
     events.on(CoreEvent.UserFeedback, listener);
     events.drainBacklogs();
@@ -85,55 +81,55 @@ describe('CoreEventEmitter', () => {
     expect(listener).not.toHaveBeenCalled();
   });
 
-  it('should include optional error object in payload', () => {
+  it("should include optional error object in payload", () => {
     const listener = vi.fn();
     events.on(CoreEvent.UserFeedback, listener);
 
-    const error = new Error('Original error');
-    events.emitFeedback('error', 'Something went wrong', error);
+    const error = new Error("Original error");
+    events.emitFeedback("error", "Something went wrong", error);
 
     expect(listener).toHaveBeenCalledWith(
       expect.objectContaining({
-        severity: 'error',
-        message: 'Something went wrong',
+        severity: "error",
+        message: "Something went wrong",
         error,
       }),
     );
   });
 
-  it('should handle multiple listeners correctly', () => {
+  it("should handle multiple listeners correctly", () => {
     const listenerA = vi.fn();
     const listenerB = vi.fn();
 
     events.on(CoreEvent.UserFeedback, listenerA);
     events.on(CoreEvent.UserFeedback, listenerB);
 
-    events.emitFeedback('info', 'Broadcast message');
+    events.emitFeedback("info", "Broadcast message");
 
     expect(listenerA).toHaveBeenCalledTimes(1);
     expect(listenerB).toHaveBeenCalledTimes(1);
   });
 
-  it('should stop receiving events after off() is called', () => {
+  it("should stop receiving events after off() is called", () => {
     const listener = vi.fn();
     events.on(CoreEvent.UserFeedback, listener);
 
-    events.emitFeedback('info', 'First message');
+    events.emitFeedback("info", "First message");
     expect(listener).toHaveBeenCalledTimes(1);
 
     events.off(CoreEvent.UserFeedback, listener);
-    events.emitFeedback('info', 'Second message');
+    events.emitFeedback("info", "Second message");
     expect(listener).toHaveBeenCalledTimes(1); // Still 1
   });
 
-  it('should handle re-entrant feedback emission during draining safely', () => {
-    events.emitFeedback('info', 'Buffered 1');
-    events.emitFeedback('info', 'Buffered 2');
+  it("should handle re-entrant feedback emission during draining safely", () => {
+    events.emitFeedback("info", "Buffered 1");
+    events.emitFeedback("info", "Buffered 2");
 
     const listener = vi.fn((payload: UserFeedbackPayload) => {
       // When 'Buffered 1' is received, immediately emit another event.
-      if (payload.message === 'Buffered 1') {
-        events.emitFeedback('warning', 'Re-entrant message');
+      if (payload.message === "Buffered 1") {
+        events.emitFeedback("warning", "Re-entrant message");
       }
     });
 
@@ -150,21 +146,21 @@ describe('CoreEventEmitter', () => {
     // 7. listener fires for 'Buffered 2'
 
     expect(listener).toHaveBeenCalledTimes(3);
-    expect(listener.mock.calls[0][0]).toMatchObject({ message: 'Buffered 1' });
+    expect(listener.mock.calls[0][0]).toMatchObject({ message: "Buffered 1" });
     expect(listener.mock.calls[1][0]).toMatchObject({
-      message: 'Re-entrant message',
+      message: "Re-entrant message",
     });
-    expect(listener.mock.calls[2][0]).toMatchObject({ message: 'Buffered 2' });
+    expect(listener.mock.calls[2][0]).toMatchObject({ message: "Buffered 2" });
   });
 
-  describe('ConsoleLog Event', () => {
-    it('should emit console log immediately when a listener is present', () => {
+  describe("ConsoleLog Event", () => {
+    it("should emit console log immediately when a listener is present", () => {
       const listener = vi.fn();
       events.on(CoreEvent.ConsoleLog, listener);
 
       const payload = {
-        type: 'info' as const,
-        content: 'Test log',
+        type: "info" as const,
+        content: "Test log",
       };
 
       events.emitConsoleLog(payload.type, payload.content);
@@ -173,11 +169,11 @@ describe('CoreEventEmitter', () => {
       expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
     });
 
-    it('should buffer console logs when no listener is present', () => {
+    it("should buffer console logs when no listener is present", () => {
       const listener = vi.fn();
       const payload = {
-        type: 'warn' as const,
-        content: 'Buffered log',
+        type: "warn" as const,
+        content: "Buffered log",
       };
 
       // Emit while no listeners attached
@@ -192,12 +188,12 @@ describe('CoreEventEmitter', () => {
       expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
     });
 
-    it('should respect the backlog size limit for console logs', () => {
+    it("should respect the backlog size limit for console logs", () => {
       const listener = vi.fn();
       const MAX_BACKLOG_SIZE = 10000;
 
       for (let i = 0; i < MAX_BACKLOG_SIZE + 10; i++) {
-        events.emitConsoleLog('debug', `Log ${i}`);
+        events.emitConsoleLog("debug", `Log ${i}`);
       }
 
       events.on(CoreEvent.ConsoleLog, listener);
@@ -205,19 +201,19 @@ describe('CoreEventEmitter', () => {
 
       expect(listener).toHaveBeenCalledTimes(MAX_BACKLOG_SIZE);
       // Verify strictly that the FIRST call was Log 10 (0-9 dropped)
-      expect(listener.mock.calls[0][0]).toMatchObject({ content: 'Log 10' });
+      expect(listener.mock.calls[0][0]).toMatchObject({ content: "Log 10" });
     });
   });
 
-  describe('Output Event', () => {
-    it('should emit output immediately when a listener is present', () => {
+  describe("Output Event", () => {
+    it("should emit output immediately when a listener is present", () => {
       const listener = vi.fn();
       events.on(CoreEvent.Output, listener);
 
       const payload = {
         isStderr: false,
-        chunk: 'Test output',
-        encoding: 'utf8' as BufferEncoding,
+        chunk: "Test output",
+        encoding: "utf8" as BufferEncoding,
       };
 
       events.emitOutput(payload.isStderr, payload.chunk, payload.encoding);
@@ -226,11 +222,11 @@ describe('CoreEventEmitter', () => {
       expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
     });
 
-    it('should buffer output when no listener is present', () => {
+    it("should buffer output when no listener is present", () => {
       const listener = vi.fn();
       const payload = {
         isStderr: true,
-        chunk: 'Buffered output',
+        chunk: "Buffered output",
       };
 
       // Emit while no listeners attached
@@ -245,7 +241,7 @@ describe('CoreEventEmitter', () => {
       expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
     });
 
-    it('should respect the backlog size limit for output', () => {
+    it("should respect the backlog size limit for output", () => {
       const listener = vi.fn();
       const MAX_BACKLOG_SIZE = 10000;
 
@@ -258,16 +254,16 @@ describe('CoreEventEmitter', () => {
 
       expect(listener).toHaveBeenCalledTimes(MAX_BACKLOG_SIZE);
       // Verify strictly that the FIRST call was Output 10 (0-9 dropped)
-      expect(listener.mock.calls[0][0]).toMatchObject({ chunk: 'Output 10' });
+      expect(listener.mock.calls[0][0]).toMatchObject({ chunk: "Output 10" });
     });
   });
 
-  describe('ModelChanged Event', () => {
-    it('should emit ModelChanged event with correct payload', () => {
+  describe("ModelChanged Event", () => {
+    it("should emit ModelChanged event with correct payload", () => {
       const listener = vi.fn();
       events.on(CoreEvent.ModelChanged, listener);
 
-      const newModel = 'gemini-2.5-pro';
+      const newModel = "gemini-2.5-pro";
       events.emitModelChanged(newModel);
 
       expect(listener).toHaveBeenCalledTimes(1);
diff --git a/packages/gemini-cli-core/src/utils/events.ts b/packages/gemini-cli-core/src/utils/events.ts
index 65ff8e9fc..88d49c807 100644
--- a/packages/gemini-cli-core/src/utils/events.ts
+++ b/packages/gemini-cli-core/src/utils/events.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
-import type { LoadServerHierarchicalMemoryResponse } from './memoryDiscovery.js';
+import { EventEmitter } from "node:events";
+import type { LoadServerHierarchicalMemoryResponse } from "./memoryDiscovery.js";
 
 /**
  * Defines the severity level for user-facing feedback.
  * This maps loosely to UI `MessageType`
  */
-export type FeedbackSeverity = 'info' | 'warning' | 'error';
+export type FeedbackSeverity = "info" | "warning" | "error";
 
 /**
  * Payload for the 'user-feedback' event.
@@ -58,7 +58,7 @@ export interface ModelChangedPayload {
  * Payload for the 'console-log' event.
  */
 export interface ConsoleLogPayload {
-  type: 'log' | 'warn' | 'error' | 'debug' | 'info';
+  type: "log" | "warn" | "error" | "debug" | "info";
   content: string;
 }
 
@@ -77,13 +77,13 @@ export interface OutputPayload {
 export type MemoryChangedPayload = LoadServerHierarchicalMemoryResponse;
 
 export enum CoreEvent {
-  UserFeedback = 'user-feedback',
-  FallbackModeChanged = 'fallback-mode-changed',
-  ModelChanged = 'model-changed',
-  ConsoleLog = 'console-log',
-  Output = 'output',
-  MemoryChanged = 'memory-changed',
-  ExternalEditorClosed = 'external-editor-closed',
+  UserFeedback = "user-feedback",
+  FallbackModeChanged = "fallback-mode-changed",
+  ModelChanged = "model-changed",
+  ConsoleLog = "console-log",
+  Output = "output",
+  MemoryChanged = "memory-changed",
+  ExternalEditorClosed = "external-editor-closed",
 }
 
 export interface CoreEvents {
@@ -111,22 +111,17 @@ export class CoreEventEmitter extends EventEmitter<CoreEvents> {
     super();
   }
 
-  private _emitOrQueue<K extends keyof CoreEvents>(
-    event: K,
-    ...args: CoreEvents[K]
-  ): void {
+  private _emitOrQueue<K extends keyof CoreEvents>(event: K, ...args: CoreEvents[K]): void {
     if (this.listenerCount(event) === 0) {
       if (this._eventBacklog.length >= CoreEventEmitter.MAX_BACKLOG_SIZE) {
         this._eventBacklog.shift();
       }
       this._eventBacklog.push({ event, args } as EventBacklogItem);
     } else {
-      (
-        this.emit as <K extends keyof CoreEvents>(
-          event: K,
-          ...args: CoreEvents[K]
-        ) => boolean
-      )(event, ...args);
+      (this.emit as <K extends keyof CoreEvents>(event: K, ...args: CoreEvents[K]) => boolean)(
+        event,
+        ...args,
+      );
     }
   }
 
@@ -134,11 +129,7 @@ export class CoreEventEmitter extends EventEmitter<CoreEvents> {
    * Sends actionable feedback to the user.
    * Buffers automatically if the UI hasn't subscribed yet.
    */
-  emitFeedback(
-    severity: FeedbackSeverity,
-    message: string,
-    error?: unknown,
-  ): void {
+  emitFeedback(severity: FeedbackSeverity, message: string, error?: unknown): void {
     const payload: UserFeedbackPayload = { severity, message, error };
     this._emitOrQueue(CoreEvent.UserFeedback, payload);
   }
@@ -146,10 +137,7 @@ export class CoreEventEmitter extends EventEmitter<CoreEvents> {
   /**
    * Broadcasts a console log message.
    */
-  emitConsoleLog(
-    type: 'log' | 'warn' | 'error' | 'debug' | 'info',
-    content: string,
-  ): void {
+  emitConsoleLog(type: "log" | "warn" | "error" | "debug" | "info", content: string): void {
     const payload: ConsoleLogPayload = { type, content };
     this._emitOrQueue(CoreEvent.ConsoleLog, payload);
   }
@@ -157,11 +145,7 @@ export class CoreEventEmitter extends EventEmitter<CoreEvents> {
   /**
    * Broadcasts stdout/stderr output.
    */
-  emitOutput(
-    isStderr: boolean,
-    chunk: Uint8Array | string,
-    encoding?: BufferEncoding,
-  ): void {
+  emitOutput(isStderr: boolean, chunk: Uint8Array | string, encoding?: BufferEncoding): void {
     const payload: OutputPayload = { isStderr, chunk, encoding };
     this._emitOrQueue(CoreEvent.Output, payload);
   }
@@ -191,12 +175,10 @@ export class CoreEventEmitter extends EventEmitter<CoreEvents> {
     const backlog = [...this._eventBacklog];
     this._eventBacklog.length = 0; // Clear in-place
     for (const item of backlog) {
-      (
-        this.emit as <K extends keyof CoreEvents>(
-          event: K,
-          ...args: CoreEvents[K]
-        ) => boolean
-      )(item.event, ...item.args);
+      (this.emit as <K extends keyof CoreEvents>(event: K, ...args: CoreEvents[K]) => boolean)(
+        item.event,
+        ...item.args,
+      );
     }
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/extensionLoader.test.ts b/packages/gemini-cli-core/src/utils/extensionLoader.test.ts
index a9328ccd7..4a241fda9 100644
--- a/packages/gemini-cli-core/src/utils/extensionLoader.test.ts
+++ b/packages/gemini-cli-core/src/utils/extensionLoader.test.ts
@@ -4,54 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  expect,
-  it,
-  vi,
-  beforeEach,
-  afterEach,
-  type MockInstance,
-} from 'vitest';
-import { SimpleExtensionLoader } from './extensionLoader.js';
-import type { Config, GeminiCLIExtension } from '../config/config.js';
-import { type McpClientManager } from '../tools/mcp-client-manager.js';
-import type { GeminiClient } from '../core/client.js';
+import { afterEach, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest";
+import type { Config, GeminiCLIExtension } from "../config/config.js";
+import type { GeminiClient } from "../core/client.js";
+import { type McpClientManager } from "../tools/mcp-client-manager.js";
+import { SimpleExtensionLoader } from "./extensionLoader.js";
 
 const mockRefreshServerHierarchicalMemory = vi.hoisted(() => vi.fn());
 
-vi.mock('./memoryDiscovery.js', async (importActual) => {
-  const actual = await importActual<typeof import('./memoryDiscovery.js')>();
+vi.mock("./memoryDiscovery.js", async (importActual) => {
+  const actual = await importActual<typeof import("./memoryDiscovery.js")>();
   return {
     ...actual,
     refreshServerHierarchicalMemory: mockRefreshServerHierarchicalMemory,
   };
 });
 
-describe('SimpleExtensionLoader', () => {
+describe("SimpleExtensionLoader", () => {
   let mockConfig: Config;
   let extensionReloadingEnabled: boolean;
   let mockMcpClientManager: McpClientManager;
-  let mockGeminiClientSetTools: MockInstance<
-    typeof GeminiClient.prototype.setTools
-  >;
+  let mockGeminiClientSetTools: MockInstance<typeof GeminiClient.prototype.setTools>;
 
   const activeExtension: GeminiCLIExtension = {
-    name: 'test-extension',
+    name: "test-extension",
     isActive: true,
-    version: '1.0.0',
-    path: '/path/to/extension',
+    version: "1.0.0",
+    path: "/path/to/extension",
     contextFiles: [],
-    excludeTools: ['some-tool'],
-    id: '123',
+    excludeTools: ["some-tool"],
+    id: "123",
   };
   const inactiveExtension: GeminiCLIExtension = {
-    name: 'test-extension',
+    name: "test-extension",
     isActive: false,
-    version: '1.0.0',
-    path: '/path/to/extension',
+    version: "1.0.0",
+    path: "/path/to/extension",
     contextFiles: [],
-    id: '123',
+    id: "123",
   };
 
   beforeEach(() => {
@@ -75,22 +65,20 @@ describe('SimpleExtensionLoader', () => {
     vi.restoreAllMocks();
   });
 
-  it('should start active extensions', async () => {
+  it("should start active extensions", async () => {
     const loader = new SimpleExtensionLoader([activeExtension]);
     await loader.start(mockConfig);
-    expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(
-      activeExtension,
-    );
+    expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
   });
 
-  it('should not start inactive extensions', async () => {
+  it("should not start inactive extensions", async () => {
     const loader = new SimpleExtensionLoader([inactiveExtension]);
     await loader.start(mockConfig);
     expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
   });
 
-  describe('interactive extension loading and unloading', () => {
-    it('should not call `start` or `stop` if the loader is not already started', async () => {
+  describe("interactive extension loading and unloading", () => {
+    it("should not call `start` or `stop` if the loader is not already started", async () => {
       const loader = new SimpleExtensionLoader([]);
       await loader.loadExtension(activeExtension);
       expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
@@ -98,83 +86,78 @@ describe('SimpleExtensionLoader', () => {
       expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
     });
 
-    it('should start extensions that were explicitly loaded prior to initializing the loader', async () => {
+    it("should start extensions that were explicitly loaded prior to initializing the loader", async () => {
       const loader = new SimpleExtensionLoader([]);
       await loader.loadExtension(activeExtension);
       expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
       await loader.start(mockConfig);
-      expect(
-        mockMcpClientManager.startExtension,
-      ).toHaveBeenCalledExactlyOnceWith(activeExtension);
+      expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
     });
 
-    describe.each([true, false])(
-      'when enableExtensionReloading === $i',
-      (reloadingEnabled) => {
-        beforeEach(() => {
-          extensionReloadingEnabled = reloadingEnabled;
-        });
-
-        it(`should ${reloadingEnabled ? '' : 'not '}reload extension features`, async () => {
-          const loader = new SimpleExtensionLoader([]);
-          await loader.start(mockConfig);
+    describe.each([true, false])("when enableExtensionReloading === $i", (reloadingEnabled) => {
+      beforeEach(() => {
+        extensionReloadingEnabled = reloadingEnabled;
+      });
+
+      it(`should ${reloadingEnabled ? "" : "not "}reload extension features`, async () => {
+        const loader = new SimpleExtensionLoader([]);
+        await loader.start(mockConfig);
+        expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+        await loader.loadExtension(activeExtension);
+        if (reloadingEnabled) {
+          expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(
+            activeExtension,
+          );
+          expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
+          expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
+        } else {
           expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+          expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
+          expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
+        }
+        mockRefreshServerHierarchicalMemory.mockClear();
+        mockGeminiClientSetTools.mockClear();
+
+        await loader.unloadExtension(activeExtension);
+        if (reloadingEnabled) {
+          expect(mockMcpClientManager.stopExtension).toHaveBeenCalledExactlyOnceWith(
+            activeExtension,
+          );
+          expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
+          expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
+        } else {
+          expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
+          expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
+          expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
+        }
+      });
+
+      it.runIf(reloadingEnabled)(
+        "Should only reload memory once all extensions are done",
+        async () => {
+          const anotherExtension = {
+            ...activeExtension,
+            name: "another-extension",
+          };
+          const loader = new SimpleExtensionLoader([]);
           await loader.loadExtension(activeExtension);
-          if (reloadingEnabled) {
-            expect(
-              mockMcpClientManager.startExtension,
-            ).toHaveBeenCalledExactlyOnceWith(activeExtension);
-            expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
-            expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
-          } else {
-            expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
-            expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
-            expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
-          }
-          mockRefreshServerHierarchicalMemory.mockClear();
-          mockGeminiClientSetTools.mockClear();
-
-          await loader.unloadExtension(activeExtension);
-          if (reloadingEnabled) {
-            expect(
-              mockMcpClientManager.stopExtension,
-            ).toHaveBeenCalledExactlyOnceWith(activeExtension);
-            expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
-            expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
-          } else {
-            expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
-            expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
-            expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
-          }
-        });
-
-        it.runIf(reloadingEnabled)(
-          'Should only reload memory once all extensions are done',
-          async () => {
-            const anotherExtension = {
-              ...activeExtension,
-              name: 'another-extension',
-            };
-            const loader = new SimpleExtensionLoader([]);
-            await loader.loadExtension(activeExtension);
-            await loader.start(mockConfig);
-            expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
-            await Promise.all([
-              loader.unloadExtension(activeExtension),
-              loader.loadExtension(anotherExtension),
-            ]);
-            expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
-          },
-        );
-      },
-    );
+          await loader.start(mockConfig);
+          expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
+          await Promise.all([
+            loader.unloadExtension(activeExtension),
+            loader.loadExtension(anotherExtension),
+          ]);
+          expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
+        },
+      );
+    });
   });
 
-  describe('restartExtension', () => {
-    it('should stop and then start the extension', async () => {
+  describe("restartExtension", () => {
+    it("should stop and then start the extension", async () => {
       const loader = new TestingSimpleExtensionLoader([activeExtension]);
-      vi.spyOn(loader, 'stopExtension');
-      vi.spyOn(loader, 'startExtension');
+      vi.spyOn(loader, "stopExtension");
+      vi.spyOn(loader, "startExtension");
       await loader.start(mockConfig);
       await loader.restartExtension(activeExtension);
       expect(loader.stopExtension).toHaveBeenCalledWith(activeExtension);
diff --git a/packages/gemini-cli-core/src/utils/extensionLoader.ts b/packages/gemini-cli-core/src/utils/extensionLoader.ts
index 707f30cb4..1ba223aa0 100644
--- a/packages/gemini-cli-core/src/utils/extensionLoader.ts
+++ b/packages/gemini-cli-core/src/utils/extensionLoader.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { EventEmitter } from 'node:events';
-import type { Config, GeminiCLIExtension } from '../config/config.js';
-import { refreshServerHierarchicalMemory } from './memoryDiscovery.js';
+import type { EventEmitter } from "node:events";
+import type { Config, GeminiCLIExtension } from "../config/config.js";
+import { refreshServerHierarchicalMemory } from "./memoryDiscovery.js";
 
 export abstract class ExtensionLoader {
   // Assigned in `start`.
@@ -41,7 +41,7 @@ export abstract class ExtensionLoader {
       if (!this.config) {
         this.config = config;
       } else {
-        throw new Error('Already started, you may only call `start` once.');
+        throw new Error("Already started, you may only call `start` once.");
       }
       await Promise.all(
         this.getExtensions()
@@ -64,10 +64,10 @@ export abstract class ExtensionLoader {
    */
   protected async startExtension(extension: GeminiCLIExtension) {
     if (!this.config) {
-      throw new Error('Cannot call `startExtension` prior to calling `start`.');
+      throw new Error("Cannot call `startExtension` prior to calling `start`.");
     }
     this.startingCount++;
-    this.eventEmitter?.emit('extensionsStarting', {
+    this.eventEmitter?.emit("extensionsStarting", {
       total: this.startingCount,
       completed: this.startCompletedCount,
     });
@@ -84,7 +84,7 @@ export abstract class ExtensionLoader {
       // useSlashCommandProcessor hook which responds to events fired here today.
     } finally {
       this.startCompletedCount++;
-      this.eventEmitter?.emit('extensionsStarting', {
+      this.eventEmitter?.emit("extensionsStarting", {
         total: this.startingCount,
         completed: this.startCompletedCount,
       });
@@ -98,9 +98,7 @@ export abstract class ExtensionLoader {
 
   private async maybeRefreshMemories(): Promise<void> {
     if (!this.config) {
-      throw new Error(
-        'Cannot refresh gemini memories prior to calling `start`.',
-      );
+      throw new Error("Cannot refresh gemini memories prior to calling `start`.");
     }
     if (
       !this.isStarting && // Don't refresh memories on the first call to `start`.
@@ -118,9 +116,7 @@ export abstract class ExtensionLoader {
    * Refreshes the gemini tools list if it is initialized and the extension has
    * any excludeTools settings.
    */
-  private async maybeRefreshGeminiTools(
-    extension: GeminiCLIExtension,
-  ): Promise<void> {
+  private async maybeRefreshGeminiTools(extension: GeminiCLIExtension): Promise<void> {
     if (extension.excludeTools && extension.excludeTools.length > 0) {
       const geminiClient = this.config?.getGeminiClient();
       if (geminiClient?.isInitialized()) {
@@ -134,9 +130,7 @@ export abstract class ExtensionLoader {
    * then calls `startExtension` to include all extension features into the
    * program.
    */
-  protected maybeStartExtension(
-    extension: GeminiCLIExtension,
-  ): Promise<void> | undefined {
+  protected maybeStartExtension(extension: GeminiCLIExtension): Promise<void> | undefined {
     if (this.config && this.config.getEnableExtensionReloading()) {
       return this.startExtension(extension);
     }
@@ -154,10 +148,10 @@ export abstract class ExtensionLoader {
    */
   protected async stopExtension(extension: GeminiCLIExtension) {
     if (!this.config) {
-      throw new Error('Cannot call `stopExtension` prior to calling `start`.');
+      throw new Error("Cannot call `stopExtension` prior to calling `start`.");
     }
     this.stoppingCount++;
-    this.eventEmitter?.emit('extensionsStopping', {
+    this.eventEmitter?.emit("extensionsStopping", {
       total: this.stoppingCount,
       completed: this.stopCompletedCount,
     });
@@ -175,7 +169,7 @@ export abstract class ExtensionLoader {
       // useSlashCommandProcessor hook which responds to events fired here today.
     } finally {
       this.stopCompletedCount++;
-      this.eventEmitter?.emit('extensionsStopping', {
+      this.eventEmitter?.emit("extensionsStopping", {
         total: this.stoppingCount,
         completed: this.stopCompletedCount,
       });
@@ -192,9 +186,7 @@ export abstract class ExtensionLoader {
    * then this also performs all necessary steps to remove all extension
    * features from the rest of the system.
    */
-  protected maybeStopExtension(
-    extension: GeminiCLIExtension,
-  ): Promise<void> | undefined {
+  protected maybeStopExtension(extension: GeminiCLIExtension): Promise<void> | undefined {
     if (this.config && this.config.getEnableExtensionReloading()) {
       return this.stopExtension(extension);
     }
diff --git a/packages/gemini-cli-core/src/utils/fetch.ts b/packages/gemini-cli-core/src/utils/fetch.ts
index 3c59b2ef3..e7abfac94 100644
--- a/packages/gemini-cli-core/src/utils/fetch.ts
+++ b/packages/gemini-cli-core/src/utils/fetch.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getErrorMessage, isNodeError } from './errors.js';
-import { URL } from 'node:url';
-import { ProxyAgent, setGlobalDispatcher } from 'undici';
+import { URL } from "node:url";
+import { ProxyAgent, setGlobalDispatcher } from "undici";
+import { getErrorMessage, isNodeError } from "./errors.js";
 
 const PRIVATE_IP_RANGES = [
   /^10\./,
@@ -25,7 +25,7 @@ export class FetchError extends Error {
     options?: ErrorOptions,
   ) {
     super(message, options);
-    this.name = 'FetchError';
+    this.name = "FetchError";
   }
 }
 
@@ -38,10 +38,7 @@ export function isPrivateIp(url: string): boolean {
   }
 }
 
-export async function fetchWithTimeout(
-  url: string,
-  timeout: number,
-): Promise<Response> {
+export async function fetchWithTimeout(url: string, timeout: number): Promise<Response> {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), timeout);
 
@@ -49,8 +46,8 @@ export async function fetchWithTimeout(
     const response = await fetch(url, { signal: controller.signal });
     return response;
   } catch (error) {
-    if (isNodeError(error) && error.code === 'ABORT_ERR') {
-      throw new FetchError(`Request timed out after ${timeout}ms`, 'ETIMEDOUT');
+    if (isNodeError(error) && error.code === "ABORT_ERR") {
+      throw new FetchError(`Request timed out after ${timeout}ms`, "ETIMEDOUT");
     }
     throw new FetchError(getErrorMessage(error), undefined, { cause: error });
   } finally {
diff --git a/packages/gemini-cli-core/src/utils/fileUtils.test.ts b/packages/gemini-cli-core/src/utils/fileUtils.test.ts
index 4d5120656..d6b80a84e 100644
--- a/packages/gemini-cli-core/src/utils/fileUtils.test.ts
+++ b/packages/gemini-cli-core/src/utils/fileUtils.test.ts
@@ -4,45 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-
-import * as actualNodeFs from 'node:fs'; // For setup/teardown
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import os from 'node:os';
-import { fileURLToPath } from 'node:url';
+import fs, * as actualNodeFs from "node:fs";
+import fsPromises from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 // eslint-disable-next-line import/no-internal-modules
-import mime from 'mime/lite';
-
+import mime from "mime/lite";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
 import {
-  isWithinRoot,
-  isBinaryFile,
+  detectBOM,
   detectFileType,
+  fileExists,
+  isBinaryFile,
+  isWithinRoot,
   processSingleFileContent,
-  detectBOM,
   readFileWithEncoding,
-  fileExists,
   readWasmBinaryFromDisk,
-} from './fileUtils.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
+} from "./fileUtils.js";
 
-vi.mock('mime/lite', () => ({
+vi.mock("mime/lite", () => ({
   default: { getType: vi.fn() },
   getType: vi.fn(),
 }));
 
 const mockMimeGetType = mime.getType as Mock;
 
-describe('fileUtils', () => {
+describe("fileUtils", () => {
   let tempRootDir: string;
   const originalProcessCwd = process.cwd;
 
@@ -57,18 +46,16 @@ describe('fileUtils', () => {
   beforeEach(() => {
     vi.resetAllMocks(); // Reset all mocks, including mime.getType
 
-    tempRootDir = actualNodeFs.mkdtempSync(
-      path.join(os.tmpdir(), 'fileUtils-test-'),
-    );
+    tempRootDir = actualNodeFs.mkdtempSync(path.join(os.tmpdir(), "fileUtils-test-"));
     process.cwd = vi.fn(() => tempRootDir); // Mock cwd if necessary for relative path logic within tests
 
-    testTextFilePath = path.join(tempRootDir, 'test.txt');
-    testImageFilePath = path.join(tempRootDir, 'image.png');
-    testPdfFilePath = path.join(tempRootDir, 'document.pdf');
-    testAudioFilePath = path.join(tempRootDir, 'audio.mp3');
-    testBinaryFilePath = path.join(tempRootDir, 'app.exe');
-    nonexistentFilePath = path.join(tempRootDir, 'nonexistent.txt');
-    directoryPath = path.join(tempRootDir, 'subdir');
+    testTextFilePath = path.join(tempRootDir, "test.txt");
+    testImageFilePath = path.join(tempRootDir, "image.png");
+    testPdfFilePath = path.join(tempRootDir, "document.pdf");
+    testAudioFilePath = path.join(tempRootDir, "audio.mp3");
+    testBinaryFilePath = path.join(tempRootDir, "app.exe");
+    nonexistentFilePath = path.join(tempRootDir, "nonexistent.txt");
+    directoryPath = path.join(tempRootDir, "subdir");
 
     actualNodeFs.mkdirSync(directoryPath, { recursive: true }); // Ensure subdir exists
   });
@@ -81,119 +68,111 @@ describe('fileUtils', () => {
     vi.restoreAllMocks(); // Restore any spies
   });
 
-  describe('readWasmBinaryFromDisk', () => {
-    it('loads a WASM binary from disk as a Uint8Array', async () => {
-      const wasmFixtureUrl = new URL(
-        './__fixtures__/dummy.wasm',
-        import.meta.url,
-      );
+  describe("readWasmBinaryFromDisk", () => {
+    it("loads a WASM binary from disk as a Uint8Array", async () => {
+      const wasmFixtureUrl = new URL("./__fixtures__/dummy.wasm", import.meta.url);
       const wasmFixturePath = fileURLToPath(wasmFixtureUrl);
       const result = await readWasmBinaryFromDisk(wasmFixturePath);
-      const expectedBytes = new Uint8Array(
-        await fsPromises.readFile(wasmFixturePath),
-      );
+      const expectedBytes = new Uint8Array(await fsPromises.readFile(wasmFixturePath));
 
       expect(result).toBeInstanceOf(Uint8Array);
       expect(result).toStrictEqual(expectedBytes);
     });
   });
 
-  describe('isWithinRoot', () => {
-    const defaultRoot = path.resolve('/project/root');
+  describe("isWithinRoot", () => {
+    const defaultRoot = path.resolve("/project/root");
 
     it.each([
       {
-        name: 'a path directly within the root',
-        path: path.join(defaultRoot, 'file.txt'),
+        name: "a path directly within the root",
+        path: path.join(defaultRoot, "file.txt"),
         expected: true,
       },
       {
-        name: 'a path in a subdirectory within the root',
-        path: path.join(defaultRoot, 'subdir', 'file.txt'),
+        name: "a path in a subdirectory within the root",
+        path: path.join(defaultRoot, "subdir", "file.txt"),
         expected: true,
       },
-      { name: 'the root path itself', path: defaultRoot, expected: true },
+      { name: "the root path itself", path: defaultRoot, expected: true },
       {
-        name: 'a path with a trailing slash',
-        path: path.join(defaultRoot, 'file.txt') + path.sep,
+        name: "a path with a trailing slash",
+        path: path.join(defaultRoot, "file.txt") + path.sep,
         expected: true,
       },
       {
-        name: 'the root path with a trailing slash',
+        name: "the root path with a trailing slash",
         path: defaultRoot + path.sep,
         expected: true,
       },
       {
-        name: 'a sub-path of the path to check',
-        path: path.resolve('/project/root/sub'),
-        root: path.resolve('/project/root'),
+        name: "a sub-path of the path to check",
+        path: path.resolve("/project/root/sub"),
+        root: path.resolve("/project/root"),
         expected: true,
       },
       {
-        name: 'a path outside the root',
-        path: path.resolve('/project/other', 'file.txt'),
+        name: "a path outside the root",
+        path: path.resolve("/project/other", "file.txt"),
         expected: false,
       },
       {
-        name: 'an unrelated path',
-        path: path.resolve('/unrelated', 'file.txt'),
+        name: "an unrelated path",
+        path: path.resolve("/unrelated", "file.txt"),
         expected: false,
       },
       {
-        name: 'a path that only partially matches the root prefix',
-        path: path.resolve('/project/root-but-actually-different'),
+        name: "a path that only partially matches the root prefix",
+        path: path.resolve("/project/root-but-actually-different"),
         expected: false,
       },
       {
-        name: 'a root path that is a sub-path of the path to check',
-        path: path.resolve('/project/root'),
-        root: path.resolve('/project/root/sub'),
+        name: "a root path that is a sub-path of the path to check",
+        path: path.resolve("/project/root"),
+        root: path.resolve("/project/root/sub"),
         expected: false,
       },
       {
-        name: 'a POSIX path inside',
-        path: '/project/root/file.txt',
-        root: '/project/root',
+        name: "a POSIX path inside",
+        path: "/project/root/file.txt",
+        root: "/project/root",
         expected: true,
       },
       {
-        name: 'a POSIX path outside',
-        path: '/project/other/file.txt',
-        root: '/project/root',
+        name: "a POSIX path outside",
+        path: "/project/other/file.txt",
+        root: "/project/root",
         expected: false,
       },
-    ])(
-      'should return $expected for $name',
-      ({ path: testPath, root, expected }) => {
-        expect(isWithinRoot(testPath, root || defaultRoot)).toBe(expected);
-      },
-    );
+    ])("should return $expected for $name", ({ path: testPath, root, expected }) => {
+      expect(isWithinRoot(testPath, root || defaultRoot)).toBe(expected);
+    });
   });
 
-  describe('fileExists', () => {
-    it('should return true if the file exists', async () => {
-      const testFile = path.join(tempRootDir, 'exists.txt');
-      actualNodeFs.writeFileSync(testFile, 'content');
+  describe("fileExists", () => {
+    it("should return true if the file exists", async () => {
+      const testFile = path.join(tempRootDir, "exists.txt");
+      actualNodeFs.writeFileSync(testFile, "content");
       await expect(fileExists(testFile)).resolves.toBe(true);
     });
 
-    it('should return false if the file does not exist', async () => {
-      const testFile = path.join(tempRootDir, 'does-not-exist.txt');
+    it("should return false if the file does not exist", async () => {
+      const testFile = path.join(tempRootDir, "does-not-exist.txt");
       await expect(fileExists(testFile)).resolves.toBe(false);
     });
 
-    it('should return true for a directory that exists', async () => {
-      const testDir = path.join(tempRootDir, 'exists-dir');
+    it("should return true for a directory that exists", async () => {
+      const testDir = path.join(tempRootDir, "exists-dir");
       actualNodeFs.mkdirSync(testDir);
       await expect(fileExists(testDir)).resolves.toBe(true);
     });
   });
 
-  describe('isBinaryFile', () => {
+  describe("isBinaryFile", () => {
     let filePathForBinaryTest: string;
 
     beforeEach(() => {
-      filePathForBinaryTest = path.join(tempRootDir, 'binaryCheck.tmp');
+      filePathForBinaryTest = path.join(tempRootDir, "binaryCheck.tmp");
     });
 
     afterEach(() => {
@@ -202,20 +181,20 @@ describe('fileUtils', () => {
       }
     });
 
-    it('should return false for an empty file', async () => {
-      actualNodeFs.writeFileSync(filePathForBinaryTest, '');
+    it("should return false for an empty file", async () => {
+      actualNodeFs.writeFileSync(filePathForBinaryTest, "");
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(false);
     });
 
-    it('should return false for a typical text file', async () => {
+    it("should return false for a typical text file", async () => {
       actualNodeFs.writeFileSync(
         filePathForBinaryTest,
-        'Hello, world!\nThis is a test file with normal text content.',
+        "Hello, world!\nThis is a test file with normal text content.",
       );
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(false);
     });
 
-    it('should return true for a file with many null bytes', async () => {
+    it("should return true for a file with many null bytes", async () => {
       const binaryContent = Buffer.from([
         0x48, 0x65, 0x00, 0x6c, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00,
       ]); // "He\0llo\0\0\0\0\0"
@@ -223,7 +202,7 @@ describe('fileUtils', () => {
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(true);
     });
 
-    it('should return true for a file with high percentage of non-printable ASCII', async () => {
+    it("should return true for a file with high percentage of non-printable ASCII", async () => {
       const binaryContent = Buffer.from([
         0x41, 0x42, 0x01, 0x02, 0x03, 0x04, 0x05, 0x43, 0x44, 0x06,
       ]); // AB\x01\x02\x03\x04\x05CD\x06
@@ -231,7 +210,7 @@ describe('fileUtils', () => {
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(true);
     });
 
-    it('should return false if file access fails (e.g., ENOENT)', async () => {
+    it("should return false if file access fails (e.g., ENOENT)", async () => {
       // Ensure the file does not exist
       if (actualNodeFs.existsSync(filePathForBinaryTest)) {
         actualNodeFs.unlinkSync(filePathForBinaryTest);
@@ -240,15 +219,12 @@ describe('fileUtils', () => {
     });
   });
 
-  describe('BOM detection and encoding', () => {
+  describe("BOM detection and encoding", () => {
     let testDir: string;
 
     beforeEach(async () => {
       testDir = await fsPromises.mkdtemp(
-        path.join(
-          await fsPromises.realpath(os.tmpdir()),
-          'fileUtils-bom-test-',
-        ),
+        path.join(await fsPromises.realpath(os.tmpdir()), "fileUtils-bom-test-"),
       );
     });
 
@@ -258,91 +234,85 @@ describe('fileUtils', () => {
       }
     });
 
-    describe('detectBOM', () => {
-      it('should detect UTF-8 BOM', () => {
-        const buf = Buffer.from([
-          0xef, 0xbb, 0xbf, 0x48, 0x65, 0x6c, 0x6c, 0x6f,
-        ]);
+    describe("detectBOM", () => {
+      it("should detect UTF-8 BOM", () => {
+        const buf = Buffer.from([0xef, 0xbb, 0xbf, 0x48, 0x65, 0x6c, 0x6c, 0x6f]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf8', bomLength: 3 });
+        expect(result).toEqual({ encoding: "utf8", bomLength: 3 });
       });
 
-      it('should detect UTF-16 LE BOM', () => {
+      it("should detect UTF-16 LE BOM", () => {
         const buf = Buffer.from([0xff, 0xfe, 0x48, 0x00, 0x65, 0x00]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf16le', bomLength: 2 });
+        expect(result).toEqual({ encoding: "utf16le", bomLength: 2 });
       });
 
-      it('should detect UTF-16 BE BOM', () => {
+      it("should detect UTF-16 BE BOM", () => {
         const buf = Buffer.from([0xfe, 0xff, 0x00, 0x48, 0x00, 0x65]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf16be', bomLength: 2 });
+        expect(result).toEqual({ encoding: "utf16be", bomLength: 2 });
       });
 
-      it('should detect UTF-32 LE BOM', () => {
-        const buf = Buffer.from([
-          0xff, 0xfe, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
-        ]);
+      it("should detect UTF-32 LE BOM", () => {
+        const buf = Buffer.from([0xff, 0xfe, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf32le', bomLength: 4 });
+        expect(result).toEqual({ encoding: "utf32le", bomLength: 4 });
       });
 
-      it('should detect UTF-32 BE BOM', () => {
-        const buf = Buffer.from([
-          0x00, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x48,
-        ]);
+      it("should detect UTF-32 BE BOM", () => {
+        const buf = Buffer.from([0x00, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x48]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf32be', bomLength: 4 });
+        expect(result).toEqual({ encoding: "utf32be", bomLength: 4 });
       });
 
-      it('should return null for no BOM', () => {
+      it("should return null for no BOM", () => {
         const buf = Buffer.from([0x48, 0x65, 0x6c, 0x6c, 0x6f]);
         const result = detectBOM(buf);
         expect(result).toBeNull();
       });
 
-      it('should return null for empty buffer', () => {
+      it("should return null for empty buffer", () => {
         const buf = Buffer.alloc(0);
         const result = detectBOM(buf);
         expect(result).toBeNull();
       });
 
-      it('should return null for partial BOM', () => {
+      it("should return null for partial BOM", () => {
         const buf = Buffer.from([0xef, 0xbb]); // Incomplete UTF-8 BOM
         const result = detectBOM(buf);
         expect(result).toBeNull();
       });
     });
 
-    describe('readFileWithEncoding', () => {
-      it('should read UTF-8 BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+    describe("readFileWithEncoding", () => {
+      it("should read UTF-8 BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf8Bom = Buffer.from([0xef, 0xbb, 0xbf]);
-        const utf8Content = Buffer.from(content, 'utf8');
+        const utf8Content = Buffer.from(content, "utf8");
         const fullBuffer = Buffer.concat([utf8Bom, utf8Content]);
 
-        const filePath = path.join(testDir, 'utf8-bom.txt');
+        const filePath = path.join(testDir, "utf8-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-16 LE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-16 LE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf16leBom = Buffer.from([0xff, 0xfe]);
-        const utf16leContent = Buffer.from(content, 'utf16le');
+        const utf16leContent = Buffer.from(content, "utf16le");
         const fullBuffer = Buffer.concat([utf16leBom, utf16leContent]);
 
-        const filePath = path.join(testDir, 'utf16le-bom.txt');
+        const filePath = path.join(testDir, "utf16le-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-16 BE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-16 BE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         // Manually encode UTF-16 BE: each char as big-endian 16-bit
         const utf16beBom = Buffer.from([0xfe, 0xff]);
         const chars = Array.from(content);
@@ -364,15 +334,15 @@ describe('fileUtils', () => {
         const utf16beContent = Buffer.from(utf16beBytes);
         const fullBuffer = Buffer.concat([utf16beBom, utf16beContent]);
 
-        const filePath = path.join(testDir, 'utf16be-bom.txt');
+        const filePath = path.join(testDir, "utf16be-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-32 LE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-32 LE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf32leBom = Buffer.from([0xff, 0xfe, 0x00, 0x00]);
 
         const utf32leBytes: number[] = [];
@@ -389,15 +359,15 @@ describe('fileUtils', () => {
         const utf32leContent = Buffer.from(utf32leBytes);
         const fullBuffer = Buffer.concat([utf32leBom, utf32leContent]);
 
-        const filePath = path.join(testDir, 'utf32le-bom.txt');
+        const filePath = path.join(testDir, "utf32le-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-32 BE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-32 BE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf32beBom = Buffer.from([0x00, 0x00, 0xfe, 0xff]);
 
         const utf32beBytes: number[] = [];
@@ -414,59 +384,59 @@ describe('fileUtils', () => {
         const utf32beContent = Buffer.from(utf32beBytes);
         const fullBuffer = Buffer.concat([utf32beBom, utf32beContent]);
 
-        const filePath = path.join(testDir, 'utf32be-bom.txt');
+        const filePath = path.join(testDir, "utf32be-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read file without BOM as UTF-8', async () => {
-        const content = 'Hello, 世界!';
-        const filePath = path.join(testDir, 'no-bom.txt');
-        await fsPromises.writeFile(filePath, content, 'utf8');
+      it("should read file without BOM as UTF-8", async () => {
+        const content = "Hello, 世界!";
+        const filePath = path.join(testDir, "no-bom.txt");
+        await fsPromises.writeFile(filePath, content, "utf8");
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should handle empty file', async () => {
-        const filePath = path.join(testDir, 'empty.txt');
-        await fsPromises.writeFile(filePath, '');
+      it("should handle empty file", async () => {
+        const filePath = path.join(testDir, "empty.txt");
+        await fsPromises.writeFile(filePath, "");
 
         const result = await readFileWithEncoding(filePath);
-        expect(result).toBe('');
+        expect(result).toBe("");
       });
     });
 
-    describe('isBinaryFile with BOM awareness', () => {
-      it('should not treat UTF-8 BOM file as binary', async () => {
-        const content = 'Hello, world!';
+    describe("isBinaryFile with BOM awareness", () => {
+      it("should not treat UTF-8 BOM file as binary", async () => {
+        const content = "Hello, world!";
         const utf8Bom = Buffer.from([0xef, 0xbb, 0xbf]);
-        const utf8Content = Buffer.from(content, 'utf8');
+        const utf8Content = Buffer.from(content, "utf8");
         const fullBuffer = Buffer.concat([utf8Bom, utf8Content]);
 
-        const filePath = path.join(testDir, 'utf8-bom-test.txt');
+        const filePath = path.join(testDir, "utf8-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-16 LE BOM file as binary', async () => {
-        const content = 'Hello, world!';
+      it("should not treat UTF-16 LE BOM file as binary", async () => {
+        const content = "Hello, world!";
         const utf16leBom = Buffer.from([0xff, 0xfe]);
-        const utf16leContent = Buffer.from(content, 'utf16le');
+        const utf16leContent = Buffer.from(content, "utf16le");
         const fullBuffer = Buffer.concat([utf16leBom, utf16leContent]);
 
-        const filePath = path.join(testDir, 'utf16le-bom-test.txt');
+        const filePath = path.join(testDir, "utf16le-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-16 BE BOM file as binary', async () => {
+      it("should not treat UTF-16 BE BOM file as binary", async () => {
         const utf16beBom = Buffer.from([0xfe, 0xff]);
         // Simple ASCII in UTF-16 BE
         const utf16beContent = Buffer.from([
@@ -499,14 +469,14 @@ describe('fileUtils', () => {
         ]);
         const fullBuffer = Buffer.concat([utf16beBom, utf16beContent]);
 
-        const filePath = path.join(testDir, 'utf16be-bom-test.txt');
+        const filePath = path.join(testDir, "utf16be-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-32 LE BOM file as binary', async () => {
+      it("should not treat UTF-32 LE BOM file as binary", async () => {
         const utf32leBom = Buffer.from([0xff, 0xfe, 0x00, 0x00]);
         const utf32leContent = Buffer.from([
           0x48,
@@ -532,14 +502,14 @@ describe('fileUtils', () => {
         ]);
         const fullBuffer = Buffer.concat([utf32leBom, utf32leContent]);
 
-        const filePath = path.join(testDir, 'utf32le-bom-test.txt');
+        const filePath = path.join(testDir, "utf32le-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-32 BE BOM file as binary', async () => {
+      it("should not treat UTF-32 BE BOM file as binary", async () => {
         const utf32beBom = Buffer.from([0x00, 0x00, 0xfe, 0xff]);
         const utf32beContent = Buffer.from([
           0x00,
@@ -565,34 +535,30 @@ describe('fileUtils', () => {
         ]);
         const fullBuffer = Buffer.concat([utf32beBom, utf32beContent]);
 
-        const filePath = path.join(testDir, 'utf32be-bom-test.txt');
+        const filePath = path.join(testDir, "utf32be-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should still treat actual binary file as binary', async () => {
+      it("should still treat actual binary file as binary", async () => {
         // PNG header + some binary data with null bytes
-        const pngHeader = Buffer.from([
-          0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-        ]);
-        const binaryData = Buffer.from([
-          0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-        ]); // IHDR chunk with nulls
+        const pngHeader = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+        const binaryData = Buffer.from([0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52]); // IHDR chunk with nulls
         const fullContent = Buffer.concat([pngHeader, binaryData]);
-        const filePath = path.join(testDir, 'test.png');
+        const filePath = path.join(testDir, "test.png");
         await fsPromises.writeFile(filePath, fullContent);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(true);
       });
 
-      it('should treat file with null bytes (no BOM) as binary', async () => {
+      it("should treat file with null bytes (no BOM) as binary", async () => {
         const content = Buffer.from([
           0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x77, 0x6f, 0x72, 0x6c, 0x64,
         ]);
-        const filePath = path.join(testDir, 'null-bytes.bin');
+        const filePath = path.join(testDir, "null-bytes.bin");
         await fsPromises.writeFile(filePath, content);
 
         const result = await isBinaryFile(filePath);
@@ -601,13 +567,13 @@ describe('fileUtils', () => {
     });
   });
 
-  describe('detectFileType', () => {
+  describe("detectFileType", () => {
     let filePathForDetectTest: string;
 
     beforeEach(() => {
-      filePathForDetectTest = path.join(tempRootDir, 'detectType.tmp');
+      filePathForDetectTest = path.join(tempRootDir, "detectType.tmp");
       // Default: create as a text file for isBinaryFile fallback
-      actualNodeFs.writeFileSync(filePathForDetectTest, 'Plain text content');
+      actualNodeFs.writeFileSync(filePathForDetectTest, "Plain text content");
     });
 
     afterEach(() => {
@@ -617,70 +583,62 @@ describe('fileUtils', () => {
       vi.restoreAllMocks(); // Restore spies on actualNodeFs
     });
 
-    it('should detect typescript type by extension (ts, mts, cts, tsx)', async () => {
-      expect(await detectFileType('file.ts')).toBe('text');
-      expect(await detectFileType('file.test.ts')).toBe('text');
-      expect(await detectFileType('file.mts')).toBe('text');
-      expect(await detectFileType('vite.config.mts')).toBe('text');
-      expect(await detectFileType('file.cts')).toBe('text');
-      expect(await detectFileType('component.tsx')).toBe('text');
+    it("should detect typescript type by extension (ts, mts, cts, tsx)", async () => {
+      expect(await detectFileType("file.ts")).toBe("text");
+      expect(await detectFileType("file.test.ts")).toBe("text");
+      expect(await detectFileType("file.mts")).toBe("text");
+      expect(await detectFileType("vite.config.mts")).toBe("text");
+      expect(await detectFileType("file.cts")).toBe("text");
+      expect(await detectFileType("component.tsx")).toBe("text");
     });
 
     it.each([
-      { type: 'image', file: 'file.png', mime: 'image/png' },
-      { type: 'image', file: 'file.jpg', mime: 'image/jpeg' },
-      { type: 'pdf', file: 'file.pdf', mime: 'application/pdf' },
-      { type: 'audio', file: 'song.mp3', mime: 'audio/mpeg' },
-      { type: 'video', file: 'movie.mp4', mime: 'video/mp4' },
-      { type: 'binary', file: 'archive.zip', mime: 'application/zip' },
-      { type: 'binary', file: 'app.exe', mime: 'application/octet-stream' },
-    ])(
-      'should detect $type type for $file by extension',
-      async ({ file, mime, type }) => {
-        mockMimeGetType.mockReturnValueOnce(mime);
-        expect(await detectFileType(file)).toBe(type);
-      },
-    );
+      { type: "image", file: "file.png", mime: "image/png" },
+      { type: "image", file: "file.jpg", mime: "image/jpeg" },
+      { type: "pdf", file: "file.pdf", mime: "application/pdf" },
+      { type: "audio", file: "song.mp3", mime: "audio/mpeg" },
+      { type: "video", file: "movie.mp4", mime: "video/mp4" },
+      { type: "binary", file: "archive.zip", mime: "application/zip" },
+      { type: "binary", file: "app.exe", mime: "application/octet-stream" },
+    ])("should detect $type type for $file by extension", async ({ file, mime, type }) => {
+      mockMimeGetType.mockReturnValueOnce(mime);
+      expect(await detectFileType(file)).toBe(type);
+    });
 
-    it('should detect svg type by extension', async () => {
-      expect(await detectFileType('image.svg')).toBe('svg');
-      expect(await detectFileType('image.icon.svg')).toBe('svg');
+    it("should detect svg type by extension", async () => {
+      expect(await detectFileType("image.svg")).toBe("svg");
+      expect(await detectFileType("image.icon.svg")).toBe("svg");
     });
 
-    it('should use isBinaryFile for unknown extensions and detect as binary', async () => {
+    it("should use isBinaryFile for unknown extensions and detect as binary", async () => {
       mockMimeGetType.mockReturnValueOnce(false); // Unknown mime type
       // Create a file that isBinaryFile will identify as binary
       const binaryContent = Buffer.from([
         0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
       ]);
       actualNodeFs.writeFileSync(filePathForDetectTest, binaryContent);
-      expect(await detectFileType(filePathForDetectTest)).toBe('binary');
+      expect(await detectFileType(filePathForDetectTest)).toBe("binary");
     });
 
-    it('should default to text if mime type is unknown and content is not binary', async () => {
+    it("should default to text if mime type is unknown and content is not binary", async () => {
       mockMimeGetType.mockReturnValueOnce(false); // Unknown mime type
       // filePathForDetectTest is already a text file by default from beforeEach
-      expect(await detectFileType(filePathForDetectTest)).toBe('text');
+      expect(await detectFileType(filePathForDetectTest)).toBe("text");
     });
   });
 
-  describe('processSingleFileContent', () => {
+  describe("processSingleFileContent", () => {
     beforeEach(() => {
       // Ensure files exist for statSync checks before readFile might be mocked
-      if (actualNodeFs.existsSync(testTextFilePath))
-        actualNodeFs.unlinkSync(testTextFilePath);
-      if (actualNodeFs.existsSync(testImageFilePath))
-        actualNodeFs.unlinkSync(testImageFilePath);
-      if (actualNodeFs.existsSync(testPdfFilePath))
-        actualNodeFs.unlinkSync(testPdfFilePath);
-      if (actualNodeFs.existsSync(testAudioFilePath))
-        actualNodeFs.unlinkSync(testAudioFilePath);
-      if (actualNodeFs.existsSync(testBinaryFilePath))
-        actualNodeFs.unlinkSync(testBinaryFilePath);
+      if (actualNodeFs.existsSync(testTextFilePath)) actualNodeFs.unlinkSync(testTextFilePath);
+      if (actualNodeFs.existsSync(testImageFilePath)) actualNodeFs.unlinkSync(testImageFilePath);
+      if (actualNodeFs.existsSync(testPdfFilePath)) actualNodeFs.unlinkSync(testPdfFilePath);
+      if (actualNodeFs.existsSync(testAudioFilePath)) actualNodeFs.unlinkSync(testAudioFilePath);
+      if (actualNodeFs.existsSync(testBinaryFilePath)) actualNodeFs.unlinkSync(testBinaryFilePath);
     });
 
-    it('should read a text file successfully', async () => {
-      const content = 'Line 1\\nLine 2\\nLine 3';
+    it("should read a text file successfully", async () => {
+      const content = "Line 1\\nLine 2\\nLine 3";
       actualNodeFs.writeFileSync(testTextFilePath, content);
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -688,125 +646,116 @@ describe('fileUtils', () => {
         new StandardFileSystemService(),
       );
       expect(result.llmContent).toBe(content);
-      expect(result.returnDisplay).toBe('');
+      expect(result.returnDisplay).toBe("");
       expect(result.error).toBeUndefined();
     });
 
-    it('should handle file not found', async () => {
+    it("should handle file not found", async () => {
       const result = await processSingleFileContent(
         nonexistentFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('File not found');
-      expect(result.returnDisplay).toContain('File not found');
+      expect(result.error).toContain("File not found");
+      expect(result.returnDisplay).toContain("File not found");
     });
 
-    it('should handle read errors for text files', async () => {
-      actualNodeFs.writeFileSync(testTextFilePath, 'content'); // File must exist for initial statSync
-      const readError = new Error('Simulated read error');
-      vi.spyOn(fsPromises, 'readFile').mockRejectedValueOnce(readError);
+    it("should handle read errors for text files", async () => {
+      actualNodeFs.writeFileSync(testTextFilePath, "content"); // File must exist for initial statSync
+      const readError = new Error("Simulated read error");
+      vi.spyOn(fsPromises, "readFile").mockRejectedValueOnce(readError);
 
       const result = await processSingleFileContent(
         testTextFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('Simulated read error');
-      expect(result.returnDisplay).toContain('Simulated read error');
+      expect(result.error).toContain("Simulated read error");
+      expect(result.returnDisplay).toContain("Simulated read error");
     });
 
-    it('should handle read errors for image/pdf files', async () => {
-      actualNodeFs.writeFileSync(testImageFilePath, 'content'); // File must exist
-      mockMimeGetType.mockReturnValue('image/png');
-      const readError = new Error('Simulated image read error');
-      vi.spyOn(fsPromises, 'readFile').mockRejectedValueOnce(readError);
+    it("should handle read errors for image/pdf files", async () => {
+      actualNodeFs.writeFileSync(testImageFilePath, "content"); // File must exist
+      mockMimeGetType.mockReturnValue("image/png");
+      const readError = new Error("Simulated image read error");
+      vi.spyOn(fsPromises, "readFile").mockRejectedValueOnce(readError);
 
       const result = await processSingleFileContent(
         testImageFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('Simulated image read error');
-      expect(result.returnDisplay).toContain('Simulated image read error');
+      expect(result.error).toContain("Simulated image read error");
+      expect(result.returnDisplay).toContain("Simulated image read error");
     });
 
-    it('should process an image file', async () => {
-      const fakePngData = Buffer.from('fake png data');
+    it("should process an image file", async () => {
+      const fakePngData = Buffer.from("fake png data");
       actualNodeFs.writeFileSync(testImageFilePath, fakePngData);
-      mockMimeGetType.mockReturnValue('image/png');
+      mockMimeGetType.mockReturnValue("image/png");
       const result = await processSingleFileContent(
         testImageFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(
-        (result.llmContent as { inlineData: unknown }).inlineData,
-      ).toBeDefined();
-      expect(
-        (result.llmContent as { inlineData: { mimeType: string } }).inlineData
-          .mimeType,
-      ).toBe('image/png');
-      expect(
-        (result.llmContent as { inlineData: { data: string } }).inlineData.data,
-      ).toBe(fakePngData.toString('base64'));
-      expect(result.returnDisplay).toContain('Read image file: image.png');
+      expect((result.llmContent as { inlineData: unknown }).inlineData).toBeDefined();
+      expect((result.llmContent as { inlineData: { mimeType: string } }).inlineData.mimeType).toBe(
+        "image/png",
+      );
+      expect((result.llmContent as { inlineData: { data: string } }).inlineData.data).toBe(
+        fakePngData.toString("base64"),
+      );
+      expect(result.returnDisplay).toContain("Read image file: image.png");
     });
 
-    it('should process a PDF file', async () => {
-      const fakePdfData = Buffer.from('fake pdf data');
+    it("should process a PDF file", async () => {
+      const fakePdfData = Buffer.from("fake pdf data");
       actualNodeFs.writeFileSync(testPdfFilePath, fakePdfData);
-      mockMimeGetType.mockReturnValue('application/pdf');
+      mockMimeGetType.mockReturnValue("application/pdf");
       const result = await processSingleFileContent(
         testPdfFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(
-        (result.llmContent as { inlineData: unknown }).inlineData,
-      ).toBeDefined();
-      expect(
-        (result.llmContent as { inlineData: { mimeType: string } }).inlineData
-          .mimeType,
-      ).toBe('application/pdf');
-      expect(
-        (result.llmContent as { inlineData: { data: string } }).inlineData.data,
-      ).toBe(fakePdfData.toString('base64'));
-      expect(result.returnDisplay).toContain('Read pdf file: document.pdf');
+      expect((result.llmContent as { inlineData: unknown }).inlineData).toBeDefined();
+      expect((result.llmContent as { inlineData: { mimeType: string } }).inlineData.mimeType).toBe(
+        "application/pdf",
+      );
+      expect((result.llmContent as { inlineData: { data: string } }).inlineData.data).toBe(
+        fakePdfData.toString("base64"),
+      );
+      expect(result.returnDisplay).toContain("Read pdf file: document.pdf");
     });
 
-    it('should process an audio file', async () => {
-      const fakeMp3Data = Buffer.from('fake mp3 data');
+    it("should process an audio file", async () => {
+      const fakeMp3Data = Buffer.from("fake mp3 data");
       actualNodeFs.writeFileSync(testAudioFilePath, fakeMp3Data);
-      mockMimeGetType.mockReturnValue('audio/mpeg');
+      mockMimeGetType.mockReturnValue("audio/mpeg");
       const result = await processSingleFileContent(
         testAudioFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(
-        (result.llmContent as { inlineData: unknown }).inlineData,
-      ).toBeDefined();
-      expect(
-        (result.llmContent as { inlineData: { mimeType: string } }).inlineData
-          .mimeType,
-      ).toBe('audio/mpeg');
-      expect(
-        (result.llmContent as { inlineData: { data: string } }).inlineData.data,
-      ).toBe(fakeMp3Data.toString('base64'));
-      expect(result.returnDisplay).toContain('Read audio file: audio.mp3');
+      expect((result.llmContent as { inlineData: unknown }).inlineData).toBeDefined();
+      expect((result.llmContent as { inlineData: { mimeType: string } }).inlineData.mimeType).toBe(
+        "audio/mpeg",
+      );
+      expect((result.llmContent as { inlineData: { data: string } }).inlineData.data).toBe(
+        fakeMp3Data.toString("base64"),
+      );
+      expect(result.returnDisplay).toContain("Read audio file: audio.mp3");
     });
 
-    it('should read an SVG file as text when under 1MB', async () => {
+    it("should read an SVG file as text when under 1MB", async () => {
       const svgContent = `
     <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">
       <rect width="100" height="100" fill="blue" />
     </svg>
   `;
-      const testSvgFilePath = path.join(tempRootDir, 'test.svg');
-      actualNodeFs.writeFileSync(testSvgFilePath, svgContent, 'utf-8');
+      const testSvgFilePath = path.join(tempRootDir, "test.svg");
+      actualNodeFs.writeFileSync(testSvgFilePath, svgContent, "utf-8");
 
-      mockMimeGetType.mockReturnValue('image/svg+xml');
+      mockMimeGetType.mockReturnValue("image/svg+xml");
 
       const result = await processSingleFileContent(
         testSvgFilePath,
@@ -815,15 +764,12 @@ describe('fileUtils', () => {
       );
 
       expect(result.llmContent).toBe(svgContent);
-      expect(result.returnDisplay).toContain('Read SVG as text');
+      expect(result.returnDisplay).toContain("Read SVG as text");
     });
 
-    it('should skip binary files', async () => {
-      actualNodeFs.writeFileSync(
-        testBinaryFilePath,
-        Buffer.from([0x00, 0x01, 0x02]),
-      );
-      mockMimeGetType.mockReturnValueOnce('application/octet-stream');
+    it("should skip binary files", async () => {
+      actualNodeFs.writeFileSync(testBinaryFilePath, Buffer.from([0x00, 0x01, 0x02]));
+      mockMimeGetType.mockReturnValueOnce("application/octet-stream");
       // isBinaryFile will operate on the real file.
 
       const result = await processSingleFileContent(
@@ -831,25 +777,23 @@ describe('fileUtils', () => {
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.llmContent).toContain(
-        'Cannot display content of binary file',
-      );
-      expect(result.returnDisplay).toContain('Skipped binary file: app.exe');
+      expect(result.llmContent).toContain("Cannot display content of binary file");
+      expect(result.returnDisplay).toContain("Skipped binary file: app.exe");
     });
 
-    it('should handle path being a directory', async () => {
+    it("should handle path being a directory", async () => {
       const result = await processSingleFileContent(
         directoryPath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('Path is a directory');
-      expect(result.returnDisplay).toContain('Path is a directory');
+      expect(result.error).toContain("Path is a directory");
+      expect(result.returnDisplay).toContain("Path is a directory");
     });
 
-    it('should paginate text files correctly (offset and limit)', async () => {
+    it("should paginate text files correctly (offset and limit)", async () => {
       const lines = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -858,18 +802,18 @@ describe('fileUtils', () => {
         5,
         5,
       ); // Read lines 6-10
-      const expectedContent = lines.slice(5, 10).join('\n');
+      const expectedContent = lines.slice(5, 10).join("\n");
 
       expect(result.llmContent).toBe(expectedContent);
-      expect(result.returnDisplay).toBe('Read lines 6-10 of 20 from test.txt');
+      expect(result.returnDisplay).toBe("Read lines 6-10 of 20 from test.txt");
       expect(result.isTruncated).toBe(true);
       expect(result.originalLineCount).toBe(20);
       expect(result.linesShown).toEqual([6, 10]);
     });
 
-    it('should identify truncation when reading the end of a file', async () => {
+    it("should identify truncation when reading the end of a file", async () => {
       const lines = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       // Read from line 11 to 20. The start is not 0, so it's truncated.
       const result = await processSingleFileContent(
@@ -879,18 +823,18 @@ describe('fileUtils', () => {
         10,
         10,
       );
-      const expectedContent = lines.slice(10, 20).join('\n');
+      const expectedContent = lines.slice(10, 20).join("\n");
 
       expect(result.llmContent).toContain(expectedContent);
-      expect(result.returnDisplay).toBe('Read lines 11-20 of 20 from test.txt');
+      expect(result.returnDisplay).toBe("Read lines 11-20 of 20 from test.txt");
       expect(result.isTruncated).toBe(true); // This is the key check for the bug
       expect(result.originalLineCount).toBe(20);
       expect(result.linesShown).toEqual([11, 20]);
     });
 
-    it('should handle limit exceeding file length', async () => {
-      const lines = ['Line 1', 'Line 2'];
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+    it("should handle limit exceeding file length", async () => {
+      const lines = ["Line 1", "Line 2"];
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -899,21 +843,18 @@ describe('fileUtils', () => {
         0,
         10,
       );
-      const expectedContent = lines.join('\n');
+      const expectedContent = lines.join("\n");
 
       expect(result.llmContent).toBe(expectedContent);
-      expect(result.returnDisplay).toBe('');
+      expect(result.returnDisplay).toBe("");
       expect(result.isTruncated).toBe(false);
       expect(result.originalLineCount).toBe(2);
       expect(result.linesShown).toEqual([1, 2]);
     });
 
-    it('should truncate long lines in text files', async () => {
-      const longLine = 'a'.repeat(2500);
-      actualNodeFs.writeFileSync(
-        testTextFilePath,
-        `Short line\n${longLine}\nAnother short line`,
-      );
+    it("should truncate long lines in text files", async () => {
+      const longLine = "a".repeat(2500);
+      actualNodeFs.writeFileSync(testTextFilePath, `Short line\n${longLine}\nAnother short line`);
 
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -921,20 +862,18 @@ describe('fileUtils', () => {
         new StandardFileSystemService(),
       );
 
-      expect(result.llmContent).toContain('Short line');
-      expect(result.llmContent).toContain(
-        longLine.substring(0, 2000) + '... [truncated]',
-      );
-      expect(result.llmContent).toContain('Another short line');
+      expect(result.llmContent).toContain("Short line");
+      expect(result.llmContent).toContain(longLine.substring(0, 2000) + "... [truncated]");
+      expect(result.llmContent).toContain("Another short line");
       expect(result.returnDisplay).toBe(
-        'Read all 3 lines from test.txt (some lines were shortened)',
+        "Read all 3 lines from test.txt (some lines were shortened)",
       );
       expect(result.isTruncated).toBe(true);
     });
 
-    it('should truncate when line count exceeds the limit', async () => {
+    it("should truncate when line count exceeds the limit", async () => {
       const lines = Array.from({ length: 11 }, (_, i) => `Line ${i + 1}`);
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       // Read 5 lines, but there are 11 total
       const result = await processSingleFileContent(
@@ -946,14 +885,14 @@ describe('fileUtils', () => {
       );
 
       expect(result.isTruncated).toBe(true);
-      expect(result.returnDisplay).toBe('Read lines 1-5 of 11 from test.txt');
+      expect(result.returnDisplay).toBe("Read lines 1-5 of 11 from test.txt");
     });
 
-    it('should truncate when a line length exceeds the character limit', async () => {
-      const longLine = 'b'.repeat(2500);
+    it("should truncate when a line length exceeds the character limit", async () => {
+      const longLine = "b".repeat(2500);
       const lines = Array.from({ length: 10 }, (_, i) => `Line ${i + 1}`);
       lines.push(longLine); // Total 11 lines
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       // Read all 11 lines, including the long one
       const result = await processSingleFileContent(
@@ -966,20 +905,14 @@ describe('fileUtils', () => {
 
       expect(result.isTruncated).toBe(true);
       expect(result.returnDisplay).toBe(
-        'Read all 11 lines from test.txt (some lines were shortened)',
+        "Read all 11 lines from test.txt (some lines were shortened)",
       );
     });
 
-    it('should truncate both line count and line length when both exceed limits', async () => {
-      const linesWithLongInMiddle = Array.from(
-        { length: 20 },
-        (_, i) => `Line ${i + 1}`,
-      );
-      linesWithLongInMiddle[4] = 'c'.repeat(2500);
-      actualNodeFs.writeFileSync(
-        testTextFilePath,
-        linesWithLongInMiddle.join('\n'),
-      );
+    it("should truncate both line count and line length when both exceed limits", async () => {
+      const linesWithLongInMiddle = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
+      linesWithLongInMiddle[4] = "c".repeat(2500);
+      actualNodeFs.writeFileSync(testTextFilePath, linesWithLongInMiddle.join("\n"));
 
       // Read 10 lines out of 20, including the long line
       const result = await processSingleFileContent(
@@ -991,16 +924,16 @@ describe('fileUtils', () => {
       );
       expect(result.isTruncated).toBe(true);
       expect(result.returnDisplay).toBe(
-        'Read lines 1-10 of 20 from test.txt (some lines were shortened)',
+        "Read lines 1-10 of 20 from test.txt (some lines were shortened)",
       );
     });
 
-    it('should return an error if the file size exceeds 20MB', async () => {
+    it("should return an error if the file size exceeds 20MB", async () => {
       // Create a small test file
-      actualNodeFs.writeFileSync(testTextFilePath, 'test content');
+      actualNodeFs.writeFileSync(testTextFilePath, "test content");
 
       // Spy on fs.promises.stat to return a large file size
-      const statSpy = vi.spyOn(fs.promises, 'stat').mockResolvedValueOnce({
+      const statSpy = vi.spyOn(fs.promises, "stat").mockResolvedValueOnce({
         size: 21 * 1024 * 1024,
         isDirectory: () => false,
       } as fs.Stats);
@@ -1012,11 +945,9 @@ describe('fileUtils', () => {
           new StandardFileSystemService(),
         );
 
-        expect(result.error).toContain('File size exceeds the 20MB limit');
-        expect(result.returnDisplay).toContain(
-          'File size exceeds the 20MB limit',
-        );
-        expect(result.llmContent).toContain('File size exceeds the 20MB limit');
+        expect(result.error).toContain("File size exceeds the 20MB limit");
+        expect(result.returnDisplay).toContain("File size exceeds the 20MB limit");
+        expect(result.llmContent).toContain("File size exceeds the 20MB limit");
       } finally {
         statSpy.mockRestore();
       }
diff --git a/packages/gemini-cli-core/src/utils/fileUtils.ts b/packages/gemini-cli-core/src/utils/fileUtils.ts
index 321162f19..02834222f 100644
--- a/packages/gemini-cli-core/src/utils/fileUtils.ts
+++ b/packages/gemini-cli-core/src/utils/fileUtils.ts
@@ -4,23 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import type { PartUnion } from '@google/genai';
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import { createRequire as createModuleRequire } from "node:module";
+import path from "node:path";
+import type { PartUnion } from "@google/genai";
 // eslint-disable-next-line import/no-internal-modules
-import mime from 'mime/lite';
-import type { FileSystemService } from '../services/fileSystemService.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import { BINARY_EXTENSIONS } from './ignorePatterns.js';
-import { createRequire as createModuleRequire } from 'node:module';
-import { debugLogger } from './debugLogger.js';
+import mime from "mime/lite";
+import type { FileSystemService } from "../services/fileSystemService.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { debugLogger } from "./debugLogger.js";
+import { BINARY_EXTENSIONS } from "./ignorePatterns.js";
 
 const requireModule = createModuleRequire(import.meta.url);
 
-export async function readWasmBinaryFromDisk(
-  specifier: string,
-): Promise<Uint8Array> {
+export async function readWasmBinaryFromDisk(specifier: string): Promise<Uint8Array> {
   const resolvedPath = requireModule.resolve(specifier);
   const buffer = await fsPromises.readFile(resolvedPath);
   return new Uint8Array(buffer);
@@ -46,7 +44,7 @@ export async function loadWasmBinary(
   try {
     return await readWasmBinaryFromDisk(fallbackSpecifier);
   } catch (error) {
-    throw new Error('WASM binary module did not provide a Uint8Array export', {
+    throw new Error("WASM binary module did not provide a Uint8Array export", {
       cause: error,
     });
   }
@@ -57,11 +55,11 @@ const DEFAULT_MAX_LINES_TEXT_FILE = 2000;
 const MAX_LINE_LENGTH_TEXT_FILE = 2000;
 
 // Default values for encoding and separator format
-export const DEFAULT_ENCODING: BufferEncoding = 'utf-8';
+export const DEFAULT_ENCODING: BufferEncoding = "utf-8";
 
 // --- Unicode BOM detection & decoding helpers --------------------------------
 
-type UnicodeEncoding = 'utf8' | 'utf16le' | 'utf16be' | 'utf32le' | 'utf32be';
+type UnicodeEncoding = "utf8" | "utf16le" | "utf16be" | "utf32le" | "utf32be";
 
 interface BOMInfo {
   encoding: UnicodeEncoding;
@@ -75,28 +73,18 @@ interface BOMInfo {
 export function detectBOM(buf: Buffer): BOMInfo | null {
   if (buf.length >= 4) {
     // UTF-32 LE: FF FE 00 00
-    if (
-      buf[0] === 0xff &&
-      buf[1] === 0xfe &&
-      buf[2] === 0x00 &&
-      buf[3] === 0x00
-    ) {
-      return { encoding: 'utf32le', bomLength: 4 };
+    if (buf[0] === 0xff && buf[1] === 0xfe && buf[2] === 0x00 && buf[3] === 0x00) {
+      return { encoding: "utf32le", bomLength: 4 };
     }
     // UTF-32 BE: 00 00 FE FF
-    if (
-      buf[0] === 0x00 &&
-      buf[1] === 0x00 &&
-      buf[2] === 0xfe &&
-      buf[3] === 0xff
-    ) {
-      return { encoding: 'utf32be', bomLength: 4 };
+    if (buf[0] === 0x00 && buf[1] === 0x00 && buf[2] === 0xfe && buf[3] === 0xff) {
+      return { encoding: "utf32be", bomLength: 4 };
     }
   }
   if (buf.length >= 3) {
     // UTF-8: EF BB BF
     if (buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) {
-      return { encoding: 'utf8', bomLength: 3 };
+      return { encoding: "utf8", bomLength: 3 };
     }
   }
   if (buf.length >= 2) {
@@ -106,11 +94,11 @@ export function detectBOM(buf: Buffer): BOMInfo | null {
       buf[1] === 0xfe &&
       (buf.length < 4 || buf[2] !== 0x00 || buf[3] !== 0x00)
     ) {
-      return { encoding: 'utf16le', bomLength: 2 };
+      return { encoding: "utf16le", bomLength: 2 };
     }
     // UTF-16 BE: FE FF
     if (buf[0] === 0xfe && buf[1] === 0xff) {
-      return { encoding: 'utf16be', bomLength: 2 };
+      return { encoding: "utf16be", bomLength: 2 };
     }
   }
   return null;
@@ -121,10 +109,10 @@ export function detectBOM(buf: Buffer): BOMInfo | null {
  * (Node has 'utf16le' but not 'utf16be'.)
  */
 function decodeUTF16BE(buf: Buffer): string {
-  if (buf.length === 0) return '';
+  if (buf.length === 0) return "";
   const swapped = Buffer.from(buf); // swap16 mutates in place, so copy
   swapped.swap16();
-  return swapped.toString('utf16le');
+  return swapped.toString("utf16le");
 }
 
 /**
@@ -132,26 +120,18 @@ function decodeUTF16BE(buf: Buffer): string {
  * Invalid code points are replaced with U+FFFD, partial trailing bytes are ignored.
  */
 function decodeUTF32(buf: Buffer, littleEndian: boolean): string {
-  if (buf.length < 4) return '';
+  if (buf.length < 4) return "";
   const usable = buf.length - (buf.length % 4);
-  let out = '';
+  let out = "";
   for (let i = 0; i < usable; i += 4) {
     const cp = littleEndian
-      ? (buf[i] |
-          (buf[i + 1] << 8) |
-          (buf[i + 2] << 16) |
-          (buf[i + 3] << 24)) >>>
-        0
-      : (buf[i + 3] |
-          (buf[i + 2] << 8) |
-          (buf[i + 1] << 16) |
-          (buf[i] << 24)) >>>
-        0;
+      ? (buf[i] | (buf[i + 1] << 8) | (buf[i + 2] << 16) | (buf[i + 3] << 24)) >>> 0
+      : (buf[i + 3] | (buf[i + 2] << 8) | (buf[i + 1] << 16) | (buf[i] << 24)) >>> 0;
     // Valid planes: 0x0000..0x10FFFF excluding surrogates
     if (cp <= 0x10ffff && !(cp >= 0xd800 && cp <= 0xdfff)) {
       out += String.fromCodePoint(cp);
     } else {
-      out += '\uFFFD';
+      out += "\uFFFD";
     }
   }
   return out;
@@ -164,30 +144,30 @@ function decodeUTF32(buf: Buffer, littleEndian: boolean): string {
 export async function readFileWithEncoding(filePath: string): Promise<string> {
   // Read the file once; detect BOM and decode from the single buffer.
   const full = await fs.promises.readFile(filePath);
-  if (full.length === 0) return '';
+  if (full.length === 0) return "";
 
   const bom = detectBOM(full);
   if (!bom) {
     // No BOM → treat as UTF‑8
-    return full.toString('utf8');
+    return full.toString("utf8");
   }
 
   // Strip BOM and decode per encoding
   const content = full.subarray(bom.bomLength);
   switch (bom.encoding) {
-    case 'utf8':
-      return content.toString('utf8');
-    case 'utf16le':
-      return content.toString('utf16le');
-    case 'utf16be':
+    case "utf8":
+      return content.toString("utf8");
+    case "utf16le":
+      return content.toString("utf16le");
+    case "utf16be":
       return decodeUTF16BE(content);
-    case 'utf32le':
+    case "utf32le":
       return decodeUTF32(content, true);
-    case 'utf32be':
+    case "utf32be":
       return decodeUTF32(content, false);
     default:
       // Defensive fallback; should be unreachable
-      return content.toString('utf8');
+      return content.toString("utf8");
   }
 }
 
@@ -198,7 +178,7 @@ export async function readFileWithEncoding(filePath: string): Promise<string> {
  */
 export function getSpecificMimeType(filePath: string): string | undefined {
   const lookedUpMime = mime.getType(filePath);
-  return typeof lookedUpMime === 'string' ? lookedUpMime : undefined;
+  return typeof lookedUpMime === "string" ? lookedUpMime : undefined;
 }
 
 /**
@@ -207,18 +187,14 @@ export function getSpecificMimeType(filePath: string): string | undefined {
  * @param rootDirectory The absolute root directory.
  * @returns True if the path is within the root directory, false otherwise.
  */
-export function isWithinRoot(
-  pathToCheck: string,
-  rootDirectory: string,
-): boolean {
+export function isWithinRoot(pathToCheck: string, rootDirectory: string): boolean {
   const normalizedPathToCheck = path.resolve(pathToCheck);
   const normalizedRootDirectory = path.resolve(rootDirectory);
 
   // Ensure the rootDirectory path ends with a separator for correct startsWith comparison,
   // unless it's the root path itself (e.g., '/' or 'C:\').
   const rootWithSeparator =
-    normalizedRootDirectory === path.sep ||
-    normalizedRootDirectory.endsWith(path.sep)
+    normalizedRootDirectory === path.sep || normalizedRootDirectory.endsWith(path.sep)
       ? normalizedRootDirectory
       : normalizedRootDirectory + path.sep;
 
@@ -236,7 +212,7 @@ export function isWithinRoot(
 export async function isBinaryFile(filePath: string): Promise<boolean> {
   let fh: fs.promises.FileHandle | null = null;
   try {
-    fh = await fs.promises.open(filePath, 'r');
+    fh = await fs.promises.open(filePath, "r");
     const stats = await fh.stat();
     const fileSize = stats.size;
     if (fileSize === 0) return false; // empty is not binary
@@ -287,49 +263,49 @@ export async function isBinaryFile(filePath: string): Promise<boolean> {
  */
 export async function detectFileType(
   filePath: string,
-): Promise<'text' | 'image' | 'pdf' | 'audio' | 'video' | 'binary' | 'svg'> {
+): Promise<"text" | "image" | "pdf" | "audio" | "video" | "binary" | "svg"> {
   const ext = path.extname(filePath).toLowerCase();
 
   // The mimetype for various TypeScript extensions (ts, mts, cts, tsx) can be
   // MPEG transport stream (a video format), but we want to assume these are
   // TypeScript files instead.
-  if (['.ts', '.mts', '.cts'].includes(ext)) {
-    return 'text';
+  if ([".ts", ".mts", ".cts"].includes(ext)) {
+    return "text";
   }
 
-  if (ext === '.svg') {
-    return 'svg';
+  if (ext === ".svg") {
+    return "svg";
   }
 
   const lookedUpMimeType = mime.getType(filePath); // Returns null if not found, or the mime type string
   if (lookedUpMimeType) {
-    if (lookedUpMimeType.startsWith('image/')) {
-      return 'image';
+    if (lookedUpMimeType.startsWith("image/")) {
+      return "image";
     }
-    if (lookedUpMimeType.startsWith('audio/')) {
-      return 'audio';
+    if (lookedUpMimeType.startsWith("audio/")) {
+      return "audio";
     }
-    if (lookedUpMimeType.startsWith('video/')) {
-      return 'video';
+    if (lookedUpMimeType.startsWith("video/")) {
+      return "video";
     }
-    if (lookedUpMimeType === 'application/pdf') {
-      return 'pdf';
+    if (lookedUpMimeType === "application/pdf") {
+      return "pdf";
     }
   }
 
   // Stricter binary check for common non-text extensions before content check
   // These are often not well-covered by mime-types or might be misidentified.
   if (BINARY_EXTENSIONS.includes(ext)) {
-    return 'binary';
+    return "binary";
   }
 
   // Fall back to content-based check if mime type wasn't conclusive for image/pdf
   // and it's not a known binary extension.
   if (await isBinaryFile(filePath)) {
-    return 'binary';
+    return "binary";
   }
 
-  return 'text';
+  return "text";
 }
 
 export interface ProcessedFileReadResult {
@@ -361,9 +337,8 @@ export async function processSingleFileContent(
     if (!fs.existsSync(filePath)) {
       // Sync check is acceptable before async read
       return {
-        llmContent:
-          'Could not read file because no file was found at the specified path.',
-        returnDisplay: 'File not found.',
+        llmContent: "Could not read file because no file was found at the specified path.",
+        returnDisplay: "File not found.",
         error: `File not found: ${filePath}`,
         errorType: ToolErrorType.FILE_NOT_FOUND,
       };
@@ -371,9 +346,8 @@ export async function processSingleFileContent(
     const stats = await fs.promises.stat(filePath);
     if (stats.isDirectory()) {
       return {
-        llmContent:
-          'Could not read file because the provided path is a directory, not a file.',
-        returnDisplay: 'Path is a directory.',
+        llmContent: "Could not read file because the provided path is a directory, not a file.",
+        returnDisplay: "Path is a directory.",
         error: `Path is a directory, not a file: ${filePath}`,
         errorType: ToolErrorType.TARGET_IS_DIRECTORY,
       };
@@ -382,26 +356,24 @@ export async function processSingleFileContent(
     const fileSizeInMB = stats.size / (1024 * 1024);
     if (fileSizeInMB > 20) {
       return {
-        llmContent: 'File size exceeds the 20MB limit.',
-        returnDisplay: 'File size exceeds the 20MB limit.',
+        llmContent: "File size exceeds the 20MB limit.",
+        returnDisplay: "File size exceeds the 20MB limit.",
         error: `File size exceeds the 20MB limit: ${filePath} (${fileSizeInMB.toFixed(2)}MB)`,
         errorType: ToolErrorType.FILE_TOO_LARGE,
       };
     }
 
     const fileType = await detectFileType(filePath);
-    const relativePathForDisplay = path
-      .relative(rootDirectory, filePath)
-      .replace(/\\/g, '/');
+    const relativePathForDisplay = path.relative(rootDirectory, filePath).replace(/\\/g, "/");
 
     switch (fileType) {
-      case 'binary': {
+      case "binary": {
         return {
           llmContent: `Cannot display content of binary file: ${relativePathForDisplay}`,
           returnDisplay: `Skipped binary file: ${relativePathForDisplay}`,
         };
       }
-      case 'svg': {
+      case "svg": {
         const SVG_MAX_SIZE_BYTES = 1 * 1024 * 1024;
         if (stats.size > SVG_MAX_SIZE_BYTES) {
           return {
@@ -415,15 +387,14 @@ export async function processSingleFileContent(
           returnDisplay: `Read SVG as text: ${relativePathForDisplay}`,
         };
       }
-      case 'text': {
+      case "text": {
         // Use BOM-aware reader to avoid leaving a BOM character in content and to support UTF-16/32 transparently
         const content = await readFileWithEncoding(filePath);
-        const lines = content.split('\n');
+        const lines = content.split("\n");
         const originalLineCount = lines.length;
 
         const startLine = offset || 0;
-        const effectiveLimit =
-          limit === undefined ? DEFAULT_MAX_LINES_TEXT_FILE : limit;
+        const effectiveLimit = limit === undefined ? DEFAULT_MAX_LINES_TEXT_FILE : limit;
         // Ensure endLine does not exceed originalLineCount
         const endLine = Math.min(startLine + effectiveLimit, originalLineCount);
         // Ensure selectedLines doesn't try to slice beyond array bounds if startLine is too high
@@ -434,26 +405,23 @@ export async function processSingleFileContent(
         const formattedLines = selectedLines.map((line) => {
           if (line.length > MAX_LINE_LENGTH_TEXT_FILE) {
             linesWereTruncatedInLength = true;
-            return (
-              line.substring(0, MAX_LINE_LENGTH_TEXT_FILE) + '... [truncated]'
-            );
+            return line.substring(0, MAX_LINE_LENGTH_TEXT_FILE) + "... [truncated]";
           }
           return line;
         });
 
-        const contentRangeTruncated =
-          startLine > 0 || endLine < originalLineCount;
+        const contentRangeTruncated = startLine > 0 || endLine < originalLineCount;
         const isTruncated = contentRangeTruncated || linesWereTruncatedInLength;
-        const llmContent = formattedLines.join('\n');
+        const llmContent = formattedLines.join("\n");
 
         // By default, return nothing to streamline the common case of a successful read_file.
-        let returnDisplay = '';
+        let returnDisplay = "";
         if (contentRangeTruncated) {
           returnDisplay = `Read lines ${
             actualStartLine + 1
           }-${endLine} of ${originalLineCount} from ${relativePathForDisplay}`;
           if (linesWereTruncatedInLength) {
-            returnDisplay += ' (some lines were shortened)';
+            returnDisplay += " (some lines were shortened)";
           }
         } else if (linesWereTruncatedInLength) {
           returnDisplay = `Read all ${originalLineCount} lines from ${relativePathForDisplay} (some lines were shortened)`;
@@ -467,17 +435,17 @@ export async function processSingleFileContent(
           linesShown: [actualStartLine + 1, endLine],
         };
       }
-      case 'image':
-      case 'pdf':
-      case 'audio':
-      case 'video': {
+      case "image":
+      case "pdf":
+      case "audio":
+      case "video": {
         const contentBuffer = await fs.promises.readFile(filePath);
-        const base64Data = contentBuffer.toString('base64');
+        const base64Data = contentBuffer.toString("base64");
         return {
           llmContent: {
             inlineData: {
               data: base64Data,
-              mimeType: mime.getType(filePath) || 'application/octet-stream',
+              mimeType: mime.getType(filePath) || "application/octet-stream",
             },
           },
           returnDisplay: `Read ${fileType} file: ${relativePathForDisplay}`,
@@ -495,9 +463,7 @@ export async function processSingleFileContent(
     }
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    const displayPath = path
-      .relative(rootDirectory, filePath)
-      .replace(/\\/g, '/');
+    const displayPath = path.relative(rootDirectory, filePath).replace(/\\/g, "/");
     return {
       llmContent: `Error reading file ${displayPath}: ${errorMessage}`,
       returnDisplay: `Error reading file ${displayPath}: ${errorMessage}`,
diff --git a/packages/gemini-cli-core/src/utils/filesearch/crawlCache.test.ts b/packages/gemini-cli-core/src/utils/filesearch/crawlCache.test.ts
index c8ca0df2e..7a1ec5b06 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/crawlCache.test.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/crawlCache.test.ts
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
-import { getCacheKey, read, write, clear } from './crawlCache.js';
-
-describe('CrawlCache', () => {
-  describe('getCacheKey', () => {
-    it('should generate a consistent hash', () => {
-      const key1 = getCacheKey('/foo', 'bar');
-      const key2 = getCacheKey('/foo', 'bar');
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { clear, getCacheKey, read, write } from "./crawlCache.js";
+
+describe("CrawlCache", () => {
+  describe("getCacheKey", () => {
+    it("should generate a consistent hash", () => {
+      const key1 = getCacheKey("/foo", "bar");
+      const key2 = getCacheKey("/foo", "bar");
       expect(key1).toBe(key2);
     });
 
-    it('should generate a different hash for different directories', () => {
-      const key1 = getCacheKey('/foo', 'bar');
-      const key2 = getCacheKey('/bar', 'bar');
+    it("should generate a different hash for different directories", () => {
+      const key1 = getCacheKey("/foo", "bar");
+      const key2 = getCacheKey("/bar", "bar");
       expect(key1).not.toBe(key2);
     });
 
-    it('should generate a different hash for different ignore content', () => {
-      const key1 = getCacheKey('/foo', 'bar');
-      const key2 = getCacheKey('/foo', 'baz');
+    it("should generate a different hash for different ignore content", () => {
+      const key1 = getCacheKey("/foo", "bar");
+      const key2 = getCacheKey("/foo", "baz");
       expect(key1).not.toBe(key2);
     });
 
-    it('should generate a different hash for different maxDepth values', () => {
-      const key1 = getCacheKey('/foo', 'bar', 1);
-      const key2 = getCacheKey('/foo', 'bar', 2);
-      const key3 = getCacheKey('/foo', 'bar', undefined);
-      const key4 = getCacheKey('/foo', 'bar');
+    it("should generate a different hash for different maxDepth values", () => {
+      const key1 = getCacheKey("/foo", "bar", 1);
+      const key2 = getCacheKey("/foo", "bar", 2);
+      const key3 = getCacheKey("/foo", "bar", undefined);
+      const key4 = getCacheKey("/foo", "bar");
       expect(key1).not.toBe(key2);
       expect(key1).not.toBe(key3);
       expect(key2).not.toBe(key3);
@@ -39,7 +39,7 @@ describe('CrawlCache', () => {
     });
   });
 
-  describe('in-memory cache operations', () => {
+  describe("in-memory cache operations", () => {
     beforeEach(() => {
       // Ensure a clean slate before each test
       clear();
@@ -50,32 +50,32 @@ describe('CrawlCache', () => {
       vi.useRealTimers();
     });
 
-    it('should write and read data from the cache', () => {
-      const key = 'test-key';
-      const data = ['foo', 'bar'];
+    it("should write and read data from the cache", () => {
+      const key = "test-key";
+      const data = ["foo", "bar"];
       write(key, data, 10000); // 10 second TTL
       const cachedData = read(key);
       expect(cachedData).toEqual(data);
     });
 
-    it('should return undefined for a nonexistent key', () => {
-      const cachedData = read('nonexistent-key');
+    it("should return undefined for a nonexistent key", () => {
+      const cachedData = read("nonexistent-key");
       expect(cachedData).toBeUndefined();
     });
 
-    it('should clear the cache', () => {
-      const key = 'test-key';
-      const data = ['foo', 'bar'];
+    it("should clear the cache", () => {
+      const key = "test-key";
+      const data = ["foo", "bar"];
       write(key, data, 10000);
       clear();
       const cachedData = read(key);
       expect(cachedData).toBeUndefined();
     });
 
-    it('should automatically evict a cache entry after its TTL expires', async () => {
+    it("should automatically evict a cache entry after its TTL expires", async () => {
       vi.useFakeTimers();
-      const key = 'ttl-key';
-      const data = ['foo'];
+      const key = "ttl-key";
+      const data = ["foo"];
       const ttl = 5000; // 5 seconds
 
       write(key, data, ttl);
@@ -92,11 +92,11 @@ describe('CrawlCache', () => {
       expect(read(key)).toBeUndefined();
     });
 
-    it('should reset the timer when an entry is updated', async () => {
+    it("should reset the timer when an entry is updated", async () => {
       vi.useFakeTimers();
-      const key = 'update-key';
-      const initialData = ['initial'];
-      const updatedData = ['updated'];
+      const key = "update-key";
+      const initialData = ["initial"];
+      const updatedData = ["updated"];
       const ttl = 5000; // 5 seconds
 
       // Write initial data
diff --git a/packages/gemini-cli-core/src/utils/filesearch/crawlCache.ts b/packages/gemini-cli-core/src/utils/filesearch/crawlCache.ts
index b905c9dfc..b13cf6812 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/crawlCache.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/crawlCache.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import crypto from 'node:crypto';
+import crypto from "node:crypto";
 
 const crawlCache = new Map<string, string[]>();
 const cacheTimers = new Map<string, NodeJS.Timeout>();
@@ -19,13 +19,13 @@ export const getCacheKey = (
   ignoreContent: string,
   maxDepth?: number,
 ): string => {
-  const hash = crypto.createHash('sha256');
+  const hash = crypto.createHash("sha256");
   hash.update(directory);
   hash.update(ignoreContent);
   if (maxDepth !== undefined) {
     hash.update(String(maxDepth));
   }
-  return hash.digest('hex');
+  return hash.digest("hex");
 };
 
 /**
diff --git a/packages/gemini-cli-core/src/utils/filesearch/crawler.test.ts b/packages/gemini-cli-core/src/utils/filesearch/crawler.test.ts
index 5e2252af2..4a6129a93 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/crawler.test.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/crawler.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach, vi, beforeEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as cache from './crawlCache.js';
-import { crawl } from './crawler.js';
-import { createTmpDir, cleanupTmpDir } from '@airiscode/ui-gemini-test-utils';
-import type { Ignore } from './ignore.js';
-import { loadIgnoreRules } from './ignore.js';
-
-describe('crawler', () => {
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { cleanupTmpDir, createTmpDir } from "@airiscode/ui-gemini-test-utils";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import * as cache from "./crawlCache.js";
+import { crawl } from "./crawler.js";
+import type { Ignore } from "./ignore.js";
+import { loadIgnoreRules } from "./ignore.js";
+
+describe("crawler", () => {
   let tmpDir: string;
   afterEach(async () => {
     if (tmpDir) {
@@ -22,11 +22,11 @@ describe('crawler', () => {
     vi.restoreAllMocks();
   });
 
-  it('should use .geminiignore rules', async () => {
+  it("should use .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.geminiignore': 'dist/',
-      dist: ['ignored.js'],
-      src: ['not-ignored.js'],
+      ".geminiignore": "dist/",
+      dist: ["ignored.js"],
+      src: ["not-ignored.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -45,22 +45,17 @@ describe('crawler', () => {
     });
 
     expect(results).toEqual(
-      expect.arrayContaining([
-        '.',
-        'src/',
-        '.geminiignore',
-        'src/not-ignored.js',
-      ]),
+      expect.arrayContaining([".", "src/", ".geminiignore", "src/not-ignored.js"]),
     );
   });
 
-  it('should combine .gitignore and .geminiignore rules', async () => {
+  it("should combine .gitignore and .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': 'dist/',
-      '.geminiignore': 'build/',
-      dist: ['ignored-by-git.js'],
-      build: ['ignored-by-gemini.js'],
-      src: ['not-ignored.js'],
+      ".gitignore": "dist/",
+      ".geminiignore": "build/",
+      dist: ["ignored-by-git.js"],
+      build: ["ignored-by-gemini.js"],
+      src: ["not-ignored.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -79,27 +74,21 @@ describe('crawler', () => {
     });
 
     expect(results).toEqual(
-      expect.arrayContaining([
-        '.',
-        'src/',
-        '.geminiignore',
-        '.gitignore',
-        'src/not-ignored.js',
-      ]),
+      expect.arrayContaining([".", "src/", ".geminiignore", ".gitignore", "src/not-ignored.js"]),
     );
   });
 
-  it('should use ignoreDirs option', async () => {
+  it("should use ignoreDirs option", async () => {
     tmpDir = await createTmpDir({
-      logs: ['some.log'],
-      src: ['main.js'],
+      logs: ["some.log"],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
       useGitignore: false,
       useGeminiignore: false,
-      ignoreDirs: ['logs'],
+      ignoreDirs: ["logs"],
     });
 
     const results = await crawl({
@@ -110,21 +99,17 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', 'src/main.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", "src/main.js"]));
   });
 
-  it('should handle negated directories', async () => {
+  it("should handle negated directories", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['build/**', '!build/public', '!build/public/**'].join(
-        '\n',
-      ),
+      ".gitignore": ["build/**", "!build/public", "!build/public/**"].join("\n"),
       build: {
-        'private.js': '',
-        public: ['index.html'],
+        "private.js": "",
+        public: ["index.html"],
       },
-      src: ['main.js'],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -144,22 +129,22 @@ describe('crawler', () => {
 
     expect(results).toEqual(
       expect.arrayContaining([
-        '.',
-        'build/',
-        'build/public/',
-        'src/',
-        '.gitignore',
-        'build/public/index.html',
-        'src/main.js',
+        ".",
+        "build/",
+        "build/public/",
+        "src/",
+        ".gitignore",
+        "build/public/index.html",
+        "src/main.js",
       ]),
     );
   });
 
-  it('should handle root-level file negation', async () => {
+  it("should handle root-level file negation", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['*.mk', '!Foo.mk'].join('\n'),
-      'bar.mk': '',
-      'Foo.mk': '',
+      ".gitignore": ["*.mk", "!Foo.mk"].join("\n"),
+      "bar.mk": "",
+      "Foo.mk": "",
     });
 
     const ignore = loadIgnoreRules({
@@ -177,26 +162,24 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', '.gitignore', 'Foo.mk', 'bar.mk']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", ".gitignore", "Foo.mk", "bar.mk"]));
   });
 
-  it('should handle directory negation with glob', async () => {
+  it("should handle directory negation with glob", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': [
-        'third_party/**',
-        '!third_party/foo',
-        '!third_party/foo/bar',
-        '!third_party/foo/bar/baz_buffer',
-      ].join('\n'),
+      ".gitignore": [
+        "third_party/**",
+        "!third_party/foo",
+        "!third_party/foo/bar",
+        "!third_party/foo/bar/baz_buffer",
+      ].join("\n"),
       third_party: {
         foo: {
           bar: {
-            baz_buffer: '',
+            baz_buffer: "",
           },
         },
-        ignore_this: '',
+        ignore_this: "",
       },
     });
 
@@ -217,21 +200,21 @@ describe('crawler', () => {
 
     expect(results).toEqual(
       expect.arrayContaining([
-        '.',
-        'third_party/',
-        'third_party/foo/',
-        'third_party/foo/bar/',
-        '.gitignore',
-        'third_party/foo/bar/baz_buffer',
+        ".",
+        "third_party/",
+        "third_party/foo/",
+        "third_party/foo/bar/",
+        ".gitignore",
+        "third_party/foo/bar/baz_buffer",
       ]),
     );
   });
 
-  it('should correctly handle negated patterns in .gitignore', async () => {
+  it("should correctly handle negated patterns in .gitignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['dist/**', '!dist/keep.js'].join('\n'),
-      dist: ['ignore.js', 'keep.js'],
-      src: ['main.js'],
+      ".gitignore": ["dist/**", "!dist/keep.js"].join("\n"),
+      dist: ["ignore.js", "keep.js"],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -250,20 +233,13 @@ describe('crawler', () => {
     });
 
     expect(results).toEqual(
-      expect.arrayContaining([
-        '.',
-        'dist/',
-        'src/',
-        '.gitignore',
-        'dist/keep.js',
-        'src/main.js',
-      ]),
+      expect.arrayContaining([".", "dist/", "src/", ".gitignore", "dist/keep.js", "src/main.js"]),
     );
   });
 
-  it('should initialize correctly when ignore files are missing', async () => {
+  it("should initialize correctly when ignore files are missing", async () => {
     tmpDir = await createTmpDir({
-      src: ['file1.js'],
+      src: ["file1.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -280,15 +256,13 @@ describe('crawler', () => {
       cache: false,
       cacheTtl: 0,
     });
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', 'src/file1.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", "src/file1.js"]));
   });
 
-  it('should handle empty or commented-only ignore files', async () => {
+  it("should handle empty or commented-only ignore files", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '# This is a comment\n\n   \n',
-      src: ['main.js'],
+      ".gitignore": "# This is a comment\n\n   \n",
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -306,15 +280,13 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', '.gitignore', 'src/main.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", ".gitignore", "src/main.js"]));
   });
 
-  it('should always ignore the .git directory', async () => {
+  it("should always ignore the .git directory", async () => {
     tmpDir = await createTmpDir({
-      '.git': ['config', 'HEAD'],
-      src: ['main.js'],
+      ".git": ["config", "HEAD"],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -332,12 +304,10 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', 'src/main.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", "src/main.js"]));
   });
 
-  describe('with in-memory cache', () => {
+  describe("with in-memory cache", () => {
     beforeEach(() => {
       cache.clear();
       vi.useFakeTimers();
@@ -347,8 +317,8 @@ describe('crawler', () => {
       vi.useRealTimers();
     });
 
-    it('should hit the cache for subsequent crawls', async () => {
-      tmpDir = await createTmpDir({ 'file1.js': '' });
+    it("should hit the cache for subsequent crawls", async () => {
+      tmpDir = await createTmpDir({ "file1.js": "" });
       const ignore = loadIgnoreRules({
         projectRoot: tmpDir,
         useGitignore: false,
@@ -363,7 +333,7 @@ describe('crawler', () => {
         cacheTtl: 10,
       };
 
-      const crawlSpy = vi.spyOn(cache, 'read');
+      const crawlSpy = vi.spyOn(cache, "read");
 
       await crawl(options);
       expect(crawlSpy).toHaveBeenCalledTimes(1);
@@ -380,11 +350,11 @@ describe('crawler', () => {
       expect(cache.read(cacheKey)).toBeDefined();
     });
 
-    it('should miss the cache when ignore rules change', async () => {
+    it("should miss the cache when ignore rules change", async () => {
       tmpDir = await createTmpDir({
-        '.gitignore': 'a.txt',
-        'a.txt': '',
-        'b.txt': '',
+        ".gitignore": "a.txt",
+        "a.txt": "",
+        "b.txt": "",
       });
       const getIgnore = () =>
         loadIgnoreRules({
@@ -404,23 +374,19 @@ describe('crawler', () => {
       // Initial crawl to populate the cache
       const ignore1 = getIgnore();
       const results1 = await crawl(getOptions(ignore1));
-      expect(results1).toEqual(
-        expect.arrayContaining(['.', '.gitignore', 'b.txt']),
-      );
+      expect(results1).toEqual(expect.arrayContaining([".", ".gitignore", "b.txt"]));
 
       // Modify the ignore file
-      await fs.writeFile(path.join(tmpDir, '.gitignore'), 'b.txt');
+      await fs.writeFile(path.join(tmpDir, ".gitignore"), "b.txt");
 
       // Second crawl should miss the cache and trigger a recrawl
       const ignore2 = getIgnore();
       const results2 = await crawl(getOptions(ignore2));
-      expect(results2).toEqual(
-        expect.arrayContaining(['.', '.gitignore', 'a.txt']),
-      );
+      expect(results2).toEqual(expect.arrayContaining([".", ".gitignore", "a.txt"]));
     });
 
-    it('should miss the cache after TTL expires', async () => {
-      tmpDir = await createTmpDir({ 'file1.js': '' });
+    it("should miss the cache after TTL expires", async () => {
+      tmpDir = await createTmpDir({ "file1.js": "" });
       const ignore = loadIgnoreRules({
         projectRoot: tmpDir,
         useGitignore: false,
@@ -435,8 +401,8 @@ describe('crawler', () => {
         cacheTtl: 10, // 10 seconds
       };
 
-      const readSpy = vi.spyOn(cache, 'read');
-      const writeSpy = vi.spyOn(cache, 'write');
+      const readSpy = vi.spyOn(cache, "read");
+      const writeSpy = vi.spyOn(cache, "write");
 
       await crawl(options);
       expect(readSpy).toHaveBeenCalledTimes(1);
@@ -450,8 +416,8 @@ describe('crawler', () => {
       expect(writeSpy).toHaveBeenCalledTimes(2);
     });
 
-    it('should miss the cache when maxDepth changes', async () => {
-      tmpDir = await createTmpDir({ 'file1.js': '' });
+    it("should miss the cache when maxDepth changes", async () => {
+      tmpDir = await createTmpDir({ "file1.js": "" });
       const ignore = loadIgnoreRules({
         projectRoot: tmpDir,
         useGitignore: false,
@@ -467,8 +433,8 @@ describe('crawler', () => {
         maxDepth,
       });
 
-      const readSpy = vi.spyOn(cache, 'read');
-      const writeSpy = vi.spyOn(cache, 'write');
+      const readSpy = vi.spyOn(cache, "read");
+      const writeSpy = vi.spyOn(cache, "write");
 
       // 1. First crawl with maxDepth: 1
       await crawl(getOptions(1));
@@ -487,16 +453,16 @@ describe('crawler', () => {
     });
   });
 
-  describe('with maxDepth', () => {
+  describe("with maxDepth", () => {
     beforeEach(async () => {
       tmpDir = await createTmpDir({
-        'file-root.txt': '',
+        "file-root.txt": "",
         level1: {
-          'file-level1.txt': '',
+          "file-level1.txt": "",
           level2: {
-            'file-level2.txt': '',
+            "file-level2.txt": "",
             level3: {
-              'file-level3.txt': '',
+              "file-level3.txt": "",
             },
           },
         },
@@ -520,53 +486,51 @@ describe('crawler', () => {
       });
     };
 
-    it('should only crawl top-level files when maxDepth is 0', async () => {
+    it("should only crawl top-level files when maxDepth is 0", async () => {
       const results = await getCrawlResults(0);
-      expect(results).toEqual(
-        expect.arrayContaining(['.', 'level1/', 'file-root.txt']),
-      );
+      expect(results).toEqual(expect.arrayContaining([".", "level1/", "file-root.txt"]));
     });
 
-    it('should crawl one level deep when maxDepth is 1', async () => {
+    it("should crawl one level deep when maxDepth is 1", async () => {
       const results = await getCrawlResults(1);
       expect(results).toEqual(
         expect.arrayContaining([
-          '.',
-          'level1/',
-          'level1/level2/',
-          'file-root.txt',
-          'level1/file-level1.txt',
+          ".",
+          "level1/",
+          "level1/level2/",
+          "file-root.txt",
+          "level1/file-level1.txt",
         ]),
       );
     });
 
-    it('should crawl two levels deep when maxDepth is 2', async () => {
+    it("should crawl two levels deep when maxDepth is 2", async () => {
       const results = await getCrawlResults(2);
       expect(results).toEqual(
         expect.arrayContaining([
-          '.',
-          'level1/',
-          'level1/level2/',
-          'level1/level2/level3/',
-          'file-root.txt',
-          'level1/file-level1.txt',
-          'level1/level2/file-level2.txt',
+          ".",
+          "level1/",
+          "level1/level2/",
+          "level1/level2/level3/",
+          "file-root.txt",
+          "level1/file-level1.txt",
+          "level1/level2/file-level2.txt",
         ]),
       );
     });
 
-    it('should perform a full recursive crawl when maxDepth is undefined', async () => {
+    it("should perform a full recursive crawl when maxDepth is undefined", async () => {
       const results = await getCrawlResults(undefined);
       expect(results).toEqual(
         expect.arrayContaining([
-          '.',
-          'level1/',
-          'level1/level2/',
-          'level1/level2/level3/',
-          'file-root.txt',
-          'level1/file-level1.txt',
-          'level1/level2/file-level2.txt',
-          'level1/level2/level3/file-level3.txt',
+          ".",
+          "level1/",
+          "level1/level2/",
+          "level1/level2/level3/",
+          "file-root.txt",
+          "level1/file-level1.txt",
+          "level1/level2/file-level2.txt",
+          "level1/level2/level3/file-level3.txt",
         ]),
       );
     });
diff --git a/packages/gemini-cli-core/src/utils/filesearch/crawler.ts b/packages/gemini-cli-core/src/utils/filesearch/crawler.ts
index 9184ba328..4a1b7f22d 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/crawler.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/crawler.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { fdir } from 'fdir';
-import type { Ignore } from './ignore.js';
-import * as cache from './crawlCache.js';
+import path from "node:path";
+import { fdir } from "fdir";
+import * as cache from "./crawlCache.js";
+import type { Ignore } from "./ignore.js";
 
 export interface CrawlOptions {
   // The directory to start the crawl from.
@@ -50,7 +50,7 @@ export async function crawl(options: CrawlOptions): Promise<string[]> {
     const api = new fdir()
       .withRelativePaths()
       .withDirs()
-      .withPathSeparator('/') // Always use unix style paths
+      .withPathSeparator("/") // Always use unix style paths
       .exclude((_, dirPath) => {
         const relativePath = path.posix.relative(posixCrawlDirectory, dirPath);
         return dirFilter(`${relativePath}/`);
@@ -68,9 +68,7 @@ export async function crawl(options: CrawlOptions): Promise<string[]> {
 
   const relativeToCrawlDir = path.posix.relative(posixCwd, posixCrawlDirectory);
 
-  const relativeToCwdResults = results.map((p) =>
-    path.posix.join(relativeToCrawlDir, p),
-  );
+  const relativeToCwdResults = results.map((p) => path.posix.join(relativeToCrawlDir, p));
 
   if (options.cache) {
     const cacheKey = cache.getCacheKey(
diff --git a/packages/gemini-cli-core/src/utils/filesearch/fileSearch.test.ts b/packages/gemini-cli-core/src/utils/filesearch/fileSearch.test.ts
index f5d1ebb57..bae7b79e2 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/fileSearch.test.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/fileSearch.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach, vi } from 'vitest';
-import { FileSearchFactory, AbortError, filter } from './fileSearch.js';
-import { createTmpDir, cleanupTmpDir } from '@airiscode/ui-gemini-test-utils';
+import { cleanupTmpDir, createTmpDir } from "@airiscode/ui-gemini-test-utils";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { AbortError, FileSearchFactory, filter } from "./fileSearch.js";
 
-describe('FileSearch', () => {
+describe("FileSearch", () => {
   let tmpDir: string;
   afterEach(async () => {
     if (tmpDir) {
@@ -17,11 +17,11 @@ describe('FileSearch', () => {
     vi.restoreAllMocks();
   });
 
-  it('should use .geminiignore rules', async () => {
+  it("should use .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.geminiignore': 'dist/',
-      dist: ['ignored.js'],
-      src: ['not-ignored.js'],
+      ".geminiignore": "dist/",
+      dist: ["ignored.js"],
+      src: ["not-ignored.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -36,18 +36,18 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', '.geminiignore', 'src/not-ignored.js']);
+    expect(results).toEqual(["src/", ".geminiignore", "src/not-ignored.js"]);
   });
 
-  it('should combine .gitignore and .geminiignore rules', async () => {
+  it("should combine .gitignore and .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': 'dist/',
-      '.geminiignore': 'build/',
-      dist: ['ignored-by-git.js'],
-      build: ['ignored-by-gemini.js'],
-      src: ['not-ignored.js'],
+      ".gitignore": "dist/",
+      ".geminiignore": "build/",
+      dist: ["ignored-by-git.js"],
+      build: ["ignored-by-gemini.js"],
+      src: ["not-ignored.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -62,27 +62,22 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual([
-      'src/',
-      '.geminiignore',
-      '.gitignore',
-      'src/not-ignored.js',
-    ]);
+    expect(results).toEqual(["src/", ".geminiignore", ".gitignore", "src/not-ignored.js"]);
   });
 
-  it('should use ignoreDirs option', async () => {
+  it("should use ignoreDirs option", async () => {
     tmpDir = await createTmpDir({
-      logs: ['some.log'],
-      src: ['main.js'],
+      logs: ["some.log"],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
       projectRoot: tmpDir,
       useGitignore: false,
       useGeminiignore: false,
-      ignoreDirs: ['logs'],
+      ignoreDirs: ["logs"],
       cache: false,
       cacheTtl: 0,
       enableRecursiveFileSearch: true,
@@ -90,21 +85,19 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', 'src/main.js']);
+    expect(results).toEqual(["src/", "src/main.js"]);
   });
 
-  it('should handle negated directories', async () => {
+  it("should handle negated directories", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['build/**', '!build/public', '!build/public/**'].join(
-        '\n',
-      ),
+      ".gitignore": ["build/**", "!build/public", "!build/public/**"].join("\n"),
       build: {
-        'private.js': '',
-        public: ['index.html'],
+        "private.js": "",
+        public: ["index.html"],
       },
-      src: ['main.js'],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -119,24 +112,24 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
     expect(results).toEqual([
-      'build/',
-      'build/public/',
-      'src/',
-      '.gitignore',
-      'build/public/index.html',
-      'src/main.js',
+      "build/",
+      "build/public/",
+      "src/",
+      ".gitignore",
+      "build/public/index.html",
+      "src/main.js",
     ]);
   });
 
-  it('should filter results with a search pattern', async () => {
+  it("should filter results with a search pattern", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'main.js': '',
-        'util.ts': '',
-        'style.css': '',
+        "main.js": "",
+        "util.ts": "",
+        "style.css": "",
       },
     });
 
@@ -152,16 +145,16 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('**/*.js');
+    const results = await fileSearch.search("**/*.js");
 
-    expect(results).toEqual(['src/main.js']);
+    expect(results).toEqual(["src/main.js"]);
   });
 
-  it('should handle root-level file negation', async () => {
+  it("should handle root-level file negation", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['*.mk', '!Foo.mk'].join('\n'),
-      'bar.mk': '',
-      'Foo.mk': '',
+      ".gitignore": ["*.mk", "!Foo.mk"].join("\n"),
+      "bar.mk": "",
+      "Foo.mk": "",
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -176,26 +169,26 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['.gitignore', 'Foo.mk']);
+    expect(results).toEqual([".gitignore", "Foo.mk"]);
   });
 
-  it('should handle directory negation with glob', async () => {
+  it("should handle directory negation with glob", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': [
-        'third_party/**',
-        '!third_party/foo',
-        '!third_party/foo/bar',
-        '!third_party/foo/bar/baz_buffer',
-      ].join('\n'),
+      ".gitignore": [
+        "third_party/**",
+        "!third_party/foo",
+        "!third_party/foo/bar",
+        "!third_party/foo/bar/baz_buffer",
+      ].join("\n"),
       third_party: {
         foo: {
           bar: {
-            baz_buffer: '',
+            baz_buffer: "",
           },
         },
-        ignore_this: '',
+        ignore_this: "",
       },
     });
 
@@ -211,22 +204,22 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
     expect(results).toEqual([
-      'third_party/',
-      'third_party/foo/',
-      'third_party/foo/bar/',
-      '.gitignore',
-      'third_party/foo/bar/baz_buffer',
+      "third_party/",
+      "third_party/foo/",
+      "third_party/foo/bar/",
+      ".gitignore",
+      "third_party/foo/bar/baz_buffer",
     ]);
   });
 
-  it('should correctly handle negated patterns in .gitignore', async () => {
+  it("should correctly handle negated patterns in .gitignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['dist/**', '!dist/keep.js'].join('\n'),
-      dist: ['ignore.js', 'keep.js'],
-      src: ['main.js'],
+      ".gitignore": ["dist/**", "!dist/keep.js"].join("\n"),
+      dist: ["ignore.js", "keep.js"],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -241,22 +234,16 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual([
-      'dist/',
-      'src/',
-      '.gitignore',
-      'dist/keep.js',
-      'src/main.js',
-    ]);
+    expect(results).toEqual(["dist/", "src/", ".gitignore", "dist/keep.js", "src/main.js"]);
   });
 
   // New test cases start here
 
-  it('should initialize correctly when ignore files are missing', async () => {
+  it("should initialize correctly when ignore files are missing", async () => {
     tmpDir = await createTmpDir({
-      src: ['file1.js'],
+      src: ["file1.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -272,17 +259,17 @@ describe('FileSearch', () => {
 
     // Expect no errors to be thrown during initialization
     await expect(fileSearch.initialize()).resolves.toBeUndefined();
-    const results = await fileSearch.search('');
-    expect(results).toEqual(['src/', 'src/file1.js']);
+    const results = await fileSearch.search("");
+    expect(results).toEqual(["src/", "src/file1.js"]);
   });
 
-  it('should respect maxResults option in search', async () => {
+  it("should respect maxResults option in search", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file1.js': '',
-        'file2.js': '',
-        'file3.js': '',
-        'file4.js': '',
+        "file1.js": "",
+        "file2.js": "",
+        "file3.js": "",
+        "file4.js": "",
       },
     });
 
@@ -298,17 +285,17 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('**/*.js', { maxResults: 2 });
+    const results = await fileSearch.search("**/*.js", { maxResults: 2 });
 
-    expect(results).toEqual(['src/file1.js', 'src/file2.js']); // Assuming alphabetical sort
+    expect(results).toEqual(["src/file1.js", "src/file2.js"]); // Assuming alphabetical sort
   });
 
-  it('should use fzf for fuzzy matching when pattern does not contain wildcards', async () => {
+  it("should use fzf for fuzzy matching when pattern does not contain wildcards", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'main.js': '',
-        'util.ts': '',
-        'style.css': '',
+        "main.js": "",
+        "util.ts": "",
+        "style.css": "",
       },
     });
 
@@ -324,17 +311,17 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('sst');
+    const results = await fileSearch.search("sst");
 
-    expect(results).toEqual(['src/style.css']);
+    expect(results).toEqual(["src/style.css"]);
   });
 
-  it('should not use fzf for fuzzy matching when disableFuzzySearch is true', async () => {
+  it("should not use fzf for fuzzy matching when disableFuzzySearch is true", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file1.js': '',
-        'flexible.js': '',
-        'other.ts': '',
+        "file1.js": "",
+        "flexible.js": "",
+        "other.ts": "",
       },
     });
 
@@ -350,17 +337,17 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('fle');
+    const results = await fileSearch.search("fle");
 
-    expect(results).toEqual(['src/flexible.js']);
+    expect(results).toEqual(["src/flexible.js"]);
   });
 
-  it('should use fzf for fuzzy matching when disableFuzzySearch is false', async () => {
+  it("should use fzf for fuzzy matching when disableFuzzySearch is false", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file1.js': '',
-        'flexible.js': '',
-        'other.ts': '',
+        "file1.js": "",
+        "flexible.js": "",
+        "other.ts": "",
       },
     });
 
@@ -376,16 +363,14 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('fle');
+    const results = await fileSearch.search("fle");
 
-    expect(results).toEqual(
-      expect.arrayContaining(['src/file1.js', 'src/flexible.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["src/file1.js", "src/flexible.js"]));
   });
 
-  it('should return empty array when no matches are found', async () => {
+  it("should return empty array when no matches are found", async () => {
     tmpDir = await createTmpDir({
-      src: ['file1.js'],
+      src: ["file1.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -400,16 +385,16 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('nonexistent-file.xyz');
+    const results = await fileSearch.search("nonexistent-file.xyz");
 
     expect(results).toEqual([]);
   });
 
-  it('should throw AbortError when filter is aborted', async () => {
+  it("should throw AbortError when filter is aborted", async () => {
     const controller = new AbortController();
     const dummyPaths = Array.from({ length: 5000 }, (_, i) => `file${i}.js`); // Large array to ensure yielding
 
-    const filterPromise = filter(dummyPaths, '*.js', controller.signal);
+    const filterPromise = filter(dummyPaths, "*.js", controller.signal);
 
     // Abort after a short delay to ensure filter has started
     setTimeout(() => controller.abort(), 1);
@@ -417,7 +402,7 @@ describe('FileSearch', () => {
     await expect(filterPromise).rejects.toThrow(AbortError);
   });
 
-  it('should throw an error if search is called before initialization', async () => {
+  it("should throw an error if search is called before initialization", async () => {
     tmpDir = await createTmpDir({});
     const fileSearch = FileSearchFactory.create({
       projectRoot: tmpDir,
@@ -430,15 +415,15 @@ describe('FileSearch', () => {
       disableFuzzySearch: false,
     });
 
-    await expect(fileSearch.search('')).rejects.toThrow(
-      'Engine not initialized. Call initialize() first.',
+    await expect(fileSearch.search("")).rejects.toThrow(
+      "Engine not initialized. Call initialize() first.",
     );
   });
 
-  it('should handle empty or commented-only ignore files', async () => {
+  it("should handle empty or commented-only ignore files", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '# This is a comment\n\n   \n',
-      src: ['main.js'],
+      ".gitignore": "# This is a comment\n\n   \n",
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -453,15 +438,15 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', '.gitignore', 'src/main.js']);
+    expect(results).toEqual(["src/", ".gitignore", "src/main.js"]);
   });
 
-  it('should always ignore the .git directory', async () => {
+  it("should always ignore the .git directory", async () => {
     tmpDir = await createTmpDir({
-      '.git': ['config', 'HEAD'],
-      src: ['main.js'],
+      ".git": ["config", "HEAD"],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -476,15 +461,15 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', 'src/main.js']);
+    expect(results).toEqual(["src/", "src/main.js"]);
   });
 
-  it('should be cancellable via AbortSignal', async () => {
+  it("should be cancellable via AbortSignal", async () => {
     const largeDir: Record<string, string> = {};
     for (let i = 0; i < 100; i++) {
-      largeDir[`file${i}.js`] = '';
+      largeDir[`file${i}.js`] = "";
     }
     tmpDir = await createTmpDir(largeDir);
 
@@ -502,7 +487,7 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     const controller = new AbortController();
-    const searchPromise = fileSearch.search('**/*.js', {
+    const searchPromise = fileSearch.search("**/*.js", {
       signal: controller.signal,
     });
 
@@ -514,13 +499,13 @@ describe('FileSearch', () => {
     await expect(searchPromise).rejects.toThrow(AbortError);
   });
 
-  it('should leverage ResultCache for bestBaseQuery optimization', async () => {
+  it("should leverage ResultCache for bestBaseQuery optimization", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'foo.js': '',
-        'bar.ts': '',
+        "foo.js": "",
+        "bar.ts": "",
         nested: {
-          'baz.js': '',
+          "baz.js": "",
         },
       },
     });
@@ -539,30 +524,30 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     // Perform a broad search to prime the cache
-    const broadResults = await fileSearch.search('src/**');
+    const broadResults = await fileSearch.search("src/**");
     expect(broadResults).toEqual([
-      'src/',
-      'src/nested/',
-      'src/bar.ts',
-      'src/foo.js',
-      'src/nested/baz.js',
+      "src/",
+      "src/nested/",
+      "src/bar.ts",
+      "src/foo.js",
+      "src/nested/baz.js",
     ]);
 
     // Perform a more specific search that should leverage the broad search's cached results
-    const specificResults = await fileSearch.search('src/**/*.js');
-    expect(specificResults).toEqual(['src/foo.js', 'src/nested/baz.js']);
+    const specificResults = await fileSearch.search("src/**/*.js");
+    expect(specificResults).toEqual(["src/foo.js", "src/nested/baz.js"]);
 
     // Although we can't directly inspect ResultCache.hits/misses from here,
     // the correctness of specificResults after a broad search implicitly
     // verifies that the caching mechanism, including bestBaseQuery, is working.
   });
 
-  it('should be case-insensitive by default', async () => {
+  it("should be case-insensitive by default", async () => {
     tmpDir = await createTmpDir({
-      'File1.Js': '',
-      'file2.js': '',
-      'FILE3.JS': '',
-      'other.txt': '',
+      "File1.Js": "",
+      "file2.js": "",
+      "FILE3.JS": "",
+      "other.txt": "",
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -579,34 +564,28 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     // Search with a lowercase pattern
-    let results = await fileSearch.search('file*.js');
+    let results = await fileSearch.search("file*.js");
     expect(results).toHaveLength(3);
-    expect(results).toEqual(
-      expect.arrayContaining(['File1.Js', 'file2.js', 'FILE3.JS']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["File1.Js", "file2.js", "FILE3.JS"]));
 
     // Search with an uppercase pattern
-    results = await fileSearch.search('FILE*.JS');
+    results = await fileSearch.search("FILE*.JS");
     expect(results).toHaveLength(3);
-    expect(results).toEqual(
-      expect.arrayContaining(['File1.Js', 'file2.js', 'FILE3.JS']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["File1.Js", "file2.js", "FILE3.JS"]));
 
     // Search with a mixed-case pattern
-    results = await fileSearch.search('FiLe*.Js');
+    results = await fileSearch.search("FiLe*.Js");
     expect(results).toHaveLength(3);
-    expect(results).toEqual(
-      expect.arrayContaining(['File1.Js', 'file2.js', 'FILE3.JS']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["File1.Js", "file2.js", "FILE3.JS"]));
   });
 
-  it('should respect maxResults even when the cache returns an exact match', async () => {
+  it("should respect maxResults even when the cache returns an exact match", async () => {
     tmpDir = await createTmpDir({
-      'file1.js': '',
-      'file2.js': '',
-      'file3.js': '',
-      'file4.js': '',
-      'file5.js': '',
+      "file1.js": "",
+      "file2.js": "",
+      "file3.js": "",
+      "file4.js": "",
+      "file5.js": "",
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -623,27 +602,21 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     // 1. Perform a broad search to populate the cache with an exact match.
-    const initialResults = await fileSearch.search('*.js');
-    expect(initialResults).toEqual([
-      'file1.js',
-      'file2.js',
-      'file3.js',
-      'file4.js',
-      'file5.js',
-    ]);
+    const initialResults = await fileSearch.search("*.js");
+    expect(initialResults).toEqual(["file1.js", "file2.js", "file3.js", "file4.js", "file5.js"]);
 
     // 2. Perform the same search again, but this time with a maxResults limit.
-    const limitedResults = await fileSearch.search('*.js', { maxResults: 2 });
+    const limitedResults = await fileSearch.search("*.js", { maxResults: 2 });
 
     // 3. Assert that the maxResults limit was respected, even with a cache hit.
-    expect(limitedResults).toEqual(['file1.js', 'file2.js']);
+    expect(limitedResults).toEqual(["file1.js", "file2.js"]);
   });
 
-  it('should handle file paths with special characters that need escaping', async () => {
+  it("should handle file paths with special characters that need escaping", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file with (special) chars.txt': '',
-        'another-file.txt': '',
+        "file with (special) chars.txt": "",
+        "another-file.txt": "",
       },
     });
 
@@ -662,19 +635,17 @@ describe('FileSearch', () => {
 
     // Search for the file using a pattern that contains special characters.
     // The `unescapePath` function should handle the escaped path correctly.
-    const results = await fileSearch.search(
-      'src/file with \\(special\\) chars.txt',
-    );
+    const results = await fileSearch.search("src/file with \\(special\\) chars.txt");
 
-    expect(results).toEqual(['src/file with (special) chars.txt']);
+    expect(results).toEqual(["src/file with (special) chars.txt"]);
   });
 
-  describe('DirectoryFileSearch', () => {
-    it('should search for files in the current directory', async () => {
+  describe("DirectoryFileSearch", () => {
+    it("should search for files in the current directory", async () => {
       tmpDir = await createTmpDir({
-        'file1.js': '',
-        'file2.ts': '',
-        'file3.js': '',
+        "file1.js": "",
+        "file2.ts": "",
+        "file3.js": "",
       });
 
       const fileSearch = FileSearchFactory.create({
@@ -689,16 +660,16 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('*.js');
-      expect(results).toEqual(['file1.js', 'file3.js']);
+      const results = await fileSearch.search("*.js");
+      expect(results).toEqual(["file1.js", "file3.js"]);
     });
 
-    it('should search for files in a subdirectory', async () => {
+    it("should search for files in a subdirectory", async () => {
       tmpDir = await createTmpDir({
-        'file1.js': '',
+        "file1.js": "",
         src: {
-          'file2.js': '',
-          'file3.ts': '',
+          "file2.js": "",
+          "file3.ts": "",
         },
       });
 
@@ -714,16 +685,16 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('src/*.js');
-      expect(results).toEqual(['src/file2.js']);
+      const results = await fileSearch.search("src/*.js");
+      expect(results).toEqual(["src/file2.js"]);
     });
 
-    it('should list all files in a directory', async () => {
+    it("should list all files in a directory", async () => {
       tmpDir = await createTmpDir({
-        'file1.js': '',
+        "file1.js": "",
         src: {
-          'file2.js': '',
-          'file3.ts': '',
+          "file2.js": "",
+          "file3.ts": "",
         },
       });
 
@@ -739,15 +710,15 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('src/');
-      expect(results).toEqual(['src/file2.js', 'src/file3.ts']);
+      const results = await fileSearch.search("src/");
+      expect(results).toEqual(["src/file2.js", "src/file3.ts"]);
     });
 
-    it('should respect ignore rules', async () => {
+    it("should respect ignore rules", async () => {
       tmpDir = await createTmpDir({
-        '.gitignore': '*.js',
-        'file1.js': '',
-        'file2.ts': '',
+        ".gitignore": "*.js",
+        "file1.js": "",
+        "file2.ts": "",
       });
 
       const fileSearch = FileSearchFactory.create({
@@ -762,8 +733,8 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('*');
-      expect(results).toEqual(['.gitignore', 'file2.ts']);
+      const results = await fileSearch.search("*");
+      expect(results).toEqual([".gitignore", "file2.ts"]);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/filesearch/fileSearch.ts b/packages/gemini-cli-core/src/utils/filesearch/fileSearch.ts
index d81e02382..0a3299b42 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/fileSearch.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/fileSearch.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import picomatch from 'picomatch';
-import type { Ignore } from './ignore.js';
-import { loadIgnoreRules } from './ignore.js';
-import { ResultCache } from './result-cache.js';
-import { crawl } from './crawler.js';
-import type { FzfResultItem } from 'fzf';
-import { AsyncFzf } from 'fzf';
-import { unescapePath } from '../paths.js';
+import path from "node:path";
+import type { FzfResultItem } from "fzf";
+import { AsyncFzf } from "fzf";
+import picomatch from "picomatch";
+import { unescapePath } from "../paths.js";
+import { crawl } from "./crawler.js";
+import type { Ignore } from "./ignore.js";
+import { loadIgnoreRules } from "./ignore.js";
+import { ResultCache } from "./result-cache.js";
 
 export interface FileSearchOptions {
   projectRoot: string;
@@ -27,9 +27,9 @@ export interface FileSearchOptions {
 }
 
 export class AbortError extends Error {
-  constructor(message = 'Search aborted') {
+  constructor(message = "Search aborted") {
     super(message);
-    this.name = 'AbortError';
+    this.name = "AbortError";
   }
 }
 
@@ -67,8 +67,8 @@ export async function filter(
   }
 
   results.sort((a, b) => {
-    const aIsDir = a.endsWith('/');
-    const bIsDir = b.endsWith('/');
+    const aIsDir = a.endsWith("/");
+    const bIsDir = b.endsWith("/");
 
     if (aIsDir && !bIsDir) return -1;
     if (!aIsDir && bIsDir) return 1;
@@ -113,30 +113,22 @@ class RecursiveFileSearch implements FileSearch {
     this.buildResultCache();
   }
 
-  async search(
-    pattern: string,
-    options: SearchOptions = {},
-  ): Promise<string[]> {
-    if (
-      !this.resultCache ||
-      (!this.fzf && !this.options.disableFuzzySearch) ||
-      !this.ignore
-    ) {
-      throw new Error('Engine not initialized. Call initialize() first.');
+  async search(pattern: string, options: SearchOptions = {}): Promise<string[]> {
+    if (!this.resultCache || (!this.fzf && !this.options.disableFuzzySearch) || !this.ignore) {
+      throw new Error("Engine not initialized. Call initialize() first.");
     }
 
-    pattern = unescapePath(pattern) || '*';
+    pattern = unescapePath(pattern) || "*";
 
     let filteredCandidates;
-    const { files: candidates, isExactMatch } =
-      await this.resultCache!.get(pattern);
+    const { files: candidates, isExactMatch } = await this.resultCache!.get(pattern);
 
     if (isExactMatch) {
       // Use the cached result.
       filteredCandidates = candidates;
     } else {
       let shouldCache = true;
-      if (pattern.includes('*') || !this.fzf) {
+      if (pattern.includes("*") || !this.fzf) {
         filteredCandidates = await filter(candidates, pattern, options.signal);
       } else {
         filteredCandidates = await this.fzf
@@ -168,7 +160,7 @@ class RecursiveFileSearch implements FileSearch {
       if (results.length >= (options.maxResults ?? Infinity)) {
         break;
       }
-      if (candidate === '.') {
+      if (candidate === ".") {
         continue;
       }
       if (!fileFilter(candidate)) {
@@ -185,7 +177,7 @@ class RecursiveFileSearch implements FileSearch {
       // occurrence of the pattern. We use it for search spaces that have >20k
       // files, because the v2 algorithm is just too slow in those cases.
       this.fzf = new AsyncFzf(this.allFiles, {
-        fuzzy: this.allFiles.length > 20000 ? 'v1' : 'v2',
+        fuzzy: this.allFiles.length > 20000 ? "v1" : "v2",
       });
     }
   }
@@ -200,16 +192,13 @@ class DirectoryFileSearch implements FileSearch {
     this.ignore = loadIgnoreRules(this.options);
   }
 
-  async search(
-    pattern: string,
-    options: SearchOptions = {},
-  ): Promise<string[]> {
+  async search(pattern: string, options: SearchOptions = {}): Promise<string[]> {
     if (!this.ignore) {
-      throw new Error('Engine not initialized. Call initialize() first.');
+      throw new Error("Engine not initialized. Call initialize() first.");
     }
-    pattern = pattern || '*';
+    pattern = pattern || "*";
 
-    const dir = pattern.endsWith('/') ? pattern : path.dirname(pattern);
+    const dir = pattern.endsWith("/") ? pattern : path.dirname(pattern);
     const results = await crawl({
       crawlDirectory: path.join(this.options.projectRoot, dir),
       cwd: this.options.projectRoot,
@@ -227,7 +216,7 @@ class DirectoryFileSearch implements FileSearch {
       if (finalResults.length >= (options.maxResults ?? Infinity)) {
         break;
       }
-      if (candidate === '.') {
+      if (candidate === ".") {
         continue;
       }
       if (!fileFilter(candidate)) {
diff --git a/packages/gemini-cli-core/src/utils/filesearch/ignore.test.ts b/packages/gemini-cli-core/src/utils/filesearch/ignore.test.ts
index de740cb7a..3eddd63cd 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/ignore.test.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/ignore.test.ts
@@ -4,68 +4,68 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach } from 'vitest';
-import { Ignore, loadIgnoreRules } from './ignore.js';
-import { createTmpDir, cleanupTmpDir } from '@airiscode/ui-gemini-test-utils';
-
-describe('Ignore', () => {
-  describe('getDirectoryFilter', () => {
-    it('should ignore directories matching directory patterns', () => {
-      const ig = new Ignore().add(['foo/', 'bar/']);
+import { cleanupTmpDir, createTmpDir } from "@airiscode/ui-gemini-test-utils";
+import { afterEach, describe, expect, it } from "vitest";
+import { Ignore, loadIgnoreRules } from "./ignore.js";
+
+describe("Ignore", () => {
+  describe("getDirectoryFilter", () => {
+    it("should ignore directories matching directory patterns", () => {
+      const ig = new Ignore().add(["foo/", "bar/"]);
       const dirFilter = ig.getDirectoryFilter();
-      expect(dirFilter('foo/')).toBe(true);
-      expect(dirFilter('bar/')).toBe(true);
-      expect(dirFilter('baz/')).toBe(false);
+      expect(dirFilter("foo/")).toBe(true);
+      expect(dirFilter("bar/")).toBe(true);
+      expect(dirFilter("baz/")).toBe(false);
     });
 
-    it('should not ignore directories with file patterns', () => {
-      const ig = new Ignore().add(['foo.js', '*.log']);
+    it("should not ignore directories with file patterns", () => {
+      const ig = new Ignore().add(["foo.js", "*.log"]);
       const dirFilter = ig.getDirectoryFilter();
-      expect(dirFilter('foo.js')).toBe(false);
-      expect(dirFilter('foo.log')).toBe(false);
+      expect(dirFilter("foo.js")).toBe(false);
+      expect(dirFilter("foo.log")).toBe(false);
     });
   });
 
-  describe('getFileFilter', () => {
-    it('should not ignore files with directory patterns', () => {
-      const ig = new Ignore().add(['foo/', 'bar/']);
+  describe("getFileFilter", () => {
+    it("should not ignore files with directory patterns", () => {
+      const ig = new Ignore().add(["foo/", "bar/"]);
       const fileFilter = ig.getFileFilter();
-      expect(fileFilter('foo')).toBe(false);
-      expect(fileFilter('foo/file.txt')).toBe(false);
+      expect(fileFilter("foo")).toBe(false);
+      expect(fileFilter("foo/file.txt")).toBe(false);
     });
 
-    it('should ignore files matching file patterns', () => {
-      const ig = new Ignore().add(['*.log', 'foo.js']);
+    it("should ignore files matching file patterns", () => {
+      const ig = new Ignore().add(["*.log", "foo.js"]);
       const fileFilter = ig.getFileFilter();
-      expect(fileFilter('foo.log')).toBe(true);
-      expect(fileFilter('foo.js')).toBe(true);
-      expect(fileFilter('bar.txt')).toBe(false);
+      expect(fileFilter("foo.log")).toBe(true);
+      expect(fileFilter("foo.js")).toBe(true);
+      expect(fileFilter("bar.txt")).toBe(false);
     });
   });
 
-  it('should accumulate patterns across multiple add() calls', () => {
-    const ig = new Ignore().add('foo.js');
-    ig.add('bar.js');
+  it("should accumulate patterns across multiple add() calls", () => {
+    const ig = new Ignore().add("foo.js");
+    ig.add("bar.js");
     const fileFilter = ig.getFileFilter();
-    expect(fileFilter('foo.js')).toBe(true);
-    expect(fileFilter('bar.js')).toBe(true);
-    expect(fileFilter('baz.js')).toBe(false);
+    expect(fileFilter("foo.js")).toBe(true);
+    expect(fileFilter("bar.js")).toBe(true);
+    expect(fileFilter("baz.js")).toBe(false);
   });
 
-  it('should return a stable and consistent fingerprint', () => {
-    const ig1 = new Ignore().add(['foo', '!bar']);
-    const ig2 = new Ignore().add('foo\n!bar');
+  it("should return a stable and consistent fingerprint", () => {
+    const ig1 = new Ignore().add(["foo", "!bar"]);
+    const ig2 = new Ignore().add("foo\n!bar");
 
     // Fingerprints should be identical for the same rules.
     expect(ig1.getFingerprint()).toBe(ig2.getFingerprint());
 
     // Adding a new rule should change the fingerprint.
-    ig2.add('baz');
+    ig2.add("baz");
     expect(ig1.getFingerprint()).not.toBe(ig2.getFingerprint());
   });
 });
 
-describe('loadIgnoreRules', () => {
+describe("loadIgnoreRules", () => {
   let tmpDir: string;
 
   afterEach(async () => {
@@ -74,9 +74,9 @@ describe('loadIgnoreRules', () => {
     }
   });
 
-  it('should load rules from .gitignore', async () => {
+  it("should load rules from .gitignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '*.log',
+      ".gitignore": "*.log",
     });
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -85,13 +85,13 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('test.log')).toBe(true);
-    expect(fileFilter('test.txt')).toBe(false);
+    expect(fileFilter("test.log")).toBe(true);
+    expect(fileFilter("test.txt")).toBe(false);
   });
 
-  it('should load rules from .geminiignore', async () => {
+  it("should load rules from .geminiignore", async () => {
     tmpDir = await createTmpDir({
-      '.geminiignore': '*.log',
+      ".geminiignore": "*.log",
     });
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -100,14 +100,14 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('test.log')).toBe(true);
-    expect(fileFilter('test.txt')).toBe(false);
+    expect(fileFilter("test.log")).toBe(true);
+    expect(fileFilter("test.txt")).toBe(false);
   });
 
-  it('should combine rules from .gitignore and .geminiignore', async () => {
+  it("should combine rules from .gitignore and .geminiignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '*.log',
-      '.geminiignore': '*.txt',
+      ".gitignore": "*.log",
+      ".geminiignore": "*.txt",
     });
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -116,25 +116,25 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('test.log')).toBe(true);
-    expect(fileFilter('test.txt')).toBe(true);
-    expect(fileFilter('test.md')).toBe(false);
+    expect(fileFilter("test.log")).toBe(true);
+    expect(fileFilter("test.txt")).toBe(true);
+    expect(fileFilter("test.md")).toBe(false);
   });
 
-  it('should add ignoreDirs', async () => {
+  it("should add ignoreDirs", async () => {
     tmpDir = await createTmpDir({});
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
       useGitignore: false,
       useGeminiignore: false,
-      ignoreDirs: ['logs/'],
+      ignoreDirs: ["logs/"],
     });
     const dirFilter = ignore.getDirectoryFilter();
-    expect(dirFilter('logs/')).toBe(true);
-    expect(dirFilter('src/')).toBe(false);
+    expect(dirFilter("logs/")).toBe(true);
+    expect(dirFilter("src/")).toBe(false);
   });
 
-  it('should handle missing ignore files gracefully', async () => {
+  it("should handle missing ignore files gracefully", async () => {
     tmpDir = await createTmpDir({});
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -143,10 +143,10 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('anyfile.txt')).toBe(false);
+    expect(fileFilter("anyfile.txt")).toBe(false);
   });
 
-  it('should always add .git to the ignore list', async () => {
+  it("should always add .git to the ignore list", async () => {
     tmpDir = await createTmpDir({});
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -155,6 +155,6 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const dirFilter = ignore.getDirectoryFilter();
-    expect(dirFilter('.git/')).toBe(true);
+    expect(dirFilter(".git/")).toBe(true);
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/filesearch/ignore.ts b/packages/gemini-cli-core/src/utils/filesearch/ignore.ts
index a39066f58..e78f7af52 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/ignore.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/ignore.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import ignore from 'ignore';
-import picomatch from 'picomatch';
+import fs from "node:fs";
+import path from "node:path";
+import ignore from "ignore";
+import picomatch from "picomatch";
 
-const hasFileExtension = picomatch('**/*[*.]*');
+const hasFileExtension = picomatch("**/*[*.]*");
 
 export interface LoadIgnoreRulesOptions {
   projectRoot: string;
@@ -21,23 +21,23 @@ export interface LoadIgnoreRulesOptions {
 export function loadIgnoreRules(options: LoadIgnoreRulesOptions): Ignore {
   const ignorer = new Ignore();
   if (options.useGitignore) {
-    const gitignorePath = path.join(options.projectRoot, '.gitignore');
+    const gitignorePath = path.join(options.projectRoot, ".gitignore");
     if (fs.existsSync(gitignorePath)) {
-      ignorer.add(fs.readFileSync(gitignorePath, 'utf8'));
+      ignorer.add(fs.readFileSync(gitignorePath, "utf8"));
     }
   }
 
   if (options.useGeminiignore) {
-    const geminiignorePath = path.join(options.projectRoot, '.geminiignore');
+    const geminiignorePath = path.join(options.projectRoot, ".geminiignore");
     if (fs.existsSync(geminiignorePath)) {
-      ignorer.add(fs.readFileSync(geminiignorePath, 'utf8'));
+      ignorer.add(fs.readFileSync(geminiignorePath, "utf8"));
     }
   }
 
-  const ignoreDirs = ['.git', ...options.ignoreDirs];
+  const ignoreDirs = [".git", ...options.ignoreDirs];
   ignorer.add(
     ignoreDirs.map((dir) => {
-      if (dir.endsWith('/')) {
+      if (dir.endsWith("/")) {
         return dir;
       }
       return `${dir}/`;
@@ -59,21 +59,20 @@ export class Ignore {
    * @returns The `Ignore` instance for chaining.
    */
   add(patterns: string | string[]): this {
-    if (typeof patterns === 'string') {
+    if (typeof patterns === "string") {
       patterns = patterns.split(/\r?\n/);
     }
 
     for (const p of patterns) {
       const pattern = p.trim();
 
-      if (pattern === '' || pattern.startsWith('#')) {
+      if (pattern === "" || pattern.startsWith("#")) {
         continue;
       }
 
       this.allPatterns.push(pattern);
 
-      const isPositiveDirPattern =
-        pattern.endsWith('/') && !pattern.startsWith('!');
+      const isPositiveDirPattern = pattern.endsWith("/") && !pattern.startsWith("!");
 
       if (isPositiveDirPattern) {
         this.dirIgnorer.add(pattern);
@@ -126,6 +125,6 @@ export class Ignore {
    * @returns A string fingerprint of the ignore patterns.
    */
   getFingerprint(): string {
-    return this.allPatterns.join('\n');
+    return this.allPatterns.join("\n");
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/filesearch/result-cache.test.ts b/packages/gemini-cli-core/src/utils/filesearch/result-cache.test.ts
index fcfa3f00a..eb1c62d60 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/result-cache.test.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/result-cache.test.ts
@@ -4,52 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { test, expect } from 'vitest';
-import { ResultCache } from './result-cache.js';
+import { expect, test } from "vitest";
+import { ResultCache } from "./result-cache.js";
 
-test('ResultCache basic usage', async () => {
+test("ResultCache basic usage", async () => {
   const files = [
-    'foo.txt',
-    'bar.js',
-    'baz.md',
-    'subdir/file.txt',
-    'subdir/other.js',
-    'subdir/nested/file.md',
+    "foo.txt",
+    "bar.js",
+    "baz.md",
+    "subdir/file.txt",
+    "subdir/other.js",
+    "subdir/nested/file.md",
   ];
   const cache = new ResultCache(files);
-  const { files: resultFiles, isExactMatch } = await cache.get('*.js');
+  const { files: resultFiles, isExactMatch } = await cache.get("*.js");
   expect(resultFiles).toEqual(files);
   expect(isExactMatch).toBe(false);
 });
 
-test('ResultCache cache hit/miss', async () => {
-  const files = ['foo.txt', 'bar.js', 'baz.md'];
+test("ResultCache cache hit/miss", async () => {
+  const files = ["foo.txt", "bar.js", "baz.md"];
   const cache = new ResultCache(files);
   // First call: miss
-  const { files: result1Files, isExactMatch: isExactMatch1 } =
-    await cache.get('*.js');
+  const { files: result1Files, isExactMatch: isExactMatch1 } = await cache.get("*.js");
   expect(result1Files).toEqual(files);
   expect(isExactMatch1).toBe(false);
 
   // Simulate FileSearch applying the filter and setting the result
-  cache.set('*.js', ['bar.js']);
+  cache.set("*.js", ["bar.js"]);
 
   // Second call: hit
-  const { files: result2Files, isExactMatch: isExactMatch2 } =
-    await cache.get('*.js');
-  expect(result2Files).toEqual(['bar.js']);
+  const { files: result2Files, isExactMatch: isExactMatch2 } = await cache.get("*.js");
+  expect(result2Files).toEqual(["bar.js"]);
   expect(isExactMatch2).toBe(true);
 });
 
-test('ResultCache best base query', async () => {
-  const files = ['foo.txt', 'foobar.js', 'baz.md'];
+test("ResultCache best base query", async () => {
+  const files = ["foo.txt", "foobar.js", "baz.md"];
   const cache = new ResultCache(files);
 
   // Cache a broader query
-  cache.set('foo', ['foo.txt', 'foobar.js']);
+  cache.set("foo", ["foo.txt", "foobar.js"]);
 
   // Search for a more specific query that starts with the broader one
-  const { files: resultFiles, isExactMatch } = await cache.get('foobar');
-  expect(resultFiles).toEqual(['foo.txt', 'foobar.js']);
+  const { files: resultFiles, isExactMatch } = await cache.get("foobar");
+  expect(resultFiles).toEqual(["foo.txt", "foobar.js"]);
   expect(isExactMatch).toBe(false);
 });
diff --git a/packages/gemini-cli-core/src/utils/filesearch/result-cache.ts b/packages/gemini-cli-core/src/utils/filesearch/result-cache.ts
index cf0c2b4b1..274444d17 100644
--- a/packages/gemini-cli-core/src/utils/filesearch/result-cache.ts
+++ b/packages/gemini-cli-core/src/utils/filesearch/result-cache.ts
@@ -24,9 +24,7 @@ export class ResultCache {
    * @returns An object containing the files to search and a boolean indicating
    *          if the result is an exact cache hit.
    */
-  async get(
-    query: string,
-  ): Promise<{ files: string[]; isExactMatch: boolean }> {
+  async get(query: string): Promise<{ files: string[]; isExactMatch: boolean }> {
     const isCacheHit = this.cache.has(query);
 
     if (isCacheHit) {
@@ -42,16 +40,14 @@ export class ResultCache {
     // from the results of the "foo" search.
     // This finds the most specific, already-cached query that is a prefix
     // of the current query.
-    let bestBaseQuery = '';
+    let bestBaseQuery = "";
     for (const key of this.cache?.keys?.() ?? []) {
       if (query.startsWith(key) && key.length > bestBaseQuery.length) {
         bestBaseQuery = key;
       }
     }
 
-    const filesToSearch = bestBaseQuery
-      ? this.cache.get(bestBaseQuery)!
-      : this.allFiles;
+    const filesToSearch = bestBaseQuery ? this.cache.get(bestBaseQuery)! : this.allFiles;
 
     return { files: filesToSearch, isExactMatch: false };
   }
diff --git a/packages/gemini-cli-core/src/utils/flashFallback.test.ts b/packages/gemini-cli-core/src/utils/flashFallback.test.ts
index 522f5230f..0c21affe5 100644
--- a/packages/gemini-cli-core/src/utils/flashFallback.test.ts
+++ b/packages/gemini-cli-core/src/utils/flashFallback.test.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { Config } from '../config/config.js';
-import fs from 'node:fs';
+import fs from "node:fs";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+// Import the new types (Assuming this test file is in packages/core/src/utils/)
+import type { FallbackModelHandler } from "../fallback/types.js";
+import type { GoogleApiError } from "./googleErrors.js";
+import { TerminalQuotaError } from "./googleQuotaErrors.js";
+import { retryWithBackoff } from "./retry.js";
 import {
-  setSimulate429,
   disableSimulationAfterFallback,
-  shouldSimulate429,
   resetRequestCounter,
-} from './testUtils.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { retryWithBackoff } from './retry.js';
-import { AuthType } from '../core/contentGenerator.js';
-// Import the new types (Assuming this test file is in packages/core/src/utils/)
-import type { FallbackModelHandler } from '../fallback/types.js';
-import type { GoogleApiError } from './googleErrors.js';
-import { TerminalQuotaError } from './googleQuotaErrors.js';
+  setSimulate429,
+  shouldSimulate429,
+} from "./testUtils.js";
 
-vi.mock('node:fs');
+vi.mock("node:fs");
 
 // Update the description to reflect that this tests the retry utility's integration
-describe('Retry Utility Fallback Integration', () => {
+describe("Retry Utility Fallback Integration", () => {
   let config: Config;
   let mockGoogleApiError: GoogleApiError;
 
@@ -34,15 +34,15 @@ describe('Retry Utility Fallback Integration', () => {
       isDirectory: () => true,
     } as fs.Stats);
     config = new Config({
-      sessionId: 'test-session',
-      targetDir: '/test',
+      sessionId: "test-session",
+      targetDir: "/test",
       debugMode: false,
-      cwd: '/test',
-      model: 'gemini-2.5-pro',
+      cwd: "/test",
+      model: "gemini-2.5-pro",
     });
     mockGoogleApiError = {
       code: 429,
-      message: 'mock error',
+      message: "mock error",
       details: [],
     };
 
@@ -52,37 +52,33 @@ describe('Retry Utility Fallback Integration', () => {
   });
 
   // This test validates the Config's ability to store and execute the handler contract.
-  it('should execute the injected FallbackHandler contract correctly', async () => {
+  it("should execute the injected FallbackHandler contract correctly", async () => {
     // Set up a minimal handler for testing, ensuring it matches the new type.
-    const fallbackHandler: FallbackModelHandler = async () => 'retry_always';
+    const fallbackHandler: FallbackModelHandler = async () => "retry_always";
 
     // Use the generalized setter
     config.setFallbackModelHandler(fallbackHandler);
 
     // Call the handler directly via the config property
     const result = await config.fallbackModelHandler!(
-      'gemini-2.5-pro',
+      "gemini-2.5-pro",
       DEFAULT_GEMINI_FLASH_MODEL,
-      new Error('test'),
+      new Error("test"),
     );
 
     // Verify it returns the correct intent
-    expect(result).toBe('retry_always');
+    expect(result).toBe("retry_always");
   });
 
   // This test validates the retry utility's logic for triggering the callback.
-  it('should trigger onPersistent429 on TerminalQuotaError for OAuth users', async () => {
+  it("should trigger onPersistent429 on TerminalQuotaError for OAuth users", async () => {
     let fallbackCalled = false;
 
     const mockApiCall = vi
       .fn()
-      .mockRejectedValueOnce(
-        new TerminalQuotaError('Daily limit', mockGoogleApiError),
-      )
-      .mockRejectedValueOnce(
-        new TerminalQuotaError('Daily limit', mockGoogleApiError),
-      )
-      .mockResolvedValueOnce('success after fallback');
+      .mockRejectedValueOnce(new TerminalQuotaError("Daily limit", mockGoogleApiError))
+      .mockRejectedValueOnce(new TerminalQuotaError("Daily limit", mockGoogleApiError))
+      .mockResolvedValueOnce("success after fallback");
 
     const mockPersistent429Callback = vi.fn(async (_authType?: string) => {
       fallbackCalled = true;
@@ -102,18 +98,16 @@ describe('Retry Utility Fallback Integration', () => {
       AuthType.LOGIN_WITH_GOOGLE,
       expect.any(TerminalQuotaError),
     );
-    expect(result).toBe('success after fallback');
+    expect(result).toBe("success after fallback");
     expect(mockApiCall).toHaveBeenCalledTimes(3);
   });
 
-  it('should not trigger onPersistent429 for API key users', async () => {
+  it("should not trigger onPersistent429 for API key users", async () => {
     const fallbackCallback = vi.fn();
 
     const mockApiCall = vi
       .fn()
-      .mockRejectedValueOnce(
-        new TerminalQuotaError('Daily limit', mockGoogleApiError),
-      );
+      .mockRejectedValueOnce(new TerminalQuotaError("Daily limit", mockGoogleApiError));
 
     const promise = retryWithBackoff(mockApiCall, {
       maxAttempts: 2,
@@ -123,13 +117,13 @@ describe('Retry Utility Fallback Integration', () => {
       authType: AuthType.USE_GEMINI, // API key auth type
     });
 
-    await expect(promise).rejects.toThrow('Daily limit');
+    await expect(promise).rejects.toThrow("Daily limit");
     expect(fallbackCallback).not.toHaveBeenCalled();
     expect(mockApiCall).toHaveBeenCalledTimes(1);
   });
 
   // This test validates the test utilities themselves.
-  it('should properly disable simulation state after fallback (Test Utility)', () => {
+  it("should properly disable simulation state after fallback (Test Utility)", () => {
     // Enable simulation
     setSimulate429(true);
 
diff --git a/packages/gemini-cli-core/src/utils/formatters.test.ts b/packages/gemini-cli-core/src/utils/formatters.test.ts
index 305b2d0ad..f164f3063 100644
--- a/packages/gemini-cli-core/src/utils/formatters.test.ts
+++ b/packages/gemini-cli-core/src/utils/formatters.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 
-import { bytesToMB, formatMemoryUsage } from './formatters.js';
+import { bytesToMB, formatMemoryUsage } from "./formatters.js";
 
-describe('bytesToMB', () => {
-  it('converts bytes to megabytes', () => {
+describe("bytesToMB", () => {
+  it("converts bytes to megabytes", () => {
     expect(bytesToMB(0)).toBe(0);
     expect(bytesToMB(512 * 1024)).toBeCloseTo(0.5, 5);
     expect(bytesToMB(5 * 1024 * 1024)).toBe(5);
   });
 });
 
-describe('formatMemoryUsage', () => {
-  it('formats values below one megabyte in KB', () => {
-    expect(formatMemoryUsage(512 * 1024)).toBe('512.0 KB');
+describe("formatMemoryUsage", () => {
+  it("formats values below one megabyte in KB", () => {
+    expect(formatMemoryUsage(512 * 1024)).toBe("512.0 KB");
   });
 
-  it('formats values below one gigabyte in MB', () => {
-    expect(formatMemoryUsage(5 * 1024 * 1024)).toBe('5.0 MB');
+  it("formats values below one gigabyte in MB", () => {
+    expect(formatMemoryUsage(5 * 1024 * 1024)).toBe("5.0 MB");
   });
 
-  it('formats values of one gigabyte or larger in GB', () => {
-    expect(formatMemoryUsage(2 * 1024 * 1024 * 1024)).toBe('2.00 GB');
+  it("formats values of one gigabyte or larger in GB", () => {
+    expect(formatMemoryUsage(2 * 1024 * 1024 * 1024)).toBe("2.00 GB");
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/geminiIgnoreParser.test.ts b/packages/gemini-cli-core/src/utils/geminiIgnoreParser.test.ts
index bf85cd8c6..1435d43c2 100644
--- a/packages/gemini-cli-core/src/utils/geminiIgnoreParser.test.ts
+++ b/packages/gemini-cli-core/src/utils/geminiIgnoreParser.test.ts
@@ -4,25 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { GeminiIgnoreParser } from './geminiIgnoreParser.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GeminiIgnoreParser } from "./geminiIgnoreParser.js";
 
-describe('GeminiIgnoreParser', () => {
+describe("GeminiIgnoreParser", () => {
   let projectRoot: string;
 
-  async function createTestFile(filePath: string, content = '') {
+  async function createTestFile(filePath: string, content = "") {
     const fullPath = path.join(projectRoot, filePath);
     await fs.mkdir(path.dirname(fullPath), { recursive: true });
     await fs.writeFile(fullPath, content);
   }
 
   beforeEach(async () => {
-    projectRoot = await fs.mkdtemp(
-      path.join(os.tmpdir(), 'geminiignore-test-'),
-    );
+    projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), "geminiignore-test-"));
   });
 
   afterEach(async () => {
@@ -30,41 +28,30 @@ describe('GeminiIgnoreParser', () => {
     vi.restoreAllMocks();
   });
 
-  describe('when .geminiignore exists', () => {
+  describe("when .geminiignore exists", () => {
     beforeEach(async () => {
-      await createTestFile(
-        '.geminiignore',
-        'ignored.txt\n# A comment\n/ignored_dir/\n',
-      );
-      await createTestFile('ignored.txt', 'ignored');
-      await createTestFile('not_ignored.txt', 'not ignored');
-      await createTestFile(
-        path.join('ignored_dir', 'file.txt'),
-        'in ignored dir',
-      );
-      await createTestFile(
-        path.join('subdir', 'not_ignored.txt'),
-        'not ignored',
-      );
+      await createTestFile(".geminiignore", "ignored.txt\n# A comment\n/ignored_dir/\n");
+      await createTestFile("ignored.txt", "ignored");
+      await createTestFile("not_ignored.txt", "not ignored");
+      await createTestFile(path.join("ignored_dir", "file.txt"), "in ignored dir");
+      await createTestFile(path.join("subdir", "not_ignored.txt"), "not ignored");
     });
 
-    it('should ignore files specified in .geminiignore', () => {
+    it("should ignore files specified in .geminiignore", () => {
       const parser = new GeminiIgnoreParser(projectRoot);
-      expect(parser.getPatterns()).toEqual(['ignored.txt', '/ignored_dir/']);
-      expect(parser.isIgnored('ignored.txt')).toBe(true);
-      expect(parser.isIgnored('not_ignored.txt')).toBe(false);
-      expect(parser.isIgnored(path.join('ignored_dir', 'file.txt'))).toBe(true);
-      expect(parser.isIgnored(path.join('subdir', 'not_ignored.txt'))).toBe(
-        false,
-      );
+      expect(parser.getPatterns()).toEqual(["ignored.txt", "/ignored_dir/"]);
+      expect(parser.isIgnored("ignored.txt")).toBe(true);
+      expect(parser.isIgnored("not_ignored.txt")).toBe(false);
+      expect(parser.isIgnored(path.join("ignored_dir", "file.txt"))).toBe(true);
+      expect(parser.isIgnored(path.join("subdir", "not_ignored.txt"))).toBe(false);
     });
   });
 
-  describe('when .geminiignore does not exist', () => {
-    it('should not load any patterns and not ignore any files', () => {
+  describe("when .geminiignore does not exist", () => {
+    it("should not load any patterns and not ignore any files", () => {
       const parser = new GeminiIgnoreParser(projectRoot);
       expect(parser.getPatterns()).toEqual([]);
-      expect(parser.isIgnored('any_file.txt')).toBe(false);
+      expect(parser.isIgnored("any_file.txt")).toBe(false);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/geminiIgnoreParser.ts b/packages/gemini-cli-core/src/utils/geminiIgnoreParser.ts
index 8518923de..c0fcee734 100644
--- a/packages/gemini-cli-core/src/utils/geminiIgnoreParser.ts
+++ b/packages/gemini-cli-core/src/utils/geminiIgnoreParser.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import ignore from 'ignore';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import ignore from "ignore";
 
 export interface GeminiIgnoreFilter {
   isIgnored(filePath: string): boolean;
@@ -24,19 +24,19 @@ export class GeminiIgnoreParser implements GeminiIgnoreFilter {
   }
 
   private loadPatterns(): void {
-    const patternsFilePath = path.join(this.projectRoot, '.geminiignore');
+    const patternsFilePath = path.join(this.projectRoot, ".geminiignore");
     let content: string;
     try {
-      content = fs.readFileSync(patternsFilePath, 'utf-8');
+      content = fs.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       // ignore file not found
       return;
     }
 
-    this.patterns = (content ?? '')
-      .split('\n')
+    this.patterns = (content ?? "")
+      .split("\n")
       .map((p) => p.trim())
-      .filter((p) => p !== '' && !p.startsWith('#'));
+      .filter((p) => p !== "" && !p.startsWith("#"));
 
     this.ig.add(this.patterns);
   }
@@ -46,29 +46,25 @@ export class GeminiIgnoreParser implements GeminiIgnoreFilter {
       return false;
     }
 
-    if (!filePath || typeof filePath !== 'string') {
+    if (!filePath || typeof filePath !== "string") {
       return false;
     }
 
-    if (
-      filePath.startsWith('\\') ||
-      filePath === '/' ||
-      filePath.includes('\0')
-    ) {
+    if (filePath.startsWith("\\") || filePath === "/" || filePath.includes("\0")) {
       return false;
     }
 
     const resolved = path.resolve(this.projectRoot, filePath);
     const relativePath = path.relative(this.projectRoot, resolved);
 
-    if (relativePath === '' || relativePath.startsWith('..')) {
+    if (relativePath === "" || relativePath.startsWith("..")) {
       return false;
     }
 
     // Even in windows, Ignore expects forward slashes.
-    const normalizedPath = relativePath.replace(/\\/g, '/');
+    const normalizedPath = relativePath.replace(/\\/g, "/");
 
-    if (normalizedPath.startsWith('/') || normalizedPath === '') {
+    if (normalizedPath.startsWith("/") || normalizedPath === "") {
       return false;
     }
 
diff --git a/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.test.ts b/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.test.ts
index 5f99fa8d4..0ba56cd07 100644
--- a/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.test.ts
+++ b/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.test.ts
@@ -4,28 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import type { GenerateContentResponse, Part, SafetyRating } from "@google/genai";
+import { FinishReason } from "@google/genai";
+import { describe, expect, it } from "vitest";
 import {
-  getResponseTextFromParts,
   getFunctionCalls,
-  getFunctionCallsFromParts,
   getFunctionCallsAsJson,
+  getFunctionCallsFromParts,
   getFunctionCallsFromPartsAsJson,
+  getResponseTextFromParts,
   getStructuredResponse,
   getStructuredResponseFromParts,
-} from './generateContentResponseUtilities.js';
-import type {
-  GenerateContentResponse,
-  Part,
-  SafetyRating,
-} from '@google/genai';
-import { FinishReason } from '@google/genai';
+} from "./generateContentResponseUtilities.js";
 
 const mockTextPart = (text: string): Part => ({ text });
-const mockFunctionCallPart = (
-  name: string,
-  args?: Record<string, unknown>,
-): Part => ({
+const mockFunctionCallPart = (name: string, args?: Record<string, unknown>): Part => ({
   functionCall: { name, args: args ?? {} },
 });
 
@@ -38,7 +31,7 @@ const mockResponse = (
     {
       content: {
         parts,
-        role: 'model',
+        role: "model",
       },
       index: 0,
       finishReason,
@@ -56,7 +49,7 @@ const mockResponse = (
 });
 
 const minimalMockResponse = (
-  candidates: GenerateContentResponse['candidates'],
+  candidates: GenerateContentResponse["candidates"],
 ): GenerateContentResponse => ({
   candidates,
   promptFeedback: { safetyRatings: [] },
@@ -67,99 +60,91 @@ const minimalMockResponse = (
   codeExecutionResult: undefined,
 });
 
-describe('generateContentResponseUtilities', () => {
-  describe('getResponseTextFromParts', () => {
-    it('should return undefined for no parts', () => {
+describe("generateContentResponseUtilities", () => {
+  describe("getResponseTextFromParts", () => {
+    it("should return undefined for no parts", () => {
       expect(getResponseTextFromParts([])).toBeUndefined();
     });
-    it('should extract text from a single text part', () => {
-      expect(getResponseTextFromParts([mockTextPart('Hello')])).toBe('Hello');
+    it("should extract text from a single text part", () => {
+      expect(getResponseTextFromParts([mockTextPart("Hello")])).toBe("Hello");
     });
-    it('should concatenate text from multiple text parts', () => {
-      expect(
-        getResponseTextFromParts([
-          mockTextPart('Hello '),
-          mockTextPart('World'),
-        ]),
-      ).toBe('Hello World');
+    it("should concatenate text from multiple text parts", () => {
+      expect(getResponseTextFromParts([mockTextPart("Hello "), mockTextPart("World")])).toBe(
+        "Hello World",
+      );
     });
-    it('should ignore function call parts', () => {
+    it("should ignore function call parts", () => {
       expect(
         getResponseTextFromParts([
-          mockTextPart('Hello '),
-          mockFunctionCallPart('testFunc'),
-          mockTextPart('World'),
+          mockTextPart("Hello "),
+          mockFunctionCallPart("testFunc"),
+          mockTextPart("World"),
         ]),
-      ).toBe('Hello World');
+      ).toBe("Hello World");
     });
-    it('should return undefined if only function call parts exist', () => {
+    it("should return undefined if only function call parts exist", () => {
       expect(
         getResponseTextFromParts([
-          mockFunctionCallPart('testFunc'),
-          mockFunctionCallPart('anotherFunc'),
+          mockFunctionCallPart("testFunc"),
+          mockFunctionCallPart("anotherFunc"),
         ]),
       ).toBeUndefined();
     });
   });
 
-  describe('getFunctionCalls', () => {
-    it('should return undefined for no candidates', () => {
+  describe("getFunctionCalls", () => {
+    it("should return undefined for no candidates", () => {
       expect(getFunctionCalls(minimalMockResponse(undefined))).toBeUndefined();
     });
-    it('should return undefined for empty candidates array', () => {
+    it("should return undefined for empty candidates array", () => {
       expect(getFunctionCalls(minimalMockResponse([]))).toBeUndefined();
     });
-    it('should return undefined for no parts', () => {
+    it("should return undefined for no parts", () => {
       const response = mockResponse([]);
       expect(getFunctionCalls(response)).toBeUndefined();
     });
-    it('should extract a single function call', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
-      const response = mockResponse([
-        mockFunctionCallPart(func.name, func.args),
-      ]);
+    it("should extract a single function call", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
+      const response = mockResponse([mockFunctionCallPart(func.name, func.args)]);
       expect(getFunctionCalls(response)).toEqual([func]);
     });
-    it('should extract multiple function calls', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+    it("should extract multiple function calls", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       const response = mockResponse([
         mockFunctionCallPart(func1.name, func1.args),
         mockFunctionCallPart(func2.name, func2.args),
       ]);
       expect(getFunctionCalls(response)).toEqual([func1, func2]);
     });
-    it('should ignore text parts', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
+    it("should ignore text parts", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
       const response = mockResponse([
-        mockTextPart('Some text'),
+        mockTextPart("Some text"),
         mockFunctionCallPart(func.name, func.args),
-        mockTextPart('More text'),
+        mockTextPart("More text"),
       ]);
       expect(getFunctionCalls(response)).toEqual([func]);
     });
-    it('should return undefined if only text parts exist', () => {
-      const response = mockResponse([
-        mockTextPart('Some text'),
-        mockTextPart('More text'),
-      ]);
+    it("should return undefined if only text parts exist", () => {
+      const response = mockResponse([mockTextPart("Some text"), mockTextPart("More text")]);
       expect(getFunctionCalls(response)).toBeUndefined();
     });
   });
 
-  describe('getFunctionCallsFromParts', () => {
-    it('should return undefined for no parts', () => {
+  describe("getFunctionCallsFromParts", () => {
+    it("should return undefined for no parts", () => {
       expect(getFunctionCallsFromParts([])).toBeUndefined();
     });
-    it('should extract a single function call', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
-      expect(
-        getFunctionCallsFromParts([mockFunctionCallPart(func.name, func.args)]),
-      ).toEqual([func]);
+    it("should extract a single function call", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
+      expect(getFunctionCallsFromParts([mockFunctionCallPart(func.name, func.args)])).toEqual([
+        func,
+      ]);
     });
-    it('should extract multiple function calls', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+    it("should extract multiple function calls", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       expect(
         getFunctionCallsFromParts([
           mockFunctionCallPart(func1.name, func1.args),
@@ -167,78 +152,73 @@ describe('generateContentResponseUtilities', () => {
         ]),
       ).toEqual([func1, func2]);
     });
-    it('should ignore text parts', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
+    it("should ignore text parts", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
       expect(
         getFunctionCallsFromParts([
-          mockTextPart('Some text'),
+          mockTextPart("Some text"),
           mockFunctionCallPart(func.name, func.args),
-          mockTextPart('More text'),
+          mockTextPart("More text"),
         ]),
       ).toEqual([func]);
     });
-    it('should return undefined if only text parts exist', () => {
+    it("should return undefined if only text parts exist", () => {
       expect(
-        getFunctionCallsFromParts([
-          mockTextPart('Some text'),
-          mockTextPart('More text'),
-        ]),
+        getFunctionCallsFromParts([mockTextPart("Some text"), mockTextPart("More text")]),
       ).toBeUndefined();
     });
   });
 
-  describe('getFunctionCallsAsJson', () => {
-    it('should return JSON string of function calls', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+  describe("getFunctionCallsAsJson", () => {
+    it("should return JSON string of function calls", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       const response = mockResponse([
         mockFunctionCallPart(func1.name, func1.args),
-        mockTextPart('text in between'),
+        mockTextPart("text in between"),
         mockFunctionCallPart(func2.name, func2.args),
       ]);
       const expectedJson = JSON.stringify([func1, func2], null, 2);
       expect(getFunctionCallsAsJson(response)).toBe(expectedJson);
     });
-    it('should return undefined if no function calls', () => {
-      const response = mockResponse([mockTextPart('Hello')]);
+    it("should return undefined if no function calls", () => {
+      const response = mockResponse([mockTextPart("Hello")]);
       expect(getFunctionCallsAsJson(response)).toBeUndefined();
     });
   });
 
-  describe('getFunctionCallsFromPartsAsJson', () => {
-    it('should return JSON string of function calls from parts', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+  describe("getFunctionCallsFromPartsAsJson", () => {
+    it("should return JSON string of function calls from parts", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       const parts = [
         mockFunctionCallPart(func1.name, func1.args),
-        mockTextPart('text in between'),
+        mockTextPart("text in between"),
         mockFunctionCallPart(func2.name, func2.args),
       ];
       const expectedJson = JSON.stringify([func1, func2], null, 2);
       expect(getFunctionCallsFromPartsAsJson(parts)).toBe(expectedJson);
     });
-    it('should return undefined if no function calls in parts', () => {
-      const parts = [mockTextPart('Hello')];
+    it("should return undefined if no function calls in parts", () => {
+      const parts = [mockTextPart("Hello")];
       expect(getFunctionCallsFromPartsAsJson(parts)).toBeUndefined();
     });
   });
 
-  describe('getStructuredResponse', () => {
-    it('should return only text if only text exists', () => {
-      const response = mockResponse([mockTextPart('Hello World')]);
-      expect(getStructuredResponse(response)).toBe('Hello World');
+  describe("getStructuredResponse", () => {
+    it("should return only text if only text exists", () => {
+      const response = mockResponse([mockTextPart("Hello World")]);
+      expect(getStructuredResponse(response)).toBe("Hello World");
     });
-    it('should return only function call JSON if only function calls exist', () => {
-      const func = { name: 'testFunc', args: { data: 'payload' } };
-      const response = mockResponse([
-        mockFunctionCallPart(func.name, func.args),
-      ]);
+    it("should return only function call JSON if only function calls exist", () => {
+      const func = { name: "testFunc", args: { data: "payload" } };
+      const response = mockResponse([mockFunctionCallPart(func.name, func.args)]);
       const expectedJson = JSON.stringify([func], null, 2);
       expect(getStructuredResponse(response)).toBe(expectedJson);
     });
-    it('should return text and function call JSON if both exist', () => {
-      const text = 'Consider this data:';
-      const func = { name: 'processData', args: { item: 42 } };
+    it("should return text and function call JSON if both exist", () => {
+      const text = "Consider this data:";
+      const func = { name: "processData", args: { item: 42 } };
       const response = mockResponse([
         mockTextPart(text),
         mockFunctionCallPart(func.name, func.args),
@@ -246,36 +226,31 @@ describe('generateContentResponseUtilities', () => {
       const expectedJson = JSON.stringify([func], null, 2);
       expect(getStructuredResponse(response)).toBe(`${text}\n${expectedJson}`);
     });
-    it('should return undefined if neither text nor function calls exist', () => {
+    it("should return undefined if neither text nor function calls exist", () => {
       const response = mockResponse([]);
       expect(getStructuredResponse(response)).toBeUndefined();
     });
   });
 
-  describe('getStructuredResponseFromParts', () => {
-    it('should return only text if only text exists in parts', () => {
-      const parts = [mockTextPart('Hello World')];
-      expect(getStructuredResponseFromParts(parts)).toBe('Hello World');
+  describe("getStructuredResponseFromParts", () => {
+    it("should return only text if only text exists in parts", () => {
+      const parts = [mockTextPart("Hello World")];
+      expect(getStructuredResponseFromParts(parts)).toBe("Hello World");
     });
-    it('should return only function call JSON if only function calls exist in parts', () => {
-      const func = { name: 'testFunc', args: { data: 'payload' } };
+    it("should return only function call JSON if only function calls exist in parts", () => {
+      const func = { name: "testFunc", args: { data: "payload" } };
       const parts = [mockFunctionCallPart(func.name, func.args)];
       const expectedJson = JSON.stringify([func], null, 2);
       expect(getStructuredResponseFromParts(parts)).toBe(expectedJson);
     });
-    it('should return text and function call JSON if both exist in parts', () => {
-      const text = 'Consider this data:';
-      const func = { name: 'processData', args: { item: 42 } };
-      const parts = [
-        mockTextPart(text),
-        mockFunctionCallPart(func.name, func.args),
-      ];
+    it("should return text and function call JSON if both exist in parts", () => {
+      const text = "Consider this data:";
+      const func = { name: "processData", args: { item: 42 } };
+      const parts = [mockTextPart(text), mockFunctionCallPart(func.name, func.args)];
       const expectedJson = JSON.stringify([func], null, 2);
-      expect(getStructuredResponseFromParts(parts)).toBe(
-        `${text}\n${expectedJson}`,
-      );
+      expect(getStructuredResponseFromParts(parts)).toBe(`${text}\n${expectedJson}`);
     });
-    it('should return undefined if neither text nor function calls exist in parts', () => {
+    it("should return undefined if neither text nor function calls exist in parts", () => {
       const parts: Part[] = [];
       expect(getStructuredResponseFromParts(parts)).toBeUndefined();
     });
diff --git a/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.ts b/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.ts
index 8d5bec9f4..30c136c2f 100644
--- a/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.ts
+++ b/packages/gemini-cli-core/src/utils/generateContentResponseUtilities.ts
@@ -4,12 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  GenerateContentResponse,
-  Part,
-  FunctionCall,
-} from '@google/genai';
-import { getResponseText } from './partUtils.js';
+import type { FunctionCall, GenerateContentResponse, Part } from "@google/genai";
+import { getResponseText } from "./partUtils.js";
 
 export function getResponseTextFromParts(parts: Part[]): string | undefined {
   if (!parts) {
@@ -17,17 +13,15 @@ export function getResponseTextFromParts(parts: Part[]): string | undefined {
   }
   const textSegments = parts
     .map((part) => part.text)
-    .filter((text): text is string => typeof text === 'string');
+    .filter((text): text is string => typeof text === "string");
 
   if (textSegments.length === 0) {
     return undefined;
   }
-  return textSegments.join('');
+  return textSegments.join("");
 }
 
-export function getFunctionCalls(
-  response: GenerateContentResponse,
-): FunctionCall[] | undefined {
+export function getFunctionCalls(response: GenerateContentResponse): FunctionCall[] | undefined {
   const parts = response.candidates?.[0]?.content?.parts;
   if (!parts) {
     return undefined;
@@ -38,9 +32,7 @@ export function getFunctionCalls(
   return functionCallParts.length > 0 ? functionCallParts : undefined;
 }
 
-export function getFunctionCallsFromParts(
-  parts: Part[],
-): FunctionCall[] | undefined {
+export function getFunctionCallsFromParts(parts: Part[]): FunctionCall[] | undefined {
   if (!parts) {
     return undefined;
   }
@@ -50,9 +42,7 @@ export function getFunctionCallsFromParts(
   return functionCallParts.length > 0 ? functionCallParts : undefined;
 }
 
-export function getFunctionCallsAsJson(
-  response: GenerateContentResponse,
-): string | undefined {
+export function getFunctionCallsAsJson(response: GenerateContentResponse): string | undefined {
   const functionCalls = getFunctionCalls(response);
   if (!functionCalls) {
     return undefined;
@@ -60,9 +50,7 @@ export function getFunctionCallsAsJson(
   return JSON.stringify(functionCalls, null, 2);
 }
 
-export function getFunctionCallsFromPartsAsJson(
-  parts: Part[],
-): string | undefined {
+export function getFunctionCallsFromPartsAsJson(parts: Part[]): string | undefined {
   const functionCalls = getFunctionCallsFromParts(parts);
   if (!functionCalls) {
     return undefined;
@@ -70,9 +58,7 @@ export function getFunctionCallsFromPartsAsJson(
   return JSON.stringify(functionCalls, null, 2);
 }
 
-export function getStructuredResponse(
-  response: GenerateContentResponse,
-): string | undefined {
+export function getStructuredResponse(response: GenerateContentResponse): string | undefined {
   const textContent = getResponseText(response);
   const functionCallsJson = getFunctionCallsAsJson(response);
 
@@ -88,9 +74,7 @@ export function getStructuredResponse(
   return undefined;
 }
 
-export function getStructuredResponseFromParts(
-  parts: Part[],
-): string | undefined {
+export function getStructuredResponseFromParts(parts: Part[]): string | undefined {
   const textContent = getResponseTextFromParts(parts);
   const functionCallsJson = getFunctionCallsFromPartsAsJson(parts);
 
diff --git a/packages/gemini-cli-core/src/utils/getFolderStructure.test.ts b/packages/gemini-cli-core/src/utils/getFolderStructure.test.ts
index 5b8e18c08..950da455c 100644
--- a/packages/gemini-cli-core/src/utils/getFolderStructure.test.ts
+++ b/packages/gemini-cli-core/src/utils/getFolderStructure.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import fsPromises from 'node:fs/promises';
-import * as nodePath from 'node:path';
-import * as os from 'node:os';
-import { getFolderStructure } from './getFolderStructure.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import * as path from 'node:path';
-import { GEMINI_DIR } from './paths.js';
-
-describe('getFolderStructure', () => {
+import fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as nodePath from "node:path";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { getFolderStructure } from "./getFolderStructure.js";
+import { GEMINI_DIR } from "./paths.js";
+
+describe("getFolderStructure", () => {
   let testRootDir: string;
 
   async function createEmptyDir(...pathSegments: string[]) {
@@ -24,24 +24,22 @@ describe('getFolderStructure', () => {
   async function createTestFile(...pathSegments: string[]) {
     const fullPath = path.join(testRootDir, ...pathSegments);
     await fsPromises.mkdir(path.dirname(fullPath), { recursive: true });
-    await fsPromises.writeFile(fullPath, '');
+    await fsPromises.writeFile(fullPath, "");
     return fullPath;
   }
 
   beforeEach(async () => {
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'folder-structure-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "folder-structure-test-"));
   });
 
   afterEach(async () => {
     await fsPromises.rm(testRootDir, { recursive: true, force: true });
   });
 
-  it('should return basic folder structure', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.js');
-    await createTestFile('subfolderB', 'fileB1.md');
+  it("should return basic folder structure", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.js");
+    await createTestFile("subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir);
     expect(structure.trim()).toBe(
@@ -57,7 +55,7 @@ ${testRootDir}${path.sep}
     );
   });
 
-  it('should handle an empty folder', async () => {
+  it("should handle an empty folder", async () => {
     const structure = await getFolderStructure(testRootDir);
     expect(structure.trim()).toBe(
       `
@@ -70,14 +68,14 @@ ${testRootDir}${path.sep}
     );
   });
 
-  it('should ignore folders specified in ignoredFolders (default)', async () => {
-    await createTestFile('.hiddenfile');
-    await createTestFile('file1.txt');
-    await createEmptyDir('emptyFolder');
-    await createTestFile('node_modules', 'somepackage', 'index.js');
-    await createTestFile('subfolderA', 'fileA1.ts');
-    await createTestFile('subfolderA', 'fileA2.js');
-    await createTestFile('subfolderA', 'subfolderB', 'fileB1.md');
+  it("should ignore folders specified in ignoredFolders (default)", async () => {
+    await createTestFile(".hiddenfile");
+    await createTestFile("file1.txt");
+    await createEmptyDir("emptyFolder");
+    await createTestFile("node_modules", "somepackage", "index.js");
+    await createTestFile("subfolderA", "fileA1.ts");
+    await createTestFile("subfolderA", "fileA2.js");
+    await createTestFile("subfolderA", "subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir);
     expect(structure.trim()).toBe(
@@ -98,15 +96,15 @@ ${testRootDir}${path.sep}
     );
   });
 
-  it('should ignore folders specified in custom ignoredFolders', async () => {
-    await createTestFile('.hiddenfile');
-    await createTestFile('file1.txt');
-    await createEmptyDir('emptyFolder');
-    await createTestFile('node_modules', 'somepackage', 'index.js');
-    await createTestFile('subfolderA', 'fileA1.ts');
+  it("should ignore folders specified in custom ignoredFolders", async () => {
+    await createTestFile(".hiddenfile");
+    await createTestFile("file1.txt");
+    await createEmptyDir("emptyFolder");
+    await createTestFile("node_modules", "somepackage", "index.js");
+    await createTestFile("subfolderA", "fileA1.ts");
 
     const structure = await getFolderStructure(testRootDir, {
-      ignoredFolders: new Set(['subfolderA', 'node_modules']),
+      ignoredFolders: new Set(["subfolderA", "node_modules"]),
     });
     const expected = `
 Showing up to 200 items (files + folders). Folders or files indicated with ... contain more items not shown, were ignored, or the display limit (200 items) was reached.
@@ -121,10 +119,10 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should filter files by fileIncludePattern', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.js');
-    await createTestFile('subfolderB', 'fileB1.md');
+  it("should filter files by fileIncludePattern", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.js");
+    await createTestFile("subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir, {
       fileIncludePattern: /\.ts$/,
@@ -139,10 +137,10 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should handle maxItems truncation for files within a folder', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.js');
-    await createTestFile('subfolderB', 'fileB1.md');
+  it("should handle maxItems truncation for files within a folder", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.js");
+    await createTestFile("subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 3,
@@ -158,9 +156,9 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should handle maxItems truncation for subfolders', async () => {
+  it("should handle maxItems truncation for subfolders", async () => {
     for (let i = 0; i < 5; i++) {
-      await createTestFile(`folder-${i}`, 'child.txt');
+      await createTestFile(`folder-${i}`, "child.txt");
     }
 
     const structure = await getFolderStructure(testRootDir, {
@@ -179,10 +177,10 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expectedRevised);
   });
 
-  it('should handle maxItems that only allows the root folder itself', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.ts');
-    await createTestFile('subfolderB', 'fileB1.ts');
+  it("should handle maxItems that only allows the root folder itself", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.ts");
+    await createTestFile("subfolderB", "fileB1.ts");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 1,
@@ -198,16 +196,16 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should handle non-existent directory', async () => {
-    const nonExistentPath = path.join(testRootDir, 'non-existent');
+  it("should handle non-existent directory", async () => {
+    const nonExistentPath = path.join(testRootDir, "non-existent");
     const structure = await getFolderStructure(nonExistentPath);
     expect(structure).toContain(
       `Error: Could not read directory "${nonExistentPath}". Check path and permissions.`,
     );
   });
 
-  it('should handle deep folder structure within limits', async () => {
-    await createTestFile('level1', 'level2', 'level3', 'file.txt');
+  it("should handle deep folder structure within limits", async () => {
+    await createTestFile("level1", "level2", "level3", "file.txt");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 10,
@@ -224,8 +222,8 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should truncate deep folder structure if maxItems is small', async () => {
-    await createTestFile('level1', 'level2', 'level3', 'file.txt');
+  it("should truncate deep folder structure if maxItems is small", async () => {
+    await createTestFile("level1", "level2", "level3", "file.txt");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 3,
@@ -241,43 +239,40 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  describe('with gitignore', () => {
+  describe("with gitignore", () => {
     beforeEach(async () => {
-      await fsPromises.mkdir(path.join(testRootDir, '.git'), {
+      await fsPromises.mkdir(path.join(testRootDir, ".git"), {
         recursive: true,
       });
     });
 
-    it('should ignore files and folders specified in .gitignore', async () => {
+    it("should ignore files and folders specified in .gitignore", async () => {
       await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.gitignore'),
-        'ignored.txt\nnode_modules/\n.gemini/*\n!/.gemini/config.yaml',
+        nodePath.join(testRootDir, ".gitignore"),
+        "ignored.txt\nnode_modules/\n.gemini/*\n!/.gemini/config.yaml",
       );
-      await createTestFile('file1.txt');
-      await createTestFile('node_modules', 'some-package', 'index.js');
-      await createTestFile('ignored.txt');
-      await createTestFile(GEMINI_DIR, 'config.yaml');
-      await createTestFile(GEMINI_DIR, 'logs.json');
+      await createTestFile("file1.txt");
+      await createTestFile("node_modules", "some-package", "index.js");
+      await createTestFile("ignored.txt");
+      await createTestFile(GEMINI_DIR, "config.yaml");
+      await createTestFile(GEMINI_DIR, "logs.json");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
         fileService,
       });
 
-      expect(structure).not.toContain('ignored.txt');
+      expect(structure).not.toContain("ignored.txt");
       expect(structure).toContain(`node_modules${path.sep}...`);
-      expect(structure).not.toContain('logs.json');
-      expect(structure).toContain('config.yaml');
-      expect(structure).toContain('file1.txt');
+      expect(structure).not.toContain("logs.json");
+      expect(structure).toContain("config.yaml");
+      expect(structure).toContain("file1.txt");
     });
 
-    it('should not ignore files if respectGitIgnore is false', async () => {
-      await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.gitignore'),
-        'ignored.txt',
-      );
-      await createTestFile('file1.txt');
-      await createTestFile('ignored.txt');
+    it("should not ignore files if respectGitIgnore is false", async () => {
+      await fsPromises.writeFile(nodePath.join(testRootDir, ".gitignore"), "ignored.txt");
+      await createTestFile("file1.txt");
+      await createTestFile("ignored.txt");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
@@ -288,42 +283,42 @@ ${testRootDir}${path.sep}
         },
       });
 
-      expect(structure).toContain('ignored.txt');
-      expect(structure).toContain('file1.txt');
+      expect(structure).toContain("ignored.txt");
+      expect(structure).toContain("file1.txt");
     });
   });
 
-  describe('with geminiignore', () => {
-    it('should ignore geminiignore files by default', async () => {
+  describe("with geminiignore", () => {
+    it("should ignore geminiignore files by default", async () => {
       await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.geminiignore'),
-        'ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml',
+        nodePath.join(testRootDir, ".geminiignore"),
+        "ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml",
       );
-      await createTestFile('file1.txt');
-      await createTestFile('node_modules', 'some-package', 'index.js');
-      await createTestFile('ignored.txt');
-      await createTestFile(GEMINI_DIR, 'config.yaml');
-      await createTestFile(GEMINI_DIR, 'logs.json');
+      await createTestFile("file1.txt");
+      await createTestFile("node_modules", "some-package", "index.js");
+      await createTestFile("ignored.txt");
+      await createTestFile(GEMINI_DIR, "config.yaml");
+      await createTestFile(GEMINI_DIR, "logs.json");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
         fileService,
       });
-      expect(structure).not.toContain('ignored.txt');
+      expect(structure).not.toContain("ignored.txt");
       expect(structure).toContain(`node_modules${path.sep}...`);
-      expect(structure).not.toContain('logs.json');
+      expect(structure).not.toContain("logs.json");
     });
 
-    it('should not ignore files if respectGeminiIgnore is false', async () => {
+    it("should not ignore files if respectGeminiIgnore is false", async () => {
       await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.geminiignore'),
-        'ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml',
+        nodePath.join(testRootDir, ".geminiignore"),
+        "ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml",
       );
-      await createTestFile('file1.txt');
-      await createTestFile('node_modules', 'some-package', 'index.js');
-      await createTestFile('ignored.txt');
-      await createTestFile(GEMINI_DIR, 'config.yaml');
-      await createTestFile(GEMINI_DIR, 'logs.json');
+      await createTestFile("file1.txt");
+      await createTestFile("node_modules", "some-package", "index.js");
+      await createTestFile("ignored.txt");
+      await createTestFile(GEMINI_DIR, "config.yaml");
+      await createTestFile(GEMINI_DIR, "logs.json");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
@@ -333,7 +328,7 @@ ${testRootDir}${path.sep}
           respectGitIgnore: true, // Explicitly disable gemini ignore only
         },
       });
-      expect(structure).toContain('ignored.txt');
+      expect(structure).toContain("ignored.txt");
       // node_modules is still ignored by default
       expect(structure).toContain(`node_modules${path.sep}...`);
     });
diff --git a/packages/gemini-cli-core/src/utils/getFolderStructure.ts b/packages/gemini-cli-core/src/utils/getFolderStructure.ts
index 141d4f542..0bcf681d8 100644
--- a/packages/gemini-cli-core/src/utils/getFolderStructure.ts
+++ b/packages/gemini-cli-core/src/utils/getFolderStructure.ts
@@ -4,21 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import type { Dirent } from 'node:fs';
-import * as path from 'node:path';
-import { getErrorMessage, isNodeError } from './errors.js';
-import type {
-  FileDiscoveryService,
-  FilterFilesOptions,
-} from '../services/fileDiscoveryService.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { debugLogger } from './debugLogger.js';
+import type { Dirent } from "node:fs";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FileFilteringOptions } from "../config/constants.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { FileDiscoveryService, FilterFilesOptions } from "../services/fileDiscoveryService.js";
+import { debugLogger } from "./debugLogger.js";
+import { getErrorMessage, isNodeError } from "./errors.js";
 
 const MAX_ITEMS = 200;
-const TRUNCATION_INDICATOR = '...';
-const DEFAULT_IGNORED_FOLDERS = new Set(['node_modules', '.git', 'dist']);
+const TRUNCATION_INDICATOR = "...";
+const DEFAULT_IGNORED_FOLDERS = new Set(["node_modules", ".git", "dist"]);
 
 // --- Interfaces ---
 
@@ -37,7 +34,7 @@ interface FolderStructureOptions {
 }
 // Define a type for the merged options where fileIncludePattern remains optional
 type MergedFolderStructureOptions = Required<
-  Omit<FolderStructureOptions, 'fileIncludePattern' | 'fileService'>
+  Omit<FolderStructureOptions, "fileIncludePattern" | "fileService">
 > & {
   fileIncludePattern?: RegExp;
   fileService?: FileDiscoveryService;
@@ -104,14 +101,9 @@ async function readFullStructure(
       // Sort entries alphabetically by name for consistent processing order
       entries = rawEntries.sort((a, b) => a.name.localeCompare(b.name));
     } catch (error: unknown) {
-      if (
-        isNodeError(error) &&
-        (error.code === 'EACCES' || error.code === 'ENOENT')
-      ) {
-        debugLogger.warn(
-          `Warning: Could not read directory ${currentPath}: ${error.message}`,
-        );
-        if (currentPath === rootPath && error.code === 'ENOENT') {
+      if (isNodeError(error) && (error.code === "EACCES" || error.code === "ENOENT")) {
+        debugLogger.warn(`Warning: Could not read directory ${currentPath}: ${error.message}`);
+        if (currentPath === rootPath && error.code === "ENOENT") {
           return null; // Root directory itself not found
         }
         // For other EACCES/ENOENT on subdirectories, just skip them.
@@ -136,15 +128,10 @@ async function readFullStructure(
         }
         const fileName = entry.name;
         const filePath = path.join(currentPath, fileName);
-        if (
-          options.fileService?.shouldIgnoreFile(filePath, filterFileOptions)
-        ) {
+        if (options.fileService?.shouldIgnoreFile(filePath, filterFileOptions)) {
           continue;
         }
-        if (
-          !options.fileIncludePattern ||
-          options.fileIncludePattern.test(fileName)
-        ) {
+        if (!options.fileIncludePattern || options.fileIncludePattern.test(fileName)) {
           filesInCurrentDir.push(fileName);
           currentItemCount++;
           folderInfo.totalFiles++;
@@ -171,10 +158,7 @@ async function readFullStructure(
         const subFolderPath = path.join(currentPath, subFolderName);
 
         const isIgnored =
-          options.fileService?.shouldIgnoreFile(
-            subFolderPath,
-            filterFileOptions,
-          ) ?? false;
+          options.fileService?.shouldIgnoreFile(subFolderPath, filterFileOptions) ?? false;
 
         if (options.ignoredFolders.has(subFolderName) || isIgnored) {
           const ignoredSubFolder: FullFolderInfo = {
@@ -228,7 +212,7 @@ function formatStructure(
   isProcessingRootNode: boolean,
   builder: string[],
 ): void {
-  const connector = isLastChildOfParent ? '└───' : '├───';
+  const connector = isLastChildOfParent ? "└───" : "├───";
 
   // The root node of the structure (the one passed initially to getFolderStructure)
   // is not printed with a connector line itself, only its name as a header.
@@ -236,7 +220,7 @@ function formatStructure(
   // Ignored root nodes ARE printed with a connector.
   if (!isProcessingRootNode || node.isIgnored) {
     builder.push(
-      `${currentIndent}${connector}${node.name}${path.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ''}`,
+      `${currentIndent}${connector}${node.name}${path.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ""}`,
     );
   }
 
@@ -244,31 +228,27 @@ function formatStructure(
   // If *this* node was the root of the whole structure, its children start with no indent before their connectors.
   // Otherwise, children's indent extends from the current node's indent.
   const indentForChildren = isProcessingRootNode
-    ? ''
-    : currentIndent + (isLastChildOfParent ? '    ' : '│   ');
+    ? ""
+    : currentIndent + (isLastChildOfParent ? "    " : "│   ");
 
   // Render files of the current node
   const fileCount = node.files.length;
   for (let i = 0; i < fileCount; i++) {
     const isLastFileAmongSiblings =
-      i === fileCount - 1 &&
-      node.subFolders.length === 0 &&
-      !node.hasMoreSubfolders;
-    const fileConnector = isLastFileAmongSiblings ? '└───' : '├───';
+      i === fileCount - 1 && node.subFolders.length === 0 && !node.hasMoreSubfolders;
+    const fileConnector = isLastFileAmongSiblings ? "└───" : "├───";
     builder.push(`${indentForChildren}${fileConnector}${node.files[i]}`);
   }
   if (node.hasMoreFiles) {
-    const isLastIndicatorAmongSiblings =
-      node.subFolders.length === 0 && !node.hasMoreSubfolders;
-    const fileConnector = isLastIndicatorAmongSiblings ? '└───' : '├───';
+    const isLastIndicatorAmongSiblings = node.subFolders.length === 0 && !node.hasMoreSubfolders;
+    const fileConnector = isLastIndicatorAmongSiblings ? "└───" : "├───";
     builder.push(`${indentForChildren}${fileConnector}${TRUNCATION_INDICATOR}`);
   }
 
   // Render subfolders of the current node
   const subFolderCount = node.subFolders.length;
   for (let i = 0; i < subFolderCount; i++) {
-    const isLastSubfolderAmongSiblings =
-      i === subFolderCount - 1 && !node.hasMoreSubfolders;
+    const isLastSubfolderAmongSiblings = i === subFolderCount - 1 && !node.hasMoreSubfolders;
     // Children are never the root node being processed initially.
     formatStructure(
       node.subFolders[i],
@@ -304,8 +284,7 @@ export async function getFolderStructure(
     ignoredFolders: options?.ignoredFolders ?? DEFAULT_IGNORED_FOLDERS,
     fileIncludePattern: options?.fileIncludePattern,
     fileService: options?.fileService,
-    fileFilteringOptions:
-      options?.fileFilteringOptions ?? DEFAULT_FILE_FILTERING_OPTIONS,
+    fileFilteringOptions: options?.fileFilteringOptions ?? DEFAULT_FILE_FILTERING_OPTIONS,
   };
 
   try {
@@ -319,7 +298,7 @@ export async function getFolderStructure(
     // 2. Format the structure into a string
     const structureLines: string[] = [];
     // Pass true for isRoot for the initial call
-    formatStructure(structureRoot, '', true, true, structureLines);
+    formatStructure(structureRoot, "", true, true, structureLines);
 
     // 3. Build the final output string
     function isTruncated(node: FullFolderInfo): boolean {
@@ -340,7 +319,7 @@ export async function getFolderStructure(
       summary += ` Folders or files indicated with ${TRUNCATION_INDICATOR} contain more items not shown, were ignored, or the display limit (${mergedOptions.maxItems} items) was reached.`;
     }
 
-    return `${summary}\n\n${resolvedPath}${path.sep}\n${structureLines.join('\n')}`;
+    return `${summary}\n\n${resolvedPath}${path.sep}\n${structureLines.join("\n")}`;
   } catch (error: unknown) {
     console.error(`Error getting folder structure for ${resolvedPath}:`, error);
     return `Error processing directory "${resolvedPath}": ${getErrorMessage(error)}`;
diff --git a/packages/gemini-cli-core/src/utils/getPty.ts b/packages/gemini-cli-core/src/utils/getPty.ts
index 2d7cb16fc..2e61bc620 100644
--- a/packages/gemini-cli-core/src/utils/getPty.ts
+++ b/packages/gemini-cli-core/src/utils/getPty.ts
@@ -7,7 +7,7 @@
 export type PtyImplementation = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   module: any;
-  name: 'lydell-node-pty' | 'node-pty';
+  name: "lydell-node-pty" | "node-pty";
 } | null;
 
 export interface PtyProcess {
@@ -19,14 +19,14 @@ export interface PtyProcess {
 
 export const getPty = async (): Promise<PtyImplementation> => {
   try {
-    const lydell = '@lydell/node-pty';
+    const lydell = "@lydell/node-pty";
     const module = await import(lydell);
-    return { module, name: 'lydell-node-pty' };
+    return { module, name: "lydell-node-pty" };
   } catch (_e) {
     try {
-      const nodePty = 'node-pty';
+      const nodePty = "node-pty";
       const module = await import(nodePty);
-      return { module, name: 'node-pty' };
+      return { module, name: "node-pty" };
     } catch (_e2) {
       return null;
     }
diff --git a/packages/gemini-cli-core/src/utils/gitIgnoreParser.test.ts b/packages/gemini-cli-core/src/utils/gitIgnoreParser.test.ts
index 2afeb823d..3a9c9a8a0 100644
--- a/packages/gemini-cli-core/src/utils/gitIgnoreParser.test.ts
+++ b/packages/gemini-cli-core/src/utils/gitIgnoreParser.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { GitIgnoreParser } from './gitIgnoreParser.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { GitIgnoreParser } from "./gitIgnoreParser.js";
 
-describe('GitIgnoreParser', () => {
+describe("GitIgnoreParser", () => {
   let parser: GitIgnoreParser;
   let projectRoot: string;
 
-  async function createTestFile(filePath: string, content = '') {
+  async function createTestFile(filePath: string, content = "") {
     const fullPath = path.join(projectRoot, filePath);
     await fs.mkdir(path.dirname(fullPath), { recursive: true });
     await fs.writeFile(fullPath, content);
   }
 
   async function setupGitRepo() {
-    await fs.mkdir(path.join(projectRoot, '.git'), { recursive: true });
+    await fs.mkdir(path.join(projectRoot, ".git"), { recursive: true });
   }
 
   beforeEach(async () => {
-    projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'gitignore-test-'));
+    projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), "gitignore-test-"));
     parser = new GitIgnoreParser(projectRoot);
   });
 
@@ -33,16 +33,16 @@ describe('GitIgnoreParser', () => {
     await fs.rm(projectRoot, { recursive: true, force: true });
   });
 
-  describe('Basic ignore behaviors', () => {
+  describe("Basic ignore behaviors", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should not ignore files when no .gitignore exists', async () => {
-      expect(parser.isIgnored('file.txt')).toBe(false);
+    it("should not ignore files when no .gitignore exists", async () => {
+      expect(parser.isIgnored("file.txt")).toBe(false);
     });
 
-    it('should ignore files based on a root .gitignore', async () => {
+    it("should ignore files based on a root .gitignore", async () => {
       const gitignoreContent = `
 # Comment
 node_modules/
@@ -50,30 +50,25 @@ node_modules/
 /dist
 .env
 `;
-      await createTestFile('.gitignore', gitignoreContent);
+      await createTestFile(".gitignore", gitignoreContent);
 
-      expect(parser.isIgnored(path.join('node_modules', 'some-lib'))).toBe(
-        true,
-      );
-      expect(parser.isIgnored(path.join('src', 'app.log'))).toBe(true);
-      expect(parser.isIgnored(path.join('dist', 'index.js'))).toBe(true);
-      expect(parser.isIgnored('.env')).toBe(true);
-      expect(parser.isIgnored('src/index.js')).toBe(false);
+      expect(parser.isIgnored(path.join("node_modules", "some-lib"))).toBe(true);
+      expect(parser.isIgnored(path.join("src", "app.log"))).toBe(true);
+      expect(parser.isIgnored(path.join("dist", "index.js"))).toBe(true);
+      expect(parser.isIgnored(".env")).toBe(true);
+      expect(parser.isIgnored("src/index.js")).toBe(false);
     });
 
-    it('should handle git exclude file', async () => {
-      await createTestFile(
-        path.join('.git', 'info', 'exclude'),
-        'temp/\n*.tmp',
-      );
+    it("should handle git exclude file", async () => {
+      await createTestFile(path.join(".git", "info", "exclude"), "temp/\n*.tmp");
 
-      expect(parser.isIgnored(path.join('temp', 'file.txt'))).toBe(true);
-      expect(parser.isIgnored(path.join('src', 'file.tmp'))).toBe(true);
-      expect(parser.isIgnored('src/file.js')).toBe(false);
+      expect(parser.isIgnored(path.join("temp", "file.txt"))).toBe(true);
+      expect(parser.isIgnored(path.join("src", "file.tmp"))).toBe(true);
+      expect(parser.isIgnored("src/file.js")).toBe(false);
     });
   });
 
-  describe('isIgnored path handling', () => {
+  describe("isIgnored path handling", () => {
     beforeEach(async () => {
       await setupGitRepo();
       const gitignoreContent = `
@@ -84,228 +79,218 @@ node_modules/
 src/*.tmp
 !src/important.tmp
 `;
-      await createTestFile('.gitignore', gitignoreContent);
+      await createTestFile(".gitignore", gitignoreContent);
     });
 
-    it('should always ignore .git directory', () => {
-      expect(parser.isIgnored('.git')).toBe(true);
-      expect(parser.isIgnored(path.join('.git', 'config'))).toBe(true);
-      expect(parser.isIgnored(path.join(projectRoot, '.git', 'HEAD'))).toBe(
-        true,
-      );
+    it("should always ignore .git directory", () => {
+      expect(parser.isIgnored(".git")).toBe(true);
+      expect(parser.isIgnored(path.join(".git", "config"))).toBe(true);
+      expect(parser.isIgnored(path.join(projectRoot, ".git", "HEAD"))).toBe(true);
     });
 
-    it('should ignore files matching patterns', () => {
-      expect(
-        parser.isIgnored(path.join('node_modules', 'package', 'index.js')),
-      ).toBe(true);
-      expect(parser.isIgnored('app.log')).toBe(true);
-      expect(parser.isIgnored(path.join('logs', 'app.log'))).toBe(true);
-      expect(parser.isIgnored(path.join('dist', 'bundle.js'))).toBe(true);
-      expect(parser.isIgnored('.env')).toBe(true);
-      expect(parser.isIgnored(path.join('config', '.env'))).toBe(false); // .env is anchored to root
+    it("should ignore files matching patterns", () => {
+      expect(parser.isIgnored(path.join("node_modules", "package", "index.js"))).toBe(true);
+      expect(parser.isIgnored("app.log")).toBe(true);
+      expect(parser.isIgnored(path.join("logs", "app.log"))).toBe(true);
+      expect(parser.isIgnored(path.join("dist", "bundle.js"))).toBe(true);
+      expect(parser.isIgnored(".env")).toBe(true);
+      expect(parser.isIgnored(path.join("config", ".env"))).toBe(false); // .env is anchored to root
     });
 
-    it('should ignore files with path-specific patterns', () => {
-      expect(parser.isIgnored(path.join('src', 'temp.tmp'))).toBe(true);
-      expect(parser.isIgnored(path.join('other', 'temp.tmp'))).toBe(false);
+    it("should ignore files with path-specific patterns", () => {
+      expect(parser.isIgnored(path.join("src", "temp.tmp"))).toBe(true);
+      expect(parser.isIgnored(path.join("other", "temp.tmp"))).toBe(false);
     });
 
-    it('should handle negation patterns', () => {
-      expect(parser.isIgnored(path.join('src', 'important.tmp'))).toBe(false);
+    it("should handle negation patterns", () => {
+      expect(parser.isIgnored(path.join("src", "important.tmp"))).toBe(false);
     });
 
-    it('should not ignore files that do not match patterns', () => {
-      expect(parser.isIgnored(path.join('src', 'index.ts'))).toBe(false);
-      expect(parser.isIgnored('README.md')).toBe(false);
+    it("should not ignore files that do not match patterns", () => {
+      expect(parser.isIgnored(path.join("src", "index.ts"))).toBe(false);
+      expect(parser.isIgnored("README.md")).toBe(false);
     });
 
-    it('should handle absolute paths correctly', () => {
-      const absolutePath = path.join(projectRoot, 'node_modules', 'lib');
+    it("should handle absolute paths correctly", () => {
+      const absolutePath = path.join(projectRoot, "node_modules", "lib");
       expect(parser.isIgnored(absolutePath)).toBe(true);
     });
 
-    it('should handle paths outside project root by not ignoring them', () => {
-      const outsidePath = path.resolve(projectRoot, '..', 'other', 'file.txt');
+    it("should handle paths outside project root by not ignoring them", () => {
+      const outsidePath = path.resolve(projectRoot, "..", "other", "file.txt");
       expect(parser.isIgnored(outsidePath)).toBe(false);
     });
 
-    it('should handle relative paths correctly', () => {
-      expect(parser.isIgnored(path.join('node_modules', 'some-package'))).toBe(
-        true,
-      );
-      expect(
-        parser.isIgnored(path.join('..', 'some', 'other', 'file.txt')),
-      ).toBe(false);
+    it("should handle relative paths correctly", () => {
+      expect(parser.isIgnored(path.join("node_modules", "some-package"))).toBe(true);
+      expect(parser.isIgnored(path.join("..", "some", "other", "file.txt"))).toBe(false);
     });
 
-    it('should normalize path separators on Windows', () => {
-      expect(parser.isIgnored(path.join('node_modules', 'package'))).toBe(true);
-      expect(parser.isIgnored(path.join('src', 'temp.tmp'))).toBe(true);
+    it("should normalize path separators on Windows", () => {
+      expect(parser.isIgnored(path.join("node_modules", "package"))).toBe(true);
+      expect(parser.isIgnored(path.join("src", "temp.tmp"))).toBe(true);
     });
 
     it('should handle root path "/" without throwing error', () => {
-      expect(() => parser.isIgnored('/')).not.toThrow();
-      expect(parser.isIgnored('/')).toBe(false);
+      expect(() => parser.isIgnored("/")).not.toThrow();
+      expect(parser.isIgnored("/")).toBe(false);
     });
 
-    it('should handle absolute-like paths without throwing error', () => {
-      expect(() => parser.isIgnored('/some/path')).not.toThrow();
-      expect(parser.isIgnored('/some/path')).toBe(false);
+    it("should handle absolute-like paths without throwing error", () => {
+      expect(() => parser.isIgnored("/some/path")).not.toThrow();
+      expect(parser.isIgnored("/some/path")).toBe(false);
     });
 
-    it('should handle paths that start with forward slash', () => {
-      expect(() => parser.isIgnored('/node_modules')).not.toThrow();
-      expect(parser.isIgnored('/node_modules')).toBe(false);
+    it("should handle paths that start with forward slash", () => {
+      expect(() => parser.isIgnored("/node_modules")).not.toThrow();
+      expect(parser.isIgnored("/node_modules")).toBe(false);
     });
 
-    it('should handle backslash-prefixed files without crashing', () => {
-      expect(() => parser.isIgnored('\\backslash-file-test.txt')).not.toThrow();
-      expect(parser.isIgnored('\\backslash-file-test.txt')).toBe(false);
+    it("should handle backslash-prefixed files without crashing", () => {
+      expect(() => parser.isIgnored("\\backslash-file-test.txt")).not.toThrow();
+      expect(parser.isIgnored("\\backslash-file-test.txt")).toBe(false);
     });
 
-    it('should handle files with absolute-like names', () => {
-      expect(() => parser.isIgnored('/backslash-file-test.txt')).not.toThrow();
-      expect(parser.isIgnored('/backslash-file-test.txt')).toBe(false);
+    it("should handle files with absolute-like names", () => {
+      expect(() => parser.isIgnored("/backslash-file-test.txt")).not.toThrow();
+      expect(parser.isIgnored("/backslash-file-test.txt")).toBe(false);
     });
   });
 
-  describe('nested .gitignore files', () => {
+  describe("nested .gitignore files", () => {
     beforeEach(async () => {
       await setupGitRepo();
       // Root .gitignore
-      await createTestFile('.gitignore', 'root-ignored.txt');
+      await createTestFile(".gitignore", "root-ignored.txt");
       // Nested .gitignore 1
-      await createTestFile('a/.gitignore', '/b\nc');
+      await createTestFile("a/.gitignore", "/b\nc");
       // Nested .gitignore 2
-      await createTestFile('a/d/.gitignore', 'e.txt\nf/g');
+      await createTestFile("a/d/.gitignore", "e.txt\nf/g");
     });
 
-    it('should handle nested .gitignore files correctly', async () => {
+    it("should handle nested .gitignore files correctly", async () => {
       // From root .gitignore
-      expect(parser.isIgnored('root-ignored.txt')).toBe(true);
-      expect(parser.isIgnored('a/root-ignored.txt')).toBe(true);
+      expect(parser.isIgnored("root-ignored.txt")).toBe(true);
+      expect(parser.isIgnored("a/root-ignored.txt")).toBe(true);
 
       // From a/.gitignore: /b
-      expect(parser.isIgnored('a/b')).toBe(true);
-      expect(parser.isIgnored('b')).toBe(false);
-      expect(parser.isIgnored('a/x/b')).toBe(false);
+      expect(parser.isIgnored("a/b")).toBe(true);
+      expect(parser.isIgnored("b")).toBe(false);
+      expect(parser.isIgnored("a/x/b")).toBe(false);
 
       // From a/.gitignore: c
-      expect(parser.isIgnored('a/c')).toBe(true);
-      expect(parser.isIgnored('a/x/y/c')).toBe(true);
-      expect(parser.isIgnored('c')).toBe(false);
+      expect(parser.isIgnored("a/c")).toBe(true);
+      expect(parser.isIgnored("a/x/y/c")).toBe(true);
+      expect(parser.isIgnored("c")).toBe(false);
 
       // From a/d/.gitignore: e.txt
-      expect(parser.isIgnored('a/d/e.txt')).toBe(true);
-      expect(parser.isIgnored('a/d/x/e.txt')).toBe(true);
-      expect(parser.isIgnored('a/e.txt')).toBe(false);
+      expect(parser.isIgnored("a/d/e.txt")).toBe(true);
+      expect(parser.isIgnored("a/d/x/e.txt")).toBe(true);
+      expect(parser.isIgnored("a/e.txt")).toBe(false);
 
       // From a/d/.gitignore: f/g
-      expect(parser.isIgnored('a/d/f/g')).toBe(true);
-      expect(parser.isIgnored('a/f/g')).toBe(false);
+      expect(parser.isIgnored("a/d/f/g")).toBe(true);
+      expect(parser.isIgnored("a/f/g")).toBe(false);
     });
   });
 
-  describe('precedence rules', () => {
+  describe("precedence rules", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should prioritize nested .gitignore over root .gitignore', async () => {
-      await createTestFile('.gitignore', '*.log');
-      await createTestFile('a/b/.gitignore', '!special.log');
+    it("should prioritize nested .gitignore over root .gitignore", async () => {
+      await createTestFile(".gitignore", "*.log");
+      await createTestFile("a/b/.gitignore", "!special.log");
 
-      expect(parser.isIgnored('a/b/any.log')).toBe(true);
-      expect(parser.isIgnored('a/b/special.log')).toBe(false);
+      expect(parser.isIgnored("a/b/any.log")).toBe(true);
+      expect(parser.isIgnored("a/b/special.log")).toBe(false);
     });
 
-    it('should prioritize .gitignore over .git/info/exclude', async () => {
+    it("should prioritize .gitignore over .git/info/exclude", async () => {
       // Exclude all .log files
-      await createTestFile(path.join('.git', 'info', 'exclude'), '*.log');
+      await createTestFile(path.join(".git", "info", "exclude"), "*.log");
       // But make an exception in the root .gitignore
-      await createTestFile('.gitignore', '!important.log');
+      await createTestFile(".gitignore", "!important.log");
 
-      expect(parser.isIgnored('some.log')).toBe(true);
-      expect(parser.isIgnored('important.log')).toBe(false);
-      expect(parser.isIgnored(path.join('subdir', 'some.log'))).toBe(true);
-      expect(parser.isIgnored(path.join('subdir', 'important.log'))).toBe(
-        false,
-      );
+      expect(parser.isIgnored("some.log")).toBe(true);
+      expect(parser.isIgnored("important.log")).toBe(false);
+      expect(parser.isIgnored(path.join("subdir", "some.log"))).toBe(true);
+      expect(parser.isIgnored(path.join("subdir", "important.log"))).toBe(false);
     });
   });
-  describe('Escaped Characters', () => {
+  describe("Escaped Characters", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should correctly handle escaped characters in .gitignore', async () => {
-      await createTestFile('.gitignore', '\\#foo\n\\!bar');
+    it("should correctly handle escaped characters in .gitignore", async () => {
+      await createTestFile(".gitignore", "\\#foo\n\\!bar");
       // Create files with special characters in names
-      await createTestFile('bla/#foo', 'content');
-      await createTestFile('bla/!bar', 'content');
+      await createTestFile("bla/#foo", "content");
+      await createTestFile("bla/!bar", "content");
 
       // These should be ignored based on the escaped patterns
-      expect(parser.isIgnored('bla/#foo')).toBe(true);
-      expect(parser.isIgnored('bla/!bar')).toBe(true);
+      expect(parser.isIgnored("bla/#foo")).toBe(true);
+      expect(parser.isIgnored("bla/!bar")).toBe(true);
     });
   });
 
-  describe('Trailing Spaces', () => {
+  describe("Trailing Spaces", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should correctly handle significant trailing spaces', async () => {
-      await createTestFile('.gitignore', 'foo\\ \nbar ');
-      await createTestFile('foo ', 'content');
-      await createTestFile('bar', 'content');
-      await createTestFile('bar ', 'content');
+    it("should correctly handle significant trailing spaces", async () => {
+      await createTestFile(".gitignore", "foo\\ \nbar ");
+      await createTestFile("foo ", "content");
+      await createTestFile("bar", "content");
+      await createTestFile("bar ", "content");
 
       // 'foo\ ' should match 'foo '
-      expect(parser.isIgnored('foo ')).toBe(true);
+      expect(parser.isIgnored("foo ")).toBe(true);
 
       // 'bar ' should be trimmed to 'bar'
-      expect(parser.isIgnored('bar')).toBe(true);
-      expect(parser.isIgnored('bar ')).toBe(false);
+      expect(parser.isIgnored("bar")).toBe(true);
+      expect(parser.isIgnored("bar ")).toBe(false);
     });
   });
 
-  describe('Extra Patterns', () => {
+  describe("Extra Patterns", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should apply extraPatterns with higher precedence than .gitignore', async () => {
-      await createTestFile('.gitignore', '*.txt');
+    it("should apply extraPatterns with higher precedence than .gitignore", async () => {
+      await createTestFile(".gitignore", "*.txt");
 
-      const extraPatterns = ['!important.txt', 'temp/'];
+      const extraPatterns = ["!important.txt", "temp/"];
       parser = new GitIgnoreParser(projectRoot, extraPatterns);
 
-      expect(parser.isIgnored('file.txt')).toBe(true);
-      expect(parser.isIgnored('important.txt')).toBe(false); // Un-ignored by extraPatterns
-      expect(parser.isIgnored('temp/file.js')).toBe(true); // Ignored by extraPatterns
+      expect(parser.isIgnored("file.txt")).toBe(true);
+      expect(parser.isIgnored("important.txt")).toBe(false); // Un-ignored by extraPatterns
+      expect(parser.isIgnored("temp/file.js")).toBe(true); // Ignored by extraPatterns
     });
 
-    it('should handle extraPatterns that unignore directories', async () => {
-      await createTestFile('.gitignore', '/foo/\n/a/*/c/');
+    it("should handle extraPatterns that unignore directories", async () => {
+      await createTestFile(".gitignore", "/foo/\n/a/*/c/");
 
-      const extraPatterns = ['!foo/', '!a/*/c/'];
+      const extraPatterns = ["!foo/", "!a/*/c/"];
       parser = new GitIgnoreParser(projectRoot, extraPatterns);
 
-      expect(parser.isIgnored('foo/bar/file.txt')).toBe(false);
-      expect(parser.isIgnored('a/b/c/file.txt')).toBe(false);
+      expect(parser.isIgnored("foo/bar/file.txt")).toBe(false);
+      expect(parser.isIgnored("a/b/c/file.txt")).toBe(false);
     });
 
-    it('should handle extraPatterns that unignore directories with nested gitignore', async () => {
-      await createTestFile('.gitignore', '/foo/');
-      await createTestFile('foo/bar/.gitignore', 'file.txt');
+    it("should handle extraPatterns that unignore directories with nested gitignore", async () => {
+      await createTestFile(".gitignore", "/foo/");
+      await createTestFile("foo/bar/.gitignore", "file.txt");
 
-      const extraPatterns = ['!foo/'];
+      const extraPatterns = ["!foo/"];
       parser = new GitIgnoreParser(projectRoot, extraPatterns);
 
-      expect(parser.isIgnored('foo/bar/file.txt')).toBe(true);
-      expect(parser.isIgnored('foo/bar/file2.txt')).toBe(false);
+      expect(parser.isIgnored("foo/bar/file.txt")).toBe(true);
+      expect(parser.isIgnored("foo/bar/file2.txt")).toBe(false);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/gitIgnoreParser.ts b/packages/gemini-cli-core/src/utils/gitIgnoreParser.ts
index f2dc3d1a2..6e0cff439 100644
--- a/packages/gemini-cli-core/src/utils/gitIgnoreParser.ts
+++ b/packages/gemini-cli-core/src/utils/gitIgnoreParser.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import ignore from 'ignore';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import ignore from "ignore";
 
 export interface GitIgnoreFilter {
   isIgnored(filePath: string): boolean;
@@ -25,98 +25,90 @@ export class GitIgnoreParser implements GitIgnoreFilter {
     this.projectRoot = path.resolve(projectRoot);
     if (this.extraPatterns) {
       // extraPatterns are assumed to be from project root (like .geminiignore)
-      this.processedExtraPatterns = this.processPatterns(
-        this.extraPatterns,
-        '.',
-      );
+      this.processedExtraPatterns = this.processPatterns(this.extraPatterns, ".");
     }
   }
 
   private loadPatternsForFile(patternsFilePath: string): string[] {
     let content: string;
     try {
-      content = fs.readFileSync(patternsFilePath, 'utf-8');
+      content = fs.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       return [];
     }
 
-    const isExcludeFile = patternsFilePath.endsWith(
-      path.join('.git', 'info', 'exclude'),
-    );
+    const isExcludeFile = patternsFilePath.endsWith(path.join(".git", "info", "exclude"));
 
     const relativeBaseDir = isExcludeFile
-      ? '.'
+      ? "."
       : path
           .dirname(path.relative(this.projectRoot, patternsFilePath))
           .split(path.sep)
           .join(path.posix.sep);
 
-    const rawPatterns = content.split('\n');
+    const rawPatterns = content.split("\n");
     return this.processPatterns(rawPatterns, relativeBaseDir);
   }
 
-  private processPatterns(
-    rawPatterns: string[],
-    relativeBaseDir: string,
-  ): string[] {
+  private processPatterns(rawPatterns: string[], relativeBaseDir: string): string[] {
     return rawPatterns
       .map((p) => p.trimStart())
-      .filter((p) => p !== '' && !p.startsWith('#'))
+      .filter((p) => p !== "" && !p.startsWith("#"))
       .map((p) => {
-        const isNegative = p.startsWith('!');
+        const isNegative = p.startsWith("!");
         if (isNegative) {
           p = p.substring(1);
         }
 
-        const isAnchoredInFile = p.startsWith('/');
+        const isAnchoredInFile = p.startsWith("/");
         if (isAnchoredInFile) {
           p = p.substring(1);
         }
 
         // An empty pattern can result from a negated pattern like `!`,
         // which we can ignore.
-        if (p === '') {
-          return '';
+        if (p === "") {
+          return "";
         }
 
         let newPattern = p;
-        if (relativeBaseDir && relativeBaseDir !== '.') {
+        if (relativeBaseDir && relativeBaseDir !== ".") {
           // Only in nested .gitignore files, the patterns need to be modified according to:
           // - If `a/b/.gitignore` defines `/c` then it needs to be changed to `/a/b/c`
           // - If `a/b/.gitignore` defines `c` then it needs to be changed to `/a/b/**/c`
           // - If `a/b/.gitignore` defines `c/d` then it needs to be changed to `/a/b/c/d`
 
-          if (!isAnchoredInFile && !p.includes('/')) {
+          if (!isAnchoredInFile && !p.includes("/")) {
             // If no slash and not anchored in file, it matches files in any
             // subdirectory.
-            newPattern = path.posix.join('**', p);
+            newPattern = path.posix.join("**", p);
           }
 
           // Prepend the .gitignore file's directory.
           newPattern = path.posix.join(relativeBaseDir, newPattern);
 
           // Anchor the pattern to a nested gitignore directory.
-          if (!newPattern.startsWith('/')) {
-            newPattern = '/' + newPattern;
+          if (!newPattern.startsWith("/")) {
+            newPattern = "/" + newPattern;
           }
         }
 
         // Anchor the pattern if originally anchored
-        if (isAnchoredInFile && !newPattern.startsWith('/')) {
-          newPattern = '/' + newPattern;
+        if (isAnchoredInFile && !newPattern.startsWith("/")) {
+          newPattern = "/" + newPattern;
         }
 
         if (isNegative) {
-          newPattern = '!' + newPattern;
+          newPattern = "!" + newPattern;
         }
 
         return newPattern;
       })
-      .filter((p) => p !== '');
+      .filter((p) => p !== "");
   }
 
   isIgnored(filePath: string): boolean {
-    if (!filePath || typeof filePath !== 'string') {
+    if (!filePath || typeof filePath !== "string") {
       return false;
     }
 
@@ -129,30 +121,25 @@ export class GitIgnoreParser implements GitIgnoreFilter {
       const resolved = path.resolve(this.projectRoot, filePath);
       const relativePath = path.relative(this.projectRoot, resolved);
 
-      if (relativePath === '' || relativePath.startsWith('..')) {
+      if (relativePath === "" || relativePath.startsWith("..")) {
         return false;
       }
 
       // Even in windows, Ignore expects forward slashes.
-      const normalizedPath = relativePath.replace(/\\/g, '/');
+      const normalizedPath = relativePath.replace(/\\/g, "/");
 
-      if (normalizedPath.startsWith('/') || normalizedPath === '') {
+      if (normalizedPath.startsWith("/") || normalizedPath === "") {
         return false;
       }
 
       const ig = ignore();
 
       // Always ignore .git directory
-      ig.add('.git');
+      ig.add(".git");
 
       // Load global patterns from .git/info/exclude on first call
       if (this.globalPatterns === undefined) {
-        const excludeFile = path.join(
-          this.projectRoot,
-          '.git',
-          'info',
-          'exclude',
-        );
+        const excludeFile = path.join(this.projectRoot, ".git", "info", "exclude");
         this.globalPatterns = fs.existsSync(excludeFile)
           ? this.loadPatternsForFile(excludeFile)
           : [];
@@ -172,10 +159,8 @@ export class GitIgnoreParser implements GitIgnoreFilter {
       for (const dir of dirsToVisit) {
         const relativeDir = path.relative(this.projectRoot, dir);
         if (relativeDir) {
-          const normalizedRelativeDir = relativeDir.replace(/\\/g, '/');
-          const igPlusExtras = ignore()
-            .add(ig)
-            .add(this.processedExtraPatterns);
+          const normalizedRelativeDir = relativeDir.replace(/\\/g, "/");
+          const igPlusExtras = ignore().add(ig).add(this.processedExtraPatterns);
           if (igPlusExtras.ignores(normalizedRelativeDir)) {
             // This directory is ignored by an ancestor's .gitignore.
             // According to git behavior, we don't need to process this
@@ -191,7 +176,7 @@ export class GitIgnoreParser implements GitIgnoreFilter {
             ig.add(patterns);
           }
         } else {
-          const gitignorePath = path.join(dir, '.gitignore');
+          const gitignorePath = path.join(dir, ".gitignore");
           if (fs.existsSync(gitignorePath)) {
             const patterns = this.loadPatternsForFile(gitignorePath);
 
diff --git a/packages/gemini-cli-core/src/utils/gitUtils.ts b/packages/gemini-cli-core/src/utils/gitUtils.ts
index 9ac8f1b04..b4b2efb40 100644
--- a/packages/gemini-cli-core/src/utils/gitUtils.ts
+++ b/packages/gemini-cli-core/src/utils/gitUtils.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
+import * as fs from "node:fs";
+import * as path from "node:path";
 
 /**
  * Checks if a directory is within a git repository
@@ -17,7 +17,7 @@ export function isGitRepository(directory: string): boolean {
     let currentDir = path.resolve(directory);
 
     while (true) {
-      const gitDir = path.join(currentDir, '.git');
+      const gitDir = path.join(currentDir, ".git");
 
       // Check if .git exists (either as directory or file for worktrees)
       if (fs.existsSync(gitDir)) {
@@ -51,7 +51,7 @@ export function findGitRoot(directory: string): string | null {
     let currentDir = path.resolve(directory);
 
     while (true) {
-      const gitDir = path.join(currentDir, '.git');
+      const gitDir = path.join(currentDir, ".git");
 
       if (fs.existsSync(gitDir)) {
         return currentDir;
diff --git a/packages/gemini-cli-core/src/utils/googleErrors.test.ts b/packages/gemini-cli-core/src/utils/googleErrors.test.ts
index 46a6aa7b7..35c43e846 100644
--- a/packages/gemini-cli-core/src/utils/googleErrors.test.ts
+++ b/packages/gemini-cli-core/src/utils/googleErrors.test.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseGoogleApiError } from './googleErrors.js';
-import type { QuotaFailure } from './googleErrors.js';
+import { describe, expect, it } from "vitest";
+import type { QuotaFailure } from "./googleErrors.js";
+import { parseGoogleApiError } from "./googleErrors.js";
 
-describe('parseGoogleApiError', () => {
-  it('should return null for non-gaxios errors', () => {
-    expect(parseGoogleApiError(new Error('vanilla error'))).toBeNull();
+describe("parseGoogleApiError", () => {
+  it("should return null for non-gaxios errors", () => {
+    expect(parseGoogleApiError(new Error("vanilla error"))).toBeNull();
     expect(parseGoogleApiError(null)).toBeNull();
     expect(parseGoogleApiError({})).toBeNull();
   });
 
-  it('should parse a standard gaxios error', () => {
+  it("should parse a standard gaxios error", () => {
     const mockError = {
       response: {
         status: 429,
         data: {
           error: {
             code: 429,
-            message: 'Quota exceeded',
+            message: "Quota exceeded",
             details: [
               {
-                '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-                violations: [{ subject: 'user', description: 'daily limit' }],
+                "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+                violations: [{ subject: "user", description: "daily limit" }],
               },
             ],
           },
@@ -37,22 +37,22 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
     expect(parsed?.details).toHaveLength(1);
     const detail = parsed?.details[0] as QuotaFailure;
-    expect(detail['@type']).toBe('type.googleapis.com/google.rpc.QuotaFailure');
-    expect(detail.violations[0].description).toBe('daily limit');
+    expect(detail["@type"]).toBe("type.googleapis.com/google.rpc.QuotaFailure");
+    expect(detail.violations[0].description).toBe("daily limit");
   });
 
-  it('should parse an error with details stringified in the message', () => {
+  it("should parse an error with details stringified in the message", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Inner quota message',
+        message: "Inner quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '10s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "10s",
           },
         ],
       },
@@ -74,22 +74,20 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Inner quota message');
+    expect(parsed?.message).toBe("Inner quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should return null if details are not in the expected format', () => {
+  it("should return null if details are not in the expected format", () => {
     const mockError = {
       response: {
         status: 400,
         data: {
           error: {
             code: 400,
-            message: 'Bad Request',
-            details: 'just a string', // Invalid details format
+            message: "Bad Request",
+            details: "just a string", // Invalid details format
           },
         },
       },
@@ -97,23 +95,23 @@ describe('parseGoogleApiError', () => {
 
     expect(parseGoogleApiError(mockError)).toEqual({
       code: 400,
-      message: 'Bad Request',
+      message: "Bad Request",
       details: [],
     });
   });
 
-  it('should return null if there are no valid details', () => {
+  it("should return null if there are no valid details", () => {
     const mockError = {
       response: {
         status: 400,
         data: {
           error: {
             code: 400,
-            message: 'Bad Request',
+            message: "Bad Request",
             details: [
               {
                 // missing '@type'
-                reason: 'some reason',
+                reason: "some reason",
               },
             ],
           },
@@ -122,20 +120,20 @@ describe('parseGoogleApiError', () => {
     };
     expect(parseGoogleApiError(mockError)).toEqual({
       code: 400,
-      message: 'Bad Request',
+      message: "Bad Request",
       details: [],
     });
   });
 
-  it('should parse a doubly nested error in the message', () => {
+  it("should parse a doubly nested error in the message", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Innermost quota message',
+        message: "Innermost quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '20s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "20s",
           },
         ],
       },
@@ -165,22 +163,20 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Innermost quota message');
+    expect(parsed?.message).toBe("Innermost quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should parse an error that is not in a response object', () => {
+  it("should parse an error that is not in a response object", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Innermost quota message',
+        message: "Innermost quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '20s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "20s",
           },
         ],
       },
@@ -197,22 +193,20 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Innermost quota message');
+    expect(parsed?.message).toBe("Innermost quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should parse an error that is a JSON string', () => {
+  it("should parse an error that is a JSON string", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Innermost quota message',
+        message: "Innermost quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '20s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "20s",
           },
         ],
       },
@@ -229,44 +223,38 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(JSON.stringify(mockError));
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Innermost quota message');
+    expect(parsed?.message).toBe("Innermost quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should parse the user-provided nested error string', () => {
+  it("should parse the user-provided nested error string", () => {
     const userErrorString =
       '{"error":{"message":"{\\n  \\"error\\": {\\n    \\"code\\": 429,\\n    \\"message\\": \\"You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count, limit: 10000\\\\nPlease retry in 40.025771073s.\\",\\n    \\"status\\": \\"RESOURCE_EXHAUSTED\\",\\n    \\"details\\": [\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.DebugInfo\\",\\n        \\"detail\\": \\"[ORIGINAL ERROR] generic::resource_exhausted: You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count, limit: 10000\\\\nPlease retry in 40.025771073s. [google.rpc.error_details_ext] { message: \\\\\\"You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count, limit: 10000\\\\\\\\nPlease retry in 40.025771073s.\\\\\\" }\\"\\n      },\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.QuotaFailure\\",\\n        \\"violations\\": [\\n          {\\n            \\"quotaMetric\\": \\"generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count\\",\\n            \\"quotaId\\": \\"GenerateContentPaidTierInputTokensPerModelPerMinute\\",\\n            \\"quotaDimensions\\": {\\n              \\"location\\": \\"global\\",\\n              \\"model\\": \\"gemini-2.5-pro\\"\\n            },\\n            \\"quotaValue\\": \\"10000\\"\\n          }\\n        ]\\n      },\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.Help\\",\\n        \\"links\\": [\\n          {\\n            \\"description\\": \\"Learn more about Gemini API quotas\\",\\n            \\"url\\": \\"https://ai.google.dev/gemini-api/docs/rate-limits\\"\\n          }\\n        ]\\n      },\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.RetryInfo\\",\\n        \\"retryDelay\\": \\"40s\\"\\n      }\\n    ]\\n  }\\n}\\n","code":429,"status":"Too Many Requests"}}';
 
     const parsed = parseGoogleApiError(userErrorString);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toContain('You exceeded your current quota');
+    expect(parsed?.message).toContain("You exceeded your current quota");
     expect(parsed?.details).toHaveLength(4);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.QuotaFailure',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure"),
     ).toBe(true);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.RetryInfo',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo"),
     ).toBe(true);
   });
 
-  it('should parse an error that is an array', () => {
+  it("should parse an error that is an array", () => {
     const mockError = [
       {
         error: {
           code: 429,
-          message: 'Quota exceeded',
+          message: "Quota exceeded",
           details: [
             {
-              '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-              violations: [{ subject: 'user', description: 'daily limit' }],
+              "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+              violations: [{ subject: "user", description: "daily limit" }],
             },
           ],
         },
@@ -276,10 +264,10 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
   });
 
-  it('should parse a gaxios error where data is an array', () => {
+  it("should parse a gaxios error where data is an array", () => {
     const mockError = {
       response: {
         status: 429,
@@ -287,11 +275,11 @@ describe('parseGoogleApiError', () => {
           {
             error: {
               code: 429,
-              message: 'Quota exceeded',
+              message: "Quota exceeded",
               details: [
                 {
-                  '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-                  violations: [{ subject: 'user', description: 'daily limit' }],
+                  "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+                  violations: [{ subject: "user", description: "daily limit" }],
                 },
               ],
             },
@@ -303,10 +291,10 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
   });
 
-  it('should parse a gaxios error where data is a stringified array', () => {
+  it("should parse a gaxios error where data is a stringified array", () => {
     const mockError = {
       response: {
         status: 429,
@@ -314,11 +302,11 @@ describe('parseGoogleApiError', () => {
           {
             error: {
               code: 429,
-              message: 'Quota exceeded',
+              message: "Quota exceeded",
               details: [
                 {
-                  '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-                  violations: [{ subject: 'user', description: 'daily limit' }],
+                  "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+                  violations: [{ subject: "user", description: "daily limit" }],
                 },
               ],
             },
@@ -330,18 +318,18 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
   });
 
-  it('should parse an error with a malformed @type key (returned by Gemini API)', () => {
+  it("should parse an error with a malformed @type key (returned by Gemini API)", () => {
     const malformedError = {
-      name: 'API Error',
+      name: "API Error",
       message: {
         error: {
           message:
             '{\n  "error": {\n    "code": 429,\n    "message": "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 54.887755558s.",\n    "status": "RESOURCE_EXHAUSTED",\n    "details": [\n      {\n        " @type": "type.googleapis.com/google.rpc.DebugInfo",\n        "detail": "[ORIGINAL ERROR] generic::resource_exhausted: You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\\nPlease retry in 54.887755558s. [google.rpc.error_details_ext] { message: \\"You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\\\\nPlease retry in 54.887755558s.\\" }"\n      },\n      {\n" @type": "type.googleapis.com/google.rpc.QuotaFailure",\n        "violations": [\n          {\n            "quotaMetric": "generativelanguage.googleapis.com/generate_content_free_tier_requests",\n            "quotaId": "GenerateRequestsPerMinutePerProjectPerModel-FreeTier",\n            "quotaDimensions": {\n              "location": "global",\n"model": "gemini-2.5-pro"\n            },\n            "quotaValue": "2"\n          }\n        ]\n      },\n      {\n" @type": "type.googleapis.com/google.rpc.Help",\n        "links": [\n          {\n            "description": "Learn more about Gemini API quotas",\n            "url": "https://ai.google.dev/gemini-api/docs/rate-limits"\n          }\n        ]\n      },\n      {\n" @type": "type.googleapis.com/google.rpc.RetryInfo",\n        "retryDelay": "54s"\n      }\n    ]\n  }\n}\n',
           code: 429,
-          status: 'Too Many Requests',
+          status: "Too Many Requests",
         },
       },
     };
@@ -349,17 +337,13 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(malformedError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toContain('You exceeded your current quota');
+    expect(parsed?.message).toContain("You exceeded your current quota");
     expect(parsed?.details).toHaveLength(4);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.QuotaFailure',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure"),
     ).toBe(true);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.RetryInfo',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo"),
     ).toBe(true);
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/googleErrors.ts b/packages/gemini-cli-core/src/utils/googleErrors.ts
index 56e20a95c..e37989a74 100644
--- a/packages/gemini-cli-core/src/utils/googleErrors.ts
+++ b/packages/gemini-cli-core/src/utils/googleErrors.ts
@@ -14,25 +14,25 @@
  */
 
 export interface ErrorInfo {
-  '@type': 'type.googleapis.com/google.rpc.ErrorInfo';
+  "@type": "type.googleapis.com/google.rpc.ErrorInfo";
   reason: string;
   domain: string;
   metadata: { [key: string]: string };
 }
 
 export interface RetryInfo {
-  '@type': 'type.googleapis.com/google.rpc.RetryInfo';
+  "@type": "type.googleapis.com/google.rpc.RetryInfo";
   retryDelay: string; // e.g. "51820.638305887s"
 }
 
 export interface DebugInfo {
-  '@type': 'type.googleapis.com/google.rpc.DebugInfo';
+  "@type": "type.googleapis.com/google.rpc.DebugInfo";
   stackEntries: string[];
   detail: string;
 }
 
 export interface QuotaFailure {
-  '@type': 'type.googleapis.com/google.rpc.QuotaFailure';
+  "@type": "type.googleapis.com/google.rpc.QuotaFailure";
   violations: Array<{
     subject?: string;
     description?: string;
@@ -46,7 +46,7 @@ export interface QuotaFailure {
 }
 
 export interface PreconditionFailure {
-  '@type': 'type.googleapis.com/google.rpc.PreconditionFailure';
+  "@type": "type.googleapis.com/google.rpc.PreconditionFailure";
   violations: Array<{
     type: string;
     subject: string;
@@ -55,13 +55,13 @@ export interface PreconditionFailure {
 }
 
 export interface LocalizedMessage {
-  '@type': 'type.googleapis.com/google.rpc.LocalizedMessage';
+  "@type": "type.googleapis.com/google.rpc.LocalizedMessage";
   locale: string;
   message: string;
 }
 
 export interface BadRequest {
-  '@type': 'type.googleapis.com/google.rpc.BadRequest';
+  "@type": "type.googleapis.com/google.rpc.BadRequest";
   fieldViolations: Array<{
     field: string;
     description: string;
@@ -71,13 +71,13 @@ export interface BadRequest {
 }
 
 export interface RequestInfo {
-  '@type': 'type.googleapis.com/google.rpc.RequestInfo';
+  "@type": "type.googleapis.com/google.rpc.RequestInfo";
   requestId: string;
   servingData: string;
 }
 
 export interface ResourceInfo {
-  '@type': 'type.googleapis.com/google.rpc.ResourceInfo';
+  "@type": "type.googleapis.com/google.rpc.ResourceInfo";
   resourceType: string;
   resourceName: string;
   owner: string;
@@ -85,7 +85,7 @@ export interface ResourceInfo {
 }
 
 export interface Help {
-  '@type': 'type.googleapis.com/google.rpc.Help';
+  "@type": "type.googleapis.com/google.rpc.Help";
   links: Array<{
     description: string;
     url: string;
@@ -136,7 +136,7 @@ export function parseGoogleApiError(error: unknown): GoogleApiError | null {
   let errorObj: unknown = error;
 
   // If error is a string, try to parse it.
-  if (typeof errorObj === 'string') {
+  if (typeof errorObj === "string") {
     try {
       errorObj = JSON.parse(errorObj);
     } catch (_) {
@@ -149,25 +149,20 @@ export function parseGoogleApiError(error: unknown): GoogleApiError | null {
     errorObj = errorObj[0];
   }
 
-  if (typeof errorObj !== 'object' || errorObj === null) {
+  if (typeof errorObj !== "object" || errorObj === null) {
     return null;
   }
 
-  let currentError: ErrorShape | undefined =
-    fromGaxiosError(errorObj) ?? fromApiError(errorObj);
+  let currentError: ErrorShape | undefined = fromGaxiosError(errorObj) ?? fromApiError(errorObj);
 
   let depth = 0;
   const maxDepth = 10;
   // Handle cases where the actual error object is stringified inside the message
   // by drilling down until we find an error that doesn't have a stringified message.
-  while (
-    currentError &&
-    typeof currentError.message === 'string' &&
-    depth < maxDepth
-  ) {
+  while (currentError && typeof currentError.message === "string" && depth < maxDepth) {
     try {
       const parsedMessage = JSON.parse(
-        currentError.message.replace(/\u00A0/g, '').replace(/\n/g, ' '),
+        currentError.message.replace(/\u00A0/g, "").replace(/\n/g, " "),
       );
       if (parsedMessage.error) {
         currentError = parsedMessage.error;
@@ -194,14 +189,12 @@ export function parseGoogleApiError(error: unknown): GoogleApiError | null {
     const details: GoogleApiErrorDetail[] = [];
     if (Array.isArray(errorDetails)) {
       for (const detail of errorDetails) {
-        if (detail && typeof detail === 'object') {
+        if (detail && typeof detail === "object") {
           const detailObj = detail as Record<string, unknown>;
-          const typeKey = Object.keys(detailObj).find(
-            (key) => key.trim() === '@type',
-          );
+          const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
           if (typeKey) {
-            if (typeKey !== '@type') {
-              detailObj['@type'] = detailObj[typeKey];
+            if (typeKey !== "@type") {
+              detailObj["@type"] = detailObj[typeKey];
               delete detailObj[typeKey];
             }
             // We can just cast it; the consumer will have to switch on @type
@@ -239,7 +232,7 @@ function fromGaxiosError(errorObj: object): ErrorShape | undefined {
   if (gaxiosError.response?.data) {
     let data = gaxiosError.response.data;
 
-    if (typeof data === 'string') {
+    if (typeof data === "string") {
       try {
         data = JSON.parse(data);
       } catch (_) {
@@ -251,8 +244,8 @@ function fromGaxiosError(errorObj: object): ErrorShape | undefined {
       data = data[0];
     }
 
-    if (typeof data === 'object' && data !== null) {
-      if ('error' in data) {
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
         outerError = (data as { error: ErrorShape }).error;
       }
     }
@@ -283,15 +276,15 @@ function fromApiError(errorObj: object): ErrorShape | undefined {
   if (apiError.message) {
     let data = apiError.message;
 
-    if (typeof data === 'string') {
+    if (typeof data === "string") {
       try {
         data = JSON.parse(data);
       } catch (_) {
         // Not a JSON string, can't parse.
         // Try one more fallback: look for the first '{' and last '}'
-        if (typeof data === 'string') {
-          const firstBrace = data.indexOf('{');
-          const lastBrace = data.lastIndexOf('}');
+        if (typeof data === "string") {
+          const firstBrace = data.indexOf("{");
+          const lastBrace = data.lastIndexOf("}");
           if (firstBrace !== -1 && lastBrace !== -1 && lastBrace > firstBrace) {
             try {
               data = JSON.parse(data.substring(firstBrace, lastBrace + 1));
@@ -307,8 +300,8 @@ function fromApiError(errorObj: object): ErrorShape | undefined {
       data = data[0];
     }
 
-    if (typeof data === 'object' && data !== null) {
-      if ('error' in data) {
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
         outerError = (data as { error: ErrorShape }).error;
       }
     }
diff --git a/packages/gemini-cli-core/src/utils/googleQuotaErrors.test.ts b/packages/gemini-cli-core/src/utils/googleQuotaErrors.test.ts
index f6fd9f474..d76f477e3 100644
--- a/packages/gemini-cli-core/src/utils/googleQuotaErrors.test.ts
+++ b/packages/gemini-cli-core/src/utils/googleQuotaErrors.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GoogleApiError } from "./googleErrors.js";
+import * as errorParser from "./googleErrors.js";
 import {
   classifyGoogleError,
   RetryableQuotaError,
   TerminalQuotaError,
-} from './googleQuotaErrors.js';
-import * as errorParser from './googleErrors.js';
-import type { GoogleApiError } from './googleErrors.js';
-import { ModelNotFoundError } from './httpErrors.js';
+} from "./googleQuotaErrors.js";
+import { ModelNotFoundError } from "./httpErrors.js";
 
-describe('classifyGoogleError', () => {
+describe("classifyGoogleError", () => {
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should return original error if not a Google API error', () => {
-    const regularError = new Error('Something went wrong');
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(null);
+  it("should return original error if not a Google API error", () => {
+    const regularError = new Error("Something went wrong");
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(null);
     const result = classifyGoogleError(regularError);
     expect(result).toBe(regularError);
   });
@@ -32,11 +32,11 @@ describe('classifyGoogleError', () => {
         message:
           '{"error": {"code": 429, "status": 429, "message": "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 44.097740004s.", "details": [{"detail": "??? to (unknown) : APP_ERROR(8) You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 44.097740004s."}]}}',
         code: 429,
-        status: 'Too Many Requests',
+        status: "Too Many Requests",
       },
     };
     const rawError = new Error(JSON.stringify(complexError));
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(null);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(null);
 
     const result = classifyGoogleError(rawError);
 
@@ -51,11 +51,11 @@ describe('classifyGoogleError', () => {
         message:
           '{"error": {"code": 429, "status": 429, "message": "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 900.2ms.", "details": [{"detail": "??? to (unknown) : APP_ERROR(8) You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 900.2ms."}]}}',
         code: 429,
-        status: 'Too Many Requests',
+        status: "Too Many Requests",
       },
     });
     const rawError = new Error(complexErrorString);
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(null);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(null);
 
     const result = classifyGoogleError(rawError);
 
@@ -64,13 +64,13 @@ describe('classifyGoogleError', () => {
     expect((result as RetryableQuotaError).message).toBe(rawError.message);
   });
 
-  it('should return original error if code is not 429', () => {
+  it("should return original error if code is not 429", () => {
     const apiError: GoogleApiError = {
       code: 500,
-      message: 'Server error',
+      message: "Server error",
       details: [],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const originalError = new Error();
     const result = classifyGoogleError(originalError);
     expect(result).toBe(originalError);
@@ -78,279 +78,274 @@ describe('classifyGoogleError', () => {
     expect(result).not.toBeInstanceOf(RetryableQuotaError);
   });
 
-  it('should return TerminalQuotaError for daily quota violations in QuotaFailure', () => {
+  it("should return TerminalQuotaError for daily quota violations in QuotaFailure", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              subject: 'user',
-              description: 'daily limit',
-              quotaId: 'RequestsPerDay-limit',
+              subject: "user",
+              description: "daily limit",
+              quotaId: "RequestsPerDay-limit",
             },
           ],
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
     expect((result as TerminalQuotaError).cause).toBe(apiError);
   });
 
-  it('should return TerminalQuotaError for daily quota violations in ErrorInfo', () => {
+  it("should return TerminalQuotaError for daily quota violations in ErrorInfo", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'QUOTA_EXCEEDED',
-          domain: 'googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "QUOTA_EXCEEDED",
+          domain: "googleapis.com",
           metadata: {
-            quota_limit: 'RequestsPerDay_PerProject_PerUser',
+            quota_limit: "RequestsPerDay_PerProject_PerUser",
           },
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should return TerminalQuotaError for long retry delays', () => {
+  it("should return TerminalQuotaError for long retry delays", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Too many requests',
+      message: "Too many requests",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '301s', // > 5 minutes
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "301s", // > 5 minutes
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should return RetryableQuotaError for short retry delays', () => {
+  it("should return RetryableQuotaError for short retry delays", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Too many requests',
+      message: "Too many requests",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '45.123s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "45.123s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(45123);
   });
 
-  it('should return RetryableQuotaError for per-minute quota violations in QuotaFailure', () => {
+  it("should return RetryableQuotaError for per-minute quota violations in QuotaFailure", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              subject: 'user',
-              description: 'per minute limit',
-              quotaId: 'RequestsPerMinute-limit',
+              subject: "user",
+              description: "per minute limit",
+              quotaId: "RequestsPerMinute-limit",
             },
           ],
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(60000);
   });
 
-  it('should return RetryableQuotaError for per-minute quota violations in ErrorInfo', () => {
+  it("should return RetryableQuotaError for per-minute quota violations in ErrorInfo", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'QUOTA_EXCEEDED',
-          domain: 'googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "QUOTA_EXCEEDED",
+          domain: "googleapis.com",
           metadata: {
-            quota_limit: 'RequestsPerMinute_PerProject_PerUser',
+            quota_limit: "RequestsPerMinute_PerProject_PerUser",
           },
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(60000);
   });
 
-  it('should return RetryableQuotaError for another short retry delay', () => {
+  it("should return RetryableQuotaError for another short retry delay", () => {
     const apiError: GoogleApiError = {
       code: 429,
       message:
-        'You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 56.185908122s.',
+        "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 56.185908122s.",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              quotaMetric:
-                'generativelanguage.googleapis.com/generate_content_free_tier_requests',
-              quotaId: 'GenerateRequestsPerMinutePerProjectPerModel-FreeTier',
+              quotaMetric: "generativelanguage.googleapis.com/generate_content_free_tier_requests",
+              quotaId: "GenerateRequestsPerMinutePerProjectPerModel-FreeTier",
               quotaDimensions: {
-                location: 'global',
-                model: 'gemini-2.5-pro',
+                location: "global",
+                model: "gemini-2.5-pro",
               },
-              quotaValue: '2',
+              quotaValue: "2",
             },
           ],
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.Help',
+          "@type": "type.googleapis.com/google.rpc.Help",
           links: [
             {
-              description: 'Learn more about Gemini API quotas',
-              url: 'https://ai.google.dev/gemini-api/docs/rate-limits',
+              description: "Learn more about Gemini API quotas",
+              url: "https://ai.google.dev/gemini-api/docs/rate-limits",
             },
           ],
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '56s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "56s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(56000);
   });
 
-  it('should return RetryableQuotaError for Cloud Code RATE_LIMIT_EXCEEDED with retry delay', () => {
+  it("should return RetryableQuotaError for Cloud Code RATE_LIMIT_EXCEEDED with retry delay", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message:
-        'You have exhausted your capacity on this model. Your quota will reset after 0s.',
+      message: "You have exhausted your capacity on this model. Your quota will reset after 0s.",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'RATE_LIMIT_EXCEEDED',
-          domain: 'cloudcode-pa.googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "RATE_LIMIT_EXCEEDED",
+          domain: "cloudcode-pa.googleapis.com",
           metadata: {
-            uiMessage: 'true',
-            model: 'gemini-2.5-pro',
-            quotaResetDelay: '539.477544ms',
-            quotaResetTimeStamp: '2025-10-20T19:14:08Z',
+            uiMessage: "true",
+            model: "gemini-2.5-pro",
+            quotaResetDelay: "539.477544ms",
+            quotaResetTimeStamp: "2025-10-20T19:14:08Z",
           },
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '0.539477544s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "0.539477544s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
-    expect((result as RetryableQuotaError).retryDelayMs).toBeCloseTo(
-      539.477544,
-    );
+    expect((result as RetryableQuotaError).retryDelayMs).toBeCloseTo(539.477544);
   });
 
-  it('should return TerminalQuotaError for Cloud Code QUOTA_EXHAUSTED', () => {
+  it("should return TerminalQuotaError for Cloud Code QUOTA_EXHAUSTED", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message:
-        'You have exhausted your capacity on this model. Your quota will reset after 0s.',
+      message: "You have exhausted your capacity on this model. Your quota will reset after 0s.",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'QUOTA_EXHAUSTED',
-          domain: 'cloudcode-pa.googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "QUOTA_EXHAUSTED",
+          domain: "cloudcode-pa.googleapis.com",
           metadata: {
-            uiMessage: 'true',
-            model: 'gemini-2.5-pro',
-            quotaResetDelay: '539.477544ms',
-            quotaResetTimeStamp: '2025-10-20T19:14:08Z',
+            uiMessage: "true",
+            model: "gemini-2.5-pro",
+            quotaResetDelay: "539.477544ms",
+            quotaResetTimeStamp: "2025-10-20T19:14:08Z",
           },
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '0.539477544s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "0.539477544s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should prioritize daily limit over retry info', () => {
+  it("should prioritize daily limit over retry info", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              subject: 'user',
-              description: 'daily limit',
-              quotaId: 'RequestsPerDay-limit',
+              subject: "user",
+              description: "daily limit",
+              quotaId: "RequestsPerDay-limit",
             },
           ],
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '10s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "10s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should return original error for 429 without specific details', () => {
+  it("should return original error for 429 without specific details", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Too many requests',
+      message: "Too many requests",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.DebugInfo',
-          detail: 'some debug info',
+          "@type": "type.googleapis.com/google.rpc.DebugInfo",
+          detail: "some debug info",
           stackEntries: [],
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const originalError = new Error();
     const result = classifyGoogleError(originalError);
     expect(result).toBe(originalError);
   });
 
-  it('should classify nested JSON string 404 error as ModelNotFoundError', () => {
+  it("should classify nested JSON string 404 error as ModelNotFoundError", () => {
     // Mimic the double-wrapped JSON structure seen in the user report
     const innerError = {
       error: {
         code: 404,
         message:
-          'models/NOT_FOUND is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.',
-        status: 'NOT_FOUND',
+          "models/NOT_FOUND is not found for API version v1beta, or is not supported for generateContent. Call ListModels to see the list of available models and their supported methods.",
+        status: "NOT_FOUND",
       },
     };
     const errorString = JSON.stringify(innerError);
@@ -367,11 +362,11 @@ describe('classifyGoogleError', () => {
     expect((classified as ModelNotFoundError).code).toBe(404);
   });
 
-  it('should fallback to string parsing for retry delays when details array is empty', () => {
+  it("should fallback to string parsing for retry delays when details array is empty", () => {
     const errorWithEmptyDetails = {
       error: {
         code: 429,
-        message: 'Resource exhausted. Please retry in 5s',
+        message: "Resource exhausted. Please retry in 5s",
         details: [],
       },
     };
@@ -384,7 +379,7 @@ describe('classifyGoogleError', () => {
       // The cause should be the parsed GoogleApiError
       expect(result.cause).toEqual({
         code: 429,
-        message: 'Resource exhausted. Please retry in 5s',
+        message: "Resource exhausted. Please retry in 5s",
         details: [],
       });
     }
diff --git a/packages/gemini-cli-core/src/utils/googleQuotaErrors.ts b/packages/gemini-cli-core/src/utils/googleQuotaErrors.ts
index 6f315f33e..2aeb254c9 100644
--- a/packages/gemini-cli-core/src/utils/googleQuotaErrors.ts
+++ b/packages/gemini-cli-core/src/utils/googleQuotaErrors.ts
@@ -4,14 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ErrorInfo,
-  GoogleApiError,
-  QuotaFailure,
-  RetryInfo,
-} from './googleErrors.js';
-import { parseGoogleApiError } from './googleErrors.js';
-import { getErrorStatus, ModelNotFoundError } from './httpErrors.js';
+import type { ErrorInfo, GoogleApiError, QuotaFailure, RetryInfo } from "./googleErrors.js";
+import { parseGoogleApiError } from "./googleErrors.js";
+import { getErrorStatus, ModelNotFoundError } from "./httpErrors.js";
 
 /**
  * A non-retryable error indicating a hard quota limit has been reached (e.g., daily limit).
@@ -25,7 +20,7 @@ export class TerminalQuotaError extends Error {
     retryDelayMs?: number,
   ) {
     super(message);
-    this.name = 'TerminalQuotaError';
+    this.name = "TerminalQuotaError";
     this.retryDelayMs = retryDelayMs ? retryDelayMs * 1000 : undefined;
   }
 }
@@ -42,7 +37,7 @@ export class RetryableQuotaError extends Error {
     retryDelaySeconds: number,
   ) {
     super(message);
-    this.name = 'RetryableQuotaError';
+    this.name = "RetryableQuotaError";
     this.retryDelayMs = retryDelaySeconds * 1000;
   }
 }
@@ -53,11 +48,11 @@ export class RetryableQuotaError extends Error {
  * @returns The duration in seconds, or null if parsing fails.
  */
 function parseDurationInSeconds(duration: string): number | null {
-  if (duration.endsWith('ms')) {
+  if (duration.endsWith("ms")) {
     const milliseconds = parseFloat(duration.slice(0, -2));
     return isNaN(milliseconds) ? null : milliseconds / 1000;
   }
-  if (duration.endsWith('s')) {
+  if (duration.endsWith("s")) {
     const seconds = parseFloat(duration.slice(0, -1));
     return isNaN(seconds) ? null : seconds;
   }
@@ -84,20 +79,14 @@ export function classifyGoogleError(error: unknown): unknown {
 
   if (status === 404) {
     const message =
-      googleApiError?.message ||
-      (error instanceof Error ? error.message : 'Model not found');
+      googleApiError?.message || (error instanceof Error ? error.message : "Model not found");
     return new ModelNotFoundError(message, status);
   }
 
-  if (
-    !googleApiError ||
-    googleApiError.code !== 429 ||
-    googleApiError.details.length === 0
-  ) {
+  if (!googleApiError || googleApiError.code !== 429 || googleApiError.details.length === 0) {
     // Fallback: try to parse the error message for a retry delay
     const errorMessage =
-      googleApiError?.message ||
-      (error instanceof Error ? error.message : String(error));
+      googleApiError?.message || (error instanceof Error ? error.message : String(error));
     const match = errorMessage.match(/Please retry in ([0-9.]+(?:ms|s))/);
     if (match?.[1]) {
       const retryDelaySeconds = parseDurationInSeconds(match[1]);
@@ -118,25 +107,22 @@ export function classifyGoogleError(error: unknown): unknown {
   }
 
   const quotaFailure = googleApiError.details.find(
-    (d): d is QuotaFailure =>
-      d['@type'] === 'type.googleapis.com/google.rpc.QuotaFailure',
+    (d): d is QuotaFailure => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure",
   );
 
   const errorInfo = googleApiError.details.find(
-    (d): d is ErrorInfo =>
-      d['@type'] === 'type.googleapis.com/google.rpc.ErrorInfo',
+    (d): d is ErrorInfo => d["@type"] === "type.googleapis.com/google.rpc.ErrorInfo",
   );
 
   const retryInfo = googleApiError.details.find(
-    (d): d is RetryInfo =>
-      d['@type'] === 'type.googleapis.com/google.rpc.RetryInfo',
+    (d): d is RetryInfo => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo",
   );
 
   // 1. Check for long-term limits in QuotaFailure or ErrorInfo
   if (quotaFailure) {
     for (const violation of quotaFailure.violations) {
-      const quotaId = violation.quotaId ?? '';
-      if (quotaId.includes('PerDay') || quotaId.includes('Daily')) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerDay") || quotaId.includes("Daily")) {
         return new TerminalQuotaError(
           `You have exhausted your daily quota on this model.`,
           googleApiError,
@@ -157,31 +143,27 @@ export function classifyGoogleError(error: unknown): unknown {
     // New Cloud Code API quota handling
     if (errorInfo.domain) {
       const validDomains = [
-        'cloudcode-pa.googleapis.com',
-        'staging-cloudcode-pa.googleapis.com',
-        'autopush-cloudcode-pa.googleapis.com',
+        "cloudcode-pa.googleapis.com",
+        "staging-cloudcode-pa.googleapis.com",
+        "autopush-cloudcode-pa.googleapis.com",
       ];
       if (validDomains.includes(errorInfo.domain)) {
-        if (errorInfo.reason === 'RATE_LIMIT_EXCEEDED') {
+        if (errorInfo.reason === "RATE_LIMIT_EXCEEDED") {
           return new RetryableQuotaError(
             `${googleApiError.message}`,
             googleApiError,
             delaySeconds ?? 10,
           );
         }
-        if (errorInfo.reason === 'QUOTA_EXHAUSTED') {
-          return new TerminalQuotaError(
-            `${googleApiError.message}`,
-            googleApiError,
-            delaySeconds,
-          );
+        if (errorInfo.reason === "QUOTA_EXHAUSTED") {
+          return new TerminalQuotaError(`${googleApiError.message}`, googleApiError, delaySeconds);
         }
       }
     }
 
     // Existing Cloud Code API quota handling
-    const quotaLimit = errorInfo.metadata?.['quota_limit'] ?? '';
-    if (quotaLimit.includes('PerDay') || quotaLimit.includes('Daily')) {
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerDay") || quotaLimit.includes("Daily")) {
       return new TerminalQuotaError(
         `You have exhausted your daily quota on this model.`,
         googleApiError,
@@ -211,8 +193,8 @@ export function classifyGoogleError(error: unknown): unknown {
   // 3. Check for short-term limits in QuotaFailure or ErrorInfo
   if (quotaFailure) {
     for (const violation of quotaFailure.violations) {
-      const quotaId = violation.quotaId ?? '';
-      if (quotaId.includes('PerMinute')) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerMinute")) {
         return new RetryableQuotaError(
           `${googleApiError.message}\nSuggested retry after 60s.`,
           googleApiError,
@@ -223,8 +205,8 @@ export function classifyGoogleError(error: unknown): unknown {
   }
 
   if (errorInfo) {
-    const quotaLimit = errorInfo.metadata?.['quota_limit'] ?? '';
-    if (quotaLimit.includes('PerMinute')) {
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerMinute")) {
       return new RetryableQuotaError(
         `${errorInfo.reason}\nSuggested retry after 60s.`,
         googleApiError,
diff --git a/packages/gemini-cli-core/src/utils/httpErrors.ts b/packages/gemini-cli-core/src/utils/httpErrors.ts
index a29732737..5886fda2e 100644
--- a/packages/gemini-cli-core/src/utils/httpErrors.ts
+++ b/packages/gemini-cli-core/src/utils/httpErrors.ts
@@ -14,20 +14,18 @@ export interface HttpError extends Error {
  * @returns The HTTP status code, or undefined if not found.
  */
 export function getErrorStatus(error: unknown): number | undefined {
-  if (typeof error === 'object' && error !== null) {
-    if ('status' in error && typeof error.status === 'number') {
+  if (typeof error === "object" && error !== null) {
+    if ("status" in error && typeof error.status === "number") {
       return error.status;
     }
     // Check for error.response.status (common in axios errors)
     if (
-      'response' in error &&
-      typeof (error as { response?: unknown }).response === 'object' &&
+      "response" in error &&
+      typeof (error as { response?: unknown }).response === "object" &&
       (error as { response?: unknown }).response !== null
     ) {
-      const response = (
-        error as { response: { status?: unknown; headers?: unknown } }
-      ).response;
-      if ('status' in response && typeof response.status === 'number') {
+      const response = (error as { response: { status?: unknown; headers?: unknown } }).response;
+      if ("status" in response && typeof response.status === "number") {
         return response.status;
       }
     }
@@ -39,7 +37,7 @@ export class ModelNotFoundError extends Error {
   code: number;
   constructor(message: string, code?: number) {
     super(message);
-    this.name = 'ModelNotFoundError';
+    this.name = "ModelNotFoundError";
     this.code = code ? code : 404;
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/ignorePatterns.test.ts b/packages/gemini-cli-core/src/utils/ignorePatterns.test.ts
index 58f504f98..808e5cc8e 100644
--- a/packages/gemini-cli-core/src/utils/ignorePatterns.test.ts
+++ b/packages/gemini-cli-core/src/utils/ignorePatterns.test.ts
@@ -4,94 +4,94 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
+import { describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
 import {
-  FileExclusions,
   BINARY_EXTENSIONS,
   extractExtensionsFromPatterns,
-} from './ignorePatterns.js';
-import type { Config } from '../config/config.js';
+  FileExclusions,
+} from "./ignorePatterns.js";
 
 // Mock the memoryTool module
-vi.mock('../tools/memoryTool.js', () => ({
-  getCurrentGeminiMdFilename: vi.fn(() => 'GEMINI.md'),
+vi.mock("../tools/memoryTool.js", () => ({
+  getCurrentGeminiMdFilename: vi.fn(() => "GEMINI.md"),
 }));
 
-describe('FileExclusions', () => {
-  describe('getCoreIgnorePatterns', () => {
-    it('should return basic ignore patterns', () => {
+describe("FileExclusions", () => {
+  describe("getCoreIgnorePatterns", () => {
+    it("should return basic ignore patterns", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getCoreIgnorePatterns();
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/bower_components/**');
-      expect(patterns).toContain('**/.svn/**');
-      expect(patterns).toContain('**/.hg/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/bower_components/**");
+      expect(patterns).toContain("**/.svn/**");
+      expect(patterns).toContain("**/.hg/**");
       expect(patterns).toHaveLength(5);
     });
   });
 
-  describe('getDefaultExcludePatterns', () => {
-    it('should return comprehensive patterns by default', () => {
+  describe("getDefaultExcludePatterns", () => {
+    it("should return comprehensive patterns by default", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns();
 
       // Should include core patterns
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
 
       // Should include directory excludes
-      expect(patterns).toContain('**/.vscode/**');
-      expect(patterns).toContain('**/dist/**');
-      expect(patterns).toContain('**/build/**');
+      expect(patterns).toContain("**/.vscode/**");
+      expect(patterns).toContain("**/dist/**");
+      expect(patterns).toContain("**/build/**");
 
       // Should include binary patterns
-      expect(patterns).toContain('**/*.exe');
-      expect(patterns).toContain('**/*.jar');
+      expect(patterns).toContain("**/*.exe");
+      expect(patterns).toContain("**/*.jar");
 
       // Should include system files
-      expect(patterns).toContain('**/.DS_Store');
-      expect(patterns).toContain('**/.env');
+      expect(patterns).toContain("**/.DS_Store");
+      expect(patterns).toContain("**/.env");
 
       // Should include dynamic patterns
-      expect(patterns).toContain('**/GEMINI.md');
+      expect(patterns).toContain("**/GEMINI.md");
     });
 
-    it('should respect includeDefaults option', () => {
+    it("should respect includeDefaults option", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns({
         includeDefaults: false,
         includeDynamicPatterns: false,
       });
 
-      expect(patterns).not.toContain('**/node_modules/**');
-      expect(patterns).not.toContain('**/.git/**');
-      expect(patterns).not.toContain('**/GEMINI.md');
+      expect(patterns).not.toContain("**/node_modules/**");
+      expect(patterns).not.toContain("**/.git/**");
+      expect(patterns).not.toContain("**/GEMINI.md");
       expect(patterns).toHaveLength(0);
     });
 
-    it('should include custom patterns', () => {
+    it("should include custom patterns", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns({
-        customPatterns: ['**/custom/**', '**/*.custom'],
+        customPatterns: ["**/custom/**", "**/*.custom"],
       });
 
-      expect(patterns).toContain('**/custom/**');
-      expect(patterns).toContain('**/*.custom');
+      expect(patterns).toContain("**/custom/**");
+      expect(patterns).toContain("**/*.custom");
     });
 
-    it('should include runtime patterns', () => {
+    it("should include runtime patterns", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns({
-        runtimePatterns: ['**/temp/**', '**/*.tmp'],
+        runtimePatterns: ["**/temp/**", "**/*.tmp"],
       });
 
-      expect(patterns).toContain('**/temp/**');
-      expect(patterns).toContain('**/*.tmp');
+      expect(patterns).toContain("**/temp/**");
+      expect(patterns).toContain("**/*.tmp");
     });
 
-    it('should respect includeDynamicPatterns option', () => {
+    it("should respect includeDynamicPatterns option", () => {
       const excluder = new FileExclusions();
       const patternsWithDynamic = excluder.getDefaultExcludePatterns({
         includeDynamicPatterns: true,
@@ -100,96 +100,96 @@ describe('FileExclusions', () => {
         includeDynamicPatterns: false,
       });
 
-      expect(patternsWithDynamic).toContain('**/GEMINI.md');
-      expect(patternsWithoutDynamic).not.toContain('**/GEMINI.md');
+      expect(patternsWithDynamic).toContain("**/GEMINI.md");
+      expect(patternsWithoutDynamic).not.toContain("**/GEMINI.md");
     });
   });
 
-  describe('getReadManyFilesExcludes', () => {
-    it('should provide legacy compatibility', () => {
+  describe("getReadManyFilesExcludes", () => {
+    it("should provide legacy compatibility", () => {
       const excluder = new FileExclusions();
-      const patterns = excluder.getReadManyFilesExcludes(['**/*.log']);
+      const patterns = excluder.getReadManyFilesExcludes(["**/*.log"]);
 
       // Should include all default patterns
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/GEMINI.md');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/GEMINI.md");
 
       // Should include additional excludes
-      expect(patterns).toContain('**/*.log');
+      expect(patterns).toContain("**/*.log");
     });
   });
 
-  describe('getGlobExcludes', () => {
-    it('should return core patterns for glob operations', () => {
+  describe("getGlobExcludes", () => {
+    it("should return core patterns for glob operations", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getGlobExcludes();
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/bower_components/**');
-      expect(patterns).toContain('**/.svn/**');
-      expect(patterns).toContain('**/.hg/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/bower_components/**");
+      expect(patterns).toContain("**/.svn/**");
+      expect(patterns).toContain("**/.hg/**");
 
       // Should not include comprehensive patterns by default
       expect(patterns).toHaveLength(5);
     });
 
-    it('should include additional excludes', () => {
+    it("should include additional excludes", () => {
       const excluder = new FileExclusions();
-      const patterns = excluder.getGlobExcludes(['**/temp/**']);
+      const patterns = excluder.getGlobExcludes(["**/temp/**"]);
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/temp/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/temp/**");
     });
   });
 
-  describe('with Config', () => {
-    it('should use config custom excludes when available', () => {
+  describe("with Config", () => {
+    it("should use config custom excludes when available", () => {
       const mockConfig = {
-        getCustomExcludes: vi.fn(() => ['**/config-exclude/**']),
+        getCustomExcludes: vi.fn(() => ["**/config-exclude/**"]),
       } as unknown as Config;
 
       const excluder = new FileExclusions(mockConfig);
       const patterns = excluder.getDefaultExcludePatterns();
 
-      expect(patterns).toContain('**/config-exclude/**');
+      expect(patterns).toContain("**/config-exclude/**");
       expect(mockConfig.getCustomExcludes).toHaveBeenCalled();
     });
 
-    it('should handle config without getCustomExcludes method', () => {
+    it("should handle config without getCustomExcludes method", () => {
       const mockConfig = {} as Config;
 
       const excluder = new FileExclusions(mockConfig);
       const patterns = excluder.getDefaultExcludePatterns();
 
       // Should not throw and should include default patterns
-      expect(patterns).toContain('**/node_modules/**');
+      expect(patterns).toContain("**/node_modules/**");
       expect(patterns.length).toBeGreaterThan(0);
     });
 
-    it('should include config custom excludes in glob patterns', () => {
+    it("should include config custom excludes in glob patterns", () => {
       const mockConfig = {
-        getCustomExcludes: vi.fn(() => ['**/config-glob/**']),
+        getCustomExcludes: vi.fn(() => ["**/config-glob/**"]),
       } as unknown as Config;
 
       const excluder = new FileExclusions(mockConfig);
       const patterns = excluder.getGlobExcludes();
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/config-glob/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/config-glob/**");
     });
   });
 
-  describe('buildExcludePatterns', () => {
-    it('should be an alias for getDefaultExcludePatterns', () => {
+  describe("buildExcludePatterns", () => {
+    it("should be an alias for getDefaultExcludePatterns", () => {
       const excluder = new FileExclusions();
       const options = {
         includeDefaults: true,
-        customPatterns: ['**/test/**'],
-        runtimePatterns: ['**/runtime/**'],
+        customPatterns: ["**/test/**"],
+        runtimePatterns: ["**/runtime/**"],
       };
 
       const defaultPatterns = excluder.getDefaultExcludePatterns(options);
@@ -200,109 +200,101 @@ describe('FileExclusions', () => {
   });
 });
 
-describe('BINARY_EXTENSIONS', () => {
+describe("BINARY_EXTENSIONS", () => {
   it.each([
-    ['common binary file extensions', ['.exe', '.dll', '.jar', '.zip']],
-    ['additional binary extensions', ['.dat', '.obj', '.wasm']],
-    ['media file extensions', ['.pdf', '.png', '.jpg']],
-  ])('should include %s', (_, extensions) => {
+    ["common binary file extensions", [".exe", ".dll", ".jar", ".zip"]],
+    ["additional binary extensions", [".dat", ".obj", ".wasm"]],
+    ["media file extensions", [".pdf", ".png", ".jpg"]],
+  ])("should include %s", (_, extensions) => {
     extensions.forEach((ext) => {
       expect(BINARY_EXTENSIONS).toContain(ext);
     });
   });
 
-  it('should be sorted', () => {
+  it("should be sorted", () => {
     const sortedExtensions = [...BINARY_EXTENSIONS].sort();
     expect(BINARY_EXTENSIONS).toEqual(sortedExtensions);
   });
 
-  it('should not contain invalid extensions from brace patterns', () => {
+  it("should not contain invalid extensions from brace patterns", () => {
     // If brace expansion was not handled correctly, we would see invalid extensions like '.{jpg,png}'
     const invalidExtensions = BINARY_EXTENSIONS.filter(
-      (ext) => ext.includes('{') || ext.includes('}'),
+      (ext) => ext.includes("{") || ext.includes("}"),
     );
     expect(invalidExtensions).toHaveLength(0);
   });
 });
 
-describe('extractExtensionsFromPatterns', () => {
+describe("extractExtensionsFromPatterns", () => {
   it.each([
+    ["simple extensions", ["**/*.exe", "**/*.jar", "**/*.zip"], [".exe", ".jar", ".zip"]],
+    ["compound extensions", ["**/*.tar.gz", "**/*.min.js", "**/*.d.ts"], [".gz", ".js", ".ts"]],
     [
-      'simple extensions',
-      ['**/*.exe', '**/*.jar', '**/*.zip'],
-      ['.exe', '.jar', '.zip'],
-    ],
-    [
-      'compound extensions',
-      ['**/*.tar.gz', '**/*.min.js', '**/*.d.ts'],
-      ['.gz', '.js', '.ts'],
-    ],
-    [
-      'dotfiles',
-      ['**/*.gitignore', '**/*.profile', '**/*.bashrc'],
-      ['.bashrc', '.gitignore', '.profile'],
+      "dotfiles",
+      ["**/*.gitignore", "**/*.profile", "**/*.bashrc"],
+      [".bashrc", ".gitignore", ".profile"],
     ],
-  ])('should extract %s', (_, patterns, expected) => {
+  ])("should extract %s", (_, patterns, expected) => {
     const result = extractExtensionsFromPatterns(patterns);
     expect(result).toEqual(expected);
   });
 
-  it('should handle brace expansion patterns', () => {
-    const patterns = ['**/*.{js,ts}', '**/*.{jpg,png}'];
+  it("should handle brace expansion patterns", () => {
+    const patterns = ["**/*.{js,ts}", "**/*.{jpg,png}"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toContain('.js');
-    expect(result).toContain('.ts');
-    expect(result).toContain('.jpg');
-    expect(result).toContain('.png');
-    expect(result).not.toContain('.{js,ts}');
-    expect(result).not.toContain('.{jpg,png}');
+    expect(result).toContain(".js");
+    expect(result).toContain(".ts");
+    expect(result).toContain(".jpg");
+    expect(result).toContain(".png");
+    expect(result).not.toContain(".{js,ts}");
+    expect(result).not.toContain(".{jpg,png}");
   });
 
-  it('should combine simple and brace expansion patterns', () => {
-    const patterns = ['**/*.exe', '**/*.{js,ts}', '**/*.pdf'];
+  it("should combine simple and brace expansion patterns", () => {
+    const patterns = ["**/*.exe", "**/*.{js,ts}", "**/*.pdf"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toContain('.exe');
-    expect(result).toContain('.js');
-    expect(result).toContain('.ts');
-    expect(result).toContain('.pdf');
+    expect(result).toContain(".exe");
+    expect(result).toContain(".js");
+    expect(result).toContain(".ts");
+    expect(result).toContain(".pdf");
   });
 
-  it('should handle empty brace expansion', () => {
-    const patterns = ['**/*.{}', '**/*.{,}'];
+  it("should handle empty brace expansion", () => {
+    const patterns = ["**/*.{}", "**/*.{,}"];
     const result = extractExtensionsFromPatterns(patterns);
 
     // Empty extensions should be filtered out
     expect(result).toHaveLength(0);
   });
 
-  it('should ignore invalid patterns', () => {
-    const patterns = ['no-asterisk.exe', '**/*no-dot', '**/*.{unclosed'];
+  it("should ignore invalid patterns", () => {
+    const patterns = ["no-asterisk.exe", "**/*no-dot", "**/*.{unclosed"];
     const result = extractExtensionsFromPatterns(patterns);
 
     expect(result).toHaveLength(0);
   });
 
-  it('should remove duplicates and sort results', () => {
-    const patterns = ['**/*.js', '**/*.{js,ts}', '**/*.ts'];
+  it("should remove duplicates and sort results", () => {
+    const patterns = ["**/*.js", "**/*.{js,ts}", "**/*.ts"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toEqual(['.js', '.ts']);
+    expect(result).toEqual([".js", ".ts"]);
   });
 
-  it('should handle complex brace patterns with multiple extensions', () => {
-    const patterns = ['**/*.{html,css,js,jsx,ts,tsx}'];
+  it("should handle complex brace patterns with multiple extensions", () => {
+    const patterns = ["**/*.{html,css,js,jsx,ts,tsx}"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toEqual(['.css', '.html', '.js', '.jsx', '.ts', '.tsx']);
+    expect(result).toEqual([".css", ".html", ".js", ".jsx", ".ts", ".tsx"]);
   });
 
-  it('should handle edge cases with path.extname', () => {
-    const patterns = ['**/*.hidden.', '**/*.config.json'];
+  it("should handle edge cases with path.extname", () => {
+    const patterns = ["**/*.hidden.", "**/*.config.json"];
     const result = extractExtensionsFromPatterns(patterns);
 
     // Should handle edge cases properly (trailing dots are filtered out)
-    expect(result).toEqual(['.json']);
+    expect(result).toEqual([".json"]);
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/ignorePatterns.ts b/packages/gemini-cli-core/src/utils/ignorePatterns.ts
index 9f9776db5..e34ebb6c7 100644
--- a/packages/gemini-cli-core/src/utils/ignorePatterns.ts
+++ b/packages/gemini-cli-core/src/utils/ignorePatterns.ts
@@ -4,49 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import type { Config } from '../config/config.js';
-import { getCurrentGeminiMdFilename } from '../tools/memoryTool.js';
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { getCurrentGeminiMdFilename } from "../tools/memoryTool.js";
 
 /**
  * Common ignore patterns used across multiple tools for basic exclusions.
  * These are the most commonly ignored directories in development projects.
  */
 export const COMMON_IGNORE_PATTERNS: string[] = [
-  '**/node_modules/**',
-  '**/.git/**',
-  '**/bower_components/**',
-  '**/.svn/**',
-  '**/.hg/**',
+  "**/node_modules/**",
+  "**/.git/**",
+  "**/bower_components/**",
+  "**/.svn/**",
+  "**/.hg/**",
 ];
 
 /**
  * Binary file extension patterns that are typically excluded from text processing.
  */
 export const BINARY_FILE_PATTERNS: string[] = [
-  '**/*.bin',
-  '**/*.exe',
-  '**/*.dll',
-  '**/*.so',
-  '**/*.dylib',
-  '**/*.class',
-  '**/*.jar',
-  '**/*.war',
-  '**/*.zip',
-  '**/*.tar',
-  '**/*.gz',
-  '**/*.bz2',
-  '**/*.rar',
-  '**/*.7z',
-  '**/*.doc',
-  '**/*.docx',
-  '**/*.xls',
-  '**/*.xlsx',
-  '**/*.ppt',
-  '**/*.pptx',
-  '**/*.odt',
-  '**/*.ods',
-  '**/*.odp',
+  "**/*.bin",
+  "**/*.exe",
+  "**/*.dll",
+  "**/*.so",
+  "**/*.dylib",
+  "**/*.class",
+  "**/*.jar",
+  "**/*.war",
+  "**/*.zip",
+  "**/*.tar",
+  "**/*.gz",
+  "**/*.bz2",
+  "**/*.rar",
+  "**/*.7z",
+  "**/*.doc",
+  "**/*.docx",
+  "**/*.xls",
+  "**/*.xlsx",
+  "**/*.ppt",
+  "**/*.pptx",
+  "**/*.odt",
+  "**/*.ods",
+  "**/*.odp",
 ];
 
 /**
@@ -54,37 +54,37 @@ export const BINARY_FILE_PATTERNS: string[] = [
  * These files can be processed as inlineData when explicitly requested.
  */
 export const MEDIA_FILE_PATTERNS: string[] = [
-  '**/*.pdf',
-  '**/*.png',
-  '**/*.jpg',
-  '**/*.jpeg',
-  '**/*.gif',
-  '**/*.webp',
-  '**/*.bmp',
-  '**/*.svg',
+  "**/*.pdf",
+  "**/*.png",
+  "**/*.jpg",
+  "**/*.jpeg",
+  "**/*.gif",
+  "**/*.webp",
+  "**/*.bmp",
+  "**/*.svg",
 ];
 
 /**
  * Common directory patterns that are typically ignored in development projects.
  */
 export const COMMON_DIRECTORY_EXCLUDES: string[] = [
-  '**/.vscode/**',
-  '**/.idea/**',
-  '**/dist/**',
-  '**/build/**',
-  '**/coverage/**',
-  '**/__pycache__/**',
+  "**/.vscode/**",
+  "**/.idea/**",
+  "**/dist/**",
+  "**/build/**",
+  "**/coverage/**",
+  "**/__pycache__/**",
 ];
 
 /**
  * Python-specific patterns.
  */
-export const PYTHON_EXCLUDES: string[] = ['**/*.pyc', '**/*.pyo'];
+export const PYTHON_EXCLUDES: string[] = ["**/*.pyc", "**/*.pyo"];
 
 /**
  * System and environment file patterns.
  */
-export const SYSTEM_FILE_EXCLUDES: string[] = ['**/.DS_Store', '**/.env'];
+export const SYSTEM_FILE_EXCLUDES: string[] = ["**/.DS_Store", "**/.env"];
 
 /**
  * Comprehensive file exclusion patterns combining all common ignore patterns.
@@ -222,23 +222,23 @@ export class FileExclusions {
 export function extractExtensionsFromPatterns(patterns: string[]): string[] {
   const extensions = new Set(
     patterns
-      .filter((pattern) => pattern.includes('*.'))
+      .filter((pattern) => pattern.includes("*."))
       .flatMap((pattern) => {
-        const extPart = pattern.substring(pattern.lastIndexOf('*.') + 1);
+        const extPart = pattern.substring(pattern.lastIndexOf("*.") + 1);
         // Handle brace expansion e.g. `**/*.{jpg,png}`
-        if (extPart.startsWith('.{') && extPart.endsWith('}')) {
+        if (extPart.startsWith(".{") && extPart.endsWith("}")) {
           const inner = extPart.slice(2, -1); // get 'jpg,png'
           return inner
-            .split(',')
+            .split(",")
             .map((ext) => `.${ext.trim()}`)
-            .filter((ext) => ext !== '.');
+            .filter((ext) => ext !== ".");
         }
         // Handle simple/compound/dotfile extensions
         if (
-          extPart.startsWith('.') &&
-          !extPart.includes('/') &&
-          !extPart.includes('{') &&
-          !extPart.includes('}')
+          extPart.startsWith(".") &&
+          !extPart.includes("/") &&
+          !extPart.includes("{") &&
+          !extPart.includes("}")
         ) {
           // Using path.extname on a dummy file handles various cases like
           // '.tar.gz' -> '.gz' and '.profile' -> '.profile' correctly.
@@ -246,9 +246,7 @@ export function extractExtensionsFromPatterns(patterns: string[]): string[] {
           // If extname returns empty (e.g. for '.'), use the original part.
           // Then filter out empty or '.' results and invalid double dot patterns.
           const result = extracted || extPart;
-          return result && result !== '.' && !result.substring(1).includes('.')
-            ? [result]
-            : [];
+          return result && result !== "." && !result.substring(1).includes(".") ? [result] : [];
         }
         return [];
       }),
@@ -267,10 +265,10 @@ export const BINARY_EXTENSIONS: string[] = [
     ...PYTHON_EXCLUDES,
   ]),
   // Additional binary extensions not in the main patterns
-  '.dat',
-  '.obj',
-  '.o',
-  '.a',
-  '.lib',
-  '.wasm',
+  ".dat",
+  ".obj",
+  ".o",
+  ".a",
+  ".lib",
+  ".wasm",
 ].sort();
diff --git a/packages/gemini-cli-core/src/utils/installationManager.test.ts b/packages/gemini-cli-core/src/utils/installationManager.test.ts
index 2b4c586cb..7eec09fb4 100644
--- a/packages/gemini-cli-core/src/utils/installationManager.test.ts
+++ b/packages/gemini-cli-core/src/utils/installationManager.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { InstallationManager } from './installationManager.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import path from 'node:path';
-import { randomUUID } from 'node:crypto';
-import { GEMINI_DIR } from './paths.js';
-import { debugLogger } from './debugLogger.js';
-
-vi.mock('node:fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:fs')>();
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
+import { InstallationManager } from "./installationManager.js";
+import { GEMINI_DIR } from "./paths.js";
+
+vi.mock("node:fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:fs")>();
   return {
     ...actual,
     readFileSync: vi.fn(actual.readFileSync),
@@ -23,32 +23,29 @@ vi.mock('node:fs', async (importOriginal) => {
   } as typeof actual;
 });
 
-vi.mock('os', async (importOriginal) => {
-  const os = await importOriginal<typeof import('os')>();
+vi.mock("os", async (importOriginal) => {
+  const os = await importOriginal<typeof import("os")>();
   return {
     ...os,
     homedir: vi.fn(),
   };
 });
 
-vi.mock('crypto', async (importOriginal) => {
-  const crypto = await importOriginal<typeof import('crypto')>();
+vi.mock("crypto", async (importOriginal) => {
+  const crypto = await importOriginal<typeof import("crypto")>();
   return {
     ...crypto,
     randomUUID: vi.fn(),
   };
 });
 
-describe('InstallationManager', () => {
+describe("InstallationManager", () => {
   let tempHomeDir: string;
   let installationManager: InstallationManager;
-  const installationIdFile = () =>
-    path.join(tempHomeDir, GEMINI_DIR, 'installation_id');
+  const installationIdFile = () => path.join(tempHomeDir, GEMINI_DIR, "installation_id");
 
   beforeEach(() => {
-    tempHomeDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-    );
+    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
     (os.homedir as Mock).mockReturnValue(tempHomeDir);
     installationManager = new InstallationManager();
   });
@@ -58,20 +55,20 @@ describe('InstallationManager', () => {
     vi.clearAllMocks();
   });
 
-  describe('getInstallationId', () => {
-    it('should create and write a new installation ID if one does not exist', () => {
-      const newId = 'new-uuid-123';
+  describe("getInstallationId", () => {
+    it("should create and write a new installation ID if one does not exist", () => {
+      const newId = "new-uuid-123";
       (randomUUID as Mock).mockReturnValue(newId);
 
       const installationId = installationManager.getInstallationId();
 
       expect(installationId).toBe(newId);
       expect(fs.existsSync(installationIdFile())).toBe(true);
-      expect(fs.readFileSync(installationIdFile(), 'utf-8')).toBe(newId);
+      expect(fs.readFileSync(installationIdFile(), "utf-8")).toBe(newId);
     });
 
-    it('should read an existing installation ID from a file', () => {
-      const existingId = 'existing-uuid-123';
+    it("should read an existing installation ID from a file", () => {
+      const existingId = "existing-uuid-123";
       fs.mkdirSync(path.dirname(installationIdFile()), { recursive: true });
       fs.writeFileSync(installationIdFile(), existingId);
 
@@ -80,25 +77,23 @@ describe('InstallationManager', () => {
       expect(installationId).toBe(existingId);
     });
 
-    it('should return the same ID on subsequent calls', () => {
+    it("should return the same ID on subsequent calls", () => {
       const firstId = installationManager.getInstallationId();
       const secondId = installationManager.getInstallationId();
       expect(secondId).toBe(firstId);
     });
 
-    it('should handle read errors and return a fallback ID', () => {
+    it("should handle read errors and return a fallback ID", () => {
       vi.mocked(fs.existsSync).mockReturnValueOnce(true);
       const readSpy = vi.mocked(fs.readFileSync);
       readSpy.mockImplementationOnce(() => {
-        throw new Error('Read error');
+        throw new Error("Read error");
       });
-      const consoleWarnSpy = vi
-        .spyOn(debugLogger, 'warn')
-        .mockImplementation(() => {});
+      const consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
       const id = installationManager.getInstallationId();
 
-      expect(id).toBe('123456789');
+      expect(id).toBe("123456789");
       expect(consoleWarnSpy).toHaveBeenCalled();
     });
   });
diff --git a/packages/gemini-cli-core/src/utils/installationManager.ts b/packages/gemini-cli-core/src/utils/installationManager.ts
index 3fa05c030..3e46854e2 100644
--- a/packages/gemini-cli-core/src/utils/installationManager.ts
+++ b/packages/gemini-cli-core/src/utils/installationManager.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import { debugLogger } from './debugLogger.js';
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { Storage } from "../config/storage.js";
+import { debugLogger } from "./debugLogger.js";
 
 export class InstallationManager {
   private getInstallationIdPath(): string {
@@ -18,9 +18,7 @@ export class InstallationManager {
   private readInstallationIdFromFile(): string | null {
     const installationIdFile = this.getInstallationIdPath();
     if (fs.existsSync(installationIdFile)) {
-      const installationid = fs
-        .readFileSync(installationIdFile, 'utf-8')
-        .trim();
+      const installationid = fs.readFileSync(installationIdFile, "utf-8").trim();
       return installationid || null;
     }
     return null;
@@ -30,7 +28,7 @@ export class InstallationManager {
     const installationIdFile = this.getInstallationIdPath();
     const dir = path.dirname(installationIdFile);
     fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(installationIdFile, installationId, 'utf-8');
+    fs.writeFileSync(installationIdFile, installationId, "utf-8");
   }
 
   /**
@@ -49,11 +47,8 @@ export class InstallationManager {
 
       return installationId;
     } catch (error) {
-      debugLogger.warn(
-        'Error accessing installation ID file, generating ephemeral ID:',
-        error,
-      );
-      return '123456789';
+      debugLogger.warn("Error accessing installation ID file, generating ephemeral ID:", error);
+      return "123456789";
     }
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/language-detection.ts b/packages/gemini-cli-core/src/utils/language-detection.ts
index ebbefe8b3..6335bd9b0 100644
--- a/packages/gemini-cli-core/src/utils/language-detection.ts
+++ b/packages/gemini-cli-core/src/utils/language-detection.ts
@@ -4,93 +4,93 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
+import * as path from "node:path";
 
 const extensionToLanguageMap: { [key: string]: string } = {
-  '.ts': 'TypeScript',
-  '.js': 'JavaScript',
-  '.mjs': 'JavaScript',
-  '.cjs': 'JavaScript',
-  '.jsx': 'JavaScript',
-  '.tsx': 'TypeScript',
-  '.py': 'Python',
-  '.java': 'Java',
-  '.go': 'Go',
-  '.rb': 'Ruby',
-  '.php': 'PHP',
-  '.phtml': 'PHP',
-  '.cs': 'C#',
-  '.cpp': 'C++',
-  '.cxx': 'C++',
-  '.cc': 'C++',
-  '.c': 'C',
-  '.h': 'C/C++',
-  '.hpp': 'C++',
-  '.swift': 'Swift',
-  '.kt': 'Kotlin',
-  '.rs': 'Rust',
-  '.m': 'Objective-C',
-  '.mm': 'Objective-C',
-  '.pl': 'Perl',
-  '.pm': 'Perl',
-  '.lua': 'Lua',
-  '.r': 'R',
-  '.scala': 'Scala',
-  '.sc': 'Scala',
-  '.sh': 'Shell',
-  '.ps1': 'PowerShell',
-  '.bat': 'Batch',
-  '.cmd': 'Batch',
-  '.sql': 'SQL',
-  '.html': 'HTML',
-  '.htm': 'HTML',
-  '.css': 'CSS',
-  '.less': 'Less',
-  '.sass': 'Sass',
-  '.scss': 'Sass',
-  '.json': 'JSON',
-  '.xml': 'XML',
-  '.yaml': 'YAML',
-  '.yml': 'YAML',
-  '.md': 'Markdown',
-  '.markdown': 'Markdown',
-  '.dockerfile': 'Dockerfile',
-  '.vim': 'Vim script',
-  '.vb': 'Visual Basic',
-  '.fs': 'F#',
-  '.clj': 'Clojure',
-  '.cljs': 'Clojure',
-  '.dart': 'Dart',
-  '.ex': 'Elixir',
-  '.erl': 'Erlang',
-  '.hs': 'Haskell',
-  '.lisp': 'Lisp',
-  '.rkt': 'Racket',
-  '.groovy': 'Groovy',
-  '.jl': 'Julia',
-  '.tex': 'LaTeX',
-  '.ino': 'Arduino',
-  '.asm': 'Assembly',
-  '.s': 'Assembly',
-  '.toml': 'TOML',
-  '.vue': 'Vue',
-  '.svelte': 'Svelte',
-  '.gohtml': 'Go Template',
-  '.hbs': 'Handlebars',
-  '.ejs': 'EJS',
-  '.erb': 'ERB',
-  '.jsp': 'JSP',
-  '.dockerignore': 'Docker',
-  '.gitignore': 'Git',
-  '.npmignore': 'npm',
-  '.editorconfig': 'EditorConfig',
-  '.prettierrc': 'Prettier',
-  '.eslintrc': 'ESLint',
-  '.babelrc': 'Babel',
-  '.tsconfig': 'TypeScript',
-  '.flow': 'Flow',
-  '.graphql': 'GraphQL',
-  '.proto': 'Protocol Buffers',
+  ".ts": "TypeScript",
+  ".js": "JavaScript",
+  ".mjs": "JavaScript",
+  ".cjs": "JavaScript",
+  ".jsx": "JavaScript",
+  ".tsx": "TypeScript",
+  ".py": "Python",
+  ".java": "Java",
+  ".go": "Go",
+  ".rb": "Ruby",
+  ".php": "PHP",
+  ".phtml": "PHP",
+  ".cs": "C#",
+  ".cpp": "C++",
+  ".cxx": "C++",
+  ".cc": "C++",
+  ".c": "C",
+  ".h": "C/C++",
+  ".hpp": "C++",
+  ".swift": "Swift",
+  ".kt": "Kotlin",
+  ".rs": "Rust",
+  ".m": "Objective-C",
+  ".mm": "Objective-C",
+  ".pl": "Perl",
+  ".pm": "Perl",
+  ".lua": "Lua",
+  ".r": "R",
+  ".scala": "Scala",
+  ".sc": "Scala",
+  ".sh": "Shell",
+  ".ps1": "PowerShell",
+  ".bat": "Batch",
+  ".cmd": "Batch",
+  ".sql": "SQL",
+  ".html": "HTML",
+  ".htm": "HTML",
+  ".css": "CSS",
+  ".less": "Less",
+  ".sass": "Sass",
+  ".scss": "Sass",
+  ".json": "JSON",
+  ".xml": "XML",
+  ".yaml": "YAML",
+  ".yml": "YAML",
+  ".md": "Markdown",
+  ".markdown": "Markdown",
+  ".dockerfile": "Dockerfile",
+  ".vim": "Vim script",
+  ".vb": "Visual Basic",
+  ".fs": "F#",
+  ".clj": "Clojure",
+  ".cljs": "Clojure",
+  ".dart": "Dart",
+  ".ex": "Elixir",
+  ".erl": "Erlang",
+  ".hs": "Haskell",
+  ".lisp": "Lisp",
+  ".rkt": "Racket",
+  ".groovy": "Groovy",
+  ".jl": "Julia",
+  ".tex": "LaTeX",
+  ".ino": "Arduino",
+  ".asm": "Assembly",
+  ".s": "Assembly",
+  ".toml": "TOML",
+  ".vue": "Vue",
+  ".svelte": "Svelte",
+  ".gohtml": "Go Template",
+  ".hbs": "Handlebars",
+  ".ejs": "EJS",
+  ".erb": "ERB",
+  ".jsp": "JSP",
+  ".dockerignore": "Docker",
+  ".gitignore": "Git",
+  ".npmignore": "npm",
+  ".editorconfig": "EditorConfig",
+  ".prettierrc": "Prettier",
+  ".eslintrc": "ESLint",
+  ".babelrc": "Babel",
+  ".tsconfig": "TypeScript",
+  ".flow": "Flow",
+  ".graphql": "GraphQL",
+  ".proto": "Protocol Buffers",
 };
 
 export function getLanguageFromFilePath(filePath: string): string | undefined {
diff --git a/packages/gemini-cli-core/src/utils/llm-edit-fixer.test.ts b/packages/gemini-cli-core/src/utils/llm-edit-fixer.test.ts
index d4fc95e40..3ffc0920d 100644
--- a/packages/gemini-cli-core/src/utils/llm-edit-fixer.test.ts
+++ b/packages/gemini-cli-core/src/utils/llm-edit-fixer.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { debugLogger } from "./debugLogger.js";
 import {
   FixLLMEditWithInstruction,
   resetLlmEditFixerCaches_TEST_ONLY,
   type SearchReplaceEdit,
-} from './llm-edit-fixer.js';
-import { promptIdContext } from './promptIdContext.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import { debugLogger } from './debugLogger.js';
+} from "./llm-edit-fixer.js";
+import { promptIdContext } from "./promptIdContext.js";
 
 // Mock the BaseLlmClient
 const mockGenerateJson = vi.fn();
@@ -21,19 +21,19 @@ const mockBaseLlmClient = {
   config: {
     generationConfigService: {
       getResolvedConfig: vi.fn().mockReturnValue({
-        model: 'edit-corrector',
+        model: "edit-corrector",
         generateContentConfig: {},
       }),
     },
   },
 } as unknown as BaseLlmClient;
 
-describe('FixLLMEditWithInstruction', () => {
-  const instruction = 'Replace the title';
-  const old_string = '<h1>Old Title</h1>';
-  const new_string = '<h1>New Title</h1>';
-  const error = 'String not found';
-  const current_content = '<body><h1>Old Title</h1></body>';
+describe("FixLLMEditWithInstruction", () => {
+  const instruction = "Replace the title";
+  const old_string = "<h1>Old Title</h1>";
+  const new_string = "<h1>New Title</h1>";
+  const error = "String not found";
+  const current_content = "<body><h1>Old Title</h1></body>";
   const abortController = new AbortController();
   const abortSignal = abortController.signal;
 
@@ -41,13 +41,9 @@ describe('FixLLMEditWithInstruction', () => {
     vi.useFakeTimers();
     vi.clearAllMocks();
     // Mock AbortSignal.timeout to use setTimeout so it respects fake timers
-    vi.spyOn(AbortSignal, 'timeout').mockImplementation((ms) => {
+    vi.spyOn(AbortSignal, "timeout").mockImplementation((ms) => {
       const controller = new AbortController();
-      setTimeout(
-        () =>
-          controller.abort(new DOMException('TimeoutError', 'TimeoutError')),
-        ms,
-      );
+      setTimeout(() => controller.abort(new DOMException("TimeoutError", "TimeoutError")), ms);
       return controller.signal;
     });
     resetLlmEditFixerCaches_TEST_ONLY(); // Ensure cache is cleared before each test
@@ -59,14 +55,14 @@ describe('FixLLMEditWithInstruction', () => {
   });
 
   const mockApiResponse: SearchReplaceEdit = {
-    search: '<h1>Old Title</h1>',
-    replace: '<h1>New Title</h1>',
+    search: "<h1>Old Title</h1>",
+    replace: "<h1>New Title</h1>",
     noChangesRequired: false,
-    explanation: 'The original search was correct.',
+    explanation: "The original search was correct.",
   };
 
-  it('should use the promptId from the AsyncLocalStorage context when available', async () => {
-    const testPromptId = 'test-prompt-id-12345';
+  it("should use the promptId from the AsyncLocalStorage context when available", async () => {
+    const testPromptId = "test-prompt-id-12345";
     mockGenerateJson.mockResolvedValue(mockApiResponse);
 
     await promptIdContext.run(testPromptId, async () => {
@@ -90,11 +86,9 @@ describe('FixLLMEditWithInstruction', () => {
     );
   });
 
-  it('should generate and use a fallback promptId when context is not available', async () => {
+  it("should generate and use a fallback promptId when context is not available", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const consoleWarnSpy = vi
-      .spyOn(debugLogger, 'warn')
-      .mockImplementation(() => {});
+    const consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
     // Run the function outside of any context
     await FixLLMEditWithInstruction(
@@ -110,7 +104,7 @@ describe('FixLLMEditWithInstruction', () => {
     // Verify the warning was logged
     expect(consoleWarnSpy).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Could not find promptId in context. This is unexpected. Using a fallback ID: llm-fixer-fallback-',
+        "Could not find promptId in context. This is unexpected. Using a fallback ID: llm-fixer-fallback-",
       ),
     );
 
@@ -118,7 +112,7 @@ describe('FixLLMEditWithInstruction', () => {
     expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     expect(mockGenerateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        promptId: expect.stringContaining('llm-fixer-fallback-'),
+        promptId: expect.stringContaining("llm-fixer-fallback-"),
       }),
     );
 
@@ -126,9 +120,9 @@ describe('FixLLMEditWithInstruction', () => {
     consoleWarnSpy.mockRestore();
   });
 
-  it('should construct the user prompt correctly', async () => {
+  it("should construct the user prompt correctly", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const promptId = 'test-prompt-id-prompt-construction';
+    const promptId = "test-prompt-id-prompt-construction";
 
     await promptIdContext.run(promptId, async () => {
       await FixLLMEditWithInstruction(
@@ -145,20 +139,16 @@ describe('FixLLMEditWithInstruction', () => {
     const generateJsonCall = mockGenerateJson.mock.calls[0][0];
     const userPromptContent = generateJsonCall.contents[0].parts[0].text;
 
-    expect(userPromptContent).toContain(
-      `<instruction>\n${instruction}\n</instruction>`,
-    );
+    expect(userPromptContent).toContain(`<instruction>\n${instruction}\n</instruction>`);
     expect(userPromptContent).toContain(`<search>\n${old_string}\n</search>`);
     expect(userPromptContent).toContain(`<replace>\n${new_string}\n</replace>`);
     expect(userPromptContent).toContain(`<error>\n${error}\n</error>`);
-    expect(userPromptContent).toContain(
-      `<file_content>\n${current_content}\n</file_content>`,
-    );
+    expect(userPromptContent).toContain(`<file_content>\n${current_content}\n</file_content>`);
   });
 
-  it('should return a cached result on subsequent identical calls', async () => {
+  it("should return a cached result on subsequent identical calls", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const testPromptId = 'test-prompt-id-caching';
+    const testPromptId = "test-prompt-id-caching";
 
     await promptIdContext.run(testPromptId, async () => {
       // First call - should call the API
@@ -190,9 +180,9 @@ describe('FixLLMEditWithInstruction', () => {
     });
   });
 
-  it('should not use cache for calls with different parameters', async () => {
+  it("should not use cache for calls with different parameters", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const testPromptId = 'test-prompt-id-cache-miss';
+    const testPromptId = "test-prompt-id-cache-miss";
 
     await promptIdContext.run(testPromptId, async () => {
       // First call
@@ -208,7 +198,7 @@ describe('FixLLMEditWithInstruction', () => {
 
       // Second call with a different instruction
       await FixLLMEditWithInstruction(
-        'A different instruction',
+        "A different instruction",
         old_string,
         new_string,
         error,
@@ -222,40 +212,38 @@ describe('FixLLMEditWithInstruction', () => {
     });
   });
 
-  describe('cache collision prevention', () => {
-    it('should prevent cache collisions when parameters contain separator sequences', async () => {
+  describe("cache collision prevention", () => {
+    it("should prevent cache collisions when parameters contain separator sequences", async () => {
       // This test would have failed with the old string concatenation approach
       // but passes with JSON.stringify implementation
 
       const firstResponse: SearchReplaceEdit = {
-        search: 'original text',
-        replace: 'first replacement',
+        search: "original text",
+        replace: "first replacement",
         noChangesRequired: false,
-        explanation: 'First edit correction',
+        explanation: "First edit correction",
       };
 
       const secondResponse: SearchReplaceEdit = {
-        search: 'different text',
-        replace: 'second replacement',
+        search: "different text",
+        replace: "second replacement",
         noChangesRequired: false,
-        explanation: 'Second edit correction',
+        explanation: "Second edit correction",
       };
 
-      mockGenerateJson
-        .mockResolvedValueOnce(firstResponse)
-        .mockResolvedValueOnce(secondResponse);
+      mockGenerateJson.mockResolvedValueOnce(firstResponse).mockResolvedValueOnce(secondResponse);
 
-      const testPromptId = 'cache-collision-test';
+      const testPromptId = "cache-collision-test";
 
       await promptIdContext.run(testPromptId, async () => {
         // Scenario 1: Parameters that would create collision with string concatenation
         // Cache key with old method would be: "Fix YAML---content---update--some---data--error"
         const call1 = await FixLLMEditWithInstruction(
-          'Fix YAML', // instruction
-          'content', // old_string
-          'update--some', // new_string (contains --)
-          'data', // current_content
-          'error', // error
+          "Fix YAML", // instruction
+          "content", // old_string
+          "update--some", // new_string (contains --)
+          "data", // current_content
+          "error", // error
           mockBaseLlmClient,
           abortSignal,
         );
@@ -263,11 +251,11 @@ describe('FixLLMEditWithInstruction', () => {
         // Scenario 2: Different parameters that would create same cache key with concatenation
         // Cache key with old method would be: "Fix YAML---content---update--some---data--error"
         const call2 = await FixLLMEditWithInstruction(
-          'Fix YAML---content---update', // instruction (contains ---)
-          'some---data', // old_string (contains ---)
-          'error', // new_string
-          '', // current_content
-          '', // error
+          "Fix YAML---content---update", // instruction (contains ---)
+          "some---data", // old_string (contains ---)
+          "error", // new_string
+          "", // current_content
+          "", // error
           mockBaseLlmClient,
           abortSignal,
         );
@@ -284,48 +272,46 @@ describe('FixLLMEditWithInstruction', () => {
       });
     });
 
-    it('should handle YAML frontmatter without cache collisions', async () => {
+    it("should handle YAML frontmatter without cache collisions", async () => {
       // Real-world test case with YAML frontmatter containing ---
 
       const yamlResponse: SearchReplaceEdit = {
-        search: '---\ntitle: Old\n---',
-        replace: '---\ntitle: New\n---',
+        search: "---\ntitle: Old\n---",
+        replace: "---\ntitle: New\n---",
         noChangesRequired: false,
-        explanation: 'Updated YAML frontmatter',
+        explanation: "Updated YAML frontmatter",
       };
 
       const contentResponse: SearchReplaceEdit = {
-        search: 'old content',
-        replace: 'new content',
+        search: "old content",
+        replace: "new content",
         noChangesRequired: false,
-        explanation: 'Updated content',
+        explanation: "Updated content",
       };
 
-      mockGenerateJson
-        .mockResolvedValueOnce(yamlResponse)
-        .mockResolvedValueOnce(contentResponse);
+      mockGenerateJson.mockResolvedValueOnce(yamlResponse).mockResolvedValueOnce(contentResponse);
 
-      const testPromptId = 'yaml-frontmatter-test';
+      const testPromptId = "yaml-frontmatter-test";
 
       await promptIdContext.run(testPromptId, async () => {
         // Call 1: Edit YAML frontmatter
         const yamlEdit = await FixLLMEditWithInstruction(
-          'Update YAML frontmatter',
-          '---\ntitle: Old\n---', // Contains ---
-          '---\ntitle: New\n---', // Contains ---
-          'Some markdown content',
-          'YAML parse error',
+          "Update YAML frontmatter",
+          "---\ntitle: Old\n---", // Contains ---
+          "---\ntitle: New\n---", // Contains ---
+          "Some markdown content",
+          "YAML parse error",
           mockBaseLlmClient,
           abortSignal,
         );
 
         // Call 2: Edit regular content
         const contentEdit = await FixLLMEditWithInstruction(
-          'Update content',
-          'old content',
-          'new content',
-          'Different file content',
-          'Content not found',
+          "Update content",
+          "old content",
+          "new content",
+          "Different file content",
+          "Content not found",
           mockBaseLlmClient,
           abortSignal,
         );
@@ -341,22 +327,22 @@ describe('FixLLMEditWithInstruction', () => {
     });
   });
 
-  it('should return null if the LLM call times out', async () => {
+  it("should return null if the LLM call times out", async () => {
     mockGenerateJson.mockImplementation(
       async ({ abortSignal }) =>
         // Simulate a long-running operation that never resolves on its own.
         // It will only reject when the abort signal is triggered by the timeout.
         new Promise((_resolve, reject) => {
           if (abortSignal?.aborted) {
-            return reject(new DOMException('Aborted', 'AbortError'));
+            return reject(new DOMException("Aborted", "AbortError"));
           }
-          abortSignal?.addEventListener('abort', () => {
-            reject(new DOMException('Aborted', 'AbortError'));
+          abortSignal?.addEventListener("abort", () => {
+            reject(new DOMException("Aborted", "AbortError"));
           });
         }),
     );
 
-    const testPromptId = 'test-prompt-id-timeout';
+    const testPromptId = "test-prompt-id-timeout";
 
     const fixPromise = promptIdContext.run(testPromptId, () =>
       FixLLMEditWithInstruction(
diff --git a/packages/gemini-cli-core/src/utils/llm-edit-fixer.ts b/packages/gemini-cli-core/src/utils/llm-edit-fixer.ts
index 363c973cd..3454885d9 100644
--- a/packages/gemini-cli-core/src/utils/llm-edit-fixer.ts
+++ b/packages/gemini-cli-core/src/utils/llm-edit-fixer.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createHash } from 'node:crypto';
-import { type Content, Type } from '@google/genai';
-import { type BaseLlmClient } from '../core/baseLlmClient.js';
-import { LruCache } from './LruCache.js';
-import { promptIdContext } from './promptIdContext.js';
-import { debugLogger } from './debugLogger.js';
+import { createHash } from "node:crypto";
+import { type Content, Type } from "@google/genai";
+import { type BaseLlmClient } from "../core/baseLlmClient.js";
+import { debugLogger } from "./debugLogger.js";
+import { LruCache } from "./LruCache.js";
+import { promptIdContext } from "./promptIdContext.js";
 
 const MAX_CACHE_SIZE = 50;
 const GENERATE_JSON_TIMEOUT_MS = 40000; // 40 seconds
@@ -81,17 +81,14 @@ const SearchReplaceEditSchema = {
     replace: { type: Type.STRING },
     noChangesRequired: { type: Type.BOOLEAN },
   },
-  required: ['search', 'replace', 'explanation'],
+  required: ["search", "replace", "explanation"],
 };
 
-const editCorrectionWithInstructionCache = new LruCache<
-  string,
-  SearchReplaceEdit
->(MAX_CACHE_SIZE);
+const editCorrectionWithInstructionCache = new LruCache<string, SearchReplaceEdit>(MAX_CACHE_SIZE);
 
 async function generateJsonWithTimeout<T>(
   client: BaseLlmClient,
-  params: Parameters<BaseLlmClient['generateJson']>[0],
+  params: Parameters<BaseLlmClient["generateJson"]>[0],
   timeoutMs: number,
 ): Promise<T | null> {
   try {
@@ -144,30 +141,22 @@ export async function FixLLMEditWithInstruction(
     );
   }
 
-  const cacheKey = createHash('sha256')
-    .update(
-      JSON.stringify([
-        current_content,
-        old_string,
-        new_string,
-        instruction,
-        error,
-      ]),
-    )
-    .digest('hex');
+  const cacheKey = createHash("sha256")
+    .update(JSON.stringify([current_content, old_string, new_string, instruction, error]))
+    .digest("hex");
   const cachedResult = editCorrectionWithInstructionCache.get(cacheKey);
   if (cachedResult) {
     return cachedResult;
   }
-  const userPrompt = EDIT_USER_PROMPT.replace('{instruction}', instruction)
-    .replace('{old_string}', old_string)
-    .replace('{new_string}', new_string)
-    .replace('{error}', error)
-    .replace('{current_content}', current_content);
+  const userPrompt = EDIT_USER_PROMPT.replace("{instruction}", instruction)
+    .replace("{old_string}", old_string)
+    .replace("{new_string}", new_string)
+    .replace("{error}", error)
+    .replace("{current_content}", current_content);
 
   const contents: Content[] = [
     {
-      role: 'user',
+      role: "user",
       parts: [{ text: userPrompt }],
     },
   ];
@@ -175,7 +164,7 @@ export async function FixLLMEditWithInstruction(
   const result = await generateJsonWithTimeout<SearchReplaceEdit>(
     baseLlmClient,
     {
-      modelConfigKey: { model: 'llm-edit-fixer' },
+      modelConfigKey: { model: "llm-edit-fixer" },
       contents,
       schema: SearchReplaceEditSchema,
       abortSignal,
diff --git a/packages/gemini-cli-core/src/utils/memoryDiscovery.test.ts b/packages/gemini-cli-core/src/utils/memoryDiscovery.test.ts
index 8196300ad..87ed3e0f0 100644
--- a/packages/gemini-cli-core/src/utils/memoryDiscovery.test.ts
+++ b/packages/gemini-cli-core/src/utils/memoryDiscovery.test.ts
@@ -4,30 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fsPromises from 'node:fs/promises';
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Config, type GeminiCLIExtension } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { DEFAULT_CONTEXT_FILENAME, setGeminiMdFilename } from "../tools/memoryTool.js";
+import { debugLogger } from "./debugLogger.js";
+import { CoreEvent, coreEvents } from "./events.js";
+import { SimpleExtensionLoader } from "./extensionLoader.js";
 import {
-  loadServerHierarchicalMemory,
-  loadGlobalMemory,
   loadEnvironmentMemory,
+  loadGlobalMemory,
   loadJitSubdirectoryMemory,
+  loadServerHierarchicalMemory,
   refreshServerHierarchicalMemory,
-} from './memoryDiscovery.js';
-import {
-  setGeminiMdFilename,
-  DEFAULT_CONTEXT_FILENAME,
-} from '../tools/memoryTool.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { GEMINI_DIR } from './paths.js';
-import { Config, type GeminiCLIExtension } from '../config/config.js';
-import { Storage } from '../config/storage.js';
-import { SimpleExtensionLoader } from './extensionLoader.js';
-import { CoreEvent, coreEvents } from './events.js';
-import { debugLogger } from './debugLogger.js';
-
-vi.mock('os', async (importOriginal) => {
+} from "./memoryDiscovery.js";
+import { GEMINI_DIR } from "./paths.js";
+
+vi.mock("os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof os>();
   return {
     ...actualOs,
@@ -35,7 +32,7 @@ vi.mock('os', async (importOriginal) => {
   };
 });
 
-describe('memoryDiscovery', () => {
+describe("memoryDiscovery", () => {
   const DEFAULT_FOLDER_TRUST = true;
   let testRootDir: string;
   let cwd: string;
@@ -54,18 +51,16 @@ describe('memoryDiscovery', () => {
   }
 
   beforeEach(async () => {
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'folder-structure-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "folder-structure-test-"));
 
     vi.resetAllMocks();
     // Set environment variables to indicate test environment
-    vi.stubEnv('NODE_ENV', 'test');
-    vi.stubEnv('VITEST', 'true');
+    vi.stubEnv("NODE_ENV", "test");
+    vi.stubEnv("VITEST", "true");
 
-    projectRoot = await createEmptyDir(path.join(testRootDir, 'project'));
-    cwd = await createEmptyDir(path.join(projectRoot, 'src'));
-    homedir = await createEmptyDir(path.join(testRootDir, 'userhome'));
+    projectRoot = await createEmptyDir(path.join(testRootDir, "project"));
+    cwd = await createEmptyDir(path.join(projectRoot, "src"));
+    homedir = await createEmptyDir(path.join(testRootDir, "userhome"));
     vi.mocked(os.homedir).mockReturnValue(homedir);
   });
 
@@ -83,16 +78,10 @@ describe('memoryDiscovery', () => {
     });
   });
 
-  describe('when untrusted', () => {
-    it('does not load context files from untrusted workspaces', async () => {
-      await createTestFile(
-        path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-        'Project root memory',
-      );
-      await createTestFile(
-        path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-        'Src directory memory',
-      );
+  describe("when untrusted", () => {
+    it("does not load context files from untrusted workspaces", async () => {
+      await createTestFile(path.join(projectRoot, DEFAULT_CONTEXT_FILENAME), "Project root memory");
+      await createTestFile(path.join(cwd, DEFAULT_CONTEXT_FILENAME), "Src directory memory");
       const result = await loadServerHierarchicalMemory(
         cwd,
         [],
@@ -103,33 +92,32 @@ describe('memoryDiscovery', () => {
       );
 
       expect(result).toEqual({
-        memoryContent: '',
+        memoryContent: "",
         fileCount: 0,
         filePaths: [],
       });
     });
 
-    it('loads context from outside the untrusted workspace', async () => {
+    it("loads context from outside the untrusted workspace", async () => {
       await createTestFile(
         path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-        'Project root memory', // Untrusted
+        "Project root memory", // Untrusted
       );
       await createTestFile(
         path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-        'Src directory memory', // Untrusted
+        "Src directory memory", // Untrusted
       );
 
       const filepath = path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME);
-      await createTestFile(filepath, 'default context content'); // In user home dir (outside untrusted space).
-      const { fileCount, memoryContent, filePaths } =
-        await loadServerHierarchicalMemory(
-          cwd,
-          [],
-          false,
-          new FileDiscoveryService(projectRoot),
-          new SimpleExtensionLoader([]),
-          false, // untrusted
-        );
+      await createTestFile(filepath, "default context content"); // In user home dir (outside untrusted space).
+      const { fileCount, memoryContent, filePaths } = await loadServerHierarchicalMemory(
+        cwd,
+        [],
+        false,
+        new FileDiscoveryService(projectRoot),
+        new SimpleExtensionLoader([]),
+        false, // untrusted
+      );
 
       expect(fileCount).toEqual(1);
       expect(memoryContent).toContain(path.relative(cwd, filepath).toString());
@@ -137,7 +125,7 @@ describe('memoryDiscovery', () => {
     });
   });
 
-  it('should return empty memory and count if no context files are found', async () => {
+  it("should return empty memory and count if no context files are found", async () => {
     const result = await loadServerHierarchicalMemory(
       cwd,
       [],
@@ -148,16 +136,16 @@ describe('memoryDiscovery', () => {
     );
 
     expect(result).toEqual({
-      memoryContent: '',
+      memoryContent: "",
       fileCount: 0,
       filePaths: [],
     });
   });
 
-  it('should load only the global context file if present and others are not (default filename)', async () => {
+  it("should load only the global context file if present and others are not (default filename)", async () => {
     const defaultContextFile = await createTestFile(
       path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME),
-      'default context content',
+      "default context content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -178,13 +166,13 @@ default context content
     });
   });
 
-  it('should load only the global custom context file if present and filename is changed', async () => {
-    const customFilename = 'CUSTOM_AGENTS.md';
+  it("should load only the global custom context file if present and filename is changed", async () => {
+    const customFilename = "CUSTOM_AGENTS.md";
     setGeminiMdFilename(customFilename);
 
     const customContextFile = await createTestFile(
       path.join(homedir, GEMINI_DIR, customFilename),
-      'custom context content',
+      "custom context content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -205,17 +193,17 @@ custom context content
     });
   });
 
-  it('should load context files by upward traversal with custom filename', async () => {
-    const customFilename = 'PROJECT_CONTEXT.md';
+  it("should load context files by upward traversal with custom filename", async () => {
+    const customFilename = "PROJECT_CONTEXT.md";
     setGeminiMdFilename(customFilename);
 
     const projectContextFile = await createTestFile(
       path.join(projectRoot, customFilename),
-      'project context content',
+      "project context content",
     );
     const cwdContextFile = await createTestFile(
       path.join(cwd, customFilename),
-      'cwd context content',
+      "cwd context content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -240,18 +228,15 @@ cwd context content
     });
   });
 
-  it('should load context files by downward traversal with custom filename', async () => {
-    const customFilename = 'LOCAL_CONTEXT.md';
+  it("should load context files by downward traversal with custom filename", async () => {
+    const customFilename = "LOCAL_CONTEXT.md";
     setGeminiMdFilename(customFilename);
 
     const subdirCustomFile = await createTestFile(
-      path.join(cwd, 'subdir', customFilename),
-      'Subdir custom memory',
-    );
-    const cwdCustomFile = await createTestFile(
-      path.join(cwd, customFilename),
-      'CWD custom memory',
+      path.join(cwd, "subdir", customFilename),
+      "Subdir custom memory",
     );
+    const cwdCustomFile = await createTestFile(path.join(cwd, customFilename), "CWD custom memory");
 
     const result = await loadServerHierarchicalMemory(
       cwd,
@@ -267,22 +252,22 @@ cwd context content
 CWD custom memory
 --- End of Context from: ${customFilename} ---
 
---- Context from: ${path.join('subdir', customFilename)} ---
+--- Context from: ${path.join("subdir", customFilename)} ---
 Subdir custom memory
---- End of Context from: ${path.join('subdir', customFilename)} ---`,
+--- End of Context from: ${path.join("subdir", customFilename)} ---`,
       fileCount: 2,
       filePaths: [cwdCustomFile, subdirCustomFile],
     });
   });
 
-  it('should load ORIGINAL_GEMINI_MD_FILENAME files by upward traversal from CWD to project root', async () => {
+  it("should load ORIGINAL_GEMINI_MD_FILENAME files by upward traversal from CWD to project root", async () => {
     const projectRootGeminiFile = await createTestFile(
       path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-      'Project root memory',
+      "Project root memory",
     );
     const srcGeminiFile = await createTestFile(
       path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-      'Src directory memory',
+      "Src directory memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -307,14 +292,14 @@ Src directory memory
     });
   });
 
-  it('should load ORIGINAL_GEMINI_MD_FILENAME files by downward traversal from CWD', async () => {
+  it("should load ORIGINAL_GEMINI_MD_FILENAME files by downward traversal from CWD", async () => {
     const subDirGeminiFile = await createTestFile(
-      path.join(cwd, 'subdir', DEFAULT_CONTEXT_FILENAME),
-      'Subdir memory',
+      path.join(cwd, "subdir", DEFAULT_CONTEXT_FILENAME),
+      "Subdir memory",
     );
     const cwdGeminiFile = await createTestFile(
       path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-      'CWD memory',
+      "CWD memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -331,34 +316,34 @@ Src directory memory
 CWD memory
 --- End of Context from: ${DEFAULT_CONTEXT_FILENAME} ---
 
---- Context from: ${path.join('subdir', DEFAULT_CONTEXT_FILENAME)} ---
+--- Context from: ${path.join("subdir", DEFAULT_CONTEXT_FILENAME)} ---
 Subdir memory
---- End of Context from: ${path.join('subdir', DEFAULT_CONTEXT_FILENAME)} ---`,
+--- End of Context from: ${path.join("subdir", DEFAULT_CONTEXT_FILENAME)} ---`,
       fileCount: 2,
       filePaths: [cwdGeminiFile, subDirGeminiFile],
     });
   });
 
-  it('should load and correctly order global, upward, and downward ORIGINAL_GEMINI_MD_FILENAME files', async () => {
+  it("should load and correctly order global, upward, and downward ORIGINAL_GEMINI_MD_FILENAME files", async () => {
     const defaultContextFile = await createTestFile(
       path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME),
-      'default context content',
+      "default context content",
     );
     const rootGeminiFile = await createTestFile(
       path.join(testRootDir, DEFAULT_CONTEXT_FILENAME),
-      'Project parent memory',
+      "Project parent memory",
     );
     const projectRootGeminiFile = await createTestFile(
       path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-      'Project root memory',
+      "Project root memory",
     );
     const cwdGeminiFile = await createTestFile(
       path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-      'CWD memory',
+      "CWD memory",
     );
     const subDirGeminiFile = await createTestFile(
-      path.join(cwd, 'sub', DEFAULT_CONTEXT_FILENAME),
-      'Subdir memory',
+      path.join(cwd, "sub", DEFAULT_CONTEXT_FILENAME),
+      "Subdir memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -401,17 +386,17 @@ Subdir memory
     });
   });
 
-  it('should ignore specified directories during downward scan', async () => {
-    await createEmptyDir(path.join(projectRoot, '.git'));
-    await createTestFile(path.join(projectRoot, '.gitignore'), 'node_modules');
+  it("should ignore specified directories during downward scan", async () => {
+    await createEmptyDir(path.join(projectRoot, ".git"));
+    await createTestFile(path.join(projectRoot, ".gitignore"), "node_modules");
 
     await createTestFile(
-      path.join(cwd, 'node_modules', DEFAULT_CONTEXT_FILENAME),
-      'Ignored memory',
+      path.join(cwd, "node_modules", DEFAULT_CONTEXT_FILENAME),
+      "Ignored memory",
     );
     const regularSubDirGeminiFile = await createTestFile(
-      path.join(cwd, 'my_code', DEFAULT_CONTEXT_FILENAME),
-      'My code memory',
+      path.join(cwd, "my_code", DEFAULT_CONTEXT_FILENAME),
+      "My code memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -421,7 +406,7 @@ Subdir memory
       new FileDiscoveryService(projectRoot),
       new SimpleExtensionLoader([]),
       DEFAULT_FOLDER_TRUST,
-      'tree',
+      "tree",
       {
         respectGitIgnore: true,
         respectGeminiIgnore: true,
@@ -438,10 +423,8 @@ My code memory
     });
   });
 
-  it('should respect the maxDirs parameter during downward scan', async () => {
-    const consoleDebugSpy = vi
-      .spyOn(debugLogger, 'debug')
-      .mockImplementation(() => {});
+  it("should respect the maxDirs parameter during downward scan", async () => {
+    const consoleDebugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
 
     // Create directories in parallel for better performance
     const dirPromises = Array.from({ length: 2 }, (_, i) =>
@@ -457,7 +440,7 @@ My code memory
       new FileDiscoveryService(projectRoot),
       new SimpleExtensionLoader([]),
       DEFAULT_FOLDER_TRUST,
-      'tree', // importFormat
+      "tree", // importFormat
       {
         respectGitIgnore: true,
         respectGeminiIgnore: true,
@@ -466,8 +449,8 @@ My code memory
     );
 
     expect(consoleDebugSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[DEBUG] [BfsFileSearch]'),
-      expect.stringContaining('Scanning [1/1]:'),
+      expect.stringContaining("[DEBUG] [BfsFileSearch]"),
+      expect.stringContaining("Scanning [1/1]:"),
     );
 
     consoleDebugSpy.mockRestore();
@@ -482,16 +465,16 @@ My code memory
     );
 
     expect(result).toEqual({
-      memoryContent: '',
+      memoryContent: "",
       fileCount: 0,
       filePaths: [],
     });
   });
 
-  it('should load extension context file paths', async () => {
+  it("should load extension context file paths", async () => {
     const extensionFilePath = await createTestFile(
-      path.join(testRootDir, 'extensions/ext1/GEMINI.md'),
-      'Extension memory content',
+      path.join(testRootDir, "extensions/ext1/GEMINI.md"),
+      "Extension memory content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -517,13 +500,11 @@ Extension memory content
     });
   });
 
-  it('should load memory from included directories', async () => {
-    const includedDir = await createEmptyDir(
-      path.join(testRootDir, 'included'),
-    );
+  it("should load memory from included directories", async () => {
+    const includedDir = await createEmptyDir(path.join(testRootDir, "included"));
     const includedFile = await createTestFile(
       path.join(includedDir, DEFAULT_CONTEXT_FILENAME),
-      'included directory memory',
+      "included directory memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -544,15 +525,13 @@ included directory memory
     });
   });
 
-  it('should handle multiple directories and files in parallel correctly', async () => {
+  it("should handle multiple directories and files in parallel correctly", async () => {
     // Create multiple test directories with GEMINI.md files
     const numDirs = 5;
     const createdFiles: string[] = [];
 
     for (let i = 0; i < numDirs; i++) {
-      const dirPath = await createEmptyDir(
-        path.join(testRootDir, `project-${i}`),
-      );
+      const dirPath = await createEmptyDir(path.join(testRootDir, `project-${i}`));
       const filePath = await createTestFile(
         path.join(dirPath, DEFAULT_CONTEXT_FILENAME),
         `Content from project ${i}`,
@@ -581,18 +560,18 @@ included directory memory
     }
   });
 
-  it('should preserve order and prevent duplicates when processing multiple directories', async () => {
+  it("should preserve order and prevent duplicates when processing multiple directories", async () => {
     // Create overlapping directory structure
-    const parentDir = await createEmptyDir(path.join(testRootDir, 'parent'));
-    const childDir = await createEmptyDir(path.join(parentDir, 'child'));
+    const parentDir = await createEmptyDir(path.join(testRootDir, "parent"));
+    const childDir = await createEmptyDir(path.join(parentDir, "child"));
 
     const parentFile = await createTestFile(
       path.join(parentDir, DEFAULT_CONTEXT_FILENAME),
-      'Parent content',
+      "Parent content",
     );
     const childFile = await createTestFile(
       path.join(childDir, DEFAULT_CONTEXT_FILENAME),
-      'Child content',
+      "Child content",
     );
 
     // Include both parent and child directories
@@ -607,47 +586,43 @@ included directory memory
 
     // Should have both files without duplicates
     expect(result.fileCount).toBe(2);
-    expect(result.memoryContent).toContain('Parent content');
-    expect(result.memoryContent).toContain('Child content');
+    expect(result.memoryContent).toContain("Parent content");
+    expect(result.memoryContent).toContain("Child content");
     expect(result.filePaths.sort()).toEqual([parentFile, childFile].sort());
 
     // Check that files are not duplicated
-    const parentOccurrences = (
-      result.memoryContent.match(/Parent content/g) || []
-    ).length;
-    const childOccurrences = (
-      result.memoryContent.match(/Child content/g) || []
-    ).length;
+    const parentOccurrences = (result.memoryContent.match(/Parent content/g) || []).length;
+    const childOccurrences = (result.memoryContent.match(/Child content/g) || []).length;
     expect(parentOccurrences).toBe(1);
     expect(childOccurrences).toBe(1);
   });
 
-  describe('loadGlobalMemory', () => {
-    it('should load global memory file if it exists', async () => {
+  describe("loadGlobalMemory", () => {
+    it("should load global memory file if it exists", async () => {
       const globalMemoryFile = await createTestFile(
         path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME),
-        'Global memory content',
+        "Global memory content",
       );
 
       const result = await loadGlobalMemory();
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(globalMemoryFile);
-      expect(result.files[0].content).toBe('Global memory content');
+      expect(result.files[0].content).toBe("Global memory content");
     });
 
-    it('should return empty content if global memory file does not exist', async () => {
+    it("should return empty content if global memory file does not exist", async () => {
       const result = await loadGlobalMemory();
 
       expect(result.files).toHaveLength(0);
     });
   });
 
-  describe('loadEnvironmentMemory', () => {
-    it('should load extension memory', async () => {
+  describe("loadEnvironmentMemory", () => {
+    it("should load extension memory", async () => {
       const extFile = await createTestFile(
-        path.join(testRootDir, 'ext', 'GEMINI.md'),
-        'Extension content',
+        path.join(testRootDir, "ext", "GEMINI.md"),
+        "Extension content",
       );
       const mockExtensionLoader = new SimpleExtensionLoader([
         {
@@ -660,114 +635,85 @@ included directory memory
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(extFile);
-      expect(result.files[0].content).toBe('Extension content');
+      expect(result.files[0].content).toBe("Extension content");
     });
 
-    it('should NOT traverse upward beyond trusted root (even with .git)', async () => {
+    it("should NOT traverse upward beyond trusted root (even with .git)", async () => {
       // Setup: /temp/parent/repo/.git
-      const parentDir = await createEmptyDir(path.join(testRootDir, 'parent'));
-      const repoDir = await createEmptyDir(path.join(parentDir, 'repo'));
-      await createEmptyDir(path.join(repoDir, '.git'));
-      const srcDir = await createEmptyDir(path.join(repoDir, 'src'));
+      const parentDir = await createEmptyDir(path.join(testRootDir, "parent"));
+      const repoDir = await createEmptyDir(path.join(parentDir, "repo"));
+      await createEmptyDir(path.join(repoDir, ".git"));
+      const srcDir = await createEmptyDir(path.join(repoDir, "src"));
 
-      await createTestFile(
-        path.join(parentDir, DEFAULT_CONTEXT_FILENAME),
-        'Parent content',
-      );
-      await createTestFile(
-        path.join(repoDir, DEFAULT_CONTEXT_FILENAME),
-        'Repo content',
-      );
+      await createTestFile(path.join(parentDir, DEFAULT_CONTEXT_FILENAME), "Parent content");
+      await createTestFile(path.join(repoDir, DEFAULT_CONTEXT_FILENAME), "Repo content");
       const srcFile = await createTestFile(
         path.join(srcDir, DEFAULT_CONTEXT_FILENAME),
-        'Src content',
+        "Src content",
       );
 
       // Trust srcDir. Should ONLY load srcFile.
       // Repo and Parent are NOT trusted.
-      const result = await loadEnvironmentMemory(
-        [srcDir],
-        new SimpleExtensionLoader([]),
-      );
+      const result = await loadEnvironmentMemory([srcDir], new SimpleExtensionLoader([]));
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(srcFile);
-      expect(result.files[0].content).toBe('Src content');
+      expect(result.files[0].content).toBe("Src content");
     });
 
-    it('should NOT traverse upward beyond trusted root (no .git)', async () => {
+    it("should NOT traverse upward beyond trusted root (no .git)", async () => {
       // Setup: /homedir/docs/notes (no .git anywhere)
-      const docsDir = await createEmptyDir(path.join(homedir, 'docs'));
-      const notesDir = await createEmptyDir(path.join(docsDir, 'notes'));
+      const docsDir = await createEmptyDir(path.join(homedir, "docs"));
+      const notesDir = await createEmptyDir(path.join(docsDir, "notes"));
 
-      await createTestFile(
-        path.join(homedir, DEFAULT_CONTEXT_FILENAME),
-        'Home content',
-      );
+      await createTestFile(path.join(homedir, DEFAULT_CONTEXT_FILENAME), "Home content");
       const docsFile = await createTestFile(
         path.join(docsDir, DEFAULT_CONTEXT_FILENAME),
-        'Docs content',
+        "Docs content",
       );
 
       // Trust notesDir. Should load NOTHING because notesDir has no file,
       // and we do not traverse up to docsDir.
-      const resultNotes = await loadEnvironmentMemory(
-        [notesDir],
-        new SimpleExtensionLoader([]),
-      );
+      const resultNotes = await loadEnvironmentMemory([notesDir], new SimpleExtensionLoader([]));
       expect(resultNotes.files).toHaveLength(0);
 
       // Trust docsDir. Should load docsFile, but NOT homeFile.
-      const resultDocs = await loadEnvironmentMemory(
-        [docsDir],
-        new SimpleExtensionLoader([]),
-      );
+      const resultDocs = await loadEnvironmentMemory([docsDir], new SimpleExtensionLoader([]));
       expect(resultDocs.files).toHaveLength(1);
       expect(resultDocs.files[0].path).toBe(docsFile);
-      expect(resultDocs.files[0].content).toBe('Docs content');
+      expect(resultDocs.files[0].content).toBe("Docs content");
     });
 
-    it('should deduplicate paths when same root is trusted multiple times', async () => {
-      const repoDir = await createEmptyDir(path.join(testRootDir, 'repo'));
-      await createEmptyDir(path.join(repoDir, '.git'));
+    it("should deduplicate paths when same root is trusted multiple times", async () => {
+      const repoDir = await createEmptyDir(path.join(testRootDir, "repo"));
+      await createEmptyDir(path.join(repoDir, ".git"));
 
       const repoFile = await createTestFile(
         path.join(repoDir, DEFAULT_CONTEXT_FILENAME),
-        'Repo content',
+        "Repo content",
       );
 
       // Trust repoDir twice.
-      const result = await loadEnvironmentMemory(
-        [repoDir, repoDir],
-        new SimpleExtensionLoader([]),
-      );
+      const result = await loadEnvironmentMemory([repoDir, repoDir], new SimpleExtensionLoader([]));
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(repoFile);
     });
 
-    it('should keep multiple memory files from the same directory adjacent and in order', async () => {
+    it("should keep multiple memory files from the same directory adjacent and in order", async () => {
       // Configure multiple memory filenames
-      setGeminiMdFilename(['PRIMARY.md', 'SECONDARY.md']);
+      setGeminiMdFilename(["PRIMARY.md", "SECONDARY.md"]);
 
-      const dir = await createEmptyDir(
-        path.join(testRootDir, 'multi_file_dir'),
-      );
-      await createEmptyDir(path.join(dir, '.git'));
+      const dir = await createEmptyDir(path.join(testRootDir, "multi_file_dir"));
+      await createEmptyDir(path.join(dir, ".git"));
 
-      const primaryFile = await createTestFile(
-        path.join(dir, 'PRIMARY.md'),
-        'Primary content',
-      );
+      const primaryFile = await createTestFile(path.join(dir, "PRIMARY.md"), "Primary content");
       const secondaryFile = await createTestFile(
-        path.join(dir, 'SECONDARY.md'),
-        'Secondary content',
+        path.join(dir, "SECONDARY.md"),
+        "Secondary content",
       );
 
-      const result = await loadEnvironmentMemory(
-        [dir],
-        new SimpleExtensionLoader([]),
-      );
+      const result = await loadEnvironmentMemory([dir], new SimpleExtensionLoader([]));
 
       expect(result.files).toHaveLength(2);
       // Verify order: PRIMARY should come before SECONDARY because they are
@@ -775,120 +721,97 @@ included directory memory
       // if in same dir.
       expect(result.files[0].path).toBe(primaryFile);
       expect(result.files[1].path).toBe(secondaryFile);
-      expect(result.files[0].content).toBe('Primary content');
-      expect(result.files[1].content).toBe('Secondary content');
+      expect(result.files[0].content).toBe("Primary content");
+      expect(result.files[1].content).toBe("Secondary content");
     });
   });
 
-  describe('loadJitSubdirectoryMemory', () => {
-    it('should load JIT memory when target is inside a trusted root', async () => {
-      const rootDir = await createEmptyDir(path.join(testRootDir, 'jit_root'));
-      const subDir = await createEmptyDir(path.join(rootDir, 'subdir'));
-      const targetFile = path.join(subDir, 'target.txt');
+  describe("loadJitSubdirectoryMemory", () => {
+    it("should load JIT memory when target is inside a trusted root", async () => {
+      const rootDir = await createEmptyDir(path.join(testRootDir, "jit_root"));
+      const subDir = await createEmptyDir(path.join(rootDir, "subdir"));
+      const targetFile = path.join(subDir, "target.txt");
 
       const subDirMemory = await createTestFile(
         path.join(subDir, DEFAULT_CONTEXT_FILENAME),
-        'Subdir JIT content',
+        "Subdir JIT content",
       );
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [rootDir],
-        new Set(),
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [rootDir], new Set());
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(subDirMemory);
-      expect(result.files[0].content).toBe('Subdir JIT content');
+      expect(result.files[0].content).toBe("Subdir JIT content");
     });
 
-    it('should skip JIT memory when target is outside trusted roots', async () => {
-      const trustedRoot = await createEmptyDir(
-        path.join(testRootDir, 'trusted'),
-      );
-      const untrustedDir = await createEmptyDir(
-        path.join(testRootDir, 'untrusted'),
-      );
-      const targetFile = path.join(untrustedDir, 'target.txt');
+    it("should skip JIT memory when target is outside trusted roots", async () => {
+      const trustedRoot = await createEmptyDir(path.join(testRootDir, "trusted"));
+      const untrustedDir = await createEmptyDir(path.join(testRootDir, "untrusted"));
+      const targetFile = path.join(untrustedDir, "target.txt");
 
-      await createTestFile(
-        path.join(untrustedDir, DEFAULT_CONTEXT_FILENAME),
-        'Untrusted content',
-      );
+      await createTestFile(path.join(untrustedDir, DEFAULT_CONTEXT_FILENAME), "Untrusted content");
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [trustedRoot],
-        new Set(),
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [trustedRoot], new Set());
 
       expect(result.files).toHaveLength(0);
     });
 
-    it('should skip already loaded paths', async () => {
-      const rootDir = await createEmptyDir(path.join(testRootDir, 'jit_root'));
-      const subDir = await createEmptyDir(path.join(rootDir, 'subdir'));
-      const targetFile = path.join(subDir, 'target.txt');
+    it("should skip already loaded paths", async () => {
+      const rootDir = await createEmptyDir(path.join(testRootDir, "jit_root"));
+      const subDir = await createEmptyDir(path.join(rootDir, "subdir"));
+      const targetFile = path.join(subDir, "target.txt");
 
       const rootMemory = await createTestFile(
         path.join(rootDir, DEFAULT_CONTEXT_FILENAME),
-        'Root content',
+        "Root content",
       );
       const subDirMemory = await createTestFile(
         path.join(subDir, DEFAULT_CONTEXT_FILENAME),
-        'Subdir content',
+        "Subdir content",
       );
 
       // Simulate root memory already loaded (e.g., by loadEnvironmentMemory)
       const alreadyLoaded = new Set([rootMemory]);
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [rootDir],
-        alreadyLoaded,
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [rootDir], alreadyLoaded);
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(subDirMemory);
-      expect(result.files[0].content).toBe('Subdir content');
+      expect(result.files[0].content).toBe("Subdir content");
     });
 
-    it('should use the deepest trusted root when multiple nested roots exist', async () => {
-      const outerRoot = await createEmptyDir(path.join(testRootDir, 'outer'));
-      const innerRoot = await createEmptyDir(path.join(outerRoot, 'inner'));
-      const targetFile = path.join(innerRoot, 'target.txt');
+    it("should use the deepest trusted root when multiple nested roots exist", async () => {
+      const outerRoot = await createEmptyDir(path.join(testRootDir, "outer"));
+      const innerRoot = await createEmptyDir(path.join(outerRoot, "inner"));
+      const targetFile = path.join(innerRoot, "target.txt");
 
       const outerMemory = await createTestFile(
         path.join(outerRoot, DEFAULT_CONTEXT_FILENAME),
-        'Outer content',
+        "Outer content",
       );
       const innerMemory = await createTestFile(
         path.join(innerRoot, DEFAULT_CONTEXT_FILENAME),
-        'Inner content',
+        "Inner content",
       );
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [outerRoot, innerRoot],
-        new Set(),
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [outerRoot, innerRoot], new Set());
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(innerMemory);
-      expect(result.files[0].content).toBe('Inner content');
+      expect(result.files[0].content).toBe("Inner content");
       // Ensure outer memory is NOT loaded
       expect(result.files.find((f) => f.path === outerMemory)).toBeUndefined();
     });
   });
 
-  it('refreshServerHierarchicalMemory should refresh memory and update config', async () => {
+  it("refreshServerHierarchicalMemory should refresh memory and update config", async () => {
     const extensionLoader = new SimpleExtensionLoader([]);
     const config = new Config({
-      sessionId: '1',
+      sessionId: "1",
       targetDir: cwd,
       cwd,
       debugMode: false,
-      model: 'fake-model',
+      model: "fake-model",
       extensionLoader,
     });
     const result = await loadServerHierarchicalMemory(
@@ -906,16 +829,16 @@ included directory memory
 
     // Now add an extension with a memory file
     const extensionsDir = new Storage(homedir).getExtensionsDir();
-    const extensionPath = path.join(extensionsDir, 'new-extension');
-    const contextFilePath = path.join(extensionPath, 'CustomContext.md');
+    const extensionPath = path.join(extensionsDir, "new-extension");
+    const contextFilePath = path.join(extensionPath, "CustomContext.md");
     await fsPromises.mkdir(extensionPath, { recursive: true });
-    await fsPromises.writeFile(contextFilePath, 'Really cool custom context!');
+    await fsPromises.writeFile(contextFilePath, "Really cool custom context!");
     await extensionLoader.loadExtension({
-      name: 'new-extension',
+      name: "new-extension",
       isActive: true,
       contextFiles: [contextFilePath],
-      version: '1.0.0',
-      id: '1234',
+      version: "1.0.0",
+      id: "1234",
       path: extensionPath,
     });
 
@@ -924,30 +847,22 @@ included directory memory
     const refreshResult = await refreshServerHierarchicalMemory(config);
     expect(refreshResult.fileCount).equals(1);
     expect(config.getGeminiMdFileCount()).equals(refreshResult.fileCount);
-    expect(refreshResult.memoryContent).toContain(
-      'Really cool custom context!',
-    );
+    expect(refreshResult.memoryContent).toContain("Really cool custom context!");
     expect(config.getUserMemory()).equals(refreshResult.memoryContent);
-    expect(refreshResult.filePaths[0]).toContain(
-      path.join(extensionPath, 'CustomContext.md'),
-    );
+    expect(refreshResult.filePaths[0]).toContain(path.join(extensionPath, "CustomContext.md"));
     expect(config.getGeminiMdFilePaths()).equals(refreshResult.filePaths);
     expect(mockEventListener).toHaveBeenCalledExactlyOnceWith(refreshResult);
   });
 
-  it('should include MCP instructions in user memory', async () => {
+  it("should include MCP instructions in user memory", async () => {
     const mockConfig = {
       getWorkingDir: vi.fn().mockReturnValue(cwd),
       shouldLoadMemoryFromIncludeDirectories: vi.fn().mockReturnValue(false),
       getDebugMode: vi.fn().mockReturnValue(false),
-      getFileService: vi
-        .fn()
-        .mockReturnValue(new FileDiscoveryService(projectRoot)),
-      getExtensionLoader: vi
-        .fn()
-        .mockReturnValue(new SimpleExtensionLoader([])),
+      getFileService: vi.fn().mockReturnValue(new FileDiscoveryService(projectRoot)),
+      getExtensionLoader: vi.fn().mockReturnValue(new SimpleExtensionLoader([])),
       isTrustedFolder: vi.fn().mockReturnValue(true),
-      getImportFormat: vi.fn().mockReturnValue('tree'),
+      getImportFormat: vi.fn().mockReturnValue("tree"),
       getFileFilteringOptions: vi.fn().mockReturnValue(undefined),
       getDiscoveryMaxDirs: vi.fn().mockReturnValue(200),
       setUserMemory: vi.fn(),
@@ -965,12 +880,10 @@ included directory memory
     await refreshServerHierarchicalMemory(mockConfig);
 
     expect(mockConfig.setUserMemory).toHaveBeenCalledWith(
-      expect.stringContaining(
-        "# Instructions for MCP Server 'extension-server'",
-      ),
+      expect.stringContaining("# Instructions for MCP Server 'extension-server'"),
     );
     expect(mockConfig.setUserMemory).toHaveBeenCalledWith(
-      expect.stringContaining('Always be polite.'),
+      expect.stringContaining("Always be polite."),
     );
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/memoryDiscovery.ts b/packages/gemini-cli-core/src/utils/memoryDiscovery.ts
index cbbbad880..965bf863a 100644
--- a/packages/gemini-cli-core/src/utils/memoryDiscovery.ts
+++ b/packages/gemini-cli-core/src/utils/memoryDiscovery.ts
@@ -4,34 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as fsSync from 'node:fs';
-import * as path from 'node:path';
-import { homedir } from 'node:os';
-import { bfsFileSearch } from './bfsFileSearch.js';
-import { getAllGeminiMdFilenames } from '../tools/memoryTool.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { processImports } from './memoryImportProcessor.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { GEMINI_DIR } from './paths.js';
-import type { ExtensionLoader } from './extensionLoader.js';
-import { debugLogger } from './debugLogger.js';
-import type { Config } from '../config/config.js';
-import { CoreEvent, coreEvents } from './events.js';
+import * as fsSync from "node:fs";
+import * as fs from "node:fs/promises";
+import { homedir } from "node:os";
+import * as path from "node:path";
+import type { Config } from "../config/config.js";
+import type { FileFilteringOptions } from "../config/constants.js";
+import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { getAllGeminiMdFilenames } from "../tools/memoryTool.js";
+import { bfsFileSearch } from "./bfsFileSearch.js";
+import { debugLogger } from "./debugLogger.js";
+import { CoreEvent, coreEvents } from "./events.js";
+import type { ExtensionLoader } from "./extensionLoader.js";
+import { processImports } from "./memoryImportProcessor.js";
+import { GEMINI_DIR } from "./paths.js";
 
 // Simple console logger, similar to the one previously in CLI's config.ts
 // TODO: Integrate with a more robust server-side logger if available/appropriate.
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) =>
-    debugLogger.debug('[DEBUG] [MemoryDiscovery]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [MemoryDiscovery]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  warn: (...args: any[]) =>
-    debugLogger.warn('[WARN] [MemoryDiscovery]', ...args),
+  warn: (...args: any[]) => debugLogger.warn("[WARN] [MemoryDiscovery]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: (...args: any[]) =>
-    console.error('[ERROR] [MemoryDiscovery]', ...args),
+  error: (...args: any[]) => console.error("[ERROR] [MemoryDiscovery]", ...args),
 };
 
 export interface GeminiFileContent {
@@ -42,7 +39,7 @@ export interface GeminiFileContent {
 async function findProjectRoot(startDir: string): Promise<string | null> {
   let currentDir = path.resolve(startDir);
   while (true) {
-    const gitPath = path.join(currentDir, '.git');
+    const gitPath = path.join(currentDir, ".git");
     try {
       const stats = await fs.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -52,22 +49,19 @@ async function findProjectRoot(startDir: string): Promise<string | null> {
       // Don't log ENOENT errors as they're expected when .git doesn't exist
       // Also don't log errors in test environments, which often have mocked fs
       const isENOENT =
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'code' in error &&
-        (error as { code: string }).code === 'ENOENT';
+        "code" in error &&
+        (error as { code: string }).code === "ENOENT";
 
       // Only log unexpected errors in non-test environments
       // process.env['NODE_ENV'] === 'test' or VITEST are common test indicators
-      const isTestEnv =
-        process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
+      const isTestEnv = process.env["NODE_ENV"] === "test" || process.env["VITEST"];
 
       if (!isENOENT && !isTestEnv) {
-        if (typeof error === 'object' && error !== null && 'code' in error) {
+        if (typeof error === "object" && error !== null && "code" in error) {
           const fsError = error as { code: string; message: string };
-          logger.warn(
-            `Error checking for .git directory at ${gitPath}: ${fsError.message}`,
-          );
+          logger.warn(`Error checking for .git directory at ${gitPath}: ${fsError.message}`);
         } else {
           logger.warn(
             `Non-standard error checking for .git directory at ${gitPath}: ${String(error)}`,
@@ -93,10 +87,7 @@ async function getGeminiMdFilePathsInternal(
   fileFilteringOptions: FileFilteringOptions,
   maxDirs: number,
 ): Promise<string[]> {
-  const dirs = new Set<string>([
-    ...includeDirectoriesToReadGemini,
-    currentWorkingDirectory,
-  ]);
+  const dirs = new Set<string>([...includeDirectoriesToReadGemini, currentWorkingDirectory]);
 
   // Process directories in parallel with concurrency limit to prevent EMFILE errors
   const CONCURRENT_LIMIT = 10;
@@ -120,7 +111,7 @@ async function getGeminiMdFilePathsInternal(
     const batchResults = await Promise.allSettled(batchPromises);
 
     for (const result of batchResults) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         pathsArrays.push(result.value);
       } else {
         const error = result.reason;
@@ -149,20 +140,13 @@ async function getGeminiMdFilePathsInternalForEachDir(
 
   for (const geminiMdFilename of geminiMdFilenames) {
     const resolvedHome = path.resolve(userHomePath);
-    const globalMemoryPath = path.join(
-      resolvedHome,
-      GEMINI_DIR,
-      geminiMdFilename,
-    );
+    const globalMemoryPath = path.join(resolvedHome, GEMINI_DIR, geminiMdFilename);
 
     // This part that finds the global file always runs.
     try {
       await fs.access(globalMemoryPath, fsSync.constants.R_OK);
       allPaths.add(globalMemoryPath);
-      if (debugMode)
-        logger.debug(
-          `Found readable global ${geminiMdFilename}: ${globalMemoryPath}`,
-        );
+      if (debugMode) logger.debug(`Found readable global ${geminiMdFilename}: ${globalMemoryPath}`);
     } catch {
       // It's okay if it's not found.
     }
@@ -172,19 +156,14 @@ async function getGeminiMdFilePathsInternalForEachDir(
     if (dir && folderTrust) {
       const resolvedCwd = path.resolve(dir);
       if (debugMode)
-        logger.debug(
-          `Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`,
-        );
+        logger.debug(`Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`);
 
       const projectRoot = await findProjectRoot(resolvedCwd);
-      if (debugMode)
-        logger.debug(`Determined project root: ${projectRoot ?? 'None'}`);
+      if (debugMode) logger.debug(`Determined project root: ${projectRoot ?? "None"}`);
 
       const upwardPaths: string[] = [];
       let currentDir = resolvedCwd;
-      const ultimateStopDir = projectRoot
-        ? path.dirname(projectRoot)
-        : path.dirname(resolvedHome);
+      const ultimateStopDir = projectRoot ? path.dirname(projectRoot) : path.dirname(resolvedHome);
 
       while (currentDir && currentDir !== path.dirname(currentDir)) {
         if (currentDir === path.join(resolvedHome, GEMINI_DIR)) {
@@ -232,9 +211,7 @@ async function getGeminiMdFilePathsInternalForEachDir(
 
   if (debugMode)
     logger.debug(
-      `Final ordered ${getAllGeminiMdFilenames()} paths to read: ${JSON.stringify(
-        finalPaths,
-      )}`,
+      `Final ordered ${getAllGeminiMdFilenames()} paths to read: ${JSON.stringify(finalPaths)}`,
     );
   return finalPaths;
 }
@@ -242,7 +219,7 @@ async function getGeminiMdFilePathsInternalForEachDir(
 async function readGeminiMdFiles(
   filePaths: string[],
   debugMode: boolean,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
 ): Promise<GeminiFileContent[]> {
   // Process files in parallel with concurrency limit to prevent EMFILE errors
   const CONCURRENT_LIMIT = 20; // Higher limit for file reads as they're typically faster
@@ -250,46 +227,42 @@ async function readGeminiMdFiles(
 
   for (let i = 0; i < filePaths.length; i += CONCURRENT_LIMIT) {
     const batch = filePaths.slice(i, i + CONCURRENT_LIMIT);
-    const batchPromises = batch.map(
-      async (filePath): Promise<GeminiFileContent> => {
-        try {
-          const content = await fs.readFile(filePath, 'utf-8');
-
-          // Process imports in the content
-          const processedResult = await processImports(
-            content,
-            path.dirname(filePath),
-            debugMode,
-            undefined,
-            undefined,
-            importFormat,
+    const batchPromises = batch.map(async (filePath): Promise<GeminiFileContent> => {
+      try {
+        const content = await fs.readFile(filePath, "utf-8");
+
+        // Process imports in the content
+        const processedResult = await processImports(
+          content,
+          path.dirname(filePath),
+          debugMode,
+          undefined,
+          undefined,
+          importFormat,
+        );
+        if (debugMode)
+          logger.debug(
+            `Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`,
+          );
+
+        return { filePath, content: processedResult.content };
+      } catch (error: unknown) {
+        const isTestEnv = process.env["NODE_ENV"] === "test" || process.env["VITEST"];
+        if (!isTestEnv) {
+          const message = error instanceof Error ? error.message : String(error);
+          logger.warn(
+            `Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`,
           );
-          if (debugMode)
-            logger.debug(
-              `Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`,
-            );
-
-          return { filePath, content: processedResult.content };
-        } catch (error: unknown) {
-          const isTestEnv =
-            process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
-          if (!isTestEnv) {
-            const message =
-              error instanceof Error ? error.message : String(error);
-            logger.warn(
-              `Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`,
-            );
-          }
-          if (debugMode) logger.debug(`Failed to read: ${filePath}`);
-          return { filePath, content: null }; // Still include it with null content
         }
-      },
-    );
+        if (debugMode) logger.debug(`Failed to read: ${filePath}`);
+        return { filePath, content: null }; // Still include it with null content
+      }
+    });
 
     const batchResults = await Promise.allSettled(batchPromises);
 
     for (const result of batchResults) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         results.push(result.value);
       } else {
         // This case shouldn't happen since we catch all errors above,
@@ -310,7 +283,7 @@ export function concatenateInstructions(
   currentWorkingDirectoryForDisplay: string,
 ): string {
   return instructionContents
-    .filter((item) => typeof item.content === 'string')
+    .filter((item) => typeof item.content === "string")
     .map((item) => {
       const trimmedContent = (item.content as string).trim();
       if (trimmedContent.length === 0) {
@@ -322,16 +295,14 @@ export function concatenateInstructions(
       return `--- Context from: ${displayPath} ---\n${trimmedContent}\n--- End of Context from: ${displayPath} ---`;
     })
     .filter((block): block is string => block !== null)
-    .join('\n\n');
+    .join("\n\n");
 }
 
 export interface MemoryLoadResult {
   files: Array<{ path: string; content: string }>;
 }
 
-export async function loadGlobalMemory(
-  debugMode: boolean = false,
-): Promise<MemoryLoadResult> {
+export async function loadGlobalMemory(debugMode: boolean = false): Promise<MemoryLoadResult> {
   const userHome = homedir();
   const geminiMdFilenames = getAllGeminiMdFilenames();
 
@@ -344,16 +315,14 @@ export async function loadGlobalMemory(
       }
       return globalPath;
     } catch {
-      debugLogger.debug('A global memory file was not found.');
+      debugLogger.debug("A global memory file was not found.");
       return null;
     }
   });
 
-  const foundPaths = (await Promise.all(accessChecks)).filter(
-    (p): p is string => p !== null,
-  );
+  const foundPaths = (await Promise.all(accessChecks)).filter((p): p is string => p !== null);
 
-  const contents = await readGeminiMdFiles(foundPaths, debugMode, 'tree');
+  const contents = await readGeminiMdFiles(foundPaths, debugMode, "tree");
 
   return {
     files: contents
@@ -383,9 +352,7 @@ async function findUpwardGeminiFiles(
   const globalGeminiDir = path.join(homedir(), GEMINI_DIR);
 
   if (debugMode) {
-    logger.debug(
-      `Starting upward search from ${currentDir} stopping at ${resolvedStopDir}`,
-    );
+    logger.debug(`Starting upward search from ${currentDir} stopping at ${resolvedStopDir}`);
   }
 
   while (true) {
@@ -410,10 +377,7 @@ async function findUpwardGeminiFiles(
 
     upwardPaths.unshift(...foundPathsInDir);
 
-    if (
-      currentDir === resolvedStopDir ||
-      currentDir === path.dirname(currentDir)
-    ) {
+    if (currentDir === resolvedStopDir || currentDir === path.dirname(currentDir)) {
       break;
     }
     currentDir = path.dirname(currentDir);
@@ -450,7 +414,7 @@ export async function loadEnvironmentMemory(
   extensionPaths.forEach((p) => allPaths.add(p));
 
   const sortedPaths = Array.from(allPaths).sort();
-  const contents = await readGeminiMdFiles(sortedPaths, debugMode, 'tree');
+  const contents = await readGeminiMdFiles(sortedPaths, debugMode, "tree");
 
   return {
     files: contents
@@ -479,7 +443,7 @@ export async function loadServerHierarchicalMemory(
   fileService: FileDiscoveryService,
   extensionLoader: ExtensionLoader,
   folderTrust: boolean,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
   fileFilteringOptions?: FileFilteringOptions,
   maxDirs: number = 200,
 ): Promise<LoadServerHierarchicalMemoryResponse> {
@@ -490,7 +454,7 @@ export async function loadServerHierarchicalMemory(
 
   // If it is the home directory, pass an empty string to the core memory
   // function to signal that it should skip the workspace search.
-  currentWorkingDirectory = isHomeDirectory ? '' : currentWorkingDirectory;
+  currentWorkingDirectory = isHomeDirectory ? "" : currentWorkingDirectory;
 
   if (debugMode)
     logger.debug(
@@ -520,28 +484,15 @@ export async function loadServerHierarchicalMemory(
   );
 
   if (filePaths.length === 0) {
-    if (debugMode)
-      logger.debug('No GEMINI.md files found in hierarchy of the workspace.');
-    return { memoryContent: '', fileCount: 0, filePaths: [] };
+    if (debugMode) logger.debug("No GEMINI.md files found in hierarchy of the workspace.");
+    return { memoryContent: "", fileCount: 0, filePaths: [] };
   }
-  const contentsWithPaths = await readGeminiMdFiles(
-    filePaths,
-    debugMode,
-    importFormat,
-  );
+  const contentsWithPaths = await readGeminiMdFiles(filePaths, debugMode, importFormat);
   // Pass CWD for relative path display in concatenated content
-  const combinedInstructions = concatenateInstructions(
-    contentsWithPaths,
-    currentWorkingDirectory,
-  );
-  if (debugMode)
-    logger.debug(
-      `Combined instructions length: ${combinedInstructions.length}`,
-    );
+  const combinedInstructions = concatenateInstructions(contentsWithPaths, currentWorkingDirectory);
+  if (debugMode) logger.debug(`Combined instructions length: ${combinedInstructions.length}`);
   if (debugMode && combinedInstructions.length > 0)
-    logger.debug(
-      `Combined instructions (snippet): ${combinedInstructions.substring(0, 500)}...`,
-    );
+    logger.debug(`Combined instructions (snippet): ${combinedInstructions.substring(0, 500)}...`);
   return {
     memoryContent: combinedInstructions,
     fileCount: contentsWithPaths.length,
@@ -569,11 +520,10 @@ export async function refreshServerHierarchicalMemory(config: Config) {
     config.getFileFilteringOptions(),
     config.getDiscoveryMaxDirs(),
   );
-  const mcpInstructions =
-    config.getMcpClientManager()?.getMcpInstructions() || '';
+  const mcpInstructions = config.getMcpClientManager()?.getMcpInstructions() || "";
   const finalMemory = [result.memoryContent, mcpInstructions.trimStart()]
     .filter(Boolean)
-    .join('\n\n');
+    .join("\n\n");
   config.setUserMemory(finalMemory);
   config.setGeminiMdFileCount(result.fileCount);
   config.setGeminiMdFilePaths(result.filePaths);
@@ -603,25 +553,17 @@ export async function loadJitSubdirectoryMemory(
 
   if (!bestRoot) {
     if (debugMode) {
-      logger.debug(
-        `JIT memory skipped: ${resolvedTarget} is not in any trusted root.`,
-      );
+      logger.debug(`JIT memory skipped: ${resolvedTarget} is not in any trusted root.`);
     }
     return { files: [] };
   }
 
   if (debugMode) {
-    logger.debug(
-      `Loading JIT memory for ${resolvedTarget} (Trusted root: ${bestRoot})`,
-    );
+    logger.debug(`Loading JIT memory for ${resolvedTarget} (Trusted root: ${bestRoot})`);
   }
 
   // Traverse from target up to the trusted root
-  const potentialPaths = await findUpwardGeminiFiles(
-    resolvedTarget,
-    bestRoot,
-    debugMode,
-  );
+  const potentialPaths = await findUpwardGeminiFiles(resolvedTarget, bestRoot, debugMode);
 
   // Filter out already loaded paths
   const newPaths = potentialPaths.filter((p) => !alreadyLoadedPaths.has(p));
@@ -634,7 +576,7 @@ export async function loadJitSubdirectoryMemory(
     logger.debug(`Found new JIT memory files: ${JSON.stringify(newPaths)}`);
   }
 
-  const contents = await readGeminiMdFiles(newPaths, debugMode, 'tree');
+  const contents = await readGeminiMdFiles(newPaths, debugMode, "tree");
 
   return {
     files: contents
diff --git a/packages/gemini-cli-core/src/utils/memoryImportProcessor.test.ts b/packages/gemini-cli-core/src/utils/memoryImportProcessor.test.ts
index 3c9a74b60..1447567de 100644
--- a/packages/gemini-cli-core/src/utils/memoryImportProcessor.test.ts
+++ b/packages/gemini-cli-core/src/utils/memoryImportProcessor.test.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { marked } from 'marked';
-import { processImports, validateImportPath } from './memoryImportProcessor.js';
-import { debugLogger } from './debugLogger.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { marked } from "marked";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
+import { processImports, validateImportPath } from "./memoryImportProcessor.js";
 
 // Helper function to create platform-agnostic test paths
 function testPath(...segments: string[]): string {
@@ -18,9 +18,9 @@ function testPath(...segments: string[]): string {
 
   // Join remaining segments with the platform-specific separator
   for (let i = 1; i < segments.length; i++) {
-    if (segments[i].startsWith('/') || segments[i].startsWith('\\')) {
+    if (segments[i].startsWith("/") || segments[i].startsWith("\\")) {
       // If segment starts with a separator, remove the trailing separator from the result
-      result = path.normalize(result.replace(/[\\/]+$/, '') + segments[i]);
+      result = path.normalize(result.replace(/[\\/]+$/, "") + segments[i]);
     } else {
       // Otherwise join with the platform separator
       result = path.join(result, segments[i]);
@@ -30,7 +30,7 @@ function testPath(...segments: string[]): string {
   return path.normalize(result);
 }
 
-vi.mock('fs/promises');
+vi.mock("fs/promises");
 const mockedFs = vi.mocked(fs);
 
 // Helper functions using marked for parsing and validation
@@ -43,7 +43,7 @@ const findMarkdownComments = (content: string): string[] => {
   function walkTokens(tokenList: unknown[]) {
     for (const token of tokenList) {
       const t = token as { type: string; raw: string; tokens?: unknown[] };
-      if (t.type === 'html' && t.raw.includes('<!--')) {
+      if (t.type === "html" && t.raw.includes("<!--")) {
         comments.push(t.raw.trim());
       }
       if (t.tokens) {
@@ -56,23 +56,21 @@ const findMarkdownComments = (content: string): string[] => {
   return comments;
 };
 
-const findCodeBlocks = (
-  content: string,
-): Array<{ type: string; content: string }> => {
+const findCodeBlocks = (content: string): Array<{ type: string; content: string }> => {
   const tokens = parseMarkdown(content);
   const codeBlocks: Array<{ type: string; content: string }> = [];
 
   function walkTokens(tokenList: unknown[]) {
     for (const token of tokenList) {
       const t = token as { type: string; text: string; tokens?: unknown[] };
-      if (t.type === 'code') {
+      if (t.type === "code") {
         codeBlocks.push({
-          type: 'code_block',
+          type: "code_block",
           content: t.text,
         });
-      } else if (t.type === 'codespan') {
+      } else if (t.type === "codespan") {
         codeBlocks.push({
-          type: 'inline_code',
+          type: "inline_code",
           content: t.text,
         });
       }
@@ -86,24 +84,24 @@ const findCodeBlocks = (
   return codeBlocks;
 };
 
-describe('memoryImportProcessor', () => {
+describe("memoryImportProcessor", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     // Mock console methods
-    vi.spyOn(debugLogger, 'warn').mockImplementation(() => {});
-    vi.spyOn(debugLogger, 'error').mockImplementation(() => {});
-    vi.spyOn(debugLogger, 'debug').mockImplementation(() => {});
+    vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
+    vi.spyOn(debugLogger, "error").mockImplementation(() => {});
+    vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
   });
 
   afterEach(() => {
     vi.resetAllMocks();
   });
 
-  describe('processImports', () => {
-    it('should process basic md file imports', async () => {
-      const content = 'Some content @./test.md more content';
-      const basePath = testPath('test', 'path');
-      const importedContent = '# Imported Content\nThis is imported.';
+  describe("processImports", () => {
+    it("should process basic md file imports", async () => {
+      const content = "Some content @./test.md more content";
+      const basePath = testPath("test", "path");
+      const importedContent = "# Imported Content\nThis is imported.";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(importedContent);
@@ -112,12 +110,8 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find HTML comments (import markers)
       const comments = findMarkdownComments(result.content);
-      expect(comments.some((c) => c.includes('Imported from: ./test.md'))).toBe(
-        true,
-      );
-      expect(
-        comments.some((c) => c.includes('End of import from: ./test.md')),
-      ).toBe(true);
+      expect(comments.some((c) => c.includes("Imported from: ./test.md"))).toBe(true);
+      expect(comments.some((c) => c.includes("End of import from: ./test.md"))).toBe(true);
 
       // Verify the imported content is present
       expect(result.content).toContain(importedContent);
@@ -127,17 +121,13 @@ describe('memoryImportProcessor', () => {
       expect(tokens).toBeDefined();
       expect(tokens.length).toBeGreaterThan(0);
 
-      expect(mockedFs.readFile).toHaveBeenCalledWith(
-        path.resolve(basePath, './test.md'),
-        'utf-8',
-      );
+      expect(mockedFs.readFile).toHaveBeenCalledWith(path.resolve(basePath, "./test.md"), "utf-8");
     });
 
-    it('should import non-md files just like md files', async () => {
-      const content = 'Some content @./instructions.txt more content';
-      const basePath = testPath('test', 'path');
-      const importedContent =
-        '# Instructions\nThis is a text file with markdown.';
+    it("should import non-md files just like md files", async () => {
+      const content = "Some content @./instructions.txt more content";
+      const basePath = testPath("test", "path");
+      const importedContent = "# Instructions\nThis is a text file with markdown.";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(importedContent);
@@ -146,37 +136,29 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find import comments
       const comments = findMarkdownComments(result.content);
-      expect(
-        comments.some((c) => c.includes('Imported from: ./instructions.txt')),
-      ).toBe(true);
-      expect(
-        comments.some((c) =>
-          c.includes('End of import from: ./instructions.txt'),
-        ),
-      ).toBe(true);
+      expect(comments.some((c) => c.includes("Imported from: ./instructions.txt"))).toBe(true);
+      expect(comments.some((c) => c.includes("End of import from: ./instructions.txt"))).toBe(true);
 
       // Use marked to parse and validate the imported content structure
       const tokens = parseMarkdown(result.content);
 
       // Find headers in the parsed content
-      const headers = tokens.filter((token) => token.type === 'heading');
-      expect(
-        headers.some((h) => (h as { text: string }).text === 'Instructions'),
-      ).toBe(true);
+      const headers = tokens.filter((token) => token.type === "heading");
+      expect(headers.some((h) => (h as { text: string }).text === "Instructions")).toBe(true);
 
       // Verify the imported content is present
       expect(result.content).toContain(importedContent);
       expect(debugLogger.warn).not.toHaveBeenCalled();
       expect(mockedFs.readFile).toHaveBeenCalledWith(
-        path.resolve(basePath, './instructions.txt'),
-        'utf-8',
+        path.resolve(basePath, "./instructions.txt"),
+        "utf-8",
       );
     });
 
-    it('should handle circular imports', async () => {
-      const content = 'Content @./circular.md more content';
-      const basePath = testPath('test', 'path');
-      const circularContent = 'Circular @./main.md content';
+    it("should handle circular imports", async () => {
+      const content = "Content @./circular.md more content";
+      const basePath = testPath("test", "path");
+      const circularContent = "Circular @./main.md content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(circularContent);
@@ -186,38 +168,34 @@ describe('memoryImportProcessor', () => {
         processedFiles: new Set<string>(),
         maxDepth: 10,
         currentDepth: 0,
-        currentFile: testPath('test', 'path', 'main.md'), // Simulate we're processing main.md
+        currentFile: testPath("test", "path", "main.md"), // Simulate we're processing main.md
       };
 
       const result = await processImports(content, basePath, true, importState);
 
       // The circular import should be detected when processing the nested import
-      expect(result.content).toContain(
-        '<!-- File already processed: ./main.md -->',
-      );
+      expect(result.content).toContain("<!-- File already processed: ./main.md -->");
     });
 
-    it('should handle file not found errors', async () => {
-      const content = 'Content @./nonexistent.md more content';
-      const basePath = testPath('test', 'path');
+    it("should handle file not found errors", async () => {
+      const content = "Content @./nonexistent.md more content";
+      const basePath = testPath("test", "path");
 
-      mockedFs.access.mockRejectedValue(new Error('File not found'));
+      mockedFs.access.mockRejectedValue(new Error("File not found"));
 
       const result = await processImports(content, basePath, true);
 
-      expect(result.content).toContain(
-        '<!-- Import failed: ./nonexistent.md - File not found -->',
-      );
+      expect(result.content).toContain("<!-- Import failed: ./nonexistent.md - File not found -->");
       expect(debugLogger.error).toHaveBeenCalledWith(
-        '[ERROR] [ImportProcessor]',
-        'Failed to import ./nonexistent.md: File not found',
+        "[ERROR] [ImportProcessor]",
+        "Failed to import ./nonexistent.md: File not found",
       );
     });
 
-    it('should respect max depth limit', async () => {
-      const content = 'Content @./deep.md more content';
-      const basePath = testPath('test', 'path');
-      const deepContent = 'Deep @./deeper.md content';
+    it("should respect max depth limit", async () => {
+      const content = "Content @./deep.md more content";
+      const basePath = testPath("test", "path");
+      const deepContent = "Deep @./deeper.md content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(deepContent);
@@ -231,34 +209,32 @@ describe('memoryImportProcessor', () => {
       const result = await processImports(content, basePath, true, importState);
 
       expect(debugLogger.warn).toHaveBeenCalledWith(
-        '[WARN] [ImportProcessor]',
-        'Maximum import depth (1) reached. Stopping import processing.',
+        "[WARN] [ImportProcessor]",
+        "Maximum import depth (1) reached. Stopping import processing.",
       );
       expect(result.content).toBe(content);
     });
 
-    it('should handle nested imports recursively', async () => {
-      const content = 'Main @./nested.md content';
-      const basePath = testPath('test', 'path');
-      const nestedContent = 'Nested @./inner.md content';
-      const innerContent = 'Inner content';
+    it("should handle nested imports recursively", async () => {
+      const content = "Main @./nested.md content";
+      const basePath = testPath("test", "path");
+      const nestedContent = "Nested @./inner.md content";
+      const innerContent = "Inner content";
 
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(nestedContent)
-        .mockResolvedValueOnce(innerContent);
+      mockedFs.readFile.mockResolvedValueOnce(nestedContent).mockResolvedValueOnce(innerContent);
 
       const result = await processImports(content, basePath, true);
 
-      expect(result.content).toContain('<!-- Imported from: ./nested.md -->');
-      expect(result.content).toContain('<!-- Imported from: ./inner.md -->');
+      expect(result.content).toContain("<!-- Imported from: ./nested.md -->");
+      expect(result.content).toContain("<!-- Imported from: ./inner.md -->");
       expect(result.content).toContain(innerContent);
     });
 
-    it('should handle absolute paths in imports', async () => {
-      const content = 'Content @/absolute/path/file.md more content';
-      const basePath = testPath('test', 'path');
-      const importedContent = 'Absolute path content';
+    it("should handle absolute paths in imports", async () => {
+      const content = "Content @/absolute/path/file.md more content";
+      const basePath = testPath("test", "path");
+      const importedContent = "Absolute path content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(importedContent);
@@ -266,53 +242,45 @@ describe('memoryImportProcessor', () => {
       const result = await processImports(content, basePath, true);
 
       expect(result.content).toContain(
-        '<!-- Import failed: /absolute/path/file.md - Path traversal attempt -->',
+        "<!-- Import failed: /absolute/path/file.md - Path traversal attempt -->",
       );
     });
 
-    it('should handle multiple imports in same content', async () => {
-      const content = 'Start @./first.md middle @./second.md end';
-      const basePath = testPath('test', 'path');
-      const firstContent = 'First content';
-      const secondContent = 'Second content';
+    it("should handle multiple imports in same content", async () => {
+      const content = "Start @./first.md middle @./second.md end";
+      const basePath = testPath("test", "path");
+      const firstContent = "First content";
+      const secondContent = "Second content";
 
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(firstContent)
-        .mockResolvedValueOnce(secondContent);
+      mockedFs.readFile.mockResolvedValueOnce(firstContent).mockResolvedValueOnce(secondContent);
 
       const result = await processImports(content, basePath, true);
 
-      expect(result.content).toContain('<!-- Imported from: ./first.md -->');
-      expect(result.content).toContain('<!-- Imported from: ./second.md -->');
+      expect(result.content).toContain("<!-- Imported from: ./first.md -->");
+      expect(result.content).toContain("<!-- Imported from: ./second.md -->");
       expect(result.content).toContain(firstContent);
       expect(result.content).toContain(secondContent);
     });
 
-    it('should ignore imports inside code blocks', async () => {
+    it("should ignore imports inside code blocks", async () => {
       const content = [
-        'Normal content @./should-import.md',
-        '```',
-        'code block with @./should-not-import.md',
-        '```',
-        'More content @./should-import2.md',
-      ].join('\n');
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedContent1 = 'Imported 1';
-      const importedContent2 = 'Imported 2';
+        "Normal content @./should-import.md",
+        "```",
+        "code block with @./should-not-import.md",
+        "```",
+        "More content @./should-import2.md",
+      ].join("\n");
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedContent1 = "Imported 1";
+      const importedContent2 = "Imported 2";
       // Only the imports outside code blocks should be processed
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
         .mockResolvedValueOnce(importedContent1)
         .mockResolvedValueOnce(importedContent2);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       // Use marked to verify imported content is present
       expect(result.content).toContain(importedContent1);
@@ -321,38 +289,30 @@ describe('memoryImportProcessor', () => {
       // Use marked to find code blocks and verify the import wasn't processed
       const codeBlocks = findCodeBlocks(result.content);
       const hasUnprocessedImport = codeBlocks.some((block) =>
-        block.content.includes('@./should-not-import.md'),
+        block.content.includes("@./should-not-import.md"),
       );
       expect(hasUnprocessedImport).toBe(true);
 
       // Verify no import comment was created for the code block import
       const comments = findMarkdownComments(result.content);
-      expect(comments.some((c) => c.includes('should-not-import.md'))).toBe(
-        false,
-      );
+      expect(comments.some((c) => c.includes("should-not-import.md"))).toBe(false);
     });
 
-    it('should ignore imports inside inline code', async () => {
+    it("should ignore imports inside inline code", async () => {
       const content = [
-        'Normal content @./should-import.md',
-        '`code with import @./should-not-import.md`',
-        'More content @./should-import2.md',
-      ].join('\n');
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedContent1 = 'Imported 1';
-      const importedContent2 = 'Imported 2';
+        "Normal content @./should-import.md",
+        "`code with import @./should-not-import.md`",
+        "More content @./should-import2.md",
+      ].join("\n");
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedContent1 = "Imported 1";
+      const importedContent2 = "Imported 2";
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
         .mockResolvedValueOnce(importedContent1)
         .mockResolvedValueOnce(importedContent2);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       // Verify imported content is present
       expect(result.content).toContain(importedContent1);
@@ -360,132 +320,96 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find inline code spans
       const codeBlocks = findCodeBlocks(result.content);
-      const inlineCodeSpans = codeBlocks.filter(
-        (block) => block.type === 'inline_code',
-      );
+      const inlineCodeSpans = codeBlocks.filter((block) => block.type === "inline_code");
 
       // Verify the inline code span still contains the unprocessed import
-      expect(
-        inlineCodeSpans.some((span) =>
-          span.content.includes('@./should-not-import.md'),
-        ),
-      ).toBe(true);
+      expect(inlineCodeSpans.some((span) => span.content.includes("@./should-not-import.md"))).toBe(
+        true,
+      );
 
       // Verify no import comments were created for inline code imports
       const comments = findMarkdownComments(result.content);
-      expect(comments.some((c) => c.includes('should-not-import.md'))).toBe(
-        false,
-      );
+      expect(comments.some((c) => c.includes("should-not-import.md"))).toBe(false);
     });
 
-    it('should handle nested tokens and non-unique content correctly', async () => {
+    it("should handle nested tokens and non-unique content correctly", async () => {
       // This test verifies the robust findCodeRegions implementation
       // that recursively walks the token tree and handles non-unique content
       const content = [
-        'Normal content @./should-import.md',
-        'Paragraph with `inline code @./should-not-import.md` and more text.',
-        'Another paragraph with the same `inline code @./should-not-import.md` text.',
-        'More content @./should-import2.md',
-      ].join('\n');
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedContent1 = 'Imported 1';
-      const importedContent2 = 'Imported 2';
+        "Normal content @./should-import.md",
+        "Paragraph with `inline code @./should-not-import.md` and more text.",
+        "Another paragraph with the same `inline code @./should-not-import.md` text.",
+        "More content @./should-import2.md",
+      ].join("\n");
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedContent1 = "Imported 1";
+      const importedContent2 = "Imported 2";
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
         .mockResolvedValueOnce(importedContent1)
         .mockResolvedValueOnce(importedContent2);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       // Should process imports outside code regions
       expect(result.content).toContain(importedContent1);
       expect(result.content).toContain(importedContent2);
 
       // Should preserve imports inside inline code (both occurrences)
-      expect(result.content).toContain('`inline code @./should-not-import.md`');
+      expect(result.content).toContain("`inline code @./should-not-import.md`");
 
       // Should not have processed the imports inside code regions
-      expect(result.content).not.toContain(
-        '<!-- Imported from: ./should-not-import.md -->',
-      );
+      expect(result.content).not.toContain("<!-- Imported from: ./should-not-import.md -->");
     });
 
-    it('should not process imports in repeated inline code blocks', async () => {
-      const content = '`@noimport` and `@noimport`';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
+    it("should not process imports in repeated inline code blocks", async () => {
+      const content = "`@noimport` and `@noimport`";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
 
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       expect(result.content).toBe(content);
     });
 
-    it('should not import when @ is inside an inline code block', async () => {
-      const content =
-        'We should not ` @import` when the symbol is inside an inline code string.';
-      const testRootDir = testPath('test', 'project');
+    it("should not import when @ is inside an inline code block", async () => {
+      const content = "We should not ` @import` when the symbol is inside an inline code string.";
+      const testRootDir = testPath("test", "project");
       const result = await processImports(content, testRootDir);
       expect(result.content).toBe(content);
       expect(result.importTree.imports).toBeUndefined();
     });
 
-    it('should allow imports from parent and subdirectories within project root', async () => {
-      const content =
-        'Parent import: @../parent.md Subdir import: @./components/sub.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedParent = 'Parent file content';
-      const importedSub = 'Subdir file content';
+    it("should allow imports from parent and subdirectories within project root", async () => {
+      const content = "Parent import: @../parent.md Subdir import: @./components/sub.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedParent = "Parent file content";
+      const importedSub = "Subdir file content";
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(importedParent)
-        .mockResolvedValueOnce(importedSub);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      mockedFs.readFile.mockResolvedValueOnce(importedParent).mockResolvedValueOnce(importedSub);
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
       expect(result.content).toContain(importedParent);
       expect(result.content).toContain(importedSub);
     });
 
-    it('should reject imports outside project root', async () => {
-      const content = 'Outside import: @../../../etc/passwd';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+    it("should reject imports outside project root", async () => {
+      const content = "Outside import: @../../../etc/passwd";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
       expect(result.content).toContain(
-        '<!-- Import failed: ../../../etc/passwd - Path traversal attempt -->',
+        "<!-- Import failed: ../../../etc/passwd - Path traversal attempt -->",
       );
     });
 
-    it('should build import tree structure', async () => {
-      const content = 'Main content @./nested.md @./simple.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const nestedContent = 'Nested @./inner.md content';
-      const simpleContent = 'Simple content';
-      const innerContent = 'Inner content';
+    it("should build import tree structure", async () => {
+      const content = "Main content @./nested.md @./simple.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const nestedContent = "Nested @./inner.md content";
+      const simpleContent = "Simple content";
+      const innerContent = "Inner content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
@@ -497,13 +421,11 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find and validate import comments
       const comments = findMarkdownComments(result.content);
-      const importComments = comments.filter((c) =>
-        c.includes('Imported from:'),
-      );
+      const importComments = comments.filter((c) => c.includes("Imported from:"));
 
-      expect(importComments.some((c) => c.includes('./nested.md'))).toBe(true);
-      expect(importComments.some((c) => c.includes('./simple.md'))).toBe(true);
-      expect(importComments.some((c) => c.includes('./inner.md'))).toBe(true);
+      expect(importComments.some((c) => c.includes("./nested.md"))).toBe(true);
+      expect(importComments.some((c) => c.includes("./simple.md"))).toBe(true);
+      expect(importComments.some((c) => c.includes("./inner.md"))).toBe(true);
 
       // Use marked to validate the markdown structure is well-formed
       const tokens = parseMarkdown(result.content);
@@ -512,45 +434,43 @@ describe('memoryImportProcessor', () => {
 
       // Verify the content contains expected text using marked parsing
       const textContent = tokens
-        .filter((token) => token.type === 'paragraph')
+        .filter((token) => token.type === "paragraph")
         .map((token) => token.raw)
-        .join(' ');
+        .join(" ");
 
-      expect(textContent).toContain('Main content');
-      expect(textContent).toContain('Nested');
-      expect(textContent).toContain('Simple content');
-      expect(textContent).toContain('Inner content');
+      expect(textContent).toContain("Main content");
+      expect(textContent).toContain("Nested");
+      expect(textContent).toContain("Simple content");
+      expect(textContent).toContain("Inner content");
 
       // Verify import tree structure
-      expect(result.importTree.path).toBe('unknown'); // No currentFile set in test
+      expect(result.importTree.path).toBe("unknown"); // No currentFile set in test
       expect(result.importTree.imports).toHaveLength(2);
 
       // First import: nested.md
       // Check that the paths match using includes to handle potential absolute/relative differences
-      const expectedNestedPath = testPath(projectRoot, 'src', 'nested.md');
+      const expectedNestedPath = testPath(projectRoot, "src", "nested.md");
 
       expect(result.importTree.imports![0].path).toContain(expectedNestedPath);
       expect(result.importTree.imports![0].imports).toHaveLength(1);
 
-      const expectedInnerPath = testPath(projectRoot, 'src', 'inner.md');
-      expect(result.importTree.imports![0].imports![0].path).toContain(
-        expectedInnerPath,
-      );
+      const expectedInnerPath = testPath(projectRoot, "src", "inner.md");
+      expect(result.importTree.imports![0].imports![0].path).toContain(expectedInnerPath);
       expect(result.importTree.imports![0].imports![0].imports).toBeUndefined();
 
       // Second import: simple.md
-      const expectedSimplePath = testPath(projectRoot, 'src', 'simple.md');
+      const expectedSimplePath = testPath(projectRoot, "src", "simple.md");
       expect(result.importTree.imports![1].path).toContain(expectedSimplePath);
       expect(result.importTree.imports![1].imports).toBeUndefined();
     });
 
-    it('should produce flat output in Claude-style with unique files in order', async () => {
-      const content = 'Main @./nested.md content @./simple.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const nestedContent = 'Nested @./inner.md content';
-      const simpleContent = 'Simple content';
-      const innerContent = 'Inner content';
+    it("should produce flat output in Claude-style with unique files in order", async () => {
+      const content = "Main @./nested.md content @./simple.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const nestedContent = "Nested @./inner.md content";
+      const simpleContent = "Simple content";
+      const innerContent = "Inner content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
@@ -558,14 +478,7 @@ describe('memoryImportProcessor', () => {
         .mockResolvedValueOnce(simpleContent)
         .mockResolvedValueOnce(innerContent);
 
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-        'flat',
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot, "flat");
 
       // Use marked to parse the output and validate structure
       const tokens = parseMarkdown(result.content);
@@ -578,14 +491,14 @@ describe('memoryImportProcessor', () => {
       function walkTokens(tokenList: unknown[]) {
         for (const token of tokenList) {
           const t = token as { type: string; raw: string; tokens?: unknown[] };
-          if (t.type === 'paragraph' && t.raw.includes('--- File:')) {
+          if (t.type === "paragraph" && t.raw.includes("--- File:")) {
             const match = t.raw.match(/--- File: (.+?) ---/);
             if (match) {
               // Normalize the path before adding to fileMarkers
               fileMarkers.push(path.normalize(match[1]));
             }
           }
-          if (t.type === 'paragraph' && t.raw.includes('--- End of File:')) {
+          if (t.type === "paragraph" && t.raw.includes("--- End of File:")) {
             const match = t.raw.match(/--- End of File: (.+?) ---/);
             if (match) {
               // Normalize the path before adding to endMarkers
@@ -601,7 +514,7 @@ describe('memoryImportProcessor', () => {
       walkTokens(tokens);
 
       // Verify all expected files are present
-      const expectedFiles = ['nested.md', 'simple.md', 'inner.md'];
+      const expectedFiles = ["nested.md", "simple.md", "inner.md"];
 
       // Check that each expected file is present in the content
       expectedFiles.forEach((file) => {
@@ -609,22 +522,20 @@ describe('memoryImportProcessor', () => {
       });
 
       // Verify content is present
-      expect(result.content).toContain(
-        'Main @./nested.md content @./simple.md',
-      );
-      expect(result.content).toContain('Nested @./inner.md content');
-      expect(result.content).toContain('Simple content');
-      expect(result.content).toContain('Inner content');
+      expect(result.content).toContain("Main @./nested.md content @./simple.md");
+      expect(result.content).toContain("Nested @./inner.md content");
+      expect(result.content).toContain("Simple content");
+      expect(result.content).toContain("Inner content");
 
       // Verify end markers exist
       expect(endMarkers.length).toBeGreaterThan(0);
     });
 
-    it('should not duplicate files in flat output if imported multiple times', async () => {
-      const content = 'Main @./dup.md again @./dup.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const dupContent = 'Duplicated content';
+    it("should not duplicate files in flat output if imported multiple times", async () => {
+      const content = "Main @./dup.md again @./dup.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const dupContent = "Duplicated content";
 
       // Reset mocks
       mockedFs.access.mockReset();
@@ -640,7 +551,7 @@ describe('memoryImportProcessor', () => {
         true, // followImports
         undefined, // allowedPaths
         projectRoot,
-        'flat', // outputFormat
+        "flat", // outputFormat
       );
 
       // Verify readFile was called only once for dup.md
@@ -648,78 +559,61 @@ describe('memoryImportProcessor', () => {
 
       // Check that the content contains the file content only once
       const contentStr = result.content;
-      const firstIndex = contentStr.indexOf('Duplicated content');
-      const lastIndex = contentStr.lastIndexOf('Duplicated content');
+      const firstIndex = contentStr.indexOf("Duplicated content");
+      const lastIndex = contentStr.lastIndexOf("Duplicated content");
       expect(firstIndex).toBeGreaterThan(-1); // Content should exist
       expect(firstIndex).toBe(lastIndex); // Should only appear once
     });
 
-    it('should handle nested imports in flat output', async () => {
-      const content = 'Root @./a.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const aContent = 'A @./b.md';
-      const bContent = 'B content';
+    it("should handle nested imports in flat output", async () => {
+      const content = "Root @./a.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const aContent = "A @./b.md";
+      const bContent = "B content";
 
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(aContent)
-        .mockResolvedValueOnce(bContent);
+      mockedFs.readFile.mockResolvedValueOnce(aContent).mockResolvedValueOnce(bContent);
 
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-        'flat',
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot, "flat");
 
       // Verify all files are present by checking for their basenames
-      expect(result.content).toContain('a.md');
-      expect(result.content).toContain('b.md');
+      expect(result.content).toContain("a.md");
+      expect(result.content).toContain("b.md");
 
       // Verify content is in the correct order
       const contentStr = result.content;
-      const aIndex = contentStr.indexOf('a.md');
-      const bIndex = contentStr.indexOf('b.md');
-      const rootIndex = contentStr.indexOf('Root @./a.md');
+      const aIndex = contentStr.indexOf("a.md");
+      const bIndex = contentStr.indexOf("b.md");
+      const rootIndex = contentStr.indexOf("Root @./a.md");
 
       expect(rootIndex).toBeLessThan(aIndex);
       expect(aIndex).toBeLessThan(bIndex);
 
       // Verify content is present
-      expect(result.content).toContain('Root @./a.md');
-      expect(result.content).toContain('A @./b.md');
-      expect(result.content).toContain('B content');
+      expect(result.content).toContain("Root @./a.md");
+      expect(result.content).toContain("A @./b.md");
+      expect(result.content).toContain("B content");
     });
   });
 
-  describe('validateImportPath', () => {
-    it('should reject URLs', () => {
-      const basePath = testPath('base');
-      const allowedPath = testPath('allowed');
-      expect(
-        validateImportPath('https://example.com/file.md', basePath, [
-          allowedPath,
-        ]),
-      ).toBe(false);
-      expect(
-        validateImportPath('http://example.com/file.md', basePath, [
-          allowedPath,
-        ]),
-      ).toBe(false);
-      expect(
-        validateImportPath('file:///path/to/file.md', basePath, [allowedPath]),
-      ).toBe(false);
+  describe("validateImportPath", () => {
+    it("should reject URLs", () => {
+      const basePath = testPath("base");
+      const allowedPath = testPath("allowed");
+      expect(validateImportPath("https://example.com/file.md", basePath, [allowedPath])).toBe(
+        false,
+      );
+      expect(validateImportPath("http://example.com/file.md", basePath, [allowedPath])).toBe(false);
+      expect(validateImportPath("file:///path/to/file.md", basePath, [allowedPath])).toBe(false);
     });
 
-    it('should allow paths within allowed directories', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowedPath = path.resolve(testPath('allowed'));
+    it("should allow paths within allowed directories", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowedPath = path.resolve(testPath("allowed"));
 
       // Test relative paths - resolve them against basePath
-      const relativePath = './file.md';
+      const relativePath = "./file.md";
       path.resolve(basePath, relativePath);
       expect(validateImportPath(relativePath, basePath, [basePath])).toBe(true);
 
@@ -727,144 +621,106 @@ describe('memoryImportProcessor', () => {
       const parentPath = path.dirname(basePath);
       if (parentPath !== basePath) {
         // Only test if parent is different
-        const parentRelativePath = '../file.md';
+        const parentRelativePath = "../file.md";
         path.resolve(basePath, parentRelativePath);
-        expect(
-          validateImportPath(parentRelativePath, basePath, [parentPath]),
-        ).toBe(true);
+        expect(validateImportPath(parentRelativePath, basePath, [parentPath])).toBe(true);
 
-        path.resolve(basePath, 'sub');
-        const resultSub = validateImportPath('sub', basePath, [basePath]);
+        path.resolve(basePath, "sub");
+        const resultSub = validateImportPath("sub", basePath, [basePath]);
         expect(resultSub).toBe(true);
       }
 
       // Test allowed path access - use a file within the allowed directory
-      const allowedSubPath = 'nested';
-      const allowedFilePath = path.join(allowedPath, allowedSubPath, 'file.md');
-      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(
-        true,
-      );
+      const allowedSubPath = "nested";
+      const allowedFilePath = path.join(allowedPath, allowedSubPath, "file.md");
+      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(true);
     });
 
-    it('should reject paths outside allowed directories', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowedPath = path.resolve(testPath('allowed'));
-      const forbiddenPath = path.resolve(testPath('forbidden'));
+    it("should reject paths outside allowed directories", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowedPath = path.resolve(testPath("allowed"));
+      const forbiddenPath = path.resolve(testPath("forbidden"));
 
       // Forbidden path should be blocked
-      expect(validateImportPath(forbiddenPath, basePath, [allowedPath])).toBe(
-        false,
-      );
+      expect(validateImportPath(forbiddenPath, basePath, [allowedPath])).toBe(false);
 
       // Relative path to forbidden directory should be blocked
-      const relativeToForbidden = path.relative(
-        basePath,
-        path.join(forbiddenPath, 'file.md'),
-      );
-      expect(
-        validateImportPath(relativeToForbidden, basePath, [allowedPath]),
-      ).toBe(false);
+      const relativeToForbidden = path.relative(basePath, path.join(forbiddenPath, "file.md"));
+      expect(validateImportPath(relativeToForbidden, basePath, [allowedPath])).toBe(false);
 
       // Path that tries to escape the base directory should be blocked
-      const escapingPath = path.join('..', '..', 'sensitive', 'file.md');
-      expect(validateImportPath(escapingPath, basePath, [basePath])).toBe(
-        false,
-      );
+      const escapingPath = path.join("..", "..", "sensitive", "file.md");
+      expect(validateImportPath(escapingPath, basePath, [basePath])).toBe(false);
     });
 
-    it('should handle multiple allowed directories', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowed1 = path.resolve(testPath('allowed1'));
-      const allowed2 = path.resolve(testPath('allowed2'));
+    it("should handle multiple allowed directories", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowed1 = path.resolve(testPath("allowed1"));
+      const allowed2 = path.resolve(testPath("allowed2"));
 
       // File not in any allowed path
-      const otherPath = path.resolve(testPath('other', 'file.md'));
-      expect(
-        validateImportPath(otherPath, basePath, [allowed1, allowed2]),
-      ).toBe(false);
+      const otherPath = path.resolve(testPath("other", "file.md"));
+      expect(validateImportPath(otherPath, basePath, [allowed1, allowed2])).toBe(false);
 
       // File in first allowed path
-      const file1 = path.join(allowed1, 'nested', 'file.md');
-      expect(validateImportPath(file1, basePath, [allowed1, allowed2])).toBe(
-        true,
-      );
+      const file1 = path.join(allowed1, "nested", "file.md");
+      expect(validateImportPath(file1, basePath, [allowed1, allowed2])).toBe(true);
 
       // File in second allowed path
-      const file2 = path.join(allowed2, 'nested', 'file.md');
-      expect(validateImportPath(file2, basePath, [allowed1, allowed2])).toBe(
-        true,
-      );
+      const file2 = path.join(allowed2, "nested", "file.md");
+      expect(validateImportPath(file2, basePath, [allowed1, allowed2])).toBe(true);
 
       // Test with relative path to allowed directory
       const relativeToAllowed1 = path.relative(basePath, file1);
-      expect(
-        validateImportPath(relativeToAllowed1, basePath, [allowed1, allowed2]),
-      ).toBe(true);
+      expect(validateImportPath(relativeToAllowed1, basePath, [allowed1, allowed2])).toBe(true);
     });
 
-    it('should handle relative paths correctly', () => {
-      const basePath = path.resolve(testPath('base'));
-      const parentPath = path.resolve(testPath('parent'));
+    it("should handle relative paths correctly", () => {
+      const basePath = path.resolve(testPath("base"));
+      const parentPath = path.resolve(testPath("parent"));
 
       // Current directory file access
-      expect(validateImportPath('file.md', basePath, [basePath])).toBe(true);
+      expect(validateImportPath("file.md", basePath, [basePath])).toBe(true);
 
       // Explicit current directory file access
-      expect(validateImportPath('./file.md', basePath, [basePath])).toBe(true);
+      expect(validateImportPath("./file.md", basePath, [basePath])).toBe(true);
 
       // Parent directory access - should be blocked unless parent is in allowed paths
-      const parentFile = path.join(parentPath, 'file.md');
+      const parentFile = path.join(parentPath, "file.md");
       const relativeToParent = path.relative(basePath, parentFile);
-      expect(validateImportPath(relativeToParent, basePath, [basePath])).toBe(
-        false,
-      );
+      expect(validateImportPath(relativeToParent, basePath, [basePath])).toBe(false);
 
       // Parent directory access when parent is in allowed paths
-      expect(
-        validateImportPath(relativeToParent, basePath, [basePath, parentPath]),
-      ).toBe(true);
+      expect(validateImportPath(relativeToParent, basePath, [basePath, parentPath])).toBe(true);
 
       // Nested relative path
-      const nestedPath = path.join('nested', 'sub', 'file.md');
+      const nestedPath = path.join("nested", "sub", "file.md");
       expect(validateImportPath(nestedPath, basePath, [basePath])).toBe(true);
     });
 
-    it('should handle absolute paths correctly', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowedPath = path.resolve(testPath('allowed'));
-      const forbiddenPath = path.resolve(testPath('forbidden'));
+    it("should handle absolute paths correctly", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowedPath = path.resolve(testPath("allowed"));
+      const forbiddenPath = path.resolve(testPath("forbidden"));
 
       // Allowed path should work - file directly in allowed directory
-      const allowedFilePath = path.join(allowedPath, 'file.md');
-      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(
-        true,
-      );
+      const allowedFilePath = path.join(allowedPath, "file.md");
+      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(true);
 
       // Allowed path should work - file in subdirectory of allowed directory
-      const allowedNestedPath = path.join(allowedPath, 'nested', 'file.md');
-      expect(
-        validateImportPath(allowedNestedPath, basePath, [allowedPath]),
-      ).toBe(true);
+      const allowedNestedPath = path.join(allowedPath, "nested", "file.md");
+      expect(validateImportPath(allowedNestedPath, basePath, [allowedPath])).toBe(true);
 
       // Forbidden path should be blocked
-      const forbiddenFilePath = path.join(forbiddenPath, 'file.md');
-      expect(
-        validateImportPath(forbiddenFilePath, basePath, [allowedPath]),
-      ).toBe(false);
+      const forbiddenFilePath = path.join(forbiddenPath, "file.md");
+      expect(validateImportPath(forbiddenFilePath, basePath, [allowedPath])).toBe(false);
 
       // Relative path to allowed directory should work
       const relativeToAllowed = path.relative(basePath, allowedFilePath);
-      expect(
-        validateImportPath(relativeToAllowed, basePath, [allowedPath]),
-      ).toBe(true);
+      expect(validateImportPath(relativeToAllowed, basePath, [allowedPath])).toBe(true);
 
       // Path that resolves to the same file but via different relative segments
-      const dotPath = path.join(
-        '.',
-        '..',
-        path.basename(allowedPath),
-        'file.md',
-      );
+      const dotPath = path.join(".", "..", path.basename(allowedPath), "file.md");
       expect(validateImportPath(dotPath, basePath, [allowedPath])).toBe(true);
     });
   });
diff --git a/packages/gemini-cli-core/src/utils/memoryImportProcessor.ts b/packages/gemini-cli-core/src/utils/memoryImportProcessor.ts
index 9b808926c..354ee29d8 100644
--- a/packages/gemini-cli-core/src/utils/memoryImportProcessor.ts
+++ b/packages/gemini-cli-core/src/utils/memoryImportProcessor.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isSubpath } from './paths.js';
-import { marked, type Token } from 'marked';
-import { debugLogger } from './debugLogger.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { marked, type Token } from "marked";
+import { debugLogger } from "./debugLogger.js";
+import { isSubpath } from "./paths.js";
 
 // Simple console logger for import processing
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) =>
-    debugLogger.debug('[DEBUG] [ImportProcessor]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [ImportProcessor]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  warn: (...args: any[]) =>
-    debugLogger.warn('[WARN] [ImportProcessor]', ...args),
+  warn: (...args: any[]) => debugLogger.warn("[WARN] [ImportProcessor]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: (...args: any[]) =>
-    debugLogger.error('[ERROR] [ImportProcessor]', ...args),
+  error: (...args: any[]) => debugLogger.error("[ERROR] [ImportProcessor]", ...args),
 };
 
 /**
@@ -53,7 +50,7 @@ export interface ProcessImportsResult {
 async function findProjectRoot(startDir: string): Promise<string> {
   let currentDir = path.resolve(startDir);
   while (true) {
-    const gitPath = path.join(currentDir, '.git');
+    const gitPath = path.join(currentDir, ".git");
     try {
       const stats = await fs.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -76,10 +73,10 @@ async function findProjectRoot(startDir: string): Promise<string> {
 // Add a type guard for error objects
 function hasMessage(err: unknown): err is { message: string } {
   return (
-    typeof err === 'object' &&
+    typeof err === "object" &&
     err !== null &&
-    'message' in err &&
-    typeof (err as { message: unknown }).message === 'string'
+    "message" in err &&
+    typeof (err as { message: unknown }).message === "string"
   );
 }
 
@@ -88,16 +85,14 @@ function hasMessage(err: unknown): err is { message: string } {
  * Finds all import statements in content without using regex
  * @returns Array of {start, _end, path} objects for each import found
  */
-function findImports(
-  content: string,
-): Array<{ start: number; _end: number; path: string }> {
+function findImports(content: string): Array<{ start: number; _end: number; path: string }> {
   const imports: Array<{ start: number; _end: number; path: string }> = [];
   let i = 0;
   const len = content.length;
 
   while (i < len) {
     // Find next @ symbol
-    i = content.indexOf('@', i);
+    i = content.indexOf("@", i);
     if (i === -1) break;
 
     // Check if it's a word boundary (not part of another word)
@@ -108,12 +103,7 @@ function findImports(
 
     // Find the end of the import path (whitespace or newline)
     let j = i + 1;
-    while (
-      j < len &&
-      !isWhitespace(content[j]) &&
-      content[j] !== '\n' &&
-      content[j] !== '\r'
-    ) {
+    while (j < len && !isWhitespace(content[j]) && content[j] !== "\n" && content[j] !== "\r") {
       j++;
     }
 
@@ -123,9 +113,7 @@ function findImports(
     // Basic validation (starts with ./ or / or letter)
     if (
       importPath.length > 0 &&
-      (importPath[0] === '.' ||
-        importPath[0] === '/' ||
-        isLetter(importPath[0]))
+      (importPath[0] === "." || importPath[0] === "/" || isLetter(importPath[0]))
     ) {
       imports.push({
         start: i,
@@ -141,7 +129,7 @@ function findImports(
 }
 
 function isWhitespace(char: string): boolean {
-  return char === ' ' || char === '\t' || char === '\n' || char === '\r';
+  return char === " " || char === "\t" || char === "\n" || char === "\r";
 }
 
 function isLetter(char: string): boolean {
@@ -158,11 +146,11 @@ function findCodeRegions(content: string): Array<[number, number]> {
   let offset = 0;
 
   function walk(token: Token, baseOffset: number) {
-    if (token.type === 'code' || token.type === 'codespan') {
+    if (token.type === "code" || token.type === "codespan") {
       regions.push([baseOffset, baseOffset + token.raw.length]);
     }
 
-    if ('tokens' in token && token.tokens) {
+    if ("tokens" in token && token.tokens) {
       let childOffset = 0;
       for (const child of token.tokens) {
         const childIndexInParent = token.raw.indexOf(child.raw, childOffset);
@@ -207,7 +195,7 @@ export async function processImports(
     currentDepth: 0,
   },
   projectRoot?: string,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
 ): Promise<ProcessImportsResult> {
   if (!projectRoot) {
     projectRoot = await findProjectRoot(basePath);
@@ -221,12 +209,12 @@ export async function processImports(
     }
     return {
       content,
-      importTree: { path: importState.currentFile || 'unknown' },
+      importTree: { path: importState.currentFile || "unknown" },
     };
   }
 
   // --- FLAT FORMAT LOGIC ---
-  if (importFormat === 'flat') {
+  if (importFormat === "flat") {
     // Use a queue to process files in order of first encounter, and a set to avoid duplicates
     const flatFiles: Array<{ path: string; content: string }> = [];
     // Track processed files across the entire operation
@@ -261,18 +249,13 @@ export async function processImports(
 
         // Skip if inside a code region
         if (
-          codeRegions.some(
-            ([regionStart, regionEnd]) =>
-              start >= regionStart && start < regionEnd,
-          )
+          codeRegions.some(([regionStart, regionEnd]) => start >= regionStart && start < regionEnd)
         ) {
           continue;
         }
 
         // Validate import path
-        if (
-          !validateImportPath(importPath, fileBasePath, [projectRoot || ''])
-        ) {
+        if (!validateImportPath(importPath, fileBasePath, [projectRoot || ""])) {
           continue;
         }
 
@@ -284,19 +267,14 @@ export async function processImports(
 
         try {
           await fs.access(fullPath);
-          const importedContent = await fs.readFile(fullPath, 'utf-8');
+          const importedContent = await fs.readFile(fullPath, "utf-8");
 
           // Process the imported file
-          await processFlat(
-            importedContent,
-            path.dirname(fullPath),
-            normalizedFullPath,
-            depth + 1,
-          );
+          await processFlat(importedContent, path.dirname(fullPath), normalizedFullPath, depth + 1);
         } catch (error) {
           if (debugMode) {
             logger.warn(
-              `Failed to import ${fullPath}: ${hasMessage(error) ? error.message : 'Unknown error'}`,
+              `Failed to import ${fullPath}: ${hasMessage(error) ? error.message : "Unknown error"}`,
             );
           }
           // Continue with other imports even if one fails
@@ -305,18 +283,13 @@ export async function processImports(
     }
 
     // Start with the root file (current file)
-    const rootPath = path.normalize(
-      importState.currentFile || path.resolve(basePath),
-    );
+    const rootPath = path.normalize(importState.currentFile || path.resolve(basePath));
     await processFlat(content, basePath, rootPath, 0);
 
     // Concatenate all unique files in order, Claude-style
     const flatContent = flatFiles
-      .map(
-        (f) =>
-          `--- File: ${f.path} ---\n${f.content.trim()}\n--- End of File: ${f.path} ---`,
-      )
-      .join('\n\n');
+      .map((f) => `--- File: ${f.path} ---\n${f.content.trim()}\n--- End of File: ${f.path} ---`)
+      .join("\n\n");
 
     return {
       content: flatContent,
@@ -326,7 +299,7 @@ export async function processImports(
 
   // --- TREE FORMAT LOGIC (existing) ---
   const codeRegions = findCodeRegions(content);
-  let result = '';
+  let result = "";
   let lastIndex = 0;
   const imports: MemoryFile[] = [];
   const importsList = findImports(content);
@@ -342,7 +315,7 @@ export async function processImports(
       continue;
     }
     // Validate import path to prevent path traversal attacks
-    if (!validateImportPath(importPath, basePath, [projectRoot || ''])) {
+    if (!validateImportPath(importPath, basePath, [projectRoot || ""])) {
       result += `<!-- Import failed: ${importPath} - Path traversal attempt -->`;
       continue;
     }
@@ -353,7 +326,7 @@ export async function processImports(
     }
     try {
       await fs.access(fullPath);
-      const fileContent = await fs.readFile(fullPath, 'utf-8');
+      const fileContent = await fs.readFile(fullPath, "utf-8");
       // Mark this file as processed for this import chain
       const newImportState: ImportState = {
         ...importState,
@@ -373,10 +346,10 @@ export async function processImports(
       result += `<!-- Imported from: ${importPath} -->\n${imported.content}\n<!-- End of import from: ${importPath} -->`;
       imports.push(imported.importTree);
     } catch (err: unknown) {
-      let message = 'Unknown error';
+      let message = "Unknown error";
       if (hasMessage(err)) {
         message = err.message;
-      } else if (typeof err === 'string') {
+      } else if (typeof err === "string") {
         message = err;
       }
       logger.error(`Failed to import ${importPath}: ${message}`);
@@ -389,7 +362,7 @@ export async function processImports(
   return {
     content: result,
     importTree: {
-      path: importState.currentFile || 'unknown',
+      path: importState.currentFile || "unknown",
       imports: imports.length > 0 ? imports : undefined,
     },
   };
@@ -407,7 +380,5 @@ export function validateImportPath(
 
   const resolvedPath = path.resolve(basePath, importPath);
 
-  return allowedDirectories.some((allowedDir) =>
-    isSubpath(allowedDir, resolvedPath),
-  );
+  return allowedDirectories.some((allowedDir) => isSubpath(allowedDir, resolvedPath));
 }
diff --git a/packages/gemini-cli-core/src/utils/messageInspectors.ts b/packages/gemini-cli-core/src/utils/messageInspectors.ts
index 9a7709469..3150ea0e6 100644
--- a/packages/gemini-cli-core/src/utils/messageInspectors.ts
+++ b/packages/gemini-cli-core/src/utils/messageInspectors.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
+import type { Content } from "@google/genai";
 
 export function isFunctionResponse(content: Content): boolean {
   return (
-    content.role === 'user' &&
+    content.role === "user" &&
     !!content.parts &&
     content.parts.every((part) => !!part.functionResponse)
   );
@@ -16,7 +16,7 @@ export function isFunctionResponse(content: Content): boolean {
 
 export function isFunctionCall(content: Content): boolean {
   return (
-    content.role === 'model' &&
+    content.role === "model" &&
     !!content.parts &&
     content.parts.every((part) => !!part.functionCall)
   );
diff --git a/packages/gemini-cli-core/src/utils/nextSpeakerChecker.test.ts b/packages/gemini-cli-core/src/utils/nextSpeakerChecker.test.ts
index fbf3bb8b9..0f80afbc8 100644
--- a/packages/gemini-cli-core/src/utils/nextSpeakerChecker.test.ts
+++ b/packages/gemini-cli-core/src/utils/nextSpeakerChecker.test.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Content } from '@google/genai';
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import type { Config } from '../config/config.js';
-import type { NextSpeakerResponse } from './nextSpeakerChecker.js';
-import { checkNextSpeaker } from './nextSpeakerChecker.js';
-import { GeminiChat } from '../core/geminiChat.js';
+import type { Content } from "@google/genai";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { GeminiChat } from "../core/geminiChat.js";
+import type { NextSpeakerResponse } from "./nextSpeakerChecker.js";
+import { checkNextSpeaker } from "./nextSpeakerChecker.js";
 
 // Mock fs module to prevent actual file system operations during tests
 const mockFileSystem = new Map<string, string>();
 
-vi.mock('node:fs', () => {
+vi.mock("node:fs", () => {
   const fsModule = {
     mkdirSync: vi.fn(),
     writeFileSync: vi.fn((path: string, data: string) => {
@@ -27,8 +27,8 @@ vi.mock('node:fs', () => {
       if (mockFileSystem.has(path)) {
         return mockFileSystem.get(path);
       }
-      throw Object.assign(new Error('ENOENT: no such file or directory'), {
-        code: 'ENOENT',
+      throw Object.assign(new Error("ENOENT: no such file or directory"), {
+        code: "ENOENT",
       });
     }),
     existsSync: vi.fn((path: string) => mockFileSystem.has(path)),
@@ -45,28 +45,28 @@ vi.mock('node:fs', () => {
 });
 
 // Mock GeminiClient and Config constructor
-vi.mock('../core/baseLlmClient.js');
-vi.mock('../config/config.js');
+vi.mock("../core/baseLlmClient.js");
+vi.mock("../config/config.js");
 
-describe('checkNextSpeaker', () => {
+describe("checkNextSpeaker", () => {
   let chatInstance: GeminiChat;
   let mockConfig: Config;
   let mockBaseLlmClient: BaseLlmClient;
   const abortSignal = new AbortController().signal;
-  const promptId = 'test-prompt-id';
+  const promptId = "test-prompt-id";
 
   beforeEach(() => {
     vi.resetAllMocks();
     const mockResolvedConfig = {
-      model: 'next-speaker-v1',
+      model: "next-speaker-v1",
       generateContentConfig: {},
     };
     mockConfig = {
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getModel: () => 'test-model',
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
+      getModel: () => "test-model",
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/temp"),
       },
       modelConfigService: {
         getResolvedConfig: vi.fn().mockReturnValue(mockResolvedConfig),
@@ -86,198 +86,143 @@ describe('checkNextSpeaker', () => {
     // GeminiChat will receive the mocked instances via the mocked GoogleGenAI constructor
     chatInstance = new GeminiChat(
       mockConfig,
-      '', // empty system instruction
+      "", // empty system instruction
       [], // no tools
       [], // initial history
     );
 
     // Spy on getHistory for chatInstance
-    vi.spyOn(chatInstance, 'getHistory');
+    vi.spyOn(chatInstance, "getHistory");
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should return null if history is empty', async () => {
+  it("should return null if history is empty", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([]);
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
-  it('should return null if the last speaker was the user', async () => {
+  it("should return null if the last speaker was the user", async () => {
     vi.mocked(chatInstance.getHistory).mockReturnValue([
-      { role: 'user', parts: [{ text: 'Hello' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
     ]);
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
   it("should return { next_speaker: 'model' } when model intends to continue", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'I will now do something.' }] },
+      { role: "model", parts: [{ text: "I will now do something." }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model stated it will do something.',
-      next_speaker: 'model',
+      reasoning: "Model stated it will do something.",
+      next_speaker: "model",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toEqual(mockApiResponse);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
   });
 
   it("should return { next_speaker: 'user' } when model asks a question", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'What would you like to do?' }] },
+      { role: "model", parts: [{ text: "What would you like to do?" }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model asked a question.',
-      next_speaker: 'user',
+      reasoning: "Model asked a question.",
+      next_speaker: "user",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toEqual(mockApiResponse);
   });
 
   it("should return { next_speaker: 'user' } when model makes a statement", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'This is a statement.' }] },
+      { role: "model", parts: [{ text: "This is a statement." }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model made a statement, awaiting user input.',
-      next_speaker: 'user',
+      reasoning: "Model made a statement, awaiting user input.",
+      next_speaker: "user",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toEqual(mockApiResponse);
   });
 
-  it('should return null if baseLlmClient.generateJson throws an error', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(console, 'warn')
-      .mockImplementation(() => {});
+  it("should return null if baseLlmClient.generateJson throws an error", async () => {
+    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
-    (mockBaseLlmClient.generateJson as Mock).mockRejectedValue(
-      new Error('API Error'),
-    );
+    (mockBaseLlmClient.generateJson as Mock).mockRejectedValue(new Error("API Error"));
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
     consoleWarnSpy.mockRestore();
   });
 
-  it('should return null if baseLlmClient.generateJson returns invalid JSON (missing next_speaker)', async () => {
+  it("should return null if baseLlmClient.generateJson returns invalid JSON (missing next_speaker)", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue({
-      reasoning: 'This is incomplete.',
+      reasoning: "This is incomplete.",
     } as unknown as NextSpeakerResponse); // Type assertion to simulate invalid response
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
   });
 
-  it('should return null if baseLlmClient.generateJson returns a non-string next_speaker', async () => {
+  it("should return null if baseLlmClient.generateJson returns a non-string next_speaker", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue({
-      reasoning: 'Model made a statement, awaiting user input.',
+      reasoning: "Model made a statement, awaiting user input.",
       next_speaker: 123, // Invalid type
     } as unknown as NextSpeakerResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
   });
 
-  it('should return null if baseLlmClient.generateJson returns an invalid next_speaker string value', async () => {
+  it("should return null if baseLlmClient.generateJson returns an invalid next_speaker string value", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue({
-      reasoning: 'Model made a statement, awaiting user input.',
-      next_speaker: 'neither', // Invalid enum value
+      reasoning: "Model made a statement, awaiting user input.",
+      next_speaker: "neither", // Invalid enum value
     } as unknown as NextSpeakerResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
   });
 
-  it('should call generateJson with the correct parameters', async () => {
+  it("should call generateJson with the correct parameters", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model made a statement, awaiting user input.',
-      next_speaker: 'user',
+      reasoning: "Model made a statement, awaiting user input.",
+      next_speaker: "user",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalled();
-    const generateJsonCall = (mockBaseLlmClient.generateJson as Mock).mock
-      .calls[0][0];
-    expect(generateJsonCall.modelConfigKey.model).toBe('next-speaker-checker');
+    const generateJsonCall = (mockBaseLlmClient.generateJson as Mock).mock.calls[0][0];
+    expect(generateJsonCall.modelConfigKey.model).toBe("next-speaker-checker");
     expect(generateJsonCall.promptId).toBe(promptId);
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/nextSpeakerChecker.ts b/packages/gemini-cli-core/src/utils/nextSpeakerChecker.ts
index 76b1c6a44..ab00a9fd9 100644
--- a/packages/gemini-cli-core/src/utils/nextSpeakerChecker.ts
+++ b/packages/gemini-cli-core/src/utils/nextSpeakerChecker.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import { isFunctionResponse } from './messageInspectors.js';
-import { debugLogger } from './debugLogger.js';
+import type { Content } from "@google/genai";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import { debugLogger } from "./debugLogger.js";
+import { isFunctionResponse } from "./messageInspectors.js";
 
 const CHECK_PROMPT = `Analyze *only* the content and structure of your immediately preceding response (your last turn in the conversation history). Based *strictly* on that response, determine who should logically speak next: the 'user' or the 'model' (you).
 **Decision Rules (apply in order):**
@@ -17,26 +17,26 @@ const CHECK_PROMPT = `Analyze *only* the content and structure of your immediate
 3.  **Waiting for User:** If your last response completed a thought, statement, or task *and* does not meet the criteria for Rule 1 (Model Continues) or Rule 2 (Question to User), it implies a pause expecting user input or reaction. In this case, the **'user'** should speak next.`;
 
 const RESPONSE_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     reasoning: {
-      type: 'string',
+      type: "string",
       description:
         "Brief explanation justifying the 'next_speaker' choice based *strictly* on the applicable rule and the content/structure of the preceding turn.",
     },
     next_speaker: {
-      type: 'string',
-      enum: ['user', 'model'],
+      type: "string",
+      enum: ["user", "model"],
       description:
-        'Who should speak next based *only* on the preceding turn and the decision rules',
+        "Who should speak next based *only* on the preceding turn and the decision rules",
     },
   },
-  required: ['reasoning', 'next_speaker'],
+  required: ["reasoning", "next_speaker"],
 };
 
 export interface NextSpeakerResponse {
   reasoning: string;
-  next_speaker: 'user' | 'model';
+  next_speaker: "user" | "model";
 }
 
 export async function checkNextSpeaker(
@@ -64,40 +64,35 @@ export async function checkNextSpeaker(
   if (comprehensiveHistory.length === 0) {
     return null;
   }
-  const lastComprehensiveMessage =
-    comprehensiveHistory[comprehensiveHistory.length - 1];
+  const lastComprehensiveMessage = comprehensiveHistory[comprehensiveHistory.length - 1];
 
   // If the last message is a user message containing only function_responses,
   // then the model should speak next.
-  if (
-    lastComprehensiveMessage &&
-    isFunctionResponse(lastComprehensiveMessage)
-  ) {
+  if (lastComprehensiveMessage && isFunctionResponse(lastComprehensiveMessage)) {
     return {
-      reasoning:
-        'The last message was a function response, so the model should speak next.',
-      next_speaker: 'model',
+      reasoning: "The last message was a function response, so the model should speak next.",
+      next_speaker: "model",
     };
   }
 
   if (
     lastComprehensiveMessage &&
-    lastComprehensiveMessage.role === 'model' &&
+    lastComprehensiveMessage.role === "model" &&
     lastComprehensiveMessage.parts &&
     lastComprehensiveMessage.parts.length === 0
   ) {
-    lastComprehensiveMessage.parts.push({ text: '' });
+    lastComprehensiveMessage.parts.push({ text: "" });
     return {
       reasoning:
-        'The last message was a filler model message with no content (nothing for user to act on), model should speak next.',
-      next_speaker: 'model',
+        "The last message was a filler model message with no content (nothing for user to act on), model should speak next.",
+      next_speaker: "model",
     };
   }
 
   // Things checked out. Let's proceed to potentially making an LLM request.
 
   const lastMessage = curatedHistory[curatedHistory.length - 1];
-  if (!lastMessage || lastMessage.role !== 'model') {
+  if (!lastMessage || lastMessage.role !== "model") {
     // Cannot determine next speaker if the last turn wasn't from the model
     // or if history is empty.
     return null;
@@ -105,12 +100,12 @@ export async function checkNextSpeaker(
 
   const contents: Content[] = [
     ...curatedHistory,
-    { role: 'user', parts: [{ text: CHECK_PROMPT }] },
+    { role: "user", parts: [{ text: CHECK_PROMPT }] },
   ];
 
   try {
     const parsedResponse = (await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'next-speaker-checker' },
+      modelConfigKey: { model: "next-speaker-checker" },
       contents,
       schema: RESPONSE_SCHEMA,
       abortSignal,
@@ -120,14 +115,14 @@ export async function checkNextSpeaker(
     if (
       parsedResponse &&
       parsedResponse.next_speaker &&
-      ['user', 'model'].includes(parsedResponse.next_speaker)
+      ["user", "model"].includes(parsedResponse.next_speaker)
     ) {
       return parsedResponse;
     }
     return null;
   } catch (error) {
     debugLogger.warn(
-      'Failed to talk to Gemini endpoint when seeing if conversation should continue.',
+      "Failed to talk to Gemini endpoint when seeing if conversation should continue.",
       error,
     );
     return null;
diff --git a/packages/gemini-cli-core/src/utils/package.ts b/packages/gemini-cli-core/src/utils/package.ts
index 81b208bc5..868b48fb5 100644
--- a/packages/gemini-cli-core/src/utils/package.ts
+++ b/packages/gemini-cli-core/src/utils/package.ts
@@ -4,10 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  readPackageUp,
-  type PackageJson as BasePackageJson,
-} from 'read-package-up';
+import { type PackageJson as BasePackageJson, readPackageUp } from "read-package-up";
 
 export type PackageJson = BasePackageJson & {
   config?: {
@@ -29,9 +26,7 @@ export type PackageJson = BasePackageJson & {
  * const version = pkg?.version ?? 'unknown';
  * ```
  */
-export async function getPackageJson(
-  cwd: string,
-): Promise<PackageJson | undefined> {
+export async function getPackageJson(cwd: string): Promise<PackageJson | undefined> {
   const result = await readPackageUp({ cwd });
   if (!result) {
     return undefined;
diff --git a/packages/gemini-cli-core/src/utils/partUtils.test.ts b/packages/gemini-cli-core/src/utils/partUtils.test.ts
index d53010725..4e5a4becc 100644
--- a/packages/gemini-cli-core/src/utils/partUtils.test.ts
+++ b/packages/gemini-cli-core/src/utils/partUtils.test.ts
@@ -4,21 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import type { GenerateContentResponse, Part, PartUnion } from "@google/genai";
+import { describe, expect, it } from "vitest";
 import {
-  partToString,
-  getResponseText,
-  flatMapTextParts,
   appendToLastTextPart,
-} from './partUtils.js';
-import type { GenerateContentResponse, Part, PartUnion } from '@google/genai';
+  flatMapTextParts,
+  getResponseText,
+  partToString,
+} from "./partUtils.js";
 
 const mockResponse = (
   parts?: Array<{ text?: string; functionCall?: unknown }>,
 ): GenerateContentResponse => ({
-  candidates: parts
-    ? [{ content: { parts: parts as Part[], role: 'model' }, index: 0 }]
-    : [],
+  candidates: parts ? [{ content: { parts: parts as Part[], role: "model" }, index: 0 }] : [],
   promptFeedback: { safetyRatings: [] },
   text: undefined,
   data: undefined,
@@ -27,148 +25,142 @@ const mockResponse = (
   codeExecutionResult: undefined,
 });
 
-describe('partUtils', () => {
-  describe('partToString (default behavior)', () => {
-    it('should return empty string for undefined or null', () => {
+describe("partUtils", () => {
+  describe("partToString (default behavior)", () => {
+    it("should return empty string for undefined or null", () => {
       // @ts-expect-error Testing invalid input
-      expect(partToString(undefined)).toBe('');
+      expect(partToString(undefined)).toBe("");
       // @ts-expect-error Testing invalid input
-      expect(partToString(null)).toBe('');
+      expect(partToString(null)).toBe("");
     });
 
-    it('should return string input unchanged', () => {
-      expect(partToString('hello')).toBe('hello');
+    it("should return string input unchanged", () => {
+      expect(partToString("hello")).toBe("hello");
     });
 
-    it('should concatenate strings from an array', () => {
-      expect(partToString(['a', 'b'])).toBe('ab');
+    it("should concatenate strings from an array", () => {
+      expect(partToString(["a", "b"])).toBe("ab");
     });
 
-    it('should return text property when provided a text part', () => {
-      expect(partToString({ text: 'hi' })).toBe('hi');
+    it("should return text property when provided a text part", () => {
+      expect(partToString({ text: "hi" })).toBe("hi");
     });
 
-    it('should return empty string for non-text parts', () => {
-      const part: Part = { inlineData: { mimeType: 'image/png', data: '' } };
-      expect(partToString(part)).toBe('');
-      const part2: Part = { functionCall: { name: 'test' } };
-      expect(partToString(part2)).toBe('');
+    it("should return empty string for non-text parts", () => {
+      const part: Part = { inlineData: { mimeType: "image/png", data: "" } };
+      expect(partToString(part)).toBe("");
+      const part2: Part = { functionCall: { name: "test" } };
+      expect(partToString(part2)).toBe("");
     });
   });
 
-  describe('partToString (verbose)', () => {
+  describe("partToString (verbose)", () => {
     const verboseOptions = { verbose: true };
 
-    it('should return empty string for undefined or null', () => {
+    it("should return empty string for undefined or null", () => {
       // @ts-expect-error Testing invalid input
-      expect(partToString(undefined, verboseOptions)).toBe('');
+      expect(partToString(undefined, verboseOptions)).toBe("");
       // @ts-expect-error Testing invalid input
-      expect(partToString(null, verboseOptions)).toBe('');
+      expect(partToString(null, verboseOptions)).toBe("");
     });
 
-    it('should return string input unchanged', () => {
-      expect(partToString('hello', verboseOptions)).toBe('hello');
+    it("should return string input unchanged", () => {
+      expect(partToString("hello", verboseOptions)).toBe("hello");
     });
 
-    it('should join parts if the value is an array', () => {
-      const parts = ['hello', { text: ' world' }];
-      expect(partToString(parts, verboseOptions)).toBe('hello world');
+    it("should join parts if the value is an array", () => {
+      const parts = ["hello", { text: " world" }];
+      expect(partToString(parts, verboseOptions)).toBe("hello world");
     });
 
-    it('should return the text property if the part is an object with text', () => {
-      const part: Part = { text: 'hello world' };
-      expect(partToString(part, verboseOptions)).toBe('hello world');
+    it("should return the text property if the part is an object with text", () => {
+      const part: Part = { text: "hello world" };
+      expect(partToString(part, verboseOptions)).toBe("hello world");
     });
 
-    it('should return descriptive string for videoMetadata part', () => {
+    it("should return descriptive string for videoMetadata part", () => {
       const part = { videoMetadata: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe('[Video Metadata]');
+      expect(partToString(part, verboseOptions)).toBe("[Video Metadata]");
     });
 
-    it('should return descriptive string for thought part', () => {
-      const part = { thought: 'thinking' } as unknown as Part;
-      expect(partToString(part, verboseOptions)).toBe('[Thought: thinking]');
+    it("should return descriptive string for thought part", () => {
+      const part = { thought: "thinking" } as unknown as Part;
+      expect(partToString(part, verboseOptions)).toBe("[Thought: thinking]");
     });
 
-    it('should return descriptive string for codeExecutionResult part', () => {
+    it("should return descriptive string for codeExecutionResult part", () => {
       const part = { codeExecutionResult: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe(
-        '[Code Execution Result]',
-      );
+      expect(partToString(part, verboseOptions)).toBe("[Code Execution Result]");
     });
 
-    it('should return descriptive string for executableCode part', () => {
+    it("should return descriptive string for executableCode part", () => {
       const part = { executableCode: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe('[Executable Code]');
+      expect(partToString(part, verboseOptions)).toBe("[Executable Code]");
     });
 
-    it('should return descriptive string for fileData part', () => {
+    it("should return descriptive string for fileData part", () => {
       const part = { fileData: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe('[File Data]');
+      expect(partToString(part, verboseOptions)).toBe("[File Data]");
     });
 
-    it('should return descriptive string for functionCall part', () => {
-      const part = { functionCall: { name: 'myFunction' } } as Part;
-      expect(partToString(part, verboseOptions)).toBe(
-        '[Function Call: myFunction]',
-      );
+    it("should return descriptive string for functionCall part", () => {
+      const part = { functionCall: { name: "myFunction" } } as Part;
+      expect(partToString(part, verboseOptions)).toBe("[Function Call: myFunction]");
     });
 
-    it('should return descriptive string for functionResponse part', () => {
-      const part = { functionResponse: { name: 'myFunction' } } as Part;
-      expect(partToString(part, verboseOptions)).toBe(
-        '[Function Response: myFunction]',
-      );
+    it("should return descriptive string for functionResponse part", () => {
+      const part = { functionResponse: { name: "myFunction" } } as Part;
+      expect(partToString(part, verboseOptions)).toBe("[Function Response: myFunction]");
     });
 
-    it('should return descriptive string for inlineData part', () => {
-      const part = { inlineData: { mimeType: 'image/png', data: '' } } as Part;
-      expect(partToString(part, verboseOptions)).toBe('<image/png>');
+    it("should return descriptive string for inlineData part", () => {
+      const part = { inlineData: { mimeType: "image/png", data: "" } } as Part;
+      expect(partToString(part, verboseOptions)).toBe("<image/png>");
     });
 
-    it('should return an empty string for an unknown part type', () => {
+    it("should return an empty string for an unknown part type", () => {
       const part: Part = {};
-      expect(partToString(part, verboseOptions)).toBe('');
+      expect(partToString(part, verboseOptions)).toBe("");
     });
 
-    it('should handle complex nested arrays with various part types', () => {
+    it("should handle complex nested arrays with various part types", () => {
       const parts = [
-        'start ',
-        { text: 'middle' },
+        "start ",
+        { text: "middle" },
         [
-          { functionCall: { name: 'func1' } },
-          ' end',
-          { inlineData: { mimeType: 'audio/mp3', data: '' } },
+          { functionCall: { name: "func1" } },
+          " end",
+          { inlineData: { mimeType: "audio/mp3", data: "" } },
         ],
       ];
       expect(partToString(parts as Part, verboseOptions)).toBe(
-        'start middle[Function Call: func1] end<audio/mp3>',
+        "start middle[Function Call: func1] end<audio/mp3>",
       );
     });
   });
 
-  describe('getResponseText', () => {
-    it('should return null when no candidates exist', () => {
+  describe("getResponseText", () => {
+    it("should return null when no candidates exist", () => {
       const response = mockResponse(undefined);
       expect(getResponseText(response)).toBeNull();
     });
 
-    it('should return concatenated text from first candidate', () => {
-      const result = mockResponse([{ text: 'a' }, { text: 'b' }]);
-      expect(getResponseText(result)).toBe('ab');
+    it("should return concatenated text from first candidate", () => {
+      const result = mockResponse([{ text: "a" }, { text: "b" }]);
+      expect(getResponseText(result)).toBe("ab");
     });
 
-    it('should ignore parts without text', () => {
-      const result = mockResponse([{ functionCall: {} }, { text: 'hello' }]);
-      expect(getResponseText(result)).toBe('hello');
+    it("should ignore parts without text", () => {
+      const result = mockResponse([{ functionCall: {} }, { text: "hello" }]);
+      expect(getResponseText(result)).toBe("hello");
     });
 
-    it('should return null when candidate has no parts', () => {
+    it("should return null when candidate has no parts", () => {
       const result = mockResponse([]);
       expect(getResponseText(result)).toBeNull();
     });
 
-    it('should return null if the first candidate has no content property', () => {
+    it("should return null if the first candidate has no content property", () => {
       const response: GenerateContentResponse = {
         candidates: [
           {
@@ -186,116 +178,105 @@ describe('partUtils', () => {
     });
   });
 
-  describe('flatMapTextParts', () => {
+  describe("flatMapTextParts", () => {
     // A simple async transform function that splits a string into character parts.
     const splitCharsTransform = async (text: string): Promise<PartUnion[]> =>
-      text.split('').map((char) => ({ text: char }));
+      text.split("").map((char) => ({ text: char }));
 
-    it('should return an empty array for empty input', async () => {
+    it("should return an empty array for empty input", async () => {
       const result = await flatMapTextParts([], splitCharsTransform);
       expect(result).toEqual([]);
     });
 
-    it('should transform a simple string input', async () => {
-      const result = await flatMapTextParts('hi', splitCharsTransform);
-      expect(result).toEqual([{ text: 'h' }, { text: 'i' }]);
+    it("should transform a simple string input", async () => {
+      const result = await flatMapTextParts("hi", splitCharsTransform);
+      expect(result).toEqual([{ text: "h" }, { text: "i" }]);
     });
 
-    it('should transform a single text part object', async () => {
-      const result = await flatMapTextParts(
-        { text: 'cat' },
-        splitCharsTransform,
-      );
-      expect(result).toEqual([{ text: 'c' }, { text: 'a' }, { text: 't' }]);
+    it("should transform a single text part object", async () => {
+      const result = await flatMapTextParts({ text: "cat" }, splitCharsTransform);
+      expect(result).toEqual([{ text: "c" }, { text: "a" }, { text: "t" }]);
     });
 
-    it('should transform an array of text parts and flatten the result', async () => {
+    it("should transform an array of text parts and flatten the result", async () => {
       // A transform that duplicates the text to test the "flatMap" behavior.
       const duplicateTransform = async (text: string): Promise<PartUnion[]> => [
         { text: `${text}` },
         { text: `${text}` },
       ];
-      const parts = [{ text: 'a' }, { text: 'b' }];
+      const parts = [{ text: "a" }, { text: "b" }];
       const result = await flatMapTextParts(parts, duplicateTransform);
-      expect(result).toEqual([
-        { text: 'a' },
-        { text: 'a' },
-        { text: 'b' },
-        { text: 'b' },
-      ]);
+      expect(result).toEqual([{ text: "a" }, { text: "a" }, { text: "b" }, { text: "b" }]);
     });
 
-    it('should pass through non-text parts unmodified', async () => {
-      const nonTextPart: Part = { functionCall: { name: 'do_stuff' } };
+    it("should pass through non-text parts unmodified", async () => {
+      const nonTextPart: Part = { functionCall: { name: "do_stuff" } };
       const result = await flatMapTextParts(nonTextPart, splitCharsTransform);
       expect(result).toEqual([nonTextPart]);
     });
 
-    it('should handle a mix of text and non-text parts in an array', async () => {
+    it("should handle a mix of text and non-text parts in an array", async () => {
       const nonTextPart: Part = {
-        inlineData: { mimeType: 'image/jpeg', data: '' },
+        inlineData: { mimeType: "image/jpeg", data: "" },
       };
-      const parts: PartUnion[] = [{ text: 'go' }, nonTextPart, ' stop'];
+      const parts: PartUnion[] = [{ text: "go" }, nonTextPart, " stop"];
       const result = await flatMapTextParts(parts, splitCharsTransform);
       expect(result).toEqual([
-        { text: 'g' },
-        { text: 'o' },
+        { text: "g" },
+        { text: "o" },
         nonTextPart, // Should be passed through
-        { text: ' ' },
-        { text: 's' },
-        { text: 't' },
-        { text: 'o' },
-        { text: 'p' },
+        { text: " " },
+        { text: "s" },
+        { text: "t" },
+        { text: "o" },
+        { text: "p" },
       ]);
     });
 
-    it('should handle a transform that returns an empty array', async () => {
+    it("should handle a transform that returns an empty array", async () => {
       const removeTransform = async (_text: string): Promise<PartUnion[]> => [];
-      const parts: PartUnion[] = [
-        { text: 'remove' },
-        { functionCall: { name: 'keep' } },
-      ];
+      const parts: PartUnion[] = [{ text: "remove" }, { functionCall: { name: "keep" } }];
       const result = await flatMapTextParts(parts, removeTransform);
-      expect(result).toEqual([{ functionCall: { name: 'keep' } }]);
+      expect(result).toEqual([{ functionCall: { name: "keep" } }]);
     });
   });
 
-  describe('appendToLastTextPart', () => {
-    it('should append to an empty prompt', () => {
+  describe("appendToLastTextPart", () => {
+    it("should append to an empty prompt", () => {
       const prompt: PartUnion[] = [];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual([{ text: 'new text' }]);
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual([{ text: "new text" }]);
     });
 
-    it('should append to a prompt with a string as the last part', () => {
-      const prompt: PartUnion[] = ['first part'];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual(['first part\n\nnew text']);
+    it("should append to a prompt with a string as the last part", () => {
+      const prompt: PartUnion[] = ["first part"];
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual(["first part\n\nnew text"]);
     });
 
-    it('should append to a prompt with a text part object as the last part', () => {
-      const prompt: PartUnion[] = [{ text: 'first part' }];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual([{ text: 'first part\n\nnew text' }]);
+    it("should append to a prompt with a text part object as the last part", () => {
+      const prompt: PartUnion[] = [{ text: "first part" }];
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual([{ text: "first part\n\nnew text" }]);
     });
 
-    it('should append a new text part if the last part is not a text part', () => {
-      const nonTextPart: Part = { functionCall: { name: 'do_stuff' } };
+    it("should append a new text part if the last part is not a text part", () => {
+      const nonTextPart: Part = { functionCall: { name: "do_stuff" } };
       const prompt: PartUnion[] = [nonTextPart];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual([nonTextPart, { text: '\n\nnew text' }]);
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual([nonTextPart, { text: "\n\nnew text" }]);
     });
 
-    it('should not append anything if the text to append is empty', () => {
-      const prompt: PartUnion[] = ['first part'];
-      const result = appendToLastTextPart(prompt, '');
-      expect(result).toEqual(['first part']);
+    it("should not append anything if the text to append is empty", () => {
+      const prompt: PartUnion[] = ["first part"];
+      const result = appendToLastTextPart(prompt, "");
+      expect(result).toEqual(["first part"]);
     });
 
-    it('should use a custom separator', () => {
-      const prompt: PartUnion[] = ['first part'];
-      const result = appendToLastTextPart(prompt, 'new text', '---');
-      expect(result).toEqual(['first part---new text']);
+    it("should use a custom separator", () => {
+      const prompt: PartUnion[] = ["first part"];
+      const result = appendToLastTextPart(prompt, "new text", "---");
+      expect(result).toEqual(["first part---new text"]);
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/partUtils.ts b/packages/gemini-cli-core/src/utils/partUtils.ts
index f5195c11c..c9216e313 100644
--- a/packages/gemini-cli-core/src/utils/partUtils.ts
+++ b/packages/gemini-cli-core/src/utils/partUtils.ts
@@ -4,29 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  GenerateContentResponse,
-  PartListUnion,
-  Part,
-  PartUnion,
-} from '@google/genai';
+import type { GenerateContentResponse, Part, PartListUnion, PartUnion } from "@google/genai";
 
 /**
  * Converts a PartListUnion into a string.
  * If verbose is true, includes summary representations of non-text parts.
  */
-export function partToString(
-  value: PartListUnion,
-  options?: { verbose?: boolean },
-): string {
+export function partToString(value: PartListUnion, options?: { verbose?: boolean }): string {
   if (!value) {
-    return '';
+    return "";
   }
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     return value;
   }
   if (Array.isArray(value)) {
-    return value.map((part) => partToString(part, options)).join('');
+    return value.map((part) => partToString(part, options)).join("");
   }
 
   // Cast to Part, assuming it might contain project-specific fields
@@ -66,24 +58,18 @@ export function partToString(
     }
   }
 
-  return part.text ?? '';
+  return part.text ?? "";
 }
 
-export function getResponseText(
-  response: GenerateContentResponse,
-): string | null {
+export function getResponseText(response: GenerateContentResponse): string | null {
   if (response.candidates && response.candidates.length > 0) {
     const candidate = response.candidates[0];
 
-    if (
-      candidate.content &&
-      candidate.content.parts &&
-      candidate.content.parts.length > 0
-    ) {
+    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
       return candidate.content.parts
         .filter((part) => part.text)
         .map((part) => part.text)
-        .join('');
+        .join("");
     }
   }
   return null;
@@ -106,15 +92,15 @@ export async function flatMapTextParts(
   const result: PartUnion[] = [];
   const partArray = Array.isArray(parts)
     ? parts
-    : typeof parts === 'string'
+    : typeof parts === "string"
       ? [{ text: parts }]
       : [parts];
 
   for (const part of partArray) {
     let textToProcess: string | undefined;
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       textToProcess = part;
-    } else if ('text' in part) {
+    } else if ("text" in part) {
       textToProcess = part.text;
     }
 
@@ -141,7 +127,7 @@ export async function flatMapTextParts(
 export function appendToLastTextPart(
   prompt: PartUnion[],
   textToAppend: string,
-  separator = '\n\n',
+  separator = "\n\n",
 ): PartUnion[] {
   if (!textToAppend) {
     return prompt;
@@ -154,9 +140,9 @@ export function appendToLastTextPart(
   const newPrompt = [...prompt];
   const lastPart = newPrompt.at(-1);
 
-  if (typeof lastPart === 'string') {
+  if (typeof lastPart === "string") {
     newPrompt[newPrompt.length - 1] = `${lastPart}${separator}${textToAppend}`;
-  } else if (lastPart && 'text' in lastPart) {
+  } else if (lastPart && "text" in lastPart) {
     newPrompt[newPrompt.length - 1] = {
       ...lastPart,
       text: `${lastPart.text}${separator}${textToAppend}`,
diff --git a/packages/gemini-cli-core/src/utils/pathCorrector.test.ts b/packages/gemini-cli-core/src/utils/pathCorrector.test.ts
index a3ed038dd..fb993613d 100644
--- a/packages/gemini-cli-core/src/utils/pathCorrector.test.ts
+++ b/packages/gemini-cli-core/src/utils/pathCorrector.test.ts
@@ -4,32 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import type { Config } from '../config/config.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { correctPath } from './pathCorrector.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import { correctPath } from "./pathCorrector.js";
 
-describe('pathCorrector', () => {
+describe("pathCorrector", () => {
   let tempDir: string;
   let rootDir: string;
   let otherWorkspaceDir: string;
   let mockConfig: Config;
 
   beforeEach(() => {
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'path-corrector-test-'));
-    rootDir = path.join(tempDir, 'root');
-    otherWorkspaceDir = path.join(tempDir, 'other');
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "path-corrector-test-"));
+    rootDir = path.join(tempDir, "root");
+    otherWorkspaceDir = path.join(tempDir, "other");
     fs.mkdirSync(rootDir, { recursive: true });
     fs.mkdirSync(otherWorkspaceDir, { recursive: true });
 
     mockConfig = {
       getTargetDir: () => rootDir,
-      getWorkspaceContext: () =>
-        createMockWorkspaceContext(rootDir, [otherWorkspaceDir]),
+      getWorkspaceContext: () => createMockWorkspaceContext(rootDir, [otherWorkspaceDir]),
       getFileService: () => new FileDiscoveryService(rootDir),
       getFileFilteringOptions: () => ({
         respectGitIgnore: true,
@@ -43,9 +42,9 @@ describe('pathCorrector', () => {
     vi.restoreAllMocks();
   });
 
-  it('should correct a relative path if it is unambiguous in the target dir', () => {
-    const testFile = 'unique.txt';
-    fs.writeFileSync(path.join(rootDir, testFile), 'content');
+  it("should correct a relative path if it is unambiguous in the target dir", () => {
+    const testFile = "unique.txt";
+    fs.writeFileSync(path.join(rootDir, testFile), "content");
 
     const result = correctPath(testFile, mockConfig);
 
@@ -55,12 +54,12 @@ describe('pathCorrector', () => {
     }
   });
 
-  it('should correct a partial relative path if it is unambiguous in another workspace dir', () => {
-    const subDir = path.join(otherWorkspaceDir, 'sub');
+  it("should correct a partial relative path if it is unambiguous in another workspace dir", () => {
+    const subDir = path.join(otherWorkspaceDir, "sub");
     fs.mkdirSync(subDir);
-    const testFile = 'file.txt';
+    const testFile = "file.txt";
     const fullPath = path.join(subDir, testFile);
-    fs.writeFileSync(fullPath, 'content');
+    fs.writeFileSync(fullPath, "content");
 
     const result = correctPath(testFile, mockConfig);
 
@@ -70,26 +69,26 @@ describe('pathCorrector', () => {
     }
   });
 
-  it('should return an error for a relative path that does not exist', () => {
-    const result = correctPath('nonexistent.txt', mockConfig);
+  it("should return an error for a relative path that does not exist", () => {
+    const result = correctPath("nonexistent.txt", mockConfig);
     expect(result.success).toBe(false);
     if (!result.success) {
       expect(result.error).toMatch(
         /File not found for 'nonexistent.txt' and path is not absolute./,
       );
     } else {
-      expect.fail('Expected path correction to fail.');
+      expect.fail("Expected path correction to fail.");
     }
   });
 
-  it('should return an error for an ambiguous path', () => {
-    const ambiguousFile = 'component.ts';
-    const subDir1 = path.join(rootDir, 'module1');
-    const subDir2 = path.join(otherWorkspaceDir, 'module2');
+  it("should return an error for an ambiguous path", () => {
+    const ambiguousFile = "component.ts";
+    const subDir1 = path.join(rootDir, "module1");
+    const subDir2 = path.join(otherWorkspaceDir, "module2");
     fs.mkdirSync(subDir1, { recursive: true });
     fs.mkdirSync(subDir2, { recursive: true });
-    fs.writeFileSync(path.join(subDir1, ambiguousFile), 'content 1');
-    fs.writeFileSync(path.join(subDir2, ambiguousFile), 'content 2');
+    fs.writeFileSync(path.join(subDir1, ambiguousFile), "content 1");
+    fs.writeFileSync(path.join(subDir2, ambiguousFile), "content 2");
 
     const result = correctPath(ambiguousFile, mockConfig);
 
@@ -99,7 +98,7 @@ describe('pathCorrector', () => {
         /The file path 'component.ts' is ambiguous and matches multiple files./,
       );
     } else {
-      expect.fail('Expected path correction to fail.');
+      expect.fail("Expected path correction to fail.");
     }
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/pathCorrector.ts b/packages/gemini-cli-core/src/utils/pathCorrector.ts
index d6538ff05..8ac2fdd48 100644
--- a/packages/gemini-cli-core/src/utils/pathCorrector.ts
+++ b/packages/gemini-cli-core/src/utils/pathCorrector.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import type { Config } from '../config/config.js';
-import { bfsFileSearchSync } from './bfsFileSearch.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { Config } from "../config/config.js";
+import { bfsFileSearchSync } from "./bfsFileSearch.js";
 
 type SuccessfulPathCorrection = {
   success: true;
@@ -27,13 +27,8 @@ type FailedPathCorrection = {
  * @param config The application configuration.
  * @returns A `PathCorrectionResult` object with either a `correctedPath` or an `error`.
  */
-export type PathCorrectionResult =
-  | SuccessfulPathCorrection
-  | FailedPathCorrection;
-export function correctPath(
-  filePath: string,
-  config: Config,
-): PathCorrectionResult {
+export type PathCorrectionResult = SuccessfulPathCorrection | FailedPathCorrection;
+export function correctPath(filePath: string, config: Config): PathCorrectionResult {
   // Check for direct path relative to the primary target directory.
   const directPath = path.join(config.getTargetDir(), filePath);
   if (fs.existsSync(directPath)) {
@@ -44,7 +39,7 @@ export function correctPath(
   const workspaceContext = config.getWorkspaceContext();
   const searchPaths = workspaceContext.getDirectories();
   const basename = path.basename(filePath);
-  const normalizedTarget = filePath.replace(/\\/g, '/');
+  const normalizedTarget = filePath.replace(/\\/g, "/");
 
   // Normalize path for matching and check if it ends with the provided relative path
   const foundFiles = searchPaths
@@ -56,7 +51,7 @@ export function correctPath(
         fileFilteringOptions: config.getFileFilteringOptions(),
       }),
     )
-    .filter((f) => f.replace(/\\/g, '/').endsWith(normalizedTarget));
+    .filter((f) => f.replace(/\\/g, "/").endsWith(normalizedTarget));
 
   if (foundFiles.length === 0) {
     return {
@@ -68,7 +63,7 @@ export function correctPath(
   if (foundFiles.length > 1) {
     return {
       success: false,
-      error: `The file path '${filePath}' is ambiguous and matches multiple files. Please provide a more specific path. Matches: ${foundFiles.join(', ')}`,
+      error: `The file path '${filePath}' is ambiguous and matches multiple files. Please provide a more specific path. Matches: ${foundFiles.join(", ")}`,
     };
   }
 
diff --git a/packages/gemini-cli-core/src/utils/pathReader.test.ts b/packages/gemini-cli-core/src/utils/pathReader.test.ts
index 0aa4e308e..be59fefc2 100644
--- a/packages/gemini-cli-core/src/utils/pathReader.test.ts
+++ b/packages/gemini-cli-core/src/utils/pathReader.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach, vi } from 'vitest';
-import mock from 'mock-fs';
-import * as path from 'node:path';
-import { WorkspaceContext } from './workspaceContext.js';
-import { readPathFromWorkspace } from './pathReader.js';
-import type { Config } from '../config/config.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import * as path from "node:path";
+import mock from "mock-fs";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { readPathFromWorkspace } from "./pathReader.js";
+import { WorkspaceContext } from "./workspaceContext.js";
 
 // --- Helper for creating a mock Config object ---
 // We use the actual implementations of WorkspaceContext and FileSystemService
@@ -39,113 +39,111 @@ const createMockConfig = (
   } as unknown as Config;
 };
 
-describe('readPathFromWorkspace', () => {
-  const CWD = path.resolve('/test/cwd');
-  const OTHER_DIR = path.resolve('/test/other');
-  const OUTSIDE_DIR = path.resolve('/test/outside');
+describe("readPathFromWorkspace", () => {
+  const CWD = path.resolve("/test/cwd");
+  const OTHER_DIR = path.resolve("/test/other");
+  const OUTSIDE_DIR = path.resolve("/test/outside");
 
   afterEach(() => {
     mock.restore();
     vi.resetAllMocks();
   });
 
-  it('should read a text file from the CWD', async () => {
+  it("should read a text file from the CWD", async () => {
     mock({
       [CWD]: {
-        'file.txt': 'hello from cwd',
+        "file.txt": "hello from cwd",
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('file.txt', config);
+    const result = await readPathFromWorkspace("file.txt", config);
     // Expect [string] for text content
-    expect(result).toEqual(['hello from cwd']);
+    expect(result).toEqual(["hello from cwd"]);
     expect(mockFileService.filterFiles).toHaveBeenCalled();
   });
 
-  it('should read a file from a secondary workspace directory', async () => {
+  it("should read a file from a secondary workspace directory", async () => {
     mock({
       [CWD]: {},
       [OTHER_DIR]: {
-        'file.txt': 'hello from other dir',
+        "file.txt": "hello from other dir",
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
-    const result = await readPathFromWorkspace('file.txt', config);
-    expect(result).toEqual(['hello from other dir']);
+    const result = await readPathFromWorkspace("file.txt", config);
+    expect(result).toEqual(["hello from other dir"]);
   });
 
-  it('should prioritize CWD when file exists in both CWD and secondary dir', async () => {
+  it("should prioritize CWD when file exists in both CWD and secondary dir", async () => {
     mock({
       [CWD]: {
-        'file.txt': 'hello from cwd',
+        "file.txt": "hello from cwd",
       },
       [OTHER_DIR]: {
-        'file.txt': 'hello from other dir',
+        "file.txt": "hello from other dir",
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
-    const result = await readPathFromWorkspace('file.txt', config);
-    expect(result).toEqual(['hello from cwd']);
+    const result = await readPathFromWorkspace("file.txt", config);
+    expect(result).toEqual(["hello from cwd"]);
   });
 
-  it('should read an image file and return it as inlineData (Part object)', async () => {
+  it("should read an image file and return it as inlineData (Part object)", async () => {
     // Use a real PNG header for robustness
-    const imageData = Buffer.from([
-      0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-    ]);
+    const imageData = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
     mock({
       [CWD]: {
-        'image.png': imageData,
+        "image.png": imageData,
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('image.png', config);
+    const result = await readPathFromWorkspace("image.png", config);
     // Expect [Part] for image content
     expect(result).toEqual([
       {
         inlineData: {
-          mimeType: 'image/png',
-          data: imageData.toString('base64'),
+          mimeType: "image/png",
+          data: imageData.toString("base64"),
         },
       },
     ]);
   });
 
-  it('should read a generic binary file and return an info string', async () => {
+  it("should read a generic binary file and return an info string", async () => {
     // Data that is clearly binary (null bytes)
     const binaryData = Buffer.from([0x00, 0x01, 0x02, 0x03]);
     mock({
       [CWD]: {
-        'data.bin': binaryData,
+        "data.bin": binaryData,
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('data.bin', config);
+    const result = await readPathFromWorkspace("data.bin", config);
     // Expect [string] containing the skip message from fileUtils
-    expect(result).toEqual(['Cannot display content of binary file: data.bin']);
+    expect(result).toEqual(["Cannot display content of binary file: data.bin"]);
   });
 
-  it('should read a file from an absolute path if within workspace', async () => {
-    const absPath = path.join(OTHER_DIR, 'abs.txt');
+  it("should read a file from an absolute path if within workspace", async () => {
+    const absPath = path.join(OTHER_DIR, "abs.txt");
     mock({
       [CWD]: {},
       [OTHER_DIR]: {
-        'abs.txt': 'absolute content',
+        "abs.txt": "absolute content",
       },
     });
     const mockFileService = {
@@ -153,16 +151,16 @@ describe('readPathFromWorkspace', () => {
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
     const result = await readPathFromWorkspace(absPath, config);
-    expect(result).toEqual(['absolute content']);
+    expect(result).toEqual(["absolute content"]);
   });
 
-  describe('Directory Expansion', () => {
-    it('should expand a directory and read the content of its files', async () => {
+  describe("Directory Expansion", () => {
+    it("should expand a directory and read the content of its files", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'file1.txt': 'content of file 1',
-            'file2.md': 'content of file 2',
+          "my-dir": {
+            "file1.txt": "content of file 1",
+            "file2.md": "content of file 2",
           },
         },
       });
@@ -170,38 +168,34 @@ describe('readPathFromWorkspace', () => {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('my-dir', config);
+      const result = await readPathFromWorkspace("my-dir", config);
 
       // Convert to a single string for easier, order-independent checking
       const resultText = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
           // This part is important for handling binary/image data which isn't just text
-          if (typeof p === 'object' && p && 'inlineData' in p) return '';
+          if (typeof p === "object" && p && "inlineData" in p) return "";
           return p;
         })
-        .join('');
+        .join("");
 
-      expect(resultText).toContain(
-        '--- Start of content for directory: my-dir ---',
-      );
-      expect(resultText).toContain('--- file1.txt ---');
-      expect(resultText).toContain('content of file 1');
-      expect(resultText).toContain('--- file2.md ---');
-      expect(resultText).toContain('content of file 2');
-      expect(resultText).toContain(
-        '--- End of content for directory: my-dir ---',
-      );
+      expect(resultText).toContain("--- Start of content for directory: my-dir ---");
+      expect(resultText).toContain("--- file1.txt ---");
+      expect(resultText).toContain("content of file 1");
+      expect(resultText).toContain("--- file2.md ---");
+      expect(resultText).toContain("content of file 2");
+      expect(resultText).toContain("--- End of content for directory: my-dir ---");
     });
 
-    it('should recursively expand a directory and read all nested files', async () => {
+    it("should recursively expand a directory and read all nested files", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'file1.txt': 'content of file 1',
-            'sub-dir': {
-              'nested.txt': 'nested content',
+          "my-dir": {
+            "file1.txt": "content of file 1",
+            "sub-dir": {
+              "nested.txt": "nested content",
             },
           },
         },
@@ -210,36 +204,32 @@ describe('readPathFromWorkspace', () => {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('my-dir', config);
+      const result = await readPathFromWorkspace("my-dir", config);
 
       const resultText = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
-          return '';
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
+          return "";
         })
-        .join('');
+        .join("");
 
-      expect(resultText).toContain('content of file 1');
-      expect(resultText).toContain('nested content');
-      expect(resultText).toContain(
-        `--- ${path.join('sub-dir', 'nested.txt')} ---`,
-      );
+      expect(resultText).toContain("content of file 1");
+      expect(resultText).toContain("nested content");
+      expect(resultText).toContain(`--- ${path.join("sub-dir", "nested.txt")} ---`);
     });
 
-    it('should handle mixed content and include files from subdirectories', async () => {
-      const imageData = Buffer.from([
-        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-      ]);
+    it("should handle mixed content and include files from subdirectories", async () => {
+      const imageData = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
       mock({
         [CWD]: {
-          'mixed-dir': {
-            'info.txt': 'some text',
-            'photo.png': imageData,
-            'sub-dir': {
-              'nested.txt': 'this should be included',
+          "mixed-dir": {
+            "info.txt": "some text",
+            "photo.png": imageData,
+            "sub-dir": {
+              "nested.txt": "this should be included",
             },
-            'empty-sub-dir': {},
+            "empty-sub-dir": {},
           },
         },
       });
@@ -247,104 +237,97 @@ describe('readPathFromWorkspace', () => {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('mixed-dir', config);
+      const result = await readPathFromWorkspace("mixed-dir", config);
 
       // Check for the text part
       const textContent = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
-          return ''; // Ignore non-text parts for this assertion
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
+          return ""; // Ignore non-text parts for this assertion
         })
-        .join('');
-      expect(textContent).toContain('some text');
-      expect(textContent).toContain('this should be included');
+        .join("");
+      expect(textContent).toContain("some text");
+      expect(textContent).toContain("this should be included");
 
       // Check for the image part
-      const imagePart = result.find(
-        (p) => typeof p === 'object' && 'inlineData' in p,
-      );
+      const imagePart = result.find((p) => typeof p === "object" && "inlineData" in p);
       expect(imagePart).toEqual({
         inlineData: {
-          mimeType: 'image/png',
-          data: imageData.toString('base64'),
+          mimeType: "image/png",
+          data: imageData.toString("base64"),
         },
       });
     });
 
-    it('should handle an empty directory', async () => {
+    it("should handle an empty directory", async () => {
       mock({
         [CWD]: {
-          'empty-dir': {},
+          "empty-dir": {},
         },
       });
       const mockFileService = {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('empty-dir', config);
+      const result = await readPathFromWorkspace("empty-dir", config);
       expect(result).toEqual([
-        { text: '--- Start of content for directory: empty-dir ---\n' },
-        { text: '--- End of content for directory: empty-dir ---' },
+        { text: "--- Start of content for directory: empty-dir ---\n" },
+        { text: "--- End of content for directory: empty-dir ---" },
       ]);
     });
   });
 
-  describe('File Ignoring', () => {
-    it('should return an empty array for an ignored file', async () => {
+  describe("File Ignoring", () => {
+    it("should return an empty array for an ignored file", async () => {
       mock({
         [CWD]: {
-          'ignored.txt': 'ignored content',
+          "ignored.txt": "ignored content",
         },
       });
       const mockFileService = {
         filterFiles: vi.fn(() => []), // Simulate the file being filtered out
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('ignored.txt', config);
+      const result = await readPathFromWorkspace("ignored.txt", config);
       expect(result).toEqual([]);
-      expect(mockFileService.filterFiles).toHaveBeenCalledWith(
-        ['ignored.txt'],
-        {
-          respectGitIgnore: true,
-          respectGeminiIgnore: true,
-        },
-      );
+      expect(mockFileService.filterFiles).toHaveBeenCalledWith(["ignored.txt"], {
+        respectGitIgnore: true,
+        respectGeminiIgnore: true,
+      });
     });
 
-    it('should not read ignored files when expanding a directory', async () => {
+    it("should not read ignored files when expanding a directory", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'not-ignored.txt': 'visible',
-            'ignored.log': 'invisible',
+          "my-dir": {
+            "not-ignored.txt": "visible",
+            "ignored.log": "invisible",
           },
         },
       });
       const mockFileService = {
-        filterFiles: vi.fn((files: string[]) =>
-          files.filter((f) => !f.endsWith('ignored.log')),
-        ),
+        filterFiles: vi.fn((files: string[]) => files.filter((f) => !f.endsWith("ignored.log"))),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('my-dir', config);
+      const result = await readPathFromWorkspace("my-dir", config);
       const resultText = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
-          return '';
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
+          return "";
         })
-        .join('');
+        .join("");
 
-      expect(resultText).toContain('visible');
-      expect(resultText).not.toContain('invisible');
+      expect(resultText).toContain("visible");
+      expect(resultText).not.toContain("invisible");
       expect(mockFileService.filterFiles).toHaveBeenCalled();
     });
 
-    it('should pass correct ignore flags to file service for a single file', async () => {
+    it("should pass correct ignore flags to file service for a single file", async () => {
       mock({
         [CWD]: {
-          'file.txt': 'content',
+          "file.txt": "content",
         },
       });
       const mockFileService = {
@@ -354,18 +337,18 @@ describe('readPathFromWorkspace', () => {
         respectGitIgnore: false,
         respectGeminiIgnore: true,
       });
-      await readPathFromWorkspace('file.txt', config);
-      expect(mockFileService.filterFiles).toHaveBeenCalledWith(['file.txt'], {
+      await readPathFromWorkspace("file.txt", config);
+      expect(mockFileService.filterFiles).toHaveBeenCalledWith(["file.txt"], {
         respectGitIgnore: false,
         respectGeminiIgnore: true,
       });
     });
 
-    it('should pass correct ignore flags to file service for a directory', async () => {
+    it("should pass correct ignore flags to file service for a directory", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'file.txt': 'content',
+          "my-dir": {
+            "file.txt": "content",
           },
         },
       });
@@ -376,23 +359,20 @@ describe('readPathFromWorkspace', () => {
         respectGitIgnore: true,
         respectGeminiIgnore: false,
       });
-      await readPathFromWorkspace('my-dir', config);
-      expect(mockFileService.filterFiles).toHaveBeenCalledWith(
-        [path.join('my-dir', 'file.txt')],
-        {
-          respectGitIgnore: true,
-          respectGeminiIgnore: false,
-        },
-      );
+      await readPathFromWorkspace("my-dir", config);
+      expect(mockFileService.filterFiles).toHaveBeenCalledWith([path.join("my-dir", "file.txt")], {
+        respectGitIgnore: true,
+        respectGeminiIgnore: false,
+      });
     });
   });
 
-  it('should throw an error for an absolute path outside the workspace', async () => {
-    const absPath = path.join(OUTSIDE_DIR, 'secret.txt');
+  it("should throw an error for an absolute path outside the workspace", async () => {
+    const absPath = path.join(OUTSIDE_DIR, "secret.txt");
     mock({
       [CWD]: {},
       [OUTSIDE_DIR]: {
-        'secret.txt': 'secrets',
+        "secret.txt": "secrets",
       },
     });
     // OUTSIDE_DIR is not added to the config's workspace
@@ -402,25 +382,25 @@ describe('readPathFromWorkspace', () => {
     );
   });
 
-  it('should throw an error if a relative path is not found anywhere', async () => {
+  it("should throw an error if a relative path is not found anywhere", async () => {
     mock({
       [CWD]: {},
       [OTHER_DIR]: {},
     });
     const config = createMockConfig(CWD, [OTHER_DIR]);
-    await expect(
-      readPathFromWorkspace('not-found.txt', config),
-    ).rejects.toThrow('Path not found in workspace: not-found.txt');
+    await expect(readPathFromWorkspace("not-found.txt", config)).rejects.toThrow(
+      "Path not found in workspace: not-found.txt",
+    );
   });
 
   // mock-fs permission simulation is unreliable on Windows.
-  it.skipIf(process.platform === 'win32')(
-    'should return an error string if reading a file with no permissions',
+  it.skipIf(process.platform === "win32")(
+    "should return an error string if reading a file with no permissions",
     async () => {
       mock({
         [CWD]: {
-          'unreadable.txt': mock.file({
-            content: 'you cannot read me',
+          "unreadable.txt": mock.file({
+            content: "you cannot read me",
             mode: 0o222, // Write-only
           }),
         },
@@ -430,30 +410,30 @@ describe('readPathFromWorkspace', () => {
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
       // processSingleFileContent catches the error and returns an error string.
-      const result = await readPathFromWorkspace('unreadable.txt', config);
+      const result = await readPathFromWorkspace("unreadable.txt", config);
       const textResult = result[0] as string;
 
       // processSingleFileContent formats errors using the relative path from the target dir (CWD).
-      expect(textResult).toContain('Error reading file unreadable.txt');
+      expect(textResult).toContain("Error reading file unreadable.txt");
       expect(textResult).toMatch(/(EACCES|permission denied)/i);
     },
   );
 
-  it('should return an error string for files exceeding the size limit', async () => {
+  it("should return an error string for files exceeding the size limit", async () => {
     // Mock a file slightly larger than the 20MB limit defined in fileUtils.ts
-    const largeContent = 'a'.repeat(21 * 1024 * 1024); // 21MB
+    const largeContent = "a".repeat(21 * 1024 * 1024); // 21MB
     mock({
       [CWD]: {
-        'large.txt': largeContent,
+        "large.txt": largeContent,
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('large.txt', config);
+    const result = await readPathFromWorkspace("large.txt", config);
     const textResult = result[0] as string;
     // The error message comes directly from processSingleFileContent
-    expect(textResult).toBe('File size exceeds the 20MB limit.');
+    expect(textResult).toBe("File size exceeds the 20MB limit.");
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/pathReader.ts b/packages/gemini-cli-core/src/utils/pathReader.ts
index 486ce2a82..ec697a8e9 100644
--- a/packages/gemini-cli-core/src/utils/pathReader.ts
+++ b/packages/gemini-cli-core/src/utils/pathReader.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { glob } from 'glob';
-import type { PartUnion } from '@google/genai';
-import { processSingleFileContent } from './fileUtils.js';
-import type { Config } from '../config/config.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import type { PartUnion } from "@google/genai";
+import { glob } from "glob";
+import type { Config } from "../config/config.js";
+import { processSingleFileContent } from "./fileUtils.js";
 
 /**
  * Reads the content of a file or recursively expands a directory from
@@ -20,19 +20,14 @@ import type { Config } from '../config/config.js';
  * @returns A promise that resolves to an array of PartUnion (string | Part).
  * @throws An error if the path is not found or is outside the workspace.
  */
-export async function readPathFromWorkspace(
-  pathStr: string,
-  config: Config,
-): Promise<PartUnion[]> {
+export async function readPathFromWorkspace(pathStr: string, config: Config): Promise<PartUnion[]> {
   const workspace = config.getWorkspaceContext();
   const fileService = config.getFileService();
   let absolutePath: string | null = null;
 
   if (path.isAbsolute(pathStr)) {
     if (!workspace.isPathWithinWorkspace(pathStr)) {
-      throw new Error(
-        `Absolute path is outside of the allowed workspace: ${pathStr}`,
-      );
+      throw new Error(`Absolute path is outside of the allowed workspace: ${pathStr}`);
     }
     absolutePath = pathStr;
   } else {
@@ -62,23 +57,19 @@ export async function readPathFromWorkspace(
     });
 
     // Use glob to recursively find all files within the directory.
-    const files = await glob('**/*', {
+    const files = await glob("**/*", {
       cwd: absolutePath,
       nodir: true, // We only want files
       dot: true, // Include dotfiles
       absolute: true,
     });
 
-    const relativeFiles = files.map((p) =>
-      path.relative(config.getTargetDir(), p),
-    );
+    const relativeFiles = files.map((p) => path.relative(config.getTargetDir(), p));
     const filteredFiles = fileService.filterFiles(relativeFiles, {
       respectGitIgnore: config.getFileFilteringRespectGitIgnore(),
       respectGeminiIgnore: config.getFileFilteringRespectGeminiIgnore(),
     });
-    const finalFiles = filteredFiles.map((p) =>
-      path.resolve(config.getTargetDir(), p),
-    );
+    const finalFiles = filteredFiles.map((p) => path.resolve(config.getTargetDir(), p));
 
     for (const filePath of finalFiles) {
       const relativePathForDisplay = path.relative(absolutePath, filePath);
@@ -89,7 +80,7 @@ export async function readPathFromWorkspace(
         config.getFileSystemService(),
       );
       allParts.push(result.llmContent);
-      allParts.push({ text: '\n' }); // Add a newline for separation
+      allParts.push({ text: "\n" }); // Add a newline for separation
     }
 
     allParts.push({ text: `--- End of content for directory: ${pathStr} ---` });
diff --git a/packages/gemini-cli-core/src/utils/paths.test.ts b/packages/gemini-cli-core/src/utils/paths.test.ts
index 210dc8b44..10a1fa0d0 100644
--- a/packages/gemini-cli-core/src/utils/paths.test.ts
+++ b/packages/gemini-cli-core/src/utils/paths.test.ts
@@ -4,132 +4,122 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
-import { escapePath, unescapePath, isSubpath, shortenPath } from './paths.js';
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { escapePath, isSubpath, shortenPath, unescapePath } from "./paths.js";
 
-describe('escapePath', () => {
+describe("escapePath", () => {
   it.each([
-    ['spaces', 'my file.txt', 'my\\ file.txt'],
-    ['tabs', 'file\twith\ttabs.txt', 'file\\\twith\\\ttabs.txt'],
-    ['parentheses', 'file(1).txt', 'file\\(1\\).txt'],
-    ['square brackets', 'file[backup].txt', 'file\\[backup\\].txt'],
-    ['curly braces', 'file{temp}.txt', 'file\\{temp\\}.txt'],
-    ['semicolons', 'file;name.txt', 'file\\;name.txt'],
-    ['ampersands', 'file&name.txt', 'file\\&name.txt'],
-    ['pipes', 'file|name.txt', 'file\\|name.txt'],
-    ['asterisks', 'file*.txt', 'file\\*.txt'],
-    ['question marks', 'file?.txt', 'file\\?.txt'],
-    ['dollar signs', 'file$name.txt', 'file\\$name.txt'],
-    ['backticks', 'file`name.txt', 'file\\`name.txt'],
-    ['single quotes', "file'name.txt", "file\\'name.txt"],
-    ['double quotes', 'file"name.txt', 'file\\"name.txt'],
-    ['hash symbols', 'file#name.txt', 'file\\#name.txt'],
-    ['exclamation marks', 'file!name.txt', 'file\\!name.txt'],
-    ['tildes', 'file~name.txt', 'file\\~name.txt'],
-    [
-      'less than and greater than signs',
-      'file<name>.txt',
-      'file\\<name\\>.txt',
-    ],
-  ])('should escape %s', (_, input, expected) => {
+    ["spaces", "my file.txt", "my\\ file.txt"],
+    ["tabs", "file\twith\ttabs.txt", "file\\\twith\\\ttabs.txt"],
+    ["parentheses", "file(1).txt", "file\\(1\\).txt"],
+    ["square brackets", "file[backup].txt", "file\\[backup\\].txt"],
+    ["curly braces", "file{temp}.txt", "file\\{temp\\}.txt"],
+    ["semicolons", "file;name.txt", "file\\;name.txt"],
+    ["ampersands", "file&name.txt", "file\\&name.txt"],
+    ["pipes", "file|name.txt", "file\\|name.txt"],
+    ["asterisks", "file*.txt", "file\\*.txt"],
+    ["question marks", "file?.txt", "file\\?.txt"],
+    ["dollar signs", "file$name.txt", "file\\$name.txt"],
+    ["backticks", "file`name.txt", "file\\`name.txt"],
+    ["single quotes", "file'name.txt", "file\\'name.txt"],
+    ["double quotes", 'file"name.txt', 'file\\"name.txt'],
+    ["hash symbols", "file#name.txt", "file\\#name.txt"],
+    ["exclamation marks", "file!name.txt", "file\\!name.txt"],
+    ["tildes", "file~name.txt", "file\\~name.txt"],
+    ["less than and greater than signs", "file<name>.txt", "file\\<name\\>.txt"],
+  ])("should escape %s", (_, input, expected) => {
     expect(escapePath(input)).toBe(expected);
   });
 
-  it('should handle multiple special characters', () => {
-    expect(escapePath('my file (backup) [v1.2].txt')).toBe(
-      'my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt',
+  it("should handle multiple special characters", () => {
+    expect(escapePath("my file (backup) [v1.2].txt")).toBe(
+      "my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt",
     );
   });
 
-  it('should not double-escape already escaped characters', () => {
-    expect(escapePath('my\\ file.txt')).toBe('my\\ file.txt');
-    expect(escapePath('file\\(name\\).txt')).toBe('file\\(name\\).txt');
+  it("should not double-escape already escaped characters", () => {
+    expect(escapePath("my\\ file.txt")).toBe("my\\ file.txt");
+    expect(escapePath("file\\(name\\).txt")).toBe("file\\(name\\).txt");
   });
 
-  it('should handle escaped backslashes correctly', () => {
+  it("should handle escaped backslashes correctly", () => {
     // Double backslash (escaped backslash) followed by space should escape the space
-    expect(escapePath('path\\\\ file.txt')).toBe('path\\\\\\ file.txt');
+    expect(escapePath("path\\\\ file.txt")).toBe("path\\\\\\ file.txt");
     // Triple backslash (escaped backslash + escaping backslash) followed by space should not double-escape
-    expect(escapePath('path\\\\\\ file.txt')).toBe('path\\\\\\ file.txt');
+    expect(escapePath("path\\\\\\ file.txt")).toBe("path\\\\\\ file.txt");
     // Quadruple backslash (two escaped backslashes) followed by space should escape the space
-    expect(escapePath('path\\\\\\\\ file.txt')).toBe('path\\\\\\\\\\ file.txt');
+    expect(escapePath("path\\\\\\\\ file.txt")).toBe("path\\\\\\\\\\ file.txt");
   });
 
-  it('should handle complex escaped backslash scenarios', () => {
+  it("should handle complex escaped backslash scenarios", () => {
     // Escaped backslash before special character that needs escaping
-    expect(escapePath('file\\\\(test).txt')).toBe('file\\\\\\(test\\).txt');
+    expect(escapePath("file\\\\(test).txt")).toBe("file\\\\\\(test\\).txt");
     // Multiple escaped backslashes
-    expect(escapePath('path\\\\\\\\with space.txt')).toBe(
-      'path\\\\\\\\with\\ space.txt',
-    );
+    expect(escapePath("path\\\\\\\\with space.txt")).toBe("path\\\\\\\\with\\ space.txt");
   });
 
-  it('should handle paths without special characters', () => {
-    expect(escapePath('normalfile.txt')).toBe('normalfile.txt');
-    expect(escapePath('path/to/normalfile.txt')).toBe('path/to/normalfile.txt');
+  it("should handle paths without special characters", () => {
+    expect(escapePath("normalfile.txt")).toBe("normalfile.txt");
+    expect(escapePath("path/to/normalfile.txt")).toBe("path/to/normalfile.txt");
   });
 
-  it('should handle complex real-world examples', () => {
-    expect(escapePath('My Documents/Project (2024)/file [backup].txt')).toBe(
-      'My\\ Documents/Project\\ \\(2024\\)/file\\ \\[backup\\].txt',
+  it("should handle complex real-world examples", () => {
+    expect(escapePath("My Documents/Project (2024)/file [backup].txt")).toBe(
+      "My\\ Documents/Project\\ \\(2024\\)/file\\ \\[backup\\].txt",
     );
-    expect(escapePath('file with $special &chars!.txt')).toBe(
-      'file\\ with\\ \\$special\\ \\&chars\\!.txt',
+    expect(escapePath("file with $special &chars!.txt")).toBe(
+      "file\\ with\\ \\$special\\ \\&chars\\!.txt",
     );
   });
 
-  it('should handle empty strings', () => {
-    expect(escapePath('')).toBe('');
+  it("should handle empty strings", () => {
+    expect(escapePath("")).toBe("");
   });
 
-  it('should handle paths with only special characters', () => {
-    expect(escapePath(' ()[]{};&|*?$`\'"#!~<>')).toBe(
-      '\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\\'\\"\\#\\!\\~\\<\\>',
+  it("should handle paths with only special characters", () => {
+    expect(escapePath(" ()[]{};&|*?$`'\"#!~<>")).toBe(
+      "\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\'\\\"\\#\\!\\~\\<\\>",
     );
   });
 });
 
-describe('unescapePath', () => {
+describe("unescapePath", () => {
   it.each([
-    ['spaces', 'my\\ file.txt', 'my file.txt'],
-    ['tabs', 'file\\\twith\\\ttabs.txt', 'file\twith\ttabs.txt'],
-    ['parentheses', 'file\\(1\\).txt', 'file(1).txt'],
-    ['square brackets', 'file\\[backup\\].txt', 'file[backup].txt'],
-    ['curly braces', 'file\\{temp\\}.txt', 'file{temp}.txt'],
-  ])('should unescape %s', (_, input, expected) => {
+    ["spaces", "my\\ file.txt", "my file.txt"],
+    ["tabs", "file\\\twith\\\ttabs.txt", "file\twith\ttabs.txt"],
+    ["parentheses", "file\\(1\\).txt", "file(1).txt"],
+    ["square brackets", "file\\[backup\\].txt", "file[backup].txt"],
+    ["curly braces", "file\\{temp\\}.txt", "file{temp}.txt"],
+  ])("should unescape %s", (_, input, expected) => {
     expect(unescapePath(input)).toBe(expected);
   });
 
-  it('should unescape multiple special characters', () => {
-    expect(unescapePath('my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt')).toBe(
-      'my file (backup) [v1.2].txt',
+  it("should unescape multiple special characters", () => {
+    expect(unescapePath("my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt")).toBe(
+      "my file (backup) [v1.2].txt",
     );
   });
 
-  it('should handle paths without escaped characters', () => {
-    expect(unescapePath('normalfile.txt')).toBe('normalfile.txt');
-    expect(unescapePath('path/to/normalfile.txt')).toBe(
-      'path/to/normalfile.txt',
-    );
+  it("should handle paths without escaped characters", () => {
+    expect(unescapePath("normalfile.txt")).toBe("normalfile.txt");
+    expect(unescapePath("path/to/normalfile.txt")).toBe("path/to/normalfile.txt");
   });
 
-  it('should handle all special characters', () => {
-    expect(
-      unescapePath(
-        '\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\\'\\"\\#\\!\\~\\<\\>',
-      ),
-    ).toBe(' ()[]{};&|*?$`\'"#!~<>');
+  it("should handle all special characters", () => {
+    expect(unescapePath("\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\'\\\"\\#\\!\\~\\<\\>")).toBe(
+      " ()[]{};&|*?$`'\"#!~<>",
+    );
   });
 
-  it('should be the inverse of escapePath', () => {
+  it("should be the inverse of escapePath", () => {
     const testCases = [
-      'my file.txt',
-      'file(1).txt',
-      'file[backup].txt',
-      'My Documents/Project (2024)/file [backup].txt',
-      'file with $special &chars!.txt',
-      ' ()[]{};&|*?$`\'"#!~<>',
-      'file\twith\ttabs.txt',
+      "my file.txt",
+      "file(1).txt",
+      "file[backup].txt",
+      "My Documents/Project (2024)/file [backup].txt",
+      "file with $special &chars!.txt",
+      " ()[]{};&|*?$`'\"#!~<>",
+      "file\twith\ttabs.txt",
     ];
 
     testCases.forEach((testCase) => {
@@ -137,337 +127,313 @@ describe('unescapePath', () => {
     });
   });
 
-  it('should handle empty strings', () => {
-    expect(unescapePath('')).toBe('');
+  it("should handle empty strings", () => {
+    expect(unescapePath("")).toBe("");
   });
 
-  it('should not affect backslashes not followed by special characters', () => {
-    expect(unescapePath('file\\name.txt')).toBe('file\\name.txt');
-    expect(unescapePath('path\\to\\file.txt')).toBe('path\\to\\file.txt');
+  it("should not affect backslashes not followed by special characters", () => {
+    expect(unescapePath("file\\name.txt")).toBe("file\\name.txt");
+    expect(unescapePath("path\\to\\file.txt")).toBe("path\\to\\file.txt");
   });
 
-  it('should handle escaped backslashes in unescaping', () => {
+  it("should handle escaped backslashes in unescaping", () => {
     // Should correctly unescape when there are escaped backslashes
-    expect(unescapePath('path\\\\\\ file.txt')).toBe('path\\\\ file.txt');
-    expect(unescapePath('path\\\\\\\\\\ file.txt')).toBe(
-      'path\\\\\\\\ file.txt',
-    );
-    expect(unescapePath('file\\\\\\(test\\).txt')).toBe('file\\\\(test).txt');
+    expect(unescapePath("path\\\\\\ file.txt")).toBe("path\\\\ file.txt");
+    expect(unescapePath("path\\\\\\\\\\ file.txt")).toBe("path\\\\\\\\ file.txt");
+    expect(unescapePath("file\\\\\\(test\\).txt")).toBe("file\\\\(test).txt");
   });
 });
 
-describe('isSubpath', () => {
-  it('should return true for a direct subpath', () => {
-    expect(isSubpath('/a/b', '/a/b/c')).toBe(true);
+describe("isSubpath", () => {
+  it("should return true for a direct subpath", () => {
+    expect(isSubpath("/a/b", "/a/b/c")).toBe(true);
   });
 
-  it('should return true for the same path', () => {
-    expect(isSubpath('/a/b', '/a/b')).toBe(true);
+  it("should return true for the same path", () => {
+    expect(isSubpath("/a/b", "/a/b")).toBe(true);
   });
 
-  it('should return false for a parent path', () => {
-    expect(isSubpath('/a/b/c', '/a/b')).toBe(false);
+  it("should return false for a parent path", () => {
+    expect(isSubpath("/a/b/c", "/a/b")).toBe(false);
   });
 
-  it('should return false for a completely different path', () => {
-    expect(isSubpath('/a/b', '/x/y')).toBe(false);
+  it("should return false for a completely different path", () => {
+    expect(isSubpath("/a/b", "/x/y")).toBe(false);
   });
 
-  it('should handle relative paths', () => {
-    expect(isSubpath('a/b', 'a/b/c')).toBe(true);
-    expect(isSubpath('a/b', 'a/c')).toBe(false);
+  it("should handle relative paths", () => {
+    expect(isSubpath("a/b", "a/b/c")).toBe(true);
+    expect(isSubpath("a/b", "a/c")).toBe(false);
   });
 
-  it('should handle paths with ..', () => {
-    expect(isSubpath('/a/b', '/a/b/../b/c')).toBe(true);
-    expect(isSubpath('/a/b', '/a/c/../b')).toBe(true);
+  it("should handle paths with ..", () => {
+    expect(isSubpath("/a/b", "/a/b/../b/c")).toBe(true);
+    expect(isSubpath("/a/b", "/a/c/../b")).toBe(true);
   });
 
-  it('should handle root paths', () => {
-    expect(isSubpath('/', '/a')).toBe(true);
-    expect(isSubpath('/a', '/')).toBe(false);
+  it("should handle root paths", () => {
+    expect(isSubpath("/", "/a")).toBe(true);
+    expect(isSubpath("/a", "/")).toBe(false);
   });
 
-  it('should handle trailing slashes', () => {
-    expect(isSubpath('/a/b/', '/a/b/c')).toBe(true);
-    expect(isSubpath('/a/b', '/a/b/c/')).toBe(true);
-    expect(isSubpath('/a/b/', '/a/b/c/')).toBe(true);
+  it("should handle trailing slashes", () => {
+    expect(isSubpath("/a/b/", "/a/b/c")).toBe(true);
+    expect(isSubpath("/a/b", "/a/b/c/")).toBe(true);
+    expect(isSubpath("/a/b/", "/a/b/c/")).toBe(true);
   });
 });
 
-describe('isSubpath on Windows', () => {
+describe("isSubpath on Windows", () => {
   const originalPlatform = process.platform;
 
   beforeAll(() => {
-    Object.defineProperty(process, 'platform', {
-      value: 'win32',
+    Object.defineProperty(process, "platform", {
+      value: "win32",
     });
   });
 
   afterAll(() => {
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
     });
   });
 
-  it('should return true for a direct subpath on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'C:\\Users\\Test\\file.txt')).toBe(
-      true,
-    );
+  it("should return true for a direct subpath on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should return true for the same path on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'C:\\Users\\Test')).toBe(true);
+  it("should return true for the same path on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "C:\\Users\\Test")).toBe(true);
   });
 
-  it('should return false for a parent path on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test\\file.txt', 'C:\\Users\\Test')).toBe(
-      false,
-    );
+  it("should return false for a parent path on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test\\file.txt", "C:\\Users\\Test")).toBe(false);
   });
 
-  it('should return false for a different drive on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'D:\\Users\\Test')).toBe(false);
+  it("should return false for a different drive on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "D:\\Users\\Test")).toBe(false);
   });
 
-  it('should be case-insensitive for drive letters on Windows', () => {
-    expect(isSubpath('c:\\Users\\Test', 'C:\\Users\\Test\\file.txt')).toBe(
-      true,
-    );
+  it("should be case-insensitive for drive letters on Windows", () => {
+    expect(isSubpath("c:\\Users\\Test", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should be case-insensitive for path components on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'c:\\users\\test\\file.txt')).toBe(
-      true,
-    );
+  it("should be case-insensitive for path components on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "c:\\users\\test\\file.txt")).toBe(true);
   });
 
-  it('should handle mixed slashes on Windows', () => {
-    expect(isSubpath('C:/Users/Test', 'C:\\Users\\Test\\file.txt')).toBe(true);
+  it("should handle mixed slashes on Windows", () => {
+    expect(isSubpath("C:/Users/Test", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should handle trailing slashes on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test\\', 'C:\\Users\\Test\\file.txt')).toBe(
-      true,
-    );
+  it("should handle trailing slashes on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test\\", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should handle relative paths correctly on Windows', () => {
-    expect(isSubpath('Users\\Test', 'Users\\Test\\file.txt')).toBe(true);
-    expect(isSubpath('Users\\Test\\file.txt', 'Users\\Test')).toBe(false);
+  it("should handle relative paths correctly on Windows", () => {
+    expect(isSubpath("Users\\Test", "Users\\Test\\file.txt")).toBe(true);
+    expect(isSubpath("Users\\Test\\file.txt", "Users\\Test")).toBe(false);
   });
 });
 
-describe('shortenPath', () => {
-  describe.skipIf(process.platform === 'win32')('on POSIX', () => {
-    it('should not shorten a path that is shorter than maxLen', () => {
-      const p = '/path/to/file.txt';
+describe("shortenPath", () => {
+  describe.skipIf(process.platform === "win32")("on POSIX", () => {
+    it("should not shorten a path that is shorter than maxLen", () => {
+      const p = "/path/to/file.txt";
       expect(shortenPath(p, 40)).toBe(p);
     });
 
-    it('should not shorten a path that is equal to maxLen', () => {
-      const p = '/path/to/file.txt';
+    it("should not shorten a path that is equal to maxLen", () => {
+      const p = "/path/to/file.txt";
       expect(shortenPath(p, p.length)).toBe(p);
     });
 
-    it('should shorten a long path, keeping start and end from a short limit', () => {
-      const p = '/path/to/a/very/long/directory/name/file.txt';
-      expect(shortenPath(p, 25)).toBe('/path/.../name/file.txt');
+    it("should shorten a long path, keeping start and end from a short limit", () => {
+      const p = "/path/to/a/very/long/directory/name/file.txt";
+      expect(shortenPath(p, 25)).toBe("/path/.../name/file.txt");
     });
 
-    it('should shorten a long path, keeping more from the end from a longer limit', () => {
-      const p = '/path/to/a/very/long/directory/name/file.txt';
-      expect(shortenPath(p, 35)).toBe('/path/.../directory/name/file.txt');
+    it("should shorten a long path, keeping more from the end from a longer limit", () => {
+      const p = "/path/to/a/very/long/directory/name/file.txt";
+      expect(shortenPath(p, 35)).toBe("/path/.../directory/name/file.txt");
     });
 
-    it('should handle deep paths where few segments from the end fit', () => {
-      const p = '/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt';
-      expect(shortenPath(p, 20)).toBe('/a/.../y/z/file.txt');
+    it("should handle deep paths where few segments from the end fit", () => {
+      const p = "/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt";
+      expect(shortenPath(p, 20)).toBe("/a/.../y/z/file.txt");
     });
 
-    it('should handle deep paths where many segments from the end fit', () => {
-      const p = '/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt';
-      expect(shortenPath(p, 45)).toBe(
-        '/a/.../l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt',
-      );
+    it("should handle deep paths where many segments from the end fit", () => {
+      const p = "/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt";
+      expect(shortenPath(p, 45)).toBe("/a/.../l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt");
     });
 
-    it('should handle a long filename in the root when it needs shortening', () => {
-      const p = '/a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        '/a-very-long-filen...o-be-shortened.txt',
-      );
+    it("should handle a long filename in the root when it needs shortening", () => {
+      const p = "/a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("/a-very-long-filen...o-be-shortened.txt");
     });
 
-    it('should handle root path', () => {
-      const p = '/';
-      expect(shortenPath(p, 10)).toBe('/');
+    it("should handle root path", () => {
+      const p = "/";
+      expect(shortenPath(p, 10)).toBe("/");
     });
 
-    it('should handle a path with one long segment after root', () => {
-      const p = '/a-very-long-directory-name';
-      expect(shortenPath(p, 20)).toBe('/a-very-...ory-name');
+    it("should handle a path with one long segment after root", () => {
+      const p = "/a-very-long-directory-name";
+      expect(shortenPath(p, 20)).toBe("/a-very-...ory-name");
     });
 
-    it('should handle a path with just a long filename (no root)', () => {
-      const p = 'a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        'a-very-long-filena...o-be-shortened.txt',
-      );
+    it("should handle a path with just a long filename (no root)", () => {
+      const p = "a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("a-very-long-filena...o-be-shortened.txt");
     });
 
-    it('should fallback to truncating earlier segments while keeping the last intact', () => {
-      const p = '/abcdef/fghij.txt';
+    it("should fallback to truncating earlier segments while keeping the last intact", () => {
+      const p = "/abcdef/fghij.txt";
       const result = shortenPath(p, 10);
-      expect(result).toBe('/fghij.txt');
+      expect(result).toBe("/fghij.txt");
       expect(result.length).toBeLessThanOrEqual(10);
     });
 
-    it('should fallback by truncating start and middle segments when needed', () => {
-      const p = '/averylongcomponentname/another/short.txt';
+    it("should fallback by truncating start and middle segments when needed", () => {
+      const p = "/averylongcomponentname/another/short.txt";
       const result = shortenPath(p, 25);
-      expect(result).toBe('/averylo.../.../short.txt');
+      expect(result).toBe("/averylo.../.../short.txt");
       expect(result.length).toBeLessThanOrEqual(25);
     });
 
-    it('should show only the last segment when maxLen is tiny', () => {
-      const p = '/foo/bar/baz.txt';
+    it("should show only the last segment when maxLen is tiny", () => {
+      const p = "/foo/bar/baz.txt";
       const result = shortenPath(p, 8);
-      expect(result).toBe('/baz.txt');
+      expect(result).toBe("/baz.txt");
       expect(result.length).toBeLessThanOrEqual(8);
     });
 
-    it('should fall back to simple truncation when the last segment exceeds maxLen', () => {
-      const longFile = 'x'.repeat(60) + '.txt';
+    it("should fall back to simple truncation when the last segment exceeds maxLen", () => {
+      const longFile = "x".repeat(60) + ".txt";
       const p = `/really/long/${longFile}`;
       const result = shortenPath(p, 50);
-      expect(result).toBe('/really/long/xxxxxxxxxx...xxxxxxxxxxxxxxxxxxx.txt');
+      expect(result).toBe("/really/long/xxxxxxxxxx...xxxxxxxxxxxxxxxxxxx.txt");
       expect(result.length).toBeLessThanOrEqual(50);
     });
 
-    it('should handle relative paths without a root', () => {
-      const p = 'foo/bar/baz/qux.txt';
+    it("should handle relative paths without a root", () => {
+      const p = "foo/bar/baz/qux.txt";
       const result = shortenPath(p, 18);
-      expect(result).toBe('foo/.../qux.txt');
+      expect(result).toBe("foo/.../qux.txt");
       expect(result.length).toBeLessThanOrEqual(18);
     });
 
-    it('should ignore empty segments created by repeated separators', () => {
-      const p = '/foo//bar///baz/verylongname.txt';
+    it("should ignore empty segments created by repeated separators", () => {
+      const p = "/foo//bar///baz/verylongname.txt";
       const result = shortenPath(p, 20);
-      expect(result).toBe('.../verylongname.txt');
+      expect(result).toBe(".../verylongname.txt");
       expect(result.length).toBeLessThanOrEqual(20);
     });
   });
 
-  describe.skipIf(process.platform !== 'win32')('on Windows', () => {
-    it('should not shorten a path that is shorter than maxLen', () => {
-      const p = 'C\\Users\\Test\\file.txt';
+  describe.skipIf(process.platform !== "win32")("on Windows", () => {
+    it("should not shorten a path that is shorter than maxLen", () => {
+      const p = "C\\Users\\Test\\file.txt";
       expect(shortenPath(p, 40)).toBe(p);
     });
 
-    it('should not shorten a path that is equal to maxLen', () => {
-      const p = 'C\\path\\to\\file.txt';
+    it("should not shorten a path that is equal to maxLen", () => {
+      const p = "C\\path\\to\\file.txt";
       expect(shortenPath(p, p.length)).toBe(p);
     });
 
-    it('should shorten a long path, keeping start and end from a short limit', () => {
-      const p = 'C\\path\\to\\a\\very\\long\\directory\\name\\file.txt';
-      expect(shortenPath(p, 30)).toBe('C\\...\\directory\\name\\file.txt');
+    it("should shorten a long path, keeping start and end from a short limit", () => {
+      const p = "C\\path\\to\\a\\very\\long\\directory\\name\\file.txt";
+      expect(shortenPath(p, 30)).toBe("C\\...\\directory\\name\\file.txt");
     });
 
-    it('should shorten a long path, keeping more from the end from a longer limit', () => {
-      const p = 'C\\path\\to\\a\\very\\long\\directory\\name\\file.txt';
-      expect(shortenPath(p, 42)).toBe(
-        'C\\...\\a\\very\\long\\directory\\name\\file.txt',
-      );
+    it("should shorten a long path, keeping more from the end from a longer limit", () => {
+      const p = "C\\path\\to\\a\\very\\long\\directory\\name\\file.txt";
+      expect(shortenPath(p, 42)).toBe("C\\...\\a\\very\\long\\directory\\name\\file.txt");
     });
 
-    it('should handle deep paths where few segments from the end fit', () => {
+    it("should handle deep paths where few segments from the end fit", () => {
       const p =
-        'C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt';
-      expect(shortenPath(p, 22)).toBe('C\\...\\w\\x\\y\\z\\file.txt');
+        "C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt";
+      expect(shortenPath(p, 22)).toBe("C\\...\\w\\x\\y\\z\\file.txt");
     });
 
-    it('should handle deep paths where many segments from the end fit', () => {
+    it("should handle deep paths where many segments from the end fit", () => {
       const p =
-        'C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt';
+        "C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt";
       expect(shortenPath(p, 47)).toBe(
-        'C\\...\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt',
+        "C\\...\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt",
       );
     });
 
-    it('should handle a long filename in the root when it needs shortening', () => {
-      const p = 'C\\a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        'C\\a-very-long-file...o-be-shortened.txt',
-      );
+    it("should handle a long filename in the root when it needs shortening", () => {
+      const p = "C\\a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("C\\a-very-long-file...o-be-shortened.txt");
     });
 
-    it('should handle root path', () => {
-      const p = 'C\\';
-      expect(shortenPath(p, 10)).toBe('C\\');
+    it("should handle root path", () => {
+      const p = "C\\";
+      expect(shortenPath(p, 10)).toBe("C\\");
     });
 
-    it('should handle a path with one long segment after root', () => {
-      const p = 'C\\a-very-long-directory-name';
-      expect(shortenPath(p, 22)).toBe('C\\a-very-...tory-name');
+    it("should handle a path with one long segment after root", () => {
+      const p = "C\\a-very-long-directory-name";
+      expect(shortenPath(p, 22)).toBe("C\\a-very-...tory-name");
     });
 
-    it('should handle a path with just a long filename (no root)', () => {
-      const p = 'a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        'a-very-long-filena...o-be-shortened.txt',
-      );
+    it("should handle a path with just a long filename (no root)", () => {
+      const p = "a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("a-very-long-filena...o-be-shortened.txt");
     });
 
-    it('should fallback to truncating earlier segments while keeping the last intact', () => {
-      const p = 'C\\abcdef\\fghij.txt';
+    it("should fallback to truncating earlier segments while keeping the last intact", () => {
+      const p = "C\\abcdef\\fghij.txt";
       const result = shortenPath(p, 15);
-      expect(result).toBe('C\\...\\fghij.txt');
+      expect(result).toBe("C\\...\\fghij.txt");
       expect(result.length).toBeLessThanOrEqual(15);
     });
 
-    it('should fallback by truncating start and middle segments when needed', () => {
-      const p = 'C\\averylongcomponentname\\another\\short.txt';
+    it("should fallback by truncating start and middle segments when needed", () => {
+      const p = "C\\averylongcomponentname\\another\\short.txt";
       const result = shortenPath(p, 30);
-      expect(result).toBe('C\\...\\another\\short.txt');
+      expect(result).toBe("C\\...\\another\\short.txt");
       expect(result.length).toBeLessThanOrEqual(30);
     });
 
-    it('should show only the last segment for tiny maxLen values', () => {
-      const p = 'C\\foo\\bar\\baz.txt';
+    it("should show only the last segment for tiny maxLen values", () => {
+      const p = "C\\foo\\bar\\baz.txt";
       const result = shortenPath(p, 12);
-      expect(result).toBe('...\\baz.txt');
+      expect(result).toBe("...\\baz.txt");
       expect(result.length).toBeLessThanOrEqual(12);
     });
 
-    it('should keep the drive prefix when space allows', () => {
-      const p = 'C\\foo\\bar\\baz.txt';
+    it("should keep the drive prefix when space allows", () => {
+      const p = "C\\foo\\bar\\baz.txt";
       const result = shortenPath(p, 14);
-      expect(result).toBe('C\\...\\baz.txt');
+      expect(result).toBe("C\\...\\baz.txt");
       expect(result.length).toBeLessThanOrEqual(14);
     });
 
-    it('should fall back when the last segment exceeds maxLen on Windows', () => {
-      const longFile = 'x'.repeat(60) + '.txt';
+    it("should fall back when the last segment exceeds maxLen on Windows", () => {
+      const longFile = "x".repeat(60) + ".txt";
       const p = `C\\really\\long\\${longFile}`;
       const result = shortenPath(p, 40);
-      expect(result).toBe('C\\really\\long\\xxxx...xxxxxxxxxxxxxx.txt');
+      expect(result).toBe("C\\really\\long\\xxxx...xxxxxxxxxxxxxx.txt");
       expect(result.length).toBeLessThanOrEqual(40);
     });
 
-    it('should handle UNC paths with limited space', () => {
-      const p = '\\server\\share\\deep\\path\\file.txt';
+    it("should handle UNC paths with limited space", () => {
+      const p = "\\server\\share\\deep\\path\\file.txt";
       const result = shortenPath(p, 25);
-      expect(result).toBe('\\server\\...\\path\\file.txt');
+      expect(result).toBe("\\server\\...\\path\\file.txt");
       expect(result.length).toBeLessThanOrEqual(25);
     });
 
-    it('should collapse UNC paths further when maxLen shrinks', () => {
-      const p = '\\server\\share\\deep\\path\\file.txt';
+    it("should collapse UNC paths further when maxLen shrinks", () => {
+      const p = "\\server\\share\\deep\\path\\file.txt";
       const result = shortenPath(p, 18);
-      expect(result).toBe('\\s...\\...\\file.txt');
+      expect(result).toBe("\\s...\\...\\file.txt");
       expect(result.length).toBeLessThanOrEqual(18);
     });
   });
diff --git a/packages/gemini-cli-core/src/utils/paths.ts b/packages/gemini-cli-core/src/utils/paths.ts
index c32a3ce9f..654cb5d5e 100644
--- a/packages/gemini-cli-core/src/utils/paths.ts
+++ b/packages/gemini-cli-core/src/utils/paths.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import os from 'node:os';
-import * as crypto from 'node:crypto';
+import * as crypto from "node:crypto";
+import os from "node:os";
+import path from "node:path";
 
-export const GEMINI_DIR = '.gemini';
-export const GOOGLE_ACCOUNTS_FILENAME = 'google_accounts.json';
+export const GEMINI_DIR = ".gemini";
+export const GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
 
 /**
  * Special characters that need to be escaped in file paths for shell compatibility.
@@ -26,7 +26,7 @@ export const SHELL_SPECIAL_CHARS = /[ \t()[\]{};|*?$`'"#&<>!~]/;
 export function tildeifyPath(path: string): string {
   const homeDir = os.homedir();
   if (path.startsWith(homeDir)) {
-    return path.replace(homeDir, '~');
+    return path.replace(homeDir, "~");
   }
   return path;
 }
@@ -43,14 +43,14 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
   const simpleTruncate = () => {
     const keepLen = Math.floor((maxLen - 3) / 2);
     if (keepLen <= 0) {
-      return filePath.substring(0, maxLen - 3) + '...';
+      return filePath.substring(0, maxLen - 3) + "...";
     }
     const start = filePath.substring(0, keepLen);
     const end = filePath.substring(filePath.length - keepLen);
     return `${start}...${end}`;
   };
 
-  type TruncateMode = 'start' | 'end' | 'center';
+  type TruncateMode = "start" | "end" | "center";
 
   const truncateComponent = (
     component: string,
@@ -62,29 +62,27 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
     }
 
     if (targetLength <= 0) {
-      return '';
+      return "";
     }
 
     if (targetLength <= 3) {
-      if (mode === 'end') {
+      if (mode === "end") {
         return component.slice(-targetLength);
       }
       return component.slice(0, targetLength);
     }
 
-    if (mode === 'start') {
+    if (mode === "start") {
       return `${component.slice(0, targetLength - 3)}...`;
     }
 
-    if (mode === 'end') {
+    if (mode === "end") {
       return `...${component.slice(component.length - (targetLength - 3))}`;
     }
 
     const front = Math.ceil((targetLength - 3) / 2);
     const back = targetLength - 3 - front;
-    return `${component.slice(0, front)}...${component.slice(
-      component.length - back,
-    )}`;
+    return `${component.slice(0, front)}...${component.slice(component.length - back)}`;
   };
 
   const parsedPath = path.parse(filePath);
@@ -93,7 +91,7 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
 
   // Get segments of the path *after* the root
   const relativePath = filePath.substring(root.length);
-  const segments = relativePath.split(separator).filter((s) => s !== ''); // Filter out empty segments
+  const segments = relativePath.split(separator).filter((s) => s !== ""); // Filter out empty segments
 
   // Handle cases with no segments after root (e.g., "/", "C:\") or only one segment
   if (segments.length <= 1) {
@@ -131,12 +129,12 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
   const components = [firstDir, ...endPartSegments];
   const componentModes: TruncateMode[] = components.map((_, index) => {
     if (index === 0) {
-      return 'start';
+      return "start";
     }
     if (index === components.length - 1) {
-      return 'end';
+      return "end";
     }
-    return 'center';
+    return "center";
   });
 
   const separatorsCount = endPartSegments.length + 1;
@@ -240,10 +238,7 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
  * @param rootDirectory The absolute path of the directory to make the target path relative to.
  * @returns The relative path from rootDirectory to targetPath.
  */
-export function makeRelative(
-  targetPath: string,
-  rootDirectory: string,
-): string {
+export function makeRelative(targetPath: string, rootDirectory: string): string {
   if (!path.isAbsolute(targetPath)) {
     return targetPath;
   }
@@ -251,7 +246,7 @@ export function makeRelative(
   const relativePath = path.relative(resolvedRootDirectory, targetPath);
 
   // If the paths are the same, path.relative returns '', return '.' instead
-  return relativePath || '.';
+  return relativePath || ".";
 }
 
 /**
@@ -260,13 +255,13 @@ export function makeRelative(
  * asterisks, question marks, dollar signs, backticks, quotes, hash, and other shell metacharacters.
  */
 export function escapePath(filePath: string): string {
-  let result = '';
+  let result = "";
   for (let i = 0; i < filePath.length; i++) {
     const char = filePath[i];
 
     // Count consecutive backslashes before this character
     let backslashCount = 0;
-    for (let j = i - 1; j >= 0 && filePath[j] === '\\'; j--) {
+    for (let j = i - 1; j >= 0 && filePath[j] === "\\"; j--) {
       backslashCount++;
     }
 
@@ -275,7 +270,7 @@ export function escapePath(filePath: string): string {
 
     // Only escape if not already escaped
     if (!isAlreadyEscaped && SHELL_SPECIAL_CHARS.test(char)) {
-      result += '\\' + char;
+      result += "\\" + char;
     } else {
       result += char;
     }
@@ -289,8 +284,8 @@ export function escapePath(filePath: string): string {
  */
 export function unescapePath(filePath: string): string {
   return filePath.replace(
-    new RegExp(`\\\\([${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`, 'g'),
-    '$1',
+    new RegExp(`\\\\([${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`, "g"),
+    "$1",
   );
 }
 
@@ -300,7 +295,7 @@ export function unescapePath(filePath: string): string {
  * @returns A SHA256 hash of the project root path.
  */
 export function getProjectHash(projectRoot: string): string {
-  return crypto.createHash('sha256').update(projectRoot).digest('hex');
+  return crypto.createHash("sha256").update(projectRoot).digest("hex");
 }
 
 /**
@@ -310,7 +305,7 @@ export function getProjectHash(projectRoot: string): string {
  * @returns True if childPath is a subpath of parentPath, false otherwise.
  */
 export function isSubpath(parentPath: string, childPath: string): boolean {
-  const isWindows = os.platform() === 'win32';
+  const isWindows = os.platform() === "win32";
   const pathModule = isWindows ? path.win32 : path;
 
   // On Windows, path.relative is case-insensitive. On POSIX, it's case-sensitive.
@@ -318,7 +313,7 @@ export function isSubpath(parentPath: string, childPath: string): boolean {
 
   return (
     !relative.startsWith(`..${pathModule.sep}`) &&
-    relative !== '..' &&
+    relative !== ".." &&
     !pathModule.isAbsolute(relative)
   );
 }
diff --git a/packages/gemini-cli-core/src/utils/promptIdContext.ts b/packages/gemini-cli-core/src/utils/promptIdContext.ts
index 6344bd0b8..ee933e989 100644
--- a/packages/gemini-cli-core/src/utils/promptIdContext.ts
+++ b/packages/gemini-cli-core/src/utils/promptIdContext.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AsyncLocalStorage } from 'node:async_hooks';
+import { AsyncLocalStorage } from "node:async_hooks";
 
 export const promptIdContext = new AsyncLocalStorage<string>();
diff --git a/packages/gemini-cli-core/src/utils/quotaErrorDetection.ts b/packages/gemini-cli-core/src/utils/quotaErrorDetection.ts
index 893e48b0f..52de1971a 100644
--- a/packages/gemini-cli-core/src/utils/quotaErrorDetection.ts
+++ b/packages/gemini-cli-core/src/utils/quotaErrorDetection.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { StructuredError } from '../core/turn.js';
+import type { StructuredError } from "../core/turn.js";
 
 export interface ApiError {
   error: {
@@ -17,19 +17,19 @@ export interface ApiError {
 
 export function isApiError(error: unknown): error is ApiError {
   return (
-    typeof error === 'object' &&
+    typeof error === "object" &&
     error !== null &&
-    'error' in error &&
-    typeof (error as ApiError).error === 'object' &&
-    'message' in (error as ApiError).error
+    "error" in error &&
+    typeof (error as ApiError).error === "object" &&
+    "message" in (error as ApiError).error
   );
 }
 
 export function isStructuredError(error: unknown): error is StructuredError {
   return (
-    typeof error === 'object' &&
+    typeof error === "object" &&
     error !== null &&
-    'message' in error &&
-    typeof (error as StructuredError).message === 'string'
+    "message" in error &&
+    typeof (error as StructuredError).message === "string"
   );
 }
diff --git a/packages/gemini-cli-core/src/utils/retry.test.ts b/packages/gemini-cli-core/src/utils/retry.test.ts
index 1b940ed38..7839b01a5 100644
--- a/packages/gemini-cli-core/src/utils/retry.test.ts
+++ b/packages/gemini-cli-core/src/utils/retry.test.ts
@@ -4,28 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { ApiError } from "@google/genai";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { ApiError } from '@google/genai';
-import { AuthType } from '../core/contentGenerator.js';
-import { type HttpError, ModelNotFoundError } from './httpErrors.js';
-import { retryWithBackoff } from './retry.js';
-import { setSimulate429 } from './testUtils.js';
-import { debugLogger } from './debugLogger.js';
-import {
-  TerminalQuotaError,
-  RetryableQuotaError,
-} from './googleQuotaErrors.js';
-import { PREVIEW_GEMINI_MODEL } from '../config/models.js';
-import type { ModelPolicy } from '../availability/modelPolicy.js';
-import { createAvailabilityServiceMock } from '../availability/testUtils.js';
-import type { ModelAvailabilityService } from '../availability/modelAvailabilityService.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ModelAvailabilityService } from "../availability/modelAvailabilityService.js";
+import type { ModelPolicy } from "../availability/modelPolicy.js";
+import { createAvailabilityServiceMock } from "../availability/testUtils.js";
+import { PREVIEW_GEMINI_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { debugLogger } from "./debugLogger.js";
+import { RetryableQuotaError, TerminalQuotaError } from "./googleQuotaErrors.js";
+import { type HttpError, ModelNotFoundError } from "./httpErrors.js";
+import { retryWithBackoff } from "./retry.js";
+import { setSimulate429 } from "./testUtils.js";
 
 // Helper to create a mock function that fails a certain number of times
-const createFailingFunction = (
-  failures: number,
-  successValue: string = 'success',
-) => {
+const createFailingFunction = (failures: number, successValue: string = "success") => {
   let attempts = 0;
   return vi.fn(async () => {
     attempts++;
@@ -43,11 +37,11 @@ const createFailingFunction = (
 class NonRetryableError extends Error {
   constructor(message: string) {
     super(message);
-    this.name = 'NonRetryableError';
+    this.name = "NonRetryableError";
   }
 }
 
-describe('retryWithBackoff', () => {
+describe("retryWithBackoff", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     // Disable 429 simulation for tests
@@ -61,14 +55,14 @@ describe('retryWithBackoff', () => {
     vi.useRealTimers();
   });
 
-  it('should return the result on the first attempt if successful', async () => {
+  it("should return the result on the first attempt if successful", async () => {
     const mockFn = createFailingFunction(0);
     const result = await retryWithBackoff(mockFn);
-    expect(result).toBe('success');
+    expect(result).toBe("success");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should retry and succeed if failures are within maxAttempts', async () => {
+  it("should retry and succeed if failures are within maxAttempts", async () => {
     const mockFn = createFailingFunction(2);
     const promise = retryWithBackoff(mockFn, {
       maxAttempts: 3,
@@ -78,11 +72,11 @@ describe('retryWithBackoff', () => {
     await vi.runAllTimersAsync(); // Ensure all delays and retries complete
 
     const result = await promise;
-    expect(result).toBe('success');
+    expect(result).toBe("success");
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should throw an error if all attempts fail', async () => {
+  it("should throw an error if all attempts fail", async () => {
     const mockFn = createFailingFunction(3);
 
     // 1. Start the retryable operation, which returns a promise.
@@ -93,7 +87,7 @@ describe('retryWithBackoff', () => {
 
     // 2. Run timers and await expectation in parallel.
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow("Simulated error attempt 3"),
       vi.runAllTimersAsync(),
     ]);
 
@@ -101,21 +95,21 @@ describe('retryWithBackoff', () => {
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should default to 3 maxAttempts if no options are provided', async () => {
+  it("should default to 3 maxAttempts if no options are provided", async () => {
     // This function will fail more than 3 times to ensure all retries are used.
     const mockFn = createFailingFunction(10);
 
     const promise = retryWithBackoff(mockFn);
 
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow("Simulated error attempt 3"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should default to 3 maxAttempts if options.maxAttempts is undefined', async () => {
+  it("should default to 3 maxAttempts if options.maxAttempts is undefined", async () => {
     // This function will fail more than 3 times to ensure all retries are used.
     const mockFn = createFailingFunction(10);
 
@@ -123,44 +117,43 @@ describe('retryWithBackoff', () => {
 
     // Expect it to fail with the error from the 5th attempt.
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow("Simulated error attempt 3"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should not retry if shouldRetry returns false', async () => {
+  it("should not retry if shouldRetry returns false", async () => {
     const mockFn = vi.fn(async () => {
-      throw new NonRetryableError('Non-retryable error');
+      throw new NonRetryableError("Non-retryable error");
     });
-    const shouldRetryOnError = (error: Error) =>
-      !(error instanceof NonRetryableError);
+    const shouldRetryOnError = (error: Error) => !(error instanceof NonRetryableError);
 
     const promise = retryWithBackoff(mockFn, {
       shouldRetryOnError,
       initialDelayMs: 10,
     });
 
-    await expect(promise).rejects.toThrow('Non-retryable error');
+    await expect(promise).rejects.toThrow("Non-retryable error");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should throw an error if maxAttempts is not a positive number', async () => {
+  it("should throw an error if maxAttempts is not a positive number", async () => {
     const mockFn = createFailingFunction(1);
 
     // Test with 0
     await expect(retryWithBackoff(mockFn, { maxAttempts: 0 })).rejects.toThrow(
-      'maxAttempts must be a positive number.',
+      "maxAttempts must be a positive number.",
     );
 
     // The function should not be called at all if validation fails
     expect(mockFn).not.toHaveBeenCalled();
   });
 
-  it('should use default shouldRetry if not provided, retrying on ApiError 429', async () => {
+  it("should use default shouldRetry if not provided, retrying on ApiError 429", async () => {
     const mockFn = vi.fn(async () => {
-      throw new ApiError({ message: 'Too Many Requests', status: 429 });
+      throw new ApiError({ message: "Too Many Requests", status: 429 });
     });
 
     const promise = retryWithBackoff(mockFn, {
@@ -169,29 +162,29 @@ describe('retryWithBackoff', () => {
     });
 
     await Promise.all([
-      expect(promise).rejects.toThrow('Too Many Requests'),
+      expect(promise).rejects.toThrow("Too Many Requests"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(2);
   });
 
-  it('should use default shouldRetry if not provided, not retrying on ApiError 400', async () => {
+  it("should use default shouldRetry if not provided, not retrying on ApiError 400", async () => {
     const mockFn = vi.fn(async () => {
-      throw new ApiError({ message: 'Bad Request', status: 400 });
+      throw new ApiError({ message: "Bad Request", status: 400 });
     });
 
     const promise = retryWithBackoff(mockFn, {
       maxAttempts: 2,
       initialDelayMs: 10,
     });
-    await expect(promise).rejects.toThrow('Bad Request');
+    await expect(promise).rejects.toThrow("Bad Request");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should use default shouldRetry if not provided, retrying on generic error with status 429', async () => {
+  it("should use default shouldRetry if not provided, retrying on generic error with status 429", async () => {
     const mockFn = vi.fn(async () => {
-      const error = new Error('Too Many Requests') as any;
+      const error = new Error("Too Many Requests") as any;
       error.status = 429;
       throw error;
     });
@@ -203,16 +196,16 @@ describe('retryWithBackoff', () => {
 
     // Run timers and await expectation in parallel.
     await Promise.all([
-      expect(promise).rejects.toThrow('Too Many Requests'),
+      expect(promise).rejects.toThrow("Too Many Requests"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(2);
   });
 
-  it('should use default shouldRetry if not provided, not retrying on generic error with status 400', async () => {
+  it("should use default shouldRetry if not provided, not retrying on generic error with status 400", async () => {
     const mockFn = vi.fn(async () => {
-      const error = new Error('Bad Request') as any;
+      const error = new Error("Bad Request") as any;
       error.status = 400;
       throw error;
     });
@@ -221,13 +214,13 @@ describe('retryWithBackoff', () => {
       maxAttempts: 2,
       initialDelayMs: 10,
     });
-    await expect(promise).rejects.toThrow('Bad Request');
+    await expect(promise).rejects.toThrow("Bad Request");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should respect maxDelayMs', async () => {
+  it("should respect maxDelayMs", async () => {
     const mockFn = createFailingFunction(3);
-    const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+    const setTimeoutSpy = vi.spyOn(global, "setTimeout");
 
     const promise = retryWithBackoff(mockFn, {
       maxAttempts: 4,
@@ -252,9 +245,9 @@ describe('retryWithBackoff', () => {
     expect(delays[2]).toBeLessThanOrEqual(250 * 1.3);
   });
 
-  it('should handle jitter correctly, ensuring varied delays', async () => {
+  it("should handle jitter correctly, ensuring varied delays", async () => {
     let mockFn = createFailingFunction(5);
-    const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+    const setTimeoutSpy = vi.spyOn(global, "setTimeout");
 
     // Run retryWithBackoff multiple times to observe jitter
     const runRetry = () =>
@@ -267,14 +260,9 @@ describe('retryWithBackoff', () => {
     // We expect rejections as mockFn fails 5 times
     const promise1 = runRetry();
     // Run timers and await expectation in parallel.
-    await Promise.all([
-      expect(promise1).rejects.toThrow(),
-      vi.runAllTimersAsync(),
-    ]);
+    await Promise.all([expect(promise1).rejects.toThrow(), vi.runAllTimersAsync()]);
 
-    const firstDelaySet = setTimeoutSpy.mock.calls.map(
-      (call) => call[1] as number,
-    );
+    const firstDelaySet = setTimeoutSpy.mock.calls.map((call) => call[1] as number);
     setTimeoutSpy.mockClear(); // Clear calls for the next run
 
     // Reset mockFn to reset its internal attempt counter for the next run
@@ -282,14 +270,9 @@ describe('retryWithBackoff', () => {
 
     const promise2 = runRetry();
     // Run timers and await expectation in parallel.
-    await Promise.all([
-      expect(promise2).rejects.toThrow(),
-      vi.runAllTimersAsync(),
-    ]);
+    await Promise.all([expect(promise2).rejects.toThrow(), vi.runAllTimersAsync()]);
 
-    const secondDelaySet = setTimeoutSpy.mock.calls.map(
-      (call) => call[1] as number,
-    );
+    const secondDelaySet = setTimeoutSpy.mock.calls.map((call) => call[1] as number);
 
     // Check that the delays are not exactly the same due to jitter
     // This is a probabilistic test, but with +/-30% jitter, it's highly likely they differ.
@@ -298,7 +281,7 @@ describe('retryWithBackoff', () => {
       expect(firstDelaySet[0]).not.toBe(secondDelaySet[0]);
     } else {
       // If somehow no delays were captured (e.g. test setup issue), fail explicitly
-      throw new Error('Delays were not captured for jitter test');
+      throw new Error("Delays were not captured for jitter test");
     }
 
     // Ensure delays are within the expected jitter range [70, 130] for initialDelayMs = 100
@@ -308,11 +291,11 @@ describe('retryWithBackoff', () => {
     });
   });
 
-  describe('Fetch error retries', () => {
+  describe("Fetch error retries", () => {
     it("should retry on 'fetch failed' when retryFetchErrors is true", async () => {
       const mockFn = vi.fn();
-      mockFn.mockRejectedValueOnce(new TypeError('fetch failed'));
-      mockFn.mockResolvedValueOnce('success');
+      mockFn.mockRejectedValueOnce(new TypeError("fetch failed"));
+      mockFn.mockResolvedValueOnce("success");
 
       const promise = retryWithBackoff(mockFn, {
         retryFetchErrors: true,
@@ -322,16 +305,16 @@ describe('retryWithBackoff', () => {
       await vi.runAllTimersAsync();
 
       const result = await promise;
-      expect(result).toBe('success');
+      expect(result).toBe("success");
       expect(mockFn).toHaveBeenCalledTimes(2);
     });
 
-    it('should retry on common network error codes (ECONNRESET)', async () => {
+    it("should retry on common network error codes (ECONNRESET)", async () => {
       const mockFn = vi.fn();
-      const error = new Error('read ECONNRESET');
-      (error as any).code = 'ECONNRESET';
+      const error = new Error("read ECONNRESET");
+      (error as any).code = "ECONNRESET";
       mockFn.mockRejectedValueOnce(error);
-      mockFn.mockResolvedValueOnce('success');
+      mockFn.mockResolvedValueOnce("success");
 
       const promise = retryWithBackoff(mockFn, {
         retryFetchErrors: true,
@@ -341,19 +324,19 @@ describe('retryWithBackoff', () => {
       await vi.runAllTimersAsync();
 
       const result = await promise;
-      expect(result).toBe('success');
+      expect(result).toBe("success");
       expect(mockFn).toHaveBeenCalledTimes(2);
     });
 
-    it('should retry on common network error codes in cause (ETIMEDOUT)', async () => {
+    it("should retry on common network error codes in cause (ETIMEDOUT)", async () => {
       const mockFn = vi.fn();
-      const cause = new Error('Connect Timeout');
-      (cause as any).code = 'ETIMEDOUT';
-      const error = new Error('fetch failed');
+      const cause = new Error("Connect Timeout");
+      (cause as any).code = "ETIMEDOUT";
+      const error = new Error("fetch failed");
       (error as any).cause = cause;
 
       mockFn.mockRejectedValueOnce(error);
-      mockFn.mockResolvedValueOnce('success');
+      mockFn.mockResolvedValueOnce("success");
 
       const promise = retryWithBackoff(mockFn, {
         retryFetchErrors: true,
@@ -363,15 +346,15 @@ describe('retryWithBackoff', () => {
       await vi.runAllTimersAsync();
 
       const result = await promise;
-      expect(result).toBe('success');
+      expect(result).toBe("success");
       expect(mockFn).toHaveBeenCalledTimes(2);
     });
 
     it("should retry on 'fetch failed' when retryFetchErrors is true (short delays)", async () => {
       const mockFn = vi
         .fn()
-        .mockRejectedValueOnce(new TypeError('fetch failed'))
-        .mockResolvedValue('success');
+        .mockRejectedValueOnce(new TypeError("fetch failed"))
+        .mockResolvedValue("success");
 
       const promise = retryWithBackoff(mockFn, {
         retryFetchErrors: true,
@@ -379,27 +362,24 @@ describe('retryWithBackoff', () => {
         maxDelayMs: 1,
       });
       await vi.runAllTimersAsync();
-      await expect(promise).resolves.toBe('success');
+      await expect(promise).resolves.toBe("success");
     });
 
     it("should not retry on 'fetch failed' when retryFetchErrors is false", async () => {
-      const mockFn = vi.fn().mockRejectedValue(new TypeError('fetch failed'));
+      const mockFn = vi.fn().mockRejectedValue(new TypeError("fetch failed"));
       const promise = retryWithBackoff(mockFn, {
         retryFetchErrors: false,
         initialDelayMs: 1,
         maxDelayMs: 1,
       });
-      await expect(promise).rejects.toThrow('fetch failed');
+      await expect(promise).rejects.toThrow("fetch failed");
       expect(mockFn).toHaveBeenCalledTimes(1);
     });
 
-    it('should retry on network error code (ETIMEDOUT) even when retryFetchErrors is false', async () => {
-      const error = new Error('connect ETIMEDOUT');
-      (error as any).code = 'ETIMEDOUT';
-      const mockFn = vi
-        .fn()
-        .mockRejectedValueOnce(error)
-        .mockResolvedValue('success');
+    it("should retry on network error code (ETIMEDOUT) even when retryFetchErrors is false", async () => {
+      const error = new Error("connect ETIMEDOUT");
+      (error as any).code = "ETIMEDOUT";
+      const mockFn = vi.fn().mockRejectedValueOnce(error).mockResolvedValue("success");
 
       const promise = retryWithBackoff(mockFn, {
         retryFetchErrors: false,
@@ -407,20 +387,20 @@ describe('retryWithBackoff', () => {
         maxDelayMs: 1,
       });
       await vi.runAllTimersAsync();
-      await expect(promise).resolves.toBe('success');
+      await expect(promise).resolves.toBe("success");
     });
   });
 
-  describe('Flash model fallback for OAuth users', () => {
-    it('should trigger fallback for OAuth personal users on TerminalQuotaError', async () => {
-      const fallbackCallback = vi.fn().mockResolvedValue('gemini-2.5-flash');
+  describe("Flash model fallback for OAuth users", () => {
+    it("should trigger fallback for OAuth personal users on TerminalQuotaError", async () => {
+      const fallbackCallback = vi.fn().mockResolvedValue("gemini-2.5-flash");
 
       let fallbackOccurred = false;
       const mockFn = vi.fn().mockImplementation(async () => {
         if (!fallbackOccurred) {
-          throw new TerminalQuotaError('Daily limit reached', {} as any);
+          throw new TerminalQuotaError("Daily limit reached", {} as any);
         }
-        return 'success';
+        return "success";
       });
 
       const promise = retryWithBackoff(mockFn, {
@@ -430,23 +410,23 @@ describe('retryWithBackoff', () => {
           fallbackOccurred = true;
           return await fallbackCallback(authType, error);
         },
-        authType: 'oauth-personal',
+        authType: "oauth-personal",
       });
 
       await vi.runAllTimersAsync();
 
-      await expect(promise).resolves.toBe('success');
+      await expect(promise).resolves.toBe("success");
       expect(fallbackCallback).toHaveBeenCalledWith(
-        'oauth-personal',
+        "oauth-personal",
         expect.any(TerminalQuotaError),
       );
       expect(mockFn).toHaveBeenCalledTimes(2);
     });
 
-    it('should use retryDelayMs from RetryableQuotaError', async () => {
-      const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+    it("should use retryDelayMs from RetryableQuotaError", async () => {
+      const setTimeoutSpy = vi.spyOn(global, "setTimeout");
       const mockFn = vi.fn().mockImplementation(async () => {
-        throw new RetryableQuotaError('Per-minute limit', {} as any, 12.345);
+        throw new RetryableQuotaError("Per-minute limit", {} as any, 12.345);
       });
 
       const promise = retryWithBackoff(mockFn, {
@@ -463,30 +443,31 @@ describe('retryWithBackoff', () => {
       expect(setTimeoutSpy).toHaveBeenCalledWith(expect.any(Function), 12345);
     });
 
-    it.each([[AuthType.USE_GEMINI], [AuthType.USE_VERTEX_AI], [undefined]])(
-      'should not trigger fallback for non-Google auth users (authType: %s) on TerminalQuotaError',
-      async (authType) => {
-        const fallbackCallback = vi.fn();
-        const mockFn = vi.fn().mockImplementation(async () => {
-          throw new TerminalQuotaError('Daily limit reached', {} as any);
-        });
+    it.each([
+      [AuthType.USE_GEMINI],
+      [AuthType.USE_VERTEX_AI],
+      [undefined],
+    ])("should not trigger fallback for non-Google auth users (authType: %s) on TerminalQuotaError", async (authType) => {
+      const fallbackCallback = vi.fn();
+      const mockFn = vi.fn().mockImplementation(async () => {
+        throw new TerminalQuotaError("Daily limit reached", {} as any);
+      });
 
-        const promise = retryWithBackoff(mockFn, {
-          maxAttempts: 3,
-          onPersistent429: fallbackCallback,
-          authType,
-        });
+      const promise = retryWithBackoff(mockFn, {
+        maxAttempts: 3,
+        onPersistent429: fallbackCallback,
+        authType,
+      });
 
-        await expect(promise).rejects.toThrow('Daily limit reached');
-        expect(fallbackCallback).not.toHaveBeenCalled();
-        expect(mockFn).toHaveBeenCalledTimes(1);
-      },
-    );
+      await expect(promise).rejects.toThrow("Daily limit reached");
+      expect(fallbackCallback).not.toHaveBeenCalled();
+      expect(mockFn).toHaveBeenCalledTimes(1);
+    });
   });
-  it('should abort the retry loop when the signal is aborted', async () => {
+  it("should abort the retry loop when the signal is aborted", async () => {
     const abortController = new AbortController();
     const mockFn = vi.fn().mockImplementation(async () => {
-      const error: HttpError = new Error('Server error');
+      const error: HttpError = new Error("Server error");
       error.status = 500;
       throw error;
     });
@@ -499,22 +480,20 @@ describe('retryWithBackoff', () => {
     await vi.advanceTimersByTimeAsync(50);
     abortController.abort();
 
-    await expect(promise).rejects.toThrow(
-      expect.objectContaining({ name: 'AbortError' }),
-    );
+    await expect(promise).rejects.toThrow(expect.objectContaining({ name: "AbortError" }));
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
-  it('should trigger fallback for OAuth personal users on persistent 500 errors', async () => {
-    const fallbackCallback = vi.fn().mockResolvedValue('gemini-2.5-flash');
+  it("should trigger fallback for OAuth personal users on persistent 500 errors", async () => {
+    const fallbackCallback = vi.fn().mockResolvedValue("gemini-2.5-flash");
 
     let fallbackOccurred = false;
     const mockFn = vi.fn().mockImplementation(async () => {
       if (!fallbackOccurred) {
-        const error: HttpError = new Error('Internal Server Error');
+        const error: HttpError = new Error("Internal Server Error");
         error.status = 500;
         throw error;
       }
-      return 'success';
+      return "success";
     });
 
     const promise = retryWithBackoff(mockFn, {
@@ -529,7 +508,7 @@ describe('retryWithBackoff', () => {
 
     await vi.runAllTimersAsync();
 
-    await expect(promise).resolves.toBe('success');
+    await expect(promise).resolves.toBe("success");
     expect(fallbackCallback).toHaveBeenCalledWith(
       AuthType.LOGIN_WITH_GOOGLE,
       expect.objectContaining({ status: 500 }),
@@ -538,15 +517,15 @@ describe('retryWithBackoff', () => {
     expect(mockFn).toHaveBeenCalledTimes(4);
   });
 
-  it('should trigger fallback for OAuth personal users on ModelNotFoundError', async () => {
+  it("should trigger fallback for OAuth personal users on ModelNotFoundError", async () => {
     const fallbackCallback = vi.fn().mockResolvedValue(PREVIEW_GEMINI_MODEL);
 
     let fallbackOccurred = false;
     const mockFn = vi.fn().mockImplementation(async () => {
       if (!fallbackOccurred) {
-        throw new ModelNotFoundError('Requested entity was not found.', 404);
+        throw new ModelNotFoundError("Requested entity was not found.", 404);
       }
-      return 'success';
+      return "success";
     });
 
     const promise = retryWithBackoff(mockFn, {
@@ -561,7 +540,7 @@ describe('retryWithBackoff', () => {
 
     await vi.runAllTimersAsync();
 
-    await expect(promise).resolves.toBe('success');
+    await expect(promise).resolves.toBe("success");
     expect(fallbackCallback).toHaveBeenCalledWith(
       AuthType.LOGIN_WITH_GOOGLE,
       expect.any(ModelNotFoundError),
@@ -569,7 +548,7 @@ describe('retryWithBackoff', () => {
     expect(mockFn).toHaveBeenCalledTimes(2);
   });
 
-  describe('Availability Context Integration', () => {
+  describe("Availability Context Integration", () => {
     let mockService: ModelAvailabilityService;
     let mockPolicy1: ModelPolicy;
     let mockPolicy2: ModelPolicy;
@@ -579,27 +558,27 @@ describe('retryWithBackoff', () => {
       mockService = createAvailabilityServiceMock();
 
       mockPolicy1 = {
-        model: 'model-1',
+        model: "model-1",
         actions: {},
         stateTransitions: {
-          terminal: 'terminal',
-          transient: 'sticky_retry',
+          terminal: "terminal",
+          transient: "sticky_retry",
         },
       };
 
       mockPolicy2 = {
-        model: 'model-2',
+        model: "model-2",
         actions: {},
         stateTransitions: {
-          terminal: 'terminal',
+          terminal: "terminal",
         },
       };
     });
 
-    it('updates availability context per attempt and applies transitions to the correct policy', async () => {
+    it("updates availability context per attempt and applies transitions to the correct policy", async () => {
       const error = new TerminalQuotaError(
-        'quota exceeded',
-        { code: 429, message: 'quota', details: [] },
+        "quota exceeded",
+        { code: 429, message: "quota", details: [] },
         10,
       );
 
@@ -609,7 +588,7 @@ describe('retryWithBackoff', () => {
 
       const onPersistent429 = vi
         .fn()
-        .mockResolvedValueOnce('model-2') // First fallback success
+        .mockResolvedValueOnce("model-2") // First fallback success
         .mockResolvedValueOnce(null); // Second fallback fails (give up)
 
       // Context provider returns policy1 first, then policy2
@@ -629,34 +608,24 @@ describe('retryWithBackoff', () => {
       ).rejects.toThrow(TerminalQuotaError);
 
       // Verify failures
-      expect(mockService.markTerminal).toHaveBeenCalledWith('model-1', 'quota');
-      expect(mockService.markTerminal).toHaveBeenCalledWith('model-2', 'quota');
+      expect(mockService.markTerminal).toHaveBeenCalledWith("model-1", "quota");
+      expect(mockService.markTerminal).toHaveBeenCalledWith("model-2", "quota");
 
       // Verify sequences
-      expect(mockService.markTerminal).toHaveBeenNthCalledWith(
-        1,
-        'model-1',
-        'quota',
-      );
-      expect(mockService.markTerminal).toHaveBeenNthCalledWith(
-        2,
-        'model-2',
-        'quota',
-      );
+      expect(mockService.markTerminal).toHaveBeenNthCalledWith(1, "model-1", "quota");
+      expect(mockService.markTerminal).toHaveBeenNthCalledWith(2, "model-2", "quota");
     });
 
-    it('marks sticky_retry after retries are exhausted for transient failures', async () => {
+    it("marks sticky_retry after retries are exhausted for transient failures", async () => {
       const transientError = new RetryableQuotaError(
-        'transient error',
-        { code: 429, message: 'transient', details: [] },
+        "transient error",
+        { code: 429, message: "transient", details: [] },
         0,
       );
 
       const fn = vi.fn().mockRejectedValue(transientError);
 
-      const getContext = vi
-        .fn()
-        .mockReturnValue({ service: mockService, policy: mockPolicy1 });
+      const getContext = vi.fn().mockReturnValue({ service: mockService, policy: mockPolicy1 });
 
       vi.useFakeTimers();
       const promise = retryWithBackoff(fn, {
@@ -671,19 +640,19 @@ describe('retryWithBackoff', () => {
       expect(result).toBe(transientError);
 
       expect(fn).toHaveBeenCalledTimes(3);
-      expect(mockService.markRetryOncePerTurn).toHaveBeenCalledWith('model-1');
+      expect(mockService.markRetryOncePerTurn).toHaveBeenCalledWith("model-1");
       expect(mockService.markRetryOncePerTurn).toHaveBeenCalledTimes(1);
       expect(mockService.markTerminal).not.toHaveBeenCalled();
     });
 
-    it('maps different failure kinds to correct terminal reasons', async () => {
+    it("maps different failure kinds to correct terminal reasons", async () => {
       const quotaError = new TerminalQuotaError(
-        'quota',
-        { code: 429, message: 'q', details: [] },
+        "quota",
+        { code: 429, message: "q", details: [] },
         10,
       );
-      const notFoundError = new ModelNotFoundError('not found', 404);
-      const genericError = new Error('unknown error');
+      const notFoundError = new ModelNotFoundError("not found", 404);
+      const genericError = new Error("unknown error");
 
       const fn = vi
         .fn()
@@ -692,45 +661,37 @@ describe('retryWithBackoff', () => {
         .mockRejectedValueOnce(genericError);
 
       const policy: ModelPolicy = {
-        model: 'model-1',
+        model: "model-1",
         actions: {},
         stateTransitions: {
-          terminal: 'terminal', // from quotaError
-          not_found: 'terminal', // from notFoundError
-          unknown: 'terminal', // from genericError
+          terminal: "terminal", // from quotaError
+          not_found: "terminal", // from notFoundError
+          unknown: "terminal", // from genericError
         },
       };
 
-      const getContext = vi
-        .fn()
-        .mockReturnValue({ service: mockService, policy });
+      const getContext = vi.fn().mockReturnValue({ service: mockService, policy });
 
       // Run for quotaError
       await retryWithBackoff(fn, {
         maxAttempts: 1,
         getAvailabilityContext: getContext,
       }).catch(() => {});
-      expect(mockService.markTerminal).toHaveBeenCalledWith('model-1', 'quota');
+      expect(mockService.markTerminal).toHaveBeenCalledWith("model-1", "quota");
 
       // Run for notFoundError
       await retryWithBackoff(fn, {
         maxAttempts: 1,
         getAvailabilityContext: getContext,
       }).catch(() => {});
-      expect(mockService.markTerminal).toHaveBeenCalledWith(
-        'model-1',
-        'capacity',
-      );
+      expect(mockService.markTerminal).toHaveBeenCalledWith("model-1", "capacity");
 
       // Run for genericError
       await retryWithBackoff(fn, {
         maxAttempts: 1,
         getAvailabilityContext: getContext,
       }).catch(() => {});
-      expect(mockService.markTerminal).toHaveBeenCalledWith(
-        'model-1',
-        'capacity',
-      );
+      expect(mockService.markTerminal).toHaveBeenCalledWith("model-1", "capacity");
 
       expect(mockService.markTerminal).toHaveBeenCalledTimes(3);
     });
diff --git a/packages/gemini-cli-core/src/utils/retry.ts b/packages/gemini-cli-core/src/utils/retry.ts
index b9224fe30..1c203db06 100644
--- a/packages/gemini-cli-core/src/utils/retry.ts
+++ b/packages/gemini-cli-core/src/utils/retry.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentResponse } from '@google/genai';
-import { ApiError } from '@google/genai';
-import { AuthType } from '../core/contentGenerator.js';
+import type { GenerateContentResponse } from "@google/genai";
+import { ApiError } from "@google/genai";
+import { classifyFailureKind } from "../availability/errorClassification.js";
+import type { RetryAvailabilityContext } from "../availability/modelPolicy.js";
+import { applyAvailabilityTransition } from "../availability/policyHelpers.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { debugLogger } from "./debugLogger.js";
+import { createAbortError, delay } from "./delay.js";
 import {
-  TerminalQuotaError,
-  RetryableQuotaError,
   classifyGoogleError,
-} from './googleQuotaErrors.js';
-import { delay, createAbortError } from './delay.js';
-import { debugLogger } from './debugLogger.js';
-import { getErrorStatus, ModelNotFoundError } from './httpErrors.js';
-import type { RetryAvailabilityContext } from '../availability/modelPolicy.js';
-import { classifyFailureKind } from '../availability/errorClassification.js';
-import { applyAvailabilityTransition } from '../availability/policyHelpers.js';
+  RetryableQuotaError,
+  TerminalQuotaError,
+} from "./googleQuotaErrors.js";
+import { getErrorStatus, ModelNotFoundError } from "./httpErrors.js";
 
 export type { RetryAvailabilityContext };
 
@@ -27,10 +27,7 @@ export interface RetryOptions {
   maxDelayMs: number;
   shouldRetryOnError: (error: Error, retryFetchErrors?: boolean) => boolean;
   shouldRetryOnContent?: (content: GenerateContentResponse) => boolean;
-  onPersistent429?: (
-    authType?: string,
-    error?: unknown,
-  ) => Promise<string | boolean | null>;
+  onPersistent429?: (authType?: string, error?: unknown) => Promise<string | boolean | null>;
   authType?: string;
   retryFetchErrors?: boolean;
   signal?: AbortSignal;
@@ -45,20 +42,20 @@ const DEFAULT_RETRY_OPTIONS: RetryOptions = {
 };
 
 const RETRYABLE_NETWORK_CODES = [
-  'ECONNRESET',
-  'ETIMEDOUT',
-  'EPIPE',
-  'ENOTFOUND',
-  'EAI_AGAIN',
-  'ECONNREFUSED',
+  "ECONNRESET",
+  "ETIMEDOUT",
+  "EPIPE",
+  "ENOTFOUND",
+  "EAI_AGAIN",
+  "ECONNREFUSED",
 ];
 
 function getNetworkErrorCode(error: unknown): string | undefined {
   const getCode = (obj: unknown): string | undefined => {
-    if (typeof obj !== 'object' || obj === null) {
+    if (typeof obj !== "object" || obj === null) {
       return undefined;
     }
-    if ('code' in obj && typeof (obj as { code: unknown }).code === 'string') {
+    if ("code" in obj && typeof (obj as { code: unknown }).code === "string") {
       return (obj as { code: string }).code;
     }
     return undefined;
@@ -69,14 +66,14 @@ function getNetworkErrorCode(error: unknown): string | undefined {
     return directCode;
   }
 
-  if (typeof error === 'object' && error !== null && 'cause' in error) {
+  if (typeof error === "object" && error !== null && "cause" in error) {
     return getCode((error as { cause: unknown }).cause);
   }
 
   return undefined;
 }
 
-const FETCH_FAILED_MESSAGE = 'fetch failed';
+const FETCH_FAILED_MESSAGE = "fetch failed";
 
 /**
  * Default predicate function to determine if a retry should be attempted.
@@ -85,10 +82,7 @@ const FETCH_FAILED_MESSAGE = 'fetch failed';
  * @param retryFetchErrors Whether to retry on specific fetch errors.
  * @returns True if the error is a transient error, false otherwise.
  */
-export function isRetryableError(
-  error: Error | unknown,
-  retryFetchErrors?: boolean,
-): boolean {
+export function isRetryableError(error: Error | unknown, retryFetchErrors?: boolean): boolean {
   // Check for common network error codes
   const errorCode = getNetworkErrorCode(error);
   if (errorCode && RETRYABLE_NETWORK_CODES.includes(errorCode)) {
@@ -134,7 +128,7 @@ export async function retryWithBackoff<T>(
   }
 
   if (options?.maxAttempts !== undefined && options.maxAttempts <= 0) {
-    throw new Error('maxAttempts must be a positive number.');
+    throw new Error("maxAttempts must be a positive number.");
   }
 
   const cleanOptions = options
@@ -169,10 +163,7 @@ export async function retryWithBackoff<T>(
     try {
       const result = await fn();
 
-      if (
-        shouldRetryOnContent &&
-        shouldRetryOnContent(result as GenerateContentResponse)
-      ) {
+      if (shouldRetryOnContent && shouldRetryOnContent(result as GenerateContentResponse)) {
         const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
         const delayWithJitter = Math.max(0, currentDelay + jitter);
         await delay(delayWithJitter, signal);
@@ -187,14 +178,13 @@ export async function retryWithBackoff<T>(
 
       return result;
     } catch (error) {
-      if (error instanceof Error && error.name === 'AbortError') {
+      if (error instanceof Error && error.name === "AbortError") {
         throw error;
       }
 
       const classifiedError = classifyGoogleError(error);
       const failureKind = classifyFailureKind(classifiedError);
-      const appliedImmediate =
-        failureKind === 'terminal' || failureKind === 'not_found';
+      const appliedImmediate = failureKind === "terminal" || failureKind === "not_found";
       if (appliedImmediate) {
         applyAvailabilityTransition(getAvailabilityContext, failureKind);
       }
@@ -207,49 +197,40 @@ export async function retryWithBackoff<T>(
       ) {
         if (onPersistent429 && authType === AuthType.LOGIN_WITH_GOOGLE) {
           try {
-            const fallbackModel = await onPersistent429(
-              authType,
-              classifiedError,
-            );
+            const fallbackModel = await onPersistent429(authType, classifiedError);
             if (fallbackModel) {
               attempt = 0; // Reset attempts and retry with the new model.
               currentDelay = initialDelayMs;
               continue;
             }
           } catch (fallbackError) {
-            debugLogger.warn('Fallback to Flash model failed:', fallbackError);
+            debugLogger.warn("Fallback to Flash model failed:", fallbackError);
           }
         }
         // Terminal/not_found already recorded; nothing else to mark here.
         throw classifiedError; // Throw if no fallback or fallback failed.
       }
 
-      const is500 =
-        errorCode !== undefined && errorCode >= 500 && errorCode < 600;
+      const is500 = errorCode !== undefined && errorCode >= 500 && errorCode < 600;
 
       if (classifiedError instanceof RetryableQuotaError || is500) {
         if (attempt >= maxAttempts) {
           if (onPersistent429 && authType === AuthType.LOGIN_WITH_GOOGLE) {
             try {
-              const fallbackModel = await onPersistent429(
-                authType,
-                classifiedError,
-              );
+              const fallbackModel = await onPersistent429(authType, classifiedError);
               if (fallbackModel) {
                 attempt = 0; // Reset attempts and retry with the new model.
                 currentDelay = initialDelayMs;
                 continue;
               }
             } catch (fallbackError) {
-              console.warn('Model fallback failed:', fallbackError);
+              console.warn("Model fallback failed:", fallbackError);
             }
           }
           if (!appliedImmediate) {
             applyAvailabilityTransition(getAvailabilityContext, failureKind);
           }
-          throw classifiedError instanceof RetryableQuotaError
-            ? classifiedError
-            : error;
+          throw classifiedError instanceof RetryableQuotaError ? classifiedError : error;
         }
 
         if (classifiedError instanceof RetryableQuotaError) {
@@ -272,10 +253,7 @@ export async function retryWithBackoff<T>(
       }
 
       // Generic retry logic for other errors
-      if (
-        attempt >= maxAttempts ||
-        !shouldRetryOnError(error as Error, retryFetchErrors)
-      ) {
+      if (attempt >= maxAttempts || !shouldRetryOnError(error as Error, retryFetchErrors)) {
         if (!appliedImmediate) {
           applyAvailabilityTransition(getAvailabilityContext, failureKind);
         }
@@ -293,7 +271,7 @@ export async function retryWithBackoff<T>(
     }
   }
 
-  throw new Error('Retry attempts exhausted');
+  throw new Error("Retry attempts exhausted");
 }
 
 /**
@@ -302,11 +280,7 @@ export async function retryWithBackoff<T>(
  * @param error The error that caused the retry.
  * @param errorStatus The HTTP status code of the error, if available.
  */
-function logRetryAttempt(
-  attempt: number,
-  error: unknown,
-  errorStatus?: number,
-): void {
+function logRetryAttempt(attempt: number, error: unknown, errorStatus?: number): void {
   let message = `Attempt ${attempt} failed. Retrying with backoff...`;
   if (errorStatus) {
     message = `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...`;
@@ -318,16 +292,13 @@ function logRetryAttempt(
     console.error(message, error);
   } else if (error instanceof Error) {
     // Fallback for errors that might not have a status but have a message
-    if (error.message.includes('429')) {
+    if (error.message.includes("429")) {
       debugLogger.warn(
         `Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`,
         error,
       );
     } else if (error.message.match(/5\d{2}/)) {
-      console.error(
-        `Attempt ${attempt} failed with 5xx error. Retrying with backoff...`,
-        error,
-      );
+      console.error(`Attempt ${attempt} failed with 5xx error. Retrying with backoff...`, error);
     } else {
       debugLogger.warn(message, error); // Default to warn for other errors
     }
diff --git a/packages/gemini-cli-core/src/utils/safeJsonStringify.test.ts b/packages/gemini-cli-core/src/utils/safeJsonStringify.test.ts
index 9a38c0488..cbe353e79 100644
--- a/packages/gemini-cli-core/src/utils/safeJsonStringify.test.ts
+++ b/packages/gemini-cli-core/src/utils/safeJsonStringify.test.ts
@@ -4,54 +4,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { safeJsonStringify } from './safeJsonStringify.js';
+import { describe, expect, it } from "vitest";
+import { safeJsonStringify } from "./safeJsonStringify.js";
 
-describe('safeJsonStringify', () => {
-  it('should stringify normal objects without issues', () => {
-    const obj = { name: 'test', value: 42 };
+describe("safeJsonStringify", () => {
+  it("should stringify normal objects without issues", () => {
+    const obj = { name: "test", value: 42 };
     const result = safeJsonStringify(obj);
     expect(result).toBe('{"name":"test","value":42}');
   });
 
-  it('should handle circular references by replacing them with [Circular]', () => {
+  it("should handle circular references by replacing them with [Circular]", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const obj: any = { name: 'test' };
+    const obj: any = { name: "test" };
     obj.circular = obj; // Create circular reference
 
     const result = safeJsonStringify(obj);
     expect(result).toBe('{"name":"test","circular":"[Circular]"}');
   });
 
-  it('should handle complex circular structures like HttpsProxyAgent', () => {
+  it("should handle complex circular structures like HttpsProxyAgent", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const agent: any = {
       sockets: {},
-      options: { host: 'example.com' },
+      options: { host: "example.com" },
     };
-    agent.sockets['example.com'] = [{ agent }];
+    agent.sockets["example.com"] = [{ agent }];
 
     const result = safeJsonStringify(agent);
-    expect(result).toContain('[Circular]');
-    expect(result).toContain('example.com');
+    expect(result).toContain("[Circular]");
+    expect(result).toContain("example.com");
   });
 
-  it('should respect the space parameter for formatting', () => {
-    const obj = { name: 'test', value: 42 };
+  it("should respect the space parameter for formatting", () => {
+    const obj = { name: "test", value: 42 };
     const result = safeJsonStringify(obj, 2);
     expect(result).toBe('{\n  "name": "test",\n  "value": 42\n}');
   });
 
-  it('should handle circular references with formatting', () => {
+  it("should handle circular references with formatting", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const obj: any = { name: 'test' };
+    const obj: any = { name: "test" };
     obj.circular = obj;
 
     const result = safeJsonStringify(obj, 2);
     expect(result).toBe('{\n  "name": "test",\n  "circular": "[Circular]"\n}');
   });
 
-  it('should handle arrays with circular references', () => {
+  it("should handle arrays with circular references", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const arr: any[] = [{ id: 1 }];
     arr[0].parent = arr; // Create circular reference
@@ -60,14 +60,14 @@ describe('safeJsonStringify', () => {
     expect(result).toBe('[{"id":1,"parent":"[Circular]"}]');
   });
 
-  it('should handle null and undefined values', () => {
-    expect(safeJsonStringify(null)).toBe('null');
+  it("should handle null and undefined values", () => {
+    expect(safeJsonStringify(null)).toBe("null");
     expect(safeJsonStringify(undefined)).toBe(undefined);
   });
 
-  it('should handle primitive values', () => {
-    expect(safeJsonStringify('test')).toBe('"test"');
-    expect(safeJsonStringify(42)).toBe('42');
-    expect(safeJsonStringify(true)).toBe('true');
+  it("should handle primitive values", () => {
+    expect(safeJsonStringify("test")).toBe('"test"');
+    expect(safeJsonStringify(42)).toBe("42");
+    expect(safeJsonStringify(true)).toBe("true");
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/safeJsonStringify.ts b/packages/gemini-cli-core/src/utils/safeJsonStringify.ts
index 00eeee8cd..0611f48c0 100644
--- a/packages/gemini-cli-core/src/utils/safeJsonStringify.ts
+++ b/packages/gemini-cli-core/src/utils/safeJsonStringify.ts
@@ -11,19 +11,16 @@
  * @param space - Optional space parameter for formatting (defaults to no formatting)
  * @returns JSON string with circular references replaced by [Circular]
  */
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
 
-export function safeJsonStringify(
-  obj: unknown,
-  space?: string | number,
-): string {
+export function safeJsonStringify(obj: unknown, space?: string | number): string {
   const seen = new WeakSet();
   return JSON.stringify(
     obj,
     (key, value) => {
-      if (typeof value === 'object' && value !== null) {
+      if (typeof value === "object" && value !== null) {
         if (seen.has(value)) {
-          return '[Circular]';
+          return "[Circular]";
         }
         seen.add(value);
       }
@@ -38,7 +35,7 @@ function removeEmptyObjects(data: any): object {
   const cleanedObject: { [key: string]: unknown } = {};
   for (const k in data) {
     const v = data[k];
-    if (v !== null && v !== undefined && typeof v === 'boolean') {
+    if (v !== null && v !== undefined && typeof v === "boolean") {
       cleanedObject[k] = v;
     }
   }
@@ -60,9 +57,9 @@ export function safeJsonStringifyBooleanValuesOnly(obj: any): string {
       configSeen = true;
       return value;
     }
-    if (typeof value === 'boolean') {
+    if (typeof value === "boolean") {
       return value;
     }
-    return '';
+    return "";
   });
 }
diff --git a/packages/gemini-cli-core/src/utils/schemaValidator.test.ts b/packages/gemini-cli-core/src/utils/schemaValidator.test.ts
index ecd10321d..e3525d2c9 100644
--- a/packages/gemini-cli-core/src/utils/schemaValidator.test.ts
+++ b/packages/gemini-cli-core/src/utils/schemaValidator.test.ts
@@ -4,121 +4,119 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it } from 'vitest';
-import { SchemaValidator } from './schemaValidator.js';
+import { describe, expect, it } from "vitest";
+import { SchemaValidator } from "./schemaValidator.js";
 
-describe('SchemaValidator', () => {
-  it('should allow any params if schema is undefined', () => {
+describe("SchemaValidator", () => {
+  it("should allow any params if schema is undefined", () => {
     const params = {
-      foo: 'bar',
+      foo: "bar",
     };
     expect(SchemaValidator.validate(undefined, params)).toBeNull();
   });
 
-  it('rejects null params', () => {
+  it("rejects null params", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         foo: {
-          type: 'string',
+          type: "string",
         },
       },
     };
-    expect(SchemaValidator.validate(schema, null)).toBe(
-      'Value of params must be an object',
-    );
+    expect(SchemaValidator.validate(schema, null)).toBe("Value of params must be an object");
   });
 
-  it('rejects params that are not objects', () => {
+  it("rejects params that are not objects", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         foo: {
-          type: 'string',
+          type: "string",
         },
       },
     };
-    expect(SchemaValidator.validate(schema, 'not an object')).toBe(
-      'Value of params must be an object',
+    expect(SchemaValidator.validate(schema, "not an object")).toBe(
+      "Value of params must be an object",
     );
   });
 
-  it('allows schema with extra properties', () => {
+  it("allows schema with extra properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         example_enum: {
-          type: 'string',
-          enum: ['FOO', 'BAR'],
+          type: "string",
+          enum: ["FOO", "BAR"],
           // enum-descriptions is not part of the JSON schema spec.
           // This test verifies that the SchemaValidator allows the
           // use of extra keywords, like this one, in the schema.
-          'enum-descriptions': ['a foo', 'a bar'],
+          "enum-descriptions": ["a foo", "a bar"],
         },
       },
     };
     const params = {
-      example_enum: 'BAR',
+      example_enum: "BAR",
     };
 
     expect(SchemaValidator.validate(schema, params)).toBeNull();
   });
 
-  it('allows custom format values', () => {
+  it("allows custom format values", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         duration: {
-          type: 'string',
+          type: "string",
           // See: https://cloud.google.com/docs/discovery/type-format
-          format: 'google-duration',
+          format: "google-duration",
         },
         mask: {
-          type: 'string',
-          format: 'google-fieldmask',
+          type: "string",
+          format: "google-fieldmask",
         },
         foo: {
-          type: 'string',
-          format: 'something-totally-custom',
+          type: "string",
+          format: "something-totally-custom",
         },
       },
     };
     const params = {
-      duration: '10s',
-      mask: 'foo.bar,biz.baz',
-      foo: 'some value',
+      duration: "10s",
+      mask: "foo.bar,biz.baz",
+      foo: "some value",
     };
     expect(SchemaValidator.validate(schema, params)).toBeNull();
   });
 
-  it('allows valid values for known formats', () => {
+  it("allows valid values for known formats", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         today: {
-          type: 'string',
-          format: 'date',
+          type: "string",
+          format: "date",
         },
       },
     };
     const params = {
-      today: '2025-04-08',
+      today: "2025-04-08",
     };
     expect(SchemaValidator.validate(schema, params)).toBeNull();
   });
 
-  it('rejects invalid values for known formats', () => {
+  it("rejects invalid values for known formats", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         today: {
-          type: 'string',
-          format: 'date',
+          type: "string",
+          format: "date",
         },
       },
     };
     const params = {
-      today: 'this is not a date',
+      today: "this is not a date",
     };
     expect(SchemaValidator.validate(schema, params)).not.toBeNull();
   });
diff --git a/packages/gemini-cli-core/src/utils/schemaValidator.ts b/packages/gemini-cli-core/src/utils/schemaValidator.ts
index a97b67b20..9855d725c 100644
--- a/packages/gemini-cli-core/src/utils/schemaValidator.ts
+++ b/packages/gemini-cli-core/src/utils/schemaValidator.ts
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import AjvPkg from 'ajv';
-import * as addFormats from 'ajv-formats';
+import AjvPkg from "ajv";
+import * as addFormats from "ajv-formats";
+
 // Ajv's ESM/CJS interop: use 'any' for compatibility as recommended by Ajv docs
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const AjvClass = (AjvPkg as any).default || AjvPkg;
@@ -37,13 +38,13 @@ export class SchemaValidator {
     if (!schema) {
       return null;
     }
-    if (typeof data !== 'object' || data === null) {
-      return 'Value of params must be an object';
+    if (typeof data !== "object" || data === null) {
+      return "Value of params must be an object";
     }
     const validate = ajValidator.compile(schema);
     const valid = validate(data);
     if (!valid && validate.errors) {
-      return ajValidator.errorsText(validate.errors, { dataVar: 'params' });
+      return ajValidator.errorsText(validate.errors, { dataVar: "params" });
     }
     return null;
   }
diff --git a/packages/gemini-cli-core/src/utils/secure-browser-launcher.test.ts b/packages/gemini-cli-core/src/utils/secure-browser-launcher.test.ts
index de27ce6ff..ec2789a91 100644
--- a/packages/gemini-cli-core/src/utils/secure-browser-launcher.test.ts
+++ b/packages/gemini-cli-core/src/utils/secure-browser-launcher.test.ts
@@ -4,96 +4,84 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { openBrowserSecurely } from './secure-browser-launcher.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { openBrowserSecurely } from "./secure-browser-launcher.js";
 
 // Create mock function using vi.hoisted
 const mockExecFile = vi.hoisted(() => vi.fn());
 
 // Mock modules
-vi.mock('node:child_process');
-vi.mock('node:util', () => ({
+vi.mock("node:child_process");
+vi.mock("node:util", () => ({
   promisify: () => mockExecFile,
 }));
 
-describe('secure-browser-launcher', () => {
+describe("secure-browser-launcher", () => {
   let originalPlatform: PropertyDescriptor | undefined;
 
   beforeEach(() => {
     vi.clearAllMocks();
-    mockExecFile.mockResolvedValue({ stdout: '', stderr: '' });
-    originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');
+    mockExecFile.mockResolvedValue({ stdout: "", stderr: "" });
+    originalPlatform = Object.getOwnPropertyDescriptor(process, "platform");
   });
 
   afterEach(() => {
     if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform);
+      Object.defineProperty(process, "platform", originalPlatform);
     }
   });
 
   function setPlatform(platform: string) {
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: platform,
       configurable: true,
     });
   }
 
-  describe('URL validation', () => {
-    it('should allow valid HTTP URLs', async () => {
-      setPlatform('darwin');
-      await openBrowserSecurely('http://example.com');
-      expect(mockExecFile).toHaveBeenCalledWith(
-        'open',
-        ['http://example.com'],
-        expect.any(Object),
-      );
+  describe("URL validation", () => {
+    it("should allow valid HTTP URLs", async () => {
+      setPlatform("darwin");
+      await openBrowserSecurely("http://example.com");
+      expect(mockExecFile).toHaveBeenCalledWith("open", ["http://example.com"], expect.any(Object));
     });
 
-    it('should allow valid HTTPS URLs', async () => {
-      setPlatform('darwin');
-      await openBrowserSecurely('https://example.com');
+    it("should allow valid HTTPS URLs", async () => {
+      setPlatform("darwin");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'open',
-        ['https://example.com'],
+        "open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
 
-    it('should reject non-HTTP(S) protocols', async () => {
-      await expect(openBrowserSecurely('file:///etc/passwd')).rejects.toThrow(
-        'Unsafe protocol',
-      );
-      await expect(openBrowserSecurely('javascript:alert(1)')).rejects.toThrow(
-        'Unsafe protocol',
-      );
-      await expect(openBrowserSecurely('ftp://example.com')).rejects.toThrow(
-        'Unsafe protocol',
-      );
+    it("should reject non-HTTP(S) protocols", async () => {
+      await expect(openBrowserSecurely("file:///etc/passwd")).rejects.toThrow("Unsafe protocol");
+      await expect(openBrowserSecurely("javascript:alert(1)")).rejects.toThrow("Unsafe protocol");
+      await expect(openBrowserSecurely("ftp://example.com")).rejects.toThrow("Unsafe protocol");
     });
 
-    it('should reject invalid URLs', async () => {
-      await expect(openBrowserSecurely('not-a-url')).rejects.toThrow(
-        'Invalid URL',
-      );
-      await expect(openBrowserSecurely('')).rejects.toThrow('Invalid URL');
+    it("should reject invalid URLs", async () => {
+      await expect(openBrowserSecurely("not-a-url")).rejects.toThrow("Invalid URL");
+      await expect(openBrowserSecurely("")).rejects.toThrow("Invalid URL");
     });
 
-    it('should reject URLs with control characters', async () => {
-      await expect(
-        openBrowserSecurely('http://example.com\nmalicious-command'),
-      ).rejects.toThrow('invalid characters');
-      await expect(
-        openBrowserSecurely('http://example.com\rmalicious-command'),
-      ).rejects.toThrow('invalid characters');
-      await expect(
-        openBrowserSecurely('http://example.com\x00'),
-      ).rejects.toThrow('invalid characters');
+    it("should reject URLs with control characters", async () => {
+      await expect(openBrowserSecurely("http://example.com\nmalicious-command")).rejects.toThrow(
+        "invalid characters",
+      );
+      await expect(openBrowserSecurely("http://example.com\rmalicious-command")).rejects.toThrow(
+        "invalid characters",
+      );
+      await expect(openBrowserSecurely("http://example.com\x00")).rejects.toThrow(
+        "invalid characters",
+      );
     });
   });
 
-  describe('Command injection prevention', () => {
-    it('should prevent PowerShell command injection on Windows', async () => {
-      setPlatform('win32');
+  describe("Command injection prevention", () => {
+    it("should prevent PowerShell command injection on Windows", async () => {
+      setPlatform("win32");
 
       // The POC from the vulnerability report
       const maliciousUrl =
@@ -103,58 +91,53 @@ describe('secure-browser-launcher', () => {
 
       // Verify that execFile was called (not exec) and the URL is passed safely
       expect(mockExecFile).toHaveBeenCalledWith(
-        'powershell.exe',
+        "powershell.exe",
         [
-          '-NoProfile',
-          '-NonInteractive',
-          '-WindowStyle',
-          'Hidden',
-          '-Command',
+          "-NoProfile",
+          "-NonInteractive",
+          "-WindowStyle",
+          "Hidden",
+          "-Command",
           `Start-Process '${maliciousUrl.replace(/'/g, "''")}'`,
         ],
         expect.any(Object),
       );
     });
 
-    it('should handle URLs with special shell characters safely', async () => {
-      setPlatform('darwin');
+    it("should handle URLs with special shell characters safely", async () => {
+      setPlatform("darwin");
 
       const urlsWithSpecialChars = [
-        'http://example.com/path?param=value&other=$value',
-        'http://example.com/path#fragment;command',
-        'http://example.com/$(whoami)',
-        'http://example.com/`command`',
-        'http://example.com/|pipe',
-        'http://example.com/>redirect',
+        "http://example.com/path?param=value&other=$value",
+        "http://example.com/path#fragment;command",
+        "http://example.com/$(whoami)",
+        "http://example.com/`command`",
+        "http://example.com/|pipe",
+        "http://example.com/>redirect",
       ];
 
       for (const url of urlsWithSpecialChars) {
         await openBrowserSecurely(url);
         // Verify the URL is passed as an argument, not interpreted by shell
-        expect(mockExecFile).toHaveBeenCalledWith(
-          'open',
-          [url],
-          expect.any(Object),
-        );
+        expect(mockExecFile).toHaveBeenCalledWith("open", [url], expect.any(Object));
       }
     });
 
-    it('should properly escape single quotes in URLs on Windows', async () => {
-      setPlatform('win32');
+    it("should properly escape single quotes in URLs on Windows", async () => {
+      setPlatform("win32");
 
-      const urlWithSingleQuotes =
-        "http://example.com/path?name=O'Brien&test='value'";
+      const urlWithSingleQuotes = "http://example.com/path?name=O'Brien&test='value'";
       await openBrowserSecurely(urlWithSingleQuotes);
 
       // Verify that single quotes are escaped by doubling them
       expect(mockExecFile).toHaveBeenCalledWith(
-        'powershell.exe',
+        "powershell.exe",
         [
-          '-NoProfile',
-          '-NonInteractive',
-          '-WindowStyle',
-          'Hidden',
-          '-Command',
+          "-NoProfile",
+          "-NonInteractive",
+          "-WindowStyle",
+          "Hidden",
+          "-Command",
           `Start-Process 'http://example.com/path?name=O''Brien&test=''value'''`,
         ],
         expect.any(Object),
@@ -162,79 +145,76 @@ describe('secure-browser-launcher', () => {
     });
   });
 
-  describe('Platform-specific behavior', () => {
-    it('should use correct command on macOS', async () => {
-      setPlatform('darwin');
-      await openBrowserSecurely('https://example.com');
+  describe("Platform-specific behavior", () => {
+    it("should use correct command on macOS", async () => {
+      setPlatform("darwin");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'open',
-        ['https://example.com'],
+        "open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
 
-    it('should use PowerShell on Windows', async () => {
-      setPlatform('win32');
-      await openBrowserSecurely('https://example.com');
+    it("should use PowerShell on Windows", async () => {
+      setPlatform("win32");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'powershell.exe',
-        expect.arrayContaining([
-          '-Command',
-          `Start-Process 'https://example.com'`,
-        ]),
+        "powershell.exe",
+        expect.arrayContaining(["-Command", `Start-Process 'https://example.com'`]),
         expect.any(Object),
       );
     });
 
-    it('should use xdg-open on Linux', async () => {
-      setPlatform('linux');
-      await openBrowserSecurely('https://example.com');
+    it("should use xdg-open on Linux", async () => {
+      setPlatform("linux");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'xdg-open',
-        ['https://example.com'],
+        "xdg-open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
 
-    it('should throw on unsupported platforms', async () => {
-      setPlatform('aix');
-      await expect(openBrowserSecurely('https://example.com')).rejects.toThrow(
-        'Unsupported platform',
+    it("should throw on unsupported platforms", async () => {
+      setPlatform("aix");
+      await expect(openBrowserSecurely("https://example.com")).rejects.toThrow(
+        "Unsupported platform",
       );
     });
   });
 
-  describe('Error handling', () => {
-    it('should handle browser launch failures gracefully', async () => {
-      setPlatform('darwin');
-      mockExecFile.mockRejectedValueOnce(new Error('Command not found'));
+  describe("Error handling", () => {
+    it("should handle browser launch failures gracefully", async () => {
+      setPlatform("darwin");
+      mockExecFile.mockRejectedValueOnce(new Error("Command not found"));
 
-      await expect(openBrowserSecurely('https://example.com')).rejects.toThrow(
-        'Failed to open browser',
+      await expect(openBrowserSecurely("https://example.com")).rejects.toThrow(
+        "Failed to open browser",
       );
     });
 
-    it('should try fallback browsers on Linux', async () => {
-      setPlatform('linux');
+    it("should try fallback browsers on Linux", async () => {
+      setPlatform("linux");
 
       // First call to xdg-open fails
-      mockExecFile.mockRejectedValueOnce(new Error('Command not found'));
+      mockExecFile.mockRejectedValueOnce(new Error("Command not found"));
       // Second call to gnome-open succeeds
-      mockExecFile.mockResolvedValueOnce({ stdout: '', stderr: '' });
+      mockExecFile.mockResolvedValueOnce({ stdout: "", stderr: "" });
 
-      await openBrowserSecurely('https://example.com');
+      await openBrowserSecurely("https://example.com");
 
       expect(mockExecFile).toHaveBeenCalledTimes(2);
       expect(mockExecFile).toHaveBeenNthCalledWith(
         1,
-        'xdg-open',
-        ['https://example.com'],
+        "xdg-open",
+        ["https://example.com"],
         expect.any(Object),
       );
       expect(mockExecFile).toHaveBeenNthCalledWith(
         2,
-        'gnome-open',
-        ['https://example.com'],
+        "gnome-open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
diff --git a/packages/gemini-cli-core/src/utils/secure-browser-launcher.ts b/packages/gemini-cli-core/src/utils/secure-browser-launcher.ts
index c60a646d1..fb15f0869 100644
--- a/packages/gemini-cli-core/src/utils/secure-browser-launcher.ts
+++ b/packages/gemini-cli-core/src/utils/secure-browser-launcher.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { platform } from 'node:os';
-import { URL } from 'node:url';
+import { execFile } from "node:child_process";
+import { platform } from "node:os";
+import { URL } from "node:url";
+import { promisify } from "node:util";
 
 const execFileAsync = promisify(execFile);
 
@@ -28,16 +28,14 @@ function validateUrl(url: string): void {
   }
 
   // Only allow HTTP and HTTPS protocols
-  if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
-    throw new Error(
-      `Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`,
-    );
+  if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+    throw new Error(`Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`);
   }
 
   // Additional validation: ensure no newlines or control characters
   // eslint-disable-next-line no-control-regex
   if (/[\r\n\x00-\x1f]/.test(url)) {
-    throw new Error('URL contains invalid characters');
+    throw new Error("URL contains invalid characters");
   }
 }
 
@@ -60,32 +58,32 @@ export async function openBrowserSecurely(url: string): Promise<void> {
   let args: string[];
 
   switch (platformName) {
-    case 'darwin':
+    case "darwin":
       // macOS
-      command = 'open';
+      command = "open";
       args = [url];
       break;
 
-    case 'win32':
+    case "win32":
       // Windows - use PowerShell with Start-Process
       // This avoids the cmd.exe shell which is vulnerable to injection
-      command = 'powershell.exe';
+      command = "powershell.exe";
       args = [
-        '-NoProfile',
-        '-NonInteractive',
-        '-WindowStyle',
-        'Hidden',
-        '-Command',
+        "-NoProfile",
+        "-NonInteractive",
+        "-WindowStyle",
+        "Hidden",
+        "-Command",
         `Start-Process '${url.replace(/'/g, "''")}'`,
       ];
       break;
 
-    case 'linux':
-    case 'freebsd':
-    case 'openbsd':
+    case "linux":
+    case "freebsd":
+    case "openbsd":
       // Linux and BSD variants
       // Try xdg-open first, fall back to other options
-      command = 'xdg-open';
+      command = "xdg-open";
       args = [url];
       break;
 
@@ -102,7 +100,7 @@ export async function openBrowserSecurely(url: string): Promise<void> {
     },
     // Detach the browser process so it doesn't block
     detached: true,
-    stdio: 'ignore',
+    stdio: "ignore",
   };
 
   try {
@@ -110,18 +108,10 @@ export async function openBrowserSecurely(url: string): Promise<void> {
   } catch (error) {
     // For Linux, try fallback commands if xdg-open fails
     if (
-      (platformName === 'linux' ||
-        platformName === 'freebsd' ||
-        platformName === 'openbsd') &&
-      command === 'xdg-open'
+      (platformName === "linux" || platformName === "freebsd" || platformName === "openbsd") &&
+      command === "xdg-open"
     ) {
-      const fallbackCommands = [
-        'gnome-open',
-        'kde-open',
-        'firefox',
-        'chromium',
-        'google-chrome',
-      ];
+      const fallbackCommands = ["gnome-open", "kde-open", "firefox", "chromium", "google-chrome"];
 
       for (const fallbackCommand of fallbackCommands) {
         try {
@@ -136,7 +126,7 @@ export async function openBrowserSecurely(url: string): Promise<void> {
 
     // Re-throw the error if all attempts failed
     throw new Error(
-      `Failed to open browser: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      `Failed to open browser: ${error instanceof Error ? error.message : "Unknown error"}`,
     );
   }
 }
@@ -150,29 +140,26 @@ export async function openBrowserSecurely(url: string): Promise<void> {
 export function shouldLaunchBrowser(): boolean {
   // A list of browser names that indicate we should not attempt to open a
   // web browser for the user.
-  const browserBlocklist = ['www-browser'];
-  const browserEnv = process.env['BROWSER'];
+  const browserBlocklist = ["www-browser"];
+  const browserEnv = process.env["BROWSER"];
   if (browserEnv && browserBlocklist.includes(browserEnv)) {
     return false;
   }
 
   // Common environment variables used in CI/CD or other non-interactive shells.
-  if (
-    process.env['CI'] ||
-    process.env['DEBIAN_FRONTEND'] === 'noninteractive'
-  ) {
+  if (process.env["CI"] || process.env["DEBIAN_FRONTEND"] === "noninteractive") {
     return false;
   }
 
   // The presence of SSH_CONNECTION indicates a remote session.
   // We should not attempt to launch a browser unless a display is explicitly available
   // (checked below for Linux).
-  const isSSH = !!process.env['SSH_CONNECTION'];
+  const isSSH = !!process.env["SSH_CONNECTION"];
 
   // On Linux, the presence of a display server is a strong indicator of a GUI.
-  if (platform() === 'linux') {
+  if (platform() === "linux") {
     // These are environment variables that can indicate a running compositor on Linux.
-    const displayVariables = ['DISPLAY', 'WAYLAND_DISPLAY', 'MIR_SOCKET'];
+    const displayVariables = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"];
     const hasDisplay = displayVariables.some((v) => !!process.env[v]);
     if (!hasDisplay) {
       return false;
@@ -181,7 +168,7 @@ export function shouldLaunchBrowser(): boolean {
 
   // If in an SSH session on a non-Linux OS (e.g., macOS), don't launch browser.
   // The Linux case is handled above (it's allowed if DISPLAY is set).
-  if (isSSH && platform() !== 'linux') {
+  if (isSSH && platform() !== "linux") {
     return false;
   }
 
diff --git a/packages/gemini-cli-core/src/utils/session.ts b/packages/gemini-cli-core/src/utils/session.ts
index 96cdbbf48..ae8694433 100644
--- a/packages/gemini-cli-core/src/utils/session.ts
+++ b/packages/gemini-cli-core/src/utils/session.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
 
 export const sessionId = randomUUID();
diff --git a/packages/gemini-cli-core/src/utils/shell-utils.test.ts b/packages/gemini-cli-core/src/utils/shell-utils.test.ts
index 6414664e8..b082621a4 100644
--- a/packages/gemini-cli-core/src/utils/shell-utils.test.ts
+++ b/packages/gemini-cli-core/src/utils/shell-utils.test.ts
@@ -4,31 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  expect,
-  describe,
-  it,
-  beforeEach,
-  beforeAll,
-  vi,
-  afterEach,
-} from 'vitest';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { AnyToolInvocation } from "../index.js";
 import {
   checkCommandPermissions,
   escapeShellArg,
   getCommandRoots,
   getShellConfiguration,
-  isCommandAllowed,
   initializeShellParsers,
-  stripShellWrapper,
+  isCommandAllowed,
   isShellInvocationAllowlisted,
-} from './shell-utils.js';
-import type { Config } from '../config/config.js';
-import type { AnyToolInvocation } from '../index.js';
+  stripShellWrapper,
+} from "./shell-utils.js";
 
 const mockPlatform = vi.hoisted(() => vi.fn());
 const mockHomedir = vi.hoisted(() => vi.fn());
-vi.mock('os', () => ({
+vi.mock("os", () => ({
   default: {
     platform: mockPlatform,
     homedir: mockHomedir,
@@ -38,24 +30,22 @@ vi.mock('os', () => ({
 }));
 
 const mockQuote = vi.hoisted(() => vi.fn());
-vi.mock('shell-quote', () => ({
+vi.mock("shell-quote", () => ({
   quote: mockQuote,
 }));
 
 let config: Config;
-const isWindowsRuntime = process.platform === 'win32';
+const isWindowsRuntime = process.platform === "win32";
 const describeWindowsOnly = isWindowsRuntime ? describe : describe.skip;
 
 beforeAll(async () => {
-  mockPlatform.mockReturnValue('linux');
+  mockPlatform.mockReturnValue("linux");
   await initializeShellParsers();
 });
 
 beforeEach(() => {
-  mockPlatform.mockReturnValue('linux');
-  mockQuote.mockImplementation((args: string[]) =>
-    args.map((arg) => `'${arg}'`).join(' '),
-  );
+  mockPlatform.mockReturnValue("linux");
+  mockQuote.mockImplementation((args: string[]) => args.map((arg) => `'${arg}'`).join(" "));
   config = {
     getCoreTools: () => [],
     getExcludeTools: () => new Set([]),
@@ -67,109 +57,87 @@ afterEach(() => {
   vi.clearAllMocks();
 });
 
-describe('isCommandAllowed', () => {
-  it('should allow a command if no restrictions are provided', () => {
-    const result = isCommandAllowed('goodCommand --safe', config);
+describe("isCommandAllowed", () => {
+  it("should allow a command if no restrictions are provided", () => {
+    const result = isCommandAllowed("goodCommand --safe", config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should allow a command if it is in the global allowlist', () => {
-    config.getCoreTools = () => ['ShellTool(goodCommand)'];
-    const result = isCommandAllowed('goodCommand --safe', config);
+  it("should allow a command if it is in the global allowlist", () => {
+    config.getCoreTools = () => ["ShellTool(goodCommand)"];
+    const result = isCommandAllowed("goodCommand --safe", config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should block a command if it is not in a strict global allowlist', () => {
-    config.getCoreTools = () => ['ShellTool(goodCommand --safe)'];
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should block a command if it is not in a strict global allowlist", () => {
+    config.getCoreTools = () => ["ShellTool(goodCommand --safe)"];
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "badCommand --danger"`,
     );
   });
 
-  it('should block a command if it is in the blocked list', () => {
-    config.getExcludeTools = () => new Set(['ShellTool(badCommand --danger)']);
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should block a command if it is in the blocked list", () => {
+    config.getExcludeTools = () => new Set(["ShellTool(badCommand --danger)"]);
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should prioritize the blocklist over the allowlist', () => {
-    config.getCoreTools = () => ['ShellTool(badCommand --danger)'];
-    config.getExcludeTools = () => new Set(['ShellTool(badCommand --danger)']);
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should prioritize the blocklist over the allowlist", () => {
+    config.getCoreTools = () => ["ShellTool(badCommand --danger)"];
+    config.getExcludeTools = () => new Set(["ShellTool(badCommand --danger)"]);
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should allow any command when a wildcard is in coreTools', () => {
-    config.getCoreTools = () => ['ShellTool'];
-    const result = isCommandAllowed('any random command', config);
+  it("should allow any command when a wildcard is in coreTools", () => {
+    config.getCoreTools = () => ["ShellTool"];
+    const result = isCommandAllowed("any random command", config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should block any command when a wildcard is in excludeTools', () => {
-    config.getExcludeTools = () => new Set(['run_shell_command']);
-    const result = isCommandAllowed('any random command', config);
+  it("should block any command when a wildcard is in excludeTools", () => {
+    config.getExcludeTools = () => new Set(["run_shell_command"]);
+    const result = isCommandAllowed("any random command", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      'Shell tool is globally disabled in configuration',
-    );
+    expect(result.reason).toBe("Shell tool is globally disabled in configuration");
   });
 
-  it('should block a command on the blocklist even with a wildcard allow', () => {
-    config.getCoreTools = () => ['ShellTool'];
-    config.getExcludeTools = () => new Set(['ShellTool(badCommand --danger)']);
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should block a command on the blocklist even with a wildcard allow", () => {
+    config.getCoreTools = () => ["ShellTool"];
+    config.getExcludeTools = () => new Set(["ShellTool(badCommand --danger)"]);
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should allow a chained command if all parts are on the global allowlist', () => {
-    config.getCoreTools = () => [
-      'run_shell_command(echo)',
-      'run_shell_command(goodCommand)',
-    ];
-    const result = isCommandAllowed(
-      'echo "hello" && goodCommand --safe',
-      config,
-    );
+  it("should allow a chained command if all parts are on the global allowlist", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)", "run_shell_command(goodCommand)"];
+    const result = isCommandAllowed('echo "hello" && goodCommand --safe', config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should block a chained command if any part is blocked', () => {
-    config.getExcludeTools = () => new Set(['run_shell_command(badCommand)']);
-    const result = isCommandAllowed(
-      'echo "hello" && badCommand --danger',
-      config,
-    );
+  it("should block a chained command if any part is blocked", () => {
+    config.getExcludeTools = () => new Set(["run_shell_command(badCommand)"]);
+    const result = isCommandAllowed('echo "hello" && badCommand --danger', config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should block a command that redefines an allowed function to run an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed(
-      'echo () (curl google.com) ; echo Hello World',
-      config,
-    );
+  it("should block a command that redefines an allowed function to run an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo () (curl google.com) ; echo Hello World", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block a multi-line function body that runs an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
+  it("should block a multi-line function body that runs an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
     const result = isCommandAllowed(
       `echo () {
   curl google.com
@@ -182,50 +150,44 @@ describe('isCommandAllowed', () => {
     );
   });
 
-  it('should block a function keyword declaration that runs an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed(
-      'function echo { curl google.com; } ; echo hi',
-      config,
-    );
+  it("should block a function keyword declaration that runs an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("function echo { curl google.com; } ; echo hi", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block command substitution that invokes an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo $(curl google.com)', config);
+  it("should block command substitution that invokes an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo $(curl google.com)", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block pipelines that invoke an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo hi | curl google.com', config);
+  it("should block pipelines that invoke an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo hi | curl google.com", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block background jobs that invoke an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo hi & curl google.com', config);
+  it("should block background jobs that invoke an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo hi & curl google.com", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block command substitution inside a here-document when the inner command is unlisted', () => {
-    config.getCoreTools = () => [
-      'run_shell_command(echo)',
-      'run_shell_command(cat)',
-    ];
+  it("should block command substitution inside a here-document when the inner command is unlisted", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)", "run_shell_command(cat)"];
     const result = isCommandAllowed(
       `cat <<EOF
 $(rm -rf /)
@@ -238,32 +200,26 @@ EOF`,
     );
   });
 
-  it('should block backtick substitution that invokes an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo `curl google.com`', config);
+  it("should block backtick substitution that invokes an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo `curl google.com`", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block process substitution using <() when the inner command is unlisted', () => {
-    config.getCoreTools = () => [
-      'run_shell_command(diff)',
-      'run_shell_command(echo)',
-    ];
-    const result = isCommandAllowed(
-      'diff <(curl google.com) <(echo safe)',
-      config,
-    );
+  it("should block process substitution using <() when the inner command is unlisted", () => {
+    config.getCoreTools = () => ["run_shell_command(diff)", "run_shell_command(echo)"];
+    const result = isCommandAllowed("diff <(curl google.com) <(echo safe)", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block process substitution using >() when the inner command is unlisted', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
+  it("should block process substitution using >() when the inner command is unlisted", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
     const result = isCommandAllowed('echo "data" > >(curl google.com)', config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
@@ -271,109 +227,94 @@ EOF`,
     );
   });
 
-  it('should block commands containing prompt transformations', () => {
-    const result = isCommandAllowed(
-      'echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"',
-      config,
-    );
+  it("should block commands containing prompt transformations", () => {
+    const result = isCommandAllowed('echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"', config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      'Command rejected because it could not be parsed safely',
-    );
+    expect(result.reason).toBe("Command rejected because it could not be parsed safely");
   });
 
-  it('should block simple prompt transformation expansions', () => {
-    const result = isCommandAllowed('echo ${foo@P}', config);
+  it("should block simple prompt transformation expansions", () => {
+    const result = isCommandAllowed("echo ${foo@P}", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      'Command rejected because it could not be parsed safely',
-    );
+    expect(result.reason).toBe("Command rejected because it could not be parsed safely");
   });
 
-  describe('command substitution', () => {
-    it('should allow command substitution using `$(...)`', () => {
-      const result = isCommandAllowed('echo $(goodCommand --safe)', config);
+  describe("command substitution", () => {
+    it("should allow command substitution using `$(...)`", () => {
+      const result = isCommandAllowed("echo $(goodCommand --safe)", config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow command substitution using `<(...)`', () => {
-      const result = isCommandAllowed('diff <(ls) <(ls -a)', config);
+    it("should allow command substitution using `<(...)`", () => {
+      const result = isCommandAllowed("diff <(ls) <(ls -a)", config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow command substitution using `>(...)`', () => {
-      const result = isCommandAllowed(
-        'echo "Log message" > >(tee log.txt)',
-        config,
-      );
+    it("should allow command substitution using `>(...)`", () => {
+      const result = isCommandAllowed('echo "Log message" > >(tee log.txt)', config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow command substitution using backticks', () => {
-      const result = isCommandAllowed('echo `goodCommand --safe`', config);
+    it("should allow command substitution using backticks", () => {
+      const result = isCommandAllowed("echo `goodCommand --safe`", config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow substitution-like patterns inside single quotes', () => {
-      config.getCoreTools = () => ['ShellTool(echo)'];
+    it("should allow substitution-like patterns inside single quotes", () => {
+      config.getCoreTools = () => ["ShellTool(echo)"];
       const result = isCommandAllowed("echo '$(pwd)'", config);
       expect(result.allowed).toBe(true);
     });
 
-    it('should block a command when parsing fails', () => {
-      const result = isCommandAllowed('ls &&', config);
+    it("should block a command when parsing fails", () => {
+      const result = isCommandAllowed("ls &&", config);
       expect(result.allowed).toBe(false);
-      expect(result.reason).toBe(
-        'Command rejected because it could not be parsed safely',
-      );
+      expect(result.reason).toBe("Command rejected because it could not be parsed safely");
     });
   });
 });
 
-describe('checkCommandPermissions', () => {
+describe("checkCommandPermissions", () => {
   describe('in "Default Allow" mode (no sessionAllowlist)', () => {
-    it('should return a detailed success object for an allowed command', () => {
-      const result = checkCommandPermissions('goodCommand --safe', config);
+    it("should return a detailed success object for an allowed command", () => {
+      const result = checkCommandPermissions("goodCommand --safe", config);
       expect(result).toEqual({
         allAllowed: true,
         disallowedCommands: [],
       });
     });
 
-    it('should block commands that cannot be parsed safely', () => {
-      const result = checkCommandPermissions('ls &&', config);
+    it("should block commands that cannot be parsed safely", () => {
+      const result = checkCommandPermissions("ls &&", config);
       expect(result).toEqual({
         allAllowed: false,
-        disallowedCommands: ['ls &&'],
-        blockReason: 'Command rejected because it could not be parsed safely',
+        disallowedCommands: ["ls &&"],
+        blockReason: "Command rejected because it could not be parsed safely",
         isHardDenial: true,
       });
     });
 
-    it('should return a detailed failure object for a blocked command', () => {
-      config.getExcludeTools = () => new Set(['ShellTool(badCommand)']);
-      const result = checkCommandPermissions('badCommand --danger', config);
+    it("should return a detailed failure object for a blocked command", () => {
+      config.getExcludeTools = () => new Set(["ShellTool(badCommand)"]);
+      const result = checkCommandPermissions("badCommand --danger", config);
       expect(result).toEqual({
         allAllowed: false,
-        disallowedCommands: ['badCommand --danger'],
+        disallowedCommands: ["badCommand --danger"],
         blockReason: `Command 'badCommand --danger' is blocked by configuration`,
         isHardDenial: true,
       });
     });
 
-    it('should return a detailed failure object for a command not on a strict allowlist', () => {
-      config.getCoreTools = () => ['ShellTool(goodCommand)'];
-      const result = checkCommandPermissions(
-        'git status && goodCommand',
-        config,
-      );
+    it("should return a detailed failure object for a command not on a strict allowlist", () => {
+      config.getCoreTools = () => ["ShellTool(goodCommand)"];
+      const result = checkCommandPermissions("git status && goodCommand", config);
       expect(result).toEqual({
         allAllowed: false,
-        disallowedCommands: ['git status'],
+        disallowedCommands: ["git status"],
         blockReason: `Command(s) not in the allowed commands list. Disallowed commands: "git status"`,
         isHardDenial: false,
       });
@@ -381,368 +322,343 @@ describe('checkCommandPermissions', () => {
   });
 
   describe('in "Default Deny" mode (with sessionAllowlist)', () => {
-    it('should allow a command on the sessionAllowlist', () => {
+    it("should allow a command on the sessionAllowlist", () => {
       const result = checkCommandPermissions(
-        'goodCommand --safe',
+        "goodCommand --safe",
         config,
-        new Set(['goodCommand --safe']),
+        new Set(["goodCommand --safe"]),
       );
       expect(result.allAllowed).toBe(true);
     });
 
-    it('should block a command not on the sessionAllowlist or global allowlist', () => {
+    it("should block a command not on the sessionAllowlist or global allowlist", () => {
       const result = checkCommandPermissions(
-        'badCommand --danger',
+        "badCommand --danger",
         config,
-        new Set(['goodCommand --safe']),
+        new Set(["goodCommand --safe"]),
       );
       expect(result.allAllowed).toBe(false);
-      expect(result.blockReason).toContain(
-        'not on the global or session allowlist',
-      );
-      expect(result.disallowedCommands).toEqual(['badCommand --danger']);
+      expect(result.blockReason).toContain("not on the global or session allowlist");
+      expect(result.disallowedCommands).toEqual(["badCommand --danger"]);
     });
 
-    it('should allow a command on the global allowlist even if not on the session allowlist', () => {
-      config.getCoreTools = () => ['ShellTool(git status)'];
-      const result = checkCommandPermissions(
-        'git status',
-        config,
-        new Set(['goodCommand --safe']),
-      );
+    it("should allow a command on the global allowlist even if not on the session allowlist", () => {
+      config.getCoreTools = () => ["ShellTool(git status)"];
+      const result = checkCommandPermissions("git status", config, new Set(["goodCommand --safe"]));
       expect(result.allAllowed).toBe(true);
     });
 
-    it('should allow a chained command if parts are on different allowlists', () => {
-      config.getCoreTools = () => ['ShellTool(git status)'];
+    it("should allow a chained command if parts are on different allowlists", () => {
+      config.getCoreTools = () => ["ShellTool(git status)"];
       const result = checkCommandPermissions(
-        'git status && git commit',
+        "git status && git commit",
         config,
-        new Set(['git commit']),
+        new Set(["git commit"]),
       );
       expect(result.allAllowed).toBe(true);
     });
 
-    it('should block a command on the sessionAllowlist if it is also globally blocked', () => {
-      config.getExcludeTools = () => new Set(['run_shell_command(badCommand)']);
+    it("should block a command on the sessionAllowlist if it is also globally blocked", () => {
+      config.getExcludeTools = () => new Set(["run_shell_command(badCommand)"]);
       const result = checkCommandPermissions(
-        'badCommand --danger',
+        "badCommand --danger",
         config,
-        new Set(['badCommand --danger']),
+        new Set(["badCommand --danger"]),
       );
       expect(result.allAllowed).toBe(false);
-      expect(result.blockReason).toContain('is blocked by configuration');
+      expect(result.blockReason).toContain("is blocked by configuration");
     });
 
-    it('should block a chained command if one part is not on any allowlist', () => {
-      config.getCoreTools = () => ['run_shell_command(echo)'];
+    it("should block a chained command if one part is not on any allowlist", () => {
+      config.getCoreTools = () => ["run_shell_command(echo)"];
       const result = checkCommandPermissions(
         'echo "hello" && badCommand --danger',
         config,
-        new Set(['echo']),
+        new Set(["echo"]),
       );
       expect(result.allAllowed).toBe(false);
-      expect(result.disallowedCommands).toEqual(['badCommand --danger']);
+      expect(result.disallowedCommands).toEqual(["badCommand --danger"]);
     });
   });
 });
 
-describe('getCommandRoots', () => {
-  it('should return a single command', () => {
-    expect(getCommandRoots('ls -l')).toEqual(['ls']);
+describe("getCommandRoots", () => {
+  it("should return a single command", () => {
+    expect(getCommandRoots("ls -l")).toEqual(["ls"]);
   });
 
-  it('should handle paths and return the binary name', () => {
-    expect(getCommandRoots('/usr/local/bin/node script.js')).toEqual(['node']);
+  it("should handle paths and return the binary name", () => {
+    expect(getCommandRoots("/usr/local/bin/node script.js")).toEqual(["node"]);
   });
 
-  it('should return an empty array for an empty string', () => {
-    expect(getCommandRoots('')).toEqual([]);
+  it("should return an empty array for an empty string", () => {
+    expect(getCommandRoots("")).toEqual([]);
   });
 
-  it('should handle a mix of operators', () => {
-    const result = getCommandRoots('a;b|c&&d||e&f');
-    expect(result).toEqual(['a', 'b', 'c', 'd', 'e', 'f']);
+  it("should handle a mix of operators", () => {
+    const result = getCommandRoots("a;b|c&&d||e&f");
+    expect(result).toEqual(["a", "b", "c", "d", "e", "f"]);
   });
 
-  it('should correctly parse a chained command with quotes', () => {
+  it("should correctly parse a chained command with quotes", () => {
     const result = getCommandRoots('echo "hello" && git commit -m "feat"');
-    expect(result).toEqual(['echo', 'git']);
+    expect(result).toEqual(["echo", "git"]);
   });
 
-  it('should include nested command substitutions', () => {
-    const result = getCommandRoots('echo $(badCommand --danger)');
-    expect(result).toEqual(['echo', 'badCommand']);
+  it("should include nested command substitutions", () => {
+    const result = getCommandRoots("echo $(badCommand --danger)");
+    expect(result).toEqual(["echo", "badCommand"]);
   });
 
-  it('should include process substitutions', () => {
-    const result = getCommandRoots('diff <(ls) <(ls -a)');
-    expect(result).toEqual(['diff', 'ls', 'ls']);
+  it("should include process substitutions", () => {
+    const result = getCommandRoots("diff <(ls) <(ls -a)");
+    expect(result).toEqual(["diff", "ls", "ls"]);
   });
 
-  it('should include backtick substitutions', () => {
-    const result = getCommandRoots('echo `badCommand --danger`');
-    expect(result).toEqual(['echo', 'badCommand']);
+  it("should include backtick substitutions", () => {
+    const result = getCommandRoots("echo `badCommand --danger`");
+    expect(result).toEqual(["echo", "badCommand"]);
   });
 
-  it('should treat parameter expansions with prompt transformations as unsafe', () => {
-    const roots = getCommandRoots(
-      'echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"',
-    );
+  it("should treat parameter expansions with prompt transformations as unsafe", () => {
+    const roots = getCommandRoots('echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"');
     expect(roots).toEqual([]);
   });
 
-  it('should not return roots for prompt transformation expansions', () => {
-    const roots = getCommandRoots('echo ${foo@P}');
+  it("should not return roots for prompt transformation expansions", () => {
+    const roots = getCommandRoots("echo ${foo@P}");
     expect(roots).toEqual([]);
   });
 });
 
-describeWindowsOnly('PowerShell integration', () => {
-  const originalComSpec = process.env['ComSpec'];
+describeWindowsOnly("PowerShell integration", () => {
+  const originalComSpec = process.env["ComSpec"];
 
   beforeEach(() => {
-    mockPlatform.mockReturnValue('win32');
-    const systemRoot = process.env['SystemRoot'] || 'C:\\\\Windows';
-    process.env['ComSpec'] =
+    mockPlatform.mockReturnValue("win32");
+    const systemRoot = process.env["SystemRoot"] || "C:\\\\Windows";
+    process.env["ComSpec"] =
       `${systemRoot}\\\\System32\\\\WindowsPowerShell\\\\v1.0\\\\powershell.exe`;
   });
 
   afterEach(() => {
     if (originalComSpec === undefined) {
-      delete process.env['ComSpec'];
+      delete process.env["ComSpec"];
     } else {
-      process.env['ComSpec'] = originalComSpec;
+      process.env["ComSpec"] = originalComSpec;
     }
   });
 
-  it('should return command roots using PowerShell AST output', () => {
-    const roots = getCommandRoots('Get-ChildItem | Select-Object Name');
+  it("should return command roots using PowerShell AST output", () => {
+    const roots = getCommandRoots("Get-ChildItem | Select-Object Name");
     expect(roots.length).toBeGreaterThan(0);
-    expect(roots).toContain('Get-ChildItem');
+    expect(roots).toContain("Get-ChildItem");
   });
 
-  it('should block commands when PowerShell parser reports errors', () => {
-    const { allowed, reason } = isCommandAllowed('Get-ChildItem |', config);
+  it("should block commands when PowerShell parser reports errors", () => {
+    const { allowed, reason } = isCommandAllowed("Get-ChildItem |", config);
     expect(allowed).toBe(false);
-    expect(reason).toBe(
-      'Command rejected because it could not be parsed safely',
-    );
+    expect(reason).toBe("Command rejected because it could not be parsed safely");
   });
 });
 
-describe('stripShellWrapper', () => {
-  it('should strip sh -c with quotes', () => {
-    expect(stripShellWrapper('sh -c "ls -l"')).toEqual('ls -l');
+describe("stripShellWrapper", () => {
+  it("should strip sh -c with quotes", () => {
+    expect(stripShellWrapper('sh -c "ls -l"')).toEqual("ls -l");
   });
 
-  it('should strip bash -c with extra whitespace', () => {
-    expect(stripShellWrapper('  bash  -c  "ls -l"  ')).toEqual('ls -l');
+  it("should strip bash -c with extra whitespace", () => {
+    expect(stripShellWrapper('  bash  -c  "ls -l"  ')).toEqual("ls -l");
   });
 
-  it('should strip zsh -c without quotes', () => {
-    expect(stripShellWrapper('zsh -c ls -l')).toEqual('ls -l');
+  it("should strip zsh -c without quotes", () => {
+    expect(stripShellWrapper("zsh -c ls -l")).toEqual("ls -l");
   });
 
-  it('should strip cmd.exe /c', () => {
-    expect(stripShellWrapper('cmd.exe /c "dir"')).toEqual('dir');
+  it("should strip cmd.exe /c", () => {
+    expect(stripShellWrapper('cmd.exe /c "dir"')).toEqual("dir");
   });
 
-  it('should strip powershell.exe -Command with optional -NoProfile', () => {
-    expect(
-      stripShellWrapper('powershell.exe -NoProfile -Command "Get-ChildItem"'),
-    ).toEqual('Get-ChildItem');
-    expect(
-      stripShellWrapper('powershell.exe -Command "Get-ChildItem"'),
-    ).toEqual('Get-ChildItem');
+  it("should strip powershell.exe -Command with optional -NoProfile", () => {
+    expect(stripShellWrapper('powershell.exe -NoProfile -Command "Get-ChildItem"')).toEqual(
+      "Get-ChildItem",
+    );
+    expect(stripShellWrapper('powershell.exe -Command "Get-ChildItem"')).toEqual("Get-ChildItem");
   });
 
-  it('should strip pwsh -Command wrapper', () => {
-    expect(
-      stripShellWrapper('pwsh -NoProfile -Command "Get-ChildItem"'),
-    ).toEqual('Get-ChildItem');
+  it("should strip pwsh -Command wrapper", () => {
+    expect(stripShellWrapper('pwsh -NoProfile -Command "Get-ChildItem"')).toEqual("Get-ChildItem");
   });
 
-  it('should not strip anything if no wrapper is present', () => {
-    expect(stripShellWrapper('ls -l')).toEqual('ls -l');
+  it("should not strip anything if no wrapper is present", () => {
+    expect(stripShellWrapper("ls -l")).toEqual("ls -l");
   });
 });
 
-describe('isShellInvocationAllowlisted', () => {
+describe("isShellInvocationAllowlisted", () => {
   function createInvocation(command: string): AnyToolInvocation {
     return { params: { command } } as unknown as AnyToolInvocation;
   }
 
-  it('should return false when any chained command segment is not allowlisted', () => {
-    const invocation = createInvocation(
-      'git status && rm -rf /tmp/should-not-run',
-    );
-    expect(
-      isShellInvocationAllowlisted(invocation, ['run_shell_command(git)']),
-    ).toBe(false);
+  it("should return false when any chained command segment is not allowlisted", () => {
+    const invocation = createInvocation("git status && rm -rf /tmp/should-not-run");
+    expect(isShellInvocationAllowlisted(invocation, ["run_shell_command(git)"])).toBe(false);
   });
 
-  it('should return true when every segment is explicitly allowlisted', () => {
-    const invocation = createInvocation(
-      'git status && rm -rf /tmp/should-run && git diff',
-    );
+  it("should return true when every segment is explicitly allowlisted", () => {
+    const invocation = createInvocation("git status && rm -rf /tmp/should-run && git diff");
     expect(
       isShellInvocationAllowlisted(invocation, [
-        'run_shell_command(git)',
-        'run_shell_command(rm -rf)',
+        "run_shell_command(git)",
+        "run_shell_command(rm -rf)",
       ]),
     ).toBe(true);
   });
 
-  it('should return true when the allowlist contains a wildcard shell entry', () => {
-    const invocation = createInvocation('git status && rm -rf /tmp/should-run');
-    expect(
-      isShellInvocationAllowlisted(invocation, ['run_shell_command']),
-    ).toBe(true);
+  it("should return true when the allowlist contains a wildcard shell entry", () => {
+    const invocation = createInvocation("git status && rm -rf /tmp/should-run");
+    expect(isShellInvocationAllowlisted(invocation, ["run_shell_command"])).toBe(true);
   });
 
-  it('should treat piped commands as separate segments that must be allowlisted', () => {
-    const invocation = createInvocation('git status | tail -n 1');
-    expect(
-      isShellInvocationAllowlisted(invocation, ['run_shell_command(git)']),
-    ).toBe(false);
+  it("should treat piped commands as separate segments that must be allowlisted", () => {
+    const invocation = createInvocation("git status | tail -n 1");
+    expect(isShellInvocationAllowlisted(invocation, ["run_shell_command(git)"])).toBe(false);
     expect(
       isShellInvocationAllowlisted(invocation, [
-        'run_shell_command(git)',
-        'run_shell_command(tail)',
+        "run_shell_command(git)",
+        "run_shell_command(tail)",
       ]),
     ).toBe(true);
   });
 });
 
-describe('escapeShellArg', () => {
-  describe('POSIX (bash)', () => {
-    it('should use shell-quote for escaping', () => {
+describe("escapeShellArg", () => {
+  describe("POSIX (bash)", () => {
+    it("should use shell-quote for escaping", () => {
       mockQuote.mockReturnValueOnce("'escaped value'");
-      const result = escapeShellArg('raw value', 'bash');
-      expect(mockQuote).toHaveBeenCalledWith(['raw value']);
+      const result = escapeShellArg("raw value", "bash");
+      expect(mockQuote).toHaveBeenCalledWith(["raw value"]);
       expect(result).toBe("'escaped value'");
     });
 
-    it('should handle empty strings', () => {
-      const result = escapeShellArg('', 'bash');
-      expect(result).toBe('');
+    it("should handle empty strings", () => {
+      const result = escapeShellArg("", "bash");
+      expect(result).toBe("");
       expect(mockQuote).not.toHaveBeenCalled();
     });
   });
 
-  describe('Windows', () => {
-    describe('when shell is cmd.exe', () => {
-      it('should wrap simple arguments in double quotes', () => {
-        const result = escapeShellArg('search term', 'cmd');
+  describe("Windows", () => {
+    describe("when shell is cmd.exe", () => {
+      it("should wrap simple arguments in double quotes", () => {
+        const result = escapeShellArg("search term", "cmd");
         expect(result).toBe('"search term"');
       });
 
-      it('should escape internal double quotes by doubling them', () => {
-        const result = escapeShellArg('He said "Hello"', 'cmd');
+      it("should escape internal double quotes by doubling them", () => {
+        const result = escapeShellArg('He said "Hello"', "cmd");
         expect(result).toBe('"He said ""Hello"""');
       });
 
-      it('should handle empty strings', () => {
-        const result = escapeShellArg('', 'cmd');
-        expect(result).toBe('');
+      it("should handle empty strings", () => {
+        const result = escapeShellArg("", "cmd");
+        expect(result).toBe("");
       });
     });
 
-    describe('when shell is PowerShell', () => {
-      it('should wrap simple arguments in single quotes', () => {
-        const result = escapeShellArg('search term', 'powershell');
+    describe("when shell is PowerShell", () => {
+      it("should wrap simple arguments in single quotes", () => {
+        const result = escapeShellArg("search term", "powershell");
         expect(result).toBe("'search term'");
       });
 
-      it('should escape internal single quotes by doubling them', () => {
-        const result = escapeShellArg("It's a test", 'powershell');
+      it("should escape internal single quotes by doubling them", () => {
+        const result = escapeShellArg("It's a test", "powershell");
         expect(result).toBe("'It''s a test'");
       });
 
-      it('should handle double quotes without escaping them', () => {
-        const result = escapeShellArg('He said "Hello"', 'powershell');
-        expect(result).toBe('\'He said "Hello"\'');
+      it("should handle double quotes without escaping them", () => {
+        const result = escapeShellArg('He said "Hello"', "powershell");
+        expect(result).toBe("'He said \"Hello\"'");
       });
 
-      it('should handle empty strings', () => {
-        const result = escapeShellArg('', 'powershell');
-        expect(result).toBe('');
+      it("should handle empty strings", () => {
+        const result = escapeShellArg("", "powershell");
+        expect(result).toBe("");
       });
     });
   });
 });
 
-describe('getShellConfiguration', () => {
+describe("getShellConfiguration", () => {
   const originalEnv = { ...process.env };
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  it('should return bash configuration on Linux', () => {
-    mockPlatform.mockReturnValue('linux');
+  it("should return bash configuration on Linux", () => {
+    mockPlatform.mockReturnValue("linux");
     const config = getShellConfiguration();
-    expect(config.executable).toBe('bash');
-    expect(config.argsPrefix).toEqual(['-c']);
-    expect(config.shell).toBe('bash');
+    expect(config.executable).toBe("bash");
+    expect(config.argsPrefix).toEqual(["-c"]);
+    expect(config.shell).toBe("bash");
   });
 
-  it('should return bash configuration on macOS (darwin)', () => {
-    mockPlatform.mockReturnValue('darwin');
+  it("should return bash configuration on macOS (darwin)", () => {
+    mockPlatform.mockReturnValue("darwin");
     const config = getShellConfiguration();
-    expect(config.executable).toBe('bash');
-    expect(config.argsPrefix).toEqual(['-c']);
-    expect(config.shell).toBe('bash');
+    expect(config.executable).toBe("bash");
+    expect(config.argsPrefix).toEqual(["-c"]);
+    expect(config.shell).toBe("bash");
   });
 
-  describe('on Windows', () => {
+  describe("on Windows", () => {
     beforeEach(() => {
-      mockPlatform.mockReturnValue('win32');
+      mockPlatform.mockReturnValue("win32");
     });
 
-    it('should return PowerShell configuration by default', () => {
-      delete process.env['ComSpec'];
+    it("should return PowerShell configuration by default", () => {
+      delete process.env["ComSpec"];
       const config = getShellConfiguration();
-      expect(config.executable).toBe('powershell.exe');
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.executable).toBe("powershell.exe");
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should ignore ComSpec when pointing to cmd.exe', () => {
-      const cmdPath = 'C:\\WINDOWS\\system32\\cmd.exe';
-      process.env['ComSpec'] = cmdPath;
+    it("should ignore ComSpec when pointing to cmd.exe", () => {
+      const cmdPath = "C:\\WINDOWS\\system32\\cmd.exe";
+      process.env["ComSpec"] = cmdPath;
       const config = getShellConfiguration();
-      expect(config.executable).toBe('powershell.exe');
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.executable).toBe("powershell.exe");
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should return PowerShell configuration if ComSpec points to powershell.exe', () => {
-      const psPath =
-        'C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe';
-      process.env['ComSpec'] = psPath;
+    it("should return PowerShell configuration if ComSpec points to powershell.exe", () => {
+      const psPath = "C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe";
+      process.env["ComSpec"] = psPath;
       const config = getShellConfiguration();
       expect(config.executable).toBe(psPath);
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should return PowerShell configuration if ComSpec points to pwsh.exe', () => {
-      const pwshPath = 'C:\\Program Files\\PowerShell\\7\\pwsh.exe';
-      process.env['ComSpec'] = pwshPath;
+    it("should return PowerShell configuration if ComSpec points to pwsh.exe", () => {
+      const pwshPath = "C:\\Program Files\\PowerShell\\7\\pwsh.exe";
+      process.env["ComSpec"] = pwshPath;
       const config = getShellConfiguration();
       expect(config.executable).toBe(pwshPath);
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should be case-insensitive when checking ComSpec', () => {
-      process.env['ComSpec'] = 'C:\\Path\\To\\POWERSHELL.EXE';
+    it("should be case-insensitive when checking ComSpec", () => {
+      process.env["ComSpec"] = "C:\\Path\\To\\POWERSHELL.EXE";
       const config = getShellConfiguration();
-      expect(config.executable).toBe('C:\\Path\\To\\POWERSHELL.EXE');
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.executable).toBe("C:\\Path\\To\\POWERSHELL.EXE");
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/shell-utils.ts b/packages/gemini-cli-core/src/utils/shell-utils.ts
index d26122b70..3ad475fcf 100644
--- a/packages/gemini-cli-core/src/utils/shell-utils.ts
+++ b/packages/gemini-cli-core/src/utils/shell-utils.ts
@@ -4,26 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AnyToolInvocation } from '../index.js';
-import type { Config } from '../config/config.js';
-import os from 'node:os';
-import { quote } from 'shell-quote';
-import { doesToolInvocationMatch } from './tool-utils.js';
-import {
-  spawn,
-  spawnSync,
-  type SpawnOptionsWithoutStdio,
-} from 'node:child_process';
-import type { Node } from 'web-tree-sitter';
-import { Language, Parser } from 'web-tree-sitter';
-import { loadWasmBinary } from './fileUtils.js';
-
-export const SHELL_TOOL_NAMES = ['run_shell_command', 'ShellTool'];
+import { type SpawnOptionsWithoutStdio, spawn, spawnSync } from "node:child_process";
+import os from "node:os";
+import { quote } from "shell-quote";
+import type { Node } from "web-tree-sitter";
+import { Language, Parser } from "web-tree-sitter";
+import type { Config } from "../config/config.js";
+import type { AnyToolInvocation } from "../index.js";
+import { loadWasmBinary } from "./fileUtils.js";
+import { doesToolInvocationMatch } from "./tool-utils.js";
+
+export const SHELL_TOOL_NAMES = ["run_shell_command", "ShellTool"];
 
 /**
  * An identifier for the shell type.
  */
-export type ShellType = 'cmd' | 'powershell' | 'bash';
+export type ShellType = "cmd" | "powershell" | "bash";
 
 /**
  * Defines the configuration required to execute a command string within a specific shell.
@@ -46,7 +42,7 @@ let treeSitterInitializationError: Error | null = null;
 class ShellParserInitializationError extends Error {
   constructor(cause: Error) {
     super(`Failed to initialize bash parser: ${cause.message}`, { cause });
-    this.name = 'ShellParserInitializationError';
+    this.name = "ShellParserInitializationError";
   }
 }
 
@@ -54,10 +50,10 @@ function toError(value: unknown): Error {
   if (value instanceof Error) {
     return value;
   }
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     return new Error(value);
   }
-  return new Error('Unknown tree-sitter initialization error', {
+  return new Error("Unknown tree-sitter initialization error", {
     cause: value,
   });
 }
@@ -69,16 +65,16 @@ async function loadBashLanguage(): Promise<void> {
       loadWasmBinary(
         () =>
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore resolved by esbuild-plugin-wasm during bundling
-          import('web-tree-sitter/tree-sitter.wasm?binary'),
-        'web-tree-sitter/tree-sitter.wasm',
+          // @ts-expect-error resolved by esbuild-plugin-wasm during bundling
+          import("web-tree-sitter/tree-sitter.wasm?binary"),
+        "web-tree-sitter/tree-sitter.wasm",
       ),
       loadWasmBinary(
         () =>
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore resolved by esbuild-plugin-wasm during bundling
-          import('tree-sitter-bash/tree-sitter-bash.wasm?binary'),
-        'tree-sitter-bash/tree-sitter-bash.wasm',
+          // @ts-expect-error resolved by esbuild-plugin-wasm during bundling
+          import("tree-sitter-bash/tree-sitter-bash.wasm?binary"),
+        "tree-sitter-bash/tree-sitter-bash.wasm",
       ),
     ]);
 
@@ -117,7 +113,7 @@ interface CommandParseResult {
   hasError: boolean;
 }
 
-const POWERSHELL_COMMAND_ENV = '__GCLI_POWERSHELL_COMMAND__';
+const POWERSHELL_COMMAND_ENV = "__GCLI_POWERSHELL_COMMAND__";
 
 // Encode the parser script as UTF-16LE base64 so we can pass it via PowerShell's -EncodedCommand flag;
 // this avoids brittle quoting/escaping when spawning PowerShell and ensures the script is received byte-for-byte.
@@ -153,8 +149,8 @@ foreach ($commandAst in $commandAsts) {
   commands = $commandObjects
 } | ConvertTo-Json -Compress
 `,
-  'utf16le',
-).toString('base64');
+  "utf16le",
+).toString("base64");
 
 function createParser(): Parser | null {
   if (!bashLanguage) {
@@ -203,16 +199,16 @@ function normalizeCommandName(raw: string): string {
 
 function extractNameFromNode(node: Node): string | null {
   switch (node.type) {
-    case 'command': {
-      const nameNode = node.childForFieldName('name');
+    case "command": {
+      const nameNode = node.childForFieldName("name");
       if (!nameNode) {
         return null;
       }
       return normalizeCommandName(nameNode.text);
     }
-    case 'declaration_command':
-    case 'unset_command':
-    case 'test_command': {
+    case "declaration_command":
+    case "unset_command":
+    case "test_command": {
       const firstChild = node.child(0);
       if (!firstChild) {
         return null;
@@ -224,10 +220,7 @@ function extractNameFromNode(node: Node): string | null {
   }
 }
 
-function collectCommandDetails(
-  root: Node,
-  source: string,
-): ParsedCommandDetail[] {
+function collectCommandDetails(root: Node, source: string): ParsedCommandDetail[] {
   const stack: Node[] = [root];
   const details: ParsedCommandDetail[] = [];
 
@@ -265,15 +258,12 @@ function hasPromptCommandTransform(root: Node): boolean {
       continue;
     }
 
-    if (current.type === 'expansion') {
+    if (current.type === "expansion") {
       for (let i = 0; i < current.childCount - 1; i += 1) {
         const operatorNode = current.child(i);
         const transformNode = current.child(i + 1);
 
-        if (
-          operatorNode?.text === '@' &&
-          transformNode?.text?.toLowerCase() === 'p'
-        ) {
+        if (operatorNode?.text === "@" && transformNode?.text?.toLowerCase() === "p") {
           return true;
         }
       }
@@ -311,9 +301,7 @@ function parseBashCommandDetails(command: string): CommandParseResult | null {
   return {
     details,
     hasError:
-      tree.rootNode.hasError ||
-      details.length === 0 ||
-      hasPromptCommandTransform(tree.rootNode),
+      tree.rootNode.hasError || details.length === 0 || hasPromptCommandTransform(tree.rootNode),
   };
 }
 
@@ -332,19 +320,13 @@ function parsePowerShellCommandDetails(
   try {
     const result = spawnSync(
       executable,
-      [
-        '-NoLogo',
-        '-NoProfile',
-        '-NonInteractive',
-        '-EncodedCommand',
-        POWERSHELL_PARSER_SCRIPT,
-      ],
+      ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", POWERSHELL_PARSER_SCRIPT],
       {
         env: {
           ...process.env,
           [POWERSHELL_COMMAND_ENV]: command,
         },
-        encoding: 'utf-8',
+        encoding: "utf-8",
       },
     );
 
@@ -352,7 +334,7 @@ function parsePowerShellCommandDetails(
       return null;
     }
 
-    const output = (result.stdout ?? '').toString().trim();
+    const output = (result.stdout ?? "").toString().trim();
     if (!output) {
       return { details: [], hasError: true };
     }
@@ -373,15 +355,12 @@ function parsePowerShellCommandDetails(
 
     const details = (parsed.commands ?? [])
       .map((commandDetail) => {
-        if (!commandDetail || typeof commandDetail.name !== 'string') {
+        if (!commandDetail || typeof commandDetail.name !== "string") {
           return null;
         }
 
         const name = normalizeCommandName(commandDetail.name);
-        const text =
-          typeof commandDetail.text === 'string'
-            ? commandDetail.text.trim()
-            : command;
+        const text = typeof commandDetail.text === "string" ? commandDetail.text.trim() : command;
 
         return {
           name,
@@ -402,11 +381,11 @@ function parsePowerShellCommandDetails(
 function parseCommandDetails(command: string): CommandParseResult | null {
   const configuration = getShellConfiguration();
 
-  if (configuration.shell === 'powershell') {
+  if (configuration.shell === "powershell") {
     return parsePowerShellCommandDetails(command, configuration.executable);
   }
 
-  if (configuration.shell === 'bash') {
+  if (configuration.shell === "bash") {
     return parseBashCommandDetails(command);
   }
 
@@ -423,37 +402,34 @@ function parseCommandDetails(command: string): CommandParseResult | null {
  */
 export function getShellConfiguration(): ShellConfiguration {
   if (isWindows()) {
-    const comSpec = process.env['ComSpec'];
+    const comSpec = process.env["ComSpec"];
     if (comSpec) {
       const executable = comSpec.toLowerCase();
-      if (
-        executable.endsWith('powershell.exe') ||
-        executable.endsWith('pwsh.exe')
-      ) {
+      if (executable.endsWith("powershell.exe") || executable.endsWith("pwsh.exe")) {
         return {
           executable: comSpec,
-          argsPrefix: ['-NoProfile', '-Command'],
-          shell: 'powershell',
+          argsPrefix: ["-NoProfile", "-Command"],
+          shell: "powershell",
         };
       }
     }
 
     // Default to PowerShell for all other Windows configurations.
     return {
-      executable: 'powershell.exe',
-      argsPrefix: ['-NoProfile', '-Command'],
-      shell: 'powershell',
+      executable: "powershell.exe",
+      argsPrefix: ["-NoProfile", "-Command"],
+      shell: "powershell",
     };
   }
 
   // Unix-like systems (Linux, macOS)
-  return { executable: 'bash', argsPrefix: ['-c'], shell: 'bash' };
+  return { executable: "bash", argsPrefix: ["-c"], shell: "bash" };
 }
 
 /**
  * Export the platform detection constant for use in process management (e.g., killing processes).
  */
-export const isWindows = () => os.platform() === 'win32';
+export const isWindows = () => os.platform() === "win32";
 
 /**
  * Escapes a string so that it can be safely used as a single argument
@@ -465,17 +441,17 @@ export const isWindows = () => os.platform() === 'win32';
  */
 export function escapeShellArg(arg: string, shell: ShellType): string {
   if (!arg) {
-    return '';
+    return "";
   }
 
   switch (shell) {
-    case 'powershell':
+    case "powershell":
       // For PowerShell, wrap in single quotes and escape internal single quotes by doubling them.
       return `'${arg.replace(/'/g, "''")}'`;
-    case 'cmd':
+    case "cmd":
       // Simple Windows escaping for cmd.exe: wrap in double quotes and escape inner double quotes.
       return `"${arg.replace(/"/g, '""')}"`;
-    case 'bash':
+    case "bash":
     default:
       // POSIX shell escaping using shell-quote.
       return quote([arg]);
@@ -591,41 +567,35 @@ export function checkCommandPermissions(
     return {
       allAllowed: false,
       disallowedCommands: [command],
-      blockReason: 'Command rejected because it could not be parsed safely',
+      blockReason: "Command rejected because it could not be parsed safely",
       isHardDenial: true,
     };
   }
 
-  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, ' ');
+  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, " ");
   const commandsToValidate = parseResult.details
     .map((detail) => normalize(detail.text))
     .filter(Boolean);
   const invocation: AnyToolInvocation & { params: { command: string } } = {
-    params: { command: '' },
+    params: { command: "" },
   } as AnyToolInvocation & { params: { command: string } };
 
   // 1. Blocklist Check (Highest Priority)
   const excludeTools = config.getExcludeTools() || new Set([]);
-  const isWildcardBlocked = SHELL_TOOL_NAMES.some((name) =>
-    excludeTools.has(name),
-  );
+  const isWildcardBlocked = SHELL_TOOL_NAMES.some((name) => excludeTools.has(name));
 
   if (isWildcardBlocked) {
     return {
       allAllowed: false,
       disallowedCommands: commandsToValidate,
-      blockReason: 'Shell tool is globally disabled in configuration',
+      blockReason: "Shell tool is globally disabled in configuration",
       isHardDenial: true,
     };
   }
 
   for (const cmd of commandsToValidate) {
-    invocation.params['command'] = cmd;
-    if (
-      doesToolInvocationMatch('run_shell_command', invocation, [
-        ...excludeTools,
-      ])
-    ) {
+    invocation.params["command"] = cmd;
+    if (doesToolInvocationMatch("run_shell_command", invocation, [...excludeTools])) {
       return {
         allAllowed: false,
         disallowedCommands: [cmd],
@@ -636,9 +606,7 @@ export function checkCommandPermissions(
   }
 
   const coreTools = config.getCoreTools() || [];
-  const isWildcardAllowed = SHELL_TOOL_NAMES.some((name) =>
-    coreTools.includes(name),
-  );
+  const isWildcardAllowed = SHELL_TOOL_NAMES.some((name) => coreTools.includes(name));
 
   // If there's a global wildcard, all commands are allowed at this point
   // because they have already passed the blocklist check.
@@ -652,25 +620,17 @@ export function checkCommandPermissions(
     // "DEFAULT DENY" MODE: A session allowlist is provided.
     // All commands must be in either the session or global allowlist.
     const normalizedSessionAllowlist = new Set(
-      [...sessionAllowlist].flatMap((cmd) =>
-        SHELL_TOOL_NAMES.map((name) => `${name}(${cmd})`),
-      ),
+      [...sessionAllowlist].flatMap((cmd) => SHELL_TOOL_NAMES.map((name) => `${name}(${cmd})`)),
     );
 
     for (const cmd of commandsToValidate) {
-      invocation.params['command'] = cmd;
-      const isSessionAllowed = doesToolInvocationMatch(
-        'run_shell_command',
-        invocation,
-        [...normalizedSessionAllowlist],
-      );
+      invocation.params["command"] = cmd;
+      const isSessionAllowed = doesToolInvocationMatch("run_shell_command", invocation, [
+        ...normalizedSessionAllowlist,
+      ]);
       if (isSessionAllowed) continue;
 
-      const isGloballyAllowed = doesToolInvocationMatch(
-        'run_shell_command',
-        invocation,
-        coreTools,
-      );
+      const isGloballyAllowed = doesToolInvocationMatch("run_shell_command", invocation, coreTools);
       if (isGloballyAllowed) continue;
 
       disallowedCommands.push(cmd);
@@ -682,22 +642,21 @@ export function checkCommandPermissions(
         disallowedCommands,
         blockReason: `Command(s) not on the global or session allowlist. Disallowed commands: ${disallowedCommands
           .map((c) => JSON.stringify(c))
-          .join(', ')}`,
+          .join(", ")}`,
         isHardDenial: false, // This is a soft denial; confirmation is possible.
       };
     }
   } else {
     // "DEFAULT ALLOW" MODE: No session allowlist.
     const hasSpecificAllowedCommands =
-      coreTools.filter((tool) =>
-        SHELL_TOOL_NAMES.some((name) => tool.startsWith(`${name}(`)),
-      ).length > 0;
+      coreTools.filter((tool) => SHELL_TOOL_NAMES.some((name) => tool.startsWith(`${name}(`)))
+        .length > 0;
 
     if (hasSpecificAllowedCommands) {
       for (const cmd of commandsToValidate) {
-        invocation.params['command'] = cmd;
+        invocation.params["command"] = cmd;
         const isGloballyAllowed = doesToolInvocationMatch(
-          'run_shell_command',
+          "run_shell_command",
           invocation,
           coreTools,
         );
@@ -711,7 +670,7 @@ export function checkCommandPermissions(
           disallowedCommands,
           blockReason: `Command(s) not in the allowed commands list. Disallowed commands: ${disallowedCommands
             .map((c) => JSON.stringify(c))
-            .join(', ')}`,
+            .join(", ")}`,
           isHardDenial: false, // This is a soft denial.
         };
       }
@@ -742,18 +701,18 @@ export const spawnAsync = (
 ): Promise<{ stdout: string; stderr: string }> =>
   new Promise((resolve, reject) => {
     const child = spawn(command, args, options);
-    let stdout = '';
-    let stderr = '';
+    let stdout = "";
+    let stderr = "";
 
-    child.stdout.on('data', (data) => {
+    child.stdout.on("data", (data) => {
       stdout += data.toString();
     });
 
-    child.stderr.on('data', (data) => {
+    child.stderr.on("data", (data) => {
       stderr += data.toString();
     });
 
-    child.on('close', (code) => {
+    child.on("close", (code) => {
       if (code === 0) {
         resolve({ stdout, stderr });
       } else {
@@ -761,7 +720,7 @@ export const spawnAsync = (
       }
     });
 
-    child.on('error', (err) => {
+    child.on("error", (err) => {
       reject(err);
     });
   });
@@ -796,9 +755,7 @@ export function isShellInvocationAllowlisted(
     return false;
   }
 
-  const hasShellWildcard = allowedPatterns.some((pattern) =>
-    SHELL_TOOL_NAMES.includes(pattern),
-  );
+  const hasShellWildcard = allowedPatterns.some((pattern) => SHELL_TOOL_NAMES.includes(pattern));
   const hasShellSpecificPattern = allowedPatterns.some((pattern) =>
     SHELL_TOOL_NAMES.some((name) => pattern.startsWith(`${name}(`)),
   );
@@ -812,16 +769,16 @@ export function isShellInvocationAllowlisted(
   }
 
   if (
-    !('params' in invocation) ||
-    typeof invocation.params !== 'object' ||
+    !("params" in invocation) ||
+    typeof invocation.params !== "object" ||
     invocation.params === null ||
-    !('command' in invocation.params)
+    !("command" in invocation.params)
   ) {
     return false;
   }
 
   const commandValue = (invocation.params as { command?: unknown }).command;
-  if (typeof commandValue !== 'string' || !commandValue.trim()) {
+  if (typeof commandValue !== "string" || !commandValue.trim()) {
     return false;
   }
 
@@ -832,7 +789,7 @@ export function isShellInvocationAllowlisted(
     return false;
   }
 
-  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, ' ');
+  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, " ");
   const commandsToValidate = parseResult.details
     .map((detail) => normalize(detail.text))
     .filter(Boolean);
diff --git a/packages/gemini-cli-core/src/utils/stdio.test.ts b/packages/gemini-cli-core/src/utils/stdio.test.ts
index 93e390d0c..6c369e10a 100644
--- a/packages/gemini-cli-core/src/utils/stdio.test.ts
+++ b/packages/gemini-cli-core/src/utils/stdio.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { patchStdio, createWorkingStdio } from './stdio.js';
-import { coreEvents } from './events.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { coreEvents } from "./events.js";
+import { createWorkingStdio, patchStdio } from "./stdio.js";
 
-vi.mock('./events.js', () => ({
+vi.mock("./events.js", () => ({
   coreEvents: {
     emitOutput: vi.fn(),
   },
 }));
 
-describe('stdio utils', () => {
+describe("stdio utils", () => {
   let originalStdoutWrite: typeof process.stdout.write;
   let originalStderrWrite: typeof process.stderr.write;
 
@@ -29,22 +29,14 @@ describe('stdio utils', () => {
     vi.restoreAllMocks();
   });
 
-  it('patchStdio redirects stdout and stderr to coreEvents', () => {
+  it("patchStdio redirects stdout and stderr to coreEvents", () => {
     const cleanup = patchStdio();
 
-    process.stdout.write('test stdout');
-    expect(coreEvents.emitOutput).toHaveBeenCalledWith(
-      false,
-      'test stdout',
-      undefined,
-    );
+    process.stdout.write("test stdout");
+    expect(coreEvents.emitOutput).toHaveBeenCalledWith(false, "test stdout", undefined);
 
-    process.stderr.write('test stderr');
-    expect(coreEvents.emitOutput).toHaveBeenCalledWith(
-      true,
-      'test stderr',
-      undefined,
-    );
+    process.stderr.write("test stderr");
+    expect(coreEvents.emitOutput).toHaveBeenCalledWith(true, "test stderr", undefined);
 
     cleanup();
 
@@ -53,14 +45,14 @@ describe('stdio utils', () => {
     expect(process.stderr.write).toBe(originalStderrWrite);
   });
 
-  it('createWorkingStdio writes to real stdout/stderr bypassing patch', () => {
+  it("createWorkingStdio writes to real stdout/stderr bypassing patch", () => {
     const cleanup = patchStdio();
     const { stdout, stderr } = createWorkingStdio();
 
-    stdout.write('working stdout');
+    stdout.write("working stdout");
     expect(coreEvents.emitOutput).not.toHaveBeenCalled();
 
-    stderr.write('working stderr');
+    stderr.write("working stderr");
     expect(coreEvents.emitOutput).not.toHaveBeenCalled();
 
     cleanup();
diff --git a/packages/gemini-cli-core/src/utils/stdio.ts b/packages/gemini-cli-core/src/utils/stdio.ts
index 8f6290639..05e95e4a8 100644
--- a/packages/gemini-cli-core/src/utils/stdio.ts
+++ b/packages/gemini-cli-core/src/utils/stdio.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { coreEvents } from './events.js';
+import { coreEvents } from "./events.js";
 
 // Capture the original stdout and stderr write methods before any monkey patching occurs.
 const originalStdoutWrite = process.stdout.write.bind(process.stdout);
@@ -13,18 +13,14 @@ const originalStderrWrite = process.stderr.write.bind(process.stderr);
 /**
  * Writes to the real stdout, bypassing any monkey patching on process.stdout.write.
  */
-export function writeToStdout(
-  ...args: Parameters<typeof process.stdout.write>
-): boolean {
+export function writeToStdout(...args: Parameters<typeof process.stdout.write>): boolean {
   return originalStdoutWrite(...args);
 }
 
 /**
  * Writes to the real stderr, bypassing any monkey patching on process.stderr.write.
  */
-export function writeToStderr(
-  ...args: Parameters<typeof process.stderr.write>
-): boolean {
+export function writeToStderr(...args: Parameters<typeof process.stderr.write>): boolean {
   return originalStderrWrite(...args);
 }
 
@@ -39,15 +35,12 @@ export function patchStdio(): () => void {
 
   process.stdout.write = (
     chunk: Uint8Array | string,
-    encodingOrCb?:
-      | BufferEncoding
-      | ((err?: NodeJS.ErrnoException | null) => void),
+    encodingOrCb?: BufferEncoding | ((err?: NodeJS.ErrnoException | null) => void),
     cb?: (err?: NodeJS.ErrnoException | null) => void,
   ) => {
-    const encoding =
-      typeof encodingOrCb === 'string' ? encodingOrCb : undefined;
+    const encoding = typeof encodingOrCb === "string" ? encodingOrCb : undefined;
     coreEvents.emitOutput(false, chunk, encoding);
-    const callback = typeof encodingOrCb === 'function' ? encodingOrCb : cb;
+    const callback = typeof encodingOrCb === "function" ? encodingOrCb : cb;
     if (callback) {
       callback();
     }
@@ -56,15 +49,12 @@ export function patchStdio(): () => void {
 
   process.stderr.write = (
     chunk: Uint8Array | string,
-    encodingOrCb?:
-      | BufferEncoding
-      | ((err?: NodeJS.ErrnoException | null) => void),
+    encodingOrCb?: BufferEncoding | ((err?: NodeJS.ErrnoException | null) => void),
     cb?: (err?: NodeJS.ErrnoException | null) => void,
   ) => {
-    const encoding =
-      typeof encodingOrCb === 'string' ? encodingOrCb : undefined;
+    const encoding = typeof encodingOrCb === "string" ? encodingOrCb : undefined;
     coreEvents.emitOutput(true, chunk, encoding);
-    const callback = typeof encodingOrCb === 'function' ? encodingOrCb : cb;
+    const callback = typeof encodingOrCb === "function" ? encodingOrCb : cb;
     if (callback) {
       callback();
     }
@@ -85,11 +75,11 @@ export function patchStdio(): () => void {
 export function createWorkingStdio() {
   const inkStdout = new Proxy(process.stdout, {
     get(target, prop, receiver) {
-      if (prop === 'write') {
+      if (prop === "write") {
         return writeToStdout;
       }
       const value = Reflect.get(target, prop, receiver);
-      if (typeof value === 'function') {
+      if (typeof value === "function") {
         return value.bind(target);
       }
       return value;
@@ -98,11 +88,11 @@ export function createWorkingStdio() {
 
   const inkStderr = new Proxy(process.stderr, {
     get(target, prop, receiver) {
-      if (prop === 'write') {
+      if (prop === "write") {
         return writeToStderr;
       }
       const value = Reflect.get(target, prop, receiver);
-      if (typeof value === 'function') {
+      if (typeof value === "function") {
         return value.bind(target);
       }
       return value;
diff --git a/packages/gemini-cli-core/src/utils/summarizer.test.ts b/packages/gemini-cli-core/src/utils/summarizer.test.ts
index e44196f9d..74754eba8 100644
--- a/packages/gemini-cli-core/src/utils/summarizer.test.ts
+++ b/packages/gemini-cli-core/src/utils/summarizer.test.ts
@@ -4,33 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { GeminiClient } from '../core/client.js';
-import { Config } from '../config/config.js';
-import {
-  summarizeToolOutput,
-  llmSummarizer,
-  defaultSummarizer,
-} from './summarizer.js';
-import type { ToolResult } from '../tools/tools.js';
-import type {
-  ModelConfigService,
-  ResolvedModelConfig,
-} from '../services/modelConfigService.js';
-import { DEFAULT_GEMINI_MODEL } from '../config/models.js';
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_MODEL } from "../config/models.js";
+import { GeminiClient } from "../core/client.js";
+import type { ModelConfigService, ResolvedModelConfig } from "../services/modelConfigService.js";
+import type { ToolResult } from "../tools/tools.js";
+import { defaultSummarizer, llmSummarizer, summarizeToolOutput } from "./summarizer.js";
 
 // Mock GeminiClient and Config constructor
-vi.mock('../core/client.js');
-vi.mock('../config/config.js');
+vi.mock("../core/client.js");
+vi.mock("../config/config.js");
 
-describe('summarizers', () => {
+describe("summarizers", () => {
   let mockGeminiClient: GeminiClient;
   let MockConfig: Mock;
   let mockConfigInstance: Config;
   const abortSignal = new AbortController().signal;
   const mockResolvedConfig = {
-    model: 'gemini-pro',
+    model: "gemini-pro",
     generateContentConfig: {
       maxOutputTokens: 2000,
     },
@@ -39,10 +32,10 @@ describe('summarizers', () => {
   beforeEach(() => {
     MockConfig = vi.mocked(Config);
     mockConfigInstance = new MockConfig(
-      'test-api-key',
-      'gemini-pro',
+      "test-api-key",
+      "gemini-pro",
       false,
-      '.',
+      ".",
       false,
       undefined,
       false,
@@ -57,7 +50,7 @@ describe('summarizers', () => {
     mockGeminiClient = new GeminiClient(mockConfigInstance);
     (mockGeminiClient.generateContent as Mock) = vi.fn();
 
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -65,9 +58,9 @@ describe('summarizers', () => {
     (console.error as Mock).mockRestore();
   });
 
-  describe('summarizeToolOutput', () => {
-    it('should return original text if it is shorter than maxLength', async () => {
-      const shortText = 'This is a short text.';
+  describe("summarizeToolOutput", () => {
+    it("should return original text if it is shorter than maxLength", async () => {
+      const shortText = "This is a short text.";
       const result = await summarizeToolOutput(
         mockConfigInstance,
         { model: DEFAULT_GEMINI_MODEL },
@@ -79,8 +72,8 @@ describe('summarizers', () => {
       expect(mockGeminiClient.generateContent).not.toHaveBeenCalled();
     });
 
-    it('should return original text if it is empty', async () => {
-      const emptyText = '';
+    it("should return original text if it is empty", async () => {
+      const emptyText = "";
       const result = await summarizeToolOutput(
         mockConfigInstance,
         { model: DEFAULT_GEMINI_MODEL },
@@ -92,9 +85,9 @@ describe('summarizers', () => {
       expect(mockGeminiClient.generateContent).not.toHaveBeenCalled();
     });
 
-    it('should call generateContent if text is longer than maxLength', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
-      const summary = 'This is a summary.';
+    it("should call generateContent if text is longer than maxLength", async () => {
+      const longText = "This is a very long text.".repeat(200);
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
@@ -110,9 +103,9 @@ describe('summarizers', () => {
       expect(result).toBe(summary);
     });
 
-    it('should return original text if generateContent throws an error', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
-      const error = new Error('API Error');
+    it("should return original text if generateContent throws an error", async () => {
+      const longText = "This is a very long text.".repeat(200);
+      const error = new Error("API Error");
       (mockGeminiClient.generateContent as Mock).mockRejectedValue(error);
 
       const result = await summarizeToolOutput(
@@ -127,16 +120,16 @@ describe('summarizers', () => {
       expect(result).toBe(longText);
     });
 
-    it('should construct the correct prompt for summarization', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
-      const summary = 'This is a summary.';
+    it("should construct the correct prompt for summarization", async () => {
+      const longText = "This is a very long text.".repeat(200);
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
       (mockConfigInstance.modelConfigService as unknown) = {
         getResolvedConfig() {
           return {
-            model: 'gemini-pro-limited',
+            model: "gemini-pro-limited",
             generateContentConfig: {
               maxOutputTokens: 1000,
             },
@@ -146,7 +139,7 @@ describe('summarizers', () => {
 
       await summarizeToolOutput(
         mockConfigInstance,
-        { model: 'gemini-pro-limited' },
+        { model: "gemini-pro-limited" },
         longText,
         mockGeminiClient,
         abortSignal,
@@ -165,20 +158,19 @@ Text to summarize:
 
 Return the summary string which should first contain an overall summarization of text followed by the full stack trace of errors and warnings in the tool output.
 `;
-      const calledWith = (mockGeminiClient.generateContent as Mock).mock
-        .calls[0];
+      const calledWith = (mockGeminiClient.generateContent as Mock).mock.calls[0];
       const contents = calledWith[1];
       expect(contents[0].parts[0].text).toBe(expectedPrompt);
     });
   });
 
-  describe('llmSummarizer', () => {
-    it('should summarize tool output using summarizeToolOutput', async () => {
+  describe("llmSummarizer", () => {
+    it("should summarize tool output using summarizeToolOutput", async () => {
       const toolResult: ToolResult = {
-        llmContent: 'This is a very long text.'.repeat(200),
-        returnDisplay: '',
+        llmContent: "This is a very long text.".repeat(200),
+        returnDisplay: "",
       };
-      const summary = 'This is a summary.';
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
@@ -194,13 +186,13 @@ Return the summary string which should first contain an overall summarization of
       expect(result).toBe(summary);
     });
 
-    it('should handle different llmContent types', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
+    it("should handle different llmContent types", async () => {
+      const longText = "This is a very long text.".repeat(200);
       const toolResult: ToolResult = {
         llmContent: [{ text: longText }],
-        returnDisplay: '',
+        returnDisplay: "",
       };
-      const summary = 'This is a summary.';
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
@@ -213,19 +205,18 @@ Return the summary string which should first contain an overall summarization of
       );
 
       expect(mockGeminiClient.generateContent).toHaveBeenCalledTimes(1);
-      const calledWith = (mockGeminiClient.generateContent as Mock).mock
-        .calls[0];
+      const calledWith = (mockGeminiClient.generateContent as Mock).mock.calls[0];
       const contents = calledWith[1];
       expect(contents[0].parts[0].text).toContain(`"${longText}"`);
       expect(result).toBe(summary);
     });
   });
 
-  describe('defaultSummarizer', () => {
-    it('should stringify the llmContent', async () => {
+  describe("defaultSummarizer", () => {
+    it("should stringify the llmContent", async () => {
       const toolResult: ToolResult = {
-        llmContent: { text: 'some data' },
-        returnDisplay: '',
+        llmContent: { text: "some data" },
+        returnDisplay: "",
       };
 
       const result = await defaultSummarizer(
@@ -235,7 +226,7 @@ Return the summary string which should first contain an overall summarization of
         abortSignal,
       );
 
-      expect(result).toBe(JSON.stringify({ text: 'some data' }));
+      expect(result).toBe(JSON.stringify({ text: "some data" }));
       expect(mockGeminiClient.generateContent).not.toHaveBeenCalled();
     });
   });
diff --git a/packages/gemini-cli-core/src/utils/summarizer.ts b/packages/gemini-cli-core/src/utils/summarizer.ts
index b25961e14..ce8b0fa45 100644
--- a/packages/gemini-cli-core/src/utils/summarizer.ts
+++ b/packages/gemini-cli-core/src/utils/summarizer.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolResult } from '../tools/tools.js';
-import type { Content } from '@google/genai';
-import type { GeminiClient } from '../core/client.js';
-import { getResponseText, partToString } from './partUtils.js';
-import { debugLogger } from './debugLogger.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
-import type { Config } from '../config/config.js';
+import type { Content } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { GeminiClient } from "../core/client.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import type { ToolResult } from "../tools/tools.js";
+import { debugLogger } from "./debugLogger.js";
+import { getResponseText, partToString } from "./partUtils.js";
 
 /**
  * A function that summarizes the result of a tool execution.
@@ -54,15 +54,10 @@ Text to summarize:
 Return the summary string which should first contain an overall summarization of text followed by the full stack trace of errors and warnings in the tool output.
 `;
 
-export const llmSummarizer: Summarizer = async (
-  config,
-  result,
-  geminiClient,
-  abortSignal,
-) =>
+export const llmSummarizer: Summarizer = async (config, result, geminiClient, abortSignal) =>
   summarizeToolOutput(
     config,
-    { model: 'summarizer-default' },
+    { model: "summarizer-default" },
     partToString(result.llmContent),
     geminiClient,
     abortSignal,
@@ -76,19 +71,19 @@ export async function summarizeToolOutput(
   abortSignal: AbortSignal,
 ): Promise<string> {
   const maxOutputTokens =
-    config.modelConfigService.getResolvedConfig(modelConfigKey)
-      .generateContentConfig.maxOutputTokens ?? 2000;
+    config.modelConfigService.getResolvedConfig(modelConfigKey).generateContentConfig
+      .maxOutputTokens ?? 2000;
   // There is going to be a slight difference here since we are comparing length of string with maxOutputTokens.
   // This is meant to be a ballpark estimation of if we need to summarize the tool output.
   if (!textToSummarize || textToSummarize.length < maxOutputTokens) {
     return textToSummarize;
   }
   const prompt = SUMMARIZE_TOOL_OUTPUT_PROMPT.replace(
-    '{maxOutputTokens}',
+    "{maxOutputTokens}",
     String(maxOutputTokens),
-  ).replace('{textToSummarize}', textToSummarize);
+  ).replace("{textToSummarize}", textToSummarize);
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
   try {
     const parsedResponse = await geminiClient.generateContent(
       modelConfigKey,
@@ -97,7 +92,7 @@ export async function summarizeToolOutput(
     );
     return getResponseText(parsedResponse) || textToSummarize;
   } catch (error) {
-    debugLogger.warn('Failed to summarize tool output.', error);
+    debugLogger.warn("Failed to summarize tool output.", error);
     return textToSummarize;
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/systemEncoding.test.ts b/packages/gemini-cli-core/src/utils/systemEncoding.test.ts
index d84e5914e..4d72cb767 100644
--- a/packages/gemini-cli-core/src/utils/systemEncoding.test.ts
+++ b/packages/gemini-cli-core/src/utils/systemEncoding.test.ts
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { execSync } from 'node:child_process';
-import * as os from 'node:os';
-import { detect as chardetDetect } from 'chardet';
-import { debugLogger } from './debugLogger.js';
+import { execSync } from "node:child_process";
+import * as os from "node:os";
+import { detect as chardetDetect } from "chardet";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
 
 // Mock dependencies
-vi.mock('child_process');
-vi.mock('os');
-vi.mock('chardet');
+vi.mock("child_process");
+vi.mock("os");
+vi.mock("chardet");
 
 // Import the functions we want to test after refactoring
 import {
+  detectEncodingFromBuffer,
   getCachedEncodingForBuffer,
   getSystemEncoding,
-  windowsCodePageToEncoding,
-  detectEncodingFromBuffer,
   resetEncodingCache,
-} from './systemEncoding.js';
+  windowsCodePageToEncoding,
+} from "./systemEncoding.js";
 
-describe('Shell Command Processor - Encoding Functions', () => {
+describe("Shell Command Processor - Encoding Functions", () => {
   let consoleWarnSpy: ReturnType<typeof vi.spyOn>;
   let mockedExecSync: ReturnType<typeof vi.mocked<typeof execSync>>;
   let mockedOsPlatform: ReturnType<typeof vi.mocked<() => string>>;
   let mockedChardetDetect: ReturnType<typeof vi.mocked<typeof chardetDetect>>;
 
   beforeEach(() => {
-    consoleWarnSpy = vi.spyOn(debugLogger, 'warn').mockImplementation(() => {});
+    consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
     mockedExecSync = vi.mocked(execSync);
     mockedOsPlatform = vi.mocked(os.platform);
     mockedChardetDetect = vi.mocked(chardetDetect);
@@ -40,9 +40,9 @@ describe('Shell Command Processor - Encoding Functions', () => {
     resetEncodingCache();
 
     // Clear environment variables that might affect tests
-    delete process.env['LC_ALL'];
-    delete process.env['LC_CTYPE'];
-    delete process.env['LANG'];
+    delete process.env["LC_ALL"];
+    delete process.env["LC_CTYPE"];
+    delete process.env["LANG"];
   });
 
   afterEach(() => {
@@ -50,366 +50,351 @@ describe('Shell Command Processor - Encoding Functions', () => {
     resetEncodingCache();
   });
 
-  describe('windowsCodePageToEncoding', () => {
-    it('should map common Windows code pages correctly', () => {
-      expect(windowsCodePageToEncoding(437)).toBe('cp437');
-      expect(windowsCodePageToEncoding(850)).toBe('cp850');
-      expect(windowsCodePageToEncoding(65001)).toBe('utf-8');
-      expect(windowsCodePageToEncoding(1252)).toBe('windows-1252');
-      expect(windowsCodePageToEncoding(932)).toBe('shift_jis');
-      expect(windowsCodePageToEncoding(936)).toBe('gb2312');
-      expect(windowsCodePageToEncoding(949)).toBe('euc-kr');
-      expect(windowsCodePageToEncoding(950)).toBe('big5');
-      expect(windowsCodePageToEncoding(1200)).toBe('utf-16le');
-      expect(windowsCodePageToEncoding(1201)).toBe('utf-16be');
-    });
-
-    it('should return null for unmapped code pages and warn', () => {
+  describe("windowsCodePageToEncoding", () => {
+    it("should map common Windows code pages correctly", () => {
+      expect(windowsCodePageToEncoding(437)).toBe("cp437");
+      expect(windowsCodePageToEncoding(850)).toBe("cp850");
+      expect(windowsCodePageToEncoding(65001)).toBe("utf-8");
+      expect(windowsCodePageToEncoding(1252)).toBe("windows-1252");
+      expect(windowsCodePageToEncoding(932)).toBe("shift_jis");
+      expect(windowsCodePageToEncoding(936)).toBe("gb2312");
+      expect(windowsCodePageToEncoding(949)).toBe("euc-kr");
+      expect(windowsCodePageToEncoding(950)).toBe("big5");
+      expect(windowsCodePageToEncoding(1200)).toBe("utf-16le");
+      expect(windowsCodePageToEncoding(1201)).toBe("utf-16be");
+    });
+
+    it("should return null for unmapped code pages and warn", () => {
       expect(windowsCodePageToEncoding(99999)).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Unable to determine encoding for windows code page 99999.',
+        "Unable to determine encoding for windows code page 99999.",
       );
     });
 
-    it('should handle all Windows-specific code pages', () => {
-      expect(windowsCodePageToEncoding(874)).toBe('windows-874');
-      expect(windowsCodePageToEncoding(1250)).toBe('windows-1250');
-      expect(windowsCodePageToEncoding(1251)).toBe('windows-1251');
-      expect(windowsCodePageToEncoding(1253)).toBe('windows-1253');
-      expect(windowsCodePageToEncoding(1254)).toBe('windows-1254');
-      expect(windowsCodePageToEncoding(1255)).toBe('windows-1255');
-      expect(windowsCodePageToEncoding(1256)).toBe('windows-1256');
-      expect(windowsCodePageToEncoding(1257)).toBe('windows-1257');
-      expect(windowsCodePageToEncoding(1258)).toBe('windows-1258');
+    it("should handle all Windows-specific code pages", () => {
+      expect(windowsCodePageToEncoding(874)).toBe("windows-874");
+      expect(windowsCodePageToEncoding(1250)).toBe("windows-1250");
+      expect(windowsCodePageToEncoding(1251)).toBe("windows-1251");
+      expect(windowsCodePageToEncoding(1253)).toBe("windows-1253");
+      expect(windowsCodePageToEncoding(1254)).toBe("windows-1254");
+      expect(windowsCodePageToEncoding(1255)).toBe("windows-1255");
+      expect(windowsCodePageToEncoding(1256)).toBe("windows-1256");
+      expect(windowsCodePageToEncoding(1257)).toBe("windows-1257");
+      expect(windowsCodePageToEncoding(1258)).toBe("windows-1258");
     });
   });
 
-  describe('detectEncodingFromBuffer', () => {
-    it('should detect encoding using chardet successfully', () => {
-      const buffer = Buffer.from('test content', 'utf8');
-      mockedChardetDetect.mockReturnValue('UTF-8');
+  describe("detectEncodingFromBuffer", () => {
+    it("should detect encoding using chardet successfully", () => {
+      const buffer = Buffer.from("test content", "utf8");
+      mockedChardetDetect.mockReturnValue("UTF-8");
 
       const result = detectEncodingFromBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
       expect(mockedChardetDetect).toHaveBeenCalledWith(buffer);
     });
 
-    it('should handle chardet returning mixed case encoding', () => {
-      const buffer = Buffer.from('test content', 'utf8');
-      mockedChardetDetect.mockReturnValue('ISO-8859-1');
+    it("should handle chardet returning mixed case encoding", () => {
+      const buffer = Buffer.from("test content", "utf8");
+      mockedChardetDetect.mockReturnValue("ISO-8859-1");
 
       const result = detectEncodingFromBuffer(buffer);
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
 
-    it('should return null when chardet fails', () => {
-      const buffer = Buffer.from('test content', 'utf8');
+    it("should return null when chardet fails", () => {
+      const buffer = Buffer.from("test content", "utf8");
       mockedChardetDetect.mockImplementation(() => {
-        throw new Error('Detection failed');
+        throw new Error("Detection failed");
       });
 
       const result = detectEncodingFromBuffer(buffer);
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Failed to detect encoding with chardet:',
+        "Failed to detect encoding with chardet:",
         expect.any(Error),
       );
     });
 
-    it('should return null when chardet returns null', () => {
-      const buffer = Buffer.from('test content', 'utf8');
+    it("should return null when chardet returns null", () => {
+      const buffer = Buffer.from("test content", "utf8");
       mockedChardetDetect.mockReturnValue(null);
 
       const result = detectEncodingFromBuffer(buffer);
       expect(result).toBe(null);
     });
 
-    it('should return null when chardet returns non-string', () => {
-      const buffer = Buffer.from('test content', 'utf8');
-      mockedChardetDetect.mockReturnValue([
-        'utf-8',
-        'iso-8859-1',
-      ] as unknown as string);
+    it("should return null when chardet returns non-string", () => {
+      const buffer = Buffer.from("test content", "utf8");
+      mockedChardetDetect.mockReturnValue(["utf-8", "iso-8859-1"] as unknown as string);
 
       const result = detectEncodingFromBuffer(buffer);
       expect(result).toBe(null);
     });
   });
 
-  describe('getSystemEncoding - Windows', () => {
+  describe("getSystemEncoding - Windows", () => {
     beforeEach(() => {
-      mockedOsPlatform.mockReturnValue('win32');
+      mockedOsPlatform.mockReturnValue("win32");
     });
 
-    it('should parse Windows chcp output correctly', () => {
-      mockedExecSync.mockReturnValue('Active code page: 65001');
+    it("should parse Windows chcp output correctly", () => {
+      mockedExecSync.mockReturnValue("Active code page: 65001");
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
-      expect(mockedExecSync).toHaveBeenCalledWith('chcp', { encoding: 'utf8' });
+      expect(result).toBe("utf-8");
+      expect(mockedExecSync).toHaveBeenCalledWith("chcp", { encoding: "utf8" });
     });
 
-    it('should handle different chcp output formats', () => {
-      mockedExecSync.mockReturnValue('Current code page: 1252');
+    it("should handle different chcp output formats", () => {
+      mockedExecSync.mockReturnValue("Current code page: 1252");
 
       const result = getSystemEncoding();
-      expect(result).toBe('windows-1252');
+      expect(result).toBe("windows-1252");
     });
 
-    it('should handle chcp output with extra whitespace', () => {
-      mockedExecSync.mockReturnValue('Active code page:   437   ');
+    it("should handle chcp output with extra whitespace", () => {
+      mockedExecSync.mockReturnValue("Active code page:   437   ");
 
       const result = getSystemEncoding();
-      expect(result).toBe('cp437');
+      expect(result).toBe("cp437");
     });
 
-    it('should return null when chcp command fails', () => {
+    it("should return null when chcp command fails", () => {
       mockedExecSync.mockImplementation(() => {
-        throw new Error('Command failed');
+        throw new Error("Command failed");
       });
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          "Failed to get Windows code page using 'chcp' command",
-        ),
+        expect.stringContaining("Failed to get Windows code page using 'chcp' command"),
       );
     });
 
-    it('should return null when chcp output cannot be parsed', () => {
-      mockedExecSync.mockReturnValue('Unexpected output format');
+    it("should return null when chcp output cannot be parsed", () => {
+      mockedExecSync.mockReturnValue("Unexpected output format");
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          "Failed to get Windows code page using 'chcp' command",
-        ),
+        expect.stringContaining("Failed to get Windows code page using 'chcp' command"),
       );
     });
 
-    it('should return null when code page is not a number', () => {
-      mockedExecSync.mockReturnValue('Active code page: abc');
+    it("should return null when code page is not a number", () => {
+      mockedExecSync.mockReturnValue("Active code page: abc");
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          "Failed to get Windows code page using 'chcp' command",
-        ),
+        expect.stringContaining("Failed to get Windows code page using 'chcp' command"),
       );
     });
 
-    it('should return null when code page maps to null', () => {
-      mockedExecSync.mockReturnValue('Active code page: 99999');
+    it("should return null when code page maps to null", () => {
+      mockedExecSync.mockReturnValue("Active code page: 99999");
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       // Should warn about unknown code page from windowsCodePageToEncoding
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Unable to determine encoding for windows code page 99999.',
+        "Unable to determine encoding for windows code page 99999.",
       );
     });
   });
 
-  describe('getSystemEncoding - Unix-like', () => {
+  describe("getSystemEncoding - Unix-like", () => {
     beforeEach(() => {
-      mockedOsPlatform.mockReturnValue('linux');
+      mockedOsPlatform.mockReturnValue("linux");
     });
 
-    it('should parse locale from LC_ALL environment variable', () => {
-      process.env['LC_ALL'] = 'en_US.UTF-8';
+    it("should parse locale from LC_ALL environment variable", () => {
+      process.env["LC_ALL"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should parse locale from LC_CTYPE when LC_ALL is not set', () => {
-      process.env['LC_CTYPE'] = 'fr_FR.ISO-8859-1';
+    it("should parse locale from LC_CTYPE when LC_ALL is not set", () => {
+      process.env["LC_CTYPE"] = "fr_FR.ISO-8859-1";
 
       const result = getSystemEncoding();
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
 
-    it('should parse locale from LANG when LC_ALL and LC_CTYPE are not set', () => {
-      process.env['LANG'] = 'de_DE.UTF-8';
+    it("should parse locale from LANG when LC_ALL and LC_CTYPE are not set", () => {
+      process.env["LANG"] = "de_DE.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle locale charmap command when environment variables are empty', () => {
-      mockedExecSync.mockReturnValue('UTF-8\n');
+    it("should handle locale charmap command when environment variables are empty", () => {
+      mockedExecSync.mockReturnValue("UTF-8\n");
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
-      expect(mockedExecSync).toHaveBeenCalledWith('locale charmap', {
-        encoding: 'utf8',
+      expect(result).toBe("utf-8");
+      expect(mockedExecSync).toHaveBeenCalledWith("locale charmap", {
+        encoding: "utf8",
       });
     });
 
-    it('should handle locale charmap with mixed case', () => {
-      mockedExecSync.mockReturnValue('ISO-8859-1\n');
+    it("should handle locale charmap with mixed case", () => {
+      mockedExecSync.mockReturnValue("ISO-8859-1\n");
 
       const result = getSystemEncoding();
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
 
-    it('should return null when locale charmap fails', () => {
+    it("should return null when locale charmap fails", () => {
       mockedExecSync.mockImplementation(() => {
-        throw new Error('Command failed');
+        throw new Error("Command failed");
       });
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
-      expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Failed to get locale charmap.',
-      );
+      expect(consoleWarnSpy).toHaveBeenCalledWith("Failed to get locale charmap.");
     });
 
-    it('should handle locale without encoding (no dot)', () => {
-      process.env['LANG'] = 'C';
+    it("should handle locale without encoding (no dot)", () => {
+      process.env["LANG"] = "C";
 
       const result = getSystemEncoding();
-      expect(result).toBe('c');
+      expect(result).toBe("c");
     });
 
-    it('should handle empty locale environment variables', () => {
-      process.env['LC_ALL'] = '';
-      process.env['LC_CTYPE'] = '';
-      process.env['LANG'] = '';
-      mockedExecSync.mockReturnValue('UTF-8');
+    it("should handle empty locale environment variables", () => {
+      process.env["LC_ALL"] = "";
+      process.env["LC_CTYPE"] = "";
+      process.env["LANG"] = "";
+      mockedExecSync.mockReturnValue("UTF-8");
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should return locale as-is when locale format has no dot', () => {
-      process.env['LANG'] = 'invalid_format';
+    it("should return locale as-is when locale format has no dot", () => {
+      process.env["LANG"] = "invalid_format";
 
       const result = getSystemEncoding();
-      expect(result).toBe('invalid_format');
+      expect(result).toBe("invalid_format");
     });
 
-    it('should prioritize LC_ALL over other environment variables', () => {
-      process.env['LC_ALL'] = 'en_US.UTF-8';
-      process.env['LC_CTYPE'] = 'fr_FR.ISO-8859-1';
-      process.env['LANG'] = 'de_DE.CP1252';
+    it("should prioritize LC_ALL over other environment variables", () => {
+      process.env["LC_ALL"] = "en_US.UTF-8";
+      process.env["LC_CTYPE"] = "fr_FR.ISO-8859-1";
+      process.env["LANG"] = "de_DE.CP1252";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should prioritize LC_CTYPE over LANG', () => {
-      process.env['LC_CTYPE'] = 'fr_FR.ISO-8859-1';
-      process.env['LANG'] = 'de_DE.CP1252';
+    it("should prioritize LC_CTYPE over LANG", () => {
+      process.env["LC_CTYPE"] = "fr_FR.ISO-8859-1";
+      process.env["LANG"] = "de_DE.CP1252";
 
       const result = getSystemEncoding();
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
   });
 
-  describe('getEncodingForBuffer', () => {
+  describe("getEncodingForBuffer", () => {
     beforeEach(() => {
-      mockedOsPlatform.mockReturnValue('linux');
+      mockedOsPlatform.mockReturnValue("linux");
     });
 
-    it('should use cached system encoding on subsequent calls', () => {
-      process.env['LANG'] = 'en_US.UTF-8';
-      const buffer = Buffer.from('test');
+    it("should use cached system encoding on subsequent calls", () => {
+      process.env["LANG"] = "en_US.UTF-8";
+      const buffer = Buffer.from("test");
 
       // First call
       const result1 = getCachedEncodingForBuffer(buffer);
-      expect(result1).toBe('utf-8');
+      expect(result1).toBe("utf-8");
 
       // Change environment (should not affect cached result)
-      process.env['LANG'] = 'fr_FR.ISO-8859-1';
+      process.env["LANG"] = "fr_FR.ISO-8859-1";
 
       // Second call should use cached value
       const result2 = getCachedEncodingForBuffer(buffer);
-      expect(result2).toBe('utf-8');
+      expect(result2).toBe("utf-8");
     });
 
-    it('should fall back to buffer detection when system encoding fails', () => {
+    it("should fall back to buffer detection when system encoding fails", () => {
       // No environment variables set
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      const buffer = Buffer.from('test');
-      mockedChardetDetect.mockReturnValue('ISO-8859-1');
+      const buffer = Buffer.from("test");
+      mockedChardetDetect.mockReturnValue("ISO-8859-1");
 
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
       expect(mockedChardetDetect).toHaveBeenCalledWith(buffer);
     });
 
-    it('should fall back to utf-8 when both system and buffer detection fail', () => {
+    it("should fall back to utf-8 when both system and buffer detection fail", () => {
       // System encoding fails
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
       // Buffer detection fails
       mockedChardetDetect.mockImplementation(() => {
-        throw new Error('chardet failed');
+        throw new Error("chardet failed");
       });
 
-      const buffer = Buffer.from('test');
+      const buffer = Buffer.from("test");
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should not cache buffer detection results', () => {
+    it("should not cache buffer detection results", () => {
       // System encoding fails initially
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      const buffer1 = Buffer.from('test1');
-      const buffer2 = Buffer.from('test2');
+      const buffer1 = Buffer.from("test1");
+      const buffer2 = Buffer.from("test2");
 
-      mockedChardetDetect
-        .mockReturnValueOnce('ISO-8859-1')
-        .mockReturnValueOnce('UTF-16');
+      mockedChardetDetect.mockReturnValueOnce("ISO-8859-1").mockReturnValueOnce("UTF-16");
 
       const result1 = getCachedEncodingForBuffer(buffer1);
       const result2 = getCachedEncodingForBuffer(buffer2);
 
-      expect(result1).toBe('iso-8859-1');
-      expect(result2).toBe('utf-16');
+      expect(result1).toBe("iso-8859-1");
+      expect(result2).toBe("utf-16");
       expect(mockedChardetDetect).toHaveBeenCalledTimes(2);
     });
 
-    it('should handle Windows system encoding', () => {
-      mockedOsPlatform.mockReturnValue('win32');
-      mockedExecSync.mockReturnValue('Active code page: 1252');
+    it("should handle Windows system encoding", () => {
+      mockedOsPlatform.mockReturnValue("win32");
+      mockedExecSync.mockReturnValue("Active code page: 1252");
 
-      const buffer = Buffer.from('test');
+      const buffer = Buffer.from("test");
       const result = getCachedEncodingForBuffer(buffer);
 
-      expect(result).toBe('windows-1252');
+      expect(result).toBe("windows-1252");
     });
 
-    it('should cache null system encoding result', () => {
+    it("should cache null system encoding result", () => {
       // Reset the cache specifically for this test
       resetEncodingCache();
 
       // Ensure we're on Unix-like for this test
-      mockedOsPlatform.mockReturnValue('linux');
+      mockedOsPlatform.mockReturnValue("linux");
 
       // System encoding detection returns null
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      const buffer1 = Buffer.from('test1');
-      const buffer2 = Buffer.from('test2');
+      const buffer1 = Buffer.from("test1");
+      const buffer2 = Buffer.from("test2");
 
-      mockedChardetDetect
-        .mockReturnValueOnce('ISO-8859-1')
-        .mockReturnValueOnce('UTF-16');
+      mockedChardetDetect.mockReturnValueOnce("ISO-8859-1").mockReturnValueOnce("UTF-16");
 
       // Clear any previous calls from beforeEach setup or previous tests
       mockedExecSync.mockClear();
@@ -419,79 +404,79 @@ describe('Shell Command Processor - Encoding Functions', () => {
 
       // Should call execSync only once due to caching (null result is cached)
       expect(mockedExecSync).toHaveBeenCalledTimes(1);
-      expect(result1).toBe('iso-8859-1');
-      expect(result2).toBe('utf-16');
+      expect(result1).toBe("iso-8859-1");
+      expect(result2).toBe("utf-16");
 
       // Call a third time to verify cache is still used
-      const buffer3 = Buffer.from('test3');
-      mockedChardetDetect.mockReturnValueOnce('UTF-32');
+      const buffer3 = Buffer.from("test3");
+      mockedChardetDetect.mockReturnValueOnce("UTF-32");
       const result3 = getCachedEncodingForBuffer(buffer3);
 
       // Still should be only one call to execSync
       expect(mockedExecSync).toHaveBeenCalledTimes(1);
-      expect(result3).toBe('utf-32');
+      expect(result3).toBe("utf-32");
     });
   });
 
-  describe('Cross-platform behavior', () => {
-    it('should work correctly on macOS', () => {
-      mockedOsPlatform.mockReturnValue('darwin');
-      process.env['LANG'] = 'en_US.UTF-8';
+  describe("Cross-platform behavior", () => {
+    it("should work correctly on macOS", () => {
+      mockedOsPlatform.mockReturnValue("darwin");
+      process.env["LANG"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should work correctly on other Unix-like systems', () => {
-      mockedOsPlatform.mockReturnValue('freebsd');
-      process.env['LANG'] = 'en_US.UTF-8';
+    it("should work correctly on other Unix-like systems", () => {
+      mockedOsPlatform.mockReturnValue("freebsd");
+      process.env["LANG"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle unknown platforms as Unix-like', () => {
-      mockedOsPlatform.mockReturnValue('unknown' as NodeJS.Platform);
-      process.env['LANG'] = 'en_US.UTF-8';
+    it("should handle unknown platforms as Unix-like", () => {
+      mockedOsPlatform.mockReturnValue("unknown" as NodeJS.Platform);
+      process.env["LANG"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
   });
 
-  describe('Edge cases and error handling', () => {
-    it('should handle empty buffer gracefully', () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      process.env['LANG'] = 'en_US.UTF-8';
+  describe("Edge cases and error handling", () => {
+    it("should handle empty buffer gracefully", () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      process.env["LANG"] = "en_US.UTF-8";
 
       const buffer = Buffer.alloc(0);
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle very large buffers', () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      process.env['LANG'] = 'en_US.UTF-8';
+    it("should handle very large buffers", () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      process.env["LANG"] = "en_US.UTF-8";
 
-      const buffer = Buffer.alloc(1024 * 1024, 'a');
+      const buffer = Buffer.alloc(1024 * 1024, "a");
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle Unicode content', () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      const unicodeText = '你好世界 🌍 ñoño';
+    it("should handle Unicode content", () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      const unicodeText = "你好世界 🌍 ñoño";
 
       // System encoding fails
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      mockedChardetDetect.mockReturnValue('UTF-8');
+      mockedChardetDetect.mockReturnValue("UTF-8");
 
-      const buffer = Buffer.from(unicodeText, 'utf8');
+      const buffer = Buffer.from(unicodeText, "utf8");
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/systemEncoding.ts b/packages/gemini-cli-core/src/utils/systemEncoding.ts
index 298eed05a..65ec00fcb 100644
--- a/packages/gemini-cli-core/src/utils/systemEncoding.ts
+++ b/packages/gemini-cli-core/src/utils/systemEncoding.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync } from 'node:child_process';
-import os from 'node:os';
-import { detect as chardetDetect } from 'chardet';
-import { debugLogger } from './debugLogger.js';
+import { execSync } from "node:child_process";
+import os from "node:os";
+import { detect as chardetDetect } from "chardet";
+import { debugLogger } from "./debugLogger.js";
 
 // Cache for system encoding to avoid repeated detection
 // Use undefined to indicate "not yet checked" vs null meaning "checked but failed"
@@ -39,7 +39,7 @@ export function getCachedEncodingForBuffer(buffer: Buffer): string {
   }
 
   // Otherwise, detect from this specific buffer (don't cache this result)
-  return detectEncodingFromBuffer(buffer) || 'utf-8';
+  return detectEncodingFromBuffer(buffer) || "utf-8";
 }
 
 /**
@@ -52,9 +52,9 @@ export function getCachedEncodingForBuffer(buffer: Buffer): string {
  */
 export function getSystemEncoding(): string | null {
   // Windows
-  if (os.platform() === 'win32') {
+  if (os.platform() === "win32") {
     try {
-      const output = execSync('chcp', { encoding: 'utf8' });
+      const output = execSync("chcp", { encoding: "utf8" });
       const match = output.match(/:\s*(\d+)/);
       if (match) {
         const codePage = parseInt(match[1], 10);
@@ -63,9 +63,7 @@ export function getSystemEncoding(): string | null {
         }
       }
       // Only warn if we can't parse the output format, not if windowsCodePageToEncoding fails
-      throw new Error(
-        `Unable to parse Windows code page from 'chcp' output "${output.trim()}". `,
-      );
+      throw new Error(`Unable to parse Windows code page from 'chcp' output "${output.trim()}". `);
     } catch (error) {
       debugLogger.warn(
         `Failed to get Windows code page using 'chcp' command: ${error instanceof Error ? error.message : String(error)}. ` +
@@ -80,16 +78,14 @@ export function getSystemEncoding(): string | null {
   // system encoding. However, these environment variables might not always
   // be set or accurate. Handle cases where none of these variables are set.
   const env = process.env;
-  let locale = env['LC_ALL'] || env['LC_CTYPE'] || env['LANG'] || '';
+  let locale = env["LC_ALL"] || env["LC_CTYPE"] || env["LANG"] || "";
 
   // Fallback to querying the system directly when environment variables are missing
   if (!locale) {
     try {
-      locale = execSync('locale charmap', { encoding: 'utf8' })
-        .toString()
-        .trim();
+      locale = execSync("locale charmap", { encoding: "utf8" }).toString().trim();
     } catch (_e) {
-      debugLogger.warn('Failed to get locale charmap.');
+      debugLogger.warn("Failed to get locale charmap.");
       return null;
     }
   }
@@ -100,7 +96,7 @@ export function getSystemEncoding(): string | null {
   }
 
   // Handle cases where locale charmap returns just the encoding name (e.g., "UTF-8")
-  if (locale && !locale.includes('.')) {
+  if (locale && !locale.includes(".")) {
     return locale.toLowerCase();
   }
 
@@ -115,27 +111,27 @@ export function getSystemEncoding(): string | null {
 export function windowsCodePageToEncoding(cp: number): string | null {
   // Most common mappings; extend as needed
   const map: { [key: number]: string } = {
-    437: 'cp437',
-    850: 'cp850',
-    852: 'cp852',
-    866: 'cp866',
-    874: 'windows-874',
-    932: 'shift_jis',
-    936: 'gb2312',
-    949: 'euc-kr',
-    950: 'big5',
-    1200: 'utf-16le',
-    1201: 'utf-16be',
-    1250: 'windows-1250',
-    1251: 'windows-1251',
-    1252: 'windows-1252',
-    1253: 'windows-1253',
-    1254: 'windows-1254',
-    1255: 'windows-1255',
-    1256: 'windows-1256',
-    1257: 'windows-1257',
-    1258: 'windows-1258',
-    65001: 'utf-8',
+    437: "cp437",
+    850: "cp850",
+    852: "cp852",
+    866: "cp866",
+    874: "windows-874",
+    932: "shift_jis",
+    936: "gb2312",
+    949: "euc-kr",
+    950: "big5",
+    1200: "utf-16le",
+    1201: "utf-16be",
+    1250: "windows-1250",
+    1251: "windows-1251",
+    1252: "windows-1252",
+    1253: "windows-1253",
+    1254: "windows-1254",
+    1255: "windows-1255",
+    1256: "windows-1256",
+    1257: "windows-1257",
+    1258: "windows-1258",
+    65001: "utf-8",
   };
 
   if (map[cp]) {
@@ -156,11 +152,11 @@ export function windowsCodePageToEncoding(cp: number): string | null {
 export function detectEncodingFromBuffer(buffer: Buffer): string | null {
   try {
     const detected = chardetDetect(buffer);
-    if (detected && typeof detected === 'string') {
+    if (detected && typeof detected === "string") {
       return detected.toLowerCase();
     }
   } catch (error) {
-    debugLogger.warn('Failed to detect encoding with chardet:', error);
+    debugLogger.warn("Failed to detect encoding with chardet:", error);
   }
 
   return null;
diff --git a/packages/gemini-cli-core/src/utils/terminal.ts b/packages/gemini-cli-core/src/utils/terminal.ts
index 008919ea4..44a8265a5 100644
--- a/packages/gemini-cli-core/src/utils/terminal.ts
+++ b/packages/gemini-cli-core/src/utils/terminal.ts
@@ -4,42 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { writeToStdout } from './stdio.js';
+import { writeToStdout } from "./stdio.js";
 
 export function enableMouseEvents() {
   // Enable mouse tracking with SGR format
   // ?1002h = button event tracking (clicks + drags + scroll wheel)
   // ?1006h = SGR extended mouse mode (better coordinate handling)
-  writeToStdout('\u001b[?1002h\u001b[?1006h');
+  writeToStdout("\u001b[?1002h\u001b[?1006h");
 }
 
 export function disableMouseEvents() {
   // Disable mouse tracking with SGR format
-  writeToStdout('\u001b[?1006l\u001b[?1002l');
+  writeToStdout("\u001b[?1006l\u001b[?1002l");
 }
 
 export function enableKittyKeyboardProtocol() {
-  writeToStdout('\x1b[>1u');
+  writeToStdout("\x1b[>1u");
 }
 
 export function disableKittyKeyboardProtocol() {
-  writeToStdout('\x1b[<u');
+  writeToStdout("\x1b[<u");
 }
 
 export function enableLineWrapping() {
-  writeToStdout('\x1b[?7h');
+  writeToStdout("\x1b[?7h");
 }
 
 export function disableLineWrapping() {
-  writeToStdout('\x1b[?7l');
+  writeToStdout("\x1b[?7l");
 }
 
 export function enterAlternateScreen() {
-  writeToStdout('\x1b[?1049h');
+  writeToStdout("\x1b[?1049h");
 }
 
 export function exitAlternateScreen() {
-  writeToStdout('\x1b[?1049l');
+  writeToStdout("\x1b[?1049l");
 }
 
 export function shouldEnterAlternateScreen(
diff --git a/packages/gemini-cli-core/src/utils/terminalSerializer.test.ts b/packages/gemini-cli-core/src/utils/terminalSerializer.test.ts
index cfc803214..282fd8960 100644
--- a/packages/gemini-cli-core/src/utils/terminalSerializer.test.ts
+++ b/packages/gemini-cli-core/src/utils/terminalSerializer.test.ts
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { Terminal } from '@xterm/headless';
-import {
-  serializeTerminalToObject,
-  convertColorToHex,
-  ColorMode,
-} from './terminalSerializer.js';
+import { Terminal } from "@xterm/headless";
+import { describe, expect, it } from "vitest";
+import { ColorMode, convertColorToHex, serializeTerminalToObject } from "./terminalSerializer.js";
 
-const RED_FG = '\x1b[31m';
-const RESET = '\x1b[0m';
+const RED_FG = "\x1b[31m";
+const RESET = "\x1b[0m";
 
 function writeToTerminal(terminal: Terminal, data: string): Promise<void> {
   return new Promise((resolve) => {
@@ -21,9 +17,9 @@ function writeToTerminal(terminal: Terminal, data: string): Promise<void> {
   });
 }
 
-describe('terminalSerializer', () => {
-  describe('serializeTerminalToObject', () => {
-    it('should handle an empty terminal', () => {
+describe("terminalSerializer", () => {
+  describe("serializeTerminalToObject", () => {
+    it("should handle an empty terminal", () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
@@ -34,95 +30,95 @@ describe('terminalSerializer', () => {
       result.forEach((line) => {
         // Expect each line to be either empty or contain a single token with spaces
         if (line.length > 0) {
-          expect(line[0].text.trim()).toBe('');
+          expect(line[0].text.trim()).toBe("");
         }
       });
     });
 
-    it('should serialize a single line of text', async () => {
+    it("should serialize a single line of text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, 'Hello, world!');
+      await writeToTerminal(terminal, "Hello, world!");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].text).toContain('Hello, world!');
+      expect(result[0][0].text).toContain("Hello, world!");
     });
 
-    it('should serialize multiple lines of text', async () => {
+    it("should serialize multiple lines of text", async () => {
       const terminal = new Terminal({
         cols: 7,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, 'Line 1\r\nLine 2');
+      await writeToTerminal(terminal, "Line 1\r\nLine 2");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].text).toBe('Line 1 ');
-      expect(result[1][0].text).toBe('Line 2');
+      expect(result[0][0].text).toBe("Line 1 ");
+      expect(result[1][0].text).toBe("Line 2");
     });
 
-    it('should handle bold text', async () => {
+    it("should handle bold text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[1mBold text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[1mBold text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].bold).toBe(true);
-      expect(result[0][0].text).toBe('Bold text');
+      expect(result[0][0].text).toBe("Bold text");
     });
 
-    it('should handle italic text', async () => {
+    it("should handle italic text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[3mItalic text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[3mItalic text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].italic).toBe(true);
-      expect(result[0][0].text).toBe('Italic text');
+      expect(result[0][0].text).toBe("Italic text");
     });
 
-    it('should handle underlined text', async () => {
+    it("should handle underlined text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[4mUnderlined text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[4mUnderlined text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].underline).toBe(true);
-      expect(result[0][0].text).toBe('Underlined text');
+      expect(result[0][0].text).toBe("Underlined text");
     });
 
-    it('should handle dim text', async () => {
+    it("should handle dim text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[2mDim text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[2mDim text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].dim).toBe(true);
-      expect(result[0][0].text).toBe('Dim text');
+      expect(result[0][0].text).toBe("Dim text");
     });
 
-    it('should handle inverse text', async () => {
+    it("should handle inverse text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[7mInverse text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[7mInverse text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].inverse).toBe(true);
-      expect(result[0][0].text).toBe('Inverse text');
+      expect(result[0][0].text).toBe("Inverse text");
     });
 
-    it('should handle foreground colors', async () => {
+    it("should handle foreground colors", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
@@ -130,88 +126,88 @@ describe('terminalSerializer', () => {
       });
       await writeToTerminal(terminal, `${RED_FG}Red text${RESET}`);
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].fg).toBe('#800000');
-      expect(result[0][0].text).toBe('Red text');
+      expect(result[0][0].fg).toBe("#800000");
+      expect(result[0][0].text).toBe("Red text");
     });
 
-    it('should handle background colors', async () => {
+    it("should handle background colors", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[42mGreen background\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[42mGreen background\x1b[0m");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].bg).toBe('#008000');
-      expect(result[0][0].text).toBe('Green background');
+      expect(result[0][0].bg).toBe("#008000");
+      expect(result[0][0].text).toBe("Green background");
     });
 
-    it('should handle RGB colors', async () => {
+    it("should handle RGB colors", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[38;2;100;200;50mRGB text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[38;2;100;200;50mRGB text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].fg).toBe('#64c832');
-      expect(result[0][0].text).toBe('RGB text');
+      expect(result[0][0].fg).toBe("#64c832");
+      expect(result[0][0].text).toBe("RGB text");
     });
 
-    it('should handle a combination of styles', async () => {
+    it("should handle a combination of styles", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[1;31;42mStyled text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[1;31;42mStyled text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].bold).toBe(true);
-      expect(result[0][0].fg).toBe('#800000');
-      expect(result[0][0].bg).toBe('#008000');
-      expect(result[0][0].text).toBe('Styled text');
+      expect(result[0][0].fg).toBe("#800000");
+      expect(result[0][0].bg).toBe("#008000");
+      expect(result[0][0].text).toBe("Styled text");
     });
 
-    it('should set inverse for the cursor position', async () => {
+    it("should set inverse for the cursor position", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, 'Cursor test');
+      await writeToTerminal(terminal, "Cursor test");
       // Move cursor to the start of the line (0,0) using ANSI escape code
-      await writeToTerminal(terminal, '\x1b[H');
+      await writeToTerminal(terminal, "\x1b[H");
 
       const result = serializeTerminalToObject(terminal);
       // The character at (0,0) should have inverse: true due to cursor
-      expect(result[0][0].text).toBe('C');
+      expect(result[0][0].text).toBe("C");
       expect(result[0][0].inverse).toBe(true);
 
       // The rest of the text should not have inverse: true (unless explicitly set)
-      expect(result[0][1].text.trim()).toBe('ursor test');
+      expect(result[0][1].text.trim()).toBe("ursor test");
       expect(result[0][1].inverse).toBe(false);
     });
   });
-  describe('convertColorToHex', () => {
-    it('should convert RGB color to hex', () => {
+  describe("convertColorToHex", () => {
+    it("should convert RGB color to hex", () => {
       const color = (100 << 16) | (200 << 8) | 50;
-      const hex = convertColorToHex(color, ColorMode.RGB, '#000000');
-      expect(hex).toBe('#64c832');
+      const hex = convertColorToHex(color, ColorMode.RGB, "#000000");
+      expect(hex).toBe("#64c832");
     });
 
-    it('should convert palette color to hex', () => {
-      const hex = convertColorToHex(1, ColorMode.PALETTE, '#000000');
-      expect(hex).toBe('#800000');
+    it("should convert palette color to hex", () => {
+      const hex = convertColorToHex(1, ColorMode.PALETTE, "#000000");
+      expect(hex).toBe("#800000");
     });
 
-    it('should return default color for ColorMode.DEFAULT', () => {
-      const hex = convertColorToHex(0, ColorMode.DEFAULT, '#ffffff');
-      expect(hex).toBe('#ffffff');
+    it("should return default color for ColorMode.DEFAULT", () => {
+      const hex = convertColorToHex(0, ColorMode.DEFAULT, "#ffffff");
+      expect(hex).toBe("#ffffff");
     });
 
-    it('should return default color for invalid palette index', () => {
-      const hex = convertColorToHex(999, ColorMode.PALETTE, '#000000');
-      expect(hex).toBe('#000000');
+    it("should return default color for invalid palette index", () => {
+      const hex = convertColorToHex(999, ColorMode.PALETTE, "#000000");
+      expect(hex).toBe("#000000");
     });
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/terminalSerializer.ts b/packages/gemini-cli-core/src/utils/terminalSerializer.ts
index 7bcd2a4ce..70befccb8 100644
--- a/packages/gemini-cli-core/src/utils/terminalSerializer.ts
+++ b/packages/gemini-cli-core/src/utils/terminalSerializer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { IBufferCell, Terminal } from '@xterm/headless';
+import type { IBufferCell, Terminal } from "@xterm/headless";
 export interface AnsiToken {
   text: string;
   bold: boolean;
@@ -45,13 +45,7 @@ class Cell {
   fgColorMode: ColorMode = ColorMode.DEFAULT;
   bgColorMode: ColorMode = ColorMode.DEFAULT;
 
-  constructor(
-    cell: IBufferCell | null,
-    x: number,
-    y: number,
-    cursorX: number,
-    cursorY: number,
-  ) {
+  constructor(cell: IBufferCell | null, x: number, y: number, cursorX: number, cursorY: number) {
     this.cell = cell;
     this.x = x;
     this.y = y;
@@ -112,7 +106,7 @@ class Cell {
   }
 
   getChars(): string {
-    return this.cell?.getChars() || ' ';
+    return this.cell?.getChars() || " ";
   }
 
   isAttribute(attribute: Attribute): boolean {
@@ -135,8 +129,8 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
   const buffer = terminal.buffer.active;
   const cursorX = buffer.cursorX;
   const cursorY = buffer.cursorY;
-  const defaultFg = '';
-  const defaultBg = '';
+  const defaultFg = "";
+  const defaultBg = "";
 
   const result: AnsiOutput = [];
 
@@ -149,7 +143,7 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
     }
 
     let lastCell = new Cell(null, -1, -1, cursorX, cursorY);
-    let currentText = '';
+    let currentText = "";
 
     for (let x = 0; x < terminal.cols; x++) {
       const cellData = line.getCell(x);
@@ -163,14 +157,13 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
             italic: lastCell.isAttribute(Attribute.italic),
             underline: lastCell.isAttribute(Attribute.underline),
             dim: lastCell.isAttribute(Attribute.dim),
-            inverse:
-              lastCell.isAttribute(Attribute.inverse) || lastCell.isCursor(),
+            inverse: lastCell.isAttribute(Attribute.inverse) || lastCell.isCursor(),
             fg: convertColorToHex(lastCell.fg, lastCell.fgColorMode, defaultFg),
             bg: convertColorToHex(lastCell.bg, lastCell.bgColorMode, defaultBg),
           };
           currentLine.push(token);
         }
-        currentText = '';
+        currentText = "";
       }
       currentText += cell.getChars();
       lastCell = cell;
@@ -198,262 +191,262 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
 
 // ANSI color palette from https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
 const ANSI_COLORS = [
-  '#000000',
-  '#800000',
-  '#008000',
-  '#808000',
-  '#000080',
-  '#800080',
-  '#008080',
-  '#c0c0c0',
-  '#808080',
-  '#ff0000',
-  '#00ff00',
-  '#ffff00',
-  '#0000ff',
-  '#ff00ff',
-  '#00ffff',
-  '#ffffff',
-  '#000000',
-  '#00005f',
-  '#000087',
-  '#0000af',
-  '#0000d7',
-  '#0000ff',
-  '#005f00',
-  '#005f5f',
-  '#005f87',
-  '#005faf',
-  '#005fd7',
-  '#005fff',
-  '#008700',
-  '#00875f',
-  '#008787',
-  '#0087af',
-  '#0087d7',
-  '#0087ff',
-  '#00af00',
-  '#00af5f',
-  '#00af87',
-  '#00afaf',
-  '#00afd7',
-  '#00afff',
-  '#00d700',
-  '#00d75f',
-  '#00d787',
-  '#00d7af',
-  '#00d7d7',
-  '#00d7ff',
-  '#00ff00',
-  '#00ff5f',
-  '#00ff87',
-  '#00ffaf',
-  '#00ffd7',
-  '#00ffff',
-  '#5f0000',
-  '#5f005f',
-  '#5f0087',
-  '#5f00af',
-  '#5f00d7',
-  '#5f00ff',
-  '#5f5f00',
-  '#5f5f5f',
-  '#5f5f87',
-  '#5f5faf',
-  '#5f5fd7',
-  '#5f5fff',
-  '#5f8700',
-  '#5f875f',
-  '#5f8787',
-  '#5f87af',
-  '#5f87d7',
-  '#5f87ff',
-  '#5faf00',
-  '#5faf5f',
-  '#5faf87',
-  '#5fafaf',
-  '#5fafd7',
-  '#5fafff',
-  '#5fd700',
-  '#5fd75f',
-  '#5fd787',
-  '#5fd7af',
-  '#5fd7d7',
-  '#5fd7ff',
-  '#5fff00',
-  '#5fff5f',
-  '#5fff87',
-  '#5fffaf',
-  '#5fffd7',
-  '#5fffff',
-  '#870000',
-  '#87005f',
-  '#870087',
-  '#8700af',
-  '#8700d7',
-  '#8700ff',
-  '#875f00',
-  '#875f5f',
-  '#875f87',
-  '#875faf',
-  '#875fd7',
-  '#875fff',
-  '#878700',
-  '#87875f',
-  '#878787',
-  '#8787af',
-  '#8787d7',
-  '#8787ff',
-  '#87af00',
-  '#87af5f',
-  '#87af87',
-  '#87afaf',
-  '#87afd7',
-  '#87afff',
-  '#87d700',
-  '#87d75f',
-  '#87d787',
-  '#87d7af',
-  '#87d7d7',
-  '#87d7ff',
-  '#87ff00',
-  '#87ff5f',
-  '#87ff87',
-  '#87ffaf',
-  '#87ffd7',
-  '#87ffff',
-  '#af0000',
-  '#af005f',
-  '#af0087',
-  '#af00af',
-  '#af00d7',
-  '#af00ff',
-  '#af5f00',
-  '#af5f5f',
-  '#af5f87',
-  '#af5faf',
-  '#af5fd7',
-  '#af5fff',
-  '#af8700',
-  '#af875f',
-  '#af8787',
-  '#af87af',
-  '#af87d7',
-  '#af87ff',
-  '#afaf00',
-  '#afaf5f',
-  '#afaf87',
-  '#afafaf',
-  '#afafd7',
-  '#afafff',
-  '#afd700',
-  '#afd75f',
-  '#afd787',
-  '#afd7af',
-  '#afd7d7',
-  '#afd7ff',
-  '#afff00',
-  '#afff5f',
-  '#afff87',
-  '#afffaf',
-  '#afffd7',
-  '#afffff',
-  '#d70000',
-  '#d7005f',
-  '#d70087',
-  '#d700af',
-  '#d700d7',
-  '#d700ff',
-  '#d75f00',
-  '#d75f5f',
-  '#d75f87',
-  '#d75faf',
-  '#d75fd7',
-  '#d75fff',
-  '#d78700',
-  '#d7875f',
-  '#d78787',
-  '#d787af',
-  '#d787d7',
-  '#d787ff',
-  '#d7af00',
-  '#d7af5f',
-  '#d7af87',
-  '#d7afaf',
-  '#d7afd7',
-  '#d7afff',
-  '#d7d700',
-  '#d7d75f',
-  '#d7d787',
-  '#d7d7af',
-  '#d7d7d7',
-  '#d7d7ff',
-  '#d7ff00',
-  '#d7ff5f',
-  '#d7ff87',
-  '#d7ffaf',
-  '#d7ffd7',
-  '#d7ffff',
-  '#ff0000',
-  '#ff005f',
-  '#ff0087',
-  '#ff00af',
-  '#ff00d7',
-  '#ff00ff',
-  '#ff5f00',
-  '#ff5f5f',
-  '#ff5f87',
-  '#ff5faf',
-  '#ff5fd7',
-  '#ff5fff',
-  '#ff8700',
-  '#ff875f',
-  '#ff8787',
-  '#ff87af',
-  '#ff87d7',
-  '#ff87ff',
-  '#ffaf00',
-  '#ffaf5f',
-  '#ffaf87',
-  '#ffafaf',
-  '#ffafd7',
-  '#ffafff',
-  '#ffd700',
-  '#ffd75f',
-  '#ffd787',
-  '#ffd7af',
-  '#ffd7d7',
-  '#ffd7ff',
-  '#ffff00',
-  '#ffff5f',
-  '#ffff87',
-  '#ffffaf',
-  '#ffffd7',
-  '#ffffff',
-  '#080808',
-  '#121212',
-  '#1c1c1c',
-  '#262626',
-  '#303030',
-  '#3a3a3a',
-  '#444444',
-  '#4e4e4e',
-  '#585858',
-  '#626262',
-  '#6c6c6c',
-  '#767676',
-  '#808080',
-  '#8a8a8a',
-  '#949494',
-  '#9e9e9e',
-  '#a8a8a8',
-  '#b2b2b2',
-  '#bcbcbc',
-  '#c6c6c6',
-  '#d0d0d0',
-  '#dadada',
-  '#e4e4e4',
-  '#eeeeee',
+  "#000000",
+  "#800000",
+  "#008000",
+  "#808000",
+  "#000080",
+  "#800080",
+  "#008080",
+  "#c0c0c0",
+  "#808080",
+  "#ff0000",
+  "#00ff00",
+  "#ffff00",
+  "#0000ff",
+  "#ff00ff",
+  "#00ffff",
+  "#ffffff",
+  "#000000",
+  "#00005f",
+  "#000087",
+  "#0000af",
+  "#0000d7",
+  "#0000ff",
+  "#005f00",
+  "#005f5f",
+  "#005f87",
+  "#005faf",
+  "#005fd7",
+  "#005fff",
+  "#008700",
+  "#00875f",
+  "#008787",
+  "#0087af",
+  "#0087d7",
+  "#0087ff",
+  "#00af00",
+  "#00af5f",
+  "#00af87",
+  "#00afaf",
+  "#00afd7",
+  "#00afff",
+  "#00d700",
+  "#00d75f",
+  "#00d787",
+  "#00d7af",
+  "#00d7d7",
+  "#00d7ff",
+  "#00ff00",
+  "#00ff5f",
+  "#00ff87",
+  "#00ffaf",
+  "#00ffd7",
+  "#00ffff",
+  "#5f0000",
+  "#5f005f",
+  "#5f0087",
+  "#5f00af",
+  "#5f00d7",
+  "#5f00ff",
+  "#5f5f00",
+  "#5f5f5f",
+  "#5f5f87",
+  "#5f5faf",
+  "#5f5fd7",
+  "#5f5fff",
+  "#5f8700",
+  "#5f875f",
+  "#5f8787",
+  "#5f87af",
+  "#5f87d7",
+  "#5f87ff",
+  "#5faf00",
+  "#5faf5f",
+  "#5faf87",
+  "#5fafaf",
+  "#5fafd7",
+  "#5fafff",
+  "#5fd700",
+  "#5fd75f",
+  "#5fd787",
+  "#5fd7af",
+  "#5fd7d7",
+  "#5fd7ff",
+  "#5fff00",
+  "#5fff5f",
+  "#5fff87",
+  "#5fffaf",
+  "#5fffd7",
+  "#5fffff",
+  "#870000",
+  "#87005f",
+  "#870087",
+  "#8700af",
+  "#8700d7",
+  "#8700ff",
+  "#875f00",
+  "#875f5f",
+  "#875f87",
+  "#875faf",
+  "#875fd7",
+  "#875fff",
+  "#878700",
+  "#87875f",
+  "#878787",
+  "#8787af",
+  "#8787d7",
+  "#8787ff",
+  "#87af00",
+  "#87af5f",
+  "#87af87",
+  "#87afaf",
+  "#87afd7",
+  "#87afff",
+  "#87d700",
+  "#87d75f",
+  "#87d787",
+  "#87d7af",
+  "#87d7d7",
+  "#87d7ff",
+  "#87ff00",
+  "#87ff5f",
+  "#87ff87",
+  "#87ffaf",
+  "#87ffd7",
+  "#87ffff",
+  "#af0000",
+  "#af005f",
+  "#af0087",
+  "#af00af",
+  "#af00d7",
+  "#af00ff",
+  "#af5f00",
+  "#af5f5f",
+  "#af5f87",
+  "#af5faf",
+  "#af5fd7",
+  "#af5fff",
+  "#af8700",
+  "#af875f",
+  "#af8787",
+  "#af87af",
+  "#af87d7",
+  "#af87ff",
+  "#afaf00",
+  "#afaf5f",
+  "#afaf87",
+  "#afafaf",
+  "#afafd7",
+  "#afafff",
+  "#afd700",
+  "#afd75f",
+  "#afd787",
+  "#afd7af",
+  "#afd7d7",
+  "#afd7ff",
+  "#afff00",
+  "#afff5f",
+  "#afff87",
+  "#afffaf",
+  "#afffd7",
+  "#afffff",
+  "#d70000",
+  "#d7005f",
+  "#d70087",
+  "#d700af",
+  "#d700d7",
+  "#d700ff",
+  "#d75f00",
+  "#d75f5f",
+  "#d75f87",
+  "#d75faf",
+  "#d75fd7",
+  "#d75fff",
+  "#d78700",
+  "#d7875f",
+  "#d78787",
+  "#d787af",
+  "#d787d7",
+  "#d787ff",
+  "#d7af00",
+  "#d7af5f",
+  "#d7af87",
+  "#d7afaf",
+  "#d7afd7",
+  "#d7afff",
+  "#d7d700",
+  "#d7d75f",
+  "#d7d787",
+  "#d7d7af",
+  "#d7d7d7",
+  "#d7d7ff",
+  "#d7ff00",
+  "#d7ff5f",
+  "#d7ff87",
+  "#d7ffaf",
+  "#d7ffd7",
+  "#d7ffff",
+  "#ff0000",
+  "#ff005f",
+  "#ff0087",
+  "#ff00af",
+  "#ff00d7",
+  "#ff00ff",
+  "#ff5f00",
+  "#ff5f5f",
+  "#ff5f87",
+  "#ff5faf",
+  "#ff5fd7",
+  "#ff5fff",
+  "#ff8700",
+  "#ff875f",
+  "#ff8787",
+  "#ff87af",
+  "#ff87d7",
+  "#ff87ff",
+  "#ffaf00",
+  "#ffaf5f",
+  "#ffaf87",
+  "#ffafaf",
+  "#ffafd7",
+  "#ffafff",
+  "#ffd700",
+  "#ffd75f",
+  "#ffd787",
+  "#ffd7af",
+  "#ffd7d7",
+  "#ffd7ff",
+  "#ffff00",
+  "#ffff5f",
+  "#ffff87",
+  "#ffffaf",
+  "#ffffd7",
+  "#ffffff",
+  "#080808",
+  "#121212",
+  "#1c1c1c",
+  "#262626",
+  "#303030",
+  "#3a3a3a",
+  "#444444",
+  "#4e4e4e",
+  "#585858",
+  "#626262",
+  "#6c6c6c",
+  "#767676",
+  "#808080",
+  "#8a8a8a",
+  "#949494",
+  "#9e9e9e",
+  "#a8a8a8",
+  "#b2b2b2",
+  "#bcbcbc",
+  "#c6c6c6",
+  "#d0d0d0",
+  "#dadada",
+  "#e4e4e4",
+  "#eeeeee",
 ];
 
 export function convertColorToHex(
@@ -465,9 +458,9 @@ export function convertColorToHex(
     const r = (color >> 16) & 255;
     const g = (color >> 8) & 255;
     const b = color & 255;
-    return `#${r.toString(16).padStart(2, '0')}${g
+    return `#${r.toString(16).padStart(2, "0")}${g
       .toString(16)
-      .padStart(2, '0')}${b.toString(16).padStart(2, '0')}`;
+      .padStart(2, "0")}${b.toString(16).padStart(2, "0")}`;
   }
   if (colorMode === ColorMode.PALETTE) {
     return ANSI_COLORS[color] || defaultColor;
diff --git a/packages/gemini-cli-core/src/utils/testUtils.ts b/packages/gemini-cli-core/src/utils/testUtils.ts
index a0010b105..566fda202 100644
--- a/packages/gemini-cli-core/src/utils/testUtils.ts
+++ b/packages/gemini-cli-core/src/utils/testUtils.ts
@@ -56,7 +56,7 @@ export function disableSimulationAfterFallback(): void {
  * Create a simulated 429 error response
  */
 export function createSimulated429Error(): Error {
-  const error = new Error('Rate limit exceeded (simulated)') as Error & {
+  const error = new Error("Rate limit exceeded (simulated)") as Error & {
     status: number;
   };
   error.status = 429;
@@ -74,11 +74,7 @@ export function resetSimulationState(): void {
 /**
  * Enable/disable 429 simulation programmatically (for tests)
  */
-export function setSimulate429(
-  enabled: boolean,
-  afterRequests = 0,
-  forAuthType?: string,
-): void {
+export function setSimulate429(enabled: boolean, afterRequests = 0, forAuthType?: string): void {
   simulate429Enabled = enabled;
   simulate429AfterRequests = afterRequests;
   simulate429ForAuthType = forAuthType;
diff --git a/packages/gemini-cli-core/src/utils/textUtils.test.ts b/packages/gemini-cli-core/src/utils/textUtils.test.ts
index c1468c111..5f127aaa7 100644
--- a/packages/gemini-cli-core/src/utils/textUtils.test.ts
+++ b/packages/gemini-cli-core/src/utils/textUtils.test.ts
@@ -4,34 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { safeLiteralReplace } from './textUtils.js';
+import { describe, expect, it } from "vitest";
+import { safeLiteralReplace } from "./textUtils.js";
 
-describe('safeLiteralReplace', () => {
-  it('returns original string when oldString empty or not found', () => {
-    expect(safeLiteralReplace('abc', '', 'X')).toBe('abc');
-    expect(safeLiteralReplace('abc', 'z', 'X')).toBe('abc');
+describe("safeLiteralReplace", () => {
+  it("returns original string when oldString empty or not found", () => {
+    expect(safeLiteralReplace("abc", "", "X")).toBe("abc");
+    expect(safeLiteralReplace("abc", "z", "X")).toBe("abc");
   });
 
-  it('fast path when newString has no $', () => {
-    expect(safeLiteralReplace('abc', 'b', 'X')).toBe('aXc');
+  it("fast path when newString has no $", () => {
+    expect(safeLiteralReplace("abc", "b", "X")).toBe("aXc");
   });
 
-  it('treats $ literally', () => {
-    expect(safeLiteralReplace('foo', 'foo', "bar$'baz")).toBe("bar$'baz");
+  it("treats $ literally", () => {
+    expect(safeLiteralReplace("foo", "foo", "bar$'baz")).toBe("bar$'baz");
   });
 
   it("does not interpret replacement patterns like $&, $', $` and $1", () => {
-    expect(safeLiteralReplace('hello', 'hello', '$&-replacement')).toBe(
-      '$&-replacement',
-    );
-    expect(safeLiteralReplace('mid', 'mid', 'new$`content')).toBe(
-      'new$`content',
-    );
-    expect(safeLiteralReplace('test', 'test', '$1$2value')).toBe('$1$2value');
+    expect(safeLiteralReplace("hello", "hello", "$&-replacement")).toBe("$&-replacement");
+    expect(safeLiteralReplace("mid", "mid", "new$`content")).toBe("new$`content");
+    expect(safeLiteralReplace("test", "test", "$1$2value")).toBe("$1$2value");
   });
 
-  it('preserves end-of-line $ in regex-like text', () => {
+  it("preserves end-of-line $ in regex-like text", () => {
     const current = "| select('match', '^[sv]d[a-z]$')";
     const oldStr = "'^[sv]d[a-z]$'";
     const newStr = "'^[sv]d[a-z]$' # updated";
@@ -39,41 +35,37 @@ describe('safeLiteralReplace', () => {
     expect(safeLiteralReplace(current, oldStr, newStr)).toBe(expected);
   });
 
-  it('handles multiple $ characters', () => {
-    expect(safeLiteralReplace('x', 'x', '$$$')).toBe('$$$');
+  it("handles multiple $ characters", () => {
+    expect(safeLiteralReplace("x", "x", "$$$")).toBe("$$$");
   });
 
-  it('preserves pre-escaped $$ literally', () => {
-    expect(safeLiteralReplace('x', 'x', '$$value')).toBe('$$value');
+  it("preserves pre-escaped $$ literally", () => {
+    expect(safeLiteralReplace("x", "x", "$$value")).toBe("$$value");
   });
 
-  it('handles complex malicious patterns from PR #7871', () => {
-    const original = 'The price is PRICE.';
-    const result = safeLiteralReplace(
-      original,
-      'PRICE',
-      "$& Wow, that's a lot! $'",
-    );
+  it("handles complex malicious patterns from PR #7871", () => {
+    const original = "The price is PRICE.";
+    const result = safeLiteralReplace(original, "PRICE", "$& Wow, that's a lot! $'");
     expect(result).toBe("The price is $& Wow, that's a lot! $'.");
   });
 
-  it('handles multiple replacements correctly', () => {
-    const text = 'Replace FOO and FOO again';
-    const result = safeLiteralReplace(text, 'FOO', '$100');
-    expect(result).toBe('Replace $100 and $100 again');
+  it("handles multiple replacements correctly", () => {
+    const text = "Replace FOO and FOO again";
+    const result = safeLiteralReplace(text, "FOO", "$100");
+    expect(result).toBe("Replace $100 and $100 again");
   });
 
-  it('preserves $ at different positions', () => {
-    expect(safeLiteralReplace('test', 'test', '$')).toBe('$');
-    expect(safeLiteralReplace('test', 'test', 'prefix$')).toBe('prefix$');
-    expect(safeLiteralReplace('test', 'test', '$suffix')).toBe('$suffix');
+  it("preserves $ at different positions", () => {
+    expect(safeLiteralReplace("test", "test", "$")).toBe("$");
+    expect(safeLiteralReplace("test", "test", "prefix$")).toBe("prefix$");
+    expect(safeLiteralReplace("test", "test", "$suffix")).toBe("$suffix");
   });
 
-  it('handles edge case with $$$$', () => {
-    expect(safeLiteralReplace('x', 'x', '$$$$')).toBe('$$$$');
+  it("handles edge case with $$$$", () => {
+    expect(safeLiteralReplace("x", "x", "$$$$")).toBe("$$$$");
   });
 
-  it('handles newString with only dollar signs', () => {
-    expect(safeLiteralReplace('abc', 'b', '$$')).toBe('a$$c');
+  it("handles newString with only dollar signs", () => {
+    expect(safeLiteralReplace("abc", "b", "$$")).toBe("a$$c");
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/textUtils.ts b/packages/gemini-cli-core/src/utils/textUtils.ts
index 693ab48fe..b7c54e87d 100644
--- a/packages/gemini-cli-core/src/utils/textUtils.ts
+++ b/packages/gemini-cli-core/src/utils/textUtils.ts
@@ -8,20 +8,16 @@
  * Safely replaces text with literal strings, avoiding ECMAScript GetSubstitution issues.
  * Escapes $ characters to prevent template interpretation.
  */
-export function safeLiteralReplace(
-  str: string,
-  oldString: string,
-  newString: string,
-): string {
-  if (oldString === '' || !str.includes(oldString)) {
+export function safeLiteralReplace(str: string, oldString: string, newString: string): string {
+  if (oldString === "" || !str.includes(oldString)) {
     return str;
   }
 
-  if (!newString.includes('$')) {
+  if (!newString.includes("$")) {
     return str.replaceAll(oldString, newString);
   }
 
-  const escapedNewString = newString.replaceAll('$', '$$$$');
+  const escapedNewString = newString.replaceAll("$", "$$$$");
   return str.replaceAll(oldString, escapedNewString);
 }
 
@@ -32,10 +28,7 @@ export function safeLiteralReplace(
  * @param sampleSize The number of bytes from the start of the buffer to test.
  * @returns True if a NULL byte is found, false otherwise.
  */
-export function isBinary(
-  data: Buffer | null | undefined,
-  sampleSize = 512,
-): boolean {
+export function isBinary(data: Buffer | null | undefined, sampleSize = 512): boolean {
   if (!data) {
     return false;
   }
diff --git a/packages/gemini-cli-core/src/utils/thoughtUtils.test.ts b/packages/gemini-cli-core/src/utils/thoughtUtils.test.ts
index 88d11c6c0..cb82d5e96 100644
--- a/packages/gemini-cli-core/src/utils/thoughtUtils.test.ts
+++ b/packages/gemini-cli-core/src/utils/thoughtUtils.test.ts
@@ -4,77 +4,76 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseThought } from './thoughtUtils.js';
+import { describe, expect, it } from "vitest";
+import { parseThought } from "./thoughtUtils.js";
 
-describe('parseThought', () => {
+describe("parseThought", () => {
   it.each([
     {
-      name: 'a standard thought with subject and description',
-      rawText: '**Subject:** This is the description.',
+      name: "a standard thought with subject and description",
+      rawText: "**Subject:** This is the description.",
       expected: {
-        subject: 'Subject:',
-        description: 'This is the description.',
+        subject: "Subject:",
+        description: "This is the description.",
       },
     },
     {
-      name: 'leading and trailing whitespace in the raw string',
-      rawText: '  **Subject** description with spaces   ',
-      expected: { subject: 'Subject', description: 'description with spaces' },
+      name: "leading and trailing whitespace in the raw string",
+      rawText: "  **Subject** description with spaces   ",
+      expected: { subject: "Subject", description: "description with spaces" },
     },
     {
-      name: 'whitespace surrounding the subject content',
-      rawText: '** Subject  **',
-      expected: { subject: 'Subject', description: '' },
+      name: "whitespace surrounding the subject content",
+      rawText: "** Subject  **",
+      expected: { subject: "Subject", description: "" },
     },
     {
-      name: 'a thought with only a subject',
-      rawText: '**Only Subject**',
-      expected: { subject: 'Only Subject', description: '' },
+      name: "a thought with only a subject",
+      rawText: "**Only Subject**",
+      expected: { subject: "Only Subject", description: "" },
     },
     {
-      name: 'a thought with only a description (no subject)',
-      rawText: 'This is just a description.',
-      expected: { subject: '', description: 'This is just a description.' },
+      name: "a thought with only a description (no subject)",
+      rawText: "This is just a description.",
+      expected: { subject: "", description: "This is just a description." },
     },
     {
-      name: 'an empty string input',
-      rawText: '',
-      expected: { subject: '', description: '' },
+      name: "an empty string input",
+      rawText: "",
+      expected: { subject: "", description: "" },
     },
     {
-      name: 'newlines within the subject and description',
-      rawText:
-        '**Multi-line\nSubject**\nHere is a description\nspread across lines.',
+      name: "newlines within the subject and description",
+      rawText: "**Multi-line\nSubject**\nHere is a description\nspread across lines.",
       expected: {
-        subject: 'Multi-line\nSubject',
-        description: 'Here is a description\nspread across lines.',
+        subject: "Multi-line\nSubject",
+        description: "Here is a description\nspread across lines.",
       },
     },
     {
-      name: 'only the first subject if multiple are present',
-      rawText: '**First** some text **Second**',
-      expected: { subject: 'First', description: 'some text **Second**' },
+      name: "only the first subject if multiple are present",
+      rawText: "**First** some text **Second**",
+      expected: { subject: "First", description: "some text **Second**" },
     },
     {
-      name: 'text before and after the subject',
-      rawText: 'Prefix text **Subject** Suffix text.',
+      name: "text before and after the subject",
+      rawText: "Prefix text **Subject** Suffix text.",
       expected: {
-        subject: 'Subject',
-        description: 'Prefix text  Suffix text.',
+        subject: "Subject",
+        description: "Prefix text  Suffix text.",
       },
     },
     {
-      name: 'an unclosed subject tag',
-      rawText: 'Text with **an unclosed subject',
-      expected: { subject: '', description: 'Text with **an unclosed subject' },
+      name: "an unclosed subject tag",
+      rawText: "Text with **an unclosed subject",
+      expected: { subject: "", description: "Text with **an unclosed subject" },
     },
     {
-      name: 'an empty subject tag',
-      rawText: 'A thought with **** in the middle.',
-      expected: { subject: '', description: 'A thought with  in the middle.' },
+      name: "an empty subject tag",
+      rawText: "A thought with **** in the middle.",
+      expected: { subject: "", description: "A thought with  in the middle." },
     },
-  ])('should correctly parse $name', ({ rawText, expected }) => {
+  ])("should correctly parse $name", ({ rawText, expected }) => {
     expect(parseThought(rawText)).toEqual(expected);
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/thoughtUtils.ts b/packages/gemini-cli-core/src/utils/thoughtUtils.ts
index c97a39a32..dd6f31e5e 100644
--- a/packages/gemini-cli-core/src/utils/thoughtUtils.ts
+++ b/packages/gemini-cli-core/src/utils/thoughtUtils.ts
@@ -9,8 +9,8 @@ export type ThoughtSummary = {
   description: string;
 };
 
-const START_DELIMITER = '**';
-const END_DELIMITER = '**';
+const START_DELIMITER = "**";
+const END_DELIMITER = "**";
 
 /**
  * Parses a raw thought string into a structured ThoughtSummary object.
@@ -27,27 +27,21 @@ export function parseThought(rawText: string): ThoughtSummary {
   const startIndex = rawText.indexOf(START_DELIMITER);
   if (startIndex === -1) {
     // No start delimiter found, the whole text is the description.
-    return { subject: '', description: rawText.trim() };
+    return { subject: "", description: rawText.trim() };
   }
 
-  const endIndex = rawText.indexOf(
-    END_DELIMITER,
-    startIndex + START_DELIMITER.length,
-  );
+  const endIndex = rawText.indexOf(END_DELIMITER, startIndex + START_DELIMITER.length);
   if (endIndex === -1) {
     // Start delimiter found but no end delimiter, so it's not a valid subject.
     // Treat the entire string as the description.
-    return { subject: '', description: rawText.trim() };
+    return { subject: "", description: rawText.trim() };
   }
 
-  const subject = rawText
-    .substring(startIndex + START_DELIMITER.length, endIndex)
-    .trim();
+  const subject = rawText.substring(startIndex + START_DELIMITER.length, endIndex).trim();
 
   // The description is everything before the start delimiter and after the end delimiter.
   const description = (
-    rawText.substring(0, startIndex) +
-    rawText.substring(endIndex + END_DELIMITER.length)
+    rawText.substring(0, startIndex) + rawText.substring(endIndex + END_DELIMITER.length)
   ).trim();
 
   return { subject, description };
diff --git a/packages/gemini-cli-core/src/utils/tokenCalculation.test.ts b/packages/gemini-cli-core/src/utils/tokenCalculation.test.ts
index 7e1eae3e8..66adba77a 100644
--- a/packages/gemini-cli-core/src/utils/tokenCalculation.test.ts
+++ b/packages/gemini-cli-core/src/utils/tokenCalculation.test.ts
@@ -4,42 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { calculateRequestTokenCount } from './tokenCalculation.js';
-import type { ContentGenerator } from '../core/contentGenerator.js';
+import { describe, expect, it, vi } from "vitest";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { calculateRequestTokenCount } from "./tokenCalculation.js";
 
-describe('calculateRequestTokenCount', () => {
+describe("calculateRequestTokenCount", () => {
   const mockContentGenerator = {
     countTokens: vi.fn(),
   } as unknown as ContentGenerator;
 
-  const model = 'gemini-pro';
+  const model = "gemini-pro";
 
-  it('should use countTokens API for media requests (images/files)', async () => {
+  it("should use countTokens API for media requests (images/files)", async () => {
     vi.mocked(mockContentGenerator.countTokens).mockResolvedValue({
       totalTokens: 100,
     });
-    const request = [{ inlineData: { mimeType: 'image/png', data: 'data' } }];
+    const request = [{ inlineData: { mimeType: "image/png", data: "data" } }];
 
-    const count = await calculateRequestTokenCount(
-      request,
-      mockContentGenerator,
-      model,
-    );
+    const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
 
     expect(count).toBe(100);
     expect(mockContentGenerator.countTokens).toHaveBeenCalled();
   });
 
-  it('should estimate tokens locally for tool calls', async () => {
+  it("should estimate tokens locally for tool calls", async () => {
     vi.mocked(mockContentGenerator.countTokens).mockClear();
-    const request = [{ functionCall: { name: 'foo', args: { bar: 'baz' } } }];
+    const request = [{ functionCall: { name: "foo", args: { bar: "baz" } } }];
 
-    const count = await calculateRequestTokenCount(
-      request,
-      mockContentGenerator,
-      model,
-    );
+    const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
 
     // Estimation logic: JSON.stringify(part).length / 4
     // JSON: {"functionCall":{"name":"foo","args":{"bar":"baz"}}}
@@ -48,78 +40,53 @@ describe('calculateRequestTokenCount', () => {
     expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
   });
 
-  it('should estimate tokens locally for simple ASCII text', async () => {
+  it("should estimate tokens locally for simple ASCII text", async () => {
     vi.mocked(mockContentGenerator.countTokens).mockClear();
     // 12 chars. 12 * 0.25 = 3 tokens.
-    const request = 'Hello world!';
+    const request = "Hello world!";
 
-    const count = await calculateRequestTokenCount(
-      request,
-      mockContentGenerator,
-      model,
-    );
+    const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
 
     expect(count).toBe(3);
     expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
   });
 
-  it('should estimate tokens locally for CJK text with higher weight', async () => {
+  it("should estimate tokens locally for CJK text with higher weight", async () => {
     vi.mocked(mockContentGenerator.countTokens).mockClear();
     // 2 chars. 2 * 1.3 = 2.6 -> floor(2.6) = 2.
     // Old logic would be 2/4 = 0.5 -> 0.
-    const request = '你好';
+    const request = "你好";
 
-    const count = await calculateRequestTokenCount(
-      request,
-      mockContentGenerator,
-      model,
-    );
+    const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
 
     expect(count).toBeGreaterThanOrEqual(2);
     expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
   });
 
-  it('should handle mixed content', async () => {
+  it("should handle mixed content", async () => {
     vi.mocked(mockContentGenerator.countTokens).mockClear();
     // 'Hi': 2 * 0.25 = 0.5
     // '你好': 2 * 1.3 = 2.6
     // Total: 3.1 -> 3
-    const request = 'Hi你好';
+    const request = "Hi你好";
 
-    const count = await calculateRequestTokenCount(
-      request,
-      mockContentGenerator,
-      model,
-    );
+    const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
 
     expect(count).toBe(3);
     expect(mockContentGenerator.countTokens).not.toHaveBeenCalled();
   });
 
-  it('should handle empty text', async () => {
-    const request = '';
-    const count = await calculateRequestTokenCount(
-      request,
-      mockContentGenerator,
-      model,
-    );
+  it("should handle empty text", async () => {
+    const request = "";
+    const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
     expect(count).toBe(0);
   });
 
-  it('should fallback to local estimation when countTokens API fails', async () => {
-    vi.mocked(mockContentGenerator.countTokens).mockRejectedValue(
-      new Error('API error'),
-    );
-    const request = [
-      { text: 'Hello' },
-      { inlineData: { mimeType: 'image/png', data: 'data' } },
-    ];
-
-    const count = await calculateRequestTokenCount(
-      request,
-      mockContentGenerator,
-      model,
-    );
+  it("should fallback to local estimation when countTokens API fails", async () => {
+    vi.mocked(mockContentGenerator.countTokens).mockRejectedValue(new Error("API error"));
+    const request = [{ text: "Hello" }, { inlineData: { mimeType: "image/png", data: "data" } }];
+
+    const count = await calculateRequestTokenCount(request, mockContentGenerator, model);
 
     // Should fallback to estimation:
     // 'Hello': 5 chars * 0.25 = 1.25
diff --git a/packages/gemini-cli-core/src/utils/tokenCalculation.ts b/packages/gemini-cli-core/src/utils/tokenCalculation.ts
index 0359cb3e7..869bdab7f 100644
--- a/packages/gemini-cli-core/src/utils/tokenCalculation.ts
+++ b/packages/gemini-cli-core/src/utils/tokenCalculation.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { PartListUnion, Part } from '@google/genai';
-import type { ContentGenerator } from '../core/contentGenerator.js';
+import type { Part, PartListUnion } from "@google/genai";
+import type { ContentGenerator } from "../core/contentGenerator.js";
 
 // Token estimation constants
 // ASCII characters (0-127) are roughly 4 chars per token
@@ -22,7 +22,7 @@ const NON_ASCII_TOKENS_PER_CHAR = 1.3;
 export function estimateTokenCountSync(parts: Part[]): number {
   let totalTokens = 0;
   for (const part of parts) {
-    if (typeof part.text === 'string') {
+    if (typeof part.text === "string") {
       for (const char of part.text) {
         if (char.codePointAt(0)! <= 127) {
           totalTokens += ASCII_TOKENS_PER_CHAR;
@@ -51,14 +51,14 @@ export async function calculateRequestTokenCount(
   model: string,
 ): Promise<number> {
   const parts: Part[] = Array.isArray(request)
-    ? request.map((p) => (typeof p === 'string' ? { text: p } : p))
-    : typeof request === 'string'
+    ? request.map((p) => (typeof p === "string" ? { text: p } : p))
+    : typeof request === "string"
       ? [{ text: request }]
       : [request];
 
   // Use countTokens API only for heavy media parts that are hard to estimate.
   const hasMedia = parts.some((p) => {
-    const isMedia = 'inlineData' in p || 'fileData' in p;
+    const isMedia = "inlineData" in p || "fileData" in p;
     return isMedia;
   });
 
@@ -66,7 +66,7 @@ export async function calculateRequestTokenCount(
     try {
       const response = await contentGenerator.countTokens({
         model,
-        contents: [{ role: 'user', parts }],
+        contents: [{ role: "user", parts }],
       });
       return response.totalTokens ?? 0;
     } catch {
diff --git a/packages/gemini-cli-core/src/utils/tool-utils.test.ts b/packages/gemini-cli-core/src/utils/tool-utils.test.ts
index 672bc7230..d52d88811 100644
--- a/packages/gemini-cli-core/src/utils/tool-utils.test.ts
+++ b/packages/gemini-cli-core/src/utils/tool-utils.test.ts
@@ -4,99 +4,75 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { expect, describe, it } from 'vitest';
-import { doesToolInvocationMatch } from './tool-utils.js';
-import type { AnyToolInvocation, Config } from '../index.js';
-import { ReadFileTool } from '../tools/read-file.js';
+import { describe, expect, it } from "vitest";
+import type { AnyToolInvocation, Config } from "../index.js";
+import { ReadFileTool } from "../tools/read-file.js";
+import { doesToolInvocationMatch } from "./tool-utils.js";
 
-describe('doesToolInvocationMatch', () => {
-  it('should not match a partial command prefix', () => {
+describe("doesToolInvocationMatch", () => {
+  it("should not match a partial command prefix", () => {
     const invocation = {
-      params: { command: 'git commitsomething' },
+      params: { command: "git commitsomething" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(git commit)'];
-    const result = doesToolInvocationMatch(
-      'run_shell_command',
-      invocation,
-      patterns,
-    );
+    const patterns = ["ShellTool(git commit)"];
+    const result = doesToolInvocationMatch("run_shell_command", invocation, patterns);
     expect(result).toBe(false);
   });
 
-  it('should match an exact command', () => {
+  it("should match an exact command", () => {
     const invocation = {
-      params: { command: 'git status' },
+      params: { command: "git status" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(git status)'];
-    const result = doesToolInvocationMatch(
-      'run_shell_command',
-      invocation,
-      patterns,
-    );
+    const patterns = ["ShellTool(git status)"];
+    const result = doesToolInvocationMatch("run_shell_command", invocation, patterns);
     expect(result).toBe(true);
   });
 
-  it('should match a command with an alias', () => {
+  it("should match a command with an alias", () => {
     const invocation = {
-      params: { command: 'wc -l' },
+      params: { command: "wc -l" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(wc)'];
-    const result = doesToolInvocationMatch('ShellTool', invocation, patterns);
+    const patterns = ["ShellTool(wc)"];
+    const result = doesToolInvocationMatch("ShellTool", invocation, patterns);
     expect(result).toBe(true);
   });
 
-  it('should match a command that is a prefix', () => {
+  it("should match a command that is a prefix", () => {
     const invocation = {
-      params: { command: 'git status -v' },
+      params: { command: "git status -v" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(git status)'];
-    const result = doesToolInvocationMatch(
-      'run_shell_command',
-      invocation,
-      patterns,
-    );
+    const patterns = ["ShellTool(git status)"];
+    const result = doesToolInvocationMatch("run_shell_command", invocation, patterns);
     expect(result).toBe(true);
   });
 
-  describe('for non-shell tools', () => {
+  describe("for non-shell tools", () => {
     const readFileTool = new ReadFileTool({} as Config);
     const invocation = {
-      params: { file: 'test.txt' },
+      params: { file: "test.txt" },
     } as AnyToolInvocation;
 
-    it('should match by tool name', () => {
-      const patterns = ['read_file'];
-      const result = doesToolInvocationMatch(
-        readFileTool,
-        invocation,
-        patterns,
-      );
+    it("should match by tool name", () => {
+      const patterns = ["read_file"];
+      const result = doesToolInvocationMatch(readFileTool, invocation, patterns);
       expect(result).toBe(true);
     });
 
-    it('should match by tool class name', () => {
-      const patterns = ['ReadFileTool'];
-      const result = doesToolInvocationMatch(
-        readFileTool,
-        invocation,
-        patterns,
-      );
+    it("should match by tool class name", () => {
+      const patterns = ["ReadFileTool"];
+      const result = doesToolInvocationMatch(readFileTool, invocation, patterns);
       expect(result).toBe(true);
     });
 
-    it('should not match if neither name is in the patterns', () => {
-      const patterns = ['some_other_tool', 'AnotherToolClass'];
-      const result = doesToolInvocationMatch(
-        readFileTool,
-        invocation,
-        patterns,
-      );
+    it("should not match if neither name is in the patterns", () => {
+      const patterns = ["some_other_tool", "AnotherToolClass"];
+      const result = doesToolInvocationMatch(readFileTool, invocation, patterns);
       expect(result).toBe(false);
     });
 
-    it('should match by tool name when passed as a string', () => {
-      const patterns = ['read_file'];
-      const result = doesToolInvocationMatch('read_file', invocation, patterns);
+    it("should match by tool name when passed as a string", () => {
+      const patterns = ["read_file"];
+      const result = doesToolInvocationMatch("read_file", invocation, patterns);
       expect(result).toBe(true);
     });
   });
diff --git a/packages/gemini-cli-core/src/utils/tool-utils.ts b/packages/gemini-cli-core/src/utils/tool-utils.ts
index ebf73f90b..81b2291ac 100644
--- a/packages/gemini-cli-core/src/utils/tool-utils.ts
+++ b/packages/gemini-cli-core/src/utils/tool-utils.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AnyDeclarativeTool, AnyToolInvocation } from '../index.js';
-import { isTool } from '../index.js';
-import { SHELL_TOOL_NAMES } from './shell-utils.js';
+import type { AnyDeclarativeTool, AnyToolInvocation } from "../index.js";
+import { isTool } from "../index.js";
+import { SHELL_TOOL_NAMES } from "./shell-utils.js";
 
 /**
  * Checks if a tool invocation matches any of a list of patterns.
@@ -37,7 +37,7 @@ export function doesToolInvocationMatch(
   }
 
   for (const pattern of patterns) {
-    const openParen = pattern.indexOf('(');
+    const openParen = pattern.indexOf("(");
 
     if (openParen === -1) {
       // No arguments, just a tool name
@@ -52,17 +52,17 @@ export function doesToolInvocationMatch(
       continue;
     }
 
-    if (!pattern.endsWith(')')) {
+    if (!pattern.endsWith(")")) {
       continue;
     }
 
     const argPattern = pattern.substring(openParen + 1, pattern.length - 1);
 
     let command: string;
-    if (typeof invocation === 'string') {
+    if (typeof invocation === "string") {
       command = invocation;
     } else {
-      if (!('command' in invocation.params)) {
+      if (!("command" in invocation.params)) {
         // This invocation has no command - nothing to check.
         continue;
       }
@@ -70,7 +70,7 @@ export function doesToolInvocationMatch(
     }
 
     if (toolNames.some((name) => SHELL_TOOL_NAMES.includes(name))) {
-      if (command === argPattern || command.startsWith(argPattern + ' ')) {
+      if (command === argPattern || command.startsWith(argPattern + " ")) {
         return true;
       }
     }
diff --git a/packages/gemini-cli-core/src/utils/userAccountManager.test.ts b/packages/gemini-cli-core/src/utils/userAccountManager.test.ts
index 8b4cb6105..22db3d411 100644
--- a/packages/gemini-cli-core/src/utils/userAccountManager.test.ts
+++ b/packages/gemini-cli-core/src/utils/userAccountManager.test.ts
@@ -4,35 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { UserAccountManager } from './userAccountManager.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import path from 'node:path';
-import { GEMINI_DIR } from './paths.js';
-import { debugLogger } from './debugLogger.js';
-
-vi.mock('os', async (importOriginal) => {
-  const os = await importOriginal<typeof import('os')>();
+import * as fs from "node:fs";
+import * as os from "node:os";
+import path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
+import { GEMINI_DIR } from "./paths.js";
+import { UserAccountManager } from "./userAccountManager.js";
+
+vi.mock("os", async (importOriginal) => {
+  const os = await importOriginal<typeof import("os")>();
   return {
     ...os,
     homedir: vi.fn(),
   };
 });
 
-describe('UserAccountManager', () => {
+describe("UserAccountManager", () => {
   let tempHomeDir: string;
   let userAccountManager: UserAccountManager;
   let accountsFile: () => string;
 
   beforeEach(() => {
-    tempHomeDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-    );
+    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
     (os.homedir as Mock).mockReturnValue(tempHomeDir);
-    accountsFile = () =>
-      path.join(tempHomeDir, GEMINI_DIR, 'google_accounts.json');
+    accountsFile = () => path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
     userAccountManager = new UserAccountManager();
   });
 
@@ -41,35 +38,31 @@ describe('UserAccountManager', () => {
     vi.clearAllMocks();
   });
 
-  describe('cacheGoogleAccount', () => {
-    it('should create directory and write initial account file', async () => {
-      await userAccountManager.cacheGoogleAccount('test1@google.com');
+  describe("cacheGoogleAccount", () => {
+    it("should create directory and write initial account file", async () => {
+      await userAccountManager.cacheGoogleAccount("test1@google.com");
 
       // Verify Google Account ID was cached
       expect(fs.existsSync(accountsFile())).toBe(true);
-      expect(fs.readFileSync(accountsFile(), 'utf-8')).toBe(
-        JSON.stringify({ active: 'test1@google.com', old: [] }, null, 2),
+      expect(fs.readFileSync(accountsFile(), "utf-8")).toBe(
+        JSON.stringify({ active: "test1@google.com", old: [] }, null, 2),
       );
     });
 
-    it('should update active account and move previous to old', async () => {
+    it("should update active account and move previous to old", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify(
-          { active: 'test2@google.com', old: ['test1@google.com'] },
-          null,
-          2,
-        ),
+        JSON.stringify({ active: "test2@google.com", old: ["test1@google.com"] }, null, 2),
       );
 
-      await userAccountManager.cacheGoogleAccount('test3@google.com');
+      await userAccountManager.cacheGoogleAccount("test3@google.com");
 
-      expect(fs.readFileSync(accountsFile(), 'utf-8')).toBe(
+      expect(fs.readFileSync(accountsFile(), "utf-8")).toBe(
         JSON.stringify(
           {
-            active: 'test3@google.com',
-            old: ['test1@google.com', 'test2@google.com'],
+            active: "test3@google.com",
+            old: ["test1@google.com", "test2@google.com"],
           },
           null,
           2,
@@ -77,93 +70,79 @@ describe('UserAccountManager', () => {
       );
     });
 
-    it('should not add a duplicate to the old list', async () => {
+    it("should not add a duplicate to the old list", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify(
-          { active: 'test1@google.com', old: ['test2@google.com'] },
-          null,
-          2,
-        ),
+        JSON.stringify({ active: "test1@google.com", old: ["test2@google.com"] }, null, 2),
       );
-      await userAccountManager.cacheGoogleAccount('test2@google.com');
-      await userAccountManager.cacheGoogleAccount('test1@google.com');
+      await userAccountManager.cacheGoogleAccount("test2@google.com");
+      await userAccountManager.cacheGoogleAccount("test1@google.com");
 
-      expect(fs.readFileSync(accountsFile(), 'utf-8')).toBe(
-        JSON.stringify(
-          { active: 'test1@google.com', old: ['test2@google.com'] },
-          null,
-          2,
-        ),
+      expect(fs.readFileSync(accountsFile(), "utf-8")).toBe(
+        JSON.stringify({ active: "test1@google.com", old: ["test2@google.com"] }, null, 2),
       );
     });
 
-    it('should handle corrupted JSON by starting fresh', async () => {
+    it("should handle corrupted JSON by starting fresh", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), 'not valid json');
-      const consoleLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), "not valid json");
+      const consoleLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
-      await userAccountManager.cacheGoogleAccount('test1@google.com');
+      await userAccountManager.cacheGoogleAccount("test1@google.com");
 
       expect(consoleLogSpy).toHaveBeenCalled();
-      expect(JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'))).toEqual({
-        active: 'test1@google.com',
+      expect(JSON.parse(fs.readFileSync(accountsFile(), "utf-8"))).toEqual({
+        active: "test1@google.com",
         old: [],
       });
     });
 
-    it('should handle valid JSON with incorrect schema by starting fresh', async () => {
+    it("should handle valid JSON with incorrect schema by starting fresh", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify({ active: 'test1@google.com', old: 'not-an-array' }),
+        JSON.stringify({ active: "test1@google.com", old: "not-an-array" }),
       );
-      const consoleLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      const consoleLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
-      await userAccountManager.cacheGoogleAccount('test2@google.com');
+      await userAccountManager.cacheGoogleAccount("test2@google.com");
 
       expect(consoleLogSpy).toHaveBeenCalled();
-      expect(JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'))).toEqual({
-        active: 'test2@google.com',
+      expect(JSON.parse(fs.readFileSync(accountsFile(), "utf-8"))).toEqual({
+        active: "test2@google.com",
         old: [],
       });
     });
   });
 
-  describe('getCachedGoogleAccount', () => {
-    it('should return the active account if file exists and is valid', () => {
+  describe("getCachedGoogleAccount", () => {
+    it("should return the active account if file exists and is valid", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify({ active: 'active@google.com', old: [] }, null, 2),
+        JSON.stringify({ active: "active@google.com", old: [] }, null, 2),
       );
       const account = userAccountManager.getCachedGoogleAccount();
-      expect(account).toBe('active@google.com');
+      expect(account).toBe("active@google.com");
     });
 
-    it('should return null if file does not exist', () => {
+    it("should return null if file does not exist", () => {
       const account = userAccountManager.getCachedGoogleAccount();
       expect(account).toBeNull();
     });
 
-    it('should return null if file is empty', () => {
+    it("should return null if file is empty", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), '');
+      fs.writeFileSync(accountsFile(), "");
       const account = userAccountManager.getCachedGoogleAccount();
       expect(account).toBeNull();
     });
 
-    it('should return null and log if file is corrupted', () => {
+    it("should return null and log if file is corrupted", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(accountsFile(), '{ "active": "test@google.com"'); // Invalid JSON
-      const consoleLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      const consoleLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
       const account = userAccountManager.getCachedGoogleAccount();
 
@@ -171,7 +150,7 @@ describe('UserAccountManager', () => {
       expect(consoleLogSpy).toHaveBeenCalled();
     });
 
-    it('should return null if active key is missing', () => {
+    it("should return null if active key is missing", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(accountsFile(), JSON.stringify({ old: [] }));
       const account = userAccountManager.getCachedGoogleAccount();
@@ -179,71 +158,65 @@ describe('UserAccountManager', () => {
     });
   });
 
-  describe('clearCachedGoogleAccount', () => {
-    it('should set active to null and move it to old', async () => {
+  describe("clearCachedGoogleAccount", () => {
+    it("should set active to null and move it to old", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify(
-          { active: 'active@google.com', old: ['old1@google.com'] },
-          null,
-          2,
-        ),
+        JSON.stringify({ active: "active@google.com", old: ["old1@google.com"] }, null, 2),
       );
 
       await userAccountManager.clearCachedGoogleAccount();
 
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
-      expect(stored.old).toEqual(['old1@google.com', 'active@google.com']);
+      expect(stored.old).toEqual(["old1@google.com", "active@google.com"]);
     });
 
-    it('should handle empty file gracefully', async () => {
+    it("should handle empty file gracefully", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), '');
+      fs.writeFileSync(accountsFile(), "");
       await userAccountManager.clearCachedGoogleAccount();
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
       expect(stored.old).toEqual([]);
     });
 
-    it('should handle corrupted JSON by creating a fresh file', async () => {
+    it("should handle corrupted JSON by creating a fresh file", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), 'not valid json');
-      const consoleLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), "not valid json");
+      const consoleLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
       await userAccountManager.clearCachedGoogleAccount();
 
       expect(consoleLogSpy).toHaveBeenCalled();
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
       expect(stored.old).toEqual([]);
     });
 
-    it('should be idempotent if active account is already null', async () => {
+    it("should be idempotent if active account is already null", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify({ active: null, old: ['old1@google.com'] }, null, 2),
+        JSON.stringify({ active: null, old: ["old1@google.com"] }, null, 2),
       );
 
       await userAccountManager.clearCachedGoogleAccount();
 
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
-      expect(stored.old).toEqual(['old1@google.com']);
+      expect(stored.old).toEqual(["old1@google.com"]);
     });
 
-    it('should not add a duplicate to the old list', async () => {
+    it("should not add a duplicate to the old list", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify(
           {
-            active: 'active@google.com',
-            old: ['active@google.com'],
+            active: "active@google.com",
+            old: ["active@google.com"],
           },
           null,
           2,
@@ -252,88 +225,78 @@ describe('UserAccountManager', () => {
 
       await userAccountManager.clearCachedGoogleAccount();
 
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
-      expect(stored.old).toEqual(['active@google.com']);
+      expect(stored.old).toEqual(["active@google.com"]);
     });
   });
 
-  describe('getLifetimeGoogleAccounts', () => {
-    it('should return 0 if the file does not exist', () => {
+  describe("getLifetimeGoogleAccounts", () => {
+    it("should return 0 if the file does not exist", () => {
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
     });
 
-    it('should return 0 if the file is empty', () => {
+    it("should return 0 if the file is empty", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), '');
+      fs.writeFileSync(accountsFile(), "");
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
     });
 
-    it('should return 0 if the file is corrupted', () => {
+    it("should return 0 if the file is corrupted", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), 'invalid json');
-      const consoleDebugSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), "invalid json");
+      const consoleDebugSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
       expect(consoleDebugSpy).toHaveBeenCalled();
     });
 
-    it('should return 1 if there is only an active account', () => {
+    it("should return 1 if there is only an active account", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(
-        accountsFile(),
-        JSON.stringify({ active: 'test1@google.com', old: [] }),
-      );
+      fs.writeFileSync(accountsFile(), JSON.stringify({ active: "test1@google.com", old: [] }));
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(1);
     });
 
-    it('should correctly count old accounts when active is null', () => {
+    it("should correctly count old accounts when active is null", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify({
           active: null,
-          old: ['test1@google.com', 'test2@google.com'],
+          old: ["test1@google.com", "test2@google.com"],
         }),
       );
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(2);
     });
 
-    it('should correctly count both active and old accounts', () => {
+    it("should correctly count both active and old accounts", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify({
-          active: 'test3@google.com',
-          old: ['test1@google.com', 'test2@google.com'],
+          active: "test3@google.com",
+          old: ["test1@google.com", "test2@google.com"],
         }),
       );
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(3);
     });
 
-    it('should handle valid JSON with incorrect schema by returning 0', () => {
+    it("should handle valid JSON with incorrect schema by returning 0", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(
-        accountsFile(),
-        JSON.stringify({ active: null, old: 1 }),
-      );
-      const consoleLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), JSON.stringify({ active: null, old: 1 }));
+      const consoleLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
       expect(consoleLogSpy).toHaveBeenCalled();
     });
 
-    it('should not double count if active account is also in old list', () => {
+    it("should not double count if active account is also in old list", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify({
-          active: 'test1@google.com',
-          old: ['test1@google.com', 'test2@google.com'],
+          active: "test1@google.com",
+          old: ["test1@google.com", "test2@google.com"],
         }),
       );
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(2);
diff --git a/packages/gemini-cli-core/src/utils/userAccountManager.ts b/packages/gemini-cli-core/src/utils/userAccountManager.ts
index 83d27d947..9b9d87fe5 100644
--- a/packages/gemini-cli-core/src/utils/userAccountManager.ts
+++ b/packages/gemini-cli-core/src/utils/userAccountManager.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { promises as fsp, readFileSync } from 'node:fs';
-import { Storage } from '../config/storage.js';
-import { debugLogger } from './debugLogger.js';
+import { promises as fsp, readFileSync } from "node:fs";
+import path from "node:path";
+import { Storage } from "../config/storage.js";
+import { debugLogger } from "./debugLogger.js";
 
 interface UserAccounts {
   active: string | null;
@@ -33,18 +33,17 @@ export class UserAccountManager {
     const parsed = JSON.parse(content);
 
     // Inlined validation logic
-    if (typeof parsed !== 'object' || parsed === null) {
-      debugLogger.log('Invalid accounts file schema, starting fresh.');
+    if (typeof parsed !== "object" || parsed === null) {
+      debugLogger.log("Invalid accounts file schema, starting fresh.");
       return defaultState;
     }
     const { active, old } = parsed as Partial<UserAccounts>;
     const isValid =
-      (active === undefined || active === null || typeof active === 'string') &&
-      (old === undefined ||
-        (Array.isArray(old) && old.every((i) => typeof i === 'string')));
+      (active === undefined || active === null || typeof active === "string") &&
+      (old === undefined || (Array.isArray(old) && old.every((i) => typeof i === "string")));
 
     if (!isValid) {
-      debugLogger.log('Invalid accounts file schema, starting fresh.');
+      debugLogger.log("Invalid accounts file schema, starting fresh.");
       return defaultState;
     }
 
@@ -57,20 +56,13 @@ export class UserAccountManager {
   private readAccountsSync(filePath: string): UserAccounts {
     const defaultState = { active: null, old: [] };
     try {
-      const content = readFileSync(filePath, 'utf-8');
+      const content = readFileSync(filePath, "utf-8");
       return this.parseAndValidateAccounts(content);
     } catch (error) {
-      if (
-        error instanceof Error &&
-        'code' in error &&
-        error.code === 'ENOENT'
-      ) {
+      if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return defaultState;
       }
-      debugLogger.log(
-        'Error during sync read of accounts, starting fresh.',
-        error,
-      );
+      debugLogger.log("Error during sync read of accounts, starting fresh.", error);
       return defaultState;
     }
   }
@@ -78,17 +70,13 @@ export class UserAccountManager {
   private async readAccounts(filePath: string): Promise<UserAccounts> {
     const defaultState = { active: null, old: [] };
     try {
-      const content = await fsp.readFile(filePath, 'utf-8');
+      const content = await fsp.readFile(filePath, "utf-8");
       return this.parseAndValidateAccounts(content);
     } catch (error) {
-      if (
-        error instanceof Error &&
-        'code' in error &&
-        error.code === 'ENOENT'
-      ) {
+      if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return defaultState;
       }
-      debugLogger.log('Could not parse accounts file, starting fresh.', error);
+      debugLogger.log("Could not parse accounts file, starting fresh.", error);
       return defaultState;
     }
   }
@@ -109,7 +97,7 @@ export class UserAccountManager {
     accounts.old = accounts.old.filter((oldEmail) => oldEmail !== email);
 
     accounts.active = email;
-    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), 'utf-8');
+    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), "utf-8");
   }
 
   getCachedGoogleAccount(): string | null {
@@ -139,6 +127,6 @@ export class UserAccountManager {
       accounts.active = null;
     }
 
-    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), 'utf-8');
+    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), "utf-8");
   }
 }
diff --git a/packages/gemini-cli-core/src/utils/version.test.ts b/packages/gemini-cli-core/src/utils/version.test.ts
index 775860b62..a57f68cb6 100644
--- a/packages/gemini-cli-core/src/utils/version.test.ts
+++ b/packages/gemini-cli-core/src/utils/version.test.ts
@@ -4,43 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { getVersion } from './version.js';
-import { getPackageJson } from './package.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { getPackageJson } from "./package.js";
+import { getVersion } from "./version.js";
 
-vi.mock('./package.js', () => ({
+vi.mock("./package.js", () => ({
   getPackageJson: vi.fn(),
 }));
 
-describe('version', () => {
+describe("version", () => {
   const originalEnv = process.env;
 
   beforeEach(() => {
     vi.resetModules();
     process.env = { ...originalEnv };
-    vi.mocked(getPackageJson).mockResolvedValue({ version: '1.0.0' });
+    vi.mocked(getPackageJson).mockResolvedValue({ version: "1.0.0" });
   });
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  it('should return CLI_VERSION from env if set', async () => {
-    process.env['CLI_VERSION'] = '2.0.0';
+  it("should return CLI_VERSION from env if set", async () => {
+    process.env["CLI_VERSION"] = "2.0.0";
     const version = await getVersion();
-    expect(version).toBe('2.0.0');
+    expect(version).toBe("2.0.0");
   });
 
-  it('should return version from package.json if CLI_VERSION is not set', async () => {
-    delete process.env['CLI_VERSION'];
+  it("should return version from package.json if CLI_VERSION is not set", async () => {
+    delete process.env["CLI_VERSION"];
     const version = await getVersion();
-    expect(version).toBe('1.0.0');
+    expect(version).toBe("1.0.0");
   });
 
   it('should return "unknown" if package.json is not found and CLI_VERSION is not set', async () => {
-    delete process.env['CLI_VERSION'];
+    delete process.env["CLI_VERSION"];
     vi.mocked(getPackageJson).mockResolvedValue(undefined);
     const version = await getVersion();
-    expect(version).toBe('unknown');
+    expect(version).toBe("unknown");
   });
 });
diff --git a/packages/gemini-cli-core/src/utils/version.ts b/packages/gemini-cli-core/src/utils/version.ts
index ecd7a8b50..e37af864a 100644
--- a/packages/gemini-cli-core/src/utils/version.ts
+++ b/packages/gemini-cli-core/src/utils/version.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getPackageJson } from './package.js';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { getPackageJson } from "./package.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export async function getVersion(): Promise<string> {
   const pkgJson = await getPackageJson(__dirname);
-  return process.env['CLI_VERSION'] || pkgJson?.version || 'unknown';
+  return process.env["CLI_VERSION"] || pkgJson?.version || "unknown";
 }
diff --git a/packages/gemini-cli-core/src/utils/workspaceContext.test.ts b/packages/gemini-cli-core/src/utils/workspaceContext.test.ts
index 1580aa32d..dbccc3e38 100644
--- a/packages/gemini-cli-core/src/utils/workspaceContext.test.ts
+++ b/packages/gemini-cli-core/src/utils/workspaceContext.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { WorkspaceContext } from './workspaceContext.js';
-import { debugLogger } from './debugLogger.js';
-
-describe('WorkspaceContext with real filesystem', () => {
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
+import { WorkspaceContext } from "./workspaceContext.js";
+
+describe("WorkspaceContext with real filesystem", () => {
   let tempDir: string;
   let cwd: string;
   let otherDir: string;
@@ -19,12 +19,10 @@ describe('WorkspaceContext with real filesystem', () => {
   beforeEach(() => {
     // os.tmpdir() can return a path using a symlink (this is standard on macOS)
     // Use fs.realpathSync to fully resolve the absolute path.
-    tempDir = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'workspace-context-test-')),
-    );
+    tempDir = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "workspace-context-test-")));
 
-    cwd = path.join(tempDir, 'project');
-    otherDir = path.join(tempDir, 'other-project');
+    cwd = path.join(tempDir, "project");
+    otherDir = path.join(tempDir, "other-project");
 
     fs.mkdirSync(cwd, { recursive: true });
     fs.mkdirSync(otherDir, { recursive: true });
@@ -34,22 +32,22 @@ describe('WorkspaceContext with real filesystem', () => {
     fs.rmSync(tempDir, { recursive: true, force: true });
   });
 
-  describe('initialization', () => {
-    it('should initialize with a single directory (cwd)', () => {
+  describe("initialization", () => {
+    it("should initialize with a single directory (cwd)", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const directories = workspaceContext.getDirectories();
 
       expect(directories).toEqual([cwd]);
     });
 
-    it('should validate and resolve directories to absolute paths', () => {
+    it("should validate and resolve directories to absolute paths", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
       const directories = workspaceContext.getDirectories();
 
       expect(directories).toEqual([cwd, otherDir]);
     });
 
-    it('should handle empty initialization', () => {
+    it("should handle empty initialization", () => {
       const workspaceContext = new WorkspaceContext(cwd, []);
       const directories = workspaceContext.getDirectories();
       expect(directories).toHaveLength(1);
@@ -57,8 +55,8 @@ describe('WorkspaceContext with real filesystem', () => {
     });
   });
 
-  describe('adding directories', () => {
-    it('should add valid directories', () => {
+  describe("adding directories", () => {
+    it("should add valid directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       workspaceContext.addDirectory(otherDir);
       const directories = workspaceContext.getDirectories();
@@ -66,7 +64,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(directories).toEqual([cwd, otherDir]);
     });
 
-    it('should resolve relative paths to absolute', () => {
+    it("should resolve relative paths to absolute", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const relativePath = path.relative(cwd, otherDir);
       workspaceContext.addDirectory(relativePath);
@@ -75,7 +73,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(directories).toEqual([cwd, otherDir]);
     });
 
-    it('should prevent duplicate directories', () => {
+    it("should prevent duplicate directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       workspaceContext.addDirectory(otherDir);
       workspaceContext.addDirectory(otherDir);
@@ -84,68 +82,65 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(directories).toHaveLength(2);
     });
 
-    it.skipIf(os.platform() === 'win32')(
-      'should handle symbolic links correctly',
-      () => {
-        const realDir = path.join(tempDir, 'real');
-        fs.mkdirSync(realDir, { recursive: true });
-        const symlinkDir = path.join(tempDir, 'symlink-to-real');
-        fs.symlinkSync(realDir, symlinkDir, 'dir');
-        const workspaceContext = new WorkspaceContext(cwd);
-        workspaceContext.addDirectory(symlinkDir);
+    it.skipIf(os.platform() === "win32")("should handle symbolic links correctly", () => {
+      const realDir = path.join(tempDir, "real");
+      fs.mkdirSync(realDir, { recursive: true });
+      const symlinkDir = path.join(tempDir, "symlink-to-real");
+      fs.symlinkSync(realDir, symlinkDir, "dir");
+      const workspaceContext = new WorkspaceContext(cwd);
+      workspaceContext.addDirectory(symlinkDir);
 
-        const directories = workspaceContext.getDirectories();
+      const directories = workspaceContext.getDirectories();
 
-        expect(directories).toEqual([cwd, realDir]);
-      },
-    );
+      expect(directories).toEqual([cwd, realDir]);
+    });
   });
 
-  describe('path validation', () => {
-    it('should accept paths within workspace directories', () => {
+  describe("path validation", () => {
+    it("should accept paths within workspace directories", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const validPath1 = path.join(cwd, 'src', 'file.ts');
-      const validPath2 = path.join(otherDir, 'lib', 'module.js');
+      const validPath1 = path.join(cwd, "src", "file.ts");
+      const validPath2 = path.join(otherDir, "lib", "module.js");
 
       fs.mkdirSync(path.dirname(validPath1), { recursive: true });
-      fs.writeFileSync(validPath1, 'content');
+      fs.writeFileSync(validPath1, "content");
       fs.mkdirSync(path.dirname(validPath2), { recursive: true });
-      fs.writeFileSync(validPath2, 'content');
+      fs.writeFileSync(validPath2, "content");
 
       expect(workspaceContext.isPathWithinWorkspace(validPath1)).toBe(true);
       expect(workspaceContext.isPathWithinWorkspace(validPath2)).toBe(true);
     });
 
-    it('should accept non-existent paths within workspace directories', () => {
+    it("should accept non-existent paths within workspace directories", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const validPath1 = path.join(cwd, 'src', 'file.ts');
-      const validPath2 = path.join(otherDir, 'lib', 'module.js');
+      const validPath1 = path.join(cwd, "src", "file.ts");
+      const validPath2 = path.join(otherDir, "lib", "module.js");
 
       expect(workspaceContext.isPathWithinWorkspace(validPath1)).toBe(true);
       expect(workspaceContext.isPathWithinWorkspace(validPath2)).toBe(true);
     });
 
-    it('should reject paths outside workspace', () => {
+    it("should reject paths outside workspace", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const invalidPath = path.join(tempDir, 'outside-workspace', 'file.txt');
+      const invalidPath = path.join(tempDir, "outside-workspace", "file.txt");
 
       expect(workspaceContext.isPathWithinWorkspace(invalidPath)).toBe(false);
     });
 
-    it('should reject non-existent paths outside workspace', () => {
+    it("should reject non-existent paths outside workspace", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const invalidPath = path.join(tempDir, 'outside-workspace', 'file.txt');
+      const invalidPath = path.join(tempDir, "outside-workspace", "file.txt");
 
       expect(workspaceContext.isPathWithinWorkspace(invalidPath)).toBe(false);
     });
 
-    it('should handle nested directories correctly', () => {
+    it("should handle nested directories correctly", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const nestedPath = path.join(cwd, 'deeply', 'nested', 'path', 'file.txt');
+      const nestedPath = path.join(cwd, "deeply", "nested", "path", "file.txt");
       expect(workspaceContext.isPathWithinWorkspace(nestedPath)).toBe(true);
     });
 
-    it('should handle edge cases (root, parent references)', () => {
+    it("should handle edge cases (root, parent references)", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
       const rootPath = path.parse(tempDir).root;
       const parentPath = path.dirname(cwd);
@@ -154,42 +149,40 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(workspaceContext.isPathWithinWorkspace(parentPath)).toBe(false);
     });
 
-    it('should handle non-existent paths correctly', () => {
+    it("should handle non-existent paths correctly", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const nonExistentPath = path.join(cwd, 'does-not-exist.txt');
-      expect(workspaceContext.isPathWithinWorkspace(nonExistentPath)).toBe(
-        true,
-      );
+      const nonExistentPath = path.join(cwd, "does-not-exist.txt");
+      expect(workspaceContext.isPathWithinWorkspace(nonExistentPath)).toBe(true);
     });
 
-    describe.skipIf(os.platform() === 'win32')('with symbolic link', () => {
-      describe('in the workspace', () => {
+    describe.skipIf(os.platform() === "win32")("with symbolic link", () => {
+      describe("in the workspace", () => {
         let realDir: string;
         let symlinkDir: string;
         beforeEach(() => {
-          realDir = path.join(cwd, 'real-dir');
+          realDir = path.join(cwd, "real-dir");
           fs.mkdirSync(realDir, { recursive: true });
 
-          symlinkDir = path.join(cwd, 'symlink-file');
-          fs.symlinkSync(realDir, symlinkDir, 'dir');
+          symlinkDir = path.join(cwd, "symlink-file");
+          fs.symlinkSync(realDir, symlinkDir, "dir");
         });
 
-        it('should accept dir paths', () => {
+        it("should accept dir paths", () => {
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(symlinkDir)).toBe(true);
         });
 
-        it('should accept non-existent paths', () => {
-          const filePath = path.join(symlinkDir, 'does-not-exist.txt');
+        it("should accept non-existent paths", () => {
+          const filePath = path.join(symlinkDir, "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(filePath)).toBe(true);
         });
 
-        it('should accept non-existent deep paths', () => {
-          const filePath = path.join(symlinkDir, 'deep', 'does-not-exist.txt');
+        it("should accept non-existent deep paths", () => {
+          const filePath = path.join(symlinkDir, "deep", "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
@@ -197,45 +190,43 @@ describe('WorkspaceContext with real filesystem', () => {
         });
       });
 
-      describe('outside the workspace', () => {
+      describe("outside the workspace", () => {
         let realDir: string;
         let symlinkDir: string;
         beforeEach(() => {
-          realDir = path.join(tempDir, 'real-dir');
+          realDir = path.join(tempDir, "real-dir");
           fs.mkdirSync(realDir, { recursive: true });
 
-          symlinkDir = path.join(cwd, 'symlink-file');
-          fs.symlinkSync(realDir, symlinkDir, 'dir');
+          symlinkDir = path.join(cwd, "symlink-file");
+          fs.symlinkSync(realDir, symlinkDir, "dir");
         });
 
-        it('should reject dir paths', () => {
+        it("should reject dir paths", () => {
           const workspaceContext = new WorkspaceContext(cwd);
 
-          expect(workspaceContext.isPathWithinWorkspace(symlinkDir)).toBe(
-            false,
-          );
+          expect(workspaceContext.isPathWithinWorkspace(symlinkDir)).toBe(false);
         });
 
-        it('should reject non-existent paths', () => {
-          const filePath = path.join(symlinkDir, 'does-not-exist.txt');
+        it("should reject non-existent paths", () => {
+          const filePath = path.join(symlinkDir, "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(filePath)).toBe(false);
         });
 
-        it('should reject non-existent deep paths', () => {
-          const filePath = path.join(symlinkDir, 'deep', 'does-not-exist.txt');
+        it("should reject non-existent deep paths", () => {
+          const filePath = path.join(symlinkDir, "deep", "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(filePath)).toBe(false);
         });
 
-        it('should reject partially non-existent deep paths', () => {
-          const deepDir = path.join(symlinkDir, 'deep');
+        it("should reject partially non-existent deep paths", () => {
+          const deepDir = path.join(symlinkDir, "deep");
           fs.mkdirSync(deepDir, { recursive: true });
-          const filePath = path.join(deepDir, 'does-not-exist.txt');
+          const filePath = path.join(deepDir, "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
@@ -243,36 +234,36 @@ describe('WorkspaceContext with real filesystem', () => {
         });
       });
 
-      it('should reject symbolic file links outside the workspace', () => {
-        const realFile = path.join(tempDir, 'real-file.txt');
-        fs.writeFileSync(realFile, 'content');
+      it("should reject symbolic file links outside the workspace", () => {
+        const realFile = path.join(tempDir, "real-file.txt");
+        fs.writeFileSync(realFile, "content");
 
-        const symlinkFile = path.join(cwd, 'symlink-to-real-file');
-        fs.symlinkSync(realFile, symlinkFile, 'file');
+        const symlinkFile = path.join(cwd, "symlink-to-real-file");
+        fs.symlinkSync(realFile, symlinkFile, "file");
 
         const workspaceContext = new WorkspaceContext(cwd);
 
         expect(workspaceContext.isPathWithinWorkspace(symlinkFile)).toBe(false);
       });
 
-      it('should reject non-existent symbolic file links outside the workspace', () => {
-        const realFile = path.join(tempDir, 'real-file.txt');
+      it("should reject non-existent symbolic file links outside the workspace", () => {
+        const realFile = path.join(tempDir, "real-file.txt");
 
-        const symlinkFile = path.join(cwd, 'symlink-to-real-file');
-        fs.symlinkSync(realFile, symlinkFile, 'file');
+        const symlinkFile = path.join(cwd, "symlink-to-real-file");
+        fs.symlinkSync(realFile, symlinkFile, "file");
 
         const workspaceContext = new WorkspaceContext(cwd);
 
         expect(workspaceContext.isPathWithinWorkspace(symlinkFile)).toBe(false);
       });
 
-      it('should handle circular symlinks gracefully', () => {
+      it("should handle circular symlinks gracefully", () => {
         const workspaceContext = new WorkspaceContext(cwd);
-        const linkA = path.join(cwd, 'link-a');
-        const linkB = path.join(cwd, 'link-b');
+        const linkA = path.join(cwd, "link-a");
+        const linkB = path.join(cwd, "link-b");
         // Create a circular dependency: linkA -> linkB -> linkA
-        fs.symlinkSync(linkB, linkA, 'dir');
-        fs.symlinkSync(linkA, linkB, 'dir');
+        fs.symlinkSync(linkB, linkA, "dir");
+        fs.symlinkSync(linkA, linkB, "dir");
 
         // fs.realpathSync should throw ELOOP, and isPathWithinWorkspace should
         // handle it gracefully and return false.
@@ -282,8 +273,8 @@ describe('WorkspaceContext with real filesystem', () => {
     });
   });
 
-  describe('onDirectoriesChanged', () => {
-    it('should call listener when adding a directory', () => {
+  describe("onDirectoriesChanged", () => {
+    it("should call listener when adding a directory", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(listener);
@@ -293,7 +284,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).toHaveBeenCalledOnce();
     });
 
-    it('should not call listener when adding a duplicate directory', () => {
+    it("should not call listener when adding a duplicate directory", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       workspaceContext.addDirectory(otherDir);
       const listener = vi.fn();
@@ -304,7 +295,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).not.toHaveBeenCalled();
     });
 
-    it('should call listener when setting different directories', () => {
+    it("should call listener when setting different directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(listener);
@@ -314,7 +305,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).toHaveBeenCalledOnce();
     });
 
-    it('should not call listener when setting same directories', () => {
+    it("should not call listener when setting same directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(listener);
@@ -324,7 +315,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).not.toHaveBeenCalled();
     });
 
-    it('should support multiple listeners', () => {
+    it("should support multiple listeners", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener1 = vi.fn();
       const listener2 = vi.fn();
@@ -337,7 +328,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener2).toHaveBeenCalledOnce();
     });
 
-    it('should allow unsubscribing a listener', () => {
+    it("should allow unsubscribing a listener", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       const unsubscribe = workspaceContext.onDirectoriesChanged(listener);
@@ -348,10 +339,10 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).not.toHaveBeenCalled();
     });
 
-    it('should not fail if a listener throws an error', () => {
+    it("should not fail if a listener throws an error", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const errorListener = () => {
-        throw new Error('test error');
+        throw new Error("test error");
       };
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(errorListener);
@@ -364,8 +355,8 @@ describe('WorkspaceContext with real filesystem', () => {
     });
   });
 
-  describe('getDirectories', () => {
-    it('should return a copy of directories array', () => {
+  describe("getDirectories", () => {
+    it("should return a copy of directories array", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const dirs1 = workspaceContext.getDirectories();
       const dirs2 = workspaceContext.getDirectories();
@@ -376,7 +367,7 @@ describe('WorkspaceContext with real filesystem', () => {
   });
 });
 
-describe('WorkspaceContext with optional directories', () => {
+describe("WorkspaceContext with optional directories", () => {
   let tempDir: string;
   let cwd: string;
   let existingDir1: string;
@@ -385,18 +376,18 @@ describe('WorkspaceContext with optional directories', () => {
 
   beforeEach(() => {
     tempDir = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'workspace-context-optional-')),
+      fs.mkdtempSync(path.join(os.tmpdir(), "workspace-context-optional-")),
     );
-    cwd = path.join(tempDir, 'project');
-    existingDir1 = path.join(tempDir, 'existing-dir-1');
-    existingDir2 = path.join(tempDir, 'existing-dir-2');
-    nonExistentDir = path.join(tempDir, 'non-existent-dir');
+    cwd = path.join(tempDir, "project");
+    existingDir1 = path.join(tempDir, "existing-dir-1");
+    existingDir2 = path.join(tempDir, "existing-dir-2");
+    nonExistentDir = path.join(tempDir, "non-existent-dir");
 
     fs.mkdirSync(cwd, { recursive: true });
     fs.mkdirSync(existingDir1, { recursive: true });
     fs.mkdirSync(existingDir2, { recursive: true });
 
-    vi.spyOn(debugLogger, 'warn').mockImplementation(() => {});
+    vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -404,11 +395,8 @@ describe('WorkspaceContext with optional directories', () => {
     vi.restoreAllMocks();
   });
 
-  it('should skip a missing optional directory and log a warning', () => {
-    const workspaceContext = new WorkspaceContext(cwd, [
-      nonExistentDir,
-      existingDir1,
-    ]);
+  it("should skip a missing optional directory and log a warning", () => {
+    const workspaceContext = new WorkspaceContext(cwd, [nonExistentDir, existingDir1]);
     const directories = workspaceContext.getDirectories();
     expect(directories).toEqual([cwd, existingDir1]);
     expect(debugLogger.warn).toHaveBeenCalledTimes(1);
@@ -417,7 +405,7 @@ describe('WorkspaceContext with optional directories', () => {
     );
   });
 
-  it('should include an existing optional directory', () => {
+  it("should include an existing optional directory", () => {
     const workspaceContext = new WorkspaceContext(cwd, [existingDir1]);
     const directories = workspaceContext.getDirectories();
     expect(directories).toEqual([cwd, existingDir1]);
diff --git a/packages/gemini-cli-core/src/utils/workspaceContext.ts b/packages/gemini-cli-core/src/utils/workspaceContext.ts
index c1da8794b..dc3928598 100755
--- a/packages/gemini-cli-core/src/utils/workspaceContext.ts
+++ b/packages/gemini-cli-core/src/utils/workspaceContext.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isNodeError } from '../utils/errors.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { debugLogger } from './debugLogger.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { isNodeError } from "../utils/errors.js";
+import { debugLogger } from "./debugLogger.js";
 
 export type Unsubscribe = () => void;
 
@@ -155,7 +155,7 @@ export class WorkspaceContext {
     } catch (e: unknown) {
       if (
         isNodeError(e) &&
-        e.code === 'ENOENT' &&
+        e.code === "ENOENT" &&
         e.path &&
         // realpathSync does not set e.path correctly for symlinks to
         // non-existent files.
@@ -174,16 +174,9 @@ export class WorkspaceContext {
    * @param rootDirectory The absolute root directory
    * @returns True if the path is within the root directory, false otherwise
    */
-  private isPathWithinRoot(
-    pathToCheck: string,
-    rootDirectory: string,
-  ): boolean {
+  private isPathWithinRoot(pathToCheck: string, rootDirectory: string): boolean {
     const relative = path.relative(rootDirectory, pathToCheck);
-    return (
-      !relative.startsWith(`..${path.sep}`) &&
-      relative !== '..' &&
-      !path.isAbsolute(relative)
-    );
+    return !relative.startsWith(`..${path.sep}`) && relative !== ".." && !path.isAbsolute(relative);
   }
 
   /**
@@ -191,7 +184,7 @@ export class WorkspaceContext {
    */
   private isFileSymlink(filePath: string): boolean {
     try {
-      return !fs.readlinkSync(filePath).endsWith('/');
+      return !fs.readlinkSync(filePath).endsWith("/");
     } catch (_error) {
       return false;
     }
diff --git a/packages/gemini-core/src/__mocks__/fs/promises.ts b/packages/gemini-core/src/__mocks__/fs/promises.ts
index 423859111..78f96e8d5 100644
--- a/packages/gemini-core/src/__mocks__/fs/promises.ts
+++ b/packages/gemini-core/src/__mocks__/fs/promises.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import * as actualFsPromises from 'node:fs/promises';
+import * as actualFsPromises from "node:fs/promises";
+import { vi } from "vitest";
 
 const readFileMock = vi.fn();
 
diff --git a/packages/gemini-core/src/agents/codebase-investigator.test.ts b/packages/gemini-core/src/agents/codebase-investigator.test.ts
index 3d8453cb9..b7c1beb63 100644
--- a/packages/gemini-core/src/agents/codebase-investigator.test.ts
+++ b/packages/gemini-core/src/agents/codebase-investigator.test.ts
@@ -4,30 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { CodebaseInvestigatorAgent } from './codebase-investigator.js';
+import { describe, expect, it } from "vitest";
+import { DEFAULT_GEMINI_MODEL } from "../config/models.js";
 import {
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
   LS_TOOL_NAME,
   READ_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { DEFAULT_GEMINI_MODEL } from '../config/models.js';
+} from "../tools/tool-names.js";
+import { CodebaseInvestigatorAgent } from "./codebase-investigator.js";
 
-describe('CodebaseInvestigatorAgent', () => {
-  it('should have the correct agent definition', () => {
-    expect(CodebaseInvestigatorAgent.name).toBe('codebase_investigator');
-    expect(CodebaseInvestigatorAgent.displayName).toBe(
-      'Codebase Investigator Agent',
-    );
+describe("CodebaseInvestigatorAgent", () => {
+  it("should have the correct agent definition", () => {
+    expect(CodebaseInvestigatorAgent.name).toBe("codebase_investigator");
+    expect(CodebaseInvestigatorAgent.displayName).toBe("Codebase Investigator Agent");
     expect(CodebaseInvestigatorAgent.description).toBeDefined();
-    expect(
-      CodebaseInvestigatorAgent.inputConfig.inputs['objective'].required,
-    ).toBe(true);
-    expect(CodebaseInvestigatorAgent.outputConfig?.outputName).toBe('report');
-    expect(CodebaseInvestigatorAgent.modelConfig?.model).toBe(
-      DEFAULT_GEMINI_MODEL,
-    );
+    expect(CodebaseInvestigatorAgent.inputConfig.inputs["objective"].required).toBe(true);
+    expect(CodebaseInvestigatorAgent.outputConfig?.outputName).toBe("report");
+    expect(CodebaseInvestigatorAgent.modelConfig?.model).toBe(DEFAULT_GEMINI_MODEL);
     expect(CodebaseInvestigatorAgent.toolConfig?.tools).toEqual([
       LS_TOOL_NAME,
       READ_FILE_TOOL_NAME,
@@ -36,10 +30,10 @@ describe('CodebaseInvestigatorAgent', () => {
     ]);
   });
 
-  it('should process output to a formatted JSON string', () => {
+  it("should process output to a formatted JSON string", () => {
     const report = {
-      SummaryOfFindings: 'summary',
-      ExplorationTrace: ['trace'],
+      SummaryOfFindings: "summary",
+      ExplorationTrace: ["trace"],
       RelevantLocations: [],
     };
     const processed = CodebaseInvestigatorAgent.processOutput?.(report);
diff --git a/packages/gemini-core/src/agents/codebase-investigator.ts b/packages/gemini-core/src/agents/codebase-investigator.ts
index 94181205d..49cc08382 100644
--- a/packages/gemini-core/src/agents/codebase-investigator.ts
+++ b/packages/gemini-core/src/agents/codebase-investigator.ts
@@ -4,28 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AgentDefinition } from './types.js';
+import { z } from "zod";
+import { DEFAULT_GEMINI_MODEL } from "../config/models.js";
 import {
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
   LS_TOOL_NAME,
   READ_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { DEFAULT_GEMINI_MODEL } from '../config/models.js';
-import { z } from 'zod';
+} from "../tools/tool-names.js";
+import type { AgentDefinition } from "./types.js";
 
 // Define a type that matches the outputConfig schema for type safety.
 const CodebaseInvestigationReportSchema = z.object({
   SummaryOfFindings: z
     .string()
-    .describe(
-      "A summary of the investigation's conclusions and insights for the main agent.",
-    ),
+    .describe("A summary of the investigation's conclusions and insights for the main agent."),
   ExplorationTrace: z
     .array(z.string())
-    .describe(
-      'A step-by-step list of actions and tools used during the investigation.',
-    ),
+    .describe("A step-by-step list of actions and tools used during the investigation."),
   RelevantLocations: z
     .array(
       z.object({
@@ -34,63 +30,62 @@ const CodebaseInvestigationReportSchema = z.object({
         KeySymbols: z.array(z.string()),
       }),
     )
-    .describe('A list of relevant files and the key symbols within them.'),
+    .describe("A list of relevant files and the key symbols within them."),
 });
 
 /**
  * A Proof-of-Concept subagent specialized in analyzing codebase structure,
  * dependencies, and technologies.
  */
-export const CodebaseInvestigatorAgent: AgentDefinition<
-  typeof CodebaseInvestigationReportSchema
-> = {
-  name: 'codebase_investigator',
-  displayName: 'Codebase Investigator Agent',
-  description: `The specialized tool for codebase analysis, architectural mapping, and understanding system-wide dependencies. 
+export const CodebaseInvestigatorAgent: AgentDefinition<typeof CodebaseInvestigationReportSchema> =
+  {
+    name: "codebase_investigator",
+    displayName: "Codebase Investigator Agent",
+    description: `The specialized tool for codebase analysis, architectural mapping, and understanding system-wide dependencies. 
     Invoke this tool for tasks like vague requests, bug root-cause analysis, system refactoring, comprehensive feature implementation or to answer questions about the codebase that require investigation. 
     It returns a structured report with key file paths, symbols, and actionable architectural insights.`,
-  inputConfig: {
-    inputs: {
-      objective: {
-        description: `A comprehensive and detailed description of the user's ultimate goal. 
+    inputConfig: {
+      inputs: {
+        objective: {
+          description: `A comprehensive and detailed description of the user's ultimate goal. 
           You must include original user's objective as well as questions and any extra context and questions you may have.`,
-        type: 'string',
-        required: true,
+          type: "string",
+          required: true,
+        },
       },
     },
-  },
-  outputConfig: {
-    outputName: 'report',
-    description: 'The final investigation report as a JSON object.',
-    schema: CodebaseInvestigationReportSchema,
-  },
+    outputConfig: {
+      outputName: "report",
+      description: "The final investigation report as a JSON object.",
+      schema: CodebaseInvestigationReportSchema,
+    },
 
-  // The 'output' parameter is now strongly typed as CodebaseInvestigationReportSchema
-  processOutput: (output) => JSON.stringify(output, null, 2),
+    // The 'output' parameter is now strongly typed as CodebaseInvestigationReportSchema
+    processOutput: (output) => JSON.stringify(output, null, 2),
 
-  modelConfig: {
-    model: DEFAULT_GEMINI_MODEL,
-    temp: 0.1,
-    top_p: 0.95,
-    thinkingBudget: -1,
-  },
+    modelConfig: {
+      model: DEFAULT_GEMINI_MODEL,
+      temp: 0.1,
+      top_p: 0.95,
+      thinkingBudget: -1,
+    },
 
-  runConfig: {
-    max_time_minutes: 5,
-    max_turns: 15,
-  },
+    runConfig: {
+      max_time_minutes: 5,
+      max_turns: 15,
+    },
 
-  toolConfig: {
-    // Grant access only to read-only tools.
-    tools: [LS_TOOL_NAME, READ_FILE_TOOL_NAME, GLOB_TOOL_NAME, GREP_TOOL_NAME],
-  },
+    toolConfig: {
+      // Grant access only to read-only tools.
+      tools: [LS_TOOL_NAME, READ_FILE_TOOL_NAME, GLOB_TOOL_NAME, GREP_TOOL_NAME],
+    },
 
-  promptConfig: {
-    query: `Your task is to do a deep investigation of the codebase to find all relevant files, code locations, architectural mental map and insights to solve  for the following user objective:
+    promptConfig: {
+      query: `Your task is to do a deep investigation of the codebase to find all relevant files, code locations, architectural mental map and insights to solve  for the following user objective:
 <objective>
 \${objective}
 </objective>`,
-    systemPrompt: `You are **Codebase Investigator**, a hyper-specialized AI agent and an expert in reverse-engineering complex software projects. You are a sub-agent within a larger development system.
+      systemPrompt: `You are **Codebase Investigator**, a hyper-specialized AI agent and an expert in reverse-engineering complex software projects. You are a sub-agent within a larger development system.
 Your **SOLE PURPOSE** is to build a complete mental model of the code relevant to a given investigation. You must identify all relevant files, understand their roles, and foresee the direct architectural consequences of potential changes.
 You are a sub-agent in a larger system. Your only responsibility is to provide deep, actionable context.
 - **DO:** Find the key modules, classes, and functions that are part of the problem and its solution.
@@ -149,5 +144,5 @@ When you are finished, you **MUST** call the \`complete_task\` tool. The \`repor
 }
 \`\`\`
 `,
-  },
-};
+    },
+  };
diff --git a/packages/gemini-core/src/agents/executor.test.ts b/packages/gemini-core/src/agents/executor.test.ts
index 960dc30bd..bd3484608 100644
--- a/packages/gemini-core/src/agents/executor.test.ts
+++ b/packages/gemini-core/src/agents/executor.test.ts
@@ -5,78 +5,51 @@
  */
 
 import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { AgentExecutor, type ActivityCallback } from './executor.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { LSTool } from '../tools/ls.js';
-import { LS_TOOL_NAME, READ_FILE_TOOL_NAME } from '../tools/tool-names.js';
-import {
-  GeminiChat,
-  StreamEventType,
-  type StreamEvent,
-} from '../core/geminiChat.js';
-import {
+  type Content,
   type FunctionCall,
-  type Part,
-  type GenerateContentResponse,
   type GenerateContentConfig,
-  type Content,
-} from '@google/genai';
-import type { Config } from '../config/config.js';
-import { MockTool } from '../test-utils/mock-tool.js';
-import { getDirectoryContextString } from '../utils/environmentContext.js';
-import { z } from 'zod';
-import { promptIdContext } from '../utils/promptIdContext.js';
-import {
-  logAgentStart,
-  logAgentFinish,
-  logRecoveryAttempt,
-} from '../telemetry/loggers.js';
-import {
-  AgentStartEvent,
-  AgentFinishEvent,
-  RecoveryAttemptEvent,
-} from '../telemetry/types.js';
-import type {
-  AgentDefinition,
-  AgentInputs,
-  SubagentActivityEvent,
-  OutputConfig,
-} from './types.js';
-import { AgentTerminateMode } from './types.js';
-import type { AnyDeclarativeTool, AnyToolInvocation } from '../tools/tools.js';
-import { CompressionStatus } from '../core/turn.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-
-const { mockSendMessageStream, mockExecuteToolCall, mockCompress } = vi.hoisted(
-  () => ({
-    mockSendMessageStream: vi.fn(),
-    mockExecuteToolCall: vi.fn(),
-    mockCompress: vi.fn(),
-  }),
-);
+  type GenerateContentResponse,
+  type Part,
+} from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { z } from "zod";
+import type { Config } from "../config/config.js";
+import { GeminiChat, type StreamEvent, StreamEventType } from "../core/geminiChat.js";
+import { CompressionStatus } from "../core/turn.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import { logAgentFinish, logAgentStart, logRecoveryAttempt } from "../telemetry/loggers.js";
+import { AgentFinishEvent, AgentStartEvent, RecoveryAttemptEvent } from "../telemetry/types.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { LSTool } from "../tools/ls.js";
+import { LS_TOOL_NAME, READ_FILE_TOOL_NAME } from "../tools/tool-names.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import type { AnyDeclarativeTool, AnyToolInvocation } from "../tools/tools.js";
+import { getDirectoryContextString } from "../utils/environmentContext.js";
+import { promptIdContext } from "../utils/promptIdContext.js";
+import { type ActivityCallback, AgentExecutor } from "./executor.js";
+import type { AgentDefinition, AgentInputs, OutputConfig, SubagentActivityEvent } from "./types.js";
+import { AgentTerminateMode } from "./types.js";
+
+const { mockSendMessageStream, mockExecuteToolCall, mockCompress } = vi.hoisted(() => ({
+  mockSendMessageStream: vi.fn(),
+  mockExecuteToolCall: vi.fn(),
+  mockCompress: vi.fn(),
+}));
 
 let mockChatHistory: Content[] = [];
 const mockSetHistory = vi.fn((newHistory: Content[]) => {
   mockChatHistory = newHistory;
 });
 
-vi.mock('../services/chatCompressionService.js', () => ({
+vi.mock("../services/chatCompressionService.js", () => ({
   ChatCompressionService: vi.fn().mockImplementation(() => ({
     compress: mockCompress,
   })),
 }));
 
-vi.mock('../core/geminiChat.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../core/geminiChat.js')>();
+vi.mock("../core/geminiChat.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../core/geminiChat.js")>();
   return {
     ...actual,
     GeminiChat: vi.fn().mockImplementation(() => ({
@@ -87,21 +60,20 @@ vi.mock('../core/geminiChat.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../core/nonInteractiveToolExecutor.js', () => ({
+vi.mock("../core/nonInteractiveToolExecutor.js", () => ({
   executeToolCall: mockExecuteToolCall,
 }));
 
-vi.mock('../utils/environmentContext.js');
+vi.mock("../utils/environmentContext.js");
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logAgentStart: vi.fn(),
   logAgentFinish: vi.fn(),
   logRecoveryAttempt: vi.fn(),
 }));
 
-vi.mock('../utils/promptIdContext.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../utils/promptIdContext.js')>();
+vi.mock("../utils/promptIdContext.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/promptIdContext.js")>();
   return {
     ...actual,
     promptIdContext: {
@@ -120,8 +92,8 @@ const mockedLogAgentFinish = vi.mocked(logAgentFinish);
 const mockedLogRecoveryAttempt = vi.mocked(logRecoveryAttempt);
 
 // Constants for testing
-const TASK_COMPLETE_TOOL_NAME = 'complete_task';
-const MOCK_TOOL_NOT_ALLOWED = new MockTool({ name: 'write_file_interactive' });
+const TASK_COMPLETE_TOOL_NAME = "complete_task";
+const MOCK_TOOL_NOT_ALLOWED = new MockTool({ name: "write_file_interactive" });
 
 /**
  * Helper to create a mock API response chunk.
@@ -132,18 +104,14 @@ const createMockResponseChunk = (
   functionCalls?: FunctionCall[],
 ): GenerateContentResponse =>
   ({
-    candidates: [{ index: 0, content: { role: 'model', parts } }],
+    candidates: [{ index: 0, content: { role: "model", parts } }],
     ...(functionCalls && functionCalls.length > 0 ? { functionCalls } : {}),
   }) as unknown as GenerateContentResponse;
 
 /**
  * Helper to mock a single turn of model response in the stream.
  */
-const mockModelResponse = (
-  functionCalls: FunctionCall[],
-  thought?: string,
-  text?: string,
-) => {
+const mockModelResponse = (functionCalls: FunctionCall[], thought?: string, text?: string) => {
   const parts: Part[] = [];
   if (thought) {
     parts.push({
@@ -184,35 +152,35 @@ let parentToolRegistry: ToolRegistry;
  */
 const createTestDefinition = <TOutput extends z.ZodTypeAny>(
   tools: Array<string | MockTool> = [LS_TOOL_NAME],
-  runConfigOverrides: Partial<AgentDefinition<TOutput>['runConfig']> = {},
-  outputConfigMode: 'default' | 'none' = 'default',
+  runConfigOverrides: Partial<AgentDefinition<TOutput>["runConfig"]> = {},
+  outputConfigMode: "default" | "none" = "default",
   schema: TOutput = z.string() as unknown as TOutput,
 ): AgentDefinition<TOutput> => {
   let outputConfig: OutputConfig<TOutput> | undefined;
 
-  if (outputConfigMode === 'default') {
+  if (outputConfigMode === "default") {
     outputConfig = {
-      outputName: 'finalResult',
-      description: 'The final result.',
+      outputName: "finalResult",
+      description: "The final result.",
       schema,
     };
   }
 
   return {
-    name: 'TestAgent',
-    description: 'An agent for testing.',
+    name: "TestAgent",
+    description: "An agent for testing.",
     inputConfig: {
-      inputs: { goal: { type: 'string', required: true, description: 'goal' } },
+      inputs: { goal: { type: "string", required: true, description: "goal" } },
     },
-    modelConfig: { model: 'gemini-test-model', temp: 0, top_p: 1 },
+    modelConfig: { model: "gemini-test-model", temp: 0, top_p: 1 },
     runConfig: { max_time_minutes: 5, max_turns: 5, ...runConfigOverrides },
-    promptConfig: { systemPrompt: 'Achieve the goal: ${goal}.' },
+    promptConfig: { systemPrompt: "Achieve the goal: ${goal}." },
     toolConfig: { tools },
     outputConfig,
   };
 };
 
-describe('AgentExecutor', () => {
+describe("AgentExecutor", () => {
   let activities: SubagentActivityEvent[];
   let onActivity: ActivityCallback;
   let abortController: AbortController;
@@ -252,18 +220,12 @@ describe('AgentExecutor', () => {
     mockConfig = makeFakeConfig();
     parentToolRegistry = new ToolRegistry(mockConfig);
     parentToolRegistry.registerTool(new LSTool(mockConfig));
-    parentToolRegistry.registerTool(
-      new MockTool({ name: READ_FILE_TOOL_NAME }),
-    );
+    parentToolRegistry.registerTool(new MockTool({ name: READ_FILE_TOOL_NAME }));
     parentToolRegistry.registerTool(MOCK_TOOL_NOT_ALLOWED);
 
-    vi.spyOn(mockConfig, 'getToolRegistry').mockResolvedValue(
-      parentToolRegistry,
-    );
+    vi.spyOn(mockConfig, "getToolRegistry").mockResolvedValue(parentToolRegistry);
 
-    mockedGetDirectoryContextString.mockResolvedValue(
-      'Mocked Environment Context',
-    );
+    mockedGetDirectoryContextString.mockResolvedValue("Mocked Environment Context");
 
     activities = [];
     onActivity = (activity) => activities.push(activity);
@@ -275,36 +237,25 @@ describe('AgentExecutor', () => {
     vi.useRealTimers();
   });
 
-  describe('create (Initialization and Validation)', () => {
-    it('should create successfully with allowed tools', async () => {
+  describe("create (Initialization and Validation)", () => {
+    it("should create successfully with allowed tools", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
       expect(executor).toBeInstanceOf(AgentExecutor);
     });
 
-    it('SECURITY: should throw if a tool is not on the non-interactive allowlist', async () => {
+    it("SECURITY: should throw if a tool is not on the non-interactive allowlist", async () => {
       const definition = createTestDefinition([MOCK_TOOL_NOT_ALLOWED.name]);
-      await expect(
-        AgentExecutor.create(definition, mockConfig, onActivity),
-      ).rejects.toThrow(/not on the allow-list for non-interactive execution/);
+      await expect(AgentExecutor.create(definition, mockConfig, onActivity)).rejects.toThrow(
+        /not on the allow-list for non-interactive execution/,
+      );
     });
 
-    it('should create an isolated ToolRegistry for the agent', async () => {
-      const definition = createTestDefinition([
-        LS_TOOL_NAME,
-        READ_FILE_TOOL_NAME,
-      ]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+    it("should create an isolated ToolRegistry for the agent", async () => {
+      const definition = createTestDefinition([LS_TOOL_NAME, READ_FILE_TOOL_NAME]);
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      const agentRegistry = executor['toolRegistry'] as ToolRegistry;
+      const agentRegistry = executor["toolRegistry"] as ToolRegistry;
 
       expect(agentRegistry).not.toBe(parentToolRegistry);
       expect(agentRegistry.getAllToolNames()).toEqual(
@@ -314,47 +265,37 @@ describe('AgentExecutor', () => {
       expect(agentRegistry.getTool(MOCK_TOOL_NOT_ALLOWED.name)).toBeUndefined();
     });
 
-    it('should use parentPromptId from context to create agentId', async () => {
-      const parentId = 'parent-id';
+    it("should use parentPromptId from context to create agentId", async () => {
+      const parentId = "parent-id";
       mockedPromptIdContext.getStore.mockReturnValue(parentId);
 
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      expect(executor['agentId']).toMatch(
-        new RegExp(`^${parentId}-${definition.name}-`),
-      );
+      expect(executor["agentId"]).toMatch(new RegExp(`^${parentId}-${definition.name}-`));
     });
 
-    it('should correctly apply templates to initialMessages', async () => {
+    it("should correctly apply templates to initialMessages", async () => {
       const definition = createTestDefinition();
       // Override promptConfig to use initialMessages instead of systemPrompt
       definition.promptConfig = {
         initialMessages: [
-          { role: 'user', parts: [{ text: 'Goal: ${goal}' }] },
-          { role: 'model', parts: [{ text: 'OK, starting on ${goal}.' }] },
+          { role: "user", parts: [{ text: "Goal: ${goal}" }] },
+          { role: "model", parts: [{ text: "OK, starting on ${goal}." }] },
         ],
       };
-      const inputs = { goal: 'TestGoal' };
+      const inputs = { goal: "TestGoal" };
 
       // Mock a response to prevent the loop from running forever
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'done' },
-          id: 'call1',
+          args: { finalResult: "done" },
+          id: "call1",
         },
       ]);
 
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
       await executor.run(inputs, signal);
 
       const chatConstructorArgs = MockedGeminiChat.mock.calls[0];
@@ -365,30 +306,24 @@ describe('AgentExecutor', () => {
 
       // Perform checks on defined objects to satisfy TS
       const firstPart = startHistory?.[0]?.parts?.[0];
-      expect(firstPart?.text).toBe('Goal: TestGoal');
+      expect(firstPart?.text).toBe("Goal: TestGoal");
 
       const secondPart = startHistory?.[1]?.parts?.[0];
-      expect(secondPart?.text).toBe('OK, starting on TestGoal.');
+      expect(secondPart?.text).toBe("OK, starting on TestGoal.");
     });
   });
 
-  describe('run (Execution Loop and Logic)', () => {
-    it('should log AgentFinish with error if run throws', async () => {
+  describe("run (Execution Loop and Logic)", () => {
+    it("should log AgentFinish with error if run throws", async () => {
       const definition = createTestDefinition();
       // Make the definition invalid to cause an error during run
       definition.inputConfig.inputs = {
-        goal: { type: 'string', required: true, description: 'goal' },
+        goal: { type: "string", required: true, description: "goal" },
       };
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Run without inputs to trigger validation error
-      await expect(executor.run({}, signal)).rejects.toThrow(
-        /Missing required input parameters/,
-      );
+      await expect(executor.run({}, signal)).rejects.toThrow(/Missing required input parameters/);
 
       expect(mockedLogAgentStart).toHaveBeenCalledTimes(1);
       expect(mockedLogAgentFinish).toHaveBeenCalledTimes(1);
@@ -400,40 +335,33 @@ describe('AgentExecutor', () => {
       );
     });
 
-    it('should execute successfully when model calls complete_task with output (Happy Path with Output)', async () => {
+    it("should execute successfully when model calls complete_task with output (Happy Path with Output)", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const inputs: AgentInputs = { goal: 'Find files' };
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const inputs: AgentInputs = { goal: "Find files" };
 
       // Turn 1: Model calls ls
-      mockModelResponse(
-        [{ name: LS_TOOL_NAME, args: { path: '.' }, id: 'call1' }],
-        'T1: Listing',
-      );
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "call1" }], "T1: Listing");
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: 'file1.txt',
+          callId: "call1",
+          resultDisplay: "file1.txt",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
-                response: { result: 'file1.txt' },
-                id: 'call1',
+                response: { result: "file1.txt" },
+                id: "call1",
               },
             },
           ],
@@ -448,11 +376,11 @@ describe('AgentExecutor', () => {
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Found file1.txt' },
-            id: 'call2',
+            args: { finalResult: "Found file1.txt" },
+            id: "call2",
           },
         ],
-        'T2: Done',
+        "T2: Done",
       );
 
       const output = await executor.run(inputs, signal);
@@ -463,24 +391,18 @@ describe('AgentExecutor', () => {
       const chatConfig = chatConstructorArgs[1];
       const systemInstruction = chatConfig?.systemInstruction as string;
 
-      expect(systemInstruction).toContain(
-        `MUST call the \`${TASK_COMPLETE_TOOL_NAME}\` tool`,
-      );
-      expect(systemInstruction).toContain('Mocked Environment Context');
-      expect(systemInstruction).toContain(
-        'You are running in a non-interactive mode',
-      );
-      expect(systemInstruction).toContain('Always use absolute paths');
+      expect(systemInstruction).toContain(`MUST call the \`${TASK_COMPLETE_TOOL_NAME}\` tool`);
+      expect(systemInstruction).toContain("Mocked Environment Context");
+      expect(systemInstruction).toContain("You are running in a non-interactive mode");
+      expect(systemInstruction).toContain("Always use absolute paths");
 
       const turn1Params = getMockMessageParams(0);
 
       const firstToolGroup = turn1Params.config?.tools?.[0];
       expect(firstToolGroup).toBeDefined();
 
-      if (!firstToolGroup || !('functionDeclarations' in firstToolGroup)) {
-        throw new Error(
-          'Test expectation failed: Config does not contain functionDeclarations.',
-        );
+      if (!firstToolGroup || !("functionDeclarations" in firstToolGroup)) {
+        throw new Error("Test expectation failed: Config does not contain functionDeclarations.");
       }
 
       const sentTools = firstToolGroup.functionDeclarations;
@@ -493,31 +415,23 @@ describe('AgentExecutor', () => {
         ]),
       );
 
-      const completeToolDef = sentTools!.find(
-        (t) => t.name === TASK_COMPLETE_TOOL_NAME,
-      );
-      expect(completeToolDef?.parameters?.required).toContain('finalResult');
+      const completeToolDef = sentTools!.find((t) => t.name === TASK_COMPLETE_TOOL_NAME);
+      expect(completeToolDef?.parameters?.required).toContain("finalResult");
 
-      expect(output.result).toBe('Found file1.txt');
+      expect(output.result).toBe("Found file1.txt");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
 
       // Telemetry checks
       expect(mockedLogAgentStart).toHaveBeenCalledTimes(1);
-      expect(mockedLogAgentStart).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(AgentStartEvent),
-      );
+      expect(mockedLogAgentStart).toHaveBeenCalledWith(mockConfig, expect.any(AgentStartEvent));
       expect(mockedLogAgentFinish).toHaveBeenCalledTimes(1);
-      expect(mockedLogAgentFinish).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(AgentFinishEvent),
-      );
+      expect(mockedLogAgentFinish).toHaveBeenCalledWith(mockConfig, expect.any(AgentFinishEvent));
       const finishEvent = mockedLogAgentFinish.mock.calls[0][1];
       expect(finishEvent.terminate_reason).toBe(AgentTerminateMode.GOAL);
 
       // Context checks
       expect(mockedPromptIdContext.run).toHaveBeenCalledTimes(2); // Two turns
-      const agentId = executor['agentId'];
+      const agentId = executor["agentId"];
       expect(mockedPromptIdContext.run).toHaveBeenNthCalledWith(
         1,
         `${agentId}#0`,
@@ -532,62 +446,56 @@ describe('AgentExecutor', () => {
       expect(activities).toEqual(
         expect.arrayContaining([
           expect.objectContaining({
-            type: 'THOUGHT_CHUNK',
-            data: { text: 'T1: Listing' },
+            type: "THOUGHT_CHUNK",
+            data: { text: "T1: Listing" },
           }),
           expect.objectContaining({
-            type: 'TOOL_CALL_END',
-            data: { name: LS_TOOL_NAME, output: 'file1.txt' },
+            type: "TOOL_CALL_END",
+            data: { name: LS_TOOL_NAME, output: "file1.txt" },
           }),
           expect.objectContaining({
-            type: 'TOOL_CALL_START',
+            type: "TOOL_CALL_START",
             data: {
               name: TASK_COMPLETE_TOOL_NAME,
-              args: { finalResult: 'Found file1.txt' },
+              args: { finalResult: "Found file1.txt" },
             },
           }),
           expect.objectContaining({
-            type: 'TOOL_CALL_END',
+            type: "TOOL_CALL_END",
             data: {
               name: TASK_COMPLETE_TOOL_NAME,
-              output: expect.stringContaining('Output submitted'),
+              output: expect.stringContaining("Output submitted"),
             },
           }),
         ]),
       );
     });
 
-    it('should execute successfully when model calls complete_task without output (Happy Path No Output)', async () => {
-      const definition = createTestDefinition([LS_TOOL_NAME], {}, 'none');
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+    it("should execute successfully when model calls complete_task without output (Happy Path No Output)", async () => {
+      const definition = createTestDefinition([LS_TOOL_NAME], {}, "none");
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '.' }, id: 'call1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "call1" }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: 'ok',
+          callId: "call1",
+          resultDisplay: "ok",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
                 response: {},
-                id: 'call1',
+                id: "call1",
               },
             },
           ],
@@ -598,68 +506,56 @@ describe('AgentExecutor', () => {
       });
 
       mockModelResponse(
-        [{ name: TASK_COMPLETE_TOOL_NAME, args: {}, id: 'call2' }],
-        'Task finished.',
+        [{ name: TASK_COMPLETE_TOOL_NAME, args: {}, id: "call2" }],
+        "Task finished.",
       );
 
-      const output = await executor.run({ goal: 'Do work' }, signal);
+      const output = await executor.run({ goal: "Do work" }, signal);
 
       const turn1Params = getMockMessageParams(0);
       const firstToolGroup = turn1Params.config?.tools?.[0];
 
       expect(firstToolGroup).toBeDefined();
-      if (!firstToolGroup || !('functionDeclarations' in firstToolGroup)) {
-        throw new Error(
-          'Test expectation failed: Config does not contain functionDeclarations.',
-        );
+      if (!firstToolGroup || !("functionDeclarations" in firstToolGroup)) {
+        throw new Error("Test expectation failed: Config does not contain functionDeclarations.");
       }
 
       const sentTools = firstToolGroup.functionDeclarations;
       expect(sentTools).toBeDefined();
 
-      const completeToolDef = sentTools!.find(
-        (t) => t.name === TASK_COMPLETE_TOOL_NAME,
-      );
+      const completeToolDef = sentTools!.find((t) => t.name === TASK_COMPLETE_TOOL_NAME);
       expect(completeToolDef?.parameters?.required).toEqual([]);
-      expect(completeToolDef?.description).toContain(
-        'signal that you have completed',
-      );
+      expect(completeToolDef?.description).toContain("signal that you have completed");
 
-      expect(output.result).toBe('Task completed successfully.');
+      expect(output.result).toBe("Task completed successfully.");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
     });
 
-    it('should error immediately if the model stops tools without calling complete_task (Protocol Violation)', async () => {
+    it("should error immediately if the model stops tools without calling complete_task (Protocol Violation)", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '.' }, id: 'call1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "call1" }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: 'ok',
+          callId: "call1",
+          resultDisplay: "ok",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
                 response: {},
-                id: 'call1',
+                id: "call1",
               },
             },
           ],
@@ -670,20 +566,18 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 2 (protocol violation)
-      mockModelResponse([], 'I think I am done.');
+      mockModelResponse([], "I think I am done.");
 
       // Turn 3 (recovery turn - also fails)
-      mockModelResponse([], 'I still give up.');
+      mockModelResponse([], "I still give up.");
 
-      const output = await executor.run({ goal: 'Strict test' }, signal);
+      const output = await executor.run({ goal: "Strict test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(3);
 
       const expectedError = `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}'.`;
 
-      expect(output.terminate_reason).toBe(
-        AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
-      );
+      expect(output.terminate_reason).toBe(AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL);
       expect(output.result).toBe(expectedError);
 
       // Telemetry check for error
@@ -696,29 +590,25 @@ describe('AgentExecutor', () => {
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'protocol_violation',
+            context: "protocol_violation",
             error: expectedError,
           }),
         }),
       );
     });
 
-    it('should report an error if complete_task is called with missing required arguments', async () => {
+    it("should report an error if complete_task is called with missing required arguments", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Missing arg
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { wrongArg: 'oops' },
-          id: 'call1',
+          args: { wrongArg: "oops" },
+          id: "call1",
         },
       ]);
 
@@ -726,23 +616,22 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'Corrected result' },
-          id: 'call2',
+          args: { finalResult: "Corrected result" },
+          id: "call2",
         },
       ]);
 
-      const output = await executor.run({ goal: 'Error test' }, signal);
+      const output = await executor.run({ goal: "Error test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
 
-      const expectedError =
-        "Missing required argument 'finalResult' for completion.";
+      const expectedError = "Missing required argument 'finalResult' for completion.";
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: {
-            context: 'tool_call',
+            context: "tool_call",
             name: TASK_COMPLETE_TOOL_NAME,
             error: expectedError,
           },
@@ -759,67 +648,55 @@ describe('AgentExecutor', () => {
           functionResponse: expect.objectContaining({
             name: TASK_COMPLETE_TOOL_NAME,
             response: { error: expectedError },
-            id: 'call1',
+            id: "call1",
           }),
         }),
       );
 
-      expect(output.result).toBe('Corrected result');
+      expect(output.result).toBe("Corrected result");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
     });
 
-    it('should handle multiple calls to complete_task in the same turn (accept first, block rest)', async () => {
-      const definition = createTestDefinition([], {}, 'none');
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+    it("should handle multiple calls to complete_task in the same turn (accept first, block rest)", async () => {
+      const definition = createTestDefinition([], {}, "none");
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Duplicate calls
       mockModelResponse([
-        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: 'call1' },
-        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: 'call2' },
+        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: "call1" },
+        { name: TASK_COMPLETE_TOOL_NAME, args: {}, id: "call2" },
       ]);
 
-      const output = await executor.run({ goal: 'Dup test' }, signal);
+      const output = await executor.run({ goal: "Dup test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(1);
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
 
       const completions = activities.filter(
-        (a) =>
-          a.type === 'TOOL_CALL_END' &&
-          a.data['name'] === TASK_COMPLETE_TOOL_NAME,
+        (a) => a.type === "TOOL_CALL_END" && a.data["name"] === TASK_COMPLETE_TOOL_NAME,
       );
       const errors = activities.filter(
-        (a) => a.type === 'ERROR' && a.data['name'] === TASK_COMPLETE_TOOL_NAME,
+        (a) => a.type === "ERROR" && a.data["name"] === TASK_COMPLETE_TOOL_NAME,
       );
 
       expect(completions).toHaveLength(1);
       expect(errors).toHaveLength(1);
-      expect(errors[0].data['error']).toContain(
-        'Task already marked complete in this turn',
-      );
+      expect(errors[0].data["error"]).toContain("Task already marked complete in this turn");
     });
 
-    it('should execute parallel tool calls and then complete', async () => {
+    it("should execute parallel tool calls and then complete", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       const call1: FunctionCall = {
         name: LS_TOOL_NAME,
-        args: { path: '/a' },
-        id: 'c1',
+        args: { path: "/a" },
+        id: "c1",
       };
       const call2: FunctionCall = {
         name: LS_TOOL_NAME,
-        args: { path: '/b' },
-        id: 'c2',
+        args: { path: "/b" },
+        id: "c2",
       };
 
       // Turn 1: Parallel calls
@@ -837,13 +714,13 @@ describe('AgentExecutor', () => {
         if (callsStarted === 2) resolveCalls();
         await vi.advanceTimersByTimeAsync(100);
         return {
-          status: 'success',
+          status: "success",
           request: reqInfo,
           tool: {} as AnyDeclarativeTool,
           invocation: {} as AnyToolInvocation,
           response: {
             callId: reqInfo.callId,
-            resultDisplay: 'ok',
+            resultDisplay: "ok",
             responseParts: [
               {
                 functionResponse: {
@@ -864,12 +741,12 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'done' },
-          id: 'c3',
+          args: { finalResult: "done" },
+          id: "c3",
         },
       ]);
 
-      const runPromise = executor.run({ goal: 'Parallel' }, signal);
+      const runPromise = executor.run({ goal: "Parallel" }, signal);
 
       await vi.advanceTimersByTimeAsync(1);
       await bothStarted;
@@ -889,29 +766,25 @@ describe('AgentExecutor', () => {
       expect(parts).toEqual(
         expect.arrayContaining([
           expect.objectContaining({
-            functionResponse: expect.objectContaining({ id: 'c1' }),
+            functionResponse: expect.objectContaining({ id: "c1" }),
           }),
           expect.objectContaining({
-            functionResponse: expect.objectContaining({ id: 'c2' }),
+            functionResponse: expect.objectContaining({ id: "c2" }),
           }),
         ]),
       );
     });
 
-    it('SECURITY: should block unauthorized tools and provide explicit failure to model', async () => {
+    it("SECURITY: should block unauthorized tools and provide explicit failure to model", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Model tries to use a tool not in its config
-      const badCallId = 'bad_call_1';
+      const badCallId = "bad_call_1";
       mockModelResponse([
         {
           name: READ_FILE_TOOL_NAME,
-          args: { path: 'secret.txt' },
+          args: { path: "secret.txt" },
           id: badCallId,
         },
       ]);
@@ -920,16 +793,14 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'Could not read file.' },
-          id: 'c2',
+          args: { finalResult: "Could not read file." },
+          id: "c2",
         },
       ]);
 
-      const consoleWarnSpy = vi
-        .spyOn(console, 'warn')
-        .mockImplementation(() => {});
+      const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
-      await executor.run({ goal: 'Sec test' }, signal);
+      await executor.run({ goal: "Sec test" }, signal);
 
       // Verify external executor was not called (Security held)
       expect(mockExecuteToolCall).not.toHaveBeenCalled();
@@ -950,7 +821,7 @@ describe('AgentExecutor', () => {
             id: badCallId,
             name: READ_FILE_TOOL_NAME,
             response: {
-              error: expect.stringContaining('Unauthorized tool call'),
+              error: expect.stringContaining("Unauthorized tool call"),
             },
           }),
         }),
@@ -959,9 +830,9 @@ describe('AgentExecutor', () => {
       // Verify Activity Stream reported the error
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'tool_call_unauthorized',
+            context: "tool_call_unauthorized",
             name: READ_FILE_TOOL_NAME,
           }),
         }),
@@ -969,26 +840,22 @@ describe('AgentExecutor', () => {
     });
   });
 
-  describe('Edge Cases and Error Handling', () => {
-    it('should report an error if complete_task output fails schema validation', async () => {
+  describe("Edge Cases and Error Handling", () => {
+    it("should report an error if complete_task output fails schema validation", async () => {
       const definition = createTestDefinition(
         [],
         {},
-        'default',
+        "default",
         z.string().min(10), // The schema is for the output value itself
       );
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Invalid arg (too short)
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'short' },
-          id: 'call1',
+          args: { finalResult: "short" },
+          id: "call1",
         },
       ]);
 
@@ -996,12 +863,12 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'This is a much longer and valid result' },
-          id: 'call2',
+          args: { finalResult: "This is a much longer and valid result" },
+          id: "call2",
         },
       ]);
 
-      const output = await executor.run({ goal: 'Validation test' }, signal);
+      const output = await executor.run({ goal: "Validation test" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
 
@@ -1011,11 +878,11 @@ describe('AgentExecutor', () => {
       // Check that the error was reported in the activity stream
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: {
-            context: 'tool_call',
+            context: "tool_call",
             name: TASK_COMPLETE_TOOL_NAME,
-            error: expect.stringContaining('Output validation failed'),
+            error: expect.stringContaining("Output validation failed"),
           },
         }),
       );
@@ -1028,38 +895,34 @@ describe('AgentExecutor', () => {
           functionResponse: expect.objectContaining({
             name: TASK_COMPLETE_TOOL_NAME,
             response: { error: expectedError },
-            id: 'call1',
+            id: "call1",
           }),
         }),
       ]);
 
       // Check that the agent eventually succeeded
-      expect(output.result).toContain('This is a much longer and valid result');
+      expect(output.result).toContain("This is a much longer and valid result");
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
     });
 
-    it('should throw and log if GeminiChat creation fails', async () => {
+    it("should throw and log if GeminiChat creation fails", async () => {
       const definition = createTestDefinition();
-      const initError = new Error('Chat creation failed');
+      const initError = new Error("Chat creation failed");
       MockedGeminiChat.mockImplementationOnce(() => {
         throw initError;
       });
 
       // We expect the error to be thrown during the run, not creation
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
-      await expect(executor.run({ goal: 'test' }, signal)).rejects.toThrow(
+      await expect(executor.run({ goal: "test" }, signal)).rejects.toThrow(
         `Failed to create chat object: ${initError}`,
       );
 
       // Ensure the error was reported via the activity callback
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
             error: `Error: Failed to create chat object: ${initError}`,
           }),
@@ -1075,47 +938,41 @@ describe('AgentExecutor', () => {
       );
     });
 
-    it('should handle a failed tool call and feed the error to the model', async () => {
+    it("should handle a failed tool call and feed the error to the model", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME]);
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const toolErrorMessage = 'Tool failed spectacularly';
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const toolErrorMessage = "Tool failed spectacularly";
 
       // Turn 1: Model calls a tool that will fail
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '/fake' }, id: 'call1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "/fake" }, id: "call1" }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'error',
+        status: "error",
         request: {
-          callId: 'call1',
+          callId: "call1",
           name: LS_TOOL_NAME,
-          args: { path: '/fake' },
+          args: { path: "/fake" },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
-          callId: 'call1',
-          resultDisplay: '',
+          callId: "call1",
+          resultDisplay: "",
           responseParts: [
             {
               functionResponse: {
                 name: LS_TOOL_NAME,
                 response: { error: toolErrorMessage },
-                id: 'call1',
+                id: "call1",
               },
             },
           ],
           error: {
-            type: 'ToolError',
+            type: "ToolError",
             message: toolErrorMessage,
           },
-          errorType: 'ToolError',
+          errorType: "ToolError",
           contentLength: 0,
         },
       });
@@ -1124,12 +981,12 @@ describe('AgentExecutor', () => {
       mockModelResponse([
         {
           name: TASK_COMPLETE_TOOL_NAME,
-          args: { finalResult: 'Aborted due to tool failure.' },
-          id: 'call2',
+          args: { finalResult: "Aborted due to tool failure." },
+          id: "call2",
         },
       ]);
 
-      const output = await executor.run({ goal: 'Tool failure test' }, signal);
+      const output = await executor.run({ goal: "Tool failure test" }, signal);
 
       expect(mockExecuteToolCall).toHaveBeenCalledTimes(1);
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
@@ -1137,9 +994,9 @@ describe('AgentExecutor', () => {
       // Verify the error was reported in the activity stream
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: {
-            context: 'tool_call',
+            context: "tool_call",
             name: LS_TOOL_NAME,
             error: toolErrorMessage,
           },
@@ -1153,7 +1010,7 @@ describe('AgentExecutor', () => {
         expect.objectContaining({
           functionResponse: expect.objectContaining({
             name: LS_TOOL_NAME,
-            id: 'call1',
+            id: "call1",
             response: {
               error: toolErrorMessage,
             },
@@ -1162,30 +1019,28 @@ describe('AgentExecutor', () => {
       ]);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Aborted due to tool failure.');
+      expect(output.result).toBe("Aborted due to tool failure.");
     });
   });
 
-  describe('run (Termination Conditions)', () => {
+  describe("run (Termination Conditions)", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1193,33 +1048,29 @@ describe('AgentExecutor', () => {
       });
     };
 
-    it('should terminate when max_turns is reached', async () => {
+    it("should terminate when max_turns is reached", async () => {
       const MAX = 2;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
       });
       const executor = await AgentExecutor.create(definition, mockConfig);
 
-      mockWorkResponse('t1');
-      mockWorkResponse('t2');
+      mockWorkResponse("t1");
+      mockWorkResponse("t2");
       // Recovery turn
-      mockModelResponse([], 'I give up');
+      mockModelResponse([], "I give up");
 
-      const output = await executor.run({ goal: 'Turns test' }, signal);
+      const output = await executor.run({ goal: "Turns test" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.MAX_TURNS);
       expect(mockSendMessageStream).toHaveBeenCalledTimes(MAX + 1);
     });
 
-    it('should terminate with TIMEOUT if a model call takes too long', async () => {
+    it("should terminate with TIMEOUT if a model call takes too long", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 0.5, // 30 seconds
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Mock a model call that is interruptible by an abort signal.
       mockSendMessageStream.mockImplementationOnce(async (_model, params) => {
@@ -1228,16 +1079,16 @@ describe('AgentExecutor', () => {
         return (async function* () {
           await new Promise<void>((resolve) => {
             // This promise resolves when aborted, ending the generator.
-            signal?.addEventListener('abort', () => {
+            signal?.addEventListener("abort", () => {
               resolve();
             });
           });
         })();
       });
       // Recovery turn
-      mockModelResponse([], 'I give up');
+      mockModelResponse([], "I give up");
 
-      const runPromise = executor.run({ goal: 'Timeout test' }, signal);
+      const runPromise = executor.run({ goal: "Timeout test" }, signal);
 
       // Advance time past the timeout to trigger the abort.
       await vi.advanceTimersByTimeAsync(31 * 1000);
@@ -1245,16 +1096,16 @@ describe('AgentExecutor', () => {
       const output = await runPromise;
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.TIMEOUT);
-      expect(output.result).toContain('Agent timed out after 0.5 minutes.');
+      expect(output.result).toContain("Agent timed out after 0.5 minutes.");
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
 
       // Verify activity stream reported the timeout
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'timeout',
-            error: 'Agent timed out after 0.5 minutes.',
+            context: "timeout",
+            error: "Agent timed out after 0.5 minutes.",
           }),
         }),
       );
@@ -1268,27 +1119,25 @@ describe('AgentExecutor', () => {
       );
     });
 
-    it('should terminate with TIMEOUT if a tool call takes too long', async () => {
+    it("should terminate with TIMEOUT if a tool call takes too long", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 1,
       });
       const executor = await AgentExecutor.create(definition, mockConfig);
 
-      mockModelResponse([
-        { name: LS_TOOL_NAME, args: { path: '.' }, id: 't1' },
-      ]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id: "t1" }]);
 
       // Long running tool
       mockExecuteToolCall.mockImplementationOnce(async (_ctx, reqInfo) => {
         await vi.advanceTimersByTimeAsync(61 * 1000);
         return {
-          status: 'success',
+          status: "success",
           request: reqInfo,
           tool: {} as AnyDeclarativeTool,
           invocation: {} as AnyToolInvocation,
           response: {
-            callId: 't1',
-            resultDisplay: 'ok',
+            callId: "t1",
+            resultDisplay: "ok",
             responseParts: [],
             error: undefined,
             errorType: undefined,
@@ -1298,15 +1147,15 @@ describe('AgentExecutor', () => {
       });
 
       // Recovery turn
-      mockModelResponse([], 'I give up');
+      mockModelResponse([], "I give up");
 
-      const output = await executor.run({ goal: 'Timeout test' }, signal);
+      const output = await executor.run({ goal: "Timeout test" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.TIMEOUT);
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
     });
 
-    it('should terminate when AbortSignal is triggered', async () => {
+    it("should terminate when AbortSignal is triggered", async () => {
       const definition = createTestDefinition();
       const executor = await AgentExecutor.create(definition, mockConfig);
 
@@ -1314,40 +1163,36 @@ describe('AgentExecutor', () => {
         (async function* () {
           yield {
             type: StreamEventType.CHUNK,
-            value: createMockResponseChunk([
-              { text: 'Thinking...', thought: true },
-            ]),
+            value: createMockResponseChunk([{ text: "Thinking...", thought: true }]),
           } as StreamEvent;
           abortController.abort();
         })(),
       );
 
-      const output = await executor.run({ goal: 'Abort test' }, signal);
+      const output = await executor.run({ goal: "Abort test" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.ABORTED);
     });
   });
 
-  describe('run (Recovery Turns)', () => {
+  describe("run (Recovery Turns)", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1355,183 +1200,155 @@ describe('AgentExecutor', () => {
       });
     };
 
-    it('should recover successfully if complete_task is called during the grace turn after MAX_TURNS', async () => {
+    it("should recover successfully if complete_task is called during the grace turn after MAX_TURNS", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (succeeds)
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered!' },
-            id: 't2',
+            args: { finalResult: "Recovered!" },
+            id: "t2",
           },
         ],
-        'Recovering from max turns',
+        "Recovering from max turns",
       );
 
-      const output = await executor.run({ goal: 'Turns recovery' }, signal);
+      const output = await executor.run({ goal: "Turns recovery" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Recovered!');
+      expect(output.result).toBe("Recovered!");
       expect(mockSendMessageStream).toHaveBeenCalledTimes(MAX + 1); // 1 regular + 1 recovery
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
+          type: "THOUGHT_CHUNK",
           data: {
-            text: 'Execution limit reached (MAX_TURNS). Attempting one final recovery turn with a grace period.',
+            text: "Execution limit reached (MAX_TURNS). Attempting one final recovery turn with a grace period.",
           },
         }),
       );
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
-          data: { text: 'Graceful recovery succeeded.' },
+          type: "THOUGHT_CHUNK",
+          data: { text: "Graceful recovery succeeded." },
         }),
       );
     });
 
-    it('should fail if complete_task is NOT called during the grace turn after MAX_TURNS', async () => {
+    it("should fail if complete_task is NOT called during the grace turn after MAX_TURNS", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (fails by calling no tools)
-      mockModelResponse([], 'I give up again.');
+      mockModelResponse([], "I give up again.");
 
-      const output = await executor.run(
-        { goal: 'Turns recovery fail' },
-        signal,
-      );
+      const output = await executor.run({ goal: "Turns recovery fail" }, signal);
 
       expect(output.terminate_reason).toBe(AgentTerminateMode.MAX_TURNS);
-      expect(output.result).toContain('Agent reached max turns limit');
+      expect(output.result).toContain("Agent reached max turns limit");
       expect(mockSendMessageStream).toHaveBeenCalledTimes(MAX + 1);
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'recovery_turn',
-            error: 'Graceful recovery attempt failed. Reason: stop',
+            context: "recovery_turn",
+            error: "Graceful recovery attempt failed. Reason: stop",
           }),
         }),
       );
     });
 
-    it('should recover successfully from a protocol violation (no complete_task)', async () => {
+    it("should recover successfully from a protocol violation (no complete_task)", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Normal work
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Turn 2: Protocol violation (no tool calls)
-      mockModelResponse([], 'I think I am done, but I forgot the right tool.');
+      mockModelResponse([], "I think I am done, but I forgot the right tool.");
 
       // Turn 3: Recovery turn (succeeds)
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered from violation!' },
-            id: 't3',
+            args: { finalResult: "Recovered from violation!" },
+            id: "t3",
           },
         ],
-        'My mistake, here is the completion.',
+        "My mistake, here is the completion.",
       );
 
-      const output = await executor.run({ goal: 'Violation recovery' }, signal);
+      const output = await executor.run({ goal: "Violation recovery" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(3);
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Recovered from violation!');
+      expect(output.result).toBe("Recovered from violation!");
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
+          type: "THOUGHT_CHUNK",
           data: {
-            text: 'Execution limit reached (ERROR_NO_COMPLETE_TASK_CALL). Attempting one final recovery turn with a grace period.',
+            text: "Execution limit reached (ERROR_NO_COMPLETE_TASK_CALL). Attempting one final recovery turn with a grace period.",
           },
         }),
       );
     });
 
-    it('should fail recovery from a protocol violation if it violates again', async () => {
+    it("should fail recovery from a protocol violation if it violates again", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Turn 1: Normal work
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Turn 2: Protocol violation (no tool calls)
-      mockModelResponse([], 'I think I am done, but I forgot the right tool.');
+      mockModelResponse([], "I think I am done, but I forgot the right tool.");
 
       // Turn 3: Recovery turn (fails again)
-      mockModelResponse([], 'I still dont know what to do.');
+      mockModelResponse([], "I still dont know what to do.");
 
-      const output = await executor.run(
-        { goal: 'Violation recovery fail' },
-        signal,
-      );
+      const output = await executor.run({ goal: "Violation recovery fail" }, signal);
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(3);
-      expect(output.terminate_reason).toBe(
-        AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
-      );
+      expect(output.terminate_reason).toBe(AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL);
       expect(output.result).toContain(
         `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}'`,
       );
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'recovery_turn',
-            error: 'Graceful recovery attempt failed. Reason: stop',
+            context: "recovery_turn",
+            error: "Graceful recovery attempt failed. Reason: stop",
           }),
         }),
       );
     });
 
-    it('should recover successfully from a TIMEOUT', async () => {
+    it("should recover successfully from a TIMEOUT", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 0.5, // 30 seconds
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Mock a model call that gets interrupted by the timeout.
       mockSendMessageStream.mockImplementationOnce(async (_model, params) => {
@@ -1540,7 +1357,7 @@ describe('AgentExecutor', () => {
         return (async function* () {
           // This promise never resolves, it waits for abort.
           await new Promise<void>((resolve) => {
-            signal?.addEventListener('abort', () => resolve());
+            signal?.addEventListener("abort", () => resolve());
           });
         })();
       });
@@ -1550,14 +1367,14 @@ describe('AgentExecutor', () => {
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered from timeout!' },
-            id: 't2',
+            args: { finalResult: "Recovered from timeout!" },
+            id: "t2",
           },
         ],
-        'Apologies for the delay, finishing up.',
+        "Apologies for the delay, finishing up.",
       );
 
-      const runPromise = executor.run({ goal: 'Timeout recovery' }, signal);
+      const runPromise = executor.run({ goal: "Timeout recovery" }, signal);
 
       // Advance time past the timeout to trigger the abort and recovery.
       await vi.advanceTimersByTimeAsync(31 * 1000);
@@ -1566,35 +1383,29 @@ describe('AgentExecutor', () => {
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2); // 1 failed + 1 recovery
       expect(output.terminate_reason).toBe(AgentTerminateMode.GOAL);
-      expect(output.result).toBe('Recovered from timeout!');
+      expect(output.result).toBe("Recovered from timeout!");
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'THOUGHT_CHUNK',
+          type: "THOUGHT_CHUNK",
           data: {
-            text: 'Execution limit reached (TIMEOUT). Attempting one final recovery turn with a grace period.',
+            text: "Execution limit reached (TIMEOUT). Attempting one final recovery turn with a grace period.",
           },
         }),
       );
     });
 
-    it('should fail recovery from a TIMEOUT if the grace period also times out', async () => {
+    it("should fail recovery from a TIMEOUT if the grace period also times out", async () => {
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_time_minutes: 0.5, // 30 seconds
       });
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       mockSendMessageStream.mockImplementationOnce(async (_model, params) => {
         const signal = params?.config?.abortSignal;
         // eslint-disable-next-line require-yield
         return (async function* () {
-          await new Promise<void>((resolve) =>
-            signal?.addEventListener('abort', () => resolve()),
-          );
+          await new Promise<void>((resolve) => signal?.addEventListener("abort", () => resolve()));
         })();
       });
 
@@ -1603,16 +1414,11 @@ describe('AgentExecutor', () => {
         const signal = params?.config?.abortSignal;
         // eslint-disable-next-line require-yield
         return (async function* () {
-          await new Promise<void>((resolve) =>
-            signal?.addEventListener('abort', () => resolve()),
-          );
+          await new Promise<void>((resolve) => signal?.addEventListener("abort", () => resolve()));
         })();
       });
 
-      const runPromise = executor.run(
-        { goal: 'Timeout recovery fail' },
-        signal,
-      );
+      const runPromise = executor.run({ goal: "Timeout recovery fail" }, signal);
 
       // 1. Trigger the main timeout
       await vi.advanceTimersByTimeAsync(31 * 1000);
@@ -1625,39 +1431,37 @@ describe('AgentExecutor', () => {
 
       expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
       expect(output.terminate_reason).toBe(AgentTerminateMode.TIMEOUT);
-      expect(output.result).toContain('Agent timed out after 0.5 minutes.');
+      expect(output.result).toContain("Agent timed out after 0.5 minutes.");
 
       expect(activities).toContainEqual(
         expect.objectContaining({
-          type: 'ERROR',
+          type: "ERROR",
           data: expect.objectContaining({
-            context: 'recovery_turn',
-            error: 'Graceful recovery attempt failed. Reason: stop',
+            context: "recovery_turn",
+            error: "Graceful recovery attempt failed. Reason: stop",
           }),
         }),
       );
     });
   });
-  describe('Telemetry and Logging', () => {
+  describe("Telemetry and Logging", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1669,7 +1473,7 @@ describe('AgentExecutor', () => {
       mockedLogRecoveryAttempt.mockClear();
     });
 
-    it('should log a RecoveryAttemptEvent when a recoverable error occurs and recovery fails', async () => {
+    it("should log a RecoveryAttemptEvent when a recoverable error occurs and recovery fails", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
@@ -1677,12 +1481,12 @@ describe('AgentExecutor', () => {
       const executor = await AgentExecutor.create(definition, mockConfig);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (fails by calling no tools)
-      mockModelResponse([], 'I give up again.');
+      mockModelResponse([], "I give up again.");
 
-      await executor.run({ goal: 'Turns recovery fail' }, signal);
+      await executor.run({ goal: "Turns recovery fail" }, signal);
 
       expect(mockedLogRecoveryAttempt).toHaveBeenCalledTimes(1);
       const recoveryEvent = mockedLogRecoveryAttempt.mock.calls[0][1];
@@ -1694,7 +1498,7 @@ describe('AgentExecutor', () => {
       expect(recoveryEvent.duration_ms).toBeGreaterThanOrEqual(0);
     });
 
-    it('should log a successful RecoveryAttemptEvent when recovery succeeds', async () => {
+    it("should log a successful RecoveryAttemptEvent when recovery succeeds", async () => {
       const MAX = 1;
       const definition = createTestDefinition([LS_TOOL_NAME], {
         max_turns: MAX,
@@ -1702,21 +1506,21 @@ describe('AgentExecutor', () => {
       const executor = await AgentExecutor.create(definition, mockConfig);
 
       // Turn 1 (hits max_turns)
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Recovery Turn (succeeds)
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Recovered!' },
-            id: 't2',
+            args: { finalResult: "Recovered!" },
+            id: "t2",
           },
         ],
-        'Recovering from max turns',
+        "Recovering from max turns",
       );
 
-      await executor.run({ goal: 'Turns recovery success' }, signal);
+      await executor.run({ goal: "Turns recovery success" }, signal);
 
       expect(mockedLogRecoveryAttempt).toHaveBeenCalledTimes(1);
       const recoveryEvent = mockedLogRecoveryAttempt.mock.calls[0][1];
@@ -1725,26 +1529,24 @@ describe('AgentExecutor', () => {
       expect(recoveryEvent.reason).toBe(AgentTerminateMode.MAX_TURNS);
     });
   });
-  describe('Chat Compression', () => {
+  describe("Chat Compression", () => {
     const mockWorkResponse = (id: string) => {
-      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: '.' }, id }]);
+      mockModelResponse([{ name: LS_TOOL_NAME, args: { path: "." }, id }]);
       mockExecuteToolCall.mockResolvedValueOnce({
-        status: 'success',
+        status: "success",
         request: {
           callId: id,
           name: LS_TOOL_NAME,
-          args: { path: '.' },
+          args: { path: "." },
           isClientInitiated: false,
-          prompt_id: 'test-prompt',
+          prompt_id: "test-prompt",
         },
         tool: {} as AnyDeclarativeTool,
         invocation: {} as AnyToolInvocation,
         response: {
           callId: id,
-          resultDisplay: 'ok',
-          responseParts: [
-            { functionResponse: { name: LS_TOOL_NAME, response: {}, id } },
-          ],
+          resultDisplay: "ok",
+          responseParts: [{ functionResponse: { name: LS_TOOL_NAME, response: {}, id } }],
           error: undefined,
           errorType: undefined,
           contentLength: undefined,
@@ -1752,13 +1554,9 @@ describe('AgentExecutor', () => {
       });
     };
 
-    it('should attempt to compress chat history on each turn', async () => {
+    it("should attempt to compress chat history on each turn", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // Mock compression to do nothing
       mockCompress.mockResolvedValue({
@@ -1767,35 +1565,29 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 1
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
 
       // Turn 2: Complete
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 'call2',
+            args: { finalResult: "Done" },
+            id: "call2",
           },
         ],
-        'T2',
+        "T2",
       );
 
-      await executor.run({ goal: 'Compress test' }, signal);
+      await executor.run({ goal: "Compress test" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(2);
     });
 
-    it('should update chat history when compression is successful', async () => {
+    it("should update chat history when compression is successful", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const compressedHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'compressed' }] },
-      ];
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const compressedHistory: Content[] = [{ role: "user", parts: [{ text: "compressed" }] }];
 
       mockCompress.mockResolvedValue({
         newHistory: compressedHistory,
@@ -1807,34 +1599,29 @@ describe('AgentExecutor', () => {
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 'call1',
+            args: { finalResult: "Done" },
+            id: "call1",
           },
         ],
-        'T1',
+        "T1",
       );
 
-      await executor.run({ goal: 'Compress success' }, signal);
+      await executor.run({ goal: "Compress success" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(1);
       expect(mockSetHistory).toHaveBeenCalledTimes(1);
       expect(mockSetHistory).toHaveBeenCalledWith(compressedHistory);
     });
 
-    it('should pass hasFailedCompressionAttempt=true to compression after a failure', async () => {
+    it("should pass hasFailedCompressionAttempt=true to compression after a failure", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
 
       // First call fails
       mockCompress.mockResolvedValueOnce({
         newHistory: null,
         info: {
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         },
       });
       // Second call is neutral
@@ -1844,20 +1631,20 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 1
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
       // Turn 2: Complete
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 't2',
+            args: { finalResult: "Done" },
+            id: "t2",
           },
         ],
-        'T2',
+        "T2",
       );
 
-      await executor.run({ goal: 'Compress fail' }, signal);
+      await executor.run({ goal: "Compress fail" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(2);
       // First call, hasFailedCompressionAttempt is false
@@ -1866,23 +1653,16 @@ describe('AgentExecutor', () => {
       expect(mockCompress.mock.calls[1][5]).toBe(true);
     });
 
-    it('should reset hasFailedCompressionAttempt flag after a successful compression', async () => {
+    it("should reset hasFailedCompressionAttempt flag after a successful compression", async () => {
       const definition = createTestDefinition();
-      const executor = await AgentExecutor.create(
-        definition,
-        mockConfig,
-        onActivity,
-      );
-      const compressedHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'compressed' }] },
-      ];
+      const executor = await AgentExecutor.create(definition, mockConfig, onActivity);
+      const compressedHistory: Content[] = [{ role: "user", parts: [{ text: "compressed" }] }];
 
       // Turn 1: Fails
       mockCompress.mockResolvedValueOnce({
         newHistory: null,
         info: {
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         },
       });
       // Turn 2: Succeeds
@@ -1897,22 +1677,22 @@ describe('AgentExecutor', () => {
       });
 
       // Turn 1
-      mockWorkResponse('t1');
+      mockWorkResponse("t1");
       // Turn 2
-      mockWorkResponse('t2');
+      mockWorkResponse("t2");
       // Turn 3: Complete
       mockModelResponse(
         [
           {
             name: TASK_COMPLETE_TOOL_NAME,
-            args: { finalResult: 'Done' },
-            id: 't3',
+            args: { finalResult: "Done" },
+            id: "t3",
           },
         ],
-        'T3',
+        "T3",
       );
 
-      await executor.run({ goal: 'Compress reset' }, signal);
+      await executor.run({ goal: "Compress reset" }, signal);
 
       expect(mockCompress).toHaveBeenCalledTimes(3);
       // Call 1: hasFailed... is false
diff --git a/packages/gemini-core/src/agents/executor.ts b/packages/gemini-core/src/agents/executor.ts
index 598281766..e6c58a047 100644
--- a/packages/gemini-core/src/agents/executor.ts
+++ b/packages/gemini-core/src/agents/executor.ts
@@ -4,23 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { reportError } from '../utils/errorReporting.js';
-import { GeminiChat, StreamEventType } from '../core/geminiChat.js';
-import { Type } from '@google/genai';
 import type {
   Content,
-  Part,
   FunctionCall,
-  GenerateContentConfig,
   FunctionDeclaration,
+  GenerateContentConfig,
+  Part,
   Schema,
-} from '@google/genai';
-import { executeToolCall } from '../core/nonInteractiveToolExecutor.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { type ToolCallRequestInfo, CompressionStatus } from '../core/turn.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-import { getDirectoryContextString } from '../utils/environmentContext.js';
+} from "@google/genai";
+import { Type } from "@google/genai";
+import { type z } from "zod";
+import { zodToJsonSchema } from "zod-to-json-schema";
+import type { Config } from "../config/config.js";
+import { GeminiChat, StreamEventType } from "../core/geminiChat.js";
+import { executeToolCall } from "../core/nonInteractiveToolExecutor.js";
+import { CompressionStatus, type ToolCallRequestInfo } from "../core/turn.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import { logAgentFinish, logAgentStart, logRecoveryAttempt } from "../telemetry/loggers.js";
+import { AgentFinishEvent, AgentStartEvent, RecoveryAttemptEvent } from "../telemetry/types.js";
 import {
   GLOB_TOOL_NAME,
   GREP_TOOL_NAME,
@@ -29,45 +30,31 @@ import {
   READ_FILE_TOOL_NAME,
   READ_MANY_FILES_TOOL_NAME,
   WEB_SEARCH_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { promptIdContext } from '../utils/promptIdContext.js';
-import {
-  logAgentStart,
-  logAgentFinish,
-  logRecoveryAttempt,
-} from '../telemetry/loggers.js';
-import {
-  AgentStartEvent,
-  AgentFinishEvent,
-  RecoveryAttemptEvent,
-} from '../telemetry/types.js';
-import type {
-  AgentDefinition,
-  AgentInputs,
-  OutputObject,
-  SubagentActivityEvent,
-} from './types.js';
-import { AgentTerminateMode } from './types.js';
-import { templateString } from './utils.js';
-import { parseThought } from '../utils/thoughtUtils.js';
-import { type z } from 'zod';
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "../tools/tool-names.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getDirectoryContextString } from "../utils/environmentContext.js";
+import { reportError } from "../utils/errorReporting.js";
+import { promptIdContext } from "../utils/promptIdContext.js";
+import { parseThought } from "../utils/thoughtUtils.js";
+import type { AgentDefinition, AgentInputs, OutputObject, SubagentActivityEvent } from "./types.js";
+import { AgentTerminateMode } from "./types.js";
+import { templateString } from "./utils.js";
 
 /** A callback function to report on agent activity. */
 export type ActivityCallback = (activity: SubagentActivityEvent) => void;
 
-const TASK_COMPLETE_TOOL_NAME = 'complete_task';
+const TASK_COMPLETE_TOOL_NAME = "complete_task";
 const GRACE_PERIOD_MS = 60 * 1000; // 1 min
 
 /** The possible outcomes of a single agent turn. */
 type AgentTurnResult =
   | {
-      status: 'continue';
+      status: "continue";
       nextMessage: Content;
     }
   | {
-      status: 'stop';
+      status: "stop";
       terminateReason: AgentTerminateMode;
       finalResult: string | null;
     };
@@ -110,18 +97,14 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     if (definition.toolConfig) {
       for (const toolRef of definition.toolConfig.tools) {
-        if (typeof toolRef === 'string') {
+        if (typeof toolRef === "string") {
           // If the tool is referenced by name, retrieve it from the parent
           // registry and register it with the agent's isolated registry.
           const toolFromParent = parentToolRegistry.getTool(toolRef);
           if (toolFromParent) {
             agentToolRegistry.registerTool(toolFromParent);
           }
-        } else if (
-          typeof toolRef === 'object' &&
-          'name' in toolRef &&
-          'build' in toolRef
-        ) {
+        } else if (typeof toolRef === "object" && "name" in toolRef && "build" in toolRef) {
           agentToolRegistry.registerTool(toolRef);
         }
         // Note: Raw `FunctionDeclaration` objects in the config don't need to be
@@ -168,7 +151,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const randomIdPart = Math.random().toString(36).slice(2, 8);
     // parentPromptId will be undefined if this agent is invoked directly
     // (top-level), rather than as a sub-agent.
-    const parentPrefix = parentPromptId ? `${parentPromptId}-` : '';
+    const parentPrefix = parentPromptId ? `${parentPromptId}-` : "";
     this.agentId = `${parentPrefix}${this.definition.name}-${randomIdPart}`;
   }
 
@@ -200,7 +183,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         ? AgentTerminateMode.TIMEOUT
         : AgentTerminateMode.ABORTED;
       return {
-        status: 'stop',
+        status: "stop",
         terminateReason,
         finalResult: null, // 'run' method will set the final timeout string
       };
@@ -208,24 +191,27 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     // If the model stops calling tools without calling complete_task, it's an error.
     if (functionCalls.length === 0) {
-      this.emitActivity('ERROR', {
+      this.emitActivity("ERROR", {
         error: `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}' to finalize the session.`,
-        context: 'protocol_violation',
+        context: "protocol_violation",
       });
       return {
-        status: 'stop',
+        status: "stop",
         terminateReason: AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
         finalResult: null,
       };
     }
 
-    const { nextMessage, submittedOutput, taskCompleted } =
-      await this.processFunctionCalls(functionCalls, combinedSignal, promptId);
+    const { nextMessage, submittedOutput, taskCompleted } = await this.processFunctionCalls(
+      functionCalls,
+      combinedSignal,
+      promptId,
+    );
 
     if (taskCompleted) {
-      const finalResult = submittedOutput ?? 'Task completed successfully.';
+      const finalResult = submittedOutput ?? "Task completed successfully.";
       return {
-        status: 'stop',
+        status: "stop",
         terminateReason: AgentTerminateMode.GOAL,
         finalResult,
       };
@@ -233,7 +219,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     // Task is not complete, continue to the next turn.
     return {
-      status: 'continue',
+      status: "continue",
       nextMessage,
     };
   }
@@ -247,16 +233,16 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       | AgentTerminateMode.MAX_TURNS
       | AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
   ): string {
-    let explanation = '';
+    let explanation = "";
     switch (reason) {
       case AgentTerminateMode.TIMEOUT:
-        explanation = 'You have exceeded the time limit.';
+        explanation = "You have exceeded the time limit.";
         break;
       case AgentTerminateMode.MAX_TURNS:
-        explanation = 'You have exceeded the maximum number of turns.';
+        explanation = "You have exceeded the maximum number of turns.";
         break;
       case AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL:
-        explanation = 'You have stopped calling tools without finishing.';
+        explanation = "You have stopped calling tools without finishing.";
         break;
       default:
         throw new Error(`Unknown terminate reason: ${reason}`);
@@ -280,7 +266,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       | AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL,
     externalSignal: AbortSignal, // The original signal passed to run()
   ): Promise<string | null> {
-    this.emitActivity('THOUGHT_CHUNK', {
+    this.emitActivity("THOUGHT_CHUNK", {
       text: `Execution limit reached (${reason}). Attempting one final recovery turn with a grace period.`,
     });
 
@@ -290,21 +276,18 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const gracePeriodMs = GRACE_PERIOD_MS;
     const graceTimeoutController = new AbortController();
     const graceTimeoutId = setTimeout(
-      () => graceTimeoutController.abort(new Error('Grace period timed out.')),
+      () => graceTimeoutController.abort(new Error("Grace period timed out.")),
       gracePeriodMs,
     );
 
     try {
       const recoveryMessage: Content = {
-        role: 'user',
+        role: "user",
         parts: [{ text: this.getFinalWarningMessage(reason) }],
       };
 
       // We monitor both the external signal and our new grace period timeout
-      const combinedSignal = AbortSignal.any([
-        externalSignal,
-        graceTimeoutController.signal,
-      ]);
+      const combinedSignal = AbortSignal.any([externalSignal, graceTimeoutController.signal]);
 
       const turnResult = await this.executeTurn(
         chat,
@@ -315,29 +298,26 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         graceTimeoutController.signal, // Pass grace signal to identify a *grace* timeout
       );
 
-      if (
-        turnResult.status === 'stop' &&
-        turnResult.terminateReason === AgentTerminateMode.GOAL
-      ) {
+      if (turnResult.status === "stop" && turnResult.terminateReason === AgentTerminateMode.GOAL) {
         // Success!
-        this.emitActivity('THOUGHT_CHUNK', {
-          text: 'Graceful recovery succeeded.',
+        this.emitActivity("THOUGHT_CHUNK", {
+          text: "Graceful recovery succeeded.",
         });
         success = true;
-        return turnResult.finalResult ?? 'Task completed during grace period.';
+        return turnResult.finalResult ?? "Task completed during grace period.";
       }
 
       // Any other outcome (continue, error, non-GOAL stop) is a failure.
-      this.emitActivity('ERROR', {
+      this.emitActivity("ERROR", {
         error: `Graceful recovery attempt failed. Reason: ${turnResult.status}`,
-        context: 'recovery_turn',
+        context: "recovery_turn",
       });
       return null;
     } catch (error) {
       // This catch block will likely catch the 'Grace period timed out' error.
-      this.emitActivity('ERROR', {
+      this.emitActivity("ERROR", {
         error: `Graceful recovery attempt failed: ${String(error)}`,
-        context: 'recovery_turn',
+        context: "recovery_turn",
       });
       return null;
     } finally {
@@ -372,17 +352,14 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const { max_time_minutes } = this.definition.runConfig;
     const timeoutController = new AbortController();
     const timeoutId = setTimeout(
-      () => timeoutController.abort(new Error('Agent timed out.')),
+      () => timeoutController.abort(new Error("Agent timed out.")),
       max_time_minutes * 60 * 1000,
     );
 
     // Combine the external signal with the internal timeout signal.
     const combinedSignal = AbortSignal.any([signal, timeoutController.signal]);
 
-    logAgentStart(
-      this.runtimeContext,
-      new AgentStartEvent(this.agentId, this.definition.name),
-    );
+    logAgentStart(this.runtimeContext, new AgentStartEvent(this.agentId, this.definition.name));
 
     let chat: GeminiChat | undefined;
     let tools: FunctionDeclaration[] | undefined;
@@ -391,8 +368,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       tools = this.prepareToolsList();
       const query = this.definition.promptConfig.query
         ? templateString(this.definition.promptConfig.query, inputs)
-        : 'Get Started!';
-      let currentMessage: Content = { role: 'user', parts: [{ text: query }] };
+        : "Get Started!";
+      let currentMessage: Content = { role: "user", parts: [{ text: query }] };
 
       while (true) {
         // Check for termination conditions like max turns.
@@ -420,7 +397,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           timeoutController.signal,
         );
 
-        if (turnResult.status === 'stop') {
+        if (turnResult.status === "stop") {
           terminateReason = turnResult.terminateReason;
           // Only set finalResult if the turn provided one (e.g., error or goal).
           if (turnResult.finalResult) {
@@ -457,26 +434,24 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           // Recovery Failed. Set the final error message based on the *original* reason.
           if (terminateReason === AgentTerminateMode.TIMEOUT) {
             finalResult = `Agent timed out after ${this.definition.runConfig.max_time_minutes} minutes.`;
-            this.emitActivity('ERROR', {
+            this.emitActivity("ERROR", {
               error: finalResult,
-              context: 'timeout',
+              context: "timeout",
             });
           } else if (terminateReason === AgentTerminateMode.MAX_TURNS) {
             finalResult = `Agent reached max turns limit (${this.definition.runConfig.max_turns}).`;
-            this.emitActivity('ERROR', {
+            this.emitActivity("ERROR", {
               error: finalResult,
-              context: 'max_turns',
+              context: "max_turns",
             });
-          } else if (
-            terminateReason === AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL
-          ) {
+          } else if (terminateReason === AgentTerminateMode.ERROR_NO_COMPLETE_TASK_CALL) {
             // The finalResult was already set by executeTurn, but we re-emit just in case.
             finalResult =
               finalResult ||
               `Agent stopped calling tools but did not call '${TASK_COMPLETE_TOOL_NAME}'.`;
-            this.emitActivity('ERROR', {
+            this.emitActivity("ERROR", {
               error: finalResult,
-              context: 'protocol_violation',
+              context: "protocol_violation",
             });
           }
         }
@@ -485,21 +460,20 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       // === FINAL RETURN LOGIC ===
       if (terminateReason === AgentTerminateMode.GOAL) {
         return {
-          result: finalResult || 'Task completed.',
+          result: finalResult || "Task completed.",
           terminate_reason: terminateReason,
         };
       }
 
       return {
-        result:
-          finalResult || 'Agent execution was terminated before completion.',
+        result: finalResult || "Agent execution was terminated before completion.",
         terminate_reason: terminateReason,
       };
     } catch (error) {
       // Check if the error is an AbortError caused by our internal timeout.
       if (
         error instanceof Error &&
-        error.name === 'AbortError' &&
+        error.name === "AbortError" &&
         timeoutController.signal.aborted &&
         !signal.aborted // Ensure the external signal was not the cause
       ) {
@@ -528,9 +502,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
         // Recovery failed or wasn't possible
         finalResult = `Agent timed out after ${this.definition.runConfig.max_time_minutes} minutes.`;
-        this.emitActivity('ERROR', {
+        this.emitActivity("ERROR", {
           error: finalResult,
-          context: 'timeout',
+          context: "timeout",
         });
         return {
           result: finalResult,
@@ -538,7 +512,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         };
       }
 
-      this.emitActivity('ERROR', { error: String(error) });
+      this.emitActivity("ERROR", { error: String(error) });
       throw error; // Re-throw other errors or external aborts.
     } finally {
       clearTimeout(timeoutId);
@@ -555,10 +529,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     }
   }
 
-  private async tryCompressChat(
-    chat: GeminiChat,
-    prompt_id: string,
-  ): Promise<void> {
+  private async tryCompressChat(chat: GeminiChat, prompt_id: string): Promise<void> {
     const model = this.definition.modelConfig.model;
 
     const { newHistory, info } = await this.compressionService.compress(
@@ -570,10 +541,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       this.hasFailedCompressionAttempt,
     );
 
-    if (
-      info.compressionStatus ===
-      CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT
-    ) {
+    if (info.compressionStatus === CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT) {
       this.hasFailedCompressionAttempt = true;
     } else if (info.compressionStatus === CompressionStatus.COMPRESSED) {
       if (newHistory) {
@@ -610,7 +578,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     );
 
     const functionCalls: FunctionCall[] = [];
-    let textResponse = '';
+    let textResponse = "";
 
     for await (const resp of responseStream) {
       if (signal.aborted) break;
@@ -620,11 +588,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         const parts = chunk.candidates?.[0]?.content?.parts;
 
         // Extract and emit any subject "thought" content from the model.
-        const { subject } = parseThought(
-          parts?.find((p) => p.thought)?.text || '',
-        );
+        const { subject } = parseThought(parts?.find((p) => p.thought)?.text || "");
         if (subject) {
-          this.emitActivity('THOUGHT_CHUNK', { text: subject });
+          this.emitActivity("THOUGHT_CHUNK", { text: subject });
         }
 
         // Collect any function calls requested by the model.
@@ -637,7 +603,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           parts
             ?.filter((p) => !p.thought && p.text)
             .map((p) => p.text)
-            .join('') || '';
+            .join("") || "";
 
         if (text) {
           textResponse += text;
@@ -653,9 +619,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const { promptConfig, modelConfig } = this.definition;
 
     if (!promptConfig.systemPrompt && !promptConfig.initialMessages) {
-      throw new Error(
-        'PromptConfig must define either `systemPrompt` or `initialMessages`.',
-      );
+      throw new Error("PromptConfig must define either `systemPrompt` or `initialMessages`.");
     }
 
     const startHistory = this.applyTemplateToInitialMessages(
@@ -682,17 +646,13 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         generationConfig.systemInstruction = systemInstruction;
       }
 
-      return new GeminiChat(
-        this.runtimeContext,
-        generationConfig,
-        startHistory,
-      );
+      return new GeminiChat(this.runtimeContext, generationConfig, startHistory);
     } catch (error) {
       await reportError(
         error,
         `Error initializing Gemini chat for agent ${this.definition.name}.`,
         startHistory,
-        'startChat',
+        "startChat",
       );
       // Re-throw as a more specific error after reporting.
       throw new Error(`Failed to create chat object: ${error}`);
@@ -729,7 +689,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       const callId = functionCall.id ?? `${promptId}-${index}`;
       const args = (functionCall.args ?? {}) as Record<string, unknown>;
 
-      this.emitActivity('TOOL_CALL_START', {
+      this.emitActivity("TOOL_CALL_START", {
         name: functionCall.name,
         args,
       });
@@ -737,8 +697,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
       if (functionCall.name === TASK_COMPLETE_TOOL_NAME) {
         if (taskCompleted) {
           // We already have a completion from this turn. Ignore subsequent ones.
-          const error =
-            'Task already marked complete in this turn. Ignoring duplicate call.';
+          const error = "Task already marked complete in this turn. Ignoring duplicate call.";
           syncResponseParts.push({
             functionResponse: {
               name: TASK_COMPLETE_TOOL_NAME,
@@ -746,8 +705,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
               id: callId,
             },
           });
-          this.emitActivity('ERROR', {
-            context: 'tool_call',
+          this.emitActivity("ERROR", {
+            context: "tool_call",
             name: functionCall.name,
             error,
           });
@@ -773,8 +732,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
                   id: callId,
                 },
               });
-              this.emitActivity('ERROR', {
-                context: 'tool_call',
+              this.emitActivity("ERROR", {
+                context: "tool_call",
                 name: functionCall.name,
                 error,
               });
@@ -786,20 +745,20 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
               submittedOutput = this.definition.processOutput(validatedOutput);
             } else {
               submittedOutput =
-                typeof outputValue === 'string'
+                typeof outputValue === "string"
                   ? outputValue
                   : JSON.stringify(outputValue, null, 2);
             }
             syncResponseParts.push({
               functionResponse: {
                 name: TASK_COMPLETE_TOOL_NAME,
-                response: { result: 'Output submitted and task completed.' },
+                response: { result: "Output submitted and task completed." },
                 id: callId,
               },
             });
-            this.emitActivity('TOOL_CALL_END', {
+            this.emitActivity("TOOL_CALL_END", {
               name: functionCall.name,
-              output: 'Output submitted and task completed.',
+              output: "Output submitted and task completed.",
             });
           } else {
             // Failed to provide required output.
@@ -812,25 +771,25 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
                 id: callId,
               },
             });
-            this.emitActivity('ERROR', {
-              context: 'tool_call',
+            this.emitActivity("ERROR", {
+              context: "tool_call",
               name: functionCall.name,
               error,
             });
           }
         } else {
           // No output expected. Just signal completion.
-          submittedOutput = 'Task completed successfully.';
+          submittedOutput = "Task completed successfully.";
           syncResponseParts.push({
             functionResponse: {
               name: TASK_COMPLETE_TOOL_NAME,
-              response: { status: 'Task marked complete.' },
+              response: { status: "Task marked complete." },
               id: callId,
             },
           });
-          this.emitActivity('TOOL_CALL_END', {
+          this.emitActivity("TOOL_CALL_END", {
             name: functionCall.name,
-            output: 'Task marked complete.',
+            output: "Task marked complete.",
           });
         }
         continue;
@@ -850,8 +809,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
           },
         });
 
-        this.emitActivity('ERROR', {
-          context: 'tool_call_unauthorized',
+        this.emitActivity("ERROR", {
+          context: "tool_call_unauthorized",
           name: functionCall.name,
           callId,
           error,
@@ -877,13 +836,13 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         );
 
         if (toolResponse.error) {
-          this.emitActivity('ERROR', {
-            context: 'tool_call',
+          this.emitActivity("ERROR", {
+            context: "tool_call",
             name: functionCall.name,
             error: toolResponse.error.message,
           });
         } else {
-          this.emitActivity('TOOL_CALL_END', {
+          this.emitActivity("TOOL_CALL_END", {
             name: functionCall.name,
             output: toolResponse.resultDisplay,
           });
@@ -907,18 +866,14 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     }
 
     // If all authorized tool calls failed (and task isn't complete), provide a generic error.
-    if (
-      functionCalls.length > 0 &&
-      toolResponseParts.length === 0 &&
-      !taskCompleted
-    ) {
+    if (functionCalls.length > 0 && toolResponseParts.length === 0 && !taskCompleted) {
       toolResponseParts.push({
-        text: 'All tool calls failed or were unauthorized. Please analyze the errors and try an alternative approach.',
+        text: "All tool calls failed or were unauthorized. Please analyze the errors and try an alternative approach.",
       });
     }
 
     return {
-      nextMessage: { role: 'user', parts: toolResponseParts },
+      nextMessage: { role: "user", parts: toolResponseParts },
       submittedOutput,
       taskCompleted,
     };
@@ -934,9 +889,9 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     if (toolConfig) {
       const toolNamesToLoad: string[] = [];
       for (const toolRef of toolConfig.tools) {
-        if (typeof toolRef === 'string') {
+        if (typeof toolRef === "string") {
           toolNamesToLoad.push(toolRef);
-        } else if (typeof toolRef === 'object' && 'schema' in toolRef) {
+        } else if (typeof toolRef === "object" && "schema" in toolRef) {
           // Tool instance with an explicit schema property.
           toolsList.push(toolRef.schema as FunctionDeclaration);
         } else {
@@ -945,9 +900,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
         }
       }
       // Add schemas from tools that were registered by name.
-      toolsList.push(
-        ...this.toolRegistry.getFunctionDeclarationsFiltered(toolNamesToLoad),
-      );
+      toolsList.push(...this.toolRegistry.getFunctionDeclarationsFiltered(toolNamesToLoad));
     }
 
     // Always inject complete_task.
@@ -955,8 +908,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
     const completeTool: FunctionDeclaration = {
       name: TASK_COMPLETE_TOOL_NAME,
       description: outputConfig
-        ? 'Call this tool to submit your final answer and complete the task. This is the ONLY way to finish.'
-        : 'Call this tool to signal that you have completed your task. This is the ONLY way to finish.',
+        ? "Call this tool to submit your final answer and complete the task. This is the ONLY way to finish."
+        : "Call this tool to signal that you have completed your task. This is the ONLY way to finish.",
       parameters: {
         type: Type.OBJECT,
         properties: {},
@@ -966,13 +919,8 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
 
     if (outputConfig) {
       const jsonSchema = zodToJsonSchema(outputConfig.schema);
-      const {
-        $schema: _$schema,
-        definitions: _definitions,
-        ...schema
-      } = jsonSchema;
-      completeTool.parameters!.properties![outputConfig.outputName] =
-        schema as Schema;
+      const { $schema: _$schema, definitions: _definitions, ...schema } = jsonSchema;
+      completeTool.parameters!.properties![outputConfig.outputName] = schema as Schema;
       completeTool.parameters!.required!.push(outputConfig.outputName);
     }
 
@@ -985,7 +933,7 @@ export class AgentExecutor<TOutput extends z.ZodTypeAny> {
   private async buildSystemPrompt(inputs: AgentInputs): Promise<string> {
     const { promptConfig } = this.definition;
     if (!promptConfig.systemPrompt) {
-      return '';
+      return "";
     }
 
     // Inject user inputs into the prompt template.
@@ -1023,7 +971,7 @@ Important Rules:
   ): Content[] {
     return initialMessages.map((content) => {
       const newParts = (content.parts ?? []).map((part) => {
-        if ('text' in part && part.text !== undefined) {
+        if ("text" in part && part.text !== undefined) {
           return { text: templateString(part.text, inputs) };
         }
         return part;
@@ -1037,10 +985,7 @@ Important Rules:
    *
    * @throws An error if a tool is not on the allow-list for non-interactive execution.
    */
-  private static async validateTools(
-    toolRegistry: ToolRegistry,
-    agentName: string,
-  ): Promise<void> {
+  private static async validateTools(toolRegistry: ToolRegistry, agentName: string): Promise<void> {
     // Tools that are non-interactive. This is temporary until we have tool
     // confirmations for subagents.
     const allowlist = new Set([
@@ -1068,10 +1013,7 @@ Important Rules:
    *
    * @returns The reason for termination, or `null` if execution can continue.
    */
-  private checkTermination(
-    startTime: number,
-    turnCounter: number,
-  ): AgentTerminateMode | null {
+  private checkTermination(startTime: number, turnCounter: number): AgentTerminateMode | null {
     const { runConfig } = this.definition;
 
     if (runConfig.max_turns && turnCounter >= runConfig.max_turns) {
@@ -1082,10 +1024,7 @@ Important Rules:
   }
 
   /** Emits an activity event to the configured callback. */
-  private emitActivity(
-    type: SubagentActivityEvent['type'],
-    data: Record<string, unknown>,
-  ): void {
+  private emitActivity(type: SubagentActivityEvent["type"], data: Record<string, unknown>): void {
     if (this.onActivity) {
       const event: SubagentActivityEvent = {
         isSubagentActivityEvent: true,
diff --git a/packages/gemini-core/src/agents/invocation.test.ts b/packages/gemini-core/src/agents/invocation.test.ts
index a91f5ee80..9e0a0422a 100644
--- a/packages/gemini-core/src/agents/invocation.test.ts
+++ b/packages/gemini-core/src/agents/invocation.test.ts
@@ -4,42 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
-import { SubagentInvocation } from './invocation.js';
-import { AgentExecutor } from './executor.js';
-import type {
-  AgentDefinition,
-  SubagentActivityEvent,
-  AgentInputs,
-} from './types.js';
-import { AgentTerminateMode } from './types.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import type { Config } from '../config/config.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { type z } from 'zod';
-
-vi.mock('./executor.js');
+import { beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import { type z } from "zod";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { AgentExecutor } from "./executor.js";
+import { SubagentInvocation } from "./invocation.js";
+import type { AgentDefinition, AgentInputs, SubagentActivityEvent } from "./types.js";
+import { AgentTerminateMode } from "./types.js";
+
+vi.mock("./executor.js");
 
 const MockAgentExecutor = vi.mocked(AgentExecutor);
 
 let mockConfig: Config;
 
 const testDefinition: AgentDefinition<z.ZodUnknown> = {
-  name: 'MockAgent',
-  description: 'A mock agent.',
+  name: "MockAgent",
+  description: "A mock agent.",
   inputConfig: {
     inputs: {
-      task: { type: 'string', required: true, description: 'task' },
-      priority: { type: 'number', required: false, description: 'prio' },
+      task: { type: "string", required: true, description: "task" },
+      priority: { type: "number", required: false, description: "prio" },
     },
   },
-  modelConfig: { model: 'test', temp: 0, top_p: 1 },
+  modelConfig: { model: "test", temp: 0, top_p: 1 },
   runConfig: { max_time_minutes: 1 },
-  promptConfig: { systemPrompt: 'test' },
+  promptConfig: { systemPrompt: "test" },
 };
 
-describe('SubagentInvocation', () => {
+describe("SubagentInvocation", () => {
   let mockExecutorInstance: Mocked<AgentExecutor<z.ZodUnknown>>;
 
   beforeEach(() => {
@@ -56,9 +52,9 @@ describe('SubagentInvocation', () => {
     );
   });
 
-  it('should pass the messageBus to the parent constructor', () => {
+  it("should pass the messageBus to the parent constructor", () => {
     const mockMessageBus = {} as MessageBus;
-    const params = { task: 'Analyze data' };
+    const params = { task: "Analyze data" };
     const invocation = new SubagentInvocation<z.ZodUnknown>(
       params,
       testDefinition,
@@ -71,80 +67,62 @@ describe('SubagentInvocation', () => {
     expect((invocation as any).messageBus).toBe(mockMessageBus);
   });
 
-  describe('getDescription', () => {
-    it('should format the description with inputs', () => {
-      const params = { task: 'Analyze data', priority: 5 };
-      const invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        testDefinition,
-        mockConfig,
-      );
+  describe("getDescription", () => {
+    it("should format the description with inputs", () => {
+      const params = { task: "Analyze data", priority: 5 };
+      const invocation = new SubagentInvocation<z.ZodUnknown>(params, testDefinition, mockConfig);
       const description = invocation.getDescription();
       expect(description).toBe(
         "Running subagent 'MockAgent' with inputs: { task: Analyze data, priority: 5 }",
       );
     });
 
-    it('should truncate long input values', () => {
-      const longTask = 'A'.repeat(100);
+    it("should truncate long input values", () => {
+      const longTask = "A".repeat(100);
       const params = { task: longTask };
-      const invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        testDefinition,
-        mockConfig,
-      );
+      const invocation = new SubagentInvocation<z.ZodUnknown>(params, testDefinition, mockConfig);
       const description = invocation.getDescription();
       // Default INPUT_PREVIEW_MAX_LENGTH is 50
       expect(description).toBe(
-        `Running subagent 'MockAgent' with inputs: { task: ${'A'.repeat(50)} }`,
+        `Running subagent 'MockAgent' with inputs: { task: ${"A".repeat(50)} }`,
       );
     });
 
-    it('should truncate the overall description if it exceeds the limit', () => {
+    it("should truncate the overall description if it exceeds the limit", () => {
       // Create a definition and inputs that result in a very long description
       const longNameDef = {
         ...testDefinition,
-        name: 'VeryLongAgentNameThatTakesUpSpace',
+        name: "VeryLongAgentNameThatTakesUpSpace",
       };
       const params: AgentInputs = {};
       for (let i = 0; i < 20; i++) {
         params[`input${i}`] = `value${i}`;
       }
-      const invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        longNameDef,
-        mockConfig,
-      );
+      const invocation = new SubagentInvocation<z.ZodUnknown>(params, longNameDef, mockConfig);
       const description = invocation.getDescription();
       // Default DESCRIPTION_MAX_LENGTH is 200
       expect(description.length).toBe(200);
-      expect(
-        description.startsWith(
-          "Running subagent 'VeryLongAgentNameThatTakesUpSpace'",
-        ),
-      ).toBe(true);
+      expect(description.startsWith("Running subagent 'VeryLongAgentNameThatTakesUpSpace'")).toBe(
+        true,
+      );
     });
   });
 
-  describe('execute', () => {
+  describe("execute", () => {
     let signal: AbortSignal;
     let updateOutput: ReturnType<typeof vi.fn>;
-    const params = { task: 'Execute task' };
+    const params = { task: "Execute task" };
     let invocation: SubagentInvocation<z.ZodUnknown>;
 
     beforeEach(() => {
       signal = new AbortController().signal;
       updateOutput = vi.fn();
-      invocation = new SubagentInvocation<z.ZodUnknown>(
-        params,
-        testDefinition,
-        mockConfig,
-      );
+      invocation = new SubagentInvocation<z.ZodUnknown>(params, testDefinition, mockConfig);
     });
 
-    it('should initialize and run the executor successfully', async () => {
+    it("should initialize and run the executor successfully", async () => {
       const mockOutput = {
-        result: 'Analysis complete.',
+        result: "Analysis complete.",
         terminate_reason: AgentTerminateMode.GOAL,
       };
       mockExecutorInstance.run.mockResolvedValue(mockOutput);
@@ -156,7 +134,7 @@ describe('SubagentInvocation', () => {
         mockConfig,
         expect.any(Function),
       );
-      expect(updateOutput).toHaveBeenCalledWith('Subagent starting...\n');
+      expect(updateOutput).toHaveBeenCalledWith("Subagent starting...\n");
 
       expect(mockExecutorInstance.run).toHaveBeenCalledWith(params, signal);
 
@@ -167,90 +145,90 @@ describe('SubagentInvocation', () => {
           ),
         },
       ]);
-      expect(result.returnDisplay).toContain('Result:\nAnalysis complete.');
-      expect(result.returnDisplay).toContain('Termination Reason:\n GOAL');
+      expect(result.returnDisplay).toContain("Result:\nAnalysis complete.");
+      expect(result.returnDisplay).toContain("Termination Reason:\n GOAL");
     });
 
-    it('should stream THOUGHT_CHUNK activities from the executor', async () => {
+    it("should stream THOUGHT_CHUNK activities from the executor", async () => {
       mockExecutorInstance.run.mockImplementation(async () => {
         const onActivity = MockAgentExecutor.create.mock.calls[0][2];
 
         if (onActivity) {
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'THOUGHT_CHUNK',
-            data: { text: 'Analyzing...' },
+            agentName: "MockAgent",
+            type: "THOUGHT_CHUNK",
+            data: { text: "Analyzing..." },
           } as SubagentActivityEvent);
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'THOUGHT_CHUNK',
-            data: { text: ' Still thinking.' },
+            agentName: "MockAgent",
+            type: "THOUGHT_CHUNK",
+            data: { text: " Still thinking." },
           } as SubagentActivityEvent);
         }
-        return { result: 'Done', terminate_reason: AgentTerminateMode.GOAL };
+        return { result: "Done", terminate_reason: AgentTerminateMode.GOAL };
       });
 
       await invocation.execute(signal, updateOutput);
 
-      expect(updateOutput).toHaveBeenCalledWith('Subagent starting...\n');
-      expect(updateOutput).toHaveBeenCalledWith('🤖💭 Analyzing...');
-      expect(updateOutput).toHaveBeenCalledWith('🤖💭  Still thinking.');
+      expect(updateOutput).toHaveBeenCalledWith("Subagent starting...\n");
+      expect(updateOutput).toHaveBeenCalledWith("🤖💭 Analyzing...");
+      expect(updateOutput).toHaveBeenCalledWith("🤖💭  Still thinking.");
       expect(updateOutput).toHaveBeenCalledTimes(3); // Initial message + 2 thoughts
     });
 
-    it('should NOT stream other activities (e.g., TOOL_CALL_START, ERROR)', async () => {
+    it("should NOT stream other activities (e.g., TOOL_CALL_START, ERROR)", async () => {
       mockExecutorInstance.run.mockImplementation(async () => {
         const onActivity = MockAgentExecutor.create.mock.calls[0][2];
 
         if (onActivity) {
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'TOOL_CALL_START',
-            data: { name: 'ls' },
+            agentName: "MockAgent",
+            type: "TOOL_CALL_START",
+            data: { name: "ls" },
           } as SubagentActivityEvent);
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'MockAgent',
-            type: 'ERROR',
-            data: { error: 'Failed' },
+            agentName: "MockAgent",
+            type: "ERROR",
+            data: { error: "Failed" },
           } as SubagentActivityEvent);
         }
-        return { result: 'Done', terminate_reason: AgentTerminateMode.GOAL };
+        return { result: "Done", terminate_reason: AgentTerminateMode.GOAL };
       });
 
       await invocation.execute(signal, updateOutput);
 
       // Should only contain the initial "Subagent starting..." message
       expect(updateOutput).toHaveBeenCalledTimes(1);
-      expect(updateOutput).toHaveBeenCalledWith('Subagent starting...\n');
+      expect(updateOutput).toHaveBeenCalledWith("Subagent starting...\n");
     });
 
-    it('should run successfully without an updateOutput callback', async () => {
+    it("should run successfully without an updateOutput callback", async () => {
       mockExecutorInstance.run.mockImplementation(async () => {
         const onActivity = MockAgentExecutor.create.mock.calls[0][2];
         if (onActivity) {
           // Ensure calling activity doesn't crash when updateOutput is undefined
           onActivity({
             isSubagentActivityEvent: true,
-            agentName: 'testAgent',
-            type: 'THOUGHT_CHUNK',
-            data: { text: 'Thinking silently.' },
+            agentName: "testAgent",
+            type: "THOUGHT_CHUNK",
+            data: { text: "Thinking silently." },
           } as SubagentActivityEvent);
         }
-        return { result: 'Done', terminate_reason: AgentTerminateMode.GOAL };
+        return { result: "Done", terminate_reason: AgentTerminateMode.GOAL };
       });
 
       // Execute without the optional callback
       const result = await invocation.execute(signal);
       expect(result.error).toBeUndefined();
-      expect(result.returnDisplay).toContain('Result:\nDone');
+      expect(result.returnDisplay).toContain("Result:\nDone");
     });
 
-    it('should handle executor run failure', async () => {
-      const error = new Error('Model failed during execution.');
+    it("should handle executor run failure", async () => {
+      const error = new Error("Model failed during execution.");
       mockExecutorInstance.run.mockRejectedValue(error);
 
       const result = await invocation.execute(signal, updateOutput);
@@ -259,16 +237,12 @@ describe('SubagentInvocation', () => {
         message: error.message,
         type: ToolErrorType.EXECUTION_FAILED,
       });
-      expect(result.returnDisplay).toBe(
-        `Subagent Failed: MockAgent\nError: ${error.message}`,
-      );
-      expect(result.llmContent).toBe(
-        `Subagent 'MockAgent' failed. Error: ${error.message}`,
-      );
+      expect(result.returnDisplay).toBe(`Subagent Failed: MockAgent\nError: ${error.message}`);
+      expect(result.llmContent).toBe(`Subagent 'MockAgent' failed. Error: ${error.message}`);
     });
 
-    it('should handle executor creation failure', async () => {
-      const creationError = new Error('Failed to initialize tools.');
+    it("should handle executor creation failure", async () => {
+      const creationError = new Error("Failed to initialize tools.");
       MockAgentExecutor.create.mockRejectedValue(creationError);
 
       const result = await invocation.execute(signal, updateOutput);
@@ -285,23 +259,17 @@ describe('SubagentInvocation', () => {
      * This test verifies that the AbortSignal is correctly propagated and
      * that a rejection from the executor due to abortion is handled gracefully.
      */
-    it('should handle abortion signal during execution', async () => {
-      const abortError = new Error('Aborted');
+    it("should handle abortion signal during execution", async () => {
+      const abortError = new Error("Aborted");
       mockExecutorInstance.run.mockRejectedValue(abortError);
 
       const controller = new AbortController();
-      const executePromise = invocation.execute(
-        controller.signal,
-        updateOutput,
-      );
+      const executePromise = invocation.execute(controller.signal, updateOutput);
       controller.abort();
       const result = await executePromise;
 
-      expect(mockExecutorInstance.run).toHaveBeenCalledWith(
-        params,
-        controller.signal,
-      );
-      expect(result.error?.message).toBe('Aborted');
+      expect(mockExecutorInstance.run).toHaveBeenCalledWith(params, controller.signal);
+      expect(result.error?.message).toBe("Aborted");
       expect(result.error?.type).toBe(ToolErrorType.EXECUTION_FAILED);
     });
   });
diff --git a/packages/gemini-core/src/agents/invocation.ts b/packages/gemini-core/src/agents/invocation.ts
index cb49095cb..c712240cd 100644
--- a/packages/gemini-core/src/agents/invocation.ts
+++ b/packages/gemini-core/src/agents/invocation.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { AgentExecutor } from './executor.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
-import { BaseToolInvocation, type ToolResult } from '../tools/tools.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import type {
-  AgentDefinition,
-  AgentInputs,
-  SubagentActivityEvent,
-} from './types.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { type z } from 'zod';
+import { type z } from "zod";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { BaseToolInvocation, type ToolResult } from "../tools/tools.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { AgentExecutor } from "./executor.js";
+import type { AgentDefinition, AgentInputs, SubagentActivityEvent } from "./types.js";
 
 const INPUT_PREVIEW_MAX_LENGTH = 50;
 const DESCRIPTION_MAX_LENGTH = 200;
@@ -30,9 +26,10 @@ const DESCRIPTION_MAX_LENGTH = 200;
  * live output stream.
  * 4. Formatting the final result into a {@link ToolResult}.
  */
-export class SubagentInvocation<
-  TOutput extends z.ZodTypeAny,
-> extends BaseToolInvocation<AgentInputs, ToolResult> {
+export class SubagentInvocation<TOutput extends z.ZodTypeAny> extends BaseToolInvocation<
+  AgentInputs,
+  ToolResult
+> {
   /**
    * @param params The validated input parameters for the agent.
    * @param definition The definition object that configures the agent.
@@ -54,11 +51,8 @@ export class SubagentInvocation<
    */
   getDescription(): string {
     const inputSummary = Object.entries(this.params)
-      .map(
-        ([key, value]) =>
-          `${key}: ${String(value).slice(0, INPUT_PREVIEW_MAX_LENGTH)}`,
-      )
-      .join(', ');
+      .map(([key, value]) => `${key}: ${String(value).slice(0, INPUT_PREVIEW_MAX_LENGTH)}`)
+      .join(", ");
 
     const description = `Running subagent '${this.definition.name}' with inputs: { ${inputSummary} }`;
     return description.slice(0, DESCRIPTION_MAX_LENGTH);
@@ -78,7 +72,7 @@ export class SubagentInvocation<
   ): Promise<ToolResult> {
     try {
       if (updateOutput) {
-        updateOutput('Subagent starting...\n');
+        updateOutput("Subagent starting...\n");
       }
 
       // Create an activity callback to bridge the executor's events to the
@@ -86,19 +80,12 @@ export class SubagentInvocation<
       const onActivity = (activity: SubagentActivityEvent): void => {
         if (!updateOutput) return;
 
-        if (
-          activity.type === 'THOUGHT_CHUNK' &&
-          typeof activity.data['text'] === 'string'
-        ) {
-          updateOutput(`🤖💭 ${activity.data['text']}`);
+        if (activity.type === "THOUGHT_CHUNK" && typeof activity.data["text"] === "string") {
+          updateOutput(`🤖💭 ${activity.data["text"]}`);
         }
       };
 
-      const executor = await AgentExecutor.create(
-        this.definition,
-        this.config,
-        onActivity,
-      );
+      const executor = await AgentExecutor.create(this.definition, this.config, onActivity);
 
       const output = await executor.run(this.params, signal);
 
@@ -121,8 +108,7 @@ ${output.result}
         returnDisplay: displayContent,
       };
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
 
       return {
         llmContent: `Subagent '${this.definition.name}' failed. Error: ${errorMessage}`,
diff --git a/packages/gemini-core/src/agents/registry.test.ts b/packages/gemini-core/src/agents/registry.test.ts
index 306c3e7b2..19eda4a30 100644
--- a/packages/gemini-core/src/agents/registry.test.ts
+++ b/packages/gemini-core/src/agents/registry.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { AgentRegistry } from './registry.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import type { AgentDefinition } from './types.js';
-import type { Config } from '../config/config.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { AgentRegistry } from "./registry.js";
+import type { AgentDefinition } from "./types.js";
 
 // A test-only subclass to expose the protected `registerAgent` method.
 class TestableAgentRegistry extends AgentRegistry {
@@ -19,20 +19,20 @@ class TestableAgentRegistry extends AgentRegistry {
 
 // Define mock agent structures for testing registration logic
 const MOCK_AGENT_V1: AgentDefinition = {
-  name: 'MockAgent',
-  description: 'Mock Description V1',
+  name: "MockAgent",
+  description: "Mock Description V1",
   inputConfig: { inputs: {} },
-  modelConfig: { model: 'test', temp: 0, top_p: 1 },
+  modelConfig: { model: "test", temp: 0, top_p: 1 },
   runConfig: { max_time_minutes: 1 },
-  promptConfig: { systemPrompt: 'test' },
+  promptConfig: { systemPrompt: "test" },
 };
 
 const MOCK_AGENT_V2: AgentDefinition = {
   ...MOCK_AGENT_V1,
-  description: 'Mock Description V2 (Updated)',
+  description: "Mock Description V2 (Updated)",
 };
 
-describe('AgentRegistry', () => {
+describe("AgentRegistry", () => {
   let mockConfig: Config;
   let registry: TestableAgentRegistry;
 
@@ -46,7 +46,7 @@ describe('AgentRegistry', () => {
     vi.restoreAllMocks(); // Restore spies after each test
   });
 
-  describe('initialize', () => {
+  describe("initialize", () => {
     // TODO: Add this test once we actually have a built-in agent configured.
     // it('should load built-in agents upon initialization', async () => {
     //   expect(registry.getAllDefinitions()).toHaveLength(0);
@@ -57,12 +57,10 @@ describe('AgentRegistry', () => {
     //   expect(registry.getAllDefinitions()).toEqual([]);
     // });
 
-    it('should log the count of loaded agents in debug mode', async () => {
+    it("should log the count of loaded agents in debug mode", async () => {
       const debugConfig = makeFakeConfig({ debugMode: true });
       const debugRegistry = new TestableAgentRegistry(debugConfig);
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       await debugRegistry.initialize();
 
@@ -73,83 +71,69 @@ describe('AgentRegistry', () => {
     });
   });
 
-  describe('registration logic', () => {
-    it('should register a valid agent definition', () => {
+  describe("registration logic", () => {
+    it("should register a valid agent definition", () => {
       registry.testRegisterAgent(MOCK_AGENT_V1);
-      expect(registry.getDefinition('MockAgent')).toEqual(MOCK_AGENT_V1);
+      expect(registry.getDefinition("MockAgent")).toEqual(MOCK_AGENT_V1);
     });
 
-    it('should handle special characters in agent names', () => {
+    it("should handle special characters in agent names", () => {
       const specialAgent = {
         ...MOCK_AGENT_V1,
-        name: 'Agent-123_$pecial.v2',
+        name: "Agent-123_$pecial.v2",
       };
       registry.testRegisterAgent(specialAgent);
-      expect(registry.getDefinition('Agent-123_$pecial.v2')).toEqual(
-        specialAgent,
-      );
+      expect(registry.getDefinition("Agent-123_$pecial.v2")).toEqual(specialAgent);
     });
 
-    it('should reject an agent definition missing a name', () => {
-      const invalidAgent = { ...MOCK_AGENT_V1, name: '' };
-      const consoleWarnSpy = vi
-        .spyOn(console, 'warn')
-        .mockImplementation(() => {});
+    it("should reject an agent definition missing a name", () => {
+      const invalidAgent = { ...MOCK_AGENT_V1, name: "" };
+      const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
       registry.testRegisterAgent(invalidAgent);
 
-      expect(registry.getDefinition('MockAgent')).toBeUndefined();
+      expect(registry.getDefinition("MockAgent")).toBeUndefined();
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        '[AgentRegistry] Skipping invalid agent definition. Missing name or description.',
+        "[AgentRegistry] Skipping invalid agent definition. Missing name or description.",
       );
     });
 
-    it('should reject an agent definition missing a description', () => {
-      const invalidAgent = { ...MOCK_AGENT_V1, description: '' };
-      const consoleWarnSpy = vi
-        .spyOn(console, 'warn')
-        .mockImplementation(() => {});
+    it("should reject an agent definition missing a description", () => {
+      const invalidAgent = { ...MOCK_AGENT_V1, description: "" };
+      const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
       registry.testRegisterAgent(invalidAgent as AgentDefinition);
 
-      expect(registry.getDefinition('MockAgent')).toBeUndefined();
+      expect(registry.getDefinition("MockAgent")).toBeUndefined();
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        '[AgentRegistry] Skipping invalid agent definition. Missing name or description.',
+        "[AgentRegistry] Skipping invalid agent definition. Missing name or description.",
       );
     });
 
-    it('should overwrite an existing agent definition', () => {
+    it("should overwrite an existing agent definition", () => {
       registry.testRegisterAgent(MOCK_AGENT_V1);
-      expect(registry.getDefinition('MockAgent')?.description).toBe(
-        'Mock Description V1',
-      );
+      expect(registry.getDefinition("MockAgent")?.description).toBe("Mock Description V1");
 
       registry.testRegisterAgent(MOCK_AGENT_V2);
-      expect(registry.getDefinition('MockAgent')?.description).toBe(
-        'Mock Description V2 (Updated)',
+      expect(registry.getDefinition("MockAgent")?.description).toBe(
+        "Mock Description V2 (Updated)",
       );
       expect(registry.getAllDefinitions()).toHaveLength(1);
     });
 
-    it('should log overwrites when in debug mode', () => {
+    it("should log overwrites when in debug mode", () => {
       const debugConfig = makeFakeConfig({ debugMode: true });
       const debugRegistry = new TestableAgentRegistry(debugConfig);
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       debugRegistry.testRegisterAgent(MOCK_AGENT_V1);
       debugRegistry.testRegisterAgent(MOCK_AGENT_V2);
 
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        `[AgentRegistry] Overriding agent 'MockAgent'`,
-      );
+      expect(consoleLogSpy).toHaveBeenCalledWith(`[AgentRegistry] Overriding agent 'MockAgent'`);
     });
 
-    it('should not log overwrites when not in debug mode', () => {
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+    it("should not log overwrites when not in debug mode", () => {
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       registry.testRegisterAgent(MOCK_AGENT_V1);
       registry.testRegisterAgent(MOCK_AGENT_V2);
@@ -159,7 +143,7 @@ describe('AgentRegistry', () => {
       );
     });
 
-    it('should handle bulk registrations correctly', async () => {
+    it("should handle bulk registrations correctly", async () => {
       const promises = Array.from({ length: 100 }, (_, i) =>
         Promise.resolve(
           registry.testRegisterAgent({
@@ -174,10 +158,10 @@ describe('AgentRegistry', () => {
     });
   });
 
-  describe('accessors', () => {
+  describe("accessors", () => {
     const ANOTHER_AGENT: AgentDefinition = {
       ...MOCK_AGENT_V1,
-      name: 'AnotherAgent',
+      name: "AnotherAgent",
     };
 
     beforeEach(() => {
@@ -185,21 +169,19 @@ describe('AgentRegistry', () => {
       registry.testRegisterAgent(ANOTHER_AGENT);
     });
 
-    it('getDefinition should return the correct definition', () => {
-      expect(registry.getDefinition('MockAgent')).toEqual(MOCK_AGENT_V1);
-      expect(registry.getDefinition('AnotherAgent')).toEqual(ANOTHER_AGENT);
+    it("getDefinition should return the correct definition", () => {
+      expect(registry.getDefinition("MockAgent")).toEqual(MOCK_AGENT_V1);
+      expect(registry.getDefinition("AnotherAgent")).toEqual(ANOTHER_AGENT);
     });
 
-    it('getDefinition should return undefined for unknown agents', () => {
-      expect(registry.getDefinition('NonExistentAgent')).toBeUndefined();
+    it("getDefinition should return undefined for unknown agents", () => {
+      expect(registry.getDefinition("NonExistentAgent")).toBeUndefined();
     });
 
-    it('getAllDefinitions should return all registered definitions', () => {
+    it("getAllDefinitions should return all registered definitions", () => {
       const all = registry.getAllDefinitions();
       expect(all).toHaveLength(2);
-      expect(all).toEqual(
-        expect.arrayContaining([MOCK_AGENT_V1, ANOTHER_AGENT]),
-      );
+      expect(all).toEqual(expect.arrayContaining([MOCK_AGENT_V1, ANOTHER_AGENT]));
     });
   });
 });
diff --git a/packages/gemini-core/src/agents/registry.ts b/packages/gemini-core/src/agents/registry.ts
index ad68a596b..d657e04d5 100644
--- a/packages/gemini-core/src/agents/registry.ts
+++ b/packages/gemini-core/src/agents/registry.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { AgentDefinition } from './types.js';
-import { CodebaseInvestigatorAgent } from './codebase-investigator.js';
-import { type z } from 'zod';
-import { debugLogger } from '../utils/debugLogger.js';
+import { type z } from "zod";
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { CodebaseInvestigatorAgent } from "./codebase-investigator.js";
+import type { AgentDefinition } from "./types.js";
 
 /**
  * Manages the discovery, loading, validation, and registration of
@@ -27,9 +27,7 @@ export class AgentRegistry {
     this.loadBuiltInAgents();
 
     if (this.config.getDebugMode()) {
-      debugLogger.log(
-        `[AgentRegistry] Initialized with ${this.agents.size} agents.`,
-      );
+      debugLogger.log(`[AgentRegistry] Initialized with ${this.agents.size} agents.`);
     }
   }
 
@@ -42,9 +40,7 @@ export class AgentRegistry {
         ...CodebaseInvestigatorAgent,
         modelConfig: {
           ...CodebaseInvestigatorAgent.modelConfig,
-          model:
-            investigatorSettings.model ??
-            CodebaseInvestigatorAgent.modelConfig.model,
+          model: investigatorSettings.model ?? CodebaseInvestigatorAgent.modelConfig.model,
           thinkingBudget:
             investigatorSettings.thinkingBudget ??
             CodebaseInvestigatorAgent.modelConfig.thinkingBudget,
@@ -55,8 +51,7 @@ export class AgentRegistry {
             investigatorSettings.maxTimeMinutes ??
             CodebaseInvestigatorAgent.runConfig.max_time_minutes,
           max_turns:
-            investigatorSettings.maxNumTurns ??
-            CodebaseInvestigatorAgent.runConfig.max_turns,
+            investigatorSettings.maxNumTurns ?? CodebaseInvestigatorAgent.runConfig.max_turns,
         },
       };
       this.registerAgent(agentDef);
diff --git a/packages/gemini-core/src/agents/schema-utils.test.ts b/packages/gemini-core/src/agents/schema-utils.test.ts
index 48ef90e0b..a0d9a4738 100644
--- a/packages/gemini-core/src/agents/schema-utils.test.ts
+++ b/packages/gemini-core/src/agents/schema-utils.test.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { convertInputConfigToJsonSchema } from './schema-utils.js';
-import type { InputConfig } from './types.js';
+import { describe, expect, it } from "vitest";
+import { convertInputConfigToJsonSchema } from "./schema-utils.js";
+import type { InputConfig } from "./types.js";
 
 const PRIMITIVE_TYPES_CONFIG: InputConfig = {
   inputs: {
     goal: {
-      type: 'string',
-      description: 'The primary objective',
+      type: "string",
+      description: "The primary objective",
       required: true,
     },
     max_retries: {
-      type: 'integer',
-      description: 'Maximum number of retries',
+      type: "integer",
+      description: "Maximum number of retries",
       required: false,
     },
     temperature: {
-      type: 'number',
-      description: 'The model temperature',
+      type: "number",
+      description: "The model temperature",
       required: true,
     },
     verbose: {
-      type: 'boolean',
-      description: 'Enable verbose logging',
+      type: "boolean",
+      description: "Enable verbose logging",
       required: false,
     },
   },
@@ -36,13 +36,13 @@ const PRIMITIVE_TYPES_CONFIG: InputConfig = {
 const ARRAY_TYPES_CONFIG: InputConfig = {
   inputs: {
     filenames: {
-      type: 'string[]',
-      description: 'A list of file paths',
+      type: "string[]",
+      description: "A list of file paths",
       required: true,
     },
     scores: {
-      type: 'number[]',
-      description: 'A list of scores',
+      type: "number[]",
+      description: "A list of scores",
       required: false,
     },
   },
@@ -51,8 +51,8 @@ const ARRAY_TYPES_CONFIG: InputConfig = {
 const NO_REQUIRED_FIELDS_CONFIG: InputConfig = {
   inputs: {
     optional_param: {
-      type: 'string',
-      description: 'An optional parameter',
+      type: "string",
+      description: "An optional parameter",
       required: false,
     },
   },
@@ -60,8 +60,8 @@ const NO_REQUIRED_FIELDS_CONFIG: InputConfig = {
 
 const ALL_REQUIRED_FIELDS_CONFIG: InputConfig = {
   inputs: {
-    paramA: { type: 'string', description: 'Parameter A', required: true },
-    paramB: { type: 'boolean', description: 'Parameter B', required: true },
+    paramA: { type: "string", description: "Parameter A", required: true },
+    paramB: { type: "boolean", description: "Parameter B", required: true },
   },
 };
 
@@ -73,90 +73,87 @@ const UNSUPPORTED_TYPE_CONFIG: InputConfig = {
   inputs: {
     invalid_param: {
       // @ts-expect-error - Intentionally testing an invalid type
-      type: 'date',
-      description: 'This type is not supported',
+      type: "date",
+      description: "This type is not supported",
       required: true,
     },
   },
 };
 
-describe('convertInputConfigToJsonSchema', () => {
-  describe('type conversion', () => {
-    it('should correctly convert an InputConfig with various primitive types', () => {
+describe("convertInputConfigToJsonSchema", () => {
+  describe("type conversion", () => {
+    it("should correctly convert an InputConfig with various primitive types", () => {
       const result = convertInputConfigToJsonSchema(PRIMITIVE_TYPES_CONFIG);
 
       expect(result).toEqual({
-        type: 'object',
+        type: "object",
         properties: {
-          goal: { type: 'string', description: 'The primary objective' },
+          goal: { type: "string", description: "The primary objective" },
           max_retries: {
-            type: 'integer',
-            description: 'Maximum number of retries',
+            type: "integer",
+            description: "Maximum number of retries",
           },
-          temperature: { type: 'number', description: 'The model temperature' },
-          verbose: { type: 'boolean', description: 'Enable verbose logging' },
+          temperature: { type: "number", description: "The model temperature" },
+          verbose: { type: "boolean", description: "Enable verbose logging" },
         },
-        required: ['goal', 'temperature'],
+        required: ["goal", "temperature"],
       });
     });
 
-    it('should correctly handle array types for strings and numbers', () => {
+    it("should correctly handle array types for strings and numbers", () => {
       const result = convertInputConfigToJsonSchema(ARRAY_TYPES_CONFIG);
 
       expect(result).toEqual({
-        type: 'object',
+        type: "object",
         properties: {
           filenames: {
-            type: 'array',
-            description: 'A list of file paths',
-            items: { type: 'string' },
+            type: "array",
+            description: "A list of file paths",
+            items: { type: "string" },
           },
           scores: {
-            type: 'array',
-            description: 'A list of scores',
-            items: { type: 'number' },
+            type: "array",
+            description: "A list of scores",
+            items: { type: "number" },
           },
         },
-        required: ['filenames'],
+        required: ["filenames"],
       });
     });
   });
 
-  describe('required field handling', () => {
-    it('should produce an undefined `required` field when no inputs are required', () => {
+  describe("required field handling", () => {
+    it("should produce an undefined `required` field when no inputs are required", () => {
       const result = convertInputConfigToJsonSchema(NO_REQUIRED_FIELDS_CONFIG);
 
-      expect(result.properties['optional_param']).toBeDefined();
+      expect(result.properties["optional_param"]).toBeDefined();
       // Per the implementation and JSON Schema spec, the `required` field
       // should be omitted if no properties are required.
       expect(result.required).toBeUndefined();
     });
 
-    it('should list all properties in `required` when all are marked as required', () => {
+    it("should list all properties in `required` when all are marked as required", () => {
       const result = convertInputConfigToJsonSchema(ALL_REQUIRED_FIELDS_CONFIG);
       expect(result.required).toHaveLength(2);
-      expect(result.required).toEqual(
-        expect.arrayContaining(['paramA', 'paramB']),
-      );
+      expect(result.required).toEqual(expect.arrayContaining(["paramA", "paramB"]));
     });
   });
 
-  describe('edge cases', () => {
-    it('should return a valid, empty schema for an empty input config', () => {
+  describe("edge cases", () => {
+    it("should return a valid, empty schema for an empty input config", () => {
       const result = convertInputConfigToJsonSchema(EMPTY_CONFIG);
 
       expect(result).toEqual({
-        type: 'object',
+        type: "object",
         properties: {},
         required: undefined,
       });
     });
   });
 
-  describe('error handling', () => {
-    it('should throw an informative error for an unsupported input type', () => {
-      const action = () =>
-        convertInputConfigToJsonSchema(UNSUPPORTED_TYPE_CONFIG);
+  describe("error handling", () => {
+    it("should throw an informative error for an unsupported input type", () => {
+      const action = () => convertInputConfigToJsonSchema(UNSUPPORTED_TYPE_CONFIG);
 
       expect(action).toThrow(/Unsupported input type 'date'/);
       expect(action).toThrow(/parameter 'invalid_param'/);
diff --git a/packages/gemini-core/src/agents/schema-utils.ts b/packages/gemini-core/src/agents/schema-utils.ts
index 13516ef4c..ad81c349a 100644
--- a/packages/gemini-core/src/agents/schema-utils.ts
+++ b/packages/gemini-core/src/agents/schema-utils.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { InputConfig } from './types.js';
+import type { InputConfig } from "./types.js";
 
 /**
  * Defines the structure for a JSON Schema object, used for tool function
  * declarations.
  */
 interface JsonSchemaObject {
-  type: 'object';
+  type: "object";
   properties: Record<string, JsonSchemaProperty>;
   required?: string[];
 }
@@ -20,9 +20,9 @@ interface JsonSchemaObject {
  * Defines the structure for a property within a {@link JsonSchemaObject}.
  */
 interface JsonSchemaProperty {
-  type: 'string' | 'number' | 'integer' | 'boolean' | 'array';
+  type: "string" | "number" | "integer" | "boolean" | "array";
   description: string;
-  items?: { type: 'string' | 'number' };
+  items?: { type: "string" | "number" };
 }
 
 /**
@@ -37,9 +37,7 @@ interface JsonSchemaProperty {
  * @throws An `Error` if an unsupported input type is encountered, ensuring
  * configuration errors are caught early.
  */
-export function convertInputConfigToJsonSchema(
-  inputConfig: InputConfig,
-): JsonSchemaObject {
+export function convertInputConfigToJsonSchema(inputConfig: InputConfig): JsonSchemaObject {
   const properties: Record<string, JsonSchemaProperty> = {};
   const required: string[] = [];
 
@@ -49,28 +47,28 @@ export function convertInputConfigToJsonSchema(
     };
 
     switch (definition.type) {
-      case 'string':
-      case 'number':
-      case 'integer':
-      case 'boolean':
+      case "string":
+      case "number":
+      case "integer":
+      case "boolean":
         schemaProperty.type = definition.type;
         break;
 
-      case 'string[]':
-        schemaProperty.type = 'array';
-        schemaProperty.items = { type: 'string' };
+      case "string[]":
+        schemaProperty.type = "array";
+        schemaProperty.items = { type: "string" };
         break;
 
-      case 'number[]':
-        schemaProperty.type = 'array';
-        schemaProperty.items = { type: 'number' };
+      case "number[]":
+        schemaProperty.type = "array";
+        schemaProperty.items = { type: "number" };
         break;
 
       default: {
         const exhaustiveCheck: never = definition.type;
         throw new Error(
           `Unsupported input type '${exhaustiveCheck}' for parameter '${name}'. ` +
-            'Supported types: string, number, integer, boolean, string[], number[]',
+            "Supported types: string, number, integer, boolean, string[], number[]",
         );
       }
     }
@@ -83,7 +81,7 @@ export function convertInputConfigToJsonSchema(
   }
 
   return {
-    type: 'object',
+    type: "object",
     properties,
     required: required.length > 0 ? required : undefined,
   };
diff --git a/packages/gemini-core/src/agents/subagent-tool-wrapper.test.ts b/packages/gemini-core/src/agents/subagent-tool-wrapper.test.ts
index f971dc516..5669434ee 100644
--- a/packages/gemini-core/src/agents/subagent-tool-wrapper.test.ts
+++ b/packages/gemini-core/src/agents/subagent-tool-wrapper.test.ts
@@ -4,57 +4,55 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { SubagentToolWrapper } from './subagent-tool-wrapper.js';
-import { SubagentInvocation } from './invocation.js';
-import { convertInputConfigToJsonSchema } from './schema-utils.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import type { AgentDefinition, AgentInputs } from './types.js';
-import type { Config } from '../config/config.js';
-import { Kind } from '../tools/tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { Kind } from "../tools/tools.js";
+import { SubagentInvocation } from "./invocation.js";
+import { convertInputConfigToJsonSchema } from "./schema-utils.js";
+import { SubagentToolWrapper } from "./subagent-tool-wrapper.js";
+import type { AgentDefinition, AgentInputs } from "./types.js";
 
 // Mock dependencies to isolate the SubagentToolWrapper class
-vi.mock('./invocation.js');
-vi.mock('./schema-utils.js');
+vi.mock("./invocation.js");
+vi.mock("./schema-utils.js");
 
 const MockedSubagentInvocation = vi.mocked(SubagentInvocation);
-const mockConvertInputConfigToJsonSchema = vi.mocked(
-  convertInputConfigToJsonSchema,
-);
+const mockConvertInputConfigToJsonSchema = vi.mocked(convertInputConfigToJsonSchema);
 
 // Define reusable test data
 let mockConfig: Config;
 
 const mockDefinition: AgentDefinition = {
-  name: 'TestAgent',
-  displayName: 'Test Agent Display Name',
-  description: 'An agent for testing.',
+  name: "TestAgent",
+  displayName: "Test Agent Display Name",
+  description: "An agent for testing.",
   inputConfig: {
     inputs: {
-      goal: { type: 'string', required: true, description: 'The goal.' },
+      goal: { type: "string", required: true, description: "The goal." },
       priority: {
-        type: 'number',
+        type: "number",
         required: false,
-        description: 'The priority.',
+        description: "The priority.",
       },
     },
   },
-  modelConfig: { model: 'gemini-test-model', temp: 0, top_p: 1 },
+  modelConfig: { model: "gemini-test-model", temp: 0, top_p: 1 },
   runConfig: { max_time_minutes: 5 },
-  promptConfig: { systemPrompt: 'You are a test agent.' },
+  promptConfig: { systemPrompt: "You are a test agent." },
 };
 
 const mockSchema = {
-  type: 'object',
+  type: "object",
   properties: {
-    goal: { type: 'string', description: 'The goal.' },
-    priority: { type: 'number', description: 'The priority.' },
+    goal: { type: "string", description: "The goal." },
+    priority: { type: "number", description: "The priority." },
   },
-  required: ['goal'],
+  required: ["goal"],
 };
 
-describe('SubagentToolWrapper', () => {
+describe("SubagentToolWrapper", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockConfig = makeFakeConfig();
@@ -63,8 +61,8 @@ describe('SubagentToolWrapper', () => {
     mockConvertInputConfigToJsonSchema.mockReturnValue(mockSchema as any);
   });
 
-  describe('constructor', () => {
-    it('should call convertInputConfigToJsonSchema with the correct agent inputConfig', () => {
+  describe("constructor", () => {
+    it("should call convertInputConfigToJsonSchema with the correct agent inputConfig", () => {
       new SubagentToolWrapper(mockDefinition, mockConfig);
 
       expect(convertInputConfigToJsonSchema).toHaveBeenCalledExactlyOnceWith(
@@ -72,7 +70,7 @@ describe('SubagentToolWrapper', () => {
       );
     });
 
-    it('should correctly configure the tool properties from the agent definition', () => {
+    it("should correctly configure the tool properties from the agent definition", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
 
       expect(wrapper.name).toBe(mockDefinition.name);
@@ -83,19 +81,16 @@ describe('SubagentToolWrapper', () => {
       expect(wrapper.canUpdateOutput).toBe(true);
     });
 
-    it('should fall back to the agent name for displayName if it is not provided', () => {
+    it("should fall back to the agent name for displayName if it is not provided", () => {
       const definitionWithoutDisplayName = {
         ...mockDefinition,
         displayName: undefined,
       };
-      const wrapper = new SubagentToolWrapper(
-        definitionWithoutDisplayName,
-        mockConfig,
-      );
+      const wrapper = new SubagentToolWrapper(definitionWithoutDisplayName, mockConfig);
       expect(wrapper.displayName).toBe(definitionWithoutDisplayName.name);
     });
 
-    it('should generate a valid tool schema using the definition and converted schema', () => {
+    it("should generate a valid tool schema using the definition and converted schema", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
       const schema = wrapper.schema;
 
@@ -105,10 +100,10 @@ describe('SubagentToolWrapper', () => {
     });
   });
 
-  describe('createInvocation', () => {
-    it('should create a SubagentInvocation with the correct parameters', () => {
+  describe("createInvocation", () => {
+    it("should create a SubagentInvocation with the correct parameters", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
-      const params: AgentInputs = { goal: 'Test the invocation', priority: 1 };
+      const params: AgentInputs = { goal: "Test the invocation", priority: 1 };
 
       // The public `build` method calls the protected `createInvocation` after validation
       const invocation = wrapper.build(params);
@@ -122,14 +117,10 @@ describe('SubagentToolWrapper', () => {
       );
     });
 
-    it('should pass the messageBus to the SubagentInvocation constructor', () => {
+    it("should pass the messageBus to the SubagentInvocation constructor", () => {
       const mockMessageBus = {} as MessageBus;
-      const wrapper = new SubagentToolWrapper(
-        mockDefinition,
-        mockConfig,
-        mockMessageBus,
-      );
-      const params: AgentInputs = { goal: 'Test the invocation', priority: 1 };
+      const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig, mockMessageBus);
+      const params: AgentInputs = { goal: "Test the invocation", priority: 1 };
 
       wrapper.build(params);
 
@@ -141,7 +132,7 @@ describe('SubagentToolWrapper', () => {
       );
     });
 
-    it('should throw a validation error for invalid parameters before creating an invocation', () => {
+    it("should throw a validation error for invalid parameters before creating an invocation", () => {
       const wrapper = new SubagentToolWrapper(mockDefinition, mockConfig);
       // Missing the required 'goal' parameter
       const invalidParams = { priority: 1 };
diff --git a/packages/gemini-core/src/agents/subagent-tool-wrapper.ts b/packages/gemini-core/src/agents/subagent-tool-wrapper.ts
index ace4ee347..18dcaf889 100644
--- a/packages/gemini-core/src/agents/subagent-tool-wrapper.ts
+++ b/packages/gemini-core/src/agents/subagent-tool-wrapper.ts
@@ -4,26 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  BaseDeclarativeTool,
-  Kind,
-  type ToolInvocation,
-  type ToolResult,
-} from '../tools/tools.js';
-import type { Config } from '../config/config.js';
-import type { AgentDefinition, AgentInputs } from './types.js';
-import { convertInputConfigToJsonSchema } from './schema-utils.js';
-import { SubagentInvocation } from './invocation.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { BaseDeclarativeTool, Kind, type ToolInvocation, type ToolResult } from "../tools/tools.js";
+import { SubagentInvocation } from "./invocation.js";
+import { convertInputConfigToJsonSchema } from "./schema-utils.js";
+import type { AgentDefinition, AgentInputs } from "./types.js";
 
 /**
  * A tool wrapper that dynamically exposes a subagent as a standard,
  * strongly-typed `DeclarativeTool`.
  */
-export class SubagentToolWrapper extends BaseDeclarativeTool<
-  AgentInputs,
-  ToolResult
-> {
+export class SubagentToolWrapper extends BaseDeclarativeTool<AgentInputs, ToolResult> {
   /**
    * Constructs the tool wrapper.
    *
@@ -40,9 +32,7 @@ export class SubagentToolWrapper extends BaseDeclarativeTool<
     messageBus?: MessageBus,
   ) {
     // Dynamically generate the JSON schema required for the tool definition.
-    const parameterSchema = convertInputConfigToJsonSchema(
-      definition.inputConfig,
-    );
+    const parameterSchema = convertInputConfigToJsonSchema(definition.inputConfig);
 
     super(
       definition.name,
@@ -65,14 +55,7 @@ export class SubagentToolWrapper extends BaseDeclarativeTool<
    * @param params The validated input parameters from the parent agent's call.
    * @returns A `ToolInvocation` instance ready for execution.
    */
-  protected createInvocation(
-    params: AgentInputs,
-  ): ToolInvocation<AgentInputs, ToolResult> {
-    return new SubagentInvocation(
-      params,
-      this.definition,
-      this.config,
-      this.messageBus,
-    );
+  protected createInvocation(params: AgentInputs): ToolInvocation<AgentInputs, ToolResult> {
+    return new SubagentInvocation(params, this.definition, this.config, this.messageBus);
   }
 }
diff --git a/packages/gemini-core/src/agents/types.ts b/packages/gemini-core/src/agents/types.ts
index 5a152ba8d..57efc9b8a 100644
--- a/packages/gemini-core/src/agents/types.ts
+++ b/packages/gemini-core/src/agents/types.ts
@@ -8,20 +8,20 @@
  * @fileoverview Defines the core configuration interfaces and types for the agent architecture.
  */
 
-import type { Content, FunctionDeclaration } from '@google/genai';
-import type { AnyDeclarativeTool } from '../tools/tools.js';
-import { type z } from 'zod';
+import type { Content, FunctionDeclaration } from "@google/genai";
+import { type z } from "zod";
+import type { AnyDeclarativeTool } from "../tools/tools.js";
 
 /**
  * Describes the possible termination modes for an agent.
  */
 export enum AgentTerminateMode {
-  ERROR = 'ERROR',
-  TIMEOUT = 'TIMEOUT',
-  GOAL = 'GOAL',
-  MAX_TURNS = 'MAX_TURNS',
-  ABORTED = 'ABORTED',
-  ERROR_NO_COMPLETE_TASK_CALL = 'ERROR_NO_COMPLETE_TASK_CALL',
+  ERROR = "ERROR",
+  TIMEOUT = "TIMEOUT",
+  GOAL = "GOAL",
+  MAX_TURNS = "MAX_TURNS",
+  ABORTED = "ABORTED",
+  ERROR_NO_COMPLETE_TASK_CALL = "ERROR_NO_COMPLETE_TASK_CALL",
 }
 
 /**
@@ -44,7 +44,7 @@ export type AgentInputs = Record<string, unknown>;
 export interface SubagentActivityEvent {
   isSubagentActivityEvent: true;
   agentName: string;
-  type: 'TOOL_CALL_START' | 'TOOL_CALL_END' | 'THOUGHT_CHUNK' | 'ERROR';
+  type: "TOOL_CALL_START" | "TOOL_CALL_END" | "THOUGHT_CHUNK" | "ERROR";
   data: Record<string, unknown>;
 }
 
@@ -114,13 +114,7 @@ export interface InputConfig {
     string,
     {
       description: string;
-      type:
-        | 'string'
-        | 'number'
-        | 'boolean'
-        | 'integer'
-        | 'string[]'
-        | 'number[]';
+      type: "string" | "number" | "boolean" | "integer" | "string[]" | "number[]";
       required: boolean;
     }
   >;
diff --git a/packages/gemini-core/src/agents/utils.test.ts b/packages/gemini-core/src/agents/utils.test.ts
index 348f8fe0b..7995c04cf 100644
--- a/packages/gemini-core/src/agents/utils.test.ts
+++ b/packages/gemini-core/src/agents/utils.test.ts
@@ -4,37 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { templateString } from './utils.js';
-import type { AgentInputs } from './types.js';
-
-describe('templateString', () => {
-  it('should replace a single placeholder with a string value', () => {
-    const template = 'Hello, ${name}!';
-    const inputs: AgentInputs = { name: 'World' };
+import { describe, expect, it } from "vitest";
+import type { AgentInputs } from "./types.js";
+import { templateString } from "./utils.js";
+
+describe("templateString", () => {
+  it("should replace a single placeholder with a string value", () => {
+    const template = "Hello, ${name}!";
+    const inputs: AgentInputs = { name: "World" };
     const result = templateString(template, inputs);
-    expect(result).toBe('Hello, World!');
+    expect(result).toBe("Hello, World!");
   });
 
-  it('should replace multiple unique placeholders', () => {
-    const template = 'User: ${user}, Role: ${role}';
-    const inputs: AgentInputs = { user: 'Alex', role: 'Admin' };
+  it("should replace multiple unique placeholders", () => {
+    const template = "User: ${user}, Role: ${role}";
+    const inputs: AgentInputs = { user: "Alex", role: "Admin" };
     const result = templateString(template, inputs);
-    expect(result).toBe('User: Alex, Role: Admin');
+    expect(result).toBe("User: Alex, Role: Admin");
   });
 
-  it('should replace multiple instances of the same placeholder', () => {
-    const template = '${greeting}, ${user}. Welcome, ${user}!';
-    const inputs: AgentInputs = { greeting: 'Hi', user: 'Sam' };
+  it("should replace multiple instances of the same placeholder", () => {
+    const template = "${greeting}, ${user}. Welcome, ${user}!";
+    const inputs: AgentInputs = { greeting: "Hi", user: "Sam" };
     const result = templateString(template, inputs);
-    expect(result).toBe('Hi, Sam. Welcome, Sam!');
+    expect(result).toBe("Hi, Sam. Welcome, Sam!");
   });
 
-  it('should handle various data types for input values', () => {
+  it("should handle various data types for input values", () => {
     const template =
-      'Name: ${name}, Age: ${age}, Active: ${isActive}, Plan: ${plan}, Score: ${score}';
+      "Name: ${name}, Age: ${age}, Active: ${isActive}, Plan: ${plan}, Score: ${score}";
     const inputs: AgentInputs = {
-      name: 'Jo',
+      name: "Jo",
       age: 30,
       isActive: true,
       plan: null,
@@ -42,44 +42,42 @@ describe('templateString', () => {
     };
     const result = templateString(template, inputs);
     // All values are converted to their string representations
-    expect(result).toBe(
-      'Name: Jo, Age: 30, Active: true, Plan: null, Score: undefined',
-    );
+    expect(result).toBe("Name: Jo, Age: 30, Active: true, Plan: null, Score: undefined");
   });
 
-  it('should return the original string if no placeholders are present', () => {
-    const template = 'This is a plain string with no placeholders.';
-    const inputs: AgentInputs = { key: 'value' };
+  it("should return the original string if no placeholders are present", () => {
+    const template = "This is a plain string with no placeholders.";
+    const inputs: AgentInputs = { key: "value" };
     const result = templateString(template, inputs);
-    expect(result).toBe('This is a plain string with no placeholders.');
+    expect(result).toBe("This is a plain string with no placeholders.");
   });
 
-  it('should correctly handle an empty template string', () => {
-    const template = '';
-    const inputs: AgentInputs = { key: 'value' };
+  it("should correctly handle an empty template string", () => {
+    const template = "";
+    const inputs: AgentInputs = { key: "value" };
     const result = templateString(template, inputs);
-    expect(result).toBe('');
+    expect(result).toBe("");
   });
 
-  it('should ignore extra keys in the inputs object that are not in the template', () => {
-    const template = 'Hello, ${name}.';
-    const inputs: AgentInputs = { name: 'Alice', extra: 'ignored' };
+  it("should ignore extra keys in the inputs object that are not in the template", () => {
+    const template = "Hello, ${name}.";
+    const inputs: AgentInputs = { name: "Alice", extra: "ignored" };
     const result = templateString(template, inputs);
-    expect(result).toBe('Hello, Alice.');
+    expect(result).toBe("Hello, Alice.");
   });
 
-  it('should throw an error if a required key is missing from the inputs', () => {
-    const template = 'The goal is ${goal}.';
-    const inputs: AgentInputs = { other_input: 'some value' };
+  it("should throw an error if a required key is missing from the inputs", () => {
+    const template = "The goal is ${goal}.";
+    const inputs: AgentInputs = { other_input: "some value" };
 
     expect(() => templateString(template, inputs)).toThrow(
-      'Template validation failed: Missing required input parameters: goal. Available inputs: other_input',
+      "Template validation failed: Missing required input parameters: goal. Available inputs: other_input",
     );
   });
 
-  it('should throw an error listing all missing keys if multiple are missing', () => {
-    const template = 'Analyze ${file} with ${tool}.';
-    const inputs: AgentInputs = { an_available_key: 'foo' };
+  it("should throw an error listing all missing keys if multiple are missing", () => {
+    const template = "Analyze ${file} with ${tool}.";
+    const inputs: AgentInputs = { an_available_key: "foo" };
 
     // Using a regex to allow for any order of missing keys in the error message
     expect(() => templateString(template, inputs)).toThrow(
@@ -87,29 +85,26 @@ describe('templateString', () => {
     );
   });
 
-  it('should be case-sensitive with placeholder keys', () => {
-    const template = 'Value: ${Key}';
-    const inputs: AgentInputs = { key: 'some value' }; // 'key' is lowercase
+  it("should be case-sensitive with placeholder keys", () => {
+    const template = "Value: ${Key}";
+    const inputs: AgentInputs = { key: "some value" }; // 'key' is lowercase
 
     expect(() => templateString(template, inputs)).toThrow(
-      'Template validation failed: Missing required input parameters: Key. Available inputs: key',
+      "Template validation failed: Missing required input parameters: Key. Available inputs: key",
     );
   });
 
-  it('should not replace malformed or incomplete placeholders', () => {
-    const template =
-      'This is {not_a_placeholder} and this is $$escaped. Test: ${valid}';
-    const inputs: AgentInputs = { valid: 'works' };
+  it("should not replace malformed or incomplete placeholders", () => {
+    const template = "This is {not_a_placeholder} and this is $$escaped. Test: ${valid}";
+    const inputs: AgentInputs = { valid: "works" };
     const result = templateString(template, inputs);
-    expect(result).toBe(
-      'This is {not_a_placeholder} and this is $$escaped. Test: works',
-    );
+    expect(result).toBe("This is {not_a_placeholder} and this is $$escaped. Test: works");
   });
 
-  it('should work correctly with an empty inputs object if the template has no placeholders', () => {
-    const template = 'Static text.';
+  it("should work correctly with an empty inputs object if the template has no placeholders", () => {
+    const template = "Static text.";
     const inputs: AgentInputs = {};
     const result = templateString(template, inputs);
-    expect(result).toBe('Static text.');
+    expect(result).toBe("Static text.");
   });
 });
diff --git a/packages/gemini-core/src/agents/utils.ts b/packages/gemini-core/src/agents/utils.ts
index 484c845e9..1016acaf2 100644
--- a/packages/gemini-core/src/agents/utils.ts
+++ b/packages/gemini-core/src/agents/utils.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AgentInputs } from './types.js';
+import type { AgentInputs } from "./types.js";
 
 /**
  * Replaces `${...}` placeholders in a template string with values from AgentInputs.
@@ -24,20 +24,16 @@ export function templateString(template: string, inputs: AgentInputs): string {
 
   // Check if all required keys exist in the inputs.
   const inputKeys = new Set(Object.keys(inputs));
-  const missingKeys = Array.from(requiredKeys).filter(
-    (key) => !inputKeys.has(key),
-  );
+  const missingKeys = Array.from(requiredKeys).filter((key) => !inputKeys.has(key));
 
   if (missingKeys.length > 0) {
     // Enhanced error message showing both missing and available keys
     throw new Error(
-      `Template validation failed: Missing required input parameters: ${missingKeys.join(', ')}. ` +
-        `Available inputs: ${Object.keys(inputs).join(', ')}`,
+      `Template validation failed: Missing required input parameters: ${missingKeys.join(", ")}. ` +
+        `Available inputs: ${Object.keys(inputs).join(", ")}`,
     );
   }
 
   // Perform the replacement using a replacer function.
-  return template.replace(placeholderRegex, (_match, key) =>
-    String(inputs[key]),
-  );
+  return template.replace(placeholderRegex, (_match, key) => String(inputs[key]));
 }
diff --git a/packages/gemini-core/src/code_assist/codeAssist.test.ts b/packages/gemini-core/src/code_assist/codeAssist.test.ts
index 1608a7d97..fb72cc0d0 100644
--- a/packages/gemini-core/src/code_assist/codeAssist.test.ts
+++ b/packages/gemini-core/src/code_assist/codeAssist.test.ts
@@ -4,45 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { AuthType } from '../core/contentGenerator.js';
-import { getOauthClient } from './oauth2.js';
-import { setupUser } from './setup.js';
-import { CodeAssistServer } from './server.js';
-import {
-  createCodeAssistContentGenerator,
-  getCodeAssistServer,
-} from './codeAssist.js';
-import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from '../core/loggingContentGenerator.js';
-import { UserTierId } from './types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { LoggingContentGenerator } from "../core/loggingContentGenerator.js";
+import { createCodeAssistContentGenerator, getCodeAssistServer } from "./codeAssist.js";
+import { getOauthClient } from "./oauth2.js";
+import { CodeAssistServer } from "./server.js";
+import { setupUser } from "./setup.js";
+import { UserTierId } from "./types.js";
 
 // Mock dependencies
-vi.mock('./oauth2.js');
-vi.mock('./setup.js');
-vi.mock('./server.js');
-vi.mock('../core/loggingContentGenerator.js');
+vi.mock("./oauth2.js");
+vi.mock("./setup.js");
+vi.mock("./server.js");
+vi.mock("../core/loggingContentGenerator.js");
 
 const mockedGetOauthClient = vi.mocked(getOauthClient);
 const mockedSetupUser = vi.mocked(setupUser);
 const MockedCodeAssistServer = vi.mocked(CodeAssistServer);
 const MockedLoggingContentGenerator = vi.mocked(LoggingContentGenerator);
 
-describe('codeAssist', () => {
+describe("codeAssist", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  describe('createCodeAssistContentGenerator', () => {
+  describe("createCodeAssistContentGenerator", () => {
     const httpOptions = {};
     const mockConfig = {} as Config;
-    const mockAuthClient = { a: 'client' };
+    const mockAuthClient = { a: "client" };
     const mockUserData = {
-      projectId: 'test-project',
+      projectId: "test-project",
       userTier: UserTierId.FREE,
     };
 
-    it('should create a server for LOGIN_WITH_GOOGLE', async () => {
+    it("should create a server for LOGIN_WITH_GOOGLE", async () => {
       mockedGetOauthClient.mockResolvedValue(mockAuthClient as never);
       mockedSetupUser.mockResolvedValue(mockUserData);
 
@@ -50,25 +47,22 @@ describe('codeAssist', () => {
         httpOptions,
         AuthType.LOGIN_WITH_GOOGLE,
         mockConfig,
-        'session-123',
+        "session-123",
       );
 
-      expect(getOauthClient).toHaveBeenCalledWith(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfig,
-      );
+      expect(getOauthClient).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
       expect(setupUser).toHaveBeenCalledWith(mockAuthClient);
       expect(MockedCodeAssistServer).toHaveBeenCalledWith(
         mockAuthClient,
-        'test-project',
+        "test-project",
         httpOptions,
-        'session-123',
-        'free-tier',
+        "session-123",
+        "free-tier",
       );
       expect(generator).toBeInstanceOf(MockedCodeAssistServer);
     });
 
-    it('should create a server for CLOUD_SHELL', async () => {
+    it("should create a server for CLOUD_SHELL", async () => {
       mockedGetOauthClient.mockResolvedValue(mockAuthClient as never);
       mockedSetupUser.mockResolvedValue(mockUserData);
 
@@ -78,35 +72,32 @@ describe('codeAssist', () => {
         mockConfig,
       );
 
-      expect(getOauthClient).toHaveBeenCalledWith(
-        AuthType.CLOUD_SHELL,
-        mockConfig,
-      );
+      expect(getOauthClient).toHaveBeenCalledWith(AuthType.CLOUD_SHELL, mockConfig);
       expect(setupUser).toHaveBeenCalledWith(mockAuthClient);
       expect(MockedCodeAssistServer).toHaveBeenCalledWith(
         mockAuthClient,
-        'test-project',
+        "test-project",
         httpOptions,
         undefined, // No session ID
-        'free-tier',
+        "free-tier",
       );
       expect(generator).toBeInstanceOf(MockedCodeAssistServer);
     });
 
-    it('should throw an error for unsupported auth types', async () => {
+    it("should throw an error for unsupported auth types", async () => {
       await expect(
         createCodeAssistContentGenerator(
           httpOptions,
-          'api-key' as AuthType, // Use literal string to avoid enum resolution issues
+          "api-key" as AuthType, // Use literal string to avoid enum resolution issues
           mockConfig,
         ),
-      ).rejects.toThrow('Unsupported authType: api-key');
+      ).rejects.toThrow("Unsupported authType: api-key");
     });
   });
 
-  describe('getCodeAssistServer', () => {
-    it('should return the server if it is a CodeAssistServer', () => {
-      const mockServer = new MockedCodeAssistServer({} as never, '', {});
+  describe("getCodeAssistServer", () => {
+    it("should return the server if it is a CodeAssistServer", () => {
+      const mockServer = new MockedCodeAssistServer({} as never, "", {});
       const mockConfig = {
         getContentGenerator: () => mockServer,
       } as unknown as Config;
@@ -115,13 +106,10 @@ describe('codeAssist', () => {
       expect(server).toBe(mockServer);
     });
 
-    it('should unwrap and return the server if it is wrapped in a LoggingContentGenerator', () => {
-      const mockServer = new MockedCodeAssistServer({} as never, '', {});
-      const mockLogger = new MockedLoggingContentGenerator(
-        {} as never,
-        {} as never,
-      );
-      vi.spyOn(mockLogger, 'getWrapped').mockReturnValue(mockServer);
+    it("should unwrap and return the server if it is wrapped in a LoggingContentGenerator", () => {
+      const mockServer = new MockedCodeAssistServer({} as never, "", {});
+      const mockLogger = new MockedLoggingContentGenerator({} as never, {} as never);
+      vi.spyOn(mockLogger, "getWrapped").mockReturnValue(mockServer);
 
       const mockConfig = {
         getContentGenerator: () => mockLogger,
@@ -132,8 +120,8 @@ describe('codeAssist', () => {
       expect(mockLogger.getWrapped).toHaveBeenCalled();
     });
 
-    it('should return undefined if the content generator is not a CodeAssistServer', () => {
-      const mockGenerator = { a: 'generator' }; // Not a CodeAssistServer
+    it("should return undefined if the content generator is not a CodeAssistServer", () => {
+      const mockGenerator = { a: "generator" }; // Not a CodeAssistServer
       const mockConfig = {
         getContentGenerator: () => mockGenerator,
       } as unknown as Config;
@@ -142,15 +130,10 @@ describe('codeAssist', () => {
       expect(server).toBeUndefined();
     });
 
-    it('should return undefined if the wrapped generator is not a CodeAssistServer', () => {
-      const mockGenerator = { a: 'generator' }; // Not a CodeAssistServer
-      const mockLogger = new MockedLoggingContentGenerator(
-        {} as never,
-        {} as never,
-      );
-      vi.spyOn(mockLogger, 'getWrapped').mockReturnValue(
-        mockGenerator as never,
-      );
+    it("should return undefined if the wrapped generator is not a CodeAssistServer", () => {
+      const mockGenerator = { a: "generator" }; // Not a CodeAssistServer
+      const mockLogger = new MockedLoggingContentGenerator({} as never, {} as never);
+      vi.spyOn(mockLogger, "getWrapped").mockReturnValue(mockGenerator as never);
 
       const mockConfig = {
         getContentGenerator: () => mockLogger,
diff --git a/packages/gemini-core/src/code_assist/codeAssist.ts b/packages/gemini-core/src/code_assist/codeAssist.ts
index c8ade92ed..ee5d13ac6 100644
--- a/packages/gemini-core/src/code_assist/codeAssist.ts
+++ b/packages/gemini-core/src/code_assist/codeAssist.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import { AuthType } from '../core/contentGenerator.js';
-import { getOauthClient } from './oauth2.js';
-import { setupUser } from './setup.js';
-import type { HttpOptions } from './server.js';
-import { CodeAssistServer } from './server.js';
-import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from '../core/loggingContentGenerator.js';
+import type { Config } from "../config/config.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { LoggingContentGenerator } from "../core/loggingContentGenerator.js";
+import { getOauthClient } from "./oauth2.js";
+import type { HttpOptions } from "./server.js";
+import { CodeAssistServer } from "./server.js";
+import { setupUser } from "./setup.js";
 
 export async function createCodeAssistContentGenerator(
   httpOptions: HttpOptions,
@@ -19,10 +19,7 @@ export async function createCodeAssistContentGenerator(
   config: Config,
   sessionId?: string,
 ): Promise<ContentGenerator> {
-  if (
-    authType === AuthType.LOGIN_WITH_GOOGLE ||
-    authType === AuthType.CLOUD_SHELL
-  ) {
+  if (authType === AuthType.LOGIN_WITH_GOOGLE || authType === AuthType.CLOUD_SHELL) {
     const authClient = await getOauthClient(authType, config);
     const userData = await setupUser(authClient);
     return new CodeAssistServer(
@@ -37,9 +34,7 @@ export async function createCodeAssistContentGenerator(
   throw new Error(`Unsupported authType: ${authType}`);
 }
 
-export function getCodeAssistServer(
-  config: Config,
-): CodeAssistServer | undefined {
+export function getCodeAssistServer(config: Config): CodeAssistServer | undefined {
   let server = config.getContentGenerator();
 
   // Unwrap LoggingContentGenerator if present
diff --git a/packages/gemini-core/src/code_assist/converter.test.ts b/packages/gemini-core/src/code_assist/converter.test.ts
index 17dba1e4d..3c2371874 100644
--- a/packages/gemini-core/src/code_assist/converter.test.ts
+++ b/packages/gemini-core/src/code_assist/converter.test.ts
@@ -4,42 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import type { CaGenerateContentResponse } from './converter.js';
-import {
-  toGenerateContentRequest,
-  fromGenerateContentResponse,
-  toContents,
-} from './converter.js';
-import type {
-  ContentListUnion,
-  GenerateContentParameters,
-} from '@google/genai';
-import {
-  GenerateContentResponse,
-  FinishReason,
-  BlockedReason,
-  type Part,
-} from '@google/genai';
+import type { ContentListUnion, GenerateContentParameters } from "@google/genai";
+import { BlockedReason, FinishReason, GenerateContentResponse, type Part } from "@google/genai";
+import { describe, expect, it } from "vitest";
+import type { CaGenerateContentResponse } from "./converter.js";
+import { fromGenerateContentResponse, toContents, toGenerateContentRequest } from "./converter.js";
 
-describe('converter', () => {
-  describe('toCodeAssistRequest', () => {
-    it('should convert a simple request with project', () => {
+describe("converter", () => {
+  describe("toCodeAssistRequest", () => {
+    it("should convert a simple request with project", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: "gemini-pro",
+        contents: [{ role: "user", parts: [{ text: "Hello" }] }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq).toEqual({
-        model: 'gemini-pro',
-        project: 'my-project',
+        model: "gemini-pro",
+        project: "my-project",
         request: {
-          contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+          contents: [{ role: "user", parts: [{ text: "Hello" }] }],
           systemInstruction: undefined,
           cachedContent: undefined,
           tools: undefined,
@@ -47,28 +35,28 @@ describe('converter', () => {
           labels: undefined,
           safetySettings: undefined,
           generationConfig: undefined,
-          session_id: 'my-session',
+          session_id: "my-session",
         },
-        user_prompt_id: 'my-prompt',
+        user_prompt_id: "my-prompt",
       });
     });
 
-    it('should convert a request without a project', () => {
+    it("should convert a request without a project", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: "gemini-pro",
+        contents: [{ role: "user", parts: [{ text: "Hello" }] }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
+        "my-prompt",
         undefined,
-        'my-session',
+        "my-session",
       );
       expect(codeAssistReq).toEqual({
-        model: 'gemini-pro',
+        model: "gemini-pro",
         project: undefined,
         request: {
-          contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+          contents: [{ role: "user", parts: [{ text: "Hello" }] }],
           systemInstruction: undefined,
           cachedContent: undefined,
           tools: undefined,
@@ -76,28 +64,28 @@ describe('converter', () => {
           labels: undefined,
           safetySettings: undefined,
           generationConfig: undefined,
-          session_id: 'my-session',
+          session_id: "my-session",
         },
-        user_prompt_id: 'my-prompt',
+        user_prompt_id: "my-prompt",
       });
     });
 
-    it('should convert a request with sessionId', () => {
+    it("should convert a request with sessionId", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: "gemini-pro",
+        contents: [{ role: "user", parts: [{ text: "Hello" }] }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'session-123',
+        "my-prompt",
+        "my-project",
+        "session-123",
       );
       expect(codeAssistReq).toEqual({
-        model: 'gemini-pro',
-        project: 'my-project',
+        model: "gemini-pro",
+        project: "my-project",
         request: {
-          contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+          contents: [{ role: "user", parts: [{ text: "Hello" }] }],
           systemInstruction: undefined,
           cachedContent: undefined,
           tools: undefined,
@@ -105,69 +93,69 @@ describe('converter', () => {
           labels: undefined,
           safetySettings: undefined,
           generationConfig: undefined,
-          session_id: 'session-123',
+          session_id: "session-123",
         },
-        user_prompt_id: 'my-prompt',
+        user_prompt_id: "my-prompt",
       });
     });
 
-    it('should handle string content', () => {
+    it("should handle string content", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.contents).toEqual([
-        { role: 'user', parts: [{ text: 'Hello' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
       ]);
     });
 
-    it('should handle Part[] content', () => {
+    it("should handle Part[] content", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ text: 'Hello' }, { text: 'World' }],
+        model: "gemini-pro",
+        contents: [{ text: "Hello" }, { text: "World" }],
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.contents).toEqual([
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        { role: 'user', parts: [{ text: 'World' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
+        { role: "user", parts: [{ text: "World" }] },
       ]);
     });
 
-    it('should handle system instructions', () => {
+    it("should handle system instructions", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
         config: {
-          systemInstruction: 'You are a helpful assistant.',
+          systemInstruction: "You are a helpful assistant.",
         },
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.systemInstruction).toEqual({
-        role: 'user',
-        parts: [{ text: 'You are a helpful assistant.' }],
+        role: "user",
+        parts: [{ text: "You are a helpful assistant." }],
       });
     });
 
-    it('should handle generation config', () => {
+    it("should handle generation config", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
         config: {
           temperature: 0.8,
           topK: 40,
@@ -175,9 +163,9 @@ describe('converter', () => {
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.generationConfig).toEqual({
         temperature: 0.8,
@@ -185,30 +173,30 @@ describe('converter', () => {
       });
     });
 
-    it('should handle all generation config fields', () => {
+    it("should handle all generation config fields", () => {
       const genaiReq: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: 'Hello',
+        model: "gemini-pro",
+        contents: "Hello",
         config: {
           temperature: 0.1,
           topP: 0.2,
           topK: 3,
           candidateCount: 4,
           maxOutputTokens: 5,
-          stopSequences: ['a'],
+          stopSequences: ["a"],
           responseLogprobs: true,
           logprobs: 6,
           presencePenalty: 0.7,
           frequencyPenalty: 0.8,
           seed: 9,
-          responseMimeType: 'application/json',
+          responseMimeType: "application/json",
         },
       };
       const codeAssistReq = toGenerateContentRequest(
         genaiReq,
-        'my-prompt',
-        'my-project',
-        'my-session',
+        "my-prompt",
+        "my-project",
+        "my-session",
       );
       expect(codeAssistReq.request.generationConfig).toEqual({
         temperature: 0.1,
@@ -216,27 +204,27 @@ describe('converter', () => {
         topK: 3,
         candidateCount: 4,
         maxOutputTokens: 5,
-        stopSequences: ['a'],
+        stopSequences: ["a"],
         responseLogprobs: true,
         logprobs: 6,
         presencePenalty: 0.7,
         frequencyPenalty: 0.8,
         seed: 9,
-        responseMimeType: 'application/json',
+        responseMimeType: "application/json",
       });
     });
   });
 
-  describe('fromCodeAssistResponse', () => {
-    it('should convert a simple response', () => {
+  describe("fromCodeAssistResponse", () => {
+    it("should convert a simple response", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [
             {
               index: 0,
               content: {
-                role: 'model',
-                parts: [{ text: 'Hi there!' }],
+                role: "model",
+                parts: [{ text: "Hi there!" }],
               },
               finishReason: FinishReason.STOP,
               safetyRatings: [],
@@ -249,7 +237,7 @@ describe('converter', () => {
       expect(genaiRes.candidates).toEqual(codeAssistRes.response.candidates);
     });
 
-    it('should handle prompt feedback and usage metadata', () => {
+    it("should handle prompt feedback and usage metadata", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
@@ -265,27 +253,23 @@ describe('converter', () => {
         },
       };
       const genaiRes = fromGenerateContentResponse(codeAssistRes);
-      expect(genaiRes.promptFeedback).toEqual(
-        codeAssistRes.response.promptFeedback,
-      );
-      expect(genaiRes.usageMetadata).toEqual(
-        codeAssistRes.response.usageMetadata,
-      );
+      expect(genaiRes.promptFeedback).toEqual(codeAssistRes.response.promptFeedback);
+      expect(genaiRes.usageMetadata).toEqual(codeAssistRes.response.usageMetadata);
     });
 
-    it('should handle automatic function calling history', () => {
+    it("should handle automatic function calling history", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
           automaticFunctionCallingHistory: [
             {
-              role: 'model',
+              role: "model",
               parts: [
                 {
                   functionCall: {
-                    name: 'test_function',
+                    name: "test_function",
                     args: {
-                      foo: 'bar',
+                      foo: "bar",
                     },
                   },
                 },
@@ -300,29 +284,29 @@ describe('converter', () => {
       );
     });
 
-    it('should handle modelVersion', () => {
+    it("should handle modelVersion", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
-          modelVersion: 'gemini-2.5-pro',
+          modelVersion: "gemini-2.5-pro",
         },
       };
       const genaiRes = fromGenerateContentResponse(codeAssistRes);
-      expect(genaiRes.modelVersion).toEqual('gemini-2.5-pro');
+      expect(genaiRes.modelVersion).toEqual("gemini-2.5-pro");
     });
 
-    it('should handle traceId', () => {
+    it("should handle traceId", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
         },
-        traceId: 'my-trace-id',
+        traceId: "my-trace-id",
       };
       const genaiRes = fromGenerateContentResponse(codeAssistRes);
-      expect(genaiRes.responseId).toEqual('my-trace-id');
+      expect(genaiRes.responseId).toEqual("my-trace-id");
     });
 
-    it('should handle missing traceId', () => {
+    it("should handle missing traceId", () => {
       const codeAssistRes: CaGenerateContentResponse = {
         response: {
           candidates: [],
@@ -333,141 +317,135 @@ describe('converter', () => {
     });
   });
 
-  describe('toContents', () => {
-    it('should handle Content', () => {
+  describe("toContents", () => {
+    it("should handle Content", () => {
       const content: ContentListUnion = {
-        role: 'user',
-        parts: [{ text: 'hello' }],
+        role: "user",
+        parts: [{ text: "hello" }],
       };
-      expect(toContents(content)).toEqual([
-        { role: 'user', parts: [{ text: 'hello' }] },
-      ]);
+      expect(toContents(content)).toEqual([{ role: "user", parts: [{ text: "hello" }] }]);
     });
 
-    it('should handle array of Contents', () => {
+    it("should handle array of Contents", () => {
       const contents: ContentListUnion = [
-        { role: 'user', parts: [{ text: 'hello' }] },
-        { role: 'model', parts: [{ text: 'hi' }] },
+        { role: "user", parts: [{ text: "hello" }] },
+        { role: "model", parts: [{ text: "hi" }] },
       ];
       expect(toContents(contents)).toEqual([
-        { role: 'user', parts: [{ text: 'hello' }] },
-        { role: 'model', parts: [{ text: 'hi' }] },
+        { role: "user", parts: [{ text: "hello" }] },
+        { role: "model", parts: [{ text: "hi" }] },
       ]);
     });
 
-    it('should handle Part', () => {
-      const part: ContentListUnion = { text: 'a part' };
-      expect(toContents(part)).toEqual([
-        { role: 'user', parts: [{ text: 'a part' }] },
-      ]);
+    it("should handle Part", () => {
+      const part: ContentListUnion = { text: "a part" };
+      expect(toContents(part)).toEqual([{ role: "user", parts: [{ text: "a part" }] }]);
     });
 
-    it('should handle array of Parts', () => {
-      const parts = [{ text: 'part 1' }, 'part 2'];
+    it("should handle array of Parts", () => {
+      const parts = [{ text: "part 1" }, "part 2"];
       expect(toContents(parts)).toEqual([
-        { role: 'user', parts: [{ text: 'part 1' }] },
-        { role: 'user', parts: [{ text: 'part 2' }] },
+        { role: "user", parts: [{ text: "part 1" }] },
+        { role: "user", parts: [{ text: "part 2" }] },
       ]);
     });
 
-    it('should handle string', () => {
-      const str: ContentListUnion = 'a string';
-      expect(toContents(str)).toEqual([
-        { role: 'user', parts: [{ text: 'a string' }] },
-      ]);
+    it("should handle string", () => {
+      const str: ContentListUnion = "a string";
+      expect(toContents(str)).toEqual([{ role: "user", parts: [{ text: "a string" }] }]);
     });
 
-    it('should handle array of strings', () => {
-      const strings: ContentListUnion = ['string 1', 'string 2'];
+    it("should handle array of strings", () => {
+      const strings: ContentListUnion = ["string 1", "string 2"];
       expect(toContents(strings)).toEqual([
-        { role: 'user', parts: [{ text: 'string 1' }] },
-        { role: 'user', parts: [{ text: 'string 2' }] },
+        { role: "user", parts: [{ text: "string 1" }] },
+        { role: "user", parts: [{ text: "string 2" }] },
       ]);
     });
 
-    it('should convert thought parts to text parts for API compatibility', () => {
+    it("should convert thought parts to text parts for API compatibility", () => {
       const contentWithThought: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
-          { text: 'regular text' },
-          { thought: 'thinking about the problem' } as Part & {
+          { text: "regular text" },
+          { thought: "thinking about the problem" } as Part & {
             thought: string;
           },
-          { text: 'more text' },
+          { text: "more text" },
         ],
       };
       expect(toContents(contentWithThought)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
-            { text: 'regular text' },
-            { text: '[Thought: thinking about the problem]' },
-            { text: 'more text' },
+            { text: "regular text" },
+            { text: "[Thought: thinking about the problem]" },
+            { text: "more text" },
           ],
         },
       ]);
     });
 
-    it('should combine text and thought for text parts with thoughts', () => {
+    it("should combine text and thought for text parts with thoughts", () => {
       const contentWithTextAndThought: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
           {
-            text: 'Here is my response',
-            thought: 'I need to be careful here',
+            text: "Here is my response",
+            thought: "I need to be careful here",
           } as Part & { thought: string },
         ],
       };
       expect(toContents(contentWithTextAndThought)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
-              text: 'Here is my response\n[Thought: I need to be careful here]',
+              text: "Here is my response\n[Thought: I need to be careful here]",
             },
           ],
         },
       ]);
     });
 
-    it('should preserve non-thought properties while removing thought', () => {
+    it("should preserve non-thought properties while removing thought", () => {
       const contentWithComplexPart: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
           {
-            functionCall: { name: 'calculate', args: { x: 5, y: 10 } },
-            thought: 'Performing calculation',
+            functionCall: { name: "calculate", args: { x: 5, y: 10 } },
+            thought: "Performing calculation",
           } as Part & { thought: string },
         ],
       };
       expect(toContents(contentWithComplexPart)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
-              functionCall: { name: 'calculate', args: { x: 5, y: 10 } },
+              functionCall: { name: "calculate", args: { x: 5, y: 10 } },
             },
           ],
         },
       ]);
     });
 
-    it('should convert invalid text content to valid text part with thought', () => {
+    it("should convert invalid text content to valid text part with thought", () => {
       const contentWithInvalidText: ContentListUnion = {
-        role: 'model',
+        role: "model",
         parts: [
           {
             text: 123, // Invalid - should be string
-            thought: 'Processing number',
+            thought: "Processing number",
           } as Part & { thought: string; text: number },
         ],
       };
       expect(toContents(contentWithInvalidText)).toEqual([
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
-              text: '123\n[Thought: Processing number]',
+              text: "123\n[Thought: Processing number]",
             },
           ],
         },
diff --git a/packages/gemini-core/src/code_assist/converter.ts b/packages/gemini-core/src/code_assist/converter.ts
index 2b8b0a3a3..1612bf59f 100644
--- a/packages/gemini-core/src/code_assist/converter.ts
+++ b/packages/gemini-core/src/code_assist/converter.ts
@@ -5,28 +5,28 @@
  */
 
 import type {
+  Candidate,
   Content,
   ContentListUnion,
   ContentUnion,
-  GenerateContentConfig,
-  GenerateContentParameters,
   CountTokensParameters,
   CountTokensResponse,
+  GenerateContentConfig,
+  GenerateContentParameters,
+  GenerateContentResponsePromptFeedback,
+  GenerateContentResponseUsageMetadata,
   GenerationConfigRoutingConfig,
   MediaResolution,
-  Candidate,
   ModelSelectionConfig,
-  GenerateContentResponsePromptFeedback,
-  GenerateContentResponseUsageMetadata,
   Part,
-  SafetySetting,
   PartUnion,
+  SafetySetting,
   SpeechConfigUnion,
   ThinkingConfig,
-  ToolListUnion,
   ToolConfig,
-} from '@google/genai';
-import { GenerateContentResponse } from '@google/genai';
+  ToolListUnion,
+} from "@google/genai";
+import { GenerateContentResponse } from "@google/genai";
 
 export interface CAGenerateContentRequest {
   model: string;
@@ -97,20 +97,16 @@ export interface CaCountTokenResponse {
   totalTokens: number;
 }
 
-export function toCountTokenRequest(
-  req: CountTokensParameters,
-): CaCountTokenRequest {
+export function toCountTokenRequest(req: CountTokensParameters): CaCountTokenRequest {
   return {
     request: {
-      model: 'models/' + req.model,
+      model: "models/" + req.model,
       contents: toContents(req.contents),
     },
   };
 }
 
-export function fromCountTokenResponse(
-  res: CaCountTokenResponse,
-): CountTokensResponse {
+export function fromCountTokenResponse(res: CaCountTokenResponse): CountTokensResponse {
   return {
     totalTokens: res.totalTokens,
   };
@@ -181,29 +177,27 @@ function toContent(content: ContentUnion): Content {
   if (Array.isArray(content)) {
     // it's a PartsUnion[]
     return {
-      role: 'user',
+      role: "user",
       parts: toParts(content),
     };
   }
-  if (typeof content === 'string') {
+  if (typeof content === "string") {
     // it's a string
     return {
-      role: 'user',
+      role: "user",
       parts: [{ text: content }],
     };
   }
-  if ('parts' in content) {
+  if ("parts" in content) {
     // it's a Content - process parts to handle thought filtering
     return {
       ...content,
-      parts: content.parts
-        ? toParts(content.parts.filter((p) => p != null))
-        : [],
+      parts: content.parts ? toParts(content.parts.filter((p) => p != null)) : [],
     };
   }
   // it's a Part
   return {
-    role: 'user',
+    role: "user",
     parts: [toPart(content as Part)],
   };
 }
@@ -213,7 +207,7 @@ export function toParts(parts: PartUnion[]): Part[] {
 }
 
 function toPart(part: PartUnion): Part {
-  if (typeof part === 'string') {
+  if (typeof part === "string") {
     // it's a string
     return { text: part };
   }
@@ -221,17 +215,17 @@ function toPart(part: PartUnion): Part {
   // Handle thought parts for CountToken API compatibility
   // The CountToken API expects parts to have certain required "oneof" fields initialized,
   // but thought parts don't conform to this schema and cause API failures
-  if ('thought' in part && part.thought) {
+  if ("thought" in part && part.thought) {
     const thoughtText = `[Thought: ${part.thought}]`;
 
     const newPart = { ...part };
-    delete (newPart as Record<string, unknown>)['thought'];
+    delete (newPart as Record<string, unknown>)["thought"];
 
     const hasApiContent =
-      'functionCall' in newPart ||
-      'functionResponse' in newPart ||
-      'inlineData' in newPart ||
-      'fileData' in newPart;
+      "functionCall" in newPart ||
+      "functionResponse" in newPart ||
+      "inlineData" in newPart ||
+      "fileData" in newPart;
 
     if (hasApiContent) {
       // It's a functionCall or other non-text part. Just strip the thought.
@@ -241,10 +235,8 @@ function toPart(part: PartUnion): Part {
     // If no other valid API content, this must be a text part.
     // Combine existing text (if any) with the thought, preserving other properties.
     const text = (newPart as { text?: unknown }).text;
-    const existingText = text ? String(text) : '';
-    const combinedText = existingText
-      ? `${existingText}\n${thoughtText}`
-      : thoughtText;
+    const existingText = text ? String(text) : "";
+    const combinedText = existingText ? `${existingText}\n${thoughtText}` : thoughtText;
 
     return {
       ...newPart,
diff --git a/packages/gemini-core/src/code_assist/experiments/client_metadata.test.ts b/packages/gemini-core/src/code_assist/experiments/client_metadata.test.ts
index 63a5b71e8..294d9038f 100644
--- a/packages/gemini-core/src/code_assist/experiments/client_metadata.test.ts
+++ b/packages/gemini-core/src/code_assist/experiments/client_metadata.test.ts
@@ -4,58 +4,58 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { ReleaseChannel, getReleaseChannel } from '../../utils/channel.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { getReleaseChannel, ReleaseChannel } from "../../utils/channel.js";
 
 // Mock dependencies before importing the module under test
-vi.mock('../../utils/channel.js', async () => {
-  const actual = await vi.importActual('../../utils/channel.js');
+vi.mock("../../utils/channel.js", async () => {
+  const actual = await vi.importActual("../../utils/channel.js");
   return {
     ...(actual as object),
     getReleaseChannel: vi.fn(),
   };
 });
 
-describe('client_metadata', () => {
+describe("client_metadata", () => {
   const originalPlatform = process.platform;
   const originalArch = process.arch;
-  const originalCliVersion = process.env['CLI_VERSION'];
+  const originalCliVersion = process.env["CLI_VERSION"];
   const originalNodeVersion = process.version;
 
   beforeEach(async () => {
     // Reset modules to clear the cached `clientMetadataPromise`
     vi.resetModules();
     // Re-import the module to get a fresh instance
-    await import('./client_metadata.js');
+    await import("./client_metadata.js");
     // Provide a default mock implementation for each test
     vi.mocked(getReleaseChannel).mockResolvedValue(ReleaseChannel.STABLE);
   });
 
   afterEach(() => {
     // Restore original process properties to avoid side-effects between tests
-    Object.defineProperty(process, 'platform', { value: originalPlatform });
-    Object.defineProperty(process, 'arch', { value: originalArch });
-    process.env['CLI_VERSION'] = originalCliVersion;
-    Object.defineProperty(process, 'version', { value: originalNodeVersion });
+    Object.defineProperty(process, "platform", { value: originalPlatform });
+    Object.defineProperty(process, "arch", { value: originalArch });
+    process.env["CLI_VERSION"] = originalCliVersion;
+    Object.defineProperty(process, "version", { value: originalNodeVersion });
     vi.clearAllMocks();
   });
 
-  describe('getPlatform', () => {
+  describe("getPlatform", () => {
     const testCases = [
-      { platform: 'darwin', arch: 'x64', expected: 'DARWIN_AMD64' },
-      { platform: 'darwin', arch: 'arm64', expected: 'DARWIN_ARM64' },
-      { platform: 'linux', arch: 'x64', expected: 'LINUX_AMD64' },
-      { platform: 'linux', arch: 'arm64', expected: 'LINUX_ARM64' },
-      { platform: 'win32', arch: 'x64', expected: 'WINDOWS_AMD64' },
-      { platform: 'sunos', arch: 'x64', expected: 'PLATFORM_UNSPECIFIED' },
-      { platform: 'win32', arch: 'arm', expected: 'PLATFORM_UNSPECIFIED' },
+      { platform: "darwin", arch: "x64", expected: "DARWIN_AMD64" },
+      { platform: "darwin", arch: "arm64", expected: "DARWIN_ARM64" },
+      { platform: "linux", arch: "x64", expected: "LINUX_AMD64" },
+      { platform: "linux", arch: "arm64", expected: "LINUX_ARM64" },
+      { platform: "win32", arch: "x64", expected: "WINDOWS_AMD64" },
+      { platform: "sunos", arch: "x64", expected: "PLATFORM_UNSPECIFIED" },
+      { platform: "win32", arch: "arm", expected: "PLATFORM_UNSPECIFIED" },
     ];
 
     for (const { platform, arch, expected } of testCases) {
       it(`should return ${expected} for platform ${platform} and arch ${arch}`, async () => {
-        Object.defineProperty(process, 'platform', { value: platform });
-        Object.defineProperty(process, 'arch', { value: arch });
-        const { getClientMetadata } = await import('./client_metadata.js');
+        Object.defineProperty(process, "platform", { value: platform });
+        Object.defineProperty(process, "arch", { value: arch });
+        const { getClientMetadata } = await import("./client_metadata.js");
 
         const metadata = await getClientMetadata();
         expect(metadata.platform).toBe(expected);
@@ -63,37 +63,37 @@ describe('client_metadata', () => {
     }
   });
 
-  describe('getClientMetadata', () => {
-    it('should use CLI_VERSION for ideVersion if set', async () => {
-      process.env['CLI_VERSION'] = '1.2.3';
-      Object.defineProperty(process, 'version', { value: 'v18.0.0' });
-      const { getClientMetadata } = await import('./client_metadata.js');
+  describe("getClientMetadata", () => {
+    it("should use CLI_VERSION for ideVersion if set", async () => {
+      process.env["CLI_VERSION"] = "1.2.3";
+      Object.defineProperty(process, "version", { value: "v18.0.0" });
+      const { getClientMetadata } = await import("./client_metadata.js");
 
       const metadata = await getClientMetadata();
-      expect(metadata.ideVersion).toBe('1.2.3');
+      expect(metadata.ideVersion).toBe("1.2.3");
     });
 
-    it('should use process.version for ideVersion as a fallback', async () => {
-      delete process.env['CLI_VERSION'];
-      Object.defineProperty(process, 'version', { value: 'v20.0.0' });
-      const { getClientMetadata } = await import('./client_metadata.js');
+    it("should use process.version for ideVersion as a fallback", async () => {
+      delete process.env["CLI_VERSION"];
+      Object.defineProperty(process, "version", { value: "v20.0.0" });
+      const { getClientMetadata } = await import("./client_metadata.js");
 
       const metadata = await getClientMetadata();
-      expect(metadata.ideVersion).toBe('v20.0.0');
+      expect(metadata.ideVersion).toBe("v20.0.0");
     });
 
-    it('should call getReleaseChannel to get the update channel', async () => {
+    it("should call getReleaseChannel to get the update channel", async () => {
       vi.mocked(getReleaseChannel).mockResolvedValue(ReleaseChannel.NIGHTLY);
-      const { getClientMetadata } = await import('./client_metadata.js');
+      const { getClientMetadata } = await import("./client_metadata.js");
 
       const metadata = await getClientMetadata();
 
-      expect(metadata.updateChannel).toBe('nightly');
+      expect(metadata.updateChannel).toBe("nightly");
       expect(getReleaseChannel).toHaveBeenCalled();
     });
 
-    it('should cache the client metadata promise', async () => {
-      const { getClientMetadata } = await import('./client_metadata.js');
+    it("should cache the client metadata promise", async () => {
+      const { getClientMetadata } = await import("./client_metadata.js");
 
       const firstCall = await getClientMetadata();
       const secondCall = await getClientMetadata();
@@ -103,16 +103,16 @@ describe('client_metadata', () => {
       expect(getReleaseChannel).toHaveBeenCalledTimes(1);
     });
 
-    it('should always return the IDE name as IDE_UNSPECIFIED', async () => {
-      const { getClientMetadata } = await import('./client_metadata.js');
+    it("should always return the IDE name as IDE_UNSPECIFIED", async () => {
+      const { getClientMetadata } = await import("./client_metadata.js");
       const metadata = await getClientMetadata();
-      expect(metadata.ideName).toBe('IDE_UNSPECIFIED');
+      expect(metadata.ideName).toBe("IDE_UNSPECIFIED");
     });
 
-    it('should always return the pluginType as GEMINI', async () => {
-      const { getClientMetadata } = await import('./client_metadata.js');
+    it("should always return the pluginType as GEMINI", async () => {
+      const { getClientMetadata } = await import("./client_metadata.js");
       const metadata = await getClientMetadata();
-      expect(metadata.pluginType).toBe('GEMINI');
+      expect(metadata.pluginType).toBe("GEMINI");
     });
   });
 });
diff --git a/packages/gemini-core/src/code_assist/experiments/client_metadata.ts b/packages/gemini-core/src/code_assist/experiments/client_metadata.ts
index c5450e4f4..71e8d1c26 100644
--- a/packages/gemini-core/src/code_assist/experiments/client_metadata.ts
+++ b/packages/gemini-core/src/code_assist/experiments/client_metadata.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getReleaseChannel } from '../../utils/channel.js';
-import type { ClientMetadata, ClientMetadataPlatform } from '../types.js';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { getReleaseChannel } from "../../utils/channel.js";
+import type { ClientMetadata, ClientMetadataPlatform } from "../types.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -19,22 +19,22 @@ function getPlatform(): ClientMetadataPlatform {
   const platform = process.platform;
   const arch = process.arch;
 
-  if (platform === 'darwin' && arch === 'x64') {
-    return 'DARWIN_AMD64';
+  if (platform === "darwin" && arch === "x64") {
+    return "DARWIN_AMD64";
   }
-  if (platform === 'darwin' && arch === 'arm64') {
-    return 'DARWIN_ARM64';
+  if (platform === "darwin" && arch === "arm64") {
+    return "DARWIN_ARM64";
   }
-  if (platform === 'linux' && arch === 'x64') {
-    return 'LINUX_AMD64';
+  if (platform === "linux" && arch === "x64") {
+    return "LINUX_AMD64";
   }
-  if (platform === 'linux' && arch === 'arm64') {
-    return 'LINUX_ARM64';
+  if (platform === "linux" && arch === "arm64") {
+    return "LINUX_ARM64";
   }
-  if (platform === 'win32' && arch === 'x64') {
-    return 'WINDOWS_AMD64';
+  if (platform === "win32" && arch === "x64") {
+    return "WINDOWS_AMD64";
   }
-  return 'PLATFORM_UNSPECIFIED';
+  return "PLATFORM_UNSPECIFIED";
 }
 
 /**
@@ -45,9 +45,9 @@ function getPlatform(): ClientMetadataPlatform {
 export async function getClientMetadata(): Promise<ClientMetadata> {
   if (!clientMetadataPromise) {
     clientMetadataPromise = (async () => ({
-      ideName: 'IDE_UNSPECIFIED',
-      pluginType: 'GEMINI',
-      ideVersion: process.env['CLI_VERSION'] || process.version,
+      ideName: "IDE_UNSPECIFIED",
+      pluginType: "GEMINI",
+      ideVersion: process.env["CLI_VERSION"] || process.version,
       platform: getPlatform(),
       updateChannel: await getReleaseChannel(__dirname),
     }))();
diff --git a/packages/gemini-core/src/code_assist/experiments/experiments.test.ts b/packages/gemini-core/src/code_assist/experiments/experiments.test.ts
index 393e648cc..6d905e32d 100644
--- a/packages/gemini-core/src/code_assist/experiments/experiments.test.ts
+++ b/packages/gemini-core/src/code_assist/experiments/experiments.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { CodeAssistServer } from '../server.js';
-import { getClientMetadata } from './client_metadata.js';
-import type { ListExperimentsResponse, Flag } from './types.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { CodeAssistServer } from "../server.js";
+import { getClientMetadata } from "./client_metadata.js";
+import type { Flag, ListExperimentsResponse } from "./types.js";
 
 // Mock dependencies before importing the module under test
-vi.mock('../server.js');
-vi.mock('./client_metadata.js');
+vi.mock("../server.js");
+vi.mock("./client_metadata.js");
 
-describe('experiments', () => {
+describe("experiments", () => {
   let mockServer: CodeAssistServer;
 
   beforeEach(() => {
@@ -22,10 +22,10 @@ describe('experiments', () => {
 
     // Mock the dependencies that `getExperiments` relies on
     vi.mocked(getClientMetadata).mockResolvedValue({
-      ideName: 'GEMINI_CLI',
-      ideVersion: '1.0.0',
-      platform: 'LINUX_AMD64',
-      updateChannel: 'stable',
+      ideName: "GEMINI_CLI",
+      ideVersion: "1.0.0",
+      platform: "LINUX_AMD64",
+      updateChannel: "stable",
     });
 
     // Create a mock instance of the server for each test
@@ -38,12 +38,12 @@ describe('experiments', () => {
     vi.clearAllMocks();
   });
 
-  it('should fetch and parse experiments from the server', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should fetch and parse experiments from the server", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {
       flags: [
-        { name: 'flag1', boolValue: true },
-        { name: 'flag2', stringValue: 'value' },
+        { name: "flag1", boolValue: true },
+        { name: "flag2", stringValue: "value" },
       ],
       experimentIds: [123, 456],
     };
@@ -53,24 +53,22 @@ describe('experiments', () => {
 
     // Verify that the dependencies were called
     expect(getClientMetadata).toHaveBeenCalled();
-    expect(mockServer.listExperiments).toHaveBeenCalledWith(
-      await getClientMetadata(),
-    );
+    expect(mockServer.listExperiments).toHaveBeenCalledWith(await getClientMetadata());
 
     // Verify that the response was parsed correctly
-    expect(experiments.flags['flag1']).toEqual({
-      name: 'flag1',
+    expect(experiments.flags["flag1"]).toEqual({
+      name: "flag1",
       boolValue: true,
     });
-    expect(experiments.flags['flag2']).toEqual({
-      name: 'flag2',
-      stringValue: 'value',
+    expect(experiments.flags["flag2"]).toEqual({
+      name: "flag2",
+      stringValue: "value",
     });
     expect(experiments.experimentIds).toEqual([123, 456]);
   });
 
-  it('should handle an empty or partial response from the server', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should handle an empty or partial response from the server", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {}; // No flags or experimentIds
     vi.mocked(mockServer.listExperiments).mockResolvedValue(mockApiResponse);
 
@@ -80,12 +78,12 @@ describe('experiments', () => {
     expect(experiments.experimentIds).toEqual([]);
   });
 
-  it('should ignore flags that are missing a name', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should ignore flags that are missing a name", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {
       flags: [
         { boolValue: true } as Flag, // No name
-        { name: 'flag2', stringValue: 'value' },
+        { name: "flag2", stringValue: "value" },
       ],
     };
     vi.mocked(mockServer.listExperiments).mockResolvedValue(mockApiResponse);
@@ -93,12 +91,12 @@ describe('experiments', () => {
     const experiments = await getExperiments(mockServer);
 
     expect(Object.keys(experiments.flags)).toHaveLength(1);
-    expect(experiments.flags['flag2']).toBeDefined();
-    expect(experiments.flags['undefined']).toBeUndefined();
+    expect(experiments.flags["flag2"]).toBeDefined();
+    expect(experiments.flags["undefined"]).toBeUndefined();
   });
 
-  it('should cache the experiments promise to avoid multiple fetches', async () => {
-    const { getExperiments } = await import('./experiments.js');
+  it("should cache the experiments promise to avoid multiple fetches", async () => {
+    const { getExperiments } = await import("./experiments.js");
     const mockApiResponse: ListExperimentsResponse = {
       experimentIds: [1, 2, 3],
     };
diff --git a/packages/gemini-core/src/code_assist/experiments/experiments.ts b/packages/gemini-core/src/code_assist/experiments/experiments.ts
index f716da9c7..644661043 100644
--- a/packages/gemini-core/src/code_assist/experiments/experiments.ts
+++ b/packages/gemini-core/src/code_assist/experiments/experiments.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CodeAssistServer } from '../server.js';
-import { getClientMetadata } from './client_metadata.js';
-import type { ListExperimentsResponse, Flag } from './types.js';
+import type { CodeAssistServer } from "../server.js";
+import { getClientMetadata } from "./client_metadata.js";
+import type { Flag, ListExperimentsResponse } from "./types.js";
 
 export interface Experiments {
   flags: Record<string, Flag>;
@@ -20,9 +20,7 @@ let experimentsPromise: Promise<Experiments> | undefined;
  *
  * The experiments are cached so that they are only fetched once.
  */
-export async function getExperiments(
-  server: CodeAssistServer,
-): Promise<Experiments> {
+export async function getExperiments(server: CodeAssistServer): Promise<Experiments> {
   if (experimentsPromise) {
     return await experimentsPromise;
   }
diff --git a/packages/gemini-core/src/code_assist/experiments/flagNames.ts b/packages/gemini-core/src/code_assist/experiments/flagNames.ts
index cb6b6397a..c4f387d9a 100644
--- a/packages/gemini-core/src/code_assist/experiments/flagNames.ts
+++ b/packages/gemini-core/src/code_assist/experiments/flagNames.ts
@@ -5,10 +5,8 @@
  */
 
 export const ExperimentFlags = {
-  CONTEXT_COMPRESSION_THRESHOLD:
-    'GeminiCLIContextCompression__threshold_fraction',
-  USER_CACHING: 'GcliUserCaching__user_caching',
+  CONTEXT_COMPRESSION_THRESHOLD: "GeminiCLIContextCompression__threshold_fraction",
+  USER_CACHING: "GcliUserCaching__user_caching",
 } as const;
 
-export type ExperimentFlagName =
-  (typeof ExperimentFlags)[keyof typeof ExperimentFlags];
+export type ExperimentFlagName = (typeof ExperimentFlags)[keyof typeof ExperimentFlags];
diff --git a/packages/gemini-core/src/code_assist/experiments/types.ts b/packages/gemini-core/src/code_assist/experiments/types.ts
index 924108f34..066139e09 100644
--- a/packages/gemini-core/src/code_assist/experiments/types.ts
+++ b/packages/gemini-core/src/code_assist/experiments/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ClientMetadata } from '../types.js';
+import type { ClientMetadata } from "../types.js";
 
 export interface ListExperimentsRequest {
   project: string;
diff --git a/packages/gemini-core/src/code_assist/oauth-credential-storage.test.ts b/packages/gemini-core/src/code_assist/oauth-credential-storage.test.ts
index d75892f95..3357018c5 100644
--- a/packages/gemini-core/src/code_assist/oauth-credential-storage.test.ts
+++ b/packages/gemini-core/src/code_assist/oauth-credential-storage.test.ts
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type Credentials } from 'google-auth-library';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { OAuthCredentialStorage } from './oauth-credential-storage.js';
-import type { OAuthCredentials } from '../mcp/token-storage/types.js';
-import { coreEvents } from '../utils/events.js';
-
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { promises as fs } from 'node:fs';
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { type Credentials } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { OAuthCredentials } from "../mcp/token-storage/types.js";
+import { coreEvents } from "../utils/events.js";
+import { OAuthCredentialStorage } from "./oauth-credential-storage.js";
 
 // Mock external dependencies
 const mockHybridTokenStorage = vi.hoisted(() => ({
@@ -20,103 +19,89 @@ const mockHybridTokenStorage = vi.hoisted(() => ({
   setCredentials: vi.fn(),
   deleteCredentials: vi.fn(),
 }));
-vi.mock('../mcp/token-storage/hybrid-token-storage.js', () => ({
+vi.mock("../mcp/token-storage/hybrid-token-storage.js", () => ({
   HybridTokenStorage: vi.fn(() => mockHybridTokenStorage),
 }));
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   promises: {
     readFile: vi.fn(),
     rm: vi.fn(),
   },
 }));
-vi.mock('node:os');
-vi.mock('node:path');
-vi.mock('../utils/events.js', () => ({
+vi.mock("node:os");
+vi.mock("node:path");
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
 }));
 
-describe('OAuthCredentialStorage', () => {
+describe("OAuthCredentialStorage", () => {
   const mockCredentials: Credentials = {
-    access_token: 'mock_access_token',
-    refresh_token: 'mock_refresh_token',
+    access_token: "mock_access_token",
+    refresh_token: "mock_refresh_token",
     expiry_date: Date.now() + 3600 * 1000,
-    token_type: 'Bearer',
-    scope: 'email profile',
+    token_type: "Bearer",
+    scope: "email profile",
   };
 
   const mockMcpCredentials: OAuthCredentials = {
-    serverName: 'main-account',
+    serverName: "main-account",
     token: {
-      accessToken: 'mock_access_token',
-      refreshToken: 'mock_refresh_token',
-      tokenType: 'Bearer',
-      scope: 'email profile',
+      accessToken: "mock_access_token",
+      refreshToken: "mock_refresh_token",
+      tokenType: "Bearer",
+      scope: "email profile",
       expiresAt: mockCredentials.expiry_date!,
     },
     updatedAt: expect.any(Number),
   };
 
-  const oldFilePath = '/mock/home/.gemini/oauth.json';
+  const oldFilePath = "/mock/home/.gemini/oauth.json";
 
   beforeEach(() => {
-    vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(null);
-    vi.spyOn(mockHybridTokenStorage, 'setCredentials').mockResolvedValue(
-      undefined,
-    );
-    vi.spyOn(mockHybridTokenStorage, 'deleteCredentials').mockResolvedValue(
-      undefined,
-    );
-
-    vi.spyOn(fs, 'readFile').mockRejectedValue(new Error('File not found'));
-    vi.spyOn(fs, 'rm').mockResolvedValue(undefined);
-
-    vi.spyOn(os, 'homedir').mockReturnValue('/mock/home');
-    vi.spyOn(path, 'join').mockReturnValue(oldFilePath);
+    vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+    vi.spyOn(mockHybridTokenStorage, "setCredentials").mockResolvedValue(undefined);
+    vi.spyOn(mockHybridTokenStorage, "deleteCredentials").mockResolvedValue(undefined);
+
+    vi.spyOn(fs, "readFile").mockRejectedValue(new Error("File not found"));
+    vi.spyOn(fs, "rm").mockResolvedValue(undefined);
+
+    vi.spyOn(os, "homedir").mockReturnValue("/mock/home");
+    vi.spyOn(path, "join").mockReturnValue(oldFilePath);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('loadCredentials', () => {
-    it('should load credentials from HybridTokenStorage if available', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        mockMcpCredentials,
-      );
+  describe("loadCredentials", () => {
+    it("should load credentials from HybridTokenStorage if available", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(mockMcpCredentials);
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
-      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith(
-        'main-account',
-      );
+      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith("main-account");
       expect(result).toEqual(mockCredentials);
     });
 
-    it('should fallback to migrateFromFileStorage if no credentials in HybridTokenStorage', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify(mockCredentials),
-      );
+    it("should fallback to migrateFromFileStorage if no credentials in HybridTokenStorage", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue(JSON.stringify(mockCredentials));
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
-      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith(
-        'main-account',
-      );
-      expect(fs.readFile).toHaveBeenCalledWith(oldFilePath, 'utf-8');
+      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith("main-account");
+      expect(fs.readFile).toHaveBeenCalledWith(oldFilePath, "utf-8");
       expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalled(); // Verify credentials were saved
       expect(fs.rm).toHaveBeenCalledWith(oldFilePath, { force: true }); // Verify old file was removed
       expect(result).toEqual(mockCredentials);
     });
 
-    it('should return null if no credentials found and no old file to migrate', async () => {
-      vi.spyOn(fs, 'readFile').mockRejectedValue({
-        message: 'File not found',
-        code: 'ENOENT',
+    it("should return null if no credentials found and no old file to migrate", async () => {
+      vi.spyOn(fs, "readFile").mockRejectedValue({
+        message: "File not found",
+        code: "ENOENT",
       });
 
       const result = await OAuthCredentialStorage.loadCredentials();
@@ -124,86 +109,70 @@ describe('OAuthCredentialStorage', () => {
       expect(result).toBeNull();
     });
 
-    it('should throw an error if loading fails', async () => {
-      const mockError = new Error('HybridTokenStorage error');
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockRejectedValue(
-        mockError,
-      );
+    it("should throw an error if loading fails", async () => {
+      const mockError = new Error("HybridTokenStorage error");
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockRejectedValue(mockError);
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Failed to load OAuth credentials',
+        "error",
+        "Failed to load OAuth credentials",
         mockError,
       );
     });
 
-    it('should throw an error if read file fails', async () => {
-      const mockError = new Error('Permission denied');
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockRejectedValue(mockError);
+    it("should throw an error if read file fails", async () => {
+      const mockError = new Error("Permission denied");
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockRejectedValue(mockError);
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Failed to load OAuth credentials',
+        "error",
+        "Failed to load OAuth credentials",
         mockError,
       );
     });
 
-    it('should not throw error if migration file removal failed', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify(mockCredentials),
-      );
-      vi.spyOn(OAuthCredentialStorage, 'saveCredentials').mockResolvedValue(
-        undefined,
-      );
-      vi.spyOn(fs, 'rm').mockRejectedValue(new Error('Deletion failed'));
+    it("should not throw error if migration file removal failed", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue(JSON.stringify(mockCredentials));
+      vi.spyOn(OAuthCredentialStorage, "saveCredentials").mockResolvedValue(undefined);
+      vi.spyOn(fs, "rm").mockRejectedValue(new Error("Deletion failed"));
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
       expect(result).toEqual(mockCredentials);
     });
 
-    it('should throw an error if the migration file contains invalid JSON', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue('invalid json');
+    it("should throw an error if the migration file contains invalid JSON", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue("invalid json");
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
     });
 
-    it('should not delete the old file if saving migrated credentials fails', async () => {
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        null,
-      );
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify(mockCredentials),
-      );
-      vi.spyOn(mockHybridTokenStorage, 'setCredentials').mockRejectedValue(
-        new Error('Save failed'),
+    it("should not delete the old file if saving migrated credentials fails", async () => {
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(null);
+      vi.spyOn(fs, "readFile").mockResolvedValue(JSON.stringify(mockCredentials));
+      vi.spyOn(mockHybridTokenStorage, "setCredentials").mockRejectedValue(
+        new Error("Save failed"),
       );
 
       await expect(OAuthCredentialStorage.loadCredentials()).rejects.toThrow(
-        'Failed to load OAuth credentials',
+        "Failed to load OAuth credentials",
       );
 
       expect(fs.rm).not.toHaveBeenCalled();
     });
 
-    it('should return credentials even if access_token is missing from storage', async () => {
+    it("should return credentials even if access_token is missing from storage", async () => {
       const partialMcpCredentials = {
         ...mockMcpCredentials,
         token: {
@@ -211,9 +180,7 @@ describe('OAuthCredentialStorage', () => {
           accessToken: undefined,
         },
       };
-      vi.spyOn(mockHybridTokenStorage, 'getCredentials').mockResolvedValue(
-        partialMcpCredentials,
-      );
+      vi.spyOn(mockHybridTokenStorage, "getCredentials").mockResolvedValue(partialMcpCredentials);
 
       const result = await OAuthCredentialStorage.loadCredentials();
 
@@ -227,30 +194,26 @@ describe('OAuthCredentialStorage', () => {
     });
   });
 
-  describe('saveCredentials', () => {
-    it('should save credentials to HybridTokenStorage', async () => {
+  describe("saveCredentials", () => {
+    it("should save credentials to HybridTokenStorage", async () => {
       await OAuthCredentialStorage.saveCredentials(mockCredentials);
 
-      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(
-        mockMcpCredentials,
-      );
+      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(mockMcpCredentials);
     });
 
-    it('should throw an error if access_token is missing', async () => {
+    it("should throw an error if access_token is missing", async () => {
       const invalidCredentials: Credentials = {
         ...mockCredentials,
         access_token: undefined,
       };
-      await expect(
-        OAuthCredentialStorage.saveCredentials(invalidCredentials),
-      ).rejects.toThrow(
-        'Attempted to save credentials without an access token.',
+      await expect(OAuthCredentialStorage.saveCredentials(invalidCredentials)).rejects.toThrow(
+        "Attempted to save credentials without an access token.",
       );
     });
 
-    it('should handle saving credentials with null or undefined optional fields', async () => {
+    it("should handle saving credentials with null or undefined optional fields", async () => {
       const partialCredentials: Credentials = {
-        access_token: 'only_access_token',
+        access_token: "only_access_token",
         refresh_token: null, // test null
         scope: undefined, // test undefined
       };
@@ -258,11 +221,11 @@ describe('OAuthCredentialStorage', () => {
       await OAuthCredentialStorage.saveCredentials(partialCredentials);
 
       expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith({
-        serverName: 'main-account',
+        serverName: "main-account",
         token: {
-          accessToken: 'only_access_token',
+          accessToken: "only_access_token",
           refreshToken: undefined,
-          tokenType: 'Bearer', // default
+          tokenType: "Bearer", // default
           scope: undefined,
           expiresAt: undefined,
         },
@@ -271,41 +234,35 @@ describe('OAuthCredentialStorage', () => {
     });
   });
 
-  describe('clearCredentials', () => {
-    it('should delete credentials from HybridTokenStorage', async () => {
+  describe("clearCredentials", () => {
+    it("should delete credentials from HybridTokenStorage", async () => {
       await OAuthCredentialStorage.clearCredentials();
 
-      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith(
-        'main-account',
-      );
+      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith("main-account");
     });
 
-    it('should attempt to remove the old file-based storage', async () => {
+    it("should attempt to remove the old file-based storage", async () => {
       await OAuthCredentialStorage.clearCredentials();
 
       expect(fs.rm).toHaveBeenCalledWith(oldFilePath, { force: true });
     });
 
-    it('should not throw an error if deleting old file fails', async () => {
-      vi.spyOn(fs, 'rm').mockRejectedValue(new Error('File deletion failed'));
+    it("should not throw an error if deleting old file fails", async () => {
+      vi.spyOn(fs, "rm").mockRejectedValue(new Error("File deletion failed"));
 
-      await expect(
-        OAuthCredentialStorage.clearCredentials(),
-      ).resolves.toBeUndefined();
+      await expect(OAuthCredentialStorage.clearCredentials()).resolves.toBeUndefined();
     });
 
-    it('should throw an error if clearing from HybridTokenStorage fails', async () => {
-      const mockError = new Error('Deletion error');
-      vi.spyOn(mockHybridTokenStorage, 'deleteCredentials').mockRejectedValue(
-        mockError,
-      );
+    it("should throw an error if clearing from HybridTokenStorage fails", async () => {
+      const mockError = new Error("Deletion error");
+      vi.spyOn(mockHybridTokenStorage, "deleteCredentials").mockRejectedValue(mockError);
 
       await expect(OAuthCredentialStorage.clearCredentials()).rejects.toThrow(
-        'Failed to clear OAuth credentials',
+        "Failed to clear OAuth credentials",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Failed to clear OAuth credentials',
+        "error",
+        "Failed to clear OAuth credentials",
         mockError,
       );
     });
diff --git a/packages/gemini-core/src/code_assist/oauth-credential-storage.ts b/packages/gemini-core/src/code_assist/oauth-credential-storage.ts
index 2f1c78d1d..9aa6ceabd 100644
--- a/packages/gemini-core/src/code_assist/oauth-credential-storage.ts
+++ b/packages/gemini-core/src/code_assist/oauth-credential-storage.ts
@@ -4,23 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type Credentials } from 'google-auth-library';
-import { HybridTokenStorage } from '../mcp/token-storage/hybrid-token-storage.js';
-import { OAUTH_FILE } from '../config/storage.js';
-import type { OAuthCredentials } from '../mcp/token-storage/types.js';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { promises as fs } from 'node:fs';
-import { GEMINI_DIR } from '../utils/paths.js';
-import { coreEvents } from '../utils/events.js';
-
-const KEYCHAIN_SERVICE_NAME = 'gemini-cli-oauth';
-const MAIN_ACCOUNT_KEY = 'main-account';
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { type Credentials } from "google-auth-library";
+import { OAUTH_FILE } from "../config/storage.js";
+import { HybridTokenStorage } from "../mcp/token-storage/hybrid-token-storage.js";
+import type { OAuthCredentials } from "../mcp/token-storage/types.js";
+import { coreEvents } from "../utils/events.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+
+const KEYCHAIN_SERVICE_NAME = "gemini-cli-oauth";
+const MAIN_ACCOUNT_KEY = "main-account";
 
 export class OAuthCredentialStorage {
-  private static storage: HybridTokenStorage = new HybridTokenStorage(
-    KEYCHAIN_SERVICE_NAME,
-  );
+  private static storage: HybridTokenStorage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME);
 
   /**
    * Load cached OAuth credentials
@@ -30,8 +28,7 @@ export class OAuthCredentialStorage {
       const credentials = await this.storage.getCredentials(MAIN_ACCOUNT_KEY);
 
       if (credentials?.token) {
-        const { accessToken, refreshToken, expiresAt, tokenType, scope } =
-          credentials.token;
+        const { accessToken, refreshToken, expiresAt, tokenType, scope } = credentials.token;
         // Convert from OAuthCredentials format to Google Credentials format
         const googleCreds: Credentials = {
           access_token: accessToken,
@@ -50,12 +47,8 @@ export class OAuthCredentialStorage {
       // Fallback: Try to migrate from old file-based storage
       return await this.migrateFromFileStorage();
     } catch (error: unknown) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to load OAuth credentials',
-        error,
-      );
-      throw new Error('Failed to load OAuth credentials', { cause: error });
+      coreEvents.emitFeedback("error", "Failed to load OAuth credentials", error);
+      throw new Error("Failed to load OAuth credentials", { cause: error });
     }
   }
 
@@ -64,7 +57,7 @@ export class OAuthCredentialStorage {
    */
   static async saveCredentials(credentials: Credentials): Promise<void> {
     if (!credentials.access_token) {
-      throw new Error('Attempted to save credentials without an access token.');
+      throw new Error("Attempted to save credentials without an access token.");
     }
 
     // Convert Google Credentials to OAuthCredentials format
@@ -73,7 +66,7 @@ export class OAuthCredentialStorage {
       token: {
         accessToken: credentials.access_token,
         refreshToken: credentials.refresh_token || undefined,
-        tokenType: credentials.token_type || 'Bearer',
+        tokenType: credentials.token_type || "Bearer",
         scope: credentials.scope || undefined,
         expiresAt: credentials.expiry_date || undefined,
       },
@@ -94,12 +87,8 @@ export class OAuthCredentialStorage {
       const oldFilePath = path.join(os.homedir(), GEMINI_DIR, OAUTH_FILE);
       await fs.rm(oldFilePath, { force: true }).catch(() => {});
     } catch (error: unknown) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to clear OAuth credentials',
-        error,
-      );
-      throw new Error('Failed to clear OAuth credentials', { cause: error });
+      coreEvents.emitFeedback("error", "Failed to clear OAuth credentials", error);
+      throw new Error("Failed to clear OAuth credentials", { cause: error });
     }
   }
 
@@ -111,13 +100,13 @@ export class OAuthCredentialStorage {
 
     let credsJson: string;
     try {
-      credsJson = await fs.readFile(oldFilePath, 'utf-8');
+      credsJson = await fs.readFile(oldFilePath, "utf-8");
     } catch (error: unknown) {
       if (
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'code' in error &&
-        error.code === 'ENOENT'
+        "code" in error &&
+        error.code === "ENOENT"
       ) {
         // File doesn't exist, so no migration.
         return null;
diff --git a/packages/gemini-core/src/code_assist/oauth2.test.ts b/packages/gemini-core/src/code_assist/oauth2.test.ts
index b15a7aa89..413986087 100644
--- a/packages/gemini-core/src/code_assist/oauth2.test.ts
+++ b/packages/gemini-core/src/code_assist/oauth2.test.ts
@@ -4,47 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Credentials } from 'google-auth-library';
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import crypto from "node:crypto";
+import * as fs from "node:fs";
+import http from "node:http";
+import * as os from "node:os";
+import * as path from "node:path";
+import readline from "node:readline";
+import type { Credentials } from "google-auth-library";
+import { Compute, GoogleAuth, OAuth2Client } from "google-auth-library";
+import open from "open";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { FORCE_ENCRYPTED_FILE_ENV_VAR } from "../mcp/token-storage/index.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
 import {
-  getOauthClient,
-  resetOauthClientForTesting,
   clearCachedCredentialFile,
   clearOauthClientCache,
-} from './oauth2.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
-import { OAuth2Client, Compute, GoogleAuth } from 'google-auth-library';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import http from 'node:http';
-import open from 'open';
-import crypto from 'node:crypto';
-import * as os from 'node:os';
-import { AuthType } from '../core/contentGenerator.js';
-import type { Config } from '../config/config.js';
-import readline from 'node:readline';
-import { FORCE_ENCRYPTED_FILE_ENV_VAR } from '../mcp/token-storage/index.js';
-import { GEMINI_DIR } from '../utils/paths.js';
-
-vi.mock('os', async (importOriginal) => {
-  const os = await importOriginal<typeof import('os')>();
+  getOauthClient,
+  resetOauthClientForTesting,
+} from "./oauth2.js";
+
+vi.mock("os", async (importOriginal) => {
+  const os = await importOriginal<typeof import("os")>();
   return {
     ...os,
     homedir: vi.fn(),
   };
 });
 
-vi.mock('google-auth-library');
-vi.mock('http');
-vi.mock('open');
-vi.mock('crypto');
-vi.mock('node:readline');
-vi.mock('../utils/browser.js', () => ({
+vi.mock("google-auth-library");
+vi.mock("http");
+vi.mock("open");
+vi.mock("crypto");
+vi.mock("node:readline");
+vi.mock("../utils/browser.js", () => ({
   shouldAttemptBrowserLaunch: () => true,
 }));
 
-vi.mock('./oauth-credential-storage.js', () => ({
+vi.mock("./oauth-credential-storage.js", () => ({
   OAuthCredentialStorage: {
     saveCredentials: vi.fn(),
     loadCredentials: vi.fn(),
@@ -54,22 +54,20 @@ vi.mock('./oauth-credential-storage.js', () => ({
 
 const mockConfig = {
   getNoBrowser: () => false,
-  getProxy: () => 'http://test.proxy.com:8080',
+  getProxy: () => "http://test.proxy.com:8080",
   isBrowserLaunchSuppressed: () => false,
 } as unknown as Config;
 
 // Mock fetch globally
 global.fetch = vi.fn();
 
-describe('oauth2', () => {
-  describe('with encrypted flag false', () => {
+describe("oauth2", () => {
+  describe("with encrypted flag false", () => {
     let tempHomeDir: string;
 
     beforeEach(() => {
-      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = 'false';
-      tempHomeDir = fs.mkdtempSync(
-        path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-      );
+      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = "false";
+      tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
       vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
     });
     afterEach(() => {
@@ -79,21 +77,19 @@ describe('oauth2', () => {
       vi.unstubAllEnvs();
     });
 
-    it('should perform a web login', async () => {
-      const mockAuthUrl = 'https://example.com/auth';
-      const mockCode = 'test-code';
-      const mockState = 'test-state';
+    it("should perform a web login", async () => {
+      const mockAuthUrl = "https://example.com/auth";
+      const mockCode = "test-code";
+      const mockState = "test-state";
       const mockTokens = {
-        access_token: 'test-access-token',
-        refresh_token: 'test-refresh-token',
+        access_token: "test-access-token",
+        refresh_token: "test-refresh-token",
       };
 
       const mockGenerateAuthUrl = vi.fn().mockReturnValue(mockAuthUrl);
       const mockGetToken = vi.fn().mockResolvedValue({ tokens: mockTokens });
       const mockSetCredentials = vi.fn();
-      const mockGetAccessToken = vi
-        .fn()
-        .mockResolvedValue({ token: 'mock-access-token' });
+      const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "mock-access-token" });
       const mockOAuth2Client = {
         generateAuthUrl: mockGenerateAuthUrl,
         getToken: mockGetToken,
@@ -104,17 +100,13 @@ describe('oauth2', () => {
       } as unknown as OAuth2Client;
       vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-      vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-      vi.mocked(open).mockImplementation(
-        async () => ({ on: vi.fn() }) as never,
-      );
+      vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+      vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
       // Mock the UserInfo API response
       vi.mocked(global.fetch).mockResolvedValue({
         ok: true,
-        json: vi
-          .fn()
-          .mockResolvedValue({ email: 'test-google-account@gmail.com' }),
+        json: vi.fn().mockResolvedValue({ email: "test-google-account@gmail.com" }),
       } as unknown as Response);
 
       let requestCallback!: http.RequestListener<
@@ -123,9 +115,7 @@ describe('oauth2', () => {
       >;
 
       let serverListeningCallback: (value: unknown) => void;
-      const serverListeningPromise = new Promise(
-        (resolve) => (serverListeningCallback = resolve),
-      );
+      const serverListeningPromise = new Promise((resolve) => (serverListeningCallback = resolve));
 
       let capturedPort = 0;
       const mockHttpServer = {
@@ -152,10 +142,7 @@ describe('oauth2', () => {
         return mockHttpServer as unknown as http.Server;
       });
 
-      const clientPromise = getOauthClient(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfig,
-      );
+      const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
       // wait for server to start listening.
       await serverListeningPromise;
@@ -181,49 +168,41 @@ describe('oauth2', () => {
       expect(mockSetCredentials).toHaveBeenCalledWith(mockTokens);
 
       // Verify Google Account was cached
-      const googleAccountPath = path.join(
-        tempHomeDir,
-        GEMINI_DIR,
-        'google_accounts.json',
-      );
+      const googleAccountPath = path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
       expect(fs.existsSync(googleAccountPath)).toBe(true);
-      const cachedGoogleAccount = fs.readFileSync(googleAccountPath, 'utf-8');
+      const cachedGoogleAccount = fs.readFileSync(googleAccountPath, "utf-8");
       expect(JSON.parse(cachedGoogleAccount)).toEqual({
-        active: 'test-google-account@gmail.com',
+        active: "test-google-account@gmail.com",
         old: [],
       });
 
       // Verify the getCachedGoogleAccount function works
       const userAccountManager = new UserAccountManager();
-      expect(userAccountManager.getCachedGoogleAccount()).toBe(
-        'test-google-account@gmail.com',
-      );
+      expect(userAccountManager.getCachedGoogleAccount()).toBe("test-google-account@gmail.com");
     });
 
-    it('should perform login with user code', async () => {
+    it("should perform login with user code", async () => {
       const mockConfigWithNoBrowser = {
         getNoBrowser: () => true,
-        getProxy: () => 'http://test.proxy.com:8080',
+        getProxy: () => "http://test.proxy.com:8080",
         isBrowserLaunchSuppressed: () => true,
       } as unknown as Config;
 
       const mockCodeVerifier = {
-        codeChallenge: 'test-challenge',
-        codeVerifier: 'test-verifier',
+        codeChallenge: "test-challenge",
+        codeVerifier: "test-verifier",
       };
-      const mockAuthUrl = 'https://example.com/auth-user-code';
-      const mockCode = 'test-user-code';
+      const mockAuthUrl = "https://example.com/auth-user-code";
+      const mockCode = "test-user-code";
       const mockTokens = {
-        access_token: 'test-access-token-user-code',
-        refresh_token: 'test-refresh-token-user-code',
+        access_token: "test-access-token-user-code",
+        refresh_token: "test-refresh-token-user-code",
       };
 
       const mockGenerateAuthUrl = vi.fn().mockReturnValue(mockAuthUrl);
       const mockGetToken = vi.fn().mockResolvedValue({ tokens: mockTokens });
       const mockSetCredentials = vi.fn();
-      const mockGenerateCodeVerifierAsync = vi
-        .fn()
-        .mockResolvedValue(mockCodeVerifier);
+      const mockGenerateCodeVerifierAsync = vi.fn().mockResolvedValue(mockCodeVerifier);
 
       const mockOAuth2Client = {
         generateAuthUrl: mockGenerateAuthUrl,
@@ -240,74 +219,59 @@ describe('oauth2', () => {
       };
       (readline.createInterface as Mock).mockReturnValue(mockReadline);
 
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
-      const client = await getOauthClient(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfigWithNoBrowser,
-      );
+      const client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfigWithNoBrowser);
 
       expect(client).toBe(mockOAuth2Client);
 
       // Verify the auth flow
       expect(mockGenerateCodeVerifierAsync).toHaveBeenCalled();
       expect(mockGenerateAuthUrl).toHaveBeenCalled();
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        expect.stringContaining(mockAuthUrl),
-      );
+      expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(mockAuthUrl));
       expect(mockReadline.question).toHaveBeenCalledWith(
-        'Enter the authorization code: ',
+        "Enter the authorization code: ",
         expect.any(Function),
       );
       expect(mockGetToken).toHaveBeenCalledWith({
         code: mockCode,
         codeVerifier: mockCodeVerifier.codeVerifier,
-        redirect_uri: 'https://codeassist.google.com/authcode',
+        redirect_uri: "https://codeassist.google.com/authcode",
       });
       expect(mockSetCredentials).toHaveBeenCalledWith(mockTokens);
 
       consoleLogSpy.mockRestore();
     });
 
-    describe('in Cloud Shell', () => {
+    describe("in Cloud Shell", () => {
       const mockGetAccessToken = vi.fn();
       let mockComputeClient: Compute;
 
       beforeEach(() => {
-        mockGetAccessToken.mockResolvedValue({ token: 'test-access-token' });
+        mockGetAccessToken.mockResolvedValue({ token: "test-access-token" });
         mockComputeClient = {
-          credentials: { refresh_token: 'test-refresh-token' },
+          credentials: { refresh_token: "test-refresh-token" },
           getAccessToken: mockGetAccessToken,
         } as unknown as Compute;
 
-        (Compute as unknown as Mock).mockImplementation(
-          () => mockComputeClient,
-        );
+        (Compute as unknown as Mock).mockImplementation(() => mockComputeClient);
       });
 
-      it('should attempt to load cached credentials first', async () => {
-        const cachedCreds = { refresh_token: 'cached-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+      it("should attempt to load cached credentials first", async () => {
+        const cachedCreds = { refresh_token: "cached-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
         const mockClient = {
           setCredentials: vi.fn(),
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
           getTokenInfo: vi.fn().mockResolvedValue({}),
           on: vi.fn(),
         };
 
         // To mock the new OAuth2Client() inside the function
-        vi.mocked(OAuth2Client).mockImplementation(
-          () => mockClient as unknown as OAuth2Client,
-        );
+        vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
@@ -317,77 +281,62 @@ describe('oauth2', () => {
         expect(Compute).not.toHaveBeenCalled(); // Should not fetch new client if cache is valid
       });
 
-      it('should use Compute to get a client if no cached credentials exist', async () => {
+      it("should use Compute to get a client if no cached credentials exist", async () => {
         await getOauthClient(AuthType.CLOUD_SHELL, mockConfig);
 
         expect(Compute).toHaveBeenCalledWith({});
         expect(mockGetAccessToken).toHaveBeenCalled();
       });
 
-      it('should not cache the credentials after fetching them via ADC', async () => {
-        const newCredentials = { refresh_token: 'new-adc-token' };
+      it("should not cache the credentials after fetching them via ADC", async () => {
+        const newCredentials = { refresh_token: "new-adc-token" };
         mockComputeClient.credentials = newCredentials;
-        mockGetAccessToken.mockResolvedValue({ token: 'new-adc-token' });
+        mockGetAccessToken.mockResolvedValue({ token: "new-adc-token" });
 
         await getOauthClient(AuthType.CLOUD_SHELL, mockConfig);
 
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         expect(fs.existsSync(credsPath)).toBe(false);
       });
 
-      it('should return the Compute client on successful ADC authentication', async () => {
+      it("should return the Compute client on successful ADC authentication", async () => {
         const client = await getOauthClient(AuthType.CLOUD_SHELL, mockConfig);
         expect(client).toBe(mockComputeClient);
       });
 
-      it('should throw an error if ADC fails', async () => {
-        const testError = new Error('ADC Failed');
+      it("should throw an error if ADC fails", async () => {
+        const testError = new Error("ADC Failed");
         mockGetAccessToken.mockRejectedValue(testError);
 
-        await expect(
-          getOauthClient(AuthType.CLOUD_SHELL, mockConfig),
-        ).rejects.toThrow(
-          'Could not authenticate using Cloud Shell credentials. Please select a different authentication method or ensure you are in a properly configured environment. Error: ADC Failed',
+        await expect(getOauthClient(AuthType.CLOUD_SHELL, mockConfig)).rejects.toThrow(
+          "Could not authenticate using Cloud Shell credentials. Please select a different authentication method or ensure you are in a properly configured environment. Error: ADC Failed",
         );
       });
     });
 
-    describe('credential loading order', () => {
-      it('should prioritize default cached credentials over GOOGLE_APPLICATION_CREDENTIALS', async () => {
+    describe("credential loading order", () => {
+      it("should prioritize default cached credentials over GOOGLE_APPLICATION_CREDENTIALS", async () => {
         // Setup default cached credentials
-        const defaultCreds = { refresh_token: 'default-cached-token' };
-        const defaultCredsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const defaultCreds = { refresh_token: "default-cached-token" };
+        const defaultCredsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(defaultCredsPath), {
           recursive: true,
         });
-        await fs.promises.writeFile(
-          defaultCredsPath,
-          JSON.stringify(defaultCreds),
-        );
+        await fs.promises.writeFile(defaultCredsPath, JSON.stringify(defaultCreds));
 
         // Setup credentials via environment variable
-        const envCreds = { refresh_token: 'env-var-token' };
-        const envCredsPath = path.join(tempHomeDir, 'env_creds.json');
+        const envCreds = { refresh_token: "env-var-token" };
+        const envCredsPath = path.join(tempHomeDir, "env_creds.json");
         await fs.promises.writeFile(envCredsPath, JSON.stringify(envCreds));
-        vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
+        vi.stubEnv("GOOGLE_APPLICATION_CREDENTIALS", envCredsPath);
 
         const mockClient = {
           setCredentials: vi.fn(),
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
           getTokenInfo: vi.fn().mockResolvedValue({}),
           on: vi.fn(),
         };
-        vi.mocked(OAuth2Client).mockImplementation(
-          () => mockClient as unknown as OAuth2Client,
-        );
+        vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
@@ -396,22 +345,20 @@ describe('oauth2', () => {
         expect(mockClient.setCredentials).not.toHaveBeenCalledWith(envCreds);
       });
 
-      it('should fall back to GOOGLE_APPLICATION_CREDENTIALS if default cache is missing', async () => {
+      it("should fall back to GOOGLE_APPLICATION_CREDENTIALS if default cache is missing", async () => {
         // Setup credentials via environment variable
-        const envCreds = { refresh_token: 'env-var-token' };
-        const envCredsPath = path.join(tempHomeDir, 'env_creds.json');
+        const envCreds = { refresh_token: "env-var-token" };
+        const envCredsPath = path.join(tempHomeDir, "env_creds.json");
         await fs.promises.writeFile(envCredsPath, JSON.stringify(envCreds));
-        vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
+        vi.stubEnv("GOOGLE_APPLICATION_CREDENTIALS", envCredsPath);
 
         const mockClient = {
           setCredentials: vi.fn(),
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
           getTokenInfo: vi.fn().mockResolvedValue({}),
           on: vi.fn(),
         };
-        vi.mocked(OAuth2Client).mockImplementation(
-          () => mockClient as unknown as OAuth2Client,
-        );
+        vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
@@ -419,44 +366,32 @@ describe('oauth2', () => {
         expect(mockClient.setCredentials).toHaveBeenCalledWith(envCreds);
       });
 
-      it('should use GoogleAuth for BYOID credentials from GOOGLE_APPLICATION_CREDENTIALS', async () => {
+      it("should use GoogleAuth for BYOID credentials from GOOGLE_APPLICATION_CREDENTIALS", async () => {
         // Setup BYOID credentials via environment variable
         const byoidCredentials = {
-          type: 'external_account_authorized_user',
-          client_id: 'mock-client-id',
+          type: "external_account_authorized_user",
+          client_id: "mock-client-id",
         };
-        const envCredsPath = path.join(tempHomeDir, 'byoid_creds.json');
-        await fs.promises.writeFile(
-          envCredsPath,
-          JSON.stringify(byoidCredentials),
-        );
-        vi.stubEnv('GOOGLE_APPLICATION_CREDENTIALS', envCredsPath);
+        const envCredsPath = path.join(tempHomeDir, "byoid_creds.json");
+        await fs.promises.writeFile(envCredsPath, JSON.stringify(byoidCredentials));
+        vi.stubEnv("GOOGLE_APPLICATION_CREDENTIALS", envCredsPath);
 
         // Mock GoogleAuth and its chain of calls
         const mockExternalAccountClient = {
-          getAccessToken: vi.fn().mockResolvedValue({ token: 'byoid-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "byoid-token" }),
         };
-        const mockFromJSON = vi
-          .fn()
-          .mockResolvedValue(mockExternalAccountClient);
+        const mockFromJSON = vi.fn().mockResolvedValue(mockExternalAccountClient);
         const mockGoogleAuthInstance = {
           fromJSON: mockFromJSON,
         };
-        (GoogleAuth as unknown as Mock).mockImplementation(
-          () => mockGoogleAuthInstance,
-        );
+        (GoogleAuth as unknown as Mock).mockImplementation(() => mockGoogleAuthInstance);
 
         const mockOAuth2Client = {
           on: vi.fn(),
         };
-        (OAuth2Client as unknown as Mock).mockImplementation(
-          () => mockOAuth2Client,
-        );
+        (OAuth2Client as unknown as Mock).mockImplementation(() => mockOAuth2Client);
 
-        const client = await getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
         // Assert that GoogleAuth was used and the correct client was returned
         expect(GoogleAuth).toHaveBeenCalledWith({
@@ -467,15 +402,13 @@ describe('oauth2', () => {
       });
     });
 
-    describe('with GCP environment variables', () => {
-      it('should use GOOGLE_CLOUD_ACCESS_TOKEN when GOOGLE_GENAI_USE_GCA is true', async () => {
-        vi.stubEnv('GOOGLE_GENAI_USE_GCA', 'true');
-        vi.stubEnv('GOOGLE_CLOUD_ACCESS_TOKEN', 'gcp-access-token');
+    describe("with GCP environment variables", () => {
+      it("should use GOOGLE_CLOUD_ACCESS_TOKEN when GOOGLE_GENAI_USE_GCA is true", async () => {
+        vi.stubEnv("GOOGLE_GENAI_USE_GCA", "true");
+        vi.stubEnv("GOOGLE_CLOUD_ACCESS_TOKEN", "gcp-access-token");
 
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'gcp-access-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "gcp-access-token" });
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
           getAccessToken: mockGetAccessToken,
@@ -486,52 +419,38 @@ describe('oauth2', () => {
         // Mock the UserInfo API response for fetchAndCacheUserInfo
         (global.fetch as Mock).mockResolvedValue({
           ok: true,
-          json: vi
-            .fn()
-            .mockResolvedValue({ email: 'test-gcp-account@gmail.com' }),
+          json: vi.fn().mockResolvedValue({ email: "test-gcp-account@gmail.com" }),
         } as unknown as Response);
 
-        const client = await getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const client = await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
         expect(client).toBe(mockOAuth2Client);
         expect(mockSetCredentials).toHaveBeenCalledWith({
-          access_token: 'gcp-access-token',
+          access_token: "gcp-access-token",
         });
 
         // Verify fetchAndCacheUserInfo was effectively called
         expect(mockGetAccessToken).toHaveBeenCalled();
-        expect(global.fetch).toHaveBeenCalledWith(
-          'https://www.googleapis.com/oauth2/v2/userinfo',
-          {
-            headers: {
-              Authorization: 'Bearer gcp-access-token',
-            },
+        expect(global.fetch).toHaveBeenCalledWith("https://www.googleapis.com/oauth2/v2/userinfo", {
+          headers: {
+            Authorization: "Bearer gcp-access-token",
           },
-        );
+        });
 
         // Verify Google Account was cached
-        const googleAccountPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'google_accounts.json',
-        );
-        const cachedContent = fs.readFileSync(googleAccountPath, 'utf-8');
+        const googleAccountPath = path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
+        const cachedContent = fs.readFileSync(googleAccountPath, "utf-8");
         expect(JSON.parse(cachedContent)).toEqual({
-          active: 'test-gcp-account@gmail.com',
+          active: "test-gcp-account@gmail.com",
           old: [],
         });
       });
 
-      it('should not use GCP token if GOOGLE_CLOUD_ACCESS_TOKEN is not set', async () => {
-        vi.stubEnv('GOOGLE_GENAI_USE_GCA', 'true');
+      it("should not use GCP token if GOOGLE_CLOUD_ACCESS_TOKEN is not set", async () => {
+        vi.stubEnv("GOOGLE_GENAI_USE_GCA", "true");
 
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'cached-access-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "cached-access-token" });
         const mockGetTokenInfo = vi.fn().mockResolvedValue({});
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
@@ -542,12 +461,8 @@ describe('oauth2', () => {
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         // Make it fall through to cached credentials path
-        const cachedCreds = { refresh_token: 'cached-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const cachedCreds = { refresh_token: "cached-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
@@ -558,13 +473,11 @@ describe('oauth2', () => {
         expect(mockSetCredentials).toHaveBeenCalledWith(cachedCreds);
       });
 
-      it('should not use GCP token if GOOGLE_GENAI_USE_GCA is not set', async () => {
-        vi.stubEnv('GOOGLE_CLOUD_ACCESS_TOKEN', 'gcp-access-token');
+      it("should not use GCP token if GOOGLE_GENAI_USE_GCA is not set", async () => {
+        vi.stubEnv("GOOGLE_CLOUD_ACCESS_TOKEN", "gcp-access-token");
 
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'cached-access-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "cached-access-token" });
         const mockGetTokenInfo = vi.fn().mockResolvedValue({});
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
@@ -575,12 +488,8 @@ describe('oauth2', () => {
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         // Make it fall through to cached credentials path
-        const cachedCreds = { refresh_token: 'cached-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const cachedCreds = { refresh_token: "cached-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
@@ -592,33 +501,31 @@ describe('oauth2', () => {
       });
     });
 
-    describe('error handling', () => {
-      it('should handle browser launch failure with FatalAuthenticationError', async () => {
-        const mockError = new Error('Browser launch failed');
+    describe("error handling", () => {
+      it("should handle browser launch failure with FatalAuthenticationError", async () => {
+        const mockError = new Error("Browser launch failed");
         (open as Mock).mockRejectedValue(mockError);
 
         const mockOAuth2Client = {
-          generateAuthUrl: vi.fn().mockReturnValue('https://example.com/auth'),
+          generateAuthUrl: vi.fn().mockReturnValue("https://example.com/auth"),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        await expect(
-          getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig),
-        ).rejects.toThrow('Failed to open browser: Browser launch failed');
+        await expect(getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig)).rejects.toThrow(
+          "Failed to open browser: Browser launch failed",
+        );
       });
 
-      it('should handle authentication timeout with proper error message', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
+      it("should handle authentication timeout with proper error message", async () => {
+        const mockAuthUrl = "https://example.com/auth";
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         const mockHttpServer = {
           listen: vi.fn(),
@@ -636,26 +543,22 @@ describe('oauth2', () => {
           (callback) => (callback(), {} as unknown as NodeJS.Timeout),
         ) as unknown as typeof setTimeout;
 
-        await expect(
-          getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig),
-        ).rejects.toThrow(
-          'Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. Please try again or use NO_BROWSER=true for manual authentication.',
+        await expect(getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig)).rejects.toThrow(
+          "Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. Please try again or use NO_BROWSER=true for manual authentication.",
         );
 
         global.setTimeout = originalSetTimeout;
       });
 
-      it('should handle OAuth callback errors with descriptive messages', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
+      it("should handle OAuth callback errors with descriptive messages", async () => {
+        const mockAuthUrl = "https://example.com/auth";
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -664,12 +567,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -679,15 +580,12 @@ describe('oauth2', () => {
           return mockHttpServer as unknown as http.Server;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         // Test OAuth error with description
         const mockReq = {
-          url: '/oauth2callback?error=access_denied&error_description=User+denied+access',
+          url: "/oauth2callback?error=access_denied&error_description=User+denied+access",
         } as http.IncomingMessage;
         const mockRes = {
           writeHead: vi.fn(),
@@ -697,22 +595,18 @@ describe('oauth2', () => {
         await expect(async () => {
           await requestCallback(mockReq, mockRes);
           await clientPromise;
-        }).rejects.toThrow(
-          'Google OAuth error: access_denied. User denied access',
-        );
+        }).rejects.toThrow("Google OAuth error: access_denied. User denied access");
       });
 
-      it('should handle OAuth error without description', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
+      it("should handle OAuth error without description", async () => {
+        const mockAuthUrl = "https://example.com/auth";
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -721,12 +615,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -736,15 +628,12 @@ describe('oauth2', () => {
           return mockHttpServer as unknown as http.Server;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         // Test OAuth error without description
         const mockReq = {
-          url: '/oauth2callback?error=server_error',
+          url: "/oauth2callback?error=server_error",
         } as http.IncomingMessage;
         const mockRes = {
           writeHead: vi.fn(),
@@ -754,29 +643,23 @@ describe('oauth2', () => {
         await expect(async () => {
           await requestCallback(mockReq, mockRes);
           await clientPromise;
-        }).rejects.toThrow(
-          'Google OAuth error: server_error. No additional details provided',
-        );
+        }).rejects.toThrow("Google OAuth error: server_error. No additional details provided");
       });
 
-      it('should handle token exchange failure with descriptive error', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
-        const mockCode = 'test-code';
-        const mockState = 'test-state';
+      it("should handle token exchange failure with descriptive error", async () => {
+        const mockAuthUrl = "https://example.com/auth";
+        const mockCode = "test-code";
+        const mockState = "test-state";
 
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
-          getToken: vi
-            .fn()
-            .mockRejectedValue(new Error('Token exchange failed')),
+          getToken: vi.fn().mockRejectedValue(new Error("Token exchange failed")),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -785,12 +668,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -800,10 +681,7 @@ describe('oauth2', () => {
           return mockHttpServer as unknown as http.Server;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         const mockReq = {
@@ -818,45 +696,39 @@ describe('oauth2', () => {
           await requestCallback(mockReq, mockRes);
           await clientPromise;
         }).rejects.toThrow(
-          'Failed to exchange authorization code for tokens: Token exchange failed',
+          "Failed to exchange authorization code for tokens: Token exchange failed",
         );
       });
 
-      it('should handle fetchAndCacheUserInfo failure gracefully', async () => {
-        const mockAuthUrl = 'https://example.com/auth';
-        const mockCode = 'test-code';
-        const mockState = 'test-state';
+      it("should handle fetchAndCacheUserInfo failure gracefully", async () => {
+        const mockAuthUrl = "https://example.com/auth";
+        const mockCode = "test-code";
+        const mockState = "test-state";
         const mockTokens = {
-          access_token: 'test-access-token',
-          refresh_token: 'test-refresh-token',
+          access_token: "test-access-token",
+          refresh_token: "test-refresh-token",
         };
 
         const mockOAuth2Client = {
           generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
           getToken: vi.fn().mockResolvedValue({ tokens: mockTokens }),
           setCredentials: vi.fn(),
-          getAccessToken: vi
-            .fn()
-            .mockResolvedValue({ token: 'test-access-token' }),
+          getAccessToken: vi.fn().mockResolvedValue({ token: "test-access-token" }),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-        vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-        vi.mocked(open).mockImplementation(
-          async () => ({ on: vi.fn() }) as never,
-        );
+        vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+        vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
         // Mock fetch to fail
         vi.mocked(global.fetch).mockResolvedValue({
           ok: false,
           status: 500,
-          statusText: 'Internal Server Error',
+          statusText: "Internal Server Error",
         } as unknown as Response);
 
-        const consoleLogSpy = vi
-          .spyOn(console, 'log')
-          .mockImplementation(() => {});
+        const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
         let requestCallback!: http.RequestListener;
         let serverListeningCallback: (value: unknown) => void;
@@ -865,12 +737,10 @@ describe('oauth2', () => {
         );
 
         const mockHttpServer = {
-          listen: vi.fn(
-            (_port: number, _host: string, callback?: () => void) => {
-              if (callback) callback();
-              serverListeningCallback(undefined);
-            },
-          ),
+          listen: vi.fn((_port: number, _host: string, callback?: () => void) => {
+            if (callback) callback();
+            serverListeningCallback(undefined);
+          }),
           close: vi.fn(),
           on: vi.fn(),
           address: () => ({ port: 3000 }),
@@ -880,10 +750,7 @@ describe('oauth2', () => {
           return mockHttpServer;
         });
 
-        const clientPromise = getOauthClient(
-          AuthType.LOGIN_WITH_GOOGLE,
-          mockConfig,
-        );
+        const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
         await serverListeningPromise;
 
         const mockReq = {
@@ -900,54 +767,48 @@ describe('oauth2', () => {
         // Authentication should succeed even if fetchAndCacheUserInfo fails
         expect(client).toBe(mockOAuth2Client);
         expect(consoleLogSpy).toHaveBeenCalledWith(
-          'Failed to fetch user info:',
+          "Failed to fetch user info:",
           500,
-          'Internal Server Error',
+          "Internal Server Error",
         );
 
         consoleLogSpy.mockRestore();
       });
 
-      it('should handle user code authentication failure with descriptive error', async () => {
+      it("should handle user code authentication failure with descriptive error", async () => {
         const mockConfigWithNoBrowser = {
           getNoBrowser: () => true,
-          getProxy: () => 'http://test.proxy.com:8080',
+          getProxy: () => "http://test.proxy.com:8080",
           isBrowserLaunchSuppressed: () => true,
         } as unknown as Config;
 
         const mockOAuth2Client = {
           generateCodeVerifierAsync: vi.fn().mockResolvedValue({
-            codeChallenge: 'test-challenge',
-            codeVerifier: 'test-verifier',
+            codeChallenge: "test-challenge",
+            codeVerifier: "test-verifier",
           }),
-          generateAuthUrl: vi.fn().mockReturnValue('https://example.com/auth'),
-          getToken: vi
-            .fn()
-            .mockRejectedValue(new Error('Invalid authorization code')),
+          generateAuthUrl: vi.fn().mockReturnValue("https://example.com/auth"),
+          getToken: vi.fn().mockRejectedValue(new Error("Invalid authorization code")),
           on: vi.fn(),
         } as unknown as OAuth2Client;
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         const mockReadline = {
-          question: vi.fn((_query, callback) => callback('invalid-code')),
+          question: vi.fn((_query, callback) => callback("invalid-code")),
           close: vi.fn(),
         };
         (readline.createInterface as Mock).mockReturnValue(mockReadline);
 
-        const consoleLogSpy = vi
-          .spyOn(console, 'log')
-          .mockImplementation(() => {});
-        const consoleErrorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
+        const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         await expect(
           getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfigWithNoBrowser),
-        ).rejects.toThrow('Failed to authenticate with user code.');
+        ).rejects.toThrow("Failed to authenticate with user code.");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
-          'Failed to authenticate with authorization code:',
-          'Invalid authorization code',
+          "Failed to authenticate with authorization code:",
+          "Invalid authorization code",
         );
 
         consoleLogSpy.mockRestore();
@@ -955,50 +816,33 @@ describe('oauth2', () => {
       });
     });
 
-    describe('clearCachedCredentialFile', () => {
-      it('should clear cached credentials and Google account', async () => {
-        const cachedCreds = { refresh_token: 'test-token' };
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+    describe("clearCachedCredentialFile", () => {
+      it("should clear cached credentials and Google account", async () => {
+        const cachedCreds = { refresh_token: "test-token" };
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
         await fs.promises.writeFile(credsPath, JSON.stringify(cachedCreds));
 
-        const googleAccountPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'google_accounts.json',
-        );
-        const accountData = { active: 'test@example.com', old: [] };
-        await fs.promises.writeFile(
-          googleAccountPath,
-          JSON.stringify(accountData),
-        );
+        const googleAccountPath = path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
+        const accountData = { active: "test@example.com", old: [] };
+        await fs.promises.writeFile(googleAccountPath, JSON.stringify(accountData));
         const userAccountManager = new UserAccountManager();
 
         expect(fs.existsSync(credsPath)).toBe(true);
         expect(fs.existsSync(googleAccountPath)).toBe(true);
-        expect(userAccountManager.getCachedGoogleAccount()).toBe(
-          'test@example.com',
-        );
+        expect(userAccountManager.getCachedGoogleAccount()).toBe("test@example.com");
 
         await clearCachedCredentialFile();
         expect(fs.existsSync(credsPath)).toBe(false);
         expect(userAccountManager.getCachedGoogleAccount()).toBeNull();
-        const updatedAccountData = JSON.parse(
-          fs.readFileSync(googleAccountPath, 'utf-8'),
-        );
+        const updatedAccountData = JSON.parse(fs.readFileSync(googleAccountPath, "utf-8"));
         expect(updatedAccountData.active).toBeNull();
-        expect(updatedAccountData.old).toContain('test@example.com');
+        expect(updatedAccountData.old).toContain("test@example.com");
       });
 
-      it('should clear the in-memory OAuth client cache', async () => {
+      it("should clear the in-memory OAuth client cache", async () => {
         const mockSetCredentials = vi.fn();
-        const mockGetAccessToken = vi
-          .fn()
-          .mockResolvedValue({ token: 'test-token' });
+        const mockGetAccessToken = vi.fn().mockResolvedValue({ token: "test-token" });
         const mockGetTokenInfo = vi.fn().mockResolvedValue({});
         const mockOAuth2Client = {
           setCredentials: mockSetCredentials,
@@ -1009,16 +853,9 @@ describe('oauth2', () => {
         vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
         // Pre-populate credentials to make getOauthClient resolve quickly
-        const credsPath = path.join(
-          tempHomeDir,
-          GEMINI_DIR,
-          'oauth_creds.json',
-        );
+        const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
         await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
-        await fs.promises.writeFile(
-          credsPath,
-          JSON.stringify({ refresh_token: 'token' }),
-        );
+        await fs.promises.writeFile(credsPath, JSON.stringify({ refresh_token: "token" }));
 
         // First call, should create a client
         await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
@@ -1037,13 +874,11 @@ describe('oauth2', () => {
     });
   });
 
-  describe('with encrypted flag true', () => {
+  describe("with encrypted flag true", () => {
     let tempHomeDir: string;
     beforeEach(() => {
-      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = 'true';
-      tempHomeDir = fs.mkdtempSync(
-        path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-      );
+      process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] = "true";
+      tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
       (os.homedir as Mock).mockReturnValue(tempHomeDir);
     });
 
@@ -1054,21 +889,19 @@ describe('oauth2', () => {
       vi.unstubAllEnvs();
     });
 
-    it('should save credentials using OAuthCredentialStorage during web login', async () => {
-      const { OAuthCredentialStorage } = await import(
-        './oauth-credential-storage.js'
-      );
-      const mockAuthUrl = 'https://example.com/auth';
-      const mockCode = 'test-code';
-      const mockState = 'test-state';
+    it("should save credentials using OAuthCredentialStorage during web login", async () => {
+      const { OAuthCredentialStorage } = await import("./oauth-credential-storage.js");
+      const mockAuthUrl = "https://example.com/auth";
+      const mockCode = "test-code";
+      const mockState = "test-state";
       const mockTokens = {
-        access_token: 'test-access-token',
-        refresh_token: 'test-refresh-token',
+        access_token: "test-access-token",
+        refresh_token: "test-refresh-token",
       };
 
       let onTokensCallback: (tokens: Credentials) => void = () => {};
       const mockOn = vi.fn((event, callback) => {
-        if (event === 'tokens') {
+        if (event === "tokens") {
           onTokensCallback = callback;
         }
       });
@@ -1082,31 +915,23 @@ describe('oauth2', () => {
         generateAuthUrl: vi.fn().mockReturnValue(mockAuthUrl),
         getToken: mockGetToken,
         setCredentials: vi.fn(),
-        getAccessToken: vi
-          .fn()
-          .mockResolvedValue({ token: 'mock-access-token' }),
+        getAccessToken: vi.fn().mockResolvedValue({ token: "mock-access-token" }),
         on: mockOn,
         credentials: mockTokens,
       } as unknown as OAuth2Client;
       vi.mocked(OAuth2Client).mockImplementation(() => mockOAuth2Client);
 
-      vi.spyOn(crypto, 'randomBytes').mockReturnValue(mockState as never);
-      vi.mocked(open).mockImplementation(
-        async () => ({ on: vi.fn() }) as never,
-      );
+      vi.spyOn(crypto, "randomBytes").mockReturnValue(mockState as never);
+      vi.mocked(open).mockImplementation(async () => ({ on: vi.fn() }) as never);
 
       (global.fetch as Mock).mockResolvedValue({
         ok: true,
-        json: vi
-          .fn()
-          .mockResolvedValue({ email: 'test-google-account@gmail.com' }),
+        json: vi.fn().mockResolvedValue({ email: "test-google-account@gmail.com" }),
       } as unknown as Response);
 
       let requestCallback!: http.RequestListener;
       let serverListeningCallback: (value: unknown) => void;
-      const serverListeningPromise = new Promise(
-        (resolve) => (serverListeningCallback = resolve),
-      );
+      const serverListeningPromise = new Promise((resolve) => (serverListeningCallback = resolve));
 
       let capturedPort = 0;
       const mockHttpServer = {
@@ -1130,10 +955,7 @@ describe('oauth2', () => {
         return mockHttpServer as unknown as http.Server;
       });
 
-      const clientPromise = getOauthClient(
-        AuthType.LOGIN_WITH_GOOGLE,
-        mockConfig,
-      );
+      const clientPromise = getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
       await serverListeningPromise;
 
@@ -1149,64 +971,50 @@ describe('oauth2', () => {
 
       await clientPromise;
 
-      expect(
-        OAuthCredentialStorage.saveCredentials as Mock,
-      ).toHaveBeenCalledWith(mockTokens);
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+      expect(OAuthCredentialStorage.saveCredentials as Mock).toHaveBeenCalledWith(mockTokens);
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
       expect(fs.existsSync(credsPath)).toBe(false);
     });
 
-    it('should load credentials using OAuthCredentialStorage and not from file', async () => {
-      const { OAuthCredentialStorage } = await import(
-        './oauth-credential-storage.js'
-      );
-      const cachedCreds = { refresh_token: 'cached-encrypted-token' };
-      (OAuthCredentialStorage.loadCredentials as Mock).mockResolvedValue(
-        cachedCreds,
-      );
+    it("should load credentials using OAuthCredentialStorage and not from file", async () => {
+      const { OAuthCredentialStorage } = await import("./oauth-credential-storage.js");
+      const cachedCreds = { refresh_token: "cached-encrypted-token" };
+      (OAuthCredentialStorage.loadCredentials as Mock).mockResolvedValue(cachedCreds);
 
       // Create a dummy unencrypted credential file.
       // If the logic is correct, this file should be ignored.
-      const unencryptedCreds = { refresh_token: 'unencrypted-token' };
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+      const unencryptedCreds = { refresh_token: "unencrypted-token" };
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
       await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
       await fs.promises.writeFile(credsPath, JSON.stringify(unencryptedCreds));
 
       const mockClient = {
         setCredentials: vi.fn(),
-        getAccessToken: vi.fn().mockResolvedValue({ token: 'test-token' }),
+        getAccessToken: vi.fn().mockResolvedValue({ token: "test-token" }),
         getTokenInfo: vi.fn().mockResolvedValue({}),
         on: vi.fn(),
       };
 
-      vi.mocked(OAuth2Client).mockImplementation(
-        () => mockClient as unknown as OAuth2Client,
-      );
+      vi.mocked(OAuth2Client).mockImplementation(() => mockClient as unknown as OAuth2Client);
 
       await getOauthClient(AuthType.LOGIN_WITH_GOOGLE, mockConfig);
 
       expect(OAuthCredentialStorage.loadCredentials as Mock).toHaveBeenCalled();
       expect(mockClient.setCredentials).toHaveBeenCalledWith(cachedCreds);
-      expect(mockClient.setCredentials).not.toHaveBeenCalledWith(
-        unencryptedCreds,
-      );
+      expect(mockClient.setCredentials).not.toHaveBeenCalledWith(unencryptedCreds);
     });
 
-    it('should clear credentials using OAuthCredentialStorage', async () => {
-      const { OAuthCredentialStorage } = await import(
-        './oauth-credential-storage.js'
-      );
+    it("should clear credentials using OAuthCredentialStorage", async () => {
+      const { OAuthCredentialStorage } = await import("./oauth-credential-storage.js");
 
       // Create a dummy unencrypted credential file. It should not be deleted.
-      const credsPath = path.join(tempHomeDir, GEMINI_DIR, 'oauth_creds.json');
+      const credsPath = path.join(tempHomeDir, GEMINI_DIR, "oauth_creds.json");
       await fs.promises.mkdir(path.dirname(credsPath), { recursive: true });
-      await fs.promises.writeFile(credsPath, '{}');
+      await fs.promises.writeFile(credsPath, "{}");
 
       await clearCachedCredentialFile();
 
-      expect(
-        OAuthCredentialStorage.clearCredentials as Mock,
-      ).toHaveBeenCalled();
+      expect(OAuthCredentialStorage.clearCredentials as Mock).toHaveBeenCalled();
       expect(fs.existsSync(credsPath)).toBe(true); // The unencrypted file should remain
     });
   });
diff --git a/packages/gemini-core/src/code_assist/oauth2.ts b/packages/gemini-core/src/code_assist/oauth2.ts
index 46ff9fcb0..0dbd94aad 100644
--- a/packages/gemini-core/src/code_assist/oauth2.ts
+++ b/packages/gemini-core/src/code_assist/oauth2.ts
@@ -4,35 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Credentials, AuthClient, JWTInput } from 'google-auth-library';
-import {
-  OAuth2Client,
-  Compute,
-  CodeChallengeMethod,
-  GoogleAuth,
-} from 'google-auth-library';
-import * as http from 'node:http';
-import url from 'node:url';
-import crypto from 'node:crypto';
-import * as net from 'node:net';
-import open from 'open';
-import path from 'node:path';
-import { promises as fs } from 'node:fs';
-import type { Config } from '../config/config.js';
-import { getErrorMessage, FatalAuthenticationError } from '../utils/errors.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
-import { AuthType } from '../core/contentGenerator.js';
-import readline from 'node:readline';
-import { Storage } from '../config/storage.js';
-import { OAuthCredentialStorage } from './oauth-credential-storage.js';
-import { FORCE_ENCRYPTED_FILE_ENV_VAR } from '../mcp/token-storage/index.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import crypto from "node:crypto";
+import { promises as fs } from "node:fs";
+import * as http from "node:http";
+import * as net from "node:net";
+import path from "node:path";
+import readline from "node:readline";
+import url from "node:url";
+import type { AuthClient, Credentials, JWTInput } from "google-auth-library";
+import { CodeChallengeMethod, Compute, GoogleAuth, OAuth2Client } from "google-auth-library";
+import open from "open";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { FORCE_ENCRYPTED_FILE_ENV_VAR } from "../mcp/token-storage/index.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { FatalAuthenticationError, getErrorMessage } from "../utils/errors.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
+import { OAuthCredentialStorage } from "./oauth-credential-storage.js";
 
 const userAccountManager = new UserAccountManager();
 
 //  OAuth Client ID used to initiate OAuth2Client class.
-const OAUTH_CLIENT_ID =
-  '681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com';
+const OAUTH_CLIENT_ID = "681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com";
 
 // OAuth Secret value used to initiate OAuth2Client class.
 // Note: It's ok to save this in git because this is an installed application
@@ -40,20 +34,18 @@ const OAUTH_CLIENT_ID =
 // "The process results in a client ID and, in some cases, a client secret,
 // which you embed in the source code of your application. (In this context,
 // the client secret is obviously not treated as a secret.)"
-const OAUTH_CLIENT_SECRET = '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';
+const OAUTH_CLIENT_SECRET = "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";
 
 // OAuth Scopes for Cloud Code authorization.
 const OAUTH_SCOPE = [
-  'https://www.googleapis.com/auth/cloud-platform',
-  'https://www.googleapis.com/auth/userinfo.email',
-  'https://www.googleapis.com/auth/userinfo.profile',
+  "https://www.googleapis.com/auth/cloud-platform",
+  "https://www.googleapis.com/auth/userinfo.email",
+  "https://www.googleapis.com/auth/userinfo.profile",
 ];
 
 const HTTP_REDIRECT = 301;
-const SIGN_IN_SUCCESS_URL =
-  'https://developers.google.com/gemini-code-assist/auth_success_gemini';
-const SIGN_IN_FAILURE_URL =
-  'https://developers.google.com/gemini-code-assist/auth_failure_gemini';
+const SIGN_IN_SUCCESS_URL = "https://developers.google.com/gemini-code-assist/auth_success_gemini";
+const SIGN_IN_FAILURE_URL = "https://developers.google.com/gemini-code-assist/auth_failure_gemini";
 
 /**
  * An Authentication URL for updating the credentials of a Oauth2Client
@@ -68,19 +60,15 @@ export interface OauthWebLogin {
 const oauthClientPromises = new Map<AuthType, Promise<AuthClient>>();
 
 function getUseEncryptedStorageFlag() {
-  return process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === 'true';
+  return process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === "true";
 }
 
-async function initOauthClient(
-  authType: AuthType,
-  config: Config,
-): Promise<AuthClient> {
+async function initOauthClient(authType: AuthType, config: Config): Promise<AuthClient> {
   const credentials = await fetchCachedCredentials();
 
   if (
     credentials &&
-    (credentials as { type?: string }).type ===
-      'external_account_authorized_user'
+    (credentials as { type?: string }).type === "external_account_authorized_user"
   ) {
     const auth = new GoogleAuth({
       scopes: OAUTH_SCOPE,
@@ -91,7 +79,7 @@ async function initOauthClient(
     });
     const token = await byoidClient.getAccessToken();
     if (token) {
-      debugLogger.debug('Created BYOID auth client.');
+      debugLogger.debug("Created BYOID auth client.");
       return byoidClient;
     }
   }
@@ -105,18 +93,15 @@ async function initOauthClient(
   });
   const useEncryptedStorage = getUseEncryptedStorageFlag();
 
-  if (
-    process.env['GOOGLE_GENAI_USE_GCA'] &&
-    process.env['GOOGLE_CLOUD_ACCESS_TOKEN']
-  ) {
+  if (process.env["GOOGLE_GENAI_USE_GCA"] && process.env["GOOGLE_CLOUD_ACCESS_TOKEN"]) {
     client.setCredentials({
-      access_token: process.env['GOOGLE_CLOUD_ACCESS_TOKEN'],
+      access_token: process.env["GOOGLE_CLOUD_ACCESS_TOKEN"],
     });
     await fetchAndCacheUserInfo(client);
     return client;
   }
 
-  client.on('tokens', async (tokens: Credentials) => {
+  client.on("tokens", async (tokens: Credentials) => {
     if (useEncryptedStorage) {
       await OAuthCredentialStorage.saveCredentials(tokens);
     } else {
@@ -138,20 +123,14 @@ async function initOauthClient(
             await fetchAndCacheUserInfo(client);
           } catch (error) {
             // Non-fatal, continue with existing auth.
-            debugLogger.warn(
-              'Failed to fetch user info:',
-              getErrorMessage(error),
-            );
+            debugLogger.warn("Failed to fetch user info:", getErrorMessage(error));
           }
         }
-        debugLogger.log('Loaded cached credentials.');
+        debugLogger.log("Loaded cached credentials.");
         return client;
       }
     } catch (error) {
-      debugLogger.debug(
-        `Cached credentials are not valid:`,
-        getErrorMessage(error),
-      );
+      debugLogger.debug(`Cached credentials are not valid:`, getErrorMessage(error));
     }
   }
 
@@ -166,7 +145,7 @@ async function initOauthClient(
         // the service account email.
       });
       await computeClient.getAccessToken();
-      debugLogger.log('Authentication successful.');
+      debugLogger.log("Authentication successful.");
 
       // Do not cache creds in this case; note that Compute client will handle its own refresh
       return computeClient;
@@ -186,15 +165,13 @@ async function initOauthClient(
       success = await authWithUserCode(client);
       if (!success) {
         debugLogger.error(
-          '\nFailed to authenticate with user code.',
-          i === maxRetries - 1 ? '' : 'Retrying...\n',
+          "\nFailed to authenticate with user code.",
+          i === maxRetries - 1 ? "" : "Retrying...\n",
         );
       }
     }
     if (!success) {
-      throw new FatalAuthenticationError(
-        'Failed to authenticate with user code.',
-      );
+      throw new FatalAuthenticationError("Failed to authenticate with user code.");
     }
   } else {
     const webLogin = await authWithWeb(client);
@@ -214,7 +191,7 @@ async function initOauthClient(
       // Without this, if `open` fails to spawn a process (e.g., `xdg-open` is not found
       // in a minimal Docker container), it will emit an unhandled 'error' event,
       // causing the entire Node.js process to crash.
-      childProcess.on('error', (error) => {
+      childProcess.on("error", (error) => {
         debugLogger.error(
           `Failed to open browser with error:`,
           getErrorMessage(error),
@@ -227,11 +204,9 @@ async function initOauthClient(
         getErrorMessage(err),
         `\nPlease try running again with NO_BROWSER=true set.`,
       );
-      throw new FatalAuthenticationError(
-        `Failed to open browser: ${getErrorMessage(err)}`,
-      );
+      throw new FatalAuthenticationError(`Failed to open browser: ${getErrorMessage(err)}`);
     }
-    debugLogger.log('Waiting for authentication...');
+    debugLogger.log("Waiting for authentication...");
 
     // Add timeout to prevent infinite waiting when browser tab gets stuck
     const authTimeout = 5 * 60 * 1000; // 5 minutes timeout
@@ -239,8 +214,8 @@ async function initOauthClient(
       setTimeout(() => {
         reject(
           new FatalAuthenticationError(
-            'Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. ' +
-              'Please try again or use NO_BROWSER=true for manual authentication.',
+            "Authentication timed out after 5 minutes. The browser tab may have gotten stuck in a loading state. " +
+              "Please try again or use NO_BROWSER=true for manual authentication.",
           ),
         );
       }, authTimeout);
@@ -252,10 +227,7 @@ async function initOauthClient(
   return client;
 }
 
-export async function getOauthClient(
-  authType: AuthType,
-  config: Config,
-): Promise<AuthClient> {
+export async function getOauthClient(authType: AuthType, config: Config): Promise<AuthClient> {
   if (!oauthClientPromises.has(authType)) {
     oauthClientPromises.set(authType, initOauthClient(authType, config));
   }
@@ -263,37 +235,35 @@ export async function getOauthClient(
 }
 
 async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
-  const redirectUri = 'https://codeassist.google.com/authcode';
+  const redirectUri = "https://codeassist.google.com/authcode";
   const codeVerifier = await client.generateCodeVerifierAsync();
-  const state = crypto.randomBytes(32).toString('hex');
+  const state = crypto.randomBytes(32).toString("hex");
   const authUrl: string = client.generateAuthUrl({
     redirect_uri: redirectUri,
-    access_type: 'offline',
+    access_type: "offline",
     scope: OAUTH_SCOPE,
     code_challenge_method: CodeChallengeMethod.S256,
     code_challenge: codeVerifier.codeChallenge,
     state,
   });
-  debugLogger.log(
-    'Please visit the following URL to authorize the application:',
-  );
-  debugLogger.log('');
+  debugLogger.log("Please visit the following URL to authorize the application:");
+  debugLogger.log("");
   debugLogger.log(authUrl);
-  debugLogger.log('');
+  debugLogger.log("");
 
   const code = await new Promise<string>((resolve) => {
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
     });
-    rl.question('Enter the authorization code: ', (code) => {
+    rl.question("Enter the authorization code: ", (code) => {
       rl.close();
       resolve(code.trim());
     });
   });
 
   if (!code) {
-    debugLogger.error('Authorization code is required.');
+    debugLogger.error("Authorization code is required.");
     return false;
   }
 
@@ -305,10 +275,7 @@ async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
     });
     client.setCredentials(tokens);
   } catch (error) {
-    debugLogger.error(
-      'Failed to authenticate with authorization code:',
-      getErrorMessage(error),
-    );
+    debugLogger.error("Failed to authenticate with authorization code:", getErrorMessage(error));
     return false;
   }
   return true;
@@ -317,16 +284,16 @@ async function authWithUserCode(client: OAuth2Client): Promise<boolean> {
 async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
   const port = await getAvailablePort();
   // The hostname used for the HTTP server binding (e.g., '0.0.0.0' in Docker).
-  const host = process.env['OAUTH_CALLBACK_HOST'] || 'localhost';
+  const host = process.env["OAUTH_CALLBACK_HOST"] || "localhost";
   // The `redirectUri` sent to Google's authorization server MUST use a loopback IP literal
   // (i.e., 'localhost' or '127.0.0.1'). This is a strict security policy for credentials of
   // type 'Desktop app' or 'Web application' (when using loopback flow) to mitigate
   // authorization code interception attacks.
   const redirectUri = `http://localhost:${port}/oauth2callback`;
-  const state = crypto.randomBytes(32).toString('hex');
+  const state = crypto.randomBytes(32).toString("hex");
   const authUrl = client.generateAuthUrl({
     redirect_uri: redirectUri,
-    access_type: 'offline',
+    access_type: "offline",
     scope: OAUTH_SCOPE,
     state,
   });
@@ -334,41 +301,38 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
   const loginCompletePromise = new Promise<void>((resolve, reject) => {
     const server = http.createServer(async (req, res) => {
       try {
-        if (req.url!.indexOf('/oauth2callback') === -1) {
+        if (req.url!.indexOf("/oauth2callback") === -1) {
           res.writeHead(HTTP_REDIRECT, { Location: SIGN_IN_FAILURE_URL });
           res.end();
           reject(
             new FatalAuthenticationError(
-              'OAuth callback not received. Unexpected request: ' + req.url,
+              "OAuth callback not received. Unexpected request: " + req.url,
             ),
           );
         }
         // acquire the code from the querystring, and close the web server.
-        const qs = new url.URL(req.url!, 'http://localhost:3000').searchParams;
-        if (qs.get('error')) {
+        const qs = new url.URL(req.url!, "http://localhost:3000").searchParams;
+        if (qs.get("error")) {
           res.writeHead(HTTP_REDIRECT, { Location: SIGN_IN_FAILURE_URL });
           res.end();
 
-          const errorCode = qs.get('error');
-          const errorDescription =
-            qs.get('error_description') || 'No additional details provided';
+          const errorCode = qs.get("error");
+          const errorDescription = qs.get("error_description") || "No additional details provided";
           reject(
-            new FatalAuthenticationError(
-              `Google OAuth error: ${errorCode}. ${errorDescription}`,
-            ),
+            new FatalAuthenticationError(`Google OAuth error: ${errorCode}. ${errorDescription}`),
           );
-        } else if (qs.get('state') !== state) {
-          res.end('State mismatch. Possible CSRF attack');
+        } else if (qs.get("state") !== state) {
+          res.end("State mismatch. Possible CSRF attack");
 
           reject(
             new FatalAuthenticationError(
-              'OAuth state mismatch. Possible CSRF attack or browser session issue.',
+              "OAuth state mismatch. Possible CSRF attack or browser session issue.",
             ),
           );
-        } else if (qs.get('code')) {
+        } else if (qs.get("code")) {
           try {
             const { tokens } = await client.getToken({
-              code: qs.get('code')!,
+              code: qs.get("code")!,
               redirect_uri: redirectUri,
             });
             client.setCredentials(tokens);
@@ -378,7 +342,7 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
               await fetchAndCacheUserInfo(client);
             } catch (error) {
               debugLogger.warn(
-                'Failed to retrieve Google Account ID during authentication:',
+                "Failed to retrieve Google Account ID during authentication:",
                 getErrorMessage(error),
               );
               // Don't fail the auth flow if Google Account ID retrieval fails
@@ -399,7 +363,7 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
         } else {
           reject(
             new FatalAuthenticationError(
-              'No authorization code received from Google OAuth. Please try authenticating again.',
+              "No authorization code received from Google OAuth. Please try authenticating again.",
             ),
           );
         }
@@ -423,12 +387,8 @@ async function authWithWeb(client: OAuth2Client): Promise<OauthWebLogin> {
       // Server started successfully
     });
 
-    server.on('error', (err) => {
-      reject(
-        new FatalAuthenticationError(
-          `OAuth callback server error: ${getErrorMessage(err)}`,
-        ),
-      );
+    server.on("error", (err) => {
+      reject(new FatalAuthenticationError(`OAuth callback server error: ${getErrorMessage(err)}`));
     });
   });
 
@@ -442,13 +402,11 @@ export function getAvailablePort(): Promise<number> {
   return new Promise((resolve, reject) => {
     let port = 0;
     try {
-      const portStr = process.env['OAUTH_CALLBACK_PORT'];
+      const portStr = process.env["OAUTH_CALLBACK_PORT"];
       if (portStr) {
         port = parseInt(portStr, 10);
         if (isNaN(port) || port <= 0 || port > 65535) {
-          return reject(
-            new Error(`Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`),
-          );
+          return reject(new Error(`Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`));
         }
         return resolve(port);
       }
@@ -457,21 +415,19 @@ export function getAvailablePort(): Promise<number> {
         const address = server.address()! as net.AddressInfo;
         port = address.port;
       });
-      server.on('listening', () => {
+      server.on("listening", () => {
         server.close();
         server.unref();
       });
-      server.on('error', (e) => reject(e));
-      server.on('close', () => resolve(port));
+      server.on("error", (e) => reject(e));
+      server.on("close", () => resolve(port));
     } catch (e) {
       reject(e);
     }
   });
 }
 
-async function fetchCachedCredentials(): Promise<
-  Credentials | JWTInput | null
-> {
+async function fetchCachedCredentials(): Promise<Credentials | JWTInput | null> {
   const useEncryptedStorage = getUseEncryptedStorageFlag();
   if (useEncryptedStorage) {
     return await OAuthCredentialStorage.loadCredentials();
@@ -479,19 +435,16 @@ async function fetchCachedCredentials(): Promise<
 
   const pathsToTry = [
     Storage.getOAuthCredsPath(),
-    process.env['GOOGLE_APPLICATION_CREDENTIALS'],
+    process.env["GOOGLE_APPLICATION_CREDENTIALS"],
   ].filter((p): p is string => !!p);
 
   for (const keyFile of pathsToTry) {
     try {
-      const keyFileString = await fs.readFile(keyFile, 'utf-8');
+      const keyFileString = await fs.readFile(keyFile, "utf-8");
       return JSON.parse(keyFileString);
     } catch (error) {
       // Log specific error for debugging, but continue trying other paths
-      debugLogger.debug(
-        `Failed to load credentials from ${keyFile}:`,
-        getErrorMessage(error),
-      );
+      debugLogger.debug(`Failed to load credentials from ${keyFile}:`, getErrorMessage(error));
     }
   }
 
@@ -528,7 +481,7 @@ export async function clearCachedCredentialFile() {
     // Clear the in-memory OAuth client cache to force re-authentication
     clearOauthClientCache();
   } catch (e) {
-    debugLogger.warn('Failed to clear cached credentials:', e);
+    debugLogger.warn("Failed to clear cached credentials:", e);
   }
 }
 
@@ -539,28 +492,21 @@ async function fetchAndCacheUserInfo(client: OAuth2Client): Promise<void> {
       return;
     }
 
-    const response = await fetch(
-      'https://www.googleapis.com/oauth2/v2/userinfo',
-      {
-        headers: {
-          Authorization: `Bearer ${token}`,
-        },
+    const response = await fetch("https://www.googleapis.com/oauth2/v2/userinfo", {
+      headers: {
+        Authorization: `Bearer ${token}`,
       },
-    );
+    });
 
     if (!response.ok) {
-      debugLogger.log(
-        'Failed to fetch user info:',
-        response.status,
-        response.statusText,
-      );
+      debugLogger.log("Failed to fetch user info:", response.status, response.statusText);
       return;
     }
 
     const userInfo = await response.json();
     await userAccountManager.cacheGoogleAccount(userInfo.email);
   } catch (error) {
-    debugLogger.log('Error retrieving user info:', error);
+    debugLogger.log("Error retrieving user info:", error);
   }
 }
 
diff --git a/packages/gemini-core/src/code_assist/server.test.ts b/packages/gemini-core/src/code_assist/server.test.ts
index 099c05ad5..b8397fae1 100644
--- a/packages/gemini-core/src/code_assist/server.test.ts
+++ b/packages/gemini-core/src/code_assist/server.test.ts
@@ -4,38 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { beforeEach, describe, it, expect, vi, afterEach } from 'vitest';
-import { CodeAssistServer } from './server.js';
-import { OAuth2Client } from 'google-auth-library';
-import { UserTierId } from './types.js';
+import { OAuth2Client } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { CodeAssistServer } from "./server.js";
+import { UserTierId } from "./types.js";
 
-vi.mock('google-auth-library');
+vi.mock("google-auth-library");
 
-describe('CodeAssistServer', () => {
+describe("CodeAssistServer", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should be able to be constructed', () => {
+  it("should be able to be constructed", () => {
     const auth = new OAuth2Client();
-    const server = new CodeAssistServer(
-      auth,
-      'test-project',
-      {},
-      'test-session',
-      UserTierId.FREE,
-    );
+    const server = new CodeAssistServer(auth, "test-project", {}, "test-session", UserTierId.FREE);
     expect(server).toBeInstanceOf(CodeAssistServer);
   });
 
-  it('should call the generateContent endpoint', async () => {
+  it("should call the generateContent endpoint", async () => {
     const mockRequest = vi.fn();
     const client = { request: mockRequest } as unknown as OAuth2Client;
     const server = new CodeAssistServer(
       client,
-      'test-project',
-      { headers: { 'x-custom-header': 'test-value' } },
-      'test-session',
+      "test-project",
+      { headers: { "x-custom-header": "test-value" } },
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponseData = {
@@ -44,10 +38,10 @@ describe('CodeAssistServer', () => {
           {
             index: 0,
             content: {
-              role: 'model',
-              parts: [{ text: 'response' }],
+              role: "model",
+              parts: [{ text: "response" }],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
             safetyRatings: [],
           },
         ],
@@ -57,34 +51,32 @@ describe('CodeAssistServer', () => {
 
     const response = await server.generateContent(
       {
-        model: 'test-model',
-        contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+        model: "test-model",
+        contents: [{ role: "user", parts: [{ text: "request" }] }],
       },
-      'user-prompt-id',
+      "user-prompt-id",
     );
 
     expect(mockRequest).toHaveBeenCalledWith({
-      url: expect.stringContaining(':generateContent'),
-      method: 'POST',
+      url: expect.stringContaining(":generateContent"),
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
-        'x-custom-header': 'test-value',
+        "Content-Type": "application/json",
+        "x-custom-header": "test-value",
       },
-      responseType: 'json',
+      responseType: "json",
       body: expect.any(String),
       signal: undefined,
     });
 
     const requestBody = JSON.parse(mockRequest.mock.calls[0][0].body);
-    expect(requestBody.user_prompt_id).toBe('user-prompt-id');
-    expect(requestBody.project).toBe('test-project');
+    expect(requestBody.user_prompt_id).toBe("user-prompt-id");
+    expect(requestBody.project).toBe("test-project");
 
-    expect(response.candidates?.[0]?.content?.parts?.[0]?.text).toBe(
-      'response',
-    );
+    expect(response.candidates?.[0]?.content?.parts?.[0]?.text).toBe("response");
   });
 
-  describe('getMethodUrl', () => {
+  describe("getMethodUrl", () => {
     const originalEnv = process.env;
 
     beforeEach(() => {
@@ -97,62 +89,60 @@ describe('CodeAssistServer', () => {
       process.env = originalEnv;
     });
 
-    it('should construct the default URL correctly', () => {
+    it("should construct the default URL correctly", () => {
       const server = new CodeAssistServer({} as never);
-      const url = server.getMethodUrl('testMethod');
-      expect(url).toBe(
-        'https://cloudcode-pa.googleapis.com/v1internal:testMethod',
-      );
+      const url = server.getMethodUrl("testMethod");
+      expect(url).toBe("https://cloudcode-pa.googleapis.com/v1internal:testMethod");
     });
 
-    it('should use the CODE_ASSIST_ENDPOINT environment variable if set', () => {
-      process.env['CODE_ASSIST_ENDPOINT'] = 'https://custom-endpoint.com';
+    it("should use the CODE_ASSIST_ENDPOINT environment variable if set", () => {
+      process.env["CODE_ASSIST_ENDPOINT"] = "https://custom-endpoint.com";
       const server = new CodeAssistServer({} as never);
-      const url = server.getMethodUrl('testMethod');
-      expect(url).toBe('https://custom-endpoint.com/v1internal:testMethod');
+      const url = server.getMethodUrl("testMethod");
+      expect(url).toBe("https://custom-endpoint.com/v1internal:testMethod");
     });
   });
 
-  it('should call the generateContentStream endpoint and parse SSE', async () => {
+  it("should call the generateContentStream endpoint and parse SSE", async () => {
     const mockRequest = vi.fn();
     const client = { request: mockRequest } as unknown as OAuth2Client;
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
 
     // Create a mock readable stream
-    const { Readable } = await import('node:stream');
+    const { Readable } = await import("node:stream");
     const mockStream = new Readable({
       read() {},
     });
 
     const mockResponseData1 = {
-      response: { candidates: [{ content: { parts: [{ text: 'Hello' }] } }] },
+      response: { candidates: [{ content: { parts: [{ text: "Hello" }] } }] },
     };
     const mockResponseData2 = {
-      response: { candidates: [{ content: { parts: [{ text: ' World' }] } }] },
+      response: { candidates: [{ content: { parts: [{ text: " World" }] } }] },
     };
 
     mockRequest.mockResolvedValue({ data: mockStream });
 
     const stream = await server.generateContentStream(
       {
-        model: 'test-model',
-        contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+        model: "test-model",
+        contents: [{ role: "user", parts: [{ text: "request" }] }],
       },
-      'user-prompt-id',
+      "user-prompt-id",
     );
 
     // Push SSE data to the stream
     // Use setTimeout to ensure the stream processing has started
     setTimeout(() => {
-      mockStream.push('data: ' + JSON.stringify(mockResponseData1) + '\n\n');
-      mockStream.push('id: 123\n'); // Should be ignored
-      mockStream.push('data: ' + JSON.stringify(mockResponseData2) + '\n\n');
+      mockStream.push("data: " + JSON.stringify(mockResponseData1) + "\n\n");
+      mockStream.push("id: 123\n"); // Should be ignored
+      mockStream.push("data: " + JSON.stringify(mockResponseData2) + "\n\n");
       mockStream.push(null); // End the stream
     }, 0);
 
@@ -162,38 +152,38 @@ describe('CodeAssistServer', () => {
     }
 
     expect(mockRequest).toHaveBeenCalledWith({
-      url: expect.stringContaining(':streamGenerateContent'),
-      method: 'POST',
-      params: { alt: 'sse' },
-      responseType: 'stream',
+      url: expect.stringContaining(":streamGenerateContent"),
+      method: "POST",
+      params: { alt: "sse" },
+      responseType: "stream",
       body: expect.any(String),
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       signal: undefined,
     });
 
     expect(results).toHaveLength(2);
-    expect(results[0].candidates?.[0].content?.parts?.[0].text).toBe('Hello');
-    expect(results[1].candidates?.[0].content?.parts?.[0].text).toBe(' World');
+    expect(results[0].candidates?.[0].content?.parts?.[0].text).toBe("Hello");
+    expect(results[1].candidates?.[0].content?.parts?.[0].text).toBe(" World");
   });
 
-  it('should ignore malformed SSE data', async () => {
+  it("should ignore malformed SSE data", async () => {
     const mockRequest = vi.fn();
     const client = { request: mockRequest } as unknown as OAuth2Client;
     const server = new CodeAssistServer(client);
 
-    const { Readable } = await import('node:stream');
+    const { Readable } = await import("node:stream");
     const mockStream = new Readable({
       read() {},
     });
 
     mockRequest.mockResolvedValue({ data: mockStream });
 
-    const stream = await server.requestStreamingPost('testStream', {});
+    const stream = await server.requestStreamingPost("testStream", {});
 
     setTimeout(() => {
-      mockStream.push('this is a malformed line\n');
+      mockStream.push("this is a malformed line\n");
       mockStream.push(null);
     }, 0);
 
@@ -204,111 +194,105 @@ describe('CodeAssistServer', () => {
     expect(results).toHaveLength(0);
   });
 
-  it('should call the onboardUser endpoint', async () => {
+  it("should call the onboardUser endpoint", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
-      name: 'operations/123',
+      name: "operations/123",
       done: true,
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const response = await server.onboardUser({
-      tierId: 'test-tier',
-      cloudaicompanionProject: 'test-project',
+      tierId: "test-tier",
+      cloudaicompanionProject: "test-project",
       metadata: {},
     });
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'onboardUser',
-      expect.any(Object),
-    );
-    expect(response.name).toBe('operations/123');
+    expect(server.requestPost).toHaveBeenCalledWith("onboardUser", expect.any(Object));
+    expect(response.name).toBe("operations/123");
   });
 
-  it('should call the loadCodeAssist endpoint', async () => {
+  it("should call the loadCodeAssist endpoint", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
       currentTier: {
         id: UserTierId.FREE,
-        name: 'Free',
-        description: 'free tier',
+        name: "Free",
+        description: "free tier",
       },
       allowedTiers: [],
       ineligibleTiers: [],
-      cloudaicompanionProject: 'projects/test',
+      cloudaicompanionProject: "projects/test",
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const response = await server.loadCodeAssist({
       metadata: {},
     });
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'loadCodeAssist',
-      expect.any(Object),
-    );
+    expect(server.requestPost).toHaveBeenCalledWith("loadCodeAssist", expect.any(Object));
     expect(response).toEqual(mockResponse);
   });
 
-  it('should return 0 for countTokens', async () => {
+  it("should return 0 for countTokens", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
       totalTokens: 100,
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const response = await server.countTokens({
-      model: 'test-model',
-      contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+      model: "test-model",
+      contents: [{ role: "user", parts: [{ text: "request" }] }],
     });
     expect(response.totalTokens).toBe(100);
   });
 
-  it('should throw an error for embedContent', async () => {
+  it("should throw an error for embedContent", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     await expect(
       server.embedContent({
-        model: 'test-model',
-        contents: [{ role: 'user', parts: [{ text: 'request' }] }],
+        model: "test-model",
+        contents: [{ role: "user", parts: [{ text: "request" }] }],
       }),
     ).rejects.toThrow();
   });
 
-  it('should handle VPC-SC errors when calling loadCodeAssist', async () => {
+  it("should handle VPC-SC errors when calling loadCodeAssist", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockVpcScError = {
@@ -317,66 +301,60 @@ describe('CodeAssistServer', () => {
           error: {
             details: [
               {
-                reason: 'SECURITY_POLICY_VIOLATED',
+                reason: "SECURITY_POLICY_VIOLATED",
               },
             ],
           },
         },
       },
     };
-    vi.spyOn(server, 'requestPost').mockRejectedValue(mockVpcScError);
+    vi.spyOn(server, "requestPost").mockRejectedValue(mockVpcScError);
 
     const response = await server.loadCodeAssist({
       metadata: {},
     });
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'loadCodeAssist',
-      expect.any(Object),
-    );
+    expect(server.requestPost).toHaveBeenCalledWith("loadCodeAssist", expect.any(Object));
     expect(response).toEqual({
       currentTier: { id: UserTierId.STANDARD },
     });
   });
 
-  it('should re-throw non-VPC-SC errors from loadCodeAssist', async () => {
+  it("should re-throw non-VPC-SC errors from loadCodeAssist", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(client);
-    const genericError = new Error('Something else went wrong');
-    vi.spyOn(server, 'requestPost').mockRejectedValue(genericError);
+    const genericError = new Error("Something else went wrong");
+    vi.spyOn(server, "requestPost").mockRejectedValue(genericError);
 
     await expect(server.loadCodeAssist({ metadata: {} })).rejects.toThrow(
-      'Something else went wrong',
+      "Something else went wrong",
     );
 
-    expect(server.requestPost).toHaveBeenCalledWith(
-      'loadCodeAssist',
-      expect.any(Object),
-    );
+    expect(server.requestPost).toHaveBeenCalledWith("loadCodeAssist", expect.any(Object));
   });
 
-  it('should call the listExperiments endpoint with metadata', async () => {
+  it("should call the listExperiments endpoint with metadata", async () => {
     const client = new OAuth2Client();
     const server = new CodeAssistServer(
       client,
-      'test-project',
+      "test-project",
       {},
-      'test-session',
+      "test-session",
       UserTierId.FREE,
     );
     const mockResponse = {
       experiments: [],
     };
-    vi.spyOn(server, 'requestPost').mockResolvedValue(mockResponse);
+    vi.spyOn(server, "requestPost").mockResolvedValue(mockResponse);
 
     const metadata = {
-      ideVersion: 'v0.1.0',
+      ideVersion: "v0.1.0",
     };
     const response = await server.listExperiments(metadata);
 
-    expect(server.requestPost).toHaveBeenCalledWith('listExperiments', {
-      project: 'test-project',
-      metadata: { ideVersion: 'v0.1.0', duetProject: 'test-project' },
+    expect(server.requestPost).toHaveBeenCalledWith("listExperiments", {
+      project: "test-project",
+      metadata: { ideVersion: "v0.1.0", duetProject: "test-project" },
     });
     expect(response).toEqual(mockResponse);
   });
diff --git a/packages/gemini-core/src/code_assist/server.ts b/packages/gemini-core/src/code_assist/server.ts
index 8670fda28..3c64afce8 100644
--- a/packages/gemini-core/src/code_assist/server.ts
+++ b/packages/gemini-core/src/code_assist/server.ts
@@ -4,21 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AuthClient } from 'google-auth-library';
-import type {
-  CodeAssistGlobalUserSettingResponse,
-  GoogleRpcResponse,
-  LoadCodeAssistRequest,
-  LoadCodeAssistResponse,
-  LongRunningOperationResponse,
-  OnboardUserRequest,
-  SetCodeAssistGlobalUserSettingRequest,
-  ClientMetadata,
-} from './types.js';
-import type {
-  ListExperimentsRequest,
-  ListExperimentsResponse,
-} from './experiments/types.js';
+import * as readline from "node:readline";
 import type {
   CountTokensParameters,
   CountTokensResponse,
@@ -26,20 +12,28 @@ import type {
   EmbedContentResponse,
   GenerateContentParameters,
   GenerateContentResponse,
-} from '@google/genai';
-import * as readline from 'node:readline';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import { UserTierId } from './types.js';
-import type {
-  CaCountTokenResponse,
-  CaGenerateContentResponse,
-} from './converter.js';
+} from "@google/genai";
+import type { AuthClient } from "google-auth-library";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import type { CaCountTokenResponse, CaGenerateContentResponse } from "./converter.js";
 import {
   fromCountTokenResponse,
   fromGenerateContentResponse,
   toCountTokenRequest,
   toGenerateContentRequest,
-} from './converter.js';
+} from "./converter.js";
+import type { ListExperimentsRequest, ListExperimentsResponse } from "./experiments/types.js";
+import type {
+  ClientMetadata,
+  CodeAssistGlobalUserSettingResponse,
+  GoogleRpcResponse,
+  LoadCodeAssistRequest,
+  LoadCodeAssistResponse,
+  LongRunningOperationResponse,
+  OnboardUserRequest,
+  SetCodeAssistGlobalUserSettingRequest,
+} from "./types.js";
+import { UserTierId } from "./types.js";
 
 /** HTTP options to be used in each of the requests. */
 export interface HttpOptions {
@@ -47,8 +41,8 @@ export interface HttpOptions {
   headers?: Record<string, string>;
 }
 
-export const CODE_ASSIST_ENDPOINT = 'https://cloudcode-pa.googleapis.com';
-export const CODE_ASSIST_API_VERSION = 'v1internal';
+export const CODE_ASSIST_ENDPOINT = "https://cloudcode-pa.googleapis.com";
+export const CODE_ASSIST_API_VERSION = "v1internal";
 
 export class CodeAssistServer implements ContentGenerator {
   constructor(
@@ -64,13 +58,8 @@ export class CodeAssistServer implements ContentGenerator {
     userPromptId: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     const resps = await this.requestStreamingPost<CaGenerateContentResponse>(
-      'streamGenerateContent',
-      toGenerateContentRequest(
-        req,
-        userPromptId,
-        this.projectId,
-        this.sessionId,
-      ),
+      "streamGenerateContent",
+      toGenerateContentRequest(req, userPromptId, this.projectId, this.sessionId),
       req.config?.abortSignal,
     );
     return (async function* (): AsyncGenerator<GenerateContentResponse> {
@@ -85,35 +74,20 @@ export class CodeAssistServer implements ContentGenerator {
     userPromptId: string,
   ): Promise<GenerateContentResponse> {
     const resp = await this.requestPost<CaGenerateContentResponse>(
-      'generateContent',
-      toGenerateContentRequest(
-        req,
-        userPromptId,
-        this.projectId,
-        this.sessionId,
-      ),
+      "generateContent",
+      toGenerateContentRequest(req, userPromptId, this.projectId, this.sessionId),
       req.config?.abortSignal,
     );
     return fromGenerateContentResponse(resp);
   }
 
-  async onboardUser(
-    req: OnboardUserRequest,
-  ): Promise<LongRunningOperationResponse> {
-    return await this.requestPost<LongRunningOperationResponse>(
-      'onboardUser',
-      req,
-    );
+  async onboardUser(req: OnboardUserRequest): Promise<LongRunningOperationResponse> {
+    return await this.requestPost<LongRunningOperationResponse>("onboardUser", req);
   }
 
-  async loadCodeAssist(
-    req: LoadCodeAssistRequest,
-  ): Promise<LoadCodeAssistResponse> {
+  async loadCodeAssist(req: LoadCodeAssistRequest): Promise<LoadCodeAssistResponse> {
     try {
-      return await this.requestPost<LoadCodeAssistResponse>(
-        'loadCodeAssist',
-        req,
-      );
+      return await this.requestPost<LoadCodeAssistResponse>("loadCodeAssist", req);
     } catch (e) {
       if (isVpcScAffectedUser(e)) {
         return {
@@ -127,7 +101,7 @@ export class CodeAssistServer implements ContentGenerator {
 
   async getCodeAssistGlobalUserSetting(): Promise<CodeAssistGlobalUserSettingResponse> {
     return await this.requestGet<CodeAssistGlobalUserSettingResponse>(
-      'getCodeAssistGlobalUserSetting',
+      "getCodeAssistGlobalUserSetting",
     );
   }
 
@@ -135,55 +109,44 @@ export class CodeAssistServer implements ContentGenerator {
     req: SetCodeAssistGlobalUserSettingRequest,
   ): Promise<CodeAssistGlobalUserSettingResponse> {
     return await this.requestPost<CodeAssistGlobalUserSettingResponse>(
-      'setCodeAssistGlobalUserSetting',
+      "setCodeAssistGlobalUserSetting",
       req,
     );
   }
 
   async countTokens(req: CountTokensParameters): Promise<CountTokensResponse> {
     const resp = await this.requestPost<CaCountTokenResponse>(
-      'countTokens',
+      "countTokens",
       toCountTokenRequest(req),
     );
     return fromCountTokenResponse(resp);
   }
 
-  async embedContent(
-    _req: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(_req: EmbedContentParameters): Promise<EmbedContentResponse> {
     throw Error();
   }
 
-  async listExperiments(
-    metadata: ClientMetadata,
-  ): Promise<ListExperimentsResponse> {
+  async listExperiments(metadata: ClientMetadata): Promise<ListExperimentsResponse> {
     if (!this.projectId) {
-      throw new Error('projectId is not defined for CodeAssistServer.');
+      throw new Error("projectId is not defined for CodeAssistServer.");
     }
     const projectId = this.projectId;
     const req: ListExperimentsRequest = {
       project: projectId,
       metadata: { ...metadata, duetProject: projectId },
     };
-    return await this.requestPost<ListExperimentsResponse>(
-      'listExperiments',
-      req,
-    );
+    return await this.requestPost<ListExperimentsResponse>("listExperiments", req);
   }
 
-  async requestPost<T>(
-    method: string,
-    req: object,
-    signal?: AbortSignal,
-  ): Promise<T> {
+  async requestPost<T>(method: string, req: object, signal?: AbortSignal): Promise<T> {
     const res = await this.client.request({
       url: this.getMethodUrl(method),
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         ...this.httpOptions.headers,
       },
-      responseType: 'json',
+      responseType: "json",
       body: JSON.stringify(req),
       signal,
     });
@@ -193,12 +156,12 @@ export class CodeAssistServer implements ContentGenerator {
   async requestGet<T>(method: string, signal?: AbortSignal): Promise<T> {
     const res = await this.client.request({
       url: this.getMethodUrl(method),
-      method: 'GET',
+      method: "GET",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         ...this.httpOptions.headers,
       },
-      responseType: 'json',
+      responseType: "json",
       signal,
     });
     return res.data as T;
@@ -211,15 +174,15 @@ export class CodeAssistServer implements ContentGenerator {
   ): Promise<AsyncGenerator<T>> {
     const res = await this.client.request({
       url: this.getMethodUrl(method),
-      method: 'POST',
+      method: "POST",
       params: {
-        alt: 'sse',
+        alt: "sse",
       },
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         ...this.httpOptions.headers,
       },
-      responseType: 'stream',
+      responseType: "stream",
       body: JSON.stringify(req),
       signal,
     });
@@ -232,13 +195,13 @@ export class CodeAssistServer implements ContentGenerator {
 
       let bufferedLines: string[] = [];
       for await (const line of rl) {
-        if (line.startsWith('data: ')) {
+        if (line.startsWith("data: ")) {
           bufferedLines.push(line.slice(6).trim());
-        } else if (line === '') {
+        } else if (line === "") {
           if (bufferedLines.length === 0) {
             continue; // no data to yield
           }
-          yield JSON.parse(bufferedLines.join('\n')) as T;
+          yield JSON.parse(bufferedLines.join("\n")) as T;
           bufferedLines = []; // Reset the buffer after yielding
         }
         // Ignore other lines like comments or id fields
@@ -247,26 +210,21 @@ export class CodeAssistServer implements ContentGenerator {
   }
 
   getMethodUrl(method: string): string {
-    const endpoint =
-      process.env['CODE_ASSIST_ENDPOINT'] ?? CODE_ASSIST_ENDPOINT;
+    const endpoint = process.env["CODE_ASSIST_ENDPOINT"] ?? CODE_ASSIST_ENDPOINT;
     return `${endpoint}/${CODE_ASSIST_API_VERSION}:${method}`;
   }
 }
 
 function isVpcScAffectedUser(error: unknown): boolean {
-  if (error && typeof error === 'object' && 'response' in error) {
+  if (error && typeof error === "object" && "response" in error) {
     const gaxiosError = error as {
       response?: {
         data?: unknown;
       };
     };
-    const response = gaxiosError.response?.data as
-      | GoogleRpcResponse
-      | undefined;
+    const response = gaxiosError.response?.data as GoogleRpcResponse | undefined;
     if (Array.isArray(response?.error?.details)) {
-      return response.error.details.some(
-        (detail) => detail.reason === 'SECURITY_POLICY_VIOLATED',
-      );
+      return response.error.details.some((detail) => detail.reason === "SECURITY_POLICY_VIOLATED");
     }
   }
   return false;
diff --git a/packages/gemini-core/src/code_assist/setup.test.ts b/packages/gemini-core/src/code_assist/setup.test.ts
index 54ad7f249..5f2d0812c 100644
--- a/packages/gemini-core/src/code_assist/setup.test.ts
+++ b/packages/gemini-core/src/code_assist/setup.test.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { setupUser, ProjectIdRequiredError } from './setup.js';
-import { CodeAssistServer } from '../code_assist/server.js';
-import type { OAuth2Client } from 'google-auth-library';
-import type { GeminiUserTier } from './types.js';
-import { UserTierId } from './types.js';
+import type { OAuth2Client } from "google-auth-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { CodeAssistServer } from "../code_assist/server.js";
+import { ProjectIdRequiredError, setupUser } from "./setup.js";
+import type { GeminiUserTier } from "./types.js";
+import { UserTierId } from "./types.js";
 
-vi.mock('../code_assist/server.js');
+vi.mock("../code_assist/server.js");
 
 const mockPaidTier: GeminiUserTier = {
   id: UserTierId.STANDARD,
-  name: 'paid',
-  description: 'Paid tier',
+  name: "paid",
+  description: "Paid tier",
   isDefault: true,
 };
 
 const mockFreeTier: GeminiUserTier = {
   id: UserTierId.FREE,
-  name: 'free',
-  description: 'Free tier',
+  name: "free",
+  description: "Free tier",
   isDefault: true,
 };
 
-describe('setupUser for existing user', () => {
+describe("setupUser for existing user", () => {
   let mockLoad: ReturnType<typeof vi.fn>;
   let mockOnboardUser: ReturnType<typeof vi.fn>;
 
@@ -38,7 +38,7 @@ describe('setupUser for existing user', () => {
       done: true,
       response: {
         cloudaicompanionProject: {
-          id: 'server-project',
+          id: "server-project",
         },
       },
     });
@@ -55,55 +55,41 @@ describe('setupUser for existing user', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT when set and project from server is undefined', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should use GOOGLE_CLOUD_PROJECT when set and project from server is undefined", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
       currentTier: mockPaidTier,
     });
     await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      'test-project',
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, "test-project", {}, "", undefined);
   });
 
-  it('should ignore GOOGLE_CLOUD_PROJECT when project from server is set', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should ignore GOOGLE_CLOUD_PROJECT when project from server is set", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
-      cloudaicompanionProject: 'server-project',
+      cloudaicompanionProject: "server-project",
       currentTier: mockPaidTier,
     });
     const projectId = await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      'test-project',
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, "test-project", {}, "", undefined);
     expect(projectId).toEqual({
-      projectId: 'server-project',
-      userTier: 'standard-tier',
+      projectId: "server-project",
+      userTier: "standard-tier",
     });
   });
 
-  it('should throw ProjectIdRequiredError when no project ID is available', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+  it("should throw ProjectIdRequiredError when no project ID is available", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
     // And the server itself requires a project ID internally
     vi.mocked(CodeAssistServer).mockImplementation(() => {
       throw new ProjectIdRequiredError();
     });
 
-    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(
-      ProjectIdRequiredError,
-    );
+    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(ProjectIdRequiredError);
   });
 });
 
-describe('setupUser for new user', () => {
+describe("setupUser for new user", () => {
   let mockLoad: ReturnType<typeof vi.fn>;
   let mockOnboardUser: ReturnType<typeof vi.fn>;
 
@@ -114,7 +100,7 @@ describe('setupUser for new user', () => {
       done: true,
       response: {
         cloudaicompanionProject: {
-          id: 'server-project',
+          id: "server-project",
         },
       },
     });
@@ -131,67 +117,55 @@ describe('setupUser for new user', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT when set and onboard a new paid user', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should use GOOGLE_CLOUD_PROJECT when set and onboard a new paid user", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockPaidTier],
     });
     const userData = await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      'test-project',
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, "test-project", {}, "", undefined);
     expect(mockLoad).toHaveBeenCalled();
     expect(mockOnboardUser).toHaveBeenCalledWith({
-      tierId: 'standard-tier',
-      cloudaicompanionProject: 'test-project',
+      tierId: "standard-tier",
+      cloudaicompanionProject: "test-project",
       metadata: {
-        ideType: 'IDE_UNSPECIFIED',
-        platform: 'PLATFORM_UNSPECIFIED',
-        pluginType: 'GEMINI',
-        duetProject: 'test-project',
+        ideType: "IDE_UNSPECIFIED",
+        platform: "PLATFORM_UNSPECIFIED",
+        pluginType: "GEMINI",
+        duetProject: "test-project",
       },
     });
     expect(userData).toEqual({
-      projectId: 'server-project',
-      userTier: 'standard-tier',
+      projectId: "server-project",
+      userTier: "standard-tier",
     });
   });
 
-  it('should onboard a new free user when GOOGLE_CLOUD_PROJECT is not set', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+  it("should onboard a new free user when GOOGLE_CLOUD_PROJECT is not set", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockFreeTier],
     });
     const userData = await setupUser({} as OAuth2Client);
-    expect(CodeAssistServer).toHaveBeenCalledWith(
-      {},
-      undefined,
-      {},
-      '',
-      undefined,
-    );
+    expect(CodeAssistServer).toHaveBeenCalledWith({}, undefined, {}, "", undefined);
     expect(mockLoad).toHaveBeenCalled();
     expect(mockOnboardUser).toHaveBeenCalledWith({
-      tierId: 'free-tier',
+      tierId: "free-tier",
       cloudaicompanionProject: undefined,
       metadata: {
-        ideType: 'IDE_UNSPECIFIED',
-        platform: 'PLATFORM_UNSPECIFIED',
-        pluginType: 'GEMINI',
+        ideType: "IDE_UNSPECIFIED",
+        platform: "PLATFORM_UNSPECIFIED",
+        pluginType: "GEMINI",
       },
     });
     expect(userData).toEqual({
-      projectId: 'server-project',
-      userTier: 'free-tier',
+      projectId: "server-project",
+      userTier: "free-tier",
     });
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT when onboard response has no project ID', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'test-project');
+  it("should use GOOGLE_CLOUD_PROJECT when onboard response has no project ID", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "test-project");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockPaidTier],
     });
@@ -203,13 +177,13 @@ describe('setupUser for new user', () => {
     });
     const userData = await setupUser({} as OAuth2Client);
     expect(userData).toEqual({
-      projectId: 'test-project',
-      userTier: 'standard-tier',
+      projectId: "test-project",
+      userTier: "standard-tier",
     });
   });
 
-  it('should throw ProjectIdRequiredError when no project ID is available', async () => {
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
+  it("should throw ProjectIdRequiredError when no project ID is available", async () => {
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
     mockLoad.mockResolvedValue({
       allowedTiers: [mockPaidTier],
     });
@@ -217,8 +191,6 @@ describe('setupUser for new user', () => {
       done: true,
       response: {},
     });
-    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(
-      ProjectIdRequiredError,
-    );
+    await expect(setupUser({} as OAuth2Client)).rejects.toThrow(ProjectIdRequiredError);
   });
 });
diff --git a/packages/gemini-core/src/code_assist/setup.ts b/packages/gemini-core/src/code_assist/setup.ts
index d33c019d6..6ff0ec6df 100644
--- a/packages/gemini-core/src/code_assist/setup.ts
+++ b/packages/gemini-core/src/code_assist/setup.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { AuthClient } from "google-auth-library";
+import { CodeAssistServer } from "./server.js";
 import type {
   ClientMetadata,
   GeminiUserTier,
   LoadCodeAssistResponse,
   OnboardUserRequest,
-} from './types.js';
-import { UserTierId } from './types.js';
-import { CodeAssistServer } from './server.js';
-import type { AuthClient } from 'google-auth-library';
+} from "./types.js";
+import { UserTierId } from "./types.js";
 
 export class ProjectIdRequiredError extends Error {
   constructor() {
     super(
-      'This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID env var. See https://goo.gle/gemini-cli-auth-docs#workspace-gca',
+      "This account requires setting the GOOGLE_CLOUD_PROJECT or GOOGLE_CLOUD_PROJECT_ID env var. See https://goo.gle/gemini-cli-auth-docs#workspace-gca",
     );
   }
 }
@@ -34,14 +34,12 @@ export interface UserData {
  */
 export async function setupUser(client: AuthClient): Promise<UserData> {
   const projectId =
-    process.env['GOOGLE_CLOUD_PROJECT'] ||
-    process.env['GOOGLE_CLOUD_PROJECT_ID'] ||
-    undefined;
-  const caServer = new CodeAssistServer(client, projectId, {}, '', undefined);
+    process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || undefined;
+  const caServer = new CodeAssistServer(client, projectId, {}, "", undefined);
   const coreClientMetadata: ClientMetadata = {
-    ideType: 'IDE_UNSPECIFIED',
-    platform: 'PLATFORM_UNSPECIFIED',
-    pluginType: 'GEMINI',
+    ideType: "IDE_UNSPECIFIED",
+    platform: "PLATFORM_UNSPECIFIED",
+    pluginType: "GEMINI",
   };
 
   const loadRes = await caServer.loadCodeAssist({
@@ -119,8 +117,8 @@ function getOnboardTier(res: LoadCodeAssistResponse): GeminiUserTier {
     }
   }
   return {
-    name: '',
-    description: '',
+    name: "",
+    description: "",
     id: UserTierId.LEGACY,
     userDefinedCloudaicompanionProject: true,
   };
diff --git a/packages/gemini-core/src/code_assist/types.ts b/packages/gemini-core/src/code_assist/types.ts
index e59dd3ac4..10354deea 100644
--- a/packages/gemini-core/src/code_assist/types.ts
+++ b/packages/gemini-core/src/code_assist/types.ts
@@ -16,26 +16,26 @@ export interface ClientMetadata {
 }
 
 export type ClientMetadataIdeType =
-  | 'IDE_UNSPECIFIED'
-  | 'VSCODE'
-  | 'INTELLIJ'
-  | 'VSCODE_CLOUD_WORKSTATION'
-  | 'INTELLIJ_CLOUD_WORKSTATION'
-  | 'CLOUD_SHELL'
-  | 'GEMINI_CLI';
+  | "IDE_UNSPECIFIED"
+  | "VSCODE"
+  | "INTELLIJ"
+  | "VSCODE_CLOUD_WORKSTATION"
+  | "INTELLIJ_CLOUD_WORKSTATION"
+  | "CLOUD_SHELL"
+  | "GEMINI_CLI";
 export type ClientMetadataPlatform =
-  | 'PLATFORM_UNSPECIFIED'
-  | 'DARWIN_AMD64'
-  | 'DARWIN_ARM64'
-  | 'LINUX_AMD64'
-  | 'LINUX_ARM64'
-  | 'WINDOWS_AMD64';
+  | "PLATFORM_UNSPECIFIED"
+  | "DARWIN_AMD64"
+  | "DARWIN_ARM64"
+  | "LINUX_AMD64"
+  | "LINUX_ARM64"
+  | "WINDOWS_AMD64";
 export type ClientMetadataPluginType =
-  | 'PLUGIN_UNSPECIFIED'
-  | 'CLOUD_CODE'
-  | 'GEMINI'
-  | 'AIPLUGIN_INTELLIJ'
-  | 'AIPLUGIN_STUDIO';
+  | "PLUGIN_UNSPECIFIED"
+  | "CLOUD_CODE"
+  | "GEMINI"
+  | "AIPLUGIN_INTELLIJ"
+  | "AIPLUGIN_STUDIO";
 
 export interface LoadCodeAssistRequest {
   cloudaicompanionProject?: string;
@@ -88,14 +88,14 @@ export interface IneligibleTier {
  */
 export enum IneligibleTierReasonCode {
   // go/keep-sorted start
-  DASHER_USER = 'DASHER_USER',
-  INELIGIBLE_ACCOUNT = 'INELIGIBLE_ACCOUNT',
-  NON_USER_ACCOUNT = 'NON_USER_ACCOUNT',
-  RESTRICTED_AGE = 'RESTRICTED_AGE',
-  RESTRICTED_NETWORK = 'RESTRICTED_NETWORK',
-  UNKNOWN = 'UNKNOWN',
-  UNKNOWN_LOCATION = 'UNKNOWN_LOCATION',
-  UNSUPPORTED_LOCATION = 'UNSUPPORTED_LOCATION',
+  DASHER_USER = "DASHER_USER",
+  INELIGIBLE_ACCOUNT = "INELIGIBLE_ACCOUNT",
+  NON_USER_ACCOUNT = "NON_USER_ACCOUNT",
+  RESTRICTED_AGE = "RESTRICTED_AGE",
+  RESTRICTED_NETWORK = "RESTRICTED_NETWORK",
+  UNKNOWN = "UNKNOWN",
+  UNKNOWN_LOCATION = "UNKNOWN_LOCATION",
+  UNSUPPORTED_LOCATION = "UNSUPPORTED_LOCATION",
   // go/keep-sorted end
 }
 /**
@@ -104,9 +104,9 @@ export enum IneligibleTierReasonCode {
  * //depot/google3/cloud/developer_experience/cloudcode/pa/service/usertier.go;l=16
  */
 export enum UserTierId {
-  FREE = 'free-tier',
-  LEGACY = 'legacy-tier',
-  STANDARD = 'standard-tier',
+  FREE = "free-tier",
+  LEGACY = "legacy-tier",
+  STANDARD = "standard-tier",
 }
 
 /**
@@ -155,10 +155,10 @@ export interface OnboardUserResponse {
  * Error value is an additional value assigned to error responses from OnboardUser
  */
 export enum OnboardUserStatusCode {
-  Default = 'DEFAULT',
-  Notice = 'NOTICE',
-  Warning = 'WARNING',
-  Error = 'ERROR',
+  Default = "DEFAULT",
+  Notice = "NOTICE",
+  Warning = "WARNING",
+  Error = "ERROR",
 }
 
 /**
diff --git a/packages/gemini-core/src/commands/extensions.test.ts b/packages/gemini-core/src/commands/extensions.test.ts
index cc53123d5..55341da53 100644
--- a/packages/gemini-core/src/commands/extensions.test.ts
+++ b/packages/gemini-core/src/commands/extensions.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { listExtensions } from './extensions.js';
-import type { Config } from '../config/config.js';
+import { describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { listExtensions } from "./extensions.js";
 
-describe('listExtensions', () => {
-  it('should call config.getExtensions and return the result', () => {
-    const mockExtensions = [{ name: 'ext1' }, { name: 'ext2' }];
+describe("listExtensions", () => {
+  it("should call config.getExtensions and return the result", () => {
+    const mockExtensions = [{ name: "ext1" }, { name: "ext2" }];
     const mockConfig = {
       getExtensions: vi.fn().mockReturnValue(mockExtensions),
     } as unknown as Config;
diff --git a/packages/gemini-core/src/commands/extensions.ts b/packages/gemini-core/src/commands/extensions.ts
index c18593e64..789e64218 100644
--- a/packages/gemini-core/src/commands/extensions.ts
+++ b/packages/gemini-core/src/commands/extensions.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
 
 export function listExtensions(config: Config) {
   return config.getExtensions();
diff --git a/packages/gemini-core/src/config/config.test.ts b/packages/gemini-core/src/config/config.test.ts
index 7e71e71cc..90643b25d 100644
--- a/packages/gemini-core/src/config/config.test.ts
+++ b/packages/gemini-core/src/config/config.test.ts
@@ -4,40 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Mock } from 'vitest';
-import type { ConfigParameters, SandboxConfig } from './config.js';
-import { Config, DEFAULT_FILE_FILTERING_OPTIONS } from './config.js';
-import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { ApprovalMode } from '../policy/types.js';
-import type { HookDefinition } from '../hooks/types.js';
-import { HookType, HookEventName } from '../hooks/types.js';
-import * as path from 'node:path';
-import { setGeminiMdFilename as mockSetGeminiMdFilename } from '../tools/memoryTool.js';
-import {
-  DEFAULT_TELEMETRY_TARGET,
-  DEFAULT_OTLP_ENDPOINT,
-} from '../telemetry/index.js';
-import type { ContentGeneratorConfig } from '../core/contentGenerator.js';
-import {
-  AuthType,
-  createContentGeneratorConfig,
-} from '../core/contentGenerator.js';
-import { GeminiClient } from '../core/client.js';
-import { GitService } from '../services/gitService.js';
-import { ShellTool } from '../tools/shell.js';
-import { ReadFileTool } from '../tools/read-file.js';
-import { GrepTool } from '../tools/grep.js';
-import { RipGrepTool, canUseRipgrep } from '../tools/ripGrep.js';
-import { logRipgrepFallback } from '../telemetry/loggers.js';
-import { RipgrepFallbackEvent } from '../telemetry/types.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { DEFAULT_MODEL_CONFIGS } from './defaultModelConfigs.js';
-import { READ_MANY_FILES_TOOL_NAME } from '../tools/tool-names.js';
-
-vi.mock('fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs')>();
+import * as path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ExperimentFlags } from "../code_assist/experiments/flagNames.js";
+import { GeminiClient } from "../core/client.js";
+import type { ContentGeneratorConfig } from "../core/contentGenerator.js";
+import { AuthType, createContentGeneratorConfig } from "../core/contentGenerator.js";
+import type { HookDefinition } from "../hooks/types.js";
+import { HookEventName, HookType } from "../hooks/types.js";
+import { ApprovalMode } from "../policy/types.js";
+import { GitService } from "../services/gitService.js";
+import { DEFAULT_OTLP_ENDPOINT, DEFAULT_TELEMETRY_TARGET } from "../telemetry/index.js";
+import { logRipgrepFallback } from "../telemetry/loggers.js";
+import { RipgrepFallbackEvent } from "../telemetry/types.js";
+import { GrepTool } from "../tools/grep.js";
+import { setGeminiMdFilename as mockSetGeminiMdFilename } from "../tools/memoryTool.js";
+import { ReadFileTool } from "../tools/read-file.js";
+import { canUseRipgrep, RipGrepTool } from "../tools/ripGrep.js";
+import { ShellTool } from "../tools/shell.js";
+import { READ_MANY_FILES_TOOL_NAME } from "../tools/tool-names.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { ConfigParameters, SandboxConfig } from "./config.js";
+import { Config, DEFAULT_FILE_FILTERING_OPTIONS } from "./config.js";
+import { DEFAULT_MODEL_CONFIGS } from "./defaultModelConfigs.js";
+
+vi.mock("fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("fs")>();
   return {
     ...actual,
     existsSync: vi.fn().mockReturnValue(true),
@@ -49,7 +43,7 @@ vi.mock('fs', async (importOriginal) => {
 });
 
 // Mock dependencies that might be called during Config construction or createServerConfig
-vi.mock('../tools/tool-registry', () => {
+vi.mock("../tools/tool-registry", () => {
   const ToolRegistryMock = vi.fn();
   ToolRegistryMock.prototype.registerTool = vi.fn();
   ToolRegistryMock.prototype.discoverAllTools = vi.fn();
@@ -60,43 +54,43 @@ vi.mock('../tools/tool-registry', () => {
   return { ToolRegistry: ToolRegistryMock };
 });
 
-vi.mock('../utils/memoryDiscovery.js', () => ({
+vi.mock("../utils/memoryDiscovery.js", () => ({
   loadServerHierarchicalMemory: vi.fn(),
 }));
 
 // Mock individual tools if their constructors are complex or have side effects
-vi.mock('../tools/ls');
-vi.mock('../tools/read-file');
-vi.mock('../tools/grep.js');
-vi.mock('../tools/ripGrep.js', () => ({
+vi.mock("../tools/ls");
+vi.mock("../tools/read-file");
+vi.mock("../tools/grep.js");
+vi.mock("../tools/ripGrep.js", () => ({
   canUseRipgrep: vi.fn(),
   RipGrepTool: class MockRipGrepTool {},
 }));
-vi.mock('../tools/glob');
-vi.mock('../tools/edit');
-vi.mock('../tools/shell');
-vi.mock('../tools/write-file');
-vi.mock('../tools/web-fetch');
-vi.mock('../tools/read-many-files');
-vi.mock('../tools/memoryTool', () => ({
+vi.mock("../tools/glob");
+vi.mock("../tools/edit");
+vi.mock("../tools/shell");
+vi.mock("../tools/write-file");
+vi.mock("../tools/web-fetch");
+vi.mock("../tools/read-many-files");
+vi.mock("../tools/memoryTool", () => ({
   MemoryTool: vi.fn(),
   setGeminiMdFilename: vi.fn(),
-  getCurrentGeminiMdFilename: vi.fn(() => 'GEMINI.md'), // Mock the original filename
-  DEFAULT_CONTEXT_FILENAME: 'GEMINI.md',
-  GEMINI_DIR: '.gemini',
+  getCurrentGeminiMdFilename: vi.fn(() => "GEMINI.md"), // Mock the original filename
+  DEFAULT_CONTEXT_FILENAME: "GEMINI.md",
+  GEMINI_DIR: ".gemini",
 }));
 
-vi.mock('../core/contentGenerator.js');
+vi.mock("../core/contentGenerator.js");
 
-vi.mock('../core/client.js', () => ({
+vi.mock("../core/client.js", () => ({
   GeminiClient: vi.fn().mockImplementation(() => ({
     initialize: vi.fn().mockResolvedValue(undefined),
     stripThoughtsFromHistory: vi.fn(),
   })),
 }));
 
-vi.mock('../telemetry/index.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../telemetry/index.js')>();
+vi.mock("../telemetry/index.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../telemetry/index.js")>();
   return {
     ...actual,
     initializeTelemetry: vi.fn(),
@@ -106,22 +100,21 @@ vi.mock('../telemetry/index.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../telemetry/loggers.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../telemetry/loggers.js')>();
+vi.mock("../telemetry/loggers.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../telemetry/loggers.js")>();
   return {
     ...actual,
     logRipgrepFallback: vi.fn(),
   };
 });
 
-vi.mock('../services/gitService.js', () => {
+vi.mock("../services/gitService.js", () => {
   const GitServiceMock = vi.fn();
   GitServiceMock.prototype.initialize = vi.fn();
   return { GitService: GitServiceMock };
 });
 
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn().mockResolvedValue({
       getConnectionStatus: vi.fn(),
@@ -131,7 +124,7 @@ vi.mock('../ide/ide-client.js', () => ({
   },
 }));
 
-vi.mock('../agents/registry.js', () => {
+vi.mock("../agents/registry.js", () => {
   const AgentRegistryMock = vi.fn();
   AgentRegistryMock.prototype.initialize = vi.fn();
   AgentRegistryMock.prototype.getAllDefinitions = vi.fn(() => []);
@@ -139,7 +132,7 @@ vi.mock('../agents/registry.js', () => {
   return { AgentRegistry: AgentRegistryMock };
 });
 
-vi.mock('../agents/subagent-tool-wrapper.js', () => ({
+vi.mock("../agents/subagent-tool-wrapper.js", () => ({
   SubagentToolWrapper: vi.fn(),
 }));
 
@@ -150,38 +143,38 @@ const mockCoreEvents = vi.hoisted(() => ({
 
 const mockSetGlobalProxy = vi.hoisted(() => vi.fn());
 
-vi.mock('../utils/events.js', () => ({
+vi.mock("../utils/events.js", () => ({
   coreEvents: mockCoreEvents,
 }));
 
-vi.mock('../utils/fetch.js', () => ({
+vi.mock("../utils/fetch.js", () => ({
   setGlobalProxy: mockSetGlobalProxy,
 }));
 
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import { uiTelemetryService } from '../telemetry/index.js';
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import { uiTelemetryService } from "../telemetry/index.js";
 
-vi.mock('../core/baseLlmClient.js');
-vi.mock('../core/tokenLimits.js', () => ({
+vi.mock("../core/baseLlmClient.js");
+vi.mock("../core/tokenLimits.js", () => ({
   tokenLimit: vi.fn(),
 }));
 
-describe('Server Config (config.ts)', () => {
-  const MODEL = 'gemini-pro';
+describe("Server Config (config.ts)", () => {
+  const MODEL = "gemini-pro";
   const SANDBOX: SandboxConfig = {
-    command: 'docker',
-    image: 'gemini-cli-sandbox',
+    command: "docker",
+    image: "gemini-cli-sandbox",
   };
-  const TARGET_DIR = '/path/to/target';
+  const TARGET_DIR = "/path/to/target";
   const DEBUG_MODE = false;
-  const QUESTION = 'test question';
-  const USER_MEMORY = 'Test User Memory';
+  const QUESTION = "test question";
+  const USER_MEMORY = "Test User Memory";
   const TELEMETRY_SETTINGS = { enabled: false };
-  const EMBEDDING_MODEL = 'gemini-embedding';
-  const SESSION_ID = 'test-session-id';
+  const EMBEDDING_MODEL = "gemini-embedding";
+  const SESSION_ID = "test-session-id";
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
+    cwd: "/tmp",
     embeddingModel: EMBEDDING_MODEL,
     sandbox: SANDBOX,
     targetDir: TARGET_DIR,
@@ -199,9 +192,9 @@ describe('Server Config (config.ts)', () => {
     vi.clearAllMocks();
   });
 
-  describe('initialize', () => {
-    it('should throw an error if checkpointing is enabled and GitService fails', async () => {
-      const gitError = new Error('Git is not installed');
+  describe("initialize", () => {
+    it("should throw an error if checkpointing is enabled and GitService fails", async () => {
+      const gitError = new Error("Git is not installed");
       (GitService.prototype.initialize as Mock).mockRejectedValue(gitError);
 
       const config = new Config({
@@ -212,8 +205,8 @@ describe('Server Config (config.ts)', () => {
       await expect(config.initialize()).rejects.toThrow(gitError);
     });
 
-    it('should not throw an error if checkpointing is disabled and GitService fails', async () => {
-      const gitError = new Error('Git is not installed');
+    it("should not throw an error if checkpointing is disabled and GitService fails", async () => {
+      const gitError = new Error("Git is not installed");
       (GitService.prototype.initialize as Mock).mockRejectedValue(gitError);
 
       const config = new Config({
@@ -224,20 +217,18 @@ describe('Server Config (config.ts)', () => {
       await expect(config.initialize()).resolves.toBeUndefined();
     });
 
-    it('should throw an error if initialized more than once', async () => {
+    it("should throw an error if initialized more than once", async () => {
       const config = new Config({
         ...baseParams,
         checkpointing: false,
       });
 
       await expect(config.initialize()).resolves.toBeUndefined();
-      await expect(config.initialize()).rejects.toThrow(
-        'Config was already initialized',
-      );
+      await expect(config.initialize()).rejects.toThrow("Config was already initialized");
     });
 
-    describe('getCompressionThreshold', () => {
-      it('should return the local compression threshold if it is set', async () => {
+    describe("getCompressionThreshold", () => {
+      it("should return the local compression threshold if it is set", async () => {
         const config = new Config({
           ...baseParams,
           compressionThreshold: 0.5,
@@ -245,7 +236,7 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getCompressionThreshold()).toBe(0.5);
       });
 
-      it('should return the remote experiment threshold if it is a positive number', async () => {
+      it("should return the remote experiment threshold if it is a positive number", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -259,7 +250,7 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getCompressionThreshold()).toBe(0.8);
       });
 
-      it('should return undefined if the remote experiment threshold is 0', async () => {
+      it("should return undefined if the remote experiment threshold is 0", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -273,14 +264,14 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getCompressionThreshold()).toBeUndefined();
       });
 
-      it('should return undefined if there are no experiments', async () => {
+      it("should return undefined if there are no experiments", async () => {
         const config = new Config(baseParams);
         expect(await config.getCompressionThreshold()).toBeUndefined();
       });
     });
 
-    describe('getUserCaching', () => {
-      it('should return the remote experiment flag when available', async () => {
+    describe("getUserCaching", () => {
+      it("should return the remote experiment flag when available", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -295,7 +286,7 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getUserCaching()).toBe(true);
       });
 
-      it('should return false when the remote flag is false', async () => {
+      it("should return false when the remote flag is false", async () => {
         const config = new Config({
           ...baseParams,
           experiments: {
@@ -310,24 +301,22 @@ describe('Server Config (config.ts)', () => {
         expect(await config.getUserCaching()).toBe(false);
       });
 
-      it('should return undefined if there are no experiments', async () => {
+      it("should return undefined if there are no experiments", async () => {
         const config = new Config(baseParams);
         expect(await config.getUserCaching()).toBeUndefined();
       });
     });
   });
 
-  describe('refreshAuth', () => {
-    it('should refresh auth and update config', async () => {
+  describe("refreshAuth", () => {
+    it("should refresh auth and update config", async () => {
       const config = new Config(baseParams);
       const authType = AuthType.USE_GEMINI;
       const mockContentConfig = {
-        apiKey: 'test-key',
+        apiKey: "test-key",
       };
 
-      vi.mocked(createContentGeneratorConfig).mockResolvedValue(
-        mockContentConfig,
-      );
+      vi.mocked(createContentGeneratorConfig).mockResolvedValue(mockContentConfig);
 
       // Set fallback mode to true to ensure it gets reset
       config.setFallbackMode(true);
@@ -335,10 +324,7 @@ describe('Server Config (config.ts)', () => {
 
       await config.refreshAuth(authType);
 
-      expect(createContentGeneratorConfig).toHaveBeenCalledWith(
-        config,
-        authType,
-      );
+      expect(createContentGeneratorConfig).toHaveBeenCalledWith(config, authType);
       // Verify that contentGeneratorConfig is updated
       expect(config.getContentGeneratorConfig()).toEqual(mockContentConfig);
       expect(GeminiClient).toHaveBeenCalledWith(config);
@@ -346,7 +332,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.isInFallbackMode()).toBe(false);
     });
 
-    it('should strip thoughts when switching from GenAI to Vertex', async () => {
+    it("should strip thoughts when switching from GenAI to Vertex", async () => {
       const config = new Config(baseParams);
 
       vi.mocked(createContentGeneratorConfig).mockImplementation(
@@ -358,12 +344,10 @@ describe('Server Config (config.ts)', () => {
 
       await config.refreshAuth(AuthType.LOGIN_WITH_GOOGLE);
 
-      expect(
-        config.getGeminiClient().stripThoughtsFromHistory,
-      ).toHaveBeenCalledWith();
+      expect(config.getGeminiClient().stripThoughtsFromHistory).toHaveBeenCalledWith();
     });
 
-    it('should not strip thoughts when switching from Vertex to GenAI', async () => {
+    it("should not strip thoughts when switching from Vertex to GenAI", async () => {
       const config = new Config(baseParams);
 
       vi.mocked(createContentGeneratorConfig).mockImplementation(
@@ -375,13 +359,11 @@ describe('Server Config (config.ts)', () => {
 
       await config.refreshAuth(AuthType.USE_GEMINI);
 
-      expect(
-        config.getGeminiClient().stripThoughtsFromHistory,
-      ).not.toHaveBeenCalledWith();
+      expect(config.getGeminiClient().stripThoughtsFromHistory).not.toHaveBeenCalledWith();
     });
   });
 
-  it('Config constructor should store userMemory correctly', () => {
+  it("Config constructor should store userMemory correctly", () => {
     const config = new Config(baseParams);
 
     expect(config.getUserMemory()).toBe(USER_MEMORY);
@@ -389,16 +371,16 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTargetDir()).toBe(path.resolve(TARGET_DIR)); // Check resolved path
   });
 
-  it('Config constructor should default userMemory to empty string if not provided', () => {
+  it("Config constructor should default userMemory to empty string if not provided", () => {
     const paramsWithoutMemory: ConfigParameters = { ...baseParams };
     delete paramsWithoutMemory.userMemory;
     const config = new Config(paramsWithoutMemory);
 
-    expect(config.getUserMemory()).toBe('');
+    expect(config.getUserMemory()).toBe("");
   });
 
-  it('Config constructor should call setGeminiMdFilename with contextFileName if provided', () => {
-    const contextFileName = 'CUSTOM_AGENTS.md';
+  it("Config constructor should call setGeminiMdFilename with contextFileName if provided", () => {
+    const contextFileName = "CUSTOM_AGENTS.md";
     const paramsWithContextFile: ConfigParameters = {
       ...baseParams,
       contextFileName,
@@ -407,19 +389,19 @@ describe('Server Config (config.ts)', () => {
     expect(mockSetGeminiMdFilename).toHaveBeenCalledWith(contextFileName);
   });
 
-  it('Config constructor should not call setGeminiMdFilename if contextFileName is not provided', () => {
+  it("Config constructor should not call setGeminiMdFilename if contextFileName is not provided", () => {
     new Config(baseParams); // baseParams does not have contextFileName
     expect(mockSetGeminiMdFilename).not.toHaveBeenCalled();
   });
 
-  it('should set default file filtering settings when not provided', () => {
+  it("should set default file filtering settings when not provided", () => {
     const config = new Config(baseParams);
     expect(config.getFileFilteringRespectGitIgnore()).toBe(
       DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
     );
   });
 
-  it('should set custom file filtering settings when provided', () => {
+  it("should set custom file filtering settings when provided", () => {
     const paramsWithFileFiltering: ConfigParameters = {
       ...baseParams,
       fileFiltering: {
@@ -430,9 +412,9 @@ describe('Server Config (config.ts)', () => {
     expect(config.getFileFilteringRespectGitIgnore()).toBe(false);
   });
 
-  it('should initialize WorkspaceContext with includeDirectories', () => {
+  it("should initialize WorkspaceContext with includeDirectories", () => {
     const resolved = path.resolve(baseParams.targetDir);
-    const includeDirectories = ['dir1', 'dir2'];
+    const includeDirectories = ["dir1", "dir2"];
     const paramsWithIncludeDirs: ConfigParameters = {
       ...baseParams,
       includeDirectories,
@@ -443,11 +425,11 @@ describe('Server Config (config.ts)', () => {
     // Should include the target directory plus the included directories
     expect(directories).toHaveLength(3);
     expect(directories).toContain(resolved);
-    expect(directories).toContain(path.join(resolved, 'dir1'));
-    expect(directories).toContain(path.join(resolved, 'dir2'));
+    expect(directories).toContain(path.join(resolved, "dir1"));
+    expect(directories).toContain(path.join(resolved, "dir2"));
   });
 
-  it('Config constructor should set telemetry to true when provided as true', () => {
+  it("Config constructor should set telemetry to true when provided as true", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true },
@@ -456,7 +438,7 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryEnabled()).toBe(true);
   });
 
-  it('Config constructor should set telemetry to false when provided as false', () => {
+  it("Config constructor should set telemetry to false when provided as false", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: false },
@@ -465,14 +447,14 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryEnabled()).toBe(false);
   });
 
-  it('Config constructor should default telemetry to default value if not provided', () => {
+  it("Config constructor should default telemetry to default value if not provided", () => {
     const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
     delete paramsWithoutTelemetry.telemetry;
     const config = new Config(paramsWithoutTelemetry);
     expect(config.getTelemetryEnabled()).toBe(TELEMETRY_SETTINGS.enabled);
   });
 
-  it('Config constructor should set telemetry useCollector to true when provided', () => {
+  it("Config constructor should set telemetry useCollector to true when provided", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true, useCollector: true },
@@ -481,7 +463,7 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryUseCollector()).toBe(true);
   });
 
-  it('Config constructor should set telemetry useCollector to false when provided', () => {
+  it("Config constructor should set telemetry useCollector to false when provided", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true, useCollector: false },
@@ -490,7 +472,7 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryUseCollector()).toBe(false);
   });
 
-  it('Config constructor should default telemetry useCollector to false if not provided', () => {
+  it("Config constructor should default telemetry useCollector to false if not provided", () => {
     const paramsWithTelemetry: ConfigParameters = {
       ...baseParams,
       telemetry: { enabled: true },
@@ -499,14 +481,14 @@ describe('Server Config (config.ts)', () => {
     expect(config.getTelemetryUseCollector()).toBe(false);
   });
 
-  it('should have a getFileService method that returns FileDiscoveryService', () => {
+  it("should have a getFileService method that returns FileDiscoveryService", () => {
     const config = new Config(baseParams);
     const fileService = config.getFileService();
     expect(fileService).toBeDefined();
   });
 
-  describe('Usage Statistics', () => {
-    it('defaults usage statistics to enabled if not specified', () => {
+  describe("Usage Statistics", () => {
+    it("defaults usage statistics to enabled if not specified", () => {
       const config = new Config({
         ...baseParams,
         usageStatisticsEnabled: undefined,
@@ -515,20 +497,20 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUsageStatisticsEnabled()).toBe(true);
     });
 
-    it.each([{ enabled: true }, { enabled: false }])(
-      'sets usage statistics based on the provided value (enabled: $enabled)',
-      ({ enabled }) => {
-        const config = new Config({
-          ...baseParams,
-          usageStatisticsEnabled: enabled,
-        });
-        expect(config.getUsageStatisticsEnabled()).toBe(enabled);
-      },
-    );
+    it.each([
+      { enabled: true },
+      { enabled: false },
+    ])("sets usage statistics based on the provided value (enabled: $enabled)", ({ enabled }) => {
+      const config = new Config({
+        ...baseParams,
+        usageStatisticsEnabled: enabled,
+      });
+      expect(config.getUsageStatisticsEnabled()).toBe(enabled);
+    });
   });
 
-  describe('Telemetry Settings', () => {
-    it('should return default telemetry target if not provided', () => {
+  describe("Telemetry Settings", () => {
+    it("should return default telemetry target if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
@@ -537,8 +519,8 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryTarget()).toBe(DEFAULT_TELEMETRY_TARGET);
     });
 
-    it('should return provided OTLP endpoint', () => {
-      const endpoint = 'http://custom.otel.collector:4317';
+    it("should return provided OTLP endpoint", () => {
+      const endpoint = "http://custom.otel.collector:4317";
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true, otlpEndpoint: endpoint },
@@ -547,7 +529,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryOtlpEndpoint()).toBe(endpoint);
     });
 
-    it('should return default OTLP endpoint if not provided', () => {
+    it("should return default OTLP endpoint if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
@@ -556,7 +538,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryOtlpEndpoint()).toBe(DEFAULT_OTLP_ENDPOINT);
     });
 
-    it('should return provided logPrompts setting', () => {
+    it("should return provided logPrompts setting", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true, logPrompts: false },
@@ -565,7 +547,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryLogPromptsEnabled()).toBe(false);
     });
 
-    it('should return default logPrompts setting (true) if not provided', () => {
+    it("should return default logPrompts setting (true) if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
@@ -574,60 +556,60 @@ describe('Server Config (config.ts)', () => {
       expect(config.getTelemetryLogPromptsEnabled()).toBe(true);
     });
 
-    it('should return default logPrompts setting (true) if telemetry object is not provided', () => {
+    it("should return default logPrompts setting (true) if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
       expect(config.getTelemetryLogPromptsEnabled()).toBe(true);
     });
 
-    it('should return default telemetry target if telemetry object is not provided', () => {
+    it("should return default telemetry target if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
       expect(config.getTelemetryTarget()).toBe(DEFAULT_TELEMETRY_TARGET);
     });
 
-    it('should return default OTLP endpoint if telemetry object is not provided', () => {
+    it("should return default OTLP endpoint if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
       expect(config.getTelemetryOtlpEndpoint()).toBe(DEFAULT_OTLP_ENDPOINT);
     });
 
-    it('should return provided OTLP protocol', () => {
+    it("should return provided OTLP protocol", () => {
       const params: ConfigParameters = {
         ...baseParams,
-        telemetry: { enabled: true, otlpProtocol: 'http' },
+        telemetry: { enabled: true, otlpProtocol: "http" },
       };
       const config = new Config(params);
-      expect(config.getTelemetryOtlpProtocol()).toBe('http');
+      expect(config.getTelemetryOtlpProtocol()).toBe("http");
     });
 
-    it('should return default OTLP protocol if not provided', () => {
+    it("should return default OTLP protocol if not provided", () => {
       const params: ConfigParameters = {
         ...baseParams,
         telemetry: { enabled: true },
       };
       const config = new Config(params);
-      expect(config.getTelemetryOtlpProtocol()).toBe('grpc');
+      expect(config.getTelemetryOtlpProtocol()).toBe("grpc");
     });
 
-    it('should return default OTLP protocol if telemetry object is not provided', () => {
+    it("should return default OTLP protocol if telemetry object is not provided", () => {
       const paramsWithoutTelemetry: ConfigParameters = { ...baseParams };
       delete paramsWithoutTelemetry.telemetry;
       const config = new Config(paramsWithoutTelemetry);
-      expect(config.getTelemetryOtlpProtocol()).toBe('grpc');
+      expect(config.getTelemetryOtlpProtocol()).toBe("grpc");
     });
   });
 
-  describe('UseRipgrep Configuration', () => {
-    it('should default useRipgrep to true when not provided', () => {
+  describe("UseRipgrep Configuration", () => {
+    it("should default useRipgrep to true when not provided", () => {
       const config = new Config(baseParams);
       expect(config.getUseRipgrep()).toBe(true);
     });
 
-    it('should set useRipgrep to false when provided as false', () => {
+    it("should set useRipgrep to false when provided as false", () => {
       const paramsWithRipgrep: ConfigParameters = {
         ...baseParams,
         useRipgrep: false,
@@ -636,7 +618,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseRipgrep()).toBe(false);
     });
 
-    it('should set useRipgrep to true when explicitly provided as true', () => {
+    it("should set useRipgrep to true when explicitly provided as true", () => {
       const paramsWithRipgrep: ConfigParameters = {
         ...baseParams,
         useRipgrep: true,
@@ -645,7 +627,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseRipgrep()).toBe(true);
     });
 
-    it('should default useRipgrep to true when undefined', () => {
+    it("should default useRipgrep to true when undefined", () => {
       const paramsWithUndefinedRipgrep: ConfigParameters = {
         ...baseParams,
         useRipgrep: undefined,
@@ -655,8 +637,8 @@ describe('Server Config (config.ts)', () => {
     });
   });
 
-  describe('Model Router with Auth', () => {
-    it('should disable model router by default for oauth-personal', async () => {
+  describe("Model Router with Auth", () => {
+    it("should disable model router by default for oauth-personal", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: true,
@@ -665,7 +647,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseModelRouter()).toBe(true);
     });
 
-    it('should enable model router by default for other auth types', async () => {
+    it("should enable model router by default for other auth types", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: true,
@@ -674,7 +656,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseModelRouter()).toBe(true);
     });
 
-    it('should disable model router for specified auth type', async () => {
+    it("should disable model router for specified auth type", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: true,
@@ -684,7 +666,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseModelRouter()).toBe(false);
     });
 
-    it('should enable model router for other auth type', async () => {
+    it("should enable model router for other auth type", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: true,
@@ -694,7 +676,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseModelRouter()).toBe(true);
     });
 
-    it('should keep model router disabled when useModelRouter is false', async () => {
+    it("should keep model router disabled when useModelRouter is false", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: false,
@@ -704,13 +686,13 @@ describe('Server Config (config.ts)', () => {
       expect(config.getUseModelRouter()).toBe(false);
     });
 
-    it('should keep the user-chosen model after refreshAuth, even when model router is disabled for the auth type', async () => {
+    it("should keep the user-chosen model after refreshAuth, even when model router is disabled for the auth type", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: true,
         disableModelRouterForAuth: [AuthType.USE_GEMINI],
       });
-      const chosenModel = 'gemini-1.5-pro-latest';
+      const chosenModel = "gemini-1.5-pro-latest";
       config.setModel(chosenModel);
 
       await config.refreshAuth(AuthType.USE_GEMINI);
@@ -719,13 +701,13 @@ describe('Server Config (config.ts)', () => {
       expect(config.getModel()).toBe(chosenModel);
     });
 
-    it('should keep the user-chosen model after refreshAuth, when model router is enabled for the auth type', async () => {
+    it("should keep the user-chosen model after refreshAuth, when model router is enabled for the auth type", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: true,
         disableModelRouterForAuth: [AuthType.USE_GEMINI],
       });
-      const chosenModel = 'gemini-1.5-pro-latest';
+      const chosenModel = "gemini-1.5-pro-latest";
       config.setModel(chosenModel);
 
       await config.refreshAuth(AuthType.LOGIN_WITH_GOOGLE);
@@ -734,27 +716,27 @@ describe('Server Config (config.ts)', () => {
       expect(config.getModel()).toBe(chosenModel);
     });
 
-    it('should NOT switch to auto model if cli provides specific model, even if router is enabled', async () => {
+    it("should NOT switch to auto model if cli provides specific model, even if router is enabled", async () => {
       const config = new Config({
         ...baseParams,
         useModelRouter: true,
-        model: 'gemini-flash-latest',
+        model: "gemini-flash-latest",
       });
 
       await config.refreshAuth(AuthType.LOGIN_WITH_GOOGLE);
 
       expect(config.getUseModelRouter()).toBe(true);
-      expect(config.getModel()).toBe('gemini-flash-latest');
+      expect(config.getModel()).toBe("gemini-flash-latest");
     });
   });
 
-  describe('ContinueOnFailedApiCall Configuration', () => {
-    it('should default continueOnFailedApiCall to false when not provided', () => {
+  describe("ContinueOnFailedApiCall Configuration", () => {
+    it("should default continueOnFailedApiCall to false when not provided", () => {
       const config = new Config(baseParams);
       expect(config.getContinueOnFailedApiCall()).toBe(true);
     });
 
-    it('should set continueOnFailedApiCall to true when provided as true', () => {
+    it("should set continueOnFailedApiCall to true when provided as true", () => {
       const paramsWithContinueOnFailedApiCall: ConfigParameters = {
         ...baseParams,
         continueOnFailedApiCall: true,
@@ -763,7 +745,7 @@ describe('Server Config (config.ts)', () => {
       expect(config.getContinueOnFailedApiCall()).toBe(true);
     });
 
-    it('should set continueOnFailedApiCall to false when explicitly provided as false', () => {
+    it("should set continueOnFailedApiCall to false when explicitly provided as false", () => {
       const paramsWithContinueOnFailedApiCall: ConfigParameters = {
         ...baseParams,
         continueOnFailedApiCall: false,
@@ -773,18 +755,18 @@ describe('Server Config (config.ts)', () => {
     });
   });
 
-  describe('createToolRegistry', () => {
-    it('should register a tool if coreTools contains an argument-specific pattern', async () => {
+  describe("createToolRegistry", () => {
+    it("should register a tool if coreTools contains an argument-specific pattern", async () => {
       const params: ConfigParameters = {
         ...baseParams,
-        coreTools: ['ShellTool(git status)'],
+        coreTools: ["ShellTool(git status)"],
       };
       const config = new Config(params);
       await config.initialize();
 
       // The ToolRegistry class is mocked, so we can inspect its prototype's methods.
       const registerToolMock = (
-        (await vi.importMock('../tools/tool-registry')) as {
+        (await vi.importMock("../tools/tool-registry")) as {
           ToolRegistry: { prototype: { registerTool: Mock } };
         }
       ).ToolRegistry.prototype.registerTool;
@@ -796,13 +778,13 @@ describe('Server Config (config.ts)', () => {
       expect(wasShellToolRegistered).toBe(true);
 
       // Check that registerTool was NOT called for ReadFileTool
-      const wasReadFileToolRegistered = (
-        registerToolMock as Mock
-      ).mock.calls.some((call) => call[0] instanceof vi.mocked(ReadFileTool));
+      const wasReadFileToolRegistered = (registerToolMock as Mock).mock.calls.some(
+        (call) => call[0] instanceof vi.mocked(ReadFileTool),
+      );
       expect(wasReadFileToolRegistered).toBe(false);
     });
 
-    it('should register subagents as tools when codebaseInvestigatorSettings.enabled is true', async () => {
+    it("should register subagents as tools when codebaseInvestigatorSettings.enabled is true", async () => {
       const params: ConfigParameters = {
         ...baseParams,
         codebaseInvestigatorSettings: { enabled: true },
@@ -810,22 +792,20 @@ describe('Server Config (config.ts)', () => {
       const config = new Config(params);
 
       const mockAgentDefinition = {
-        name: 'codebase-investigator',
-        description: 'Agent 1',
-        instructions: 'Inst 1',
+        name: "codebase-investigator",
+        description: "Agent 1",
+        instructions: "Inst 1",
       };
 
       const AgentRegistryMock = (
-        (await vi.importMock('../agents/registry.js')) as {
+        (await vi.importMock("../agents/registry.js")) as {
           AgentRegistry: Mock;
         }
       ).AgentRegistry;
-      AgentRegistryMock.prototype.getDefinition.mockReturnValue(
-        mockAgentDefinition,
-      );
+      AgentRegistryMock.prototype.getDefinition.mockReturnValue(mockAgentDefinition);
 
       const SubagentToolWrapperMock = (
-        (await vi.importMock('../agents/subagent-tool-wrapper.js')) as {
+        (await vi.importMock("../agents/subagent-tool-wrapper.js")) as {
           SubagentToolWrapper: Mock;
         }
       ).SubagentToolWrapper;
@@ -833,26 +813,20 @@ describe('Server Config (config.ts)', () => {
       await config.initialize();
 
       const registerToolMock = (
-        (await vi.importMock('../tools/tool-registry')) as {
+        (await vi.importMock("../tools/tool-registry")) as {
           ToolRegistry: { prototype: { registerTool: Mock } };
         }
       ).ToolRegistry.prototype.registerTool;
 
       expect(SubagentToolWrapperMock).toHaveBeenCalledTimes(1);
-      expect(SubagentToolWrapperMock).toHaveBeenCalledWith(
-        mockAgentDefinition,
-        config,
-        undefined,
-      );
+      expect(SubagentToolWrapperMock).toHaveBeenCalledWith(mockAgentDefinition, config, undefined);
 
       const calls = registerToolMock.mock.calls;
-      const registeredWrappers = calls.filter(
-        (call) => call[0] instanceof SubagentToolWrapperMock,
-      );
+      const registeredWrappers = calls.filter((call) => call[0] instanceof SubagentToolWrapperMock);
       expect(registeredWrappers).toHaveLength(1);
     });
 
-    it('should not register subagents as tools when codebaseInvestigatorSettings.enabled is false', async () => {
+    it("should not register subagents as tools when codebaseInvestigatorSettings.enabled is false", async () => {
       const params: ConfigParameters = {
         ...baseParams,
         codebaseInvestigatorSettings: { enabled: false },
@@ -860,7 +834,7 @@ describe('Server Config (config.ts)', () => {
       const config = new Config(params);
 
       const SubagentToolWrapperMock = (
-        (await vi.importMock('../agents/subagent-tool-wrapper.js')) as {
+        (await vi.importMock("../agents/subagent-tool-wrapper.js")) as {
           SubagentToolWrapper: Mock;
         }
       ).SubagentToolWrapper;
@@ -870,171 +844,153 @@ describe('Server Config (config.ts)', () => {
       expect(SubagentToolWrapperMock).not.toHaveBeenCalled();
     });
 
-    describe('with minified tool class names', () => {
+    describe("with minified tool class names", () => {
       beforeEach(() => {
-        Object.defineProperty(
-          vi.mocked(ShellTool).prototype.constructor,
-          'name',
-          {
-            value: '_ShellTool',
-            configurable: true,
-          },
-        );
+        Object.defineProperty(vi.mocked(ShellTool).prototype.constructor, "name", {
+          value: "_ShellTool",
+          configurable: true,
+        });
       });
 
       afterEach(() => {
-        Object.defineProperty(
-          vi.mocked(ShellTool).prototype.constructor,
-          'name',
-          {
-            value: 'ShellTool',
-          },
-        );
+        Object.defineProperty(vi.mocked(ShellTool).prototype.constructor, "name", {
+          value: "ShellTool",
+        });
       });
 
-      it('should register a tool if coreTools contains the non-minified class name', async () => {
+      it("should register a tool if coreTools contains the non-minified class name", async () => {
         const params: ConfigParameters = {
           ...baseParams,
-          coreTools: ['ShellTool'],
+          coreTools: ["ShellTool"],
         };
         const config = new Config(params);
         await config.initialize();
 
         const registerToolMock = (
-          (await vi.importMock('../tools/tool-registry')) as {
+          (await vi.importMock("../tools/tool-registry")) as {
             ToolRegistry: { prototype: { registerTool: Mock } };
           }
         ).ToolRegistry.prototype.registerTool;
 
-        const wasShellToolRegistered = (
-          registerToolMock as Mock
-        ).mock.calls.some((call) => call[0] instanceof vi.mocked(ShellTool));
+        const wasShellToolRegistered = (registerToolMock as Mock).mock.calls.some(
+          (call) => call[0] instanceof vi.mocked(ShellTool),
+        );
         expect(wasShellToolRegistered).toBe(true);
       });
 
-      it('should register a tool if coreTools contains an argument-specific pattern with the non-minified class name', async () => {
+      it("should register a tool if coreTools contains an argument-specific pattern with the non-minified class name", async () => {
         const params: ConfigParameters = {
           ...baseParams,
-          coreTools: ['ShellTool(git status)'],
+          coreTools: ["ShellTool(git status)"],
         };
         const config = new Config(params);
         await config.initialize();
 
         const registerToolMock = (
-          (await vi.importMock('../tools/tool-registry')) as {
+          (await vi.importMock("../tools/tool-registry")) as {
             ToolRegistry: { prototype: { registerTool: Mock } };
           }
         ).ToolRegistry.prototype.registerTool;
 
-        const wasShellToolRegistered = (
-          registerToolMock as Mock
-        ).mock.calls.some((call) => call[0] instanceof vi.mocked(ShellTool));
+        const wasShellToolRegistered = (registerToolMock as Mock).mock.calls.some(
+          (call) => call[0] instanceof vi.mocked(ShellTool),
+        );
         expect(wasShellToolRegistered).toBe(true);
       });
     });
   });
 
-  describe('getTruncateToolOutputThreshold', () => {
+  describe("getTruncateToolOutputThreshold", () => {
     beforeEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should return the calculated threshold when it is smaller than the default', () => {
+    it("should return the calculated threshold when it is smaller than the default", () => {
       const config = new Config(baseParams);
       vi.mocked(tokenLimit).mockReturnValue(32000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        1000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(1000);
       // 4 * (32000 - 1000) = 4 * 31000 = 124000
       // default is 4_000_000
       expect(config.getTruncateToolOutputThreshold()).toBe(124000);
     });
 
-    it('should return the default threshold when the calculated value is larger', () => {
+    it("should return the default threshold when the calculated value is larger", () => {
       const config = new Config(baseParams);
       vi.mocked(tokenLimit).mockReturnValue(2_000_000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        500_000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(500_000);
       // 4 * (2_000_000 - 500_000) = 4 * 1_500_000 = 6_000_000
       // default is 4_000_000
       expect(config.getTruncateToolOutputThreshold()).toBe(4_000_000);
     });
 
-    it('should use a custom truncateToolOutputThreshold if provided', () => {
+    it("should use a custom truncateToolOutputThreshold if provided", () => {
       const customParams = {
         ...baseParams,
         truncateToolOutputThreshold: 50000,
       };
       const config = new Config(customParams);
       vi.mocked(tokenLimit).mockReturnValue(8000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        2000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(2000);
       // 4 * (8000 - 2000) = 4 * 6000 = 24000
       // custom threshold is 50000
       expect(config.getTruncateToolOutputThreshold()).toBe(24000);
 
       vi.mocked(tokenLimit).mockReturnValue(32000);
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        1000,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(1000);
       // 4 * (32000 - 1000) = 124000
       // custom threshold is 50000
       expect(config.getTruncateToolOutputThreshold()).toBe(50000);
     });
   });
 
-  describe('Proxy Configuration Error Handling', () => {
+  describe("Proxy Configuration Error Handling", () => {
     beforeEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should call setGlobalProxy when proxy is configured', () => {
+    it("should call setGlobalProxy when proxy is configured", () => {
       const paramsWithProxy: ConfigParameters = {
         ...baseParams,
-        proxy: 'http://proxy.example.com:8080',
+        proxy: "http://proxy.example.com:8080",
       };
       new Config(paramsWithProxy);
 
-      expect(mockSetGlobalProxy).toHaveBeenCalledWith(
-        'http://proxy.example.com:8080',
-      );
+      expect(mockSetGlobalProxy).toHaveBeenCalledWith("http://proxy.example.com:8080");
     });
 
-    it('should not call setGlobalProxy when proxy is not configured', () => {
+    it("should not call setGlobalProxy when proxy is not configured", () => {
       new Config(baseParams);
 
       expect(mockSetGlobalProxy).not.toHaveBeenCalled();
     });
 
-    it('should emit error feedback when setGlobalProxy throws an error', () => {
-      const proxyError = new Error('Invalid proxy URL');
+    it("should emit error feedback when setGlobalProxy throws an error", () => {
+      const proxyError = new Error("Invalid proxy URL");
       mockSetGlobalProxy.mockImplementation(() => {
         throw proxyError;
       });
 
       const paramsWithProxy: ConfigParameters = {
         ...baseParams,
-        proxy: 'invalid-proxy',
+        proxy: "invalid-proxy",
       };
       new Config(paramsWithProxy);
 
       expect(mockCoreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Invalid proxy configuration detected. Check debug drawer for more details (F12)',
+        "error",
+        "Invalid proxy configuration detected. Check debug drawer for more details (F12)",
         proxyError,
       );
     });
 
-    it('should not emit error feedback when setGlobalProxy succeeds', () => {
+    it("should not emit error feedback when setGlobalProxy succeeds", () => {
       mockSetGlobalProxy.mockImplementation(() => {
         // Success - no error thrown
       });
 
       const paramsWithProxy: ConfigParameters = {
         ...baseParams,
-        proxy: 'http://proxy.example.com:8080',
+        proxy: "http://proxy.example.com:8080",
       };
       new Config(paramsWithProxy);
 
@@ -1042,8 +998,8 @@ describe('Server Config (config.ts)', () => {
     });
   });
 
-  describe('checkDeprecatedTools', () => {
-    it('should emit a warning when a deprecated tool is in coreTools', async () => {
+  describe("checkDeprecatedTools", () => {
+    it("should emit a warning when a deprecated tool is in coreTools", async () => {
       const params: ConfigParameters = {
         ...baseParams,
         coreTools: [READ_MANY_FILES_TOOL_NAME],
@@ -1052,23 +1008,23 @@ describe('Server Config (config.ts)', () => {
       await config.initialize();
 
       expect(mockCoreEvents.emitFeedback).toHaveBeenCalledWith(
-        'warning',
+        "warning",
         expect.stringContaining(
           `The tool '${READ_MANY_FILES_TOOL_NAME}' (or 'ReadManyFilesTool') specified in 'tools.core' is deprecated`,
         ),
       );
     });
 
-    it('should emit a warning when a deprecated tool is in allowedTools', async () => {
+    it("should emit a warning when a deprecated tool is in allowedTools", async () => {
       const params: ConfigParameters = {
         ...baseParams,
-        allowedTools: ['ReadManyFilesTool'],
+        allowedTools: ["ReadManyFilesTool"],
       };
       const config = new Config(params);
       await config.initialize();
 
       expect(mockCoreEvents.emitFeedback).toHaveBeenCalledWith(
-        'warning',
+        "warning",
         expect.stringContaining(
           `The tool '${READ_MANY_FILES_TOOL_NAME}' (or 'ReadManyFilesTool') specified in 'tools.allowed' is deprecated`,
         ),
@@ -1077,134 +1033,112 @@ describe('Server Config (config.ts)', () => {
   });
 });
 
-describe('setApprovalMode with folder trust', () => {
+describe("setApprovalMode with folder trust", () => {
   const baseParams: ConfigParameters = {
-    sessionId: 'test',
-    targetDir: '.',
+    sessionId: "test",
+    targetDir: ".",
     debugMode: false,
-    model: 'test-model',
-    cwd: '.',
+    model: "test-model",
+    cwd: ".",
   };
 
-  it('should throw an error when setting YOLO mode in an untrusted folder', () => {
+  it("should throw an error when setting YOLO mode in an untrusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(() => config.setApprovalMode(ApprovalMode.YOLO)).toThrow(
-      'Cannot enable privileged approval modes in an untrusted folder.',
+      "Cannot enable privileged approval modes in an untrusted folder.",
     );
   });
 
-  it('should throw an error when setting AUTO_EDIT mode in an untrusted folder', () => {
+  it("should throw an error when setting AUTO_EDIT mode in an untrusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(() => config.setApprovalMode(ApprovalMode.AUTO_EDIT)).toThrow(
-      'Cannot enable privileged approval modes in an untrusted folder.',
+      "Cannot enable privileged approval modes in an untrusted folder.",
     );
   });
 
-  it('should NOT throw an error when setting DEFAULT mode in an untrusted folder', () => {
+  it("should NOT throw an error when setting DEFAULT mode in an untrusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(() => config.setApprovalMode(ApprovalMode.DEFAULT)).not.toThrow();
   });
 
-  it('should NOT throw an error when setting any mode in a trusted folder', () => {
+  it("should NOT throw an error when setting any mode in a trusted folder", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true);
     expect(() => config.setApprovalMode(ApprovalMode.YOLO)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.AUTO_EDIT)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.DEFAULT)).not.toThrow();
   });
 
-  it('should NOT throw an error when setting any mode if trustedFolder is undefined', () => {
+  it("should NOT throw an error when setting any mode if trustedFolder is undefined", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true); // isTrustedFolder defaults to true
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true); // isTrustedFolder defaults to true
     expect(() => config.setApprovalMode(ApprovalMode.YOLO)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.AUTO_EDIT)).not.toThrow();
     expect(() => config.setApprovalMode(ApprovalMode.DEFAULT)).not.toThrow();
   });
 
-  describe('registerCoreTools', () => {
+  describe("registerCoreTools", () => {
     beforeEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should register RipGrepTool when useRipgrep is true and it is available', async () => {
+    it("should register RipGrepTool when useRipgrep is true and it is available", async () => {
       (canUseRipgrep as Mock).mockResolvedValue(true);
       const config = new Config({ ...baseParams, useRipgrep: true });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(true);
       expect(wasGrepRegistered).toBe(false);
       expect(logRipgrepFallback).not.toHaveBeenCalled();
     });
 
-    it('should register GrepTool as a fallback when useRipgrep is true but it is not available', async () => {
+    it("should register GrepTool as a fallback when useRipgrep is true but it is not available", async () => {
       (canUseRipgrep as Mock).mockResolvedValue(false);
       const config = new Config({ ...baseParams, useRipgrep: true });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(false);
       expect(wasGrepRegistered).toBe(true);
-      expect(logRipgrepFallback).toHaveBeenCalledWith(
-        config,
-        expect.any(RipgrepFallbackEvent),
-      );
+      expect(logRipgrepFallback).toHaveBeenCalledWith(config, expect.any(RipgrepFallbackEvent));
       const event = (logRipgrepFallback as Mock).mock.calls[0][1];
       expect(event.error).toBeUndefined();
     });
 
-    it('should register GrepTool as a fallback when canUseRipgrep throws an error', async () => {
-      const error = new Error('ripGrep check failed');
+    it("should register GrepTool as a fallback when canUseRipgrep throws an error", async () => {
+      const error = new Error("ripGrep check failed");
       (canUseRipgrep as Mock).mockRejectedValue(error);
       const config = new Config({ ...baseParams, useRipgrep: true });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(false);
       expect(wasGrepRegistered).toBe(true);
-      expect(logRipgrepFallback).toHaveBeenCalledWith(
-        config,
-        expect.any(RipgrepFallbackEvent),
-      );
+      expect(logRipgrepFallback).toHaveBeenCalledWith(config, expect.any(RipgrepFallbackEvent));
       const event = (logRipgrepFallback as Mock).mock.calls[0][1];
       expect(event.error).toBe(String(error));
     });
 
-    it('should register GrepTool when useRipgrep is false', async () => {
+    it("should register GrepTool when useRipgrep is false", async () => {
       const config = new Config({ ...baseParams, useRipgrep: false });
       await config.initialize();
 
       const calls = (ToolRegistry.prototype.registerTool as Mock).mock.calls;
-      const wasRipGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(RipGrepTool),
-      );
-      const wasGrepRegistered = calls.some(
-        (call) => call[0] instanceof vi.mocked(GrepTool),
-      );
+      const wasRipGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(RipGrepTool));
+      const wasGrepRegistered = calls.some((call) => call[0] instanceof vi.mocked(GrepTool));
 
       expect(wasRipGrepRegistered).toBe(false);
       expect(wasGrepRegistered).toBe(true);
@@ -1214,55 +1148,55 @@ describe('setApprovalMode with folder trust', () => {
   });
 });
 
-describe('isYoloModeDisabled', () => {
+describe("isYoloModeDisabled", () => {
   const baseParams: ConfigParameters = {
-    sessionId: 'test',
-    targetDir: '.',
+    sessionId: "test",
+    targetDir: ".",
     debugMode: false,
-    model: 'test-model',
-    cwd: '.',
+    model: "test-model",
+    cwd: ".",
   };
 
-  it('should return false when yolo mode is not disabled and folder is trusted', () => {
+  it("should return false when yolo mode is not disabled and folder is trusted", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true);
     expect(config.isYoloModeDisabled()).toBe(false);
   });
 
-  it('should return true when yolo mode is disabled by parameter', () => {
+  it("should return true when yolo mode is disabled by parameter", () => {
     const config = new Config({ ...baseParams, disableYoloMode: true });
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(true);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(true);
     expect(config.isYoloModeDisabled()).toBe(true);
   });
 
-  it('should return true when folder is untrusted', () => {
+  it("should return true when folder is untrusted", () => {
     const config = new Config(baseParams);
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(config.isYoloModeDisabled()).toBe(true);
   });
 
-  it('should return true when yolo is disabled and folder is untrusted', () => {
+  it("should return true when yolo is disabled and folder is untrusted", () => {
     const config = new Config({ ...baseParams, disableYoloMode: true });
-    vi.spyOn(config, 'isTrustedFolder').mockReturnValue(false);
+    vi.spyOn(config, "isTrustedFolder").mockReturnValue(false);
     expect(config.isYoloModeDisabled()).toBe(true);
   });
 });
 
-describe('BaseLlmClient Lifecycle', () => {
-  const MODEL = 'gemini-pro';
+describe("BaseLlmClient Lifecycle", () => {
+  const MODEL = "gemini-pro";
   const SANDBOX: SandboxConfig = {
-    command: 'docker',
-    image: 'gemini-cli-sandbox',
+    command: "docker",
+    image: "gemini-cli-sandbox",
   };
-  const TARGET_DIR = '/path/to/target';
+  const TARGET_DIR = "/path/to/target";
   const DEBUG_MODE = false;
-  const QUESTION = 'test question';
-  const USER_MEMORY = 'Test User Memory';
+  const QUESTION = "test question";
+  const USER_MEMORY = "Test User Memory";
   const TELEMETRY_SETTINGS = { enabled: false };
-  const EMBEDDING_MODEL = 'gemini-embedding';
-  const SESSION_ID = 'test-session-id';
+  const EMBEDDING_MODEL = "gemini-embedding";
+  const SESSION_ID = "test-session-id";
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
+    cwd: "/tmp",
     embeddingModel: EMBEDDING_MODEL,
     sandbox: SANDBOX,
     targetDir: TARGET_DIR,
@@ -1275,49 +1209,44 @@ describe('BaseLlmClient Lifecycle', () => {
     usageStatisticsEnabled: false,
   };
 
-  it('should throw an error if getBaseLlmClient is called before refreshAuth', () => {
+  it("should throw an error if getBaseLlmClient is called before refreshAuth", () => {
     const config = new Config(baseParams);
     expect(() => config.getBaseLlmClient()).toThrow(
-      'BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.',
+      "BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.",
     );
   });
 
-  it('should successfully initialize BaseLlmClient after refreshAuth is called', async () => {
+  it("should successfully initialize BaseLlmClient after refreshAuth is called", async () => {
     const config = new Config(baseParams);
     const authType = AuthType.USE_GEMINI;
-    const mockContentConfig = { model: 'gemini-flash', apiKey: 'test-key' };
+    const mockContentConfig = { model: "gemini-flash", apiKey: "test-key" };
 
-    vi.mocked(createContentGeneratorConfig).mockResolvedValue(
-      mockContentConfig,
-    );
+    vi.mocked(createContentGeneratorConfig).mockResolvedValue(mockContentConfig);
 
     await config.refreshAuth(authType);
 
     // Should not throw
     const llmService = config.getBaseLlmClient();
     expect(llmService).toBeDefined();
-    expect(BaseLlmClient).toHaveBeenCalledWith(
-      config.getContentGenerator(),
-      config,
-    );
+    expect(BaseLlmClient).toHaveBeenCalledWith(config.getContentGenerator(), config);
   });
 });
 
-describe('Generation Config Merging (HACK)', () => {
-  const MODEL = 'gemini-pro';
+describe("Generation Config Merging (HACK)", () => {
+  const MODEL = "gemini-pro";
   const SANDBOX: SandboxConfig = {
-    command: 'docker',
-    image: 'gemini-cli-sandbox',
+    command: "docker",
+    image: "gemini-cli-sandbox",
   };
-  const TARGET_DIR = '/path/to/target';
+  const TARGET_DIR = "/path/to/target";
   const DEBUG_MODE = false;
-  const QUESTION = 'test question';
-  const USER_MEMORY = 'Test User Memory';
+  const QUESTION = "test question";
+  const USER_MEMORY = "Test User Memory";
   const TELEMETRY_SETTINGS = { enabled: false };
-  const EMBEDDING_MODEL = 'gemini-embedding';
-  const SESSION_ID = 'test-session-id';
+  const EMBEDDING_MODEL = "gemini-embedding";
+  const SESSION_ID = "test-session-id";
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
+    cwd: "/tmp",
     embeddingModel: EMBEDDING_MODEL,
     sandbox: SANDBOX,
     targetDir: TARGET_DIR,
@@ -1330,10 +1259,10 @@ describe('Generation Config Merging (HACK)', () => {
     usageStatisticsEnabled: false,
   };
 
-  it('should merge default aliases when user provides only overrides', () => {
+  it("should merge default aliases when user provides only overrides", () => {
     const userOverrides = [
       {
-        match: { model: 'test-model' },
+        match: { model: "test-model" },
         modelConfig: { generateContentConfig: { temperature: 0.1 } },
       },
     ];
@@ -1355,10 +1284,10 @@ describe('Generation Config Merging (HACK)', () => {
     expect(serviceConfig.overrides).toEqual(userOverrides);
   });
 
-  it('should use user-provided aliases if they exist', () => {
+  it("should use user-provided aliases if they exist", () => {
     const userAliases = {
-      'my-alias': {
-        modelConfig: { model: 'my-model' },
+      "my-alias": {
+        modelConfig: { model: "my-model" },
       },
     };
 
@@ -1377,7 +1306,7 @@ describe('Generation Config Merging (HACK)', () => {
     expect(serviceConfig.aliases).toEqual(userAliases);
   });
 
-  it('should use default generation config if none is provided', () => {
+  it("should use default generation config if none is provided", () => {
     const params: ConfigParameters = { ...baseParams };
 
     const config = new Config(params);
@@ -1389,22 +1318,22 @@ describe('Generation Config Merging (HACK)', () => {
   });
 });
 
-describe('Config getHooks', () => {
+describe("Config getHooks", () => {
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
-    targetDir: '/path/to/target',
+    cwd: "/tmp",
+    targetDir: "/path/to/target",
     debugMode: false,
-    sessionId: 'test-session-id',
-    model: 'gemini-pro',
+    sessionId: "test-session-id",
+    model: "gemini-pro",
     usageStatisticsEnabled: false,
   };
 
-  it('should return undefined when no hooks are provided', () => {
+  it("should return undefined when no hooks are provided", () => {
     const config = new Config(baseParams);
     expect(config.getHooks()).toBeUndefined();
   });
 
-  it('should return empty object when empty hooks are provided', () => {
+  it("should return empty object when empty hooks are provided", () => {
     const configWithEmptyHooks = new Config({
       ...baseParams,
       hooks: {},
@@ -1412,11 +1341,11 @@ describe('Config getHooks', () => {
     expect(configWithEmptyHooks.getHooks()).toEqual({});
   });
 
-  it('should return the hooks configuration when provided', () => {
+  it("should return the hooks configuration when provided", () => {
     const mockHooks: { [K in HookEventName]?: HookDefinition[] } = {
       [HookEventName.BeforeTool]: [
         {
-          matcher: 'write_file',
+          matcher: "write_file",
           hooks: [
             {
               type: HookType.Command,
@@ -1431,7 +1360,7 @@ describe('Config getHooks', () => {
           hooks: [
             {
               type: HookType.Command,
-              command: './hooks/after-tool.sh',
+              command: "./hooks/after-tool.sh",
               timeout: 10000,
             },
           ],
@@ -1449,41 +1378,21 @@ describe('Config getHooks', () => {
     expect(retrievedHooks).toBe(mockHooks); // Should return the same reference
   });
 
-  it('should return hooks with all supported event types', () => {
+  it("should return hooks with all supported event types", () => {
     const allEventHooks: { [K in HookEventName]?: HookDefinition[] } = {
-      [HookEventName.BeforeAgent]: [
-        { hooks: [{ type: HookType.Command, command: 'test1' }] },
-      ],
-      [HookEventName.AfterAgent]: [
-        { hooks: [{ type: HookType.Command, command: 'test2' }] },
-      ],
-      [HookEventName.BeforeTool]: [
-        { hooks: [{ type: HookType.Command, command: 'test3' }] },
-      ],
-      [HookEventName.AfterTool]: [
-        { hooks: [{ type: HookType.Command, command: 'test4' }] },
-      ],
-      [HookEventName.BeforeModel]: [
-        { hooks: [{ type: HookType.Command, command: 'test5' }] },
-      ],
-      [HookEventName.AfterModel]: [
-        { hooks: [{ type: HookType.Command, command: 'test6' }] },
-      ],
+      [HookEventName.BeforeAgent]: [{ hooks: [{ type: HookType.Command, command: "test1" }] }],
+      [HookEventName.AfterAgent]: [{ hooks: [{ type: HookType.Command, command: "test2" }] }],
+      [HookEventName.BeforeTool]: [{ hooks: [{ type: HookType.Command, command: "test3" }] }],
+      [HookEventName.AfterTool]: [{ hooks: [{ type: HookType.Command, command: "test4" }] }],
+      [HookEventName.BeforeModel]: [{ hooks: [{ type: HookType.Command, command: "test5" }] }],
+      [HookEventName.AfterModel]: [{ hooks: [{ type: HookType.Command, command: "test6" }] }],
       [HookEventName.BeforeToolSelection]: [
-        { hooks: [{ type: HookType.Command, command: 'test7' }] },
-      ],
-      [HookEventName.Notification]: [
-        { hooks: [{ type: HookType.Command, command: 'test8' }] },
-      ],
-      [HookEventName.SessionStart]: [
-        { hooks: [{ type: HookType.Command, command: 'test9' }] },
-      ],
-      [HookEventName.SessionEnd]: [
-        { hooks: [{ type: HookType.Command, command: 'test10' }] },
-      ],
-      [HookEventName.PreCompress]: [
-        { hooks: [{ type: HookType.Command, command: 'test11' }] },
+        { hooks: [{ type: HookType.Command, command: "test7" }] },
       ],
+      [HookEventName.Notification]: [{ hooks: [{ type: HookType.Command, command: "test8" }] }],
+      [HookEventName.SessionStart]: [{ hooks: [{ type: HookType.Command, command: "test9" }] }],
+      [HookEventName.SessionEnd]: [{ hooks: [{ type: HookType.Command, command: "test10" }] }],
+      [HookEventName.PreCompress]: [{ hooks: [{ type: HookType.Command, command: "test11" }] }],
     };
 
     const config = new Config({
@@ -1496,13 +1405,13 @@ describe('Config getHooks', () => {
     expect(Object.keys(retrievedHooks!)).toHaveLength(11); // All hook event types
   });
 
-  describe('setModel', () => {
-    it('should allow setting a pro (any) model and disable fallback mode', () => {
+  describe("setModel", () => {
+    it("should allow setting a pro (any) model and disable fallback mode", () => {
       const config = new Config(baseParams);
       config.setFallbackMode(true);
       expect(config.isInFallbackMode()).toBe(true);
 
-      const proModel = 'gemini-2.5-pro';
+      const proModel = "gemini-2.5-pro";
       config.setModel(proModel);
 
       expect(config.getModel()).toBe(proModel);
@@ -1512,22 +1421,22 @@ describe('Config getHooks', () => {
   });
 });
 
-describe('Config getExperiments', () => {
+describe("Config getExperiments", () => {
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
-    targetDir: '/path/to/target',
+    cwd: "/tmp",
+    targetDir: "/path/to/target",
     debugMode: false,
-    sessionId: 'test-session-id',
-    model: 'gemini-pro',
+    sessionId: "test-session-id",
+    model: "gemini-pro",
     usageStatisticsEnabled: false,
   };
 
-  it('should return undefined when no experiments are provided', () => {
+  it("should return undefined when no experiments are provided", () => {
     const config = new Config(baseParams);
     expect(config.getExperiments()).toBeUndefined();
   });
 
-  it('should return empty object when empty experiments are provided', () => {
+  it("should return empty object when empty experiments are provided", () => {
     const configWithEmptyExps = new Config({
       ...baseParams,
       experiments: { flags: {}, experimentIds: [] },
@@ -1538,7 +1447,7 @@ describe('Config getExperiments', () => {
     });
   });
 
-  it('should return the experiments configuration when provided', () => {
+  it("should return the experiments configuration when provided", () => {
     const mockExps = {
       flags: {
         testFlag: { boolValue: true },
@@ -1557,32 +1466,30 @@ describe('Config getExperiments', () => {
   });
 });
 
-describe('Config setExperiments logging', () => {
+describe("Config setExperiments logging", () => {
   const baseParams: ConfigParameters = {
-    cwd: '/tmp',
-    targetDir: '/path/to/target',
+    cwd: "/tmp",
+    targetDir: "/path/to/target",
     debugMode: false,
-    sessionId: 'test-session-id',
-    model: 'gemini-pro',
+    sessionId: "test-session-id",
+    model: "gemini-pro",
     usageStatisticsEnabled: false,
   };
 
-  it('logs a sorted, non-truncated summary of experiments when they are set', () => {
+  it("logs a sorted, non-truncated summary of experiments when they are set", () => {
     const config = new Config(baseParams);
-    const debugSpy = vi
-      .spyOn(debugLogger, 'debug')
-      .mockImplementation(() => {});
+    const debugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
     const experiments = {
       flags: {
         ZetaFlag: {
           boolValue: true,
-          stringValue: 'zeta',
+          stringValue: "zeta",
           int32ListValue: { values: [1, 2] },
         },
         AlphaFlag: {
           boolValue: false,
-          stringValue: 'alpha',
-          stringListValue: { values: ['a', 'b', 'c'] },
+          stringValue: "alpha",
+          stringListValue: { values: ["a", "b", "c"] },
         },
         MiddleFlag: {
           // Intentionally sparse to ensure undefined values are omitted
@@ -1595,24 +1502,22 @@ describe('Config setExperiments logging', () => {
 
     config.setExperiments(experiments);
 
-    const logCall = debugSpy.mock.calls.find(
-      ([message]) => message === 'Experiments loaded',
-    );
+    const logCall = debugSpy.mock.calls.find(([message]) => message === "Experiments loaded");
     expect(logCall).toBeDefined();
     const loggedSummary = logCall?.[1] as string;
-    expect(typeof loggedSummary).toBe('string');
-    expect(loggedSummary).toContain('experimentIds');
-    expect(loggedSummary).toContain('101');
-    expect(loggedSummary).toContain('AlphaFlag');
-    expect(loggedSummary).toContain('ZetaFlag');
-    const alphaIndex = loggedSummary.indexOf('AlphaFlag');
-    const zetaIndex = loggedSummary.indexOf('ZetaFlag');
+    expect(typeof loggedSummary).toBe("string");
+    expect(loggedSummary).toContain("experimentIds");
+    expect(loggedSummary).toContain("101");
+    expect(loggedSummary).toContain("AlphaFlag");
+    expect(loggedSummary).toContain("ZetaFlag");
+    const alphaIndex = loggedSummary.indexOf("AlphaFlag");
+    const zetaIndex = loggedSummary.indexOf("ZetaFlag");
     expect(alphaIndex).toBeGreaterThan(-1);
     expect(zetaIndex).toBeGreaterThan(-1);
     expect(alphaIndex).toBeLessThan(zetaIndex);
-    expect(loggedSummary).toContain('\n');
-    expect(loggedSummary).not.toContain('stringListLength: 0');
-    expect(loggedSummary).not.toContain('int32ListLength: 0');
+    expect(loggedSummary).toContain("\n");
+    expect(loggedSummary).not.toContain("stringListLength: 0");
+    expect(loggedSummary).not.toContain("int32ListLength: 0");
 
     debugSpy.mockRestore();
   });
diff --git a/packages/gemini-core/src/config/config.ts b/packages/gemini-core/src/config/config.ts
index b0e137329..88379e73e 100644
--- a/packages/gemini-core/src/config/config.ts
+++ b/packages/gemini-core/src/config/config.ts
@@ -4,91 +4,88 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import { inspect } from 'node:util';
-import process from 'node:process';
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../core/contentGenerator.js';
+import * as path from "node:path";
+import process from "node:process";
+import { inspect } from "node:util";
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import { GeminiClient } from "../core/client.js";
+import type { ContentGenerator, ContentGeneratorConfig } from "../core/contentGenerator.js";
 import {
   AuthType,
   createContentGenerator,
   createContentGeneratorConfig,
-} from '../core/contentGenerator.js';
-import { PromptRegistry } from '../prompts/prompt-registry.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
-import { LSTool } from '../tools/ls.js';
-import { ReadFileTool } from '../tools/read-file.js';
-import { GrepTool } from '../tools/grep.js';
-import { canUseRipgrep, RipGrepTool } from '../tools/ripGrep.js';
-import { GlobTool } from '../tools/glob.js';
-import { EditTool } from '../tools/edit.js';
-import { SmartEditTool } from '../tools/smart-edit.js';
-import { ShellTool } from '../tools/shell.js';
-import { WriteFileTool } from '../tools/write-file.js';
-import { WebFetchTool } from '../tools/web-fetch.js';
-import { ReadManyFilesTool } from '../tools/read-many-files.js';
-import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
-import { WebSearchTool } from '../tools/web-search.js';
-import { GeminiClient } from '../core/client.js';
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { HookDefinition, HookEventName } from '../hooks/types.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { GitService } from '../services/gitService.js';
-import type { TelemetryTarget } from '../telemetry/index.js';
+} from "../core/contentGenerator.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import type { FallbackModelHandler } from "../fallback/types.js";
+import type { HookDefinition, HookEventName } from "../hooks/types.js";
+import { ideContextStore } from "../ide/ideContext.js";
+import type { MCPOAuthConfig } from "../mcp/oauth-provider.js";
+import { OutputFormat } from "../output/types.js";
+import { PromptRegistry } from "../prompts/prompt-registry.js";
+import { ModelRouterService } from "../routing/modelRouterService.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import type { FileSystemService } from "../services/fileSystemService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { GitService } from "../services/gitService.js";
+import type { ModelConfigServiceConfig } from "../services/modelConfigService.js";
+import { ModelConfigService } from "../services/modelConfigService.js";
+import type { TelemetryTarget } from "../telemetry/index.js";
 import {
-  initializeTelemetry,
-  DEFAULT_TELEMETRY_TARGET,
   DEFAULT_OTLP_ENDPOINT,
+  DEFAULT_TELEMETRY_TARGET,
+  initializeTelemetry,
   uiTelemetryService,
-} from '../telemetry/index.js';
-import { coreEvents } from '../utils/events.js';
-import { tokenLimit } from '../core/tokenLimits.js';
+} from "../telemetry/index.js";
+import { logRipgrepFallback } from "../telemetry/loggers.js";
+import { RipgrepFallbackEvent } from "../telemetry/types.js";
+import { EditTool } from "../tools/edit.js";
+import { GlobTool } from "../tools/glob.js";
+import { GrepTool } from "../tools/grep.js";
+import { LSTool } from "../tools/ls.js";
+import { MemoryTool, setGeminiMdFilename } from "../tools/memoryTool.js";
+import { ReadFileTool } from "../tools/read-file.js";
+import { ReadManyFilesTool } from "../tools/read-many-files.js";
+import { canUseRipgrep, RipGrepTool } from "../tools/ripGrep.js";
+import { ShellTool } from "../tools/shell.js";
+import { SmartEditTool } from "../tools/smart-edit.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
+import { WebFetchTool } from "../tools/web-fetch.js";
+import { WebSearchTool } from "../tools/web-search.js";
+import { WriteFileTool } from "../tools/write-file.js";
+import { WriteTodosTool } from "../tools/write-todos.js";
+import { shouldAttemptBrowserLaunch } from "../utils/browser.js";
+import { coreEvents } from "../utils/events.js";
+import { DEFAULT_MODEL_CONFIGS } from "./defaultModelConfigs.js";
 import {
   DEFAULT_GEMINI_EMBEDDING_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   DEFAULT_GEMINI_MODEL_AUTO,
   DEFAULT_THINKING_MODE,
-} from './models.js';
-import { shouldAttemptBrowserLaunch } from '../utils/browser.js';
-import type { MCPOAuthConfig } from '../mcp/oauth-provider.js';
-import { ideContextStore } from '../ide/ideContext.js';
-import { WriteTodosTool } from '../tools/write-todos.js';
-import type { FileSystemService } from '../services/fileSystemService.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { logRipgrepFallback } from '../telemetry/loggers.js';
-import { RipgrepFallbackEvent } from '../telemetry/types.js';
-import type { FallbackModelHandler } from '../fallback/types.js';
-import { ModelRouterService } from '../routing/modelRouterService.js';
-import { OutputFormat } from '../output/types.js';
-import type { ModelConfigServiceConfig } from '../services/modelConfigService.js';
-import { ModelConfigService } from '../services/modelConfigService.js';
-import { DEFAULT_MODEL_CONFIGS } from './defaultModelConfigs.js';
+} from "./models.js";
 
 // Re-export OAuth config type
-export type { MCPOAuthConfig, AnyToolInvocation };
-import type { AnyToolInvocation } from '../tools/tools.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-import { Storage } from './storage.js';
-import type { ShellExecutionConfig } from '../services/shellExecutionService.js';
-import { FileExclusions } from '../utils/ignorePatterns.js';
-import type { EventEmitter } from 'node:events';
-import { MessageBus } from '../confirmation-bus/message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import type { PolicyEngineConfig } from '../policy/types.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { getCodeAssistServer } from '../code_assist/codeAssist.js';
-import type { Experiments } from '../code_assist/experiments/experiments.js';
-import { AgentRegistry } from '../agents/registry.js';
-import { setGlobalProxy } from '../utils/fetch.js';
-import { SubagentToolWrapper } from '../agents/subagent-tool-wrapper.js';
-import { getExperiments } from '../code_assist/experiments/experiments.js';
-import { ExperimentFlags } from '../code_assist/experiments/flagNames.js';
-import { debugLogger } from '../utils/debugLogger.js';
-
-import { ApprovalMode } from '../policy/types.js';
+export type { AnyToolInvocation, MCPOAuthConfig };
+
+import type { EventEmitter } from "node:events";
+import { AgentRegistry } from "../agents/registry.js";
+import { SubagentToolWrapper } from "../agents/subagent-tool-wrapper.js";
+import { getCodeAssistServer } from "../code_assist/codeAssist.js";
+import type { Experiments } from "../code_assist/experiments/experiments.js";
+import { getExperiments } from "../code_assist/experiments/experiments.js";
+import { ExperimentFlags } from "../code_assist/experiments/flagNames.js";
+import type { UserTierId } from "../code_assist/types.js";
+import { MessageBus } from "../confirmation-bus/message-bus.js";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import type { PolicyEngineConfig } from "../policy/types.js";
+import { ApprovalMode } from "../policy/types.js";
+import type { ShellExecutionConfig } from "../services/shellExecutionService.js";
+import type { AnyToolInvocation } from "../tools/tools.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { setGlobalProxy } from "../utils/fetch.js";
+import { FileExclusions } from "../utils/ignorePatterns.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { Storage } from "./storage.js";
 
 export interface AccessibilitySettings {
   disableLoadingPhrases?: boolean;
@@ -107,7 +104,7 @@ export interface TelemetrySettings {
   enabled?: boolean;
   target?: TelemetryTarget;
   otlpEndpoint?: string;
-  otlpProtocol?: 'grpc' | 'http';
+  otlpProtocol?: "grpc" | "http";
   logPrompts?: boolean;
   outfile?: string;
   useCollector?: boolean;
@@ -146,31 +143,25 @@ export interface GeminiCLIExtension {
 
 export interface ExtensionInstallMetadata {
   source: string;
-  type: 'git' | 'local' | 'link' | 'github-release';
+  type: "git" | "local" | "link" | "github-release";
   releaseTag?: string; // Only present for github-release installs.
   ref?: string;
   autoUpdate?: boolean;
   allowPreRelease?: boolean;
 }
 
-import type { FileFilteringOptions } from './constants.js';
+import { McpClientManager } from "../tools/mcp-client-manager.js";
+import { READ_MANY_FILES_TOOL_NAME } from "../tools/tool-names.js";
+
+import { type ExtensionLoader, SimpleExtensionLoader } from "../utils/extensionLoader.js";
+import type { FileFilteringOptions } from "./constants.js";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS,
   DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-} from './constants.js';
-
-import {
-  type ExtensionLoader,
-  SimpleExtensionLoader,
-} from '../utils/extensionLoader.js';
-import { McpClientManager } from '../tools/mcp-client-manager.js';
-import { READ_MANY_FILES_TOOL_NAME } from '../tools/tool-names.js';
+} from "./constants.js";
 
 export type { FileFilteringOptions };
-export {
-  DEFAULT_FILE_FILTERING_OPTIONS,
-  DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-};
+export { DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS };
 
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD = 4_000_000;
 export const DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES = 1000;
@@ -209,13 +200,13 @@ export class MCPServerConfig {
 }
 
 export enum AuthProviderType {
-  DYNAMIC_DISCOVERY = 'dynamic_discovery',
-  GOOGLE_CREDENTIALS = 'google_credentials',
-  SERVICE_ACCOUNT_IMPERSONATION = 'service_account_impersonation',
+  DYNAMIC_DISCOVERY = "dynamic_discovery",
+  GOOGLE_CREDENTIALS = "google_credentials",
+  SERVICE_ACCOUNT_IMPERSONATION = "service_account_impersonation",
 }
 
 export interface SandboxConfig {
-  command: 'docker' | 'podman' | 'sandbox-exec';
+  command: "docker" | "podman" | "sandbox-exec";
   image: string;
 }
 
@@ -271,7 +262,7 @@ export interface ConfigParameters {
   folderTrust?: boolean;
   ideMode?: boolean;
   loadMemoryFromIncludeDirectories?: boolean;
-  importFormat?: 'tree' | 'flat';
+  importFormat?: "tree" | "flat";
   discoveryMaxDirs?: number;
   compressionThreshold?: number;
   interactive?: boolean;
@@ -373,12 +364,10 @@ export class Config {
   private readonly enableExtensionReloading: boolean;
   fallbackModelHandler?: FallbackModelHandler;
   private quotaErrorOccurred: boolean = false;
-  private readonly summarizeToolOutput:
-    | Record<string, SummarizeToolOutputSettings>
-    | undefined;
+  private readonly summarizeToolOutput: Record<string, SummarizeToolOutputSettings> | undefined;
   private readonly experimentalZedIntegration: boolean = false;
   private readonly loadMemoryFromIncludeDirectories: boolean = false;
-  private readonly importFormat: 'tree' | 'flat';
+  private readonly importFormat: "tree" | "flat";
   private readonly discoveryMaxDirs: number;
   private readonly compressionThreshold: number | undefined;
   private readonly interactive: boolean;
@@ -414,23 +403,17 @@ export class Config {
   readonly recordResponses?: string;
   private readonly disableYoloMode: boolean;
   private readonly enableHooks: boolean;
-  private readonly hooks:
-    | { [K in HookEventName]?: HookDefinition[] }
-    | undefined;
+  private readonly hooks: { [K in HookEventName]?: HookDefinition[] } | undefined;
   private experiments: Experiments | undefined;
   private experimentsPromise: Promise<void> | undefined;
 
   constructor(params: ConfigParameters) {
     this.sessionId = params.sessionId;
-    this.embeddingModel =
-      params.embeddingModel ?? DEFAULT_GEMINI_EMBEDDING_MODEL;
+    this.embeddingModel = params.embeddingModel ?? DEFAULT_GEMINI_EMBEDDING_MODEL;
     this.fileSystemService = new StandardFileSystemService();
     this.sandbox = params.sandbox;
     this.targetDir = path.resolve(params.targetDir);
-    this.workspaceContext = new WorkspaceContext(
-      this.targetDir,
-      params.includeDirectories ?? [],
-    );
+    this.workspaceContext = new WorkspaceContext(this.targetDir, params.includeDirectories ?? []);
     this.debugMode = params.debugMode;
     this.question = params.question;
 
@@ -443,7 +426,7 @@ export class Config {
     this.mcpServers = params.mcpServers;
     this.allowedMcpServers = params.allowedMcpServers ?? [];
     this.blockedMcpServers = params.blockedMcpServers ?? [];
-    this.userMemory = params.userMemory ?? '';
+    this.userMemory = params.userMemory ?? "";
     this.geminiMdFileCount = params.geminiMdFileCount ?? 0;
     this.geminiMdFilePaths = params.geminiMdFilePaths ?? [];
     this.approvalMode = params.approvalMode ?? ApprovalMode.DEFAULT;
@@ -462,13 +445,11 @@ export class Config {
 
     this.fileFiltering = {
       respectGitIgnore:
-        params.fileFiltering?.respectGitIgnore ??
-        DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        params.fileFiltering?.respectGitIgnore ?? DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
       respectGeminiIgnore:
         params.fileFiltering?.respectGeminiIgnore ??
         DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-      enableRecursiveFileSearch:
-        params.fileFiltering?.enableRecursiveFileSearch ?? true,
+      enableRecursiveFileSearch: params.fileFiltering?.enableRecursiveFileSearch ?? true,
       disableFuzzySearch: params.fileFiltering?.disableFuzzySearch ?? false,
     };
     this.checkpointing = params.checkpointing ?? false;
@@ -478,25 +459,22 @@ export class Config {
     this.bugCommand = params.bugCommand;
     this.model = params.model;
     this.maxSessionTurns = params.maxSessionTurns ?? -1;
-    this.experimentalZedIntegration =
-      params.experimentalZedIntegration ?? false;
+    this.experimentalZedIntegration = params.experimentalZedIntegration ?? false;
     this.listSessions = params.listSessions ?? false;
     this.deleteSession = params.deleteSession;
     this.listExtensions = params.listExtensions ?? false;
-    this._extensionLoader =
-      params.extensionLoader ?? new SimpleExtensionLoader([]);
+    this._extensionLoader = params.extensionLoader ?? new SimpleExtensionLoader([]);
     this._enabledExtensions = params.enabledExtensions ?? [];
     this.noBrowser = params.noBrowser ?? false;
     this.summarizeToolOutput = params.summarizeToolOutput;
     this.folderTrust = params.folderTrust ?? false;
     this.ideMode = params.ideMode ?? false;
-    this.loadMemoryFromIncludeDirectories =
-      params.loadMemoryFromIncludeDirectories ?? false;
-    this.importFormat = params.importFormat ?? 'tree';
+    this.loadMemoryFromIncludeDirectories = params.loadMemoryFromIncludeDirectories ?? false;
+    this.importFormat = params.importFormat ?? "tree";
     this.discoveryMaxDirs = params.discoveryMaxDirs ?? 200;
     this.compressionThreshold = params.compressionThreshold;
     this.interactive = params.interactive ?? false;
-    this.ptyInfo = params.ptyInfo ?? 'child_process';
+    this.ptyInfo = params.ptyInfo ?? "child_process";
     this.trustedFolder = params.trustedFolder;
     this.useRipgrep = params.useRipgrep ?? true;
     this.enableInteractiveShell = params.enableInteractiveShell ?? false;
@@ -505,11 +483,10 @@ export class Config {
       terminalWidth: params.shellExecutionConfig?.terminalWidth ?? 80,
       terminalHeight: params.shellExecutionConfig?.terminalHeight ?? 24,
       showColor: params.shellExecutionConfig?.showColor ?? false,
-      pager: params.shellExecutionConfig?.pager ?? 'cat',
+      pager: params.shellExecutionConfig?.pager ?? "cat",
     };
     this.truncateToolOutputThreshold =
-      params.truncateToolOutputThreshold ??
-      DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
+      params.truncateToolOutputThreshold ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD;
     this.truncateToolOutputLines =
       params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
     this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
@@ -526,20 +503,16 @@ export class Config {
     const hasHooks = params.hooks && Object.keys(params.hooks).length > 0;
     const hooksNeedMessageBus = this.enableHooks && hasHooks;
     this.enableMessageBusIntegration =
-      params.enableMessageBusIntegration ??
-      (hooksNeedMessageBus ? true : false);
+      params.enableMessageBusIntegration ?? (hooksNeedMessageBus ? true : false);
     this.codebaseInvestigatorSettings = {
       enabled: params.codebaseInvestigatorSettings?.enabled ?? true,
       maxNumTurns: params.codebaseInvestigatorSettings?.maxNumTurns ?? 10,
       maxTimeMinutes: params.codebaseInvestigatorSettings?.maxTimeMinutes ?? 3,
-      thinkingBudget:
-        params.codebaseInvestigatorSettings?.thinkingBudget ??
-        DEFAULT_THINKING_MODE,
+      thinkingBudget: params.codebaseInvestigatorSettings?.thinkingBudget ?? DEFAULT_THINKING_MODE,
       model: params.codebaseInvestigatorSettings?.model ?? DEFAULT_GEMINI_MODEL,
     };
     this.continueOnFailedApiCall = params.continueOnFailedApiCall ?? true;
-    this.enableShellOutputEfficiency =
-      params.enableShellOutputEfficiency ?? true;
+    this.enableShellOutputEfficiency = params.enableShellOutputEfficiency ?? true;
     this.extensionManagement = params.extensionManagement ?? true;
     this.enableExtensionReloading = params.enableExtensionReloading ?? false;
     this.storage = new Storage(this.targetDir);
@@ -572,8 +545,8 @@ export class Config {
         setGlobalProxy(proxy);
       } catch (error) {
         coreEvents.emitFeedback(
-          'error',
-          'Invalid proxy configuration detected. Check debug drawer for more details (F12)',
+          "error",
+          "Invalid proxy configuration detected. Check debug drawer for more details (F12)",
           error,
         );
       }
@@ -606,7 +579,7 @@ export class Config {
    */
   async initialize(): Promise<void> {
     if (this.initialized) {
-      throw Error('Config was already initialized');
+      throw Error("Config was already initialized");
     }
     this.initialized = true;
 
@@ -621,11 +594,7 @@ export class Config {
     await this.agentRegistry.initialize();
 
     this.toolRegistry = await this.createToolRegistry();
-    this.mcpClientManager = new McpClientManager(
-      this.toolRegistry,
-      this,
-      this.eventEmitter,
-    );
+    this.mcpClientManager = new McpClientManager(this.toolRegistry, this, this.eventEmitter);
     await Promise.all([
       await this.mcpClientManager.startConfiguredMcpServers(),
       await this.getExtensionLoader().start(this),
@@ -640,7 +609,7 @@ export class Config {
     const deprecatedTools = [
       {
         name: READ_MANY_FILES_TOOL_NAME,
-        alternateName: 'ReadManyFilesTool',
+        alternateName: "ReadManyFilesTool",
       },
     ];
 
@@ -649,15 +618,15 @@ export class Config {
       for (const tool of deprecatedTools) {
         if (list.includes(tool.name) || list.includes(tool.alternateName)) {
           coreEvents.emitFeedback(
-            'warning',
+            "warning",
             `The tool '${tool.name}' (or '${tool.alternateName}') specified in '${listName}' is deprecated and will be removed in v0.14.0.`,
           );
         }
       }
     };
 
-    checkList(this.coreTools, 'tools.core');
-    checkList(this.allowedTools, 'tools.allowed');
+    checkList(this.coreTools, "tools.core");
+    checkList(this.allowedTools, "tools.allowed");
   }
 
   getContentGenerator(): ContentGenerator {
@@ -683,10 +652,7 @@ export class Config {
       this.geminiClient.stripThoughtsFromHistory();
     }
 
-    const newContentGeneratorConfig = await createContentGeneratorConfig(
-      this,
-      authMethod,
-    );
+    const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
     this.contentGenerator = await createContentGenerator(
       newContentGeneratorConfig,
       this,
@@ -705,7 +671,7 @@ export class Config {
           this.setExperiments(experiments);
         })
         .catch((e) => {
-          debugLogger.error('Failed to fetch experiments', e);
+          debugLogger.error("Failed to fetch experiments", e);
         });
     } else {
       this.experiments = undefined;
@@ -727,13 +693,10 @@ export class Config {
     if (!this.baseLlmClient) {
       // Handle cases where initialization might be deferred or authentication failed
       if (this.contentGenerator) {
-        this.baseLlmClient = new BaseLlmClient(
-          this.getContentGenerator(),
-          this,
-        );
+        this.baseLlmClient = new BaseLlmClient(this.getContentGenerator(), this);
       } else {
         throw new Error(
-          'BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.',
+          "BaseLlmClient not initialized. Ensure authentication has occurred and ContentGenerator is ready.",
         );
       }
     }
@@ -752,7 +715,7 @@ export class Config {
     return this.loadMemoryFromIncludeDirectories;
   }
 
-  getImportFormat(): 'tree' | 'flat' {
+  getImportFormat(): "tree" | "flat" {
     return this.importFormat;
   }
 
@@ -811,12 +774,12 @@ export class Config {
 
   isRestrictiveSandbox(): boolean {
     const sandboxConfig = this.getSandbox();
-    const seatbeltProfile = process.env['SEATBELT_PROFILE'];
+    const seatbeltProfile = process.env["SEATBELT_PROFILE"];
     return (
       !!sandboxConfig &&
-      sandboxConfig.command === 'sandbox-exec' &&
+      sandboxConfig.command === "sandbox-exec" &&
       !!seatbeltProfile &&
-      seatbeltProfile.startsWith('restrictive-')
+      seatbeltProfile.startsWith("restrictive-")
     );
   }
 
@@ -945,9 +908,7 @@ export class Config {
 
   setApprovalMode(mode: ApprovalMode): void {
     if (!this.isTrustedFolder() && mode !== ApprovalMode.DEFAULT) {
-      throw new Error(
-        'Cannot enable privileged approval modes in an untrusted folder.',
-      );
+      throw new Error("Cannot enable privileged approval modes in an untrusted folder.");
     }
     this.approvalMode = mode;
   }
@@ -976,8 +937,8 @@ export class Config {
     return this.telemetrySettings.otlpEndpoint ?? DEFAULT_OTLP_ENDPOINT;
   }
 
-  getTelemetryOtlpProtocol(): 'grpc' | 'http' {
-    return this.telemetrySettings.otlpProtocol ?? 'grpc';
+  getTelemetryOtlpProtocol(): "grpc" | "http" {
+    return this.telemetrySettings.otlpProtocol ?? "grpc";
   }
 
   getTelemetryTarget(): TelemetryTarget {
@@ -1110,9 +1071,7 @@ export class Config {
     return this.getNoBrowser() || !shouldAttemptBrowserLaunch();
   }
 
-  getSummarizeToolOutputConfig():
-    | Record<string, SummarizeToolOutputSettings>
-    | undefined {
+  getSummarizeToolOutputConfig(): Record<string, SummarizeToolOutputSettings> | undefined {
     return this.summarizeToolOutput;
   }
 
@@ -1176,8 +1135,7 @@ export class Config {
     await this.ensureExperimentsLoaded();
 
     const remoteThreshold =
-      this.experiments?.flags[ExperimentFlags.CONTEXT_COMPRESSION_THRESHOLD]
-        ?.floatValue;
+      this.experiments?.flags[ExperimentFlags.CONTEXT_COMPRESSION_THRESHOLD]?.floatValue;
     if (remoteThreshold === 0) {
       return undefined;
     }
@@ -1197,16 +1155,12 @@ export class Config {
     try {
       await this.experimentsPromise;
     } catch (e) {
-      debugLogger.debug('Failed to fetch experiments', e);
+      debugLogger.debug("Failed to fetch experiments", e);
     }
   }
 
   isInteractiveShellEnabled(): boolean {
-    return (
-      this.interactive &&
-      this.ptyInfo !== 'child_process' &&
-      this.enableInteractiveShell
-    );
+    return this.interactive && this.ptyInfo !== "child_process" && this.enableInteractiveShell;
   }
 
   isInteractive(): boolean {
@@ -1243,10 +1197,8 @@ export class Config {
 
   setShellExecutionConfig(config: ShellExecutionConfig): void {
     this.shellExecutionConfig = {
-      terminalWidth:
-        config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
-      terminalHeight:
-        config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
+      terminalWidth: config.terminalWidth ?? this.shellExecutionConfig.terminalWidth,
+      terminalHeight: config.terminalHeight ?? this.shellExecutionConfig.terminalHeight,
       showColor: config.showColor ?? this.shellExecutionConfig.showColor,
       pager: config.pager ?? this.shellExecutionConfig.pager,
     };
@@ -1266,8 +1218,7 @@ export class Config {
   getTruncateToolOutputThreshold(): number {
     return Math.min(
       // Estimate remaining context window in characters (1 token ~= 4 chars).
-      4 *
-        (tokenLimit(this.model) - uiTelemetryService.getLastPromptTokenCount()),
+      4 * (tokenLimit(this.model) - uiTelemetryService.getLastPromptTokenCount()),
       this.truncateToolOutputThreshold,
     );
   }
@@ -1285,9 +1236,7 @@ export class Config {
   }
 
   getOutputFormat(): OutputFormat {
-    return this.outputSettings?.format
-      ? this.outputSettings.format
-      : OutputFormat.TEXT;
+    return this.outputSettings?.format ? this.outputSettings.format : OutputFormat.TEXT;
   }
 
   getUseModelRouter(): boolean {
@@ -1341,7 +1290,7 @@ export class Config {
       const toolName = ToolClass.Name || className;
       const coreTools = this.getCoreTools();
       // On some platforms, the className can be minified to _ClassName.
-      const normalizedClassName = className.replace(/^_+/, '');
+      const normalizedClassName = className.replace(/^_+/, "");
 
       let isEnabled = true; // Enabled by default if coreTools is not set.
       if (coreTools) {
@@ -1360,9 +1309,7 @@ export class Config {
         // the tool registry.
         const messageBusEnabled = this.getEnableMessageBusIntegration();
 
-        const toolArgs = messageBusEnabled
-          ? [...args, this.getMessageBus()]
-          : args;
+        const toolArgs = messageBusEnabled ? [...args, this.getMessageBus()] : args;
 
         registry.registerTool(new ToolClass(...toolArgs));
       }
@@ -1407,15 +1354,12 @@ export class Config {
 
     // Register Subagents as Tools
     if (this.getCodebaseInvestigatorSettings().enabled) {
-      const definition = this.agentRegistry.getDefinition(
-        'codebase_investigator',
-      );
+      const definition = this.agentRegistry.getDefinition("codebase_investigator");
       if (definition) {
         // We must respect the main allowed/exclude lists for agents too.
         const allowedTools = this.getAllowedTools();
 
-        const isAllowed =
-          !allowedTools || allowedTools.includes(definition.name);
+        const isAllowed = !allowedTools || allowedTools.includes(definition.name);
 
         if (isAllowed) {
           const messageBusEnabled = this.getEnableMessageBusIntegration();
@@ -1458,24 +1402,24 @@ export class Config {
       .map(([name, flag]) => {
         const summary: Record<string, unknown> = { name };
         if (flag.boolValue !== undefined) {
-          summary['boolValue'] = flag.boolValue;
+          summary["boolValue"] = flag.boolValue;
         }
         if (flag.floatValue !== undefined) {
-          summary['floatValue'] = flag.floatValue;
+          summary["floatValue"] = flag.floatValue;
         }
         if (flag.intValue !== undefined) {
-          summary['intValue'] = flag.intValue;
+          summary["intValue"] = flag.intValue;
         }
         if (flag.stringValue !== undefined) {
-          summary['stringValue'] = flag.stringValue;
+          summary["stringValue"] = flag.stringValue;
         }
         const int32Length = flag.int32ListValue?.values?.length ?? 0;
         if (int32Length > 0) {
-          summary['int32ListLength'] = int32Length;
+          summary["int32ListLength"] = int32Length;
         }
         const stringListLength = flag.stringListValue?.values?.length ?? 0;
         if (stringListLength > 0) {
-          summary['stringListLength'] = stringListLength;
+          summary["stringListLength"] = stringListLength;
         }
         return summary;
       });
@@ -1490,7 +1434,7 @@ export class Config {
       breakLength: 80,
       compact: false,
     });
-    debugLogger.debug('Experiments loaded', summaryString);
+    debugLogger.debug("Experiments loaded", summaryString);
   }
 }
 // Export model constants for use in CLI
diff --git a/packages/gemini-core/src/config/defaultModelConfigs.ts b/packages/gemini-core/src/config/defaultModelConfigs.ts
index b2f96b598..41939be91 100644
--- a/packages/gemini-core/src/config/defaultModelConfigs.ts
+++ b/packages/gemini-core/src/config/defaultModelConfigs.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ModelConfigServiceConfig } from '../services/modelConfigService.js';
+import type { ModelConfigServiceConfig } from "../services/modelConfigService.js";
 
 // The default model configs. We use `base` as the parent for all of our model
 // configs, while `chat-base`, a child of `base`, is the parent of the models
@@ -19,8 +19,8 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'chat-base': {
-      extends: 'base',
+    "chat-base": {
+      extends: "base",
       modelConfig: {
         generateContentConfig: {
           thinkingConfig: {
@@ -35,35 +35,35 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
     // ensure these model configs can be used interactively.
     // TODO(joshualitt): Introduce internal base configs for the various models,
     // note: we will have to think carefully about names.
-    'gemini-2.5-pro': {
-      extends: 'chat-base',
+    "gemini-2.5-pro": {
+      extends: "chat-base",
       modelConfig: {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
       },
     },
-    'gemini-2.5-flash': {
-      extends: 'chat-base',
+    "gemini-2.5-flash": {
+      extends: "chat-base",
       modelConfig: {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
       },
     },
-    'gemini-2.5-flash-lite': {
-      extends: 'chat-base',
+    "gemini-2.5-flash-lite": {
+      extends: "chat-base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
       },
     },
     // Bases for the internal model configs.
-    'gemini-2.5-flash-base': {
-      extends: 'base',
+    "gemini-2.5-flash-base": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
       },
     },
     classifier: {
-      extends: 'base',
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           maxOutputTokens: 1024,
           thinkingConfig: {
@@ -72,10 +72,10 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'prompt-completion': {
-      extends: 'base',
+    "prompt-completion": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           temperature: 0.3,
           maxOutputTokens: 16000,
@@ -85,10 +85,10 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'edit-corrector': {
-      extends: 'base',
+    "edit-corrector": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           thinkingConfig: {
             thinkingBudget: 0,
@@ -96,34 +96,34 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
         },
       },
     },
-    'summarizer-default': {
-      extends: 'base',
+    "summarizer-default": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           maxOutputTokens: 2000,
         },
       },
     },
-    'summarizer-shell': {
-      extends: 'base',
+    "summarizer-shell": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-flash-lite',
+        model: "gemini-2.5-flash-lite",
         generateContentConfig: {
           maxOutputTokens: 2000,
         },
       },
     },
-    'web-search': {
-      extends: 'gemini-2.5-flash-base',
+    "web-search": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {
         generateContentConfig: {
           tools: [{ googleSearch: {} }],
         },
       },
     },
-    'web-fetch': {
-      extends: 'gemini-2.5-flash-base',
+    "web-fetch": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {
         generateContentConfig: {
           tools: [{ urlContext: {} }],
@@ -131,26 +131,26 @@ export const DEFAULT_MODEL_CONFIGS: ModelConfigServiceConfig = {
       },
     },
     // TODO(joshualitt): During cleanup, make modelConfig optional.
-    'web-fetch-fallback': {
-      extends: 'gemini-2.5-flash-base',
+    "web-fetch-fallback": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
-    'loop-detection': {
-      extends: 'gemini-2.5-flash-base',
+    "loop-detection": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
-    'loop-detection-double-check': {
-      extends: 'base',
+    "loop-detection-double-check": {
+      extends: "base",
       modelConfig: {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
       },
     },
-    'llm-edit-fixer': {
-      extends: 'gemini-2.5-flash-base',
+    "llm-edit-fixer": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
-    'next-speaker-checker': {
-      extends: 'gemini-2.5-flash-base',
+    "next-speaker-checker": {
+      extends: "gemini-2.5-flash-base",
       modelConfig: {},
     },
   },
diff --git a/packages/gemini-core/src/config/flashFallback.test.ts b/packages/gemini-core/src/config/flashFallback.test.ts
index 5665a7e00..3a500ddd7 100644
--- a/packages/gemini-core/src/config/flashFallback.test.ts
+++ b/packages/gemini-core/src/config/flashFallback.test.ts
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { Config } from './config.js';
-import { DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL } from './models.js';
+import fs from "node:fs";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "./config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL } from "./models.js";
 
-import fs from 'node:fs';
+vi.mock("node:fs");
 
-vi.mock('node:fs');
-
-describe('Flash Model Fallback Configuration', () => {
+describe("Flash Model Fallback Configuration", () => {
   let config: Config;
 
   beforeEach(() => {
@@ -21,19 +20,17 @@ describe('Flash Model Fallback Configuration', () => {
       isDirectory: () => true,
     } as fs.Stats);
     config = new Config({
-      sessionId: 'test-session',
-      targetDir: '/test',
+      sessionId: "test-session",
+      targetDir: "/test",
       debugMode: false,
-      cwd: '/test',
+      cwd: "/test",
       model: DEFAULT_GEMINI_MODEL,
     });
 
     // Initialize contentGeneratorConfig for testing
-    (
-      config as unknown as { contentGeneratorConfig: unknown }
-    ).contentGeneratorConfig = {
+    (config as unknown as { contentGeneratorConfig: unknown }).contentGeneratorConfig = {
       model: DEFAULT_GEMINI_MODEL,
-      authType: 'oauth-personal',
+      authType: "oauth-personal",
     };
   });
 
@@ -41,14 +38,14 @@ describe('Flash Model Fallback Configuration', () => {
   // when setFallbackMode is marked as true. This is to decouple setting a model
   // with the fallback mechanism. This will be necessary we introduce more
   // intelligent model routing.
-  describe('setModel', () => {
-    it('should only mark as switched if contentGeneratorConfig exists', () => {
+  describe("setModel", () => {
+    it("should only mark as switched if contentGeneratorConfig exists", () => {
       // Create config without initializing contentGeneratorConfig
       const newConfig = new Config({
-        sessionId: 'test-session-2',
-        targetDir: '/test',
+        sessionId: "test-session-2",
+        targetDir: "/test",
         debugMode: false,
-        cwd: '/test',
+        cwd: "/test",
         model: DEFAULT_GEMINI_MODEL,
       });
 
@@ -58,38 +55,38 @@ describe('Flash Model Fallback Configuration', () => {
     });
   });
 
-  describe('getModel', () => {
-    it('should return contentGeneratorConfig model if available', () => {
+  describe("getModel", () => {
+    it("should return contentGeneratorConfig model if available", () => {
       // Simulate initialized content generator config
       config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
       expect(config.getModel()).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should fall back to initial model if contentGeneratorConfig is not available', () => {
+    it("should fall back to initial model if contentGeneratorConfig is not available", () => {
       // Test with fresh config where contentGeneratorConfig might not be set
       const newConfig = new Config({
-        sessionId: 'test-session-2',
-        targetDir: '/test',
+        sessionId: "test-session-2",
+        targetDir: "/test",
         debugMode: false,
-        cwd: '/test',
-        model: 'custom-model',
+        cwd: "/test",
+        model: "custom-model",
       });
 
-      expect(newConfig.getModel()).toBe('custom-model');
+      expect(newConfig.getModel()).toBe("custom-model");
     });
   });
 
-  describe('isInFallbackMode', () => {
-    it('should start as false for new session', () => {
+  describe("isInFallbackMode", () => {
+    it("should start as false for new session", () => {
       expect(config.isInFallbackMode()).toBe(false);
     });
 
-    it('should remain false if no model switch occurs', () => {
+    it("should remain false if no model switch occurs", () => {
       // Perform other operations that don't involve model switching
       expect(config.isInFallbackMode()).toBe(false);
     });
 
-    it('should persist switched state throughout session', () => {
+    it("should persist switched state throughout session", () => {
       config.setModel(DEFAULT_GEMINI_FLASH_MODEL);
       // Setting state for fallback mode as is expected of clients
       config.setFallbackMode(true);
diff --git a/packages/gemini-core/src/config/models.test.ts b/packages/gemini-core/src/config/models.test.ts
index 8c790dd1a..1255956c6 100644
--- a/packages/gemini-core/src/config/models.test.ts
+++ b/packages/gemini-core/src/config/models.test.ts
@@ -4,78 +4,66 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
-  getEffectiveModel,
-  DEFAULT_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
-} from './models.js';
+  DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_MODEL,
+  getEffectiveModel,
+} from "./models.js";
 
-describe('getEffectiveModel', () => {
-  describe('When NOT in fallback mode', () => {
+describe("getEffectiveModel", () => {
+  describe("When NOT in fallback mode", () => {
     const isInFallbackMode = false;
 
-    it('should return the Pro model when Pro is requested', () => {
+    it("should return the Pro model when Pro is requested", () => {
       const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_MODEL);
       expect(model).toBe(DEFAULT_GEMINI_MODEL);
     });
 
-    it('should return the Flash model when Flash is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_MODEL,
-      );
+    it("should return the Flash model when Flash is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_MODEL);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should return the Lite model when Lite is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_LITE_MODEL,
-      );
+    it("should return the Lite model when Lite is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_LITE_MODEL);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
     });
 
-    it('should return a custom model name when requested', () => {
-      const customModel = 'custom-model-v1';
+    it("should return a custom model name when requested", () => {
+      const customModel = "custom-model-v1";
       const model = getEffectiveModel(isInFallbackMode, customModel);
       expect(model).toBe(customModel);
     });
   });
 
-  describe('When IN fallback mode', () => {
+  describe("When IN fallback mode", () => {
     const isInFallbackMode = true;
 
-    it('should downgrade the Pro model to the Flash model', () => {
+    it("should downgrade the Pro model to the Flash model", () => {
       const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_MODEL);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should return the Flash model when Flash is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_MODEL,
-      );
+    it("should return the Flash model when Flash is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_MODEL);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
 
-    it('should HONOR the Lite model when Lite is requested', () => {
-      const model = getEffectiveModel(
-        isInFallbackMode,
-        DEFAULT_GEMINI_FLASH_LITE_MODEL,
-      );
+    it("should HONOR the Lite model when Lite is requested", () => {
+      const model = getEffectiveModel(isInFallbackMode, DEFAULT_GEMINI_FLASH_LITE_MODEL);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
     });
 
     it('should HONOR any model with "lite" in its name', () => {
-      const customLiteModel = 'gemini-2.5-custom-lite-vNext';
+      const customLiteModel = "gemini-2.5-custom-lite-vNext";
       const model = getEffectiveModel(isInFallbackMode, customLiteModel);
       expect(model).toBe(customLiteModel);
     });
 
-    it('should downgrade any other custom model to the Flash model', () => {
-      const customModel = 'custom-model-v1-unlisted';
+    it("should downgrade any other custom model to the Flash model", () => {
+      const customModel = "custom-model-v1-unlisted";
       const model = getEffectiveModel(isInFallbackMode, customModel);
       expect(model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
     });
diff --git a/packages/gemini-core/src/config/models.ts b/packages/gemini-core/src/config/models.ts
index 9add9fa73..c90a488c1 100644
--- a/packages/gemini-core/src/config/models.ts
+++ b/packages/gemini-core/src/config/models.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const DEFAULT_GEMINI_MODEL = 'gemini-2.5-pro';
-export const DEFAULT_GEMINI_FLASH_MODEL = 'gemini-2.5-flash';
-export const DEFAULT_GEMINI_FLASH_LITE_MODEL = 'gemini-2.5-flash-lite';
+export const DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
+export const DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
+export const DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
 
-export const DEFAULT_GEMINI_MODEL_AUTO = 'auto';
+export const DEFAULT_GEMINI_MODEL_AUTO = "auto";
 
-export const DEFAULT_GEMINI_EMBEDDING_MODEL = 'gemini-embedding-001';
+export const DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
 
 // Cap the thinking at 8192 to prevent run-away thinking loops.
 export const DEFAULT_THINKING_MODE = 8192;
@@ -28,10 +28,7 @@ export const DEFAULT_THINKING_MODE = 8192;
  * @param requestedModel The model that was originally requested.
  * @returns The effective model name.
  */
-export function getEffectiveModel(
-  isInFallbackMode: boolean,
-  requestedModel: string,
-): string {
+export function getEffectiveModel(isInFallbackMode: boolean, requestedModel: string): string {
   // If we are not in fallback mode, simply use the requested model.
   if (!isInFallbackMode) {
     return requestedModel;
@@ -39,7 +36,7 @@ export function getEffectiveModel(
 
   // If a "lite" model is requested, honor it. This allows for variations of
   // lite models without needing to list them all as constants.
-  if (requestedModel.includes('lite')) {
+  if (requestedModel.includes("lite")) {
     return requestedModel;
   }
 
diff --git a/packages/gemini-core/src/config/storage.test.ts b/packages/gemini-core/src/config/storage.test.ts
index 075eb9fb1..7f7f2615c 100644
--- a/packages/gemini-core/src/config/storage.test.ts
+++ b/packages/gemini-core/src/config/storage.test.ts
@@ -4,58 +4,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as os from "node:os";
+import * as path from "node:path";
+import { describe, expect, it, vi } from "vitest";
 
-vi.mock('fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs')>();
+vi.mock("fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("fs")>();
   return {
     ...actual,
     mkdirSync: vi.fn(),
   };
 });
 
-import { Storage } from './storage.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+import { GEMINI_DIR } from "../utils/paths.js";
+import { Storage } from "./storage.js";
 
-describe('Storage – getGlobalSettingsPath', () => {
-  it('returns path to ~/.gemini/settings.json', () => {
-    const expected = path.join(os.homedir(), GEMINI_DIR, 'settings.json');
+describe("Storage – getGlobalSettingsPath", () => {
+  it("returns path to ~/.gemini/settings.json", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "settings.json");
     expect(Storage.getGlobalSettingsPath()).toBe(expected);
   });
 });
 
-describe('Storage – additional helpers', () => {
-  const projectRoot = '/tmp/project';
+describe("Storage – additional helpers", () => {
+  const projectRoot = "/tmp/project";
   const storage = new Storage(projectRoot);
 
-  it('getWorkspaceSettingsPath returns project/.gemini/settings.json', () => {
-    const expected = path.join(projectRoot, GEMINI_DIR, 'settings.json');
+  it("getWorkspaceSettingsPath returns project/.gemini/settings.json", () => {
+    const expected = path.join(projectRoot, GEMINI_DIR, "settings.json");
     expect(storage.getWorkspaceSettingsPath()).toBe(expected);
   });
 
-  it('getUserCommandsDir returns ~/.gemini/commands', () => {
-    const expected = path.join(os.homedir(), GEMINI_DIR, 'commands');
+  it("getUserCommandsDir returns ~/.gemini/commands", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "commands");
     expect(Storage.getUserCommandsDir()).toBe(expected);
   });
 
-  it('getProjectCommandsDir returns project/.gemini/commands', () => {
-    const expected = path.join(projectRoot, GEMINI_DIR, 'commands');
+  it("getProjectCommandsDir returns project/.gemini/commands", () => {
+    const expected = path.join(projectRoot, GEMINI_DIR, "commands");
     expect(storage.getProjectCommandsDir()).toBe(expected);
   });
 
-  it('getMcpOAuthTokensPath returns ~/.gemini/mcp-oauth-tokens.json', () => {
-    const expected = path.join(
-      os.homedir(),
-      GEMINI_DIR,
-      'mcp-oauth-tokens.json',
-    );
+  it("getMcpOAuthTokensPath returns ~/.gemini/mcp-oauth-tokens.json", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "mcp-oauth-tokens.json");
     expect(Storage.getMcpOAuthTokensPath()).toBe(expected);
   });
 
-  it('getGlobalBinDir returns ~/.gemini/tmp/bin', () => {
-    const expected = path.join(os.homedir(), GEMINI_DIR, 'tmp', 'bin');
+  it("getGlobalBinDir returns ~/.gemini/tmp/bin", () => {
+    const expected = path.join(os.homedir(), GEMINI_DIR, "tmp", "bin");
     expect(Storage.getGlobalBinDir()).toBe(expected);
   });
 });
diff --git a/packages/gemini-core/src/config/storage.ts b/packages/gemini-core/src/config/storage.ts
index a98030c49..144f7cc1d 100644
--- a/packages/gemini-core/src/config/storage.ts
+++ b/packages/gemini-core/src/config/storage.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import * as os from 'node:os';
-import * as crypto from 'node:crypto';
-import * as fs from 'node:fs';
-import { GEMINI_DIR } from '../utils/paths.js';
+import * as crypto from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { GEMINI_DIR } from "../utils/paths.js";
 
-export const GOOGLE_ACCOUNTS_FILENAME = 'google_accounts.json';
-export const OAUTH_FILE = 'oauth_creds.json';
-const TMP_DIR_NAME = 'tmp';
-const BIN_DIR_NAME = 'bin';
+export const GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
+export const OAUTH_FILE = "oauth_creds.json";
+const TMP_DIR_NAME = "tmp";
+const BIN_DIR_NAME = "bin";
 
 export class Storage {
   private readonly targetDir: string;
@@ -31,15 +31,15 @@ export class Storage {
   }
 
   static getMcpOAuthTokensPath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'mcp-oauth-tokens.json');
+    return path.join(Storage.getGlobalGeminiDir(), "mcp-oauth-tokens.json");
   }
 
   static getGlobalSettingsPath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'settings.json');
+    return path.join(Storage.getGlobalGeminiDir(), "settings.json");
   }
 
   static getInstallationIdPath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'installation_id');
+    return path.join(Storage.getGlobalGeminiDir(), "installation_id");
   }
 
   static getGoogleAccountsPath(): string {
@@ -47,32 +47,32 @@ export class Storage {
   }
 
   static getUserCommandsDir(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'commands');
+    return path.join(Storage.getGlobalGeminiDir(), "commands");
   }
 
   static getGlobalMemoryFilePath(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'memory.md');
+    return path.join(Storage.getGlobalGeminiDir(), "memory.md");
   }
 
   static getUserPoliciesDir(): string {
-    return path.join(Storage.getGlobalGeminiDir(), 'policies');
+    return path.join(Storage.getGlobalGeminiDir(), "policies");
   }
 
   static getSystemSettingsPath(): string {
-    if (process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH']) {
-      return process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
+    if (process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"]) {
+      return process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"];
     }
-    if (os.platform() === 'darwin') {
-      return '/Library/Application Support/GeminiCli/settings.json';
-    } else if (os.platform() === 'win32') {
-      return 'C:\\ProgramData\\gemini-cli\\settings.json';
+    if (os.platform() === "darwin") {
+      return "/Library/Application Support/GeminiCli/settings.json";
+    } else if (os.platform() === "win32") {
+      return "C:\\ProgramData\\gemini-cli\\settings.json";
     } else {
-      return '/etc/gemini-cli/settings.json';
+      return "/etc/gemini-cli/settings.json";
     }
   }
 
   static getSystemPoliciesDir(): string {
-    return path.join(path.dirname(Storage.getSystemSettingsPath()), 'policies');
+    return path.join(path.dirname(Storage.getSystemSettingsPath()), "policies");
   }
 
   static getGlobalTempDir(): string {
@@ -106,36 +106,36 @@ export class Storage {
   }
 
   private getFilePathHash(filePath: string): string {
-    return crypto.createHash('sha256').update(filePath).digest('hex');
+    return crypto.createHash("sha256").update(filePath).digest("hex");
   }
 
   getHistoryDir(): string {
     const hash = this.getFilePathHash(this.getProjectRoot());
-    const historyDir = path.join(Storage.getGlobalGeminiDir(), 'history');
+    const historyDir = path.join(Storage.getGlobalGeminiDir(), "history");
     return path.join(historyDir, hash);
   }
 
   getWorkspaceSettingsPath(): string {
-    return path.join(this.getGeminiDir(), 'settings.json');
+    return path.join(this.getGeminiDir(), "settings.json");
   }
 
   getProjectCommandsDir(): string {
-    return path.join(this.getGeminiDir(), 'commands');
+    return path.join(this.getGeminiDir(), "commands");
   }
 
   getProjectTempCheckpointsDir(): string {
-    return path.join(this.getProjectTempDir(), 'checkpoints');
+    return path.join(this.getProjectTempDir(), "checkpoints");
   }
 
   getExtensionsDir(): string {
-    return path.join(this.getGeminiDir(), 'extensions');
+    return path.join(this.getGeminiDir(), "extensions");
   }
 
   getExtensionsConfigPath(): string {
-    return path.join(this.getExtensionsDir(), 'gemini-extension.json');
+    return path.join(this.getExtensionsDir(), "gemini-extension.json");
   }
 
   getHistoryFilePath(): string {
-    return path.join(this.getProjectTempDir(), 'shell_history');
+    return path.join(this.getProjectTempDir(), "shell_history");
   }
 }
diff --git a/packages/gemini-core/src/confirmation-bus/index.ts b/packages/gemini-core/src/confirmation-bus/index.ts
index 379d9aa4d..2130cd553 100644
--- a/packages/gemini-core/src/confirmation-bus/index.ts
+++ b/packages/gemini-core/src/confirmation-bus/index.ts
@@ -4,5 +4,5 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './message-bus.js';
-export * from './types.js';
+export * from "./message-bus.js";
+export * from "./types.js";
diff --git a/packages/gemini-core/src/confirmation-bus/message-bus.test.ts b/packages/gemini-core/src/confirmation-bus/message-bus.test.ts
index 8156671c9..c52fc4b9e 100644
--- a/packages/gemini-core/src/confirmation-bus/message-bus.test.ts
+++ b/packages/gemini-core/src/confirmation-bus/message-bus.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { MessageBus } from './message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import { PolicyDecision } from '../policy/types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import { PolicyDecision } from "../policy/types.js";
+import { MessageBus } from "./message-bus.js";
 import {
   MessageBusType,
   type ToolConfirmationRequest,
   type ToolConfirmationResponse,
-  type ToolPolicyRejection,
   type ToolExecutionSuccess,
-} from './types.js';
+  type ToolPolicyRejection,
+} from "./types.js";
 
-describe('MessageBus', () => {
+describe("MessageBus", () => {
   let messageBus: MessageBus;
   let policyEngine: PolicyEngine;
 
@@ -25,108 +25,96 @@ describe('MessageBus', () => {
     messageBus = new MessageBus(policyEngine);
   });
 
-  describe('publish', () => {
-    it('should emit error for invalid message', () => {
+  describe("publish", () => {
+    it("should emit error for invalid message", () => {
       const errorHandler = vi.fn();
-      messageBus.on('error', errorHandler);
+      messageBus.on("error", errorHandler);
 
       // @ts-expect-error - Testing invalid message
-      messageBus.publish({ invalid: 'message' });
+      messageBus.publish({ invalid: "message" });
 
       expect(errorHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          message: expect.stringContaining('Invalid message structure'),
+          message: expect.stringContaining("Invalid message structure"),
         }),
       );
     });
 
-    it('should validate tool confirmation requests have correlationId', () => {
+    it("should validate tool confirmation requests have correlationId", () => {
       const errorHandler = vi.fn();
-      messageBus.on('error', errorHandler);
+      messageBus.on("error", errorHandler);
 
       // @ts-expect-error - Testing missing correlationId
       messageBus.publish({
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test' },
+        toolCall: { name: "test" },
       });
 
       expect(errorHandler).toHaveBeenCalled();
     });
 
-    it('should emit confirmation response when policy allows', () => {
-      vi.spyOn(policyEngine, 'check').mockReturnValue(PolicyDecision.ALLOW);
+    it("should emit confirmation response when policy allows", () => {
+      vi.spyOn(policyEngine, "check").mockReturnValue(PolicyDecision.ALLOW);
 
       const responseHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        responseHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool', args: {} },
-        correlationId: '123',
+        toolCall: { name: "test-tool", args: {} },
+        correlationId: "123",
       };
 
       messageBus.publish(request);
 
       const expectedResponse: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: '123',
+        correlationId: "123",
         confirmed: true,
       };
       expect(responseHandler).toHaveBeenCalledWith(expectedResponse);
     });
 
-    it('should emit rejection and response when policy denies', () => {
-      vi.spyOn(policyEngine, 'check').mockReturnValue(PolicyDecision.DENY);
+    it("should emit rejection and response when policy denies", () => {
+      vi.spyOn(policyEngine, "check").mockReturnValue(PolicyDecision.DENY);
 
       const responseHandler = vi.fn();
       const rejectionHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        responseHandler,
-      );
-      messageBus.subscribe(
-        MessageBusType.TOOL_POLICY_REJECTION,
-        rejectionHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
+      messageBus.subscribe(MessageBusType.TOOL_POLICY_REJECTION, rejectionHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool', args: {} },
-        correlationId: '123',
+        toolCall: { name: "test-tool", args: {} },
+        correlationId: "123",
       };
 
       messageBus.publish(request);
 
       const expectedRejection: ToolPolicyRejection = {
         type: MessageBusType.TOOL_POLICY_REJECTION,
-        toolCall: { name: 'test-tool', args: {} },
+        toolCall: { name: "test-tool", args: {} },
       };
       expect(rejectionHandler).toHaveBeenCalledWith(expectedRejection);
 
       const expectedResponse: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: '123',
+        correlationId: "123",
         confirmed: false,
       };
       expect(responseHandler).toHaveBeenCalledWith(expectedResponse);
     });
 
-    it('should pass through to UI when policy says ASK_USER', () => {
-      vi.spyOn(policyEngine, 'check').mockReturnValue(PolicyDecision.ASK_USER);
+    it("should pass through to UI when policy says ASK_USER", () => {
+      vi.spyOn(policyEngine, "check").mockReturnValue(PolicyDecision.ASK_USER);
 
       const requestHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        requestHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, requestHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool', args: {} },
-        correlationId: '123',
+        toolCall: { name: "test-tool", args: {} },
+        correlationId: "123",
       };
 
       messageBus.publish(request);
@@ -134,17 +122,14 @@ describe('MessageBus', () => {
       expect(requestHandler).toHaveBeenCalledWith(request);
     });
 
-    it('should emit other message types directly', () => {
+    it("should emit other message types directly", () => {
       const successHandler = vi.fn();
-      messageBus.subscribe(
-        MessageBusType.TOOL_EXECUTION_SUCCESS,
-        successHandler,
-      );
+      messageBus.subscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, successHandler);
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test-tool' },
-        result: 'success',
+        toolCall: { name: "test-tool" },
+        result: "success",
       };
 
       messageBus.publish(message);
@@ -153,15 +138,15 @@ describe('MessageBus', () => {
     });
   });
 
-  describe('subscribe/unsubscribe', () => {
-    it('should allow subscribing to specific message types', () => {
+  describe("subscribe/unsubscribe", () => {
+    it("should allow subscribing to specific message types", () => {
       const handler = vi.fn();
       messageBus.subscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, handler);
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test' },
-        result: 'test',
+        toolCall: { name: "test" },
+        result: "test",
       };
 
       messageBus.publish(message);
@@ -169,15 +154,15 @@ describe('MessageBus', () => {
       expect(handler).toHaveBeenCalledWith(message);
     });
 
-    it('should allow unsubscribing from message types', () => {
+    it("should allow unsubscribing from message types", () => {
       const handler = vi.fn();
       messageBus.subscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, handler);
       messageBus.unsubscribe(MessageBusType.TOOL_EXECUTION_SUCCESS, handler);
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test' },
-        result: 'test',
+        toolCall: { name: "test" },
+        result: "test",
       };
 
       messageBus.publish(message);
@@ -185,7 +170,7 @@ describe('MessageBus', () => {
       expect(handler).not.toHaveBeenCalled();
     });
 
-    it('should support multiple subscribers for the same message type', () => {
+    it("should support multiple subscribers for the same message type", () => {
       const handler1 = vi.fn();
       const handler2 = vi.fn();
 
@@ -194,8 +179,8 @@ describe('MessageBus', () => {
 
       const message: ToolExecutionSuccess<string> = {
         type: MessageBusType.TOOL_EXECUTION_SUCCESS as const,
-        toolCall: { name: 'test' },
-        result: 'test',
+        toolCall: { name: "test" },
+        result: "test",
       };
 
       messageBus.publish(message);
@@ -205,20 +190,20 @@ describe('MessageBus', () => {
     });
   });
 
-  describe('error handling', () => {
-    it('should not crash on errors during message processing', () => {
+  describe("error handling", () => {
+    it("should not crash on errors during message processing", () => {
       const errorHandler = vi.fn();
-      messageBus.on('error', errorHandler);
+      messageBus.on("error", errorHandler);
 
       // Mock policyEngine to throw an error
-      vi.spyOn(policyEngine, 'check').mockImplementation(() => {
-        throw new Error('Policy check failed');
+      vi.spyOn(policyEngine, "check").mockImplementation(() => {
+        throw new Error("Policy check failed");
       });
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
-        toolCall: { name: 'test-tool' },
-        correlationId: '123',
+        toolCall: { name: "test-tool" },
+        correlationId: "123",
       };
 
       // Should not throw
@@ -227,7 +212,7 @@ describe('MessageBus', () => {
       // Should emit error
       expect(errorHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          message: 'Policy check failed',
+          message: "Policy check failed",
         }),
       );
     });
diff --git a/packages/gemini-core/src/confirmation-bus/message-bus.ts b/packages/gemini-core/src/confirmation-bus/message-bus.ts
index cd293a72a..c2a024d12 100644
--- a/packages/gemini-core/src/confirmation-bus/message-bus.ts
+++ b/packages/gemini-core/src/confirmation-bus/message-bus.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
-import type { PolicyEngine } from '../policy/policy-engine.js';
-import { PolicyDecision } from '../policy/types.js';
-import { MessageBusType, type Message } from './types.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+import { EventEmitter } from "node:events";
+import type { PolicyEngine } from "../policy/policy-engine.js";
+import { PolicyDecision } from "../policy/types.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { type Message, MessageBusType } from "./types.js";
 
 export class MessageBus extends EventEmitter {
   constructor(
@@ -26,7 +26,7 @@ export class MessageBus extends EventEmitter {
 
     if (
       message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST &&
-      !('correlationId' in message)
+      !("correlationId" in message)
     ) {
       return false;
     }
@@ -44,16 +44,11 @@ export class MessageBus extends EventEmitter {
     }
     try {
       if (!this.isValidMessage(message)) {
-        throw new Error(
-          `Invalid message structure: ${safeJsonStringify(message)}`,
-        );
+        throw new Error(`Invalid message structure: ${safeJsonStringify(message)}`);
       }
 
       if (message.type === MessageBusType.TOOL_CONFIRMATION_REQUEST) {
-        const decision = this.policyEngine.check(
-          message.toolCall,
-          message.serverName,
-        );
+        const decision = this.policyEngine.check(message.toolCall, message.serverName);
 
         switch (decision) {
           case PolicyDecision.ALLOW:
@@ -88,21 +83,15 @@ export class MessageBus extends EventEmitter {
         this.emitMessage(message);
       }
     } catch (error) {
-      this.emit('error', error);
+      this.emit("error", error);
     }
   }
 
-  subscribe<T extends Message>(
-    type: T['type'],
-    listener: (message: T) => void,
-  ): void {
+  subscribe<T extends Message>(type: T["type"], listener: (message: T) => void): void {
     this.on(type, listener);
   }
 
-  unsubscribe<T extends Message>(
-    type: T['type'],
-    listener: (message: T) => void,
-  ): void {
+  unsubscribe<T extends Message>(type: T["type"], listener: (message: T) => void): void {
     this.off(type, listener);
   }
 }
diff --git a/packages/gemini-core/src/confirmation-bus/types.ts b/packages/gemini-core/src/confirmation-bus/types.ts
index 52d7bd2e9..72089483f 100644
--- a/packages/gemini-core/src/confirmation-bus/types.ts
+++ b/packages/gemini-core/src/confirmation-bus/types.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type FunctionCall } from '@google/genai';
+import { type FunctionCall } from "@google/genai";
 
 export enum MessageBusType {
-  TOOL_CONFIRMATION_REQUEST = 'tool-confirmation-request',
-  TOOL_CONFIRMATION_RESPONSE = 'tool-confirmation-response',
-  TOOL_POLICY_REJECTION = 'tool-policy-rejection',
-  TOOL_EXECUTION_SUCCESS = 'tool-execution-success',
-  TOOL_EXECUTION_FAILURE = 'tool-execution-failure',
-  UPDATE_POLICY = 'update-policy',
+  TOOL_CONFIRMATION_REQUEST = "tool-confirmation-request",
+  TOOL_CONFIRMATION_RESPONSE = "tool-confirmation-response",
+  TOOL_POLICY_REJECTION = "tool-policy-rejection",
+  TOOL_EXECUTION_SUCCESS = "tool-execution-success",
+  TOOL_EXECUTION_FAILURE = "tool-execution-failure",
+  UPDATE_POLICY = "update-policy",
 }
 
 export interface ToolConfirmationRequest {
diff --git a/packages/gemini-core/src/core/apiKeyCredentialStorage.test.ts b/packages/gemini-core/src/core/apiKeyCredentialStorage.test.ts
index b0b0551f4..792e88c42 100644
--- a/packages/gemini-core/src/core/apiKeyCredentialStorage.test.ts
+++ b/packages/gemini-core/src/core/apiKeyCredentialStorage.test.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import {
-  loadApiKey,
-  saveApiKey,
-  clearApiKey,
-} from './apiKeyCredentialStorage.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { clearApiKey, loadApiKey, saveApiKey } from "./apiKeyCredentialStorage.js";
 
 const getCredentialsMock = vi.hoisted(() => vi.fn());
 const setCredentialsMock = vi.hoisted(() => vi.fn());
 const deleteCredentialsMock = vi.hoisted(() => vi.fn());
 
-vi.mock('../mcp/token-storage/hybrid-token-storage.js', () => ({
+vi.mock("../mcp/token-storage/hybrid-token-storage.js", () => ({
   HybridTokenStorage: vi.fn().mockImplementation(() => ({
     getCredentials: getCredentialsMock,
     setCredentials: setCredentialsMock,
@@ -23,66 +19,66 @@ vi.mock('../mcp/token-storage/hybrid-token-storage.js', () => ({
   })),
 }));
 
-describe('ApiKeyCredentialStorage', () => {
+describe("ApiKeyCredentialStorage", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should load an API key', async () => {
+  it("should load an API key", async () => {
     getCredentialsMock.mockResolvedValue({
-      serverName: 'default-api-key',
+      serverName: "default-api-key",
       token: {
-        accessToken: 'test-key',
-        tokenType: 'ApiKey',
+        accessToken: "test-key",
+        tokenType: "ApiKey",
       },
       updatedAt: Date.now(),
     });
 
     const apiKey = await loadApiKey();
-    expect(apiKey).toBe('test-key');
-    expect(getCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(apiKey).toBe("test-key");
+    expect(getCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 
-  it('should return null if no API key is stored', async () => {
+  it("should return null if no API key is stored", async () => {
     getCredentialsMock.mockResolvedValue(null);
     const apiKey = await loadApiKey();
     expect(apiKey).toBeNull();
-    expect(getCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(getCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 
-  it('should save an API key', async () => {
-    await saveApiKey('new-key');
+  it("should save an API key", async () => {
+    await saveApiKey("new-key");
     expect(setCredentialsMock).toHaveBeenCalledWith(
       expect.objectContaining({
-        serverName: 'default-api-key',
+        serverName: "default-api-key",
         token: expect.objectContaining({
-          accessToken: 'new-key',
-          tokenType: 'ApiKey',
+          accessToken: "new-key",
+          tokenType: "ApiKey",
         }),
       }),
     );
   });
 
-  it('should clear an API key when saving empty key', async () => {
-    await saveApiKey('');
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+  it("should clear an API key when saving empty key", async () => {
+    await saveApiKey("");
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
     expect(setCredentialsMock).not.toHaveBeenCalled();
   });
 
-  it('should clear an API key when saving null key', async () => {
+  it("should clear an API key when saving null key", async () => {
     await saveApiKey(null);
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
     expect(setCredentialsMock).not.toHaveBeenCalled();
   });
 
-  it('should clear an API key', async () => {
+  it("should clear an API key", async () => {
     await clearApiKey();
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 
-  it('should not throw when clearing an API key fails', async () => {
-    deleteCredentialsMock.mockRejectedValueOnce(new Error('Failed to delete'));
-    await expect(saveApiKey('')).resolves.not.toThrow();
-    expect(deleteCredentialsMock).toHaveBeenCalledWith('default-api-key');
+  it("should not throw when clearing an API key fails", async () => {
+    deleteCredentialsMock.mockRejectedValueOnce(new Error("Failed to delete"));
+    await expect(saveApiKey("")).resolves.not.toThrow();
+    expect(deleteCredentialsMock).toHaveBeenCalledWith("default-api-key");
   });
 });
diff --git a/packages/gemini-core/src/core/apiKeyCredentialStorage.ts b/packages/gemini-core/src/core/apiKeyCredentialStorage.ts
index 4836ba075..24a3c3cbb 100644
--- a/packages/gemini-core/src/core/apiKeyCredentialStorage.ts
+++ b/packages/gemini-core/src/core/apiKeyCredentialStorage.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { HybridTokenStorage } from '../mcp/token-storage/hybrid-token-storage.js';
-import type { OAuthCredentials } from '../mcp/token-storage/types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { HybridTokenStorage } from "../mcp/token-storage/hybrid-token-storage.js";
+import type { OAuthCredentials } from "../mcp/token-storage/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
 
-const KEYCHAIN_SERVICE_NAME = 'gemini-cli-api-key';
-const DEFAULT_API_KEY_ENTRY = 'default-api-key';
+const KEYCHAIN_SERVICE_NAME = "gemini-cli-api-key";
+const DEFAULT_API_KEY_ENTRY = "default-api-key";
 
 const storage = new HybridTokenStorage(KEYCHAIN_SERVICE_NAME);
 
@@ -27,7 +27,7 @@ export async function loadApiKey(): Promise<string | null> {
     return null;
   } catch (error: unknown) {
     // Log other errors but don't crash, just return null so user can re-enter key
-    debugLogger.error('Failed to load API key from storage:', error);
+    debugLogger.error("Failed to load API key from storage:", error);
     return null;
   }
 }
@@ -35,15 +35,13 @@ export async function loadApiKey(): Promise<string | null> {
 /**
  * Save API key
  */
-export async function saveApiKey(
-  apiKey: string | null | undefined,
-): Promise<void> {
-  if (!apiKey || apiKey.trim() === '') {
+export async function saveApiKey(apiKey: string | null | undefined): Promise<void> {
+  if (!apiKey || apiKey.trim() === "") {
     try {
       await storage.deleteCredentials(DEFAULT_API_KEY_ENTRY);
     } catch (error: unknown) {
       // Ignore errors when deleting, as it might not exist
-      debugLogger.warn('Failed to delete API key from storage:', error);
+      debugLogger.warn("Failed to delete API key from storage:", error);
     }
     return;
   }
@@ -53,7 +51,7 @@ export async function saveApiKey(
     serverName: DEFAULT_API_KEY_ENTRY,
     token: {
       accessToken: apiKey,
-      tokenType: 'ApiKey',
+      tokenType: "ApiKey",
     },
     updatedAt: Date.now(),
   };
@@ -68,6 +66,6 @@ export async function clearApiKey(): Promise<void> {
   try {
     await storage.deleteCredentials(DEFAULT_API_KEY_ENTRY);
   } catch (error: unknown) {
-    debugLogger.error('Failed to clear API key from storage:', error);
+    debugLogger.error("Failed to clear API key from storage:", error);
   }
 }
diff --git a/packages/gemini-core/src/core/baseLlmClient.test.ts b/packages/gemini-core/src/core/baseLlmClient.test.ts
index d924fabac..c927b42e5 100644
--- a/packages/gemini-core/src/core/baseLlmClient.test.ts
+++ b/packages/gemini-core/src/core/baseLlmClient.test.ts
@@ -4,38 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mocked,
-} from 'vitest';
-
-import type { GenerateContentResponse } from '@google/genai';
-import { BaseLlmClient, type GenerateJsonOptions } from './baseLlmClient.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import type { Config } from '../config/config.js';
-import { AuthType } from './contentGenerator.js';
-import { reportError } from '../utils/errorReporting.js';
-import { logMalformedJsonResponse } from '../telemetry/loggers.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import { MalformedJsonResponseEvent } from '../telemetry/types.js';
-import { getErrorMessage } from '../utils/errors.js';
-
-vi.mock('../utils/errorReporting.js');
-vi.mock('../telemetry/loggers.js');
-vi.mock('../utils/errors.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../utils/errors.js')>();
+import type { GenerateContentResponse } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { logMalformedJsonResponse } from "../telemetry/loggers.js";
+import { MalformedJsonResponseEvent } from "../telemetry/types.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import { BaseLlmClient, type GenerateJsonOptions } from "./baseLlmClient.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { AuthType } from "./contentGenerator.js";
+
+vi.mock("../utils/errorReporting.js");
+vi.mock("../telemetry/loggers.js");
+vi.mock("../utils/errors.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../utils/errors.js")>();
   return {
     ...actual,
     getErrorMessage: vi.fn((e) => (e instanceof Error ? e.message : String(e))),
   };
 });
 
-vi.mock('../utils/retry.js', () => ({
+vi.mock("../utils/retry.js", () => ({
   retryWithBackoff: vi.fn(async (fn, options) => {
     // Default implementation - just call the function
     const result = await fn();
@@ -49,10 +40,10 @@ vi.mock('../utils/retry.js', () => ({
         const responseText = result?.candidates?.[0]?.content?.parts?.[0]?.text;
         if (
           !responseText ||
-          responseText.trim() === '' ||
+          responseText.trim() === "" ||
           responseText.includes('{"color": "blue"')
         ) {
-          throw new Error('Retry attempts exhausted for invalid content');
+          throw new Error("Retry attempts exhausted for invalid content");
         }
       }
     }
@@ -72,10 +63,10 @@ const mockContentGenerator = {
 // Helper to create a mock GenerateContentResponse
 const createMockResponse = (text: string): GenerateContentResponse =>
   ({
-    candidates: [{ content: { role: 'model', parts: [{ text }] }, index: 0 }],
+    candidates: [{ content: { role: "model", parts: [{ text }] }, index: 0 }],
   }) as GenerateContentResponse;
 
-describe('BaseLlmClient', () => {
+describe("BaseLlmClient", () => {
   let client: BaseLlmClient;
   let abortController: AbortController;
   let defaultOptions: GenerateJsonOptions;
@@ -89,11 +80,9 @@ describe('BaseLlmClient', () => {
     );
 
     mockConfig = {
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getContentGeneratorConfig: vi
-        .fn()
-        .mockReturnValue({ authType: AuthType.USE_GEMINI }),
-      getEmbeddingModel: vi.fn().mockReturnValue('test-embedding-model'),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
+      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: AuthType.USE_GEMINI }),
+      getEmbeddingModel: vi.fn().mockReturnValue("test-embedding-model"),
       isInteractive: vi.fn().mockReturnValue(false),
       modelConfigService: {
         getResolvedConfig: vi.fn().mockImplementation(({ model }) => ({
@@ -109,11 +98,11 @@ describe('BaseLlmClient', () => {
     client = new BaseLlmClient(mockContentGenerator, mockConfig);
     abortController = new AbortController();
     defaultOptions = {
-      modelConfigKey: { model: 'test-model' },
-      contents: [{ role: 'user', parts: [{ text: 'Give me a color.' }] }],
-      schema: { type: 'object', properties: { color: { type: 'string' } } },
+      modelConfigKey: { model: "test-model" },
+      contents: [{ role: "user", parts: [{ text: "Give me a color." }] }],
+      schema: { type: "object", properties: { color: { type: "string" } } },
       abortSignal: abortController.signal,
-      promptId: 'test-prompt-id',
+      promptId: "test-prompt-id",
     };
   });
 
@@ -121,14 +110,14 @@ describe('BaseLlmClient', () => {
     abortController.abort();
   });
 
-  describe('generateJson - Success Scenarios', () => {
-    it('should call generateContent with correct parameters, defaults, and utilize retry mechanism', async () => {
+  describe("generateJson - Success Scenarios", () => {
+    it("should call generateContent with correct parameters, defaults, and utilize retry mechanism", async () => {
       const mockResponse = createMockResponse('{"color": "blue"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
 
       const result = await client.generateJson(defaultOptions);
 
-      expect(result).toEqual({ color: 'blue' });
+      expect(result).toEqual({ color: "blue" });
 
       // Ensure the retry mechanism was engaged with shouldRetryOnContent
       expect(retryWithBackoff).toHaveBeenCalledTimes(1);
@@ -143,25 +132,25 @@ describe('BaseLlmClient', () => {
       expect(mockGenerateContent).toHaveBeenCalledTimes(1);
       expect(mockGenerateContent).toHaveBeenCalledWith(
         {
-          model: 'test-model',
+          model: "test-model",
           contents: defaultOptions.contents,
           config: {
             abortSignal: defaultOptions.abortSignal,
             responseJsonSchema: defaultOptions.schema,
-            responseMimeType: 'application/json',
+            responseMimeType: "application/json",
             temperature: 0,
             topP: 1,
             // Crucial: systemInstruction should NOT be in the config object if not provided
           },
         },
-        'test-prompt-id',
+        "test-prompt-id",
       );
     });
 
-    it('should include system instructions when provided', async () => {
+    it("should include system instructions when provided", async () => {
       const mockResponse = createMockResponse('{"color": "green"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
-      const systemInstruction = 'You are a helpful assistant.';
+      const systemInstruction = "You are a helpful assistant.";
 
       const options: GenerateJsonOptions = {
         ...defaultOptions,
@@ -180,10 +169,10 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should use the provided promptId', async () => {
+    it("should use the provided promptId", async () => {
       const mockResponse = createMockResponse('{"color": "yellow"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
-      const customPromptId = 'custom-id-123';
+      const customPromptId = "custom-id-123";
 
       const options: GenerateJsonOptions = {
         ...defaultOptions,
@@ -192,13 +181,10 @@ describe('BaseLlmClient', () => {
 
       await client.generateJson(options);
 
-      expect(mockGenerateContent).toHaveBeenCalledWith(
-        expect.any(Object),
-        customPromptId,
-      );
+      expect(mockGenerateContent).toHaveBeenCalledWith(expect.any(Object), customPromptId);
     });
 
-    it('should pass maxAttempts to retryWithBackoff when provided', async () => {
+    it("should pass maxAttempts to retryWithBackoff when provided", async () => {
       const mockResponse = createMockResponse('{"color": "cyan"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
       const customMaxAttempts = 3;
@@ -219,7 +205,7 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should call retryWithBackoff without maxAttempts when not provided', async () => {
+    it("should call retryWithBackoff without maxAttempts when not provided", async () => {
       const mockResponse = createMockResponse('{"color": "indigo"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
 
@@ -235,8 +221,8 @@ describe('BaseLlmClient', () => {
     });
   });
 
-  describe('generateJson - Content Validation and Retries', () => {
-    it('should validate content using shouldRetryOnContent function', async () => {
+  describe("generateJson - Content Validation and Retries", () => {
+    it("should validate content using shouldRetryOnContent function", async () => {
       const mockResponse = createMockResponse('{"color": "blue"}');
       mockGenerateContent.mockResolvedValue(mockResponse);
 
@@ -258,25 +244,21 @@ describe('BaseLlmClient', () => {
       expect(shouldRetryOnContent!(mockResponse)).toBe(false);
 
       // Empty response should trigger retry
-      expect(shouldRetryOnContent!(createMockResponse(''))).toBe(true);
+      expect(shouldRetryOnContent!(createMockResponse(""))).toBe(true);
 
       // Invalid JSON should trigger retry
-      expect(
-        shouldRetryOnContent!(createMockResponse('{"color": "blue"')),
-      ).toBe(true);
+      expect(shouldRetryOnContent!(createMockResponse('{"color": "blue"'))).toBe(true);
     });
   });
 
-  describe('generateJson - Response Cleaning', () => {
-    it('should clean JSON wrapped in markdown backticks and log telemetry', async () => {
+  describe("generateJson - Response Cleaning", () => {
+    it("should clean JSON wrapped in markdown backticks and log telemetry", async () => {
       const malformedResponse = '```json\n{"color": "purple"}\n```';
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse(malformedResponse),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse(malformedResponse));
 
       const result = await client.generateJson(defaultOptions);
 
-      expect(result).toEqual({ color: 'purple' });
+      expect(result).toEqual({ color: "purple" });
       expect(logMalformedJsonResponse).toHaveBeenCalledWith(
         mockConfig,
         expect.any(MalformedJsonResponseEvent),
@@ -288,75 +270,73 @@ describe('BaseLlmClient', () => {
       expect(event.model).toBe(defaultOptions.modelConfigKey.model);
     });
 
-    it('should handle extra whitespace correctly without logging malformed telemetry', async () => {
+    it("should handle extra whitespace correctly without logging malformed telemetry", async () => {
       const responseWithWhitespace = '  \n  {"color": "orange"}  \n';
-      mockGenerateContent.mockResolvedValue(
-        createMockResponse(responseWithWhitespace),
-      );
+      mockGenerateContent.mockResolvedValue(createMockResponse(responseWithWhitespace));
 
       const result = await client.generateJson(defaultOptions);
 
-      expect(result).toEqual({ color: 'orange' });
+      expect(result).toEqual({ color: "orange" });
       expect(logMalformedJsonResponse).not.toHaveBeenCalled();
     });
   });
 
-  describe('generateJson - Error Handling', () => {
-    it('should throw and report error for empty response after retry exhaustion', async () => {
-      mockGenerateContent.mockResolvedValue(createMockResponse(''));
+  describe("generateJson - Error Handling", () => {
+    it("should throw and report error for empty response after retry exhaustion", async () => {
+      mockGenerateContent.mockResolvedValue(createMockResponse(""));
 
       await expect(client.generateJson(defaultOptions)).rejects.toThrow(
-        'Failed to generate JSON content: Retry attempts exhausted for invalid content',
+        "Failed to generate JSON content: Retry attempts exhausted for invalid content",
       );
 
       // Verify error reporting details
       expect(reportError).toHaveBeenCalledTimes(1);
       expect(reportError).toHaveBeenCalledWith(
         expect.any(Error),
-        'API returned invalid content (empty or unparsable JSON) after all retries.',
+        "API returned invalid content (empty or unparsable JSON) after all retries.",
         defaultOptions.contents,
-        'generateJson-invalid-content',
+        "generateJson-invalid-content",
       );
     });
 
-    it('should throw and report error for invalid JSON syntax after retry exhaustion', async () => {
+    it("should throw and report error for invalid JSON syntax after retry exhaustion", async () => {
       const invalidJson = '{"color": "blue"'; // missing closing brace
       mockGenerateContent.mockResolvedValue(createMockResponse(invalidJson));
 
       await expect(client.generateJson(defaultOptions)).rejects.toThrow(
-        'Failed to generate JSON content: Retry attempts exhausted for invalid content',
+        "Failed to generate JSON content: Retry attempts exhausted for invalid content",
       );
 
       expect(reportError).toHaveBeenCalledTimes(1);
       expect(reportError).toHaveBeenCalledWith(
         expect.any(Error),
-        'API returned invalid content (empty or unparsable JSON) after all retries.',
+        "API returned invalid content (empty or unparsable JSON) after all retries.",
         defaultOptions.contents,
-        'generateJson-invalid-content',
+        "generateJson-invalid-content",
       );
     });
 
-    it('should throw and report generic API errors', async () => {
-      const apiError = new Error('Service Unavailable (503)');
+    it("should throw and report generic API errors", async () => {
+      const apiError = new Error("Service Unavailable (503)");
       // Simulate the generator failing
       mockGenerateContent.mockRejectedValue(apiError);
 
       await expect(client.generateJson(defaultOptions)).rejects.toThrow(
-        'Failed to generate JSON content: Service Unavailable (503)',
+        "Failed to generate JSON content: Service Unavailable (503)",
       );
 
       // Verify generic error reporting
       expect(reportError).toHaveBeenCalledTimes(1);
       expect(reportError).toHaveBeenCalledWith(
         apiError,
-        'Error generating JSON content via API.',
+        "Error generating JSON content via API.",
         defaultOptions.contents,
-        'generateJson-api',
+        "generateJson-api",
       );
     });
 
-    it('should throw immediately without reporting if aborted', async () => {
-      const abortError = new DOMException('Aborted', 'AbortError');
+    it("should throw immediately without reporting if aborted", async () => {
+      const abortError = new DOMException("Aborted", "AbortError");
 
       // Simulate abortion happening during the API call
       mockGenerateContent.mockImplementation(() => {
@@ -376,20 +356,17 @@ describe('BaseLlmClient', () => {
     });
   });
 
-  describe('generateEmbedding', () => {
-    const texts = ['hello world', 'goodbye world'];
-    const testEmbeddingModel = 'test-embedding-model';
+  describe("generateEmbedding", () => {
+    const texts = ["hello world", "goodbye world"];
+    const testEmbeddingModel = "test-embedding-model";
 
-    it('should call embedContent with correct parameters and return embeddings', async () => {
+    it("should call embedContent with correct parameters and return embeddings", async () => {
       const mockEmbeddings = [
         [0.1, 0.2, 0.3],
         [0.4, 0.5, 0.6],
       ];
       mockEmbedContent.mockResolvedValue({
-        embeddings: [
-          { values: mockEmbeddings[0] },
-          { values: mockEmbeddings[1] },
-        ],
+        embeddings: [{ values: mockEmbeddings[0] }, { values: mockEmbeddings[1] }],
       });
 
       const result = await client.generateEmbedding(texts);
@@ -402,41 +379,41 @@ describe('BaseLlmClient', () => {
       expect(result).toEqual(mockEmbeddings);
     });
 
-    it('should return an empty array if an empty array is passed', async () => {
+    it("should return an empty array if an empty array is passed", async () => {
       const result = await client.generateEmbedding([]);
       expect(result).toEqual([]);
       expect(mockEmbedContent).not.toHaveBeenCalled();
     });
 
-    it('should throw an error if API response has no embeddings array', async () => {
+    it("should throw an error if API response has no embeddings array", async () => {
       mockEmbedContent.mockResolvedValue({});
 
       await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'No embeddings found in API response.',
+        "No embeddings found in API response.",
       );
     });
 
-    it('should throw an error if API response has an empty embeddings array', async () => {
+    it("should throw an error if API response has an empty embeddings array", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [],
       });
 
       await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'No embeddings found in API response.',
+        "No embeddings found in API response.",
       );
     });
 
-    it('should throw an error if API returns a mismatched number of embeddings', async () => {
+    it("should throw an error if API returns a mismatched number of embeddings", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [{ values: [1, 2, 3] }], // Only one for two texts
       });
 
       await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'API returned a mismatched number of embeddings. Expected 2, got 1.',
+        "API returned a mismatched number of embeddings. Expected 2, got 1.",
       );
     });
 
-    it('should throw an error if any embedding has nullish values', async () => {
+    it("should throw an error if any embedding has nullish values", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [{ values: [1, 2, 3] }, { values: undefined }], // Second one is bad
       });
@@ -446,7 +423,7 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should throw an error if any embedding has an empty values array', async () => {
+    it("should throw an error if any embedding has an empty values array", async () => {
       mockEmbedContent.mockResolvedValue({
         embeddings: [{ values: [] }, { values: [1, 2, 3] }], // First one is bad
       });
@@ -456,12 +433,10 @@ describe('BaseLlmClient', () => {
       );
     });
 
-    it('should propagate errors from the API call', async () => {
-      mockEmbedContent.mockRejectedValue(new Error('API Failure'));
+    it("should propagate errors from the API call", async () => {
+      mockEmbedContent.mockRejectedValue(new Error("API Failure"));
 
-      await expect(client.generateEmbedding(texts)).rejects.toThrow(
-        'API Failure',
-      );
+      await expect(client.generateEmbedding(texts)).rejects.toThrow("API Failure");
     });
   });
 });
diff --git a/packages/gemini-core/src/core/baseLlmClient.ts b/packages/gemini-core/src/core/baseLlmClient.ts
index adaa3e3c3..7fe5e9dc8 100644
--- a/packages/gemini-core/src/core/baseLlmClient.ts
+++ b/packages/gemini-core/src/core/baseLlmClient.ts
@@ -6,20 +6,20 @@
 
 import type {
   Content,
-  GenerateContentConfig,
-  Part,
   EmbedContentParameters,
+  GenerateContentConfig,
   GenerateContentResponse,
-} from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { reportError } from '../utils/errorReporting.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { logMalformedJsonResponse } from '../telemetry/loggers.js';
-import { MalformedJsonResponseEvent } from '../telemetry/types.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
+  Part,
+} from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import { logMalformedJsonResponse } from "../telemetry/loggers.js";
+import { MalformedJsonResponseEvent } from "../telemetry/types.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 
 const DEFAULT_MAX_ATTEMPTS = 5;
 
@@ -59,9 +59,7 @@ export class BaseLlmClient {
     private readonly config: Config,
   ) {}
 
-  async generateJson(
-    options: GenerateJsonOptions,
-  ): Promise<Record<string, unknown>> {
+  async generateJson(options: GenerateJsonOptions): Promise<Record<string, unknown>> {
     const {
       modelConfigKey,
       contents,
@@ -79,7 +77,7 @@ export class BaseLlmClient {
       ...generateContentConfig,
       ...(systemInstruction && { systemInstruction }),
       responseJsonSchema: schema,
-      responseMimeType: 'application/json',
+      responseMimeType: "application/json",
     };
 
     try {
@@ -112,37 +110,30 @@ export class BaseLlmClient {
       });
 
       // If we are here, the content is valid (not empty and parsable).
-      return JSON.parse(
-        this.cleanJsonResponse(getResponseText(result)!.trim(), model),
-      );
+      return JSON.parse(this.cleanJsonResponse(getResponseText(result)!.trim(), model));
     } catch (error) {
       if (abortSignal.aborted) {
         throw error;
       }
 
       // Check if the error is from exhausting retries, and report accordingly.
-      if (
-        error instanceof Error &&
-        error.message.includes('Retry attempts exhausted')
-      ) {
+      if (error instanceof Error && error.message.includes("Retry attempts exhausted")) {
         await reportError(
           error,
-          'API returned invalid content (empty or unparsable JSON) after all retries.',
+          "API returned invalid content (empty or unparsable JSON) after all retries.",
           contents,
-          'generateJson-invalid-content',
+          "generateJson-invalid-content",
         );
       } else {
         await reportError(
           error,
-          'Error generating JSON content via API.',
+          "Error generating JSON content via API.",
           contents,
-          'generateJson-api',
+          "generateJson-api",
         );
       }
 
-      throw new Error(
-        `Failed to generate JSON content: ${getErrorMessage(error)}`,
-      );
+      throw new Error(`Failed to generate JSON content: ${getErrorMessage(error)}`);
     }
   }
 
@@ -155,13 +146,9 @@ export class BaseLlmClient {
       contents: texts,
     };
 
-    const embedContentResponse =
-      await this.contentGenerator.embedContent(embedModelParams);
-    if (
-      !embedContentResponse.embeddings ||
-      embedContentResponse.embeddings.length === 0
-    ) {
-      throw new Error('No embeddings found in API response.');
+    const embedContentResponse = await this.contentGenerator.embedContent(embedModelParams);
+    if (!embedContentResponse.embeddings || embedContentResponse.embeddings.length === 0) {
+      throw new Error("No embeddings found in API response.");
     }
 
     if (embedContentResponse.embeddings.length !== texts.length) {
@@ -182,13 +169,10 @@ export class BaseLlmClient {
   }
 
   private cleanJsonResponse(text: string, model: string): string {
-    const prefix = '```json';
-    const suffix = '```';
+    const prefix = "```json";
+    const suffix = "```";
     if (text.startsWith(prefix) && text.endsWith(suffix)) {
-      logMalformedJsonResponse(
-        this.config,
-        new MalformedJsonResponseEvent(model),
-      );
+      logMalformedJsonResponse(this.config, new MalformedJsonResponseEvent(model));
       return text.substring(prefix.length, text.length - suffix.length).trim();
     }
     return text;
diff --git a/packages/gemini-core/src/core/client.test.ts b/packages/gemini-core/src/core/client.test.ts
index 66ccb30a1..15126c2b3 100644
--- a/packages/gemini-core/src/core/client.test.ts
+++ b/packages/gemini-core/src/core/client.test.ts
@@ -4,56 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-
-import type { Content, GenerateContentResponse, Part } from '@google/genai';
-import {
-  isThinkingDefault,
-  isThinkingSupported,
-  GeminiClient,
-} from './client.js';
+import type { Content, GenerateContentResponse, Part } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { ideContextStore } from "../ide/ideContext.js";
+import type { ModelRouterService } from "../routing/modelRouterService.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import type { ModelConfigKey, ResolvedModelConfig } from "../services/modelConfigService.js";
+import { ClearcutLogger } from "../telemetry/clearcut-logger/clearcut-logger.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import { setSimulate429 } from "../utils/testUtils.js";
+import { GeminiClient, isThinkingDefault, isThinkingSupported } from "./client.js";
 import {
   AuthType,
   type ContentGenerator,
   type ContentGeneratorConfig,
-} from './contentGenerator.js';
-import { type GeminiChat } from './geminiChat.js';
-import type { Config } from '../config/config.js';
-import {
-  CompressionStatus,
-  GeminiEventType,
-  Turn,
-  type ChatCompressionInfo,
-} from './turn.js';
-import { getCoreSystemPrompt } from './prompts.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { setSimulate429 } from '../utils/testUtils.js';
-import { tokenLimit } from './tokenLimits.js';
-import { ideContextStore } from '../ide/ideContext.js';
-import type { ModelRouterService } from '../routing/modelRouterService.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-import type {
-  ModelConfigKey,
-  ResolvedModelConfig,
-} from '../services/modelConfigService.js';
-import { ClearcutLogger } from '../telemetry/clearcut-logger/clearcut-logger.js';
-
-vi.mock('../services/chatCompressionService.js');
+} from "./contentGenerator.js";
+import { type GeminiChat } from "./geminiChat.js";
+import { getCoreSystemPrompt } from "./prompts.js";
+import { tokenLimit } from "./tokenLimits.js";
+import { type ChatCompressionInfo, CompressionStatus, GeminiEventType, Turn } from "./turn.js";
+
+vi.mock("../services/chatCompressionService.js");
 
 // Mock fs module to prevent actual file system operations during tests
 const mockFileSystem = new Map<string, string>();
 
-vi.mock('node:fs', () => {
+vi.mock("node:fs", () => {
   const fsModule = {
     mkdirSync: vi.fn(),
     writeFileSync: vi.fn((path: string, data: string) => {
@@ -63,8 +42,8 @@ vi.mock('node:fs', () => {
       if (mockFileSystem.has(path)) {
         return mockFileSystem.get(path);
       }
-      throw Object.assign(new Error('ENOENT: no such file or directory'), {
-        code: 'ENOENT',
+      throw Object.assign(new Error("ENOENT: no such file or directory"), {
+        code: "ENOENT",
       });
     }),
     existsSync: vi.fn((path: string) => mockFileSystem.has(path)),
@@ -79,8 +58,8 @@ vi.mock('node:fs', () => {
 // --- Mocks ---
 const mockTurnRunFn = vi.fn();
 
-vi.mock('./turn', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./turn.js')>();
+vi.mock("./turn", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./turn.js")>();
   // Define a mock class that has the same shape as the real Turn
   class MockTurn {
     pendingToolCalls = [];
@@ -98,27 +77,26 @@ vi.mock('./turn', async (importOriginal) => {
   };
 });
 
-vi.mock('../config/config.js');
-vi.mock('./prompts');
-vi.mock('../utils/getFolderStructure', () => ({
-  getFolderStructure: vi.fn().mockResolvedValue('Mock Folder Structure'),
+vi.mock("../config/config.js");
+vi.mock("./prompts");
+vi.mock("../utils/getFolderStructure", () => ({
+  getFolderStructure: vi.fn().mockResolvedValue("Mock Folder Structure"),
 }));
-vi.mock('../utils/errorReporting', () => ({ reportError: vi.fn() }));
-vi.mock('../utils/nextSpeakerChecker', () => ({
+vi.mock("../utils/errorReporting", () => ({ reportError: vi.fn() }));
+vi.mock("../utils/nextSpeakerChecker", () => ({
   checkNextSpeaker: vi.fn().mockResolvedValue(null),
 }));
-vi.mock('../utils/generateContentResponseUtilities', () => ({
+vi.mock("../utils/generateContentResponseUtilities", () => ({
   getResponseText: (result: GenerateContentResponse) =>
-    result.candidates?.[0]?.content?.parts?.map((part) => part.text).join('') ||
-    undefined,
+    result.candidates?.[0]?.content?.parts?.map((part) => part.text).join("") || undefined,
 }));
-vi.mock('../telemetry/index.js', () => ({
+vi.mock("../telemetry/index.js", () => ({
   logApiRequest: vi.fn(),
   logApiResponse: vi.fn(),
   logApiError: vi.fn(),
 }));
-vi.mock('../ide/ideContext.js');
-vi.mock('../telemetry/uiTelemetry.js', () => ({
+vi.mock("../ide/ideContext.js");
+vi.mock("../telemetry/uiTelemetry.js", () => ({
   uiTelemetryService: {
     setLastPromptTokenCount: vi.fn(),
     getLastPromptTokenCount: vi.fn(),
@@ -138,41 +116,41 @@ async function fromAsync<T>(promise: AsyncGenerator<T>): Promise<readonly T[]> {
   return results;
 }
 
-describe('isThinkingSupported', () => {
-  it('should return true for gemini-2.5', () => {
-    expect(isThinkingSupported('gemini-2.5')).toBe(true);
+describe("isThinkingSupported", () => {
+  it("should return true for gemini-2.5", () => {
+    expect(isThinkingSupported("gemini-2.5")).toBe(true);
   });
 
-  it('should return true for gemini-2.5-pro', () => {
-    expect(isThinkingSupported('gemini-2.5-pro')).toBe(true);
+  it("should return true for gemini-2.5-pro", () => {
+    expect(isThinkingSupported("gemini-2.5-pro")).toBe(true);
   });
 
-  it('should return false for other models', () => {
-    expect(isThinkingSupported('gemini-1.5-flash')).toBe(false);
-    expect(isThinkingSupported('some-other-model')).toBe(false);
+  it("should return false for other models", () => {
+    expect(isThinkingSupported("gemini-1.5-flash")).toBe(false);
+    expect(isThinkingSupported("some-other-model")).toBe(false);
   });
 });
 
-describe('isThinkingDefault', () => {
-  it('should return false for gemini-2.5-flash-lite', () => {
-    expect(isThinkingDefault('gemini-2.5-flash-lite')).toBe(false);
+describe("isThinkingDefault", () => {
+  it("should return false for gemini-2.5-flash-lite", () => {
+    expect(isThinkingDefault("gemini-2.5-flash-lite")).toBe(false);
   });
 
-  it('should return true for gemini-2.5', () => {
-    expect(isThinkingDefault('gemini-2.5')).toBe(true);
+  it("should return true for gemini-2.5", () => {
+    expect(isThinkingDefault("gemini-2.5")).toBe(true);
   });
 
-  it('should return true for gemini-2.5-pro', () => {
-    expect(isThinkingDefault('gemini-2.5-pro')).toBe(true);
+  it("should return true for gemini-2.5-pro", () => {
+    expect(isThinkingDefault("gemini-2.5-pro")).toBe(true);
   });
 
-  it('should return false for other models', () => {
-    expect(isThinkingDefault('gemini-1.5-flash')).toBe(false);
-    expect(isThinkingDefault('some-other-model')).toBe(false);
+  it("should return false for other models", () => {
+    expect(isThinkingDefault("gemini-1.5-flash")).toBe(false);
+    expect(isThinkingDefault("some-other-model")).toBe(false);
   });
 });
 
-describe('Gemini Client (client.ts)', () => {
+describe("Gemini Client (client.ts)", () => {
   let mockContentGenerator: ContentGenerator;
   let mockConfig: Config;
   let client: GeminiClient;
@@ -211,27 +189,25 @@ describe('Gemini Client (client.ts)', () => {
       getFunctionDeclarations: vi.fn().mockReturnValue([]),
       getTool: vi.fn().mockReturnValue(null),
     };
-    const fileService = new FileDiscoveryService('/test/dir');
+    const fileService = new FileDiscoveryService("/test/dir");
     const contentGeneratorConfig: ContentGeneratorConfig = {
-      apiKey: 'test-key',
+      apiKey: "test-key",
       vertexai: false,
       authType: AuthType.USE_GEMINI,
     };
     mockConfig = {
-      getContentGeneratorConfig: vi
-        .fn()
-        .mockReturnValue(contentGeneratorConfig),
+      getContentGeneratorConfig: vi.fn().mockReturnValue(contentGeneratorConfig),
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
-      getModel: vi.fn().mockReturnValue('test-model'),
-      getEmbeddingModel: vi.fn().mockReturnValue('test-embedding-model'),
-      getApiKey: vi.fn().mockReturnValue('test-key'),
+      getModel: vi.fn().mockReturnValue("test-model"),
+      getEmbeddingModel: vi.fn().mockReturnValue("test-embedding-model"),
+      getApiKey: vi.fn().mockReturnValue("test-key"),
       getVertexAI: vi.fn().mockReturnValue(false),
-      getUserAgent: vi.fn().mockReturnValue('test-agent'),
-      getUserMemory: vi.fn().mockReturnValue(''),
+      getUserAgent: vi.fn().mockReturnValue("test-agent"),
+      getUserMemory: vi.fn().mockReturnValue(""),
 
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
       getProxy: vi.fn().mockReturnValue(undefined),
-      getWorkingDir: vi.fn().mockReturnValue('/test/dir'),
+      getWorkingDir: vi.fn().mockReturnValue("/test/dir"),
       getFileService: vi.fn().mockReturnValue(fileService),
       getMaxSessionTurns: vi.fn().mockReturnValue(0),
       getQuotaErrorOccurred: vi.fn().mockReturnValue(false),
@@ -242,11 +218,11 @@ describe('Gemini Client (client.ts)', () => {
       getIdeMode: vi.fn().mockReturnValue(true),
       getDebugMode: vi.fn().mockReturnValue(false),
       getWorkspaceContext: vi.fn().mockReturnValue({
-        getDirectories: vi.fn().mockReturnValue(['/test/dir']),
+        getDirectories: vi.fn().mockReturnValue(["/test/dir"]),
       }),
       getGeminiClient: vi.fn(),
       getModelRouterService: vi.fn().mockReturnValue({
-        route: vi.fn().mockResolvedValue({ model: 'default-routed-model' }),
+        route: vi.fn().mockResolvedValue({ model: "default-routed-model" }),
       }),
       isInFallbackMode: vi.fn().mockReturnValue(false),
       setFallbackMode: vi.fn(),
@@ -255,15 +231,15 @@ describe('Gemini Client (client.ts)', () => {
       getUseSmartEdit: vi.fn().mockReturnValue(false),
       getUseModelRouter: vi.fn().mockReturnValue(false),
       getContinueOnFailedApiCall: vi.fn(),
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/temp"),
       },
       getContentGenerator: vi.fn().mockReturnValue(mockContentGenerator),
       getBaseLlmClient: vi.fn().mockReturnValue({
         generateJson: vi.fn().mockResolvedValue({
-          next_speaker: 'user',
-          reasoning: 'test',
+          next_speaker: "user",
+          reasoning: "test",
         }),
       }),
       modelConfigService: {
@@ -291,16 +267,16 @@ describe('Gemini Client (client.ts)', () => {
     vi.restoreAllMocks();
   });
 
-  describe('addHistory', () => {
-    it('should call chat.addHistory with the provided content', async () => {
+  describe("addHistory", () => {
+    it("should call chat.addHistory with the provided content", async () => {
       const mockChat = {
         addHistory: vi.fn(),
       } as unknown as GeminiChat;
-      client['chat'] = mockChat;
+      client["chat"] = mockChat;
 
       const newContent = {
-        role: 'user',
-        parts: [{ text: 'New history item' }],
+        role: "user",
+        parts: [{ text: "New history item" }],
       };
       await client.addHistory(newContent);
 
@@ -308,19 +284,17 @@ describe('Gemini Client (client.ts)', () => {
     });
   });
 
-  describe('resetChat', () => {
-    it('should create a new chat session, clearing the old history', async () => {
+  describe("resetChat", () => {
+    it("should create a new chat session, clearing the old history", async () => {
       // 1. Get the initial chat instance and add some history.
       const initialChat = client.getChat();
       const initialHistory = await client.getHistory();
       await client.addHistory({
-        role: 'user',
-        parts: [{ text: 'some old message' }],
+        role: "user",
+        parts: [{ text: "some old message" }],
       });
       const historyWithOldMessage = await client.getHistory();
-      expect(historyWithOldMessage.length).toBeGreaterThan(
-        initialHistory.length,
-      );
+      expect(historyWithOldMessage.length).toBeGreaterThan(initialHistory.length);
 
       // 2. Call resetChat.
       await client.resetChat();
@@ -332,26 +306,24 @@ describe('Gemini Client (client.ts)', () => {
       // 4. Assert that the chat instance is new and the history is reset.
       expect(newChat).not.toBe(initialChat);
       expect(newHistory.length).toBe(initialHistory.length);
-      expect(JSON.stringify(newHistory)).not.toContain('some old message');
+      expect(JSON.stringify(newHistory)).not.toContain("some old message");
     });
   });
 
-  describe('startChat', () => {
-    it('should include environment context when resuming a session', async () => {
+  describe("startChat", () => {
+    it("should include environment context when resuming a session", async () => {
       const extraHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'Old message' }] },
-        { role: 'model', parts: [{ text: 'Old response' }] },
+        { role: "user", parts: [{ text: "Old message" }] },
+        { role: "model", parts: [{ text: "Old response" }] },
       ];
 
       const chat = await client.startChat(extraHistory);
       const history = chat.getHistory();
 
       // The first message should be the environment context
-      expect(history[0].role).toBe('user');
-      expect(history[0].parts?.[0]?.text).toContain('This is the Gemini CLI');
-      expect(history[0].parts?.[0]?.text).toContain(
-        "The project's temporary directory is:",
-      );
+      expect(history[0].role).toBe("user");
+      expect(history[0].parts?.[0]?.text).toContain("This is the Gemini CLI");
+      expect(history[0].parts?.[0]?.text).toContain("The project's temporary directory is:");
 
       // The subsequent messages should be the extra history
       expect(history[1]).toEqual(extraHistory[0]);
@@ -359,15 +331,15 @@ describe('Gemini Client (client.ts)', () => {
     });
   });
 
-  describe('tryCompressChat', () => {
+  describe("tryCompressChat", () => {
     const mockGetHistory = vi.fn();
 
     beforeEach(() => {
-      vi.mock('./tokenLimits', () => ({
+      vi.mock("./tokenLimits", () => ({
         tokenLimit: vi.fn(),
       }));
 
-      client['chat'] = {
+      client["chat"] = {
         getHistory: mockGetHistory,
         addHistory: vi.fn(),
         setHistory: vi.fn(),
@@ -377,8 +349,8 @@ describe('Gemini Client (client.ts)', () => {
 
     function setup({
       chatHistory = [
-        { role: 'user', parts: [{ text: 'Long conversation' }] },
-        { role: 'model', parts: [{ text: 'Long response' }] },
+        { role: "user", parts: [{ text: "Long conversation" }] },
+        { role: "model", parts: [{ text: "Long response" }] },
       ] as Content[],
       originalTokenCount = 1000,
       newTokenCount = 500,
@@ -389,22 +361,17 @@ describe('Gemini Client (client.ts)', () => {
         setHistory: vi.fn(),
         getLastPromptTokenCount: vi.fn().mockReturnValue(originalTokenCount),
       };
-      client['chat'] = mockOriginalChat as GeminiChat;
+      client["chat"] = mockOriginalChat as GeminiChat;
 
-      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(
-        originalTokenCount,
-      );
+      vi.mocked(uiTelemetryService.getLastPromptTokenCount).mockReturnValue(originalTokenCount);
 
       const newHistory: Content[] = [
-        { role: 'user', parts: [{ text: 'Summary' }] },
-        { role: 'model', parts: [{ text: 'Got it' }] },
+        { role: "user", parts: [{ text: "Summary" }] },
+        { role: "model", parts: [{ text: "Got it" }] },
       ];
 
       vi.mocked(ChatCompressionService.prototype.compress).mockResolvedValue({
-        newHistory:
-          compressionStatus === CompressionStatus.COMPRESSED
-            ? newHistory
-            : null,
+        newHistory: compressionStatus === CompressionStatus.COMPRESSED ? newHistory : null,
         info: {
           originalTokenCount,
           newTokenCount,
@@ -418,9 +385,7 @@ describe('Gemini Client (client.ts)', () => {
         getLastPromptTokenCount: vi.fn().mockReturnValue(newTokenCount),
       };
 
-      client['startChat'] = vi
-        .fn()
-        .mockResolvedValue(mockNewChat as GeminiChat);
+      client["startChat"] = vi.fn().mockResolvedValue(mockNewChat as GeminiChat);
 
       return {
         client,
@@ -430,17 +395,16 @@ describe('Gemini Client (client.ts)', () => {
       };
     }
 
-    describe('when compression inflates the token count', () => {
-      it('allows compression to be forced/manual after a failure', async () => {
+    describe("when compression inflates the token count", () => {
+      it("allows compression to be forced/manual after a failure", async () => {
         // Call 1 (Fails): Setup with inflated tokens
         setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        await client.tryCompressChat('prompt-id-4', false); // Fails
+        await client.tryCompressChat("prompt-id-4", false); // Fails
 
         // Call 2 (Forced): Re-setup with compressed tokens
         const { estimatedNewTokenCount: compressedTokenCount } = setup({
@@ -449,7 +413,7 @@ describe('Gemini Client (client.ts)', () => {
           compressionStatus: CompressionStatus.COMPRESSED,
         });
 
-        const result = await client.tryCompressChat('prompt-id-4', true); // Forced
+        const result = await client.tryCompressChat("prompt-id-4", true); // Forced
 
         expect(result).toEqual({
           compressionStatus: CompressionStatus.COMPRESSED,
@@ -458,56 +422,48 @@ describe('Gemini Client (client.ts)', () => {
         });
       });
 
-      it('yields the result even if the compression inflated the tokens', async () => {
+      it("yields the result even if the compression inflated the tokens", async () => {
         const { client, estimatedNewTokenCount } = setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        const result = await client.tryCompressChat('prompt-id-4', false);
+        const result = await client.tryCompressChat("prompt-id-4", false);
 
         expect(result).toEqual({
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
           newTokenCount: estimatedNewTokenCount,
           originalTokenCount: 100,
         });
         // IMPORTANT: The change in client.ts means setLastPromptTokenCount is NOT called on failure
-        expect(
-          uiTelemetryService.setLastPromptTokenCount,
-        ).not.toHaveBeenCalled();
+        expect(uiTelemetryService.setLastPromptTokenCount).not.toHaveBeenCalled();
       });
 
-      it('does not manipulate the source chat', async () => {
+      it("does not manipulate the source chat", async () => {
         const { client, mockOriginalChat } = setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        await client.tryCompressChat('prompt-id-4', false);
+        await client.tryCompressChat("prompt-id-4", false);
 
         // On failure, the chat should NOT be replaced
-        expect(client['chat']).toBe(mockOriginalChat);
+        expect(client["chat"]).toBe(mockOriginalChat);
       });
 
-      it.skip('will not attempt to compress context after a failure', async () => {
+      it.skip("will not attempt to compress context after a failure", async () => {
         const { client } = setup({
           originalTokenCount: 100,
           newTokenCount: 200,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
 
-        await client.tryCompressChat('prompt-id-4', false); // This fails and sets hasFailedCompressionAttempt = true
+        await client.tryCompressChat("prompt-id-4", false); // This fails and sets hasFailedCompressionAttempt = true
 
         // Mock the next call to return NOOP
-        vi.mocked(
-          ChatCompressionService.prototype.compress,
-        ).mockResolvedValueOnce({
+        vi.mocked(ChatCompressionService.prototype.compress).mockResolvedValueOnce({
           newHistory: null,
           info: {
             originalTokenCount: 0,
@@ -517,17 +473,13 @@ describe('Gemini Client (client.ts)', () => {
         });
 
         // This call should now be a NOOP
-        const result = await client.tryCompressChat('prompt-id-5', false);
+        const result = await client.tryCompressChat("prompt-id-5", false);
 
         expect(result.compressionStatus).toBe(CompressionStatus.NOOP);
-        expect(ChatCompressionService.prototype.compress).toHaveBeenCalledTimes(
-          2,
-        );
-        expect(
-          ChatCompressionService.prototype.compress,
-        ).toHaveBeenLastCalledWith(
+        expect(ChatCompressionService.prototype.compress).toHaveBeenCalledTimes(2);
+        expect(ChatCompressionService.prototype.compress).toHaveBeenLastCalledWith(
           expect.anything(),
-          'prompt-id-5',
+          "prompt-id-5",
           false,
           expect.anything(),
           expect.anything(),
@@ -536,7 +488,7 @@ describe('Gemini Client (client.ts)', () => {
       });
     });
 
-    it('should not trigger summarization if token count is below threshold', async () => {
+    it("should not trigger summarization if token count is below threshold", async () => {
       const MOCKED_TOKEN_LIMIT = 1000;
       const originalTokenCount = MOCKED_TOKEN_LIMIT * 0.699;
 
@@ -550,7 +502,7 @@ describe('Gemini Client (client.ts)', () => {
       });
 
       const initialChat = client.getChat();
-      const result = await client.tryCompressChat('prompt-id-2', false);
+      const result = await client.tryCompressChat("prompt-id-2", false);
       const newChat = client.getChat();
 
       expect(result).toEqual({
@@ -561,15 +513,15 @@ describe('Gemini Client (client.ts)', () => {
       expect(newChat).toBe(initialChat);
     });
 
-    it('should return NOOP if history is too short to compress', async () => {
+    it("should return NOOP if history is too short to compress", async () => {
       const { client } = setup({
-        chatHistory: [{ role: 'user', parts: [{ text: 'hi' }] }],
+        chatHistory: [{ role: "user", parts: [{ text: "hi" }] }],
         originalTokenCount: 50,
         newTokenCount: 50,
         compressionStatus: CompressionStatus.NOOP,
       });
 
-      const result = await client.tryCompressChat('prompt-id-noop', false);
+      const result = await client.tryCompressChat("prompt-id-noop", false);
 
       expect(result).toEqual({
         compressionStatus: CompressionStatus.NOOP,
@@ -579,12 +531,12 @@ describe('Gemini Client (client.ts)', () => {
     });
   });
 
-  describe('sendMessageStream', () => {
-    it('emits a compression event when the context was automatically compressed', async () => {
+  describe("sendMessageStream", () => {
+    it("emits a compression event when the context was automatically compressed", async () => {
       // Arrange
       mockTurnRunFn.mockReturnValue(
         (async function* () {
-          yield { type: 'content', value: 'Hello' };
+          yield { type: "content", value: "Hello" };
         })(),
       );
 
@@ -594,15 +546,13 @@ describe('Gemini Client (client.ts)', () => {
         newTokenCount: 500,
       };
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValueOnce(
-        compressionInfo,
-      );
+      vi.spyOn(client, "tryCompressChat").mockResolvedValueOnce(compressionInfo);
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-1',
+        "prompt-id-1",
       );
 
       const events = await fromAsync(stream);
@@ -616,64 +566,60 @@ describe('Gemini Client (client.ts)', () => {
 
     it.each([
       {
-        compressionStatus:
-          CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+        compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
       },
       { compressionStatus: CompressionStatus.NOOP },
-    ])(
-      'does not emit a compression event when the status is $compressionStatus',
-      async ({ compressionStatus }) => {
-        // Arrange
-        const mockStream = (async function* () {
-          yield { type: 'content', value: 'Hello' };
-        })();
-        mockTurnRunFn.mockReturnValue(mockStream);
+    ])("does not emit a compression event when the status is $compressionStatus", async ({
+      compressionStatus,
+    }) => {
+      // Arrange
+      const mockStream = (async function* () {
+        yield { type: "content", value: "Hello" };
+      })();
+      mockTurnRunFn.mockReturnValue(mockStream);
 
-        const compressionInfo: ChatCompressionInfo = {
-          compressionStatus,
-          originalTokenCount: 1000,
-          newTokenCount: 500,
-        };
+      const compressionInfo: ChatCompressionInfo = {
+        compressionStatus,
+        originalTokenCount: 1000,
+        newTokenCount: 500,
+      };
 
-        vi.spyOn(client, 'tryCompressChat').mockResolvedValueOnce(
-          compressionInfo,
-        );
+      vi.spyOn(client, "tryCompressChat").mockResolvedValueOnce(compressionInfo);
 
-        // Act
-        const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
-          new AbortController().signal,
-          'prompt-id-1',
-        );
+      // Act
+      const stream = client.sendMessageStream(
+        [{ text: "Hi" }],
+        new AbortController().signal,
+        "prompt-id-1",
+      );
 
-        const events = await fromAsync(stream);
+      const events = await fromAsync(stream);
 
-        // Assert
-        expect(events).not.toContainEqual({
-          type: GeminiEventType.ChatCompressed,
-          value: expect.anything(),
-        });
-      },
-    );
+      // Assert
+      expect(events).not.toContainEqual({
+        type: GeminiEventType.ChatCompressed,
+        value: expect.anything(),
+      });
+    });
 
-    it('should include editor context when ideMode is enabled', async () => {
+    it("should include editor context when ideMode is enabled", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/active/file.ts',
+              path: "/path/to/active/file.ts",
               timestamp: Date.now(),
               isActive: true,
-              selectedText: 'hello',
+              selectedText: "hello",
               cursor: { line: 5, character: 10 },
             },
             {
-              path: '/path/to/recent/file1.ts',
+              path: "/path/to/recent/file1.ts",
               timestamp: Date.now(),
             },
             {
-              path: '/path/to/recent/file2.ts',
+              path: "/path/to/recent/file2.ts",
               timestamp: Date.now(),
             },
           ],
@@ -682,7 +628,7 @@ describe('Gemini Client (client.ts)', () => {
 
       vi.mocked(mockConfig.getIdeMode).mockReturnValue(true);
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: 0,
         newTokenCount: 0,
         compressionStatus: CompressionStatus.COMPRESSED,
@@ -690,7 +636,7 @@ describe('Gemini Client (client.ts)', () => {
 
       mockTurnRunFn.mockReturnValue(
         (async function* () {
-          yield { type: 'content', value: 'Hello' };
+          yield { type: "content", value: "Hello" };
         })(),
       );
 
@@ -699,15 +645,15 @@ describe('Gemini Client (client.ts)', () => {
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       } as unknown as GeminiChat;
-      client['chat'] = mockChat;
+      client["chat"] = mockChat;
 
-      const initialRequest: Part[] = [{ text: 'Hi' }];
+      const initialRequest: Part[] = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -721,14 +667,14 @@ Here is the user's editor context as a JSON object. This is for your information
 ${JSON.stringify(
   {
     activeFile: {
-      path: '/path/to/active/file.ts',
+      path: "/path/to/active/file.ts",
       cursor: {
         line: 5,
         character: 10,
       },
-      selectedText: 'hello',
+      selectedText: "hello",
     },
-    otherOpenFiles: ['/path/to/recent/file1.ts', '/path/to/recent/file2.ts'],
+    otherOpenFiles: ["/path/to/recent/file1.ts", "/path/to/recent/file2.ts"],
   },
   null,
   2,
@@ -737,12 +683,12 @@ ${JSON.stringify(
       `.trim();
       const expectedRequest = [{ text: expectedContext }];
       expect(mockChat.addHistory).toHaveBeenCalledWith({
-        role: 'user',
+        role: "user",
         parts: expectedRequest,
       });
     });
 
-    it('should not add context if ideMode is enabled but no open files', async () => {
+    it("should not add context if ideMode is enabled but no open files", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
@@ -750,10 +696,10 @@ ${JSON.stringify(
         },
       });
 
-      vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -762,15 +708,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
+      const initialRequest = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -789,32 +735,32 @@ ${JSON.stringify(
       );
     });
 
-    it('should add context if ideMode is enabled and there is one active file', async () => {
+    it("should add context if ideMode is enabled and there is one active file", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/active/file.ts',
+              path: "/path/to/active/file.ts",
               timestamp: Date.now(),
               isActive: true,
-              selectedText: 'hello',
+              selectedText: "hello",
               cursor: { line: 5, character: 10 },
             },
           ],
         },
       });
 
-      vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: 0,
         newTokenCount: 0,
         compressionStatus: CompressionStatus.COMPRESSED,
       });
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -823,15 +769,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
+      const initialRequest = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -845,12 +791,12 @@ Here is the user's editor context as a JSON object. This is for your information
 ${JSON.stringify(
   {
     activeFile: {
-      path: '/path/to/active/file.ts',
+      path: "/path/to/active/file.ts",
       cursor: {
         line: 5,
         character: 10,
       },
-      selectedText: 'hello',
+      selectedText: "hello",
     },
   },
   null,
@@ -860,38 +806,38 @@ ${JSON.stringify(
       `.trim();
       const expectedRequest = [{ text: expectedContext }];
       expect(mockChat.addHistory).toHaveBeenCalledWith({
-        role: 'user',
+        role: "user",
         parts: expectedRequest,
       });
     });
 
-    it('should add context if ideMode is enabled and there are open files but no active file', async () => {
+    it("should add context if ideMode is enabled and there are open files but no active file", async () => {
       // Arrange
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/recent/file1.ts',
+              path: "/path/to/recent/file1.ts",
               timestamp: Date.now(),
             },
             {
-              path: '/path/to/recent/file2.ts',
+              path: "/path/to/recent/file2.ts",
               timestamp: Date.now(),
             },
           ],
         },
       });
 
-      vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: 0,
         newTokenCount: 0,
         compressionStatus: CompressionStatus.COMPRESSED,
       });
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -900,15 +846,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
+      const initialRequest = [{ text: "Hi" }];
 
       // Act
       const stream = client.sendMessageStream(
         initialRequest,
         new AbortController().signal,
-        'prompt-id-ide',
+        "prompt-id-ide",
       );
       for await (const _ of stream) {
         // consume stream
@@ -921,7 +867,7 @@ Here is the user's editor context as a JSON object. This is for your information
 \`\`\`json
 ${JSON.stringify(
   {
-    otherOpenFiles: ['/path/to/recent/file1.ts', '/path/to/recent/file2.ts'],
+    otherOpenFiles: ["/path/to/recent/file1.ts", "/path/to/recent/file2.ts"],
   },
   null,
   2,
@@ -930,15 +876,15 @@ ${JSON.stringify(
       `.trim();
       const expectedRequest = [{ text: expectedContext }];
       expect(mockChat.addHistory).toHaveBeenCalledWith({
-        role: 'user',
+        role: "user",
         parts: expectedRequest,
       });
     });
 
-    it('should return the turn instance after the stream is complete', async () => {
+    it("should return the turn instance after the stream is complete", async () => {
       // Arrange
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -947,13 +893,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-1',
+        "prompt-id-1",
       );
 
       // Consume the stream manually to get the final return value.
@@ -970,23 +916,19 @@ ${JSON.stringify(
       expect(finalResult).toBeInstanceOf(Turn);
     });
 
-    it('should stop infinite loop after MAX_TURNS when nextSpeaker always returns model', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        true,
-      );
+    it("should stop infinite loop after MAX_TURNS when nextSpeaker always returns model", async () => {
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(true);
       // Get the mocked checkNextSpeaker function and configure it to trigger infinite loop
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
       mockCheckNextSpeaker.mockResolvedValue({
-        next_speaker: 'model',
-        reasoning: 'Test case - always continue',
+        next_speaker: "model",
+        reasoning: "Test case - always continue",
       });
 
       // Mock Turn to have no pending tool calls (which would allow nextSpeaker check)
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Continue...' };
+        yield { type: "content", value: "Continue..." };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -995,7 +937,7 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Use a signal that never gets aborted
       const abortController = new AbortController();
@@ -1003,9 +945,9 @@ ${JSON.stringify(
 
       // Act - Start the stream that should loop
       const stream = client.sendMessageStream(
-        [{ text: 'Start conversation' }],
+        [{ text: "Start conversation" }],
         signal,
-        'prompt-id-2',
+        "prompt-id-2",
       );
 
       // Count how many stream events we get
@@ -1024,9 +966,7 @@ ${JSON.stringify(
         // Safety check to prevent actual infinite loop in test
         if (eventCount > 200) {
           abortController.abort();
-          throw new Error(
-            'Test exceeded expected event limit - possible actual infinite loop',
-          );
+          throw new Error("Test exceeded expected event limit - possible actual infinite loop");
         }
       }
 
@@ -1043,15 +983,13 @@ ${JSON.stringify(
       expect(eventCount).toBeLessThan(200); // Should not exceed our safety limit
     });
 
-    it('should yield MaxSessionTurns and stop when session turn limit is reached', async () => {
+    it("should yield MaxSessionTurns and stop when session turn limit is reached", async () => {
       // Arrange
       const MAX_SESSION_TURNS = 5;
-      vi.spyOn(client['config'], 'getMaxSessionTurns').mockReturnValue(
-        MAX_SESSION_TURNS,
-      );
+      vi.spyOn(client["config"], "getMaxSessionTurns").mockReturnValue(MAX_SESSION_TURNS);
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1060,15 +998,15 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act & Assert
       // Run up to the limit
       for (let i = 0; i < MAX_SESSION_TURNS; i++) {
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-id-4',
+          "prompt-id-4",
         );
         // consume stream
         for await (const _event of stream) {
@@ -1078,9 +1016,9 @@ ${JSON.stringify(
 
       // This call should exceed the limit
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-5',
+        "prompt-id-5",
       );
 
       const events = [];
@@ -1092,23 +1030,21 @@ ${JSON.stringify(
       expect(mockTurnRunFn).toHaveBeenCalledTimes(MAX_SESSION_TURNS);
     });
 
-    it('should respect MAX_TURNS limit even when turns parameter is set to a large value', async () => {
+    it("should respect MAX_TURNS limit even when turns parameter is set to a large value", async () => {
       // This test verifies that the infinite loop protection works even when
       // someone tries to bypass it by calling with a very large turns value
 
       // Get the mocked checkNextSpeaker function and configure it to trigger infinite loop
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
       mockCheckNextSpeaker.mockResolvedValue({
-        next_speaker: 'model',
-        reasoning: 'Test case - always continue',
+        next_speaker: "model",
+        reasoning: "Test case - always continue",
       });
 
       // Mock Turn to have no pending tool calls (which would allow nextSpeaker check)
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Continue...' };
+        yield { type: "content", value: "Continue..." };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1117,7 +1053,7 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Use a signal that never gets aborted
       const abortController = new AbortController();
@@ -1126,9 +1062,9 @@ ${JSON.stringify(
       // Act - Start the stream with an extremely high turns value
       // This simulates a case where the turns protection is bypassed
       const stream = client.sendMessageStream(
-        [{ text: 'Start conversation' }],
+        [{ text: "Start conversation" }],
         signal,
-        'prompt-id-3',
+        "prompt-id-3",
         Number.MAX_SAFE_INTEGER, // Bypass the MAX_TURNS protection
       );
 
@@ -1165,7 +1101,7 @@ ${JSON.stringify(
       expect(eventCount).toBeLessThanOrEqual(200); // Should have reasonable number of events
     });
 
-    it('should yield ContextWindowWillOverflow when the context window is about to overflow', async () => {
+    it("should yield ContextWindowWillOverflow when the context window is about to overflow", async () => {
       // Arrange
       const MOCKED_TOKEN_LIMIT = 1000;
       vi.mocked(tokenLimit).mockReturnValue(MOCKED_TOKEN_LIMIT);
@@ -1176,20 +1112,18 @@ ${JSON.stringify(
         getLastPromptTokenCount: vi.fn().mockReturnValue(lastPromptTokenCount),
         getHistory: vi.fn().mockReturnValue([]),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Remaining = 100. Threshold (95%) = 95.
       // We need a request > 95 tokens.
       // A string of length 400 is roughly 100 tokens.
-      const longText = 'a'.repeat(400);
+      const longText = "a".repeat(400);
       const request: Part[] = [{ text: longText }];
-      const estimatedRequestTokenCount = Math.floor(
-        JSON.stringify(request).length / 4,
-      );
+      const estimatedRequestTokenCount = Math.floor(JSON.stringify(request).length / 4);
       const remainingTokenCount = MOCKED_TOKEN_LIMIT - lastPromptTokenCount;
 
       // Mock tryCompressChat to not compress
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: lastPromptTokenCount,
         newTokenCount: lastPromptTokenCount,
         compressionStatus: CompressionStatus.NOOP,
@@ -1199,7 +1133,7 @@ ${JSON.stringify(
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'prompt-id-overflow',
+        "prompt-id-overflow",
       );
 
       const events = await fromAsync(stream);
@@ -1218,7 +1152,7 @@ ${JSON.stringify(
 
     it("should use the sticky model's token limit for the overflow check", async () => {
       // Arrange
-      const STICKY_MODEL = 'gemini-1.5-flash';
+      const STICKY_MODEL = "gemini-1.5-flash";
       const STICKY_MODEL_LIMIT = 1000;
       const CONFIG_MODEL_LIMIT = 2000;
 
@@ -1229,7 +1163,7 @@ ${JSON.stringify(
       });
 
       // Set the sticky model
-      client['currentSequenceModel'] = STICKY_MODEL;
+      client["currentSequenceModel"] = STICKY_MODEL;
 
       // Set token count
       const lastPromptTokenCount = 900;
@@ -1237,18 +1171,16 @@ ${JSON.stringify(
         getLastPromptTokenCount: vi.fn().mockReturnValue(lastPromptTokenCount),
         getHistory: vi.fn().mockReturnValue([]),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Remaining (sticky) = 100. Threshold (95%) = 95.
       // We need a request > 95 tokens.
-      const longText = 'a'.repeat(400);
+      const longText = "a".repeat(400);
       const request: Part[] = [{ text: longText }];
-      const estimatedRequestTokenCount = Math.floor(
-        JSON.stringify(request).length / 4,
-      );
+      const estimatedRequestTokenCount = Math.floor(JSON.stringify(request).length / 4);
       const remainingTokenCount = STICKY_MODEL_LIMIT - lastPromptTokenCount;
 
-      vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+      vi.spyOn(client, "tryCompressChat").mockResolvedValue({
         originalTokenCount: lastPromptTokenCount,
         newTokenCount: lastPromptTokenCount,
         compressionStatus: CompressionStatus.NOOP,
@@ -1258,7 +1190,7 @@ ${JSON.stringify(
       const stream = client.sendMessageStream(
         request,
         new AbortController().signal,
-        'test-session-id', // Use the same ID as the session to keep stickiness
+        "test-session-id", // Use the same ID as the session to keep stickiness
       );
 
       const events = await fromAsync(stream);
@@ -1276,14 +1208,12 @@ ${JSON.stringify(
       expect(mockTurnRunFn).not.toHaveBeenCalled();
     });
 
-    describe('Model Routing', () => {
+    describe("Model Routing", () => {
       let mockRouterService: { route: Mock };
 
       beforeEach(() => {
         mockRouterService = {
-          route: vi
-            .fn()
-            .mockResolvedValue({ model: 'routed-model', reason: 'test' }),
+          route: vi.fn().mockResolvedValue({ model: "routed-model", reason: "test" }),
         };
         vi.mocked(mockConfig.getModelRouterService).mockReturnValue(
           mockRouterService as unknown as ModelRouterService,
@@ -1291,7 +1221,7 @@ ${JSON.stringify(
 
         mockTurnRunFn.mockReturnValue(
           (async function* () {
-            yield { type: 'content', value: 'Hello' };
+            yield { type: "content", value: "Hello" };
           })(),
         );
 
@@ -1300,47 +1230,47 @@ ${JSON.stringify(
           getHistory: vi.fn().mockReturnValue([]),
           getLastPromptTokenCount: vi.fn(),
         };
-        client['chat'] = mockChat as GeminiChat;
+        client["chat"] = mockChat as GeminiChat;
       });
 
-      it('should use the model router service to select a model on the first turn', async () => {
+      it("should use the model router service to select a model on the first turn", async () => {
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream); // consume stream
 
         expect(mockConfig.getModelRouterService).toHaveBeenCalled();
         expect(mockRouterService.route).toHaveBeenCalled();
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          'routed-model', // The model from the router
-          [{ text: 'Hi' }],
+          "routed-model", // The model from the router
+          [{ text: "Hi" }],
           expect.any(Object),
         );
       });
 
-      it('should use the same model for subsequent turns in the same prompt (stickiness)', async () => {
+      it("should use the same model for subsequent turns in the same prompt (stickiness)", async () => {
         // First turn
         let stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
         expect(mockRouterService.route).toHaveBeenCalledTimes(1);
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          'routed-model',
-          [{ text: 'Hi' }],
+          "routed-model",
+          [{ text: "Hi" }],
           expect.any(Object),
         );
 
         // Second turn
         stream = client.sendMessageStream(
-          [{ text: 'Continue' }],
+          [{ text: "Continue" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
@@ -1348,37 +1278,37 @@ ${JSON.stringify(
         expect(mockRouterService.route).toHaveBeenCalledTimes(1);
         // Should stick to the first model
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          'routed-model',
-          [{ text: 'Continue' }],
+          "routed-model",
+          [{ text: "Continue" }],
           expect.any(Object),
         );
       });
 
-      it('should reset the sticky model and re-route when the prompt_id changes', async () => {
+      it("should reset the sticky model and re-route when the prompt_id changes", async () => {
         // First prompt
         let stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
         expect(mockRouterService.route).toHaveBeenCalledTimes(1);
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          'routed-model',
-          [{ text: 'Hi' }],
+          "routed-model",
+          [{ text: "Hi" }],
           expect.any(Object),
         );
 
         // New prompt
         mockRouterService.route.mockResolvedValue({
-          model: 'new-routed-model',
-          reason: 'test',
+          model: "new-routed-model",
+          reason: "test",
         });
         stream = client.sendMessageStream(
-          [{ text: 'A new topic' }],
+          [{ text: "A new topic" }],
           new AbortController().signal,
-          'prompt-2',
+          "prompt-2",
         );
         await fromAsync(stream);
 
@@ -1386,51 +1316,51 @@ ${JSON.stringify(
         expect(mockRouterService.route).toHaveBeenCalledTimes(2);
         // Should use the newly routed model
         expect(mockTurnRunFn).toHaveBeenCalledWith(
-          'new-routed-model',
-          [{ text: 'A new topic' }],
+          "new-routed-model",
+          [{ text: "A new topic" }],
           expect.any(Object),
         );
       });
 
-      it('should use the fallback model and bypass routing when in fallback mode', async () => {
+      it("should use the fallback model and bypass routing when in fallback mode", async () => {
         vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
         mockRouterService.route.mockResolvedValue({
           model: DEFAULT_GEMINI_FLASH_MODEL,
-          reason: 'fallback',
+          reason: "fallback",
         });
 
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-1',
+          "prompt-1",
         );
         await fromAsync(stream);
 
         expect(mockTurnRunFn).toHaveBeenCalledWith(
           DEFAULT_GEMINI_FLASH_MODEL,
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           expect.any(Object),
         );
       });
 
-      it('should stick to the fallback model for the entire sequence even if fallback mode ends', async () => {
+      it("should stick to the fallback model for the entire sequence even if fallback mode ends", async () => {
         // Start the sequence in fallback mode
         vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
         mockRouterService.route.mockResolvedValue({
           model: DEFAULT_GEMINI_FLASH_MODEL,
-          reason: 'fallback',
+          reason: "fallback",
         });
         let stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-fallback-stickiness',
+          "prompt-fallback-stickiness",
         );
         await fromAsync(stream);
 
         // First call should use fallback model
         expect(mockTurnRunFn).toHaveBeenCalledWith(
           DEFAULT_GEMINI_FLASH_MODEL,
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           expect.any(Object),
         );
 
@@ -1439,9 +1369,9 @@ ${JSON.stringify(
 
         // Second call in the same sequence
         stream = client.sendMessageStream(
-          [{ text: 'Continue' }],
+          [{ text: "Continue" }],
           new AbortController().signal,
-          'prompt-fallback-stickiness',
+          "prompt-fallback-stickiness",
         );
         await fromAsync(stream);
 
@@ -1449,37 +1379,33 @@ ${JSON.stringify(
         expect(mockTurnRunFn).toHaveBeenCalledTimes(2); // Ensure it was called again
         expect(mockTurnRunFn).toHaveBeenLastCalledWith(
           DEFAULT_GEMINI_FLASH_MODEL, // Still the fallback model
-          [{ text: 'Continue' }],
+          [{ text: "Continue" }],
           expect.any(Object),
         );
       });
     });
 
     it('should recursively call sendMessageStream with "Please continue." when InvalidStream event is received', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        true,
-      );
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(true);
       // Arrange
       const mockStream1 = (async function* () {
         yield { type: GeminiEventType.InvalidStream };
       })();
       const mockStream2 = (async function* () {
-        yield { type: GeminiEventType.Content, value: 'Continued content' };
+        yield { type: GeminiEventType.Content, value: "Continued content" };
       })();
 
-      mockTurnRunFn
-        .mockReturnValueOnce(mockStream1)
-        .mockReturnValueOnce(mockStream2);
+      mockTurnRunFn.mockReturnValueOnce(mockStream1).mockReturnValueOnce(mockStream2);
 
       const mockChat: Partial<GeminiChat> = {
         addHistory: vi.fn(),
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
-      const promptId = 'prompt-id-invalid-stream';
+      const initialRequest = [{ text: "Hi" }];
+      const promptId = "prompt-id-invalid-stream";
       const signal = new AbortController().signal;
 
       // Act
@@ -1489,7 +1415,7 @@ ${JSON.stringify(
       // Assert
       expect(events).toEqual([
         { type: GeminiEventType.InvalidStream },
-        { type: GeminiEventType.Content, value: 'Continued content' },
+        { type: GeminiEventType.Content, value: "Continued content" },
       ]);
 
       // Verify that turn.run was called twice
@@ -1507,15 +1433,13 @@ ${JSON.stringify(
       expect(mockTurnRunFn).toHaveBeenNthCalledWith(
         2,
         expect.any(String),
-        [{ text: 'System: Please continue.' }],
+        [{ text: "System: Please continue." }],
         expect.any(Object),
       );
     });
 
     it('should not recursively call sendMessageStream with "Please continue." when InvalidStream event is received and flag is false', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        false,
-      );
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(false);
       // Arrange
       const mockStream1 = (async function* () {
         yield { type: GeminiEventType.InvalidStream };
@@ -1528,10 +1452,10 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
-      const promptId = 'prompt-id-invalid-stream';
+      const initialRequest = [{ text: "Hi" }];
+      const promptId = "prompt-id-invalid-stream";
       const signal = new AbortController().signal;
 
       // Act
@@ -1545,10 +1469,8 @@ ${JSON.stringify(
       expect(mockTurnRunFn).toHaveBeenCalledTimes(1);
     });
 
-    it('should stop recursing after one retry when InvalidStream events are repeatedly received', async () => {
-      vi.spyOn(client['config'], 'getContinueOnFailedApiCall').mockReturnValue(
-        true,
-      );
+    it("should stop recursing after one retry when InvalidStream events are repeatedly received", async () => {
+      vi.spyOn(client["config"], "getContinueOnFailedApiCall").mockReturnValue(true);
       // Arrange
       // Always return a new invalid stream
       mockTurnRunFn.mockImplementation(() =>
@@ -1562,10 +1484,10 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
-      const initialRequest = [{ text: 'Hi' }];
-      const promptId = 'prompt-id-infinite-invalid-stream';
+      const initialRequest = [{ text: "Hi" }];
+      const promptId = "prompt-id-infinite-invalid-stream";
       const signal = new AbortController().signal;
 
       // Act
@@ -1575,27 +1497,25 @@ ${JSON.stringify(
       // Assert
       // We expect 2 InvalidStream events (original + 1 retry)
       expect(events.length).toBe(2);
-      expect(
-        events.every((e) => e.type === GeminiEventType.InvalidStream),
-      ).toBe(true);
+      expect(events.every((e) => e.type === GeminiEventType.InvalidStream)).toBe(true);
 
       // Verify that turn.run was called twice
       expect(mockTurnRunFn).toHaveBeenCalledTimes(2);
     });
 
-    describe('Editor context delta', () => {
+    describe("Editor context delta", () => {
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Hello' };
+        yield { type: "content", value: "Hello" };
       })();
 
       beforeEach(() => {
-        client['forceFullIdeContext'] = false; // Reset before each delta test
-        vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+        client["forceFullIdeContext"] = false; // Reset before each delta test
+        vi.spyOn(client, "tryCompressChat").mockResolvedValue({
           originalTokenCount: 0,
           newTokenCount: 0,
           compressionStatus: CompressionStatus.COMPRESSED,
         });
-        vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+        vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
         mockTurnRunFn.mockReturnValue(mockStream);
 
         const mockChat: Partial<GeminiChat> = {
@@ -1604,188 +1524,183 @@ ${JSON.stringify(
           // Assume history is not empty for delta checks
           getHistory: vi
             .fn()
-            .mockReturnValue([
-              { role: 'user', parts: [{ text: 'previous message' }] },
-            ]),
+            .mockReturnValue([{ role: "user", parts: [{ text: "previous message" }] }]),
           getLastPromptTokenCount: vi.fn(),
         };
-        client['chat'] = mockChat as GeminiChat;
+        client["chat"] = mockChat as GeminiChat;
       });
 
       const testCases = [
         {
-          description: 'sends delta when active file changes',
+          description: "sends delta when active file changes",
           previousActiveFile: {
-            path: '/path/to/old/file.ts',
+            path: "/path/to/old/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when cursor line changes',
+          description: "sends delta when cursor line changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 1, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when cursor character changes',
+          description: "sends delta when cursor character changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 1 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when selected text changes',
+          description: "sends delta when selected text changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'world',
+            selectedText: "world",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when selected text is added',
+          description: "sends delta when selected text is added",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: true,
         },
         {
-          description: 'sends delta when selected text is removed',
+          description: "sends delta when selected text is removed",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
           },
           shouldSendContext: true,
         },
         {
-          description: 'does not send context when nothing changes',
+          description: "does not send context when nothing changes",
           previousActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           currentActiveFile: {
-            path: '/path/to/active/file.ts',
+            path: "/path/to/active/file.ts",
             cursor: { line: 5, character: 10 },
-            selectedText: 'hello',
+            selectedText: "hello",
           },
           shouldSendContext: false,
         },
       ];
 
-      it.each(testCases)(
-        '$description',
-        async ({
-          previousActiveFile,
-          currentActiveFile,
-          shouldSendContext,
-        }) => {
-          // Setup previous context
-          client['lastSentIdeContext'] = {
-            workspaceState: {
-              openFiles: [
-                {
-                  path: previousActiveFile.path,
-                  cursor: previousActiveFile.cursor,
-                  selectedText: previousActiveFile.selectedText,
-                  isActive: true,
-                  timestamp: Date.now() - 1000,
-                },
-              ],
-            },
-          };
+      it.each(testCases)("$description", async ({
+        previousActiveFile,
+        currentActiveFile,
+        shouldSendContext,
+      }) => {
+        // Setup previous context
+        client["lastSentIdeContext"] = {
+          workspaceState: {
+            openFiles: [
+              {
+                path: previousActiveFile.path,
+                cursor: previousActiveFile.cursor,
+                selectedText: previousActiveFile.selectedText,
+                isActive: true,
+                timestamp: Date.now() - 1000,
+              },
+            ],
+          },
+        };
 
-          // Setup current context
-          vi.mocked(ideContextStore.get).mockReturnValue({
-            workspaceState: {
-              openFiles: [
-                {
-                  ...currentActiveFile,
-                  isActive: true,
-                  timestamp: Date.now(),
-                },
-              ],
-            },
-          });
+        // Setup current context
+        vi.mocked(ideContextStore.get).mockReturnValue({
+          workspaceState: {
+            openFiles: [
+              {
+                ...currentActiveFile,
+                isActive: true,
+                timestamp: Date.now(),
+              },
+            ],
+          },
+        });
 
-          const stream = client.sendMessageStream(
-            [{ text: 'Hi' }],
-            new AbortController().signal,
-            'prompt-id-delta',
-          );
-          for await (const _ of stream) {
-            // consume stream
-          }
+        const stream = client.sendMessageStream(
+          [{ text: "Hi" }],
+          new AbortController().signal,
+          "prompt-id-delta",
+        );
+        for await (const _ of stream) {
+          // consume stream
+        }
 
-          const mockChat = client['chat'] as unknown as {
-            addHistory: (typeof vi)['fn'];
-          };
+        const mockChat = client["chat"] as unknown as {
+          addHistory: (typeof vi)["fn"];
+        };
 
-          if (shouldSendContext) {
-            expect(mockChat.addHistory).toHaveBeenCalledWith(
-              expect.objectContaining({
-                parts: expect.arrayContaining([
-                  expect.objectContaining({
-                    text: expect.stringContaining(
-                      "Here is a summary of changes in the user's editor context",
-                    ),
-                  }),
-                ]),
-              }),
-            );
-          } else {
-            expect(mockChat.addHistory).not.toHaveBeenCalled();
-          }
-        },
-      );
+        if (shouldSendContext) {
+          expect(mockChat.addHistory).toHaveBeenCalledWith(
+            expect.objectContaining({
+              parts: expect.arrayContaining([
+                expect.objectContaining({
+                  text: expect.stringContaining(
+                    "Here is a summary of changes in the user's editor context",
+                  ),
+                }),
+              ]),
+            }),
+          );
+        } else {
+          expect(mockChat.addHistory).not.toHaveBeenCalled();
+        }
+      });
 
-      it('sends full context when history is cleared, even if editor state is unchanged', async () => {
+      it("sends full context when history is cleared, even if editor state is unchanged", async () => {
         const activeFile = {
-          path: '/path/to/active/file.ts',
+          path: "/path/to/active/file.ts",
           cursor: { line: 5, character: 10 },
-          selectedText: 'hello',
+          selectedText: "hello",
         };
 
         // Setup previous context
-        client['lastSentIdeContext'] = {
+        client["lastSentIdeContext"] = {
           workspaceState: {
             openFiles: [
               {
@@ -1802,23 +1717,21 @@ ${JSON.stringify(
         // Setup current context (same as previous)
         vi.mocked(ideContextStore.get).mockReturnValue({
           workspaceState: {
-            openFiles: [
-              { ...activeFile, isActive: true, timestamp: Date.now() },
-            ],
+            openFiles: [{ ...activeFile, isActive: true, timestamp: Date.now() }],
           },
         });
 
         // Make history empty
-        const mockChat = client['chat'] as unknown as {
-          getHistory: ReturnType<(typeof vi)['fn']>;
-          addHistory: ReturnType<(typeof vi)['fn']>;
+        const mockChat = client["chat"] as unknown as {
+          getHistory: ReturnType<(typeof vi)["fn"]>;
+          addHistory: ReturnType<(typeof vi)["fn"]>;
         };
         mockChat.getHistory.mockReturnValue([]);
 
         const stream = client.sendMessageStream(
-          [{ text: 'Hi' }],
+          [{ text: "Hi" }],
           new AbortController().signal,
-          'prompt-id-history-cleared',
+          "prompt-id-history-cleared",
         );
         for await (const _ of stream) {
           // consume stream
@@ -1828,9 +1741,7 @@ ${JSON.stringify(
           expect.objectContaining({
             parts: expect.arrayContaining([
               expect.objectContaining({
-                text: expect.stringContaining(
-                  "Here is the user's editor context",
-                ),
+                text: expect.stringContaining("Here is the user's editor context"),
               }),
             ]),
           }),
@@ -1839,26 +1750,24 @@ ${JSON.stringify(
         // Also verify it's the full context, not a delta.
         const call = mockChat.addHistory.mock.calls[0][0];
         const contextText = call.parts[0].text;
-        const contextJson = JSON.parse(
-          contextText.match(/```json\n(.*)\n```/s)![1],
-        );
-        expect(contextJson).toHaveProperty('activeFile');
-        expect(contextJson.activeFile.path).toBe('/path/to/active/file.ts');
+        const contextJson = JSON.parse(contextText.match(/```json\n(.*)\n```/s)![1]);
+        expect(contextJson).toHaveProperty("activeFile");
+        expect(contextJson.activeFile.path).toBe("/path/to/active/file.ts");
       });
     });
 
-    describe('IDE context with pending tool calls', () => {
+    describe("IDE context with pending tool calls", () => {
       let mockChat: Partial<GeminiChat>;
 
       beforeEach(() => {
-        vi.spyOn(client, 'tryCompressChat').mockResolvedValue({
+        vi.spyOn(client, "tryCompressChat").mockResolvedValue({
           originalTokenCount: 0,
           newTokenCount: 0,
           compressionStatus: CompressionStatus.COMPRESSED,
         });
 
         const mockStream = (async function* () {
-          yield { type: 'content', value: 'response' };
+          yield { type: "content", value: "response" };
         })();
         mockTurnRunFn.mockReturnValue(mockStream);
 
@@ -1868,23 +1777,23 @@ ${JSON.stringify(
           setHistory: vi.fn(),
           getLastPromptTokenCount: vi.fn(),
         };
-        client['chat'] = mockChat as GeminiChat;
+        client["chat"] = mockChat as GeminiChat;
 
-        vi.spyOn(client['config'], 'getIdeMode').mockReturnValue(true);
+        vi.spyOn(client["config"], "getIdeMode").mockReturnValue(true);
         vi.mocked(ideContextStore.get).mockReturnValue({
           workspaceState: {
-            openFiles: [{ path: '/path/to/file.ts', timestamp: Date.now() }],
+            openFiles: [{ path: "/path/to/file.ts", timestamp: Date.now() }],
           },
         });
       });
 
-      it('should NOT add IDE context when a tool call is pending', async () => {
+      it("should NOT add IDE context when a tool call is pending", async () => {
         // Arrange: History ends with a functionCall from the model
         const historyWithPendingCall: Content[] = [
-          { role: 'user', parts: [{ text: 'Please use a tool.' }] },
+          { role: "user", parts: [{ text: "Please use a tool." }] },
           {
-            role: 'model',
-            parts: [{ functionCall: { name: 'some_tool', args: {} } }],
+            role: "model",
+            parts: [{ functionCall: { name: "some_tool", args: {} } }],
           },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(historyWithPendingCall);
@@ -1894,13 +1803,13 @@ ${JSON.stringify(
           [
             {
               functionResponse: {
-                name: 'some_tool',
+                name: "some_tool",
                 response: { success: true },
               },
             },
           ],
           new AbortController().signal,
-          'prompt-id-tool-response',
+          "prompt-id-tool-response",
         );
         for await (const _ of stream) {
           // consume stream to complete the call
@@ -1918,19 +1827,19 @@ ${JSON.stringify(
         );
       });
 
-      it('should add IDE context when no tool call is pending', async () => {
+      it("should add IDE context when no tool call is pending", async () => {
         // Arrange: History is normal, no pending calls
         const normalHistory: Content[] = [
-          { role: 'user', parts: [{ text: 'A normal message.' }] },
-          { role: 'model', parts: [{ text: 'A normal response.' }] },
+          { role: "user", parts: [{ text: "A normal message." }] },
+          { role: "model", parts: [{ text: "A normal response." }] },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(normalHistory);
 
         // Act
         const stream = client.sendMessageStream(
-          [{ text: 'Another normal message' }],
+          [{ text: "Another normal message" }],
           new AbortController().signal,
-          'prompt-id-normal',
+          "prompt-id-normal",
         );
         for await (const _ of stream) {
           // consume stream
@@ -1939,7 +1848,7 @@ ${JSON.stringify(
         // Assert: The IDE context message SHOULD have been added.
         expect(mockChat.addHistory).toHaveBeenCalledWith(
           expect.objectContaining({
-            role: 'user',
+            role: "user",
             parts: expect.arrayContaining([
               expect.objectContaining({
                 text: expect.stringContaining("user's editor context"),
@@ -1949,15 +1858,15 @@ ${JSON.stringify(
         );
       });
 
-      it('should send the latest IDE context on the next message after a skipped context', async () => {
+      it("should send the latest IDE context on the next message after a skipped context", async () => {
         // --- Step 1: A tool call is pending, context should be skipped ---
 
         // Arrange: History ends with a functionCall
         const historyWithPendingCall: Content[] = [
-          { role: 'user', parts: [{ text: 'Please use a tool.' }] },
+          { role: "user", parts: [{ text: "Please use a tool." }] },
           {
-            role: 'model',
-            parts: [{ functionCall: { name: 'some_tool', args: {} } }],
+            role: "model",
+            parts: [{ functionCall: { name: "some_tool", args: {} } }],
           },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(historyWithPendingCall);
@@ -1965,7 +1874,7 @@ ${JSON.stringify(
         // Arrange: Set the initial IDE context
         const initialIdeContext = {
           workspaceState: {
-            openFiles: [{ path: '/path/to/fileA.ts', timestamp: Date.now() }],
+            openFiles: [{ path: "/path/to/fileA.ts", timestamp: Date.now() }],
           },
         };
         vi.mocked(ideContextStore.get).mockReturnValue(initialIdeContext);
@@ -1975,13 +1884,13 @@ ${JSON.stringify(
           [
             {
               functionResponse: {
-                name: 'some_tool',
+                name: "some_tool",
                 response: { success: true },
               },
             },
           ],
           new AbortController().signal,
-          'prompt-id-tool-response',
+          "prompt-id-tool-response",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2004,36 +1913,34 @@ ${JSON.stringify(
         const historyAfterToolResponse: Content[] = [
           ...historyWithPendingCall,
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
                 functionResponse: {
-                  name: 'some_tool',
+                  name: "some_tool",
                   response: { success: true },
                 },
               },
             ],
           },
-          { role: 'model', parts: [{ text: 'The tool ran successfully.' }] },
+          { role: "model", parts: [{ text: "The tool ran successfully." }] },
         ];
-        vi.mocked(mockChat.getHistory!).mockReturnValue(
-          historyAfterToolResponse,
-        );
+        vi.mocked(mockChat.getHistory!).mockReturnValue(historyAfterToolResponse);
         vi.mocked(mockChat.addHistory!).mockClear(); // Clear previous calls for the next assertion
 
         // Arrange: The IDE context has now changed
         const newIdeContext = {
           workspaceState: {
-            openFiles: [{ path: '/path/to/fileB.ts', timestamp: Date.now() }],
+            openFiles: [{ path: "/path/to/fileB.ts", timestamp: Date.now() }],
           },
         };
         vi.mocked(ideContextStore.get).mockReturnValue(newIdeContext);
 
         // Act: Send a new, regular user message
         stream = client.sendMessageStream(
-          [{ text: 'Thanks!' }],
+          [{ text: "Thanks!" }],
           new AbortController().signal,
-          'prompt-id-final',
+          "prompt-id-final",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2049,19 +1956,19 @@ ${JSON.stringify(
           "Here is the user's editor context as a JSON object",
         );
         // Check that the sent context is the new one (fileB.ts)
-        expect(JSON.stringify(contextCall![0])).toContain('fileB.ts');
+        expect(JSON.stringify(contextCall![0])).toContain("fileB.ts");
         // Check that the sent context is NOT the old one (fileA.ts)
-        expect(JSON.stringify(contextCall![0])).not.toContain('fileA.ts');
+        expect(JSON.stringify(contextCall![0])).not.toContain("fileA.ts");
       });
 
-      it('should send a context DELTA on the next message after a skipped context', async () => {
+      it("should send a context DELTA on the next message after a skipped context", async () => {
         // --- Step 0: Establish an initial context ---
         vi.mocked(mockChat.getHistory!).mockReturnValue([]); // Start with empty history
         const contextA = {
           workspaceState: {
             openFiles: [
               {
-                path: '/path/to/fileA.ts',
+                path: "/path/to/fileA.ts",
                 isActive: true,
                 timestamp: Date.now(),
               },
@@ -2072,9 +1979,9 @@ ${JSON.stringify(
 
         // Act: Send a regular message to establish the initial context
         let stream = client.sendMessageStream(
-          [{ text: 'Initial message' }],
+          [{ text: "Initial message" }],
           new AbortController().signal,
-          'prompt-id-initial',
+          "prompt-id-initial",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2082,19 +1989,17 @@ ${JSON.stringify(
 
         // Assert: Full context for fileA.ts was sent and stored.
         const initialCall = vi.mocked(mockChat.addHistory!).mock.calls[0][0];
-        expect(JSON.stringify(initialCall)).toContain(
-          "user's editor context as a JSON object",
-        );
-        expect(JSON.stringify(initialCall)).toContain('fileA.ts');
+        expect(JSON.stringify(initialCall)).toContain("user's editor context as a JSON object");
+        expect(JSON.stringify(initialCall)).toContain("fileA.ts");
         // This implicitly tests that `lastSentIdeContext` is now set internally by the client.
         vi.mocked(mockChat.addHistory!).mockClear();
 
         // --- Step 1: A tool call is pending, context should be skipped ---
         const historyWithPendingCall: Content[] = [
-          { role: 'user', parts: [{ text: 'Please use a tool.' }] },
+          { role: "user", parts: [{ text: "Please use a tool." }] },
           {
-            role: 'model',
-            parts: [{ functionCall: { name: 'some_tool', args: {} } }],
+            role: "model",
+            parts: [{ functionCall: { name: "some_tool", args: {} } }],
           },
         ];
         vi.mocked(mockChat.getHistory!).mockReturnValue(historyWithPendingCall);
@@ -2104,7 +2009,7 @@ ${JSON.stringify(
           workspaceState: {
             openFiles: [
               {
-                path: '/path/to/fileB.ts',
+                path: "/path/to/fileB.ts",
                 isActive: true,
                 timestamp: Date.now(),
               },
@@ -2118,13 +2023,13 @@ ${JSON.stringify(
           [
             {
               functionResponse: {
-                name: 'some_tool',
+                name: "some_tool",
                 response: { success: true },
               },
             },
           ],
           new AbortController().signal,
-          'prompt-id-tool-response',
+          "prompt-id-tool-response",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2137,21 +2042,19 @@ ${JSON.stringify(
         const historyAfterToolResponse: Content[] = [
           ...historyWithPendingCall,
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
                 functionResponse: {
-                  name: 'some_tool',
+                  name: "some_tool",
                   response: { success: true },
                 },
               },
             ],
           },
-          { role: 'model', parts: [{ text: 'The tool ran successfully.' }] },
+          { role: "model", parts: [{ text: "The tool ran successfully." }] },
         ];
-        vi.mocked(mockChat.getHistory!).mockReturnValue(
-          historyAfterToolResponse,
-        );
+        vi.mocked(mockChat.getHistory!).mockReturnValue(historyAfterToolResponse);
 
         // Arrange: The IDE context has changed again
         const contextC = {
@@ -2159,7 +2062,7 @@ ${JSON.stringify(
             openFiles: [
               // fileA is now closed, fileC is open
               {
-                path: '/path/to/fileC.ts',
+                path: "/path/to/fileC.ts",
                 isActive: true,
                 timestamp: Date.now(),
               },
@@ -2170,9 +2073,9 @@ ${JSON.stringify(
 
         // Act: Send a new, regular user message
         stream = client.sendMessageStream(
-          [{ text: 'Thanks!' }],
+          [{ text: "Thanks!" }],
           new AbortController().signal,
-          'prompt-id-final',
+          "prompt-id-final",
         );
         for await (const _ of stream) {
           /* consume */
@@ -2180,26 +2083,24 @@ ${JSON.stringify(
 
         // Assert: The DELTA context was sent
         const finalCall = vi.mocked(mockChat.addHistory!).mock.calls[0][0];
-        expect(JSON.stringify(finalCall)).toContain('summary of changes');
+        expect(JSON.stringify(finalCall)).toContain("summary of changes");
         // The delta should reflect fileA being closed and fileC being opened.
-        expect(JSON.stringify(finalCall)).toContain('filesClosed');
-        expect(JSON.stringify(finalCall)).toContain('fileA.ts');
-        expect(JSON.stringify(finalCall)).toContain('activeFileChanged');
-        expect(JSON.stringify(finalCall)).toContain('fileC.ts');
+        expect(JSON.stringify(finalCall)).toContain("filesClosed");
+        expect(JSON.stringify(finalCall)).toContain("fileA.ts");
+        expect(JSON.stringify(finalCall)).toContain("activeFileChanged");
+        expect(JSON.stringify(finalCall)).toContain("fileC.ts");
       });
     });
 
-    it('should not call checkNextSpeaker when turn.run() yields an error', async () => {
+    it("should not call checkNextSpeaker when turn.run() yields an error", async () => {
       // Arrange
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
 
       const mockStream = (async function* () {
         yield {
           type: GeminiEventType.Error,
-          value: { error: { message: 'test error' } },
+          value: { error: { message: "test error" } },
         };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
@@ -2209,13 +2110,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-error',
+        "prompt-id-error",
       );
       for await (const _ of stream) {
         // consume stream
@@ -2225,18 +2126,16 @@ ${JSON.stringify(
       expect(mockCheckNextSpeaker).not.toHaveBeenCalled();
     });
 
-    it('should not call checkNextSpeaker when turn.run() yields a value then an error', async () => {
+    it("should not call checkNextSpeaker when turn.run() yields a value then an error", async () => {
       // Arrange
-      const { checkNextSpeaker } = await import(
-        '../utils/nextSpeakerChecker.js'
-      );
+      const { checkNextSpeaker } = await import("../utils/nextSpeakerChecker.js");
       const mockCheckNextSpeaker = vi.mocked(checkNextSpeaker);
 
       const mockStream = (async function* () {
-        yield { type: GeminiEventType.Content, value: 'some content' };
+        yield { type: GeminiEventType.Content, value: "some content" };
         yield {
           type: GeminiEventType.Error,
-          value: { error: { message: 'test error' } },
+          value: { error: { message: "test error" } },
         };
       })();
       mockTurnRunFn.mockReturnValue(mockStream);
@@ -2246,13 +2145,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-error',
+        "prompt-id-error",
       );
       for await (const _ of stream) {
         // consume stream
@@ -2262,10 +2161,10 @@ ${JSON.stringify(
       expect(mockCheckNextSpeaker).not.toHaveBeenCalled();
     });
 
-    it('should abort linked signal when loop is detected', async () => {
+    it("should abort linked signal when loop is detected", async () => {
       // Arrange
-      vi.spyOn(client['loopDetector'], 'turnStarted').mockResolvedValue(false);
-      vi.spyOn(client['loopDetector'], 'addAndCheck')
+      vi.spyOn(client["loopDetector"], "turnStarted").mockResolvedValue(false);
+      vi.spyOn(client["loopDetector"], "addAndCheck")
         .mockReturnValueOnce(false)
         .mockReturnValueOnce(true);
 
@@ -2273,8 +2172,8 @@ ${JSON.stringify(
       mockTurnRunFn.mockImplementation((model, request, signal) => {
         capturedSignal = signal;
         return (async function* () {
-          yield { type: 'content', value: 'First event' };
-          yield { type: 'content', value: 'Second event' };
+          yield { type: "content", value: "First event" };
+          yield { type: "content", value: "Second event" };
         })();
       });
 
@@ -2283,13 +2182,13 @@ ${JSON.stringify(
         getHistory: vi.fn().mockReturnValue([]),
         getLastPromptTokenCount: vi.fn(),
       };
-      client['chat'] = mockChat as GeminiChat;
+      client["chat"] = mockChat as GeminiChat;
 
       // Act
       const stream = client.sendMessageStream(
-        [{ text: 'Hi' }],
+        [{ text: "Hi" }],
         new AbortController().signal,
-        'prompt-id-loop',
+        "prompt-id-loop",
       );
 
       const events = [];
@@ -2303,38 +2202,34 @@ ${JSON.stringify(
     });
   });
 
-  describe('generateContent', () => {
-    it('should call generateContent with the correct parameters', async () => {
-      const contents = [{ role: 'user', parts: [{ text: 'hello' }] }];
+  describe("generateContent", () => {
+    it("should call generateContent with the correct parameters", async () => {
+      const contents = [{ role: "user", parts: [{ text: "hello" }] }];
       const abortSignal = new AbortController().signal;
 
-      await client.generateContent(
-        { model: DEFAULT_GEMINI_FLASH_MODEL },
-        contents,
-        abortSignal,
-      );
+      await client.generateContent({ model: DEFAULT_GEMINI_FLASH_MODEL }, contents, abortSignal);
 
       expect(mockContentGenerator.generateContent).toHaveBeenCalledWith(
         {
           model: DEFAULT_GEMINI_FLASH_MODEL,
           config: {
             abortSignal,
-            systemInstruction: getCoreSystemPrompt({} as unknown as Config, ''),
+            systemInstruction: getCoreSystemPrompt({} as unknown as Config, ""),
             temperature: 0,
             topP: 1,
           },
           contents,
         },
-        'test-session-id',
+        "test-session-id",
       );
     });
 
-    it('should use current model from config for content generation', async () => {
-      const initialModel = client['config'].getModel();
-      const contents = [{ role: 'user', parts: [{ text: 'test' }] }];
-      const currentModel = initialModel + '-changed';
+    it("should use current model from config for content generation", async () => {
+      const initialModel = client["config"].getModel();
+      const contents = [{ role: "user", parts: [{ text: "test" }] }];
+      const currentModel = initialModel + "-changed";
 
-      vi.spyOn(client['config'], 'getModel').mockReturnValueOnce(currentModel);
+      vi.spyOn(client["config"], "getModel").mockReturnValueOnce(currentModel);
 
       await client.generateContent(
         { model: DEFAULT_GEMINI_FLASH_MODEL },
@@ -2353,29 +2248,25 @@ ${JSON.stringify(
           config: expect.any(Object),
           contents,
         },
-        'test-session-id',
+        "test-session-id",
       );
     });
 
-    it('should use the Flash model when fallback mode is active', async () => {
-      const contents = [{ role: 'user', parts: [{ text: 'hello' }] }];
+    it("should use the Flash model when fallback mode is active", async () => {
+      const contents = [{ role: "user", parts: [{ text: "hello" }] }];
       const abortSignal = new AbortController().signal;
-      const requestedModel = 'gemini-2.5-pro'; // A non-flash model
+      const requestedModel = "gemini-2.5-pro"; // A non-flash model
 
       // Mock config to be in fallback mode
-      vi.spyOn(client['config'], 'isInFallbackMode').mockReturnValue(true);
+      vi.spyOn(client["config"], "isInFallbackMode").mockReturnValue(true);
 
-      await client.generateContent(
-        { model: requestedModel },
-        contents,
-        abortSignal,
-      );
+      await client.generateContent({ model: requestedModel }, contents, abortSignal);
 
       expect(mockGenerateContentFn).toHaveBeenCalledWith(
         expect.objectContaining({
           model: DEFAULT_GEMINI_FLASH_MODEL,
         }),
-        'test-session-id',
+        "test-session-id",
       );
     });
   });
diff --git a/packages/gemini-core/src/core/client.ts b/packages/gemini-core/src/core/client.ts
index 5e4848c68..867c402bd 100644
--- a/packages/gemini-core/src/core/client.ts
+++ b/packages/gemini-core/src/core/client.ts
@@ -5,66 +5,53 @@
  */
 
 import type {
+  Content,
   GenerateContentConfig,
+  GenerateContentResponse,
   PartListUnion,
-  Content,
   Tool,
-  GenerateContentResponse,
-} from '@google/genai';
-import {
-  getDirectoryContextString,
-  getInitialChatHistory,
-} from '../utils/environmentContext.js';
-import type { ServerGeminiStreamEvent, ChatCompressionInfo } from './turn.js';
-import { CompressionStatus } from './turn.js';
-import { Turn, GeminiEventType } from './turn.js';
-import type { Config } from '../config/config.js';
-import { getCoreSystemPrompt } from './prompts.js';
-import { checkNextSpeaker } from '../utils/nextSpeakerChecker.js';
-import { reportError } from '../utils/errorReporting.js';
-import { GeminiChat } from './geminiChat.js';
-import { retryWithBackoff } from '../utils/retry.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { tokenLimit } from './tokenLimits.js';
-import type {
-  ChatRecordingService,
-  ResumedSessionData,
-} from '../services/chatRecordingService.js';
-import type { ContentGenerator } from './contentGenerator.js';
+} from "@google/genai";
+import type { Config } from "../config/config.js";
 import {
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   DEFAULT_GEMINI_MODEL_AUTO,
   DEFAULT_THINKING_MODE,
   getEffectiveModel,
-} from '../config/models.js';
-import { LoopDetectionService } from '../services/loopDetectionService.js';
-import { ChatCompressionService } from '../services/chatCompressionService.js';
-import { ideContextStore } from '../ide/ideContext.js';
-import {
-  logContentRetryFailure,
-  logNextSpeakerCheck,
-} from '../telemetry/loggers.js';
-import {
-  ContentRetryFailureEvent,
-  NextSpeakerCheckEvent,
-} from '../telemetry/types.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
-import type { IdeContext, File } from '../ide/types.js';
-import { handleFallback } from '../fallback/handler.js';
-import type { RoutingContext } from '../routing/routingStrategy.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
+} from "../config/models.js";
+import { handleFallback } from "../fallback/handler.js";
+import { ideContextStore } from "../ide/ideContext.js";
+import type { File, IdeContext } from "../ide/types.js";
+import type { RoutingContext } from "../routing/routingStrategy.js";
+import { ChatCompressionService } from "../services/chatCompressionService.js";
+import type { ChatRecordingService, ResumedSessionData } from "../services/chatRecordingService.js";
+import { LoopDetectionService } from "../services/loopDetectionService.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import { logContentRetryFailure, logNextSpeakerCheck } from "../telemetry/loggers.js";
+import { ContentRetryFailureEvent, NextSpeakerCheckEvent } from "../telemetry/types.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getDirectoryContextString, getInitialChatHistory } from "../utils/environmentContext.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { checkNextSpeaker } from "../utils/nextSpeakerChecker.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { GeminiChat } from "./geminiChat.js";
+import { getCoreSystemPrompt } from "./prompts.js";
+import { tokenLimit } from "./tokenLimits.js";
+import type { ChatCompressionInfo, ServerGeminiStreamEvent } from "./turn.js";
+import { CompressionStatus, GeminiEventType, Turn } from "./turn.js";
 
 export function isThinkingSupported(model: string) {
-  return model.startsWith('gemini-2.5') || model === DEFAULT_GEMINI_MODEL_AUTO;
+  return model.startsWith("gemini-2.5") || model === DEFAULT_GEMINI_MODEL_AUTO;
 }
 
 export function isThinkingDefault(model: string) {
-  if (model.startsWith('gemini-2.5-flash-lite')) {
+  if (model.startsWith("gemini-2.5-flash-lite")) {
     return false;
   }
-  return model.startsWith('gemini-2.5') || model === DEFAULT_GEMINI_MODEL_AUTO;
+  return model.startsWith("gemini-2.5") || model === DEFAULT_GEMINI_MODEL_AUTO;
 }
 
 const MAX_TURNS = 100;
@@ -98,9 +85,7 @@ export class GeminiClient {
 
   private updateTelemetryTokenCount() {
     if (this.chat) {
-      uiTelemetryService.setLastPromptTokenCount(
-        this.chat.getLastPromptTokenCount(),
-      );
+      uiTelemetryService.setLastPromptTokenCount(this.chat.getLastPromptTokenCount());
     }
   }
 
@@ -111,7 +96,7 @@ export class GeminiClient {
 
   private getContentGeneratorOrFail(): ContentGenerator {
     if (!this.config.getContentGenerator()) {
-      throw new Error('Content generator not initialized');
+      throw new Error("Content generator not initialized");
     }
     return this.config.getContentGenerator();
   }
@@ -122,7 +107,7 @@ export class GeminiClient {
 
   getChat(): GeminiChat {
     if (!this.chat) {
-      throw new Error('Chat not initialized');
+      throw new Error("Chat not initialized");
     }
     return this.chat;
   }
@@ -156,10 +141,7 @@ export class GeminiClient {
     this.updateTelemetryTokenCount();
   }
 
-  async resumeChat(
-    history: Content[],
-    resumedSessionData?: ResumedSessionData,
-  ): Promise<void> {
+  async resumeChat(history: Content[], resumedSessionData?: ResumedSessionData): Promise<void> {
     this.chat = await this.startChat(history, resumedSessionData);
   }
 
@@ -181,7 +163,7 @@ export class GeminiClient {
     }
 
     this.getChat().addHistory({
-      role: 'user',
+      role: "user",
       parts: [{ text: await getDirectoryContextString(this.config) }],
     });
   }
@@ -224,12 +206,7 @@ export class GeminiClient {
         resumedSessionData,
       );
     } catch (error) {
-      await reportError(
-        error,
-        'Error initializing Gemini chat session.',
-        history,
-        'startChat',
-      );
+      await reportError(error, "Error initializing Gemini chat session.", history, "startChat");
       throw new Error(`Failed to initialize chat: ${getErrorMessage(error)}`);
     }
   }
@@ -247,14 +224,12 @@ export class GeminiClient {
       // Send full context as JSON
       const openFiles = currentIdeContext.workspaceState?.openFiles || [];
       const activeFile = openFiles.find((f) => f.isActive);
-      const otherOpenFiles = openFiles
-        .filter((f) => !f.isActive)
-        .map((f) => f.path);
+      const otherOpenFiles = openFiles.filter((f) => !f.isActive).map((f) => f.path);
 
       const contextData: Record<string, unknown> = {};
 
       if (activeFile) {
-        contextData['activeFile'] = {
+        contextData["activeFile"] = {
           path: activeFile.path,
           cursor: activeFile.cursor
             ? {
@@ -267,7 +242,7 @@ export class GeminiClient {
       }
 
       if (otherOpenFiles.length > 0) {
-        contextData['otherOpenFiles'] = otherOpenFiles;
+        contextData["otherOpenFiles"] = otherOpenFiles;
       }
 
       if (Object.keys(contextData).length === 0) {
@@ -277,13 +252,13 @@ export class GeminiClient {
       const jsonString = JSON.stringify(contextData, null, 2);
       const contextParts = [
         "Here is the user's editor context as a JSON object. This is for your information only.",
-        '```json',
+        "```json",
         jsonString,
-        '```',
+        "```",
       ];
 
       if (this.config.getDebugMode()) {
-        debugLogger.log(contextParts.join('\n'));
+        debugLogger.log(contextParts.join("\n"));
       }
       return {
         contextParts,
@@ -295,15 +270,10 @@ export class GeminiClient {
       const changes: Record<string, unknown> = {};
 
       const lastFiles = new Map(
-        (this.lastSentIdeContext.workspaceState?.openFiles || []).map(
-          (f: File) => [f.path, f],
-        ),
+        (this.lastSentIdeContext.workspaceState?.openFiles || []).map((f: File) => [f.path, f]),
       );
       const currentFiles = new Map(
-        (currentIdeContext.workspaceState?.openFiles || []).map((f: File) => [
-          f.path,
-          f,
-        ]),
+        (currentIdeContext.workspaceState?.openFiles || []).map((f: File) => [f.path, f]),
       );
 
       const openedFiles: string[] = [];
@@ -313,7 +283,7 @@ export class GeminiClient {
         }
       }
       if (openedFiles.length > 0) {
-        changes['filesOpened'] = openedFiles;
+        changes["filesOpened"] = openedFiles;
       }
 
       const closedFiles: string[] = [];
@@ -323,19 +293,19 @@ export class GeminiClient {
         }
       }
       if (closedFiles.length > 0) {
-        changes['filesClosed'] = closedFiles;
+        changes["filesClosed"] = closedFiles;
       }
 
-      const lastActiveFile = (
-        this.lastSentIdeContext.workspaceState?.openFiles || []
-      ).find((f: File) => f.isActive);
-      const currentActiveFile = (
-        currentIdeContext.workspaceState?.openFiles || []
-      ).find((f: File) => f.isActive);
+      const lastActiveFile = (this.lastSentIdeContext.workspaceState?.openFiles || []).find(
+        (f: File) => f.isActive,
+      );
+      const currentActiveFile = (currentIdeContext.workspaceState?.openFiles || []).find(
+        (f: File) => f.isActive,
+      );
 
       if (currentActiveFile) {
         if (!lastActiveFile || lastActiveFile.path !== currentActiveFile.path) {
-          changes['activeFileChanged'] = {
+          changes["activeFileChanged"] = {
             path: currentActiveFile.path,
             cursor: currentActiveFile.cursor
               ? {
@@ -354,7 +324,7 @@ export class GeminiClient {
               lastCursor.line !== currentCursor.line ||
               lastCursor.character !== currentCursor.character)
           ) {
-            changes['cursorMoved'] = {
+            changes["cursorMoved"] = {
               path: currentActiveFile.path,
               cursor: {
                 line: currentCursor.line,
@@ -363,17 +333,17 @@ export class GeminiClient {
             };
           }
 
-          const lastSelectedText = lastActiveFile.selectedText || '';
-          const currentSelectedText = currentActiveFile.selectedText || '';
+          const lastSelectedText = lastActiveFile.selectedText || "";
+          const currentSelectedText = currentActiveFile.selectedText || "";
           if (lastSelectedText !== currentSelectedText) {
-            changes['selectionChanged'] = {
+            changes["selectionChanged"] = {
               path: currentActiveFile.path,
               selectedText: currentSelectedText,
             };
           }
         }
       } else if (lastActiveFile) {
-        changes['activeFileChanged'] = {
+        changes["activeFileChanged"] = {
           path: null,
           previousPath: lastActiveFile.path,
         };
@@ -383,17 +353,17 @@ export class GeminiClient {
         return { contextParts: [], newIdeContext: currentIdeContext };
       }
 
-      delta['changes'] = changes;
+      delta["changes"] = changes;
       const jsonString = JSON.stringify(delta, null, 2);
       const contextParts = [
         "Here is a summary of changes in the user's editor context, in JSON format. This is for your information only.",
-        '```json',
+        "```json",
         jsonString,
-        '```',
+        "```",
       ];
 
       if (this.config.getDebugMode()) {
-        debugLogger.log(contextParts.join('\n'));
+        debugLogger.log(contextParts.join("\n"));
       }
       return {
         contextParts,
@@ -409,9 +379,7 @@ export class GeminiClient {
 
     const configModel = this.config.getModel();
     const model: string =
-      configModel === DEFAULT_GEMINI_MODEL_AUTO
-        ? DEFAULT_GEMINI_MODEL
-        : configModel;
+      configModel === DEFAULT_GEMINI_MODEL_AUTO ? DEFAULT_GEMINI_MODEL : configModel;
     return getEffectiveModel(this.config.isInFallbackMode(), model);
   }
 
@@ -444,9 +412,7 @@ export class GeminiClient {
     // Check for context window overflow
     const modelForLimitCheck = this._getEffectiveModelForCurrentTurn();
 
-    const estimatedRequestTokenCount = Math.floor(
-      JSON.stringify(request).length / 4,
-    );
+    const estimatedRequestTokenCount = Math.floor(JSON.stringify(request).length / 4);
 
     const remainingTokenCount =
       tokenLimit(modelForLimitCheck) - this.getChat().getLastPromptTokenCount();
@@ -471,12 +437,11 @@ export class GeminiClient {
     // in the conversation history . The IDE context is not discarded; it will
     // be included in the next regular message sent to the model.
     const history = this.getHistory();
-    const lastMessage =
-      history.length > 0 ? history[history.length - 1] : undefined;
+    const lastMessage = history.length > 0 ? history[history.length - 1] : undefined;
     const hasPendingToolCall =
       !!lastMessage &&
-      lastMessage.role === 'model' &&
-      (lastMessage.parts?.some((p) => 'functionCall' in p) || false);
+      lastMessage.role === "model" &&
+      (lastMessage.parts?.some((p) => "functionCall" in p) || false);
 
     if (this.config.getIdeMode() && !hasPendingToolCall) {
       const { contextParts, newIdeContext } = this.getIdeContextParts(
@@ -484,8 +449,8 @@ export class GeminiClient {
       );
       if (contextParts.length > 0) {
         this.getChat().addHistory({
-          role: 'user',
-          parts: [{ text: contextParts.join('\n') }],
+          role: "user",
+          parts: [{ text: contextParts.join("\n") }],
         });
       }
       this.lastSentIdeContext = newIdeContext;
@@ -541,13 +506,13 @@ export class GeminiClient {
               this.config,
               new ContentRetryFailureEvent(
                 4, // 2 initial + 2 after injections
-                'FAILED_AFTER_PROMPT_INJECTION',
+                "FAILED_AFTER_PROMPT_INJECTION",
                 modelToUse,
               ),
             );
             return turn;
           }
-          const nextRequest = [{ text: 'System: Please continue.' }];
+          const nextRequest = [{ text: "System: Please continue." }];
           yield* this.sendMessageStream(
             nextRequest,
             signal,
@@ -582,12 +547,12 @@ export class GeminiClient {
         this.config,
         new NextSpeakerCheckEvent(
           prompt_id,
-          turn.finishReason?.toString() || '',
-          nextSpeakerCheck?.next_speaker || '',
+          turn.finishReason?.toString() || "",
+          nextSpeakerCheck?.next_speaker || "",
         ),
       );
-      if (nextSpeakerCheck?.next_speaker === 'model') {
-        const nextRequest = [{ text: 'Please continue.' }];
+      if (nextSpeakerCheck?.next_speaker === "model") {
+        const nextRequest = [{ text: "Please continue." }];
         // This recursive call's events will be yielded out, but the final
         // turn object will be from the top-level call.
         yield* this.sendMessageStream(
@@ -607,17 +572,13 @@ export class GeminiClient {
     contents: Content[],
     abortSignal: AbortSignal,
   ): Promise<GenerateContentResponse> {
-    const desiredModelConfig =
-      this.config.modelConfigService.getResolvedConfig(modelConfigKey);
-    let {
-      model: currentAttemptModel,
-      generateContentConfig: currentAttemptGenerateContentConfig,
-    } = desiredModelConfig;
-    const fallbackModelConfig =
-      this.config.modelConfigService.getResolvedConfig({
-        ...modelConfigKey,
-        model: DEFAULT_GEMINI_FLASH_MODEL,
-      });
+    const desiredModelConfig = this.config.modelConfigService.getResolvedConfig(modelConfigKey);
+    let { model: currentAttemptModel, generateContentConfig: currentAttemptGenerateContentConfig } =
+      desiredModelConfig;
+    const fallbackModelConfig = this.config.modelConfigService.getResolvedConfig({
+      ...modelConfigKey,
+      model: DEFAULT_GEMINI_FLASH_MODEL,
+    });
 
     try {
       const userMemory = this.config.getUserMemory();
@@ -628,8 +589,7 @@ export class GeminiClient {
           ? fallbackModelConfig
           : desiredModelConfig;
         currentAttemptModel = modelConfigToUse.model;
-        currentAttemptGenerateContentConfig =
-          modelConfigToUse.generateContentConfig;
+        currentAttemptGenerateContentConfig = modelConfigToUse.generateContentConfig;
         const requestConfig: GenerateContentConfig = {
           ...currentAttemptGenerateContentConfig,
           abortSignal,
@@ -645,10 +605,7 @@ export class GeminiClient {
           this.lastPromptId,
         );
       };
-      const onPersistent429Callback = async (
-        authType?: string,
-        error?: unknown,
-      ) =>
+      const onPersistent429Callback = async (authType?: string, error?: unknown) =>
         // Pass the captured model to the centralized handler.
         await handleFallback(this.config, currentAttemptModel, authType, error);
 
@@ -669,7 +626,7 @@ export class GeminiClient {
           requestContents: contents,
           requestConfig: currentAttemptGenerateContentConfig,
         },
-        'generateContent-api',
+        "generateContent-api",
       );
       throw new Error(
         `Failed to generate content with model ${currentAttemptModel}: ${getErrorMessage(error)}`,
@@ -677,10 +634,7 @@ export class GeminiClient {
     }
   }
 
-  async tryCompressChat(
-    prompt_id: string,
-    force: boolean = false,
-  ): Promise<ChatCompressionInfo> {
+  async tryCompressChat(prompt_id: string, force: boolean = false): Promise<ChatCompressionInfo> {
     // If the model is 'auto', we will use a placeholder model to check.
     // Compression occurs before we choose a model, so calling `count_tokens`
     // before the model is chosen would result in an error.
@@ -695,10 +649,7 @@ export class GeminiClient {
       this.hasFailedCompressionAttempt,
     );
 
-    if (
-      info.compressionStatus ===
-      CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT
-    ) {
+    if (info.compressionStatus === CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT) {
       this.hasFailedCompressionAttempt = !force && true;
     } else if (info.compressionStatus === CompressionStatus.COMPRESSED) {
       if (newHistory) {
diff --git a/packages/gemini-core/src/core/contentGenerator.test.ts b/packages/gemini-core/src/core/contentGenerator.test.ts
index ac5cb2f13..35bfbee3e 100644
--- a/packages/gemini-core/src/core/contentGenerator.test.ts
+++ b/packages/gemini-core/src/core/contentGenerator.test.ts
@@ -4,38 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { ContentGenerator } from './contentGenerator.js';
+import { GoogleGenAI } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createCodeAssistContentGenerator } from "../code_assist/codeAssist.js";
+import type { Config } from "../config/config.js";
+import { loadApiKey } from "./apiKeyCredentialStorage.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 import {
-  createContentGenerator,
   AuthType,
+  createContentGenerator,
   createContentGeneratorConfig,
-} from './contentGenerator.js';
-import { createCodeAssistContentGenerator } from '../code_assist/codeAssist.js';
-import { GoogleGenAI } from '@google/genai';
-import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from './loggingContentGenerator.js';
-import { loadApiKey } from './apiKeyCredentialStorage.js';
-import { FakeContentGenerator } from './fakeContentGenerator.js';
-import { RecordingContentGenerator } from './recordingContentGenerator.js';
-
-vi.mock('../code_assist/codeAssist.js');
-vi.mock('@google/genai');
-vi.mock('./apiKeyCredentialStorage.js', () => ({
+} from "./contentGenerator.js";
+import { FakeContentGenerator } from "./fakeContentGenerator.js";
+import { LoggingContentGenerator } from "./loggingContentGenerator.js";
+import { RecordingContentGenerator } from "./recordingContentGenerator.js";
+
+vi.mock("../code_assist/codeAssist.js");
+vi.mock("@google/genai");
+vi.mock("./apiKeyCredentialStorage.js", () => ({
   loadApiKey: vi.fn(),
 }));
 
-vi.mock('./fakeContentGenerator.js');
+vi.mock("./fakeContentGenerator.js");
 
 const mockConfig = {} as unknown as Config;
 
-describe('createContentGenerator', () => {
-  it('should create a FakeContentGenerator', async () => {
+describe("createContentGenerator", () => {
+  it("should create a FakeContentGenerator", async () => {
     const mockGenerator = {} as unknown as ContentGenerator;
-    vi.mocked(FakeContentGenerator.fromFile).mockResolvedValue(
-      mockGenerator as never,
-    );
-    const fakeResponsesFile = 'fake/responses.yaml';
+    vi.mocked(FakeContentGenerator.fromFile).mockResolvedValue(mockGenerator as never);
+    const fakeResponsesFile = "fake/responses.yaml";
     const mockConfigWithFake = {
       fakeResponses: fakeResponsesFile,
     } as unknown as Config;
@@ -45,15 +43,13 @@ describe('createContentGenerator', () => {
       },
       mockConfigWithFake,
     );
-    expect(FakeContentGenerator.fromFile).toHaveBeenCalledWith(
-      fakeResponsesFile,
-    );
+    expect(FakeContentGenerator.fromFile).toHaveBeenCalledWith(fakeResponsesFile);
     expect(generator).toEqual(mockGenerator);
   });
 
-  it('should create a RecordingContentGenerator', async () => {
-    const fakeResponsesFile = 'fake/responses.yaml';
-    const recordResponsesFile = 'record/responses.yaml';
+  it("should create a RecordingContentGenerator", async () => {
+    const fakeResponsesFile = "fake/responses.yaml";
+    const recordResponsesFile = "record/responses.yaml";
     const mockConfigWithRecordResponses = {
       fakeResponses: fakeResponsesFile,
       recordResponses: recordResponsesFile,
@@ -67,11 +63,9 @@ describe('createContentGenerator', () => {
     expect(generator).toBeInstanceOf(RecordingContentGenerator);
   });
 
-  it('should create a CodeAssistContentGenerator', async () => {
+  it("should create a CodeAssistContentGenerator", async () => {
     const mockGenerator = {} as unknown as ContentGenerator;
-    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(
-      mockGenerator as never,
-    );
+    vi.mocked(createCodeAssistContentGenerator).mockResolvedValue(mockGenerator as never);
     const generator = await createContentGenerator(
       {
         authType: AuthType.LOGIN_WITH_GOOGLE,
@@ -79,12 +73,10 @@ describe('createContentGenerator', () => {
       mockConfig,
     );
     expect(createCodeAssistContentGenerator).toHaveBeenCalled();
-    expect(generator).toEqual(
-      new LoggingContentGenerator(mockGenerator, mockConfig),
-    );
+    expect(generator).toEqual(new LoggingContentGenerator(mockGenerator, mockConfig));
   });
 
-  it('should create a GoogleGenAI content generator', async () => {
+  it("should create a GoogleGenAI content generator", async () => {
     const mockConfig = {
       getUsageStatisticsEnabled: () => true,
     } as unknown as Config;
@@ -95,30 +87,27 @@ describe('createContentGenerator', () => {
     vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator as never);
     const generator = await createContentGenerator(
       {
-        apiKey: 'test-api-key',
+        apiKey: "test-api-key",
         authType: AuthType.USE_GEMINI,
       },
       mockConfig,
     );
     expect(GoogleGenAI).toHaveBeenCalledWith({
-      apiKey: 'test-api-key',
+      apiKey: "test-api-key",
       vertexai: undefined,
       httpOptions: {
         headers: {
-          'User-Agent': expect.any(String),
-          'x-gemini-api-privileged-user-id': expect.any(String),
+          "User-Agent": expect.any(String),
+          "x-gemini-api-privileged-user-id": expect.any(String),
         },
       },
     });
     expect(generator).toEqual(
-      new LoggingContentGenerator(
-        (mockGenerator as GoogleGenAI).models,
-        mockConfig,
-      ),
+      new LoggingContentGenerator((mockGenerator as GoogleGenAI).models, mockConfig),
     );
   });
 
-  it('should create a GoogleGenAI content generator with client install id logging disabled', async () => {
+  it("should create a GoogleGenAI content generator with client install id logging disabled", async () => {
     const mockConfig = {
       getUsageStatisticsEnabled: () => false,
     } as unknown as Config;
@@ -128,32 +117,29 @@ describe('createContentGenerator', () => {
     vi.mocked(GoogleGenAI).mockImplementation(() => mockGenerator as never);
     const generator = await createContentGenerator(
       {
-        apiKey: 'test-api-key',
+        apiKey: "test-api-key",
         authType: AuthType.USE_GEMINI,
       },
       mockConfig,
     );
     expect(GoogleGenAI).toHaveBeenCalledWith({
-      apiKey: 'test-api-key',
+      apiKey: "test-api-key",
       vertexai: undefined,
       httpOptions: {
         headers: {
-          'User-Agent': expect.any(String),
+          "User-Agent": expect.any(String),
         },
       },
     });
     expect(generator).toEqual(
-      new LoggingContentGenerator(
-        (mockGenerator as GoogleGenAI).models,
-        mockConfig,
-      ),
+      new LoggingContentGenerator((mockGenerator as GoogleGenAI).models, mockConfig),
     );
   });
 });
 
-describe('createContentGeneratorConfig', () => {
+describe("createContentGeneratorConfig", () => {
   const mockConfig = {
-    getModel: vi.fn().mockReturnValue('gemini-pro'),
+    getModel: vi.fn().mockReturnValue("gemini-pro"),
     setModel: vi.fn(),
     flashFallbackHandler: vi.fn(),
     getProxy: vi.fn(),
@@ -169,67 +155,49 @@ describe('createContentGeneratorConfig', () => {
     vi.unstubAllEnvs();
   });
 
-  it('should configure for Gemini using GEMINI_API_KEY when set', async () => {
-    vi.stubEnv('GEMINI_API_KEY', 'env-gemini-key');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_GEMINI,
-    );
-    expect(config.apiKey).toBe('env-gemini-key');
+  it("should configure for Gemini using GEMINI_API_KEY when set", async () => {
+    vi.stubEnv("GEMINI_API_KEY", "env-gemini-key");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_GEMINI);
+    expect(config.apiKey).toBe("env-gemini-key");
     expect(config.vertexai).toBe(false);
   });
 
-  it('should not configure for Gemini if GEMINI_API_KEY is empty', async () => {
-    vi.stubEnv('GEMINI_API_KEY', '');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_GEMINI,
-    );
+  it("should not configure for Gemini if GEMINI_API_KEY is empty", async () => {
+    vi.stubEnv("GEMINI_API_KEY", "");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_GEMINI);
     expect(config.apiKey).toBeUndefined();
     expect(config.vertexai).toBeUndefined();
   });
 
-  it('should not configure for Gemini if GEMINI_API_KEY is not set and storage is empty', async () => {
-    vi.stubEnv('GEMINI_API_KEY', '');
+  it("should not configure for Gemini if GEMINI_API_KEY is not set and storage is empty", async () => {
+    vi.stubEnv("GEMINI_API_KEY", "");
     vi.mocked(loadApiKey).mockResolvedValue(null);
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_GEMINI,
-    );
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_GEMINI);
     expect(config.apiKey).toBeUndefined();
     expect(config.vertexai).toBeUndefined();
   });
 
-  it('should configure for Vertex AI using GOOGLE_API_KEY when set', async () => {
-    vi.stubEnv('GOOGLE_API_KEY', 'env-google-key');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_VERTEX_AI,
-    );
-    expect(config.apiKey).toBe('env-google-key');
+  it("should configure for Vertex AI using GOOGLE_API_KEY when set", async () => {
+    vi.stubEnv("GOOGLE_API_KEY", "env-google-key");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_VERTEX_AI);
+    expect(config.apiKey).toBe("env-google-key");
     expect(config.vertexai).toBe(true);
   });
 
-  it('should configure for Vertex AI using GCP project and location when set', async () => {
-    vi.stubEnv('GOOGLE_API_KEY', undefined);
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', 'env-gcp-project');
-    vi.stubEnv('GOOGLE_CLOUD_LOCATION', 'env-gcp-location');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_VERTEX_AI,
-    );
+  it("should configure for Vertex AI using GCP project and location when set", async () => {
+    vi.stubEnv("GOOGLE_API_KEY", undefined);
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "env-gcp-project");
+    vi.stubEnv("GOOGLE_CLOUD_LOCATION", "env-gcp-location");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_VERTEX_AI);
     expect(config.vertexai).toBe(true);
     expect(config.apiKey).toBeUndefined();
   });
 
-  it('should not configure for Vertex AI if required env vars are empty', async () => {
-    vi.stubEnv('GOOGLE_API_KEY', '');
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', '');
-    vi.stubEnv('GOOGLE_CLOUD_LOCATION', '');
-    const config = await createContentGeneratorConfig(
-      mockConfig,
-      AuthType.USE_VERTEX_AI,
-    );
+  it("should not configure for Vertex AI if required env vars are empty", async () => {
+    vi.stubEnv("GOOGLE_API_KEY", "");
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", "");
+    vi.stubEnv("GOOGLE_CLOUD_LOCATION", "");
+    const config = await createContentGeneratorConfig(mockConfig, AuthType.USE_VERTEX_AI);
     expect(config.apiKey).toBeUndefined();
     expect(config.vertexai).toBeUndefined();
   });
diff --git a/packages/gemini-core/src/core/contentGenerator.ts b/packages/gemini-core/src/core/contentGenerator.ts
index 6fac941e0..ebf6cd427 100644
--- a/packages/gemini-core/src/core/contentGenerator.ts
+++ b/packages/gemini-core/src/core/contentGenerator.ts
@@ -5,23 +5,22 @@
  */
 
 import type {
-  CountTokensResponse,
-  GenerateContentResponse,
-  GenerateContentParameters,
   CountTokensParameters,
-  EmbedContentResponse,
+  CountTokensResponse,
   EmbedContentParameters,
-} from '@google/genai';
-import { GoogleGenAI } from '@google/genai';
-import { createCodeAssistContentGenerator } from '../code_assist/codeAssist.js';
-import type { Config } from '../config/config.js';
-import { loadApiKey } from './apiKeyCredentialStorage.js';
-
-import type { UserTierId } from '../code_assist/types.js';
-import { LoggingContentGenerator } from './loggingContentGenerator.js';
-import { InstallationManager } from '../utils/installationManager.js';
-import { FakeContentGenerator } from './fakeContentGenerator.js';
-import { RecordingContentGenerator } from './recordingContentGenerator.js';
+  EmbedContentResponse,
+  GenerateContentParameters,
+  GenerateContentResponse,
+} from "@google/genai";
+import { GoogleGenAI } from "@google/genai";
+import { createCodeAssistContentGenerator } from "../code_assist/codeAssist.js";
+import type { UserTierId } from "../code_assist/types.js";
+import type { Config } from "../config/config.js";
+import { InstallationManager } from "../utils/installationManager.js";
+import { loadApiKey } from "./apiKeyCredentialStorage.js";
+import { FakeContentGenerator } from "./fakeContentGenerator.js";
+import { LoggingContentGenerator } from "./loggingContentGenerator.js";
+import { RecordingContentGenerator } from "./recordingContentGenerator.js";
 
 /**
  * Interface abstracting the core functionalities for generating content and counting tokens.
@@ -45,10 +44,10 @@ export interface ContentGenerator {
 }
 
 export enum AuthType {
-  LOGIN_WITH_GOOGLE = 'oauth-personal',
-  USE_GEMINI = 'gemini-api-key',
-  USE_VERTEX_AI = 'vertex-ai',
-  CLOUD_SHELL = 'cloud-shell',
+  LOGIN_WITH_GOOGLE = "oauth-personal",
+  USE_GEMINI = "gemini-api-key",
+  USE_VERTEX_AI = "vertex-ai",
+  CLOUD_SHELL = "cloud-shell",
 }
 
 export type ContentGeneratorConfig = {
@@ -62,14 +61,11 @@ export async function createContentGeneratorConfig(
   config: Config,
   authType: AuthType | undefined,
 ): Promise<ContentGeneratorConfig> {
-  const geminiApiKey =
-    (await loadApiKey()) || process.env['GEMINI_API_KEY'] || undefined;
-  const googleApiKey = process.env['GOOGLE_API_KEY'] || undefined;
+  const geminiApiKey = (await loadApiKey()) || process.env["GEMINI_API_KEY"] || undefined;
+  const googleApiKey = process.env["GOOGLE_API_KEY"] || undefined;
   const googleCloudProject =
-    process.env['GOOGLE_CLOUD_PROJECT'] ||
-    process.env['GOOGLE_CLOUD_PROJECT_ID'] ||
-    undefined;
-  const googleCloudLocation = process.env['GOOGLE_CLOUD_LOCATION'] || undefined;
+    process.env["GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT_ID"] || undefined;
+  const googleCloudLocation = process.env["GOOGLE_CLOUD_LOCATION"] || undefined;
 
   const contentGeneratorConfig: ContentGeneratorConfig = {
     authType,
@@ -77,10 +73,7 @@ export async function createContentGeneratorConfig(
   };
 
   // If we are using Google auth or we are in Cloud Shell, there is nothing else to validate for now
-  if (
-    authType === AuthType.LOGIN_WITH_GOOGLE ||
-    authType === AuthType.CLOUD_SHELL
-  ) {
+  if (authType === AuthType.LOGIN_WITH_GOOGLE || authType === AuthType.CLOUD_SHELL) {
     return contentGeneratorConfig;
   }
 
@@ -113,10 +106,10 @@ export async function createContentGenerator(
     if (gcConfig.fakeResponses) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
-    const version = process.env['CLI_VERSION'] || process.version;
+    const version = process.env["CLI_VERSION"] || process.version;
     const userAgent = `GeminiCLI/${version} (${process.platform}; ${process.arch})`;
     const baseHeaders: Record<string, string> = {
-      'User-Agent': userAgent,
+      "User-Agent": userAgent,
     };
     if (
       config.authType === AuthType.LOGIN_WITH_GOOGLE ||
@@ -124,41 +117,31 @@ export async function createContentGenerator(
     ) {
       const httpOptions = { headers: baseHeaders };
       return new LoggingContentGenerator(
-        await createCodeAssistContentGenerator(
-          httpOptions,
-          config.authType,
-          gcConfig,
-          sessionId,
-        ),
+        await createCodeAssistContentGenerator(httpOptions, config.authType, gcConfig, sessionId),
         gcConfig,
       );
     }
 
-    if (
-      config.authType === AuthType.USE_GEMINI ||
-      config.authType === AuthType.USE_VERTEX_AI
-    ) {
+    if (config.authType === AuthType.USE_GEMINI || config.authType === AuthType.USE_VERTEX_AI) {
       let headers: Record<string, string> = { ...baseHeaders };
       if (gcConfig?.getUsageStatisticsEnabled()) {
         const installationManager = new InstallationManager();
         const installationId = installationManager.getInstallationId();
         headers = {
           ...headers,
-          'x-gemini-api-privileged-user-id': `${installationId}`,
+          "x-gemini-api-privileged-user-id": `${installationId}`,
         };
       }
       const httpOptions = { headers };
 
       const googleGenAI = new GoogleGenAI({
-        apiKey: config.apiKey === '' ? undefined : config.apiKey,
+        apiKey: config.apiKey === "" ? undefined : config.apiKey,
         vertexai: config.vertexai,
         httpOptions,
       });
       return new LoggingContentGenerator(googleGenAI.models, gcConfig);
     }
-    throw new Error(
-      `Error creating contentGenerator: Unsupported authType: ${config.authType}`,
-    );
+    throw new Error(`Error creating contentGenerator: Unsupported authType: ${config.authType}`);
   })();
 
   if (gcConfig.recordResponses) {
diff --git a/packages/gemini-core/src/core/coreToolScheduler.test.ts b/packages/gemini-core/src/core/coreToolScheduler.test.ts
index bf75e4433..efc069323 100644
--- a/packages/gemini-core/src/core/coreToolScheduler.test.ts
+++ b/packages/gemini-core/src/core/coreToolScheduler.test.ts
@@ -4,75 +4,70 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type { Mock } from 'vitest';
-import type { ToolCall, WaitingToolCall } from './coreToolScheduler.js';
-import {
-  CoreToolScheduler,
-  convertToFunctionResponse,
-  truncateAndSaveToFile,
-} from './coreToolScheduler.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { Part, PartListUnion } from "@google/genai";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import type {
+  AnyToolInvocation,
+  Config,
   ToolCallConfirmationDetails,
   ToolConfirmationPayload,
   ToolInvocation,
-  ToolResult,
-  Config,
   ToolRegistry,
-  AnyToolInvocation,
-} from '../index.js';
+  ToolResult,
+} from "../index.js";
 import {
-  DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-  DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+  ApprovalMode,
   BaseDeclarativeTool,
   BaseToolInvocation,
-  ToolConfirmationOutcome,
+  DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
+  DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   Kind,
-  ApprovalMode,
-} from '../index.js';
-import type { Part, PartListUnion } from '@google/genai';
+  ToolConfirmationOutcome,
+} from "../index.js";
 import {
+  MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
   MockModifiableTool,
   MockTool,
-  MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
-} from '../test-utils/mock-tool.js';
-import * as modifiableToolModule from '../tools/modifiable-tool.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isShellInvocationAllowlisted } from '../utils/shell-utils.js';
+} from "../test-utils/mock-tool.js";
+import * as modifiableToolModule from "../tools/modifiable-tool.js";
+import { isShellInvocationAllowlisted } from "../utils/shell-utils.js";
+import type { ToolCall, WaitingToolCall } from "./coreToolScheduler.js";
+import {
+  CoreToolScheduler,
+  convertToFunctionResponse,
+  truncateAndSaveToFile,
+} from "./coreToolScheduler.js";
 
-vi.mock('fs/promises', () => ({
+vi.mock("fs/promises", () => ({
   writeFile: vi.fn(),
 }));
 
 class TestApprovalTool extends BaseDeclarativeTool<{ id: string }, ToolResult> {
-  static readonly Name = 'testApprovalTool';
+  static readonly Name = "testApprovalTool";
 
   constructor(private config: Config) {
     super(
       TestApprovalTool.Name,
-      'TestApprovalTool',
-      'A tool for testing approval logic',
+      "TestApprovalTool",
+      "A tool for testing approval logic",
       Kind.Edit,
       {
-        properties: { id: { type: 'string' } },
-        required: ['id'],
-        type: 'object',
+        properties: { id: { type: "string" } },
+        required: ["id"],
+        type: "object",
       },
     );
   }
 
-  protected createInvocation(params: {
-    id: string;
-  }): ToolInvocation<{ id: string }, ToolResult> {
+  protected createInvocation(params: { id: string }): ToolInvocation<{ id: string }, ToolResult> {
     return new TestApprovalInvocation(this.config, params);
   }
 }
 
-class TestApprovalInvocation extends BaseToolInvocation<
-  { id: string },
-  ToolResult
-> {
+class TestApprovalInvocation extends BaseToolInvocation<{ id: string }, ToolResult> {
   constructor(
     private config: Config,
     params: { id: string },
@@ -84,22 +79,20 @@ class TestApprovalInvocation extends BaseToolInvocation<
     return `Test tool ${this.params.id}`;
   }
 
-  override async shouldConfirmExecute(): Promise<
-    ToolCallConfirmationDetails | false
-  > {
+  override async shouldConfirmExecute(): Promise<ToolCallConfirmationDetails | false> {
     // Need confirmation unless approval mode is AUTO_EDIT
     if (this.config.getApprovalMode() === ApprovalMode.AUTO_EDIT) {
       return false;
     }
 
     return {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Test Tool ${this.params.id}`,
       fileName: `test-${this.params.id}.txt`,
       filePath: `/test-${this.params.id}.txt`,
-      fileDiff: 'Test diff content',
-      originalContent: '',
-      newContent: 'Test content',
+      fileDiff: "Test diff content",
+      originalContent: "",
+      newContent: "Test content",
       onConfirm: async (outcome: ToolConfirmationOutcome) => {
         if (outcome === ToolConfirmationOutcome.ProceedAlways) {
           this.config.setApprovalMode(ApprovalMode.AUTO_EDIT);
@@ -136,29 +129,26 @@ class AbortDuringConfirmationInvocation extends BaseToolInvocation<
   }
 
   async execute(_abortSignal: AbortSignal): Promise<ToolResult> {
-    throw new Error('execute should not be called when confirmation fails');
+    throw new Error("execute should not be called when confirmation fails");
   }
 
   getDescription(): string {
-    return 'Abort during confirmation invocation';
+    return "Abort during confirmation invocation";
   }
 }
 
-class AbortDuringConfirmationTool extends BaseDeclarativeTool<
-  Record<string, unknown>,
-  ToolResult
-> {
+class AbortDuringConfirmationTool extends BaseDeclarativeTool<Record<string, unknown>, ToolResult> {
   constructor(
     private readonly abortController: AbortController,
     private readonly abortError: Error,
   ) {
     super(
-      'abortDuringConfirmationTool',
-      'Abort During Confirmation Tool',
-      'A tool that aborts while confirming execution.',
+      "abortDuringConfirmationTool",
+      "Abort During Confirmation Tool",
+      "A tool that aborts while confirming execution.",
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {},
       },
     );
@@ -167,17 +157,13 @@ class AbortDuringConfirmationTool extends BaseDeclarativeTool<
   protected createInvocation(
     params: Record<string, unknown>,
   ): ToolInvocation<Record<string, unknown>, ToolResult> {
-    return new AbortDuringConfirmationInvocation(
-      this.abortController,
-      this.abortError,
-      params,
-    );
+    return new AbortDuringConfirmationInvocation(this.abortController, this.abortError, params);
   }
 }
 
 async function waitForStatus(
   onToolCallsUpdate: Mock,
-  status: 'awaiting_approval' | 'executing' | 'success' | 'error' | 'cancelled',
+  status: "awaiting_approval" | "executing" | "success" | "error" | "cancelled",
   timeout = 5000,
 ): Promise<ToolCall> {
   return new Promise((resolve, reject) => {
@@ -189,9 +175,7 @@ async function waitForStatus(
           .map((toolCall: ToolCall) => toolCall.status);
         reject(
           new Error(
-            `Timed out waiting for status "${status}". Seen statuses: ${seenStatuses.join(
-              ', ',
-            )}`,
+            `Timed out waiting for status "${status}". Seen statuses: ${seenStatuses.join(", ")}`,
           ),
         );
         return;
@@ -226,25 +210,24 @@ function createMockConfig(overrides: Partial<Config> = {}): Config {
   } as unknown as ToolRegistry;
 
   const baseConfig = {
-    getSessionId: () => 'test-session-id',
+    getSessionId: () => "test-session-id",
     getUsageStatisticsEnabled: () => true,
     getDebugMode: () => false,
     getApprovalMode: () => ApprovalMode.DEFAULT,
     setApprovalMode: () => {},
     getAllowedTools: () => [],
     getContentGeneratorConfig: () => ({
-      model: 'test-model',
-      authType: 'oauth-personal',
+      model: "test-model",
+      authType: "oauth-personal",
     }),
     getShellExecutionConfig: () => ({
       terminalWidth: 90,
       terminalHeight: 30,
     }),
     storage: {
-      getProjectTempDir: () => '/tmp',
+      getProjectTempDir: () => "/tmp",
     },
-    getTruncateToolOutputThreshold: () =>
-      DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+    getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
     getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
     getToolRegistry: () => defaultToolRegistry,
     getUseSmartEdit: () => false,
@@ -258,10 +241,10 @@ function createMockConfig(overrides: Partial<Config> = {}): Config {
   return { ...baseConfig, ...overrides } as Config;
 }
 
-describe('CoreToolScheduler', () => {
-  it('should cancel a tool call if the signal is aborted before confirmation', async () => {
+describe("CoreToolScheduler", () => {
+  it("should cancel a tool call if the signal is aborted before confirmation", async () => {
     const mockTool = new MockTool({
-      name: 'mockTool',
+      name: "mockTool",
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
     const declarativeTool = mockTool;
@@ -291,41 +274,40 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockTool',
+      callId: "1",
+      name: "mockTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-1',
+      prompt_id: "prompt-id-1",
     };
 
     abortController.abort();
     await scheduler.schedule([request], abortController.signal);
 
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('cancelled');
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
+    expect(completedCalls[0].status).toBe("cancelled");
   });
 
-  it('should cancel all tools when cancelAll is called', async () => {
+  it("should cancel all tools when cancelAll is called", async () => {
     const mockTool1 = new MockTool({
-      name: 'mockTool1',
+      name: "mockTool1",
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
-    const mockTool2 = new MockTool({ name: 'mockTool2' });
-    const mockTool3 = new MockTool({ name: 'mockTool3' });
+    const mockTool2 = new MockTool({ name: "mockTool2" });
+    const mockTool3 = new MockTool({ name: "mockTool3" });
 
     const mockToolRegistry = {
       getTool: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getFunctionDeclarations: () => [],
@@ -333,9 +315,9 @@ describe('CoreToolScheduler', () => {
       discovery: {},
       registerTool: () => {},
       getToolByName: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getToolByDisplayName: () => undefined,
@@ -357,32 +339,32 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool1',
+        callId: "1",
+        name: "mockTool1",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '2',
-        name: 'mockTool2',
+        callId: "2",
+        name: "mockTool2",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '3',
-        name: 'mockTool3',
+        callId: "3",
+        name: "mockTool3",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
     ];
 
@@ -390,7 +372,7 @@ describe('CoreToolScheduler', () => {
     void scheduler.schedule(requests, abortController.signal);
 
     // Wait for the first tool to be awaiting approval
-    await waitForStatus(onToolCallsUpdate, 'awaiting_approval');
+    await waitForStatus(onToolCallsUpdate, "awaiting_approval");
 
     // Cancel all operations
     scheduler.cancelAll(abortController.signal);
@@ -400,34 +382,27 @@ describe('CoreToolScheduler', () => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
 
     expect(completedCalls).toHaveLength(3);
-    expect(completedCalls.find((c) => c.request.callId === '1')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '2')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '3')?.status).toBe(
-      'cancelled',
-    );
+    expect(completedCalls.find((c) => c.request.callId === "1")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "2")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "3")?.status).toBe("cancelled");
   });
 
-  it('should cancel all tools in a batch when one is cancelled via confirmation', async () => {
+  it("should cancel all tools in a batch when one is cancelled via confirmation", async () => {
     const mockTool1 = new MockTool({
-      name: 'mockTool1',
+      name: "mockTool1",
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
-    const mockTool2 = new MockTool({ name: 'mockTool2' });
-    const mockTool3 = new MockTool({ name: 'mockTool3' });
+    const mockTool2 = new MockTool({ name: "mockTool2" });
+    const mockTool3 = new MockTool({ name: "mockTool3" });
 
     const mockToolRegistry = {
       getTool: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getFunctionDeclarations: () => [],
@@ -435,9 +410,9 @@ describe('CoreToolScheduler', () => {
       discovery: {},
       registerTool: () => {},
       getToolByName: (name: string) => {
-        if (name === 'mockTool1') return mockTool1;
-        if (name === 'mockTool2') return mockTool2;
-        if (name === 'mockTool3') return mockTool3;
+        if (name === "mockTool1") return mockTool1;
+        if (name === "mockTool2") return mockTool2;
+        if (name === "mockTool3") return mockTool3;
         return undefined;
       },
       getToolByDisplayName: () => undefined,
@@ -459,32 +434,32 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool1',
+        callId: "1",
+        name: "mockTool1",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '2',
-        name: 'mockTool2',
+        callId: "2",
+        name: "mockTool2",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
       {
-        callId: '3',
-        name: 'mockTool3',
+        callId: "3",
+        name: "mockTool3",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-1',
+        prompt_id: "prompt-id-1",
       },
     ];
 
@@ -494,41 +469,29 @@ describe('CoreToolScheduler', () => {
     // Wait for the first tool to be awaiting approval
     const awaitingCall = (await waitForStatus(
       onToolCallsUpdate,
-      'awaiting_approval',
+      "awaiting_approval",
     )) as WaitingToolCall;
 
     // Cancel the first tool via its confirmation handler
-    await awaitingCall.confirmationDetails.onConfirm(
-      ToolConfirmationOutcome.Cancel,
-    );
+    await awaitingCall.confirmationDetails.onConfirm(ToolConfirmationOutcome.Cancel);
     abortController.abort(); // User cancelling often involves an abort signal
 
     await vi.waitFor(() => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
 
     expect(completedCalls).toHaveLength(3);
-    expect(completedCalls.find((c) => c.request.callId === '1')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '2')?.status).toBe(
-      'cancelled',
-    );
-    expect(completedCalls.find((c) => c.request.callId === '3')?.status).toBe(
-      'cancelled',
-    );
+    expect(completedCalls.find((c) => c.request.callId === "1")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "2")?.status).toBe("cancelled");
+    expect(completedCalls.find((c) => c.request.callId === "3")?.status).toBe("cancelled");
   });
 
-  it('should mark tool call as cancelled when abort happens during confirmation error', async () => {
+  it("should mark tool call as cancelled when abort happens during confirmation error", async () => {
     const abortController = new AbortController();
-    const abortError = new Error('Abort requested during confirmation');
-    const declarativeTool = new AbortDuringConfirmationTool(
-      abortController,
-      abortError,
-    );
+    const abortError = new Error("Abort requested during confirmation");
+    const declarativeTool = new AbortDuringConfirmationTool(abortController, abortError);
 
     const mockToolRegistry = {
       getTool: () => declarativeTool,
@@ -556,35 +519,34 @@ describe('CoreToolScheduler', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const request = {
-      callId: 'abort-1',
-      name: 'abortDuringConfirmationTool',
+      callId: "abort-1",
+      name: "abortDuringConfirmationTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-abort',
+      prompt_id: "prompt-id-abort",
     };
 
     await scheduler.schedule([request], abortController.signal);
 
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('cancelled');
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
+    expect(completedCalls[0].status).toBe("cancelled");
     const statuses = onToolCallsUpdate.mock.calls.flatMap((call) =>
       (call[0] as ToolCall[]).map((toolCall) => toolCall.status),
     );
-    expect(statuses).not.toContain('error');
+    expect(statuses).not.toContain("error");
   });
 
-  describe('getToolSuggestion', () => {
-    it('should suggest the top N closest tool names for a typo', () => {
+  describe("getToolSuggestion", () => {
+    it("should suggest the top N closest tool names for a typo", () => {
       // Create mocked tool registry
       const mockToolRegistry = {
-        getAllToolNames: () => ['list_files', 'read_file', 'write_file'],
+        getAllToolNames: () => ["list_files", "read_file", "write_file"],
       } as unknown as ToolRegistry;
       const mockConfig = createMockConfig({
         getToolRegistry: () => mockToolRegistry,
@@ -594,23 +556,23 @@ describe('CoreToolScheduler', () => {
       // Create scheduler
       const scheduler = new CoreToolScheduler({
         config: mockConfig,
-        getPreferredEditor: () => 'vscode',
+        getPreferredEditor: () => "vscode",
         onEditorClose: vi.fn(),
       });
 
       // Test that the right tool is selected, with only 1 result, for typos
       // @ts-expect-error accessing private method
-      const misspelledTool = scheduler.getToolSuggestion('list_fils', 1);
+      const misspelledTool = scheduler.getToolSuggestion("list_fils", 1);
       expect(misspelledTool).toBe(' Did you mean "list_files"?');
 
       // Test that the right tool is selected, with only 1 result, for prefixes
       // @ts-expect-error accessing private method
-      const prefixedTool = scheduler.getToolSuggestion('github.list_files', 1);
+      const prefixedTool = scheduler.getToolSuggestion("github.list_files", 1);
       expect(prefixedTool).toBe(' Did you mean "list_files"?');
 
       // Test that the right tool is first
       // @ts-expect-error accessing private method
-      const suggestionMultiple = scheduler.getToolSuggestion('list_fils');
+      const suggestionMultiple = scheduler.getToolSuggestion("list_fils");
       expect(suggestionMultiple).toBe(
         ' Did you mean one of: "list_files", "read_file", "write_file"?',
       );
@@ -618,8 +580,8 @@ describe('CoreToolScheduler', () => {
   });
 });
 
-describe('CoreToolScheduler with payload', () => {
-  it('should update args and diff and execute tool when payload is provided', async () => {
+describe("CoreToolScheduler with payload", () => {
+  it("should update args and diff and execute tool when payload is provided", async () => {
     const mockTool = new MockModifiableTool();
     mockTool.executeFn = vi.fn();
     const declarativeTool = mockTool;
@@ -649,33 +611,30 @@ describe('CoreToolScheduler with payload', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockModifiableTool',
+      callId: "1",
+      name: "mockModifiableTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-2',
+      prompt_id: "prompt-id-2",
     };
 
     await scheduler.schedule([request], abortController.signal);
 
     const awaitingCall = (await waitForStatus(
       onToolCallsUpdate,
-      'awaiting_approval',
+      "awaiting_approval",
     )) as WaitingToolCall;
     const confirmationDetails = awaitingCall.confirmationDetails;
 
     if (confirmationDetails) {
-      const payload: ToolConfirmationPayload = { newContent: 'final version' };
-      await confirmationDetails.onConfirm(
-        ToolConfirmationOutcome.ProceedOnce,
-        payload,
-      );
+      const payload: ToolConfirmationPayload = { newContent: "final version" };
+      await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce, payload);
     }
 
     // Wait for the tool execution to complete
@@ -683,64 +642,63 @@ describe('CoreToolScheduler with payload', () => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('success');
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
+    expect(completedCalls[0].status).toBe("success");
     expect(mockTool.executeFn).toHaveBeenCalledWith({
-      newContent: 'final version',
+      newContent: "final version",
     });
   });
 });
 
-describe('convertToFunctionResponse', () => {
-  const toolName = 'testTool';
-  const callId = 'call1';
+describe("convertToFunctionResponse", () => {
+  const toolName = "testTool";
+  const callId = "call1";
 
-  it('should handle simple string llmContent', () => {
-    const llmContent = 'Simple text output';
+  it("should handle simple string llmContent", () => {
+    const llmContent = "Simple text output";
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Simple text output' },
+          response: { output: "Simple text output" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as a single Part with text', () => {
-    const llmContent: Part = { text: 'Text from Part object' };
+  it("should handle llmContent as a single Part with text", () => {
+    const llmContent: Part = { text: "Text from Part object" };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Text from Part object' },
+          response: { output: "Text from Part object" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as a PartListUnion array with a single text Part', () => {
-    const llmContent: PartListUnion = [{ text: 'Text from array' }];
+  it("should handle llmContent as a PartListUnion array with a single text Part", () => {
+    const llmContent: PartListUnion = [{ text: "Text from array" }];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Text from array' },
+          response: { output: "Text from array" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent with inlineData', () => {
+  it("should handle llmContent with inlineData", () => {
     const llmContent: Part = {
-      inlineData: { mimeType: 'image/png', data: 'base64...' },
+      inlineData: { mimeType: "image/png", data: "base64..." },
     };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -749,7 +707,7 @@ describe('convertToFunctionResponse', () => {
           name: toolName,
           id: callId,
           response: {
-            output: 'Binary content of type image/png was processed.',
+            output: "Binary content of type image/png was processed.",
           },
         },
       },
@@ -757,9 +715,9 @@ describe('convertToFunctionResponse', () => {
     ]);
   });
 
-  it('should handle llmContent with fileData', () => {
+  it("should handle llmContent with fileData", () => {
     const llmContent: Part = {
-      fileData: { mimeType: 'application/pdf', fileUri: 'gs://...' },
+      fileData: { mimeType: "application/pdf", fileUri: "gs://..." },
     };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -768,7 +726,7 @@ describe('convertToFunctionResponse', () => {
           name: toolName,
           id: callId,
           response: {
-            output: 'Binary content of type application/pdf was processed.',
+            output: "Binary content of type application/pdf was processed.",
           },
         },
       },
@@ -776,11 +734,11 @@ describe('convertToFunctionResponse', () => {
     ]);
   });
 
-  it('should handle llmContent as an array of multiple Parts (text and inlineData)', () => {
+  it("should handle llmContent as an array of multiple Parts (text and inlineData)", () => {
     const llmContent: PartListUnion = [
-      { text: 'Some textual description' },
-      { inlineData: { mimeType: 'image/jpeg', data: 'base64data...' } },
-      { text: 'Another text part' },
+      { text: "Some textual description" },
+      { inlineData: { mimeType: "image/jpeg", data: "base64data..." } },
+      { text: "Another text part" },
     ];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -788,16 +746,16 @@ describe('convertToFunctionResponse', () => {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
       ...llmContent,
     ]);
   });
 
-  it('should handle llmContent as an array with a single inlineData Part', () => {
+  it("should handle llmContent as an array with a single inlineData Part", () => {
     const llmContent: PartListUnion = [
-      { inlineData: { mimeType: 'image/gif', data: 'gifdata...' } },
+      { inlineData: { mimeType: "image/gif", data: "gifdata..." } },
     ];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -806,7 +764,7 @@ describe('convertToFunctionResponse', () => {
           name: toolName,
           id: callId,
           response: {
-            output: 'Binary content of type image/gif was processed.',
+            output: "Binary content of type image/gif was processed.",
           },
         },
       },
@@ -814,35 +772,35 @@ describe('convertToFunctionResponse', () => {
     ]);
   });
 
-  it('should handle llmContent as a generic Part (not text, inlineData, or fileData)', () => {
-    const llmContent: Part = { functionCall: { name: 'test', args: {} } };
+  it("should handle llmContent as a generic Part (not text, inlineData, or fileData)", () => {
+    const llmContent: Part = { functionCall: { name: "test", args: {} } };
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
     ]);
   });
 
-  it('should handle empty string llmContent', () => {
-    const llmContent = '';
+  it("should handle empty string llmContent", () => {
+    const llmContent = "";
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
       {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: '' },
+          response: { output: "" },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as an empty array', () => {
+  it("should handle llmContent as an empty array", () => {
     const llmContent: PartListUnion = [];
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -850,13 +808,13 @@ describe('convertToFunctionResponse', () => {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
     ]);
   });
 
-  it('should handle llmContent as a Part with undefined inlineData/fileData/text', () => {
+  it("should handle llmContent as a Part with undefined inlineData/fileData/text", () => {
     const llmContent: Part = {}; // An empty part object
     const result = convertToFunctionResponse(toolName, callId, llmContent);
     expect(result).toEqual([
@@ -864,55 +822,48 @@ describe('convertToFunctionResponse', () => {
         functionResponse: {
           name: toolName,
           id: callId,
-          response: { output: 'Tool execution succeeded.' },
+          response: { output: "Tool execution succeeded." },
         },
       },
     ]);
   });
 });
 
-class MockEditToolInvocation extends BaseToolInvocation<
-  Record<string, unknown>,
-  ToolResult
-> {
+class MockEditToolInvocation extends BaseToolInvocation<Record<string, unknown>, ToolResult> {
   constructor(params: Record<string, unknown>) {
     super(params);
   }
 
   getDescription(): string {
-    return 'A mock edit tool invocation';
+    return "A mock edit tool invocation";
   }
 
   override async shouldConfirmExecute(
     _abortSignal: AbortSignal,
   ): Promise<ToolCallConfirmationDetails | false> {
     return {
-      type: 'edit',
-      title: 'Confirm Edit',
-      fileName: 'test.txt',
-      filePath: 'test.txt',
-      fileDiff:
-        '--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content',
-      originalContent: 'old content',
-      newContent: 'new content',
+      type: "edit",
+      title: "Confirm Edit",
+      fileName: "test.txt",
+      filePath: "test.txt",
+      fileDiff: "--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content",
+      originalContent: "old content",
+      newContent: "new content",
       onConfirm: async () => {},
     };
   }
 
   async execute(_abortSignal: AbortSignal): Promise<ToolResult> {
     return {
-      llmContent: 'Edited successfully',
-      returnDisplay: 'Edited successfully',
+      llmContent: "Edited successfully",
+      returnDisplay: "Edited successfully",
     };
   }
 }
 
-class MockEditTool extends BaseDeclarativeTool<
-  Record<string, unknown>,
-  ToolResult
-> {
+class MockEditTool extends BaseDeclarativeTool<Record<string, unknown>, ToolResult> {
   constructor() {
-    super('mockEditTool', 'mockEditTool', 'A mock edit tool', Kind.Edit, {});
+    super("mockEditTool", "mockEditTool", "A mock edit tool", Kind.Edit, {});
   }
 
   protected createInvocation(
@@ -922,8 +873,8 @@ class MockEditTool extends BaseDeclarativeTool<
   }
 }
 
-describe('CoreToolScheduler edit cancellation', () => {
-  it('should preserve diff when an edit is cancelled', async () => {
+describe("CoreToolScheduler edit cancellation", () => {
+  it("should preserve diff when an edit is cancelled", async () => {
     const mockEditTool = new MockEditTool();
     const mockToolRegistry = {
       getTool: () => mockEditTool,
@@ -951,24 +902,24 @@ describe('CoreToolScheduler edit cancellation', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockEditTool',
+      callId: "1",
+      name: "mockEditTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-1',
+      prompt_id: "prompt-id-1",
     };
 
     await scheduler.schedule([request], abortController.signal);
 
     const awaitingCall = (await waitForStatus(
       onToolCallsUpdate,
-      'awaiting_approval',
+      "awaiting_approval",
     )) as WaitingToolCall;
 
     // Cancel the edit
@@ -978,31 +929,30 @@ describe('CoreToolScheduler edit cancellation', () => {
     }
 
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
 
-    expect(completedCalls[0].status).toBe('cancelled');
+    expect(completedCalls[0].status).toBe("cancelled");
 
     // Check that the diff is preserved
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const cancelledCall = completedCalls[0] as any;
     expect(cancelledCall.response.resultDisplay).toBeDefined();
     expect(cancelledCall.response.resultDisplay.fileDiff).toBe(
-      '--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content',
+      "--- test.txt\n+++ test.txt\n@@ -1,1 +1,1 @@\n-old content\n+new content",
     );
-    expect(cancelledCall.response.resultDisplay.fileName).toBe('test.txt');
+    expect(cancelledCall.response.resultDisplay.fileName).toBe("test.txt");
   });
 });
 
-describe('CoreToolScheduler YOLO mode', () => {
-  it('should execute tool requiring confirmation directly without waiting', async () => {
+describe("CoreToolScheduler YOLO mode", () => {
+  it("should execute tool requiring confirmation directly without waiting", async () => {
     // Arrange
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Tool executed',
-      returnDisplay: 'Tool executed',
+      llmContent: "Tool executed",
+      returnDisplay: "Tool executed",
     });
     const mockTool = new MockTool({
-      name: 'mockTool',
+      name: "mockTool",
       execute: executeFn,
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
@@ -1037,17 +987,17 @@ describe('CoreToolScheduler YOLO mode', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockTool',
-      args: { param: 'value' },
+      callId: "1",
+      name: "mockTool",
+      args: { param: "value" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-yolo',
+      prompt_id: "prompt-id-yolo",
     };
 
     // Act
@@ -1060,41 +1010,35 @@ describe('CoreToolScheduler YOLO mode', () => {
 
     // Assert
     // 1. The tool's execute method was called directly.
-    expect(executeFn).toHaveBeenCalledWith({ param: 'value' });
+    expect(executeFn).toHaveBeenCalledWith({ param: "value" });
 
     // 2. The tool call status never entered 'awaiting_approval'.
     const statusUpdates = onToolCallsUpdate.mock.calls
       .map((call) => (call[0][0] as ToolCall)?.status)
       .filter(Boolean);
-    expect(statusUpdates).not.toContain('awaiting_approval');
-    expect(statusUpdates).toEqual([
-      'validating',
-      'scheduled',
-      'executing',
-      'success',
-    ]);
+    expect(statusUpdates).not.toContain("awaiting_approval");
+    expect(statusUpdates).toEqual(["validating", "scheduled", "executing", "success"]);
 
     // 3. The final callback indicates the tool call was successful.
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(1);
     const completedCall = completedCalls[0];
-    expect(completedCall.status).toBe('success');
-    if (completedCall.status === 'success') {
-      expect(completedCall.response.resultDisplay).toBe('Tool executed');
+    expect(completedCall.status).toBe("success");
+    if (completedCall.status === "success") {
+      expect(completedCall.response.resultDisplay).toBe("Tool executed");
     }
   });
 });
 
-describe('CoreToolScheduler request queueing', () => {
-  it('should queue a request if another is running', async () => {
+describe("CoreToolScheduler request queueing", () => {
+  it("should queue a request if another is running", async () => {
     let resolveFirstCall: (result: ToolResult) => void;
     const firstCallPromise = new Promise<ToolResult>((resolve) => {
       resolveFirstCall = resolve;
     });
 
     const executeFn = vi.fn().mockImplementation(() => firstCallPromise);
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
 
     const mockToolRegistry = {
@@ -1124,45 +1068,42 @@ describe('CoreToolScheduler request queueing', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request1 = {
-      callId: '1',
-      name: 'mockTool',
+      callId: "1",
+      name: "mockTool",
       args: { a: 1 },
       isClientInitiated: false,
-      prompt_id: 'prompt-1',
+      prompt_id: "prompt-1",
     };
     const request2 = {
-      callId: '2',
-      name: 'mockTool',
+      callId: "2",
+      name: "mockTool",
       args: { b: 2 },
       isClientInitiated: false,
-      prompt_id: 'prompt-2',
+      prompt_id: "prompt-2",
     };
 
     // Schedule the first call, which will pause execution.
     scheduler.schedule([request1], abortController.signal);
 
     // Wait for the first call to be in the 'executing' state.
-    await waitForStatus(onToolCallsUpdate, 'executing');
+    await waitForStatus(onToolCallsUpdate, "executing");
 
     // Schedule the second call while the first is "running".
-    const schedulePromise2 = scheduler.schedule(
-      [request2],
-      abortController.signal,
-    );
+    const schedulePromise2 = scheduler.schedule([request2], abortController.signal);
 
     // Ensure the second tool call hasn't been executed yet.
     expect(executeFn).toHaveBeenCalledWith({ a: 1 });
 
     // Complete the first tool call.
     resolveFirstCall!({
-      llmContent: 'First call complete',
-      returnDisplay: 'First call complete',
+      llmContent: "First call complete",
+      returnDisplay: "First call complete",
     });
 
     // Wait for the second schedule promise to resolve.
@@ -1170,8 +1111,8 @@ describe('CoreToolScheduler request queueing', () => {
 
     // Let the second call finish.
     const secondCallResult = {
-      llmContent: 'Second call complete',
-      returnDisplay: 'Second call complete',
+      llmContent: "Second call complete",
+      returnDisplay: "Second call complete",
     };
     // Since the mock is shared, we need to resolve the current promise.
     // In a real scenario, a new promise would be created for the second call.
@@ -1189,18 +1130,18 @@ describe('CoreToolScheduler request queueing', () => {
     });
 
     // Verify the completion callbacks were called correctly.
-    expect(onAllToolCallsComplete.mock.calls[0][0][0].status).toBe('success');
-    expect(onAllToolCallsComplete.mock.calls[1][0][0].status).toBe('success');
+    expect(onAllToolCallsComplete.mock.calls[0][0][0].status).toBe("success");
+    expect(onAllToolCallsComplete.mock.calls[1][0][0].status).toBe("success");
   });
 
-  it('should auto-approve a tool call if it is on the allowedTools list', async () => {
+  it("should auto-approve a tool call if it is on the allowedTools list", async () => {
     // Arrange
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Tool executed',
-      returnDisplay: 'Tool executed',
+      llmContent: "Tool executed",
+      returnDisplay: "Tool executed",
     });
     const mockTool = new MockTool({
-      name: 'mockTool',
+      name: "mockTool",
       execute: executeFn,
       shouldConfirmExecute: MOCK_TOOL_SHOULD_CONFIRM_EXECUTE,
     });
@@ -1225,7 +1166,7 @@ describe('CoreToolScheduler request queueing', () => {
 
     // Configure the scheduler to auto-approve the specific tool call.
     const mockConfig = createMockConfig({
-      getAllowedTools: () => ['mockTool'], // Auto-approve this tool
+      getAllowedTools: () => ["mockTool"], // Auto-approve this tool
       getToolRegistry: () => toolRegistry,
       getShellExecutionConfig: () => ({
         terminalWidth: 80,
@@ -1238,17 +1179,17 @@ describe('CoreToolScheduler request queueing', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: '1',
-      name: 'mockTool',
-      args: { param: 'value' },
+      callId: "1",
+      name: "mockTool",
+      args: { param: "value" },
       isClientInitiated: false,
-      prompt_id: 'prompt-auto-approved',
+      prompt_id: "prompt-auto-approved",
     };
 
     // Act
@@ -1261,55 +1202,49 @@ describe('CoreToolScheduler request queueing', () => {
 
     // Assert
     // 1. The tool's execute method was called directly.
-    expect(executeFn).toHaveBeenCalledWith({ param: 'value' });
+    expect(executeFn).toHaveBeenCalledWith({ param: "value" });
 
     // 2. The tool call status never entered 'awaiting_approval'.
     const statusUpdates = onToolCallsUpdate.mock.calls
       .map((call) => (call[0][0] as ToolCall)?.status)
       .filter(Boolean);
-    expect(statusUpdates).not.toContain('awaiting_approval');
-    expect(statusUpdates).toEqual([
-      'validating',
-      'scheduled',
-      'executing',
-      'success',
-    ]);
+    expect(statusUpdates).not.toContain("awaiting_approval");
+    expect(statusUpdates).toEqual(["validating", "scheduled", "executing", "success"]);
 
     // 3. The final callback indicates the tool call was successful.
     expect(onAllToolCallsComplete).toHaveBeenCalled();
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(1);
     const completedCall = completedCalls[0];
-    expect(completedCall.status).toBe('success');
-    if (completedCall.status === 'success') {
-      expect(completedCall.response.resultDisplay).toBe('Tool executed');
+    expect(completedCall.status).toBe("success");
+    if (completedCall.status === "success") {
+      expect(completedCall.response.resultDisplay).toBe("Tool executed");
     }
   });
 
-  it('should require approval for a chained shell command even when prefix is allowlisted', async () => {
+  it("should require approval for a chained shell command even when prefix is allowlisted", async () => {
     expect(
       isShellInvocationAllowlisted(
         {
-          params: { command: 'git status && rm -rf /tmp/should-not-run' },
+          params: { command: "git status && rm -rf /tmp/should-not-run" },
         } as unknown as AnyToolInvocation,
-        ['run_shell_command(git)'],
+        ["run_shell_command(git)"],
       ),
     ).toBe(false);
 
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Shell command executed',
-      returnDisplay: 'Shell command executed',
+      llmContent: "Shell command executed",
+      returnDisplay: "Shell command executed",
     });
 
     const mockShellTool = new MockTool({
-      name: 'run_shell_command',
+      name: "run_shell_command",
       shouldConfirmExecute: (params) =>
         Promise.resolve({
-          type: 'exec',
-          title: 'Confirm Shell Command',
-          command: String(params['command'] ?? ''),
-          rootCommand: 'git',
+          type: "exec",
+          title: "Confirm Shell Command",
+          command: String(params["command"] ?? ""),
+          rootCommand: "git",
           onConfirm: async () => {},
         }),
       execute: () => executeFn({}),
@@ -1333,7 +1268,7 @@ describe('CoreToolScheduler request queueing', () => {
     const onToolCallsUpdate = vi.fn();
 
     const mockConfig = createMockConfig({
-      getAllowedTools: () => ['run_shell_command(git)'],
+      getAllowedTools: () => ["run_shell_command(git)"],
       getShellExecutionConfig: () => ({
         terminalWidth: 80,
         terminalHeight: 24,
@@ -1346,17 +1281,17 @@ describe('CoreToolScheduler request queueing', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request = {
-      callId: 'shell-1',
-      name: 'run_shell_command',
-      args: { command: 'git status && rm -rf /tmp/should-not-run' },
+      callId: "shell-1",
+      name: "run_shell_command",
+      args: { command: "git status && rm -rf /tmp/should-not-run" },
       isClientInitiated: false,
-      prompt_id: 'prompt-shell-auto-approved',
+      prompt_id: "prompt-shell-auto-approved",
     };
 
     await scheduler.schedule([request], abortController.signal);
@@ -1365,17 +1300,17 @@ describe('CoreToolScheduler request queueing', () => {
       .map((call) => (call[0][0] as ToolCall)?.status)
       .filter(Boolean);
 
-    expect(statusUpdates).toContain('awaiting_approval');
+    expect(statusUpdates).toContain("awaiting_approval");
     expect(executeFn).not.toHaveBeenCalled();
     expect(onAllToolCallsComplete).not.toHaveBeenCalled();
   }, 20000);
 
-  it('should handle two synchronous calls to schedule', async () => {
+  it("should handle two synchronous calls to schedule", async () => {
     const executeFn = vi.fn().mockResolvedValue({
-      llmContent: 'Tool executed',
-      returnDisplay: 'Tool executed',
+      llmContent: "Tool executed",
+      returnDisplay: "Tool executed",
     });
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
     const mockToolRegistry = {
       getTool: () => declarativeTool,
@@ -1403,35 +1338,29 @@ describe('CoreToolScheduler request queueing', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const request1 = {
-      callId: '1',
-      name: 'mockTool',
+      callId: "1",
+      name: "mockTool",
       args: { a: 1 },
       isClientInitiated: false,
-      prompt_id: 'prompt-1',
+      prompt_id: "prompt-1",
     };
     const request2 = {
-      callId: '2',
-      name: 'mockTool',
+      callId: "2",
+      name: "mockTool",
       args: { b: 2 },
       isClientInitiated: false,
-      prompt_id: 'prompt-2',
+      prompt_id: "prompt-2",
     };
 
     // Schedule two calls synchronously.
-    const schedulePromise1 = scheduler.schedule(
-      [request1],
-      abortController.signal,
-    );
-    const schedulePromise2 = scheduler.schedule(
-      [request2],
-      abortController.signal,
-    );
+    const schedulePromise1 = scheduler.schedule([request1], abortController.signal);
+    const schedulePromise2 = scheduler.schedule([request2], abortController.signal);
 
     // Wait for both promises to resolve.
     await Promise.all([schedulePromise1, schedulePromise2]);
@@ -1445,7 +1374,7 @@ describe('CoreToolScheduler request queueing', () => {
     expect(onAllToolCallsComplete).toHaveBeenCalledTimes(2);
   });
 
-  it('should auto-approve remaining tool calls when first tool call is approved with ProceedAlways', async () => {
+  it("should auto-approve remaining tool calls when first tool call is approved with ProceedAlways", async () => {
     let approvalMode = ApprovalMode.DEFAULT;
     const mockConfig = createMockConfig({
       getApprovalMode: () => approvalMode,
@@ -1481,9 +1410,7 @@ describe('CoreToolScheduler request queueing', () => {
 
     const onAllToolCallsComplete = vi.fn();
     const onToolCallsUpdate = vi.fn();
-    const pendingConfirmations: Array<
-      (outcome: ToolConfirmationOutcome) => void
-    > = [];
+    const pendingConfirmations: Array<(outcome: ToolConfirmationOutcome) => void> = [];
 
     const scheduler = new CoreToolScheduler({
       config: mockConfig,
@@ -1492,22 +1419,20 @@ describe('CoreToolScheduler request queueing', () => {
         onToolCallsUpdate(toolCalls);
         // Capture confirmation handlers for awaiting_approval tools
         toolCalls.forEach((call) => {
-          if (call.status === 'awaiting_approval') {
+          if (call.status === "awaiting_approval") {
             const waitingCall = call as WaitingToolCall;
             if (waitingCall.confirmationDetails?.onConfirm) {
               const originalHandler = pendingConfirmations.find(
                 (h) => h === waitingCall.confirmationDetails.onConfirm,
               );
               if (!originalHandler) {
-                pendingConfirmations.push(
-                  waitingCall.confirmationDetails.onConfirm,
-                );
+                pendingConfirmations.push(waitingCall.confirmationDetails.onConfirm);
               }
             }
           }
         });
       },
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
@@ -1516,25 +1441,25 @@ describe('CoreToolScheduler request queueing', () => {
     // Schedule multiple tools that need confirmation
     const requests = [
       {
-        callId: '1',
-        name: 'testApprovalTool',
-        args: { id: 'first' },
+        callId: "1",
+        name: "testApprovalTool",
+        args: { id: "first" },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '2',
-        name: 'testApprovalTool',
-        args: { id: 'second' },
+        callId: "2",
+        name: "testApprovalTool",
+        args: { id: "second" },
         isClientInitiated: false,
-        prompt_id: 'prompt-2',
+        prompt_id: "prompt-2",
       },
       {
-        callId: '3',
-        name: 'testApprovalTool',
-        args: { id: 'third' },
+        callId: "3",
+        name: "testApprovalTool",
+        args: { id: "third" },
         isClientInitiated: false,
-        prompt_id: 'prompt-3',
+        prompt_id: "prompt-3",
       },
     ];
 
@@ -1545,11 +1470,11 @@ describe('CoreToolScheduler request queueing', () => {
       const calls = onToolCallsUpdate.mock.calls.at(-1)?.[0] as ToolCall[];
       // With the sequential scheduler, the update includes the active call and the queue.
       expect(calls?.length).toBe(3);
-      expect(calls?.[0].status).toBe('awaiting_approval');
-      expect(calls?.[0].request.callId).toBe('1');
+      expect(calls?.[0].status).toBe("awaiting_approval");
+      expect(calls?.[0].request.callId).toBe("1");
       // Check that the other two are in the queue (still in 'validating' state)
-      expect(calls?.[1].status).toBe('validating');
-      expect(calls?.[2].status).toBe('validating');
+      expect(calls?.[1].status).toBe("validating");
+      expect(calls?.[2].status).toBe("validating");
     });
 
     expect(pendingConfirmations.length).toBe(1);
@@ -1563,45 +1488,37 @@ describe('CoreToolScheduler request queueing', () => {
       expect(onAllToolCallsComplete).toHaveBeenCalled();
     });
 
-    const completedCalls = onAllToolCallsComplete.mock.calls.at(
-      -1,
-    )?.[0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls.at(-1)?.[0] as ToolCall[];
     expect(completedCalls?.length).toBe(3);
-    expect(completedCalls?.every((call) => call.status === 'success')).toBe(
-      true,
-    );
+    expect(completedCalls?.every((call) => call.status === "success")).toBe(true);
 
     // Verify approval mode was changed
     expect(approvalMode).toBe(ApprovalMode.AUTO_EDIT);
   });
 });
 
-describe('CoreToolScheduler Sequential Execution', () => {
-  it('should execute tool calls in a batch sequentially', async () => {
+describe("CoreToolScheduler Sequential Execution", () => {
+  it("should execute tool calls in a batch sequentially", async () => {
     // Arrange
     let firstCallFinished = false;
-    const executeFn = vi
-      .fn()
-      .mockImplementation(async (args: { call: number }) => {
-        if (args.call === 1) {
-          // First call, wait for a bit to simulate work
-          await new Promise((resolve) => setTimeout(resolve, 50));
-          firstCallFinished = true;
-          return { llmContent: 'First call done' };
-        }
-        if (args.call === 2) {
-          // Second call, should only happen after the first is finished
-          if (!firstCallFinished) {
-            throw new Error(
-              'Second tool call started before the first one finished!',
-            );
-          }
-          return { llmContent: 'Second call done' };
+    const executeFn = vi.fn().mockImplementation(async (args: { call: number }) => {
+      if (args.call === 1) {
+        // First call, wait for a bit to simulate work
+        await new Promise((resolve) => setTimeout(resolve, 50));
+        firstCallFinished = true;
+        return { llmContent: "First call done" };
+      }
+      if (args.call === 2) {
+        // Second call, should only happen after the first is finished
+        if (!firstCallFinished) {
+          throw new Error("Second tool call started before the first one finished!");
         }
-        return { llmContent: 'default' };
-      });
+        return { llmContent: "Second call done" };
+      }
+      return { llmContent: "default" };
+    });
 
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
 
     const mockToolRegistry = {
@@ -1631,25 +1548,25 @@ describe('CoreToolScheduler Sequential Execution', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const abortController = new AbortController();
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool',
+        callId: "1",
+        name: "mockTool",
         args: { call: 1 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '2',
-        name: 'mockTool',
+        callId: "2",
+        name: "mockTool",
         args: { call: 2 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
     ];
 
@@ -1670,38 +1587,35 @@ describe('CoreToolScheduler Sequential Execution', () => {
     expect(calls[1][0]).toEqual({ call: 2 });
 
     // The onAllToolCallsComplete should be called once with both results
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(2);
-    expect(completedCalls[0].status).toBe('success');
-    expect(completedCalls[1].status).toBe('success');
+    expect(completedCalls[0].status).toBe("success");
+    expect(completedCalls[1].status).toBe("success");
   });
 
-  it('should cancel subsequent tools when the signal is aborted.', async () => {
+  it("should cancel subsequent tools when the signal is aborted.", async () => {
     // Arrange
     const abortController = new AbortController();
     let secondCallStarted = false;
 
-    const executeFn = vi
-      .fn()
-      .mockImplementation(async (args: { call: number }) => {
-        if (args.call === 1) {
-          return { llmContent: 'First call done' };
-        }
-        if (args.call === 2) {
-          secondCallStarted = true;
-          // This call will be cancelled while it's "running".
-          await new Promise((resolve) => setTimeout(resolve, 100));
-          // It should not return a value because it will be cancelled.
-          return { llmContent: 'Second call should not complete' };
-        }
-        if (args.call === 3) {
-          return { llmContent: 'Third call done' };
-        }
-        return { llmContent: 'default' };
-      });
+    const executeFn = vi.fn().mockImplementation(async (args: { call: number }) => {
+      if (args.call === 1) {
+        return { llmContent: "First call done" };
+      }
+      if (args.call === 2) {
+        secondCallStarted = true;
+        // This call will be cancelled while it's "running".
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        // It should not return a value because it will be cancelled.
+        return { llmContent: "Second call should not complete" };
+      }
+      if (args.call === 3) {
+        return { llmContent: "Third call done" };
+      }
+      return { llmContent: "default" };
+    });
 
-    const mockTool = new MockTool({ name: 'mockTool', execute: executeFn });
+    const mockTool = new MockTool({ name: "mockTool", execute: executeFn });
     const declarativeTool = mockTool;
 
     const mockToolRegistry = {
@@ -1731,39 +1645,36 @@ describe('CoreToolScheduler Sequential Execution', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
     const requests = [
       {
-        callId: '1',
-        name: 'mockTool',
+        callId: "1",
+        name: "mockTool",
         args: { call: 1 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '2',
-        name: 'mockTool',
+        callId: "2",
+        name: "mockTool",
         args: { call: 2 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
       {
-        callId: '3',
-        name: 'mockTool',
+        callId: "3",
+        name: "mockTool",
         args: { call: 3 },
         isClientInitiated: false,
-        prompt_id: 'prompt-1',
+        prompt_id: "prompt-1",
       },
     ];
 
     // Act
-    const schedulePromise = scheduler.schedule(
-      requests,
-      abortController.signal,
-    );
+    const schedulePromise = scheduler.schedule(requests, abortController.signal);
 
     // Wait for the second call to start, then abort.
     await vi.waitFor(() => {
@@ -1783,28 +1694,27 @@ describe('CoreToolScheduler Sequential Execution', () => {
     expect(executeFn).toHaveBeenCalledWith({ call: 1 });
     expect(executeFn).toHaveBeenCalledWith({ call: 2 });
 
-    const completedCalls = onAllToolCallsComplete.mock
-      .calls[0][0] as ToolCall[];
+    const completedCalls = onAllToolCallsComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls).toHaveLength(3);
 
-    const call1 = completedCalls.find((c) => c.request.callId === '1');
-    const call2 = completedCalls.find((c) => c.request.callId === '2');
-    const call3 = completedCalls.find((c) => c.request.callId === '3');
+    const call1 = completedCalls.find((c) => c.request.callId === "1");
+    const call2 = completedCalls.find((c) => c.request.callId === "2");
+    const call3 = completedCalls.find((c) => c.request.callId === "3");
 
-    expect(call1?.status).toBe('success');
-    expect(call2?.status).toBe('cancelled');
-    expect(call3?.status).toBe('cancelled');
+    expect(call1?.status).toBe("success");
+    expect(call2?.status).toBe("cancelled");
+    expect(call3?.status).toBe("cancelled");
   });
 
-  it('should pass confirmation diff data into modifyWithEditor overrides', async () => {
+  it("should pass confirmation diff data into modifyWithEditor overrides", async () => {
     const modifyWithEditorSpy = vi
-      .spyOn(modifiableToolModule, 'modifyWithEditor')
+      .spyOn(modifiableToolModule, "modifyWithEditor")
       .mockResolvedValue({
-        updatedParams: { param: 'updated' },
-        updatedDiff: 'updated diff',
+        updatedParams: { param: "updated" },
+        updatedDiff: "updated diff",
       });
 
-    const mockModifiableTool = new MockModifiableTool('mockModifiableTool');
+    const mockModifiableTool = new MockModifiableTool("mockModifiableTool");
     const mockToolRegistry = {
       getTool: () => mockModifiableTool,
       getToolByName: () => mockModifiableTool,
@@ -1830,7 +1740,7 @@ describe('CoreToolScheduler Sequential Execution', () => {
       config: mockConfig,
       onAllToolCallsComplete,
       onToolCallsUpdate,
-      getPreferredEditor: () => 'vscode',
+      getPreferredEditor: () => "vscode",
       onEditorClose: vi.fn(),
     });
 
@@ -1839,11 +1749,11 @@ describe('CoreToolScheduler Sequential Execution', () => {
     await scheduler.schedule(
       [
         {
-          callId: '1',
-          name: 'mockModifiableTool',
+          callId: "1",
+          name: "mockModifiableTool",
           args: {},
           isClientInitiated: false,
-          prompt_id: 'prompt-1',
+          prompt_id: "prompt-1",
         },
       ],
       abortController.signal,
@@ -1851,7 +1761,7 @@ describe('CoreToolScheduler Sequential Execution', () => {
 
     const toolCall = (scheduler as unknown as { toolCalls: ToolCall[] })
       .toolCalls[0] as WaitingToolCall;
-    expect(toolCall.status).toBe('awaiting_approval');
+    expect(toolCall.status).toBe("awaiting_approval");
 
     const confirmationSignal = new AbortController().signal;
     await scheduler.handleConfirmationResponse(
@@ -1862,20 +1772,17 @@ describe('CoreToolScheduler Sequential Execution', () => {
     );
 
     expect(modifyWithEditorSpy).toHaveBeenCalled();
-    const overrides =
-      modifyWithEditorSpy.mock.calls[
-        modifyWithEditorSpy.mock.calls.length - 1
-      ][5];
+    const overrides = modifyWithEditorSpy.mock.calls[modifyWithEditorSpy.mock.calls.length - 1][5];
     expect(overrides).toEqual({
-      currentContent: 'originalContent',
-      proposedContent: 'newContent',
+      currentContent: "originalContent",
+      proposedContent: "newContent",
     });
 
     modifyWithEditorSpy.mockRestore();
   });
 });
 
-describe('truncateAndSaveToFile', () => {
+describe("truncateAndSaveToFile", () => {
   const mockWriteFile = vi.mocked(fs.writeFile);
   const THRESHOLD = 40_000;
   const TRUNCATE_LINES = 1000;
@@ -1884,10 +1791,10 @@ describe('truncateAndSaveToFile', () => {
     vi.clearAllMocks();
   });
 
-  it('should return content unchanged if below threshold', async () => {
-    const content = 'Short content';
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should return content unchanged if below threshold", async () => {
+    const content = "Short content";
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
     const result = await truncateAndSaveToFile(
       content,
@@ -1901,12 +1808,12 @@ describe('truncateAndSaveToFile', () => {
     expect(mockWriteFile).not.toHaveBeenCalled();
   });
 
-  it('should truncate content by lines when content has many lines', async () => {
+  it("should truncate content by lines when content has many lines", async () => {
     // Create content that exceeds 100,000 character threshold with many lines
-    const lines = Array(2000).fill('x'.repeat(100)); // 100 chars per line * 2000 lines = 200,000 chars
-    const content = lines.join('\n');
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+    const lines = Array(2000).fill("x".repeat(100)); // 100 chars per line * 2000 lines = 200,000 chars
+    const content = lines.join("\n");
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
     mockWriteFile.mockResolvedValue(undefined);
 
@@ -1918,9 +1825,7 @@ describe('truncateAndSaveToFile', () => {
       TRUNCATE_LINES,
     );
 
-    expect(result.outputFile).toBe(
-      path.join(projectTempDir, `${callId}.output`),
-    );
+    expect(result.outputFile).toBe(path.join(projectTempDir, `${callId}.output`));
     expect(mockWriteFile).toHaveBeenCalledWith(
       path.join(projectTempDir, `${callId}.output`),
       content,
@@ -1931,19 +1836,17 @@ describe('truncateAndSaveToFile', () => {
     const beginning = lines.slice(0, head);
     const end = lines.slice(-(TRUNCATE_LINES - head));
     const expectedTruncated =
-      beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
+      beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
 
-    expect(result.content).toContain(
-      'Tool output was too large and has been truncated',
-    );
-    expect(result.content).toContain('Truncated part of the output:');
+    expect(result.content).toContain("Tool output was too large and has been truncated");
+    expect(result.content).toContain("Truncated part of the output:");
     expect(result.content).toContain(expectedTruncated);
   });
 
-  it('should wrap and truncate content when content has few but long lines', async () => {
-    const content = 'a'.repeat(200_000); // A single very long line
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should wrap and truncate content when content has few but long lines", async () => {
+    const content = "a".repeat(200_000); // A single very long line
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
     const wrapWidth = 120;
 
     mockWriteFile.mockResolvedValue(undefined);
@@ -1953,7 +1856,7 @@ describe('truncateAndSaveToFile', () => {
     for (let i = 0; i < content.length; i += wrapWidth) {
       wrappedLines.push(content.substring(i, i + wrapWidth));
     }
-    const expectedFileContent = wrappedLines.join('\n');
+    const expectedFileContent = wrappedLines.join("\n");
 
     const result = await truncateAndSaveToFile(
       content,
@@ -1963,9 +1866,7 @@ describe('truncateAndSaveToFile', () => {
       TRUNCATE_LINES,
     );
 
-    expect(result.outputFile).toBe(
-      path.join(projectTempDir, `${callId}.output`),
-    );
+    expect(result.outputFile).toBe(path.join(projectTempDir, `${callId}.output`));
     // Check that the file was written with the wrapped content
     expect(mockWriteFile).toHaveBeenCalledWith(
       path.join(projectTempDir, `${callId}.output`),
@@ -1977,20 +1878,18 @@ describe('truncateAndSaveToFile', () => {
     const beginning = wrappedLines.slice(0, head);
     const end = wrappedLines.slice(-(TRUNCATE_LINES - head));
     const expectedTruncated =
-      beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
-    expect(result.content).toContain(
-      'Tool output was too large and has been truncated',
-    );
-    expect(result.content).toContain('Truncated part of the output:');
+      beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
+    expect(result.content).toContain("Tool output was too large and has been truncated");
+    expect(result.content).toContain("Truncated part of the output:");
     expect(result.content).toContain(expectedTruncated);
   });
 
-  it('should handle file write errors gracefully', async () => {
-    const content = 'a'.repeat(2_000_000);
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should handle file write errors gracefully", async () => {
+    const content = "a".repeat(2_000_000);
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
-    mockWriteFile.mockRejectedValue(new Error('File write failed'));
+    mockWriteFile.mockRejectedValue(new Error("File write failed"));
 
     const result = await truncateAndSaveToFile(
       content,
@@ -2001,16 +1900,14 @@ describe('truncateAndSaveToFile', () => {
     );
 
     expect(result.outputFile).toBeUndefined();
-    expect(result.content).toContain(
-      '[Note: Could not save full output to file]',
-    );
+    expect(result.content).toContain("[Note: Could not save full output to file]");
     expect(mockWriteFile).toHaveBeenCalled();
   });
 
-  it('should save to correct file path with call ID', async () => {
-    const content = 'a'.repeat(200_000);
-    const callId = 'unique-call-123';
-    const projectTempDir = '/custom/temp/dir';
+  it("should save to correct file path with call ID", async () => {
+    const content = "a".repeat(200_000);
+    const callId = "unique-call-123";
+    const projectTempDir = "/custom/temp/dir";
     const wrapWidth = 120;
 
     mockWriteFile.mockResolvedValue(undefined);
@@ -2020,7 +1917,7 @@ describe('truncateAndSaveToFile', () => {
     for (let i = 0; i < content.length; i += wrapWidth) {
       wrappedLines.push(content.substring(i, i + wrapWidth));
     }
-    const expectedFileContent = wrappedLines.join('\n');
+    const expectedFileContent = wrappedLines.join("\n");
 
     const result = await truncateAndSaveToFile(
       content,
@@ -2032,16 +1929,13 @@ describe('truncateAndSaveToFile', () => {
 
     const expectedPath = path.join(projectTempDir, `${callId}.output`);
     expect(result.outputFile).toBe(expectedPath);
-    expect(mockWriteFile).toHaveBeenCalledWith(
-      expectedPath,
-      expectedFileContent,
-    );
+    expect(mockWriteFile).toHaveBeenCalledWith(expectedPath, expectedFileContent);
   });
 
-  it('should include helpful instructions in truncated message', async () => {
-    const content = 'a'.repeat(2_000_000);
-    const callId = 'test-call-id';
-    const projectTempDir = '/tmp';
+  it("should include helpful instructions in truncated message", async () => {
+    const content = "a".repeat(2_000_000);
+    const callId = "test-call-id";
+    const projectTempDir = "/tmp";
 
     mockWriteFile.mockResolvedValue(undefined);
 
@@ -2053,22 +1947,16 @@ describe('truncateAndSaveToFile', () => {
       TRUNCATE_LINES,
     );
 
-    expect(result.content).toContain(
-      'read_file tool with the absolute file path above',
-    );
-    expect(result.content).toContain('read_file tool with offset=0, limit=100');
-    expect(result.content).toContain(
-      'read_file tool with offset=N to skip N lines',
-    );
-    expect(result.content).toContain(
-      'read_file tool with limit=M to read only M lines',
-    );
+    expect(result.content).toContain("read_file tool with the absolute file path above");
+    expect(result.content).toContain("read_file tool with offset=0, limit=100");
+    expect(result.content).toContain("read_file tool with offset=N to skip N lines");
+    expect(result.content).toContain("read_file tool with limit=M to read only M lines");
   });
 
-  it('should sanitize callId to prevent path traversal', async () => {
-    const content = 'a'.repeat(200_000);
-    const callId = '../../../../../etc/passwd';
-    const projectTempDir = '/tmp/safe_dir';
+  it("should sanitize callId to prevent path traversal", async () => {
+    const content = "a".repeat(200_000);
+    const callId = "../../../../../etc/passwd";
+    const projectTempDir = "/tmp/safe_dir";
     const wrapWidth = 120;
 
     mockWriteFile.mockResolvedValue(undefined);
@@ -2078,20 +1966,11 @@ describe('truncateAndSaveToFile', () => {
     for (let i = 0; i < content.length; i += wrapWidth) {
       wrappedLines.push(content.substring(i, i + wrapWidth));
     }
-    const expectedFileContent = wrappedLines.join('\n');
+    const expectedFileContent = wrappedLines.join("\n");
 
-    await truncateAndSaveToFile(
-      content,
-      callId,
-      projectTempDir,
-      THRESHOLD,
-      TRUNCATE_LINES,
-    );
+    await truncateAndSaveToFile(content, callId, projectTempDir, THRESHOLD, TRUNCATE_LINES);
 
-    const expectedPath = path.join(projectTempDir, 'passwd.output');
-    expect(mockWriteFile).toHaveBeenCalledWith(
-      expectedPath,
-      expectedFileContent,
-    );
+    const expectedPath = path.join(projectTempDir, "passwd.output");
+    expect(mockWriteFile).toHaveBeenCalledWith(expectedPath, expectedFileContent);
   });
 });
diff --git a/packages/gemini-core/src/core/coreToolScheduler.ts b/packages/gemini-core/src/core/coreToolScheduler.ts
index 6e3b79927..7554b57f8 100644
--- a/packages/gemini-core/src/core/coreToolScheduler.ts
+++ b/packages/gemini-core/src/core/coreToolScheduler.ts
@@ -4,53 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { Part, PartListUnion } from "@google/genai";
+import * as Diff from "diff";
+import levenshtein from "fast-levenshtein";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import type { ToolConfirmationRequest } from "../confirmation-bus/types.js";
+import { MessageBusType } from "../confirmation-bus/types.js";
 import type {
+  AnsiOutput,
+  AnyDeclarativeTool,
+  AnyToolInvocation,
+  Config,
+  EditorType,
+  ToolCallConfirmationDetails,
   ToolCallRequestInfo,
   ToolCallResponseInfo,
-  ToolCallConfirmationDetails,
+  ToolConfirmationPayload,
   ToolResult,
   ToolResultDisplay,
-  EditorType,
-  Config,
-  ToolConfirmationPayload,
-  AnyDeclarativeTool,
-  AnyToolInvocation,
-  AnsiOutput,
-} from '../index.js';
+} from "../index.js";
 import {
-  ToolConfirmationOutcome,
   ApprovalMode,
   logToolCall,
-  ToolErrorType,
-  ToolCallEvent,
   logToolOutputTruncated,
-  ToolOutputTruncatedEvent,
   runInDevTraceSpan,
-} from '../index.js';
-import { READ_FILE_TOOL_NAME, SHELL_TOOL_NAME } from '../tools/tool-names.js';
-import type { Part, PartListUnion } from '@google/genai';
-import { getResponseTextFromParts } from '../utils/generateContentResponseUtilities.js';
-import type { ModifyContext } from '../tools/modifiable-tool.js';
-import {
-  isModifiableDeclarativeTool,
-  modifyWithEditor,
-} from '../tools/modifiable-tool.js';
-import * as Diff from 'diff';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import {
-  isShellInvocationAllowlisted,
-  SHELL_TOOL_NAMES,
-} from '../utils/shell-utils.js';
-import { doesToolInvocationMatch } from '../utils/tool-utils.js';
-import levenshtein from 'fast-levenshtein';
-import { ShellToolInvocation } from '../tools/shell.js';
-import type { ToolConfirmationRequest } from '../confirmation-bus/types.js';
-import { MessageBusType } from '../confirmation-bus/types.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+  ToolCallEvent,
+  ToolConfirmationOutcome,
+  ToolErrorType,
+  ToolOutputTruncatedEvent,
+} from "../index.js";
+import type { ModifyContext } from "../tools/modifiable-tool.js";
+import { isModifiableDeclarativeTool, modifyWithEditor } from "../tools/modifiable-tool.js";
+import { ShellToolInvocation } from "../tools/shell.js";
+import { READ_FILE_TOOL_NAME, SHELL_TOOL_NAME } from "../tools/tool-names.js";
+import { getResponseTextFromParts } from "../utils/generateContentResponseUtilities.js";
+import { isShellInvocationAllowlisted, SHELL_TOOL_NAMES } from "../utils/shell-utils.js";
+import { doesToolInvocationMatch } from "../utils/tool-utils.js";
 
 export type ValidatingToolCall = {
-  status: 'validating';
+  status: "validating";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -59,7 +53,7 @@ export type ValidatingToolCall = {
 };
 
 export type ScheduledToolCall = {
-  status: 'scheduled';
+  status: "scheduled";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -68,7 +62,7 @@ export type ScheduledToolCall = {
 };
 
 export type ErroredToolCall = {
-  status: 'error';
+  status: "error";
   request: ToolCallRequestInfo;
   response: ToolCallResponseInfo;
   tool?: AnyDeclarativeTool;
@@ -77,7 +71,7 @@ export type ErroredToolCall = {
 };
 
 export type SuccessfulToolCall = {
-  status: 'success';
+  status: "success";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   response: ToolCallResponseInfo;
@@ -87,7 +81,7 @@ export type SuccessfulToolCall = {
 };
 
 export type ExecutingToolCall = {
-  status: 'executing';
+  status: "executing";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -98,7 +92,7 @@ export type ExecutingToolCall = {
 };
 
 export type CancelledToolCall = {
-  status: 'cancelled';
+  status: "cancelled";
   request: ToolCallRequestInfo;
   response: ToolCallResponseInfo;
   tool: AnyDeclarativeTool;
@@ -108,7 +102,7 @@ export type CancelledToolCall = {
 };
 
 export type WaitingToolCall = {
-  status: 'awaiting_approval';
+  status: "awaiting_approval";
   request: ToolCallRequestInfo;
   tool: AnyDeclarativeTool;
   invocation: AnyToolInvocation;
@@ -117,7 +111,7 @@ export type WaitingToolCall = {
   outcome?: ToolConfirmationOutcome;
 };
 
-export type Status = ToolCall['status'];
+export type Status = ToolCall["status"];
 
 export type ToolCall =
   | ValidatingToolCall
@@ -128,19 +122,11 @@ export type ToolCall =
   | CancelledToolCall
   | WaitingToolCall;
 
-export type CompletedToolCall =
-  | SuccessfulToolCall
-  | CancelledToolCall
-  | ErroredToolCall;
+export type CompletedToolCall = SuccessfulToolCall | CancelledToolCall | ErroredToolCall;
 
-export type ConfirmHandler = (
-  toolCall: WaitingToolCall,
-) => Promise<ToolConfirmationOutcome>;
+export type ConfirmHandler = (toolCall: WaitingToolCall) => Promise<ToolConfirmationOutcome>;
 
-export type OutputUpdateHandler = (
-  toolCallId: string,
-  outputChunk: string | AnsiOutput,
-) => void;
+export type OutputUpdateHandler = (toolCallId: string, outputChunk: string | AnsiOutput) => void;
 
 export type AllToolCallsCompleteHandler = (
   completedToolCalls: CompletedToolCall[],
@@ -151,11 +137,7 @@ export type ToolCallsUpdateHandler = (toolCalls: ToolCall[]) => void;
 /**
  * Formats tool output for a Gemini FunctionResponse.
  */
-function createFunctionResponsePart(
-  callId: string,
-  toolName: string,
-  output: string,
-): Part {
+function createFunctionResponsePart(callId: string, toolName: string, output: string): Part {
   return {
     functionResponse: {
       id: callId,
@@ -171,11 +153,9 @@ export function convertToFunctionResponse(
   llmContent: PartListUnion,
 ): Part[] {
   const contentToProcess =
-    Array.isArray(llmContent) && llmContent.length === 1
-      ? llmContent[0]
-      : llmContent;
+    Array.isArray(llmContent) && llmContent.length === 1 ? llmContent[0] : llmContent;
 
-  if (typeof contentToProcess === 'string') {
+  if (typeof contentToProcess === "string") {
     return [createFunctionResponsePart(callId, toolName, contentToProcess)];
   }
 
@@ -183,18 +163,17 @@ export function convertToFunctionResponse(
     const functionResponse = createFunctionResponsePart(
       callId,
       toolName,
-      'Tool execution succeeded.',
+      "Tool execution succeeded.",
     );
     return [functionResponse, ...toParts(contentToProcess)];
   }
 
   // After this point, contentToProcess is a single Part object.
   if (contentToProcess.functionResponse) {
-    if (contentToProcess.functionResponse.response?.['content']) {
+    if (contentToProcess.functionResponse.response?.["content"]) {
       const stringifiedOutput =
-        getResponseTextFromParts(
-          contentToProcess.functionResponse.response['content'] as Part[],
-        ) || '';
+        getResponseTextFromParts(contentToProcess.functionResponse.response["content"] as Part[]) ||
+        "";
       return [createFunctionResponsePart(callId, toolName, stringifiedOutput)];
     }
     // It's a functionResponse that we should pass through as is.
@@ -203,9 +182,7 @@ export function convertToFunctionResponse(
 
   if (contentToProcess.inlineData || contentToProcess.fileData) {
     const mimeType =
-      contentToProcess.inlineData?.mimeType ||
-      contentToProcess.fileData?.mimeType ||
-      'unknown';
+      contentToProcess.inlineData?.mimeType || contentToProcess.fileData?.mimeType || "unknown";
     const functionResponse = createFunctionResponsePart(
       callId,
       toolName,
@@ -215,21 +192,17 @@ export function convertToFunctionResponse(
   }
 
   if (contentToProcess.text !== undefined) {
-    return [
-      createFunctionResponsePart(callId, toolName, contentToProcess.text),
-    ];
+    return [createFunctionResponsePart(callId, toolName, contentToProcess.text)];
   }
 
   // Default case for other kinds of parts.
-  return [
-    createFunctionResponsePart(callId, toolName, 'Tool execution succeeded.'),
-  ];
+  return [createFunctionResponsePart(callId, toolName, "Tool execution succeeded.")];
 }
 
 function toParts(input: PartListUnion): Part[] {
   const parts: Part[] = [];
   for (const part of Array.isArray(input) ? input : [input]) {
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       parts.push({ text: part });
     } else if (part) {
       parts.push(part);
@@ -270,7 +243,7 @@ export async function truncateAndSaveToFile(
     return { content };
   }
 
-  let lines = content.split('\n');
+  let lines = content.split("\n");
   let fileContent = content;
 
   // If the content is long but has few lines, wrap it to enable line-based truncation.
@@ -287,14 +260,14 @@ export async function truncateAndSaveToFile(
       }
     }
     lines = wrappedLines;
-    fileContent = lines.join('\n');
+    fileContent = lines.join("\n");
   }
 
   const head = Math.floor(truncateLines / 5);
   const beginning = lines.slice(0, head);
   const end = lines.slice(-(truncateLines - head));
   const truncatedContent =
-    beginning.join('\n') + '\n... [CONTENT TRUNCATED] ...\n' + end.join('\n');
+    beginning.join("\n") + "\n... [CONTENT TRUNCATED] ...\n" + end.join("\n");
 
   // Sanitize callId to prevent path traversal.
   const safeFileName = `${path.basename(callId)}.output`;
@@ -317,8 +290,7 @@ ${truncatedContent}`,
     };
   } catch (_error) {
     return {
-      content:
-        truncatedContent + `\n[Note: Could not save full output to file]`,
+      content: truncatedContent + `\n[Note: Could not save full output to file]`,
     };
   }
 }
@@ -388,10 +360,7 @@ export class CoreToolScheduler {
           });
         };
 
-        messageBus.subscribe(
-          MessageBusType.TOOL_CONFIRMATION_REQUEST,
-          sharedHandler,
-        );
+        messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_REQUEST, sharedHandler);
 
         // Store the handler in the WeakMap so we don't subscribe again
         CoreToolScheduler.subscribedMessageBuses.set(messageBus, sharedHandler);
@@ -401,31 +370,31 @@ export class CoreToolScheduler {
 
   private setStatusInternal(
     targetCallId: string,
-    status: 'success',
+    status: "success",
     signal: AbortSignal,
     response: ToolCallResponseInfo,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'awaiting_approval',
+    status: "awaiting_approval",
     signal: AbortSignal,
     confirmationDetails: ToolCallConfirmationDetails,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'error',
+    status: "error",
     signal: AbortSignal,
     response: ToolCallResponseInfo,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'cancelled',
+    status: "cancelled",
     signal: AbortSignal,
     reason: string,
   ): void;
   private setStatusInternal(
     targetCallId: string,
-    status: 'executing' | 'scheduled' | 'validating',
+    status: "executing" | "scheduled" | "validating",
     signal: AbortSignal,
   ): void;
   private setStatusInternal(
@@ -437,9 +406,9 @@ export class CoreToolScheduler {
     this.toolCalls = this.toolCalls.map((currentCall) => {
       if (
         currentCall.request.callId !== targetCallId ||
-        currentCall.status === 'success' ||
-        currentCall.status === 'error' ||
-        currentCall.status === 'cancelled'
+        currentCall.status === "success" ||
+        currentCall.status === "error" ||
+        currentCall.status === "cancelled"
       ) {
         return currentCall;
       }
@@ -452,67 +421,60 @@ export class CoreToolScheduler {
       const outcome = currentCall.outcome;
 
       switch (newStatus) {
-        case 'success': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "success": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
           return {
             request: currentCall.request,
             tool: toolInstance,
             invocation,
-            status: 'success',
+            status: "success",
             response: auxiliaryData as ToolCallResponseInfo,
             durationMs,
             outcome,
           } as SuccessfulToolCall;
         }
-        case 'error': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "error": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
           return {
             request: currentCall.request,
-            status: 'error',
+            status: "error",
             tool: toolInstance,
             response: auxiliaryData as ToolCallResponseInfo,
             durationMs,
             outcome,
           } as ErroredToolCall;
         }
-        case 'awaiting_approval':
+        case "awaiting_approval":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'awaiting_approval',
+            status: "awaiting_approval",
             confirmationDetails: auxiliaryData as ToolCallConfirmationDetails,
             startTime: existingStartTime,
             outcome,
             invocation,
           } as WaitingToolCall;
-        case 'scheduled':
+        case "scheduled":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'scheduled',
+            status: "scheduled",
             startTime: existingStartTime,
             outcome,
             invocation,
           } as ScheduledToolCall;
-        case 'cancelled': {
-          const durationMs = existingStartTime
-            ? Date.now() - existingStartTime
-            : undefined;
+        case "cancelled": {
+          const durationMs = existingStartTime ? Date.now() - existingStartTime : undefined;
 
           // Preserve diff for cancelled edit operations
           let resultDisplay: ToolResultDisplay | undefined = undefined;
-          if (currentCall.status === 'awaiting_approval') {
+          if (currentCall.status === "awaiting_approval") {
             const waitingCall = currentCall as WaitingToolCall;
-            if (waitingCall.confirmationDetails.type === 'edit') {
+            if (waitingCall.confirmationDetails.type === "edit") {
               resultDisplay = {
                 fileDiff: waitingCall.confirmationDetails.fileDiff,
                 fileName: waitingCall.confirmationDetails.fileName,
-                originalContent:
-                  waitingCall.confirmationDetails.originalContent,
+                originalContent: waitingCall.confirmationDetails.originalContent,
                 newContent: waitingCall.confirmationDetails.newContent,
               };
             }
@@ -523,7 +485,7 @@ export class CoreToolScheduler {
             request: currentCall.request,
             tool: toolInstance,
             invocation,
-            status: 'cancelled',
+            status: "cancelled",
             response: {
               callId: currentCall.request.callId,
               responseParts: [
@@ -546,20 +508,20 @@ export class CoreToolScheduler {
             outcome,
           } as CancelledToolCall;
         }
-        case 'validating':
+        case "validating":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'validating',
+            status: "validating",
             startTime: existingStartTime,
             outcome,
             invocation,
           } as ValidatingToolCall;
-        case 'executing':
+        case "executing":
           return {
             request: currentCall.request,
             tool: toolInstance,
-            status: 'executing',
+            status: "executing",
             startTime: existingStartTime,
             outcome,
             invocation,
@@ -577,14 +539,11 @@ export class CoreToolScheduler {
     this.toolCalls = this.toolCalls.map((call) => {
       // We should never be asked to set args on an ErroredToolCall, but
       // we guard for the case anyways.
-      if (call.request.callId !== targetCallId || call.status === 'error') {
+      if (call.request.callId !== targetCallId || call.status === "error") {
         return call;
       }
 
-      const invocationOrError = this.buildInvocation(
-        call.tool,
-        args as Record<string, unknown>,
-      );
+      const invocationOrError = this.buildInvocation(call.tool, args as Record<string, unknown>);
       if (invocationOrError instanceof Error) {
         const response = createErrorResponse(
           call.request,
@@ -593,7 +552,7 @@ export class CoreToolScheduler {
         );
         return {
           request: { ...call.request, args: args as Record<string, unknown> },
-          status: 'error',
+          status: "error",
           tool: call.tool,
           response,
         } as ErroredToolCall;
@@ -611,16 +570,12 @@ export class CoreToolScheduler {
     return (
       this.isFinalizingToolCalls ||
       this.toolCalls.some(
-        (call) =>
-          call.status === 'executing' || call.status === 'awaiting_approval',
+        (call) => call.status === "executing" || call.status === "awaiting_approval",
       )
     );
   }
 
-  private buildInvocation(
-    tool: AnyDeclarativeTool,
-    args: object,
-  ): AnyToolInvocation | Error {
+  private buildInvocation(tool: AnyDeclarativeTool, args: object): AnyToolInvocation | Error {
     try {
       return tool.build(args);
     } catch (e) {
@@ -651,12 +606,10 @@ export class CoreToolScheduler {
     const topNResults = matches.slice(0, topN);
 
     if (topNResults.length === 0) {
-      return '';
+      return "";
     }
 
-    const suggestedNames = topNResults
-      .map((match) => `"${match.name}"`)
-      .join(', ');
+    const suggestedNames = topNResults.map((match) => `"${match.name}"`).join(", ");
 
     if (topNResults.length > 1) {
       return ` Did you mean one of: ${suggestedNames}?`;
@@ -669,42 +622,37 @@ export class CoreToolScheduler {
     request: ToolCallRequestInfo | ToolCallRequestInfo[],
     signal: AbortSignal,
   ): Promise<void> {
-    return runInDevTraceSpan(
-      { name: 'schedule' },
-      async ({ metadata: spanMetadata }) => {
-        spanMetadata.input = request;
-        if (this.isRunning() || this.isScheduling) {
-          return new Promise((resolve, reject) => {
-            const abortHandler = () => {
-              // Find and remove the request from the queue
-              const index = this.requestQueue.findIndex(
-                (item) => item.request === request,
-              );
-              if (index > -1) {
-                this.requestQueue.splice(index, 1);
-                reject(new Error('Tool call cancelled while in queue.'));
-              }
-            };
+    return runInDevTraceSpan({ name: "schedule" }, async ({ metadata: spanMetadata }) => {
+      spanMetadata.input = request;
+      if (this.isRunning() || this.isScheduling) {
+        return new Promise((resolve, reject) => {
+          const abortHandler = () => {
+            // Find and remove the request from the queue
+            const index = this.requestQueue.findIndex((item) => item.request === request);
+            if (index > -1) {
+              this.requestQueue.splice(index, 1);
+              reject(new Error("Tool call cancelled while in queue."));
+            }
+          };
 
-            signal.addEventListener('abort', abortHandler, { once: true });
+          signal.addEventListener("abort", abortHandler, { once: true });
 
-            this.requestQueue.push({
-              request,
-              signal,
-              resolve: () => {
-                signal.removeEventListener('abort', abortHandler);
-                resolve();
-              },
-              reject: (reason?: Error) => {
-                signal.removeEventListener('abort', abortHandler);
-                reject(reason);
-              },
-            });
+          this.requestQueue.push({
+            request,
+            signal,
+            resolve: () => {
+              signal.removeEventListener("abort", abortHandler);
+              resolve();
+            },
+            reject: (reason?: Error) => {
+              signal.removeEventListener("abort", abortHandler);
+              reject(reason);
+            },
           });
-        }
-        return this._schedule(request, signal);
-      },
-    );
+        });
+      }
+      return this._schedule(request, signal);
+    });
   }
 
   cancelAll(signal: AbortSignal): void {
@@ -717,16 +665,16 @@ export class CoreToolScheduler {
       const activeCall = this.toolCalls[0];
       // Only cancel if it's in a cancellable state.
       if (
-        activeCall.status === 'awaiting_approval' ||
-        activeCall.status === 'executing' ||
-        activeCall.status === 'scheduled' ||
-        activeCall.status === 'validating'
+        activeCall.status === "awaiting_approval" ||
+        activeCall.status === "executing" ||
+        activeCall.status === "scheduled" ||
+        activeCall.status === "validating"
       ) {
         this.setStatusInternal(
           activeCall.request.callId,
-          'cancelled',
+          "cancelled",
           signal,
-          'User cancelled the operation.',
+          "User cancelled the operation.",
         );
       }
     }
@@ -747,59 +695,52 @@ export class CoreToolScheduler {
     try {
       if (this.isRunning()) {
         throw new Error(
-          'Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).',
+          "Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).",
         );
       }
       const requestsToProcess = Array.isArray(request) ? request : [request];
       this.completedToolCallsForBatch = [];
 
-      const newToolCalls: ToolCall[] = requestsToProcess.map(
-        (reqInfo): ToolCall => {
-          const toolInstance = this.config
-            .getToolRegistry()
-            .getTool(reqInfo.name);
-          if (!toolInstance) {
-            const suggestion = this.getToolSuggestion(reqInfo.name);
-            const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
-            return {
-              status: 'error',
-              request: reqInfo,
-              response: createErrorResponse(
-                reqInfo,
-                new Error(errorMessage),
-                ToolErrorType.TOOL_NOT_REGISTERED,
-              ),
-              durationMs: 0,
-            };
-          }
-
-          const invocationOrError = this.buildInvocation(
-            toolInstance,
-            reqInfo.args,
-          );
-          if (invocationOrError instanceof Error) {
-            return {
-              status: 'error',
-              request: reqInfo,
-              tool: toolInstance,
-              response: createErrorResponse(
-                reqInfo,
-                invocationOrError,
-                ToolErrorType.INVALID_TOOL_PARAMS,
-              ),
-              durationMs: 0,
-            };
-          }
+      const newToolCalls: ToolCall[] = requestsToProcess.map((reqInfo): ToolCall => {
+        const toolInstance = this.config.getToolRegistry().getTool(reqInfo.name);
+        if (!toolInstance) {
+          const suggestion = this.getToolSuggestion(reqInfo.name);
+          const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
+          return {
+            status: "error",
+            request: reqInfo,
+            response: createErrorResponse(
+              reqInfo,
+              new Error(errorMessage),
+              ToolErrorType.TOOL_NOT_REGISTERED,
+            ),
+            durationMs: 0,
+          };
+        }
 
+        const invocationOrError = this.buildInvocation(toolInstance, reqInfo.args);
+        if (invocationOrError instanceof Error) {
           return {
-            status: 'validating',
+            status: "error",
             request: reqInfo,
             tool: toolInstance,
-            invocation: invocationOrError,
-            startTime: Date.now(),
+            response: createErrorResponse(
+              reqInfo,
+              invocationOrError,
+              ToolErrorType.INVALID_TOOL_PARAMS,
+            ),
+            durationMs: 0,
           };
-        },
-      );
+        }
+
+        return {
+          status: "validating",
+          request: reqInfo,
+          tool: toolInstance,
+          invocation: invocationOrError,
+          startTime: Date.now(),
+        };
+      });
 
       this.toolCallQueue.push(...newToolCalls);
       await this._processNextInQueue(signal);
@@ -829,7 +770,7 @@ export class CoreToolScheduler {
     this.notifyToolCallsUpdate();
 
     // Handle tools that were already errored during creation.
-    if (toolCall.status === 'error') {
+    if (toolCall.status === "error") {
       // An error during validation means this "active" tool is already complete.
       // We need to check for batch completion to either finish or process the next in queue.
       await this.checkAndNotifyCompletion(signal);
@@ -837,46 +778,36 @@ export class CoreToolScheduler {
     }
 
     // This logic is moved from the old `for` loop in `_schedule`.
-    if (toolCall.status === 'validating') {
+    if (toolCall.status === "validating") {
       const { request: reqInfo, invocation } = toolCall;
 
       try {
         if (signal.aborted) {
           this.setStatusInternal(
             reqInfo.callId,
-            'cancelled',
+            "cancelled",
             signal,
-            'Tool call cancelled by user.',
+            "Tool call cancelled by user.",
           );
           // The completion check will handle the cascade.
           await this.checkAndNotifyCompletion(signal);
           return;
         }
 
-        const confirmationDetails =
-          await invocation.shouldConfirmExecute(signal);
+        const confirmationDetails = await invocation.shouldConfirmExecute(signal);
 
         if (!confirmationDetails) {
-          this.setToolCallOutcome(
-            reqInfo.callId,
-            ToolConfirmationOutcome.ProceedAlways,
-          );
-          this.setStatusInternal(reqInfo.callId, 'scheduled', signal);
+          this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+          this.setStatusInternal(reqInfo.callId, "scheduled", signal);
         } else {
           if (this.isAutoApproved(toolCall)) {
-            this.setToolCallOutcome(
-              reqInfo.callId,
-              ToolConfirmationOutcome.ProceedAlways,
-            );
-            this.setStatusInternal(reqInfo.callId, 'scheduled', signal);
+            this.setToolCallOutcome(reqInfo.callId, ToolConfirmationOutcome.ProceedAlways);
+            this.setStatusInternal(reqInfo.callId, "scheduled", signal);
           } else {
             // Allow IDE to resolve confirmation
-            if (
-              confirmationDetails.type === 'edit' &&
-              confirmationDetails.ideConfirmation
-            ) {
+            if (confirmationDetails.type === "edit" && confirmationDetails.ideConfirmation) {
               confirmationDetails.ideConfirmation.then((resolution) => {
-                if (resolution.status === 'accepted') {
+                if (resolution.status === "accepted") {
                   this.handleConfirmationResponse(
                     reqInfo.callId,
                     confirmationDetails.onConfirm,
@@ -897,10 +828,7 @@ export class CoreToolScheduler {
             const originalOnConfirm = confirmationDetails.onConfirm;
             const wrappedConfirmationDetails: ToolCallConfirmationDetails = {
               ...confirmationDetails,
-              onConfirm: (
-                outcome: ToolConfirmationOutcome,
-                payload?: ToolConfirmationPayload,
-              ) =>
+              onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) =>
                 this.handleConfirmationResponse(
                   reqInfo.callId,
                   originalOnConfirm,
@@ -911,7 +839,7 @@ export class CoreToolScheduler {
             };
             this.setStatusInternal(
               reqInfo.callId,
-              'awaiting_approval',
+              "awaiting_approval",
               signal,
               wrappedConfirmationDetails,
             );
@@ -921,15 +849,15 @@ export class CoreToolScheduler {
         if (signal.aborted) {
           this.setStatusInternal(
             reqInfo.callId,
-            'cancelled',
+            "cancelled",
             signal,
-            'Tool call cancelled by user.',
+            "Tool call cancelled by user.",
           );
           await this.checkAndNotifyCompletion(signal);
         } else {
           this.setStatusInternal(
             reqInfo.callId,
-            'error',
+            "error",
             signal,
             createErrorResponse(
               reqInfo,
@@ -952,10 +880,10 @@ export class CoreToolScheduler {
     payload?: ToolConfirmationPayload,
   ): Promise<void> {
     const toolCall = this.toolCalls.find(
-      (c) => c.request.callId === callId && c.status === 'awaiting_approval',
+      (c) => c.request.callId === callId && c.status === "awaiting_approval",
     );
 
-    if (toolCall && toolCall.status === 'awaiting_approval') {
+    if (toolCall && toolCall.status === "awaiting_approval") {
       await originalOnConfirm(outcome);
     }
 
@@ -974,16 +902,15 @@ export class CoreToolScheduler {
           return;
         }
 
-        this.setStatusInternal(callId, 'awaiting_approval', signal, {
+        this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
           isModifying: true,
         } as ToolCallConfirmationDetails);
 
         const contentOverrides =
-          waitingToolCall.confirmationDetails.type === 'edit'
+          waitingToolCall.confirmationDetails.type === "edit"
             ? {
-                currentContent:
-                  waitingToolCall.confirmationDetails.originalContent,
+                currentContent: waitingToolCall.confirmationDetails.originalContent,
                 proposedContent: waitingToolCall.confirmationDetails.newContent,
               }
             : undefined;
@@ -999,7 +926,7 @@ export class CoreToolScheduler {
           contentOverrides,
         );
         this.setArgsInternal(callId, updatedParams);
-        this.setStatusInternal(callId, 'awaiting_approval', signal, {
+        this.setStatusInternal(callId, "awaiting_approval", signal, {
           ...waitingToolCall.confirmationDetails,
           fileDiff: updatedDiff,
           isModifying: false,
@@ -1008,13 +935,9 @@ export class CoreToolScheduler {
     } else {
       // If the client provided new content, apply it before scheduling.
       if (payload?.newContent && toolCall) {
-        await this._applyInlineModify(
-          toolCall as WaitingToolCall,
-          payload,
-          signal,
-        );
+        await this._applyInlineModify(toolCall as WaitingToolCall, payload, signal);
       }
-      this.setStatusInternal(callId, 'scheduled', signal);
+      this.setStatusInternal(callId, "scheduled", signal);
     }
     await this.attemptExecutionOfScheduledCalls(signal);
   }
@@ -1031,16 +954,14 @@ export class CoreToolScheduler {
     signal: AbortSignal,
   ): Promise<void> {
     if (
-      toolCall.confirmationDetails.type !== 'edit' ||
+      toolCall.confirmationDetails.type !== "edit" ||
       !isModifiableDeclarativeTool(toolCall.tool)
     ) {
       return;
     }
 
     const modifyContext = toolCall.tool.getModifyContext(signal);
-    const currentContent = await modifyContext.getCurrentContent(
-      toolCall.request.args,
-    );
+    const currentContent = await modifyContext.getCurrentContent(toolCall.request.args);
 
     const updatedParams = modifyContext.createUpdatedParams(
       currentContent,
@@ -1051,45 +972,36 @@ export class CoreToolScheduler {
       modifyContext.getFilePath(toolCall.request.args),
       currentContent,
       payload.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
     );
 
     this.setArgsInternal(toolCall.request.callId, updatedParams);
-    this.setStatusInternal(
-      toolCall.request.callId,
-      'awaiting_approval',
-      signal,
-      {
-        ...toolCall.confirmationDetails,
-        fileDiff: updatedDiff,
-      },
-    );
+    this.setStatusInternal(toolCall.request.callId, "awaiting_approval", signal, {
+      ...toolCall.confirmationDetails,
+      fileDiff: updatedDiff,
+    });
   }
 
-  private async attemptExecutionOfScheduledCalls(
-    signal: AbortSignal,
-  ): Promise<void> {
+  private async attemptExecutionOfScheduledCalls(signal: AbortSignal): Promise<void> {
     const allCallsFinalOrScheduled = this.toolCalls.every(
       (call) =>
-        call.status === 'scheduled' ||
-        call.status === 'cancelled' ||
-        call.status === 'success' ||
-        call.status === 'error',
+        call.status === "scheduled" ||
+        call.status === "cancelled" ||
+        call.status === "success" ||
+        call.status === "error",
     );
 
     if (allCallsFinalOrScheduled) {
-      const callsToExecute = this.toolCalls.filter(
-        (call) => call.status === 'scheduled',
-      );
+      const callsToExecute = this.toolCalls.filter((call) => call.status === "scheduled");
 
       for (const toolCall of callsToExecute) {
-        if (toolCall.status !== 'scheduled') continue;
+        if (toolCall.status !== "scheduled") continue;
 
         const scheduledCall = toolCall;
         const { callId, name: toolName } = scheduledCall.request;
         const invocation = scheduledCall.invocation;
-        this.setStatusInternal(callId, 'executing', signal);
+        this.setStatusInternal(callId, "executing", signal);
 
         const liveOutputCallback =
           scheduledCall.tool.canUpdateOutput && this.outputUpdateHandler
@@ -1098,7 +1010,7 @@ export class CoreToolScheduler {
                   this.outputUpdateHandler(callId, outputChunk);
                 }
                 this.toolCalls = this.toolCalls.map((tc) =>
-                  tc.request.callId === callId && tc.status === 'executing'
+                  tc.request.callId === callId && tc.status === "executing"
                     ? { ...tc, liveOutput: outputChunk }
                     : tc,
                 );
@@ -1111,7 +1023,7 @@ export class CoreToolScheduler {
         await runInDevTraceSpan(
           {
             name: toolCall.tool.name,
-            attributes: { type: 'tool-call' },
+            attributes: { type: "tool-call" },
           },
           async ({ metadata: spanMetadata }) => {
             spanMetadata.input = {
@@ -1125,9 +1037,7 @@ export class CoreToolScheduler {
             if (invocation instanceof ShellToolInvocation) {
               const setPidCallback = (pid: number) => {
                 this.toolCalls = this.toolCalls.map((tc) =>
-                  tc.request.callId === callId && tc.status === 'executing'
-                    ? { ...tc, pid }
-                    : tc,
+                  tc.request.callId === callId && tc.status === "executing" ? { ...tc, pid } : tc,
                 );
                 this.notifyToolCallsUpdate();
               };
@@ -1138,11 +1048,7 @@ export class CoreToolScheduler {
                 setPidCallback,
               );
             } else {
-              promise = invocation.execute(
-                signal,
-                liveOutputCallback,
-                shellExecutionConfig,
-              );
+              promise = invocation.execute(signal, liveOutputCallback, shellExecutionConfig);
             }
 
             try {
@@ -1151,25 +1057,23 @@ export class CoreToolScheduler {
               if (signal.aborted) {
                 this.setStatusInternal(
                   callId,
-                  'cancelled',
+                  "cancelled",
                   signal,
-                  'User cancelled tool execution.',
+                  "User cancelled tool execution.",
                 );
               } else if (toolResult.error === undefined) {
                 let content = toolResult.llmContent;
                 let outputFile: string | undefined = undefined;
-                const contentLength =
-                  typeof content === 'string' ? content.length : undefined;
+                const contentLength = typeof content === "string" ? content.length : undefined;
                 if (
-                  typeof content === 'string' &&
+                  typeof content === "string" &&
                   toolName === SHELL_TOOL_NAME &&
                   this.config.getEnableToolOutputTruncation() &&
                   this.config.getTruncateToolOutputThreshold() > 0 &&
                   this.config.getTruncateToolOutputLines() > 0
                 ) {
                   const originalContentLength = content.length;
-                  const threshold =
-                    this.config.getTruncateToolOutputThreshold();
+                  const threshold = this.config.getTruncateToolOutputThreshold();
                   const lines = this.config.getTruncateToolOutputLines();
                   const truncatedResult = await truncateAndSaveToFile(
                     content,
@@ -1184,25 +1088,18 @@ export class CoreToolScheduler {
                   if (outputFile) {
                     logToolOutputTruncated(
                       this.config,
-                      new ToolOutputTruncatedEvent(
-                        scheduledCall.request.prompt_id,
-                        {
-                          toolName,
-                          originalContentLength,
-                          truncatedContentLength: content.length,
-                          threshold,
-                          lines,
-                        },
-                      ),
+                      new ToolOutputTruncatedEvent(scheduledCall.request.prompt_id, {
+                        toolName,
+                        originalContentLength,
+                        truncatedContentLength: content.length,
+                        threshold,
+                        lines,
+                      }),
                     );
                   }
                 }
 
-                const response = convertToFunctionResponse(
-                  toolName,
-                  callId,
-                  content,
-                );
+                const response = convertToFunctionResponse(toolName, callId, content);
                 const successResponse: ToolCallResponseInfo = {
                   callId,
                   responseParts: response,
@@ -1212,12 +1109,7 @@ export class CoreToolScheduler {
                   outputFile,
                   contentLength,
                 };
-                this.setStatusInternal(
-                  callId,
-                  'success',
-                  signal,
-                  successResponse,
-                );
+                this.setStatusInternal(callId, "success", signal, successResponse);
               } else {
                 // It is a failure
                 const error = new Error(toolResult.error.message);
@@ -1226,21 +1118,21 @@ export class CoreToolScheduler {
                   error,
                   toolResult.error.type,
                 );
-                this.setStatusInternal(callId, 'error', signal, errorResponse);
+                this.setStatusInternal(callId, "error", signal, errorResponse);
               }
             } catch (executionError: unknown) {
               spanMetadata.error = executionError;
               if (signal.aborted) {
                 this.setStatusInternal(
                   callId,
-                  'cancelled',
+                  "cancelled",
                   signal,
-                  'User cancelled tool execution.',
+                  "User cancelled tool execution.",
                 );
               } else {
                 this.setStatusInternal(
                   callId,
-                  'error',
+                  "error",
                   signal,
                   createErrorResponse(
                     scheduledCall.request,
@@ -1269,9 +1161,9 @@ export class CoreToolScheduler {
     } else {
       const activeCall = this.toolCalls[0];
       const isTerminal =
-        activeCall.status === 'success' ||
-        activeCall.status === 'error' ||
-        activeCall.status === 'cancelled';
+        activeCall.status === "success" ||
+        activeCall.status === "error" ||
+        activeCall.status === "cancelled";
 
       // If the active tool is not in a terminal state (e.g., it's 'executing' or 'awaiting_approval'),
       // then the scheduler is still busy or paused. We should not proceed.
@@ -1314,9 +1206,7 @@ export class CoreToolScheduler {
       // After completion of the entire batch, process the next item in the main request queue.
       if (this.requestQueue.length > 0) {
         const next = this.requestQueue.shift()!;
-        this._schedule(next.request, next.signal)
-          .then(next.resolve)
-          .catch(next.reject);
+        this._schedule(next.request, next.signal).then(next.resolve).catch(next.reject);
       }
     } else {
       // The batch is not yet complete, so continue processing the current batch sequence.
@@ -1328,21 +1218,20 @@ export class CoreToolScheduler {
     while (this.toolCallQueue.length > 0) {
       const queuedCall = this.toolCallQueue.shift()!;
       // Don't cancel tools that already errored during validation.
-      if (queuedCall.status === 'error') {
+      if (queuedCall.status === "error") {
         this.completedToolCallsForBatch.push(queuedCall);
         continue;
       }
       const durationMs =
-        'startTime' in queuedCall && queuedCall.startTime
+        "startTime" in queuedCall && queuedCall.startTime
           ? Date.now() - queuedCall.startTime
           : undefined;
-      const errorMessage =
-        '[Operation Cancelled] User cancelled the operation.';
+      const errorMessage = "[Operation Cancelled] User cancelled the operation.";
       this.completedToolCallsForBatch.push({
         request: queuedCall.request,
         tool: queuedCall.tool,
         invocation: queuedCall.invocation,
-        status: 'cancelled',
+        status: "cancelled",
         response: {
           callId: queuedCall.request.callId,
           responseParts: [
@@ -1394,7 +1283,7 @@ export class CoreToolScheduler {
 
     const allowedTools = this.config.getAllowedTools() || [];
     const { tool, invocation } = toolCall;
-    const toolName = typeof tool === 'string' ? tool : tool.name;
+    const toolName = typeof tool === "string" ? tool : tool.name;
 
     if (SHELL_TOOL_NAMES.includes(toolName)) {
       return isShellInvocationAllowlisted(invocation, allowedTools);
diff --git a/packages/gemini-core/src/core/fakeContentGenerator.test.ts b/packages/gemini-core/src/core/fakeContentGenerator.test.ts
index de8306e51..dbd381795 100644
--- a/packages/gemini-core/src/core/fakeContentGenerator.test.ts
+++ b/packages/gemini-core/src/core/fakeContentGenerator.test.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { promises } from "node:fs";
 import {
-  FakeContentGenerator,
-  type FakeResponse,
-} from './fakeContentGenerator.js';
-import { promises } from 'node:fs';
-import {
-  GenerateContentResponse,
+  type CountTokensParameters,
   type CountTokensResponse,
+  type EmbedContentParameters,
   type EmbedContentResponse,
   type GenerateContentParameters,
-  type CountTokensParameters,
-  type EmbedContentParameters,
-} from '@google/genai';
+  GenerateContentResponse,
+} from "@google/genai";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { FakeContentGenerator, type FakeResponse } from "./fakeContentGenerator.js";
 
-vi.mock('node:fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:fs')>();
+vi.mock("node:fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:fs")>();
   return {
     ...actual,
     promises: {
@@ -32,39 +29,33 @@ vi.mock('node:fs', async (importOriginal) => {
 
 const mockReadFile = vi.mocked(promises.readFile);
 
-describe('FakeContentGenerator', () => {
+describe("FakeContentGenerator", () => {
   const fakeGenerateContentResponse: FakeResponse = {
-    method: 'generateContent',
+    method: "generateContent",
     response: {
-      candidates: [
-        { content: { parts: [{ text: 'response1' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response1" }], role: "model" } }],
     } as GenerateContentResponse,
   };
 
   const fakeGenerateContentStreamResponse: FakeResponse = {
-    method: 'generateContentStream',
+    method: "generateContentStream",
     response: [
       {
-        candidates: [
-          { content: { parts: [{ text: 'chunk1' }], role: 'model' } },
-        ],
+        candidates: [{ content: { parts: [{ text: "chunk1" }], role: "model" } }],
       },
       {
-        candidates: [
-          { content: { parts: [{ text: 'chunk2' }], role: 'model' } },
-        ],
+        candidates: [{ content: { parts: [{ text: "chunk2" }], role: "model" } }],
       },
     ] as GenerateContentResponse[],
   };
 
   const fakeCountTokensResponse: FakeResponse = {
-    method: 'countTokens',
+    method: "countTokens",
     response: { totalTokens: 10 } as CountTokensResponse,
   };
 
   const fakeEmbedContentResponse: FakeResponse = {
-    method: 'embedContent',
+    method: "embedContent",
     response: {
       embeddings: [{ values: [1, 2, 3] }],
     } as EmbedContentResponse,
@@ -74,24 +65,16 @@ describe('FakeContentGenerator', () => {
     vi.resetAllMocks();
   });
 
-  it('should return responses for generateContent', async () => {
+  it("should return responses for generateContent", async () => {
     const generator = new FakeContentGenerator([fakeGenerateContentResponse]);
-    const response = await generator.generateContent(
-      {} as GenerateContentParameters,
-      'id',
-    );
+    const response = await generator.generateContent({} as GenerateContentParameters, "id");
     expect(response).instanceOf(GenerateContentResponse);
     expect(response).toEqual(fakeGenerateContentResponse.response);
   });
 
-  it('should return responses for generateContentStream', async () => {
-    const generator = new FakeContentGenerator([
-      fakeGenerateContentStreamResponse,
-    ]);
-    const stream = await generator.generateContentStream(
-      {} as GenerateContentParameters,
-      'id',
-    );
+  it("should return responses for generateContentStream", async () => {
+    const generator = new FakeContentGenerator([fakeGenerateContentStreamResponse]);
+    const stream = await generator.generateContentStream({} as GenerateContentParameters, "id");
     const responses = [];
     for await (const response of stream) {
       expect(response).instanceOf(GenerateContentResponse);
@@ -100,19 +83,19 @@ describe('FakeContentGenerator', () => {
     expect(responses).toEqual(fakeGenerateContentStreamResponse.response);
   });
 
-  it('should return responses for countTokens', async () => {
+  it("should return responses for countTokens", async () => {
     const generator = new FakeContentGenerator([fakeCountTokensResponse]);
     const response = await generator.countTokens({} as CountTokensParameters);
     expect(response).toEqual(fakeCountTokensResponse.response);
   });
 
-  it('should return responses for embedContent', async () => {
+  it("should return responses for embedContent", async () => {
     const generator = new FakeContentGenerator([fakeEmbedContentResponse]);
     const response = await generator.embedContent({} as EmbedContentParameters);
     expect(response).toEqual(fakeEmbedContentResponse.response);
   });
 
-  it('should handle a mixture of calls', async () => {
+  it("should handle a mixture of calls", async () => {
     const fakeResponses = [
       fakeGenerateContentResponse,
       fakeGenerateContentStreamResponse,
@@ -121,8 +104,8 @@ describe('FakeContentGenerator', () => {
     ];
     const generator = new FakeContentGenerator(fakeResponses);
     for (const fakeResponse of fakeResponses) {
-      const response = await generator[fakeResponse.method]({} as never, '');
-      if (fakeResponse.method === 'generateContentStream') {
+      const response = await generator[fakeResponse.method]({} as never, "");
+      if (fakeResponse.method === "generateContentStream") {
         const responses = [];
         for await (const item of response as AsyncGenerator<GenerateContentResponse>) {
           expect(item).instanceOf(GenerateContentResponse);
@@ -135,33 +118,30 @@ describe('FakeContentGenerator', () => {
     }
   });
 
-  it('should throw error when no more responses', async () => {
+  it("should throw error when no more responses", async () => {
     const generator = new FakeContentGenerator([fakeGenerateContentResponse]);
-    await generator.generateContent({} as GenerateContentParameters, 'id');
-    await expect(
-      generator.embedContent({} as EmbedContentParameters),
-    ).rejects.toThrowError('No more mock responses for embedContent');
-    await expect(
-      generator.countTokens({} as CountTokensParameters),
-    ).rejects.toThrowError('No more mock responses for countTokens');
+    await generator.generateContent({} as GenerateContentParameters, "id");
+    await expect(generator.embedContent({} as EmbedContentParameters)).rejects.toThrowError(
+      "No more mock responses for embedContent",
+    );
+    await expect(generator.countTokens({} as CountTokensParameters)).rejects.toThrowError(
+      "No more mock responses for countTokens",
+    );
     await expect(
-      generator.generateContentStream({} as GenerateContentParameters, 'id'),
-    ).rejects.toThrow('No more mock responses for generateContentStream');
+      generator.generateContentStream({} as GenerateContentParameters, "id"),
+    ).rejects.toThrow("No more mock responses for generateContentStream");
     await expect(
-      generator.generateContent({} as GenerateContentParameters, 'id'),
-    ).rejects.toThrowError('No more mock responses for generateContent');
+      generator.generateContent({} as GenerateContentParameters, "id"),
+    ).rejects.toThrowError("No more mock responses for generateContent");
   });
 
-  describe('fromFile', () => {
-    it('should create a generator from a file', async () => {
-      const fileContent = JSON.stringify(fakeGenerateContentResponse) + '\n';
+  describe("fromFile", () => {
+    it("should create a generator from a file", async () => {
+      const fileContent = JSON.stringify(fakeGenerateContentResponse) + "\n";
       mockReadFile.mockResolvedValue(fileContent);
 
-      const generator = await FakeContentGenerator.fromFile('fake-path.json');
-      const response = await generator.generateContent(
-        {} as GenerateContentParameters,
-        'id',
-      );
+      const generator = await FakeContentGenerator.fromFile("fake-path.json");
+      const response = await generator.generateContent({} as GenerateContentParameters, "id");
       expect(response).toEqual(fakeGenerateContentResponse.response);
     });
   });
diff --git a/packages/gemini-core/src/core/fakeContentGenerator.ts b/packages/gemini-core/src/core/fakeContentGenerator.ts
index a464c4f8f..61d525c8c 100644
--- a/packages/gemini-core/src/core/fakeContentGenerator.ts
+++ b/packages/gemini-core/src/core/fakeContentGenerator.ts
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { promises } from "node:fs";
 import {
-  GenerateContentResponse,
-  type CountTokensResponse,
-  type GenerateContentParameters,
   type CountTokensParameters,
-  EmbedContentResponse,
+  type CountTokensResponse,
   type EmbedContentParameters,
-} from '@google/genai';
-import { promises } from 'node:fs';
-import type { ContentGenerator } from './contentGenerator.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+  EmbedContentResponse,
+  type GenerateContentParameters,
+  GenerateContentResponse,
+} from "@google/genai";
+import type { UserTierId } from "../code_assist/types.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 
 export type FakeResponse =
   | {
-      method: 'generateContent';
+      method: "generateContent";
       response: GenerateContentResponse;
     }
   | {
-      method: 'generateContentStream';
+      method: "generateContentStream";
       response: GenerateContentResponse[];
     }
   | {
-      method: 'countTokens';
+      method: "countTokens";
       response: CountTokensResponse;
     }
   | {
-      method: 'embedContent';
+      method: "embedContent";
       response: EmbedContentResponse;
     };
 
@@ -46,23 +46,22 @@ export class FakeContentGenerator implements ContentGenerator {
   constructor(private readonly responses: FakeResponse[]) {}
 
   static async fromFile(filePath: string): Promise<FakeContentGenerator> {
-    const fileContent = await promises.readFile(filePath, 'utf-8');
+    const fileContent = await promises.readFile(filePath, "utf-8");
     const responses = fileContent
-      .split('\n')
-      .filter((line) => line.trim() !== '')
+      .split("\n")
+      .filter((line) => line.trim() !== "")
       .map((line) => JSON.parse(line) as FakeResponse);
     return new FakeContentGenerator(responses);
   }
 
   private getNextResponse<
-    M extends FakeResponse['method'],
-    R = Extract<FakeResponse, { method: M }>['response'],
+    M extends FakeResponse["method"],
+    R = Extract<FakeResponse, { method: M }>["response"],
   >(method: M, request: unknown): R {
     const response = this.responses[this.callCounter++];
     if (!response) {
       throw new Error(
-        `No more mock responses for ${method}, got request:\n` +
-          safeJsonStringify(request),
+        `No more mock responses for ${method}, got request:\n` + safeJsonStringify(request),
       );
     }
     if (response.method !== method) {
@@ -78,7 +77,7 @@ export class FakeContentGenerator implements ContentGenerator {
     _userPromptId: string,
   ): Promise<GenerateContentResponse> {
     return Object.setPrototypeOf(
-      this.getNextResponse('generateContent', request),
+      this.getNextResponse("generateContent", request),
       GenerateContentResponse.prototype,
     );
   }
@@ -87,29 +86,22 @@ export class FakeContentGenerator implements ContentGenerator {
     request: GenerateContentParameters,
     _userPromptId: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
-    const responses = this.getNextResponse('generateContentStream', request);
+    const responses = this.getNextResponse("generateContentStream", request);
     async function* stream() {
       for (const response of responses) {
-        yield Object.setPrototypeOf(
-          response,
-          GenerateContentResponse.prototype,
-        );
+        yield Object.setPrototypeOf(response, GenerateContentResponse.prototype);
       }
     }
     return stream();
   }
 
-  async countTokens(
-    request: CountTokensParameters,
-  ): Promise<CountTokensResponse> {
-    return this.getNextResponse('countTokens', request);
+  async countTokens(request: CountTokensParameters): Promise<CountTokensResponse> {
+    return this.getNextResponse("countTokens", request);
   }
 
-  async embedContent(
-    request: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse> {
     return Object.setPrototypeOf(
-      this.getNextResponse('embedContent', request),
+      this.getNextResponse("embedContent", request),
       EmbedContentResponse.prototype,
     );
   }
diff --git a/packages/gemini-core/src/core/geminiChat.test.ts b/packages/gemini-core/src/core/geminiChat.test.ts
index 8f5d31353..8cbd46a30 100644
--- a/packages/gemini-core/src/core/geminiChat.test.ts
+++ b/packages/gemini-core/src/core/geminiChat.test.ts
@@ -4,31 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type {
-  Content,
-  GenerateContentConfig,
-  GenerateContentResponse,
-} from '@google/genai';
-import { ApiError } from '@google/genai';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import {
-  GeminiChat,
-  InvalidStreamError,
-  StreamEventType,
-  type StreamEvent,
-} from './geminiChat.js';
-import type { Config } from '../config/config.js';
-import { setSimulate429 } from '../utils/testUtils.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { AuthType } from './contentGenerator.js';
-import { type RetryOptions } from '../utils/retry.js';
-import { uiTelemetryService } from '../telemetry/uiTelemetry.js';
+import type { Content, GenerateContentConfig, GenerateContentResponse } from "@google/genai";
+import { ApiError } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { uiTelemetryService } from "../telemetry/uiTelemetry.js";
+import { type RetryOptions } from "../utils/retry.js";
+import { setSimulate429 } from "../utils/testUtils.js";
+import { AuthType } from "./contentGenerator.js";
+import { GeminiChat, InvalidStreamError, type StreamEvent, StreamEventType } from "./geminiChat.js";
 
 // Mock fs module to prevent actual file system operations during tests
 const mockFileSystem = new Map<string, string>();
 
-vi.mock('node:fs', () => {
+vi.mock("node:fs", () => {
   const fsModule = {
     mkdirSync: vi.fn(),
     writeFileSync: vi.fn((path: string, data: string) => {
@@ -38,8 +29,8 @@ vi.mock('node:fs', () => {
       if (mockFileSystem.has(path)) {
         return mockFileSystem.get(path);
       }
-      throw Object.assign(new Error('ENOENT: no such file or directory'), {
-        code: 'ENOENT',
+      throw Object.assign(new Error("ENOENT: no such file or directory"), {
+        code: "ENOENT",
       });
     }),
     existsSync: vi.fn((path: string) => mockFileSystem.has(path)),
@@ -60,11 +51,11 @@ const { mockRetryWithBackoff } = vi.hoisted(() => ({
   mockRetryWithBackoff: vi.fn(),
 }));
 
-vi.mock('../utils/retry.js', () => ({
+vi.mock("../utils/retry.js", () => ({
   retryWithBackoff: mockRetryWithBackoff,
 }));
 
-vi.mock('../fallback/handler.js', () => ({
+vi.mock("../fallback/handler.js", () => ({
   handleFallback: mockHandleFallback,
 }));
 
@@ -73,18 +64,18 @@ const { mockLogContentRetry, mockLogContentRetryFailure } = vi.hoisted(() => ({
   mockLogContentRetryFailure: vi.fn(),
 }));
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logContentRetry: mockLogContentRetry,
   logContentRetryFailure: mockLogContentRetryFailure,
 }));
 
-vi.mock('../telemetry/uiTelemetry.js', () => ({
+vi.mock("../telemetry/uiTelemetry.js", () => ({
   uiTelemetryService: {
     setLastPromptTokenCount: vi.fn(),
   },
 }));
 
-describe('GeminiChat', () => {
+describe("GeminiChat", () => {
   let mockContentGenerator: ContentGenerator;
   let chat: GeminiChat;
   let mockConfig: Config;
@@ -105,23 +96,23 @@ describe('GeminiChat', () => {
     // Default mock implementation for tests that don't care about retry logic
     mockRetryWithBackoff.mockImplementation(async (apiCall) => apiCall());
     mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryLogPromptsEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
       getDebugMode: () => false,
       getContentGeneratorConfig: vi.fn().mockReturnValue({
-        authType: 'oauth-personal', // Ensure this is set for fallback tests
-        model: 'test-model',
+        authType: "oauth-personal", // Ensure this is set for fallback tests
+        model: "test-model",
       }),
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       setModel: vi.fn(),
       isInFallbackMode: vi.fn().mockReturnValue(false),
       getQuotaErrorOccurred: vi.fn().mockReturnValue(false),
       setQuotaErrorOccurred: vi.fn(),
       flashFallbackHandler: undefined,
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/temp"),
       },
       getToolRegistry: vi.fn().mockReturnValue({
         getTool: vi.fn(),
@@ -142,35 +133,33 @@ describe('GeminiChat', () => {
     vi.resetAllMocks();
   });
 
-  describe('constructor', () => {
-    it('should initialize lastPromptTokenCount based on history size', () => {
+  describe("constructor", () => {
+    it("should initialize lastPromptTokenCount based on history size", () => {
       const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        { role: 'model', parts: [{ text: 'Hi there' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
+        { role: "model", parts: [{ text: "Hi there" }] },
       ];
       const chatWithHistory = new GeminiChat(mockConfig, config, history);
       const estimatedTokens = Math.ceil(JSON.stringify(history).length / 4);
       expect(chatWithHistory.getLastPromptTokenCount()).toBe(estimatedTokens);
     });
 
-    it('should initialize lastPromptTokenCount for empty history', () => {
+    it("should initialize lastPromptTokenCount for empty history", () => {
       const chatEmpty = new GeminiChat(mockConfig, config, []);
-      expect(chatEmpty.getLastPromptTokenCount()).toBe(
-        Math.ceil(JSON.stringify([]).length / 4),
-      );
+      expect(chatEmpty.getLastPromptTokenCount()).toBe(Math.ceil(JSON.stringify([]).length / 4));
     });
   });
 
-  describe('sendMessageStream', () => {
-    it('should succeed if a tool call is followed by an empty part', async () => {
+  describe("sendMessageStream", () => {
+    it("should succeed if a tool call is followed by an empty part", async () => {
       // 1. Mock a stream that contains a tool call, then an invalid (empty) part.
       const streamWithToolCall = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ functionCall: { name: 'test_tool', args: {} } }],
+                role: "model",
+                parts: [{ functionCall: { name: "test_tool", args: {} } }],
               },
             },
           ],
@@ -180,24 +169,22 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: '' }],
+                role: "model",
+                parts: [{ text: "" }],
               },
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithToolCall,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithToolCall);
 
       // 2. Action & Assert: The stream processing should complete without throwing an error
       // because the presence of a tool call makes the empty final chunk acceptable.
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test message' },
-        'prompt-id-tool-call-empty-end',
+        "test-model",
+        { message: "test message" },
+        "prompt-id-tool-call-empty-end",
       );
       await expect(
         (async () => {
@@ -215,15 +202,15 @@ describe('GeminiChat', () => {
       expect(modelTurn?.parts![0]!.functionCall).toBeDefined();
     });
 
-    it('should fail if the stream ends with an empty part and has no finishReason', async () => {
+    it("should fail if the stream ends with an empty part and has no finishReason", async () => {
       // 1. Mock a stream that ends with an invalid part and has no finish reason.
       const streamWithNoFinish = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'Initial content...' }],
+                role: "model",
+                parts: [{ text: "Initial content..." }],
               },
             },
           ],
@@ -233,23 +220,21 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: '' }],
+                role: "model",
+                parts: [{ text: "" }],
               },
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithNoFinish,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithNoFinish);
 
       // 2. Action & Assert: The stream should fail because there's no finish reason.
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test message' },
-        'prompt-id-no-finish-empty-end',
+        "test-model",
+        { message: "test message" },
+        "prompt-id-no-finish-empty-end",
       );
       await expect(
         (async () => {
@@ -260,15 +245,15 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should succeed if the stream ends with an invalid part but has a finishReason and contained a valid part', async () => {
+    it("should succeed if the stream ends with an invalid part but has a finishReason and contained a valid part", async () => {
       // 1. Mock a stream that sends a valid chunk, then an invalid one, but has a finish reason.
       const streamWithInvalidEnd = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'Initial valid content...' }],
+                role: "model",
+                parts: [{ text: "Initial valid content..." }],
               },
             },
           ],
@@ -278,24 +263,22 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: '' }], // Invalid part
+                role: "model",
+                parts: [{ text: "" }], // Invalid part
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithInvalidEnd,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithInvalidEnd);
 
       // 2. Action & Assert: The stream should complete without throwing an error.
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test message' },
-        'prompt-id-valid-then-invalid-end',
+        "test-model",
+        { message: "test message" },
+        "prompt-id-valid-then-invalid-end",
       );
       await expect(
         (async () => {
@@ -310,16 +293,14 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2); // user turn + model turn
       const modelTurn = history[1]!;
       expect(modelTurn?.parts?.length).toBe(1);
-      expect(modelTurn?.parts![0]!.text).toBe('Initial valid content...');
+      expect(modelTurn?.parts![0]!.text).toBe("Initial valid content...");
     });
 
-    it('should consolidate subsequent text chunks after receiving an empty text chunk', async () => {
+    it("should consolidate subsequent text chunks after receiving an empty text chunk", async () => {
       // 1. Mock the API to return a stream where one chunk is just an empty text part.
       const multiChunkStream = (async function* () {
         yield {
-          candidates: [
-            { content: { role: 'model', parts: [{ text: 'Hello' }] } },
-          ],
+          candidates: [{ content: { role: "model", parts: [{ text: "Hello" }] } }],
         } as unknown as GenerateContentResponse;
         // FIX: The original test used { text: '' }, which is invalid.
         // A chunk can be empty but still valid. This chunk is now removed
@@ -327,22 +308,20 @@ describe('GeminiChat', () => {
         yield {
           candidates: [
             {
-              content: { role: 'model', parts: [{ text: ' World!' }] },
-              finishReason: 'STOP',
+              content: { role: "model", parts: [{ text: " World!" }] },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        multiChunkStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(multiChunkStream);
 
       // 2. Action: Send a message and consume the stream.
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test message' },
-        'prompt-id-empty-chunk-consolidation',
+        "test-model",
+        { message: "test message" },
+        "prompt-id-empty-chunk-consolidation",
       );
       for await (const _ of stream) {
         // Consume the stream
@@ -353,29 +332,25 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2);
       const modelTurn = history[1]!;
       expect(modelTurn?.parts?.length).toBe(1);
-      expect(modelTurn?.parts![0]!.text).toBe('Hello World!');
+      expect(modelTurn?.parts![0]!.text).toBe("Hello World!");
     });
 
-    it('should consolidate adjacent text parts that arrive in separate stream chunks', async () => {
+    it("should consolidate adjacent text parts that arrive in separate stream chunks", async () => {
       // 1. Mock the API to return a stream of multiple, adjacent text chunks.
       const multiChunkStream = (async function* () {
         yield {
-          candidates: [
-            { content: { role: 'model', parts: [{ text: 'This is the ' }] } },
-          ],
+          candidates: [{ content: { role: "model", parts: [{ text: "This is the " }] } }],
         } as unknown as GenerateContentResponse;
         yield {
-          candidates: [
-            { content: { role: 'model', parts: [{ text: 'first part.' }] } },
-          ],
+          candidates: [{ content: { role: "model", parts: [{ text: "first part." }] } }],
         } as unknown as GenerateContentResponse;
         // This function call should break the consolidation.
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ functionCall: { name: 'do_stuff', args: {} } }],
+                role: "model",
+                parts: [{ functionCall: { name: "do_stuff", args: {} } }],
               },
             },
           ],
@@ -384,23 +359,21 @@ describe('GeminiChat', () => {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'This is the second part.' }],
+                role: "model",
+                parts: [{ text: "This is the second part." }],
               },
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        multiChunkStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(multiChunkStream);
 
       // 2. Action: Send a message and consume the stream.
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test message' },
-        'prompt-id-multi-chunk',
+        "test-model",
+        { message: "test message" },
+        "prompt-id-multi-chunk",
       );
       for await (const _ of stream) {
         // Consume the stream to trigger history recording.
@@ -413,42 +386,40 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2);
 
       const modelTurn = history[1]!;
-      expect(modelTurn.role).toBe('model');
+      expect(modelTurn.role).toBe("model");
 
       // The model turn should have 3 distinct parts: the merged text, the function call, and the final text.
       expect(modelTurn?.parts?.length).toBe(3);
-      expect(modelTurn?.parts![0]!.text).toBe('This is the first part.');
+      expect(modelTurn?.parts![0]!.text).toBe("This is the first part.");
       expect(modelTurn.parts![1]!.functionCall).toBeDefined();
-      expect(modelTurn.parts![2]!.text).toBe('This is the second part.');
+      expect(modelTurn.parts![2]!.text).toBe("This is the second part.");
     });
-    it('should preserve text parts that stream in the same chunk as a thought', async () => {
+    it("should preserve text parts that stream in the same chunk as a thought", async () => {
       // 1. Mock the API to return a single chunk containing both a thought and visible text.
       const mixedContentStream = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
+                role: "model",
                 parts: [
-                  { thought: 'This is a thought.' },
-                  { text: 'This is the visible text that should not be lost.' },
+                  { thought: "This is a thought." },
+                  { text: "This is the visible text that should not be lost." },
                 ],
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        mixedContentStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(mixedContentStream);
 
       // 2. Action: Send a message and fully consume the stream to trigger history recording.
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test message' },
-        'prompt-id-mixed-chunk',
+        "test-model",
+        { message: "test message" },
+        "prompt-id-mixed-chunk",
       );
       for await (const _ of stream) {
         // This loop consumes the stream.
@@ -461,30 +432,28 @@ describe('GeminiChat', () => {
       expect(history.length).toBe(2);
 
       const modelTurn = history[1]!;
-      expect(modelTurn.role).toBe('model');
+      expect(modelTurn.role).toBe("model");
 
       // CRUCIAL ASSERTION:
       // The buggy code would fail here, resulting in parts.length being 0.
       // The corrected code will pass, preserving the single visible text part.
       expect(modelTurn?.parts?.length).toBe(1);
-      expect(modelTurn?.parts![0]!.text).toBe(
-        'This is the visible text that should not be lost.',
-      );
+      expect(modelTurn?.parts![0]!.text).toBe("This is the visible text that should not be lost.");
     });
-    it('should throw an error when a tool call is followed by an empty stream response', async () => {
+    it("should throw an error when a tool call is followed by an empty stream response", async () => {
       // 1. Setup: A history where the model has just made a function call.
       const initialHistory: Content[] = [
         {
-          role: 'user',
-          parts: [{ text: 'Find a good Italian restaurant for me.' }],
+          role: "user",
+          parts: [{ text: "Find a good Italian restaurant for me." }],
         },
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
               functionCall: {
-                name: 'find_restaurant',
-                args: { cuisine: 'Italian' },
+                name: "find_restaurant",
+                args: { cuisine: "Italian" },
               },
             },
           ],
@@ -497,28 +466,26 @@ describe('GeminiChat', () => {
         yield {
           candidates: [
             {
-              content: { role: 'model', parts: [{ thought: true }] },
-              finishReason: 'STOP',
+              content: { role: "model", parts: [{ thought: true }] },
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        emptyStreamResponse,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(emptyStreamResponse);
 
       // 3. Action: Send the function response back to the model and consume the stream.
       const stream = await chat.sendMessageStream(
-        'test-model',
+        "test-model",
         {
           message: {
             functionResponse: {
-              name: 'find_restaurant',
-              response: { name: 'Vesuvio' },
+              name: "find_restaurant",
+              response: { name: "Vesuvio" },
             },
           },
         },
-        'prompt-id-stream-1',
+        "prompt-id-stream-1",
       );
 
       // 4. Assert: The stream processing should throw an InvalidStreamError.
@@ -531,19 +498,19 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should succeed when there is a tool call without finish reason', async () => {
+    it("should succeed when there is a tool call without finish reason", async () => {
       // Setup: Stream with tool call but no finish reason
       const streamWithToolCall = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
+                role: "model",
                 parts: [
                   {
                     functionCall: {
-                      name: 'test_function',
-                      args: { param: 'value' },
+                      name: "test_function",
+                      args: { param: "value" },
                     },
                   },
                 ],
@@ -554,15 +521,9 @@ describe('GeminiChat', () => {
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        streamWithToolCall,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(streamWithToolCall);
 
-      const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-1',
-      );
+      const stream = await chat.sendMessageStream("test-model", { message: "test" }, "prompt-id-1");
 
       // Should not throw an error
       await expect(
@@ -574,15 +535,15 @@ describe('GeminiChat', () => {
       ).resolves.not.toThrow();
     });
 
-    it('should throw InvalidStreamError when no tool call and no finish reason', async () => {
+    it("should throw InvalidStreamError when no tool call and no finish reason", async () => {
       // Setup: Stream with text but no finish reason and no tool call
       const streamWithoutFinishReason = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'some response' }],
+                role: "model",
+                parts: [{ text: "some response" }],
               },
               // No finishReason
             },
@@ -594,11 +555,7 @@ describe('GeminiChat', () => {
         streamWithoutFinishReason,
       );
 
-      const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-1',
-      );
+      const stream = await chat.sendMessageStream("test-model", { message: "test" }, "prompt-id-1");
 
       await expect(
         (async () => {
@@ -609,17 +566,17 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should throw InvalidStreamError when no tool call and empty response text', async () => {
+    it("should throw InvalidStreamError when no tool call and empty response text", async () => {
       // Setup: Stream with finish reason but empty response (only thoughts)
       const streamWithEmptyResponse = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ thought: 'thinking...' }],
+                role: "model",
+                parts: [{ thought: "thinking..." }],
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
@@ -629,11 +586,7 @@ describe('GeminiChat', () => {
         streamWithEmptyResponse,
       );
 
-      const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-1',
-      );
+      const stream = await chat.sendMessageStream("test-model", { message: "test" }, "prompt-id-1");
 
       await expect(
         (async () => {
@@ -644,31 +597,25 @@ describe('GeminiChat', () => {
       ).rejects.toThrow(InvalidStreamError);
     });
 
-    it('should succeed when there is finish reason and response text', async () => {
+    it("should succeed when there is finish reason and response text", async () => {
       // Setup: Stream with both finish reason and text content
       const validStream = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'valid response' }],
+                role: "model",
+                parts: [{ text: "valid response" }],
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
             },
           ],
         } as unknown as GenerateContentResponse;
       })();
 
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        validStream,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(validStream);
 
-      const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-1',
-      );
+      const stream = await chat.sendMessageStream("test-model", { message: "test" }, "prompt-id-1");
 
       // Should not throw an error
       await expect(
@@ -680,21 +627,21 @@ describe('GeminiChat', () => {
       ).resolves.not.toThrow();
     });
 
-    it('should call generateContentStream with the correct parameters', async () => {
+    it("should call generateContentStream with the correct parameters", async () => {
       const response = (async function* () {
         yield {
           candidates: [
             {
               content: {
-                parts: [{ text: 'response' }],
-                role: 'model',
+                parts: [{ text: "response" }],
+                role: "model",
               },
-              finishReason: 'STOP',
+              finishReason: "STOP",
               index: 0,
               safetyRatings: [],
             },
           ],
-          text: () => 'response',
+          text: () => "response",
           usageMetadata: {
             promptTokenCount: 42,
             candidatesTokenCount: 15,
@@ -702,14 +649,12 @@ describe('GeminiChat', () => {
           },
         } as unknown as GenerateContentResponse;
       })();
-      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
-        response,
-      );
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(response);
 
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'hello' },
-        'prompt-id-1',
+        "test-model",
+        { message: "hello" },
+        "prompt-id-1",
       );
       for await (const _ of stream) {
         // consume stream
@@ -717,25 +662,25 @@ describe('GeminiChat', () => {
 
       expect(mockContentGenerator.generateContentStream).toHaveBeenCalledWith(
         {
-          model: 'test-model',
+          model: "test-model",
           contents: [
             {
-              role: 'user',
-              parts: [{ text: 'hello' }],
+              role: "user",
+              parts: [{ text: "hello" }],
             },
           ],
           config: {},
         },
-        'prompt-id-1',
+        "prompt-id-1",
       );
     });
   });
 
-  describe('addHistory', () => {
-    it('should add a new content item to the history', () => {
+  describe("addHistory", () => {
+    it("should add a new content item to the history", () => {
       const newContent: Content = {
-        role: 'user',
-        parts: [{ text: 'A new message' }],
+        role: "user",
+        parts: [{ text: "A new message" }],
       };
       chat.addHistory(newContent);
       const history = chat.getHistory();
@@ -743,14 +688,14 @@ describe('GeminiChat', () => {
       expect(history[0]).toEqual(newContent);
     });
 
-    it('should add multiple items correctly', () => {
+    it("should add multiple items correctly", () => {
       const content1: Content = {
-        role: 'user',
-        parts: [{ text: 'Message 1' }],
+        role: "user",
+        parts: [{ text: "Message 1" }],
       };
       const content2: Content = {
-        role: 'model',
-        parts: [{ text: 'Message 2' }],
+        role: "model",
+        parts: [{ text: "Message 2" }],
       };
       chat.addHistory(content1);
       chat.addHistory(content2);
@@ -761,15 +706,15 @@ describe('GeminiChat', () => {
     });
   });
 
-  describe('sendMessageStream with retries', () => {
-    it('should yield a RETRY event when an invalid stream is encountered', async () => {
+  describe("sendMessageStream with retries", () => {
+    it("should yield a RETRY event when an invalid stream is encountered", async () => {
       // ARRANGE: Mock the stream to fail once, then succeed.
       vi.mocked(mockContentGenerator.generateContentStream)
         .mockImplementationOnce(async () =>
           // First attempt: An invalid stream with an empty text part.
           (async function* () {
             yield {
-              candidates: [{ content: { parts: [{ text: '' }] } }],
+              candidates: [{ content: { parts: [{ text: "" }] } }],
             } as unknown as GenerateContentResponse;
           })(),
         )
@@ -779,8 +724,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Success' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Success" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -789,9 +734,9 @@ describe('GeminiChat', () => {
 
       // ACT: Send a message and collect all events from the stream.
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-yield-retry',
+        "test-model",
+        { message: "test" },
+        "prompt-id-yield-retry",
       );
       const events: StreamEvent[] = [];
       for await (const event of stream) {
@@ -804,14 +749,14 @@ describe('GeminiChat', () => {
       expect(retryEvent).toBeDefined();
       expect(retryEvent?.type).toBe(StreamEventType.RETRY);
     });
-    it('should retry on invalid content, succeed, and report metrics', async () => {
+    it("should retry on invalid content, succeed, and report metrics", async () => {
       // Use mockImplementationOnce to provide a fresh, promise-wrapped generator for each attempt.
       vi.mocked(mockContentGenerator.generateContentStream)
         .mockImplementationOnce(async () =>
           // First call returns an invalid stream
           (async function* () {
             yield {
-              candidates: [{ content: { parts: [{ text: '' }] } }], // Invalid empty text part
+              candidates: [{ content: { parts: [{ text: "" }] } }], // Invalid empty text part
             } as unknown as GenerateContentResponse;
           })(),
         )
@@ -821,8 +766,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Successful response' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Successful response" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -830,9 +775,9 @@ describe('GeminiChat', () => {
         );
 
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-retry-success',
+        "test-model",
+        { message: "test" },
+        "prompt-id-retry-success",
       );
       const chunks: StreamEvent[] = [];
       for await (const chunk of stream) {
@@ -842,9 +787,7 @@ describe('GeminiChat', () => {
       // Assertions
       expect(mockLogContentRetry).toHaveBeenCalledTimes(1);
       expect(mockLogContentRetryFailure).not.toHaveBeenCalled();
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
       // Check for a retry event
       expect(chunks.some((c) => c.type === StreamEventType.RETRY)).toBe(true);
@@ -854,8 +797,7 @@ describe('GeminiChat', () => {
         chunks.some(
           (c) =>
             c.type === StreamEventType.CHUNK &&
-            c.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-              'Successful response',
+            c.value.candidates?.[0]?.content?.parts?.[0]?.text === "Successful response",
         ),
       ).toBe(true);
 
@@ -863,26 +805,26 @@ describe('GeminiChat', () => {
       const history = chat.getHistory();
       expect(history.length).toBe(2);
       expect(history[0]).toEqual({
-        role: 'user',
-        parts: [{ text: 'test' }],
+        role: "user",
+        parts: [{ text: "test" }],
       });
       expect(history[1]).toEqual({
-        role: 'model',
-        parts: [{ text: 'Successful response' }],
+        role: "model",
+        parts: [{ text: "Successful response" }],
       });
 
       // Verify that token counting is not called when usageMetadata is missing
       expect(uiTelemetryService.setLastPromptTokenCount).not.toHaveBeenCalled();
     });
 
-    it('should set temperature to 1 on retry', async () => {
+    it("should set temperature to 1 on retry", async () => {
       // Use mockImplementationOnce to provide a fresh, promise-wrapped generator for each attempt.
       vi.mocked(mockContentGenerator.generateContentStream)
         .mockImplementationOnce(async () =>
           // First call returns an invalid stream
           (async function* () {
             yield {
-              candidates: [{ content: { parts: [{ text: '' }] } }], // Invalid empty text part
+              candidates: [{ content: { parts: [{ text: "" }] } }], // Invalid empty text part
             } as unknown as GenerateContentResponse;
           })(),
         )
@@ -892,8 +834,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Successful response' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Successful response" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -901,67 +843,60 @@ describe('GeminiChat', () => {
         );
 
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test', config: { temperature: 0.5 } },
-        'prompt-id-retry-temperature',
+        "test-model",
+        { message: "test", config: { temperature: 0.5 } },
+        "prompt-id-retry-temperature",
       );
 
       for await (const _ of stream) {
         // consume stream
       }
 
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
       // First call should have original temperature
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         1,
         expect.objectContaining({
           config: expect.objectContaining({
             temperature: 0.5,
           }),
         }),
-        'prompt-id-retry-temperature',
+        "prompt-id-retry-temperature",
       );
 
       // Second call (retry) should have temperature 1
-      expect(
-        mockContentGenerator.generateContentStream,
-      ).toHaveBeenNthCalledWith(
+      expect(mockContentGenerator.generateContentStream).toHaveBeenNthCalledWith(
         2,
         expect.objectContaining({
           config: expect.objectContaining({
             temperature: 1,
           }),
         }),
-        'prompt-id-retry-temperature',
+        "prompt-id-retry-temperature",
       );
     });
 
-    it('should fail after all retries on persistent invalid content and report metrics', async () => {
-      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(
-        async () =>
-          (async function* () {
-            yield {
-              candidates: [
-                {
-                  content: {
-                    parts: [{ text: '' }],
-                    role: 'model',
-                  },
+    it("should fail after all retries on persistent invalid content and report metrics", async () => {
+      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(async () =>
+        (async function* () {
+          yield {
+            candidates: [
+              {
+                content: {
+                  parts: [{ text: "" }],
+                  role: "model",
                 },
-              ],
-            } as unknown as GenerateContentResponse;
-          })(),
+              },
+            ],
+          } as unknown as GenerateContentResponse;
+        })(),
       );
 
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-retry-fail',
+        "test-model",
+        { message: "test" },
+        "prompt-id-retry-fail",
       );
       await expect(async () => {
         for await (const _ of stream) {
@@ -970,9 +905,7 @@ describe('GeminiChat', () => {
       }).rejects.toThrow(InvalidStreamError);
 
       // Should be called 2 times (initial + 1 retry)
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
       expect(mockLogContentRetry).toHaveBeenCalledTimes(1);
       expect(mockLogContentRetryFailure).toHaveBeenCalledTimes(1);
 
@@ -980,12 +913,12 @@ describe('GeminiChat', () => {
       const history = chat.getHistory();
       expect(history.length).toBe(1);
       expect(history[0]).toEqual({
-        role: 'user',
-        parts: [{ text: 'test' }],
+        role: "user",
+        parts: [{ text: "test" }],
       });
     });
 
-    describe('API error retry behavior', () => {
+    describe("API error retry behavior", () => {
       beforeEach(() => {
         // Use a more direct mock for retry testing
         mockRetryWithBackoff.mockImplementation(async (apiCall) => {
@@ -995,10 +928,7 @@ describe('GeminiChat', () => {
             // Simulate the logic of defaultShouldRetry for ApiError
             let shouldRetry = false;
             if (error instanceof ApiError && error.message) {
-              if (
-                error.status === 429 ||
-                (error.status >= 500 && error.status < 600)
-              ) {
+              if (error.status === 429 || (error.status >= 500 && error.status < 600)) {
                 shouldRetry = true;
               }
               // Explicitly don't retry on these
@@ -1016,17 +946,15 @@ describe('GeminiChat', () => {
         });
       });
 
-      it('should not retry on 400 Bad Request errors', async () => {
-        const error400 = new ApiError({ message: 'Bad Request', status: 400 });
+      it("should not retry on 400 Bad Request errors", async () => {
+        const error400 = new ApiError({ message: "Bad Request", status: 400 });
 
-        vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(
-          error400,
-        );
+        vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(error400);
 
         const stream = await chat.sendMessageStream(
-          'test-model',
-          { message: 'test' },
-          'prompt-id-400',
+          "test-model",
+          { message: "test" },
+          "prompt-id-400",
         );
 
         await expect(
@@ -1038,13 +966,11 @@ describe('GeminiChat', () => {
         ).rejects.toThrow(error400);
 
         // Should only be called once (no retry)
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(1);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(1);
       });
 
-      it('should retry on 429 Rate Limit errors', async () => {
-        const error429 = new ApiError({ message: 'Rate Limited', status: 429 });
+      it("should retry on 429 Rate Limit errors", async () => {
+        const error429 = new ApiError({ message: "Rate Limited", status: 429 });
 
         vi.mocked(mockContentGenerator.generateContentStream)
           .mockRejectedValueOnce(error429)
@@ -1053,8 +979,8 @@ describe('GeminiChat', () => {
               yield {
                 candidates: [
                   {
-                    content: { parts: [{ text: 'Success after retry' }] },
-                    finishReason: 'STOP',
+                    content: { parts: [{ text: "Success after retry" }] },
+                    finishReason: "STOP",
                   },
                 ],
               } as unknown as GenerateContentResponse;
@@ -1062,9 +988,9 @@ describe('GeminiChat', () => {
           );
 
         const stream = await chat.sendMessageStream(
-          'test-model',
-          { message: 'test' },
-          'prompt-id-429-retry',
+          "test-model",
+          { message: "test" },
+          "prompt-id-429-retry",
         );
 
         const events: StreamEvent[] = [];
@@ -1073,24 +999,21 @@ describe('GeminiChat', () => {
         }
 
         // Should be called twice (initial + retry)
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(2);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
         // Should have successful content
         expect(
           events.some(
             (e) =>
               e.type === StreamEventType.CHUNK &&
-              e.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-                'Success after retry',
+              e.value.candidates?.[0]?.content?.parts?.[0]?.text === "Success after retry",
           ),
         ).toBe(true);
       });
 
-      it('should retry on 5xx server errors', async () => {
+      it("should retry on 5xx server errors", async () => {
         const error500 = new ApiError({
-          message: 'Internal Server Error 500',
+          message: "Internal Server Error 500",
           status: 500,
         });
 
@@ -1101,8 +1024,8 @@ describe('GeminiChat', () => {
               yield {
                 candidates: [
                   {
-                    content: { parts: [{ text: 'Recovered from 500' }] },
-                    finishReason: 'STOP',
+                    content: { parts: [{ text: "Recovered from 500" }] },
+                    finishReason: "STOP",
                   },
                 ],
               } as unknown as GenerateContentResponse;
@@ -1110,9 +1033,9 @@ describe('GeminiChat', () => {
           );
 
         const stream = await chat.sendMessageStream(
-          'test-model',
-          { message: 'test' },
-          'prompt-id-500-retry',
+          "test-model",
+          { message: "test" },
+          "prompt-id-500-retry",
         );
 
         const events: StreamEvent[] = [];
@@ -1121,17 +1044,13 @@ describe('GeminiChat', () => {
         }
 
         // Should be called twice (initial + retry)
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(2);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
       });
 
-      it('should retry on specific fetch errors when configured', async () => {
+      it("should retry on specific fetch errors when configured", async () => {
         vi.mocked(mockConfig.getRetryFetchErrors).mockReturnValue(true);
 
-        const fetchError = new Error(
-          'exception TypeError: fetch failed sending request',
-        );
+        const fetchError = new Error("exception TypeError: fetch failed sending request");
 
         vi.mocked(mockContentGenerator.generateContentStream)
           .mockRejectedValueOnce(fetchError)
@@ -1140,8 +1059,8 @@ describe('GeminiChat', () => {
               yield {
                 candidates: [
                   {
-                    content: { parts: [{ text: 'Success after fetch error' }] },
-                    finishReason: 'STOP',
+                    content: { parts: [{ text: "Success after fetch error" }] },
+                    finishReason: "STOP",
                   },
                 ],
               } as unknown as GenerateContentResponse;
@@ -1155,9 +1074,7 @@ describe('GeminiChat', () => {
             if (
               options?.retryFetchErrors &&
               error instanceof Error &&
-              error.message.includes(
-                'exception TypeError: fetch failed sending request',
-              )
+              error.message.includes("exception TypeError: fetch failed sending request")
             ) {
               return await apiCall();
             }
@@ -1166,9 +1083,9 @@ describe('GeminiChat', () => {
         });
 
         const stream = await chat.sendMessageStream(
-          'test-model',
-          { message: 'test' },
-          'prompt-id-fetch-error-retry',
+          "test-model",
+          { message: "test" },
+          "prompt-id-fetch-error-retry",
         );
 
         const events: StreamEvent[] = [];
@@ -1176,16 +1093,13 @@ describe('GeminiChat', () => {
           events.push(event);
         }
 
-        expect(
-          mockContentGenerator.generateContentStream,
-        ).toHaveBeenCalledTimes(2);
+        expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
 
         expect(
           events.some(
             (e) =>
               e.type === StreamEventType.CHUNK &&
-              e.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-                'Success after fetch error',
+              e.value.candidates?.[0]?.content?.parts?.[0]?.text === "Success after fetch error",
           ),
         ).toBe(true);
       });
@@ -1196,11 +1110,11 @@ describe('GeminiChat', () => {
       });
     });
   });
-  it('should correctly retry and append to an existing history mid-conversation', async () => {
+  it("should correctly retry and append to an existing history mid-conversation", async () => {
     // 1. Setup
     const initialHistory: Content[] = [
-      { role: 'user', parts: [{ text: 'First question' }] },
-      { role: 'model', parts: [{ text: 'First answer' }] },
+      { role: "user", parts: [{ text: "First question" }] },
+      { role: "model", parts: [{ text: "First answer" }] },
     ];
     chat.setHistory(initialHistory);
 
@@ -1209,7 +1123,7 @@ describe('GeminiChat', () => {
       .mockImplementationOnce(async () =>
         (async function* () {
           yield {
-            candidates: [{ content: { parts: [{ text: '' }] } }],
+            candidates: [{ content: { parts: [{ text: "" }] } }],
           } as unknown as GenerateContentResponse;
         })(),
       )
@@ -1219,8 +1133,8 @@ describe('GeminiChat', () => {
           yield {
             candidates: [
               {
-                content: { parts: [{ text: 'Second answer' }] },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Second answer" }] },
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -1229,9 +1143,9 @@ describe('GeminiChat', () => {
 
     // 3. Send a new message
     const stream = await chat.sendMessageStream(
-      'test-model',
-      { message: 'Second question' },
-      'prompt-id-retry-existing',
+      "test-model",
+      { message: "Second question" },
+      "prompt-id-retry-existing",
     );
     for await (const _ of stream) {
       // consume stream
@@ -1246,35 +1160,31 @@ describe('GeminiChat', () => {
 
     // Explicitly verify the structure of each part to satisfy TypeScript
     const turn1 = history[0];
-    if (!turn1?.parts?.[0] || !('text' in turn1.parts[0])) {
-      throw new Error('Test setup error: First turn is not a valid text part.');
+    if (!turn1?.parts?.[0] || !("text" in turn1.parts[0])) {
+      throw new Error("Test setup error: First turn is not a valid text part.");
     }
-    expect(turn1.parts[0].text).toBe('First question');
+    expect(turn1.parts[0].text).toBe("First question");
 
     const turn2 = history[1];
-    if (!turn2?.parts?.[0] || !('text' in turn2.parts[0])) {
-      throw new Error(
-        'Test setup error: Second turn is not a valid text part.',
-      );
+    if (!turn2?.parts?.[0] || !("text" in turn2.parts[0])) {
+      throw new Error("Test setup error: Second turn is not a valid text part.");
     }
-    expect(turn2.parts[0].text).toBe('First answer');
+    expect(turn2.parts[0].text).toBe("First answer");
 
     const turn3 = history[2];
-    if (!turn3?.parts?.[0] || !('text' in turn3.parts[0])) {
-      throw new Error('Test setup error: Third turn is not a valid text part.');
+    if (!turn3?.parts?.[0] || !("text" in turn3.parts[0])) {
+      throw new Error("Test setup error: Third turn is not a valid text part.");
     }
-    expect(turn3.parts[0].text).toBe('Second question');
+    expect(turn3.parts[0].text).toBe("Second question");
 
     const turn4 = history[3];
-    if (!turn4?.parts?.[0] || !('text' in turn4.parts[0])) {
-      throw new Error(
-        'Test setup error: Fourth turn is not a valid text part.',
-      );
+    if (!turn4?.parts?.[0] || !("text" in turn4.parts[0])) {
+      throw new Error("Test setup error: Fourth turn is not a valid text part.");
     }
-    expect(turn4.parts[0].text).toBe('Second answer');
+    expect(turn4.parts[0].text).toBe("Second answer");
   });
 
-  it('should retry if the model returns a completely empty stream (no chunks)', async () => {
+  it("should retry if the model returns a completely empty stream (no chunks)", async () => {
     // 1. Mock the API to return an empty stream first, then a valid one.
     vi.mocked(mockContentGenerator.generateContentStream)
       .mockImplementationOnce(
@@ -1289,9 +1199,9 @@ describe('GeminiChat', () => {
               candidates: [
                 {
                   content: {
-                    parts: [{ text: 'Successful response after empty' }],
+                    parts: [{ text: "Successful response after empty" }],
                   },
-                  finishReason: 'STOP',
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -1300,9 +1210,9 @@ describe('GeminiChat', () => {
 
     // 2. Call the method and consume the stream.
     const stream = await chat.sendMessageStream(
-      'test-model',
-      { message: 'test empty stream' },
-      'prompt-id-empty-stream',
+      "test-model",
+      { message: "test empty stream" },
+      "prompt-id-empty-stream",
     );
     const chunks: StreamEvent[] = [];
     for await (const chunk of stream) {
@@ -1315,8 +1225,7 @@ describe('GeminiChat', () => {
       chunks.some(
         (c) =>
           c.type === StreamEventType.CHUNK &&
-          c.value.candidates?.[0]?.content?.parts?.[0]?.text ===
-            'Successful response after empty',
+          c.value.candidates?.[0]?.content?.parts?.[0]?.text === "Successful response after empty",
       ),
     ).toBe(true);
 
@@ -1325,20 +1234,18 @@ describe('GeminiChat', () => {
 
     // Explicitly verify the structure of each part to satisfy TypeScript
     const turn1 = history[0];
-    if (!turn1?.parts?.[0] || !('text' in turn1.parts[0])) {
-      throw new Error('Test setup error: First turn is not a valid text part.');
+    if (!turn1?.parts?.[0] || !("text" in turn1.parts[0])) {
+      throw new Error("Test setup error: First turn is not a valid text part.");
     }
-    expect(turn1.parts[0].text).toBe('test empty stream');
+    expect(turn1.parts[0].text).toBe("test empty stream");
 
     const turn2 = history[1];
-    if (!turn2?.parts?.[0] || !('text' in turn2.parts[0])) {
-      throw new Error(
-        'Test setup error: Second turn is not a valid text part.',
-      );
+    if (!turn2?.parts?.[0] || !("text" in turn2.parts[0])) {
+      throw new Error("Test setup error: Second turn is not a valid text part.");
     }
-    expect(turn2.parts[0].text).toBe('Successful response after empty');
+    expect(turn2.parts[0].text).toBe("Successful response after empty");
   });
-  it('should queue a subsequent sendMessageStream call until the first stream is fully consumed', async () => {
+  it("should queue a subsequent sendMessageStream call until the first stream is fully consumed", async () => {
     // 1. Create a promise to manually control the stream's lifecycle
     let continueFirstStream: () => void;
     const firstStreamContinuePromise = new Promise<void>((resolve) => {
@@ -1348,16 +1255,14 @@ describe('GeminiChat', () => {
     // 2. Mock the API to return controllable async generators
     const firstStreamGenerator = (async function* () {
       yield {
-        candidates: [
-          { content: { parts: [{ text: 'first response part 1' }] } },
-        ],
+        candidates: [{ content: { parts: [{ text: "first response part 1" }] } }],
       } as unknown as GenerateContentResponse;
       await firstStreamContinuePromise; // Pause the stream
       yield {
         candidates: [
           {
-            content: { parts: [{ text: ' part 2' }] },
-            finishReason: 'STOP',
+            content: { parts: [{ text: " part 2" }] },
+            finishReason: "STOP",
           },
         ],
       } as unknown as GenerateContentResponse;
@@ -1367,8 +1272,8 @@ describe('GeminiChat', () => {
       yield {
         candidates: [
           {
-            content: { parts: [{ text: 'second response' }] },
-            finishReason: 'STOP',
+            content: { parts: [{ text: "second response" }] },
+            finishReason: "STOP",
           },
         ],
       } as unknown as GenerateContentResponse;
@@ -1380,18 +1285,18 @@ describe('GeminiChat', () => {
 
     // 3. Start the first stream and consume only the first chunk to pause it
     const firstStream = await chat.sendMessageStream(
-      'test-model',
-      { message: 'first' },
-      'prompt-1',
+      "test-model",
+      { message: "first" },
+      "prompt-1",
     );
     const firstStreamIterator = firstStream[Symbol.asyncIterator]();
     await firstStreamIterator.next();
 
     // 4. While the first stream is paused, start the second call. It will block.
     const secondStreamPromise = chat.sendMessageStream(
-      'test-model',
-      { message: 'second' },
-      'prompt-2',
+      "test-model",
+      { message: "second" },
+      "prompt-2",
     );
 
     // 5. Assert that only one API call has been made so far.
@@ -1420,38 +1325,35 @@ describe('GeminiChat', () => {
     expect(history.length).toBe(4);
 
     const turn4 = history[3];
-    if (!turn4?.parts?.[0] || !('text' in turn4.parts[0])) {
-      throw new Error(
-        'Test setup error: Fourth turn is not a valid text part.',
-      );
+    if (!turn4?.parts?.[0] || !("text" in turn4.parts[0])) {
+      throw new Error("Test setup error: Fourth turn is not a valid text part.");
     }
-    expect(turn4.parts[0].text).toBe('second response');
+    expect(turn4.parts[0].text).toBe("second response");
   });
 
-  describe('Model Resolution', () => {
+  describe("Model Resolution", () => {
     const mockResponse = {
       candidates: [
         {
-          content: { parts: [{ text: 'response' }], role: 'model' },
-          finishReason: 'STOP',
+          content: { parts: [{ text: "response" }], role: "model" },
+          finishReason: "STOP",
         },
       ],
     } as unknown as GenerateContentResponse;
 
-    it('should use the FLASH model when in fallback mode (sendMessageStream)', async () => {
-      vi.mocked(mockConfig.getModel).mockReturnValue('gemini-pro');
+    it("should use the FLASH model when in fallback mode (sendMessageStream)", async () => {
+      vi.mocked(mockConfig.getModel).mockReturnValue("gemini-pro");
       vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
-      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(
-        async () =>
-          (async function* () {
-            yield mockResponse;
-          })(),
+      vi.mocked(mockContentGenerator.generateContentStream).mockImplementation(async () =>
+        (async function* () {
+          yield mockResponse;
+        })(),
       );
 
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test' },
-        'prompt-id-res3',
+        "test-model",
+        { message: "test" },
+        "prompt-id-res3",
       );
       for await (const _ of stream) {
         // consume stream
@@ -1461,14 +1363,14 @@ describe('GeminiChat', () => {
         expect.objectContaining({
           model: DEFAULT_GEMINI_FLASH_MODEL,
         }),
-        'prompt-id-res3',
+        "prompt-id-res3",
       );
     });
   });
 
-  describe('Fallback Integration (Retries)', () => {
+  describe("Fallback Integration (Retries)", () => {
     const error429 = new ApiError({
-      message: 'API Error 429: Quota exceeded',
+      message: "API Error 429: Quota exceeded",
       status: 429,
     });
 
@@ -1484,10 +1386,7 @@ describe('GeminiChat', () => {
       } catch (error) {
         if (options.onPersistent429) {
           // We simulate the "persistent" trigger here for simplicity.
-          const shouldRetry = await options.onPersistent429(
-            options.authType,
-            error,
-          );
+          const shouldRetry = await options.onPersistent429(options.authType, error);
           if (shouldRetry) {
             return await apiCall();
           }
@@ -1504,13 +1403,13 @@ describe('GeminiChat', () => {
       mockRetryWithBackoff.mockImplementation(async (apiCall) => apiCall());
     });
 
-    it('should call handleFallback with the specific failed model and retry if handler returns true', async () => {
+    it("should call handleFallback with the specific failed model and retry if handler returns true", async () => {
       const authType = AuthType.LOGIN_WITH_GOOGLE;
       vi.mocked(mockConfig.getContentGeneratorConfig).mockReturnValue({
         authType,
       });
 
-      const isInFallbackModeSpy = vi.spyOn(mockConfig, 'isInFallbackMode');
+      const isInFallbackModeSpy = vi.spyOn(mockConfig, "isInFallbackMode");
       isInFallbackModeSpy.mockReturnValue(false);
 
       vi.mocked(mockContentGenerator.generateContentStream)
@@ -1521,8 +1420,8 @@ describe('GeminiChat', () => {
             yield {
               candidates: [
                 {
-                  content: { parts: [{ text: 'Success on retry' }] },
-                  finishReason: 'STOP',
+                  content: { parts: [{ text: "Success on retry" }] },
+                  finishReason: "STOP",
                 },
               ],
             } as unknown as GenerateContentResponse;
@@ -1535,9 +1434,9 @@ describe('GeminiChat', () => {
       });
 
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'trigger 429' },
-        'prompt-id-fb1',
+        "test-model",
+        { message: "trigger 429" },
+        "prompt-id-fb1",
       );
 
       // Consume stream to trigger logic
@@ -1545,33 +1444,24 @@ describe('GeminiChat', () => {
         // no-op
       }
 
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        2,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(2);
       expect(mockHandleFallback).toHaveBeenCalledTimes(1);
-      expect(mockHandleFallback).toHaveBeenCalledWith(
-        mockConfig,
-        'test-model',
-        authType,
-        error429,
-      );
+      expect(mockHandleFallback).toHaveBeenCalledWith(mockConfig, "test-model", authType, error429);
 
       const history = chat.getHistory();
       const modelTurn = history[1]!;
-      expect(modelTurn.parts![0]!.text).toBe('Success on retry');
+      expect(modelTurn.parts![0]!.text).toBe("Success on retry");
     });
 
-    it('should stop retrying if handleFallback returns false (e.g., auth intent)', async () => {
-      vi.mocked(mockConfig.getModel).mockReturnValue('gemini-pro');
-      vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(
-        error429,
-      );
+    it("should stop retrying if handleFallback returns false (e.g., auth intent)", async () => {
+      vi.mocked(mockConfig.getModel).mockReturnValue("gemini-pro");
+      vi.mocked(mockContentGenerator.generateContentStream).mockRejectedValue(error429);
       mockHandleFallback.mockResolvedValue(false);
 
       const stream = await chat.sendMessageStream(
-        'test-model',
-        { message: 'test stop' },
-        'prompt-id-fb2',
+        "test-model",
+        { message: "test stop" },
+        "prompt-id-fb2",
       );
 
       await expect(
@@ -1582,14 +1472,12 @@ describe('GeminiChat', () => {
         })(),
       ).rejects.toThrow(error429);
 
-      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(
-        1,
-      );
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledTimes(1);
       expect(mockHandleFallback).toHaveBeenCalledTimes(1);
     });
   });
 
-  it('should discard valid partial content from a failed attempt upon retry', async () => {
+  it("should discard valid partial content from a failed attempt upon retry", async () => {
     // Mock the stream to fail on the first attempt after yielding some valid content.
     vi.mocked(mockContentGenerator.generateContentStream)
       .mockImplementationOnce(async () =>
@@ -1599,13 +1487,13 @@ describe('GeminiChat', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'This valid part should be discarded' }],
+                  parts: [{ text: "This valid part should be discarded" }],
                 },
               },
             ],
           } as unknown as GenerateContentResponse;
           yield {
-            candidates: [{ content: { parts: [{ text: '' }] } }], // Invalid chunk triggers retry
+            candidates: [{ content: { parts: [{ text: "" }] } }], // Invalid chunk triggers retry
           } as unknown as GenerateContentResponse;
         })(),
       )
@@ -1616,9 +1504,9 @@ describe('GeminiChat', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'Successful final response' }],
+                  parts: [{ text: "Successful final response" }],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           } as unknown as GenerateContentResponse;
@@ -1627,9 +1515,9 @@ describe('GeminiChat', () => {
 
     // Send a message and consume the stream
     const stream = await chat.sendMessageStream(
-      'test-model',
-      { message: 'test' },
-      'prompt-id-discard-test',
+      "test-model",
+      { message: "test" },
+      "prompt-id-discard-test",
     );
     const events: StreamEvent[] = [];
     for await (const event of stream) {
@@ -1646,27 +1534,25 @@ describe('GeminiChat', () => {
 
     const modelTurn = history[1]!;
     // The model turn should only contain the text from the successful attempt
-    expect(modelTurn!.parts![0]!.text).toBe('Successful final response');
+    expect(modelTurn!.parts![0]!.text).toBe("Successful final response");
     // It should NOT contain any text from the failed attempt
-    expect(modelTurn!.parts![0]!.text).not.toContain(
-      'This valid part should be discarded',
-    );
+    expect(modelTurn!.parts![0]!.text).not.toContain("This valid part should be discarded");
   });
 
-  describe('stripThoughtsFromHistory', () => {
-    it('should strip thought signatures', () => {
+  describe("stripThoughtsFromHistory", () => {
+    it("should strip thought signatures", () => {
       chat.setHistory([
         {
-          role: 'user',
-          parts: [{ text: 'hello' }],
+          role: "user",
+          parts: [{ text: "hello" }],
         },
         {
-          role: 'model',
+          role: "model",
           parts: [
-            { text: 'thinking...', thoughtSignature: 'thought-123' },
+            { text: "thinking...", thoughtSignature: "thought-123" },
             {
-              functionCall: { name: 'test', args: {} },
-              thoughtSignature: 'thought-456',
+              functionCall: { name: "test", args: {} },
+              thoughtSignature: "thought-456",
             },
           ],
         },
@@ -1676,15 +1562,12 @@ describe('GeminiChat', () => {
 
       expect(chat.getHistory()).toEqual([
         {
-          role: 'user',
-          parts: [{ text: 'hello' }],
+          role: "user",
+          parts: [{ text: "hello" }],
         },
         {
-          role: 'model',
-          parts: [
-            { text: 'thinking...' },
-            { functionCall: { name: 'test', args: {} } },
-          ],
+          role: "model",
+          parts: [{ text: "thinking..." }, { functionCall: { name: "test", args: {} } }],
         },
       ]);
     });
diff --git a/packages/gemini-core/src/core/geminiChat.ts b/packages/gemini-core/src/core/geminiChat.ts
index 86dd4e718..c5a5eab67 100644
--- a/packages/gemini-core/src/core/geminiChat.ts
+++ b/packages/gemini-core/src/core/geminiChat.ts
@@ -8,46 +8,34 @@
 // where function responses are not treated as "valid" responses: https://b.corp.google.com/issues/420354090
 
 import type {
-  GenerateContentResponse,
   Content,
   GenerateContentConfig,
-  SendMessageParameters,
+  GenerateContentResponse,
   Part,
+  SendMessageParameters,
   Tool,
-} from '@google/genai';
-import { toParts } from '../code_assist/converter.js';
-import { createUserContent } from '@google/genai';
-import { retryWithBackoff } from '../utils/retry.js';
-import type { Config } from '../config/config.js';
-import {
-  DEFAULT_GEMINI_FLASH_MODEL,
-  getEffectiveModel,
-} from '../config/models.js';
-import { hasCycleInSchema } from '../tools/tools.js';
-import type { StructuredError } from './turn.js';
-import type { CompletedToolCall } from './coreToolScheduler.js';
-import {
-  logContentRetry,
-  logContentRetryFailure,
-} from '../telemetry/loggers.js';
-import {
-  ChatRecordingService,
-  type ResumedSessionData,
-} from '../services/chatRecordingService.js';
-import {
-  ContentRetryEvent,
-  ContentRetryFailureEvent,
-} from '../telemetry/types.js';
-import { handleFallback } from '../fallback/handler.js';
-import { isFunctionResponse } from '../utils/messageInspectors.js';
-import { partListUnionToString } from './geminiRequest.js';
+} from "@google/genai";
+import { createUserContent } from "@google/genai";
+import { toParts } from "../code_assist/converter.js";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, getEffectiveModel } from "../config/models.js";
+import { handleFallback } from "../fallback/handler.js";
+import { ChatRecordingService, type ResumedSessionData } from "../services/chatRecordingService.js";
+import { logContentRetry, logContentRetryFailure } from "../telemetry/loggers.js";
+import { ContentRetryEvent, ContentRetryFailureEvent } from "../telemetry/types.js";
+import { hasCycleInSchema } from "../tools/tools.js";
+import { isFunctionResponse } from "../utils/messageInspectors.js";
+import { retryWithBackoff } from "../utils/retry.js";
+import type { CompletedToolCall } from "./coreToolScheduler.js";
+import { partListUnionToString } from "./geminiRequest.js";
+import type { StructuredError } from "./turn.js";
 
 export enum StreamEventType {
   /** A regular content chunk from the API. */
-  CHUNK = 'chunk',
+  CHUNK = "chunk",
   /** A signal that a retry is about to happen. The UI should discard any partial
    * content from the attempt that just failed. */
-  RETRY = 'retry',
+  RETRY = "retry",
 }
 
 export type StreamEvent =
@@ -85,7 +73,7 @@ function isValidResponse(response: GenerateContentResponse): boolean {
 
 export function isValidNonThoughtTextPart(part: Part): boolean {
   return (
-    typeof part.text === 'string' &&
+    typeof part.text === "string" &&
     !part.thought &&
     // Technically, the model should never generate parts that have text and
     //  any of these but we don't trust them so check anyways.
@@ -104,7 +92,7 @@ function isValidContent(content: Content): boolean {
     if (part === undefined || Object.keys(part).length === 0) {
       return false;
     }
-    if (!part.thought && part.text !== undefined && part.text === '') {
+    if (!part.thought && part.text !== undefined && part.text === "") {
       return false;
     }
   }
@@ -119,7 +107,7 @@ function isValidContent(content: Content): boolean {
  */
 function validateHistory(history: Content[]) {
   for (const content of history) {
-    if (content.role !== 'user' && content.role !== 'model') {
+    if (content.role !== "user" && content.role !== "model") {
       throw new Error(`Role must be user or model, but got ${content.role}.`);
     }
   }
@@ -141,13 +129,13 @@ function extractCuratedHistory(comprehensiveHistory: Content[]): Content[] {
   const length = comprehensiveHistory.length;
   let i = 0;
   while (i < length) {
-    if (comprehensiveHistory[i].role === 'user') {
+    if (comprehensiveHistory[i].role === "user") {
       curatedHistory.push(comprehensiveHistory[i]);
       i++;
     } else {
       const modelOutput: Content[] = [];
       let isValid = true;
-      while (i < length && comprehensiveHistory[i].role === 'model') {
+      while (i < length && comprehensiveHistory[i].role === "model") {
         modelOutput.push(comprehensiveHistory[i]);
         if (isValid && !isValidContent(comprehensiveHistory[i])) {
           isValid = false;
@@ -167,11 +155,11 @@ function extractCuratedHistory(comprehensiveHistory: Content[]): Content[] {
  * which should trigger a retry.
  */
 export class InvalidStreamError extends Error {
-  readonly type: 'NO_FINISH_REASON' | 'NO_RESPONSE_TEXT';
+  readonly type: "NO_FINISH_REASON" | "NO_RESPONSE_TEXT";
 
-  constructor(message: string, type: 'NO_FINISH_REASON' | 'NO_RESPONSE_TEXT') {
+  constructor(message: string, type: "NO_FINISH_REASON" | "NO_RESPONSE_TEXT") {
     super(message);
-    this.name = 'InvalidStreamError';
+    this.name = "InvalidStreamError";
     this.type = type;
   }
 }
@@ -199,9 +187,7 @@ export class GeminiChat {
     validateHistory(history);
     this.chatRecordingService = new ChatRecordingService(config);
     this.chatRecordingService.initialize(resumedSessionData);
-    this.lastPromptTokenCount = Math.ceil(
-      JSON.stringify(this.history).length / 4,
-    );
+    this.lastPromptTokenCount = Math.ceil(JSON.stringify(this.history).length / 4);
   }
 
   setSystemInstruction(sysInstr: string) {
@@ -248,13 +234,11 @@ export class GeminiChat {
     // Record user input - capture complete message with all parts (text, files, images, etc.)
     // but skip recording function responses (tool call results) as they should be stored in tool call records
     if (!isFunctionResponse(userContent)) {
-      const userMessage = Array.isArray(params.message)
-        ? params.message
-        : [params.message];
+      const userMessage = Array.isArray(params.message) ? params.message : [params.message];
       const userMessageContent = partListUnionToString(toParts(userMessage));
       this.chatRecordingService.recordMessage({
         model,
-        type: 'user',
+        type: "user",
         content: userMessageContent,
       });
     }
@@ -267,13 +251,9 @@ export class GeminiChat {
     const self = this;
     return (async function* () {
       try {
-        let lastError: unknown = new Error('Request failed after all retries.');
+        let lastError: unknown = new Error("Request failed after all retries.");
 
-        for (
-          let attempt = 0;
-          attempt < INVALID_CONTENT_RETRY_OPTIONS.maxAttempts;
-          attempt++
-        ) {
+        for (let attempt = 0; attempt < INVALID_CONTENT_RETRY_OPTIONS.maxAttempts; attempt++) {
           try {
             if (attempt > 0) {
               yield { type: StreamEventType.RETRY };
@@ -318,11 +298,7 @@ export class GeminiChat {
                   ),
                 );
                 await new Promise((res) =>
-                  setTimeout(
-                    res,
-                    INVALID_CONTENT_RETRY_OPTIONS.initialDelayMs *
-                      (attempt + 1),
-                  ),
+                  setTimeout(res, INVALID_CONTENT_RETRY_OPTIONS.initialDelayMs * (attempt + 1)),
                 );
                 continue;
               }
@@ -357,18 +333,10 @@ export class GeminiChat {
     prompt_id: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     const apiCall = () => {
-      const modelToUse = getEffectiveModel(
-        this.config.isInFallbackMode(),
-        model,
-      );
+      const modelToUse = getEffectiveModel(this.config.isInFallbackMode(), model);
 
-      if (
-        this.config.getQuotaErrorOccurred() &&
-        modelToUse === DEFAULT_GEMINI_FLASH_MODEL
-      ) {
-        throw new Error(
-          'Please submit a new query to continue with the Flash model.',
-        );
+      if (this.config.getQuotaErrorOccurred() && modelToUse === DEFAULT_GEMINI_FLASH_MODEL) {
+        throw new Error("Please submit a new query to continue with the Flash model.");
       }
 
       return this.config.getContentGenerator().generateContentStream(
@@ -381,10 +349,8 @@ export class GeminiChat {
       );
     };
 
-    const onPersistent429Callback = async (
-      authType?: string,
-      error?: unknown,
-    ) => await handleFallback(this.config, model, authType, error);
+    const onPersistent429Callback = async (authType?: string, error?: unknown) =>
+      await handleFallback(this.config, model, authType, error);
 
     const streamResponse = await retryWithBackoff(apiCall, {
       onPersistent429: onPersistent429Callback,
@@ -420,9 +386,7 @@ export class GeminiChat {
    * chat session.
    */
   getHistory(curated: boolean = false): Content[] {
-    const history = curated
-      ? extractCuratedHistory(this.history)
-      : this.history;
+    const history = curated ? extractCuratedHistory(this.history) : this.history;
     // Deep copy the history to avoid mutating the history outside of the
     // chat session.
     return structuredClone(history);
@@ -451,7 +415,7 @@ export class GeminiChat {
       const newContent = { ...content };
       if (newContent.parts) {
         newContent.parts = newContent.parts.map((part) => {
-          if (part && typeof part === 'object' && 'thoughtSignature' in part) {
+          if (part && typeof part === "object" && "thoughtSignature" in part) {
             const newPart = { ...part };
             delete (newPart as { thoughtSignature?: string }).thoughtSignature;
             return newPart;
@@ -470,10 +434,7 @@ export class GeminiChat {
   async maybeIncludeSchemaDepthContext(error: StructuredError): Promise<void> {
     // Check for potentially problematic cyclic tools with cyclic schemas
     // and include a recommendation to remove potentially problematic tools.
-    if (
-      isSchemaDepthError(error.message) ||
-      isInvalidArgumentError(error.message)
-    ) {
+    if (isSchemaDepthError(error.message) || isInvalidArgumentError(error.message)) {
       const tools = this.config.getToolRegistry().getAllTools();
       const cyclicSchemaTools: string[] = [];
       for (const tool of tools) {
@@ -505,8 +466,7 @@ export class GeminiChat {
     let hasFinishReason = false;
 
     for await (const chunk of streamResponse) {
-      hasFinishReason =
-        chunk?.candidates?.some((candidate) => candidate.finishReason) ?? false;
+      hasFinishReason = chunk?.candidates?.some((candidate) => candidate.finishReason) ?? false;
       if (isValidResponse(chunk)) {
         const content = chunk.candidates?.[0]?.content;
         if (content?.parts) {
@@ -518,9 +478,7 @@ export class GeminiChat {
             hasToolCall = true;
           }
 
-          modelResponseParts.push(
-            ...content.parts.filter((part) => !part.thought),
-          );
+          modelResponseParts.push(...content.parts.filter((part) => !part.thought));
         }
       }
 
@@ -553,14 +511,14 @@ export class GeminiChat {
     const responseText = consolidatedParts
       .filter((part) => part.text)
       .map((part) => part.text)
-      .join('')
+      .join("")
       .trim();
 
     // Record model response text from the collected parts
     if (responseText) {
       this.chatRecordingService.recordMessage({
         model,
-        type: 'gemini',
+        type: "gemini",
         content: responseText,
       });
     }
@@ -575,18 +533,18 @@ export class GeminiChat {
     if (!hasToolCall && (!hasFinishReason || !responseText)) {
       if (!hasFinishReason) {
         throw new InvalidStreamError(
-          'Model stream ended without a finish reason.',
-          'NO_FINISH_REASON',
+          "Model stream ended without a finish reason.",
+          "NO_FINISH_REASON",
         );
       } else {
         throw new InvalidStreamError(
-          'Model stream ended with empty response text.',
-          'NO_RESPONSE_TEXT',
+          "Model stream ended with empty response text.",
+          "NO_RESPONSE_TEXT",
         );
       }
     }
 
-    this.history.push({ role: 'model', parts: consolidatedParts });
+    this.history.push({ role: "model", parts: consolidatedParts });
   }
 
   getLastPromptTokenCount(): number {
@@ -604,21 +562,17 @@ export class GeminiChat {
    * Records completed tool calls with full metadata.
    * This is called by external components when tool calls complete, before sending responses to Gemini.
    */
-  recordCompletedToolCalls(
-    model: string,
-    toolCalls: CompletedToolCall[],
-  ): void {
+  recordCompletedToolCalls(model: string, toolCalls: CompletedToolCall[]): void {
     const toolCallRecords = toolCalls.map((call) => {
       const resultDisplayRaw = call.response?.resultDisplay;
-      const resultDisplay =
-        typeof resultDisplayRaw === 'string' ? resultDisplayRaw : undefined;
+      const resultDisplay = typeof resultDisplayRaw === "string" ? resultDisplayRaw : undefined;
 
       return {
         id: call.request.callId,
         name: call.request.name,
         args: call.request.args,
         result: call.response?.responseParts || null,
-        status: call.status as 'error' | 'success' | 'cancelled',
+        status: call.status as "error" | "success" | "cancelled",
         timestamp: new Date().toISOString(),
         resultDisplay,
       };
@@ -640,10 +594,8 @@ export class GeminiChat {
       // Extract subject and description using the same logic as turn.ts
       const rawText = thoughtPart.text;
       const subjectStringMatches = rawText.match(/\*\*(.*?)\*\*/s);
-      const subject = subjectStringMatches
-        ? subjectStringMatches[1].trim()
-        : '';
-      const description = rawText.replace(/\*\*(.*?)\*\*/s, '').trim();
+      const subject = subjectStringMatches ? subjectStringMatches[1].trim() : "";
+      const description = rawText.replace(/\*\*(.*?)\*\*/s, "").trim();
 
       this.chatRecordingService.recordThought({
         subject,
@@ -655,9 +607,9 @@ export class GeminiChat {
 
 /** Visible for Testing */
 export function isSchemaDepthError(errorMessage: string): boolean {
-  return errorMessage.includes('maximum schema depth exceeded');
+  return errorMessage.includes("maximum schema depth exceeded");
 }
 
 export function isInvalidArgumentError(errorMessage: string): boolean {
-  return errorMessage.includes('Request contains an invalid argument');
+  return errorMessage.includes("Request contains an invalid argument");
 }
diff --git a/packages/gemini-core/src/core/geminiRequest.ts b/packages/gemini-core/src/core/geminiRequest.ts
index f3c52fbb6..9eccea5cd 100644
--- a/packages/gemini-core/src/core/geminiRequest.ts
+++ b/packages/gemini-core/src/core/geminiRequest.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type PartListUnion } from '@google/genai';
-import { partToString } from '../utils/partUtils.js';
+import { type PartListUnion } from "@google/genai";
+import { partToString } from "../utils/partUtils.js";
 
 /**
  * Represents a request to be sent to the Gemini API.
diff --git a/packages/gemini-core/src/core/logger.test.ts b/packages/gemini-core/src/core/logger.test.ts
index 70697b6f9..53a9999e0 100644
--- a/packages/gemini-core/src/core/logger.test.ts
+++ b/packages/gemini-core/src/core/logger.test.ts
@@ -4,44 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  afterAll,
-} from 'vitest';
-import type { LogEntry } from './logger.js';
-import {
-  Logger,
-  MessageSenderType,
-  encodeTagName,
-  decodeTagName,
-} from './logger.js';
-import { Storage } from '../config/storage.js';
-import { promises as fs, existsSync } from 'node:fs';
-import path from 'node:path';
-import type { Content } from '@google/genai';
-
-import crypto from 'node:crypto';
-import os from 'node:os';
-import { GEMINI_DIR } from '../utils/paths.js';
-
-const TMP_DIR_NAME = 'tmp';
-const LOG_FILE_NAME = 'logs.json';
-const CHECKPOINT_FILE_NAME = 'checkpoint.json';
+import crypto from "node:crypto";
+import { existsSync, promises as fs } from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import type { Content } from "@google/genai";
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Storage } from "../config/storage.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import type { LogEntry } from "./logger.js";
+import { decodeTagName, encodeTagName, Logger, MessageSenderType } from "./logger.js";
+
+const TMP_DIR_NAME = "tmp";
+const LOG_FILE_NAME = "logs.json";
+const CHECKPOINT_FILE_NAME = "checkpoint.json";
 
 const projectDir = process.cwd();
-const hash = crypto.createHash('sha256').update(projectDir).digest('hex');
+const hash = crypto.createHash("sha256").update(projectDir).digest("hex");
 const TEST_GEMINI_DIR = path.join(os.homedir(), GEMINI_DIR, TMP_DIR_NAME, hash);
 
 const TEST_LOG_FILE_PATH = path.join(TEST_GEMINI_DIR, LOG_FILE_NAME);
-const TEST_CHECKPOINT_FILE_PATH = path.join(
-  TEST_GEMINI_DIR,
-  CHECKPOINT_FILE_NAME,
-);
+const TEST_CHECKPOINT_FILE_PATH = path.join(TEST_GEMINI_DIR, CHECKPOINT_FILE_NAME);
 
 async function cleanupLogAndCheckpointFiles() {
   try {
@@ -53,28 +36,28 @@ async function cleanupLogAndCheckpointFiles() {
 
 async function readLogFile(): Promise<LogEntry[]> {
   try {
-    const content = await fs.readFile(TEST_LOG_FILE_PATH, 'utf-8');
+    const content = await fs.readFile(TEST_LOG_FILE_PATH, "utf-8");
     return JSON.parse(content) as LogEntry[];
   } catch (error) {
-    if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+    if ((error as NodeJS.ErrnoException).code === "ENOENT") {
       return [];
     }
     throw error;
   }
 }
 
-vi.mock('../utils/session.js', () => ({
-  sessionId: 'test-session-id',
+vi.mock("../utils/session.js", () => ({
+  sessionId: "test-session-id",
 }));
 
-describe('Logger', () => {
+describe("Logger", () => {
   let logger: Logger;
-  const testSessionId = 'test-session-id';
+  const testSessionId = "test-session-id";
 
   beforeEach(async () => {
     vi.resetAllMocks();
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-01-01T12:00:00.000Z'));
+    vi.setSystemTime(new Date("2025-01-01T12:00:00.000Z"));
     // Clean up before the test
     await cleanupLogAndCheckpointFiles();
     // Ensure the directory exists for the test
@@ -98,8 +81,8 @@ describe('Logger', () => {
     await cleanupLogAndCheckpointFiles();
   });
 
-  describe('initialize', () => {
-    it('should create .gemini directory and an empty log file if none exist', async () => {
+  describe("initialize", () => {
+    it("should create .gemini directory and an empty log file if none exist", async () => {
       const dirExists = await fs
         .access(TEST_GEMINI_DIR)
         .then(() => true)
@@ -116,90 +99,79 @@ describe('Logger', () => {
       expect(logContent).toEqual([]);
     });
 
-    it('should load existing logs and set correct messageId for the current session', async () => {
-      const currentSessionId = 'session-123';
-      const anotherSessionId = 'session-456';
+    it("should load existing logs and set correct messageId for the current session", async () => {
+      const currentSessionId = "session-123";
+      const anotherSessionId = "session-456";
       const existingLogs: LogEntry[] = [
         {
           sessionId: currentSessionId,
           messageId: 0,
-          timestamp: new Date('2025-01-01T10:00:05.000Z').toISOString(),
+          timestamp: new Date("2025-01-01T10:00:05.000Z").toISOString(),
           type: MessageSenderType.USER,
-          message: 'Msg1',
+          message: "Msg1",
         },
         {
           sessionId: anotherSessionId,
           messageId: 5,
-          timestamp: new Date('2025-01-01T09:00:00.000Z').toISOString(),
+          timestamp: new Date("2025-01-01T09:00:00.000Z").toISOString(),
           type: MessageSenderType.USER,
-          message: 'OldMsg',
+          message: "OldMsg",
         },
         {
           sessionId: currentSessionId,
           messageId: 1,
-          timestamp: new Date('2025-01-01T10:00:10.000Z').toISOString(),
+          timestamp: new Date("2025-01-01T10:00:10.000Z").toISOString(),
           type: MessageSenderType.USER,
-          message: 'Msg2',
+          message: "Msg2",
         },
       ];
-      await fs.writeFile(
-        TEST_LOG_FILE_PATH,
-        JSON.stringify(existingLogs, null, 2),
-      );
-      const newLogger = new Logger(
-        currentSessionId,
-        new Storage(process.cwd()),
-      );
+      await fs.writeFile(TEST_LOG_FILE_PATH, JSON.stringify(existingLogs, null, 2));
+      const newLogger = new Logger(currentSessionId, new Storage(process.cwd()));
       await newLogger.initialize();
-      expect(newLogger['messageId']).toBe(2);
-      expect(newLogger['logs']).toEqual(existingLogs);
+      expect(newLogger["messageId"]).toBe(2);
+      expect(newLogger["logs"]).toEqual(existingLogs);
       newLogger.close();
     });
 
-    it('should set messageId to 0 for a new session if log file exists but has no logs for current session', async () => {
+    it("should set messageId to 0 for a new session if log file exists but has no logs for current session", async () => {
       const existingLogs: LogEntry[] = [
         {
-          sessionId: 'some-other-session',
+          sessionId: "some-other-session",
           messageId: 5,
           timestamp: new Date().toISOString(),
           type: MessageSenderType.USER,
-          message: 'OldMsg',
+          message: "OldMsg",
         },
       ];
-      await fs.writeFile(
-        TEST_LOG_FILE_PATH,
-        JSON.stringify(existingLogs, null, 2),
-      );
-      const newLogger = new Logger('a-new-session', new Storage(process.cwd()));
+      await fs.writeFile(TEST_LOG_FILE_PATH, JSON.stringify(existingLogs, null, 2));
+      const newLogger = new Logger("a-new-session", new Storage(process.cwd()));
       await newLogger.initialize();
-      expect(newLogger['messageId']).toBe(0);
+      expect(newLogger["messageId"]).toBe(0);
       newLogger.close();
     });
 
-    it('should be idempotent', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'test message');
-      const initialMessageId = logger['messageId'];
-      const initialLogCount = logger['logs'].length;
+    it("should be idempotent", async () => {
+      await logger.logMessage(MessageSenderType.USER, "test message");
+      const initialMessageId = logger["messageId"];
+      const initialLogCount = logger["logs"].length;
 
       await logger.initialize(); // Second call should not change state
 
-      expect(logger['messageId']).toBe(initialMessageId);
-      expect(logger['logs'].length).toBe(initialLogCount);
+      expect(logger["messageId"]).toBe(initialMessageId);
+      expect(logger["logs"].length).toBe(initialLogCount);
       const logsFromFile = await readLogFile();
       expect(logsFromFile.length).toBe(1);
     });
 
-    it('should handle invalid JSON in log file by backing it up and starting fresh', async () => {
-      await fs.writeFile(TEST_LOG_FILE_PATH, 'invalid json');
-      const consoleDebugSpy = vi
-        .spyOn(console, 'debug')
-        .mockImplementation(() => {});
+    it("should handle invalid JSON in log file by backing it up and starting fresh", async () => {
+      await fs.writeFile(TEST_LOG_FILE_PATH, "invalid json");
+      const consoleDebugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
 
       const newLogger = new Logger(testSessionId, new Storage(process.cwd()));
       await newLogger.initialize();
 
       expect(consoleDebugSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Invalid JSON in log file'),
+        expect.stringContaining("Invalid JSON in log file"),
         expect.any(SyntaxError),
       );
       const logContent = await readLogFile();
@@ -207,21 +179,15 @@ describe('Logger', () => {
       const dirContents = await fs.readdir(TEST_GEMINI_DIR);
       expect(
         dirContents.some(
-          (f) =>
-            f.startsWith(LOG_FILE_NAME + '.invalid_json') && f.endsWith('.bak'),
+          (f) => f.startsWith(LOG_FILE_NAME + ".invalid_json") && f.endsWith(".bak"),
         ),
       ).toBe(true);
       newLogger.close();
     });
 
-    it('should handle non-array JSON in log file by backing it up and starting fresh', async () => {
-      await fs.writeFile(
-        TEST_LOG_FILE_PATH,
-        JSON.stringify({ not: 'an array' }),
-      );
-      const consoleDebugSpy = vi
-        .spyOn(console, 'debug')
-        .mockImplementation(() => {});
+    it("should handle non-array JSON in log file by backing it up and starting fresh", async () => {
+      await fs.writeFile(TEST_LOG_FILE_PATH, JSON.stringify({ not: "an array" }));
+      const consoleDebugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
 
       const newLogger = new Logger(testSessionId, new Storage(process.cwd()));
       await newLogger.initialize();
@@ -234,172 +200,143 @@ describe('Logger', () => {
       const dirContents = await fs.readdir(TEST_GEMINI_DIR);
       expect(
         dirContents.some(
-          (f) =>
-            f.startsWith(LOG_FILE_NAME + '.malformed_array') &&
-            f.endsWith('.bak'),
+          (f) => f.startsWith(LOG_FILE_NAME + ".malformed_array") && f.endsWith(".bak"),
         ),
       ).toBe(true);
       newLogger.close();
     });
   });
 
-  describe('logMessage', () => {
-    it('should append a message to the log file and update in-memory logs', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'Hello, world!');
+  describe("logMessage", () => {
+    it("should append a message to the log file and update in-memory logs", async () => {
+      await logger.logMessage(MessageSenderType.USER, "Hello, world!");
       const logsFromFile = await readLogFile();
       expect(logsFromFile.length).toBe(1);
       expect(logsFromFile[0]).toMatchObject({
         sessionId: testSessionId,
         messageId: 0,
         type: MessageSenderType.USER,
-        message: 'Hello, world!',
-        timestamp: new Date('2025-01-01T12:00:00.000Z').toISOString(),
+        message: "Hello, world!",
+        timestamp: new Date("2025-01-01T12:00:00.000Z").toISOString(),
       });
-      expect(logger['logs'].length).toBe(1);
-      expect(logger['logs'][0]).toEqual(logsFromFile[0]);
-      expect(logger['messageId']).toBe(1);
+      expect(logger["logs"].length).toBe(1);
+      expect(logger["logs"][0]).toEqual(logsFromFile[0]);
+      expect(logger["messageId"]).toBe(1);
     });
 
-    it('should correctly increment messageId for subsequent messages in the same session', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'First');
+    it("should correctly increment messageId for subsequent messages in the same session", async () => {
+      await logger.logMessage(MessageSenderType.USER, "First");
       vi.advanceTimersByTime(1000);
-      await logger.logMessage(MessageSenderType.USER, 'Second');
+      await logger.logMessage(MessageSenderType.USER, "Second");
       const logs = await readLogFile();
       expect(logs.length).toBe(2);
       expect(logs[0].messageId).toBe(0);
       expect(logs[1].messageId).toBe(1);
       expect(logs[1].timestamp).not.toBe(logs[0].timestamp);
-      expect(logger['messageId']).toBe(2);
+      expect(logger["messageId"]).toBe(2);
     });
 
-    it('should handle logger not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should handle logger not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close(); // Ensure it's treated as uninitialized
-      const consoleDebugSpy = vi
-        .spyOn(console, 'debug')
-        .mockImplementation(() => {});
-      await uninitializedLogger.logMessage(MessageSenderType.USER, 'test');
+      const consoleDebugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
+      await uninitializedLogger.logMessage(MessageSenderType.USER, "test");
       expect(consoleDebugSpy).toHaveBeenCalledWith(
-        'Logger not initialized or session ID missing. Cannot log message.',
+        "Logger not initialized or session ID missing. Cannot log message.",
       );
       expect((await readLogFile()).length).toBe(0);
       uninitializedLogger.close();
     });
 
-    it('should simulate concurrent writes from different logger instances to the same file', async () => {
-      const concurrentSessionId = 'concurrent-session';
-      const logger1 = new Logger(
-        concurrentSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should simulate concurrent writes from different logger instances to the same file", async () => {
+      const concurrentSessionId = "concurrent-session";
+      const logger1 = new Logger(concurrentSessionId, new Storage(process.cwd()));
       await logger1.initialize();
 
-      const logger2 = new Logger(
-        concurrentSessionId,
-        new Storage(process.cwd()),
-      );
+      const logger2 = new Logger(concurrentSessionId, new Storage(process.cwd()));
       await logger2.initialize();
-      expect(logger2['sessionId']).toEqual(logger1['sessionId']);
+      expect(logger2["sessionId"]).toEqual(logger1["sessionId"]);
 
-      await logger1.logMessage(MessageSenderType.USER, 'L1M1');
+      await logger1.logMessage(MessageSenderType.USER, "L1M1");
       vi.advanceTimersByTime(10);
-      await logger2.logMessage(MessageSenderType.USER, 'L2M1');
+      await logger2.logMessage(MessageSenderType.USER, "L2M1");
       vi.advanceTimersByTime(10);
-      await logger1.logMessage(MessageSenderType.USER, 'L1M2');
+      await logger1.logMessage(MessageSenderType.USER, "L1M2");
       vi.advanceTimersByTime(10);
-      await logger2.logMessage(MessageSenderType.USER, 'L2M2');
+      await logger2.logMessage(MessageSenderType.USER, "L2M2");
 
       const logsFromFile = await readLogFile();
       expect(logsFromFile.length).toBe(4);
-      const messageIdsInFile = logsFromFile
-        .map((log) => log.messageId)
-        .sort((a, b) => a - b);
+      const messageIdsInFile = logsFromFile.map((log) => log.messageId).sort((a, b) => a - b);
       expect(messageIdsInFile).toEqual([0, 1, 2, 3]);
 
       const messagesInFile = logsFromFile
         .sort((a, b) => a.messageId - b.messageId)
         .map((l) => l.message);
-      expect(messagesInFile).toEqual(['L1M1', 'L2M1', 'L1M2', 'L2M2']);
+      expect(messagesInFile).toEqual(["L1M1", "L2M1", "L1M2", "L2M2"]);
 
       // Check internal state (next messageId each logger would use for that session)
-      expect(logger1['messageId']).toBe(3);
-      expect(logger2['messageId']).toBe(4);
+      expect(logger1["messageId"]).toBe(3);
+      expect(logger2["messageId"]).toBe(4);
 
       logger1.close();
       logger2.close();
     });
 
-    it('should not throw, not increment messageId, and log error if writing to file fails', async () => {
-      vi.spyOn(fs, 'writeFile').mockRejectedValueOnce(new Error('Disk full'));
-      const consoleDebugSpy = vi
-        .spyOn(console, 'debug')
-        .mockImplementation(() => {});
-      const initialMessageId = logger['messageId'];
-      const initialLogCount = logger['logs'].length;
+    it("should not throw, not increment messageId, and log error if writing to file fails", async () => {
+      vi.spyOn(fs, "writeFile").mockRejectedValueOnce(new Error("Disk full"));
+      const consoleDebugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
+      const initialMessageId = logger["messageId"];
+      const initialLogCount = logger["logs"].length;
 
-      await logger.logMessage(MessageSenderType.USER, 'test fail write');
+      await logger.logMessage(MessageSenderType.USER, "test fail write");
 
-      expect(consoleDebugSpy).toHaveBeenCalledWith(
-        'Error writing to log file:',
-        expect.any(Error),
-      );
-      expect(logger['messageId']).toBe(initialMessageId); // Not incremented
-      expect(logger['logs'].length).toBe(initialLogCount); // Log not added to in-memory cache
+      expect(consoleDebugSpy).toHaveBeenCalledWith("Error writing to log file:", expect.any(Error));
+      expect(logger["messageId"]).toBe(initialMessageId); // Not incremented
+      expect(logger["logs"].length).toBe(initialLogCount); // Log not added to in-memory cache
     });
   });
 
-  describe('getPreviousUserMessages', () => {
-    it('should retrieve all user messages from logs, sorted newest first', async () => {
-      const loggerSort = new Logger('session-1', new Storage(process.cwd()));
+  describe("getPreviousUserMessages", () => {
+    it("should retrieve all user messages from logs, sorted newest first", async () => {
+      const loggerSort = new Logger("session-1", new Storage(process.cwd()));
       await loggerSort.initialize();
-      await loggerSort.logMessage(MessageSenderType.USER, 'S1M0_ts100000');
+      await loggerSort.logMessage(MessageSenderType.USER, "S1M0_ts100000");
       vi.advanceTimersByTime(1000);
-      await loggerSort.logMessage(MessageSenderType.USER, 'S1M1_ts101000');
+      await loggerSort.logMessage(MessageSenderType.USER, "S1M1_ts101000");
       vi.advanceTimersByTime(1000);
       // Switch to a different session to log
-      const loggerSort2 = new Logger('session-2', new Storage(process.cwd()));
+      const loggerSort2 = new Logger("session-2", new Storage(process.cwd()));
       await loggerSort2.initialize();
-      await loggerSort2.logMessage(MessageSenderType.USER, 'S2M0_ts102000');
+      await loggerSort2.logMessage(MessageSenderType.USER, "S2M0_ts102000");
       vi.advanceTimersByTime(1000);
-      await loggerSort2.logMessage(
-        'model' as MessageSenderType,
-        'S2_Model_ts103000',
-      );
+      await loggerSort2.logMessage("model" as MessageSenderType, "S2_Model_ts103000");
       vi.advanceTimersByTime(1000);
-      await loggerSort2.logMessage(MessageSenderType.USER, 'S2M1_ts104000');
+      await loggerSort2.logMessage(MessageSenderType.USER, "S2M1_ts104000");
       loggerSort.close();
       loggerSort2.close();
 
-      const finalLogger = new Logger(
-        'final-session',
-        new Storage(process.cwd()),
-      );
+      const finalLogger = new Logger("final-session", new Storage(process.cwd()));
       await finalLogger.initialize();
 
       const messages = await finalLogger.getPreviousUserMessages();
       expect(messages).toEqual([
-        'S2M1_ts104000',
-        'S2M0_ts102000',
-        'S1M1_ts101000',
-        'S1M0_ts100000',
+        "S2M1_ts104000",
+        "S2M0_ts102000",
+        "S1M1_ts101000",
+        "S1M0_ts100000",
       ]);
       finalLogger.close();
     });
 
-    it('should return empty array if no user messages exist', async () => {
-      await logger.logMessage('system' as MessageSenderType, 'System boot');
+    it("should return empty array if no user messages exist", async () => {
+      await logger.logMessage("system" as MessageSenderType, "System boot");
       const messages = await logger.getPreviousUserMessages();
       expect(messages).toEqual([]);
     });
 
-    it('should return empty array if logger not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should return empty array if logger not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
       const messages = await uninitializedLogger.getPreviousUserMessages();
       expect(messages).toEqual([]);
@@ -407,103 +344,81 @@ describe('Logger', () => {
     });
   });
 
-  describe('saveCheckpoint', () => {
+  describe("saveCheckpoint", () => {
     const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
+      { role: "model", parts: [{ text: "Hi there" }] },
     ];
 
     it.each([
       {
-        tag: 'test-tag',
-        encodedTag: 'test-tag',
+        tag: "test-tag",
+        encodedTag: "test-tag",
       },
       {
-        tag: '你好世界',
-        encodedTag: '%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C',
+        tag: "你好世界",
+        encodedTag: "%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C",
       },
       {
-        tag: 'japanese-ひらがなひらがな形声',
+        tag: "japanese-ひらがなひらがな形声",
         encodedTag:
-          'japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0',
+          "japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0",
       },
       {
-        tag: '../../secret',
-        encodedTag: '..%2F..%2Fsecret',
+        tag: "../../secret",
+        encodedTag: "..%2F..%2Fsecret",
       },
-    ])('should save a checkpoint', async ({ tag, encodedTag }) => {
+    ])("should save a checkpoint", async ({ tag, encodedTag }) => {
       await logger.saveCheckpoint(conversation, tag);
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
-      const fileContent = await fs.readFile(taggedFilePath, 'utf-8');
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
+      const fileContent = await fs.readFile(taggedFilePath, "utf-8");
       expect(JSON.parse(fileContent)).toEqual(conversation);
     });
 
-    it('should not throw if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should not throw if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
-      await expect(
-        uninitializedLogger.saveCheckpoint(conversation, 'tag'),
-      ).resolves.not.toThrow();
+      await expect(uninitializedLogger.saveCheckpoint(conversation, "tag")).resolves.not.toThrow();
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.",
       );
     });
   });
 
-  describe('loadCheckpoint', () => {
+  describe("loadCheckpoint", () => {
     const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
+      { role: "model", parts: [{ text: "Hi there" }] },
     ];
 
     beforeEach(async () => {
-      await fs.writeFile(
-        TEST_CHECKPOINT_FILE_PATH,
-        JSON.stringify(conversation, null, 2),
-      );
+      await fs.writeFile(TEST_CHECKPOINT_FILE_PATH, JSON.stringify(conversation, null, 2));
     });
 
     it.each([
       {
-        tag: 'test-tag',
-        encodedTag: 'test-tag',
+        tag: "test-tag",
+        encodedTag: "test-tag",
       },
       {
-        tag: '你好世界',
-        encodedTag: '%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C',
+        tag: "你好世界",
+        encodedTag: "%E4%BD%A0%E5%A5%BD%E4%B8%96%E7%95%8C",
       },
       {
-        tag: 'japanese-ひらがなひらがな形声',
+        tag: "japanese-ひらがなひらがな形声",
         encodedTag:
-          'japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0',
+          "japanese-%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E3%81%B2%E3%82%89%E3%81%8C%E3%81%AA%E5%BD%A2%E5%A3%B0",
       },
       {
-        tag: '../../secret',
-        encodedTag: '..%2F..%2Fsecret',
+        tag: "../../secret",
+        encodedTag: "..%2F..%2Fsecret",
       },
-    ])('should load from a checkpoint', async ({ tag, encodedTag }) => {
-      const taggedConversation = [
-        ...conversation,
-        { role: 'user', parts: [{ text: 'hello' }] },
-      ];
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
-      await fs.writeFile(
-        taggedFilePath,
-        JSON.stringify(taggedConversation, null, 2),
-      );
+    ])("should load from a checkpoint", async ({ tag, encodedTag }) => {
+      const taggedConversation = [...conversation, { role: "user", parts: [{ text: "hello" }] }];
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
+      await fs.writeFile(taggedFilePath, JSON.stringify(taggedConversation, null, 2));
 
       const loaded = await logger.loadCheckpoint(tag);
       expect(loaded).toEqual(taggedConversation);
@@ -511,71 +426,56 @@ describe('Logger', () => {
       expect(decodeTagName(encodedTag)).toBe(tag);
     });
 
-    it('should return an empty array if a tagged checkpoint file does not exist', async () => {
-      const loaded = await logger.loadCheckpoint('nonexistent-tag');
+    it("should return an empty array if a tagged checkpoint file does not exist", async () => {
+      const loaded = await logger.loadCheckpoint("nonexistent-tag");
       expect(loaded).toEqual([]);
     });
 
-    it('should return an empty array if the checkpoint file does not exist', async () => {
+    it("should return an empty array if the checkpoint file does not exist", async () => {
       await fs.unlink(TEST_CHECKPOINT_FILE_PATH); // Ensure it's gone
-      const loaded = await logger.loadCheckpoint('missing');
+      const loaded = await logger.loadCheckpoint("missing");
       expect(loaded).toEqual([]);
     });
 
-    it('should return an empty array if the file contains invalid JSON', async () => {
-      const tag = 'invalid-json-tag';
-      const encodedTag = 'invalid-json-tag';
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
-      await fs.writeFile(taggedFilePath, 'invalid json');
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it("should return an empty array if the file contains invalid JSON", async () => {
+      const tag = "invalid-json-tag";
+      const encodedTag = "invalid-json-tag";
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
+      await fs.writeFile(taggedFilePath, "invalid json");
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
       const loadedCheckpoint = await logger.loadCheckpoint(tag);
       expect(loadedCheckpoint).toEqual([]);
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Failed to read or parse checkpoint file'),
+        expect.stringContaining("Failed to read or parse checkpoint file"),
         expect.any(Error),
       );
     });
 
-    it('should return an empty array if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should return an empty array if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
-      const loadedCheckpoint = await uninitializedLogger.loadCheckpoint('tag');
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+      const loadedCheckpoint = await uninitializedLogger.loadCheckpoint("tag");
       expect(loadedCheckpoint).toEqual([]);
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Logger not initialized or checkpoint file path not set. Cannot load checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot load checkpoint.",
       );
     });
   });
 
-  describe('deleteCheckpoint', () => {
-    const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Content to be deleted' }] },
-    ];
-    const tag = 'delete-me';
-    const encodedTag = 'delete-me';
+  describe("deleteCheckpoint", () => {
+    const conversation: Content[] = [{ role: "user", parts: [{ text: "Content to be deleted" }] }];
+    const tag = "delete-me";
+    const encodedTag = "delete-me";
     let taggedFilePath: string;
 
     beforeEach(async () => {
-      taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
+      taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
       // Create a file to be deleted
       await fs.writeFile(taggedFilePath, JSON.stringify(conversation));
     });
 
-    it('should delete the specified checkpoint file and return true', async () => {
+    it("should delete the specified checkpoint file and return true", async () => {
       const result = await logger.deleteCheckpoint(tag);
       expect(result).toBe(true);
 
@@ -583,17 +483,14 @@ describe('Logger', () => {
       await expect(fs.access(taggedFilePath)).rejects.toThrow(/ENOENT/);
     });
 
-    it('should delete both new and old checkpoint files if they exist', async () => {
-      const oldTag = 'delete-me(old)';
-      const oldStylePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${oldTag}.json`,
-      );
-      const newStylePath = logger['_checkpointPath'](oldTag);
+    it("should delete both new and old checkpoint files if they exist", async () => {
+      const oldTag = "delete-me(old)";
+      const oldStylePath = path.join(TEST_GEMINI_DIR, `checkpoint-${oldTag}.json`);
+      const newStylePath = logger["_checkpointPath"](oldTag);
 
       // Create both files
-      await fs.writeFile(oldStylePath, '{}');
-      await fs.writeFile(newStylePath, '{}');
+      await fs.writeFile(oldStylePath, "{}");
+      await fs.writeFile(newStylePath, "{}");
 
       // Verify both files exist before deletion
       expect(existsSync(oldStylePath)).toBe(true);
@@ -607,97 +504,78 @@ describe('Logger', () => {
       expect(existsSync(newStylePath)).toBe(false);
     });
 
-    it('should return false if the checkpoint file does not exist', async () => {
-      const result = await logger.deleteCheckpoint('non-existent-tag');
+    it("should return false if the checkpoint file does not exist", async () => {
+      const result = await logger.deleteCheckpoint("non-existent-tag");
       expect(result).toBe(false);
     });
 
-    it('should re-throw an error if file deletion fails for reasons other than not existing', async () => {
+    it("should re-throw an error if file deletion fails for reasons other than not existing", async () => {
       // Simulate a different error (e.g., permission denied)
-      vi.spyOn(fs, 'unlink').mockRejectedValueOnce(
-        Object.assign(new Error('EACCES: permission denied'), {
-          code: 'EACCES',
+      vi.spyOn(fs, "unlink").mockRejectedValueOnce(
+        Object.assign(new Error("EACCES: permission denied"), {
+          code: "EACCES",
         }),
       );
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
-      await expect(logger.deleteCheckpoint(tag)).rejects.toThrow(
-        'EACCES: permission denied',
-      );
+      await expect(logger.deleteCheckpoint(tag)).rejects.toThrow("EACCES: permission denied");
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         `Failed to delete checkpoint file ${taggedFilePath}:`,
         expect.any(Error),
       );
     });
 
-    it('should return false if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should return false if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       const result = await uninitializedLogger.deleteCheckpoint(tag);
       expect(result).toBe(false);
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.",
       );
     });
   });
 
-  describe('checkpointExists', () => {
-    const tag = 'exists-test';
-    const encodedTag = 'exists-test';
+  describe("checkpointExists", () => {
+    const tag = "exists-test";
+    const encodedTag = "exists-test";
     let taggedFilePath: string;
 
     beforeEach(() => {
-      taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${encodedTag}.json`,
-      );
+      taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${encodedTag}.json`);
     });
 
-    it('should return true if the checkpoint file exists', async () => {
-      await fs.writeFile(taggedFilePath, '{}');
+    it("should return true if the checkpoint file exists", async () => {
+      await fs.writeFile(taggedFilePath, "{}");
       const exists = await logger.checkpointExists(tag);
       expect(exists).toBe(true);
     });
 
-    it('should return false if the checkpoint file does not exist', async () => {
-      const exists = await logger.checkpointExists('non-existent-tag');
+    it("should return false if the checkpoint file does not exist", async () => {
+      const exists = await logger.checkpointExists("non-existent-tag");
       expect(exists).toBe(false);
     });
 
-    it('should throw an error if logger is not initialized', async () => {
-      const uninitializedLogger = new Logger(
-        testSessionId,
-        new Storage(process.cwd()),
-      );
+    it("should throw an error if logger is not initialized", async () => {
+      const uninitializedLogger = new Logger(testSessionId, new Storage(process.cwd()));
       uninitializedLogger.close();
 
       await expect(uninitializedLogger.checkpointExists(tag)).rejects.toThrow(
-        'Logger not initialized. Cannot check for checkpoint existence.',
+        "Logger not initialized. Cannot check for checkpoint existence.",
       );
     });
 
-    it('should re-throw an error if fs.access fails for reasons other than not existing', async () => {
-      vi.spyOn(fs, 'access').mockRejectedValueOnce(
-        Object.assign(new Error('EACCES: permission denied'), {
-          code: 'EACCES',
+    it("should re-throw an error if fs.access fails for reasons other than not existing", async () => {
+      vi.spyOn(fs, "access").mockRejectedValueOnce(
+        Object.assign(new Error("EACCES: permission denied"), {
+          code: "EACCES",
         }),
       );
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
-      await expect(logger.checkpointExists(tag)).rejects.toThrow(
-        'EACCES: permission denied',
-      );
+      await expect(logger.checkpointExists(tag)).rejects.toThrow("EACCES: permission denied");
       expect(consoleErrorSpy).toHaveBeenCalledWith(
         `Failed to check checkpoint existence for path for tag "${tag}":`,
         expect.any(Error),
@@ -705,49 +583,38 @@ describe('Logger', () => {
     });
   });
 
-  describe('Backward compatibility', () => {
+  describe("Backward compatibility", () => {
     const conversation: Content[] = [
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
+      { role: "model", parts: [{ text: "Hi there" }] },
     ];
-    it('should load from a checkpoint with a raw special character tag', async () => {
-      const taggedConversation = [
-        ...conversation,
-        { role: 'user', parts: [{ text: 'hello' }] },
-      ];
-      const tag = 'special(char)';
-      const taggedFilePath = path.join(
-        TEST_GEMINI_DIR,
-        `checkpoint-${tag}.json`,
-      );
-      await fs.writeFile(
-        taggedFilePath,
-        JSON.stringify(taggedConversation, null, 2),
-      );
+    it("should load from a checkpoint with a raw special character tag", async () => {
+      const taggedConversation = [...conversation, { role: "user", parts: [{ text: "hello" }] }];
+      const tag = "special(char)";
+      const taggedFilePath = path.join(TEST_GEMINI_DIR, `checkpoint-${tag}.json`);
+      await fs.writeFile(taggedFilePath, JSON.stringify(taggedConversation, null, 2));
 
       const loaded = await logger.loadCheckpoint(tag);
       expect(loaded).toEqual(taggedConversation);
     });
   });
 
-  describe('close', () => {
-    it('should reset logger state', async () => {
-      await logger.logMessage(MessageSenderType.USER, 'A message');
+  describe("close", () => {
+    it("should reset logger state", async () => {
+      await logger.logMessage(MessageSenderType.USER, "A message");
       logger.close();
-      const consoleDebugSpy = vi
-        .spyOn(console, 'debug')
-        .mockImplementation(() => {});
-      await logger.logMessage(MessageSenderType.USER, 'Another message');
+      const consoleDebugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
+      await logger.logMessage(MessageSenderType.USER, "Another message");
       expect(consoleDebugSpy).toHaveBeenCalledWith(
-        'Logger not initialized or session ID missing. Cannot log message.',
+        "Logger not initialized or session ID missing. Cannot log message.",
       );
       const messages = await logger.getPreviousUserMessages();
       expect(messages).toEqual([]);
-      expect(logger['initialized']).toBe(false);
-      expect(logger['logFilePath']).toBeUndefined();
-      expect(logger['logs']).toEqual([]);
-      expect(logger['sessionId']).toBeUndefined();
-      expect(logger['messageId']).toBe(0);
+      expect(logger["initialized"]).toBe(false);
+      expect(logger["logFilePath"]).toBeUndefined();
+      expect(logger["logs"]).toEqual([]);
+      expect(logger["sessionId"]).toBeUndefined();
+      expect(logger["messageId"]).toBe(0);
     });
   });
 });
diff --git a/packages/gemini-core/src/core/logger.ts b/packages/gemini-core/src/core/logger.ts
index ce7812b6d..307a44793 100644
--- a/packages/gemini-core/src/core/logger.ts
+++ b/packages/gemini-core/src/core/logger.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { promises as fs } from 'node:fs';
-import type { Content } from '@google/genai';
-import type { Storage } from '../config/storage.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { coreEvents } from '../utils/events.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import type { Content } from "@google/genai";
+import type { Storage } from "../config/storage.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { coreEvents } from "../utils/events.js";
 
-const LOG_FILE_NAME = 'logs.json';
+const LOG_FILE_NAME = "logs.json";
 
 export enum MessageSenderType {
-  USER = 'user',
+  USER = "user",
 }
 
 export interface LogEntry {
@@ -55,9 +55,7 @@ export function decodeTagName(str: string): string {
     return decodeURIComponent(str);
   } catch (_e) {
     // Fallback for old, potentially malformed encoding
-    return str.replace(/%([0-9A-F]{2})/g, (_, hex) =>
-      String.fromCharCode(parseInt(hex, 16)),
-    );
+    return str.replace(/%([0-9A-F]{2})/g, (_, hex) => String.fromCharCode(parseInt(hex, 16)));
   }
 }
 
@@ -78,29 +76,29 @@ export class Logger {
 
   private async _readLogFile(): Promise<LogEntry[]> {
     if (!this.logFilePath) {
-      throw new Error('Log file path not set during read attempt.');
+      throw new Error("Log file path not set during read attempt.");
     }
     try {
-      const fileContent = await fs.readFile(this.logFilePath, 'utf-8');
+      const fileContent = await fs.readFile(this.logFilePath, "utf-8");
       const parsedLogs = JSON.parse(fileContent);
       if (!Array.isArray(parsedLogs)) {
         debugLogger.debug(
           `Log file at ${this.logFilePath} is not a valid JSON array. Starting with empty logs.`,
         );
-        await this._backupCorruptedLogFile('malformed_array');
+        await this._backupCorruptedLogFile("malformed_array");
         return [];
       }
       return parsedLogs.filter(
         (entry) =>
-          typeof entry.sessionId === 'string' &&
-          typeof entry.messageId === 'number' &&
-          typeof entry.timestamp === 'string' &&
-          typeof entry.type === 'string' &&
-          typeof entry.message === 'string',
+          typeof entry.sessionId === "string" &&
+          typeof entry.messageId === "number" &&
+          typeof entry.timestamp === "string" &&
+          typeof entry.type === "string" &&
+          typeof entry.message === "string",
       ) as LogEntry[];
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         return [];
       }
       if (error instanceof SyntaxError) {
@@ -108,13 +106,10 @@ export class Logger {
           `Invalid JSON in log file ${this.logFilePath}. Backing up and starting fresh.`,
           error,
         );
-        await this._backupCorruptedLogFile('invalid_json');
+        await this._backupCorruptedLogFile("invalid_json");
         return [];
       }
-      debugLogger.debug(
-        `Failed to read or parse log file ${this.logFilePath}:`,
-        error,
-      );
+      debugLogger.debug(`Failed to read or parse log file ${this.logFilePath}:`, error);
       throw error;
     }
   }
@@ -148,38 +143,29 @@ export class Logger {
       }
       this.logs = await this._readLogFile();
       if (!fileExisted && this.logs.length === 0) {
-        await fs.writeFile(this.logFilePath, '[]', 'utf-8');
+        await fs.writeFile(this.logFilePath, "[]", "utf-8");
       }
-      const sessionLogs = this.logs.filter(
-        (entry) => entry.sessionId === this.sessionId,
-      );
+      const sessionLogs = this.logs.filter((entry) => entry.sessionId === this.sessionId);
       this.messageId =
-        sessionLogs.length > 0
-          ? Math.max(...sessionLogs.map((entry) => entry.messageId)) + 1
-          : 0;
+        sessionLogs.length > 0 ? Math.max(...sessionLogs.map((entry) => entry.messageId)) + 1 : 0;
       this.initialized = true;
     } catch (err) {
-      coreEvents.emitFeedback('error', 'Failed to initialize logger:', err);
+      coreEvents.emitFeedback("error", "Failed to initialize logger:", err);
       this.initialized = false;
     }
   }
 
-  private async _updateLogFile(
-    entryToAppend: LogEntry,
-  ): Promise<LogEntry | null> {
+  private async _updateLogFile(entryToAppend: LogEntry): Promise<LogEntry | null> {
     if (!this.logFilePath) {
-      debugLogger.debug('Log file path not set. Cannot persist log entry.');
-      throw new Error('Log file path not set during update attempt.');
+      debugLogger.debug("Log file path not set. Cannot persist log entry.");
+      throw new Error("Log file path not set during update attempt.");
     }
 
     let currentLogsOnDisk: LogEntry[];
     try {
       currentLogsOnDisk = await this._readLogFile();
     } catch (readError) {
-      debugLogger.debug(
-        'Critical error reading log file before append:',
-        readError,
-      );
+      debugLogger.debug("Critical error reading log file before append:", readError);
       throw readError;
     }
 
@@ -188,9 +174,7 @@ export class Logger {
       (e) => e.sessionId === entryToAppend.sessionId,
     );
     const nextMessageIdForSession =
-      sessionLogsOnDisk.length > 0
-        ? Math.max(...sessionLogsOnDisk.map((e) => e.messageId)) + 1
-        : 0;
+      sessionLogsOnDisk.length > 0 ? Math.max(...sessionLogsOnDisk.map((e) => e.messageId)) + 1 : 0;
 
     // Update the messageId of the entry we are about to append
     entryToAppend.messageId = nextMessageIdForSession;
@@ -217,15 +201,11 @@ export class Logger {
     currentLogsOnDisk.push(entryToAppend);
 
     try {
-      await fs.writeFile(
-        this.logFilePath,
-        JSON.stringify(currentLogsOnDisk, null, 2),
-        'utf-8',
-      );
+      await fs.writeFile(this.logFilePath, JSON.stringify(currentLogsOnDisk, null, 2), "utf-8");
       this.logs = currentLogsOnDisk;
       return entryToAppend; // Return the successfully appended entry
     } catch (error) {
-      debugLogger.debug('Error writing to log file:', error);
+      debugLogger.debug("Error writing to log file:", error);
       throw error;
     }
   }
@@ -244,9 +224,7 @@ export class Logger {
 
   async logMessage(type: MessageSenderType, message: string): Promise<void> {
     if (!this.initialized || this.sessionId === undefined) {
-      debugLogger.debug(
-        'Logger not initialized or session ID missing. Cannot log message.',
-      );
+      debugLogger.debug("Logger not initialized or session ID missing. Cannot log message.");
       return;
     }
 
@@ -274,10 +252,10 @@ export class Logger {
 
   private _checkpointPath(tag: string): string {
     if (!tag.length) {
-      throw new Error('No checkpoint tag specified.');
+      throw new Error("No checkpoint tag specified.");
     }
     if (!this.geminiDir) {
-      throw new Error('Checkpoint file path not set.');
+      throw new Error("Checkpoint file path not set.");
     }
     // Encode the tag to handle all special characters safely.
     const encodedTag = encodeTagName(tag);
@@ -292,7 +270,7 @@ export class Logger {
       return newPath; // Found it, use the new path.
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
+      if (nodeError.code !== "ENOENT") {
         throw error; // A real error occurred, rethrow it.
       }
       // It was not found, so we'll check the old path next.
@@ -305,7 +283,7 @@ export class Logger {
       return oldPath; // Found it, use the old path.
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
+      if (nodeError.code !== "ENOENT") {
         throw error; // A real error occurred, rethrow it.
       }
     }
@@ -317,30 +295,30 @@ export class Logger {
   async saveCheckpoint(conversation: Content[], tag: string): Promise<void> {
     if (!this.initialized) {
       debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot save a checkpoint.",
       );
       return;
     }
     // Always save with the new encoded path.
     const path = this._checkpointPath(tag);
     try {
-      await fs.writeFile(path, JSON.stringify(conversation, null, 2), 'utf-8');
+      await fs.writeFile(path, JSON.stringify(conversation, null, 2), "utf-8");
     } catch (error) {
-      debugLogger.error('Error writing to checkpoint file:', error);
+      debugLogger.error("Error writing to checkpoint file:", error);
     }
   }
 
   async loadCheckpoint(tag: string): Promise<Content[]> {
     if (!this.initialized) {
       debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot load checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot load checkpoint.",
       );
       return [];
     }
 
     const path = await this._getCheckpointPath(tag);
     try {
-      const fileContent = await fs.readFile(path, 'utf-8');
+      const fileContent = await fs.readFile(path, "utf-8");
       const parsedContent = JSON.parse(fileContent);
       if (!Array.isArray(parsedContent)) {
         debugLogger.warn(
@@ -351,14 +329,11 @@ export class Logger {
       return parsedContent as Content[];
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         // This is okay, it just means the checkpoint doesn't exist in either format.
         return [];
       }
-      debugLogger.error(
-        `Failed to read or parse checkpoint file ${path}:`,
-        error,
-      );
+      debugLogger.error(`Failed to read or parse checkpoint file ${path}:`, error);
       return [];
     }
   }
@@ -366,7 +341,7 @@ export class Logger {
   async deleteCheckpoint(tag: string): Promise<boolean> {
     if (!this.initialized || !this.geminiDir) {
       debugLogger.error(
-        'Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.',
+        "Logger not initialized or checkpoint file path not set. Cannot delete checkpoint.",
       );
       return false;
     }
@@ -380,11 +355,8 @@ export class Logger {
       deletedSomething = true;
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code !== 'ENOENT') {
-        debugLogger.error(
-          `Failed to delete checkpoint file ${newPath}:`,
-          error,
-        );
+      if (nodeError.code !== "ENOENT") {
+        debugLogger.error(`Failed to delete checkpoint file ${newPath}:`, error);
         throw error; // Rethrow unexpected errors
       }
       // It's okay if it doesn't exist.
@@ -398,11 +370,8 @@ export class Logger {
         deletedSomething = true;
       } catch (error) {
         const nodeError = error as NodeJS.ErrnoException;
-        if (nodeError.code !== 'ENOENT') {
-          debugLogger.error(
-            `Failed to delete checkpoint file ${oldPath}:`,
-            error,
-          );
+        if (nodeError.code !== "ENOENT") {
+          debugLogger.error(`Failed to delete checkpoint file ${oldPath}:`, error);
           throw error; // Rethrow unexpected errors
         }
         // It's okay if it doesn't exist.
@@ -414,9 +383,7 @@ export class Logger {
 
   async checkpointExists(tag: string): Promise<boolean> {
     if (!this.initialized) {
-      throw new Error(
-        'Logger not initialized. Cannot check for checkpoint existence.',
-      );
+      throw new Error("Logger not initialized. Cannot check for checkpoint existence.");
     }
     let filePath: string | undefined;
     try {
@@ -427,14 +394,12 @@ export class Logger {
       return true;
     } catch (error) {
       const nodeError = error as NodeJS.ErrnoException;
-      if (nodeError.code === 'ENOENT') {
+      if (nodeError.code === "ENOENT") {
         return false; // It truly doesn't exist in either format.
       }
       // A different error occurred.
       debugLogger.error(
-        `Failed to check checkpoint existence for ${
-          filePath ?? `path for tag "${tag}"`
-        }:`,
+        `Failed to check checkpoint existence for ${filePath ?? `path for tag "${tag}"`}:`,
         error,
       );
       throw error;
diff --git a/packages/gemini-core/src/core/loggingContentGenerator.test.ts b/packages/gemini-core/src/core/loggingContentGenerator.test.ts
index e591f86be..5aff44b52 100644
--- a/packages/gemini-core/src/core/loggingContentGenerator.test.ts
+++ b/packages/gemini-core/src/core/loggingContentGenerator.test.ts
@@ -8,7 +8,7 @@ const logApiRequest = vi.hoisted(() => vi.fn());
 const logApiResponse = vi.hoisted(() => vi.fn());
 const logApiError = vi.hoisted(() => vi.fn());
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logApiRequest,
   logApiResponse,
   logApiError,
@@ -18,21 +18,18 @@ const runInDevTraceSpan = vi.hoisted(() =>
   vi.fn(async (meta, fn) => fn({ metadata: {}, endSpan: vi.fn() })),
 );
 
-vi.mock('../telemetry/trace.js', () => ({
+vi.mock("../telemetry/trace.js", () => ({
   runInDevTraceSpan,
 }));
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type {
-  GenerateContentResponse,
-  EmbedContentResponse,
-} from '@google/genai';
-import type { ContentGenerator } from './contentGenerator.js';
-import { LoggingContentGenerator } from './loggingContentGenerator.js';
-import type { Config } from '../config/config.js';
-import { ApiRequestEvent } from '../telemetry/types.js';
-
-describe('LoggingContentGenerator', () => {
+import type { EmbedContentResponse, GenerateContentResponse } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { ApiRequestEvent } from "../telemetry/types.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { LoggingContentGenerator } from "./loggingContentGenerator.js";
+
+describe("LoggingContentGenerator", () => {
   let wrapped: ContentGenerator;
   let config: Config;
   let loggingContentGenerator: LoggingContentGenerator;
@@ -48,7 +45,7 @@ describe('LoggingContentGenerator', () => {
       getGoogleAIConfig: vi.fn(),
       getVertexAIConfig: vi.fn(),
       getContentGeneratorConfig: vi.fn().mockReturnValue({
-        authType: 'API_KEY',
+        authType: "API_KEY",
       }),
     } as unknown as Config;
     loggingContentGenerator = new LoggingContentGenerator(wrapped, config);
@@ -60,13 +57,13 @@ describe('LoggingContentGenerator', () => {
     vi.useRealTimers();
   });
 
-  describe('generateContent', () => {
-    it('should log request and response on success', async () => {
+  describe("generateContent", () => {
+    it("should log request and response on success", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
+      const userPromptId = "prompt-123";
       const response: GenerateContentResponse = {
         candidates: [],
         usageMetadata: {
@@ -81,63 +78,51 @@ describe('LoggingContentGenerator', () => {
         data: undefined,
       };
       vi.mocked(wrapped.generateContent).mockResolvedValue(response);
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const promise = loggingContentGenerator.generateContent(
-        req,
-        userPromptId,
-      );
+      const promise = loggingContentGenerator.generateContent(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
       await promise;
 
       expect(wrapped.generateContent).toHaveBeenCalledWith(req, userPromptId);
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
       expect(responseEvent.duration_ms).toBe(1000);
     });
 
-    it('should log error on failure', async () => {
+    it("should log error on failure", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
-      const error = new Error('test error');
+      const userPromptId = "prompt-123";
+      const error = new Error("test error");
       vi.mocked(wrapped.generateContent).mockRejectedValue(error);
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const promise = loggingContentGenerator.generateContent(
-        req,
-        userPromptId,
-      );
+      const promise = loggingContentGenerator.generateContent(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
       await expect(promise).rejects.toThrow(error);
 
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const errorEvent = vi.mocked(logApiError).mock.calls[0][1];
       expect(errorEvent.duration_ms).toBe(1000);
     });
   });
 
-  describe('generateContentStream', () => {
-    it('should log request and response on success', async () => {
+  describe("generateContentStream", () => {
+    it("should log request and response on success", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
+      const userPromptId = "prompt-123";
       const response = {
         candidates: [],
         usageMetadata: {
@@ -151,16 +136,11 @@ describe('LoggingContentGenerator', () => {
         yield response;
       }
 
-      vi.mocked(wrapped.generateContentStream).mockResolvedValue(
-        createAsyncGenerator(),
-      );
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const stream = await loggingContentGenerator.generateContentStream(
-        req,
-        userPromptId,
-      );
+      const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
@@ -168,40 +148,29 @@ describe('LoggingContentGenerator', () => {
         // consume stream
       }
 
-      expect(wrapped.generateContentStream).toHaveBeenCalledWith(
-        req,
-        userPromptId,
-      );
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(wrapped.generateContentStream).toHaveBeenCalledWith(req, userPromptId);
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const responseEvent = vi.mocked(logApiResponse).mock.calls[0][1];
       expect(responseEvent.duration_ms).toBe(1000);
     });
 
-    it('should log error on failure', async () => {
+    it("should log error on failure", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [{ text: 'hello' }] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [{ text: "hello" }] }],
+        model: "gemini-pro",
       };
-      const userPromptId = 'prompt-123';
-      const error = new Error('test error');
+      const userPromptId = "prompt-123";
+      const error = new Error("test error");
 
       async function* createAsyncGenerator() {
         yield Promise.reject(error);
       }
 
-      vi.mocked(wrapped.generateContentStream).mockResolvedValue(
-        createAsyncGenerator(),
-      );
-      const startTime = new Date('2025-01-01T00:00:00.000Z');
+      vi.mocked(wrapped.generateContentStream).mockResolvedValue(createAsyncGenerator());
+      const startTime = new Date("2025-01-01T00:00:00.000Z");
       vi.setSystemTime(startTime);
 
-      const stream = await loggingContentGenerator.generateContentStream(
-        req,
-        userPromptId,
-      );
+      const stream = await loggingContentGenerator.generateContentStream(req, userPromptId);
 
       vi.advanceTimersByTime(1000);
 
@@ -211,24 +180,21 @@ describe('LoggingContentGenerator', () => {
         }
       }).rejects.toThrow(error);
 
-      expect(logApiRequest).toHaveBeenCalledWith(
-        config,
-        expect.any(ApiRequestEvent),
-      );
+      expect(logApiRequest).toHaveBeenCalledWith(config, expect.any(ApiRequestEvent));
       const errorEvent = vi.mocked(logApiError).mock.calls[0][1];
       expect(errorEvent.duration_ms).toBe(1000);
     });
   });
 
-  describe('getWrapped', () => {
-    it('should return the wrapped content generator', () => {
+  describe("getWrapped", () => {
+    it("should return the wrapped content generator", () => {
       expect(loggingContentGenerator.getWrapped()).toBe(wrapped);
     });
   });
 
-  describe('countTokens', () => {
-    it('should call the wrapped countTokens method', async () => {
-      const req = { contents: [], model: 'gemini-pro' };
+  describe("countTokens", () => {
+    it("should call the wrapped countTokens method", async () => {
+      const req = { contents: [], model: "gemini-pro" };
       const response = { totalTokens: 10 };
       vi.mocked(wrapped.countTokens).mockResolvedValue(response);
 
@@ -239,11 +205,11 @@ describe('LoggingContentGenerator', () => {
     });
   });
 
-  describe('embedContent', () => {
-    it('should call the wrapped embedContent method', async () => {
+  describe("embedContent", () => {
+    it("should call the wrapped embedContent method", async () => {
       const req = {
-        contents: [{ role: 'user', parts: [] }],
-        model: 'gemini-pro',
+        contents: [{ role: "user", parts: [] }],
+        model: "gemini-pro",
       };
       const response: EmbedContentResponse = { embeddings: [{ values: [] }] };
       vi.mocked(wrapped.embedContent).mockResolvedValue(response);
diff --git a/packages/gemini-core/src/core/loggingContentGenerator.ts b/packages/gemini-core/src/core/loggingContentGenerator.ts
index 3b0768e98..b5f344044 100644
--- a/packages/gemini-core/src/core/loggingContentGenerator.ts
+++ b/packages/gemini-core/src/core/loggingContentGenerator.ts
@@ -13,26 +13,18 @@ import type {
   EmbedContentResponse,
   GenerateContentConfig,
   GenerateContentParameters,
-  GenerateContentResponseUsageMetadata,
   GenerateContentResponse,
-} from '@google/genai';
-import type { ServerDetails } from '../telemetry/types.js';
-import {
-  ApiRequestEvent,
-  ApiResponseEvent,
-  ApiErrorEvent,
-} from '../telemetry/types.js';
-import type { Config } from '../config/config.js';
-import {
-  logApiError,
-  logApiRequest,
-  logApiResponse,
-} from '../telemetry/loggers.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import { CodeAssistServer } from '../code_assist/server.js';
-import { toContents } from '../code_assist/converter.js';
-import { isStructuredError } from '../utils/quotaErrorDetection.js';
-import { runInDevTraceSpan, type SpanMetadata } from '../telemetry/trace.js';
+  GenerateContentResponseUsageMetadata,
+} from "@google/genai";
+import { toContents } from "../code_assist/converter.js";
+import { CodeAssistServer } from "../code_assist/server.js";
+import type { Config } from "../config/config.js";
+import { logApiError, logApiRequest, logApiResponse } from "../telemetry/loggers.js";
+import { runInDevTraceSpan, type SpanMetadata } from "../telemetry/trace.js";
+import type { ServerDetails } from "../telemetry/types.js";
+import { ApiErrorEvent, ApiRequestEvent, ApiResponseEvent } from "../telemetry/types.js";
+import { isStructuredError } from "../utils/quotaErrorDetection.js";
+import type { ContentGenerator } from "./contentGenerator.js";
 
 interface StructuredError {
   status: number;
@@ -51,31 +43,20 @@ export class LoggingContentGenerator implements ContentGenerator {
     return this.wrapped;
   }
 
-  private logApiRequest(
-    contents: Content[],
-    model: string,
-    promptId: string,
-  ): void {
+  private logApiRequest(contents: Content[], model: string, promptId: string): void {
     const requestText = JSON.stringify(contents);
-    logApiRequest(
-      this.config,
-      new ApiRequestEvent(model, promptId, requestText),
-    );
+    logApiRequest(this.config, new ApiRequestEvent(model, promptId, requestText));
   }
 
   private _getEndpointUrl(
     req: GenerateContentParameters,
-    method: 'generateContent' | 'generateContentStream',
+    method: "generateContent" | "generateContentStream",
   ): ServerDetails {
     // Case 1: Authenticated with a Google account (`gcloud auth login`).
     // Requests are routed through the internal CodeAssistServer.
     if (this.wrapped instanceof CodeAssistServer) {
       const url = new URL(this.wrapped.getMethodUrl(method));
-      const port = url.port
-        ? parseInt(url.port, 10)
-        : url.protocol === 'https:'
-          ? 443
-          : 80;
+      const port = url.port ? parseInt(url.port, 10) : url.protocol === "https:" ? 443 : 80;
       return { address: url.hostname, port };
     }
 
@@ -83,11 +64,11 @@ export class LoggingContentGenerator implements ContentGenerator {
 
     // Case 2: Using an API key for Vertex AI.
     if (genConfig?.vertexai) {
-      const location = process.env['GOOGLE_CLOUD_LOCATION'];
+      const location = process.env["GOOGLE_CLOUD_LOCATION"];
       if (location) {
         return { address: `${location}-aiplatform.googleapis.com`, port: 443 };
       } else {
-        return { address: 'unknown', port: 0 };
+        return { address: "unknown", port: 0 };
       }
     }
 
@@ -140,7 +121,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     serverDetails?: ServerDetails,
   ): void {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    const errorType = error instanceof Error ? error.name : 'unknown';
+    const errorType = error instanceof Error ? error.name : "unknown";
 
     logApiError(
       this.config,
@@ -156,9 +137,7 @@ export class LoggingContentGenerator implements ContentGenerator {
         },
         this.config.getContentGeneratorConfig()?.authType,
         errorType,
-        isStructuredError(error)
-          ? (error as StructuredError).status
-          : undefined,
+        isStructuredError(error) ? (error as StructuredError).status : undefined,
       ),
     );
   }
@@ -169,7 +148,7 @@ export class LoggingContentGenerator implements ContentGenerator {
   ): Promise<GenerateContentResponse> {
     return runInDevTraceSpan(
       {
-        name: 'generateContent',
+        name: "generateContent",
       },
       async ({ metadata: spanMetadata }) => {
         spanMetadata.input = { request: req, userPromptId, model: req.model };
@@ -177,12 +156,9 @@ export class LoggingContentGenerator implements ContentGenerator {
         const startTime = Date.now();
         const contents: Content[] = toContents(req.contents);
         this.logApiRequest(toContents(req.contents), req.model, userPromptId);
-        const serverDetails = this._getEndpointUrl(req, 'generateContent');
+        const serverDetails = this._getEndpointUrl(req, "generateContent");
         try {
-          const response = await this.wrapped.generateContent(
-            req,
-            userPromptId,
-          );
+          const response = await this.wrapped.generateContent(req, userPromptId);
           spanMetadata.output = {
             response,
             usageMetadata: response.usageMetadata,
@@ -224,17 +200,14 @@ export class LoggingContentGenerator implements ContentGenerator {
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     return runInDevTraceSpan(
       {
-        name: 'generateContentStream',
+        name: "generateContentStream",
         noAutoEnd: true,
       },
       async ({ metadata: spanMetadata, endSpan }) => {
         spanMetadata.input = { request: req, userPromptId, model: req.model };
         const startTime = Date.now();
         this.logApiRequest(toContents(req.contents), req.model, userPromptId);
-        const serverDetails = this._getEndpointUrl(
-          req,
-          'generateContentStream',
-        );
+        const serverDetails = this._getEndpointUrl(req, "generateContentStream");
 
         let stream: AsyncGenerator<GenerateContentResponse>;
         try {
@@ -276,7 +249,7 @@ export class LoggingContentGenerator implements ContentGenerator {
     const responses: GenerateContentResponse[] = [];
 
     let lastUsageMetadata: GenerateContentResponseUsageMetadata | undefined;
-    const serverDetails = this._getEndpointUrl(req, 'generateContentStream');
+    const serverDetails = this._getEndpointUrl(req, "generateContentStream");
     const requestContents: Content[] = toContents(req.contents);
     try {
       for await (const response of stream) {
@@ -329,12 +302,10 @@ export class LoggingContentGenerator implements ContentGenerator {
     return this.wrapped.countTokens(req);
   }
 
-  async embedContent(
-    req: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(req: EmbedContentParameters): Promise<EmbedContentResponse> {
     return runInDevTraceSpan(
       {
-        name: 'embedContent',
+        name: "embedContent",
       },
       async ({ metadata: spanMetadata }) => {
         spanMetadata.input = { request: req };
diff --git a/packages/gemini-core/src/core/nonInteractiveToolExecutor.test.ts b/packages/gemini-core/src/core/nonInteractiveToolExecutor.test.ts
index 5ee2b83f4..151437aa2 100644
--- a/packages/gemini-core/src/core/nonInteractiveToolExecutor.test.ts
+++ b/packages/gemini-core/src/core/nonInteractiveToolExecutor.test.ts
@@ -4,25 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import type { Mock } from 'vitest';
-import { executeToolCall } from './nonInteractiveToolExecutor.js';
-import type {
-  ToolRegistry,
-  ToolCallRequestInfo,
-  ToolResult,
-  Config,
-} from '../index.js';
+import type { Part } from "@google/genai";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config, ToolCallRequestInfo, ToolRegistry, ToolResult } from "../index.js";
 import {
+  ApprovalMode,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   ToolErrorType,
-  ApprovalMode,
-} from '../index.js';
-import type { Part } from '@google/genai';
-import { MockTool } from '../test-utils/mock-tool.js';
+} from "../index.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { executeToolCall } from "./nonInteractiveToolExecutor.js";
 
-describe('executeToolCall', () => {
+describe("executeToolCall", () => {
   let mockToolRegistry: ToolRegistry;
   let mockTool: MockTool;
   let executeFn: Mock;
@@ -31,7 +26,7 @@ describe('executeToolCall', () => {
 
   beforeEach(() => {
     executeFn = vi.fn();
-    mockTool = new MockTool({ name: 'testTool', execute: executeFn });
+    mockTool = new MockTool({ name: "testTool", execute: executeFn });
 
     mockToolRegistry = {
       getTool: vi.fn(),
@@ -42,22 +37,21 @@ describe('executeToolCall', () => {
       getToolRegistry: () => mockToolRegistry,
       getApprovalMode: () => ApprovalMode.DEFAULT,
       getAllowedTools: () => [],
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getDebugMode: () => false,
       getContentGeneratorConfig: () => ({
-        model: 'test-model',
-        authType: 'oauth-personal',
+        model: "test-model",
+        authType: "oauth-personal",
       }),
       getShellExecutionConfig: () => ({
         terminalWidth: 90,
         terminalHeight: 30,
       }),
       storage: {
-        getProjectTempDir: () => '/tmp',
+        getProjectTempDir: () => "/tmp",
       },
-      getTruncateToolOutputThreshold: () =>
-        DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
+      getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
       getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
       getUseSmartEdit: () => false,
       getUseModelRouter: () => false,
@@ -71,75 +65,62 @@ describe('executeToolCall', () => {
     abortController = new AbortController();
   });
 
-  it('should execute a tool successfully', async () => {
+  it("should execute a tool successfully", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call1',
-      name: 'testTool',
-      args: { param1: 'value1' },
+      callId: "call1",
+      name: "testTool",
+      args: { param1: "value1" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-1',
+      prompt_id: "prompt-id-1",
     };
     const toolResult: ToolResult = {
-      llmContent: 'Tool executed successfully',
-      returnDisplay: 'Success!',
+      llmContent: "Tool executed successfully",
+      returnDisplay: "Success!",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
-    expect(mockToolRegistry.getTool).toHaveBeenCalledWith('testTool');
+    expect(mockToolRegistry.getTool).toHaveBeenCalledWith("testTool");
     expect(executeFn).toHaveBeenCalledWith(request.args);
     expect(response).toStrictEqual({
-      callId: 'call1',
+      callId: "call1",
       error: undefined,
       errorType: undefined,
       outputFile: undefined,
-      resultDisplay: 'Success!',
+      resultDisplay: "Success!",
       contentLength:
-        typeof toolResult.llmContent === 'string'
-          ? toolResult.llmContent.length
-          : undefined,
+        typeof toolResult.llmContent === "string" ? toolResult.llmContent.length : undefined,
       responseParts: [
         {
           functionResponse: {
-            name: 'testTool',
-            id: 'call1',
-            response: { output: 'Tool executed successfully' },
+            name: "testTool",
+            id: "call1",
+            response: { output: "Tool executed successfully" },
           },
         },
       ],
     });
   });
 
-  it('should return an error if tool is not found', async () => {
+  it("should return an error if tool is not found", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call2',
-      name: 'nonexistentTool',
+      callId: "call2",
+      name: "nonexistentTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-2',
+      prompt_id: "prompt-id-2",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(undefined);
-    vi.mocked(mockToolRegistry.getAllToolNames).mockReturnValue([
-      'testTool',
-      'anotherTool',
-    ]);
+    vi.mocked(mockToolRegistry.getAllToolNames).mockReturnValue(["testTool", "anotherTool"]);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     const expectedErrorMessage =
       'Tool "nonexistentTool" not found in registry. Tools must use the exact names that are registered. Did you mean one of: "testTool", "anotherTool"?';
     expect(response).toStrictEqual({
-      callId: 'call2',
+      callId: "call2",
       error: new Error(expectedErrorMessage),
       errorType: ToolErrorType.TOOL_NOT_REGISTERED,
       resultDisplay: expectedErrorMessage,
@@ -147,8 +128,8 @@ describe('executeToolCall', () => {
       responseParts: [
         {
           functionResponse: {
-            name: 'nonexistentTool',
-            id: 'call2',
+            name: "nonexistentTool",
+            id: "call2",
             response: {
               error: expectedErrorMessage,
             },
@@ -158,162 +139,146 @@ describe('executeToolCall', () => {
     });
   });
 
-  it('should return an error if tool validation fails', async () => {
+  it("should return an error if tool validation fails", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call3',
-      name: 'testTool',
-      args: { param1: 'invalid' },
+      callId: "call3",
+      name: "testTool",
+      args: { param1: "invalid" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-3',
+      prompt_id: "prompt-id-3",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-    vi.spyOn(mockTool, 'build').mockImplementation(() => {
-      throw new Error('Invalid parameters');
+    vi.spyOn(mockTool, "build").mockImplementation(() => {
+      throw new Error("Invalid parameters");
     });
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response).toStrictEqual({
-      callId: 'call3',
-      error: new Error('Invalid parameters'),
+      callId: "call3",
+      error: new Error("Invalid parameters"),
       errorType: ToolErrorType.INVALID_TOOL_PARAMS,
       responseParts: [
         {
           functionResponse: {
-            id: 'call3',
-            name: 'testTool',
+            id: "call3",
+            name: "testTool",
             response: {
-              error: 'Invalid parameters',
+              error: "Invalid parameters",
             },
           },
         },
       ],
-      resultDisplay: 'Invalid parameters',
-      contentLength: 'Invalid parameters'.length,
+      resultDisplay: "Invalid parameters",
+      contentLength: "Invalid parameters".length,
     });
   });
 
-  it('should return an error if tool execution fails', async () => {
+  it("should return an error if tool execution fails", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call4',
-      name: 'testTool',
-      args: { param1: 'value1' },
+      callId: "call4",
+      name: "testTool",
+      args: { param1: "value1" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-4',
+      prompt_id: "prompt-id-4",
     };
     const executionErrorResult: ToolResult = {
-      llmContent: 'Error: Execution failed',
-      returnDisplay: 'Execution failed',
+      llmContent: "Error: Execution failed",
+      returnDisplay: "Execution failed",
       error: {
-        message: 'Execution failed',
+        message: "Execution failed",
         type: ToolErrorType.EXECUTION_FAILED,
       },
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(executionErrorResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
     expect(response).toStrictEqual({
-      callId: 'call4',
-      error: new Error('Execution failed'),
+      callId: "call4",
+      error: new Error("Execution failed"),
       errorType: ToolErrorType.EXECUTION_FAILED,
       responseParts: [
         {
           functionResponse: {
-            id: 'call4',
-            name: 'testTool',
+            id: "call4",
+            name: "testTool",
             response: {
-              error: 'Execution failed',
+              error: "Execution failed",
             },
           },
         },
       ],
-      resultDisplay: 'Execution failed',
-      contentLength: 'Execution failed'.length,
+      resultDisplay: "Execution failed",
+      contentLength: "Execution failed".length,
     });
   });
 
-  it('should return an unhandled exception error if execution throws', async () => {
+  it("should return an unhandled exception error if execution throws", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call5',
-      name: 'testTool',
-      args: { param1: 'value1' },
+      callId: "call5",
+      name: "testTool",
+      args: { param1: "value1" },
       isClientInitiated: false,
-      prompt_id: 'prompt-id-5',
+      prompt_id: "prompt-id-5",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
-    executeFn.mockRejectedValue(new Error('Something went very wrong'));
+    executeFn.mockRejectedValue(new Error("Something went very wrong"));
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response).toStrictEqual({
-      callId: 'call5',
-      error: new Error('Something went very wrong'),
+      callId: "call5",
+      error: new Error("Something went very wrong"),
       errorType: ToolErrorType.UNHANDLED_EXCEPTION,
-      resultDisplay: 'Something went very wrong',
-      contentLength: 'Something went very wrong'.length,
+      resultDisplay: "Something went very wrong",
+      contentLength: "Something went very wrong".length,
       responseParts: [
         {
           functionResponse: {
-            name: 'testTool',
-            id: 'call5',
-            response: { error: 'Something went very wrong' },
+            name: "testTool",
+            id: "call5",
+            response: { error: "Something went very wrong" },
           },
         },
       ],
     });
   });
 
-  it('should correctly format llmContent with inlineData', async () => {
+  it("should correctly format llmContent with inlineData", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call6',
-      name: 'testTool',
+      callId: "call6",
+      name: "testTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-6',
+      prompt_id: "prompt-id-6",
     };
     const imageDataPart: Part = {
-      inlineData: { mimeType: 'image/png', data: 'base64data' },
+      inlineData: { mimeType: "image/png", data: "base64data" },
     };
     const toolResult: ToolResult = {
       llmContent: [imageDataPart],
-      returnDisplay: 'Image processed',
+      returnDisplay: "Image processed",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response).toStrictEqual({
-      callId: 'call6',
+      callId: "call6",
       error: undefined,
       errorType: undefined,
       outputFile: undefined,
-      resultDisplay: 'Image processed',
+      resultDisplay: "Image processed",
       contentLength: undefined,
       responseParts: [
         {
           functionResponse: {
-            name: 'testTool',
-            id: 'call6',
+            name: "testTool",
+            id: "call6",
             response: {
-              output: 'Binary content of type image/png was processed.',
+              output: "Binary content of type image/png was processed.",
             },
           },
         },
@@ -322,54 +287,44 @@ describe('executeToolCall', () => {
     });
   });
 
-  it('should calculate contentLength for a string llmContent', async () => {
+  it("should calculate contentLength for a string llmContent", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call7',
-      name: 'testTool',
+      callId: "call7",
+      name: "testTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-7',
+      prompt_id: "prompt-id-7",
     };
     const toolResult: ToolResult = {
-      llmContent: 'This is a test string.',
-      returnDisplay: 'String returned',
+      llmContent: "This is a test string.",
+      returnDisplay: "String returned",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response.contentLength).toBe(
-      typeof toolResult.llmContent === 'string'
-        ? toolResult.llmContent.length
-        : undefined,
+      typeof toolResult.llmContent === "string" ? toolResult.llmContent.length : undefined,
     );
   });
 
-  it('should have undefined contentLength for array llmContent with no string parts', async () => {
+  it("should have undefined contentLength for array llmContent with no string parts", async () => {
     const request: ToolCallRequestInfo = {
-      callId: 'call8',
-      name: 'testTool',
+      callId: "call8",
+      name: "testTool",
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-8',
+      prompt_id: "prompt-id-8",
     };
     const toolResult: ToolResult = {
-      llmContent: [{ inlineData: { mimeType: 'image/png', data: 'fakedata' } }],
-      returnDisplay: 'Image data returned',
+      llmContent: [{ inlineData: { mimeType: "image/png", data: "fakedata" } }],
+      returnDisplay: "Image data returned",
     };
     vi.mocked(mockToolRegistry.getTool).mockReturnValue(mockTool);
     executeFn.mockResolvedValue(toolResult);
 
-    const { response } = await executeToolCall(
-      mockConfig,
-      request,
-      abortController.signal,
-    );
+    const { response } = await executeToolCall(mockConfig, request, abortController.signal);
 
     expect(response.contentLength).toBeUndefined();
   });
diff --git a/packages/gemini-core/src/core/nonInteractiveToolExecutor.ts b/packages/gemini-core/src/core/nonInteractiveToolExecutor.ts
index 52100e6ea..a88dd1c71 100644
--- a/packages/gemini-core/src/core/nonInteractiveToolExecutor.ts
+++ b/packages/gemini-core/src/core/nonInteractiveToolExecutor.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolCallRequestInfo, Config } from '../index.js';
-import {
-  CoreToolScheduler,
-  type CompletedToolCall,
-} from './coreToolScheduler.js';
+import type { Config, ToolCallRequestInfo } from "../index.js";
+import { type CompletedToolCall, CoreToolScheduler } from "./coreToolScheduler.js";
 
 /**
  * Executes a single tool call non-interactively by leveraging the CoreToolScheduler.
diff --git a/packages/gemini-core/src/core/prompts.test.ts b/packages/gemini-core/src/core/prompts.test.ts
index 013dbfdf5..fd63b7f1a 100644
--- a/packages/gemini-core/src/core/prompts.test.ts
+++ b/packages/gemini-core/src/core/prompts.test.ts
@@ -4,52 +4,52 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { getCoreSystemPrompt, resolvePathFromEnv } from './prompts.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import type { Config } from '../config/config.js';
-import { CodebaseInvestigatorAgent } from '../agents/codebase-investigator.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { CodebaseInvestigatorAgent } from "../agents/codebase-investigator.js";
+import type { Config } from "../config/config.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import { getCoreSystemPrompt, resolvePathFromEnv } from "./prompts.js";
 
 // Mock tool names if they are dynamically generated or complex
-vi.mock('../tools/ls', () => ({ LSTool: { Name: 'list_directory' } }));
-vi.mock('../tools/edit', () => ({ EditTool: { Name: 'replace' } }));
-vi.mock('../tools/glob', () => ({ GlobTool: { Name: 'glob' } }));
-vi.mock('../tools/grep', () => ({ GrepTool: { Name: 'search_file_content' } }));
-vi.mock('../tools/read-file', () => ({ ReadFileTool: { Name: 'read_file' } }));
-vi.mock('../tools/read-many-files', () => ({
-  ReadManyFilesTool: { Name: 'read_many_files' },
+vi.mock("../tools/ls", () => ({ LSTool: { Name: "list_directory" } }));
+vi.mock("../tools/edit", () => ({ EditTool: { Name: "replace" } }));
+vi.mock("../tools/glob", () => ({ GlobTool: { Name: "glob" } }));
+vi.mock("../tools/grep", () => ({ GrepTool: { Name: "search_file_content" } }));
+vi.mock("../tools/read-file", () => ({ ReadFileTool: { Name: "read_file" } }));
+vi.mock("../tools/read-many-files", () => ({
+  ReadManyFilesTool: { Name: "read_many_files" },
 }));
-vi.mock('../tools/shell', () => ({
-  ShellTool: { Name: 'run_shell_command' },
+vi.mock("../tools/shell", () => ({
+  ShellTool: { Name: "run_shell_command" },
 }));
-vi.mock('../tools/write-file', () => ({
-  WriteFileTool: { Name: 'write_file' },
+vi.mock("../tools/write-file", () => ({
+  WriteFileTool: { Name: "write_file" },
 }));
-vi.mock('../agents/codebase-investigator.js', () => ({
-  CodebaseInvestigatorAgent: { name: 'codebase_investigator' },
+vi.mock("../agents/codebase-investigator.js", () => ({
+  CodebaseInvestigatorAgent: { name: "codebase_investigator" },
 }));
-vi.mock('../utils/gitUtils', () => ({
+vi.mock("../utils/gitUtils", () => ({
   isGitRepository: vi.fn(),
 }));
-vi.mock('node:fs');
+vi.mock("node:fs");
 
-describe('Core System Prompt (prompts.ts)', () => {
+describe("Core System Prompt (prompts.ts)", () => {
   let mockConfig: Config;
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.stubEnv('GEMINI_SYSTEM_MD', undefined);
-    vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', undefined);
+    vi.stubEnv("GEMINI_SYSTEM_MD", undefined);
+    vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", undefined);
     mockConfig = {
       getToolRegistry: vi.fn().mockReturnValue({
         getAllToolNames: vi.fn().mockReturnValue([]),
       }),
       getEnableShellOutputEfficiency: vi.fn().mockReturnValue(true),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
       },
       isInteractive: vi.fn().mockReturnValue(true),
       isInteractiveShellEnabled: vi.fn().mockReturnValue(true),
@@ -57,257 +57,231 @@ describe('Core System Prompt (prompts.ts)', () => {
   });
 
   it.each([
-    ['empty string', ''],
-    ['whitespace only', '   \n  \t '],
-  ])('should return the base prompt when userMemory is %s', (_, userMemory) => {
-    vi.stubEnv('SANDBOX', undefined);
+    ["empty string", ""],
+    ["whitespace only", "   \n  \t "],
+  ])("should return the base prompt when userMemory is %s", (_, userMemory) => {
+    vi.stubEnv("SANDBOX", undefined);
     const prompt = getCoreSystemPrompt(mockConfig, userMemory);
-    expect(prompt).not.toContain('---\n\n'); // Separator should not be present
-    expect(prompt).toContain('You are an interactive CLI agent'); // Check for core content
+    expect(prompt).not.toContain("---\n\n"); // Separator should not be present
+    expect(prompt).toContain("You are an interactive CLI agent"); // Check for core content
     expect(prompt).toMatchSnapshot(); // Use snapshot for base prompt structure
   });
 
-  it('should append userMemory with separator when provided', () => {
-    vi.stubEnv('SANDBOX', undefined);
-    const memory = 'This is custom user memory.\nBe extra polite.';
+  it("should append userMemory with separator when provided", () => {
+    vi.stubEnv("SANDBOX", undefined);
+    const memory = "This is custom user memory.\nBe extra polite.";
     const expectedSuffix = `\n\n---\n\n${memory}`;
     const prompt = getCoreSystemPrompt(mockConfig, memory);
 
     expect(prompt.endsWith(expectedSuffix)).toBe(true);
-    expect(prompt).toContain('You are an interactive CLI agent'); // Ensure base prompt follows
+    expect(prompt).toContain("You are an interactive CLI agent"); // Ensure base prompt follows
     expect(prompt).toMatchSnapshot(); // Snapshot the combined prompt
   });
 
-  it('should include sandbox-specific instructions when SANDBOX env var is set', () => {
-    vi.stubEnv('SANDBOX', 'true'); // Generic sandbox value
+  it("should include sandbox-specific instructions when SANDBOX env var is set", () => {
+    vi.stubEnv("SANDBOX", "true"); // Generic sandbox value
     const prompt = getCoreSystemPrompt(mockConfig);
-    expect(prompt).toContain('# Sandbox');
-    expect(prompt).not.toContain('# macOS Seatbelt');
-    expect(prompt).not.toContain('# Outside of Sandbox');
+    expect(prompt).toContain("# Sandbox");
+    expect(prompt).not.toContain("# macOS Seatbelt");
+    expect(prompt).not.toContain("# Outside of Sandbox");
     expect(prompt).toMatchSnapshot();
   });
 
   it('should include seatbelt-specific instructions when SANDBOX env var is "sandbox-exec"', () => {
-    vi.stubEnv('SANDBOX', 'sandbox-exec');
+    vi.stubEnv("SANDBOX", "sandbox-exec");
     const prompt = getCoreSystemPrompt(mockConfig);
-    expect(prompt).toContain('# macOS Seatbelt');
-    expect(prompt).not.toContain('# Sandbox');
-    expect(prompt).not.toContain('# Outside of Sandbox');
+    expect(prompt).toContain("# macOS Seatbelt");
+    expect(prompt).not.toContain("# Sandbox");
+    expect(prompt).not.toContain("# Outside of Sandbox");
     expect(prompt).toMatchSnapshot();
   });
 
-  it('should include non-sandbox instructions when SANDBOX env var is not set', () => {
-    vi.stubEnv('SANDBOX', undefined); // Ensure it\'s not set
+  it("should include non-sandbox instructions when SANDBOX env var is not set", () => {
+    vi.stubEnv("SANDBOX", undefined); // Ensure it\'s not set
     const prompt = getCoreSystemPrompt(mockConfig);
-    expect(prompt).toContain('# Outside of Sandbox');
-    expect(prompt).not.toContain('# Sandbox');
-    expect(prompt).not.toContain('# macOS Seatbelt');
+    expect(prompt).toContain("# Outside of Sandbox");
+    expect(prompt).not.toContain("# Sandbox");
+    expect(prompt).not.toContain("# macOS Seatbelt");
     expect(prompt).toMatchSnapshot();
   });
 
-  it('should include git instructions when in a git repo', () => {
-    vi.stubEnv('SANDBOX', undefined);
+  it("should include git instructions when in a git repo", () => {
+    vi.stubEnv("SANDBOX", undefined);
     vi.mocked(isGitRepository).mockReturnValue(true);
     const prompt = getCoreSystemPrompt(mockConfig);
-    expect(prompt).toContain('# Git Repository');
+    expect(prompt).toContain("# Git Repository");
     expect(prompt).toMatchSnapshot();
   });
 
-  it('should not include git instructions when not in a git repo', () => {
-    vi.stubEnv('SANDBOX', undefined);
+  it("should not include git instructions when not in a git repo", () => {
+    vi.stubEnv("SANDBOX", undefined);
     vi.mocked(isGitRepository).mockReturnValue(false);
     const prompt = getCoreSystemPrompt(mockConfig);
-    expect(prompt).not.toContain('# Git Repository');
+    expect(prompt).not.toContain("# Git Repository");
     expect(prompt).toMatchSnapshot();
   });
 
-  it('should return the interactive avoidance prompt when in non-interactive mode', () => {
-    vi.stubEnv('SANDBOX', undefined);
+  it("should return the interactive avoidance prompt when in non-interactive mode", () => {
+    vi.stubEnv("SANDBOX", undefined);
     mockConfig.isInteractive = vi.fn().mockReturnValue(false);
-    const prompt = getCoreSystemPrompt(mockConfig, '');
-    expect(prompt).toContain('**Interactive Commands:**'); // Check for interactive prompt
+    const prompt = getCoreSystemPrompt(mockConfig, "");
+    expect(prompt).toContain("**Interactive Commands:**"); // Check for interactive prompt
     expect(prompt).toMatchSnapshot(); // Use snapshot for base prompt structure
   });
 
-  describe('with CodebaseInvestigator enabled', () => {
+  describe("with CodebaseInvestigator enabled", () => {
     beforeEach(() => {
       mockConfig = {
         getToolRegistry: vi.fn().mockReturnValue({
-          getAllToolNames: vi
-            .fn()
-            .mockReturnValue([CodebaseInvestigatorAgent.name]),
+          getAllToolNames: vi.fn().mockReturnValue([CodebaseInvestigatorAgent.name]),
         }),
         getEnableShellOutputEfficiency: vi.fn().mockReturnValue(true),
         storage: {
-          getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
+          getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
         },
         isInteractive: vi.fn().mockReturnValue(false),
         isInteractiveShellEnabled: vi.fn().mockReturnValue(false),
       } as unknown as Config;
     });
 
-    it('should include CodebaseInvestigator instructions in the prompt', () => {
+    it("should include CodebaseInvestigator instructions in the prompt", () => {
       const prompt = getCoreSystemPrompt(mockConfig);
       expect(prompt).toContain(
         `your **first and primary tool** must be '${CodebaseInvestigatorAgent.name}'`,
       );
-      expect(prompt).toContain(
-        `do not ignore the output of '${CodebaseInvestigatorAgent.name}'`,
-      );
-      expect(prompt).not.toContain(
-        "Use 'search_file_content' and 'glob' search tools extensively",
-      );
+      expect(prompt).toContain(`do not ignore the output of '${CodebaseInvestigatorAgent.name}'`);
+      expect(prompt).not.toContain("Use 'search_file_content' and 'glob' search tools extensively");
     });
   });
 
-  describe('with CodebaseInvestigator disabled', () => {
+  describe("with CodebaseInvestigator disabled", () => {
     // No beforeEach needed, will use the default from the parent describe
-    it('should include standard tool instructions in the prompt', () => {
+    it("should include standard tool instructions in the prompt", () => {
       const prompt = getCoreSystemPrompt(mockConfig);
       expect(prompt).not.toContain(
         `your **first and primary tool** must be '${CodebaseInvestigatorAgent.name}'`,
       );
-      expect(prompt).toContain(
-        "Use 'search_file_content' and 'glob' search tools extensively",
-      );
+      expect(prompt).toContain("Use 'search_file_content' and 'glob' search tools extensively");
     });
   });
 
-  describe('GEMINI_SYSTEM_MD environment variable', () => {
-    it.each(['false', '0'])(
-      'should use default prompt when GEMINI_SYSTEM_MD is "%s"',
-      (value) => {
-        vi.stubEnv('GEMINI_SYSTEM_MD', value);
-        const prompt = getCoreSystemPrompt(mockConfig);
-        expect(fs.readFileSync).not.toHaveBeenCalled();
-        expect(prompt).not.toContain('custom system prompt');
-      },
-    );
+  describe("GEMINI_SYSTEM_MD environment variable", () => {
+    it.each(["false", "0"])('should use default prompt when GEMINI_SYSTEM_MD is "%s"', (value) => {
+      vi.stubEnv("GEMINI_SYSTEM_MD", value);
+      const prompt = getCoreSystemPrompt(mockConfig);
+      expect(fs.readFileSync).not.toHaveBeenCalled();
+      expect(prompt).not.toContain("custom system prompt");
+    });
 
-    it('should throw error if GEMINI_SYSTEM_MD points to a non-existent file', () => {
-      const customPath = '/non/existent/path/system.md';
-      vi.stubEnv('GEMINI_SYSTEM_MD', customPath);
+    it("should throw error if GEMINI_SYSTEM_MD points to a non-existent file", () => {
+      const customPath = "/non/existent/path/system.md";
+      vi.stubEnv("GEMINI_SYSTEM_MD", customPath);
       vi.mocked(fs.existsSync).mockReturnValue(false);
       expect(() => getCoreSystemPrompt(mockConfig)).toThrow(
         `missing system prompt file '${path.resolve(customPath)}'`,
       );
     });
 
-    it.each(['true', '1'])(
-      'should read from default path when GEMINI_SYSTEM_MD is "%s"',
-      (value) => {
-        const defaultPath = path.resolve(path.join(GEMINI_DIR, 'system.md'));
-        vi.stubEnv('GEMINI_SYSTEM_MD', value);
-        vi.mocked(fs.existsSync).mockReturnValue(true);
-        vi.mocked(fs.readFileSync).mockReturnValue('custom system prompt');
-
-        const prompt = getCoreSystemPrompt(mockConfig);
-        expect(fs.readFileSync).toHaveBeenCalledWith(defaultPath, 'utf8');
-        expect(prompt).toBe('custom system prompt');
-      },
-    );
+    it.each([
+      "true",
+      "1",
+    ])('should read from default path when GEMINI_SYSTEM_MD is "%s"', (value) => {
+      const defaultPath = path.resolve(path.join(GEMINI_DIR, "system.md"));
+      vi.stubEnv("GEMINI_SYSTEM_MD", value);
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(fs.readFileSync).mockReturnValue("custom system prompt");
+
+      const prompt = getCoreSystemPrompt(mockConfig);
+      expect(fs.readFileSync).toHaveBeenCalledWith(defaultPath, "utf8");
+      expect(prompt).toBe("custom system prompt");
+    });
 
-    it('should read from custom path when GEMINI_SYSTEM_MD provides one, preserving case', () => {
-      const customPath = path.resolve('/custom/path/SyStEm.Md');
-      vi.stubEnv('GEMINI_SYSTEM_MD', customPath);
+    it("should read from custom path when GEMINI_SYSTEM_MD provides one, preserving case", () => {
+      const customPath = path.resolve("/custom/path/SyStEm.Md");
+      vi.stubEnv("GEMINI_SYSTEM_MD", customPath);
       vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue('custom system prompt');
+      vi.mocked(fs.readFileSync).mockReturnValue("custom system prompt");
 
       const prompt = getCoreSystemPrompt(mockConfig);
-      expect(fs.readFileSync).toHaveBeenCalledWith(customPath, 'utf8');
-      expect(prompt).toBe('custom system prompt');
+      expect(fs.readFileSync).toHaveBeenCalledWith(customPath, "utf8");
+      expect(prompt).toBe("custom system prompt");
     });
 
-    it('should expand tilde in custom path when GEMINI_SYSTEM_MD is set', () => {
-      const homeDir = '/Users/test';
-      vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
-      const customPath = '~/custom/system.md';
-      const expectedPath = path.join(homeDir, 'custom/system.md');
-      vi.stubEnv('GEMINI_SYSTEM_MD', customPath);
+    it("should expand tilde in custom path when GEMINI_SYSTEM_MD is set", () => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
+      const customPath = "~/custom/system.md";
+      const expectedPath = path.join(homeDir, "custom/system.md");
+      vi.stubEnv("GEMINI_SYSTEM_MD", customPath);
       vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue('custom system prompt');
+      vi.mocked(fs.readFileSync).mockReturnValue("custom system prompt");
 
       const prompt = getCoreSystemPrompt(mockConfig);
-      expect(fs.readFileSync).toHaveBeenCalledWith(
-        path.resolve(expectedPath),
-        'utf8',
-      );
-      expect(prompt).toBe('custom system prompt');
+      expect(fs.readFileSync).toHaveBeenCalledWith(path.resolve(expectedPath), "utf8");
+      expect(prompt).toBe("custom system prompt");
     });
   });
 
-  describe('GEMINI_WRITE_SYSTEM_MD environment variable', () => {
-    it.each(['false', '0'])(
-      'should not write to file when GEMINI_WRITE_SYSTEM_MD is "%s"',
-      (value) => {
-        vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', value);
-        getCoreSystemPrompt(mockConfig);
-        expect(fs.writeFileSync).not.toHaveBeenCalled();
-      },
-    );
-
-    it.each(['true', '1'])(
-      'should write to default path when GEMINI_WRITE_SYSTEM_MD is "%s"',
-      (value) => {
-        const defaultPath = path.resolve(path.join(GEMINI_DIR, 'system.md'));
-        vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', value);
-        getCoreSystemPrompt(mockConfig);
-        expect(fs.writeFileSync).toHaveBeenCalledWith(
-          defaultPath,
-          expect.any(String),
-        );
-      },
-    );
+  describe("GEMINI_WRITE_SYSTEM_MD environment variable", () => {
+    it.each([
+      "false",
+      "0",
+    ])('should not write to file when GEMINI_WRITE_SYSTEM_MD is "%s"', (value) => {
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", value);
+      getCoreSystemPrompt(mockConfig);
+      expect(fs.writeFileSync).not.toHaveBeenCalled();
+    });
 
-    it('should write to custom path when GEMINI_WRITE_SYSTEM_MD provides one', () => {
-      const customPath = path.resolve('/custom/path/system.md');
-      vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', customPath);
+    it.each([
+      "true",
+      "1",
+    ])('should write to default path when GEMINI_WRITE_SYSTEM_MD is "%s"', (value) => {
+      const defaultPath = path.resolve(path.join(GEMINI_DIR, "system.md"));
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", value);
       getCoreSystemPrompt(mockConfig);
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        customPath,
-        expect.any(String),
-      );
+      expect(fs.writeFileSync).toHaveBeenCalledWith(defaultPath, expect.any(String));
     });
 
-    it('should expand tilde in custom path when GEMINI_WRITE_SYSTEM_MD is set', () => {
-      const homeDir = '/Users/test';
-      vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
-      const customPath = '~/custom/system.md';
-      const expectedPath = path.join(homeDir, 'custom/system.md');
-      vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', customPath);
+    it("should write to custom path when GEMINI_WRITE_SYSTEM_MD provides one", () => {
+      const customPath = path.resolve("/custom/path/system.md");
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", customPath);
       getCoreSystemPrompt(mockConfig);
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        path.resolve(expectedPath),
-        expect.any(String),
-      );
+      expect(fs.writeFileSync).toHaveBeenCalledWith(customPath, expect.any(String));
     });
 
-    it('should expand tilde in custom path when GEMINI_WRITE_SYSTEM_MD is just ~', () => {
-      const homeDir = '/Users/test';
-      vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
-      const customPath = '~';
+    it("should expand tilde in custom path when GEMINI_WRITE_SYSTEM_MD is set", () => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
+      const customPath = "~/custom/system.md";
+      const expectedPath = path.join(homeDir, "custom/system.md");
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", customPath);
+      getCoreSystemPrompt(mockConfig);
+      expect(fs.writeFileSync).toHaveBeenCalledWith(path.resolve(expectedPath), expect.any(String));
+    });
+
+    it("should expand tilde in custom path when GEMINI_WRITE_SYSTEM_MD is just ~", () => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
+      const customPath = "~";
       const expectedPath = homeDir;
-      vi.stubEnv('GEMINI_WRITE_SYSTEM_MD', customPath);
+      vi.stubEnv("GEMINI_WRITE_SYSTEM_MD", customPath);
       getCoreSystemPrompt(mockConfig);
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        path.resolve(expectedPath),
-        expect.any(String),
-      );
+      expect(fs.writeFileSync).toHaveBeenCalledWith(path.resolve(expectedPath), expect.any(String));
     });
   });
 });
 
-describe('resolvePathFromEnv helper function', () => {
+describe("resolvePathFromEnv helper function", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  describe('when envVar is undefined, empty, or whitespace', () => {
+  describe("when envVar is undefined, empty, or whitespace", () => {
     it.each([
-      ['undefined', undefined],
-      ['empty string', ''],
-      ['whitespace only', '   \n\t  '],
-    ])('should return null for %s', (_, input) => {
+      ["undefined", undefined],
+      ["empty string", ""],
+      ["whitespace only", "   \n\t  "],
+    ])("should return null for %s", (_, input) => {
       const result = resolvePathFromEnv(input);
       expect(result).toEqual({
         isSwitch: false,
@@ -317,15 +291,15 @@ describe('resolvePathFromEnv helper function', () => {
     });
   });
 
-  describe('when envVar is a boolean-like string', () => {
+  describe("when envVar is a boolean-like string", () => {
     it.each([
-      ['"0" as disabled switch', '0', '0', true],
-      ['"false" as disabled switch', 'false', 'false', true],
-      ['"1" as enabled switch', '1', '1', false],
-      ['"true" as enabled switch', 'true', 'true', false],
-      ['"FALSE" (case-insensitive)', 'FALSE', 'false', true],
-      ['"TRUE" (case-insensitive)', 'TRUE', 'true', false],
-    ])('should handle %s', (_, input, expectedValue, isDisabled) => {
+      ['"0" as disabled switch', "0", "0", true],
+      ['"false" as disabled switch', "false", "false", true],
+      ['"1" as enabled switch', "1", "1", false],
+      ['"true" as enabled switch', "true", "true", false],
+      ['"FALSE" (case-insensitive)', "FALSE", "false", true],
+      ['"TRUE" (case-insensitive)', "TRUE", "true", false],
+    ])("should handle %s", (_, input, expectedValue, isDisabled) => {
       const result = resolvePathFromEnv(input);
       expect(result).toEqual({
         isSwitch: true,
@@ -335,42 +309,42 @@ describe('resolvePathFromEnv helper function', () => {
     });
   });
 
-  describe('when envVar is a file path', () => {
-    it('should resolve absolute paths', () => {
-      const result = resolvePathFromEnv('/absolute/path/file.txt');
+  describe("when envVar is a file path", () => {
+    it("should resolve absolute paths", () => {
+      const result = resolvePathFromEnv("/absolute/path/file.txt");
       expect(result).toEqual({
         isSwitch: false,
-        value: path.resolve('/absolute/path/file.txt'),
+        value: path.resolve("/absolute/path/file.txt"),
         isDisabled: false,
       });
     });
 
-    it('should resolve relative paths', () => {
-      const result = resolvePathFromEnv('relative/path/file.txt');
+    it("should resolve relative paths", () => {
+      const result = resolvePathFromEnv("relative/path/file.txt");
       expect(result).toEqual({
         isSwitch: false,
-        value: path.resolve('relative/path/file.txt'),
+        value: path.resolve("relative/path/file.txt"),
         isDisabled: false,
       });
     });
 
-    it('should expand tilde to home directory', () => {
-      const homeDir = '/Users/test';
-      vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
+    it("should expand tilde to home directory", () => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
 
-      const result = resolvePathFromEnv('~/documents/file.txt');
+      const result = resolvePathFromEnv("~/documents/file.txt");
       expect(result).toEqual({
         isSwitch: false,
-        value: path.resolve(path.join(homeDir, 'documents/file.txt')),
+        value: path.resolve(path.join(homeDir, "documents/file.txt")),
         isDisabled: false,
       });
     });
 
-    it('should handle standalone tilde', () => {
-      const homeDir = '/Users/test';
-      vi.spyOn(os, 'homedir').mockReturnValue(homeDir);
+    it("should handle standalone tilde", () => {
+      const homeDir = "/Users/test";
+      vi.spyOn(os, "homedir").mockReturnValue(homeDir);
 
-      const result = resolvePathFromEnv('~');
+      const result = resolvePathFromEnv("~");
       expect(result).toEqual({
         isSwitch: false,
         value: path.resolve(homeDir),
@@ -378,20 +352,20 @@ describe('resolvePathFromEnv helper function', () => {
       });
     });
 
-    it('should handle os.homedir() errors gracefully', () => {
-      vi.spyOn(os, 'homedir').mockImplementation(() => {
-        throw new Error('Cannot resolve home directory');
+    it("should handle os.homedir() errors gracefully", () => {
+      vi.spyOn(os, "homedir").mockImplementation(() => {
+        throw new Error("Cannot resolve home directory");
       });
-      const consoleSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+      const consoleSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
-      const result = resolvePathFromEnv('~/documents/file.txt');
+      const result = resolvePathFromEnv("~/documents/file.txt");
       expect(result).toEqual({
         isSwitch: false,
         value: null,
         isDisabled: false,
       });
       expect(consoleSpy).toHaveBeenCalledWith(
-        'Could not resolve home directory for path: ~/documents/file.txt',
+        "Could not resolve home directory for path: ~/documents/file.txt",
         expect.any(Error),
       );
 
diff --git a/packages/gemini-core/src/core/prompts.ts b/packages/gemini-core/src/core/prompts.ts
index fd603ecd9..626bb34b1 100644
--- a/packages/gemini-core/src/core/prompts.ts
+++ b/packages/gemini-core/src/core/prompts.ts
@@ -4,9 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import process from "node:process";
+import { CodebaseInvestigatorAgent } from "../agents/codebase-investigator.js";
+import type { Config } from "../config/config.js";
 import {
   EDIT_TOOL_NAME,
   GLOB_TOOL_NAME,
@@ -16,14 +19,11 @@ import {
   SHELL_TOOL_NAME,
   WRITE_FILE_TOOL_NAME,
   WRITE_TODOS_TOOL_NAME,
-} from '../tools/tool-names.js';
-import process from 'node:process';
-import { isGitRepository } from '../utils/gitUtils.js';
-import { CodebaseInvestigatorAgent } from '../agents/codebase-investigator.js';
-import type { Config } from '../config/config.js';
-import { GEMINI_DIR } from '../utils/paths.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { WriteTodosTool } from '../tools/write-todos.js';
+} from "../tools/tool-names.js";
+import { WriteTodosTool } from "../tools/write-todos.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import { GEMINI_DIR } from "../utils/paths.js";
 
 export function resolvePathFromEnv(envVar?: string): {
   isSwitch: boolean;
@@ -38,9 +38,9 @@ export function resolvePathFromEnv(envVar?: string): {
 
   const lowerEnvVar = trimmedEnvVar.toLowerCase();
   // Check if the input is a common boolean-like string.
-  if (['0', 'false', '1', 'true'].includes(lowerEnvVar)) {
+  if (["0", "false", "1", "true"].includes(lowerEnvVar)) {
     // If so, identify it as a "switch" and return its value.
-    const isDisabled = ['0', 'false'].includes(lowerEnvVar);
+    const isDisabled = ["0", "false"].includes(lowerEnvVar);
     return { isSwitch: true, value: lowerEnvVar, isDisabled };
   }
 
@@ -48,20 +48,17 @@ export function resolvePathFromEnv(envVar?: string): {
   let customPath = trimmedEnvVar;
 
   // Safely expand the tilde (~) character to the user's home directory.
-  if (customPath.startsWith('~/') || customPath === '~') {
+  if (customPath.startsWith("~/") || customPath === "~") {
     try {
       const home = os.homedir(); // This is the call that can throw an error.
-      if (customPath === '~') {
+      if (customPath === "~") {
         customPath = home;
       } else {
         customPath = path.join(home, customPath.slice(2));
       }
     } catch (error) {
       // If os.homedir() fails, we catch the error instead of crashing.
-      debugLogger.warn(
-        `Could not resolve home directory for path: ${trimmedEnvVar}`,
-        error,
-      );
+      debugLogger.warn(`Could not resolve home directory for path: ${trimmedEnvVar}`, error);
       // Return null to indicate the path resolution failed.
       return { isSwitch: false, value: null, isDisabled: false };
     }
@@ -75,18 +72,13 @@ export function resolvePathFromEnv(envVar?: string): {
   };
 }
 
-export function getCoreSystemPrompt(
-  config: Config,
-  userMemory?: string,
-): string {
+export function getCoreSystemPrompt(config: Config, userMemory?: string): string {
   // A flag to indicate whether the system prompt override is active.
   let systemMdEnabled = false;
   // The default path for the system prompt file. This can be overridden.
-  let systemMdPath = path.resolve(path.join(GEMINI_DIR, 'system.md'));
+  let systemMdPath = path.resolve(path.join(GEMINI_DIR, "system.md"));
   // Resolve the environment variable to get either a path or a switch value.
-  const systemMdResolution = resolvePathFromEnv(
-    process.env['GEMINI_SYSTEM_MD'],
-  );
+  const systemMdResolution = resolvePathFromEnv(process.env["GEMINI_SYSTEM_MD"]);
 
   // Proceed only if the environment variable is set and is not disabled.
   if (systemMdResolution.value && !systemMdResolution.isDisabled) {
@@ -114,7 +106,7 @@ export function getCoreSystemPrompt(
 
   let basePrompt: string;
   if (systemMdEnabled) {
-    basePrompt = fs.readFileSync(systemMdPath, 'utf8');
+    basePrompt = fs.readFileSync(systemMdPath, "utf8");
   } else {
     const promptConfig = {
       preamble: `You are an interactive CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
@@ -205,7 +197,7 @@ IT IS CRITICAL TO FOLLOW THESE GUIDELINES TO AVOID EXCESSIVE TOKEN CONSUMPTION.
 - After the command runs, inspect the temp files (e.g. '<temp_dir>/out.log' and '<temp_dir>/err.log') using commands like 'grep', 'tail', 'head', ... (or platform equivalents). Remove the temp files when done.
 `;
   }
-  return '';
+  return "";
 })()}
 
 ## Tone and Style (CLI Interaction)
@@ -241,8 +233,8 @@ ${(function () {
       sandbox: `
 ${(function () {
   // Determine sandbox status based on environment variables
-  const isSandboxExec = process.env['SANDBOX'] === 'sandbox-exec';
-  const isGenericSandbox = !!process.env['SANDBOX']; // Check if SANDBOX is set to any non-empty value
+  const isSandboxExec = process.env["SANDBOX"] === "sandbox-exec";
+  const isGenericSandbox = !!process.env["SANDBOX"]; // Check if SANDBOX is set to any non-empty value
 
   if (isSandboxExec) {
     return `
@@ -281,33 +273,30 @@ ${(function () {
 - Never push changes to a remote repository without being asked explicitly by the user.
 `;
   }
-  return '';
+  return "";
 })()}`,
       finalReminder: `
 # Final Reminder
 Your core function is efficient and safe assistance. Balance extreme conciseness with the crucial need for clarity, especially regarding safety and potential system modifications. Always prioritize user control and project conventions. Never make assumptions about the contents of files; instead use '${READ_FILE_TOOL_NAME}' to ensure you aren't making broad assumptions. Finally, you are an agent - please keep going until the user's query is completely resolved.`,
     };
 
-    const orderedPrompts: Array<keyof typeof promptConfig> = [
-      'preamble',
-      'coreMandates',
-    ];
+    const orderedPrompts: Array<keyof typeof promptConfig> = ["preamble", "coreMandates"];
 
     if (enableCodebaseInvestigator && enableWriteTodosTool) {
-      orderedPrompts.push('primaryWorkflows_prefix_ci_todo');
+      orderedPrompts.push("primaryWorkflows_prefix_ci_todo");
     } else if (enableCodebaseInvestigator) {
-      orderedPrompts.push('primaryWorkflows_prefix_ci');
+      orderedPrompts.push("primaryWorkflows_prefix_ci");
     } else if (enableWriteTodosTool) {
-      orderedPrompts.push('primaryWorkflows_todo');
+      orderedPrompts.push("primaryWorkflows_todo");
     } else {
-      orderedPrompts.push('primaryWorkflows_prefix');
+      orderedPrompts.push("primaryWorkflows_prefix");
     }
     orderedPrompts.push(
-      'primaryWorkflows_suffix',
-      'operationalGuidelines',
-      'sandbox',
-      'git',
-      'finalReminder',
+      "primaryWorkflows_suffix",
+      "operationalGuidelines",
+      "sandbox",
+      "git",
+      "finalReminder",
     );
 
     // By default, all prompts are enabled. A prompt is disabled if its corresponding
@@ -315,16 +304,14 @@ Your core function is efficient and safe assistance. Balance extreme conciseness
     const enabledPrompts = orderedPrompts.filter((key) => {
       const envVar = process.env[`GEMINI_PROMPT_${key.toUpperCase()}`];
       const lowerEnvVar = envVar?.trim().toLowerCase();
-      return lowerEnvVar !== '0' && lowerEnvVar !== 'false';
+      return lowerEnvVar !== "0" && lowerEnvVar !== "false";
     });
 
-    basePrompt = enabledPrompts.map((key) => promptConfig[key]).join('\n');
+    basePrompt = enabledPrompts.map((key) => promptConfig[key]).join("\n");
   }
 
   // if GEMINI_WRITE_SYSTEM_MD is set (and not 0|false), write base system prompt to file
-  const writeSystemMdResolution = resolvePathFromEnv(
-    process.env['GEMINI_WRITE_SYSTEM_MD'],
-  );
+  const writeSystemMdResolution = resolvePathFromEnv(process.env["GEMINI_WRITE_SYSTEM_MD"]);
 
   // Check if the feature is enabled. This proceeds only if the environment
   // variable is set and is not explicitly '0' or 'false'.
@@ -338,9 +325,7 @@ Your core function is efficient and safe assistance. Balance extreme conciseness
   }
 
   const memorySuffix =
-    userMemory && userMemory.trim().length > 0
-      ? `\n\n---\n\n${userMemory.trim()}`
-      : '';
+    userMemory && userMemory.trim().length > 0 ? `\n\n---\n\n${userMemory.trim()}` : "";
 
   return `${basePrompt}${memorySuffix}`;
 }
diff --git a/packages/gemini-core/src/core/recordingContentGenerator.test.ts b/packages/gemini-core/src/core/recordingContentGenerator.test.ts
index c69c62ebf..94c824854 100644
--- a/packages/gemini-core/src/core/recordingContentGenerator.test.ts
+++ b/packages/gemini-core/src/core/recordingContentGenerator.test.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { appendFileSync } from "node:fs";
 import type {
-  GenerateContentResponse,
+  ContentEmbedding,
+  CountTokensParameters,
   CountTokensResponse,
+  EmbedContentParameters,
   EmbedContentResponse,
   GenerateContentParameters,
-  CountTokensParameters,
-  EmbedContentParameters,
-  ContentEmbedding,
-} from '@google/genai';
-import { appendFileSync } from 'node:fs';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import type { ContentGenerator } from './contentGenerator.js';
-import { RecordingContentGenerator } from './recordingContentGenerator.js';
-
-vi.mock('node:fs', () => ({
+  GenerateContentResponse,
+} from "@google/genai";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import { RecordingContentGenerator } from "./recordingContentGenerator.js";
+
+vi.mock("node:fs", () => ({
   appendFileSync: vi.fn(),
 }));
 
-describe('RecordingContentGenerator', () => {
+describe("RecordingContentGenerator", () => {
   let mockRealGenerator: ContentGenerator;
   let recorder: RecordingContentGenerator;
-  const filePath = '/test/file/responses.json';
+  const filePath = "/test/file/responses.json";
 
   beforeEach(() => {
     mockRealGenerator = {
@@ -39,42 +39,33 @@ describe('RecordingContentGenerator', () => {
     vi.clearAllMocks();
   });
 
-  it('should record generateContent responses', async () => {
+  it("should record generateContent responses", async () => {
     const mockResponse = {
-      candidates: [
-        { content: { parts: [{ text: 'response' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response" }], role: "model" } }],
       usageMetadata: { totalTokenCount: 10 },
     } as GenerateContentResponse;
     (mockRealGenerator.generateContent as Mock).mockResolvedValue(mockResponse);
 
-    const response = await recorder.generateContent(
-      {} as GenerateContentParameters,
-      'id1',
-    );
+    const response = await recorder.generateContent({} as GenerateContentParameters, "id1");
     expect(response).toEqual(mockResponse);
-    expect(mockRealGenerator.generateContent).toHaveBeenCalledWith({}, 'id1');
+    expect(mockRealGenerator.generateContent).toHaveBeenCalledWith({}, "id1");
 
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'generateContent',
+        method: "generateContent",
         response: mockResponse,
-      }) + '\n',
+      }) + "\n",
     );
   });
 
-  it('should record generateContentStream responses', async () => {
+  it("should record generateContentStream responses", async () => {
     const mockResponse1 = {
-      candidates: [
-        { content: { parts: [{ text: 'response1' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response1" }], role: "model" } }],
       usageMetadata: { totalTokenCount: 10 },
     } as GenerateContentResponse;
     const mockResponse2 = {
-      candidates: [
-        { content: { parts: [{ text: 'response2' }], role: 'model' } },
-      ],
+      candidates: [{ content: { parts: [{ text: "response2" }], role: "model" } }],
       usageMetadata: { totalTokenCount: 20 },
     } as GenerateContentResponse;
 
@@ -83,35 +74,27 @@ describe('RecordingContentGenerator', () => {
       yield mockResponse2;
     }
 
-    (mockRealGenerator.generateContentStream as Mock).mockResolvedValue(
-      mockStream(),
-    );
+    (mockRealGenerator.generateContentStream as Mock).mockResolvedValue(mockStream());
 
-    const stream = await recorder.generateContentStream(
-      {} as GenerateContentParameters,
-      'id1',
-    );
+    const stream = await recorder.generateContentStream({} as GenerateContentParameters, "id1");
     const responses = [];
     for await (const response of stream) {
       responses.push(response);
     }
 
     expect(responses).toEqual([mockResponse1, mockResponse2]);
-    expect(mockRealGenerator.generateContentStream).toHaveBeenCalledWith(
-      {},
-      'id1',
-    );
+    expect(mockRealGenerator.generateContentStream).toHaveBeenCalledWith({}, "id1");
 
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'generateContentStream',
+        method: "generateContentStream",
         response: responses,
-      }) + '\n',
+      }) + "\n",
     );
   });
 
-  it('should record countTokens responses', async () => {
+  it("should record countTokens responses", async () => {
     const mockResponse = {
       totalTokens: 100,
       cachedContentTokenCount: 10,
@@ -125,13 +108,13 @@ describe('RecordingContentGenerator', () => {
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'countTokens',
+        method: "countTokens",
         response: mockResponse,
-      }) + '\n',
+      }) + "\n",
     );
   });
 
-  it('should record embedContent responses', async () => {
+  it("should record embedContent responses", async () => {
     const mockResponse = {
       embeddings: [{ values: [1, 2, 3] } as ContentEmbedding],
     } as EmbedContentResponse;
@@ -143,9 +126,9 @@ describe('RecordingContentGenerator', () => {
     expect(appendFileSync).toHaveBeenCalledWith(
       filePath,
       safeJsonStringify({
-        method: 'embedContent',
+        method: "embedContent",
         response: mockResponse,
-      }) + '\n',
+      }) + "\n",
     );
   });
 });
diff --git a/packages/gemini-core/src/core/recordingContentGenerator.ts b/packages/gemini-core/src/core/recordingContentGenerator.ts
index 27abcb418..a8e6e3817 100644
--- a/packages/gemini-core/src/core/recordingContentGenerator.ts
+++ b/packages/gemini-core/src/core/recordingContentGenerator.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { appendFileSync } from "node:fs";
 import type {
+  CountTokensParameters,
   CountTokensResponse,
+  EmbedContentParameters,
+  EmbedContentResponse,
   GenerateContentParameters,
   GenerateContentResponse,
-  CountTokensParameters,
-  EmbedContentResponse,
-  EmbedContentParameters,
-} from '@google/genai';
-import { appendFileSync } from 'node:fs';
-import type { ContentGenerator } from './contentGenerator.js';
-import type { FakeResponse } from './fakeContentGenerator.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+} from "@google/genai";
+import type { UserTierId } from "../code_assist/types.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import type { ContentGenerator } from "./contentGenerator.js";
+import type { FakeResponse } from "./fakeContentGenerator.js";
 
 // A ContentGenerator that wraps another content generator and records all the
 // responses, with the ability to write them out to a file. These files are
@@ -36,12 +36,9 @@ export class RecordingContentGenerator implements ContentGenerator {
     request: GenerateContentParameters,
     userPromptId: string,
   ): Promise<GenerateContentResponse> {
-    const response = await this.realGenerator.generateContent(
-      request,
-      userPromptId,
-    );
+    const response = await this.realGenerator.generateContent(request, userPromptId);
     const recordedResponse: FakeResponse = {
-      method: 'generateContent',
+      method: "generateContent",
       response: {
         candidates: response.candidates,
         usageMetadata: response.usageMetadata,
@@ -56,14 +53,11 @@ export class RecordingContentGenerator implements ContentGenerator {
     userPromptId: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
     const recordedResponse: FakeResponse = {
-      method: 'generateContentStream',
+      method: "generateContentStream",
       response: [],
     };
 
-    const realResponses = await this.realGenerator.generateContentStream(
-      request,
-      userPromptId,
-    );
+    const realResponses = await this.realGenerator.generateContentStream(request, userPromptId);
 
     async function* stream(filePath: string) {
       for await (const response of realResponses) {
@@ -79,12 +73,10 @@ export class RecordingContentGenerator implements ContentGenerator {
     return Promise.resolve(stream(this.filePath));
   }
 
-  async countTokens(
-    request: CountTokensParameters,
-  ): Promise<CountTokensResponse> {
+  async countTokens(request: CountTokensParameters): Promise<CountTokensResponse> {
     const response = await this.realGenerator.countTokens(request);
     const recordedResponse: FakeResponse = {
-      method: 'countTokens',
+      method: "countTokens",
       response: {
         totalTokens: response.totalTokens,
         cachedContentTokenCount: response.cachedContentTokenCount,
@@ -94,13 +86,11 @@ export class RecordingContentGenerator implements ContentGenerator {
     return response;
   }
 
-  async embedContent(
-    request: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
+  async embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse> {
     const response = await this.realGenerator.embedContent(request);
 
     const recordedResponse: FakeResponse = {
-      method: 'embedContent',
+      method: "embedContent",
       response: {
         embeddings: response.embeddings,
         metadata: response.metadata,
diff --git a/packages/gemini-core/src/core/tokenLimits.test.ts b/packages/gemini-core/src/core/tokenLimits.test.ts
index 1bff09d31..5f2f9e3c8 100644
--- a/packages/gemini-core/src/core/tokenLimits.test.ts
+++ b/packages/gemini-core/src/core/tokenLimits.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { tokenLimit, DEFAULT_TOKEN_LIMIT } from './tokenLimits.js';
+import { describe, expect, it } from "vitest";
+import { DEFAULT_TOKEN_LIMIT, tokenLimit } from "./tokenLimits.js";
 
-describe('tokenLimit', () => {
-  it('should return the correct token limit for gemini-1.5-pro', () => {
-    expect(tokenLimit('gemini-1.5-pro')).toBe(2_097_152);
+describe("tokenLimit", () => {
+  it("should return the correct token limit for gemini-1.5-pro", () => {
+    expect(tokenLimit("gemini-1.5-pro")).toBe(2_097_152);
   });
 
-  it('should return the correct token limit for gemini-1.5-flash', () => {
-    expect(tokenLimit('gemini-1.5-flash')).toBe(1_048_576);
+  it("should return the correct token limit for gemini-1.5-flash", () => {
+    expect(tokenLimit("gemini-1.5-flash")).toBe(1_048_576);
   });
 
-  it('should return the default token limit for an unknown model', () => {
-    expect(tokenLimit('unknown-model')).toBe(DEFAULT_TOKEN_LIMIT);
+  it("should return the default token limit for an unknown model", () => {
+    expect(tokenLimit("unknown-model")).toBe(DEFAULT_TOKEN_LIMIT);
   });
 
-  it('should return the default token limit if no model is provided', () => {
+  it("should return the default token limit if no model is provided", () => {
     // @ts-expect-error testing invalid input
     expect(tokenLimit(undefined)).toBe(DEFAULT_TOKEN_LIMIT);
   });
 
-  it('should have the correct default token limit value', () => {
+  it("should have the correct default token limit value", () => {
     expect(DEFAULT_TOKEN_LIMIT).toBe(1_048_576);
   });
 });
diff --git a/packages/gemini-core/src/core/tokenLimits.ts b/packages/gemini-core/src/core/tokenLimits.ts
index d238cdb3a..16c0f3f4f 100644
--- a/packages/gemini-core/src/core/tokenLimits.ts
+++ b/packages/gemini-core/src/core/tokenLimits.ts
@@ -13,18 +13,18 @@ export function tokenLimit(model: Model): TokenCount {
   // Add other models as they become relevant or if specified by config
   // Pulled from https://ai.google.dev/gemini-api/docs/models
   switch (model) {
-    case 'gemini-1.5-pro':
+    case "gemini-1.5-pro":
       return 2_097_152;
-    case 'gemini-1.5-flash':
-    case 'gemini-2.5-pro-preview-05-06':
-    case 'gemini-2.5-pro-preview-06-05':
-    case 'gemini-2.5-pro':
-    case 'gemini-2.5-flash-preview-05-20':
-    case 'gemini-2.5-flash':
-    case 'gemini-2.5-flash-lite':
-    case 'gemini-2.0-flash':
+    case "gemini-1.5-flash":
+    case "gemini-2.5-pro-preview-05-06":
+    case "gemini-2.5-pro-preview-06-05":
+    case "gemini-2.5-pro":
+    case "gemini-2.5-flash-preview-05-20":
+    case "gemini-2.5-flash":
+    case "gemini-2.5-flash-lite":
+    case "gemini-2.0-flash":
       return 1_048_576;
-    case 'gemini-2.0-flash-preview-image-generation':
+    case "gemini-2.0-flash-preview-image-generation":
       return 32_000;
     default:
       return DEFAULT_TOKEN_LIMIT;
diff --git a/packages/gemini-core/src/core/turn.test.ts b/packages/gemini-core/src/core/turn.test.ts
index efe4761ce..67776a1b5 100644
--- a/packages/gemini-core/src/core/turn.test.ts
+++ b/packages/gemini-core/src/core/turn.test.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type {
-  ServerGeminiToolCallRequestEvent,
-  ServerGeminiErrorEvent,
-} from './turn.js';
-import { Turn, GeminiEventType } from './turn.js';
-import type { GenerateContentResponse, Part, Content } from '@google/genai';
-import { reportError } from '../utils/errorReporting.js';
-import type { GeminiChat } from './geminiChat.js';
-import { InvalidStreamError, StreamEventType } from './geminiChat.js';
+import type { Content, GenerateContentResponse, Part } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { reportError } from "../utils/errorReporting.js";
+import type { GeminiChat } from "./geminiChat.js";
+import { InvalidStreamError, StreamEventType } from "./geminiChat.js";
+import type { ServerGeminiErrorEvent, ServerGeminiToolCallRequestEvent } from "./turn.js";
+import { GeminiEventType, Turn } from "./turn.js";
 
 const mockSendMessageStream = vi.fn();
 const mockGetHistory = vi.fn();
 const mockMaybeIncludeSchemaDepthContext = vi.fn();
 
-vi.mock('@google/genai', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@google/genai')>();
+vi.mock("@google/genai", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@google/genai")>();
   const MockChat = vi.fn().mockImplementation(() => ({
     sendMessageStream: mockSendMessageStream,
     getHistory: mockGetHistory,
@@ -32,18 +29,17 @@ vi.mock('@google/genai', async (importOriginal) => {
   };
 });
 
-vi.mock('../utils/errorReporting', () => ({
+vi.mock("../utils/errorReporting", () => ({
   reportError: vi.fn(),
 }));
 
 // Use the actual implementation from partUtils now that it's provided.
-vi.mock('../utils/generateContentResponseUtilities', () => ({
+vi.mock("../utils/generateContentResponseUtilities", () => ({
   getResponseText: (resp: GenerateContentResponse) =>
-    resp.candidates?.[0]?.content?.parts?.map((part) => part.text).join('') ||
-    undefined,
+    resp.candidates?.[0]?.content?.parts?.map((part) => part.text).join("") || undefined,
 }));
 
-describe('Turn', () => {
+describe("Turn", () => {
   let turn: Turn;
   // Define a type for the mocked Chat instance for clarity
   type MockedChatInstance = {
@@ -60,7 +56,7 @@ describe('Turn', () => {
       getHistory: mockGetHistory,
       maybeIncludeSchemaDepthContext: mockMaybeIncludeSchemaDepthContext,
     };
-    turn = new Turn(mockChatInstance as unknown as GeminiChat, 'prompt-id-1');
+    turn = new Turn(mockChatInstance as unknown as GeminiChat, "prompt-id-1");
     mockGetHistory.mockReturnValue([]);
     mockSendMessageStream.mockResolvedValue((async function* () {})());
   });
@@ -69,72 +65,68 @@ describe('Turn', () => {
     vi.restoreAllMocks();
   });
 
-  describe('constructor', () => {
-    it('should initialize pendingToolCalls and debugResponses', () => {
+  describe("constructor", () => {
+    it("should initialize pendingToolCalls and debugResponses", () => {
       expect(turn.pendingToolCalls).toEqual([]);
       expect(turn.getDebugResponses()).toEqual([]);
     });
   });
 
-  describe('run', () => {
-    it('should yield content events for text parts', async () => {
+  describe("run", () => {
+    it("should yield content events for text parts", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: 'Hello' }] } }],
+            candidates: [{ content: { parts: [{ text: "Hello" }] } }],
           } as GenerateContentResponse,
         };
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: ' world' }] } }],
+            candidates: [{ content: { parts: [{ text: " world" }] } }],
           } as GenerateContentResponse,
         };
       })();
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Hi' }];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Hi" }];
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
       expect(mockSendMessageStream).toHaveBeenCalledWith(
-        'test-model',
+        "test-model",
         {
           message: reqParts,
           config: { abortSignal: expect.any(AbortSignal) },
         },
-        'prompt-id-1',
+        "prompt-id-1",
       );
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Hello' },
-        { type: GeminiEventType.Content, value: ' world' },
+        { type: GeminiEventType.Content, value: "Hello" },
+        { type: GeminiEventType.Content, value: " world" },
       ]);
       expect(turn.getDebugResponses().length).toBe(2);
     });
 
-    it('should yield tool_call_request events for function calls', async () => {
+    it("should yield tool_call_request events for function calls", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             functionCalls: [
               {
-                id: 'fc1',
-                name: 'tool1',
-                args: { arg1: 'val1' },
+                id: "fc1",
+                name: "tool1",
+                args: { arg1: "val1" },
                 isClientInitiated: false,
               },
               {
-                name: 'tool2',
-                args: { arg2: 'val2' },
+                name: "tool2",
+                args: { arg2: "val2" },
                 isClientInitiated: false,
               }, // No ID
             ],
@@ -144,12 +136,8 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Use tools' }];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Use tools" }];
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
@@ -158,9 +146,9 @@ describe('Turn', () => {
       expect(event1.type).toBe(GeminiEventType.ToolCallRequest);
       expect(event1.value).toEqual(
         expect.objectContaining({
-          callId: 'fc1',
-          name: 'tool1',
-          args: { arg1: 'val1' },
+          callId: "fc1",
+          name: "tool1",
+          args: { arg1: "val1" },
           isClientInitiated: false,
         }),
       );
@@ -170,25 +158,23 @@ describe('Turn', () => {
       expect(event2.type).toBe(GeminiEventType.ToolCallRequest);
       expect(event2.value).toEqual(
         expect.objectContaining({
-          name: 'tool2',
-          args: { arg2: 'val2' },
+          name: "tool2",
+          args: { arg2: "val2" },
           isClientInitiated: false,
         }),
       );
-      expect(event2.value.callId).toEqual(
-        expect.stringMatching(/^tool2-\d{13}-\w{10,}$/),
-      );
+      expect(event2.value.callId).toEqual(expect.stringMatching(/^tool2-\d{13}-\w{10,}$/));
       expect(turn.pendingToolCalls[1]).toEqual(event2.value);
       expect(turn.getDebugResponses().length).toBe(1);
     });
 
-    it('should yield UserCancelled event if signal is aborted', async () => {
+    it("should yield UserCancelled event if signal is aborted", async () => {
       const abortController = new AbortController();
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: 'First part' }] } }],
+            candidates: [{ content: { parts: [{ text: "First part" }] } }],
           } as GenerateContentResponse,
         };
         abortController.abort();
@@ -198,7 +184,7 @@ describe('Turn', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'Second part - should not be processed' }],
+                  parts: [{ text: "Second part - should not be processed" }],
                 },
               },
             ],
@@ -208,35 +194,24 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test abort' }];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        abortController.signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Test abort" }];
+      for await (const event of turn.run("test-model", reqParts, abortController.signal)) {
         events.push(event);
       }
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'First part' },
+        { type: GeminiEventType.Content, value: "First part" },
         { type: GeminiEventType.UserCancelled },
       ]);
       expect(turn.getDebugResponses().length).toBe(1);
     });
 
-    it('should yield InvalidStream event if sendMessageStream throws InvalidStreamError', async () => {
-      const error = new InvalidStreamError(
-        'Test invalid stream',
-        'NO_FINISH_REASON',
-      );
+    it("should yield InvalidStream event if sendMessageStream throws InvalidStreamError", async () => {
+      const error = new InvalidStreamError("Test invalid stream", "NO_FINISH_REASON");
       mockSendMessageStream.mockRejectedValue(error);
-      const reqParts: Part[] = [{ text: 'Trigger invalid stream' }];
+      const reqParts: Part[] = [{ text: "Trigger invalid stream" }];
 
       const events = [];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
@@ -245,21 +220,15 @@ describe('Turn', () => {
       expect(reportError).not.toHaveBeenCalled(); // Should not report as error
     });
 
-    it('should yield Error event and report if sendMessageStream throws', async () => {
-      const error = new Error('API Error');
+    it("should yield Error event and report if sendMessageStream throws", async () => {
+      const error = new Error("API Error");
       mockSendMessageStream.mockRejectedValue(error);
-      const reqParts: Part[] = [{ text: 'Trigger error' }];
-      const historyContent: Content[] = [
-        { role: 'model', parts: [{ text: 'Previous history' }] },
-      ];
+      const reqParts: Part[] = [{ text: "Trigger error" }];
+      const historyContent: Content[] = [{ role: "model", parts: [{ text: "Previous history" }] }];
       mockGetHistory.mockReturnValue(historyContent);
       mockMaybeIncludeSchemaDepthContext.mockResolvedValue(undefined);
       const events = [];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
@@ -267,18 +236,18 @@ describe('Turn', () => {
       const errorEvent = events[0] as ServerGeminiErrorEvent;
       expect(errorEvent.type).toBe(GeminiEventType.Error);
       expect(errorEvent.value).toEqual({
-        error: { message: 'API Error', status: undefined },
+        error: { message: "API Error", status: undefined },
       });
       expect(turn.getDebugResponses().length).toBe(0);
       expect(reportError).toHaveBeenCalledWith(
         error,
-        'Error when talking to Gemini API',
-        [...historyContent, { role: 'user', parts: reqParts }],
-        'Turn.run-sendMessageStream',
+        "Error when talking to Gemini API",
+        [...historyContent, { role: "user", parts: reqParts }],
+        "Turn.run-sendMessageStream",
       );
     });
 
-    it('should handle function calls with undefined name or args', async () => {
+    it("should handle function calls with undefined name or args", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -286,9 +255,9 @@ describe('Turn', () => {
             candidates: [],
             functionCalls: [
               // Add `id` back to the mock to match what the code expects
-              { id: 'fc1', name: undefined, args: { arg1: 'val1' } },
-              { id: 'fc2', name: 'tool2', args: undefined },
-              { id: 'fc3', name: undefined, args: undefined },
+              { id: "fc1", name: undefined, args: { arg1: "val1" } },
+              { id: "fc2", name: "tool2", args: undefined },
+              { id: "fc3", name: undefined, args: undefined },
             ],
           },
         };
@@ -297,8 +266,8 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'Test undefined tool parts' }],
+        "test-model",
+        [{ text: "Test undefined tool parts" }],
         new AbortController().signal,
       )) {
         events.push(event);
@@ -309,35 +278,35 @@ describe('Turn', () => {
       // Assertions for each specific tool call event
       const event1 = events[0] as ServerGeminiToolCallRequestEvent;
       expect(event1.value).toMatchObject({
-        callId: 'fc1',
-        name: 'undefined_tool_name',
-        args: { arg1: 'val1' },
+        callId: "fc1",
+        name: "undefined_tool_name",
+        args: { arg1: "val1" },
       });
 
       const event2 = events[1] as ServerGeminiToolCallRequestEvent;
       expect(event2.value).toMatchObject({
-        callId: 'fc2',
-        name: 'tool2',
+        callId: "fc2",
+        name: "tool2",
         args: {},
       });
 
       const event3 = events[2] as ServerGeminiToolCallRequestEvent;
       expect(event3.value).toMatchObject({
-        callId: 'fc3',
-        name: 'undefined_tool_name',
+        callId: "fc3",
+        name: "undefined_tool_name",
         args: {},
       });
     });
 
-    it('should yield finished event when response has finish reason', async () => {
+    it("should yield finished event when response has finish reason", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Partial response' }] },
-                finishReason: 'STOP',
+                content: { parts: [{ text: "Partial response" }] },
+                finishReason: "STOP",
               },
             ],
             usageMetadata: {
@@ -354,19 +323,19 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'Test finish reason' }],
+        "test-model",
+        [{ text: "Test finish reason" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Partial response' },
+        { type: GeminiEventType.Content, value: "Partial response" },
         {
           type: GeminiEventType.Finished,
           value: {
-            reason: 'STOP',
+            reason: "STOP",
             usageMetadata: {
               promptTokenCount: 17,
               candidatesTokenCount: 50,
@@ -379,7 +348,7 @@ describe('Turn', () => {
       ]);
     });
 
-    it('should yield finished event for MAX_TOKENS finish reason', async () => {
+    it("should yield finished event for MAX_TOKENS finish reason", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -387,11 +356,9 @@ describe('Turn', () => {
             candidates: [
               {
                 content: {
-                  parts: [
-                    { text: 'This is a long response that was cut off...' },
-                  ],
+                  parts: [{ text: "This is a long response that was cut off..." }],
                 },
-                finishReason: 'MAX_TOKENS',
+                finishReason: "MAX_TOKENS",
               },
             ],
           },
@@ -400,36 +367,32 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Generate long text' }];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Generate long text" }];
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
       expect(events).toEqual([
         {
           type: GeminiEventType.Content,
-          value: 'This is a long response that was cut off...',
+          value: "This is a long response that was cut off...",
         },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'MAX_TOKENS', usageMetadata: undefined },
+          value: { reason: "MAX_TOKENS", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should yield finished event for SAFETY finish reason', async () => {
+    it("should yield finished event for SAFETY finish reason", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Content blocked' }] },
-                finishReason: 'SAFETY',
+                content: { parts: [{ text: "Content blocked" }] },
+                finishReason: "SAFETY",
               },
             ],
           },
@@ -438,25 +401,21 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test safety' }];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Test safety" }];
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Content blocked' },
+        { type: GeminiEventType.Content, value: "Content blocked" },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'SAFETY', usageMetadata: undefined },
+          value: { reason: "SAFETY", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should yield finished event with undefined reason when there is no finish reason', async () => {
+    it("should yield finished event with undefined reason when there is no finish reason", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -464,7 +423,7 @@ describe('Turn', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: 'Response without finish reason' }],
+                  parts: [{ text: "Response without finish reason" }],
                 },
                 // No finishReason property
               },
@@ -475,31 +434,27 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test no finish reason' }];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Test no finish reason" }];
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
       expect(events).toEqual([
         {
           type: GeminiEventType.Content,
-          value: 'Response without finish reason',
+          value: "Response without finish reason",
         },
       ]);
     });
 
-    it('should handle multiple responses with different finish reasons', async () => {
+    it("should handle multiple responses with different finish reasons", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'First part' }] },
+                content: { parts: [{ text: "First part" }] },
                 // No finish reason on first response
               },
             ],
@@ -510,8 +465,8 @@ describe('Turn', () => {
             type: StreamEventType.CHUNK,
             candidates: [
               {
-                content: { parts: [{ text: 'Second part' }] },
-                finishReason: 'OTHER',
+                content: { parts: [{ text: "Second part" }] },
+                finishReason: "OTHER",
               },
             ],
           },
@@ -520,42 +475,38 @@ describe('Turn', () => {
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test multiple responses' }];
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Test multiple responses" }];
+      for await (const event of turn.run("test-model", reqParts, new AbortController().signal)) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'First part' },
-        { type: GeminiEventType.Content, value: 'Second part' },
+        { type: GeminiEventType.Content, value: "First part" },
+        { type: GeminiEventType.Content, value: "Second part" },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'OTHER', usageMetadata: undefined },
+          value: { reason: "OTHER", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should yield citation and finished events when response has citationMetadata', async () => {
+    it("should yield citation and finished events when response has citationMetadata", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Source 1 Title',
+                      uri: "https://example.com/source1",
+                      title: "Source 1 Title",
                     },
                   ],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           },
@@ -565,47 +516,47 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'Test citations' }],
+        "test-model",
+        [{ text: "Test citations" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
+        { type: GeminiEventType.Content, value: "Some text." },
         {
           type: GeminiEventType.Citation,
-          value: 'Citations:\n(Source 1 Title) https://example.com/source1',
+          value: "Citations:\n(Source 1 Title) https://example.com/source1",
         },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'STOP', usageMetadata: undefined },
+          value: { reason: "STOP", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should yield a single citation event for multiple citations in one response', async () => {
+    it("should yield a single citation event for multiple citations in one response", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source2',
-                      title: 'Title2',
+                      uri: "https://example.com/source2",
+                      title: "Title2",
                     },
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Title1',
+                      uri: "https://example.com/source1",
+                      title: "Title1",
                     },
                   ],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           },
@@ -615,40 +566,40 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'test' }],
+        "test-model",
+        [{ text: "test" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
+        { type: GeminiEventType.Content, value: "Some text." },
         {
           type: GeminiEventType.Citation,
           value:
-            'Citations:\n(Title1) https://example.com/source1\n(Title2) https://example.com/source2',
+            "Citations:\n(Title1) https://example.com/source1\n(Title2) https://example.com/source2",
         },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'STOP', usageMetadata: undefined },
+          value: { reason: "STOP", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should not yield citation event if there is no finish reason', async () => {
+    it("should not yield citation event if there is no finish reason", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Source 1 Title',
+                      uri: "https://example.com/source1",
+                      title: "Source 1 Title",
                     },
                   ],
                 },
@@ -662,43 +613,39 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'test' }],
+        "test-model",
+        [{ text: "test" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
-      expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
-      ]);
+      expect(events).toEqual([{ type: GeminiEventType.Content, value: "Some text." }]);
       // No Citation event (but we do get a Finished event with undefined reason)
-      expect(events.some((e) => e.type === GeminiEventType.Citation)).toBe(
-        false,
-      );
+      expect(events.some((e) => e.type === GeminiEventType.Citation)).toBe(false);
     });
 
-    it('should ignore citations without a URI', async () => {
+    it("should ignore citations without a URI", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
             candidates: [
               {
-                content: { parts: [{ text: 'Some text.' }] },
+                content: { parts: [{ text: "Some text." }] },
                 citationMetadata: {
                   citations: [
                     {
-                      uri: 'https://example.com/source1',
-                      title: 'Good Source',
+                      uri: "https://example.com/source1",
+                      title: "Good Source",
                     },
                     {
                       // uri is undefined
-                      title: 'Bad Source',
+                      title: "Bad Source",
                     },
                   ],
                 },
-                finishReason: 'STOP',
+                finishReason: "STOP",
               },
             ],
           },
@@ -708,27 +655,27 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'test' }],
+        "test-model",
+        [{ text: "test" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Some text.' },
+        { type: GeminiEventType.Content, value: "Some text." },
         {
           type: GeminiEventType.Citation,
-          value: 'Citations:\n(Good Source) https://example.com/source1',
+          value: "Citations:\n(Good Source) https://example.com/source1",
         },
         {
           type: GeminiEventType.Finished,
-          value: { reason: 'STOP', usageMetadata: undefined },
+          value: { reason: "STOP", usageMetadata: undefined },
         },
       ]);
     });
 
-    it('should not crash when cancelled request has malformed error', async () => {
+    it("should not crash when cancelled request has malformed error", async () => {
       const abortController = new AbortController();
 
       const errorToThrow = {
@@ -743,13 +690,9 @@ describe('Turn', () => {
       });
 
       const events = [];
-      const reqParts: Part[] = [{ text: 'Test malformed error handling' }];
+      const reqParts: Part[] = [{ text: "Test malformed error handling" }];
 
-      for await (const event of turn.run(
-        'test-model',
-        reqParts,
-        abortController.signal,
-      )) {
+      for await (const event of turn.run("test-model", reqParts, abortController.signal)) {
         events.push(event);
       }
 
@@ -758,40 +701,36 @@ describe('Turn', () => {
       expect(reportError).not.toHaveBeenCalled();
     });
 
-    it('should yield a Retry event when it receives one from the chat stream', async () => {
+    it("should yield a Retry event when it receives one from the chat stream", async () => {
       const mockResponseStream = (async function* () {
         yield { type: StreamEventType.RETRY };
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: 'Success' }] } }],
+            candidates: [{ content: { parts: [{ text: "Success" }] } }],
           },
         };
       })();
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
 
       const events = [];
-      for await (const event of turn.run(
-        'test-model',
-        [],
-        new AbortController().signal,
-      )) {
+      for await (const event of turn.run("test-model", [], new AbortController().signal)) {
         events.push(event);
       }
 
       expect(events).toEqual([
         { type: GeminiEventType.Retry },
-        { type: GeminiEventType.Content, value: 'Success' },
+        { type: GeminiEventType.Content, value: "Success" },
       ]);
     });
 
-    it('should yield content events with traceId', async () => {
+    it("should yield content events with traceId", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
           value: {
-            candidates: [{ content: { parts: [{ text: 'Hello' }] } }],
-            responseId: 'trace-123',
+            candidates: [{ content: { parts: [{ text: "Hello" }] } }],
+            responseId: "trace-123",
           } as GenerateContentResponse,
         };
       })();
@@ -799,19 +738,19 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'Hi' }],
+        "test-model",
+        [{ text: "Hi" }],
         new AbortController().signal,
       )) {
         events.push(event);
       }
 
       expect(events).toEqual([
-        { type: GeminiEventType.Content, value: 'Hello', traceId: 'trace-123' },
+        { type: GeminiEventType.Content, value: "Hello", traceId: "trace-123" },
       ]);
     });
 
-    it('should yield thought events with traceId', async () => {
+    it("should yield thought events with traceId", async () => {
       const mockResponseStream = (async function* () {
         yield {
           type: StreamEventType.CHUNK,
@@ -819,11 +758,11 @@ describe('Turn', () => {
             candidates: [
               {
                 content: {
-                  parts: [{ text: '[Thought: thinking]', thought: 'thinking' }],
+                  parts: [{ text: "[Thought: thinking]", thought: "thinking" }],
                 },
               },
             ],
-            responseId: 'trace-456',
+            responseId: "trace-456",
           } as unknown as GenerateContentResponse,
         };
       })();
@@ -831,8 +770,8 @@ describe('Turn', () => {
 
       const events = [];
       for await (const event of turn.run(
-        'test-model',
-        [{ text: 'Hi' }],
+        "test-model",
+        [{ text: "Hi" }],
         new AbortController().signal,
       )) {
         events.push(event);
@@ -841,32 +780,28 @@ describe('Turn', () => {
       expect(events).toEqual([
         {
           type: GeminiEventType.Thought,
-          value: { subject: '', description: '[Thought: thinking]' },
-          traceId: 'trace-456',
+          value: { subject: "", description: "[Thought: thinking]" },
+          traceId: "trace-456",
         },
       ]);
     });
   });
 
-  describe('getDebugResponses', () => {
-    it('should return collected debug responses', async () => {
+  describe("getDebugResponses", () => {
+    it("should return collected debug responses", async () => {
       const resp1 = {
-        candidates: [{ content: { parts: [{ text: 'Debug 1' }] } }],
+        candidates: [{ content: { parts: [{ text: "Debug 1" }] } }],
       } as unknown as GenerateContentResponse;
       const resp2 = {
-        functionCalls: [{ name: 'debugTool' }],
+        functionCalls: [{ name: "debugTool" }],
       } as unknown as GenerateContentResponse;
       const mockResponseStream = (async function* () {
         yield { type: StreamEventType.CHUNK, value: resp1 };
         yield { type: StreamEventType.CHUNK, value: resp2 };
       })();
       mockSendMessageStream.mockResolvedValue(mockResponseStream);
-      const reqParts: Part[] = [{ text: 'Hi' }];
-      for await (const _ of turn.run(
-        'test-model',
-        reqParts,
-        new AbortController().signal,
-      )) {
+      const reqParts: Part[] = [{ text: "Hi" }];
+      for await (const _ of turn.run("test-model", reqParts, new AbortController().signal)) {
         // consume stream
       }
       expect(turn.getDebugResponses()).toEqual([resp1, resp2]);
diff --git a/packages/gemini-core/src/core/turn.ts b/packages/gemini-core/src/core/turn.ts
index 681a7e9be..0cc46fd0d 100644
--- a/packages/gemini-core/src/core/turn.ts
+++ b/packages/gemini-core/src/core/turn.ts
@@ -5,41 +5,30 @@
  */
 
 import type {
-  Part,
-  PartListUnion,
-  GenerateContentResponse,
+  FinishReason,
   FunctionCall,
   FunctionDeclaration,
-  FinishReason,
+  GenerateContentResponse,
   GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import type {
-  ToolCallConfirmationDetails,
-  ToolResult,
-  ToolResultDisplay,
-} from '../tools/tools.js';
-import type { ToolErrorType } from '../tools/tool-error.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { reportError } from '../utils/errorReporting.js';
-import {
-  getErrorMessage,
-  UnauthorizedError,
-  toFriendlyError,
-} from '../utils/errors.js';
-import type { GeminiChat } from './geminiChat.js';
-import { InvalidStreamError } from './geminiChat.js';
-import { parseThought, type ThoughtSummary } from '../utils/thoughtUtils.js';
-import { createUserContent } from '@google/genai';
+  Part,
+  PartListUnion,
+} from "@google/genai";
+import { createUserContent } from "@google/genai";
+import type { ToolErrorType } from "../tools/tool-error.js";
+import type { ToolCallConfirmationDetails, ToolResult, ToolResultDisplay } from "../tools/tools.js";
+import { reportError } from "../utils/errorReporting.js";
+import { getErrorMessage, toFriendlyError, UnauthorizedError } from "../utils/errors.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { parseThought, type ThoughtSummary } from "../utils/thoughtUtils.js";
+import type { GeminiChat } from "./geminiChat.js";
+import { InvalidStreamError } from "./geminiChat.js";
 
 // Define a structure for tools passed to the server
 export interface ServerTool {
   name: string;
   schema: FunctionDeclaration;
   // The execute method signature might differ slightly or be wrapped
-  execute(
-    params: Record<string, unknown>,
-    signal?: AbortSignal,
-  ): Promise<ToolResult>;
+  execute(params: Record<string, unknown>, signal?: AbortSignal): Promise<ToolResult>;
   shouldConfirmExecute(
     params: Record<string, unknown>,
     abortSignal: AbortSignal,
@@ -47,21 +36,21 @@ export interface ServerTool {
 }
 
 export enum GeminiEventType {
-  Content = 'content',
-  ToolCallRequest = 'tool_call_request',
-  ToolCallResponse = 'tool_call_response',
-  ToolCallConfirmation = 'tool_call_confirmation',
-  UserCancelled = 'user_cancelled',
-  Error = 'error',
-  ChatCompressed = 'chat_compressed',
-  Thought = 'thought',
-  MaxSessionTurns = 'max_session_turns',
-  Finished = 'finished',
-  LoopDetected = 'loop_detected',
-  Citation = 'citation',
-  Retry = 'retry',
-  ContextWindowWillOverflow = 'context_window_will_overflow',
-  InvalidStream = 'invalid_stream',
+  Content = "content",
+  ToolCallRequest = "tool_call_request",
+  ToolCallResponse = "tool_call_response",
+  ToolCallConfirmation = "tool_call_confirmation",
+  UserCancelled = "user_cancelled",
+  Error = "error",
+  ChatCompressed = "chat_compressed",
+  Thought = "thought",
+  MaxSessionTurns = "max_session_turns",
+  Finished = "finished",
+  LoopDetected = "loop_detected",
+  Citation = "citation",
+  Retry = "retry",
+  ContextWindowWillOverflow = "context_window_will_overflow",
+  InvalidStream = "invalid_stream",
 }
 
 export type ServerGeminiRetryEvent = {
@@ -252,7 +241,7 @@ export class Turn {
         }
 
         // Handle the new RETRY event
-        if (streamEvent.type === 'retry') {
+        if (streamEvent.type === "retry") {
           yield { type: GeminiEventType.Retry };
           continue; // Skip to the next event in the stream
         }
@@ -267,7 +256,7 @@ export class Turn {
 
         const thoughtPart = resp.candidates?.[0]?.content?.parts?.[0];
         if (thoughtPart?.thought) {
-          const thought = parseThought(thoughtPart.text ?? '');
+          const thought = parseThought(thoughtPart.text ?? "");
           yield {
             type: GeminiEventType.Thought,
             value: thought,
@@ -302,7 +291,7 @@ export class Turn {
           if (this.pendingCitations.size > 0) {
             yield {
               type: GeminiEventType.Citation,
-              value: `Citations:\n${[...this.pendingCitations].sort().join('\n')}`,
+              value: `Citations:\n${[...this.pendingCitations].sort().join("\n")}`,
             };
             this.pendingCitations.clear();
           }
@@ -334,21 +323,18 @@ export class Turn {
         throw error;
       }
 
-      const contextForReport = [
-        ...this.chat.getHistory(/*curated*/ true),
-        createUserContent(req),
-      ];
+      const contextForReport = [...this.chat.getHistory(/*curated*/ true), createUserContent(req)];
       await reportError(
         error,
-        'Error when talking to Gemini API',
+        "Error when talking to Gemini API",
         contextForReport,
-        'Turn.run-sendMessageStream',
+        "Turn.run-sendMessageStream",
       );
       const status =
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'status' in error &&
-        typeof (error as { status: unknown }).status === 'number'
+        "status" in error &&
+        typeof (error as { status: unknown }).status === "number"
           ? (error as { status: number }).status
           : undefined;
       const structuredError: StructuredError = {
@@ -361,13 +347,10 @@ export class Turn {
     }
   }
 
-  private handlePendingFunctionCall(
-    fnCall: FunctionCall,
-  ): ServerGeminiStreamEvent | null {
+  private handlePendingFunctionCall(fnCall: FunctionCall): ServerGeminiStreamEvent | null {
     const callId =
-      fnCall.id ??
-      `${fnCall.name}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
-    const name = fnCall.name || 'undefined_tool_name';
+      fnCall.id ?? `${fnCall.name}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+    const name = fnCall.name || "undefined_tool_name";
     const args = (fnCall.args || {}) as Record<string, unknown>;
 
     const toolCallRequest: ToolCallRequestInfo = {
diff --git a/packages/gemini-core/src/fallback/handler.test.ts b/packages/gemini-core/src/fallback/handler.test.ts
index 133ac7f3f..11e1c00a3 100644
--- a/packages/gemini-core/src/fallback/handler.test.ts
+++ b/packages/gemini-core/src/fallback/handler.test.ts
@@ -5,27 +5,24 @@
  */
 
 import {
+  afterEach,
+  beforeEach,
   describe,
-  it,
   expect,
-  vi,
-  beforeEach,
+  it,
   type Mock,
   type MockInstance,
-  afterEach,
-} from 'vitest';
-import { handleFallback } from './handler.js';
-import type { Config } from '../config/config.js';
-import { AuthType } from '../core/contentGenerator.js';
-import {
-  DEFAULT_GEMINI_FLASH_MODEL,
-  DEFAULT_GEMINI_MODEL,
-} from '../config/models.js';
-import { logFlashFallback } from '../telemetry/index.js';
-import type { FallbackModelHandler } from './types.js';
+  vi,
+} from "vitest";
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { logFlashFallback } from "../telemetry/index.js";
+import { handleFallback } from "./handler.js";
+import type { FallbackModelHandler } from "./types.js";
 
 // Mock the telemetry logger and event class
-vi.mock('../telemetry/index.js', () => ({
+vi.mock("../telemetry/index.js", () => ({
   logFlashFallback: vi.fn(),
   FlashFallbackEvent: class {},
 }));
@@ -44,7 +41,7 @@ const createMockConfig = (overrides: Partial<Config> = {}): Config =>
     ...overrides,
   }) as unknown as Config;
 
-describe('handleFallback', () => {
+describe("handleFallback", () => {
   let mockConfig: Config;
   let mockHandler: Mock<FallbackModelHandler>;
   let consoleErrorSpy: MockInstance;
@@ -56,26 +53,22 @@ describe('handleFallback', () => {
     mockConfig = createMockConfig({
       fallbackModelHandler: mockHandler,
     });
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
   });
 
   afterEach(() => {
     consoleErrorSpy.mockRestore();
   });
 
-  it('should return null immediately if authType is not OAuth', async () => {
-    const result = await handleFallback(
-      mockConfig,
-      MOCK_PRO_MODEL,
-      AUTH_API_KEY,
-    );
+  it("should return null immediately if authType is not OAuth", async () => {
+    const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_API_KEY);
     expect(result).toBeNull();
     expect(mockHandler).not.toHaveBeenCalled();
     expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
   });
 
-  it('should still consult the handler if the failed model is the fallback model', async () => {
-    mockHandler.mockResolvedValue('stop');
+  it("should still consult the handler if the failed model is the fallback model", async () => {
+    mockHandler.mockResolvedValue("stop");
     const result = await handleFallback(
       mockConfig,
       FALLBACK_MODEL, // Failed model is Flash
@@ -85,27 +78,19 @@ describe('handleFallback', () => {
     expect(mockHandler).toHaveBeenCalled();
   });
 
-  it('should return null if no fallbackHandler is injected in config', async () => {
+  it("should return null if no fallbackHandler is injected in config", async () => {
     const configWithoutHandler = createMockConfig({
       fallbackModelHandler: undefined,
     });
-    const result = await handleFallback(
-      configWithoutHandler,
-      MOCK_PRO_MODEL,
-      AUTH_OAUTH,
-    );
+    const result = await handleFallback(configWithoutHandler, MOCK_PRO_MODEL, AUTH_OAUTH);
     expect(result).toBeNull();
   });
 
   describe('when handler returns "retry"', () => {
-    it('should activate fallback mode, log telemetry, and return true', async () => {
-      mockHandler.mockResolvedValue('retry');
+    it("should activate fallback mode, log telemetry, and return true", async () => {
+      mockHandler.mockResolvedValue("retry");
 
-      const result = await handleFallback(
-        mockConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBe(true);
       expect(mockConfig.setFallbackMode).toHaveBeenCalledWith(true);
@@ -114,14 +99,10 @@ describe('handleFallback', () => {
   });
 
   describe('when handler returns "stop"', () => {
-    it('should activate fallback mode, log telemetry, and return false', async () => {
-      mockHandler.mockResolvedValue('stop');
+    it("should activate fallback mode, log telemetry, and return false", async () => {
+      mockHandler.mockResolvedValue("stop");
 
-      const result = await handleFallback(
-        mockConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBe(false);
       expect(mockConfig.setFallbackMode).toHaveBeenCalledWith(true);
@@ -129,41 +110,31 @@ describe('handleFallback', () => {
     });
   });
 
-  describe('when handler returns an unexpected value', () => {
-    it('should log an error and return null', async () => {
+  describe("when handler returns an unexpected value", () => {
+    it("should log an error and return null", async () => {
       mockHandler.mockResolvedValue(null);
 
-      const result = await handleFallback(
-        mockConfig,
-        MOCK_PRO_MODEL,
-        AUTH_OAUTH,
-      );
+      const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
       expect(result).toBeNull();
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'Fallback UI handler failed:',
-        new Error(
-          'Unexpected fallback intent received from fallbackModelHandler: "null"',
-        ),
+        "Fallback UI handler failed:",
+        new Error('Unexpected fallback intent received from fallbackModelHandler: "null"'),
       );
       expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
     });
   });
 
-  it('should pass the correct context (failedModel, fallbackModel, error) to the handler', async () => {
-    const mockError = new Error('Quota Exceeded');
-    mockHandler.mockResolvedValue('retry');
+  it("should pass the correct context (failedModel, fallbackModel, error) to the handler", async () => {
+    const mockError = new Error("Quota Exceeded");
+    mockHandler.mockResolvedValue("retry");
 
     await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH, mockError);
 
-    expect(mockHandler).toHaveBeenCalledWith(
-      MOCK_PRO_MODEL,
-      FALLBACK_MODEL,
-      mockError,
-    );
+    expect(mockHandler).toHaveBeenCalledWith(MOCK_PRO_MODEL, FALLBACK_MODEL, mockError);
   });
 
-  it('should not call setFallbackMode or log telemetry if already in fallback mode', async () => {
+  it("should not call setFallbackMode or log telemetry if already in fallback mode", async () => {
     // Setup config where fallback mode is already active
     const activeFallbackConfig = createMockConfig({
       fallbackModelHandler: mockHandler,
@@ -171,13 +142,9 @@ describe('handleFallback', () => {
       setFallbackMode: vi.fn(),
     });
 
-    mockHandler.mockResolvedValue('retry');
+    mockHandler.mockResolvedValue("retry");
 
-    const result = await handleFallback(
-      activeFallbackConfig,
-      MOCK_PRO_MODEL,
-      AUTH_OAUTH,
-    );
+    const result = await handleFallback(activeFallbackConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
     // Should still return true to allow the retry (which will use the active fallback mode)
     expect(result).toBe(true);
@@ -188,17 +155,14 @@ describe('handleFallback', () => {
     expect(logFlashFallback).not.toHaveBeenCalled();
   });
 
-  it('should catch errors from the handler, log an error, and return null', async () => {
-    const handlerError = new Error('UI interaction failed');
+  it("should catch errors from the handler, log an error, and return null", async () => {
+    const handlerError = new Error("UI interaction failed");
     mockHandler.mockRejectedValue(handlerError);
 
     const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
 
     expect(result).toBeNull();
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Fallback UI handler failed:',
-      handlerError,
-    );
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Fallback UI handler failed:", handlerError);
     expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
   });
 });
diff --git a/packages/gemini-core/src/fallback/handler.ts b/packages/gemini-core/src/fallback/handler.ts
index 77bff0779..e88bcb28c 100644
--- a/packages/gemini-core/src/fallback/handler.ts
+++ b/packages/gemini-core/src/fallback/handler.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { AuthType } from '../core/contentGenerator.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { logFlashFallback, FlashFallbackEvent } from '../telemetry/index.js';
-import { coreEvents } from '../utils/events.js';
+import type { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { FlashFallbackEvent, logFlashFallback } from "../telemetry/index.js";
+import { coreEvents } from "../utils/events.js";
 
 export async function handleFallback(
   config: Config,
@@ -23,28 +23,24 @@ export async function handleFallback(
 
   // Consult UI Handler for Intent
   const fallbackModelHandler = config.fallbackModelHandler;
-  if (typeof fallbackModelHandler !== 'function') return null;
+  if (typeof fallbackModelHandler !== "function") return null;
 
   try {
     // Pass the specific failed model to the UI handler.
-    const intent = await fallbackModelHandler(
-      failedModel,
-      fallbackModel,
-      error,
-    );
+    const intent = await fallbackModelHandler(failedModel, fallbackModel, error);
 
     // Process Intent and Update State
     switch (intent) {
-      case 'retry':
+      case "retry":
         // Activate fallback mode. The NEXT retry attempt will pick this up.
         activateFallbackMode(config, authType);
         return true; // Signal retryWithBackoff to continue.
 
-      case 'stop':
+      case "stop":
         activateFallbackMode(config, authType);
         return false;
 
-      case 'retry_later':
+      case "retry_later":
         return false;
 
       default:
@@ -53,7 +49,7 @@ export async function handleFallback(
         );
     }
   } catch (handlerError) {
-    console.error('Fallback UI handler failed:', handlerError);
+    console.error("Fallback UI handler failed:", handlerError);
     return null;
   }
 }
diff --git a/packages/gemini-core/src/fallback/types.ts b/packages/gemini-core/src/fallback/types.ts
index 53e964624..cc06a5572 100644
--- a/packages/gemini-core/src/fallback/types.ts
+++ b/packages/gemini-core/src/fallback/types.ts
@@ -8,9 +8,9 @@
  * Defines the intent returned by the UI layer during a fallback scenario.
  */
 export type FallbackIntent =
-  | 'retry' // Immediately retry the current request with the fallback model.
-  | 'stop' // Switch to fallback for future requests, but stop the current request.
-  | 'retry_later'; // Stop the current request and do not fallback. Intend to try again later with the same model.
+  | "retry" // Immediately retry the current request with the fallback model.
+  | "stop" // Switch to fallback for future requests, but stop the current request.
+  | "retry_later"; // Stop the current request and do not fallback. Intend to try again later with the same model.
 
 /**
  * The interface for the handler provided by the UI layer (e.g., the CLI)
diff --git a/packages/gemini-core/src/hooks/hookAggregator.test.ts b/packages/gemini-core/src/hooks/hookAggregator.test.ts
index ea675464f..bf5af16d8 100644
--- a/packages/gemini-core/src/hooks/hookAggregator.test.ts
+++ b/packages/gemini-core/src/hooks/hookAggregator.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { HookAggregator } from './hookAggregator.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { HookAggregator } from "./hookAggregator.js";
 import type {
-  HookExecutionResult,
-  BeforeToolSelectionOutput,
   BeforeModelOutput,
+  BeforeToolSelectionOutput,
+  HookExecutionResult,
   HookOutput,
-} from './types.js';
-import { HookType, HookEventName } from './types.js';
+} from "./types.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Helper function to create proper HookExecutionResult objects
 function createHookExecutionResult(
@@ -28,28 +28,25 @@ function createHookExecutionResult(
     error,
     hookConfig: {
       type: HookType.Command,
-      command: 'test-command',
+      command: "test-command",
       timeout: 30000,
     },
     eventName: HookEventName.BeforeTool,
   };
 }
 
-describe('HookAggregator', () => {
+describe("HookAggregator", () => {
   let aggregator: HookAggregator;
 
   beforeEach(() => {
     aggregator = new HookAggregator();
   });
 
-  describe('aggregateResults', () => {
-    it('should handle empty results', () => {
+  describe("aggregateResults", () => {
+    it("should handle empty results", () => {
       const results: HookExecutionResult[] = [];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
       expect(aggregated.allOutputs).toHaveLength(0);
@@ -58,169 +55,145 @@ describe('HookAggregator', () => {
       expect(aggregated.finalOutput).toBeUndefined();
     });
 
-    it('should aggregate successful results', () => {
+    it("should aggregate successful results", () => {
       const results: HookExecutionResult[] = [
-        createHookExecutionResult(
-          { decision: 'allow', reason: 'Hook 1 approved' },
-          true,
-          100,
-        ),
-        createHookExecutionResult(
-          { decision: 'allow', reason: 'Hook 2 approved' },
-          true,
-          150,
-        ),
+        createHookExecutionResult({ decision: "allow", reason: "Hook 1 approved" }, true, 100),
+        createHookExecutionResult({ decision: "allow", reason: "Hook 2 approved" }, true, 150),
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
       expect(aggregated.allOutputs).toHaveLength(2);
       expect(aggregated.errors).toHaveLength(0);
       expect(aggregated.totalDuration).toBe(250);
-      expect(aggregated.finalOutput?.decision).toBe('allow');
-      expect(aggregated.finalOutput?.reason).toBe(
-        'Hook 1 approved\nHook 2 approved',
-      );
+      expect(aggregated.finalOutput?.decision).toBe("allow");
+      expect(aggregated.finalOutput?.reason).toBe("Hook 1 approved\nHook 2 approved");
     });
 
-    it('should handle errors in results', () => {
+    it("should handle errors in results", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: false,
-          error: new Error('Hook failed'),
+          error: new Error("Hook failed"),
           duration: 50,
         },
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'allow' },
+          output: { decision: "allow" },
           duration: 100,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(false);
       expect(aggregated.allOutputs).toHaveLength(1);
       expect(aggregated.errors).toHaveLength(1);
-      expect(aggregated.errors[0].message).toBe('Hook failed');
+      expect(aggregated.errors[0].message).toBe("Hook failed");
       expect(aggregated.totalDuration).toBe(150);
     });
 
-    it('should handle blocking decisions with OR logic', () => {
+    it("should handle blocking decisions with OR logic", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'allow', reason: 'Hook 1 allowed' },
+          output: { decision: "allow", reason: "Hook 1 allowed" },
           duration: 100,
         },
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'block', reason: 'Hook 2 blocked' },
+          output: { decision: "block", reason: "Hook 2 blocked" },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
-      expect(aggregated.finalOutput?.decision).toBe('block');
-      expect(aggregated.finalOutput?.reason).toBe(
-        'Hook 1 allowed\nHook 2 blocked',
-      );
+      expect(aggregated.finalOutput?.decision).toBe("block");
+      expect(aggregated.finalOutput?.reason).toBe("Hook 1 allowed\nHook 2 blocked");
     });
 
-    it('should handle continue=false with precedence', () => {
+    it("should handle continue=false with precedence", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
-          output: { decision: 'allow', continue: true },
+          output: { decision: "allow", continue: true },
           duration: 100,
         },
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeTool,
           success: true,
           output: {
-            decision: 'allow',
+            decision: "allow",
             continue: false,
-            stopReason: 'Stop requested',
+            stopReason: "Stop requested",
           },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeTool);
 
       expect(aggregated.success).toBe(true);
       expect(aggregated.finalOutput?.continue).toBe(false);
-      expect(aggregated.finalOutput?.stopReason).toBe('Stop requested');
+      expect(aggregated.finalOutput?.stopReason).toBe("Stop requested");
     });
   });
 
-  describe('BeforeToolSelection merge strategy', () => {
-    it('should merge tool configurations with NONE mode precedence', () => {
+  describe("BeforeToolSelection merge strategy", () => {
+    it("should merge tool configurations with NONE mode precedence", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'ANY',
-                allowedFunctionNames: ['tool1', 'tool2'],
+                mode: "ANY",
+                allowedFunctionNames: ["tool1", "tool2"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -229,16 +202,16 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'NONE',
+                mode: "NONE",
                 allowedFunctionNames: [],
               },
             },
@@ -247,34 +220,31 @@ describe('HookAggregator', () => {
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeToolSelection,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeToolSelection);
 
       expect(aggregated.success).toBe(true);
       const output = aggregated.finalOutput as BeforeToolSelectionOutput;
       const toolConfig = output.hookSpecificOutput?.toolConfig;
-      expect(toolConfig?.mode).toBe('NONE');
+      expect(toolConfig?.mode).toBe("NONE");
       expect(toolConfig?.allowedFunctionNames).toEqual([]);
     });
 
-    it('should merge tool configurations with ANY mode', () => {
+    it("should merge tool configurations with ANY mode", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'AUTO',
-                allowedFunctionNames: ['tool1'],
+                mode: "AUTO",
+                allowedFunctionNames: ["tool1"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -283,17 +253,17 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'ANY',
-                allowedFunctionNames: ['tool2', 'tool3'],
+                mode: "ANY",
+                allowedFunctionNames: ["tool2", "tool3"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -301,38 +271,31 @@ describe('HookAggregator', () => {
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeToolSelection,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeToolSelection);
 
       expect(aggregated.success).toBe(true);
       const output = aggregated.finalOutput as BeforeToolSelectionOutput;
       const toolConfig = output.hookSpecificOutput?.toolConfig;
-      expect(toolConfig?.mode).toBe('ANY');
-      expect(toolConfig?.allowedFunctionNames).toEqual([
-        'tool1',
-        'tool2',
-        'tool3',
-      ]);
+      expect(toolConfig?.mode).toBe("ANY");
+      expect(toolConfig?.allowedFunctionNames).toEqual(["tool1", "tool2", "tool3"]);
     });
 
-    it('should merge tool configurations with AUTO mode when all are AUTO', () => {
+    it("should merge tool configurations with AUTO mode when all are AUTO", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'AUTO',
-                allowedFunctionNames: ['tool1'],
+                mode: "AUTO",
+                allowedFunctionNames: ["tool1"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -341,17 +304,17 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeToolSelection,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'BeforeToolSelection',
+              hookEventName: "BeforeToolSelection",
               toolConfig: {
-                mode: 'AUTO',
-                allowedFunctionNames: ['tool2'],
+                mode: "AUTO",
+                allowedFunctionNames: ["tool2"],
               },
             },
           } as BeforeToolSelectionOutput,
@@ -359,35 +322,32 @@ describe('HookAggregator', () => {
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeToolSelection,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeToolSelection);
 
       expect(aggregated.success).toBe(true);
       const output = aggregated.finalOutput as BeforeToolSelectionOutput;
       const toolConfig = output.hookSpecificOutput?.toolConfig;
-      expect(toolConfig?.mode).toBe('AUTO');
-      expect(toolConfig?.allowedFunctionNames).toEqual(['tool1', 'tool2']);
+      expect(toolConfig?.mode).toBe("AUTO");
+      expect(toolConfig?.allowedFunctionNames).toEqual(["tool1", "tool2"]);
     });
   });
 
-  describe('BeforeModel/AfterModel merge strategy', () => {
-    it('should use field replacement strategy', () => {
+  describe("BeforeModel/AfterModel merge strategy", () => {
+    it("should use field replacement strategy", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeModel,
           success: true,
           output: {
-            decision: 'allow',
+            decision: "allow",
             hookSpecificOutput: {
-              hookEventName: 'BeforeModel',
-              llm_request: { model: 'model1', config: {}, contents: [] },
+              hookEventName: "BeforeModel",
+              llm_request: { model: "model1", config: {}, contents: [] },
             },
           },
           duration: 100,
@@ -395,50 +355,47 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.BeforeModel,
           success: true,
           output: {
-            decision: 'block',
+            decision: "block",
             hookSpecificOutput: {
-              hookEventName: 'BeforeModel',
-              llm_request: { model: 'model2', config: {}, contents: [] },
+              hookEventName: "BeforeModel",
+              llm_request: { model: "model2", config: {}, contents: [] },
             },
           },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.BeforeModel,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.BeforeModel);
 
       expect(aggregated.success).toBe(true);
-      expect(aggregated.finalOutput?.decision).toBe('block'); // Later value wins
+      expect(aggregated.finalOutput?.decision).toBe("block"); // Later value wins
       const output = aggregated.finalOutput as BeforeModelOutput;
       const llmRequest = output.hookSpecificOutput?.llm_request;
-      expect(llmRequest?.['model']).toBe('model2'); // Later value wins
+      expect(llmRequest?.["model"]).toBe("model2"); // Later value wins
     });
   });
 
-  describe('extractAdditionalContext', () => {
-    it('should extract additional context from hook outputs', () => {
+  describe("extractAdditionalContext", () => {
+    it("should extract additional context from hook outputs", () => {
       const results: HookExecutionResult[] = [
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.AfterTool,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'AfterTool',
-              additionalContext: 'Context from hook 1',
+              hookEventName: "AfterTool",
+              additionalContext: "Context from hook 1",
             },
           },
           duration: 100,
@@ -446,30 +403,27 @@ describe('HookAggregator', () => {
         {
           hookConfig: {
             type: HookType.Command,
-            command: 'test-command',
+            command: "test-command",
             timeout: 30000,
           },
           eventName: HookEventName.AfterTool,
           success: true,
           output: {
             hookSpecificOutput: {
-              hookEventName: 'AfterTool',
-              additionalContext: 'Context from hook 2',
+              hookEventName: "AfterTool",
+              additionalContext: "Context from hook 2",
             },
           },
           duration: 150,
         },
       ];
 
-      const aggregated = aggregator.aggregateResults(
-        results,
-        HookEventName.AfterTool,
-      );
+      const aggregated = aggregator.aggregateResults(results, HookEventName.AfterTool);
 
       expect(aggregated.success).toBe(true);
-      expect(
-        aggregated.finalOutput?.hookSpecificOutput?.['additionalContext'],
-      ).toBe('Context from hook 1\nContext from hook 2');
+      expect(aggregated.finalOutput?.hookSpecificOutput?.["additionalContext"]).toBe(
+        "Context from hook 1\nContext from hook 2",
+      );
     });
   });
 });
diff --git a/packages/gemini-core/src/hooks/hookAggregator.ts b/packages/gemini-core/src/hooks/hookAggregator.ts
index 16176d7cf..25019bd04 100644
--- a/packages/gemini-core/src/hooks/hookAggregator.ts
+++ b/packages/gemini-core/src/hooks/hookAggregator.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { FunctionCallingConfigMode } from '@google/genai';
-import type {
-  HookOutput,
-  HookExecutionResult,
-  BeforeToolSelectionOutput,
-} from './types.js';
+import { FunctionCallingConfigMode } from "@google/genai";
+import type { BeforeToolSelectionOutput, HookExecutionResult, HookOutput } from "./types.js";
 import {
-  DefaultHookOutput,
-  BeforeToolHookOutput,
+  AfterModelHookOutput,
   BeforeModelHookOutput,
+  BeforeToolHookOutput,
   BeforeToolSelectionHookOutput,
-  AfterModelHookOutput,
-} from './types.js';
-import { HookEventName } from './types.js';
+  DefaultHookOutput,
+  HookEventName,
+} from "./types.js";
 
 /**
  * Aggregated hook result
@@ -37,10 +33,7 @@ export class HookAggregator {
   /**
    * Aggregate results from multiple hook executions
    */
-  aggregateResults(
-    results: HookExecutionResult[],
-    eventName: HookEventName,
-  ): AggregatedHookResult {
+  aggregateResults(results: HookExecutionResult[], eventName: HookEventName): AggregatedHookResult {
     const allOutputs: HookOutput[] = [];
     const errors: Error[] = [];
     let totalDuration = 0;
@@ -79,10 +72,7 @@ export class HookAggregator {
    * Note: We always use the merge logic even for single hooks to ensure
    * consistent default behaviors (e.g., default decision='allow' for OR logic)
    */
-  private mergeOutputs(
-    outputs: HookOutput[],
-    eventName: HookEventName,
-  ): HookOutput | undefined {
+  private mergeOutputs(outputs: HookOutput[], eventName: HookEventName): HookOutput | undefined {
     if (outputs.length === 0) {
       return undefined;
     }
@@ -100,9 +90,7 @@ export class HookAggregator {
         return this.mergeWithFieldReplacement(outputs);
 
       case HookEventName.BeforeToolSelection:
-        return this.mergeToolSelectionOutputs(
-          outputs as BeforeToolSelectionOutput[],
-        );
+        return this.mergeToolSelectionOutputs(outputs as BeforeToolSelectionOutput[]);
 
       default:
         // For other events, use simple merge
@@ -164,27 +152,27 @@ export class HookAggregator {
 
     // Set final decision if no blocking decision was found
     if (!hasBlockDecision && !hasContinueFalse) {
-      merged.decision = 'allow';
+      merged.decision = "allow";
     }
 
     // Merge messages
     if (messages.length > 0) {
-      merged.stopReason = messages.join('\n');
+      merged.stopReason = messages.join("\n");
     }
 
     if (reasons.length > 0) {
-      merged.reason = reasons.join('\n');
+      merged.reason = reasons.join("\n");
     }
 
     if (systemMessages.length > 0) {
-      merged.systemMessage = systemMessages.join('\n');
+      merged.systemMessage = systemMessages.join("\n");
     }
 
     // Add merged additional context
     if (additionalContexts.length > 0) {
       merged.hookSpecificOutput = {
         ...(merged.hookSpecificOutput || {}),
-        additionalContext: additionalContexts.join('\n'),
+        additionalContext: additionalContexts.join("\n"),
       };
     }
 
@@ -241,9 +229,9 @@ export class HookAggregator {
       }
 
       // Check mode (using simplified HookToolConfig format)
-      if (toolConfig.mode === 'NONE') {
+      if (toolConfig.mode === "NONE") {
         hasNoneMode = true;
-      } else if (toolConfig.mode === 'ANY') {
+      } else if (toolConfig.mode === "ANY") {
         hasAnyMode = true;
       }
 
@@ -276,7 +264,7 @@ export class HookAggregator {
     }
 
     merged.hookSpecificOutput = {
-      hookEventName: 'BeforeToolSelection',
+      hookEventName: "BeforeToolSelection",
       toolConfig: {
         mode: finalMode,
         allowedFunctionNames: finalFunctionNames,
@@ -323,21 +311,15 @@ export class HookAggregator {
   /**
    * Extract additional context from hook-specific outputs
    */
-  private extractAdditionalContext(
-    output: HookOutput,
-    contexts: string[],
-  ): void {
+  private extractAdditionalContext(output: HookOutput, contexts: string[]): void {
     const specific = output.hookSpecificOutput;
     if (!specific) {
       return;
     }
 
     // Extract additionalContext from various hook types
-    if (
-      'additionalContext' in specific &&
-      typeof specific['additionalContext'] === 'string'
-    ) {
-      contexts.push(specific['additionalContext']);
+    if ("additionalContext" in specific && typeof specific["additionalContext"] === "string") {
+      contexts.push(specific["additionalContext"]);
     }
   }
 }
diff --git a/packages/gemini-core/src/hooks/hookPlanner.test.ts b/packages/gemini-core/src/hooks/hookPlanner.test.ts
index c408266ec..7901efa6a 100644
--- a/packages/gemini-core/src/hooks/hookPlanner.test.ts
+++ b/packages/gemini-core/src/hooks/hookPlanner.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { HookPlanner } from './hookPlanner.js';
-import type { HookRegistry, HookRegistryEntry } from './hookRegistry.js';
-import { HookEventName, HookType } from './types.js';
-import { ConfigSource } from './hookRegistry.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { HookPlanner } from "./hookPlanner.js";
+import type { HookRegistry, HookRegistryEntry } from "./hookRegistry.js";
+import { ConfigSource } from "./hookRegistry.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Mock debugLogger using vi.hoisted
 const mockDebugLogger = vi.hoisted(() => ({
@@ -18,11 +18,11 @@ const mockDebugLogger = vi.hoisted(() => ({
   debug: vi.fn(),
 }));
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: mockDebugLogger,
 }));
 
-describe('HookPlanner', () => {
+describe("HookPlanner", () => {
   let hookPlanner: HookPlanner;
   let mockHookRegistry: HookRegistry;
 
@@ -36,8 +36,8 @@ describe('HookPlanner', () => {
     hookPlanner = new HookPlanner(mockHookRegistry);
   });
 
-  describe('createExecutionPlan', () => {
-    it('should return empty plan when no hooks registered', () => {
+  describe("createExecutionPlan", () => {
+    it("should return empty plan when no hooks registered", () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue([]);
 
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool);
@@ -45,10 +45,10 @@ describe('HookPlanner', () => {
       expect(plan).toBeNull();
     });
 
-    it('should create plan for hooks without matchers', () => {
+    it("should create plan for hooks without matchers", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './hook1.sh' },
+          config: { type: HookType.Command, command: "./hook1.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
           enabled: true,
@@ -56,7 +56,7 @@ describe('HookPlanner', () => {
         {
           config: {
             type: HookType.Command,
-            command: './test-hook.sh',
+            command: "./test-hook.sh",
           },
           source: ConfigSource.User,
           eventName: HookEventName.BeforeTool,
@@ -70,21 +70,21 @@ describe('HookPlanner', () => {
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(2);
-      expect(plan!.hookConfigs[0].command).toBe('./hook1.sh');
-      expect(plan!.hookConfigs[1].command).toBe('./test-hook.sh');
+      expect(plan!.hookConfigs[0].command).toBe("./hook1.sh");
+      expect(plan!.hookConfigs[1].command).toBe("./test-hook.sh");
     });
 
-    it('should filter hooks by tool name matcher', () => {
+    it("should filter hooks by tool name matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './edit_hook.sh' },
+          config: { type: HookType.Command, command: "./edit_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: 'EditTool',
+          matcher: "EditTool",
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './general_hook.sh' },
+          config: { type: HookType.Command, command: "./general_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
           enabled: true,
@@ -95,27 +95,27 @@ describe('HookPlanner', () => {
 
       // Test with EditTool context
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: 'EditTool',
+        toolName: "EditTool",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(2); // Both should match (one specific, one general)
     });
 
-    it('should filter hooks by regex matcher', () => {
+    it("should filter hooks by regex matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './edit_hook.sh' },
+          config: { type: HookType.Command, command: "./edit_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: 'Edit|Write',
+          matcher: "Edit|Write",
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './read_hook.sh' },
+          config: { type: HookType.Command, command: "./read_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: 'ReadTool',
+          matcher: "ReadTool",
           enabled: true,
         },
       ];
@@ -123,47 +123,43 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       // Test with EditTool - should match first hook
-      const editPlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'EditTool' },
-      );
+      const editPlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "EditTool",
+      });
       expect(editPlan).not.toBeNull();
       expect(editPlan!.hookConfigs).toHaveLength(1);
-      expect(editPlan!.hookConfigs[0].command).toBe('./edit_hook.sh');
+      expect(editPlan!.hookConfigs[0].command).toBe("./edit_hook.sh");
 
       // Test with WriteTool - should match first hook
-      const writePlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'WriteTool' },
-      );
+      const writePlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "WriteTool",
+      });
       expect(writePlan).not.toBeNull();
       expect(writePlan!.hookConfigs).toHaveLength(1);
-      expect(writePlan!.hookConfigs[0].command).toBe('./edit_hook.sh');
+      expect(writePlan!.hookConfigs[0].command).toBe("./edit_hook.sh");
 
       // Test with ReadTool - should match second hook
-      const readPlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'ReadTool' },
-      );
+      const readPlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "ReadTool",
+      });
       expect(readPlan).not.toBeNull();
       expect(readPlan!.hookConfigs).toHaveLength(1);
-      expect(readPlan!.hookConfigs[0].command).toBe('./read_hook.sh');
+      expect(readPlan!.hookConfigs[0].command).toBe("./read_hook.sh");
 
       // Test with unmatched tool - should match no hooks
-      const otherPlan = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        { toolName: 'OtherTool' },
-      );
+      const otherPlan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "OtherTool",
+      });
       expect(otherPlan).toBeNull();
     });
 
-    it('should handle wildcard matcher', () => {
+    it("should handle wildcard matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './wildcard_hook.sh' },
+          config: { type: HookType.Command, command: "./wildcard_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: '*',
+          matcher: "*",
           enabled: true,
         },
       ];
@@ -171,23 +167,23 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: 'AnyTool',
+        toolName: "AnyTool",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(1);
     });
 
-    it('should handle empty string matcher', () => {
+    it("should handle empty string matcher", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
           config: {
             type: HookType.Command,
-            command: './empty_matcher_hook.sh',
+            command: "./empty_matcher_hook.sh",
           },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: '',
+          matcher: "",
           enabled: true,
         },
       ];
@@ -195,23 +191,23 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: 'AnyTool',
+        toolName: "AnyTool",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(1);
     });
 
-    it('should handle invalid regex matcher gracefully', () => {
+    it("should handle invalid regex matcher gracefully", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
           config: {
             type: HookType.Command,
-            command: './invalid_regex_hook.sh',
+            command: "./invalid_regex_hook.sh",
           },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
-          matcher: '[invalid-regex',
+          matcher: "[invalid-regex",
           enabled: true,
         },
       ];
@@ -220,33 +216,30 @@ describe('HookPlanner', () => {
 
       // Should match when toolName exactly equals the invalid regex pattern
       const plan = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
-        toolName: '[invalid-regex',
+        toolName: "[invalid-regex",
       });
 
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(1); // Should fall back to exact match
 
       // Should not match when toolName doesn't exactly equal the pattern
-      const planNoMatch = hookPlanner.createExecutionPlan(
-        HookEventName.BeforeTool,
-        {
-          toolName: 'other-tool',
-        },
-      );
+      const planNoMatch = hookPlanner.createExecutionPlan(HookEventName.BeforeTool, {
+        toolName: "other-tool",
+      });
 
       expect(planNoMatch).toBeNull();
     });
 
-    it('should deduplicate identical hooks', () => {
+    it("should deduplicate identical hooks", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './same_hook.sh' },
+          config: { type: HookType.Command, command: "./same_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './same_hook.sh' },
+          config: { type: HookType.Command, command: "./same_hook.sh" },
           source: ConfigSource.User,
           eventName: HookEventName.BeforeTool,
           enabled: true,
@@ -254,7 +247,7 @@ describe('HookPlanner', () => {
         {
           config: {
             type: HookType.Command,
-            command: './test-hook.sh',
+            command: "./test-hook.sh",
           },
           source: ConfigSource.Project,
           eventName: HookEventName.BeforeTool,
@@ -263,7 +256,7 @@ describe('HookPlanner', () => {
         {
           config: {
             type: HookType.Command,
-            command: './test-hook.sh',
+            command: "./test-hook.sh",
           },
           source: ConfigSource.User,
           eventName: HookEventName.BeforeTool,
@@ -278,24 +271,24 @@ describe('HookPlanner', () => {
       expect(plan).not.toBeNull();
       expect(plan!.hookConfigs).toHaveLength(2); // Should be deduplicated to 2 unique hooks
       expect(mockDebugLogger.debug).toHaveBeenCalledWith(
-        expect.stringContaining('Deduplicated hook'),
+        expect.stringContaining("Deduplicated hook"),
       );
     });
 
-    it('should match trigger for session events', () => {
+    it("should match trigger for session events", () => {
       const mockEntries: HookRegistryEntry[] = [
         {
-          config: { type: HookType.Command, command: './startup_hook.sh' },
+          config: { type: HookType.Command, command: "./startup_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.SessionStart,
-          matcher: 'startup',
+          matcher: "startup",
           enabled: true,
         },
         {
-          config: { type: HookType.Command, command: './resume_hook.sh' },
+          config: { type: HookType.Command, command: "./resume_hook.sh" },
           source: ConfigSource.Project,
           eventName: HookEventName.SessionStart,
-          matcher: 'resume',
+          matcher: "resume",
           enabled: true,
         },
       ];
@@ -303,22 +296,20 @@ describe('HookPlanner', () => {
       vi.mocked(mockHookRegistry.getHooksForEvent).mockReturnValue(mockEntries);
 
       // Test startup trigger
-      const startupPlan = hookPlanner.createExecutionPlan(
-        HookEventName.SessionStart,
-        { trigger: 'startup' },
-      );
+      const startupPlan = hookPlanner.createExecutionPlan(HookEventName.SessionStart, {
+        trigger: "startup",
+      });
       expect(startupPlan).not.toBeNull();
       expect(startupPlan!.hookConfigs).toHaveLength(1);
-      expect(startupPlan!.hookConfigs[0].command).toBe('./startup_hook.sh');
+      expect(startupPlan!.hookConfigs[0].command).toBe("./startup_hook.sh");
 
       // Test resume trigger
-      const resumePlan = hookPlanner.createExecutionPlan(
-        HookEventName.SessionStart,
-        { trigger: 'resume' },
-      );
+      const resumePlan = hookPlanner.createExecutionPlan(HookEventName.SessionStart, {
+        trigger: "resume",
+      });
       expect(resumePlan).not.toBeNull();
       expect(resumePlan!.hookConfigs).toHaveLength(1);
-      expect(resumePlan!.hookConfigs[0].command).toBe('./resume_hook.sh');
+      expect(resumePlan!.hookConfigs[0].command).toBe("./resume_hook.sh");
     });
   });
 });
diff --git a/packages/gemini-core/src/hooks/hookPlanner.ts b/packages/gemini-core/src/hooks/hookPlanner.ts
index 4a0f00a8e..ed7e4eb85 100644
--- a/packages/gemini-core/src/hooks/hookPlanner.ts
+++ b/packages/gemini-core/src/hooks/hookPlanner.ts
@@ -4,10 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HookRegistry, HookRegistryEntry } from './hookRegistry.js';
-import type { HookExecutionPlan } from './types.js';
-import type { HookEventName } from './types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { debugLogger } from "../utils/debugLogger.js";
+import type { HookRegistry, HookRegistryEntry } from "./hookRegistry.js";
+import type { HookEventName, HookExecutionPlan } from "./types.js";
 
 /**
  * Hook planner that selects matching hooks and creates execution plans
@@ -33,9 +32,7 @@ export class HookPlanner {
     }
 
     // Filter hooks by matcher
-    const matchingEntries = hookEntries.filter((entry) =>
-      this.matchesContext(entry, context),
-    );
+    const matchingEntries = hookEntries.filter((entry) => this.matchesContext(entry, context));
 
     if (matchingEntries.length === 0) {
       return null;
@@ -48,9 +45,7 @@ export class HookPlanner {
     const hookConfigs = deduplicatedEntries.map((entry) => entry.config);
 
     // Determine execution strategy - if ANY hook definition has sequential=true, run all sequentially
-    const sequential = deduplicatedEntries.some(
-      (entry) => entry.sequential === true,
-    );
+    const sequential = deduplicatedEntries.some((entry) => entry.sequential === true);
 
     const plan: HookExecutionPlan = {
       eventName,
@@ -59,7 +54,7 @@ export class HookPlanner {
     };
 
     debugLogger.debug(
-      `Created execution plan for ${eventName}: ${hookConfigs.length} hook(s) to execute ${sequential ? 'sequentially' : 'in parallel'}`,
+      `Created execution plan for ${eventName}: ${hookConfigs.length} hook(s) to execute ${sequential ? "sequentially" : "in parallel"}`,
     );
 
     return plan;
@@ -68,17 +63,14 @@ export class HookPlanner {
   /**
    * Check if a hook entry matches the given context
    */
-  private matchesContext(
-    entry: HookRegistryEntry,
-    context?: HookEventContext,
-  ): boolean {
+  private matchesContext(entry: HookRegistryEntry, context?: HookEventContext): boolean {
     if (!entry.matcher || !context) {
       return true; // No matcher means match all
     }
 
     const matcher = entry.matcher.trim();
 
-    if (matcher === '' || matcher === '*') {
+    if (matcher === "" || matcher === "*") {
       return true; // Empty string or wildcard matches all
     }
 
diff --git a/packages/gemini-core/src/hooks/hookRegistry.test.ts b/packages/gemini-core/src/hooks/hookRegistry.test.ts
index 5c6906b83..8e3a4eade 100644
--- a/packages/gemini-core/src/hooks/hookRegistry.test.ts
+++ b/packages/gemini-core/src/hooks/hookRegistry.test.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs';
-import {
-  HookRegistry,
-  ConfigSource,
-  HookRegistryNotInitializedError,
-} from './hookRegistry.js';
-import type { Storage } from '../config/storage.js';
-import { HookEventName, HookType } from './types.js';
-import type { Config } from '../config/config.js';
-import type { HookDefinition } from './types.js';
+import * as fs from "node:fs";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { Storage } from "../config/storage.js";
+import { ConfigSource, HookRegistry, HookRegistryNotInitializedError } from "./hookRegistry.js";
+import type { HookDefinition } from "./types.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Mock fs
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   existsSync: vi.fn(),
   readFileSync: vi.fn(),
 }));
@@ -30,11 +26,11 @@ const mockDebugLogger = vi.hoisted(() => ({
   debug: vi.fn(),
 }));
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: mockDebugLogger,
 }));
 
-describe('HookRegistry', () => {
+describe("HookRegistry", () => {
   let hookRegistry: HookRegistry;
   let mockConfig: Config;
   let mockStorage: Storage;
@@ -43,7 +39,7 @@ describe('HookRegistry', () => {
     vi.resetAllMocks();
 
     mockStorage = {
-      getGeminiDir: vi.fn().mockReturnValue('/project/.gemini'),
+      getGeminiDir: vi.fn().mockReturnValue("/project/.gemini"),
     } as unknown as Storage;
 
     mockConfig = {
@@ -59,27 +55,27 @@ describe('HookRegistry', () => {
     vi.restoreAllMocks();
   });
 
-  describe('initialize', () => {
-    it('should initialize successfully with no hooks', async () => {
+  describe("initialize", () => {
+    it("should initialize successfully with no hooks", async () => {
       vi.mocked(fs.existsSync).mockReturnValue(false);
 
       await hookRegistry.initialize();
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.log).toHaveBeenCalledWith(
-        'Hook registry initialized with 0 hook entries',
+        "Hook registry initialized with 0 hook entries",
       );
     });
 
-    it('should load hooks from project configuration', async () => {
+    it("should load hooks from project configuration", async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
+            matcher: "EditTool",
             hooks: [
               {
-                type: 'command',
-                command: './hooks/check_style.sh',
+                type: "command",
+                command: "./hooks/check_style.sh",
                 timeout: 60,
               },
             ],
@@ -100,19 +96,19 @@ describe('HookRegistry', () => {
       expect(hooks).toHaveLength(1);
       expect(hooks[0].eventName).toBe(HookEventName.BeforeTool);
       expect(hooks[0].config.type).toBe(HookType.Command);
-      expect(hooks[0].config.command).toBe('./hooks/check_style.sh');
-      expect(hooks[0].matcher).toBe('EditTool');
+      expect(hooks[0].config.command).toBe("./hooks/check_style.sh");
+      expect(hooks[0].matcher).toBe("EditTool");
       expect(hooks[0].source).toBe(ConfigSource.Project);
     });
 
-    it('should load plugin hooks', async () => {
+    it("should load plugin hooks", async () => {
       const mockHooksConfig = {
         AfterTool: [
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/after-tool.sh',
+                type: "command",
+                command: "./hooks/after-tool.sh",
                 timeout: 30,
               },
             ],
@@ -133,17 +129,17 @@ describe('HookRegistry', () => {
       expect(hooks).toHaveLength(1);
       expect(hooks[0].eventName).toBe(HookEventName.AfterTool);
       expect(hooks[0].config.type).toBe(HookType.Command);
-      expect(hooks[0].config.command).toBe('./hooks/after-tool.sh');
+      expect(hooks[0].config.command).toBe("./hooks/after-tool.sh");
     });
 
-    it('should handle invalid configuration gracefully', async () => {
+    it("should handle invalid configuration gracefully", async () => {
       const invalidHooksConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'invalid-type', // Invalid hook type
-                command: './hooks/test.sh',
+                type: "invalid-type", // Invalid hook type
+                command: "./hooks/test.sh",
               },
             ],
           },
@@ -163,17 +159,17 @@ describe('HookRegistry', () => {
       expect(mockDebugLogger.warn).toHaveBeenCalled();
     });
 
-    it('should validate hook configurations', async () => {
+    it("should validate hook configurations", async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'invalid',
-                command: './hooks/test.sh',
+                type: "invalid",
+                command: "./hooks/test.sh",
               },
               {
-                type: 'command',
+                type: "command",
                 // Missing command field
               },
             ],
@@ -195,24 +191,24 @@ describe('HookRegistry', () => {
     });
   });
 
-  describe('getHooksForEvent', () => {
+  describe("getHooksForEvent", () => {
     beforeEach(async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
+            matcher: "EditTool",
             hooks: [
               {
-                type: 'command',
-                command: './hooks/edit_check.sh',
+                type: "command",
+                command: "./hooks/edit_check.sh",
               },
             ],
           },
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/general_check.sh',
+                type: "command",
+                command: "./hooks/general_check.sh",
               },
             ],
           },
@@ -221,8 +217,8 @@ describe('HookRegistry', () => {
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/after-tool.sh',
+                type: "command",
+                command: "./hooks/after-tool.sh",
               },
             ],
           },
@@ -239,26 +235,20 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
     });
 
-    it('should return hooks for specific event', () => {
-      const beforeToolHooks = hookRegistry.getHooksForEvent(
-        HookEventName.BeforeTool,
-      );
+    it("should return hooks for specific event", () => {
+      const beforeToolHooks = hookRegistry.getHooksForEvent(HookEventName.BeforeTool);
       expect(beforeToolHooks).toHaveLength(2);
 
-      const afterToolHooks = hookRegistry.getHooksForEvent(
-        HookEventName.AfterTool,
-      );
+      const afterToolHooks = hookRegistry.getHooksForEvent(HookEventName.AfterTool);
       expect(afterToolHooks).toHaveLength(1);
     });
 
-    it('should return empty array for events with no hooks', () => {
-      const notificationHooks = hookRegistry.getHooksForEvent(
-        HookEventName.Notification,
-      );
+    it("should return empty array for events with no hooks", () => {
+      const notificationHooks = hookRegistry.getHooksForEvent(HookEventName.Notification);
       expect(notificationHooks).toHaveLength(0);
     });
 
-    it('should throw error if not initialized', () => {
+    it("should throw error if not initialized", () => {
       const uninitializedRegistry = new HookRegistry(mockConfig);
 
       expect(() => {
@@ -267,15 +257,15 @@ describe('HookRegistry', () => {
     });
   });
 
-  describe('setHookEnabled', () => {
+  describe("setHookEnabled", () => {
     beforeEach(async () => {
       const mockHooksConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'command',
-                command: './hooks/test.sh',
+                type: "command",
+                command: "./hooks/test.sh",
               },
             ],
           },
@@ -292,8 +282,8 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
     });
 
-    it('should enable and disable hooks', () => {
-      const hookName = './hooks/test.sh';
+    it("should enable and disable hooks", () => {
+      const hookName = "./hooks/test.sh";
 
       // Initially enabled
       let hooks = hookRegistry.getHooksForEvent(HookEventName.BeforeTool);
@@ -310,18 +300,18 @@ describe('HookRegistry', () => {
       expect(hooks).toHaveLength(1);
     });
 
-    it('should warn when hook not found', () => {
-      hookRegistry.setHookEnabled('non-existent-hook', false);
+    it("should warn when hook not found", () => {
+      hookRegistry.setHookEnabled("non-existent-hook", false);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
         'No hooks found matching "non-existent-hook"',
       );
     });
   });
 
-  describe('malformed configuration handling', () => {
-    it('should handle non-array definitions gracefully', async () => {
+  describe("malformed configuration handling", () => {
+    it("should handle non-array definitions gracefully", async () => {
       const malformedConfig = {
-        BeforeTool: 'not-an-array', // Should be an array of HookDefinition
+        BeforeTool: "not-an-array", // Should be an array of HookDefinition
       };
 
       vi.mocked(mockConfig.getHooks).mockReturnValue(
@@ -333,12 +323,10 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
-      expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('is not an array'),
-      );
+      expect(mockDebugLogger.warn).toHaveBeenCalledWith(expect.stringContaining("is not an array"));
     });
 
-    it('should handle object instead of array for definitions', async () => {
+    it("should handle object instead of array for definitions", async () => {
       const malformedConfig = {
         AfterTool: { hooks: [] }, // Should be an array, not a single object
       };
@@ -352,12 +340,10 @@ describe('HookRegistry', () => {
       await hookRegistry.initialize();
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
-      expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('is not an array'),
-      );
+      expect(mockDebugLogger.warn).toHaveBeenCalledWith(expect.stringContaining("is not an array"));
     });
 
-    it('should handle null definition gracefully', async () => {
+    it("should handle null definition gracefully", async () => {
       const malformedConfig = {
         BeforeTool: [null], // Invalid: null definition
       };
@@ -372,16 +358,16 @@ describe('HookRegistry', () => {
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook definition'),
+        expect.stringContaining("Discarding invalid hook definition"),
         null,
       );
     });
 
-    it('should handle definition without hooks array', async () => {
+    it("should handle definition without hooks array", async () => {
       const malformedConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
+            matcher: "EditTool",
             // Missing hooks array
           },
         ],
@@ -397,17 +383,17 @@ describe('HookRegistry', () => {
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook definition'),
-        expect.objectContaining({ matcher: 'EditTool' }),
+        expect.stringContaining("Discarding invalid hook definition"),
+        expect.objectContaining({ matcher: "EditTool" }),
       );
     });
 
-    it('should handle non-array hooks property', async () => {
+    it("should handle non-array hooks property", async () => {
       const malformedConfig = {
         BeforeTool: [
           {
-            matcher: 'EditTool',
-            hooks: 'not-an-array', // Should be an array
+            matcher: "EditTool",
+            hooks: "not-an-array", // Should be an array
           },
         ],
       };
@@ -422,17 +408,17 @@ describe('HookRegistry', () => {
 
       expect(hookRegistry.getAllHooks()).toHaveLength(0);
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook definition'),
-        expect.objectContaining({ hooks: 'not-an-array', matcher: 'EditTool' }),
+        expect.stringContaining("Discarding invalid hook definition"),
+        expect.objectContaining({ hooks: "not-an-array", matcher: "EditTool" }),
       );
     });
 
-    it('should handle non-object hookConfig in hooks array', async () => {
+    it("should handle non-object hookConfig in hooks array", async () => {
       const malformedConfig = {
         BeforeTool: [
           {
             hooks: [
-              'not-an-object', // Should be an object
+              "not-an-object", // Should be an object
               42, // Should be an object
               null, // Should be an object
             ],
@@ -452,19 +438,19 @@ describe('HookRegistry', () => {
       expect(mockDebugLogger.warn).toHaveBeenCalledTimes(3); // One warning for each invalid hookConfig
     });
 
-    it('should handle mixed valid and invalid hook configurations', async () => {
+    it("should handle mixed valid and invalid hook configurations", async () => {
       const mixedConfig = {
         BeforeTool: [
           {
             hooks: [
               {
-                type: 'command',
-                command: './valid-hook.sh',
+                type: "command",
+                command: "./valid-hook.sh",
               },
-              'invalid-string',
+              "invalid-string",
               {
-                type: 'invalid-type',
-                command: './invalid-type.sh',
+                type: "invalid-type",
+                command: "./invalid-type.sh",
               },
             ],
           },
@@ -482,22 +468,22 @@ describe('HookRegistry', () => {
       // Should only load the valid hook
       const hooks = hookRegistry.getAllHooks();
       expect(hooks).toHaveLength(1);
-      expect(hooks[0].config.command).toBe('./valid-hook.sh');
+      expect(hooks[0].config.command).toBe("./valid-hook.sh");
 
       // Verify the warnings for invalid configurations
       // 1st warning: non-object hookConfig ('invalid-string')
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook configuration'),
-        'invalid-string',
+        expect.stringContaining("Discarding invalid hook configuration"),
+        "invalid-string",
       );
       // 2nd warning: validateHookConfig logs invalid type
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Invalid hook BeforeTool from project type'),
+        expect.stringContaining("Invalid hook BeforeTool from project type"),
       );
       // 3rd warning: processHookDefinition logs the failed hookConfig
       expect(mockDebugLogger.warn).toHaveBeenCalledWith(
-        expect.stringContaining('Discarding invalid hook configuration'),
-        expect.objectContaining({ type: 'invalid-type' }),
+        expect.stringContaining("Discarding invalid hook configuration"),
+        expect.objectContaining({ type: "invalid-type" }),
       );
     });
   });
diff --git a/packages/gemini-core/src/hooks/hookRegistry.ts b/packages/gemini-core/src/hooks/hookRegistry.ts
index 82fda3297..2172b76ae 100644
--- a/packages/gemini-core/src/hooks/hookRegistry.ts
+++ b/packages/gemini-core/src/hooks/hookRegistry.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { HookDefinition, HookConfig } from './types.js';
-import { HookEventName } from './types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { HookConfig, HookDefinition } from "./types.js";
+import { HookEventName } from "./types.js";
 
 /**
  * Error thrown when attempting to use HookRegistry before initialization
  */
 export class HookRegistryNotInitializedError extends Error {
-  constructor(message = 'Hook registry not initialized') {
+  constructor(message = "Hook registry not initialized") {
     super(message);
-    this.name = 'HookRegistryNotInitializedError';
+    this.name = "HookRegistryNotInitializedError";
   }
 }
 
@@ -23,10 +23,10 @@ export class HookRegistryNotInitializedError extends Error {
  * Configuration source levels in precedence order (highest to lowest)
  */
 export enum ConfigSource {
-  Project = 'project',
-  User = 'user',
-  System = 'system',
-  Extensions = 'extensions',
+  Project = "project",
+  User = "user",
+  System = "system",
+  Extensions = "extensions",
 }
 
 /**
@@ -65,9 +65,7 @@ export class HookRegistry {
     this.processHooksFromConfig();
     this.initialized = true;
 
-    debugLogger.log(
-      `Hook registry initialized with ${this.entries.length} hook entries`,
-    );
+    debugLogger.log(`Hook registry initialized with ${this.entries.length} hook entries`);
   }
 
   /**
@@ -80,10 +78,7 @@ export class HookRegistry {
 
     return this.entries
       .filter((entry) => entry.eventName === eventName && entry.enabled)
-      .sort(
-        (a, b) =>
-          this.getSourcePriority(a.source) - this.getSourcePriority(b.source),
-      );
+      .sort((a, b) => this.getSourcePriority(a.source) - this.getSourcePriority(b.source));
   }
 
   /**
@@ -112,7 +107,7 @@ export class HookRegistry {
 
     if (updated.length > 0) {
       debugLogger.log(
-        `${enabled ? 'Enabled' : 'Disabled'} ${updated.length} hook(s) matching "${hookName}"`,
+        `${enabled ? "Enabled" : "Disabled"} ${updated.length} hook(s) matching "${hookName}"`,
       );
     } else {
       debugLogger.warn(`No hooks found matching "${hookName}"`);
@@ -123,7 +118,7 @@ export class HookRegistry {
    * Get hook name for display purposes
    */
   private getHookName(entry: HookRegistryEntry): string {
-    return entry.config.command || 'unknown-command';
+    return entry.config.command || "unknown-command";
   }
 
   /**
@@ -140,10 +135,7 @@ export class HookRegistry {
     const extensions = this.config.getExtensions() || [];
     for (const extension of extensions) {
       if (extension.isActive && extension.hooks) {
-        this.processHooksConfiguration(
-          extension.hooks,
-          ConfigSource.Extensions,
-        );
+        this.processHooksConfiguration(extension.hooks, ConfigSource.Extensions);
       }
     }
   }
@@ -184,11 +176,7 @@ export class HookRegistry {
     eventName: HookEventName,
     source: ConfigSource,
   ): void {
-    if (
-      !definition ||
-      typeof definition !== 'object' ||
-      !Array.isArray(definition.hooks)
-    ) {
+    if (!definition || typeof definition !== "object" || !Array.isArray(definition.hooks)) {
       debugLogger.warn(
         `Discarding invalid hook definition for ${eventName} from ${source}:`,
         definition,
@@ -199,7 +187,7 @@ export class HookRegistry {
     for (const hookConfig of definition.hooks) {
       if (
         hookConfig &&
-        typeof hookConfig === 'object' &&
+        typeof hookConfig === "object" &&
         this.validateHookConfig(hookConfig, eventName, source)
       ) {
         this.entries.push({
@@ -228,17 +216,13 @@ export class HookRegistry {
     eventName: HookEventName,
     source: ConfigSource,
   ): boolean {
-    if (!config.type || !['command', 'plugin'].includes(config.type)) {
-      debugLogger.warn(
-        `Invalid hook ${eventName} from ${source} type: ${config.type}`,
-      );
+    if (!config.type || !["command", "plugin"].includes(config.type)) {
+      debugLogger.warn(`Invalid hook ${eventName} from ${source} type: ${config.type}`);
       return false;
     }
 
-    if (config.type === 'command' && !config.command) {
-      debugLogger.warn(
-        `Command hook ${eventName} from ${source} missing command field`,
-      );
+    if (config.type === "command" && !config.command) {
+      debugLogger.warn(`Command hook ${eventName} from ${source} missing command field`);
       return false;
     }
 
diff --git a/packages/gemini-core/src/hooks/hookRunner.test.ts b/packages/gemini-core/src/hooks/hookRunner.test.ts
index 0fad35311..ddcf214f6 100644
--- a/packages/gemini-core/src/hooks/hookRunner.test.ts
+++ b/packages/gemini-core/src/hooks/hookRunner.test.ts
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { spawn, type ChildProcessWithoutNullStreams } from 'node:child_process';
-import { HookRunner } from './hookRunner.js';
-import { HookEventName, HookType } from './types.js';
-import type { HookConfig } from './types.js';
-import type { HookInput } from './types.js';
-import type { Readable, Writable } from 'node:stream';
+import { type ChildProcessWithoutNullStreams, spawn } from "node:child_process";
+import type { Readable, Writable } from "node:stream";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { HookRunner } from "./hookRunner.js";
+import type { HookConfig, HookInput } from "./types.js";
+import { HookEventName, HookType } from "./types.js";
 
 // Mock type for the child_process spawn
 type MockChildProcessWithoutNullStreams = ChildProcessWithoutNullStreams & {
@@ -20,7 +19,7 @@ type MockChildProcessWithoutNullStreams = ChildProcessWithoutNullStreams & {
 };
 
 // Mock child_process with importOriginal for partial mocking
-vi.mock('node:child_process', async (importOriginal) => {
+vi.mock("node:child_process", async (importOriginal) => {
   const actual = (await importOriginal()) as object;
   return {
     ...actual,
@@ -36,18 +35,18 @@ const mockConsole = {
   debug: vi.fn(),
 };
 
-vi.stubGlobal('console', mockConsole);
+vi.stubGlobal("console", mockConsole);
 
-describe('HookRunner', () => {
+describe("HookRunner", () => {
   let hookRunner: HookRunner;
   let mockSpawn: MockChildProcessWithoutNullStreams;
 
   const mockInput: HookInput = {
-    session_id: 'test-session',
-    transcript_path: '/path/to/transcript',
-    cwd: '/test/project',
-    hook_event_name: 'BeforeTool',
-    timestamp: '2025-01-01T00:00:00.000Z',
+    session_id: "test-session",
+    transcript_path: "/path/to/transcript",
+    cwd: "/test/project",
+    hook_event_name: "BeforeTool",
+    timestamp: "2025-01-01T00:00:00.000Z",
   };
 
   beforeEach(() => {
@@ -86,32 +85,29 @@ describe('HookRunner', () => {
     vi.restoreAllMocks();
   });
 
-  describe('executeHook', () => {
-    describe('command hooks', () => {
+  describe("executeHook", () => {
+    describe("command hooks", () => {
       const commandConfig: HookConfig = {
         type: HookType.Command,
-        command: './hooks/test.sh',
+        command: "./hooks/test.sh",
         timeout: 5000,
       };
 
-      it('should execute command hook successfully', async () => {
-        const mockOutput = { decision: 'allow', reason: 'All good' };
+      it("should execute command hook successfully", async () => {
+        const mockOutput = { decision: "allow", reason: "All good" };
 
         // Mock successful execution
         mockSpawn.mockStdoutOn.mockImplementation(
           (event: string, callback: (data: Buffer) => void) => {
-            if (event === 'data') {
-              setTimeout(
-                () => callback(Buffer.from(JSON.stringify(mockOutput))),
-                10,
-              );
+            if (event === "data") {
+              setTimeout(() => callback(Buffer.from(JSON.stringify(mockOutput))), 10);
             }
           },
         );
 
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               setTimeout(() => callback(0), 20);
             }
           },
@@ -126,17 +122,15 @@ describe('HookRunner', () => {
         expect(result.success).toBe(true);
         expect(result.output).toEqual(mockOutput);
         expect(result.exitCode).toBe(0);
-        expect(mockSpawn.stdin.write).toHaveBeenCalledWith(
-          JSON.stringify(mockInput),
-        );
+        expect(mockSpawn.stdin.write).toHaveBeenCalledWith(JSON.stringify(mockInput));
       });
 
-      it('should handle command hook failure', async () => {
-        const errorMessage = 'Command failed';
+      it("should handle command hook failure", async () => {
+        const errorMessage = "Command failed";
 
         mockSpawn.mockStderrOn.mockImplementation(
           (event: string, callback: (data: Buffer) => void) => {
-            if (event === 'data') {
+            if (event === "data") {
               setTimeout(() => callback(Buffer.from(errorMessage)), 10);
             }
           },
@@ -144,7 +138,7 @@ describe('HookRunner', () => {
 
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               setTimeout(() => callback(1), 20);
             }
           },
@@ -161,10 +155,10 @@ describe('HookRunner', () => {
         expect(result.stderr).toBe(errorMessage);
       });
 
-      it('should handle command hook timeout', async () => {
+      it("should handle command hook timeout", async () => {
         const shortTimeoutConfig: HookConfig = {
           type: HookType.Command,
-          command: './hooks/slow.sh',
+          command: "./hooks/slow.sh",
           timeout: 50, // Very short timeout for testing
         };
 
@@ -174,7 +168,7 @@ describe('HookRunner', () => {
         // Mock a hanging process that registers the close handler but doesn't call it initially
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               closeCallback = callback; // Store the callback but don't call it yet
             }
           },
@@ -200,37 +194,33 @@ describe('HookRunner', () => {
 
         expect(result.success).toBe(false);
         expect(killWasCalled).toBe(true);
-        expect(result.error?.message).toContain('timed out');
-        expect(mockSpawn.kill).toHaveBeenCalledWith('SIGTERM');
+        expect(result.error?.message).toContain("timed out");
+        expect(mockSpawn.kill).toHaveBeenCalledWith("SIGTERM");
       });
 
-      it('should expand environment variables in commands', async () => {
+      it("should expand environment variables in commands", async () => {
         const configWithEnvVar: HookConfig = {
           type: HookType.Command,
-          command: '$GEMINI_PROJECT_DIR/hooks/test.sh',
+          command: "$GEMINI_PROJECT_DIR/hooks/test.sh",
         };
 
         mockSpawn.mockProcessOn.mockImplementation(
           (event: string, callback: (code: number) => void) => {
-            if (event === 'close') {
+            if (event === "close") {
               setTimeout(() => callback(0), 10);
             }
           },
         );
 
-        await hookRunner.executeHook(
-          configWithEnvVar,
-          HookEventName.BeforeTool,
-          mockInput,
-        );
+        await hookRunner.executeHook(configWithEnvVar, HookEventName.BeforeTool, mockInput);
 
         expect(spawn).toHaveBeenCalledWith(
-          '/test/project/hooks/test.sh',
+          "/test/project/hooks/test.sh",
           expect.objectContaining({
             shell: true,
             env: expect.objectContaining({
-              GEMINI_PROJECT_DIR: '/test/project',
-              CLAUDE_PROJECT_DIR: '/test/project',
+              GEMINI_PROJECT_DIR: "/test/project",
+              CLAUDE_PROJECT_DIR: "/test/project",
             }),
           }),
         );
@@ -238,17 +228,17 @@ describe('HookRunner', () => {
     });
   });
 
-  describe('executeHooksParallel', () => {
-    it('should execute multiple hooks in parallel', async () => {
+  describe("executeHooksParallel", () => {
+    it("should execute multiple hooks in parallel", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       // Mock both commands to succeed
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 10);
           }
         },
@@ -265,16 +255,16 @@ describe('HookRunner', () => {
       expect(spawn).toHaveBeenCalledTimes(2);
     });
 
-    it('should handle mixed success and failure', async () => {
+    it("should handle mixed success and failure", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       let callCount = 0;
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             const exitCode = callCount++ === 0 ? 0 : 1; // First succeeds, second fails
             setTimeout(() => callback(exitCode), 10);
           }
@@ -293,11 +283,11 @@ describe('HookRunner', () => {
     });
   });
 
-  describe('executeHooksSequential', () => {
-    it('should execute multiple hooks in sequence', async () => {
+  describe("executeHooksSequential", () => {
+    it("should execute multiple hooks in sequence", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       const executionOrder: string[] = [];
@@ -305,9 +295,8 @@ describe('HookRunner', () => {
       // Mock both commands to succeed
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
-            const command =
-              vi.mocked(spawn).mock.calls[executionOrder.length][0];
+          if (event === "close") {
+            const command = vi.mocked(spawn).mock.calls[executionOrder.length][0];
             executionOrder.push(command);
             setTimeout(() => callback(0), 10);
           }
@@ -324,29 +313,29 @@ describe('HookRunner', () => {
       expect(results.every((r) => r.success)).toBe(true);
       expect(spawn).toHaveBeenCalledTimes(2);
       // Verify they were called sequentially
-      expect(executionOrder).toEqual(['./hook1.sh', './hook2.sh']);
+      expect(executionOrder).toEqual(["./hook1.sh", "./hook2.sh"]);
     });
 
-    it('should continue execution even if a hook fails', async () => {
+    it("should continue execution even if a hook fails", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
-        { type: HookType.Command, command: './hook3.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
+        { type: HookType.Command, command: "./hook3.sh" },
       ];
 
       let callCount = 0;
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data' && callCount === 1) {
+          if (event === "data" && callCount === 1) {
             // Second hook fails
-            setTimeout(() => callback(Buffer.from('Hook 2 failed')), 10);
+            setTimeout(() => callback(Buffer.from("Hook 2 failed")), 10);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             const exitCode = callCount++ === 1 ? 1 : 0; // Second fails, others succeed
             setTimeout(() => callback(exitCode), 20);
           }
@@ -366,33 +355,30 @@ describe('HookRunner', () => {
       expect(spawn).toHaveBeenCalledTimes(3);
     });
 
-    it('should pass modified input from one hook to the next for BeforeAgent', async () => {
+    it("should pass modified input from one hook to the next for BeforeAgent", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       const mockBeforeAgentInput = {
         ...mockInput,
-        prompt: 'Original prompt',
+        prompt: "Original prompt",
       };
 
       const mockOutput1 = {
-        decision: 'allow' as const,
+        decision: "allow" as const,
         hookSpecificOutput: {
-          additionalContext: 'Context from hook 1',
+          additionalContext: "Context from hook 1",
         },
       };
 
       let hookCallCount = 0;
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             if (hookCallCount === 0) {
-              setTimeout(
-                () => callback(Buffer.from(JSON.stringify(mockOutput1))),
-                10,
-              );
+              setTimeout(() => callback(Buffer.from(JSON.stringify(mockOutput1))), 10);
             }
           }
         },
@@ -400,7 +386,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             hookCallCount++;
             setTimeout(() => callback(0), 20);
           }
@@ -418,29 +404,27 @@ describe('HookRunner', () => {
       expect(results[0].output).toEqual(mockOutput1);
 
       // Verify that the second hook received modified input
-      const secondHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[1][0],
-      );
-      expect(secondHookInput.prompt).toContain('Original prompt');
-      expect(secondHookInput.prompt).toContain('Context from hook 1');
+      const secondHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[1][0]);
+      expect(secondHookInput.prompt).toContain("Original prompt");
+      expect(secondHookInput.prompt).toContain("Context from hook 1");
     });
 
-    it('should pass modified LLM request from one hook to the next for BeforeModel', async () => {
+    it("should pass modified LLM request from one hook to the next for BeforeModel", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       const mockBeforeModelInput = {
         ...mockInput,
         llm_request: {
-          model: 'gemini-1.5-pro',
-          messages: [{ role: 'user', content: 'Hello' }],
+          model: "gemini-1.5-pro",
+          messages: [{ role: "user", content: "Hello" }],
         },
       };
 
       const mockOutput1 = {
-        decision: 'allow' as const,
+        decision: "allow" as const,
         hookSpecificOutput: {
           llm_request: {
             temperature: 0.7,
@@ -451,12 +435,9 @@ describe('HookRunner', () => {
       let hookCallCount = 0;
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             if (hookCallCount === 0) {
-              setTimeout(
-                () => callback(Buffer.from(JSON.stringify(mockOutput1))),
-                10,
-              );
+              setTimeout(() => callback(Buffer.from(JSON.stringify(mockOutput1))), 10);
             }
           }
         },
@@ -464,7 +445,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             hookCallCount++;
             setTimeout(() => callback(0), 20);
           }
@@ -481,30 +462,28 @@ describe('HookRunner', () => {
       expect(results[0].success).toBe(true);
 
       // Verify that the second hook received modified input
-      const secondHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[1][0],
-      );
-      expect(secondHookInput.llm_request.model).toBe('gemini-1.5-pro');
+      const secondHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[1][0]);
+      expect(secondHookInput.llm_request.model).toBe("gemini-1.5-pro");
       expect(secondHookInput.llm_request.temperature).toBe(0.7);
     });
 
-    it('should not modify input if hook fails', async () => {
+    it("should not modify input if hook fails", async () => {
       const configs: HookConfig[] = [
-        { type: HookType.Command, command: './hook1.sh' },
-        { type: HookType.Command, command: './hook2.sh' },
+        { type: HookType.Command, command: "./hook1.sh" },
+        { type: HookType.Command, command: "./hook2.sh" },
       ];
 
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
-            setTimeout(() => callback(Buffer.from('Hook failed')), 10);
+          if (event === "data") {
+            setTimeout(() => callback(Buffer.from("Hook failed")), 10);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(1), 20); // All hooks fail
           }
         },
@@ -520,28 +499,24 @@ describe('HookRunner', () => {
       expect(results.every((r) => !r.success)).toBe(true);
 
       // Verify that both hooks received the same original input
-      const firstHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[0][0],
-      );
-      const secondHookInput = JSON.parse(
-        vi.mocked(mockSpawn.stdin.write).mock.calls[1][0],
-      );
+      const firstHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[0][0]);
+      const secondHookInput = JSON.parse(vi.mocked(mockSpawn.stdin.write).mock.calls[1][0]);
       expect(firstHookInput).toEqual(secondHookInput);
     });
   });
 
-  describe('invalid JSON handling', () => {
+  describe("invalid JSON handling", () => {
     const commandConfig: HookConfig = {
       type: HookType.Command,
-      command: './hooks/test.sh',
+      command: "./hooks/test.sh",
     };
 
-    it('should handle invalid JSON output gracefully', async () => {
+    it("should handle invalid JSON output gracefully", async () => {
       const invalidJson = '{ "decision": "allow", incomplete';
 
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(invalidJson)), 10);
           }
         },
@@ -549,7 +524,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
@@ -565,17 +540,17 @@ describe('HookRunner', () => {
       expect(result.exitCode).toBe(0);
       // Should convert plain text to structured output
       expect(result.output).toEqual({
-        decision: 'allow',
+        decision: "allow",
         systemMessage: invalidJson,
       });
     });
 
-    it('should handle malformed JSON with exit code 0', async () => {
-      const malformedJson = 'not json at all';
+    it("should handle malformed JSON with exit code 0", async () => {
+      const malformedJson = "not json at all";
 
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(malformedJson)), 10);
           }
         },
@@ -583,7 +558,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
@@ -597,17 +572,17 @@ describe('HookRunner', () => {
 
       expect(result.success).toBe(true);
       expect(result.output).toEqual({
-        decision: 'allow',
+        decision: "allow",
         systemMessage: malformedJson,
       });
     });
 
-    it('should handle invalid JSON with exit code 1 (non-blocking error)', async () => {
-      const invalidJson = '{ broken json';
+    it("should handle invalid JSON with exit code 1 (non-blocking error)", async () => {
+      const invalidJson = "{ broken json";
 
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(invalidJson)), 10);
           }
         },
@@ -615,7 +590,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(1), 20);
           }
         },
@@ -630,17 +605,17 @@ describe('HookRunner', () => {
       expect(result.success).toBe(false);
       expect(result.exitCode).toBe(1);
       expect(result.output).toEqual({
-        decision: 'allow',
+        decision: "allow",
         systemMessage: `Warning: ${invalidJson}`,
       });
     });
 
-    it('should handle invalid JSON with exit code 2 (blocking error)', async () => {
+    it("should handle invalid JSON with exit code 2 (blocking error)", async () => {
       const invalidJson = '{ "error": incomplete';
 
       mockSpawn.mockStderrOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(invalidJson)), 10);
           }
         },
@@ -648,7 +623,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(2), 20);
           }
         },
@@ -663,23 +638,23 @@ describe('HookRunner', () => {
       expect(result.success).toBe(false);
       expect(result.exitCode).toBe(2);
       expect(result.output).toEqual({
-        decision: 'deny',
+        decision: "deny",
         reason: invalidJson,
       });
     });
 
-    it('should handle empty JSON output', async () => {
+    it("should handle empty JSON output", async () => {
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
-            setTimeout(() => callback(Buffer.from('')), 10);
+          if (event === "data") {
+            setTimeout(() => callback(Buffer.from("")), 10);
           }
         },
       );
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
@@ -696,13 +671,13 @@ describe('HookRunner', () => {
       expect(result.output).toBeUndefined();
     });
 
-    it('should handle double-encoded JSON string', async () => {
-      const mockOutput = { decision: 'allow', reason: 'All good' };
+    it("should handle double-encoded JSON string", async () => {
+      const mockOutput = { decision: "allow", reason: "All good" };
       const doubleEncodedJson = JSON.stringify(JSON.stringify(mockOutput));
 
       mockSpawn.mockStdoutOn.mockImplementation(
         (event: string, callback: (data: Buffer) => void) => {
-          if (event === 'data') {
+          if (event === "data") {
             setTimeout(() => callback(Buffer.from(doubleEncodedJson)), 10);
           }
         },
@@ -710,7 +685,7 @@ describe('HookRunner', () => {
 
       mockSpawn.mockProcessOn.mockImplementation(
         (event: string, callback: (code: number) => void) => {
-          if (event === 'close') {
+          if (event === "close") {
             setTimeout(() => callback(0), 20);
           }
         },
diff --git a/packages/gemini-core/src/hooks/hookRunner.ts b/packages/gemini-core/src/hooks/hookRunner.ts
index f394b7fd7..d3d657424 100644
--- a/packages/gemini-core/src/hooks/hookRunner.ts
+++ b/packages/gemini-core/src/hooks/hookRunner.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
-import type { HookConfig } from './types.js';
-import { HookEventName } from './types.js';
+import { spawn } from "node:child_process";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { LLMRequest } from "./hookTranslator.js";
 import type {
-  HookInput,
-  HookOutput,
-  HookExecutionResult,
   BeforeAgentInput,
   BeforeModelInput,
   BeforeModelOutput,
-} from './types.js';
-import type { LLMRequest } from './hookTranslator.js';
-import { debugLogger } from '../utils/debugLogger.js';
+  HookConfig,
+  HookExecutionResult,
+  HookInput,
+  HookOutput,
+} from "./types.js";
+import { HookEventName } from "./types.js";
 
 /**
  * Default timeout for hook execution (60 seconds)
@@ -47,15 +47,10 @@ export class HookRunner {
     const startTime = Date.now();
 
     try {
-      return await this.executeCommandHook(
-        hookConfig,
-        eventName,
-        input,
-        startTime,
-      );
+      return await this.executeCommandHook(hookConfig, eventName, input, startTime);
     } catch (error) {
       const duration = Date.now() - startTime;
-      const hookSource = hookConfig.command || 'unknown';
+      const hookSource = hookConfig.command || "unknown";
       const errorMessage = `Hook execution failed for event '${eventName}' (source: ${hookSource}): ${error}`;
       debugLogger.warn(`Hook execution error (non-fatal): ${errorMessage}`);
 
@@ -77,9 +72,7 @@ export class HookRunner {
     eventName: HookEventName,
     input: HookInput,
   ): Promise<HookExecutionResult[]> {
-    const promises = hookConfigs.map((config) =>
-      this.executeHook(config, eventName, input),
-    );
+    const promises = hookConfigs.map((config) => this.executeHook(config, eventName, input));
 
     return await Promise.all(promises);
   }
@@ -101,11 +94,7 @@ export class HookRunner {
 
       // If the hook succeeded and has output, use it to modify the input for the next hook
       if (result.success && result.output) {
-        currentInput = this.applyHookOutputToInput(
-          currentInput,
-          result.output,
-          eventName,
-        );
+        currentInput = this.applyHookOutputToInput(currentInput, result.output, eventName);
       }
     }
 
@@ -127,33 +116,26 @@ export class HookRunner {
     if (hookOutput.hookSpecificOutput) {
       switch (eventName) {
         case HookEventName.BeforeAgent:
-          if ('additionalContext' in hookOutput.hookSpecificOutput) {
+          if ("additionalContext" in hookOutput.hookSpecificOutput) {
             // For BeforeAgent, we could modify the prompt with additional context
-            const additionalContext =
-              hookOutput.hookSpecificOutput['additionalContext'];
-            if (
-              typeof additionalContext === 'string' &&
-              'prompt' in modifiedInput
-            ) {
-              (modifiedInput as BeforeAgentInput).prompt +=
-                '\n\n' + additionalContext;
+            const additionalContext = hookOutput.hookSpecificOutput["additionalContext"];
+            if (typeof additionalContext === "string" && "prompt" in modifiedInput) {
+              (modifiedInput as BeforeAgentInput).prompt += "\n\n" + additionalContext;
             }
           }
           break;
 
         case HookEventName.BeforeModel:
-          if ('llm_request' in hookOutput.hookSpecificOutput) {
+          if ("llm_request" in hookOutput.hookSpecificOutput) {
             // For BeforeModel, we update the LLM request
             const hookBeforeModelOutput = hookOutput as BeforeModelOutput;
             if (
               hookBeforeModelOutput.hookSpecificOutput?.llm_request &&
-              'llm_request' in modifiedInput
+              "llm_request" in modifiedInput
             ) {
               // Merge the partial request with the existing request
-              const currentRequest = (modifiedInput as BeforeModelInput)
-                .llm_request;
-              const partialRequest =
-                hookBeforeModelOutput.hookSpecificOutput.llm_request;
+              const currentRequest = (modifiedInput as BeforeModelInput).llm_request;
+              const partialRequest = hookBeforeModelOutput.hookSpecificOutput.llm_request;
               (modifiedInput as BeforeModelInput).llm_request = {
                 ...currentRequest,
                 ...partialRequest,
@@ -184,10 +166,8 @@ export class HookRunner {
 
     return new Promise((resolve) => {
       if (!hookConfig.command) {
-        const errorMessage = 'Command hook missing command';
-        debugLogger.warn(
-          `Hook configuration error (non-fatal): ${errorMessage}`,
-        );
+        const errorMessage = "Command hook missing command";
+        debugLogger.warn(`Hook configuration error (non-fatal): ${errorMessage}`);
         resolve({
           hookConfig,
           eventName,
@@ -198,8 +178,8 @@ export class HookRunner {
         return;
       }
 
-      let stdout = '';
-      let stderr = '';
+      let stdout = "";
+      let stderr = "";
       let timedOut = false;
       const command = this.expandCommand(hookConfig.command, input);
 
@@ -213,19 +193,19 @@ export class HookRunner {
       const child = spawn(command, {
         env,
         cwd: input.cwd,
-        stdio: ['pipe', 'pipe', 'pipe'],
+        stdio: ["pipe", "pipe", "pipe"],
         shell: true,
       });
 
       // Set up timeout
       const timeoutHandle = setTimeout(() => {
         timedOut = true;
-        child.kill('SIGTERM');
+        child.kill("SIGTERM");
 
         // Force kill after 5 seconds
         setTimeout(() => {
           if (!child.killed) {
-            child.kill('SIGKILL');
+            child.kill("SIGKILL");
           }
         }, 5000);
       }, timeout);
@@ -237,17 +217,17 @@ export class HookRunner {
       }
 
       // Collect stdout
-      child.stdout?.on('data', (data: Buffer) => {
+      child.stdout?.on("data", (data: Buffer) => {
         stdout += data.toString();
       });
 
       // Collect stderr
-      child.stderr?.on('data', (data: Buffer) => {
+      child.stderr?.on("data", (data: Buffer) => {
         stderr += data.toString();
       });
 
       // Handle process exit
-      child.on('close', (exitCode) => {
+      child.on("close", (exitCode) => {
         clearTimeout(timeoutHandle);
         const duration = Date.now() - startTime;
 
@@ -269,7 +249,7 @@ export class HookRunner {
         if (exitCode === EXIT_CODE_SUCCESS && stdout.trim()) {
           try {
             let parsed = JSON.parse(stdout.trim());
-            if (typeof parsed === 'string') {
+            if (typeof parsed === "string") {
               // If the output is a string, parse it in case
               // it's double-encoded JSON string.
               parsed = JSON.parse(parsed);
@@ -302,7 +282,7 @@ export class HookRunner {
       });
 
       // Handle process errors
-      child.on('error', (error) => {
+      child.on("error", (error) => {
         clearTimeout(timeoutHandle);
         const duration = Date.now() - startTime;
 
@@ -331,26 +311,23 @@ export class HookRunner {
   /**
    * Convert plain text output to structured HookOutput
    */
-  private convertPlainTextToHookOutput(
-    text: string,
-    exitCode: number,
-  ): HookOutput {
+  private convertPlainTextToHookOutput(text: string, exitCode: number): HookOutput {
     if (exitCode === EXIT_CODE_SUCCESS) {
       // Success - treat as system message or additional context
       return {
-        decision: 'allow',
+        decision: "allow",
         systemMessage: text,
       };
     } else if (exitCode === EXIT_CODE_BLOCKING_ERROR) {
       // Blocking error
       return {
-        decision: 'deny',
+        decision: "deny",
         reason: text,
       };
     } else {
       // Non-blocking error (EXIT_CODE_NON_BLOCKING_ERROR or any other code)
       return {
-        decision: 'allow',
+        decision: "allow",
         systemMessage: `Warning: ${text}`,
       };
     }
diff --git a/packages/gemini-core/src/hooks/hookTranslator.test.ts b/packages/gemini-core/src/hooks/hookTranslator.test.ts
index 785cadfc4..d68feff44 100644
--- a/packages/gemini-core/src/hooks/hookTranslator.test.ts
+++ b/packages/gemini-core/src/hooks/hookTranslator.test.ts
@@ -4,42 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import {
-  HookTranslatorGenAIv1,
-  defaultHookTranslator,
-  type LLMRequest,
-  type LLMResponse,
-  type HookToolConfig,
-} from './hookTranslator.js';
 import type {
+  ContentListUnion,
   GenerateContentParameters,
   GenerateContentResponse,
   ToolConfig,
-  ContentListUnion,
-} from '@google/genai';
+} from "@google/genai";
+import { beforeEach, describe, expect, it } from "vitest";
+import {
+  defaultHookTranslator,
+  type HookToolConfig,
+  HookTranslatorGenAIv1,
+  type LLMRequest,
+  type LLMResponse,
+} from "./hookTranslator.js";
 
-describe('HookTranslator', () => {
+describe("HookTranslator", () => {
   let translator: HookTranslatorGenAIv1;
 
   beforeEach(() => {
     translator = new HookTranslatorGenAIv1();
   });
 
-  describe('defaultHookTranslator', () => {
-    it('should be an instance of HookTranslatorGenAIv1', () => {
+  describe("defaultHookTranslator", () => {
+    it("should be an instance of HookTranslatorGenAIv1", () => {
       expect(defaultHookTranslator).toBeInstanceOf(HookTranslatorGenAIv1);
     });
   });
 
-  describe('LLM Request Translation', () => {
-    it('should convert SDK request to hook format', () => {
+  describe("LLM Request Translation", () => {
+    it("should convert SDK request to hook format", () => {
       const sdkRequest: GenerateContentParameters = {
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         contents: [
           {
-            role: 'user',
-            parts: [{ text: 'Hello world' }],
+            role: "user",
+            parts: [{ text: "Hello world" }],
           },
         ],
         config: {
@@ -51,11 +51,11 @@ describe('HookTranslator', () => {
       const hookRequest = translator.toHookLLMRequest(sdkRequest);
 
       expect(hookRequest).toEqual({
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         messages: [
           {
-            role: 'user',
-            content: 'Hello world',
+            role: "user",
+            content: "Hello world",
           },
         ],
         config: {
@@ -67,25 +67,25 @@ describe('HookTranslator', () => {
       });
     });
 
-    it('should handle string contents', () => {
+    it("should handle string contents", () => {
       const sdkRequest: GenerateContentParameters = {
-        model: 'gemini-1.5-flash',
-        contents: ['Simple string message'],
+        model: "gemini-1.5-flash",
+        contents: ["Simple string message"],
       } as unknown as GenerateContentParameters;
 
       const hookRequest = translator.toHookLLMRequest(sdkRequest);
 
       expect(hookRequest.messages).toEqual([
         {
-          role: 'user',
-          content: 'Simple string message',
+          role: "user",
+          content: "Simple string message",
         },
       ]);
     });
 
-    it('should handle conversion errors gracefully', () => {
+    it("should handle conversion errors gracefully", () => {
       const sdkRequest: GenerateContentParameters = {
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         contents: [null as unknown as ContentListUnion], // Invalid content
       } as unknown as GenerateContentParameters;
 
@@ -93,16 +93,16 @@ describe('HookTranslator', () => {
 
       // When contents are invalid, the translator skips them and returns empty messages
       expect(hookRequest.messages).toEqual([]);
-      expect(hookRequest.model).toBe('gemini-1.5-flash');
+      expect(hookRequest.model).toBe("gemini-1.5-flash");
     });
 
-    it('should convert hook request back to SDK format', () => {
+    it("should convert hook request back to SDK format", () => {
       const hookRequest: LLMRequest = {
-        model: 'gemini-1.5-flash',
+        model: "gemini-1.5-flash",
         messages: [
           {
-            role: 'user',
-            content: 'Hello world',
+            role: "user",
+            content: "Hello world",
           },
         ],
         config: {
@@ -113,27 +113,27 @@ describe('HookTranslator', () => {
 
       const sdkRequest = translator.fromHookLLMRequest(hookRequest);
 
-      expect(sdkRequest.model).toBe('gemini-1.5-flash');
+      expect(sdkRequest.model).toBe("gemini-1.5-flash");
       expect(sdkRequest.contents).toEqual([
         {
-          role: 'user',
-          parts: [{ text: 'Hello world' }],
+          role: "user",
+          parts: [{ text: "Hello world" }],
         },
       ]);
     });
   });
 
-  describe('LLM Response Translation', () => {
-    it('should convert SDK response to hook format', () => {
+  describe("LLM Response Translation", () => {
+    it("should convert SDK response to hook format", () => {
       const sdkResponse: GenerateContentResponse = {
-        text: 'Hello response',
+        text: "Hello response",
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'Hello response' }],
+              role: "model",
+              parts: [{ text: "Hello response" }],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
             index: 0,
           },
         ],
@@ -147,14 +147,14 @@ describe('HookTranslator', () => {
       const hookResponse = translator.toHookLLMResponse(sdkResponse);
 
       expect(hookResponse).toEqual({
-        text: 'Hello response',
+        text: "Hello response",
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['Hello response'],
+              role: "model",
+              parts: ["Hello response"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
             index: 0,
             safetyRatings: undefined,
           },
@@ -167,62 +167,60 @@ describe('HookTranslator', () => {
       });
     });
 
-    it('should convert hook response back to SDK format', () => {
+    it("should convert hook response back to SDK format", () => {
       const hookResponse: LLMResponse = {
-        text: 'Hello response',
+        text: "Hello response",
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['Hello response'],
+              role: "model",
+              parts: ["Hello response"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
 
       const sdkResponse = translator.fromHookLLMResponse(hookResponse);
 
-      expect(sdkResponse.text).toBe('Hello response');
+      expect(sdkResponse.text).toBe("Hello response");
       expect(sdkResponse.candidates).toHaveLength(1);
-      expect(sdkResponse.candidates?.[0]?.content?.parts?.[0]?.text).toBe(
-        'Hello response',
-      );
+      expect(sdkResponse.candidates?.[0]?.content?.parts?.[0]?.text).toBe("Hello response");
     });
   });
 
-  describe('Tool Config Translation', () => {
-    it('should convert SDK tool config to hook format', () => {
+  describe("Tool Config Translation", () => {
+    it("should convert SDK tool config to hook format", () => {
       const sdkToolConfig = {
         functionCallingConfig: {
-          mode: 'ANY',
-          allowedFunctionNames: ['tool1', 'tool2'],
+          mode: "ANY",
+          allowedFunctionNames: ["tool1", "tool2"],
         },
       } as unknown as ToolConfig;
 
       const hookToolConfig = translator.toHookToolConfig(sdkToolConfig);
 
       expect(hookToolConfig).toEqual({
-        mode: 'ANY',
-        allowedFunctionNames: ['tool1', 'tool2'],
+        mode: "ANY",
+        allowedFunctionNames: ["tool1", "tool2"],
       });
     });
 
-    it('should convert hook tool config back to SDK format', () => {
+    it("should convert hook tool config back to SDK format", () => {
       const hookToolConfig: HookToolConfig = {
-        mode: 'AUTO',
-        allowedFunctionNames: ['tool1', 'tool2'],
+        mode: "AUTO",
+        allowedFunctionNames: ["tool1", "tool2"],
       };
 
       const sdkToolConfig = translator.fromHookToolConfig(hookToolConfig);
 
       expect(sdkToolConfig.functionCallingConfig).toEqual({
-        mode: 'AUTO',
-        allowedFunctionNames: ['tool1', 'tool2'],
+        mode: "AUTO",
+        allowedFunctionNames: ["tool1", "tool2"],
       });
     });
 
-    it('should handle undefined tool config', () => {
+    it("should handle undefined tool config", () => {
       const sdkToolConfig = {} as ToolConfig;
 
       const hookToolConfig = translator.toHookToolConfig(sdkToolConfig);
diff --git a/packages/gemini-core/src/hooks/hookTranslator.ts b/packages/gemini-core/src/hooks/hookTranslator.ts
index 9cbcd903f..fe468e120 100644
--- a/packages/gemini-core/src/hooks/hookTranslator.ts
+++ b/packages/gemini-core/src/hooks/hookTranslator.ts
@@ -5,13 +5,13 @@
  */
 
 import type {
-  GenerateContentResponse,
-  GenerateContentParameters,
-  ToolConfig,
   FinishReason,
   FunctionCallingConfig,
-} from '@google/genai';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
+  GenerateContentParameters,
+  GenerateContentResponse,
+  ToolConfig,
+} from "@google/genai";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
 
 /**
  * Decoupled LLM request format - stable across Gemini CLI versions
@@ -19,7 +19,7 @@ import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
 export interface LLMRequest {
   model: string;
   messages: Array<{
-    role: 'user' | 'model' | 'system';
+    role: "user" | "model" | "system";
     content: string | Array<{ type: string; [key: string]: unknown }>;
   }>;
   config?: {
@@ -43,10 +43,10 @@ export interface LLMResponse {
   text?: string;
   candidates: Array<{
     content: {
-      role: 'model';
+      role: "model";
       parts: string[];
     };
-    finishReason?: 'STOP' | 'MAX_TOKENS' | 'SAFETY' | 'RECITATION' | 'OTHER';
+    finishReason?: "STOP" | "MAX_TOKENS" | "SAFETY" | "RECITATION" | "OTHER";
     index?: number;
     safetyRatings?: Array<{
       category: string;
@@ -65,7 +65,7 @@ export interface LLMResponse {
  * Decoupled tool configuration - stable across Gemini CLI versions
  */
 export interface HookToolConfig {
-  mode?: 'AUTO' | 'ANY' | 'NONE';
+  mode?: "AUTO" | "ANY" | "NONE";
   allowedFunctionNames?: string[];
 }
 
@@ -79,9 +79,7 @@ export abstract class HookTranslator {
     baseRequest?: GenerateContentParameters,
   ): GenerateContentParameters;
   abstract toHookLLMResponse(sdkResponse: GenerateContentResponse): LLMResponse;
-  abstract fromHookLLMResponse(
-    hookResponse: LLMResponse,
-  ): GenerateContentResponse;
+  abstract fromHookLLMResponse(hookResponse: LLMResponse): GenerateContentResponse;
   abstract toHookToolConfig(sdkToolConfig: ToolConfig): HookToolConfig;
   abstract fromHookToolConfig(hookToolConfig: HookToolConfig): ToolConfig;
 }
@@ -91,25 +89,18 @@ export abstract class HookTranslator {
  */
 function hasTextProperty(value: unknown): value is { text: string } {
   return (
-    typeof value === 'object' &&
+    typeof value === "object" &&
     value !== null &&
-    'text' in value &&
-    typeof (value as { text: unknown }).text === 'string'
+    "text" in value &&
+    typeof (value as { text: unknown }).text === "string"
   );
 }
 
 /**
  * Type guard to check if content has role and parts properties
  */
-function isContentWithParts(
-  content: unknown,
-): content is { role: string; parts: unknown } {
-  return (
-    typeof content === 'object' &&
-    content !== null &&
-    'role' in content &&
-    'parts' in content
-  );
+function isContentWithParts(content: unknown): content is { role: string; parts: unknown } {
+  return typeof content === "object" && content !== null && "role" in content && "parts" in content;
 }
 
 /**
@@ -126,7 +117,7 @@ function extractGenerationConfig(request: GenerateContentParameters):
   | undefined {
   // Access the config field which contains generation settings
   // Use type assertion after checking the field exists
-  if (request.config && typeof request.config === 'object') {
+  if (request.config && typeof request.config === "object") {
     const config = request.config as {
       temperature?: number;
       maxOutputTokens?: number;
@@ -159,7 +150,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
    * Future versions may expose additional content types if needed.
    */
   toHookLLMRequest(sdkRequest: GenerateContentParameters): LLMRequest {
-    const messages: LLMRequest['messages'] = [];
+    const messages: LLMRequest["messages"] = [];
 
     // Convert contents to messages format (simplified)
     if (sdkRequest.contents) {
@@ -168,28 +159,26 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
         : [sdkRequest.contents];
 
       for (const content of contents) {
-        if (typeof content === 'string') {
+        if (typeof content === "string") {
           messages.push({
-            role: 'user',
+            role: "user",
             content,
           });
         } else if (isContentWithParts(content)) {
           const role =
-            content.role === 'model'
-              ? ('model' as const)
-              : content.role === 'system'
-                ? ('system' as const)
-                : ('user' as const);
+            content.role === "model"
+              ? ("model" as const)
+              : content.role === "system"
+                ? ("system" as const)
+                : ("user" as const);
 
-          const parts = Array.isArray(content.parts)
-            ? content.parts
-            : [content.parts];
+          const parts = Array.isArray(content.parts) ? content.parts : [content.parts];
 
           // Extract only text parts - intentionally filtering out non-text content
           const textContent = parts
             .filter(hasTextProperty)
             .map((part) => part.text)
-            .join('');
+            .join("");
 
           // Only add message if there's text content
           if (textContent) {
@@ -226,13 +215,10 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
   ): GenerateContentParameters {
     // Convert hook messages back to SDK Content format
     const contents = hookRequest.messages.map((message) => ({
-      role: message.role === 'model' ? 'model' : message.role,
+      role: message.role === "model" ? "model" : message.role,
       parts: [
         {
-          text:
-            typeof message.content === 'string'
-              ? message.content
-              : String(message.content),
+          text: typeof message.content === "string" ? message.content : String(message.content),
         },
       ],
     }));
@@ -246,9 +232,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
 
     // Add generation config if it exists in the hook request
     if (hookRequest.config) {
-      const baseConfig = baseRequest
-        ? extractGenerationConfig(baseRequest)
-        : undefined;
+      const baseConfig = baseRequest ? extractGenerationConfig(baseRequest) : undefined;
 
       result.config = {
         ...baseConfig,
@@ -256,7 +240,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
         maxOutputTokens: hookRequest.config.maxOutputTokens,
         topP: hookRequest.config.topP,
         topK: hookRequest.config.topK,
-      } as GenerateContentParameters['config'];
+      } as GenerateContentParameters["config"];
     }
 
     return result;
@@ -271,29 +255,25 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
       candidates: (sdkResponse.candidates || []).map((candidate) => {
         // Extract text parts from the candidate
         const textParts =
-          candidate.content?.parts
-            ?.filter(hasTextProperty)
-            .map((part) => part.text) || [];
+          candidate.content?.parts?.filter(hasTextProperty).map((part) => part.text) || [];
 
         return {
           content: {
-            role: 'model' as const,
+            role: "model" as const,
             parts: textParts,
           },
-          finishReason:
-            candidate.finishReason as LLMResponse['candidates'][0]['finishReason'],
+          finishReason: candidate.finishReason as LLMResponse["candidates"][0]["finishReason"],
           index: candidate.index,
           safetyRatings: candidate.safetyRatings?.map((rating) => ({
-            category: String(rating.category || ''),
-            probability: String(rating.probability || ''),
+            category: String(rating.category || ""),
+            probability: String(rating.probability || ""),
           })),
         };
       }),
       usageMetadata: sdkResponse.usageMetadata
         ? {
             promptTokenCount: sdkResponse.usageMetadata.promptTokenCount,
-            candidatesTokenCount:
-              sdkResponse.usageMetadata.candidatesTokenCount,
+            candidatesTokenCount: sdkResponse.usageMetadata.candidatesTokenCount,
             totalTokenCount: sdkResponse.usageMetadata.totalTokenCount,
           }
         : undefined,
@@ -309,7 +289,7 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
       text: hookResponse.text,
       candidates: hookResponse.candidates.map((candidate) => ({
         content: {
-          role: 'model',
+          role: "model",
           parts: candidate.content.parts.map((part) => ({
             text: part,
           })),
@@ -329,9 +309,8 @@ export class HookTranslatorGenAIv1 extends HookTranslator {
    */
   toHookToolConfig(sdkToolConfig: ToolConfig): HookToolConfig {
     return {
-      mode: sdkToolConfig.functionCallingConfig?.mode as HookToolConfig['mode'],
-      allowedFunctionNames:
-        sdkToolConfig.functionCallingConfig?.allowedFunctionNames,
+      mode: sdkToolConfig.functionCallingConfig?.mode as HookToolConfig["mode"],
+      allowedFunctionNames: sdkToolConfig.functionCallingConfig?.allowedFunctionNames,
     };
   }
 
diff --git a/packages/gemini-core/src/hooks/types.test.ts b/packages/gemini-core/src/hooks/types.test.ts
index 8853b5a10..e01b30f0d 100644
--- a/packages/gemini-core/src/hooks/types.test.ts
+++ b/packages/gemini-core/src/hooks/types.test.ts
@@ -4,56 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
+import type { GenerateContentParameters, GenerateContentResponse, ToolConfig } from "@google/genai";
+import { describe, expect, it, vi } from "vitest";
+import type { LLMRequest, LLMResponse } from "./hookTranslator.js";
+import { defaultHookTranslator } from "./hookTranslator.js";
+import type { HookDecision } from "./types.js";
 import {
-  createHookOutput,
-  DefaultHookOutput,
-  BeforeToolHookOutput,
+  AfterModelHookOutput,
   BeforeModelHookOutput,
+  BeforeToolHookOutput,
   BeforeToolSelectionHookOutput,
-  AfterModelHookOutput,
+  createHookOutput,
+  DefaultHookOutput,
   HookEventName,
   HookType,
-} from './types.js';
-import { defaultHookTranslator } from './hookTranslator.js';
-import type {
-  GenerateContentParameters,
-  GenerateContentResponse,
-  ToolConfig,
-} from '@google/genai';
-import type { LLMRequest, LLMResponse } from './hookTranslator.js';
-import type { HookDecision } from './types.js';
-
-vi.mock('./hookTranslator.js', () => ({
+} from "./types.js";
+
+vi.mock("./hookTranslator.js", () => ({
   defaultHookTranslator: {
     fromHookLLMResponse: vi.fn(
       (response: LLMResponse) => response as unknown as GenerateContentResponse,
     ),
-    fromHookLLMRequest: vi.fn(
-      (request: LLMRequest, target: GenerateContentParameters) => ({
-        ...target,
-        ...request,
-      }),
-    ),
+    fromHookLLMRequest: vi.fn((request: LLMRequest, target: GenerateContentParameters) => ({
+      ...target,
+      ...request,
+    })),
     fromHookToolConfig: vi.fn((config: ToolConfig) => config),
   },
 }));
 
-describe('Hook Types', () => {
-  describe('HookEventName', () => {
-    it('should contain all required event names', () => {
+describe("Hook Types", () => {
+  describe("HookEventName", () => {
+    it("should contain all required event names", () => {
       const expectedEvents = [
-        'BeforeTool',
-        'AfterTool',
-        'BeforeAgent',
-        'Notification',
-        'AfterAgent',
-        'SessionStart',
-        'SessionEnd',
-        'PreCompress',
-        'BeforeModel',
-        'AfterModel',
-        'BeforeToolSelection',
+        "BeforeTool",
+        "AfterTool",
+        "BeforeAgent",
+        "Notification",
+        "AfterAgent",
+        "SessionStart",
+        "SessionEnd",
+        "PreCompress",
+        "BeforeModel",
+        "AfterModel",
+        "BeforeToolSelection",
       ];
 
       for (const event of expectedEvents) {
@@ -62,49 +56,49 @@ describe('Hook Types', () => {
     });
   });
 
-  describe('HookType', () => {
-    it('should contain command type', () => {
-      expect(HookType.Command).toBe('command');
+  describe("HookType", () => {
+    it("should contain command type", () => {
+      expect(HookType.Command).toBe("command");
     });
   });
 });
 
-describe('Hook Output Classes', () => {
-  describe('createHookOutput', () => {
-    it('should return DefaultHookOutput for unknown event names', () => {
-      const output = createHookOutput('UnknownEvent', {});
+describe("Hook Output Classes", () => {
+  describe("createHookOutput", () => {
+    it("should return DefaultHookOutput for unknown event names", () => {
+      const output = createHookOutput("UnknownEvent", {});
       expect(output).toBeInstanceOf(DefaultHookOutput);
       expect(output).not.toBeInstanceOf(BeforeModelHookOutput);
       expect(output).not.toBeInstanceOf(AfterModelHookOutput);
       expect(output).not.toBeInstanceOf(BeforeToolSelectionHookOutput);
     });
 
-    it('should return BeforeModelHookOutput for BeforeModel event', () => {
+    it("should return BeforeModelHookOutput for BeforeModel event", () => {
       const output = createHookOutput(HookEventName.BeforeModel, {});
       expect(output).toBeInstanceOf(BeforeModelHookOutput);
     });
 
-    it('should return AfterModelHookOutput for AfterModel event', () => {
+    it("should return AfterModelHookOutput for AfterModel event", () => {
       const output = createHookOutput(HookEventName.AfterModel, {});
       expect(output).toBeInstanceOf(AfterModelHookOutput);
     });
 
-    it('should return BeforeToolSelectionHookOutput for BeforeToolSelection event', () => {
+    it("should return BeforeToolSelectionHookOutput for BeforeToolSelection event", () => {
       const output = createHookOutput(HookEventName.BeforeToolSelection, {});
       expect(output).toBeInstanceOf(BeforeToolSelectionHookOutput);
     });
   });
 
-  describe('DefaultHookOutput', () => {
-    it('should construct with provided data', () => {
+  describe("DefaultHookOutput", () => {
+    it("should construct with provided data", () => {
       const data = {
         continue: false,
-        stopReason: 'test stop',
+        stopReason: "test stop",
         suppressOutput: true,
-        systemMessage: 'test system message',
-        decision: 'block' as HookDecision,
-        reason: 'test reason',
-        hookSpecificOutput: { key: 'value' },
+        systemMessage: "test system message",
+        decision: "block" as HookDecision,
+        reason: "test reason",
+        hookSpecificOutput: { key: "value" },
       };
       const output = new DefaultHookOutput(data);
       expect(output.continue).toBe(data.continue);
@@ -116,164 +110,159 @@ describe('Hook Output Classes', () => {
       expect(output.hookSpecificOutput).toEqual(data.hookSpecificOutput);
     });
 
-    it('should return false for isBlockingDecision if decision is not block or deny', () => {
-      const output1 = new DefaultHookOutput({ decision: 'approve' });
+    it("should return false for isBlockingDecision if decision is not block or deny", () => {
+      const output1 = new DefaultHookOutput({ decision: "approve" });
       expect(output1.isBlockingDecision()).toBe(false);
       const output2 = new DefaultHookOutput({ decision: undefined });
       expect(output2.isBlockingDecision()).toBe(false);
     });
 
-    it('should return true for isBlockingDecision if decision is block or deny', () => {
-      const output1 = new DefaultHookOutput({ decision: 'block' });
+    it("should return true for isBlockingDecision if decision is block or deny", () => {
+      const output1 = new DefaultHookOutput({ decision: "block" });
       expect(output1.isBlockingDecision()).toBe(true);
-      const output2 = new DefaultHookOutput({ decision: 'deny' });
+      const output2 = new DefaultHookOutput({ decision: "deny" });
       expect(output2.isBlockingDecision()).toBe(true);
     });
 
-    it('should return true for shouldStopExecution if continue is false', () => {
+    it("should return true for shouldStopExecution if continue is false", () => {
       const output = new DefaultHookOutput({ continue: false });
       expect(output.shouldStopExecution()).toBe(true);
     });
 
-    it('should return false for shouldStopExecution if continue is true or undefined', () => {
+    it("should return false for shouldStopExecution if continue is true or undefined", () => {
       const output1 = new DefaultHookOutput({ continue: true });
       expect(output1.shouldStopExecution()).toBe(false);
       const output2 = new DefaultHookOutput({});
       expect(output2.shouldStopExecution()).toBe(false);
     });
 
-    it('should return reason if available', () => {
-      const output = new DefaultHookOutput({ reason: 'specific reason' });
-      expect(output.getEffectiveReason()).toBe('specific reason');
+    it("should return reason if available", () => {
+      const output = new DefaultHookOutput({ reason: "specific reason" });
+      expect(output.getEffectiveReason()).toBe("specific reason");
     });
 
-    it('should return stopReason if reason is not available', () => {
-      const output = new DefaultHookOutput({ stopReason: 'stop reason' });
-      expect(output.getEffectiveReason()).toBe('stop reason');
+    it("should return stopReason if reason is not available", () => {
+      const output = new DefaultHookOutput({ stopReason: "stop reason" });
+      expect(output.getEffectiveReason()).toBe("stop reason");
     });
 
     it('should return "No reason provided" if neither reason nor stopReason are available', () => {
       const output = new DefaultHookOutput({});
-      expect(output.getEffectiveReason()).toBe('No reason provided');
+      expect(output.getEffectiveReason()).toBe("No reason provided");
     });
 
-    it('applyLLMRequestModifications should return target unchanged', () => {
+    it("applyLLMRequestModifications should return target unchanged", () => {
       const target: GenerateContentParameters = {
-        model: 'gemini-pro',
+        model: "gemini-pro",
         contents: [],
       };
       const output = new DefaultHookOutput({});
       expect(output.applyLLMRequestModifications(target)).toBe(target);
     });
 
-    it('applyToolConfigModifications should return target unchanged', () => {
+    it("applyToolConfigModifications should return target unchanged", () => {
       const target = { toolConfig: {}, tools: [] };
       const output = new DefaultHookOutput({});
       expect(output.applyToolConfigModifications(target)).toBe(target);
     });
 
-    it('getAdditionalContext should return additionalContext if present', () => {
+    it("getAdditionalContext should return additionalContext if present", () => {
       const output = new DefaultHookOutput({
-        hookSpecificOutput: { additionalContext: 'some context' },
+        hookSpecificOutput: { additionalContext: "some context" },
       });
-      expect(output.getAdditionalContext()).toBe('some context');
+      expect(output.getAdditionalContext()).toBe("some context");
     });
 
-    it('getAdditionalContext should return undefined if additionalContext is not present', () => {
+    it("getAdditionalContext should return undefined if additionalContext is not present", () => {
       const output = new DefaultHookOutput({
-        hookSpecificOutput: { other: 'value' },
+        hookSpecificOutput: { other: "value" },
       });
       expect(output.getAdditionalContext()).toBeUndefined();
     });
 
-    it('getAdditionalContext should return undefined if hookSpecificOutput is undefined', () => {
+    it("getAdditionalContext should return undefined if hookSpecificOutput is undefined", () => {
       const output = new DefaultHookOutput({});
       expect(output.getAdditionalContext()).toBeUndefined();
     });
 
-    it('getBlockingError should return blocked: true and reason if blocking decision', () => {
+    it("getBlockingError should return blocked: true and reason if blocking decision", () => {
       const output = new DefaultHookOutput({
-        decision: 'block',
-        reason: 'blocked by hook',
+        decision: "block",
+        reason: "blocked by hook",
       });
       expect(output.getBlockingError()).toEqual({
         blocked: true,
-        reason: 'blocked by hook',
+        reason: "blocked by hook",
       });
     });
 
-    it('getBlockingError should return blocked: false if not blocking decision', () => {
-      const output = new DefaultHookOutput({ decision: 'approve' });
-      expect(output.getBlockingError()).toEqual({ blocked: false, reason: '' });
+    it("getBlockingError should return blocked: false if not blocking decision", () => {
+      const output = new DefaultHookOutput({ decision: "approve" });
+      expect(output.getBlockingError()).toEqual({ blocked: false, reason: "" });
     });
   });
 
-  describe('BeforeToolHookOutput', () => {
-    it('isBlockingDecision should use permissionDecision from hookSpecificOutput', () => {
+  describe("BeforeToolHookOutput", () => {
+    it("isBlockingDecision should use permissionDecision from hookSpecificOutput", () => {
       const output1 = new BeforeToolHookOutput({
-        hookSpecificOutput: { permissionDecision: 'block' },
+        hookSpecificOutput: { permissionDecision: "block" },
       });
       expect(output1.isBlockingDecision()).toBe(true);
 
       const output2 = new BeforeToolHookOutput({
-        hookSpecificOutput: { permissionDecision: 'approve' },
+        hookSpecificOutput: { permissionDecision: "approve" },
       });
       expect(output2.isBlockingDecision()).toBe(false);
     });
 
-    it('getEffectiveReason should use permissionDecisionReason from hookSpecificOutput', () => {
+    it("getEffectiveReason should use permissionDecisionReason from hookSpecificOutput", () => {
       const output1 = new BeforeToolHookOutput({
-        hookSpecificOutput: { permissionDecisionReason: 'compat reason' },
+        hookSpecificOutput: { permissionDecisionReason: "compat reason" },
       });
-      expect(output1.getEffectiveReason()).toBe('compat reason');
+      expect(output1.getEffectiveReason()).toBe("compat reason");
 
       const output2 = new BeforeToolHookOutput({
-        reason: 'default reason',
-        hookSpecificOutput: { other: 'value' },
+        reason: "default reason",
+        hookSpecificOutput: { other: "value" },
       });
-      expect(output2.getEffectiveReason()).toBe('default reason');
+      expect(output2.getEffectiveReason()).toBe("default reason");
     });
   });
 
-  describe('BeforeModelHookOutput', () => {
-    it('getSyntheticResponse should return synthetic response if llm_response is present', () => {
+  describe("BeforeModelHookOutput", () => {
+    it("getSyntheticResponse should return synthetic response if llm_response is present", () => {
       const mockResponse: LLMResponse = { candidates: [] };
       const output = new BeforeModelHookOutput({
         hookSpecificOutput: { llm_response: mockResponse },
       });
       expect(output.getSyntheticResponse()).toEqual(mockResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        mockResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(mockResponse);
     });
 
-    it('getSyntheticResponse should return undefined if llm_response is not present', () => {
+    it("getSyntheticResponse should return undefined if llm_response is not present", () => {
       const output = new BeforeModelHookOutput({});
       expect(output.getSyntheticResponse()).toBeUndefined();
     });
 
-    it('applyLLMRequestModifications should apply modifications if llm_request is present', () => {
+    it("applyLLMRequestModifications should apply modifications if llm_request is present", () => {
       const target: GenerateContentParameters = {
-        model: 'gemini-pro',
-        contents: [{ parts: [{ text: 'original' }] }],
+        model: "gemini-pro",
+        contents: [{ parts: [{ text: "original" }] }],
       };
       const mockRequest: Partial<LLMRequest> = {
-        messages: [{ role: 'user', content: 'modified' }],
+        messages: [{ role: "user", content: "modified" }],
       };
       const output = new BeforeModelHookOutput({
         hookSpecificOutput: { llm_request: mockRequest },
       });
       const result = output.applyLLMRequestModifications(target);
       expect(result).toEqual({ ...target, ...mockRequest });
-      expect(defaultHookTranslator.fromHookLLMRequest).toHaveBeenCalledWith(
-        mockRequest,
-        target,
-      );
+      expect(defaultHookTranslator.fromHookLLMRequest).toHaveBeenCalledWith(mockRequest, target);
     });
 
-    it('applyLLMRequestModifications should return target unchanged if llm_request is not present', () => {
+    it("applyLLMRequestModifications should return target unchanged if llm_request is not present", () => {
       const target: GenerateContentParameters = {
-        model: 'gemini-pro',
+        model: "gemini-pro",
         contents: [],
       };
       const output = new BeforeModelHookOutput({});
@@ -281,29 +270,27 @@ describe('Hook Output Classes', () => {
     });
   });
 
-  describe('BeforeToolSelectionHookOutput', () => {
-    it('applyToolConfigModifications should apply modifications if toolConfig is present', () => {
+  describe("BeforeToolSelectionHookOutput", () => {
+    it("applyToolConfigModifications should apply modifications if toolConfig is present", () => {
       const target = { tools: [{ functionDeclarations: [] }] };
-      const mockToolConfig = { functionCallingConfig: { mode: 'ANY' } };
+      const mockToolConfig = { functionCallingConfig: { mode: "ANY" } };
       const output = new BeforeToolSelectionHookOutput({
         hookSpecificOutput: { toolConfig: mockToolConfig },
       });
       const result = output.applyToolConfigModifications(target);
       expect(result).toEqual({ ...target, toolConfig: mockToolConfig });
-      expect(defaultHookTranslator.fromHookToolConfig).toHaveBeenCalledWith(
-        mockToolConfig,
-      );
+      expect(defaultHookTranslator.fromHookToolConfig).toHaveBeenCalledWith(mockToolConfig);
     });
 
-    it('applyToolConfigModifications should return target unchanged if toolConfig is not present', () => {
+    it("applyToolConfigModifications should return target unchanged if toolConfig is not present", () => {
       const target = { toolConfig: {}, tools: [] };
       const output = new BeforeToolSelectionHookOutput({});
       expect(output.applyToolConfigModifications(target)).toBe(target);
     });
 
-    it('applyToolConfigModifications should initialize tools array if not present', () => {
+    it("applyToolConfigModifications should initialize tools array if not present", () => {
       const target = {};
-      const mockToolConfig = { functionCallingConfig: { mode: 'ANY' } };
+      const mockToolConfig = { functionCallingConfig: { mode: "ANY" } };
       const output = new BeforeToolSelectionHookOutput({
         hookSpecificOutput: { toolConfig: mockToolConfig },
       });
@@ -312,23 +299,21 @@ describe('Hook Output Classes', () => {
     });
   });
 
-  describe('AfterModelHookOutput', () => {
-    it('getModifiedResponse should return modified response if llm_response is present and has content', () => {
+  describe("AfterModelHookOutput", () => {
+    it("getModifiedResponse should return modified response if llm_response is present and has content", () => {
       const mockResponse: LLMResponse = {
-        candidates: [{ content: { role: 'model', parts: ['modified'] } }],
+        candidates: [{ content: { role: "model", parts: ["modified"] } }],
       };
       const output = new AfterModelHookOutput({
         hookSpecificOutput: { llm_response: mockResponse },
       });
       expect(output.getModifiedResponse()).toEqual(mockResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        mockResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(mockResponse);
     });
 
-    it('getModifiedResponse should return undefined if llm_response is present but no content', () => {
+    it("getModifiedResponse should return undefined if llm_response is present but no content", () => {
       const mockResponse: LLMResponse = {
-        candidates: [{ content: { role: 'model', parts: [] } }],
+        candidates: [{ content: { role: "model", parts: [] } }],
       };
       const output = new AfterModelHookOutput({
         hookSpecificOutput: { llm_response: mockResponse },
@@ -336,50 +321,46 @@ describe('Hook Output Classes', () => {
       expect(output.getModifiedResponse()).toBeUndefined();
     });
 
-    it('getModifiedResponse should return undefined if llm_response is not present', () => {
+    it("getModifiedResponse should return undefined if llm_response is not present", () => {
       const output = new AfterModelHookOutput({});
       expect(output.getModifiedResponse()).toBeUndefined();
     });
 
-    it('getModifiedResponse should return a synthetic stop response if shouldStopExecution is true', () => {
+    it("getModifiedResponse should return a synthetic stop response if shouldStopExecution is true", () => {
       const output = new AfterModelHookOutput({
         continue: false,
-        stopReason: 'stopped by hook',
+        stopReason: "stopped by hook",
       });
       const expectedResponse: LLMResponse = {
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['stopped by hook'],
+              role: "model",
+              parts: ["stopped by hook"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
       expect(output.getModifiedResponse()).toEqual(expectedResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        expectedResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(expectedResponse);
     });
 
-    it('getModifiedResponse should return a synthetic stop response with default reason if shouldStopExecution is true and no stopReason', () => {
+    it("getModifiedResponse should return a synthetic stop response with default reason if shouldStopExecution is true and no stopReason", () => {
       const output = new AfterModelHookOutput({ continue: false });
       const expectedResponse: LLMResponse = {
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: ['No reason provided'],
+              role: "model",
+              parts: ["No reason provided"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
       expect(output.getModifiedResponse()).toEqual(expectedResponse);
-      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(
-        expectedResponse,
-      );
+      expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(expectedResponse);
     });
   });
 });
diff --git a/packages/gemini-core/src/hooks/types.ts b/packages/gemini-core/src/hooks/types.ts
index 4678b0d21..b7c93cc40 100644
--- a/packages/gemini-core/src/hooks/types.ts
+++ b/packages/gemini-core/src/hooks/types.ts
@@ -5,33 +5,29 @@
  */
 
 import type {
-  GenerateContentResponse,
-  GenerateContentParameters,
   ToolConfig as GenAIToolConfig,
+  GenerateContentParameters,
+  GenerateContentResponse,
   ToolListUnion,
-} from '@google/genai';
-import type {
-  LLMRequest,
-  LLMResponse,
-  HookToolConfig,
-} from './hookTranslator.js';
-import { defaultHookTranslator } from './hookTranslator.js';
+} from "@google/genai";
+import type { HookToolConfig, LLMRequest, LLMResponse } from "./hookTranslator.js";
+import { defaultHookTranslator } from "./hookTranslator.js";
 
 /**
  * Event names for the hook system
  */
 export enum HookEventName {
-  BeforeTool = 'BeforeTool',
-  AfterTool = 'AfterTool',
-  BeforeAgent = 'BeforeAgent',
-  Notification = 'Notification',
-  AfterAgent = 'AfterAgent',
-  SessionStart = 'SessionStart',
-  SessionEnd = 'SessionEnd',
-  PreCompress = 'PreCompress',
-  BeforeModel = 'BeforeModel',
-  AfterModel = 'AfterModel',
-  BeforeToolSelection = 'BeforeToolSelection',
+  BeforeTool = "BeforeTool",
+  AfterTool = "AfterTool",
+  BeforeAgent = "BeforeAgent",
+  Notification = "Notification",
+  AfterAgent = "AfterAgent",
+  SessionStart = "SessionStart",
+  SessionEnd = "SessionEnd",
+  PreCompress = "PreCompress",
+  BeforeModel = "BeforeModel",
+  AfterModel = "AfterModel",
+  BeforeToolSelection = "BeforeToolSelection",
 }
 
 /**
@@ -58,19 +54,13 @@ export interface HookDefinition {
  * Hook implementation types
  */
 export enum HookType {
-  Command = 'command',
+  Command = "command",
 }
 
 /**
  * Decision types for hook outputs
  */
-export type HookDecision =
-  | 'ask'
-  | 'block'
-  | 'deny'
-  | 'approve'
-  | 'allow'
-  | undefined;
+export type HookDecision = "ask" | "block" | "deny" | "approve" | "allow" | undefined;
 
 /**
  * Base hook input - common fields for all events
@@ -100,16 +90,13 @@ export interface HookOutput {
  * Factory function to create the appropriate hook output class based on event name
  * Returns DefaultHookOutput for all events since it contains all necessary methods
  */
-export function createHookOutput(
-  eventName: string,
-  data: Partial<HookOutput>,
-): DefaultHookOutput {
+export function createHookOutput(eventName: string, data: Partial<HookOutput>): DefaultHookOutput {
   switch (eventName) {
-    case 'BeforeModel':
+    case "BeforeModel":
       return new BeforeModelHookOutput(data);
-    case 'AfterModel':
+    case "AfterModel":
       return new AfterModelHookOutput(data);
-    case 'BeforeToolSelection':
+    case "BeforeToolSelection":
       return new BeforeToolSelectionHookOutput(data);
     default:
       return new DefaultHookOutput(data);
@@ -142,7 +129,7 @@ export class DefaultHookOutput implements HookOutput {
    * Check if this output represents a blocking decision
    */
   isBlockingDecision(): boolean {
-    return this.decision === 'block' || this.decision === 'deny';
+    return this.decision === "block" || this.decision === "deny";
   }
 
   /**
@@ -156,15 +143,13 @@ export class DefaultHookOutput implements HookOutput {
    * Get the effective reason for blocking or stopping
    */
   getEffectiveReason(): string {
-    return this.reason || this.stopReason || 'No reason provided';
+    return this.reason || this.stopReason || "No reason provided";
   }
 
   /**
    * Apply LLM request modifications (specific method for BeforeModel hooks)
    */
-  applyLLMRequestModifications(
-    target: GenerateContentParameters,
-  ): GenerateContentParameters {
+  applyLLMRequestModifications(target: GenerateContentParameters): GenerateContentParameters {
     // Base implementation - overridden by BeforeModelHookOutput
     return target;
   }
@@ -172,10 +157,7 @@ export class DefaultHookOutput implements HookOutput {
   /**
    * Apply tool config modifications (specific method for BeforeToolSelection hooks)
    */
-  applyToolConfigModifications(target: {
-    toolConfig?: GenAIToolConfig;
-    tools?: ToolListUnion;
-  }): {
+  applyToolConfigModifications(target: { toolConfig?: GenAIToolConfig; tools?: ToolListUnion }): {
     toolConfig?: GenAIToolConfig;
     tools?: ToolListUnion;
   } {
@@ -187,12 +169,9 @@ export class DefaultHookOutput implements HookOutput {
    * Get additional context for adding to responses
    */
   getAdditionalContext(): string | undefined {
-    if (
-      this.hookSpecificOutput &&
-      'additionalContext' in this.hookSpecificOutput
-    ) {
-      const context = this.hookSpecificOutput['additionalContext'];
-      return typeof context === 'string' ? context : undefined;
+    if (this.hookSpecificOutput && "additionalContext" in this.hookSpecificOutput) {
+      const context = this.hookSpecificOutput["additionalContext"];
+      return typeof context === "string" ? context : undefined;
     }
     return undefined;
   }
@@ -207,7 +186,7 @@ export class DefaultHookOutput implements HookOutput {
         reason: this.getEffectiveReason(),
       };
     }
-    return { blocked: false, reason: '' };
+    return { blocked: false, reason: "" };
   }
 }
 
@@ -221,10 +200,9 @@ export class BeforeToolHookOutput extends DefaultHookOutput {
   override getEffectiveReason(): string {
     // Check for compatibility fields first
     if (this.hookSpecificOutput) {
-      if ('permissionDecisionReason' in this.hookSpecificOutput) {
-        const compatReason =
-          this.hookSpecificOutput['permissionDecisionReason'];
-        if (typeof compatReason === 'string') {
+      if ("permissionDecisionReason" in this.hookSpecificOutput) {
+        const compatReason = this.hookSpecificOutput["permissionDecisionReason"];
+        if (typeof compatReason === "string") {
           return compatReason;
         }
       }
@@ -238,12 +216,9 @@ export class BeforeToolHookOutput extends DefaultHookOutput {
    */
   override isBlockingDecision(): boolean {
     // Check compatibility field first
-    if (
-      this.hookSpecificOutput &&
-      'permissionDecision' in this.hookSpecificOutput
-    ) {
-      const compatDecision = this.hookSpecificOutput['permissionDecision'];
-      if (compatDecision === 'block' || compatDecision === 'deny') {
+    if (this.hookSpecificOutput && "permissionDecision" in this.hookSpecificOutput) {
+      const compatDecision = this.hookSpecificOutput["permissionDecision"];
+      if (compatDecision === "block" || compatDecision === "deny") {
         return true;
       }
     }
@@ -260,10 +235,8 @@ export class BeforeModelHookOutput extends DefaultHookOutput {
    * Get synthetic LLM response if provided by hook
    */
   getSyntheticResponse(): GenerateContentResponse | undefined {
-    if (this.hookSpecificOutput && 'llm_response' in this.hookSpecificOutput) {
-      const hookResponse = this.hookSpecificOutput[
-        'llm_response'
-      ] as LLMResponse;
+    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
+      const hookResponse = this.hookSpecificOutput["llm_response"] as LLMResponse;
       if (hookResponse) {
         // Convert hook format to SDK format
         return defaultHookTranslator.fromHookLLMResponse(hookResponse);
@@ -278,10 +251,8 @@ export class BeforeModelHookOutput extends DefaultHookOutput {
   override applyLLMRequestModifications(
     target: GenerateContentParameters,
   ): GenerateContentParameters {
-    if (this.hookSpecificOutput && 'llm_request' in this.hookSpecificOutput) {
-      const hookRequest = this.hookSpecificOutput[
-        'llm_request'
-      ] as Partial<LLMRequest>;
+    if (this.hookSpecificOutput && "llm_request" in this.hookSpecificOutput) {
+      const hookRequest = this.hookSpecificOutput["llm_request"] as Partial<LLMRequest>;
       if (hookRequest) {
         // Convert hook format to SDK format
         const sdkRequest = defaultHookTranslator.fromHookLLMRequest(
@@ -309,14 +280,11 @@ export class BeforeToolSelectionHookOutput extends DefaultHookOutput {
     toolConfig?: GenAIToolConfig;
     tools?: ToolListUnion;
   }): { toolConfig?: GenAIToolConfig; tools?: ToolListUnion } {
-    if (this.hookSpecificOutput && 'toolConfig' in this.hookSpecificOutput) {
-      const hookToolConfig = this.hookSpecificOutput[
-        'toolConfig'
-      ] as HookToolConfig;
+    if (this.hookSpecificOutput && "toolConfig" in this.hookSpecificOutput) {
+      const hookToolConfig = this.hookSpecificOutput["toolConfig"] as HookToolConfig;
       if (hookToolConfig) {
         // Convert hook format to SDK format
-        const sdkToolConfig =
-          defaultHookTranslator.fromHookToolConfig(hookToolConfig);
+        const sdkToolConfig = defaultHookTranslator.fromHookToolConfig(hookToolConfig);
         return {
           ...target,
           tools: target.tools || [],
@@ -336,15 +304,11 @@ export class AfterModelHookOutput extends DefaultHookOutput {
    * Get modified LLM response if provided by hook
    */
   getModifiedResponse(): GenerateContentResponse | undefined {
-    if (this.hookSpecificOutput && 'llm_response' in this.hookSpecificOutput) {
-      const hookResponse = this.hookSpecificOutput[
-        'llm_response'
-      ] as Partial<LLMResponse>;
+    if (this.hookSpecificOutput && "llm_response" in this.hookSpecificOutput) {
+      const hookResponse = this.hookSpecificOutput["llm_response"] as Partial<LLMResponse>;
       if (hookResponse?.candidates?.[0]?.content?.parts?.length) {
         // Convert hook format to SDK format
-        return defaultHookTranslator.fromHookLLMResponse(
-          hookResponse as LLMResponse,
-        );
+        return defaultHookTranslator.fromHookLLMResponse(hookResponse as LLMResponse);
       }
     }
 
@@ -354,10 +318,10 @@ export class AfterModelHookOutput extends DefaultHookOutput {
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [this.getEffectiveReason() || 'Execution stopped by hook'],
+              role: "model",
+              parts: [this.getEffectiveReason() || "Execution stopped by hook"],
             },
-            finishReason: 'STOP',
+            finishReason: "STOP",
           },
         ],
       };
@@ -381,7 +345,7 @@ export interface BeforeToolInput extends HookInput {
  */
 export interface BeforeToolOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeTool';
+    hookEventName: "BeforeTool";
     permissionDecision?: HookDecision;
     permissionDecisionReason?: string;
   };
@@ -401,7 +365,7 @@ export interface AfterToolInput extends HookInput {
  */
 export interface AfterToolOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'AfterTool';
+    hookEventName: "AfterTool";
     additionalContext?: string;
   };
 }
@@ -418,7 +382,7 @@ export interface BeforeAgentInput extends HookInput {
  */
 export interface BeforeAgentOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeAgent';
+    hookEventName: "BeforeAgent";
     additionalContext?: string;
   };
 }
@@ -427,7 +391,7 @@ export interface BeforeAgentOutput extends HookOutput {
  * Notification types
  */
 export enum NotificationType {
-  ToolPermission = 'ToolPermission',
+  ToolPermission = "ToolPermission",
 }
 
 /**
@@ -460,10 +424,10 @@ export interface AfterAgentInput extends HookInput {
  * SessionStart source types
  */
 export enum SessionStartSource {
-  Startup = 'startup',
-  Resume = 'resume',
-  Clear = 'clear',
-  Compress = 'compress',
+  Startup = "startup",
+  Resume = "resume",
+  Clear = "clear",
+  Compress = "compress",
 }
 
 /**
@@ -478,7 +442,7 @@ export interface SessionStartInput extends HookInput {
  */
 export interface SessionStartOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'SessionStart';
+    hookEventName: "SessionStart";
     additionalContext?: string;
   };
 }
@@ -487,11 +451,11 @@ export interface SessionStartOutput extends HookOutput {
  * SessionEnd reason types
  */
 export enum SessionEndReason {
-  Exit = 'exit',
-  Clear = 'clear',
-  Logout = 'logout',
-  PromptInputExit = 'prompt_input_exit',
-  Other = 'other',
+  Exit = "exit",
+  Clear = "clear",
+  Logout = "logout",
+  PromptInputExit = "prompt_input_exit",
+  Other = "other",
 }
 
 /**
@@ -505,8 +469,8 @@ export interface SessionEndInput extends HookInput {
  * PreCompress trigger types
  */
 export enum PreCompressTrigger {
-  Manual = 'manual',
-  Auto = 'auto',
+  Manual = "manual",
+  Auto = "auto",
 }
 
 /**
@@ -536,7 +500,7 @@ export interface BeforeModelInput extends HookInput {
  */
 export interface BeforeModelOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeModel';
+    hookEventName: "BeforeModel";
     llm_request?: Partial<LLMRequest>;
     llm_response?: LLMResponse;
   };
@@ -555,7 +519,7 @@ export interface AfterModelInput extends HookInput {
  */
 export interface AfterModelOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'AfterModel';
+    hookEventName: "AfterModel";
     llm_response?: Partial<LLMResponse>;
   };
 }
@@ -572,7 +536,7 @@ export interface BeforeToolSelectionInput extends HookInput {
  */
 export interface BeforeToolSelectionOutput extends HookOutput {
   hookSpecificOutput?: {
-    hookEventName: 'BeforeToolSelection';
+    hookEventName: "BeforeToolSelection";
     toolConfig?: HookToolConfig;
   };
 }
diff --git a/packages/gemini-core/src/ide/constants.ts b/packages/gemini-core/src/ide/constants.ts
index 2844a5d85..f1b74a375 100644
--- a/packages/gemini-core/src/ide/constants.ts
+++ b/packages/gemini-core/src/ide/constants.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const GEMINI_CLI_COMPANION_EXTENSION_NAME = 'Gemini CLI Companion';
+export const GEMINI_CLI_COMPANION_EXTENSION_NAME = "Gemini CLI Companion";
 export const IDE_MAX_OPEN_FILES = 10;
 export const IDE_MAX_SELECTED_TEXT_LENGTH = 16384; // 16 KiB limit
 export const IDE_REQUEST_TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
diff --git a/packages/gemini-core/src/ide/detect-ide.test.ts b/packages/gemini-core/src/ide/detect-ide.test.ts
index 66993314c..abdaadf91 100644
--- a/packages/gemini-core/src/ide/detect-ide.test.ts
+++ b/packages/gemini-core/src/ide/detect-ide.test.ts
@@ -4,122 +4,118 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach } from 'vitest';
-import { detectIde, IDE_DEFINITIONS } from './detect-ide.js';
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { detectIde, IDE_DEFINITIONS } from "./detect-ide.js";
 
-describe('detectIde', () => {
-  const ideProcessInfo = { pid: 123, command: 'some/path/to/code' };
-  const ideProcessInfoNoCode = { pid: 123, command: 'some/path/to/fork' };
+describe("detectIde", () => {
+  const ideProcessInfo = { pid: 123, command: "some/path/to/code" };
+  const ideProcessInfoNoCode = { pid: 123, command: "some/path/to/fork" };
 
   afterEach(() => {
     vi.unstubAllEnvs();
     // Clear Cursor-specific environment variables that might interfere with tests
-    delete process.env['CURSOR_TRACE_ID'];
+    delete process.env["CURSOR_TRACE_ID"];
   });
 
-  it('should return undefined if TERM_PROGRAM is not vscode', () => {
-    vi.stubEnv('TERM_PROGRAM', '');
+  it("should return undefined if TERM_PROGRAM is not vscode", () => {
+    vi.stubEnv("TERM_PROGRAM", "");
     expect(detectIde(ideProcessInfo)).toBeUndefined();
   });
 
-  it('should detect Devin', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('__COG_BASHRC_SOURCED', '1');
+  it("should detect Devin", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("__COG_BASHRC_SOURCED", "1");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.devin);
   });
 
-  it('should detect Replit', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('REPLIT_USER', 'testuser');
+  it("should detect Replit", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("REPLIT_USER", "testuser");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.replit);
   });
 
-  it('should detect Cursor', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CURSOR_TRACE_ID', 'some-id');
+  it("should detect Cursor", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CURSOR_TRACE_ID", "some-id");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cursor);
   });
 
-  it('should detect Codespaces', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CODESPACES', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Codespaces", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CODESPACES", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.codespaces);
   });
 
-  it('should detect Cloud Shell via EDITOR_IN_CLOUD_SHELL', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('EDITOR_IN_CLOUD_SHELL', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Cloud Shell via EDITOR_IN_CLOUD_SHELL", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("EDITOR_IN_CLOUD_SHELL", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cloudshell);
   });
 
-  it('should detect Cloud Shell via CLOUD_SHELL', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CLOUD_SHELL', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Cloud Shell via CLOUD_SHELL", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CLOUD_SHELL", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.cloudshell);
   });
 
-  it('should detect Trae', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('TERM_PRODUCT', 'Trae');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Trae", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("TERM_PRODUCT", "Trae");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.trae);
   });
 
-  it('should detect Firebase Studio via MONOSPACE_ENV', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('MONOSPACE_ENV', 'true');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+  it("should detect Firebase Studio via MONOSPACE_ENV", () => {
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("MONOSPACE_ENV", "true");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.firebasestudio);
   });
 
   it('should detect VSCode when no other IDE is detected and command includes "code"', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('MONOSPACE_ENV', '');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("MONOSPACE_ENV", "");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfo)).toBe(IDE_DEFINITIONS.vscode);
   });
 
   it('should detect VSCodeFork when no other IDE is detected and command does not include "code"', () => {
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('MONOSPACE_ENV', '');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("MONOSPACE_ENV", "");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
     expect(detectIde(ideProcessInfoNoCode)).toBe(IDE_DEFINITIONS.vscodefork);
   });
 });
 
-describe('detectIde with ideInfoFromFile', () => {
-  const ideProcessInfo = { pid: 123, command: 'some/path/to/code' };
+describe("detectIde with ideInfoFromFile", () => {
+  const ideProcessInfo = { pid: 123, command: "some/path/to/code" };
 
   afterEach(() => {
     vi.unstubAllEnvs();
   });
 
-  it('should use the name and displayName from the file', () => {
+  it("should use the name and displayName from the file", () => {
     const ideInfoFromFile = {
-      name: 'custom-ide',
-      displayName: 'Custom IDE',
+      name: "custom-ide",
+      displayName: "Custom IDE",
     };
     expect(detectIde(ideProcessInfo, ideInfoFromFile)).toEqual(ideInfoFromFile);
   });
 
-  it('should fall back to env detection if name is missing', () => {
-    const ideInfoFromFile = { displayName: 'Custom IDE' };
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
-    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(
-      IDE_DEFINITIONS.vscode,
-    );
+  it("should fall back to env detection if name is missing", () => {
+    const ideInfoFromFile = { displayName: "Custom IDE" };
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
+    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(IDE_DEFINITIONS.vscode);
   });
 
-  it('should fall back to env detection if displayName is missing', () => {
-    const ideInfoFromFile = { name: 'custom-ide' };
-    vi.stubEnv('TERM_PROGRAM', 'vscode');
-    vi.stubEnv('CURSOR_TRACE_ID', '');
-    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(
-      IDE_DEFINITIONS.vscode,
-    );
+  it("should fall back to env detection if displayName is missing", () => {
+    const ideInfoFromFile = { name: "custom-ide" };
+    vi.stubEnv("TERM_PROGRAM", "vscode");
+    vi.stubEnv("CURSOR_TRACE_ID", "");
+    expect(detectIde(ideProcessInfo, ideInfoFromFile)).toBe(IDE_DEFINITIONS.vscode);
   });
 });
diff --git a/packages/gemini-core/src/ide/detect-ide.ts b/packages/gemini-core/src/ide/detect-ide.ts
index 951abbf71..79d29fb0f 100644
--- a/packages/gemini-core/src/ide/detect-ide.ts
+++ b/packages/gemini-core/src/ide/detect-ide.ts
@@ -5,15 +5,15 @@
  */
 
 export const IDE_DEFINITIONS = {
-  devin: { name: 'devin', displayName: 'Devin' },
-  replit: { name: 'replit', displayName: 'Replit' },
-  cursor: { name: 'cursor', displayName: 'Cursor' },
-  cloudshell: { name: 'cloudshell', displayName: 'Cloud Shell' },
-  codespaces: { name: 'codespaces', displayName: 'GitHub Codespaces' },
-  firebasestudio: { name: 'firebasestudio', displayName: 'Firebase Studio' },
-  trae: { name: 'trae', displayName: 'Trae' },
-  vscode: { name: 'vscode', displayName: 'VS Code' },
-  vscodefork: { name: 'vscodefork', displayName: 'IDE' },
+  devin: { name: "devin", displayName: "Devin" },
+  replit: { name: "replit", displayName: "Replit" },
+  cursor: { name: "cursor", displayName: "Cursor" },
+  cloudshell: { name: "cloudshell", displayName: "Cloud Shell" },
+  codespaces: { name: "codespaces", displayName: "GitHub Codespaces" },
+  firebasestudio: { name: "firebasestudio", displayName: "Firebase Studio" },
+  trae: { name: "trae", displayName: "Trae" },
+  vscode: { name: "vscode", displayName: "VS Code" },
+  vscodefork: { name: "vscodefork", displayName: "IDE" },
 } as const;
 
 export interface IdeInfo {
@@ -22,29 +22,29 @@ export interface IdeInfo {
 }
 
 export function isCloudShell(): boolean {
-  return !!(process.env['EDITOR_IN_CLOUD_SHELL'] || process.env['CLOUD_SHELL']);
+  return !!(process.env["EDITOR_IN_CLOUD_SHELL"] || process.env["CLOUD_SHELL"]);
 }
 
 export function detectIdeFromEnv(): IdeInfo {
-  if (process.env['__COG_BASHRC_SOURCED']) {
+  if (process.env["__COG_BASHRC_SOURCED"]) {
     return IDE_DEFINITIONS.devin;
   }
-  if (process.env['REPLIT_USER']) {
+  if (process.env["REPLIT_USER"]) {
     return IDE_DEFINITIONS.replit;
   }
-  if (process.env['CURSOR_TRACE_ID']) {
+  if (process.env["CURSOR_TRACE_ID"]) {
     return IDE_DEFINITIONS.cursor;
   }
-  if (process.env['CODESPACES']) {
+  if (process.env["CODESPACES"]) {
     return IDE_DEFINITIONS.codespaces;
   }
   if (isCloudShell()) {
     return IDE_DEFINITIONS.cloudshell;
   }
-  if (process.env['TERM_PRODUCT'] === 'Trae') {
+  if (process.env["TERM_PRODUCT"] === "Trae") {
     return IDE_DEFINITIONS.trae;
   }
-  if (process.env['MONOSPACE_ENV']) {
+  if (process.env["MONOSPACE_ENV"]) {
     return IDE_DEFINITIONS.firebasestudio;
   }
   return IDE_DEFINITIONS.vscode;
@@ -60,10 +60,7 @@ function verifyVSCode(
   if (ide.name !== IDE_DEFINITIONS.vscode.name) {
     return ide;
   }
-  if (
-    !ideProcessInfo.command ||
-    ideProcessInfo.command.toLowerCase().includes('code')
-  ) {
+  if (!ideProcessInfo.command || ideProcessInfo.command.toLowerCase().includes("code")) {
     return IDE_DEFINITIONS.vscode;
   }
   return IDE_DEFINITIONS.vscodefork;
@@ -84,7 +81,7 @@ export function detectIde(
   }
 
   // Only VSCode-based integrations are currently supported.
-  if (process.env['TERM_PROGRAM'] !== 'vscode') {
+  if (process.env["TERM_PROGRAM"] !== "vscode") {
     return undefined;
   }
 
diff --git a/packages/gemini-core/src/ide/ide-client.test.ts b/packages/gemini-core/src/ide/ide-client.test.ts
index 1881d9112..97ab51c25 100644
--- a/packages/gemini-core/src/ide/ide-client.test.ts
+++ b/packages/gemini-core/src/ide/ide-client.test.ts
@@ -4,27 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mocked,
-  type Mock,
-} from 'vitest';
-import { IdeClient, IDEConnectionStatus } from './ide-client.js';
-import * as fs from 'node:fs';
-import { getIdeProcessInfo } from './process-utils.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { detectIde, IDE_DEFINITIONS } from './detect-ide.js';
-import * as os from 'node:os';
-import * as path from 'node:path';
-
-vi.mock('node:fs', async (importOriginal) => {
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { afterEach, beforeEach, describe, expect, it, type Mock, type Mocked, vi } from "vitest";
+import { detectIde, IDE_DEFINITIONS } from "./detect-ide.js";
+import { IDEConnectionStatus, IdeClient } from "./ide-client.js";
+import { getIdeProcessInfo } from "./process-utils.js";
+
+vi.mock("node:fs", async (importOriginal) => {
   const actual = await importOriginal<typeof fs>();
   return {
     ...(actual as object),
@@ -37,37 +28,36 @@ vi.mock('node:fs', async (importOriginal) => {
     existsSync: () => false,
   };
 });
-vi.mock('./process-utils.js');
-vi.mock('@modelcontextprotocol/sdk/client/index.js');
-vi.mock('@modelcontextprotocol/sdk/client/streamableHttp.js');
-vi.mock('@modelcontextprotocol/sdk/client/stdio.js');
-vi.mock('./detect-ide.js');
-vi.mock('node:os');
-
-describe('IdeClient', () => {
+vi.mock("./process-utils.js");
+vi.mock("@modelcontextprotocol/sdk/client/index.js");
+vi.mock("@modelcontextprotocol/sdk/client/streamableHttp.js");
+vi.mock("@modelcontextprotocol/sdk/client/stdio.js");
+vi.mock("./detect-ide.js");
+vi.mock("node:os");
+
+describe("IdeClient", () => {
   let mockClient: Mocked<Client>;
   let mockHttpTransport: Mocked<StreamableHTTPClientTransport>;
   let mockStdioTransport: Mocked<StdioClientTransport>;
 
   beforeEach(async () => {
     // Reset singleton instance for test isolation
-    (IdeClient as unknown as { instance: IdeClient | undefined }).instance =
-      undefined;
+    (IdeClient as unknown as { instance: IdeClient | undefined }).instance = undefined;
 
     // Mock environment variables
-    process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'] = '/test/workspace';
-    delete process.env['GEMINI_CLI_IDE_SERVER_PORT'];
-    delete process.env['GEMINI_CLI_IDE_SERVER_STDIO_COMMAND'];
-    delete process.env['GEMINI_CLI_IDE_SERVER_STDIO_ARGS'];
+    process.env["GEMINI_CLI_IDE_WORKSPACE_PATH"] = "/test/workspace";
+    delete process.env["GEMINI_CLI_IDE_SERVER_PORT"];
+    delete process.env["GEMINI_CLI_IDE_SERVER_STDIO_COMMAND"];
+    delete process.env["GEMINI_CLI_IDE_SERVER_STDIO_ARGS"];
 
     // Mock dependencies
-    vi.spyOn(process, 'cwd').mockReturnValue('/test/workspace/sub-dir');
+    vi.spyOn(process, "cwd").mockReturnValue("/test/workspace/sub-dir");
     vi.mocked(detectIde).mockReturnValue(IDE_DEFINITIONS.vscode);
     vi.mocked(getIdeProcessInfo).mockResolvedValue({
       pid: 12345,
-      command: 'test-ide',
+      command: "test-ide",
     });
-    vi.mocked(os.tmpdir).mockReturnValue('/tmp');
+    vi.mocked(os.tmpdir).mockReturnValue("/tmp");
 
     // Mock MCP client and transports
     mockClient = {
@@ -95,65 +85,55 @@ describe('IdeClient', () => {
     vi.restoreAllMocks();
   });
 
-  describe('connect', () => {
-    it('should connect using HTTP when port is provided in config file', async () => {
-      const config = { port: '8080' };
+  describe("connect", () => {
+    it("should connect using HTTP when port is provided in config file", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/', 'gemini-ide-server-12345.json'),
-        'utf8',
+        path.join("/tmp/", "gemini-ide-server-12345.json"),
+        "utf8",
       );
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:8080/mcp'),
+        new URL("http://127.0.0.1:8080/mcp"),
         expect.any(Object),
       );
       expect(mockClient.connect).toHaveBeenCalledWith(mockHttpTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should connect using stdio when stdio config is provided in file', async () => {
-      const config = { stdio: { command: 'test-cmd', args: ['--foo'] } };
+    it("should connect using stdio when stdio config is provided in file", async () => {
+      const config = { stdio: { command: "test-cmd", args: ["--foo"] } };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StdioClientTransport).toHaveBeenCalledWith({
-        command: 'test-cmd',
-        args: ['--foo'],
+        command: "test-cmd",
+        args: ["--foo"],
       });
       expect(mockClient.connect).toHaveBeenCalledWith(mockStdioTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should prioritize port over stdio when both are in config file', async () => {
+    it("should prioritize port over stdio when both are in config file", async () => {
       const config = {
-        port: '8080',
-        stdio: { command: 'test-cmd', args: ['--foo'] },
+        port: "8080",
+        stdio: { command: "test-cmd", args: ["--foo"] },
       };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
@@ -161,90 +141,68 @@ describe('IdeClient', () => {
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalled();
       expect(StdioClientTransport).not.toHaveBeenCalled();
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should connect using HTTP when port is provided in environment variables', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(
-        new Error('File not found'),
-      );
+    it("should connect using HTTP when port is provided in environment variables", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("File not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '9090';
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "9090";
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:9090/mcp'),
+        new URL("http://127.0.0.1:9090/mcp"),
         expect.any(Object),
       );
       expect(mockClient.connect).toHaveBeenCalledWith(mockHttpTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should connect using stdio when stdio config is in environment variables', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(
-        new Error('File not found'),
-      );
+    it("should connect using stdio when stdio config is in environment variables", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("File not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      process.env['GEMINI_CLI_IDE_SERVER_STDIO_COMMAND'] = 'env-cmd';
-      process.env['GEMINI_CLI_IDE_SERVER_STDIO_ARGS'] = '["--bar"]';
+      process.env["GEMINI_CLI_IDE_SERVER_STDIO_COMMAND"] = "env-cmd";
+      process.env["GEMINI_CLI_IDE_SERVER_STDIO_ARGS"] = '["--bar"]';
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StdioClientTransport).toHaveBeenCalledWith({
-        command: 'env-cmd',
-        args: ['--bar'],
+        command: "env-cmd",
+        args: ["--bar"],
       });
       expect(mockClient.connect).toHaveBeenCalledWith(mockStdioTransport);
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should prioritize file config over environment variables', async () => {
-      const config = { port: '8080' };
+    it("should prioritize file config over environment variables", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '9090';
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "9090";
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:8080/mcp'),
+        new URL("http://127.0.0.1:8080/mcp"),
         expect.any(Object),
       );
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
 
-    it('should be disconnected if no config is found', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(
-        new Error('File not found'),
-      );
+    it("should be disconnected if no config is found", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("File not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
@@ -252,18 +210,14 @@ describe('IdeClient', () => {
 
       expect(StreamableHTTPClientTransport).not.toHaveBeenCalled();
       expect(StdioClientTransport).not.toHaveBeenCalled();
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Disconnected,
-      );
-      expect(ideClient.getConnectionStatus().details).toContain(
-        'Failed to connect',
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Disconnected);
+      expect(ideClient.getConnectionStatus().details).toContain("Failed to connect");
     });
   });
 
-  describe('getConnectionConfigFromFile', () => {
-    it('should return config from the specific pid file if it exists', async () => {
-      const config = { port: '1234', workspacePath: '/test/workspace' };
+  describe("getConnectionConfigFromFile", () => {
+    it("should return config from the specific pid file if it exists", async () => {
+      const config = { port: "1234", workspacePath: "/test/workspace" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
 
       const ideClient = await IdeClient.getInstance();
@@ -276,17 +230,15 @@ describe('IdeClient', () => {
 
       expect(result).toEqual(config);
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp', 'gemini-ide-server-12345.json'),
-        'utf8',
+        path.join("/tmp", "gemini-ide-server-12345.json"),
+        "utf8",
       );
     });
 
-    it('should return undefined if no config files are found', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error('not found'));
+    it("should return undefined if no config files are found", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValue(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
@@ -299,18 +251,14 @@ describe('IdeClient', () => {
       expect(result).toBeUndefined();
     });
 
-    it('should find and parse a single config file with the new naming scheme', async () => {
-      const config = { port: '5678', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      ); // For old path
+    it("should find and parse a single config file with the new naming scheme", async () => {
+      const config = { port: "5678", workspacePath: "/test/workspace" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found")); // For old path
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue(['gemini-ide-server-12345-123.json']);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-123.json"]);
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -323,37 +271,30 @@ describe('IdeClient', () => {
 
       expect(result).toEqual(config);
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'gemini-ide-server-12345-123.json'),
-        'utf8',
+        path.join("/tmp/gemini/ide", "gemini-ide-server-12345-123.json"),
+        "utf8",
       );
     });
 
-    it('should filter out configs with invalid workspace paths', async () => {
+    it("should filter out configs with invalid workspace paths", async () => {
       const validConfig = {
-        port: '5678',
-        workspacePath: '/test/workspace',
+        port: "5678",
+        workspacePath: "/test/workspace",
       };
       const invalidConfig = {
-        port: '1111',
-        workspacePath: '/invalid/workspace',
+        port: "1111",
+        workspacePath: "/invalid/workspace",
       };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(invalidConfig))
         .mockResolvedValueOnce(JSON.stringify(validConfig));
 
       const validateSpy = vi
-        .spyOn(IdeClient, 'validateWorkspacePath')
+        .spyOn(IdeClient, "validateWorkspacePath")
         .mockReturnValueOnce({ isValid: false })
         .mockReturnValueOnce({ isValid: true });
 
@@ -365,34 +306,21 @@ describe('IdeClient', () => {
       ).getConnectionConfigFromFile();
 
       expect(result).toEqual(validConfig);
-      expect(validateSpy).toHaveBeenCalledWith(
-        '/invalid/workspace',
-        '/test/workspace/sub-dir',
-      );
-      expect(validateSpy).toHaveBeenCalledWith(
-        '/test/workspace',
-        '/test/workspace/sub-dir',
-      );
+      expect(validateSpy).toHaveBeenCalledWith("/invalid/workspace", "/test/workspace/sub-dir");
+      expect(validateSpy).toHaveBeenCalledWith("/test/workspace", "/test/workspace/sub-dir");
     });
 
-    it('should return the first valid config when multiple workspaces are valid', async () => {
-      const config1 = { port: '1111', workspacePath: '/test/workspace' };
-      const config2 = { port: '2222', workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should return the first valid config when multiple workspaces are valid", async () => {
+      const config1 = { port: "1111", workspacePath: "/test/workspace" };
+      const config2 = { port: "2222", workspacePath: "/test/workspace2" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(config1))
         .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -406,25 +334,18 @@ describe('IdeClient', () => {
       expect(result).toEqual(config1);
     });
 
-    it('should prioritize the config matching the port from the environment variable', async () => {
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '2222';
-      const config1 = { port: '1111', workspacePath: '/test/workspace' };
-      const config2 = { port: '2222', workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should prioritize the config matching the port from the environment variable", async () => {
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "2222";
+      const config1 = { port: "1111", workspacePath: "/test/workspace" };
+      const config2 = { port: "2222", workspacePath: "/test/workspace2" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(config1))
         .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -438,23 +359,16 @@ describe('IdeClient', () => {
       expect(result).toEqual(config2);
     });
 
-    it('should handle invalid JSON in one of the config files', async () => {
-      const validConfig = { port: '2222', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should handle invalid JSON in one of the config files", async () => {
+      const validConfig = { port: "2222", workspacePath: "/test/workspace" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
-        .mockResolvedValueOnce('invalid json')
+        .mockResolvedValueOnce("invalid json")
         .mockResolvedValueOnce(JSON.stringify(validConfig));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -468,13 +382,9 @@ describe('IdeClient', () => {
       expect(result).toEqual(validConfig);
     });
 
-    it('should return undefined if readdir throws an error', async () => {
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
-      vi.mocked(fs.promises.readdir).mockRejectedValue(
-        new Error('readdir failed'),
-      );
+    it("should return undefined if readdir throws an error", async () => {
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
+      vi.mocked(fs.promises.readdir).mockRejectedValue(new Error("readdir failed"));
 
       const ideClient = await IdeClient.getInstance();
       const result = await (
@@ -486,24 +396,18 @@ describe('IdeClient', () => {
       expect(result).toBeUndefined();
     });
 
-    it('should ignore files with invalid names', async () => {
-      const validConfig = { port: '3333', workspacePath: '/test/workspace' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should ignore files with invalid names", async () => {
+      const validConfig = { port: "3333", workspacePath: "/test/workspace" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json', // valid
-        'not-a-config-file.txt', // invalid
-        'gemini-ide-server-asdf.json', // invalid
+        "gemini-ide-server-12345-111.json", // valid
+        "not-a-config-file.txt", // invalid
+        "gemini-ide-server-asdf.json", // invalid
       ]);
-      vi.mocked(fs.promises.readFile).mockResolvedValueOnce(
-        JSON.stringify(validConfig),
-      );
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.mocked(fs.promises.readFile).mockResolvedValueOnce(JSON.stringify(validConfig));
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -516,34 +420,27 @@ describe('IdeClient', () => {
 
       expect(result).toEqual(validConfig);
       expect(fs.promises.readFile).toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'gemini-ide-server-12345-111.json'),
-        'utf8',
+        path.join("/tmp/gemini/ide", "gemini-ide-server-12345-111.json"),
+        "utf8",
       );
       expect(fs.promises.readFile).not.toHaveBeenCalledWith(
-        path.join('/tmp/gemini/ide', 'not-a-config-file.txt'),
-        'utf8',
+        path.join("/tmp/gemini/ide", "not-a-config-file.txt"),
+        "utf8",
       );
     });
 
-    it('should match env port string to a number port in the config', async () => {
-      process.env['GEMINI_CLI_IDE_SERVER_PORT'] = '3333';
-      const config1 = { port: 1111, workspacePath: '/test/workspace' };
-      const config2 = { port: 3333, workspacePath: '/test/workspace2' };
-      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(
-        new Error('not found'),
-      );
+    it("should match env port string to a number port in the config", async () => {
+      process.env["GEMINI_CLI_IDE_SERVER_PORT"] = "3333";
+      const config1 = { port: 1111, workspacePath: "/test/workspace" };
+      const config2 = { port: 3333, workspacePath: "/test/workspace2" };
+      vi.mocked(fs.promises.readFile).mockRejectedValueOnce(new Error("not found"));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
-      ).mockResolvedValue([
-        'gemini-ide-server-12345-111.json',
-        'gemini-ide-server-12345-222.json',
-      ]);
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
+      ).mockResolvedValue(["gemini-ide-server-12345-111.json", "gemini-ide-server-12345-222.json"]);
       vi.mocked(fs.promises.readFile)
         .mockResolvedValueOnce(JSON.stringify(config1))
         .mockResolvedValueOnce(JSON.stringify(config2));
-      vi.spyOn(IdeClient, 'validateWorkspacePath').mockReturnValue({
+      vi.spyOn(IdeClient, "validateWorkspacePath").mockReturnValue({
         isValid: true,
       });
 
@@ -558,96 +455,80 @@ describe('IdeClient', () => {
     });
   });
 
-  describe('isDiffingEnabled', () => {
-    it('should return false if not connected', async () => {
+  describe("isDiffingEnabled", () => {
+    it("should return false if not connected", async () => {
       const ideClient = await IdeClient.getInstance();
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return false if tool discovery fails', async () => {
-      const config = { port: '8080' };
+    it("should return false if tool discovery fails", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
-      mockClient.request.mockRejectedValue(new Error('Method not found'));
+      mockClient.request.mockRejectedValue(new Error("Method not found"));
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return false if diffing tools are not available', async () => {
-      const config = { port: '8080' };
+    it("should return false if diffing tools are not available", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
       mockClient.request.mockResolvedValue({
-        tools: [{ name: 'someOtherTool' }],
+        tools: [{ name: "someOtherTool" }],
       });
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return false if only openDiff tool is available', async () => {
-      const config = { port: '8080' };
+    it("should return false if only openDiff tool is available", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
       mockClient.request.mockResolvedValue({
-        tools: [{ name: 'openDiff' }],
+        tools: [{ name: "openDiff" }],
       });
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(false);
     });
 
-    it('should return true if connected and diffing tools are available', async () => {
-      const config = { port: '8080' };
+    it("should return true if connected and diffing tools are available", async () => {
+      const config = { port: "8080" };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
       mockClient.request.mockResolvedValue({
-        tools: [{ name: 'openDiff' }, { name: 'closeDiff' }],
+        tools: [{ name: "openDiff" }, { name: "closeDiff" }],
       });
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
       expect(ideClient.isDiffingEnabled()).toBe(true);
     });
   });
 
-  describe('resolveDiffFromCli', () => {
+  describe("resolveDiffFromCli", () => {
     beforeEach(async () => {
       // Ensure client is "connected" for these tests
       const ideClient = await IdeClient.getInstance();
@@ -666,30 +547,30 @@ describe('IdeClient', () => {
           ideClient as unknown as {
             closeDiff: () => Promise<string | undefined>;
           },
-          'closeDiff',
+          "closeDiff",
         )
-        .mockResolvedValue('final content from ide');
+        .mockResolvedValue("final content from ide");
 
-      const diffPromise = ideClient.openDiff('/test.txt', 'new content');
+      const diffPromise = ideClient.openDiff("/test.txt", "new content");
 
       // Yield to the event loop to allow the openDiff promise executor to run
       await new Promise((resolve) => setImmediate(resolve));
 
-      await ideClient.resolveDiffFromCli('/test.txt', 'accepted');
+      await ideClient.resolveDiffFromCli("/test.txt", "accepted");
 
       const result = await diffPromise;
 
       expect(result).toEqual({
-        status: 'accepted',
-        content: 'final content from ide',
+        status: "accepted",
+        content: "final content from ide",
       });
-      expect(closeDiffSpy).toHaveBeenCalledWith('/test.txt', {
+      expect(closeDiffSpy).toHaveBeenCalledWith("/test.txt", {
         suppressNotification: true,
       });
       expect(
-        (
-          ideClient as unknown as { diffResponses: Map<string, unknown> }
-        ).diffResponses.has('/test.txt'),
+        (ideClient as unknown as { diffResponses: Map<string, unknown> }).diffResponses.has(
+          "/test.txt",
+        ),
       ).toBe(false);
     });
 
@@ -700,96 +581,92 @@ describe('IdeClient', () => {
           ideClient as unknown as {
             closeDiff: () => Promise<string | undefined>;
           },
-          'closeDiff',
+          "closeDiff",
         )
         .mockResolvedValue(undefined);
 
-      const diffPromise = ideClient.openDiff('/test.txt', 'new content');
+      const diffPromise = ideClient.openDiff("/test.txt", "new content");
 
       // Yield to the event loop to allow the openDiff promise executor to run
       await new Promise((resolve) => setImmediate(resolve));
 
-      await ideClient.resolveDiffFromCli('/test.txt', 'rejected');
+      await ideClient.resolveDiffFromCli("/test.txt", "rejected");
 
       const result = await diffPromise;
 
       expect(result).toEqual({
-        status: 'rejected',
+        status: "rejected",
         content: undefined,
       });
-      expect(closeDiffSpy).toHaveBeenCalledWith('/test.txt', {
+      expect(closeDiffSpy).toHaveBeenCalledWith("/test.txt", {
         suppressNotification: true,
       });
       expect(
-        (
-          ideClient as unknown as { diffResponses: Map<string, unknown> }
-        ).diffResponses.has('/test.txt'),
+        (ideClient as unknown as { diffResponses: Map<string, unknown> }).diffResponses.has(
+          "/test.txt",
+        ),
       ).toBe(false);
     });
 
-    it('should do nothing if no diff is open for the given file path', async () => {
+    it("should do nothing if no diff is open for the given file path", async () => {
       const ideClient = await IdeClient.getInstance();
       const closeDiffSpy = vi
         .spyOn(
           ideClient as unknown as {
             closeDiff: () => Promise<string | undefined>;
           },
-          'closeDiff',
+          "closeDiff",
         )
         .mockResolvedValue(undefined);
 
       // No call to openDiff, so no resolver will exist.
-      await ideClient.resolveDiffFromCli('/non-existent.txt', 'accepted');
+      await ideClient.resolveDiffFromCli("/non-existent.txt", "accepted");
 
-      expect(closeDiffSpy).toHaveBeenCalledWith('/non-existent.txt', {
+      expect(closeDiffSpy).toHaveBeenCalledWith("/non-existent.txt", {
         suppressNotification: true,
       });
       // No crash should occur, and nothing should be in the map.
       expect(
-        (
-          ideClient as unknown as { diffResponses: Map<string, unknown> }
-        ).diffResponses.has('/non-existent.txt'),
+        (ideClient as unknown as { diffResponses: Map<string, unknown> }).diffResponses.has(
+          "/non-existent.txt",
+        ),
       ).toBe(false);
     });
   });
 
-  describe('closeDiff', () => {
+  describe("closeDiff", () => {
     beforeEach(async () => {
       const ideClient = await IdeClient.getInstance();
       (ideClient as unknown as { client: Client }).client = mockClient;
     });
 
-    it('should return undefined if client is not connected', async () => {
+    it("should return undefined if client is not connected", async () => {
       const ideClient = await IdeClient.getInstance();
-      (ideClient as unknown as { client: Client | undefined }).client =
-        undefined;
+      (ideClient as unknown as { client: Client | undefined }).client = undefined;
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should call client.request with correct arguments', async () => {
+    it("should call client.request with correct arguments", async () => {
       const ideClient = await IdeClient.getInstance();
       // Return a valid, empty response as the return value is not under test here.
       mockClient.request.mockResolvedValue({ isError: false, content: [] });
 
       await (
         ideClient as unknown as {
-          closeDiff: (
-            f: string,
-            o?: { suppressNotification?: boolean },
-          ) => Promise<void>;
+          closeDiff: (f: string, o?: { suppressNotification?: boolean }) => Promise<void>;
         }
-      ).closeDiff('/test.txt', { suppressNotification: true });
+      ).closeDiff("/test.txt", { suppressNotification: true });
 
       expect(mockClient.request).toHaveBeenCalledWith(
         expect.objectContaining({
           params: {
-            name: 'closeDiff',
+            name: "closeDiff",
             arguments: {
-              filePath: '/test.txt',
+              filePath: "/test.txt",
               suppressNotification: true,
             },
           },
@@ -799,89 +676,87 @@ describe('IdeClient', () => {
       );
     });
 
-    it('should return content from a valid JSON response', async () => {
+    it("should return content from a valid JSON response", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [
-          { type: 'text', text: JSON.stringify({ content: 'file content' }) },
-        ],
+        content: [{ type: "text", text: JSON.stringify({ content: "file content" }) }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<string> }
-      ).closeDiff('/test.txt');
-      expect(result).toBe('file content');
+      ).closeDiff("/test.txt");
+      expect(result).toBe("file content");
     });
 
-    it('should return undefined for a valid JSON response with null content', async () => {
+    it("should return undefined for a valid JSON response with null content", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [{ type: 'text', text: JSON.stringify({ content: null }) }],
+        content: [{ type: "text", text: JSON.stringify({ content: null }) }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if response is not valid JSON', async () => {
+    it("should return undefined if response is not valid JSON", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [{ type: 'text', text: 'not json' }],
+        content: [{ type: "text", text: "not json" }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if request result has isError: true', async () => {
+    it("should return undefined if request result has isError: true", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: true,
-        content: [{ type: 'text', text: 'An error occurred' }],
+        content: [{ type: "text", text: "An error occurred" }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if client.request throws', async () => {
+    it("should return undefined if client.request throws", async () => {
       const ideClient = await IdeClient.getInstance();
-      mockClient.request.mockRejectedValue(new Error('Request failed'));
+      mockClient.request.mockRejectedValue(new Error("Request failed"));
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if response has no text part', async () => {
+    it("should return undefined if response has no text part", async () => {
       const ideClient = await IdeClient.getInstance();
       const response = {
         isError: false,
-        content: [{ type: 'other' }],
+        content: [{ type: "other" }],
       };
       mockClient.request.mockResolvedValue(response);
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined if response is falsy', async () => {
+    it("should return undefined if response is falsy", async () => {
       const ideClient = await IdeClient.getInstance();
       // Mocking with `null as any` to test the falsy path, as the mock
       // function is strictly typed.
@@ -890,27 +765,25 @@ describe('IdeClient', () => {
 
       const result = await (
         ideClient as unknown as { closeDiff: (f: string) => Promise<void> }
-      ).closeDiff('/test.txt');
+      ).closeDiff("/test.txt");
       expect(result).toBeUndefined();
     });
   });
 
-  describe('authentication', () => {
-    it('should connect with an auth token if provided in the discovery file', async () => {
-      const authToken = 'test-auth-token';
-      const config = { port: '8080', authToken };
+  describe("authentication", () => {
+    it("should connect with an auth token if provided in the discovery file", async () => {
+      const authToken = "test-auth-token";
+      const config = { port: "8080", authToken };
       vi.mocked(fs.promises.readFile).mockResolvedValue(JSON.stringify(config));
       (
-        vi.mocked(fs.promises.readdir) as Mock<
-          (path: fs.PathLike) => Promise<string[]>
-        >
+        vi.mocked(fs.promises.readdir) as Mock<(path: fs.PathLike) => Promise<string[]>>
       ).mockResolvedValue([]);
 
       const ideClient = await IdeClient.getInstance();
       await ideClient.connect();
 
       expect(StreamableHTTPClientTransport).toHaveBeenCalledWith(
-        new URL('http://127.0.0.1:8080/mcp'),
+        new URL("http://127.0.0.1:8080/mcp"),
         expect.objectContaining({
           requestInit: {
             headers: {
@@ -919,9 +792,7 @@ describe('IdeClient', () => {
           },
         }),
       );
-      expect(ideClient.getConnectionStatus().status).toBe(
-        IDEConnectionStatus.Connected,
-      );
+      expect(ideClient.getConnectionStatus().status).toBe(IDEConnectionStatus.Connected);
     });
   });
 });
diff --git a/packages/gemini-core/src/ide/ide-client.ts b/packages/gemini-core/src/ide/ide-client.ts
index 7190228eb..0cb19dc66 100644
--- a/packages/gemini-core/src/ide/ide-client.ts
+++ b/packages/gemini-core/src/ide/ide-client.ts
@@ -4,42 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { isSubpath } from '../utils/paths.js';
-import { detectIde, type IdeInfo } from '../ide/detect-ide.js';
-import { ideContextStore } from './ideContext.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { CallToolResultSchema, ListToolsResultSchema } from "@modelcontextprotocol/sdk/types.js";
+import { EnvHttpProxyAgent } from "undici";
+import { detectIde, type IdeInfo } from "../ide/detect-ide.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isSubpath } from "../utils/paths.js";
+import { IDE_REQUEST_TIMEOUT_MS } from "./constants.js";
+import { ideContextStore } from "./ideContext.js";
+import { getIdeProcessInfo } from "./process-utils.js";
 import {
   IdeContextNotificationSchema,
   IdeDiffAcceptedNotificationSchema,
   IdeDiffClosedNotificationSchema,
   IdeDiffRejectedNotificationSchema,
-} from './types.js';
-import { getIdeProcessInfo } from './process-utils.js';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { EnvHttpProxyAgent } from 'undici';
-import { ListToolsResultSchema } from '@modelcontextprotocol/sdk/types.js';
-import { IDE_REQUEST_TIMEOUT_MS } from './constants.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "./types.js";
 
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) => debugLogger.debug('[DEBUG] [IDEClient]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [IDEClient]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: (...args: any[]) => console.error('[ERROR] [IDEClient]', ...args),
+  error: (...args: any[]) => console.error("[ERROR] [IDEClient]", ...args),
 };
 
 export type DiffUpdateResult =
   | {
-      status: 'accepted';
+      status: "accepted";
       content?: string;
     }
   | {
-      status: 'rejected';
+      status: "rejected";
       content: undefined;
     };
 
@@ -49,9 +48,9 @@ export type IDEConnectionState = {
 };
 
 export enum IDEConnectionStatus {
-  Connected = 'connected',
-  Disconnected = 'disconnected',
-  Connecting = 'connecting',
+  Connected = "connected",
+  Disconnected = "disconnected",
+  Connecting = "connecting",
 }
 
 type StdioConfig = {
@@ -83,8 +82,7 @@ export class IdeClient {
   private client: Client | undefined = undefined;
   private state: IDEConnectionState = {
     status: IDEConnectionStatus.Disconnected,
-    details:
-      'IDE integration is currently disabled. To enable it, run /ide enable.',
+    details: "IDE integration is currently disabled. To enable it, run /ide enable.",
   };
   private currentIde: IdeInfo | undefined;
   private ideProcessInfo: { pid: number; command: string } | undefined;
@@ -111,10 +109,7 @@ export class IdeClient {
         const client = new IdeClient();
         client.ideProcessInfo = await getIdeProcessInfo();
         client.connectionConfig = await client.getConnectionConfigFromFile();
-        client.currentIde = detectIde(
-          client.ideProcessInfo,
-          client.connectionConfig?.ideInfo,
-        );
+        client.currentIde = detectIde(client.ideProcessInfo, client.connectionConfig?.ideInfo);
         return client;
       })();
     }
@@ -154,13 +149,9 @@ export class IdeClient {
       this.authToken = this.connectionConfig.authToken;
     }
     const workspacePath =
-      this.connectionConfig?.workspacePath ??
-      process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];
+      this.connectionConfig?.workspacePath ?? process.env["GEMINI_CLI_IDE_WORKSPACE_PATH"];
 
-    const { isValid, error } = IdeClient.validateWorkspacePath(
-      workspacePath,
-      process.cwd(),
-    );
+    const { isValid, error } = IdeClient.validateWorkspacePath(workspacePath, process.cwd());
 
     if (!isValid) {
       this.setState(IDEConnectionStatus.Disconnected, error, true);
@@ -169,17 +160,13 @@ export class IdeClient {
 
     if (this.connectionConfig) {
       if (this.connectionConfig.port) {
-        const connected = await this.establishHttpConnection(
-          this.connectionConfig.port,
-        );
+        const connected = await this.establishHttpConnection(this.connectionConfig.port);
         if (connected) {
           return;
         }
       }
       if (this.connectionConfig.stdio) {
-        const connected = await this.establishStdioConnection(
-          this.connectionConfig.stdio,
-        );
+        const connected = await this.establishStdioConnection(this.connectionConfig.stdio);
         if (connected) {
           return;
         }
@@ -227,22 +214,19 @@ export class IdeClient {
    *   whether the diff was 'accepted' or 'rejected' and including the final
    *   content if accepted.
    */
-  async openDiff(
-    filePath: string,
-    newContent: string,
-  ): Promise<DiffUpdateResult> {
+  async openDiff(filePath: string, newContent: string): Promise<DiffUpdateResult> {
     const release = await this.acquireMutex();
 
     const promise = new Promise<DiffUpdateResult>((resolve, reject) => {
       if (!this.client) {
         // The promise will be rejected, and the finally block below will release the mutex.
-        return reject(new Error('IDE client is not connected.'));
+        return reject(new Error("IDE client is not connected."));
       }
       this.diffResponses.set(filePath, resolve);
       this.client
         .request(
           {
-            method: 'tools/call',
+            method: "tools/call",
             params: {
               name: `openDiff`,
               arguments: {
@@ -256,15 +240,9 @@ export class IdeClient {
         )
         .then((parsedResultData) => {
           if (parsedResultData.isError) {
-            const textPart = parsedResultData.content.find(
-              (part) => part.type === 'text',
-            );
-            const errorMessage =
-              textPart?.text ?? `Tool 'openDiff' reported an error.`;
-            logger.debug(
-              `Request for openDiff ${filePath} failed with isError:`,
-              errorMessage,
-            );
+            const textPart = parsedResultData.content.find((part) => part.type === "text");
+            const errorMessage = textPart?.text ?? `Tool 'openDiff' reported an error.`;
+            logger.debug(`Request for openDiff ${filePath} failed with isError:`, errorMessage);
             this.diffResponses.delete(filePath);
             reject(new Error(errorMessage));
           }
@@ -319,7 +297,7 @@ export class IdeClient {
       }
       const resultData = await this.client.request(
         {
-          method: 'tools/call',
+          method: "tools/call",
           params: {
             name: `closeDiff`,
             arguments: {
@@ -337,34 +315,25 @@ export class IdeClient {
       }
 
       if (resultData.isError) {
-        const textPart = resultData.content.find(
-          (part) => part.type === 'text',
-        );
-        const errorMessage =
-          textPart?.text ?? `Tool 'closeDiff' reported an error.`;
-        logger.debug(
-          `Request for closeDiff ${filePath} failed with isError:`,
-          errorMessage,
-        );
+        const textPart = resultData.content.find((part) => part.type === "text");
+        const errorMessage = textPart?.text ?? `Tool 'closeDiff' reported an error.`;
+        logger.debug(`Request for closeDiff ${filePath} failed with isError:`, errorMessage);
         return undefined;
       }
 
-      const textPart = resultData.content.find((part) => part.type === 'text');
+      const textPart = resultData.content.find((part) => part.type === "text");
 
       if (textPart?.text) {
         try {
           const parsedJson = JSON.parse(textPart.text);
-          if (parsedJson && typeof parsedJson.content === 'string') {
+          if (parsedJson && typeof parsedJson.content === "string") {
             return parsedJson.content;
           }
           if (parsedJson && parsedJson.content === null) {
             return undefined;
           }
         } catch (_e) {
-          logger.debug(
-            `Invalid JSON in closeDiff response for ${filePath}:`,
-            textPart.text,
-          );
+          logger.debug(`Invalid JSON in closeDiff response for ${filePath}:`, textPart.text);
         }
       }
     } catch (err) {
@@ -375,7 +344,7 @@ export class IdeClient {
 
   // Closes the diff. Instead of waiting for a notification,
   // manually resolves the diff resolver as the desired outcome.
-  async resolveDiffFromCli(filePath: string, outcome: 'accepted' | 'rejected') {
+  async resolveDiffFromCli(filePath: string, outcome: "accepted" | "rejected") {
     const resolver = this.diffResponses.get(filePath);
     const content = await this.closeDiff(filePath, {
       // Suppress notification to avoid race where closing the diff rejects the
@@ -384,10 +353,10 @@ export class IdeClient {
     });
 
     if (resolver) {
-      if (outcome === 'accepted') {
-        resolver({ status: 'accepted', content });
+      if (outcome === "accepted") {
+        resolver({ status: "accepted", content });
       } else {
-        resolver({ status: 'rejected', content: undefined });
+        resolver({ status: "rejected", content: undefined });
       }
       this.diffResponses.delete(filePath);
     }
@@ -403,7 +372,7 @@ export class IdeClient {
     this.diffResponses.clear();
     this.setState(
       IDEConnectionStatus.Disconnected,
-      'IDE integration disabled. To enable it again, run /ide enable.',
+      "IDE integration disabled. To enable it again, run /ide enable.",
     );
     this.client?.close();
   }
@@ -424,8 +393,8 @@ export class IdeClient {
     return (
       !!this.client &&
       this.state.status === IDEConnectionStatus.Connected &&
-      this.availableTools.includes('openDiff') &&
-      this.availableTools.includes('closeDiff')
+      this.availableTools.includes("openDiff") &&
+      this.availableTools.includes("closeDiff")
     );
   }
 
@@ -434,9 +403,9 @@ export class IdeClient {
       return;
     }
     try {
-      logger.debug('Discovering tools from IDE...');
+      logger.debug("Discovering tools from IDE...");
       const response = await this.client.request(
-        { method: 'tools/list', params: {} },
+        { method: "tools/list", params: {} },
         ListToolsResultSchema,
       );
 
@@ -445,33 +414,24 @@ export class IdeClient {
 
       if (this.availableTools.length > 0) {
         logger.debug(
-          `Discovered ${this.availableTools.length} tools from IDE: ${this.availableTools.join(', ')}`,
+          `Discovered ${this.availableTools.length} tools from IDE: ${this.availableTools.join(", ")}`,
         );
       } else {
-        logger.debug(
-          'IDE supports tool discovery, but no tools are available.',
-        );
+        logger.debug("IDE supports tool discovery, but no tools are available.");
       }
     } catch (error) {
       // It's okay if this fails, the IDE might not support it.
       // Don't log an error if the method is not found, which is a common case.
-      if (
-        error instanceof Error &&
-        !error.message?.includes('Method not found')
-      ) {
+      if (error instanceof Error && !error.message?.includes("Method not found")) {
         logger.error(`Error discovering tools from IDE: ${error.message}`);
       } else {
-        logger.debug('IDE does not support tool discovery.');
+        logger.debug("IDE does not support tool discovery.");
       }
       this.availableTools = [];
     }
   }
 
-  private setState(
-    status: IDEConnectionStatus,
-    details?: string,
-    logToConsole = false,
-  ) {
+  private setState(status: IDEConnectionStatus, details?: string, logToConsole = false) {
     const isAlreadyDisconnected =
       this.state.status === IDEConnectionStatus.Disconnected &&
       status === IDEConnectionStatus.Disconnected;
@@ -510,7 +470,7 @@ export class IdeClient {
       };
     }
 
-    if (ideWorkspacePath === '') {
+    if (ideWorkspacePath === "") {
       return {
         isValid: false,
         error: `To use this feature, please open a workspace folder in your IDE and try again.`,
@@ -528,7 +488,7 @@ export class IdeClient {
       return {
         isValid: false,
         error: `Directory mismatch. Gemini CLI is running in a different location than the open workspace in the IDE. Please run the CLI from one of the following directories: ${ideWorkspacePaths.join(
-          ', ',
+          ", ",
         )}`,
       };
     }
@@ -536,7 +496,7 @@ export class IdeClient {
   }
 
   private getPortFromEnv(): string | undefined {
-    const port = process.env['GEMINI_CLI_IDE_SERVER_PORT'];
+    const port = process.env["GEMINI_CLI_IDE_SERVER_PORT"];
     if (!port) {
       return undefined;
     }
@@ -544,12 +504,12 @@ export class IdeClient {
   }
 
   private getStdioConfigFromEnv(): StdioConfig | undefined {
-    const command = process.env['GEMINI_CLI_IDE_SERVER_STDIO_COMMAND'];
+    const command = process.env["GEMINI_CLI_IDE_SERVER_STDIO_COMMAND"];
     if (!command) {
       return undefined;
     }
 
-    const argsStr = process.env['GEMINI_CLI_IDE_SERVER_STDIO_ARGS'];
+    const argsStr = process.env["GEMINI_CLI_IDE_SERVER_STDIO_ARGS"];
     let args: string[] = [];
     if (argsStr) {
       try {
@@ -557,12 +517,10 @@ export class IdeClient {
         if (Array.isArray(parsedArgs)) {
           args = parsedArgs;
         } else {
-          logger.error(
-            'GEMINI_CLI_IDE_SERVER_STDIO_ARGS must be a JSON array string.',
-          );
+          logger.error("GEMINI_CLI_IDE_SERVER_STDIO_ARGS must be a JSON array string.");
         }
       } catch (e) {
-        logger.error('Failed to parse GEMINI_CLI_IDE_SERVER_STDIO_ARGS:', e);
+        logger.error("Failed to parse GEMINI_CLI_IDE_SERVER_STDIO_ARGS:", e);
       }
     }
 
@@ -570,8 +528,7 @@ export class IdeClient {
   }
 
   private async getConnectionConfigFromFile(): Promise<
-    | (ConnectionConfig & { workspacePath?: string; ideInfo?: IdeInfo })
-    | undefined
+    (ConnectionConfig & { workspacePath?: string; ideInfo?: IdeInfo }) | undefined
   > {
     if (!this.ideProcessInfo) {
       return undefined;
@@ -579,11 +536,8 @@ export class IdeClient {
 
     // For backwards compatibility
     try {
-      const portFile = path.join(
-        os.tmpdir(),
-        `gemini-ide-server-${this.ideProcessInfo.pid}.json`,
-      );
-      const portFileContents = await fs.promises.readFile(portFile, 'utf8');
+      const portFile = path.join(os.tmpdir(), `gemini-ide-server-${this.ideProcessInfo.pid}.json`);
+      const portFileContents = await fs.promises.readFile(portFile, "utf8");
       return JSON.parse(portFileContents);
     } catch (_) {
       // For newer extension versions, the file name matches the pattern
@@ -592,12 +546,12 @@ export class IdeClient {
       // exist.
     }
 
-    const portFileDir = path.join(os.tmpdir(), 'gemini', 'ide');
+    const portFileDir = path.join(os.tmpdir(), "gemini", "ide");
     let portFiles;
     try {
       portFiles = await fs.promises.readdir(portFileDir);
     } catch (e) {
-      logger.debug('Failed to read IDE connection directory:', e);
+      logger.debug("Failed to read IDE connection directory:", e);
       return undefined;
     }
 
@@ -605,12 +559,8 @@ export class IdeClient {
       return undefined;
     }
 
-    const fileRegex = new RegExp(
-      `^gemini-ide-server-${this.ideProcessInfo.pid}-\\d+\\.json$`,
-    );
-    const matchingFiles = portFiles
-      .filter((file) => fileRegex.test(file))
-      .sort();
+    const fileRegex = new RegExp(`^gemini-ide-server-${this.ideProcessInfo.pid}-\\d+\\.json$`);
+    const matchingFiles = portFiles.filter((file) => fileRegex.test(file)).sort();
     if (matchingFiles.length === 0) {
       return undefined;
     }
@@ -618,19 +568,17 @@ export class IdeClient {
     let fileContents: string[];
     try {
       fileContents = await Promise.all(
-        matchingFiles.map((file) =>
-          fs.promises.readFile(path.join(portFileDir, file), 'utf8'),
-        ),
+        matchingFiles.map((file) => fs.promises.readFile(path.join(portFileDir, file), "utf8")),
       );
     } catch (e) {
-      logger.debug('Failed to read IDE connection config file(s):', e);
+      logger.debug("Failed to read IDE connection config file(s):", e);
       return undefined;
     }
     const parsedContents = fileContents.map((content) => {
       try {
         return JSON.parse(content);
       } catch (e) {
-        logger.debug('Failed to parse JSON from config file: ', e);
+        logger.debug("Failed to parse JSON from config file: ", e);
         return undefined;
       }
     });
@@ -639,10 +587,7 @@ export class IdeClient {
       if (!content) {
         return false;
       }
-      const { isValid } = IdeClient.validateWorkspacePath(
-        content.workspacePath,
-        process.cwd(),
-      );
+      const { isValid } = IdeClient.validateWorkspacePath(content.workspacePath, process.cwd());
       return isValid;
     });
 
@@ -656,9 +601,7 @@ export class IdeClient {
 
     const portFromEnv = this.getPortFromEnv();
     if (portFromEnv) {
-      const matchingPort = validWorkspaces.find(
-        (content) => String(content.port) === portFromEnv,
-      );
+      const matchingPort = validWorkspaces.find((content) => String(content.port) === portFromEnv);
       if (matchingPort) {
         return matchingPort;
       }
@@ -669,18 +612,18 @@ export class IdeClient {
 
   private createProxyAwareFetch() {
     // ignore proxy for '127.0.0.1' by default to allow connecting to the ide mcp server
-    const existingNoProxy = process.env['NO_PROXY'] || '';
+    const existingNoProxy = process.env["NO_PROXY"] || "";
     const agent = new EnvHttpProxyAgent({
-      noProxy: [existingNoProxy, '127.0.0.1'].filter(Boolean).join(','),
+      noProxy: [existingNoProxy, "127.0.0.1"].filter(Boolean).join(","),
     });
-    const undiciPromise = import('undici');
+    const undiciPromise = import("undici");
     return async (url: string | URL, init?: RequestInit): Promise<Response> => {
       const { fetch: fetchFn } = await undiciPromise;
       const fetchOptions: RequestInit & { dispatcher?: unknown } = {
         ...init,
         dispatcher: agent,
       };
-      const options = fetchOptions as unknown as import('undici').RequestInit;
+      const options = fetchOptions as unknown as import("undici").RequestInit;
       const response = await fetchFn(url, options);
       return new Response(response.body as ReadableStream<unknown> | null, {
         status: response.status,
@@ -695,18 +638,15 @@ export class IdeClient {
       return;
     }
 
-    this.client.setNotificationHandler(
-      IdeContextNotificationSchema,
-      (notification) => {
-        ideContextStore.set(notification.params);
-        const isTrusted = notification.params.workspaceState?.isTrusted;
-        if (isTrusted !== undefined) {
-          for (const listener of this.trustChangeListeners) {
-            listener(isTrusted);
-          }
+    this.client.setNotificationHandler(IdeContextNotificationSchema, (notification) => {
+      ideContextStore.set(notification.params);
+      const isTrusted = notification.params.workspaceState?.isTrusted;
+      if (isTrusted !== undefined) {
+        for (const listener of this.trustChangeListeners) {
+          listener(isTrusted);
         }
-      },
-    );
+      }
+    });
     this.client.onerror = (_error) => {
       const errorMessage = _error instanceof Error ? _error.message : `_error`;
       this.setState(
@@ -722,68 +662,57 @@ export class IdeClient {
         true,
       );
     };
-    this.client.setNotificationHandler(
-      IdeDiffAcceptedNotificationSchema,
-      (notification) => {
-        const { filePath, content } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'accepted', content });
-          this.diffResponses.delete(filePath);
-        } else {
-          logger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffAcceptedNotificationSchema, (notification) => {
+      const { filePath, content } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "accepted", content });
+        this.diffResponses.delete(filePath);
+      } else {
+        logger.debug(`No resolver found for ${filePath}`);
+      }
+    });
 
-    this.client.setNotificationHandler(
-      IdeDiffRejectedNotificationSchema,
-      (notification) => {
-        const { filePath } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'rejected', content: undefined });
-          this.diffResponses.delete(filePath);
-        } else {
-          logger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffRejectedNotificationSchema, (notification) => {
+      const { filePath } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "rejected", content: undefined });
+        this.diffResponses.delete(filePath);
+      } else {
+        logger.debug(`No resolver found for ${filePath}`);
+      }
+    });
 
     // For backwards compatibility. Newer extension versions will only send
     // IdeDiffRejectedNotificationSchema.
-    this.client.setNotificationHandler(
-      IdeDiffClosedNotificationSchema,
-      (notification) => {
-        const { filePath } = notification.params;
-        const resolver = this.diffResponses.get(filePath);
-        if (resolver) {
-          resolver({ status: 'rejected', content: undefined });
-          this.diffResponses.delete(filePath);
-        } else {
-          logger.debug(`No resolver found for ${filePath}`);
-        }
-      },
-    );
+    this.client.setNotificationHandler(IdeDiffClosedNotificationSchema, (notification) => {
+      const { filePath } = notification.params;
+      const resolver = this.diffResponses.get(filePath);
+      if (resolver) {
+        resolver({ status: "rejected", content: undefined });
+        this.diffResponses.delete(filePath);
+      } else {
+        logger.debug(`No resolver found for ${filePath}`);
+      }
+    });
   }
 
   private async establishHttpConnection(port: string): Promise<boolean> {
     let transport: StreamableHTTPClientTransport | undefined;
     try {
-      logger.debug('Attempting to connect to IDE via HTTP SSE');
+      logger.debug("Attempting to connect to IDE via HTTP SSE");
       this.client = new Client({
-        name: 'streamable-http-client',
+        name: "streamable-http-client",
         // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: "1.0.0",
       });
       transport = new StreamableHTTPClientTransport(
         new URL(`http://${getIdeServerHost()}:${port}/mcp`),
         {
           fetch: this.createProxyAwareFetch(),
           requestInit: {
-            headers: this.authToken
-              ? { Authorization: `Bearer ${this.authToken}` }
-              : {},
+            headers: this.authToken ? { Authorization: `Bearer ${this.authToken}` } : {},
           },
         },
       );
@@ -797,24 +726,21 @@ export class IdeClient {
         try {
           await transport.close();
         } catch (closeError) {
-          logger.debug('Failed to close transport:', closeError);
+          logger.debug("Failed to close transport:", closeError);
         }
       }
       return false;
     }
   }
 
-  private async establishStdioConnection({
-    command,
-    args,
-  }: StdioConfig): Promise<boolean> {
+  private async establishStdioConnection({ command, args }: StdioConfig): Promise<boolean> {
     let transport: StdioClientTransport | undefined;
     try {
-      logger.debug('Attempting to connect to IDE via stdio');
+      logger.debug("Attempting to connect to IDE via stdio");
       this.client = new Client({
-        name: 'stdio-client',
+        name: "stdio-client",
         // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: "1.0.0",
       });
 
       transport = new StdioClientTransport({
@@ -831,7 +757,7 @@ export class IdeClient {
         try {
           await transport.close();
         } catch (closeError) {
-          logger.debug('Failed to close transport:', closeError);
+          logger.debug("Failed to close transport:", closeError);
         }
       }
       return false;
@@ -840,7 +766,6 @@ export class IdeClient {
 }
 
 function getIdeServerHost() {
-  const isInContainer =
-    fs.existsSync('/.dockerenv') || fs.existsSync('/run/.containerenv');
-  return isInContainer ? 'host.docker.internal' : '127.0.0.1';
+  const isInContainer = fs.existsSync("/.dockerenv") || fs.existsSync("/run/.containerenv");
+  return isInContainer ? "host.docker.internal" : "127.0.0.1";
 }
diff --git a/packages/gemini-core/src/ide/ide-installer.test.ts b/packages/gemini-core/src/ide/ide-installer.test.ts
index ff2afce27..071696969 100644
--- a/packages/gemini-core/src/ide/ide-installer.test.ts
+++ b/packages/gemini-core/src/ide/ide-installer.test.ts
@@ -4,40 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
+import { vi } from "vitest";
 
-vi.mock('node:child_process', async (importOriginal) => {
-  const actual =
-    (await importOriginal()) as typeof import('node:child_process');
+vi.mock("node:child_process", async (importOriginal) => {
+  const actual = (await importOriginal()) as typeof import("node:child_process");
   return {
     ...actual,
     execSync: vi.fn(),
     spawnSync: vi.fn(() => ({ status: 0 })),
   };
 });
-vi.mock('fs');
-vi.mock('os');
+vi.mock("fs");
+vi.mock("os");
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { getIdeInstaller } from './ide-installer.js';
-import * as child_process from 'node:child_process';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { IDE_DEFINITIONS, type IdeInfo } from './detect-ide.js';
+import * as child_process from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { IDE_DEFINITIONS, type IdeInfo } from "./detect-ide.js";
+import { getIdeInstaller } from "./ide-installer.js";
 
-describe('ide-installer', () => {
-  const HOME_DIR = '/home/user';
+describe("ide-installer", () => {
+  const HOME_DIR = "/home/user";
 
   beforeEach(() => {
-    vi.spyOn(os, 'homedir').mockReturnValue(HOME_DIR);
+    vi.spyOn(os, "homedir").mockReturnValue(HOME_DIR);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('getIdeInstaller', () => {
+  describe("getIdeInstaller", () => {
     it.each([
       { ide: IDE_DEFINITIONS.vscode },
       { ide: IDE_DEFINITIONS.firebasestudio },
@@ -49,142 +48,126 @@ describe('ide-installer', () => {
     });
   });
 
-  describe('VsCodeInstaller', () => {
+  describe("VsCodeInstaller", () => {
     function setup({
       ide = IDE_DEFINITIONS.vscode,
       existsResult = false,
-      execSync = () => '',
-      platform = 'linux' as NodeJS.Platform,
+      execSync = () => "",
+      platform = "linux" as NodeJS.Platform,
     }: {
       ide?: IdeInfo;
       existsResult?: boolean;
       execSync?: () => string;
       platform?: NodeJS.Platform;
     } = {}) {
-      vi.spyOn(child_process, 'execSync').mockImplementation(execSync);
-      vi.spyOn(fs, 'existsSync').mockReturnValue(existsResult);
+      vi.spyOn(child_process, "execSync").mockImplementation(execSync);
+      vi.spyOn(fs, "existsSync").mockReturnValue(existsResult);
       const installer = getIdeInstaller(ide, platform)!;
 
       return { installer };
     }
 
-    describe('install', () => {
+    describe("install", () => {
       it.each([
         {
-          platform: 'win32' as NodeJS.Platform,
+          platform: "win32" as NodeJS.Platform,
           expectedLookupPaths: [
-            path.join('C:\\Program Files', 'Microsoft VS Code/bin/code.cmd'),
-            path.join(
-              HOME_DIR,
-              '/AppData/Local/Programs/Microsoft VS Code/bin/code.cmd',
-            ),
+            path.join("C:\\Program Files", "Microsoft VS Code/bin/code.cmd"),
+            path.join(HOME_DIR, "/AppData/Local/Programs/Microsoft VS Code/bin/code.cmd"),
           ],
         },
         {
-          platform: 'darwin' as NodeJS.Platform,
+          platform: "darwin" as NodeJS.Platform,
           expectedLookupPaths: [
-            '/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code',
-            path.join(HOME_DIR, 'Library/Application Support/Code/bin/code'),
+            "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code",
+            path.join(HOME_DIR, "Library/Application Support/Code/bin/code"),
           ],
         },
         {
-          platform: 'linux' as NodeJS.Platform,
-          expectedLookupPaths: ['/usr/share/code/bin/code'],
+          platform: "linux" as NodeJS.Platform,
+          expectedLookupPaths: ["/usr/share/code/bin/code"],
         },
-      ])(
-        'identifies the path to code cli on platform: $platform',
-        async ({ platform, expectedLookupPaths }) => {
-          const { installer } = setup({
-            platform,
-            execSync: () => {
-              throw new Error('Command not found'); // `code` is not in PATH
-            },
-          });
-          await installer.install();
-          for (const [idx, path] of expectedLookupPaths.entries()) {
-            expect(fs.existsSync).toHaveBeenNthCalledWith(idx + 1, path);
-          }
-        },
-      );
+      ])("identifies the path to code cli on platform: $platform", async ({
+        platform,
+        expectedLookupPaths,
+      }) => {
+        const { installer } = setup({
+          platform,
+          execSync: () => {
+            throw new Error("Command not found"); // `code` is not in PATH
+          },
+        });
+        await installer.install();
+        for (const [idx, path] of expectedLookupPaths.entries()) {
+          expect(fs.existsSync).toHaveBeenNthCalledWith(idx + 1, path);
+        }
+      });
 
-      it('installs the extension using code cli', async () => {
+      it("installs the extension using code cli", async () => {
         const { installer } = setup({
-          platform: 'linux',
+          platform: "linux",
         });
         await installer.install();
         expect(child_process.spawnSync).toHaveBeenCalledWith(
-          'code',
-          [
-            '--install-extension',
-            'google.gemini-cli-vscode-ide-companion',
-            '--force',
-          ],
-          { stdio: 'pipe', shell: false },
+          "code",
+          ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+          { stdio: "pipe", shell: false },
         );
       });
 
-      it('installs the extension using code cli on windows', async () => {
+      it("installs the extension using code cli on windows", async () => {
         const { installer } = setup({
-          platform: 'win32',
-          execSync: () => 'C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd',
+          platform: "win32",
+          execSync: () => "C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd",
         });
         await installer.install();
         expect(child_process.spawnSync).toHaveBeenCalledWith(
-          'C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd',
-          [
-            '--install-extension',
-            'google.gemini-cli-vscode-ide-companion',
-            '--force',
-          ],
-          { stdio: 'pipe', shell: true },
+          "C:\\Program Files\\Microsoft VS Code\\bin\\code.cmd",
+          ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+          { stdio: "pipe", shell: true },
         );
       });
 
       it.each([
         {
           ide: IDE_DEFINITIONS.vscode,
-          expectedMessage:
-            'VS Code companion extension was installed successfully',
+          expectedMessage: "VS Code companion extension was installed successfully",
         },
         {
           ide: IDE_DEFINITIONS.firebasestudio,
-          expectedMessage:
-            'Firebase Studio companion extension was installed successfully',
+          expectedMessage: "Firebase Studio companion extension was installed successfully",
         },
-      ])(
-        'returns that the cli was installed successfully',
-        async ({ ide, expectedMessage }) => {
-          const { installer } = setup({ ide });
-          const result = await installer.install();
-          expect(result.success).toBe(true);
-          expect(result.message).toContain(expectedMessage);
-        },
-      );
+      ])("returns that the cli was installed successfully", async ({ ide, expectedMessage }) => {
+        const { installer } = setup({ ide });
+        const result = await installer.install();
+        expect(result.success).toBe(true);
+        expect(result.message).toContain(expectedMessage);
+      });
 
       it.each([
         {
           ide: IDE_DEFINITIONS.vscode,
-          expectedErr: 'VS Code CLI not found',
+          expectedErr: "VS Code CLI not found",
         },
         {
           ide: IDE_DEFINITIONS.firebasestudio,
-          expectedErr: 'Firebase Studio CLI not found',
-        },
-      ])(
-        'should return a failure message if $ide is not installed',
-        async ({ ide, expectedErr }) => {
-          const { installer } = setup({
-            ide,
-            execSync: () => {
-              throw new Error('Command not found');
-            },
-            existsResult: false,
-          });
-          const result = await installer.install();
-          expect(result.success).toBe(false);
-          expect(result.message).toContain(expectedErr);
+          expectedErr: "Firebase Studio CLI not found",
         },
-      );
+      ])("should return a failure message if $ide is not installed", async ({
+        ide,
+        expectedErr,
+      }) => {
+        const { installer } = setup({
+          ide,
+          execSync: () => {
+            throw new Error("Command not found");
+          },
+          existsResult: false,
+        });
+        const result = await installer.install();
+        expect(result.success).toBe(false);
+        expect(result.message).toContain(expectedErr);
+      });
     });
   });
 });
diff --git a/packages/gemini-core/src/ide/ide-installer.ts b/packages/gemini-core/src/ide/ide-installer.ts
index 62d5382b4..f9680ce08 100644
--- a/packages/gemini-core/src/ide/ide-installer.ts
+++ b/packages/gemini-core/src/ide/ide-installer.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as child_process from 'node:child_process';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import { IDE_DEFINITIONS, type IdeInfo } from './detect-ide.js';
-import { GEMINI_CLI_COMPANION_EXTENSION_NAME } from './constants.js';
+import * as child_process from "node:child_process";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as process from "node:process";
+import { GEMINI_CLI_COMPANION_EXTENSION_NAME } from "./constants.js";
+import { IDE_DEFINITIONS, type IdeInfo } from "./detect-ide.js";
 
 function getVsCodeCommand(platform: NodeJS.Platform = process.platform) {
-  return platform === 'win32' ? 'code.cmd' : 'code';
+  return platform === "win32" ? "code.cmd" : "code";
 }
 
 export interface IdeInstaller {
@@ -31,11 +31,8 @@ async function findVsCodeCommand(
   // 1. Check PATH first.
   const vscodeCommand = getVsCodeCommand(platform);
   try {
-    if (platform === 'win32') {
-      const result = child_process
-        .execSync(`where.exe ${vscodeCommand}`)
-        .toString()
-        .trim();
+    if (platform === "win32") {
+      const result = child_process.execSync(`where.exe ${vscodeCommand}`).toString().trim();
       // `where.exe` can return multiple paths. Return the first one.
       const firstPath = result.split(/\r?\n/)[0];
       if (firstPath) {
@@ -43,7 +40,7 @@ async function findVsCodeCommand(
       }
     } else {
       child_process.execSync(`command -v ${vscodeCommand}`, {
-        stdio: 'ignore',
+        stdio: "ignore",
       });
       return vscodeCommand;
     }
@@ -55,37 +52,29 @@ async function findVsCodeCommand(
   const locations: string[] = [];
   const homeDir = os.homedir();
 
-  if (platform === 'darwin') {
+  if (platform === "darwin") {
     // macOS
     locations.push(
-      '/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code',
-      path.join(homeDir, 'Library/Application Support/Code/bin/code'),
+      "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code",
+      path.join(homeDir, "Library/Application Support/Code/bin/code"),
     );
-  } else if (platform === 'linux') {
+  } else if (platform === "linux") {
     // Linux
     locations.push(
-      '/usr/share/code/bin/code',
-      '/snap/bin/code',
-      path.join(homeDir, '.local/share/code/bin/code'),
+      "/usr/share/code/bin/code",
+      "/snap/bin/code",
+      path.join(homeDir, ".local/share/code/bin/code"),
     );
-  } else if (platform === 'win32') {
+  } else if (platform === "win32") {
     // Windows
     locations.push(
       path.join(
-        process.env['ProgramFiles'] || 'C:\\Program Files',
-        'Microsoft VS Code',
-        'bin',
-        'code.cmd',
-      ),
-      path.join(
-        homeDir,
-        'AppData',
-        'Local',
-        'Programs',
-        'Microsoft VS Code',
-        'bin',
-        'code.cmd',
+        process.env["ProgramFiles"] || "C:\\Program Files",
+        "Microsoft VS Code",
+        "bin",
+        "code.cmd",
       ),
+      path.join(homeDir, "AppData", "Local", "Programs", "Microsoft VS Code", "bin", "code.cmd"),
     );
   }
 
@@ -120,18 +109,12 @@ class VsCodeInstaller implements IdeInstaller {
     try {
       const result = child_process.spawnSync(
         commandPath,
-        [
-          '--install-extension',
-          'google.gemini-cli-vscode-ide-companion',
-          '--force',
-        ],
-        { stdio: 'pipe', shell: this.platform === 'win32' },
+        ["--install-extension", "google.gemini-cli-vscode-ide-companion", "--force"],
+        { stdio: "pipe", shell: this.platform === "win32" },
       );
 
       if (result.status !== 0) {
-        throw new Error(
-          `Failed to install extension: ${result.stderr?.toString()}`,
-        );
+        throw new Error(`Failed to install extension: ${result.stderr?.toString()}`);
       }
 
       return {
@@ -147,10 +130,7 @@ class VsCodeInstaller implements IdeInstaller {
   }
 }
 
-export function getIdeInstaller(
-  ide: IdeInfo,
-  platform = process.platform,
-): IdeInstaller | null {
+export function getIdeInstaller(ide: IdeInfo, platform = process.platform): IdeInstaller | null {
   switch (ide.name) {
     case IDE_DEFINITIONS.vscode.name:
     case IDE_DEFINITIONS.firebasestudio.name:
diff --git a/packages/gemini-core/src/ide/ideContext.test.ts b/packages/gemini-core/src/ide/ideContext.test.ts
index 0e3c7ec53..4fce60d21 100644
--- a/packages/gemini-core/src/ide/ideContext.test.ts
+++ b/packages/gemini-core/src/ide/ideContext.test.ts
@@ -4,21 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  IDE_MAX_OPEN_FILES,
-  IDE_MAX_SELECTED_TEXT_LENGTH,
-} from './constants.js';
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { IdeContextStore } from './ideContext.js';
-import {
-  type IdeContext,
-  FileSchema,
-  IdeContextSchema,
-  type File,
-} from './types.js';
-
-describe('ideContext', () => {
-  describe('createIdeContextStore', () => {
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { IDE_MAX_OPEN_FILES, IDE_MAX_SELECTED_TEXT_LENGTH } from "./constants.js";
+import { IdeContextStore } from "./ideContext.js";
+import { type File, FileSchema, type IdeContext, IdeContextSchema } from "./types.js";
+
+describe("ideContext", () => {
+  describe("createIdeContextStore", () => {
     let ideContextStore: IdeContextStore;
 
     beforeEach(() => {
@@ -30,18 +22,18 @@ describe('ideContext', () => {
       vi.restoreAllMocks();
     });
 
-    it('should return undefined initially for ide context', () => {
+    it("should return undefined initially for ide context", () => {
       expect(ideContextStore.get()).toBeUndefined();
     });
 
-    it('should set and retrieve the ide context', () => {
+    it("should set and retrieve the ide context", () => {
       const testFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/test/file.ts',
+              path: "/path/to/test/file.ts",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -54,14 +46,14 @@ describe('ideContext', () => {
       expect(activeFile).toEqual(testFile);
     });
 
-    it('should update the ide context when called multiple times', () => {
+    it("should update the ide context when called multiple times", () => {
       const firstFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/first.js',
+              path: "/path/to/first.js",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -73,7 +65,7 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/second.py',
+              path: "/path/to/second.py",
               isActive: true,
               cursor: { line: 20, character: 30 },
               timestamp: 0,
@@ -87,14 +79,14 @@ describe('ideContext', () => {
       expect(activeFile).toEqual(secondFile);
     });
 
-    it('should handle empty string for file path', () => {
+    it("should handle empty string for file path", () => {
       const testFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '',
+              path: "",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -104,7 +96,7 @@ describe('ideContext', () => {
       expect(ideContextStore.get()).toEqual(testFile);
     });
 
-    it('should notify subscribers when ide context changes', () => {
+    it("should notify subscribers when ide context changes", () => {
       const subscriber1 = vi.fn();
       const subscriber2 = vi.fn();
 
@@ -115,7 +107,7 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/subscribed.ts',
+              path: "/path/to/subscribed.ts",
               isActive: true,
               cursor: { line: 15, character: 25 },
               timestamp: 0,
@@ -135,9 +127,9 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/new.js',
+              path: "/path/to/new.js",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -151,7 +143,7 @@ describe('ideContext', () => {
       expect(subscriber2).toHaveBeenCalledWith(newFile);
     });
 
-    it('should stop notifying a subscriber after unsubscribe', () => {
+    it("should stop notifying a subscriber after unsubscribe", () => {
       const subscriber1 = vi.fn();
       const subscriber2 = vi.fn();
 
@@ -162,9 +154,9 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/file1.txt',
+              path: "/path/to/file1.txt",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -179,9 +171,9 @@ describe('ideContext', () => {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/file2.txt',
+              path: "/path/to/file2.txt",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -191,14 +183,14 @@ describe('ideContext', () => {
       expect(subscriber2).toHaveBeenCalledTimes(2);
     });
 
-    it('should clear the ide context', () => {
+    it("should clear the ide context", () => {
       const testFile = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/test/file.ts',
+              path: "/path/to/test/file.ts",
               isActive: true,
-              selectedText: '1234',
+              selectedText: "1234",
               timestamp: 0,
             },
           ],
@@ -214,7 +206,7 @@ describe('ideContext', () => {
       expect(ideContextStore.get()).toBeUndefined();
     });
 
-    it('should set the context and notify subscribers when no workspaceState is present', () => {
+    it("should set the context and notify subscribers when no workspaceState is present", () => {
       const subscriber = vi.fn();
       ideContextStore.subscribe(subscriber);
       const context: IdeContext = {};
@@ -223,7 +215,7 @@ describe('ideContext', () => {
       expect(subscriber).toHaveBeenCalledWith(context);
     });
 
-    it('should handle an empty openFiles array', () => {
+    it("should handle an empty openFiles array", () => {
       const context: IdeContext = {
         workspaceState: {
           openFiles: [],
@@ -233,45 +225,45 @@ describe('ideContext', () => {
       expect(ideContextStore.get()?.workspaceState?.openFiles).toEqual([]);
     });
 
-    it('should sort openFiles by timestamp in descending order', () => {
+    it("should sort openFiles by timestamp in descending order", () => {
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
-            { path: 'file1.ts', timestamp: 100, isActive: false },
-            { path: 'file2.ts', timestamp: 300, isActive: true },
-            { path: 'file3.ts', timestamp: 200, isActive: false },
+            { path: "file1.ts", timestamp: 100, isActive: false },
+            { path: "file2.ts", timestamp: 300, isActive: true },
+            { path: "file3.ts", timestamp: 200, isActive: false },
           ],
         },
       };
       ideContextStore.set(context);
       const openFiles = ideContextStore.get()?.workspaceState?.openFiles;
-      expect(openFiles?.[0]?.path).toBe('file2.ts');
-      expect(openFiles?.[1]?.path).toBe('file3.ts');
-      expect(openFiles?.[2]?.path).toBe('file1.ts');
+      expect(openFiles?.[0]?.path).toBe("file2.ts");
+      expect(openFiles?.[1]?.path).toBe("file3.ts");
+      expect(openFiles?.[2]?.path).toBe("file1.ts");
     });
 
-    it('should mark only the most recent file as active and clear other active files', () => {
+    it("should mark only the most recent file as active and clear other active files", () => {
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
             {
-              path: 'file1.ts',
+              path: "file1.ts",
               timestamp: 100,
               isActive: true,
-              selectedText: 'hello',
+              selectedText: "hello",
             },
             {
-              path: 'file2.ts',
+              path: "file2.ts",
               timestamp: 300,
               isActive: true,
               cursor: { line: 1, character: 1 },
-              selectedText: 'hello',
+              selectedText: "hello",
             },
             {
-              path: 'file3.ts',
+              path: "file3.ts",
               timestamp: 200,
               isActive: false,
-              selectedText: 'hello',
+              selectedText: "hello",
             },
           ],
         },
@@ -291,13 +283,13 @@ describe('ideContext', () => {
       expect(openFiles?.[2]?.selectedText).toBeUndefined();
     });
 
-    it('should truncate selectedText if it exceeds the max length', () => {
-      const longText = 'a'.repeat(IDE_MAX_SELECTED_TEXT_LENGTH + 10);
+    it("should truncate selectedText if it exceeds the max length", () => {
+      const longText = "a".repeat(IDE_MAX_SELECTED_TEXT_LENGTH + 10);
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
             {
-              path: 'file1.ts',
+              path: "file1.ts",
               timestamp: 100,
               isActive: true,
               selectedText: longText,
@@ -306,21 +298,18 @@ describe('ideContext', () => {
         },
       };
       ideContextStore.set(context);
-      const selectedText =
-        ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
-      expect(selectedText).toHaveLength(
-        IDE_MAX_SELECTED_TEXT_LENGTH + '... [TRUNCATED]'.length,
-      );
-      expect(selectedText?.endsWith('... [TRUNCATED]')).toBe(true);
+      const selectedText = ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
+      expect(selectedText).toHaveLength(IDE_MAX_SELECTED_TEXT_LENGTH + "... [TRUNCATED]".length);
+      expect(selectedText?.endsWith("... [TRUNCATED]")).toBe(true);
     });
 
-    it('should not truncate selectedText if it is within the max length', () => {
-      const shortText = 'a'.repeat(IDE_MAX_SELECTED_TEXT_LENGTH);
+    it("should not truncate selectedText if it is within the max length", () => {
+      const shortText = "a".repeat(IDE_MAX_SELECTED_TEXT_LENGTH);
       const context: IdeContext = {
         workspaceState: {
           openFiles: [
             {
-              path: 'file1.ts',
+              path: "file1.ts",
               timestamp: 100,
               isActive: true,
               selectedText: shortText,
@@ -329,20 +318,16 @@ describe('ideContext', () => {
         },
       };
       ideContextStore.set(context);
-      const selectedText =
-        ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
+      const selectedText = ideContextStore.get()?.workspaceState?.openFiles?.[0]?.selectedText;
       expect(selectedText).toBe(shortText);
     });
 
-    it('should truncate the openFiles list if it exceeds the max length', () => {
-      const files: File[] = Array.from(
-        { length: IDE_MAX_OPEN_FILES + 5 },
-        (_, i) => ({
-          path: `file${i}.ts`,
-          timestamp: i,
-          isActive: false,
-        }),
-      );
+    it("should truncate the openFiles list if it exceeds the max length", () => {
+      const files: File[] = Array.from({ length: IDE_MAX_OPEN_FILES + 5 }, (_, i) => ({
+        path: `file${i}.ts`,
+        timestamp: i,
+        isActive: false,
+      }));
       const context: IdeContext = {
         workspaceState: {
           openFiles: files,
@@ -354,22 +339,22 @@ describe('ideContext', () => {
     });
   });
 
-  describe('FileSchema', () => {
-    it('should validate a file with only required fields', () => {
+  describe("FileSchema", () => {
+    it("should validate a file with only required fields", () => {
       const file = {
-        path: '/path/to/file.ts',
+        path: "/path/to/file.ts",
         timestamp: 12345,
       };
       const result = FileSchema.safeParse(file);
       expect(result.success).toBe(true);
     });
 
-    it('should validate a file with all fields', () => {
+    it("should validate a file with all fields", () => {
       const file = {
-        path: '/path/to/file.ts',
+        path: "/path/to/file.ts",
         timestamp: 12345,
         isActive: true,
-        selectedText: 'const x = 1;',
+        selectedText: "const x = 1;",
         cursor: {
           line: 10,
           character: 20,
@@ -379,7 +364,7 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should fail validation if path is missing', () => {
+    it("should fail validation if path is missing", () => {
       const file = {
         timestamp: 12345,
       };
@@ -387,23 +372,23 @@ describe('ideContext', () => {
       expect(result.success).toBe(false);
     });
 
-    it('should fail validation if timestamp is missing', () => {
+    it("should fail validation if timestamp is missing", () => {
       const file = {
-        path: '/path/to/file.ts',
+        path: "/path/to/file.ts",
       };
       const result = FileSchema.safeParse(file);
       expect(result.success).toBe(false);
     });
   });
 
-  describe('IdeContextSchema', () => {
-    it('should validate an empty context', () => {
+  describe("IdeContextSchema", () => {
+    it("should validate an empty context", () => {
       const context = {};
       const result = IdeContextSchema.safeParse(context);
       expect(result.success).toBe(true);
     });
 
-    it('should validate a context with an empty workspaceState', () => {
+    it("should validate a context with an empty workspaceState", () => {
       const context = {
         workspaceState: {},
       };
@@ -411,7 +396,7 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should validate a context with an empty openFiles array', () => {
+    it("should validate a context with an empty openFiles array", () => {
       const context = {
         workspaceState: {
           openFiles: [],
@@ -421,12 +406,12 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should validate a context with a valid file', () => {
+    it("should validate a context with a valid file", () => {
       const context = {
         workspaceState: {
           openFiles: [
             {
-              path: '/path/to/file.ts',
+              path: "/path/to/file.ts",
               timestamp: 12345,
             },
           ],
@@ -436,7 +421,7 @@ describe('ideContext', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should fail validation with an invalid file', () => {
+    it("should fail validation with an invalid file", () => {
       const context = {
         workspaceState: {
           openFiles: [
diff --git a/packages/gemini-core/src/ide/ideContext.ts b/packages/gemini-core/src/ide/ideContext.ts
index 527d4135c..9ec0a1e3b 100644
--- a/packages/gemini-core/src/ide/ideContext.ts
+++ b/packages/gemini-core/src/ide/ideContext.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  IDE_MAX_OPEN_FILES,
-  IDE_MAX_SELECTED_TEXT_LENGTH,
-} from './constants.js';
-import type { IdeContext } from './types.js';
+import { IDE_MAX_OPEN_FILES, IDE_MAX_SELECTED_TEXT_LENGTH } from "./constants.js";
+import type { IdeContext } from "./types.js";
 
 type IdeContextSubscriber = (ideContext?: IdeContext) => void;
 
@@ -69,10 +66,8 @@ export class IdeContextStore {
           mostRecentFile.selectedText.length > IDE_MAX_SELECTED_TEXT_LENGTH
         ) {
           mostRecentFile.selectedText =
-            mostRecentFile.selectedText.substring(
-              0,
-              IDE_MAX_SELECTED_TEXT_LENGTH,
-            ) + '... [TRUNCATED]';
+            mostRecentFile.selectedText.substring(0, IDE_MAX_SELECTED_TEXT_LENGTH) +
+            "... [TRUNCATED]";
         }
       }
 
diff --git a/packages/gemini-core/src/ide/process-utils.test.ts b/packages/gemini-core/src/ide/process-utils.test.ts
index 9176dad49..e1fc44cdc 100644
--- a/packages/gemini-core/src/ide/process-utils.test.ts
+++ b/packages/gemini-core/src/ide/process-utils.test.ts
@@ -4,31 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  afterEach,
-  beforeEach,
-  type Mock,
-} from 'vitest';
-import { getIdeProcessInfo } from './process-utils.js';
-import os from 'node:os';
+import os from "node:os";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { getIdeProcessInfo } from "./process-utils.js";
 
 const mockedExec = vi.hoisted(() => vi.fn());
-vi.mock('node:util', () => ({
+vi.mock("node:util", () => ({
   promisify: vi.fn().mockReturnValue(mockedExec),
 }));
-vi.mock('node:os', () => ({
+vi.mock("node:os", () => ({
   default: {
     platform: vi.fn(),
   },
 }));
 
-describe('getIdeProcessInfo', () => {
+describe("getIdeProcessInfo", () => {
   beforeEach(() => {
-    Object.defineProperty(process, 'pid', { value: 1000, configurable: true });
+    Object.defineProperty(process, "pid", { value: 1000, configurable: true });
     mockedExec.mockReset();
   });
 
@@ -36,35 +28,35 @@ describe('getIdeProcessInfo', () => {
     vi.restoreAllMocks();
   });
 
-  describe('on Unix', () => {
-    it('should traverse up to find the shell and return grandparent process info', async () => {
-      (os.platform as Mock).mockReturnValue('linux');
+  describe("on Unix", () => {
+    it("should traverse up to find the shell and return grandparent process info", async () => {
+      (os.platform as Mock).mockReturnValue("linux");
       // process (1000) -> shell (800) -> IDE (700)
       mockedExec
-        .mockResolvedValueOnce({ stdout: '800 /bin/bash' }) // pid 1000 -> ppid 800 (shell)
-        .mockResolvedValueOnce({ stdout: '700 /usr/lib/vscode/code' }) // pid 800 -> ppid 700 (IDE)
-        .mockResolvedValueOnce({ stdout: '700 /usr/lib/vscode/code' }); // get command for pid 700
+        .mockResolvedValueOnce({ stdout: "800 /bin/bash" }) // pid 1000 -> ppid 800 (shell)
+        .mockResolvedValueOnce({ stdout: "700 /usr/lib/vscode/code" }) // pid 800 -> ppid 700 (IDE)
+        .mockResolvedValueOnce({ stdout: "700 /usr/lib/vscode/code" }); // get command for pid 700
 
       const result = await getIdeProcessInfo();
 
-      expect(result).toEqual({ pid: 700, command: '/usr/lib/vscode/code' });
+      expect(result).toEqual({ pid: 700, command: "/usr/lib/vscode/code" });
     });
 
-    it('should return parent process info if grandparent lookup fails', async () => {
-      (os.platform as Mock).mockReturnValue('linux');
+    it("should return parent process info if grandparent lookup fails", async () => {
+      (os.platform as Mock).mockReturnValue("linux");
       mockedExec
-        .mockResolvedValueOnce({ stdout: '800 /bin/bash' }) // pid 1000 -> ppid 800 (shell)
-        .mockRejectedValueOnce(new Error('ps failed')) // lookup for ppid of 800 fails
-        .mockResolvedValueOnce({ stdout: '800 /bin/bash' }); // get command for pid 800
+        .mockResolvedValueOnce({ stdout: "800 /bin/bash" }) // pid 1000 -> ppid 800 (shell)
+        .mockRejectedValueOnce(new Error("ps failed")) // lookup for ppid of 800 fails
+        .mockResolvedValueOnce({ stdout: "800 /bin/bash" }); // get command for pid 800
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 800, command: '/bin/bash' });
+      expect(result).toEqual({ pid: 800, command: "/bin/bash" });
     });
   });
 
-  describe('on Windows', () => {
-    it('should traverse up and find the great-grandchild of the root process', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+  describe("on Windows", () => {
+    it("should traverse up and find the great-grandchild of the root process", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       // process (1000) -> powershell (900) -> code (800) -> wininit (700) -> root (0)
       // Ancestors: [1000, 900, 800, 700]
       // Target (great-grandchild of root): 900
@@ -72,111 +64,111 @@ describe('getIdeProcessInfo', () => {
         {
           ProcessId: 1000,
           ParentProcessId: 900,
-          Name: 'node.exe',
-          CommandLine: 'node.exe',
+          Name: "node.exe",
+          CommandLine: "node.exe",
         },
         {
           ProcessId: 900,
           ParentProcessId: 800,
-          Name: 'powershell.exe',
-          CommandLine: 'powershell.exe',
+          Name: "powershell.exe",
+          CommandLine: "powershell.exe",
         },
         {
           ProcessId: 800,
           ParentProcessId: 700,
-          Name: 'code.exe',
-          CommandLine: 'code.exe',
+          Name: "code.exe",
+          CommandLine: "code.exe",
         },
         {
           ProcessId: 700,
           ParentProcessId: 0,
-          Name: 'wininit.exe',
-          CommandLine: 'wininit.exe',
+          Name: "wininit.exe",
+          CommandLine: "wininit.exe",
         },
       ];
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 900, command: 'powershell.exe' });
+      expect(result).toEqual({ pid: 900, command: "powershell.exe" });
       expect(mockedExec).toHaveBeenCalledWith(
-        expect.stringContaining('Get-CimInstance Win32_Process'),
+        expect.stringContaining("Get-CimInstance Win32_Process"),
         expect.anything(),
       );
     });
 
-    it('should handle short process chains', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle short process chains", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       // process (1000) -> root (0)
       const processes = [
         {
           ProcessId: 1000,
           ParentProcessId: 0,
-          Name: 'node.exe',
-          CommandLine: 'node.exe',
+          Name: "node.exe",
+          CommandLine: "node.exe",
         },
       ];
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: 'node.exe' });
+      expect(result).toEqual({ pid: 1000, command: "node.exe" });
     });
 
-    it('should handle PowerShell failure gracefully', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
-      mockedExec.mockRejectedValueOnce(new Error('PowerShell failed'));
+    it("should handle PowerShell failure gracefully", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
+      mockedExec.mockRejectedValueOnce(new Error("PowerShell failed"));
       // Fallback to getProcessInfo for current PID
-      mockedExec.mockResolvedValueOnce({ stdout: '' }); // ps command fails on windows
+      mockedExec.mockResolvedValueOnce({ stdout: "" }); // ps command fails on windows
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: '' });
+      expect(result).toEqual({ pid: 1000, command: "" });
     });
 
-    it('should handle malformed JSON output gracefully', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle malformed JSON output gracefully", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       mockedExec.mockResolvedValueOnce({ stdout: '{"invalid":json}' });
       // Fallback to getProcessInfo for current PID
-      mockedExec.mockResolvedValueOnce({ stdout: '' });
+      mockedExec.mockResolvedValueOnce({ stdout: "" });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: '' });
+      expect(result).toEqual({ pid: 1000, command: "" });
     });
 
-    it('should handle single process output from ConvertTo-Json', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle single process output from ConvertTo-Json", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       const process = {
         ProcessId: 1000,
         ParentProcessId: 0,
-        Name: 'node.exe',
-        CommandLine: 'node.exe',
+        Name: "node.exe",
+        CommandLine: "node.exe",
       };
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(process) });
 
       const result = await getIdeProcessInfo();
-      expect(result).toEqual({ pid: 1000, command: 'node.exe' });
+      expect(result).toEqual({ pid: 1000, command: "node.exe" });
     });
 
-    it('should handle missing process in map during traversal', async () => {
-      (os.platform as Mock).mockReturnValue('win32');
+    it("should handle missing process in map during traversal", async () => {
+      (os.platform as Mock).mockReturnValue("win32");
       // process (1000) -> parent (900) -> missing (800)
       const processes = [
         {
           ProcessId: 1000,
           ParentProcessId: 900,
-          Name: 'node.exe',
-          CommandLine: 'node.exe',
+          Name: "node.exe",
+          CommandLine: "node.exe",
         },
         {
           ProcessId: 900,
           ParentProcessId: 800,
-          Name: 'parent.exe',
-          CommandLine: 'parent.exe',
+          Name: "parent.exe",
+          CommandLine: "parent.exe",
         },
       ];
       mockedExec.mockResolvedValueOnce({ stdout: JSON.stringify(processes) });
 
       const result = await getIdeProcessInfo();
       // Ancestors: [1000, 900]. Length < 3, returns last (900)
-      expect(result).toEqual({ pid: 900, command: 'parent.exe' });
+      expect(result).toEqual({ pid: 900, command: "parent.exe" });
     });
   });
 });
diff --git a/packages/gemini-core/src/ide/process-utils.ts b/packages/gemini-core/src/ide/process-utils.ts
index 5c1ca570a..6a7cc1d98 100644
--- a/packages/gemini-core/src/ide/process-utils.ts
+++ b/packages/gemini-core/src/ide/process-utils.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
-import os from 'node:os';
-import path from 'node:path';
+import { exec } from "node:child_process";
+import os from "node:os";
+import path from "node:path";
+import { promisify } from "node:util";
 
 const execAsync = promisify(exec);
 
@@ -35,7 +35,7 @@ async function getProcessTableWindows(): Promise<Map<number, ProcessInfo>> {
   try {
     // Fetch ProcessId, ParentProcessId, Name, and CommandLine for all processes.
     const powershellCommand =
-      'Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress';
+      "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId,Name,CommandLine | ConvertTo-Json -Compress";
     // Increase maxBuffer to handle large process lists (default is 1MB)
     const { stdout } = await execAsync(`powershell "${powershellCommand}"`, {
       maxBuffer: 10 * 1024 * 1024,
@@ -57,12 +57,12 @@ async function getProcessTableWindows(): Promise<Map<number, ProcessInfo>> {
     }
 
     for (const p of processes) {
-      if (p && typeof p.ProcessId === 'number') {
+      if (p && typeof p.ProcessId === "number") {
         processMap.set(p.ProcessId, {
           pid: p.ProcessId,
           parentPid: p.ParentProcessId || 0,
-          name: p.Name || '',
-          command: p.CommandLine || '',
+          name: p.Name || "",
+          command: p.CommandLine || "",
         });
       }
     }
@@ -88,13 +88,13 @@ async function getProcessInfo(pid: number): Promise<{
     const { stdout } = await execAsync(command);
     const trimmedStdout = stdout.trim();
     if (!trimmedStdout) {
-      return { parentPid: 0, name: '', command: '' };
+      return { parentPid: 0, name: "", command: "" };
     }
     const parts = trimmedStdout.split(/\s+/);
     const ppidString = parts[0];
     const parentPid = parseInt(ppidString, 10);
     const fullCommand = trimmedStdout.substring(ppidString.length).trim();
-    const processName = path.basename(fullCommand.split(' ')[0]);
+    const processName = path.basename(fullCommand.split(" ")[0]);
 
     return {
       parentPid: isNaN(parentPid) ? 1 : parentPid,
@@ -102,7 +102,7 @@ async function getProcessInfo(pid: number): Promise<{
       command: fullCommand,
     };
   } catch (_e) {
-    return { parentPid: 0, name: '', command: '' };
+    return { parentPid: 0, name: "", command: "" };
   }
 }
 
@@ -119,7 +119,7 @@ async function getIdeProcessInfoForUnix(): Promise<{
   pid: number;
   command: string;
 }> {
-  const shells = ['zsh', 'bash', 'sh', 'tcsh', 'csh', 'ksh', 'fish', 'dash'];
+  const shells = ["zsh", "bash", "sh", "tcsh", "csh", "ksh", "fish", "dash"];
   let currentPid = process.pid;
 
   for (let i = 0; i < MAX_TRAVERSAL_DEPTH; i++) {
@@ -218,7 +218,7 @@ export async function getIdeProcessInfo(): Promise<{
 }> {
   const platform = os.platform();
 
-  if (platform === 'win32') {
+  if (platform === "win32") {
     return getIdeProcessInfoForWindows();
   }
 
diff --git a/packages/gemini-core/src/ide/types.ts b/packages/gemini-core/src/ide/types.ts
index dbbce4462..8c54796c2 100644
--- a/packages/gemini-core/src/ide/types.ts
+++ b/packages/gemini-core/src/ide/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
+import { z } from "zod";
 
 /**
  * A file that is open in the IDE.
@@ -67,8 +67,8 @@ export type IdeContext = z.infer<typeof IdeContextSchema>;
  * A notification that the IDE context has been updated.
  */
 export const IdeContextNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/contextUpdate'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/contextUpdate"),
   params: IdeContextSchema,
 });
 
@@ -76,8 +76,8 @@ export const IdeContextNotificationSchema = z.object({
  * A notification that a diff has been accepted in the IDE.
  */
 export const IdeDiffAcceptedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffAccepted'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffAccepted"),
   params: z.object({
     /**
      * The absolute path to the file that was diffed.
@@ -94,8 +94,8 @@ export const IdeDiffAcceptedNotificationSchema = z.object({
  * A notification that a diff has been rejected in the IDE.
  */
 export const IdeDiffRejectedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffRejected'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffRejected"),
   params: z.object({
     /**
      * The absolute path to the file that was diffed.
@@ -111,8 +111,8 @@ export const IdeDiffRejectedNotificationSchema = z.object({
  * A notification that a diff has been closed in the IDE.
  */
 export const IdeDiffClosedNotificationSchema = z.object({
-  jsonrpc: z.literal('2.0'),
-  method: z.literal('ide/diffClosed'),
+  jsonrpc: z.literal("2.0"),
+  method: z.literal("ide/diffClosed"),
   params: z.object({
     filePath: z.string(),
     content: z.string().optional(),
diff --git a/packages/gemini-core/src/index.test.ts b/packages/gemini-core/src/index.test.ts
index 154c96a6a..fe4cef878 100644
--- a/packages/gemini-core/src/index.test.ts
+++ b/packages/gemini-core/src/index.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 
-describe('placeholder tests', () => {
-  it('should pass', () => {
+describe("placeholder tests", () => {
+  it("should pass", () => {
     expect(true).toBe(true);
   });
 });
diff --git a/packages/gemini-core/src/index.ts b/packages/gemini-core/src/index.ts
index a867354c6..4ba4816ec 100644
--- a/packages/gemini-core/src/index.ts
+++ b/packages/gemini-core/src/index.ts
@@ -4,141 +4,126 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Export config
-export * from './config/config.js';
-export * from './config/defaultModelConfigs.js';
-export * from './output/types.js';
-export * from './output/json-formatter.js';
-export * from './output/stream-json-formatter.js';
-export * from './policy/types.js';
-export * from './policy/policy-engine.js';
-export * from './policy/toml-loader.js';
-export * from './policy/config.js';
-export * from './confirmation-bus/types.js';
-export * from './confirmation-bus/message-bus.js';
-
+export * from "./code_assist/codeAssist.js";
+export * from "./code_assist/oauth2.js";
+export * from "./code_assist/server.js";
+export * from "./code_assist/types.js";
 // Export Commands logic
-export * from './commands/extensions.js';
-
+export * from "./commands/extensions.js";
+// Export config
+export * from "./config/config.js";
+export * from "./config/defaultModelConfigs.js";
+export { Storage } from "./config/storage.js";
+export * from "./confirmation-bus/message-bus.js";
+export * from "./confirmation-bus/types.js";
+export * from "./core/apiKeyCredentialStorage.js";
 // Export Core Logic
-export * from './core/client.js';
-export * from './core/contentGenerator.js';
-export * from './core/loggingContentGenerator.js';
-export * from './core/geminiChat.js';
-export * from './core/logger.js';
-export * from './core/prompts.js';
-export * from './core/tokenLimits.js';
-export * from './core/turn.js';
-export * from './core/geminiRequest.js';
-export * from './core/coreToolScheduler.js';
-export * from './core/nonInteractiveToolExecutor.js';
-export * from './core/recordingContentGenerator.js';
-
-export * from './fallback/types.js';
-
-export * from './code_assist/codeAssist.js';
-export * from './code_assist/oauth2.js';
-export * from './code_assist/server.js';
-export * from './code_assist/types.js';
-export * from './core/apiKeyCredentialStorage.js';
-
-// Export utilities
-export * from './utils/paths.js';
-export * from './utils/schemaValidator.js';
-export * from './utils/errors.js';
-export * from './utils/getFolderStructure.js';
-export * from './utils/memoryDiscovery.js';
-export * from './utils/getPty.js';
-export * from './utils/gitIgnoreParser.js';
-export * from './utils/gitUtils.js';
-export * from './utils/editor.js';
-export * from './utils/quotaErrorDetection.js';
-export * from './utils/googleQuotaErrors.js';
-export * from './utils/fileUtils.js';
-export * from './utils/retry.js';
-export * from './utils/shell-utils.js';
-export * from './utils/terminalSerializer.js';
-export * from './utils/systemEncoding.js';
-export * from './utils/textUtils.js';
-export * from './utils/formatters.js';
-export * from './utils/generateContentResponseUtilities.js';
-export * from './utils/filesearch/fileSearch.js';
-export * from './utils/errorParsing.js';
-export * from './utils/workspaceContext.js';
-export * from './utils/ignorePatterns.js';
-export * from './utils/partUtils.js';
-export * from './utils/promptIdContext.js';
-export * from './utils/thoughtUtils.js';
-export * from './utils/debugLogger.js';
-export * from './utils/events.js';
-export * from './utils/extensionLoader.js';
-export * from './utils/package.js';
-
-// Export services
-export * from './services/fileDiscoveryService.js';
-export * from './services/gitService.js';
-export * from './services/chatRecordingService.js';
-export * from './services/fileSystemService.js';
-
+export * from "./core/client.js";
+export * from "./core/contentGenerator.js";
+export * from "./core/coreToolScheduler.js";
+export * from "./core/geminiChat.js";
+export * from "./core/geminiRequest.js";
+export * from "./core/logger.js";
+export * from "./core/loggingContentGenerator.js";
+export * from "./core/nonInteractiveToolExecutor.js";
+export * from "./core/prompts.js";
+export * from "./core/recordingContentGenerator.js";
+export * from "./core/tokenLimits.js";
+export * from "./core/turn.js";
+export * from "./fallback/types.js";
+// Export hook types
+export * from "./hooks/types.js";
+export * from "./ide/constants.js";
+export { IDE_DEFINITIONS, type IdeInfo } from "./ide/detect-ide.js";
 // Export IDE specific logic
-export * from './ide/ide-client.js';
-export * from './ide/ideContext.js';
-export * from './ide/ide-installer.js';
-export { IDE_DEFINITIONS, type IdeInfo } from './ide/detect-ide.js';
-export * from './ide/constants.js';
-export * from './ide/types.js';
-
-// Export Shell Execution Service
-export * from './services/shellExecutionService.js';
-
-// Export base tool definitions
-export * from './tools/tools.js';
-export * from './tools/tool-error.js';
-export * from './tools/tool-registry.js';
-export * from './tools/tool-names.js';
-
-// Export prompt logic
-export * from './prompts/mcp-prompts.js';
-
-// Export specific tool logic
-export * from './tools/read-file.js';
-export * from './tools/ls.js';
-export * from './tools/grep.js';
-export * from './tools/ripGrep.js';
-export * from './tools/glob.js';
-export * from './tools/edit.js';
-export * from './tools/write-file.js';
-export * from './tools/web-fetch.js';
-export * from './tools/memoryTool.js';
-export * from './tools/shell.js';
-export * from './tools/web-search.js';
-export * from './tools/read-many-files.js';
-export * from './tools/mcp-client.js';
-export * from './tools/mcp-tool.js';
-export * from './tools/write-todos.js';
-
+export * from "./ide/ide-client.js";
+export * from "./ide/ide-installer.js";
+export * from "./ide/ideContext.js";
+export * from "./ide/types.js";
+export type { MCPOAuthConfig } from "./mcp/oauth-provider.js";
 // MCP OAuth
-export { MCPOAuthProvider } from './mcp/oauth-provider.js';
-export type {
-  OAuthToken,
-  OAuthCredentials,
-} from './mcp/token-storage/types.js';
-export { MCPOAuthTokenStorage } from './mcp/oauth-token-storage.js';
-export type { MCPOAuthConfig } from './mcp/oauth-provider.js';
+export { MCPOAuthProvider } from "./mcp/oauth-provider.js";
+export { MCPOAuthTokenStorage } from "./mcp/oauth-token-storage.js";
 export type {
   OAuthAuthorizationServerMetadata,
   OAuthProtectedResourceMetadata,
-} from './mcp/oauth-utils.js';
-export { OAuthUtils } from './mcp/oauth-utils.js';
-
+} from "./mcp/oauth-utils.js";
+export { OAuthUtils } from "./mcp/oauth-utils.js";
+export type {
+  OAuthCredentials,
+  OAuthToken,
+} from "./mcp/token-storage/types.js";
+export * from "./output/json-formatter.js";
+export * from "./output/stream-json-formatter.js";
+export * from "./output/types.js";
+export * from "./policy/config.js";
+export * from "./policy/policy-engine.js";
+export * from "./policy/toml-loader.js";
+export * from "./policy/types.js";
+// Export prompt logic
+export * from "./prompts/mcp-prompts.js";
+export * from "./services/chatRecordingService.js";
+// Export services
+export * from "./services/fileDiscoveryService.js";
+export * from "./services/fileSystemService.js";
+export * from "./services/gitService.js";
+// Export Shell Execution Service
+export * from "./services/shellExecutionService.js";
 // Export telemetry functions
-export * from './telemetry/index.js';
-export { sessionId } from './utils/session.js';
-export * from './utils/browser.js';
-export { Storage } from './config/storage.js';
-
+export * from "./telemetry/index.js";
 // Export test utils
-export * from './test-utils/index.js';
-
-// Export hook types
-export * from './hooks/types.js';
+export * from "./test-utils/index.js";
+export * from "./tools/edit.js";
+export * from "./tools/glob.js";
+export * from "./tools/grep.js";
+export * from "./tools/ls.js";
+export * from "./tools/mcp-client.js";
+export * from "./tools/mcp-tool.js";
+export * from "./tools/memoryTool.js";
+// Export specific tool logic
+export * from "./tools/read-file.js";
+export * from "./tools/read-many-files.js";
+export * from "./tools/ripGrep.js";
+export * from "./tools/shell.js";
+export * from "./tools/tool-error.js";
+export * from "./tools/tool-names.js";
+export * from "./tools/tool-registry.js";
+// Export base tool definitions
+export * from "./tools/tools.js";
+export * from "./tools/web-fetch.js";
+export * from "./tools/web-search.js";
+export * from "./tools/write-file.js";
+export * from "./tools/write-todos.js";
+export * from "./utils/browser.js";
+export * from "./utils/debugLogger.js";
+export * from "./utils/editor.js";
+export * from "./utils/errorParsing.js";
+export * from "./utils/errors.js";
+export * from "./utils/events.js";
+export * from "./utils/extensionLoader.js";
+export * from "./utils/filesearch/fileSearch.js";
+export * from "./utils/fileUtils.js";
+export * from "./utils/formatters.js";
+export * from "./utils/generateContentResponseUtilities.js";
+export * from "./utils/getFolderStructure.js";
+export * from "./utils/getPty.js";
+export * from "./utils/gitIgnoreParser.js";
+export * from "./utils/gitUtils.js";
+export * from "./utils/googleQuotaErrors.js";
+export * from "./utils/ignorePatterns.js";
+export * from "./utils/memoryDiscovery.js";
+export * from "./utils/package.js";
+export * from "./utils/partUtils.js";
+// Export utilities
+export * from "./utils/paths.js";
+export * from "./utils/promptIdContext.js";
+export * from "./utils/quotaErrorDetection.js";
+export * from "./utils/retry.js";
+export * from "./utils/schemaValidator.js";
+export { sessionId } from "./utils/session.js";
+export * from "./utils/shell-utils.js";
+export * from "./utils/systemEncoding.js";
+export * from "./utils/terminalSerializer.js";
+export * from "./utils/textUtils.js";
+export * from "./utils/thoughtUtils.js";
+export * from "./utils/workspaceContext.js";
diff --git a/packages/gemini-core/src/mcp/google-auth-provider.test.ts b/packages/gemini-core/src/mcp/google-auth-provider.test.ts
index efe959ff3..ba5a8532b 100644
--- a/packages/gemini-core/src/mcp/google-auth-provider.test.ts
+++ b/packages/gemini-core/src/mcp/google-auth-provider.test.ts
@@ -4,43 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { GoogleAuth } from 'google-auth-library';
-import { GoogleCredentialProvider } from './google-auth-provider.js';
-import type { Mock } from 'vitest';
-import { vi, describe, beforeEach, it, expect } from 'vitest';
-import type { MCPServerConfig } from '../config/config.js';
+import { GoogleAuth } from "google-auth-library";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { MCPServerConfig } from "../config/config.js";
+import { GoogleCredentialProvider } from "./google-auth-provider.js";
 
-vi.mock('google-auth-library');
+vi.mock("google-auth-library");
 
-describe('GoogleCredentialProvider', () => {
+describe("GoogleCredentialProvider", () => {
   const validConfig = {
-    url: 'https://test.googleapis.com',
+    url: "https://test.googleapis.com",
     oauth: {
-      scopes: ['scope1', 'scope2'],
+      scopes: ["scope1", "scope2"],
     },
   } as MCPServerConfig;
 
-  it('should throw an error if no scopes are provided', () => {
+  it("should throw an error if no scopes are provided", () => {
     const config = {
-      url: 'https://test.googleapis.com',
+      url: "https://test.googleapis.com",
     } as MCPServerConfig;
     expect(() => new GoogleCredentialProvider(config)).toThrow(
-      'Scopes must be provided in the oauth config for Google Credentials provider',
+      "Scopes must be provided in the oauth config for Google Credentials provider",
     );
   });
 
-  it('should use scopes from the config if provided', () => {
+  it("should use scopes from the config if provided", () => {
     new GoogleCredentialProvider(validConfig);
     expect(GoogleAuth).toHaveBeenCalledWith({
-      scopes: ['scope1', 'scope2'],
+      scopes: ["scope1", "scope2"],
     });
   });
 
-  it('should throw an error for a non-allowlisted host', () => {
+  it("should throw an error for a non-allowlisted host", () => {
     const config = {
-      url: 'https://example.com',
+      url: "https://example.com",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     expect(() => new GoogleCredentialProvider(config)).toThrow(
@@ -48,31 +48,31 @@ describe('GoogleCredentialProvider', () => {
     );
   });
 
-  it('should allow luci.app', () => {
+  it("should allow luci.app", () => {
     const config = {
-      url: 'https://luci.app',
+      url: "https://luci.app",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     new GoogleCredentialProvider(config);
   });
 
-  it('should allow sub.luci.app', () => {
+  it("should allow sub.luci.app", () => {
     const config = {
-      url: 'https://sub.luci.app',
+      url: "https://sub.luci.app",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     new GoogleCredentialProvider(config);
   });
 
-  it('should not allow googleapis.com without a subdomain', () => {
+  it("should not allow googleapis.com without a subdomain", () => {
     const config = {
-      url: 'https://googleapis.com',
+      url: "https://googleapis.com",
       oauth: {
-        scopes: ['scope1', 'scope2'],
+        scopes: ["scope1", "scope2"],
       },
     } as MCPServerConfig;
     expect(() => new GoogleCredentialProvider(config)).toThrow(
@@ -80,7 +80,7 @@ describe('GoogleCredentialProvider', () => {
     );
   });
 
-  describe('with provider instance', () => {
+  describe("with provider instance", () => {
     let provider: GoogleCredentialProvider;
     let mockGetAccessToken: Mock;
     let mockClient: {
@@ -98,28 +98,28 @@ describe('GoogleCredentialProvider', () => {
       provider = new GoogleCredentialProvider(validConfig);
     });
 
-    it('should return credentials', async () => {
-      mockGetAccessToken.mockResolvedValue({ token: 'test-token' });
+    it("should return credentials", async () => {
+      mockGetAccessToken.mockResolvedValue({ token: "test-token" });
 
       const credentials = await provider.tokens();
-      expect(credentials?.access_token).toBe('test-token');
+      expect(credentials?.access_token).toBe("test-token");
     });
 
-    it('should return undefined if access token is not available', async () => {
+    it("should return undefined if access token is not available", async () => {
       mockGetAccessToken.mockResolvedValue({ token: null });
 
       const credentials = await provider.tokens();
       expect(credentials).toBeUndefined();
     });
 
-    it('should return a cached token if it is not expired', async () => {
+    it("should return a cached token if it is not expired", async () => {
       vi.useFakeTimers();
       mockClient.credentials = { expiry_date: Date.now() + 3600 * 1000 }; // 1 hour
-      mockGetAccessToken.mockResolvedValue({ token: 'test-token' });
+      mockGetAccessToken.mockResolvedValue({ token: "test-token" });
 
       // first call
       const firstTokens = await provider.tokens();
-      expect(firstTokens?.access_token).toBe('test-token');
+      expect(firstTokens?.access_token).toBe("test-token");
       expect(mockGetAccessToken).toHaveBeenCalledTimes(1);
 
       // second call
@@ -131,24 +131,24 @@ describe('GoogleCredentialProvider', () => {
       vi.useRealTimers();
     });
 
-    it('should fetch a new token if the cached token is expired', async () => {
+    it("should fetch a new token if the cached token is expired", async () => {
       vi.useFakeTimers();
 
       // first call
       mockClient.credentials = { expiry_date: Date.now() + 1000 }; // Expires in 1 second
-      mockGetAccessToken.mockResolvedValue({ token: 'expired-token' });
+      mockGetAccessToken.mockResolvedValue({ token: "expired-token" });
 
       const firstTokens = await provider.tokens();
-      expect(firstTokens?.access_token).toBe('expired-token');
+      expect(firstTokens?.access_token).toBe("expired-token");
       expect(mockGetAccessToken).toHaveBeenCalledTimes(1);
 
       // second call
       vi.advanceTimersByTime(1001); // Advance time past expiry
       mockClient.credentials = { expiry_date: Date.now() + 3600 * 1000 }; // New expiry
-      mockGetAccessToken.mockResolvedValue({ token: 'new-token' });
+      mockGetAccessToken.mockResolvedValue({ token: "new-token" });
 
       const newTokens = await provider.tokens();
-      expect(newTokens?.access_token).toBe('new-token');
+      expect(newTokens?.access_token).toBe("new-token");
       expect(mockGetAccessToken).toHaveBeenCalledTimes(2); // new fetch
 
       vi.useRealTimers();
diff --git a/packages/gemini-core/src/mcp/google-auth-provider.ts b/packages/gemini-core/src/mcp/google-auth-provider.ts
index 6196914cb..d6f55c164 100644
--- a/packages/gemini-core/src/mcp/google-auth-provider.ts
+++ b/packages/gemini-core/src/mcp/google-auth-provider.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
+import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
 import type {
   OAuthClientInformation,
   OAuthClientInformationFull,
   OAuthClientMetadata,
   OAuthTokens,
-} from '@modelcontextprotocol/sdk/shared/auth.js';
-import { GoogleAuth } from 'google-auth-library';
-import type { MCPServerConfig } from '../config/config.js';
-import { FIVE_MIN_BUFFER_MS } from './oauth-utils.js';
-import { coreEvents } from '../utils/events.js';
+} from "@modelcontextprotocol/sdk/shared/auth.js";
+import { GoogleAuth } from "google-auth-library";
+import type { MCPServerConfig } from "../config/config.js";
+import { coreEvents } from "../utils/events.js";
+import { FIVE_MIN_BUFFER_MS } from "./oauth-utils.js";
 
 const ALLOWED_HOSTS = [/^.+\.googleapis\.com$/, /^(.*\.)?luci\.app$/];
 
@@ -24,35 +24,31 @@ export class GoogleCredentialProvider implements OAuthClientProvider {
   private tokenExpiryTime?: number;
 
   // Properties required by OAuthClientProvider, with no-op values
-  readonly redirectUrl = '';
+  readonly redirectUrl = "";
   readonly clientMetadata: OAuthClientMetadata = {
-    client_name: 'Gemini CLI (Google ADC)',
+    client_name: "Gemini CLI (Google ADC)",
     redirect_uris: [],
     grant_types: [],
     response_types: [],
-    token_endpoint_auth_method: 'none',
+    token_endpoint_auth_method: "none",
   };
   private _clientInformation?: OAuthClientInformationFull;
 
   constructor(private readonly config?: MCPServerConfig) {
     const url = this.config?.url || this.config?.httpUrl;
     if (!url) {
-      throw new Error(
-        'URL must be provided in the config for Google Credentials provider',
-      );
+      throw new Error("URL must be provided in the config for Google Credentials provider");
     }
 
     const hostname = new URL(url).hostname;
     if (!ALLOWED_HOSTS.some((pattern) => pattern.test(hostname))) {
-      throw new Error(
-        `Host "${hostname}" is not an allowed host for Google Credential provider.`,
-      );
+      throw new Error(`Host "${hostname}" is not an allowed host for Google Credential provider.`);
     }
 
     const scopes = this.config?.oauth?.scopes;
     if (!scopes || scopes.length === 0) {
       throw new Error(
-        'Scopes must be provided in the oauth config for Google Credentials provider',
+        "Scopes must be provided in the oauth config for Google Credentials provider",
       );
     }
     this.auth = new GoogleAuth({
@@ -86,16 +82,13 @@ export class GoogleCredentialProvider implements OAuthClientProvider {
     const accessTokenResponse = await client.getAccessToken();
 
     if (!accessTokenResponse.token) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to get access token from Google ADC',
-      );
+      coreEvents.emitFeedback("error", "Failed to get access token from Google ADC");
       return undefined;
     }
 
     const newToken: OAuthTokens = {
       access_token: accessTokenResponse.token,
-      token_type: 'Bearer',
+      token_type: "Bearer",
     };
 
     const expiryTime = client.credentials?.expiry_date;
@@ -121,6 +114,6 @@ export class GoogleCredentialProvider implements OAuthClientProvider {
 
   codeVerifier(): string {
     // No-op
-    return '';
+    return "";
   }
 }
diff --git a/packages/gemini-core/src/mcp/oauth-provider.test.ts b/packages/gemini-core/src/mcp/oauth-provider.test.ts
index 46e9b0d73..10839d034 100644
--- a/packages/gemini-core/src/mcp/oauth-provider.test.ts
+++ b/packages/gemini-core/src/mcp/oauth-provider.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
+import { vi } from "vitest";
 
 // Mock dependencies AT THE TOP
 const mockOpenBrowserSecurely = vi.hoisted(() => vi.fn());
-vi.mock('../utils/secure-browser-launcher.js', () => ({
+vi.mock("../utils/secure-browser-launcher.js", () => ({
   openBrowserSecurely: mockOpenBrowserSecurely,
 }));
-vi.mock('node:crypto');
-vi.mock('./oauth-token-storage.js', () => {
+vi.mock("node:crypto");
+vi.mock("./oauth-token-storage.js", () => {
   const mockSaveToken = vi.fn();
   const mockGetCredentials = vi.fn();
   const mockIsTokenExpired = vi.fn();
@@ -27,29 +27,29 @@ vi.mock('./oauth-token-storage.js', () => {
     })),
   };
 });
-vi.mock('../utils/events.js', () => ({
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
 }));
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as http from 'node:http';
-import * as crypto from 'node:crypto';
+import * as crypto from "node:crypto";
+import * as http from "node:http";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { coreEvents } from "../utils/events.js";
 import type {
   MCPOAuthConfig,
-  OAuthTokenResponse,
   OAuthClientRegistrationResponse,
-} from './oauth-provider.js';
-import { MCPOAuthProvider } from './oauth-provider.js';
-import type { OAuthToken } from './token-storage/types.js';
-import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
+  OAuthTokenResponse,
+} from "./oauth-provider.js";
+import { MCPOAuthProvider } from "./oauth-provider.js";
+import { MCPOAuthTokenStorage } from "./oauth-token-storage.js";
 import {
-  OAuthUtils,
   type OAuthAuthorizationServerMetadata,
   type OAuthProtectedResourceMetadata,
-} from './oauth-utils.js';
-import { coreEvents } from '../utils/events.js';
+  OAuthUtils,
+} from "./oauth-utils.js";
+import type { OAuthToken } from "./token-storage/types.js";
 
 // Mock fetch globally
 const mockFetch = vi.fn();
@@ -75,7 +75,7 @@ const createMockResponse = (options: {
     ok: options.ok,
     headers: {
       get: (name: string) => {
-        if (name.toLowerCase() === 'content-type') {
+        if (name.toLowerCase() === "content-type") {
           return options.contentType || null;
         }
         return null;
@@ -89,14 +89,14 @@ const createMockResponse = (options: {
 
   if (options.text !== undefined) {
     response.text =
-      typeof options.text === 'string'
+      typeof options.text === "string"
         ? () => Promise.resolve(options.text as string)
         : (options.text as () => Promise<string>);
   }
 
   if (options.json !== undefined) {
     response.json =
-      typeof options.json === 'function'
+      typeof options.json === "function"
         ? (options.json as () => Promise<unknown>)
         : () => Promise.resolve(options.json);
   }
@@ -109,65 +109,65 @@ const mockHttpServer = {
   listen: vi.fn(),
   close: vi.fn(),
   on: vi.fn(),
-  address: vi.fn(() => ({ address: 'localhost', family: 'IPv4', port: 7777 })),
+  address: vi.fn(() => ({ address: "localhost", family: "IPv4", port: 7777 })),
 };
-vi.mock('node:http', () => ({
+vi.mock("node:http", () => ({
   createServer: vi.fn(() => mockHttpServer),
 }));
 
-describe('MCPOAuthProvider', () => {
+describe("MCPOAuthProvider", () => {
   const mockConfig: MCPOAuthConfig = {
     enabled: true,
-    clientId: 'test-client-id',
-    clientSecret: 'test-client-secret',
-    authorizationUrl: 'https://auth.example.com/authorize',
-    tokenUrl: 'https://auth.example.com/token',
-    scopes: ['read', 'write'],
-    redirectUri: 'http://localhost:7777/oauth/callback',
-    audiences: ['https://api.example.com'],
+    clientId: "test-client-id",
+    clientSecret: "test-client-secret",
+    authorizationUrl: "https://auth.example.com/authorize",
+    tokenUrl: "https://auth.example.com/token",
+    scopes: ["read", "write"],
+    redirectUri: "http://localhost:7777/oauth/callback",
+    audiences: ["https://api.example.com"],
   };
 
   const mockToken: OAuthToken = {
-    accessToken: 'access_token_123',
-    refreshToken: 'refresh_token_456',
-    tokenType: 'Bearer',
-    scope: 'read write',
+    accessToken: "access_token_123",
+    refreshToken: "refresh_token_456",
+    tokenType: "Bearer",
+    scope: "read write",
     expiresAt: Date.now() + 3600000,
   };
 
   const mockTokenResponse: OAuthTokenResponse = {
-    access_token: 'access_token_123',
-    token_type: 'Bearer',
+    access_token: "access_token_123",
+    token_type: "Bearer",
     expires_in: 3600,
-    refresh_token: 'refresh_token_456',
-    scope: 'read write',
+    refresh_token: "refresh_token_456",
+    scope: "read write",
   };
 
   beforeEach(() => {
     vi.clearAllMocks();
     mockOpenBrowserSecurely.mockClear();
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
 
     // Mock crypto functions
     vi.mocked(crypto.randomBytes).mockImplementation((size: number) => {
-      if (size === 32) return Buffer.from('code_verifier_mock_32_bytes_long');
-      if (size === 16) return Buffer.from('state_mock_16_by');
+      if (size === 32) return Buffer.from("code_verifier_mock_32_bytes_long");
+      if (size === 16) return Buffer.from("state_mock_16_by");
       return Buffer.alloc(size);
     });
 
     vi.mocked(crypto.createHash).mockReturnValue({
       update: vi.fn().mockReturnThis(),
-      digest: vi.fn().mockReturnValue('code_challenge_mock'),
+      digest: vi.fn().mockReturnValue("code_challenge_mock"),
     } as unknown as crypto.Hash);
 
     // Mock randomBytes to return predictable values for state
     vi.mocked(crypto.randomBytes).mockImplementation((size) => {
       if (size === 32) {
-        return Buffer.from('mock_code_verifier_32_bytes_long_string');
+        return Buffer.from("mock_code_verifier_32_bytes_long_string");
       } else if (size === 16) {
-        return Buffer.from('mock_state_16_bytes');
+        return Buffer.from("mock_state_16_bytes");
       }
       return Buffer.alloc(size);
     });
@@ -182,8 +182,8 @@ describe('MCPOAuthProvider', () => {
     vi.restoreAllMocks();
   });
 
-  describe('authenticate', () => {
-    it('should perform complete OAuth flow with PKCE', async () => {
+  describe("authenticate", () => {
+    it("should perform complete OAuth flow with PKCE", async () => {
       // Mock HTTP server callback
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
@@ -196,16 +196,13 @@ describe('MCPOAuthProvider', () => {
         // Simulate OAuth callback
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -213,54 +210,52 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate('test-server', mockConfig);
+      const result = await authProvider.authenticate("test-server", mockConfig);
 
       expect(result).toEqual({
-        accessToken: 'access_token_123',
-        refreshToken: 'refresh_token_456',
-        tokenType: 'Bearer',
-        scope: 'read write',
+        accessToken: "access_token_123",
+        refreshToken: "refresh_token_456",
+        tokenType: "Bearer",
+        scope: "read write",
         expiresAt: expect.any(Number),
       });
 
-      expect(mockOpenBrowserSecurely).toHaveBeenCalledWith(
-        expect.stringContaining('authorize'),
-      );
+      expect(mockOpenBrowserSecurely).toHaveBeenCalledWith(expect.stringContaining("authorize"));
       const tokenStorage = new MCPOAuthTokenStorage();
       expect(tokenStorage.saveToken).toHaveBeenCalledWith(
-        'test-server',
-        expect.objectContaining({ accessToken: 'access_token_123' }),
-        'test-client-id',
-        'https://auth.example.com/token',
+        "test-server",
+        expect.objectContaining({ accessToken: "access_token_123" }),
+        "test-client-id",
+        "https://auth.example.com/token",
         undefined,
       );
     });
 
-    it('should handle OAuth discovery when no authorization URL provided', async () => {
+    it("should handle OAuth discovery when no authorization URL provided", async () => {
       // Use a mutable config object
       const configWithoutAuth: MCPOAuthConfig = {
         ...mockConfig,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
+        clientId: "test-client-id",
+        clientSecret: "test-client-secret",
       };
       delete configWithoutAuth.authorizationUrl;
       delete configWithoutAuth.tokenUrl;
 
       const mockResourceMetadata = {
-        authorization_servers: ['https://discovered.auth.com'],
+        authorization_servers: ["https://discovered.auth.com"],
       };
 
       const mockAuthServerMetadata = {
-        authorization_endpoint: 'https://discovered.auth.com/authorize',
-        token_endpoint: 'https://discovered.auth.com/token',
-        scopes_supported: ['read', 'write'],
+        authorization_endpoint: "https://discovered.auth.com/authorize",
+        token_endpoint: "https://discovered.auth.com/token",
+        scopes_supported: ["read", "write"],
       };
 
       // Mock HEAD request for WWW-Authenticate check
@@ -274,7 +269,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -282,7 +277,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -299,16 +294,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -316,7 +308,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -324,43 +316,43 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithoutAuth,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://discovered.auth.com/token',
+        "https://discovered.auth.com/token",
         expect.objectContaining({
-          method: 'POST',
+          method: "POST",
           headers: expect.objectContaining({
-            'Content-Type': 'application/x-www-form-urlencoded',
+            "Content-Type": "application/x-www-form-urlencoded",
           }),
         }),
       );
     });
 
-    it('should perform dynamic client registration when no client ID is provided but registration URL is provided', async () => {
+    it("should perform dynamic client registration when no client ID is provided but registration URL is provided", async () => {
       const configWithoutClient: MCPOAuthConfig = {
         ...mockConfig,
-        registrationUrl: 'https://auth.example.com/register',
+        registrationUrl: "https://auth.example.com/register",
       };
       delete configWithoutClient.clientId;
 
       const mockRegistrationResponse: OAuthClientRegistrationResponse = {
-        client_id: 'dynamic_client_id',
-        client_secret: 'dynamic_client_secret',
-        redirect_uris: ['http://localhost:7777/oauth/callback'],
-        grant_types: ['authorization_code', 'refresh_token'],
-        response_types: ['code'],
-        token_endpoint_auth_method: 'none',
+        client_id: "dynamic_client_id",
+        client_secret: "dynamic_client_secret",
+        redirect_uris: ["http://localhost:7777/oauth/callback"],
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none",
       };
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockRegistrationResponse),
           json: mockRegistrationResponse,
         }),
@@ -377,16 +369,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -394,53 +383,50 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate(
-        'test-server',
-        configWithoutClient,
-      );
+      const result = await authProvider.authenticate("test-server", configWithoutClient);
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/register',
+        "https://auth.example.com/register",
         expect.objectContaining({
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
         }),
       );
     });
 
-    it('should perform OAuth discovery and dynamic client registration when no client ID or registration URL provided', async () => {
+    it("should perform OAuth discovery and dynamic client registration when no client ID or registration URL provided", async () => {
       const configWithoutClient: MCPOAuthConfig = { ...mockConfig };
       delete configWithoutClient.clientId;
 
       const mockRegistrationResponse: OAuthClientRegistrationResponse = {
-        client_id: 'dynamic_client_id',
-        client_secret: 'dynamic_client_secret',
-        redirect_uris: ['http://localhost:7777/oauth/callback'],
-        grant_types: ['authorization_code', 'refresh_token'],
-        response_types: ['code'],
-        token_endpoint_auth_method: 'none',
+        client_id: "dynamic_client_id",
+        client_secret: "dynamic_client_secret",
+        redirect_uris: ["http://localhost:7777/oauth/callback"],
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none",
       };
 
       const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
-        registration_endpoint: 'https://auth.example.com/register',
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
+        registration_endpoint: "https://auth.example.com/register",
       };
 
       mockFetch
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -448,7 +434,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockRegistrationResponse),
             json: mockRegistrationResponse,
           }),
@@ -465,16 +451,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -482,29 +465,26 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate(
-        'test-server',
-        configWithoutClient,
-      );
+      const result = await authProvider.authenticate("test-server", configWithoutClient);
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/register',
+        "https://auth.example.com/register",
         expect.objectContaining({
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
         }),
       );
     });
 
-    it('should perform OAuth discovery once and dynamic client registration when no client ID, authorization URL or registration URL provided', async () => {
+    it("should perform OAuth discovery once and dynamic client registration when no client ID, authorization URL or registration URL provided", async () => {
       const configWithoutClientAndAuthorizationUrl: MCPOAuthConfig = {
         ...mockConfig,
       };
@@ -512,24 +492,24 @@ describe('MCPOAuthProvider', () => {
       delete configWithoutClientAndAuthorizationUrl.authorizationUrl;
 
       const mockResourceMetadata: OAuthProtectedResourceMetadata = {
-        resource: 'https://api.example.com',
-        authorization_servers: ['https://auth.example.com'],
+        resource: "https://api.example.com",
+        authorization_servers: ["https://auth.example.com"],
       };
 
       const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
-        registration_endpoint: 'https://auth.example.com/register',
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
+        registration_endpoint: "https://auth.example.com/register",
       };
 
       const mockRegistrationResponse: OAuthClientRegistrationResponse = {
-        client_id: 'dynamic_client_id',
-        client_secret: 'dynamic_client_secret',
-        redirect_uris: ['http://localhost:7777/oauth/callback'],
-        grant_types: ['authorization_code', 'refresh_token'],
-        response_types: ['code'],
-        token_endpoint_auth_method: 'none',
+        client_id: "dynamic_client_id",
+        client_secret: "dynamic_client_secret",
+        redirect_uris: ["http://localhost:7777/oauth/callback"],
+        grant_types: ["authorization_code", "refresh_token"],
+        response_types: ["code"],
+        token_endpoint_auth_method: "none",
       };
 
       mockFetch
@@ -542,7 +522,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -550,7 +530,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -558,7 +538,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockRegistrationResponse),
             json: mockRegistrationResponse,
           }),
@@ -575,16 +555,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -592,7 +569,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -600,22 +577,22 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithoutClientAndAuthorizationUrl,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(result).toBeDefined();
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/register',
+        "https://auth.example.com/register",
         expect.objectContaining({
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
         }),
       );
     });
 
-    it('should handle OAuth callback errors', async () => {
+    it("should handle OAuth callback errors", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -626,26 +603,23 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?error=access_denied&error_description=User%20denied%20access',
+            url: "/oauth/callback?error=access_denied&error_description=User%20denied%20access",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('OAuth error: access_denied');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "OAuth error: access_denied",
+      );
     });
 
-    it('should handle state mismatch in callback', async () => {
+    it("should handle state mismatch in callback", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -656,26 +630,23 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=wrong_state',
+            url: "/oauth/callback?code=auth_code_123&state=wrong_state",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('State mismatch - possible CSRF attack');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "State mismatch - possible CSRF attack",
+      );
     });
 
-    it('should handle token exchange failure', async () => {
+    it("should handle token exchange failure", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -686,16 +657,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -703,18 +671,18 @@ describe('MCPOAuthProvider', () => {
         createMockResponse({
           ok: false,
           status: 400,
-          contentType: 'application/x-www-form-urlencoded',
-          text: 'error=invalid_grant&error_description=Invalid grant',
+          contentType: "application/x-www-form-urlencoded",
+          text: "error=invalid_grant&error_description=Invalid grant",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('Token exchange failed: invalid_grant - Invalid grant');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "Token exchange failed: invalid_grant - Invalid grant",
+      );
     });
 
-    it('should handle OAuth discovery failure', async () => {
+    it("should handle OAuth discovery failure", async () => {
       const configWithoutAuth: MCPOAuthConfig = { ...mockConfig };
       delete configWithoutAuth.authorizationUrl;
       delete configWithoutAuth.tokenUrl;
@@ -728,17 +696,11 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       await expect(
-        authProvider.authenticate(
-          'test-server',
-          configWithoutAuth,
-          'https://api.example.com',
-        ),
-      ).rejects.toThrow(
-        'Failed to discover OAuth configuration from MCP server',
-      );
+        authProvider.authenticate("test-server", configWithoutAuth, "https://api.example.com"),
+      ).rejects.toThrow("Failed to discover OAuth configuration from MCP server");
     });
 
-    it('should handle authorization server metadata discovery failure', async () => {
+    it("should handle authorization server metadata discovery failure", async () => {
       const configWithoutClient: MCPOAuthConfig = { ...mockConfig };
       delete configWithoutClient.clientId;
 
@@ -755,14 +717,12 @@ describe('MCPOAuthProvider', () => {
       });
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', configWithoutClient),
-      ).rejects.toThrow(
-        'Failed to fetch authorization server metadata for client registration',
+      await expect(authProvider.authenticate("test-server", configWithoutClient)).rejects.toThrow(
+        "Failed to fetch authorization server metadata for client registration",
       );
     });
 
-    it('should handle invalid callback request', async () => {
+    it("should handle invalid callback request", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -773,16 +733,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/invalid-path',
+            url: "/invalid-path",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 0);
       });
 
@@ -790,12 +747,12 @@ describe('MCPOAuthProvider', () => {
       // The test will timeout if the server does not handle the invalid request correctly.
       // We are testing that the server does not hang.
       await Promise.race([
-        authProvider.authenticate('test-server', mockConfig),
+        authProvider.authenticate("test-server", mockConfig),
         new Promise((resolve) => setTimeout(resolve, 1000)),
       ]);
     });
 
-    it('should handle token exchange failure with non-json response', async () => {
+    it("should handle token exchange failure with non-json response", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -806,16 +763,13 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -823,18 +777,18 @@ describe('MCPOAuthProvider', () => {
         createMockResponse({
           ok: false,
           status: 500,
-          contentType: 'text/html',
-          text: 'Internal Server Error',
+          contentType: "text/html",
+          text: "Internal Server Error",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('Token exchange failed: 500 - Internal Server Error');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "Token exchange failed: 500 - Internal Server Error",
+      );
     });
 
-    it('should handle token exchange with unexpected content type', async () => {
+    it("should handle token exchange with unexpected content type", async () => {
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
         callbackHandler = handler;
@@ -845,39 +799,36 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'text/plain',
-          text: 'access_token=plain_text_token',
+          contentType: "text/plain",
+          text: "access_token=plain_text_token",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate('test-server', mockConfig);
-      expect(result.accessToken).toBe('plain_text_token');
+      const result = await authProvider.authenticate("test-server", mockConfig);
+      expect(result.accessToken).toBe("plain_text_token");
     });
 
-    it('should handle refresh token failure with non-json response', async () => {
+    it("should handle refresh token failure with non-json response", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: false,
           status: 500,
-          contentType: 'text/html',
-          text: 'Internal Server Error',
+          contentType: "text/html",
+          text: "Internal Server Error",
         }),
       );
 
@@ -885,32 +836,32 @@ describe('MCPOAuthProvider', () => {
       await expect(
         authProvider.refreshAccessToken(
           mockConfig,
-          'invalid_refresh_token',
-          'https://auth.example.com/token',
+          "invalid_refresh_token",
+          "https://auth.example.com/token",
         ),
-      ).rejects.toThrow('Token refresh failed: 500 - Internal Server Error');
+      ).rejects.toThrow("Token refresh failed: 500 - Internal Server Error");
     });
 
-    it('should handle refresh token with unexpected content type', async () => {
+    it("should handle refresh token with unexpected content type", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'text/plain',
-          text: 'access_token=plain_text_token',
+          contentType: "text/plain",
+          text: "access_token=plain_text_token",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.refreshAccessToken(
         mockConfig,
-        'refresh_token',
-        'https://auth.example.com/token',
+        "refresh_token",
+        "https://auth.example.com/token",
       );
-      expect(result.access_token).toBe('plain_text_token');
+      expect(result.access_token).toBe("plain_text_token");
     });
 
-    it('should continue authentication when browser fails to open', async () => {
-      mockOpenBrowserSecurely.mockRejectedValue(new Error('Browser not found'));
+    it("should continue authentication when browser fails to open", async () => {
+      mockOpenBrowserSecurely.mockRejectedValue(new Error("Browser not found"));
 
       let callbackHandler: unknown;
       vi.mocked(http.createServer).mockImplementation((handler) => {
@@ -922,62 +873,54 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.authenticate('test-server', mockConfig);
+      const result = await authProvider.authenticate("test-server", mockConfig);
       expect(result).toBeDefined();
     });
 
-    it('should return null when token is expired and no refresh token is available', async () => {
+    it("should return null when token is expired and no refresh token is available", async () => {
       const expiredCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
           ...mockToken,
           refreshToken: undefined,
           expiresAt: Date.now() - 3600000,
         },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        expiredCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(expiredCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
     });
 
-    it('should handle callback timeout', async () => {
+    it("should handle callback timeout", async () => {
       vi.mocked(http.createServer).mockImplementation(
         () => mockHttpServer as unknown as http.Server,
       );
@@ -998,27 +941,27 @@ describe('MCPOAuthProvider', () => {
       }) as unknown as typeof setTimeout;
 
       const authProvider = new MCPOAuthProvider();
-      await expect(
-        authProvider.authenticate('test-server', mockConfig),
-      ).rejects.toThrow('OAuth callback timeout');
+      await expect(authProvider.authenticate("test-server", mockConfig)).rejects.toThrow(
+        "OAuth callback timeout",
+      );
 
       global.setTimeout = originalSetTimeout;
     });
   });
 
-  describe('refreshAccessToken', () => {
-    it('should refresh token successfully', async () => {
+  describe("refreshAccessToken", () => {
+    it("should refresh token successfully", async () => {
       const refreshResponse = {
-        access_token: 'new_access_token',
-        token_type: 'Bearer',
+        access_token: "new_access_token",
+        token_type: "Bearer",
         expires_in: 3600,
-        refresh_token: 'new_refresh_token',
+        refresh_token: "new_refresh_token",
       };
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(refreshResponse),
           json: refreshResponse,
         }),
@@ -1027,29 +970,29 @@ describe('MCPOAuthProvider', () => {
       const authProvider = new MCPOAuthProvider();
       const result = await authProvider.refreshAccessToken(
         mockConfig,
-        'old_refresh_token',
-        'https://auth.example.com/token',
+        "old_refresh_token",
+        "https://auth.example.com/token",
       );
 
       expect(result).toEqual(refreshResponse);
       expect(mockFetch).toHaveBeenCalledWith(
-        'https://auth.example.com/token',
+        "https://auth.example.com/token",
         expect.objectContaining({
-          method: 'POST',
+          method: "POST",
           headers: {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            Accept: 'application/json, application/x-www-form-urlencoded',
+            "Content-Type": "application/x-www-form-urlencoded",
+            Accept: "application/json, application/x-www-form-urlencoded",
           },
-          body: expect.stringContaining('grant_type=refresh_token'),
+          body: expect.stringContaining("grant_type=refresh_token"),
         }),
       );
     });
 
-    it('should include client secret in refresh request when available', async () => {
+    it("should include client secret in refresh request when available", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1058,21 +1001,21 @@ describe('MCPOAuthProvider', () => {
       const authProvider = new MCPOAuthProvider();
       await authProvider.refreshAccessToken(
         mockConfig,
-        'refresh_token',
-        'https://auth.example.com/token',
+        "refresh_token",
+        "https://auth.example.com/token",
       );
 
       const fetchCall = mockFetch.mock.calls[0];
-      expect(fetchCall[1].body).toContain('client_secret=test-client-secret');
+      expect(fetchCall[1].body).toContain("client_secret=test-client-secret");
     });
 
-    it('should handle refresh token failure', async () => {
+    it("should handle refresh token failure", async () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: false,
           status: 400,
-          contentType: 'application/x-www-form-urlencoded',
-          text: 'error=invalid_request&error_description=Invalid refresh token',
+          contentType: "application/x-www-form-urlencoded",
+          text: "error=invalid_request&error_description=Invalid refresh token",
         }),
       );
 
@@ -1080,113 +1023,96 @@ describe('MCPOAuthProvider', () => {
       await expect(
         authProvider.refreshAccessToken(
           mockConfig,
-          'invalid_refresh_token',
-          'https://auth.example.com/token',
+          "invalid_refresh_token",
+          "https://auth.example.com/token",
         ),
-      ).rejects.toThrow(
-        'Token refresh failed: invalid_request - Invalid refresh token',
-      );
+      ).rejects.toThrow("Token refresh failed: invalid_request - Invalid refresh token");
     });
   });
 
-  describe('getValidToken', () => {
-    it('should return valid token when not expired', async () => {
+  describe("getValidToken", () => {
+    it("should return valid token when not expired", async () => {
       const validCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: mockToken,
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        validCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(validCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(false);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
-      expect(result).toBe('access_token_123');
+      expect(result).toBe("access_token_123");
     });
 
-    it('should refresh expired token and return new token', async () => {
+    it("should refresh expired token and return new token", async () => {
       const expiredCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: { ...mockToken, expiresAt: Date.now() - 3600000 },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        expiredCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(expiredCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
 
       const refreshResponse = {
-        access_token: 'new_access_token',
-        token_type: 'Bearer',
+        access_token: "new_access_token",
+        token_type: "Bearer",
         expires_in: 3600,
-        refresh_token: 'new_refresh_token',
+        refresh_token: "new_refresh_token",
       };
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(refreshResponse),
           json: refreshResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
-      expect(result).toBe('new_access_token');
+      expect(result).toBe("new_access_token");
       expect(tokenStorage.saveToken).toHaveBeenCalledWith(
-        'test-server',
-        expect.objectContaining({ accessToken: 'new_access_token' }),
-        'test-client-id',
-        'https://auth.example.com/token',
+        "test-server",
+        expect.objectContaining({ accessToken: "new_access_token" }),
+        "test-client-id",
+        "https://auth.example.com/token",
         undefined,
       );
     });
 
-    it('should return null when no credentials exist', async () => {
+    it("should return null when no credentials exist", async () => {
       const tokenStorage = new MCPOAuthTokenStorage();
       vi.mocked(tokenStorage.getCredentials).mockResolvedValue(null);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
     });
 
-    it('should handle refresh failure and remove invalid token', async () => {
+    it("should handle refresh failure and remove invalid token", async () => {
       const expiredCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: { ...mockToken, expiresAt: Date.now() - 3600000 },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        expiredCredentials,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(expiredCredentials);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
       vi.mocked(tokenStorage.deleteCredentials).mockResolvedValue(undefined);
 
@@ -1194,59 +1120,49 @@ describe('MCPOAuthProvider', () => {
         createMockResponse({
           ok: false,
           status: 400,
-          contentType: 'application/x-www-form-urlencoded',
-          text: 'error=invalid_request&error_description=Invalid refresh token',
+          contentType: "application/x-www-form-urlencoded",
+          text: "error=invalid_request&error_description=Invalid refresh token",
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
-      expect(tokenStorage.deleteCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(tokenStorage.deleteCredentials).toHaveBeenCalledWith("test-server");
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        expect.stringContaining('Failed to refresh auth token'),
+        "error",
+        expect.stringContaining("Failed to refresh auth token"),
         expect.any(Error),
       );
     });
 
-    it('should return null for token without refresh capability', async () => {
+    it("should return null for token without refresh capability", async () => {
       const tokenWithoutRefresh = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
           ...mockToken,
           refreshToken: undefined,
           expiresAt: Date.now() - 3600000,
         },
-        clientId: 'test-client-id',
-        tokenUrl: 'https://auth.example.com/token',
+        clientId: "test-client-id",
+        tokenUrl: "https://auth.example.com/token",
         updatedAt: Date.now(),
       };
 
       const tokenStorage = new MCPOAuthTokenStorage();
-      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(
-        tokenWithoutRefresh,
-      );
+      vi.mocked(tokenStorage.getCredentials).mockResolvedValue(tokenWithoutRefresh);
       vi.mocked(tokenStorage.isTokenExpired).mockReturnValue(true);
 
       const authProvider = new MCPOAuthProvider();
-      const result = await authProvider.getValidToken(
-        'test-server',
-        mockConfig,
-      );
+      const result = await authProvider.getValidToken("test-server", mockConfig);
 
       expect(result).toBeNull();
     });
   });
 
-  describe('PKCE parameter generation', () => {
-    it('should generate valid PKCE parameters', async () => {
+  describe("PKCE parameter generation", () => {
+    it("should generate valid PKCE parameters", async () => {
       // Test is implicit in the authenticate flow tests, but we can verify
       // the crypto mocks are called correctly
       let callbackHandler: unknown;
@@ -1259,39 +1175,36 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate('test-server', mockConfig);
+      await authProvider.authenticate("test-server", mockConfig);
 
       expect(crypto.randomBytes).toHaveBeenCalledWith(32); // code verifier
       expect(crypto.randomBytes).toHaveBeenCalledWith(16); // state
-      expect(crypto.createHash).toHaveBeenCalledWith('sha256');
+      expect(crypto.createHash).toHaveBeenCalledWith("sha256");
     });
   });
 
-  describe('Authorization URL building', () => {
-    it('should build correct authorization URL with all parameters', async () => {
+  describe("Authorization URL building", () => {
+    it("should build correct authorization URL with all parameters", async () => {
       // Mock to capture the URL that would be opened
       let capturedUrl: string | undefined;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
@@ -1309,46 +1222,39 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
       );
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate(
-        'test-server',
-        mockConfig,
-        'https://auth.example.com',
-      );
+      await authProvider.authenticate("test-server", mockConfig, "https://auth.example.com");
 
       expect(capturedUrl).toBeDefined();
-      expect(capturedUrl!).toContain('response_type=code');
-      expect(capturedUrl!).toContain('client_id=test-client-id');
-      expect(capturedUrl!).toContain('code_challenge=code_challenge_mock');
-      expect(capturedUrl!).toContain('code_challenge_method=S256');
-      expect(capturedUrl!).toContain('scope=read+write');
-      expect(capturedUrl!).toContain('resource=https%3A%2F%2Fauth.example.com');
-      expect(capturedUrl!).toContain('audience=https%3A%2F%2Fapi.example.com');
+      expect(capturedUrl!).toContain("response_type=code");
+      expect(capturedUrl!).toContain("client_id=test-client-id");
+      expect(capturedUrl!).toContain("code_challenge=code_challenge_mock");
+      expect(capturedUrl!).toContain("code_challenge_method=S256");
+      expect(capturedUrl!).toContain("scope=read+write");
+      expect(capturedUrl!).toContain("resource=https%3A%2F%2Fauth.example.com");
+      expect(capturedUrl!).toContain("audience=https%3A%2F%2Fapi.example.com");
     });
 
-    it('should correctly append parameters to an authorization URL that already has query params', async () => {
+    it("should correctly append parameters to an authorization URL that already has query params", async () => {
       // Mock to capture the URL that would be opened
       let capturedUrl: string;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
@@ -1366,23 +1272,20 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1390,19 +1293,19 @@ describe('MCPOAuthProvider', () => {
 
       const configWithParamsInUrl = {
         ...mockConfig,
-        authorizationUrl: 'https://auth.example.com/authorize?audience=1234',
+        authorizationUrl: "https://auth.example.com/authorize?audience=1234",
       };
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate('test-server', configWithParamsInUrl);
+      await authProvider.authenticate("test-server", configWithParamsInUrl);
 
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('audience')).toBe('1234');
-      expect(url.searchParams.get('client_id')).toBe('test-client-id');
-      expect(url.search.startsWith('?audience=1234&')).toBe(true);
+      expect(url.searchParams.get("audience")).toBe("1234");
+      expect(url.searchParams.get("client_id")).toBe("test-client-id");
+      expect(url.search.startsWith("?audience=1234&")).toBe(true);
     });
 
-    it('should correctly append parameters to a URL with a fragment', async () => {
+    it("should correctly append parameters to a URL with a fragment", async () => {
       // Mock to capture the URL that would be opened
       let capturedUrl: string;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
@@ -1420,23 +1323,20 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code_123&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = {
             writeHead: vi.fn(),
             end: vi.fn(),
           };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1444,19 +1344,19 @@ describe('MCPOAuthProvider', () => {
 
       const configWithFragment = {
         ...mockConfig,
-        authorizationUrl: 'https://auth.example.com/authorize#login',
+        authorizationUrl: "https://auth.example.com/authorize#login",
       };
 
       const authProvider = new MCPOAuthProvider();
-      await authProvider.authenticate('test-server', configWithFragment);
+      await authProvider.authenticate("test-server", configWithFragment);
 
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('client_id')).toBe('test-client-id');
-      expect(url.hash).toBe('#login');
-      expect(url.pathname).toBe('/authorize');
+      expect(url.searchParams.get("client_id")).toBe("test-client-id");
+      expect(url.hash).toBe("#login");
+      expect(url.pathname).toBe("/authorize");
     });
 
-    it('should use user-configured scopes over discovered scopes', async () => {
+    it("should use user-configured scopes over discovered scopes", async () => {
       let capturedUrl: string | undefined;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
         capturedUrl = url;
@@ -1465,21 +1365,21 @@ describe('MCPOAuthProvider', () => {
 
       const configWithUserScopes: MCPOAuthConfig = {
         ...mockConfig,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
-        scopes: ['user-scope'],
+        clientId: "test-client-id",
+        clientSecret: "test-client-secret",
+        scopes: ["user-scope"],
       };
       delete configWithUserScopes.authorizationUrl;
       delete configWithUserScopes.tokenUrl;
 
       const mockResourceMetadata = {
-        authorization_servers: ['https://discovered.auth.com'],
+        authorization_servers: ["https://discovered.auth.com"],
       };
 
       const mockAuthServerMetadata = {
-        authorization_endpoint: 'https://discovered.auth.com/authorize',
-        token_endpoint: 'https://discovered.auth.com/token',
-        scopes_supported: ['discovered-scope'],
+        authorization_endpoint: "https://discovered.auth.com/authorize",
+        token_endpoint: "https://discovered.auth.com/token",
+        scopes_supported: ["discovered-scope"],
       };
 
       mockFetch
@@ -1487,7 +1387,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -1495,7 +1395,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -1512,13 +1412,10 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = { writeHead: vi.fn(), end: vi.fn() };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -1526,7 +1423,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1534,17 +1431,17 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithUserScopes,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(capturedUrl).toBeDefined();
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('scope')).toBe('user-scope');
+      expect(url.searchParams.get("scope")).toBe("user-scope");
     });
 
-    it('should use discovered scopes when no user-configured scopes are provided', async () => {
+    it("should use discovered scopes when no user-configured scopes are provided", async () => {
       let capturedUrl: string | undefined;
       mockOpenBrowserSecurely.mockImplementation((url: string) => {
         capturedUrl = url;
@@ -1553,21 +1450,21 @@ describe('MCPOAuthProvider', () => {
 
       const configWithoutScopes: MCPOAuthConfig = {
         ...mockConfig,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
+        clientId: "test-client-id",
+        clientSecret: "test-client-secret",
       };
       delete configWithoutScopes.scopes;
       delete configWithoutScopes.authorizationUrl;
       delete configWithoutScopes.tokenUrl;
 
       const mockResourceMetadata = {
-        authorization_servers: ['https://discovered.auth.com'],
+        authorization_servers: ["https://discovered.auth.com"],
       };
 
       const mockAuthServerMetadata = {
-        authorization_endpoint: 'https://discovered.auth.com/authorize',
-        token_endpoint: 'https://discovered.auth.com/token',
-        scopes_supported: ['discovered-scope-1', 'discovered-scope-2'],
+        authorization_endpoint: "https://discovered.auth.com/authorize",
+        token_endpoint: "https://discovered.auth.com/token",
+        scopes_supported: ["discovered-scope-1", "discovered-scope-2"],
       };
 
       mockFetch
@@ -1575,7 +1472,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockResourceMetadata),
             json: mockResourceMetadata,
           }),
@@ -1583,7 +1480,7 @@ describe('MCPOAuthProvider', () => {
         .mockResolvedValueOnce(
           createMockResponse({
             ok: true,
-            contentType: 'application/json',
+            contentType: "application/json",
             text: JSON.stringify(mockAuthServerMetadata),
             json: mockAuthServerMetadata,
           }),
@@ -1600,13 +1497,10 @@ describe('MCPOAuthProvider', () => {
         callback?.();
         setTimeout(() => {
           const mockReq = {
-            url: '/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw',
+            url: "/oauth/callback?code=auth_code&state=bW9ja19zdGF0ZV8xNl9ieXRlcw",
           };
           const mockRes = { writeHead: vi.fn(), end: vi.fn() };
-          (callbackHandler as (req: unknown, res: unknown) => void)(
-            mockReq,
-            mockRes,
-          );
+          (callbackHandler as (req: unknown, res: unknown) => void)(mockReq, mockRes);
         }, 10);
       });
 
@@ -1614,7 +1508,7 @@ describe('MCPOAuthProvider', () => {
       mockFetch.mockResolvedValueOnce(
         createMockResponse({
           ok: true,
-          contentType: 'application/json',
+          contentType: "application/json",
           text: JSON.stringify(mockTokenResponse),
           json: mockTokenResponse,
         }),
@@ -1622,109 +1516,93 @@ describe('MCPOAuthProvider', () => {
 
       const authProvider = new MCPOAuthProvider();
       await authProvider.authenticate(
-        'test-server',
+        "test-server",
         configWithoutScopes,
-        'https://api.example.com',
+        "https://api.example.com",
       );
 
       expect(capturedUrl).toBeDefined();
       const url = new URL(capturedUrl!);
-      expect(url.searchParams.get('scope')).toBe(
-        'discovered-scope-1 discovered-scope-2',
-      );
+      expect(url.searchParams.get("scope")).toBe("discovered-scope-1 discovered-scope-2");
     });
   });
 
-  describe('issuer discovery conformance', () => {
+  describe("issuer discovery conformance", () => {
     const registrationMetadata: OAuthAuthorizationServerMetadata = {
-      issuer: 'http://localhost:8888/realms/my-realm',
-      authorization_endpoint:
-        'http://localhost:8888/realms/my-realm/protocol/openid-connect/auth',
-      token_endpoint:
-        'http://localhost:8888/realms/my-realm/protocol/openid-connect/token',
+      issuer: "http://localhost:8888/realms/my-realm",
+      authorization_endpoint: "http://localhost:8888/realms/my-realm/protocol/openid-connect/auth",
+      token_endpoint: "http://localhost:8888/realms/my-realm/protocol/openid-connect/token",
       registration_endpoint:
-        'http://localhost:8888/realms/my-realm/clients-registrations/openid-connect',
+        "http://localhost:8888/realms/my-realm/clients-registrations/openid-connect",
     };
 
-    it('falls back to path-based issuer when origin discovery fails', async () => {
+    it("falls back to path-based issuer when origin discovery fails", async () => {
       const authProvider = new MCPOAuthProvider();
       const providerWithAccess = authProvider as unknown as {
-        discoverAuthServerMetadataForRegistration: (
-          authorizationUrl: string,
-        ) => Promise<{
+        discoverAuthServerMetadataForRegistration: (authorizationUrl: string) => Promise<{
           issuerUrl: string;
           metadata: OAuthAuthorizationServerMetadata;
         }>;
       };
 
-      vi.spyOn(
-        OAuthUtils,
-        'discoverAuthorizationServerMetadata',
-      ).mockImplementation(async (issuer) => {
-        if (issuer === 'http://localhost:8888/realms/my-realm') {
-          return registrationMetadata;
-        }
-        return null;
-      });
+      vi.spyOn(OAuthUtils, "discoverAuthorizationServerMetadata").mockImplementation(
+        async (issuer) => {
+          if (issuer === "http://localhost:8888/realms/my-realm") {
+            return registrationMetadata;
+          }
+          return null;
+        },
+      );
 
-      const result =
-        await providerWithAccess.discoverAuthServerMetadataForRegistration(
-          'http://localhost:8888/realms/my-realm/protocol/openid-connect/auth',
-        );
+      const result = await providerWithAccess.discoverAuthServerMetadataForRegistration(
+        "http://localhost:8888/realms/my-realm/protocol/openid-connect/auth",
+      );
 
-      expect(
-        vi.mocked(OAuthUtils.discoverAuthorizationServerMetadata).mock.calls,
-      ).toEqual([
-        ['http://localhost:8888'],
-        ['http://localhost:8888/realms/my-realm'],
+      expect(vi.mocked(OAuthUtils.discoverAuthorizationServerMetadata).mock.calls).toEqual([
+        ["http://localhost:8888"],
+        ["http://localhost:8888/realms/my-realm"],
       ]);
-      expect(result.issuerUrl).toBe('http://localhost:8888/realms/my-realm');
+      expect(result.issuerUrl).toBe("http://localhost:8888/realms/my-realm");
       expect(result.metadata).toBe(registrationMetadata);
     });
 
-    it('trims versioned segments from authorization endpoints', async () => {
+    it("trims versioned segments from authorization endpoints", async () => {
       const authProvider = new MCPOAuthProvider();
       const providerWithAccess = authProvider as unknown as {
-        discoverAuthServerMetadataForRegistration: (
-          authorizationUrl: string,
-        ) => Promise<{
+        discoverAuthServerMetadataForRegistration: (authorizationUrl: string) => Promise<{
           issuerUrl: string;
           metadata: OAuthAuthorizationServerMetadata;
         }>;
       };
 
       const oktaMetadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.okta.local/oauth2/default',
-        authorization_endpoint:
-          'https://auth.okta.local/oauth2/default/v1/authorize',
-        token_endpoint: 'https://auth.okta.local/oauth2/default/v1/token',
-        registration_endpoint:
-          'https://auth.okta.local/oauth2/default/v1/register',
+        issuer: "https://auth.okta.local/oauth2/default",
+        authorization_endpoint: "https://auth.okta.local/oauth2/default/v1/authorize",
+        token_endpoint: "https://auth.okta.local/oauth2/default/v1/token",
+        registration_endpoint: "https://auth.okta.local/oauth2/default/v1/register",
       };
 
       const attempts: string[] = [];
-      vi.spyOn(
-        OAuthUtils,
-        'discoverAuthorizationServerMetadata',
-      ).mockImplementation(async (issuer) => {
-        attempts.push(issuer);
-        if (issuer === 'https://auth.okta.local/oauth2/default') {
-          return oktaMetadata;
-        }
-        return null;
-      });
+      vi.spyOn(OAuthUtils, "discoverAuthorizationServerMetadata").mockImplementation(
+        async (issuer) => {
+          attempts.push(issuer);
+          if (issuer === "https://auth.okta.local/oauth2/default") {
+            return oktaMetadata;
+          }
+          return null;
+        },
+      );
 
-      const result =
-        await providerWithAccess.discoverAuthServerMetadataForRegistration(
-          'https://auth.okta.local/oauth2/default/v1/authorize',
-        );
+      const result = await providerWithAccess.discoverAuthServerMetadataForRegistration(
+        "https://auth.okta.local/oauth2/default/v1/authorize",
+      );
 
       expect(attempts).toEqual([
-        'https://auth.okta.local',
-        'https://auth.okta.local/oauth2/default/v1',
-        'https://auth.okta.local/oauth2/default',
+        "https://auth.okta.local",
+        "https://auth.okta.local/oauth2/default/v1",
+        "https://auth.okta.local/oauth2/default",
       ]);
-      expect(result.issuerUrl).toBe('https://auth.okta.local/oauth2/default');
+      expect(result.issuerUrl).toBe("https://auth.okta.local/oauth2/default");
       expect(result.metadata).toBe(oktaMetadata);
     });
   });
diff --git a/packages/gemini-core/src/mcp/oauth-provider.ts b/packages/gemini-core/src/mcp/oauth-provider.ts
index 06f5a95cf..ca66de4e6 100644
--- a/packages/gemini-core/src/mcp/oauth-provider.ts
+++ b/packages/gemini-core/src/mcp/oauth-provider.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as http from 'node:http';
-import * as crypto from 'node:crypto';
-import type * as net from 'node:net';
-import { URL } from 'node:url';
-import type { EventEmitter } from 'node:events';
-import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
-import type { OAuthToken } from './token-storage/types.js';
-import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { OAuthUtils } from './oauth-utils.js';
-import { coreEvents } from '../utils/events.js';
-import { debugLogger } from '../utils/debugLogger.js';
-
-export const OAUTH_DISPLAY_MESSAGE_EVENT = 'oauth-display-message' as const;
+import * as crypto from "node:crypto";
+import type { EventEmitter } from "node:events";
+import * as http from "node:http";
+import type * as net from "node:net";
+import { URL } from "node:url";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import { openBrowserSecurely } from "../utils/secure-browser-launcher.js";
+import { MCPOAuthTokenStorage } from "./oauth-token-storage.js";
+import { OAuthUtils } from "./oauth-utils.js";
+import type { OAuthToken } from "./token-storage/types.js";
+
+export const OAUTH_DISPLAY_MESSAGE_EVENT = "oauth-display-message" as const;
 
 /**
  * OAuth configuration for an MCP server.
@@ -90,7 +90,7 @@ interface PKCEParams {
   state: string;
 }
 
-const REDIRECT_PATH = '/oauth/callback';
+const REDIRECT_PATH = "/oauth/callback";
 const HTTP_OK = 200;
 
 /**
@@ -116,22 +116,21 @@ export class MCPOAuthProvider {
     config: MCPOAuthConfig,
     redirectPort: number,
   ): Promise<OAuthClientRegistrationResponse> {
-    const redirectUri =
-      config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
 
     const registrationRequest: OAuthClientRegistrationRequest = {
-      client_name: 'Gemini CLI MCP Client',
+      client_name: "Gemini CLI MCP Client",
       redirect_uris: [redirectUri],
-      grant_types: ['authorization_code', 'refresh_token'],
-      response_types: ['code'],
-      token_endpoint_auth_method: 'none', // Public client
-      scope: config.scopes?.join(' ') || '',
+      grant_types: ["authorization_code", "refresh_token"],
+      response_types: ["code"],
+      token_endpoint_auth_method: "none", // Public client
+      scope: config.scopes?.join(" ") || "",
     };
 
     const response = await fetch(registrationUrl, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       body: JSON.stringify(registrationRequest),
     });
@@ -152,16 +151,12 @@ export class MCPOAuthProvider {
    * @param mcpServerUrl The MCP server URL
    * @returns OAuth configuration if discovered, null otherwise
    */
-  private async discoverOAuthFromMCPServer(
-    mcpServerUrl: string,
-  ): Promise<MCPOAuthConfig | null> {
+  private async discoverOAuthFromMCPServer(mcpServerUrl: string): Promise<MCPOAuthConfig | null> {
     // Use the full URL with path preserved for OAuth discovery
     return OAuthUtils.discoverOAuthConfig(mcpServerUrl);
   }
 
-  private async discoverAuthServerMetadataForRegistration(
-    authorizationUrl: string,
-  ): Promise<{
+  private async discoverAuthServerMetadataForRegistration(authorizationUrl: string): Promise<{
     issuerUrl: string;
     metadata: NonNullable<
       Awaited<ReturnType<typeof OAuthUtils.discoverAuthorizationServerMetadata>>
@@ -174,14 +169,14 @@ export class MCPOAuthProvider {
     // For example: http://localhost:8888/realms/my-realm/protocol/openid-connect/auth
     //           -> http://localhost:8888/realms/my-realm
     const oidcPatterns = [
-      '/protocol/openid-connect/auth',
-      '/protocol/openid-connect/authorize',
-      '/oauth2/authorize',
-      '/oauth/authorize',
-      '/authorize',
+      "/protocol/openid-connect/auth",
+      "/protocol/openid-connect/authorize",
+      "/oauth2/authorize",
+      "/oauth/authorize",
+      "/authorize",
     ];
 
-    let pathname = authUrl.pathname.replace(/\/$/, ''); // Trim trailing slash
+    let pathname = authUrl.pathname.replace(/\/$/, ""); // Trim trailing slash
     for (const pattern of oidcPatterns) {
       if (pathname.endsWith(pattern)) {
         pathname = pathname.slice(0, -pattern.length);
@@ -196,14 +191,12 @@ export class MCPOAuthProvider {
       issuerCandidates.add(`${authUrl.origin}${pathname}`);
 
       const versionSegmentPattern = /^v\d+(\.\d+)?$/i;
-      const segments = pathname.split('/').filter(Boolean);
+      const segments = pathname.split("/").filter(Boolean);
       const lastSegment = segments.at(-1);
       if (lastSegment && versionSegmentPattern.test(lastSegment)) {
         const withoutVersionPath = segments.slice(0, -1);
         if (withoutVersionPath.length) {
-          issuerCandidates.add(
-            `${authUrl.origin}/${withoutVersionPath.join('/')}`,
-          );
+          issuerCandidates.add(`${authUrl.origin}/${withoutVersionPath.join("/")}`);
         }
       }
     }
@@ -216,8 +209,7 @@ export class MCPOAuthProvider {
 
     for (const issuer of attemptedIssuers) {
       debugLogger.debug(`   Trying issuer URL: ${issuer}`);
-      const metadata =
-        await OAuthUtils.discoverAuthorizationServerMetadata(issuer);
+      const metadata = await OAuthUtils.discoverAuthorizationServerMetadata(issuer);
       if (metadata) {
         selectedIssuer = issuer;
         discoveredMetadata = metadata;
@@ -227,7 +219,7 @@ export class MCPOAuthProvider {
 
     if (!discoveredMetadata) {
       throw new Error(
-        `Failed to fetch authorization server metadata for client registration (attempted issuers: ${attemptedIssuers.join(', ')})`,
+        `Failed to fetch authorization server metadata for client registration (attempted issuers: ${attemptedIssuers.join(", ")})`,
       );
     }
 
@@ -245,16 +237,13 @@ export class MCPOAuthProvider {
    */
   private generatePKCEParams(): PKCEParams {
     // Generate code verifier (43-128 characters)
-    const codeVerifier = crypto.randomBytes(32).toString('base64url');
+    const codeVerifier = crypto.randomBytes(32).toString("base64url");
 
     // Generate code challenge using SHA256
-    const codeChallenge = crypto
-      .createHash('sha256')
-      .update(codeVerifier)
-      .digest('base64url');
+    const codeChallenge = crypto.createHash("sha256").update(codeVerifier).digest("base64url");
 
     // Generate state for CSRF protection
-    const state = crypto.randomBytes(16).toString('base64url');
+    const state = crypto.randomBytes(16).toString("base64url");
 
     return { codeVerifier, codeChallenge, state };
   }
@@ -277,59 +266,58 @@ export class MCPOAuthProvider {
       portReject = reject;
     });
 
-    const responsePromise = new Promise<OAuthAuthorizationResponse>(
-      (resolve, reject) => {
-        let serverPort: number;
+    const responsePromise = new Promise<OAuthAuthorizationResponse>((resolve, reject) => {
+      let serverPort: number;
 
-        const server = http.createServer(
-          async (req: http.IncomingMessage, res: http.ServerResponse) => {
-            try {
-              const url = new URL(req.url!, `http://localhost:${serverPort}`);
+      const server = http.createServer(
+        async (req: http.IncomingMessage, res: http.ServerResponse) => {
+          try {
+            const url = new URL(req.url!, `http://localhost:${serverPort}`);
 
-              if (url.pathname !== REDIRECT_PATH) {
-                res.writeHead(404);
-                res.end('Not found');
-                return;
-              }
+            if (url.pathname !== REDIRECT_PATH) {
+              res.writeHead(404);
+              res.end("Not found");
+              return;
+            }
 
-              const code = url.searchParams.get('code');
-              const state = url.searchParams.get('state');
-              const error = url.searchParams.get('error');
+            const code = url.searchParams.get("code");
+            const state = url.searchParams.get("state");
+            const error = url.searchParams.get("error");
 
-              if (error) {
-                res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
-                res.end(`
+            if (error) {
+              res.writeHead(HTTP_OK, { "Content-Type": "text/html" });
+              res.end(`
               <html>
                 <body>
                   <h1>Authentication Failed</h1>
-                  <p>Error: ${(error as string).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p>
-                  <p>${((url.searchParams.get('error_description') || '') as string).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</p>
+                  <p>Error: ${(error as string).replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p>
+                  <p>${((url.searchParams.get("error_description") || "") as string).replace(/</g, "&lt;").replace(/>/g, "&gt;")}</p>
                   <p>You can close this window.</p>
                 </body>
               </html>
             `);
-                server.close();
-                reject(new Error(`OAuth error: ${error}`));
-                return;
-              }
-
-              if (!code || !state) {
-                res.writeHead(400);
-                res.end('Missing code or state parameter');
-                return;
-              }
-
-              if (state !== expectedState) {
-                res.writeHead(400);
-                res.end('Invalid state parameter');
-                server.close();
-                reject(new Error('State mismatch - possible CSRF attack'));
-                return;
-              }
-
-              // Send success response to browser
-              res.writeHead(HTTP_OK, { 'Content-Type': 'text/html' });
-              res.end(`
+              server.close();
+              reject(new Error(`OAuth error: ${error}`));
+              return;
+            }
+
+            if (!code || !state) {
+              res.writeHead(400);
+              res.end("Missing code or state parameter");
+              return;
+            }
+
+            if (state !== expectedState) {
+              res.writeHead(400);
+              res.end("Invalid state parameter");
+              server.close();
+              reject(new Error("State mismatch - possible CSRF attack"));
+              return;
+            }
+
+            // Send success response to browser
+            res.writeHead(HTTP_OK, { "Content-Type": "text/html" });
+            res.end(`
             <html>
               <body>
                 <h1>Authentication Successful!</h1>
@@ -339,55 +327,50 @@ export class MCPOAuthProvider {
             </html>
           `);
 
-              server.close();
-              resolve({ code, state });
-            } catch (error) {
-              server.close();
-              reject(error);
-            }
-          },
-        );
+            server.close();
+            resolve({ code, state });
+          } catch (error) {
+            server.close();
+            reject(error);
+          }
+        },
+      );
 
-        server.on('error', (error) => {
+      server.on("error", (error) => {
+        portReject(error);
+        reject(error);
+      });
+
+      // Determine which port to use (env var or OS-assigned)
+      const portStr = process.env["OAUTH_CALLBACK_PORT"];
+      let listenPort = 0; // Default to OS-assigned port
+      if (portStr) {
+        const envPort = parseInt(portStr, 10);
+        if (isNaN(envPort) || envPort <= 0 || envPort > 65535) {
+          const error = new Error(`Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`);
           portReject(error);
           reject(error);
-        });
-
-        // Determine which port to use (env var or OS-assigned)
-        const portStr = process.env['OAUTH_CALLBACK_PORT'];
-        let listenPort = 0; // Default to OS-assigned port
-        if (portStr) {
-          const envPort = parseInt(portStr, 10);
-          if (isNaN(envPort) || envPort <= 0 || envPort > 65535) {
-            const error = new Error(
-              `Invalid value for OAUTH_CALLBACK_PORT: "${portStr}"`,
-            );
-            portReject(error);
-            reject(error);
-            return;
-          }
-          listenPort = envPort;
+          return;
         }
+        listenPort = envPort;
+      }
 
-        server.listen(listenPort, () => {
-          const address = server.address() as net.AddressInfo;
-          serverPort = address.port;
-          debugLogger.log(
-            `OAuth callback server listening on port ${serverPort}`,
-          );
-          portResolve(serverPort); // Resolve port promise immediately
-        });
-
-        // Timeout after 5 minutes
-        setTimeout(
-          () => {
-            server.close();
-            reject(new Error('OAuth callback timeout'));
-          },
-          5 * 60 * 1000,
-        );
-      },
-    );
+      server.listen(listenPort, () => {
+        const address = server.address() as net.AddressInfo;
+        serverPort = address.port;
+        debugLogger.log(`OAuth callback server listening on port ${serverPort}`);
+        portResolve(serverPort); // Resolve port promise immediately
+      });
+
+      // Timeout after 5 minutes
+      setTimeout(
+        () => {
+          server.close();
+          reject(new Error("OAuth callback timeout"));
+        },
+        5 * 60 * 1000,
+      );
+    });
 
     return { port: portPromise, response: responsePromise };
   }
@@ -407,38 +390,32 @@ export class MCPOAuthProvider {
     redirectPort: number,
     mcpServerUrl?: string,
   ): string {
-    const redirectUri =
-      config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
 
     const params = new URLSearchParams({
       client_id: config.clientId!,
-      response_type: 'code',
+      response_type: "code",
       redirect_uri: redirectUri,
       state: pkceParams.state,
       code_challenge: pkceParams.codeChallenge,
-      code_challenge_method: 'S256',
+      code_challenge_method: "S256",
     });
 
     if (config.scopes && config.scopes.length > 0) {
-      params.append('scope', config.scopes.join(' '));
+      params.append("scope", config.scopes.join(" "));
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
     // Only add if we have an MCP server URL (indicates MCP OAuth flow, not standard OAuth)
     if (mcpServerUrl) {
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(mcpServerUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
@@ -466,11 +443,10 @@ export class MCPOAuthProvider {
     redirectPort: number,
     mcpServerUrl?: string,
   ): Promise<OAuthTokenResponse> {
-    const redirectUri =
-      config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
+    const redirectUri = config.redirectUri || `http://localhost:${redirectPort}${REDIRECT_PATH}`;
 
     const params = new URLSearchParams({
-      grant_type: 'authorization_code',
+      grant_type: "authorization_code",
       code,
       redirect_uri: redirectUri,
       code_verifier: codeVerifier,
@@ -478,11 +454,11 @@ export class MCPOAuthProvider {
     });
 
     if (config.clientSecret) {
-      params.append('client_secret', config.clientSecret);
+      params.append("client_secret", config.clientSecret);
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
@@ -490,52 +466,46 @@ export class MCPOAuthProvider {
     if (mcpServerUrl) {
       const resourceUrl = mcpServerUrl;
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(resourceUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(resourceUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
     const response = await fetch(config.tokenUrl!, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json, application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json, application/x-www-form-urlencoded",
       },
       body: params.toString(),
     });
 
     const responseText = await response.text();
-    const contentType = response.headers.get('content-type') || '';
+    const contentType = response.headers.get("content-type") || "";
 
     if (!response.ok) {
       // Try to parse error from form-urlencoded response
       let errorMessage: string | null = null;
       try {
         const errorParams = new URLSearchParams(responseText);
-        const error = errorParams.get('error');
-        const errorDescription = errorParams.get('error_description');
+        const error = errorParams.get("error");
+        const errorDescription = errorParams.get("error_description");
         if (error) {
-          errorMessage = `Token exchange failed: ${error} - ${errorDescription || 'No description'}`;
+          errorMessage = `Token exchange failed: ${error} - ${errorDescription || "No description"}`;
         }
       } catch {
         // Fall back to raw error
       }
       throw new Error(
-        errorMessage ||
-          `Token exchange failed: ${response.status} - ${responseText}`,
+        errorMessage || `Token exchange failed: ${response.status} - ${responseText}`,
       );
     }
 
     // Log unexpected content types for debugging
     if (
-      !contentType.includes('application/json') &&
-      !contentType.includes('application/x-www-form-urlencoded')
+      !contentType.includes("application/json") &&
+      !contentType.includes("application/x-www-form-urlencoded")
     ) {
       debugLogger.warn(
         `Token endpoint returned unexpected content-type: ${contentType}. ` +
@@ -550,18 +520,18 @@ export class MCPOAuthProvider {
     } catch {
       // Parse form-urlencoded response
       const tokenParams = new URLSearchParams(responseText);
-      const accessToken = tokenParams.get('access_token');
-      const tokenType = tokenParams.get('token_type') || 'Bearer';
-      const expiresIn = tokenParams.get('expires_in');
-      const refreshToken = tokenParams.get('refresh_token');
-      const scope = tokenParams.get('scope');
+      const accessToken = tokenParams.get("access_token");
+      const tokenType = tokenParams.get("token_type") || "Bearer";
+      const expiresIn = tokenParams.get("expires_in");
+      const refreshToken = tokenParams.get("refresh_token");
+      const scope = tokenParams.get("scope");
 
       if (!accessToken) {
         // Check for error in response
-        const error = tokenParams.get('error');
-        const errorDescription = tokenParams.get('error_description');
+        const error = tokenParams.get("error");
+        const errorDescription = tokenParams.get("error_description");
         throw new Error(
-          `Token exchange failed: ${error || 'no_access_token'} - ${errorDescription || responseText}`,
+          `Token exchange failed: ${error || "no_access_token"} - ${errorDescription || responseText}`,
         );
       }
 
@@ -591,73 +561,65 @@ export class MCPOAuthProvider {
     mcpServerUrl?: string,
   ): Promise<OAuthTokenResponse> {
     const params = new URLSearchParams({
-      grant_type: 'refresh_token',
+      grant_type: "refresh_token",
       refresh_token: refreshToken,
       client_id: config.clientId!,
     });
 
     if (config.clientSecret) {
-      params.append('client_secret', config.clientSecret);
+      params.append("client_secret", config.clientSecret);
     }
 
     if (config.scopes && config.scopes.length > 0) {
-      params.append('scope', config.scopes.join(' '));
+      params.append("scope", config.scopes.join(" "));
     }
 
     if (config.audiences && config.audiences.length > 0) {
-      params.append('audience', config.audiences.join(' '));
+      params.append("audience", config.audiences.join(" "));
     }
 
     // Add resource parameter for MCP OAuth spec compliance
     // Only add if we have an MCP server URL (indicates MCP OAuth flow, not standard OAuth)
     if (mcpServerUrl) {
       try {
-        params.append(
-          'resource',
-          OAuthUtils.buildResourceParameter(mcpServerUrl),
-        );
+        params.append("resource", OAuthUtils.buildResourceParameter(mcpServerUrl));
       } catch (error) {
-        debugLogger.warn(
-          `Could not add resource parameter: ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Could not add resource parameter: ${getErrorMessage(error)}`);
       }
     }
 
     const response = await fetch(tokenUrl, {
-      method: 'POST',
+      method: "POST",
       headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        Accept: 'application/json, application/x-www-form-urlencoded',
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json, application/x-www-form-urlencoded",
       },
       body: params.toString(),
     });
 
     const responseText = await response.text();
-    const contentType = response.headers.get('content-type') || '';
+    const contentType = response.headers.get("content-type") || "";
 
     if (!response.ok) {
       // Try to parse error from form-urlencoded response
       let errorMessage: string | null = null;
       try {
         const errorParams = new URLSearchParams(responseText);
-        const error = errorParams.get('error');
-        const errorDescription = errorParams.get('error_description');
+        const error = errorParams.get("error");
+        const errorDescription = errorParams.get("error_description");
         if (error) {
-          errorMessage = `Token refresh failed: ${error} - ${errorDescription || 'No description'}`;
+          errorMessage = `Token refresh failed: ${error} - ${errorDescription || "No description"}`;
         }
       } catch {
         // Fall back to raw error
       }
-      throw new Error(
-        errorMessage ||
-          `Token refresh failed: ${response.status} - ${responseText}`,
-      );
+      throw new Error(errorMessage || `Token refresh failed: ${response.status} - ${responseText}`);
     }
 
     // Log unexpected content types for debugging
     if (
-      !contentType.includes('application/json') &&
-      !contentType.includes('application/x-www-form-urlencoded')
+      !contentType.includes("application/json") &&
+      !contentType.includes("application/x-www-form-urlencoded")
     ) {
       debugLogger.warn(
         `Token refresh endpoint returned unexpected content-type: ${contentType}. ` +
@@ -672,18 +634,18 @@ export class MCPOAuthProvider {
     } catch {
       // Parse form-urlencoded response
       const tokenParams = new URLSearchParams(responseText);
-      const accessToken = tokenParams.get('access_token');
-      const tokenType = tokenParams.get('token_type') || 'Bearer';
-      const expiresIn = tokenParams.get('expires_in');
-      const refreshToken = tokenParams.get('refresh_token');
-      const scope = tokenParams.get('scope');
+      const accessToken = tokenParams.get("access_token");
+      const tokenType = tokenParams.get("token_type") || "Bearer";
+      const expiresIn = tokenParams.get("expires_in");
+      const refreshToken = tokenParams.get("refresh_token");
+      const scope = tokenParams.get("scope");
 
       if (!accessToken) {
         // Check for error in response
-        const error = tokenParams.get('error');
-        const errorDescription = tokenParams.get('error_description');
+        const error = tokenParams.get("error");
+        const errorDescription = tokenParams.get("error_description");
         throw new Error(
-          `Token refresh failed: ${error || 'unknown_error'} - ${errorDescription || responseText}`,
+          `Token refresh failed: ${error || "unknown_error"} - ${errorDescription || responseText}`,
         );
       }
 
@@ -729,22 +691,20 @@ export class MCPOAuthProvider {
       // First check if the server requires authentication via WWW-Authenticate header
       try {
         const headers: HeadersInit = OAuthUtils.isSSEEndpoint(mcpServerUrl)
-          ? { Accept: 'text/event-stream' }
-          : { Accept: 'application/json' };
+          ? { Accept: "text/event-stream" }
+          : { Accept: "application/json" };
 
         const response = await fetch(mcpServerUrl, {
-          method: 'HEAD',
+          method: "HEAD",
           headers,
         });
 
         if (response.status === 401 || response.status === 307) {
-          const wwwAuthenticate = response.headers.get('www-authenticate');
+          const wwwAuthenticate = response.headers.get("www-authenticate");
 
           if (wwwAuthenticate) {
             const discoveredConfig =
-              await OAuthUtils.discoverOAuthFromWWWAuthenticate(
-                wwwAuthenticate,
-              );
+              await OAuthUtils.discoverOAuthFromWWWAuthenticate(wwwAuthenticate);
             if (discoveredConfig) {
               // Merge discovered config with existing config, preserving clientId and clientSecret
               config = {
@@ -767,8 +727,7 @@ export class MCPOAuthProvider {
 
       // If we still don't have OAuth config, try the standard discovery
       if (!config.authorizationUrl) {
-        const discoveredConfig =
-          await this.discoverOAuthFromMCPServer(mcpServerUrl);
+        const discoveredConfig = await this.discoverOAuthFromMCPServer(mcpServerUrl);
         if (discoveredConfig) {
           // Merge discovered config with existing config, preserving clientId and clientSecret
           config = {
@@ -782,9 +741,7 @@ export class MCPOAuthProvider {
             clientSecret: config.clientSecret,
           };
         } else {
-          throw new Error(
-            'Failed to discover OAuth configuration from MCP server',
-          );
+          throw new Error("Failed to discover OAuth configuration from MCP server");
         }
       }
     }
@@ -809,54 +766,37 @@ export class MCPOAuthProvider {
       if (!registrationUrl) {
         // Extract server URL from authorization URL
         if (!config.authorizationUrl) {
-          throw new Error(
-            'Cannot perform dynamic registration without authorization URL',
-          );
+          throw new Error("Cannot perform dynamic registration without authorization URL");
         }
 
-        debugLogger.debug('→ Attempting dynamic client registration...');
+        debugLogger.debug("→ Attempting dynamic client registration...");
         const { metadata: authServerMetadata } =
-          await this.discoverAuthServerMetadataForRegistration(
-            config.authorizationUrl,
-          );
+          await this.discoverAuthServerMetadataForRegistration(config.authorizationUrl);
         registrationUrl = authServerMetadata.registration_endpoint;
       }
 
       // Register client if registration endpoint is available
       if (registrationUrl) {
-        const clientRegistration = await this.registerClient(
-          registrationUrl,
-          config,
-          redirectPort,
-        );
+        const clientRegistration = await this.registerClient(registrationUrl, config, redirectPort);
 
         config.clientId = clientRegistration.client_id;
         if (clientRegistration.client_secret) {
           config.clientSecret = clientRegistration.client_secret;
         }
 
-        debugLogger.debug('✓ Dynamic client registration successful');
+        debugLogger.debug("✓ Dynamic client registration successful");
       } else {
-        throw new Error(
-          'No client ID provided and dynamic registration not supported',
-        );
+        throw new Error("No client ID provided and dynamic registration not supported");
       }
     }
 
     // Validate configuration
     if (!config.clientId || !config.authorizationUrl || !config.tokenUrl) {
-      throw new Error(
-        'Missing required OAuth configuration after discovery and registration',
-      );
+      throw new Error("Missing required OAuth configuration after discovery and registration");
     }
 
     // Build authorization URL
-    const authUrl = this.buildAuthorizationUrl(
-      config,
-      pkceParams,
-      redirectPort,
-      mcpServerUrl,
-    );
+    const authUrl = this.buildAuthorizationUrl(config, pkceParams, redirectPort, mcpServerUrl);
 
     displayMessage(`→ Opening your browser for OAuth sign-in...
 
@@ -870,18 +810,13 @@ ${authUrl}
     try {
       await openBrowserSecurely(authUrl);
     } catch (error) {
-      debugLogger.warn(
-        'Failed to open browser automatically:',
-        getErrorMessage(error),
-      );
+      debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error));
     }
 
     // Wait for callback
     const { code } = await callbackServer.response;
 
-    debugLogger.debug(
-      '✓ Authorization code received, exchanging for tokens...',
-    );
+    debugLogger.debug("✓ Authorization code received, exchanging for tokens...");
 
     // Exchange code for tokens
     const tokenResponse = await this.exchangeCodeForToken(
@@ -894,12 +829,12 @@ ${authUrl}
 
     // Convert to our token format
     if (!tokenResponse.access_token) {
-      throw new Error('No access token received from token endpoint');
+      throw new Error("No access token received from token endpoint");
     }
 
     const token: OAuthToken = {
       accessToken: tokenResponse.access_token,
-      tokenType: tokenResponse.token_type || 'Bearer',
+      tokenType: tokenResponse.token_type || "Bearer",
       refreshToken: tokenResponse.refresh_token,
       scope: tokenResponse.scope,
     };
@@ -917,27 +852,23 @@ ${authUrl}
         config.tokenUrl,
         mcpServerUrl,
       );
-      debugLogger.debug('✓ Authentication successful! Token saved.');
+      debugLogger.debug("✓ Authentication successful! Token saved.");
 
       // Verify token was saved
       const savedToken = await this.tokenStorage.getCredentials(serverName);
       if (savedToken && savedToken.token && savedToken.token.accessToken) {
         // Avoid leaking token material; log a short SHA-256 fingerprint instead.
         const tokenFingerprint = crypto
-          .createHash('sha256')
+          .createHash("sha256")
           .update(savedToken.token.accessToken)
-          .digest('hex')
+          .digest("hex")
           .slice(0, 8);
-        debugLogger.debug(
-          `✓ Token verification successful (fingerprint: ${tokenFingerprint})`,
-        );
+        debugLogger.debug(`✓ Token verification successful (fingerprint: ${tokenFingerprint})`);
       } else {
-        debugLogger.warn(
-          'Token verification failed: token not found or invalid after save',
-        );
+        debugLogger.warn("Token verification failed: token not found or invalid after save");
       }
     } catch (saveError) {
-      debugLogger.error('Failed to save auth token.', saveError);
+      debugLogger.error("Failed to save auth token.", saveError);
       throw saveError;
     }
 
@@ -951,10 +882,7 @@ ${authUrl}
    * @param config OAuth configuration
    * @returns A valid access token or null if not authenticated
    */
-  async getValidToken(
-    serverName: string,
-    config: MCPOAuthConfig,
-  ): Promise<string | null> {
+  async getValidToken(serverName: string, config: MCPOAuthConfig): Promise<string | null> {
     debugLogger.debug(`Getting valid token for server: ${serverName}`);
     const credentials = await this.tokenStorage.getCredentials(serverName);
 
@@ -977,9 +905,7 @@ ${authUrl}
     // Try to refresh if we have a refresh token
     if (token.refreshToken && config.clientId && credentials.tokenUrl) {
       try {
-        debugLogger.log(
-          `Refreshing expired token for MCP server: ${serverName}`,
-        );
+        debugLogger.log(`Refreshing expired token for MCP server: ${serverName}`);
 
         const newTokenResponse = await this.refreshAccessToken(
           config,
@@ -1010,11 +936,7 @@ ${authUrl}
 
         return newToken.accessToken;
       } catch (error) {
-        coreEvents.emitFeedback(
-          'error',
-          'Failed to refresh auth token.',
-          error,
-        );
+        coreEvents.emitFeedback("error", "Failed to refresh auth token.", error);
         // Remove invalid token
         await this.tokenStorage.deleteCredentials(serverName);
       }
diff --git a/packages/gemini-core/src/mcp/oauth-token-storage.test.ts b/packages/gemini-core/src/mcp/oauth-token-storage.test.ts
index d882109ca..829d9d2de 100644
--- a/packages/gemini-core/src/mcp/oauth-token-storage.test.ts
+++ b/packages/gemini-core/src/mcp/oauth-token-storage.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { coreEvents } from '../utils/events.js';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
-import { FORCE_ENCRYPTED_FILE_ENV_VAR } from './token-storage/index.js';
-import type { OAuthCredentials, OAuthToken } from './token-storage/types.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { coreEvents } from "../utils/events.js";
+import { GEMINI_DIR } from "../utils/paths.js";
+import { MCPOAuthTokenStorage } from "./oauth-token-storage.js";
+import { FORCE_ENCRYPTED_FILE_ENV_VAR } from "./token-storage/index.js";
+import type { OAuthCredentials, OAuthToken } from "./token-storage/types.js";
 
 // Mock dependencies
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   promises: {
     readFile: vi.fn(),
     writeFile: vi.fn(),
@@ -23,18 +23,18 @@ vi.mock('node:fs', () => ({
   },
 }));
 
-vi.mock('node:path', () => ({
+vi.mock("node:path", () => ({
   dirname: vi.fn(),
   join: vi.fn(),
 }));
 
-vi.mock('../config/storage.js', () => ({
+vi.mock("../config/storage.js", () => ({
   Storage: {
     getMcpOAuthTokensPath: vi.fn(),
   },
 }));
 
-vi.mock('../utils/events.js', () => ({
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
@@ -48,34 +48,34 @@ const mockHybridTokenStorage = {
   clearAll: vi.fn(),
   getAllCredentials: vi.fn(),
 };
-vi.mock('./token-storage/hybrid-token-storage.js', () => ({
+vi.mock("./token-storage/hybrid-token-storage.js", () => ({
   HybridTokenStorage: vi.fn(() => mockHybridTokenStorage),
 }));
 
 const ONE_HR_MS = 3600000;
 
-describe('MCPOAuthTokenStorage', () => {
+describe("MCPOAuthTokenStorage", () => {
   let tokenStorage: MCPOAuthTokenStorage;
 
   const mockToken: OAuthToken = {
-    accessToken: 'access_token_123',
-    refreshToken: 'refresh_token_456',
-    tokenType: 'Bearer',
-    scope: 'read write',
+    accessToken: "access_token_123",
+    refreshToken: "refresh_token_456",
+    tokenType: "Bearer",
+    scope: "read write",
     expiresAt: Date.now() + ONE_HR_MS,
   };
 
   const mockCredentials: OAuthCredentials = {
-    serverName: 'test-server',
+    serverName: "test-server",
     token: mockToken,
-    clientId: 'test-client-id',
-    tokenUrl: 'https://auth.example.com/token',
+    clientId: "test-client-id",
+    tokenUrl: "https://auth.example.com/token",
     updatedAt: Date.now(),
   };
 
-  describe('with encrypted flag false', () => {
+  describe("with encrypted flag false", () => {
     beforeEach(() => {
-      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, 'false');
+      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, "false");
       tokenStorage = new MCPOAuthTokenStorage();
 
       vi.clearAllMocks();
@@ -86,9 +86,9 @@ describe('MCPOAuthTokenStorage', () => {
       vi.restoreAllMocks();
     });
 
-    describe('getAllCredentials', () => {
-      it('should return empty map when token file does not exist', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+    describe("getAllCredentials", () => {
+      it("should return empty map when token file does not exist", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
 
         const tokens = await tokenStorage.getAllCredentials();
 
@@ -96,214 +96,190 @@ describe('MCPOAuthTokenStorage', () => {
         expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
       });
 
-      it('should load tokens from file successfully', async () => {
+      it("should load tokens from file successfully", async () => {
         const tokensArray = [mockCredentials];
         vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify(tokensArray));
 
         const tokens = await tokenStorage.getAllCredentials();
 
         expect(tokens.size).toBe(1);
-        expect(tokens.get('test-server')).toEqual(mockCredentials);
+        expect(tokens.get("test-server")).toEqual(mockCredentials);
         expect(fs.readFile).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
-          'utf-8',
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
+          "utf-8",
         );
       });
 
-      it('should handle corrupted token file gracefully', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue('invalid json');
+      it("should handle corrupted token file gracefully", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue("invalid json");
 
         const tokens = await tokenStorage.getAllCredentials();
 
         expect(tokens.size).toBe(0);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          expect.stringContaining('Failed to load MCP OAuth tokens'),
+          "error",
+          expect.stringContaining("Failed to load MCP OAuth tokens"),
           expect.any(Error),
         );
       });
 
-      it('should handle file read errors other than ENOENT', async () => {
-        const error = new Error('Permission denied');
+      it("should handle file read errors other than ENOENT", async () => {
+        const error = new Error("Permission denied");
         vi.mocked(fs.readFile).mockRejectedValue(error);
 
         const tokens = await tokenStorage.getAllCredentials();
 
         expect(tokens.size).toBe(0);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to load MCP OAuth tokens: Permission denied',
+          "error",
+          "Failed to load MCP OAuth tokens: Permission denied",
           error,
         );
       });
     });
 
-    describe('saveToken', () => {
-      it('should save token with restricted permissions', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+    describe("saveToken", () => {
+      it("should save token with restricted permissions", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
         vi.mocked(fs.mkdir).mockResolvedValue(undefined);
         vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
-        await tokenStorage.saveToken(
-          'test-server',
-          mockToken,
-          'client-id',
-          'https://token.url',
-        );
+        await tokenStorage.saveToken("test-server", mockToken, "client-id", "https://token.url");
 
-        expect(fs.mkdir).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR),
-          { recursive: true },
-        );
+        expect(fs.mkdir).toHaveBeenCalledWith(path.join("/mock/home", GEMINI_DIR), {
+          recursive: true,
+        });
         expect(fs.writeFile).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
-          expect.stringContaining('test-server'),
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
+          expect.stringContaining("test-server"),
           { mode: 0o600 },
         );
       });
 
-      it('should update existing token for same server', async () => {
+      it("should update existing token for same server", async () => {
         const existingCredentials: OAuthCredentials = {
           ...mockCredentials,
-          serverName: 'existing-server',
+          serverName: "existing-server",
         };
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([existingCredentials]),
-        );
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([existingCredentials]));
         vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
         const newToken: OAuthToken = {
           ...mockToken,
-          accessToken: 'new_access_token',
+          accessToken: "new_access_token",
         };
-        await tokenStorage.saveToken('existing-server', newToken);
+        await tokenStorage.saveToken("existing-server", newToken);
 
         const writeCall = vi.mocked(fs.writeFile).mock.calls[0];
-        const savedData = JSON.parse(
-          writeCall[1] as string,
-        ) as OAuthCredentials[];
+        const savedData = JSON.parse(writeCall[1] as string) as OAuthCredentials[];
 
         expect(savedData).toHaveLength(1);
-        expect(savedData[0].token.accessToken).toBe('new_access_token');
-        expect(savedData[0].serverName).toBe('existing-server');
+        expect(savedData[0].token.accessToken).toBe("new_access_token");
+        expect(savedData[0].serverName).toBe("existing-server");
       });
 
-      it('should handle write errors gracefully', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+      it("should handle write errors gracefully", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
         vi.mocked(fs.mkdir).mockResolvedValue(undefined);
-        const writeError = new Error('Disk full');
+        const writeError = new Error("Disk full");
         vi.mocked(fs.writeFile).mockRejectedValue(writeError);
 
-        await expect(
-          tokenStorage.saveToken('test-server', mockToken),
-        ).rejects.toThrow('Disk full');
+        await expect(tokenStorage.saveToken("test-server", mockToken)).rejects.toThrow("Disk full");
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to save MCP OAuth token: Disk full',
+          "error",
+          "Failed to save MCP OAuth token: Disk full",
           writeError,
         );
       });
     });
 
-    describe('getCredentials', () => {
-      it('should return token for existing server', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+    describe("getCredentials", () => {
+      it("should return token for existing server", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
 
-        const result = await tokenStorage.getCredentials('test-server');
+        const result = await tokenStorage.getCredentials("test-server");
 
         expect(result).toEqual(mockCredentials);
       });
 
-      it('should return null for non-existent server', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+      it("should return null for non-existent server", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
 
-        const result = await tokenStorage.getCredentials('non-existent');
+        const result = await tokenStorage.getCredentials("non-existent");
 
         expect(result).toBeNull();
       });
 
-      it('should return null when no tokens file exists', async () => {
-        vi.mocked(fs.readFile).mockRejectedValue({ code: 'ENOENT' });
+      it("should return null when no tokens file exists", async () => {
+        vi.mocked(fs.readFile).mockRejectedValue({ code: "ENOENT" });
 
-        const result = await tokenStorage.getCredentials('test-server');
+        const result = await tokenStorage.getCredentials("test-server");
 
         expect(result).toBeNull();
       });
     });
 
-    describe('deleteCredentials', () => {
-      it('should remove token for specific server', async () => {
+    describe("deleteCredentials", () => {
+      it("should remove token for specific server", async () => {
         const credentials1: OAuthCredentials = {
           ...mockCredentials,
-          serverName: 'server1',
+          serverName: "server1",
         };
         const credentials2: OAuthCredentials = {
           ...mockCredentials,
-          serverName: 'server2',
+          serverName: "server2",
         };
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([credentials1, credentials2]),
-        );
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([credentials1, credentials2]));
         vi.mocked(fs.writeFile).mockResolvedValue(undefined);
 
-        await tokenStorage.deleteCredentials('server1');
+        await tokenStorage.deleteCredentials("server1");
 
         const writeCall = vi.mocked(fs.writeFile).mock.calls[0];
         const savedData = JSON.parse(writeCall[1] as string);
 
         expect(savedData).toHaveLength(1);
-        expect(savedData[0].serverName).toBe('server2');
+        expect(savedData[0].serverName).toBe("server2");
       });
 
-      it('should remove token file when no tokens remain', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+      it("should remove token file when no tokens remain", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
         vi.mocked(fs.unlink).mockResolvedValue(undefined);
 
-        await tokenStorage.deleteCredentials('test-server');
+        await tokenStorage.deleteCredentials("test-server");
 
         expect(fs.unlink).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
         );
         expect(fs.writeFile).not.toHaveBeenCalled();
       });
 
-      it('should handle removal of non-existent token gracefully', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
+      it("should handle removal of non-existent token gracefully", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
 
-        await tokenStorage.deleteCredentials('non-existent');
+        await tokenStorage.deleteCredentials("non-existent");
 
         expect(fs.writeFile).not.toHaveBeenCalled();
         expect(fs.unlink).not.toHaveBeenCalled();
       });
 
-      it('should handle file operation errors gracefully', async () => {
-        vi.mocked(fs.readFile).mockResolvedValue(
-          JSON.stringify([mockCredentials]),
-        );
-        const unlinkError = new Error('Permission denied');
+      it("should handle file operation errors gracefully", async () => {
+        vi.mocked(fs.readFile).mockResolvedValue(JSON.stringify([mockCredentials]));
+        const unlinkError = new Error("Permission denied");
         vi.mocked(fs.unlink).mockRejectedValue(unlinkError);
 
-        await tokenStorage.deleteCredentials('test-server');
+        await tokenStorage.deleteCredentials("test-server");
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to remove MCP OAuth token: Permission denied',
+          "error",
+          "Failed to remove MCP OAuth token: Permission denied",
           unlinkError,
         );
       });
     });
 
-    describe('isTokenExpired', () => {
-      it('should return false for token without expiry', () => {
+    describe("isTokenExpired", () => {
+      it("should return false for token without expiry", () => {
         const tokenWithoutExpiry: OAuthToken = { ...mockToken };
         delete tokenWithoutExpiry.expiresAt;
 
@@ -312,7 +288,7 @@ describe('MCPOAuthTokenStorage', () => {
         expect(result).toBe(false);
       });
 
-      it('should return false for valid token', () => {
+      it("should return false for valid token", () => {
         const futureToken: OAuthToken = {
           ...mockToken,
           expiresAt: Date.now() + ONE_HR_MS,
@@ -323,7 +299,7 @@ describe('MCPOAuthTokenStorage', () => {
         expect(result).toBe(false);
       });
 
-      it('should return true for expired token', () => {
+      it("should return true for expired token", () => {
         const expiredToken: OAuthToken = {
           ...mockToken,
           expiresAt: Date.now() - ONE_HR_MS,
@@ -334,7 +310,7 @@ describe('MCPOAuthTokenStorage', () => {
         expect(result).toBe(true);
       });
 
-      it('should return true for token expiring within buffer time', () => {
+      it("should return true for token expiring within buffer time", () => {
         const soonToExpireToken: OAuthToken = {
           ...mockToken,
           expiresAt: Date.now() + 60000, // 1 minute from now (within 5-minute buffer)
@@ -346,43 +322,43 @@ describe('MCPOAuthTokenStorage', () => {
       });
     });
 
-    describe('clearAll', () => {
-      it('should remove token file successfully', async () => {
+    describe("clearAll", () => {
+      it("should remove token file successfully", async () => {
         vi.mocked(fs.unlink).mockResolvedValue(undefined);
 
         await tokenStorage.clearAll();
 
         expect(fs.unlink).toHaveBeenCalledWith(
-          path.join('/mock/home', GEMINI_DIR, 'mcp-oauth-tokens.json'),
+          path.join("/mock/home", GEMINI_DIR, "mcp-oauth-tokens.json"),
         );
       });
 
-      it('should handle non-existent file gracefully', async () => {
-        vi.mocked(fs.unlink).mockRejectedValue({ code: 'ENOENT' });
+      it("should handle non-existent file gracefully", async () => {
+        vi.mocked(fs.unlink).mockRejectedValue({ code: "ENOENT" });
 
         await tokenStorage.clearAll();
 
         expect(coreEvents.emitFeedback).not.toHaveBeenCalled();
       });
 
-      it('should handle other file errors gracefully', async () => {
-        const unlinkError = new Error('Permission denied');
+      it("should handle other file errors gracefully", async () => {
+        const unlinkError = new Error("Permission denied");
         vi.mocked(fs.unlink).mockRejectedValue(unlinkError);
 
         await tokenStorage.clearAll();
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to clear MCP OAuth tokens: Permission denied',
+          "error",
+          "Failed to clear MCP OAuth tokens: Permission denied",
           unlinkError,
         );
       });
     });
   });
 
-  describe('with encrypted flag true', () => {
+  describe("with encrypted flag true", () => {
     beforeEach(() => {
-      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, 'true');
+      vi.stubEnv(FORCE_ENCRYPTED_FILE_ENV_VAR, "true");
       tokenStorage = new MCPOAuthTokenStorage();
 
       vi.clearAllMocks();
@@ -393,73 +369,59 @@ describe('MCPOAuthTokenStorage', () => {
       vi.restoreAllMocks();
     });
 
-    it('should use HybridTokenStorage to list all credentials', async () => {
+    it("should use HybridTokenStorage to list all credentials", async () => {
       mockHybridTokenStorage.getAllCredentials.mockResolvedValue(new Map());
       const servers = await tokenStorage.getAllCredentials();
       expect(mockHybridTokenStorage.getAllCredentials).toHaveBeenCalled();
       expect(servers).toEqual(new Map());
     });
 
-    it('should use HybridTokenStorage to list servers', async () => {
-      mockHybridTokenStorage.listServers.mockResolvedValue(['server1']);
+    it("should use HybridTokenStorage to list servers", async () => {
+      mockHybridTokenStorage.listServers.mockResolvedValue(["server1"]);
       const servers = await tokenStorage.listServers();
       expect(mockHybridTokenStorage.listServers).toHaveBeenCalled();
-      expect(servers).toEqual(['server1']);
+      expect(servers).toEqual(["server1"]);
     });
 
-    it('should use HybridTokenStorage to set credentials', async () => {
+    it("should use HybridTokenStorage to set credentials", async () => {
       await tokenStorage.setCredentials(mockCredentials);
-      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(
-        mockCredentials,
-      );
+      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(mockCredentials);
     });
 
-    it('should use HybridTokenStorage to save a token', async () => {
-      const serverName = 'server1';
+    it("should use HybridTokenStorage to save a token", async () => {
+      const serverName = "server1";
       const now = Date.now();
-      vi.spyOn(Date, 'now').mockReturnValue(now);
+      vi.spyOn(Date, "now").mockReturnValue(now);
 
-      await tokenStorage.saveToken(
-        serverName,
-        mockToken,
-        'clientId',
-        'tokenUrl',
-        'mcpUrl',
-      );
+      await tokenStorage.saveToken(serverName, mockToken, "clientId", "tokenUrl", "mcpUrl");
 
       const expectedCredential: OAuthCredentials = {
         serverName,
         token: mockToken,
-        clientId: 'clientId',
-        tokenUrl: 'tokenUrl',
-        mcpServerUrl: 'mcpUrl',
+        clientId: "clientId",
+        tokenUrl: "tokenUrl",
+        mcpServerUrl: "mcpUrl",
         updatedAt: now,
       };
 
-      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(
-        expectedCredential,
-      );
+      expect(mockHybridTokenStorage.setCredentials).toHaveBeenCalledWith(expectedCredential);
       expect(path.dirname).toHaveBeenCalled();
       expect(fs.mkdir).toHaveBeenCalled();
     });
 
-    it('should use HybridTokenStorage to get credentials', async () => {
+    it("should use HybridTokenStorage to get credentials", async () => {
       mockHybridTokenStorage.getCredentials.mockResolvedValue(mockCredentials);
-      const result = await tokenStorage.getCredentials('server1');
-      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith(
-        'server1',
-      );
+      const result = await tokenStorage.getCredentials("server1");
+      expect(mockHybridTokenStorage.getCredentials).toHaveBeenCalledWith("server1");
       expect(result).toBe(mockCredentials);
     });
 
-    it('should use HybridTokenStorage to delete credentials', async () => {
-      await tokenStorage.deleteCredentials('server1');
-      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith(
-        'server1',
-      );
+    it("should use HybridTokenStorage to delete credentials", async () => {
+      await tokenStorage.deleteCredentials("server1");
+      expect(mockHybridTokenStorage.deleteCredentials).toHaveBeenCalledWith("server1");
     });
 
-    it('should use HybridTokenStorage to clear all tokens', async () => {
+    it("should use HybridTokenStorage to clear all tokens", async () => {
       await tokenStorage.clearAll();
       expect(mockHybridTokenStorage.clearAll).toHaveBeenCalled();
     });
diff --git a/packages/gemini-core/src/mcp/oauth-token-storage.ts b/packages/gemini-core/src/mcp/oauth-token-storage.ts
index fd11299c8..a73dad076 100644
--- a/packages/gemini-core/src/mcp/oauth-token-storage.ts
+++ b/packages/gemini-core/src/mcp/oauth-token-storage.ts
@@ -4,31 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { coreEvents } from '../utils/events.js';
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type {
-  OAuthToken,
-  OAuthCredentials,
-  TokenStorage,
-} from './token-storage/types.js';
-import { HybridTokenStorage } from './token-storage/hybrid-token-storage.js';
-import {
-  DEFAULT_SERVICE_NAME,
-  FORCE_ENCRYPTED_FILE_ENV_VAR,
-} from './token-storage/index.js';
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { Storage } from "../config/storage.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import { HybridTokenStorage } from "./token-storage/hybrid-token-storage.js";
+import { DEFAULT_SERVICE_NAME, FORCE_ENCRYPTED_FILE_ENV_VAR } from "./token-storage/index.js";
+import type { OAuthCredentials, OAuthToken, TokenStorage } from "./token-storage/types.js";
 
 /**
  * Class for managing MCP OAuth token storage and retrieval.
  */
 export class MCPOAuthTokenStorage implements TokenStorage {
-  private readonly hybridTokenStorage = new HybridTokenStorage(
-    DEFAULT_SERVICE_NAME,
-  );
-  private readonly useEncryptedFile =
-    process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === 'true';
+  private readonly hybridTokenStorage = new HybridTokenStorage(DEFAULT_SERVICE_NAME);
+  private readonly useEncryptedFile = process.env[FORCE_ENCRYPTED_FILE_ENV_VAR] === "true";
 
   /**
    * Get the path to the token storage file.
@@ -60,7 +50,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
 
     try {
       const tokenFile = this.getTokenFilePath();
-      const data = await fs.readFile(tokenFile, 'utf-8');
+      const data = await fs.readFile(tokenFile, "utf-8");
       const tokens = JSON.parse(data) as OAuthCredentials[];
 
       for (const credential of tokens) {
@@ -68,9 +58,9 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       }
     } catch (error) {
       // File doesn't exist or is invalid, return empty map
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Failed to load MCP OAuth tokens: ${getErrorMessage(error)}`,
           error,
         );
@@ -106,7 +96,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       );
     } catch (error) {
       coreEvents.emitFeedback(
-        'error',
+        "error",
         `Failed to save MCP OAuth token: ${getErrorMessage(error)}`,
         error,
       );
@@ -187,7 +177,7 @@ export class MCPOAuthTokenStorage implements TokenStorage {
         }
       } catch (error) {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Failed to remove MCP OAuth token: ${getErrorMessage(error)}`,
           error,
         );
@@ -222,9 +212,9 @@ export class MCPOAuthTokenStorage implements TokenStorage {
       const tokenFile = this.getTokenFilePath();
       await fs.unlink(tokenFile);
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Failed to clear MCP OAuth tokens: ${getErrorMessage(error)}`,
           error,
         );
diff --git a/packages/gemini-core/src/mcp/oauth-utils.test.ts b/packages/gemini-core/src/mcp/oauth-utils.test.ts
index bec8ef9f4..9ad5482f9 100644
--- a/packages/gemini-core/src/mcp/oauth-utils.test.ts
+++ b/packages/gemini-core/src/mcp/oauth-utils.test.ts
@@ -4,153 +4,147 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import type {
   OAuthAuthorizationServerMetadata,
   OAuthProtectedResourceMetadata,
-} from './oauth-utils.js';
-import { OAuthUtils } from './oauth-utils.js';
+} from "./oauth-utils.js";
+import { OAuthUtils } from "./oauth-utils.js";
 
 // Mock fetch globally
 const mockFetch = vi.fn();
 global.fetch = mockFetch;
 
-describe('OAuthUtils', () => {
+describe("OAuthUtils", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.spyOn(console, 'debug').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(console, 'log').mockImplementation(() => {});
+    vi.spyOn(console, "debug").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('buildWellKnownUrls', () => {
-    it('should build standard root-based URLs by default', () => {
-      const urls = OAuthUtils.buildWellKnownUrls('https://example.com/mcp');
+  describe("buildWellKnownUrls", () => {
+    it("should build standard root-based URLs by default", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com/mcp");
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server',
+        "https://example.com/.well-known/oauth-authorization-server",
       );
     });
 
-    it('should build path-based URLs when includePathSuffix is true', () => {
-      const urls = OAuthUtils.buildWellKnownUrls(
-        'https://example.com/mcp',
-        true,
-      );
+    it("should build path-based URLs when includePathSuffix is true", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com/mcp", true);
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource/mcp',
+        "https://example.com/.well-known/oauth-protected-resource/mcp",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server/mcp',
+        "https://example.com/.well-known/oauth-authorization-server/mcp",
       );
     });
 
-    it('should handle root path correctly', () => {
-      const urls = OAuthUtils.buildWellKnownUrls('https://example.com', true);
+    it("should handle root path correctly", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com", true);
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server',
+        "https://example.com/.well-known/oauth-authorization-server",
       );
     });
 
-    it('should handle trailing slash in path', () => {
-      const urls = OAuthUtils.buildWellKnownUrls(
-        'https://example.com/mcp/',
-        true,
-      );
+    it("should handle trailing slash in path", () => {
+      const urls = OAuthUtils.buildWellKnownUrls("https://example.com/mcp/", true);
       expect(urls.protectedResource).toBe(
-        'https://example.com/.well-known/oauth-protected-resource/mcp',
+        "https://example.com/.well-known/oauth-protected-resource/mcp",
       );
       expect(urls.authorizationServer).toBe(
-        'https://example.com/.well-known/oauth-authorization-server/mcp',
+        "https://example.com/.well-known/oauth-authorization-server/mcp",
       );
     });
   });
 
-  describe('fetchProtectedResourceMetadata', () => {
+  describe("fetchProtectedResourceMetadata", () => {
     const mockResourceMetadata: OAuthProtectedResourceMetadata = {
-      resource: 'https://api.example.com',
-      authorization_servers: ['https://auth.example.com'],
-      bearer_methods_supported: ['header'],
+      resource: "https://api.example.com",
+      authorization_servers: ["https://auth.example.com"],
+      bearer_methods_supported: ["header"],
     };
 
-    it('should fetch protected resource metadata successfully', async () => {
+    it("should fetch protected resource metadata successfully", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: true,
         json: () => Promise.resolve(mockResourceMetadata),
       });
 
       const result = await OAuthUtils.fetchProtectedResourceMetadata(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
 
       expect(result).toEqual(mockResourceMetadata);
     });
 
-    it('should return null when fetch fails', async () => {
+    it("should return null when fetch fails", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: false,
       });
 
       const result = await OAuthUtils.fetchProtectedResourceMetadata(
-        'https://example.com/.well-known/oauth-protected-resource',
+        "https://example.com/.well-known/oauth-protected-resource",
       );
 
       expect(result).toBeNull();
     });
   });
 
-  describe('fetchAuthorizationServerMetadata', () => {
+  describe("fetchAuthorizationServerMetadata", () => {
     const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-      issuer: 'https://auth.example.com',
-      authorization_endpoint: 'https://auth.example.com/authorize',
-      token_endpoint: 'https://auth.example.com/token',
-      scopes_supported: ['read', 'write'],
+      issuer: "https://auth.example.com",
+      authorization_endpoint: "https://auth.example.com/authorize",
+      token_endpoint: "https://auth.example.com/token",
+      scopes_supported: ["read", "write"],
     };
 
-    it('should fetch authorization server metadata successfully', async () => {
+    it("should fetch authorization server metadata successfully", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: true,
         json: () => Promise.resolve(mockAuthServerMetadata),
       });
 
       const result = await OAuthUtils.fetchAuthorizationServerMetadata(
-        'https://auth.example.com/.well-known/oauth-authorization-server',
+        "https://auth.example.com/.well-known/oauth-authorization-server",
       );
 
       expect(result).toEqual(mockAuthServerMetadata);
     });
 
-    it('should return null when fetch fails', async () => {
+    it("should return null when fetch fails", async () => {
       mockFetch.mockResolvedValueOnce({
         ok: false,
       });
 
       const result = await OAuthUtils.fetchAuthorizationServerMetadata(
-        'https://auth.example.com/.well-known/oauth-authorization-server',
+        "https://auth.example.com/.well-known/oauth-authorization-server",
       );
 
       expect(result).toBeNull();
     });
   });
 
-  describe('discoverAuthorizationServerMetadata', () => {
+  describe("discoverAuthorizationServerMetadata", () => {
     const mockAuthServerMetadata: OAuthAuthorizationServerMetadata = {
-      issuer: 'https://auth.example.com',
-      authorization_endpoint: 'https://auth.example.com/authorize',
-      token_endpoint: 'https://auth.example.com/token',
-      scopes_supported: ['read', 'write'],
+      issuer: "https://auth.example.com",
+      authorization_endpoint: "https://auth.example.com/authorize",
+      token_endpoint: "https://auth.example.com/token",
+      scopes_supported: ["read", "write"],
     };
 
-    it('should handle URLs without path components correctly', async () => {
+    it("should handle URLs without path components correctly", async () => {
       mockFetch
         .mockResolvedValueOnce({
           ok: false,
@@ -161,22 +155,22 @@ describe('OAuthUtils', () => {
         });
 
       const result = await OAuthUtils.discoverAuthorizationServerMetadata(
-        'https://auth.example.com/',
+        "https://auth.example.com/",
       );
 
       expect(result).toEqual(mockAuthServerMetadata);
 
       expect(mockFetch).nthCalledWith(
         1,
-        'https://auth.example.com/.well-known/oauth-authorization-server',
+        "https://auth.example.com/.well-known/oauth-authorization-server",
       );
       expect(mockFetch).nthCalledWith(
         2,
-        'https://auth.example.com/.well-known/openid-configuration',
+        "https://auth.example.com/.well-known/openid-configuration",
       );
     });
 
-    it('should handle URLs with path components correctly', async () => {
+    it("should handle URLs with path components correctly", async () => {
       mockFetch
         .mockResolvedValueOnce({
           ok: false,
@@ -190,49 +184,49 @@ describe('OAuthUtils', () => {
         });
 
       const result = await OAuthUtils.discoverAuthorizationServerMetadata(
-        'https://auth.example.com/mcp',
+        "https://auth.example.com/mcp",
       );
 
       expect(result).toEqual(mockAuthServerMetadata);
 
       expect(mockFetch).nthCalledWith(
         1,
-        'https://auth.example.com/.well-known/oauth-authorization-server/mcp',
+        "https://auth.example.com/.well-known/oauth-authorization-server/mcp",
       );
       expect(mockFetch).nthCalledWith(
         2,
-        'https://auth.example.com/.well-known/openid-configuration/mcp',
+        "https://auth.example.com/.well-known/openid-configuration/mcp",
       );
       expect(mockFetch).nthCalledWith(
         3,
-        'https://auth.example.com/mcp/.well-known/openid-configuration',
+        "https://auth.example.com/mcp/.well-known/openid-configuration",
       );
     });
   });
 
-  describe('metadataToOAuthConfig', () => {
-    it('should convert metadata to OAuth config', () => {
+  describe("metadataToOAuthConfig", () => {
+    it("should convert metadata to OAuth config", () => {
       const metadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
-        scopes_supported: ['read', 'write'],
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
+        scopes_supported: ["read", "write"],
       };
 
       const config = OAuthUtils.metadataToOAuthConfig(metadata);
 
       expect(config).toEqual({
-        authorizationUrl: 'https://auth.example.com/authorize',
-        tokenUrl: 'https://auth.example.com/token',
-        scopes: ['read', 'write'],
+        authorizationUrl: "https://auth.example.com/authorize",
+        tokenUrl: "https://auth.example.com/token",
+        scopes: ["read", "write"],
       });
     });
 
-    it('should handle empty scopes', () => {
+    it("should handle empty scopes", () => {
       const metadata: OAuthAuthorizationServerMetadata = {
-        issuer: 'https://auth.example.com',
-        authorization_endpoint: 'https://auth.example.com/authorize',
-        token_endpoint: 'https://auth.example.com/token',
+        issuer: "https://auth.example.com",
+        authorization_endpoint: "https://auth.example.com/authorize",
+        token_endpoint: "https://auth.example.com/token",
       };
 
       const config = OAuthUtils.metadataToOAuthConfig(metadata);
@@ -241,123 +235,111 @@ describe('OAuthUtils', () => {
     });
   });
 
-  describe('parseWWWAuthenticateHeader', () => {
-    it('should parse resource metadata URI from WWW-Authenticate header', () => {
+  describe("parseWWWAuthenticateHeader", () => {
+    it("should parse resource metadata URI from WWW-Authenticate header", () => {
       const header =
         'Bearer realm="example", resource_metadata="https://example.com/.well-known/oauth-protected-resource"';
       const result = OAuthUtils.parseWWWAuthenticateHeader(header);
-      expect(result).toBe(
-        'https://example.com/.well-known/oauth-protected-resource',
-      );
+      expect(result).toBe("https://example.com/.well-known/oauth-protected-resource");
     });
 
-    it('should return null when no resource metadata URI is found', () => {
+    it("should return null when no resource metadata URI is found", () => {
       const header = 'Bearer realm="example"';
       const result = OAuthUtils.parseWWWAuthenticateHeader(header);
       expect(result).toBeNull();
     });
   });
 
-  describe('extractBaseUrl', () => {
-    it('should extract base URL from MCP server URL', () => {
-      const result = OAuthUtils.extractBaseUrl('https://example.com/mcp/v1');
-      expect(result).toBe('https://example.com');
+  describe("extractBaseUrl", () => {
+    it("should extract base URL from MCP server URL", () => {
+      const result = OAuthUtils.extractBaseUrl("https://example.com/mcp/v1");
+      expect(result).toBe("https://example.com");
     });
 
-    it('should handle URLs with ports', () => {
-      const result = OAuthUtils.extractBaseUrl(
-        'https://example.com:8080/mcp/v1',
-      );
-      expect(result).toBe('https://example.com:8080');
+    it("should handle URLs with ports", () => {
+      const result = OAuthUtils.extractBaseUrl("https://example.com:8080/mcp/v1");
+      expect(result).toBe("https://example.com:8080");
     });
   });
 
-  describe('isSSEEndpoint', () => {
-    it('should return true for SSE endpoints', () => {
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/sse')).toBe(true);
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/api/v1/sse')).toBe(
-        true,
-      );
+  describe("isSSEEndpoint", () => {
+    it("should return true for SSE endpoints", () => {
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/sse")).toBe(true);
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/api/v1/sse")).toBe(true);
     });
 
-    it('should return true for non-MCP endpoints', () => {
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/api')).toBe(true);
+    it("should return true for non-MCP endpoints", () => {
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/api")).toBe(true);
     });
 
-    it('should return false for MCP endpoints', () => {
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/mcp')).toBe(false);
-      expect(OAuthUtils.isSSEEndpoint('https://example.com/api/mcp/v1')).toBe(
-        false,
-      );
+    it("should return false for MCP endpoints", () => {
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/mcp")).toBe(false);
+      expect(OAuthUtils.isSSEEndpoint("https://example.com/api/mcp/v1")).toBe(false);
     });
   });
 
-  describe('buildResourceParameter', () => {
-    it('should build resource parameter from endpoint URL', () => {
-      const result = OAuthUtils.buildResourceParameter(
-        'https://example.com/oauth/token',
-      );
-      expect(result).toBe('https://example.com/oauth/token');
+  describe("buildResourceParameter", () => {
+    it("should build resource parameter from endpoint URL", () => {
+      const result = OAuthUtils.buildResourceParameter("https://example.com/oauth/token");
+      expect(result).toBe("https://example.com/oauth/token");
     });
 
-    it('should handle URLs with ports', () => {
-      const result = OAuthUtils.buildResourceParameter(
-        'https://example.com:8080/oauth/token',
-      );
-      expect(result).toBe('https://example.com:8080/oauth/token');
+    it("should handle URLs with ports", () => {
+      const result = OAuthUtils.buildResourceParameter("https://example.com:8080/oauth/token");
+      expect(result).toBe("https://example.com:8080/oauth/token");
     });
 
-    it('should strip query parameters from the URL', () => {
+    it("should strip query parameters from the URL", () => {
       const result = OAuthUtils.buildResourceParameter(
-        'https://example.com/api/v1/data?user=123&scope=read',
+        "https://example.com/api/v1/data?user=123&scope=read",
       );
-      expect(result).toBe('https://example.com/api/v1/data');
+      expect(result).toBe("https://example.com/api/v1/data");
     });
 
-    it('should strip URL fragments from the URL', () => {
+    it("should strip URL fragments from the URL", () => {
       const result = OAuthUtils.buildResourceParameter(
-        'https://example.com/api/v1/data#section-one',
+        "https://example.com/api/v1/data#section-one",
       );
-      expect(result).toBe('https://example.com/api/v1/data');
+      expect(result).toBe("https://example.com/api/v1/data");
     });
 
-    it('should throw an error for invalid URLs', () => {
-      expect(() => OAuthUtils.buildResourceParameter('not-a-url')).toThrow();
+    it("should throw an error for invalid URLs", () => {
+      expect(() => OAuthUtils.buildResourceParameter("not-a-url")).toThrow();
     });
   });
 
-  describe('parseTokenExpiry', () => {
-    it('should return the expiry time in milliseconds for a valid token', () => {
+  describe("parseTokenExpiry", () => {
+    it("should return the expiry time in milliseconds for a valid token", () => {
       // Corresponds to a date of 2100-01-01T00:00:00Z
       const expiry = 4102444800;
       const payload = { exp: expiry };
-      const token = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+      const token = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBe(expiry * 1000);
     });
 
-    it('should return undefined for a token without an expiry time', () => {
+    it("should return undefined for a token without an expiry time", () => {
       const payload = { iat: 1678886400 };
-      const token = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+      const token = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined for a token with an invalid expiry time', () => {
-      const payload = { exp: 'not-a-number' };
-      const token = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+    it("should return undefined for a token with an invalid expiry time", () => {
+      const payload = { exp: "not-a-number" };
+      const token = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined for a malformed token', () => {
-      const token = 'not-a-valid-token';
+    it("should return undefined for a malformed token", () => {
+      const token = "not-a-valid-token";
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
 
-    it('should return undefined for a token with invalid JSON in payload', () => {
-      const token = `header.${Buffer.from('{ not valid json').toString('base64')}.signature`;
+    it("should return undefined for a token with invalid JSON in payload", () => {
+      const token = `header.${Buffer.from("{ not valid json").toString("base64")}.signature`;
       const result = OAuthUtils.parseTokenExpiry(token);
       expect(result).toBeUndefined();
     });
diff --git a/packages/gemini-core/src/mcp/oauth-utils.ts b/packages/gemini-core/src/mcp/oauth-utils.ts
index 0f4bd0b24..d29b1a62c 100644
--- a/packages/gemini-core/src/mcp/oauth-utils.ts
+++ b/packages/gemini-core/src/mcp/oauth-utils.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MCPOAuthConfig } from './oauth-provider.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import type { MCPOAuthConfig } from "./oauth-provider.js";
 
 /**
  * OAuth authorization server metadata as per RFC 8414.
@@ -56,19 +56,13 @@ export class OAuthUtils {
     if (!includePathSuffix) {
       // Standard discovery: use root-based well-known URLs
       return {
-        protectedResource: new URL(
-          '/.well-known/oauth-protected-resource',
-          base,
-        ).toString(),
-        authorizationServer: new URL(
-          '/.well-known/oauth-authorization-server',
-          base,
-        ).toString(),
+        protectedResource: new URL("/.well-known/oauth-protected-resource", base).toString(),
+        authorizationServer: new URL("/.well-known/oauth-authorization-server", base).toString(),
       };
     }
 
     // Path-based discovery: append path suffix to well-known URLs
-    const pathSuffix = serverUrl.pathname.replace(/\/$/, ''); // Remove trailing slash
+    const pathSuffix = serverUrl.pathname.replace(/\/$/, ""); // Remove trailing slash
     return {
       protectedResource: new URL(
         `/.well-known/oauth-protected-resource${pathSuffix}`,
@@ -133,9 +127,7 @@ export class OAuthUtils {
    * @param metadata The authorization server metadata
    * @returns The OAuth configuration
    */
-  static metadataToOAuthConfig(
-    metadata: OAuthAuthorizationServerMetadata,
-  ): MCPOAuthConfig {
+  static metadataToOAuthConfig(metadata: OAuthAuthorizationServerMetadata): MCPOAuthConfig {
     return {
       authorizationUrl: metadata.authorization_endpoint,
       tokenUrl: metadata.token_endpoint,
@@ -161,7 +153,7 @@ export class OAuthUtils {
 
     // With issuer URLs with path components, try the following well-known
     // endpoints in order:
-    if (authServerUrlObj.pathname !== '/') {
+    if (authServerUrlObj.pathname !== "/") {
       // 1. OAuth 2.0 Authorization Server Metadata with path insertion
       endpointsToTry.push(
         new URL(
@@ -172,18 +164,12 @@ export class OAuthUtils {
 
       // 2. OpenID Connect Discovery 1.0 with path insertion
       endpointsToTry.push(
-        new URL(
-          `/.well-known/openid-configuration${authServerUrlObj.pathname}`,
-          base,
-        ).toString(),
+        new URL(`/.well-known/openid-configuration${authServerUrlObj.pathname}`, base).toString(),
       );
 
       // 3. OpenID Connect Discovery 1.0 with path appending
       endpointsToTry.push(
-        new URL(
-          `${authServerUrlObj.pathname}/.well-known/openid-configuration`,
-          base,
-        ).toString(),
+        new URL(`${authServerUrlObj.pathname}/.well-known/openid-configuration`, base).toString(),
       );
     }
 
@@ -191,26 +177,19 @@ export class OAuthUtils {
     // discoveries, try the following well-known endpoints in order:
 
     // 1. OAuth 2.0 Authorization Server Metadata
-    endpointsToTry.push(
-      new URL('/.well-known/oauth-authorization-server', base).toString(),
-    );
+    endpointsToTry.push(new URL("/.well-known/oauth-authorization-server", base).toString());
 
     // 2. OpenID Connect Discovery 1.0
-    endpointsToTry.push(
-      new URL('/.well-known/openid-configuration', base).toString(),
-    );
+    endpointsToTry.push(new URL("/.well-known/openid-configuration", base).toString());
 
     for (const endpoint of endpointsToTry) {
-      const authServerMetadata =
-        await this.fetchAuthorizationServerMetadata(endpoint);
+      const authServerMetadata = await this.fetchAuthorizationServerMetadata(endpoint);
       if (authServerMetadata) {
         return authServerMetadata;
       }
     }
 
-    debugLogger.debug(
-      `Metadata discovery failed for authorization server ${authServerUrl}`,
-    );
+    debugLogger.debug(`Metadata discovery failed for authorization server ${authServerUrl}`);
     return null;
   }
 
@@ -220,9 +199,7 @@ export class OAuthUtils {
    * @param serverUrl The base URL of the server
    * @returns The discovered OAuth configuration or null if not available
    */
-  static async discoverOAuthConfig(
-    serverUrl: string,
-  ): Promise<MCPOAuthConfig | null> {
+  static async discoverOAuthConfig(serverUrl: string): Promise<MCPOAuthConfig | null> {
     try {
       // First try standard root-based discovery
       const wellKnownUrls = this.buildWellKnownUrls(serverUrl, false);
@@ -235,7 +212,7 @@ export class OAuthUtils {
       // If root discovery fails and we have a path, try path-based discovery
       if (!resourceMetadata) {
         const url = new URL(serverUrl);
-        if (url.pathname && url.pathname !== '/') {
+        if (url.pathname && url.pathname !== "/") {
           const pathBasedUrls = this.buildWellKnownUrls(serverUrl, true);
           resourceMetadata = await this.fetchProtectedResourceMetadata(
             pathBasedUrls.protectedResource,
@@ -246,14 +223,13 @@ export class OAuthUtils {
       if (resourceMetadata?.authorization_servers?.length) {
         // Use the first authorization server
         const authServerUrl = resourceMetadata.authorization_servers[0];
-        const authServerMetadata =
-          await this.discoverAuthorizationServerMetadata(authServerUrl);
+        const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
 
         if (authServerMetadata) {
           const config = this.metadataToOAuthConfig(authServerMetadata);
           if (authServerMetadata.registration_endpoint) {
             debugLogger.log(
-              'Dynamic client registration is supported at:',
+              "Dynamic client registration is supported at:",
               authServerMetadata.registration_endpoint,
             );
           }
@@ -263,14 +239,13 @@ export class OAuthUtils {
 
       // Fallback: try well-known endpoints at the base URL
       debugLogger.debug(`Trying OAuth discovery fallback at ${serverUrl}`);
-      const authServerMetadata =
-        await this.discoverAuthorizationServerMetadata(serverUrl);
+      const authServerMetadata = await this.discoverAuthorizationServerMetadata(serverUrl);
 
       if (authServerMetadata) {
         const config = this.metadataToOAuthConfig(authServerMetadata);
         if (authServerMetadata.registration_endpoint) {
           debugLogger.log(
-            'Dynamic client registration is supported at:',
+            "Dynamic client registration is supported at:",
             authServerMetadata.registration_endpoint,
           );
         }
@@ -279,9 +254,7 @@ export class OAuthUtils {
 
       return null;
     } catch (error) {
-      debugLogger.debug(
-        `Failed to discover OAuth configuration: ${getErrorMessage(error)}`,
-      );
+      debugLogger.debug(`Failed to discover OAuth configuration: ${getErrorMessage(error)}`);
       return null;
     }
   }
@@ -310,21 +283,18 @@ export class OAuthUtils {
   static async discoverOAuthFromWWWAuthenticate(
     wwwAuthenticate: string,
   ): Promise<MCPOAuthConfig | null> {
-    const resourceMetadataUri =
-      this.parseWWWAuthenticateHeader(wwwAuthenticate);
+    const resourceMetadataUri = this.parseWWWAuthenticateHeader(wwwAuthenticate);
     if (!resourceMetadataUri) {
       return null;
     }
 
-    const resourceMetadata =
-      await this.fetchProtectedResourceMetadata(resourceMetadataUri);
+    const resourceMetadata = await this.fetchProtectedResourceMetadata(resourceMetadataUri);
     if (!resourceMetadata?.authorization_servers?.length) {
       return null;
     }
 
     const authServerUrl = resourceMetadata.authorization_servers[0];
-    const authServerMetadata =
-      await this.discoverAuthorizationServerMetadata(authServerUrl);
+    const authServerMetadata = await this.discoverAuthorizationServerMetadata(authServerUrl);
 
     if (authServerMetadata) {
       return this.metadataToOAuthConfig(authServerMetadata);
@@ -351,7 +321,7 @@ export class OAuthUtils {
    * @returns True if the URL appears to be an SSE endpoint
    */
   static isSSEEndpoint(url: string): boolean {
-    return url.includes('/sse') || !url.includes('/mcp');
+    return url.includes("/sse") || !url.includes("/mcp");
   }
 
   /**
@@ -372,15 +342,13 @@ export class OAuthUtils {
    */
   static parseTokenExpiry(idToken: string): number | undefined {
     try {
-      const payload = JSON.parse(
-        Buffer.from(idToken.split('.')[1], 'base64').toString(),
-      );
+      const payload = JSON.parse(Buffer.from(idToken.split(".")[1], "base64").toString());
 
-      if (payload && typeof payload.exp === 'number') {
+      if (payload && typeof payload.exp === "number") {
         return payload.exp * 1000; // Convert seconds to milliseconds
       }
     } catch (e) {
-      console.error('Failed to parse ID token for expiry time with error:', e);
+      console.error("Failed to parse ID token for expiry time with error:", e);
     }
 
     // Return undefined if try block fails or 'exp' is missing/invalid
diff --git a/packages/gemini-core/src/mcp/sa-impersonation-provider.test.ts b/packages/gemini-core/src/mcp/sa-impersonation-provider.test.ts
index c86da645c..7232a3d9e 100644
--- a/packages/gemini-core/src/mcp/sa-impersonation-provider.test.ts
+++ b/packages/gemini-core/src/mcp/sa-impersonation-provider.test.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ServiceAccountImpersonationProvider } from './sa-impersonation-provider.js';
-import type { MCPServerConfig } from '../config/config.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { MCPServerConfig } from "../config/config.js";
+import { ServiceAccountImpersonationProvider } from "./sa-impersonation-provider.js";
 
 const mockRequest = vi.fn();
 const mockGetClient = vi.fn(() => ({
@@ -14,8 +14,8 @@ const mockGetClient = vi.fn(() => ({
 }));
 
 // Mock the google-auth-library to use a shared mock function
-vi.mock('google-auth-library', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('google-auth-library')>();
+vi.mock("google-auth-library", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("google-auth-library")>();
   return {
     ...actual,
     GoogleAuth: vi.fn().mockImplementation(() => ({
@@ -25,45 +25,45 @@ vi.mock('google-auth-library', async (importOriginal) => {
 });
 
 const defaultSAConfig: MCPServerConfig = {
-  url: 'https://my-iap-service.run.app',
-  targetAudience: 'my-audience',
-  targetServiceAccount: 'my-sa',
+  url: "https://my-iap-service.run.app",
+  targetAudience: "my-audience",
+  targetServiceAccount: "my-sa",
 };
 
-describe('ServiceAccountImpersonationProvider', () => {
+describe("ServiceAccountImpersonationProvider", () => {
   beforeEach(() => {
     // Reset mocks before each test
     vi.clearAllMocks();
   });
 
-  it('should throw an error if no URL is provided', () => {
+  it("should throw an error if no URL is provided", () => {
     const config: MCPServerConfig = {};
     expect(() => new ServiceAccountImpersonationProvider(config)).toThrow(
-      'A url or httpUrl must be provided for the Service Account Impersonation provider',
+      "A url or httpUrl must be provided for the Service Account Impersonation provider",
     );
   });
 
-  it('should throw an error if no targetAudience is provided', () => {
+  it("should throw an error if no targetAudience is provided", () => {
     const config: MCPServerConfig = {
-      url: 'https://my-iap-service.run.app',
+      url: "https://my-iap-service.run.app",
     };
     expect(() => new ServiceAccountImpersonationProvider(config)).toThrow(
-      'targetAudience must be provided for the Service Account Impersonation provider',
+      "targetAudience must be provided for the Service Account Impersonation provider",
     );
   });
 
-  it('should throw an error if no targetSA is provided', () => {
+  it("should throw an error if no targetSA is provided", () => {
     const config: MCPServerConfig = {
-      url: 'https://my-iap-service.run.app',
-      targetAudience: 'my-audience',
+      url: "https://my-iap-service.run.app",
+      targetAudience: "my-audience",
     };
     expect(() => new ServiceAccountImpersonationProvider(config)).toThrow(
-      'targetServiceAccount must be provided for the Service Account Impersonation provider',
+      "targetServiceAccount must be provided for the Service Account Impersonation provider",
     );
   });
 
-  it('should correctly get tokens for a valid config', async () => {
-    const mockToken = 'mock-id-token-123';
+  it("should correctly get tokens for a valid config", async () => {
+    const mockToken = "mock-id-token-123";
     mockRequest.mockResolvedValue({ data: { token: mockToken } });
 
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
@@ -71,10 +71,10 @@ describe('ServiceAccountImpersonationProvider', () => {
 
     expect(tokens).toBeDefined();
     expect(tokens?.access_token).toBe(mockToken);
-    expect(tokens?.token_type).toBe('Bearer');
+    expect(tokens?.token_type).toBe("Bearer");
   });
 
-  it('should return undefined if token acquisition fails', async () => {
+  it("should return undefined if token acquisition fails", async () => {
     mockRequest.mockResolvedValue({ data: { token: null } });
 
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
@@ -83,29 +83,29 @@ describe('ServiceAccountImpersonationProvider', () => {
     expect(tokens).toBeUndefined();
   });
 
-  it('should make a request with the correct parameters', async () => {
-    mockRequest.mockResolvedValue({ data: { token: 'test-token' } });
+  it("should make a request with the correct parameters", async () => {
+    mockRequest.mockResolvedValue({ data: { token: "test-token" } });
 
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
     await provider.tokens();
 
     expect(mockRequest).toHaveBeenCalledWith({
-      url: 'https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/my-sa:generateIdToken',
-      method: 'POST',
+      url: "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/my-sa:generateIdToken",
+      method: "POST",
       data: {
-        audience: 'my-audience',
+        audience: "my-audience",
         includeEmail: true,
       },
     });
   });
 
-  it('should return a cached token if it is not expired', async () => {
+  it("should return a cached token if it is not expired", async () => {
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
     vi.useFakeTimers();
 
     // jwt payload with exp set to 1 hour from now
     const payload = { exp: Math.floor(Date.now() / 1000) + 3600 };
-    const jwt = `header.${Buffer.from(JSON.stringify(payload)).toString('base64')}.signature`;
+    const jwt = `header.${Buffer.from(JSON.stringify(payload)).toString("base64")}.signature`;
     mockRequest.mockResolvedValue({ data: { token: jwt } });
 
     const firstTokens = await provider.tokens();
@@ -123,13 +123,13 @@ describe('ServiceAccountImpersonationProvider', () => {
     vi.useRealTimers();
   });
 
-  it('should fetch a new token if the cached token is expired (using fake timers)', async () => {
+  it("should fetch a new token if the cached token is expired (using fake timers)", async () => {
     const provider = new ServiceAccountImpersonationProvider(defaultSAConfig);
     vi.useFakeTimers();
 
     // Get and cache a token that expires in 1 second
     const expiredPayload = { exp: Math.floor(Date.now() / 1000) + 1 };
-    const expiredJwt = `header.${Buffer.from(JSON.stringify(expiredPayload)).toString('base64')}.signature`;
+    const expiredJwt = `header.${Buffer.from(JSON.stringify(expiredPayload)).toString("base64")}.signature`;
 
     mockRequest.mockResolvedValue({ data: { token: expiredJwt } });
     const firstTokens = await provider.tokens();
@@ -138,7 +138,7 @@ describe('ServiceAccountImpersonationProvider', () => {
 
     // Prepare the mock for the *next* call
     const newPayload = { exp: Math.floor(Date.now() / 1000) + 3600 };
-    const newJwt = `header.${Buffer.from(JSON.stringify(newPayload)).toString('base64')}.signature`;
+    const newJwt = `header.${Buffer.from(JSON.stringify(newPayload)).toString("base64")}.signature`;
     mockRequest.mockResolvedValue({ data: { token: newJwt } });
 
     vi.advanceTimersByTime(1001);
diff --git a/packages/gemini-core/src/mcp/sa-impersonation-provider.ts b/packages/gemini-core/src/mcp/sa-impersonation-provider.ts
index 2b9516d0d..41b41c137 100644
--- a/packages/gemini-core/src/mcp/sa-impersonation-provider.ts
+++ b/packages/gemini-core/src/mcp/sa-impersonation-provider.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
 import type {
   OAuthClientInformation,
   OAuthClientInformationFull,
   OAuthClientMetadata,
   OAuthTokens,
-} from '@modelcontextprotocol/sdk/shared/auth.js';
-import { GoogleAuth } from 'google-auth-library';
-import { OAuthUtils, FIVE_MIN_BUFFER_MS } from './oauth-utils.js';
-import type { MCPServerConfig } from '../config/config.js';
-import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
-import { coreEvents } from '../utils/events.js';
+} from "@modelcontextprotocol/sdk/shared/auth.js";
+import { GoogleAuth } from "google-auth-library";
+import type { MCPServerConfig } from "../config/config.js";
+import { coreEvents } from "../utils/events.js";
+import { FIVE_MIN_BUFFER_MS, OAuthUtils } from "./oauth-utils.js";
 
 function createIamApiUrl(targetSA: string): string {
   return `https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/${encodeURIComponent(
@@ -22,9 +22,7 @@ function createIamApiUrl(targetSA: string): string {
   )}:generateIdToken`;
 }
 
-export class ServiceAccountImpersonationProvider
-  implements OAuthClientProvider
-{
+export class ServiceAccountImpersonationProvider implements OAuthClientProvider {
   private readonly targetServiceAccount: string;
   private readonly targetAudience: string; // OAuth Client Id
   private readonly auth: GoogleAuth;
@@ -32,13 +30,13 @@ export class ServiceAccountImpersonationProvider
   private tokenExpiryTime?: number;
 
   // Properties required by OAuthClientProvider, with no-op values
-  readonly redirectUrl = '';
+  readonly redirectUrl = "";
   readonly clientMetadata: OAuthClientMetadata = {
-    client_name: 'Gemini CLI (Service Account Impersonation)',
+    client_name: "Gemini CLI (Service Account Impersonation)",
     redirect_uris: [],
     grant_types: [],
     response_types: [],
-    token_endpoint_auth_method: 'none',
+    token_endpoint_auth_method: "none",
   };
   private _clientInformation?: OAuthClientInformationFull;
 
@@ -46,20 +44,20 @@ export class ServiceAccountImpersonationProvider
     // This check is done in mcp-client.ts. This is just an additional check.
     if (!this.config.httpUrl && !this.config.url) {
       throw new Error(
-        'A url or httpUrl must be provided for the Service Account Impersonation provider',
+        "A url or httpUrl must be provided for the Service Account Impersonation provider",
       );
     }
 
     if (!config.targetAudience) {
       throw new Error(
-        'targetAudience must be provided for the Service Account Impersonation provider',
+        "targetAudience must be provided for the Service Account Impersonation provider",
       );
     }
     this.targetAudience = config.targetAudience;
 
     if (!config.targetServiceAccount) {
       throw new Error(
-        'targetServiceAccount must be provided for the Service Account Impersonation provider',
+        "targetServiceAccount must be provided for the Service Account Impersonation provider",
       );
     }
     this.targetServiceAccount = config.targetServiceAccount;
@@ -97,7 +95,7 @@ export class ServiceAccountImpersonationProvider
     try {
       const res = await client.request<{ token: string }>({
         url,
-        method: 'POST',
+        method: "POST",
         data: {
           audience: this.targetAudience,
           includeEmail: true,
@@ -106,18 +104,11 @@ export class ServiceAccountImpersonationProvider
       idToken = res.data.token;
 
       if (!idToken || idToken.length === 0) {
-        coreEvents.emitFeedback(
-          'error',
-          'Failed to obtain authentication token.',
-        );
+        coreEvents.emitFeedback("error", "Failed to obtain authentication token.");
         return undefined;
       }
     } catch (e) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to obtain authentication token.',
-        e as Error,
-      );
+      coreEvents.emitFeedback("error", "Failed to obtain authentication token.", e as Error);
       return undefined;
     }
 
@@ -128,7 +119,7 @@ export class ServiceAccountImpersonationProvider
     // present an ID token.
     const newTokens: OAuthTokens = {
       access_token: idToken,
-      token_type: 'Bearer',
+      token_type: "Bearer",
     };
 
     if (expiryTime) {
@@ -153,6 +144,6 @@ export class ServiceAccountImpersonationProvider
 
   codeVerifier(): string {
     // No-op
-    return '';
+    return "";
   }
 }
diff --git a/packages/gemini-core/src/mcp/token-storage/base-token-storage.test.ts b/packages/gemini-core/src/mcp/token-storage/base-token-storage.test.ts
index 7443ec3bd..ff8b4794d 100644
--- a/packages/gemini-core/src/mcp/token-storage/base-token-storage.test.ts
+++ b/packages/gemini-core/src/mcp/token-storage/base-token-storage.test.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials, OAuthToken } from './types.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials, OAuthToken } from "./types.js";
 
 class TestTokenStorage extends BaseTokenStorage {
   private storage = new Map<string, OAuthCredentials>();
@@ -49,20 +49,20 @@ class TestTokenStorage extends BaseTokenStorage {
   }
 }
 
-describe('BaseTokenStorage', () => {
+describe("BaseTokenStorage", () => {
   let storage: TestTokenStorage;
 
   beforeEach(() => {
-    storage = new TestTokenStorage('gemini-cli-mcp-oauth');
+    storage = new TestTokenStorage("gemini-cli-mcp-oauth");
   });
 
-  describe('validateCredentials', () => {
-    it('should validate valid credentials', () => {
+  describe("validateCredentials", () => {
+    it("should validate valid credentials", () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -72,73 +72,69 @@ describe('BaseTokenStorage', () => {
 
     it.each([
       {
-        desc: 'missing server name',
+        desc: "missing server name",
         credentials: {
-          serverName: '',
+          serverName: "",
           token: {
-            accessToken: 'access-token',
-            tokenType: 'Bearer',
+            accessToken: "access-token",
+            tokenType: "Bearer",
           },
           updatedAt: Date.now(),
         },
-        expectedError: 'Server name is required',
+        expectedError: "Server name is required",
       },
       {
-        desc: 'missing token',
+        desc: "missing token",
         credentials: {
-          serverName: 'test-server',
+          serverName: "test-server",
           token: null as unknown as OAuthToken,
           updatedAt: Date.now(),
         },
-        expectedError: 'Token is required',
+        expectedError: "Token is required",
       },
       {
-        desc: 'missing access token',
+        desc: "missing access token",
         credentials: {
-          serverName: 'test-server',
+          serverName: "test-server",
           token: {
-            accessToken: '',
-            tokenType: 'Bearer',
+            accessToken: "",
+            tokenType: "Bearer",
           },
           updatedAt: Date.now(),
         },
-        expectedError: 'Access token is required',
+        expectedError: "Access token is required",
       },
       {
-        desc: 'missing token type',
+        desc: "missing token type",
         credentials: {
-          serverName: 'test-server',
+          serverName: "test-server",
           token: {
-            accessToken: 'access-token',
-            tokenType: '',
+            accessToken: "access-token",
+            tokenType: "",
           },
           updatedAt: Date.now(),
         },
-        expectedError: 'Token type is required',
+        expectedError: "Token type is required",
       },
-    ])('should throw for $desc', ({ credentials, expectedError }) => {
-      expect(() =>
-        storage.validateCredentials(credentials as OAuthCredentials),
-      ).toThrow(expectedError);
+    ])("should throw for $desc", ({ credentials, expectedError }) => {
+      expect(() => storage.validateCredentials(credentials as OAuthCredentials)).toThrow(
+        expectedError,
+      );
     });
   });
 
-  describe('isTokenExpired', () => {
+  describe("isTokenExpired", () => {
     it.each([
-      ['tokens without expiry', undefined, false],
-      ['valid tokens', Date.now() + 3600000, false],
-      ['expired tokens', Date.now() - 3600000, true],
-      [
-        'tokens within 5-minute buffer (4 minutes from now)',
-        Date.now() + 4 * 60 * 1000,
-        true,
-      ],
-    ])('should return %s for %s', (_, expiresAt, expected) => {
+      ["tokens without expiry", undefined, false],
+      ["valid tokens", Date.now() + 3600000, false],
+      ["expired tokens", Date.now() - 3600000, true],
+      ["tokens within 5-minute buffer (4 minutes from now)", Date.now() + 4 * 60 * 1000, true],
+    ])("should return %s for %s", (_, expiresAt, expected) => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
           ...(expiresAt !== undefined && { expiresAt }),
         },
         updatedAt: Date.now(),
@@ -148,24 +144,16 @@ describe('BaseTokenStorage', () => {
     });
   });
 
-  describe('sanitizeServerName', () => {
+  describe("sanitizeServerName", () => {
     it.each([
+      ["valid characters", "test-server.example_123", "test-server.example_123"],
       [
-        'valid characters',
-        'test-server.example_123',
-        'test-server.example_123',
-      ],
-      [
-        'invalid characters with underscore replacement',
-        'test@server#example',
-        'test_server_example',
-      ],
-      [
-        'special characters',
-        'test server/example:123',
-        'test_server_example_123',
+        "invalid characters with underscore replacement",
+        "test@server#example",
+        "test_server_example",
       ],
-    ])('should handle %s', (_, input, expected) => {
+      ["special characters", "test server/example:123", "test_server_example_123"],
+    ])("should handle %s", (_, input, expected) => {
       expect(storage.sanitizeServerName(input)).toBe(expected);
     });
   });
diff --git a/packages/gemini-core/src/mcp/token-storage/base-token-storage.ts b/packages/gemini-core/src/mcp/token-storage/base-token-storage.ts
index b36096fd8..410454b47 100644
--- a/packages/gemini-core/src/mcp/token-storage/base-token-storage.ts
+++ b/packages/gemini-core/src/mcp/token-storage/base-token-storage.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TokenStorage, OAuthCredentials } from './types.js';
+import type { OAuthCredentials, TokenStorage } from "./types.js";
 
 export abstract class BaseTokenStorage implements TokenStorage {
   protected readonly serviceName: string;
@@ -22,16 +22,16 @@ export abstract class BaseTokenStorage implements TokenStorage {
 
   protected validateCredentials(credentials: OAuthCredentials): void {
     if (!credentials.serverName) {
-      throw new Error('Server name is required');
+      throw new Error("Server name is required");
     }
     if (!credentials.token) {
-      throw new Error('Token is required');
+      throw new Error("Token is required");
     }
     if (!credentials.token.accessToken) {
-      throw new Error('Access token is required');
+      throw new Error("Access token is required");
     }
     if (!credentials.token.tokenType) {
-      throw new Error('Token type is required');
+      throw new Error("Token type is required");
     }
   }
 
@@ -44,6 +44,6 @@ export abstract class BaseTokenStorage implements TokenStorage {
   }
 
   protected sanitizeServerName(serverName: string): string {
-    return serverName.replace(/[^a-zA-Z0-9-_.]/g, '_');
+    return serverName.replace(/[^a-zA-Z0-9-_.]/g, "_");
   }
 }
diff --git a/packages/gemini-core/src/mcp/token-storage/file-token-storage.test.ts b/packages/gemini-core/src/mcp/token-storage/file-token-storage.test.ts
index 48050f37e..3d12b0005 100644
--- a/packages/gemini-core/src/mcp/token-storage/file-token-storage.test.ts
+++ b/packages/gemini-core/src/mcp/token-storage/file-token-storage.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import { FileTokenStorage } from './file-token-storage.js';
-import type { OAuthCredentials } from './types.js';
-import { GEMINI_DIR } from '../../utils/paths.js';
-
-vi.mock('node:fs', () => ({
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GEMINI_DIR } from "../../utils/paths.js";
+import { FileTokenStorage } from "./file-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
+
+vi.mock("node:fs", () => ({
   promises: {
     readFile: vi.fn(),
     writeFile: vi.fn(),
@@ -20,18 +20,18 @@ vi.mock('node:fs', () => ({
   },
 }));
 
-vi.mock('node:os', () => ({
+vi.mock("node:os", () => ({
   default: {
-    homedir: vi.fn(() => '/home/test'),
-    hostname: vi.fn(() => 'test-host'),
-    userInfo: vi.fn(() => ({ username: 'test-user' })),
+    homedir: vi.fn(() => "/home/test"),
+    hostname: vi.fn(() => "test-host"),
+    userInfo: vi.fn(() => ({ username: "test-user" })),
   },
-  homedir: vi.fn(() => '/home/test'),
-  hostname: vi.fn(() => 'test-host'),
-  userInfo: vi.fn(() => ({ username: 'test-user' })),
+  homedir: vi.fn(() => "/home/test"),
+  hostname: vi.fn(() => "test-host"),
+  userInfo: vi.fn(() => ({ username: "test-user" })),
 }));
 
-describe('FileTokenStorage', () => {
+describe("FileTokenStorage", () => {
   let storage: FileTokenStorage;
   const mockFs = fs as unknown as {
     readFile: ReturnType<typeof vi.fn>;
@@ -40,104 +40,98 @@ describe('FileTokenStorage', () => {
     mkdir: ReturnType<typeof vi.fn>;
   };
   const existingCredentials: OAuthCredentials = {
-    serverName: 'existing-server',
+    serverName: "existing-server",
     token: {
-      accessToken: 'existing-token',
-      tokenType: 'Bearer',
+      accessToken: "existing-token",
+      tokenType: "Bearer",
     },
     updatedAt: Date.now() - 10000,
   };
 
   beforeEach(() => {
     vi.clearAllMocks();
-    storage = new FileTokenStorage('test-storage');
+    storage = new FileTokenStorage("test-storage");
   });
 
   afterEach(() => {
     vi.clearAllMocks();
   });
 
-  describe('getCredentials', () => {
-    it('should return null when file does not exist', async () => {
-      mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+  describe("getCredentials", () => {
+    it("should return null when file does not exist", async () => {
+      mockFs.readFile.mockRejectedValue({ code: "ENOENT" });
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
       expect(result).toBeNull();
     });
 
-    it('should return null for expired tokens', async () => {
+    it("should return null for expired tokens", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
           expiresAt: Date.now() - 3600000,
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'test-server': credentials }),
-      );
+      const encryptedData = storage["encrypt"](JSON.stringify({ "test-server": credentials }));
       mockFs.readFile.mockResolvedValue(encryptedData);
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
       expect(result).toBeNull();
     });
 
-    it('should return credentials for valid tokens', async () => {
+    it("should return credentials for valid tokens", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
           expiresAt: Date.now() + 3600000,
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'test-server': credentials }),
-      );
+      const encryptedData = storage["encrypt"](JSON.stringify({ "test-server": credentials }));
       mockFs.readFile.mockResolvedValue(encryptedData);
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
       expect(result).toEqual(credentials);
     });
 
-    it('should throw error for corrupted files', async () => {
-      mockFs.readFile.mockResolvedValue('corrupted-data');
+    it("should throw error for corrupted files", async () => {
+      mockFs.readFile.mockResolvedValue("corrupted-data");
 
-      await expect(storage.getCredentials('test-server')).rejects.toThrow(
-        'Token file corrupted',
-      );
+      await expect(storage.getCredentials("test-server")).rejects.toThrow("Token file corrupted");
     });
   });
 
-  describe('setCredentials', () => {
-    it('should save credentials with encryption', async () => {
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'existing-server': existingCredentials }),
+  describe("setCredentials", () => {
+    it("should save credentials with encryption", async () => {
+      const encryptedData = storage["encrypt"](
+        JSON.stringify({ "existing-server": existingCredentials }),
       );
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.mkdir.mockResolvedValue(undefined);
       mockFs.writeFile.mockResolvedValue(undefined);
 
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
       await storage.setCredentials(credentials);
 
-      expect(mockFs.mkdir).toHaveBeenCalledWith(
-        path.join('/home/test', GEMINI_DIR),
-        { recursive: true, mode: 0o700 },
-      );
+      expect(mockFs.mkdir).toHaveBeenCalledWith(path.join("/home/test", GEMINI_DIR), {
+        recursive: true,
+        mode: 0o700,
+      });
       expect(mockFs.writeFile).toHaveBeenCalled();
 
       const writeCall = mockFs.writeFile.mock.calls[0];
@@ -145,18 +139,18 @@ describe('FileTokenStorage', () => {
       expect(writeCall[2]).toEqual({ mode: 0o600 });
     });
 
-    it('should update existing credentials', async () => {
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'existing-server': existingCredentials }),
+    it("should update existing credentials", async () => {
+      const encryptedData = storage["encrypt"](
+        JSON.stringify({ "existing-server": existingCredentials }),
       );
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.writeFile.mockResolvedValue(undefined);
 
       const newCredentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'new-token',
-          tokenType: 'Bearer',
+          accessToken: "new-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -165,158 +159,154 @@ describe('FileTokenStorage', () => {
 
       expect(mockFs.writeFile).toHaveBeenCalled();
       const writeCall = mockFs.writeFile.mock.calls[0];
-      const decrypted = storage['decrypt'](writeCall[1]);
+      const decrypted = storage["decrypt"](writeCall[1]);
       const saved = JSON.parse(decrypted);
 
-      expect(saved['existing-server']).toEqual(existingCredentials);
-      expect(saved['test-server'].token.accessToken).toBe('new-token');
+      expect(saved["existing-server"]).toEqual(existingCredentials);
+      expect(saved["test-server"].token.accessToken).toBe("new-token");
     });
   });
 
-  describe('deleteCredentials', () => {
-    it('should throw when credentials do not exist', async () => {
-      mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+  describe("deleteCredentials", () => {
+    it("should throw when credentials do not exist", async () => {
+      mockFs.readFile.mockRejectedValue({ code: "ENOENT" });
 
-      await expect(storage.deleteCredentials('test-server')).rejects.toThrow(
-        'No credentials found for test-server',
+      await expect(storage.deleteCredentials("test-server")).rejects.toThrow(
+        "No credentials found for test-server",
       );
     });
 
-    it('should delete file when last credential is removed', async () => {
+    it("should delete file when last credential is removed", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
-        JSON.stringify({ 'test-server': credentials }),
-      );
+      const encryptedData = storage["encrypt"](JSON.stringify({ "test-server": credentials }));
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.unlink.mockResolvedValue(undefined);
 
-      await storage.deleteCredentials('test-server');
+      await storage.deleteCredentials("test-server");
 
       expect(mockFs.unlink).toHaveBeenCalledWith(
-        path.join('/home/test', GEMINI_DIR, 'mcp-oauth-tokens-v2.json'),
+        path.join("/home/test", GEMINI_DIR, "mcp-oauth-tokens-v2.json"),
       );
     });
 
-    it('should update file when other credentials remain', async () => {
+    it("should update file when other credentials remain", async () => {
       const credentials1: OAuthCredentials = {
-        serverName: 'server1',
+        serverName: "server1",
         token: {
-          accessToken: 'token1',
-          tokenType: 'Bearer',
+          accessToken: "token1",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
       const credentials2: OAuthCredentials = {
-        serverName: 'server2',
+        serverName: "server2",
         token: {
-          accessToken: 'token2',
-          tokenType: 'Bearer',
+          accessToken: "token2",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
 
-      const encryptedData = storage['encrypt'](
+      const encryptedData = storage["encrypt"](
         JSON.stringify({ server1: credentials1, server2: credentials2 }),
       );
       mockFs.readFile.mockResolvedValue(encryptedData);
       mockFs.writeFile.mockResolvedValue(undefined);
 
-      await storage.deleteCredentials('server1');
+      await storage.deleteCredentials("server1");
 
       expect(mockFs.writeFile).toHaveBeenCalled();
       expect(mockFs.unlink).not.toHaveBeenCalled();
 
       const writeCall = mockFs.writeFile.mock.calls[0];
-      const decrypted = storage['decrypt'](writeCall[1]);
+      const decrypted = storage["decrypt"](writeCall[1]);
       const saved = JSON.parse(decrypted);
 
-      expect(saved['server1']).toBeUndefined();
-      expect(saved['server2']).toEqual(credentials2);
+      expect(saved["server1"]).toBeUndefined();
+      expect(saved["server2"]).toEqual(credentials2);
     });
   });
 
-  describe('listServers', () => {
-    it('should return empty list when file does not exist', async () => {
-      mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+  describe("listServers", () => {
+    it("should return empty list when file does not exist", async () => {
+      mockFs.readFile.mockRejectedValue({ code: "ENOENT" });
 
       const result = await storage.listServers();
       expect(result).toEqual([]);
     });
 
-    it('should return list of server names', async () => {
+    it("should return list of server names", async () => {
       const credentials: Record<string, OAuthCredentials> = {
         server1: {
-          serverName: 'server1',
-          token: { accessToken: 'token1', tokenType: 'Bearer' },
+          serverName: "server1",
+          token: { accessToken: "token1", tokenType: "Bearer" },
           updatedAt: Date.now(),
         },
         server2: {
-          serverName: 'server2',
-          token: { accessToken: 'token2', tokenType: 'Bearer' },
+          serverName: "server2",
+          token: { accessToken: "token2", tokenType: "Bearer" },
           updatedAt: Date.now(),
         },
       };
 
-      const encryptedData = storage['encrypt'](JSON.stringify(credentials));
+      const encryptedData = storage["encrypt"](JSON.stringify(credentials));
       mockFs.readFile.mockResolvedValue(encryptedData);
 
       const result = await storage.listServers();
-      expect(result).toEqual(['server1', 'server2']);
+      expect(result).toEqual(["server1", "server2"]);
     });
   });
 
-  describe('clearAll', () => {
-    it('should delete the token file', async () => {
+  describe("clearAll", () => {
+    it("should delete the token file", async () => {
       mockFs.unlink.mockResolvedValue(undefined);
 
       await storage.clearAll();
 
       expect(mockFs.unlink).toHaveBeenCalledWith(
-        path.join('/home/test', GEMINI_DIR, 'mcp-oauth-tokens-v2.json'),
+        path.join("/home/test", GEMINI_DIR, "mcp-oauth-tokens-v2.json"),
       );
     });
 
-    it('should not throw when file does not exist', async () => {
-      mockFs.unlink.mockRejectedValue({ code: 'ENOENT' });
+    it("should not throw when file does not exist", async () => {
+      mockFs.unlink.mockRejectedValue({ code: "ENOENT" });
 
       await expect(storage.clearAll()).resolves.not.toThrow();
     });
   });
 
-  describe('encryption', () => {
-    it('should encrypt and decrypt data correctly', () => {
-      const original = 'test-data-123';
-      const encrypted = storage['encrypt'](original);
-      const decrypted = storage['decrypt'](encrypted);
+  describe("encryption", () => {
+    it("should encrypt and decrypt data correctly", () => {
+      const original = "test-data-123";
+      const encrypted = storage["encrypt"](original);
+      const decrypted = storage["decrypt"](encrypted);
 
       expect(decrypted).toBe(original);
       expect(encrypted).not.toBe(original);
       expect(encrypted).toMatch(/^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+$/);
     });
 
-    it('should produce different encrypted output each time', () => {
-      const original = 'test-data';
-      const encrypted1 = storage['encrypt'](original);
-      const encrypted2 = storage['encrypt'](original);
+    it("should produce different encrypted output each time", () => {
+      const original = "test-data";
+      const encrypted1 = storage["encrypt"](original);
+      const encrypted2 = storage["encrypt"](original);
 
       expect(encrypted1).not.toBe(encrypted2);
-      expect(storage['decrypt'](encrypted1)).toBe(original);
-      expect(storage['decrypt'](encrypted2)).toBe(original);
+      expect(storage["decrypt"](encrypted1)).toBe(original);
+      expect(storage["decrypt"](encrypted2)).toBe(original);
     });
 
-    it('should throw on invalid encrypted data format', () => {
-      expect(() => storage['decrypt']('invalid-data')).toThrow(
-        'Invalid encrypted data format',
-      );
+    it("should throw on invalid encrypted data format", () => {
+      expect(() => storage["decrypt"]("invalid-data")).toThrow("Invalid encrypted data format");
     });
   });
 });
diff --git a/packages/gemini-core/src/mcp/token-storage/file-token-storage.ts b/packages/gemini-core/src/mcp/token-storage/file-token-storage.ts
index a9e17b60d..3569af6ae 100644
--- a/packages/gemini-core/src/mcp/token-storage/file-token-storage.ts
+++ b/packages/gemini-core/src/mcp/token-storage/file-token-storage.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import * as crypto from 'node:crypto';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials } from './types.js';
-import { GEMINI_DIR } from '../../utils/paths.js';
+import * as crypto from "node:crypto";
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { GEMINI_DIR } from "../../utils/paths.js";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
 
 export class FileTokenStorage extends BaseTokenStorage {
   private readonly tokenFilePath: string;
@@ -19,46 +19,42 @@ export class FileTokenStorage extends BaseTokenStorage {
   constructor(serviceName: string) {
     super(serviceName);
     const configDir = path.join(os.homedir(), GEMINI_DIR);
-    this.tokenFilePath = path.join(configDir, 'mcp-oauth-tokens-v2.json');
+    this.tokenFilePath = path.join(configDir, "mcp-oauth-tokens-v2.json");
     this.encryptionKey = this.deriveEncryptionKey();
   }
 
   private deriveEncryptionKey(): Buffer {
     const salt = `${os.hostname()}-${os.userInfo().username}-gemini-cli`;
-    return crypto.scryptSync('gemini-cli-oauth', salt, 32);
+    return crypto.scryptSync("gemini-cli-oauth", salt, 32);
   }
 
   private encrypt(text: string): string {
     const iv = crypto.randomBytes(16);
-    const cipher = crypto.createCipheriv('aes-256-gcm', this.encryptionKey, iv);
+    const cipher = crypto.createCipheriv("aes-256-gcm", this.encryptionKey, iv);
 
-    let encrypted = cipher.update(text, 'utf8', 'hex');
-    encrypted += cipher.final('hex');
+    let encrypted = cipher.update(text, "utf8", "hex");
+    encrypted += cipher.final("hex");
 
     const authTag = cipher.getAuthTag();
 
-    return iv.toString('hex') + ':' + authTag.toString('hex') + ':' + encrypted;
+    return iv.toString("hex") + ":" + authTag.toString("hex") + ":" + encrypted;
   }
 
   private decrypt(encryptedData: string): string {
-    const parts = encryptedData.split(':');
+    const parts = encryptedData.split(":");
     if (parts.length !== 3) {
-      throw new Error('Invalid encrypted data format');
+      throw new Error("Invalid encrypted data format");
     }
 
-    const iv = Buffer.from(parts[0], 'hex');
-    const authTag = Buffer.from(parts[1], 'hex');
+    const iv = Buffer.from(parts[0], "hex");
+    const authTag = Buffer.from(parts[1], "hex");
     const encrypted = parts[2];
 
-    const decipher = crypto.createDecipheriv(
-      'aes-256-gcm',
-      this.encryptionKey,
-      iv,
-    );
+    const decipher = crypto.createDecipheriv("aes-256-gcm", this.encryptionKey, iv);
     decipher.setAuthTag(authTag);
 
-    let decrypted = decipher.update(encrypted, 'hex', 'utf8');
-    decrypted += decipher.final('utf8');
+    let decrypted = decipher.update(encrypted, "hex", "utf8");
+    decrypted += decipher.final("utf8");
 
     return decrypted;
   }
@@ -70,30 +66,26 @@ export class FileTokenStorage extends BaseTokenStorage {
 
   private async loadTokens(): Promise<Map<string, OAuthCredentials>> {
     try {
-      const data = await fs.readFile(this.tokenFilePath, 'utf-8');
+      const data = await fs.readFile(this.tokenFilePath, "utf-8");
       const decrypted = this.decrypt(data);
       const tokens = JSON.parse(decrypted) as Record<string, OAuthCredentials>;
       return new Map(Object.entries(tokens));
     } catch (error: unknown) {
       const err = error as NodeJS.ErrnoException & { message?: string };
-      if (err.code === 'ENOENT') {
+      if (err.code === "ENOENT") {
         return new Map();
       }
       if (
-        err.message?.includes('Invalid encrypted data format') ||
-        err.message?.includes(
-          'Unsupported state or unable to authenticate data',
-        )
+        err.message?.includes("Invalid encrypted data format") ||
+        err.message?.includes("Unsupported state or unable to authenticate data")
       ) {
-        throw new Error('Token file corrupted');
+        throw new Error("Token file corrupted");
       }
       throw error;
     }
   }
 
-  private async saveTokens(
-    tokens: Map<string, OAuthCredentials>,
-  ): Promise<void> {
+  private async saveTokens(tokens: Map<string, OAuthCredentials>): Promise<void> {
     await this.ensureDirectoryExists();
 
     const data = Object.fromEntries(tokens);
@@ -145,7 +137,7 @@ export class FileTokenStorage extends BaseTokenStorage {
         await fs.unlink(this.tokenFilePath);
       } catch (error: unknown) {
         const err = error as NodeJS.ErrnoException;
-        if (err.code !== 'ENOENT') {
+        if (err.code !== "ENOENT") {
           throw error;
         }
       }
@@ -177,7 +169,7 @@ export class FileTokenStorage extends BaseTokenStorage {
       await fs.unlink(this.tokenFilePath);
     } catch (error: unknown) {
       const err = error as NodeJS.ErrnoException;
-      if (err.code !== 'ENOENT') {
+      if (err.code !== "ENOENT") {
         throw error;
       }
     }
diff --git a/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.test.ts b/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.test.ts
index 5303d8477..857690aee 100644
--- a/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.test.ts
+++ b/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { HybridTokenStorage } from './hybrid-token-storage.js';
-import { KeychainTokenStorage } from './keychain-token-storage.js';
-import { FileTokenStorage } from './file-token-storage.js';
-import { type OAuthCredentials, TokenStorageType } from './types.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { FileTokenStorage } from "./file-token-storage.js";
+import { HybridTokenStorage } from "./hybrid-token-storage.js";
+import { KeychainTokenStorage } from "./keychain-token-storage.js";
+import { type OAuthCredentials, TokenStorageType } from "./types.js";
 
-vi.mock('./keychain-token-storage.js', () => ({
+vi.mock("./keychain-token-storage.js", () => ({
   KeychainTokenStorage: vi.fn().mockImplementation(() => ({
     isAvailable: vi.fn(),
     getCredentials: vi.fn(),
@@ -22,7 +22,7 @@ vi.mock('./keychain-token-storage.js', () => ({
   })),
 }));
 
-vi.mock('./file-token-storage.js', () => ({
+vi.mock("./file-token-storage.js", () => ({
   FileTokenStorage: vi.fn().mockImplementation(() => ({
     getCredentials: vi.fn(),
     setCredentials: vi.fn(),
@@ -43,7 +43,7 @@ interface MockStorage {
   clearAll: ReturnType<typeof vi.fn>;
 }
 
-describe('HybridTokenStorage', () => {
+describe("HybridTokenStorage", () => {
   let storage: HybridTokenStorage;
   let mockKeychainStorage: MockStorage;
   let mockFileStorage: MockStorage;
@@ -73,99 +73,83 @@ describe('HybridTokenStorage', () => {
       clearAll: vi.fn(),
     };
 
-    (
-      KeychainTokenStorage as unknown as ReturnType<typeof vi.fn>
-    ).mockImplementation(() => mockKeychainStorage);
-    (
-      FileTokenStorage as unknown as ReturnType<typeof vi.fn>
-    ).mockImplementation(() => mockFileStorage);
+    (KeychainTokenStorage as unknown as ReturnType<typeof vi.fn>).mockImplementation(
+      () => mockKeychainStorage,
+    );
+    (FileTokenStorage as unknown as ReturnType<typeof vi.fn>).mockImplementation(
+      () => mockFileStorage,
+    );
 
-    storage = new HybridTokenStorage('test-service');
+    storage = new HybridTokenStorage("test-service");
   });
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  describe('storage selection', () => {
-    it('should use keychain when available', async () => {
+  describe("storage selection", () => {
+    it("should use keychain when available", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
-      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith("test-server");
       expect(await storage.getStorageType()).toBe(TokenStorageType.KEYCHAIN);
     });
 
-    it('should use file storage when GEMINI_FORCE_FILE_STORAGE is set', async () => {
-      process.env['GEMINI_FORCE_FILE_STORAGE'] = 'true';
+    it("should use file storage when GEMINI_FORCE_FILE_STORAGE is set", async () => {
+      process.env["GEMINI_FORCE_FILE_STORAGE"] = "true";
       mockFileStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).not.toHaveBeenCalled();
-      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
-      expect(await storage.getStorageType()).toBe(
-        TokenStorageType.ENCRYPTED_FILE,
-      );
+      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith("test-server");
+      expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
     });
 
-    it('should fall back to file storage when keychain is unavailable', async () => {
+    it("should fall back to file storage when keychain is unavailable", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(false);
       mockFileStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
-      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
-      expect(await storage.getStorageType()).toBe(
-        TokenStorageType.ENCRYPTED_FILE,
-      );
+      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith("test-server");
+      expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
     });
 
-    it('should fall back to file storage when keychain throws error', async () => {
-      mockKeychainStorage.isAvailable!.mockRejectedValue(
-        new Error('Keychain error'),
-      );
+    it("should fall back to file storage when keychain throws error", async () => {
+      mockKeychainStorage.isAvailable!.mockRejectedValue(new Error("Keychain error"));
       mockFileStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
+      await storage.getCredentials("test-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
-      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
-      expect(await storage.getStorageType()).toBe(
-        TokenStorageType.ENCRYPTED_FILE,
-      );
+      expect(mockFileStorage.getCredentials).toHaveBeenCalledWith("test-server");
+      expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
     });
 
-    it('should cache storage selection', async () => {
+    it("should cache storage selection", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.getCredentials.mockResolvedValue(null);
 
-      await storage.getCredentials('test-server');
-      await storage.getCredentials('another-server');
+      await storage.getCredentials("test-server");
+      await storage.getCredentials("another-server");
 
       expect(mockKeychainStorage.isAvailable).toHaveBeenCalledTimes(1);
     });
   });
 
-  describe('getCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("getCredentials", () => {
+    it("should delegate to selected storage", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -173,22 +157,20 @@ describe('HybridTokenStorage', () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.getCredentials.mockResolvedValue(credentials);
 
-      const result = await storage.getCredentials('test-server');
+      const result = await storage.getCredentials("test-server");
 
       expect(result).toEqual(credentials);
-      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith("test-server");
     });
   });
 
-  describe('setCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("setCredentials", () => {
+    it("should delegate to selected storage", async () => {
       const credentials: OAuthCredentials = {
-        serverName: 'test-server',
+        serverName: "test-server",
         token: {
-          accessToken: 'access-token',
-          tokenType: 'Bearer',
+          accessToken: "access-token",
+          tokenType: "Bearer",
         },
         updatedAt: Date.now(),
       };
@@ -198,28 +180,24 @@ describe('HybridTokenStorage', () => {
 
       await storage.setCredentials(credentials);
 
-      expect(mockKeychainStorage.setCredentials).toHaveBeenCalledWith(
-        credentials,
-      );
+      expect(mockKeychainStorage.setCredentials).toHaveBeenCalledWith(credentials);
     });
   });
 
-  describe('deleteCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("deleteCredentials", () => {
+    it("should delegate to selected storage", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.deleteCredentials.mockResolvedValue(undefined);
 
-      await storage.deleteCredentials('test-server');
+      await storage.deleteCredentials("test-server");
 
-      expect(mockKeychainStorage.deleteCredentials).toHaveBeenCalledWith(
-        'test-server',
-      );
+      expect(mockKeychainStorage.deleteCredentials).toHaveBeenCalledWith("test-server");
     });
   });
 
-  describe('listServers', () => {
-    it('should delegate to selected storage', async () => {
-      const servers = ['server1', 'server2'];
+  describe("listServers", () => {
+    it("should delegate to selected storage", async () => {
+      const servers = ["server1", "server2"];
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.listServers.mockResolvedValue(servers);
 
@@ -230,22 +208,22 @@ describe('HybridTokenStorage', () => {
     });
   });
 
-  describe('getAllCredentials', () => {
-    it('should delegate to selected storage', async () => {
+  describe("getAllCredentials", () => {
+    it("should delegate to selected storage", async () => {
       const credentialsMap = new Map([
         [
-          'server1',
+          "server1",
           {
-            serverName: 'server1',
-            token: { accessToken: 'token1', tokenType: 'Bearer' },
+            serverName: "server1",
+            token: { accessToken: "token1", tokenType: "Bearer" },
             updatedAt: Date.now(),
           },
         ],
         [
-          'server2',
+          "server2",
           {
-            serverName: 'server2',
-            token: { accessToken: 'token2', tokenType: 'Bearer' },
+            serverName: "server2",
+            token: { accessToken: "token2", tokenType: "Bearer" },
             updatedAt: Date.now(),
           },
         ],
@@ -261,8 +239,8 @@ describe('HybridTokenStorage', () => {
     });
   });
 
-  describe('clearAll', () => {
-    it('should delegate to selected storage', async () => {
+  describe("clearAll", () => {
+    it("should delegate to selected storage", async () => {
       mockKeychainStorage.isAvailable!.mockResolvedValue(true);
       mockKeychainStorage.clearAll.mockResolvedValue(undefined);
 
diff --git a/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.ts b/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.ts
index 70edac07c..ef9be861f 100644
--- a/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.ts
+++ b/packages/gemini-core/src/mcp/token-storage/hybrid-token-storage.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { BaseTokenStorage } from './base-token-storage.js';
-import { FileTokenStorage } from './file-token-storage.js';
-import type { TokenStorage, OAuthCredentials } from './types.js';
-import { TokenStorageType } from './types.js';
+import { BaseTokenStorage } from "./base-token-storage.js";
+import { FileTokenStorage } from "./file-token-storage.js";
+import type { OAuthCredentials, TokenStorage } from "./types.js";
+import { TokenStorageType } from "./types.js";
 
-const FORCE_FILE_STORAGE_ENV_VAR = 'GEMINI_FORCE_FILE_STORAGE';
+const FORCE_FILE_STORAGE_ENV_VAR = "GEMINI_FORCE_FILE_STORAGE";
 
 export class HybridTokenStorage extends BaseTokenStorage {
   private storage: TokenStorage | null = null;
@@ -21,13 +21,11 @@ export class HybridTokenStorage extends BaseTokenStorage {
   }
 
   private async initializeStorage(): Promise<TokenStorage> {
-    const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === 'true';
+    const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === "true";
 
     if (!forceFileStorage) {
       try {
-        const { KeychainTokenStorage } = await import(
-          './keychain-token-storage.js'
-        );
+        const { KeychainTokenStorage } = await import("./keychain-token-storage.js");
         const keychainStorage = new KeychainTokenStorage(this.serviceName);
 
         const isAvailable = await keychainStorage.isAvailable();
diff --git a/packages/gemini-core/src/mcp/token-storage/index.ts b/packages/gemini-core/src/mcp/token-storage/index.ts
index 0b48a933a..ec4b4359e 100644
--- a/packages/gemini-core/src/mcp/token-storage/index.ts
+++ b/packages/gemini-core/src/mcp/token-storage/index.ts
@@ -4,11 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './types.js';
-export * from './base-token-storage.js';
-export * from './file-token-storage.js';
-export * from './hybrid-token-storage.js';
+export * from "./base-token-storage.js";
+export * from "./file-token-storage.js";
+export * from "./hybrid-token-storage.js";
+export * from "./types.js";
 
-export const DEFAULT_SERVICE_NAME = 'gemini-cli-oauth';
-export const FORCE_ENCRYPTED_FILE_ENV_VAR =
-  'GEMINI_FORCE_ENCRYPTED_FILE_STORAGE';
+export const DEFAULT_SERVICE_NAME = "gemini-cli-oauth";
+export const FORCE_ENCRYPTED_FILE_ENV_VAR = "GEMINI_FORCE_ENCRYPTED_FILE_STORAGE";
diff --git a/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.test.ts b/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.test.ts
index 632387e23..f7147e94a 100644
--- a/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.test.ts
+++ b/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { KeychainTokenStorage } from './keychain-token-storage.js';
-import type { OAuthCredentials } from './types.js';
-import { coreEvents } from '../../utils/events.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { coreEvents } from "../../utils/events.js";
+import type { KeychainTokenStorage } from "./keychain-token-storage.js";
+import type { OAuthCredentials } from "./types.js";
 
 // Hoist the mock to be available in the vi.mock factory
 const mockKeytar = vi.hoisted(() => ({
@@ -17,36 +17,34 @@ const mockKeytar = vi.hoisted(() => ({
   findCredentials: vi.fn(),
 }));
 
-const mockServiceName = 'service-name';
-const mockCryptoRandomBytesString = 'random-string';
+const mockServiceName = "service-name";
+const mockCryptoRandomBytesString = "random-string";
 
 // Mock the dynamic import of 'keytar'
-vi.mock('keytar', () => ({
+vi.mock("keytar", () => ({
   default: mockKeytar,
 }));
 
-vi.mock('node:crypto', () => ({
+vi.mock("node:crypto", () => ({
   randomBytes: vi.fn(() => ({
     toString: vi.fn(() => mockCryptoRandomBytesString),
   })),
 }));
 
-vi.mock('../../utils/events.js', () => ({
+vi.mock("../../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
 }));
 
-describe('KeychainTokenStorage', () => {
+describe("KeychainTokenStorage", () => {
   let storage: KeychainTokenStorage;
 
   beforeEach(async () => {
     vi.resetAllMocks();
     // Reset the internal state of the keychain-token-storage module
     vi.resetModules();
-    const { KeychainTokenStorage } = await import(
-      './keychain-token-storage.js'
-    );
+    const { KeychainTokenStorage } = await import("./keychain-token-storage.js");
     storage = new KeychainTokenStorage(mockServiceName);
   });
 
@@ -56,19 +54,19 @@ describe('KeychainTokenStorage', () => {
   });
 
   const validCredentials = {
-    serverName: 'test-server',
+    serverName: "test-server",
     token: {
-      accessToken: 'access-token',
-      tokenType: 'Bearer',
+      accessToken: "access-token",
+      tokenType: "Bearer",
       expiresAt: Date.now() + 3600000,
     },
     updatedAt: Date.now(),
   } as OAuthCredentials;
 
-  describe('checkKeychainAvailability', () => {
-    it('should return true if keytar is available and functional', async () => {
+  describe("checkKeychainAvailability", () => {
+    it("should return true if keytar is available and functional", async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('test');
+      mockKeytar.getPassword.mockResolvedValue("test");
       mockKeytar.deletePassword.mockResolvedValue(true);
 
       const isAvailable = await storage.checkKeychainAvailability();
@@ -76,7 +74,7 @@ describe('KeychainTokenStorage', () => {
       expect(mockKeytar.setPassword).toHaveBeenCalledWith(
         mockServiceName,
         `__keychain_test__${mockCryptoRandomBytesString}`,
-        'test',
+        "test",
       );
       expect(mockKeytar.getPassword).toHaveBeenCalledWith(
         mockServiceName,
@@ -88,24 +86,24 @@ describe('KeychainTokenStorage', () => {
       );
     });
 
-    it('should return false if keytar fails to set password', async () => {
-      const error = new Error('write error');
+    it("should return false if keytar fails to set password", async () => {
+      const error = new Error("write error");
       mockKeytar.setPassword.mockRejectedValue(error);
       const isAvailable = await storage.checkKeychainAvailability();
       expect(isAvailable).toBe(false);
     });
 
-    it('should return false if retrieved password does not match', async () => {
+    it("should return false if retrieved password does not match", async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('wrong-password');
+      mockKeytar.getPassword.mockResolvedValue("wrong-password");
       mockKeytar.deletePassword.mockResolvedValue(true);
       const isAvailable = await storage.checkKeychainAvailability();
       expect(isAvailable).toBe(false);
     });
 
-    it('should cache the availability result', async () => {
+    it("should cache the availability result", async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('test');
+      mockKeytar.getPassword.mockResolvedValue("test");
       mockKeytar.deletePassword.mockResolvedValue(true);
 
       await storage.checkKeychainAvailability();
@@ -115,324 +113,300 @@ describe('KeychainTokenStorage', () => {
     });
   });
 
-  describe('with keychain unavailable', () => {
+  describe("with keychain unavailable", () => {
     beforeEach(async () => {
       // Force keychain to be unavailable
-      mockKeytar.setPassword.mockRejectedValue(new Error('keychain error'));
+      mockKeytar.setPassword.mockRejectedValue(new Error("keychain error"));
       await storage.checkKeychainAvailability();
     });
 
-    it('getCredentials should throw', async () => {
-      await expect(storage.getCredentials('server')).rejects.toThrow(
-        'Keychain is not available',
-      );
+    it("getCredentials should throw", async () => {
+      await expect(storage.getCredentials("server")).rejects.toThrow("Keychain is not available");
     });
 
-    it('setCredentials should throw', async () => {
+    it("setCredentials should throw", async () => {
       await expect(storage.setCredentials(validCredentials)).rejects.toThrow(
-        'Keychain is not available',
+        "Keychain is not available",
       );
     });
 
-    it('deleteCredentials should throw', async () => {
-      await expect(storage.deleteCredentials('server')).rejects.toThrow(
-        'Keychain is not available',
+    it("deleteCredentials should throw", async () => {
+      await expect(storage.deleteCredentials("server")).rejects.toThrow(
+        "Keychain is not available",
       );
     });
 
-    it('listServers should throw', async () => {
-      await expect(storage.listServers()).rejects.toThrow(
-        'Keychain is not available',
-      );
+    it("listServers should throw", async () => {
+      await expect(storage.listServers()).rejects.toThrow("Keychain is not available");
     });
 
-    it('getAllCredentials should throw', async () => {
-      await expect(storage.getAllCredentials()).rejects.toThrow(
-        'Keychain is not available',
-      );
+    it("getAllCredentials should throw", async () => {
+      await expect(storage.getAllCredentials()).rejects.toThrow("Keychain is not available");
     });
   });
 
-  describe('with keychain available', () => {
+  describe("with keychain available", () => {
     beforeEach(async () => {
       mockKeytar.setPassword.mockResolvedValue(undefined);
-      mockKeytar.getPassword.mockResolvedValue('test');
+      mockKeytar.getPassword.mockResolvedValue("test");
       mockKeytar.deletePassword.mockResolvedValue(true);
       await storage.checkKeychainAvailability();
       // Reset mocks after availability check
       vi.resetAllMocks();
     });
 
-    describe('getCredentials', () => {
-      it('should return null if no credentials are found', async () => {
+    describe("getCredentials", () => {
+      it("should return null if no credentials are found", async () => {
         mockKeytar.getPassword.mockResolvedValue(null);
-        const result = await storage.getCredentials('test-server');
+        const result = await storage.getCredentials("test-server");
         expect(result).toBeNull();
-        expect(mockKeytar.getPassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'test-server',
-        );
+        expect(mockKeytar.getPassword).toHaveBeenCalledWith(mockServiceName, "test-server");
       });
 
-      it('should return credentials if found and not expired', async () => {
-        mockKeytar.getPassword.mockResolvedValue(
-          JSON.stringify(validCredentials),
-        );
-        const result = await storage.getCredentials('test-server');
+      it("should return credentials if found and not expired", async () => {
+        mockKeytar.getPassword.mockResolvedValue(JSON.stringify(validCredentials));
+        const result = await storage.getCredentials("test-server");
         expect(result).toEqual(validCredentials);
       });
 
-      it('should return null if credentials have expired', async () => {
+      it("should return null if credentials have expired", async () => {
         const expiredCreds = {
           ...validCredentials,
           token: { ...validCredentials.token, expiresAt: Date.now() - 1000 },
         };
         mockKeytar.getPassword.mockResolvedValue(JSON.stringify(expiredCreds));
-        const result = await storage.getCredentials('test-server');
+        const result = await storage.getCredentials("test-server");
         expect(result).toBeNull();
       });
 
-      it('should throw if stored data is corrupted JSON', async () => {
-        mockKeytar.getPassword.mockResolvedValue('not-json');
-        await expect(storage.getCredentials('test-server')).rejects.toThrow(
-          'Failed to parse stored credentials for test-server',
+      it("should throw if stored data is corrupted JSON", async () => {
+        mockKeytar.getPassword.mockResolvedValue("not-json");
+        await expect(storage.getCredentials("test-server")).rejects.toThrow(
+          "Failed to parse stored credentials for test-server",
         );
       });
     });
 
-    describe('setCredentials', () => {
-      it('should save credentials to keychain', async () => {
+    describe("setCredentials", () => {
+      it("should save credentials to keychain", async () => {
         vi.useFakeTimers();
         mockKeytar.setPassword.mockResolvedValue(undefined);
         await storage.setCredentials(validCredentials);
         expect(mockKeytar.setPassword).toHaveBeenCalledWith(
           mockServiceName,
-          'test-server',
+          "test-server",
           JSON.stringify({ ...validCredentials, updatedAt: Date.now() }),
         );
       });
 
-      it('should throw if saving to keychain fails', async () => {
-        mockKeytar.setPassword.mockRejectedValue(
-          new Error('keychain write error'),
-        );
+      it("should throw if saving to keychain fails", async () => {
+        mockKeytar.setPassword.mockRejectedValue(new Error("keychain write error"));
         await expect(storage.setCredentials(validCredentials)).rejects.toThrow(
-          'keychain write error',
+          "keychain write error",
         );
       });
     });
 
-    describe('deleteCredentials', () => {
-      it('should delete credentials from keychain', async () => {
+    describe("deleteCredentials", () => {
+      it("should delete credentials from keychain", async () => {
         mockKeytar.deletePassword.mockResolvedValue(true);
-        await storage.deleteCredentials('test-server');
-        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'test-server',
-        );
+        await storage.deleteCredentials("test-server");
+        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, "test-server");
       });
 
-      it('should throw if no credentials were found to delete', async () => {
+      it("should throw if no credentials were found to delete", async () => {
         mockKeytar.deletePassword.mockResolvedValue(false);
-        await expect(storage.deleteCredentials('test-server')).rejects.toThrow(
-          'No credentials found for test-server',
+        await expect(storage.deleteCredentials("test-server")).rejects.toThrow(
+          "No credentials found for test-server",
         );
       });
 
-      it('should throw if deleting from keychain fails', async () => {
-        mockKeytar.deletePassword.mockRejectedValue(
-          new Error('keychain delete error'),
-        );
-        await expect(storage.deleteCredentials('test-server')).rejects.toThrow(
-          'keychain delete error',
+      it("should throw if deleting from keychain fails", async () => {
+        mockKeytar.deletePassword.mockRejectedValue(new Error("keychain delete error"));
+        await expect(storage.deleteCredentials("test-server")).rejects.toThrow(
+          "keychain delete error",
         );
       });
     });
 
-    describe('listServers', () => {
-      it('should return a list of server names', async () => {
+    describe("listServers", () => {
+      it("should return a list of server names", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
-          { account: 'server2', password: '' },
+          { account: "server1", password: "" },
+          { account: "server2", password: "" },
         ]);
         const result = await storage.listServers();
-        expect(result).toEqual(['server1', 'server2']);
+        expect(result).toEqual(["server1", "server2"]);
       });
 
-      it('should not include internal test keys in the server list', async () => {
+      it("should not include internal test keys in the server list", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
+          { account: "server1", password: "" },
           {
             account: `__keychain_test__${mockCryptoRandomBytesString}`,
-            password: '',
+            password: "",
           },
-          { account: 'server2', password: '' },
+          { account: "server2", password: "" },
         ]);
         const result = await storage.listServers();
-        expect(result).toEqual(['server1', 'server2']);
+        expect(result).toEqual(["server1", "server2"]);
       });
 
-      it('should return an empty array on error', async () => {
-        const error = new Error('find error');
+      it("should return an empty array on error", async () => {
+        const error = new Error("find error");
         mockKeytar.findCredentials.mockRejectedValue(error);
         const result = await storage.listServers();
         expect(result).toEqual([]);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to list servers from keychain',
+          "error",
+          "Failed to list servers from keychain",
           error,
         );
       });
     });
 
-    describe('getAllCredentials', () => {
-      it('should return a map of all valid credentials and emit feedback for invalid ones', async () => {
+    describe("getAllCredentials", () => {
+      it("should return a map of all valid credentials and emit feedback for invalid ones", async () => {
         const creds2 = {
           ...validCredentials,
-          serverName: 'server2',
+          serverName: "server2",
         };
         const expiredCreds = {
           ...validCredentials,
-          serverName: 'expired-server',
+          serverName: "expired-server",
           token: { ...validCredentials.token, expiresAt: Date.now() - 1000 },
         };
         const structurallyInvalidCreds = {
-          serverName: 'invalid-server',
+          serverName: "invalid-server",
         };
 
         mockKeytar.findCredentials.mockResolvedValue([
           {
-            account: 'test-server',
+            account: "test-server",
             password: JSON.stringify(validCredentials),
           },
-          { account: 'server2', password: JSON.stringify(creds2) },
+          { account: "server2", password: JSON.stringify(creds2) },
           {
-            account: 'expired-server',
+            account: "expired-server",
             password: JSON.stringify(expiredCreds),
           },
-          { account: 'bad-server', password: 'not-json' },
+          { account: "bad-server", password: "not-json" },
           {
-            account: 'invalid-server',
+            account: "invalid-server",
             password: JSON.stringify(structurallyInvalidCreds),
           },
         ]);
 
         const result = await storage.getAllCredentials();
         expect(result.size).toBe(2);
-        expect(result.get('test-server')).toEqual(validCredentials);
-        expect(result.get('server2')).toEqual(creds2);
-        expect(result.has('expired-server')).toBe(false);
-        expect(result.has('bad-server')).toBe(false);
-        expect(result.has('invalid-server')).toBe(false);
+        expect(result.get("test-server")).toEqual(validCredentials);
+        expect(result.get("server2")).toEqual(creds2);
+        expect(result.has("expired-server")).toBe(false);
+        expect(result.has("bad-server")).toBe(false);
+        expect(result.has("invalid-server")).toBe(false);
 
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to parse credentials for bad-server',
+          "error",
+          "Failed to parse credentials for bad-server",
           expect.any(SyntaxError),
         );
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to parse credentials for invalid-server',
+          "error",
+          "Failed to parse credentials for invalid-server",
           expect.any(Error),
         );
       });
 
-      it('should emit feedback and return empty map if findCredentials fails', async () => {
-        const error = new Error('find all error');
+      it("should emit feedback and return empty map if findCredentials fails", async () => {
+        const error = new Error("find all error");
         mockKeytar.findCredentials.mockRejectedValue(error);
 
         const result = await storage.getAllCredentials();
         expect(result.size).toBe(0);
         expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-          'error',
-          'Failed to get all credentials from keychain',
+          "error",
+          "Failed to get all credentials from keychain",
           error,
         );
       });
     });
 
-    describe('clearAll', () => {
-      it('should delete all credentials for the service', async () => {
+    describe("clearAll", () => {
+      it("should delete all credentials for the service", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
-          { account: 'server2', password: '' },
+          { account: "server1", password: "" },
+          { account: "server2", password: "" },
         ]);
         mockKeytar.deletePassword.mockResolvedValue(true);
 
         await storage.clearAll();
 
         expect(mockKeytar.deletePassword).toHaveBeenCalledTimes(2);
-        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'server1',
-        );
-        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
-          mockServiceName,
-          'server2',
-        );
+        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, "server1");
+        expect(mockKeytar.deletePassword).toHaveBeenCalledWith(mockServiceName, "server2");
       });
 
-      it('should throw an aggregated error if deletions fail', async () => {
+      it("should throw an aggregated error if deletions fail", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: 'server1', password: '' },
-          { account: 'server2', password: '' },
+          { account: "server1", password: "" },
+          { account: "server2", password: "" },
         ]);
         mockKeytar.deletePassword
           .mockResolvedValueOnce(true)
-          .mockRejectedValueOnce(new Error('delete failed'));
+          .mockRejectedValueOnce(new Error("delete failed"));
 
         await expect(storage.clearAll()).rejects.toThrow(
-          'Failed to clear some credentials: delete failed',
+          "Failed to clear some credentials: delete failed",
         );
       });
     });
 
-    describe('Secrets', () => {
-      it('should set and get a secret', async () => {
+    describe("Secrets", () => {
+      it("should set and get a secret", async () => {
         mockKeytar.setPassword.mockResolvedValue(undefined);
-        mockKeytar.getPassword.mockResolvedValue('secret-value');
+        mockKeytar.getPassword.mockResolvedValue("secret-value");
 
-        await storage.setSecret('secret-key', 'secret-value');
-        const value = await storage.getSecret('secret-key');
+        await storage.setSecret("secret-key", "secret-value");
+        const value = await storage.getSecret("secret-key");
 
         expect(mockKeytar.setPassword).toHaveBeenCalledWith(
           mockServiceName,
-          '__secret__secret-key',
-          'secret-value',
+          "__secret__secret-key",
+          "secret-value",
         );
         expect(mockKeytar.getPassword).toHaveBeenCalledWith(
           mockServiceName,
-          '__secret__secret-key',
+          "__secret__secret-key",
         );
-        expect(value).toBe('secret-value');
+        expect(value).toBe("secret-value");
       });
 
-      it('should delete a secret', async () => {
+      it("should delete a secret", async () => {
         mockKeytar.deletePassword.mockResolvedValue(true);
-        await storage.deleteSecret('secret-key');
+        await storage.deleteSecret("secret-key");
         expect(mockKeytar.deletePassword).toHaveBeenCalledWith(
           mockServiceName,
-          '__secret__secret-key',
+          "__secret__secret-key",
         );
       });
 
-      it('should list secrets', async () => {
+      it("should list secrets", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: '__secret__secret1', password: '' },
-          { account: '__secret__secret2', password: '' },
-          { account: 'server1', password: '' },
+          { account: "__secret__secret1", password: "" },
+          { account: "__secret__secret2", password: "" },
+          { account: "server1", password: "" },
         ]);
         const secrets = await storage.listSecrets();
-        expect(secrets).toEqual(['secret1', 'secret2']);
+        expect(secrets).toEqual(["secret1", "secret2"]);
       });
 
-      it('should not list secrets in listServers', async () => {
+      it("should not list secrets in listServers", async () => {
         mockKeytar.findCredentials.mockResolvedValue([
-          { account: '__secret__secret1', password: '' },
-          { account: 'server1', password: '' },
+          { account: "__secret__secret1", password: "" },
+          { account: "server1", password: "" },
         ]);
         const servers = await storage.listServers();
-        expect(servers).toEqual(['server1']);
+        expect(servers).toEqual(["server1"]);
       });
     });
   });
diff --git a/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.ts b/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.ts
index b8ea7b689..09e8af616 100644
--- a/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.ts
+++ b/packages/gemini-core/src/mcp/token-storage/keychain-token-storage.ts
@@ -4,31 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as crypto from 'node:crypto';
-import { BaseTokenStorage } from './base-token-storage.js';
-import type { OAuthCredentials, SecretStorage } from './types.js';
-import { coreEvents } from '../../utils/events.js';
+import * as crypto from "node:crypto";
+import { coreEvents } from "../../utils/events.js";
+import { BaseTokenStorage } from "./base-token-storage.js";
+import type { OAuthCredentials, SecretStorage } from "./types.js";
 
 interface Keytar {
   getPassword(service: string, account: string): Promise<string | null>;
-  setPassword(
-    service: string,
-    account: string,
-    password: string,
-  ): Promise<void>;
+  setPassword(service: string, account: string, password: string): Promise<void>;
   deletePassword(service: string, account: string): Promise<boolean>;
-  findCredentials(
-    service: string,
-  ): Promise<Array<{ account: string; password: string }>>;
+  findCredentials(service: string): Promise<Array<{ account: string; password: string }>>;
 }
 
-const KEYCHAIN_TEST_PREFIX = '__keychain_test__';
-const SECRET_PREFIX = '__secret__';
+const KEYCHAIN_TEST_PREFIX = "__keychain_test__";
+const SECRET_PREFIX = "__secret__";
 
-export class KeychainTokenStorage
-  extends BaseTokenStorage
-  implements SecretStorage
-{
+export class KeychainTokenStorage extends BaseTokenStorage implements SecretStorage {
   private keychainAvailable: boolean | null = null;
   private keytarModule: Keytar | null = null;
   private keytarLoadAttempted = false;
@@ -43,7 +34,7 @@ export class KeychainTokenStorage
 
     try {
       // Try to import keytar without any timeout - let the OS handle it
-      const moduleName = 'keytar';
+      const moduleName = "keytar";
       const module = await import(moduleName);
       this.keytarModule = module.default || module;
     } catch (_) {
@@ -54,12 +45,12 @@ export class KeychainTokenStorage
 
   async getCredentials(serverName: string): Promise<OAuthCredentials | null> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     try {
@@ -87,12 +78,12 @@ export class KeychainTokenStorage
 
   async setCredentials(credentials: OAuthCredentials): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     this.validateCredentials(credentials);
@@ -109,19 +100,16 @@ export class KeychainTokenStorage
 
   async deleteCredentials(serverName: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     const sanitizedName = this.sanitizeServerName(serverName);
-    const deleted = await keytar.deletePassword(
-      this.serviceName,
-      sanitizedName,
-    );
+    const deleted = await keytar.deletePassword(this.serviceName, sanitizedName);
 
     if (!deleted) {
       throw new Error(`No credentials found for ${serverName}`);
@@ -130,12 +118,12 @@ export class KeychainTokenStorage
 
   async listServers(): Promise<string[]> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     try {
@@ -148,33 +136,25 @@ export class KeychainTokenStorage
         )
         .map((cred: { account: string }) => cred.account);
     } catch (error) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to list servers from keychain',
-        error,
-      );
+      coreEvents.emitFeedback("error", "Failed to list servers from keychain", error);
       return [];
     }
   }
 
   async getAllCredentials(): Promise<Map<string, OAuthCredentials>> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
 
     const result = new Map<string, OAuthCredentials>();
     try {
-      const credentials = (
-        await keytar.findCredentials(this.serviceName)
-      ).filter(
-        (c) =>
-          !c.account.startsWith(KEYCHAIN_TEST_PREFIX) &&
-          !c.account.startsWith(SECRET_PREFIX),
+      const credentials = (await keytar.findCredentials(this.serviceName)).filter(
+        (c) => !c.account.startsWith(KEYCHAIN_TEST_PREFIX) && !c.account.startsWith(SECRET_PREFIX),
       );
 
       for (const cred of credentials) {
@@ -185,18 +165,14 @@ export class KeychainTokenStorage
           }
         } catch (error) {
           coreEvents.emitFeedback(
-            'error',
+            "error",
             `Failed to parse credentials for ${cred.account}`,
             error,
           );
         }
       }
     } catch (error) {
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to get all credentials from keychain',
-        error,
-      );
+      coreEvents.emitFeedback("error", "Failed to get all credentials from keychain", error);
     }
 
     return result;
@@ -204,7 +180,7 @@ export class KeychainTokenStorage
 
   async clearAll(): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
 
     const servers = this.keytarModule
@@ -212,9 +188,7 @@ export class KeychainTokenStorage
           .findCredentials(this.serviceName)
           .then((creds) => creds.map((c) => c.account))
           .catch((error: Error) => {
-            throw new Error(
-              `Failed to list servers for clearing: ${error.message}`,
-            );
+            throw new Error(`Failed to list servers for clearing: ${error.message}`);
           })
       : [];
     const errors: Error[] = [];
@@ -229,7 +203,7 @@ export class KeychainTokenStorage
 
     if (errors.length > 0) {
       throw new Error(
-        `Failed to clear some credentials: ${errors.map((e) => e.message).join(', ')}`,
+        `Failed to clear some credentials: ${errors.map((e) => e.message).join(", ")}`,
       );
     }
   }
@@ -248,15 +222,12 @@ export class KeychainTokenStorage
         return false;
       }
 
-      const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto.randomBytes(8).toString('hex')}`;
-      const testPassword = 'test';
+      const testAccount = `${KEYCHAIN_TEST_PREFIX}${crypto.randomBytes(8).toString("hex")}`;
+      const testPassword = "test";
 
       await keytar.setPassword(this.serviceName, testAccount, testPassword);
       const retrieved = await keytar.getPassword(this.serviceName, testAccount);
-      const deleted = await keytar.deletePassword(
-        this.serviceName,
-        testAccount,
-      );
+      const deleted = await keytar.deletePassword(this.serviceName, testAccount);
 
       const success = deleted && retrieved === testPassword;
       this.keychainAvailable = success;
@@ -273,38 +244,35 @@ export class KeychainTokenStorage
 
   async setSecret(key: string, value: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     await keytar.setPassword(this.serviceName, `${SECRET_PREFIX}${key}`, value);
   }
 
   async getSecret(key: string): Promise<string | null> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     return keytar.getPassword(this.serviceName, `${SECRET_PREFIX}${key}`);
   }
 
   async deleteSecret(key: string): Promise<void> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
-    const deleted = await keytar.deletePassword(
-      this.serviceName,
-      `${SECRET_PREFIX}${key}`,
-    );
+    const deleted = await keytar.deletePassword(this.serviceName, `${SECRET_PREFIX}${key}`);
     if (!deleted) {
       throw new Error(`No secret found for key: ${key}`);
     }
@@ -312,11 +280,11 @@ export class KeychainTokenStorage
 
   async listSecrets(): Promise<string[]> {
     if (!(await this.checkKeychainAvailability())) {
-      throw new Error('Keychain is not available');
+      throw new Error("Keychain is not available");
     }
     const keytar = await this.getKeytar();
     if (!keytar) {
-      throw new Error('Keytar module not available');
+      throw new Error("Keytar module not available");
     }
     try {
       const credentials = await keytar.findCredentials(this.serviceName);
@@ -324,7 +292,7 @@ export class KeychainTokenStorage
         .filter((cred) => cred.account.startsWith(SECRET_PREFIX))
         .map((cred) => cred.account.substring(SECRET_PREFIX.length));
     } catch (error) {
-      console.error('Failed to list secrets from keychain:', error);
+      console.error("Failed to list secrets from keychain:", error);
       return [];
     }
   }
diff --git a/packages/gemini-core/src/mcp/token-storage/types.ts b/packages/gemini-core/src/mcp/token-storage/types.ts
index b167e821d..0ec278d55 100644
--- a/packages/gemini-core/src/mcp/token-storage/types.ts
+++ b/packages/gemini-core/src/mcp/token-storage/types.ts
@@ -44,6 +44,6 @@ export interface SecretStorage {
 }
 
 export enum TokenStorageType {
-  KEYCHAIN = 'keychain',
-  ENCRYPTED_FILE = 'encrypted_file',
+  KEYCHAIN = "keychain",
+  ENCRYPTED_FILE = "encrypted_file",
 }
diff --git a/packages/gemini-core/src/mocks/msw.ts b/packages/gemini-core/src/mocks/msw.ts
index 4bf93138e..1a3d38f52 100644
--- a/packages/gemini-core/src/mocks/msw.ts
+++ b/packages/gemini-core/src/mocks/msw.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { setupServer } from 'msw/node';
+import { setupServer } from "msw/node";
 
 export const server = setupServer();
diff --git a/packages/gemini-core/src/output/json-formatter.test.ts b/packages/gemini-core/src/output/json-formatter.test.ts
index 587030a98..254c63879 100644
--- a/packages/gemini-core/src/output/json-formatter.test.ts
+++ b/packages/gemini-core/src/output/json-formatter.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { expect, describe, it } from 'vitest';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
-import { JsonFormatter } from './json-formatter.js';
-import type { JsonError } from './types.js';
+import { describe, expect, it } from "vitest";
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import { JsonFormatter } from "./json-formatter.js";
+import type { JsonError } from "./types.js";
 
-describe('JsonFormatter', () => {
-  it('should format the response as JSON', () => {
+describe("JsonFormatter", () => {
+  it("should format the response as JSON", () => {
     const formatter = new JsonFormatter();
-    const response = 'This is a test response.';
+    const response = "This is a test response.";
     const formatted = formatter.format(response);
     const expected = {
       response,
@@ -20,39 +20,37 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should strip ANSI escape sequences from response text', () => {
+  it("should strip ANSI escape sequences from response text", () => {
     const formatter = new JsonFormatter();
-    const responseWithAnsi =
-      '\x1B[31mRed text\x1B[0m and \x1B[32mGreen text\x1B[0m';
+    const responseWithAnsi = "\x1B[31mRed text\x1B[0m and \x1B[32mGreen text\x1B[0m";
     const formatted = formatter.format(responseWithAnsi);
     const parsed = JSON.parse(formatted);
-    expect(parsed.response).toBe('Red text and Green text');
+    expect(parsed.response).toBe("Red text and Green text");
   });
 
-  it('should strip control characters from response text', () => {
+  it("should strip control characters from response text", () => {
     const formatter = new JsonFormatter();
-    const responseWithControlChars =
-      'Text with\x07 bell\x08 and\x0B vertical tab';
+    const responseWithControlChars = "Text with\x07 bell\x08 and\x0B vertical tab";
     const formatted = formatter.format(responseWithControlChars);
     const parsed = JSON.parse(formatted);
     // Only ANSI codes are stripped, other control chars are preserved
-    expect(parsed.response).toBe('Text with\x07 bell\x08 and\x0B vertical tab');
+    expect(parsed.response).toBe("Text with\x07 bell\x08 and\x0B vertical tab");
   });
 
-  it('should preserve newlines and tabs in response text', () => {
+  it("should preserve newlines and tabs in response text", () => {
     const formatter = new JsonFormatter();
-    const responseWithWhitespace = 'Line 1\nLine 2\r\nLine 3\twith tab';
+    const responseWithWhitespace = "Line 1\nLine 2\r\nLine 3\twith tab";
     const formatted = formatter.format(responseWithWhitespace);
     const parsed = JSON.parse(formatted);
-    expect(parsed.response).toBe('Line 1\nLine 2\r\nLine 3\twith tab');
+    expect(parsed.response).toBe("Line 1\nLine 2\r\nLine 3\twith tab");
   });
 
-  it('should format the response as JSON with stats', () => {
+  it("should format the response as JSON with stats", () => {
     const formatter = new JsonFormatter();
-    const response = 'This is a test response.';
+    const response = "This is a test response.";
     const stats: SessionMetrics = {
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: {
             totalRequests: 2,
             totalErrors: 0,
@@ -67,7 +65,7 @@ describe('JsonFormatter', () => {
             tool: 0,
           },
         },
-        'gemini-2.5-flash': {
+        "gemini-2.5-flash": {
           api: {
             totalRequests: 2,
             totalErrors: 0,
@@ -122,11 +120,11 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should format error as JSON', () => {
+  it("should format error as JSON", () => {
     const formatter = new JsonFormatter();
     const error: JsonError = {
-      type: 'ValidationError',
-      message: 'Invalid input provided',
+      type: "ValidationError",
+      message: "Invalid input provided",
       code: 400,
     };
     const formatted = formatter.format(undefined, undefined, error);
@@ -136,13 +134,13 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should format response with error as JSON', () => {
+  it("should format response with error as JSON", () => {
     const formatter = new JsonFormatter();
-    const response = 'Partial response';
+    const response = "Partial response";
     const error: JsonError = {
-      type: 'TimeoutError',
-      message: 'Request timed out',
-      code: 'TIMEOUT',
+      type: "TimeoutError",
+      message: "Request timed out",
+      code: "TIMEOUT",
     };
     const formatted = formatter.format(response, undefined, error);
     const expected = {
@@ -152,45 +150,45 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should format error using formatError method', () => {
+  it("should format error using formatError method", () => {
     const formatter = new JsonFormatter();
-    const error = new Error('Something went wrong');
+    const error = new Error("Something went wrong");
     const formatted = formatter.formatError(error, 500);
     const parsed = JSON.parse(formatted);
 
     expect(parsed).toEqual({
       error: {
-        type: 'Error',
-        message: 'Something went wrong',
+        type: "Error",
+        message: "Something went wrong",
         code: 500,
       },
     });
   });
 
-  it('should format custom error using formatError method', () => {
+  it("should format custom error using formatError method", () => {
     class CustomError extends Error {
       constructor(message: string) {
         super(message);
-        this.name = 'CustomError';
+        this.name = "CustomError";
       }
     }
 
     const formatter = new JsonFormatter();
-    const error = new CustomError('Custom error occurred');
+    const error = new CustomError("Custom error occurred");
     const formatted = formatter.formatError(error);
     const parsed = JSON.parse(formatted);
 
     expect(parsed).toEqual({
       error: {
-        type: 'CustomError',
-        message: 'Custom error occurred',
+        type: "CustomError",
+        message: "Custom error occurred",
       },
     });
   });
 
-  it('should format complete JSON output with response, stats, and error', () => {
+  it("should format complete JSON output with response, stats, and error", () => {
     const formatter = new JsonFormatter();
-    const response = 'Partial response before error';
+    const response = "Partial response before error";
     const stats: SessionMetrics = {
       models: {},
       tools: {
@@ -212,8 +210,8 @@ describe('JsonFormatter', () => {
       },
     };
     const error: JsonError = {
-      type: 'ApiError',
-      message: 'Rate limit exceeded',
+      type: "ApiError",
+      message: "Rate limit exceeded",
       code: 429,
     };
 
@@ -226,19 +224,17 @@ describe('JsonFormatter', () => {
     expect(JSON.parse(formatted)).toEqual(expected);
   });
 
-  it('should handle error messages containing JSON content', () => {
+  it("should handle error messages containing JSON content", () => {
     const formatter = new JsonFormatter();
-    const errorWithJson = new Error(
-      'API returned: {"error": "Invalid request", "code": 400}',
-    );
-    const formatted = formatter.formatError(errorWithJson, 'API_ERROR');
+    const errorWithJson = new Error('API returned: {"error": "Invalid request", "code": 400}');
+    const formatted = formatter.formatError(errorWithJson, "API_ERROR");
     const parsed = JSON.parse(formatted);
 
     expect(parsed).toEqual({
       error: {
-        type: 'Error',
+        type: "Error",
         message: 'API returned: {"error": "Invalid request", "code": 400}',
-        code: 'API_ERROR',
+        code: "API_ERROR",
       },
     });
 
@@ -246,7 +242,7 @@ describe('JsonFormatter', () => {
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should handle error messages with quotes and special characters', () => {
+  it("should handle error messages with quotes and special characters", () => {
     const formatter = new JsonFormatter();
     const errorWithQuotes = new Error('Error: "quoted text" and \\backslash');
     const formatted = formatter.formatError(errorWithQuotes);
@@ -254,7 +250,7 @@ describe('JsonFormatter', () => {
 
     expect(parsed).toEqual({
       error: {
-        type: 'Error',
+        type: "Error",
         message: 'Error: "quoted text" and \\backslash',
       },
     });
@@ -263,39 +259,37 @@ describe('JsonFormatter', () => {
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should handle error messages with control characters', () => {
+  it("should handle error messages with control characters", () => {
     const formatter = new JsonFormatter();
-    const errorWithControlChars = new Error('Error with\n newline and\t tab');
+    const errorWithControlChars = new Error("Error with\n newline and\t tab");
     const formatted = formatter.formatError(errorWithControlChars);
     const parsed = JSON.parse(formatted);
 
     // Should preserve newlines and tabs as they are common whitespace characters
-    expect(parsed.error.message).toBe('Error with\n newline and\t tab');
+    expect(parsed.error.message).toBe("Error with\n newline and\t tab");
 
     // Verify the entire output is valid JSON
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should strip ANSI escape sequences from error messages', () => {
+  it("should strip ANSI escape sequences from error messages", () => {
     const formatter = new JsonFormatter();
-    const errorWithAnsi = new Error('\x1B[31mRed error\x1B[0m message');
+    const errorWithAnsi = new Error("\x1B[31mRed error\x1B[0m message");
     const formatted = formatter.formatError(errorWithAnsi);
     const parsed = JSON.parse(formatted);
 
-    expect(parsed.error.message).toBe('Red error message');
+    expect(parsed.error.message).toBe("Red error message");
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 
-  it('should strip unsafe control characters from error messages', () => {
+  it("should strip unsafe control characters from error messages", () => {
     const formatter = new JsonFormatter();
-    const errorWithControlChars = new Error(
-      'Error\x07 with\x08 control\x0B chars',
-    );
+    const errorWithControlChars = new Error("Error\x07 with\x08 control\x0B chars");
     const formatted = formatter.formatError(errorWithControlChars);
     const parsed = JSON.parse(formatted);
 
     // Only ANSI codes are stripped, other control chars are preserved
-    expect(parsed.error.message).toBe('Error\x07 with\x08 control\x0B chars');
+    expect(parsed.error.message).toBe("Error\x07 with\x08 control\x0B chars");
     expect(() => JSON.parse(formatted)).not.toThrow();
   });
 });
diff --git a/packages/gemini-core/src/output/json-formatter.ts b/packages/gemini-core/src/output/json-formatter.ts
index 83ea3e386..1229fd08e 100644
--- a/packages/gemini-core/src/output/json-formatter.ts
+++ b/packages/gemini-core/src/output/json-formatter.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
-import type { JsonError, JsonOutput } from './types.js';
+import stripAnsi from "strip-ansi";
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import type { JsonError, JsonOutput } from "./types.js";
 
 export class JsonFormatter {
   format(response?: string, stats?: SessionMetrics, error?: JsonError): string {
diff --git a/packages/gemini-core/src/output/stream-json-formatter.test.ts b/packages/gemini-core/src/output/stream-json-formatter.test.ts
index 6e9d3c792..1181909e9 100644
--- a/packages/gemini-core/src/output/stream-json-formatter.test.ts
+++ b/packages/gemini-core/src/output/stream-json-formatter.test.ts
@@ -4,148 +4,146 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { StreamJsonFormatter } from './stream-json-formatter.js';
-import { JsonStreamEventType } from './types.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ToolCallDecision } from "../telemetry/tool-call-decision.js";
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import { StreamJsonFormatter } from "./stream-json-formatter.js";
 import type {
+  ErrorEvent,
   InitEvent,
   MessageEvent,
-  ToolUseEvent,
-  ToolResultEvent,
-  ErrorEvent,
   ResultEvent,
-} from './types.js';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
-import { ToolCallDecision } from '../telemetry/tool-call-decision.js';
+  ToolResultEvent,
+  ToolUseEvent,
+} from "./types.js";
+import { JsonStreamEventType } from "./types.js";
 
-describe('StreamJsonFormatter', () => {
+describe("StreamJsonFormatter", () => {
   let formatter: StreamJsonFormatter;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let stdoutWriteSpy: any;
 
   beforeEach(() => {
     formatter = new StreamJsonFormatter();
-    stdoutWriteSpy = vi
-      .spyOn(process.stdout, 'write')
-      .mockImplementation(() => true);
+    stdoutWriteSpy = vi.spyOn(process.stdout, "write").mockImplementation(() => true);
   });
 
   afterEach(() => {
     stdoutWriteSpy.mockRestore();
   });
 
-  describe('formatEvent', () => {
-    it('should format init event as JSONL', () => {
+  describe("formatEvent", () => {
+    it("should format init event as JSONL", () => {
       const event: InitEvent = {
         type: JsonStreamEventType.INIT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        session_id: 'test-session-123',
-        model: 'gemini-2.0-flash-exp',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        session_id: "test-session-123",
+        model: "gemini-2.0-flash-exp",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format user message event', () => {
+    it("should format user message event", () => {
       const event: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        role: 'user',
-        content: 'What is 2+2?',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        role: "user",
+        content: "What is 2+2?",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format assistant message event with delta', () => {
+    it("should format assistant message event with delta", () => {
       const event: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        role: 'assistant',
-        content: '4',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        role: "assistant",
+        content: "4",
         delta: true,
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       const parsed = JSON.parse(result.trim());
       expect(parsed.delta).toBe(true);
     });
 
-    it('should format tool_use event', () => {
+    it("should format tool_use event", () => {
       const event: ToolUseEvent = {
         type: JsonStreamEventType.TOOL_USE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        tool_name: 'Read',
-        tool_id: 'read-123',
-        parameters: { file_path: '/path/to/file.txt' },
+        timestamp: "2025-10-10T12:00:00.000Z",
+        tool_name: "Read",
+        tool_id: "read-123",
+        parameters: { file_path: "/path/to/file.txt" },
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format tool_result event (success)', () => {
+    it("should format tool_result event (success)", () => {
       const event: ToolResultEvent = {
         type: JsonStreamEventType.TOOL_RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        tool_id: 'read-123',
-        status: 'success',
-        output: 'File contents here',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        tool_id: "read-123",
+        status: "success",
+        output: "File contents here",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format tool_result event (error)', () => {
+    it("should format tool_result event (error)", () => {
       const event: ToolResultEvent = {
         type: JsonStreamEventType.TOOL_RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        tool_id: 'read-123',
-        status: 'error',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        tool_id: "read-123",
+        status: "error",
         error: {
-          type: 'FILE_NOT_FOUND',
-          message: 'File not found',
+          type: "FILE_NOT_FOUND",
+          message: "File not found",
         },
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format error event', () => {
+    it("should format error event", () => {
       const event: ErrorEvent = {
         type: JsonStreamEventType.ERROR,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        severity: 'warning',
-        message: 'Loop detected, stopping execution',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        severity: "warning",
+        message: "Loop detected, stopping execution",
       };
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format result event with success status', () => {
+    it("should format result event with success status", () => {
       const event: ResultEvent = {
         type: JsonStreamEventType.RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        status: 'success',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        status: "success",
         stats: {
           total_tokens: 100,
           input_tokens: 50,
@@ -157,18 +155,18 @@ describe('StreamJsonFormatter', () => {
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should format result event with error status', () => {
+    it("should format result event with error status", () => {
       const event: ResultEvent = {
         type: JsonStreamEventType.RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        status: 'error',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        status: "error",
         error: {
-          type: 'MaxSessionTurnsError',
-          message: 'Maximum session turns exceeded',
+          type: "MaxSessionTurnsError",
+          message: "Maximum session turns exceeded",
         },
         stats: {
           total_tokens: 100,
@@ -181,76 +179,70 @@ describe('StreamJsonFormatter', () => {
 
       const result = formatter.formatEvent(event);
 
-      expect(result).toBe(JSON.stringify(event) + '\n');
+      expect(result).toBe(JSON.stringify(event) + "\n");
       expect(JSON.parse(result.trim())).toEqual(event);
     });
 
-    it('should produce minified JSON without pretty-printing', () => {
+    it("should produce minified JSON without pretty-printing", () => {
       const event: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        role: 'user',
-        content: 'Test',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        role: "user",
+        content: "Test",
       };
 
       const result = formatter.formatEvent(event);
 
       // Should not contain multiple spaces or newlines (except trailing)
-      expect(result).not.toContain('  ');
-      expect(result.split('\n').length).toBe(2); // JSON + trailing newline
+      expect(result).not.toContain("  ");
+      expect(result.split("\n").length).toBe(2); // JSON + trailing newline
     });
   });
 
-  describe('emitEvent', () => {
-    it('should write formatted event to stdout', () => {
+  describe("emitEvent", () => {
+    it("should write formatted event to stdout", () => {
       const event: InitEvent = {
         type: JsonStreamEventType.INIT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        session_id: 'test-session',
-        model: 'gemini-2.0-flash-exp',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        session_id: "test-session",
+        model: "gemini-2.0-flash-exp",
       };
 
       formatter.emitEvent(event);
 
       expect(stdoutWriteSpy).toHaveBeenCalledTimes(1);
-      expect(stdoutWriteSpy).toHaveBeenCalledWith(JSON.stringify(event) + '\n');
+      expect(stdoutWriteSpy).toHaveBeenCalledWith(JSON.stringify(event) + "\n");
     });
 
-    it('should emit multiple events sequentially', () => {
+    it("should emit multiple events sequentially", () => {
       const event1: InitEvent = {
         type: JsonStreamEventType.INIT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        session_id: 'test-session',
-        model: 'gemini-2.0-flash-exp',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        session_id: "test-session",
+        model: "gemini-2.0-flash-exp",
       };
 
       const event2: MessageEvent = {
         type: JsonStreamEventType.MESSAGE,
-        timestamp: '2025-10-10T12:00:01.000Z',
-        role: 'user',
-        content: 'Hello',
+        timestamp: "2025-10-10T12:00:01.000Z",
+        role: "user",
+        content: "Hello",
       };
 
       formatter.emitEvent(event1);
       formatter.emitEvent(event2);
 
       expect(stdoutWriteSpy).toHaveBeenCalledTimes(2);
-      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(
-        1,
-        JSON.stringify(event1) + '\n',
-      );
-      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(
-        2,
-        JSON.stringify(event2) + '\n',
-      );
+      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(1, JSON.stringify(event1) + "\n");
+      expect(stdoutWriteSpy).toHaveBeenNthCalledWith(2, JSON.stringify(event2) + "\n");
     });
   });
 
-  describe('convertToStreamStats', () => {
-    it('should aggregate token counts from single model', () => {
+  describe("convertToStreamStats", () => {
+    it("should aggregate token counts from single model", () => {
       const metrics: SessionMetrics = {
         models: {
-          'gemini-2.0-flash': {
+          "gemini-2.0-flash": {
             api: {
               totalRequests: 1,
               totalErrors: 0,
@@ -296,10 +288,10 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should aggregate token counts from multiple models', () => {
+    it("should aggregate token counts from multiple models", () => {
       const metrics: SessionMetrics = {
         models: {
-          'gemini-2.0-flash': {
+          "gemini-2.0-flash": {
             api: {
               totalRequests: 1,
               totalErrors: 0,
@@ -314,7 +306,7 @@ describe('StreamJsonFormatter', () => {
               tool: 0,
             },
           },
-          'gemini-1.5-pro': {
+          "gemini-1.5-pro": {
             api: {
               totalRequests: 1,
               totalErrors: 0,
@@ -360,7 +352,7 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should handle empty metrics', () => {
+    it("should handle empty metrics", () => {
       const metrics: SessionMetrics = {
         models: {},
         tools: {
@@ -393,7 +385,7 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should use session-level tool calls count', () => {
+    it("should use session-level tool calls count", () => {
       const metrics: SessionMetrics = {
         models: {},
         tools: {
@@ -445,7 +437,7 @@ describe('StreamJsonFormatter', () => {
       expect(result.tool_calls).toBe(3);
     });
 
-    it('should pass through duration unchanged', () => {
+    it("should pass through duration unchanged", () => {
       const metrics: SessionMetrics = {
         models: {},
         tools: {
@@ -473,44 +465,44 @@ describe('StreamJsonFormatter', () => {
     });
   });
 
-  describe('JSON validity', () => {
-    it('should produce valid JSON for all event types', () => {
+  describe("JSON validity", () => {
+    it("should produce valid JSON for all event types", () => {
       const events = [
         {
           type: JsonStreamEventType.INIT,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          session_id: 'test',
-          model: 'gemini-2.0-flash',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          session_id: "test",
+          model: "gemini-2.0-flash",
         } as InitEvent,
         {
           type: JsonStreamEventType.MESSAGE,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          role: 'user',
-          content: 'Test',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          role: "user",
+          content: "Test",
         } as MessageEvent,
         {
           type: JsonStreamEventType.TOOL_USE,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          tool_name: 'Read',
-          tool_id: 'read-1',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          tool_name: "Read",
+          tool_id: "read-1",
           parameters: {},
         } as ToolUseEvent,
         {
           type: JsonStreamEventType.TOOL_RESULT,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          tool_id: 'read-1',
-          status: 'success',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          tool_id: "read-1",
+          status: "success",
         } as ToolResultEvent,
         {
           type: JsonStreamEventType.ERROR,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          severity: 'error',
-          message: 'Test error',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          severity: "error",
+          message: "Test error",
         } as ErrorEvent,
         {
           type: JsonStreamEventType.RESULT,
-          timestamp: '2025-10-10T12:00:00.000Z',
-          status: 'success',
+          timestamp: "2025-10-10T12:00:00.000Z",
+          status: "success",
           stats: {
             total_tokens: 0,
             input_tokens: 0,
@@ -527,11 +519,11 @@ describe('StreamJsonFormatter', () => {
       });
     });
 
-    it('should preserve field types', () => {
+    it("should preserve field types", () => {
       const event: ResultEvent = {
         type: JsonStreamEventType.RESULT,
-        timestamp: '2025-10-10T12:00:00.000Z',
-        status: 'success',
+        timestamp: "2025-10-10T12:00:00.000Z",
+        status: "success",
         stats: {
           total_tokens: 100,
           input_tokens: 50,
@@ -544,11 +536,11 @@ describe('StreamJsonFormatter', () => {
       const formatted = formatter.formatEvent(event);
       const parsed = JSON.parse(formatted.trim());
 
-      expect(typeof parsed.stats.total_tokens).toBe('number');
-      expect(typeof parsed.stats.input_tokens).toBe('number');
-      expect(typeof parsed.stats.output_tokens).toBe('number');
-      expect(typeof parsed.stats.duration_ms).toBe('number');
-      expect(typeof parsed.stats.tool_calls).toBe('number');
+      expect(typeof parsed.stats.total_tokens).toBe("number");
+      expect(typeof parsed.stats.input_tokens).toBe("number");
+      expect(typeof parsed.stats.output_tokens).toBe("number");
+      expect(typeof parsed.stats.duration_ms).toBe("number");
+      expect(typeof parsed.stats.tool_calls).toBe("number");
     });
   });
 });
diff --git a/packages/gemini-core/src/output/stream-json-formatter.ts b/packages/gemini-core/src/output/stream-json-formatter.ts
index b42177b7f..cdf4c3fd5 100644
--- a/packages/gemini-core/src/output/stream-json-formatter.ts
+++ b/packages/gemini-core/src/output/stream-json-formatter.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { JsonStreamEvent, StreamStats } from './types.js';
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
+import type { JsonStreamEvent, StreamStats } from "./types.js";
 
 /**
  * Formatter for streaming JSON output.
@@ -18,7 +18,7 @@ export class StreamJsonFormatter {
    * @returns JSON string with trailing newline
    */
   formatEvent(event: JsonStreamEvent): string {
-    return JSON.stringify(event) + '\n';
+    return JSON.stringify(event) + "\n";
   }
 
   /**
@@ -36,10 +36,7 @@ export class StreamJsonFormatter {
    * @param durationMs - The session duration in milliseconds
    * @returns Simplified stats for streaming output
    */
-  convertToStreamStats(
-    metrics: SessionMetrics,
-    durationMs: number,
-  ): StreamStats {
+  convertToStreamStats(metrics: SessionMetrics, durationMs: number): StreamStats {
     let totalTokens = 0;
     let inputTokens = 0;
     let outputTokens = 0;
diff --git a/packages/gemini-core/src/output/types.ts b/packages/gemini-core/src/output/types.ts
index 044835425..8c438aae0 100644
--- a/packages/gemini-core/src/output/types.ts
+++ b/packages/gemini-core/src/output/types.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SessionMetrics } from '../telemetry/uiTelemetry.js';
+import type { SessionMetrics } from "../telemetry/uiTelemetry.js";
 
 export enum OutputFormat {
-  TEXT = 'text',
-  JSON = 'json',
-  STREAM_JSON = 'stream-json',
+  TEXT = "text",
+  JSON = "json",
+  STREAM_JSON = "stream-json",
 }
 
 export interface JsonError {
@@ -26,12 +26,12 @@ export interface JsonOutput {
 
 // Streaming JSON event types
 export enum JsonStreamEventType {
-  INIT = 'init',
-  MESSAGE = 'message',
-  TOOL_USE = 'tool_use',
-  TOOL_RESULT = 'tool_result',
-  ERROR = 'error',
-  RESULT = 'result',
+  INIT = "init",
+  MESSAGE = "message",
+  TOOL_USE = "tool_use",
+  TOOL_RESULT = "tool_result",
+  ERROR = "error",
+  RESULT = "result",
 }
 
 export interface BaseJsonStreamEvent {
@@ -47,7 +47,7 @@ export interface InitEvent extends BaseJsonStreamEvent {
 
 export interface MessageEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.MESSAGE;
-  role: 'user' | 'assistant';
+  role: "user" | "assistant";
   content: string;
   delta?: boolean;
 }
@@ -62,7 +62,7 @@ export interface ToolUseEvent extends BaseJsonStreamEvent {
 export interface ToolResultEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.TOOL_RESULT;
   tool_id: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
   output?: string;
   error?: {
     type: string;
@@ -72,7 +72,7 @@ export interface ToolResultEvent extends BaseJsonStreamEvent {
 
 export interface ErrorEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.ERROR;
-  severity: 'warning' | 'error';
+  severity: "warning" | "error";
   message: string;
 }
 
@@ -86,7 +86,7 @@ export interface StreamStats {
 
 export interface ResultEvent extends BaseJsonStreamEvent {
   type: JsonStreamEventType.RESULT;
-  status: 'success' | 'error';
+  status: "success" | "error";
   error?: {
     type: string;
     message: string;
diff --git a/packages/gemini-core/src/policy/config.test.ts b/packages/gemini-core/src/policy/config.test.ts
index 460087639..99fb7569f 100644
--- a/packages/gemini-core/src/policy/config.test.ts
+++ b/packages/gemini-core/src/policy/config.test.ts
@@ -4,59 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
-
-import nodePath from 'node:path';
-
-import type { PolicySettings } from './types.js';
-import { ApprovalMode, PolicyDecision } from './types.js';
-
-import { Storage } from '../config/storage.js';
+import nodePath from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Storage } from "../config/storage.js";
+import type { PolicySettings } from "./types.js";
+import { ApprovalMode, PolicyDecision } from "./types.js";
 
 afterEach(() => {
   vi.clearAllMocks();
   vi.restoreAllMocks();
-  vi.doUnmock('node:fs/promises');
+  vi.doUnmock("node:fs/promises");
 });
 
-describe('createPolicyEngineConfig', () => {
+describe("createPolicyEngineConfig", () => {
   beforeEach(() => {
     // Mock Storage to avoid picking up real user/system policies from the host environment
-    vi.spyOn(Storage, 'getUserPoliciesDir').mockReturnValue(
-      '/non/existent/user/policies',
-    );
-    vi.spyOn(Storage, 'getSystemPoliciesDir').mockReturnValue(
-      '/non/existent/system/policies',
-    );
+    vi.spyOn(Storage, "getUserPoliciesDir").mockReturnValue("/non/existent/user/policies");
+    vi.spyOn(Storage, "getSystemPoliciesDir").mockReturnValue("/non/existent/system/policies");
   });
-  it('should return ASK_USER for write tools and ALLOW for read-only tools by default', async () => {
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+  it("should return ASK_USER for write tools and ALLOW for read-only tools by default", async () => {
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
     const mockReaddir = vi.fn(
-      async (
-        path: string | Buffer | URL,
-        options?: Parameters<typeof actualFs.readdir>[1],
-      ) => {
+      async (path: string | Buffer | URL, options?: Parameters<typeof actualFs.readdir>[1]) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies"))
         ) {
           // Return empty array for user policies
           return [] as unknown as Awaited<ReturnType<typeof actualFs.readdir>>;
         }
-        return actualFs.readdir(
-          path,
-          options as Parameters<typeof actualFs.readdir>[1],
-        );
+        return actualFs.readdir(path, options as Parameters<typeof actualFs.readdir>[1]);
       },
     );
 
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readdir: mockReaddir },
       readdir: mockReaddir,
@@ -67,20 +49,18 @@ describe('createPolicyEngineConfig', () => {
     // Let's see if we need to mock Storage.getUserPoliciesDir etc.
 
     vi.resetModules();
-    const { createPolicyEngineConfig } = await import('./config.js');
+    const { createPolicyEngineConfig } = await import("./config.js");
 
     const settings: PolicySettings = {};
     // Pass a dummy default policies dir to avoid it trying to resolve __dirname relative to the test file in a weird way
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     expect(config.defaultDecision).toBe(PolicyDecision.ASK_USER);
     // The order of the rules is not guaranteed, so we sort them by tool name.
-    config.rules?.sort((a, b) =>
-      (a.toolName ?? '').localeCompare(b.toolName ?? ''),
-    );
+    config.rules?.sort((a, b) => (a.toolName ?? "").localeCompare(b.toolName ?? ""));
 
     // Since we are mocking an empty policy directory, we expect NO rules from TOML.
     // Wait, the CLI test expected a bunch of default rules. Those must have come from
@@ -97,91 +77,85 @@ describe('createPolicyEngineConfig', () => {
 
     expect(config.rules).toEqual([]);
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should allow tools in tools.allowed', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow tools in tools.allowed", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      tools: { allowed: ['run_shell_command'] },
+      tools: { allowed: ["run_shell_command"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBeCloseTo(2.3, 5); // Command line allow
   });
 
-  it('should deny tools in tools.exclude', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should deny tools in tools.exclude", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      tools: { exclude: ['run_shell_command'] },
+      tools: { exclude: ["run_shell_command"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.DENY,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBeCloseTo(2.4, 5); // Command line exclude
   });
 
-  it('should allow tools from allowed MCP servers', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow tools from allowed MCP servers", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { allowed: ['my-server'] },
+      mcp: { allowed: ["my-server"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBe(2.1); // MCP allowed server
   });
 
-  it('should deny tools from excluded MCP servers', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should deny tools from excluded MCP servers", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { excluded: ['my-server'] },
+      mcp: { excluded: ["my-server"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.DENY,
     );
     expect(rule).toBeDefined();
     expect(rule?.priority).toBe(2.9); // MCP excluded server
   });
 
-  it('should allow tools from trusted MCP servers', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow tools from trusted MCP servers", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
       mcpServers: {
-        'trusted-server': {
+        "trusted-server": {
           trust: true,
         },
-        'untrusted-server': {
+        "untrusted-server": {
           trust: false,
         },
       },
@@ -189,35 +163,31 @@ describe('createPolicyEngineConfig', () => {
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const trustedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'trusted-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "trusted-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(trustedRule).toBeDefined();
     expect(trustedRule?.priority).toBe(2.2); // MCP trusted server
 
     // Untrusted server should not have an allow rule
     const untrustedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'untrusted-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "untrusted-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(untrustedRule).toBeUndefined();
   });
 
-  it('should handle multiple MCP server configurations together', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should handle multiple MCP server configurations together", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
       mcp: {
-        allowed: ['allowed-server'],
-        excluded: ['excluded-server'],
+        allowed: ["allowed-server"],
+        excluded: ["excluded-server"],
       },
       mcpServers: {
-        'trusted-server': {
+        "trusted-server": {
           trust: true,
         },
       },
@@ -225,109 +195,91 @@ describe('createPolicyEngineConfig', () => {
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     // Check allowed server
     const allowedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'allowed-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "allowed-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(allowedRule).toBeDefined();
     expect(allowedRule?.priority).toBe(2.1); // MCP allowed server
 
     // Check trusted server
     const trustedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'trusted-server__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "trusted-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     expect(trustedRule).toBeDefined();
     expect(trustedRule?.priority).toBe(2.2); // MCP trusted server
 
     // Check excluded server
     const excludedRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'excluded-server__*' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "excluded-server__*" && r.decision === PolicyDecision.DENY,
     );
     expect(excludedRule).toBeDefined();
     expect(excludedRule?.priority).toBe(2.9); // MCP excluded server
   });
 
-  it('should allow all tools in YOLO mode', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow all tools in YOLO mode", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {};
     const config = await createPolicyEngineConfig(settings, ApprovalMode.YOLO);
-    const rule = config.rules?.find(
-      (r) => r.decision === PolicyDecision.ALLOW && !r.toolName,
-    );
+    const rule = config.rules?.find((r) => r.decision === PolicyDecision.ALLOW && !r.toolName);
     expect(rule).toBeDefined();
     // Priority 999 in default tier → 1.999
     expect(rule?.priority).toBeCloseTo(1.999, 5);
   });
 
-  it('should allow edit tool in AUTO_EDIT mode', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should allow edit tool in AUTO_EDIT mode", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {};
-    const config = await createPolicyEngineConfig(
-      settings,
-      ApprovalMode.AUTO_EDIT,
-    );
+    const config = await createPolicyEngineConfig(settings, ApprovalMode.AUTO_EDIT);
     const rule = config.rules?.find(
-      (r) => r.toolName === 'replace' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "replace" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     // Priority 15 in default tier → 1.015
     expect(rule?.priority).toBeCloseTo(1.015, 5);
   });
 
-  it('should prioritize exclude over allow', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should prioritize exclude over allow", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      tools: { allowed: ['run_shell_command'], exclude: ['run_shell_command'] },
+      tools: { allowed: ["run_shell_command"], exclude: ["run_shell_command"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
     const denyRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.DENY,
     );
     const allowRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.ALLOW,
     );
     expect(denyRule).toBeDefined();
     expect(allowRule).toBeDefined();
     expect(denyRule!.priority).toBeGreaterThan(allowRule!.priority!);
   });
 
-  it('should prioritize specific tool allows over MCP server excludes', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should prioritize specific tool allows over MCP server excludes", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { excluded: ['my-server'] },
-      tools: { allowed: ['my-server__specific-tool'] },
+      mcp: { excluded: ["my-server"] },
+      tools: { allowed: ["my-server__specific-tool"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const serverDenyRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.DENY,
     );
     const toolAllowRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__specific-tool' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "my-server__specific-tool" && r.decision === PolicyDecision.ALLOW,
     );
 
     expect(serverDenyRule).toBeDefined();
@@ -339,31 +291,28 @@ describe('createPolicyEngineConfig', () => {
     // so server deny wins (this is expected behavior - server-level blocks are security critical)
   });
 
-  it('should handle MCP server allows and tool excludes', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should handle MCP server allows and tool excludes", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
-      mcp: { allowed: ['my-server'] },
+      mcp: { allowed: ["my-server"] },
       mcpServers: {
-        'my-server': {
+        "my-server": {
           trust: true,
         },
       },
-      tools: { exclude: ['my-server__dangerous-tool'] },
+      tools: { exclude: ["my-server__dangerous-tool"] },
     };
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const serverAllowRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__*' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "my-server__*" && r.decision === PolicyDecision.ALLOW,
     );
     const toolDenyRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'my-server__dangerous-tool' &&
-        r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "my-server__dangerous-tool" && r.decision === PolicyDecision.DENY,
     );
 
     expect(serverAllowRule).toBeDefined();
@@ -373,33 +322,30 @@ describe('createPolicyEngineConfig', () => {
     expect(toolDenyRule!.priority).toBeGreaterThan(serverAllowRule!.priority!);
   });
 
-  it('should handle complex priority scenarios correctly', async () => {
+  it("should handle complex priority scenarios correctly", async () => {
     const settings: PolicySettings = {
       tools: {
-        allowed: ['my-server__tool1', 'other-tool'], // Priority 2.3
-        exclude: ['my-server__tool2', 'glob'], // Priority 2.4
+        allowed: ["my-server__tool1", "other-tool"], // Priority 2.3
+        exclude: ["my-server__tool2", "glob"], // Priority 2.4
       },
       mcp: {
-        allowed: ['allowed-server'], // Priority 2.1
-        excluded: ['excluded-server'], // Priority 2.9
+        allowed: ["allowed-server"], // Priority 2.1
+        excluded: ["excluded-server"], // Priority 2.9
       },
       mcpServers: {
-        'trusted-server': {
+        "trusted-server": {
           trust: true, // Priority 90 -> 2.2
         },
       },
     };
 
     // Mock a default policy for 'glob' to test priority override
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
     const mockReaddir = vi.fn(async (p, _o) => {
-      if (typeof p === 'string' && p.includes('/tmp/mock/default/policies')) {
+      if (typeof p === "string" && p.includes("/tmp/mock/default/policies")) {
         return [
           {
-            name: 'default.toml',
+            name: "default.toml",
             isFile: () => true,
             isDirectory: () => false,
           },
@@ -408,34 +354,28 @@ describe('createPolicyEngineConfig', () => {
       return [];
     });
     const mockReadFile = vi.fn(async (p, _o) => {
-      if (typeof p === 'string' && p.includes('default.toml')) {
+      if (typeof p === "string" && p.includes("default.toml")) {
         return '[[rule]]\ntoolName = "glob"\ndecision = "allow"\npriority = 50\n';
       }
-      return '';
+      return "";
     });
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readdir: mockReaddir, readFile: mockReadFile },
       readdir: mockReaddir,
       readFile: mockReadFile,
     }));
     vi.resetModules();
-    const { createPolicyEngineConfig: createConfig } = await import(
-      './config.js'
-    );
+    const { createPolicyEngineConfig: createConfig } = await import("./config.js");
 
-    const config = await createConfig(
-      settings,
-      ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
-    );
+    const config = await createConfig(settings, ApprovalMode.DEFAULT, "/tmp/mock/default/policies");
 
     // Verify glob is denied even though default would allow it
     const globDenyRule = config.rules?.find(
-      (r) => r.toolName === 'glob' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "glob" && r.decision === PolicyDecision.DENY,
     );
     const globAllowRule = config.rules?.find(
-      (r) => r.toolName === 'glob' && r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "glob" && r.decision === PolicyDecision.ALLOW,
     );
     expect(globDenyRule).toBeDefined();
     expect(globAllowRule).toBeDefined();
@@ -455,25 +395,21 @@ describe('createPolicyEngineConfig', () => {
 
     // Check that the highest priority items are the excludes (user tier: 2.4 and 2.9)
     const highestPriorityExcludes = priorities?.filter(
-      (p) =>
-        Math.abs(p.priority! - 2.4) < 0.01 ||
-        Math.abs(p.priority! - 2.9) < 0.01,
+      (p) => Math.abs(p.priority! - 2.4) < 0.01 || Math.abs(p.priority! - 2.9) < 0.01,
     );
-    expect(
-      highestPriorityExcludes?.every((p) => p.decision === PolicyDecision.DENY),
-    ).toBe(true);
+    expect(highestPriorityExcludes?.every((p) => p.decision === PolicyDecision.DENY)).toBe(true);
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should handle MCP servers with undefined trust property', async () => {
-    const { createPolicyEngineConfig } = await import('./config.js');
+  it("should handle MCP servers with undefined trust property", async () => {
+    const { createPolicyEngineConfig } = await import("./config.js");
     const settings: PolicySettings = {
       mcpServers: {
-        'no-trust-property': {
+        "no-trust-property": {
           // trust property is undefined/missing
         },
-        'explicit-false': {
+        "explicit-false": {
           trust: false,
         },
       },
@@ -481,42 +417,32 @@ describe('createPolicyEngineConfig', () => {
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     // Neither server should have an allow rule
     const noTrustRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'no-trust-property__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "no-trust-property__*" && r.decision === PolicyDecision.ALLOW,
     );
     const explicitFalseRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'explicit-false__*' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "explicit-false__*" && r.decision === PolicyDecision.ALLOW,
     );
 
     expect(noTrustRule).toBeUndefined();
     expect(explicitFalseRule).toBeUndefined();
   });
 
-  it('should have YOLO allow-all rule beat write tool rules in YOLO mode', async () => {
+  it("should have YOLO allow-all rule beat write tool rules in YOLO mode", async () => {
     vi.resetModules();
-    vi.doUnmock('node:fs/promises');
-    const { createPolicyEngineConfig: createConfig } = await import(
-      './config.js'
-    );
+    vi.doUnmock("node:fs/promises");
+    const { createPolicyEngineConfig: createConfig } = await import("./config.js");
     // Re-mock Storage after resetModules because it was reloaded
-    const { Storage: FreshStorage } = await import('../config/storage.js');
-    vi.spyOn(FreshStorage, 'getUserPoliciesDir').mockReturnValue(
-      '/non/existent/user/policies',
-    );
-    vi.spyOn(FreshStorage, 'getSystemPoliciesDir').mockReturnValue(
-      '/non/existent/system/policies',
-    );
+    const { Storage: FreshStorage } = await import("../config/storage.js");
+    vi.spyOn(FreshStorage, "getUserPoliciesDir").mockReturnValue("/non/existent/user/policies");
+    vi.spyOn(FreshStorage, "getSystemPoliciesDir").mockReturnValue("/non/existent/system/policies");
 
     const settings: PolicySettings = {
-      tools: { exclude: ['dangerous-tool'] },
+      tools: { exclude: ["dangerous-tool"] },
     };
     // Use default policy dir (no third arg) to load real yolo.toml and write.toml
     const config = await createConfig(settings, ApprovalMode.YOLO);
@@ -532,8 +458,7 @@ describe('createPolicyEngineConfig', () => {
     // Write tool ASK_USER rules are present (from write.toml)
     const writeToolRules = config.rules?.filter(
       (r) =>
-        ['run_shell_command'].includes(r.toolName || '') &&
-        r.decision === PolicyDecision.ASK_USER,
+        ["run_shell_command"].includes(r.toolName || "") && r.decision === PolicyDecision.ASK_USER,
     );
     expect(writeToolRules).toBeDefined();
     expect(writeToolRules?.length).toBeGreaterThan(0);
@@ -545,42 +470,30 @@ describe('createPolicyEngineConfig', () => {
 
     // Should still have the exclude rule (from settings, user tier)
     const excludeRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'dangerous-tool' && r.decision === PolicyDecision.DENY,
+      (r) => r.toolName === "dangerous-tool" && r.decision === PolicyDecision.DENY,
     );
     expect(excludeRule).toBeDefined();
     expect(excludeRule?.priority).toBeCloseTo(2.4, 5); // Command line exclude
   });
 
-  it('should support argsPattern in policy rules', async () => {
-    const actualFs =
-      await vi.importActual<typeof import('node:fs/promises')>(
-        'node:fs/promises',
-      );
+  it("should support argsPattern in policy rules", async () => {
+    const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
     const mockReaddir = vi.fn(
-      async (
-        path: string | Buffer | URL,
-        options?: Parameters<typeof actualFs.readdir>[1],
-      ) => {
+      async (path: string | Buffer | URL, options?: Parameters<typeof actualFs.readdir>[1]) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies"))
         ) {
           return [
             {
-              name: 'write.toml',
+              name: "write.toml",
               isFile: () => true,
               isDirectory: () => false,
             },
           ] as unknown as Awaited<ReturnType<typeof actualFs.readdir>>;
         }
-        return actualFs.readdir(
-          path,
-          options as Parameters<typeof actualFs.readdir>[1],
-        );
+        return actualFs.readdir(path, options as Parameters<typeof actualFs.readdir>[1]);
       },
     );
 
@@ -590,10 +503,8 @@ describe('createPolicyEngineConfig', () => {
         options: Parameters<typeof actualFs.readFile>[1],
       ) => {
         if (
-          typeof path === 'string' &&
-          nodePath
-            .normalize(path)
-            .includes(nodePath.normalize('.gemini/policies/write.toml'))
+          typeof path === "string" &&
+          nodePath.normalize(path).includes(nodePath.normalize(".gemini/policies/write.toml"))
         ) {
           return `
 [[rule]]
@@ -607,7 +518,7 @@ priority = 150
       },
     );
 
-    vi.doMock('node:fs/promises', () => ({
+    vi.doMock("node:fs/promises", () => ({
       ...actualFs,
       default: { ...actualFs, readFile: mockReadFile, readdir: mockReaddir },
       readFile: mockReadFile,
@@ -615,19 +526,17 @@ priority = 150
     }));
 
     vi.resetModules();
-    const { createPolicyEngineConfig } = await import('./config.js');
+    const { createPolicyEngineConfig } = await import("./config.js");
 
     const settings: PolicySettings = {};
     const config = await createPolicyEngineConfig(
       settings,
       ApprovalMode.DEFAULT,
-      '/tmp/mock/default/policies',
+      "/tmp/mock/default/policies",
     );
 
     const rule = config.rules?.find(
-      (r) =>
-        r.toolName === 'run_shell_command' &&
-        r.decision === PolicyDecision.ALLOW,
+      (r) => r.toolName === "run_shell_command" && r.decision === PolicyDecision.ALLOW,
     );
     expect(rule).toBeDefined();
     // Priority 150 in user tier → 2.150
@@ -639,32 +548,24 @@ priority = 150
     expect(rule?.argsPattern?.test('{"command":"git commit"}')).toBe(false);
     expect(rule?.argsPattern?.test('{"command":"git push"}')).toBe(false);
 
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  it('should have default ASK_USER rule for discovered tools', async () => {
+  it("should have default ASK_USER rule for discovered tools", async () => {
     vi.resetModules();
-    vi.doUnmock('node:fs/promises');
-    const { createPolicyEngineConfig: createConfig } = await import(
-      './config.js'
-    );
+    vi.doUnmock("node:fs/promises");
+    const { createPolicyEngineConfig: createConfig } = await import("./config.js");
     // Re-mock Storage after resetModules because it was reloaded
-    const { Storage: FreshStorage } = await import('../config/storage.js');
-    vi.spyOn(FreshStorage, 'getUserPoliciesDir').mockReturnValue(
-      '/non/existent/user/policies',
-    );
-    vi.spyOn(FreshStorage, 'getSystemPoliciesDir').mockReturnValue(
-      '/non/existent/system/policies',
-    );
+    const { Storage: FreshStorage } = await import("../config/storage.js");
+    vi.spyOn(FreshStorage, "getUserPoliciesDir").mockReturnValue("/non/existent/user/policies");
+    vi.spyOn(FreshStorage, "getSystemPoliciesDir").mockReturnValue("/non/existent/system/policies");
 
     const settings: PolicySettings = {};
     // Use default policy dir to load real discovered.toml
     const config = await createConfig(settings, ApprovalMode.DEFAULT);
 
     const discoveredRule = config.rules?.find(
-      (r) =>
-        r.toolName === 'discovered_tool_*' &&
-        r.decision === PolicyDecision.ASK_USER,
+      (r) => r.toolName === "discovered_tool_*" && r.decision === PolicyDecision.ASK_USER,
     );
     expect(discoveredRule).toBeDefined();
     // Priority 10 in default tier → 1.010
diff --git a/packages/gemini-core/src/policy/config.ts b/packages/gemini-core/src/policy/config.ts
index 64d6476d1..99ef606cc 100644
--- a/packages/gemini-core/src/policy/config.ts
+++ b/packages/gemini-core/src/policy/config.ts
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { Storage } from '../config/storage.js';
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import { Storage } from "../config/storage.js";
+import { type MessageBus } from "../confirmation-bus/message-bus.js";
+import { MessageBusType, type UpdatePolicy } from "../confirmation-bus/types.js";
+import { coreEvents } from "../utils/events.js";
+import type { PolicyEngine } from "./policy-engine.js";
+import { loadPoliciesFromToml, type PolicyFileError } from "./toml-loader.js";
 import {
-  type PolicyEngineConfig,
+  type ApprovalMode,
   PolicyDecision,
+  type PolicyEngineConfig,
   type PolicyRule,
-  type ApprovalMode,
   type PolicySettings,
-} from './types.js';
-import type { PolicyEngine } from './policy-engine.js';
-import { loadPoliciesFromToml, type PolicyFileError } from './toml-loader.js';
-import {
-  MessageBusType,
-  type UpdatePolicy,
-} from '../confirmation-bus/types.js';
-import { type MessageBus } from '../confirmation-bus/message-bus.js';
-import { coreEvents } from '../utils/events.js';
+} from "./types.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-export const DEFAULT_CORE_POLICIES_DIR = path.join(__dirname, 'policies');
+export const DEFAULT_CORE_POLICIES_DIR = path.join(__dirname, "policies");
 
 // Policy tier constants for priority calculation
 export const DEFAULT_POLICY_TIER = 1;
@@ -60,10 +57,7 @@ export function getPolicyDirectories(defaultPoliciesDir?: string): string[] {
  * Determines the policy tier (1=default, 2=user, 3=admin) for a given directory.
  * This is used by the TOML loader to assign priority bands.
  */
-export function getPolicyTier(
-  dir: string,
-  defaultPoliciesDir?: string,
-): number {
+export function getPolicyTier(dir: string, defaultPoliciesDir?: string): number {
   const USER_POLICIES_DIR = Storage.getUserPoliciesDir();
   const ADMIN_POLICIES_DIR = Storage.getSystemPoliciesDir();
 
@@ -71,10 +65,7 @@ export function getPolicyTier(
   const normalizedUser = path.resolve(USER_POLICIES_DIR);
   const normalizedAdmin = path.resolve(ADMIN_POLICIES_DIR);
 
-  if (
-    defaultPoliciesDir &&
-    normalizedDir === path.resolve(defaultPoliciesDir)
-  ) {
+  if (defaultPoliciesDir && normalizedDir === path.resolve(defaultPoliciesDir)) {
     return DEFAULT_POLICY_TIER;
   }
   if (normalizedDir === path.resolve(DEFAULT_CORE_POLICIES_DIR)) {
@@ -114,17 +105,15 @@ export async function createPolicyEngineConfig(
   const policyDirs = getPolicyDirectories(defaultPoliciesDir);
 
   // Load policies from TOML files
-  const { rules: tomlRules, errors } = await loadPoliciesFromToml(
-    approvalMode,
-    policyDirs,
-    (dir) => getPolicyTier(dir, defaultPoliciesDir),
+  const { rules: tomlRules, errors } = await loadPoliciesFromToml(approvalMode, policyDirs, (dir) =>
+    getPolicyTier(dir, defaultPoliciesDir),
   );
 
   // Emit any errors encountered during TOML loading to the UI
   // coreEvents has a buffer that will display these once the UI is ready
   if (errors.length > 0) {
     for (const error of errors) {
-      coreEvents.emitFeedback('error', formatPolicyError(error));
+      coreEvents.emitFeedback("error", formatPolicyError(error));
     }
   }
 
@@ -196,9 +185,7 @@ export async function createPolicyEngineConfig(
   // MCP servers that are trusted in the settings.
   // Priority: 2.2 (user tier - persistent trusted servers)
   if (settings.mcpServers) {
-    for (const [serverName, serverConfig] of Object.entries(
-      settings.mcpServers,
-    )) {
+    for (const [serverName, serverConfig] of Object.entries(settings.mcpServers)) {
       if (serverConfig.trust) {
         // Trust all tools from this MCP server
         // Using pattern matching for MCP tool names which are formatted as "serverName__toolName"
@@ -229,23 +216,17 @@ export async function createPolicyEngineConfig(
   };
 }
 
-export function createPolicyUpdater(
-  policyEngine: PolicyEngine,
-  messageBus: MessageBus,
-) {
-  messageBus.subscribe(
-    MessageBusType.UPDATE_POLICY,
-    (message: UpdatePolicy) => {
-      const toolName = message.toolName;
-
-      policyEngine.addRule({
-        toolName,
-        decision: PolicyDecision.ALLOW,
-        // User tier (2) + high priority (950/1000) = 2.95
-        // This ensures user "always allow" selections are high priority
-        // but still lose to admin policies (3.xxx) and settings excludes (200)
-        priority: 2.95,
-      });
-    },
-  );
+export function createPolicyUpdater(policyEngine: PolicyEngine, messageBus: MessageBus) {
+  messageBus.subscribe(MessageBusType.UPDATE_POLICY, (message: UpdatePolicy) => {
+    const toolName = message.toolName;
+
+    policyEngine.addRule({
+      toolName,
+      decision: PolicyDecision.ALLOW,
+      // User tier (2) + high priority (950/1000) = 2.95
+      // This ensures user "always allow" selections are high priority
+      // but still lose to admin policies (3.xxx) and settings excludes (200)
+      priority: 2.95,
+    });
+  });
 }
diff --git a/packages/gemini-core/src/policy/index.ts b/packages/gemini-core/src/policy/index.ts
index 483640be8..3dc347de7 100644
--- a/packages/gemini-core/src/policy/index.ts
+++ b/packages/gemini-core/src/policy/index.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './policy-engine.js';
-export * from './types.js';
-export * from './toml-loader.js';
-export * from './config.js';
+export * from "./config.js";
+export * from "./policy-engine.js";
+export * from "./toml-loader.js";
+export * from "./types.js";
diff --git a/packages/gemini-core/src/policy/policy-engine.test.ts b/packages/gemini-core/src/policy/policy-engine.test.ts
index fd3a4b62b..9bdb04541 100644
--- a/packages/gemini-core/src/policy/policy-engine.test.ts
+++ b/packages/gemini-core/src/policy/policy-engine.test.ts
@@ -4,39 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { PolicyEngine } from './policy-engine.js';
-import {
-  PolicyDecision,
-  type PolicyRule,
-  type PolicyEngineConfig,
-} from './types.js';
-import type { FunctionCall } from '@google/genai';
-
-describe('PolicyEngine', () => {
+import type { FunctionCall } from "@google/genai";
+import { beforeEach, describe, expect, it } from "vitest";
+import { PolicyEngine } from "./policy-engine.js";
+import { PolicyDecision, type PolicyEngineConfig, type PolicyRule } from "./types.js";
+
+describe("PolicyEngine", () => {
   let engine: PolicyEngine;
 
   beforeEach(() => {
     engine = new PolicyEngine();
   });
 
-  describe('constructor', () => {
-    it('should use default config when none provided', () => {
-      const decision = engine.check({ name: 'test' }, undefined);
+  describe("constructor", () => {
+    it("should use default config when none provided", () => {
+      const decision = engine.check({ name: "test" }, undefined);
       expect(decision).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should respect custom default decision', () => {
+    it("should respect custom default decision", () => {
       engine = new PolicyEngine({ defaultDecision: PolicyDecision.DENY });
-      const decision = engine.check({ name: 'test' }, undefined);
+      const decision = engine.check({ name: "test" }, undefined);
       expect(decision).toBe(PolicyDecision.DENY);
     });
 
-    it('should sort rules by priority', () => {
+    it("should sort rules by priority", () => {
       const rules: PolicyRule[] = [
-        { toolName: 'tool1', decision: PolicyDecision.DENY, priority: 1 },
-        { toolName: 'tool2', decision: PolicyDecision.ALLOW, priority: 10 },
-        { toolName: 'tool3', decision: PolicyDecision.ASK_USER, priority: 5 },
+        { toolName: "tool1", decision: PolicyDecision.DENY, priority: 1 },
+        { toolName: "tool2", decision: PolicyDecision.ALLOW, priority: 10 },
+        { toolName: "tool3", decision: PolicyDecision.ASK_USER, priority: 5 },
       ];
 
       engine = new PolicyEngine({ rules });
@@ -48,35 +44,29 @@ describe('PolicyEngine', () => {
     });
   });
 
-  describe('check', () => {
-    it('should match tool by name', () => {
+  describe("check", () => {
+    it("should match tool by name", () => {
       const rules: PolicyRule[] = [
-        { toolName: 'shell', decision: PolicyDecision.ALLOW },
-        { toolName: 'edit', decision: PolicyDecision.DENY },
+        { toolName: "shell", decision: PolicyDecision.ALLOW },
+        { toolName: "edit", decision: PolicyDecision.DENY },
       ];
 
       engine = new PolicyEngine({ rules });
 
-      expect(engine.check({ name: 'shell' }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
-      expect(engine.check({ name: 'edit' }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
-      expect(engine.check({ name: 'other' }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      );
+      expect(engine.check({ name: "shell" }, undefined)).toBe(PolicyDecision.ALLOW);
+      expect(engine.check({ name: "edit" }, undefined)).toBe(PolicyDecision.DENY);
+      expect(engine.check({ name: "other" }, undefined)).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should match by args pattern', () => {
+    it("should match by args pattern", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'shell',
+          toolName: "shell",
           argsPattern: /rm -rf/,
           decision: PolicyDecision.DENY,
         },
         {
-          toolName: 'shell',
+          toolName: "shell",
           decision: PolicyDecision.ALLOW,
         },
       ];
@@ -84,89 +74,77 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       const dangerousCall: FunctionCall = {
-        name: 'shell',
-        args: { command: 'rm -rf /' },
+        name: "shell",
+        args: { command: "rm -rf /" },
       };
 
       const safeCall: FunctionCall = {
-        name: 'shell',
-        args: { command: 'ls -la' },
+        name: "shell",
+        args: { command: "ls -la" },
       };
 
       expect(engine.check(dangerousCall, undefined)).toBe(PolicyDecision.DENY);
       expect(engine.check(safeCall, undefined)).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should apply rules by priority', () => {
+    it("should apply rules by priority", () => {
       const rules: PolicyRule[] = [
-        { toolName: 'shell', decision: PolicyDecision.DENY, priority: 1 },
-        { toolName: 'shell', decision: PolicyDecision.ALLOW, priority: 10 },
+        { toolName: "shell", decision: PolicyDecision.DENY, priority: 1 },
+        { toolName: "shell", decision: PolicyDecision.ALLOW, priority: 10 },
       ];
 
       engine = new PolicyEngine({ rules });
 
       // Higher priority rule (ALLOW) should win
-      expect(engine.check({ name: 'shell' }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "shell" }, undefined)).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should apply wildcard rules (no toolName)', () => {
+    it("should apply wildcard rules (no toolName)", () => {
       const rules: PolicyRule[] = [
         { decision: PolicyDecision.DENY }, // Applies to all tools
-        { toolName: 'safe-tool', decision: PolicyDecision.ALLOW, priority: 10 },
+        { toolName: "safe-tool", decision: PolicyDecision.ALLOW, priority: 10 },
       ];
 
       engine = new PolicyEngine({ rules });
 
-      expect(engine.check({ name: 'safe-tool' }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
-      expect(engine.check({ name: 'any-other-tool' }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
+      expect(engine.check({ name: "safe-tool" }, undefined)).toBe(PolicyDecision.ALLOW);
+      expect(engine.check({ name: "any-other-tool" }, undefined)).toBe(PolicyDecision.DENY);
     });
 
-    it('should handle non-interactive mode', () => {
+    it("should handle non-interactive mode", () => {
       const config: PolicyEngineConfig = {
         nonInteractive: true,
         rules: [
-          { toolName: 'interactive-tool', decision: PolicyDecision.ASK_USER },
-          { toolName: 'allowed-tool', decision: PolicyDecision.ALLOW },
+          { toolName: "interactive-tool", decision: PolicyDecision.ASK_USER },
+          { toolName: "allowed-tool", decision: PolicyDecision.ALLOW },
         ],
       };
 
       engine = new PolicyEngine(config);
 
       // ASK_USER should become DENY in non-interactive mode
-      expect(engine.check({ name: 'interactive-tool' }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
+      expect(engine.check({ name: "interactive-tool" }, undefined)).toBe(PolicyDecision.DENY);
       // ALLOW should remain ALLOW
-      expect(engine.check({ name: 'allowed-tool' }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "allowed-tool" }, undefined)).toBe(PolicyDecision.ALLOW);
       // Default ASK_USER should also become DENY
-      expect(engine.check({ name: 'unknown-tool' }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
+      expect(engine.check({ name: "unknown-tool" }, undefined)).toBe(PolicyDecision.DENY);
     });
   });
 
-  describe('addRule', () => {
-    it('should add a new rule and maintain priority order', () => {
+  describe("addRule", () => {
+    it("should add a new rule and maintain priority order", () => {
       engine.addRule({
-        toolName: 'tool1',
+        toolName: "tool1",
         decision: PolicyDecision.ALLOW,
         priority: 5,
       });
       engine.addRule({
-        toolName: 'tool2',
+        toolName: "tool2",
         decision: PolicyDecision.DENY,
         priority: 10,
       });
       engine.addRule({
-        toolName: 'tool3',
+        toolName: "tool3",
         decision: PolicyDecision.ASK_USER,
         priority: 1,
       });
@@ -178,73 +156,69 @@ describe('PolicyEngine', () => {
       expect(rules[2].priority).toBe(1);
     });
 
-    it('should apply newly added rules', () => {
-      expect(engine.check({ name: 'new-tool' }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      );
+    it("should apply newly added rules", () => {
+      expect(engine.check({ name: "new-tool" }, undefined)).toBe(PolicyDecision.ASK_USER);
 
-      engine.addRule({ toolName: 'new-tool', decision: PolicyDecision.ALLOW });
+      engine.addRule({ toolName: "new-tool", decision: PolicyDecision.ALLOW });
 
-      expect(engine.check({ name: 'new-tool' }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "new-tool" }, undefined)).toBe(PolicyDecision.ALLOW);
     });
   });
 
-  describe('removeRulesForTool', () => {
-    it('should remove rules for specific tool', () => {
-      engine.addRule({ toolName: 'tool1', decision: PolicyDecision.ALLOW });
-      engine.addRule({ toolName: 'tool2', decision: PolicyDecision.DENY });
+  describe("removeRulesForTool", () => {
+    it("should remove rules for specific tool", () => {
+      engine.addRule({ toolName: "tool1", decision: PolicyDecision.ALLOW });
+      engine.addRule({ toolName: "tool2", decision: PolicyDecision.DENY });
       engine.addRule({
-        toolName: 'tool1',
+        toolName: "tool1",
         decision: PolicyDecision.ASK_USER,
         priority: 10,
       });
 
       expect(engine.getRules()).toHaveLength(3);
 
-      engine.removeRulesForTool('tool1');
+      engine.removeRulesForTool("tool1");
 
       const remainingRules = engine.getRules();
       expect(remainingRules).toHaveLength(1);
-      expect(remainingRules.some((r) => r.toolName === 'tool1')).toBe(false);
-      expect(remainingRules.some((r) => r.toolName === 'tool2')).toBe(true);
+      expect(remainingRules.some((r) => r.toolName === "tool1")).toBe(false);
+      expect(remainingRules.some((r) => r.toolName === "tool2")).toBe(true);
     });
 
-    it('should handle removing non-existent tool', () => {
-      engine.addRule({ toolName: 'existing', decision: PolicyDecision.ALLOW });
+    it("should handle removing non-existent tool", () => {
+      engine.addRule({ toolName: "existing", decision: PolicyDecision.ALLOW });
 
-      expect(() => engine.removeRulesForTool('non-existent')).not.toThrow();
+      expect(() => engine.removeRulesForTool("non-existent")).not.toThrow();
       expect(engine.getRules()).toHaveLength(1);
     });
   });
 
-  describe('getRules', () => {
-    it('should return readonly array of rules', () => {
+  describe("getRules", () => {
+    it("should return readonly array of rules", () => {
       const rules: PolicyRule[] = [
-        { toolName: 'tool1', decision: PolicyDecision.ALLOW },
-        { toolName: 'tool2', decision: PolicyDecision.DENY },
+        { toolName: "tool1", decision: PolicyDecision.ALLOW },
+        { toolName: "tool2", decision: PolicyDecision.DENY },
       ];
 
       engine = new PolicyEngine({ rules });
 
       const retrievedRules = engine.getRules();
       expect(retrievedRules).toHaveLength(2);
-      expect(retrievedRules[0].toolName).toBe('tool1');
-      expect(retrievedRules[1].toolName).toBe('tool2');
+      expect(retrievedRules[0].toolName).toBe("tool1");
+      expect(retrievedRules[1].toolName).toBe("tool2");
     });
   });
 
-  describe('MCP server wildcard patterns', () => {
-    it('should match MCP server wildcard patterns', () => {
+  describe("MCP server wildcard patterns", () => {
+    it("should match MCP server wildcard patterns", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'my-server__*',
+          toolName: "my-server__*",
           decision: PolicyDecision.ALLOW,
           priority: 10,
         },
         {
-          toolName: 'blocked-server__*',
+          toolName: "blocked-server__*",
           decision: PolicyDecision.DENY,
           priority: 20,
         },
@@ -253,42 +227,32 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Should match my-server tools
-      expect(engine.check({ name: 'my-server__tool1' }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
-      expect(engine.check({ name: 'my-server__another_tool' }, undefined)).toBe(
+      expect(engine.check({ name: "my-server__tool1" }, undefined)).toBe(PolicyDecision.ALLOW);
+      expect(engine.check({ name: "my-server__another_tool" }, undefined)).toBe(
         PolicyDecision.ALLOW,
       );
 
       // Should match blocked-server tools
-      expect(engine.check({ name: 'blocked-server__tool1' }, undefined)).toBe(
+      expect(engine.check({ name: "blocked-server__tool1" }, undefined)).toBe(PolicyDecision.DENY);
+      expect(engine.check({ name: "blocked-server__dangerous" }, undefined)).toBe(
         PolicyDecision.DENY,
       );
-      expect(
-        engine.check({ name: 'blocked-server__dangerous' }, undefined),
-      ).toBe(PolicyDecision.DENY);
 
       // Should not match other patterns
-      expect(engine.check({ name: 'other-server__tool' }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      );
-      expect(engine.check({ name: 'my-server-tool' }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      ); // No __ separator
-      expect(engine.check({ name: 'my-server' }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      ); // No tool name
+      expect(engine.check({ name: "other-server__tool" }, undefined)).toBe(PolicyDecision.ASK_USER);
+      expect(engine.check({ name: "my-server-tool" }, undefined)).toBe(PolicyDecision.ASK_USER); // No __ separator
+      expect(engine.check({ name: "my-server" }, undefined)).toBe(PolicyDecision.ASK_USER); // No tool name
     });
 
-    it('should prioritize specific tool rules over server wildcards', () => {
+    it("should prioritize specific tool rules over server wildcards", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'my-server__*',
+          toolName: "my-server__*",
           decision: PolicyDecision.ALLOW,
           priority: 10,
         },
         {
-          toolName: 'my-server__dangerous-tool',
+          toolName: "my-server__dangerous-tool",
           decision: PolicyDecision.DENY,
           priority: 20,
         },
@@ -297,74 +261,66 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Specific tool deny should override server allow
-      expect(
-        engine.check({ name: 'my-server__dangerous-tool' }, undefined),
-      ).toBe(PolicyDecision.DENY);
-      expect(engine.check({ name: 'my-server__safe-tool' }, undefined)).toBe(
-        PolicyDecision.ALLOW,
+      expect(engine.check({ name: "my-server__dangerous-tool" }, undefined)).toBe(
+        PolicyDecision.DENY,
       );
+      expect(engine.check({ name: "my-server__safe-tool" }, undefined)).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should NOT match spoofed server names when using wildcards', () => {
+    it("should NOT match spoofed server names when using wildcards", () => {
       // Vulnerability: A rule for 'prefix__*' matches 'prefix__suffix__tool'
       // effectively allowing a server named 'prefix__suffix' to spoof 'prefix'.
       const rules: PolicyRule[] = [
         {
-          toolName: 'safe_server__*',
+          toolName: "safe_server__*",
           decision: PolicyDecision.ALLOW,
         },
       ];
       engine = new PolicyEngine({ rules });
 
       // A tool from a different server 'safe_server__malicious'
-      const spoofedToolCall = { name: 'safe_server__malicious__tool' };
+      const spoofedToolCall = { name: "safe_server__malicious__tool" };
 
       // CURRENT BEHAVIOR (FIXED): Matches because it starts with 'safe_server__' BUT serverName doesn't match 'safe_server'
       // We expect this to FAIL matching the ALLOW rule, thus falling back to default (ASK_USER)
-      expect(engine.check(spoofedToolCall, 'safe_server__malicious')).toBe(
-        PolicyDecision.ASK_USER,
-      );
+      expect(engine.check(spoofedToolCall, "safe_server__malicious")).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should verify tool name prefix even if serverName matches', () => {
+    it("should verify tool name prefix even if serverName matches", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'safe_server__*',
+          toolName: "safe_server__*",
           decision: PolicyDecision.ALLOW,
         },
       ];
       engine = new PolicyEngine({ rules });
 
       // serverName matches, but tool name does not start with prefix
-      const invalidToolCall = { name: 'other_server__tool' };
-      expect(engine.check(invalidToolCall, 'safe_server')).toBe(
-        PolicyDecision.ASK_USER,
-      );
+      const invalidToolCall = { name: "other_server__tool" };
+      expect(engine.check(invalidToolCall, "safe_server")).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should allow when both serverName and tool name prefix match', () => {
+    it("should allow when both serverName and tool name prefix match", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'safe_server__*',
+          toolName: "safe_server__*",
           decision: PolicyDecision.ALLOW,
         },
       ];
       engine = new PolicyEngine({ rules });
 
-      const validToolCall = { name: 'safe_server__tool' };
-      expect(engine.check(validToolCall, 'safe_server')).toBe(
-        PolicyDecision.ALLOW,
-      );
+      const validToolCall = { name: "safe_server__tool" };
+      expect(engine.check(validToolCall, "safe_server")).toBe(PolicyDecision.ALLOW);
     });
   });
 
-  describe('complex scenarios', () => {
-    it('should handle multiple matching rules with different priorities', () => {
+  describe("complex scenarios", () => {
+    it("should handle multiple matching rules with different priorities", () => {
       const rules: PolicyRule[] = [
         { decision: PolicyDecision.DENY, priority: 0 }, // Default deny all
-        { toolName: 'shell', decision: PolicyDecision.ASK_USER, priority: 5 },
+        { toolName: "shell", decision: PolicyDecision.ASK_USER, priority: 5 },
         {
-          toolName: 'shell',
+          toolName: "shell",
           argsPattern: /"command":"ls/,
           decision: PolicyDecision.ALLOW,
           priority: 10,
@@ -374,25 +330,23 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Matches highest priority rule (ls command)
-      expect(
-        engine.check({ name: 'shell', args: { command: 'ls -la' } }, undefined),
-      ).toBe(PolicyDecision.ALLOW);
+      expect(engine.check({ name: "shell", args: { command: "ls -la" } }, undefined)).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // Matches middle priority rule (shell without ls)
-      expect(
-        engine.check({ name: 'shell', args: { command: 'pwd' } }, undefined),
-      ).toBe(PolicyDecision.ASK_USER);
+      expect(engine.check({ name: "shell", args: { command: "pwd" } }, undefined)).toBe(
+        PolicyDecision.ASK_USER,
+      );
 
       // Matches lowest priority rule (not shell)
-      expect(engine.check({ name: 'edit' }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
+      expect(engine.check({ name: "edit" }, undefined)).toBe(PolicyDecision.DENY);
     });
 
-    it('should handle tools with no args', () => {
+    it("should handle tools with no args", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'read',
+          toolName: "read",
           argsPattern: /secret/,
           decision: PolicyDecision.DENY,
         },
@@ -401,25 +355,23 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Tool call without args should not match pattern
-      expect(engine.check({ name: 'read' }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      );
+      expect(engine.check({ name: "read" }, undefined)).toBe(PolicyDecision.ASK_USER);
 
       // Tool call with args not matching pattern
-      expect(
-        engine.check({ name: 'read', args: { file: 'public.txt' } }, undefined),
-      ).toBe(PolicyDecision.ASK_USER);
+      expect(engine.check({ name: "read", args: { file: "public.txt" } }, undefined)).toBe(
+        PolicyDecision.ASK_USER,
+      );
 
       // Tool call with args matching pattern
-      expect(
-        engine.check({ name: 'read', args: { file: 'secret.txt' } }, undefined),
-      ).toBe(PolicyDecision.DENY);
+      expect(engine.check({ name: "read", args: { file: "secret.txt" } }, undefined)).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should match args pattern regardless of property order', () => {
+    it("should match args pattern regardless of property order", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'shell',
+          toolName: "shell",
           // Pattern matches the stable stringified format
           argsPattern: /"command":"rm[^"]*-rf/,
           decision: PolicyDecision.DENY,
@@ -429,27 +381,23 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Same args with different property order should both match
-      const args1 = { command: 'rm -rf /', path: '/home' };
-      const args2 = { path: '/home', command: 'rm -rf /' };
+      const args1 = { command: "rm -rf /", path: "/home" };
+      const args2 = { path: "/home", command: "rm -rf /" };
 
-      expect(engine.check({ name: 'shell', args: args1 }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
-      expect(engine.check({ name: 'shell', args: args2 }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
+      expect(engine.check({ name: "shell", args: args1 }, undefined)).toBe(PolicyDecision.DENY);
+      expect(engine.check({ name: "shell", args: args2 }, undefined)).toBe(PolicyDecision.DENY);
 
       // Verify safe command doesn't match
-      const safeArgs = { command: 'ls -la', path: '/home' };
-      expect(engine.check({ name: 'shell', args: safeArgs }, undefined)).toBe(
+      const safeArgs = { command: "ls -la", path: "/home" };
+      expect(engine.check({ name: "shell", args: safeArgs }, undefined)).toBe(
         PolicyDecision.ASK_USER,
       );
     });
 
-    it('should handle nested objects in args with stable stringification', () => {
+    it("should handle nested objects in args with stable stringification", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'api',
+          toolName: "api",
           argsPattern: /"sensitive":true/,
           decision: PolicyDecision.DENY,
         },
@@ -459,26 +407,22 @@ describe('PolicyEngine', () => {
 
       // Nested objects with different key orders should match consistently
       const args1 = {
-        data: { sensitive: true, value: 'secret' },
-        method: 'POST',
+        data: { sensitive: true, value: "secret" },
+        method: "POST",
       };
       const args2 = {
-        method: 'POST',
-        data: { value: 'secret', sensitive: true },
+        method: "POST",
+        data: { value: "secret", sensitive: true },
       };
 
-      expect(engine.check({ name: 'api', args: args1 }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
-      expect(engine.check({ name: 'api', args: args2 }, undefined)).toBe(
-        PolicyDecision.DENY,
-      );
+      expect(engine.check({ name: "api", args: args1 }, undefined)).toBe(PolicyDecision.DENY);
+      expect(engine.check({ name: "api", args: args2 }, undefined)).toBe(PolicyDecision.DENY);
     });
 
-    it('should handle circular references without stack overflow', () => {
+    it("should handle circular references without stack overflow", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /\[Circular\]/,
           decision: PolicyDecision.DENY,
         },
@@ -491,34 +435,31 @@ describe('PolicyEngine', () => {
         data?: Record<string, unknown>;
       };
       const circularArgs: CircularArgs = {
-        name: 'test',
+        name: "test",
         data: {},
       };
       // Create circular reference - TypeScript allows this since data is Record<string, unknown>
-      (circularArgs.data as Record<string, unknown>)['self'] =
-        circularArgs.data;
+      (circularArgs.data as Record<string, unknown>)["self"] = circularArgs.data;
 
       // Should not throw stack overflow error
-      expect(() =>
-        engine.check({ name: 'test', args: circularArgs }, undefined),
-      ).not.toThrow();
+      expect(() => engine.check({ name: "test", args: circularArgs }, undefined)).not.toThrow();
 
       // Should detect the circular reference pattern
-      expect(
-        engine.check({ name: 'test', args: circularArgs }, undefined),
-      ).toBe(PolicyDecision.DENY);
+      expect(engine.check({ name: "test", args: circularArgs }, undefined)).toBe(
+        PolicyDecision.DENY,
+      );
 
       // Non-circular object should not match
-      const normalArgs = { name: 'test', data: { value: 'normal' } };
-      expect(engine.check({ name: 'test', args: normalArgs }, undefined)).toBe(
+      const normalArgs = { name: "test", data: { value: "normal" } };
+      expect(engine.check({ name: "test", args: normalArgs }, undefined)).toBe(
         PolicyDecision.ASK_USER,
       );
     });
 
-    it('should handle deep circular references', () => {
+    it("should handle deep circular references", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'deep',
+          toolName: "deep",
           argsPattern: /\[Circular\]/,
           decision: PolicyDecision.DENY,
         },
@@ -543,28 +484,26 @@ describe('PolicyEngine', () => {
       };
       // Create circular reference with proper type assertions
       const level3 = deepCircular.level1!.level2!.level3!;
-      level3['back'] = deepCircular.level1;
+      level3["back"] = deepCircular.level1;
 
       // Should handle without stack overflow
-      expect(() =>
-        engine.check({ name: 'deep', args: deepCircular }, undefined),
-      ).not.toThrow();
+      expect(() => engine.check({ name: "deep", args: deepCircular }, undefined)).not.toThrow();
 
       // Should detect the circular reference
-      expect(
-        engine.check({ name: 'deep', args: deepCircular }, undefined),
-      ).toBe(PolicyDecision.DENY);
+      expect(engine.check({ name: "deep", args: deepCircular }, undefined)).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle repeated non-circular objects correctly', () => {
+    it("should handle repeated non-circular objects correctly", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /\[Circular\]/,
           decision: PolicyDecision.DENY,
         },
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"value":"shared"/,
           decision: PolicyDecision.ALLOW,
           priority: 10,
@@ -574,7 +513,7 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       // Create an object with repeated references but no cycles
-      const sharedObj = { value: 'shared' };
+      const sharedObj = { value: "shared" };
       const args = {
         first: sharedObj,
         second: sharedObj,
@@ -582,15 +521,13 @@ describe('PolicyEngine', () => {
       };
 
       // Should NOT mark repeated objects as circular, and should match the shared value pattern
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should omit undefined and function values from objects', () => {
+    it("should omit undefined and function values from objects", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"definedValue":"test"/,
           decision: PolicyDecision.ALLOW,
         },
@@ -599,48 +536,42 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       const args = {
-        definedValue: 'test',
+        definedValue: "test",
         undefinedValue: undefined,
-        functionValue: () => 'hello',
+        functionValue: () => "hello",
         nullValue: null,
       };
 
       // Should match pattern with defined value, undefined and functions omitted
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ALLOW);
 
       // Check that the pattern would NOT match if undefined was included
       const rulesWithUndefined: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /undefinedValue/,
           decision: PolicyDecision.DENY,
         },
       ];
       engine = new PolicyEngine({ rules: rulesWithUndefined });
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ASK_USER);
 
       // Check that the pattern would NOT match if function was included
       const rulesWithFunction: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /functionValue/,
           decision: PolicyDecision.DENY,
         },
       ];
       engine = new PolicyEngine({ rules: rulesWithFunction });
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ASK_USER);
     });
 
-    it('should convert undefined and functions to null in arrays', () => {
+    it("should convert undefined and functions to null in arrays", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /\["value",null,null,null\]/,
           decision: PolicyDecision.ALLOW,
         },
@@ -649,39 +580,36 @@ describe('PolicyEngine', () => {
       engine = new PolicyEngine({ rules });
 
       const args = {
-        array: ['value', undefined, () => 'hello', null],
+        array: ["value", undefined, () => "hello", null],
       };
 
       // Should match pattern with undefined and functions converted to null
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should produce valid JSON for all inputs', () => {
-      const testCases: Array<{ input: Record<string, unknown>; desc: string }> =
-        [
-          { input: { simple: 'string' }, desc: 'simple object' },
-          {
-            input: { nested: { deep: { value: 123 } } },
-            desc: 'nested object',
-          },
-          { input: { data: [1, 2, 3] }, desc: 'simple array' },
-          { input: { mixed: [1, { a: 'b' }, null] }, desc: 'mixed array' },
-          {
-            input: { undef: undefined, func: () => {}, normal: 'value' },
-            desc: 'object with undefined and function',
-          },
-          {
-            input: { data: ['a', undefined, () => {}, null] },
-            desc: 'array with undefined and function',
-          },
-        ];
+    it("should produce valid JSON for all inputs", () => {
+      const testCases: Array<{ input: Record<string, unknown>; desc: string }> = [
+        { input: { simple: "string" }, desc: "simple object" },
+        {
+          input: { nested: { deep: { value: 123 } } },
+          desc: "nested object",
+        },
+        { input: { data: [1, 2, 3] }, desc: "simple array" },
+        { input: { mixed: [1, { a: "b" }, null] }, desc: "mixed array" },
+        {
+          input: { undef: undefined, func: () => {}, normal: "value" },
+          desc: "object with undefined and function",
+        },
+        {
+          input: { data: ["a", undefined, () => {}, null] },
+          desc: "array with undefined and function",
+        },
+      ];
 
       for (const { input } of testCases) {
         const rules: PolicyRule[] = [
           {
-            toolName: 'test',
+            toolName: "test",
             argsPattern: /.*/,
             decision: PolicyDecision.ALLOW,
           },
@@ -689,26 +617,22 @@ describe('PolicyEngine', () => {
         engine = new PolicyEngine({ rules });
 
         // Should not throw when checking (which internally uses stableStringify)
-        expect(() =>
-          engine.check({ name: 'test', args: input }, undefined),
-        ).not.toThrow();
+        expect(() => engine.check({ name: "test", args: input }, undefined)).not.toThrow();
 
         // The check should succeed
-        expect(engine.check({ name: 'test', args: input }, undefined)).toBe(
-          PolicyDecision.ALLOW,
-        );
+        expect(engine.check({ name: "test", args: input }, undefined)).toBe(PolicyDecision.ALLOW);
       }
     });
 
-    it('should respect toJSON methods on objects', () => {
+    it("should respect toJSON methods on objects", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"sanitized":"safe"/,
           decision: PolicyDecision.ALLOW,
         },
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"dangerous":"data"/,
           decision: PolicyDecision.DENY,
         },
@@ -719,21 +643,19 @@ describe('PolicyEngine', () => {
       // Object with toJSON that sanitizes output
       const args = {
         data: {
-          dangerous: 'data',
-          toJSON: () => ({ sanitized: 'safe' }),
+          dangerous: "data",
+          toJSON: () => ({ sanitized: "safe" }),
         },
       };
 
       // Should match the sanitized pattern, not the dangerous one
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should handle toJSON that returns primitives', () => {
+    it("should handle toJSON that returns primitives", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"value":"string-value"/,
           decision: PolicyDecision.ALLOW,
         },
@@ -743,21 +665,19 @@ describe('PolicyEngine', () => {
 
       const args = {
         value: {
-          complex: 'object',
-          toJSON: () => 'string-value',
+          complex: "object",
+          toJSON: () => "string-value",
         },
       };
 
       // toJSON returns a string, which should be properly stringified
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should handle toJSON that throws an error', () => {
+    it("should handle toJSON that throws an error", () => {
       const rules: PolicyRule[] = [
         {
-          toolName: 'test',
+          toolName: "test",
           argsPattern: /"fallback":"value"/,
           decision: PolicyDecision.ALLOW,
         },
@@ -767,31 +687,25 @@ describe('PolicyEngine', () => {
 
       const args = {
         data: {
-          fallback: 'value',
+          fallback: "value",
           toJSON: () => {
-            throw new Error('toJSON error');
+            throw new Error("toJSON error");
           },
         },
       };
 
       // Should fall back to regular object serialization when toJSON throws
-      expect(engine.check({ name: 'test', args }, undefined)).toBe(
-        PolicyDecision.ALLOW,
-      );
+      expect(engine.check({ name: "test", args }, undefined)).toBe(PolicyDecision.ALLOW);
     });
   });
 
-  describe('serverName requirement', () => {
-    it('should require serverName for checks', () => {
+  describe("serverName requirement", () => {
+    it("should require serverName for checks", () => {
       // @ts-expect-error - intentionally testing missing serverName
-      expect(engine.check({ name: 'test' })).toBe(PolicyDecision.ASK_USER);
+      expect(engine.check({ name: "test" })).toBe(PolicyDecision.ASK_USER);
       // When serverName is provided (even undefined), it should work
-      expect(engine.check({ name: 'test' }, undefined)).toBe(
-        PolicyDecision.ASK_USER,
-      );
-      expect(engine.check({ name: 'test' }, 'some-server')).toBe(
-        PolicyDecision.ASK_USER,
-      );
+      expect(engine.check({ name: "test" }, undefined)).toBe(PolicyDecision.ASK_USER);
+      expect(engine.check({ name: "test" }, "some-server")).toBe(PolicyDecision.ASK_USER);
     });
   });
 });
diff --git a/packages/gemini-core/src/policy/policy-engine.ts b/packages/gemini-core/src/policy/policy-engine.ts
index 034cce2c8..144d7196b 100644
--- a/packages/gemini-core/src/policy/policy-engine.ts
+++ b/packages/gemini-core/src/policy/policy-engine.ts
@@ -4,14 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type FunctionCall } from '@google/genai';
-import {
-  PolicyDecision,
-  type PolicyEngineConfig,
-  type PolicyRule,
-} from './types.js';
-import { stableStringify } from './stable-stringify.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { type FunctionCall } from "@google/genai";
+import { debugLogger } from "../utils/debugLogger.js";
+import { stableStringify } from "./stable-stringify.js";
+import { PolicyDecision, type PolicyEngineConfig, type PolicyRule } from "./types.js";
 
 function ruleMatches(
   rule: PolicyRule,
@@ -22,7 +18,7 @@ function ruleMatches(
   // Check tool name if specified
   if (rule.toolName) {
     // Support wildcard patterns: "serverName__*" matches "serverName__anyTool"
-    if (rule.toolName.endsWith('__*')) {
+    if (rule.toolName.endsWith("__*")) {
       const prefix = rule.toolName.slice(0, -3); // Remove "__*"
       if (serverName !== undefined) {
         // Robust check: if serverName is provided, it MUST match the prefix exactly.
@@ -32,7 +28,7 @@ function ruleMatches(
         }
       }
       // Always verify the prefix, even if serverName matched
-      if (!toolCall.name || !toolCall.name.startsWith(prefix + '__')) {
+      if (!toolCall.name || !toolCall.name.startsWith(prefix + "__")) {
         return false;
       }
     } else if (toolCall.name !== rule.toolName) {
@@ -47,10 +43,7 @@ function ruleMatches(
       return false;
     }
     // Use stable JSON stringification with sorted keys to ensure consistent matching
-    if (
-      stringifiedArgs === undefined ||
-      !rule.argsPattern.test(stringifiedArgs)
-    ) {
+    if (stringifiedArgs === undefined || !rule.argsPattern.test(stringifiedArgs)) {
       return false;
     }
   }
@@ -64,9 +57,7 @@ export class PolicyEngine {
   private readonly nonInteractive: boolean;
 
   constructor(config: PolicyEngineConfig = {}) {
-    this.rules = (config.rules ?? []).sort(
-      (a, b) => (b.priority ?? 0) - (a.priority ?? 0),
-    );
+    this.rules = (config.rules ?? []).sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0));
     this.defaultDecision = config.defaultDecision ?? PolicyDecision.ASK_USER;
     this.nonInteractive = config.nonInteractive ?? false;
   }
@@ -74,10 +65,7 @@ export class PolicyEngine {
   /**
    * Check if a tool call is allowed based on the configured policies.
    */
-  check(
-    toolCall: FunctionCall,
-    serverName: string | undefined,
-  ): PolicyDecision {
+  check(toolCall: FunctionCall, serverName: string | undefined): PolicyDecision {
     let stringifiedArgs: string | undefined;
     // Compute stringified args once before the loop
     if (toolCall.args && this.rules.some((rule) => rule.argsPattern)) {
@@ -92,7 +80,7 @@ export class PolicyEngine {
     for (const rule of this.rules) {
       if (ruleMatches(rule, toolCall, stringifiedArgs, serverName)) {
         debugLogger.debug(
-          `[PolicyEngine.check] MATCHED rule: toolName=${rule.toolName}, decision=${rule.decision}, priority=${rule.priority}, argsPattern=${rule.argsPattern?.source || 'none'}`,
+          `[PolicyEngine.check] MATCHED rule: toolName=${rule.toolName}, decision=${rule.decision}, priority=${rule.priority}, argsPattern=${rule.argsPattern?.source || "none"}`,
         );
         return this.applyNonInteractiveMode(rule.decision);
       }
diff --git a/packages/gemini-core/src/policy/stable-stringify.ts b/packages/gemini-core/src/policy/stable-stringify.ts
index 78db692ea..00c82a41b 100644
--- a/packages/gemini-core/src/policy/stable-stringify.ts
+++ b/packages/gemini-core/src/policy/stable-stringify.ts
@@ -60,15 +60,15 @@ export function stableStringify(obj: unknown): string {
   const stringify = (currentObj: unknown, ancestors: Set<unknown>): string => {
     // Handle primitives and null
     if (currentObj === undefined) {
-      return 'null'; // undefined in arrays becomes null in JSON
+      return "null"; // undefined in arrays becomes null in JSON
     }
     if (currentObj === null) {
-      return 'null';
+      return "null";
     }
-    if (typeof currentObj === 'function') {
-      return 'null'; // functions in arrays become null in JSON
+    if (typeof currentObj === "function") {
+      return "null"; // functions in arrays become null in JSON
     }
-    if (typeof currentObj !== 'object') {
+    if (typeof currentObj !== "object") {
       return JSON.stringify(currentObj);
     }
 
@@ -82,12 +82,12 @@ export function stableStringify(obj: unknown): string {
     try {
       // Check for toJSON method and use it if present
       const objWithToJSON = currentObj as { toJSON?: () => unknown };
-      if (typeof objWithToJSON.toJSON === 'function') {
+      if (typeof objWithToJSON.toJSON === "function") {
         try {
           const jsonValue = objWithToJSON.toJSON();
           // The result of toJSON needs to be stringified recursively
           if (jsonValue === null) {
-            return 'null';
+            return "null";
           }
           return stringify(jsonValue, ancestors);
         } catch {
@@ -98,12 +98,12 @@ export function stableStringify(obj: unknown): string {
       if (Array.isArray(currentObj)) {
         const items = currentObj.map((item) => {
           // undefined and functions in arrays become null
-          if (item === undefined || typeof item === 'function') {
-            return 'null';
+          if (item === undefined || typeof item === "function") {
+            return "null";
           }
           return stringify(item, ancestors);
         });
-        return '[' + items.join(',') + ']';
+        return "[" + items.join(",") + "]";
       }
 
       // Handle objects - sort keys and filter out undefined/function values
@@ -113,12 +113,12 @@ export function stableStringify(obj: unknown): string {
       for (const key of sortedKeys) {
         const value = (currentObj as Record<string, unknown>)[key];
         // Skip undefined and function values in objects (per JSON spec)
-        if (value !== undefined && typeof value !== 'function') {
-          pairs.push(JSON.stringify(key) + ':' + stringify(value, ancestors));
+        if (value !== undefined && typeof value !== "function") {
+          pairs.push(JSON.stringify(key) + ":" + stringify(value, ancestors));
         }
       }
 
-      return '{' + pairs.join(',') + '}';
+      return "{" + pairs.join(",") + "}";
     } finally {
       ancestors.delete(currentObj);
     }
diff --git a/packages/gemini-core/src/policy/toml-loader.test.ts b/packages/gemini-core/src/policy/toml-loader.test.ts
index 77b44bc2c..5a0877246 100644
--- a/packages/gemini-core/src/policy/toml-loader.test.ts
+++ b/packages/gemini-core/src/policy/toml-loader.test.ts
@@ -4,27 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { ApprovalMode, PolicyDecision } from './types.js';
-import type { Dirent } from 'node:fs';
-import nodePath from 'node:path';
-import type { PolicyLoadResult } from './toml-loader.js';
+import type { Dirent } from "node:fs";
+import nodePath from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { PolicyLoadResult } from "./toml-loader.js";
+import { ApprovalMode, PolicyDecision } from "./types.js";
 
 async function runLoadPoliciesFromToml(
   tomlContent: string,
-  fileName = 'test.toml',
+  fileName = "test.toml",
 ): Promise<PolicyLoadResult> {
-  const actualFs =
-    await vi.importActual<typeof import('node:fs/promises')>(
-      'node:fs/promises',
-    );
+  const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
   const mockReaddir = vi.fn(
-    async (
-      path: string,
-      _options?: { withFileTypes: boolean },
-    ): Promise<Dirent[]> => {
-      if (nodePath.normalize(path) === nodePath.normalize('/policies')) {
+    async (path: string, _options?: { withFileTypes: boolean }): Promise<Dirent[]> => {
+      if (nodePath.normalize(path) === nodePath.normalize("/policies")) {
         return [
           {
             name: fileName,
@@ -38,40 +32,37 @@ async function runLoadPoliciesFromToml(
   );
 
   const mockReadFile = vi.fn(async (path: string): Promise<string> => {
-    if (
-      nodePath.normalize(path) ===
-      nodePath.normalize(nodePath.join('/policies', fileName))
-    ) {
+    if (nodePath.normalize(path) === nodePath.normalize(nodePath.join("/policies", fileName))) {
       return tomlContent;
     }
-    throw new Error('File not found');
+    throw new Error("File not found");
   });
 
-  vi.doMock('node:fs/promises', () => ({
+  vi.doMock("node:fs/promises", () => ({
     ...actualFs,
     default: { ...actualFs, readFile: mockReadFile, readdir: mockReaddir },
     readFile: mockReadFile,
     readdir: mockReaddir,
   }));
 
-  const { loadPoliciesFromToml: load } = await import('./toml-loader.js');
+  const { loadPoliciesFromToml: load } = await import("./toml-loader.js");
 
   const getPolicyTier = (_dir: string) => 1;
-  return load(ApprovalMode.DEFAULT, ['/policies'], getPolicyTier);
+  return load(ApprovalMode.DEFAULT, ["/policies"], getPolicyTier);
 }
 
-describe('policy-toml-loader', () => {
+describe("policy-toml-loader", () => {
   beforeEach(() => {
     vi.resetModules();
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
-    vi.doUnmock('node:fs/promises');
+    vi.doUnmock("node:fs/promises");
   });
 
-  describe('loadPoliciesFromToml', () => {
-    it('should load and parse a simple policy file', async () => {
+  describe("loadPoliciesFromToml", () => {
+    it("should load and parse a simple policy file", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -81,14 +72,14 @@ priority = 100
 
       expect(result.rules).toHaveLength(1);
       expect(result.rules[0]).toEqual({
-        toolName: 'glob',
+        toolName: "glob",
         decision: PolicyDecision.ALLOW,
         priority: 1.1, // tier 1 + 100/1000
       });
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should expand commandPrefix array to multiple rules', async () => {
+    it("should expand commandPrefix array to multiple rules", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -98,18 +89,14 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(2);
-      expect(result.rules[0].toolName).toBe('run_shell_command');
-      expect(result.rules[1].toolName).toBe('run_shell_command');
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git status"}'),
-      ).toBe(true);
-      expect(result.rules[1].argsPattern?.test('{"command":"git log"}')).toBe(
-        true,
-      );
+      expect(result.rules[0].toolName).toBe("run_shell_command");
+      expect(result.rules[1].toolName).toBe("run_shell_command");
+      expect(result.rules[0].argsPattern?.test('{"command":"git status"}')).toBe(true);
+      expect(result.rules[1].argsPattern?.test('{"command":"git log"}')).toBe(true);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should transform commandRegex to argsPattern', async () => {
+    it("should transform commandRegex to argsPattern", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -119,19 +106,13 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(1);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git status"}'),
-      ).toBe(true);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git log --all"}'),
-      ).toBe(true);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git branch"}'),
-      ).toBe(false);
+      expect(result.rules[0].argsPattern?.test('{"command":"git status"}')).toBe(true);
+      expect(result.rules[0].argsPattern?.test('{"command":"git log --all"}')).toBe(true);
+      expect(result.rules[0].argsPattern?.test('{"command":"git branch"}')).toBe(false);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should expand toolName array', async () => {
+    it("should expand toolName array", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = ["glob", "grep", "read"]
@@ -140,15 +121,11 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(3);
-      expect(result.rules.map((r) => r.toolName)).toEqual([
-        'glob',
-        'grep',
-        'read',
-      ]);
+      expect(result.rules.map((r) => r.toolName)).toEqual(["glob", "grep", "read"]);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should transform mcpName to composite toolName', async () => {
+    it("should transform mcpName to composite toolName", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 mcpName = "google-workspace"
@@ -158,12 +135,12 @@ priority = 100
 `);
 
       expect(result.rules).toHaveLength(2);
-      expect(result.rules[0].toolName).toBe('google-workspace__calendar.list');
-      expect(result.rules[1].toolName).toBe('google-workspace__calendar.get');
+      expect(result.rules[0].toolName).toBe("google-workspace__calendar.list");
+      expect(result.rules[1].toolName).toBe("google-workspace__calendar.get");
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should filter rules by mode', async () => {
+    it("should filter rules by mode", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -180,11 +157,11 @@ modes = ["yolo"]
 
       // Only the first rule should be included (modes includes "default")
       expect(result.rules).toHaveLength(1);
-      expect(result.rules[0].toolName).toBe('glob');
+      expect(result.rules[0].toolName).toBe("glob");
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should handle TOML parse errors', async () => {
+    it("should handle TOML parse errors", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]
 toolName = "glob"
@@ -194,11 +171,11 @@ priority = 100
 
       expect(result.rules).toHaveLength(0);
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('toml_parse');
-      expect(result.errors[0].fileName).toBe('test.toml');
+      expect(result.errors[0].errorType).toBe("toml_parse");
+      expect(result.errors[0].fileName).toBe("test.toml");
     });
 
-    it('should handle schema validation errors', async () => {
+    it("should handle schema validation errors", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -207,11 +184,11 @@ priority = 100
 
       expect(result.rules).toHaveLength(0);
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('schema_validation');
-      expect(result.errors[0].details).toContain('decision');
+      expect(result.errors[0].errorType).toBe("schema_validation");
+      expect(result.errors[0].details).toContain("decision");
     });
 
-    it('should reject commandPrefix without run_shell_command', async () => {
+    it("should reject commandPrefix without run_shell_command", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "glob"
@@ -221,11 +198,11 @@ priority = 100
 `);
 
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('rule_validation');
-      expect(result.errors[0].details).toContain('run_shell_command');
+      expect(result.errors[0].errorType).toBe("rule_validation");
+      expect(result.errors[0].details).toContain("run_shell_command");
     });
 
-    it('should reject commandPrefix + argsPattern combination', async () => {
+    it("should reject commandPrefix + argsPattern combination", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -236,11 +213,11 @@ priority = 100
 `);
 
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('rule_validation');
-      expect(result.errors[0].details).toContain('mutually exclusive');
+      expect(result.errors[0].errorType).toBe("rule_validation");
+      expect(result.errors[0].details).toContain("mutually exclusive");
     });
 
-    it('should handle invalid regex patterns', async () => {
+    it("should handle invalid regex patterns", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -251,11 +228,11 @@ priority = 100
 
       expect(result.rules).toHaveLength(0);
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].errorType).toBe('regex_compilation');
-      expect(result.errors[0].details).toContain('git (status|branch');
+      expect(result.errors[0].errorType).toBe("regex_compilation");
+      expect(result.errors[0].details).toContain("git (status|branch");
     });
 
-    it('should escape regex special characters in commandPrefix', async () => {
+    it("should escape regex special characters in commandPrefix", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -266,35 +243,25 @@ priority = 100
 
       expect(result.rules).toHaveLength(1);
       // The regex should have escaped the * and .
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git log file.txt"}'),
-      ).toBe(false);
-      expect(
-        result.rules[0].argsPattern?.test('{"command":"git log *.txt"}'),
-      ).toBe(true);
+      expect(result.rules[0].argsPattern?.test('{"command":"git log file.txt"}')).toBe(false);
+      expect(result.rules[0].argsPattern?.test('{"command":"git log *.txt"}')).toBe(true);
       expect(result.errors).toHaveLength(0);
     });
 
-    it('should handle a mix of valid and invalid policy files', async () => {
-      const actualFs =
-        await vi.importActual<typeof import('node:fs/promises')>(
-          'node:fs/promises',
-        );
+    it("should handle a mix of valid and invalid policy files", async () => {
+      const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
       const mockReaddir = vi.fn(
-        async (
-          path: string,
-          _options?: { withFileTypes: boolean },
-        ): Promise<Dirent[]> => {
-          if (nodePath.normalize(path) === nodePath.normalize('/policies')) {
+        async (path: string, _options?: { withFileTypes: boolean }): Promise<Dirent[]> => {
+          if (nodePath.normalize(path) === nodePath.normalize("/policies")) {
             return [
               {
-                name: 'valid.toml',
+                name: "valid.toml",
                 isFile: () => true,
                 isDirectory: () => false,
               } as Dirent,
               {
-                name: 'invalid.toml',
+                name: "invalid.toml",
                 isFile: () => true,
                 isDirectory: () => false,
               } as Dirent,
@@ -306,8 +273,7 @@ priority = 100
 
       const mockReadFile = vi.fn(async (path: string): Promise<string> => {
         if (
-          nodePath.normalize(path) ===
-          nodePath.normalize(nodePath.join('/policies', 'valid.toml'))
+          nodePath.normalize(path) === nodePath.normalize(nodePath.join("/policies", "valid.toml"))
         ) {
           return `
 [[rule]]
@@ -318,7 +284,7 @@ priority = 100
         }
         if (
           nodePath.normalize(path) ===
-          nodePath.normalize(nodePath.join('/policies', 'invalid.toml'))
+          nodePath.normalize(nodePath.join("/policies", "invalid.toml"))
         ) {
           return `
 [[rule]]
@@ -327,34 +293,30 @@ decision = "allow"
 priority = -1
 `;
         }
-        throw new Error('File not found');
+        throw new Error("File not found");
       });
 
-      vi.doMock('node:fs/promises', () => ({
+      vi.doMock("node:fs/promises", () => ({
         ...actualFs,
         default: { ...actualFs, readFile: mockReadFile, readdir: mockReaddir },
         readFile: mockReadFile,
         readdir: mockReaddir,
       }));
 
-      const { loadPoliciesFromToml: load } = await import('./toml-loader.js');
+      const { loadPoliciesFromToml: load } = await import("./toml-loader.js");
 
       const getPolicyTier = (_dir: string) => 1;
-      const result = await load(
-        ApprovalMode.DEFAULT,
-        ['/policies'],
-        getPolicyTier,
-      );
+      const result = await load(ApprovalMode.DEFAULT, ["/policies"], getPolicyTier);
 
       expect(result.rules).toHaveLength(1);
-      expect(result.rules[0].toolName).toBe('glob');
+      expect(result.rules[0].toolName).toBe("glob");
       expect(result.errors).toHaveLength(1);
-      expect(result.errors[0].fileName).toBe('invalid.toml');
-      expect(result.errors[0].errorType).toBe('schema_validation');
+      expect(result.errors[0].fileName).toBe("invalid.toml");
+      expect(result.errors[0].errorType).toBe("schema_validation");
     });
   });
-  describe('Negative Tests', () => {
-    it('should return a schema_validation error if priority is missing', async () => {
+  describe("Negative Tests", () => {
+    it("should return a schema_validation error if priority is missing", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -362,11 +324,11 @@ decision = "allow"
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
     });
 
-    it('should return a schema_validation error if priority is a float', async () => {
+    it("should return a schema_validation error if priority is a float", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -375,12 +337,12 @@ priority = 1.5
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('integer');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain("integer");
     });
 
-    it('should return a schema_validation error if priority is negative', async () => {
+    it("should return a schema_validation error if priority is negative", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -389,12 +351,12 @@ priority = -1
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('>= 0');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain(">= 0");
     });
 
-    it('should return a schema_validation error if priority is much lower than 0', async () => {
+    it("should return a schema_validation error if priority is much lower than 0", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -403,12 +365,12 @@ priority = -9999
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('>= 0');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain(">= 0");
     });
 
-    it('should return a schema_validation error if priority is >= 1000', async () => {
+    it("should return a schema_validation error if priority is >= 1000", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -417,12 +379,12 @@ priority = 1000
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('<= 999');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain("<= 999");
     });
 
-    it('should return a schema_validation error if priority is much higher than 1000', async () => {
+    it("should return a schema_validation error if priority is much higher than 1000", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -431,12 +393,12 @@ priority = 9999
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('priority');
-      expect(error.details).toContain('<= 999');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("priority");
+      expect(error.details).toContain("<= 999");
     });
 
-    it('should return a schema_validation error if decision is invalid', async () => {
+    it("should return a schema_validation error if decision is invalid", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -445,11 +407,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('decision');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("decision");
     });
 
-    it('should return a schema_validation error if toolName is not a string or array', async () => {
+    it("should return a schema_validation error if toolName is not a string or array", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = 123
@@ -458,11 +420,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('schema_validation');
-      expect(error.details).toContain('toolName');
+      expect(error.errorType).toBe("schema_validation");
+      expect(error.details).toContain("toolName");
     });
 
-    it('should return a rule_validation error if commandRegex is used with wrong toolName', async () => {
+    it("should return a rule_validation error if commandRegex is used with wrong toolName", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "not_shell"
@@ -472,11 +434,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('rule_validation');
-      expect(error.details).toContain('run_shell_command');
+      expect(error.errorType).toBe("rule_validation");
+      expect(error.details).toContain("run_shell_command");
     });
 
-    it('should return a rule_validation error if commandPrefix and commandRegex are combined', async () => {
+    it("should return a rule_validation error if commandPrefix and commandRegex are combined", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "run_shell_command"
@@ -487,11 +449,11 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('rule_validation');
-      expect(error.details).toContain('mutually exclusive');
+      expect(error.errorType).toBe("rule_validation");
+      expect(error.details).toContain("mutually exclusive");
     });
 
-    it('should return a regex_compilation error for invalid argsPattern', async () => {
+    it("should return a regex_compilation error for invalid argsPattern", async () => {
       const result = await runLoadPoliciesFromToml(`
 [[rule]]
 toolName = "test"
@@ -501,38 +463,31 @@ priority = 100
 `);
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('regex_compilation');
-      expect(error.message).toBe('Invalid regex pattern');
+      expect(error.errorType).toBe("regex_compilation");
+      expect(error.message).toBe("Invalid regex pattern");
     });
 
-    it('should return a file_read error if readdir fails', async () => {
-      const actualFs =
-        await vi.importActual<typeof import('node:fs/promises')>(
-          'node:fs/promises',
-        );
+    it("should return a file_read error if readdir fails", async () => {
+      const actualFs = await vi.importActual<typeof import("node:fs/promises")>("node:fs/promises");
 
       const mockReaddir = vi.fn(async () => {
-        throw new Error('Permission denied');
+        throw new Error("Permission denied");
       });
 
-      vi.doMock('node:fs/promises', () => ({
+      vi.doMock("node:fs/promises", () => ({
         ...actualFs,
         default: { ...actualFs, readdir: mockReaddir },
         readdir: mockReaddir,
       }));
 
-      const { loadPoliciesFromToml: load } = await import('./toml-loader.js');
+      const { loadPoliciesFromToml: load } = await import("./toml-loader.js");
       const getPolicyTier = (_dir: string) => 1;
-      const result = await load(
-        ApprovalMode.DEFAULT,
-        ['/policies'],
-        getPolicyTier,
-      );
+      const result = await load(ApprovalMode.DEFAULT, ["/policies"], getPolicyTier);
 
       expect(result.errors).toHaveLength(1);
       const error = result.errors[0];
-      expect(error.errorType).toBe('file_read');
-      expect(error.message).toContain('Failed to read policy directory');
+      expect(error.errorType).toBe("file_read");
+      expect(error.message).toContain("Failed to read policy directory");
     });
   });
 });
diff --git a/packages/gemini-core/src/policy/toml-loader.ts b/packages/gemini-core/src/policy/toml-loader.ts
index a57d4aa77..59a75011d 100644
--- a/packages/gemini-core/src/policy/toml-loader.ts
+++ b/packages/gemini-core/src/policy/toml-loader.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type PolicyRule, PolicyDecision, type ApprovalMode } from './types.js';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import toml from '@iarna/toml';
-import { z, type ZodError } from 'zod';
+import fs from "node:fs/promises";
+import path from "node:path";
+import toml from "@iarna/toml";
+import { type ZodError, z } from "zod";
+import { type ApprovalMode, PolicyDecision, type PolicyRule } from "./types.js";
 
 /**
  * Schema for a single policy rule in the TOML file (before transformation).
@@ -27,14 +27,14 @@ const PolicyRuleSchema = z.object({
   // - Tier 3 (admin): range [3.000, 3.999]
   priority: z
     .number({
-      required_error: 'priority is required',
-      invalid_type_error: 'priority must be a number',
+      required_error: "priority is required",
+      invalid_type_error: "priority must be a number",
     })
-    .int({ message: 'priority must be an integer' })
-    .min(0, { message: 'priority must be >= 0' })
+    .int({ message: "priority must be an integer" })
+    .min(0, { message: "priority must be >= 0" })
     .max(999, {
       message:
-        'priority must be <= 999 to prevent tier overflow. Priorities >= 1000 would jump to the next tier.',
+        "priority must be <= 999 to prevent tier overflow. Priorities >= 1000 would jump to the next tier.",
     }),
   modes: z.array(z.string()).optional(),
 });
@@ -55,11 +55,11 @@ type PolicyRuleToml = z.infer<typeof PolicyRuleSchema>;
  * Types of errors that can occur while loading policy files.
  */
 export type PolicyFileErrorType =
-  | 'file_read'
-  | 'toml_parse'
-  | 'schema_validation'
-  | 'rule_validation'
-  | 'regex_compilation';
+  | "file_read"
+  | "toml_parse"
+  | "schema_validation"
+  | "rule_validation"
+  | "regex_compilation";
 
 /**
  * Detailed error information for policy file loading failures.
@@ -67,7 +67,7 @@ export type PolicyFileErrorType =
 export interface PolicyFileError {
   filePath: string;
   fileName: string;
-  tier: 'default' | 'user' | 'admin';
+  tier: "default" | "user" | "admin";
   ruleIndex?: number;
   errorType: PolicyFileErrorType;
   message: string;
@@ -91,17 +91,17 @@ export interface PolicyLoadResult {
  * @returns The escaped string safe for use in a regex
  */
 function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
 /**
  * Converts a tier number to a human-readable tier name.
  */
-function getTierName(tier: number): 'default' | 'user' | 'admin' {
-  if (tier === 1) return 'default';
-  if (tier === 2) return 'user';
-  if (tier === 3) return 'admin';
-  return 'default';
+function getTierName(tier: number): "default" | "user" | "admin" {
+  if (tier === 1) return "default";
+  if (tier === 2) return "user";
+  if (tier === 3) return "admin";
+  return "default";
 }
 
 /**
@@ -110,10 +110,10 @@ function getTierName(tier: number): 'default' | 'user' | 'admin' {
 function formatSchemaError(error: ZodError, ruleIndex: number): string {
   const issues = error.issues
     .map((issue) => {
-      const path = issue.path.join('.');
+      const path = issue.path.join(".");
       return `  - Field "${path}": ${issue.message}`;
     })
-    .join('\n');
+    .join("\n");
   return `Invalid policy rule (rule #${ruleIndex + 1}):\n${issues}`;
 }
 
@@ -121,17 +121,14 @@ function formatSchemaError(error: ZodError, ruleIndex: number): string {
  * Validates shell command convenience syntax rules.
  * Returns an error message if invalid, or null if valid.
  */
-function validateShellCommandSyntax(
-  rule: PolicyRuleToml,
-  ruleIndex: number,
-): string | null {
+function validateShellCommandSyntax(rule: PolicyRuleToml, ruleIndex: number): string | null {
   const hasCommandPrefix = rule.commandPrefix !== undefined;
   const hasCommandRegex = rule.commandRegex !== undefined;
   const hasArgsPattern = rule.argsPattern !== undefined;
 
   if (hasCommandPrefix || hasCommandRegex) {
     // Must have exactly toolName = "run_shell_command"
-    if (rule.toolName !== 'run_shell_command' || Array.isArray(rule.toolName)) {
+    if (rule.toolName !== "run_shell_command" || Array.isArray(rule.toolName)) {
       return (
         `Rule #${ruleIndex + 1}: commandPrefix and commandRegex can only be used with toolName = "run_shell_command"\n` +
         `  Found: toolName = ${JSON.stringify(rule.toolName)}\n` +
@@ -205,11 +202,11 @@ export async function loadPoliciesFromToml(
     try {
       const dirEntries = await fs.readdir(dir, { withFileTypes: true });
       filesToLoad = dirEntries
-        .filter((entry) => entry.isFile() && entry.name.endsWith('.toml'))
+        .filter((entry) => entry.isFile() && entry.name.endsWith(".toml"))
         .map((entry) => entry.name);
     } catch (e) {
       const error = e as NodeJS.ErrnoException;
-      if (error.code === 'ENOENT') {
+      if (error.code === "ENOENT") {
         // Directory doesn't exist, skip it (not an error)
         continue;
       }
@@ -217,7 +214,7 @@ export async function loadPoliciesFromToml(
         filePath: dir,
         fileName: path.basename(dir),
         tier: tierName,
-        errorType: 'file_read',
+        errorType: "file_read",
         message: `Failed to read policy directory`,
         details: error.message,
       });
@@ -229,7 +226,7 @@ export async function loadPoliciesFromToml(
 
       try {
         // Read file
-        const fileContent = await fs.readFile(filePath, 'utf-8');
+        const fileContent = await fs.readFile(filePath, "utf-8");
 
         // Parse TOML
         let parsed: unknown;
@@ -241,11 +238,10 @@ export async function loadPoliciesFromToml(
             filePath,
             fileName: file,
             tier: tierName,
-            errorType: 'toml_parse',
-            message: 'TOML parsing failed',
+            errorType: "toml_parse",
+            message: "TOML parsing failed",
             details: error.message,
-            suggestion:
-              'Check for syntax errors like missing quotes, brackets, or commas',
+            suggestion: "Check for syntax errors like missing quotes, brackets, or commas",
           });
           continue;
         }
@@ -257,11 +253,11 @@ export async function loadPoliciesFromToml(
             filePath,
             fileName: file,
             tier: tierName,
-            errorType: 'schema_validation',
-            message: 'Schema validation failed',
+            errorType: "schema_validation",
+            message: "Schema validation failed",
             details: formatSchemaError(validationResult.error, 0),
             suggestion:
-              'Ensure all required fields (decision, priority) are present with correct types',
+              "Ensure all required fields (decision, priority) are present with correct types",
           });
           continue;
         }
@@ -276,8 +272,8 @@ export async function loadPoliciesFromToml(
               fileName: file,
               tier: tierName,
               ruleIndex: i,
-              errorType: 'rule_validation',
-              message: 'Invalid shell command syntax',
+              errorType: "rule_validation",
+              message: "Invalid shell command syntax",
               details: validationError,
             });
             // Continue to next rule, don't skip the entire file
@@ -310,9 +306,7 @@ export async function loadPoliciesFromToml(
             // Expand command prefixes to multiple patterns
             const argsPatterns: Array<string | undefined> =
               commandPrefixes.length > 0
-                ? commandPrefixes.map(
-                    (prefix) => `"command":"${escapeRegex(prefix)}`,
-                  )
+                ? commandPrefixes.map((prefix) => `"command":"${escapeRegex(prefix)}`)
                 : [effectiveArgsPattern];
 
             // For each argsPattern, expand toolName arrays
@@ -351,11 +345,11 @@ export async function loadPoliciesFromToml(
                       filePath,
                       fileName: file,
                       tier: tierName,
-                      errorType: 'regex_compilation',
-                      message: 'Invalid regex pattern',
+                      errorType: "regex_compilation",
+                      message: "Invalid regex pattern",
                       details: `Pattern: ${argsPattern}\nError: ${error.message}`,
                       suggestion:
-                        'Check regex syntax for errors like unmatched brackets or invalid escape sequences',
+                        "Check regex syntax for errors like unmatched brackets or invalid escape sequences",
                     });
                     // Skip this rule if regex compilation fails
                     return null;
@@ -372,13 +366,13 @@ export async function loadPoliciesFromToml(
       } catch (e) {
         const error = e as NodeJS.ErrnoException;
         // Catch-all for unexpected errors
-        if (error.code !== 'ENOENT') {
+        if (error.code !== "ENOENT") {
           errors.push({
             filePath,
             fileName: file,
             tier: tierName,
-            errorType: 'file_read',
-            message: 'Failed to read policy file',
+            errorType: "file_read",
+            message: "Failed to read policy file",
             details: error.message,
           });
         }
diff --git a/packages/gemini-core/src/policy/types.ts b/packages/gemini-core/src/policy/types.ts
index 2ab7ba5ed..a2f1e949f 100644
--- a/packages/gemini-core/src/policy/types.ts
+++ b/packages/gemini-core/src/policy/types.ts
@@ -5,15 +5,15 @@
  */
 
 export enum PolicyDecision {
-  ALLOW = 'allow',
-  DENY = 'deny',
-  ASK_USER = 'ask_user',
+  ALLOW = "allow",
+  DENY = "deny",
+  ASK_USER = "ask_user",
 }
 
 export enum ApprovalMode {
-  DEFAULT = 'default',
-  AUTO_EDIT = 'autoEdit',
-  YOLO = 'yolo',
+  DEFAULT = "default",
+  AUTO_EDIT = "autoEdit",
+  YOLO = "yolo",
 }
 
 export interface PolicyRule {
diff --git a/packages/gemini-core/src/prompts/mcp-prompts.test.ts b/packages/gemini-core/src/prompts/mcp-prompts.test.ts
index dfbfea859..ef795297d 100644
--- a/packages/gemini-core/src/prompts/mcp-prompts.test.ts
+++ b/packages/gemini-core/src/prompts/mcp-prompts.test.ts
@@ -4,46 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { getMCPServerPrompts } from './mcp-prompts.js';
-import type { Config } from '../config/config.js';
-import { PromptRegistry } from './prompt-registry.js';
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
-
-describe('getMCPServerPrompts', () => {
-  it('should return prompts from the registry for a given server', () => {
+import { describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
+import { getMCPServerPrompts } from "./mcp-prompts.js";
+import { PromptRegistry } from "./prompt-registry.js";
+
+describe("getMCPServerPrompts", () => {
+  it("should return prompts from the registry for a given server", () => {
     const mockPrompts: DiscoveredMCPPrompt[] = [
       {
-        name: 'prompt1',
-        serverName: 'server1',
-        tool: { name: 'p1', description: '', inputSchema: {} },
+        name: "prompt1",
+        serverName: "server1",
+        tool: { name: "p1", description: "", inputSchema: {} },
         invoke: async () => ({
-          messages: [
-            { role: 'assistant', content: { type: 'text', text: '' } },
-          ],
+          messages: [{ role: "assistant", content: { type: "text", text: "" } }],
         }),
       },
     ];
 
     const mockRegistry = new PromptRegistry();
-    vi.spyOn(mockRegistry, 'getPromptsByServer').mockReturnValue(mockPrompts);
+    vi.spyOn(mockRegistry, "getPromptsByServer").mockReturnValue(mockPrompts);
 
     const mockConfig = {
       getPromptRegistry: () => mockRegistry,
     } as unknown as Config;
 
-    const result = getMCPServerPrompts(mockConfig, 'server1');
+    const result = getMCPServerPrompts(mockConfig, "server1");
 
-    expect(mockRegistry.getPromptsByServer).toHaveBeenCalledWith('server1');
+    expect(mockRegistry.getPromptsByServer).toHaveBeenCalledWith("server1");
     expect(result).toEqual(mockPrompts);
   });
 
-  it('should return an empty array if there is no prompt registry', () => {
+  it("should return an empty array if there is no prompt registry", () => {
     const mockConfig = {
       getPromptRegistry: () => undefined,
     } as unknown as Config;
 
-    const result = getMCPServerPrompts(mockConfig, 'server1');
+    const result = getMCPServerPrompts(mockConfig, "server1");
 
     expect(result).toEqual([]);
   });
diff --git a/packages/gemini-core/src/prompts/mcp-prompts.ts b/packages/gemini-core/src/prompts/mcp-prompts.ts
index 01096cf06..6274ccb96 100644
--- a/packages/gemini-core/src/prompts/mcp-prompts.ts
+++ b/packages/gemini-core/src/prompts/mcp-prompts.ts
@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
+import type { Config } from "../config/config.js";
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
 
-export function getMCPServerPrompts(
-  config: Config,
-  serverName: string,
-): DiscoveredMCPPrompt[] {
+export function getMCPServerPrompts(config: Config, serverName: string): DiscoveredMCPPrompt[] {
   const promptRegistry = config.getPromptRegistry();
   if (!promptRegistry) {
     return [];
diff --git a/packages/gemini-core/src/prompts/prompt-registry.test.ts b/packages/gemini-core/src/prompts/prompt-registry.test.ts
index 35d27884b..c1293fa49 100644
--- a/packages/gemini-core/src/prompts/prompt-registry.test.ts
+++ b/packages/gemini-core/src/prompts/prompt-registry.test.ts
@@ -4,62 +4,56 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { PromptRegistry } from './prompt-registry.js';
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { PromptRegistry } from "./prompt-registry.js";
 
-vi.mock('../utils/debugLogger.js', () => ({
+vi.mock("../utils/debugLogger.js", () => ({
   debugLogger: {
     warn: vi.fn(),
   },
 }));
 
-describe('PromptRegistry', () => {
+describe("PromptRegistry", () => {
   let registry: PromptRegistry;
 
   const prompt1: DiscoveredMCPPrompt = {
-    name: 'prompt1',
-    serverName: 'server1',
+    name: "prompt1",
+    serverName: "server1",
     tool: {
-      name: 'prompt1',
-      description: 'Prompt 1',
+      name: "prompt1",
+      description: "Prompt 1",
       inputSchema: {},
     },
     invoke: async () => ({
-      messages: [
-        { role: 'assistant', content: { type: 'text', text: 'response1' } },
-      ],
+      messages: [{ role: "assistant", content: { type: "text", text: "response1" } }],
     }),
   };
 
   const prompt2: DiscoveredMCPPrompt = {
-    name: 'prompt2',
-    serverName: 'server1',
+    name: "prompt2",
+    serverName: "server1",
     tool: {
-      name: 'prompt2',
-      description: 'Prompt 2',
+      name: "prompt2",
+      description: "Prompt 2",
       inputSchema: {},
     },
     invoke: async () => ({
-      messages: [
-        { role: 'assistant', content: { type: 'text', text: 'response2' } },
-      ],
+      messages: [{ role: "assistant", content: { type: "text", text: "response2" } }],
     }),
   };
 
   const prompt3: DiscoveredMCPPrompt = {
-    name: 'prompt1',
-    serverName: 'server2',
+    name: "prompt1",
+    serverName: "server2",
     tool: {
-      name: 'prompt1',
-      description: 'Prompt 3',
+      name: "prompt1",
+      description: "Prompt 3",
       inputSchema: {},
     },
     invoke: async () => ({
-      messages: [
-        { role: 'assistant', content: { type: 'text', text: 'response3' } },
-      ],
+      messages: [{ role: "assistant", content: { type: "text", text: "response3" } }],
     }),
   };
 
@@ -68,62 +62,62 @@ describe('PromptRegistry', () => {
     vi.clearAllMocks();
   });
 
-  it('should register a prompt', () => {
+  it("should register a prompt", () => {
     registry.registerPrompt(prompt1);
-    expect(registry.getPrompt('prompt1')).toEqual(prompt1);
+    expect(registry.getPrompt("prompt1")).toEqual(prompt1);
   });
 
-  it('should get all prompts, sorted by name', () => {
+  it("should get all prompts, sorted by name", () => {
     registry.registerPrompt(prompt2);
     registry.registerPrompt(prompt1);
     expect(registry.getAllPrompts()).toEqual([prompt1, prompt2]);
   });
 
-  it('should get a specific prompt by name', () => {
+  it("should get a specific prompt by name", () => {
     registry.registerPrompt(prompt1);
-    expect(registry.getPrompt('prompt1')).toEqual(prompt1);
-    expect(registry.getPrompt('non-existent')).toBeUndefined();
+    expect(registry.getPrompt("prompt1")).toEqual(prompt1);
+    expect(registry.getPrompt("non-existent")).toBeUndefined();
   });
 
-  it('should get prompts by server, sorted by name', () => {
+  it("should get prompts by server, sorted by name", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt2);
     registry.registerPrompt(prompt3); // different server
-    expect(registry.getPromptsByServer('server1')).toEqual([prompt1, prompt2]);
-    expect(registry.getPromptsByServer('server2')).toEqual([
-      { ...prompt3, name: 'server2_prompt1' },
+    expect(registry.getPromptsByServer("server1")).toEqual([prompt1, prompt2]);
+    expect(registry.getPromptsByServer("server2")).toEqual([
+      { ...prompt3, name: "server2_prompt1" },
     ]);
   });
 
-  it('should handle prompt name collision by renaming', () => {
+  it("should handle prompt name collision by renaming", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt3);
 
-    expect(registry.getPrompt('prompt1')).toEqual(prompt1);
-    const renamedPrompt = { ...prompt3, name: 'server2_prompt1' };
-    expect(registry.getPrompt('server2_prompt1')).toEqual(renamedPrompt);
+    expect(registry.getPrompt("prompt1")).toEqual(prompt1);
+    const renamedPrompt = { ...prompt3, name: "server2_prompt1" };
+    expect(registry.getPrompt("server2_prompt1")).toEqual(renamedPrompt);
     expect(debugLogger.warn).toHaveBeenCalledWith(
       'Prompt with name "prompt1" is already registered. Renaming to "server2_prompt1".',
     );
   });
 
-  it('should clear all prompts', () => {
+  it("should clear all prompts", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt2);
     registry.clear();
     expect(registry.getAllPrompts()).toEqual([]);
   });
 
-  it('should remove prompts by server', () => {
+  it("should remove prompts by server", () => {
     registry.registerPrompt(prompt1);
     registry.registerPrompt(prompt2);
     registry.registerPrompt(prompt3);
-    registry.removePromptsByServer('server1');
+    registry.removePromptsByServer("server1");
 
-    const renamedPrompt = { ...prompt3, name: 'server2_prompt1' };
+    const renamedPrompt = { ...prompt3, name: "server2_prompt1" };
     expect(registry.getAllPrompts()).toEqual([renamedPrompt]);
-    expect(registry.getPrompt('prompt1')).toBeUndefined();
-    expect(registry.getPrompt('prompt2')).toBeUndefined();
-    expect(registry.getPrompt('server2_prompt1')).toEqual(renamedPrompt);
+    expect(registry.getPrompt("prompt1")).toBeUndefined();
+    expect(registry.getPrompt("prompt2")).toBeUndefined();
+    expect(registry.getPrompt("server2_prompt1")).toEqual(renamedPrompt);
   });
 });
diff --git a/packages/gemini-core/src/prompts/prompt-registry.ts b/packages/gemini-core/src/prompts/prompt-registry.ts
index 921d8bc41..3af4b69c9 100644
--- a/packages/gemini-core/src/prompts/prompt-registry.ts
+++ b/packages/gemini-core/src/prompts/prompt-registry.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { DiscoveredMCPPrompt } from '../tools/mcp-client.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { DiscoveredMCPPrompt } from "../tools/mcp-client.js";
+import { debugLogger } from "../utils/debugLogger.js";
 
 export class PromptRegistry {
   private prompts: Map<string, DiscoveredMCPPrompt> = new Map();
@@ -30,9 +30,7 @@ export class PromptRegistry {
    * Returns an array of all registered and discovered prompt instances.
    */
   getAllPrompts(): DiscoveredMCPPrompt[] {
-    return Array.from(this.prompts.values()).sort((a, b) =>
-      a.name.localeCompare(b.name),
-    );
+    return Array.from(this.prompts.values()).sort((a, b) => a.name.localeCompare(b.name));
   }
 
   /**
diff --git a/packages/gemini-core/src/routing/modelRouterService.test.ts b/packages/gemini-core/src/routing/modelRouterService.test.ts
index 39199a688..64c6c69f9 100644
--- a/packages/gemini-core/src/routing/modelRouterService.test.ts
+++ b/packages/gemini-core/src/routing/modelRouterService.test.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ModelRouterService } from './modelRouterService.js';
-import { Config } from '../config/config.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { RoutingContext, RoutingDecision } from './routingStrategy.js';
-import { DefaultStrategy } from './strategies/defaultStrategy.js';
-import { CompositeStrategy } from './strategies/compositeStrategy.js';
-import { FallbackStrategy } from './strategies/fallbackStrategy.js';
-import { OverrideStrategy } from './strategies/overrideStrategy.js';
-import { ClassifierStrategy } from './strategies/classifierStrategy.js';
-import { logModelRouting } from '../telemetry/loggers.js';
-import { ModelRoutingEvent } from '../telemetry/types.js';
-
-vi.mock('../config/config.js');
-vi.mock('../core/baseLlmClient.js');
-vi.mock('./strategies/defaultStrategy.js');
-vi.mock('./strategies/compositeStrategy.js');
-vi.mock('./strategies/fallbackStrategy.js');
-vi.mock('./strategies/overrideStrategy.js');
-vi.mock('./strategies/classifierStrategy.js');
-vi.mock('../telemetry/loggers.js');
-vi.mock('../telemetry/types.js');
-
-describe('ModelRouterService', () => {
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { logModelRouting } from "../telemetry/loggers.js";
+import { ModelRoutingEvent } from "../telemetry/types.js";
+import { ModelRouterService } from "./modelRouterService.js";
+import type { RoutingContext, RoutingDecision } from "./routingStrategy.js";
+import { ClassifierStrategy } from "./strategies/classifierStrategy.js";
+import { CompositeStrategy } from "./strategies/compositeStrategy.js";
+import { DefaultStrategy } from "./strategies/defaultStrategy.js";
+import { FallbackStrategy } from "./strategies/fallbackStrategy.js";
+import { OverrideStrategy } from "./strategies/overrideStrategy.js";
+
+vi.mock("../config/config.js");
+vi.mock("../core/baseLlmClient.js");
+vi.mock("./strategies/defaultStrategy.js");
+vi.mock("./strategies/compositeStrategy.js");
+vi.mock("./strategies/fallbackStrategy.js");
+vi.mock("./strategies/overrideStrategy.js");
+vi.mock("./strategies/classifierStrategy.js");
+vi.mock("../telemetry/loggers.js");
+vi.mock("../telemetry/types.js");
+
+describe("ModelRouterService", () => {
   let service: ModelRouterService;
   let mockConfig: Config;
   let mockBaseLlmClient: BaseLlmClient;
@@ -39,7 +39,7 @@ describe('ModelRouterService', () => {
 
     mockConfig = new Config({} as never);
     mockBaseLlmClient = {} as BaseLlmClient;
-    vi.spyOn(mockConfig, 'getBaseLlmClient').mockReturnValue(mockBaseLlmClient);
+    vi.spyOn(mockConfig, "getBaseLlmClient").mockReturnValue(mockBaseLlmClient);
 
     mockCompositeStrategy = new CompositeStrategy(
       [
@@ -48,27 +48,25 @@ describe('ModelRouterService', () => {
         new ClassifierStrategy(),
         new DefaultStrategy(),
       ],
-      'agent-router',
-    );
-    vi.mocked(CompositeStrategy).mockImplementation(
-      () => mockCompositeStrategy,
+      "agent-router",
     );
+    vi.mocked(CompositeStrategy).mockImplementation(() => mockCompositeStrategy);
 
     service = new ModelRouterService(mockConfig);
 
     mockContext = {
       history: [],
-      request: [{ text: 'test prompt' }],
+      request: [{ text: "test prompt" }],
       signal: new AbortController().signal,
     };
   });
 
-  it('should initialize with a CompositeStrategy', () => {
+  it("should initialize with a CompositeStrategy", () => {
     expect(CompositeStrategy).toHaveBeenCalled();
-    expect(service['strategy']).toBeInstanceOf(CompositeStrategy);
+    expect(service["strategy"]).toBeInstanceOf(CompositeStrategy);
   });
 
-  it('should initialize the CompositeStrategy with the correct child strategies in order', () => {
+  it("should initialize the CompositeStrategy with the correct child strategies in order", () => {
     // This test relies on the mock implementation detail of the constructor
     const compositeStrategyArgs = vi.mocked(CompositeStrategy).mock.calls[0];
     const childStrategies = compositeStrategyArgs[0];
@@ -78,74 +76,62 @@ describe('ModelRouterService', () => {
     expect(childStrategies[1]).toBeInstanceOf(OverrideStrategy);
     expect(childStrategies[2]).toBeInstanceOf(ClassifierStrategy);
     expect(childStrategies[3]).toBeInstanceOf(DefaultStrategy);
-    expect(compositeStrategyArgs[1]).toBe('agent-router');
+    expect(compositeStrategyArgs[1]).toBe("agent-router");
   });
 
-  describe('route()', () => {
+  describe("route()", () => {
     const strategyDecision: RoutingDecision = {
-      model: 'strategy-chosen-model',
+      model: "strategy-chosen-model",
       metadata: {
-        source: 'test-router/fallback',
+        source: "test-router/fallback",
         latencyMs: 10,
-        reasoning: 'Strategy reasoning',
+        reasoning: "Strategy reasoning",
       },
     };
 
-    it('should delegate routing to the composite strategy', async () => {
+    it("should delegate routing to the composite strategy", async () => {
       const strategySpy = vi
-        .spyOn(mockCompositeStrategy, 'route')
+        .spyOn(mockCompositeStrategy, "route")
         .mockResolvedValue(strategyDecision);
 
       const decision = await service.route(mockContext);
 
-      expect(strategySpy).toHaveBeenCalledWith(
-        mockContext,
-        mockConfig,
-        mockBaseLlmClient,
-      );
+      expect(strategySpy).toHaveBeenCalledWith(mockContext, mockConfig, mockBaseLlmClient);
       expect(decision).toEqual(strategyDecision);
     });
 
-    it('should log a telemetry event on a successful decision', async () => {
-      vi.spyOn(mockCompositeStrategy, 'route').mockResolvedValue(
-        strategyDecision,
-      );
+    it("should log a telemetry event on a successful decision", async () => {
+      vi.spyOn(mockCompositeStrategy, "route").mockResolvedValue(strategyDecision);
 
       await service.route(mockContext);
 
       expect(ModelRoutingEvent).toHaveBeenCalledWith(
-        'strategy-chosen-model',
-        'test-router/fallback',
+        "strategy-chosen-model",
+        "test-router/fallback",
         10,
-        'Strategy reasoning',
+        "Strategy reasoning",
         false,
         undefined,
       );
-      expect(logModelRouting).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(ModelRoutingEvent),
-      );
+      expect(logModelRouting).toHaveBeenCalledWith(mockConfig, expect.any(ModelRoutingEvent));
     });
 
-    it('should log a telemetry event and re-throw on a failed decision', async () => {
-      const testError = new Error('Strategy failed');
-      vi.spyOn(mockCompositeStrategy, 'route').mockRejectedValue(testError);
-      vi.spyOn(mockConfig, 'getModel').mockReturnValue('default-model');
+    it("should log a telemetry event and re-throw on a failed decision", async () => {
+      const testError = new Error("Strategy failed");
+      vi.spyOn(mockCompositeStrategy, "route").mockRejectedValue(testError);
+      vi.spyOn(mockConfig, "getModel").mockReturnValue("default-model");
 
       await expect(service.route(mockContext)).rejects.toThrow(testError);
 
       expect(ModelRoutingEvent).toHaveBeenCalledWith(
-        'default-model',
-        'router-exception',
+        "default-model",
+        "router-exception",
         expect.any(Number),
-        'An exception occurred during routing.',
+        "An exception occurred during routing.",
         true,
-        'Strategy failed',
-      );
-      expect(logModelRouting).toHaveBeenCalledWith(
-        mockConfig,
-        expect.any(ModelRoutingEvent),
+        "Strategy failed",
       );
+      expect(logModelRouting).toHaveBeenCalledWith(mockConfig, expect.any(ModelRoutingEvent));
     });
   });
 });
diff --git a/packages/gemini-core/src/routing/modelRouterService.ts b/packages/gemini-core/src/routing/modelRouterService.ts
index 3898ff410..f6e298cfa 100644
--- a/packages/gemini-core/src/routing/modelRouterService.ts
+++ b/packages/gemini-core/src/routing/modelRouterService.ts
@@ -4,20 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  TerminalStrategy,
-} from './routingStrategy.js';
-import { DefaultStrategy } from './strategies/defaultStrategy.js';
-import { ClassifierStrategy } from './strategies/classifierStrategy.js';
-import { CompositeStrategy } from './strategies/compositeStrategy.js';
-import { FallbackStrategy } from './strategies/fallbackStrategy.js';
-import { OverrideStrategy } from './strategies/overrideStrategy.js';
-
-import { logModelRouting } from '../telemetry/loggers.js';
-import { ModelRoutingEvent } from '../telemetry/types.js';
+import type { Config } from "../config/config.js";
+import { logModelRouting } from "../telemetry/loggers.js";
+import { ModelRoutingEvent } from "../telemetry/types.js";
+import type { RoutingContext, RoutingDecision, TerminalStrategy } from "./routingStrategy.js";
+import { ClassifierStrategy } from "./strategies/classifierStrategy.js";
+import { CompositeStrategy } from "./strategies/compositeStrategy.js";
+import { DefaultStrategy } from "./strategies/defaultStrategy.js";
+import { FallbackStrategy } from "./strategies/fallbackStrategy.js";
+import { OverrideStrategy } from "./strategies/overrideStrategy.js";
 
 /**
  * A centralized service for making model routing decisions.
@@ -41,7 +36,7 @@ export class ModelRouterService {
         new ClassifierStrategy(),
         new DefaultStrategy(),
       ],
-      'agent-router',
+      "agent-router",
     );
   }
 
@@ -56,11 +51,7 @@ export class ModelRouterService {
     let decision: RoutingDecision;
 
     try {
-      decision = await this.strategy.route(
-        context,
-        this.config,
-        this.config.getBaseLlmClient(),
-      );
+      decision = await this.strategy.route(context, this.config, this.config.getBaseLlmClient());
 
       const event = new ModelRoutingEvent(
         decision.model,
@@ -82,9 +73,9 @@ export class ModelRouterService {
       decision = {
         model: this.config.getModel(),
         metadata: {
-          source: 'router-exception',
+          source: "router-exception",
           latencyMs: Date.now() - startTime,
-          reasoning: 'An exception occurred during routing.',
+          reasoning: "An exception occurred during routing.",
           error: error_message,
         },
       };
diff --git a/packages/gemini-core/src/routing/routingStrategy.ts b/packages/gemini-core/src/routing/routingStrategy.ts
index d5d8df8dc..e2cc98c4c 100644
--- a/packages/gemini-core/src/routing/routingStrategy.ts
+++ b/packages/gemini-core/src/routing/routingStrategy.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content, PartListUnion } from '@google/genai';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { Config } from '../config/config.js';
+import type { Content, PartListUnion } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
 
 /**
  * The output of a routing decision. It specifies which model to use and why.
diff --git a/packages/gemini-core/src/routing/strategies/classifierStrategy.test.ts b/packages/gemini-core/src/routing/strategies/classifierStrategy.test.ts
index 56cd9b5d3..c31e38608 100644
--- a/packages/gemini-core/src/routing/strategies/classifierStrategy.test.ts
+++ b/packages/gemini-core/src/routing/strategies/classifierStrategy.test.ts
@@ -4,27 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ClassifierStrategy } from './classifierStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import {
-  isFunctionCall,
-  isFunctionResponse,
-} from '../../utils/messageInspectors.js';
-import {
-  DEFAULT_GEMINI_FLASH_MODEL,
-  DEFAULT_GEMINI_MODEL,
-} from '../../config/models.js';
-import { promptIdContext } from '../../utils/promptIdContext.js';
-import type { Content } from '@google/genai';
-import type { ResolvedModelConfig } from '../../services/modelConfigService.js';
-
-vi.mock('../../core/baseLlmClient.js');
-vi.mock('../../utils/promptIdContext.js');
-
-describe('ClassifierStrategy', () => {
+import type { Content } from "@google/genai";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { ResolvedModelConfig } from "../../services/modelConfigService.js";
+import { isFunctionCall, isFunctionResponse } from "../../utils/messageInspectors.js";
+import { promptIdContext } from "../../utils/promptIdContext.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { ClassifierStrategy } from "./classifierStrategy.js";
+
+vi.mock("../../core/baseLlmClient.js");
+vi.mock("../../utils/promptIdContext.js");
+
+describe("ClassifierStrategy", () => {
   let strategy: ClassifierStrategy;
   let mockContext: RoutingContext;
   let mockConfig: Config;
@@ -37,11 +31,11 @@ describe('ClassifierStrategy', () => {
     strategy = new ClassifierStrategy();
     mockContext = {
       history: [],
-      request: [{ text: 'simple task' }],
+      request: [{ text: "simple task" }],
       signal: new AbortController().signal,
     };
     mockResolvedConfig = {
-      model: 'classifier',
+      model: "classifier",
       generateContentConfig: {},
     } as unknown as ResolvedModelConfig;
     mockConfig = {
@@ -53,182 +47,146 @@ describe('ClassifierStrategy', () => {
       generateJson: vi.fn(),
     } as unknown as BaseLlmClient;
 
-    vi.mocked(promptIdContext.getStore).mockReturnValue('test-prompt-id');
+    vi.mocked(promptIdContext.getStore).mockReturnValue("test-prompt-id");
   });
 
-  it('should call generateJson with the correct parameters', async () => {
+  it("should call generateJson with the correct parameters", async () => {
     const mockApiResponse = {
-      reasoning: 'Simple task',
-      model_choice: 'flash',
+      reasoning: "Simple task",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
         modelConfigKey: { model: mockResolvedConfig.model },
-        promptId: 'test-prompt-id',
+        promptId: "test-prompt-id",
       }),
     );
   });
 
-  it('should route to FLASH model for a simple task', async () => {
+  it("should route to FLASH model for a simple task", async () => {
     const mockApiResponse = {
-      reasoning: 'This is a simple task.',
-      model_choice: 'flash',
+      reasoning: "This is a simple task.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledOnce();
     expect(decision).toEqual({
       model: DEFAULT_GEMINI_FLASH_MODEL,
       metadata: {
-        source: 'Classifier',
+        source: "Classifier",
         latencyMs: expect.any(Number),
         reasoning: mockApiResponse.reasoning,
       },
     });
   });
 
-  it('should route to PRO model for a complex task', async () => {
+  it("should route to PRO model for a complex task", async () => {
     const mockApiResponse = {
-      reasoning: 'This is a complex task.',
-      model_choice: 'pro',
+      reasoning: "This is a complex task.",
+      model_choice: "pro",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
-    mockContext.request = [{ text: 'how do I build a spaceship?' }];
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
+    mockContext.request = [{ text: "how do I build a spaceship?" }];
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledOnce();
     expect(decision).toEqual({
       model: DEFAULT_GEMINI_MODEL,
       metadata: {
-        source: 'Classifier',
+        source: "Classifier",
         latencyMs: expect.any(Number),
         reasoning: mockApiResponse.reasoning,
       },
     });
   });
 
-  it('should return null if the classifier API call fails', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(console, 'warn')
-      .mockImplementation(() => {});
-    const testError = new Error('API Failure');
+  it("should return null if the classifier API call fails", async () => {
+    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
+    const testError = new Error("API Failure");
     vi.mocked(mockBaseLlmClient.generateJson).mockRejectedValue(testError);
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(decision).toBeNull();
     expect(consoleWarnSpy).toHaveBeenCalled();
     consoleWarnSpy.mockRestore();
   });
 
-  it('should return null if the classifier returns a malformed JSON object', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(console, 'warn')
-      .mockImplementation(() => {});
+  it("should return null if the classifier returns a malformed JSON object", async () => {
+    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
     const malformedApiResponse = {
-      reasoning: 'This is a simple task.',
+      reasoning: "This is a simple task.",
       // model_choice is missing, which will cause a Zod parsing error.
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      malformedApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(malformedApiResponse);
 
-    const decision = await strategy.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const decision = await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(decision).toBeNull();
     expect(consoleWarnSpy).toHaveBeenCalled();
     consoleWarnSpy.mockRestore();
   });
 
-  it('should filter out tool-related history before sending to classifier', async () => {
+  it("should filter out tool-related history before sending to classifier", async () => {
     mockContext.history = [
-      { role: 'user', parts: [{ text: 'call a tool' }] },
-      { role: 'model', parts: [{ functionCall: { name: 'test_tool' } }] },
+      { role: "user", parts: [{ text: "call a tool" }] },
+      { role: "model", parts: [{ functionCall: { name: "test_tool" } }] },
       {
-        role: 'user',
-        parts: [
-          { functionResponse: { name: 'test_tool', response: { ok: true } } },
-        ],
+        role: "user",
+        parts: [{ functionResponse: { name: "test_tool", response: { ok: true } } }],
       },
-      { role: 'user', parts: [{ text: 'another user turn' }] },
+      { role: "user", parts: [{ text: "another user turn" }] },
     ];
     const mockApiResponse = {
-      reasoning: 'Simple.',
-      model_choice: 'flash',
+      reasoning: "Simple.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
     const contents = generateJsonCall.contents;
 
     const expectedContents = [
-      { role: 'user', parts: [{ text: 'call a tool' }] },
-      { role: 'user', parts: [{ text: 'another user turn' }] },
-      { role: 'user', parts: [{ text: 'simple task' }] },
+      { role: "user", parts: [{ text: "call a tool" }] },
+      { role: "user", parts: [{ text: "another user turn" }] },
+      { role: "user", parts: [{ text: "simple task" }] },
     ];
 
     expect(contents).toEqual(expectedContents);
   });
 
-  it('should respect HISTORY_SEARCH_WINDOW and HISTORY_TURNS_FOR_CONTEXT', async () => {
+  it("should respect HISTORY_SEARCH_WINDOW and HISTORY_TURNS_FOR_CONTEXT", async () => {
     const longHistory: Content[] = [];
     for (let i = 0; i < 30; i++) {
-      longHistory.push({ role: 'user', parts: [{ text: `Message ${i}` }] });
+      longHistory.push({ role: "user", parts: [{ text: `Message ${i}` }] });
       // Add noise that should be filtered
       if (i % 2 === 0) {
         longHistory.push({
-          role: 'model',
-          parts: [{ functionCall: { name: 'noise', args: {} } }],
+          role: "model",
+          parts: [{ functionCall: { name: "noise", args: {} } }],
         });
       }
     }
     mockContext.history = longHistory;
     const mockApiResponse = {
-      reasoning: 'Simple.',
-      model_choice: 'flash',
+      reasoning: "Simple.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
     const contents = generateJsonCall.contents;
 
     // Manually calculate what the history should be
@@ -240,38 +198,28 @@ describe('ClassifierStrategy', () => {
     );
     const finalHistory = cleanHistory.slice(-HISTORY_TURNS_FOR_CONTEXT);
 
-    expect(contents).toEqual([
-      ...finalHistory,
-      { role: 'user', parts: mockContext.request },
-    ]);
+    expect(contents).toEqual([...finalHistory, { role: "user", parts: mockContext.request }]);
     // There should be 4 history items + the current request
     expect(contents).toHaveLength(5);
   });
 
-  it('should use a fallback promptId if not found in context', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(console, 'warn')
-      .mockImplementation(() => {});
+  it("should use a fallback promptId if not found in context", async () => {
+    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
     vi.mocked(promptIdContext.getStore).mockReturnValue(undefined);
     const mockApiResponse = {
-      reasoning: 'Simple.',
-      model_choice: 'flash',
+      reasoning: "Simple.",
+      model_choice: "flash",
     };
-    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(
-      mockApiResponse,
-    );
+    vi.mocked(mockBaseLlmClient.generateJson).mockResolvedValue(mockApiResponse);
 
     await strategy.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const generateJsonCall = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
 
-    expect(generateJsonCall.promptId).toMatch(
-      /^classifier-router-fallback-\d+-\w+$/,
-    );
+    expect(generateJsonCall.promptId).toMatch(/^classifier-router-fallback-\d+-\w+$/);
     expect(consoleWarnSpy).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Could not find promptId in context. This is unexpected. Using a fallback ID:',
+        "Could not find promptId in context. This is unexpected. Using a fallback ID:",
       ),
     );
     consoleWarnSpy.mockRestore();
diff --git a/packages/gemini-core/src/routing/strategies/classifierStrategy.ts b/packages/gemini-core/src/routing/strategies/classifierStrategy.ts
index 6d92363a6..7eb819d16 100644
--- a/packages/gemini-core/src/routing/strategies/classifierStrategy.ts
+++ b/packages/gemini-core/src/routing/strategies/classifierStrategy.ts
@@ -4,32 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import { promptIdContext } from '../../utils/promptIdContext.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  RoutingStrategy,
-} from '../routingStrategy.js';
-import {
-  DEFAULT_GEMINI_FLASH_MODEL,
-  DEFAULT_GEMINI_MODEL,
-} from '../../config/models.js';
-import { createUserContent, Type } from '@google/genai';
-import type { Config } from '../../config/config.js';
-import {
-  isFunctionCall,
-  isFunctionResponse,
-} from '../../utils/messageInspectors.js';
-import { debugLogger } from '../../utils/debugLogger.js';
+import { createUserContent, Type } from "@google/genai";
+import { z } from "zod";
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import { debugLogger } from "../../utils/debugLogger.js";
+import { isFunctionCall, isFunctionResponse } from "../../utils/messageInspectors.js";
+import { promptIdContext } from "../../utils/promptIdContext.js";
+import type { RoutingContext, RoutingDecision, RoutingStrategy } from "../routingStrategy.js";
 
 // The number of recent history turns to provide to the router for context.
 const HISTORY_TURNS_FOR_CONTEXT = 4;
 const HISTORY_SEARCH_WINDOW = 20;
 
-const FLASH_MODEL = 'flash';
-const PRO_MODEL = 'pro';
+const FLASH_MODEL = "flash";
+const PRO_MODEL = "pro";
 
 const CLASSIFIER_SYSTEM_PROMPT = `
 You are a specialized Task Routing AI. Your sole function is to analyze the user's request and classify its complexity. Choose between \`${FLASH_MODEL}\` (SIMPLE) or \`${PRO_MODEL}\` (COMPLEX).
@@ -111,14 +101,14 @@ const RESPONSE_SCHEMA = {
     reasoning: {
       type: Type.STRING,
       description:
-        'A brief, step-by-step explanation for the model choice, referencing the rubric.',
+        "A brief, step-by-step explanation for the model choice, referencing the rubric.",
     },
     model_choice: {
       type: Type.STRING,
       enum: [FLASH_MODEL, PRO_MODEL],
     },
   },
-  required: ['reasoning', 'model_choice'],
+  required: ["reasoning", "model_choice"],
 };
 
 const ClassifierResponseSchema = z.object({
@@ -127,7 +117,7 @@ const ClassifierResponseSchema = z.object({
 });
 
 export class ClassifierStrategy implements RoutingStrategy {
-  readonly name = 'classifier';
+  readonly name = "classifier";
 
   async route(
     context: RoutingContext,
@@ -158,7 +148,7 @@ export class ClassifierStrategy implements RoutingStrategy {
       const finalHistory = cleanHistory.slice(-HISTORY_TURNS_FOR_CONTEXT);
 
       const jsonResponse = await baseLlmClient.generateJson({
-        modelConfigKey: { model: 'classifier' },
+        modelConfigKey: { model: "classifier" },
         contents: [...finalHistory, createUserContent(context.request)],
         schema: RESPONSE_SCHEMA,
         systemInstruction: CLASSIFIER_SYSTEM_PROMPT,
@@ -175,7 +165,7 @@ export class ClassifierStrategy implements RoutingStrategy {
         return {
           model: DEFAULT_GEMINI_FLASH_MODEL,
           metadata: {
-            source: 'Classifier',
+            source: "Classifier",
             latencyMs,
             reasoning,
           },
@@ -184,7 +174,7 @@ export class ClassifierStrategy implements RoutingStrategy {
         return {
           model: DEFAULT_GEMINI_MODEL,
           metadata: {
-            source: 'Classifier',
+            source: "Classifier",
             reasoning,
             latencyMs,
           },
diff --git a/packages/gemini-core/src/routing/strategies/compositeStrategy.test.ts b/packages/gemini-core/src/routing/strategies/compositeStrategy.test.ts
index 7fb2c393b..981856a3b 100644
--- a/packages/gemini-core/src/routing/strategies/compositeStrategy.test.ts
+++ b/packages/gemini-core/src/routing/strategies/compositeStrategy.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { CompositeStrategy } from './compositeStrategy.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../../config/config.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
 import type {
   RoutingContext,
   RoutingDecision,
   RoutingStrategy,
   TerminalStrategy,
-} from '../routingStrategy.js';
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
+} from "../routingStrategy.js";
+import { CompositeStrategy } from "./compositeStrategy.js";
 
-describe('CompositeStrategy', () => {
+describe("CompositeStrategy", () => {
   let mockContext: RoutingContext;
   let mockConfig: Config;
   let mockBaseLlmClient: BaseLlmClient;
@@ -31,125 +31,96 @@ describe('CompositeStrategy', () => {
     mockBaseLlmClient = {} as BaseLlmClient;
 
     mockStrategy1 = {
-      name: 'strategy1',
+      name: "strategy1",
       route: vi.fn().mockResolvedValue(null),
     };
 
     mockStrategy2 = {
-      name: 'strategy2',
+      name: "strategy2",
       route: vi.fn().mockResolvedValue(null),
     };
 
     mockTerminalStrategy = {
-      name: 'terminal',
+      name: "terminal",
       route: vi.fn().mockResolvedValue({
-        model: 'terminal-model',
+        model: "terminal-model",
         metadata: {
-          source: 'terminal',
+          source: "terminal",
           latencyMs: 10,
-          reasoning: 'Terminal decision',
+          reasoning: "Terminal decision",
         },
       }),
     };
   });
 
-  it('should try strategies in order and return the first successful decision', async () => {
+  it("should try strategies in order and return the first successful decision", async () => {
     const decision: RoutingDecision = {
-      model: 'strategy2-model',
+      model: "strategy2-model",
       metadata: {
-        source: 'strategy2',
+        source: "strategy2",
         latencyMs: 20,
-        reasoning: 'Strategy 2 decided',
+        reasoning: "Strategy 2 decided",
       },
     };
-    vi.spyOn(mockStrategy2, 'route').mockResolvedValue(decision);
+    vi.spyOn(mockStrategy2, "route").mockResolvedValue(decision);
 
     const composite = new CompositeStrategy(
       [mockStrategy1, mockStrategy2, mockTerminalStrategy],
-      'test-router',
+      "test-router",
     );
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    expect(mockStrategy1.route).toHaveBeenCalledWith(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
-    expect(mockStrategy2.route).toHaveBeenCalledWith(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    expect(mockStrategy1.route).toHaveBeenCalledWith(mockContext, mockConfig, mockBaseLlmClient);
+    expect(mockStrategy2.route).toHaveBeenCalledWith(mockContext, mockConfig, mockBaseLlmClient);
     expect(mockTerminalStrategy.route).not.toHaveBeenCalled();
 
-    expect(result.model).toBe('strategy2-model');
-    expect(result.metadata.source).toBe('test-router/strategy2');
+    expect(result.model).toBe("strategy2-model");
+    expect(result.metadata.source).toBe("test-router/strategy2");
   });
 
-  it('should fall back to the terminal strategy if no other strategy provides a decision', async () => {
+  it("should fall back to the terminal strategy if no other strategy provides a decision", async () => {
     const composite = new CompositeStrategy(
       [mockStrategy1, mockStrategy2, mockTerminalStrategy],
-      'test-router',
+      "test-router",
     );
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(mockStrategy1.route).toHaveBeenCalledTimes(1);
     expect(mockStrategy2.route).toHaveBeenCalledTimes(1);
     expect(mockTerminalStrategy.route).toHaveBeenCalledTimes(1);
 
-    expect(result.model).toBe('terminal-model');
-    expect(result.metadata.source).toBe('test-router/terminal');
+    expect(result.model).toBe("terminal-model");
+    expect(result.metadata.source).toBe("test-router/terminal");
   });
 
-  it('should handle errors in non-terminal strategies and continue', async () => {
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    vi.spyOn(mockStrategy1, 'route').mockRejectedValue(
-      new Error('Strategy 1 failed'),
-    );
+  it("should handle errors in non-terminal strategies and continue", async () => {
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(mockStrategy1, "route").mockRejectedValue(new Error("Strategy 1 failed"));
 
-    const composite = new CompositeStrategy(
-      [mockStrategy1, mockTerminalStrategy],
-      'test-router',
-    );
+    const composite = new CompositeStrategy([mockStrategy1, mockTerminalStrategy], "test-router");
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "[Routing] Strategy 'strategy1' failed. Continuing to next strategy. Error:",
       expect.any(Error),
     );
-    expect(result.model).toBe('terminal-model');
+    expect(result.model).toBe("terminal-model");
     consoleErrorSpy.mockRestore();
   });
 
-  it('should re-throw an error from the terminal strategy', async () => {
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    const terminalError = new Error('Terminal strategy failed');
-    vi.spyOn(mockTerminalStrategy, 'route').mockRejectedValue(terminalError);
+  it("should re-throw an error from the terminal strategy", async () => {
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    const terminalError = new Error("Terminal strategy failed");
+    vi.spyOn(mockTerminalStrategy, "route").mockRejectedValue(terminalError);
 
     const composite = new CompositeStrategy([mockTerminalStrategy]);
 
-    await expect(
-      composite.route(mockContext, mockConfig, mockBaseLlmClient),
-    ).rejects.toThrow(terminalError);
+    await expect(composite.route(mockContext, mockConfig, mockBaseLlmClient)).rejects.toThrow(
+      terminalError,
+    );
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "[Routing] Critical Error: Terminal strategy 'terminal' failed. Routing cannot proceed. Error:",
@@ -158,57 +129,43 @@ describe('CompositeStrategy', () => {
     consoleErrorSpy.mockRestore();
   });
 
-  it('should correctly finalize the decision metadata', async () => {
+  it("should correctly finalize the decision metadata", async () => {
     const decision: RoutingDecision = {
-      model: 'some-model',
+      model: "some-model",
       metadata: {
-        source: 'child-source',
+        source: "child-source",
         latencyMs: 50,
-        reasoning: 'Child reasoning',
+        reasoning: "Child reasoning",
       },
     };
-    vi.spyOn(mockStrategy1, 'route').mockResolvedValue(decision);
+    vi.spyOn(mockStrategy1, "route").mockResolvedValue(decision);
 
-    const composite = new CompositeStrategy(
-      [mockStrategy1, mockTerminalStrategy],
-      'my-composite',
-    );
+    const composite = new CompositeStrategy([mockStrategy1, mockTerminalStrategy], "my-composite");
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
-    expect(result.model).toBe('some-model');
-    expect(result.metadata.source).toBe('my-composite/child-source');
-    expect(result.metadata.reasoning).toBe('Child reasoning');
+    expect(result.model).toBe("some-model");
+    expect(result.metadata.source).toBe("my-composite/child-source");
+    expect(result.metadata.reasoning).toBe("Child reasoning");
     // It should keep the child's latency
     expect(result.metadata.latencyMs).toBe(50);
   });
 
-  it('should calculate total latency if child latency is not provided', async () => {
+  it("should calculate total latency if child latency is not provided", async () => {
     const decision: RoutingDecision = {
-      model: 'some-model',
+      model: "some-model",
       metadata: {
-        source: 'child-source',
+        source: "child-source",
         // No latencyMs here
         latencyMs: 0,
-        reasoning: 'Child reasoning',
+        reasoning: "Child reasoning",
       },
     };
-    vi.spyOn(mockStrategy1, 'route').mockResolvedValue(decision);
+    vi.spyOn(mockStrategy1, "route").mockResolvedValue(decision);
 
-    const composite = new CompositeStrategy(
-      [mockStrategy1, mockTerminalStrategy],
-      'my-composite',
-    );
+    const composite = new CompositeStrategy([mockStrategy1, mockTerminalStrategy], "my-composite");
 
-    const result = await composite.route(
-      mockContext,
-      mockConfig,
-      mockBaseLlmClient,
-    );
+    const result = await composite.route(mockContext, mockConfig, mockBaseLlmClient);
 
     expect(result.metadata.latencyMs).toBeGreaterThanOrEqual(0);
   });
diff --git a/packages/gemini-core/src/routing/strategies/compositeStrategy.ts b/packages/gemini-core/src/routing/strategies/compositeStrategy.ts
index 6aadc439d..48519aa4e 100644
--- a/packages/gemini-core/src/routing/strategies/compositeStrategy.ts
+++ b/packages/gemini-core/src/routing/strategies/compositeStrategy.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
+import type { Config } from "../../config/config.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
 import type {
   RoutingContext,
   RoutingDecision,
   RoutingStrategy,
   TerminalStrategy,
-} from '../routingStrategy.js';
+} from "../routingStrategy.js";
 
 /**
  * A strategy that attempts a list of child strategies in order (Chain of Responsibility).
@@ -26,10 +26,7 @@ export class CompositeStrategy implements TerminalStrategy {
    * @param strategies The strategies to try, in order of priority. The last strategy must be terminal.
    * @param name The name of this composite configuration (e.g., 'router' or 'composite').
    */
-  constructor(
-    strategies: [...RoutingStrategy[], TerminalStrategy],
-    name: string = 'composite',
-  ) {
+  constructor(strategies: [...RoutingStrategy[], TerminalStrategy], name: string = "composite") {
     this.strategies = strategies;
     this.name = name;
   }
@@ -43,13 +40,8 @@ export class CompositeStrategy implements TerminalStrategy {
 
     // Separate non-terminal strategies from the terminal one.
     // This separation allows TypeScript to understand the control flow guarantees.
-    const nonTerminalStrategies = this.strategies.slice(
-      0,
-      -1,
-    ) as RoutingStrategy[];
-    const terminalStrategy = this.strategies[
-      this.strategies.length - 1
-    ] as TerminalStrategy;
+    const nonTerminalStrategies = this.strategies.slice(0, -1) as RoutingStrategy[];
+    const terminalStrategy = this.strategies[this.strategies.length - 1] as TerminalStrategy;
 
     // Try non-terminal strategies, allowing them to fail gracefully.
     for (const strategy of nonTerminalStrategies) {
@@ -68,11 +60,7 @@ export class CompositeStrategy implements TerminalStrategy {
 
     // If no other strategy matched, execute the terminal strategy.
     try {
-      const decision = await terminalStrategy.route(
-        context,
-        config,
-        baseLlmClient,
-      );
+      const decision = await terminalStrategy.route(context, config, baseLlmClient);
 
       return this.finalizeDecision(decision, startTime);
     } catch (error) {
@@ -87,10 +75,7 @@ export class CompositeStrategy implements TerminalStrategy {
   /**
    * Helper function to enhance the decision metadata with composite information.
    */
-  private finalizeDecision(
-    decision: RoutingDecision,
-    startTime: number,
-  ): RoutingDecision {
+  private finalizeDecision(decision: RoutingDecision, startTime: number): RoutingDecision {
     const endTime = performance.now();
     const compositeSource = `${this.name}/${decision.metadata.source}`;
 
diff --git a/packages/gemini-core/src/routing/strategies/defaultStrategy.test.ts b/packages/gemini-core/src/routing/strategies/defaultStrategy.test.ts
index 1c739545a..8ae02e1e5 100644
--- a/packages/gemini-core/src/routing/strategies/defaultStrategy.test.ts
+++ b/packages/gemini-core/src/routing/strategies/defaultStrategy.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { DefaultStrategy } from './defaultStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import { DEFAULT_GEMINI_MODEL } from '../../config/models.js';
-import type { Config } from '../../config/config.js';
+import { describe, expect, it } from "vitest";
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { DefaultStrategy } from "./defaultStrategy.js";
 
-describe('DefaultStrategy', () => {
-  it('should always route to the default Gemini model', async () => {
+describe("DefaultStrategy", () => {
+  it("should always route to the default Gemini model", async () => {
     const strategy = new DefaultStrategy();
     const mockContext = {} as RoutingContext;
     const mockConfig = {} as Config;
@@ -23,7 +23,7 @@ describe('DefaultStrategy', () => {
     expect(decision).toEqual({
       model: DEFAULT_GEMINI_MODEL,
       metadata: {
-        source: 'default',
+        source: "default",
         latencyMs: 0,
         reasoning: `Routing to default model: ${DEFAULT_GEMINI_MODEL}`,
       },
diff --git a/packages/gemini-core/src/routing/strategies/defaultStrategy.ts b/packages/gemini-core/src/routing/strategies/defaultStrategy.ts
index dba7949f9..b350dbda4 100644
--- a/packages/gemini-core/src/routing/strategies/defaultStrategy.ts
+++ b/packages/gemini-core/src/routing/strategies/defaultStrategy.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  TerminalStrategy,
-} from '../routingStrategy.js';
-import { DEFAULT_GEMINI_MODEL } from '../../config/models.js';
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext, RoutingDecision, TerminalStrategy } from "../routingStrategy.js";
 
 export class DefaultStrategy implements TerminalStrategy {
-  readonly name = 'default';
+  readonly name = "default";
 
   async route(
     _context: RoutingContext,
diff --git a/packages/gemini-core/src/routing/strategies/fallbackStrategy.test.ts b/packages/gemini-core/src/routing/strategies/fallbackStrategy.test.ts
index dfda72d4c..325ebefb1 100644
--- a/packages/gemini-core/src/routing/strategies/fallbackStrategy.test.ts
+++ b/packages/gemini-core/src/routing/strategies/fallbackStrategy.test.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { FallbackStrategy } from './fallbackStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type { Config } from '../../config/config.js';
+import { describe, expect, it } from "vitest";
+import type { Config } from "../../config/config.js";
 import {
-  DEFAULT_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
-} from '../../config/models.js';
+  DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_MODEL,
+} from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { FallbackStrategy } from "./fallbackStrategy.js";
 
-describe('FallbackStrategy', () => {
+describe("FallbackStrategy", () => {
   const strategy = new FallbackStrategy();
   const mockContext = {} as RoutingContext;
   const mockClient = {} as BaseLlmClient;
 
-  it('should return null when not in fallback mode', async () => {
+  it("should return null when not in fallback mode", async () => {
     const mockConfig = {
       isInFallbackMode: () => false,
       getModel: () => DEFAULT_GEMINI_MODEL,
@@ -30,57 +30,45 @@ describe('FallbackStrategy', () => {
     expect(decision).toBeNull();
   });
 
-  describe('when in fallback mode', () => {
-    it('should downgrade a pro model to the flash model', async () => {
+  describe("when in fallback mode", () => {
+    it("should downgrade a pro model to the flash model", async () => {
       const mockConfig = {
         isInFallbackMode: () => true,
         getModel: () => DEFAULT_GEMINI_MODEL,
       } as Config;
 
-      const decision = await strategy.route(
-        mockContext,
-        mockConfig,
-        mockClient,
-      );
+      const decision = await strategy.route(mockContext, mockConfig, mockClient);
 
       expect(decision).not.toBeNull();
       expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-      expect(decision?.metadata.source).toBe('fallback');
-      expect(decision?.metadata.reasoning).toContain('In fallback mode');
+      expect(decision?.metadata.source).toBe("fallback");
+      expect(decision?.metadata.reasoning).toContain("In fallback mode");
     });
 
-    it('should honor a lite model request', async () => {
+    it("should honor a lite model request", async () => {
       const mockConfig = {
         isInFallbackMode: () => true,
         getModel: () => DEFAULT_GEMINI_FLASH_LITE_MODEL,
       } as Config;
 
-      const decision = await strategy.route(
-        mockContext,
-        mockConfig,
-        mockClient,
-      );
+      const decision = await strategy.route(mockContext, mockConfig, mockClient);
 
       expect(decision).not.toBeNull();
       expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_LITE_MODEL);
-      expect(decision?.metadata.source).toBe('fallback');
+      expect(decision?.metadata.source).toBe("fallback");
     });
 
-    it('should use the flash model if flash is requested', async () => {
+    it("should use the flash model if flash is requested", async () => {
       const mockConfig = {
         isInFallbackMode: () => true,
         getModel: () => DEFAULT_GEMINI_FLASH_MODEL,
       } as Config;
 
-      const decision = await strategy.route(
-        mockContext,
-        mockConfig,
-        mockClient,
-      );
+      const decision = await strategy.route(mockContext, mockConfig, mockClient);
 
       expect(decision).not.toBeNull();
       expect(decision?.model).toBe(DEFAULT_GEMINI_FLASH_MODEL);
-      expect(decision?.metadata.source).toBe('fallback');
+      expect(decision?.metadata.source).toBe("fallback");
     });
   });
 });
diff --git a/packages/gemini-core/src/routing/strategies/fallbackStrategy.ts b/packages/gemini-core/src/routing/strategies/fallbackStrategy.ts
index aef01743a..397901247 100644
--- a/packages/gemini-core/src/routing/strategies/fallbackStrategy.ts
+++ b/packages/gemini-core/src/routing/strategies/fallbackStrategy.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import { getEffectiveModel } from '../../config/models.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  RoutingStrategy,
-} from '../routingStrategy.js';
+import type { Config } from "../../config/config.js";
+import { getEffectiveModel } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext, RoutingDecision, RoutingStrategy } from "../routingStrategy.js";
 
 export class FallbackStrategy implements RoutingStrategy {
-  readonly name = 'fallback';
+  readonly name = "fallback";
 
   async route(
     _context: RoutingContext,
@@ -27,10 +23,7 @@ export class FallbackStrategy implements RoutingStrategy {
       return null;
     }
 
-    const effectiveModel = getEffectiveModel(
-      isInFallbackMode,
-      config.getModel(),
-    );
+    const effectiveModel = getEffectiveModel(isInFallbackMode, config.getModel());
     return {
       model: effectiveModel,
       metadata: {
diff --git a/packages/gemini-core/src/routing/strategies/overrideStrategy.test.ts b/packages/gemini-core/src/routing/strategies/overrideStrategy.test.ts
index bc80a99ad..33ae7ca41 100644
--- a/packages/gemini-core/src/routing/strategies/overrideStrategy.test.ts
+++ b/packages/gemini-core/src/routing/strategies/overrideStrategy.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { OverrideStrategy } from './overrideStrategy.js';
-import type { RoutingContext } from '../routingStrategy.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type { Config } from '../../config/config.js';
-import { DEFAULT_GEMINI_MODEL_AUTO } from '../../config/models.js';
-
-describe('OverrideStrategy', () => {
+import { describe, expect, it } from "vitest";
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL_AUTO } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext } from "../routingStrategy.js";
+import { OverrideStrategy } from "./overrideStrategy.js";
+
+describe("OverrideStrategy", () => {
   const strategy = new OverrideStrategy();
   const mockContext = {} as RoutingContext;
   const mockClient = {} as BaseLlmClient;
 
-  it('should return null when the override model is auto', async () => {
+  it("should return null when the override model is auto", async () => {
     const mockConfig = {
       getModel: () => DEFAULT_GEMINI_MODEL_AUTO,
     } as Config;
@@ -25,8 +25,8 @@ describe('OverrideStrategy', () => {
     expect(decision).toBeNull();
   });
 
-  it('should return a decision with the override model when one is specified', async () => {
-    const overrideModel = 'gemini-2.5-pro-custom';
+  it("should return a decision with the override model when one is specified", async () => {
+    const overrideModel = "gemini-2.5-pro-custom";
     const mockConfig = {
       getModel: () => overrideModel,
     } as Config;
@@ -35,15 +35,13 @@ describe('OverrideStrategy', () => {
 
     expect(decision).not.toBeNull();
     expect(decision?.model).toBe(overrideModel);
-    expect(decision?.metadata.source).toBe('override');
-    expect(decision?.metadata.reasoning).toContain(
-      'Routing bypassed by forced model directive',
-    );
+    expect(decision?.metadata.source).toBe("override");
+    expect(decision?.metadata.reasoning).toContain("Routing bypassed by forced model directive");
     expect(decision?.metadata.reasoning).toContain(overrideModel);
   });
 
-  it('should handle different override model names', async () => {
-    const overrideModel = 'gemini-2.5-flash-experimental';
+  it("should handle different override model names", async () => {
+    const overrideModel = "gemini-2.5-flash-experimental";
     const mockConfig = {
       getModel: () => overrideModel,
     } as Config;
diff --git a/packages/gemini-core/src/routing/strategies/overrideStrategy.ts b/packages/gemini-core/src/routing/strategies/overrideStrategy.ts
index 06d6b7f3d..0201f3381 100644
--- a/packages/gemini-core/src/routing/strategies/overrideStrategy.ts
+++ b/packages/gemini-core/src/routing/strategies/overrideStrategy.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../../config/config.js';
-import { DEFAULT_GEMINI_MODEL_AUTO } from '../../config/models.js';
-import type { BaseLlmClient } from '../../core/baseLlmClient.js';
-import type {
-  RoutingContext,
-  RoutingDecision,
-  RoutingStrategy,
-} from '../routingStrategy.js';
+import type { Config } from "../../config/config.js";
+import { DEFAULT_GEMINI_MODEL_AUTO } from "../../config/models.js";
+import type { BaseLlmClient } from "../../core/baseLlmClient.js";
+import type { RoutingContext, RoutingDecision, RoutingStrategy } from "../routingStrategy.js";
 
 /**
  * Handles cases where the user explicitly specifies a model (override).
  */
 export class OverrideStrategy implements RoutingStrategy {
-  readonly name = 'override';
+  readonly name = "override";
 
   async route(
     _context: RoutingContext,
diff --git a/packages/gemini-core/src/services/chatCompressionService.test.ts b/packages/gemini-core/src/services/chatCompressionService.test.ts
index f4472f230..8df3765f2 100644
--- a/packages/gemini-core/src/services/chatCompressionService.test.ts
+++ b/packages/gemini-core/src/services/chatCompressionService.test.ts
@@ -4,109 +4,100 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import {
-  ChatCompressionService,
-  findCompressSplitPoint,
-} from './chatCompressionService.js';
-import type { Content, GenerateContentResponse } from '@google/genai';
-import { CompressionStatus } from '../core/turn.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import type { Config } from '../config/config.js';
-import { getInitialChatHistory } from '../utils/environmentContext.js';
-import type { ContentGenerator } from '../core/contentGenerator.js';
+import type { Content, GenerateContentResponse } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import { CompressionStatus } from "../core/turn.js";
+import { getInitialChatHistory } from "../utils/environmentContext.js";
+import { ChatCompressionService, findCompressSplitPoint } from "./chatCompressionService.js";
 
-vi.mock('../core/tokenLimits.js');
-vi.mock('../telemetry/loggers.js');
-vi.mock('../utils/environmentContext.js');
+vi.mock("../core/tokenLimits.js");
+vi.mock("../telemetry/loggers.js");
+vi.mock("../utils/environmentContext.js");
 
-describe('findCompressSplitPoint', () => {
-  it('should throw an error for non-positive numbers', () => {
-    expect(() => findCompressSplitPoint([], 0)).toThrow(
-      'Fraction must be between 0 and 1',
-    );
+describe("findCompressSplitPoint", () => {
+  it("should throw an error for non-positive numbers", () => {
+    expect(() => findCompressSplitPoint([], 0)).toThrow("Fraction must be between 0 and 1");
   });
 
-  it('should throw an error for a fraction greater than or equal to 1', () => {
-    expect(() => findCompressSplitPoint([], 1)).toThrow(
-      'Fraction must be between 0 and 1',
-    );
+  it("should throw an error for a fraction greater than or equal to 1", () => {
+    expect(() => findCompressSplitPoint([], 1)).toThrow("Fraction must be between 0 and 1");
   });
 
-  it('should handle an empty history', () => {
+  it("should handle an empty history", () => {
     expect(findCompressSplitPoint([], 0.5)).toBe(0);
   });
 
-  it('should handle a fraction in the middle', () => {
+  it("should handle a fraction in the middle", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] }, // JSON length: 66 (19%)
-      { role: 'model', parts: [{ text: 'This is the second message.' }] }, // JSON length: 68 (40%)
-      { role: 'user', parts: [{ text: 'This is the third message.' }] }, // JSON length: 66 (60%)
-      { role: 'model', parts: [{ text: 'This is the fourth message.' }] }, // JSON length: 68 (80%)
-      { role: 'user', parts: [{ text: 'This is the fifth message.' }] }, // JSON length: 65 (100%)
+      { role: "user", parts: [{ text: "This is the first message." }] }, // JSON length: 66 (19%)
+      { role: "model", parts: [{ text: "This is the second message." }] }, // JSON length: 68 (40%)
+      { role: "user", parts: [{ text: "This is the third message." }] }, // JSON length: 66 (60%)
+      { role: "model", parts: [{ text: "This is the fourth message." }] }, // JSON length: 68 (80%)
+      { role: "user", parts: [{ text: "This is the fifth message." }] }, // JSON length: 65 (100%)
     ];
     expect(findCompressSplitPoint(history, 0.5)).toBe(4);
   });
 
-  it('should handle a fraction of last index', () => {
+  it("should handle a fraction of last index", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] }, // JSON length: 66 (19%)
-      { role: 'model', parts: [{ text: 'This is the second message.' }] }, // JSON length: 68 (40%)
-      { role: 'user', parts: [{ text: 'This is the third message.' }] }, // JSON length: 66 (60%)
-      { role: 'model', parts: [{ text: 'This is the fourth message.' }] }, // JSON length: 68 (80%)
-      { role: 'user', parts: [{ text: 'This is the fifth message.' }] }, // JSON length: 65 (100%)
+      { role: "user", parts: [{ text: "This is the first message." }] }, // JSON length: 66 (19%)
+      { role: "model", parts: [{ text: "This is the second message." }] }, // JSON length: 68 (40%)
+      { role: "user", parts: [{ text: "This is the third message." }] }, // JSON length: 66 (60%)
+      { role: "model", parts: [{ text: "This is the fourth message." }] }, // JSON length: 68 (80%)
+      { role: "user", parts: [{ text: "This is the fifth message." }] }, // JSON length: 65 (100%)
     ];
     expect(findCompressSplitPoint(history, 0.9)).toBe(4);
   });
 
-  it('should handle a fraction of after last index', () => {
+  it("should handle a fraction of after last index", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] }, // JSON length: 66 (24%)
-      { role: 'model', parts: [{ text: 'This is the second message.' }] }, // JSON length: 68 (50%)
-      { role: 'user', parts: [{ text: 'This is the third message.' }] }, // JSON length: 66 (74%)
-      { role: 'model', parts: [{ text: 'This is the fourth message.' }] }, // JSON length: 68 (100%)
+      { role: "user", parts: [{ text: "This is the first message." }] }, // JSON length: 66 (24%)
+      { role: "model", parts: [{ text: "This is the second message." }] }, // JSON length: 68 (50%)
+      { role: "user", parts: [{ text: "This is the third message." }] }, // JSON length: 66 (74%)
+      { role: "model", parts: [{ text: "This is the fourth message." }] }, // JSON length: 68 (100%)
     ];
     expect(findCompressSplitPoint(history, 0.8)).toBe(4);
   });
 
-  it('should return earlier splitpoint if no valid ones are after threshold', () => {
+  it("should return earlier splitpoint if no valid ones are after threshold", () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'This is the first message.' }] },
-      { role: 'model', parts: [{ text: 'This is the second message.' }] },
-      { role: 'user', parts: [{ text: 'This is the third message.' }] },
-      { role: 'model', parts: [{ functionCall: { name: 'foo', args: {} } }] },
+      { role: "user", parts: [{ text: "This is the first message." }] },
+      { role: "model", parts: [{ text: "This is the second message." }] },
+      { role: "user", parts: [{ text: "This is the third message." }] },
+      { role: "model", parts: [{ functionCall: { name: "foo", args: {} } }] },
     ];
     // Can't return 4 because the previous item has a function call.
     expect(findCompressSplitPoint(history, 0.99)).toBe(2);
   });
 
-  it('should handle a history with only one item', () => {
-    const historyWithEmptyParts: Content[] = [
-      { role: 'user', parts: [{ text: 'Message 1' }] },
-    ];
+  it("should handle a history with only one item", () => {
+    const historyWithEmptyParts: Content[] = [{ role: "user", parts: [{ text: "Message 1" }] }];
     expect(findCompressSplitPoint(historyWithEmptyParts, 0.5)).toBe(0);
   });
 
-  it('should handle history with weird parts', () => {
+  it("should handle history with weird parts", () => {
     const historyWithEmptyParts: Content[] = [
-      { role: 'user', parts: [{ text: 'Message 1' }] },
+      { role: "user", parts: [{ text: "Message 1" }] },
       {
-        role: 'model',
-        parts: [{ fileData: { fileUri: 'derp', mimeType: 'text/plain' } }],
+        role: "model",
+        parts: [{ fileData: { fileUri: "derp", mimeType: "text/plain" } }],
       },
-      { role: 'user', parts: [{ text: 'Message 2' }] },
+      { role: "user", parts: [{ text: "Message 2" }] },
     ];
     expect(findCompressSplitPoint(historyWithEmptyParts, 0.5)).toBe(2);
   });
 });
 
-describe('ChatCompressionService', () => {
+describe("ChatCompressionService", () => {
   let service: ChatCompressionService;
   let mockChat: GeminiChat;
   let mockConfig: Config;
-  const mockModel = 'gemini-pro';
-  const mockPromptId = 'test-prompt-id';
+  const mockModel = "gemini-pro";
+  const mockPromptId = "test-prompt-id";
 
   beforeEach(() => {
     service = new ChatCompressionService();
@@ -130,7 +121,7 @@ describe('ChatCompressionService', () => {
     vi.restoreAllMocks();
   });
 
-  it('should return NOOP if history is empty', async () => {
+  it("should return NOOP if history is empty", async () => {
     vi.mocked(mockChat.getHistory).mockReturnValue([]);
     const result = await service.compress(
       mockChat,
@@ -144,10 +135,8 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).toBeNull();
   });
 
-  it('should return NOOP if previously failed and not forced', async () => {
-    vi.mocked(mockChat.getHistory).mockReturnValue([
-      { role: 'user', parts: [{ text: 'hi' }] },
-    ]);
+  it("should return NOOP if previously failed and not forced", async () => {
+    vi.mocked(mockChat.getHistory).mockReturnValue([{ role: "user", parts: [{ text: "hi" }] }]);
     const result = await service.compress(
       mockChat,
       mockPromptId,
@@ -160,10 +149,8 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).toBeNull();
   });
 
-  it('should return NOOP if under token threshold and not forced', async () => {
-    vi.mocked(mockChat.getHistory).mockReturnValue([
-      { role: 'user', parts: [{ text: 'hi' }] },
-    ]);
+  it("should return NOOP if under token threshold and not forced", async () => {
+    vi.mocked(mockChat.getHistory).mockReturnValue([{ role: "user", parts: [{ text: "hi" }] }]);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(600);
     vi.mocked(tokenLimit).mockReturnValue(1000);
     // Threshold is 0.7 * 1000 = 700. 600 < 700, so NOOP.
@@ -180,12 +167,12 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).toBeNull();
   });
 
-  it('should compress if over token threshold', async () => {
+  it("should compress if over token threshold", async () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'msg1' }] },
-      { role: 'model', parts: [{ text: 'msg2' }] },
-      { role: 'user', parts: [{ text: 'msg3' }] },
-      { role: 'model', parts: [{ text: 'msg4' }] },
+      { role: "user", parts: [{ text: "msg1" }] },
+      { role: "model", parts: [{ text: "msg2" }] },
+      { role: "user", parts: [{ text: "msg3" }] },
+      { role: "model", parts: [{ text: "msg4" }] },
     ];
     vi.mocked(mockChat.getHistory).mockReturnValue(history);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(800);
@@ -194,7 +181,7 @@ describe('ChatCompressionService', () => {
       candidates: [
         {
           content: {
-            parts: [{ text: 'Summary' }],
+            parts: [{ text: "Summary" }],
           },
         },
       ],
@@ -214,16 +201,16 @@ describe('ChatCompressionService', () => {
 
     expect(result.info.compressionStatus).toBe(CompressionStatus.COMPRESSED);
     expect(result.newHistory).not.toBeNull();
-    expect(result.newHistory![0].parts![0].text).toBe('Summary');
+    expect(result.newHistory![0].parts![0].text).toBe("Summary");
     expect(mockGenerateContent).toHaveBeenCalled();
   });
 
-  it('should force compress even if under threshold', async () => {
+  it("should force compress even if under threshold", async () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'msg1' }] },
-      { role: 'model', parts: [{ text: 'msg2' }] },
-      { role: 'user', parts: [{ text: 'msg3' }] },
-      { role: 'model', parts: [{ text: 'msg4' }] },
+      { role: "user", parts: [{ text: "msg1" }] },
+      { role: "model", parts: [{ text: "msg2" }] },
+      { role: "user", parts: [{ text: "msg3" }] },
+      { role: "model", parts: [{ text: "msg4" }] },
     ];
     vi.mocked(mockChat.getHistory).mockReturnValue(history);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(100);
@@ -233,7 +220,7 @@ describe('ChatCompressionService', () => {
       candidates: [
         {
           content: {
-            parts: [{ text: 'Summary' }],
+            parts: [{ text: "Summary" }],
           },
         },
       ],
@@ -255,16 +242,16 @@ describe('ChatCompressionService', () => {
     expect(result.newHistory).not.toBeNull();
   });
 
-  it('should return FAILED if new token count is inflated', async () => {
+  it("should return FAILED if new token count is inflated", async () => {
     const history: Content[] = [
-      { role: 'user', parts: [{ text: 'msg1' }] },
-      { role: 'model', parts: [{ text: 'msg2' }] },
+      { role: "user", parts: [{ text: "msg1" }] },
+      { role: "model", parts: [{ text: "msg2" }] },
     ];
     vi.mocked(mockChat.getHistory).mockReturnValue(history);
     vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(10);
     vi.mocked(tokenLimit).mockReturnValue(1000);
 
-    const longSummary = 'a'.repeat(1000); // Long summary to inflate token count
+    const longSummary = "a".repeat(1000); // Long summary to inflate token count
     const mockGenerateContent = vi.fn().mockResolvedValue({
       candidates: [
         {
diff --git a/packages/gemini-core/src/services/chatCompressionService.ts b/packages/gemini-core/src/services/chatCompressionService.ts
index 985d1c744..2d917c7fa 100644
--- a/packages/gemini-core/src/services/chatCompressionService.ts
+++ b/packages/gemini-core/src/services/chatCompressionService.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import { type ChatCompressionInfo, CompressionStatus } from '../core/turn.js';
-import { tokenLimit } from '../core/tokenLimits.js';
-import { getCompressionPrompt } from '../core/prompts.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { logChatCompression } from '../telemetry/loggers.js';
-import { makeChatCompressionEvent } from '../telemetry/types.js';
-import { getInitialChatHistory } from '../utils/environmentContext.js';
+import type { Content } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import { getCompressionPrompt } from "../core/prompts.js";
+import { tokenLimit } from "../core/tokenLimits.js";
+import { type ChatCompressionInfo, CompressionStatus } from "../core/turn.js";
+import { logChatCompression } from "../telemetry/loggers.js";
+import { makeChatCompressionEvent } from "../telemetry/types.js";
+import { getInitialChatHistory } from "../utils/environmentContext.js";
+import { getResponseText } from "../utils/partUtils.js";
 
 /**
  * Default threshold for compression token count as a fraction of the model's
@@ -33,12 +33,9 @@ export const COMPRESSION_PRESERVE_THRESHOLD = 0.3;
  *
  * Exported for testing purposes.
  */
-export function findCompressSplitPoint(
-  contents: Content[],
-  fraction: number,
-): number {
+export function findCompressSplitPoint(contents: Content[], fraction: number): number {
   if (fraction <= 0 || fraction >= 1) {
-    throw new Error('Fraction must be between 0 and 1');
+    throw new Error("Fraction must be between 0 and 1");
   }
 
   const charCounts = contents.map((content) => JSON.stringify(content).length);
@@ -49,10 +46,7 @@ export function findCompressSplitPoint(
   let cumulativeCharCount = 0;
   for (let i = 0; i < contents.length; i++) {
     const content = contents[i];
-    if (
-      content.role === 'user' &&
-      !content.parts?.some((part) => !!part.functionResponse)
-    ) {
+    if (content.role === "user" && !content.parts?.some((part) => !!part.functionResponse)) {
       if (cumulativeCharCount >= targetCharCount) {
         return i;
       }
@@ -64,10 +58,7 @@ export function findCompressSplitPoint(
   // We found no split points after targetCharCount.
   // Check if it's safe to compress everything.
   const lastContent = contents[contents.length - 1];
-  if (
-    lastContent?.role === 'model' &&
-    !lastContent?.parts?.some((part) => part.functionCall)
-  ) {
+  if (lastContent?.role === "model" && !lastContent?.parts?.some((part) => part.functionCall)) {
     return contents.length;
   }
 
@@ -87,10 +78,7 @@ export class ChatCompressionService {
     const curatedHistory = chat.getHistory(true);
 
     // Regardless of `force`, don't do anything if the history is empty.
-    if (
-      curatedHistory.length === 0 ||
-      (hasFailedCompressionAttempt && !force)
-    ) {
+    if (curatedHistory.length === 0 || (hasFailedCompressionAttempt && !force)) {
       return {
         newHistory: null,
         info: {
@@ -106,8 +94,7 @@ export class ChatCompressionService {
     // Don't compress if not forced and we are under the limit.
     if (!force) {
       const threshold =
-        (await config.getCompressionThreshold()) ??
-        DEFAULT_COMPRESSION_TOKEN_THRESHOLD;
+        (await config.getCompressionThreshold()) ?? DEFAULT_COMPRESSION_TOKEN_THRESHOLD;
       if (originalTokenCount < threshold * tokenLimit(model)) {
         return {
           newHistory: null,
@@ -120,10 +107,7 @@ export class ChatCompressionService {
       }
     }
 
-    const splitPoint = findCompressSplitPoint(
-      curatedHistory,
-      1 - COMPRESSION_PRESERVE_THRESHOLD,
-    );
+    const splitPoint = findCompressSplitPoint(curatedHistory, 1 - COMPRESSION_PRESERVE_THRESHOLD);
 
     const historyToCompress = curatedHistory.slice(0, splitPoint);
     const historyToKeep = curatedHistory.slice(splitPoint);
@@ -145,10 +129,10 @@ export class ChatCompressionService {
         contents: [
           ...historyToCompress,
           {
-            role: 'user',
+            role: "user",
             parts: [
               {
-                text: 'First, reason in your scratchpad. Then, generate the <state_snapshot>.',
+                text: "First, reason in your scratchpad. Then, generate the <state_snapshot>.",
               },
             ],
           },
@@ -159,16 +143,16 @@ export class ChatCompressionService {
       },
       promptId,
     );
-    const summary = getResponseText(summaryResponse) ?? '';
+    const summary = getResponseText(summaryResponse) ?? "";
 
     const extraHistory: Content[] = [
       {
-        role: 'user',
+        role: "user",
         parts: [{ text: summary }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Got it. Thanks for the additional context!' }],
+        role: "model",
+        parts: [{ text: "Got it. Thanks for the additional context!" }],
       },
       ...historyToKeep,
     ];
@@ -178,10 +162,7 @@ export class ChatCompressionService {
 
     // Estimate token count 1 token ≈ 4 characters
     const newTokenCount = Math.floor(
-      fullNewHistory.reduce(
-        (total, content) => total + JSON.stringify(content).length,
-        0,
-      ) / 4,
+      fullNewHistory.reduce((total, content) => total + JSON.stringify(content).length, 0) / 4,
     );
 
     logChatCompression(
@@ -198,8 +179,7 @@ export class ChatCompressionService {
         info: {
           originalTokenCount,
           newTokenCount,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         },
       };
     } else {
diff --git a/packages/gemini-core/src/services/chatRecordingService.test.ts b/packages/gemini-core/src/services/chatRecordingService.test.ts
index dcd77c986..f432e2b2a 100644
--- a/packages/gemini-core/src/services/chatRecordingService.test.ts
+++ b/packages/gemini-core/src/services/chatRecordingService.test.ts
@@ -4,32 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MockInstance } from 'vitest';
-import { expect, it, describe, vi, beforeEach, afterEach } from 'vitest';
-import fs from 'node:fs';
-import path from 'node:path';
-import { randomUUID } from 'node:crypto';
-import type {
-  ConversationRecord,
-  ToolCallRecord,
-} from './chatRecordingService.js';
-import { ChatRecordingService } from './chatRecordingService.js';
-import type { Config } from '../config/config.js';
-import { getProjectHash } from '../utils/paths.js';
-
-vi.mock('node:fs');
-vi.mock('node:path');
-vi.mock('node:crypto', () => ({
+import { randomUUID } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import type { MockInstance } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { getProjectHash } from "../utils/paths.js";
+import type { ConversationRecord, ToolCallRecord } from "./chatRecordingService.js";
+import { ChatRecordingService } from "./chatRecordingService.js";
+
+vi.mock("node:fs");
+vi.mock("node:path");
+vi.mock("node:crypto", () => ({
   randomUUID: vi.fn(),
   createHash: vi.fn(() => ({
     update: vi.fn(() => ({
-      digest: vi.fn(() => 'mocked-hash'),
+      digest: vi.fn(() => "mocked-hash"),
     })),
   })),
 }));
-vi.mock('../utils/paths.js');
+vi.mock("../utils/paths.js");
 
-describe('ChatRecordingService', () => {
+describe("ChatRecordingService", () => {
   let chatRecordingService: ChatRecordingService;
   let mockConfig: Config;
 
@@ -38,70 +35,61 @@ describe('ChatRecordingService', () => {
 
   beforeEach(() => {
     mockConfig = {
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
       storage: {
-        getProjectTempDir: vi
-          .fn()
-          .mockReturnValue('/test/project/root/.gemini/tmp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/project/root/.gemini/tmp"),
       },
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getDebugMode: vi.fn().mockReturnValue(false),
       getToolRegistry: vi.fn().mockReturnValue({
         getTool: vi.fn().mockReturnValue({
-          displayName: 'Test Tool',
-          description: 'A test tool',
+          displayName: "Test Tool",
+          description: "A test tool",
           isOutputMarkdown: false,
         }),
       }),
     } as unknown as Config;
 
-    vi.mocked(getProjectHash).mockReturnValue('test-project-hash');
-    vi.mocked(randomUUID).mockReturnValue('this-is-a-test-uuid');
-    vi.mocked(path.join).mockImplementation((...args) => args.join('/'));
+    vi.mocked(getProjectHash).mockReturnValue("test-project-hash");
+    vi.mocked(randomUUID).mockReturnValue("this-is-a-test-uuid");
+    vi.mocked(path.join).mockImplementation((...args) => args.join("/"));
 
     chatRecordingService = new ChatRecordingService(mockConfig);
 
-    mkdirSyncSpy = vi
-      .spyOn(fs, 'mkdirSync')
-      .mockImplementation(() => undefined);
+    mkdirSyncSpy = vi.spyOn(fs, "mkdirSync").mockImplementation(() => undefined);
 
-    writeFileSyncSpy = vi
-      .spyOn(fs, 'writeFileSync')
-      .mockImplementation(() => undefined);
+    writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('initialize', () => {
-    it('should create a new session if none is provided', () => {
+  describe("initialize", () => {
+    it("should create a new session if none is provided", () => {
       chatRecordingService.initialize();
 
-      expect(mkdirSyncSpy).toHaveBeenCalledWith(
-        '/test/project/root/.gemini/tmp/chats',
-        { recursive: true },
-      );
+      expect(mkdirSyncSpy).toHaveBeenCalledWith("/test/project/root/.gemini/tmp/chats", {
+        recursive: true,
+      });
       expect(writeFileSyncSpy).not.toHaveBeenCalled();
     });
 
-    it('should resume from an existing session if provided', () => {
-      const readFileSyncSpy = vi.spyOn(fs, 'readFileSync').mockReturnValue(
+    it("should resume from an existing session if provided", () => {
+      const readFileSyncSpy = vi.spyOn(fs, "readFileSync").mockReturnValue(
         JSON.stringify({
-          sessionId: 'old-session-id',
-          projectHash: 'test-project-hash',
+          sessionId: "old-session-id",
+          projectHash: "test-project-hash",
           messages: [],
         }),
       );
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
 
       chatRecordingService.initialize({
-        filePath: '/test/project/root/.gemini/tmp/chats/session.json',
+        filePath: "/test/project/root/.gemini/tmp/chats/session.json",
         conversation: {
-          sessionId: 'old-session-id',
+          sessionId: "old-session-id",
         } as ConversationRecord,
       });
 
@@ -111,26 +99,24 @@ describe('ChatRecordingService', () => {
     });
   });
 
-  describe('recordMessage', () => {
+  describe("recordMessage", () => {
     beforeEach(() => {
       chatRecordingService.initialize();
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
+      vi.spyOn(fs, "readFileSync").mockReturnValue(
         JSON.stringify({
-          sessionId: 'test-session-id',
-          projectHash: 'test-project-hash',
+          sessionId: "test-session-id",
+          projectHash: "test-project-hash",
           messages: [],
         }),
       );
     });
 
-    it('should record a new message', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should record a new message", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       chatRecordingService.recordMessage({
-        type: 'user',
-        content: 'Hello',
-        model: 'gemini-pro',
+        type: "user",
+        content: "Hello",
+        model: "gemini-pro",
       });
       expect(mkdirSyncSpy).toHaveBeenCalled();
       expect(writeFileSyncSpy).toHaveBeenCalled();
@@ -138,34 +124,30 @@ describe('ChatRecordingService', () => {
         writeFileSyncSpy.mock.calls[0][1] as string,
       ) as ConversationRecord;
       expect(conversation.messages).toHaveLength(1);
-      expect(conversation.messages[0].content).toBe('Hello');
-      expect(conversation.messages[0].type).toBe('user');
+      expect(conversation.messages[0].content).toBe("Hello");
+      expect(conversation.messages[0].type).toBe("user");
     });
 
-    it('should create separate messages when recording multiple messages', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should create separate messages when recording multiple messages", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'user',
-            content: 'Hello',
+            id: "1",
+            type: "user",
+            content: "Hello",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       chatRecordingService.recordMessage({
-        type: 'user',
-        content: 'World',
-        model: 'gemini-pro',
+        type: "user",
+        content: "World",
+        model: "gemini-pro",
       });
 
       expect(mkdirSyncSpy).toHaveBeenCalled();
@@ -174,53 +156,47 @@ describe('ChatRecordingService', () => {
         writeFileSyncSpy.mock.calls[0][1] as string,
       ) as ConversationRecord;
       expect(conversation.messages).toHaveLength(2);
-      expect(conversation.messages[0].content).toBe('Hello');
-      expect(conversation.messages[1].content).toBe('World');
+      expect(conversation.messages[0].content).toBe("Hello");
+      expect(conversation.messages[1].content).toBe("World");
     });
   });
 
-  describe('recordThought', () => {
-    it('should queue a thought', () => {
+  describe("recordThought", () => {
+    it("should queue a thought", () => {
       chatRecordingService.initialize();
       chatRecordingService.recordThought({
-        subject: 'Thinking',
-        description: 'Thinking...',
+        subject: "Thinking",
+        description: "Thinking...",
       });
       // @ts-expect-error private property
       expect(chatRecordingService.queuedThoughts).toHaveLength(1);
       // @ts-expect-error private property
-      expect(chatRecordingService.queuedThoughts[0].subject).toBe('Thinking');
+      expect(chatRecordingService.queuedThoughts[0].subject).toBe("Thinking");
       // @ts-expect-error private property
-      expect(chatRecordingService.queuedThoughts[0].description).toBe(
-        'Thinking...',
-      );
+      expect(chatRecordingService.queuedThoughts[0].description).toBe("Thinking...");
     });
   });
 
-  describe('recordMessageTokens', () => {
+  describe("recordMessageTokens", () => {
     beforeEach(() => {
       chatRecordingService.initialize();
     });
 
-    it('should update the last message with token info', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should update the last message with token info", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'gemini',
-            content: 'Response',
+            id: "1",
+            type: "gemini",
+            content: "Response",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       chatRecordingService.recordMessageTokens({
         promptTokenCount: 1,
@@ -247,23 +223,21 @@ describe('ChatRecordingService', () => {
       });
     });
 
-    it('should queue token info if the last message already has tokens', () => {
+    it("should queue token info if the last message already has tokens", () => {
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'gemini',
-            content: 'Response',
+            id: "1",
+            type: "gemini",
+            content: "Response",
             timestamp: new Date().toISOString(),
             tokens: { input: 1, output: 1, total: 2, cached: 0 },
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       chatRecordingService.recordMessageTokens({
         promptTokenCount: 2,
@@ -284,39 +258,35 @@ describe('ChatRecordingService', () => {
     });
   });
 
-  describe('recordToolCalls', () => {
+  describe("recordToolCalls", () => {
     beforeEach(() => {
       chatRecordingService.initialize();
     });
 
-    it('should add new tool calls to the last message', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should add new tool calls to the last message", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: '1',
-            type: 'gemini',
-            content: '',
+            id: "1",
+            type: "gemini",
+            content: "",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       const toolCall: ToolCallRecord = {
-        id: 'tool-1',
-        name: 'testTool',
+        id: "tool-1",
+        name: "testTool",
         args: {},
-        status: 'awaiting_approval',
+        status: "awaiting_approval",
         timestamp: new Date().toISOString(),
       };
-      chatRecordingService.recordToolCalls('gemini-pro', [toolCall]);
+      chatRecordingService.recordToolCalls("gemini-pro", [toolCall]);
 
       expect(mkdirSyncSpy).toHaveBeenCalled();
       expect(writeFileSyncSpy).toHaveBeenCalled();
@@ -328,42 +298,38 @@ describe('ChatRecordingService', () => {
         toolCalls: [
           {
             ...toolCall,
-            displayName: 'Test Tool',
-            description: 'A test tool',
+            displayName: "Test Tool",
+            description: "A test tool",
             renderOutputAsMarkdown: false,
           },
         ],
       });
     });
 
-    it('should create a new message if the last message is not from gemini', () => {
-      const writeFileSyncSpy = vi
-        .spyOn(fs, 'writeFileSync')
-        .mockImplementation(() => undefined);
+    it("should create a new message if the last message is not from gemini", () => {
+      const writeFileSyncSpy = vi.spyOn(fs, "writeFileSync").mockImplementation(() => undefined);
       const initialConversation = {
-        sessionId: 'test-session-id',
-        projectHash: 'test-project-hash',
+        sessionId: "test-session-id",
+        projectHash: "test-project-hash",
         messages: [
           {
-            id: 'a-uuid',
-            type: 'user',
-            content: 'call a tool',
+            id: "a-uuid",
+            type: "user",
+            content: "call a tool",
             timestamp: new Date().toISOString(),
           },
         ],
       };
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(
-        JSON.stringify(initialConversation),
-      );
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(initialConversation));
 
       const toolCall: ToolCallRecord = {
-        id: 'tool-1',
-        name: 'testTool',
+        id: "tool-1",
+        name: "testTool",
         args: {},
-        status: 'awaiting_approval',
+        status: "awaiting_approval",
         timestamp: new Date().toISOString(),
       };
-      chatRecordingService.recordToolCalls('gemini-pro', [toolCall]);
+      chatRecordingService.recordToolCalls("gemini-pro", [toolCall]);
 
       expect(mkdirSyncSpy).toHaveBeenCalled();
       expect(writeFileSyncSpy).toHaveBeenCalled();
@@ -373,16 +339,16 @@ describe('ChatRecordingService', () => {
       expect(conversation.messages).toHaveLength(2);
       expect(conversation.messages[1]).toEqual({
         ...conversation.messages[1],
-        id: 'this-is-a-test-uuid',
-        model: 'gemini-pro',
-        type: 'gemini',
+        id: "this-is-a-test-uuid",
+        model: "gemini-pro",
+        type: "gemini",
         thoughts: [],
-        content: '',
+        content: "",
         toolCalls: [
           {
             ...toolCall,
-            displayName: 'Test Tool',
-            description: 'A test tool',
+            displayName: "Test Tool",
+            description: "A test tool",
             renderOutputAsMarkdown: false,
           },
         ],
@@ -390,14 +356,12 @@ describe('ChatRecordingService', () => {
     });
   });
 
-  describe('deleteSession', () => {
-    it('should delete the session file', () => {
-      const unlinkSyncSpy = vi
-        .spyOn(fs, 'unlinkSync')
-        .mockImplementation(() => undefined);
-      chatRecordingService.deleteSession('test-session-id');
+  describe("deleteSession", () => {
+    it("should delete the session file", () => {
+      const unlinkSyncSpy = vi.spyOn(fs, "unlinkSync").mockImplementation(() => undefined);
+      chatRecordingService.deleteSession("test-session-id");
       expect(unlinkSyncSpy).toHaveBeenCalledWith(
-        '/test/project/root/.gemini/tmp/chats/test-session-id.json',
+        "/test/project/root/.gemini/tmp/chats/test-session-id.json",
       );
     });
   });
diff --git a/packages/gemini-core/src/services/chatRecordingService.ts b/packages/gemini-core/src/services/chatRecordingService.ts
index 2ac9f4d99..23e8fac3a 100644
--- a/packages/gemini-core/src/services/chatRecordingService.ts
+++ b/packages/gemini-core/src/services/chatRecordingService.ts
@@ -4,20 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type Config } from '../config/config.js';
-import { type Status } from '../core/coreToolScheduler.js';
-import { type ThoughtSummary } from '../utils/thoughtUtils.js';
-import { getProjectHash } from '../utils/paths.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import type {
-  PartListUnion,
-  GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import { debugLogger } from '../utils/debugLogger.js';
-
-export const SESSION_FILE_PREFIX = 'session-';
+import { randomUUID } from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+import type { GenerateContentResponseUsageMetadata, PartListUnion } from "@google/genai";
+import { type Config } from "../config/config.js";
+import { type Status } from "../core/coreToolScheduler.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getProjectHash } from "../utils/paths.js";
+import { type ThoughtSummary } from "../utils/thoughtUtils.js";
+
+export const SESSION_FILE_PREFIX = "session-";
 
 /**
  * Token usage summary for a message or conversation.
@@ -62,10 +59,10 @@ export interface ToolCallRecord {
  */
 export type ConversationRecordExtra =
   | {
-      type: 'user';
+      type: "user";
     }
   | {
-      type: 'gemini';
+      type: "gemini";
       toolCalls?: ToolCallRecord[];
       thoughts?: Array<ThoughtSummary & { timestamp: string }>;
       tokens?: TokensSummary | null;
@@ -142,20 +139,11 @@ export class ChatRecordingService {
         this.cachedLastConvData = null;
       } else {
         // Create new session
-        const chatsDir = path.join(
-          this.config.storage.getProjectTempDir(),
-          'chats',
-        );
+        const chatsDir = path.join(this.config.storage.getProjectTempDir(), "chats");
         fs.mkdirSync(chatsDir, { recursive: true });
 
-        const timestamp = new Date()
-          .toISOString()
-          .slice(0, 16)
-          .replace(/:/g, '-');
-        const filename = `${SESSION_FILE_PREFIX}${timestamp}-${this.sessionId.slice(
-          0,
-          8,
-        )}.json`;
+        const timestamp = new Date().toISOString().slice(0, 16).replace(/:/g, "-");
+        const filename = `${SESSION_FILE_PREFIX}${timestamp}-${this.sessionId.slice(0, 8)}.json`;
         this.conversationFile = path.join(chatsDir, filename);
 
         this.writeConversation({
@@ -171,21 +159,16 @@ export class ChatRecordingService {
       this.queuedThoughts = [];
       this.queuedTokens = null;
     } catch (error) {
-      debugLogger.error('Error initializing chat recording service:', error);
+      debugLogger.error("Error initializing chat recording service:", error);
       throw error;
     }
   }
 
-  private getLastMessage(
-    conversation: ConversationRecord,
-  ): MessageRecord | undefined {
+  private getLastMessage(conversation: ConversationRecord): MessageRecord | undefined {
     return conversation.messages.at(-1);
   }
 
-  private newMessage(
-    type: ConversationRecordExtra['type'],
-    content: PartListUnion,
-  ): MessageRecord {
+  private newMessage(type: ConversationRecordExtra["type"], content: PartListUnion): MessageRecord {
     return {
       id: randomUUID(),
       timestamp: new Date().toISOString(),
@@ -199,7 +182,7 @@ export class ChatRecordingService {
    */
   recordMessage(message: {
     model: string | undefined;
-    type: ConversationRecordExtra['type'];
+    type: ConversationRecordExtra["type"];
     content: PartListUnion;
   }): void {
     if (!this.conversationFile) return;
@@ -207,7 +190,7 @@ export class ChatRecordingService {
     try {
       this.updateConversation((conversation) => {
         const msg = this.newMessage(message.type, message.content);
-        if (msg.type === 'gemini') {
+        if (msg.type === "gemini") {
           // If it's a new Gemini message then incorporate any queued thoughts.
           conversation.messages.push({
             ...msg,
@@ -223,7 +206,7 @@ export class ChatRecordingService {
         }
       });
     } catch (error) {
-      debugLogger.error('Error saving message to chat history.', error);
+      debugLogger.error("Error saving message to chat history.", error);
       throw error;
     }
   }
@@ -240,7 +223,7 @@ export class ChatRecordingService {
         timestamp: new Date().toISOString(),
       });
     } catch (error) {
-      debugLogger.error('Error saving thought to chat history.', error);
+      debugLogger.error("Error saving thought to chat history.", error);
       throw error;
     }
   }
@@ -248,9 +231,7 @@ export class ChatRecordingService {
   /**
    * Updates the tokens for the last message in the conversation (which should be by Gemini).
    */
-  recordMessageTokens(
-    respUsageMetadata: GenerateContentResponseUsageMetadata,
-  ): void {
+  recordMessageTokens(respUsageMetadata: GenerateContentResponseUsageMetadata): void {
     if (!this.conversationFile) return;
 
     try {
@@ -266,7 +247,7 @@ export class ChatRecordingService {
         const lastMsg = this.getLastMessage(conversation);
         // If the last message already has token info, it's because this new token info is for a
         // new message that hasn't been recorded yet.
-        if (lastMsg && lastMsg.type === 'gemini' && !lastMsg.tokens) {
+        if (lastMsg && lastMsg.type === "gemini" && !lastMsg.tokens) {
           lastMsg.tokens = tokens;
           this.queuedTokens = null;
         } else {
@@ -274,10 +255,7 @@ export class ChatRecordingService {
         }
       });
     } catch (error) {
-      debugLogger.error(
-        'Error updating message tokens in chat history.',
-        error,
-      );
+      debugLogger.error("Error updating message tokens in chat history.", error);
       throw error;
     }
   }
@@ -296,7 +274,7 @@ export class ChatRecordingService {
       return {
         ...toolCall,
         displayName: toolInstance?.displayName || toolCall.name,
-        description: toolInstance?.description || '',
+        description: toolInstance?.description || "",
         renderOutputAsMarkdown: toolInstance?.isOutputMarkdown || false,
       };
     });
@@ -311,18 +289,14 @@ export class ChatRecordingService {
         // Also if there are any queued thoughts, it means this tool call(s) is from a new Gemini
         // message--because it's thought some more since we last, if ever, created a new Gemini
         // message from tool calls, when we dequeued the thoughts.
-        if (
-          !lastMsg ||
-          lastMsg.type !== 'gemini' ||
-          this.queuedThoughts.length > 0
-        ) {
+        if (!lastMsg || lastMsg.type !== "gemini" || this.queuedThoughts.length > 0) {
           const newMsg: MessageRecord = {
-            ...this.newMessage('gemini' as const, ''),
+            ...this.newMessage("gemini" as const, ""),
             // This isn't strictly necessary, but TypeScript apparently can't
             // tell that the first parameter to newMessage() becomes the
             // resulting message's type, and so it thinks that toolCalls may
             // not be present.  Confirming the type here satisfies it.
-            type: 'gemini' as const,
+            type: "gemini" as const,
             toolCalls: enrichedToolCalls,
             thoughts: this.queuedThoughts,
             model,
@@ -347,9 +321,7 @@ export class ChatRecordingService {
           }
           lastMsg.toolCalls = lastMsg.toolCalls.map((toolCall) => {
             // If there are multiple tool calls with the same ID, this will take the first one.
-            const incomingToolCall = toolCalls.find(
-              (tc) => tc.id === toolCall.id,
-            );
+            const incomingToolCall = toolCalls.find((tc) => tc.id === toolCall.id);
             if (incomingToolCall) {
               // Merge in the new data to keep preserve thoughts, etc., that were assigned to older
               // versions of the tool call.
@@ -361,9 +333,7 @@ export class ChatRecordingService {
 
           // Add any new tools calls that aren't in the message yet.
           for (const toolCall of enrichedToolCalls) {
-            const existingToolCall = lastMsg.toolCalls.find(
-              (tc) => tc.id === toolCall.id,
-            );
+            const existingToolCall = lastMsg.toolCalls.find((tc) => tc.id === toolCall.id);
             if (!existingToolCall) {
               lastMsg.toolCalls.push(toolCall);
             }
@@ -371,10 +341,7 @@ export class ChatRecordingService {
         }
       });
     } catch (error) {
-      debugLogger.error(
-        'Error adding tool call to message in chat history.',
-        error,
-      );
+      debugLogger.error("Error adding tool call to message in chat history.", error);
       throw error;
     }
   }
@@ -384,11 +351,11 @@ export class ChatRecordingService {
    */
   private readConversation(): ConversationRecord {
     try {
-      this.cachedLastConvData = fs.readFileSync(this.conversationFile!, 'utf8');
+      this.cachedLastConvData = fs.readFileSync(this.conversationFile!, "utf8");
       return JSON.parse(this.cachedLastConvData);
     } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        debugLogger.error('Error reading conversation file.', error);
+      if ((error as NodeJS.ErrnoException).code !== "ENOENT") {
+        debugLogger.error("Error reading conversation file.", error);
         throw error;
       }
 
@@ -420,7 +387,7 @@ export class ChatRecordingService {
         fs.writeFileSync(this.conversationFile, newContent);
       }
     } catch (error) {
-      debugLogger.error('Error writing conversation file.', error);
+      debugLogger.error("Error writing conversation file.", error);
       throw error;
     }
   }
@@ -429,9 +396,7 @@ export class ChatRecordingService {
    * Convenient helper for updating the conversation without file reading and writing and time
    * updating boilerplate.
    */
-  private updateConversation(
-    updateFn: (conversation: ConversationRecord) => void,
-  ) {
+  private updateConversation(updateFn: (conversation: ConversationRecord) => void) {
     const conversation = this.readConversation();
     updateFn(conversation);
     this.writeConversation(conversation);
@@ -442,14 +407,11 @@ export class ChatRecordingService {
    */
   deleteSession(sessionId: string): void {
     try {
-      const chatsDir = path.join(
-        this.config.storage.getProjectTempDir(),
-        'chats',
-      );
+      const chatsDir = path.join(this.config.storage.getProjectTempDir(), "chats");
       const sessionPath = path.join(chatsDir, `${sessionId}.json`);
       fs.unlinkSync(sessionPath);
     } catch (error) {
-      debugLogger.error('Error deleting session file.', error);
+      debugLogger.error("Error deleting session file.", error);
       throw error;
     }
   }
diff --git a/packages/gemini-core/src/services/fileDiscoveryService.test.ts b/packages/gemini-core/src/services/fileDiscoveryService.test.ts
index 173e11458..6cfd86903 100644
--- a/packages/gemini-core/src/services/fileDiscoveryService.test.ts
+++ b/packages/gemini-core/src/services/fileDiscoveryService.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { FileDiscoveryService } from './fileDiscoveryService.js';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { FileDiscoveryService } from "./fileDiscoveryService.js";
 
-describe('FileDiscoveryService', () => {
+describe("FileDiscoveryService", () => {
   let testRootDir: string;
   let projectRoot: string;
 
-  async function createTestFile(filePath: string, content = '') {
+  async function createTestFile(filePath: string, content = "") {
     const fullPath = path.join(projectRoot, filePath);
     await fs.mkdir(path.dirname(fullPath), { recursive: true });
     await fs.writeFile(fullPath, content);
@@ -22,10 +22,8 @@ describe('FileDiscoveryService', () => {
   }
 
   beforeEach(async () => {
-    testRootDir = await fs.mkdtemp(
-      path.join(os.tmpdir(), 'file-discovery-test-'),
-    );
-    projectRoot = path.join(testRootDir, 'project');
+    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "file-discovery-test-"));
+    projectRoot = path.join(testRootDir, "project");
     await fs.mkdir(projectRoot, { recursive: true });
   });
 
@@ -33,65 +31,65 @@ describe('FileDiscoveryService', () => {
     await fs.rm(testRootDir, { recursive: true, force: true });
   });
 
-  describe('initialization', () => {
-    it('should initialize git ignore parser by default in a git repo', async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/');
+  describe("initialization", () => {
+    it("should initialize git ignore parser by default in a git repo", async () => {
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/");
 
       const service = new FileDiscoveryService(projectRoot);
       // Let's check the effect of the parser instead of mocking it.
-      expect(service.shouldIgnoreFile('node_modules/foo.js')).toBe(true);
-      expect(service.shouldIgnoreFile('src/foo.js')).toBe(false);
+      expect(service.shouldIgnoreFile("node_modules/foo.js")).toBe(true);
+      expect(service.shouldIgnoreFile("src/foo.js")).toBe(false);
     });
 
-    it('should not load git repo patterns when not in a git repo', async () => {
+    it("should not load git repo patterns when not in a git repo", async () => {
       // No .git directory
-      await createTestFile('.gitignore', 'node_modules/');
+      await createTestFile(".gitignore", "node_modules/");
       const service = new FileDiscoveryService(projectRoot);
 
       // .gitignore is not loaded in non-git repos
-      expect(service.shouldIgnoreFile('node_modules/foo.js')).toBe(false);
+      expect(service.shouldIgnoreFile("node_modules/foo.js")).toBe(false);
     });
 
-    it('should load .geminiignore patterns even when not in a git repo', async () => {
-      await createTestFile('.geminiignore', 'secrets.txt');
+    it("should load .geminiignore patterns even when not in a git repo", async () => {
+      await createTestFile(".geminiignore", "secrets.txt");
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(service.shouldIgnoreFile('secrets.txt')).toBe(true);
-      expect(service.shouldIgnoreFile('src/index.js')).toBe(false);
+      expect(service.shouldIgnoreFile("secrets.txt")).toBe(true);
+      expect(service.shouldIgnoreFile("src/index.js")).toBe(false);
     });
   });
 
-  describe('filterFiles', () => {
+  describe("filterFiles", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/\n.git/\ndist');
-      await createTestFile('.geminiignore', 'logs/');
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/\n.git/\ndist");
+      await createTestFile(".geminiignore", "logs/");
     });
 
-    it('should filter out git-ignored and gemini-ignored files by default', () => {
+    it("should filter out git-ignored and gemini-ignored files by default", () => {
       const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        'README.md',
-        '.git/config',
-        'dist/bundle.js',
-        'logs/latest.log',
+        "src/index.ts",
+        "node_modules/package/index.js",
+        "README.md",
+        ".git/config",
+        "dist/bundle.js",
+        "logs/latest.log",
       ].map((f) => path.join(projectRoot, f));
 
       const service = new FileDiscoveryService(projectRoot);
 
       expect(service.filterFiles(files)).toEqual(
-        ['src/index.ts', 'README.md'].map((f) => path.join(projectRoot, f)),
+        ["src/index.ts", "README.md"].map((f) => path.join(projectRoot, f)),
       );
     });
 
-    it('should not filter files when respectGitIgnore is false', () => {
+    it("should not filter files when respectGitIgnore is false", () => {
       const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        '.git/config',
-        'logs/latest.log',
+        "src/index.ts",
+        "node_modules/package/index.js",
+        ".git/config",
+        "logs/latest.log",
       ].map((f) => path.join(projectRoot, f));
 
       const service = new FileDiscoveryService(projectRoot);
@@ -102,18 +100,16 @@ describe('FileDiscoveryService', () => {
       });
 
       expect(filtered).toEqual(
-        ['src/index.ts', 'node_modules/package/index.js', '.git/config'].map(
-          (f) => path.join(projectRoot, f),
+        ["src/index.ts", "node_modules/package/index.js", ".git/config"].map((f) =>
+          path.join(projectRoot, f),
         ),
       );
     });
 
-    it('should not filter files when respectGeminiIgnore is false', () => {
-      const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        'logs/latest.log',
-      ].map((f) => path.join(projectRoot, f));
+    it("should not filter files when respectGeminiIgnore is false", () => {
+      const files = ["src/index.ts", "node_modules/package/index.js", "logs/latest.log"].map((f) =>
+        path.join(projectRoot, f),
+      );
 
       const service = new FileDiscoveryService(projectRoot);
 
@@ -123,47 +119,40 @@ describe('FileDiscoveryService', () => {
       });
 
       expect(filtered).toEqual(
-        ['src/index.ts', 'logs/latest.log'].map((f) =>
-          path.join(projectRoot, f),
-        ),
+        ["src/index.ts", "logs/latest.log"].map((f) => path.join(projectRoot, f)),
       );
     });
 
-    it('should handle empty file list', () => {
+    it("should handle empty file list", () => {
       const service = new FileDiscoveryService(projectRoot);
 
       expect(service.filterFiles([])).toEqual([]);
     });
   });
 
-  describe('filterFilesWithReport', () => {
+  describe("filterFilesWithReport", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/');
-      await createTestFile('.geminiignore', '*.log');
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/");
+      await createTestFile(".geminiignore", "*.log");
     });
 
-    it('should return filtered paths and correct ignored count', () => {
-      const files = [
-        'src/index.ts',
-        'node_modules/package/index.js',
-        'debug.log',
-        'README.md',
-      ].map((f) => path.join(projectRoot, f));
+    it("should return filtered paths and correct ignored count", () => {
+      const files = ["src/index.ts", "node_modules/package/index.js", "debug.log", "README.md"].map(
+        (f) => path.join(projectRoot, f),
+      );
 
       const service = new FileDiscoveryService(projectRoot);
       const report = service.filterFilesWithReport(files);
 
       expect(report.filteredPaths).toEqual(
-        ['src/index.ts', 'README.md'].map((f) => path.join(projectRoot, f)),
+        ["src/index.ts", "README.md"].map((f) => path.join(projectRoot, f)),
       );
       expect(report.ignoredCount).toBe(2);
     });
 
-    it('should handle no ignored files', () => {
-      const files = ['src/index.ts', 'README.md'].map((f) =>
-        path.join(projectRoot, f),
-      );
+    it("should handle no ignored files", () => {
+      const files = ["src/index.ts", "README.md"].map((f) => path.join(projectRoot, f));
 
       const service = new FileDiscoveryService(projectRoot);
       const report = service.filterFilesWithReport(files);
@@ -173,130 +162,106 @@ describe('FileDiscoveryService', () => {
     });
   });
 
-  describe('shouldGitIgnoreFile & shouldGeminiIgnoreFile', () => {
+  describe("shouldGitIgnoreFile & shouldGeminiIgnoreFile", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'node_modules/');
-      await createTestFile('.geminiignore', '*.log');
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "node_modules/");
+      await createTestFile(".geminiignore", "*.log");
     });
 
-    it('should return true for git-ignored files', () => {
+    it("should return true for git-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
       expect(
-        service.shouldIgnoreFile(
-          path.join(projectRoot, 'node_modules/package/index.js'),
-        ),
+        service.shouldIgnoreFile(path.join(projectRoot, "node_modules/package/index.js")),
       ).toBe(true);
     });
 
-    it('should return false for non-git-ignored files', () => {
+    it("should return false for non-git-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'src/index.ts')),
-      ).toBe(false);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "src/index.ts"))).toBe(false);
     });
 
-    it('should return true for gemini-ignored files', () => {
+    it("should return true for gemini-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'debug.log')),
-      ).toBe(true);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "debug.log"))).toBe(true);
     });
 
-    it('should return false for non-gemini-ignored files', () => {
+    it("should return false for non-gemini-ignored files", () => {
       const service = new FileDiscoveryService(projectRoot);
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'src/index.ts')),
-      ).toBe(false);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "src/index.ts"))).toBe(false);
     });
   });
 
-  describe('edge cases', () => {
-    it('should handle relative project root paths', async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'ignored.txt');
-      const service = new FileDiscoveryService(
-        path.relative(process.cwd(), projectRoot),
-      );
+  describe("edge cases", () => {
+    it("should handle relative project root paths", async () => {
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "ignored.txt");
+      const service = new FileDiscoveryService(path.relative(process.cwd(), projectRoot));
 
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'ignored.txt')),
-      ).toBe(true);
-      expect(
-        service.shouldIgnoreFile(path.join(projectRoot, 'not-ignored.txt')),
-      ).toBe(false);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "ignored.txt"))).toBe(true);
+      expect(service.shouldIgnoreFile(path.join(projectRoot, "not-ignored.txt"))).toBe(false);
     });
 
-    it('should handle filterFiles with undefined options', async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
-      await createTestFile('.gitignore', 'ignored.txt');
+    it("should handle filterFiles with undefined options", async () => {
+      await fs.mkdir(path.join(projectRoot, ".git"));
+      await createTestFile(".gitignore", "ignored.txt");
       const service = new FileDiscoveryService(projectRoot);
 
-      const files = ['src/index.ts', 'ignored.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["src/index.ts", "ignored.txt"].map((f) => path.join(projectRoot, f));
 
       expect(service.filterFiles(files, undefined)).toEqual([
-        path.join(projectRoot, 'src/index.ts'),
+        path.join(projectRoot, "src/index.ts"),
       ]);
     });
   });
-  describe('precedence (.geminiignore over .gitignore)', () => {
+  describe("precedence (.geminiignore over .gitignore)", () => {
     beforeEach(async () => {
-      await fs.mkdir(path.join(projectRoot, '.git'));
+      await fs.mkdir(path.join(projectRoot, ".git"));
     });
 
-    it('should un-ignore a file in .geminiignore that is ignored in .gitignore', async () => {
-      await createTestFile('.gitignore', '*.txt');
-      await createTestFile('.geminiignore', '!important.txt');
+    it("should un-ignore a file in .geminiignore that is ignored in .gitignore", async () => {
+      await createTestFile(".gitignore", "*.txt");
+      await createTestFile(".geminiignore", "!important.txt");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['file.txt', 'important.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["file.txt", "important.txt"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files);
-      expect(filtered).toEqual([path.join(projectRoot, 'important.txt')]);
+      expect(filtered).toEqual([path.join(projectRoot, "important.txt")]);
     });
 
-    it('should un-ignore a directory in .geminiignore that is ignored in .gitignore', async () => {
-      await createTestFile('.gitignore', 'logs/');
-      await createTestFile('.geminiignore', '!logs/');
+    it("should un-ignore a directory in .geminiignore that is ignored in .gitignore", async () => {
+      await createTestFile(".gitignore", "logs/");
+      await createTestFile(".geminiignore", "!logs/");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['logs/app.log', 'other/app.log'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["logs/app.log", "other/app.log"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files);
       expect(filtered).toEqual(files);
     });
 
-    it('should extend ignore rules in .geminiignore', async () => {
-      await createTestFile('.gitignore', '*.log');
-      await createTestFile('.geminiignore', 'temp/');
+    it("should extend ignore rules in .geminiignore", async () => {
+      await createTestFile(".gitignore", "*.log");
+      await createTestFile(".geminiignore", "temp/");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['app.log', 'temp/file.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["app.log", "temp/file.txt"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files);
       expect(filtered).toEqual([]);
     });
 
-    it('should use .gitignore rules if respectGeminiIgnore is false', async () => {
-      await createTestFile('.gitignore', '*.txt');
-      await createTestFile('.geminiignore', '!important.txt');
+    it("should use .gitignore rules if respectGeminiIgnore is false", async () => {
+      await createTestFile(".gitignore", "*.txt");
+      await createTestFile(".geminiignore", "!important.txt");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['file.txt', 'important.txt'].map((f) =>
-        path.join(projectRoot, f),
-      );
+      const files = ["file.txt", "important.txt"].map((f) => path.join(projectRoot, f));
 
       const filtered = service.filterFiles(files, {
         respectGitIgnore: true,
@@ -306,12 +271,12 @@ describe('FileDiscoveryService', () => {
       expect(filtered).toEqual([]);
     });
 
-    it('should use .geminiignore rules if respectGitIgnore is false', async () => {
-      await createTestFile('.gitignore', '*.txt');
-      await createTestFile('.geminiignore', '!important.txt\ntemp/');
+    it("should use .geminiignore rules if respectGitIgnore is false", async () => {
+      await createTestFile(".gitignore", "*.txt");
+      await createTestFile(".geminiignore", "!important.txt\ntemp/");
 
       const service = new FileDiscoveryService(projectRoot);
-      const files = ['file.txt', 'important.txt', 'temp/file.js'].map((f) =>
+      const files = ["file.txt", "important.txt", "temp/file.js"].map((f) =>
         path.join(projectRoot, f),
       );
 
@@ -323,9 +288,7 @@ describe('FileDiscoveryService', () => {
       // .gitignore is ignored, so *.txt is not applied.
       // .geminiignore un-ignores important.txt (which wasn't ignored anyway)
       // and ignores temp/
-      expect(filtered).toEqual(
-        ['file.txt', 'important.txt'].map((f) => path.join(projectRoot, f)),
-      );
+      expect(filtered).toEqual(["file.txt", "important.txt"].map((f) => path.join(projectRoot, f)));
     });
   });
 });
diff --git a/packages/gemini-core/src/services/fileDiscoveryService.ts b/packages/gemini-core/src/services/fileDiscoveryService.ts
index 4ad2eb755..56f10fca5 100644
--- a/packages/gemini-core/src/services/fileDiscoveryService.ts
+++ b/packages/gemini-core/src/services/fileDiscoveryService.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GitIgnoreFilter } from '../utils/gitIgnoreParser.js';
-import type { GeminiIgnoreFilter } from '../utils/geminiIgnoreParser.js';
-import { GitIgnoreParser } from '../utils/gitIgnoreParser.js';
-import { GeminiIgnoreParser } from '../utils/geminiIgnoreParser.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import * as path from 'node:path';
+import * as path from "node:path";
+import type { GeminiIgnoreFilter } from "../utils/geminiIgnoreParser.js";
+import { GeminiIgnoreParser } from "../utils/geminiIgnoreParser.js";
+import type { GitIgnoreFilter } from "../utils/gitIgnoreParser.js";
+import { GitIgnoreParser } from "../utils/gitIgnoreParser.js";
+import { isGitRepository } from "../utils/gitUtils.js";
 
 export interface FilterFilesOptions {
   respectGitIgnore?: boolean;
@@ -37,10 +37,7 @@ export class FileDiscoveryService {
     if (this.gitIgnoreFilter) {
       const geminiPatterns = this.geminiIgnoreFilter.getPatterns();
       // Create combined parser: .gitignore + .geminiignore
-      this.combinedIgnoreFilter = new GitIgnoreParser(
-        this.projectRoot,
-        geminiPatterns,
-      );
+      this.combinedIgnoreFilter = new GitIgnoreParser(this.projectRoot, geminiPatterns);
     }
   }
 
@@ -50,11 +47,7 @@ export class FileDiscoveryService {
   filterFiles(filePaths: string[], options: FilterFilesOptions = {}): string[] {
     const { respectGitIgnore = true, respectGeminiIgnore = true } = options;
     return filePaths.filter((filePath) => {
-      if (
-        respectGitIgnore &&
-        respectGeminiIgnore &&
-        this.combinedIgnoreFilter
-      ) {
+      if (respectGitIgnore && respectGeminiIgnore && this.combinedIgnoreFilter) {
         return !this.combinedIgnoreFilter.isIgnored(filePath);
       }
 
@@ -91,10 +84,7 @@ export class FileDiscoveryService {
   /**
    * Unified method to check if a file should be ignored based on filtering options
    */
-  shouldIgnoreFile(
-    filePath: string,
-    options: FilterFilesOptions = {},
-  ): boolean {
+  shouldIgnoreFile(filePath: string, options: FilterFilesOptions = {}): boolean {
     return this.filterFiles([filePath], options).length === 0;
   }
 }
diff --git a/packages/gemini-core/src/services/fileSystemService.test.ts b/packages/gemini-core/src/services/fileSystemService.test.ts
index 4ca5c3329..90fb14f4f 100644
--- a/packages/gemini-core/src/services/fileSystemService.test.ts
+++ b/packages/gemini-core/src/services/fileSystemService.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'node:fs/promises';
-import { StandardFileSystemService } from './fileSystemService.js';
+import fs from "node:fs/promises";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { StandardFileSystemService } from "./fileSystemService.js";
 
-vi.mock('fs/promises');
+vi.mock("fs/promises");
 
-describe('StandardFileSystemService', () => {
+describe("StandardFileSystemService", () => {
   let fileSystem: StandardFileSystemService;
 
   beforeEach(() => {
@@ -22,38 +22,34 @@ describe('StandardFileSystemService', () => {
     vi.restoreAllMocks();
   });
 
-  describe('readTextFile', () => {
-    it('should read file content using fs', async () => {
-      const testContent = 'Hello, World!';
+  describe("readTextFile", () => {
+    it("should read file content using fs", async () => {
+      const testContent = "Hello, World!";
       vi.mocked(fs.readFile).mockResolvedValue(testContent);
 
-      const result = await fileSystem.readTextFile('/test/file.txt');
+      const result = await fileSystem.readTextFile("/test/file.txt");
 
-      expect(fs.readFile).toHaveBeenCalledWith('/test/file.txt', 'utf-8');
+      expect(fs.readFile).toHaveBeenCalledWith("/test/file.txt", "utf-8");
       expect(result).toBe(testContent);
     });
 
-    it('should propagate fs.readFile errors', async () => {
-      const error = new Error('ENOENT: File not found');
+    it("should propagate fs.readFile errors", async () => {
+      const error = new Error("ENOENT: File not found");
       vi.mocked(fs.readFile).mockRejectedValue(error);
 
-      await expect(fileSystem.readTextFile('/test/file.txt')).rejects.toThrow(
-        'ENOENT: File not found',
+      await expect(fileSystem.readTextFile("/test/file.txt")).rejects.toThrow(
+        "ENOENT: File not found",
       );
     });
   });
 
-  describe('writeTextFile', () => {
-    it('should write file content using fs', async () => {
+  describe("writeTextFile", () => {
+    it("should write file content using fs", async () => {
       vi.mocked(fs.writeFile).mockResolvedValue();
 
-      await fileSystem.writeTextFile('/test/file.txt', 'Hello, World!');
+      await fileSystem.writeTextFile("/test/file.txt", "Hello, World!");
 
-      expect(fs.writeFile).toHaveBeenCalledWith(
-        '/test/file.txt',
-        'Hello, World!',
-        'utf-8',
-      );
+      expect(fs.writeFile).toHaveBeenCalledWith("/test/file.txt", "Hello, World!", "utf-8");
     });
   });
 });
diff --git a/packages/gemini-core/src/services/fileSystemService.ts b/packages/gemini-core/src/services/fileSystemService.ts
index 67c910611..7b111b5b2 100644
--- a/packages/gemini-core/src/services/fileSystemService.ts
+++ b/packages/gemini-core/src/services/fileSystemService.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { globSync } from 'glob';
+import fs from "node:fs/promises";
+import * as path from "node:path";
+import { globSync } from "glob";
 
 /**
  * Interface for file system operations that may be delegated to different implementations
@@ -43,16 +43,16 @@ export interface FileSystemService {
  */
 export class StandardFileSystemService implements FileSystemService {
   async readTextFile(filePath: string): Promise<string> {
-    return fs.readFile(filePath, 'utf-8');
+    return fs.readFile(filePath, "utf-8");
   }
 
   async writeTextFile(filePath: string, content: string): Promise<void> {
-    await fs.writeFile(filePath, content, 'utf-8');
+    await fs.writeFile(filePath, content, "utf-8");
   }
 
   findFiles(fileName: string, searchPaths: readonly string[]): string[] {
     return searchPaths.flatMap((searchPath) => {
-      const pattern = path.posix.join(searchPath, '**', fileName);
+      const pattern = path.posix.join(searchPath, "**", fileName);
       return globSync(pattern, {
         nodir: true,
         absolute: true,
diff --git a/packages/gemini-core/src/services/gitService.test.ts b/packages/gemini-core/src/services/gitService.test.ts
index 17860d22b..80c8be173 100644
--- a/packages/gemini-core/src/services/gitService.test.ts
+++ b/packages/gemini-core/src/services/gitService.test.ts
@@ -4,24 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { GitService } from './gitService.js';
-import { Storage } from '../config/storage.js';
-import * as path from 'node:path';
-import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import { getProjectHash, GEMINI_DIR } from '../utils/paths.js';
-import { spawnAsync } from '../utils/shell-utils.js';
-
-vi.mock('../utils/shell-utils.js', () => ({
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { Storage } from "../config/storage.js";
+import { GEMINI_DIR, getProjectHash } from "../utils/paths.js";
+import { spawnAsync } from "../utils/shell-utils.js";
+import { GitService } from "./gitService.js";
+
+vi.mock("../utils/shell-utils.js", () => ({
   spawnAsync: vi.fn(),
 }));
 
@@ -32,7 +24,7 @@ const hoistedMockInit = vi.hoisted(() => vi.fn());
 const hoistedMockRaw = vi.hoisted(() => vi.fn());
 const hoistedMockAdd = vi.hoisted(() => vi.fn());
 const hoistedMockCommit = vi.hoisted(() => vi.fn());
-vi.mock('simple-git', () => ({
+vi.mock("simple-git", () => ({
   simpleGit: hoistedMockSimpleGit.mockImplementation(() => ({
     checkIsRepo: hoistedMockCheckIsRepo,
     init: hoistedMockInit,
@@ -41,16 +33,16 @@ vi.mock('simple-git', () => ({
     commit: hoistedMockCommit,
     env: hoistedMockEnv,
   })),
-  CheckRepoActions: { IS_REPO_ROOT: 'is-repo-root' },
+  CheckRepoActions: { IS_REPO_ROOT: "is-repo-root" },
 }));
 
 const hoistedIsGitRepositoryMock = vi.hoisted(() => vi.fn());
-vi.mock('../utils/gitUtils.js', () => ({
+vi.mock("../utils/gitUtils.js", () => ({
   isGitRepository: hoistedIsGitRepositoryMock,
 }));
 
 const hoistedMockHomedir = vi.hoisted(() => vi.fn());
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const actual = await importOriginal<typeof os>();
   return {
     ...actual,
@@ -58,7 +50,7 @@ vi.mock('os', async (importOriginal) => {
   };
 });
 
-describe('GitService', () => {
+describe("GitService", () => {
   let testRootDir: string;
   let projectRoot: string;
   let homedir: string;
@@ -66,9 +58,9 @@ describe('GitService', () => {
   let storage: Storage;
 
   beforeEach(async () => {
-    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'git-service-test-'));
-    projectRoot = path.join(testRootDir, 'project');
-    homedir = path.join(testRootDir, 'home');
+    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "git-service-test-"));
+    projectRoot = path.join(testRootDir, "project");
+    homedir = path.join(testRootDir, "home");
     await fs.mkdir(projectRoot, { recursive: true });
     await fs.mkdir(homedir, { recursive: true });
 
@@ -77,8 +69,8 @@ describe('GitService', () => {
     vi.clearAllMocks();
     hoistedIsGitRepositoryMock.mockReturnValue(true);
     (spawnAsync as Mock).mockResolvedValue({
-      stdout: 'git version 2.0.0',
-      stderr: '',
+      stdout: "git version 2.0.0",
+      stderr: "",
     });
 
     hoistedMockHomedir.mockReturnValue(homedir);
@@ -100,10 +92,10 @@ describe('GitService', () => {
     }));
     hoistedMockCheckIsRepo.mockResolvedValue(false);
     hoistedMockInit.mockResolvedValue(undefined);
-    hoistedMockRaw.mockResolvedValue('');
+    hoistedMockRaw.mockResolvedValue("");
     hoistedMockAdd.mockResolvedValue(undefined);
     hoistedMockCommit.mockResolvedValue({
-      commit: 'initial',
+      commit: "initial",
     });
     storage = new Storage(projectRoot);
   });
@@ -113,73 +105,71 @@ describe('GitService', () => {
     await fs.rm(testRootDir, { recursive: true, force: true });
   });
 
-  describe('constructor', () => {
-    it('should successfully create an instance', () => {
+  describe("constructor", () => {
+    it("should successfully create an instance", () => {
       expect(() => new GitService(projectRoot, storage)).not.toThrow();
     });
   });
 
-  describe('verifyGitAvailability', () => {
-    it('should resolve true if git --version command succeeds', async () => {
+  describe("verifyGitAvailability", () => {
+    it("should resolve true if git --version command succeeds", async () => {
       const service = new GitService(projectRoot, storage);
       await expect(service.verifyGitAvailability()).resolves.toBe(true);
-      expect(spawnAsync).toHaveBeenCalledWith('git', ['--version']);
+      expect(spawnAsync).toHaveBeenCalledWith("git", ["--version"]);
     });
 
-    it('should resolve false if git --version command fails', async () => {
-      (spawnAsync as Mock).mockRejectedValue(new Error('git not found'));
+    it("should resolve false if git --version command fails", async () => {
+      (spawnAsync as Mock).mockRejectedValue(new Error("git not found"));
       const service = new GitService(projectRoot, storage);
       await expect(service.verifyGitAvailability()).resolves.toBe(false);
     });
   });
 
-  describe('initialize', () => {
-    it('should throw an error if Git is not available', async () => {
-      (spawnAsync as Mock).mockRejectedValue(new Error('git not found'));
+  describe("initialize", () => {
+    it("should throw an error if Git is not available", async () => {
+      (spawnAsync as Mock).mockRejectedValue(new Error("git not found"));
       const service = new GitService(projectRoot, storage);
       await expect(service.initialize()).rejects.toThrow(
-        'Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.',
+        "Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.",
       );
     });
 
-    it('should call setupShadowGitRepository if Git is available', async () => {
+    it("should call setupShadowGitRepository if Git is available", async () => {
       const service = new GitService(projectRoot, storage);
-      const setupSpy = vi
-        .spyOn(service, 'setupShadowGitRepository')
-        .mockResolvedValue(undefined);
+      const setupSpy = vi.spyOn(service, "setupShadowGitRepository").mockResolvedValue(undefined);
 
       await service.initialize();
       expect(setupSpy).toHaveBeenCalled();
     });
   });
 
-  describe('setupShadowGitRepository', () => {
+  describe("setupShadowGitRepository", () => {
     let repoDir: string;
     let gitConfigPath: string;
 
     beforeEach(() => {
-      repoDir = path.join(homedir, GEMINI_DIR, 'history', hash);
-      gitConfigPath = path.join(repoDir, '.gitconfig');
+      repoDir = path.join(homedir, GEMINI_DIR, "history", hash);
+      gitConfigPath = path.join(repoDir, ".gitconfig");
     });
 
-    it('should create history and repository directories', async () => {
+    it("should create history and repository directories", async () => {
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
       const stats = await fs.stat(repoDir);
       expect(stats.isDirectory()).toBe(true);
     });
 
-    it('should create a .gitconfig file with the correct content', async () => {
+    it("should create a .gitconfig file with the correct content", async () => {
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
 
       const expectedConfigContent =
-        '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
-      const actualConfigContent = await fs.readFile(gitConfigPath, 'utf-8');
+        "[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n";
+      const actualConfigContent = await fs.readFile(gitConfigPath, "utf-8");
       expect(actualConfigContent).toBe(expectedConfigContent);
     });
 
-    it('should initialize git repo in historyDir if not already initialized', async () => {
+    it("should initialize git repo in historyDir if not already initialized", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(false);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
@@ -187,38 +177,38 @@ describe('GitService', () => {
       expect(hoistedMockInit).toHaveBeenCalled();
     });
 
-    it('should not initialize git repo if already initialized', async () => {
+    it("should not initialize git repo if already initialized", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(true);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
       expect(hoistedMockInit).not.toHaveBeenCalled();
     });
 
-    it('should copy .gitignore from projectRoot if it exists', async () => {
-      const gitignoreContent = 'node_modules/\n.env';
-      const visibleGitIgnorePath = path.join(projectRoot, '.gitignore');
+    it("should copy .gitignore from projectRoot if it exists", async () => {
+      const gitignoreContent = "node_modules/\n.env";
+      const visibleGitIgnorePath = path.join(projectRoot, ".gitignore");
       await fs.writeFile(visibleGitIgnorePath, gitignoreContent);
 
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
 
-      const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
-      const copiedContent = await fs.readFile(hiddenGitIgnorePath, 'utf-8');
+      const hiddenGitIgnorePath = path.join(repoDir, ".gitignore");
+      const copiedContent = await fs.readFile(hiddenGitIgnorePath, "utf-8");
       expect(copiedContent).toBe(gitignoreContent);
     });
 
-    it('should not create a .gitignore in shadow repo if project .gitignore does not exist', async () => {
+    it("should not create a .gitignore in shadow repo if project .gitignore does not exist", async () => {
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
 
-      const hiddenGitIgnorePath = path.join(repoDir, '.gitignore');
+      const hiddenGitIgnorePath = path.join(repoDir, ".gitignore");
       // An empty string is written if the file doesn't exist.
-      const content = await fs.readFile(hiddenGitIgnorePath, 'utf-8');
-      expect(content).toBe('');
+      const content = await fs.readFile(hiddenGitIgnorePath, "utf-8");
+      expect(content).toBe("");
     });
 
-    it('should throw an error if reading projectRoot .gitignore fails with other errors', async () => {
-      const visibleGitIgnorePath = path.join(projectRoot, '.gitignore');
+    it("should throw an error if reading projectRoot .gitignore fails with other errors", async () => {
+      const visibleGitIgnorePath = path.join(projectRoot, ".gitignore");
       // Create a directory instead of a file to cause a read error
       await fs.mkdir(visibleGitIgnorePath);
 
@@ -229,16 +219,16 @@ describe('GitService', () => {
       );
     });
 
-    it('should make an initial commit if no commits exist in history repo', async () => {
+    it("should make an initial commit if no commits exist in history repo", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(false);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
-      expect(hoistedMockCommit).toHaveBeenCalledWith('Initial commit', {
-        '--allow-empty': null,
+      expect(hoistedMockCommit).toHaveBeenCalledWith("Initial commit", {
+        "--allow-empty": null,
       });
     });
 
-    it('should not make an initial commit if commits already exist', async () => {
+    it("should not make an initial commit if commits already exist", async () => {
       hoistedMockCheckIsRepo.mockResolvedValue(true);
       const service = new GitService(projectRoot, storage);
       await service.setupShadowGitRepository();
diff --git a/packages/gemini-core/src/services/gitService.ts b/packages/gemini-core/src/services/gitService.ts
index 350d9b178..78e335c99 100644
--- a/packages/gemini-core/src/services/gitService.ts
+++ b/packages/gemini-core/src/services/gitService.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isNodeError } from '../utils/errors.js';
-import { spawnAsync } from '../utils/shell-utils.js';
-import type { SimpleGit } from 'simple-git';
-import { simpleGit, CheckRepoActions } from 'simple-git';
-import type { Storage } from '../config/storage.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { SimpleGit } from "simple-git";
+import { CheckRepoActions, simpleGit } from "simple-git";
+import type { Storage } from "../config/storage.js";
+import { isNodeError } from "../utils/errors.js";
+import { spawnAsync } from "../utils/shell-utils.js";
 
 export class GitService {
   private projectRoot: string;
@@ -29,21 +29,21 @@ export class GitService {
     const gitAvailable = await this.verifyGitAvailability();
     if (!gitAvailable) {
       throw new Error(
-        'Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.',
+        "Checkpointing is enabled, but Git is not installed. Please install Git or disable checkpointing to continue.",
       );
     }
     try {
       await this.setupShadowGitRepository();
     } catch (error) {
       throw new Error(
-        `Failed to initialize checkpointing: ${error instanceof Error ? error.message : 'Unknown error'}. Please check that Git is working properly or disable checkpointing.`,
+        `Failed to initialize checkpointing: ${error instanceof Error ? error.message : "Unknown error"}. Please check that Git is working properly or disable checkpointing.`,
       );
     }
   }
 
   async verifyGitAvailability(): Promise<boolean> {
     try {
-      await spawnAsync('git', ['--version']);
+      await spawnAsync("git", ["--version"]);
       return true;
     } catch (_error) {
       return false;
@@ -56,14 +56,14 @@ export class GitService {
    */
   async setupShadowGitRepository() {
     const repoDir = this.getHistoryDir();
-    const gitConfigPath = path.join(repoDir, '.gitconfig');
+    const gitConfigPath = path.join(repoDir, ".gitconfig");
 
     await fs.mkdir(repoDir, { recursive: true });
 
     // We don't want to inherit the user's name, email, or gpg signing
     // preferences for the shadow repository, so we create a dedicated gitconfig.
     const gitConfigContent =
-      '[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n';
+      "[user]\n  name = Gemini CLI\n  email = gemini-cli@google.com\n[commit]\n  gpgsign = false\n";
     await fs.writeFile(gitConfigPath, gitConfigContent);
 
     const repo = simpleGit(repoDir);
@@ -71,20 +71,20 @@ export class GitService {
 
     if (!isRepoDefined) {
       await repo.init(false, {
-        '--initial-branch': 'main',
+        "--initial-branch": "main",
       });
 
-      await repo.commit('Initial commit', { '--allow-empty': null });
+      await repo.commit("Initial commit", { "--allow-empty": null });
     }
 
-    const userGitIgnorePath = path.join(this.projectRoot, '.gitignore');
-    const shadowGitIgnorePath = path.join(repoDir, '.gitignore');
+    const userGitIgnorePath = path.join(this.projectRoot, ".gitignore");
+    const shadowGitIgnorePath = path.join(repoDir, ".gitignore");
 
-    let userGitIgnoreContent = '';
+    let userGitIgnoreContent = "";
     try {
-      userGitIgnoreContent = await fs.readFile(userGitIgnorePath, 'utf-8');
+      userGitIgnoreContent = await fs.readFile(userGitIgnorePath, "utf-8");
     } catch (error) {
-      if (isNodeError(error) && error.code !== 'ENOENT') {
+      if (isNodeError(error) && error.code !== "ENOENT") {
         throw error;
       }
     }
@@ -95,7 +95,7 @@ export class GitService {
   private get shadowGitRepository(): SimpleGit {
     const repoDir = this.getHistoryDir();
     return simpleGit(this.projectRoot).env({
-      GIT_DIR: path.join(repoDir, '.git'),
+      GIT_DIR: path.join(repoDir, ".git"),
       GIT_WORK_TREE: this.projectRoot,
       // Prevent git from using the user's global git config.
       HOME: repoDir,
@@ -104,27 +104,27 @@ export class GitService {
   }
 
   async getCurrentCommitHash(): Promise<string> {
-    const hash = await this.shadowGitRepository.raw('rev-parse', 'HEAD');
+    const hash = await this.shadowGitRepository.raw("rev-parse", "HEAD");
     return hash.trim();
   }
 
   async createFileSnapshot(message: string): Promise<string> {
     try {
       const repo = this.shadowGitRepository;
-      await repo.add('.');
+      await repo.add(".");
       const commitResult = await repo.commit(message);
       return commitResult.commit;
     } catch (error) {
       throw new Error(
-        `Failed to create checkpoint snapshot: ${error instanceof Error ? error.message : 'Unknown error'}. Checkpointing may not be working properly.`,
+        `Failed to create checkpoint snapshot: ${error instanceof Error ? error.message : "Unknown error"}. Checkpointing may not be working properly.`,
       );
     }
   }
 
   async restoreProjectFromSnapshot(commitHash: string): Promise<void> {
     const repo = this.shadowGitRepository;
-    await repo.raw(['restore', '--source', commitHash, '.']);
+    await repo.raw(["restore", "--source", commitHash, "."]);
     // Removes any untracked files that were introduced post snapshot.
-    await repo.clean('f', ['-d']);
+    await repo.clean("f", ["-d"]);
   }
 }
diff --git a/packages/gemini-core/src/services/loopDetectionService.test.ts b/packages/gemini-core/src/services/loopDetectionService.test.ts
index 2f5419578..d4206cdd6 100644
--- a/packages/gemini-core/src/services/loopDetectionService.test.ts
+++ b/packages/gemini-core/src/services/loopDetectionService.test.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type { Content } from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { GeminiClient } from '../core/client.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
+import type { Content } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { GeminiClient } from "../core/client.js";
 import type {
   ServerGeminiContentEvent,
   ServerGeminiStreamEvent,
   ServerGeminiToolCallRequestEvent,
-} from '../core/turn.js';
-import { GeminiEventType } from '../core/turn.js';
-import * as loggers from '../telemetry/loggers.js';
-import { LoopType } from '../telemetry/types.js';
-import { LoopDetectionService } from './loopDetectionService.js';
+} from "../core/turn.js";
+import { GeminiEventType } from "../core/turn.js";
+import * as loggers from "../telemetry/loggers.js";
+import { LoopType } from "../telemetry/types.js";
+import { LoopDetectionService } from "./loopDetectionService.js";
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logLoopDetected: vi.fn(),
   logLoopDetectionDisabled: vi.fn(),
   logLlmLoopCheck: vi.fn(),
@@ -29,7 +29,7 @@ const TOOL_CALL_LOOP_THRESHOLD = 5;
 const CONTENT_LOOP_THRESHOLD = 10;
 const CONTENT_CHUNK_SIZE = 50;
 
-describe('LoopDetectionService', () => {
+describe("LoopDetectionService", () => {
   let service: LoopDetectionService;
   let mockConfig: Config;
 
@@ -50,9 +50,9 @@ describe('LoopDetectionService', () => {
     value: {
       name,
       args,
-      callId: 'test-id',
+      callId: "test-id",
       isClientInitiated: false,
-      prompt_id: 'test-prompt-id',
+      prompt_id: "test-prompt-id",
     },
   });
 
@@ -63,16 +63,16 @@ describe('LoopDetectionService', () => {
 
   const createRepetitiveContent = (id: number, length: number): string => {
     const baseString = `This is a unique sentence, id=${id}. `;
-    let content = '';
+    let content = "";
     while (content.length < length) {
       content += baseString;
     }
     return content.slice(0, length);
   };
 
-  describe('Tool Call Loop Detection', () => {
+  describe("Tool Call Loop Detection", () => {
     it(`should not detect a loop for fewer than TOOL_CALL_LOOP_THRESHOLD identical calls`, () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 1; i++) {
         expect(service.addAndCheck(event)).toBe(false);
       }
@@ -80,7 +80,7 @@ describe('LoopDetectionService', () => {
     });
 
     it(`should detect a loop on the TOOL_CALL_LOOP_THRESHOLD-th identical call`, () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 1; i++) {
         service.addAndCheck(event);
       }
@@ -88,8 +88,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect a loop on subsequent identical calls', () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+    it("should detect a loop on subsequent identical calls", () => {
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD; i++) {
         service.addAndCheck(event);
       }
@@ -97,15 +97,15 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop for different tool calls', () => {
-      const event1 = createToolCallRequestEvent('testTool', {
-        param: 'value1',
+    it("should not detect a loop for different tool calls", () => {
+      const event1 = createToolCallRequestEvent("testTool", {
+        param: "value1",
       });
-      const event2 = createToolCallRequestEvent('testTool', {
-        param: 'value2',
+      const event2 = createToolCallRequestEvent("testTool", {
+        param: "value2",
       });
-      const event3 = createToolCallRequestEvent('anotherTool', {
-        param: 'value1',
+      const event3 = createToolCallRequestEvent("anotherTool", {
+        param: "value1",
       });
 
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD - 2; i++) {
@@ -115,12 +115,12 @@ describe('LoopDetectionService', () => {
       }
     });
 
-    it('should not reset tool call counter for other event types', () => {
-      const toolCallEvent = createToolCallRequestEvent('testTool', {
-        param: 'value',
+    it("should not reset tool call counter for other event types", () => {
+      const toolCallEvent = createToolCallRequestEvent("testTool", {
+        param: "value",
       });
       const otherEvent = {
-        type: 'thought',
+        type: "thought",
       } as unknown as ServerGeminiStreamEvent;
 
       // Send events just below the threshold
@@ -136,18 +136,18 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop when disabled for session', () => {
+    it("should not detect a loop when disabled for session", () => {
       service.disableForSession();
       expect(loggers.logLoopDetectionDisabled).toHaveBeenCalledTimes(1);
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD; i++) {
         expect(service.addAndCheck(event)).toBe(false);
       }
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should stop reporting a loop if disabled after detection', () => {
-      const event = createToolCallRequestEvent('testTool', { param: 'value' });
+    it("should stop reporting a loop if disabled after detection", () => {
+      const event = createToolCallRequestEvent("testTool", { param: "value" });
       for (let i = 0; i < TOOL_CALL_LOOP_THRESHOLD; i++) {
         service.addAndCheck(event);
       }
@@ -160,22 +160,19 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Content Loop Detection', () => {
+  describe("Content Loop Detection", () => {
     const generateRandomString = (length: number) => {
-      let result = '';
-      const characters =
-        'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+      let result = "";
+      const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
       const charactersLength = characters.length;
       for (let i = 0; i < length; i++) {
-        result += characters.charAt(
-          Math.floor(Math.random() * charactersLength),
-        );
+        result += characters.charAt(Math.floor(Math.random() * charactersLength));
       }
       return result;
     };
 
-    it('should not detect a loop for random content', () => {
-      service.reset('');
+    it("should not detect a loop for random content", () => {
+      service.reset("");
       for (let i = 0; i < 1000; i++) {
         const content = generateRandomString(10);
         const isLoop = service.addAndCheck(createContentEvent(content));
@@ -184,8 +181,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should detect a loop when a chunk of content repeats consecutively', () => {
-      service.reset('');
+    it("should detect a loop when a chunk of content repeats consecutively", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       let isLoop = false;
@@ -196,8 +193,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop if repetitions are very far apart', () => {
-      service.reset('');
+    it("should not detect a loop if repetitions are very far apart", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
       const fillerContent = generateRandomString(500);
 
@@ -210,8 +207,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should detect a loop with longer repeating patterns (e.g. ~150 chars)', () => {
-      service.reset('');
+    it("should detect a loop with longer repeating patterns (e.g. ~150 chars)", () => {
+      service.reset("");
       const longPattern = createRepetitiveContent(1, 150);
       expect(longPattern.length).toBe(150);
 
@@ -224,8 +221,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect the specific user-provided loop example', () => {
-      service.reset('');
+    it("should detect the specific user-provided loop example", () => {
+      service.reset("");
       const userPattern = `I will not output any text.
   I will just end the turn.
   I am done.
@@ -243,10 +240,10 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect the second specific user-provided loop example', () => {
-      service.reset('');
+    it("should detect the second specific user-provided loop example", () => {
+      service.reset("");
       const userPattern =
-        'I have added all the requested logs and verified the test file. I will now mark the task as complete.\n  ';
+        "I have added all the requested logs and verified the test file. I will now mark the task as complete.\n  ";
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
@@ -257,9 +254,9 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect a loop of alternating short phrases', () => {
-      service.reset('');
-      const alternatingPattern = 'Thinking... Done. ';
+    it("should detect a loop of alternating short phrases", () => {
+      service.reset("");
+      const alternatingPattern = "Thinking... Done. ";
 
       let isLoop = false;
       // Needs more iterations because the pattern is short relative to chunk size,
@@ -272,10 +269,10 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should detect a loop of repeated complex thought processes', () => {
-      service.reset('');
+    it("should detect a loop of repeated complex thought processes", () => {
+      service.reset("");
       const thoughtPattern =
-        'I need to check the file. The file does not exist. I will create the file. ';
+        "I need to check the file. The file does not exist. I will create the file. ";
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
@@ -287,25 +284,25 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Content Loop Detection with Code Blocks', () => {
-    it('should not detect a loop when repetitive content is inside a code block', () => {
-      service.reset('');
+  describe("Content Loop Detection with Code Blocks", () => {
+    it("should not detect a loop when repetitive content is inside a code block", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      service.addAndCheck(createContentEvent('```\n'));
+      service.addAndCheck(createContentEvent("```\n"));
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
         const isLoop = service.addAndCheck(createContentEvent(repeatedContent));
         expect(isLoop).toBe(false);
       }
 
-      const isLoop = service.addAndCheck(createContentEvent('\n```'));
+      const isLoop = service.addAndCheck(createContentEvent("\n```"));
       expect(isLoop).toBe(false);
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should not detect loops when content transitions into a code block', () => {
-      service.reset('');
+    it("should not detect loops when content transitions into a code block", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       // Add some repetitive content outside of code block
@@ -315,26 +312,24 @@ describe('LoopDetectionService', () => {
 
       // Now transition into a code block - this should prevent loop detection
       // even though we were already close to the threshold
-      const codeBlockStart = '```javascript\n';
+      const codeBlockStart = "```javascript\n";
       const isLoop = service.addAndCheck(createContentEvent(codeBlockStart));
       expect(isLoop).toBe(false);
 
       // Continue adding repetitive content inside the code block - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
-        const isLoopInside = service.addAndCheck(
-          createContentEvent(repeatedContent),
-        );
+        const isLoopInside = service.addAndCheck(createContentEvent(repeatedContent));
         expect(isLoopInside).toBe(false);
       }
 
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should skip loop detection when already inside a code block (this.inCodeBlock)', () => {
-      service.reset('');
+    it("should skip loop detection when already inside a code block (this.inCodeBlock)", () => {
+      service.reset("");
 
       // Start with content that puts us inside a code block
-      service.addAndCheck(createContentEvent('Here is some code:\n```\n'));
+      service.addAndCheck(createContentEvent("Here is some code:\n```\n"));
 
       // Verify we are now inside a code block and any content should be ignored for loop detection
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
@@ -346,45 +341,41 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should correctly track inCodeBlock state with multiple fence transitions', () => {
-      service.reset('');
+    it("should correctly track inCodeBlock state with multiple fence transitions", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       // Outside code block - should track content
-      service.addAndCheck(createContentEvent('Normal text '));
+      service.addAndCheck(createContentEvent("Normal text "));
 
       // Enter code block (1 fence) - should stop tracking
-      const enterResult = service.addAndCheck(createContentEvent('```\n'));
+      const enterResult = service.addAndCheck(createContentEvent("```\n"));
       expect(enterResult).toBe(false);
 
       // Inside code block - should not track loops
       for (let i = 0; i < 5; i++) {
-        const insideResult = service.addAndCheck(
-          createContentEvent(repeatedContent),
-        );
+        const insideResult = service.addAndCheck(createContentEvent(repeatedContent));
         expect(insideResult).toBe(false);
       }
 
       // Exit code block (2nd fence) - should reset tracking but still return false
-      const exitResult = service.addAndCheck(createContentEvent('```\n'));
+      const exitResult = service.addAndCheck(createContentEvent("```\n"));
       expect(exitResult).toBe(false);
 
       // Enter code block again (3rd fence) - should stop tracking again
-      const reenterResult = service.addAndCheck(
-        createContentEvent('```python\n'),
-      );
+      const reenterResult = service.addAndCheck(createContentEvent("```python\n"));
       expect(reenterResult).toBe(false);
 
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should detect a loop when repetitive content is outside a code block', () => {
-      service.reset('');
+    it("should detect a loop when repetitive content is outside a code block", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      service.addAndCheck(createContentEvent('```'));
-      service.addAndCheck(createContentEvent('\nsome code\n'));
-      service.addAndCheck(createContentEvent('```'));
+      service.addAndCheck(createContentEvent("```"));
+      service.addAndCheck(createContentEvent("\nsome code\n"));
+      service.addAndCheck(createContentEvent("```"));
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
@@ -394,23 +385,23 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle content with multiple code blocks and no loops', () => {
-      service.reset('');
-      service.addAndCheck(createContentEvent('```\ncode1\n```'));
-      service.addAndCheck(createContentEvent('\nsome text\n'));
-      const isLoop = service.addAndCheck(createContentEvent('```\ncode2\n```'));
+    it("should handle content with multiple code blocks and no loops", () => {
+      service.reset("");
+      service.addAndCheck(createContentEvent("```\ncode1\n```"));
+      service.addAndCheck(createContentEvent("\nsome text\n"));
+      const isLoop = service.addAndCheck(createContentEvent("```\ncode2\n```"));
 
       expect(isLoop).toBe(false);
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should handle content with mixed code blocks and looping text', () => {
-      service.reset('');
+    it("should handle content with mixed code blocks and looping text", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      service.addAndCheck(createContentEvent('```'));
-      service.addAndCheck(createContentEvent('\ncode1\n'));
-      service.addAndCheck(createContentEvent('```'));
+      service.addAndCheck(createContentEvent("```"));
+      service.addAndCheck(createContentEvent("\ncode1\n"));
+      service.addAndCheck(createContentEvent("```"));
 
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD; i++) {
@@ -421,25 +412,24 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).toHaveBeenCalledTimes(1);
     });
 
-    it('should not detect a loop for a long code block with some repeating tokens', () => {
-      service.reset('');
-      const repeatingTokens =
-        'for (let i = 0; i < 10; i++) { console.log(i); }';
+    it("should not detect a loop for a long code block with some repeating tokens", () => {
+      service.reset("");
+      const repeatingTokens = "for (let i = 0; i < 10; i++) { console.log(i); }";
 
-      service.addAndCheck(createContentEvent('```\n'));
+      service.addAndCheck(createContentEvent("```\n"));
 
       for (let i = 0; i < 20; i++) {
         const isLoop = service.addAndCheck(createContentEvent(repeatingTokens));
         expect(isLoop).toBe(false);
       }
 
-      const isLoop = service.addAndCheck(createContentEvent('\n```'));
+      const isLoop = service.addAndCheck(createContentEvent("\n```"));
       expect(isLoop).toBe(false);
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a code fence is found', () => {
-      service.reset('');
+    it("should reset tracking when a code fence is found", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -447,7 +437,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should not trigger a loop because of the reset
-      service.addAndCheck(createContentEvent('```'));
+      service.addAndCheck(createContentEvent("```"));
 
       // We are now in a code block, so loop detection should be off.
       // Let's add the repeated content again, it should not trigger a loop.
@@ -459,8 +449,8 @@ describe('LoopDetectionService', () => {
 
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
-    it('should reset tracking when a table is detected', () => {
-      service.reset('');
+    it("should reset tracking when a table is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -468,7 +458,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('| Column 1 | Column 2 |'));
+      service.addAndCheck(createContentEvent("| Column 1 | Column 2 |"));
 
       // Add more repeated content after table - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -479,8 +469,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a list item is detected', () => {
-      service.reset('');
+    it("should reset tracking when a list item is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -488,7 +478,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('* List item'));
+      service.addAndCheck(createContentEvent("* List item"));
 
       // Add more repeated content after list - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -499,8 +489,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a heading is detected', () => {
-      service.reset('');
+    it("should reset tracking when a heading is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -508,7 +498,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('## Heading'));
+      service.addAndCheck(createContentEvent("## Heading"));
 
       // Add more repeated content after heading - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -519,8 +509,8 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking when a blockquote is detected', () => {
-      service.reset('');
+    it("should reset tracking when a blockquote is detected", () => {
+      service.reset("");
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -528,7 +518,7 @@ describe('LoopDetectionService', () => {
       }
 
       // This should reset tracking and not trigger a loop
-      service.addAndCheck(createContentEvent('> Quote text'));
+      service.addAndCheck(createContentEvent("> Quote text"));
 
       // Add more repeated content after blockquote - should not trigger loop
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -539,20 +529,20 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking for various list item formats', () => {
+    it("should reset tracking for various list item formats", () => {
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       // Test different list formats - make sure they start at beginning of line
       const listFormats = [
-        '* Bullet item',
-        '- Dash item',
-        '+ Plus item',
-        '1. Numbered item',
-        '42. Another numbered item',
+        "* Bullet item",
+        "- Dash item",
+        "+ Plus item",
+        "1. Numbered item",
+        "42. Another numbered item",
       ];
 
       listFormats.forEach((listFormat, index) => {
-        service.reset('');
+        service.reset("");
 
         // Build up to near threshold
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -560,17 +550,12 @@ describe('LoopDetectionService', () => {
         }
 
         // Reset should occur with list item - add newline to ensure it starts at beginning
-        service.addAndCheck(createContentEvent('\n' + listFormat));
+        service.addAndCheck(createContentEvent("\n" + listFormat));
 
         // Should not trigger loop after reset - use different content to avoid any cached state issues
-        const newRepeatedContent = createRepetitiveContent(
-          index + 100,
-          CONTENT_CHUNK_SIZE,
-        );
+        const newRepeatedContent = createRepetitiveContent(index + 100, CONTENT_CHUNK_SIZE);
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
-          const isLoop = service.addAndCheck(
-            createContentEvent(newRepeatedContent),
-          );
+          const isLoop = service.addAndCheck(createContentEvent(newRepeatedContent));
           expect(isLoop).toBe(false);
         }
       });
@@ -578,18 +563,13 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking for various table formats', () => {
+    it("should reset tracking for various table formats", () => {
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
-      const tableFormats = [
-        '| Column 1 | Column 2 |',
-        '|---|---|',
-        '|++|++|',
-        '+---+---+',
-      ];
+      const tableFormats = ["| Column 1 | Column 2 |", "|---|---|", "|++|++|", "+---+---+"];
 
       tableFormats.forEach((tableFormat, index) => {
-        service.reset('');
+        service.reset("");
 
         // Build up to near threshold
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -597,17 +577,12 @@ describe('LoopDetectionService', () => {
         }
 
         // Reset should occur with table format - add newline to ensure it starts at beginning
-        service.addAndCheck(createContentEvent('\n' + tableFormat));
+        service.addAndCheck(createContentEvent("\n" + tableFormat));
 
         // Should not trigger loop after reset - use different content to avoid any cached state issues
-        const newRepeatedContent = createRepetitiveContent(
-          index + 200,
-          CONTENT_CHUNK_SIZE,
-        );
+        const newRepeatedContent = createRepetitiveContent(index + 200, CONTENT_CHUNK_SIZE);
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
-          const isLoop = service.addAndCheck(
-            createContentEvent(newRepeatedContent),
-          );
+          const isLoop = service.addAndCheck(createContentEvent(newRepeatedContent));
           expect(isLoop).toBe(false);
         }
       });
@@ -615,20 +590,20 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should reset tracking for various heading levels', () => {
+    it("should reset tracking for various heading levels", () => {
       const repeatedContent = createRepetitiveContent(1, CONTENT_CHUNK_SIZE);
 
       const headingFormats = [
-        '# H1 Heading',
-        '## H2 Heading',
-        '### H3 Heading',
-        '#### H4 Heading',
-        '##### H5 Heading',
-        '###### H6 Heading',
+        "# H1 Heading",
+        "## H2 Heading",
+        "### H3 Heading",
+        "#### H4 Heading",
+        "##### H5 Heading",
+        "###### H6 Heading",
       ];
 
       headingFormats.forEach((headingFormat, index) => {
-        service.reset('');
+        service.reset("");
 
         // Build up to near threshold
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
@@ -636,17 +611,12 @@ describe('LoopDetectionService', () => {
         }
 
         // Reset should occur with heading - add newline to ensure it starts at beginning
-        service.addAndCheck(createContentEvent('\n' + headingFormat));
+        service.addAndCheck(createContentEvent("\n" + headingFormat));
 
         // Should not trigger loop after reset - use different content to avoid any cached state issues
-        const newRepeatedContent = createRepetitiveContent(
-          index + 300,
-          CONTENT_CHUNK_SIZE,
-        );
+        const newRepeatedContent = createRepetitiveContent(index + 300, CONTENT_CHUNK_SIZE);
         for (let i = 0; i < CONTENT_LOOP_THRESHOLD - 1; i++) {
-          const isLoop = service.addAndCheck(
-            createContentEvent(newRepeatedContent),
-          );
+          const isLoop = service.addAndCheck(createContentEvent(newRepeatedContent));
           expect(isLoop).toBe(false);
         }
       });
@@ -655,17 +625,17 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Edge Cases', () => {
-    it('should handle empty content', () => {
-      const event = createContentEvent('');
+  describe("Edge Cases", () => {
+    it("should handle empty content", () => {
+      const event = createContentEvent("");
       expect(service.addAndCheck(event)).toBe(false);
     });
   });
 
-  describe('Divider Content Detection', () => {
-    it('should not detect a loop for repeating divider-like content', () => {
-      service.reset('');
-      const dividerContent = '-'.repeat(CONTENT_CHUNK_SIZE);
+  describe("Divider Content Detection", () => {
+    it("should not detect a loop for repeating divider-like content", () => {
+      service.reset("");
+      const dividerContent = "-".repeat(CONTENT_CHUNK_SIZE);
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
         isLoop = service.addAndCheck(createContentEvent(dividerContent));
@@ -674,9 +644,9 @@ describe('LoopDetectionService', () => {
       expect(loggers.logLoopDetected).not.toHaveBeenCalled();
     });
 
-    it('should not detect a loop for repeating complex box-drawing dividers', () => {
-      service.reset('');
-      const dividerContent = '╭─'.repeat(CONTENT_CHUNK_SIZE / 2);
+    it("should not detect a loop for repeating complex box-drawing dividers", () => {
+      service.reset("");
+      const dividerContent = "╭─".repeat(CONTENT_CHUNK_SIZE / 2);
       let isLoop = false;
       for (let i = 0; i < CONTENT_LOOP_THRESHOLD + 5; i++) {
         isLoop = service.addAndCheck(createContentEvent(dividerContent));
@@ -686,11 +656,11 @@ describe('LoopDetectionService', () => {
     });
   });
 
-  describe('Reset Functionality', () => {
-    it('tool call should reset content count', () => {
-      const contentEvent = createContentEvent('Some content.');
-      const toolEvent = createToolCallRequestEvent('testTool', {
-        param: 'value',
+  describe("Reset Functionality", () => {
+    it("tool call should reset content count", () => {
+      const contentEvent = createContentEvent("Some content.");
+      const toolEvent = createToolCallRequestEvent("testTool", {
+        param: "value",
       });
       for (let i = 0; i < 9; i++) {
         service.addAndCheck(contentEvent);
@@ -699,16 +669,14 @@ describe('LoopDetectionService', () => {
       service.addAndCheck(toolEvent);
 
       // Should start fresh
-      expect(service.addAndCheck(createContentEvent('Fresh content.'))).toBe(
-        false,
-      );
+      expect(service.addAndCheck(createContentEvent("Fresh content."))).toBe(false);
     });
   });
 
-  describe('General Behavior', () => {
-    it('should return false for unhandled event types', () => {
+  describe("General Behavior", () => {
+    it("should return false for unhandled event types", () => {
       const otherEvent = {
-        type: 'unhandled_event',
+        type: "unhandled_event",
       } as unknown as ServerGeminiStreamEvent;
       expect(service.addAndCheck(otherEvent)).toBe(false);
       expect(service.addAndCheck(otherEvent)).toBe(false);
@@ -716,7 +684,7 @@ describe('LoopDetectionService', () => {
   });
 });
 
-describe('LoopDetectionService LLM Checks', () => {
+describe("LoopDetectionService LLM Checks", () => {
   let service: LoopDetectionService;
   let mockConfig: Config;
   let mockGeminiClient: GeminiClient;
@@ -737,15 +705,15 @@ describe('LoopDetectionService LLM Checks', () => {
       getBaseLlmClient: () => mockBaseLlmClient,
       getDebugMode: () => false,
       getTelemetryEnabled: () => true,
-      getModel: vi.fn().mockReturnValue('cognitive-loop-v1'),
+      getModel: vi.fn().mockReturnValue("cognitive-loop-v1"),
       isInFallbackMode: vi.fn().mockReturnValue(false),
       modelConfigService: {
         getResolvedConfig: vi.fn().mockImplementation((key) => {
-          if (key.model === 'loop-detection') {
-            return { model: 'gemini-2.5-flash', generateContentConfig: {} };
+          if (key.model === "loop-detection") {
+            return { model: "gemini-2.5-flash", generateContentConfig: {} };
           }
           return {
-            model: 'cognitive-loop-v1',
+            model: "cognitive-loop-v1",
             generateContentConfig: {},
           };
         }),
@@ -768,12 +736,12 @@ describe('LoopDetectionService LLM Checks', () => {
     }
   };
 
-  it('should not trigger LLM check before LLM_CHECK_AFTER_TURNS', async () => {
+  it("should not trigger LLM check before LLM_CHECK_AFTER_TURNS", async () => {
     await advanceTurns(29);
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
-  it('should trigger LLM check on the 30th turn', async () => {
+  it("should trigger LLM check on the 30th turn", async () => {
     mockBaseLlmClient.generateJson = vi
       .fn()
       .mockResolvedValue({ unproductive_state_confidence: 0.1 });
@@ -781,7 +749,7 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
         systemInstruction: expect.any(String),
         contents: expect.any(Array),
         schema: expect.any(Object),
@@ -790,17 +758,17 @@ describe('LoopDetectionService LLM Checks', () => {
     );
   });
 
-  it('should detect a cognitive loop when confidence is high', async () => {
+  it("should detect a cognitive loop when confidence is high", async () => {
     // First check at turn 30
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValue({
       unproductive_state_confidence: 0.85,
-      unproductive_state_analysis: 'Repetitive actions',
+      unproductive_state_analysis: "Repetitive actions",
     });
     await advanceTurns(30);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
 
@@ -810,7 +778,7 @@ describe('LoopDetectionService LLM Checks', () => {
 
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValue({
       unproductive_state_confidence: 0.95,
-      unproductive_state_analysis: 'Repetitive actions',
+      unproductive_state_analysis: "Repetitive actions",
     });
     const finalResult = await service.turnStarted(abortController.signal); // This is turn 37
 
@@ -818,17 +786,17 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).toHaveBeenCalledWith(
       mockConfig,
       expect.objectContaining({
-        'event.name': 'loop_detected',
+        "event.name": "loop_detected",
         loop_type: LoopType.LLM_DETECTED_LOOP,
-        confirmed_by_model: 'cognitive-loop-v1',
+        confirmed_by_model: "cognitive-loop-v1",
       }),
     );
   });
 
-  it('should not detect a loop when confidence is low', async () => {
+  it("should not detect a loop when confidence is low", async () => {
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValue({
       unproductive_state_confidence: 0.5,
-      unproductive_state_analysis: 'Looks okay',
+      unproductive_state_analysis: "Looks okay",
     });
     await advanceTurns(30);
     const result = await service.turnStarted(abortController.signal);
@@ -836,7 +804,7 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).not.toHaveBeenCalled();
   });
 
-  it('should adjust the check interval based on confidence', async () => {
+  it("should adjust the check interval based on confidence", async () => {
     // Confidence is 0.0, so interval should be MAX_LLM_CHECK_INTERVAL (15)
     mockBaseLlmClient.generateJson = vi
       .fn()
@@ -851,17 +819,15 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(2);
   });
 
-  it('should handle errors from generateJson gracefully', async () => {
-    mockBaseLlmClient.generateJson = vi
-      .fn()
-      .mockRejectedValue(new Error('API error'));
+  it("should handle errors from generateJson gracefully", async () => {
+    mockBaseLlmClient.generateJson = vi.fn().mockRejectedValue(new Error("API error"));
     await advanceTurns(30);
     const result = await service.turnStarted(abortController.signal);
     expect(result).toBe(false);
     expect(loggers.logLoopDetected).not.toHaveBeenCalled();
   });
 
-  it('should not trigger LLM check when disabled for session', async () => {
+  it("should not trigger LLM check when disabled for session", async () => {
     service.disableForSession();
     expect(loggers.logLoopDetectionDisabled).toHaveBeenCalledTimes(1);
     await advanceTurns(30);
@@ -870,15 +836,15 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
-  it('should prepend user message if history starts with a function call', async () => {
+  it("should prepend user message if history starts with a function call", async () => {
     const functionCallHistory: Content[] = [
       {
-        role: 'model',
-        parts: [{ functionCall: { name: 'someTool', args: {} } }],
+        role: "model",
+        parts: [{ functionCall: { name: "someTool", args: {} } }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Some follow up text' }],
+        role: "model",
+        parts: [{ text: "Some follow up text" }],
       },
     ];
     vi.mocked(mockGeminiClient.getHistory).mockReturnValue(functionCallHistory);
@@ -890,17 +856,16 @@ describe('LoopDetectionService LLM Checks', () => {
     await advanceTurns(30);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
-    const calledArg = vi.mocked(mockBaseLlmClient.generateJson).mock
-      .calls[0][0];
+    const calledArg = vi.mocked(mockBaseLlmClient.generateJson).mock.calls[0][0];
     expect(calledArg.contents[0]).toEqual({
-      role: 'user',
-      parts: [{ text: 'Recent conversation history:' }],
+      role: "user",
+      parts: [{ text: "Recent conversation history:" }],
     });
     // Verify the original history follows
     expect(calledArg.contents[1]).toEqual(functionCallHistory[0]);
   });
 
-  it('should detect a loop when confidence is exactly equal to the threshold (0.9)', async () => {
+  it("should detect a loop when confidence is exactly equal to the threshold (0.9)", async () => {
     // Mock isInFallbackMode to false so it double checks
     vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(false);
 
@@ -908,11 +873,11 @@ describe('LoopDetectionService LLM Checks', () => {
       .fn()
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.9,
-        unproductive_state_analysis: 'Flash says loop',
+        unproductive_state_analysis: "Flash says loop",
       })
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.9,
-        unproductive_state_analysis: 'Main says loop',
+        unproductive_state_analysis: "Main says loop",
       });
 
     await advanceTurns(30);
@@ -922,13 +887,13 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection-double-check' },
+        modelConfigKey: { model: "loop-detection-double-check" },
       }),
     );
 
@@ -936,14 +901,14 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).toHaveBeenCalledWith(
       mockConfig,
       expect.objectContaining({
-        'event.name': 'loop_detected',
+        "event.name": "loop_detected",
         loop_type: LoopType.LLM_DETECTED_LOOP,
-        confirmed_by_model: 'cognitive-loop-v1',
+        confirmed_by_model: "cognitive-loop-v1",
       }),
     );
   });
 
-  it('should not detect a loop when Flash is confident (0.9) but Main model is not (0.89)', async () => {
+  it("should not detect a loop when Flash is confident (0.9) but Main model is not (0.89)", async () => {
     // Mock isInFallbackMode to false so it double checks
     vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(false);
 
@@ -951,11 +916,11 @@ describe('LoopDetectionService LLM Checks', () => {
       .fn()
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.9,
-        unproductive_state_analysis: 'Flash says loop',
+        unproductive_state_analysis: "Flash says loop",
       })
       .mockResolvedValueOnce({
         unproductive_state_confidence: 0.89,
-        unproductive_state_analysis: 'Main says no loop',
+        unproductive_state_analysis: "Main says no loop",
       });
 
     await advanceTurns(30);
@@ -964,13 +929,13 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
     expect(mockBaseLlmClient.generateJson).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection-double-check' },
+        modelConfigKey: { model: "loop-detection-double-check" },
       }),
     );
 
@@ -988,13 +953,13 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(3);
   });
 
-  it('should only call Flash model if in fallback mode', async () => {
+  it("should only call Flash model if in fallback mode", async () => {
     // Mock isInFallbackMode to true
     vi.mocked(mockConfig.isInFallbackMode).mockReturnValue(true);
 
     mockBaseLlmClient.generateJson = vi.fn().mockResolvedValueOnce({
       unproductive_state_confidence: 0.9,
-      unproductive_state_analysis: 'Flash says loop',
+      unproductive_state_analysis: "Flash says loop",
     });
 
     await advanceTurns(30);
@@ -1003,7 +968,7 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        modelConfigKey: { model: 'loop-detection' },
+        modelConfigKey: { model: "loop-detection" },
       }),
     );
 
@@ -1011,9 +976,9 @@ describe('LoopDetectionService LLM Checks', () => {
     expect(loggers.logLoopDetected).toHaveBeenCalledWith(
       mockConfig,
       expect.objectContaining({
-        'event.name': 'loop_detected',
+        "event.name": "loop_detected",
         loop_type: LoopType.LLM_DETECTED_LOOP,
-        confirmed_by_model: 'gemini-2.5-flash',
+        confirmed_by_model: "gemini-2.5-flash",
       }),
     );
   });
diff --git a/packages/gemini-core/src/services/loopDetectionService.ts b/packages/gemini-core/src/services/loopDetectionService.ts
index 081a8bb45..2d04ed645 100644
--- a/packages/gemini-core/src/services/loopDetectionService.ts
+++ b/packages/gemini-core/src/services/loopDetectionService.ts
@@ -4,27 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import { createHash } from 'node:crypto';
-import type { ServerGeminiStreamEvent } from '../core/turn.js';
-import { GeminiEventType } from '../core/turn.js';
+import { createHash } from "node:crypto";
+import type { Content } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { ServerGeminiStreamEvent } from "../core/turn.js";
+import { GeminiEventType } from "../core/turn.js";
 import {
+  logLlmLoopCheck,
   logLoopDetected,
   logLoopDetectionDisabled,
-  logLlmLoopCheck,
-} from '../telemetry/loggers.js';
+} from "../telemetry/loggers.js";
 import {
+  LlmLoopCheckEvent,
   LoopDetectedEvent,
   LoopDetectionDisabledEvent,
   LoopType,
-  LlmLoopCheckEvent,
-} from '../telemetry/types.js';
-import type { Config } from '../config/config.js';
-import {
-  isFunctionCall,
-  isFunctionResponse,
-} from '../utils/messageInspectors.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "../telemetry/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isFunctionCall, isFunctionResponse } from "../utils/messageInspectors.js";
 
 const TOOL_CALL_LOOP_THRESHOLD = 5;
 const CONTENT_LOOP_THRESHOLD = 10;
@@ -63,7 +60,7 @@ const MAX_LLM_CHECK_INTERVAL = 15;
  * The confidence threshold above which the LLM is considered to have detected a loop.
  */
 const LLM_CONFIDENCE_THRESHOLD = 0.9;
-const DOUBLE_CHECK_MODEL_ALIAS = 'loop-detection-double-check';
+const DOUBLE_CHECK_MODEL_ALIAS = "loop-detection-double-check";
 
 const LOOP_DETECTION_SYSTEM_PROMPT = `You are a sophisticated AI diagnostic agent specializing in identifying when a conversational AI is stuck in an unproductive state. Your task is to analyze the provided conversation history and determine if the assistant has ceased to make meaningful progress.
 
@@ -77,20 +74,19 @@ Crucially, differentiate between a true unproductive state and legitimate, incre
 For example, a series of 'tool_A' or 'tool_B' tool calls that make small, distinct changes to the same file (like adding docstrings to functions one by one) is considered forward progress and is NOT a loop. A loop would be repeatedly replacing the same text with the same content, or cycling between a small set of files with no net change.`;
 
 const LOOP_DETECTION_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     unproductive_state_analysis: {
-      type: 'string',
-      description:
-        'Your reasoning on if the conversation is looping without forward progress.',
+      type: "string",
+      description: "Your reasoning on if the conversation is looping without forward progress.",
     },
     unproductive_state_confidence: {
-      type: 'number',
+      type: "number",
       description:
-        'A number between 0.0 and 1.0 representing your confidence that the conversation is in an unproductive state.',
+        "A number between 0.0 and 1.0 representing your confidence that the conversation is in an unproductive state.",
     },
   },
-  required: ['unproductive_state_analysis', 'unproductive_state_confidence'],
+  required: ["unproductive_state_analysis", "unproductive_state_confidence"],
 };
 
 /**
@@ -99,14 +95,14 @@ const LOOP_DETECTION_SCHEMA: Record<string, unknown> = {
  */
 export class LoopDetectionService {
   private readonly config: Config;
-  private promptId = '';
+  private promptId = "";
 
   // Tool call tracking
   private lastToolCallKey: string | null = null;
   private toolCallRepetitionCount: number = 0;
 
   // Content streaming tracking
-  private streamContentHistory = '';
+  private streamContentHistory = "";
   private contentStats = new Map<string, number[]>();
   private lastContentIndex = 0;
   private loopDetected = false;
@@ -129,16 +125,13 @@ export class LoopDetectionService {
    */
   disableForSession(): void {
     this.disabledForSession = true;
-    logLoopDetectionDisabled(
-      this.config,
-      new LoopDetectionDisabledEvent(this.promptId),
-    );
+    logLoopDetectionDisabled(this.config, new LoopDetectionDisabledEvent(this.promptId));
   }
 
   private getToolCallKey(toolCall: { name: string; args: object }): string {
     const argsString = JSON.stringify(toolCall.args);
     const keyString = `${toolCall.name}:${argsString}`;
-    return createHash('sha256').update(keyString).digest('hex');
+    return createHash("sha256").update(keyString).digest("hex");
   }
 
   /**
@@ -209,10 +202,7 @@ export class LoopDetectionService {
     if (this.toolCallRepetitionCount >= TOOL_CALL_LOOP_THRESHOLD) {
       logLoopDetected(
         this.config,
-        new LoopDetectedEvent(
-          LoopType.CONSECUTIVE_IDENTICAL_TOOL_CALLS,
-          this.promptId,
-        ),
+        new LoopDetectedEvent(LoopType.CONSECUTIVE_IDENTICAL_TOOL_CALLS, this.promptId),
       );
       return true;
     }
@@ -236,28 +226,19 @@ export class LoopDetectionService {
     // reset tracking to avoid analyzing content that spans across different element boundaries.
     const numFences = (content.match(/```/g) ?? []).length;
     const hasTable = /(^|\n)\s*(\|.*\||[|+-]{3,})/.test(content);
-    const hasListItem =
-      /(^|\n)\s*[*-+]\s/.test(content) || /(^|\n)\s*\d+\.\s/.test(content);
+    const hasListItem = /(^|\n)\s*[*-+]\s/.test(content) || /(^|\n)\s*\d+\.\s/.test(content);
     const hasHeading = /(^|\n)#+\s/.test(content);
     const hasBlockquote = /(^|\n)>\s/.test(content);
     const isDivider = /^[+-_=*\u2500-\u257F]+$/.test(content);
 
-    if (
-      numFences ||
-      hasTable ||
-      hasListItem ||
-      hasHeading ||
-      hasBlockquote ||
-      isDivider
-    ) {
+    if (numFences || hasTable || hasListItem || hasHeading || hasBlockquote || isDivider) {
       // Reset tracking when different content elements are detected to avoid analyzing content
       // that spans across different element boundaries.
       this.resetContentTracking();
     }
 
     const wasInCodeBlock = this.inCodeBlock;
-    this.inCodeBlock =
-      numFences % 2 === 0 ? this.inCodeBlock : !this.inCodeBlock;
+    this.inCodeBlock = numFences % 2 === 0 ? this.inCodeBlock : !this.inCodeBlock;
     if (wasInCodeBlock || this.inCodeBlock || isDivider) {
       return false;
     }
@@ -278,14 +259,9 @@ export class LoopDetectionService {
     }
 
     // Calculate how much content to remove from the beginning
-    const truncationAmount =
-      this.streamContentHistory.length - MAX_HISTORY_LENGTH;
-    this.streamContentHistory =
-      this.streamContentHistory.slice(truncationAmount);
-    this.lastContentIndex = Math.max(
-      0,
-      this.lastContentIndex - truncationAmount,
-    );
+    const truncationAmount = this.streamContentHistory.length - MAX_HISTORY_LENGTH;
+    this.streamContentHistory = this.streamContentHistory.slice(truncationAmount);
+    this.lastContentIndex = Math.max(0, this.lastContentIndex - truncationAmount);
 
     // Update all stored chunk indices to account for the truncation
     for (const [hash, oldIndices] of this.contentStats.entries()) {
@@ -317,15 +293,12 @@ export class LoopDetectionService {
         this.lastContentIndex,
         this.lastContentIndex + CONTENT_CHUNK_SIZE,
       );
-      const chunkHash = createHash('sha256').update(currentChunk).digest('hex');
+      const chunkHash = createHash("sha256").update(currentChunk).digest("hex");
 
       if (this.isLoopDetectedForChunk(currentChunk, chunkHash)) {
         logLoopDetected(
           this.config,
-          new LoopDetectedEvent(
-            LoopType.CHANTING_IDENTICAL_SENTENCES,
-            this.promptId,
-          ),
+          new LoopDetectedEvent(LoopType.CHANTING_IDENTICAL_SENTENCES, this.promptId),
         );
         return true;
       }
@@ -338,10 +311,7 @@ export class LoopDetectionService {
   }
 
   private hasMoreChunksToProcess(): boolean {
-    return (
-      this.lastContentIndex + CONTENT_CHUNK_SIZE <=
-      this.streamContentHistory.length
-    );
+    return this.lastContentIndex + CONTENT_CHUNK_SIZE <= this.streamContentHistory.length;
   }
 
   /**
@@ -374,8 +344,7 @@ export class LoopDetectionService {
 
     // Analyze the most recent occurrences to see if they're clustered closely together
     const recentIndices = existingIndices.slice(-CONTENT_LOOP_THRESHOLD);
-    const totalDistance =
-      recentIndices[recentIndices.length - 1] - recentIndices[0];
+    const totalDistance = recentIndices[recentIndices.length - 1] - recentIndices[0];
     const averageDistance = totalDistance / (CONTENT_LOOP_THRESHOLD - 1);
     const maxAllowedDistance = CONTENT_CHUNK_SIZE * 5;
 
@@ -386,10 +355,7 @@ export class LoopDetectionService {
    * Verifies that two chunks with the same hash actually contain identical content.
    * This prevents false positives from hash collisions.
    */
-  private isActualContentMatch(
-    currentChunk: string,
-    originalIndex: number,
-  ): boolean {
+  private isActualContentMatch(currentChunk: string, originalIndex: number): boolean {
     const originalChunk = this.streamContentHistory.substring(
       originalIndex,
       originalIndex + CONTENT_CHUNK_SIZE,
@@ -401,10 +367,7 @@ export class LoopDetectionService {
     // A function response must be preceded by a function call.
     // Continuously removes dangling function calls from the end of the history
     // until the last turn is not a function call.
-    while (
-      recentHistory.length > 0 &&
-      isFunctionCall(recentHistory[recentHistory.length - 1])
-    ) {
+    while (recentHistory.length > 0 && isFunctionCall(recentHistory[recentHistory.length - 1])) {
       recentHistory.pop();
     }
 
@@ -428,45 +391,30 @@ export class LoopDetectionService {
 
     const taskPrompt = `Please analyze the conversation history to determine the possibility that the conversation is stuck in a repetitive, non-productive state. Provide your response in the requested JSON format.`;
 
-    const contents = [
-      ...trimmedHistory,
-      { role: 'user', parts: [{ text: taskPrompt }] },
-    ];
+    const contents = [...trimmedHistory, { role: "user", parts: [{ text: taskPrompt }] }];
     if (contents.length > 0 && isFunctionCall(contents[0])) {
       contents.unshift({
-        role: 'user',
-        parts: [{ text: 'Recent conversation history:' }],
+        role: "user",
+        parts: [{ text: "Recent conversation history:" }],
       });
     }
 
-    const flashResult = await this.queryLoopDetectionModel(
-      'loop-detection',
-      contents,
-      signal,
-    );
+    const flashResult = await this.queryLoopDetectionModel("loop-detection", contents, signal);
 
     if (!flashResult) {
       return false;
     }
 
-    const flashConfidence = flashResult[
-      'unproductive_state_confidence'
-    ] as number;
+    const flashConfidence = flashResult["unproductive_state_confidence"] as number;
 
-    const doubleCheckModelName =
-      this.config.modelConfigService.getResolvedConfig({
-        model: DOUBLE_CHECK_MODEL_ALIAS,
-      }).model;
+    const doubleCheckModelName = this.config.modelConfigService.getResolvedConfig({
+      model: DOUBLE_CHECK_MODEL_ALIAS,
+    }).model;
 
     if (flashConfidence < LLM_CONFIDENCE_THRESHOLD) {
       logLlmLoopCheck(
         this.config,
-        new LlmLoopCheckEvent(
-          this.promptId,
-          flashConfidence,
-          doubleCheckModelName,
-          -1,
-        ),
+        new LlmLoopCheckEvent(this.promptId, flashConfidence, doubleCheckModelName, -1),
       );
       this.updateCheckInterval(flashConfidence);
       return false;
@@ -474,7 +422,7 @@ export class LoopDetectionService {
 
     if (this.config.isInFallbackMode()) {
       const flashModelName = this.config.modelConfigService.getResolvedConfig({
-        model: 'loop-detection',
+        model: "loop-detection",
       }).model;
       this.handleConfirmedLoop(flashResult, flashModelName);
       return true;
@@ -488,7 +436,7 @@ export class LoopDetectionService {
     );
 
     const mainModelConfidence = mainModelResult
-      ? (mainModelResult['unproductive_state_confidence'] as number)
+      ? (mainModelResult["unproductive_state_confidence"] as number)
       : 0;
 
     logLlmLoopCheck(
@@ -529,10 +477,7 @@ export class LoopDetectionService {
         maxAttempts: 2,
       })) as Record<string, unknown>;
 
-      if (
-        result &&
-        typeof result['unproductive_state_confidence'] === 'number'
-      ) {
+      if (result && typeof result["unproductive_state_confidence"] === "number") {
         return result;
       }
       return null;
@@ -542,31 +487,23 @@ export class LoopDetectionService {
     }
   }
 
-  private handleConfirmedLoop(
-    result: Record<string, unknown>,
-    modelName: string,
-  ): void {
+  private handleConfirmedLoop(result: Record<string, unknown>, modelName: string): void {
     if (
-      typeof result['unproductive_state_analysis'] === 'string' &&
-      result['unproductive_state_analysis']
+      typeof result["unproductive_state_analysis"] === "string" &&
+      result["unproductive_state_analysis"]
     ) {
-      debugLogger.warn(result['unproductive_state_analysis']);
+      debugLogger.warn(result["unproductive_state_analysis"]);
     }
     logLoopDetected(
       this.config,
-      new LoopDetectedEvent(
-        LoopType.LLM_DETECTED_LOOP,
-        this.promptId,
-        modelName,
-      ),
+      new LoopDetectedEvent(LoopType.LLM_DETECTED_LOOP, this.promptId, modelName),
     );
   }
 
   private updateCheckInterval(unproductive_state_confidence: number): void {
     this.llmCheckInterval = Math.round(
       MIN_LLM_CHECK_INTERVAL +
-        (MAX_LLM_CHECK_INTERVAL - MIN_LLM_CHECK_INTERVAL) *
-          (1 - unproductive_state_confidence),
+        (MAX_LLM_CHECK_INTERVAL - MIN_LLM_CHECK_INTERVAL) * (1 - unproductive_state_confidence),
     );
   }
 
@@ -588,7 +525,7 @@ export class LoopDetectionService {
 
   private resetContentTracking(resetHistory = true): void {
     if (resetHistory) {
-      this.streamContentHistory = '';
+      this.streamContentHistory = "";
     }
     this.contentStats.clear();
     this.lastContentIndex = 0;
diff --git a/packages/gemini-core/src/services/modelConfig.golden.test.ts b/packages/gemini-core/src/services/modelConfig.golden.test.ts
index c11f76330..a98f6f775 100644
--- a/packages/gemini-core/src/services/modelConfig.golden.test.ts
+++ b/packages/gemini-core/src/services/modelConfig.golden.test.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { ModelConfigService } from './modelConfigService.js';
-import { DEFAULT_MODEL_CONFIGS } from '../config/defaultModelConfigs.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { describe, expect, it } from "vitest";
+import { DEFAULT_MODEL_CONFIGS } from "../config/defaultModelConfigs.js";
+import { ModelConfigService } from "./modelConfigService.js";
 
 const GOLDEN_FILE_PATH = path.resolve(
   process.cwd(),
-  'src',
-  'services',
-  'test-data',
-  'resolved-aliases.golden.json',
+  "src",
+  "services",
+  "test-data",
+  "resolved-aliases.golden.json",
 );
 
-describe('ModelConfigService Golden Test', () => {
-  it('should match the golden file for resolved default aliases', async () => {
+describe("ModelConfigService Golden Test", () => {
+  it("should match the golden file for resolved default aliases", async () => {
     const service = new ModelConfigService(DEFAULT_MODEL_CONFIGS);
     const aliases = Object.keys(DEFAULT_MODEL_CONFIGS.aliases ?? {});
 
@@ -30,25 +30,19 @@ describe('ModelConfigService Golden Test', () => {
         (service as any).internalGetResolvedConfig({ model: alias });
     }
 
-    if (process.env['UPDATE_GOLDENS']) {
+    if (process.env["UPDATE_GOLDENS"]) {
       await fs.mkdir(path.dirname(GOLDEN_FILE_PATH), { recursive: true });
-      await fs.writeFile(
-        GOLDEN_FILE_PATH,
-        JSON.stringify(resolvedAliases, null, 2),
-        'utf-8',
-      );
+      await fs.writeFile(GOLDEN_FILE_PATH, JSON.stringify(resolvedAliases, null, 2), "utf-8");
       // In update mode, we pass the test after writing the file.
       return;
     }
 
     let goldenContent: string;
     try {
-      goldenContent = await fs.readFile(GOLDEN_FILE_PATH, 'utf-8');
+      goldenContent = await fs.readFile(GOLDEN_FILE_PATH, "utf-8");
     } catch (e) {
-      if ((e as NodeJS.ErrnoException).code === 'ENOENT') {
-        throw new Error(
-          'Golden file not found. Run with `UPDATE_GOLDENS=true` to create it.',
-        );
+      if ((e as NodeJS.ErrnoException).code === "ENOENT") {
+        throw new Error("Golden file not found. Run with `UPDATE_GOLDENS=true` to create it.");
       }
       throw e;
     }
@@ -57,7 +51,7 @@ describe('ModelConfigService Golden Test', () => {
 
     expect(
       resolvedAliases,
-      'Golden file mismatch. If the new resolved aliases are correct, run the test with `UPDATE_GOLDENS=true` to regenerate the golden file.',
+      "Golden file mismatch. If the new resolved aliases are correct, run the test with `UPDATE_GOLDENS=true` to regenerate the golden file.",
     ).toEqual(goldenData);
   });
 });
diff --git a/packages/gemini-core/src/services/modelConfig.integration.test.ts b/packages/gemini-core/src/services/modelConfig.integration.test.ts
index fd4785576..189b59853 100644
--- a/packages/gemini-core/src/services/modelConfig.integration.test.ts
+++ b/packages/gemini-core/src/services/modelConfig.integration.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { ModelConfigService } from './modelConfigService.js';
-import type { ModelConfigServiceConfig } from './modelConfigService.js';
+import { describe, expect, it } from "vitest";
+import type { ModelConfigServiceConfig } from "./modelConfigService.js";
+import { ModelConfigService } from "./modelConfigService.js";
 
 // This test suite is designed to validate the end-to-end logic of the
 // ModelConfigService with a complex, realistic configuration.
 // It tests the interplay of global settings, alias inheritance, and overrides
 // of varying specificities.
-describe('ModelConfigService Integration', () => {
+describe("ModelConfigService Integration", () => {
   const complexConfig: ModelConfigServiceConfig = {
     aliases: {
       // Abstract base with no model
@@ -24,17 +24,17 @@ describe('ModelConfigService Integration', () => {
           },
         },
       },
-      'default-text-model': {
-        extends: 'base',
+      "default-text-model": {
+        extends: "base",
         modelConfig: {
-          model: 'gemini-1.5-pro-latest',
+          model: "gemini-1.5-pro-latest",
           generateContentConfig: {
             topK: 40, // Override base
           },
         },
       },
-      'creative-writer': {
-        extends: 'default-text-model',
+      "creative-writer": {
+        extends: "default-text-model",
         modelConfig: {
           generateContentConfig: {
             temperature: 0.9, // Override global
@@ -42,10 +42,10 @@ describe('ModelConfigService Integration', () => {
           },
         },
       },
-      'fast-classifier': {
-        extends: 'base',
+      "fast-classifier": {
+        extends: "base",
         modelConfig: {
-          model: 'gemini-1.5-flash-latest',
+          model: "gemini-1.5-flash-latest",
           generateContentConfig: {
             temperature: 0.1,
             candidateCount: 4,
@@ -56,7 +56,7 @@ describe('ModelConfigService Integration', () => {
     overrides: [
       // Broad override for all flash models
       {
-        match: { model: 'gemini-1.5-flash-latest' },
+        match: { model: "gemini-1.5-flash-latest" },
         modelConfig: {
           generateContentConfig: {
             maxOutputTokens: 2048,
@@ -65,17 +65,17 @@ describe('ModelConfigService Integration', () => {
       },
       // Specific override for the 'core' agent
       {
-        match: { overrideScope: 'core' },
+        match: { overrideScope: "core" },
         modelConfig: {
           generateContentConfig: {
             temperature: 0.5,
-            stopSequences: ['AGENT_STOP'],
+            stopSequences: ["AGENT_STOP"],
           },
         },
       },
       // Highly specific override for the 'fast-classifier' when used by the 'core' agent
       {
-        match: { model: 'fast-classifier', overrideScope: 'core' },
+        match: { model: "fast-classifier", overrideScope: "core" },
         modelConfig: {
           generateContentConfig: {
             temperature: 0.0,
@@ -85,9 +85,9 @@ describe('ModelConfigService Integration', () => {
       },
       // Override to provide a model for the abstract alias
       {
-        match: { model: 'base', overrideScope: 'core' },
+        match: { model: "base", overrideScope: "core" },
         modelConfig: {
-          model: 'gemini-1.5-pro-latest',
+          model: "gemini-1.5-pro-latest",
         },
       },
     ],
@@ -95,83 +95,83 @@ describe('ModelConfigService Integration', () => {
 
   const service = new ModelConfigService(complexConfig);
 
-  it('should resolve a simple model, applying core agent defaults', () => {
+  it("should resolve a simple model, applying core agent defaults", () => {
     const resolved = service.getResolvedConfig({
-      model: 'gemini-test-model',
+      model: "gemini-test-model",
     });
 
-    expect(resolved.model).toBe('gemini-test-model');
+    expect(resolved.model).toBe("gemini-test-model");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should correctly apply a simple inherited alias and merge with global defaults', () => {
+  it("should correctly apply a simple inherited alias and merge with global defaults", () => {
     const resolved = service.getResolvedConfig({
-      model: 'default-text-model',
+      model: "default-text-model",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from alias
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from alias
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
       topP: 0.95, // from base
       topK: 40, // from alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should resolve a multi-level inherited alias', () => {
+  it("should resolve a multi-level inherited alias", () => {
     const resolved = service.getResolvedConfig({
-      model: 'creative-writer',
+      model: "creative-writer",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from default-text-model
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from default-text-model
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
       topP: 0.95, // from base
       topK: 50, // from alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should apply an inherited alias and a broad model-based override', () => {
+  it("should apply an inherited alias and a broad model-based override", () => {
     const resolved = service.getResolvedConfig({
-      model: 'fast-classifier',
+      model: "fast-classifier",
       // No agent specified, so it should match core agent-specific rules
     });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest'); // from alias
+    expect(resolved.model).toBe("gemini-1.5-flash-latest"); // from alias
     expect(resolved.generateContentConfig).toEqual({
       topP: 0.95, // from base
       topK: 64, // from base
       candidateCount: 4, // from alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
       maxOutputTokens: 4096, // from most specific override
       temperature: 0.0, // from most specific override
     });
   });
 
-  it('should apply settings for an unknown model but a known agent', () => {
+  it("should apply settings for an unknown model but a known agent", () => {
     const resolved = service.getResolvedConfig({
-      model: 'gemini-test-model',
-      overrideScope: 'core',
+      model: "gemini-test-model",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-test-model');
+    expect(resolved.model).toBe("gemini-test-model");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should apply the most specific override for a known inherited alias and agent', () => {
+  it("should apply the most specific override for a known inherited alias and agent", () => {
     const resolved = service.getResolvedConfig({
-      model: 'fast-classifier',
-      overrideScope: 'core',
+      model: "fast-classifier",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       // Inherited from 'base'
       topP: 0.95,
@@ -179,50 +179,50 @@ describe('ModelConfigService Integration', () => {
       // From 'fast-classifier' alias
       candidateCount: 4,
       // From 'core' agent override
-      stopSequences: ['AGENT_STOP'],
+      stopSequences: ["AGENT_STOP"],
       // From most specific override (model+agent)
       temperature: 0.0,
       maxOutputTokens: 4096,
     });
   });
 
-  it('should correctly apply agent override on top of a multi-level inherited alias', () => {
+  it("should correctly apply agent override on top of a multi-level inherited alias", () => {
     const resolved = service.getResolvedConfig({
-      model: 'creative-writer',
-      overrideScope: 'core',
+      model: "creative-writer",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from default-text-model
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from default-text-model
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override (wins over alias)
       topP: 0.95, // from base
       topK: 50, // from creative-writer alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should resolve an abstract alias if a specific override provides the model', () => {
+  it("should resolve an abstract alias if a specific override provides the model", () => {
     const resolved = service.getResolvedConfig({
-      model: 'base',
-      overrideScope: 'core',
+      model: "base",
+      overrideScope: "core",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-pro-latest'); // from override
+    expect(resolved.model).toBe("gemini-1.5-pro-latest"); // from override
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5, // from agent override
       topP: 0.95, // from base alias
       topK: 64, // from base alias
-      stopSequences: ['AGENT_STOP'], // from agent override
+      stopSequences: ["AGENT_STOP"], // from agent override
     });
   });
 
-  it('should not apply core agent overrides when a different agent is specified', () => {
+  it("should not apply core agent overrides when a different agent is specified", () => {
     const resolved = service.getResolvedConfig({
-      model: 'fast-classifier',
-      overrideScope: 'non-core-agent',
+      model: "fast-classifier",
+      overrideScope: "non-core-agent",
     });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       candidateCount: 4, // from alias
       maxOutputTokens: 2048, // from override of model
diff --git a/packages/gemini-core/src/services/modelConfigService.test.ts b/packages/gemini-core/src/services/modelConfigService.test.ts
index 998abe75b..e48b79378 100644
--- a/packages/gemini-core/src/services/modelConfigService.test.ts
+++ b/packages/gemini-core/src/services/modelConfigService.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import type { ModelConfigServiceConfig } from './modelConfigService.js';
-import { ModelConfigService } from './modelConfigService.js';
+import { describe, expect, it } from "vitest";
+import type { ModelConfigServiceConfig } from "./modelConfigService.js";
+import { ModelConfigService } from "./modelConfigService.js";
 
-describe('ModelConfigService', () => {
-  it('should resolve a basic alias to its model and settings', () => {
+describe("ModelConfigService", () => {
+  it("should resolve a basic alias to its model and settings", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
         classifier: {
           modelConfig: {
-            model: 'gemini-1.5-flash-latest',
+            model: "gemini-1.5-flash-latest",
             generateContentConfig: {
               temperature: 0,
               topP: 0.9,
@@ -25,21 +25,21 @@ describe('ModelConfigService', () => {
       overrides: [],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'classifier' });
+    const resolved = service.getResolvedConfig({ model: "classifier" });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0,
       topP: 0.9,
     });
   });
 
-  it('should apply a simple override on top of an alias', () => {
+  it("should apply a simple override on top of an alias", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
         classifier: {
           modelConfig: {
-            model: 'gemini-1.5-flash-latest',
+            model: "gemini-1.5-flash-latest",
             generateContentConfig: {
               temperature: 0,
               topP: 0.9,
@@ -49,7 +49,7 @@ describe('ModelConfigService', () => {
       },
       overrides: [
         {
-          match: { model: 'classifier' },
+          match: { model: "classifier" },
           modelConfig: {
             generateContentConfig: {
               temperature: 0.5,
@@ -60,9 +60,9 @@ describe('ModelConfigService', () => {
       ],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'classifier' });
+    const resolved = service.getResolvedConfig({ model: "classifier" });
 
-    expect(resolved.model).toBe('gemini-1.5-flash-latest');
+    expect(resolved.model).toBe("gemini-1.5-flash-latest");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.5,
       topP: 0.9,
@@ -70,62 +70,62 @@ describe('ModelConfigService', () => {
     });
   });
 
-  it('should apply the most specific override rule', () => {
+  it("should apply the most specific override rule", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {},
       overrides: [
         {
-          match: { model: 'gemini-pro' },
+          match: { model: "gemini-pro" },
           modelConfig: { generateContentConfig: { temperature: 0.5 } },
         },
         {
-          match: { model: 'gemini-pro', overrideScope: 'my-agent' },
+          match: { model: "gemini-pro", overrideScope: "my-agent" },
           modelConfig: { generateContentConfig: { temperature: 0.1 } },
         },
       ],
     };
     const service = new ModelConfigService(config);
     const resolved = service.getResolvedConfig({
-      model: 'gemini-pro',
-      overrideScope: 'my-agent',
+      model: "gemini-pro",
+      overrideScope: "my-agent",
     });
 
-    expect(resolved.model).toBe('gemini-pro');
+    expect(resolved.model).toBe("gemini-pro");
     expect(resolved.generateContentConfig).toEqual({ temperature: 0.1 });
   });
 
-  it('should use the last override in case of a tie in specificity', () => {
+  it("should use the last override in case of a tie in specificity", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {},
       overrides: [
         {
-          match: { model: 'gemini-pro' },
+          match: { model: "gemini-pro" },
           modelConfig: {
             generateContentConfig: { temperature: 0.5, topP: 0.8 },
           },
         },
         {
-          match: { model: 'gemini-pro' },
+          match: { model: "gemini-pro" },
           modelConfig: { generateContentConfig: { temperature: 0.1 } },
         },
       ],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'gemini-pro' });
+    const resolved = service.getResolvedConfig({ model: "gemini-pro" });
 
-    expect(resolved.model).toBe('gemini-pro');
+    expect(resolved.model).toBe("gemini-pro");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.1,
       topP: 0.8,
     });
   });
 
-  it('should correctly pass through generation config from an alias', () => {
+  it("should correctly pass through generation config from an alias", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
-        'thinking-alias': {
+        "thinking-alias": {
           modelConfig: {
-            model: 'gemini-pro',
+            model: "gemini-pro",
             generateContentConfig: {
               candidateCount: 500,
             },
@@ -135,17 +135,17 @@ describe('ModelConfigService', () => {
       overrides: [],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'thinking-alias' });
+    const resolved = service.getResolvedConfig({ model: "thinking-alias" });
 
     expect(resolved.generateContentConfig).toEqual({ candidateCount: 500 });
   });
 
-  it('should let an override generation config win over an alias config', () => {
+  it("should let an override generation config win over an alias config", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
-        'thinking-alias': {
+        "thinking-alias": {
           modelConfig: {
-            model: 'gemini-pro',
+            model: "gemini-pro",
             generateContentConfig: {
               candidateCount: 500,
             },
@@ -154,7 +154,7 @@ describe('ModelConfigService', () => {
       },
       overrides: [
         {
-          match: { model: 'thinking-alias' },
+          match: { model: "thinking-alias" },
           modelConfig: {
             generateContentConfig: {
               candidateCount: 1000,
@@ -164,19 +164,19 @@ describe('ModelConfigService', () => {
       ],
     };
     const service = new ModelConfigService(config);
-    const resolved = service.getResolvedConfig({ model: 'thinking-alias' });
+    const resolved = service.getResolvedConfig({ model: "thinking-alias" });
 
     expect(resolved.generateContentConfig).toEqual({
       candidateCount: 1000,
     });
   });
 
-  it('should merge settings from global, alias, and multiple matching overrides', () => {
+  it("should merge settings from global, alias, and multiple matching overrides", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {
-        'test-alias': {
+        "test-alias": {
           modelConfig: {
-            model: 'gemini-test-model',
+            model: "gemini-test-model",
             generateContentConfig: {
               topP: 0.9,
               topK: 50,
@@ -186,7 +186,7 @@ describe('ModelConfigService', () => {
       },
       overrides: [
         {
-          match: { model: 'gemini-test-model' },
+          match: { model: "gemini-test-model" },
           modelConfig: {
             generateContentConfig: {
               topK: 40,
@@ -195,7 +195,7 @@ describe('ModelConfigService', () => {
           },
         },
         {
-          match: { overrideScope: 'test-agent' },
+          match: { overrideScope: "test-agent" },
           modelConfig: {
             generateContentConfig: {
               maxOutputTokens: 4096,
@@ -203,7 +203,7 @@ describe('ModelConfigService', () => {
           },
         },
         {
-          match: { model: 'gemini-test-model', overrideScope: 'test-agent' },
+          match: { model: "gemini-test-model", overrideScope: "test-agent" },
           modelConfig: {
             generateContentConfig: {
               temperature: 0.2,
@@ -215,11 +215,11 @@ describe('ModelConfigService', () => {
 
     const service = new ModelConfigService(config);
     const resolved = service.getResolvedConfig({
-      model: 'test-alias',
-      overrideScope: 'test-agent',
+      model: "test-alias",
+      overrideScope: "test-agent",
     });
 
-    expect(resolved.model).toBe('gemini-test-model');
+    expect(resolved.model).toBe("gemini-test-model");
     expect(resolved.generateContentConfig).toEqual({
       // From global, overridden by most specific override
       temperature: 0.2,
@@ -232,12 +232,12 @@ describe('ModelConfigService', () => {
     });
   });
 
-  it('should match an agent:core override when agent is undefined', () => {
+  it("should match an agent:core override when agent is undefined", () => {
     const config: ModelConfigServiceConfig = {
       aliases: {},
       overrides: [
         {
-          match: { overrideScope: 'core' },
+          match: { overrideScope: "core" },
           modelConfig: {
             generateContentConfig: {
               temperature: 0.1,
@@ -249,63 +249,63 @@ describe('ModelConfigService', () => {
 
     const service = new ModelConfigService(config);
     const resolved = service.getResolvedConfig({
-      model: 'gemini-pro',
+      model: "gemini-pro",
       overrideScope: undefined, // Explicitly undefined
     });
 
-    expect(resolved.model).toBe('gemini-pro');
+    expect(resolved.model).toBe("gemini-pro");
     expect(resolved.generateContentConfig).toEqual({
       temperature: 0.1,
     });
   });
 
-  describe('alias inheritance', () => {
+  describe("alias inheritance", () => {
     it('should resolve a simple "extends" chain', () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-1.5-pro-latest',
+              model: "gemini-1.5-pro-latest",
               generateContentConfig: {
                 temperature: 0.7,
                 topP: 0.9,
               },
             },
           },
-          'flash-variant': {
-            extends: 'base',
+          "flash-variant": {
+            extends: "base",
             modelConfig: {
-              model: 'gemini-1.5-flash-latest',
+              model: "gemini-1.5-flash-latest",
             },
           },
         },
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'flash-variant' });
+      const resolved = service.getResolvedConfig({ model: "flash-variant" });
 
-      expect(resolved.model).toBe('gemini-1.5-flash-latest');
+      expect(resolved.model).toBe("gemini-1.5-flash-latest");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0.7,
         topP: 0.9,
       });
     });
 
-    it('should override parent properties from child alias', () => {
+    it("should override parent properties from child alias", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-1.5-pro-latest',
+              model: "gemini-1.5-pro-latest",
               generateContentConfig: {
                 temperature: 0.7,
                 topP: 0.9,
               },
             },
           },
-          'flash-variant': {
-            extends: 'base',
+          "flash-variant": {
+            extends: "base",
             modelConfig: {
-              model: 'gemini-1.5-flash-latest',
+              model: "gemini-1.5-flash-latest",
               generateContentConfig: {
                 temperature: 0.2,
               },
@@ -314,9 +314,9 @@ describe('ModelConfigService', () => {
         },
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'flash-variant' });
+      const resolved = service.getResolvedConfig({ model: "flash-variant" });
 
-      expect(resolved.model).toBe('gemini-1.5-flash-latest');
+      expect(resolved.model).toBe("gemini-1.5-flash-latest");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0.2,
         topP: 0.9,
@@ -328,21 +328,21 @@ describe('ModelConfigService', () => {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-1.5-pro-latest',
+              model: "gemini-1.5-pro-latest",
               generateContentConfig: {
                 temperature: 0.7,
                 topP: 0.9,
               },
             },
           },
-          'base-flash': {
-            extends: 'base',
+          "base-flash": {
+            extends: "base",
             modelConfig: {
-              model: 'gemini-1.5-flash-latest',
+              model: "gemini-1.5-flash-latest",
             },
           },
-          'classifier-flash': {
-            extends: 'base-flash',
+          "classifier-flash": {
+            extends: "base-flash",
             modelConfig: {
               generateContentConfig: {
                 temperature: 0,
@@ -353,44 +353,44 @@ describe('ModelConfigService', () => {
       };
       const service = new ModelConfigService(config);
       const resolved = service.getResolvedConfig({
-        model: 'classifier-flash',
+        model: "classifier-flash",
       });
 
-      expect(resolved.model).toBe('gemini-1.5-flash-latest');
+      expect(resolved.model).toBe("gemini-1.5-flash-latest");
       expect(resolved.generateContentConfig).toEqual({
         temperature: 0,
         topP: 0.9,
       });
     });
 
-    it('should throw an error for circular dependencies', () => {
+    it("should throw an error for circular dependencies", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          a: { extends: 'b', modelConfig: {} },
-          b: { extends: 'a', modelConfig: {} },
+          a: { extends: "b", modelConfig: {} },
+          b: { extends: "a", modelConfig: {} },
         },
       };
       const service = new ModelConfigService(config);
-      expect(() => service.getResolvedConfig({ model: 'a' })).toThrow(
-        'Circular alias dependency: a -> b -> a',
+      expect(() => service.getResolvedConfig({ model: "a" })).toThrow(
+        "Circular alias dependency: a -> b -> a",
       );
     });
 
-    describe('abstract aliases', () => {
-      it('should allow an alias to extend an abstract alias without a model', () => {
+    describe("abstract aliases", () => {
+      it("should allow an alias to extend an abstract alias without a model", () => {
         const config: ModelConfigServiceConfig = {
           aliases: {
-            'abstract-base': {
+            "abstract-base": {
               modelConfig: {
                 generateContentConfig: {
                   temperature: 0.1,
                 },
               },
             },
-            'concrete-child': {
-              extends: 'abstract-base',
+            "concrete-child": {
+              extends: "abstract-base",
               modelConfig: {
-                model: 'gemini-1.5-pro-latest',
+                model: "gemini-1.5-pro-latest",
                 generateContentConfig: {
                   topP: 0.9,
                 },
@@ -399,19 +399,19 @@ describe('ModelConfigService', () => {
           },
         };
         const service = new ModelConfigService(config);
-        const resolved = service.getResolvedConfig({ model: 'concrete-child' });
+        const resolved = service.getResolvedConfig({ model: "concrete-child" });
 
-        expect(resolved.model).toBe('gemini-1.5-pro-latest');
+        expect(resolved.model).toBe("gemini-1.5-pro-latest");
         expect(resolved.generateContentConfig).toEqual({
           temperature: 0.1,
           topP: 0.9,
         });
       });
 
-      it('should throw an error if a resolved alias chain has no model', () => {
+      it("should throw an error if a resolved alias chain has no model", () => {
         const config: ModelConfigServiceConfig = {
           aliases: {
-            'abstract-base': {
+            "abstract-base": {
               modelConfig: {
                 generateContentConfig: { temperature: 0.7 },
               },
@@ -419,17 +419,15 @@ describe('ModelConfigService', () => {
           },
         };
         const service = new ModelConfigService(config);
-        expect(() =>
-          service.getResolvedConfig({ model: 'abstract-base' }),
-        ).toThrow(
+        expect(() => service.getResolvedConfig({ model: "abstract-base" })).toThrow(
           'Could not resolve a model name for alias "abstract-base". Please ensure the alias chain or a matching override specifies a model.',
         );
       });
 
-      it('should resolve an abstract alias if an override provides the model', () => {
+      it("should resolve an abstract alias if an override provides the model", () => {
         const config: ModelConfigServiceConfig = {
           aliases: {
-            'abstract-base': {
+            "abstract-base": {
               modelConfig: {
                 generateContentConfig: {
                   temperature: 0.1,
@@ -439,50 +437,50 @@ describe('ModelConfigService', () => {
           },
           overrides: [
             {
-              match: { model: 'abstract-base' },
+              match: { model: "abstract-base" },
               modelConfig: {
-                model: 'gemini-1.5-flash-latest',
+                model: "gemini-1.5-flash-latest",
               },
             },
           ],
         };
         const service = new ModelConfigService(config);
-        const resolved = service.getResolvedConfig({ model: 'abstract-base' });
+        const resolved = service.getResolvedConfig({ model: "abstract-base" });
 
-        expect(resolved.model).toBe('gemini-1.5-flash-latest');
+        expect(resolved.model).toBe("gemini-1.5-flash-latest");
         expect(resolved.generateContentConfig).toEqual({
           temperature: 0.1,
         });
       });
     });
 
-    it('should throw an error if an extended alias does not exist', () => {
+    it("should throw an error if an extended alias does not exist", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'bad-alias': {
-            extends: 'non-existent',
+          "bad-alias": {
+            extends: "non-existent",
             modelConfig: {},
           },
         },
       };
       const service = new ModelConfigService(config);
-      expect(() => service.getResolvedConfig({ model: 'bad-alias' })).toThrow(
+      expect(() => service.getResolvedConfig({ model: "bad-alias" })).toThrow(
         'Alias "non-existent" not found.',
       );
     });
   });
 
-  describe('deep merging', () => {
-    it('should deep merge nested config objects from aliases and overrides', () => {
+  describe("deep merging", () => {
+    it("should deep merge nested config objects from aliases and overrides", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
-          'base-safe': {
+          "base-safe": {
             modelConfig: {
-              model: 'gemini-pro',
+              model: "gemini-pro",
               generateContentConfig: {
                 safetySettings: {
-                  HARM_CATEGORY_HARASSMENT: 'BLOCK_ONLY_HIGH',
-                  HARM_CATEGORY_HATE_SPEECH: 'BLOCK_ONLY_HIGH',
+                  HARM_CATEGORY_HARASSMENT: "BLOCK_ONLY_HIGH",
+                  HARM_CATEGORY_HATE_SPEECH: "BLOCK_ONLY_HIGH",
                   // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 } as any,
               },
@@ -491,12 +489,12 @@ describe('ModelConfigService', () => {
         },
         overrides: [
           {
-            match: { model: 'base-safe' },
+            match: { model: "base-safe" },
             modelConfig: {
               generateContentConfig: {
                 safetySettings: {
-                  HARM_CATEGORY_HATE_SPEECH: 'BLOCK_NONE',
-                  HARM_CATEGORY_SEXUALLY_EXPLICIT: 'BLOCK_MEDIUM_AND_ABOVE',
+                  HARM_CATEGORY_HATE_SPEECH: "BLOCK_NONE",
+                  HARM_CATEGORY_SEXUALLY_EXPLICIT: "BLOCK_MEDIUM_AND_ABOVE",
                   // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 } as any,
               },
@@ -505,49 +503,47 @@ describe('ModelConfigService', () => {
         ],
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'base-safe' });
+      const resolved = service.getResolvedConfig({ model: "base-safe" });
 
-      expect(resolved.model).toBe('gemini-pro');
+      expect(resolved.model).toBe("gemini-pro");
       expect(resolved.generateContentConfig.safetySettings).toEqual({
         // From alias
-        HARM_CATEGORY_HARASSMENT: 'BLOCK_ONLY_HIGH',
+        HARM_CATEGORY_HARASSMENT: "BLOCK_ONLY_HIGH",
         // From alias, overridden by override
-        HARM_CATEGORY_HATE_SPEECH: 'BLOCK_NONE',
+        HARM_CATEGORY_HATE_SPEECH: "BLOCK_NONE",
         // From override
-        HARM_CATEGORY_SEXUALLY_EXPLICIT: 'BLOCK_MEDIUM_AND_ABOVE',
+        HARM_CATEGORY_SEXUALLY_EXPLICIT: "BLOCK_MEDIUM_AND_ABOVE",
       });
     });
 
-    it('should not deeply merge merge arrays from aliases and overrides', () => {
+    it("should not deeply merge merge arrays from aliases and overrides", () => {
       const config: ModelConfigServiceConfig = {
         aliases: {
           base: {
             modelConfig: {
-              model: 'gemini-pro',
+              model: "gemini-pro",
               generateContentConfig: {
-                stopSequences: ['foo'],
+                stopSequences: ["foo"],
               },
             },
           },
         },
         overrides: [
           {
-            match: { model: 'base' },
+            match: { model: "base" },
             modelConfig: {
               generateContentConfig: {
-                stopSequences: ['overrideFoo'],
+                stopSequences: ["overrideFoo"],
               },
             },
           },
         ],
       };
       const service = new ModelConfigService(config);
-      const resolved = service.getResolvedConfig({ model: 'base' });
+      const resolved = service.getResolvedConfig({ model: "base" });
 
-      expect(resolved.model).toBe('gemini-pro');
-      expect(resolved.generateContentConfig.stopSequences).toEqual([
-        'overrideFoo',
-      ]);
+      expect(resolved.model).toBe("gemini-pro");
+      expect(resolved.generateContentConfig.stopSequences).toEqual(["overrideFoo"]);
     });
   });
 });
diff --git a/packages/gemini-core/src/services/modelConfigService.ts b/packages/gemini-core/src/services/modelConfigService.ts
index 14b5e5bdd..8939f8768 100644
--- a/packages/gemini-core/src/services/modelConfigService.ts
+++ b/packages/gemini-core/src/services/modelConfigService.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentConfig } from '@google/genai';
+import type { GenerateContentConfig } from "@google/genai";
 
 // The primary key for the ModelConfig is the model string. However, we also
 // support a secondary key to limit the override scope, typically an agent name.
@@ -65,9 +65,7 @@ export class ModelConfigService {
     visited = new Set<string>(),
   ): ModelConfigAlias {
     if (visited.has(aliasName)) {
-      throw new Error(
-        `Circular alias dependency: ${[...visited, aliasName].join(' -> ')}`,
-      );
+      throw new Error(`Circular alias dependency: ${[...visited, aliasName].join(" -> ")}`);
     }
     visited.add(aliasName);
 
@@ -131,14 +129,14 @@ export class ModelConfigService {
         }
 
         const isMatch = matchEntries.every(([key, value]) => {
-          if (key === 'model') {
+          if (key === "model") {
             return value === context.model || value === finalContext.model;
           }
-          if (key === 'overrideScope' && value === 'core') {
+          if (key === "overrideScope" && value === "core") {
             // The 'core' overrideScope is special. It should match if the
             // overrideScope is explicitly 'core' or if the overrideScope
             // is not specified.
-            return context.overrideScope === 'core' || !context.overrideScope;
+            return context.overrideScope === "core" || !context.overrideScope;
           }
           return finalContext[key as keyof ModelConfigKey] === value;
         });
@@ -173,10 +171,7 @@ export class ModelConfigService {
         baseModel = match.modelConfig.model;
       }
       if (match.modelConfig.generateContentConfig) {
-        resolvedConfig = this.deepMerge(
-          resolvedConfig,
-          match.modelConfig.generateContentConfig,
-        );
+        resolvedConfig = this.deepMerge(resolvedConfig, match.modelConfig.generateContentConfig);
       }
     }
 
@@ -202,7 +197,7 @@ export class ModelConfigService {
   }
 
   private isObject(item: unknown): item is Record<string, unknown> {
-    return !!item && typeof item === 'object' && !Array.isArray(item);
+    return !!item && typeof item === "object" && !Array.isArray(item);
   }
 
   private deepMerge(
diff --git a/packages/gemini-core/src/services/shellExecutionService.test.ts b/packages/gemini-core/src/services/shellExecutionService.test.ts
index 1532e8632..9fb4f6345 100644
--- a/packages/gemini-core/src/services/shellExecutionService.test.ts
+++ b/packages/gemini-core/src/services/shellExecutionService.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
-import EventEmitter from 'node:events';
-import type { Readable } from 'node:stream';
-import { type ChildProcess } from 'node:child_process';
-import type { ShellOutputEvent } from './shellExecutionService.js';
-import { ShellExecutionService } from './shellExecutionService.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
+import { type ChildProcess } from "node:child_process";
+import EventEmitter from "node:events";
+import type { Readable } from "node:stream";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import type { ShellOutputEvent } from "./shellExecutionService.js";
+import { ShellExecutionService } from "./shellExecutionService.js";
 
 // Hoisted Mocks
 const mockPtySpawn = vi.hoisted(() => vi.fn());
@@ -21,21 +21,20 @@ const mockGetPty = vi.hoisted(() => vi.fn());
 const mockSerializeTerminalToObject = vi.hoisted(() => vi.fn());
 
 // Top-level Mocks
-vi.mock('@lydell/node-pty', () => ({
+vi.mock("@lydell/node-pty", () => ({
   spawn: mockPtySpawn,
 }));
-vi.mock('node:child_process', async (importOriginal) => {
-  const actual =
-    (await importOriginal()) as typeof import('node:child_process');
+vi.mock("node:child_process", async (importOriginal) => {
+  const actual = (await importOriginal()) as typeof import("node:child_process");
   return {
     ...actual,
     spawn: mockCpSpawn,
   };
 });
-vi.mock('../utils/textUtils.js', () => ({
+vi.mock("../utils/textUtils.js", () => ({
   isBinary: mockIsBinary,
 }));
-vi.mock('os', () => ({
+vi.mock("os", () => ({
   default: {
     platform: mockPlatform,
     constants: {
@@ -53,46 +52,44 @@ vi.mock('os', () => ({
     },
   },
 }));
-vi.mock('../utils/getPty.js', () => ({
+vi.mock("../utils/getPty.js", () => ({
   getPty: mockGetPty,
 }));
-vi.mock('../utils/terminalSerializer.js', () => ({
+vi.mock("../utils/terminalSerializer.js", () => ({
   serializeTerminalToObject: mockSerializeTerminalToObject,
 }));
 
-const mockProcessKill = vi
-  .spyOn(process, 'kill')
-  .mockImplementation(() => true);
+const mockProcessKill = vi.spyOn(process, "kill").mockImplementation(() => true);
 
 const shellExecutionConfig = {
   terminalWidth: 80,
   terminalHeight: 24,
-  pager: 'cat',
+  pager: "cat",
   showColor: false,
   disableDynamicLineTrimming: true,
 };
 
 const createExpectedAnsiOutput = (text: string | string[]): AnsiOutput => {
-  const lines = Array.isArray(text) ? text : text.split('\n');
+  const lines = Array.isArray(text) ? text : text.split("\n");
   const expected: AnsiOutput = Array.from(
     { length: shellExecutionConfig.terminalHeight },
     (_, i) => [
       {
-        text: expect.stringMatching((lines[i] || '').trim()),
+        text: expect.stringMatching((lines[i] || "").trim()),
         bold: false,
         italic: false,
         underline: false,
         dim: false,
         inverse: false,
-        fg: '',
-        bg: '',
+        fg: "",
+        bg: "",
       },
     ],
   );
   return expected;
 };
 
-describe('ShellExecutionService', () => {
+describe("ShellExecutionService", () => {
   let mockPtyProcess: EventEmitter & {
     pid: number;
     kill: Mock;
@@ -116,10 +113,10 @@ describe('ShellExecutionService', () => {
     vi.clearAllMocks();
 
     mockIsBinary.mockReturnValue(false);
-    mockPlatform.mockReturnValue('linux');
+    mockPlatform.mockReturnValue("linux");
     mockGetPty.mockResolvedValue({
       module: { spawn: mockPtySpawn },
-      name: 'mock-pty',
+      name: "mock-pty",
     });
 
     onOutputEventMock = vi.fn();
@@ -155,16 +152,13 @@ describe('ShellExecutionService', () => {
   // Helper function to run a standard execution simulation
   const simulateExecution = async (
     command: string,
-    simulation: (
-      ptyProcess: typeof mockPtyProcess,
-      ac: AbortController,
-    ) => void | Promise<void>,
+    simulation: (ptyProcess: typeof mockPtyProcess, ac: AbortController) => void | Promise<void>,
     config = shellExecutionConfig,
   ) => {
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
       command,
-      '/test/dir',
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true,
@@ -177,76 +171,73 @@ describe('ShellExecutionService', () => {
     return { result, handle, abortController };
   };
 
-  describe('Successful Execution', () => {
-    it('should execute a command and capture output', async () => {
-      const { result, handle } = await simulateExecution('ls -l', (pty) => {
-        pty.onData.mock.calls[0][0]('file1.txt\n');
+  describe("Successful Execution", () => {
+    it("should execute a command and capture output", async () => {
+      const { result, handle } = await simulateExecution("ls -l", (pty) => {
+        pty.onData.mock.calls[0][0]("file1.txt\n");
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
       expect(mockPtySpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l',
-        ],
+        "bash",
+        ["-c", "shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l"],
         expect.any(Object),
       );
       expect(result.exitCode).toBe(0);
       expect(result.signal).toBeNull();
       expect(result.error).toBeNull();
       expect(result.aborted).toBe(false);
-      expect(result.output.trim()).toBe('file1.txt');
+      expect(result.output.trim()).toBe("file1.txt");
       expect(handle.pid).toBe(12345);
 
       expect(onOutputEventMock).toHaveBeenCalledWith({
-        type: 'data',
-        chunk: createExpectedAnsiOutput('file1.txt'),
+        type: "data",
+        chunk: createExpectedAnsiOutput("file1.txt"),
       });
     });
 
-    it('should strip ANSI codes from output', async () => {
-      const { result } = await simulateExecution('ls --color=auto', (pty) => {
-        pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
+    it("should strip ANSI codes from output", async () => {
+      const { result } = await simulateExecution("ls --color=auto", (pty) => {
+        pty.onData.mock.calls[0][0]("a\u001b[31mred\u001b[0mword");
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
-      expect(result.output.trim()).toBe('aredword');
+      expect(result.output.trim()).toBe("aredword");
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
-          chunk: createExpectedAnsiOutput('aredword'),
+          type: "data",
+          chunk: createExpectedAnsiOutput("aredword"),
         }),
       );
     });
 
-    it('should correctly decode multi-byte characters split across chunks', async () => {
+    it("should correctly decode multi-byte characters split across chunks", async () => {
       const { result } = await simulateExecution('echo "你好"', (pty) => {
-        const multiByteChar = '你好';
+        const multiByteChar = "你好";
         pty.onData.mock.calls[0][0](multiByteChar.slice(0, 1));
         pty.onData.mock.calls[0][0](multiByteChar.slice(1));
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
-      expect(result.output.trim()).toBe('你好');
+      expect(result.output.trim()).toBe("你好");
     });
 
-    it('should handle commands with no output', async () => {
-      await simulateExecution('touch file', (pty) => {
+    it("should handle commands with no output", async () => {
+      await simulateExecution("touch file", (pty) => {
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          chunk: createExpectedAnsiOutput(''),
+          chunk: createExpectedAnsiOutput(""),
         }),
       );
     });
 
-    it('should call onPid with the process id', async () => {
+    it("should call onPid with the process id", async () => {
       const abortController = new AbortController();
       const handle = await ShellExecutionService.execute(
-        'ls -l',
-        '/test/dir',
+        "ls -l",
+        "/test/dir",
         onOutputEventMock,
         abortController.signal,
         true,
@@ -258,9 +249,9 @@ describe('ShellExecutionService', () => {
     });
   });
 
-  describe('pty interaction', () => {
+  describe("pty interaction", () => {
     beforeEach(() => {
-      vi.spyOn(ShellExecutionService['activePtys'], 'get').mockReturnValue({
+      vi.spyOn(ShellExecutionService["activePtys"], "get").mockReturnValue({
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ptyProcess: mockPtyProcess as any,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -268,14 +259,14 @@ describe('ShellExecutionService', () => {
       });
     });
 
-    it('should write to the pty and trigger a render', async () => {
+    it("should write to the pty and trigger a render", async () => {
       vi.useFakeTimers();
-      await simulateExecution('interactive-app', (pty) => {
-        ShellExecutionService.writeToPty(pty.pid!, 'input');
+      await simulateExecution("interactive-app", (pty) => {
+        ShellExecutionService.writeToPty(pty.pid!, "input");
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
-      expect(mockPtyProcess.write).toHaveBeenCalledWith('input');
+      expect(mockPtyProcess.write).toHaveBeenCalledWith("input");
       // Use fake timers to check for the delayed render
       await vi.advanceTimersByTimeAsync(17);
       // The render will cause an output event
@@ -283,9 +274,9 @@ describe('ShellExecutionService', () => {
       vi.useRealTimers();
     });
 
-    it('should resize the pty and the headless terminal', async () => {
-      await simulateExecution('ls -l', (pty) => {
-        pty.onData.mock.calls[0][0]('file1.txt\n');
+    it("should resize the pty and the headless terminal", async () => {
+      await simulateExecution("ls -l", (pty) => {
+        pty.onData.mock.calls[0][0]("file1.txt\n");
         ShellExecutionService.resizePty(pty.pid!, 100, 40);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
@@ -294,12 +285,10 @@ describe('ShellExecutionService', () => {
       expect(mockHeadlessTerminal.resize).toHaveBeenCalledWith(100, 40);
     });
 
-    it('should not resize the pty if it is not active', async () => {
-      const isPtyActiveSpy = vi
-        .spyOn(ShellExecutionService, 'isPtyActive')
-        .mockReturnValue(false);
+    it("should not resize the pty if it is not active", async () => {
+      const isPtyActiveSpy = vi.spyOn(ShellExecutionService, "isPtyActive").mockReturnValue(false);
 
-      await simulateExecution('ls -l', (pty) => {
+      await simulateExecution("ls -l", (pty) => {
         ShellExecutionService.resizePty(pty.pid!, 100, 40);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
@@ -309,17 +298,15 @@ describe('ShellExecutionService', () => {
       isPtyActiveSpy.mockRestore();
     });
 
-    it('should ignore errors when resizing an exited pty', async () => {
-      const resizeError = new Error(
-        'Cannot resize a pty that has already exited',
-      );
+    it("should ignore errors when resizing an exited pty", async () => {
+      const resizeError = new Error("Cannot resize a pty that has already exited");
       mockPtyProcess.resize.mockImplementation(() => {
         throw resizeError;
       });
 
       // We don't expect this test to throw an error
       await expect(
-        simulateExecution('ls -l', (pty) => {
+        simulateExecution("ls -l", (pty) => {
           ShellExecutionService.resizePty(pty.pid!, 100, 40);
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         }),
@@ -328,23 +315,23 @@ describe('ShellExecutionService', () => {
       expect(mockPtyProcess.resize).toHaveBeenCalledWith(100, 40);
     });
 
-    it('should re-throw other errors during resize', async () => {
-      const otherError = new Error('Some other error');
+    it("should re-throw other errors during resize", async () => {
+      const otherError = new Error("Some other error");
       mockPtyProcess.resize.mockImplementation(() => {
         throw otherError;
       });
 
       await expect(
-        simulateExecution('ls -l', (pty) => {
+        simulateExecution("ls -l", (pty) => {
           ShellExecutionService.resizePty(pty.pid!, 100, 40);
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         }),
-      ).rejects.toThrow('Some other error');
+      ).rejects.toThrow("Some other error");
     });
 
-    it('should scroll the headless terminal', async () => {
-      await simulateExecution('ls -l', (pty) => {
-        pty.onData.mock.calls[0][0]('file1.txt\n');
+    it("should scroll the headless terminal", async () => {
+      await simulateExecution("ls -l", (pty) => {
+        pty.onData.mock.calls[0][0]("file1.txt\n");
         ShellExecutionService.scrollPty(pty.pid!, 10);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
@@ -352,10 +339,8 @@ describe('ShellExecutionService', () => {
       expect(mockHeadlessTerminal.scrollLines).toHaveBeenCalledWith(10);
     });
 
-    it('should not throw when resizing a pty that has already exited (Windows)', () => {
-      const resizeError = new Error(
-        'Cannot resize a pty that has already exited',
-      );
+    it("should not throw when resizing a pty that has already exited (Windows)", () => {
+      const resizeError = new Error("Cannot resize a pty that has already exited");
       mockPtyProcess.resize.mockImplementation(() => {
         throw resizeError;
       });
@@ -370,20 +355,20 @@ describe('ShellExecutionService', () => {
     });
   });
 
-  describe('Failed Execution', () => {
-    it('should capture a non-zero exit code', async () => {
-      const { result } = await simulateExecution('a-bad-command', (pty) => {
-        pty.onData.mock.calls[0][0]('command not found');
+  describe("Failed Execution", () => {
+    it("should capture a non-zero exit code", async () => {
+      const { result } = await simulateExecution("a-bad-command", (pty) => {
+        pty.onData.mock.calls[0][0]("command not found");
         pty.onExit.mock.calls[0][0]({ exitCode: 127, signal: null });
       });
 
       expect(result.exitCode).toBe(127);
-      expect(result.output.trim()).toBe('command not found');
+      expect(result.output.trim()).toBe("command not found");
       expect(result.error).toBeNull();
     });
 
-    it('should capture a termination signal', async () => {
-      const { result } = await simulateExecution('long-process', (pty) => {
+    it("should capture a termination signal", async () => {
+      const { result } = await simulateExecution("long-process", (pty) => {
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: 15 });
       });
 
@@ -391,16 +376,16 @@ describe('ShellExecutionService', () => {
       expect(result.signal).toBe(15);
     });
 
-    it('should handle a synchronous spawn error', async () => {
+    it("should handle a synchronous spawn error", async () => {
       mockGetPty.mockImplementation(() => null);
 
       mockCpSpawn.mockImplementation(() => {
-        throw new Error('Simulated PTY spawn error');
+        throw new Error("Simulated PTY spawn error");
       });
 
       const handle = await ShellExecutionService.execute(
-        'any-command',
-        '/test/dir',
+        "any-command",
+        "/test/dir",
         onOutputEventMock,
         new AbortController().signal,
         true,
@@ -409,31 +394,28 @@ describe('ShellExecutionService', () => {
       const result = await handle.result;
 
       expect(result.error).toBeInstanceOf(Error);
-      expect(result.error?.message).toContain('Simulated PTY spawn error');
+      expect(result.error?.message).toContain("Simulated PTY spawn error");
       expect(result.exitCode).toBe(1);
-      expect(result.output).toBe('');
+      expect(result.output).toBe("");
       expect(handle.pid).toBeUndefined();
     });
   });
 
-  describe('Aborting Commands', () => {
-    it('should abort a running process and set the aborted flag', async () => {
-      const { result } = await simulateExecution(
-        'sleep 10',
-        (pty, abortController) => {
-          abortController.abort();
-          pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
-        },
-      );
+  describe("Aborting Commands", () => {
+    it("should abort a running process and set the aborted flag", async () => {
+      const { result } = await simulateExecution("sleep 10", (pty, abortController) => {
+        abortController.abort();
+        pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
+      });
 
       expect(result.aborted).toBe(true);
       // The process kill is mocked, so we just check that the flag is set.
     });
 
-    it('should send SIGTERM and then SIGKILL on abort', async () => {
+    it("should send SIGTERM and then SIGKILL on abort", async () => {
       const sigkillPromise = new Promise<void>((resolve) => {
         mockProcessKill.mockImplementation((pid, signal) => {
-          if (signal === 'SIGKILL' && pid === -mockPtyProcess.pid) {
+          if (signal === "SIGKILL" && pid === -mockPtyProcess.pid) {
             resolve();
           }
           return true;
@@ -441,7 +423,7 @@ describe('ShellExecutionService', () => {
       });
 
       const { result } = await simulateExecution(
-        'long-running-process',
+        "long-running-process",
         async (pty, abortController) => {
           abortController.abort();
           await sigkillPromise; // Wait for SIGKILL to be sent before exiting.
@@ -454,10 +436,10 @@ describe('ShellExecutionService', () => {
       // Verify the calls were made in the correct order.
       const killCalls = mockProcessKill.mock.calls;
       const sigtermCallIndex = killCalls.findIndex(
-        (call) => call[0] === -mockPtyProcess.pid && call[1] === 'SIGTERM',
+        (call) => call[0] === -mockPtyProcess.pid && call[1] === "SIGTERM",
       );
       const sigkillCallIndex = killCalls.findIndex(
-        (call) => call[0] === -mockPtyProcess.pid && call[1] === 'SIGKILL',
+        (call) => call[0] === -mockPtyProcess.pid && call[1] === "SIGKILL",
       );
 
       expect(sigtermCallIndex).toBe(0);
@@ -467,18 +449,15 @@ describe('ShellExecutionService', () => {
       expect(result.signal).toBe(9);
     });
 
-    it('should resolve without waiting for the processing chain on abort', async () => {
-      const { result } = await simulateExecution(
-        'long-output',
-        (pty, abortController) => {
-          // Simulate a lot of data being in the queue to be processed
-          for (let i = 0; i < 1000; i++) {
-            pty.onData.mock.calls[0][0]('some data');
-          }
-          abortController.abort();
-          pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
-        },
-      );
+    it("should resolve without waiting for the processing chain on abort", async () => {
+      const { result } = await simulateExecution("long-output", (pty, abortController) => {
+        // Simulate a lot of data being in the queue to be processed
+        for (let i = 0; i < 1000; i++) {
+          pty.onData.mock.calls[0][0]("some data");
+        }
+        abortController.abort();
+        pty.onExit.mock.calls[0][0]({ exitCode: 1, signal: null });
+      });
 
       // The main assertion here is implicit: the `await` for the result above
       // should complete without timing out. This proves that the resolution
@@ -488,104 +467,93 @@ describe('ShellExecutionService', () => {
     });
   });
 
-  describe('Binary Output', () => {
-    it('should detect binary output and switch to progress events', async () => {
+  describe("Binary Output", () => {
+    it("should detect binary output and switch to progress events", async () => {
       mockIsBinary.mockReturnValueOnce(true);
       const binaryChunk1 = Buffer.from([0x89, 0x50, 0x4e, 0x47]);
       const binaryChunk2 = Buffer.from([0x0d, 0x0a, 0x1a, 0x0a]);
 
-      const { result } = await simulateExecution('cat image.png', (pty) => {
+      const { result } = await simulateExecution("cat image.png", (pty) => {
         pty.onData.mock.calls[0][0](binaryChunk1);
         pty.onData.mock.calls[0][0](binaryChunk2);
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
-      expect(result.rawOutput).toEqual(
-        Buffer.concat([binaryChunk1, binaryChunk2]),
-      );
+      expect(result.rawOutput).toEqual(Buffer.concat([binaryChunk1, binaryChunk2]));
       expect(onOutputEventMock).toHaveBeenCalledTimes(3);
       expect(onOutputEventMock.mock.calls[0][0]).toEqual({
-        type: 'binary_detected',
+        type: "binary_detected",
       });
       expect(onOutputEventMock.mock.calls[1][0]).toEqual({
-        type: 'binary_progress',
+        type: "binary_progress",
         bytesReceived: 4,
       });
       expect(onOutputEventMock.mock.calls[2][0]).toEqual({
-        type: 'binary_progress',
+        type: "binary_progress",
         bytesReceived: 8,
       });
     });
 
-    it('should not emit data events after binary is detected', async () => {
+    it("should not emit data events after binary is detected", async () => {
       mockIsBinary.mockImplementation((buffer) => buffer.includes(0x00));
 
-      await simulateExecution('cat mixed_file', (pty) => {
+      await simulateExecution("cat mixed_file", (pty) => {
         pty.onData.mock.calls[0][0](Buffer.from([0x00, 0x01, 0x02]));
-        pty.onData.mock.calls[0][0](Buffer.from('more text'));
+        pty.onData.mock.calls[0][0](Buffer.from("more text"));
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
       });
 
       const eventTypes = onOutputEventMock.mock.calls.map(
         (call: [ShellOutputEvent]) => call[0].type,
       );
-      expect(eventTypes).toEqual([
-        'binary_detected',
-        'binary_progress',
-        'binary_progress',
-      ]);
+      expect(eventTypes).toEqual(["binary_detected", "binary_progress", "binary_progress"]);
     });
   });
 
-  describe('Platform-Specific Behavior', () => {
-    it('should use powershell.exe on Windows', async () => {
-      mockPlatform.mockReturnValue('win32');
+  describe("Platform-Specific Behavior", () => {
+    it("should use powershell.exe on Windows", async () => {
+      mockPlatform.mockReturnValue("win32");
       await simulateExecution('dir "foo bar"', (pty) =>
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null }),
       );
 
       expect(mockPtySpawn).toHaveBeenCalledWith(
-        'powershell.exe',
-        ['-NoProfile', '-Command', 'dir "foo bar"'],
+        "powershell.exe",
+        ["-NoProfile", "-Command", 'dir "foo bar"'],
         expect.any(Object),
       );
     });
 
-    it('should use bash on Linux', async () => {
-      mockPlatform.mockReturnValue('linux');
+    it("should use bash on Linux", async () => {
+      mockPlatform.mockReturnValue("linux");
       await simulateExecution('ls "foo bar"', (pty) =>
         pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null }),
       );
 
       expect(mockPtySpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"',
-        ],
+        "bash",
+        ["-c", 'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"'],
         expect.any(Object),
       );
     });
   });
 
-  describe('AnsiOutput rendering', () => {
-    it('should call onOutputEvent with AnsiOutput when showColor is true', async () => {
+  describe("AnsiOutput rendering", () => {
+    it("should call onOutputEvent with AnsiOutput when showColor is true", async () => {
       const coloredShellExecutionConfig = {
         ...shellExecutionConfig,
         showColor: true,
-        defaultFg: '#ffffff',
-        defaultBg: '#000000',
+        defaultFg: "#ffffff",
+        defaultBg: "#000000",
         disableDynamicLineTrimming: true,
       };
-      const mockAnsiOutput = [
-        [{ text: 'hello', fg: '#ffffff', bg: '#000000' }],
-      ];
+      const mockAnsiOutput = [[{ text: "hello", fg: "#ffffff", bg: "#000000" }]];
       mockSerializeTerminalToObject.mockReturnValue(mockAnsiOutput);
 
       await simulateExecution(
-        'ls --color=auto',
+        "ls --color=auto",
         (pty) => {
-          pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
+          pty.onData.mock.calls[0][0]("a\u001b[31mred\u001b[0mword");
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         },
         coloredShellExecutionConfig,
@@ -597,17 +565,17 @@ describe('ShellExecutionService', () => {
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
+          type: "data",
           chunk: mockAnsiOutput,
         }),
       );
     });
 
-    it('should call onOutputEvent with AnsiOutput when showColor is false', async () => {
+    it("should call onOutputEvent with AnsiOutput when showColor is false", async () => {
       await simulateExecution(
-        'ls --color=auto',
+        "ls --color=auto",
         (pty) => {
-          pty.onData.mock.calls[0][0]('a\u001b[31mred\u001b[0mword');
+          pty.onData.mock.calls[0][0]("a\u001b[31mred\u001b[0mword");
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         },
         {
@@ -617,23 +585,21 @@ describe('ShellExecutionService', () => {
         },
       );
 
-      const expected = createExpectedAnsiOutput('aredword');
+      const expected = createExpectedAnsiOutput("aredword");
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
+          type: "data",
           chunk: expected,
         }),
       );
     });
 
-    it('should handle multi-line output correctly when showColor is false', async () => {
+    it("should handle multi-line output correctly when showColor is false", async () => {
       await simulateExecution(
-        'ls --color=auto',
+        "ls --color=auto",
         (pty) => {
-          pty.onData.mock.calls[0][0](
-            'line 1\n\u001b[32mline 2\u001b[0m\nline 3',
-          );
+          pty.onData.mock.calls[0][0]("line 1\n\u001b[32mline 2\u001b[0m\nline 3");
           pty.onExit.mock.calls[0][0]({ exitCode: 0, signal: null });
         },
         {
@@ -643,11 +609,11 @@ describe('ShellExecutionService', () => {
         },
       );
 
-      const expected = createExpectedAnsiOutput(['line 1', 'line 2', 'line 3']);
+      const expected = createExpectedAnsiOutput(["line 1", "line 2", "line 3"]);
 
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
+          type: "data",
           chunk: expected,
         }),
       );
@@ -655,7 +621,7 @@ describe('ShellExecutionService', () => {
   });
 });
 
-describe('ShellExecutionService child_process fallback', () => {
+describe("ShellExecutionService child_process fallback", () => {
   let mockChildProcess: EventEmitter & Partial<ChildProcess>;
   let onOutputEventMock: Mock<(event: ShellOutputEvent) => void>;
 
@@ -663,18 +629,17 @@ describe('ShellExecutionService child_process fallback', () => {
     vi.clearAllMocks();
 
     mockIsBinary.mockReturnValue(false);
-    mockPlatform.mockReturnValue('linux');
+    mockPlatform.mockReturnValue("linux");
     mockGetPty.mockResolvedValue(null);
 
     onOutputEventMock = vi.fn();
 
-    mockChildProcess = new EventEmitter() as EventEmitter &
-      Partial<ChildProcess>;
+    mockChildProcess = new EventEmitter() as EventEmitter & Partial<ChildProcess>;
     mockChildProcess.stdout = new EventEmitter() as Readable;
     mockChildProcess.stderr = new EventEmitter() as Readable;
     mockChildProcess.kill = vi.fn();
 
-    Object.defineProperty(mockChildProcess, 'pid', {
+    Object.defineProperty(mockChildProcess, "pid", {
       value: 12345,
       configurable: true,
     });
@@ -690,7 +655,7 @@ describe('ShellExecutionService child_process fallback', () => {
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
       command,
-      '/test/dir',
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true,
@@ -703,88 +668,85 @@ describe('ShellExecutionService child_process fallback', () => {
     return { result, handle, abortController };
   };
 
-  describe('Successful Execution', () => {
-    it('should execute a command and capture stdout and stderr', async () => {
-      const { result, handle } = await simulateExecution('ls -l', (cp) => {
-        cp.stdout?.emit('data', Buffer.from('file1.txt\n'));
-        cp.stderr?.emit('data', Buffer.from('a warning'));
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+  describe("Successful Execution", () => {
+    it("should execute a command and capture stdout and stderr", async () => {
+      const { result, handle } = await simulateExecution("ls -l", (cp) => {
+        cp.stdout?.emit("data", Buffer.from("file1.txt\n"));
+        cp.stderr?.emit("data", Buffer.from("a warning"));
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
 
       expect(mockCpSpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l',
-        ],
+        "bash",
+        ["-c", "shopt -u promptvars nullglob extglob nocaseglob dotglob; ls -l"],
         expect.objectContaining({ shell: false, detached: true }),
       );
       expect(result.exitCode).toBe(0);
       expect(result.signal).toBeNull();
       expect(result.error).toBeNull();
       expect(result.aborted).toBe(false);
-      expect(result.output).toBe('file1.txt\na warning');
+      expect(result.output).toBe("file1.txt\na warning");
       expect(handle.pid).toBe(undefined);
 
       expect(onOutputEventMock).toHaveBeenCalledWith({
-        type: 'data',
-        chunk: 'file1.txt\na warning',
+        type: "data",
+        chunk: "file1.txt\na warning",
       });
     });
 
-    it('should strip ANSI codes from output', async () => {
-      const { result } = await simulateExecution('ls --color=auto', (cp) => {
-        cp.stdout?.emit('data', Buffer.from('a\u001b[31mred\u001b[0mword'));
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+    it("should strip ANSI codes from output", async () => {
+      const { result } = await simulateExecution("ls --color=auto", (cp) => {
+        cp.stdout?.emit("data", Buffer.from("a\u001b[31mred\u001b[0mword"));
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
 
-      expect(result.output.trim()).toBe('aredword');
+      expect(result.output.trim()).toBe("aredword");
       expect(onOutputEventMock).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'data',
-          chunk: 'aredword',
+          type: "data",
+          chunk: "aredword",
         }),
       );
     });
 
-    it('should correctly decode multi-byte characters split across chunks', async () => {
+    it("should correctly decode multi-byte characters split across chunks", async () => {
       const { result } = await simulateExecution('echo "你好"', (cp) => {
-        const multiByteChar = Buffer.from('你好', 'utf-8');
-        cp.stdout?.emit('data', multiByteChar.slice(0, 2));
-        cp.stdout?.emit('data', multiByteChar.slice(2));
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+        const multiByteChar = Buffer.from("你好", "utf-8");
+        cp.stdout?.emit("data", multiByteChar.slice(0, 2));
+        cp.stdout?.emit("data", multiByteChar.slice(2));
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
-      expect(result.output.trim()).toBe('你好');
+      expect(result.output.trim()).toBe("你好");
     });
 
-    it('should handle commands with no output', async () => {
-      const { result } = await simulateExecution('touch file', (cp) => {
-        cp.emit('exit', 0, null);
-        cp.emit('close', 0, null);
+    it("should handle commands with no output", async () => {
+      const { result } = await simulateExecution("touch file", (cp) => {
+        cp.emit("exit", 0, null);
+        cp.emit("close", 0, null);
       });
 
-      expect(result.output.trim()).toBe('');
+      expect(result.output.trim()).toBe("");
       expect(onOutputEventMock).not.toHaveBeenCalled();
     });
 
-    it.skip('should truncate stdout using a sliding window and show a warning', async () => {
+    it.skip("should truncate stdout using a sliding window and show a warning", async () => {
       const MAX_SIZE = 16 * 1024 * 1024;
-      const chunk1 = 'a'.repeat(MAX_SIZE / 2 - 5);
-      const chunk2 = 'b'.repeat(MAX_SIZE / 2 - 5);
-      const chunk3 = 'c'.repeat(20);
-
-      const { result } = await simulateExecution('large-output', (cp) => {
-        cp.stdout?.emit('data', Buffer.from(chunk1));
-        cp.stdout?.emit('data', Buffer.from(chunk2));
-        cp.stdout?.emit('data', Buffer.from(chunk3));
-        cp.emit('exit', 0, null);
+      const chunk1 = "a".repeat(MAX_SIZE / 2 - 5);
+      const chunk2 = "b".repeat(MAX_SIZE / 2 - 5);
+      const chunk3 = "c".repeat(20);
+
+      const { result } = await simulateExecution("large-output", (cp) => {
+        cp.stdout?.emit("data", Buffer.from(chunk1));
+        cp.stdout?.emit("data", Buffer.from(chunk2));
+        cp.stdout?.emit("data", Buffer.from(chunk3));
+        cp.emit("exit", 0, null);
       });
 
       const truncationMessage =
-        '[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to 16MB.]';
+        "[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to 16MB.]";
       expect(result.output).toContain(truncationMessage);
 
       const outputWithoutMessage = result.output
@@ -794,53 +756,51 @@ describe('ShellExecutionService child_process fallback', () => {
       expect(outputWithoutMessage.length).toBe(MAX_SIZE);
 
       const expectedStart = (chunk1 + chunk2 + chunk3).slice(-MAX_SIZE);
-      expect(
-        outputWithoutMessage.startsWith(expectedStart.substring(0, 10)),
-      ).toBe(true);
-      expect(outputWithoutMessage.endsWith('c'.repeat(20))).toBe(true);
+      expect(outputWithoutMessage.startsWith(expectedStart.substring(0, 10))).toBe(true);
+      expect(outputWithoutMessage.endsWith("c".repeat(20))).toBe(true);
     }, 120000);
   });
 
-  describe('Failed Execution', () => {
-    it('should capture a non-zero exit code and format output correctly', async () => {
-      const { result } = await simulateExecution('a-bad-command', (cp) => {
-        cp.stderr?.emit('data', Buffer.from('command not found'));
-        cp.emit('exit', 127, null);
-        cp.emit('close', 127, null);
+  describe("Failed Execution", () => {
+    it("should capture a non-zero exit code and format output correctly", async () => {
+      const { result } = await simulateExecution("a-bad-command", (cp) => {
+        cp.stderr?.emit("data", Buffer.from("command not found"));
+        cp.emit("exit", 127, null);
+        cp.emit("close", 127, null);
       });
 
       expect(result.exitCode).toBe(127);
-      expect(result.output.trim()).toBe('command not found');
+      expect(result.output.trim()).toBe("command not found");
       expect(result.error).toBeNull();
     });
 
-    it('should capture a termination signal', async () => {
-      const { result } = await simulateExecution('long-process', (cp) => {
-        cp.emit('exit', null, 'SIGTERM');
-        cp.emit('close', null, 'SIGTERM');
+    it("should capture a termination signal", async () => {
+      const { result } = await simulateExecution("long-process", (cp) => {
+        cp.emit("exit", null, "SIGTERM");
+        cp.emit("close", null, "SIGTERM");
       });
 
       expect(result.exitCode).toBeNull();
       expect(result.signal).toBe(15);
     });
 
-    it('should handle a spawn error', async () => {
-      const spawnError = new Error('spawn EACCES');
-      const { result } = await simulateExecution('protected-cmd', (cp) => {
-        cp.emit('error', spawnError);
-        cp.emit('exit', 1, null);
-        cp.emit('close', 1, null);
+    it("should handle a spawn error", async () => {
+      const spawnError = new Error("spawn EACCES");
+      const { result } = await simulateExecution("protected-cmd", (cp) => {
+        cp.emit("error", spawnError);
+        cp.emit("exit", 1, null);
+        cp.emit("close", 1, null);
       });
 
       expect(result.error).toBe(spawnError);
       expect(result.exitCode).toBe(1);
     });
 
-    it('handles errors that do not fire the exit event', async () => {
-      const error = new Error('spawn abc ENOENT');
-      const { result } = await simulateExecution('touch cat.jpg', (cp) => {
-        cp.emit('error', error); // No exit event is fired.
-        cp.emit('close', 1, null);
+    it("handles errors that do not fire the exit event", async () => {
+      const error = new Error("spawn abc ENOENT");
+      const { result } = await simulateExecution("touch cat.jpg", (cp) => {
+        cp.emit("error", error); // No exit event is fired.
+        cp.emit("close", 1, null);
       });
 
       expect(result.error).toBe(error);
@@ -848,68 +808,59 @@ describe('ShellExecutionService child_process fallback', () => {
     });
   });
 
-  describe('Aborting Commands', () => {
+  describe("Aborting Commands", () => {
     describe.each([
       {
-        platform: 'linux',
-        expectedSignal: 'SIGTERM',
-        expectedExit: { signal: 'SIGKILL' as const },
+        platform: "linux",
+        expectedSignal: "SIGTERM",
+        expectedExit: { signal: "SIGKILL" as const },
       },
       {
-        platform: 'win32',
-        expectedCommand: 'taskkill',
+        platform: "win32",
+        expectedCommand: "taskkill",
         expectedExit: { code: 1 },
       },
-    ])(
-      'on $platform',
-      ({ platform, expectedSignal, expectedCommand, expectedExit }) => {
-        it('should abort a running process and set the aborted flag', async () => {
-          mockPlatform.mockReturnValue(platform);
-
-          const { result } = await simulateExecution(
-            'sleep 10',
-            (cp, abortController) => {
-              abortController.abort();
-              if (expectedExit.signal) {
-                cp.emit('exit', null, expectedExit.signal);
-                cp.emit('close', null, expectedExit.signal);
-              }
-              if (typeof expectedExit.code === 'number') {
-                cp.emit('exit', expectedExit.code, null);
-                cp.emit('close', expectedExit.code, null);
-              }
-            },
-          );
-
-          expect(result.aborted).toBe(true);
-
-          if (platform === 'linux') {
-            expect(mockProcessKill).toHaveBeenCalledWith(
-              -mockChildProcess.pid!,
-              expectedSignal,
-            );
-          } else {
-            expect(mockCpSpawn).toHaveBeenCalledWith(expectedCommand, [
-              '/pid',
-              String(mockChildProcess.pid),
-              '/f',
-              '/t',
-            ]);
+    ])("on $platform", ({ platform, expectedSignal, expectedCommand, expectedExit }) => {
+      it("should abort a running process and set the aborted flag", async () => {
+        mockPlatform.mockReturnValue(platform);
+
+        const { result } = await simulateExecution("sleep 10", (cp, abortController) => {
+          abortController.abort();
+          if (expectedExit.signal) {
+            cp.emit("exit", null, expectedExit.signal);
+            cp.emit("close", null, expectedExit.signal);
+          }
+          if (typeof expectedExit.code === "number") {
+            cp.emit("exit", expectedExit.code, null);
+            cp.emit("close", expectedExit.code, null);
           }
         });
-      },
-    );
 
-    it('should gracefully attempt SIGKILL on linux if SIGTERM fails', async () => {
-      mockPlatform.mockReturnValue('linux');
+        expect(result.aborted).toBe(true);
+
+        if (platform === "linux") {
+          expect(mockProcessKill).toHaveBeenCalledWith(-mockChildProcess.pid!, expectedSignal);
+        } else {
+          expect(mockCpSpawn).toHaveBeenCalledWith(expectedCommand, [
+            "/pid",
+            String(mockChildProcess.pid),
+            "/f",
+            "/t",
+          ]);
+        }
+      });
+    });
+
+    it("should gracefully attempt SIGKILL on linux if SIGTERM fails", async () => {
+      mockPlatform.mockReturnValue("linux");
       vi.useFakeTimers();
 
       // Don't await the result inside the simulation block for this specific test.
       // We need to control the timeline manually.
       const abortController = new AbortController();
       const handle = await ShellExecutionService.execute(
-        'unresponsive_process',
-        '/test/dir',
+        "unresponsive_process",
+        "/test/dir",
         onOutputEventMock,
         abortController.signal,
         true,
@@ -919,23 +870,17 @@ describe('ShellExecutionService child_process fallback', () => {
       abortController.abort();
 
       // Check the first kill signal
-      expect(mockProcessKill).toHaveBeenCalledWith(
-        -mockChildProcess.pid!,
-        'SIGTERM',
-      );
+      expect(mockProcessKill).toHaveBeenCalledWith(-mockChildProcess.pid!, "SIGTERM");
 
       // Now, advance time past the timeout
       await vi.advanceTimersByTimeAsync(250);
 
       // Check the second kill signal
-      expect(mockProcessKill).toHaveBeenCalledWith(
-        -mockChildProcess.pid!,
-        'SIGKILL',
-      );
+      expect(mockProcessKill).toHaveBeenCalledWith(-mockChildProcess.pid!, "SIGKILL");
 
       // Finally, simulate the process exiting and await the result
-      mockChildProcess.emit('exit', null, 'SIGKILL');
-      mockChildProcess.emit('close', null, 'SIGKILL');
+      mockChildProcess.emit("exit", null, "SIGKILL");
+      mockChildProcess.emit("close", null, "SIGKILL");
       const result = await handle.result;
 
       vi.useRealTimers();
@@ -945,54 +890,50 @@ describe('ShellExecutionService child_process fallback', () => {
     });
   });
 
-  describe('Binary Output', () => {
-    it('should detect binary output and switch to progress events', async () => {
+  describe("Binary Output", () => {
+    it("should detect binary output and switch to progress events", async () => {
       mockIsBinary.mockReturnValueOnce(true);
       const binaryChunk1 = Buffer.from([0x89, 0x50, 0x4e, 0x47]);
       const binaryChunk2 = Buffer.from([0x0d, 0x0a, 0x1a, 0x0a]);
 
-      const { result } = await simulateExecution('cat image.png', (cp) => {
-        cp.stdout?.emit('data', binaryChunk1);
-        cp.stdout?.emit('data', binaryChunk2);
-        cp.emit('exit', 0, null);
+      const { result } = await simulateExecution("cat image.png", (cp) => {
+        cp.stdout?.emit("data", binaryChunk1);
+        cp.stdout?.emit("data", binaryChunk2);
+        cp.emit("exit", 0, null);
       });
 
-      expect(result.rawOutput).toEqual(
-        Buffer.concat([binaryChunk1, binaryChunk2]),
-      );
+      expect(result.rawOutput).toEqual(Buffer.concat([binaryChunk1, binaryChunk2]));
       expect(onOutputEventMock).toHaveBeenCalledTimes(1);
       expect(onOutputEventMock.mock.calls[0][0]).toEqual({
-        type: 'binary_detected',
+        type: "binary_detected",
       });
     });
 
-    it('should not emit data events after binary is detected', async () => {
+    it("should not emit data events after binary is detected", async () => {
       mockIsBinary.mockImplementation((buffer) => buffer.includes(0x00));
 
-      await simulateExecution('cat mixed_file', (cp) => {
-        cp.stdout?.emit('data', Buffer.from('some text'));
-        cp.stdout?.emit('data', Buffer.from([0x00, 0x01, 0x02]));
-        cp.stdout?.emit('data', Buffer.from('more text'));
-        cp.emit('exit', 0, null);
+      await simulateExecution("cat mixed_file", (cp) => {
+        cp.stdout?.emit("data", Buffer.from("some text"));
+        cp.stdout?.emit("data", Buffer.from([0x00, 0x01, 0x02]));
+        cp.stdout?.emit("data", Buffer.from("more text"));
+        cp.emit("exit", 0, null);
       });
 
       const eventTypes = onOutputEventMock.mock.calls.map(
         (call: [ShellOutputEvent]) => call[0].type,
       );
-      expect(eventTypes).toEqual(['binary_detected']);
+      expect(eventTypes).toEqual(["binary_detected"]);
     });
   });
 
-  describe('Platform-Specific Behavior', () => {
-    it('should use powershell.exe on Windows', async () => {
-      mockPlatform.mockReturnValue('win32');
-      await simulateExecution('dir "foo bar"', (cp) =>
-        cp.emit('exit', 0, null),
-      );
+  describe("Platform-Specific Behavior", () => {
+    it("should use powershell.exe on Windows", async () => {
+      mockPlatform.mockReturnValue("win32");
+      await simulateExecution('dir "foo bar"', (cp) => cp.emit("exit", 0, null));
 
       expect(mockCpSpawn).toHaveBeenCalledWith(
-        'powershell.exe',
-        ['-NoProfile', '-Command', 'dir "foo bar"'],
+        "powershell.exe",
+        ["-NoProfile", "-Command", 'dir "foo bar"'],
         expect.objectContaining({
           shell: false,
           detached: false,
@@ -1001,16 +942,13 @@ describe('ShellExecutionService child_process fallback', () => {
       );
     });
 
-    it('should use bash and detached process group on Linux', async () => {
-      mockPlatform.mockReturnValue('linux');
-      await simulateExecution('ls "foo bar"', (cp) => cp.emit('exit', 0, null));
+    it("should use bash and detached process group on Linux", async () => {
+      mockPlatform.mockReturnValue("linux");
+      await simulateExecution('ls "foo bar"', (cp) => cp.emit("exit", 0, null));
 
       expect(mockCpSpawn).toHaveBeenCalledWith(
-        'bash',
-        [
-          '-c',
-          'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"',
-        ],
+        "bash",
+        ["-c", 'shopt -u promptvars nullglob extglob nocaseglob dotglob; ls "foo bar"'],
         expect.objectContaining({
           shell: false,
           detached: true,
@@ -1020,7 +958,7 @@ describe('ShellExecutionService child_process fallback', () => {
   });
 });
 
-describe('ShellExecutionService execution method selection', () => {
+describe("ShellExecutionService execution method selection", () => {
   let onOutputEventMock: Mock<(event: ShellOutputEvent) => void>;
   let mockPtyProcess: EventEmitter & {
     pid: number;
@@ -1055,27 +993,26 @@ describe('ShellExecutionService execution method selection', () => {
     mockPtySpawn.mockReturnValue(mockPtyProcess);
     mockGetPty.mockResolvedValue({
       module: { spawn: mockPtySpawn },
-      name: 'mock-pty',
+      name: "mock-pty",
     });
 
     // Mock for child_process
-    mockChildProcess = new EventEmitter() as EventEmitter &
-      Partial<ChildProcess>;
+    mockChildProcess = new EventEmitter() as EventEmitter & Partial<ChildProcess>;
     mockChildProcess.stdout = new EventEmitter() as Readable;
     mockChildProcess.stderr = new EventEmitter() as Readable;
     mockChildProcess.kill = vi.fn();
-    Object.defineProperty(mockChildProcess, 'pid', {
+    Object.defineProperty(mockChildProcess, "pid", {
       value: 54321,
       configurable: true,
     });
     mockCpSpawn.mockReturnValue(mockChildProcess);
   });
 
-  it('should use node-pty when shouldUseNodePty is true and pty is available', async () => {
+  it("should use node-pty when shouldUseNodePty is true and pty is available", async () => {
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
-      'test command',
-      '/test/dir',
+      "test command",
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true, // shouldUseNodePty
@@ -1089,14 +1026,14 @@ describe('ShellExecutionService execution method selection', () => {
     expect(mockGetPty).toHaveBeenCalled();
     expect(mockPtySpawn).toHaveBeenCalled();
     expect(mockCpSpawn).not.toHaveBeenCalled();
-    expect(result.executionMethod).toBe('mock-pty');
+    expect(result.executionMethod).toBe("mock-pty");
   });
 
-  it('should use child_process when shouldUseNodePty is false', async () => {
+  it("should use child_process when shouldUseNodePty is false", async () => {
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
-      'test command',
-      '/test/dir',
+      "test command",
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       false, // shouldUseNodePty
@@ -1104,22 +1041,22 @@ describe('ShellExecutionService execution method selection', () => {
     );
 
     // Simulate exit to allow promise to resolve
-    mockChildProcess.emit('exit', 0, null);
+    mockChildProcess.emit("exit", 0, null);
     const result = await handle.result;
 
     expect(mockGetPty).not.toHaveBeenCalled();
     expect(mockPtySpawn).not.toHaveBeenCalled();
     expect(mockCpSpawn).toHaveBeenCalled();
-    expect(result.executionMethod).toBe('child_process');
+    expect(result.executionMethod).toBe("child_process");
   });
 
-  it('should fall back to child_process if pty is not available even if shouldUseNodePty is true', async () => {
+  it("should fall back to child_process if pty is not available even if shouldUseNodePty is true", async () => {
     mockGetPty.mockResolvedValue(null);
 
     const abortController = new AbortController();
     const handle = await ShellExecutionService.execute(
-      'test command',
-      '/test/dir',
+      "test command",
+      "/test/dir",
       onOutputEventMock,
       abortController.signal,
       true, // shouldUseNodePty
@@ -1127,12 +1064,12 @@ describe('ShellExecutionService execution method selection', () => {
     );
 
     // Simulate exit to allow promise to resolve
-    mockChildProcess.emit('exit', 0, null);
+    mockChildProcess.emit("exit", 0, null);
     const result = await handle.result;
 
     expect(mockGetPty).toHaveBeenCalled();
     expect(mockPtySpawn).not.toHaveBeenCalled();
     expect(mockCpSpawn).toHaveBeenCalled();
-    expect(result.executionMethod).toBe('child_process');
+    expect(result.executionMethod).toBe("child_process");
   });
 });
diff --git a/packages/gemini-core/src/services/shellExecutionService.ts b/packages/gemini-core/src/services/shellExecutionService.ts
index d797dd83b..bfc827497 100644
--- a/packages/gemini-core/src/services/shellExecutionService.ts
+++ b/packages/gemini-core/src/services/shellExecutionService.ts
@@ -4,31 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import type { PtyImplementation } from '../utils/getPty.js';
-import { getPty } from '../utils/getPty.js';
-import { spawn as cpSpawn } from 'node:child_process';
-import { TextDecoder } from 'node:util';
-import os from 'node:os';
-import type { IPty } from '@lydell/node-pty';
-import { getCachedEncodingForBuffer } from '../utils/systemEncoding.js';
-import { getShellConfiguration, type ShellType } from '../utils/shell-utils.js';
-import { isBinary } from '../utils/textUtils.js';
-import pkg from '@xterm/headless';
-import {
-  serializeTerminalToObject,
-  type AnsiOutput,
-} from '../utils/terminalSerializer.js';
+import { spawn as cpSpawn } from "node:child_process";
+import os from "node:os";
+import { TextDecoder } from "node:util";
+import type { IPty } from "@lydell/node-pty";
+import pkg from "@xterm/headless";
+import stripAnsi from "strip-ansi";
+import type { PtyImplementation } from "../utils/getPty.js";
+import { getPty } from "../utils/getPty.js";
+import { getShellConfiguration, type ShellType } from "../utils/shell-utils.js";
+import { getCachedEncodingForBuffer } from "../utils/systemEncoding.js";
+import { type AnsiOutput, serializeTerminalToObject } from "../utils/terminalSerializer.js";
+import { isBinary } from "../utils/textUtils.js";
+
 const { Terminal } = pkg;
 
 const SIGKILL_TIMEOUT_MS = 200;
 const MAX_CHILD_PROCESS_BUFFER_SIZE = 16 * 1024 * 1024; // 16MB
 
-const BASH_SHOPT_OPTIONS = 'promptvars nullglob extglob nocaseglob dotglob';
+const BASH_SHOPT_OPTIONS = "promptvars nullglob extglob nocaseglob dotglob";
 const BASH_SHOPT_GUARD = `shopt -u ${BASH_SHOPT_OPTIONS};`;
 
 function ensurePromptvarsDisabled(command: string, shell: ShellType): string {
-  if (shell !== 'bash') {
+  if (shell !== "bash") {
     return command;
   }
 
@@ -57,7 +55,7 @@ export interface ShellExecutionResult {
   /** The process ID of the spawned shell. */
   pid: number | undefined;
   /** The method used to execute the shell command. */
-  executionMethod: 'lydell-node-pty' | 'node-pty' | 'child_process' | 'none';
+  executionMethod: "lydell-node-pty" | "node-pty" | "child_process" | "none";
 }
 
 /** A handle for an ongoing shell execution. */
@@ -85,17 +83,17 @@ export interface ShellExecutionConfig {
 export type ShellOutputEvent =
   | {
       /** The event contains a chunk of output data. */
-      type: 'data';
+      type: "data";
       /** The decoded string chunk. */
       chunk: string | AnsiOutput;
     }
   | {
       /** Signals that the output stream has been identified as binary. */
-      type: 'binary_detected';
+      type: "binary_detected";
     }
   | {
       /** Provides progress updates for a binary stream. */
-      type: 'binary_progress';
+      type: "binary_progress";
       /** The total number of bytes received so far. */
       bytesReceived: number;
     };
@@ -110,10 +108,10 @@ const getFullBufferText = (terminal: pkg.Terminal): string => {
   const lines: string[] = [];
   for (let i = 0; i < buffer.length; i++) {
     const line = buffer.getLine(i);
-    const lineContent = line ? line.translateToString() : '';
+    const lineContent = line ? line.translateToString() : "";
     lines.push(lineContent);
   }
-  return lines.join('\n').trimEnd();
+  return lines.join("\n").trimEnd();
 };
 
 /**
@@ -160,12 +158,7 @@ export class ShellExecutionService {
       }
     }
 
-    return this.childProcessFallback(
-      commandToExecute,
-      cwd,
-      onOutputEvent,
-      abortSignal,
-    );
+    return this.childProcessFallback(commandToExecute, cwd, onOutputEvent, abortSignal);
   }
 
   private static appendAndTruncate(
@@ -205,22 +198,22 @@ export class ShellExecutionService {
     abortSignal: AbortSignal,
   ): ShellExecutionHandle {
     try {
-      const isWindows = os.platform() === 'win32';
+      const isWindows = os.platform() === "win32";
       const { executable, argsPrefix, shell } = getShellConfiguration();
       const guardedCommand = ensurePromptvarsDisabled(commandToExecute, shell);
       const spawnArgs = [...argsPrefix, guardedCommand];
 
       const child = cpSpawn(executable, spawnArgs, {
         cwd,
-        stdio: ['ignore', 'pipe', 'pipe'],
+        stdio: ["ignore", "pipe", "pipe"],
         windowsVerbatimArguments: isWindows ? false : undefined,
         shell: false,
         detached: !isWindows,
         env: {
           ...process.env,
-          GEMINI_CLI: '1',
-          TERM: 'xterm-256color',
-          PAGER: 'cat',
+          GEMINI_CLI: "1",
+          TERM: "xterm-256color",
+          PAGER: "cat",
         },
       });
 
@@ -228,8 +221,8 @@ export class ShellExecutionService {
         let stdoutDecoder: TextDecoder | null = null;
         let stderrDecoder: TextDecoder | null = null;
 
-        let stdout = '';
-        let stderr = '';
+        let stdout = "";
+        let stderr = "";
         let stdoutTruncated = false;
         let stderrTruncated = false;
         const outputChunks: Buffer[] = [];
@@ -240,15 +233,15 @@ export class ShellExecutionService {
         const MAX_SNIFF_SIZE = 4096;
         let sniffedBytes = 0;
 
-        const handleOutput = (data: Buffer, stream: 'stdout' | 'stderr') => {
+        const handleOutput = (data: Buffer, stream: "stdout" | "stderr") => {
           if (!stdoutDecoder || !stderrDecoder) {
             const encoding = getCachedEncodingForBuffer(data);
             try {
               stdoutDecoder = new TextDecoder(encoding);
               stderrDecoder = new TextDecoder(encoding);
             } catch {
-              stdoutDecoder = new TextDecoder('utf-8');
-              stderrDecoder = new TextDecoder('utf-8');
+              stdoutDecoder = new TextDecoder("utf-8");
+              stderrDecoder = new TextDecoder("utf-8");
             }
           }
 
@@ -264,10 +257,10 @@ export class ShellExecutionService {
           }
 
           if (isStreamingRawContent) {
-            const decoder = stream === 'stdout' ? stdoutDecoder : stderrDecoder;
+            const decoder = stream === "stdout" ? stdoutDecoder : stderrDecoder;
             const decodedChunk = decoder.decode(data, { stream: true });
 
-            if (stream === 'stdout') {
+            if (stream === "stdout") {
               const { newBuffer, truncated } = this.appendAndTruncate(
                 stdout,
                 decodedChunk,
@@ -291,15 +284,11 @@ export class ShellExecutionService {
           }
         };
 
-        const handleExit = (
-          code: number | null,
-          signal: NodeJS.Signals | null,
-        ) => {
+        const handleExit = (code: number | null, signal: NodeJS.Signals | null) => {
           const { finalBuffer } = cleanup();
           // Ensure we don't add an extra newline if stdout already ends with one.
-          const separator = stdout.endsWith('\n') ? '' : '\n';
-          let combinedOutput =
-            stdout + (stderr ? (stdout ? separator : '') + stderr : '');
+          const separator = stdout.endsWith("\n") ? "" : "\n";
+          let combinedOutput = stdout + (stderr ? (stdout ? separator : "") + stderr : "");
 
           if (stdoutTruncated || stderrTruncated) {
             const truncationMessage = `\n[GEMINI_CLI_WARNING: Output truncated. The buffer is limited to ${
@@ -312,10 +301,10 @@ export class ShellExecutionService {
 
           if (isStreamingRawContent) {
             if (finalStrippedOutput) {
-              onOutputEvent({ type: 'data', chunk: finalStrippedOutput });
+              onOutputEvent({ type: "data", chunk: finalStrippedOutput });
             }
           } else {
-            onOutputEvent({ type: 'binary_detected' });
+            onOutputEvent({ type: "binary_detected" });
           }
 
           resolve({
@@ -326,13 +315,13 @@ export class ShellExecutionService {
             error,
             aborted: abortSignal.aborted,
             pid: undefined,
-            executionMethod: 'child_process',
+            executionMethod: "child_process",
           });
         };
 
-        child.stdout.on('data', (data) => handleOutput(data, 'stdout'));
-        child.stderr.on('data', (data) => handleOutput(data, 'stderr'));
-        child.on('error', (err) => {
+        child.stdout.on("data", (data) => handleOutput(data, "stdout"));
+        child.stderr.on("data", (data) => handleOutput(data, "stderr"));
+        child.on("error", (err) => {
           error = err;
           handleExit(1, null);
         });
@@ -340,24 +329,24 @@ export class ShellExecutionService {
         const abortHandler = async () => {
           if (child.pid && !exited) {
             if (isWindows) {
-              cpSpawn('taskkill', ['/pid', child.pid.toString(), '/f', '/t']);
+              cpSpawn("taskkill", ["/pid", child.pid.toString(), "/f", "/t"]);
             } else {
               try {
-                process.kill(-child.pid, 'SIGTERM');
+                process.kill(-child.pid, "SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
-                  process.kill(-child.pid, 'SIGKILL');
+                  process.kill(-child.pid, "SIGKILL");
                 }
               } catch (_e) {
-                if (!exited) child.kill('SIGKILL');
+                if (!exited) child.kill("SIGKILL");
               }
             }
           }
         };
 
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
 
-        child.on('exit', (code, signal) => {
+        child.on("exit", (code, signal) => {
           if (child.pid) {
             this.activePtys.delete(child.pid);
           }
@@ -366,7 +355,7 @@ export class ShellExecutionService {
 
         function cleanup() {
           exited = true;
-          abortSignal.removeEventListener('abort', abortHandler);
+          abortSignal.removeEventListener("abort", abortHandler);
           if (stdoutDecoder) {
             const remaining = stdoutDecoder.decode();
             if (remaining) {
@@ -393,13 +382,13 @@ export class ShellExecutionService {
         pid: undefined,
         result: Promise.resolve({
           error,
-          rawOutput: Buffer.from(''),
-          output: '',
+          rawOutput: Buffer.from(""),
+          output: "",
           exitCode: 1,
           signal: null,
           aborted: false,
           pid: undefined,
-          executionMethod: 'none',
+          executionMethod: "none",
         }),
       };
     }
@@ -415,7 +404,7 @@ export class ShellExecutionService {
   ): ShellExecutionHandle {
     if (!ptyInfo) {
       // This should not happen, but as a safeguard...
-      throw new Error('PTY implementation not found');
+      throw new Error("PTY implementation not found");
     }
     try {
       const cols = shellExecutionConfig.terminalWidth ?? 80;
@@ -426,14 +415,14 @@ export class ShellExecutionService {
 
       const ptyProcess = ptyInfo.module.spawn(executable, args, {
         cwd,
-        name: 'xterm',
+        name: "xterm",
         cols,
         rows,
         env: {
           ...process.env,
-          GEMINI_CLI: '1',
-          TERM: 'xterm-256color',
-          PAGER: shellExecutionConfig.pager ?? 'cat',
+          GEMINI_CLI: "1",
+          TERM: "xterm-256color",
+          PAGER: shellExecutionConfig.pager ?? "cat",
         },
         handleFlowControl: true,
       });
@@ -487,7 +476,7 @@ export class ShellExecutionService {
             const lines: AnsiOutput = [];
             for (let y = 0; y < headlessTerminal.rows; y++) {
               const line = buffer.getLine(buffer.viewportY + y);
-              const lineContent = line ? line.translateToString(true) : '';
+              const lineContent = line ? line.translateToString(true) : "";
               lines.push([
                 {
                   text: lineContent,
@@ -496,8 +485,8 @@ export class ShellExecutionService {
                   underline: false,
                   dim: false,
                   inverse: false,
-                  fg: '',
-                  bg: '',
+                  fg: "",
+                  bg: "",
                 },
               ]);
             }
@@ -510,7 +499,7 @@ export class ShellExecutionService {
             if (
               line
                 .map((segment) => segment.text)
-                .join('')
+                .join("")
                 .trim().length > 0
             ) {
               lastNonEmptyLine = i;
@@ -532,7 +521,7 @@ export class ShellExecutionService {
           if (JSON.stringify(output) !== JSON.stringify(finalOutput)) {
             output = finalOutput;
             onOutputEvent({
-              type: 'data',
+              type: "data",
               chunk: finalOutput,
             });
           }
@@ -572,7 +561,7 @@ export class ShellExecutionService {
                   try {
                     decoder = new TextDecoder(encoding);
                   } catch {
-                    decoder = new TextDecoder('utf-8');
+                    decoder = new TextDecoder("utf-8");
                   }
                 }
 
@@ -584,7 +573,7 @@ export class ShellExecutionService {
 
                   if (isBinary(sniffBuffer)) {
                     isStreamingRawContent = false;
-                    onOutputEvent({ type: 'binary_detected' });
+                    onOutputEvent({ type: "binary_detected" });
                   }
                 }
 
@@ -601,12 +590,9 @@ export class ShellExecutionService {
                     resolve();
                   });
                 } else {
-                  const totalBytes = outputChunks.reduce(
-                    (sum, chunk) => sum + chunk.length,
-                    0,
-                  );
+                  const totalBytes = outputChunks.reduce((sum, chunk) => sum + chunk.length, 0);
                   onOutputEvent({
-                    type: 'binary_progress',
+                    type: "binary_progress",
                     bytesReceived: totalBytes,
                   });
                   resolve();
@@ -616,91 +602,87 @@ export class ShellExecutionService {
         };
 
         ptyProcess.onData((data: string) => {
-          const bufferData = Buffer.from(data, 'utf-8');
+          const bufferData = Buffer.from(data, "utf-8");
           handleOutput(bufferData);
         });
 
-        ptyProcess.onExit(
-          ({ exitCode, signal }: { exitCode: number; signal?: number }) => {
-            exited = true;
-            abortSignal.removeEventListener('abort', abortHandler);
-            this.activePtys.delete(ptyProcess.pid);
-
-            const finalize = () => {
-              render(true);
-              const finalBuffer = Buffer.concat(outputChunks);
-
-              resolve({
-                rawOutput: finalBuffer,
-                output: getFullBufferText(headlessTerminal),
-                exitCode,
-                signal: signal ?? null,
-                error,
-                aborted: abortSignal.aborted,
-                pid: ptyProcess.pid,
-                executionMethod:
-                  (ptyInfo?.name as 'node-pty' | 'lydell-node-pty') ??
-                  'node-pty',
-              });
-            };
+        ptyProcess.onExit(({ exitCode, signal }: { exitCode: number; signal?: number }) => {
+          exited = true;
+          abortSignal.removeEventListener("abort", abortHandler);
+          this.activePtys.delete(ptyProcess.pid);
+
+          const finalize = () => {
+            render(true);
+            const finalBuffer = Buffer.concat(outputChunks);
+
+            resolve({
+              rawOutput: finalBuffer,
+              output: getFullBufferText(headlessTerminal),
+              exitCode,
+              signal: signal ?? null,
+              error,
+              aborted: abortSignal.aborted,
+              pid: ptyProcess.pid,
+              executionMethod: (ptyInfo?.name as "node-pty" | "lydell-node-pty") ?? "node-pty",
+            });
+          };
 
+          if (abortSignal.aborted) {
+            finalize();
+            return;
+          }
+
+          const processingComplete = processingChain.then(() => "processed");
+          const abortFired = new Promise<"aborted">((res) => {
             if (abortSignal.aborted) {
-              finalize();
+              res("aborted");
               return;
             }
-
-            const processingComplete = processingChain.then(() => 'processed');
-            const abortFired = new Promise<'aborted'>((res) => {
-              if (abortSignal.aborted) {
-                res('aborted');
-                return;
-              }
-              abortSignal.addEventListener('abort', () => res('aborted'), {
-                once: true,
-              });
+            abortSignal.addEventListener("abort", () => res("aborted"), {
+              once: true,
             });
+          });
 
-            Promise.race([processingComplete, abortFired]).then(() => {
-              finalize();
-            });
-          },
-        );
+          Promise.race([processingComplete, abortFired]).then(() => {
+            finalize();
+          });
+        });
 
         const abortHandler = async () => {
           if (ptyProcess.pid && !exited) {
-            if (os.platform() === 'win32') {
+            if (os.platform() === "win32") {
               ptyProcess.kill();
             } else {
               try {
                 // Kill the entire process group
-                process.kill(-ptyProcess.pid, 'SIGTERM');
+                process.kill(-ptyProcess.pid, "SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
-                  process.kill(-ptyProcess.pid, 'SIGKILL');
+                  process.kill(-ptyProcess.pid, "SIGKILL");
                 }
               } catch (_e) {
                 // Fallback to killing just the process if the group kill fails
-                ptyProcess.kill('SIGTERM');
+                ptyProcess.kill("SIGTERM");
                 await new Promise((res) => setTimeout(res, SIGKILL_TIMEOUT_MS));
                 if (!exited) {
-                  ptyProcess.kill('SIGKILL');
+                  ptyProcess.kill("SIGKILL");
                 }
               }
             }
           }
         };
 
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
       });
 
       return { pid: ptyProcess.pid, result };
     } catch (e) {
       const error = e as Error;
-      if (error.message.includes('posix_spawnp failed')) {
+      if (error.message.includes("posix_spawnp failed")) {
         onOutputEvent({
-          type: 'data',
+          type: "data",
           chunk:
-            '[GEMINI_CLI_WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n',
+            "[GEMINI_CLI_WARNING] PTY execution failed, falling back to child_process. This may be due to sandbox restrictions.\n",
         });
         throw e;
       } else {
@@ -708,13 +690,13 @@ export class ShellExecutionService {
           pid: undefined,
           result: Promise.resolve({
             error,
-            rawOutput: Buffer.from(''),
-            output: '',
+            rawOutput: Buffer.from(""),
+            output: "",
             exitCode: 1,
             signal: null,
             aborted: false,
             pid: undefined,
-            executionMethod: 'none',
+            executionMethod: "none",
           }),
         };
       }
@@ -770,8 +752,8 @@ export class ShellExecutionService {
         // due to a race condition between the exit event and this call.
         if (
           e instanceof Error &&
-          (('code' in e && e.code === 'ESRCH') ||
-            e.message.includes('Cannot resize a pty that has already exited'))
+          (("code" in e && e.code === "ESRCH") ||
+            e.message.includes("Cannot resize a pty that has already exited"))
         ) {
           // On Unix, we get an ESRCH error.
           // On Windows, we get a message-based error.
@@ -804,7 +786,7 @@ export class ShellExecutionService {
       } catch (e) {
         // Ignore errors if the pty has already exited, which can happen
         // due to a race condition between the exit event and this call.
-        if (e instanceof Error && 'code' in e && e.code === 'ESRCH') {
+        if (e instanceof Error && "code" in e && e.code === "ESRCH") {
           // ignore
         } else {
           throw e;
diff --git a/packages/gemini-core/src/telemetry/activity-detector.test.ts b/packages/gemini-core/src/telemetry/activity-detector.test.ts
index dd5d56e5a..3469b08ae 100644
--- a/packages/gemini-core/src/telemetry/activity-detector.test.ts
+++ b/packages/gemini-core/src/telemetry/activity-detector.test.ts
@@ -4,41 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
   ActivityDetector,
   getActivityDetector,
-  recordUserActivity,
   isUserActive,
-} from './activity-detector.js';
+  recordUserActivity,
+} from "./activity-detector.js";
 
-describe('ActivityDetector', () => {
+describe("ActivityDetector", () => {
   let detector: ActivityDetector;
 
   beforeEach(() => {
     detector = new ActivityDetector(1000); // 1 second idle threshold for testing
   });
 
-  describe('constructor', () => {
-    it('should initialize with default idle threshold', () => {
+  describe("constructor", () => {
+    it("should initialize with default idle threshold", () => {
       const defaultDetector = new ActivityDetector();
       expect(defaultDetector).toBeInstanceOf(ActivityDetector);
     });
 
-    it('should initialize with custom idle threshold', () => {
+    it("should initialize with custom idle threshold", () => {
       const customDetector = new ActivityDetector(5000);
       expect(customDetector).toBeInstanceOf(ActivityDetector);
     });
   });
 
-  describe('recordActivity', () => {
+  describe("recordActivity", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should update last activity time', () => {
+    it("should update last activity time", () => {
       const beforeTime = detector.getLastActivityTime();
       vi.advanceTimersByTime(100);
 
@@ -49,30 +49,30 @@ describe('ActivityDetector', () => {
     });
   });
 
-  describe('isUserActive', () => {
+  describe("isUserActive", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should return true immediately after construction', () => {
+    it("should return true immediately after construction", () => {
       expect(detector.isUserActive()).toBe(true);
     });
 
-    it('should return true within idle threshold', () => {
+    it("should return true within idle threshold", () => {
       detector.recordActivity();
       expect(detector.isUserActive()).toBe(true);
     });
 
-    it('should return false after idle threshold', () => {
+    it("should return false after idle threshold", () => {
       // Advance time beyond idle threshold
       vi.advanceTimersByTime(2000); // 2 seconds, threshold is 1 second
 
       expect(detector.isUserActive()).toBe(false);
     });
 
-    it('should return true again after recording new activity', () => {
+    it("should return true again after recording new activity", () => {
       // Go idle
       vi.advanceTimersByTime(2000);
       expect(detector.isUserActive()).toBe(false);
@@ -83,14 +83,14 @@ describe('ActivityDetector', () => {
     });
   });
 
-  describe('getTimeSinceLastActivity', () => {
+  describe("getTimeSinceLastActivity", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should return time elapsed since last activity', () => {
+    it("should return time elapsed since last activity", () => {
       detector.recordActivity();
       vi.advanceTimersByTime(500);
 
@@ -99,8 +99,8 @@ describe('ActivityDetector', () => {
     });
   });
 
-  describe('getLastActivityTime', () => {
-    it('should return the timestamp of last activity', () => {
+  describe("getLastActivityTime", () => {
+    it("should return the timestamp of last activity", () => {
       const before = Date.now();
       detector.recordActivity();
       const activityTime = detector.getLastActivityTime();
@@ -112,30 +112,30 @@ describe('ActivityDetector', () => {
   });
 });
 
-describe('Global Activity Detector Functions', () => {
-  describe('global instance', () => {
-    it('should expose a global ActivityDetector via getActivityDetector', () => {
+describe("Global Activity Detector Functions", () => {
+  describe("global instance", () => {
+    it("should expose a global ActivityDetector via getActivityDetector", () => {
       const detector = getActivityDetector();
       expect(detector).toBeInstanceOf(ActivityDetector);
     });
   });
 
-  describe('getActivityDetector', () => {
-    it('should always return the global instance', () => {
+  describe("getActivityDetector", () => {
+    it("should always return the global instance", () => {
       const detector = getActivityDetector();
       const detectorAgain = getActivityDetector();
       expect(detectorAgain).toBe(detector);
     });
   });
 
-  describe('recordUserActivity', () => {
+  describe("recordUserActivity", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should record activity on existing detector', () => {
+    it("should record activity on existing detector", () => {
       const detector = getActivityDetector()!;
       const beforeTime = detector.getLastActivityTime();
       vi.advanceTimersByTime(100);
@@ -147,14 +147,14 @@ describe('Global Activity Detector Functions', () => {
     });
   });
 
-  describe('isUserActive', () => {
+  describe("isUserActive", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
     afterEach(() => {
       vi.useRealTimers();
     });
-    it('should reflect global detector state', () => {
+    it("should reflect global detector state", () => {
       expect(isUserActive()).toBe(true);
       // Default idle threshold is 30s; advance beyond it
       vi.advanceTimersByTime(31000);
diff --git a/packages/gemini-core/src/telemetry/activity-monitor.test.ts b/packages/gemini-core/src/telemetry/activity-monitor.test.ts
index 087b89fd0..247b0378c 100644
--- a/packages/gemini-core/src/telemetry/activity-monitor.test.ts
+++ b/packages/gemini-core/src/telemetry/activity-monitor.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { ActivityEvent } from "./activity-monitor.js";
 import {
   ActivityMonitor,
   DEFAULT_ACTIVITY_CONFIG,
-  initializeActivityMonitor,
   getActivityMonitor,
+  initializeActivityMonitor,
   recordGlobalActivity,
   startGlobalActivityMonitoring,
   stopGlobalActivityMonitoring,
-} from './activity-monitor.js';
-import { ActivityType } from './activity-types.js';
-import type { ActivityEvent } from './activity-monitor.js';
-import type { Config } from '../config/config.js';
+} from "./activity-monitor.js";
+import { ActivityType } from "./activity-types.js";
 
 // Mock the dependencies
-vi.mock('./metrics.js', () => ({
+vi.mock("./metrics.js", () => ({
   isPerformanceMonitoringActive: vi.fn(() => true),
 }));
 
-vi.mock('./memory-monitor.js', () => ({
+vi.mock("./memory-monitor.js", () => ({
   getMemoryMonitor: vi.fn(() => ({
     takeSnapshot: vi.fn(() => ({
       timestamp: Date.now(),
@@ -37,14 +37,14 @@ vi.mock('./memory-monitor.js', () => ({
   })),
 }));
 
-describe('ActivityMonitor', () => {
+describe("ActivityMonitor", () => {
   let activityMonitor: ActivityMonitor;
   let mockConfig: Config;
 
   beforeEach(() => {
     vi.clearAllMocks();
     mockConfig = {
-      getSessionId: () => 'test-session-123',
+      getSessionId: () => "test-session-123",
     } as Config;
     activityMonitor = new ActivityMonitor();
   });
@@ -53,14 +53,14 @@ describe('ActivityMonitor', () => {
     activityMonitor.stop();
   });
 
-  describe('constructor', () => {
-    it('should initialize with default config', () => {
+  describe("constructor", () => {
+    it("should initialize with default config", () => {
       const monitor = new ActivityMonitor();
       expect(monitor).toBeDefined();
       expect(monitor.isMonitoringActive()).toBe(false);
     });
 
-    it('should initialize with custom config', () => {
+    it("should initialize with custom config", () => {
       const customConfig = {
         ...DEFAULT_ACTIVITY_CONFIG,
         snapshotThrottleMs: 2000,
@@ -70,8 +70,8 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('start and stop', () => {
-    it('should start and stop monitoring', () => {
+  describe("start and stop", () => {
+    it("should start and stop monitoring", () => {
       expect(activityMonitor.isMonitoringActive()).toBe(false);
 
       activityMonitor.start(mockConfig);
@@ -81,7 +81,7 @@ describe('ActivityMonitor', () => {
       expect(activityMonitor.isMonitoringActive()).toBe(false);
     });
 
-    it('should not start monitoring when already active', () => {
+    it("should not start monitoring when already active", () => {
       activityMonitor.start(mockConfig);
       expect(activityMonitor.isMonitoringActive()).toBe(true);
 
@@ -91,35 +91,28 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('recordActivity', () => {
+  describe("recordActivity", () => {
     beforeEach(() => {
       activityMonitor.start(mockConfig);
     });
 
-    it('should record activity events', () => {
-      activityMonitor.recordActivity(
-        ActivityType.USER_INPUT_START,
-        'test-context',
-      );
+    it("should record activity events", () => {
+      activityMonitor.recordActivity(ActivityType.USER_INPUT_START, "test-context");
 
       const stats = activityMonitor.getActivityStats();
       expect(stats.totalEvents).toBe(2); // includes the start event
       expect(stats.eventTypes[ActivityType.USER_INPUT_START]).toBe(1);
     });
 
-    it('should include metadata in activity events', () => {
-      const metadata = { key: 'value', count: 42 };
-      activityMonitor.recordActivity(
-        ActivityType.MESSAGE_ADDED,
-        'test-context',
-        metadata,
-      );
+    it("should include metadata in activity events", () => {
+      const metadata = { key: "value", count: 42 };
+      activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED, "test-context", metadata);
 
       const recentActivity = activityMonitor.getRecentActivity(1);
       expect(recentActivity[0].metadata).toEqual(metadata);
     });
 
-    it('should not record activity when monitoring is disabled', () => {
+    it("should not record activity when monitoring is disabled", () => {
       activityMonitor.updateConfig({ enabled: false });
 
       activityMonitor.recordActivity(ActivityType.USER_INPUT_START);
@@ -128,15 +121,12 @@ describe('ActivityMonitor', () => {
       expect(stats.totalEvents).toBe(1); // only the start event
     });
 
-    it('should limit event buffer size', () => {
+    it("should limit event buffer size", () => {
       activityMonitor.updateConfig({ maxEventBuffer: 3 });
 
       // Record more events than buffer size
       for (let i = 0; i < 5; i++) {
-        activityMonitor.recordActivity(
-          ActivityType.USER_INPUT_START,
-          `event-${i}`,
-        );
+        activityMonitor.recordActivity(ActivityType.USER_INPUT_START, `event-${i}`);
       }
 
       const stats = activityMonitor.getActivityStats();
@@ -144,7 +134,7 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('listeners', () => {
+  describe("listeners", () => {
     let listenerCallCount: number;
     let lastEvent: ActivityEvent | null;
 
@@ -154,21 +144,21 @@ describe('ActivityMonitor', () => {
       activityMonitor.start(mockConfig);
     });
 
-    it('should notify listeners of activity events', () => {
+    it("should notify listeners of activity events", () => {
       const listener = (event: ActivityEvent) => {
         listenerCallCount++;
         lastEvent = event;
       };
 
       activityMonitor.addListener(listener);
-      activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED, 'test');
+      activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED, "test");
 
       expect(listenerCallCount).toBe(1);
       expect(lastEvent?.type).toBe(ActivityType.MESSAGE_ADDED);
-      expect(lastEvent?.context).toBe('test');
+      expect(lastEvent?.context).toBe("test");
     });
 
-    it('should remove listeners correctly', () => {
+    it("should remove listeners correctly", () => {
       const listener = () => {
         listenerCallCount++;
       };
@@ -182,16 +172,16 @@ describe('ActivityMonitor', () => {
       expect(listenerCallCount).toBe(1); // Should not increase
     });
 
-    it('should handle listener errors gracefully', () => {
+    it("should handle listener errors gracefully", () => {
       const faultyListener = () => {
-        throw new Error('Listener error');
+        throw new Error("Listener error");
       };
       const goodListener = () => {
         listenerCallCount++;
       };
 
       // Spy on console.debug to check error handling
-      const debugSpy = vi.spyOn(console, 'debug').mockImplementation(() => {});
+      const debugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
 
       activityMonitor.addListener(faultyListener);
       activityMonitor.addListener(goodListener);
@@ -205,12 +195,12 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('getActivityStats', () => {
+  describe("getActivityStats", () => {
     beforeEach(() => {
       activityMonitor.start(mockConfig);
     });
 
-    it('should return correct activity statistics', () => {
+    it("should return correct activity statistics", () => {
       activityMonitor.recordActivity(ActivityType.USER_INPUT_START);
       activityMonitor.recordActivity(ActivityType.MESSAGE_ADDED);
       activityMonitor.recordActivity(ActivityType.USER_INPUT_START);
@@ -222,7 +212,7 @@ describe('ActivityMonitor', () => {
       expect(stats.timeRange).toBeDefined();
     });
 
-    it('should return null time range for empty buffer', () => {
+    it("should return null time range for empty buffer", () => {
       const emptyMonitor = new ActivityMonitor();
       const stats = emptyMonitor.getActivityStats();
       expect(stats.totalEvents).toBe(0);
@@ -230,8 +220,8 @@ describe('ActivityMonitor', () => {
     });
   });
 
-  describe('updateConfig', () => {
-    it('should update configuration correctly', () => {
+  describe("updateConfig", () => {
+    it("should update configuration correctly", () => {
       const newConfig = { snapshotThrottleMs: 2000 };
       activityMonitor.updateConfig(newConfig);
 
@@ -241,12 +231,12 @@ describe('ActivityMonitor', () => {
   });
 });
 
-describe('Global activity monitoring functions', () => {
+describe("Global activity monitoring functions", () => {
   let mockConfig: Config;
 
   beforeEach(() => {
     mockConfig = {
-      getSessionId: () => 'test-session-456',
+      getSessionId: () => "test-session-456",
     } as Config;
     vi.clearAllMocks();
   });
@@ -255,32 +245,32 @@ describe('Global activity monitoring functions', () => {
     stopGlobalActivityMonitoring();
   });
 
-  describe('initializeActivityMonitor', () => {
-    it('should create global monitor instance', () => {
+  describe("initializeActivityMonitor", () => {
+    it("should create global monitor instance", () => {
       const monitor = initializeActivityMonitor();
       expect(monitor).toBeDefined();
       expect(getActivityMonitor()).toBe(monitor);
     });
 
-    it('should return same instance on subsequent calls', () => {
+    it("should return same instance on subsequent calls", () => {
       const monitor1 = initializeActivityMonitor();
       const monitor2 = initializeActivityMonitor();
       expect(monitor1).toBe(monitor2);
     });
   });
 
-  describe('recordGlobalActivity', () => {
-    it('should record activity through global monitor', () => {
+  describe("recordGlobalActivity", () => {
+    it("should record activity through global monitor", () => {
       startGlobalActivityMonitoring(mockConfig);
 
-      recordGlobalActivity(ActivityType.TOOL_CALL_SCHEDULED, 'global-test');
+      recordGlobalActivity(ActivityType.TOOL_CALL_SCHEDULED, "global-test");
 
       const monitor = getActivityMonitor();
       const stats = monitor?.getActivityStats();
       expect(stats?.totalEvents).toBeGreaterThan(0);
     });
 
-    it('should handle missing global monitor gracefully', () => {
+    it("should handle missing global monitor gracefully", () => {
       stopGlobalActivityMonitoring();
 
       // Should not throw error
@@ -290,15 +280,15 @@ describe('Global activity monitoring functions', () => {
     });
   });
 
-  describe('startGlobalActivityMonitoring', () => {
-    it('should start global monitoring with default config', () => {
+  describe("startGlobalActivityMonitoring", () => {
+    it("should start global monitoring with default config", () => {
       startGlobalActivityMonitoring(mockConfig);
 
       const monitor = getActivityMonitor();
       expect(monitor?.isMonitoringActive()).toBe(true);
     });
 
-    it('should start global monitoring with custom config', () => {
+    it("should start global monitoring with custom config", () => {
       const customConfig = {
         ...DEFAULT_ACTIVITY_CONFIG,
         snapshotThrottleMs: 3000,
@@ -311,8 +301,8 @@ describe('Global activity monitoring functions', () => {
     });
   });
 
-  describe('stopGlobalActivityMonitoring', () => {
-    it('should stop global monitoring', () => {
+  describe("stopGlobalActivityMonitoring", () => {
+    it("should stop global monitoring", () => {
       startGlobalActivityMonitoring(mockConfig);
       expect(getActivityMonitor()?.isMonitoringActive()).toBe(true);
 
@@ -320,7 +310,7 @@ describe('Global activity monitoring functions', () => {
       expect(getActivityMonitor()?.isMonitoringActive()).toBe(false);
     });
 
-    it('should handle missing global monitor gracefully', () => {
+    it("should handle missing global monitor gracefully", () => {
       expect(() => {
         stopGlobalActivityMonitoring();
       }).not.toThrow();
diff --git a/packages/gemini-core/src/telemetry/activity-monitor.ts b/packages/gemini-core/src/telemetry/activity-monitor.ts
index 2c9393bdb..fe609aeb7 100644
--- a/packages/gemini-core/src/telemetry/activity-monitor.ts
+++ b/packages/gemini-core/src/telemetry/activity-monitor.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '../config/config.js';
-import { isPerformanceMonitoringActive } from './metrics.js';
-import { getMemoryMonitor } from './memory-monitor.js';
-import { ActivityType } from './activity-types.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { ActivityType } from "./activity-types.js";
+import { getMemoryMonitor } from "./memory-monitor.js";
+import { isPerformanceMonitoringActive } from "./metrics.js";
 
 /**
  * Activity event data structure
@@ -86,10 +86,7 @@ export class ActivityMonitor {
     this.addListener(this.memoryMonitoringListener);
 
     // Record activity monitoring start
-    this.recordActivity(
-      ActivityType.MANUAL_TRIGGER,
-      'activity_monitoring_start',
-    );
+    this.recordActivity(ActivityType.MANUAL_TRIGGER, "activity_monitoring_start");
   }
 
   /**
@@ -125,11 +122,7 @@ export class ActivityMonitor {
   /**
    * Record a user activity event
    */
-  recordActivity(
-    type: ActivityType,
-    context?: string,
-    metadata?: Record<string, unknown>,
-  ): void {
+  recordActivity(type: ActivityType, context?: string, metadata?: Record<string, unknown>): void {
     if (!this.isActive || !this.config.enabled) {
       return;
     }
@@ -153,7 +146,7 @@ export class ActivityMonitor {
         listener(event);
       } catch (error) {
         // Silently catch listener errors to avoid disrupting the application
-        debugLogger.debug('ActivityMonitor listener error:', error);
+        debugLogger.debug("ActivityMonitor listener error:", error);
       }
     });
   }
@@ -201,10 +194,7 @@ export class ActivityMonitor {
   /**
    * Handle memory monitoring for activity events
    */
-  private handleMemoryMonitoringActivity(
-    event: ActivityEvent,
-    config: Config,
-  ): void {
+  private handleMemoryMonitoringActivity(event: ActivityEvent, config: Config): void {
     // Check if this activity type should trigger memory monitoring
     if (!this.config.triggerActivities.includes(event.type)) {
       return;
@@ -243,9 +233,7 @@ let globalActivityMonitor: ActivityMonitor | null = null;
 /**
  * Initialize global activity monitor
  */
-export function initializeActivityMonitor(
-  config?: ActivityMonitorConfig,
-): ActivityMonitor {
+export function initializeActivityMonitor(config?: ActivityMonitorConfig): ActivityMonitor {
   if (!globalActivityMonitor) {
     globalActivityMonitor = new ActivityMonitor(config);
   }
diff --git a/packages/gemini-core/src/telemetry/activity-types.ts b/packages/gemini-core/src/telemetry/activity-types.ts
index c970a725c..aff0ff822 100644
--- a/packages/gemini-core/src/telemetry/activity-types.ts
+++ b/packages/gemini-core/src/telemetry/activity-types.ts
@@ -8,13 +8,13 @@
  * Types of user activities that can be tracked
  */
 export enum ActivityType {
-  USER_INPUT_START = 'user_input_start',
-  USER_INPUT_END = 'user_input_end',
-  MESSAGE_ADDED = 'message_added',
-  TOOL_CALL_SCHEDULED = 'tool_call_scheduled',
-  TOOL_CALL_COMPLETED = 'tool_call_completed',
-  STREAM_START = 'stream_start',
-  STREAM_END = 'stream_end',
-  HISTORY_UPDATED = 'history_updated',
-  MANUAL_TRIGGER = 'manual_trigger',
+  USER_INPUT_START = "user_input_start",
+  USER_INPUT_END = "user_input_end",
+  MESSAGE_ADDED = "message_added",
+  TOOL_CALL_SCHEDULED = "tool_call_scheduled",
+  TOOL_CALL_COMPLETED = "tool_call_completed",
+  STREAM_START = "stream_start",
+  STREAM_END = "stream_end",
+  HISTORY_UPDATED = "history_updated",
+  MANUAL_TRIGGER = "manual_trigger",
 }
diff --git a/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts b/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts
index 9eca914db..1ec33807f 100644
--- a/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts
+++ b/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.test.ts
@@ -4,39 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import 'vitest';
+import "vitest";
+import { HttpResponse, http } from "msw";
+import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
+import { AgentTerminateMode } from "../../agents/types.js";
+import type { ConfigParameters } from "../../config/config.js";
+import type { ContentGeneratorConfig } from "../../core/contentGenerator.js";
+import { AuthType } from "../../core/contentGenerator.js";
+import type { SuccessfulToolCall } from "../../core/coreToolScheduler.js";
+import { CLI_VERSION, GIT_COMMIT_INFO } from "../../generated/git-commit.js";
+import { server } from "../../mocks/msw.js";
+import { makeFakeConfig } from "../../test-utils/config.js";
+import { InstallationManager } from "../../utils/installationManager.js";
+import { UserAccountManager } from "../../utils/userAccountManager.js";
 import {
-  vi,
-  describe,
-  it,
-  expect,
-  afterEach,
-  beforeAll,
-  afterAll,
-} from 'vitest';
-import type { LogEvent, LogEventEntry } from './clearcut-logger.js';
-import { ClearcutLogger, EventNames, TEST_ONLY } from './clearcut-logger.js';
-import type { ContentGeneratorConfig } from '../../core/contentGenerator.js';
-import { AuthType } from '../../core/contentGenerator.js';
-import type { SuccessfulToolCall } from '../../core/coreToolScheduler.js';
-import type { ConfigParameters } from '../../config/config.js';
-import { EventMetadataKey } from './event-metadata-key.js';
-import { makeFakeConfig } from '../../test-utils/config.js';
-import { http, HttpResponse } from 'msw';
-import { server } from '../../mocks/msw.js';
-import {
-  UserPromptEvent,
-  makeChatCompressionEvent,
+  AgentFinishEvent,
+  AgentStartEvent,
   ModelRoutingEvent,
+  makeChatCompressionEvent,
   ToolCallEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
+  UserPromptEvent,
   WebFetchFallbackAttemptEvent,
-} from '../types.js';
-import { AgentTerminateMode } from '../../agents/types.js';
-import { GIT_COMMIT_INFO, CLI_VERSION } from '../../generated/git-commit.js';
-import { UserAccountManager } from '../../utils/userAccountManager.js';
-import { InstallationManager } from '../../utils/installationManager.js';
+} from "../types.js";
+import type { LogEvent, LogEventEntry } from "./clearcut-logger.js";
+import { ClearcutLogger, EventNames, TEST_ONLY } from "./clearcut-logger.js";
+import { EventMetadataKey } from "./event-metadata-key.js";
 
 interface CustomMatchers<R = unknown> {
   toHaveMetadataValue: ([key, value]: [EventMetadataKey, string]) => R;
@@ -45,7 +37,7 @@ interface CustomMatchers<R = unknown> {
   toHaveGwsExperiments: (exps: number[]) => R;
 }
 
-declare module 'vitest' {
+declare module "vitest" {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-object-type
   interface Matchers<T = any> extends CustomMatchers<T> {}
 }
@@ -57,40 +49,34 @@ expect.extend({
     const pass = event.event_name === (name as unknown as string);
     return {
       pass,
-      message: () =>
-        `event name ${event.event_name} does${isNot ? ' not ' : ''} match ${name}}`,
+      message: () => `event name ${event.event_name} does${isNot ? " not " : ""} match ${name}}`,
     };
   },
 
-  toHaveMetadataValue(
-    received: LogEventEntry[],
-    [key, value]: [EventMetadataKey, string],
-  ) {
+  toHaveMetadataValue(received: LogEventEntry[], [key, value]: [EventMetadataKey, string]) {
     const { isNot } = this;
     const event = JSON.parse(received[0].source_extension_json) as LogEvent;
-    const metadata = event['event_metadata'][0];
+    const metadata = event["event_metadata"][0];
     const data = metadata.find((m) => m.gemini_cli_key === key)?.value;
 
     const pass = data !== undefined && data === value;
 
     return {
       pass,
-      message: () =>
-        `event ${received} does${isNot ? ' not' : ''} have ${value}}`,
+      message: () => `event ${received} does${isNot ? " not" : ""} have ${value}}`,
     };
   },
 
   toHaveMetadataKey(received: LogEventEntry[], key: EventMetadataKey) {
     const { isNot } = this;
     const event = JSON.parse(received[0].source_extension_json) as LogEvent;
-    const metadata = event['event_metadata'][0];
+    const metadata = event["event_metadata"][0];
 
     const pass = metadata.some((m) => m.gemini_cli_key === key);
 
     return {
       pass,
-      message: () =>
-        `event ${received} ${isNot ? 'has' : 'does not have'} the metadata key ${key}`,
+      message: () => `event ${received} ${isNot ? "has" : "does not have"} the metadata key ${key}`,
     };
   },
 
@@ -105,13 +91,13 @@ expect.extend({
     return {
       pass,
       message: () =>
-        `event ${received} ${isNot ? 'has' : 'does not have'} expected exp ids: ${expected_exps.join(',')}`,
+        `event ${received} ${isNot ? "has" : "does not have"} expected exp ids: ${expected_exps.join(",")}`,
     };
   },
 });
 
-vi.mock('../../utils/userAccountManager.js');
-vi.mock('../../utils/installationManager.js');
+vi.mock("../../utils/userAccountManager.js");
+vi.mock("../../utils/installationManager.js");
 
 const mockUserAccount = vi.mocked(UserAccountManager.prototype);
 const mockInstallMgr = vi.mocked(InstallationManager.prototype);
@@ -129,20 +115,20 @@ afterAll(() => {
   server.close();
 });
 
-describe('ClearcutLogger', () => {
+describe("ClearcutLogger", () => {
   const NEXT_WAIT_MS = 1234;
-  const CLEARCUT_URL = 'https://play.googleapis.com/log';
-  const MOCK_DATE = new Date('2025-01-02T00:00:00.000Z');
+  const CLEARCUT_URL = "https://play.googleapis.com/log";
+  const MOCK_DATE = new Date("2025-01-02T00:00:00.000Z");
   const EXAMPLE_RESPONSE = `["${NEXT_WAIT_MS}",null,[[["ANDROID_BACKUP",0],["BATTERY_STATS",0],["SMART_SETUP",0],["TRON",0]],-3334737594024971225],[]]`;
 
   // A helper to get the internal events array for testing
   const getEvents = (l: ClearcutLogger): LogEventEntry[][] =>
-    l['events'].toArray() as LogEventEntry[][];
+    l["events"].toArray() as LogEventEntry[][];
 
-  const getEventsSize = (l: ClearcutLogger): number => l['events'].size;
+  const getEventsSize = (l: ClearcutLogger): number => l["events"].size;
 
   const requeueFailedEvents = (l: ClearcutLogger, events: LogEventEntry[][]) =>
-    l['requeueFailedEvents'](events);
+    l["requeueFailedEvents"](events);
 
   afterEach(() => {
     vi.unstubAllEnvs();
@@ -155,11 +141,9 @@ describe('ClearcutLogger', () => {
       },
     } as unknown as Partial<ConfigParameters>,
     lifetimeGoogleAccounts = 1,
-    cachedGoogleAccount = 'test@google.com',
+    cachedGoogleAccount = "test@google.com",
   } = {}) {
-    server.resetHandlers(
-      http.post(CLEARCUT_URL, () => HttpResponse.text(EXAMPLE_RESPONSE)),
-    );
+    server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.text(EXAMPLE_RESPONSE)));
 
     vi.useFakeTimers();
     vi.setSystemTime(MOCK_DATE);
@@ -170,12 +154,8 @@ describe('ClearcutLogger', () => {
     ClearcutLogger.clearInstance();
 
     mockUserAccount.getCachedGoogleAccount.mockReturnValue(cachedGoogleAccount);
-    mockUserAccount.getLifetimeGoogleAccounts.mockReturnValue(
-      lifetimeGoogleAccounts,
-    );
-    mockInstallMgr.getInstallationId = vi
-      .fn()
-      .mockReturnValue('test-installation-id');
+    mockUserAccount.getLifetimeGoogleAccounts.mockReturnValue(lifetimeGoogleAccounts);
+    mockInstallMgr.getInstallationId = vi.fn().mockReturnValue("test-installation-id");
 
     const logger = ClearcutLogger.getInstance(loggerConfig);
 
@@ -188,27 +168,27 @@ describe('ClearcutLogger', () => {
     vi.restoreAllMocks();
   });
 
-  describe('getInstance', () => {
+  describe("getInstance", () => {
     it.each([
       { usageStatisticsEnabled: false, expectedValue: undefined },
       {
         usageStatisticsEnabled: true,
         expectedValue: expect.any(ClearcutLogger),
       },
-    ])(
-      'returns an instance if usage statistics are enabled',
-      ({ usageStatisticsEnabled, expectedValue }) => {
-        ClearcutLogger.clearInstance();
-        const { logger } = setup({
-          config: {
-            usageStatisticsEnabled,
-          },
-        });
-        expect(logger).toEqual(expectedValue);
-      },
-    );
+    ])("returns an instance if usage statistics are enabled", ({
+      usageStatisticsEnabled,
+      expectedValue,
+    }) => {
+      ClearcutLogger.clearInstance();
+      const { logger } = setup({
+        config: {
+          usageStatisticsEnabled,
+        },
+      });
+      expect(logger).toEqual(expectedValue);
+    });
 
-    it('is a singleton', () => {
+    it("is a singleton", () => {
       ClearcutLogger.clearInstance();
       const { loggerConfig } = setup();
       const logger1 = ClearcutLogger.getInstance(loggerConfig);
@@ -217,8 +197,8 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('createLogEvent', () => {
-    it('logs the total number of google accounts', () => {
+  describe("createLogEvent", () => {
+    it("logs the total number of google accounts", () => {
       const { logger } = setup({
         lifetimeGoogleAccounts: 9001,
       });
@@ -227,19 +207,19 @@ describe('ClearcutLogger', () => {
 
       expect(event?.event_metadata[0]).toContainEqual({
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
-        value: '9001',
+        value: "9001",
       });
     });
 
-    it('logs default metadata', () => {
+    it("logs default metadata", () => {
       // Define expected values
-      const session_id = 'my-session-id';
+      const session_id = "my-session-id";
       const auth_type = AuthType.USE_GEMINI;
       const google_accounts = 123;
-      const surface = 'ide-1234';
+      const surface = "ide-1234";
       const cli_version = CLI_VERSION;
       const git_commit_hash = GIT_COMMIT_INFO;
-      const prompt_id = 'my-prompt-123';
+      const prompt_id = "my-prompt-123";
 
       // Setup logger with expected values
       const { logger, loggerConfig } = setup({
@@ -247,11 +227,11 @@ describe('ClearcutLogger', () => {
         config: { sessionId: session_id },
       });
 
-      vi.spyOn(loggerConfig, 'getContentGeneratorConfig').mockReturnValue({
+      vi.spyOn(loggerConfig, "getContentGeneratorConfig").mockReturnValue({
         authType: auth_type,
       } as ContentGeneratorConfig);
       logger?.logNewPromptEvent(new UserPromptEvent(1, prompt_id)); // prompt_id == session_id before this
-      vi.stubEnv('SURFACE', surface);
+      vi.stubEnv("SURFACE", surface);
 
       // Create log event
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
@@ -299,7 +279,7 @@ describe('ClearcutLogger', () => {
       );
     });
 
-    it('logs the current nodejs version', () => {
+    it("logs the current nodejs version", () => {
       const { logger } = setup({});
 
       const event = logger?.createLogEvent(EventNames.API_ERROR, []);
@@ -310,13 +290,13 @@ describe('ClearcutLogger', () => {
       });
     });
 
-    it('logs all user settings', () => {
+    it("logs all user settings", () => {
       const { logger } = setup({
         config: { useSmartEdit: true, useModelRouter: true },
       });
 
-      vi.stubEnv('TERM_PROGRAM', 'vscode');
-      vi.stubEnv('SURFACE', 'ide-1234');
+      vi.stubEnv("TERM_PROGRAM", "vscode");
+      vi.stubEnv("SURFACE", "ide-1234");
 
       const event = logger?.createLogEvent(EventNames.TOOL_CALL, []);
 
@@ -334,93 +314,90 @@ describe('ClearcutLogger', () => {
 
     it.each<SurfaceDetectionTestCase>([
       {
-        name: 'github action',
-        env: { GITHUB_SHA: '8675309' },
-        expected: 'GitHub',
+        name: "github action",
+        env: { GITHUB_SHA: "8675309" },
+        expected: "GitHub",
       },
       {
-        name: 'Cloud Shell via EDITOR_IN_CLOUD_SHELL',
-        env: { EDITOR_IN_CLOUD_SHELL: 'true' },
-        expected: 'cloudshell',
+        name: "Cloud Shell via EDITOR_IN_CLOUD_SHELL",
+        env: { EDITOR_IN_CLOUD_SHELL: "true" },
+        expected: "cloudshell",
       },
       {
-        name: 'Cloud Shell via CLOUD_SHELL',
-        env: { CLOUD_SHELL: 'true' },
-        expected: 'cloudshell',
+        name: "Cloud Shell via CLOUD_SHELL",
+        env: { CLOUD_SHELL: "true" },
+        expected: "cloudshell",
       },
       {
-        name: 'VSCode via TERM_PROGRAM',
+        name: "VSCode via TERM_PROGRAM",
         env: {
-          TERM_PROGRAM: 'vscode',
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
-          MONOSPACE_ENV: '',
+          MONOSPACE_ENV: "",
         },
-        expected: 'vscode',
+        expected: "vscode",
       },
       {
-        name: 'SURFACE env var',
-        env: { SURFACE: 'ide-1234' },
-        expected: 'ide-1234',
+        name: "SURFACE env var",
+        env: { SURFACE: "ide-1234" },
+        expected: "ide-1234",
       },
       {
-        name: 'SURFACE env var takes precedence',
-        env: { TERM_PROGRAM: 'vscode', SURFACE: 'ide-1234' },
-        expected: 'ide-1234',
+        name: "SURFACE env var takes precedence",
+        env: { TERM_PROGRAM: "vscode", SURFACE: "ide-1234" },
+        expected: "ide-1234",
       },
       {
-        name: 'Cursor',
+        name: "Cursor",
         env: {
-          CURSOR_TRACE_ID: 'abc123',
-          TERM_PROGRAM: 'vscode',
+          CURSOR_TRACE_ID: "abc123",
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
         },
-        expected: 'cursor',
+        expected: "cursor",
       },
       {
-        name: 'Firebase Studio',
+        name: "Firebase Studio",
         env: {
-          MONOSPACE_ENV: 'true',
-          TERM_PROGRAM: 'vscode',
+          MONOSPACE_ENV: "true",
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
         },
-        expected: 'firebasestudio',
+        expected: "firebasestudio",
       },
       {
-        name: 'Devin',
+        name: "Devin",
         env: {
-          __COG_BASHRC_SOURCED: 'true',
-          TERM_PROGRAM: 'vscode',
+          __COG_BASHRC_SOURCED: "true",
+          TERM_PROGRAM: "vscode",
           GITHUB_SHA: undefined,
         },
-        expected: 'devin',
+        expected: "devin",
       },
       {
-        name: 'unidentified',
+        name: "unidentified",
         env: {
           GITHUB_SHA: undefined,
           TERM_PROGRAM: undefined,
           SURFACE: undefined,
         },
-        expected: 'SURFACE_NOT_SET',
+        expected: "SURFACE_NOT_SET",
       },
-    ])(
-      'logs the current surface as $expected from $name',
-      ({ env, expected }) => {
-        const { logger } = setup({});
-        for (const [key, value] of Object.entries(env)) {
-          vi.stubEnv(key, value);
-        }
-        const event = logger?.createLogEvent(EventNames.API_ERROR, []);
-        expect(event?.event_metadata[0]).toContainEqual({
-          gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
-          value: expected,
-        });
-      },
-    );
+    ])("logs the current surface as $expected from $name", ({ env, expected }) => {
+      const { logger } = setup({});
+      for (const [key, value] of Object.entries(env)) {
+        vi.stubEnv(key, value);
+      }
+      const event = logger?.createLogEvent(EventNames.API_ERROR, []);
+      expect(event?.event_metadata[0]).toContainEqual({
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_SURFACE,
+        value: expected,
+      });
+    });
   });
 
-  describe('logChatCompressionEvent', () => {
-    it('logs an event with proper fields', () => {
+  describe("logChatCompressionEvent", () => {
+    it("logs an event with proper fields", () => {
       const { logger } = setup();
       logger?.logChatCompressionEvent(
         makeChatCompressionEvent({
@@ -434,22 +411,22 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.CHAT_COMPRESSION);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_COMPRESSION_TOKENS_BEFORE,
-        '9001',
+        "9001",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_COMPRESSION_TOKENS_AFTER,
-        '8000',
+        "8000",
       ]);
     });
   });
 
-  describe('logRipgrepFallbackEvent', () => {
-    it('logs an event with the proper name', () => {
+  describe("logRipgrepFallbackEvent", () => {
+    it("logs an event with the proper name", () => {
       const { logger } = setup();
       // Spy on flushToClearcut to prevent it from clearing the queue
       const flushSpy = vi
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .spyOn(logger!, 'flushToClearcut' as any)
+        .spyOn(logger!, "flushToClearcut" as any)
         .mockResolvedValue({ nextRequestWaitMs: 0 });
 
       logger?.logRipgrepFallbackEvent();
@@ -461,14 +438,14 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('enqueueLogEvent', () => {
-    it('should add events to the queue', () => {
+  describe("enqueueLogEvent", () => {
+    it("should add events to the queue", () => {
       const { logger } = setup();
       logger!.enqueueLogEvent(logger!.createLogEvent(EventNames.API_ERROR));
       expect(getEventsSize(logger!)).toBe(1);
     });
 
-    it('should evict the oldest event when the queue is full', () => {
+    it("should evict the oldest event when the queue is full", () => {
       const { logger } = setup();
 
       for (let i = 0; i < TEST_ONLY.MAX_EVENTS; i++) {
@@ -484,10 +461,7 @@ describe('ClearcutLogger', () => {
 
       let events = getEvents(logger!);
       expect(events.length).toBe(TEST_ONLY.MAX_EVENTS);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '0',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "0"]);
 
       // This should push out the first event
       logger!.enqueueLogEvent(
@@ -500,10 +474,7 @@ describe('ClearcutLogger', () => {
       );
       events = getEvents(logger!);
       expect(events.length).toBe(TEST_ONLY.MAX_EVENTS);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '1',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "1"]);
 
       expect(events.at(TEST_ONLY.MAX_EVENTS - 1)).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
@@ -512,11 +483,11 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('flushToClearcut', () => {
-    it('allows for usage with a configured proxy agent', async () => {
+  describe("flushToClearcut", () => {
+    it("allows for usage with a configured proxy agent", async () => {
       const { logger } = setup({
         config: {
-          proxy: 'http://mycoolproxy.whatever.com:3128',
+          proxy: "http://mycoolproxy.whatever.com:3128",
         },
       });
 
@@ -527,7 +498,7 @@ describe('ClearcutLogger', () => {
       expect(response.nextRequestWaitMs).toBe(NEXT_WAIT_MS);
     });
 
-    it('should clear events on successful flush', async () => {
+    it("should clear events on successful flush", async () => {
       const { logger } = setup();
 
       logger!.enqueueLogEvent(logger!.createLogEvent(EventNames.API_ERROR));
@@ -537,7 +508,7 @@ describe('ClearcutLogger', () => {
       expect(response.nextRequestWaitMs).toBe(NEXT_WAIT_MS);
     });
 
-    it('should handle a network error and requeue events', async () => {
+    it("should handle a network error and requeue events", async () => {
       const { logger } = setup();
 
       server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.error()));
@@ -555,7 +526,7 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.API_REQUEST);
     });
 
-    it('should handle an HTTP error and requeue events', async () => {
+    it("should handle an HTTP error and requeue events", async () => {
       const { logger } = setup();
 
       server.resetHandlers(
@@ -563,7 +534,7 @@ describe('ClearcutLogger', () => {
           CLEARCUT_URL,
           () =>
             new HttpResponse(
-              { 'the system is down': true },
+              { "the system is down": true },
               {
                 status: 500,
               },
@@ -583,8 +554,8 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('requeueFailedEvents logic', () => {
-    it('should limit the number of requeued events to max_retry_events', () => {
+  describe("requeueFailedEvents logic", () => {
+    it("should limit the number of requeued events to max_retry_events", () => {
       const { logger } = setup();
       const eventsToLogCount = TEST_ONLY.MAX_RETRY_EVENTS + 5;
       const eventsToSend: LogEventEntry[][] = [];
@@ -601,16 +572,14 @@ describe('ClearcutLogger', () => {
       requeueFailedEvents(logger!, eventsToSend);
 
       expect(getEventsSize(logger!)).toBe(TEST_ONLY.MAX_RETRY_EVENTS);
-      const firstRequeuedEvent = JSON.parse(
-        getEvents(logger!)[0][0].source_extension_json,
-      ) as { event_id: string };
+      const firstRequeuedEvent = JSON.parse(getEvents(logger!)[0][0].source_extension_json) as {
+        event_id: string;
+      };
       // The last `maxRetryEvents` are kept. The oldest of those is at index `eventsToLogCount - maxRetryEvents`.
-      expect(firstRequeuedEvent.event_id).toBe(
-        eventsToLogCount - TEST_ONLY.MAX_RETRY_EVENTS,
-      );
+      expect(firstRequeuedEvent.event_id).toBe(eventsToLogCount - TEST_ONLY.MAX_RETRY_EVENTS);
     });
 
-    it('should not requeue more events than available space in the queue', () => {
+    it("should not requeue more events than available space in the queue", () => {
       const { logger } = setup();
       const maxEvents = TEST_ONLY.MAX_EVENTS;
       const spaceToLeave = 5;
@@ -642,21 +611,21 @@ describe('ClearcutLogger', () => {
       // startIndex = max(0, 10 - 5) = 5.
       // Loop unshifts events from index 9 down to 5.
       // The first element in the deque is the one with id 'failed_5'.
-      const firstRequeuedEvent = JSON.parse(
-        getEvents(logger!)[0][0].source_extension_json,
-      ) as { event_id: string };
-      expect(firstRequeuedEvent.event_id).toBe('failed_5');
+      const firstRequeuedEvent = JSON.parse(getEvents(logger!)[0][0].source_extension_json) as {
+        event_id: string;
+      };
+      expect(firstRequeuedEvent.event_id).toBe("failed_5");
     });
   });
 
-  describe('logModelRoutingEvent', () => {
-    it('logs a successful routing event', () => {
+  describe("logModelRoutingEvent", () => {
+    it("logs a successful routing event", () => {
       const { logger } = setup();
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default-strategy',
+        "gemini-pro",
+        "default-strategy",
         123,
-        'some reasoning',
+        "some reasoning",
         false,
         undefined,
       );
@@ -668,31 +637,28 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.MODEL_ROUTING);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION,
-        'gemini-pro',
+        "gemini-pro",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION_SOURCE,
-        'default-strategy',
+        "default-strategy",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_LATENCY_MS,
-        '123',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE,
-        'false',
+        "123",
       ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE, "false"]);
     });
 
-    it('logs a failed routing event with a reason', () => {
+    it("logs a failed routing event with a reason", () => {
       const { logger } = setup();
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'router-exception',
+        "gemini-pro",
+        "router-exception",
         234,
-        'some reasoning',
+        "some reasoning",
         true,
-        'Something went wrong',
+        "Something went wrong",
       );
 
       logger?.logModelRoutingEvent(event);
@@ -702,52 +668,43 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.MODEL_ROUTING);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION,
-        'gemini-pro',
+        "gemini-pro",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_DECISION_SOURCE,
-        'router-exception',
+        "router-exception",
       ]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_LATENCY_MS,
-        '234',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE,
-        'true',
+        "234",
       ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE, "true"]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_ROUTING_FAILURE_REASON,
-        'Something went wrong',
+        "Something went wrong",
       ]);
     });
   });
 
-  describe('logAgentStartEvent', () => {
-    it('logs an event with proper fields', () => {
+  describe("logAgentStartEvent", () => {
+    it("logs an event with proper fields", () => {
       const { logger } = setup();
-      const event = new AgentStartEvent('agent-123', 'TestAgent');
+      const event = new AgentStartEvent("agent-123", "TestAgent");
 
       logger?.logAgentStartEvent(event);
 
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.AGENT_START);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_ID,
-        'agent-123',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_NAME,
-        'TestAgent',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_ID, "agent-123"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_NAME, "TestAgent"]);
     });
   });
 
-  describe('logExperiments', () => {
-    it('logs an event with gws_experiment field containing exp ids', () => {
+  describe("logExperiments", () => {
+    it("logs an event with gws_experiment field containing exp ids", () => {
       const { logger } = setup();
-      const event = new AgentStartEvent('agent-123', 'TestAgent');
+      const event = new AgentStartEvent("agent-123", "TestAgent");
 
       logger?.logAgentStartEvent(event);
 
@@ -758,12 +715,12 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('logAgentFinishEvent', () => {
-    it('logs an event with proper fields (success)', () => {
+  describe("logAgentFinishEvent", () => {
+    it("logs an event with proper fields (success)", () => {
       const { logger } = setup();
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -774,33 +731,24 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.AGENT_FINISH);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_ID,
-        'agent-123',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_NAME,
-        'TestAgent',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_ID, "agent-123"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_NAME, "TestAgent"]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AGENT_DURATION_MS,
-        '1000',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AGENT_TURN_COUNT,
-        '5',
+        "1000",
       ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AGENT_TURN_COUNT, "5"]);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AGENT_TERMINATE_REASON,
-        'GOAL',
+        "GOAL",
       ]);
     });
 
-    it('logs an event with proper fields (error)', () => {
+    it("logs an event with proper fields (error)", () => {
       const { logger } = setup();
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         500,
         2,
         AgentTerminateMode.ERROR,
@@ -813,16 +761,16 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.AGENT_FINISH);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_AGENT_TERMINATE_REASON,
-        'ERROR',
+        "ERROR",
       ]);
     });
   });
 
-  describe('logToolCallEvent', () => {
-    it('logs an event with all diff metadata', () => {
+  describe("logToolCallEvent", () => {
+    it("logs an event with all diff metadata", () => {
       const { logger } = setup();
       const completedToolCall = {
-        request: { name: 'test', args: {}, prompt_id: 'prompt-123' },
+        request: { name: "test", args: {}, prompt_id: "prompt-123" },
         response: {
           resultDisplay: {
             diffStat: {
@@ -837,7 +785,7 @@ describe('ClearcutLogger', () => {
             },
           },
         },
-        status: 'success',
+        status: "success",
       } as SuccessfulToolCall;
 
       logger?.logToolCallEvent(new ToolCallEvent(completedToolCall));
@@ -845,44 +793,20 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.TOOL_CALL);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '1',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES,
-        '2',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS,
-        '3',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS,
-        '4',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES,
-        '5',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES,
-        '6',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS,
-        '7',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS,
-        '8',
-      ]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "1"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES, "2"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS, "3"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS, "4"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES, "5"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES, "6"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS, "7"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS, "8"]);
     });
 
-    it('logs an event with partial diff metadata', () => {
+    it("logs an event with partial diff metadata", () => {
       const { logger } = setup();
       const completedToolCall = {
-        request: { name: 'test', args: {}, prompt_id: 'prompt-123' },
+        request: { name: "test", args: {}, prompt_id: "prompt-123" },
         response: {
           resultDisplay: {
             diffStat: {
@@ -893,7 +817,7 @@ describe('ClearcutLogger', () => {
             },
           },
         },
-        status: 'success',
+        status: "success",
       } as SuccessfulToolCall;
 
       logger?.logToolCallEvent(new ToolCallEvent(completedToolCall));
@@ -901,44 +825,24 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.TOOL_CALL);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-        '1',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES,
-        '2',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS,
-        '3',
-      ]);
-      expect(events[0]).toHaveMetadataValue([
-        EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS,
-        '4',
-      ]);
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES,
-      );
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES,
-      );
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS,
-      );
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS,
-      );
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES, "1"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_LINES, "2"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_ADDED_CHARS, "3"]);
+      expect(events[0]).toHaveMetadataValue([EventMetadataKey.GEMINI_CLI_AI_REMOVED_CHARS, "4"]);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_ADDED_LINES);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_REMOVED_LINES);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_ADDED_CHARS);
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_USER_REMOVED_CHARS);
     });
 
-    it('does not log diff metadata if diffStat is not present', () => {
+    it("does not log diff metadata if diffStat is not present", () => {
       const { logger } = setup();
       const completedToolCall = {
-        request: { name: 'test', args: {}, prompt_id: 'prompt-123' },
+        request: { name: "test", args: {}, prompt_id: "prompt-123" },
         response: {
           resultDisplay: {},
         },
-        status: 'success',
+        status: "success",
       } as SuccessfulToolCall;
 
       logger?.logToolCallEvent(new ToolCallEvent(completedToolCall));
@@ -946,29 +850,27 @@ describe('ClearcutLogger', () => {
       const events = getEvents(logger!);
       expect(events.length).toBe(1);
       expect(events[0]).toHaveEventName(EventNames.TOOL_CALL);
-      expect(events[0]).not.toHaveMetadataKey(
-        EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES,
-      );
+      expect(events[0]).not.toHaveMetadataKey(EventMetadataKey.GEMINI_CLI_AI_ADDED_LINES);
     });
   });
 
-  describe('flushIfNeeded', () => {
-    it('should not flush if the interval has not passed', () => {
+  describe("flushIfNeeded", () => {
+    it("should not flush if the interval has not passed", () => {
       const { logger } = setup();
       const flushSpy = vi
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .spyOn(logger!, 'flushToClearcut' as any)
+        .spyOn(logger!, "flushToClearcut" as any)
         .mockResolvedValue({ nextRequestWaitMs: 0 });
 
       logger!.flushIfNeeded();
       expect(flushSpy).not.toHaveBeenCalled();
     });
 
-    it('should flush if the interval has passed', async () => {
+    it("should flush if the interval has passed", async () => {
       const { logger } = setup();
       const flushSpy = vi
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        .spyOn(logger!, 'flushToClearcut' as any)
+        .spyOn(logger!, "flushToClearcut" as any)
         .mockResolvedValue({ nextRequestWaitMs: 0 });
 
       // Advance time by more than the flush interval
@@ -979,10 +881,10 @@ describe('ClearcutLogger', () => {
     });
   });
 
-  describe('logWebFetchFallbackAttemptEvent', () => {
-    it('logs an event with the proper name and reason', () => {
+  describe("logWebFetchFallbackAttemptEvent", () => {
+    it("logs an event with the proper name and reason", () => {
       const { logger } = setup();
-      const event = new WebFetchFallbackAttemptEvent('private_ip');
+      const event = new WebFetchFallbackAttemptEvent("private_ip");
 
       logger?.logWebFetchFallbackAttemptEvent(event);
 
@@ -991,7 +893,7 @@ describe('ClearcutLogger', () => {
       expect(events[0]).toHaveEventName(EventNames.WEB_FETCH_FALLBACK_ATTEMPT);
       expect(events[0]).toHaveMetadataValue([
         EventMetadataKey.GEMINI_CLI_WEB_FETCH_FALLBACK_REASON,
-        'private_ip',
+        "private_ip",
       ]);
     });
   });
diff --git a/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.ts b/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.ts
index a465e9dec..d3ea349ff 100644
--- a/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.ts
+++ b/packages/gemini-core/src/telemetry/clearcut-logger/clearcut-logger.ts
@@ -4,96 +4,92 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { HttpsProxyAgent } from 'https-proxy-agent';
+import { HttpsProxyAgent } from "https-proxy-agent";
+import { FixedDeque } from "mnemonist";
+import type { Config } from "../../config/config.js";
+import { CLI_VERSION, GIT_COMMIT_INFO } from "../../generated/git-commit.js";
+import { detectIdeFromEnv, IDE_DEFINITIONS, isCloudShell } from "../../ide/detect-ide.js";
+import { debugLogger } from "../../utils/debugLogger.js";
+import { InstallationManager } from "../../utils/installationManager.js";
+import {
+  safeJsonStringify,
+  safeJsonStringifyBooleanValuesOnly,
+} from "../../utils/safeJsonStringify.js";
+import { UserAccountManager } from "../../utils/userAccountManager.js";
 import type {
-  StartSessionEvent,
-  UserPromptEvent,
-  ToolCallEvent,
+  AgentFinishEvent,
+  AgentStartEvent,
+  ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
-  ApiErrorEvent,
-  LoopDetectedEvent,
-  NextSpeakerCheckEvent,
-  SlashCommandEvent,
-  MalformedJsonResponseEvent,
-  IdeConnectionEvent,
-  ConversationFinishedEvent,
   ChatCompressionEvent,
-  FileOperationEvent,
-  InvalidChunkEvent,
   ContentRetryEvent,
   ContentRetryFailureEvent,
+  ConversationFinishedEvent,
+  ExtensionDisableEvent,
+  ExtensionEnableEvent,
   ExtensionInstallEvent,
-  ToolOutputTruncatedEvent,
   ExtensionUninstallEvent,
+  ExtensionUpdateEvent,
+  FileOperationEvent,
+  IdeConnectionEvent,
+  InvalidChunkEvent,
+  LlmLoopCheckEvent,
+  LoopDetectedEvent,
+  MalformedJsonResponseEvent,
   ModelRoutingEvent,
-  ExtensionEnableEvent,
   ModelSlashCommandEvent,
-  ExtensionDisableEvent,
-  SmartEditStrategyEvent,
-  SmartEditCorrectionEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
+  NextSpeakerCheckEvent,
   RecoveryAttemptEvent,
+  SlashCommandEvent,
+  SmartEditCorrectionEvent,
+  SmartEditStrategyEvent,
+  StartSessionEvent,
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
+  UserPromptEvent,
   WebFetchFallbackAttemptEvent,
-  ExtensionUpdateEvent,
-  LlmLoopCheckEvent,
-} from '../types.js';
-import { EventMetadataKey } from './event-metadata-key.js';
-import type { Config } from '../../config/config.js';
-import { InstallationManager } from '../../utils/installationManager.js';
-import { UserAccountManager } from '../../utils/userAccountManager.js';
-import {
-  safeJsonStringify,
-  safeJsonStringifyBooleanValuesOnly,
-} from '../../utils/safeJsonStringify.js';
-import { FixedDeque } from 'mnemonist';
-import { GIT_COMMIT_INFO, CLI_VERSION } from '../../generated/git-commit.js';
-import {
-  IDE_DEFINITIONS,
-  detectIdeFromEnv,
-  isCloudShell,
-} from '../../ide/detect-ide.js';
-import { debugLogger } from '../../utils/debugLogger.js';
+} from "../types.js";
+import { EventMetadataKey } from "./event-metadata-key.js";
 
 export enum EventNames {
-  START_SESSION = 'start_session',
-  NEW_PROMPT = 'new_prompt',
-  TOOL_CALL = 'tool_call',
-  FILE_OPERATION = 'file_operation',
-  API_REQUEST = 'api_request',
-  API_RESPONSE = 'api_response',
-  API_ERROR = 'api_error',
-  END_SESSION = 'end_session',
-  FLASH_FALLBACK = 'flash_fallback',
-  RIPGREP_FALLBACK = 'ripgrep_fallback',
-  LOOP_DETECTED = 'loop_detected',
-  LOOP_DETECTION_DISABLED = 'loop_detection_disabled',
-  NEXT_SPEAKER_CHECK = 'next_speaker_check',
-  SLASH_COMMAND = 'slash_command',
-  MALFORMED_JSON_RESPONSE = 'malformed_json_response',
-  IDE_CONNECTION = 'ide_connection',
-  KITTY_SEQUENCE_OVERFLOW = 'kitty_sequence_overflow',
-  CHAT_COMPRESSION = 'chat_compression',
-  CONVERSATION_FINISHED = 'conversation_finished',
-  INVALID_CHUNK = 'invalid_chunk',
-  CONTENT_RETRY = 'content_retry',
-  CONTENT_RETRY_FAILURE = 'content_retry_failure',
-  EXTENSION_ENABLE = 'extension_enable',
-  EXTENSION_DISABLE = 'extension_disable',
-  EXTENSION_INSTALL = 'extension_install',
-  EXTENSION_UNINSTALL = 'extension_uninstall',
-  EXTENSION_UPDATE = 'extension_update',
-  TOOL_OUTPUT_TRUNCATED = 'tool_output_truncated',
-  MODEL_ROUTING = 'model_routing',
-  MODEL_SLASH_COMMAND = 'model_slash_command',
-  SMART_EDIT_STRATEGY = 'smart_edit_strategy',
-  SMART_EDIT_CORRECTION = 'smart_edit_correction',
-  AGENT_START = 'agent_start',
-  AGENT_FINISH = 'agent_finish',
-  RECOVERY_ATTEMPT = 'recovery_attempt',
-  WEB_FETCH_FALLBACK_ATTEMPT = 'web_fetch_fallback_attempt',
-  LLM_LOOP_CHECK = 'llm_loop_check',
+  START_SESSION = "start_session",
+  NEW_PROMPT = "new_prompt",
+  TOOL_CALL = "tool_call",
+  FILE_OPERATION = "file_operation",
+  API_REQUEST = "api_request",
+  API_RESPONSE = "api_response",
+  API_ERROR = "api_error",
+  END_SESSION = "end_session",
+  FLASH_FALLBACK = "flash_fallback",
+  RIPGREP_FALLBACK = "ripgrep_fallback",
+  LOOP_DETECTED = "loop_detected",
+  LOOP_DETECTION_DISABLED = "loop_detection_disabled",
+  NEXT_SPEAKER_CHECK = "next_speaker_check",
+  SLASH_COMMAND = "slash_command",
+  MALFORMED_JSON_RESPONSE = "malformed_json_response",
+  IDE_CONNECTION = "ide_connection",
+  KITTY_SEQUENCE_OVERFLOW = "kitty_sequence_overflow",
+  CHAT_COMPRESSION = "chat_compression",
+  CONVERSATION_FINISHED = "conversation_finished",
+  INVALID_CHUNK = "invalid_chunk",
+  CONTENT_RETRY = "content_retry",
+  CONTENT_RETRY_FAILURE = "content_retry_failure",
+  EXTENSION_ENABLE = "extension_enable",
+  EXTENSION_DISABLE = "extension_disable",
+  EXTENSION_INSTALL = "extension_install",
+  EXTENSION_UNINSTALL = "extension_uninstall",
+  EXTENSION_UPDATE = "extension_update",
+  TOOL_OUTPUT_TRUNCATED = "tool_output_truncated",
+  MODEL_ROUTING = "model_routing",
+  MODEL_SLASH_COMMAND = "model_slash_command",
+  SMART_EDIT_STRATEGY = "smart_edit_strategy",
+  SMART_EDIT_CORRECTION = "smart_edit_correction",
+  AGENT_START = "agent_start",
+  AGENT_FINISH = "agent_finish",
+  RECOVERY_ATTEMPT = "recovery_attempt",
+  WEB_FETCH_FALLBACK_ATTEMPT = "web_fetch_fallback_attempt",
+  LLM_LOOP_CHECK = "llm_loop_check",
 }
 
 export interface LogResponse {
@@ -112,7 +108,7 @@ export interface EventValue {
 }
 
 export interface LogEvent {
-  console_type: 'GEMINI_CLI';
+  console_type: "GEMINI_CLI";
   application: number;
   event_name: string;
   event_metadata: EventValue[][];
@@ -121,7 +117,7 @@ export interface LogEvent {
 }
 
 export interface LogRequest {
-  log_source_name: 'CONCORD';
+  log_source_name: "CONCORD";
   request_time_ms: number;
   log_event: LogEventEntry[][];
 }
@@ -136,23 +132,23 @@ export interface LogRequest {
  * methods might have in their runtimes.
  */
 function determineSurface(): string {
-  if (process.env['SURFACE']) {
-    return process.env['SURFACE'];
+  if (process.env["SURFACE"]) {
+    return process.env["SURFACE"];
   } else if (isCloudShell()) {
     return IDE_DEFINITIONS.cloudshell.name;
-  } else if (process.env['GITHUB_SHA']) {
-    return 'GitHub';
-  } else if (process.env['TERM_PROGRAM'] === 'vscode') {
+  } else if (process.env["GITHUB_SHA"]) {
+    return "GitHub";
+  } else if (process.env["TERM_PROGRAM"] === "vscode") {
     return detectIdeFromEnv().name || IDE_DEFINITIONS.vscode.name;
   } else {
-    return 'SURFACE_NOT_SET';
+    return "SURFACE_NOT_SET";
   }
 }
 
 /**
  * Clearcut URL to send logging events to.
  */
-const CLEARCUT_URL = 'https://play.googleapis.com/log?format=json&hasfast=true';
+const CLEARCUT_URL = "https://play.googleapis.com/log?format=json&hasfast=true";
 
 /**
  * Interval in which buffered events are sent to clearcut.
@@ -177,7 +173,7 @@ export class ClearcutLogger {
   private static instance: ClearcutLogger;
   private config?: Config;
   private sessionData: EventValue[] = [];
-  private promptId: string = '';
+  private promptId: string = "";
   private readonly installationManager: InstallationManager;
   private readonly userAccountManager: UserAccountManager;
 
@@ -206,14 +202,13 @@ export class ClearcutLogger {
   private constructor(config: Config) {
     this.config = config;
     this.events = new FixedDeque<LogEventEntry[]>(Array, MAX_EVENTS);
-    this.promptId = config?.getSessionId() ?? '';
+    this.promptId = config?.getSessionId() ?? "";
     this.installationManager = new InstallationManager();
     this.userAccountManager = new UserAccountManager();
   }
 
   static getInstance(config?: Config): ClearcutLogger | undefined {
-    if (config === undefined || !config?.getUsageStatisticsEnabled())
-      return undefined;
+    if (config === undefined || !config?.getUsageStatisticsEnabled()) return undefined;
     if (!ClearcutLogger.instance) {
       ClearcutLogger.instance = new ClearcutLogger(config);
     }
@@ -250,18 +245,15 @@ export class ClearcutLogger {
       }
     } catch (error) {
       if (this.config?.getDebugMode()) {
-        console.error('ClearcutLogger: Failed to enqueue log event.', error);
+        console.error("ClearcutLogger: Failed to enqueue log event.", error);
       }
     }
   }
 
-  createBasicLogEvent(
-    eventName: EventNames,
-    data: EventValue[] = [],
-  ): LogEvent {
+  createBasicLogEvent(eventName: EventNames, data: EventValue[] = []): LogEvent {
     const surface = determineSurface();
     return {
-      console_type: 'GEMINI_CLI',
+      console_type: "GEMINI_CLI",
       application: 102, // GEMINI_CLI
       event_name: eventName as string,
       event_metadata: [
@@ -316,16 +308,14 @@ export class ClearcutLogger {
     }
 
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
   async flushToClearcut(): Promise<LogResponse> {
     if (this.flushing) {
       if (this.config?.getDebugMode()) {
-        debugLogger.debug(
-          'ClearcutLogger: Flush already in progress, marking pending flush.',
-        );
+        debugLogger.debug("ClearcutLogger: Flush already in progress, marking pending flush.");
       }
       this.pendingFlush = true;
       return Promise.resolve({});
@@ -333,14 +323,14 @@ export class ClearcutLogger {
     this.flushing = true;
 
     if (this.config?.getDebugMode()) {
-      debugLogger.log('Flushing log events to Clearcut.');
+      debugLogger.log("Flushing log events to Clearcut.");
     }
     const eventsToSend = this.events.toArray() as LogEventEntry[][];
     this.events.clear();
 
     const request: LogRequest[] = [
       {
-        log_source_name: 'CONCORD',
+        log_source_name: "CONCORD",
         request_time_ms: Date.now(),
         log_event: eventsToSend,
       },
@@ -350,10 +340,10 @@ export class ClearcutLogger {
 
     try {
       const response = await fetch(CLEARCUT_URL, {
-        method: 'POST',
+        method: "POST",
         body: safeJsonStringify(request),
         headers: {
-          'Content-Type': 'application/json',
+          "Content-Type": "application/json",
         },
       });
 
@@ -378,7 +368,7 @@ export class ClearcutLogger {
       }
     } catch (e: unknown) {
       if (this.config?.getDebugMode()) {
-        console.error('Error flushing log events:', e as Error);
+        console.error("Error flushing log events:", e as Error);
       }
 
       // Re-queue failed events for retry
@@ -393,7 +383,7 @@ export class ClearcutLogger {
       // Fire and forget the pending flush
       this.flushToClearcut().catch((error) => {
         if (this.config?.getDebugMode()) {
-          debugLogger.debug('Error in pending flush to Clearcut:', error);
+          debugLogger.debug("Error in pending flush to Clearcut:", error);
         }
       });
     }
@@ -408,8 +398,7 @@ export class ClearcutLogger {
         value: event.model,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_EMBEDDING_MODEL,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EMBEDDING_MODEL,
         value: event.embedding_model,
       },
       {
@@ -425,23 +414,19 @@ export class ClearcutLogger {
         value: event.approval_mode,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_API_KEY_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_API_KEY_ENABLED,
         value: event.api_key_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
         value: event.vertex_ai_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_DEBUG_MODE_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_DEBUG_MODE_ENABLED,
         value: event.debug_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
         value: event.vertex_ai_enabled.toString(),
       },
       {
@@ -449,13 +434,11 @@ export class ClearcutLogger {
         value: event.mcp_servers,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_VERTEX_API_ENABLED,
         value: event.vertex_ai_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_TELEMETRY_ENABLED,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_TELEMETRY_ENABLED,
         value: event.telemetry_enabled.toString(),
       },
       {
@@ -464,24 +447,19 @@ export class ClearcutLogger {
         value: event.telemetry_log_user_prompts_enabled.toString(),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_SERVERS_COUNT,
-        value: event.mcp_servers_count
-          ? event.mcp_servers_count.toString()
-          : '',
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_SERVERS_COUNT,
+        value: event.mcp_servers_count ? event.mcp_servers_count.toString() : "",
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS_COUNT,
-        value: event.mcp_tools_count?.toString() ?? '',
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS_COUNT,
+        value: event.mcp_tools_count?.toString() ?? "",
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_MCP_TOOLS,
-        value: event.mcp_tools ? event.mcp_tools : '',
+        value: event.mcp_tools ? event.mcp_tools : "",
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_START_SESSION_EXTENSIONS_COUNT,
         value: event.extensions_count.toString(),
       },
       // We deliberately do not log the names of extensions here, to be safe.
@@ -495,7 +473,7 @@ export class ClearcutLogger {
     // Flush start event immediately
     this.enqueueLogEvent(this.createLogEvent(EventNames.START_SESSION, data));
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -644,28 +622,23 @@ export class ClearcutLogger {
         value: JSON.stringify(event.duration_ms),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_INPUT_TOKEN_COUNT,
         value: JSON.stringify(event.usage.input_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_OUTPUT_TOKEN_COUNT,
         value: JSON.stringify(event.usage.output_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_CACHED_TOKEN_COUNT,
         value: JSON.stringify(event.usage.cached_content_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_THINKING_TOKEN_COUNT,
         value: JSON.stringify(event.usage.thoughts_token_count),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_API_RESPONSE_TOOL_TOKEN_COUNT,
         value: JSON.stringify(event.usage.tool_token_count),
       },
     ];
@@ -710,22 +683,20 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.CHAT_COMPRESSION, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.CHAT_COMPRESSION, data));
   }
 
   logFlashFallbackEvent(): void {
     this.enqueueLogEvent(this.createLogEvent(EventNames.FLASH_FALLBACK, []));
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
   logRipgrepFallbackEvent(): void {
     this.enqueueLogEvent(this.createLogEvent(EventNames.RIPGREP_FALLBACK, []));
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -739,8 +710,7 @@ export class ClearcutLogger {
 
     if (event.confirmed_by_model) {
       data.push({
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_LOOP_DETECTED_CONFIRMED_BY_MODEL,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_LOOP_DETECTED_CONFIRMED_BY_MODEL,
         value: event.confirmed_by_model,
       });
     }
@@ -752,9 +722,7 @@ export class ClearcutLogger {
   logLoopDetectionDisabledEvent(): void {
     const data: EventValue[] = [];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.LOOP_DETECTION_DISABLED, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.LOOP_DETECTION_DISABLED, data));
     this.flushIfNeeded();
   }
 
@@ -770,9 +738,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.NEXT_SPEAKER_CHECK, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.NEXT_SPEAKER_CHECK, data));
     this.flushIfNeeded();
   }
 
@@ -812,15 +778,12 @@ export class ClearcutLogger {
   logMalformedJsonResponseEvent(event: MalformedJsonResponseEvent): void {
     const data: EventValue[] = [
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_MALFORMED_JSON_RESPONSE_MODEL,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_MALFORMED_JSON_RESPONSE_MODEL,
         value: JSON.stringify(event.model),
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.MALFORMED_JSON_RESPONSE, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.MALFORMED_JSON_RESPONSE, data));
     this.flushIfNeeded();
   }
 
@@ -840,7 +803,7 @@ export class ClearcutLogger {
     const data: EventValue[] = [
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
-        value: this.config?.getSessionId() ?? '',
+        value: this.config?.getSessionId() ?? "",
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONVERSATION_TURN_COUNT,
@@ -852,9 +815,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.CONVERSATION_FINISHED, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.CONVERSATION_FINISHED, data));
     this.flushIfNeeded();
   }
 
@@ -862,7 +823,7 @@ export class ClearcutLogger {
     // Flush immediately on session end.
     this.enqueueLogEvent(this.createLogEvent(EventNames.END_SESSION, []));
     this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -883,8 +844,7 @@ export class ClearcutLogger {
   logContentRetryEvent(event: ContentRetryEvent): void {
     const data: EventValue[] = [
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_ATTEMPT_NUMBER,
         value: String(event.attempt_number),
       },
       {
@@ -908,13 +868,11 @@ export class ClearcutLogger {
   logContentRetryFailureEvent(event: ContentRetryFailureEvent): void {
     const data: EventValue[] = [
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_ATTEMPTS,
         value: String(event.total_attempts),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_FINAL_ERROR_TYPE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_FINAL_ERROR_TYPE,
         value: event.final_error_type,
       },
       {
@@ -925,15 +883,12 @@ export class ClearcutLogger {
 
     if (event.total_duration_ms) {
       data.push({
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_CONTENT_RETRY_FAILURE_TOTAL_DURATION_MS,
         value: String(event.total_duration_ms),
       });
     }
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.CONTENT_RETRY_FAILURE, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.CONTENT_RETRY_FAILURE, data));
     this.flushIfNeeded();
   }
 
@@ -961,17 +916,13 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_INSTALL, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_INSTALL, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
-  async logExtensionUninstallEvent(
-    event: ExtensionUninstallEvent,
-  ): Promise<void> {
+  async logExtensionUninstallEvent(event: ExtensionUninstallEvent): Promise<void> {
     const data: EventValue[] = [
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_NAME,
@@ -987,11 +938,9 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_UNINSTALL, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UNINSTALL, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1023,11 +972,9 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_UPDATE, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_UPDATE, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1038,18 +985,15 @@ export class ClearcutLogger {
         value: JSON.stringify(event.tool_name),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_ORIGINAL_LENGTH,
         value: JSON.stringify(event.original_content_length),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_TRUNCATED_LENGTH,
         value: JSON.stringify(event.truncated_content_length),
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_TOOL_OUTPUT_TRUNCATED_THRESHOLD,
         value: JSON.stringify(event.threshold),
       },
       {
@@ -1058,9 +1002,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.TOOL_OUTPUT_TRUNCATED, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.TOOL_OUTPUT_TRUNCATED, data));
     this.flushIfNeeded();
   }
 
@@ -1106,17 +1048,14 @@ export class ClearcutLogger {
         value: event.extension_id,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_ENABLE_SETTING_SCOPE,
         value: event.setting_scope,
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_ENABLE, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_ENABLE, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1128,9 +1067,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.MODEL_SLASH_COMMAND, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.MODEL_SLASH_COMMAND, data));
     this.flushIfNeeded();
   }
 
@@ -1145,17 +1082,14 @@ export class ClearcutLogger {
         value: event.extension_id,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_EXTENSION_DISABLE_SETTING_SCOPE,
         value: event.setting_scope,
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createBasicLogEvent(EventNames.EXTENSION_DISABLE, data),
-    );
+    this.enqueueLogEvent(this.createBasicLogEvent(EventNames.EXTENSION_DISABLE, data));
     await this.flushToClearcut().catch((error) => {
-      debugLogger.debug('Error flushing to Clearcut:', error);
+      debugLogger.debug("Error flushing to Clearcut:", error);
     });
   }
 
@@ -1167,9 +1101,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.SMART_EDIT_STRATEGY, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_STRATEGY, data));
     this.flushIfNeeded();
   }
 
@@ -1181,9 +1113,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.SMART_EDIT_CORRECTION, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.SMART_EDIT_CORRECTION, data));
     this.flushIfNeeded();
   }
 
@@ -1259,9 +1189,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.RECOVERY_ATTEMPT, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.RECOVERY_ATTEMPT, data));
     this.flushIfNeeded();
   }
 
@@ -1273,9 +1201,7 @@ export class ClearcutLogger {
       },
     ];
 
-    this.enqueueLogEvent(
-      this.createLogEvent(EventNames.WEB_FETCH_FALLBACK_ATTEMPT, data),
-    );
+    this.enqueueLogEvent(this.createLogEvent(EventNames.WEB_FETCH_FALLBACK_ATTEMPT, data));
     this.flushIfNeeded();
   }
 
@@ -1286,8 +1212,7 @@ export class ClearcutLogger {
         value: event.prompt_id,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_FLASH_CONFIDENCE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_FLASH_CONFIDENCE,
         value: event.flash_confidence.toString(),
       },
       {
@@ -1295,8 +1220,7 @@ export class ClearcutLogger {
         value: event.main_model,
       },
       {
-        gemini_cli_key:
-          EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_MAIN_MODEL_CONFIDENCE,
+        gemini_cli_key: EventMetadataKey.GEMINI_CLI_LLM_LOOP_CHECK_MAIN_MODEL_CONFIDENCE,
         value: event.main_model_confidence.toString(),
       },
     ];
@@ -1313,13 +1237,11 @@ export class ClearcutLogger {
     const defaultLogMetadata: EventValue[] = [
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_SESSION_ID,
-        value: this.config?.getSessionId() ?? '',
+        value: this.config?.getSessionId() ?? "",
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_AUTH_TYPE,
-        value: JSON.stringify(
-          this.config?.getContentGeneratorConfig()?.authType,
-        ),
+        value: JSON.stringify(this.config?.getContentGeneratorConfig()?.authType),
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_GOOGLE_ACCOUNTS_COUNT,
@@ -1339,7 +1261,7 @@ export class ClearcutLogger {
       },
       {
         gemini_cli_key: EventMetadataKey.GEMINI_CLI_INTERACTIVE,
-        value: this.config?.isInteractive().toString() ?? 'false',
+        value: this.config?.isInteractive().toString() ?? "false",
       },
     ];
     return [...data, ...defaultLogMetadata];
@@ -1350,10 +1272,10 @@ export class ClearcutLogger {
     if (!proxyUrl) return undefined;
     // undici which is widely used in the repo can only support http & https proxy protocol,
     // https://github.com/nodejs/undici/issues/2224
-    if (proxyUrl.startsWith('http')) {
+    if (proxyUrl.startsWith("http")) {
       return new HttpsProxyAgent(proxyUrl);
     } else {
-      throw new Error('Unsupported proxy type');
+      throw new Error("Unsupported proxy type");
     }
   }
 
@@ -1386,17 +1308,13 @@ export class ClearcutLogger {
 
     if (numEventsToRequeue === 0) {
       if (this.config?.getDebugMode()) {
-        debugLogger.debug(
-          `ClearcutLogger: No events re-queued (queue size: ${this.events.size})`,
-        );
+        debugLogger.debug(`ClearcutLogger: No events re-queued (queue size: ${this.events.size})`);
       }
       return;
     }
 
     // Get the most recent events to re-queue
-    const eventsToRequeue = eventsToRetry.slice(
-      eventsToRetry.length - numEventsToRequeue,
-    );
+    const eventsToRequeue = eventsToRetry.slice(eventsToRetry.length - numEventsToRequeue);
 
     // Prepend events to the front of the deque to be retried first.
     // We iterate backwards to maintain the original order of the failed events.
diff --git a/packages/gemini-core/src/telemetry/config.test.ts b/packages/gemini-core/src/telemetry/config.test.ts
index 1ded8d490..43c728c7c 100644
--- a/packages/gemini-core/src/telemetry/config.test.ts
+++ b/packages/gemini-core/src/telemetry/config.test.ts
@@ -4,106 +4,102 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
   parseBooleanEnvFlag,
   parseTelemetryTargetValue,
   resolveTelemetrySettings,
-} from './config.js';
-import { TelemetryTarget } from './index.js';
+} from "./config.js";
+import { TelemetryTarget } from "./index.js";
 
-describe('telemetry/config helpers', () => {
-  describe('parseBooleanEnvFlag', () => {
-    it('returns undefined for undefined', () => {
+describe("telemetry/config helpers", () => {
+  describe("parseBooleanEnvFlag", () => {
+    it("returns undefined for undefined", () => {
       expect(parseBooleanEnvFlag(undefined)).toBeUndefined();
     });
 
-    it('parses true values', () => {
-      expect(parseBooleanEnvFlag('true')).toBe(true);
-      expect(parseBooleanEnvFlag('1')).toBe(true);
+    it("parses true values", () => {
+      expect(parseBooleanEnvFlag("true")).toBe(true);
+      expect(parseBooleanEnvFlag("1")).toBe(true);
     });
 
-    it('parses false/other values as false', () => {
-      expect(parseBooleanEnvFlag('false')).toBe(false);
-      expect(parseBooleanEnvFlag('0')).toBe(false);
-      expect(parseBooleanEnvFlag('TRUE')).toBe(false);
-      expect(parseBooleanEnvFlag('random')).toBe(false);
-      expect(parseBooleanEnvFlag('')).toBe(false);
+    it("parses false/other values as false", () => {
+      expect(parseBooleanEnvFlag("false")).toBe(false);
+      expect(parseBooleanEnvFlag("0")).toBe(false);
+      expect(parseBooleanEnvFlag("TRUE")).toBe(false);
+      expect(parseBooleanEnvFlag("random")).toBe(false);
+      expect(parseBooleanEnvFlag("")).toBe(false);
     });
   });
 
-  describe('parseTelemetryTargetValue', () => {
-    it('parses string values', () => {
-      expect(parseTelemetryTargetValue('local')).toBe(TelemetryTarget.LOCAL);
-      expect(parseTelemetryTargetValue('gcp')).toBe(TelemetryTarget.GCP);
+  describe("parseTelemetryTargetValue", () => {
+    it("parses string values", () => {
+      expect(parseTelemetryTargetValue("local")).toBe(TelemetryTarget.LOCAL);
+      expect(parseTelemetryTargetValue("gcp")).toBe(TelemetryTarget.GCP);
     });
 
-    it('accepts enum values', () => {
-      expect(parseTelemetryTargetValue(TelemetryTarget.LOCAL)).toBe(
-        TelemetryTarget.LOCAL,
-      );
-      expect(parseTelemetryTargetValue(TelemetryTarget.GCP)).toBe(
-        TelemetryTarget.GCP,
-      );
+    it("accepts enum values", () => {
+      expect(parseTelemetryTargetValue(TelemetryTarget.LOCAL)).toBe(TelemetryTarget.LOCAL);
+      expect(parseTelemetryTargetValue(TelemetryTarget.GCP)).toBe(TelemetryTarget.GCP);
     });
 
-    it('returns undefined for unknown', () => {
-      expect(parseTelemetryTargetValue('other')).toBeUndefined();
+    it("returns undefined for unknown", () => {
+      expect(parseTelemetryTargetValue("other")).toBeUndefined();
       expect(parseTelemetryTargetValue(undefined)).toBeUndefined();
     });
   });
 
-  describe('resolveTelemetrySettings', () => {
-    it('falls back to settings when no argv/env provided', async () => {
+  describe("resolveTelemetrySettings", () => {
+    it("falls back to settings when no argv/env provided", async () => {
       const settings = {
         enabled: false,
         target: TelemetryTarget.LOCAL,
-        otlpEndpoint: 'http://localhost:4317',
-        otlpProtocol: 'grpc' as const,
+        otlpEndpoint: "http://localhost:4317",
+        otlpProtocol: "grpc" as const,
         logPrompts: false,
-        outfile: 'settings.log',
+        outfile: "settings.log",
         useCollector: false,
       };
       const resolved = await resolveTelemetrySettings({ settings });
       expect(resolved).toEqual(settings);
     });
 
-    it('uses env over settings and argv over env', async () => {
+    it("uses env over settings and argv over env", async () => {
       const settings = {
         enabled: false,
         target: TelemetryTarget.LOCAL,
-        otlpEndpoint: 'http://settings:4317',
-        otlpProtocol: 'grpc' as const,
+        otlpEndpoint: "http://settings:4317",
+        otlpProtocol: "grpc" as const,
         logPrompts: false,
-        outfile: 'settings.log',
+        outfile: "settings.log",
         useCollector: false,
       };
       const env = {
-        GEMINI_TELEMETRY_ENABLED: '1',
-        GEMINI_TELEMETRY_TARGET: 'gcp',
-        GEMINI_TELEMETRY_OTLP_ENDPOINT: 'http://env:4317',
-        GEMINI_TELEMETRY_OTLP_PROTOCOL: 'http',
-        GEMINI_TELEMETRY_LOG_PROMPTS: 'true',
-        GEMINI_TELEMETRY_OUTFILE: 'env.log',
-        GEMINI_TELEMETRY_USE_COLLECTOR: 'true',
+        GEMINI_TELEMETRY_ENABLED: "1",
+        GEMINI_TELEMETRY_TARGET: "gcp",
+        GEMINI_TELEMETRY_OTLP_ENDPOINT: "http://env:4317",
+        GEMINI_TELEMETRY_OTLP_PROTOCOL: "http",
+        GEMINI_TELEMETRY_LOG_PROMPTS: "true",
+        GEMINI_TELEMETRY_OUTFILE: "env.log",
+        GEMINI_TELEMETRY_USE_COLLECTOR: "true",
       } as Record<string, string>;
       const argv = {
         telemetry: false,
-        telemetryTarget: 'local',
-        telemetryOtlpEndpoint: 'http://argv:4317',
-        telemetryOtlpProtocol: 'grpc',
+        telemetryTarget: "local",
+        telemetryOtlpEndpoint: "http://argv:4317",
+        telemetryOtlpProtocol: "grpc",
         telemetryLogPrompts: false,
-        telemetryOutfile: 'argv.log',
+        telemetryOutfile: "argv.log",
       };
 
       const resolvedEnv = await resolveTelemetrySettings({ env, settings });
       expect(resolvedEnv).toEqual({
         enabled: true,
         target: TelemetryTarget.GCP,
-        otlpEndpoint: 'http://env:4317',
-        otlpProtocol: 'http',
+        otlpEndpoint: "http://env:4317",
+        otlpProtocol: "http",
         logPrompts: true,
-        outfile: 'env.log',
+        outfile: "env.log",
         useCollector: true,
       });
 
@@ -115,41 +111,33 @@ describe('telemetry/config helpers', () => {
       expect(resolvedArgv).toEqual({
         enabled: false,
         target: TelemetryTarget.LOCAL,
-        otlpEndpoint: 'http://argv:4317',
-        otlpProtocol: 'grpc',
+        otlpEndpoint: "http://argv:4317",
+        otlpProtocol: "grpc",
         logPrompts: false,
-        outfile: 'argv.log',
+        outfile: "argv.log",
         useCollector: true, // from env as no argv option
       });
     });
 
-    it('falls back to OTEL_EXPORTER_OTLP_ENDPOINT when GEMINI var is missing', async () => {
+    it("falls back to OTEL_EXPORTER_OTLP_ENDPOINT when GEMINI var is missing", async () => {
       const settings = {};
       const env = {
-        OTEL_EXPORTER_OTLP_ENDPOINT: 'http://otel:4317',
+        OTEL_EXPORTER_OTLP_ENDPOINT: "http://otel:4317",
       } as Record<string, string>;
       const resolved = await resolveTelemetrySettings({ env, settings });
-      expect(resolved.otlpEndpoint).toBe('http://otel:4317');
+      expect(resolved.otlpEndpoint).toBe("http://otel:4317");
     });
 
-    it('throws on unknown protocol values', async () => {
-      const env = { GEMINI_TELEMETRY_OTLP_PROTOCOL: 'unknown' } as Record<
-        string,
-        string
-      >;
+    it("throws on unknown protocol values", async () => {
+      const env = { GEMINI_TELEMETRY_OTLP_PROTOCOL: "unknown" } as Record<string, string>;
       await expect(resolveTelemetrySettings({ env })).rejects.toThrow(
         /Invalid telemetry OTLP protocol/i,
       );
     });
 
-    it('throws on unknown target values', async () => {
-      const env = { GEMINI_TELEMETRY_TARGET: 'unknown' } as Record<
-        string,
-        string
-      >;
-      await expect(resolveTelemetrySettings({ env })).rejects.toThrow(
-        /Invalid telemetry target/i,
-      );
+    it("throws on unknown target values", async () => {
+      const env = { GEMINI_TELEMETRY_TARGET: "unknown" } as Record<string, string>;
+      await expect(resolveTelemetrySettings({ env })).rejects.toThrow(/Invalid telemetry target/i);
     });
   });
 });
diff --git a/packages/gemini-core/src/telemetry/config.ts b/packages/gemini-core/src/telemetry/config.ts
index bfca365c8..d502def90 100644
--- a/packages/gemini-core/src/telemetry/config.ts
+++ b/packages/gemini-core/src/telemetry/config.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TelemetrySettings } from '../config/config.js';
-import { FatalConfigError } from '../utils/errors.js';
-import { TelemetryTarget } from './index.js';
+import type { TelemetrySettings } from "../config/config.js";
+import { FatalConfigError } from "../utils/errors.js";
+import { TelemetryTarget } from "./index.js";
 
 /**
  * Parse a boolean environment flag. Accepts 'true'/'1' as true.
  */
-export function parseBooleanEnvFlag(
-  value: string | undefined,
-): boolean | undefined {
+export function parseBooleanEnvFlag(value: string | undefined): boolean | undefined {
   if (value === undefined) return undefined;
-  return value === 'true' || value === '1';
+  return value === "true" || value === "1";
 }
 
 /**
@@ -25,10 +23,10 @@ export function parseTelemetryTargetValue(
   value: string | TelemetryTarget | undefined,
 ): TelemetryTarget | undefined {
   if (value === undefined) return undefined;
-  if (value === TelemetryTarget.LOCAL || value === 'local') {
+  if (value === TelemetryTarget.LOCAL || value === "local") {
     return TelemetryTarget.LOCAL;
   }
-  if (value === TelemetryTarget.GCP || value === 'gcp') {
+  if (value === TelemetryTarget.GCP || value === "gcp") {
     return TelemetryTarget.GCP;
   }
   return undefined;
@@ -56,57 +54,45 @@ export async function resolveTelemetrySettings(options: {
   const settings = options.settings ?? {};
 
   const enabled =
-    argv.telemetry ??
-    parseBooleanEnvFlag(env['GEMINI_TELEMETRY_ENABLED']) ??
-    settings.enabled;
+    argv.telemetry ?? parseBooleanEnvFlag(env["GEMINI_TELEMETRY_ENABLED"]) ?? settings.enabled;
 
   const rawTarget =
     (argv.telemetryTarget as string | TelemetryTarget | undefined) ??
-    env['GEMINI_TELEMETRY_TARGET'] ??
+    env["GEMINI_TELEMETRY_TARGET"] ??
     (settings.target as string | TelemetryTarget | undefined);
   const target = parseTelemetryTargetValue(rawTarget);
   if (rawTarget !== undefined && target === undefined) {
     throw new FatalConfigError(
-      `Invalid telemetry target: ${String(
-        rawTarget,
-      )}. Valid values are: local, gcp`,
+      `Invalid telemetry target: ${String(rawTarget)}. Valid values are: local, gcp`,
     );
   }
 
   const otlpEndpoint =
     argv.telemetryOtlpEndpoint ??
-    env['GEMINI_TELEMETRY_OTLP_ENDPOINT'] ??
-    env['OTEL_EXPORTER_OTLP_ENDPOINT'] ??
+    env["GEMINI_TELEMETRY_OTLP_ENDPOINT"] ??
+    env["OTEL_EXPORTER_OTLP_ENDPOINT"] ??
     settings.otlpEndpoint;
 
   const rawProtocol =
     (argv.telemetryOtlpProtocol as string | undefined) ??
-    env['GEMINI_TELEMETRY_OTLP_PROTOCOL'] ??
+    env["GEMINI_TELEMETRY_OTLP_PROTOCOL"] ??
     settings.otlpProtocol;
-  const otlpProtocol = (['grpc', 'http'] as const).find(
-    (p) => p === rawProtocol,
-  );
+  const otlpProtocol = (["grpc", "http"] as const).find((p) => p === rawProtocol);
   if (rawProtocol !== undefined && otlpProtocol === undefined) {
     throw new FatalConfigError(
-      `Invalid telemetry OTLP protocol: ${String(
-        rawProtocol,
-      )}. Valid values are: grpc, http`,
+      `Invalid telemetry OTLP protocol: ${String(rawProtocol)}. Valid values are: grpc, http`,
     );
   }
 
   const logPrompts =
     argv.telemetryLogPrompts ??
-    parseBooleanEnvFlag(env['GEMINI_TELEMETRY_LOG_PROMPTS']) ??
+    parseBooleanEnvFlag(env["GEMINI_TELEMETRY_LOG_PROMPTS"]) ??
     settings.logPrompts;
 
-  const outfile =
-    argv.telemetryOutfile ??
-    env['GEMINI_TELEMETRY_OUTFILE'] ??
-    settings.outfile;
+  const outfile = argv.telemetryOutfile ?? env["GEMINI_TELEMETRY_OUTFILE"] ?? settings.outfile;
 
   const useCollector =
-    parseBooleanEnvFlag(env['GEMINI_TELEMETRY_USE_COLLECTOR']) ??
-    settings.useCollector;
+    parseBooleanEnvFlag(env["GEMINI_TELEMETRY_USE_COLLECTOR"]) ?? settings.useCollector;
 
   return {
     enabled,
diff --git a/packages/gemini-core/src/telemetry/constants.ts b/packages/gemini-core/src/telemetry/constants.ts
index 1d2b7751a..00624b67e 100644
--- a/packages/gemini-core/src/telemetry/constants.ts
+++ b/packages/gemini-core/src/telemetry/constants.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const SERVICE_NAME = 'gemini-cli';
+export const SERVICE_NAME = "gemini-cli";
diff --git a/packages/gemini-core/src/telemetry/file-exporters.ts b/packages/gemini-core/src/telemetry/file-exporters.ts
index 55fe64103..db7c60ea5 100644
--- a/packages/gemini-core/src/telemetry/file-exporters.ts
+++ b/packages/gemini-core/src/telemetry/file-exporters.ts
@@ -4,29 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import type { ExportResult } from '@opentelemetry/core';
-import { ExportResultCode } from '@opentelemetry/core';
-import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
-import type {
-  ReadableLogRecord,
-  LogRecordExporter,
-} from '@opentelemetry/sdk-logs';
-import type {
-  ResourceMetrics,
-  PushMetricExporter,
-} from '@opentelemetry/sdk-metrics';
-import { AggregationTemporality } from '@opentelemetry/sdk-metrics';
+import * as fs from "node:fs";
+import type { ExportResult } from "@opentelemetry/core";
+import { ExportResultCode } from "@opentelemetry/core";
+import type { LogRecordExporter, ReadableLogRecord } from "@opentelemetry/sdk-logs";
+import type { PushMetricExporter, ResourceMetrics } from "@opentelemetry/sdk-metrics";
+import { AggregationTemporality } from "@opentelemetry/sdk-metrics";
+import type { ReadableSpan, SpanExporter } from "@opentelemetry/sdk-trace-base";
 
 class FileExporter {
   protected writeStream: fs.WriteStream;
 
   constructor(filePath: string) {
-    this.writeStream = fs.createWriteStream(filePath, { flags: 'a' });
+    this.writeStream = fs.createWriteStream(filePath, { flags: "a" });
   }
 
   protected serialize(data: unknown): string {
-    return JSON.stringify(data, null, 2) + '\n';
+    return JSON.stringify(data, null, 2) + "\n";
   }
 
   shutdown(): Promise<void> {
@@ -37,11 +31,8 @@ class FileExporter {
 }
 
 export class FileSpanExporter extends FileExporter implements SpanExporter {
-  export(
-    spans: ReadableSpan[],
-    resultCallback: (result: ExportResult) => void,
-  ): void {
-    const data = spans.map((span) => this.serialize(span)).join('');
+  export(spans: ReadableSpan[], resultCallback: (result: ExportResult) => void): void {
+    const data = spans.map((span) => this.serialize(span)).join("");
     this.writeStream.write(data, (err) => {
       resultCallback({
         code: err ? ExportResultCode.FAILED : ExportResultCode.SUCCESS,
@@ -52,11 +43,8 @@ export class FileSpanExporter extends FileExporter implements SpanExporter {
 }
 
 export class FileLogExporter extends FileExporter implements LogRecordExporter {
-  export(
-    logs: ReadableLogRecord[],
-    resultCallback: (result: ExportResult) => void,
-  ): void {
-    const data = logs.map((log) => this.serialize(log)).join('');
+  export(logs: ReadableLogRecord[], resultCallback: (result: ExportResult) => void): void {
+    const data = logs.map((log) => this.serialize(log)).join("");
     this.writeStream.write(data, (err) => {
       resultCallback({
         code: err ? ExportResultCode.FAILED : ExportResultCode.SUCCESS,
@@ -66,14 +54,8 @@ export class FileLogExporter extends FileExporter implements LogRecordExporter {
   }
 }
 
-export class FileMetricExporter
-  extends FileExporter
-  implements PushMetricExporter
-{
-  export(
-    metrics: ResourceMetrics,
-    resultCallback: (result: ExportResult) => void,
-  ): void {
+export class FileMetricExporter extends FileExporter implements PushMetricExporter {
+  export(metrics: ResourceMetrics, resultCallback: (result: ExportResult) => void): void {
     const data = this.serialize(metrics);
     this.writeStream.write(data, (err) => {
       resultCallback({
diff --git a/packages/gemini-core/src/telemetry/gcp-exporters.test.ts b/packages/gemini-core/src/telemetry/gcp-exporters.test.ts
index 6415104d5..6fb56054a 100644
--- a/packages/gemini-core/src/telemetry/gcp-exporters.test.ts
+++ b/packages/gemini-core/src/telemetry/gcp-exporters.test.ts
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ExportResultCode } from '@opentelemetry/core';
-import type { ReadableLogRecord } from '@opentelemetry/sdk-logs';
-import {
-  GcpTraceExporter,
-  GcpMetricExporter,
-  GcpLogExporter,
-} from './gcp-exporters.js';
-
-const mockLogEntry = { test: 'entry' };
+import { ExportResultCode } from "@opentelemetry/core";
+import type { ReadableLogRecord } from "@opentelemetry/sdk-logs";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { GcpLogExporter, GcpMetricExporter, GcpTraceExporter } from "./gcp-exporters.js";
+
+const mockLogEntry = { test: "entry" };
 const mockLogWrite = vi.fn().mockResolvedValue(undefined);
 const mockLog = {
   entry: vi.fn().mockReturnValue(mockLogEntry),
   write: mockLogWrite,
 };
 const mockLogging = {
-  projectId: 'test-project',
+  projectId: "test-project",
   log: vi.fn().mockReturnValue(mockLog),
 };
 
-vi.mock('@google-cloud/opentelemetry-cloud-trace-exporter', () => ({
+vi.mock("@google-cloud/opentelemetry-cloud-trace-exporter", () => ({
   TraceExporter: vi.fn().mockImplementation(() => ({
     export: vi.fn(),
     shutdown: vi.fn(),
@@ -32,7 +28,7 @@ vi.mock('@google-cloud/opentelemetry-cloud-trace-exporter', () => ({
   })),
 }));
 
-vi.mock('@google-cloud/opentelemetry-cloud-monitoring-exporter', () => ({
+vi.mock("@google-cloud/opentelemetry-cloud-monitoring-exporter", () => ({
   MetricExporter: vi.fn().mockImplementation(() => ({
     export: vi.fn(),
     shutdown: vi.fn(),
@@ -40,73 +36,73 @@ vi.mock('@google-cloud/opentelemetry-cloud-monitoring-exporter', () => ({
   })),
 }));
 
-vi.mock('@google-cloud/logging', () => ({
+vi.mock("@google-cloud/logging", () => ({
   Logging: vi.fn().mockImplementation(() => mockLogging),
 }));
 
-describe('GCP Exporters', () => {
-  describe('GcpTraceExporter', () => {
-    it('should create a trace exporter with correct configuration', () => {
-      const exporter = new GcpTraceExporter('test-project');
+describe("GCP Exporters", () => {
+  describe("GcpTraceExporter", () => {
+    it("should create a trace exporter with correct configuration", () => {
+      const exporter = new GcpTraceExporter("test-project");
       expect(exporter).toBeDefined();
     });
 
-    it('should create a trace exporter without project ID', () => {
+    it("should create a trace exporter without project ID", () => {
       const exporter = new GcpTraceExporter();
       expect(exporter).toBeDefined();
     });
   });
 
-  describe('GcpMetricExporter', () => {
-    it('should create a metric exporter with correct configuration', () => {
-      const exporter = new GcpMetricExporter('test-project');
+  describe("GcpMetricExporter", () => {
+    it("should create a metric exporter with correct configuration", () => {
+      const exporter = new GcpMetricExporter("test-project");
       expect(exporter).toBeDefined();
     });
 
-    it('should create a metric exporter without project ID', () => {
+    it("should create a metric exporter without project ID", () => {
       const exporter = new GcpMetricExporter();
       expect(exporter).toBeDefined();
     });
   });
 
-  describe('GcpLogExporter', () => {
+  describe("GcpLogExporter", () => {
     let exporter: GcpLogExporter;
 
     beforeEach(() => {
       vi.clearAllMocks();
       mockLogWrite.mockResolvedValue(undefined);
       mockLog.entry.mockReturnValue(mockLogEntry);
-      exporter = new GcpLogExporter('test-project');
+      exporter = new GcpLogExporter("test-project");
     });
 
-    describe('constructor', () => {
-      it('should create a log exporter with project ID', () => {
+    describe("constructor", () => {
+      it("should create a log exporter with project ID", () => {
         expect(exporter).toBeDefined();
-        expect(mockLogging.log).toHaveBeenCalledWith('gemini_cli');
+        expect(mockLogging.log).toHaveBeenCalledWith("gemini_cli");
       });
 
-      it('should create a log exporter without project ID', () => {
+      it("should create a log exporter without project ID", () => {
         const exporterNoProject = new GcpLogExporter();
         expect(exporterNoProject).toBeDefined();
       });
     });
 
-    describe('export', () => {
-      it('should export logs successfully', async () => {
+    describe("export", () => {
+      it("should export logs successfully", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
             severityNumber: 9,
-            severityText: 'INFO',
-            body: 'Test log message',
+            severityText: "INFO",
+            body: "Test log message",
             attributes: {
-              'session.id': 'test-session',
-              'custom.attribute': 'value',
+              "session.id": "test-session",
+              "custom.attribute": "value",
             },
             resource: {
               attributes: {
-                'service.name': 'test-service',
+                "service.name": "test-service",
               },
             },
           } as unknown as ReadableLogRecord,
@@ -120,20 +116,20 @@ describe('GCP Exporters', () => {
 
         expect(mockLog.entry).toHaveBeenCalledWith(
           expect.objectContaining({
-            severity: 'INFO',
+            severity: "INFO",
             timestamp: expect.any(Date),
             resource: {
-              type: 'global',
+              type: "global",
               labels: {
-                project_id: 'test-project',
+                project_id: "test-project",
               },
             },
           }),
           expect.objectContaining({
-            message: 'Test log message',
-            'session.id': 'test-session',
-            'custom.attribute': 'value',
-            'service.name': 'test-service',
+            message: "Test log message",
+            "session.id": "test-session",
+            "custom.attribute": "value",
+            "service.name": "test-service",
           }),
         );
 
@@ -143,16 +139,16 @@ describe('GCP Exporters', () => {
         });
       });
 
-      it('should handle export failures', async () => {
+      it("should handle export failures", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
-        const error = new Error('Write failed');
+        const error = new Error("Write failed");
         mockLogWrite.mockRejectedValueOnce(error);
 
         const callback = vi.fn();
@@ -167,17 +163,17 @@ describe('GCP Exporters', () => {
         });
       });
 
-      it('should handle synchronous errors', () => {
+      it("should handle synchronous errors", () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
         mockLog.entry.mockImplementation(() => {
-          throw new Error('Entry creation failed');
+          throw new Error("Entry creation failed");
         });
 
         const callback = vi.fn();
@@ -191,17 +187,17 @@ describe('GCP Exporters', () => {
       });
     });
 
-    describe('severity mapping', () => {
-      it('should map OpenTelemetry severity numbers to Cloud Logging levels', () => {
+    describe("severity mapping", () => {
+      it("should map OpenTelemetry severity numbers to Cloud Logging levels", () => {
         const testCases = [
-          { severityNumber: undefined, expected: 'DEFAULT' },
-          { severityNumber: 1, expected: 'DEFAULT' },
-          { severityNumber: 5, expected: 'DEBUG' },
-          { severityNumber: 9, expected: 'INFO' },
-          { severityNumber: 13, expected: 'WARNING' },
-          { severityNumber: 17, expected: 'ERROR' },
-          { severityNumber: 21, expected: 'CRITICAL' },
-          { severityNumber: 25, expected: 'CRITICAL' },
+          { severityNumber: undefined, expected: "DEFAULT" },
+          { severityNumber: 1, expected: "DEFAULT" },
+          { severityNumber: 5, expected: "DEBUG" },
+          { severityNumber: 9, expected: "INFO" },
+          { severityNumber: 13, expected: "WARNING" },
+          { severityNumber: 17, expected: "ERROR" },
+          { severityNumber: 21, expected: "CRITICAL" },
+          { severityNumber: 25, expected: "CRITICAL" },
         ];
 
         testCases.forEach(({ severityNumber, expected }) => {
@@ -210,7 +206,7 @@ describe('GCP Exporters', () => {
               hrTime: [1234567890, 123456789],
               hrTimeObserved: [1234567890, 123456789],
               severityNumber,
-              body: 'Test message',
+              body: "Test message",
             } as unknown as ReadableLogRecord,
           ];
 
@@ -229,17 +225,17 @@ describe('GCP Exporters', () => {
       });
     });
 
-    describe('forceFlush', () => {
-      it('should resolve immediately when no pending writes exist', async () => {
+    describe("forceFlush", () => {
+      it("should resolve immediately when no pending writes exist", async () => {
         await expect(exporter.forceFlush()).resolves.toBeUndefined();
       });
 
-      it('should wait for pending writes to complete', async () => {
+      it("should wait for pending writes to complete", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -262,12 +258,12 @@ describe('GCP Exporters', () => {
         await expect(flushPromise).resolves.toBeUndefined();
       });
 
-      it('should handle multiple pending writes', async () => {
+      it("should handle multiple pending writes", async () => {
         const mockLogRecords1: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message 1',
+            body: "Test log message 1",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -275,7 +271,7 @@ describe('GCP Exporters', () => {
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message 2',
+            body: "Test log message 2",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -288,9 +284,7 @@ describe('GCP Exporters', () => {
           resolveWrite2 = resolve;
         });
 
-        mockLogWrite
-          .mockReturnValueOnce(writePromise1)
-          .mockReturnValueOnce(writePromise2);
+        mockLogWrite.mockReturnValueOnce(writePromise1).mockReturnValueOnce(writePromise2);
 
         const callback = vi.fn();
 
@@ -308,16 +302,16 @@ describe('GCP Exporters', () => {
         await expect(flushPromise).resolves.toBeUndefined();
       });
 
-      it('should handle write failures gracefully', async () => {
+      it("should handle write failures gracefully", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
-        const error = new Error('Write failed');
+        const error = new Error("Write failed");
         mockLogWrite.mockRejectedValueOnce(error);
 
         const callback = vi.fn();
@@ -334,27 +328,27 @@ describe('GCP Exporters', () => {
       });
     });
 
-    describe('shutdown', () => {
-      it('should call forceFlush', async () => {
-        const forceFlushSpy = vi.spyOn(exporter, 'forceFlush');
+    describe("shutdown", () => {
+      it("should call forceFlush", async () => {
+        const forceFlushSpy = vi.spyOn(exporter, "forceFlush");
 
         await exporter.shutdown();
 
         expect(forceFlushSpy).toHaveBeenCalled();
       });
 
-      it('should handle shutdown gracefully', async () => {
-        const forceFlushSpy = vi.spyOn(exporter, 'forceFlush');
+      it("should handle shutdown gracefully", async () => {
+        const forceFlushSpy = vi.spyOn(exporter, "forceFlush");
 
         await expect(exporter.shutdown()).resolves.toBeUndefined();
         expect(forceFlushSpy).toHaveBeenCalled();
       });
-      it('should wait for pending writes before shutting down', async () => {
+      it("should wait for pending writes before shutting down", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
@@ -377,12 +371,12 @@ describe('GCP Exporters', () => {
         await expect(shutdownPromise).resolves.toBeUndefined();
       });
 
-      it('should clear pending writes array after shutdown', async () => {
+      it("should clear pending writes array after shutdown", async () => {
         const mockLogRecords: ReadableLogRecord[] = [
           {
             hrTime: [1234567890, 123456789],
             hrTimeObserved: [1234567890, 123456789],
-            body: 'Test log message',
+            body: "Test log message",
           } as unknown as ReadableLogRecord,
         ];
 
diff --git a/packages/gemini-core/src/telemetry/gcp-exporters.ts b/packages/gemini-core/src/telemetry/gcp-exporters.ts
index 8bc776f63..a140959d2 100644
--- a/packages/gemini-core/src/telemetry/gcp-exporters.ts
+++ b/packages/gemini-core/src/telemetry/gcp-exporters.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { TraceExporter } from '@google-cloud/opentelemetry-cloud-trace-exporter';
-import { MetricExporter } from '@google-cloud/opentelemetry-cloud-monitoring-exporter';
-import { Logging } from '@google-cloud/logging';
-import type { Log } from '@google-cloud/logging';
-import { hrTimeToMilliseconds } from '@opentelemetry/core';
-import type { ExportResult } from '@opentelemetry/core';
-import { ExportResultCode } from '@opentelemetry/core';
-import type {
-  ReadableLogRecord,
-  LogRecordExporter,
-} from '@opentelemetry/sdk-logs';
+import type { Log } from "@google-cloud/logging";
+import { Logging } from "@google-cloud/logging";
+import { MetricExporter } from "@google-cloud/opentelemetry-cloud-monitoring-exporter";
+import { TraceExporter } from "@google-cloud/opentelemetry-cloud-trace-exporter";
+import type { ExportResult } from "@opentelemetry/core";
+import { ExportResultCode, hrTimeToMilliseconds } from "@opentelemetry/core";
+import type { LogRecordExporter, ReadableLogRecord } from "@opentelemetry/sdk-logs";
 
 /**
  * Google Cloud Trace exporter that extends the official trace exporter
@@ -35,7 +31,7 @@ export class GcpMetricExporter extends MetricExporter {
   constructor(projectId?: string) {
     super({
       projectId,
-      prefix: 'custom.googleapis.com/gemini_cli',
+      prefix: "custom.googleapis.com/gemini_cli",
     });
   }
 }
@@ -50,13 +46,10 @@ export class GcpLogExporter implements LogRecordExporter {
 
   constructor(projectId?: string) {
     this.logging = new Logging({ projectId });
-    this.log = this.logging.log('gemini_cli');
+    this.log = this.logging.log("gemini_cli");
   }
 
-  export(
-    logs: ReadableLogRecord[],
-    resultCallback: (result: ExportResult) => void,
-  ): void {
+  export(logs: ReadableLogRecord[], resultCallback: (result: ExportResult) => void): void {
     try {
       const entries = logs.map((log) => {
         const entry = this.log.entry(
@@ -64,7 +57,7 @@ export class GcpLogExporter implements LogRecordExporter {
             severity: this.mapSeverityToCloudLogging(log.severityNumber),
             timestamp: new Date(hrTimeToMilliseconds(log.hrTime)),
             resource: {
-              type: 'global',
+              type: "global",
               labels: {
                 project_id: this.logging.projectId,
               },
@@ -117,15 +110,15 @@ export class GcpLogExporter implements LogRecordExporter {
   }
 
   private mapSeverityToCloudLogging(severityNumber?: number): string {
-    if (!severityNumber) return 'DEFAULT';
+    if (!severityNumber) return "DEFAULT";
 
     // Map OpenTelemetry severity numbers to Cloud Logging severity levels
     // https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber
-    if (severityNumber >= 21) return 'CRITICAL';
-    if (severityNumber >= 17) return 'ERROR';
-    if (severityNumber >= 13) return 'WARNING';
-    if (severityNumber >= 9) return 'INFO';
-    if (severityNumber >= 5) return 'DEBUG';
-    return 'DEFAULT';
+    if (severityNumber >= 21) return "CRITICAL";
+    if (severityNumber >= 17) return "ERROR";
+    if (severityNumber >= 13) return "WARNING";
+    if (severityNumber >= 9) return "INFO";
+    if (severityNumber >= 5) return "DEBUG";
+    return "DEFAULT";
   }
 }
diff --git a/packages/gemini-core/src/telemetry/high-water-mark-tracker.test.ts b/packages/gemini-core/src/telemetry/high-water-mark-tracker.test.ts
index 568b2a797..cebe3c4c0 100644
--- a/packages/gemini-core/src/telemetry/high-water-mark-tracker.test.ts
+++ b/packages/gemini-core/src/telemetry/high-water-mark-tracker.test.ts
@@ -4,184 +4,182 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { HighWaterMarkTracker } from './high-water-mark-tracker.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
 
-describe('HighWaterMarkTracker', () => {
+describe("HighWaterMarkTracker", () => {
   let tracker: HighWaterMarkTracker;
 
   beforeEach(() => {
     tracker = new HighWaterMarkTracker(5); // 5% threshold
   });
 
-  describe('constructor', () => {
-    it('should initialize with default values', () => {
+  describe("constructor", () => {
+    it("should initialize with default values", () => {
       const defaultTracker = new HighWaterMarkTracker();
       expect(defaultTracker).toBeInstanceOf(HighWaterMarkTracker);
     });
 
-    it('should initialize with custom values', () => {
+    it("should initialize with custom values", () => {
       const customTracker = new HighWaterMarkTracker(10);
       expect(customTracker).toBeInstanceOf(HighWaterMarkTracker);
     });
 
-    it('should throw on negative threshold', () => {
+    it("should throw on negative threshold", () => {
       expect(() => new HighWaterMarkTracker(-1)).toThrow(
-        'growthThresholdPercent must be non-negative.',
+        "growthThresholdPercent must be non-negative.",
       );
     });
   });
 
-  describe('shouldRecordMetric', () => {
-    it('should return true for first measurement', () => {
-      const result = tracker.shouldRecordMetric('heap_used', 1000000);
+  describe("shouldRecordMetric", () => {
+    it("should return true for first measurement", () => {
+      const result = tracker.shouldRecordMetric("heap_used", 1000000);
       expect(result).toBe(true);
     });
 
-    it('should return false for small increases', () => {
+    it("should return false for small increases", () => {
       // Set initial high-water mark
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Small increase (less than 5%)
-      const result = tracker.shouldRecordMetric('heap_used', 1030000); // 3% increase
+      const result = tracker.shouldRecordMetric("heap_used", 1030000); // 3% increase
       expect(result).toBe(false);
     });
 
-    it('should return true for significant increases', () => {
+    it("should return true for significant increases", () => {
       // Set initial high-water mark
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Add several readings to build up smoothing window
-      tracker.shouldRecordMetric('heap_used', 1100000); // 10% increase
-      tracker.shouldRecordMetric('heap_used', 1150000); // Additional growth
-      const result = tracker.shouldRecordMetric('heap_used', 1200000); // Sustained growth
+      tracker.shouldRecordMetric("heap_used", 1100000); // 10% increase
+      tracker.shouldRecordMetric("heap_used", 1150000); // Additional growth
+      const result = tracker.shouldRecordMetric("heap_used", 1200000); // Sustained growth
       expect(result).toBe(true);
     });
 
-    it('should handle decreasing values correctly', () => {
+    it("should handle decreasing values correctly", () => {
       // Set initial high-water mark
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Decrease (should not trigger)
-      const result = tracker.shouldRecordMetric('heap_used', 900000); // 10% decrease
+      const result = tracker.shouldRecordMetric("heap_used", 900000); // 10% decrease
       expect(result).toBe(false);
     });
 
-    it('should update high-water mark when threshold exceeded', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
+    it("should update high-water mark when threshold exceeded", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
-      const beforeMark = tracker.getHighWaterMark('heap_used');
+      const beforeMark = tracker.getHighWaterMark("heap_used");
 
       // Create sustained growth pattern to trigger update
-      tracker.shouldRecordMetric('heap_used', 1100000);
-      tracker.shouldRecordMetric('heap_used', 1150000);
-      tracker.shouldRecordMetric('heap_used', 1200000);
+      tracker.shouldRecordMetric("heap_used", 1100000);
+      tracker.shouldRecordMetric("heap_used", 1150000);
+      tracker.shouldRecordMetric("heap_used", 1200000);
 
-      const afterMark = tracker.getHighWaterMark('heap_used');
+      const afterMark = tracker.getHighWaterMark("heap_used");
 
       expect(afterMark).toBeGreaterThan(beforeMark);
     });
 
-    it('should handle multiple metric types independently', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+    it("should handle multiple metric types independently", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
-      expect(tracker.getHighWaterMark('heap_used')).toBeGreaterThan(0);
-      expect(tracker.getHighWaterMark('rss')).toBeGreaterThan(0);
-      expect(tracker.getHighWaterMark('heap_used')).not.toBe(
-        tracker.getHighWaterMark('rss'),
-      );
+      expect(tracker.getHighWaterMark("heap_used")).toBeGreaterThan(0);
+      expect(tracker.getHighWaterMark("rss")).toBeGreaterThan(0);
+      expect(tracker.getHighWaterMark("heap_used")).not.toBe(tracker.getHighWaterMark("rss"));
     });
   });
 
-  describe('smoothing functionality', () => {
-    it('should reduce noise from garbage collection spikes', () => {
+  describe("smoothing functionality", () => {
+    it("should reduce noise from garbage collection spikes", () => {
       // Establish baseline
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Single spike (should be smoothed out)
-      const result = tracker.shouldRecordMetric('heap_used', 2000000);
+      const result = tracker.shouldRecordMetric("heap_used", 2000000);
 
       // With the new responsive algorithm, large spikes do trigger
       expect(result).toBe(true);
     });
 
-    it('should eventually respond to sustained growth', () => {
+    it("should eventually respond to sustained growth", () => {
       // Establish baseline
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Sustained growth pattern
-      tracker.shouldRecordMetric('heap_used', 1100000);
-      tracker.shouldRecordMetric('heap_used', 1150000);
-      const result = tracker.shouldRecordMetric('heap_used', 1200000);
+      tracker.shouldRecordMetric("heap_used", 1100000);
+      tracker.shouldRecordMetric("heap_used", 1150000);
+      const result = tracker.shouldRecordMetric("heap_used", 1200000);
 
       expect(result).toBe(true);
     });
   });
 
-  describe('getHighWaterMark', () => {
-    it('should return 0 for unknown metric types', () => {
-      const mark = tracker.getHighWaterMark('unknown_metric');
+  describe("getHighWaterMark", () => {
+    it("should return 0 for unknown metric types", () => {
+      const mark = tracker.getHighWaterMark("unknown_metric");
       expect(mark).toBe(0);
     });
 
-    it('should return correct value for known metric types', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      const mark = tracker.getHighWaterMark('heap_used');
+    it("should return correct value for known metric types", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      const mark = tracker.getHighWaterMark("heap_used");
       expect(mark).toBeGreaterThan(0);
     });
   });
 
-  describe('getAllHighWaterMarks', () => {
-    it('should return empty object initially', () => {
+  describe("getAllHighWaterMarks", () => {
+    it("should return empty object initially", () => {
       const marks = tracker.getAllHighWaterMarks();
       expect(marks).toEqual({});
     });
 
-    it('should return all recorded marks', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+    it("should return all recorded marks", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
       const marks = tracker.getAllHighWaterMarks();
       expect(Object.keys(marks)).toHaveLength(2);
-      expect(marks['heap_used']).toBeGreaterThan(0);
-      expect(marks['rss']).toBeGreaterThan(0);
+      expect(marks["heap_used"]).toBeGreaterThan(0);
+      expect(marks["rss"]).toBeGreaterThan(0);
     });
   });
 
-  describe('resetHighWaterMark', () => {
-    it('should reset specific metric type', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+  describe("resetHighWaterMark", () => {
+    it("should reset specific metric type", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
-      tracker.resetHighWaterMark('heap_used');
+      tracker.resetHighWaterMark("heap_used");
 
-      expect(tracker.getHighWaterMark('heap_used')).toBe(0);
-      expect(tracker.getHighWaterMark('rss')).toBeGreaterThan(0);
+      expect(tracker.getHighWaterMark("heap_used")).toBe(0);
+      expect(tracker.getHighWaterMark("rss")).toBeGreaterThan(0);
     });
   });
 
-  describe('resetAllHighWaterMarks', () => {
-    it('should reset all metrics', () => {
-      tracker.shouldRecordMetric('heap_used', 1000000);
-      tracker.shouldRecordMetric('rss', 2000000);
+  describe("resetAllHighWaterMarks", () => {
+    it("should reset all metrics", () => {
+      tracker.shouldRecordMetric("heap_used", 1000000);
+      tracker.shouldRecordMetric("rss", 2000000);
 
       tracker.resetAllHighWaterMarks();
 
-      expect(tracker.getHighWaterMark('heap_used')).toBe(0);
-      expect(tracker.getHighWaterMark('rss')).toBe(0);
+      expect(tracker.getHighWaterMark("heap_used")).toBe(0);
+      expect(tracker.getHighWaterMark("rss")).toBe(0);
       expect(tracker.getAllHighWaterMarks()).toEqual({});
     });
   });
 
-  describe('time-based cleanup', () => {
-    it('should clean up old readings', () => {
+  describe("time-based cleanup", () => {
+    it("should clean up old readings", () => {
       vi.useFakeTimers();
 
       // Add readings
-      tracker.shouldRecordMetric('heap_used', 1000000);
+      tracker.shouldRecordMetric("heap_used", 1000000);
 
       // Advance time significantly
       vi.advanceTimersByTime(15000); // 15 seconds
@@ -190,7 +188,7 @@ describe('HighWaterMarkTracker', () => {
       tracker.cleanup(10000); // 10 seconds
 
       // Entry should be removed
-      expect(tracker.getHighWaterMark('heap_used')).toBe(0);
+      expect(tracker.getHighWaterMark("heap_used")).toBe(0);
 
       vi.useRealTimers();
     });
diff --git a/packages/gemini-core/src/telemetry/high-water-mark-tracker.ts b/packages/gemini-core/src/telemetry/high-water-mark-tracker.ts
index 7317650bb..981ee0746 100644
--- a/packages/gemini-core/src/telemetry/high-water-mark-tracker.ts
+++ b/packages/gemini-core/src/telemetry/high-water-mark-tracker.ts
@@ -15,7 +15,7 @@ export class HighWaterMarkTracker {
 
   constructor(growthThresholdPercent: number = 5) {
     if (growthThresholdPercent < 0) {
-      throw new Error('growthThresholdPercent must be non-negative.');
+      throw new Error("growthThresholdPercent must be non-negative.");
     }
     this.growthThresholdPercent = growthThresholdPercent;
   }
@@ -41,8 +41,7 @@ export class HighWaterMarkTracker {
     }
 
     // Check if current value exceeds threshold
-    const thresholdValue =
-      currentWaterMark * (1 + this.growthThresholdPercent / 100);
+    const thresholdValue = currentWaterMark * (1 + this.growthThresholdPercent / 100);
 
     if (currentValue > thresholdValue) {
       // Update high-water mark
diff --git a/packages/gemini-core/src/telemetry/index.ts b/packages/gemini-core/src/telemetry/index.ts
index f9f520ae7..1be83506c 100644
--- a/packages/gemini-core/src/telemetry/index.ts
+++ b/packages/gemini-core/src/telemetry/index.ts
@@ -5,135 +5,135 @@
  */
 
 export enum TelemetryTarget {
-  GCP = 'gcp',
-  LOCAL = 'local',
+  GCP = "gcp",
+  LOCAL = "local",
 }
 
 const DEFAULT_TELEMETRY_TARGET = TelemetryTarget.LOCAL;
-const DEFAULT_OTLP_ENDPOINT = 'http://localhost:4317';
+const DEFAULT_OTLP_ENDPOINT = "http://localhost:4317";
 
-export { DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT };
+export { SpanStatusCode, ValueType } from "@opentelemetry/api";
+export { SemanticAttributes } from "@opentelemetry/semantic-conventions";
 export {
-  initializeTelemetry,
-  shutdownTelemetry,
-  isTelemetrySdkInitialized,
-} from './sdk.js';
+  ActivityDetector,
+  getActivityDetector,
+  isUserActive,
+  recordUserActivity,
+} from "./activity-detector.js";
+export {
+  ActivityMonitor,
+  getActivityMonitor,
+  initializeActivityMonitor,
+  startGlobalActivityMonitoring,
+  stopGlobalActivityMonitoring,
+} from "./activity-monitor.js";
+export { ActivityType } from "./activity-types.js";
 export {
-  resolveTelemetrySettings,
   parseBooleanEnvFlag,
   parseTelemetryTargetValue,
-} from './config.js';
+  resolveTelemetrySettings,
+} from "./config.js";
 export {
-  GcpTraceExporter,
-  GcpMetricExporter,
   GcpLogExporter,
-} from './gcp-exporters.js';
+  GcpMetricExporter,
+  GcpTraceExporter,
+} from "./gcp-exporters.js";
+export { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
 export {
-  logCliConfiguration,
-  logUserPrompt,
-  logToolCall,
-  logApiRequest,
   logApiError,
+  logApiRequest,
   logApiResponse,
-  logFlashFallback,
-  logSlashCommand,
-  logConversationFinishedEvent,
   logChatCompression,
-  logToolOutputTruncated,
+  logCliConfiguration,
+  logConversationFinishedEvent,
   logExtensionEnable,
   logExtensionInstallEvent,
   logExtensionUninstall,
   logExtensionUpdateEvent,
+  logFlashFallback,
+  logSlashCommand,
+  logToolCall,
+  logToolOutputTruncated,
+  logUserPrompt,
   logWebFetchFallbackAttempt,
-} from './loggers.js';
-export type { SlashCommandEvent, ChatCompressionEvent } from './types.js';
+} from "./loggers.js";
+export type { MemorySnapshot, ProcessMetrics } from "./memory-monitor.js";
 export {
-  SlashCommandStatus,
-  EndSessionEvent,
-  UserPromptEvent,
-  ApiRequestEvent,
-  ApiErrorEvent,
-  ApiResponseEvent,
-  FlashFallbackEvent,
-  StartSessionEvent,
-  ToolCallEvent,
-  ConversationFinishedEvent,
-  ToolOutputTruncatedEvent,
-  WebFetchFallbackAttemptEvent,
-  ToolCallDecision,
-} from './types.js';
-export { makeSlashCommandEvent, makeChatCompressionEvent } from './types.js';
-export type { TelemetryEvent } from './types.js';
-export { SpanStatusCode, ValueType } from '@opentelemetry/api';
-export { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-export * from './uiTelemetry.js';
-export {
-  MemoryMonitor,
-  initializeMemoryMonitor,
   getMemoryMonitor,
+  initializeMemoryMonitor,
+  MemoryMonitor,
   recordCurrentMemoryUsage,
   startGlobalMemoryMonitoring,
   stopGlobalMemoryMonitoring,
-} from './memory-monitor.js';
-export type { MemorySnapshot, ProcessMetrics } from './memory-monitor.js';
-export { HighWaterMarkTracker } from './high-water-mark-tracker.js';
-export { RateLimiter } from './rate-limiter.js';
-export { ActivityType } from './activity-types.js';
+} from "./memory-monitor.js";
 export {
-  ActivityDetector,
-  getActivityDetector,
-  recordUserActivity,
-  isUserActive,
-} from './activity-detector.js';
-export {
-  ActivityMonitor,
-  initializeActivityMonitor,
-  getActivityMonitor,
-  startGlobalActivityMonitoring,
-  stopGlobalActivityMonitoring,
-} from './activity-monitor.js';
-export {
-  // Core metrics functions
-  recordToolCallMetrics,
-  recordTokenUsageMetrics,
-  recordApiResponseMetrics,
+  ApiRequestPhase,
+  FileOperation,
+  // OpenTelemetry Semantic Convention types
+  GenAiOperationName,
+  GenAiProviderName,
+  GenAiTokenType,
+  getConventionAttributes,
+  isPerformanceMonitoringActive,
+  MemoryMetricType,
+  // Performance monitoring types
+  PerformanceMetricType,
   recordApiErrorMetrics,
-  recordFileOperationMetric,
-  recordInvalidChunk,
+  recordApiRequestBreakdown,
+  recordApiResponseMetrics,
+  recordBaselineComparison,
   recordContentRetry,
   recordContentRetryFailure,
-  recordModelRoutingMetrics,
+  recordCpuUsage,
+  recordCustomApiResponseMetrics,
   // Custom metrics for token usage and API responses
   recordCustomTokenUsageMetrics,
-  recordCustomApiResponseMetrics,
   recordExitFail,
+  recordFileOperationMetric,
+  recordFlickerFrame,
+  recordGenAiClientOperationDuration,
   // OpenTelemetry GenAI semantic convention for token usage and operation duration
   recordGenAiClientTokenUsage,
-  recordGenAiClientOperationDuration,
-  getConventionAttributes,
-  // Performance monitoring functions
-  recordStartupPerformance,
+  recordInvalidChunk,
   recordMemoryUsage,
-  recordCpuUsage,
-  recordToolQueueDepth,
-  recordToolExecutionBreakdown,
-  recordTokenEfficiency,
-  recordApiRequestBreakdown,
-  recordPerformanceScore,
+  recordModelRoutingMetrics,
   recordPerformanceRegression,
-  recordBaselineComparison,
-  isPerformanceMonitoringActive,
-  recordFlickerFrame,
+  recordPerformanceScore,
   recordSlowRender,
-  // Performance monitoring types
-  PerformanceMetricType,
-  MemoryMetricType,
+  // Performance monitoring functions
+  recordStartupPerformance,
+  recordTokenEfficiency,
+  recordTokenUsageMetrics,
+  // Core metrics functions
+  recordToolCallMetrics,
+  recordToolExecutionBreakdown,
+  recordToolQueueDepth,
   ToolExecutionPhase,
-  ApiRequestPhase,
-  FileOperation,
-  // OpenTelemetry Semantic Convention types
-  GenAiOperationName,
-  GenAiProviderName,
-  GenAiTokenType,
-} from './metrics.js';
-export { runInDevTraceSpan, type SpanMetadata } from './trace.js';
+} from "./metrics.js";
+export { RateLimiter } from "./rate-limiter.js";
+export {
+  initializeTelemetry,
+  isTelemetrySdkInitialized,
+  shutdownTelemetry,
+} from "./sdk.js";
+export { runInDevTraceSpan, type SpanMetadata } from "./trace.js";
+export type { ChatCompressionEvent, SlashCommandEvent, TelemetryEvent } from "./types.js";
+export {
+  ApiErrorEvent,
+  ApiRequestEvent,
+  ApiResponseEvent,
+  ConversationFinishedEvent,
+  EndSessionEvent,
+  FlashFallbackEvent,
+  makeChatCompressionEvent,
+  makeSlashCommandEvent,
+  SlashCommandStatus,
+  StartSessionEvent,
+  ToolCallDecision,
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
+  UserPromptEvent,
+  WebFetchFallbackAttemptEvent,
+} from "./types.js";
+export * from "./uiTelemetry.js";
+export { DEFAULT_OTLP_ENDPOINT, DEFAULT_TELEMETRY_TARGET };
diff --git a/packages/gemini-core/src/telemetry/integration.test.circular.ts b/packages/gemini-core/src/telemetry/integration.test.circular.ts
index 9ff8a58ec..12aacf72b 100644
--- a/packages/gemini-core/src/telemetry/integration.test.circular.ts
+++ b/packages/gemini-core/src/telemetry/integration.test.circular.ts
@@ -8,28 +8,28 @@
  * Integration test to verify circular reference handling with proxy agents
  */
 
-import { describe, it, expect } from 'vitest';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
-import type { Config } from '../config/config.js';
+import { describe, expect, it } from "vitest";
+import type { Config } from "../config/config.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
 
-describe('Circular Reference Integration Test', () => {
-  it('should handle HttpsProxyAgent-like circular references in clearcut logging', () => {
+describe("Circular Reference Integration Test", () => {
+  it("should handle HttpsProxyAgent-like circular references in clearcut logging", () => {
     // Create a mock config with proxy
     const mockConfig = {
       getTelemetryEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
-      getSessionId: () => 'test-session',
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding',
+      getSessionId: () => "test-session",
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding",
       getDebugMode: () => false,
-      getProxy: () => 'http://proxy.example.com:8080',
+      getProxy: () => "http://proxy.example.com:8080",
     } as unknown as Config;
 
     // Simulate the structure that causes the circular reference error
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const proxyAgentLike: any = {
       sockets: {},
-      options: { proxy: 'http://proxy.example.com:8080' },
+      options: { proxy: "http://proxy.example.com:8080" },
     };
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -41,13 +41,13 @@ describe('Circular Reference Integration Test', () => {
     };
 
     socketLike._httpMessage.socket = socketLike; // Create circular reference
-    proxyAgentLike.sockets['cloudcode-pa.googleapis.com:443'] = [socketLike];
+    proxyAgentLike.sockets["cloudcode-pa.googleapis.com:443"] = [socketLike];
 
     // Create an event that would contain this circular structure
     const problematicEvent = {
-      error: new Error('Network error'),
+      error: new Error("Network error"),
       function_args: {
-        filePath: '/test/file.txt',
+        filePath: "/test/file.txt",
         httpAgent: proxyAgentLike, // This would cause the circular reference
       },
     };
diff --git a/packages/gemini-core/src/telemetry/loggers.test.circular.ts b/packages/gemini-core/src/telemetry/loggers.test.circular.ts
index 2f82743de..2d93625f6 100644
--- a/packages/gemini-core/src/telemetry/loggers.test.circular.ts
+++ b/packages/gemini-core/src/telemetry/loggers.test.circular.ts
@@ -8,26 +8,23 @@
  * Test to verify circular reference handling in telemetry logging
  */
 
-import { describe, it, expect } from 'vitest';
-import { logToolCall } from './loggers.js';
-import { ToolCallEvent } from './types.js';
-import type { Config } from '../config/config.js';
-import type { CompletedToolCall } from '../core/coreToolScheduler.js';
-import type {
-  ToolCallRequestInfo,
-  ToolCallResponseInfo,
-} from '../core/turn.js';
-import { MockTool } from '../test-utils/mock-tool.js';
-
-describe('Circular Reference Handling', () => {
-  it('should handle circular references in tool function arguments', () => {
+import { describe, expect, it } from "vitest";
+import type { Config } from "../config/config.js";
+import type { CompletedToolCall } from "../core/coreToolScheduler.js";
+import type { ToolCallRequestInfo, ToolCallResponseInfo } from "../core/turn.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { logToolCall } from "./loggers.js";
+import { ToolCallEvent } from "./types.js";
+
+describe("Circular Reference Handling", () => {
+  it("should handle circular references in tool function arguments", () => {
     // Create a mock config
     const mockConfig = {
       getTelemetryEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
-      getSessionId: () => 'test-session',
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding',
+      getSessionId: () => "test-session",
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding",
       getDebugMode: () => false,
     } as unknown as Config;
 
@@ -38,30 +35,28 @@ describe('Circular Reference Handling', () => {
       agent: null,
     };
     circularObject.agent = circularObject; // Create circular reference
-    circularObject.sockets['test-host'] = [
-      { _httpMessage: { agent: circularObject } },
-    ];
+    circularObject.sockets["test-host"] = [{ _httpMessage: { agent: circularObject } }];
 
     // Create a mock CompletedToolCall with circular references in function_args
     const mockRequest: ToolCallRequestInfo = {
-      callId: 'test-call-id',
-      name: 'ReadFile',
+      callId: "test-call-id",
+      name: "ReadFile",
       args: circularObject, // This would cause the original error
       isClientInitiated: false,
-      prompt_id: 'test-prompt-id',
+      prompt_id: "test-prompt-id",
     };
 
     const mockResponse: ToolCallResponseInfo = {
-      callId: 'test-call-id',
-      responseParts: [{ text: 'test result' }],
+      callId: "test-call-id",
+      responseParts: [{ text: "test result" }],
       resultDisplay: undefined,
       error: undefined, // undefined means success
       errorType: undefined,
     };
 
-    const tool = new MockTool({ name: 'mock-tool' });
+    const tool = new MockTool({ name: "mock-tool" });
     const mockCompletedToolCall: CompletedToolCall = {
-      status: 'success',
+      status: "success",
       request: mockRequest,
       response: mockResponse,
       tool,
@@ -77,40 +72,40 @@ describe('Circular Reference Handling', () => {
     }).not.toThrow();
   });
 
-  it('should handle normal objects without circular references', () => {
+  it("should handle normal objects without circular references", () => {
     const mockConfig = {
       getTelemetryEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
-      getSessionId: () => 'test-session',
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding',
+      getSessionId: () => "test-session",
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding",
       getDebugMode: () => false,
     } as unknown as Config;
 
     const normalObject = {
-      filePath: '/test/path',
-      options: { encoding: 'utf8' },
+      filePath: "/test/path",
+      options: { encoding: "utf8" },
     };
 
     const mockRequest: ToolCallRequestInfo = {
-      callId: 'test-call-id',
-      name: 'ReadFile',
+      callId: "test-call-id",
+      name: "ReadFile",
       args: normalObject,
       isClientInitiated: false,
-      prompt_id: 'test-prompt-id',
+      prompt_id: "test-prompt-id",
     };
 
     const mockResponse: ToolCallResponseInfo = {
-      callId: 'test-call-id',
-      responseParts: [{ text: 'test result' }],
+      callId: "test-call-id",
+      responseParts: [{ text: "test result" }],
       resultDisplay: undefined,
       error: undefined, // undefined means success
       errorType: undefined,
     };
 
-    const tool = new MockTool({ name: 'mock-tool' });
+    const tool = new MockTool({ name: "mock-tool" });
     const mockCompletedToolCall: CompletedToolCall = {
-      status: 'success',
+      status: "success",
       request: mockRequest,
       response: mockResponse,
       tool,
diff --git a/packages/gemini-core/src/telemetry/loggers.test.ts b/packages/gemini-core/src/telemetry/loggers.test.ts
index 46357d699..2839407e8 100644
--- a/packages/gemini-core/src/telemetry/loggers.test.ts
+++ b/packages/gemini-core/src/telemetry/loggers.test.ts
@@ -4,12 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import {
+  type CallableTool,
+  FinishReason,
+  type GenerateContentResponseUsageMetadata,
+} from "@google/genai";
+import { logs } from "@opentelemetry/api-logs";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { AgentTerminateMode } from "../agents/types.js";
+import type { Config } from "../config/config.js";
+import { type GeminiCLIExtension } from "../config/config.js";
 import type {
   AnyToolInvocation,
   CompletedToolCall,
   ContentGeneratorConfig,
   ErroredToolCall,
-} from '../index.js';
+} from "../index.js";
 import {
   AuthType,
   EditTool,
@@ -17,96 +27,86 @@ import {
   ToolConfirmationOutcome,
   ToolErrorType,
   ToolRegistry,
-} from '../index.js';
-import { OutputFormat } from '../output/types.js';
-import { logs } from '@opentelemetry/api-logs';
-import type { Config } from '../config/config.js';
+} from "../index.js";
+import { OutputFormat } from "../output/types.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { DiscoveredMCPTool } from "../tools/mcp-tool.js";
+import { InstallationManager } from "../utils/installationManager.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
 import {
+  logAgentFinish,
+  logAgentStart,
   logApiError,
   logApiRequest,
   logApiResponse,
+  logChatCompression,
   logCliConfiguration,
-  logUserPrompt,
-  logToolCall,
+  logExtensionDisable,
+  logExtensionEnable,
+  logExtensionInstallEvent,
+  logExtensionUninstall,
+  logExtensionUpdateEvent,
+  logFileOperation,
   logFlashFallback,
-  logChatCompression,
   logMalformedJsonResponse,
-  logFileOperation,
+  logModelRouting,
   logRipgrepFallback,
+  logToolCall,
   logToolOutputTruncated,
-  logModelRouting,
-  logExtensionEnable,
-  logExtensionDisable,
-  logExtensionInstallEvent,
-  logExtensionUninstall,
-  logAgentStart,
-  logAgentFinish,
+  logUserPrompt,
   logWebFetchFallbackAttempt,
-  logExtensionUpdateEvent,
-} from './loggers.js';
-import { ToolCallDecision } from './tool-call-decision.js';
+} from "./loggers.js";
+import * as metrics from "./metrics.js";
+import { FileOperation } from "./metrics.js";
+import * as sdk from "./sdk.js";
+import { ToolCallDecision } from "./tool-call-decision.js";
 import {
+  AgentFinishEvent,
+  AgentStartEvent,
+  ApiErrorEvent,
+  ApiRequestEvent,
+  ApiResponseEvent,
+  EVENT_AGENT_FINISH,
+  EVENT_AGENT_START,
   EVENT_API_ERROR,
   EVENT_API_REQUEST,
   EVENT_API_RESPONSE,
   EVENT_CLI_CONFIG,
-  EVENT_TOOL_CALL,
-  EVENT_USER_PROMPT,
-  EVENT_FLASH_FALLBACK,
-  EVENT_MALFORMED_JSON_RESPONSE,
-  EVENT_FILE_OPERATION,
-  EVENT_RIPGREP_FALLBACK,
-  EVENT_MODEL_ROUTING,
-  EVENT_EXTENSION_ENABLE,
   EVENT_EXTENSION_DISABLE,
+  EVENT_EXTENSION_ENABLE,
   EVENT_EXTENSION_INSTALL,
   EVENT_EXTENSION_UNINSTALL,
+  EVENT_EXTENSION_UPDATE,
+  EVENT_FILE_OPERATION,
+  EVENT_FLASH_FALLBACK,
+  EVENT_MALFORMED_JSON_RESPONSE,
+  EVENT_MODEL_ROUTING,
+  EVENT_RIPGREP_FALLBACK,
+  EVENT_TOOL_CALL,
   EVENT_TOOL_OUTPUT_TRUNCATED,
-  EVENT_AGENT_START,
-  EVENT_AGENT_FINISH,
+  EVENT_USER_PROMPT,
   EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
-  ApiErrorEvent,
-  ApiRequestEvent,
-  ApiResponseEvent,
-  StartSessionEvent,
-  ToolCallEvent,
-  UserPromptEvent,
+  ExtensionDisableEvent,
+  ExtensionEnableEvent,
+  ExtensionInstallEvent,
+  ExtensionUninstallEvent,
+  ExtensionUpdateEvent,
+  FileOperationEvent,
   FlashFallbackEvent,
-  RipgrepFallbackEvent,
   MalformedJsonResponseEvent,
+  ModelRoutingEvent,
   makeChatCompressionEvent,
-  FileOperationEvent,
+  RipgrepFallbackEvent,
+  StartSessionEvent,
+  ToolCallEvent,
   ToolOutputTruncatedEvent,
-  ModelRoutingEvent,
-  ExtensionEnableEvent,
-  ExtensionDisableEvent,
-  ExtensionInstallEvent,
-  ExtensionUninstallEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
+  UserPromptEvent,
   WebFetchFallbackAttemptEvent,
-  ExtensionUpdateEvent,
-  EVENT_EXTENSION_UPDATE,
-} from './types.js';
-import * as metrics from './metrics.js';
-import { FileOperation } from './metrics.js';
-import * as sdk from './sdk.js';
-import { vi, describe, beforeEach, it, expect, afterEach } from 'vitest';
-import { type GeminiCLIExtension } from '../config/config.js';
-import {
-  FinishReason,
-  type CallableTool,
-  type GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
-import * as uiTelemetry from './uiTelemetry.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
-import { InstallationManager } from '../utils/installationManager.js';
-import { AgentTerminateMode } from '../agents/types.js';
-
-describe('loggers', () => {
+} from "./types.js";
+import * as uiTelemetry from "./uiTelemetry.js";
+
+describe("loggers", () => {
   const mockLogger = {
     emit: vi.fn(),
   };
@@ -116,30 +116,26 @@ describe('loggers', () => {
 
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.spyOn(sdk, 'isTelemetrySdkInitialized').mockReturnValue(true);
-    vi.spyOn(logs, 'getLogger').mockReturnValue(mockLogger);
-    vi.spyOn(uiTelemetry.uiTelemetryService, 'addEvent').mockImplementation(
-      mockUiEvent.addEvent,
+    vi.spyOn(sdk, "isTelemetrySdkInitialized").mockReturnValue(true);
+    vi.spyOn(logs, "getLogger").mockReturnValue(mockLogger);
+    vi.spyOn(uiTelemetry.uiTelemetryService, "addEvent").mockImplementation(mockUiEvent.addEvent);
+    vi.spyOn(UserAccountManager.prototype, "getCachedGoogleAccount").mockReturnValue(
+      "test-user@example.com",
+    );
+    vi.spyOn(InstallationManager.prototype, "getInstallationId").mockReturnValue(
+      "test-installation-id",
     );
-    vi.spyOn(
-      UserAccountManager.prototype,
-      'getCachedGoogleAccount',
-    ).mockReturnValue('test-user@example.com');
-    vi.spyOn(
-      InstallationManager.prototype,
-      'getInstallationId',
-    ).mockReturnValue('test-installation-id');
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-01-01T00:00:00.000Z'));
+    vi.setSystemTime(new Date("2025-01-01T00:00:00.000Z"));
   });
 
-  describe('logChatCompression', () => {
+  describe("logChatCompression", () => {
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordChatCompressionMetrics');
-      vi.spyOn(ClearcutLogger.prototype, 'logChatCompressionEvent');
+      vi.spyOn(metrics, "recordChatCompressionMetrics");
+      vi.spyOn(ClearcutLogger.prototype, "logChatCompressionEvent");
     });
 
-    it('logs the chat compression event to Clearcut', () => {
+    it("logs the chat compression event to Clearcut", () => {
       const mockConfig = makeFakeConfig();
 
       const event = makeChatCompressionEvent({
@@ -149,12 +145,10 @@ describe('loggers', () => {
 
       logChatCompression(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logChatCompressionEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logChatCompressionEvent).toHaveBeenCalledWith(event);
     });
 
-    it('records the chat compression event to OTEL', () => {
+    it("records the chat compression event to OTEL", () => {
       const mockConfig = makeFakeConfig();
 
       logChatCompression(
@@ -165,25 +159,25 @@ describe('loggers', () => {
         }),
       );
 
-      expect(metrics.recordChatCompressionMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        { tokens_before: 9001, tokens_after: 9000 },
-      );
+      expect(metrics.recordChatCompressionMetrics).toHaveBeenCalledWith(mockConfig, {
+        tokens_before: 9001,
+        tokens_after: 9000,
+      });
     });
   });
 
-  describe('logCliConfiguration', () => {
-    it('should log the cli configuration', () => {
+  describe("logCliConfiguration", () => {
+    it("should log the cli configuration", () => {
       const mockConfig = {
-        getSessionId: () => 'test-session-id',
-        getModel: () => 'test-model',
-        getEmbeddingModel: () => 'test-embedding-model',
+        getSessionId: () => "test-session-id",
+        getModel: () => "test-model",
+        getEmbeddingModel: () => "test-embedding-model",
         getSandbox: () => true,
-        getCoreTools: () => ['ls', 'read-file'],
-        getApprovalMode: () => 'default',
+        getCoreTools: () => ["ls", "read-file"],
+        getApprovalMode: () => "default",
         getContentGeneratorConfig: () => ({
-          model: 'test-model',
-          apiKey: 'test-api-key',
+          model: "test-model",
+          apiKey: "test-api-key",
           authType: AuthType.USE_VERTEX_AI,
         }),
         getTelemetryEnabled: () => true,
@@ -193,21 +187,21 @@ describe('loggers', () => {
         getFileFilteringAllowBuildArtifacts: () => false,
         getDebugMode: () => true,
         getMcpServers: () => {
-          throw new Error('Should not call');
+          throw new Error("Should not call");
         },
-        getQuestion: () => 'test-question',
-        getTargetDir: () => 'target-dir',
-        getProxy: () => 'http://test.proxy.com:8080',
+        getQuestion: () => "test-question",
+        getTargetDir: () => "target-dir",
+        getProxy: () => "http://test.proxy.com:8080",
         getOutputFormat: () => OutputFormat.JSON,
         getExtensions: () =>
           [
-            { name: 'ext-one', id: 'id-one' },
-            { name: 'ext-two', id: 'id-two' },
+            { name: "ext-one", id: "id-one" },
+            { name: "ext-two", id: "id-two" },
           ] as GeminiCLIExtension[],
         getMcpClientManager: () => ({
           getMcpServers: () => ({
-            'test-server': {
-              command: 'test-command',
+            "test-server": {
+              command: "test-command",
             },
           }),
         }),
@@ -218,113 +212,103 @@ describe('loggers', () => {
       logCliConfiguration(mockConfig, startSessionEvent);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'CLI configuration loaded.',
+        body: "CLI configuration loaded.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_CLI_CONFIG,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_CLI_CONFIG,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
-          embedding_model: 'test-embedding-model',
+          model: "test-model",
+          embedding_model: "test-embedding-model",
           sandbox_enabled: true,
-          core_tools_enabled: 'ls,read-file',
-          approval_mode: 'default',
+          core_tools_enabled: "ls,read-file",
+          approval_mode: "default",
           api_key_enabled: true,
           vertex_ai_enabled: true,
           log_user_prompts_enabled: true,
           file_filtering_respect_git_ignore: true,
           debug_mode: true,
-          mcp_servers: 'test-server',
+          mcp_servers: "test-server",
           mcp_servers_count: 1,
           mcp_tools: undefined,
           mcp_tools_count: undefined,
-          output_format: 'json',
-          extension_ids: 'id-one,id-two',
+          output_format: "json",
+          extension_ids: "id-one,id-two",
           extensions_count: 2,
-          extensions: 'ext-one,ext-two',
-          auth_type: 'vertex-ai',
+          extensions: "ext-one,ext-two",
+          auth_type: "vertex-ai",
         },
       });
     });
   });
 
-  describe('logUserPrompt', () => {
+  describe("logUserPrompt", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
-    it('should log a user prompt', () => {
-      const event = new UserPromptEvent(
-        11,
-        'prompt-id-8',
-        AuthType.USE_VERTEX_AI,
-        'test-prompt',
-      );
+    it("should log a user prompt", () => {
+      const event = new UserPromptEvent(11, "prompt-id-8", AuthType.USE_VERTEX_AI, "test-prompt");
 
       logUserPrompt(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'User prompt. Length: 11.',
+        body: "User prompt. Length: 11.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_USER_PROMPT,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_USER_PROMPT,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
           prompt_length: 11,
-          prompt: 'test-prompt',
-          prompt_id: 'prompt-id-8',
-          auth_type: 'vertex-ai',
+          prompt: "test-prompt",
+          prompt_id: "prompt-id-8",
+          auth_type: "vertex-ai",
         },
       });
     });
 
-    it('should not log prompt if disabled', () => {
+    it("should not log prompt if disabled", () => {
       const mockConfig = {
-        getSessionId: () => 'test-session-id',
+        getSessionId: () => "test-session-id",
         getTelemetryEnabled: () => true,
         getTelemetryLogPromptsEnabled: () => false,
-        getTargetDir: () => 'target-dir',
+        getTargetDir: () => "target-dir",
         getUsageStatisticsEnabled: () => true,
         isInteractive: () => false,
       } as unknown as Config;
-      const event = new UserPromptEvent(
-        11,
-        'prompt-id-9',
-        AuthType.CLOUD_SHELL,
-        'test-prompt',
-      );
+      const event = new UserPromptEvent(11, "prompt-id-9", AuthType.CLOUD_SHELL, "test-prompt");
 
       logUserPrompt(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'User prompt. Length: 11.',
+        body: "User prompt. Length: 11.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_USER_PROMPT,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_USER_PROMPT,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
           prompt_length: 11,
-          prompt_id: 'prompt-id-9',
-          auth_type: 'cloud-shell',
+          prompt_id: "prompt-id-9",
+          auth_type: "cloud-shell",
         },
       });
     });
   });
 
-  describe('logApiResponse', () => {
+  describe("logApiResponse", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
@@ -337,15 +321,15 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordApiResponseMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordApiResponseMetrics").mockImplementation(
         mockMetrics.recordApiResponseMetrics,
       );
-      vi.spyOn(metrics, 'recordTokenUsageMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordTokenUsageMetrics").mockImplementation(
         mockMetrics.recordTokenUsageMetrics,
       );
     });
 
-    it('should log an API response with all fields', () => {
+    it("should log an API response with all fields", () => {
       const usageData: GenerateContentResponseUsageMetadata = {
         promptTokenCount: 17,
         candidatesTokenCount: 50,
@@ -354,44 +338,44 @@ describe('loggers', () => {
         toolUsePromptTokenCount: 2,
       };
       const event = new ApiResponseEvent(
-        'test-model',
+        "test-model",
         100,
         {
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
           contents: [
             {
-              role: 'user',
-              parts: [{ text: 'Hello' }],
+              role: "user",
+              parts: [{ text: "Hello" }],
             },
           ],
           generate_content_config: {
             temperature: 1,
             topP: 2,
             topK: 3,
-            responseMimeType: 'text/plain',
+            responseMimeType: "text/plain",
             candidateCount: 1,
             seed: 678,
             frequencyPenalty: 10,
             maxOutputTokens: 8000,
             presencePenalty: 6,
-            stopSequences: ['stop', 'please stop'],
+            stopSequences: ["stop", "please stop"],
             systemInstruction: {
-              role: 'model',
-              parts: [{ text: 'be nice' }],
+              role: "model",
+              parts: [{ text: "be nice" }],
             },
           },
           server: {
-            address: 'foo.com',
+            address: "foo.com",
             port: 8080,
           },
         },
         {
-          response_id: '',
+          response_id: "",
           candidates: [
             {
               content: {
-                role: 'model',
-                parts: [{ text: 'candidate 1' }],
+                role: "model",
+                parts: [{ text: "candidate 1" }],
               },
               finishReason: FinishReason.STOP,
             },
@@ -399,107 +383,94 @@ describe('loggers', () => {
         },
         AuthType.LOGIN_WITH_GOOGLE,
         usageData,
-        'test-response',
+        "test-response",
       );
 
       logApiResponse(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'API response from test-model. Status: 200. Duration: 100ms.',
+        body: "API response from test-model. Status: 200. Duration: 100ms.",
         attributes: expect.objectContaining({
-          'event.name': EVENT_API_RESPONSE,
-          prompt_id: 'prompt-id-1',
+          "event.name": EVENT_API_RESPONSE,
+          prompt_id: "prompt-id-1",
         }),
       });
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'GenAI operation details from test-model. Status: 200. Duration: 100ms.',
+        body: "GenAI operation details from test-model. Status: 200. Duration: 100ms.",
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'test-model',
-          'gen_ai.request.temperature': 1,
-          'gen_ai.request.top_p': 2,
-          'gen_ai.request.top_k': 3,
-          'gen_ai.input.messages':
-            '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
-          'gen_ai.output.messages':
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.request.temperature": 1,
+          "gen_ai.request.top_p": 2,
+          "gen_ai.request.top_k": 3,
+          "gen_ai.input.messages": '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
+          "gen_ai.output.messages":
             '[{"finish_reason":"stop","role":"system","parts":[{"type":"text","content":"candidate 1"}]}]',
-          'gen_ai.response.finish_reasons': ['stop'],
-          'gen_ai.response.model': 'test-model',
-          'gen_ai.usage.input_tokens': 17,
-          'gen_ai.usage.output_tokens': 50,
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.output.type': 'text',
-          'gen_ai.request.choice.count': 1,
-          'gen_ai.request.seed': 678,
-          'gen_ai.request.frequency_penalty': 10,
-          'gen_ai.request.presence_penalty': 6,
-          'gen_ai.request.max_tokens': 8000,
-          'server.address': 'foo.com',
-          'server.port': 8080,
-          'gen_ai.request.stop_sequences': ['stop', 'please stop'],
-          'gen_ai.system_instructions': '[{"type":"text","content":"be nice"}]',
+          "gen_ai.response.finish_reasons": ["stop"],
+          "gen_ai.response.model": "test-model",
+          "gen_ai.usage.input_tokens": 17,
+          "gen_ai.usage.output_tokens": 50,
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.output.type": "text",
+          "gen_ai.request.choice.count": 1,
+          "gen_ai.request.seed": 678,
+          "gen_ai.request.frequency_penalty": 10,
+          "gen_ai.request.presence_penalty": 6,
+          "gen_ai.request.max_tokens": 8000,
+          "server.address": "foo.com",
+          "server.port": 8080,
+          "gen_ai.request.stop_sequences": ["stop", "please stop"],
+          "gen_ai.system_instructions": '[{"type":"text","content":"be nice"}]',
         }),
       });
 
-      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          model: 'test-model',
-          status_code: 200,
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-          },
+      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        model: "test-model",
+        status_code: 200,
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
         },
-      );
+      });
 
       // Verify token usage calls for all token types
-      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        17,
-        {
-          model: 'test-model',
-          type: 'input',
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-          },
+      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(mockConfig, 17, {
+        model: "test-model",
+        type: "input",
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
         },
-      );
+      });
 
-      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        50,
-        {
-          model: 'test-model',
-          type: 'output',
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-          },
+      expect(mockMetrics.recordTokenUsageMetrics).toHaveBeenCalledWith(mockConfig, 50, {
+        model: "test-model",
+        type: "output",
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
         },
-      );
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_API_RESPONSE,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_API_RESPONSE,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
   });
 
-  describe('logApiError', () => {
+  describe("logApiError", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
@@ -513,50 +484,50 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordApiResponseMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordApiResponseMetrics").mockImplementation(
         mockMetrics.recordApiResponseMetrics,
       );
-      vi.spyOn(metrics, 'recordApiErrorMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordApiErrorMetrics").mockImplementation(
         mockMetrics.recordApiErrorMetrics,
       );
     });
 
-    it('should log an API error with all fields', () => {
+    it("should log an API error with all fields", () => {
       const event = new ApiErrorEvent(
-        'test-model',
+        "test-model",
         'UNAVAILABLE. {"error":{"code":503,"message":"The model is overloaded. Please try again later.","status":"UNAVAILABLE"}}',
         100,
         {
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
           contents: [
             {
-              role: 'user',
-              parts: [{ text: 'Hello' }],
+              role: "user",
+              parts: [{ text: "Hello" }],
             },
           ],
           generate_content_config: {
             temperature: 1,
             topP: 2,
             topK: 3,
-            responseMimeType: 'text/plain',
+            responseMimeType: "text/plain",
             candidateCount: 1,
             seed: 678,
             frequencyPenalty: 10,
             maxOutputTokens: 8000,
             presencePenalty: 6,
-            stopSequences: ['stop', 'please stop'],
+            stopSequences: ["stop", "please stop"],
             systemInstruction: {
-              role: 'model',
-              parts: [{ text: 'be nice' }],
+              role: "model",
+              parts: [{ text: "be nice" }],
             },
           },
           server: {
-            address: 'foo.com',
+            address: "foo.com",
             port: 8080,
           },
         },
         AuthType.LOGIN_WITH_GOOGLE,
-        'ApiError',
+        "ApiError",
         503,
       );
 
@@ -565,245 +536,227 @@ describe('loggers', () => {
       expect(mockLogger.emit).toHaveBeenCalledWith({
         body: 'API error for test-model. Error: UNAVAILABLE. {"error":{"code":503,"message":"The model is overloaded. Please try again later.","status":"UNAVAILABLE"}}. Duration: 100ms.',
         attributes: expect.objectContaining({
-          'event.name': EVENT_API_ERROR,
-          prompt_id: 'prompt-id-1',
+          "event.name": EVENT_API_ERROR,
+          prompt_id: "prompt-id-1",
         }),
       });
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
         body: 'GenAI operation error details from test-model. Error: UNAVAILABLE. {"error":{"code":503,"message":"The model is overloaded. Please try again later.","status":"UNAVAILABLE"}}. Duration: 100ms.',
         attributes: expect.objectContaining({
-          'event.name': 'gen_ai.client.inference.operation.details',
-          'gen_ai.request.model': 'test-model',
-          'gen_ai.request.temperature': 1,
-          'gen_ai.request.top_p': 2,
-          'gen_ai.request.top_k': 3,
-          'gen_ai.input.messages':
-            '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.output.type': 'text',
-          'gen_ai.request.choice.count': 1,
-          'gen_ai.request.seed': 678,
-          'gen_ai.request.frequency_penalty': 10,
-          'gen_ai.request.presence_penalty': 6,
-          'gen_ai.request.max_tokens': 8000,
-          'server.address': 'foo.com',
-          'server.port': 8080,
-          'gen_ai.request.stop_sequences': ['stop', 'please stop'],
-          'gen_ai.system_instructions': '[{"type":"text","content":"be nice"}]',
+          "event.name": "gen_ai.client.inference.operation.details",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.request.temperature": 1,
+          "gen_ai.request.top_p": 2,
+          "gen_ai.request.top_k": 3,
+          "gen_ai.input.messages": '[{"role":"user","parts":[{"type":"text","content":"Hello"}]}]',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.output.type": "text",
+          "gen_ai.request.choice.count": 1,
+          "gen_ai.request.seed": 678,
+          "gen_ai.request.frequency_penalty": 10,
+          "gen_ai.request.presence_penalty": 6,
+          "gen_ai.request.max_tokens": 8000,
+          "server.address": "foo.com",
+          "server.port": 8080,
+          "gen_ai.request.stop_sequences": ["stop", "please stop"],
+          "gen_ai.system_instructions": '[{"type":"text","content":"be nice"}]',
         }),
       });
 
-      expect(mockMetrics.recordApiErrorMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          model: 'test-model',
-          status_code: 503,
-          error_type: 'ApiError',
-        },
-      );
+      expect(mockMetrics.recordApiErrorMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        model: "test-model",
+        status_code: 503,
+        error_type: "ApiError",
+      });
 
-      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          model: 'test-model',
-          status_code: 503,
-          genAiAttributes: {
-            'gen_ai.operation.name': 'generate_content',
-            'gen_ai.provider.name': 'gcp.vertex_ai',
-            'gen_ai.request.model': 'test-model',
-            'gen_ai.response.model': 'test-model',
-            'error.type': 'ApiError',
-          },
+      expect(mockMetrics.recordApiResponseMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        model: "test-model",
+        status_code: 503,
+        genAiAttributes: {
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "test-model",
+          "gen_ai.response.model": "test-model",
+          "error.type": "ApiError",
         },
-      );
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_API_ERROR,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_API_ERROR,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
   });
 
-  describe('logApiRequest', () => {
+  describe("logApiRequest", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
       isInteractive: () => false,
     } as Config;
 
-    it('should log an API request with request_text', () => {
-      const event = new ApiRequestEvent(
-        'test-model',
-        'prompt-id-7',
-        'This is a test request',
-      );
+    it("should log an API request with request_text", () => {
+      const event = new ApiRequestEvent("test-model", "prompt-id-7", "This is a test request");
 
       logApiRequest(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'API request to test-model.',
+        body: "API request to test-model.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_API_REQUEST,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_API_REQUEST,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
-          request_text: 'This is a test request',
-          prompt_id: 'prompt-id-7',
+          model: "test-model",
+          request_text: "This is a test request",
+          prompt_id: "prompt-id-7",
         },
       });
     });
 
-    it('should log an API request without request_text', () => {
-      const event = new ApiRequestEvent('test-model', 'prompt-id-6');
+    it("should log an API request without request_text", () => {
+      const event = new ApiRequestEvent("test-model", "prompt-id-6");
 
       logApiRequest(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'API request to test-model.',
+        body: "API request to test-model.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_API_REQUEST,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_API_REQUEST,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
-          prompt_id: 'prompt-id-6',
+          model: "test-model",
+          prompt_id: "prompt-id-6",
         },
       });
     });
   });
 
-  describe('logFlashFallback', () => {
+  describe("logFlashFallback", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
-    it('should log flash fallback event', () => {
+    it("should log flash fallback event", () => {
       const event = new FlashFallbackEvent(AuthType.USE_VERTEX_AI);
 
       logFlashFallback(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Switching to flash as Fallback.',
+        body: "Switching to flash as Fallback.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_FLASH_FALLBACK,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_FLASH_FALLBACK,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          auth_type: 'vertex-ai',
+          auth_type: "vertex-ai",
         },
       });
     });
   });
 
-  describe('logRipgrepFallback', () => {
+  describe("logRipgrepFallback", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logRipgrepFallbackEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logRipgrepFallbackEvent");
     });
 
-    it('should log ripgrep fallback event', () => {
+    it("should log ripgrep fallback event", () => {
       const event = new RipgrepFallbackEvent();
 
       logRipgrepFallback(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logRipgrepFallbackEvent,
-      ).toHaveBeenCalled();
+      expect(ClearcutLogger.prototype.logRipgrepFallbackEvent).toHaveBeenCalled();
 
       const emittedEvent = mockLogger.emit.mock.calls[0][0];
-      expect(emittedEvent.body).toBe('Switching to grep as fallback.');
+      expect(emittedEvent.body).toBe("Switching to grep as fallback.");
       expect(emittedEvent.attributes).toEqual(
         expect.objectContaining({
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_RIPGREP_FALLBACK,
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_RIPGREP_FALLBACK,
           error: undefined,
         }),
       );
     });
 
-    it('should log ripgrep fallback event with an error', () => {
-      const event = new RipgrepFallbackEvent('rg not found');
+    it("should log ripgrep fallback event with an error", () => {
+      const event = new RipgrepFallbackEvent("rg not found");
 
       logRipgrepFallback(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logRipgrepFallbackEvent,
-      ).toHaveBeenCalled();
+      expect(ClearcutLogger.prototype.logRipgrepFallbackEvent).toHaveBeenCalled();
 
       const emittedEvent = mockLogger.emit.mock.calls[0][0];
-      expect(emittedEvent.body).toBe('Switching to grep as fallback.');
+      expect(emittedEvent.body).toBe("Switching to grep as fallback.");
       expect(emittedEvent.attributes).toEqual(
         expect.objectContaining({
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_RIPGREP_FALLBACK,
-          error: 'rg not found',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_RIPGREP_FALLBACK,
+          error: "rg not found",
         }),
       );
     });
   });
 
-  describe('logToolCall', () => {
+  describe("logToolCall", () => {
     const cfg1 = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getGeminiClient: () => mockGeminiClient,
     } as Config;
     const cfg2 = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
-      getProxy: () => 'http://test.proxy.com:8080',
-      getContentGeneratorConfig: () =>
-        ({ model: 'test-model' }) as ContentGeneratorConfig,
-      getModel: () => 'test-model',
-      getEmbeddingModel: () => 'test-embedding-model',
-      getWorkingDir: () => 'test-working-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
+      getProxy: () => "http://test.proxy.com:8080",
+      getContentGeneratorConfig: () => ({ model: "test-model" }) as ContentGeneratorConfig,
+      getModel: () => "test-model",
+      getEmbeddingModel: () => "test-embedding-model",
+      getWorkingDir: () => "test-working-dir",
       getSandbox: () => true,
-      getCoreTools: () => ['ls', 'read-file'],
-      getApprovalMode: () => 'default',
+      getCoreTools: () => ["ls", "read-file"],
+      getApprovalMode: () => "default",
       getTelemetryLogPromptsEnabled: () => true,
       getFileFilteringRespectGitIgnore: () => true,
       getFileFilteringAllowBuildArtifacts: () => false,
       getDebugMode: () => true,
       getMcpServers: () => ({
-        'test-server': {
-          command: 'test-command',
+        "test-server": {
+          command: "test-command",
         },
       }),
-      getQuestion: () => 'test-question',
+      getQuestion: () => "test-question",
       getToolRegistry: () => new ToolRegistry(cfg1),
 
-      getUserMemory: () => 'user-memory',
+      getUserMemory: () => "user-memory",
     } as unknown as Config;
 
     const mockGeminiClient = new GeminiClient(cfg2);
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getGeminiClient: () => mockGeminiClient,
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
@@ -817,37 +770,35 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordToolCallMetrics').mockImplementation(
+      vi.spyOn(metrics, "recordToolCallMetrics").mockImplementation(
         mockMetrics.recordToolCallMetrics,
       );
-      vi.spyOn(metrics, 'recordLinesChanged').mockImplementation(
-        mockMetrics.recordLinesChanged,
-      );
+      vi.spyOn(metrics, "recordLinesChanged").mockImplementation(mockMetrics.recordLinesChanged);
       mockLogger.emit.mockReset();
     });
 
-    it('should log a tool call with all fields', () => {
+    it("should log a tool call with all fields", () => {
       const tool = new EditTool(mockConfig);
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: {
-            fileDiff: 'diff',
-            fileName: 'file.txt',
-            originalContent: 'old content',
-            newContent: 'new content',
+            fileDiff: "diff",
+            fileName: "file.txt",
+            originalContent: "old content",
+            newContent: "new content",
             diffStat: {
               model_added_lines: 1,
               model_removed_lines: 2,
@@ -873,18 +824,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Decision: accept. Success: true. Duration: 100ms.',
+        body: "Tool call: test-function. Decision: accept. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -893,8 +844,8 @@ describe('loggers', () => {
           duration_ms: 100,
           success: true,
           decision: ToolCallDecision.ACCEPT,
-          prompt_id: 'prompt-id-1',
-          tool_type: 'native',
+          prompt_id: "prompt-id-1",
+          tool_type: "native",
           error: undefined,
           error_type: undefined,
           mcp_server_name: undefined,
@@ -913,52 +864,42 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: true,
-          decision: ToolCallDecision.ACCEPT,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: true,
+        decision: ToolCallDecision.ACCEPT,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
 
-      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(
-        mockConfig,
-        1,
-        'added',
-        { function_name: 'test-function' },
-      );
-      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(
-        mockConfig,
-        2,
-        'removed',
-        { function_name: 'test-function' },
-      );
+      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(mockConfig, 1, "added", {
+        function_name: "test-function",
+      });
+      expect(mockMetrics.recordLinesChanged).toHaveBeenCalledWith(mockConfig, 2, "removed", {
+        function_name: "test-function",
+      });
     });
-    it('should log a tool call with a reject decision', () => {
+    it("should log a tool call with a reject decision", () => {
       const call: ErroredToolCall = {
-        status: 'error',
+        status: "error",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-2',
+          prompt_id: "prompt-id-2",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -972,18 +913,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Decision: reject. Success: false. Duration: 100ms.',
+        body: "Tool call: test-function. Decision: reject. Success: false. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -992,8 +933,8 @@ describe('loggers', () => {
           duration_ms: 100,
           success: false,
           decision: ToolCallDecision.REJECT,
-          prompt_id: 'prompt-id-2',
-          tool_type: 'native',
+          prompt_id: "prompt-id-2",
+          tool_type: "native",
           error: undefined,
           error_type: undefined,
           mcp_server_name: undefined,
@@ -1003,40 +944,36 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: false,
-          decision: ToolCallDecision.REJECT,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: false,
+        decision: ToolCallDecision.REJECT,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a tool call with a modify decision', () => {
+    it("should log a tool call with a modify decision", () => {
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-3',
+          prompt_id: "prompt-id-3",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -1052,18 +989,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Decision: modify. Success: true. Duration: 100ms.',
+        body: "Tool call: test-function. Decision: modify. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1072,8 +1009,8 @@ describe('loggers', () => {
           duration_ms: 100,
           success: true,
           decision: ToolCallDecision.MODIFY,
-          prompt_id: 'prompt-id-3',
-          tool_type: 'native',
+          prompt_id: "prompt-id-3",
+          tool_type: "native",
           error: undefined,
           error_type: undefined,
           mcp_server_name: undefined,
@@ -1083,40 +1020,36 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: true,
-          decision: ToolCallDecision.MODIFY,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: true,
+        decision: ToolCallDecision.MODIFY,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a tool call without a decision', () => {
+    it("should log a tool call without a decision", () => {
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-4',
+          prompt_id: "prompt-id-4",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -1131,18 +1064,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Success: true. Duration: 100ms.',
+        body: "Tool call: test-function. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1150,8 +1083,8 @@ describe('loggers', () => {
           ),
           duration_ms: 100,
           success: true,
-          prompt_id: 'prompt-id-4',
-          tool_type: 'native',
+          prompt_id: "prompt-id-4",
+          tool_type: "native",
           decision: undefined,
           error: undefined,
           error_type: undefined,
@@ -1162,41 +1095,37 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: true,
-          decision: undefined,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: true,
+        decision: undefined,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a failed tool call with an error', () => {
-      const errorMessage = 'test-error';
+    it("should log a failed tool call with an error", () => {
+      const errorMessage = "test-error";
       const call: ErroredToolCall = {
-        status: 'error',
+        status: "error",
         request: {
-          name: 'test-function',
+          name: "test-function",
           args: {
-            arg1: 'value1',
+            arg1: "value1",
             arg2: 2,
           },
-          callId: 'test-call-id',
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id-5',
+          prompt_id: "prompt-id-5",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: new Error(errorMessage),
           errorType: ToolErrorType.UNKNOWN,
@@ -1209,18 +1138,18 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: test-function. Success: false. Duration: 100ms.',
+        body: "Tool call: test-function. Success: false. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          function_name: 'test-function',
+          function_name: "test-function",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1228,12 +1157,12 @@ describe('loggers', () => {
           ),
           duration_ms: 100,
           success: false,
-          error: 'test-error',
-          'error.message': 'test-error',
+          error: "test-error",
+          "error.message": "test-error",
           error_type: ToolErrorType.UNKNOWN,
-          'error.type': ToolErrorType.UNKNOWN,
-          prompt_id: 'prompt-id-5',
-          tool_type: 'native',
+          "error.type": ToolErrorType.UNKNOWN,
+          prompt_id: "prompt-id-5",
+          tool_type: "native",
           decision: undefined,
           mcp_server_name: undefined,
           extension_id: undefined,
@@ -1242,57 +1171,53 @@ describe('loggers', () => {
         },
       });
 
-      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        100,
-        {
-          function_name: 'test-function',
-          success: false,
-          decision: undefined,
-          tool_type: 'native',
-        },
-      );
+      expect(mockMetrics.recordToolCallMetrics).toHaveBeenCalledWith(mockConfig, 100, {
+        function_name: "test-function",
+        success: false,
+        decision: undefined,
+        tool_type: "native",
+      });
 
       expect(mockUiEvent.addEvent).toHaveBeenCalledWith({
         ...event,
-        'event.name': EVENT_TOOL_CALL,
-        'event.timestamp': '2025-01-01T00:00:00.000Z',
+        "event.name": EVENT_TOOL_CALL,
+        "event.timestamp": "2025-01-01T00:00:00.000Z",
       });
     });
 
-    it('should log a tool call with mcp_server_name for MCP tools', () => {
+    it("should log a tool call with mcp_server_name for MCP tools", () => {
       const mockMcpTool = new DiscoveredMCPTool(
         {} as CallableTool,
-        'mock_mcp_server',
-        'mock_mcp_tool',
-        'tool description',
+        "mock_mcp_server",
+        "mock_mcp_tool",
+        "tool description",
         {
-          type: 'object',
+          type: "object",
           properties: {
-            arg1: { type: 'string' },
-            arg2: { type: 'number' },
+            arg1: { type: "string" },
+            arg2: { type: "number" },
           },
-          required: ['arg1', 'arg2'],
+          required: ["arg1", "arg2"],
         },
         false,
         undefined,
         undefined,
-        'test-extension',
-        'test-extension-id',
+        "test-extension",
+        "test-extension-id",
       );
 
       const call: CompletedToolCall = {
-        status: 'success',
+        status: "success",
         request: {
-          name: 'mock_mcp_tool',
-          args: { arg1: 'value1', arg2: 2 },
-          callId: 'test-call-id',
+          name: "mock_mcp_tool",
+          args: { arg1: "value1", arg2: 2 },
+          callId: "test-call-id",
           isClientInitiated: true,
-          prompt_id: 'prompt-id',
+          prompt_id: "prompt-id",
         },
         response: {
-          callId: 'test-call-id',
-          responseParts: [{ text: 'test-response' }],
+          callId: "test-call-id",
+          responseParts: [{ text: "test-response" }],
           resultDisplay: undefined,
           error: undefined,
           errorType: undefined,
@@ -1305,20 +1230,20 @@ describe('loggers', () => {
       logToolCall(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool call: mock_mcp_tool. Success: true. Duration: 100ms.',
+        body: "Tool call: mock_mcp_tool. Success: true. Duration: 100ms.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_CALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
-          extension_name: 'test-extension',
-          extension_id: 'test-extension-id',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_CALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
+          extension_name: "test-extension",
+          extension_id: "test-extension-id",
           interactive: false,
-          function_name: 'mock_mcp_tool',
+          function_name: "mock_mcp_tool",
           function_args: JSON.stringify(
             {
-              arg1: 'value1',
+              arg1: "value1",
               arg2: 2,
             },
             null,
@@ -1326,9 +1251,9 @@ describe('loggers', () => {
           ),
           duration_ms: 100,
           success: true,
-          prompt_id: 'prompt-id',
-          tool_type: 'mcp',
-          mcp_server_name: 'mock_mcp_server',
+          prompt_id: "prompt-id",
+          tool_type: "mcp",
+          mcp_server_name: "mock_mcp_server",
           decision: undefined,
           error: undefined,
           error_type: undefined,
@@ -1339,40 +1264,38 @@ describe('loggers', () => {
     });
   });
 
-  describe('logMalformedJsonResponse', () => {
+  describe("logMalformedJsonResponse", () => {
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logMalformedJsonResponseEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logMalformedJsonResponseEvent");
     });
 
-    it('logs the event to Clearcut and OTEL', () => {
+    it("logs the event to Clearcut and OTEL", () => {
       const mockConfig = makeFakeConfig();
-      const event = new MalformedJsonResponseEvent('test-model');
+      const event = new MalformedJsonResponseEvent("test-model");
 
       logMalformedJsonResponse(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logMalformedJsonResponseEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logMalformedJsonResponseEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Malformed JSON response from test-model.',
+        body: "Malformed JSON response from test-model.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_MALFORMED_JSON_RESPONSE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_MALFORMED_JSON_RESPONSE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          model: 'test-model',
+          model: "test-model",
         },
       });
     });
   });
 
-  describe('logFileOperation', () => {
+  describe("logFileOperation", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
-      getTargetDir: () => 'target-dir',
+      getSessionId: () => "test-session-id",
+      getTargetDir: () => "target-dir",
       getUsageStatisticsEnabled: () => true,
       getTelemetryEnabled: () => true,
       getTelemetryLogPromptsEnabled: () => true,
@@ -1384,64 +1307,61 @@ describe('loggers', () => {
     };
 
     beforeEach(() => {
-      vi.spyOn(metrics, 'recordFileOperationMetric').mockImplementation(
+      vi.spyOn(metrics, "recordFileOperationMetric").mockImplementation(
         mockMetrics.recordFileOperationMetric,
       );
     });
 
-    it('should log a file operation event', () => {
+    it("should log a file operation event", () => {
       const event = new FileOperationEvent(
-        'test-tool',
+        "test-tool",
         FileOperation.READ,
         10,
-        'text/plain',
-        '.txt',
-        'typescript',
+        "text/plain",
+        ".txt",
+        "typescript",
       );
 
       logFileOperation(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'File operation: read. Lines: 10.',
+        body: "File operation: read. Lines: 10.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_FILE_OPERATION,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_FILE_OPERATION,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          tool_name: 'test-tool',
-          operation: 'read',
+          tool_name: "test-tool",
+          operation: "read",
           lines: 10,
-          mimetype: 'text/plain',
-          extension: '.txt',
-          programming_language: 'typescript',
+          mimetype: "text/plain",
+          extension: ".txt",
+          programming_language: "typescript",
         },
       });
 
-      expect(mockMetrics.recordFileOperationMetric).toHaveBeenCalledWith(
-        mockConfig,
-        {
-          operation: 'read',
-          lines: 10,
-          mimetype: 'text/plain',
-          extension: '.txt',
-          programming_language: 'typescript',
-        },
-      );
+      expect(mockMetrics.recordFileOperationMetric).toHaveBeenCalledWith(mockConfig, {
+        operation: "read",
+        lines: 10,
+        mimetype: "text/plain",
+        extension: ".txt",
+        programming_language: "typescript",
+      });
     });
   });
 
-  describe('logToolOutputTruncated', () => {
+  describe("logToolOutputTruncated", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
-    it('should log a tool output truncated event', () => {
-      const event = new ToolOutputTruncatedEvent('prompt-id-1', {
-        toolName: 'test-tool',
+    it("should log a tool output truncated event", () => {
+      const event = new ToolOutputTruncatedEvent("prompt-id-1", {
+        toolName: "test-tool",
         originalContentLength: 1000,
         truncatedContentLength: 100,
         threshold: 500,
@@ -1451,17 +1371,17 @@ describe('loggers', () => {
       logToolOutputTruncated(mockConfig, event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Tool output truncated for test-tool.',
+        body: "Tool output truncated for test-tool.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_TOOL_OUTPUT_TRUNCATED,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
-          eventName: 'tool_output_truncated',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_TOOL_OUTPUT_TRUNCATED,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
+          eventName: "tool_output_truncated",
           interactive: false,
-          prompt_id: 'prompt-id-1',
-          tool_name: 'test-tool',
+          prompt_id: "prompt-id-1",
+          tool_name: "test-tool",
           original_content_length: 1000,
           truncated_content_length: 100,
           threshold: 500,
@@ -1471,76 +1391,69 @@ describe('loggers', () => {
     });
   });
 
-  describe('logModelRouting', () => {
+  describe("logModelRouting", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logModelRoutingEvent');
-      vi.spyOn(metrics, 'recordModelRoutingMetrics');
+      vi.spyOn(ClearcutLogger.prototype, "logModelRoutingEvent");
+      vi.spyOn(metrics, "recordModelRoutingMetrics");
     });
 
-    it('should log the event to Clearcut and OTEL, and record metrics', () => {
+    it("should log the event to Clearcut and OTEL, and record metrics", () => {
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         100,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
 
       logModelRouting(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logModelRoutingEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logModelRoutingEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Model routing decision. Model: gemini-pro, Source: default',
+        body: "Model routing decision. Model: gemini-pro, Source: default",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
           ...event,
-          'event.name': EVENT_MODEL_ROUTING,
+          "event.name": EVENT_MODEL_ROUTING,
           interactive: false,
         },
       });
 
-      expect(metrics.recordModelRoutingMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        event,
-      );
+      expect(metrics.recordModelRoutingMetrics).toHaveBeenCalledWith(mockConfig, event);
     });
 
-    it('should only log to Clearcut if OTEL SDK is not initialized', () => {
-      vi.spyOn(sdk, 'isTelemetrySdkInitialized').mockReturnValue(false);
+    it("should only log to Clearcut if OTEL SDK is not initialized", () => {
+      vi.spyOn(sdk, "isTelemetrySdkInitialized").mockReturnValue(false);
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         100,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
 
       logModelRouting(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logModelRoutingEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logModelRoutingEvent).toHaveBeenCalledWith(event);
       expect(mockLogger.emit).not.toHaveBeenCalled();
       expect(metrics.recordModelRoutingMetrics).not.toHaveBeenCalled();
     });
   });
 
-  describe('logExtensionInstall', () => {
+  describe("logExtensionInstall", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getContentGeneratorConfig: () => null,
       getUseSmartEdit: () => null,
@@ -1549,49 +1462,41 @@ describe('loggers', () => {
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionInstallEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionInstallEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension install event', async () => {
-      const event = new ExtensionInstallEvent(
-        'testing',
-        'testing-id',
-        '0.1.0',
-        'git',
-        'success',
-      );
+    it("should log extension install event", async () => {
+      const event = new ExtensionInstallEvent("testing", "testing-id", "0.1.0", "git", "success");
 
       await logExtensionInstallEvent(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionInstallEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionInstallEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Installed extension testing',
+        body: "Installed extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_INSTALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_INSTALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          extension_version: '0.1.0',
-          extension_source: 'git',
-          status: 'success',
+          extension_name: "testing",
+          extension_version: "0.1.0",
+          extension_source: "git",
+          status: "success",
         },
       });
     });
   });
 
-  describe('logExtensionUpdate', async () => {
+  describe("logExtensionUpdate", async () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getContentGeneratorConfig: () => null,
       getUseSmartEdit: () => null,
@@ -1600,51 +1505,49 @@ describe('loggers', () => {
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionUpdateEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionUpdateEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension update event', async () => {
+    it("should log extension update event", async () => {
       const event = new ExtensionUpdateEvent(
-        'testing',
-        'testing-id',
-        '0.1.0',
-        '0.1.1',
-        'git',
-        'success',
+        "testing",
+        "testing-id",
+        "0.1.0",
+        "0.1.1",
+        "git",
+        "success",
       );
 
       await logExtensionUpdateEvent(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionUpdateEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionUpdateEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Updated extension testing',
+        body: "Updated extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_UPDATE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_UPDATE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          extension_version: '0.1.0',
-          extension_previous_version: '0.1.1',
-          extension_source: 'git',
-          status: 'success',
+          extension_name: "testing",
+          extension_version: "0.1.0",
+          extension_previous_version: "0.1.1",
+          extension_source: "git",
+          status: "success",
         },
       });
     });
   });
 
-  describe('logExtensionUninstall', async () => {
+  describe("logExtensionUninstall", async () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       getContentGeneratorConfig: () => null,
       getUseSmartEdit: () => null,
@@ -1653,173 +1556,161 @@ describe('loggers', () => {
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionUninstallEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionUninstallEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
-    it('should log extension uninstall event', async () => {
-      const event = new ExtensionUninstallEvent(
-        'testing',
-        'testing-id',
-        'success',
-      );
+    it("should log extension uninstall event", async () => {
+      const event = new ExtensionUninstallEvent("testing", "testing-id", "success");
 
       await logExtensionUninstall(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionUninstallEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionUninstallEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Uninstalled extension testing',
+        body: "Uninstalled extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_UNINSTALL,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_UNINSTALL,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          status: 'success',
+          extension_name: "testing",
+          status: "success",
         },
       });
     });
   });
 
-  describe('logExtensionEnable', async () => {
+  describe("logExtensionEnable", async () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionEnableEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionEnableEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension enable event', async () => {
-      const event = new ExtensionEnableEvent('testing', 'testing-id', 'user');
+    it("should log extension enable event", async () => {
+      const event = new ExtensionEnableEvent("testing", "testing-id", "user");
 
       await logExtensionEnable(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionEnableEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionEnableEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Enabled extension testing',
+        body: "Enabled extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_ENABLE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_ENABLE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          setting_scope: 'user',
+          extension_name: "testing",
+          setting_scope: "user",
         },
       });
     });
   });
 
-  describe('logExtensionDisable', () => {
+  describe("logExtensionDisable", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logExtensionDisableEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logExtensionDisableEvent");
     });
 
     afterEach(() => {
       vi.clearAllMocks();
     });
 
-    it('should log extension disable event', async () => {
-      const event = new ExtensionDisableEvent('testing', 'testing-id', 'user');
+    it("should log extension disable event", async () => {
+      const event = new ExtensionDisableEvent("testing", "testing-id", "user");
 
       await logExtensionDisable(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logExtensionDisableEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logExtensionDisableEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Disabled extension testing',
+        body: "Disabled extension testing",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_EXTENSION_DISABLE,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_EXTENSION_DISABLE,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          extension_name: 'testing',
-          setting_scope: 'user',
+          extension_name: "testing",
+          setting_scope: "user",
         },
       });
     });
   });
 
-  describe('logAgentStart', () => {
+  describe("logAgentStart", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logAgentStartEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logAgentStartEvent");
     });
 
-    it('should log agent start event', () => {
-      const event = new AgentStartEvent('agent-123', 'TestAgent');
+    it("should log agent start event", () => {
+      const event = new AgentStartEvent("agent-123", "TestAgent");
 
       logAgentStart(mockConfig, event);
 
-      expect(ClearcutLogger.prototype.logAgentStartEvent).toHaveBeenCalledWith(
-        event,
-      );
+      expect(ClearcutLogger.prototype.logAgentStartEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Agent TestAgent started. ID: agent-123',
+        body: "Agent TestAgent started. ID: agent-123",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_AGENT_START,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_AGENT_START,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          agent_id: 'agent-123',
-          agent_name: 'TestAgent',
+          agent_id: "agent-123",
+          agent_name: "TestAgent",
         },
       });
     });
   });
 
-  describe('logAgentFinish', () => {
+  describe("logAgentFinish", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logAgentFinishEvent');
-      vi.spyOn(metrics, 'recordAgentRunMetrics');
+      vi.spyOn(ClearcutLogger.prototype, "logAgentFinishEvent");
+      vi.spyOn(metrics, "recordAgentRunMetrics");
     });
 
-    it('should log agent finish event and record metrics', () => {
+    it("should log agent finish event and record metrics", () => {
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -1827,64 +1718,57 @@ describe('loggers', () => {
 
       logAgentFinish(mockConfig, event);
 
-      expect(ClearcutLogger.prototype.logAgentFinishEvent).toHaveBeenCalledWith(
-        event,
-      );
+      expect(ClearcutLogger.prototype.logAgentFinishEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Agent TestAgent finished. Reason: GOAL. Duration: 1000ms. Turns: 5.',
+        body: "Agent TestAgent finished. Reason: GOAL. Duration: 1000ms. Turns: 5.",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_AGENT_FINISH,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_AGENT_FINISH,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          agent_id: 'agent-123',
-          agent_name: 'TestAgent',
+          agent_id: "agent-123",
+          agent_name: "TestAgent",
           duration_ms: 1000,
           turn_count: 5,
-          terminate_reason: 'GOAL',
+          terminate_reason: "GOAL",
         },
       });
 
-      expect(metrics.recordAgentRunMetrics).toHaveBeenCalledWith(
-        mockConfig,
-        event,
-      );
+      expect(metrics.recordAgentRunMetrics).toHaveBeenCalledWith(mockConfig, event);
     });
   });
 
-  describe('logWebFetchFallbackAttempt', () => {
+  describe("logWebFetchFallbackAttempt", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getUsageStatisticsEnabled: () => true,
       isInteractive: () => false,
     } as unknown as Config;
 
     beforeEach(() => {
-      vi.spyOn(ClearcutLogger.prototype, 'logWebFetchFallbackAttemptEvent');
+      vi.spyOn(ClearcutLogger.prototype, "logWebFetchFallbackAttemptEvent");
     });
 
-    it('should log web fetch fallback attempt event', () => {
-      const event = new WebFetchFallbackAttemptEvent('private_ip');
+    it("should log web fetch fallback attempt event", () => {
+      const event = new WebFetchFallbackAttemptEvent("private_ip");
 
       logWebFetchFallbackAttempt(mockConfig, event);
 
-      expect(
-        ClearcutLogger.prototype.logWebFetchFallbackAttemptEvent,
-      ).toHaveBeenCalledWith(event);
+      expect(ClearcutLogger.prototype.logWebFetchFallbackAttemptEvent).toHaveBeenCalledWith(event);
 
       expect(mockLogger.emit).toHaveBeenCalledWith({
-        body: 'Web fetch fallback attempt. Reason: private_ip',
+        body: "Web fetch fallback attempt. Reason: private_ip",
         attributes: {
-          'session.id': 'test-session-id',
-          'user.email': 'test-user@example.com',
-          'installation.id': 'test-installation-id',
-          'event.name': EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
-          'event.timestamp': '2025-01-01T00:00:00.000Z',
+          "session.id": "test-session-id",
+          "user.email": "test-user@example.com",
+          "installation.id": "test-installation-id",
+          "event.name": EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
+          "event.timestamp": "2025-01-01T00:00:00.000Z",
           interactive: false,
-          reason: 'private_ip',
+          reason: "private_ip",
         },
       });
     });
diff --git a/packages/gemini-core/src/telemetry/loggers.ts b/packages/gemini-core/src/telemetry/loggers.ts
index a84770c09..1a13a1316 100644
--- a/packages/gemini-core/src/telemetry/loggers.ts
+++ b/packages/gemini-core/src/telemetry/loggers.ts
@@ -4,78 +4,71 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { LogRecord } from '@opentelemetry/api-logs';
-import { logs } from '@opentelemetry/api-logs';
-import type { Config } from '../config/config.js';
-import { SERVICE_NAME } from './constants.js';
+import type { LogRecord } from "@opentelemetry/api-logs";
+import { logs } from "@opentelemetry/api-logs";
+import type { Config } from "../config/config.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
+import { SERVICE_NAME } from "./constants.js";
 import {
-  EVENT_API_ERROR,
-  EVENT_API_RESPONSE,
-  EVENT_TOOL_CALL,
-} from './types.js';
+  getConventionAttributes,
+  recordAgentRunMetrics,
+  recordApiErrorMetrics,
+  recordApiResponseMetrics,
+  recordChatCompressionMetrics,
+  recordContentRetry,
+  recordContentRetryFailure,
+  recordFileOperationMetric,
+  recordInvalidChunk,
+  recordLinesChanged,
+  recordModelRoutingMetrics,
+  recordModelSlashCommand,
+  recordRecoveryAttemptMetrics,
+  recordTokenUsageMetrics,
+  recordToolCallMetrics,
+} from "./metrics.js";
+import { isTelemetrySdkInitialized } from "./sdk.js";
 import type {
+  AgentFinishEvent,
+  AgentStartEvent,
   ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
-  FileOperationEvent,
-  IdeConnectionEvent,
-  StartSessionEvent,
-  ToolCallEvent,
-  UserPromptEvent,
-  FlashFallbackEvent,
-  NextSpeakerCheckEvent,
-  LoopDetectedEvent,
-  LoopDetectionDisabledEvent,
-  SlashCommandEvent,
-  ConversationFinishedEvent,
   ChatCompressionEvent,
-  MalformedJsonResponseEvent,
-  InvalidChunkEvent,
   ContentRetryEvent,
   ContentRetryFailureEvent,
-  RipgrepFallbackEvent,
-  ToolOutputTruncatedEvent,
-  ModelRoutingEvent,
+  ConversationFinishedEvent,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
-  ExtensionUninstallEvent,
   ExtensionInstallEvent,
+  ExtensionUninstallEvent,
+  ExtensionUpdateEvent,
+  FileOperationEvent,
+  FlashFallbackEvent,
+  IdeConnectionEvent,
+  InvalidChunkEvent,
+  LlmLoopCheckEvent,
+  LoopDetectedEvent,
+  LoopDetectionDisabledEvent,
+  MalformedJsonResponseEvent,
+  ModelRoutingEvent,
   ModelSlashCommandEvent,
-  SmartEditStrategyEvent,
-  SmartEditCorrectionEvent,
-  AgentStartEvent,
-  AgentFinishEvent,
+  NextSpeakerCheckEvent,
   RecoveryAttemptEvent,
+  RipgrepFallbackEvent,
+  SlashCommandEvent,
+  SmartEditCorrectionEvent,
+  SmartEditStrategyEvent,
+  StartSessionEvent,
+  ToolCallEvent,
+  ToolOutputTruncatedEvent,
+  UserPromptEvent,
   WebFetchFallbackAttemptEvent,
-  ExtensionUpdateEvent,
-  LlmLoopCheckEvent,
-} from './types.js';
-import {
-  recordApiErrorMetrics,
-  recordToolCallMetrics,
-  recordChatCompressionMetrics,
-  recordFileOperationMetric,
-  recordInvalidChunk,
-  recordContentRetry,
-  recordContentRetryFailure,
-  recordModelRoutingMetrics,
-  recordModelSlashCommand,
-  getConventionAttributes,
-  recordTokenUsageMetrics,
-  recordApiResponseMetrics,
-  recordAgentRunMetrics,
-  recordRecoveryAttemptMetrics,
-  recordLinesChanged,
-} from './metrics.js';
-import { isTelemetrySdkInitialized } from './sdk.js';
-import type { UiEvent } from './uiTelemetry.js';
-import { uiTelemetryService } from './uiTelemetry.js';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
+} from "./types.js";
+import { EVENT_API_ERROR, EVENT_API_RESPONSE, EVENT_TOOL_CALL } from "./types.js";
+import type { UiEvent } from "./uiTelemetry.js";
+import { uiTelemetryService } from "./uiTelemetry.js";
 
-export function logCliConfiguration(
-  config: Config,
-  event: StartSessionEvent,
-): void {
+export function logCliConfiguration(config: Config, event: StartSessionEvent): void {
   ClearcutLogger.getInstance(config)?.logStartSessionEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -103,8 +96,8 @@ export function logUserPrompt(config: Config, event: UserPromptEvent): void {
 export function logToolCall(config: Config, event: ToolCallEvent): void {
   const uiEvent = {
     ...event,
-    'event.name': EVENT_TOOL_CALL,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_TOOL_CALL,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   ClearcutLogger.getInstance(config)?.logToolCallEvent(event);
@@ -124,25 +117,22 @@ export function logToolCall(config: Config, event: ToolCallEvent): void {
   });
 
   if (event.metadata) {
-    const added = event.metadata['model_added_lines'];
-    if (typeof added === 'number' && added > 0) {
-      recordLinesChanged(config, added, 'added', {
+    const added = event.metadata["model_added_lines"];
+    if (typeof added === "number" && added > 0) {
+      recordLinesChanged(config, added, "added", {
         function_name: event.function_name,
       });
     }
-    const removed = event.metadata['model_removed_lines'];
-    if (typeof removed === 'number' && removed > 0) {
-      recordLinesChanged(config, removed, 'removed', {
+    const removed = event.metadata["model_removed_lines"];
+    if (typeof removed === "number" && removed > 0) {
+      recordLinesChanged(config, removed, "removed", {
         function_name: event.function_name,
       });
     }
   }
 }
 
-export function logToolOutputTruncated(
-  config: Config,
-  event: ToolOutputTruncatedEvent,
-): void {
+export function logToolOutputTruncated(config: Config, event: ToolOutputTruncatedEvent): void {
   ClearcutLogger.getInstance(config)?.logToolOutputTruncatedEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -154,10 +144,7 @@ export function logToolOutputTruncated(
   logger.emit(logRecord);
 }
 
-export function logFileOperation(
-  config: Config,
-  event: FileOperationEvent,
-): void {
+export function logFileOperation(config: Config, event: FileOperationEvent): void {
   ClearcutLogger.getInstance(config)?.logFileOperationEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -189,10 +176,7 @@ export function logApiRequest(config: Config, event: ApiRequestEvent): void {
   logger.emit(logRecord);
 }
 
-export function logFlashFallback(
-  config: Config,
-  event: FlashFallbackEvent,
-): void {
+export function logFlashFallback(config: Config, event: FlashFallbackEvent): void {
   ClearcutLogger.getInstance(config)?.logFlashFallbackEvent();
   if (!isTelemetrySdkInitialized()) return;
 
@@ -204,10 +188,7 @@ export function logFlashFallback(
   logger.emit(logRecord);
 }
 
-export function logRipgrepFallback(
-  config: Config,
-  event: RipgrepFallbackEvent,
-): void {
+export function logRipgrepFallback(config: Config, event: RipgrepFallbackEvent): void {
   ClearcutLogger.getInstance(config)?.logRipgrepFallbackEvent();
   if (!isTelemetrySdkInitialized()) return;
 
@@ -222,8 +203,8 @@ export function logRipgrepFallback(
 export function logApiError(config: Config, event: ApiErrorEvent): void {
   const uiEvent = {
     ...event,
-    'event.name': EVENT_API_ERROR,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_API_ERROR,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   ClearcutLogger.getInstance(config)?.logApiErrorEvent(event);
@@ -245,7 +226,7 @@ export function logApiError(config: Config, event: ApiErrorEvent): void {
     status_code: event.status_code,
     genAiAttributes: {
       ...getConventionAttributes(event),
-      'error.type': event.error_type || 'unknown',
+      "error.type": event.error_type || "unknown",
     },
   });
 }
@@ -253,8 +234,8 @@ export function logApiError(config: Config, event: ApiErrorEvent): void {
 export function logApiResponse(config: Config, event: ApiResponseEvent): void {
   const uiEvent = {
     ...event,
-    'event.name': EVENT_API_RESPONSE,
-    'event.timestamp': new Date().toISOString(),
+    "event.name": EVENT_API_RESPONSE,
+    "event.timestamp": new Date().toISOString(),
   } as UiEvent;
   uiTelemetryService.addEvent(uiEvent);
   ClearcutLogger.getInstance(config)?.logApiResponseEvent(event);
@@ -273,11 +254,11 @@ export function logApiResponse(config: Config, event: ApiResponseEvent): void {
   });
 
   const tokenUsageData = [
-    { count: event.usage.input_token_count, type: 'input' as const },
-    { count: event.usage.output_token_count, type: 'output' as const },
-    { count: event.usage.cached_content_token_count, type: 'cache' as const },
-    { count: event.usage.thoughts_token_count, type: 'thought' as const },
-    { count: event.usage.tool_token_count, type: 'tool' as const },
+    { count: event.usage.input_token_count, type: "input" as const },
+    { count: event.usage.output_token_count, type: "output" as const },
+    { count: event.usage.cached_content_token_count, type: "cache" as const },
+    { count: event.usage.thoughts_token_count, type: "thought" as const },
+    { count: event.usage.tool_token_count, type: "tool" as const },
   ];
 
   for (const { count, type } of tokenUsageData) {
@@ -289,10 +270,7 @@ export function logApiResponse(config: Config, event: ApiResponseEvent): void {
   }
 }
 
-export function logLoopDetected(
-  config: Config,
-  event: LoopDetectedEvent,
-): void {
+export function logLoopDetected(config: Config, event: LoopDetectedEvent): void {
   ClearcutLogger.getInstance(config)?.logLoopDetectedEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -304,10 +282,7 @@ export function logLoopDetected(
   logger.emit(logRecord);
 }
 
-export function logLoopDetectionDisabled(
-  config: Config,
-  event: LoopDetectionDisabledEvent,
-): void {
+export function logLoopDetectionDisabled(config: Config, event: LoopDetectionDisabledEvent): void {
   ClearcutLogger.getInstance(config)?.logLoopDetectionDisabledEvent();
   if (!isTelemetrySdkInitialized()) return;
 
@@ -319,10 +294,7 @@ export function logLoopDetectionDisabled(
   logger.emit(logRecord);
 }
 
-export function logNextSpeakerCheck(
-  config: Config,
-  event: NextSpeakerCheckEvent,
-): void {
+export function logNextSpeakerCheck(config: Config, event: NextSpeakerCheckEvent): void {
   ClearcutLogger.getInstance(config)?.logNextSpeakerCheck(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -334,10 +306,7 @@ export function logNextSpeakerCheck(
   logger.emit(logRecord);
 }
 
-export function logSlashCommand(
-  config: Config,
-  event: SlashCommandEvent,
-): void {
+export function logSlashCommand(config: Config, event: SlashCommandEvent): void {
   ClearcutLogger.getInstance(config)?.logSlashCommandEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -349,10 +318,7 @@ export function logSlashCommand(
   logger.emit(logRecord);
 }
 
-export function logIdeConnection(
-  config: Config,
-  event: IdeConnectionEvent,
-): void {
+export function logIdeConnection(config: Config, event: IdeConnectionEvent): void {
   ClearcutLogger.getInstance(config)?.logIdeConnectionEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -379,10 +345,7 @@ export function logConversationFinishedEvent(
   logger.emit(logRecord);
 }
 
-export function logChatCompression(
-  config: Config,
-  event: ChatCompressionEvent,
-): void {
+export function logChatCompression(config: Config, event: ChatCompressionEvent): void {
   ClearcutLogger.getInstance(config)?.logChatCompressionEvent(event);
 
   const logger = logs.getLogger(SERVICE_NAME);
@@ -398,10 +361,7 @@ export function logChatCompression(
   });
 }
 
-export function logMalformedJsonResponse(
-  config: Config,
-  event: MalformedJsonResponseEvent,
-): void {
+export function logMalformedJsonResponse(config: Config, event: MalformedJsonResponseEvent): void {
   ClearcutLogger.getInstance(config)?.logMalformedJsonResponseEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -413,10 +373,7 @@ export function logMalformedJsonResponse(
   logger.emit(logRecord);
 }
 
-export function logInvalidChunk(
-  config: Config,
-  event: InvalidChunkEvent,
-): void {
+export function logInvalidChunk(config: Config, event: InvalidChunkEvent): void {
   ClearcutLogger.getInstance(config)?.logInvalidChunkEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -429,10 +386,7 @@ export function logInvalidChunk(
   recordInvalidChunk(config);
 }
 
-export function logContentRetry(
-  config: Config,
-  event: ContentRetryEvent,
-): void {
+export function logContentRetry(config: Config, event: ContentRetryEvent): void {
   ClearcutLogger.getInstance(config)?.logContentRetryEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -445,10 +399,7 @@ export function logContentRetry(
   recordContentRetry(config);
 }
 
-export function logContentRetryFailure(
-  config: Config,
-  event: ContentRetryFailureEvent,
-): void {
+export function logContentRetryFailure(config: Config, event: ContentRetryFailureEvent): void {
   ClearcutLogger.getInstance(config)?.logContentRetryFailureEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -461,10 +412,7 @@ export function logContentRetryFailure(
   recordContentRetryFailure(config);
 }
 
-export function logModelRouting(
-  config: Config,
-  event: ModelRoutingEvent,
-): void {
+export function logModelRouting(config: Config, event: ModelRoutingEvent): void {
   ClearcutLogger.getInstance(config)?.logModelRoutingEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -477,10 +425,7 @@ export function logModelRouting(
   recordModelRoutingMetrics(config, event);
 }
 
-export function logModelSlashCommand(
-  config: Config,
-  event: ModelSlashCommandEvent,
-): void {
+export function logModelSlashCommand(config: Config, event: ModelSlashCommandEvent): void {
   ClearcutLogger.getInstance(config)?.logModelSlashCommandEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -568,10 +513,7 @@ export async function logExtensionDisable(
   logger.emit(logRecord);
 }
 
-export function logSmartEditStrategy(
-  config: Config,
-  event: SmartEditStrategyEvent,
-): void {
+export function logSmartEditStrategy(config: Config, event: SmartEditStrategyEvent): void {
   ClearcutLogger.getInstance(config)?.logSmartEditStrategyEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -583,10 +525,7 @@ export function logSmartEditStrategy(
   logger.emit(logRecord);
 }
 
-export function logSmartEditCorrectionEvent(
-  config: Config,
-  event: SmartEditCorrectionEvent,
-): void {
+export function logSmartEditCorrectionEvent(config: Config, event: SmartEditCorrectionEvent): void {
   ClearcutLogger.getInstance(config)?.logSmartEditCorrectionEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -624,10 +563,7 @@ export function logAgentFinish(config: Config, event: AgentFinishEvent): void {
   recordAgentRunMetrics(config, event);
 }
 
-export function logRecoveryAttempt(
-  config: Config,
-  event: RecoveryAttemptEvent,
-): void {
+export function logRecoveryAttempt(config: Config, event: RecoveryAttemptEvent): void {
   ClearcutLogger.getInstance(config)?.logRecoveryAttemptEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
@@ -656,10 +592,7 @@ export function logWebFetchFallbackAttempt(
   logger.emit(logRecord);
 }
 
-export function logLlmLoopCheck(
-  config: Config,
-  event: LlmLoopCheckEvent,
-): void {
+export function logLlmLoopCheck(config: Config, event: LlmLoopCheckEvent): void {
   ClearcutLogger.getInstance(config)?.logLlmLoopCheckEvent(event);
   if (!isTelemetrySdkInitialized()) return;
 
diff --git a/packages/gemini-core/src/telemetry/memory-monitor.test.ts b/packages/gemini-core/src/telemetry/memory-monitor.test.ts
index fce811975..7b070e4b4 100644
--- a/packages/gemini-core/src/telemetry/memory-monitor.test.ts
+++ b/packages/gemini-core/src/telemetry/memory-monitor.test.ts
@@ -4,44 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import v8 from 'node:v8';
-import process from 'node:process';
+import process from "node:process";
+import v8 from "node:v8";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
 import {
-  MemoryMonitor,
-  initializeMemoryMonitor,
+  _resetGlobalMemoryMonitorForTests,
   getMemoryMonitor,
+  initializeMemoryMonitor,
+  MemoryMonitor,
   recordCurrentMemoryUsage,
   startGlobalMemoryMonitoring,
   stopGlobalMemoryMonitoring,
-  _resetGlobalMemoryMonitorForTests,
-} from './memory-monitor.js';
-import type { Config } from '../config/config.js';
-import { recordMemoryUsage, isPerformanceMonitoringActive } from './metrics.js';
-import { HighWaterMarkTracker } from './high-water-mark-tracker.js';
-import { RateLimiter } from './rate-limiter.js';
+} from "./memory-monitor.js";
+import { isPerformanceMonitoringActive, recordMemoryUsage } from "./metrics.js";
+import { RateLimiter } from "./rate-limiter.js";
 
 // Mock dependencies
-vi.mock('./metrics.js', () => ({
+vi.mock("./metrics.js", () => ({
   recordMemoryUsage: vi.fn(),
   isPerformanceMonitoringActive: vi.fn(),
   MemoryMetricType: {
-    HEAP_USED: 'heap_used',
-    HEAP_TOTAL: 'heap_total',
-    EXTERNAL: 'external',
-    RSS: 'rss',
+    HEAP_USED: "heap_used",
+    HEAP_TOTAL: "heap_total",
+    EXTERNAL: "external",
+    RSS: "rss",
   },
 }));
 
 // Mock Node.js modules
-vi.mock('node:v8', () => ({
+vi.mock("node:v8", () => ({
   default: {
     getHeapStatistics: vi.fn(),
     getHeapSpaceStatistics: vi.fn(),
   },
 }));
 
-vi.mock('node:process', () => ({
+vi.mock("node:process", () => ({
   default: {
     memoryUsage: vi.fn(),
     cpuUsage: vi.fn(),
@@ -50,9 +50,7 @@ vi.mock('node:process', () => ({
 }));
 
 const mockRecordMemoryUsage = vi.mocked(recordMemoryUsage);
-const mockIsPerformanceMonitoringActive = vi.mocked(
-  isPerformanceMonitoringActive,
-);
+const mockIsPerformanceMonitoringActive = vi.mocked(isPerformanceMonitoringActive);
 const mockV8GetHeapStatistics = vi.mocked(v8.getHeapStatistics);
 const mockV8GetHeapSpaceStatistics = vi.mocked(v8.getHeapSpaceStatistics);
 const mockProcessMemoryUsage = vi.mocked(process.memoryUsage);
@@ -61,7 +59,7 @@ const mockProcessUptime = vi.mocked(process.uptime);
 
 // Mock config object
 const mockConfig = {
-  getSessionId: () => 'test-session-id',
+  getSessionId: () => "test-session-id",
   getTelemetryEnabled: () => true,
 } as unknown as Config;
 
@@ -93,14 +91,14 @@ const mockHeapStatistics = {
 
 const mockHeapSpaceStatistics = [
   {
-    space_name: 'new_space',
+    space_name: "new_space",
     space_size: 8388608,
     space_used_size: 4194304,
     space_available_size: 4194304,
     physical_space_size: 8388608,
   },
   {
-    space_name: 'old_space',
+    space_name: "old_space",
     space_size: 16777216,
     space_used_size: 8388608,
     space_available_size: 8388608,
@@ -113,10 +111,10 @@ const mockCpuUsage = {
   system: 500000, // 0.5 seconds
 };
 
-describe('MemoryMonitor', () => {
+describe("MemoryMonitor", () => {
   beforeEach(() => {
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-01-01T00:00:00.000Z'));
+    vi.setSystemTime(new Date("2025-01-01T00:00:00.000Z"));
 
     // Setup default mocks
     mockIsPerformanceMonitoringActive.mockReturnValue(true);
@@ -134,19 +132,19 @@ describe('MemoryMonitor', () => {
     _resetGlobalMemoryMonitorForTests();
   });
 
-  describe('MemoryMonitor Class', () => {
-    describe('constructor', () => {
-      it('should create a new MemoryMonitor instance without config to avoid multi-session attribution', () => {
+  describe("MemoryMonitor Class", () => {
+    describe("constructor", () => {
+      it("should create a new MemoryMonitor instance without config to avoid multi-session attribution", () => {
         const monitor = new MemoryMonitor();
         expect(monitor).toBeInstanceOf(MemoryMonitor);
       });
     });
 
-    describe('takeSnapshot', () => {
-      it('should take a memory snapshot and record metrics when performance monitoring is active', () => {
+    describe("takeSnapshot", () => {
+      it("should take a memory snapshot and record metrics when performance monitoring is active", () => {
         const monitor = new MemoryMonitor();
 
-        const snapshot = monitor.takeSnapshot('test_context', mockConfig);
+        const snapshot = monitor.takeSnapshot("test_context", mockConfig);
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -159,45 +157,29 @@ describe('MemoryMonitor', () => {
         });
 
         // Verify metrics were recorded
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_context',
-          },
-        );
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapTotal,
-          {
-            memory_type: 'heap_total',
-            component: 'test_context',
-          },
-        );
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.external,
-          {
-            memory_type: 'external',
-            component: 'test_context',
-          },
-        );
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.rss,
-          {
-            memory_type: 'rss',
-            component: 'test_context',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_context",
+        });
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapTotal, {
+          memory_type: "heap_total",
+          component: "test_context",
+        });
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.external, {
+          memory_type: "external",
+          component: "test_context",
+        });
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.rss, {
+          memory_type: "rss",
+          component: "test_context",
+        });
       });
 
-      it('should not record metrics when performance monitoring is inactive', () => {
+      it("should not record metrics when performance monitoring is inactive", () => {
         mockIsPerformanceMonitoringActive.mockReturnValue(false);
         const monitor = new MemoryMonitor();
 
-        const snapshot = monitor.takeSnapshot('test_context', mockConfig);
+        const snapshot = monitor.takeSnapshot("test_context", mockConfig);
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -214,8 +196,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getCurrentMemoryUsage', () => {
-      it('should return current memory usage without recording metrics', () => {
+    describe("getCurrentMemoryUsage", () => {
+      it("should return current memory usage without recording metrics", () => {
         const monitor = new MemoryMonitor();
 
         const usage = monitor.getCurrentMemoryUsage();
@@ -235,8 +217,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('start and stop', () => {
-      it('should start and stop memory monitoring with proper lifecycle', () => {
+    describe("start and stop", () => {
+      it("should start and stop memory monitoring with proper lifecycle", () => {
         const monitor = new MemoryMonitor();
         const intervalMs = 1000;
 
@@ -244,43 +226,31 @@ describe('MemoryMonitor', () => {
         monitor.start(mockConfig, intervalMs);
 
         // Verify initial snapshot was taken
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
 
         // Fast-forward time to trigger periodic snapshot
         vi.advanceTimersByTime(intervalMs);
 
         // Verify monitoring_start snapshot was taken (multiple metrics)
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          expect.any(Number),
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, expect.any(Number), {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
 
         // Stop monitoring
         monitor.stop(mockConfig);
 
         // Verify final snapshot was taken
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_stop',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_stop",
+        });
       });
 
-      it('should not start monitoring when performance monitoring is inactive', () => {
+      it("should not start monitoring when performance monitoring is inactive", () => {
         mockIsPerformanceMonitoringActive.mockReturnValue(false);
         const monitor = new MemoryMonitor();
 
@@ -290,7 +260,7 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage).not.toHaveBeenCalled();
       });
 
-      it('should not start monitoring when already running', () => {
+      it("should not start monitoring when already running", () => {
         const monitor = new MemoryMonitor();
 
         // Start monitoring twice
@@ -303,14 +273,14 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage).toHaveBeenCalledTimes(initialCallCount);
       });
 
-      it('should handle stop when not running', () => {
+      it("should handle stop when not running", () => {
         const monitor = new MemoryMonitor();
 
         // Should not throw error
         expect(() => monitor.stop(mockConfig)).not.toThrow();
       });
 
-      it('should stop without taking final snapshot when no config provided', () => {
+      it("should stop without taking final snapshot when no config provided", () => {
         const monitor = new MemoryMonitor();
 
         monitor.start(mockConfig, 1000);
@@ -322,15 +292,9 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage).toHaveBeenCalledTimes(callsBeforeStop);
       });
 
-      it('should periodically cleanup tracker state to prevent growth', () => {
-        const trackerCleanupSpy = vi.spyOn(
-          HighWaterMarkTracker.prototype,
-          'cleanup',
-        );
-        const rateLimiterCleanupSpy = vi.spyOn(
-          RateLimiter.prototype,
-          'cleanup',
-        );
+      it("should periodically cleanup tracker state to prevent growth", () => {
+        const trackerCleanupSpy = vi.spyOn(HighWaterMarkTracker.prototype, "cleanup");
+        const rateLimiterCleanupSpy = vi.spyOn(RateLimiter.prototype, "cleanup");
 
         const monitor = new MemoryMonitor();
         monitor.start(mockConfig, 1000);
@@ -351,12 +315,12 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getMemoryGrowth', () => {
-      it('should calculate memory growth between snapshots', () => {
+    describe("getMemoryGrowth", () => {
+      it("should calculate memory growth between snapshots", () => {
         const monitor = new MemoryMonitor();
 
         // Take initial snapshot
-        monitor.takeSnapshot('initial', mockConfig);
+        monitor.takeSnapshot("initial", mockConfig);
 
         // Change memory usage
         const newMemoryUsage = {
@@ -377,7 +341,7 @@ describe('MemoryMonitor', () => {
         });
       });
 
-      it('should return null when no previous snapshot exists', () => {
+      it("should return null when no previous snapshot exists", () => {
         const monitor = new MemoryMonitor();
 
         const growth = monitor.getMemoryGrowth();
@@ -386,8 +350,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('checkMemoryThreshold', () => {
-      it('should return true when memory usage exceeds threshold', () => {
+    describe("checkMemoryThreshold", () => {
+      it("should return true when memory usage exceeds threshold", () => {
         const monitor = new MemoryMonitor();
         const thresholdMB = 10; // 10MB threshold
 
@@ -396,7 +360,7 @@ describe('MemoryMonitor', () => {
         expect(exceeds).toBe(true); // heapUsed is ~15MB
       });
 
-      it('should return false when memory usage is below threshold', () => {
+      it("should return false when memory usage is below threshold", () => {
         const monitor = new MemoryMonitor();
         const thresholdMB = 20; // 20MB threshold
 
@@ -406,8 +370,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getMemoryUsageSummary', () => {
-      it('should return memory usage summary in MB with proper rounding', () => {
+    describe("getMemoryUsageSummary", () => {
+      it("should return memory usage summary in MB with proper rounding", () => {
         const monitor = new MemoryMonitor();
 
         const summary = monitor.getMemoryUsageSummary();
@@ -422,8 +386,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getHeapStatistics', () => {
-      it('should return V8 heap statistics', () => {
+    describe("getHeapStatistics", () => {
+      it("should return V8 heap statistics", () => {
         const monitor = new MemoryMonitor();
 
         const stats = monitor.getHeapStatistics();
@@ -433,8 +397,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getHeapSpaceStatistics', () => {
-      it('should return V8 heap space statistics', () => {
+    describe("getHeapSpaceStatistics", () => {
+      it("should return V8 heap space statistics", () => {
         const monitor = new MemoryMonitor();
 
         const stats = monitor.getHeapSpaceStatistics();
@@ -444,8 +408,8 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getProcessMetrics', () => {
-      it('should return process CPU and memory metrics', () => {
+    describe("getProcessMetrics", () => {
+      it("should return process CPU and memory metrics", () => {
         const monitor = new MemoryMonitor();
 
         const metrics = monitor.getProcessMetrics();
@@ -458,14 +422,11 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('recordComponentMemoryUsage', () => {
-      it('should record memory usage for specific component', () => {
+    describe("recordComponentMemoryUsage", () => {
+      it("should record memory usage for specific component", () => {
         const monitor = new MemoryMonitor();
 
-        const snapshot = monitor.recordComponentMemoryUsage(
-          mockConfig,
-          'test_component',
-        );
+        const snapshot = monitor.recordComponentMemoryUsage(mockConfig, "test_component");
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -477,38 +438,26 @@ describe('MemoryMonitor', () => {
           heapSizeLimit: mockHeapStatistics.heap_size_limit,
         });
 
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_component',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_component",
+        });
       });
 
-      it('should record memory usage for component with operation', () => {
+      it("should record memory usage for component with operation", () => {
         const monitor = new MemoryMonitor();
 
-        monitor.recordComponentMemoryUsage(
-          mockConfig,
-          'test_component',
-          'test_operation',
-        );
-
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_component_test_operation',
-          },
-        );
+        monitor.recordComponentMemoryUsage(mockConfig, "test_component", "test_operation");
+
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_component_test_operation",
+        });
       });
     });
 
-    describe('destroy', () => {
-      it('should stop monitoring and cleanup resources', () => {
+    describe("destroy", () => {
+      it("should stop monitoring and cleanup resources", () => {
         const monitor = new MemoryMonitor();
 
         monitor.start(mockConfig, 1000);
@@ -523,9 +472,9 @@ describe('MemoryMonitor', () => {
     });
   });
 
-  describe('Global Memory Monitor Functions', () => {
-    describe('initializeMemoryMonitor', () => {
-      it('should create singleton instance', () => {
+  describe("Global Memory Monitor Functions", () => {
+    describe("initializeMemoryMonitor", () => {
+      it("should create singleton instance", () => {
         const monitor1 = initializeMemoryMonitor();
         const monitor2 = initializeMemoryMonitor();
 
@@ -534,13 +483,13 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('getMemoryMonitor', () => {
-      it('should return null when not initialized', () => {
+    describe("getMemoryMonitor", () => {
+      it("should return null when not initialized", () => {
         _resetGlobalMemoryMonitorForTests();
         expect(getMemoryMonitor()).toBeNull();
       });
 
-      it('should return initialized monitor', () => {
+      it("should return initialized monitor", () => {
         const initialized = initializeMemoryMonitor();
         const retrieved = getMemoryMonitor();
 
@@ -548,9 +497,9 @@ describe('MemoryMonitor', () => {
       });
     });
 
-    describe('recordCurrentMemoryUsage', () => {
-      it('should initialize monitor and take snapshot', () => {
-        const snapshot = recordCurrentMemoryUsage(mockConfig, 'test_context');
+    describe("recordCurrentMemoryUsage", () => {
+      it("should initialize monitor and take snapshot", () => {
+        const snapshot = recordCurrentMemoryUsage(mockConfig, "test_context");
 
         expect(snapshot).toEqual({
           timestamp: Date.now(),
@@ -562,58 +511,42 @@ describe('MemoryMonitor', () => {
           heapSizeLimit: mockHeapStatistics.heap_size_limit,
         });
 
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'test_context',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "test_context",
+        });
       });
     });
 
-    describe('startGlobalMemoryMonitoring', () => {
-      it('should initialize and start global monitoring', () => {
+    describe("startGlobalMemoryMonitoring", () => {
+      it("should initialize and start global monitoring", () => {
         startGlobalMemoryMonitoring(mockConfig, 1000);
 
         // Verify initial snapshot
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
 
         // Fast-forward and verify monitoring snapshot
         vi.advanceTimersByTime(1000);
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          expect.any(Number),
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_start',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, expect.any(Number), {
+          memory_type: "heap_used",
+          component: "monitoring_start",
+        });
       });
     });
 
-    describe('stopGlobalMemoryMonitoring', () => {
-      it('should stop global monitoring when monitor exists', () => {
+    describe("stopGlobalMemoryMonitoring", () => {
+      it("should stop global monitoring when monitor exists", () => {
         startGlobalMemoryMonitoring(mockConfig, 1000);
         stopGlobalMemoryMonitoring(mockConfig);
 
         // Verify final snapshot
-        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(
-          mockConfig,
-          mockMemoryUsage.heapUsed,
-          {
-            memory_type: 'heap_used',
-            component: 'monitoring_stop',
-          },
-        );
+        expect(mockRecordMemoryUsage).toHaveBeenCalledWith(mockConfig, mockMemoryUsage.heapUsed, {
+          memory_type: "heap_used",
+          component: "monitoring_stop",
+        });
 
         // Verify no more periodic snapshots
         const callsAfterStop = mockRecordMemoryUsage.mock.calls.length;
@@ -621,48 +554,42 @@ describe('MemoryMonitor', () => {
         expect(mockRecordMemoryUsage.mock.calls.length).toBe(callsAfterStop);
       });
 
-      it('should handle stop when no global monitor exists', () => {
+      it("should handle stop when no global monitor exists", () => {
         expect(() => stopGlobalMemoryMonitoring(mockConfig)).not.toThrow();
       });
     });
   });
 
-  describe('Error Scenarios', () => {
-    it('should handle process.memoryUsage() errors gracefully', () => {
+  describe("Error Scenarios", () => {
+    it("should handle process.memoryUsage() errors gracefully", () => {
       mockProcessMemoryUsage.mockImplementation(() => {
-        throw new Error('Memory access error');
+        throw new Error("Memory access error");
       });
 
       const monitor = new MemoryMonitor();
 
-      expect(() => monitor.getCurrentMemoryUsage()).toThrow(
-        'Memory access error',
-      );
+      expect(() => monitor.getCurrentMemoryUsage()).toThrow("Memory access error");
     });
 
-    it('should handle v8.getHeapStatistics() errors gracefully', () => {
+    it("should handle v8.getHeapStatistics() errors gracefully", () => {
       mockV8GetHeapStatistics.mockImplementation(() => {
-        throw new Error('Heap statistics error');
+        throw new Error("Heap statistics error");
       });
 
       const monitor = new MemoryMonitor();
 
-      expect(() => monitor.getCurrentMemoryUsage()).toThrow(
-        'Heap statistics error',
-      );
+      expect(() => monitor.getCurrentMemoryUsage()).toThrow("Heap statistics error");
     });
 
-    it('should handle metric recording errors gracefully', () => {
+    it("should handle metric recording errors gracefully", () => {
       mockRecordMemoryUsage.mockImplementation(() => {
-        throw new Error('Metric recording error');
+        throw new Error("Metric recording error");
       });
 
       const monitor = new MemoryMonitor();
 
       // Should propagate error if metric recording fails
-      expect(() => monitor.takeSnapshot('test', mockConfig)).toThrow(
-        'Metric recording error',
-      );
+      expect(() => monitor.takeSnapshot("test", mockConfig)).toThrow("Metric recording error");
     });
   });
 });
diff --git a/packages/gemini-core/src/telemetry/memory-monitor.ts b/packages/gemini-core/src/telemetry/memory-monitor.ts
index e005bd73c..6fd1fe9af 100644
--- a/packages/gemini-core/src/telemetry/memory-monitor.ts
+++ b/packages/gemini-core/src/telemetry/memory-monitor.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import v8 from 'node:v8';
-import process from 'node:process';
-import type { Config } from '../config/config.js';
-import { bytesToMB } from '../utils/formatters.js';
-import { isUserActive } from './activity-detector.js';
-import { HighWaterMarkTracker } from './high-water-mark-tracker.js';
-import {
-  recordMemoryUsage,
-  MemoryMetricType,
-  isPerformanceMonitoringActive,
-} from './metrics.js';
-import { RateLimiter } from './rate-limiter.js';
+import process from "node:process";
+import v8 from "node:v8";
+import type { Config } from "../config/config.js";
+import { bytesToMB } from "../utils/formatters.js";
+import { isUserActive } from "./activity-detector.js";
+import { HighWaterMarkTracker } from "./high-water-mark-tracker.js";
+import { isPerformanceMonitoringActive, MemoryMetricType, recordMemoryUsage } from "./metrics.js";
+import { RateLimiter } from "./rate-limiter.js";
 
 export interface MemorySnapshot {
   timestamp: number;
@@ -64,7 +60,7 @@ export class MemoryMonitor {
     this.isRunning = true;
 
     // Take initial snapshot
-    this.takeSnapshot('monitoring_start', config);
+    this.takeSnapshot("monitoring_start", config);
 
     // Set up periodic monitoring with enhanced logic
     this.intervalId = setInterval(() => {
@@ -80,7 +76,7 @@ export class MemoryMonitor {
 
     if (!this.useEnhancedMonitoring) {
       // Fall back to original behavior
-      this.takeSnapshot('periodic', config);
+      this.takeSnapshot("periodic", config);
       return;
     }
 
@@ -93,29 +89,23 @@ export class MemoryMonitor {
     const currentMemory = this.getCurrentMemoryUsage();
 
     // Check if RSS has grown significantly (5% threshold)
-    const shouldRecordRss = this.highWaterMarkTracker.shouldRecordMetric(
-      'rss',
-      currentMemory.rss,
-    );
+    const shouldRecordRss = this.highWaterMarkTracker.shouldRecordMetric("rss", currentMemory.rss);
     const shouldRecordHeap = this.highWaterMarkTracker.shouldRecordMetric(
-      'heap_used',
+      "heap_used",
       currentMemory.heapUsed,
     );
 
     // Also check rate limiting
-    const canRecordPeriodic = this.rateLimiter.shouldRecord('periodic_memory');
-    const canRecordHighWater = this.rateLimiter.shouldRecord(
-      'high_water_memory',
-      true,
-    ); // High priority
+    const canRecordPeriodic = this.rateLimiter.shouldRecord("periodic_memory");
+    const canRecordHighWater = this.rateLimiter.shouldRecord("high_water_memory", true); // High priority
 
     // Record if we have significant growth and aren't rate limited
     if ((shouldRecordRss || shouldRecordHeap) && canRecordHighWater) {
-      const context = shouldRecordRss ? 'rss_growth' : 'heap_growth';
+      const context = shouldRecordRss ? "rss_growth" : "heap_growth";
       this.takeSnapshot(context, config);
     } else if (canRecordPeriodic) {
       // Occasionally record even without growth for baseline tracking
-      this.takeSnapshotWithoutRecording('periodic_check', config);
+      this.takeSnapshotWithoutRecording("periodic_check", config);
     }
   }
 
@@ -124,10 +114,7 @@ export class MemoryMonitor {
    */
   private performPeriodicCleanup(): void {
     const now = Date.now();
-    if (
-      now - this.lastCleanupTimestamp <
-      MemoryMonitor.STATE_CLEANUP_INTERVAL_MS
-    ) {
+    if (now - this.lastCleanupTimestamp < MemoryMonitor.STATE_CLEANUP_INTERVAL_MS) {
       return;
     }
 
@@ -151,7 +138,7 @@ export class MemoryMonitor {
 
     // Take final snapshot if config is provided
     if (config) {
-      this.takeSnapshot('monitoring_stop', config);
+      this.takeSnapshot("monitoring_stop", config);
     }
     this.isRunning = false;
   }
@@ -200,10 +187,7 @@ export class MemoryMonitor {
   /**
    * Take a memory snapshot without recording metrics (for internal tracking)
    */
-  private takeSnapshotWithoutRecording(
-    _context: string,
-    _config: Config,
-  ): MemorySnapshot {
+  private takeSnapshotWithoutRecording(_context: string, _config: Config): MemorySnapshot {
     const memUsage = process.memoryUsage();
     const heapStats = v8.getHeapStatistics();
 
@@ -218,11 +202,8 @@ export class MemoryMonitor {
     };
 
     // Update internal tracking but don't record metrics
-    this.highWaterMarkTracker.shouldRecordMetric('rss', snapshot.rss);
-    this.highWaterMarkTracker.shouldRecordMetric(
-      'heap_used',
-      snapshot.heapUsed,
-    );
+    this.highWaterMarkTracker.shouldRecordMetric("rss", snapshot.rss);
+    this.highWaterMarkTracker.shouldRecordMetric("heap_used", snapshot.heapUsed);
 
     this.lastSnapshot = snapshot;
     return snapshot;
@@ -297,10 +278,7 @@ export class MemoryMonitor {
     component: string,
     operation?: string,
   ): MemorySnapshot {
-    const snapshot = this.takeSnapshot(
-      operation ? `${component}_${operation}` : component,
-      config,
-    );
+    const snapshot = this.takeSnapshot(operation ? `${component}_${operation}` : component, config);
     return snapshot;
   }
 
@@ -362,11 +340,8 @@ export class MemoryMonitor {
   /**
    * Force record memory metrics (bypasses rate limiting for critical events)
    */
-  forceRecordMemory(
-    config: Config,
-    context: string = 'forced',
-  ): MemorySnapshot {
-    this.rateLimiter.forceRecord('forced_memory');
+  forceRecordMemory(config: Config, context: string = "forced"): MemorySnapshot {
+    this.rateLimiter.forceRecord("forced_memory");
     return this.takeSnapshot(context, config);
   }
 
@@ -410,10 +385,7 @@ export function getMemoryMonitor(): MemoryMonitor | null {
 /**
  * Record memory usage for current operation
  */
-export function recordCurrentMemoryUsage(
-  config: Config,
-  context: string,
-): MemorySnapshot {
+export function recordCurrentMemoryUsage(config: Config, context: string): MemorySnapshot {
   const monitor = initializeMemoryMonitor();
   return monitor.takeSnapshot(context, config);
 }
@@ -421,10 +393,7 @@ export function recordCurrentMemoryUsage(
 /**
  * Start global memory monitoring
  */
-export function startGlobalMemoryMonitoring(
-  config: Config,
-  intervalMs: number = 10000,
-): void {
+export function startGlobalMemoryMonitoring(config: Config, intervalMs: number = 10000): void {
   const monitor = initializeMemoryMonitor();
   monitor.start(config, intervalMs);
 }
diff --git a/packages/gemini-core/src/telemetry/metrics.test.ts b/packages/gemini-core/src/telemetry/metrics.test.ts
index dbb231f7c..962de94bf 100644
--- a/packages/gemini-core/src/telemetry/metrics.test.ts
+++ b/packages/gemini-core/src/telemetry/metrics.test.ts
@@ -4,37 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import type {
-  Counter,
-  Meter,
-  Attributes,
-  Context,
-  Histogram,
-} from '@opentelemetry/api';
-import type { Config } from '../config/config.js';
-import {
-  FileOperation,
-  MemoryMetricType,
-  ToolExecutionPhase,
-  ApiRequestPhase,
-} from './metrics.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-import { ModelRoutingEvent, AgentFinishEvent } from './types.js';
-import { AgentTerminateMode } from '../agents/types.js';
-
-const mockCounterAddFn: Mock<
-  (value: number, attributes?: Attributes, context?: Context) => void
-> = vi.fn();
+import type { Attributes, Context, Counter, Histogram, Meter } from "@opentelemetry/api";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { AgentTerminateMode } from "../agents/types.js";
+import type { Config } from "../config/config.js";
+import { makeFakeConfig } from "../test-utils/config.js";
+import { ApiRequestPhase, FileOperation, MemoryMetricType, ToolExecutionPhase } from "./metrics.js";
+import { AgentFinishEvent, ModelRoutingEvent } from "./types.js";
+
+const mockCounterAddFn: Mock<(value: number, attributes?: Attributes, context?: Context) => void> =
+  vi.fn();
 const mockHistogramRecordFn: Mock<
   (value: number, attributes?: Attributes, context?: Context) => void
 > = vi.fn();
 
-const mockCreateCounterFn: Mock<(name: string, options?: unknown) => Counter> =
-  vi.fn();
-const mockCreateHistogramFn: Mock<
-  (name: string, options?: unknown) => Histogram
-> = vi.fn();
+const mockCreateCounterFn: Mock<(name: string, options?: unknown) => Counter> = vi.fn();
+const mockCreateHistogramFn: Mock<(name: string, options?: unknown) => Histogram> = vi.fn();
 
 const mockCounterInstance: Counter = {
   add: mockCounterAddFn,
@@ -70,78 +55,73 @@ function originalOtelMockFactory() {
   } as const;
 }
 
-vi.mock('@opentelemetry/api');
-vi.mock('./telemetryAttributes.js');
-
-describe('Telemetry Metrics', () => {
-  let initializeMetricsModule: typeof import('./metrics.js').initializeMetrics;
-  let recordTokenUsageMetricsModule: typeof import('./metrics.js').recordTokenUsageMetrics;
-  let recordFileOperationMetricModule: typeof import('./metrics.js').recordFileOperationMetric;
-  let recordChatCompressionMetricsModule: typeof import('./metrics.js').recordChatCompressionMetrics;
-  let recordModelRoutingMetricsModule: typeof import('./metrics.js').recordModelRoutingMetrics;
-  let recordStartupPerformanceModule: typeof import('./metrics.js').recordStartupPerformance;
-  let recordMemoryUsageModule: typeof import('./metrics.js').recordMemoryUsage;
-  let recordCpuUsageModule: typeof import('./metrics.js').recordCpuUsage;
-  let recordToolQueueDepthModule: typeof import('./metrics.js').recordToolQueueDepth;
-  let recordToolExecutionBreakdownModule: typeof import('./metrics.js').recordToolExecutionBreakdown;
-  let recordTokenEfficiencyModule: typeof import('./metrics.js').recordTokenEfficiency;
-  let recordApiRequestBreakdownModule: typeof import('./metrics.js').recordApiRequestBreakdown;
-  let recordPerformanceScoreModule: typeof import('./metrics.js').recordPerformanceScore;
-  let recordPerformanceRegressionModule: typeof import('./metrics.js').recordPerformanceRegression;
-  let recordBaselineComparisonModule: typeof import('./metrics.js').recordBaselineComparison;
-  let recordGenAiClientTokenUsageModule: typeof import('./metrics.js').recordGenAiClientTokenUsage;
-  let recordGenAiClientOperationDurationModule: typeof import('./metrics.js').recordGenAiClientOperationDuration;
-  let recordFlickerFrameModule: typeof import('./metrics.js').recordFlickerFrame;
-  let recordExitFailModule: typeof import('./metrics.js').recordExitFail;
-  let recordAgentRunMetricsModule: typeof import('./metrics.js').recordAgentRunMetrics;
-  let recordLinesChangedModule: typeof import('./metrics.js').recordLinesChanged;
-  let recordSlowRenderModule: typeof import('./metrics.js').recordSlowRender;
+vi.mock("@opentelemetry/api");
+vi.mock("./telemetryAttributes.js");
+
+describe("Telemetry Metrics", () => {
+  let initializeMetricsModule: typeof import("./metrics.js").initializeMetrics;
+  let recordTokenUsageMetricsModule: typeof import("./metrics.js").recordTokenUsageMetrics;
+  let recordFileOperationMetricModule: typeof import("./metrics.js").recordFileOperationMetric;
+  let recordChatCompressionMetricsModule: typeof import("./metrics.js").recordChatCompressionMetrics;
+  let recordModelRoutingMetricsModule: typeof import("./metrics.js").recordModelRoutingMetrics;
+  let recordStartupPerformanceModule: typeof import("./metrics.js").recordStartupPerformance;
+  let recordMemoryUsageModule: typeof import("./metrics.js").recordMemoryUsage;
+  let recordCpuUsageModule: typeof import("./metrics.js").recordCpuUsage;
+  let recordToolQueueDepthModule: typeof import("./metrics.js").recordToolQueueDepth;
+  let recordToolExecutionBreakdownModule: typeof import("./metrics.js").recordToolExecutionBreakdown;
+  let recordTokenEfficiencyModule: typeof import("./metrics.js").recordTokenEfficiency;
+  let recordApiRequestBreakdownModule: typeof import("./metrics.js").recordApiRequestBreakdown;
+  let recordPerformanceScoreModule: typeof import("./metrics.js").recordPerformanceScore;
+  let recordPerformanceRegressionModule: typeof import("./metrics.js").recordPerformanceRegression;
+  let recordBaselineComparisonModule: typeof import("./metrics.js").recordBaselineComparison;
+  let recordGenAiClientTokenUsageModule: typeof import("./metrics.js").recordGenAiClientTokenUsage;
+  let recordGenAiClientOperationDurationModule: typeof import("./metrics.js").recordGenAiClientOperationDuration;
+  let recordFlickerFrameModule: typeof import("./metrics.js").recordFlickerFrame;
+  let recordExitFailModule: typeof import("./metrics.js").recordExitFail;
+  let recordAgentRunMetricsModule: typeof import("./metrics.js").recordAgentRunMetrics;
+  let recordLinesChangedModule: typeof import("./metrics.js").recordLinesChanged;
+  let recordSlowRenderModule: typeof import("./metrics.js").recordSlowRender;
 
   beforeEach(async () => {
     vi.resetModules();
-    vi.doMock('@opentelemetry/api', () => {
+    vi.doMock("@opentelemetry/api", () => {
       const actualApi = originalOtelMockFactory();
       (actualApi.metrics.getMeter as Mock).mockReturnValue(mockMeterInstance);
       return actualApi;
     });
 
-    const { getCommonAttributes } = await import('./telemetryAttributes.js');
+    const { getCommonAttributes } = await import("./telemetryAttributes.js");
     (getCommonAttributes as Mock).mockReturnValue({
-      'session.id': 'test-session-id',
-      'installation.id': 'test-installation-id',
-      'user.email': 'test@example.com',
+      "session.id": "test-session-id",
+      "installation.id": "test-installation-id",
+      "user.email": "test@example.com",
     });
 
-    const metricsJsModule = await import('./metrics.js');
+    const metricsJsModule = await import("./metrics.js");
     initializeMetricsModule = metricsJsModule.initializeMetrics;
     recordTokenUsageMetricsModule = metricsJsModule.recordTokenUsageMetrics;
     recordFileOperationMetricModule = metricsJsModule.recordFileOperationMetric;
-    recordChatCompressionMetricsModule =
-      metricsJsModule.recordChatCompressionMetrics;
+    recordChatCompressionMetricsModule = metricsJsModule.recordChatCompressionMetrics;
     recordModelRoutingMetricsModule = metricsJsModule.recordModelRoutingMetrics;
     recordStartupPerformanceModule = metricsJsModule.recordStartupPerformance;
     recordMemoryUsageModule = metricsJsModule.recordMemoryUsage;
     recordCpuUsageModule = metricsJsModule.recordCpuUsage;
     recordToolQueueDepthModule = metricsJsModule.recordToolQueueDepth;
-    recordToolExecutionBreakdownModule =
-      metricsJsModule.recordToolExecutionBreakdown;
+    recordToolExecutionBreakdownModule = metricsJsModule.recordToolExecutionBreakdown;
     recordTokenEfficiencyModule = metricsJsModule.recordTokenEfficiency;
     recordApiRequestBreakdownModule = metricsJsModule.recordApiRequestBreakdown;
     recordPerformanceScoreModule = metricsJsModule.recordPerformanceScore;
-    recordPerformanceRegressionModule =
-      metricsJsModule.recordPerformanceRegression;
+    recordPerformanceRegressionModule = metricsJsModule.recordPerformanceRegression;
     recordBaselineComparisonModule = metricsJsModule.recordBaselineComparison;
-    recordGenAiClientTokenUsageModule =
-      metricsJsModule.recordGenAiClientTokenUsage;
-    recordGenAiClientOperationDurationModule =
-      metricsJsModule.recordGenAiClientOperationDuration;
+    recordGenAiClientTokenUsageModule = metricsJsModule.recordGenAiClientTokenUsage;
+    recordGenAiClientOperationDurationModule = metricsJsModule.recordGenAiClientOperationDuration;
     recordFlickerFrameModule = metricsJsModule.recordFlickerFrame;
     recordExitFailModule = metricsJsModule.recordExitFail;
     recordAgentRunMetricsModule = metricsJsModule.recordAgentRunMetrics;
     recordLinesChangedModule = metricsJsModule.recordLinesChanged;
     recordSlowRenderModule = metricsJsModule.recordSlowRender;
 
-    const otelApiModule = await import('@opentelemetry/api');
+    const otelApiModule = await import("@opentelemetry/api");
 
     mockCounterAddFn.mockClear();
     mockCreateCounterFn.mockClear();
@@ -154,14 +134,14 @@ describe('Telemetry Metrics', () => {
     mockCreateHistogramFn.mockReturnValue(mockHistogramInstance);
   });
 
-  describe('recordFlickerFrame', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordFlickerFrame", () => {
+    it("does not record metrics if not initialized", () => {
       const config = makeFakeConfig({});
       recordFlickerFrameModule(config);
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('records a flicker frame event when initialized', () => {
+    it("records a flicker frame event when initialized", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
       recordFlickerFrameModule(config);
@@ -169,21 +149,21 @@ describe('Telemetry Metrics', () => {
       // Called for session, then for flicker
       expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
       expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('recordExitFail', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordExitFail", () => {
+    it("does not record metrics if not initialized", () => {
       const config = makeFakeConfig({});
       recordExitFailModule(config);
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('records a exit fail event when initialized', () => {
+    it("records a exit fail event when initialized", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
       recordExitFailModule(config);
@@ -191,52 +171,52 @@ describe('Telemetry Metrics', () => {
       // Called for session, then for exit fail
       expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
       expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('recordSlowRender', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordSlowRender", () => {
+    it("does not record metrics if not initialized", () => {
       const config = makeFakeConfig({});
       recordSlowRenderModule(config, 123);
       expect(mockHistogramRecordFn).not.toHaveBeenCalled();
     });
 
-    it('records a slow render event when initialized', () => {
+    it("records a slow render event when initialized", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
       recordSlowRenderModule(config, 123);
 
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(123, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('initializeMetrics', () => {
+  describe("initializeMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should apply common attributes including email', () => {
+    it("should apply common attributes including email", () => {
       initializeMetricsModule(mockConfig);
 
       expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
       });
     });
   });
 
-  describe('recordChatCompressionMetrics', () => {
-    it('does not record metrics if not initialized', () => {
+  describe("recordChatCompressionMetrics", () => {
+    it("does not record metrics if not initialized", () => {
       const lol = makeFakeConfig({});
 
       recordChatCompressionMetricsModule(lol, {
@@ -247,7 +227,7 @@ describe('Telemetry Metrics', () => {
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('records token compression with the correct attributes', () => {
+    it("records token compression with the correct attributes", () => {
       const config = makeFakeConfig({});
       initializeMetricsModule(config);
 
@@ -257,108 +237,109 @@ describe('Telemetry Metrics', () => {
       });
 
       expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
         tokens_after: 100,
         tokens_before: 200,
       });
     });
   });
 
-  describe('recordTokenUsageMetrics', () => {
+  describe("recordTokenUsageMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record metrics if not initialized', () => {
+    it("should not record metrics if not initialized", () => {
       recordTokenUsageMetricsModule(mockConfig, 100, {
-        model: 'gemini-pro',
-        type: 'input',
+        model: "gemini-pro",
+        type: "input",
       });
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
     it.each([
-      { type: 'input', tokens: 100, model: 'gemini-pro' },
-      { type: 'output', tokens: 50, model: 'gemini-pro' },
-      { type: 'thought', tokens: 25, model: 'gemini-pro' },
-      { type: 'cache', tokens: 75, model: 'gemini-pro' },
-      { type: 'tool', tokens: 125, model: 'gemini-pro' },
-      { type: 'input', tokens: 200, model: 'gemini-different-model' },
-    ])(
-      'should record token usage for $type type with $tokens tokens for model $model',
-      ({ type, tokens, model }) => {
-        initializeMetricsModule(mockConfig);
-        mockCounterAddFn.mockClear();
+      { type: "input", tokens: 100, model: "gemini-pro" },
+      { type: "output", tokens: 50, model: "gemini-pro" },
+      { type: "thought", tokens: 25, model: "gemini-pro" },
+      { type: "cache", tokens: 75, model: "gemini-pro" },
+      { type: "tool", tokens: 125, model: "gemini-pro" },
+      { type: "input", tokens: 200, model: "gemini-different-model" },
+    ])("should record token usage for $type type with $tokens tokens for model $model", ({
+      type,
+      tokens,
+      model,
+    }) => {
+      initializeMetricsModule(mockConfig);
+      mockCounterAddFn.mockClear();
 
-        recordTokenUsageMetricsModule(mockConfig, tokens, {
-          model,
-          type: type as 'input' | 'output' | 'thought' | 'cache' | 'tool',
-        });
+      recordTokenUsageMetricsModule(mockConfig, tokens, {
+        model,
+        type: type as "input" | "output" | "thought" | "cache" | "tool",
+      });
 
-        expect(mockCounterAddFn).toHaveBeenCalledWith(tokens, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model,
-          type,
-        });
-      },
-    );
+      expect(mockCounterAddFn).toHaveBeenCalledWith(tokens, {
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        model,
+        type,
+      });
+    });
   });
 
-  describe('recordLinesChanged metric', () => {
+  describe("recordLinesChanged metric", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record lines added/removed if not initialized', () => {
-      recordLinesChangedModule(mockConfig, 10, 'added', {
-        function_name: 'fn',
+    it("should not record lines added/removed if not initialized", () => {
+      recordLinesChangedModule(mockConfig, 10, "added", {
+        function_name: "fn",
       });
-      recordLinesChangedModule(mockConfig, 5, 'removed', {
-        function_name: 'fn',
+      recordLinesChangedModule(mockConfig, 5, "removed", {
+        function_name: "fn",
       });
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('should record lines added with function_name after initialization', () => {
+    it("should record lines added with function_name after initialization", () => {
       initializeMetricsModule(mockConfig);
       mockCounterAddFn.mockClear();
-      recordLinesChangedModule(mockConfig, 10, 'added', {
-        function_name: 'my-fn',
+      recordLinesChangedModule(mockConfig, 10, "added", {
+        function_name: "my-fn",
       });
       expect(mockCounterAddFn).toHaveBeenCalledWith(10, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        type: 'added',
-        function_name: 'my-fn',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        type: "added",
+        function_name: "my-fn",
       });
     });
 
-    it('should record lines removed with function_name after initialization', () => {
+    it("should record lines removed with function_name after initialization", () => {
       initializeMetricsModule(mockConfig);
       mockCounterAddFn.mockClear();
-      recordLinesChangedModule(mockConfig, 7, 'removed', {
-        function_name: 'my-fn',
+      recordLinesChangedModule(mockConfig, 7, "removed", {
+        function_name: "my-fn",
       });
       expect(mockCounterAddFn).toHaveBeenCalledWith(7, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        type: 'removed',
-        function_name: 'my-fn',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        type: "removed",
+        function_name: "my-fn",
       });
     });
   });
 
-  describe('recordFileOperationMetric', () => {
+  describe("recordFileOperationMetric", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
@@ -376,49 +357,49 @@ describe('Telemetry Metrics', () => {
 
     it.each<FileOperationTestCase>([
       {
-        name: 'should not record metrics if not initialized',
+        name: "should not record metrics if not initialized",
         initialized: false,
         attributes: {
           operation: FileOperation.CREATE,
           lines: 10,
-          mimetype: 'text/plain',
-          extension: 'txt',
+          mimetype: "text/plain",
+          extension: "txt",
         },
         shouldCall: false,
       },
       {
-        name: 'should record file creation with all attributes',
+        name: "should record file creation with all attributes",
         initialized: true,
         attributes: {
           operation: FileOperation.CREATE,
           lines: 10,
-          mimetype: 'text/plain',
-          extension: 'txt',
+          mimetype: "text/plain",
+          extension: "txt",
         },
         shouldCall: true,
       },
       {
-        name: 'should record file read with minimal attributes',
+        name: "should record file read with minimal attributes",
         initialized: true,
         attributes: { operation: FileOperation.READ },
         shouldCall: true,
       },
       {
-        name: 'should record file update with some attributes',
+        name: "should record file update with some attributes",
         initialized: true,
         attributes: {
           operation: FileOperation.UPDATE,
-          mimetype: 'application/javascript',
+          mimetype: "application/javascript",
         },
         shouldCall: true,
       },
       {
-        name: 'should record file update with no optional attributes',
+        name: "should record file update with no optional attributes",
         initialized: true,
         attributes: { operation: FileOperation.UPDATE },
         shouldCall: true,
       },
-    ])('$name', ({ initialized, attributes, shouldCall }) => {
+    ])("$name", ({ initialized, attributes, shouldCall }) => {
       if (initialized) {
         initializeMetricsModule(mockConfig);
         // The session start event also calls the counter.
@@ -429,9 +410,9 @@ describe('Telemetry Metrics', () => {
 
       if (shouldCall) {
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
           ...attributes,
         });
       } else {
@@ -440,18 +421,18 @@ describe('Telemetry Metrics', () => {
     });
   });
 
-  describe('recordModelRoutingMetrics', () => {
+  describe("recordModelRoutingMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record metrics if not initialized', () => {
+    it("should not record metrics if not initialized", () => {
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         100,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
@@ -460,70 +441,70 @@ describe('Telemetry Metrics', () => {
       expect(mockCounterAddFn).not.toHaveBeenCalled();
     });
 
-    it('should record latency for a successful routing decision', () => {
+    it("should record latency for a successful routing decision", () => {
       initializeMetricsModule(mockConfig);
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'default',
+        "gemini-pro",
+        "default",
         150,
-        'test-reason',
+        "test-reason",
         false,
         undefined,
       );
       recordModelRoutingMetricsModule(mockConfig, event);
 
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        'routing.decision_model': 'gemini-pro',
-        'routing.decision_source': 'default',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        "routing.decision_model": "gemini-pro",
+        "routing.decision_source": "default",
       });
       // The session counter is called once on init
       expect(mockCounterAddFn).toHaveBeenCalledTimes(1);
     });
 
-    it('should record latency and failure for a failed routing decision', () => {
+    it("should record latency and failure for a failed routing decision", () => {
       initializeMetricsModule(mockConfig);
       const event = new ModelRoutingEvent(
-        'gemini-pro',
-        'classifier',
+        "gemini-pro",
+        "classifier",
         200,
-        'test-reason',
+        "test-reason",
         true,
-        'test-error',
+        "test-error",
       );
       recordModelRoutingMetricsModule(mockConfig, event);
 
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(200, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        'routing.decision_model': 'gemini-pro',
-        'routing.decision_source': 'classifier',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        "routing.decision_model": "gemini-pro",
+        "routing.decision_source": "classifier",
       });
 
       expect(mockCounterAddFn).toHaveBeenCalledTimes(2);
       expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        'routing.decision_source': 'classifier',
-        'routing.error_message': 'test-error',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        "routing.decision_source": "classifier",
+        "routing.error_message": "test-error",
       });
     });
   });
 
-  describe('recordAgentRunMetrics', () => {
+  describe("recordAgentRunMetrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    it('should not record metrics if not initialized', () => {
+    it("should not record metrics if not initialized", () => {
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -533,14 +514,14 @@ describe('Telemetry Metrics', () => {
       expect(mockHistogramRecordFn).not.toHaveBeenCalled();
     });
 
-    it('should record agent run metrics', () => {
+    it("should record agent run metrics", () => {
       initializeMetricsModule(mockConfig);
       mockCounterAddFn.mockClear();
       mockHistogramRecordFn.mockClear();
 
       const event = new AgentFinishEvent(
-        'agent-123',
-        'TestAgent',
+        "agent-123",
+        "TestAgent",
         1000,
         5,
         AgentTerminateMode.GOAL,
@@ -549,232 +530,232 @@ describe('Telemetry Metrics', () => {
 
       // Verify agent run counter
       expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        agent_name: 'TestAgent',
-        terminate_reason: 'GOAL',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        agent_name: "TestAgent",
+        terminate_reason: "GOAL",
       });
 
       // Verify agent duration histogram
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(1000, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        agent_name: 'TestAgent',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        agent_name: "TestAgent",
       });
 
       // Verify agent turns histogram
       expect(mockHistogramRecordFn).toHaveBeenCalledWith(5, {
-        'session.id': 'test-session-id',
-        'installation.id': 'test-installation-id',
-        'user.email': 'test@example.com',
-        agent_name: 'TestAgent',
+        "session.id": "test-session-id",
+        "installation.id": "test-installation-id",
+        "user.email": "test@example.com",
+        agent_name: "TestAgent",
       });
     });
   });
 
-  describe('OpenTelemetry GenAI Semantic Convention Metrics', () => {
+  describe("OpenTelemetry GenAI Semantic Convention Metrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    describe('recordGenAiClientTokenUsage', () => {
-      it('should not record metrics when not initialized', () => {
+    describe("recordGenAiClientTokenUsage", () => {
+      it("should not record metrics when not initialized", () => {
         recordGenAiClientTokenUsageModule(mockConfig, 100, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.token.type': 'input',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.token.type": "input",
         });
 
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record input token usage with correct attributes', () => {
+      it("should record input token usage with correct attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientTokenUsageModule(mockConfig, 150, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
       });
 
-      it('should record output token usage with correct attributes', () => {
+      it("should record output token usage with correct attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientTokenUsageModule(mockConfig, 75, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'output',
-          'gen_ai.request.model': 'gemini-pro',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "output",
+          "gen_ai.request.model": "gemini-pro",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(75, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'output',
-          'gen_ai.request.model': 'gemini-pro',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "output",
+          "gen_ai.request.model": "gemini-pro",
         });
       });
 
-      it('should record token usage with optional attributes', () => {
+      it("should record token usage with optional attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientTokenUsageModule(mockConfig, 200, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'text-embedding-004',
-          'server.address': 'aiplatform.googleapis.com',
-          'server.port': 443,
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "text-embedding-004",
+          "server.address": "aiplatform.googleapis.com",
+          "server.port": 443,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(200, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.token.type': 'input',
-          'gen_ai.request.model': 'text-embedding-004',
-          'server.address': 'aiplatform.googleapis.com',
-          'server.port': 443,
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.token.type": "input",
+          "gen_ai.request.model": "text-embedding-004",
+          "server.address": "aiplatform.googleapis.com",
+          "server.port": 443,
         });
       });
     });
 
-    describe('recordGenAiClientOperationDuration', () => {
-      it('should not record metrics when not initialized', () => {
+    describe("recordGenAiClientOperationDuration", () => {
+      it("should not record metrics when not initialized", () => {
         recordGenAiClientOperationDurationModule(mockConfig, 2.5, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
         });
 
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record successful operation duration with correct attributes', () => {
+      it("should record successful operation duration with correct attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 1.25, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(1.25, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
-          'gen_ai.request.model': 'gemini-2.0-flash',
-          'gen_ai.response.model': 'gemini-2.0-flash',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
+          "gen_ai.request.model": "gemini-2.0-flash",
+          "gen_ai.response.model": "gemini-2.0-flash",
         });
       });
 
-      it('should record failed operation duration with error type', () => {
+      it("should record failed operation duration with error type", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 3.75, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-pro',
-          'error.type': 'quota_exceeded',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-pro",
+          "error.type": "quota_exceeded",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(3.75, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-pro',
-          'error.type': 'quota_exceeded',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-pro",
+          "error.type": "quota_exceeded",
         });
       });
 
-      it('should record operation duration with server details', () => {
+      it("should record operation duration with server details", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 0.95, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-1.5-pro',
-          'gen_ai.response.model': 'gemini-1.5-pro-001',
-          'server.address': 'us-central1-aiplatform.googleapis.com',
-          'server.port': 443,
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-1.5-pro",
+          "gen_ai.response.model": "gemini-1.5-pro-001",
+          "server.address": "us-central1-aiplatform.googleapis.com",
+          "server.port": 443,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(0.95, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.vertex_ai',
-          'gen_ai.request.model': 'gemini-1.5-pro',
-          'gen_ai.response.model': 'gemini-1.5-pro-001',
-          'server.address': 'us-central1-aiplatform.googleapis.com',
-          'server.port': 443,
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.vertex_ai",
+          "gen_ai.request.model": "gemini-1.5-pro",
+          "gen_ai.response.model": "gemini-1.5-pro-001",
+          "server.address": "us-central1-aiplatform.googleapis.com",
+          "server.port": 443,
         });
       });
 
-      it('should handle minimal required attributes', () => {
+      it("should handle minimal required attributes", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordGenAiClientOperationDurationModule(mockConfig, 2.1, {
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(2.1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          'gen_ai.operation.name': 'generate_content',
-          'gen_ai.provider.name': 'gcp.gen_ai',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          "gen_ai.operation.name": "generate_content",
+          "gen_ai.provider.name": "gcp.gen_ai",
         });
       });
     });
   });
 
-  describe('Performance Monitoring Metrics', () => {
+  describe("Performance Monitoring Metrics", () => {
     const mockConfig = {
-      getSessionId: () => 'test-session-id',
+      getSessionId: () => "test-session-id",
       getTelemetryEnabled: () => true,
     } as unknown as Config;
 
-    describe('recordStartupPerformance', () => {
-      it('should not record metrics when performance monitoring is disabled', async () => {
+    describe("recordStartupPerformance", () => {
+      it("should not record metrics when performance monitoring is disabled", async () => {
         // Re-import with performance monitoring disabled by mocking the config
         const mockConfigDisabled = {
-          getSessionId: () => 'test-session-id',
+          getSessionId: () => "test-session-id",
           getTelemetryEnabled: () => false, // Disable telemetry to disable performance monitoring
         } as unknown as Config;
 
@@ -782,101 +763,98 @@ describe('Telemetry Metrics', () => {
         mockHistogramRecordFn.mockClear();
 
         recordStartupPerformanceModule(mockConfigDisabled, 100, {
-          phase: 'settings_loading',
+          phase: "settings_loading",
           details: {
-            auth_type: 'gemini',
+            auth_type: "gemini",
           },
         });
 
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record startup performance with phase and details', () => {
+      it("should record startup performance with phase and details", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordStartupPerformanceModule(mockConfig, 150, {
-          phase: 'settings_loading',
+          phase: "settings_loading",
           details: {
-            auth_type: 'gemini',
+            auth_type: "gemini",
             telemetry_enabled: true,
             settings_sources: 2,
           },
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(150, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          phase: 'settings_loading',
-          auth_type: 'gemini',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          phase: "settings_loading",
+          auth_type: "gemini",
           telemetry_enabled: true,
           settings_sources: 2,
         });
       });
 
-      it('should record startup performance without details', () => {
+      it("should record startup performance without details", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
-        recordStartupPerformanceModule(mockConfig, 50, { phase: 'cleanup' });
+        recordStartupPerformanceModule(mockConfig, 50, { phase: "cleanup" });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(50, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          phase: 'cleanup',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          phase: "cleanup",
         });
       });
 
-      it('should handle floating-point duration values from performance.now()', () => {
+      it("should handle floating-point duration values from performance.now()", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         // Test with realistic floating-point values that performance.now() would return
         const floatingPointDuration = 123.45678;
         recordStartupPerformanceModule(mockConfig, floatingPointDuration, {
-          phase: 'total_startup',
+          phase: "total_startup",
           details: {
             is_tty: true,
             has_question: false,
           },
         });
 
-        expect(mockHistogramRecordFn).toHaveBeenCalledWith(
-          floatingPointDuration,
-          {
-            'session.id': 'test-session-id',
-            'installation.id': 'test-installation-id',
-            'user.email': 'test@example.com',
-            phase: 'total_startup',
-            is_tty: true,
-            has_question: false,
-          },
-        );
+        expect(mockHistogramRecordFn).toHaveBeenCalledWith(floatingPointDuration, {
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          phase: "total_startup",
+          is_tty: true,
+          has_question: false,
+        });
       });
     });
 
-    describe('recordMemoryUsage', () => {
+    describe("recordMemoryUsage", () => {
       it.each([
         {
           memory_type: MemoryMetricType.HEAP_USED,
-          component: 'startup',
+          component: "startup",
           value: 15728640,
         },
         {
           memory_type: MemoryMetricType.HEAP_TOTAL,
-          component: 'api_call',
+          component: "api_call",
           value: 31457280,
         },
         {
           memory_type: MemoryMetricType.EXTERNAL,
-          component: 'tool_execution',
+          component: "tool_execution",
           value: 2097152,
         },
         {
           memory_type: MemoryMetricType.RSS,
-          component: 'memory_monitor',
+          component: "memory_monitor",
           value: 41943040,
         },
         {
@@ -884,348 +862,342 @@ describe('Telemetry Metrics', () => {
           component: undefined,
           value: 15728640,
         },
-      ])(
-        'should record memory usage for $memory_type',
-        ({ memory_type, component, value }) => {
-          initializeMetricsModule(mockConfig);
-          mockHistogramRecordFn.mockClear();
-
-          recordMemoryUsageModule(mockConfig, value, {
-            memory_type,
-            component,
-          });
-
-          const expectedAttributes: Record<string, unknown> = {
-            'session.id': 'test-session-id',
-            'installation.id': 'test-installation-id',
-            'user.email': 'test@example.com',
-            memory_type,
-          };
-
-          if (component) {
-            expectedAttributes['component'] = component;
-          }
-
-          expect(mockHistogramRecordFn).toHaveBeenCalledWith(
-            value,
-            expectedAttributes,
-          );
-        },
-      );
+      ])("should record memory usage for $memory_type", ({ memory_type, component, value }) => {
+        initializeMetricsModule(mockConfig);
+        mockHistogramRecordFn.mockClear();
+
+        recordMemoryUsageModule(mockConfig, value, {
+          memory_type,
+          component,
+        });
+
+        const expectedAttributes: Record<string, unknown> = {
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          memory_type,
+        };
+
+        if (component) {
+          expectedAttributes["component"] = component;
+        }
+
+        expect(mockHistogramRecordFn).toHaveBeenCalledWith(value, expectedAttributes);
+      });
     });
 
-    describe('recordCpuUsage', () => {
-      it('should record CPU usage percentage', () => {
+    describe("recordCpuUsage", () => {
+      it("should record CPU usage percentage", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordCpuUsageModule(mockConfig, 85.5, {
-          component: 'tool_execution',
+          component: "tool_execution",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(85.5, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          component: 'tool_execution',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          component: "tool_execution",
         });
       });
 
-      it('should record CPU usage without component', () => {
+      it("should record CPU usage without component", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordCpuUsageModule(mockConfig, 42.3, {});
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(42.3, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
         });
       });
     });
 
-    describe('recordToolQueueDepth', () => {
-      it('should record tool queue depth', () => {
+    describe("recordToolQueueDepth", () => {
+      it("should record tool queue depth", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolQueueDepthModule(mockConfig, 3);
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(3, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
         });
       });
 
-      it('should record zero queue depth', () => {
+      it("should record zero queue depth", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolQueueDepthModule(mockConfig, 0);
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(0, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
         });
       });
     });
 
-    describe('recordToolExecutionBreakdown', () => {
-      it('should record tool execution breakdown for all phases', () => {
+    describe("recordToolExecutionBreakdown", () => {
+      it("should record tool execution breakdown for all phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolExecutionBreakdownModule(mockConfig, 25, {
-          function_name: 'Read',
+          function_name: "Read",
           phase: ToolExecutionPhase.VALIDATION,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(25, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Read',
-          phase: 'validation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Read",
+          phase: "validation",
         });
       });
 
-      it('should record execution breakdown for different phases', () => {
+      it("should record execution breakdown for different phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordToolExecutionBreakdownModule(mockConfig, 50, {
-          function_name: 'Bash',
+          function_name: "Bash",
           phase: ToolExecutionPhase.PREPARATION,
         });
         recordToolExecutionBreakdownModule(mockConfig, 1500, {
-          function_name: 'Bash',
+          function_name: "Bash",
           phase: ToolExecutionPhase.EXECUTION,
         });
         recordToolExecutionBreakdownModule(mockConfig, 75, {
-          function_name: 'Bash',
+          function_name: "Bash",
           phase: ToolExecutionPhase.RESULT_PROCESSING,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledTimes(3); // One for each call
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(1, 50, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Bash',
-          phase: 'preparation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Bash",
+          phase: "preparation",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 1500, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Bash',
-          phase: 'execution',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Bash",
+          phase: "execution",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 75, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          function_name: 'Bash',
-          phase: 'result_processing',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          function_name: "Bash",
+          phase: "result_processing",
         });
       });
     });
 
-    describe('recordTokenEfficiency', () => {
-      it('should record token efficiency metrics', () => {
+    describe("recordTokenEfficiency", () => {
+      it("should record token efficiency metrics", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordTokenEfficiencyModule(mockConfig, 0.85, {
-          model: 'gemini-pro',
-          metric: 'cache_hit_rate',
-          context: 'api_request',
+          model: "gemini-pro",
+          metric: "cache_hit_rate",
+          context: "api_request",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(0.85, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          metric: 'cache_hit_rate',
-          context: 'api_request',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          metric: "cache_hit_rate",
+          context: "api_request",
         });
       });
 
-      it('should record token efficiency without context', () => {
+      it("should record token efficiency without context", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordTokenEfficiencyModule(mockConfig, 125.5, {
-          model: 'gemini-pro',
-          metric: 'tokens_per_operation',
+          model: "gemini-pro",
+          metric: "tokens_per_operation",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(125.5, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          metric: 'tokens_per_operation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          metric: "tokens_per_operation",
         });
       });
     });
 
-    describe('recordApiRequestBreakdown', () => {
-      it('should record API request breakdown for all phases', () => {
+    describe("recordApiRequestBreakdown", () => {
+      it("should record API request breakdown for all phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordApiRequestBreakdownModule(mockConfig, 15, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.REQUEST_PREPARATION,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(15, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'request_preparation',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "request_preparation",
         });
       });
 
-      it('should record API request breakdown for different phases', () => {
+      it("should record API request breakdown for different phases", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordApiRequestBreakdownModule(mockConfig, 250, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.NETWORK_LATENCY,
         });
         recordApiRequestBreakdownModule(mockConfig, 100, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.RESPONSE_PROCESSING,
         });
         recordApiRequestBreakdownModule(mockConfig, 50, {
-          model: 'gemini-pro',
+          model: "gemini-pro",
           phase: ApiRequestPhase.TOKEN_PROCESSING,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledTimes(3); // One for each call
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(1, 250, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'network_latency',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "network_latency",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(2, 100, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'response_processing',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "response_processing",
         });
         expect(mockHistogramRecordFn).toHaveBeenNthCalledWith(3, 50, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          model: 'gemini-pro',
-          phase: 'token_processing',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          model: "gemini-pro",
+          phase: "token_processing",
         });
       });
     });
 
-    describe('recordPerformanceScore', () => {
-      it('should record performance score with category and baseline', () => {
+    describe("recordPerformanceScore", () => {
+      it("should record performance score with category and baseline", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceScoreModule(mockConfig, 85.5, {
-          category: 'memory_efficiency',
+          category: "memory_efficiency",
           baseline: 80.0,
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(85.5, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          category: 'memory_efficiency',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          category: "memory_efficiency",
           baseline: 80.0,
         });
       });
 
-      it('should record performance score without baseline', () => {
+      it("should record performance score without baseline", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceScoreModule(mockConfig, 92.3, {
-          category: 'overall_performance',
+          category: "overall_performance",
         });
 
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(92.3, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          category: 'overall_performance',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          category: "overall_performance",
         });
       });
     });
 
-    describe('recordPerformanceRegression', () => {
-      it('should record performance regression with baseline comparison', () => {
+    describe("recordPerformanceRegression", () => {
+      it("should record performance regression with baseline comparison", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'startup_time',
+          metric: "startup_time",
           current_value: 1200,
           baseline_value: 1000,
-          severity: 'medium',
+          severity: "medium",
         });
 
         // Verify regression counter
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'startup_time',
-          severity: 'medium',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "startup_time",
+          severity: "medium",
           current_value: 1200,
           baseline_value: 1000,
         });
 
         // Verify baseline comparison histogram (20% increase)
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(20, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'startup_time',
-          severity: 'medium',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "startup_time",
+          severity: "medium",
           current_value: 1200,
           baseline_value: 1000,
         });
       });
 
-      it('should handle zero baseline value gracefully', () => {
+      it("should handle zero baseline value gracefully", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
         mockHistogramRecordFn.mockClear();
 
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'memory_usage',
+          metric: "memory_usage",
           current_value: 100,
           baseline_value: 0,
-          severity: 'high',
+          severity: "high",
         });
 
         // Verify regression counter still recorded
         expect(mockCounterAddFn).toHaveBeenCalledWith(1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'memory_usage',
-          severity: 'high',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "memory_usage",
+          severity: "high",
           current_value: 100,
           baseline_value: 0,
         });
@@ -1234,111 +1206,109 @@ describe('Telemetry Metrics', () => {
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
 
-      it('should record different severity levels', () => {
+      it("should record different severity levels", () => {
         initializeMetricsModule(mockConfig);
         mockCounterAddFn.mockClear();
 
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'api_latency',
+          metric: "api_latency",
           current_value: 500,
           baseline_value: 400,
-          severity: 'low',
+          severity: "low",
         });
         recordPerformanceRegressionModule(mockConfig, {
-          metric: 'cpu_usage',
+          metric: "cpu_usage",
           current_value: 90,
           baseline_value: 70,
-          severity: 'high',
+          severity: "high",
         });
 
         expect(mockCounterAddFn).toHaveBeenNthCalledWith(1, 1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'api_latency',
-          severity: 'low',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "api_latency",
+          severity: "low",
           current_value: 500,
           baseline_value: 400,
         });
         expect(mockCounterAddFn).toHaveBeenNthCalledWith(2, 1, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'cpu_usage',
-          severity: 'high',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "cpu_usage",
+          severity: "high",
           current_value: 90,
           baseline_value: 70,
         });
       });
     });
 
-    describe('recordBaselineComparison', () => {
-      it('should record baseline comparison with percentage change', () => {
+    describe("recordBaselineComparison", () => {
+      it("should record baseline comparison with percentage change", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordBaselineComparisonModule(mockConfig, {
-          metric: 'memory_usage',
+          metric: "memory_usage",
           current_value: 120,
           baseline_value: 100,
-          category: 'performance_tracking',
+          category: "performance_tracking",
         });
 
         // 20% increase: (120 - 100) / 100 * 100 = 20%
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(20, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'memory_usage',
-          category: 'performance_tracking',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "memory_usage",
+          category: "performance_tracking",
           current_value: 120,
           baseline_value: 100,
         });
       });
 
-      it('should handle negative percentage change (improvement)', () => {
+      it("should handle negative percentage change (improvement)", () => {
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordBaselineComparisonModule(mockConfig, {
-          metric: 'startup_time',
+          metric: "startup_time",
           current_value: 800,
           baseline_value: 1000,
-          category: 'optimization',
+          category: "optimization",
         });
 
         // 20% decrease: (800 - 1000) / 1000 * 100 = -20%
         expect(mockHistogramRecordFn).toHaveBeenCalledWith(-20, {
-          'session.id': 'test-session-id',
-          'installation.id': 'test-installation-id',
-          'user.email': 'test@example.com',
-          metric: 'startup_time',
-          category: 'optimization',
+          "session.id": "test-session-id",
+          "installation.id": "test-installation-id",
+          "user.email": "test@example.com",
+          metric: "startup_time",
+          category: "optimization",
           current_value: 800,
           baseline_value: 1000,
         });
       });
 
-      it('should skip recording when baseline is zero', async () => {
+      it("should skip recording when baseline is zero", async () => {
         // Access the actual mocked module
-        const mockedModule = (await vi.importMock('@opentelemetry/api')) as {
+        const mockedModule = (await vi.importMock("@opentelemetry/api")) as {
           diag: { warn: ReturnType<typeof vi.fn> };
         };
-        const diagSpy = vi.spyOn(mockedModule.diag, 'warn');
+        const diagSpy = vi.spyOn(mockedModule.diag, "warn");
 
         initializeMetricsModule(mockConfig);
         mockHistogramRecordFn.mockClear();
 
         recordBaselineComparisonModule(mockConfig, {
-          metric: 'new_metric',
+          metric: "new_metric",
           current_value: 50,
           baseline_value: 0,
-          category: 'testing',
+          category: "testing",
         });
 
-        expect(diagSpy).toHaveBeenCalledWith(
-          'Baseline value is zero, skipping comparison.',
-        );
+        expect(diagSpy).toHaveBeenCalledWith("Baseline value is zero, skipping comparison.");
         expect(mockHistogramRecordFn).not.toHaveBeenCalled();
       });
     });
diff --git a/packages/gemini-core/src/telemetry/metrics.ts b/packages/gemini-core/src/telemetry/metrics.ts
index f2078aa62..556b9cd36 100644
--- a/packages/gemini-core/src/telemetry/metrics.ts
+++ b/packages/gemini-core/src/telemetry/metrics.ts
@@ -4,65 +4,61 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Attributes, Meter, Counter, Histogram } from '@opentelemetry/api';
-import { diag, metrics, ValueType } from '@opentelemetry/api';
-import { SERVICE_NAME } from './constants.js';
-import type { Config } from '../config/config.js';
+import type { Attributes, Counter, Histogram, Meter } from "@opentelemetry/api";
+import { diag, metrics, ValueType } from "@opentelemetry/api";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { SERVICE_NAME } from "./constants.js";
+import { getCommonAttributes } from "./telemetryAttributes.js";
 import type {
+  AgentFinishEvent,
   ModelRoutingEvent,
   ModelSlashCommandEvent,
-  AgentFinishEvent,
   RecoveryAttemptEvent,
-} from './types.js';
-import { AuthType } from '../core/contentGenerator.js';
-import { getCommonAttributes } from './telemetryAttributes.js';
-
-const EVENT_CHAT_COMPRESSION = 'gemini_cli.chat_compression';
-const TOOL_CALL_COUNT = 'gemini_cli.tool.call.count';
-const TOOL_CALL_LATENCY = 'gemini_cli.tool.call.latency';
-const API_REQUEST_COUNT = 'gemini_cli.api.request.count';
-const API_REQUEST_LATENCY = 'gemini_cli.api.request.latency';
-const TOKEN_USAGE = 'gemini_cli.token.usage';
-const SESSION_COUNT = 'gemini_cli.session.count';
-const FILE_OPERATION_COUNT = 'gemini_cli.file.operation.count';
-const LINES_CHANGED = 'gemini_cli.lines.changed';
-const INVALID_CHUNK_COUNT = 'gemini_cli.chat.invalid_chunk.count';
-const CONTENT_RETRY_COUNT = 'gemini_cli.chat.content_retry.count';
-const CONTENT_RETRY_FAILURE_COUNT =
-  'gemini_cli.chat.content_retry_failure.count';
-const MODEL_ROUTING_LATENCY = 'gemini_cli.model_routing.latency';
-const MODEL_ROUTING_FAILURE_COUNT = 'gemini_cli.model_routing.failure.count';
-const MODEL_SLASH_COMMAND_CALL_COUNT =
-  'gemini_cli.slash_command.model.call_count';
+} from "./types.js";
+
+const EVENT_CHAT_COMPRESSION = "gemini_cli.chat_compression";
+const TOOL_CALL_COUNT = "gemini_cli.tool.call.count";
+const TOOL_CALL_LATENCY = "gemini_cli.tool.call.latency";
+const API_REQUEST_COUNT = "gemini_cli.api.request.count";
+const API_REQUEST_LATENCY = "gemini_cli.api.request.latency";
+const TOKEN_USAGE = "gemini_cli.token.usage";
+const SESSION_COUNT = "gemini_cli.session.count";
+const FILE_OPERATION_COUNT = "gemini_cli.file.operation.count";
+const LINES_CHANGED = "gemini_cli.lines.changed";
+const INVALID_CHUNK_COUNT = "gemini_cli.chat.invalid_chunk.count";
+const CONTENT_RETRY_COUNT = "gemini_cli.chat.content_retry.count";
+const CONTENT_RETRY_FAILURE_COUNT = "gemini_cli.chat.content_retry_failure.count";
+const MODEL_ROUTING_LATENCY = "gemini_cli.model_routing.latency";
+const MODEL_ROUTING_FAILURE_COUNT = "gemini_cli.model_routing.failure.count";
+const MODEL_SLASH_COMMAND_CALL_COUNT = "gemini_cli.slash_command.model.call_count";
 
 // Agent Metrics
-const AGENT_RUN_COUNT = 'gemini_cli.agent.run.count';
-const AGENT_DURATION_MS = 'gemini_cli.agent.duration';
-const AGENT_TURNS = 'gemini_cli.agent.turns';
-const AGENT_RECOVERY_ATTEMPT_COUNT = 'gemini_cli.agent.recovery_attempt.count';
-const AGENT_RECOVERY_ATTEMPT_DURATION =
-  'gemini_cli.agent.recovery_attempt.duration';
+const AGENT_RUN_COUNT = "gemini_cli.agent.run.count";
+const AGENT_DURATION_MS = "gemini_cli.agent.duration";
+const AGENT_TURNS = "gemini_cli.agent.turns";
+const AGENT_RECOVERY_ATTEMPT_COUNT = "gemini_cli.agent.recovery_attempt.count";
+const AGENT_RECOVERY_ATTEMPT_DURATION = "gemini_cli.agent.recovery_attempt.duration";
 
 // OpenTelemetry GenAI Semantic Convention Metrics
-const GEN_AI_CLIENT_TOKEN_USAGE = 'gen_ai.client.token.usage';
-const GEN_AI_CLIENT_OPERATION_DURATION = 'gen_ai.client.operation.duration';
+const GEN_AI_CLIENT_TOKEN_USAGE = "gen_ai.client.token.usage";
+const GEN_AI_CLIENT_OPERATION_DURATION = "gen_ai.client.operation.duration";
 
 // Performance Monitoring Metrics
-const STARTUP_TIME = 'gemini_cli.startup.duration';
-const MEMORY_USAGE = 'gemini_cli.memory.usage';
-const CPU_USAGE = 'gemini_cli.cpu.usage';
-const TOOL_QUEUE_DEPTH = 'gemini_cli.tool.queue.depth';
-const TOOL_EXECUTION_BREAKDOWN = 'gemini_cli.tool.execution.breakdown';
-const TOKEN_EFFICIENCY = 'gemini_cli.token.efficiency';
-const API_REQUEST_BREAKDOWN = 'gemini_cli.api.request.breakdown';
-const PERFORMANCE_SCORE = 'gemini_cli.performance.score';
-const REGRESSION_DETECTION = 'gemini_cli.performance.regression';
-const REGRESSION_PERCENTAGE_CHANGE =
-  'gemini_cli.performance.regression.percentage_change';
-const BASELINE_COMPARISON = 'gemini_cli.performance.baseline.comparison';
-const FLICKER_FRAME_COUNT = 'gemini_cli.ui.flicker.count';
-const SLOW_RENDER_LATENCY = 'gemini_cli.ui.slow_render.latency';
-const EXIT_FAIL_COUNT = 'gemini_cli.exit.fail.count';
+const STARTUP_TIME = "gemini_cli.startup.duration";
+const MEMORY_USAGE = "gemini_cli.memory.usage";
+const CPU_USAGE = "gemini_cli.cpu.usage";
+const TOOL_QUEUE_DEPTH = "gemini_cli.tool.queue.depth";
+const TOOL_EXECUTION_BREAKDOWN = "gemini_cli.tool.execution.breakdown";
+const TOKEN_EFFICIENCY = "gemini_cli.token.efficiency";
+const API_REQUEST_BREAKDOWN = "gemini_cli.api.request.breakdown";
+const PERFORMANCE_SCORE = "gemini_cli.performance.score";
+const REGRESSION_DETECTION = "gemini_cli.performance.regression";
+const REGRESSION_PERCENTAGE_CHANGE = "gemini_cli.performance.regression.percentage_change";
+const BASELINE_COMPARISON = "gemini_cli.performance.baseline.comparison";
+const FLICKER_FRAME_COUNT = "gemini_cli.ui.flicker.count";
+const SLOW_RENDER_LATENCY = "gemini_cli.ui.slow_render.latency";
+const EXIT_FAIL_COUNT = "gemini_cli.exit.fail.count";
 
 const baseMetricDefinition = {
   getCommonAttributes,
@@ -70,18 +66,18 @@ const baseMetricDefinition = {
 
 const COUNTER_DEFINITIONS = {
   [TOOL_CALL_COUNT]: {
-    description: 'Counts tool calls, tagged by function name and success.',
+    description: "Counts tool calls, tagged by function name and success.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (toolCallCounter = c),
     attributes: {} as {
       function_name: string;
       success: boolean;
-      decision?: 'accept' | 'reject' | 'modify' | 'auto_accept';
-      tool_type?: 'native' | 'mcp';
+      decision?: "accept" | "reject" | "modify" | "auto_accept";
+      tool_type?: "native" | "mcp";
     },
   },
   [API_REQUEST_COUNT]: {
-    description: 'Counts API requests, tagged by model and status.',
+    description: "Counts API requests, tagged by model and status.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (apiRequestCounter = c),
     attributes: {} as {
@@ -91,22 +87,22 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [TOKEN_USAGE]: {
-    description: 'Counts the total number of tokens used.',
+    description: "Counts the total number of tokens used.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (tokenUsageCounter = c),
     attributes: {} as {
       model: string;
-      type: 'input' | 'output' | 'thought' | 'cache' | 'tool';
+      type: "input" | "output" | "thought" | "cache" | "tool";
     },
   },
   [SESSION_COUNT]: {
-    description: 'Count of CLI sessions started.',
+    description: "Count of CLI sessions started.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (sessionCounter = c),
     attributes: {} as Record<string, never>,
   },
   [FILE_OPERATION_COUNT]: {
-    description: 'Counts file operations (create, read, update).',
+    description: "Counts file operations (create, read, update).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (fileOperationCounter = c),
     attributes: {} as {
@@ -118,51 +114,51 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [LINES_CHANGED]: {
-    description: 'Number of lines changed (from file diffs).',
+    description: "Number of lines changed (from file diffs).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (linesChangedCounter = c),
     attributes: {} as {
       function_name?: string;
-      type: 'added' | 'removed';
+      type: "added" | "removed";
     },
   },
   [INVALID_CHUNK_COUNT]: {
-    description: 'Counts invalid chunks received from a stream.',
+    description: "Counts invalid chunks received from a stream.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (invalidChunkCounter = c),
     attributes: {} as Record<string, never>,
   },
   [CONTENT_RETRY_COUNT]: {
-    description: 'Counts retries due to content errors (e.g., empty stream).',
+    description: "Counts retries due to content errors (e.g., empty stream).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (contentRetryCounter = c),
     attributes: {} as Record<string, never>,
   },
   [CONTENT_RETRY_FAILURE_COUNT]: {
-    description: 'Counts occurrences of all content retries failing.',
+    description: "Counts occurrences of all content retries failing.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (contentRetryFailureCounter = c),
     attributes: {} as Record<string, never>,
   },
   [MODEL_ROUTING_FAILURE_COUNT]: {
-    description: 'Counts model routing failures.',
+    description: "Counts model routing failures.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (modelRoutingFailureCounter = c),
     attributes: {} as {
-      'routing.decision_source': string;
-      'routing.error_message': string;
+      "routing.decision_source": string;
+      "routing.error_message": string;
     },
   },
   [MODEL_SLASH_COMMAND_CALL_COUNT]: {
-    description: 'Counts model slash command calls.',
+    description: "Counts model slash command calls.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (modelSlashCommandCallCounter = c),
     attributes: {} as {
-      'slash_command.model.model_name': string;
+      "slash_command.model.model_name": string;
     },
   },
   [EVENT_CHAT_COMPRESSION]: {
-    description: 'Counts chat compression events.',
+    description: "Counts chat compression events.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (chatCompressionCounter = c),
     attributes: {} as {
@@ -171,7 +167,7 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [AGENT_RUN_COUNT]: {
-    description: 'Counts agent runs, tagged by name and termination reason.',
+    description: "Counts agent runs, tagged by name and termination reason.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (agentRunCounter = c),
     attributes: {} as {
@@ -180,7 +176,7 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [AGENT_RECOVERY_ATTEMPT_COUNT]: {
-    description: 'Counts agent recovery attempts.',
+    description: "Counts agent recovery attempts.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (agentRecoveryAttemptCounter = c),
     attributes: {} as {
@@ -190,14 +186,13 @@ const COUNTER_DEFINITIONS = {
     },
   },
   [FLICKER_FRAME_COUNT]: {
-    description:
-      'Counts UI frames that flicker (render taller than the terminal).',
+    description: "Counts UI frames that flicker (render taller than the terminal).",
     valueType: ValueType.INT,
     assign: (c: Counter) => (flickerFrameCounter = c),
     attributes: {} as Record<string, never>,
   },
   [EXIT_FAIL_COUNT]: {
-    description: 'Counts CLI exit failures.',
+    description: "Counts CLI exit failures.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (exitFailCounter = c),
     attributes: {} as Record<string, never>,
@@ -206,8 +201,8 @@ const COUNTER_DEFINITIONS = {
 
 const HISTOGRAM_DEFINITIONS = {
   [TOOL_CALL_LATENCY]: {
-    description: 'Latency of tool calls in milliseconds.',
-    unit: 'ms',
+    description: "Latency of tool calls in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (toolCallLatencyHistogram = h),
     attributes: {} as {
@@ -215,8 +210,8 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [API_REQUEST_LATENCY]: {
-    description: 'Latency of API requests in milliseconds.',
-    unit: 'ms',
+    description: "Latency of API requests in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (apiRequestLatencyHistogram = h),
     attributes: {} as {
@@ -224,18 +219,18 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [MODEL_ROUTING_LATENCY]: {
-    description: 'Latency of model routing decisions in milliseconds.',
-    unit: 'ms',
+    description: "Latency of model routing decisions in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (modelRoutingLatencyHistogram = h),
     attributes: {} as {
-      'routing.decision_model': string;
-      'routing.decision_source': string;
+      "routing.decision_model": string;
+      "routing.decision_source": string;
     },
   },
   [AGENT_DURATION_MS]: {
-    description: 'Duration of agent runs in milliseconds.',
-    unit: 'ms',
+    description: "Duration of agent runs in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (agentDurationHistogram = h),
     attributes: {} as {
@@ -243,15 +238,15 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [SLOW_RENDER_LATENCY]: {
-    description: 'Counts UI frames that take too long to render.',
-    unit: 'ms',
+    description: "Counts UI frames that take too long to render.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (slowRenderHistogram = h),
     attributes: {} as Record<string, never>,
   },
   [AGENT_TURNS]: {
-    description: 'Number of turns taken by agents.',
-    unit: 'turns',
+    description: "Number of turns taken by agents.",
+    unit: "turns",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (agentTurnsHistogram = h),
     attributes: {} as {
@@ -259,8 +254,8 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [AGENT_RECOVERY_ATTEMPT_DURATION]: {
-    description: 'Duration of agent recovery attempts in milliseconds.',
-    unit: 'ms',
+    description: "Duration of agent recovery attempts in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (agentRecoveryAttemptDurationHistogram = h),
     attributes: {} as {
@@ -268,45 +263,45 @@ const HISTOGRAM_DEFINITIONS = {
     },
   },
   [GEN_AI_CLIENT_TOKEN_USAGE]: {
-    description: 'Number of input and output tokens used.',
-    unit: 'token',
+    description: "Number of input and output tokens used.",
+    unit: "token",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (genAiClientTokenUsageHistogram = h),
     attributes: {} as {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.token.type': 'input' | 'output';
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.token.type": "input" | "output";
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
     },
   },
   [GEN_AI_CLIENT_OPERATION_DURATION]: {
-    description: 'GenAI operation duration.',
-    unit: 's',
+    description: "GenAI operation duration.",
+    unit: "s",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (genAiClientOperationDurationHistogram = h),
     attributes: {} as {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
-      'error.type'?: string;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
+      "error.type"?: string;
     },
   },
 } as const;
 
 const PERFORMANCE_COUNTER_DEFINITIONS = {
   [REGRESSION_DETECTION]: {
-    description: 'Performance regression detection events.',
+    description: "Performance regression detection events.",
     valueType: ValueType.INT,
     assign: (c: Counter) => (regressionDetectionCounter = c),
     attributes: {} as {
       metric: string;
-      severity: 'low' | 'medium' | 'high';
+      severity: "low" | "medium" | "high";
       current_value: number;
       baseline_value: number;
     },
@@ -315,9 +310,8 @@ const PERFORMANCE_COUNTER_DEFINITIONS = {
 
 const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
   [STARTUP_TIME]: {
-    description:
-      'CLI startup time in milliseconds, broken down by initialization phase.',
-    unit: 'ms',
+    description: "CLI startup time in milliseconds, broken down by initialization phase.",
+    unit: "ms",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (startupTimeHistogram = h),
     attributes: {} as {
@@ -326,8 +320,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [MEMORY_USAGE]: {
-    description: 'Memory usage in bytes.',
-    unit: 'bytes',
+    description: "Memory usage in bytes.",
+    unit: "bytes",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (memoryUsageGauge = h),
     attributes: {} as {
@@ -336,8 +330,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [CPU_USAGE]: {
-    description: 'CPU usage percentage.',
-    unit: 'percent',
+    description: "CPU usage percentage.",
+    unit: "percent",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (cpuUsageGauge = h),
     attributes: {} as {
@@ -345,15 +339,15 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [TOOL_QUEUE_DEPTH]: {
-    description: 'Number of tools in execution queue.',
-    unit: 'count',
+    description: "Number of tools in execution queue.",
+    unit: "count",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (toolQueueDepthGauge = h),
     attributes: {} as Record<string, never>,
   },
   [TOOL_EXECUTION_BREAKDOWN]: {
-    description: 'Tool execution time breakdown by phase in milliseconds.',
-    unit: 'ms',
+    description: "Tool execution time breakdown by phase in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (toolExecutionBreakdownHistogram = h),
     attributes: {} as {
@@ -362,9 +356,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [TOKEN_EFFICIENCY]: {
-    description:
-      'Token efficiency metrics (tokens per operation, cache hit rate, etc.).',
-    unit: 'ratio',
+    description: "Token efficiency metrics (tokens per operation, cache hit rate, etc.).",
+    unit: "ratio",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (tokenEfficiencyHistogram = h),
     attributes: {} as {
@@ -374,8 +367,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [API_REQUEST_BREAKDOWN]: {
-    description: 'API request time breakdown by phase in milliseconds.',
-    unit: 'ms',
+    description: "API request time breakdown by phase in milliseconds.",
+    unit: "ms",
     valueType: ValueType.INT,
     assign: (h: Histogram) => (apiRequestBreakdownHistogram = h),
     attributes: {} as {
@@ -384,8 +377,8 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [PERFORMANCE_SCORE]: {
-    description: 'Composite performance score (0-100).',
-    unit: 'score',
+    description: "Composite performance score (0-100).",
+    unit: "score",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (performanceScoreGauge = h),
     attributes: {} as {
@@ -394,22 +387,20 @@ const PERFORMANCE_HISTOGRAM_DEFINITIONS = {
     },
   },
   [REGRESSION_PERCENTAGE_CHANGE]: {
-    description:
-      'Percentage change compared to baseline for detected regressions.',
-    unit: 'percent',
+    description: "Percentage change compared to baseline for detected regressions.",
+    unit: "percent",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (regressionPercentageChangeHistogram = h),
     attributes: {} as {
       metric: string;
-      severity: 'low' | 'medium' | 'high';
+      severity: "low" | "medium" | "high";
       current_value: number;
       baseline_value: number;
     },
   },
   [BASELINE_COMPARISON]: {
-    description:
-      'Performance comparison to established baseline (percentage change).',
-    unit: 'percent',
+    description: "Performance comparison to established baseline (percentage change).",
+    unit: "percent",
     valueType: ValueType.DOUBLE,
     assign: (h: Histogram) => (baselineComparisonHistogram = h),
     attributes: {} as {
@@ -428,58 +419,58 @@ type AllMetricDefs = typeof COUNTER_DEFINITIONS &
 
 export type MetricDefinitions = {
   [K in keyof AllMetricDefs]: {
-    attributes: AllMetricDefs[K]['attributes'];
+    attributes: AllMetricDefs[K]["attributes"];
   };
 };
 
 export enum FileOperation {
-  CREATE = 'create',
-  READ = 'read',
-  UPDATE = 'update',
+  CREATE = "create",
+  READ = "read",
+  UPDATE = "update",
 }
 
 export enum PerformanceMetricType {
-  STARTUP = 'startup',
-  MEMORY = 'memory',
-  CPU = 'cpu',
-  TOOL_EXECUTION = 'tool_execution',
-  API_REQUEST = 'api_request',
-  TOKEN_EFFICIENCY = 'token_efficiency',
+  STARTUP = "startup",
+  MEMORY = "memory",
+  CPU = "cpu",
+  TOOL_EXECUTION = "tool_execution",
+  API_REQUEST = "api_request",
+  TOKEN_EFFICIENCY = "token_efficiency",
 }
 
 export enum MemoryMetricType {
-  HEAP_USED = 'heap_used',
-  HEAP_TOTAL = 'heap_total',
-  EXTERNAL = 'external',
-  RSS = 'rss',
+  HEAP_USED = "heap_used",
+  HEAP_TOTAL = "heap_total",
+  EXTERNAL = "external",
+  RSS = "rss",
 }
 
 export enum ToolExecutionPhase {
-  VALIDATION = 'validation',
-  PREPARATION = 'preparation',
-  EXECUTION = 'execution',
-  RESULT_PROCESSING = 'result_processing',
+  VALIDATION = "validation",
+  PREPARATION = "preparation",
+  EXECUTION = "execution",
+  RESULT_PROCESSING = "result_processing",
 }
 
 export enum ApiRequestPhase {
-  REQUEST_PREPARATION = 'request_preparation',
-  NETWORK_LATENCY = 'network_latency',
-  RESPONSE_PROCESSING = 'response_processing',
-  TOKEN_PROCESSING = 'token_processing',
+  REQUEST_PREPARATION = "request_preparation",
+  NETWORK_LATENCY = "network_latency",
+  RESPONSE_PROCESSING = "response_processing",
+  TOKEN_PROCESSING = "token_processing",
 }
 
 export enum GenAiOperationName {
-  GENERATE_CONTENT = 'generate_content',
+  GENERATE_CONTENT = "generate_content",
 }
 
 export enum GenAiProviderName {
-  GCP_GEN_AI = 'gcp.gen_ai',
-  GCP_VERTEX_AI = 'gcp.vertex_ai',
+  GCP_GEN_AI = "gcp.gen_ai",
+  GCP_VERTEX_AI = "gcp.vertex_ai",
 }
 
 export enum GenAiTokenType {
-  INPUT = 'input',
-  OUTPUT = 'output',
+  INPUT = "input",
+  OUTPUT = "output",
 }
 
 let cliMeter: Meter | undefined;
@@ -540,11 +531,9 @@ export function initializeMetrics(config: Config): void {
   if (!meter) return;
 
   // Initialize core metrics
-  Object.entries(COUNTER_DEFINITIONS).forEach(
-    ([name, { description, valueType, assign }]) => {
-      assign(meter.createCounter(name, { description, valueType }));
-    },
-  );
+  Object.entries(COUNTER_DEFINITIONS).forEach(([name, { description, valueType, assign }]) => {
+    assign(meter.createCounter(name, { description, valueType }));
+  });
 
   Object.entries(HISTOGRAM_DEFINITIONS).forEach(
     ([name, { description, unit, valueType, assign }]) => {
@@ -563,7 +552,7 @@ export function initializeMetrics(config: Config): void {
 
 export function recordChatCompressionMetrics(
   config: Config,
-  attributes: MetricDefinitions[typeof EVENT_CHAT_COMPRESSION]['attributes'],
+  attributes: MetricDefinitions[typeof EVENT_CHAT_COMPRESSION]["attributes"],
 ) {
   if (!chatCompressionCounter || !isMetricsInitialized) return;
   chatCompressionCounter.add(1, {
@@ -575,10 +564,9 @@ export function recordChatCompressionMetrics(
 export function recordToolCallMetrics(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof TOOL_CALL_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof TOOL_CALL_COUNT]["attributes"],
 ): void {
-  if (!toolCallCounter || !toolCallLatencyHistogram || !isMetricsInitialized)
-    return;
+  if (!toolCallCounter || !toolCallLatencyHistogram || !isMetricsInitialized) return;
 
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
@@ -594,7 +582,7 @@ export function recordToolCallMetrics(
 export function recordCustomTokenUsageMetrics(
   config: Config,
   tokenCount: number,
-  attributes: MetricDefinitions[typeof TOKEN_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof TOKEN_USAGE]["attributes"],
 ): void {
   if (!tokenUsageCounter || !isMetricsInitialized) return;
   tokenUsageCounter.add(tokenCount, {
@@ -606,18 +594,13 @@ export function recordCustomTokenUsageMetrics(
 export function recordCustomApiResponseMetrics(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]["attributes"],
 ): void {
-  if (
-    !apiRequestCounter ||
-    !apiRequestLatencyHistogram ||
-    !isMetricsInitialized
-  )
-    return;
+  if (!apiRequestCounter || !apiRequestLatencyHistogram || !isMetricsInitialized) return;
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
     model: attributes.model,
-    status_code: attributes.status_code ?? 'ok',
+    status_code: attributes.status_code ?? "ok",
   };
   apiRequestCounter.add(1, metricAttributes);
   apiRequestLatencyHistogram.record(durationMs, {
@@ -629,19 +612,14 @@ export function recordCustomApiResponseMetrics(
 export function recordApiErrorMetrics(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof API_REQUEST_COUNT]["attributes"],
 ): void {
-  if (
-    !apiRequestCounter ||
-    !apiRequestLatencyHistogram ||
-    !isMetricsInitialized
-  )
-    return;
+  if (!apiRequestCounter || !apiRequestLatencyHistogram || !isMetricsInitialized) return;
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
     model: attributes.model,
-    status_code: attributes.status_code ?? 'error',
-    error_type: attributes.error_type ?? 'unknown',
+    status_code: attributes.status_code ?? "error",
+    error_type: attributes.error_type ?? "unknown",
   };
   apiRequestCounter.add(1, metricAttributes);
   apiRequestLatencyHistogram.record(durationMs, {
@@ -652,7 +630,7 @@ export function recordApiErrorMetrics(
 
 export function recordFileOperationMetric(
   config: Config,
-  attributes: MetricDefinitions[typeof FILE_OPERATION_COUNT]['attributes'],
+  attributes: MetricDefinitions[typeof FILE_OPERATION_COUNT]["attributes"],
 ): void {
   if (!fileOperationCounter || !isMetricsInitialized) return;
   fileOperationCounter.add(1, {
@@ -664,7 +642,7 @@ export function recordFileOperationMetric(
 export function recordLinesChanged(
   config: Config,
   lines: number,
-  changeType: 'added' | 'removed',
+  changeType: "added" | "removed",
   attributes?: { function_name?: string },
 ): void {
   if (!linesChangedCounter || !isMetricsInitialized) return;
@@ -725,59 +703,37 @@ export function recordContentRetry(config: Config): void {
  */
 export function recordContentRetryFailure(config: Config): void {
   if (!contentRetryFailureCounter || !isMetricsInitialized) return;
-  contentRetryFailureCounter.add(
-    1,
-    baseMetricDefinition.getCommonAttributes(config),
-  );
+  contentRetryFailureCounter.add(1, baseMetricDefinition.getCommonAttributes(config));
 }
 
-export function recordModelSlashCommand(
-  config: Config,
-  event: ModelSlashCommandEvent,
-): void {
+export function recordModelSlashCommand(config: Config, event: ModelSlashCommandEvent): void {
   if (!modelSlashCommandCallCounter || !isMetricsInitialized) return;
   modelSlashCommandCallCounter.add(1, {
     ...baseMetricDefinition.getCommonAttributes(config),
-    'slash_command.model.model_name': event.model_name,
+    "slash_command.model.model_name": event.model_name,
   });
 }
 
-export function recordModelRoutingMetrics(
-  config: Config,
-  event: ModelRoutingEvent,
-): void {
-  if (
-    !modelRoutingLatencyHistogram ||
-    !modelRoutingFailureCounter ||
-    !isMetricsInitialized
-  )
-    return;
+export function recordModelRoutingMetrics(config: Config, event: ModelRoutingEvent): void {
+  if (!modelRoutingLatencyHistogram || !modelRoutingFailureCounter || !isMetricsInitialized) return;
 
   modelRoutingLatencyHistogram.record(event.routing_latency_ms, {
     ...baseMetricDefinition.getCommonAttributes(config),
-    'routing.decision_model': event.decision_model,
-    'routing.decision_source': event.decision_source,
+    "routing.decision_model": event.decision_model,
+    "routing.decision_source": event.decision_source,
   });
 
   if (event.failed) {
     modelRoutingFailureCounter.add(1, {
       ...baseMetricDefinition.getCommonAttributes(config),
-      'routing.decision_source': event.decision_source,
-      'routing.error_message': event.error_message,
+      "routing.decision_source": event.decision_source,
+      "routing.error_message": event.error_message,
     });
   }
 }
 
-export function recordAgentRunMetrics(
-  config: Config,
-  event: AgentFinishEvent,
-): void {
-  if (
-    !agentRunCounter ||
-    !agentDurationHistogram ||
-    !agentTurnsHistogram ||
-    !isMetricsInitialized
-  )
+export function recordAgentRunMetrics(config: Config, event: AgentFinishEvent): void {
+  if (!agentRunCounter || !agentDurationHistogram || !agentTurnsHistogram || !isMetricsInitialized)
     return;
 
   const commonAttributes = baseMetricDefinition.getCommonAttributes(config);
@@ -799,10 +755,7 @@ export function recordAgentRunMetrics(
   });
 }
 
-export function recordRecoveryAttemptMetrics(
-  config: Config,
-  event: RecoveryAttemptEvent,
-): void {
+export function recordRecoveryAttemptMetrics(config: Config, event: RecoveryAttemptEvent): void {
   if (
     !agentRecoveryAttemptCounter ||
     !agentRecoveryAttemptDurationHistogram ||
@@ -830,7 +783,7 @@ export function recordRecoveryAttemptMetrics(
 export function recordGenAiClientTokenUsage(
   config: Config,
   tokenCount: number,
-  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_TOKEN_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_TOKEN_USAGE]["attributes"],
 ): void {
   if (!genAiClientTokenUsageHistogram || !isMetricsInitialized) return;
 
@@ -845,7 +798,7 @@ export function recordGenAiClientTokenUsage(
 export function recordGenAiClientOperationDuration(
   config: Config,
   durationSeconds: number,
-  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_OPERATION_DURATION]['attributes'],
+  attributes: MetricDefinitions[typeof GEN_AI_CLIENT_OPERATION_DURATION]["attributes"],
 ): void {
   if (!genAiClientOperationDurationHistogram || !isMetricsInitialized) return;
 
@@ -854,29 +807,23 @@ export function recordGenAiClientOperationDuration(
     ...attributes,
   };
 
-  genAiClientOperationDurationHistogram.record(
-    durationSeconds,
-    metricAttributes,
-  );
+  genAiClientOperationDurationHistogram.record(durationSeconds, metricAttributes);
 }
 
-export function getConventionAttributes(event: {
-  model: string;
-  auth_type?: string;
-}): {
-  'gen_ai.operation.name': GenAiOperationName;
-  'gen_ai.provider.name': GenAiProviderName;
-  'gen_ai.request.model': string;
-  'gen_ai.response.model': string;
+export function getConventionAttributes(event: { model: string; auth_type?: string }): {
+  "gen_ai.operation.name": GenAiOperationName;
+  "gen_ai.provider.name": GenAiProviderName;
+  "gen_ai.request.model": string;
+  "gen_ai.response.model": string;
 } {
   const operationName = getGenAiOperationName();
   const provider = getGenAiProvider(event.auth_type);
 
   return {
-    'gen_ai.operation.name': operationName,
-    'gen_ai.provider.name': provider,
-    'gen_ai.request.model': event.model,
-    'gen_ai.response.model': event.model,
+    "gen_ai.operation.name": operationName,
+    "gen_ai.provider.name": provider,
+    "gen_ai.request.model": event.model,
+    "gen_ai.response.model": event.model,
   };
 }
 
@@ -928,7 +875,7 @@ export function initializePerformanceMonitoring(config: Config): void {
 export function recordStartupPerformance(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof STARTUP_TIME]['attributes'],
+  attributes: MetricDefinitions[typeof STARTUP_TIME]["attributes"],
 ): void {
   if (!startupTimeHistogram || !isPerformanceMonitoringEnabled) return;
 
@@ -944,7 +891,7 @@ export function recordStartupPerformance(
 export function recordMemoryUsage(
   config: Config,
   bytes: number,
-  attributes: MetricDefinitions[typeof MEMORY_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof MEMORY_USAGE]["attributes"],
 ): void {
   if (!memoryUsageGauge || !isPerformanceMonitoringEnabled) return;
 
@@ -959,7 +906,7 @@ export function recordMemoryUsage(
 export function recordCpuUsage(
   config: Config,
   percentage: number,
-  attributes: MetricDefinitions[typeof CPU_USAGE]['attributes'],
+  attributes: MetricDefinitions[typeof CPU_USAGE]["attributes"],
 ): void {
   if (!cpuUsageGauge || !isPerformanceMonitoringEnabled) return;
 
@@ -984,10 +931,9 @@ export function recordToolQueueDepth(config: Config, queueDepth: number): void {
 export function recordToolExecutionBreakdown(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof TOOL_EXECUTION_BREAKDOWN]['attributes'],
+  attributes: MetricDefinitions[typeof TOOL_EXECUTION_BREAKDOWN]["attributes"],
 ): void {
-  if (!toolExecutionBreakdownHistogram || !isPerformanceMonitoringEnabled)
-    return;
+  if (!toolExecutionBreakdownHistogram || !isPerformanceMonitoringEnabled) return;
 
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
@@ -1000,7 +946,7 @@ export function recordToolExecutionBreakdown(
 export function recordTokenEfficiency(
   config: Config,
   value: number,
-  attributes: MetricDefinitions[typeof TOKEN_EFFICIENCY]['attributes'],
+  attributes: MetricDefinitions[typeof TOKEN_EFFICIENCY]["attributes"],
 ): void {
   if (!tokenEfficiencyHistogram || !isPerformanceMonitoringEnabled) return;
 
@@ -1015,7 +961,7 @@ export function recordTokenEfficiency(
 export function recordApiRequestBreakdown(
   config: Config,
   durationMs: number,
-  attributes: MetricDefinitions[typeof API_REQUEST_BREAKDOWN]['attributes'],
+  attributes: MetricDefinitions[typeof API_REQUEST_BREAKDOWN]["attributes"],
 ): void {
   if (!apiRequestBreakdownHistogram || !isPerformanceMonitoringEnabled) return;
 
@@ -1030,7 +976,7 @@ export function recordApiRequestBreakdown(
 export function recordPerformanceScore(
   config: Config,
   score: number,
-  attributes: MetricDefinitions[typeof PERFORMANCE_SCORE]['attributes'],
+  attributes: MetricDefinitions[typeof PERFORMANCE_SCORE]["attributes"],
 ): void {
   if (!performanceScoreGauge || !isPerformanceMonitoringEnabled) return;
 
@@ -1044,7 +990,7 @@ export function recordPerformanceScore(
 
 export function recordPerformanceRegression(
   config: Config,
-  attributes: MetricDefinitions[typeof REGRESSION_DETECTION]['attributes'],
+  attributes: MetricDefinitions[typeof REGRESSION_DETECTION]["attributes"],
 ): void {
   if (!regressionDetectionCounter || !isPerformanceMonitoringEnabled) return;
 
@@ -1057,30 +1003,23 @@ export function recordPerformanceRegression(
 
   if (attributes.baseline_value !== 0 && regressionPercentageChangeHistogram) {
     const percentageChange =
-      ((attributes.current_value - attributes.baseline_value) /
-        attributes.baseline_value) *
-      100;
-    regressionPercentageChangeHistogram.record(
-      percentageChange,
-      metricAttributes,
-    );
+      ((attributes.current_value - attributes.baseline_value) / attributes.baseline_value) * 100;
+    regressionPercentageChangeHistogram.record(percentageChange, metricAttributes);
   }
 }
 
 export function recordBaselineComparison(
   config: Config,
-  attributes: MetricDefinitions[typeof BASELINE_COMPARISON]['attributes'],
+  attributes: MetricDefinitions[typeof BASELINE_COMPARISON]["attributes"],
 ): void {
   if (!baselineComparisonHistogram || !isPerformanceMonitoringEnabled) return;
 
   if (attributes.baseline_value === 0) {
-    diag.warn('Baseline value is zero, skipping comparison.');
+    diag.warn("Baseline value is zero, skipping comparison.");
     return;
   }
   const percentageChange =
-    ((attributes.current_value - attributes.baseline_value) /
-      attributes.baseline_value) *
-    100;
+    ((attributes.current_value - attributes.baseline_value) / attributes.baseline_value) * 100;
 
   const metricAttributes: Attributes = {
     ...baseMetricDefinition.getCommonAttributes(config),
@@ -1103,14 +1042,14 @@ export function recordTokenUsageMetrics(
   tokenCount: number,
   attributes: {
     model: string;
-    type: 'input' | 'output' | 'thought' | 'cache' | 'tool';
+    type: "input" | "output" | "thought" | "cache" | "tool";
     genAiAttributes?: {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
     };
   },
 ): void {
@@ -1119,13 +1058,10 @@ export function recordTokenUsageMetrics(
     type: attributes.type,
   });
 
-  if (
-    (attributes.type === 'input' || attributes.type === 'output') &&
-    attributes.genAiAttributes
-  ) {
+  if ((attributes.type === "input" || attributes.type === "output") && attributes.genAiAttributes) {
     recordGenAiClientTokenUsage(config, tokenCount, {
       ...attributes.genAiAttributes,
-      'gen_ai.token.type': attributes.type,
+      "gen_ai.token.type": attributes.type,
     });
   }
 }
@@ -1140,13 +1076,13 @@ export function recordApiResponseMetrics(
     model: string;
     status_code?: number | string;
     genAiAttributes?: {
-      'gen_ai.operation.name': string;
-      'gen_ai.provider.name': string;
-      'gen_ai.request.model'?: string;
-      'gen_ai.response.model'?: string;
-      'server.address'?: string;
-      'server.port'?: number;
-      'error.type'?: string;
+      "gen_ai.operation.name": string;
+      "gen_ai.provider.name": string;
+      "gen_ai.request.model"?: string;
+      "gen_ai.response.model"?: string;
+      "server.address"?: string;
+      "server.port"?: number;
+      "error.type"?: string;
     };
   },
 ): void {
diff --git a/packages/gemini-core/src/telemetry/rate-limiter.test.ts b/packages/gemini-core/src/telemetry/rate-limiter.test.ts
index 11e946904..2ebf297c1 100644
--- a/packages/gemini-core/src/telemetry/rate-limiter.test.ts
+++ b/packages/gemini-core/src/telemetry/rate-limiter.test.ts
@@ -4,171 +4,166 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { RateLimiter } from './rate-limiter.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { RateLimiter } from "./rate-limiter.js";
 
-describe('RateLimiter', () => {
+describe("RateLimiter", () => {
   let rateLimiter: RateLimiter;
 
   beforeEach(() => {
     rateLimiter = new RateLimiter(1000); // 1 second interval for testing
   });
 
-  describe('constructor', () => {
-    it('should initialize with default interval', () => {
+  describe("constructor", () => {
+    it("should initialize with default interval", () => {
       const defaultLimiter = new RateLimiter();
       expect(defaultLimiter).toBeInstanceOf(RateLimiter);
     });
 
-    it('should initialize with custom interval', () => {
+    it("should initialize with custom interval", () => {
       const customLimiter = new RateLimiter(5000);
       expect(customLimiter).toBeInstanceOf(RateLimiter);
     });
 
-    it('should throw on negative interval', () => {
-      expect(() => new RateLimiter(-1)).toThrow(
-        'minIntervalMs must be non-negative.',
-      );
+    it("should throw on negative interval", () => {
+      expect(() => new RateLimiter(-1)).toThrow("minIntervalMs must be non-negative.");
     });
   });
 
-  describe('shouldRecord', () => {
-    it('should allow first recording', () => {
-      const result = rateLimiter.shouldRecord('test_metric');
+  describe("shouldRecord", () => {
+    it("should allow first recording", () => {
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(true);
     });
 
-    it('should block immediate subsequent recordings', () => {
-      rateLimiter.shouldRecord('test_metric'); // First call
-      const result = rateLimiter.shouldRecord('test_metric'); // Immediate second call
+    it("should block immediate subsequent recordings", () => {
+      rateLimiter.shouldRecord("test_metric"); // First call
+      const result = rateLimiter.shouldRecord("test_metric"); // Immediate second call
       expect(result).toBe(false);
     });
 
-    it('should allow recording after interval', () => {
+    it("should allow recording after interval", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric'); // First call
+      rateLimiter.shouldRecord("test_metric"); // First call
 
       // Advance time past interval
       vi.advanceTimersByTime(1500);
 
-      const result = rateLimiter.shouldRecord('test_metric');
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
 
-    it('should handle different metric keys independently', () => {
-      rateLimiter.shouldRecord('metric_a'); // First call for metric_a
+    it("should handle different metric keys independently", () => {
+      rateLimiter.shouldRecord("metric_a"); // First call for metric_a
 
-      const resultA = rateLimiter.shouldRecord('metric_a'); // Second call for metric_a
-      const resultB = rateLimiter.shouldRecord('metric_b'); // First call for metric_b
+      const resultA = rateLimiter.shouldRecord("metric_a"); // Second call for metric_a
+      const resultB = rateLimiter.shouldRecord("metric_b"); // First call for metric_b
 
       expect(resultA).toBe(false); // Should be blocked
       expect(resultB).toBe(true); // Should be allowed
     });
 
-    it('should use shorter interval for high priority events', () => {
+    it("should use shorter interval for high priority events", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric', true); // High priority
+      rateLimiter.shouldRecord("test_metric", true); // High priority
 
       // Advance time by half the normal interval
       vi.advanceTimersByTime(500);
 
-      const result = rateLimiter.shouldRecord('test_metric', true);
+      const result = rateLimiter.shouldRecord("test_metric", true);
       expect(result).toBe(true); // Should be allowed due to high priority
 
       vi.useRealTimers();
     });
 
-    it('should still block high priority events if interval not met', () => {
+    it("should still block high priority events if interval not met", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric', true); // High priority
+      rateLimiter.shouldRecord("test_metric", true); // High priority
 
       // Advance time by less than half interval
       vi.advanceTimersByTime(300);
 
-      const result = rateLimiter.shouldRecord('test_metric', true);
+      const result = rateLimiter.shouldRecord("test_metric", true);
       expect(result).toBe(false); // Should still be blocked
 
       vi.useRealTimers();
     });
   });
 
-  describe('forceRecord', () => {
-    it('should update last record time', () => {
-      const before = rateLimiter.getTimeUntilNextAllowed('test_metric');
+  describe("forceRecord", () => {
+    it("should update last record time", () => {
+      const before = rateLimiter.getTimeUntilNextAllowed("test_metric");
 
-      rateLimiter.forceRecord('test_metric');
+      rateLimiter.forceRecord("test_metric");
 
-      const after = rateLimiter.getTimeUntilNextAllowed('test_metric');
+      const after = rateLimiter.getTimeUntilNextAllowed("test_metric");
       expect(after).toBeGreaterThan(before);
     });
 
-    it('should block subsequent recordings after force record', () => {
-      rateLimiter.forceRecord('test_metric');
+    it("should block subsequent recordings after force record", () => {
+      rateLimiter.forceRecord("test_metric");
 
-      const result = rateLimiter.shouldRecord('test_metric');
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(false);
     });
   });
 
-  describe('getTimeUntilNextAllowed', () => {
-    it('should return 0 for new metric', () => {
-      const time = rateLimiter.getTimeUntilNextAllowed('new_metric');
+  describe("getTimeUntilNextAllowed", () => {
+    it("should return 0 for new metric", () => {
+      const time = rateLimiter.getTimeUntilNextAllowed("new_metric");
       expect(time).toBe(0);
     });
 
-    it('should return correct time after recording', () => {
+    it("should return correct time after recording", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric');
+      rateLimiter.shouldRecord("test_metric");
 
       // Advance time partially
       vi.advanceTimersByTime(300);
 
-      const timeRemaining = rateLimiter.getTimeUntilNextAllowed('test_metric');
+      const timeRemaining = rateLimiter.getTimeUntilNextAllowed("test_metric");
       expect(timeRemaining).toBeCloseTo(700, -1); // Approximately 700ms remaining
 
       vi.useRealTimers();
     });
 
-    it('should return 0 after interval has passed', () => {
+    it("should return 0 after interval has passed", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric');
+      rateLimiter.shouldRecord("test_metric");
 
       // Advance time past interval
       vi.advanceTimersByTime(1500);
 
-      const timeRemaining = rateLimiter.getTimeUntilNextAllowed('test_metric');
+      const timeRemaining = rateLimiter.getTimeUntilNextAllowed("test_metric");
       expect(timeRemaining).toBe(0);
 
       vi.useRealTimers();
     });
 
-    it('should account for high priority interval', () => {
+    it("should account for high priority interval", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('hp_metric', true);
+      rateLimiter.shouldRecord("hp_metric", true);
 
       // After 300ms, with 1000ms base interval, half rounded is 500ms
       vi.advanceTimersByTime(300);
 
-      const timeRemaining = rateLimiter.getTimeUntilNextAllowed(
-        'hp_metric',
-        true,
-      );
+      const timeRemaining = rateLimiter.getTimeUntilNextAllowed("hp_metric", true);
       expect(timeRemaining).toBeCloseTo(200, -1);
 
       vi.useRealTimers();
     });
   });
 
-  describe('getStats', () => {
-    it('should return empty stats initially', () => {
+  describe("getStats", () => {
+    it("should return empty stats initially", () => {
       const stats = rateLimiter.getStats();
       expect(stats).toEqual({
         totalMetrics: 0,
@@ -178,14 +173,14 @@ describe('RateLimiter', () => {
       });
     });
 
-    it('should return correct stats after recordings', () => {
+    it("should return correct stats after recordings", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('metric_a');
+      rateLimiter.shouldRecord("metric_a");
       vi.advanceTimersByTime(500);
-      rateLimiter.shouldRecord('metric_b');
+      rateLimiter.shouldRecord("metric_b");
       vi.advanceTimersByTime(500);
-      rateLimiter.shouldRecord('metric_c');
+      rateLimiter.shouldRecord("metric_c");
 
       const stats = rateLimiter.getStats();
       expect(stats.totalMetrics).toBe(3);
@@ -194,8 +189,8 @@ describe('RateLimiter', () => {
       vi.useRealTimers();
     });
 
-    it('should handle single recording correctly', () => {
-      rateLimiter.shouldRecord('test_metric');
+    it("should handle single recording correctly", () => {
+      rateLimiter.shouldRecord("test_metric");
 
       const stats = rateLimiter.getStats();
       expect(stats.totalMetrics).toBe(1);
@@ -203,10 +198,10 @@ describe('RateLimiter', () => {
     });
   });
 
-  describe('reset', () => {
-    it('should clear all rate limiting state', () => {
-      rateLimiter.shouldRecord('metric_a');
-      rateLimiter.shouldRecord('metric_b');
+  describe("reset", () => {
+    it("should clear all rate limiting state", () => {
+      rateLimiter.shouldRecord("metric_a");
+      rateLimiter.shouldRecord("metric_b");
 
       rateLimiter.reset();
 
@@ -214,16 +209,16 @@ describe('RateLimiter', () => {
       expect(stats.totalMetrics).toBe(0);
 
       // Should allow immediate recording after reset
-      const result = rateLimiter.shouldRecord('metric_a');
+      const result = rateLimiter.shouldRecord("metric_a");
       expect(result).toBe(true);
     });
   });
 
-  describe('cleanup', () => {
-    it('should remove old entries', () => {
+  describe("cleanup", () => {
+    it("should remove old entries", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('old_metric');
+      rateLimiter.shouldRecord("old_metric");
 
       // Advance time beyond cleanup threshold
       vi.advanceTimersByTime(4000000); // More than 1 hour
@@ -231,16 +226,16 @@ describe('RateLimiter', () => {
       rateLimiter.cleanup(3600000); // 1 hour cleanup
 
       // Should allow immediate recording of old metric after cleanup
-      const result = rateLimiter.shouldRecord('old_metric');
+      const result = rateLimiter.shouldRecord("old_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
 
-    it('should preserve recent entries', () => {
+    it("should preserve recent entries", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('recent_metric');
+      rateLimiter.shouldRecord("recent_metric");
 
       // Advance time but not beyond cleanup threshold
       vi.advanceTimersByTime(1800000); // 30 minutes
@@ -248,44 +243,44 @@ describe('RateLimiter', () => {
       rateLimiter.cleanup(3600000); // 1 hour cleanup
 
       // Should no longer be rate limited after 30 minutes (way past 1 minute default interval)
-      const result = rateLimiter.shouldRecord('recent_metric');
+      const result = rateLimiter.shouldRecord("recent_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
 
-    it('should use default cleanup age', () => {
+    it("should use default cleanup age", () => {
       vi.useFakeTimers();
 
-      rateLimiter.shouldRecord('test_metric');
+      rateLimiter.shouldRecord("test_metric");
 
       // Advance time beyond default cleanup (1 hour)
       vi.advanceTimersByTime(4000000);
 
       rateLimiter.cleanup(); // Use default age
 
-      const result = rateLimiter.shouldRecord('test_metric');
+      const result = rateLimiter.shouldRecord("test_metric");
       expect(result).toBe(true);
 
       vi.useRealTimers();
     });
   });
 
-  describe('edge cases', () => {
-    it('should handle zero interval', () => {
+  describe("edge cases", () => {
+    it("should handle zero interval", () => {
       const zeroLimiter = new RateLimiter(0);
 
-      zeroLimiter.shouldRecord('test_metric');
-      const result = zeroLimiter.shouldRecord('test_metric');
+      zeroLimiter.shouldRecord("test_metric");
+      const result = zeroLimiter.shouldRecord("test_metric");
 
       expect(result).toBe(true); // Should allow with zero interval
     });
 
-    it('should handle very large intervals', () => {
+    it("should handle very large intervals", () => {
       const longLimiter = new RateLimiter(Number.MAX_SAFE_INTEGER);
 
-      longLimiter.shouldRecord('test_metric');
-      const timeRemaining = longLimiter.getTimeUntilNextAllowed('test_metric');
+      longLimiter.shouldRecord("test_metric");
+      const timeRemaining = longLimiter.getTimeUntilNextAllowed("test_metric");
 
       expect(timeRemaining).toBeGreaterThan(1000000);
     });
diff --git a/packages/gemini-core/src/telemetry/rate-limiter.ts b/packages/gemini-core/src/telemetry/rate-limiter.ts
index 076887cd3..3d380143c 100644
--- a/packages/gemini-core/src/telemetry/rate-limiter.ts
+++ b/packages/gemini-core/src/telemetry/rate-limiter.ts
@@ -15,7 +15,7 @@ export class RateLimiter {
 
   constructor(minIntervalMs: number = 60000) {
     if (minIntervalMs < 0) {
-      throw new Error('minIntervalMs must be non-negative.');
+      throw new Error("minIntervalMs must be non-negative.");
     }
     this.minIntervalMs = minIntervalMs;
   }
@@ -54,10 +54,7 @@ export class RateLimiter {
   /**
    * Get time until next allowed recording for a metric
    */
-  getTimeUntilNextAllowed(
-    metricKey: string,
-    isHighPriority: boolean = false,
-  ): number {
+  getTimeUntilNextAllowed(metricKey: string, isHighPriority: boolean = false): number {
     const now = Date.now();
     const lastRecordTime = this.lastRecordTimes.get(metricKey) || 0;
     const interval = isHighPriority
@@ -91,8 +88,7 @@ export class RateLimiter {
     const oldest = Math.min(...recordTimes);
     const newest = Math.max(...recordTimes);
     const totalSpan = newest - oldest;
-    const averageInterval =
-      recordTimes.length > 1 ? totalSpan / (recordTimes.length - 1) : 0;
+    const averageInterval = recordTimes.length > 1 ? totalSpan / (recordTimes.length - 1) : 0;
 
     return {
       totalMetrics: recordTimes.length,
diff --git a/packages/gemini-core/src/telemetry/sdk.test.ts b/packages/gemini-core/src/telemetry/sdk.test.ts
index 8808ee170..1c4cc1f80 100644
--- a/packages/gemini-core/src/telemetry/sdk.test.ts
+++ b/packages/gemini-core/src/telemetry/sdk.test.ts
@@ -4,49 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Config } from '../config/config.js';
-import { initializeTelemetry, shutdownTelemetry } from './sdk.js';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
-import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc';
-import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
-import { OTLPTraceExporter as OTLPTraceExporterHttp } from '@opentelemetry/exporter-trace-otlp-http';
-import { OTLPLogExporter as OTLPLogExporterHttp } from '@opentelemetry/exporter-logs-otlp-http';
-import { OTLPMetricExporter as OTLPMetricExporterHttp } from '@opentelemetry/exporter-metrics-otlp-http';
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import {
-  GcpTraceExporter,
-  GcpLogExporter,
-  GcpMetricExporter,
-} from './gcp-exporters.js';
-import { TelemetryTarget } from './index.js';
-
-import * as os from 'node:os';
-import * as path from 'node:path';
-
-vi.mock('@opentelemetry/exporter-trace-otlp-grpc');
-vi.mock('@opentelemetry/exporter-logs-otlp-grpc');
-vi.mock('@opentelemetry/exporter-metrics-otlp-grpc');
-vi.mock('@opentelemetry/exporter-trace-otlp-http');
-vi.mock('@opentelemetry/exporter-logs-otlp-http');
-vi.mock('@opentelemetry/exporter-metrics-otlp-http');
-vi.mock('@opentelemetry/sdk-node');
-vi.mock('./gcp-exporters.js');
-
-describe('Telemetry SDK', () => {
+import * as os from "node:os";
+import * as path from "node:path";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-grpc";
+import { OTLPLogExporter as OTLPLogExporterHttp } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
+import { OTLPMetricExporter as OTLPMetricExporterHttp } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
+import { OTLPTraceExporter as OTLPTraceExporterHttp } from "@opentelemetry/exporter-trace-otlp-http";
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { GcpLogExporter, GcpMetricExporter, GcpTraceExporter } from "./gcp-exporters.js";
+import { TelemetryTarget } from "./index.js";
+import { initializeTelemetry, shutdownTelemetry } from "./sdk.js";
+
+vi.mock("@opentelemetry/exporter-trace-otlp-grpc");
+vi.mock("@opentelemetry/exporter-logs-otlp-grpc");
+vi.mock("@opentelemetry/exporter-metrics-otlp-grpc");
+vi.mock("@opentelemetry/exporter-trace-otlp-http");
+vi.mock("@opentelemetry/exporter-logs-otlp-http");
+vi.mock("@opentelemetry/exporter-metrics-otlp-http");
+vi.mock("@opentelemetry/sdk-node");
+vi.mock("./gcp-exporters.js");
+
+describe("Telemetry SDK", () => {
   let mockConfig: Config;
 
   beforeEach(() => {
     vi.clearAllMocks();
     mockConfig = {
       getTelemetryEnabled: () => true,
-      getTelemetryOtlpEndpoint: () => 'http://localhost:4317',
-      getTelemetryOtlpProtocol: () => 'grpc',
-      getTelemetryTarget: () => 'local',
+      getTelemetryOtlpEndpoint: () => "http://localhost:4317",
+      getTelemetryOtlpProtocol: () => "grpc",
+      getTelemetryTarget: () => "local",
       getTelemetryUseCollector: () => false,
       getTelemetryOutfile: () => undefined,
       getDebugMode: () => false,
-      getSessionId: () => 'test-session',
+      getSessionId: () => "test-session",
     } as unknown as Config;
   });
 
@@ -54,125 +49,113 @@ describe('Telemetry SDK', () => {
     await shutdownTelemetry(mockConfig);
   });
 
-  it('should use gRPC exporters when protocol is grpc', () => {
+  it("should use gRPC exporters when protocol is grpc", () => {
     initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPLogExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPMetricExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(NodeSDK.prototype.start).toHaveBeenCalled();
   });
 
-  it('should use HTTP exporters when protocol is http', () => {
-    vi.spyOn(mockConfig, 'getTelemetryEnabled').mockReturnValue(true);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpProtocol').mockReturnValue('http');
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'http://localhost:4318',
-    );
+  it("should use HTTP exporters when protocol is http", () => {
+    vi.spyOn(mockConfig, "getTelemetryEnabled").mockReturnValue(true);
+    vi.spyOn(mockConfig, "getTelemetryOtlpProtocol").mockReturnValue("http");
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("http://localhost:4318");
 
     initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporterHttp).toHaveBeenCalledWith({
-      url: 'http://localhost:4318/',
+      url: "http://localhost:4318/",
     });
     expect(OTLPLogExporterHttp).toHaveBeenCalledWith({
-      url: 'http://localhost:4318/',
+      url: "http://localhost:4318/",
     });
     expect(OTLPMetricExporterHttp).toHaveBeenCalledWith({
-      url: 'http://localhost:4318/',
+      url: "http://localhost:4318/",
     });
     expect(NodeSDK.prototype.start).toHaveBeenCalled();
   });
 
-  it('should parse gRPC endpoint correctly', () => {
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'https://my-collector.com',
-    );
+  it("should parse gRPC endpoint correctly", () => {
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("https://my-collector.com");
     initializeTelemetry(mockConfig);
     expect(OTLPTraceExporter).toHaveBeenCalledWith(
-      expect.objectContaining({ url: 'https://my-collector.com' }),
+      expect.objectContaining({ url: "https://my-collector.com" }),
     );
   });
 
-  it('should parse HTTP endpoint correctly', () => {
-    vi.spyOn(mockConfig, 'getTelemetryOtlpProtocol').mockReturnValue('http');
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'https://my-collector.com',
-    );
+  it("should parse HTTP endpoint correctly", () => {
+    vi.spyOn(mockConfig, "getTelemetryOtlpProtocol").mockReturnValue("http");
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("https://my-collector.com");
     initializeTelemetry(mockConfig);
     expect(OTLPTraceExporterHttp).toHaveBeenCalledWith(
-      expect.objectContaining({ url: 'https://my-collector.com/' }),
+      expect.objectContaining({ url: "https://my-collector.com/" }),
     );
   });
 
-  it('should use direct GCP exporters when target is gcp, project ID is set, and useCollector is false', () => {
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+  it("should use direct GCP exporters when target is gcp, project ID is set, and useCollector is false", () => {
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(false);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
-    const originalEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = 'test-project';
+    const originalEnv = process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = "test-project";
 
     try {
       initializeTelemetry(mockConfig);
 
-      expect(GcpTraceExporter).toHaveBeenCalledWith('test-project');
-      expect(GcpLogExporter).toHaveBeenCalledWith('test-project');
-      expect(GcpMetricExporter).toHaveBeenCalledWith('test-project');
+      expect(GcpTraceExporter).toHaveBeenCalledWith("test-project");
+      expect(GcpLogExporter).toHaveBeenCalledWith("test-project");
+      expect(GcpMetricExporter).toHaveBeenCalledWith("test-project");
       expect(NodeSDK.prototype.start).toHaveBeenCalled();
     } finally {
       if (originalEnv) {
-        process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalEnv;
+        process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = originalEnv;
       } else {
-        delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
+        delete process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
       }
     }
   });
 
-  it('should use OTLP exporters when target is gcp but useCollector is true', () => {
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(true);
+  it("should use OTLP exporters when target is gcp but useCollector is true", () => {
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(true);
 
     initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPLogExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
     expect(OTLPMetricExporter).toHaveBeenCalledWith({
-      url: 'http://localhost:4317',
-      compression: 'gzip',
+      url: "http://localhost:4317",
+      compression: "gzip",
     });
   });
 
-  it('should not use GCP exporters when project ID environment variable is not set', () => {
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+  it("should not use GCP exporters when project ID environment variable is not set", () => {
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(false);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
-    const originalOtlpEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    const originalGoogleEnv = process.env['GOOGLE_CLOUD_PROJECT'];
-    delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    delete process.env['GOOGLE_CLOUD_PROJECT'];
+    const originalOtlpEnv = process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    const originalGoogleEnv = process.env["GOOGLE_CLOUD_PROJECT"];
+    delete process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    delete process.env["GOOGLE_CLOUD_PROJECT"];
 
     try {
       initializeTelemetry(mockConfig);
@@ -183,49 +166,45 @@ describe('Telemetry SDK', () => {
       expect(NodeSDK.prototype.start).toHaveBeenCalled();
     } finally {
       if (originalOtlpEnv) {
-        process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalOtlpEnv;
+        process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = originalOtlpEnv;
       }
       if (originalGoogleEnv) {
-        process.env['GOOGLE_CLOUD_PROJECT'] = originalGoogleEnv;
+        process.env["GOOGLE_CLOUD_PROJECT"] = originalGoogleEnv;
       }
     }
   });
 
-  it('should use GOOGLE_CLOUD_PROJECT as fallback when OTLP_GOOGLE_CLOUD_PROJECT is not set', () => {
-    vi.spyOn(mockConfig, 'getTelemetryTarget').mockReturnValue(
-      TelemetryTarget.GCP,
-    );
-    vi.spyOn(mockConfig, 'getTelemetryUseCollector').mockReturnValue(false);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue('');
+  it("should use GOOGLE_CLOUD_PROJECT as fallback when OTLP_GOOGLE_CLOUD_PROJECT is not set", () => {
+    vi.spyOn(mockConfig, "getTelemetryTarget").mockReturnValue(TelemetryTarget.GCP);
+    vi.spyOn(mockConfig, "getTelemetryUseCollector").mockReturnValue(false);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("");
 
-    const originalOtlpEnv = process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    const originalGoogleEnv = process.env['GOOGLE_CLOUD_PROJECT'];
-    delete process.env['OTLP_GOOGLE_CLOUD_PROJECT'];
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'fallback-project';
+    const originalOtlpEnv = process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    const originalGoogleEnv = process.env["GOOGLE_CLOUD_PROJECT"];
+    delete process.env["OTLP_GOOGLE_CLOUD_PROJECT"];
+    process.env["GOOGLE_CLOUD_PROJECT"] = "fallback-project";
 
     try {
       initializeTelemetry(mockConfig);
 
-      expect(GcpTraceExporter).toHaveBeenCalledWith('fallback-project');
-      expect(GcpLogExporter).toHaveBeenCalledWith('fallback-project');
-      expect(GcpMetricExporter).toHaveBeenCalledWith('fallback-project');
+      expect(GcpTraceExporter).toHaveBeenCalledWith("fallback-project");
+      expect(GcpLogExporter).toHaveBeenCalledWith("fallback-project");
+      expect(GcpMetricExporter).toHaveBeenCalledWith("fallback-project");
       expect(NodeSDK.prototype.start).toHaveBeenCalled();
     } finally {
       if (originalOtlpEnv) {
-        process.env['OTLP_GOOGLE_CLOUD_PROJECT'] = originalOtlpEnv;
+        process.env["OTLP_GOOGLE_CLOUD_PROJECT"] = originalOtlpEnv;
       }
       if (originalGoogleEnv) {
-        process.env['GOOGLE_CLOUD_PROJECT'] = originalGoogleEnv;
+        process.env["GOOGLE_CLOUD_PROJECT"] = originalGoogleEnv;
       } else {
-        delete process.env['GOOGLE_CLOUD_PROJECT'];
+        delete process.env["GOOGLE_CLOUD_PROJECT"];
       }
     }
   });
 
-  it('should not use OTLP exporters when telemetryOutfile is set', () => {
-    vi.spyOn(mockConfig, 'getTelemetryOutfile').mockReturnValue(
-      path.join(os.tmpdir(), 'test.log'),
-    );
+  it("should not use OTLP exporters when telemetryOutfile is set", () => {
+    vi.spyOn(mockConfig, "getTelemetryOutfile").mockReturnValue(path.join(os.tmpdir(), "test.log"));
     initializeTelemetry(mockConfig);
 
     expect(OTLPTraceExporter).not.toHaveBeenCalled();
diff --git a/packages/gemini-core/src/telemetry/sdk.ts b/packages/gemini-core/src/telemetry/sdk.ts
index d4d66b112..452cab28f 100644
--- a/packages/gemini-core/src/telemetry/sdk.ts
+++ b/packages/gemini-core/src/telemetry/sdk.ts
@@ -4,46 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { DiagConsoleLogger, DiagLogLevel, diag } from '@opentelemetry/api';
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc';
-import { OTLPLogExporter } from '@opentelemetry/exporter-logs-otlp-grpc';
-import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc';
-import { OTLPTraceExporter as OTLPTraceExporterHttp } from '@opentelemetry/exporter-trace-otlp-http';
-import { OTLPLogExporter as OTLPLogExporterHttp } from '@opentelemetry/exporter-logs-otlp-http';
-import { OTLPMetricExporter as OTLPMetricExporterHttp } from '@opentelemetry/exporter-metrics-otlp-http';
-import { CompressionAlgorithm } from '@opentelemetry/otlp-exporter-base';
-import { NodeSDK } from '@opentelemetry/sdk-node';
-import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
-import { resourceFromAttributes } from '@opentelemetry/resources';
-import {
-  BatchSpanProcessor,
-  ConsoleSpanExporter,
-} from '@opentelemetry/sdk-trace-node';
-import {
-  BatchLogRecordProcessor,
-  ConsoleLogRecordExporter,
-} from '@opentelemetry/sdk-logs';
-import {
-  ConsoleMetricExporter,
-  PeriodicExportingMetricReader,
-} from '@opentelemetry/sdk-metrics';
-import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
-import type { Config } from '../config/config.js';
-import { SERVICE_NAME } from './constants.js';
-import { initializeMetrics } from './metrics.js';
-import { ClearcutLogger } from './clearcut-logger/clearcut-logger.js';
-import {
-  FileLogExporter,
-  FileMetricExporter,
-  FileSpanExporter,
-} from './file-exporters.js';
-import {
-  GcpTraceExporter,
-  GcpMetricExporter,
-  GcpLogExporter,
-} from './gcp-exporters.js';
-import { TelemetryTarget } from './index.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { DiagConsoleLogger, DiagLogLevel, diag } from "@opentelemetry/api";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-grpc";
+import { OTLPLogExporter as OTLPLogExporterHttp } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-grpc";
+import { OTLPMetricExporter as OTLPMetricExporterHttp } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc";
+import { OTLPTraceExporter as OTLPTraceExporterHttp } from "@opentelemetry/exporter-trace-otlp-http";
+import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { CompressionAlgorithm } from "@opentelemetry/otlp-exporter-base";
+import { resourceFromAttributes } from "@opentelemetry/resources";
+import { BatchLogRecordProcessor, ConsoleLogRecordExporter } from "@opentelemetry/sdk-logs";
+import { ConsoleMetricExporter, PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import { BatchSpanProcessor, ConsoleSpanExporter } from "@opentelemetry/sdk-trace-node";
+import { SemanticResourceAttributes } from "@opentelemetry/semantic-conventions";
+import type { Config } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { ClearcutLogger } from "./clearcut-logger/clearcut-logger.js";
+import { SERVICE_NAME } from "./constants.js";
+import { FileLogExporter, FileMetricExporter, FileSpanExporter } from "./file-exporters.js";
+import { GcpLogExporter, GcpMetricExporter, GcpTraceExporter } from "./gcp-exporters.js";
+import { TelemetryTarget } from "./index.js";
+import { initializeMetrics } from "./metrics.js";
 
 // For troubleshooting, set the log level to DiagLogLevel.DEBUG
 diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.INFO);
@@ -57,17 +40,17 @@ export function isTelemetrySdkInitialized(): boolean {
 
 function parseOtlpEndpoint(
   otlpEndpointSetting: string | undefined,
-  protocol: 'grpc' | 'http',
+  protocol: "grpc" | "http",
 ): string | undefined {
   if (!otlpEndpointSetting) {
     return undefined;
   }
   // Trim leading/trailing quotes that might come from env variables
-  const trimmedEndpoint = otlpEndpointSetting.replace(/^["']|["']$/g, '');
+  const trimmedEndpoint = otlpEndpointSetting.replace(/^["']|["']$/g, "");
 
   try {
     const url = new URL(trimmedEndpoint);
-    if (protocol === 'grpc') {
+    if (protocol === "grpc") {
       // OTLP gRPC exporters expect an endpoint in the format scheme://host:port
       // The `origin` property provides this, stripping any path, query, or hash.
       return url.origin;
@@ -75,7 +58,7 @@ function parseOtlpEndpoint(
     // For http, use the full href.
     return url.href;
   } catch (error) {
-    diag.error('Invalid OTLP endpoint URL provided:', trimmedEndpoint, error);
+    diag.error("Invalid OTLP endpoint URL provided:", trimmedEndpoint, error);
     return undefined;
   }
 }
@@ -88,7 +71,7 @@ export function initializeTelemetry(config: Config): void {
   const resource = resourceFromAttributes({
     [SemanticResourceAttributes.SERVICE_NAME]: SERVICE_NAME,
     [SemanticResourceAttributes.SERVICE_VERSION]: process.version,
-    'session.id': config.getSessionId(),
+    "session.id": config.getSessionId(),
   });
 
   const otlpEndpoint = config.getTelemetryOtlpEndpoint();
@@ -100,8 +83,7 @@ export function initializeTelemetry(config: Config): void {
   const useOtlp = !!parsedEndpoint && !telemetryOutfile;
 
   const gcpProjectId =
-    process.env['OTLP_GOOGLE_CLOUD_PROJECT'] ||
-    process.env['GOOGLE_CLOUD_PROJECT'];
+    process.env["OTLP_GOOGLE_CLOUD_PROJECT"] || process.env["GOOGLE_CLOUD_PROJECT"];
   const useDirectGcpExport =
     telemetryTarget === TelemetryTarget.GCP && !!gcpProjectId && !useCollector;
 
@@ -127,7 +109,7 @@ export function initializeTelemetry(config: Config): void {
       exportIntervalMillis: 30000,
     });
   } else if (useOtlp) {
-    if (otlpProtocol === 'http') {
+    if (otlpProtocol === "http") {
       spanExporter = new OTLPTraceExporterHttp({
         url: parsedEndpoint,
       });
@@ -185,21 +167,21 @@ export function initializeTelemetry(config: Config): void {
   try {
     sdk.start();
     if (config.getDebugMode()) {
-      debugLogger.log('OpenTelemetry SDK started successfully.');
+      debugLogger.log("OpenTelemetry SDK started successfully.");
     }
     telemetryInitialized = true;
     initializeMetrics(config);
   } catch (error) {
-    console.error('Error starting OpenTelemetry SDK:', error);
+    console.error("Error starting OpenTelemetry SDK:", error);
   }
 
-  process.on('SIGTERM', () => {
+  process.on("SIGTERM", () => {
     shutdownTelemetry(config);
   });
-  process.on('SIGINT', () => {
+  process.on("SIGINT", () => {
     shutdownTelemetry(config);
   });
-  process.on('exit', () => {
+  process.on("exit", () => {
     shutdownTelemetry(config);
   });
 }
@@ -212,10 +194,10 @@ export async function shutdownTelemetry(config: Config): Promise<void> {
     ClearcutLogger.getInstance()?.shutdown();
     await sdk.shutdown();
     if (config.getDebugMode()) {
-      debugLogger.log('OpenTelemetry SDK shut down successfully.');
+      debugLogger.log("OpenTelemetry SDK shut down successfully.");
     }
   } catch (error) {
-    console.error('Error shutting down SDK:', error);
+    console.error("Error shutting down SDK:", error);
   } finally {
     telemetryInitialized = false;
   }
diff --git a/packages/gemini-core/src/telemetry/semantic.test.ts b/packages/gemini-core/src/telemetry/semantic.test.ts
index 6ea4cf3a3..5736b3d37 100644
--- a/packages/gemini-core/src/telemetry/semantic.test.ts
+++ b/packages/gemini-core/src/telemetry/semantic.test.ts
@@ -4,154 +4,148 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { type Candidate, type Content, FinishReason, Language, Outcome } from "@google/genai";
+import { describe, expect, it } from "vitest";
 import {
+  OTelFinishReason,
+  OTelOutputType,
   toChatMessage,
+  toFinishReasons,
   toInputMessages,
-  toSystemInstruction,
   toOutputMessages,
-  toFinishReasons,
-  OTelFinishReason,
   toOutputType,
-  OTelOutputType,
-} from './semantic.js';
-import {
-  Language,
-  type Content,
-  Outcome,
-  type Candidate,
-  FinishReason,
-} from '@google/genai';
+  toSystemInstruction,
+} from "./semantic.js";
 
-describe('toChatMessage', () => {
-  it('should correctly handle text parts', () => {
+describe("toChatMessage", () => {
+  it("should correctly handle text parts", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'Hello' }],
+      role: "user",
+      parts: [{ text: "Hello" }],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'user',
+      role: "user",
       parts: [
         {
-          type: 'text',
-          content: 'Hello',
+          type: "text",
+          content: "Hello",
         },
       ],
     });
   });
 
-  it('should correctly handle function call parts', () => {
+  it("should correctly handle function call parts", () => {
     const content: Content = {
-      role: 'model',
+      role: "model",
       parts: [
         {
           functionCall: {
-            name: 'test-function',
+            name: "test-function",
             args: {
-              arg1: 'test-value',
+              arg1: "test-value",
             },
-            id: '12345',
+            id: "12345",
           },
           // include field not specified in semantic specification that could be present
-          thoughtSignature: '1234',
+          thoughtSignature: "1234",
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'tool_call',
-          name: 'test-function',
+          type: "tool_call",
+          name: "test-function",
           arguments: '{"arg1":"test-value"}',
-          id: '12345',
+          id: "12345",
         },
       ],
     });
   });
 
-  it('should correctly handle function response parts', () => {
+  it("should correctly handle function response parts", () => {
     const content: Content = {
-      role: 'user',
+      role: "user",
       parts: [
         {
           functionResponse: {
-            name: 'test-function',
+            name: "test-function",
             response: {
-              result: 'success',
+              result: "success",
             },
-            id: '12345',
+            id: "12345",
           },
           // include field not specified in semantic specification that could be present
           fileData: {
-            displayName: 'greatfile',
+            displayName: "greatfile",
           },
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'user',
+      role: "user",
       parts: [
         {
-          type: 'tool_call_response',
+          type: "tool_call_response",
           response: '{"result":"success"}',
-          id: '12345',
+          id: "12345",
         },
       ],
     });
   });
 
-  it('should correctly handle reasoning parts with text', () => {
+  it("should correctly handle reasoning parts with text", () => {
     const content: Content = {
-      role: 'system',
-      parts: [{ text: 'Hmm', thought: true }],
+      role: "system",
+      parts: [{ text: "Hmm", thought: true }],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'reasoning',
-          content: 'Hmm',
+          type: "reasoning",
+          content: "Hmm",
         },
       ],
     });
   });
 
-  it('should correctly handle reasoning parts without text', () => {
+  it("should correctly handle reasoning parts without text", () => {
     const content: Content = {
-      role: 'system',
+      role: "system",
       parts: [
         {
           thought: true,
           // include field not specified in semantic specification that could be present
           inlineData: {
-            displayName: 'wowdata',
+            displayName: "wowdata",
           },
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'reasoning',
-          content: '',
+          type: "reasoning",
+          content: "",
         },
       ],
     });
   });
 
-  it('should correctly handle text parts that are not reasoning parts', () => {
+  it("should correctly handle text parts that are not reasoning parts", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'what a nice day', thought: false }],
+      role: "user",
+      parts: [{ text: "what a nice day", thought: false }],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'user',
+      role: "user",
       parts: [
         {
-          type: 'text',
-          content: 'what a nice day',
+          type: "text",
+          content: "what a nice day",
         },
       ],
     });
@@ -159,7 +153,7 @@ describe('toChatMessage', () => {
 
   it('should correctly handle "generic" parts', () => {
     const content: Content = {
-      role: 'model',
+      role: "model",
       parts: [
         {
           executableCode: {
@@ -170,7 +164,7 @@ describe('toChatMessage', () => {
         {
           codeExecutionResult: {
             outcome: Outcome.OUTCOME_OK,
-            output: 'foo',
+            output: "foo",
           },
           // include field not specified in semantic specification that could be present
           videoMetadata: {
@@ -180,17 +174,17 @@ describe('toChatMessage', () => {
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'executableCode',
+          type: "executableCode",
           code: 'print("foo")',
-          language: 'PYTHON',
+          language: "PYTHON",
         },
         {
-          type: 'codeExecutionResult',
-          outcome: 'OUTCOME_OK',
-          output: 'foo',
+          type: "codeExecutionResult",
+          outcome: "OUTCOME_OK",
+          output: "foo",
           videoMetadata: {
             fps: 5,
           },
@@ -199,24 +193,24 @@ describe('toChatMessage', () => {
     });
   });
 
-  it('should correctly handle unknown parts', () => {
+  it("should correctly handle unknown parts", () => {
     const content: Content = {
-      role: 'model',
+      role: "model",
       parts: [
         {
           fileData: {
-            displayName: 'superfile',
+            displayName: "superfile",
           },
         },
       ],
     };
     expect(toChatMessage(content)).toEqual({
-      role: 'system',
+      role: "system",
       parts: [
         {
-          type: 'unknown',
+          type: "unknown",
           fileData: {
-            displayName: 'superfile',
+            displayName: "superfile",
           },
         },
       ],
@@ -224,76 +218,76 @@ describe('toChatMessage', () => {
   });
 });
 
-describe('toSystemInstruction', () => {
-  it('should correctly handle a string', () => {
-    const content = 'Hello';
+describe("toSystemInstruction", () => {
+  it("should correctly handle a string", () => {
+    const content = "Hello";
     expect(toSystemInstruction(content)).toEqual([
       {
-        type: 'text',
-        content: 'Hello',
+        type: "text",
+        content: "Hello",
       },
     ]);
   });
 
-  it('should correctly handle a Content object with a text part', () => {
+  it("should correctly handle a Content object with a text part", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'Hello' }],
+      role: "user",
+      parts: [{ text: "Hello" }],
     };
     expect(toSystemInstruction(content)).toEqual([
       {
-        type: 'text',
-        content: 'Hello',
+        type: "text",
+        content: "Hello",
       },
     ]);
   });
 
-  it('should correctly handle a Content object with multiple parts', () => {
+  it("should correctly handle a Content object with multiple parts", () => {
     const content: Content = {
-      role: 'user',
-      parts: [{ text: 'Hello' }, { text: 'Hmm', thought: true }],
+      role: "user",
+      parts: [{ text: "Hello" }, { text: "Hmm", thought: true }],
     };
     expect(toSystemInstruction(content)).toEqual([
       {
-        type: 'text',
-        content: 'Hello',
+        type: "text",
+        content: "Hello",
       },
       {
-        type: 'reasoning',
-        content: 'Hmm',
+        type: "reasoning",
+        content: "Hmm",
       },
     ]);
   });
 });
 
-describe('toInputMessages', () => {
-  it('should correctly convert an array of Content objects', () => {
+describe("toInputMessages", () => {
+  it("should correctly convert an array of Content objects", () => {
     const contents: Content[] = [
       {
-        role: 'user',
-        parts: [{ text: 'Hello' }],
+        role: "user",
+        parts: [{ text: "Hello" }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Hi there!' }],
+        role: "model",
+        parts: [{ text: "Hi there!" }],
       },
     ];
     expect(toInputMessages(contents)).toEqual([
       {
-        role: 'user',
+        role: "user",
         parts: [
           {
-            type: 'text',
-            content: 'Hello',
+            type: "text",
+            content: "Hello",
           },
         ],
       },
       {
-        role: 'system',
+        role: "system",
         parts: [
           {
-            type: 'text',
-            content: 'Hi there!',
+            type: "text",
+            content: "Hi there!",
           },
         ],
       },
@@ -301,44 +295,44 @@ describe('toInputMessages', () => {
   });
 });
 
-describe('toOutputMessages', () => {
-  it('should correctly convert an array of Candidate objects', () => {
+describe("toOutputMessages", () => {
+  it("should correctly convert an array of Candidate objects", () => {
     const candidates: Candidate[] = [
       {
         index: 0,
         finishReason: FinishReason.STOP,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the first candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the first candidate." }],
         },
       },
       {
         index: 1,
         finishReason: FinishReason.MAX_TOKENS,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the second candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the second candidate." }],
         },
       },
     ];
     expect(toOutputMessages(candidates)).toEqual([
       {
-        role: 'system',
-        finish_reason: 'stop',
+        role: "system",
+        finish_reason: "stop",
         parts: [
           {
-            type: 'text',
-            content: 'This is the first candidate.',
+            type: "text",
+            content: "This is the first candidate.",
           },
         ],
       },
       {
-        role: 'system',
-        finish_reason: 'length',
+        role: "system",
+        finish_reason: "length",
         parts: [
           {
-            type: 'text',
-            content: 'This is the second candidate.',
+            type: "text",
+            content: "This is the second candidate.",
           },
         ],
       },
@@ -346,53 +340,53 @@ describe('toOutputMessages', () => {
   });
 });
 
-describe('toFinishReasons', () => {
-  it('should return an empty array if candidates is undefined', () => {
+describe("toFinishReasons", () => {
+  it("should return an empty array if candidates is undefined", () => {
     expect(toFinishReasons(undefined)).toEqual([]);
   });
 
-  it('should return an empty array if candidates is an empty array', () => {
+  it("should return an empty array if candidates is an empty array", () => {
     expect(toFinishReasons([])).toEqual([]);
   });
 
-  it('should correctly convert a single candidate', () => {
+  it("should correctly convert a single candidate", () => {
     const candidates: Candidate[] = [
       {
         index: 0,
         finishReason: FinishReason.STOP,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the first candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the first candidate." }],
         },
       },
     ];
     expect(toFinishReasons(candidates)).toEqual([OTelFinishReason.STOP]);
   });
 
-  it('should correctly convert multiple candidates', () => {
+  it("should correctly convert multiple candidates", () => {
     const candidates: Candidate[] = [
       {
         index: 0,
         finishReason: FinishReason.STOP,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the first candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the first candidate." }],
         },
       },
       {
         index: 1,
         finishReason: FinishReason.MAX_TOKENS,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the second candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the second candidate." }],
         },
       },
       {
         index: 2,
         finishReason: FinishReason.SAFETY,
         content: {
-          role: 'model',
-          parts: [{ text: 'This is the third candidate.' }],
+          role: "model",
+          parts: [{ text: "This is the third candidate." }],
         },
       },
     ];
@@ -404,22 +398,20 @@ describe('toFinishReasons', () => {
   });
 });
 
-describe('toOutputType', () => {
-  it('should return TEXT for text/plain', () => {
-    expect(toOutputType('text/plain')).toBe(OTelOutputType.TEXT);
+describe("toOutputType", () => {
+  it("should return TEXT for text/plain", () => {
+    expect(toOutputType("text/plain")).toBe(OTelOutputType.TEXT);
   });
 
-  it('should return JSON for application/json', () => {
-    expect(toOutputType('application/json')).toBe(OTelOutputType.JSON);
+  it("should return JSON for application/json", () => {
+    expect(toOutputType("application/json")).toBe(OTelOutputType.JSON);
   });
 
-  it('should return the custom mime type for other strings', () => {
-    expect(toOutputType('application/vnd.custom-type')).toBe(
-      'application/vnd.custom-type',
-    );
+  it("should return the custom mime type for other strings", () => {
+    expect(toOutputType("application/vnd.custom-type")).toBe("application/vnd.custom-type");
   });
 
-  it('should return undefined for undefined input', () => {
+  it("should return undefined for undefined input", () => {
     expect(toOutputType(undefined)).toBeUndefined();
   });
 });
diff --git a/packages/gemini-core/src/telemetry/semantic.ts b/packages/gemini-core/src/telemetry/semantic.ts
index b2ee29679..5cb886216 100644
--- a/packages/gemini-core/src/telemetry/semantic.ts
+++ b/packages/gemini-core/src/telemetry/semantic.ts
@@ -11,14 +11,8 @@
  * @see https://github.com/open-telemetry/semantic-conventions/blob/8b4f210f43136e57c1f6f47292eb6d38e3bf30bb/docs/gen-ai/gen-ai-events.md
  */
 
-import { FinishReason } from '@google/genai';
-import type {
-  Candidate,
-  Content,
-  ContentUnion,
-  Part,
-  PartUnion,
-} from '@google/genai';
+import type { Candidate, Content, ContentUnion, Part, PartUnion } from "@google/genai";
+import { FinishReason } from "@google/genai";
 
 export function toInputMessages(contents: Content[]): InputMessages {
   const messages: ChatMessage[] = [];
@@ -30,22 +24,19 @@ export function toInputMessages(contents: Content[]): InputMessages {
 
 function isPart(value: unknown): value is Part {
   return (
-    typeof value === 'object' &&
-    value !== null &&
-    !Array.isArray(value) &&
-    !('parts' in value)
+    typeof value === "object" && value !== null && !Array.isArray(value) && !("parts" in value)
   );
 }
 
 function toPart(part: PartUnion): Part {
-  if (typeof part === 'string') {
+  if (typeof part === "string") {
     return { text: part };
   }
   return part;
 }
 
 function toContent(content: ContentUnion): Content | undefined {
-  if (typeof content === 'string') {
+  if (typeof content === "string") {
     // 1. It's a string
     return {
       parts: [toPart(content)],
@@ -55,7 +46,7 @@ function toContent(content: ContentUnion): Content | undefined {
     return {
       parts: content.map(toPart),
     };
-  } else if ('parts' in content) {
+  } else if ("parts" in content) {
     // 3. It's a Content object
     return content;
   } else if (isPart(content)) {
@@ -110,9 +101,9 @@ export function toFinishReasons(candidates?: Candidate[]): OTelFinishReason[] {
 export function toOutputType(requested_mime?: string): string | undefined {
   switch (requested_mime) {
     // explictly support the known good values of responseMimeType
-    case 'text/plain':
+    case "text/plain":
       return OTelOutputType.TEXT;
-    case 'application/json':
+    case "application/json":
       return OTelOutputType.JSON;
     default:
       // if none of the well-known values applies, a custom value may be used
@@ -139,7 +130,7 @@ export function toOTelPart(part: Part): AnyPart {
     if (part.text) {
       return new ReasoningPart(part.text);
     } else {
-      return new ReasoningPart('');
+      return new ReasoningPart("");
     }
   } else if (part.text) {
     return new TextPart(part.text);
@@ -156,14 +147,14 @@ export function toOTelPart(part: Part): AnyPart {
     );
   } else if (part.executableCode) {
     const { executableCode, ...unexpectedData } = part;
-    return new GenericPart('executableCode', {
+    return new GenericPart("executableCode", {
       code: executableCode.code,
       language: executableCode.language,
       ...unexpectedData,
     });
   } else if (part.codeExecutionResult) {
     const { codeExecutionResult, ...unexpectedData } = part;
-    return new GenericPart('codeExecutionResult', {
+    return new GenericPart("codeExecutionResult", {
       outcome: codeExecutionResult.outcome,
       output: codeExecutionResult.output,
       ...unexpectedData,
@@ -171,28 +162,28 @@ export function toOTelPart(part: Part): AnyPart {
   }
   // Assuming the above cases capture all the expected parts
   // but adding a fallthrough just in case.
-  return new GenericPart('unknown', { ...part });
+  return new GenericPart("unknown", { ...part });
 }
 
 export enum OTelRole {
-  SYSTEM = 'system',
-  USER = 'user',
-  ASSISTANT = 'assistant',
-  TOOL = 'tool',
+  SYSTEM = "system",
+  USER = "user",
+  ASSISTANT = "assistant",
+  TOOL = "tool",
 }
 
 export function toOTelRole(role?: string): OTelRole {
   switch (role?.toLowerCase()) {
-    case 'system':
+    case "system":
       return OTelRole.SYSTEM;
     // Our APIs seem to frequently use 'model'
-    case 'model':
+    case "model":
       return OTelRole.SYSTEM;
-    case 'user':
+    case "user":
       return OTelRole.USER;
-    case 'assistant':
+    case "assistant":
       return OTelRole.ASSISTANT;
-    case 'tool':
+    case "tool":
       return OTelRole.TOOL;
     default:
       return OTelRole.SYSTEM;
@@ -202,18 +193,18 @@ export function toOTelRole(role?: string): OTelRole {
 export type InputMessages = ChatMessage[];
 
 export enum OTelOutputType {
-  IMAGE = 'image',
-  JSON = 'json',
-  SPEECH = 'speech',
-  TEXT = 'text',
+  IMAGE = "image",
+  JSON = "json",
+  SPEECH = "speech",
+  TEXT = "text",
 }
 
 export enum OTelFinishReason {
-  STOP = 'stop',
-  LENGTH = 'length',
-  CONTENT_FILTER = 'content_filter',
-  TOOL_CALL = 'tool_call',
-  ERROR = 'error',
+  STOP = "stop",
+  LENGTH = "length",
+  CONTENT_FILTER = "content_filter",
+  TOOL_CALL = "tool_call",
+  ERROR = "error",
 }
 
 export function toOTelFinishReason(finishReason?: string): OTelFinishReason {
@@ -271,7 +262,7 @@ export interface ChatMessage {
 }
 
 export class TextPart {
-  readonly type = 'text';
+  readonly type = "text";
   content: string;
 
   constructor(content: string) {
@@ -280,7 +271,7 @@ export class TextPart {
 }
 
 export class ToolCallRequestPart {
-  readonly type = 'tool_call';
+  readonly type = "tool_call";
   name?: string;
   id?: string;
   arguments?: string;
@@ -293,7 +284,7 @@ export class ToolCallRequestPart {
 }
 
 export class ToolCallResponsePart {
-  readonly type = 'tool_call_response';
+  readonly type = "tool_call_response";
   response?: string;
   id?: string;
 
@@ -304,7 +295,7 @@ export class ToolCallResponsePart {
 }
 
 export class ReasoningPart {
-  readonly type = 'reasoning';
+  readonly type = "reasoning";
   content: string;
 
   constructor(content: string) {
diff --git a/packages/gemini-core/src/telemetry/telemetry-utils.test.ts b/packages/gemini-core/src/telemetry/telemetry-utils.test.ts
index 4240ae666..b726af9ca 100644
--- a/packages/gemini-core/src/telemetry/telemetry-utils.test.ts
+++ b/packages/gemini-core/src/telemetry/telemetry-utils.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { getProgrammingLanguage } from './telemetry-utils.js';
+import { describe, expect, it } from "vitest";
+import { getProgrammingLanguage } from "./telemetry-utils.js";
 
-describe('getProgrammingLanguage', () => {
+describe("getProgrammingLanguage", () => {
   type ProgrammingLanguageTestCase = {
     name: string;
     args: Record<string, string>;
@@ -16,32 +16,32 @@ describe('getProgrammingLanguage', () => {
 
   it.each<ProgrammingLanguageTestCase>([
     {
-      name: 'file_path is present',
-      args: { file_path: 'src/test.ts' },
-      expected: 'TypeScript',
+      name: "file_path is present",
+      args: { file_path: "src/test.ts" },
+      expected: "TypeScript",
     },
     {
-      name: 'absolute_path is present',
-      args: { absolute_path: 'src/test.py' },
-      expected: 'Python',
+      name: "absolute_path is present",
+      args: { absolute_path: "src/test.py" },
+      expected: "Python",
     },
-    { name: 'path is present', args: { path: 'src/test.go' }, expected: 'Go' },
+    { name: "path is present", args: { path: "src/test.go" }, expected: "Go" },
     {
-      name: 'no file path is present',
+      name: "no file path is present",
       args: {},
       expected: undefined,
     },
     {
-      name: 'unknown file extensions',
-      args: { file_path: 'src/test.unknown' },
+      name: "unknown file extensions",
+      args: { file_path: "src/test.unknown" },
       expected: undefined,
     },
     {
-      name: 'files with no extension',
-      args: { file_path: 'src/test' },
+      name: "files with no extension",
+      args: { file_path: "src/test" },
       expected: undefined,
     },
-  ])('should return $expected when $name', ({ args, expected }) => {
+  ])("should return $expected when $name", ({ args, expected }) => {
     const language = getProgrammingLanguage(args);
     expect(language).toBe(expected);
   });
diff --git a/packages/gemini-core/src/telemetry/telemetry-utils.ts b/packages/gemini-core/src/telemetry/telemetry-utils.ts
index d2a0ffe83..0b2f9c552 100644
--- a/packages/gemini-core/src/telemetry/telemetry-utils.ts
+++ b/packages/gemini-core/src/telemetry/telemetry-utils.ts
@@ -4,13 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
 
-export function getProgrammingLanguage(
-  args: Record<string, unknown>,
-): string | undefined {
-  const filePath = args['file_path'] || args['path'] || args['absolute_path'];
-  if (typeof filePath === 'string') {
+export function getProgrammingLanguage(args: Record<string, unknown>): string | undefined {
+  const filePath = args["file_path"] || args["path"] || args["absolute_path"];
+  if (typeof filePath === "string") {
     return getLanguageFromFilePath(filePath);
   }
   return undefined;
diff --git a/packages/gemini-core/src/telemetry/telemetry.test.ts b/packages/gemini-core/src/telemetry/telemetry.test.ts
index 15bd2e95e..73b9e4ed1 100644
--- a/packages/gemini-core/src/telemetry/telemetry.test.ts
+++ b/packages/gemini-core/src/telemetry/telemetry.test.ts
@@ -4,19 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import {
-  initializeTelemetry,
-  shutdownTelemetry,
-  isTelemetrySdkInitialized,
-} from './sdk.js';
-import { Config } from '../config/config.js';
-import { NodeSDK } from '@opentelemetry/sdk-node';
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { initializeTelemetry, isTelemetrySdkInitialized, shutdownTelemetry } from "./sdk.js";
 
-vi.mock('@opentelemetry/sdk-node');
-vi.mock('../config/config.js');
+vi.mock("@opentelemetry/sdk-node");
+vi.mock("../config/config.js");
 
-describe('telemetry', () => {
+describe("telemetry", () => {
   let mockConfig: Config;
   let mockNodeSdk: NodeSDK;
 
@@ -24,17 +20,15 @@ describe('telemetry', () => {
     vi.resetAllMocks();
 
     mockConfig = new Config({
-      sessionId: 'test-session-id',
-      model: 'test-model',
-      targetDir: '/test/dir',
+      sessionId: "test-session-id",
+      model: "test-model",
+      targetDir: "/test/dir",
       debugMode: false,
-      cwd: '/test/dir',
+      cwd: "/test/dir",
     });
-    vi.spyOn(mockConfig, 'getTelemetryEnabled').mockReturnValue(true);
-    vi.spyOn(mockConfig, 'getTelemetryOtlpEndpoint').mockReturnValue(
-      'http://localhost:4317',
-    );
-    vi.spyOn(mockConfig, 'getSessionId').mockReturnValue('test-session-id');
+    vi.spyOn(mockConfig, "getTelemetryEnabled").mockReturnValue(true);
+    vi.spyOn(mockConfig, "getTelemetryOtlpEndpoint").mockReturnValue("http://localhost:4317");
+    vi.spyOn(mockConfig, "getSessionId").mockReturnValue("test-session-id");
     mockNodeSdk = {
       start: vi.fn(),
       shutdown: vi.fn().mockResolvedValue(undefined),
@@ -49,13 +43,13 @@ describe('telemetry', () => {
     }
   });
 
-  it('should initialize the telemetry service', () => {
+  it("should initialize the telemetry service", () => {
     initializeTelemetry(mockConfig);
     expect(NodeSDK).toHaveBeenCalled();
     expect(mockNodeSdk.start).toHaveBeenCalled();
   });
 
-  it('should shutdown the telemetry service', async () => {
+  it("should shutdown the telemetry service", async () => {
     initializeTelemetry(mockConfig);
     await shutdownTelemetry(mockConfig);
 
diff --git a/packages/gemini-core/src/telemetry/telemetryAttributes.ts b/packages/gemini-core/src/telemetry/telemetryAttributes.ts
index 83593021f..87355305c 100644
--- a/packages/gemini-core/src/telemetry/telemetryAttributes.ts
+++ b/packages/gemini-core/src/telemetry/telemetryAttributes.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Attributes } from '@opentelemetry/api';
-import type { Config } from '../config/config.js';
-import { InstallationManager } from '../utils/installationManager.js';
-import { UserAccountManager } from '../utils/userAccountManager.js';
+import type { Attributes } from "@opentelemetry/api";
+import type { Config } from "../config/config.js";
+import { InstallationManager } from "../utils/installationManager.js";
+import { UserAccountManager } from "../utils/userAccountManager.js";
 
 const userAccountManager = new UserAccountManager();
 const installationManager = new InstallationManager();
@@ -15,9 +15,9 @@ const installationManager = new InstallationManager();
 export function getCommonAttributes(config: Config): Attributes {
   const email = userAccountManager.getCachedGoogleAccount();
   return {
-    'session.id': config.getSessionId(),
-    'installation.id': installationManager.getInstallationId(),
+    "session.id": config.getSessionId(),
+    "installation.id": installationManager.getInstallationId(),
     interactive: config.isInteractive(),
-    ...(email && { 'user.email': email }),
+    ...(email && { "user.email": email }),
   };
 }
diff --git a/packages/gemini-core/src/telemetry/tool-call-decision.ts b/packages/gemini-core/src/telemetry/tool-call-decision.ts
index 167df10a3..b71c5aeba 100644
--- a/packages/gemini-core/src/telemetry/tool-call-decision.ts
+++ b/packages/gemini-core/src/telemetry/tool-call-decision.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ToolConfirmationOutcome } from '../tools/tools.js';
+import { ToolConfirmationOutcome } from "../tools/tools.js";
 
 export enum ToolCallDecision {
-  ACCEPT = 'accept',
-  REJECT = 'reject',
-  MODIFY = 'modify',
-  AUTO_ACCEPT = 'auto_accept',
+  ACCEPT = "accept",
+  REJECT = "reject",
+  MODIFY = "modify",
+  AUTO_ACCEPT = "auto_accept",
 }
 
-export function getDecisionFromOutcome(
-  outcome: ToolConfirmationOutcome,
-): ToolCallDecision {
+export function getDecisionFromOutcome(outcome: ToolConfirmationOutcome): ToolCallDecision {
   switch (outcome) {
     case ToolConfirmationOutcome.ProceedOnce:
       return ToolCallDecision.ACCEPT;
diff --git a/packages/gemini-core/src/telemetry/trace.ts b/packages/gemini-core/src/telemetry/trace.ts
index 6b4feda38..6405be214 100644
--- a/packages/gemini-core/src/telemetry/trace.ts
+++ b/packages/gemini-core/src/telemetry/trace.ts
@@ -5,16 +5,16 @@
  */
 
 import {
+  type AttributeValue,
   diag,
+  type SpanOptions,
   SpanStatusCode,
   trace,
-  type AttributeValue,
-  type SpanOptions,
-} from '@opentelemetry/api';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+} from "@opentelemetry/api";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
 
-const TRACER_NAME = 'gemini-cli';
-const TRACER_VERSION = 'v1';
+const TRACER_NAME = "gemini-cli";
+const TRACER_VERSION = "v1";
 
 /**
  * Metadata for a span.
@@ -52,15 +52,10 @@ export interface SpanMetadata {
  */
 export async function runInDevTraceSpan<R>(
   opts: SpanOptions & { name: string; noAutoEnd?: boolean },
-  fn: ({
-    metadata,
-  }: {
-    metadata: SpanMetadata;
-    endSpan: () => void;
-  }) => Promise<R>,
+  fn: ({ metadata }: { metadata: SpanMetadata; endSpan: () => void }) => Promise<R>,
 ): Promise<R> {
   const { name: spanName, noAutoEnd, ...restOfSpanOpts } = opts;
-  if (process.env['GEMINI_DEV_TRACING'] !== 'true') {
+  if (process.env["GEMINI_DEV_TRACING"] !== "true") {
     // If GEMINI_DEV_TRACING env var not set, we do not trace.
     return await fn({
       metadata: {
@@ -74,66 +69,62 @@ export async function runInDevTraceSpan<R>(
   }
 
   const tracer = trace.getTracer(TRACER_NAME, TRACER_VERSION);
-  return await tracer.startActiveSpan(
-    opts.name,
-    restOfSpanOpts,
-    async (span) => {
-      const meta: SpanMetadata = {
-        name: spanName,
-        attributes: {},
-      };
-      const endSpan = () => {
-        try {
-          if (meta.input !== undefined) {
-            span.setAttribute('input-json', safeJsonStringify(meta.input));
-          }
-          if (meta.output !== undefined) {
-            span.setAttribute('output-json', safeJsonStringify(meta.output));
-          }
-          for (const [key, value] of Object.entries(meta.attributes)) {
-            span.setAttribute(key, value as AttributeValue);
-          }
-          if (meta.error) {
-            span.setStatus({
-              code: SpanStatusCode.ERROR,
-              message: getErrorMessage(meta.error),
-            });
-            if (meta.error instanceof Error) {
-              span.recordException(meta.error);
-            }
-          } else {
-            span.setStatus({ code: SpanStatusCode.OK });
-          }
-        } catch (e) {
-          // Log the error but don't rethrow, to ensure span.end() is called.
-          diag.error('Error setting span attributes in endSpan', e);
+  return await tracer.startActiveSpan(opts.name, restOfSpanOpts, async (span) => {
+    const meta: SpanMetadata = {
+      name: spanName,
+      attributes: {},
+    };
+    const endSpan = () => {
+      try {
+        if (meta.input !== undefined) {
+          span.setAttribute("input-json", safeJsonStringify(meta.input));
+        }
+        if (meta.output !== undefined) {
+          span.setAttribute("output-json", safeJsonStringify(meta.output));
+        }
+        for (const [key, value] of Object.entries(meta.attributes)) {
+          span.setAttribute(key, value as AttributeValue);
+        }
+        if (meta.error) {
           span.setStatus({
             code: SpanStatusCode.ERROR,
-            message: `Error in endSpan: ${getErrorMessage(e)}`,
+            message: getErrorMessage(meta.error),
           });
-        } finally {
-          span.end();
+          if (meta.error instanceof Error) {
+            span.recordException(meta.error);
+          }
+        } else {
+          span.setStatus({ code: SpanStatusCode.OK });
         }
-      };
-      try {
-        return 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();
-        }
-        throw e;
+        // Log the error but don't rethrow, to ensure span.end() is called.
+        diag.error("Error setting span attributes in endSpan", e);
+        span.setStatus({
+          code: SpanStatusCode.ERROR,
+          message: `Error in endSpan: ${getErrorMessage(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();
-        }
+        span.end();
+      }
+    };
+    try {
+      return 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();
+      }
+      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();
       }
-    },
-  );
+    }
+  });
 }
 
 /**
@@ -146,7 +137,7 @@ function getErrorMessage(e: unknown): string {
   if (e instanceof Error) {
     return e.message;
   }
-  if (typeof e === 'string') {
+  if (typeof e === "string") {
     return e;
   }
   return safeJsonStringify(e);
diff --git a/packages/gemini-core/src/telemetry/types.ts b/packages/gemini-core/src/telemetry/types.ts
index 790a84c33..fec25ec33 100644
--- a/packages/gemini-core/src/telemetry/types.ts
+++ b/packages/gemini-core/src/telemetry/types.ts
@@ -9,48 +9,45 @@ import type {
   Content,
   GenerateContentConfig,
   GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import type { Config } from '../config/config.js';
-import type { ApprovalMode } from '../policy/types.js';
-
-import type { CompletedToolCall } from '../core/coreToolScheduler.js';
-import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
-import type { FileDiff } from '../tools/tools.js';
-import { AuthType } from '../core/contentGenerator.js';
-import type { LogAttributes, LogRecord } from '@opentelemetry/api-logs';
-import {
-  getDecisionFromOutcome,
-  ToolCallDecision,
-} from './tool-call-decision.js';
-import { getConventionAttributes, type FileOperation } from './metrics.js';
+} from "@google/genai";
+import type { LogAttributes, LogRecord } from "@opentelemetry/api-logs";
+import type { Config } from "../config/config.js";
+import { AuthType } from "../core/contentGenerator.js";
+import type { CompletedToolCall } from "../core/coreToolScheduler.js";
+import type { ApprovalMode } from "../policy/types.js";
+import { DiscoveredMCPTool } from "../tools/mcp-tool.js";
+import type { FileDiff } from "../tools/tools.js";
+import { type FileOperation, getConventionAttributes } from "./metrics.js";
+import { getDecisionFromOutcome, ToolCallDecision } from "./tool-call-decision.js";
+
 export { ToolCallDecision };
-import type { ToolRegistry } from '../tools/tool-registry.js';
-import type { OutputFormat } from '../output/types.js';
-import type { AgentTerminateMode } from '../agents/types.js';
 
-import { getCommonAttributes } from './telemetryAttributes.js';
-import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+import { SemanticAttributes } from "@opentelemetry/semantic-conventions";
+import type { AgentTerminateMode } from "../agents/types.js";
+import type { OutputFormat } from "../output/types.js";
+import type { ToolRegistry } from "../tools/tool-registry.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
 import {
+  toFinishReasons,
   toInputMessages,
   toOutputMessages,
-  toFinishReasons,
   toOutputType,
   toSystemInstruction,
-} from './semantic.js';
+} from "./semantic.js";
+import { getCommonAttributes } from "./telemetryAttributes.js";
 
 export interface BaseTelemetryEvent {
-  'event.name': string;
+  "event.name": string;
   /** Current timestamp in ISO 8601 format */
-  'event.timestamp': string;
+  "event.timestamp": string;
 }
 
 type CommonFields = keyof BaseTelemetryEvent;
 
-export const EVENT_CLI_CONFIG = 'gemini_cli.config';
+export const EVENT_CLI_CONFIG = "gemini_cli.config";
 export class StartSessionEvent implements BaseTelemetryEvent {
-  'event.name': 'cli_config';
-  'event.timestamp': string;
+  "event.name": "cli_config";
+  "event.timestamp": string;
   model: string;
   embedding_model: string;
   sandbox_enabled: boolean;
@@ -74,8 +71,7 @@ export class StartSessionEvent implements BaseTelemetryEvent {
 
   constructor(config: Config, toolRegistry?: ToolRegistry) {
     const generatorConfig = config.getContentGeneratorConfig();
-    const mcpServers =
-      config.getMcpClientManager()?.getMcpServers() ?? config.getMcpServers();
+    const mcpServers = config.getMcpClientManager()?.getMcpServers() ?? config.getMcpServers();
 
     let useGemini = false;
     let useVertex = false;
@@ -84,46 +80,41 @@ export class StartSessionEvent implements BaseTelemetryEvent {
       useVertex = generatorConfig.authType === AuthType.USE_VERTEX_AI;
     }
 
-    this['event.name'] = 'cli_config';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "cli_config";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = config.getModel();
     this.embedding_model = config.getEmbeddingModel();
-    this.sandbox_enabled =
-      typeof config.getSandbox() === 'string' || !!config.getSandbox();
-    this.core_tools_enabled = (config.getCoreTools() ?? []).join(',');
+    this.sandbox_enabled = typeof config.getSandbox() === "string" || !!config.getSandbox();
+    this.core_tools_enabled = (config.getCoreTools() ?? []).join(",");
     this.approval_mode = config.getApprovalMode();
     this.api_key_enabled = useGemini || useVertex;
     this.vertex_ai_enabled = useVertex;
     this.debug_enabled = config.getDebugMode();
-    this.mcp_servers = mcpServers ? Object.keys(mcpServers).join(',') : '';
+    this.mcp_servers = mcpServers ? Object.keys(mcpServers).join(",") : "";
     this.telemetry_enabled = config.getTelemetryEnabled();
-    this.telemetry_log_user_prompts_enabled =
-      config.getTelemetryLogPromptsEnabled();
-    this.file_filtering_respect_git_ignore =
-      config.getFileFilteringRespectGitIgnore();
+    this.telemetry_log_user_prompts_enabled = config.getTelemetryLogPromptsEnabled();
+    this.file_filtering_respect_git_ignore = config.getFileFilteringRespectGitIgnore();
     this.mcp_servers_count = mcpServers ? Object.keys(mcpServers).length : 0;
     this.output_format = config.getOutputFormat();
     const extensions = config.getExtensions();
     this.extensions_count = extensions.length;
-    this.extensions = extensions.map((e) => e.name).join(',');
-    this.extension_ids = extensions.map((e) => e.id).join(',');
+    this.extensions = extensions.map((e) => e.name).join(",");
+    this.extension_ids = extensions.map((e) => e.id).join(",");
     this.auth_type = generatorConfig?.authType;
     if (toolRegistry) {
       const mcpTools = toolRegistry
         .getAllTools()
         .filter((tool) => tool instanceof DiscoveredMCPTool);
       this.mcp_tools_count = mcpTools.length;
-      this.mcp_tools = mcpTools
-        .map((tool) => (tool as DiscoveredMCPTool).name)
-        .join(',');
+      this.mcp_tools = mcpTools.map((tool) => (tool as DiscoveredMCPTool).name).join(",");
     }
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CLI_CONFIG,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CLI_CONFIG,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
       embedding_model: this.embedding_model,
       sandbox_enabled: this.sandbox_enabled,
@@ -147,52 +138,47 @@ export class StartSessionEvent implements BaseTelemetryEvent {
   }
 
   toLogBody(): string {
-    return 'CLI configuration loaded.';
+    return "CLI configuration loaded.";
   }
 }
 
 export class EndSessionEvent implements BaseTelemetryEvent {
-  'event.name': 'end_session';
-  'event.timestamp': string;
+  "event.name": "end_session";
+  "event.timestamp": string;
   session_id?: string;
 
   constructor(config?: Config) {
-    this['event.name'] = 'end_session';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "end_session";
+    this["event.timestamp"] = new Date().toISOString();
     this.session_id = config?.getSessionId();
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': this['event.name'],
-      'event.timestamp': this['event.timestamp'],
+      "event.name": this["event.name"],
+      "event.timestamp": this["event.timestamp"],
       session_id: this.session_id,
     };
   }
 
   toLogBody(): string {
-    return 'Session ended.';
+    return "Session ended.";
   }
 }
 
-export const EVENT_USER_PROMPT = 'gemini_cli.user_prompt';
+export const EVENT_USER_PROMPT = "gemini_cli.user_prompt";
 export class UserPromptEvent implements BaseTelemetryEvent {
-  'event.name': 'user_prompt';
-  'event.timestamp': string;
+  "event.name": "user_prompt";
+  "event.timestamp": string;
   prompt_length: number;
   prompt_id: string;
   auth_type?: string;
   prompt?: string;
 
-  constructor(
-    prompt_length: number,
-    prompt_Id: string,
-    auth_type?: string,
-    prompt?: string,
-  ) {
-    this['event.name'] = 'user_prompt';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(prompt_length: number, prompt_Id: string, auth_type?: string, prompt?: string) {
+    this["event.name"] = "user_prompt";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_length = prompt_length;
     this.prompt_id = prompt_Id;
     this.auth_type = auth_type;
@@ -202,18 +188,18 @@ export class UserPromptEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_USER_PROMPT,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_USER_PROMPT,
+      "event.timestamp": this["event.timestamp"],
       prompt_length: this.prompt_length,
       prompt_id: this.prompt_id,
     };
 
     if (this.auth_type) {
-      attributes['auth_type'] = this.auth_type;
+      attributes["auth_type"] = this.auth_type;
     }
 
     if (config.getTelemetryLogPromptsEnabled()) {
-      attributes['prompt'] = this.prompt;
+      attributes["prompt"] = this.prompt;
     }
     return attributes;
   }
@@ -223,10 +209,10 @@ export class UserPromptEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_TOOL_CALL = 'gemini_cli.tool_call';
+export const EVENT_TOOL_CALL = "gemini_cli.tool_call";
 export class ToolCallEvent implements BaseTelemetryEvent {
-  'event.name': 'tool_call';
-  'event.timestamp': string;
+  "event.name": "tool_call";
+  "event.timestamp": string;
   function_name: string;
   function_args: Record<string, unknown>;
   duration_ms: number;
@@ -235,7 +221,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
   error?: string;
   error_type?: string;
   prompt_id: string;
-  tool_type: 'native' | 'mcp';
+  tool_type: "native" | "mcp";
   content_length?: number;
   mcp_server_name?: string;
   extension_name?: string;
@@ -251,7 +237,7 @@ export class ToolCallEvent implements BaseTelemetryEvent {
     duration_ms: number,
     success: boolean,
     prompt_id: string,
-    tool_type: 'native' | 'mcp',
+    tool_type: "native" | "mcp",
     error?: string,
   );
   constructor(
@@ -261,41 +247,36 @@ export class ToolCallEvent implements BaseTelemetryEvent {
     duration_ms?: number,
     success?: boolean,
     prompt_id?: string,
-    tool_type?: 'native' | 'mcp',
+    tool_type?: "native" | "mcp",
     error?: string,
   ) {
-    this['event.name'] = 'tool_call';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "tool_call";
+    this["event.timestamp"] = new Date().toISOString();
 
     if (call) {
       this.function_name = call.request.name;
       this.function_args = call.request.args;
       this.duration_ms = call.durationMs ?? 0;
-      this.success = call.status === 'success';
-      this.decision = call.outcome
-        ? getDecisionFromOutcome(call.outcome)
-        : undefined;
+      this.success = call.status === "success";
+      this.decision = call.outcome ? getDecisionFromOutcome(call.outcome) : undefined;
       this.error = call.response.error?.message;
       this.error_type = call.response.errorType;
       this.prompt_id = call.request.prompt_id;
       this.content_length = call.response.contentLength;
-      if (
-        typeof call.tool !== 'undefined' &&
-        call.tool instanceof DiscoveredMCPTool
-      ) {
-        this.tool_type = 'mcp';
+      if (typeof call.tool !== "undefined" && call.tool instanceof DiscoveredMCPTool) {
+        this.tool_type = "mcp";
         this.mcp_server_name = call.tool.serverName;
         this.extension_name = call.tool.extensionName;
         this.extension_id = call.tool.extensionId;
       } else {
-        this.tool_type = 'native';
+        this.tool_type = "native";
       }
 
       if (
-        call.status === 'success' &&
-        typeof call.response.resultDisplay === 'object' &&
+        call.status === "success" &&
+        typeof call.response.resultDisplay === "object" &&
         call.response.resultDisplay !== null &&
-        'diffStat' in call.response.resultDisplay
+        "diffStat" in call.response.resultDisplay
       ) {
         const diffStat = (call.response.resultDisplay as FileDiff).diffStat;
         if (diffStat) {
@@ -325,8 +306,8 @@ export class ToolCallEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_TOOL_CALL,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_TOOL_CALL,
+      "event.timestamp": this["event.timestamp"],
       function_name: this.function_name,
       function_args: safeJsonStringify(this.function_args, 2),
       duration_ms: this.duration_ms,
@@ -342,32 +323,32 @@ export class ToolCallEvent implements BaseTelemetryEvent {
     };
 
     if (this.error) {
-      attributes['error'] = this.error;
-      attributes['error.message'] = this.error;
+      attributes["error"] = this.error;
+      attributes["error.message"] = this.error;
       if (this.error_type) {
-        attributes['error_type'] = this.error_type;
-        attributes['error.type'] = this.error_type;
+        attributes["error_type"] = this.error_type;
+        attributes["error.type"] = this.error_type;
       }
     }
     return attributes;
   }
 
   toLogBody(): string {
-    return `Tool call: ${this.function_name}${this.decision ? `. Decision: ${this.decision}` : ''}. Success: ${this.success}. Duration: ${this.duration_ms}ms.`;
+    return `Tool call: ${this.function_name}${this.decision ? `. Decision: ${this.decision}` : ""}. Success: ${this.success}. Duration: ${this.duration_ms}ms.`;
   }
 }
 
-export const EVENT_API_REQUEST = 'gemini_cli.api_request';
+export const EVENT_API_REQUEST = "gemini_cli.api_request";
 export class ApiRequestEvent implements BaseTelemetryEvent {
-  'event.name': 'api_request';
-  'event.timestamp': string;
+  "event.name": "api_request";
+  "event.timestamp": string;
   model: string;
   prompt_id: string;
   request_text?: string;
 
   constructor(model: string, prompt_id: string, request_text?: string) {
-    this['event.name'] = 'api_request';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_request";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
     this.prompt_id = prompt_id;
     this.request_text = request_text;
@@ -376,8 +357,8 @@ export class ApiRequestEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_API_REQUEST,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_API_REQUEST,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
       prompt_id: this.prompt_id,
       request_text: this.request_text,
@@ -389,10 +370,10 @@ export class ApiRequestEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_API_ERROR = 'gemini_cli.api_error';
+export const EVENT_API_ERROR = "gemini_cli.api_error";
 export class ApiErrorEvent implements BaseTelemetryEvent {
-  'event.name': 'api_error';
-  'event.timestamp': string;
+  "event.name": "api_error";
+  "event.timestamp": string;
   model: string;
   prompt: GenAIPromptDetails;
   error: string;
@@ -410,8 +391,8 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
     error_type?: string,
     status_code?: number | string,
   ) {
-    this['event.name'] = 'api_error';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_error";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
     this.error = error;
     this.error_type = error_type;
@@ -424,9 +405,9 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
   toLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_API_ERROR,
-      'event.timestamp': this['event.timestamp'],
-      ['error.message']: this.error,
+      "event.name": EVENT_API_ERROR,
+      "event.timestamp": this["event.timestamp"],
+      ["error.message"]: this.error,
       model_name: this.model,
       duration: this.duration_ms,
       model: this.model,
@@ -438,9 +419,9 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
     };
 
     if (this.error_type) {
-      attributes['error.type'] = this.error_type;
+      attributes["error.type"] = this.error_type;
     }
-    if (typeof this.status_code === 'number') {
+    if (typeof this.status_code === "number") {
       attributes[SemanticAttributes.HTTP_STATUS_CODE] = this.status_code;
     }
     const logRecord: LogRecord = {
@@ -453,21 +434,19 @@ export class ApiErrorEvent implements BaseTelemetryEvent {
   toSemanticLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_GEN_AI_OPERATION_DETAILS,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_GEN_AI_OPERATION_DETAILS,
+      "event.timestamp": this["event.timestamp"],
       ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
       ...getConventionAttributes(this),
     };
 
     if (this.prompt.server) {
-      attributes['server.address'] = this.prompt.server.address;
-      attributes['server.port'] = this.prompt.server.port;
+      attributes["server.address"] = this.prompt.server.address;
+      attributes["server.port"] = this.prompt.server.port;
     }
 
     if (config.getTelemetryLogPromptsEnabled() && this.prompt.contents) {
-      attributes['gen_ai.input.messages'] = JSON.stringify(
-        toInputMessages(this.prompt.contents),
-      );
+      attributes["gen_ai.input.messages"] = JSON.stringify(toInputMessages(this.prompt.contents));
     }
 
     const logRecord: LogRecord = {
@@ -505,36 +484,31 @@ export interface GenAIUsageDetails {
   total_token_count: number;
 }
 
-export const EVENT_API_RESPONSE = 'gemini_cli.api_response';
-export const EVENT_GEN_AI_OPERATION_DETAILS =
-  'gen_ai.client.inference.operation.details';
+export const EVENT_API_RESPONSE = "gemini_cli.api_response";
+export const EVENT_GEN_AI_OPERATION_DETAILS = "gen_ai.client.inference.operation.details";
 
-function toGenerateContentConfigAttributes(
-  config?: GenerateContentConfig,
-): LogAttributes {
+function toGenerateContentConfigAttributes(config?: GenerateContentConfig): LogAttributes {
   if (!config) {
     return {};
   }
   return {
-    'gen_ai.request.temperature': config.temperature,
-    'gen_ai.request.top_p': config.topP,
-    'gen_ai.request.top_k': config.topK,
-    'gen_ai.request.choice.count': config.candidateCount,
-    'gen_ai.request.seed': config.seed,
-    'gen_ai.request.frequency_penalty': config.frequencyPenalty,
-    'gen_ai.request.presence_penalty': config.presencePenalty,
-    'gen_ai.request.max_tokens': config.maxOutputTokens,
-    'gen_ai.output.type': toOutputType(config.responseMimeType),
-    'gen_ai.request.stop_sequences': config.stopSequences,
-    'gen_ai.system_instructions': JSON.stringify(
-      toSystemInstruction(config.systemInstruction),
-    ),
+    "gen_ai.request.temperature": config.temperature,
+    "gen_ai.request.top_p": config.topP,
+    "gen_ai.request.top_k": config.topK,
+    "gen_ai.request.choice.count": config.candidateCount,
+    "gen_ai.request.seed": config.seed,
+    "gen_ai.request.frequency_penalty": config.frequencyPenalty,
+    "gen_ai.request.presence_penalty": config.presencePenalty,
+    "gen_ai.request.max_tokens": config.maxOutputTokens,
+    "gen_ai.output.type": toOutputType(config.responseMimeType),
+    "gen_ai.request.stop_sequences": config.stopSequences,
+    "gen_ai.system_instructions": JSON.stringify(toSystemInstruction(config.systemInstruction)),
   };
 }
 
 export class ApiResponseEvent implements BaseTelemetryEvent {
-  'event.name': 'api_response';
-  'event.timestamp': string;
+  "event.name": "api_response";
+  "event.timestamp": string;
   status_code?: number | string;
   duration_ms: number;
   response_text?: string;
@@ -554,8 +528,8 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
     usage_data?: GenerateContentResponseUsageMetadata,
     response_text?: string,
   ) {
-    this['event.name'] = 'api_response';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "api_response";
+    this["event.timestamp"] = new Date().toISOString();
     this.duration_ms = duration_ms;
     this.status_code = 200;
     this.response_text = response_text;
@@ -577,8 +551,8 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
   toLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_API_RESPONSE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_API_RESPONSE,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
       duration_ms: this.duration_ms,
       input_token_count: this.usage.input_token_count,
@@ -592,15 +566,15 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
       status_code: this.status_code,
     };
     if (this.response_text) {
-      attributes['response_text'] = this.response_text;
+      attributes["response_text"] = this.response_text;
     }
     if (this.status_code) {
-      if (typeof this.status_code === 'number') {
+      if (typeof this.status_code === "number") {
         attributes[SemanticAttributes.HTTP_STATUS_CODE] = this.status_code;
       }
     }
     const logRecord: LogRecord = {
-      body: `API response from ${this.model}. Status: ${this.status_code || 'N/A'}. Duration: ${this.duration_ms}ms.`,
+      body: `API response from ${this.model}. Status: ${this.status_code || "N/A"}. Duration: ${this.duration_ms}ms.`,
       attributes,
     };
     return logRecord;
@@ -609,37 +583,31 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
   toSemanticLogRecord(config: Config): LogRecord {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_GEN_AI_OPERATION_DETAILS,
-      'event.timestamp': this['event.timestamp'],
-      'gen_ai.response.id': this.response.response_id,
-      'gen_ai.response.finish_reasons': toFinishReasons(
-        this.response.candidates,
-      ),
-      'gen_ai.output.messages': JSON.stringify(
-        toOutputMessages(this.response.candidates),
-      ),
+      "event.name": EVENT_GEN_AI_OPERATION_DETAILS,
+      "event.timestamp": this["event.timestamp"],
+      "gen_ai.response.id": this.response.response_id,
+      "gen_ai.response.finish_reasons": toFinishReasons(this.response.candidates),
+      "gen_ai.output.messages": JSON.stringify(toOutputMessages(this.response.candidates)),
       ...toGenerateContentConfigAttributes(this.prompt.generate_content_config),
       ...getConventionAttributes(this),
     };
 
     if (this.prompt.server) {
-      attributes['server.address'] = this.prompt.server.address;
-      attributes['server.port'] = this.prompt.server.port;
+      attributes["server.address"] = this.prompt.server.address;
+      attributes["server.port"] = this.prompt.server.port;
     }
 
     if (config.getTelemetryLogPromptsEnabled() && this.prompt.contents) {
-      attributes['gen_ai.input.messages'] = JSON.stringify(
-        toInputMessages(this.prompt.contents),
-      );
+      attributes["gen_ai.input.messages"] = JSON.stringify(toInputMessages(this.prompt.contents));
     }
 
     if (this.usage) {
-      attributes['gen_ai.usage.input_tokens'] = this.usage.input_token_count;
-      attributes['gen_ai.usage.output_tokens'] = this.usage.output_token_count;
+      attributes["gen_ai.usage.input_tokens"] = this.usage.input_token_count;
+      attributes["gen_ai.usage.output_tokens"] = this.usage.output_token_count;
     }
 
     const logRecord: LogRecord = {
-      body: `GenAI operation details from ${this.model}. Status: ${this.status_code || 'N/A'}. Duration: ${this.duration_ms}ms.`,
+      body: `GenAI operation details from ${this.model}. Status: ${this.status_code || "N/A"}. Duration: ${this.duration_ms}ms.`,
       attributes,
     };
 
@@ -647,23 +615,23 @@ export class ApiResponseEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_FLASH_FALLBACK = 'gemini_cli.flash_fallback';
+export const EVENT_FLASH_FALLBACK = "gemini_cli.flash_fallback";
 export class FlashFallbackEvent implements BaseTelemetryEvent {
-  'event.name': 'flash_fallback';
-  'event.timestamp': string;
+  "event.name": "flash_fallback";
+  "event.timestamp": string;
   auth_type: string;
 
   constructor(auth_type: string) {
-    this['event.name'] = 'flash_fallback';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "flash_fallback";
+    this["event.timestamp"] = new Date().toISOString();
     this.auth_type = auth_type;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_FLASH_FALLBACK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_FLASH_FALLBACK,
+      "event.timestamp": this["event.timestamp"],
       auth_type: this.auth_type,
     };
   }
@@ -673,21 +641,21 @@ export class FlashFallbackEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_RIPGREP_FALLBACK = 'gemini_cli.ripgrep_fallback';
+export const EVENT_RIPGREP_FALLBACK = "gemini_cli.ripgrep_fallback";
 export class RipgrepFallbackEvent implements BaseTelemetryEvent {
-  'event.name': 'ripgrep_fallback';
-  'event.timestamp': string;
+  "event.name": "ripgrep_fallback";
+  "event.timestamp": string;
 
   constructor(public error?: string) {
-    this['event.name'] = 'ripgrep_fallback';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "ripgrep_fallback";
+    this["event.timestamp"] = new Date().toISOString();
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_RIPGREP_FALLBACK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_RIPGREP_FALLBACK,
+      "event.timestamp": this["event.timestamp"],
       error: this.error,
     };
   }
@@ -698,25 +666,21 @@ export class RipgrepFallbackEvent implements BaseTelemetryEvent {
 }
 
 export enum LoopType {
-  CONSECUTIVE_IDENTICAL_TOOL_CALLS = 'consecutive_identical_tool_calls',
-  CHANTING_IDENTICAL_SENTENCES = 'chanting_identical_sentences',
-  LLM_DETECTED_LOOP = 'llm_detected_loop',
+  CONSECUTIVE_IDENTICAL_TOOL_CALLS = "consecutive_identical_tool_calls",
+  CHANTING_IDENTICAL_SENTENCES = "chanting_identical_sentences",
+  LLM_DETECTED_LOOP = "llm_detected_loop",
 }
 
 export class LoopDetectedEvent implements BaseTelemetryEvent {
-  'event.name': 'loop_detected';
-  'event.timestamp': string;
+  "event.name": "loop_detected";
+  "event.timestamp": string;
   loop_type: LoopType;
   prompt_id: string;
   confirmed_by_model?: string;
 
-  constructor(
-    loop_type: LoopType,
-    prompt_id: string,
-    confirmed_by_model?: string,
-  ) {
-    this['event.name'] = 'loop_detected';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(loop_type: LoopType, prompt_id: string, confirmed_by_model?: string) {
+    this["event.name"] = "loop_detected";
+    this["event.timestamp"] = new Date().toISOString();
     this.loop_type = loop_type;
     this.prompt_id = prompt_id;
     this.confirmed_by_model = confirmed_by_model;
@@ -725,40 +689,40 @@ export class LoopDetectedEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': this['event.name'],
-      'event.timestamp': this['event.timestamp'],
+      "event.name": this["event.name"],
+      "event.timestamp": this["event.timestamp"],
       loop_type: this.loop_type,
       prompt_id: this.prompt_id,
     };
 
     if (this.confirmed_by_model) {
-      attributes['confirmed_by_model'] = this.confirmed_by_model;
+      attributes["confirmed_by_model"] = this.confirmed_by_model;
     }
 
     return attributes;
   }
 
   toLogBody(): string {
-    return `Loop detected. Type: ${this.loop_type}.${this.confirmed_by_model ? ` Confirmed by: ${this.confirmed_by_model}` : ''}`;
+    return `Loop detected. Type: ${this.loop_type}.${this.confirmed_by_model ? ` Confirmed by: ${this.confirmed_by_model}` : ""}`;
   }
 }
 
 export class LoopDetectionDisabledEvent implements BaseTelemetryEvent {
-  'event.name': 'loop_detection_disabled';
-  'event.timestamp': string;
+  "event.name": "loop_detection_disabled";
+  "event.timestamp": string;
   prompt_id: string;
 
   constructor(prompt_id: string) {
-    this['event.name'] = 'loop_detection_disabled';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "loop_detection_disabled";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': this['event.name'],
-      'event.timestamp': this['event.timestamp'],
+      "event.name": this["event.name"],
+      "event.timestamp": this["event.timestamp"],
       prompt_id: this.prompt_id,
     };
   }
@@ -768,17 +732,17 @@ export class LoopDetectionDisabledEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_NEXT_SPEAKER_CHECK = 'gemini_cli.next_speaker_check';
+export const EVENT_NEXT_SPEAKER_CHECK = "gemini_cli.next_speaker_check";
 export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
-  'event.name': 'next_speaker_check';
-  'event.timestamp': string;
+  "event.name": "next_speaker_check";
+  "event.timestamp": string;
   prompt_id: string;
   finish_reason: string;
   result: string;
 
   constructor(prompt_id: string, finish_reason: string, result: string) {
-    this['event.name'] = 'next_speaker_check';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "next_speaker_check";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
     this.finish_reason = finish_reason;
     this.result = result;
@@ -787,8 +751,8 @@ export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_NEXT_SPEAKER_CHECK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_NEXT_SPEAKER_CHECK,
+      "event.timestamp": this["event.timestamp"],
       prompt_id: this.prompt_id,
       finish_reason: this.finish_reason,
       result: this.result,
@@ -800,10 +764,10 @@ export class NextSpeakerCheckEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_SLASH_COMMAND = 'gemini_cli.slash_command';
+export const EVENT_SLASH_COMMAND = "gemini_cli.slash_command";
 export interface SlashCommandEvent extends BaseTelemetryEvent {
-  'event.name': 'slash_command';
-  'event.timestamp': string;
+  "event.name": "slash_command";
+  "event.timestamp": string;
   command: string;
   subcommand?: string;
   status?: SlashCommandStatus;
@@ -819,11 +783,11 @@ export function makeSlashCommandEvent({
   extension_id,
 }: Omit<
   SlashCommandEvent,
-  CommonFields | 'toOpenTelemetryAttributes' | 'toLogBody'
+  CommonFields | "toOpenTelemetryAttributes" | "toLogBody"
 >): SlashCommandEvent {
   return {
-    'event.name': 'slash_command',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "slash_command",
+    "event.timestamp": new Date().toISOString(),
     command,
     subcommand,
     status,
@@ -831,8 +795,8 @@ export function makeSlashCommandEvent({
     toOpenTelemetryAttributes(config: Config): LogAttributes {
       return {
         ...getCommonAttributes(config),
-        'event.name': EVENT_SLASH_COMMAND,
-        'event.timestamp': this['event.timestamp'],
+        "event.name": EVENT_SLASH_COMMAND,
+        "event.timestamp": this["event.timestamp"],
         command: this.command,
         subcommand: this.subcommand,
         status: this.status,
@@ -846,14 +810,14 @@ export function makeSlashCommandEvent({
 }
 
 export enum SlashCommandStatus {
-  SUCCESS = 'success',
-  ERROR = 'error',
+  SUCCESS = "success",
+  ERROR = "error",
 }
 
-export const EVENT_CHAT_COMPRESSION = 'gemini_cli.chat_compression';
+export const EVENT_CHAT_COMPRESSION = "gemini_cli.chat_compression";
 export interface ChatCompressionEvent extends BaseTelemetryEvent {
-  'event.name': 'chat_compression';
-  'event.timestamp': string;
+  "event.name": "chat_compression";
+  "event.timestamp": string;
   tokens_before: number;
   tokens_after: number;
   toOpenTelemetryAttributes(config: Config): LogAttributes;
@@ -865,18 +829,18 @@ export function makeChatCompressionEvent({
   tokens_after,
 }: Omit<
   ChatCompressionEvent,
-  CommonFields | 'toOpenTelemetryAttributes' | 'toLogBody'
+  CommonFields | "toOpenTelemetryAttributes" | "toLogBody"
 >): ChatCompressionEvent {
   return {
-    'event.name': 'chat_compression',
-    'event.timestamp': new Date().toISOString(),
+    "event.name": "chat_compression",
+    "event.timestamp": new Date().toISOString(),
     tokens_before,
     tokens_after,
     toOpenTelemetryAttributes(config: Config): LogAttributes {
       return {
         ...getCommonAttributes(config),
-        'event.name': EVENT_CHAT_COMPRESSION,
-        'event.timestamp': this['event.timestamp'],
+        "event.name": EVENT_CHAT_COMPRESSION,
+        "event.timestamp": this["event.timestamp"],
         tokens_before: this.tokens_before,
         tokens_after: this.tokens_after,
       };
@@ -887,24 +851,23 @@ export function makeChatCompressionEvent({
   };
 }
 
-export const EVENT_MALFORMED_JSON_RESPONSE =
-  'gemini_cli.malformed_json_response';
+export const EVENT_MALFORMED_JSON_RESPONSE = "gemini_cli.malformed_json_response";
 export class MalformedJsonResponseEvent implements BaseTelemetryEvent {
-  'event.name': 'malformed_json_response';
-  'event.timestamp': string;
+  "event.name": "malformed_json_response";
+  "event.timestamp": string;
   model: string;
 
   constructor(model: string) {
-    this['event.name'] = 'malformed_json_response';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "malformed_json_response";
+    this["event.timestamp"] = new Date().toISOString();
     this.model = model;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_MALFORMED_JSON_RESPONSE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_MALFORMED_JSON_RESPONSE,
+      "event.timestamp": this["event.timestamp"],
       model: this.model,
     };
   }
@@ -915,27 +878,27 @@ export class MalformedJsonResponseEvent implements BaseTelemetryEvent {
 }
 
 export enum IdeConnectionType {
-  START = 'start',
-  SESSION = 'session',
+  START = "start",
+  SESSION = "session",
 }
 
-export const EVENT_IDE_CONNECTION = 'gemini_cli.ide_connection';
+export const EVENT_IDE_CONNECTION = "gemini_cli.ide_connection";
 export class IdeConnectionEvent {
-  'event.name': 'ide_connection';
-  'event.timestamp': string;
+  "event.name": "ide_connection";
+  "event.timestamp": string;
   connection_type: IdeConnectionType;
 
   constructor(connection_type: IdeConnectionType) {
-    this['event.name'] = 'ide_connection';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "ide_connection";
+    this["event.timestamp"] = new Date().toISOString();
     this.connection_type = connection_type;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_IDE_CONNECTION,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_IDE_CONNECTION,
+      "event.timestamp": this["event.timestamp"],
       connection_type: this.connection_type,
     };
   }
@@ -945,16 +908,16 @@ export class IdeConnectionEvent {
   }
 }
 
-export const EVENT_CONVERSATION_FINISHED = 'gemini_cli.conversation_finished';
+export const EVENT_CONVERSATION_FINISHED = "gemini_cli.conversation_finished";
 export class ConversationFinishedEvent {
-  'event_name': 'conversation_finished';
-  'event.timestamp': string; // ISO 8601;
+  event_name: "conversation_finished";
+  "event.timestamp": string; // ISO 8601;
   approvalMode: ApprovalMode;
   turnCount: number;
 
   constructor(approvalMode: ApprovalMode, turnCount: number) {
-    this['event_name'] = 'conversation_finished';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event_name"] = "conversation_finished";
+    this["event.timestamp"] = new Date().toISOString();
     this.approvalMode = approvalMode;
     this.turnCount = turnCount;
   }
@@ -962,8 +925,8 @@ export class ConversationFinishedEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CONVERSATION_FINISHED,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CONVERSATION_FINISHED,
+      "event.timestamp": this["event.timestamp"],
       approvalMode: this.approvalMode,
       turnCount: this.turnCount,
     };
@@ -974,10 +937,10 @@ export class ConversationFinishedEvent {
   }
 }
 
-export const EVENT_FILE_OPERATION = 'gemini_cli.file_operation';
+export const EVENT_FILE_OPERATION = "gemini_cli.file_operation";
 export class FileOperationEvent implements BaseTelemetryEvent {
-  'event.name': 'file_operation';
-  'event.timestamp': string;
+  "event.name": "file_operation";
+  "event.timestamp": string;
   tool_name: string;
   operation: FileOperation;
   lines?: number;
@@ -993,8 +956,8 @@ export class FileOperationEvent implements BaseTelemetryEvent {
     extension?: string,
     programming_language?: string,
   ) {
-    this['event.name'] = 'file_operation';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "file_operation";
+    this["event.timestamp"] = new Date().toISOString();
     this.tool_name = tool_name;
     this.operation = operation;
     this.lines = lines;
@@ -1006,23 +969,23 @@ export class FileOperationEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_FILE_OPERATION,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_FILE_OPERATION,
+      "event.timestamp": this["event.timestamp"],
       tool_name: this.tool_name,
       operation: this.operation,
     };
 
     if (this.lines) {
-      attributes['lines'] = this.lines;
+      attributes["lines"] = this.lines;
     }
     if (this.mimetype) {
-      attributes['mimetype'] = this.mimetype;
+      attributes["mimetype"] = this.mimetype;
     }
     if (this.extension) {
-      attributes['extension'] = this.extension;
+      attributes["extension"] = this.extension;
     }
     if (this.programming_language) {
-      attributes['programming_language'] = this.programming_language;
+      attributes["programming_language"] = this.programming_language;
     }
     return attributes;
   }
@@ -1032,28 +995,28 @@ export class FileOperationEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_INVALID_CHUNK = 'gemini_cli.chat.invalid_chunk';
+export const EVENT_INVALID_CHUNK = "gemini_cli.chat.invalid_chunk";
 // Add these new event interfaces
 export class InvalidChunkEvent implements BaseTelemetryEvent {
-  'event.name': 'invalid_chunk';
-  'event.timestamp': string;
+  "event.name": "invalid_chunk";
+  "event.timestamp": string;
   error_message?: string; // Optional: validation error details
 
   constructor(error_message?: string) {
-    this['event.name'] = 'invalid_chunk';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "invalid_chunk";
+    this["event.timestamp"] = new Date().toISOString();
     this.error_message = error_message;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     const attributes: LogAttributes = {
       ...getCommonAttributes(config),
-      'event.name': EVENT_INVALID_CHUNK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_INVALID_CHUNK,
+      "event.timestamp": this["event.timestamp"],
     };
 
     if (this.error_message) {
-      attributes['error.message'] = this.error_message;
+      attributes["error.message"] = this.error_message;
     }
     return attributes;
   }
@@ -1063,23 +1026,18 @@ export class InvalidChunkEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_CONTENT_RETRY = 'gemini_cli.chat.content_retry';
+export const EVENT_CONTENT_RETRY = "gemini_cli.chat.content_retry";
 export class ContentRetryEvent implements BaseTelemetryEvent {
-  'event.name': 'content_retry';
-  'event.timestamp': string;
+  "event.name": "content_retry";
+  "event.timestamp": string;
   attempt_number: number;
   error_type: string; // e.g., 'EmptyStreamError'
   retry_delay_ms: number;
   model: string;
 
-  constructor(
-    attempt_number: number,
-    error_type: string,
-    retry_delay_ms: number,
-    model: string,
-  ) {
-    this['event.name'] = 'content_retry';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(attempt_number: number, error_type: string, retry_delay_ms: number, model: string) {
+    this["event.name"] = "content_retry";
+    this["event.timestamp"] = new Date().toISOString();
     this.attempt_number = attempt_number;
     this.error_type = error_type;
     this.retry_delay_ms = retry_delay_ms;
@@ -1089,8 +1047,8 @@ export class ContentRetryEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CONTENT_RETRY,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CONTENT_RETRY,
+      "event.timestamp": this["event.timestamp"],
       attempt_number: this.attempt_number,
       error_type: this.error_type,
       retry_delay_ms: this.retry_delay_ms,
@@ -1103,11 +1061,10 @@ export class ContentRetryEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_CONTENT_RETRY_FAILURE =
-  'gemini_cli.chat.content_retry_failure';
+export const EVENT_CONTENT_RETRY_FAILURE = "gemini_cli.chat.content_retry_failure";
 export class ContentRetryFailureEvent implements BaseTelemetryEvent {
-  'event.name': 'content_retry_failure';
-  'event.timestamp': string;
+  "event.name": "content_retry_failure";
+  "event.timestamp": string;
   total_attempts: number;
   final_error_type: string;
   total_duration_ms?: number; // Optional: total time spent retrying
@@ -1119,8 +1076,8 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
     model: string,
     total_duration_ms?: number,
   ) {
-    this['event.name'] = 'content_retry_failure';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "content_retry_failure";
+    this["event.timestamp"] = new Date().toISOString();
     this.total_attempts = total_attempts;
     this.final_error_type = final_error_type;
     this.total_duration_ms = total_duration_ms;
@@ -1130,8 +1087,8 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_CONTENT_RETRY_FAILURE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_CONTENT_RETRY_FAILURE,
+      "event.timestamp": this["event.timestamp"],
       total_attempts: this.total_attempts,
       final_error_type: this.final_error_type,
       total_duration_ms: this.total_duration_ms,
@@ -1144,10 +1101,10 @@ export class ContentRetryFailureEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_MODEL_ROUTING = 'gemini_cli.model_routing';
+export const EVENT_MODEL_ROUTING = "gemini_cli.model_routing";
 export class ModelRoutingEvent implements BaseTelemetryEvent {
-  'event.name': 'model_routing';
-  'event.timestamp': string;
+  "event.name": "model_routing";
+  "event.timestamp": string;
   decision_model: string;
   decision_source: string;
   routing_latency_ms: number;
@@ -1163,8 +1120,8 @@ export class ModelRoutingEvent implements BaseTelemetryEvent {
     failed: boolean,
     error_message: string | undefined,
   ) {
-    this['event.name'] = 'model_routing';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "model_routing";
+    this["event.timestamp"] = new Date().toISOString();
     this.decision_model = decision_model;
     this.decision_source = decision_source;
     this.routing_latency_ms = routing_latency_ms;
@@ -1176,8 +1133,8 @@ export class ModelRoutingEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_MODEL_ROUTING,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_MODEL_ROUTING,
+      "event.timestamp": this["event.timestamp"],
       decision_model: this.decision_model,
       decision_source: this.decision_source,
       routing_latency_ms: this.routing_latency_ms,
@@ -1192,25 +1149,25 @@ export class ModelRoutingEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_INSTALL = 'gemini_cli.extension_install';
+export const EVENT_EXTENSION_INSTALL = "gemini_cli.extension_install";
 export class ExtensionInstallEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_install';
-  'event.timestamp': string;
+  "event.name": "extension_install";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   extension_version: string;
   extension_source: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
   constructor(
     extension_name: string,
     extension_id: string,
     extension_version: string,
     extension_source: string,
-    status: 'success' | 'error',
+    status: "success" | "error",
   ) {
-    this['event.name'] = 'extension_install';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_install";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.extension_version = extension_version;
@@ -1221,8 +1178,8 @@ export class ExtensionInstallEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_INSTALL,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_INSTALL,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       extension_version: this.extension_version,
       extension_source: this.extension_source,
@@ -1235,11 +1192,11 @@ export class ExtensionInstallEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_TOOL_OUTPUT_TRUNCATED = 'gemini_cli.tool_output_truncated';
+export const EVENT_TOOL_OUTPUT_TRUNCATED = "gemini_cli.tool_output_truncated";
 export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
-  readonly eventName = 'tool_output_truncated';
-  readonly 'event.timestamp' = new Date().toISOString();
-  'event.name': string;
+  readonly eventName = "tool_output_truncated";
+  readonly "event.timestamp" = new Date().toISOString();
+  "event.name": string;
   tool_name: string;
   original_content_length: number;
   truncated_content_length: number;
@@ -1257,7 +1214,7 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
       lines: number;
     },
   ) {
-    this['event.name'] = this.eventName;
+    this["event.name"] = this.eventName;
     this.prompt_id = prompt_id;
     this.tool_name = details.toolName;
     this.original_content_length = details.originalContentLength;
@@ -1269,9 +1226,9 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_TOOL_OUTPUT_TRUNCATED,
+      "event.name": EVENT_TOOL_OUTPUT_TRUNCATED,
       eventName: this.eventName,
-      'event.timestamp': this['event.timestamp'],
+      "event.timestamp": this["event.timestamp"],
       tool_name: this.tool_name,
       original_content_length: this.original_content_length,
       truncated_content_length: this.truncated_content_length,
@@ -1286,21 +1243,17 @@ export class ToolOutputTruncatedEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_UNINSTALL = 'gemini_cli.extension_uninstall';
+export const EVENT_EXTENSION_UNINSTALL = "gemini_cli.extension_uninstall";
 export class ExtensionUninstallEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_uninstall';
-  'event.timestamp': string;
+  "event.name": "extension_uninstall";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
-  constructor(
-    extension_name: string,
-    extension_id: string,
-    status: 'success' | 'error',
-  ) {
-    this['event.name'] = 'extension_uninstall';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(extension_name: string, extension_id: string, status: "success" | "error") {
+    this["event.name"] = "extension_uninstall";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.status = status;
@@ -1309,8 +1262,8 @@ export class ExtensionUninstallEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_UNINSTALL,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_UNINSTALL,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       status: this.status,
     };
@@ -1321,16 +1274,16 @@ export class ExtensionUninstallEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_UPDATE = 'gemini_cli.extension_update';
+export const EVENT_EXTENSION_UPDATE = "gemini_cli.extension_update";
 export class ExtensionUpdateEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_update';
-  'event.timestamp': string;
+  "event.name": "extension_update";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   extension_previous_version: string;
   extension_version: string;
   extension_source: string;
-  status: 'success' | 'error';
+  status: "success" | "error";
 
   constructor(
     extension_name: string,
@@ -1338,10 +1291,10 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
     extension_version: string,
     extension_previous_version: string,
     extension_source: string,
-    status: 'success' | 'error',
+    status: "success" | "error",
   ) {
-    this['event.name'] = 'extension_update';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "extension_update";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.extension_version = extension_version;
@@ -1353,8 +1306,8 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_UPDATE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_UPDATE,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       extension_version: this.extension_version,
       extension_previous_version: this.extension_previous_version,
@@ -1368,21 +1321,17 @@ export class ExtensionUpdateEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_EXTENSION_ENABLE = 'gemini_cli.extension_enable';
+export const EVENT_EXTENSION_ENABLE = "gemini_cli.extension_enable";
 export class ExtensionEnableEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_enable';
-  'event.timestamp': string;
+  "event.name": "extension_enable";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   setting_scope: string;
 
-  constructor(
-    extension_name: string,
-    extension_id: string,
-    settingScope: string,
-  ) {
-    this['event.name'] = 'extension_enable';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(extension_name: string, extension_id: string, settingScope: string) {
+    this["event.name"] = "extension_enable";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.setting_scope = settingScope;
@@ -1391,8 +1340,8 @@ export class ExtensionEnableEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_ENABLE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_ENABLE,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       setting_scope: this.setting_scope,
     };
@@ -1403,23 +1352,23 @@ export class ExtensionEnableEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_MODEL_SLASH_COMMAND = 'gemini_cli.slash_command.model';
+export const EVENT_MODEL_SLASH_COMMAND = "gemini_cli.slash_command.model";
 export class ModelSlashCommandEvent implements BaseTelemetryEvent {
-  'event.name': 'model_slash_command';
-  'event.timestamp': string;
+  "event.name": "model_slash_command";
+  "event.timestamp": string;
   model_name: string;
 
   constructor(model_name: string) {
-    this['event.name'] = 'model_slash_command';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "model_slash_command";
+    this["event.timestamp"] = new Date().toISOString();
     this.model_name = model_name;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_MODEL_SLASH_COMMAND,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_MODEL_SLASH_COMMAND,
+      "event.timestamp": this["event.timestamp"],
       model_name: this.model_name,
     };
   }
@@ -1429,10 +1378,10 @@ export class ModelSlashCommandEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_LLM_LOOP_CHECK = 'gemini_cli.llm_loop_check';
+export const EVENT_LLM_LOOP_CHECK = "gemini_cli.llm_loop_check";
 export class LlmLoopCheckEvent implements BaseTelemetryEvent {
-  'event.name': 'llm_loop_check';
-  'event.timestamp': string;
+  "event.name": "llm_loop_check";
+  "event.timestamp": string;
   prompt_id: string;
   flash_confidence: number;
   main_model: string;
@@ -1444,8 +1393,8 @@ export class LlmLoopCheckEvent implements BaseTelemetryEvent {
     main_model: string,
     main_model_confidence: number,
   ) {
-    this['event.name'] = 'llm_loop_check';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "llm_loop_check";
+    this["event.timestamp"] = new Date().toISOString();
     this.prompt_id = prompt_id;
     this.flash_confidence = flash_confidence;
     this.main_model = main_model;
@@ -1455,8 +1404,8 @@ export class LlmLoopCheckEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_LLM_LOOP_CHECK,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_LLM_LOOP_CHECK,
+      "event.timestamp": this["event.timestamp"],
       prompt_id: this.prompt_id,
       flash_confidence: this.flash_confidence,
       main_model: this.main_model,
@@ -1503,21 +1452,17 @@ export type TelemetryEvent =
   | LlmLoopCheckEvent
   | WebFetchFallbackAttemptEvent;
 
-export const EVENT_EXTENSION_DISABLE = 'gemini_cli.extension_disable';
+export const EVENT_EXTENSION_DISABLE = "gemini_cli.extension_disable";
 export class ExtensionDisableEvent implements BaseTelemetryEvent {
-  'event.name': 'extension_disable';
-  'event.timestamp': string;
+  "event.name": "extension_disable";
+  "event.timestamp": string;
   extension_name: string;
   extension_id: string;
   setting_scope: string;
 
-  constructor(
-    extension_name: string,
-    extension_id: string,
-    settingScope: string,
-  ) {
-    this['event.name'] = 'extension_disable';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(extension_name: string, extension_id: string, settingScope: string) {
+    this["event.name"] = "extension_disable";
+    this["event.timestamp"] = new Date().toISOString();
     this.extension_name = extension_name;
     this.extension_id = extension_id;
     this.setting_scope = settingScope;
@@ -1526,8 +1471,8 @@ export class ExtensionDisableEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_EXTENSION_DISABLE,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_EXTENSION_DISABLE,
+      "event.timestamp": this["event.timestamp"],
       extension_name: this.extension_name,
       setting_scope: this.setting_scope,
     };
@@ -1538,23 +1483,23 @@ export class ExtensionDisableEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_SMART_EDIT_STRATEGY = 'gemini_cli.smart_edit_strategy';
+export const EVENT_SMART_EDIT_STRATEGY = "gemini_cli.smart_edit_strategy";
 export class SmartEditStrategyEvent implements BaseTelemetryEvent {
-  'event.name': 'smart_edit_strategy';
-  'event.timestamp': string;
+  "event.name": "smart_edit_strategy";
+  "event.timestamp": string;
   strategy: string;
 
   constructor(strategy: string) {
-    this['event.name'] = 'smart_edit_strategy';
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.name"] = "smart_edit_strategy";
+    this["event.timestamp"] = new Date().toISOString();
     this.strategy = strategy;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_SMART_EDIT_STRATEGY,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_SMART_EDIT_STRATEGY,
+      "event.timestamp": this["event.timestamp"],
       strategy: this.strategy,
     };
   }
@@ -1564,23 +1509,23 @@ export class SmartEditStrategyEvent implements BaseTelemetryEvent {
   }
 }
 
-export const EVENT_SMART_EDIT_CORRECTION = 'gemini_cli.smart_edit_correction';
+export const EVENT_SMART_EDIT_CORRECTION = "gemini_cli.smart_edit_correction";
 export class SmartEditCorrectionEvent implements BaseTelemetryEvent {
-  'event.name': 'smart_edit_correction';
-  'event.timestamp': string;
-  correction: 'success' | 'failure';
+  "event.name": "smart_edit_correction";
+  "event.timestamp": string;
+  correction: "success" | "failure";
 
-  constructor(correction: 'success' | 'failure') {
-    this['event.name'] = 'smart_edit_correction';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(correction: "success" | "failure") {
+    this["event.name"] = "smart_edit_correction";
+    this["event.timestamp"] = new Date().toISOString();
     this.correction = correction;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_SMART_EDIT_CORRECTION,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_SMART_EDIT_CORRECTION,
+      "event.timestamp": this["event.timestamp"],
       correction: this.correction,
     };
   }
@@ -1591,16 +1536,13 @@ export class SmartEditCorrectionEvent implements BaseTelemetryEvent {
 }
 
 abstract class BaseAgentEvent implements BaseTelemetryEvent {
-  abstract 'event.name':
-    | 'agent_start'
-    | 'agent_finish'
-    | 'agent_recovery_attempt';
-  'event.timestamp': string;
+  abstract "event.name": "agent_start" | "agent_finish" | "agent_recovery_attempt";
+  "event.timestamp": string;
   agent_id: string;
   agent_name: string;
 
   constructor(agent_id: string, agent_name: string) {
-    this['event.timestamp'] = new Date().toISOString();
+    this["event.timestamp"] = new Date().toISOString();
     this.agent_id = agent_id;
     this.agent_name = agent_name;
   }
@@ -1608,7 +1550,7 @@ abstract class BaseAgentEvent implements BaseTelemetryEvent {
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.timestamp': this['event.timestamp'],
+      "event.timestamp": this["event.timestamp"],
       agent_id: this.agent_id,
       agent_name: this.agent_name,
     };
@@ -1617,9 +1559,9 @@ abstract class BaseAgentEvent implements BaseTelemetryEvent {
   abstract toLogBody(): string;
 }
 
-export const EVENT_AGENT_START = 'gemini_cli.agent.start';
+export const EVENT_AGENT_START = "gemini_cli.agent.start";
 export class AgentStartEvent extends BaseAgentEvent {
-  'event.name' = 'agent_start' as const;
+  "event.name" = "agent_start" as const;
 
   constructor(agent_id: string, agent_name: string) {
     super(agent_id, agent_name);
@@ -1628,7 +1570,7 @@ export class AgentStartEvent extends BaseAgentEvent {
   override toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...super.toOpenTelemetryAttributes(config),
-      'event.name': EVENT_AGENT_START,
+      "event.name": EVENT_AGENT_START,
     };
   }
 
@@ -1637,9 +1579,9 @@ export class AgentStartEvent extends BaseAgentEvent {
   }
 }
 
-export const EVENT_AGENT_FINISH = 'gemini_cli.agent.finish';
+export const EVENT_AGENT_FINISH = "gemini_cli.agent.finish";
 export class AgentFinishEvent extends BaseAgentEvent {
-  'event.name' = 'agent_finish' as const;
+  "event.name" = "agent_finish" as const;
   duration_ms: number;
   turn_count: number;
   terminate_reason: AgentTerminateMode;
@@ -1660,7 +1602,7 @@ export class AgentFinishEvent extends BaseAgentEvent {
   override toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...super.toOpenTelemetryAttributes(config),
-      'event.name': EVENT_AGENT_FINISH,
+      "event.name": EVENT_AGENT_FINISH,
       duration_ms: this.duration_ms,
       turn_count: this.turn_count,
       terminate_reason: this.terminate_reason,
@@ -1672,9 +1614,9 @@ export class AgentFinishEvent extends BaseAgentEvent {
   }
 }
 
-export const EVENT_AGENT_RECOVERY_ATTEMPT = 'gemini_cli.agent.recovery_attempt';
+export const EVENT_AGENT_RECOVERY_ATTEMPT = "gemini_cli.agent.recovery_attempt";
 export class RecoveryAttemptEvent extends BaseAgentEvent {
-  'event.name' = 'agent_recovery_attempt' as const;
+  "event.name" = "agent_recovery_attempt" as const;
   reason: AgentTerminateMode;
   duration_ms: number;
   success: boolean;
@@ -1698,7 +1640,7 @@ export class RecoveryAttemptEvent extends BaseAgentEvent {
   override toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...super.toOpenTelemetryAttributes(config),
-      'event.name': EVENT_AGENT_RECOVERY_ATTEMPT,
+      "event.name": EVENT_AGENT_RECOVERY_ATTEMPT,
       reason: this.reason,
       duration_ms: this.duration_ms,
       success: this.success,
@@ -1711,24 +1653,23 @@ export class RecoveryAttemptEvent extends BaseAgentEvent {
   }
 }
 
-export const EVENT_WEB_FETCH_FALLBACK_ATTEMPT =
-  'gemini_cli.web_fetch_fallback_attempt';
+export const EVENT_WEB_FETCH_FALLBACK_ATTEMPT = "gemini_cli.web_fetch_fallback_attempt";
 export class WebFetchFallbackAttemptEvent implements BaseTelemetryEvent {
-  'event.name': 'web_fetch_fallback_attempt';
-  'event.timestamp': string;
-  reason: 'private_ip' | 'primary_failed';
+  "event.name": "web_fetch_fallback_attempt";
+  "event.timestamp": string;
+  reason: "private_ip" | "primary_failed";
 
-  constructor(reason: 'private_ip' | 'primary_failed') {
-    this['event.name'] = 'web_fetch_fallback_attempt';
-    this['event.timestamp'] = new Date().toISOString();
+  constructor(reason: "private_ip" | "primary_failed") {
+    this["event.name"] = "web_fetch_fallback_attempt";
+    this["event.timestamp"] = new Date().toISOString();
     this.reason = reason;
   }
 
   toOpenTelemetryAttributes(config: Config): LogAttributes {
     return {
       ...getCommonAttributes(config),
-      'event.name': EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
-      'event.timestamp': this['event.timestamp'],
+      "event.name": EVENT_WEB_FETCH_FALLBACK_ATTEMPT,
+      "event.timestamp": this["event.timestamp"],
       reason: this.reason,
     };
   }
diff --git a/packages/gemini-core/src/telemetry/uiTelemetry.test.ts b/packages/gemini-core/src/telemetry/uiTelemetry.test.ts
index aa06e87a9..1f8f79392 100644
--- a/packages/gemini-core/src/telemetry/uiTelemetry.test.ts
+++ b/packages/gemini-core/src/telemetry/uiTelemetry.test.ts
@@ -4,24 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { UiTelemetryService } from './uiTelemetry.js';
-import { ToolCallDecision } from './tool-call-decision.js';
-import type { ApiErrorEvent, ApiResponseEvent } from './types.js';
-import { ToolCallEvent } from './types.js';
-import {
-  EVENT_API_ERROR,
-  EVENT_API_RESPONSE,
-  EVENT_TOOL_CALL,
-} from './types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import type {
   CompletedToolCall,
   ErroredToolCall,
   SuccessfulToolCall,
-} from '../core/coreToolScheduler.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import { ToolConfirmationOutcome } from '../tools/tools.js';
-import { MockTool } from '../test-utils/mock-tool.js';
+} from "../core/coreToolScheduler.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { ToolConfirmationOutcome } from "../tools/tools.js";
+import { ToolCallDecision } from "./tool-call-decision.js";
+import type { ApiErrorEvent, ApiResponseEvent } from "./types.js";
+import { EVENT_API_ERROR, EVENT_API_RESPONSE, EVENT_TOOL_CALL, ToolCallEvent } from "./types.js";
+import { UiTelemetryService } from "./uiTelemetry.js";
 
 const createFakeCompletedToolCall = (
   name: string,
@@ -33,18 +28,18 @@ const createFakeCompletedToolCall = (
   const request = {
     callId: `call_${name}_${Date.now()}`,
     name,
-    args: { foo: 'bar' },
+    args: { foo: "bar" },
     isClientInitiated: false,
-    prompt_id: 'prompt-id-1',
+    prompt_id: "prompt-id-1",
   };
   const tool = new MockTool({ name });
 
   if (success) {
     return {
-      status: 'success',
+      status: "success",
       request,
       tool,
-      invocation: tool.build({ param: 'test' }),
+      invocation: tool.build({ param: "test" }),
       response: {
         callId: request.callId,
         responseParts: [
@@ -52,20 +47,20 @@ const createFakeCompletedToolCall = (
             functionResponse: {
               id: request.callId,
               name,
-              response: { output: 'Success!' },
+              response: { output: "Success!" },
             },
           },
         ],
         error: undefined,
         errorType: undefined,
-        resultDisplay: 'Success!',
+        resultDisplay: "Success!",
       },
       durationMs: duration,
       outcome,
     } as SuccessfulToolCall;
   } else {
     return {
-      status: 'error',
+      status: "error",
       request,
       tool,
       response: {
@@ -75,13 +70,13 @@ const createFakeCompletedToolCall = (
             functionResponse: {
               id: request.callId,
               name,
-              response: { error: 'Tool failed' },
+              response: { error: "Tool failed" },
             },
           },
         ],
-        error: error || new Error('Tool failed'),
+        error: error || new Error("Tool failed"),
         errorType: ToolErrorType.UNKNOWN,
-        resultDisplay: 'Failure!',
+        resultDisplay: "Failure!",
       },
       durationMs: duration,
       outcome,
@@ -89,14 +84,14 @@ const createFakeCompletedToolCall = (
   }
 };
 
-describe('UiTelemetryService', () => {
+describe("UiTelemetryService", () => {
   let service: UiTelemetryService;
 
   beforeEach(() => {
     service = new UiTelemetryService();
   });
 
-  it('should have correct initial metrics', () => {
+  it("should have correct initial metrics", () => {
     const metrics = service.getMetrics();
     expect(metrics).toEqual({
       models: {},
@@ -121,13 +116,13 @@ describe('UiTelemetryService', () => {
     expect(service.getLastPromptTokenCount()).toBe(0);
   });
 
-  it('should emit an update event when an event is added', () => {
+  it("should emit an update event when an event is added", () => {
     const spy = vi.fn();
-    service.on('update', spy);
+    service.on("update", spy);
 
     const event = {
-      'event.name': EVENT_API_RESPONSE,
-      model: 'gemini-2.5-pro',
+      "event.name": EVENT_API_RESPONSE,
+      model: "gemini-2.5-pro",
       duration_ms: 500,
       usage: {
         input_token_count: 10,
@@ -137,7 +132,7 @@ describe('UiTelemetryService', () => {
         thoughts_token_count: 2,
         tool_token_count: 3,
       },
-    } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+    } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
     service.addEvent(event);
 
@@ -147,11 +142,11 @@ describe('UiTelemetryService', () => {
     expect(lastPromptTokenCount).toBe(0);
   });
 
-  describe('API Response Event Processing', () => {
-    it('should process a single ApiResponseEvent', () => {
+  describe("API Response Event Processing", () => {
+    it("should process a single ApiResponseEvent", () => {
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -161,12 +156,12 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 2,
           tool_token_count: 3,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 1,
           totalErrors: 0,
@@ -184,10 +179,10 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should aggregate multiple ApiResponseEvents for the same model', () => {
+    it("should aggregate multiple ApiResponseEvents for the same model", () => {
       const event1 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -198,11 +193,11 @@ describe('UiTelemetryService', () => {
           tool_token_count: 3,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
       const event2 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 600,
         usage: {
           input_token_count: 15,
@@ -213,14 +208,14 @@ describe('UiTelemetryService', () => {
           tool_token_count: 6,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
 
       service.addEvent(event1);
       service.addEvent(event2);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 2,
           totalErrors: 0,
@@ -238,10 +233,10 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should handle ApiResponseEvents for different models', () => {
+    it("should handle ApiResponseEvents for different models", () => {
       const event1 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -252,11 +247,11 @@ describe('UiTelemetryService', () => {
           tool_token_count: 3,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
       const event2 = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-flash',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-flash",
         duration_ms: 1000,
         usage: {
           input_token_count: 100,
@@ -267,34 +262,34 @@ describe('UiTelemetryService', () => {
           tool_token_count: 30,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
 
       service.addEvent(event1);
       service.addEvent(event2);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toBeDefined();
-      expect(metrics.models['gemini-2.5-flash']).toBeDefined();
-      expect(metrics.models['gemini-2.5-pro'].api.totalRequests).toBe(1);
-      expect(metrics.models['gemini-2.5-flash'].api.totalRequests).toBe(1);
+      expect(metrics.models["gemini-2.5-pro"]).toBeDefined();
+      expect(metrics.models["gemini-2.5-flash"]).toBeDefined();
+      expect(metrics.models["gemini-2.5-pro"].api.totalRequests).toBe(1);
+      expect(metrics.models["gemini-2.5-flash"].api.totalRequests).toBe(1);
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
   });
 
-  describe('API Error Event Processing', () => {
-    it('should process a single ApiErrorEvent', () => {
+  describe("API Error Event Processing", () => {
+    it("should process a single ApiErrorEvent", () => {
       const event = {
-        'event.name': EVENT_API_ERROR,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_ERROR,
+        model: "gemini-2.5-pro",
         duration_ms: 300,
-        error: 'Something went wrong',
-      } as ApiErrorEvent & { 'event.name': typeof EVENT_API_ERROR };
+        error: "Something went wrong",
+      } as ApiErrorEvent & { "event.name": typeof EVENT_API_ERROR };
 
       service.addEvent(event);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 1,
           totalErrors: 1,
@@ -311,10 +306,10 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should aggregate ApiErrorEvents and ApiResponseEvents', () => {
+    it("should aggregate ApiErrorEvents and ApiResponseEvents", () => {
       const responseEvent = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 10,
@@ -325,20 +320,20 @@ describe('UiTelemetryService', () => {
           tool_token_count: 3,
         },
       } as ApiResponseEvent & {
-        'event.name': typeof EVENT_API_RESPONSE;
+        "event.name": typeof EVENT_API_RESPONSE;
       };
       const errorEvent = {
-        'event.name': EVENT_API_ERROR,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_ERROR,
+        model: "gemini-2.5-pro",
         duration_ms: 300,
-        error: 'Something went wrong',
-      } as ApiErrorEvent & { 'event.name': typeof EVENT_API_ERROR };
+        error: "Something went wrong",
+      } as ApiErrorEvent & { "event.name": typeof EVENT_API_ERROR };
 
       service.addEvent(responseEvent);
       service.addEvent(errorEvent);
 
       const metrics = service.getMetrics();
-      expect(metrics.models['gemini-2.5-pro']).toEqual({
+      expect(metrics.models["gemini-2.5-pro"]).toEqual({
         api: {
           totalRequests: 2,
           totalErrors: 1,
@@ -356,18 +351,18 @@ describe('UiTelemetryService', () => {
     });
   });
 
-  describe('Tool Call Event Processing', () => {
-    it('should process a single successful ToolCallEvent', () => {
+  describe("Tool Call Event Processing", () => {
+    it("should process a single successful ToolCallEvent", () => {
       const toolCall = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         true,
         150,
         ToolConfirmationOutcome.ProceedOnce,
       );
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -377,7 +372,7 @@ describe('UiTelemetryService', () => {
       expect(tools.totalFail).toBe(0);
       expect(tools.totalDurationMs).toBe(150);
       expect(tools.totalDecisions[ToolCallDecision.ACCEPT]).toBe(1);
-      expect(tools.byName['test_tool']).toEqual({
+      expect(tools.byName["test_tool"]).toEqual({
         count: 1,
         success: 1,
         fail: 0,
@@ -391,17 +386,17 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should process a single failed ToolCallEvent', () => {
+    it("should process a single failed ToolCallEvent", () => {
       const toolCall = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         false,
         200,
         ToolConfirmationOutcome.Cancel,
       );
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -411,7 +406,7 @@ describe('UiTelemetryService', () => {
       expect(tools.totalFail).toBe(1);
       expect(tools.totalDurationMs).toBe(200);
       expect(tools.totalDecisions[ToolCallDecision.REJECT]).toBe(1);
-      expect(tools.byName['test_tool']).toEqual({
+      expect(tools.byName["test_tool"]).toEqual({
         count: 1,
         success: 0,
         fail: 1,
@@ -425,33 +420,31 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should process a ToolCallEvent with modify decision', () => {
+    it("should process a ToolCallEvent with modify decision", () => {
       const toolCall = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         true,
         250,
         ToolConfirmationOutcome.ModifyWithEditor,
       );
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
 
       expect(tools.totalDecisions[ToolCallDecision.MODIFY]).toBe(1);
-      expect(tools.byName['test_tool'].decisions[ToolCallDecision.MODIFY]).toBe(
-        1,
-      );
+      expect(tools.byName["test_tool"].decisions[ToolCallDecision.MODIFY]).toBe(1);
     });
 
-    it('should process a ToolCallEvent without a decision', () => {
-      const toolCall = createFakeCompletedToolCall('test_tool', true, 100);
+    it("should process a ToolCallEvent without a decision", () => {
+      const toolCall = createFakeCompletedToolCall("test_tool", true, 100);
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -462,7 +455,7 @@ describe('UiTelemetryService', () => {
         [ToolCallDecision.MODIFY]: 0,
         [ToolCallDecision.AUTO_ACCEPT]: 0,
       });
-      expect(tools.byName['test_tool'].decisions).toEqual({
+      expect(tools.byName["test_tool"].decisions).toEqual({
         [ToolCallDecision.ACCEPT]: 0,
         [ToolCallDecision.REJECT]: 0,
         [ToolCallDecision.MODIFY]: 0,
@@ -470,15 +463,15 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should aggregate multiple ToolCallEvents for the same tool', () => {
+    it("should aggregate multiple ToolCallEvents for the same tool", () => {
       const toolCall1 = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         true,
         100,
         ToolConfirmationOutcome.ProceedOnce,
       );
       const toolCall2 = createFakeCompletedToolCall(
-        'test_tool',
+        "test_tool",
         false,
         150,
         ToolConfirmationOutcome.Cancel,
@@ -486,12 +479,12 @@ describe('UiTelemetryService', () => {
 
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall1)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall2)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -502,7 +495,7 @@ describe('UiTelemetryService', () => {
       expect(tools.totalDurationMs).toBe(250);
       expect(tools.totalDecisions[ToolCallDecision.ACCEPT]).toBe(1);
       expect(tools.totalDecisions[ToolCallDecision.REJECT]).toBe(1);
-      expect(tools.byName['test_tool']).toEqual({
+      expect(tools.byName["test_tool"]).toEqual({
         count: 2,
         success: 1,
         fail: 1,
@@ -516,17 +509,17 @@ describe('UiTelemetryService', () => {
       });
     });
 
-    it('should handle ToolCallEvents for different tools', () => {
-      const toolCall1 = createFakeCompletedToolCall('tool_A', true, 100);
-      const toolCall2 = createFakeCompletedToolCall('tool_B', false, 200);
+    it("should handle ToolCallEvents for different tools", () => {
+      const toolCall1 = createFakeCompletedToolCall("tool_A", true, 100);
+      const toolCall2 = createFakeCompletedToolCall("tool_B", false, 200);
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall1)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
       service.addEvent({
         ...structuredClone(new ToolCallEvent(toolCall2)),
-        'event.name': EVENT_TOOL_CALL,
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+        "event.name": EVENT_TOOL_CALL,
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
       const metrics = service.getMetrics();
       const { tools } = metrics;
@@ -534,19 +527,19 @@ describe('UiTelemetryService', () => {
       expect(tools.totalCalls).toBe(2);
       expect(tools.totalSuccess).toBe(1);
       expect(tools.totalFail).toBe(1);
-      expect(tools.byName['tool_A']).toBeDefined();
-      expect(tools.byName['tool_B']).toBeDefined();
-      expect(tools.byName['tool_A'].count).toBe(1);
-      expect(tools.byName['tool_B'].count).toBe(1);
+      expect(tools.byName["tool_A"]).toBeDefined();
+      expect(tools.byName["tool_B"]).toBeDefined();
+      expect(tools.byName["tool_A"].count).toBe(1);
+      expect(tools.byName["tool_B"].count).toBe(1);
     });
   });
 
-  describe('resetLastPromptTokenCount', () => {
-    it('should reset the last prompt token count to 0', () => {
+  describe("resetLastPromptTokenCount", () => {
+    it("should reset the last prompt token count to 0", () => {
       // First, set up some initial token count
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -556,7 +549,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
       expect(service.getLastPromptTokenCount()).toBe(0);
@@ -566,14 +559,14 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should emit an update event when resetLastPromptTokenCount is called', () => {
+    it("should emit an update event when resetLastPromptTokenCount is called", () => {
       const spy = vi.fn();
-      service.on('update', spy);
+      service.on("update", spy);
 
       // Set up initial token count
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -583,7 +576,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
       spy.mockClear(); // Clear the spy to focus on the reset call
@@ -596,11 +589,11 @@ describe('UiTelemetryService', () => {
       expect(lastPromptTokenCount).toBe(0);
     });
 
-    it('should not affect other metrics when resetLastPromptTokenCount is called', () => {
+    it("should not affect other metrics when resetLastPromptTokenCount is called", () => {
       // Set up initial state with some metrics
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -610,7 +603,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
 
@@ -627,14 +620,14 @@ describe('UiTelemetryService', () => {
       expect(service.getLastPromptTokenCount()).toBe(0);
     });
 
-    it('should work correctly when called multiple times', () => {
+    it("should work correctly when called multiple times", () => {
       const spy = vi.fn();
-      service.on('update', spy);
+      service.on("update", spy);
 
       // Set up initial token count
       const event = {
-        'event.name': EVENT_API_RESPONSE,
-        model: 'gemini-2.5-pro',
+        "event.name": EVENT_API_RESPONSE,
+        model: "gemini-2.5-pro",
         duration_ms: 500,
         usage: {
           input_token_count: 100,
@@ -644,7 +637,7 @@ describe('UiTelemetryService', () => {
           thoughts_token_count: 20,
           tool_token_count: 30,
         },
-      } as ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE };
+      } as ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE };
 
       service.addEvent(event);
       expect(service.getLastPromptTokenCount()).toBe(0);
@@ -661,17 +654,17 @@ describe('UiTelemetryService', () => {
     });
   });
 
-  describe('Tool Call Event with Line Count Metadata', () => {
-    it('should aggregate valid line count metadata', () => {
-      const toolCall = createFakeCompletedToolCall('test_tool', true, 100);
+  describe("Tool Call Event with Line Count Metadata", () => {
+    it("should aggregate valid line count metadata", () => {
+      const toolCall = createFakeCompletedToolCall("test_tool", true, 100);
       const event = {
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
+        "event.name": EVENT_TOOL_CALL,
         metadata: {
           model_added_lines: 10,
           model_removed_lines: 5,
         },
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL };
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL };
 
       service.addEvent(event);
 
@@ -680,16 +673,16 @@ describe('UiTelemetryService', () => {
       expect(metrics.files.totalLinesRemoved).toBe(5);
     });
 
-    it('should ignore null/undefined values in line count metadata', () => {
-      const toolCall = createFakeCompletedToolCall('test_tool', true, 100);
+    it("should ignore null/undefined values in line count metadata", () => {
+      const toolCall = createFakeCompletedToolCall("test_tool", true, 100);
       const event = {
         ...structuredClone(new ToolCallEvent(toolCall)),
-        'event.name': EVENT_TOOL_CALL,
+        "event.name": EVENT_TOOL_CALL,
         metadata: {
           model_added_lines: null,
           model_removed_lines: undefined,
         },
-      } as ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL };
+      } as ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL };
 
       service.addEvent(event);
 
diff --git a/packages/gemini-core/src/telemetry/uiTelemetry.ts b/packages/gemini-core/src/telemetry/uiTelemetry.ts
index 79cb957d7..d038dbfdf 100644
--- a/packages/gemini-core/src/telemetry/uiTelemetry.ts
+++ b/packages/gemini-core/src/telemetry/uiTelemetry.ts
@@ -4,24 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
-import {
-  EVENT_API_ERROR,
-  EVENT_API_RESPONSE,
-  EVENT_TOOL_CALL,
-} from './types.js';
-
-import { ToolCallDecision } from './tool-call-decision.js';
-import type {
-  ApiErrorEvent,
-  ApiResponseEvent,
-  ToolCallEvent,
-} from './types.js';
+import { EventEmitter } from "node:events";
+import { ToolCallDecision } from "./tool-call-decision.js";
+import type { ApiErrorEvent, ApiResponseEvent, ToolCallEvent } from "./types.js";
+import { EVENT_API_ERROR, EVENT_API_RESPONSE, EVENT_TOOL_CALL } from "./types.js";
 
 export type UiEvent =
-  | (ApiResponseEvent & { 'event.name': typeof EVENT_API_RESPONSE })
-  | (ApiErrorEvent & { 'event.name': typeof EVENT_API_ERROR })
-  | (ToolCallEvent & { 'event.name': typeof EVENT_TOOL_CALL });
+  | (ApiResponseEvent & { "event.name": typeof EVENT_API_RESPONSE })
+  | (ApiErrorEvent & { "event.name": typeof EVENT_API_ERROR })
+  | (ToolCallEvent & { "event.name": typeof EVENT_TOOL_CALL });
 
 export interface ToolCallStats {
   count: number;
@@ -115,7 +106,7 @@ export class UiTelemetryService extends EventEmitter {
   #lastPromptTokenCount = 0;
 
   addEvent(event: UiEvent) {
-    switch (event['event.name']) {
+    switch (event["event.name"]) {
       case EVENT_API_RESPONSE:
         this.processApiResponse(event);
         break;
@@ -130,7 +121,7 @@ export class UiTelemetryService extends EventEmitter {
         return;
     }
 
-    this.emit('update', {
+    this.emit("update", {
       metrics: this.#metrics,
       lastPromptTokenCount: this.#lastPromptTokenCount,
     });
@@ -146,7 +137,7 @@ export class UiTelemetryService extends EventEmitter {
 
   setLastPromptTokenCount(lastPromptTokenCount: number): void {
     this.#lastPromptTokenCount = lastPromptTokenCount;
-    this.emit('update', {
+    this.emit("update", {
       metrics: this.#metrics,
       lastPromptTokenCount: this.#lastPromptTokenCount,
     });
@@ -222,11 +213,11 @@ export class UiTelemetryService extends EventEmitter {
 
     // Aggregate line count data from metadata
     if (event.metadata) {
-      if (event.metadata['model_added_lines'] !== undefined) {
-        files.totalLinesAdded += event.metadata['model_added_lines'];
+      if (event.metadata["model_added_lines"] !== undefined) {
+        files.totalLinesAdded += event.metadata["model_added_lines"];
       }
-      if (event.metadata['model_removed_lines'] !== undefined) {
-        files.totalLinesRemoved += event.metadata['model_removed_lines'];
+      if (event.metadata["model_removed_lines"] !== undefined) {
+        files.totalLinesRemoved += event.metadata["model_removed_lines"];
       }
     }
   }
diff --git a/packages/gemini-core/src/test-utils/config.ts b/packages/gemini-core/src/test-utils/config.ts
index 9f72d4b0d..998c74bdf 100644
--- a/packages/gemini-core/src/test-utils/config.ts
+++ b/packages/gemini-core/src/test-utils/config.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ConfigParameters } from '../config/config.js';
-import { Config } from '../config/config.js';
+import type { ConfigParameters } from "../config/config.js";
+import { Config } from "../config/config.js";
 
 /**
  * Default parameters used for {@link FAKE_CONFIG}
@@ -13,11 +13,11 @@ import { Config } from '../config/config.js';
 export const DEFAULT_CONFIG_PARAMETERS: ConfigParameters = {
   usageStatisticsEnabled: true,
   debugMode: false,
-  sessionId: 'test-session-id',
+  sessionId: "test-session-id",
   proxy: undefined,
-  model: 'gemini-9001-super-duper',
-  targetDir: '/',
-  cwd: '/',
+  model: "gemini-9001-super-duper",
+  targetDir: "/",
+  cwd: "/",
 };
 
 /**
diff --git a/packages/gemini-core/src/test-utils/index.ts b/packages/gemini-core/src/test-utils/index.ts
index 6146d39d3..afcb672ae 100644
--- a/packages/gemini-core/src/test-utils/index.ts
+++ b/packages/gemini-core/src/test-utils/index.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export * from './mock-tool.js';
+export * from "./mock-tool.js";
diff --git a/packages/gemini-core/src/test-utils/mock-tool.ts b/packages/gemini-core/src/test-utils/mock-tool.ts
index 75bdf26c5..6f3a4a376 100644
--- a/packages/gemini-core/src/test-utils/mock-tool.ts
+++ b/packages/gemini-core/src/test-utils/mock-tool.ts
@@ -4,20 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from '../tools/modifiable-tool.js';
-import type {
-  ToolCallConfirmationDetails,
-  ToolInvocation,
-  ToolResult,
-} from '../tools/tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-} from '../tools/tools.js';
+import type { ModifiableDeclarativeTool, ModifyContext } from "../tools/modifiable-tool.js";
+import type { ToolCallConfirmationDetails, ToolInvocation, ToolResult } from "../tools/tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "../tools/tools.js";
 
 interface MockToolOptions {
   name: string;
@@ -37,10 +26,7 @@ interface MockToolOptions {
   params?: object;
 }
 
-class MockToolInvocation extends BaseToolInvocation<
-  { [key: string]: unknown },
-  ToolResult
-> {
+class MockToolInvocation extends BaseToolInvocation<{ [key: string]: unknown }, ToolResult> {
   constructor(
     private readonly tool: MockTool,
     params: { [key: string]: unknown },
@@ -48,10 +34,7 @@ class MockToolInvocation extends BaseToolInvocation<
     super(params);
   }
 
-  execute(
-    signal: AbortSignal,
-    updateOutput?: (output: string) => void,
-  ): Promise<ToolResult> {
+  execute(signal: AbortSignal, updateOutput?: (output: string) => void): Promise<ToolResult> {
     if (updateOutput) {
       return this.tool.execute(this.params, signal, updateOutput);
     } else {
@@ -73,10 +56,7 @@ class MockToolInvocation extends BaseToolInvocation<
 /**
  * A highly configurable mock tool for testing purposes.
  */
-export class MockTool extends BaseDeclarativeTool<
-  { [key: string]: unknown },
-  ToolResult
-> {
+export class MockTool extends BaseDeclarativeTool<{ [key: string]: unknown }, ToolResult> {
   shouldConfirmExecute: (
     params: { [key: string]: unknown },
     signal: AbortSignal,
@@ -124,10 +104,10 @@ export class MockTool extends BaseDeclarativeTool<
 
 export const MOCK_TOOL_SHOULD_CONFIRM_EXECUTE = () =>
   Promise.resolve({
-    type: 'exec' as const,
-    title: 'Confirm mockTool',
-    command: 'mockTool',
-    rootCommand: 'mockTool',
+    type: "exec" as const,
+    title: "Confirm mockTool",
+    command: "mockTool",
+    rootCommand: "mockTool",
     onConfirm: async () => {},
   });
 
@@ -157,13 +137,13 @@ export class MockModifiableToolInvocation extends BaseToolInvocation<
   ): Promise<ToolCallConfirmationDetails | false> {
     if (this.tool.shouldConfirm) {
       return {
-        type: 'edit',
-        title: 'Confirm Mock Tool',
-        fileName: 'test.txt',
-        filePath: 'test.txt',
-        fileDiff: 'diff',
-        originalContent: 'originalContent',
-        newContent: 'newContent',
+        type: "edit",
+        title: "Confirm Mock Tool",
+        fileName: "test.txt",
+        filePath: "test.txt",
+        fileDiff: "diff",
+        originalContent: "originalContent",
+        newContent: "newContent",
         onConfirm: async () => {},
       };
     }
@@ -184,24 +164,21 @@ export class MockModifiableTool
 {
   // Should be overrided in test file. Functionality will be updated in follow
   // up PR which has MockModifiableTool expect MockTool
-  executeFn: (params: Record<string, unknown>) => ToolResult | undefined = () =>
-    undefined;
+  executeFn: (params: Record<string, unknown>) => ToolResult | undefined = () => undefined;
   shouldConfirm = true;
 
-  constructor(name = 'mockModifiableTool') {
-    super(name, name, 'A mock modifiable tool for testing.', Kind.Other, {
-      type: 'object',
-      properties: { param: { type: 'string' } },
+  constructor(name = "mockModifiableTool") {
+    super(name, name, "A mock modifiable tool for testing.", Kind.Other, {
+      type: "object",
+      properties: { param: { type: "string" } },
     });
   }
 
-  getModifyContext(
-    _abortSignal: AbortSignal,
-  ): ModifyContext<Record<string, unknown>> {
+  getModifyContext(_abortSignal: AbortSignal): ModifyContext<Record<string, unknown>> {
     return {
-      getFilePath: () => 'test.txt',
-      getCurrentContent: async () => 'old content',
-      getProposedContent: async () => 'new content',
+      getFilePath: () => "test.txt",
+      getCurrentContent: async () => "old content",
+      getProposedContent: async () => "new content",
       createUpdatedParams: (
         _oldContent: string,
         modifiedProposedContent: string,
diff --git a/packages/gemini-core/src/test-utils/mockWorkspaceContext.ts b/packages/gemini-core/src/test-utils/mockWorkspaceContext.ts
index 67c614e9f..4327d96e4 100644
--- a/packages/gemini-core/src/test-utils/mockWorkspaceContext.ts
+++ b/packages/gemini-core/src/test-utils/mockWorkspaceContext.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import type { WorkspaceContext } from '../utils/workspaceContext.js';
+import { vi } from "vitest";
+import type { WorkspaceContext } from "../utils/workspaceContext.js";
 
 /**
  * Creates a mock WorkspaceContext for testing
@@ -24,9 +24,7 @@ export function createMockWorkspaceContext(
     getDirectories: vi.fn().mockReturnValue(allDirs),
     isPathWithinWorkspace: vi
       .fn()
-      .mockImplementation((path: string) =>
-        allDirs.some((dir) => path.startsWith(dir)),
-      ),
+      .mockImplementation((path: string) => allDirs.some((dir) => path.startsWith(dir))),
   } as unknown as WorkspaceContext;
 
   return mockWorkspaceContext;
diff --git a/packages/gemini-core/src/tools/base-tool-invocation.test.ts b/packages/gemini-core/src/tools/base-tool-invocation.test.ts
index 38d651f07..b074f34ae 100644
--- a/packages/gemini-core/src/tools/base-tool-invocation.test.ts
+++ b/packages/gemini-core/src/tools/base-tool-invocation.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { BaseToolInvocation, type ToolResult } from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
   type Message,
   MessageBusType,
   type ToolConfirmationRequest,
   type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
+} from "../confirmation-bus/types.js";
+import { BaseToolInvocation, type ToolResult } from "./tools.js";
 
 class TestBaseToolInvocation extends BaseToolInvocation<object, ToolResult> {
   getDescription(): string {
-    return 'test description';
+    return "test description";
   }
   async execute(): Promise<ToolResult> {
-    return { llmContent: [], returnDisplay: '' };
+    return { llmContent: [], returnDisplay: "" };
   }
 }
 
-describe('BaseToolInvocation', () => {
+describe("BaseToolInvocation", () => {
   let messageBus: MessageBus;
   let abortController: AbortController;
 
@@ -36,15 +36,9 @@ describe('BaseToolInvocation', () => {
     abortController = new AbortController();
   });
 
-  it('should propagate serverName to ToolConfirmationRequest', async () => {
-    const serverName = 'test-server';
-    const tool = new TestBaseToolInvocation(
-      {},
-      messageBus,
-      'test-tool',
-      'Test Tool',
-      serverName,
-    );
+  it("should propagate serverName to ToolConfirmationRequest", async () => {
+    const serverName = "test-server";
+    const tool = new TestBaseToolInvocation({}, messageBus, "test-tool", "Test Tool", serverName);
 
     let capturedRequest: ToolConfirmationRequest | undefined;
     vi.mocked(messageBus.publish).mockImplementation((request: Message) => {
@@ -53,31 +47,23 @@ describe('BaseToolInvocation', () => {
       }
     });
 
-    let responseHandler:
-      | ((response: ToolConfirmationResponse) => void)
-      | undefined;
+    let responseHandler: ((response: ToolConfirmationResponse) => void) | undefined;
     vi.mocked(messageBus.subscribe).mockImplementation(
       (type: MessageBusType, handler: (message: Message) => void) => {
         if (type === MessageBusType.TOOL_CONFIRMATION_RESPONSE) {
-          responseHandler = handler as (
-            response: ToolConfirmationResponse,
-          ) => void;
+          responseHandler = handler as (response: ToolConfirmationResponse) => void;
         }
       },
     );
 
-    const confirmationPromise = tool.shouldConfirmExecute(
-      abortController.signal,
-    );
+    const confirmationPromise = tool.shouldConfirmExecute(abortController.signal);
 
     // Wait for microtasks to ensure publish is called
     await new Promise((resolve) => setTimeout(resolve, 0));
 
     expect(messageBus.publish).toHaveBeenCalledTimes(1);
     expect(capturedRequest).toBeDefined();
-    expect(capturedRequest?.type).toBe(
-      MessageBusType.TOOL_CONFIRMATION_REQUEST,
-    );
+    expect(capturedRequest?.type).toBe(MessageBusType.TOOL_CONFIRMATION_REQUEST);
     expect(capturedRequest?.serverName).toBe(serverName);
 
     // Simulate response to finish the promise cleanly
@@ -92,12 +78,12 @@ describe('BaseToolInvocation', () => {
     await confirmationPromise;
   });
 
-  it('should NOT propagate serverName if not provided', async () => {
+  it("should NOT propagate serverName if not provided", async () => {
     const tool = new TestBaseToolInvocation(
       {},
       messageBus,
-      'test-tool',
-      'Test Tool',
+      "test-tool",
+      "Test Tool",
       // no serverName
     );
 
@@ -111,9 +97,7 @@ describe('BaseToolInvocation', () => {
     // We need to mock subscribe to avoid hanging if we want to await the promise,
     // but for this test we just need to check publish.
     // We'll abort to clean up.
-    const confirmationPromise = tool.shouldConfirmExecute(
-      abortController.signal,
-    );
+    const confirmationPromise = tool.shouldConfirmExecute(abortController.signal);
 
     await new Promise((resolve) => setTimeout(resolve, 0));
 
diff --git a/packages/gemini-core/src/tools/diffOptions.test.ts b/packages/gemini-core/src/tools/diffOptions.test.ts
index cf6fe89b2..2aa12a1d3 100644
--- a/packages/gemini-core/src/tools/diffOptions.test.ts
+++ b/packages/gemini-core/src/tools/diffOptions.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it } from 'vitest';
-import { getDiffStat } from './diffOptions.js';
+import { describe, expect, it } from "vitest";
+import { getDiffStat } from "./diffOptions.js";
 
-describe('getDiffStat', () => {
-  const fileName = 'test.txt';
+describe("getDiffStat", () => {
+  const fileName = "test.txt";
 
-  it('should return 0 for all stats when there are no changes', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\n';
-    const userStr = 'line1\nline2\n';
+  it("should return 0 for all stats when there are no changes", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\n";
+    const userStr = "line1\nline2\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 0,
@@ -27,10 +27,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report model additions', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\nline3\n';
+  it("should correctly report model additions", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\nline3\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -44,10 +44,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report model removals', () => {
-    const oldStr = 'line1\nline2\nline3\n';
-    const aiStr = 'line1\nline3\n';
-    const userStr = 'line1\nline3\n';
+  it("should correctly report model removals", () => {
+    const oldStr = "line1\nline2\nline3\n";
+    const aiStr = "line1\nline3\n";
+    const userStr = "line1\nline3\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 0,
@@ -61,10 +61,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report model modifications', () => {
-    const oldStr = 'line1\nline2\nline3\n';
-    const aiStr = 'line1\nline_two\nline3\n';
-    const userStr = 'line1\nline_two\nline3\n';
+  it("should correctly report model modifications", () => {
+    const oldStr = "line1\nline2\nline3\n";
+    const aiStr = "line1\nline_two\nline3\n";
+    const userStr = "line1\nline_two\nline3\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -78,10 +78,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report user additions', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\nline3\nline4\n';
+  it("should correctly report user additions", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\nline3\nline4\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -95,10 +95,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report user removals', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\n';
+  it("should correctly report user removals", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -112,10 +112,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should correctly report user modifications', () => {
-    const oldStr = 'line1\nline2\n';
-    const aiStr = 'line1\nline2\nline3\n';
-    const userStr = 'line1\nline2\nline_three\n';
+  it("should correctly report user modifications", () => {
+    const oldStr = "line1\nline2\n";
+    const aiStr = "line1\nline2\nline3\n";
+    const userStr = "line1\nline2\nline_three\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
@@ -129,10 +129,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should handle complex changes from both model and user', () => {
-    const oldStr = 'line1\nline2\nline3\nline4\n';
-    const aiStr = 'line_one\nline2\nline_three\nline4\n';
-    const userStr = 'line_one\nline_two\nline_three\nline4\nline5\n';
+  it("should handle complex changes from both model and user", () => {
+    const oldStr = "line1\nline2\nline3\nline4\n";
+    const aiStr = "line_one\nline2\nline_three\nline4\n";
+    const userStr = "line_one\nline_two\nline_three\nline4\nline5\n";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 2,
@@ -146,10 +146,10 @@ describe('getDiffStat', () => {
     });
   });
 
-  it('should report a single line modification as one addition and one removal', () => {
-    const oldStr = 'hello world';
-    const aiStr = 'hello universe';
-    const userStr = 'hello universe';
+  it("should report a single line modification as one addition and one removal", () => {
+    const oldStr = "hello world";
+    const aiStr = "hello universe";
+    const userStr = "hello universe";
     const diffStat = getDiffStat(fileName, oldStr, aiStr, userStr);
     expect(diffStat).toEqual({
       model_added_lines: 1,
diff --git a/packages/gemini-core/src/tools/diffOptions.ts b/packages/gemini-core/src/tools/diffOptions.ts
index ad0738ba0..c916f83ed 100644
--- a/packages/gemini-core/src/tools/diffOptions.ts
+++ b/packages/gemini-core/src/tools/diffOptions.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as Diff from 'diff';
-import type { DiffStat } from './tools.js';
+import * as Diff from "diff";
+import type { DiffStat } from "./tools.js";
 
 export const DEFAULT_DIFF_OPTIONS: Diff.PatchOptions = {
   context: 3,
@@ -26,10 +26,10 @@ export function getDiffStat(
 
     patch.hunks.forEach((hunk: Diff.Hunk) => {
       hunk.lines.forEach((line: string) => {
-        if (line.startsWith('+')) {
+        if (line.startsWith("+")) {
           addedLines++;
           addedChars += line.length - 1;
-        } else if (line.startsWith('-')) {
+        } else if (line.startsWith("-")) {
           removedLines++;
           removedChars += line.length - 1;
         }
@@ -43,8 +43,8 @@ export function getDiffStat(
     fileName,
     oldStr,
     aiStr,
-    'Current',
-    'Proposed',
+    "Current",
+    "Proposed",
     DEFAULT_DIFF_OPTIONS,
   );
   const modelStats = getStats(modelPatch);
@@ -54,8 +54,8 @@ export function getDiffStat(
     fileName,
     aiStr,
     userStr,
-    'Proposed',
-    'User',
+    "Proposed",
+    "User",
     DEFAULT_DIFF_OPTIONS,
   );
   const userStats = getStats(userPatch);
diff --git a/packages/gemini-core/src/tools/edit.test.ts b/packages/gemini-core/src/tools/edit.test.ts
index d8f650f46..f7f19e24b 100644
--- a/packages/gemini-core/src/tools/edit.test.ts
+++ b/packages/gemini-core/src/tools/edit.test.ts
@@ -10,29 +10,29 @@ const mockEnsureCorrectEdit = vi.hoisted(() => vi.fn());
 const mockGenerateJson = vi.hoisted(() => vi.fn());
 const mockOpenDiff = vi.hoisted(() => vi.fn());
 
-import { IdeClient } from '../ide/ide-client.js';
+import { IdeClient } from "../ide/ide-client.js";
 
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn(),
   },
 }));
 
-vi.mock('../utils/editCorrector.js', () => ({
+vi.mock("../utils/editCorrector.js", () => ({
   ensureCorrectEdit: mockEnsureCorrectEdit,
 }));
 
-vi.mock('../core/client.js', () => ({
+vi.mock("../core/client.js", () => ({
   GeminiClient: vi.fn().mockImplementation(() => ({
     generateJson: mockGenerateJson,
   })),
 }));
 
-vi.mock('../utils/editor.js', () => ({
+vi.mock("../utils/editor.js", () => ({
   openDiff: mockOpenDiff,
 }));
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
@@ -44,23 +44,23 @@ interface EditFileParameterSchema {
   };
 }
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { EditToolParams } from './edit.js';
-import { applyReplacement, EditTool } from './edit.js';
-import type { FileDiff } from './tools.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import type { Content, Part, SchemaUnion } from '@google/genai';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-describe('EditTool', () => {
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import type { Content, Part, SchemaUnion } from "@google/genai";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { ApprovalMode } from "../policy/types.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import type { EditToolParams } from "./edit.js";
+import { applyReplacement, EditTool } from "./edit.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { FileDiff } from "./tools.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+
+describe("EditTool", () => {
   let tool: EditTool;
   let tempDir: string;
   let rootDir: string;
@@ -70,8 +70,8 @@ describe('EditTool', () => {
 
   beforeEach(() => {
     vi.restoreAllMocks();
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'edit-tool-test-'));
-    rootDir = path.join(tempDir, 'root');
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "edit-tool-test-"));
+    rootDir = path.join(tempDir, "root");
     fs.mkdirSync(rootDir);
 
     geminiClient = {
@@ -94,8 +94,8 @@ describe('EditTool', () => {
       // getGeminiConfig: () => ({ apiKey: 'test-api-key' }), // This was not a real Config method
       // Add other properties/methods of Config if EditTool uses them
       // Minimal other methods to satisfy Config type if needed by EditTool constructor or other direct uses:
-      getApiKey: () => 'test-api-key',
-      getModel: () => 'test-model',
+      getApiKey: () => "test-api-key",
+      getModel: () => "test-model",
       getSandbox: () => false,
       getDebugMode: () => false,
       getQuestion: () => undefined,
@@ -104,8 +104,8 @@ describe('EditTool', () => {
       getToolCallCommand: () => undefined,
       getMcpServerCommand: () => undefined,
       getMcpServers: () => undefined,
-      getUserAgent: () => 'test-agent',
-      getUserMemory: () => '',
+      getUserAgent: () => "test-agent",
+      getUserMemory: () => "",
       setUserMemory: vi.fn(),
       getGeminiMdFileCount: () => 0,
       setGeminiMdFileCount: vi.fn(),
@@ -120,62 +120,53 @@ describe('EditTool', () => {
 
     // Reset mocks and set default implementation for ensureCorrectEdit
     mockEnsureCorrectEdit.mockReset();
-    mockEnsureCorrectEdit.mockImplementation(
-      async (_, currentContent, params) => {
-        let occurrences = 0;
-        if (params.old_string && currentContent) {
-          // Simple string counting for the mock
-          let index = currentContent.indexOf(params.old_string);
-          while (index !== -1) {
-            occurrences++;
-            index = currentContent.indexOf(params.old_string, index + 1);
-          }
-        } else if (params.old_string === '') {
-          occurrences = 0; // Creating a new file
+    mockEnsureCorrectEdit.mockImplementation(async (_, currentContent, params) => {
+      let occurrences = 0;
+      if (params.old_string && currentContent) {
+        // Simple string counting for the mock
+        let index = currentContent.indexOf(params.old_string);
+        while (index !== -1) {
+          occurrences++;
+          index = currentContent.indexOf(params.old_string, index + 1);
         }
-        return Promise.resolve({ params, occurrences });
-      },
-    );
+      } else if (params.old_string === "") {
+        occurrences = 0; // Creating a new file
+      }
+      return Promise.resolve({ params, occurrences });
+    });
 
     // Default mock for generateJson to return the snippet unchanged
     mockGenerateJson.mockReset();
-    mockGenerateJson.mockImplementation(
-      async (contents: Content[], schema: SchemaUnion) => {
-        // The problematic_snippet is the last part of the user's content
-        const userContent = contents.find((c: Content) => c.role === 'user');
-        let promptText = '';
-        if (userContent && userContent.parts) {
-          promptText = userContent.parts
-            .filter((p: Part) => typeof (p as any).text === 'string')
-            .map((p: Part) => (p as any).text)
-            .join('\n');
-        }
-        const snippetMatch = promptText.match(
-          /Problematic target snippet:\n```\n([\s\S]*?)\n```/,
-        );
-        const problematicSnippet =
-          snippetMatch && snippetMatch[1] ? snippetMatch[1] : '';
+    mockGenerateJson.mockImplementation(async (contents: Content[], schema: SchemaUnion) => {
+      // The problematic_snippet is the last part of the user's content
+      const userContent = contents.find((c: Content) => c.role === "user");
+      let promptText = "";
+      if (userContent && userContent.parts) {
+        promptText = userContent.parts
+          .filter((p: Part) => typeof (p as any).text === "string")
+          .map((p: Part) => (p as any).text)
+          .join("\n");
+      }
+      const snippetMatch = promptText.match(/Problematic target snippet:\n```\n([\s\S]*?)\n```/);
+      const problematicSnippet = snippetMatch && snippetMatch[1] ? snippetMatch[1] : "";
 
-        if (((schema as any).properties as any)?.corrected_target_snippet) {
-          return Promise.resolve({
-            corrected_target_snippet: problematicSnippet,
-          });
-        }
-        if (((schema as any).properties as any)?.corrected_new_string) {
-          // For new_string correction, we might need more sophisticated logic,
-          // but for now, returning original is a safe default if not specified by a test.
-          const originalNewStringMatch = promptText.match(
-            /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
-          );
-          const originalNewString =
-            originalNewStringMatch && originalNewStringMatch[1]
-              ? originalNewStringMatch[1]
-              : '';
-          return Promise.resolve({ corrected_new_string: originalNewString });
-        }
-        return Promise.resolve({}); // Default empty object if schema doesn't match
-      },
-    );
+      if (((schema as any).properties as any)?.corrected_target_snippet) {
+        return Promise.resolve({
+          corrected_target_snippet: problematicSnippet,
+        });
+      }
+      if (((schema as any).properties as any)?.corrected_new_string) {
+        // For new_string correction, we might need more sophisticated logic,
+        // but for now, returning original is a safe default if not specified by a test.
+        const originalNewStringMatch = promptText.match(
+          /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
+        );
+        const originalNewString =
+          originalNewStringMatch && originalNewStringMatch[1] ? originalNewStringMatch[1] : "";
+        return Promise.resolve({ corrected_new_string: originalNewString });
+      }
+      return Promise.resolve({}); // Default empty object if schema doesn't match
+    });
 
     tool = new EditTool(mockConfig);
   });
@@ -184,89 +175,87 @@ describe('EditTool', () => {
     fs.rmSync(tempDir, { recursive: true, force: true });
   });
 
-  describe('applyReplacement', () => {
-    it('should return newString if isNewFile is true', () => {
-      expect(applyReplacement(null, 'old', 'new', true)).toBe('new');
-      expect(applyReplacement('existing', 'old', 'new', true)).toBe('new');
+  describe("applyReplacement", () => {
+    it("should return newString if isNewFile is true", () => {
+      expect(applyReplacement(null, "old", "new", true)).toBe("new");
+      expect(applyReplacement("existing", "old", "new", true)).toBe("new");
     });
 
-    it('should return newString if currentContent is null and oldString is empty (defensive)', () => {
-      expect(applyReplacement(null, '', 'new', false)).toBe('new');
+    it("should return newString if currentContent is null and oldString is empty (defensive)", () => {
+      expect(applyReplacement(null, "", "new", false)).toBe("new");
     });
 
-    it('should return empty string if currentContent is null and oldString is not empty (defensive)', () => {
-      expect(applyReplacement(null, 'old', 'new', false)).toBe('');
+    it("should return empty string if currentContent is null and oldString is not empty (defensive)", () => {
+      expect(applyReplacement(null, "old", "new", false)).toBe("");
     });
 
-    it('should replace oldString with newString in currentContent', () => {
-      expect(applyReplacement('hello old world old', 'old', 'new', false)).toBe(
-        'hello new world new',
+    it("should replace oldString with newString in currentContent", () => {
+      expect(applyReplacement("hello old world old", "old", "new", false)).toBe(
+        "hello new world new",
       );
     });
 
-    it('should return currentContent if oldString is empty and not a new file', () => {
-      expect(applyReplacement('hello world', '', 'new', false)).toBe(
-        'hello world',
-      );
+    it("should return currentContent if oldString is empty and not a new file", () => {
+      expect(applyReplacement("hello world", "", "new", false)).toBe("hello world");
     });
 
-    it('should treat $ literally and not as replacement pattern', () => {
+    it("should treat $ literally and not as replacement pattern", () => {
       const current = "price is $100 and pattern end is ' '";
-      const oldStr = 'price is $100';
-      const newStr = 'price is $200';
+      const oldStr = "price is $100";
+      const newStr = "price is $200";
       const result = applyReplacement(current, oldStr, newStr, false);
       expect(result).toBe("price is $200 and pattern end is ' '");
     });
 
     it("should treat $' literally and not as a replacement pattern", () => {
-      const current = 'foo';
-      const oldStr = 'foo';
+      const current = "foo";
+      const oldStr = "foo";
       const newStr = "bar$'baz";
       const result = applyReplacement(current, oldStr, newStr, false);
       expect(result).toBe("bar$'baz");
     });
 
-    it('should treat $& literally and not as a replacement pattern', () => {
-      const current = 'hello world';
-      const oldStr = 'hello';
-      const newStr = '$&-replacement';
+    it("should treat $& literally and not as a replacement pattern", () => {
+      const current = "hello world";
+      const oldStr = "hello";
+      const newStr = "$&-replacement";
       const result = applyReplacement(current, oldStr, newStr, false);
-      expect(result).toBe('$&-replacement world');
+      expect(result).toBe("$&-replacement world");
     });
 
-    it('should treat $` literally and not as a replacement pattern', () => {
-      const current = 'prefix-middle-suffix';
-      const oldStr = 'middle';
-      const newStr = 'new$`content';
+    it("should treat $` literally and not as a replacement pattern", () => {
+      const current = "prefix-middle-suffix";
+      const oldStr = "middle";
+      const newStr = "new$`content";
       const result = applyReplacement(current, oldStr, newStr, false);
-      expect(result).toBe('prefix-new$`content-suffix');
+      expect(result).toBe("prefix-new$`content-suffix");
     });
 
-    it('should treat $1, $2 capture groups literally', () => {
-      const current = 'test string';
-      const oldStr = 'test';
-      const newStr = '$1$2replacement';
+    it("should treat $1, $2 capture groups literally", () => {
+      const current = "test string";
+      const oldStr = "test";
+      const newStr = "$1$2replacement";
       const result = applyReplacement(current, oldStr, newStr, false);
-      expect(result).toBe('$1$2replacement string');
+      expect(result).toBe("$1$2replacement string");
     });
 
-    it('should use replaceAll for normal strings without problematic $ sequences', () => {
-      const current = 'normal text replacement';
-      const oldStr = 'text';
-      const newStr = 'string';
+    it("should use replaceAll for normal strings without problematic $ sequences", () => {
+      const current = "normal text replacement";
+      const oldStr = "text";
+      const newStr = "string";
       const result = applyReplacement(current, oldStr, newStr, false);
-      expect(result).toBe('normal string replacement');
+      expect(result).toBe("normal string replacement");
     });
 
-    it('should handle multiple occurrences with problematic $ sequences', () => {
-      const current = 'foo bar foo baz';
-      const oldStr = 'foo';
+    it("should handle multiple occurrences with problematic $ sequences", () => {
+      const current = "foo bar foo baz";
+      const oldStr = "foo";
       const newStr = "test$'end";
       const result = applyReplacement(current, oldStr, newStr, false);
       expect(result).toBe("test$'end bar test$'end baz");
     });
 
-    it('should handle complex regex patterns with $ at end', () => {
+    it("should handle complex regex patterns with $ at end", () => {
       const current = "| select('match', '^[sv]d[a-z]$')";
       const oldStr = "'^[sv]d[a-z]$'";
       const newStr = "'^[sv]d[a-z]$' # updated";
@@ -274,60 +263,58 @@ describe('EditTool', () => {
       expect(result).toBe("| select('match', '^[sv]d[a-z]$' # updated)");
     });
 
-    it('should handle empty replacement with problematic $ in newString', () => {
-      const current = 'test content';
-      const oldStr = 'nothing';
+    it("should handle empty replacement with problematic $ in newString", () => {
+      const current = "test content";
+      const oldStr = "nothing";
       const newStr = "replacement$'text";
       const result = applyReplacement(current, oldStr, newStr, false);
-      expect(result).toBe('test content'); // No replacement because oldStr not found
+      expect(result).toBe("test content"); // No replacement because oldStr not found
     });
 
-    it('should handle $$ (escaped dollar) correctly', () => {
-      const current = 'price value';
-      const oldStr = 'value';
-      const newStr = '$$100';
+    it("should handle $$ (escaped dollar) correctly", () => {
+      const current = "price value";
+      const oldStr = "value";
+      const newStr = "$$100";
       const result = applyReplacement(current, oldStr, newStr, false);
-      expect(result).toBe('price $$100');
+      expect(result).toBe("price $$100");
     });
   });
 
-  describe('validateToolParams', () => {
-    it('should return null for valid params', () => {
+  describe("validateToolParams", () => {
+    it("should return null for valid params", () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'test.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "test.txt"),
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return error for path outside root', () => {
+    it("should return error for path outside root", () => {
       const params: EditToolParams = {
-        file_path: path.join(tempDir, 'outside-root.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(tempDir, "outside-root.txt"),
+        old_string: "old",
+        new_string: "new",
       };
       const error = tool.validateToolParams(params);
-      expect(error).toContain(
-        'File path must be within one of the workspace directories',
-      );
+      expect(error).toContain("File path must be within one of the workspace directories");
     });
   });
 
-  describe('shouldConfirmExecute', () => {
-    const testFile = 'edit_me.txt';
+  describe("shouldConfirmExecute", () => {
+    const testFile = "edit_me.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should resolve relative path and request confirmation', async () => {
-      fs.writeFileSync(filePath, 'some old content here');
+    it("should resolve relative path and request confirmation", async () => {
+      fs.writeFileSync(filePath, "some old content here");
       const params: EditToolParams = {
         file_path: testFile, // relative path
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       // ensureCorrectEdit will be called by shouldConfirmExecute
       mockEnsureCorrectEdit.mockResolvedValueOnce({
@@ -335,9 +322,7 @@ describe('EditTool', () => {
         occurrences: 1,
       });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Edit: ${testFile}`,
@@ -347,19 +332,17 @@ describe('EditTool', () => {
       );
     });
 
-    it('should request confirmation for valid edit', async () => {
-      fs.writeFileSync(filePath, 'some old content here');
+    it("should request confirmation for valid edit", async () => {
+      fs.writeFileSync(filePath, "some old content here");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       // ensureCorrectEdit will be called by shouldConfirmExecute
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 1 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Edit: ${testFile}`,
@@ -369,52 +352,46 @@ describe('EditTool', () => {
       );
     });
 
-    it('should return false if old_string is not found (ensureCorrectEdit returns 0)', async () => {
-      fs.writeFileSync(filePath, 'some content here');
+    it("should return false if old_string is not found (ensureCorrectEdit returns 0)", async () => {
+      fs.writeFileSync(filePath, "some content here");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'not_found',
-        new_string: 'new',
+        old_string: "not_found",
+        new_string: "new",
       };
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 0 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toBe(false);
     });
 
-    it('should return false if multiple occurrences of old_string are found (ensureCorrectEdit returns > 1)', async () => {
-      fs.writeFileSync(filePath, 'old old content here');
+    it("should return false if multiple occurrences of old_string are found (ensureCorrectEdit returns > 1)", async () => {
+      fs.writeFileSync(filePath, "old old content here");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 2 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toBe(false);
     });
 
-    it('should request confirmation for creating a new file (empty old_string)', async () => {
-      const newFileName = 'new_file.txt';
+    it("should request confirmation for creating a new file (empty old_string)", async () => {
+      const newFileName = "new_file.txt";
       const newFilePath = path.join(rootDir, newFileName);
       const params: EditToolParams = {
         file_path: newFilePath,
-        old_string: '',
-        new_string: 'new file content',
+        old_string: "",
+        new_string: "new file content",
       };
       // ensureCorrectEdit might not be called if old_string is empty,
       // as shouldConfirmExecute handles this for diff generation.
       // If it is called, it should return 0 occurrences for a new file.
       mockEnsureCorrectEdit.mockResolvedValueOnce({ params, occurrences: 0 });
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Edit: ${newFileName}`,
@@ -424,14 +401,14 @@ describe('EditTool', () => {
       );
     });
 
-    it('should use corrected params from ensureCorrectEdit for diff generation', async () => {
-      const originalContent = 'This is the original string to be replaced.';
-      const originalOldString = 'original string';
-      const originalNewString = 'new string';
+    it("should use corrected params from ensureCorrectEdit for diff generation", async () => {
+      const originalContent = "This is the original string to be replaced.";
+      const originalOldString = "original string";
+      const originalNewString = "new string";
 
-      const correctedOldString = 'original string to be replaced'; // More specific
-      const correctedNewString = 'completely new string'; // Different replacement
-      const expectedFinalContent = 'This is the completely new string.';
+      const correctedOldString = "original string to be replaced"; // More specific
+      const correctedNewString = "completely new string"; // Different replacement
+      const expectedFinalContent = "This is the completely new string.";
 
       fs.writeFileSync(filePath, originalContent);
       const params: EditToolParams = {
@@ -443,23 +420,21 @@ describe('EditTool', () => {
       // The main beforeEach already calls mockEnsureCorrectEdit.mockReset()
       // Set a specific mock for this test case
       let mockCalled = false;
-      mockEnsureCorrectEdit.mockImplementationOnce(
-        async (_, content, p, client, baseClient) => {
-          mockCalled = true;
-          expect(content).toBe(originalContent);
-          expect(p).toBe(params);
-          expect(client).toBe(geminiClient);
-          expect(baseClient).toBe(baseLlmClient);
-          return {
-            params: {
-              file_path: filePath,
-              old_string: correctedOldString,
-              new_string: correctedNewString,
-            },
-            occurrences: 1,
-          };
-        },
-      );
+      mockEnsureCorrectEdit.mockImplementationOnce(async (_, content, p, client, baseClient) => {
+        mockCalled = true;
+        expect(content).toBe(originalContent);
+        expect(p).toBe(params);
+        expect(client).toBe(geminiClient);
+        expect(baseClient).toBe(baseLlmClient);
+        return {
+          params: {
+            file_path: filePath,
+            old_string: correctedOldString,
+            new_string: correctedNewString,
+          },
+          occurrences: 1,
+        };
+      });
       const invocation = tool.build(params);
       const confirmation = (await invocation.shouldConfirmExecute(
         new AbortController().signal,
@@ -486,20 +461,20 @@ describe('EditTool', () => {
       expect(patchedContent).toBe(expectedFinalContent);
     });
 
-    it('should rethrow calculateEdit errors when the abort signal is triggered', async () => {
-      const filePath = path.join(rootDir, 'abort-confirmation.txt');
+    it("should rethrow calculateEdit errors when the abort signal is triggered", async () => {
+      const filePath = path.join(rootDir, "abort-confirmation.txt");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error('Abort requested');
+      const abortError = new Error("Abort requested");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -507,16 +482,16 @@ describe('EditTool', () => {
           throw abortError;
         });
 
-      await expect(
-        invocation.shouldConfirmExecute(abortController.signal),
-      ).rejects.toBe(abortError);
+      await expect(invocation.shouldConfirmExecute(abortController.signal)).rejects.toBe(
+        abortError,
+      );
 
       calculateSpy.mockRestore();
     });
   });
 
-  describe('execute', () => {
-    const testFile = 'execute_me.txt';
+  describe("execute", () => {
+    const testFile = "execute_me.txt";
     let filePath: string;
 
     beforeEach(() => {
@@ -530,54 +505,52 @@ describe('EditTool', () => {
             occurrences++;
             index = content.indexOf(params.old_string, index + 1);
           }
-        } else if (params.old_string === '') {
+        } else if (params.old_string === "") {
           occurrences = 0;
         }
         return { params, occurrences };
       });
     });
 
-    it('should resolve relative path and execute successfully', async () => {
-      const initialContent = 'This is some old text.';
-      const newContent = 'This is some new text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should resolve relative path and execute successfully", async () => {
+      const initialContent = "This is some old text.";
+      const newContent = "This is some new text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: testFile, // relative path
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(newContent);
     });
 
-    it('should throw error if file path is empty', async () => {
+    it("should throw error if file path is empty", async () => {
       const params: EditToolParams = {
-        file_path: '',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: "",
+        old_string: "old",
+        new_string: "new",
       };
-      expect(() => tool.build(params)).toThrow(
-        /The 'file_path' parameter must be non-empty./,
-      );
+      expect(() => tool.build(params)).toThrow(/The 'file_path' parameter must be non-empty./);
     });
 
-    it('should reject when calculateEdit fails after an abort signal', async () => {
+    it("should reject when calculateEdit fails after an abort signal", async () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'abort-execute.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "abort-execute.txt"),
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error('Abort requested during execute');
+      const abortError = new Error("Abort requested during execute");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -585,21 +558,19 @@ describe('EditTool', () => {
           throw abortError;
         });
 
-      await expect(invocation.execute(abortController.signal)).rejects.toBe(
-        abortError,
-      );
+      await expect(invocation.execute(abortController.signal)).rejects.toBe(abortError);
 
       calculateSpy.mockRestore();
     });
 
-    it('should edit an existing file and return diff with fileName', async () => {
-      const initialContent = 'This is some old text.';
-      const newContent = 'This is some new text.'; // old -> new
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should edit an existing file and return diff with fileName", async () => {
+      const initialContent = "This is some old text.";
+      const newContent = "This is some new text."; // old -> new
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
 
       // Specific mock for this test's execution path in calculateEdit
@@ -610,32 +581,30 @@ describe('EditTool', () => {
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(newContent);
       const display = result.returnDisplay as FileDiff;
       expect(display.fileDiff).toMatch(initialContent);
       expect(display.fileDiff).toMatch(newContent);
       expect(display.fileName).toBe(testFile);
     });
 
-    it('should create a new file if old_string is empty and file does not exist, and return created message', async () => {
-      const newFileName = 'brand_new_file.txt';
+    it("should create a new file if old_string is empty and file does not exist, and return created message", async () => {
+      const newFileName = "brand_new_file.txt";
       const newFilePath = path.join(rootDir, newFileName);
-      const fileContent = 'Content for the new file.';
+      const fileContent = "Content for the new file.";
       const params: EditToolParams = {
         file_path: newFilePath,
-        old_string: '',
+        old_string: "",
         new_string: fileContent,
       };
 
-      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(
-        ApprovalMode.AUTO_EDIT,
-      );
+      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Created new file/);
       expect(fs.existsSync(newFilePath)).toBe(true);
-      expect(fs.readFileSync(newFilePath, 'utf8')).toBe(fileContent);
+      expect(fs.readFileSync(newFilePath, "utf8")).toBe(fileContent);
 
       const display = result.returnDisplay as FileDiff;
       expect(display.fileDiff).toMatch(/\+Content for the new file\./);
@@ -652,48 +621,40 @@ describe('EditTool', () => {
       });
     });
 
-    it('should return error if old_string is not found in file', async () => {
-      fs.writeFileSync(filePath, 'Some content.', 'utf8');
+    it("should return error if old_string is not found in file", async () => {
+      fs.writeFileSync(filePath, "Some content.", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'nonexistent',
-        new_string: 'replacement',
+        old_string: "nonexistent",
+        new_string: "replacement",
       };
       // The default mockEnsureCorrectEdit will return 0 occurrences for 'nonexistent'
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.llmContent).toMatch(
-        /0 occurrences found for old_string in/,
-      );
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, could not find the string to replace./,
-      );
+      expect(result.llmContent).toMatch(/0 occurrences found for old_string in/);
+      expect(result.returnDisplay).toMatch(/Failed to edit, could not find the string to replace./);
     });
 
-    it('should return error if multiple occurrences of old_string are found', async () => {
-      fs.writeFileSync(filePath, 'multiple old old strings', 'utf8');
+    it("should return error if multiple occurrences of old_string are found", async () => {
+      fs.writeFileSync(filePath, "multiple old old strings", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       // The default mockEnsureCorrectEdit will return 2 occurrences for 'old'
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.llmContent).toMatch(
-        /Expected 1 occurrence but found 2 for old_string in file/,
-      );
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, expected 1 occurrence but found 2/,
-      );
+      expect(result.llmContent).toMatch(/Expected 1 occurrence but found 2 for old_string in file/);
+      expect(result.returnDisplay).toMatch(/Failed to edit, expected 1 occurrence but found 2/);
     });
 
-    it('should successfully replace multiple occurrences when expected_replacements specified', async () => {
-      fs.writeFileSync(filePath, 'old text\nold text\nold text', 'utf8');
+    it("should successfully replace multiple occurrences when expected_replacements specified", async () => {
+      fs.writeFileSync(filePath, "old text\nold text\nold text", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
         expected_replacements: 3,
       };
 
@@ -701,9 +662,7 @@ describe('EditTool', () => {
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(
-        'new text\nnew text\nnew text',
-      );
+      expect(fs.readFileSync(filePath, "utf8")).toBe("new text\nnew text\nnew text");
       const display = result.returnDisplay as FileDiff;
 
       expect(display.fileDiff).toMatch(/-old text\n-old text\n-old text/);
@@ -721,12 +680,12 @@ describe('EditTool', () => {
       });
     });
 
-    it('should return error if expected_replacements does not match actual occurrences', async () => {
-      fs.writeFileSync(filePath, 'old text old text', 'utf8');
+    it("should return error if expected_replacements does not match actual occurrences", async () => {
+      fs.writeFileSync(filePath, "old text old text", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
         expected_replacements: 3, // Expecting 3 but only 2 exist
       };
       const invocation = tool.build(params);
@@ -734,46 +693,38 @@ describe('EditTool', () => {
       expect(result.llmContent).toMatch(
         /Expected 3 occurrences but found 2 for old_string in file/,
       );
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, expected 3 occurrences but found 2/,
-      );
+      expect(result.returnDisplay).toMatch(/Failed to edit, expected 3 occurrences but found 2/);
     });
 
-    it('should return error if trying to create a file that already exists (empty old_string)', async () => {
-      fs.writeFileSync(filePath, 'Existing content', 'utf8');
+    it("should return error if trying to create a file that already exists (empty old_string)", async () => {
+      fs.writeFileSync(filePath, "Existing content", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: '',
-        new_string: 'new content',
+        old_string: "",
+        new_string: "new content",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toMatch(/File already exists, cannot create/);
-      expect(result.returnDisplay).toMatch(
-        /Attempted to create a file that already exists/,
-      );
+      expect(result.returnDisplay).toMatch(/Attempted to create a file that already exists/);
     });
 
-    it('should include modification message when proposed content is modified', async () => {
-      const initialContent = 'Line 1\nold line\nLine 3\nLine 4\nLine 5\n';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should include modification message when proposed content is modified", async () => {
+      const initialContent = "Line 1\nold line\nLine 3\nLine 4\nLine 5\n";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
         modified_by_user: true,
-        ai_proposed_content: 'Line 1\nAI line\nLine 3\nLine 4\nLine 5\n',
+        ai_proposed_content: "Line 1\nAI line\nLine 3\nLine 4\nLine 5\n",
       };
 
-      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(
-        ApprovalMode.AUTO_EDIT,
-      );
+      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.llmContent).toMatch(
-        /User modified the `new_string` content/,
-      );
+      expect(result.llmContent).toMatch(/User modified the `new_string` content/);
       expect((result.returnDisplay as FileDiff).diffStat).toStrictEqual({
         model_added_lines: 1,
         model_removed_lines: 1,
@@ -786,54 +737,46 @@ describe('EditTool', () => {
       });
     });
 
-    it('should not include modification message when proposed content is not modified', async () => {
-      const initialContent = 'This is some old text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should not include modification message when proposed content is not modified", async () => {
+      const initialContent = "This is some old text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
         modified_by_user: false,
       };
 
-      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(
-        ApprovalMode.AUTO_EDIT,
-      );
+      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.llmContent).not.toMatch(
-        /User modified the `new_string` content/,
-      );
+      expect(result.llmContent).not.toMatch(/User modified the `new_string` content/);
     });
 
-    it('should not include modification message when modified_by_user is not provided', async () => {
-      const initialContent = 'This is some old text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should not include modification message when modified_by_user is not provided", async () => {
+      const initialContent = "This is some old text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
 
-      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(
-        ApprovalMode.AUTO_EDIT,
-      );
+      (mockConfig.getApprovalMode as Mock).mockReturnValueOnce(ApprovalMode.AUTO_EDIT);
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.llmContent).not.toMatch(
-        /User modified the `new_string` content/,
-      );
+      expect(result.llmContent).not.toMatch(/User modified the `new_string` content/);
     });
 
-    it('should return error if old_string and new_string are identical', async () => {
-      const initialContent = 'This is some identical text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should return error if old_string and new_string are identical", async () => {
+      const initialContent = "This is some identical text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'identical',
-        new_string: 'identical',
+        old_string: "identical",
+        new_string: "identical",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
@@ -841,16 +784,16 @@ describe('EditTool', () => {
       expect(result.returnDisplay).toMatch(/No changes to apply/);
     });
 
-    it('should return EDIT_NO_CHANGE error if replacement results in identical content', async () => {
+    it("should return EDIT_NO_CHANGE error if replacement results in identical content", async () => {
       // This can happen if ensureCorrectEdit finds a fuzzy match, but the literal
       // string replacement with `replaceAll` results in no change.
-      const initialContent = 'line 1\nline  2\nline 3'; // Note the double space
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+      const initialContent = "line 1\nline  2\nline 3"; // Note the double space
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
         // old_string has a single space, so it won't be found by replaceAll
-        old_string: 'line 1\nline 2\nline 3',
-        new_string: 'line 1\nnew line 2\nline 3',
+        old_string: "line 1\nline 2\nline 3",
+        new_string: "line 1\nnew line 2\nline 3",
       };
 
       // Mock ensureCorrectEdit to simulate it finding a match (e.g., via fuzzy matching)
@@ -865,100 +808,96 @@ describe('EditTool', () => {
         /No changes to apply. The new content is identical to the current content./,
       );
       // Ensure the file was not actually changed
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(initialContent);
     });
   });
 
-  describe('Error Scenarios', () => {
-    const testFile = 'error_test.txt';
+  describe("Error Scenarios", () => {
+    const testFile = "error_test.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should return FILE_NOT_FOUND error', async () => {
+    it("should return FILE_NOT_FOUND error", async () => {
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'any',
-        new_string: 'new',
+        old_string: "any",
+        new_string: "new",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.FILE_NOT_FOUND);
     });
 
-    it('should return ATTEMPT_TO_CREATE_EXISTING_FILE error', async () => {
-      fs.writeFileSync(filePath, 'existing content', 'utf8');
+    it("should return ATTEMPT_TO_CREATE_EXISTING_FILE error", async () => {
+      fs.writeFileSync(filePath, "existing content", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: '',
-        new_string: 'new content',
+        old_string: "",
+        new_string: "new content",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.error?.type).toBe(
-        ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
-      );
+      expect(result.error?.type).toBe(ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE);
     });
 
-    it('should return NO_OCCURRENCE_FOUND error', async () => {
-      fs.writeFileSync(filePath, 'content', 'utf8');
+    it("should return NO_OCCURRENCE_FOUND error", async () => {
+      fs.writeFileSync(filePath, "content", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'not-found',
-        new_string: 'new',
+        old_string: "not-found",
+        new_string: "new",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_OCCURRENCE_FOUND);
     });
 
-    it('should return EXPECTED_OCCURRENCE_MISMATCH error', async () => {
-      fs.writeFileSync(filePath, 'one one two', 'utf8');
+    it("should return EXPECTED_OCCURRENCE_MISMATCH error", async () => {
+      fs.writeFileSync(filePath, "one one two", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'one',
-        new_string: 'new',
+        old_string: "one",
+        new_string: "new",
         expected_replacements: 3,
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.error?.type).toBe(
-        ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
-      );
+      expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
     });
 
-    it('should return NO_CHANGE error', async () => {
-      fs.writeFileSync(filePath, 'content', 'utf8');
+    it("should return NO_CHANGE error", async () => {
+      fs.writeFileSync(filePath, "content", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'content',
-        new_string: 'content',
+        old_string: "content",
+        new_string: "content",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_CHANGE);
     });
 
-    it('should not throw error for relative path', async () => {
+    it("should not throw error for relative path", async () => {
       const params: EditToolParams = {
-        file_path: 'relative/path.txt',
-        old_string: 'a',
-        new_string: 'b',
+        file_path: "relative/path.txt",
+        old_string: "a",
+        new_string: "b",
       };
       expect(() => tool.build(params)).not.toThrow();
     });
 
-    it('should return FILE_WRITE_FAILURE on write error', async () => {
-      fs.writeFileSync(filePath, 'content', 'utf8');
+    it("should return FILE_WRITE_FAILURE on write error", async () => {
+      fs.writeFileSync(filePath, "content", "utf8");
       // Make file readonly to trigger a write error
-      fs.chmodSync(filePath, '444');
+      fs.chmodSync(filePath, "444");
 
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'content',
-        new_string: 'new content',
+        old_string: "content",
+        new_string: "new content",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
@@ -966,27 +905,25 @@ describe('EditTool', () => {
     });
   });
 
-  describe('getDescription', () => {
+  describe("getDescription", () => {
     it('should return "No file changes to..." if old_string and new_string are the same', () => {
-      const testFileName = 'test.txt';
+      const testFileName = "test.txt";
       const params: EditToolParams = {
         file_path: path.join(rootDir, testFileName),
-        old_string: 'identical_string',
-        new_string: 'identical_string',
+        old_string: "identical_string",
+        new_string: "identical_string",
       };
       const invocation = tool.build(params);
       // shortenPath will be called internally, resulting in just the file name
-      expect(invocation.getDescription()).toBe(
-        `No file changes to ${testFileName}`,
-      );
+      expect(invocation.getDescription()).toBe(`No file changes to ${testFileName}`);
     });
 
-    it('should return a snippet of old and new strings if they are different', () => {
-      const testFileName = 'test.txt';
+    it("should return a snippet of old and new strings if they are different", () => {
+      const testFileName = "test.txt";
       const params: EditToolParams = {
         file_path: path.join(rootDir, testFileName),
-        old_string: 'this is the old string value',
-        new_string: 'this is the new string value',
+        old_string: "this is the old string value",
+        new_string: "this is the new string value",
       };
       const invocation = tool.build(params);
       // shortenPath will be called internally, resulting in just the file name
@@ -996,25 +933,23 @@ describe('EditTool', () => {
       );
     });
 
-    it('should handle very short strings correctly in the description', () => {
-      const testFileName = 'short.txt';
+    it("should handle very short strings correctly in the description", () => {
+      const testFileName = "short.txt";
       const params: EditToolParams = {
         file_path: path.join(rootDir, testFileName),
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       const invocation = tool.build(params);
       expect(invocation.getDescription()).toBe(`${testFileName}: old => new`);
     });
 
-    it('should truncate long strings in the description', () => {
-      const testFileName = 'long.txt';
+    it("should truncate long strings in the description", () => {
+      const testFileName = "long.txt";
       const params: EditToolParams = {
         file_path: path.join(rootDir, testFileName),
-        old_string:
-          'this is a very long old string that will definitely be truncated',
-        new_string:
-          'this is a very long new string that will also be truncated',
+        old_string: "this is a very long old string that will definitely be truncated",
+        new_string: "this is a very long new string that will also be truncated",
       };
       const invocation = tool.build(params);
       expect(invocation.getDescription()).toBe(
@@ -1023,60 +958,56 @@ describe('EditTool', () => {
     });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should validate paths are within workspace root', () => {
+  describe("workspace boundary validation", () => {
+    it("should validate paths are within workspace root", () => {
       const validPath = {
-        file_path: path.join(rootDir, 'file.txt'),
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "file.txt"),
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(validPath)).toBeNull();
     });
 
-    it('should reject paths outside workspace root', () => {
+    it("should reject paths outside workspace root", () => {
       const invalidPath = {
-        file_path: '/etc/passwd',
-        old_string: 'root',
-        new_string: 'hacked',
+        file_path: "/etc/passwd",
+        old_string: "root",
+        new_string: "hacked",
       };
       const error = tool.validateToolParams(invalidPath);
-      expect(error).toContain(
-        'File path must be within one of the workspace directories',
-      );
+      expect(error).toContain("File path must be within one of the workspace directories");
       expect(error).toContain(rootDir);
     });
   });
 
-  describe('constructor', () => {
+  describe("constructor", () => {
     afterEach(() => {
       vi.restoreAllMocks();
     });
 
-    it('should use windows-style path examples on windows', () => {
-      vi.spyOn(process, 'platform', 'get').mockReturnValue('win32');
+    it("should use windows-style path examples on windows", () => {
+      vi.spyOn(process, "platform", "get").mockReturnValue("win32");
 
       const tool = new EditTool({} as unknown as Config);
       const schema = tool.schema;
       expect(
-        (schema.parametersJsonSchema as EditFileParameterSchema).properties
-          .file_path.description,
-      ).toBe('The path to the file to modify.');
+        (schema.parametersJsonSchema as EditFileParameterSchema).properties.file_path.description,
+      ).toBe("The path to the file to modify.");
     });
 
-    it('should use unix-style path examples on non-windows platforms', () => {
-      vi.spyOn(process, 'platform', 'get').mockReturnValue('linux');
+    it("should use unix-style path examples on non-windows platforms", () => {
+      vi.spyOn(process, "platform", "get").mockReturnValue("linux");
 
       const tool = new EditTool({} as unknown as Config);
       const schema = tool.schema;
       expect(
-        (schema.parametersJsonSchema as EditFileParameterSchema).properties
-          .file_path.description,
-      ).toBe('The path to the file to modify.');
+        (schema.parametersJsonSchema as EditFileParameterSchema).properties.file_path.description,
+      ).toBe("The path to the file to modify.");
     });
   });
 
-  describe('IDE mode', () => {
-    const testFile = 'edit_me.txt';
+  describe("IDE mode", () => {
+    const testFile = "edit_me.txt";
     let filePath: string;
     let ideClient: any;
 
@@ -1090,33 +1021,31 @@ describe('EditTool', () => {
       (mockConfig as any).getIdeMode = () => true;
     });
 
-    it('should call ideClient.openDiff and update params on confirmation', async () => {
-      const initialContent = 'some old content here';
-      const newContent = 'some new content here';
-      const modifiedContent = 'some modified content here';
+    it("should call ideClient.openDiff and update params on confirmation", async () => {
+      const initialContent = "some old content here";
+      const newContent = "some new content here";
+      const modifiedContent = "some modified content here";
       fs.writeFileSync(filePath, initialContent);
       const params: EditToolParams = {
         file_path: filePath,
-        old_string: 'old',
-        new_string: 'new',
+        old_string: "old",
+        new_string: "new",
       };
       mockEnsureCorrectEdit.mockResolvedValueOnce({
-        params: { ...params, old_string: 'old', new_string: 'new' },
+        params: { ...params, old_string: "old", new_string: "new" },
         occurrences: 1,
       });
       ideClient.openDiff.mockResolvedValueOnce({
-        status: 'accepted',
+        status: "accepted",
         content: modifiedContent,
       });
 
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(ideClient.openDiff).toHaveBeenCalledWith(filePath, newContent);
 
-      if (confirmation && 'onConfirm' in confirmation) {
+      if (confirmation && "onConfirm" in confirmation) {
         await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
       }
 
@@ -1125,8 +1054,8 @@ describe('EditTool', () => {
     });
   });
 
-  describe('multiple file edits', () => {
-    it('should perform multiple removals and report correct diff stats', async () => {
+  describe("multiple file edits", () => {
+    it("should perform multiple removals and report correct diff stats", async () => {
       const numFiles = 10;
       const files: Array<{
         path: string;
@@ -1141,23 +1070,17 @@ describe('EditTool', () => {
         const fileName = `test-file-${i}.txt`;
         const filePath = path.join(rootDir, fileName);
         const numLines = Math.floor(Math.random() * 6) + 5; // 5 to 10 lines
-        const lines = Array.from(
-          { length: numLines },
-          (_, j) => `File ${i}, Line ${j + 1}`,
-        );
-        const content = lines.join('\n') + '\n';
+        const lines = Array.from({ length: numLines }, (_, j) => `File ${i}, Line ${j + 1}`);
+        const content = lines.join("\n") + "\n";
 
         // Determine which lines to remove (2 or 3 lines)
         const numLinesToRemove = Math.floor(Math.random() * 2) + 2; // 2 or 3
         expectedLinesRemoved.push(numLinesToRemove);
         const startLineToRemove = 1; // Start removing from the second line
-        const linesToRemove = lines.slice(
-          startLineToRemove,
-          startLineToRemove + numLinesToRemove,
-        );
-        const toRemove = linesToRemove.join('\n') + '\n';
+        const linesToRemove = lines.slice(startLineToRemove, startLineToRemove + numLinesToRemove);
+        const toRemove = linesToRemove.join("\n") + "\n";
 
-        fs.writeFileSync(filePath, content, 'utf8');
+        fs.writeFileSync(filePath, content, "utf8");
         files.push({
           path: filePath,
           initialContent: content,
@@ -1170,20 +1093,18 @@ describe('EditTool', () => {
         const params: EditToolParams = {
           file_path: file.path,
           old_string: file.toRemove,
-          new_string: '', // Removing the content
+          new_string: "", // Removing the content
         };
         const invocation = tool.build(params);
         const result = await invocation.execute(new AbortController().signal);
 
         if (
           result.returnDisplay &&
-          typeof result.returnDisplay === 'object' &&
-          'diffStat' in result.returnDisplay &&
+          typeof result.returnDisplay === "object" &&
+          "diffStat" in result.returnDisplay &&
           result.returnDisplay.diffStat
         ) {
-          actualLinesRemoved.push(
-            result.returnDisplay.diffStat?.model_removed_lines,
-          );
+          actualLinesRemoved.push(result.returnDisplay.diffStat?.model_removed_lines);
         } else if (result.error) {
           console.error(`Edit failed for ${file.path}:`, result.error);
         }
@@ -1191,21 +1112,15 @@ describe('EditTool', () => {
 
       // 3. Assert that the content was removed from each file
       for (const file of files) {
-        const finalContent = fs.readFileSync(file.path, 'utf8');
-        const expectedContent = file.initialContent.replace(file.toRemove, '');
+        const finalContent = fs.readFileSync(file.path, "utf8");
+        const expectedContent = file.initialContent.replace(file.toRemove, "");
         expect(finalContent).toBe(expectedContent);
         expect(finalContent).not.toContain(file.toRemove);
       }
 
       // 4. Assert that the total number of removed lines matches the diffStat total
-      const totalExpectedRemoved = expectedLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
-      const totalActualRemoved = actualLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
+      const totalExpectedRemoved = expectedLinesRemoved.reduce((sum, current) => sum + current, 0);
+      const totalActualRemoved = actualLinesRemoved.reduce((sum, current) => sum + current, 0);
       expect(totalActualRemoved).toBe(totalExpectedRemoved);
     });
   });
diff --git a/packages/gemini-core/src/tools/edit.ts b/packages/gemini-core/src/tools/edit.ts
index 4ffd0dbf7..40762454a 100644
--- a/packages/gemini-core/src/tools/edit.ts
+++ b/packages/gemini-core/src/tools/edit.ts
@@ -4,44 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as Diff from 'diff';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+
+import { ensureCorrectEdit } from "../utils/editCorrector.js";
+import { isNodeError } from "../utils/errors.js";
+import { getSpecificMimeType } from "../utils/fileUtils.js";
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { safeLiteralReplace } from "../utils/textUtils.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from "./tool-names.js";
 import type {
   ToolCallConfirmationDetails,
   ToolEditConfirmationDetails,
   ToolInvocation,
   ToolLocation,
   ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { isNodeError } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import { ensureCorrectEdit } from '../utils/editCorrector.js';
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getSpecificMimeType } from '../utils/fileUtils.js';
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { safeLiteralReplace } from '../utils/textUtils.js';
-import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 export function applyReplacement(
   currentContent: string | null,
@@ -54,10 +46,10 @@ export function applyReplacement(
   }
   if (currentContent === null) {
     // Should not happen if not a new file, but defensively return empty or newString if oldString is also empty
-    return oldString === '' ? newString : '';
+    return oldString === "" ? newString : "";
   }
   // If oldString is empty and it's not a new file, do not modify the content.
-  if (oldString === '' && !isNewFile) {
+  if (oldString === "" && !isNewFile) {
     return currentContent;
   }
 
@@ -123,10 +115,7 @@ class EditToolInvocation
     displayName?: string,
   ) {
     super(params, messageBus, toolName, displayName);
-    this.resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.file_path,
-    );
+    this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
   }
 
   override toolLocations(): ToolLocation[] {
@@ -150,26 +139,22 @@ class EditToolInvocation
     let finalNewString = params.new_string;
     let finalOldString = params.old_string;
     let occurrences = 0;
-    let error:
-      | { display: string; raw: string; type: ToolErrorType }
-      | undefined = undefined;
+    let error: { display: string; raw: string; type: ToolErrorType } | undefined = undefined;
 
     try {
-      currentContent = await this.config
-        .getFileSystemService()
-        .readTextFile(this.resolvedPath);
+      currentContent = await this.config.getFileSystemService().readTextFile(this.resolvedPath);
       // Normalize line endings to LF for consistent processing.
-      currentContent = currentContent.replace(/\r\n/g, '\n');
+      currentContent = currentContent.replace(/\r\n/g, "\n");
       fileExists = true;
     } catch (err: unknown) {
-      if (!isNodeError(err) || err.code !== 'ENOENT') {
+      if (!isNodeError(err) || err.code !== "ENOENT") {
         // Rethrow unexpected FS errors (permissions, etc.)
         throw err;
       }
       fileExists = false;
     }
 
-    if (params.old_string === '' && !fileExists) {
+    if (params.old_string === "" && !fileExists) {
       // Creating a new file
       isNewFile = true;
     } else if (!fileExists) {
@@ -193,7 +178,7 @@ class EditToolInvocation
       finalNewString = correctedEdit.params.new_string;
       occurrences = correctedEdit.occurrences;
 
-      if (params.old_string === '') {
+      if (params.old_string === "") {
         // Error: Trying to create a file that already exists
         error = {
           display: `Failed to edit. Attempted to create a file that already exists.`,
@@ -207,8 +192,7 @@ class EditToolInvocation
           type: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
         };
       } else if (occurrences !== expectedReplacements) {
-        const occurrenceTerm =
-          expectedReplacements === 1 ? 'occurrence' : 'occurrences';
+        const occurrenceTerm = expectedReplacements === 1 ? "occurrence" : "occurrences";
 
         error = {
           display: `Failed to edit, expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences}.`,
@@ -232,18 +216,12 @@ class EditToolInvocation
     }
 
     const newContent = !error
-      ? applyReplacement(
-          currentContent,
-          finalOldString,
-          finalNewString,
-          isNewFile,
-        )
-      : (currentContent ?? '');
+      ? applyReplacement(currentContent, finalOldString, finalNewString, isNewFile)
+      : (currentContent ?? "");
 
     if (!error && fileExists && currentContent === newContent) {
       error = {
-        display:
-          'No changes to apply. The new content is identical to the current content.',
+        display: "No changes to apply. The new content is identical to the current content.",
         raw: `No changes to apply. The new content is identical to the current content in file: ${this.resolvedPath}`,
         type: ToolErrorType.EDIT_NO_CHANGE,
       };
@@ -289,10 +267,10 @@ class EditToolInvocation
     const fileName = path.basename(this.resolvedPath);
     const fileDiff = Diff.createPatch(
       fileName,
-      editData.currentContent ?? '',
+      editData.currentContent ?? "",
       editData.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
     const ideClient = await IdeClient.getInstance();
@@ -302,7 +280,7 @@ class EditToolInvocation
         : undefined;
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Edit: ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`,
       fileName,
       filePath: this.resolvedPath,
@@ -316,10 +294,10 @@ class EditToolInvocation
 
         if (ideConfirmation) {
           const result = await ideConfirmation;
-          if (result.status === 'accepted' && result.content) {
+          if (result.status === "accepted" && result.content) {
             // TODO(chrstn): See https://github.com/google-gemini/gemini-cli/pull/5618#discussion_r2255413084
             // for info on a possible race condition where the file is modified on disk while being edited.
-            this.params.old_string = editData.currentContent ?? '';
+            this.params.old_string = editData.currentContent ?? "";
             this.params.new_string = result.content;
           }
         }
@@ -330,20 +308,17 @@ class EditToolInvocation
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
-    if (this.params.old_string === '') {
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
+    if (this.params.old_string === "") {
       return `Create ${shortenPath(relativePath)}`;
     }
 
     const oldStringSnippet =
-      this.params.old_string.split('\n')[0].substring(0, 30) +
-      (this.params.old_string.length > 30 ? '...' : '');
+      this.params.old_string.split("\n")[0].substring(0, 30) +
+      (this.params.old_string.length > 30 ? "..." : "");
     const newStringSnippet =
-      this.params.new_string.split('\n')[0].substring(0, 30) +
-      (this.params.new_string.length > 30 ? '...' : '');
+      this.params.new_string.split("\n")[0].substring(0, 30) +
+      (this.params.new_string.length > 30 ? "..." : "");
 
     if (this.params.old_string === this.params.new_string) {
       return `No file changes to ${shortenPath(relativePath)}`;
@@ -393,21 +368,20 @@ class EditToolInvocation
         .writeTextFile(this.resolvedPath, editData.newContent);
 
       const fileName = path.basename(this.resolvedPath);
-      const originallyProposedContent =
-        this.params.ai_proposed_content || editData.newContent;
+      const originallyProposedContent = this.params.ai_proposed_content || editData.newContent;
       const diffStat = getDiffStat(
         fileName,
-        editData.currentContent ?? '',
+        editData.currentContent ?? "",
         originallyProposedContent,
         editData.newContent,
       );
 
       const fileDiff = Diff.createPatch(
         fileName,
-        editData.currentContent ?? '', // Should not be null here if not isNewFile
+        editData.currentContent ?? "", // Should not be null here if not isNewFile
         editData.newContent,
-        'Current',
-        'Proposed',
+        "Current",
+        "Proposed",
         DEFAULT_DIFF_OPTIONS,
       );
       const displayResult = {
@@ -422,16 +396,14 @@ class EditToolInvocation
       const mimetype = getSpecificMimeType(this.resolvedPath);
       const programmingLanguage = getLanguageFromFilePath(this.resolvedPath);
       const extension = path.extname(this.resolvedPath);
-      const operation = editData.isNewFile
-        ? FileOperation.CREATE
-        : FileOperation.UPDATE;
+      const operation = editData.isNewFile ? FileOperation.CREATE : FileOperation.UPDATE;
 
       logFileOperation(
         this.config,
         new FileOperationEvent(
           EDIT_TOOL_NAME,
           operation,
-          editData.newContent.split('\n').length,
+          editData.newContent.split("\n").length,
           mimetype,
           extension,
           programmingLanguage,
@@ -450,7 +422,7 @@ class EditToolInvocation
       }
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -492,7 +464,7 @@ export class EditTool
   ) {
     super(
       EditTool.Name,
-      'Edit',
+      "Edit",
       `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
 
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
@@ -508,28 +480,28 @@ Expectation for required parameters:
       {
         properties: {
           file_path: {
-            description: 'The path to the file to modify.',
-            type: 'string',
+            description: "The path to the file to modify.",
+            type: "string",
           },
           old_string: {
             description:
-              'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
-            type: 'string',
+              "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. For multiple replacements, specify expected_replacements parameter. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            type: "string",
           },
           new_string: {
             description:
-              'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
-            type: 'string',
+              "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
+            type: "string",
           },
           expected_replacements: {
-            type: 'number',
+            type: "number",
             description:
-              'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
+              "Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.",
             minimum: 1,
           },
         },
-        required: ['file_path', 'old_string', 'new_string'],
-        type: 'object',
+        required: ["file_path", "old_string", "new_string"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -542,21 +514,16 @@ Expectation for required parameters:
    * @param params Parameters to validate
    * @returns Error message string or null if valid
    */
-  protected override validateToolParamValues(
-    params: EditToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: EditToolParams): string | null {
     if (!params.file_path) {
       return "The 'file_path' parameter must be non-empty.";
     }
 
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      params.file_path,
-    );
+    const resolvedPath = path.resolve(this.config.getTargetDir(), params.file_path);
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
 
     return null;
@@ -578,8 +545,7 @@ Expectation for required parameters:
   }
 
   getModifyContext(_: AbortSignal): ModifyContext<EditToolParams> {
-    const resolvePath = (filePath: string) =>
-      path.resolve(this.config.getTargetDir(), filePath);
+    const resolvePath = (filePath: string) => path.resolve(this.config.getTargetDir(), filePath);
 
     return {
       getFilePath: (params: EditToolParams) => params.file_path,
@@ -589,8 +555,8 @@ Expectation for required parameters:
             .getFileSystemService()
             .readTextFile(resolvePath(params.file_path));
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       getProposedContent: async (params: EditToolParams): Promise<string> => {
@@ -602,11 +568,11 @@ Expectation for required parameters:
             currentContent,
             params.old_string,
             params.new_string,
-            params.old_string === '' && currentContent === '',
+            params.old_string === "" && currentContent === "",
           );
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       createUpdatedParams: (
diff --git a/packages/gemini-core/src/tools/glob.test.ts b/packages/gemini-core/src/tools/glob.test.ts
index 4c6548008..5ab9f5621 100644
--- a/packages/gemini-core/src/tools/glob.test.ts
+++ b/packages/gemini-core/src/tools/glob.test.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GlobToolParams, GlobPath } from './glob.js';
-import { GlobTool, sortFileEntries } from './glob.js';
-import { partListUnionToString } from '../core/geminiRequest.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import type { Config } from '../config/config.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { ToolErrorType } from './tool-error.js';
-import * as glob from 'glob';
-
-vi.mock('glob', { spy: true });
-
-describe('GlobTool', () => {
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import * as glob from "glob";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { partListUnionToString } from "../core/geminiRequest.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import type { GlobPath, GlobToolParams } from "./glob.js";
+import { GlobTool, sortFileEntries } from "./glob.js";
+import { ToolErrorType } from "./tool-error.js";
+
+vi.mock("glob", { spy: true });
+
+describe("GlobTool", () => {
   let tempRootDir: string; // This will be the rootDirectory for the GlobTool instance
   let globTool: GlobTool;
   const abortSignal = new AbortController().signal;
@@ -41,32 +41,29 @@ describe('GlobTool', () => {
 
   beforeEach(async () => {
     // Create a unique root directory for each test run
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'glob-tool-root-'));
-    await fs.writeFile(path.join(tempRootDir, '.git'), ''); // Fake git repo
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "glob-tool-root-"));
+    await fs.writeFile(path.join(tempRootDir, ".git"), ""); // Fake git repo
     globTool = new GlobTool(mockConfig);
 
     // Create some test files and directories within this root
     // Top-level files
-    await fs.writeFile(path.join(tempRootDir, 'fileA.txt'), 'contentA');
-    await fs.writeFile(path.join(tempRootDir, 'FileB.TXT'), 'contentB'); // Different case for testing
+    await fs.writeFile(path.join(tempRootDir, "fileA.txt"), "contentA");
+    await fs.writeFile(path.join(tempRootDir, "FileB.TXT"), "contentB"); // Different case for testing
 
     // Subdirectory and files within it
-    await fs.mkdir(path.join(tempRootDir, 'sub'));
-    await fs.writeFile(path.join(tempRootDir, 'sub', 'fileC.md'), 'contentC');
-    await fs.writeFile(path.join(tempRootDir, 'sub', 'FileD.MD'), 'contentD'); // Different case
+    await fs.mkdir(path.join(tempRootDir, "sub"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "fileC.md"), "contentC");
+    await fs.writeFile(path.join(tempRootDir, "sub", "FileD.MD"), "contentD"); // Different case
 
     // Deeper subdirectory
-    await fs.mkdir(path.join(tempRootDir, 'sub', 'deep'));
-    await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'deep', 'fileE.log'),
-      'contentE',
-    );
+    await fs.mkdir(path.join(tempRootDir, "sub", "deep"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "deep", "fileE.log"), "contentE");
 
     // Files for mtime sorting test
-    await fs.writeFile(path.join(tempRootDir, 'older.sortme'), 'older_content');
+    await fs.writeFile(path.join(tempRootDir, "older.sortme"), "older_content");
     // Ensure a noticeable difference in modification time
     await new Promise((resolve) => setTimeout(resolve, 50));
-    await fs.writeFile(path.join(tempRootDir, 'newer.sortme'), 'newer_content');
+    await fs.writeFile(path.join(tempRootDir, "newer.sortme"), "newer_content");
   });
 
   afterEach(async () => {
@@ -74,132 +71,116 @@ describe('GlobTool', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  describe('execute', () => {
-    it('should find files matching a simple pattern in the root', async () => {
-      const params: GlobToolParams = { pattern: '*.txt' };
+  describe("execute", () => {
+    it("should find files matching a simple pattern in the root", async () => {
+      const params: GlobToolParams = { pattern: "*.txt" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
-      expect(result.returnDisplay).toBe('Found 2 matching file(s)');
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "FileB.TXT"));
+      expect(result.returnDisplay).toBe("Found 2 matching file(s)");
     });
 
-    it('should find files case-sensitively when case_sensitive is true', async () => {
-      const params: GlobToolParams = { pattern: '*.txt', case_sensitive: true };
+    it("should find files case-sensitively when case_sensitive is true", async () => {
+      const params: GlobToolParams = { pattern: "*.txt", case_sensitive: true };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).not.toContain(
-        path.join(tempRootDir, 'FileB.TXT'),
-      );
+      expect(result.llmContent).toContain("Found 1 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).not.toContain(path.join(tempRootDir, "FileB.TXT"));
     });
 
-    it('should find files case-insensitively by default (pattern: *.TXT)', async () => {
-      const params: GlobToolParams = { pattern: '*.TXT' };
+    it("should find files case-insensitively by default (pattern: *.TXT)", async () => {
+      const params: GlobToolParams = { pattern: "*.TXT" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "FileB.TXT"));
     });
 
-    it('should find files case-insensitively when case_sensitive is false (pattern: *.TXT)', async () => {
+    it("should find files case-insensitively when case_sensitive is false (pattern: *.TXT)", async () => {
       const params: GlobToolParams = {
-        pattern: '*.TXT',
+        pattern: "*.TXT",
         case_sensitive: false,
       };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'fileA.txt'));
-      expect(result.llmContent).toContain(path.join(tempRootDir, 'FileB.TXT'));
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "fileA.txt"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "FileB.TXT"));
     });
 
-    it('should find files using a pattern that includes a subdirectory', async () => {
-      const params: GlobToolParams = { pattern: 'sub/*.md' };
+    it("should find files using a pattern that includes a subdirectory", async () => {
+      const params: GlobToolParams = { pattern: "sub/*.md" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'fileC.md'),
-      );
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'FileD.MD'),
-      );
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "fileC.md"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "FileD.MD"));
     });
 
-    it('should find files in a specified relative path (relative to rootDir)', async () => {
-      const params: GlobToolParams = { pattern: '*.md', dir_path: 'sub' };
+    it("should find files in a specified relative path (relative to rootDir)", async () => {
+      const params: GlobToolParams = { pattern: "*.md", dir_path: "sub" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'fileC.md'),
-      );
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'FileD.MD'),
-      );
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "fileC.md"));
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "FileD.MD"));
     });
 
-    it('should find files using a deep globstar pattern (e.g., **/*.log)', async () => {
-      const params: GlobToolParams = { pattern: '**/*.log' };
+    it("should find files using a deep globstar pattern (e.g., **/*.log)", async () => {
+      const params: GlobToolParams = { pattern: "**/*.log" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'sub', 'deep', 'fileE.log'),
-      );
+      expect(result.llmContent).toContain("Found 1 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "sub", "deep", "fileE.log"));
     });
 
     it('should return "No files found" message when pattern matches nothing', async () => {
-      const params: GlobToolParams = { pattern: '*.nonexistent' };
+      const params: GlobToolParams = { pattern: "*.nonexistent" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'No files found matching pattern "*.nonexistent"',
-      );
-      expect(result.returnDisplay).toBe('No files found');
+      expect(result.llmContent).toContain('No files found matching pattern "*.nonexistent"');
+      expect(result.returnDisplay).toBe("No files found");
     });
 
-    it('should find files with special characters in the name', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file[1].txt'), 'content');
-      const params: GlobToolParams = { pattern: 'file[1].txt' };
+    it("should find files with special characters in the name", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file[1].txt"), "content");
+      const params: GlobToolParams = { pattern: "file[1].txt" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
-      expect(result.llmContent).toContain(
-        path.join(tempRootDir, 'file[1].txt'),
-      );
+      expect(result.llmContent).toContain("Found 1 file(s)");
+      expect(result.llmContent).toContain(path.join(tempRootDir, "file[1].txt"));
     });
 
-    it('should find files with special characters like [] and () in the path', async () => {
+    it("should find files with special characters like [] and () in the path", async () => {
       const filePath = path.join(
         tempRootDir,
-        'src/app/[test]/(dashboard)/testing/components/code.tsx',
+        "src/app/[test]/(dashboard)/testing/components/code.tsx",
       );
       await fs.mkdir(path.dirname(filePath), { recursive: true });
-      await fs.writeFile(filePath, 'content');
+      await fs.writeFile(filePath, "content");
 
       const params: GlobToolParams = {
-        pattern: 'src/app/[test]/(dashboard)/testing/components/code.tsx',
+        pattern: "src/app/[test]/(dashboard)/testing/components/code.tsx",
       };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Found 1 file(s)');
+      expect(result.llmContent).toContain("Found 1 file(s)");
       expect(result.llmContent).toContain(filePath);
     });
 
-    it('should correctly sort files by modification time (newest first)', async () => {
-      const params: GlobToolParams = { pattern: '*.sortme' };
+    it("should correctly sort files by modification time (newest first)", async () => {
+      const params: GlobToolParams = { pattern: "*.sortme" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
       const llmContent = partListUnionToString(result.llmContent);
 
-      expect(llmContent).toContain('Found 2 file(s)');
+      expect(llmContent).toContain("Found 2 file(s)");
       // Ensure llmContent is a string for TypeScript type checking
-      expect(typeof llmContent).toBe('string');
+      expect(typeof llmContent).toBe("string");
 
       const filesListed = llmContent
         .trim()
@@ -209,99 +190,93 @@ describe('GlobTool', () => {
         .filter(Boolean);
 
       expect(filesListed).toHaveLength(2);
-      expect(path.resolve(filesListed[0])).toBe(
-        path.resolve(tempRootDir, 'newer.sortme'),
-      );
-      expect(path.resolve(filesListed[1])).toBe(
-        path.resolve(tempRootDir, 'older.sortme'),
-      );
+      expect(path.resolve(filesListed[0])).toBe(path.resolve(tempRootDir, "newer.sortme"));
+      expect(path.resolve(filesListed[1])).toBe(path.resolve(tempRootDir, "older.sortme"));
     });
 
-    it('should return a PATH_NOT_IN_WORKSPACE error if path is outside workspace', async () => {
+    it("should return a PATH_NOT_IN_WORKSPACE error if path is outside workspace", async () => {
       // Bypassing validation to test execute method directly
-      vi.spyOn(globTool, 'validateToolParams').mockReturnValue(null);
-      const params: GlobToolParams = { pattern: '*.txt', dir_path: '/etc' };
+      vi.spyOn(globTool, "validateToolParams").mockReturnValue(null);
+      const params: GlobToolParams = { pattern: "*.txt", dir_path: "/etc" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.error?.type).toBe(ToolErrorType.PATH_NOT_IN_WORKSPACE);
-      expect(result.returnDisplay).toBe('Path is not within workspace');
+      expect(result.returnDisplay).toBe("Path is not within workspace");
     });
 
-    it('should return a GLOB_EXECUTION_ERROR on glob failure', async () => {
-      vi.mocked(glob.glob).mockRejectedValue(new Error('Glob failed'));
-      const params: GlobToolParams = { pattern: '*.txt' };
+    it("should return a GLOB_EXECUTION_ERROR on glob failure", async () => {
+      vi.mocked(glob.glob).mockRejectedValue(new Error("Glob failed"));
+      const params: GlobToolParams = { pattern: "*.txt" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.error?.type).toBe(ToolErrorType.GLOB_EXECUTION_ERROR);
-      expect(result.llmContent).toContain(
-        'Error during glob search operation: Glob failed',
-      );
+      expect(result.llmContent).toContain("Error during glob search operation: Glob failed");
       // Reset glob.
       vi.mocked(glob.glob).mockReset();
     });
   });
 
-  describe('validateToolParams', () => {
+  describe("validateToolParams", () => {
     it.each([
       {
-        name: 'should return null for valid parameters (pattern only)',
-        params: { pattern: '*.js' },
+        name: "should return null for valid parameters (pattern only)",
+        params: { pattern: "*.js" },
         expected: null,
       },
       {
-        name: 'should return null for valid parameters (pattern and dir_path)',
-        params: { pattern: '*.js', dir_path: 'sub' },
+        name: "should return null for valid parameters (pattern and dir_path)",
+        params: { pattern: "*.js", dir_path: "sub" },
         expected: null,
       },
       {
-        name: 'should return null for valid parameters (pattern, dir_path, and case_sensitive)',
-        params: { pattern: '*.js', dir_path: 'sub', case_sensitive: true },
+        name: "should return null for valid parameters (pattern, dir_path, and case_sensitive)",
+        params: { pattern: "*.js", dir_path: "sub", case_sensitive: true },
         expected: null,
       },
       {
-        name: 'should return error if pattern is missing (schema validation)',
-        params: { dir_path: '.' },
+        name: "should return error if pattern is missing (schema validation)",
+        params: { dir_path: "." },
         expected: `params must have required property 'pattern'`,
       },
       {
-        name: 'should return error if pattern is an empty string',
-        params: { pattern: '' },
+        name: "should return error if pattern is an empty string",
+        params: { pattern: "" },
         expected: "The 'pattern' parameter cannot be empty.",
       },
       {
-        name: 'should return error if pattern is only whitespace',
-        params: { pattern: '   ' },
+        name: "should return error if pattern is only whitespace",
+        params: { pattern: "   " },
         expected: "The 'pattern' parameter cannot be empty.",
       },
       {
-        name: 'should return error if dir_path is not a string (schema validation)',
-        params: { pattern: '*.ts', dir_path: 123 },
-        expected: 'params/dir_path must be string',
+        name: "should return error if dir_path is not a string (schema validation)",
+        params: { pattern: "*.ts", dir_path: 123 },
+        expected: "params/dir_path must be string",
       },
       {
-        name: 'should return error if case_sensitive is not a boolean (schema validation)',
-        params: { pattern: '*.ts', case_sensitive: 'true' },
-        expected: 'params/case_sensitive must be boolean',
+        name: "should return error if case_sensitive is not a boolean (schema validation)",
+        params: { pattern: "*.ts", case_sensitive: "true" },
+        expected: "params/case_sensitive must be boolean",
       },
       {
         name: "should return error if search path resolves outside the tool's root directory",
         params: {
-          pattern: '*.txt',
-          dir_path: '../../../../../../../../../../tmp',
+          pattern: "*.txt",
+          dir_path: "../../../../../../../../../../tmp",
         },
-        expected: 'resolves outside the allowed workspace directories',
+        expected: "resolves outside the allowed workspace directories",
       },
       {
-        name: 'should return error if specified search path does not exist',
-        params: { pattern: '*.txt', dir_path: 'nonexistent_subdir' },
-        expected: 'Search path does not exist',
+        name: "should return error if specified search path does not exist",
+        params: { pattern: "*.txt", dir_path: "nonexistent_subdir" },
+        expected: "Search path does not exist",
       },
       {
-        name: 'should return error if specified search path is a file, not a directory',
-        params: { pattern: '*.txt', dir_path: 'fileA.txt' },
-        expected: 'Search path is not a directory',
+        name: "should return error if specified search path is a file, not a directory",
+        params: { pattern: "*.txt", dir_path: "fileA.txt" },
+        expected: "Search path is not a directory",
       },
-    ])('$name', ({ params, expected }) => {
+    ])("$name", ({ params, expected }) => {
       // @ts-expect-error - We're intentionally creating invalid params for testing
       const result = globTool.validateToolParams(params);
       if (expected === null) {
@@ -312,39 +287,37 @@ describe('GlobTool', () => {
     });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should validate search paths are within workspace boundaries', () => {
-      const validPath = { pattern: '*.ts', dir_path: 'sub' };
-      const invalidPath = { pattern: '*.ts', dir_path: '../..' };
+  describe("workspace boundary validation", () => {
+    it("should validate search paths are within workspace boundaries", () => {
+      const validPath = { pattern: "*.ts", dir_path: "sub" };
+      const invalidPath = { pattern: "*.ts", dir_path: "../.." };
 
       expect(globTool.validateToolParams(validPath)).toBeNull();
       expect(globTool.validateToolParams(invalidPath)).toContain(
-        'resolves outside the allowed workspace directories',
+        "resolves outside the allowed workspace directories",
       );
     });
 
-    it('should provide clear error messages when path is outside workspace', () => {
-      const invalidPath = { pattern: '*.ts', dir_path: '/etc' };
+    it("should provide clear error messages when path is outside workspace", () => {
+      const invalidPath = { pattern: "*.ts", dir_path: "/etc" };
       const error = globTool.validateToolParams(invalidPath);
 
-      expect(error).toContain(
-        'resolves outside the allowed workspace directories',
-      );
+      expect(error).toContain("resolves outside the allowed workspace directories");
       expect(error).toContain(tempRootDir);
     });
 
-    it('should work with paths in workspace subdirectories', async () => {
-      const params: GlobToolParams = { pattern: '*.md', dir_path: 'sub' };
+    it("should work with paths in workspace subdirectories", async () => {
+      const params: GlobToolParams = { pattern: "*.md", dir_path: "sub" };
       const invocation = globTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Found 2 file(s)');
-      expect(result.llmContent).toContain('fileC.md');
-      expect(result.llmContent).toContain('FileD.MD');
+      expect(result.llmContent).toContain("Found 2 file(s)");
+      expect(result.llmContent).toContain("fileC.md");
+      expect(result.llmContent).toContain("FileD.MD");
     });
   });
 
-  describe('ignore file handling', () => {
+  describe("ignore file handling", () => {
     interface IgnoreFileTestCase {
       name: string;
       ignoreFile: { name: string; content: string };
@@ -357,77 +330,71 @@ describe('GlobTool', () => {
 
     it.each<IgnoreFileTestCase>([
       {
-        name: 'should respect .gitignore files by default',
-        ignoreFile: { name: '.gitignore', content: '*.ignored.txt' },
-        filesToCreate: ['a.ignored.txt', 'b.notignored.txt'],
-        globToolParams: { pattern: '*.txt' },
-        expectedCountMessage: 'Found 3 file(s)',
-        notExpectedToContain: ['a.ignored.txt'],
+        name: "should respect .gitignore files by default",
+        ignoreFile: { name: ".gitignore", content: "*.ignored.txt" },
+        filesToCreate: ["a.ignored.txt", "b.notignored.txt"],
+        globToolParams: { pattern: "*.txt" },
+        expectedCountMessage: "Found 3 file(s)",
+        notExpectedToContain: ["a.ignored.txt"],
       },
       {
-        name: 'should respect .geminiignore files by default',
-        ignoreFile: { name: '.geminiignore', content: '*.geminiignored.txt' },
-        filesToCreate: ['a.geminiignored.txt', 'b.notignored.txt'],
-        globToolParams: { pattern: '*.txt' },
-        expectedCountMessage: 'Found 3 file(s)',
-        notExpectedToContain: ['a.geminiignored.txt'],
+        name: "should respect .geminiignore files by default",
+        ignoreFile: { name: ".geminiignore", content: "*.geminiignored.txt" },
+        filesToCreate: ["a.geminiignored.txt", "b.notignored.txt"],
+        globToolParams: { pattern: "*.txt" },
+        expectedCountMessage: "Found 3 file(s)",
+        notExpectedToContain: ["a.geminiignored.txt"],
       },
       {
-        name: 'should not respect .gitignore when respect_git_ignore is false',
-        ignoreFile: { name: '.gitignore', content: '*.ignored.txt' },
-        filesToCreate: ['a.ignored.txt'],
-        globToolParams: { pattern: '*.txt', respect_git_ignore: false },
-        expectedCountMessage: 'Found 3 file(s)',
-        expectedToContain: ['a.ignored.txt'],
+        name: "should not respect .gitignore when respect_git_ignore is false",
+        ignoreFile: { name: ".gitignore", content: "*.ignored.txt" },
+        filesToCreate: ["a.ignored.txt"],
+        globToolParams: { pattern: "*.txt", respect_git_ignore: false },
+        expectedCountMessage: "Found 3 file(s)",
+        expectedToContain: ["a.ignored.txt"],
       },
       {
-        name: 'should not respect .geminiignore when respect_gemini_ignore is false',
-        ignoreFile: { name: '.geminiignore', content: '*.geminiignored.txt' },
-        filesToCreate: ['a.geminiignored.txt'],
-        globToolParams: { pattern: '*.txt', respect_gemini_ignore: false },
-        expectedCountMessage: 'Found 3 file(s)',
-        expectedToContain: ['a.geminiignored.txt'],
+        name: "should not respect .geminiignore when respect_gemini_ignore is false",
+        ignoreFile: { name: ".geminiignore", content: "*.geminiignored.txt" },
+        filesToCreate: ["a.geminiignored.txt"],
+        globToolParams: { pattern: "*.txt", respect_gemini_ignore: false },
+        expectedCountMessage: "Found 3 file(s)",
+        expectedToContain: ["a.geminiignored.txt"],
       },
-    ])(
-      '$name',
-      async ({
-        ignoreFile,
-        filesToCreate,
-        globToolParams,
-        expectedCountMessage,
-        expectedToContain,
-        notExpectedToContain,
-      }) => {
-        await fs.writeFile(
-          path.join(tempRootDir, ignoreFile.name),
-          ignoreFile.content,
-        );
-        for (const file of filesToCreate) {
-          await fs.writeFile(path.join(tempRootDir, file), 'content');
-        }
+    ])("$name", async ({
+      ignoreFile,
+      filesToCreate,
+      globToolParams,
+      expectedCountMessage,
+      expectedToContain,
+      notExpectedToContain,
+    }) => {
+      await fs.writeFile(path.join(tempRootDir, ignoreFile.name), ignoreFile.content);
+      for (const file of filesToCreate) {
+        await fs.writeFile(path.join(tempRootDir, file), "content");
+      }
 
-        const invocation = globTool.build(globToolParams);
-        const result = await invocation.execute(abortSignal);
+      const invocation = globTool.build(globToolParams);
+      const result = await invocation.execute(abortSignal);
 
-        expect(result.llmContent).toContain(expectedCountMessage);
+      expect(result.llmContent).toContain(expectedCountMessage);
 
-        if (expectedToContain) {
-          for (const file of expectedToContain) {
-            expect(result.llmContent).toContain(file);
-          }
+      if (expectedToContain) {
+        for (const file of expectedToContain) {
+          expect(result.llmContent).toContain(file);
         }
-        if (notExpectedToContain) {
-          for (const file of notExpectedToContain) {
-            expect(result.llmContent).not.toContain(file);
-          }
+      }
+      if (notExpectedToContain) {
+        for (const file of notExpectedToContain) {
+          expect(result.llmContent).not.toContain(file);
         }
-      },
-    );
+      }
+    });
   });
 });
 
-describe('sortFileEntries', () => {
-  const nowTimestamp = new Date('2024-01-15T12:00:00.000Z').getTime();
+describe("sortFileEntries", () => {
+  const nowTimestamp = new Date("2024-01-15T12:00:00.000Z").getTime();
   const oneDayInMs = 24 * 60 * 60 * 1000;
 
   const createFileEntry = (fullpath: string, mtimeDate: Date): GlobPath => ({
@@ -437,100 +404,93 @@ describe('sortFileEntries', () => {
 
   const testCases = [
     {
-      name: 'should sort a mix of recent and older files correctly',
+      name: "should sort a mix of recent and older files correctly",
       entries: [
         {
-          name: 'older_zebra.txt',
+          name: "older_zebra.txt",
           mtime: new Date(nowTimestamp - (oneDayInMs + 2 * 60 * 60 * 1000)),
         },
         {
-          name: 'recent_alpha.txt',
+          name: "recent_alpha.txt",
           mtime: new Date(nowTimestamp - 1 * 60 * 60 * 1000),
         },
         {
-          name: 'older_apple.txt',
+          name: "older_apple.txt",
           mtime: new Date(nowTimestamp - (oneDayInMs + 1 * 60 * 60 * 1000)),
         },
         {
-          name: 'recent_beta.txt',
+          name: "recent_beta.txt",
           mtime: new Date(nowTimestamp - 2 * 60 * 60 * 1000),
         },
         {
-          name: 'older_banana.txt',
+          name: "older_banana.txt",
           mtime: new Date(nowTimestamp - (oneDayInMs + 1 * 60 * 60 * 1000)),
         },
       ],
       expected: [
-        'recent_alpha.txt',
-        'recent_beta.txt',
-        'older_apple.txt',
-        'older_banana.txt',
-        'older_zebra.txt',
+        "recent_alpha.txt",
+        "recent_beta.txt",
+        "older_apple.txt",
+        "older_banana.txt",
+        "older_zebra.txt",
       ],
     },
     {
-      name: 'should sort only recent files by mtime descending',
+      name: "should sort only recent files by mtime descending",
       entries: [
-        { name: 'c.txt', mtime: new Date(nowTimestamp - 2000) },
-        { name: 'a.txt', mtime: new Date(nowTimestamp - 3000) },
-        { name: 'b.txt', mtime: new Date(nowTimestamp - 1000) },
+        { name: "c.txt", mtime: new Date(nowTimestamp - 2000) },
+        { name: "a.txt", mtime: new Date(nowTimestamp - 3000) },
+        { name: "b.txt", mtime: new Date(nowTimestamp - 1000) },
       ],
-      expected: ['b.txt', 'c.txt', 'a.txt'],
+      expected: ["b.txt", "c.txt", "a.txt"],
     },
     {
-      name: 'should sort only older files alphabetically by path',
+      name: "should sort only older files alphabetically by path",
       entries: [
-        { name: 'zebra.txt', mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
-        { name: 'apple.txt', mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
-        { name: 'banana.txt', mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
+        { name: "zebra.txt", mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
+        { name: "apple.txt", mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
+        { name: "banana.txt", mtime: new Date(nowTimestamp - 2 * oneDayInMs) },
       ],
-      expected: ['apple.txt', 'banana.txt', 'zebra.txt'],
+      expected: ["apple.txt", "banana.txt", "zebra.txt"],
     },
     {
-      name: 'should handle an empty array',
+      name: "should handle an empty array",
       entries: [],
       expected: [],
     },
     {
-      name: 'should correctly sort files when mtimes are identical for recent files',
+      name: "should correctly sort files when mtimes are identical for recent files",
       entries: [
-        { name: 'b.txt', mtime: new Date(nowTimestamp - 1000) },
-        { name: 'a.txt', mtime: new Date(nowTimestamp - 1000) },
+        { name: "b.txt", mtime: new Date(nowTimestamp - 1000) },
+        { name: "a.txt", mtime: new Date(nowTimestamp - 1000) },
       ],
-      expectedUnordered: ['a.txt', 'b.txt'],
+      expectedUnordered: ["a.txt", "b.txt"],
     },
     {
-      name: 'should use recencyThresholdMs parameter correctly',
+      name: "should use recencyThresholdMs parameter correctly",
       recencyThresholdMs: 1000,
       entries: [
-        { name: 'older_file.txt', mtime: new Date(nowTimestamp - 1001) },
-        { name: 'recent_file.txt', mtime: new Date(nowTimestamp - 999) },
+        { name: "older_file.txt", mtime: new Date(nowTimestamp - 1001) },
+        { name: "recent_file.txt", mtime: new Date(nowTimestamp - 999) },
       ],
-      expected: ['recent_file.txt', 'older_file.txt'],
+      expected: ["recent_file.txt", "older_file.txt"],
     },
   ];
 
-  it.each(testCases)(
-    '$name',
-    ({ entries, expected, expectedUnordered, recencyThresholdMs }) => {
-      const globPaths = entries.map((e) => createFileEntry(e.name, e.mtime));
-      const sorted = sortFileEntries(
-        globPaths,
-        nowTimestamp,
-        recencyThresholdMs ?? oneDayInMs,
-      );
-      const sortedPaths = sorted.map((e) => e.fullpath());
-
-      if (expected) {
-        expect(sortedPaths).toEqual(expected);
-      } else if (expectedUnordered) {
-        expect(sortedPaths).toHaveLength(expectedUnordered.length);
-        for (const path of expectedUnordered) {
-          expect(sortedPaths).toContain(path);
-        }
-      } else {
-        throw new Error('Test case must have expected or expectedUnordered');
+  it.each(testCases)("$name", ({ entries, expected, expectedUnordered, recencyThresholdMs }) => {
+    const globPaths = entries.map((e) => createFileEntry(e.name, e.mtime));
+    const sorted = sortFileEntries(globPaths, nowTimestamp, recencyThresholdMs ?? oneDayInMs);
+    const sortedPaths = sorted.map((e) => e.fullpath());
+
+    if (expected) {
+      expect(sortedPaths).toEqual(expected);
+    } else if (expectedUnordered) {
+      expect(sortedPaths).toHaveLength(expectedUnordered.length);
+      for (const path of expectedUnordered) {
+        expect(sortedPaths).toContain(path);
       }
-    },
-  );
+    } else {
+      throw new Error("Test case must have expected or expectedUnordered");
+    }
+  });
 });
diff --git a/packages/gemini-core/src/tools/glob.ts b/packages/gemini-core/src/tools/glob.ts
index e505d3bf2..0a66fac22 100644
--- a/packages/gemini-core/src/tools/glob.ts
+++ b/packages/gemini-core/src/tools/glob.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs';
-import path from 'node:path';
-import { glob, escape } from 'glob';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { shortenPath, makeRelative } from '../utils/paths.js';
-import { type Config } from '../config/config.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { ToolErrorType } from './tool-error.js';
-import { GLOB_TOOL_NAME } from './tool-names.js';
-import { getErrorMessage } from '../utils/errors.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import fs from "node:fs";
+import path from "node:path";
+import { escape, glob } from "glob";
+import { type Config } from "../config/config.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { GLOB_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 // Subset of 'Path' interface provided by 'glob' that we can implement for testing
 export interface GlobPath {
@@ -84,10 +84,7 @@ export interface GlobToolParams {
   respect_gemini_ignore?: boolean;
 }
 
-class GlobToolInvocation extends BaseToolInvocation<
-  GlobToolParams,
-  ToolResult
-> {
+class GlobToolInvocation extends BaseToolInvocation<GlobToolParams, ToolResult> {
   constructor(
     private config: Config,
     params: GlobToolParams,
@@ -101,10 +98,7 @@ class GlobToolInvocation extends BaseToolInvocation<
   getDescription(): string {
     let description = `'${this.params.pattern}'`;
     if (this.params.dir_path) {
-      const searchDir = path.resolve(
-        this.config.getTargetDir(),
-        this.params.dir_path || '.',
-      );
+      const searchDir = path.resolve(this.config.getTargetDir(), this.params.dir_path || ".");
       const relativePath = makeRelative(searchDir, this.config.getTargetDir());
       description += ` within ${shortenPath(relativePath)}`;
     }
@@ -119,10 +113,7 @@ class GlobToolInvocation extends BaseToolInvocation<
       // If a specific path is provided, resolve it and check if it's within workspace
       let searchDirectories: readonly string[];
       if (this.params.dir_path) {
-        const searchDirAbsolute = path.resolve(
-          this.config.getTargetDir(),
-          this.params.dir_path,
-        );
+        const searchDirAbsolute = path.resolve(this.config.getTargetDir(), this.params.dir_path);
         if (!workspaceContext.isPathWithinWorkspace(searchDirAbsolute)) {
           const rawError = `Error: Path "${this.params.dir_path}" is not within any workspace directory`;
           return {
@@ -171,17 +162,16 @@ class GlobToolInvocation extends BaseToolInvocation<
         path.relative(this.config.getTargetDir(), p.fullpath()),
       );
 
-      const { filteredPaths, ignoredCount } =
-        fileDiscovery.filterFilesWithReport(relativePaths, {
-          respectGitIgnore:
-            this.params?.respect_git_ignore ??
-            this.config.getFileFilteringOptions().respectGitIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
-          respectGeminiIgnore:
-            this.params?.respect_gemini_ignore ??
-            this.config.getFileFilteringOptions().respectGeminiIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-        });
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
+        respectGitIgnore:
+          this.params?.respect_git_ignore ??
+          this.config.getFileFilteringOptions().respectGitIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        respectGeminiIgnore:
+          this.params?.respect_gemini_ignore ??
+          this.config.getFileFilteringOptions().respectGeminiIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+      });
 
       const filteredAbsolutePaths = new Set(
         filteredPaths.map((p) => path.resolve(this.config.getTargetDir(), p)),
@@ -212,16 +202,10 @@ class GlobToolInvocation extends BaseToolInvocation<
       const nowTimestamp = new Date().getTime();
 
       // Sort the filtered entries using the new helper function
-      const sortedEntries = sortFileEntries(
-        filteredEntries,
-        nowTimestamp,
-        oneDayInMs,
-      );
+      const sortedEntries = sortFileEntries(filteredEntries, nowTimestamp, oneDayInMs);
 
-      const sortedAbsolutePaths = sortedEntries.map((entry) =>
-        entry.fullpath(),
-      );
-      const fileListDescription = sortedAbsolutePaths.join('\n');
+      const sortedAbsolutePaths = sortedEntries.map((entry) => entry.fullpath());
+      const fileListDescription = sortedAbsolutePaths.join("\n");
       const fileCount = sortedAbsolutePaths.length;
 
       let resultMessage = `Found ${fileCount} file(s) matching "${this.params.pattern}"`;
@@ -266,39 +250,38 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
   ) {
     super(
       GlobTool.Name,
-      'FindFiles',
-      'Efficiently finds files matching specific glob patterns (e.g., `src/**/*.ts`, `**/*.md`), returning absolute paths sorted by modification time (newest first). Ideal for quickly locating files based on their name or path structure, especially in large codebases.',
+      "FindFiles",
+      "Efficiently finds files matching specific glob patterns (e.g., `src/**/*.ts`, `**/*.md`), returning absolute paths sorted by modification time (newest first). Ideal for quickly locating files based on their name or path structure, especially in large codebases.",
       Kind.Search,
       {
         properties: {
           pattern: {
-            description:
-              "The glob pattern to match against (e.g., '**/*.py', 'docs/*.md').",
-            type: 'string',
+            description: "The glob pattern to match against (e.g., '**/*.py', 'docs/*.md').",
+            type: "string",
           },
           dir_path: {
             description:
-              'Optional: The absolute path to the directory to search within. If omitted, searches the root directory.',
-            type: 'string',
+              "Optional: The absolute path to the directory to search within. If omitted, searches the root directory.",
+            type: "string",
           },
           case_sensitive: {
             description:
-              'Optional: Whether the search should be case-sensitive. Defaults to false.',
-            type: 'boolean',
+              "Optional: Whether the search should be case-sensitive. Defaults to false.",
+            type: "boolean",
           },
           respect_git_ignore: {
             description:
-              'Optional: Whether to respect .gitignore patterns when finding files. Only available in git repositories. Defaults to true.',
-            type: 'boolean',
+              "Optional: Whether to respect .gitignore patterns when finding files. Only available in git repositories. Defaults to true.",
+            type: "boolean",
           },
           respect_gemini_ignore: {
             description:
-              'Optional: Whether to respect .geminiignore patterns when finding files. Defaults to true.',
-            type: 'boolean',
+              "Optional: Whether to respect .geminiignore patterns when finding files. Defaults to true.",
+            type: "boolean",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
       true,
       false,
@@ -309,18 +292,13 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
   /**
    * Validates the parameters for the tool.
    */
-  protected override validateToolParamValues(
-    params: GlobToolParams,
-  ): string | null {
-    const searchDirAbsolute = path.resolve(
-      this.config.getTargetDir(),
-      params.dir_path || '.',
-    );
+  protected override validateToolParamValues(params: GlobToolParams): string | null {
+    const searchDirAbsolute = path.resolve(this.config.getTargetDir(), params.dir_path || ".");
 
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(searchDirAbsolute)) {
       const directories = workspaceContext.getDirectories();
-      return `Search path ("${searchDirAbsolute}") resolves outside the allowed workspace directories: ${directories.join(', ')}`;
+      return `Search path ("${searchDirAbsolute}") resolves outside the allowed workspace directories: ${directories.join(", ")}`;
     }
 
     const targetDir = searchDirAbsolute || this.config.getTargetDir();
@@ -335,11 +313,7 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
       return `Error accessing search path: ${e}`;
     }
 
-    if (
-      !params.pattern ||
-      typeof params.pattern !== 'string' ||
-      params.pattern.trim() === ''
-    ) {
+    if (!params.pattern || typeof params.pattern !== "string" || params.pattern.trim() === "") {
       return "The 'pattern' parameter cannot be empty.";
     }
 
@@ -352,12 +326,6 @@ export class GlobTool extends BaseDeclarativeTool<GlobToolParams, ToolResult> {
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<GlobToolParams, ToolResult> {
-    return new GlobToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new GlobToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-core/src/tools/grep.test.ts b/packages/gemini-core/src/tools/grep.test.ts
index ded3d0d31..218878dff 100644
--- a/packages/gemini-core/src/tools/grep.test.ts
+++ b/packages/gemini-core/src/tools/grep.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { GrepToolParams } from './grep.js';
-import { GrepTool } from './grep.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { ToolErrorType } from './tool-error.js';
-import * as glob from 'glob';
-
-vi.mock('glob', { spy: true });
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import * as glob from "glob";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import type { GrepToolParams } from "./grep.js";
+import { GrepTool } from "./grep.js";
+import { ToolErrorType } from "./tool-error.js";
+
+vi.mock("glob", { spy: true });
 
 // Mock the child_process module to control grep/git grep behavior
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   spawn: vi.fn(() => ({
     on: (event: string, cb: (...args: unknown[]) => void) => {
-      if (event === 'error' || event === 'close') {
+      if (event === "error" || event === "close") {
         // Simulate command not found or error for git grep and system grep
         // to force it to fall back to JS implementation.
         setTimeout(() => cb(1), 0); // cb(1) for error/close
@@ -32,7 +32,7 @@ vi.mock('child_process', () => ({
   })),
 }));
 
-describe('GrepTool', () => {
+describe("GrepTool", () => {
   let tempRootDir: string;
   let grepTool: GrepTool;
   const abortSignal = new AbortController().signal;
@@ -46,26 +46,20 @@ describe('GrepTool', () => {
   } as unknown as Config;
 
   beforeEach(async () => {
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'grep-tool-root-'));
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-root-"));
     grepTool = new GrepTool(mockConfig);
 
     // Create some test files and directories
+    await fs.writeFile(path.join(tempRootDir, "fileA.txt"), "hello world\nsecond line with world");
     await fs.writeFile(
-      path.join(tempRootDir, 'fileA.txt'),
-      'hello world\nsecond line with world',
-    );
-    await fs.writeFile(
-      path.join(tempRootDir, 'fileB.js'),
+      path.join(tempRootDir, "fileB.js"),
       'const foo = "bar";\nfunction baz() { return "hello"; }',
     );
-    await fs.mkdir(path.join(tempRootDir, 'sub'));
-    await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileC.txt'),
-      'another world in sub dir',
-    );
+    await fs.mkdir(path.join(tempRootDir, "sub"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "fileC.txt"), "another world in sub dir");
     await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileD.md'),
-      '# Markdown file\nThis is a test.',
+      path.join(tempRootDir, "sub", "fileD.md"),
+      "# Markdown file\nThis is a test.",
     );
   });
 
@@ -73,171 +67,152 @@ describe('GrepTool', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  describe('validateToolParams', () => {
-    it('should return null for valid params (pattern only)', () => {
-      const params: GrepToolParams = { pattern: 'hello' };
+  describe("validateToolParams", () => {
+    it("should return null for valid params (pattern only)", () => {
+      const params: GrepToolParams = { pattern: "hello" };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return null for valid params (pattern and path)', () => {
-      const params: GrepToolParams = { pattern: 'hello', dir_path: '.' };
+    it("should return null for valid params (pattern and path)", () => {
+      const params: GrepToolParams = { pattern: "hello", dir_path: "." };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return null for valid params (pattern, path, and include)', () => {
+    it("should return null for valid params (pattern, path, and include)", () => {
       const params: GrepToolParams = {
-        pattern: 'hello',
-        dir_path: '.',
-        include: '*.txt',
+        pattern: "hello",
+        dir_path: ".",
+        include: "*.txt",
       };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return error if pattern is missing', () => {
-      const params = { dir_path: '.' } as unknown as GrepToolParams;
+    it("should return error if pattern is missing", () => {
+      const params = { dir_path: "." } as unknown as GrepToolParams;
       expect(grepTool.validateToolParams(params)).toBe(
         `params must have required property 'pattern'`,
       );
     });
 
-    it('should return error for invalid regex pattern', () => {
-      const params: GrepToolParams = { pattern: '[[' };
-      expect(grepTool.validateToolParams(params)).toContain(
-        'Invalid regular expression pattern',
-      );
+    it("should return error for invalid regex pattern", () => {
+      const params: GrepToolParams = { pattern: "[[" };
+      expect(grepTool.validateToolParams(params)).toContain("Invalid regular expression pattern");
     });
 
-    it('should return error if path does not exist', () => {
+    it("should return error if path does not exist", () => {
       const params: GrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'nonexistent',
+        pattern: "hello",
+        dir_path: "nonexistent",
       };
       // Check for the core error message, as the full path might vary
-      expect(grepTool.validateToolParams(params)).toContain(
-        'Failed to access path stats for',
-      );
-      expect(grepTool.validateToolParams(params)).toContain('nonexistent');
+      expect(grepTool.validateToolParams(params)).toContain("Failed to access path stats for");
+      expect(grepTool.validateToolParams(params)).toContain("nonexistent");
     });
 
-    it('should return error if path is a file, not a directory', async () => {
-      const filePath = path.join(tempRootDir, 'fileA.txt');
-      const params: GrepToolParams = { pattern: 'hello', dir_path: filePath };
-      expect(grepTool.validateToolParams(params)).toContain(
-        `Path is not a directory: ${filePath}`,
-      );
+    it("should return error if path is a file, not a directory", async () => {
+      const filePath = path.join(tempRootDir, "fileA.txt");
+      const params: GrepToolParams = { pattern: "hello", dir_path: filePath };
+      expect(grepTool.validateToolParams(params)).toContain(`Path is not a directory: ${filePath}`);
     });
   });
 
-  describe('execute', () => {
-    it('should find matches for a simple pattern in all files', async () => {
-      const params: GrepToolParams = { pattern: 'world' };
+  describe("execute", () => {
+    it("should find matches for a simple pattern in all files", async () => {
+      const params: GrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 3 matches for pattern "world" in the workspace directory',
       );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain(
-        `File: ${path.join('sub', 'fileC.txt')}`,
-      );
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 3 matches');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain(`File: ${path.join("sub", "fileC.txt")}`);
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 3 matches");
     });
 
-    it('should find matches in a specific path', async () => {
-      const params: GrepToolParams = { pattern: 'world', dir_path: 'sub' };
+    it("should find matches in a specific path", async () => {
+      const params: GrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt'); // Path relative to 'sub'
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt"); // Path relative to 'sub'
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob', async () => {
-      const params: GrepToolParams = { pattern: 'hello', include: '*.js' };
+    it("should find matches with an include glob", async () => {
+      const params: GrepToolParams = { pattern: "hello", include: "*.js" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in the workspace directory (filter: "*.js"):',
       );
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob and path', async () => {
-      await fs.writeFile(
-        path.join(tempRootDir, 'sub', 'another.js'),
-        'const greeting = "hello";',
-      );
+    it("should find matches with an include glob and path", async () => {
+      await fs.writeFile(path.join(tempRootDir, "sub", "another.js"), 'const greeting = "hello";');
       const params: GrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'sub',
-        include: '*.js',
+        pattern: "hello",
+        dir_path: "sub",
+        include: "*.js",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in path "sub" (filter: "*.js")',
       );
-      expect(result.llmContent).toContain('File: another.js');
+      expect(result.llmContent).toContain("File: another.js");
       expect(result.llmContent).toContain('L1: const greeting = "hello";');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
     it('should return "No matches found" when pattern does not exist', async () => {
-      const params: GrepToolParams = { pattern: 'nonexistentpattern' };
+      const params: GrepToolParams = { pattern: "nonexistentpattern" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'No matches found for pattern "nonexistentpattern" in the workspace directory.',
       );
-      expect(result.returnDisplay).toBe('No matches found');
+      expect(result.returnDisplay).toBe("No matches found");
     });
 
-    it('should handle regex special characters correctly', async () => {
-      const params: GrepToolParams = { pattern: 'foo.*bar' }; // Matches 'const foo = "bar";'
+    it("should handle regex special characters correctly", async () => {
+      const params: GrepToolParams = { pattern: "foo.*bar" }; // Matches 'const foo = "bar";'
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "foo.*bar" in the workspace directory:',
       );
-      expect(result.llmContent).toContain('File: fileB.js');
+      expect(result.llmContent).toContain("File: fileB.js");
       expect(result.llmContent).toContain('L1: const foo = "bar";');
     });
 
-    it('should be case-insensitive by default (JS fallback)', async () => {
-      const params: GrepToolParams = { pattern: 'HELLO' };
+    it("should be case-insensitive by default (JS fallback)", async () => {
+      const params: GrepToolParams = { pattern: "HELLO" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 2 matches for pattern "HELLO" in the workspace directory:',
       );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
     });
 
-    it('should throw an error if params are invalid', async () => {
-      const params = { dir_path: '.' } as unknown as GrepToolParams; // Invalid: pattern missing
-      expect(() => grepTool.build(params)).toThrow(
-        /params must have required property 'pattern'/,
-      );
+    it("should throw an error if params are invalid", async () => {
+      const params = { dir_path: "." } as unknown as GrepToolParams; // Invalid: pattern missing
+      expect(() => grepTool.build(params)).toThrow(/params must have required property 'pattern'/);
     });
 
-    it('should return a GREP_EXECUTION_ERROR on failure', async () => {
-      vi.mocked(glob.globStream).mockRejectedValue(new Error('Glob failed'));
-      const params: GrepToolParams = { pattern: 'hello' };
+    it("should return a GREP_EXECUTION_ERROR on failure", async () => {
+      vi.mocked(glob.globStream).mockRejectedValue(new Error("Glob failed"));
+      const params: GrepToolParams = { pattern: "hello" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.error?.type).toBe(ToolErrorType.GREP_EXECUTION_ERROR);
@@ -245,79 +220,64 @@ describe('GrepTool', () => {
     });
   });
 
-  describe('multi-directory workspace', () => {
-    it('should search across all workspace directories when no path is specified', async () => {
+  describe("multi-directory workspace", () => {
+    it("should search across all workspace directories when no path is specified", async () => {
       // Create additional directory with test files
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
-      await fs.writeFile(
-        path.join(secondDir, 'other.txt'),
-        'hello from second directory\nworld in second',
-      );
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
       await fs.writeFile(
-        path.join(secondDir, 'another.js'),
-        'function world() { return "test"; }',
+        path.join(secondDir, "other.txt"),
+        "hello from second directory\nworld in second",
       );
+      await fs.writeFile(path.join(secondDir, "another.js"), 'function world() { return "test"; }');
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getFileExclusions: () => ({
           getGlobExcludes: () => [],
         }),
       } as unknown as Config;
 
       const multiDirGrepTool = new GrepTool(multiDirConfig);
-      const params: GrepToolParams = { pattern: 'world' };
+      const params: GrepToolParams = { pattern: "world" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should find matches in both directories
-      expect(result.llmContent).toContain(
-        'Found 5 matches for pattern "world"',
-      );
+      expect(result.llmContent).toContain('Found 5 matches for pattern "world"');
 
       // Matches from first directory
-      expect(result.llmContent).toContain('fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain('fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain("fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain("fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Matches from second directory (with directory name prefix)
       const secondDirName = path.basename(secondDir);
-      expect(result.llmContent).toContain(
-        `File: ${path.join(secondDirName, 'other.txt')}`,
-      );
-      expect(result.llmContent).toContain('L2: world in second');
-      expect(result.llmContent).toContain(
-        `File: ${path.join(secondDirName, 'another.js')}`,
-      );
-      expect(result.llmContent).toContain('L1: function world()');
+      expect(result.llmContent).toContain(`File: ${path.join(secondDirName, "other.txt")}`);
+      expect(result.llmContent).toContain("L2: world in second");
+      expect(result.llmContent).toContain(`File: ${path.join(secondDirName, "another.js")}`);
+      expect(result.llmContent).toContain("L1: function world()");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
     });
 
-    it('should search only specified path within workspace directories', async () => {
+    it("should search only specified path within workspace directories", async () => {
       // Create additional directory
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
-      await fs.mkdir(path.join(secondDir, 'sub'));
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
+      await fs.mkdir(path.join(secondDir, "sub"));
       await fs.writeFile(
-        path.join(secondDir, 'sub', 'test.txt'),
-        'hello from second sub directory',
+        path.join(secondDir, "sub", "test.txt"),
+        "hello from second sub directory",
       );
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getFileExclusions: () => ({
           getGlobExcludes: () => [],
         }),
@@ -326,90 +286,83 @@ describe('GrepTool', () => {
       const multiDirGrepTool = new GrepTool(multiDirConfig);
 
       // Search only in the 'sub' directory of the first workspace
-      const params: GrepToolParams = { pattern: 'world', dir_path: 'sub' };
+      const params: GrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should only find matches in the specified sub directory
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Should not contain matches from second directory
-      expect(result.llmContent).not.toContain('test.txt');
+      expect(result.llmContent).not.toContain("test.txt");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
     });
   });
 
-  describe('getDescription', () => {
-    it('should generate correct description with pattern only', () => {
-      const params: GrepToolParams = { pattern: 'testPattern' };
+  describe("getDescription", () => {
+    it("should generate correct description with pattern only", () => {
+      const params: GrepToolParams = { pattern: "testPattern" };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern'");
     });
 
-    it('should generate correct description with pattern and include', () => {
+    it("should generate correct description with pattern and include", () => {
       const params: GrepToolParams = {
-        pattern: 'testPattern',
-        include: '*.ts',
+        pattern: "testPattern",
+        include: "*.ts",
       };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' in *.ts");
     });
 
-    it('should generate correct description with pattern and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: GrepToolParams = {
-        pattern: 'testPattern',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
       // The path will be relative to the tempRootDir, so we check for containment.
       expect(invocation.getDescription()).toContain("'testPattern' within");
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
 
-    it('should indicate searching across all workspace directories when no path specified', () => {
+    it("should indicate searching across all workspace directories when no path specified", () => {
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, ['/another/dir']),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, ["/another/dir"]),
         getFileExclusions: () => ({
           getGlobExcludes: () => [],
         }),
       } as unknown as Config;
 
       const multiDirGrepTool = new GrepTool(multiDirConfig);
-      const params: GrepToolParams = { pattern: 'testPattern' };
+      const params: GrepToolParams = { pattern: "testPattern" };
       const invocation = multiDirGrepTool.build(params);
-      expect(invocation.getDescription()).toBe(
-        "'testPattern' across all workspace directories",
-      );
+      expect(invocation.getDescription()).toBe("'testPattern' across all workspace directories");
     });
 
-    it('should generate correct description with pattern, include, and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern, include, and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: GrepToolParams = {
-        pattern: 'testPattern',
-        include: '*.ts',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        include: "*.ts",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toContain(
-        "'testPattern' in *.ts within",
-      );
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain("'testPattern' in *.ts within");
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
 
-    it('should use ./ for root path in description', () => {
-      const params: GrepToolParams = { pattern: 'testPattern', dir_path: '.' };
+    it("should use ./ for root path in description", () => {
+      const params: GrepToolParams = { pattern: "testPattern", dir_path: "." };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' within ./");
     });
diff --git a/packages/gemini-core/src/tools/grep.ts b/packages/gemini-core/src/tools/grep.ts
index 3d492bec4..8e6348728 100644
--- a/packages/gemini-core/src/tools/grep.ts
+++ b/packages/gemini-core/src/tools/grep.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import { EOL } from 'node:os';
-import { spawn } from 'node:child_process';
-import { globStream } from 'glob';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import { isGitRepository } from '../utils/gitUtils.js';
-import type { Config } from '../config/config.js';
-import type { FileExclusions } from '../utils/ignorePatterns.js';
-import { ToolErrorType } from './tool-error.js';
-import { GREP_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import { EOL } from "node:os";
+import path from "node:path";
+import { globStream } from "glob";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { isGitRepository } from "../utils/gitUtils.js";
+import type { FileExclusions } from "../utils/ignorePatterns.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { GREP_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 // --- Interfaces ---
 
@@ -53,10 +53,7 @@ interface GrepMatch {
   line: string;
 }
 
-class GrepToolInvocation extends BaseToolInvocation<
-  GrepToolParams,
-  ToolResult
-> {
+class GrepToolInvocation extends BaseToolInvocation<GrepToolParams, ToolResult> {
   private readonly fileExclusions: FileExclusions;
 
   constructor(
@@ -89,7 +86,7 @@ class GrepToolInvocation extends BaseToolInvocation<
     if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
       const directories = workspaceContext.getDirectories();
       throw new Error(
-        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(", ")}`,
       );
     }
 
@@ -100,12 +97,10 @@ class GrepToolInvocation extends BaseToolInvocation<
         throw new Error(`Path is not a directory: ${targetPath}`);
       }
     } catch (error: unknown) {
-      if (isNodeError(error) && error.code !== 'ENOENT') {
+      if (isNodeError(error) && error.code !== "ENOENT") {
         throw new Error(`Path does not exist: ${targetPath}`);
       }
-      throw new Error(
-        `Failed to access path stats for ${targetPath}: ${error}`,
-      );
+      throw new Error(`Failed to access path stats for ${targetPath}: ${error}`);
     }
 
     return targetPath;
@@ -115,7 +110,7 @@ class GrepToolInvocation extends BaseToolInvocation<
     try {
       const workspaceContext = this.config.getWorkspaceContext();
       const searchDirAbs = this.resolveAndValidatePath(this.params.dir_path);
-      const searchDirDisplay = this.params.dir_path || '.';
+      const searchDirDisplay = this.params.dir_path || ".";
 
       // Determine which directories to search
       let searchDirectories: readonly string[];
@@ -152,15 +147,13 @@ class GrepToolInvocation extends BaseToolInvocation<
       if (searchDirAbs === null) {
         const numDirs = workspaceContext.getDirectories().length;
         searchLocationDescription =
-          numDirs > 1
-            ? `across ${numDirs} workspace directories`
-            : `in the workspace directory`;
+          numDirs > 1 ? `across ${numDirs} workspace directories` : `in the workspace directory`;
       } else {
         searchLocationDescription = `in path "${searchDirDisplay}"`;
       }
 
       if (allMatches.length === 0) {
-        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}.`;
+        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}.`;
         return { llmContent: noMatchMsg, returnDisplay: `No matches found` };
       }
 
@@ -179,9 +172,9 @@ class GrepToolInvocation extends BaseToolInvocation<
       );
 
       const matchCount = allMatches.length;
-      const matchTerm = matchCount === 1 ? 'match' : 'matches';
+      const matchTerm = matchCount === 1 ? "match" : "matches";
 
-      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}:
+      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}:
 ---
 `;
 
@@ -191,7 +184,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           const trimmedLine = match.line.trim();
           llmContent += `L${match.lineNumber}: ${trimmedLine}\n`;
         });
-        llmContent += '---\n';
+        llmContent += "---\n";
       }
 
       return {
@@ -219,20 +212,16 @@ class GrepToolInvocation extends BaseToolInvocation<
    */
   private isCommandAvailable(command: string): Promise<boolean> {
     return new Promise((resolve) => {
-      const checkCommand = process.platform === 'win32' ? 'where' : 'command';
-      const checkArgs =
-        process.platform === 'win32' ? [command] : ['-v', command];
+      const checkCommand = process.platform === "win32" ? "where" : "command";
+      const checkArgs = process.platform === "win32" ? [command] : ["-v", command];
       try {
         const child = spawn(checkCommand, checkArgs, {
-          stdio: 'ignore',
+          stdio: "ignore",
           shell: true,
         });
-        child.on('close', (code) => resolve(code === 0));
-        child.on('error', (err) => {
-          debugLogger.debug(
-            `[GrepTool] Failed to start process for '${command}':`,
-            err.message,
-          );
+        child.on("close", (code) => resolve(code === 0));
+        child.on("error", (err) => {
+          debugLogger.debug(`[GrepTool] Failed to start process for '${command}':`, err.message);
           resolve(false);
         });
       } catch {
@@ -259,19 +248,16 @@ class GrepToolInvocation extends BaseToolInvocation<
       if (!line.trim()) continue;
 
       // Find the index of the first colon.
-      const firstColonIndex = line.indexOf(':');
+      const firstColonIndex = line.indexOf(":");
       if (firstColonIndex === -1) continue; // Malformed
 
       // Find the index of the second colon, searching *after* the first one.
-      const secondColonIndex = line.indexOf(':', firstColonIndex + 1);
+      const secondColonIndex = line.indexOf(":", firstColonIndex + 1);
       if (secondColonIndex === -1) continue; // Malformed
 
       // Extract parts based on the found colon indices
       const filePathRaw = line.substring(0, firstColonIndex);
-      const lineNumberStr = line.substring(
-        firstColonIndex + 1,
-        secondColonIndex,
-      );
+      const lineNumberStr = line.substring(firstColonIndex + 1, secondColonIndex);
       const lineContent = line.substring(secondColonIndex + 1);
 
       const lineNumber = parseInt(lineNumberStr, 10);
@@ -300,20 +286,11 @@ class GrepToolInvocation extends BaseToolInvocation<
       description += ` in ${this.params.include}`;
     }
     if (this.params.dir_path) {
-      const resolvedPath = path.resolve(
-        this.config.getTargetDir(),
-        this.params.dir_path,
-      );
-      if (
-        resolvedPath === this.config.getTargetDir() ||
-        this.params.dir_path === '.'
-      ) {
+      const resolvedPath = path.resolve(this.config.getTargetDir(), this.params.dir_path);
+      if (resolvedPath === this.config.getTargetDir() || this.params.dir_path === ".") {
         description += ` within ./`;
       } else {
-        const relativePath = makeRelative(
-          resolvedPath,
-          this.config.getTargetDir(),
-        );
+        const relativePath = makeRelative(resolvedPath, this.config.getTargetDir());
         description += ` within ${shortenPath(relativePath)}`;
       }
     } else {
@@ -339,88 +316,74 @@ class GrepToolInvocation extends BaseToolInvocation<
     signal: AbortSignal;
   }): Promise<GrepMatch[]> {
     const { pattern, path: absolutePath, include } = options;
-    let strategyUsed = 'none';
+    let strategyUsed = "none";
 
     try {
       // --- Strategy 1: git grep ---
       const isGit = isGitRepository(absolutePath);
-      const gitAvailable = isGit && (await this.isCommandAvailable('git'));
+      const gitAvailable = isGit && (await this.isCommandAvailable("git"));
 
       if (gitAvailable) {
-        strategyUsed = 'git grep';
-        const gitArgs = [
-          'grep',
-          '--untracked',
-          '-n',
-          '-E',
-          '--ignore-case',
-          pattern,
-        ];
+        strategyUsed = "git grep";
+        const gitArgs = ["grep", "--untracked", "-n", "-E", "--ignore-case", pattern];
         if (include) {
-          gitArgs.push('--', include);
+          gitArgs.push("--", include);
         }
 
         try {
           const output = await new Promise<string>((resolve, reject) => {
-            const child = spawn('git', gitArgs, {
+            const child = spawn("git", gitArgs, {
               cwd: absolutePath,
               windowsHide: true,
             });
             const stdoutChunks: Buffer[] = [];
             const stderrChunks: Buffer[] = [];
 
-            child.stdout.on('data', (chunk) => stdoutChunks.push(chunk));
-            child.stderr.on('data', (chunk) => stderrChunks.push(chunk));
-            child.on('error', (err) =>
+            child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
+            child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
+            child.on("error", (err) =>
               reject(new Error(`Failed to start git grep: ${err.message}`)),
             );
-            child.on('close', (code) => {
-              const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-              const stderrData = Buffer.concat(stderrChunks).toString('utf8');
+            child.on("close", (code) => {
+              const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+              const stderrData = Buffer.concat(stderrChunks).toString("utf8");
               if (code === 0) resolve(stdoutData);
               else if (code === 1)
-                resolve(''); // No matches
-              else
-                reject(
-                  new Error(`git grep exited with code ${code}: ${stderrData}`),
-                );
+                resolve(""); // No matches
+              else reject(new Error(`git grep exited with code ${code}: ${stderrData}`));
             });
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (gitError: unknown) {
           debugLogger.debug(
-            `GrepLogic: git grep failed: ${getErrorMessage(
-              gitError,
-            )}. Falling back...`,
+            `GrepLogic: git grep failed: ${getErrorMessage(gitError)}. Falling back...`,
           );
         }
       }
 
       // --- Strategy 2: System grep ---
-      debugLogger.debug(
-        'GrepLogic: System grep is being considered as fallback strategy.',
-      );
+      debugLogger.debug("GrepLogic: System grep is being considered as fallback strategy.");
 
-      const grepAvailable = await this.isCommandAvailable('grep');
+      const grepAvailable = await this.isCommandAvailable("grep");
       if (grepAvailable) {
-        strategyUsed = 'system grep';
-        const grepArgs = ['-r', '-n', '-H', '-E', '-I'];
+        strategyUsed = "system grep";
+        const grepArgs = ["-r", "-n", "-H", "-E", "-I"];
         // Extract directory names from exclusion patterns for grep --exclude-dir
         const globExcludes = this.fileExclusions.getGlobExcludes();
         const commonExcludes = globExcludes
           .map((pattern) => {
             let dir = pattern;
-            if (dir.startsWith('**/')) {
+            if (dir.startsWith("**/")) {
               dir = dir.substring(3);
             }
-            if (dir.endsWith('/**')) {
+            if (dir.endsWith("/**")) {
               dir = dir.slice(0, -3);
-            } else if (dir.endsWith('/')) {
+            } else if (dir.endsWith("/")) {
               dir = dir.slice(0, -1);
             }
 
             // Only consider patterns that are likely directories. This filters out file patterns.
-            if (dir && !dir.includes('/') && !dir.includes('*')) {
+            if (dir && !dir.includes("/") && !dir.includes("*")) {
               return dir;
             }
             return null;
@@ -431,11 +394,11 @@ class GrepToolInvocation extends BaseToolInvocation<
           grepArgs.push(`--include=${include}`);
         }
         grepArgs.push(pattern);
-        grepArgs.push('.');
+        grepArgs.push(".");
 
         try {
           const output = await new Promise<string>((resolve, reject) => {
-            const child = spawn('grep', grepArgs, {
+            const child = spawn("grep", grepArgs, {
               cwd: absolutePath,
               windowsHide: true,
             });
@@ -447,7 +410,7 @@ class GrepToolInvocation extends BaseToolInvocation<
               const stderrStr = chunk.toString();
               // Suppress common harmless stderr messages
               if (
-                !stderrStr.includes('Permission denied') &&
+                !stderrStr.includes("Permission denied") &&
                 !/grep:.*: Is a directory/i.test(stderrStr)
               ) {
                 stderrChunks.push(chunk);
@@ -458,56 +421,46 @@ class GrepToolInvocation extends BaseToolInvocation<
               reject(new Error(`Failed to start system grep: ${err.message}`));
             };
             const onClose = (code: number | null) => {
-              const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-              const stderrData = Buffer.concat(stderrChunks)
-                .toString('utf8')
-                .trim();
+              const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+              const stderrData = Buffer.concat(stderrChunks).toString("utf8").trim();
               cleanup();
               if (code === 0) resolve(stdoutData);
               else if (code === 1)
-                resolve(''); // No matches
+                resolve(""); // No matches
               else {
                 if (stderrData)
-                  reject(
-                    new Error(
-                      `System grep exited with code ${code}: ${stderrData}`,
-                    ),
-                  );
-                else resolve(''); // Exit code > 1 but no stderr, likely just suppressed errors
+                  reject(new Error(`System grep exited with code ${code}: ${stderrData}`));
+                else resolve(""); // Exit code > 1 but no stderr, likely just suppressed errors
               }
             };
 
             const cleanup = () => {
-              child.stdout.removeListener('data', onData);
-              child.stderr.removeListener('data', onStderr);
-              child.removeListener('error', onError);
-              child.removeListener('close', onClose);
+              child.stdout.removeListener("data", onData);
+              child.stderr.removeListener("data", onStderr);
+              child.removeListener("error", onError);
+              child.removeListener("close", onClose);
               if (child.connected) {
                 child.disconnect();
               }
             };
 
-            child.stdout.on('data', onData);
-            child.stderr.on('data', onStderr);
-            child.on('error', onError);
-            child.on('close', onClose);
+            child.stdout.on("data", onData);
+            child.stderr.on("data", onStderr);
+            child.on("error", onError);
+            child.on("close", onClose);
           });
           return this.parseGrepOutput(output, absolutePath);
         } catch (grepError: unknown) {
           debugLogger.debug(
-            `GrepLogic: System grep failed: ${getErrorMessage(
-              grepError,
-            )}. Falling back...`,
+            `GrepLogic: System grep failed: ${getErrorMessage(grepError)}. Falling back...`,
           );
         }
       }
 
       // --- Strategy 3: Pure JavaScript Fallback ---
-      debugLogger.debug(
-        'GrepLogic: Falling back to JavaScript grep implementation.',
-      );
-      strategyUsed = 'javascript fallback';
-      const globPattern = include ? include : '**/*';
+      debugLogger.debug("GrepLogic: Falling back to JavaScript grep implementation.");
+      strategyUsed = "javascript fallback";
+      const globPattern = include ? include : "**/*";
       const ignorePatterns = this.fileExclusions.getGlobExcludes();
 
       const filesStream = globStream(globPattern, {
@@ -519,20 +472,19 @@ class GrepToolInvocation extends BaseToolInvocation<
         signal: options.signal,
       });
 
-      const regex = new RegExp(pattern, 'i');
+      const regex = new RegExp(pattern, "i");
       const allMatches: GrepMatch[] = [];
 
       for await (const filePath of filesStream) {
         const fileAbsolutePath = filePath as string;
         try {
-          const content = await fsPromises.readFile(fileAbsolutePath, 'utf8');
+          const content = await fsPromises.readFile(fileAbsolutePath, "utf8");
           const lines = content.split(/\r?\n/);
           lines.forEach((line, index) => {
             if (regex.test(line)) {
               allMatches.push({
                 filePath:
-                  path.relative(absolutePath, fileAbsolutePath) ||
-                  path.basename(fileAbsolutePath),
+                  path.relative(absolutePath, fileAbsolutePath) || path.basename(fileAbsolutePath),
                 lineNumber: index + 1,
                 line,
               });
@@ -540,7 +492,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           });
         } catch (readError: unknown) {
           // Ignore errors like permission denied or file gone during read
-          if (!isNodeError(readError) || readError.code !== 'ENOENT') {
+          if (!isNodeError(readError) || readError.code !== "ENOENT") {
             debugLogger.debug(
               `GrepLogic: Could not read/process ${fileAbsolutePath}: ${getErrorMessage(
                 readError,
@@ -575,29 +527,29 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
   ) {
     super(
       GrepTool.Name,
-      'SearchText',
-      'Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.',
+      "SearchText",
+      "Searches for a regular expression pattern within the content of files in a specified directory (or current working directory). Can filter files by a glob pattern. Returns the lines containing matches, along with their file paths and line numbers.",
       Kind.Search,
       {
         properties: {
           pattern: {
             description:
               "The regular expression (regex) pattern to search for within file contents (e.g., 'function\\s+myFunction', 'import\\s+\\{.*\\}\\s+from\\s+.*').",
-            type: 'string',
+            type: "string",
           },
           dir_path: {
             description:
-              'Optional: The absolute path to the directory to search within. If omitted, searches the current working directory.',
-            type: 'string',
+              "Optional: The absolute path to the directory to search within. If omitted, searches the current working directory.",
+            type: "string",
           },
           include: {
             description:
               "Optional: A glob pattern to filter which files are searched (e.g., '*.js', '*.{ts,tsx}', 'src/**'). If omitted, searches all files (respecting potential global ignores).",
-            type: 'string',
+            type: "string",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
       true,
       false,
@@ -624,7 +576,7 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
     if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
       const directories = workspaceContext.getDirectories();
       throw new Error(
-        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+        `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(", ")}`,
       );
     }
 
@@ -635,12 +587,10 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
         throw new Error(`Path is not a directory: ${targetPath}`);
       }
     } catch (error: unknown) {
-      if (isNodeError(error) && error.code !== 'ENOENT') {
+      if (isNodeError(error) && error.code !== "ENOENT") {
         throw new Error(`Path does not exist: ${targetPath}`);
       }
-      throw new Error(
-        `Failed to access path stats for ${targetPath}: ${error}`,
-      );
+      throw new Error(`Failed to access path stats for ${targetPath}: ${error}`);
     }
 
     return targetPath;
@@ -651,9 +601,7 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
    * @param params Parameters to validate
    * @returns An error message string if invalid, null otherwise
    */
-  protected override validateToolParamValues(
-    params: GrepToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: GrepToolParams): string | null {
     try {
       new RegExp(params.pattern);
     } catch (error) {
@@ -678,12 +626,6 @@ export class GrepTool extends BaseDeclarativeTool<GrepToolParams, ToolResult> {
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<GrepToolParams, ToolResult> {
-    return new GrepToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new GrepToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-core/src/tools/ls.test.ts b/packages/gemini-core/src/tools/ls.test.ts
index 63a84aea4..969eb162b 100644
--- a/packages/gemini-core/src/tools/ls.test.ts
+++ b/packages/gemini-core/src/tools/ls.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import os from 'node:os';
-import { LSTool } from './ls.js';
-import type { Config } from '../config/config.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { ToolErrorType } from './tool-error.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-describe('LSTool', () => {
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { LSTool } from "./ls.js";
+import { ToolErrorType } from "./tool-error.js";
+
+describe("LSTool", () => {
   let lsTool: LSTool;
   let tempRootDir: string;
   let tempSecondaryDir: string;
@@ -23,15 +23,12 @@ describe('LSTool', () => {
 
   beforeEach(async () => {
     const realTmp = await fs.realpath(os.tmpdir());
-    tempRootDir = await fs.mkdtemp(path.join(realTmp, 'ls-tool-root-'));
-    tempSecondaryDir = await fs.mkdtemp(
-      path.join(realTmp, 'ls-tool-secondary-'),
-    );
+    tempRootDir = await fs.mkdtemp(path.join(realTmp, "ls-tool-root-"));
+    tempSecondaryDir = await fs.mkdtemp(path.join(realTmp, "ls-tool-secondary-"));
 
     mockConfig = {
       getTargetDir: () => tempRootDir,
-      getWorkspaceContext: () =>
-        new WorkspaceContext(tempRootDir, [tempSecondaryDir]),
+      getWorkspaceContext: () => new WorkspaceContext(tempRootDir, [tempSecondaryDir]),
       getFileService: () => new FileDiscoveryService(tempRootDir),
       getFileFilteringOptions: () => ({
         respectGitIgnore: true,
@@ -47,9 +44,9 @@ describe('LSTool', () => {
     await fs.rm(tempSecondaryDir, { recursive: true, force: true });
   });
 
-  describe('parameter validation', () => {
-    it('should accept valid absolute paths within workspace', async () => {
-      const testPath = path.join(tempRootDir, 'src');
+  describe("parameter validation", () => {
+    it("should accept valid absolute paths within workspace", async () => {
+      const testPath = path.join(tempRootDir, "src");
       await fs.mkdir(testPath);
 
       const invocation = lsTool.build({ dir_path: testPath });
@@ -57,8 +54,8 @@ describe('LSTool', () => {
       expect(invocation).toBeDefined();
     });
 
-    it('should accept relative paths', async () => {
-      const testPath = path.join(tempRootDir, 'src');
+    it("should accept relative paths", async () => {
+      const testPath = path.join(tempRootDir, "src");
       await fs.mkdir(testPath);
 
       const relativePath = path.relative(tempRootDir, testPath);
@@ -67,14 +64,14 @@ describe('LSTool', () => {
       expect(invocation).toBeDefined();
     });
 
-    it('should reject paths outside workspace with clear error message', () => {
-      expect(() => lsTool.build({ dir_path: '/etc/passwd' })).toThrow(
+    it("should reject paths outside workspace with clear error message", () => {
+      expect(() => lsTool.build({ dir_path: "/etc/passwd" })).toThrow(
         `Path must be within one of the workspace directories: ${tempRootDir}, ${tempSecondaryDir}`,
       );
     });
 
-    it('should accept paths in secondary workspace directory', async () => {
-      const testPath = path.join(tempSecondaryDir, 'lib');
+    it("should accept paths in secondary workspace directory", async () => {
+      const testPath = path.join(tempSecondaryDir, "lib");
       await fs.mkdir(testPath);
 
       const invocation = lsTool.build({ dir_path: testPath });
@@ -83,163 +80,155 @@ describe('LSTool', () => {
     });
   });
 
-  describe('execute', () => {
-    it('should list files in a directory', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.mkdir(path.join(tempRootDir, 'subdir'));
-      await fs.writeFile(
-        path.join(tempSecondaryDir, 'secondary-file.txt'),
-        'secondary',
-      );
+  describe("execute", () => {
+    it("should list files in a directory", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.mkdir(path.join(tempRootDir, "subdir"));
+      await fs.writeFile(path.join(tempSecondaryDir, "secondary-file.txt"), "secondary");
 
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('[DIR] subdir');
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.returnDisplay).toBe('Listed 2 item(s).');
+      expect(result.llmContent).toContain("[DIR] subdir");
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.returnDisplay).toBe("Listed 2 item(s).");
     });
 
-    it('should list files from secondary workspace directory', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.mkdir(path.join(tempRootDir, 'subdir'));
-      await fs.writeFile(
-        path.join(tempSecondaryDir, 'secondary-file.txt'),
-        'secondary',
-      );
+    it("should list files from secondary workspace directory", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.mkdir(path.join(tempRootDir, "subdir"));
+      await fs.writeFile(path.join(tempSecondaryDir, "secondary-file.txt"), "secondary");
 
       const invocation = lsTool.build({ dir_path: tempSecondaryDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('secondary-file.txt');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("secondary-file.txt");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
     });
 
-    it('should handle empty directories', async () => {
-      const emptyDir = path.join(tempRootDir, 'empty');
+    it("should handle empty directories", async () => {
+      const emptyDir = path.join(tempRootDir, "empty");
       await fs.mkdir(emptyDir);
       const invocation = lsTool.build({ dir_path: emptyDir });
       const result = await invocation.execute(abortSignal);
 
       expect(result.llmContent).toBe(`Directory ${emptyDir} is empty.`);
-      expect(result.returnDisplay).toBe('Directory is empty.');
+      expect(result.returnDisplay).toBe("Directory is empty.");
     });
 
-    it('should respect ignore patterns', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'file2.log'), 'content1');
+    it("should respect ignore patterns", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "file2.log"), "content1");
 
       const invocation = lsTool.build({
         dir_path: tempRootDir,
-        ignore: ['*.log'],
+        ignore: ["*.log"],
       });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('file2.log');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("file2.log");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
     });
 
-    it('should respect gitignore patterns', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'file2.log'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, '.git'), '');
-      await fs.writeFile(path.join(tempRootDir, '.gitignore'), '*.log');
+    it("should respect gitignore patterns", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "file2.log"), "content1");
+      await fs.writeFile(path.join(tempRootDir, ".git"), "");
+      await fs.writeFile(path.join(tempRootDir, ".gitignore"), "*.log");
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('file2.log');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("file2.log");
       // .git is always ignored by default.
-      expect(result.returnDisplay).toBe('Listed 2 item(s). (2 ignored)');
+      expect(result.returnDisplay).toBe("Listed 2 item(s). (2 ignored)");
     });
 
-    it('should respect geminiignore patterns', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'file2.log'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, '.geminiignore'), '*.log');
+    it("should respect geminiignore patterns", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "file2.log"), "content1");
+      await fs.writeFile(path.join(tempRootDir, ".geminiignore"), "*.log");
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('file2.log');
-      expect(result.returnDisplay).toBe('Listed 2 item(s). (1 ignored)');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("file2.log");
+      expect(result.returnDisplay).toBe("Listed 2 item(s). (1 ignored)");
     });
 
-    it('should handle non-directory paths', async () => {
-      const testPath = path.join(tempRootDir, 'file1.txt');
-      await fs.writeFile(testPath, 'content1');
+    it("should handle non-directory paths", async () => {
+      const testPath = path.join(tempRootDir, "file1.txt");
+      await fs.writeFile(testPath, "content1");
 
       const invocation = lsTool.build({ dir_path: testPath });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Path is not a directory');
-      expect(result.returnDisplay).toBe('Error: Path is not a directory.');
+      expect(result.llmContent).toContain("Path is not a directory");
+      expect(result.returnDisplay).toBe("Error: Path is not a directory.");
       expect(result.error?.type).toBe(ToolErrorType.PATH_IS_NOT_A_DIRECTORY);
     });
 
-    it('should handle non-existent paths', async () => {
-      const testPath = path.join(tempRootDir, 'does-not-exist');
+    it("should handle non-existent paths", async () => {
+      const testPath = path.join(tempRootDir, "does-not-exist");
       const invocation = lsTool.build({ dir_path: testPath });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Error listing directory');
-      expect(result.returnDisplay).toBe('Error: Failed to list directory.');
+      expect(result.llmContent).toContain("Error listing directory");
+      expect(result.returnDisplay).toBe("Error: Failed to list directory.");
       expect(result.error?.type).toBe(ToolErrorType.LS_EXECUTION_ERROR);
     });
 
-    it('should sort directories first, then files alphabetically', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'a-file.txt'), 'content1');
-      await fs.writeFile(path.join(tempRootDir, 'b-file.txt'), 'content1');
-      await fs.mkdir(path.join(tempRootDir, 'x-dir'));
-      await fs.mkdir(path.join(tempRootDir, 'y-dir'));
+    it("should sort directories first, then files alphabetically", async () => {
+      await fs.writeFile(path.join(tempRootDir, "a-file.txt"), "content1");
+      await fs.writeFile(path.join(tempRootDir, "b-file.txt"), "content1");
+      await fs.mkdir(path.join(tempRootDir, "x-dir"));
+      await fs.mkdir(path.join(tempRootDir, "y-dir"));
 
       const invocation = lsTool.build({ dir_path: tempRootDir });
       const result = await invocation.execute(abortSignal);
 
-      const lines = (
-        typeof result.llmContent === 'string' ? result.llmContent : ''
-      )
-        .split('\n')
+      const lines = (typeof result.llmContent === "string" ? result.llmContent : "")
+        .split("\n")
         .filter(Boolean);
       const entries = lines.slice(1); // Skip header
 
-      expect(entries[0]).toBe('[DIR] x-dir');
-      expect(entries[1]).toBe('[DIR] y-dir');
-      expect(entries[2]).toBe('a-file.txt');
-      expect(entries[3]).toBe('b-file.txt');
+      expect(entries[0]).toBe("[DIR] x-dir");
+      expect(entries[1]).toBe("[DIR] y-dir");
+      expect(entries[2]).toBe("a-file.txt");
+      expect(entries[3]).toBe("b-file.txt");
     });
 
-    it('should handle permission errors gracefully', async () => {
-      const restrictedDir = path.join(tempRootDir, 'restricted');
+    it("should handle permission errors gracefully", async () => {
+      const restrictedDir = path.join(tempRootDir, "restricted");
       await fs.mkdir(restrictedDir);
 
       // To simulate a permission error in a cross-platform way,
       // we mock fs.readdir to throw an error.
-      const error = new Error('EACCES: permission denied');
-      vi.spyOn(fs, 'readdir').mockRejectedValueOnce(error);
+      const error = new Error("EACCES: permission denied");
+      vi.spyOn(fs, "readdir").mockRejectedValueOnce(error);
 
       const invocation = lsTool.build({ dir_path: restrictedDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Error listing directory');
-      expect(result.llmContent).toContain('permission denied');
-      expect(result.returnDisplay).toBe('Error: Failed to list directory.');
+      expect(result.llmContent).toContain("Error listing directory");
+      expect(result.llmContent).toContain("permission denied");
+      expect(result.returnDisplay).toBe("Error: Failed to list directory.");
       expect(result.error?.type).toBe(ToolErrorType.LS_EXECUTION_ERROR);
     });
 
-    it('should handle errors accessing individual files during listing', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'file1.txt'), 'content1');
-      const problematicFile = path.join(tempRootDir, 'problematic.txt');
-      await fs.writeFile(problematicFile, 'content2');
+    it("should handle errors accessing individual files during listing", async () => {
+      await fs.writeFile(path.join(tempRootDir, "file1.txt"), "content1");
+      const problematicFile = path.join(tempRootDir, "problematic.txt");
+      await fs.writeFile(problematicFile, "content2");
 
       // To simulate an error on a single file in a cross-platform way,
       // we mock fs.stat to throw for a specific file. This avoids
       // platform-specific behavior with things like dangling symlinks.
       const originalStat = fs.stat;
-      const statSpy = vi.spyOn(fs, 'stat').mockImplementation(async (p) => {
+      const statSpy = vi.spyOn(fs, "stat").mockImplementation(async (p) => {
         if (p.toString() === problematicFile) {
-          throw new Error('Simulated stat error');
+          throw new Error("Simulated stat error");
         }
         return originalStat(p);
       });
@@ -248,28 +237,28 @@ describe('LSTool', () => {
       const result = await invocation.execute(abortSignal);
 
       // Should still list the other files
-      expect(result.llmContent).toContain('file1.txt');
-      expect(result.llmContent).not.toContain('problematic.txt');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("file1.txt");
+      expect(result.llmContent).not.toContain("problematic.txt");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
 
       statSpy.mockRestore();
     });
   });
 
-  describe('getDescription', () => {
-    it('should return shortened relative path', () => {
-      const deeplyNestedDir = path.join(tempRootDir, 'deeply', 'nested');
+  describe("getDescription", () => {
+    it("should return shortened relative path", () => {
+      const deeplyNestedDir = path.join(tempRootDir, "deeply", "nested");
       const params = {
-        dir_path: path.join(deeplyNestedDir, 'directory'),
+        dir_path: path.join(deeplyNestedDir, "directory"),
       };
       const invocation = lsTool.build(params);
       const description = invocation.getDescription();
-      expect(description).toBe(path.join('deeply', 'nested', 'directory'));
+      expect(description).toBe(path.join("deeply", "nested", "directory"));
     });
 
-    it('should handle paths in secondary workspace', () => {
+    it("should handle paths in secondary workspace", () => {
       const params = {
-        dir_path: path.join(tempSecondaryDir, 'lib'),
+        dir_path: path.join(tempSecondaryDir, "lib"),
       };
       const invocation = lsTool.build(params);
       const description = invocation.getDescription();
@@ -278,39 +267,36 @@ describe('LSTool', () => {
     });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should accept paths in primary workspace directory', async () => {
-      const testPath = path.join(tempRootDir, 'src');
+  describe("workspace boundary validation", () => {
+    it("should accept paths in primary workspace directory", async () => {
+      const testPath = path.join(tempRootDir, "src");
       await fs.mkdir(testPath);
       const params = { dir_path: testPath };
       expect(lsTool.build(params)).toBeDefined();
     });
 
-    it('should accept paths in secondary workspace directory', async () => {
-      const testPath = path.join(tempSecondaryDir, 'lib');
+    it("should accept paths in secondary workspace directory", async () => {
+      const testPath = path.join(tempSecondaryDir, "lib");
       await fs.mkdir(testPath);
       const params = { dir_path: testPath };
       expect(lsTool.build(params)).toBeDefined();
     });
 
-    it('should reject paths outside all workspace directories', () => {
-      const params = { dir_path: '/etc/passwd' };
+    it("should reject paths outside all workspace directories", () => {
+      const params = { dir_path: "/etc/passwd" };
       expect(() => lsTool.build(params)).toThrow(
-        'Path must be within one of the workspace directories',
+        "Path must be within one of the workspace directories",
       );
     });
 
-    it('should list files from secondary workspace directory', async () => {
-      await fs.writeFile(
-        path.join(tempSecondaryDir, 'secondary-file.txt'),
-        'secondary',
-      );
+    it("should list files from secondary workspace directory", async () => {
+      await fs.writeFile(path.join(tempSecondaryDir, "secondary-file.txt"), "secondary");
 
       const invocation = lsTool.build({ dir_path: tempSecondaryDir });
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('secondary-file.txt');
-      expect(result.returnDisplay).toBe('Listed 1 item(s).');
+      expect(result.llmContent).toContain("secondary-file.txt");
+      expect(result.returnDisplay).toBe("Listed 1 item(s).");
     });
   });
 });
diff --git a/packages/gemini-core/src/tools/ls.ts b/packages/gemini-core/src/tools/ls.ts
index 34a78038f..ea5885080 100644
--- a/packages/gemini-core/src/tools/ls.ts
+++ b/packages/gemini-core/src/tools/ls.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs/promises';
-import path from 'node:path';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import type { Config } from '../config/config.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { ToolErrorType } from './tool-error.js';
-import { LS_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import fs from "node:fs/promises";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { ToolErrorType } from "./tool-error.js";
+import { LS_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Parameters for the LS tool
@@ -93,9 +93,9 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
     for (const pattern of patterns) {
       // Convert glob pattern to RegExp
       const regexPattern = pattern
-        .replace(/[.+^${}()|[\]\\]/g, '\\$&')
-        .replace(/\*/g, '.*')
-        .replace(/\?/g, '.');
+        .replace(/[.+^${}()|[\]\\]/g, "\\$&")
+        .replace(/\*/g, ".*")
+        .replace(/\?/g, ".");
       const regex = new RegExp(`^${regexPattern}$`);
       if (regex.test(filename)) {
         return true;
@@ -109,19 +109,12 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
    * @returns A string describing the file being read
    */
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.dir_path,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.params.dir_path, this.config.getTargetDir());
     return shortenPath(relativePath);
   }
 
   // Helper for consistent error formatting
-  private errorResult(
-    llmContent: string,
-    returnDisplay: string,
-    type: ToolErrorType,
-  ): ToolResult {
+  private errorResult(llmContent: string, returnDisplay: string, type: ToolErrorType): ToolResult {
     return {
       llmContent,
       // Keep returnDisplay simpler in core logic
@@ -138,10 +131,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
    * @returns Result of the LS operation
    */
   async execute(_signal: AbortSignal): Promise<ToolResult> {
-    const resolvedDirPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.dir_path,
-    );
+    const resolvedDirPath = path.resolve(this.config.getTargetDir(), this.params.dir_path);
     try {
       const stats = await fs.stat(resolvedDirPath);
       if (!stats) {
@@ -171,24 +161,20 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       }
 
       const relativePaths = files.map((file) =>
-        path.relative(
-          this.config.getTargetDir(),
-          path.join(resolvedDirPath, file),
-        ),
+        path.relative(this.config.getTargetDir(), path.join(resolvedDirPath, file)),
       );
 
       const fileDiscovery = this.config.getFileService();
-      const { filteredPaths, ignoredCount } =
-        fileDiscovery.filterFilesWithReport(relativePaths, {
-          respectGitIgnore:
-            this.params.file_filtering_options?.respect_git_ignore ??
-            this.config.getFileFilteringOptions().respectGitIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
-          respectGeminiIgnore:
-            this.params.file_filtering_options?.respect_gemini_ignore ??
-            this.config.getFileFilteringOptions().respectGeminiIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-        });
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativePaths, {
+        respectGitIgnore:
+          this.params.file_filtering_options?.respect_git_ignore ??
+          this.config.getFileFilteringOptions().respectGitIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        respectGeminiIgnore:
+          this.params.file_filtering_options?.respect_gemini_ignore ??
+          this.config.getFileFilteringOptions().respectGeminiIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+      });
 
       const entries = [];
       for (const relativePath of filteredPaths) {
@@ -223,8 +209,8 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
 
       // Create formatted content for LLM
       const directoryContent = entries
-        .map((entry) => `${entry.isDirectory ? '[DIR] ' : ''}${entry.name}`)
-        .join('\n');
+        .map((entry) => `${entry.isDirectory ? "[DIR] " : ""}${entry.name}`)
+        .join("\n");
 
       let resultMessage = `Directory listing for ${resolvedDirPath}:\n${directoryContent}`;
       if (ignoredCount > 0) {
@@ -244,7 +230,7 @@ class LSToolInvocation extends BaseToolInvocation<LSToolParams, ToolResult> {
       const errorMsg = `Error listing directory: ${error instanceof Error ? error.message : String(error)}`;
       return this.errorResult(
         errorMsg,
-        'Failed to list directory.',
+        "Failed to list directory.",
         ToolErrorType.LS_EXECUTION_ERROR,
       );
     }
@@ -263,42 +249,42 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
   ) {
     super(
       LSTool.Name,
-      'ReadFolder',
-      'Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.',
+      "ReadFolder",
+      "Lists the names of files and subdirectories directly within a specified directory path. Can optionally ignore entries matching provided glob patterns.",
       Kind.Search,
       {
         properties: {
           dir_path: {
-            description: 'The path to the directory to list',
-            type: 'string',
+            description: "The path to the directory to list",
+            type: "string",
           },
           ignore: {
-            description: 'List of glob patterns to ignore',
+            description: "List of glob patterns to ignore",
             items: {
-              type: 'string',
+              type: "string",
             },
-            type: 'array',
+            type: "array",
           },
           file_filtering_options: {
             description:
-              'Optional: Whether to respect ignore patterns from .gitignore or .geminiignore',
-            type: 'object',
+              "Optional: Whether to respect ignore patterns from .gitignore or .geminiignore",
+            type: "object",
             properties: {
               respect_git_ignore: {
                 description:
-                  'Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.',
-                type: 'boolean',
+                  "Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.",
+                type: "boolean",
               },
               respect_gemini_ignore: {
                 description:
-                  'Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.',
-                type: 'boolean',
+                  "Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.",
+                type: "boolean",
               },
             },
           },
         },
-        required: ['dir_path'],
-        type: 'object',
+        required: ["dir_path"],
+        type: "object",
       },
       true,
       false,
@@ -311,19 +297,12 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
    * @param params Parameters to validate
    * @returns An error message string if invalid, null otherwise
    */
-  protected override validateToolParamValues(
-    params: LSToolParams,
-  ): string | null {
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      params.dir_path,
-    );
+  protected override validateToolParamValues(params: LSToolParams): string | null {
+    const resolvedPath = path.resolve(this.config.getTargetDir(), params.dir_path);
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
       const directories = workspaceContext.getDirectories();
-      return `Path must be within one of the workspace directories: ${directories.join(
-        ', ',
-      )}`;
+      return `Path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
     return null;
   }
@@ -334,12 +313,6 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<LSToolParams, ToolResult> {
-    return new LSToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new LSToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-core/src/tools/mcp-client-manager.test.ts b/packages/gemini-core/src/tools/mcp-client-manager.test.ts
index 0cfddb61f..25c42e153 100644
--- a/packages/gemini-core/src/tools/mcp-client-manager.test.ts
+++ b/packages/gemini-core/src/tools/mcp-client-manager.test.ts
@@ -4,29 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  afterEach,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-  type MockedObject,
-} from 'vitest';
-import { McpClientManager } from './mcp-client-manager.js';
-import { McpClient } from './mcp-client.js';
-import type { ToolRegistry } from './tool-registry.js';
-import type { Config } from '../config/config.js';
-
-vi.mock('./mcp-client.js', async () => {
-  const originalModule = await vi.importActual('./mcp-client.js');
+import { afterEach, beforeEach, describe, expect, it, type MockedObject, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { McpClient } from "./mcp-client.js";
+import { McpClientManager } from "./mcp-client-manager.js";
+import type { ToolRegistry } from "./tool-registry.js";
+
+vi.mock("./mcp-client.js", async () => {
+  const originalModule = await vi.importActual("./mcp-client.js");
   return {
     ...originalModule,
     McpClient: vi.fn(),
   };
 });
 
-describe('McpClientManager', () => {
+describe("McpClientManager", () => {
   let mockedMcpClient: MockedObject<McpClient>;
   let mockConfig: MockedObject<Config>;
 
@@ -47,7 +39,7 @@ describe('McpClientManager', () => {
       getWorkspaceContext: () => {},
       getAllowedMcpServers: vi.fn().mockReturnValue([]),
       getBlockedMcpServers: vi.fn().mockReturnValue([]),
-      getMcpServerCommand: vi.fn().mockReturnValue(''),
+      getMcpServerCommand: vi.fn().mockReturnValue(""),
       getGeminiClient: vi.fn().mockReturnValue({
         isInitialized: vi.fn(),
       }),
@@ -58,9 +50,9 @@ describe('McpClientManager', () => {
     vi.restoreAllMocks();
   });
 
-  it('should discover tools from all configured', async () => {
+  it("should discover tools from all configured", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
     const manager = new McpClientManager({} as ToolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
@@ -68,9 +60,9 @@ describe('McpClientManager', () => {
     expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
   });
 
-  it('should not discover tools if folder is not trusted', async () => {
+  it("should not discover tools if folder is not trusted", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
     mockConfig.isTrustedFolder.mockReturnValue(false);
     const manager = new McpClientManager({} as ToolRegistry, mockConfig);
@@ -79,79 +71,77 @@ describe('McpClientManager', () => {
     expect(mockedMcpClient.discover).not.toHaveBeenCalled();
   });
 
-  it('should not start blocked servers', async () => {
+  it("should not start blocked servers", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
-    mockConfig.getBlockedMcpServers.mockReturnValue(['test-server']);
+    mockConfig.getBlockedMcpServers.mockReturnValue(["test-server"]);
     const manager = new McpClientManager({} as ToolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
     expect(mockedMcpClient.connect).not.toHaveBeenCalled();
     expect(mockedMcpClient.discover).not.toHaveBeenCalled();
   });
 
-  it('should only start allowed servers if allow list is not empty', async () => {
+  it("should only start allowed servers if allow list is not empty", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
-      'another-server': {},
+      "test-server": {},
+      "another-server": {},
     });
-    mockConfig.getAllowedMcpServers.mockReturnValue(['another-server']);
+    mockConfig.getAllowedMcpServers.mockReturnValue(["another-server"]);
     const manager = new McpClientManager({} as ToolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
     expect(mockedMcpClient.connect).toHaveBeenCalledOnce();
     expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
   });
 
-  it('should start servers from extensions', async () => {
+  it("should start servers from extensions", async () => {
     const manager = new McpClientManager({} as ToolRegistry, mockConfig);
     await manager.startExtension({
-      name: 'test-extension',
+      name: "test-extension",
       mcpServers: {
-        'test-server': {},
+        "test-server": {},
       },
       isActive: true,
-      version: '1.0.0',
-      path: '/some-path',
+      version: "1.0.0",
+      path: "/some-path",
       contextFiles: [],
-      id: '123',
+      id: "123",
     });
     expect(mockedMcpClient.connect).toHaveBeenCalledOnce();
     expect(mockedMcpClient.discover).toHaveBeenCalledOnce();
   });
 
-  it('should not start servers from disabled extensions', async () => {
+  it("should not start servers from disabled extensions", async () => {
     const manager = new McpClientManager({} as ToolRegistry, mockConfig);
     await manager.startExtension({
-      name: 'test-extension',
+      name: "test-extension",
       mcpServers: {
-        'test-server': {},
+        "test-server": {},
       },
       isActive: false,
-      version: '1.0.0',
-      path: '/some-path',
+      version: "1.0.0",
+      path: "/some-path",
       contextFiles: [],
-      id: '123',
+      id: "123",
     });
     expect(mockedMcpClient.connect).not.toHaveBeenCalled();
     expect(mockedMcpClient.discover).not.toHaveBeenCalled();
   });
 
-  it('should add blocked servers to the blockedMcpServers list', async () => {
+  it("should add blocked servers to the blockedMcpServers list", async () => {
     mockConfig.getMcpServers.mockReturnValue({
-      'test-server': {},
+      "test-server": {},
     });
-    mockConfig.getBlockedMcpServers.mockReturnValue(['test-server']);
+    mockConfig.getBlockedMcpServers.mockReturnValue(["test-server"]);
     const manager = new McpClientManager({} as ToolRegistry, mockConfig);
     await manager.startConfiguredMcpServers();
-    expect(manager.getBlockedMcpServers()).toEqual([
-      { name: 'test-server', extensionName: '' },
-    ]);
+    expect(manager.getBlockedMcpServers()).toEqual([{ name: "test-server", extensionName: "" }]);
   });
 
-  describe('restart', () => {
-    it('should restart all running servers', async () => {
+  describe("restart", () => {
+    it("should restart all running servers", async () => {
       mockConfig.getMcpServers.mockReturnValue({
-        'test-server': {},
+        "test-server": {},
       });
       mockedMcpClient.getServerConfig.mockReturnValue({});
       const manager = new McpClientManager({} as ToolRegistry, mockConfig);
@@ -167,10 +157,10 @@ describe('McpClientManager', () => {
     });
   });
 
-  describe('restartServer', () => {
-    it('should restart the specified server', async () => {
+  describe("restartServer", () => {
+    it("should restart the specified server", async () => {
       mockConfig.getMcpServers.mockReturnValue({
-        'test-server': {},
+        "test-server": {},
       });
       mockedMcpClient.getServerConfig.mockReturnValue({});
       const manager = new McpClientManager({} as ToolRegistry, mockConfig);
@@ -179,16 +169,16 @@ describe('McpClientManager', () => {
       expect(mockedMcpClient.connect).toHaveBeenCalledTimes(1);
       expect(mockedMcpClient.discover).toHaveBeenCalledTimes(1);
 
-      await manager.restartServer('test-server');
+      await manager.restartServer("test-server");
 
       expect(mockedMcpClient.disconnect).toHaveBeenCalledTimes(1);
       expect(mockedMcpClient.connect).toHaveBeenCalledTimes(2);
       expect(mockedMcpClient.discover).toHaveBeenCalledTimes(2);
     });
 
-    it('should throw an error if the server does not exist', async () => {
+    it("should throw an error if the server does not exist", async () => {
       const manager = new McpClientManager({} as ToolRegistry, mockConfig);
-      await expect(manager.restartServer('non-existent')).rejects.toThrow(
+      await expect(manager.restartServer("non-existent")).rejects.toThrow(
         'No MCP server registered with the name "non-existent"',
       );
     });
diff --git a/packages/gemini-core/src/tools/mcp-client-manager.ts b/packages/gemini-core/src/tools/mcp-client-manager.ts
index aaf5fedac..e87836249 100644
--- a/packages/gemini-core/src/tools/mcp-client-manager.ts
+++ b/packages/gemini-core/src/tools/mcp-client-manager.ts
@@ -4,21 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  Config,
-  GeminiCLIExtension,
-  MCPServerConfig,
-} from '../config/config.js';
-import type { ToolRegistry } from './tool-registry.js';
-import {
-  McpClient,
-  MCPDiscoveryState,
-  populateMcpServerCommand,
-} from './mcp-client.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type { EventEmitter } from 'node:events';
-import { coreEvents } from '../utils/events.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import type { EventEmitter } from "node:events";
+import type { Config, GeminiCLIExtension, MCPServerConfig } from "../config/config.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import { MCPDiscoveryState, McpClient, populateMcpServerCommand } from "./mcp-client.js";
+import type { ToolRegistry } from "./tool-registry.js";
 
 /**
  * Manages the lifecycle of multiple MCP clients, including local child processes.
@@ -38,11 +30,7 @@ export class McpClientManager {
     extensionName: string;
   }> = [];
 
-  constructor(
-    toolRegistry: ToolRegistry,
-    cliConfig: Config,
-    eventEmitter?: EventEmitter,
-  ) {
+  constructor(toolRegistry: ToolRegistry, cliConfig: Config, eventEmitter?: EventEmitter) {
     this.toolRegistry = toolRegistry;
     this.cliConfig = cliConfig;
     this.eventEmitter = eventEmitter;
@@ -62,9 +50,7 @@ export class McpClientManager {
   async stopExtension(extension: GeminiCLIExtension) {
     debugLogger.log(`Unloading extension: ${extension.name}`);
     await Promise.all(
-      Object.keys(extension.mcpServers ?? {}).map(
-        this.disconnectClient.bind(this),
-      ),
+      Object.keys(extension.mcpServers ?? {}).map(this.disconnectClient.bind(this)),
     );
   }
 
@@ -89,19 +75,11 @@ export class McpClientManager {
 
   private isAllowedMcpServer(name: string) {
     const allowedNames = this.cliConfig.getAllowedMcpServers();
-    if (
-      allowedNames &&
-      allowedNames.length > 0 &&
-      allowedNames.indexOf(name) === -1
-    ) {
+    if (allowedNames && allowedNames.length > 0 && allowedNames.indexOf(name) === -1) {
       return false;
     }
     const blockedNames = this.cliConfig.getBlockedMcpServers();
-    if (
-      blockedNames &&
-      blockedNames.length > 0 &&
-      blockedNames.indexOf(name) !== -1
-    ) {
+    if (blockedNames && blockedNames.length > 0 && blockedNames.indexOf(name) !== -1) {
       return false;
     }
     return true;
@@ -112,12 +90,10 @@ export class McpClientManager {
     if (existing) {
       try {
         this.clients.delete(name);
-        this.eventEmitter?.emit('mcp-client-update', this.clients);
+        this.eventEmitter?.emit("mcp-client-update", this.clients);
         await existing.disconnect();
       } catch (error) {
-        debugLogger.warn(
-          `Error stopping client '${name}': ${getErrorMessage(error)}`,
-        );
+        debugLogger.warn(`Error stopping client '${name}': ${getErrorMessage(error)}`);
       } finally {
         // This is required to update the content generator configuration with the
         // new tool configuration.
@@ -129,15 +105,12 @@ export class McpClientManager {
     }
   }
 
-  maybeDiscoverMcpServer(
-    name: string,
-    config: MCPServerConfig,
-  ): Promise<void> | void {
+  maybeDiscoverMcpServer(name: string, config: MCPServerConfig): Promise<void> | void {
     if (!this.isAllowedMcpServer(name)) {
       if (!this.blockedMcpServers.find((s) => s.name === name)) {
         this.blockedMcpServers?.push({
           name,
-          extensionName: config.extension?.name ?? '',
+          extensionName: config.extension?.name ?? "",
         });
       }
       return;
@@ -150,9 +123,7 @@ export class McpClientManager {
     }
     const existing = this.clients.get(name);
     if (existing && existing.getServerConfig().extension !== config.extension) {
-      const extensionText = config.extension
-        ? ` from extension "${config.extension.name}"`
-        : '';
+      const extensionText = config.extension ? ` from extension "${config.extension.name}"` : "";
       debugLogger.warn(
         `Skipping MCP config for server with name "${name}"${extensionText} as it already exists.`,
       );
@@ -178,20 +149,18 @@ export class McpClientManager {
             );
           if (!existing) {
             this.clients.set(name, client);
-            this.eventEmitter?.emit('mcp-client-update', this.clients);
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
           }
           try {
             await client.connect();
             await client.discover(this.cliConfig);
-            this.eventEmitter?.emit('mcp-client-update', this.clients);
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
           } catch (error) {
-            this.eventEmitter?.emit('mcp-client-update', this.clients);
+            this.eventEmitter?.emit("mcp-client-update", this.clients);
             // Log the error but don't let a single failed server stop the others
             coreEvents.emitFeedback(
-              'error',
-              `Error during discovery for server '${name}': ${getErrorMessage(
-                error,
-              )}`,
+              "error",
+              `Error during discovery for server '${name}': ${getErrorMessage(error)}`,
               error,
             );
           }
@@ -208,14 +177,12 @@ export class McpClientManager {
     });
 
     if (this.discoveryPromise) {
-      this.discoveryPromise = this.discoveryPromise.then(
-        () => currentDiscoveryPromise,
-      );
+      this.discoveryPromise = this.discoveryPromise.then(() => currentDiscoveryPromise);
     } else {
       this.discoveryState = MCPDiscoveryState.IN_PROGRESS;
       this.discoveryPromise = currentDiscoveryPromise;
     }
-    this.eventEmitter?.emit('mcp-client-update', this.clients);
+    this.eventEmitter?.emit("mcp-client-update", this.clients);
     const currentPromise = this.discoveryPromise;
     currentPromise.then((_) => {
       // If we are the last recorded discoveryPromise, then we are done, reset
@@ -250,11 +217,9 @@ export class McpClientManager {
       this.cliConfig.getMcpServerCommand(),
     );
 
-    this.eventEmitter?.emit('mcp-client-update', this.clients);
+    this.eventEmitter?.emit("mcp-client-update", this.clients);
     await Promise.all(
-      Object.entries(servers).map(([name, config]) =>
-        this.maybeDiscoverMcpServer(name, config),
-      ),
+      Object.entries(servers).map(([name, config]) => this.maybeDiscoverMcpServer(name, config)),
     );
   }
 
@@ -267,9 +232,7 @@ export class McpClientManager {
         try {
           await this.maybeDiscoverMcpServer(name, client.getServerConfig());
         } catch (error) {
-          debugLogger.error(
-            `Error restarting client '${name}': ${getErrorMessage(error)}`,
-          );
+          debugLogger.error(`Error restarting client '${name}': ${getErrorMessage(error)}`);
         }
       }),
     );
@@ -291,19 +254,13 @@ export class McpClientManager {
    * This is the cleanup method to be called on application exit.
    */
   async stop(): Promise<void> {
-    const disconnectionPromises = Array.from(this.clients.entries()).map(
-      async ([name, client]) => {
-        try {
-          await client.disconnect();
-        } catch (error) {
-          coreEvents.emitFeedback(
-            'error',
-            `Error stopping client '${name}':`,
-            error,
-          );
-        }
-      },
-    );
+    const disconnectionPromises = Array.from(this.clients.entries()).map(async ([name, client]) => {
+      try {
+        await client.disconnect();
+      } catch (error) {
+        coreEvents.emitFeedback("error", `Error stopping client '${name}':`, error);
+      }
+    });
 
     await Promise.all(disconnectionPromises);
     this.clients.clear();
diff --git a/packages/gemini-core/src/tools/mcp-client.test.ts b/packages/gemini-core/src/tools/mcp-client.test.ts
index bf06e4179..cef6efd79 100644
--- a/packages/gemini-core/src/tools/mcp-client.test.ts
+++ b/packages/gemini-core/src/tools/mcp-client.test.ts
@@ -4,19 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as GenAiLib from '@google/genai';
-import * as ClientLib from '@modelcontextprotocol/sdk/client/index.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
-import * as SdkClientStdioLib from '@modelcontextprotocol/sdk/client/stdio.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { AuthProviderType, type Config } from '../config/config.js';
-import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
-import { MCPOAuthProvider } from '../mcp/oauth-provider.js';
-import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
-import { OAuthUtils } from '../mcp/oauth-utils.js';
-import type { PromptRegistry } from '../prompts/prompt-registry.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import * as GenAiLib from "@google/genai";
+import * as ClientLib from "@modelcontextprotocol/sdk/client/index.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import * as SdkClientStdioLib from "@modelcontextprotocol/sdk/client/stdio.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { AuthProviderType, type Config } from "../config/config.js";
+import { GoogleCredentialProvider } from "../mcp/google-auth-provider.js";
+import { MCPOAuthProvider } from "../mcp/oauth-provider.js";
+import { MCPOAuthTokenStorage } from "../mcp/oauth-token-storage.js";
+import { OAuthUtils } from "../mcp/oauth-utils.js";
+import type { PromptRegistry } from "../prompts/prompt-registry.js";
+import { coreEvents } from "../utils/events.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
 import {
   connectToMcpServer,
   createTransport,
@@ -24,36 +28,30 @@ import {
   isEnabled,
   McpClient,
   populateMcpServerCommand,
-} from './mcp-client.js';
-import type { ToolRegistry } from './tool-registry.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { coreEvents } from '../utils/events.js';
-
-vi.mock('@modelcontextprotocol/sdk/client/stdio.js');
-vi.mock('@modelcontextprotocol/sdk/client/index.js');
-vi.mock('@google/genai');
-vi.mock('../mcp/oauth-provider.js');
-vi.mock('../mcp/oauth-token-storage.js');
-vi.mock('../mcp/oauth-utils.js');
-
-vi.mock('../utils/events.js', () => ({
+} from "./mcp-client.js";
+import type { ToolRegistry } from "./tool-registry.js";
+
+vi.mock("@modelcontextprotocol/sdk/client/stdio.js");
+vi.mock("@modelcontextprotocol/sdk/client/index.js");
+vi.mock("@google/genai");
+vi.mock("../mcp/oauth-provider.js");
+vi.mock("../mcp/oauth-token-storage.js");
+vi.mock("../mcp/oauth-utils.js");
+
+vi.mock("../utils/events.js", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
 }));
 
-describe('mcp-client', () => {
+describe("mcp-client", () => {
   let workspaceContext: WorkspaceContext;
   let testWorkspace: string;
 
   beforeEach(() => {
     // create a tmp dir for this test
     // Create a unique temporary directory for the workspace to avoid conflicts
-    testWorkspace = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-agent-test-'),
-    );
+    testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-agent-test-"));
     workspaceContext = new WorkspaceContext(testWorkspace);
   });
 
@@ -61,8 +59,8 @@ describe('mcp-client', () => {
     vi.restoreAllMocks();
   });
 
-  describe('McpClient', () => {
-    it('should discover tools', async () => {
+  describe("McpClient", () => {
+    it("should discover tools", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -72,17 +70,15 @@ describe('mcp-client', () => {
         setRequestHandler: vi.fn(),
         getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedMcpToTool = vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
         tool: () => ({
           functionDeclarations: [
             {
-              name: 'testFunction',
+              name: "testFunction",
             },
           ],
         }),
@@ -93,9 +89,9 @@ describe('mcp-client', () => {
         getMessageBus: vi.fn().mockReturnValue(undefined),
       } as unknown as ToolRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         {} as PromptRegistry,
@@ -107,10 +103,8 @@ describe('mcp-client', () => {
       expect(mockedMcpToTool).toHaveBeenCalledOnce();
     });
 
-    it('should not skip tools even if a parameter is missing a type', async () => {
-      const consoleWarnSpy = vi
-        .spyOn(console, 'warn')
-        .mockImplementation(() => {});
+    it("should not skip tools even if a parameter is missing a type", async () => {
+      const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -121,10 +115,8 @@ describe('mcp-client', () => {
         getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }),
         tool: vi.fn(),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
@@ -132,20 +124,20 @@ describe('mcp-client', () => {
           Promise.resolve({
             functionDeclarations: [
               {
-                name: 'validTool',
+                name: "validTool",
                 parametersJsonSchema: {
-                  type: 'object',
+                  type: "object",
                   properties: {
-                    param1: { type: 'string' },
+                    param1: { type: "string" },
                   },
                 },
               },
               {
-                name: 'invalidTool',
+                name: "invalidTool",
                 parametersJsonSchema: {
-                  type: 'object',
+                  type: "object",
                   properties: {
-                    param1: { description: 'a param with no type' },
+                    param1: { description: "a param with no type" },
                   },
                 },
               },
@@ -158,9 +150,9 @@ describe('mcp-client', () => {
         getMessageBus: vi.fn().mockReturnValue(undefined),
       } as unknown as ToolRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         {} as PromptRegistry,
@@ -174,7 +166,7 @@ describe('mcp-client', () => {
       consoleWarnSpy.mockRestore();
     });
 
-    it('should handle errors when discovering prompts', async () => {
+    it("should handle errors when discovering prompts", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -183,12 +175,10 @@ describe('mcp-client', () => {
         registerCapabilities: vi.fn(),
         setRequestHandler: vi.fn(),
         getServerCapabilities: vi.fn().mockReturnValue({ prompts: {} }),
-        request: vi.fn().mockRejectedValue(new Error('Test error')),
+        request: vi.fn().mockRejectedValue(new Error("Test error")),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
@@ -199,9 +189,9 @@ describe('mcp-client', () => {
         getMessageBus: vi.fn().mockReturnValue(undefined),
       } as unknown as ToolRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         {} as PromptRegistry,
@@ -210,16 +200,16 @@ describe('mcp-client', () => {
       );
       await client.connect();
       await expect(client.discover({} as Config)).rejects.toThrow(
-        'No prompts or tools found on the server.',
+        "No prompts or tools found on the server.",
       );
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
+        "error",
         `Error discovering prompts from test-server: Test error`,
         expect.any(Error),
       );
     });
 
-    it('should not discover tools if server does not support them', async () => {
+    it("should not discover tools if server does not support them", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -230,10 +220,8 @@ describe('mcp-client', () => {
         getServerCapabilities: vi.fn().mockReturnValue({ prompts: {} }),
         request: vi.fn().mockResolvedValue({ prompts: [] }),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedMcpToTool = vi.mocked(GenAiLib.mcpToTool);
@@ -243,9 +231,9 @@ describe('mcp-client', () => {
         getMessageBus: vi.fn().mockReturnValue(undefined),
       } as unknown as ToolRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         {} as PromptRegistry,
@@ -254,12 +242,12 @@ describe('mcp-client', () => {
       );
       await client.connect();
       await expect(client.discover({} as Config)).rejects.toThrow(
-        'No prompts or tools found on the server.',
+        "No prompts or tools found on the server.",
       );
       expect(mockedMcpToTool).not.toHaveBeenCalled();
     });
 
-    it('should discover tools if server supports them', async () => {
+    it("should discover tools if server supports them", async () => {
       const mockedClient = {
         connect: vi.fn(),
         discover: vi.fn(),
@@ -270,10 +258,8 @@ describe('mcp-client', () => {
         getServerCapabilities: vi.fn().mockReturnValue({ tools: {} }),
         request: vi.fn().mockResolvedValue({ prompts: [] }),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       const mockedMcpToTool = vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
@@ -281,8 +267,8 @@ describe('mcp-client', () => {
           Promise.resolve({
             functionDeclarations: [
               {
-                name: 'testTool',
-                description: 'A test tool',
+                name: "testTool",
+                description: "A test tool",
               },
             ],
           }),
@@ -293,9 +279,9 @@ describe('mcp-client', () => {
         getMessageBus: vi.fn().mockReturnValue(undefined),
       } as unknown as ToolRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         {} as PromptRegistry,
@@ -308,24 +294,20 @@ describe('mcp-client', () => {
       expect(mockedToolRegistry.registerTool).toHaveBeenCalledOnce();
     });
 
-    it('should remove tools and prompts on disconnect', async () => {
+    it("should remove tools and prompts on disconnect", async () => {
       const mockedClient = {
         connect: vi.fn(),
         close: vi.fn(),
         getStatus: vi.fn(),
         registerCapabilities: vi.fn(),
         setRequestHandler: vi.fn(),
-        getServerCapabilities: vi
-          .fn()
-          .mockReturnValue({ tools: {}, prompts: {} }),
+        getServerCapabilities: vi.fn().mockReturnValue({ tools: {}, prompts: {} }),
         request: vi.fn().mockResolvedValue({
-          prompts: [{ id: 'prompt1', text: 'a prompt' }],
+          prompts: [{ id: "prompt1", text: "a prompt" }],
         }),
       };
-      vi.mocked(ClientLib.Client).mockReturnValue(
-        mockedClient as unknown as ClientLib.Client,
-      );
-      vi.spyOn(SdkClientStdioLib, 'StdioClientTransport').mockReturnValue(
+      vi.mocked(ClientLib.Client).mockReturnValue(mockedClient as unknown as ClientLib.Client);
+      vi.spyOn(SdkClientStdioLib, "StdioClientTransport").mockReturnValue(
         {} as SdkClientStdioLib.StdioClientTransport,
       );
       vi.mocked(GenAiLib.mcpToTool).mockReturnValue({
@@ -333,8 +315,8 @@ describe('mcp-client', () => {
           Promise.resolve({
             functionDeclarations: [
               {
-                name: 'testTool',
-                description: 'A test tool',
+                name: "testTool",
+                description: "A test tool",
               },
             ],
           }),
@@ -352,9 +334,9 @@ describe('mcp-client', () => {
         removePromptsByServer: vi.fn(),
       } as unknown as PromptRegistry;
       const client = new McpClient(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
+          command: "test-command",
         },
         mockedToolRegistry,
         mockedPromptRegistry,
@@ -374,135 +356,133 @@ describe('mcp-client', () => {
       expect(mockedPromptRegistry.removePromptsByServer).toHaveBeenCalledOnce();
     });
   });
-  describe('appendMcpServerCommand', () => {
-    it('should do nothing if no MCP servers or command are configured', () => {
+  describe("appendMcpServerCommand", () => {
+    it("should do nothing if no MCP servers or command are configured", () => {
       const out = populateMcpServerCommand({}, undefined);
       expect(out).toEqual({});
     });
 
-    it('should discover tools via mcpServerCommand', () => {
-      const commandString = 'command --arg1 value1';
+    it("should discover tools via mcpServerCommand", () => {
+      const commandString = "command --arg1 value1";
       const out = populateMcpServerCommand({}, commandString);
       expect(out).toEqual({
         mcp: {
-          command: 'command',
-          args: ['--arg1', 'value1'],
+          command: "command",
+          args: ["--arg1", "value1"],
         },
       });
     });
 
-    it('should handle error if mcpServerCommand parsing fails', () => {
-      expect(() => populateMcpServerCommand({}, 'derp && herp')).toThrowError();
+    it("should handle error if mcpServerCommand parsing fails", () => {
+      expect(() => populateMcpServerCommand({}, "derp && herp")).toThrowError();
     });
   });
 
-  describe('createTransport', () => {
-    describe('should connect via httpUrl', () => {
-      it('without headers', async () => {
+  describe("createTransport", () => {
+    describe("should connect via httpUrl", () => {
+      it("without headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test-server',
+            httpUrl: "http://test-server",
           },
           false,
         );
 
         expect(transport).toEqual(
-          new StreamableHTTPClientTransport(new URL('http://test-server'), {}),
+          new StreamableHTTPClientTransport(new URL("http://test-server"), {}),
         );
       });
 
-      it('with headers', async () => {
+      it("with headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test-server',
-            headers: { Authorization: 'derp' },
+            httpUrl: "http://test-server",
+            headers: { Authorization: "derp" },
           },
           false,
         );
 
         expect(transport).toEqual(
-          new StreamableHTTPClientTransport(new URL('http://test-server'), {
+          new StreamableHTTPClientTransport(new URL("http://test-server"), {
             requestInit: {
-              headers: { Authorization: 'derp' },
+              headers: { Authorization: "derp" },
             },
           }),
         );
       });
     });
 
-    describe('should connect via url', () => {
-      it('without headers', async () => {
+    describe("should connect via url", () => {
+      it("without headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
+            url: "http://test-server",
           },
           false,
         );
-        expect(transport).toEqual(
-          new SSEClientTransport(new URL('http://test-server'), {}),
-        );
+        expect(transport).toEqual(new SSEClientTransport(new URL("http://test-server"), {}));
       });
 
-      it('with headers', async () => {
+      it("with headers", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test-server',
-            headers: { Authorization: 'derp' },
+            url: "http://test-server",
+            headers: { Authorization: "derp" },
           },
           false,
         );
 
         expect(transport).toEqual(
-          new SSEClientTransport(new URL('http://test-server'), {
+          new SSEClientTransport(new URL("http://test-server"), {
             requestInit: {
-              headers: { Authorization: 'derp' },
+              headers: { Authorization: "derp" },
             },
           }),
         );
       });
     });
 
-    it('should connect via command', async () => {
+    it("should connect via command", async () => {
       const mockedTransport = vi
-        .spyOn(SdkClientStdioLib, 'StdioClientTransport')
+        .spyOn(SdkClientStdioLib, "StdioClientTransport")
         .mockReturnValue({} as SdkClientStdioLib.StdioClientTransport);
 
       await createTransport(
-        'test-server',
+        "test-server",
         {
-          command: 'test-command',
-          args: ['--foo', 'bar'],
-          env: { FOO: 'bar' },
-          cwd: 'test/cwd',
+          command: "test-command",
+          args: ["--foo", "bar"],
+          env: { FOO: "bar" },
+          cwd: "test/cwd",
         },
         false,
       );
 
       expect(mockedTransport).toHaveBeenCalledWith({
-        command: 'test-command',
-        args: ['--foo', 'bar'],
-        cwd: 'test/cwd',
-        env: { ...process.env, FOO: 'bar' },
-        stderr: 'pipe',
+        command: "test-command",
+        args: ["--foo", "bar"],
+        cwd: "test/cwd",
+        env: { ...process.env, FOO: "bar" },
+        stderr: "pipe",
       });
     });
 
-    describe('useGoogleCredentialProvider', () => {
-      it('should use GoogleCredentialProvider when specified', async () => {
+    describe("useGoogleCredentialProvider", () => {
+      it("should use GoogleCredentialProvider when specified", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            httpUrl: 'http://test.googleapis.com',
+            httpUrl: "http://test.googleapis.com",
             authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
             oauth: {
-              scopes: ['scope1'],
+              scopes: ["scope1"],
             },
             headers: {
-              'X-Goog-User-Project': 'myproject',
+              "X-Goog-User-Project": "myproject",
             },
           },
           false,
@@ -513,20 +493,18 @@ describe('mcp-client', () => {
         const authProvider = (transport as any)._authProvider;
         expect(authProvider).toBeInstanceOf(GoogleCredentialProvider);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const googUserProject = (transport as any)._requestInit?.headers?.[
-          'X-Goog-User-Project'
-        ];
-        expect(googUserProject).toBe('myproject');
+        const googUserProject = (transport as any)._requestInit?.headers?.["X-Goog-User-Project"];
+        expect(googUserProject).toBe("myproject");
       });
 
-      it('should use GoogleCredentialProvider with SSE transport', async () => {
+      it("should use GoogleCredentialProvider with SSE transport", async () => {
         const transport = await createTransport(
-          'test-server',
+          "test-server",
           {
-            url: 'http://test.googleapis.com',
+            url: "http://test.googleapis.com",
             authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
             oauth: {
-              scopes: ['scope1'],
+              scopes: ["scope1"],
             },
           },
           false,
@@ -538,102 +516,98 @@ describe('mcp-client', () => {
         expect(authProvider).toBeInstanceOf(GoogleCredentialProvider);
       });
 
-      it('should throw an error if no URL is provided with GoogleCredentialProvider', async () => {
+      it("should throw an error if no URL is provided with GoogleCredentialProvider", async () => {
         await expect(
           createTransport(
-            'test-server',
+            "test-server",
             {
               authProviderType: AuthProviderType.GOOGLE_CREDENTIALS,
               oauth: {
-                scopes: ['scope1'],
+                scopes: ["scope1"],
               },
             },
             false,
           ),
-        ).rejects.toThrow(
-          'URL must be provided in the config for Google Credentials provider',
-        );
+        ).rejects.toThrow("URL must be provided in the config for Google Credentials provider");
       });
     });
   });
-  describe('isEnabled', () => {
-    const funcDecl = { name: 'myTool' };
-    const serverName = 'myServer';
+  describe("isEnabled", () => {
+    const funcDecl = { name: "myTool" };
+    const serverName = "myServer";
 
-    it('should return true if no include or exclude lists are provided', () => {
+    it("should return true if no include or exclude lists are provided", () => {
       const mcpServerConfig = {};
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
     });
 
-    it('should return false if the tool is in the exclude list', () => {
-      const mcpServerConfig = { excludeTools: ['myTool'] };
+    it("should return false if the tool is in the exclude list", () => {
+      const mcpServerConfig = { excludeTools: ["myTool"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
     });
 
-    it('should return true if the tool is in the include list', () => {
-      const mcpServerConfig = { includeTools: ['myTool'] };
+    it("should return true if the tool is in the include list", () => {
+      const mcpServerConfig = { includeTools: ["myTool"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
     });
 
-    it('should return true if the tool is in the include list with parentheses', () => {
-      const mcpServerConfig = { includeTools: ['myTool()'] };
+    it("should return true if the tool is in the include list with parentheses", () => {
+      const mcpServerConfig = { includeTools: ["myTool()"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(true);
     });
 
-    it('should return false if the include list exists but does not contain the tool', () => {
-      const mcpServerConfig = { includeTools: ['anotherTool'] };
+    it("should return false if the include list exists but does not contain the tool", () => {
+      const mcpServerConfig = { includeTools: ["anotherTool"] };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
     });
 
-    it('should return false if the tool is in both the include and exclude lists', () => {
+    it("should return false if the tool is in both the include and exclude lists", () => {
       const mcpServerConfig = {
-        includeTools: ['myTool'],
-        excludeTools: ['myTool'],
+        includeTools: ["myTool"],
+        excludeTools: ["myTool"],
       };
       expect(isEnabled(funcDecl, serverName, mcpServerConfig)).toBe(false);
     });
 
-    it('should return false if the function declaration has no name', () => {
+    it("should return false if the function declaration has no name", () => {
       const namelessFuncDecl = {};
       const mcpServerConfig = {};
-      expect(isEnabled(namelessFuncDecl, serverName, mcpServerConfig)).toBe(
-        false,
-      );
+      expect(isEnabled(namelessFuncDecl, serverName, mcpServerConfig)).toBe(false);
     });
   });
 
-  describe('hasNetworkTransport', () => {
-    it('should return true if only url is provided', () => {
-      const config = { url: 'http://example.com' };
+  describe("hasNetworkTransport", () => {
+    it("should return true if only url is provided", () => {
+      const config = { url: "http://example.com" };
       expect(hasNetworkTransport(config)).toBe(true);
     });
 
-    it('should return true if only httpUrl is provided', () => {
-      const config = { httpUrl: 'http://example.com' };
+    it("should return true if only httpUrl is provided", () => {
+      const config = { httpUrl: "http://example.com" };
       expect(hasNetworkTransport(config)).toBe(true);
     });
 
-    it('should return true if both url and httpUrl are provided', () => {
+    it("should return true if both url and httpUrl are provided", () => {
       const config = {
-        url: 'http://example.com/sse',
-        httpUrl: 'http://example.com/http',
+        url: "http://example.com/sse",
+        httpUrl: "http://example.com/http",
       };
       expect(hasNetworkTransport(config)).toBe(true);
     });
 
-    it('should return false if neither url nor httpUrl is provided', () => {
-      const config = { command: 'do-something' };
+    it("should return false if neither url nor httpUrl is provided", () => {
+      const config = { command: "do-something" };
       expect(hasNetworkTransport(config)).toBe(false);
     });
 
-    it('should return false for an empty config object', () => {
+    it("should return false for an empty config object", () => {
       const config = {};
       expect(hasNetworkTransport(config)).toBe(false);
     });
   });
 });
 
-describe('connectToMcpServer with OAuth', () => {
+describe("connectToMcpServer with OAuth", () => {
   let mockedClient: ClientLib.Client;
   let workspaceContext: WorkspaceContext;
   let testWorkspace: string;
@@ -651,22 +625,20 @@ describe('connectToMcpServer with OAuth', () => {
     } as unknown as ClientLib.Client;
     vi.mocked(ClientLib.Client).mockImplementation(() => mockedClient);
 
-    testWorkspace = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-agent-test-'),
-    );
+    testWorkspace = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-agent-test-"));
     workspaceContext = new WorkspaceContext(testWorkspace);
 
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
 
     mockTokenStorage = {
-      getCredentials: vi.fn().mockResolvedValue({ clientId: 'test-client' }),
+      getCredentials: vi.fn().mockResolvedValue({ clientId: "test-client" }),
     } as unknown as MCPOAuthTokenStorage;
     vi.mocked(MCPOAuthTokenStorage).mockReturnValue(mockTokenStorage);
     mockAuthProvider = {
       authenticate: vi.fn().mockResolvedValue(undefined),
-      getValidToken: vi.fn().mockResolvedValue('test-access-token'),
+      getValidToken: vi.fn().mockResolvedValue("test-access-token"),
       tokenStorage: mockTokenStorage,
     } as unknown as MCPOAuthProvider;
     vi.mocked(MCPOAuthProvider).mockReturnValue(mockAuthProvider);
@@ -676,10 +648,10 @@ describe('connectToMcpServer with OAuth', () => {
     vi.clearAllMocks();
   });
 
-  it('should handle automatic OAuth flow on 401 with www-authenticate header', async () => {
-    const serverUrl = 'http://test-server.com/';
-    const authUrl = 'http://auth.example.com/auth';
-    const tokenUrl = 'http://auth.example.com/token';
+  it("should handle automatic OAuth flow on 401 with www-authenticate header", async () => {
+    const serverUrl = "http://test-server.com/";
+    const authUrl = "http://auth.example.com/auth";
+    const tokenUrl = "http://auth.example.com/token";
     const wwwAuthHeader = `Bearer realm="test", resource_metadata="http://test-server.com/.well-known/oauth-protected-resource"`;
 
     vi.mocked(mockedClient.connect).mockRejectedValueOnce(
@@ -689,21 +661,19 @@ describe('connectToMcpServer with OAuth', () => {
     vi.mocked(OAuthUtils.discoverOAuthConfig).mockResolvedValue({
       authorizationUrl: authUrl,
       tokenUrl,
-      scopes: ['test-scope'],
+      scopes: ["test-scope"],
     });
 
     // We need this to be an any type because we dig into its private state.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let capturedTransport: any;
-    vi.mocked(mockedClient.connect).mockImplementationOnce(
-      async (transport) => {
-        capturedTransport = transport;
-        return Promise.resolve();
-      },
-    );
+    vi.mocked(mockedClient.connect).mockImplementationOnce(async (transport) => {
+      capturedTransport = transport;
+      return Promise.resolve();
+    });
 
     const client = await connectToMcpServer(
-      'test-server',
+      "test-server",
       { httpUrl: serverUrl },
       false,
       workspaceContext,
@@ -713,41 +683,34 @@ describe('connectToMcpServer with OAuth', () => {
     expect(mockedClient.connect).toHaveBeenCalledTimes(2);
     expect(mockAuthProvider.authenticate).toHaveBeenCalledOnce();
 
-    const authHeader =
-      capturedTransport._requestInit?.headers?.['Authorization'];
-    expect(authHeader).toBe('Bearer test-access-token');
+    const authHeader = capturedTransport._requestInit?.headers?.["Authorization"];
+    expect(authHeader).toBe("Bearer test-access-token");
   });
 
-  it('should discover oauth config if not in www-authenticate header', async () => {
-    const serverUrl = 'http://test-server.com';
-    const authUrl = 'http://auth.example.com/auth';
-    const tokenUrl = 'http://auth.example.com/token';
+  it("should discover oauth config if not in www-authenticate header", async () => {
+    const serverUrl = "http://test-server.com";
+    const authUrl = "http://auth.example.com/auth";
+    const tokenUrl = "http://auth.example.com/token";
 
-    vi.mocked(mockedClient.connect).mockRejectedValueOnce(
-      new Error('401 Unauthorized'),
-    );
+    vi.mocked(mockedClient.connect).mockRejectedValueOnce(new Error("401 Unauthorized"));
 
     vi.mocked(OAuthUtils.discoverOAuthConfig).mockResolvedValue({
       authorizationUrl: authUrl,
       tokenUrl,
-      scopes: ['test-scope'],
+      scopes: ["test-scope"],
     });
-    vi.mocked(mockAuthProvider.getValidToken).mockResolvedValue(
-      'test-access-token-from-discovery',
-    );
+    vi.mocked(mockAuthProvider.getValidToken).mockResolvedValue("test-access-token-from-discovery");
 
     // We need this to be an any type because we dig into its private state.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let capturedTransport: any;
-    vi.mocked(mockedClient.connect).mockImplementationOnce(
-      async (transport) => {
-        capturedTransport = transport;
-        return Promise.resolve();
-      },
-    );
+    vi.mocked(mockedClient.connect).mockImplementationOnce(async (transport) => {
+      capturedTransport = transport;
+      return Promise.resolve();
+    });
 
     const client = await connectToMcpServer(
-      'test-server',
+      "test-server",
       { httpUrl: serverUrl },
       false,
       workspaceContext,
@@ -758,8 +721,7 @@ describe('connectToMcpServer with OAuth', () => {
     expect(mockAuthProvider.authenticate).toHaveBeenCalledOnce();
     expect(OAuthUtils.discoverOAuthConfig).toHaveBeenCalledWith(serverUrl);
 
-    const authHeader =
-      capturedTransport._requestInit?.headers?.['Authorization'];
-    expect(authHeader).toBe('Bearer test-access-token-from-discovery');
+    const authHeader = capturedTransport._requestInit?.headers?.["Authorization"];
+    expect(authHeader).toBe("Bearer test-access-token-from-discovery");
   });
 });
diff --git a/packages/gemini-core/src/tools/mcp-client.ts b/packages/gemini-core/src/tools/mcp-client.ts
index 7b4ce0b1f..3e42b096e 100644
--- a/packages/gemini-core/src/tools/mcp-client.ts
+++ b/packages/gemini-core/src/tools/mcp-client.ts
@@ -4,46 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import type { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
-import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import type { StreamableHTTPClientTransportOptions } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
-import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
-import type {
-  GetPromptResult,
-  Prompt,
-} from '@modelcontextprotocol/sdk/types.js';
+import { basename } from "node:path";
+import { pathToFileURL } from "node:url";
+import type { FunctionDeclaration } from "@google/genai";
+import { mcpToTool } from "@google/genai";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import type { SSEClientTransportOptions } from "@modelcontextprotocol/sdk/client/sse.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
+import type { StreamableHTTPClientTransportOptions } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import type { GetPromptResult, Prompt } from "@modelcontextprotocol/sdk/types.js";
 import {
   GetPromptResultSchema,
   ListPromptsResultSchema,
   ListRootsRequestSchema,
-} from '@modelcontextprotocol/sdk/types.js';
-import { parse } from 'shell-quote';
-import type { Config, MCPServerConfig } from '../config/config.js';
-import { AuthProviderType } from '../config/config.js';
-import { GoogleCredentialProvider } from '../mcp/google-auth-provider.js';
-import { ServiceAccountImpersonationProvider } from '../mcp/sa-impersonation-provider.js';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-
-import type { FunctionDeclaration } from '@google/genai';
-import { mcpToTool } from '@google/genai';
-import { basename } from 'node:path';
-import { pathToFileURL } from 'node:url';
-import { MCPOAuthProvider } from '../mcp/oauth-provider.js';
-import { MCPOAuthTokenStorage } from '../mcp/oauth-token-storage.js';
-import { OAuthUtils } from '../mcp/oauth-utils.js';
-import type { PromptRegistry } from '../prompts/prompt-registry.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type {
-  Unsubscribe,
-  WorkspaceContext,
-} from '../utils/workspaceContext.js';
-import type { ToolRegistry } from './tool-registry.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { coreEvents } from '../utils/events.js';
+} from "@modelcontextprotocol/sdk/types.js";
+import { parse } from "shell-quote";
+import type { Config, MCPServerConfig } from "../config/config.js";
+import { AuthProviderType } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { GoogleCredentialProvider } from "../mcp/google-auth-provider.js";
+import { MCPOAuthProvider } from "../mcp/oauth-provider.js";
+import { MCPOAuthTokenStorage } from "../mcp/oauth-token-storage.js";
+import { OAuthUtils } from "../mcp/oauth-utils.js";
+import { ServiceAccountImpersonationProvider } from "../mcp/sa-impersonation-provider.js";
+import type { PromptRegistry } from "../prompts/prompt-registry.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { coreEvents } from "../utils/events.js";
+import type { Unsubscribe, WorkspaceContext } from "../utils/workspaceContext.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import type { ToolRegistry } from "./tool-registry.js";
 
 export const MCP_DEFAULT_TIMEOUT_MSEC = 10 * 60 * 1000; // default to 10 minutes
 
@@ -57,13 +50,13 @@ export type DiscoveredMCPPrompt = Prompt & {
  */
 export enum MCPServerStatus {
   /** Server is disconnected or experiencing errors */
-  DISCONNECTED = 'disconnected',
+  DISCONNECTED = "disconnected",
   /** Server is actively disconnecting */
-  DISCONNECTING = 'disconnecting',
+  DISCONNECTING = "disconnecting",
   /** Server is in the process of connecting */
-  CONNECTING = 'connecting',
+  CONNECTING = "connecting",
   /** Server is connected and ready to use */
-  CONNECTED = 'connected',
+  CONNECTED = "connected",
 }
 
 /**
@@ -71,11 +64,11 @@ export enum MCPServerStatus {
  */
 export enum MCPDiscoveryState {
   /** Discovery has not started yet */
-  NOT_STARTED = 'not_started',
+  NOT_STARTED = "not_started",
   /** Discovery is currently in progress */
-  IN_PROGRESS = 'in_progress',
+  IN_PROGRESS = "in_progress",
   /** Discovery has completed (with or without errors) */
-  COMPLETED = 'completed',
+  COMPLETED = "completed",
 }
 
 /**
@@ -121,11 +114,7 @@ export class McpClient {
           return;
         }
         if (originalOnError) originalOnError(error);
-        coreEvents.emitFeedback(
-          'error',
-          `MCP ERROR (${this.serverName})`,
-          error,
-        );
+        coreEvents.emitFeedback("error", `MCP ERROR (${this.serverName})`, error);
         this.updateStatus(MCPServerStatus.DISCONNECTED);
       };
       this.updateStatus(MCPServerStatus.CONNECTED);
@@ -145,7 +134,7 @@ export class McpClient {
     const tools = await this.discoverTools(cliConfig);
 
     if (prompts.length === 0 && tools.length === 0) {
-      throw new Error('No prompts or tools found on the server.');
+      throw new Error("No prompts or tools found on the server.");
     }
 
     for (const tool of tools) {
@@ -234,27 +223,20 @@ export const mcpServerRequiresOAuth: Map<string, boolean> = new Map();
 /**
  * Event listeners for MCP server status changes
  */
-type StatusChangeListener = (
-  serverName: string,
-  status: MCPServerStatus,
-) => void;
+type StatusChangeListener = (serverName: string, status: MCPServerStatus) => void;
 const statusChangeListeners: StatusChangeListener[] = [];
 
 /**
  * Add a listener for MCP server status changes
  */
-export function addMCPStatusChangeListener(
-  listener: StatusChangeListener,
-): void {
+export function addMCPStatusChangeListener(listener: StatusChangeListener): void {
   statusChangeListeners.push(listener);
 }
 
 /**
  * Remove a listener for MCP server status changes
  */
-export function removeMCPStatusChangeListener(
-  listener: StatusChangeListener,
-): void {
+export function removeMCPStatusChangeListener(listener: StatusChangeListener): void {
   const index = statusChangeListeners.indexOf(listener);
   if (index !== -1) {
     statusChangeListeners.splice(index, 1);
@@ -264,10 +246,7 @@ export function removeMCPStatusChangeListener(
 /**
  * Update the status of an MCP server
  */
-export function updateMCPServerStatus(
-  serverName: string,
-  status: MCPServerStatus,
-): void {
+export function updateMCPServerStatus(serverName: string, status: MCPServerStatus): void {
   serverStatuses.set(serverName, status);
   // Notify all listeners
   for (const listener of statusChangeListeners) {
@@ -340,22 +319,19 @@ async function handleAutomaticOAuth(
 
     // Always try to parse the resource metadata URI from the www-authenticate header
     let oauthConfig;
-    const resourceMetadataUri =
-      OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
+    const resourceMetadataUri = OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
     if (resourceMetadataUri) {
       oauthConfig = await OAuthUtils.discoverOAuthConfig(resourceMetadataUri);
     } else if (hasNetworkTransport(mcpServerConfig)) {
       // Fallback: try to discover OAuth config from the base URL
-      const serverUrl = new URL(
-        mcpServerConfig.httpUrl || mcpServerConfig.url!,
-      );
+      const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url!);
       const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
       oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
     }
 
     if (!oauthConfig) {
       coreEvents.emitFeedback(
-        'error',
+        "error",
         `Could not configure OAuth for '${mcpServerName}' - please authenticate manually with /mcp auth ${mcpServerName}`,
       );
       return false;
@@ -374,19 +350,15 @@ async function handleAutomaticOAuth(
     // Perform OAuth authentication
     // Pass the server URL for proper discovery
     const serverUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
-    debugLogger.log(
-      `Starting OAuth authentication for server '${mcpServerName}'...`,
-    );
+    debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
     const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
     await authProvider.authenticate(mcpServerName, oauthAuthConfig, serverUrl);
 
-    debugLogger.log(
-      `OAuth authentication successful for server '${mcpServerName}'`,
-    );
+    debugLogger.log(`OAuth authentication successful for server '${mcpServerName}'`);
     return true;
   } catch (error) {
     coreEvents.emitFeedback(
-      'error',
+      "error",
       `Failed to handle automatic OAuth for server '${mcpServerName}': ${getErrorMessage(error)}`,
       error,
     );
@@ -450,7 +422,7 @@ async function createTransportWithOAuth(
     return null;
   } catch (error) {
     coreEvents.emitFeedback(
-      'error',
+      "error",
       `Failed to create OAuth transport for server '${mcpServerName}': ${getErrorMessage(error)}`,
       error,
     );
@@ -482,17 +454,16 @@ export async function discoverMcpTools(
   try {
     mcpServers = populateMcpServerCommand(mcpServers, mcpServerCommand);
 
-    const discoveryPromises = Object.entries(mcpServers).map(
-      ([mcpServerName, mcpServerConfig]) =>
-        connectAndDiscover(
-          mcpServerName,
-          mcpServerConfig,
-          toolRegistry,
-          promptRegistry,
-          debugMode,
-          workspaceContext,
-          cliConfig,
-        ),
+    const discoveryPromises = Object.entries(mcpServers).map(([mcpServerName, mcpServerConfig]) =>
+      connectAndDiscover(
+        mcpServerName,
+        mcpServerConfig,
+        toolRegistry,
+        promptRegistry,
+        debugMode,
+        workspaceContext,
+        cliConfig,
+      ),
     );
     await Promise.all(discoveryPromises);
   } finally {
@@ -508,11 +479,11 @@ export function populateMcpServerCommand(
   if (mcpServerCommand) {
     const cmd = mcpServerCommand;
     const args = parse(cmd, process.env) as string[];
-    if (args.some((arg) => typeof arg !== 'string')) {
-      throw new Error('failed to parse mcpServerCommand: ' + cmd);
+    if (args.some((arg) => typeof arg !== "string")) {
+      throw new Error("failed to parse mcpServerCommand: " + cmd);
     }
     // use generic server name 'mcp'
-    mcpServers['mcp'] = {
+    mcpServers["mcp"] = {
       command: args[0],
       args: args.slice(1),
     };
@@ -551,16 +522,12 @@ export async function connectAndDiscover(
     );
 
     mcpClient.onerror = (error) => {
-      coreEvents.emitFeedback('error', `MCP ERROR (${mcpServerName}):`, error);
+      coreEvents.emitFeedback("error", `MCP ERROR (${mcpServerName}):`, error);
       updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
     };
 
     // Attempt to discover both prompts and tools
-    const prompts = await discoverPrompts(
-      mcpServerName,
-      mcpClient,
-      promptRegistry,
-    );
+    const prompts = await discoverPrompts(mcpServerName, mcpClient, promptRegistry);
     const tools = await discoverTools(
       mcpServerName,
       mcpServerConfig,
@@ -571,7 +538,7 @@ export async function connectAndDiscover(
 
     // If we have neither prompts nor tools, it's a failed discovery
     if (prompts.length === 0 && tools.length === 0) {
-      throw new Error('No prompts or tools found on the server.');
+      throw new Error("No prompts or tools found on the server.");
     }
 
     // If we found anything, the server is connected
@@ -587,10 +554,8 @@ export async function connectAndDiscover(
       mcpClient.close();
     }
     coreEvents.emitFeedback(
-      'error',
-      `Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(
-        error,
-      )}`,
+      "error",
+      `Error connecting to MCP server '${mcpServerName}': ${getErrorMessage(error)}`,
       error,
     );
     updateMCPServerStatus(mcpServerName, MCPServerStatus.DISCONNECTED);
@@ -642,8 +607,8 @@ export async function discoverTools(
           mcpCallableTool,
           mcpServerName,
           funcDecl.name!,
-          funcDecl.description ?? '',
-          funcDecl.parametersJsonSchema ?? { type: 'object', properties: {} },
+          funcDecl.description ?? "",
+          funcDecl.parametersJsonSchema ?? { type: "object", properties: {} },
           mcpServerConfig.trust,
           undefined,
           cliConfig,
@@ -655,7 +620,7 @@ export async function discoverTools(
         discoveredTools.push(tool);
       } catch (error) {
         coreEvents.emitFeedback(
-          'error',
+          "error",
           `Error discovering tool: '${
             funcDecl.name
           }' from MCP server '${mcpServerName}': ${(error as Error).message}`,
@@ -665,15 +630,10 @@ export async function discoverTools(
     }
     return discoveredTools;
   } catch (error) {
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       coreEvents.emitFeedback(
-        'error',
-        `Error discovering tools from ${mcpServerName}: ${getErrorMessage(
-          error,
-        )}`,
+        "error",
+        `Error discovering tools from ${mcpServerName}: ${getErrorMessage(error)}`,
         error,
       );
     }
@@ -698,7 +658,7 @@ export async function discoverPrompts(
     if (mcpClient.getServerCapabilities()?.prompts == null) return [];
 
     const response = await mcpClient.request(
-      { method: 'prompts/list', params: {} },
+      { method: "prompts/list", params: {} },
       ListPromptsResultSchema,
     );
 
@@ -714,15 +674,10 @@ export async function discoverPrompts(
   } catch (error) {
     // It's okay if this fails, not all servers will have prompts.
     // Don't log an error if the method is not found, which is a common case.
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       coreEvents.emitFeedback(
-        'error',
-        `Error discovering prompts from ${mcpServerName}: ${getErrorMessage(
-          error,
-        )}`,
+        "error",
+        `Error discovering prompts from ${mcpServerName}: ${getErrorMessage(error)}`,
         error,
       );
     }
@@ -748,7 +703,7 @@ export async function invokeMcpPrompt(
   try {
     const response = await mcpClient.request(
       {
-        method: 'prompts/get',
+        method: "prompts/get",
         params: {
           name: promptName,
           arguments: promptParams,
@@ -759,12 +714,9 @@ export async function invokeMcpPrompt(
 
     return response;
   } catch (error) {
-    if (
-      error instanceof Error &&
-      !error.message?.includes('Method not found')
-    ) {
+    if (error instanceof Error && !error.message?.includes("Method not found")) {
       coreEvents.emitFeedback(
-        'error',
+        "error",
         `Error invoking prompt '${promptName}' from ${mcpServerName} ${promptParams}: ${getErrorMessage(
           error,
         )}`,
@@ -802,8 +754,8 @@ export async function connectToMcpServer(
   workspaceContext: WorkspaceContext,
 ): Promise<Client> {
   const mcpClient = new Client({
-    name: 'gemini-cli-mcp-client',
-    version: '0.0.1',
+    name: "gemini-cli-mcp-client",
+    version: "0.0.1",
   });
 
   mcpClient.registerCapabilities({
@@ -825,11 +777,11 @@ export async function connectToMcpServer(
     };
   });
 
-  let unlistenDirectories: Unsubscribe | undefined =
-    workspaceContext.onDirectoriesChanged(async () => {
+  let unlistenDirectories: Unsubscribe | undefined = workspaceContext.onDirectoriesChanged(
+    async () => {
       try {
         await mcpClient.notification({
-          method: 'notifications/roots/list_changed',
+          method: "notifications/roots/list_changed",
         });
       } catch (_) {
         // If this fails, its almost certainly because the connection was closed
@@ -837,7 +789,8 @@ export async function connectToMcpServer(
         unlistenDirectories?.();
         unlistenDirectories = undefined;
       }
-    });
+    },
+  );
 
   // Attempt to pro-actively unsubscribe if the mcp client closes. This API is
   // very brittle though so we don't have any guarantees, hence the try/catch
@@ -852,11 +805,7 @@ export async function connectToMcpServer(
   };
 
   try {
-    const transport = await createTransport(
-      mcpServerName,
-      mcpServerConfig,
-      debugMode,
-    );
+    const transport = await createTransport(mcpServerName, mcpServerConfig, debugMode);
     try {
       await mcpClient.connect(transport, {
         timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
@@ -869,12 +818,11 @@ export async function connectToMcpServer(
   } catch (error) {
     // Check if this is a 401 error that might indicate OAuth is required
     const errorString = String(error);
-    if (errorString.includes('401') && hasNetworkTransport(mcpServerConfig)) {
+    if (errorString.includes("401") && hasNetworkTransport(mcpServerConfig)) {
       mcpServerRequiresOAuth.set(mcpServerName, true);
       // Only trigger automatic OAuth discovery for HTTP servers or when OAuth is explicitly configured
       // For SSE servers, we should not trigger new OAuth flows automatically
-      const shouldTriggerOAuth =
-        mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
+      const shouldTriggerOAuth = mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
 
       if (!shouldTriggerOAuth) {
         // For SSE servers without explicit OAuth config, if a token was found but rejected, report it accurately.
@@ -882,22 +830,19 @@ export async function connectToMcpServer(
         const credentials = await tokenStorage.getCredentials(mcpServerName);
         if (credentials) {
           const authProvider = new MCPOAuthProvider(tokenStorage);
-          const hasStoredTokens = await authProvider.getValidToken(
-            mcpServerName,
-            {
-              // Pass client ID if available
-              clientId: credentials.clientId,
-            },
-          );
+          const hasStoredTokens = await authProvider.getValidToken(mcpServerName, {
+            // Pass client ID if available
+            clientId: credentials.clientId,
+          });
           if (hasStoredTokens) {
             coreEvents.emitFeedback(
-              'error',
+              "error",
               `Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
                 `Please re-authenticate using: /mcp auth ${mcpServerName}`,
             );
           } else {
             coreEvents.emitFeedback(
-              'error',
+              "error",
               `401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
                 `Please authenticate using: /mcp auth ${mcpServerName}`,
             );
@@ -914,42 +859,32 @@ export async function connectToMcpServer(
 
       // If we didn't get the header from the error string, try to get it from the server
       if (!wwwAuthenticate && hasNetworkTransport(mcpServerConfig)) {
-        debugLogger.log(
-          `No www-authenticate header in error, trying to fetch it from server...`,
-        );
+        debugLogger.log(`No www-authenticate header in error, trying to fetch it from server...`);
         try {
           const urlToFetch = mcpServerConfig.httpUrl || mcpServerConfig.url!;
           const response = await fetch(urlToFetch, {
-            method: 'HEAD',
+            method: "HEAD",
             headers: {
-              Accept: mcpServerConfig.httpUrl
-                ? 'application/json'
-                : 'text/event-stream',
+              Accept: mcpServerConfig.httpUrl ? "application/json" : "text/event-stream",
             },
             signal: AbortSignal.timeout(5000),
           });
 
           if (response.status === 401) {
-            wwwAuthenticate = response.headers.get('www-authenticate');
+            wwwAuthenticate = response.headers.get("www-authenticate");
             if (wwwAuthenticate) {
-              debugLogger.log(
-                `Found www-authenticate header from server: ${wwwAuthenticate}`,
-              );
+              debugLogger.log(`Found www-authenticate header from server: ${wwwAuthenticate}`);
             }
           }
         } catch (fetchError) {
           debugLogger.debug(
-            `Failed to fetch www-authenticate header: ${getErrorMessage(
-              fetchError,
-            )}`,
+            `Failed to fetch www-authenticate header: ${getErrorMessage(fetchError)}`,
           );
         }
       }
 
       if (wwwAuthenticate) {
-        debugLogger.log(
-          `Received 401 with www-authenticate header: ${wwwAuthenticate}`,
-        );
+        debugLogger.log(`Received 401 with www-authenticate header: ${wwwAuthenticate}`);
 
         // Try automatic OAuth discovery and authentication
         const oauthSuccess = await handleAutomaticOAuth(
@@ -959,9 +894,7 @@ export async function connectToMcpServer(
         );
         if (oauthSuccess) {
           // Retry connection with OAuth token
-          debugLogger.log(
-            `Retrying connection to '${mcpServerName}' with OAuth token...`,
-          );
+          debugLogger.log(`Retrying connection to '${mcpServerName}' with OAuth token...`);
 
           // Get the valid token - we need to create a proper OAuth config
           // The token should already be available from the authentication process
@@ -969,13 +902,10 @@ export async function connectToMcpServer(
           const credentials = await tokenStorage.getCredentials(mcpServerName);
           if (credentials) {
             const authProvider = new MCPOAuthProvider(tokenStorage);
-            const accessToken = await authProvider.getValidToken(
-              mcpServerName,
-              {
-                // Pass client ID if available
-                clientId: credentials.clientId,
-              },
-            );
+            const accessToken = await authProvider.getValidToken(mcpServerName, {
+              // Pass client ID if available
+              clientId: credentials.clientId,
+            });
 
             if (accessToken) {
               // Create transport with OAuth token
@@ -991,14 +921,10 @@ export async function connectToMcpServer(
                 // Connection successful with OAuth
                 return mcpClient;
               } else {
-                throw new Error(
-                  `Failed to create OAuth transport for server '${mcpServerName}'`,
-                );
+                throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
               }
             } else {
-              throw new Error(
-                `Failed to get OAuth token for server '${mcpServerName}'`,
-              );
+              throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
             }
           } else {
             throw new Error(
@@ -1006,38 +932,32 @@ export async function connectToMcpServer(
             );
           }
         } else {
-          throw new Error(
-            `Failed to handle automatic OAuth for server '${mcpServerName}'`,
-          );
+          throw new Error(`Failed to handle automatic OAuth for server '${mcpServerName}'`);
         }
       } else {
         // No www-authenticate header found, but we got a 401
         // Only try OAuth discovery for HTTP servers or when OAuth is explicitly configured
         // For SSE servers, we should not trigger new OAuth flows automatically
-        const shouldTryDiscovery =
-          mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
+        const shouldTryDiscovery = mcpServerConfig.httpUrl || mcpServerConfig.oauth?.enabled;
 
         if (!shouldTryDiscovery) {
           const tokenStorage = new MCPOAuthTokenStorage();
           const credentials = await tokenStorage.getCredentials(mcpServerName);
           if (credentials) {
             const authProvider = new MCPOAuthProvider(tokenStorage);
-            const hasStoredTokens = await authProvider.getValidToken(
-              mcpServerName,
-              {
-                // Pass client ID if available
-                clientId: credentials.clientId,
-              },
-            );
+            const hasStoredTokens = await authProvider.getValidToken(mcpServerName, {
+              // Pass client ID if available
+              clientId: credentials.clientId,
+            });
             if (hasStoredTokens) {
               coreEvents.emitFeedback(
-                'error',
+                "error",
                 `Stored OAuth token for SSE server '${mcpServerName}' was rejected. ` +
                   `Please re-authenticate using: /mcp auth ${mcpServerName}`,
               );
             } else {
               coreEvents.emitFeedback(
-                'error',
+                "error",
                 `401 error received for SSE server '${mcpServerName}' without OAuth configuration. ` +
                   `Please authenticate using: /mcp auth ${mcpServerName}`,
               );
@@ -1050,14 +970,10 @@ export async function connectToMcpServer(
         }
 
         // For SSE/HTTP servers, try to discover OAuth configuration from the base URL
-        debugLogger.log(
-          `🔍 Attempting OAuth discovery for '${mcpServerName}'...`,
-        );
+        debugLogger.log(`🔍 Attempting OAuth discovery for '${mcpServerName}'...`);
 
         if (hasNetworkTransport(mcpServerConfig)) {
-          const serverUrl = new URL(
-            mcpServerConfig.httpUrl || mcpServerConfig.url!,
-          );
+          const serverUrl = new URL(mcpServerConfig.httpUrl || mcpServerConfig.url!);
           const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
 
           // Try to discover OAuth configuration from the base URL
@@ -1077,33 +993,20 @@ export async function connectToMcpServer(
 
             // Perform OAuth authentication
             // Pass the server URL for proper discovery
-            const authServerUrl =
-              mcpServerConfig.httpUrl || mcpServerConfig.url;
-            debugLogger.log(
-              `Starting OAuth authentication for server '${mcpServerName}'...`,
-            );
-            const authProvider = new MCPOAuthProvider(
-              new MCPOAuthTokenStorage(),
-            );
-            await authProvider.authenticate(
-              mcpServerName,
-              oauthAuthConfig,
-              authServerUrl,
-            );
+            const authServerUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
+            debugLogger.log(`Starting OAuth authentication for server '${mcpServerName}'...`);
+            const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
+            await authProvider.authenticate(mcpServerName, oauthAuthConfig, authServerUrl);
 
             // Retry connection with OAuth token
             const tokenStorage = new MCPOAuthTokenStorage();
-            const credentials =
-              await tokenStorage.getCredentials(mcpServerName);
+            const credentials = await tokenStorage.getCredentials(mcpServerName);
             if (credentials) {
               const authProvider = new MCPOAuthProvider(tokenStorage);
-              const accessToken = await authProvider.getValidToken(
-                mcpServerName,
-                {
-                  // Pass client ID if available
-                  clientId: credentials.clientId,
-                },
-              );
+              const accessToken = await authProvider.getValidToken(mcpServerName, {
+                // Pass client ID if available
+                clientId: credentials.clientId,
+              });
               if (accessToken) {
                 // Create transport with OAuth token
                 const oauthTransport = await createTransportWithOAuth(
@@ -1113,25 +1016,18 @@ export async function connectToMcpServer(
                 );
                 if (oauthTransport) {
                   await mcpClient.connect(oauthTransport, {
-                    timeout:
-                      mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
+                    timeout: mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC,
                   });
                   // Connection successful with OAuth
                   return mcpClient;
                 } else {
-                  throw new Error(
-                    `Failed to create OAuth transport for server '${mcpServerName}'`,
-                  );
+                  throw new Error(`Failed to create OAuth transport for server '${mcpServerName}'`);
                 }
               } else {
-                throw new Error(
-                  `Failed to get OAuth token for server '${mcpServerName}'`,
-                );
+                throw new Error(`Failed to get OAuth token for server '${mcpServerName}'`);
               }
             } else {
-              throw new Error(
-                `Failed to get stored credentials for server '${mcpServerName}'`,
-              );
+              throw new Error(`Failed to get stored credentials for server '${mcpServerName}'`);
             }
           } else {
             throw new Error(
@@ -1149,8 +1045,7 @@ export async function connectToMcpServer(
       // Create a concise error message
       const errorMessage = (error as Error).message || String(error);
       const isNetworkError =
-        errorMessage.includes('ENOTFOUND') ||
-        errorMessage.includes('ECONNREFUSED');
+        errorMessage.includes("ENOTFOUND") || errorMessage.includes("ECONNREFUSED");
 
       let conciseError: string;
       if (isNetworkError) {
@@ -1159,7 +1054,7 @@ export async function connectToMcpServer(
         conciseError = `Connection failed for '${mcpServerName}': ${errorMessage}`;
       }
 
-      if (process.env['SANDBOX']) {
+      if (process.env["SANDBOX"]) {
         conciseError += ` (check sandbox availability)`;
       }
 
@@ -1174,57 +1069,34 @@ export async function createTransport(
   mcpServerConfig: MCPServerConfig,
   debugMode: boolean,
 ): Promise<Transport> {
-  if (
-    mcpServerConfig.authProviderType ===
-    AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION
-  ) {
+  if (mcpServerConfig.authProviderType === AuthProviderType.SERVICE_ACCOUNT_IMPERSONATION) {
     const provider = new ServiceAccountImpersonationProvider(mcpServerConfig);
-    const transportOptions:
-      | StreamableHTTPClientTransportOptions
-      | SSEClientTransportOptions = {
+    const transportOptions: StreamableHTTPClientTransportOptions | SSEClientTransportOptions = {
       requestInit: createTransportRequestInit(mcpServerConfig, {}),
       authProvider: provider,
     };
 
     if (mcpServerConfig.httpUrl) {
-      return new StreamableHTTPClientTransport(
-        new URL(mcpServerConfig.httpUrl),
-        transportOptions,
-      );
+      return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
     } else if (mcpServerConfig.url) {
       // Default to SSE if only url is provided
-      return new SSEClientTransport(
-        new URL(mcpServerConfig.url),
-        transportOptions,
-      );
+      return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
     }
-    throw new Error(
-      'No URL configured for ServiceAccountImpersonation MCP Server',
-    );
+    throw new Error("No URL configured for ServiceAccountImpersonation MCP Server");
   }
 
-  if (
-    mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS
-  ) {
+  if (mcpServerConfig.authProviderType === AuthProviderType.GOOGLE_CREDENTIALS) {
     const provider = new GoogleCredentialProvider(mcpServerConfig);
-    const transportOptions:
-      | StreamableHTTPClientTransportOptions
-      | SSEClientTransportOptions = {
+    const transportOptions: StreamableHTTPClientTransportOptions | SSEClientTransportOptions = {
       requestInit: createTransportRequestInit(mcpServerConfig, {}),
       authProvider: provider,
     };
     if (mcpServerConfig.httpUrl) {
-      return new StreamableHTTPClientTransport(
-        new URL(mcpServerConfig.httpUrl),
-        transportOptions,
-      );
+      return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
     } else if (mcpServerConfig.url) {
-      return new SSEClientTransport(
-        new URL(mcpServerConfig.url),
-        transportOptions,
-      );
+      return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
     }
-    throw new Error('No URL configured for Google Credentials MCP server');
+    throw new Error("No URL configured for Google Credentials MCP server");
   }
 
   // Check if we have OAuth configuration or stored tokens
@@ -1234,10 +1106,7 @@ export async function createTransport(
   if (hasOAuthConfig && mcpServerConfig.oauth) {
     const tokenStorage = new MCPOAuthTokenStorage();
     const authProvider = new MCPOAuthProvider(tokenStorage);
-    accessToken = await authProvider.getValidToken(
-      mcpServerName,
-      mcpServerConfig.oauth,
-    );
+    accessToken = await authProvider.getValidToken(mcpServerName, mcpServerConfig.oauth);
 
     if (!accessToken) {
       throw new Error(
@@ -1258,9 +1127,7 @@ export async function createTransport(
 
       if (accessToken) {
         hasOAuthConfig = true;
-        debugLogger.log(
-          `Found stored OAuth token for server '${mcpServerName}'`,
-        );
+        debugLogger.log(`Found stored OAuth token for server '${mcpServerName}'`);
       }
     }
   }
@@ -1282,10 +1149,7 @@ export async function createTransport(
       };
     }
 
-    return new StreamableHTTPClientTransport(
-      new URL(mcpServerConfig.httpUrl),
-      transportOptions,
-    );
+    return new StreamableHTTPClientTransport(new URL(mcpServerConfig.httpUrl), transportOptions);
   }
 
   if (mcpServerConfig.url) {
@@ -1305,10 +1169,7 @@ export async function createTransport(
       };
     }
 
-    return new SSEClientTransport(
-      new URL(mcpServerConfig.url),
-      transportOptions,
-    );
+    return new SSEClientTransport(new URL(mcpServerConfig.url), transportOptions);
   }
 
   if (mcpServerConfig.command) {
@@ -1320,15 +1181,12 @@ export async function createTransport(
         ...(mcpServerConfig.env || {}),
       } as Record<string, string>,
       cwd: mcpServerConfig.cwd,
-      stderr: 'pipe',
+      stderr: "pipe",
     });
     if (debugMode) {
-      transport.stderr!.on('data', (data) => {
+      transport.stderr!.on("data", (data) => {
         const stderrStr = data.toString().trim();
-        debugLogger.debug(
-          `[DEBUG] [MCP STDERR (${mcpServerName})]: `,
-          stderrStr,
-        );
+        debugLogger.debug(`[DEBUG] [MCP STDERR (${mcpServerName})]: `, stderrStr);
       });
     }
     return transport;
@@ -1360,8 +1218,6 @@ export function isEnabled(
 
   return (
     !includeTools ||
-    includeTools.some(
-      (tool) => tool === funcDecl.name || tool.startsWith(`${funcDecl.name}(`),
-    )
+    includeTools.some((tool) => tool === funcDecl.name || tool.startsWith(`${funcDecl.name}(`))
   );
 }
diff --git a/packages/gemini-core/src/tools/mcp-tool.test.ts b/packages/gemini-core/src/tools/mcp-tool.test.ts
index 680fa9299..282aabc56 100644
--- a/packages/gemini-core/src/tools/mcp-tool.test.ts
+++ b/packages/gemini-core/src/tools/mcp-tool.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { CallableTool, Part } from "@google/genai";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mocked } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import { DiscoveredMCPTool, generateValidName } from './mcp-tool.js'; // Added getStringifiedResultForDisplay
-import type { ToolResult } from './tools.js';
-import { ToolConfirmationOutcome } from './tools.js'; // Added ToolConfirmationOutcome
-import type { CallableTool, Part } from '@google/genai';
-import { ToolErrorType } from './tool-error.js';
+import type { Mocked } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { DiscoveredMCPTool, generateValidName } from "./mcp-tool.js"; // Added getStringifiedResultForDisplay
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolResult } from "./tools.js";
+import { ToolConfirmationOutcome } from "./tools.js"; // Added ToolConfirmationOutcome
 
 // Mock @google/genai mcpToTool and CallableTool
 // We only need to mock the parts of CallableTool that DiscoveredMCPTool uses.
@@ -25,48 +25,46 @@ const mockCallableToolInstance: Mocked<CallableTool> = {
   // Add other methods if DiscoveredMCPTool starts using them
 };
 
-describe('generateValidName', () => {
-  it('should return a valid name for a simple function', () => {
-    expect(generateValidName('myFunction')).toBe('myFunction');
+describe("generateValidName", () => {
+  it("should return a valid name for a simple function", () => {
+    expect(generateValidName("myFunction")).toBe("myFunction");
   });
 
-  it('should replace invalid characters with underscores', () => {
-    expect(generateValidName('invalid-name with spaces')).toBe(
-      'invalid-name_with_spaces',
-    );
+  it("should replace invalid characters with underscores", () => {
+    expect(generateValidName("invalid-name with spaces")).toBe("invalid-name_with_spaces");
   });
 
-  it('should truncate long names', () => {
-    expect(generateValidName('x'.repeat(80))).toBe(
-      'xxxxxxxxxxxxxxxxxxxxxxxxxxxx___xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+  it("should truncate long names", () => {
+    expect(generateValidName("x".repeat(80))).toBe(
+      "xxxxxxxxxxxxxxxxxxxxxxxxxxxx___xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
     );
   });
 
-  it('should handle names with only invalid characters', () => {
-    expect(generateValidName('!@#$%^&*()')).toBe('__________');
+  it("should handle names with only invalid characters", () => {
+    expect(generateValidName("!@#$%^&*()")).toBe("__________");
   });
 
-  it('should handle names that are exactly 63 characters long', () => {
-    expect(generateValidName('a'.repeat(63)).length).toBe(63);
+  it("should handle names that are exactly 63 characters long", () => {
+    expect(generateValidName("a".repeat(63)).length).toBe(63);
   });
 
-  it('should handle names that are exactly 64 characters long', () => {
-    expect(generateValidName('a'.repeat(64)).length).toBe(63);
+  it("should handle names that are exactly 64 characters long", () => {
+    expect(generateValidName("a".repeat(64)).length).toBe(63);
   });
 
-  it('should handle names that are longer than 64 characters', () => {
-    expect(generateValidName('a'.repeat(80)).length).toBe(63);
+  it("should handle names that are longer than 64 characters", () => {
+    expect(generateValidName("a".repeat(80)).length).toBe(63);
   });
 });
 
-describe('DiscoveredMCPTool', () => {
-  const serverName = 'mock-mcp-server';
-  const serverToolName = 'actual-server-tool-name';
-  const baseDescription = 'A test MCP tool.';
+describe("DiscoveredMCPTool", () => {
+  const serverName = "mock-mcp-server";
+  const serverToolName = "actual-server-tool-name";
+  const baseDescription = "A test MCP tool.";
   const inputSchema: Record<string, unknown> = {
-    type: 'object' as const,
-    properties: { param: { type: 'string' } },
-    required: ['param'],
+    type: "object" as const,
+    properties: { param: { type: "string" } },
+    required: ["param"],
   };
 
   let tool: DiscoveredMCPTool;
@@ -82,7 +80,7 @@ describe('DiscoveredMCPTool', () => {
       inputSchema,
     );
     // Clear allowlist before each relevant test, especially for shouldConfirmExecute
-    const invocation = tool.build({ param: 'mock' }) as any;
+    const invocation = tool.build({ param: "mock" }) as any;
     invocation.constructor.allowlist.clear();
   });
 
@@ -90,8 +88,8 @@ describe('DiscoveredMCPTool', () => {
     vi.restoreAllMocks();
   });
 
-  describe('constructor', () => {
-    it('should set properties correctly', () => {
+  describe("constructor", () => {
+    it("should set properties correctly", () => {
       expect(tool.name).toBe(serverToolName);
       expect(tool.schema.name).toBe(serverToolName);
       expect(tool.schema.description).toBe(baseDescription);
@@ -101,16 +99,16 @@ describe('DiscoveredMCPTool', () => {
     });
   });
 
-  describe('execute', () => {
-    it('should call mcpTool.callTool with correct parameters and format display output', async () => {
-      const params = { param: 'testValue' };
+  describe("execute", () => {
+    it("should call mcpTool.callTool with correct parameters and format display output", async () => {
+      const params = { param: "testValue" };
       const mockToolSuccessResultObject = {
         success: true,
-        details: 'executed',
+        details: "executed",
       };
       const mockFunctionResponseContent = [
         {
-          type: 'text',
+          type: "text",
           text: JSON.stringify(mockToolSuccessResultObject),
         },
       ];
@@ -125,150 +123,128 @@ describe('DiscoveredMCPTool', () => {
       mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
 
       const invocation = tool.build(params);
-      const toolResult: ToolResult = await invocation.execute(
-        new AbortController().signal,
-      );
+      const toolResult: ToolResult = await invocation.execute(new AbortController().signal);
 
-      expect(mockCallTool).toHaveBeenCalledWith([
-        { name: serverToolName, args: params },
-      ]);
+      expect(mockCallTool).toHaveBeenCalledWith([{ name: serverToolName, args: params }]);
 
-      const stringifiedResponseContent = JSON.stringify(
-        mockToolSuccessResultObject,
-      );
-      expect(toolResult.llmContent).toEqual([
-        { text: stringifiedResponseContent },
-      ]);
+      const stringifiedResponseContent = JSON.stringify(mockToolSuccessResultObject);
+      expect(toolResult.llmContent).toEqual([{ text: stringifiedResponseContent }]);
       expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
     });
 
-    it('should handle empty result from getStringifiedResultForDisplay', async () => {
-      const params = { param: 'testValue' };
+    it("should handle empty result from getStringifiedResultForDisplay", async () => {
+      const params = { param: "testValue" };
       const mockMcpToolResponsePartsEmpty: Part[] = [];
       mockCallTool.mockResolvedValue(mockMcpToolResponsePartsEmpty);
       const invocation = tool.build(params);
-      const toolResult: ToolResult = await invocation.execute(
-        new AbortController().signal,
-      );
-      expect(toolResult.returnDisplay).toBe('```json\n[]\n```');
-      expect(toolResult.llmContent).toEqual([
-        { text: '[Error: Could not parse tool response]' },
-      ]);
+      const toolResult: ToolResult = await invocation.execute(new AbortController().signal);
+      expect(toolResult.returnDisplay).toBe("```json\n[]\n```");
+      expect(toolResult.llmContent).toEqual([{ text: "[Error: Could not parse tool response]" }]);
     });
 
-    it('should propagate rejection if mcpTool.callTool rejects', async () => {
-      const params = { param: 'failCase' };
-      const expectedError = new Error('MCP call failed');
+    it("should propagate rejection if mcpTool.callTool rejects", async () => {
+      const params = { param: "failCase" };
+      const expectedError = new Error("MCP call failed");
       mockCallTool.mockRejectedValue(expectedError);
 
       const invocation = tool.build(params);
-      await expect(
-        invocation.execute(new AbortController().signal),
-      ).rejects.toThrow(expectedError);
+      await expect(invocation.execute(new AbortController().signal)).rejects.toThrow(expectedError);
     });
 
     it.each([
-      { isErrorValue: true, description: 'true (bool)' },
-      { isErrorValue: 'true', description: '"true" (str)' },
-    ])(
-      'should return a structured error if MCP tool reports an error',
-      async ({ isErrorValue }) => {
-        const tool = new DiscoveredMCPTool(
-          mockCallableToolInstance,
-          serverName,
-          serverToolName,
-          baseDescription,
-          inputSchema,
-        );
-        const params = { param: 'isErrorTrueCase' };
-        const functionCall = {
-          name: serverToolName,
-          args: params,
-        };
-
-        const errorResponse = { isError: isErrorValue };
-        const mockMcpToolResponseParts: Part[] = [
-          {
-            functionResponse: {
-              name: serverToolName,
-              response: { error: errorResponse },
-            },
+      { isErrorValue: true, description: "true (bool)" },
+      { isErrorValue: "true", description: '"true" (str)' },
+    ])("should return a structured error if MCP tool reports an error", async ({
+      isErrorValue,
+    }) => {
+      const tool = new DiscoveredMCPTool(
+        mockCallableToolInstance,
+        serverName,
+        serverToolName,
+        baseDescription,
+        inputSchema,
+      );
+      const params = { param: "isErrorTrueCase" };
+      const functionCall = {
+        name: serverToolName,
+        args: params,
+      };
+
+      const errorResponse = { isError: isErrorValue };
+      const mockMcpToolResponseParts: Part[] = [
+        {
+          functionResponse: {
+            name: serverToolName,
+            response: { error: errorResponse },
           },
-        ];
-        mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
-        const expectedErrorMessage = `MCP tool '${
-          serverToolName
-        }' reported tool error for function call: ${safeJsonStringify(
-          functionCall,
-        )} with response: ${safeJsonStringify(mockMcpToolResponseParts)}`;
-        const invocation = tool.build(params);
-        const result = await invocation.execute(new AbortController().signal);
+        },
+      ];
+      mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
+      const expectedErrorMessage = `MCP tool '${
+        serverToolName
+      }' reported tool error for function call: ${safeJsonStringify(
+        functionCall,
+      )} with response: ${safeJsonStringify(mockMcpToolResponseParts)}`;
+      const invocation = tool.build(params);
+      const result = await invocation.execute(new AbortController().signal);
 
-        expect(result.error?.type).toBe(ToolErrorType.MCP_TOOL_ERROR);
-        expect(result.llmContent).toBe(expectedErrorMessage);
-        expect(result.returnDisplay).toContain(
-          `Error: MCP tool '${serverToolName}' reported an error.`,
-        );
-      },
-    );
+      expect(result.error?.type).toBe(ToolErrorType.MCP_TOOL_ERROR);
+      expect(result.llmContent).toBe(expectedErrorMessage);
+      expect(result.returnDisplay).toContain(
+        `Error: MCP tool '${serverToolName}' reported an error.`,
+      );
+    });
 
     it.each([
-      { isErrorValue: false, description: 'false (bool)' },
-      { isErrorValue: 'false', description: '"false" (str)' },
-    ])(
-      'should consider a ToolResult with isError ${description} to be a success',
-      async ({ isErrorValue }) => {
-        const tool = new DiscoveredMCPTool(
-          mockCallableToolInstance,
-          serverName,
-          serverToolName,
-          baseDescription,
-          inputSchema,
-        );
-        const params = { param: 'isErrorFalseCase' };
-        const mockToolSuccessResultObject = {
-          success: true,
-          details: 'executed',
-        };
-        const mockFunctionResponseContent = [
-          {
-            type: 'text',
-            text: JSON.stringify(mockToolSuccessResultObject),
-          },
-        ];
+      { isErrorValue: false, description: "false (bool)" },
+      { isErrorValue: "false", description: '"false" (str)' },
+    ])("should consider a ToolResult with isError ${description} to be a success", async ({
+      isErrorValue,
+    }) => {
+      const tool = new DiscoveredMCPTool(
+        mockCallableToolInstance,
+        serverName,
+        serverToolName,
+        baseDescription,
+        inputSchema,
+      );
+      const params = { param: "isErrorFalseCase" };
+      const mockToolSuccessResultObject = {
+        success: true,
+        details: "executed",
+      };
+      const mockFunctionResponseContent = [
+        {
+          type: "text",
+          text: JSON.stringify(mockToolSuccessResultObject),
+        },
+      ];
 
-        const errorResponse = { isError: isErrorValue };
-        const mockMcpToolResponseParts: Part[] = [
-          {
-            functionResponse: {
-              name: serverToolName,
-              response: {
-                error: errorResponse,
-                content: mockFunctionResponseContent,
-              },
+      const errorResponse = { isError: isErrorValue };
+      const mockMcpToolResponseParts: Part[] = [
+        {
+          functionResponse: {
+            name: serverToolName,
+            response: {
+              error: errorResponse,
+              content: mockFunctionResponseContent,
             },
           },
-        ];
-        mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
+        },
+      ];
+      mockCallTool.mockResolvedValue(mockMcpToolResponseParts);
 
-        const invocation = tool.build(params);
-        const toolResult = await invocation.execute(
-          new AbortController().signal,
-        );
+      const invocation = tool.build(params);
+      const toolResult = await invocation.execute(new AbortController().signal);
 
-        const stringifiedResponseContent = JSON.stringify(
-          mockToolSuccessResultObject,
-        );
-        expect(toolResult.llmContent).toEqual([
-          { text: stringifiedResponseContent },
-        ]);
-        expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
-      },
-    );
+      const stringifiedResponseContent = JSON.stringify(mockToolSuccessResultObject);
+      expect(toolResult.llmContent).toEqual([{ text: stringifiedResponseContent }]);
+      expect(toolResult.returnDisplay).toBe(stringifiedResponseContent);
+    });
 
-    it('should handle a simple text response correctly', async () => {
-      const params = { param: 'test' };
-      const successMessage = 'This is a success message.';
+    it("should handle a simple text response correctly", async () => {
+      const params = { param: "test" };
+      const successMessage = "This is a success message.";
 
       // Simulate the response from the GenAI SDK, which wraps the MCP
       // response in a functionResponse Part.
@@ -278,7 +254,7 @@ describe('DiscoveredMCPTool', () => {
             name: serverToolName,
             response: {
               // The `content` array contains MCP ContentBlocks.
-              content: [{ type: 'text', text: successMessage }],
+              content: [{ type: "text", text: successMessage }],
             },
           },
         },
@@ -295,13 +271,11 @@ describe('DiscoveredMCPTool', () => {
       expect(toolResult.returnDisplay).toBe(successMessage);
 
       // 3. Verify that the underlying callTool was made correctly.
-      expect(mockCallTool).toHaveBeenCalledWith([
-        { name: serverToolName, args: params },
-      ]);
+      expect(mockCallTool).toHaveBeenCalledWith([{ name: serverToolName, args: params }]);
     });
 
-    it('should handle an AudioBlock response', async () => {
-      const params = { param: 'play' };
+    it("should handle an AudioBlock response", async () => {
+      const params = { param: "play" };
       const sdkResponse: Part[] = [
         {
           functionResponse: {
@@ -309,9 +283,9 @@ describe('DiscoveredMCPTool', () => {
             response: {
               content: [
                 {
-                  type: 'audio',
-                  data: 'BASE64_AUDIO_DATA',
-                  mimeType: 'audio/mp3',
+                  type: "audio",
+                  data: "BASE64_AUDIO_DATA",
+                  mimeType: "audio/mp3",
                 },
               ],
             },
@@ -329,16 +303,16 @@ describe('DiscoveredMCPTool', () => {
         },
         {
           inlineData: {
-            mimeType: 'audio/mp3',
-            data: 'BASE64_AUDIO_DATA',
+            mimeType: "audio/mp3",
+            data: "BASE64_AUDIO_DATA",
           },
         },
       ]);
-      expect(toolResult.returnDisplay).toBe('[Audio: audio/mp3]');
+      expect(toolResult.returnDisplay).toBe("[Audio: audio/mp3]");
     });
 
-    it('should handle a ResourceLinkBlock response', async () => {
-      const params = { param: 'get' };
+    it("should handle a ResourceLinkBlock response", async () => {
+      const params = { param: "get" };
       const sdkResponse: Part[] = [
         {
           functionResponse: {
@@ -346,10 +320,10 @@ describe('DiscoveredMCPTool', () => {
             response: {
               content: [
                 {
-                  type: 'resource_link',
-                  uri: 'file:///path/to/thing',
-                  name: 'resource-name',
-                  title: 'My Resource',
+                  type: "resource_link",
+                  uri: "file:///path/to/thing",
+                  name: "resource-name",
+                  title: "My Resource",
                 },
               ],
             },
@@ -363,16 +337,14 @@ describe('DiscoveredMCPTool', () => {
 
       expect(toolResult.llmContent).toEqual([
         {
-          text: 'Resource Link: My Resource at file:///path/to/thing',
+          text: "Resource Link: My Resource at file:///path/to/thing",
         },
       ]);
-      expect(toolResult.returnDisplay).toBe(
-        '[Link to My Resource: file:///path/to/thing]',
-      );
+      expect(toolResult.returnDisplay).toBe("[Link to My Resource: file:///path/to/thing]");
     });
 
-    it('should handle an embedded text ResourceBlock response', async () => {
-      const params = { param: 'get' };
+    it("should handle an embedded text ResourceBlock response", async () => {
+      const params = { param: "get" };
       const sdkResponse: Part[] = [
         {
           functionResponse: {
@@ -380,11 +352,11 @@ describe('DiscoveredMCPTool', () => {
             response: {
               content: [
                 {
-                  type: 'resource',
+                  type: "resource",
                   resource: {
-                    uri: 'file:///path/to/text.txt',
-                    text: 'This is the text content.',
-                    mimeType: 'text/plain',
+                    uri: "file:///path/to/text.txt",
+                    text: "This is the text content.",
+                    mimeType: "text/plain",
                   },
                 },
               ],
@@ -397,14 +369,12 @@ describe('DiscoveredMCPTool', () => {
       const invocation = tool.build(params);
       const toolResult = await invocation.execute(new AbortController().signal);
 
-      expect(toolResult.llmContent).toEqual([
-        { text: 'This is the text content.' },
-      ]);
-      expect(toolResult.returnDisplay).toBe('This is the text content.');
+      expect(toolResult.llmContent).toEqual([{ text: "This is the text content." }]);
+      expect(toolResult.returnDisplay).toBe("This is the text content.");
     });
 
-    it('should handle an embedded binary ResourceBlock response', async () => {
-      const params = { param: 'get' };
+    it("should handle an embedded binary ResourceBlock response", async () => {
+      const params = { param: "get" };
       const sdkResponse: Part[] = [
         {
           functionResponse: {
@@ -412,11 +382,11 @@ describe('DiscoveredMCPTool', () => {
             response: {
               content: [
                 {
-                  type: 'resource',
+                  type: "resource",
                   resource: {
-                    uri: 'file:///path/to/data.bin',
-                    blob: 'BASE64_BINARY_DATA',
-                    mimeType: 'application/octet-stream',
+                    uri: "file:///path/to/data.bin",
+                    blob: "BASE64_BINARY_DATA",
+                    mimeType: "application/octet-stream",
                   },
                 },
               ],
@@ -435,31 +405,29 @@ describe('DiscoveredMCPTool', () => {
         },
         {
           inlineData: {
-            mimeType: 'application/octet-stream',
-            data: 'BASE64_BINARY_DATA',
+            mimeType: "application/octet-stream",
+            data: "BASE64_BINARY_DATA",
           },
         },
       ]);
-      expect(toolResult.returnDisplay).toBe(
-        '[Embedded Resource: application/octet-stream]',
-      );
+      expect(toolResult.returnDisplay).toBe("[Embedded Resource: application/octet-stream]");
     });
 
-    it('should handle a mix of content block types', async () => {
-      const params = { param: 'complex' };
+    it("should handle a mix of content block types", async () => {
+      const params = { param: "complex" };
       const sdkResponse: Part[] = [
         {
           functionResponse: {
             name: serverToolName,
             response: {
               content: [
-                { type: 'text', text: 'First part.' },
+                { type: "text", text: "First part." },
                 {
-                  type: 'image',
-                  data: 'BASE64_IMAGE_DATA',
-                  mimeType: 'image/jpeg',
+                  type: "image",
+                  data: "BASE64_IMAGE_DATA",
+                  mimeType: "image/jpeg",
                 },
-                { type: 'text', text: 'Second part.' },
+                { type: "text", text: "Second part." },
               ],
             },
           },
@@ -471,33 +439,31 @@ describe('DiscoveredMCPTool', () => {
       const toolResult = await invocation.execute(new AbortController().signal);
 
       expect(toolResult.llmContent).toEqual([
-        { text: 'First part.' },
+        { text: "First part." },
         {
           text: `[Tool '${serverToolName}' provided the following image data with mime-type: image/jpeg]`,
         },
         {
           inlineData: {
-            mimeType: 'image/jpeg',
-            data: 'BASE64_IMAGE_DATA',
+            mimeType: "image/jpeg",
+            data: "BASE64_IMAGE_DATA",
           },
         },
-        { text: 'Second part.' },
+        { text: "Second part." },
       ]);
-      expect(toolResult.returnDisplay).toBe(
-        'First part.\n[Image: image/jpeg]\nSecond part.',
-      );
+      expect(toolResult.returnDisplay).toBe("First part.\n[Image: image/jpeg]\nSecond part.");
     });
 
-    it('should ignore unknown content block types', async () => {
-      const params = { param: 'test' };
+    it("should ignore unknown content block types", async () => {
+      const params = { param: "test" };
       const sdkResponse: Part[] = [
         {
           functionResponse: {
             name: serverToolName,
             response: {
               content: [
-                { type: 'text', text: 'Valid part.' },
-                { type: 'future_block', data: 'some-data' },
+                { type: "text", text: "Valid part." },
+                { type: "future_block", data: "some-data" },
               ],
             },
           },
@@ -508,39 +474,37 @@ describe('DiscoveredMCPTool', () => {
       const invocation = tool.build(params);
       const toolResult = await invocation.execute(new AbortController().signal);
 
-      expect(toolResult.llmContent).toEqual([{ text: 'Valid part.' }]);
-      expect(toolResult.returnDisplay).toBe(
-        'Valid part.\n[Unknown content type: future_block]',
-      );
+      expect(toolResult.llmContent).toEqual([{ text: "Valid part." }]);
+      expect(toolResult.returnDisplay).toBe("Valid part.\n[Unknown content type: future_block]");
     });
 
-    it('should handle a complex mix of content block types', async () => {
-      const params = { param: 'super-complex' };
+    it("should handle a complex mix of content block types", async () => {
+      const params = { param: "super-complex" };
       const sdkResponse: Part[] = [
         {
           functionResponse: {
             name: serverToolName,
             response: {
               content: [
-                { type: 'text', text: 'Here is a resource.' },
+                { type: "text", text: "Here is a resource." },
                 {
-                  type: 'resource_link',
-                  uri: 'file:///path/to/resource',
-                  name: 'resource-name',
-                  title: 'My Resource',
+                  type: "resource_link",
+                  uri: "file:///path/to/resource",
+                  name: "resource-name",
+                  title: "My Resource",
                 },
                 {
-                  type: 'resource',
+                  type: "resource",
                   resource: {
-                    uri: 'file:///path/to/text.txt',
-                    text: 'Embedded text content.',
-                    mimeType: 'text/plain',
+                    uri: "file:///path/to/text.txt",
+                    text: "Embedded text content.",
+                    mimeType: "text/plain",
                   },
                 },
                 {
-                  type: 'image',
-                  data: 'BASE64_IMAGE_DATA',
-                  mimeType: 'image/jpeg',
+                  type: "image",
+                  data: "BASE64_IMAGE_DATA",
+                  mimeType: "image/jpeg",
                 },
               ],
             },
@@ -553,44 +517,42 @@ describe('DiscoveredMCPTool', () => {
       const toolResult = await invocation.execute(new AbortController().signal);
 
       expect(toolResult.llmContent).toEqual([
-        { text: 'Here is a resource.' },
+        { text: "Here is a resource." },
         {
-          text: 'Resource Link: My Resource at file:///path/to/resource',
+          text: "Resource Link: My Resource at file:///path/to/resource",
         },
-        { text: 'Embedded text content.' },
+        { text: "Embedded text content." },
         {
           text: `[Tool '${serverToolName}' provided the following image data with mime-type: image/jpeg]`,
         },
         {
           inlineData: {
-            mimeType: 'image/jpeg',
-            data: 'BASE64_IMAGE_DATA',
+            mimeType: "image/jpeg",
+            data: "BASE64_IMAGE_DATA",
           },
         },
       ]);
       expect(toolResult.returnDisplay).toBe(
-        'Here is a resource.\n[Link to My Resource: file:///path/to/resource]\nEmbedded text content.\n[Image: image/jpeg]',
+        "Here is a resource.\n[Link to My Resource: file:///path/to/resource]\nEmbedded text content.\n[Image: image/jpeg]",
       );
     });
 
-    describe('AbortSignal support', () => {
-      it('should abort immediately if signal is already aborted', async () => {
-        const params = { param: 'test' };
+    describe("AbortSignal support", () => {
+      it("should abort immediately if signal is already aborted", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
         controller.abort();
 
         const invocation = tool.build(params);
 
-        await expect(invocation.execute(controller.signal)).rejects.toThrow(
-          'Tool call aborted',
-        );
+        await expect(invocation.execute(controller.signal)).rejects.toThrow("Tool call aborted");
 
         // Tool should not be called if signal is already aborted
         expect(mockCallTool).not.toHaveBeenCalled();
       });
 
-      it('should abort during tool execution', async () => {
-        const params = { param: 'test' };
+      it("should abort during tool execution", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
 
         // Mock a delayed response to simulate long-running tool
@@ -603,7 +565,7 @@ describe('DiscoveredMCPTool', () => {
                     functionResponse: {
                       name: serverToolName,
                       response: {
-                        content: [{ type: 'text', text: 'Success' }],
+                        content: [{ type: "text", text: "Success" }],
                       },
                     },
                   },
@@ -618,18 +580,18 @@ describe('DiscoveredMCPTool', () => {
         // Abort after a short delay to simulate cancellation during execution
         setTimeout(() => controller.abort(), 50);
 
-        await expect(promise).rejects.toThrow('Tool call aborted');
+        await expect(promise).rejects.toThrow("Tool call aborted");
       });
 
-      it('should complete successfully if not aborted', async () => {
-        const params = { param: 'test' };
+      it("should complete successfully if not aborted", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
         const successResponse = [
           {
             functionResponse: {
               name: serverToolName,
               response: {
-                content: [{ type: 'text', text: 'Success' }],
+                content: [{ type: "text", text: "Success" }],
               },
             },
           },
@@ -640,15 +602,13 @@ describe('DiscoveredMCPTool', () => {
         const invocation = tool.build(params);
         const result = await invocation.execute(controller.signal);
 
-        expect(result.llmContent).toEqual([{ text: 'Success' }]);
-        expect(result.returnDisplay).toBe('Success');
-        expect(mockCallTool).toHaveBeenCalledWith([
-          { name: serverToolName, args: params },
-        ]);
+        expect(result.llmContent).toEqual([{ text: "Success" }]);
+        expect(result.returnDisplay).toBe("Success");
+        expect(mockCallTool).toHaveBeenCalledWith([{ name: serverToolName, args: params }]);
       });
 
-      it('should handle tool error even when abort signal is provided', async () => {
-        const params = { param: 'test' };
+      it("should handle tool error even when abort signal is provided", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
         const errorResponse = [
           {
@@ -670,29 +630,27 @@ describe('DiscoveredMCPTool', () => {
         );
       });
 
-      it('should handle callTool rejection with abort signal', async () => {
-        const params = { param: 'test' };
+      it("should handle callTool rejection with abort signal", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
-        const expectedError = new Error('Network error');
+        const expectedError = new Error("Network error");
 
         mockCallTool.mockRejectedValue(expectedError);
 
         const invocation = tool.build(params);
 
-        await expect(invocation.execute(controller.signal)).rejects.toThrow(
-          expectedError,
-        );
+        await expect(invocation.execute(controller.signal)).rejects.toThrow(expectedError);
       });
 
-      it('should cleanup event listeners properly on successful completion', async () => {
-        const params = { param: 'test' };
+      it("should cleanup event listeners properly on successful completion", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
         const successResponse = [
           {
             functionResponse: {
               name: serverToolName,
               response: {
-                content: [{ type: 'text', text: 'Success' }],
+                content: [{ type: "text", text: "Success" }],
               },
             },
           },
@@ -707,10 +665,10 @@ describe('DiscoveredMCPTool', () => {
         expect(controller.signal.aborted).toBe(true);
       });
 
-      it('should cleanup event listeners properly on error', async () => {
-        const params = { param: 'test' };
+      it("should cleanup event listeners properly on error", async () => {
+        const params = { param: "test" };
         const controller = new AbortController();
-        const expectedError = new Error('Tool execution failed');
+        const expectedError = new Error("Tool execution failed");
 
         mockCallTool.mockRejectedValue(expectedError);
 
@@ -729,8 +687,8 @@ describe('DiscoveredMCPTool', () => {
     });
   });
 
-  describe('shouldConfirmExecute', () => {
-    it('should return false if trust is true', async () => {
+  describe("shouldConfirmExecute", () => {
+    it("should return false if trust is true", async () => {
       const trustedTool = new DiscoveredMCPTool(
         mockCallableToolInstance,
         serverName,
@@ -741,160 +699,120 @@ describe('DiscoveredMCPTool', () => {
         undefined,
         { isTrustedFolder: () => true } as any,
       );
-      const invocation = trustedTool.build({ param: 'mock' });
-      expect(
-        await invocation.shouldConfirmExecute(new AbortController().signal),
-      ).toBe(false);
+      const invocation = trustedTool.build({ param: "mock" });
+      expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
     });
 
-    it('should return false if server is allowlisted', async () => {
-      const invocation = tool.build({ param: 'mock' }) as any;
+    it("should return false if server is allowlisted", async () => {
+      const invocation = tool.build({ param: "mock" }) as any;
       invocation.constructor.allowlist.add(serverName);
-      expect(
-        await invocation.shouldConfirmExecute(new AbortController().signal),
-      ).toBe(false);
+      expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
     });
 
-    it('should return false if tool is allowlisted', async () => {
+    it("should return false if tool is allowlisted", async () => {
       const toolAllowlistKey = `${serverName}.${serverToolName}`;
-      const invocation = tool.build({ param: 'mock' }) as any;
+      const invocation = tool.build({ param: "mock" }) as any;
       invocation.constructor.allowlist.add(toolAllowlistKey);
-      expect(
-        await invocation.shouldConfirmExecute(new AbortController().signal),
-      ).toBe(false);
+      expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
     });
 
-    it('should return confirmation details if not trusted and not allowlisted', async () => {
-      const invocation = tool.build({ param: 'mock' });
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+    it("should return confirmation details if not trusted and not allowlisted", async () => {
+      const invocation = tool.build({ param: "mock" });
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
-      if (confirmation && confirmation.type === 'mcp') {
+      if (confirmation && confirmation.type === "mcp") {
         // Type guard for ToolMcpConfirmationDetails
-        expect(confirmation.type).toBe('mcp');
+        expect(confirmation.type).toBe("mcp");
         expect(confirmation.serverName).toBe(serverName);
         expect(confirmation.toolName).toBe(serverToolName);
       } else if (confirmation) {
         // Handle other possible confirmation types if necessary, or strengthen test if only MCP is expected
-        throw new Error(
-          'Confirmation was not of expected type MCP or was false',
-        );
+        throw new Error("Confirmation was not of expected type MCP or was false");
       } else {
-        throw new Error(
-          'Confirmation details not in expected format or was false',
-        );
+        throw new Error("Confirmation details not in expected format or was false");
       }
     });
 
-    it('should add server to allowlist on ProceedAlwaysServer', async () => {
-      const invocation = tool.build({ param: 'mock' }) as any;
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+    it("should add server to allowlist on ProceedAlwaysServer", async () => {
+      const invocation = tool.build({ param: "mock" }) as any;
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
       if (
         confirmation &&
-        typeof confirmation === 'object' &&
-        'onConfirm' in confirmation &&
-        typeof confirmation.onConfirm === 'function'
+        typeof confirmation === "object" &&
+        "onConfirm" in confirmation &&
+        typeof confirmation.onConfirm === "function"
       ) {
-        await confirmation.onConfirm(
-          ToolConfirmationOutcome.ProceedAlwaysServer,
-        );
+        await confirmation.onConfirm(ToolConfirmationOutcome.ProceedAlwaysServer);
         expect(invocation.constructor.allowlist.has(serverName)).toBe(true);
       } else {
-        throw new Error(
-          'Confirmation details or onConfirm not in expected format',
-        );
+        throw new Error("Confirmation details or onConfirm not in expected format");
       }
     });
 
-    it('should add tool to allowlist on ProceedAlwaysTool', async () => {
+    it("should add tool to allowlist on ProceedAlwaysTool", async () => {
       const toolAllowlistKey = `${serverName}.${serverToolName}`;
-      const invocation = tool.build({ param: 'mock' }) as any;
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const invocation = tool.build({ param: "mock" }) as any;
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
       if (
         confirmation &&
-        typeof confirmation === 'object' &&
-        'onConfirm' in confirmation &&
-        typeof confirmation.onConfirm === 'function'
+        typeof confirmation === "object" &&
+        "onConfirm" in confirmation &&
+        typeof confirmation.onConfirm === "function"
       ) {
         await confirmation.onConfirm(ToolConfirmationOutcome.ProceedAlwaysTool);
-        expect(invocation.constructor.allowlist.has(toolAllowlistKey)).toBe(
-          true,
-        );
+        expect(invocation.constructor.allowlist.has(toolAllowlistKey)).toBe(true);
       } else {
-        throw new Error(
-          'Confirmation details or onConfirm not in expected format',
-        );
+        throw new Error("Confirmation details or onConfirm not in expected format");
       }
     });
 
-    it('should handle Cancel confirmation outcome', async () => {
-      const invocation = tool.build({ param: 'mock' }) as any;
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+    it("should handle Cancel confirmation outcome", async () => {
+      const invocation = tool.build({ param: "mock" }) as any;
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
       if (
         confirmation &&
-        typeof confirmation === 'object' &&
-        'onConfirm' in confirmation &&
-        typeof confirmation.onConfirm === 'function'
+        typeof confirmation === "object" &&
+        "onConfirm" in confirmation &&
+        typeof confirmation.onConfirm === "function"
       ) {
         // Cancel should not add anything to allowlist
         await confirmation.onConfirm(ToolConfirmationOutcome.Cancel);
         expect(invocation.constructor.allowlist.has(serverName)).toBe(false);
-        expect(
-          invocation.constructor.allowlist.has(
-            `${serverName}.${serverToolName}`,
-          ),
-        ).toBe(false);
+        expect(invocation.constructor.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
       } else {
-        throw new Error(
-          'Confirmation details or onConfirm not in expected format',
-        );
+        throw new Error("Confirmation details or onConfirm not in expected format");
       }
     });
 
-    it('should handle ProceedOnce confirmation outcome', async () => {
-      const invocation = tool.build({ param: 'mock' }) as any;
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+    it("should handle ProceedOnce confirmation outcome", async () => {
+      const invocation = tool.build({ param: "mock" }) as any;
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
       if (
         confirmation &&
-        typeof confirmation === 'object' &&
-        'onConfirm' in confirmation &&
-        typeof confirmation.onConfirm === 'function'
+        typeof confirmation === "object" &&
+        "onConfirm" in confirmation &&
+        typeof confirmation.onConfirm === "function"
       ) {
         // ProceedOnce should not add anything to allowlist
         await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
         expect(invocation.constructor.allowlist.has(serverName)).toBe(false);
-        expect(
-          invocation.constructor.allowlist.has(
-            `${serverName}.${serverToolName}`,
-          ),
-        ).toBe(false);
+        expect(invocation.constructor.allowlist.has(`${serverName}.${serverToolName}`)).toBe(false);
       } else {
-        throw new Error(
-          'Confirmation details or onConfirm not in expected format',
-        );
+        throw new Error("Confirmation details or onConfirm not in expected format");
       }
     });
   });
 
-  describe('shouldConfirmExecute with folder trust', () => {
+  describe("shouldConfirmExecute with folder trust", () => {
     const mockConfig = (isTrusted: boolean | undefined) => ({
       isTrustedFolder: () => isTrusted,
     });
 
-    it('should return false if trust is true and folder is trusted', async () => {
+    it("should return false if trust is true and folder is trusted", async () => {
       const trustedTool = new DiscoveredMCPTool(
         mockCallableToolInstance,
         serverName,
@@ -905,13 +823,11 @@ describe('DiscoveredMCPTool', () => {
         undefined,
         mockConfig(true) as any, // isTrustedFolder = true
       );
-      const invocation = trustedTool.build({ param: 'mock' });
-      expect(
-        await invocation.shouldConfirmExecute(new AbortController().signal),
-      ).toBe(false);
+      const invocation = trustedTool.build({ param: "mock" });
+      expect(await invocation.shouldConfirmExecute(new AbortController().signal)).toBe(false);
     });
 
-    it('should return confirmation details if trust is true but folder is not trusted', async () => {
+    it("should return confirmation details if trust is true but folder is not trusted", async () => {
       const trustedTool = new DiscoveredMCPTool(
         mockCallableToolInstance,
         serverName,
@@ -922,15 +838,13 @@ describe('DiscoveredMCPTool', () => {
         undefined,
         mockConfig(false) as any, // isTrustedFolder = false
       );
-      const invocation = trustedTool.build({ param: 'mock' });
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const invocation = trustedTool.build({ param: "mock" });
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
-      expect(confirmation).toHaveProperty('type', 'mcp');
+      expect(confirmation).toHaveProperty("type", "mcp");
     });
 
-    it('should return confirmation details if trust is false, even if folder is trusted', async () => {
+    it("should return confirmation details if trust is false, even if folder is trusted", async () => {
       const untrustedTool = new DiscoveredMCPTool(
         mockCallableToolInstance,
         serverName,
@@ -941,18 +855,16 @@ describe('DiscoveredMCPTool', () => {
         undefined,
         mockConfig(true) as any, // isTrustedFolder = true
       );
-      const invocation = untrustedTool.build({ param: 'mock' });
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const invocation = untrustedTool.build({ param: "mock" });
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(confirmation).not.toBe(false);
-      expect(confirmation).toHaveProperty('type', 'mcp');
+      expect(confirmation).toHaveProperty("type", "mcp");
     });
   });
 
-  describe('DiscoveredMCPToolInvocation', () => {
-    it('should return the stringified params from getDescription', () => {
-      const params = { param: 'testValue', param2: 'anotherOne' };
+  describe("DiscoveredMCPToolInvocation", () => {
+    it("should return the stringified params from getDescription", () => {
+      const params = { param: "testValue", param2: "anotherOne" };
       const invocation = tool.build(params);
       const description = invocation.getDescription();
       expect(description).toBe('{"param":"testValue","param2":"anotherOne"}');
diff --git a/packages/gemini-core/src/tools/mcp-tool.ts b/packages/gemini-core/src/tools/mcp-tool.ts
index 13a50b060..8aafdf093 100644
--- a/packages/gemini-core/src/tools/mcp-tool.ts
+++ b/packages/gemini-core/src/tools/mcp-tool.ts
@@ -4,40 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
+import type { CallableTool, FunctionCall, Part } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { ToolErrorType } from "./tool-error.js";
 import type {
   ToolCallConfirmationDetails,
   ToolInvocation,
   ToolMcpConfirmationDetails,
   ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { CallableTool, FunctionCall, Part } from '@google/genai';
-import { ToolErrorType } from './tool-error.js';
-import type { Config } from '../config/config.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 type ToolParams = Record<string, unknown>;
 
 // Discriminated union for MCP Content Blocks to ensure type safety.
 type McpTextBlock = {
-  type: 'text';
+  type: "text";
   text: string;
 };
 
 type McpMediaBlock = {
-  type: 'image' | 'audio';
+  type: "image" | "audio";
   mimeType: string;
   data: string;
 };
 
 type McpResourceBlock = {
-  type: 'resource';
+  type: "resource";
   resource: {
     text?: string;
     blob?: string;
@@ -46,22 +41,15 @@ type McpResourceBlock = {
 };
 
 type McpResourceLinkBlock = {
-  type: 'resource_link';
+  type: "resource_link";
   uri: string;
   title?: string;
   name?: string;
 };
 
-type McpContentBlock =
-  | McpTextBlock
-  | McpMediaBlock
-  | McpResourceBlock
-  | McpResourceLinkBlock;
+type McpContentBlock = McpTextBlock | McpMediaBlock | McpResourceBlock | McpResourceLinkBlock;
 
-class DiscoveredMCPToolInvocation extends BaseToolInvocation<
-  ToolParams,
-  ToolResult
-> {
+class DiscoveredMCPToolInvocation extends BaseToolInvocation<ToolParams, ToolResult> {
   private static readonly allowlist: Set<string> = new Set();
 
   constructor(
@@ -78,13 +66,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     // This enables server wildcards (e.g., "google-workspace__*")
     // while still allowing specific tool rules
 
-    super(
-      params,
-      messageBus,
-      `${serverName}__${serverToolName}`,
-      displayName,
-      serverName,
-    );
+    super(params, messageBus, `${serverName}__${serverToolName}`, displayName, serverName);
   }
 
   protected override async getConfirmationDetails(
@@ -105,8 +87,8 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     }
 
     const confirmationDetails: ToolMcpConfirmationDetails = {
-      type: 'mcp',
-      title: 'Confirm MCP Tool Execution',
+      type: "mcp",
+      title: "Confirm MCP Tool Execution",
       serverName: this.serverName,
       toolName: this.serverToolName, // Display original tool name in confirmation
       toolDisplayName: this.displayName, // Display global registry name exposed to model and user
@@ -136,7 +118,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
       const error = (response as { error?: McpError })?.error;
       const isError = error?.isError;
 
-      if (error && (isError === true || isError === 'true')) {
+      if (error && (isError === true || isError === "true")) {
         return true;
       }
     }
@@ -154,21 +136,21 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
     // Race MCP tool call with abort signal to respect cancellation
     const rawResponseParts = await new Promise<Part[]>((resolve, reject) => {
       if (signal.aborted) {
-        const error = new Error('Tool call aborted');
-        error.name = 'AbortError';
+        const error = new Error("Tool call aborted");
+        error.name = "AbortError";
         reject(error);
         return;
       }
       const onAbort = () => {
         cleanup();
-        const error = new Error('Tool call aborted');
-        error.name = 'AbortError';
+        const error = new Error("Tool call aborted");
+        error.name = "AbortError";
         reject(error);
       };
       const cleanup = () => {
-        signal.removeEventListener('abort', onAbort);
+        signal.removeEventListener("abort", onAbort);
       };
-      signal.addEventListener('abort', onAbort, { once: true });
+      signal.addEventListener("abort", onAbort, { once: true });
 
       this.mcpTool
         .callTool(functionCalls)
@@ -212,10 +194,7 @@ class DiscoveredMCPToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class DiscoveredMCPTool extends BaseDeclarativeTool<
-  ToolParams,
-  ToolResult
-> {
+export class DiscoveredMCPTool extends BaseDeclarativeTool<ToolParams, ToolResult> {
   constructor(
     private readonly mcpTool: CallableTool,
     readonly serverName: string,
@@ -286,10 +265,7 @@ function transformTextBlock(block: McpTextBlock): Part {
   return { text: block.text };
 }
 
-function transformImageAudioBlock(
-  block: McpMediaBlock,
-  toolName: string,
-): Part[] {
+function transformImageAudioBlock(block: McpMediaBlock, toolName: string): Part[] {
   return [
     {
       text: `[Tool '${toolName}' provided the following ${
@@ -305,16 +281,13 @@ function transformImageAudioBlock(
   ];
 }
 
-function transformResourceBlock(
-  block: McpResourceBlock,
-  toolName: string,
-): Part | Part[] | null {
+function transformResourceBlock(block: McpResourceBlock, toolName: string): Part | Part[] | null {
   const resource = block.resource;
   if (resource?.text) {
     return { text: resource.text };
   }
   if (resource?.blob) {
-    const mimeType = resource.mimeType || 'application/octet-stream';
+    const mimeType = resource.mimeType || "application/octet-stream";
     return [
       {
         text: `[Tool '${toolName}' provided the following embedded resource with mime-type: ${mimeType}]`,
@@ -344,30 +317,28 @@ function transformResourceLinkBlock(block: McpResourceLinkBlock): Part {
  */
 function transformMcpContentToParts(sdkResponse: Part[]): Part[] {
   const funcResponse = sdkResponse?.[0]?.functionResponse;
-  const mcpContent = funcResponse?.response?.['content'] as McpContentBlock[];
-  const toolName = funcResponse?.name || 'unknown tool';
+  const mcpContent = funcResponse?.response?.["content"] as McpContentBlock[];
+  const toolName = funcResponse?.name || "unknown tool";
 
   if (!Array.isArray(mcpContent)) {
-    return [{ text: '[Error: Could not parse tool response]' }];
+    return [{ text: "[Error: Could not parse tool response]" }];
   }
 
-  const transformed = mcpContent.flatMap(
-    (block: McpContentBlock): Part | Part[] | null => {
-      switch (block.type) {
-        case 'text':
-          return transformTextBlock(block);
-        case 'image':
-        case 'audio':
-          return transformImageAudioBlock(block, toolName);
-        case 'resource':
-          return transformResourceBlock(block, toolName);
-        case 'resource_link':
-          return transformResourceLinkBlock(block);
-        default:
-          return null;
-      }
-    },
-  );
+  const transformed = mcpContent.flatMap((block: McpContentBlock): Part | Part[] | null => {
+    switch (block.type) {
+      case "text":
+        return transformTextBlock(block);
+      case "image":
+      case "audio":
+        return transformImageAudioBlock(block, toolName);
+      case "resource":
+        return transformResourceBlock(block, toolName);
+      case "resource_link":
+        return transformResourceLinkBlock(block);
+      default:
+        return null;
+    }
+  });
 
   return transformed.filter((part): part is Part => part !== null);
 }
@@ -381,49 +352,44 @@ function transformMcpContentToParts(sdkResponse: Part[]): Part[] {
  * @returns A formatted string representing the tool's output.
  */
 function getStringifiedResultForDisplay(rawResponse: Part[]): string {
-  const mcpContent = rawResponse?.[0]?.functionResponse?.response?.[
-    'content'
-  ] as McpContentBlock[];
+  const mcpContent = rawResponse?.[0]?.functionResponse?.response?.["content"] as McpContentBlock[];
 
   if (!Array.isArray(mcpContent)) {
-    return '```json\n' + JSON.stringify(rawResponse, null, 2) + '\n```';
+    return "```json\n" + JSON.stringify(rawResponse, null, 2) + "\n```";
   }
 
   const displayParts = mcpContent.map((block: McpContentBlock): string => {
     switch (block.type) {
-      case 'text':
+      case "text":
         return block.text;
-      case 'image':
+      case "image":
         return `[Image: ${block.mimeType}]`;
-      case 'audio':
+      case "audio":
         return `[Audio: ${block.mimeType}]`;
-      case 'resource_link':
+      case "resource_link":
         return `[Link to ${block.title || block.name}: ${block.uri}]`;
-      case 'resource':
+      case "resource":
         if (block.resource?.text) {
           return block.resource.text;
         }
-        return `[Embedded Resource: ${
-          block.resource?.mimeType || 'unknown type'
-        }]`;
+        return `[Embedded Resource: ${block.resource?.mimeType || "unknown type"}]`;
       default:
         return `[Unknown content type: ${(block as { type: string }).type}]`;
     }
   });
 
-  return displayParts.join('\n');
+  return displayParts.join("\n");
 }
 
 /** Visible for testing */
 export function generateValidName(name: string) {
   // Replace invalid characters (based on 400 error message from Gemini API) with underscores
-  let validToolname = name.replace(/[^a-zA-Z0-9_.-]/g, '_');
+  let validToolname = name.replace(/[^a-zA-Z0-9_.-]/g, "_");
 
   // If longer than 63 characters, replace middle with '___'
   // (Gemini API says max length 64, but actual limit seems to be 63)
   if (validToolname.length > 63) {
-    validToolname =
-      validToolname.slice(0, 28) + '___' + validToolname.slice(-32);
+    validToolname = validToolname.slice(0, 28) + "___" + validToolname.slice(-32);
   }
   return validToolname;
 }
diff --git a/packages/gemini-core/src/tools/memoryTool.test.ts b/packages/gemini-core/src/tools/memoryTool.test.ts
index fb251d37e..a4955c272 100644
--- a/packages/gemini-core/src/tools/memoryTool.test.ts
+++ b/packages/gemini-core/src/tools/memoryTool.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GEMINI_DIR } from "../utils/paths.js";
 import {
+  DEFAULT_CONTEXT_FILENAME,
+  getAllGeminiMdFilenames,
+  getCurrentGeminiMdFilename,
   MemoryTool,
   setGeminiMdFilename,
-  getCurrentGeminiMdFilename,
-  getAllGeminiMdFilenames,
-  DEFAULT_CONTEXT_FILENAME,
-} from './memoryTool.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import { GEMINI_DIR } from '../utils/paths.js';
+} from "./memoryTool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolConfirmationOutcome } from "./tools.js";
 
 // Mock dependencies
-vi.mock(import('node:fs/promises'), async (importOriginal) => {
+vi.mock(import("node:fs/promises"), async (importOriginal) => {
   const actual = await importOriginal();
   return {
     ...actual,
@@ -30,31 +30,28 @@ vi.mock(import('node:fs/promises'), async (importOriginal) => {
   };
 });
 
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   mkdirSync: vi.fn(),
 }));
 
-vi.mock('os');
+vi.mock("os");
 
-const MEMORY_SECTION_HEADER = '## Gemini Added Memories';
+const MEMORY_SECTION_HEADER = "## Gemini Added Memories";
 
 // Define a type for our fsAdapter to ensure consistency
 interface FsAdapter {
-  readFile: (path: string, encoding: 'utf-8') => Promise<string>;
-  writeFile: (path: string, data: string, encoding: 'utf-8') => Promise<void>;
-  mkdir: (
-    path: string,
-    options: { recursive: boolean },
-  ) => Promise<string | undefined>;
+  readFile: (path: string, encoding: "utf-8") => Promise<string>;
+  writeFile: (path: string, data: string, encoding: "utf-8") => Promise<void>;
+  mkdir: (path: string, options: { recursive: boolean }) => Promise<string | undefined>;
 }
 
-describe('MemoryTool', () => {
+describe("MemoryTool", () => {
   const mockAbortSignal = new AbortController().signal;
 
   const mockFsAdapter: {
-    readFile: Mock<FsAdapter['readFile']>;
-    writeFile: Mock<FsAdapter['writeFile']>;
-    mkdir: Mock<FsAdapter['mkdir']>;
+    readFile: Mock<FsAdapter["readFile"]>;
+    writeFile: Mock<FsAdapter["writeFile"]>;
+    mkdir: Mock<FsAdapter["mkdir"]>;
   } = {
     readFile: vi.fn(),
     writeFile: vi.fn(),
@@ -62,12 +59,10 @@ describe('MemoryTool', () => {
   };
 
   beforeEach(() => {
-    vi.mocked(os.homedir).mockReturnValue(path.join('/mock', 'home'));
+    vi.mocked(os.homedir).mockReturnValue(path.join("/mock", "home"));
     mockFsAdapter.readFile.mockReset();
     mockFsAdapter.writeFile.mockReset().mockResolvedValue(undefined);
-    mockFsAdapter.mkdir
-      .mockReset()
-      .mockResolvedValue(undefined as string | undefined);
+    mockFsAdapter.mkdir.mockReset().mockResolvedValue(undefined as string | undefined);
   });
 
   afterEach(() => {
@@ -76,73 +71,66 @@ describe('MemoryTool', () => {
     setGeminiMdFilename(DEFAULT_CONTEXT_FILENAME);
   });
 
-  describe('setGeminiMdFilename', () => {
-    it('should update currentGeminiMdFilename when a valid new name is provided', () => {
-      const newName = 'CUSTOM_CONTEXT.md';
+  describe("setGeminiMdFilename", () => {
+    it("should update currentGeminiMdFilename when a valid new name is provided", () => {
+      const newName = "CUSTOM_CONTEXT.md";
       setGeminiMdFilename(newName);
       expect(getCurrentGeminiMdFilename()).toBe(newName);
     });
 
-    it('should not update currentGeminiMdFilename if the new name is empty or whitespace', () => {
+    it("should not update currentGeminiMdFilename if the new name is empty or whitespace", () => {
       const initialName = getCurrentGeminiMdFilename(); // Get current before trying to change
-      setGeminiMdFilename('  ');
+      setGeminiMdFilename("  ");
       expect(getCurrentGeminiMdFilename()).toBe(initialName);
 
-      setGeminiMdFilename('');
+      setGeminiMdFilename("");
       expect(getCurrentGeminiMdFilename()).toBe(initialName);
     });
 
-    it('should handle an array of filenames', () => {
-      const newNames = ['CUSTOM_CONTEXT.md', 'ANOTHER_CONTEXT.md'];
+    it("should handle an array of filenames", () => {
+      const newNames = ["CUSTOM_CONTEXT.md", "ANOTHER_CONTEXT.md"];
       setGeminiMdFilename(newNames);
-      expect(getCurrentGeminiMdFilename()).toBe('CUSTOM_CONTEXT.md');
+      expect(getCurrentGeminiMdFilename()).toBe("CUSTOM_CONTEXT.md");
       expect(getAllGeminiMdFilenames()).toEqual(newNames);
     });
   });
 
-  describe('performAddMemoryEntry (static method)', () => {
+  describe("performAddMemoryEntry (static method)", () => {
     let testFilePath: string;
 
     beforeEach(() => {
-      testFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        DEFAULT_CONTEXT_FILENAME,
-      );
+      testFilePath = path.join(os.homedir(), GEMINI_DIR, DEFAULT_CONTEXT_FILENAME);
     });
 
-    it('should create section and save a fact if file does not exist', async () => {
-      mockFsAdapter.readFile.mockRejectedValue({ code: 'ENOENT' }); // Simulate file not found
-      const fact = 'The sky is blue';
+    it("should create section and save a fact if file does not exist", async () => {
+      mockFsAdapter.readFile.mockRejectedValue({ code: "ENOENT" }); // Simulate file not found
+      const fact = "The sky is blue";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
-      expect(mockFsAdapter.mkdir).toHaveBeenCalledWith(
-        path.dirname(testFilePath),
-        {
-          recursive: true,
-        },
-      );
+      expect(mockFsAdapter.mkdir).toHaveBeenCalledWith(path.dirname(testFilePath), {
+        recursive: true,
+      });
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
       const writeFileCall = mockFsAdapter.writeFile.mock.calls[0];
       expect(writeFileCall[0]).toBe(testFilePath);
       const expectedContent = `${MEMORY_SECTION_HEADER}\n- ${fact}\n`;
       expect(writeFileCall[1]).toBe(expectedContent);
-      expect(writeFileCall[2]).toBe('utf-8');
+      expect(writeFileCall[2]).toBe("utf-8");
     });
 
-    it('should create section and save a fact if file is empty', async () => {
-      mockFsAdapter.readFile.mockResolvedValue(''); // Simulate empty file
-      const fact = 'The sky is blue';
+    it("should create section and save a fact if file is empty", async () => {
+      mockFsAdapter.readFile.mockResolvedValue(""); // Simulate empty file
+      const fact = "The sky is blue";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
       const writeFileCall = mockFsAdapter.writeFile.mock.calls[0];
       const expectedContent = `${MEMORY_SECTION_HEADER}\n- ${fact}\n`;
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should add a fact to an existing section', async () => {
+    it("should add a fact to an existing section", async () => {
       const initialContent = `Some preamble.\n\n${MEMORY_SECTION_HEADER}\n- Existing fact 1\n`;
       mockFsAdapter.readFile.mockResolvedValue(initialContent);
-      const fact = 'New fact 2';
+      const fact = "New fact 2";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
@@ -151,10 +139,10 @@ describe('MemoryTool', () => {
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should add a fact to an existing empty section', async () => {
+    it("should add a fact to an existing empty section", async () => {
       const initialContent = `Some preamble.\n\n${MEMORY_SECTION_HEADER}\n`; // Empty section
       mockFsAdapter.readFile.mockResolvedValue(initialContent);
-      const fact = 'First fact in section';
+      const fact = "First fact in section";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
@@ -163,10 +151,10 @@ describe('MemoryTool', () => {
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should add a fact when other ## sections exist and preserve spacing', async () => {
+    it("should add a fact when other ## sections exist and preserve spacing", async () => {
       const initialContent = `${MEMORY_SECTION_HEADER}\n- Fact 1\n\n## Another Section\nSome other text.`;
       mockFsAdapter.readFile.mockResolvedValue(initialContent);
-      const fact = 'Fact 2';
+      const fact = "Fact 2";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
 
       expect(mockFsAdapter.writeFile).toHaveBeenCalledOnce();
@@ -176,26 +164,26 @@ describe('MemoryTool', () => {
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should correctly trim and add a fact that starts with a dash', async () => {
+    it("should correctly trim and add a fact that starts with a dash", async () => {
       mockFsAdapter.readFile.mockResolvedValue(`${MEMORY_SECTION_HEADER}\n`);
-      const fact = '- - My fact with dashes';
+      const fact = "- - My fact with dashes";
       await MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter);
       const writeFileCall = mockFsAdapter.writeFile.mock.calls[0];
       const expectedContent = `${MEMORY_SECTION_HEADER}\n- My fact with dashes\n`;
       expect(writeFileCall[1]).toBe(expectedContent);
     });
 
-    it('should handle error from fsAdapter.writeFile', async () => {
-      mockFsAdapter.readFile.mockResolvedValue('');
-      mockFsAdapter.writeFile.mockRejectedValue(new Error('Disk full'));
-      const fact = 'This will fail';
+    it("should handle error from fsAdapter.writeFile", async () => {
+      mockFsAdapter.readFile.mockResolvedValue("");
+      mockFsAdapter.writeFile.mockRejectedValue(new Error("Disk full"));
+      const fact = "This will fail";
       await expect(
         MemoryTool.performAddMemoryEntry(fact, testFilePath, mockFsAdapter),
-      ).rejects.toThrow('[MemoryTool] Failed to add memory entry: Disk full');
+      ).rejects.toThrow("[MemoryTool] Failed to add memory entry: Disk full");
     });
   });
 
-  describe('execute (instance method)', () => {
+  describe("execute (instance method)", () => {
     let memoryTool: MemoryTool;
     let performAddMemoryEntrySpy: Mock<typeof MemoryTool.performAddMemoryEntry>;
 
@@ -203,36 +191,32 @@ describe('MemoryTool', () => {
       memoryTool = new MemoryTool();
       // Spy on the static method for these tests
       performAddMemoryEntrySpy = vi
-        .spyOn(MemoryTool, 'performAddMemoryEntry')
-        .mockResolvedValue(undefined) as Mock<
-        typeof MemoryTool.performAddMemoryEntry
-      >;
+        .spyOn(MemoryTool, "performAddMemoryEntry")
+        .mockResolvedValue(undefined) as Mock<typeof MemoryTool.performAddMemoryEntry>;
       // Cast needed as spyOn returns MockInstance
     });
 
-    it('should have correct name, displayName, description, and schema', () => {
-      expect(memoryTool.name).toBe('save_memory');
-      expect(memoryTool.displayName).toBe('SaveMemory');
-      expect(memoryTool.description).toContain(
-        'Saves a specific piece of information',
-      );
+    it("should have correct name, displayName, description, and schema", () => {
+      expect(memoryTool.name).toBe("save_memory");
+      expect(memoryTool.displayName).toBe("SaveMemory");
+      expect(memoryTool.description).toContain("Saves a specific piece of information");
       expect(memoryTool.schema).toBeDefined();
-      expect(memoryTool.schema.name).toBe('save_memory');
+      expect(memoryTool.schema.name).toBe("save_memory");
       expect(memoryTool.schema.parametersJsonSchema).toStrictEqual({
-        type: 'object',
+        type: "object",
         properties: {
           fact: {
-            type: 'string',
+            type: "string",
             description:
-              'The specific fact or piece of information to remember. Should be a clear, self-contained statement.',
+              "The specific fact or piece of information to remember. Should be a clear, self-contained statement.",
           },
         },
-        required: ['fact'],
+        required: ["fact"],
       });
     });
 
-    it('should call performAddMemoryEntry with correct parameters and return success', async () => {
-      const params = { fact: 'The sky is blue' };
+    it("should call performAddMemoryEntry with correct parameters and return success", async () => {
+      const params = { fact: "The sky is blue" };
       const invocation = memoryTool.build(params);
       const result = await invocation.execute(mockAbortSignal);
       // Use getCurrentGeminiMdFilename for the default expectation before any setGeminiMdFilename calls in a test
@@ -255,14 +239,12 @@ describe('MemoryTool', () => {
         expectedFsArgument,
       );
       const successMessage = `Okay, I've remembered that: "${params.fact}"`;
-      expect(result.llmContent).toBe(
-        JSON.stringify({ success: true, message: successMessage }),
-      );
+      expect(result.llmContent).toBe(JSON.stringify({ success: true, message: successMessage }));
       expect(result.returnDisplay).toBe(successMessage);
     });
 
-    it('should return an error if fact is empty', async () => {
-      const params = { fact: ' ' }; // Empty fact
+    it("should return an error if fact is empty", async () => {
+      const params = { fact: " " }; // Empty fact
       expect(memoryTool.validateToolParams(params)).toBe(
         'Parameter "fact" must be a non-empty string.',
       );
@@ -271,11 +253,9 @@ describe('MemoryTool', () => {
       );
     });
 
-    it('should handle errors from performAddMemoryEntry', async () => {
-      const params = { fact: 'This will fail' };
-      const underlyingError = new Error(
-        '[MemoryTool] Failed to add memory entry: Disk full',
-      );
+    it("should handle errors from performAddMemoryEntry", async () => {
+      const params = { fact: "This will fail" };
+      const underlyingError = new Error("[MemoryTool] Failed to add memory entry: Disk full");
       performAddMemoryEntrySpy.mockRejectedValue(underlyingError);
 
       const invocation = memoryTool.build(params);
@@ -287,59 +267,49 @@ describe('MemoryTool', () => {
           error: `Failed to save memory. Detail: ${underlyingError.message}`,
         }),
       );
-      expect(result.returnDisplay).toBe(
-        `Error saving memory: ${underlyingError.message}`,
-      );
-      expect(result.error?.type).toBe(
-        ToolErrorType.MEMORY_TOOL_EXECUTION_ERROR,
-      );
+      expect(result.returnDisplay).toBe(`Error saving memory: ${underlyingError.message}`);
+      expect(result.error?.type).toBe(ToolErrorType.MEMORY_TOOL_EXECUTION_ERROR);
     });
   });
 
-  describe('shouldConfirmExecute', () => {
+  describe("shouldConfirmExecute", () => {
     let memoryTool: MemoryTool;
 
     beforeEach(() => {
       memoryTool = new MemoryTool();
       // Clear the allowlist before each test
-      const invocation = memoryTool.build({ fact: 'mock-fact' });
+      const invocation = memoryTool.build({ fact: "mock-fact" });
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (invocation.constructor as any).allowlist.clear();
       // Mock fs.readFile to return empty string (file doesn't exist)
-      vi.mocked(fs.readFile).mockResolvedValue('');
+      vi.mocked(fs.readFile).mockResolvedValue("");
     });
 
-    it('should return confirmation details when memory file is not allowlisted', async () => {
-      const params = { fact: 'Test fact' };
+    it("should return confirmation details when memory file is not allowlisted", async () => {
+      const params = { fact: "Test fact" };
       const invocation = memoryTool.build(params);
       const result = await invocation.shouldConfirmExecute(mockAbortSignal);
 
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
-        const expectedPath = path.join('~', GEMINI_DIR, 'GEMINI.md');
+      if (result && result.type === "edit") {
+        const expectedPath = path.join("~", GEMINI_DIR, "GEMINI.md");
         expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
-        expect(result.fileName).toContain(
-          path.join('mock', 'home', GEMINI_DIR),
-        );
-        expect(result.fileName).toContain('GEMINI.md');
-        expect(result.fileDiff).toContain('Index: GEMINI.md');
-        expect(result.fileDiff).toContain('+## Gemini Added Memories');
-        expect(result.fileDiff).toContain('+- Test fact');
-        expect(result.originalContent).toBe('');
-        expect(result.newContent).toContain('## Gemini Added Memories');
-        expect(result.newContent).toContain('- Test fact');
+        expect(result.fileName).toContain(path.join("mock", "home", GEMINI_DIR));
+        expect(result.fileName).toContain("GEMINI.md");
+        expect(result.fileDiff).toContain("Index: GEMINI.md");
+        expect(result.fileDiff).toContain("+## Gemini Added Memories");
+        expect(result.fileDiff).toContain("+- Test fact");
+        expect(result.originalContent).toBe("");
+        expect(result.newContent).toContain("## Gemini Added Memories");
+        expect(result.newContent).toContain("- Test fact");
       }
     });
 
-    it('should return false when memory file is already allowlisted', async () => {
-      const params = { fact: 'Test fact' };
-      const memoryFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        getCurrentGeminiMdFilename(),
-      );
+    it("should return false when memory file is already allowlisted", async () => {
+      const params = { fact: "Test fact" };
+      const memoryFilePath = path.join(os.homedir(), GEMINI_DIR, getCurrentGeminiMdFilename());
 
       const invocation = memoryTool.build(params);
       // Add the memory file to the allowlist
@@ -351,13 +321,9 @@ describe('MemoryTool', () => {
       expect(result).toBe(false);
     });
 
-    it('should add memory file to allowlist when ProceedAlways is confirmed', async () => {
-      const params = { fact: 'Test fact' };
-      const memoryFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        getCurrentGeminiMdFilename(),
-      );
+    it("should add memory file to allowlist when ProceedAlways is confirmed", async () => {
+      const params = { fact: "Test fact" };
+      const memoryFilePath = path.join(os.homedir(), GEMINI_DIR, getCurrentGeminiMdFilename());
 
       const invocation = memoryTool.build(params);
       const result = await invocation.shouldConfirmExecute(mockAbortSignal);
@@ -365,7 +331,7 @@ describe('MemoryTool', () => {
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
+      if (result && result.type === "edit") {
         // Simulate the onConfirm callback
         await result.onConfirm(ToolConfirmationOutcome.ProceedAlways);
 
@@ -377,13 +343,9 @@ describe('MemoryTool', () => {
       }
     });
 
-    it('should not add memory file to allowlist when other outcomes are confirmed', async () => {
-      const params = { fact: 'Test fact' };
-      const memoryFilePath = path.join(
-        os.homedir(),
-        GEMINI_DIR,
-        getCurrentGeminiMdFilename(),
-      );
+    it("should not add memory file to allowlist when other outcomes are confirmed", async () => {
+      const params = { fact: "Test fact" };
+      const memoryFilePath = path.join(os.homedir(), GEMINI_DIR, getCurrentGeminiMdFilename());
 
       const invocation = memoryTool.build(params);
       const result = await invocation.shouldConfirmExecute(mockAbortSignal);
@@ -391,7 +353,7 @@ describe('MemoryTool', () => {
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
+      if (result && result.type === "edit") {
         // Simulate the onConfirm callback with different outcomes
         await result.onConfirm(ToolConfirmationOutcome.ProceedOnce);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -403,10 +365,9 @@ describe('MemoryTool', () => {
       }
     });
 
-    it('should handle existing memory file with content', async () => {
-      const params = { fact: 'New fact' };
-      const existingContent =
-        'Some existing content.\n\n## Gemini Added Memories\n- Old fact\n';
+    it("should handle existing memory file with content", async () => {
+      const params = { fact: "New fact" };
+      const existingContent = "Some existing content.\n\n## Gemini Added Memories\n- Old fact\n";
 
       // Mock fs.readFile to return existing content
       vi.mocked(fs.readFile).mockResolvedValue(existingContent);
@@ -417,14 +378,14 @@ describe('MemoryTool', () => {
       expect(result).toBeDefined();
       expect(result).not.toBe(false);
 
-      if (result && result.type === 'edit') {
-        const expectedPath = path.join('~', GEMINI_DIR, 'GEMINI.md');
+      if (result && result.type === "edit") {
+        const expectedPath = path.join("~", GEMINI_DIR, "GEMINI.md");
         expect(result.title).toBe(`Confirm Memory Save: ${expectedPath}`);
-        expect(result.fileDiff).toContain('Index: GEMINI.md');
-        expect(result.fileDiff).toContain('+- New fact');
+        expect(result.fileDiff).toContain("Index: GEMINI.md");
+        expect(result.fileDiff).toContain("+- New fact");
         expect(result.originalContent).toBe(existingContent);
-        expect(result.newContent).toContain('- Old fact');
-        expect(result.newContent).toContain('- New fact');
+        expect(result.newContent).toContain("- Old fact");
+        expect(result.newContent).toContain("- New fact");
       }
     });
   });
diff --git a/packages/gemini-core/src/tools/memoryTool.ts b/packages/gemini-core/src/tools/memoryTool.ts
index da4a54c11..65d48354a 100644
--- a/packages/gemini-core/src/tools/memoryTool.ts
+++ b/packages/gemini-core/src/tools/memoryTool.ts
@@ -4,42 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolEditConfirmationDetails, ToolResult } from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { FunctionDeclaration } from '@google/genai';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import * as Diff from 'diff';
-import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
-import { tildeifyPath } from '../utils/paths.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { ToolErrorType } from './tool-error.js';
-import { MEMORY_TOOL_NAME } from './tool-names.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FunctionDeclaration } from "@google/genai";
+import * as Diff from "diff";
+import { Storage } from "../config/storage.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { tildeifyPath } from "../utils/paths.js";
+import { DEFAULT_DIFF_OPTIONS } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { MEMORY_TOOL_NAME } from "./tool-names.js";
+import type { ToolEditConfirmationDetails, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 const memoryToolSchemaData: FunctionDeclaration = {
   name: MEMORY_TOOL_NAME,
   description:
-    'Saves a specific piece of information or fact to your long-term memory. Use this when the user explicitly asks you to remember something, or when they state a clear, concise fact that seems important to retain for future interactions.',
+    "Saves a specific piece of information or fact to your long-term memory. Use this when the user explicitly asks you to remember something, or when they state a clear, concise fact that seems important to retain for future interactions.",
   parametersJsonSchema: {
-    type: 'object',
+    type: "object",
     properties: {
       fact: {
-        type: 'string',
+        type: "string",
         description:
-          'The specific fact or piece of information to remember. Should be a clear, self-contained statement.',
+          "The specific fact or piece of information to remember. Should be a clear, self-contained statement.",
       },
     },
-    required: ['fact'],
+    required: ["fact"],
   },
 };
 
@@ -61,8 +53,8 @@ Do NOT use this tool:
 
 - \`fact\` (string, required): The specific fact or piece of information to remember. This should be a clear, self-contained statement. For example, if the user says "My favorite color is blue", the fact would be "My favorite color is blue".`;
 
-export const DEFAULT_CONTEXT_FILENAME = 'GEMINI.md';
-export const MEMORY_SECTION_HEADER = '## Gemini Added Memories';
+export const DEFAULT_CONTEXT_FILENAME = "GEMINI.md";
+export const MEMORY_SECTION_HEADER = "## Gemini Added Memories";
 
 // This variable will hold the currently configured filename for GEMINI.md context files.
 // It defaults to DEFAULT_CONTEXT_FILENAME but can be overridden by setGeminiMdFilename.
@@ -73,7 +65,7 @@ export function setGeminiMdFilename(newFilename: string | string[]): void {
     if (newFilename.length > 0) {
       currentGeminiMdFilename = newFilename.map((name) => name.trim());
     }
-  } else if (newFilename && newFilename.trim() !== '') {
+  } else if (newFilename && newFilename.trim() !== "") {
     currentGeminiMdFilename = newFilename.trim();
   }
 }
@@ -106,12 +98,10 @@ export function getGlobalMemoryFilePath(): string {
  * Ensures proper newline separation before appending content.
  */
 function ensureNewlineSeparation(currentContent: string): string {
-  if (currentContent.length === 0) return '';
-  if (currentContent.endsWith('\n\n') || currentContent.endsWith('\r\n\r\n'))
-    return '';
-  if (currentContent.endsWith('\n') || currentContent.endsWith('\r\n'))
-    return '\n';
-  return '\n\n';
+  if (currentContent.length === 0) return "";
+  if (currentContent.endsWith("\n\n") || currentContent.endsWith("\r\n\r\n")) return "";
+  if (currentContent.endsWith("\n") || currentContent.endsWith("\r\n")) return "\n";
+  return "\n\n";
 }
 
 /**
@@ -119,11 +109,11 @@ function ensureNewlineSeparation(currentContent: string): string {
  */
 async function readMemoryFileContent(): Promise<string> {
   try {
-    return await fs.readFile(getGlobalMemoryFilePath(), 'utf-8');
+    return await fs.readFile(getGlobalMemoryFilePath(), "utf-8");
   } catch (err) {
     const error = err as Error & { code?: string };
-    if (!(error instanceof Error) || error.code !== 'ENOENT') throw err;
-    return '';
+    if (!(error instanceof Error) || error.code !== "ENOENT") throw err;
+    return "";
   }
 }
 
@@ -132,7 +122,7 @@ async function readMemoryFileContent(): Promise<string> {
  */
 function computeNewContent(currentContent: string, fact: string): string {
   let processedText = fact.trim();
-  processedText = processedText.replace(/^(-+\s*)+/, '').trim();
+  processedText = processedText.replace(/^(-+\s*)+/, "").trim();
   const newMemoryItem = `- ${processedText}`;
 
   const headerIndex = currentContent.indexOf(MEMORY_SECTION_HEADER);
@@ -140,24 +130,16 @@ function computeNewContent(currentContent: string, fact: string): string {
   if (headerIndex === -1) {
     // Header not found, append header and then the entry
     const separator = ensureNewlineSeparation(currentContent);
-    return (
-      currentContent +
-      `${separator}${MEMORY_SECTION_HEADER}\n${newMemoryItem}\n`
-    );
+    return currentContent + `${separator}${MEMORY_SECTION_HEADER}\n${newMemoryItem}\n`;
   } else {
     // Header found, find where to insert the new memory entry
     const startOfSectionContent = headerIndex + MEMORY_SECTION_HEADER.length;
-    let endOfSectionIndex = currentContent.indexOf(
-      '\n## ',
-      startOfSectionContent,
-    );
+    let endOfSectionIndex = currentContent.indexOf("\n## ", startOfSectionContent);
     if (endOfSectionIndex === -1) {
       endOfSectionIndex = currentContent.length; // End of file
     }
 
-    const beforeSectionMarker = currentContent
-      .substring(0, startOfSectionContent)
-      .trimEnd();
+    const beforeSectionMarker = currentContent.substring(0, startOfSectionContent).trimEnd();
     let sectionContent = currentContent
       .substring(startOfSectionContent, endOfSectionIndex)
       .trimEnd();
@@ -166,15 +148,12 @@ function computeNewContent(currentContent: string, fact: string): string {
     sectionContent += `\n${newMemoryItem}`;
     return (
       `${beforeSectionMarker}\n${sectionContent.trimStart()}\n${afterSectionMarker}`.trimEnd() +
-      '\n'
+      "\n"
     );
   }
 }
 
-class MemoryToolInvocation extends BaseToolInvocation<
-  SaveMemoryParams,
-  ToolResult
-> {
+class MemoryToolInvocation extends BaseToolInvocation<SaveMemoryParams, ToolResult> {
   private static readonly allowlist: Set<string> = new Set();
 
   constructor(
@@ -209,13 +188,13 @@ class MemoryToolInvocation extends BaseToolInvocation<
       fileName,
       currentContent,
       newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Memory Save: ${tildeifyPath(memoryFilePath)}`,
       fileName: memoryFilePath,
       filePath: memoryFilePath,
@@ -240,11 +219,7 @@ class MemoryToolInvocation extends BaseToolInvocation<
         await fs.mkdir(path.dirname(getGlobalMemoryFilePath()), {
           recursive: true,
         });
-        await fs.writeFile(
-          getGlobalMemoryFilePath(),
-          modified_content,
-          'utf-8',
-        );
+        await fs.writeFile(getGlobalMemoryFilePath(), modified_content, "utf-8");
         const successMessage = `Okay, I've updated the memory file with your modifications.`;
         return {
           llmContent: JSON.stringify({
@@ -255,15 +230,11 @@ class MemoryToolInvocation extends BaseToolInvocation<
         };
       } else {
         // Use the normal memory entry logic
-        await MemoryTool.performAddMemoryEntry(
-          fact,
-          getGlobalMemoryFilePath(),
-          {
-            readFile: fs.readFile,
-            writeFile: fs.writeFile,
-            mkdir: fs.mkdir,
-          },
-        );
+        await MemoryTool.performAddMemoryEntry(fact, getGlobalMemoryFilePath(), {
+          readFile: fs.readFile,
+          writeFile: fs.writeFile,
+          mkdir: fs.mkdir,
+        });
         const successMessage = `Okay, I've remembered that: "${fact}"`;
         return {
           llmContent: JSON.stringify({
@@ -274,11 +245,8 @@ class MemoryToolInvocation extends BaseToolInvocation<
         };
       }
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
-      console.warn(
-        `[MemoryTool] Error executing save_memory for fact "${fact}": ${errorMessage}`,
-      );
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.warn(`[MemoryTool] Error executing save_memory for fact "${fact}": ${errorMessage}`);
       return {
         llmContent: JSON.stringify({
           success: false,
@@ -303,7 +271,7 @@ export class MemoryTool
   constructor(messageBus?: MessageBus) {
     super(
       MemoryTool.Name,
-      'SaveMemory',
+      "SaveMemory",
       memoryToolDescription,
       Kind.Think,
       memoryToolSchemaData.parametersJsonSchema as Record<string, unknown>,
@@ -313,10 +281,8 @@ export class MemoryTool
     );
   }
 
-  protected override validateToolParamValues(
-    params: SaveMemoryParams,
-  ): string | null {
-    if (params.fact.trim() === '') {
+  protected override validateToolParamValues(params: SaveMemoryParams): string | null {
+    if (params.fact.trim() === "") {
       return 'Parameter "fact" must be a non-empty string.';
     }
 
@@ -341,35 +307,25 @@ export class MemoryTool
     text: string,
     memoryFilePath: string,
     fsAdapter: {
-      readFile: (path: string, encoding: 'utf-8') => Promise<string>;
-      writeFile: (
-        path: string,
-        data: string,
-        encoding: 'utf-8',
-      ) => Promise<void>;
-      mkdir: (
-        path: string,
-        options: { recursive: boolean },
-      ) => Promise<string | undefined>;
+      readFile: (path: string, encoding: "utf-8") => Promise<string>;
+      writeFile: (path: string, data: string, encoding: "utf-8") => Promise<void>;
+      mkdir: (path: string, options: { recursive: boolean }) => Promise<string | undefined>;
     },
   ): Promise<void> {
     try {
       await fsAdapter.mkdir(path.dirname(memoryFilePath), { recursive: true });
-      let currentContent = '';
+      let currentContent = "";
       try {
-        currentContent = await fsAdapter.readFile(memoryFilePath, 'utf-8');
+        currentContent = await fsAdapter.readFile(memoryFilePath, "utf-8");
       } catch (_e) {
         // File doesn't exist, which is fine. currentContent will be empty.
       }
 
       const newContent = computeNewContent(currentContent, text);
 
-      await fsAdapter.writeFile(memoryFilePath, newContent, 'utf-8');
+      await fsAdapter.writeFile(memoryFilePath, newContent, "utf-8");
     } catch (error) {
-      console.error(
-        `[MemoryTool] Error adding memory entry to ${memoryFilePath}:`,
-        error,
-      );
+      console.error(`[MemoryTool] Error adding memory entry to ${memoryFilePath}:`, error);
       throw new Error(
         `[MemoryTool] Failed to add memory entry: ${error instanceof Error ? error.message : String(error)}`,
       );
diff --git a/packages/gemini-core/src/tools/message-bus-integration.test.ts b/packages/gemini-core/src/tools/message-bus-integration.test.ts
index 2ee38b0d2..f5626d00a 100644
--- a/packages/gemini-core/src/tools/message-bus-integration.test.ts
+++ b/packages/gemini-core/src/tools/message-bus-integration.test.ts
@@ -4,31 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  vi,
-  type Mock,
-} from 'vitest';
-import {
-  BaseToolInvocation,
-  BaseDeclarativeTool,
-  Kind,
-  type ToolResult,
-} from './tools.js';
-import { MessageBus } from '../confirmation-bus/message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import {
-  MessageBusType,
-  type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { MessageBus } from "../confirmation-bus/message-bus.js";
+import { MessageBusType, type ToolConfirmationResponse } from "../confirmation-bus/types.js";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, type ToolResult } from "./tools.js";
 
 // Mock crypto module
-vi.mock('node:crypto', () => ({
+vi.mock("node:crypto", () => ({
   randomUUID: vi.fn(),
 }));
 
@@ -53,17 +37,15 @@ class TestToolInvocation extends BaseToolInvocation<TestParams, TestResult> {
     };
   }
 
-  override async shouldConfirmExecute(
-    abortSignal: AbortSignal,
-  ): Promise<false> {
+  override async shouldConfirmExecute(abortSignal: AbortSignal): Promise<false> {
     // This conditional is here to allow testing of the case where there is no message bus.
     if (this.messageBus) {
       const decision = await this.getMessageBusDecision(abortSignal);
-      if (decision === 'ALLOW') {
+      if (decision === "ALLOW") {
         return false;
       }
-      if (decision === 'DENY') {
-        throw new Error('Tool execution denied by policy');
+      if (decision === "DENY") {
+        throw new Error("Tool execution denied by policy");
       }
     }
     return false;
@@ -73,16 +55,16 @@ class TestToolInvocation extends BaseToolInvocation<TestParams, TestResult> {
 class TestTool extends BaseDeclarativeTool<TestParams, TestResult> {
   constructor(messageBus?: MessageBus) {
     super(
-      'test-tool',
-      'Test Tool',
-      'A test tool for message bus integration',
+      "test-tool",
+      "Test Tool",
+      "A test tool for message bus integration",
       Kind.Other,
       {
-        type: 'object',
+        type: "object",
         properties: {
-          testParam: { type: 'string' },
+          testParam: { type: "string" },
         },
-        required: ['testParam'],
+        required: ["testParam"],
       },
       true,
       false,
@@ -95,7 +77,7 @@ class TestTool extends BaseDeclarativeTool<TestParams, TestResult> {
   }
 }
 
-describe('Message Bus Integration', () => {
+describe("Message Bus Integration", () => {
   let policyEngine: PolicyEngine;
   let messageBus: MessageBus;
   let mockUUID: Mock;
@@ -105,36 +87,34 @@ describe('Message Bus Integration', () => {
     policyEngine = new PolicyEngine();
     messageBus = new MessageBus(policyEngine);
     mockUUID = vi.mocked(randomUUID);
-    mockUUID.mockReturnValue('test-correlation-id');
+    mockUUID.mockReturnValue("test-correlation-id");
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('BaseToolInvocation with MessageBus', () => {
-    it('should use message bus for confirmation when available', async () => {
+  describe("BaseToolInvocation with MessageBus", () => {
+    it("should use message bus for confirmation when available", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Mock message bus publish and subscribe
-      const publishSpy = vi.spyOn(messageBus, 'publish');
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const unsubscribeSpy = vi.spyOn(messageBus, 'unsubscribe');
+      const publishSpy = vi.spyOn(messageBus, "publish");
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const unsubscribeSpy = vi.spyOn(messageBus, "unsubscribe");
 
       // Start confirmation process
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Verify confirmation request was published
       expect(publishSpy).toHaveBeenCalledWith({
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
         toolCall: {
-          name: 'TestToolInvocation',
-          args: { testParam: 'test-value' },
+          name: "TestToolInvocation",
+          args: { testParam: "test-value" },
         },
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
       });
 
       // Verify subscription to response
@@ -147,7 +127,7 @@ describe('Message Bus Integration', () => {
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const response: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
         confirmed: true,
       };
 
@@ -158,41 +138,35 @@ describe('Message Bus Integration', () => {
       expect(unsubscribeSpy).toHaveBeenCalled();
     });
 
-    it('should reject promise when confirmation is denied', async () => {
+    it("should reject promise when confirmation is denied", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Simulate denial response
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const response: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
         confirmed: false,
       };
 
       responseHandler(response);
 
       // Should reject with error when denied
-      await expect(confirmationPromise).rejects.toThrow(
-        'Tool execution denied by policy',
-      );
+      await expect(confirmationPromise).rejects.toThrow("Tool execution denied by policy");
     });
 
-    it('should handle timeout', async () => {
+    it("should handle timeout", async () => {
       vi.useFakeTimers();
 
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Fast-forward past timeout
       vi.advanceTimersByTime(30000);
@@ -203,49 +177,41 @@ describe('Message Bus Integration', () => {
       vi.useRealTimers();
     });
 
-    it('should handle abort signal', async () => {
+    it("should handle abort signal", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       const abortController = new AbortController();
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        abortController.signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(abortController.signal);
 
       // Abort the operation
       abortController.abort();
 
-      await expect(confirmationPromise).rejects.toThrow(
-        'Tool execution denied by policy',
-      );
+      await expect(confirmationPromise).rejects.toThrow("Tool execution denied by policy");
     });
 
-    it('should fall back to default behavior when no message bus', async () => {
+    it("should fall back to default behavior when no message bus", async () => {
       const tool = new TestTool(); // No message bus
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(result).toBe(false);
     });
 
-    it('should ignore responses with wrong correlation ID', async () => {
+    it("should ignore responses with wrong correlation ID", async () => {
       vi.useFakeTimers();
 
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Send response with wrong correlation ID
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const wrongResponse: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'wrong-id',
+        correlationId: "wrong-id",
         confirmed: true,
       };
 
@@ -260,41 +226,39 @@ describe('Message Bus Integration', () => {
     });
   });
 
-  describe('Backward Compatibility', () => {
-    it('should work with existing tools that do not use message bus', async () => {
+  describe("Backward Compatibility", () => {
+    it("should work with existing tools that do not use message bus", async () => {
       const tool = new TestTool(); // No message bus
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Should execute normally
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.testValue).toBe('test-value');
-      expect(result.llmContent).toBe('Executed with test-value');
+      expect(result.testValue).toBe("test-value");
+      expect(result.llmContent).toBe("Executed with test-value");
     });
 
-    it('should work with tools that have message bus but use default confirmation', async () => {
+    it("should work with tools that have message bus but use default confirmation", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Should execute normally even with message bus available
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.testValue).toBe('test-value');
-      expect(result.llmContent).toBe('Executed with test-value');
+      expect(result.testValue).toBe("test-value");
+      expect(result.llmContent).toBe("Executed with test-value");
     });
   });
 
-  describe('Error Handling', () => {
-    it('should handle message bus publish errors gracefully', async () => {
+  describe("Error Handling", () => {
+    it("should handle message bus publish errors gracefully", async () => {
       const tool = new TestTool(messageBus);
-      const invocation = tool.build({ testParam: 'test-value' });
+      const invocation = tool.build({ testParam: "test-value" });
 
       // Mock publish to throw error
-      vi.spyOn(messageBus, 'publish').mockImplementation(() => {
-        throw new Error('Message bus error');
+      vi.spyOn(messageBus, "publish").mockImplementation(() => {
+        throw new Error("Message bus error");
       });
 
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(result).toBe(false); // Should gracefully fall back
     });
   });
diff --git a/packages/gemini-core/src/tools/modifiable-tool.test.ts b/packages/gemini-core/src/tools/modifiable-tool.test.ts
index ec6caf929..94d2a6da9 100644
--- a/packages/gemini-core/src/tools/modifiable-tool.test.ts
+++ b/packages/gemini-core/src/tools/modifiable-tool.test.ts
@@ -4,30 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import type {
-  ModifyContext,
-  ModifiableDeclarativeTool,
-} from './modifiable-tool.js';
-import {
-  modifyWithEditor,
-  isModifiableDeclarativeTool,
-} from './modifiable-tool.js';
-import type { EditorType } from '../utils/editor.js';
-import fs from 'node:fs';
-import fsp from 'node:fs/promises';
-import os from 'node:os';
-import * as path from 'node:path';
+import fs from "node:fs";
+import fsp from "node:fs/promises";
+import os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { EditorType } from "../utils/editor.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { isModifiableDeclarativeTool, modifyWithEditor } from "./modifiable-tool.js";
 
 // Mock dependencies
 const mockOpenDiff = vi.hoisted(() => vi.fn());
 const mockCreatePatch = vi.hoisted(() => vi.fn());
 
-vi.mock('../utils/editor.js', () => ({
+vi.mock("../utils/editor.js", () => ({
   openDiff: mockOpenDiff,
 }));
 
-vi.mock('diff', () => ({
+vi.mock("diff", () => ({
   createPatch: mockCreatePatch,
 }));
 
@@ -37,7 +31,7 @@ interface TestParams {
   modifiedContent?: string;
 }
 
-describe('modifyWithEditor', () => {
+describe("modifyWithEditor", () => {
   let testProjectDir: string;
   let mockModifyContext: ModifyContext<TestParams>;
   let mockParams: TestParams;
@@ -49,17 +43,15 @@ describe('modifyWithEditor', () => {
   beforeEach(async () => {
     vi.resetAllMocks();
 
-    testProjectDir = await fsp.mkdtemp(
-      path.join(os.tmpdir(), 'modifiable-tool-test-'),
-    );
+    testProjectDir = await fsp.mkdtemp(path.join(os.tmpdir(), "modifiable-tool-test-"));
     abortSignal = new AbortController().signal;
 
-    currentContent = 'original content\nline 2\nline 3';
-    proposedContent = 'modified content\nline 2\nline 3';
-    modifiedContent = 'user modified content\nline 2\nline 3\nnew line';
+    currentContent = "original content\nline 2\nline 3";
+    proposedContent = "modified content\nline 2\nline 3";
+    modifiedContent = "user modified content\nline 2\nline 3\nnew line";
     mockParams = {
-      filePath: path.join(testProjectDir, 'test.txt'),
-      someOtherParam: 'value',
+      filePath: path.join(testProjectDir, "test.txt"),
+      someOtherParam: "value",
     };
 
     mockModifyContext = {
@@ -76,10 +68,10 @@ describe('modifyWithEditor', () => {
     };
 
     mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
-      await fsp.writeFile(newPath, modifiedContent, 'utf8');
+      await fsp.writeFile(newPath, modifiedContent, "utf8");
     });
 
-    mockCreatePatch.mockReturnValue('mock diff content');
+    mockCreatePatch.mockReturnValue("mock diff content");
   });
 
   afterEach(async () => {
@@ -87,9 +79,9 @@ describe('modifyWithEditor', () => {
     await fsp.rm(testProjectDir, { recursive: true, force: true });
   });
 
-  describe('successful modification', () => {
+  describe("successful modification", () => {
     const assertMode = (mode: number, expected: number): void => {
-      if (process.platform === 'win32') {
+      if (process.platform === "win32") {
         // Windows reports POSIX modes as 0o666 regardless of requested bits.
         // At minimum confirm the owner read/write bits are present.
         expect(mode & 0o600).toBe(0o600);
@@ -98,21 +90,17 @@ describe('modifyWithEditor', () => {
       expect(mode & 0o777).toBe(expected);
     };
 
-    it('should successfully modify content with VSCode editor', async () => {
+    it("should successfully modify content with VSCode editor", async () => {
       const result = await modifyWithEditor(
         mockParams,
         mockModifyContext,
-        'vscode' as EditorType,
+        "vscode" as EditorType,
         abortSignal,
         vi.fn(),
       );
 
-      expect(mockModifyContext.getCurrentContent).toHaveBeenCalledWith(
-        mockParams,
-      );
-      expect(mockModifyContext.getProposedContent).toHaveBeenCalledWith(
-        mockParams,
-      );
+      expect(mockModifyContext.getCurrentContent).toHaveBeenCalledWith(mockParams);
+      expect(mockModifyContext.getProposedContent).toHaveBeenCalledWith(mockParams);
       expect(mockModifyContext.getFilePath).toHaveBeenCalledWith(mockParams);
 
       expect(mockOpenDiff).toHaveBeenCalledOnce();
@@ -128,8 +116,8 @@ describe('modifyWithEditor', () => {
         path.basename(mockParams.filePath),
         currentContent,
         modifiedContent,
-        'Current',
-        'Proposed',
+        "Current",
+        "Proposed",
         expect.objectContaining({
           context: 3,
           ignoreWhitespace: true,
@@ -146,11 +134,11 @@ describe('modifyWithEditor', () => {
           modifiedContent,
           oldContent: currentContent,
         },
-        updatedDiff: 'mock diff content',
+        updatedDiff: "mock diff content",
       });
     });
 
-    it('should create temp directory and files with restrictive permissions', async () => {
+    it("should create temp directory and files with restrictive permissions", async () => {
       mockOpenDiff.mockImplementation(async (oldPath, newPath) => {
         const diffDir = path.dirname(oldPath);
         expect(diffDir).toBe(path.dirname(newPath));
@@ -163,39 +151,39 @@ describe('modifyWithEditor', () => {
         assertMode(oldStats.mode, 0o600);
         assertMode(newStats.mode, 0o600);
 
-        await fsp.writeFile(newPath, modifiedContent, 'utf8');
+        await fsp.writeFile(newPath, modifiedContent, "utf8");
       });
 
       await modifyWithEditor(
         mockParams,
         mockModifyContext,
-        'vscode' as EditorType,
+        "vscode" as EditorType,
         abortSignal,
         vi.fn(),
       );
     });
   });
 
-  it('should handle missing old temp file gracefully', async () => {
+  it("should handle missing old temp file gracefully", async () => {
     mockOpenDiff.mockImplementation(async (oldPath, newPath) => {
-      await fsp.writeFile(newPath, modifiedContent, 'utf8');
+      await fsp.writeFile(newPath, modifiedContent, "utf8");
       await fsp.unlink(oldPath);
     });
 
     const result = await modifyWithEditor(
       mockParams,
       mockModifyContext,
-      'vscode' as EditorType,
+      "vscode" as EditorType,
       abortSignal,
       vi.fn(),
     );
 
     expect(mockCreatePatch).toHaveBeenCalledWith(
       path.basename(mockParams.filePath),
-      '',
+      "",
       modifiedContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       expect.objectContaining({
         context: 3,
         ignoreWhitespace: true,
@@ -203,10 +191,10 @@ describe('modifyWithEditor', () => {
     );
 
     expect(result.updatedParams).toBeDefined();
-    expect(result.updatedDiff).toBe('mock diff content');
+    expect(result.updatedDiff).toBe("mock diff content");
   });
 
-  it('should handle missing new temp file gracefully', async () => {
+  it("should handle missing new temp file gracefully", async () => {
     mockOpenDiff.mockImplementation(async (_oldPath, newPath) => {
       await fsp.unlink(newPath);
     });
@@ -214,7 +202,7 @@ describe('modifyWithEditor', () => {
     const result = await modifyWithEditor(
       mockParams,
       mockModifyContext,
-      'vscode' as EditorType,
+      "vscode" as EditorType,
       abortSignal,
       vi.fn(),
     );
@@ -222,9 +210,9 @@ describe('modifyWithEditor', () => {
     expect(mockCreatePatch).toHaveBeenCalledWith(
       path.basename(mockParams.filePath),
       currentContent,
-      '',
-      'Current',
-      'Proposed',
+      "",
+      "Current",
+      "Proposed",
       expect.objectContaining({
         context: 3,
         ignoreWhitespace: true,
@@ -232,19 +220,19 @@ describe('modifyWithEditor', () => {
     );
 
     expect(result.updatedParams).toBeDefined();
-    expect(result.updatedDiff).toBe('mock diff content');
+    expect(result.updatedDiff).toBe("mock diff content");
   });
 
-  it('should honor override content values when provided', async () => {
-    const overrideCurrent = 'override current content';
-    const overrideProposed = 'override proposed content';
+  it("should honor override content values when provided", async () => {
+    const overrideCurrent = "override current content";
+    const overrideProposed = "override proposed content";
     mockModifyContext.getCurrentContent = vi.fn();
     mockModifyContext.getProposedContent = vi.fn();
 
     await modifyWithEditor(
       mockParams,
       mockModifyContext,
-      'vscode' as EditorType,
+      "vscode" as EditorType,
       abortSignal,
       vi.fn(),
       {
@@ -259,25 +247,25 @@ describe('modifyWithEditor', () => {
       path.basename(mockParams.filePath),
       overrideCurrent,
       modifiedContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       expect.any(Object),
     );
   });
 
-  it('should treat null override as explicit empty content', async () => {
+  it("should treat null override as explicit empty content", async () => {
     mockModifyContext.getCurrentContent = vi.fn();
     mockModifyContext.getProposedContent = vi.fn();
 
     await modifyWithEditor(
       mockParams,
       mockModifyContext,
-      'vscode' as EditorType,
+      "vscode" as EditorType,
       abortSignal,
       vi.fn(),
       {
         currentContent: null,
-        proposedContent: 'override proposed content',
+        proposedContent: "override proposed content",
       },
     );
 
@@ -285,29 +273,23 @@ describe('modifyWithEditor', () => {
     expect(mockModifyContext.getProposedContent).not.toHaveBeenCalled();
     expect(mockCreatePatch).toHaveBeenCalledWith(
       path.basename(mockParams.filePath),
-      '',
+      "",
       modifiedContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       expect.any(Object),
     );
   });
 
-  it('should clean up temp files even if editor fails', async () => {
-    const editorError = new Error('Editor failed to open');
+  it("should clean up temp files even if editor fails", async () => {
+    const editorError = new Error("Editor failed to open");
     mockOpenDiff.mockRejectedValue(editorError);
 
-    const writeSpy = vi.spyOn(fs, 'writeFileSync');
+    const writeSpy = vi.spyOn(fs, "writeFileSync");
 
     await expect(
-      modifyWithEditor(
-        mockParams,
-        mockModifyContext,
-        'vscode' as EditorType,
-        abortSignal,
-        vi.fn(),
-      ),
-    ).rejects.toThrow('Editor failed to open');
+      modifyWithEditor(mockParams, mockModifyContext, "vscode" as EditorType, abortSignal, vi.fn()),
+    ).rejects.toThrow("Editor failed to open");
 
     expect(writeSpy).toHaveBeenCalledTimes(2);
     const oldFilePath = writeSpy.mock.calls[0][0] as string;
@@ -319,48 +301,42 @@ describe('modifyWithEditor', () => {
     writeSpy.mockRestore();
   });
 
-  it('should handle temp file cleanup errors gracefully', async () => {
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    vi.spyOn(fs, 'unlinkSync').mockImplementation(() => {
-      throw new Error('Failed to delete file');
+  it("should handle temp file cleanup errors gracefully", async () => {
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(fs, "unlinkSync").mockImplementation(() => {
+      throw new Error("Failed to delete file");
     });
-    vi.spyOn(fs, 'rmdirSync').mockImplementation(() => {
-      throw new Error('Failed to delete directory');
+    vi.spyOn(fs, "rmdirSync").mockImplementation(() => {
+      throw new Error("Failed to delete directory");
     });
 
     await modifyWithEditor(
       mockParams,
       mockModifyContext,
-      'vscode' as EditorType,
+      "vscode" as EditorType,
       abortSignal,
       vi.fn(),
     );
 
     expect(consoleErrorSpy).toHaveBeenCalledTimes(3);
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Error deleting temp diff file:'),
+      expect.stringContaining("Error deleting temp diff file:"),
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Error deleting temp diff directory:'),
+      expect.stringContaining("Error deleting temp diff directory:"),
     );
 
     consoleErrorSpy.mockRestore();
   });
 
-  it('should create temp files with correct naming with extension', async () => {
-    const testFilePath = path.join(
-      testProjectDir,
-      'subfolder',
-      'test-file.txt',
-    );
+  it("should create temp files with correct naming with extension", async () => {
+    const testFilePath = path.join(testProjectDir, "subfolder", "test-file.txt");
     mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
 
     await modifyWithEditor(
       mockParams,
       mockModifyContext,
-      'vscode' as EditorType,
+      "vscode" as EditorType,
       abortSignal,
       vi.fn(),
     );
@@ -370,19 +346,19 @@ describe('modifyWithEditor', () => {
     expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+\.txt$/);
     expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+\.txt$/);
 
-    const diffDirPrefix = path.join(os.tmpdir(), 'gemini-cli-tool-modify-');
+    const diffDirPrefix = path.join(os.tmpdir(), "gemini-cli-tool-modify-");
     expect(path.dirname(oldFilePath).startsWith(diffDirPrefix)).toBe(true);
     expect(path.dirname(newFilePath).startsWith(diffDirPrefix)).toBe(true);
   });
 
-  it('should create temp files with correct naming without extension', async () => {
-    const testFilePath = path.join(testProjectDir, 'subfolder', 'test-file');
+  it("should create temp files with correct naming without extension", async () => {
+    const testFilePath = path.join(testProjectDir, "subfolder", "test-file");
     mockModifyContext.getFilePath = vi.fn().mockReturnValue(testFilePath);
 
     await modifyWithEditor(
       mockParams,
       mockModifyContext,
-      'vscode' as EditorType,
+      "vscode" as EditorType,
       abortSignal,
       vi.fn(),
     );
@@ -392,25 +368,25 @@ describe('modifyWithEditor', () => {
     expect(oldFilePath).toMatch(/gemini-cli-modify-test-file-old-\d+$/);
     expect(newFilePath).toMatch(/gemini-cli-modify-test-file-new-\d+$/);
 
-    const diffDirPrefix = path.join(os.tmpdir(), 'gemini-cli-tool-modify-');
+    const diffDirPrefix = path.join(os.tmpdir(), "gemini-cli-tool-modify-");
     expect(path.dirname(oldFilePath).startsWith(diffDirPrefix)).toBe(true);
     expect(path.dirname(newFilePath).startsWith(diffDirPrefix)).toBe(true);
   });
 });
 
-describe('isModifiableTool', () => {
-  it('should return true for objects with getModifyContext method', () => {
+describe("isModifiableTool", () => {
+  it("should return true for objects with getModifyContext method", () => {
     const mockTool = {
-      name: 'test-tool',
+      name: "test-tool",
       getModifyContext: vi.fn(),
     } as unknown as ModifiableDeclarativeTool<TestParams>;
 
     expect(isModifiableDeclarativeTool(mockTool)).toBe(true);
   });
 
-  it('should return false for objects without getModifyContext method', () => {
+  it("should return false for objects without getModifyContext method", () => {
     const mockTool = {
-      name: 'test-tool',
+      name: "test-tool",
     } as unknown as ModifiableDeclarativeTool<TestParams>;
 
     expect(isModifiableDeclarativeTool(mockTool)).toBe(false);
diff --git a/packages/gemini-core/src/tools/modifiable-tool.ts b/packages/gemini-core/src/tools/modifiable-tool.ts
index b96ad04d4..9a16accf7 100644
--- a/packages/gemini-core/src/tools/modifiable-tool.ts
+++ b/packages/gemini-core/src/tools/modifiable-tool.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { EditorType } from '../utils/editor.js';
-import { openDiff } from '../utils/editor.js';
-import os from 'node:os';
-import path from 'node:path';
-import fs from 'node:fs';
-import * as Diff from 'diff';
-import { DEFAULT_DIFF_OPTIONS } from './diffOptions.js';
-import { isNodeError } from '../utils/errors.js';
-import type {
-  AnyDeclarativeTool,
-  DeclarativeTool,
-  ToolResult,
-} from './tools.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import * as Diff from "diff";
+import { debugLogger } from "../utils/debugLogger.js";
+import type { EditorType } from "../utils/editor.js";
+import { openDiff } from "../utils/editor.js";
+import { isNodeError } from "../utils/errors.js";
+import { DEFAULT_DIFF_OPTIONS } from "./diffOptions.js";
+import type { AnyDeclarativeTool, DeclarativeTool, ToolResult } from "./tools.js";
 
 /**
  * A declarative tool that supports a modify operation.
@@ -57,7 +53,7 @@ export interface ModifyContentOverrides {
 export function isModifiableDeclarativeTool(
   tool: AnyDeclarativeTool,
 ): tool is ModifiableDeclarativeTool<object> {
-  return 'getModifyContext' in tool;
+  return "getModifyContext" in tool;
 }
 
 function createTempFilesForModify(
@@ -65,38 +61,27 @@ function createTempFilesForModify(
   proposedContent: string,
   file_path: string,
 ): { oldPath: string; newPath: string; dirPath: string } {
-  const diffDir = fs.mkdtempSync(
-    path.join(os.tmpdir(), 'gemini-cli-tool-modify-'),
-  );
+  const diffDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-tool-modify-"));
 
   try {
     fs.chmodSync(diffDir, 0o700);
   } catch (e) {
-    debugLogger.error(
-      `Error setting permissions on temp diff directory: ${diffDir}`,
-      e,
-    );
+    debugLogger.error(`Error setting permissions on temp diff directory: ${diffDir}`, e);
     throw e;
   }
 
   const ext = path.extname(file_path);
   const fileName = path.basename(file_path, ext);
   const timestamp = Date.now();
-  const tempOldPath = path.join(
-    diffDir,
-    `gemini-cli-modify-${fileName}-old-${timestamp}${ext}`,
-  );
-  const tempNewPath = path.join(
-    diffDir,
-    `gemini-cli-modify-${fileName}-new-${timestamp}${ext}`,
-  );
+  const tempOldPath = path.join(diffDir, `gemini-cli-modify-${fileName}-old-${timestamp}${ext}`);
+  const tempNewPath = path.join(diffDir, `gemini-cli-modify-${fileName}-new-${timestamp}${ext}`);
 
   fs.writeFileSync(tempOldPath, currentContent, {
-    encoding: 'utf8',
+    encoding: "utf8",
     mode: 0o600,
   });
   fs.writeFileSync(tempNewPath, proposedContent, {
-    encoding: 'utf8',
+    encoding: "utf8",
     mode: 0o600,
   });
 
@@ -109,45 +94,37 @@ function getUpdatedParams<ToolParams>(
   originalParams: ToolParams,
   modifyContext: ModifyContext<ToolParams>,
 ): { updatedParams: ToolParams; updatedDiff: string } {
-  let oldContent = '';
-  let newContent = '';
+  let oldContent = "";
+  let newContent = "";
 
   try {
-    oldContent = fs.readFileSync(tmpOldPath, 'utf8');
+    oldContent = fs.readFileSync(tmpOldPath, "utf8");
   } catch (err) {
-    if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-    oldContent = '';
+    if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+    oldContent = "";
   }
 
   try {
-    newContent = fs.readFileSync(tempNewPath, 'utf8');
+    newContent = fs.readFileSync(tempNewPath, "utf8");
   } catch (err) {
-    if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-    newContent = '';
+    if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+    newContent = "";
   }
 
-  const updatedParams = modifyContext.createUpdatedParams(
-    oldContent,
-    newContent,
-    originalParams,
-  );
+  const updatedParams = modifyContext.createUpdatedParams(oldContent, newContent, originalParams);
   const updatedDiff = Diff.createPatch(
     path.basename(modifyContext.getFilePath(originalParams)),
     oldContent,
     newContent,
-    'Current',
-    'Proposed',
+    "Current",
+    "Proposed",
     DEFAULT_DIFF_OPTIONS,
   );
 
   return { updatedParams, updatedDiff };
 }
 
-function deleteTempFiles(
-  oldPath: string,
-  newPath: string,
-  dirPath: string,
-): void {
+function deleteTempFiles(oldPath: string, newPath: string, dirPath: string): void {
   try {
     fs.unlinkSync(oldPath);
   } catch {
@@ -179,33 +156,26 @@ export async function modifyWithEditor<ToolParams>(
   onEditorClose: () => void,
   overrides?: ModifyContentOverrides,
 ): Promise<ModifyResult<ToolParams>> {
-  const hasCurrentOverride =
-    overrides !== undefined && 'currentContent' in overrides;
-  const hasProposedOverride =
-    overrides !== undefined && 'proposedContent' in overrides;
+  const hasCurrentOverride = overrides !== undefined && "currentContent" in overrides;
+  const hasProposedOverride = overrides !== undefined && "proposedContent" in overrides;
 
   const currentContent = hasCurrentOverride
-    ? (overrides!.currentContent ?? '')
+    ? (overrides!.currentContent ?? "")
     : await modifyContext.getCurrentContent(originalParams);
 
   const proposedContent = hasProposedOverride
-    ? (overrides!.proposedContent ?? '')
+    ? (overrides!.proposedContent ?? "")
     : await modifyContext.getProposedContent(originalParams);
 
   const { oldPath, newPath, dirPath } = createTempFilesForModify(
-    currentContent ?? '',
-    proposedContent ?? '',
+    currentContent ?? "",
+    proposedContent ?? "",
     modifyContext.getFilePath(originalParams),
   );
 
   try {
     await openDiff(oldPath, newPath, editorType, onEditorClose);
-    const result = getUpdatedParams(
-      oldPath,
-      newPath,
-      originalParams,
-      modifyContext,
-    );
+    const result = getUpdatedParams(oldPath, newPath, originalParams, modifyContext);
 
     return result;
   } finally {
diff --git a/packages/gemini-core/src/tools/read-file.test.ts b/packages/gemini-core/src/tools/read-file.test.ts
index ccc07fd28..218b10619 100644
--- a/packages/gemini-core/src/tools/read-file.test.ts
+++ b/packages/gemini-core/src/tools/read-file.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import type { ReadFileToolParams } from './read-file.js';
-import { ReadFileTool } from './read-file.js';
-import { ToolErrorType } from './tool-error.js';
-import path from 'node:path';
-import os from 'node:os';
-import fs from 'node:fs';
-import fsp from 'node:fs/promises';
-import type { Config } from '../config/config.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-vi.mock('../telemetry/loggers.js', () => ({
+import fs from "node:fs";
+import fsp from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import type { ReadFileToolParams } from "./read-file.js";
+import { ReadFileTool } from "./read-file.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
-describe('ReadFileTool', () => {
+describe("ReadFileTool", () => {
   let tempRootDir: string;
   let tool: ReadFileTool;
   const abortSignal = new AbortController().signal;
@@ -31,7 +31,7 @@ describe('ReadFileTool', () => {
   beforeEach(async () => {
     // Create a unique temporary root directory for each test run
     const realTmp = await fsp.realpath(os.tmpdir());
-    tempRootDir = await fsp.mkdtemp(path.join(realTmp, 'read-file-tool-root-'));
+    tempRootDir = await fsp.mkdtemp(path.join(realTmp, "read-file-tool-root-"));
 
     const mockConfigInstance = {
       getFileService: () => new FileDiscoveryService(tempRootDir),
@@ -43,7 +43,7 @@ describe('ReadFileTool', () => {
         respectGeminiIgnore: true,
       }),
       storage: {
-        getProjectTempDir: () => path.join(tempRootDir, '.temp'),
+        getProjectTempDir: () => path.join(tempRootDir, ".temp"),
       },
       isInteractive: () => false,
     } as unknown as Config;
@@ -57,182 +57,156 @@ describe('ReadFileTool', () => {
     }
   });
 
-  describe('build', () => {
-    it('should return an invocation for valid params (absolute path within root)', () => {
+  describe("build", () => {
+    it("should return an invocation for valid params (absolute path within root)", () => {
       const params: ReadFileToolParams = {
-        file_path: path.join(tempRootDir, 'test.txt'),
+        file_path: path.join(tempRootDir, "test.txt"),
       };
       const result = tool.build(params);
-      expect(typeof result).not.toBe('string');
+      expect(typeof result).not.toBe("string");
     });
 
-    it('should return an invocation for valid params (relative path within root)', () => {
+    it("should return an invocation for valid params (relative path within root)", () => {
       const params: ReadFileToolParams = {
-        file_path: 'test.txt',
+        file_path: "test.txt",
       };
       const result = tool.build(params);
-      expect(typeof result).not.toBe('string');
-      const invocation = result as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
-      expect(invocation.toolLocations()[0].path).toBe(
-        path.join(tempRootDir, 'test.txt'),
-      );
+      expect(typeof result).not.toBe("string");
+      const invocation = result as ToolInvocation<ReadFileToolParams, ToolResult>;
+      expect(invocation.toolLocations()[0].path).toBe(path.join(tempRootDir, "test.txt"));
     });
 
-    it('should throw error if path is outside root', () => {
+    it("should throw error if path is outside root", () => {
       const params: ReadFileToolParams = {
-        file_path: '/outside/root.txt',
+        file_path: "/outside/root.txt",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories/,
       );
     });
 
-    it('should allow access to files in project temp directory', () => {
-      const tempDir = path.join(tempRootDir, '.temp');
+    it("should allow access to files in project temp directory", () => {
+      const tempDir = path.join(tempRootDir, ".temp");
       const params: ReadFileToolParams = {
-        file_path: path.join(tempDir, 'temp-file.txt'),
+        file_path: path.join(tempDir, "temp-file.txt"),
       };
       const result = tool.build(params);
-      expect(typeof result).not.toBe('string');
+      expect(typeof result).not.toBe("string");
     });
 
-    it('should show temp directory in error message when path is outside workspace and temp dir', () => {
+    it("should show temp directory in error message when path is outside workspace and temp dir", () => {
       const params: ReadFileToolParams = {
-        file_path: '/completely/outside/path.txt',
+        file_path: "/completely/outside/path.txt",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories.*or within the project temp directory/,
       );
     });
 
-    it('should throw error if path is empty', () => {
+    it("should throw error if path is empty", () => {
       const params: ReadFileToolParams = {
-        file_path: '',
+        file_path: "",
       };
-      expect(() => tool.build(params)).toThrow(
-        /The 'file_path' parameter must be non-empty./,
-      );
+      expect(() => tool.build(params)).toThrow(/The 'file_path' parameter must be non-empty./);
     });
 
-    it('should throw error if offset is negative', () => {
+    it("should throw error if offset is negative", () => {
       const params: ReadFileToolParams = {
-        file_path: path.join(tempRootDir, 'test.txt'),
+        file_path: path.join(tempRootDir, "test.txt"),
         offset: -1,
       };
-      expect(() => tool.build(params)).toThrow(
-        'Offset must be a non-negative number',
-      );
+      expect(() => tool.build(params)).toThrow("Offset must be a non-negative number");
     });
 
-    it('should throw error if limit is zero or negative', () => {
+    it("should throw error if limit is zero or negative", () => {
       const params: ReadFileToolParams = {
-        file_path: path.join(tempRootDir, 'test.txt'),
+        file_path: path.join(tempRootDir, "test.txt"),
         limit: 0,
       };
-      expect(() => tool.build(params)).toThrow(
-        'Limit must be a positive number',
-      );
+      expect(() => tool.build(params)).toThrow("Limit must be a positive number");
     });
   });
 
-  describe('getDescription', () => {
-    it('should return relative path without limit/offset', () => {
-      const subDir = path.join(tempRootDir, 'sub', 'dir');
+  describe("getDescription", () => {
+    it("should return relative path without limit/offset", () => {
+      const subDir = path.join(tempRootDir, "sub", "dir");
       const params: ReadFileToolParams = {
-        file_path: path.join(subDir, 'file.txt'),
+        file_path: path.join(subDir, "file.txt"),
       };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      expect(
-        (
-          invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-        ).getDescription(),
-      ).toBe(path.join('sub', 'dir', 'file.txt'));
+      expect(typeof invocation).not.toBe("string");
+      expect((invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription()).toBe(
+        path.join("sub", "dir", "file.txt"),
+      );
     });
 
-    it('should return shortened path when file path is deep', () => {
+    it("should return shortened path when file path is deep", () => {
       const deepPath = path.join(
         tempRootDir,
-        'very',
-        'deep',
-        'directory',
-        'structure',
-        'that',
-        'exceeds',
-        'the',
-        'normal',
-        'limit',
-        'file.txt',
+        "very",
+        "deep",
+        "directory",
+        "structure",
+        "that",
+        "exceeds",
+        "the",
+        "normal",
+        "limit",
+        "file.txt",
       );
       const params: ReadFileToolParams = { file_path: deepPath };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      const desc = (
-        invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-      ).getDescription();
-      expect(desc).toContain('...');
-      expect(desc).toContain('file.txt');
+      expect(typeof invocation).not.toBe("string");
+      const desc = (invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription();
+      expect(desc).toContain("...");
+      expect(desc).toContain("file.txt");
     });
 
-    it('should handle non-normalized file paths correctly', () => {
-      const subDir = path.join(tempRootDir, 'sub', 'dir');
+    it("should handle non-normalized file paths correctly", () => {
+      const subDir = path.join(tempRootDir, "sub", "dir");
       const params: ReadFileToolParams = {
-        file_path: path.join(subDir, '..', 'dir', 'file.txt'),
+        file_path: path.join(subDir, "..", "dir", "file.txt"),
       };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      expect(
-        (
-          invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-        ).getDescription(),
-      ).toBe(path.join('sub', 'dir', 'file.txt'));
+      expect(typeof invocation).not.toBe("string");
+      expect((invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription()).toBe(
+        path.join("sub", "dir", "file.txt"),
+      );
     });
 
-    it('should return . if path is the root directory', () => {
+    it("should return . if path is the root directory", () => {
       const params: ReadFileToolParams = { file_path: tempRootDir };
       const invocation = tool.build(params);
-      expect(typeof invocation).not.toBe('string');
-      expect(
-        (
-          invocation as ToolInvocation<ReadFileToolParams, ToolResult>
-        ).getDescription(),
-      ).toBe('.');
+      expect(typeof invocation).not.toBe("string");
+      expect((invocation as ToolInvocation<ReadFileToolParams, ToolResult>).getDescription()).toBe(
+        ".",
+      );
     });
   });
 
-  describe('execute', () => {
-    it('should successfully read a file with a relative path', async () => {
-      const filePath = path.join(tempRootDir, 'textfile.txt');
-      const fileContent = 'This is a test file.';
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
-      const params: ReadFileToolParams = { file_path: 'textfile.txt' };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+  describe("execute", () => {
+    it("should successfully read a file with a relative path", async () => {
+      const filePath = path.join(tempRootDir, "textfile.txt");
+      const fileContent = "This is a test file.";
+      await fsp.writeFile(filePath, fileContent, "utf-8");
+      const params: ReadFileToolParams = { file_path: "textfile.txt" };
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       expect(await invocation.execute(abortSignal)).toEqual({
         llmContent: fileContent,
-        returnDisplay: '',
+        returnDisplay: "",
       });
     });
 
-    it('should return error if file does not exist', async () => {
-      const filePath = path.join(tempRootDir, 'nonexistent.txt');
+    it("should return error if file does not exist", async () => {
+      const filePath = path.join(tempRootDir, "nonexistent.txt");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result).toEqual({
-        llmContent:
-          'Could not read file because no file was found at the specified path.',
-        returnDisplay: 'File not found.',
+        llmContent: "Could not read file because no file was found at the specified path.",
+        returnDisplay: "File not found.",
         error: {
           message: `File not found: ${filePath}`,
           type: ToolErrorType.FILE_NOT_FOUND,
@@ -240,36 +214,29 @@ describe('ReadFileTool', () => {
       });
     });
 
-    it('should return success result for a text file', async () => {
-      const filePath = path.join(tempRootDir, 'textfile.txt');
-      const fileContent = 'This is a test file.';
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
+    it("should return success result for a text file", async () => {
+      const filePath = path.join(tempRootDir, "textfile.txt");
+      const fileContent = "This is a test file.";
+      await fsp.writeFile(filePath, fileContent, "utf-8");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       expect(await invocation.execute(abortSignal)).toEqual({
         llmContent: fileContent,
-        returnDisplay: '',
+        returnDisplay: "",
       });
     });
 
-    it('should return error if path is a directory', async () => {
-      const dirPath = path.join(tempRootDir, 'directory');
+    it("should return error if path is a directory", async () => {
+      const dirPath = path.join(tempRootDir, "directory");
       await fsp.mkdir(dirPath);
       const params: ReadFileToolParams = { file_path: dirPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result).toEqual({
-        llmContent:
-          'Could not read file because the provided path is a directory, not a file.',
-        returnDisplay: 'Path is a directory.',
+        llmContent: "Could not read file because the provided path is a directory, not a file.",
+        returnDisplay: "Path is a directory.",
         error: {
           message: `Path is a directory, not a file: ${dirPath}`,
           type: ToolErrorType.TARGET_IS_DIRECTORY,
@@ -277,209 +244,163 @@ describe('ReadFileTool', () => {
       });
     });
 
-    it('should return error for a file that is too large', async () => {
-      const filePath = path.join(tempRootDir, 'largefile.txt');
+    it("should return error for a file that is too large", async () => {
+      const filePath = path.join(tempRootDir, "largefile.txt");
       // 21MB of content exceeds 20MB limit
-      const largeContent = 'x'.repeat(21 * 1024 * 1024);
-      await fsp.writeFile(filePath, largeContent, 'utf-8');
+      const largeContent = "x".repeat(21 * 1024 * 1024);
+      await fsp.writeFile(filePath, largeContent, "utf-8");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result).toHaveProperty('error');
+      expect(result).toHaveProperty("error");
       expect(result.error?.type).toBe(ToolErrorType.FILE_TOO_LARGE);
-      expect(result.error?.message).toContain(
-        'File size exceeds the 20MB limit',
-      );
+      expect(result.error?.message).toContain("File size exceeds the 20MB limit");
     });
 
-    it('should handle text file with lines exceeding maximum length', async () => {
-      const filePath = path.join(tempRootDir, 'longlines.txt');
-      const longLine = 'a'.repeat(2500); // Exceeds MAX_LINE_LENGTH_TEXT_FILE (2000)
+    it("should handle text file with lines exceeding maximum length", async () => {
+      const filePath = path.join(tempRootDir, "longlines.txt");
+      const longLine = "a".repeat(2500); // Exceeds MAX_LINE_LENGTH_TEXT_FILE (2000)
       const fileContent = `Short line\n${longLine}\nAnother short line`;
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
+      await fsp.writeFile(filePath, fileContent, "utf-8");
       const params: ReadFileToolParams = { file_path: filePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'IMPORTANT: The file content has been truncated',
-      );
-      expect(result.llmContent).toContain('--- FILE CONTENT (truncated) ---');
-      expect(result.returnDisplay).toContain('some lines were shortened');
+      expect(result.llmContent).toContain("IMPORTANT: The file content has been truncated");
+      expect(result.llmContent).toContain("--- FILE CONTENT (truncated) ---");
+      expect(result.returnDisplay).toContain("some lines were shortened");
     });
 
-    it('should handle image file and return appropriate content', async () => {
-      const imagePath = path.join(tempRootDir, 'image.png');
+    it("should handle image file and return appropriate content", async () => {
+      const imagePath = path.join(tempRootDir, "image.png");
       // Minimal PNG header
-      const pngHeader = Buffer.from([
-        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-      ]);
+      const pngHeader = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
       await fsp.writeFile(imagePath, pngHeader);
       const params: ReadFileToolParams = { file_path: imagePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toEqual({
         inlineData: {
-          data: pngHeader.toString('base64'),
-          mimeType: 'image/png',
+          data: pngHeader.toString("base64"),
+          mimeType: "image/png",
         },
       });
-      expect(result.returnDisplay).toBe('Read image file: image.png');
+      expect(result.returnDisplay).toBe("Read image file: image.png");
     });
 
-    it('should handle PDF file and return appropriate content', async () => {
-      const pdfPath = path.join(tempRootDir, 'document.pdf');
+    it("should handle PDF file and return appropriate content", async () => {
+      const pdfPath = path.join(tempRootDir, "document.pdf");
       // Minimal PDF header
-      const pdfHeader = Buffer.from('%PDF-1.4');
+      const pdfHeader = Buffer.from("%PDF-1.4");
       await fsp.writeFile(pdfPath, pdfHeader);
       const params: ReadFileToolParams = { file_path: pdfPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toEqual({
         inlineData: {
-          data: pdfHeader.toString('base64'),
-          mimeType: 'application/pdf',
+          data: pdfHeader.toString("base64"),
+          mimeType: "application/pdf",
         },
       });
-      expect(result.returnDisplay).toBe('Read pdf file: document.pdf');
+      expect(result.returnDisplay).toBe("Read pdf file: document.pdf");
     });
 
-    it('should handle binary file and skip content', async () => {
-      const binPath = path.join(tempRootDir, 'binary.bin');
+    it("should handle binary file and skip content", async () => {
+      const binPath = path.join(tempRootDir, "binary.bin");
       // Binary data with null bytes
       const binaryData = Buffer.from([0x00, 0xff, 0x00, 0xff]);
       await fsp.writeFile(binPath, binaryData);
       const params: ReadFileToolParams = { file_path: binPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toBe(
-        'Cannot display content of binary file: binary.bin',
-      );
-      expect(result.returnDisplay).toBe('Skipped binary file: binary.bin');
+      expect(result.llmContent).toBe("Cannot display content of binary file: binary.bin");
+      expect(result.returnDisplay).toBe("Skipped binary file: binary.bin");
     });
 
-    it('should handle SVG file as text', async () => {
-      const svgPath = path.join(tempRootDir, 'image.svg');
+    it("should handle SVG file as text", async () => {
+      const svgPath = path.join(tempRootDir, "image.svg");
       const svgContent = '<svg><circle cx="50" cy="50" r="40"/></svg>';
-      await fsp.writeFile(svgPath, svgContent, 'utf-8');
+      await fsp.writeFile(svgPath, svgContent, "utf-8");
       const params: ReadFileToolParams = { file_path: svgPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toBe(svgContent);
-      expect(result.returnDisplay).toBe('Read SVG as text: image.svg');
+      expect(result.returnDisplay).toBe("Read SVG as text: image.svg");
     });
 
-    it('should handle large SVG file', async () => {
-      const svgPath = path.join(tempRootDir, 'large.svg');
+    it("should handle large SVG file", async () => {
+      const svgPath = path.join(tempRootDir, "large.svg");
       // Create SVG content larger than 1MB
-      const largeContent = '<svg>' + 'x'.repeat(1024 * 1024 + 1) + '</svg>';
-      await fsp.writeFile(svgPath, largeContent, 'utf-8');
+      const largeContent = "<svg>" + "x".repeat(1024 * 1024 + 1) + "</svg>";
+      await fsp.writeFile(svgPath, largeContent, "utf-8");
       const params: ReadFileToolParams = { file_path: svgPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toBe(
-        'Cannot display content of SVG file larger than 1MB: large.svg',
-      );
-      expect(result.returnDisplay).toBe(
-        'Skipped large SVG file (>1MB): large.svg',
+        "Cannot display content of SVG file larger than 1MB: large.svg",
       );
+      expect(result.returnDisplay).toBe("Skipped large SVG file (>1MB): large.svg");
     });
 
-    it('should handle empty file', async () => {
-      const emptyPath = path.join(tempRootDir, 'empty.txt');
-      await fsp.writeFile(emptyPath, '', 'utf-8');
+    it("should handle empty file", async () => {
+      const emptyPath = path.join(tempRootDir, "empty.txt");
+      await fsp.writeFile(emptyPath, "", "utf-8");
       const params: ReadFileToolParams = { file_path: emptyPath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toBe('');
-      expect(result.returnDisplay).toBe('');
+      expect(result.llmContent).toBe("");
+      expect(result.returnDisplay).toBe("");
     });
 
-    it('should support offset and limit for text files', async () => {
-      const filePath = path.join(tempRootDir, 'paginated.txt');
+    it("should support offset and limit for text files", async () => {
+      const filePath = path.join(tempRootDir, "paginated.txt");
       const lines = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
-      const fileContent = lines.join('\n');
-      await fsp.writeFile(filePath, fileContent, 'utf-8');
+      const fileContent = lines.join("\n");
+      await fsp.writeFile(filePath, fileContent, "utf-8");
 
       const params: ReadFileToolParams = {
         file_path: filePath,
         offset: 5, // Start from line 6
         limit: 3,
       };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'IMPORTANT: The file content has been truncated',
-      );
-      expect(result.llmContent).toContain(
-        'Status: Showing lines 6-8 of 20 total lines',
-      );
-      expect(result.llmContent).toContain('Line 6');
-      expect(result.llmContent).toContain('Line 7');
-      expect(result.llmContent).toContain('Line 8');
-      expect(result.returnDisplay).toBe(
-        'Read lines 6-8 of 20 from paginated.txt',
-      );
+      expect(result.llmContent).toContain("IMPORTANT: The file content has been truncated");
+      expect(result.llmContent).toContain("Status: Showing lines 6-8 of 20 total lines");
+      expect(result.llmContent).toContain("Line 6");
+      expect(result.llmContent).toContain("Line 7");
+      expect(result.llmContent).toContain("Line 8");
+      expect(result.returnDisplay).toBe("Read lines 6-8 of 20 from paginated.txt");
     });
 
-    it('should successfully read files from project temp directory', async () => {
-      const tempDir = path.join(tempRootDir, '.temp');
+    it("should successfully read files from project temp directory", async () => {
+      const tempDir = path.join(tempRootDir, ".temp");
       await fsp.mkdir(tempDir, { recursive: true });
-      const tempFilePath = path.join(tempDir, 'temp-output.txt');
-      const tempFileContent = 'This is temporary output content';
-      await fsp.writeFile(tempFilePath, tempFileContent, 'utf-8');
+      const tempFilePath = path.join(tempDir, "temp-output.txt");
+      const tempFileContent = "This is temporary output content";
+      await fsp.writeFile(tempFilePath, tempFileContent, "utf-8");
 
       const params: ReadFileToolParams = { file_path: tempFilePath };
-      const invocation = tool.build(params) as ToolInvocation<
-        ReadFileToolParams,
-        ToolResult
-      >;
+      const invocation = tool.build(params) as ToolInvocation<ReadFileToolParams, ToolResult>;
 
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toBe(tempFileContent);
-      expect(result.returnDisplay).toBe('');
+      expect(result.returnDisplay).toBe("");
     });
 
-    describe('with .geminiignore', () => {
+    describe("with .geminiignore", () => {
       beforeEach(async () => {
         await fsp.writeFile(
-          path.join(tempRootDir, '.geminiignore'),
-          ['foo.*', 'ignored/'].join('\n'),
+          path.join(tempRootDir, ".geminiignore"),
+          ["foo.*", "ignored/"].join("\n"),
         );
         const mockConfigInstance = {
           getFileService: () => new FileDiscoveryService(tempRootDir),
@@ -491,15 +412,15 @@ describe('ReadFileTool', () => {
             respectGeminiIgnore: true,
           }),
           storage: {
-            getProjectTempDir: () => path.join(tempRootDir, '.temp'),
+            getProjectTempDir: () => path.join(tempRootDir, ".temp"),
           },
         } as unknown as Config;
         tool = new ReadFileTool(mockConfigInstance);
       });
 
-      it('should throw error if path is ignored by a .geminiignore pattern', async () => {
-        const ignoredFilePath = path.join(tempRootDir, 'foo.bar');
-        await fsp.writeFile(ignoredFilePath, 'content', 'utf-8');
+      it("should throw error if path is ignored by a .geminiignore pattern", async () => {
+        const ignoredFilePath = path.join(tempRootDir, "foo.bar");
+        await fsp.writeFile(ignoredFilePath, "content", "utf-8");
         const params: ReadFileToolParams = {
           file_path: ignoredFilePath,
         };
@@ -507,11 +428,11 @@ describe('ReadFileTool', () => {
         expect(() => tool.build(params)).toThrow(expectedError);
       });
 
-      it('should throw error if file is in an ignored directory', async () => {
-        const ignoredDirPath = path.join(tempRootDir, 'ignored');
+      it("should throw error if file is in an ignored directory", async () => {
+        const ignoredDirPath = path.join(tempRootDir, "ignored");
         await fsp.mkdir(ignoredDirPath, { recursive: true });
-        const ignoredFilePath = path.join(ignoredDirPath, 'file.txt');
-        await fsp.writeFile(ignoredFilePath, 'content', 'utf-8');
+        const ignoredFilePath = path.join(ignoredDirPath, "file.txt");
+        await fsp.writeFile(ignoredFilePath, "content", "utf-8");
         const params: ReadFileToolParams = {
           file_path: ignoredFilePath,
         };
@@ -519,14 +440,14 @@ describe('ReadFileTool', () => {
         expect(() => tool.build(params)).toThrow(expectedError);
       });
 
-      it('should allow reading non-ignored files', async () => {
-        const allowedFilePath = path.join(tempRootDir, 'allowed.txt');
-        await fsp.writeFile(allowedFilePath, 'content', 'utf-8');
+      it("should allow reading non-ignored files", async () => {
+        const allowedFilePath = path.join(tempRootDir, "allowed.txt");
+        await fsp.writeFile(allowedFilePath, "content", "utf-8");
         const params: ReadFileToolParams = {
           file_path: allowedFilePath,
         };
         const invocation = tool.build(params);
-        expect(typeof invocation).not.toBe('string');
+        expect(typeof invocation).not.toBe("string");
       });
     });
   });
diff --git a/packages/gemini-core/src/tools/read-file.ts b/packages/gemini-core/src/tools/read-file.ts
index 8def7e2dd..76bf7ba04 100644
--- a/packages/gemini-core/src/tools/read-file.ts
+++ b/packages/gemini-core/src/tools/read-file.ts
@@ -4,23 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import path from 'node:path';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import type { ToolInvocation, ToolLocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-
-import type { PartUnion } from '@google/genai';
-import {
-  processSingleFileContent,
-  getSpecificMimeType,
-} from '../utils/fileUtils.js';
-import type { Config } from '../config/config.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getProgrammingLanguage } from '../telemetry/telemetry-utils.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { READ_FILE_TOOL_NAME } from './tool-names.js';
+import path from "node:path";
+import type { PartUnion } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { getProgrammingLanguage } from "../telemetry/telemetry-utils.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { getSpecificMimeType, processSingleFileContent } from "../utils/fileUtils.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { READ_FILE_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolLocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Parameters for the ReadFile tool
@@ -42,10 +38,7 @@ export interface ReadFileToolParams {
   limit?: number;
 }
 
-class ReadFileToolInvocation extends BaseToolInvocation<
-  ReadFileToolParams,
-  ToolResult
-> {
+class ReadFileToolInvocation extends BaseToolInvocation<ReadFileToolParams, ToolResult> {
   private readonly resolvedPath: string;
   constructor(
     private config: Config,
@@ -55,17 +48,11 @@ class ReadFileToolInvocation extends BaseToolInvocation<
     _toolDisplayName?: string,
   ) {
     super(params, messageBus, _toolName, _toolDisplayName);
-    this.resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.file_path,
-    );
+    this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.resolvedPath,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.resolvedPath, this.config.getTargetDir());
     return shortenPath(relativePath);
   }
 
@@ -85,7 +72,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
     if (result.error) {
       return {
         llmContent: result.llmContent,
-        returnDisplay: result.returnDisplay || 'Error reading file',
+        returnDisplay: result.returnDisplay || "Error reading file",
         error: {
           message: result.error,
           type: result.errorType,
@@ -97,9 +84,7 @@ class ReadFileToolInvocation extends BaseToolInvocation<
     if (result.isTruncated) {
       const [start, end] = result.linesShown!;
       const total = result.originalLineCount!;
-      const nextOffset = this.params.offset
-        ? this.params.offset + end - start + 1
-        : end;
+      const nextOffset = this.params.offset ? this.params.offset + end - start + 1 : end;
       llmContent = `
 IMPORTANT: The file content has been truncated.
 Status: Showing lines ${start}-${end} of ${total} total lines.
@@ -108,13 +93,11 @@ Action: To read more of the file, you can use the 'offset' and 'limit' parameter
 --- FILE CONTENT (truncated) ---
 ${result.llmContent}`;
     } else {
-      llmContent = result.llmContent || '';
+      llmContent = result.llmContent || "";
     }
 
     const lines =
-      typeof result.llmContent === 'string'
-        ? result.llmContent.split('\n').length
-        : undefined;
+      typeof result.llmContent === "string" ? result.llmContent.split("\n").length : undefined;
     const mimetype = getSpecificMimeType(this.resolvedPath);
     const programming_language = getProgrammingLanguage({
       file_path: this.resolvedPath,
@@ -133,7 +116,7 @@ ${result.llmContent}`;
 
     return {
       llmContent,
-      returnDisplay: result.returnDisplay || '',
+      returnDisplay: result.returnDisplay || "",
     };
   }
 }
@@ -141,10 +124,7 @@ ${result.llmContent}`;
 /**
  * Implementation of the ReadFile tool logic
  */
-export class ReadFileTool extends BaseDeclarativeTool<
-  ReadFileToolParams,
-  ToolResult
-> {
+export class ReadFileTool extends BaseDeclarativeTool<ReadFileToolParams, ToolResult> {
   static readonly Name = READ_FILE_TOOL_NAME;
 
   constructor(
@@ -153,28 +133,28 @@ export class ReadFileTool extends BaseDeclarativeTool<
   ) {
     super(
       ReadFileTool.Name,
-      'ReadFile',
+      "ReadFile",
       `Reads and returns the content of a specified file. If the file is large, the content will be truncated. The tool's response will clearly indicate if truncation has occurred and will provide details on how to read more of the file using the 'offset' and 'limit' parameters. Handles text, images (PNG, JPG, GIF, WEBP, SVG, BMP), and PDF files. For text files, it can read specific line ranges.`,
       Kind.Read,
       {
         properties: {
           file_path: {
-            description: 'The path to the file to read.',
-            type: 'string',
+            description: "The path to the file to read.",
+            type: "string",
           },
           offset: {
             description:
               "Optional: For text files, the 0-based line number to start reading from. Requires 'limit' to be set. Use for paginating through large files.",
-            type: 'number',
+            type: "number",
           },
           limit: {
             description:
               "Optional: For text files, maximum number of lines to read. Use with 'offset' to paginate through large files. If omitted, reads the entire file (if feasible, up to a default limit).",
-            type: 'number',
+            type: "number",
           },
         },
-        required: ['file_path'],
-        type: 'object',
+        required: ["file_path"],
+        type: "object",
       },
       true,
       false,
@@ -182,36 +162,28 @@ export class ReadFileTool extends BaseDeclarativeTool<
     );
   }
 
-  protected override validateToolParamValues(
-    params: ReadFileToolParams,
-  ): string | null {
-    if (params.file_path.trim() === '') {
+  protected override validateToolParamValues(params: ReadFileToolParams): string | null {
+    if (params.file_path.trim() === "") {
       return "The 'file_path' parameter must be non-empty.";
     }
 
     const workspaceContext = this.config.getWorkspaceContext();
     const projectTempDir = this.config.storage.getProjectTempDir();
-    const resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      params.file_path,
-    );
+    const resolvedPath = path.resolve(this.config.getTargetDir(), params.file_path);
     const resolvedProjectTempDir = path.resolve(projectTempDir);
     const isWithinTempDir =
       resolvedPath.startsWith(resolvedProjectTempDir + path.sep) ||
       resolvedPath === resolvedProjectTempDir;
 
-    if (
-      !workspaceContext.isPathWithinWorkspace(resolvedPath) &&
-      !isWithinTempDir
-    ) {
+    if (!workspaceContext.isPathWithinWorkspace(resolvedPath) && !isWithinTempDir) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(', ')} or within the project temp directory: ${projectTempDir}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")} or within the project temp directory: ${projectTempDir}`;
     }
     if (params.offset !== undefined && params.offset < 0) {
-      return 'Offset must be a non-negative number';
+      return "Offset must be a non-negative number";
     }
     if (params.limit !== undefined && params.limit <= 0) {
-      return 'Limit must be a positive number';
+      return "Limit must be a positive number";
     }
 
     const fileService = this.config.getFileService();
@@ -229,12 +201,6 @@ export class ReadFileTool extends BaseDeclarativeTool<
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<ReadFileToolParams, ToolResult> {
-    return new ReadFileToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new ReadFileToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-core/src/tools/read-many-files.test.ts b/packages/gemini-core/src/tools/read-many-files.test.ts
index 47aa6b73d..5457344a7 100644
--- a/packages/gemini-core/src/tools/read-many-files.test.ts
+++ b/packages/gemini-core/src/tools/read-many-files.test.ts
@@ -4,42 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import type { Mock } from 'vitest';
-import { mockControl } from '../__mocks__/fs/promises.js';
-import { ReadManyFilesTool } from './read-many-files.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import path from 'node:path';
-import fs from 'node:fs'; // Actual fs for setup
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { ToolErrorType } from './tool-error.js';
-import {
-  COMMON_IGNORE_PATTERNS,
-  DEFAULT_FILE_EXCLUDES,
-} from '../utils/ignorePatterns.js';
-import * as glob from 'glob';
-
-vi.mock('glob', { spy: true });
-
-vi.mock('mime', () => {
+import fs from "node:fs"; // Actual fs for setup
+import os from "node:os";
+import path from "node:path";
+import * as glob from "glob";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { mockControl } from "../__mocks__/fs/promises.js";
+import type { Config } from "../config/config.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { COMMON_IGNORE_PATTERNS, DEFAULT_FILE_EXCLUDES } from "../utils/ignorePatterns.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { ReadManyFilesTool } from "./read-many-files.js";
+import { ToolErrorType } from "./tool-error.js";
+
+vi.mock("glob", { spy: true });
+
+vi.mock("mime", () => {
   const getType = (filename: string) => {
-    if (filename.endsWith('.ts') || filename.endsWith('.js')) {
-      return 'text/plain';
+    if (filename.endsWith(".ts") || filename.endsWith(".js")) {
+      return "text/plain";
     }
-    if (filename.endsWith('.png')) {
-      return 'image/png';
+    if (filename.endsWith(".png")) {
+      return "image/png";
     }
-    if (filename.endsWith('.pdf')) {
-      return 'application/pdf';
+    if (filename.endsWith(".pdf")) {
+      return "application/pdf";
     }
-    if (filename.endsWith('.mp3') || filename.endsWith('.wav')) {
-      return 'audio/mpeg';
+    if (filename.endsWith(".mp3") || filename.endsWith(".wav")) {
+      return "audio/mpeg";
     }
-    if (filename.endsWith('.mp4') || filename.endsWith('.mov')) {
-      return 'video/mp4';
+    if (filename.endsWith(".mp4") || filename.endsWith(".mov")) {
+      return "video/mp4";
     }
     return false;
   };
@@ -51,24 +48,22 @@ vi.mock('mime', () => {
   };
 });
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
-describe('ReadManyFilesTool', () => {
+describe("ReadManyFilesTool", () => {
   let tool: ReadManyFilesTool;
   let tempRootDir: string;
   let tempDirOutsideRoot: string;
   let mockReadFileFn: Mock;
 
   beforeEach(async () => {
-    tempRootDir = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'read-many-files-root-')),
-    );
+    tempRootDir = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "read-many-files-root-")));
     tempDirOutsideRoot = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'read-many-files-external-')),
+      fs.mkdtempSync(path.join(os.tmpdir(), "read-many-files-external-")),
     );
-    fs.writeFileSync(path.join(tempRootDir, '.geminiignore'), 'foo.*');
+    fs.writeFileSync(path.join(tempRootDir, ".geminiignore"), "foo.*");
     const fileService = new FileDiscoveryService(tempRootDir);
     const mockConfig = {
       getFileService: () => fileService,
@@ -97,38 +92,30 @@ describe('ReadManyFilesTool', () => {
 
     mockReadFileFn.mockImplementation(
       async (filePath: fs.PathLike, options?: Record<string, unknown>) => {
-        const fp =
-          typeof filePath === 'string'
-            ? filePath
-            : (filePath as Buffer).toString();
+        const fp = typeof filePath === "string" ? filePath : (filePath as Buffer).toString();
 
         if (fs.existsSync(fp)) {
-          const originalFs = await vi.importActual<typeof fs>('fs');
+          const originalFs = await vi.importActual<typeof fs>("fs");
           return originalFs.promises.readFile(fp, options);
         }
 
-        if (fp.endsWith('nonexistent-file.txt')) {
-          const err = new Error(
-            `ENOENT: no such file or directory, open '${fp}'`,
-          );
-          (err as NodeJS.ErrnoException).code = 'ENOENT';
+        if (fp.endsWith("nonexistent-file.txt")) {
+          const err = new Error(`ENOENT: no such file or directory, open '${fp}'`);
+          (err as NodeJS.ErrnoException).code = "ENOENT";
           throw err;
         }
-        if (fp.endsWith('unreadable.txt')) {
+        if (fp.endsWith("unreadable.txt")) {
           const err = new Error(`EACCES: permission denied, open '${fp}'`);
-          (err as NodeJS.ErrnoException).code = 'EACCES';
+          (err as NodeJS.ErrnoException).code = "EACCES";
           throw err;
         }
-        if (fp.endsWith('.png'))
+        if (fp.endsWith(".png"))
           return Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]); // PNG header
-        if (fp.endsWith('.pdf')) return Buffer.from('%PDF-1.4...'); // PDF start
-        if (fp.endsWith('binary.bin'))
-          return Buffer.from([0x00, 0x01, 0x02, 0x00, 0x03]);
-
-        const err = new Error(
-          `ENOENT: no such file or directory, open '${fp}' (unmocked path)`,
-        );
-        (err as NodeJS.ErrnoException).code = 'ENOENT';
+        if (fp.endsWith(".pdf")) return Buffer.from("%PDF-1.4..."); // PDF start
+        if (fp.endsWith("binary.bin")) return Buffer.from([0x00, 0x01, 0x02, 0x00, 0x03]);
+
+        const err = new Error(`ENOENT: no such file or directory, open '${fp}' (unmocked path)`);
+        (err as NodeJS.ErrnoException).code = "ENOENT";
         throw err;
       },
     );
@@ -143,78 +130,72 @@ describe('ReadManyFilesTool', () => {
     }
   });
 
-  describe('build', () => {
-    it('should return an invocation for valid relative paths within root', () => {
-      const params = { include: ['file1.txt', 'subdir/file2.txt'] };
+  describe("build", () => {
+    it("should return an invocation for valid relative paths within root", () => {
+      const params = { include: ["file1.txt", "subdir/file2.txt"] };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should return an invocation for valid glob patterns within root', () => {
-      const params = { include: ['*.txt', 'subdir/**/*.js'] };
+    it("should return an invocation for valid glob patterns within root", () => {
+      const params = { include: ["*.txt", "subdir/**/*.js"] };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should return an invocation for paths trying to escape the root (e.g., ../) as execute handles this', () => {
-      const params = { include: ['../outside.txt'] };
+    it("should return an invocation for paths trying to escape the root (e.g., ../) as execute handles this", () => {
+      const params = { include: ["../outside.txt"] };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should return an invocation for absolute paths as execute handles this', () => {
+    it("should return an invocation for absolute paths as execute handles this", () => {
       const params = {
-        include: [path.join(tempDirOutsideRoot, 'absolute.txt')],
+        include: [path.join(tempDirOutsideRoot, "absolute.txt")],
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should throw error if paths array is empty', () => {
+    it("should throw error if paths array is empty", () => {
       const params = { include: [] };
-      expect(() => tool.build(params)).toThrow(
-        'params/include must NOT have fewer than 1 items',
-      );
+      expect(() => tool.build(params)).toThrow("params/include must NOT have fewer than 1 items");
     });
 
-    it('should return an invocation for valid exclude and include patterns', () => {
+    it("should return an invocation for valid exclude and include patterns", () => {
       const params = {
-        exclude: ['**/*.test.ts'],
-        include: ['src/**/*.ts', 'src/utils/*.ts'],
+        exclude: ["**/*.test.ts"],
+        include: ["src/**/*.ts", "src/utils/*.ts"],
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
     });
 
-    it('should throw error if paths array contains an empty string', () => {
-      const params = { include: ['file1.txt', ''] };
+    it("should throw error if paths array contains an empty string", () => {
+      const params = { include: ["file1.txt", ""] };
       expect(() => tool.build(params)).toThrow(
-        'params/include/1 must NOT have fewer than 1 characters',
+        "params/include/1 must NOT have fewer than 1 characters",
       );
     });
 
-    it('should throw error if include array contains non-string elements', () => {
+    it("should throw error if include array contains non-string elements", () => {
       const params = {
-        include: ['*.ts', 123] as string[],
+        include: ["*.ts", 123] as string[],
       };
-      expect(() => tool.build(params)).toThrow(
-        'params/include/1 must be string',
-      );
+      expect(() => tool.build(params)).toThrow("params/include/1 must be string");
     });
 
-    it('should throw error if exclude array contains non-string elements', () => {
+    it("should throw error if exclude array contains non-string elements", () => {
       const params = {
-        include: ['file1.txt'],
-        exclude: ['*.log', {}] as string[],
+        include: ["file1.txt"],
+        exclude: ["*.log", {}] as string[],
       };
-      expect(() => tool.build(params)).toThrow(
-        'params/exclude/1 must be string',
-      );
+      expect(() => tool.build(params)).toThrow("params/exclude/1 must be string");
     });
   });
 
-  describe('execute', () => {
-    const createFile = (filePath: string, content = '') => {
+  describe("execute", () => {
+    const createFile = (filePath: string, content = "") => {
       const fullPath = path.join(tempRootDir, filePath);
       fs.mkdirSync(path.dirname(fullPath), { recursive: true });
       fs.writeFileSync(fullPath, content);
@@ -225,267 +206,235 @@ describe('ReadManyFilesTool', () => {
       fs.writeFileSync(fullPath, data);
     };
 
-    it('should read a single specified file', async () => {
-      createFile('file1.txt', 'Content of file1');
-      const params = { include: ['file1.txt'] };
+    it("should read a single specified file", async () => {
+      createFile("file1.txt", "Content of file1");
+      const params = { include: ["file1.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      const expectedPath = path.join(tempRootDir, 'file1.txt');
+      const expectedPath = path.join(tempRootDir, "file1.txt");
       expect(result.llmContent).toEqual([
         `--- ${expectedPath} ---\n\nContent of file1\n\n`,
         `\n--- End of content ---`,
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should read multiple specified files', async () => {
-      createFile('file1.txt', 'Content1');
-      createFile('subdir/file2.js', 'Content2');
-      const params = { include: ['file1.txt', 'subdir/file2.js'] };
+    it("should read multiple specified files", async () => {
+      createFile("file1.txt", "Content1");
+      createFile("subdir/file2.js", "Content2");
+      const params = { include: ["file1.txt", "subdir/file2.js"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath1 = path.join(tempRootDir, 'file1.txt');
-      const expectedPath2 = path.join(tempRootDir, 'subdir/file2.js');
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`),
-        ),
-      ).toBe(true);
+      const expectedPath1 = path.join(tempRootDir, "file1.txt");
+      const expectedPath2 = path.join(tempRootDir, "subdir/file2.js");
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`))).toBe(
+        true,
+      );
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
     });
 
-    it('should handle glob patterns', async () => {
-      createFile('file.txt', 'Text file');
-      createFile('another.txt', 'Another text');
-      createFile('sub/data.json', '{}');
-      const params = { include: ['*.txt'] };
+    it("should handle glob patterns", async () => {
+      createFile("file.txt", "Text file");
+      createFile("another.txt", "Another text");
+      createFile("sub/data.json", "{}");
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath1 = path.join(tempRootDir, 'file.txt');
-      const expectedPath2 = path.join(tempRootDir, 'another.txt');
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nText file\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\nAnother text\n\n`),
-        ),
-      ).toBe(true);
-      expect(content.find((c) => c.includes('sub/data.json'))).toBeUndefined();
+      const expectedPath1 = path.join(tempRootDir, "file.txt");
+      const expectedPath2 = path.join(tempRootDir, "another.txt");
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nText file\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\nAnother text\n\n`))).toBe(
+        true,
+      );
+      expect(content.find((c) => c.includes("sub/data.json"))).toBeUndefined();
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
     });
 
-    it('should respect exclude patterns', async () => {
-      createFile('src/main.ts', 'Main content');
-      createFile('src/main.test.ts', 'Test content');
-      const params = { include: ['src/**/*.ts'], exclude: ['**/*.test.ts'] };
+    it("should respect exclude patterns", async () => {
+      createFile("src/main.ts", "Main content");
+      createFile("src/main.test.ts", "Test content");
+      const params = { include: ["src/**/*.ts"], exclude: ["**/*.test.ts"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath = path.join(tempRootDir, 'src/main.ts');
+      const expectedPath = path.join(tempRootDir, "src/main.ts");
       expect(content).toEqual([
         `--- ${expectedPath} ---\n\nMain content\n\n`,
         `\n--- End of content ---`,
       ]);
-      expect(
-        content.find((c) => c.includes('src/main.test.ts')),
-      ).toBeUndefined();
+      expect(content.find((c) => c.includes("src/main.test.ts"))).toBeUndefined();
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should handle nonexistent specific files gracefully', async () => {
-      const params = { include: ['nonexistent-file.txt'] };
+    it("should handle nonexistent specific files gracefully", async () => {
+      const params = { include: ["nonexistent-file.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
-        'No files matching the criteria were found or all were skipped.',
+        "No files matching the criteria were found or all were skipped.",
       ]);
       expect(result.returnDisplay).toContain(
-        'No files were read and concatenated based on the criteria.',
+        "No files were read and concatenated based on the criteria.",
       );
     });
 
-    it('should use default excludes', async () => {
-      createFile('node_modules/some-lib/index.js', 'lib code');
-      createFile('src/app.js', 'app code');
-      const params = { include: ['**/*.js'] };
+    it("should use default excludes", async () => {
+      createFile("node_modules/some-lib/index.js", "lib code");
+      createFile("src/app.js", "app code");
+      const params = { include: ["**/*.js"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath = path.join(tempRootDir, 'src/app.js');
+      const expectedPath = path.join(tempRootDir, "src/app.js");
       expect(content).toEqual([
         `--- ${expectedPath} ---\n\napp code\n\n`,
         `\n--- End of content ---`,
       ]);
-      expect(
-        content.find((c) => c.includes('node_modules/some-lib/index.js')),
-      ).toBeUndefined();
+      expect(content.find((c) => c.includes("node_modules/some-lib/index.js"))).toBeUndefined();
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should NOT use default excludes if useDefaultExcludes is false', async () => {
-      createFile('node_modules/some-lib/index.js', 'lib code');
-      createFile('src/app.js', 'app code');
-      const params = { include: ['**/*.js'], useDefaultExcludes: false };
+    it("should NOT use default excludes if useDefaultExcludes is false", async () => {
+      createFile("node_modules/some-lib/index.js", "lib code");
+      createFile("src/app.js", "app code");
+      const params = { include: ["**/*.js"], useDefaultExcludes: false };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath1 = path.join(
-        tempRootDir,
-        'node_modules/some-lib/index.js',
+      const expectedPath1 = path.join(tempRootDir, "node_modules/some-lib/index.js");
+      const expectedPath2 = path.join(tempRootDir, "src/app.js");
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nlib code\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\napp code\n\n`))).toBe(
+        true,
       );
-      const expectedPath2 = path.join(tempRootDir, 'src/app.js');
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nlib code\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\napp code\n\n`),
-        ),
-      ).toBe(true);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
     });
 
-    it('should include images as inlineData parts if explicitly requested by extension', async () => {
-      createBinaryFile(
-        'image.png',
-        Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]),
-      );
-      const params = { include: ['*.png'] }; // Explicitly requesting .png
+    it("should include images as inlineData parts if explicitly requested by extension", async () => {
+      createBinaryFile("image.png", Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]));
+      const params = { include: ["*.png"] }; // Explicitly requesting .png
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from([
-              0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-            ]).toString('base64'),
-            mimeType: 'image/png',
+            data: Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]).toString("base64"),
+            mimeType: "image/png",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should include images as inlineData parts if explicitly requested by name', async () => {
+    it("should include images as inlineData parts if explicitly requested by name", async () => {
       createBinaryFile(
-        'myExactImage.png',
+        "myExactImage.png",
         Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]),
       );
-      const params = { include: ['myExactImage.png'] }; // Explicitly requesting by full name
+      const params = { include: ["myExactImage.png"] }; // Explicitly requesting by full name
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from([
-              0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-            ]).toString('base64'),
-            mimeType: 'image/png',
+            data: Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]).toString("base64"),
+            mimeType: "image/png",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
     });
 
-    it('should skip PDF files if not explicitly requested by extension or name', async () => {
-      createBinaryFile('document.pdf', Buffer.from('%PDF-1.4...'));
-      createFile('notes.txt', 'text notes');
-      const params = { include: ['*'] }; // Generic glob, not specific to .pdf
+    it("should skip PDF files if not explicitly requested by extension or name", async () => {
+      createBinaryFile("document.pdf", Buffer.from("%PDF-1.4..."));
+      createFile("notes.txt", "text notes");
+      const params = { include: ["*"] }; // Generic glob, not specific to .pdf
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
-      const expectedPath = path.join(tempRootDir, 'notes.txt');
+      const expectedPath = path.join(tempRootDir, "notes.txt");
       expect(
         content.some(
-          (c) =>
-            typeof c === 'string' &&
-            c.includes(`--- ${expectedPath} ---\n\ntext notes\n\n`),
+          (c) => typeof c === "string" && c.includes(`--- ${expectedPath} ---\n\ntext notes\n\n`),
         ),
       ).toBe(true);
-      expect(result.returnDisplay).toContain('**Skipped 1 item(s):**');
+      expect(result.returnDisplay).toContain("**Skipped 1 item(s):**");
       expect(result.returnDisplay).toContain(
-        '- `document.pdf` (Reason: asset file (image/pdf) was not explicitly requested by name or extension)',
+        "- `document.pdf` (Reason: asset file (image/pdf) was not explicitly requested by name or extension)",
       );
     });
 
-    it('should include PDF files as inlineData parts if explicitly requested by extension', async () => {
-      createBinaryFile('important.pdf', Buffer.from('%PDF-1.4...'));
-      const params = { include: ['*.pdf'] }; // Explicitly requesting .pdf files
+    it("should include PDF files as inlineData parts if explicitly requested by extension", async () => {
+      createBinaryFile("important.pdf", Buffer.from("%PDF-1.4..."));
+      const params = { include: ["*.pdf"] }; // Explicitly requesting .pdf files
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from('%PDF-1.4...').toString('base64'),
-            mimeType: 'application/pdf',
+            data: Buffer.from("%PDF-1.4...").toString("base64"),
+            mimeType: "application/pdf",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
     });
 
-    it('should include PDF files as inlineData parts if explicitly requested by name', async () => {
-      createBinaryFile('report-final.pdf', Buffer.from('%PDF-1.4...'));
-      const params = { include: ['report-final.pdf'] };
+    it("should include PDF files as inlineData parts if explicitly requested by name", async () => {
+      createBinaryFile("report-final.pdf", Buffer.from("%PDF-1.4..."));
+      const params = { include: ["report-final.pdf"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toEqual([
         {
           inlineData: {
-            data: Buffer.from('%PDF-1.4...').toString('base64'),
-            mimeType: 'application/pdf',
+            data: Buffer.from("%PDF-1.4...").toString("base64"),
+            mimeType: "application/pdf",
           },
         },
-        '\n--- End of content ---',
+        "\n--- End of content ---",
       ]);
     });
 
-    it('should return error if path is ignored by a .geminiignore pattern', async () => {
-      createFile('foo.bar', '');
-      createFile('bar.ts', '');
-      createFile('foo.quux', '');
-      const params = { include: ['foo.bar', 'bar.ts', 'foo.quux'] };
+    it("should return error if path is ignored by a .geminiignore pattern", async () => {
+      createFile("foo.bar", "");
+      createFile("bar.ts", "");
+      createFile("foo.quux", "");
+      const params = { include: ["foo.bar", "bar.ts", "foo.quux"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.returnDisplay).not.toContain('foo.bar');
-      expect(result.returnDisplay).not.toContain('foo.quux');
-      expect(result.returnDisplay).toContain('bar.ts');
+      expect(result.returnDisplay).not.toContain("foo.bar");
+      expect(result.returnDisplay).not.toContain("foo.quux");
+      expect(result.returnDisplay).toContain("bar.ts");
     });
 
-    it('should read files from multiple workspace directories', async () => {
-      const tempDir1 = fs.realpathSync(
-        fs.mkdtempSync(path.join(os.tmpdir(), 'multi-dir-1-')),
-      );
-      const tempDir2 = fs.realpathSync(
-        fs.mkdtempSync(path.join(os.tmpdir(), 'multi-dir-2-')),
-      );
+    it("should read files from multiple workspace directories", async () => {
+      const tempDir1 = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "multi-dir-1-")));
+      const tempDir2 = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "multi-dir-2-")));
       const fileService = new FileDiscoveryService(tempDir1);
       const mockConfig = {
         getFileService: () => fileService,
@@ -507,69 +456,59 @@ describe('ReadManyFilesTool', () => {
       } as Partial<Config> as Config;
       tool = new ReadManyFilesTool(mockConfig);
 
-      fs.writeFileSync(path.join(tempDir1, 'file1.txt'), 'Content1');
-      fs.writeFileSync(path.join(tempDir2, 'file2.txt'), 'Content2');
+      fs.writeFileSync(path.join(tempDir1, "file1.txt"), "Content1");
+      fs.writeFileSync(path.join(tempDir2, "file2.txt"), "Content2");
 
-      const params = { include: ['*.txt'] };
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
       if (!Array.isArray(content)) {
         throw new Error(`llmContent is not an array: ${content}`);
       }
-      const expectedPath1 = path.join(tempDir1, 'file1.txt');
-      const expectedPath2 = path.join(tempDir2, 'file2.txt');
+      const expectedPath1 = path.join(tempDir1, "file1.txt");
+      const expectedPath2 = path.join(tempDir2, "file2.txt");
 
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`),
-        ),
-      ).toBe(true);
-      expect(
-        content.some((c) =>
-          c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`),
-        ),
-      ).toBe(true);
+      expect(content.some((c) => c.includes(`--- ${expectedPath1} ---\n\nContent1\n\n`))).toBe(
+        true,
+      );
+      expect(content.some((c) => c.includes(`--- ${expectedPath2} ---\n\nContent2\n\n`))).toBe(
+        true,
+      );
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **2 file(s)**',
+        "Successfully read and concatenated content from **2 file(s)**",
       );
 
       fs.rmSync(tempDir1, { recursive: true, force: true });
       fs.rmSync(tempDir2, { recursive: true, force: true });
     });
 
-    it('should add a warning for truncated files', async () => {
-      createFile('file1.txt', 'Content1');
+    it("should add a warning for truncated files", async () => {
+      createFile("file1.txt", "Content1");
       // Create a file that will be "truncated" by making it long
-      const longContent = Array.from({ length: 2500 }, (_, i) => `L${i}`).join(
-        '\n',
-      );
-      createFile('large-file.txt', longContent);
+      const longContent = Array.from({ length: 2500 }, (_, i) => `L${i}`).join("\n");
+      createFile("large-file.txt", longContent);
 
-      const params = { include: ['*.txt'] };
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       const content = result.llmContent as string[];
 
-      const normalFileContent = content.find((c) => c.includes('file1.txt'));
-      const truncatedFileContent = content.find((c) =>
-        c.includes('large-file.txt'),
-      );
+      const normalFileContent = content.find((c) => c.includes("file1.txt"));
+      const truncatedFileContent = content.find((c) => c.includes("large-file.txt"));
 
-      expect(normalFileContent).not.toContain(
-        '[WARNING: This file was truncated.',
-      );
+      expect(normalFileContent).not.toContain("[WARNING: This file was truncated.");
       expect(truncatedFileContent).toContain(
         "[WARNING: This file was truncated. To view the full content, use the 'read_file' tool on this specific file.]",
       );
       // Check that the actual content is still there but truncated
-      expect(truncatedFileContent).toContain('L200');
-      expect(truncatedFileContent).not.toContain('L2400');
+      expect(truncatedFileContent).toContain("L200");
+      expect(truncatedFileContent).not.toContain("L2400");
     });
 
-    it('should read files with special characters like [] and () in the path', async () => {
-      const filePath = 'src/app/[test]/(dashboard)/testing/components/code.tsx';
-      createFile(filePath, 'Content of receive-detail');
+    it("should read files with special characters like [] and () in the path", async () => {
+      const filePath = "src/app/[test]/(dashboard)/testing/components/code.tsx";
+      createFile(filePath, "Content of receive-detail");
       const params = { include: [filePath] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
@@ -583,16 +522,16 @@ Content of receive-detail
         `\n--- End of content ---`,
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
 
-    it('should read files with special characters in the name', async () => {
-      createFile('file[1].txt', 'Content of file[1]');
-      const params = { include: ['file[1].txt'] };
+    it("should read files with special characters in the name", async () => {
+      createFile("file[1].txt", "Content of file[1]");
+      const params = { include: ["file[1].txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      const expectedPath = path.join(tempRootDir, 'file[1].txt');
+      const expectedPath = path.join(tempRootDir, "file[1].txt");
       expect(result.llmContent).toEqual([
         `--- ${expectedPath} ---
 
@@ -602,35 +541,33 @@ Content of file[1]
         `\n--- End of content ---`,
       ]);
       expect(result.returnDisplay).toContain(
-        'Successfully read and concatenated content from **1 file(s)**',
+        "Successfully read and concatenated content from **1 file(s)**",
       );
     });
   });
 
-  describe('Error handling', () => {
-    it('should return an INVALID_TOOL_PARAMS error if no paths are provided', async () => {
+  describe("Error handling", () => {
+    it("should return an INVALID_TOOL_PARAMS error if no paths are provided", async () => {
       const params = { include: [] };
       expect(() => {
         tool.build(params);
-      }).toThrow('params/include must NOT have fewer than 1 items');
+      }).toThrow("params/include must NOT have fewer than 1 items");
     });
 
-    it('should return a READ_MANY_FILES_SEARCH_ERROR on glob failure', async () => {
-      vi.mocked(glob.glob).mockRejectedValue(new Error('Glob failed'));
-      const params = { include: ['*.txt'] };
+    it("should return a READ_MANY_FILES_SEARCH_ERROR on glob failure", async () => {
+      vi.mocked(glob.glob).mockRejectedValue(new Error("Glob failed"));
+      const params = { include: ["*.txt"] };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.error?.type).toBe(
-        ToolErrorType.READ_MANY_FILES_SEARCH_ERROR,
-      );
-      expect(result.llmContent).toBe('Error during file search: Glob failed');
+      expect(result.error?.type).toBe(ToolErrorType.READ_MANY_FILES_SEARCH_ERROR);
+      expect(result.llmContent).toBe("Error during file search: Glob failed");
       // Reset glob.
       vi.mocked(glob.glob).mockReset();
     });
   });
 
-  describe('Batch Processing', () => {
-    const createMultipleFiles = (count: number, contentPrefix = 'Content') => {
+  describe("Batch Processing", () => {
+    const createMultipleFiles = (count: number, contentPrefix = "Content") => {
       const files: string[] = [];
       for (let i = 0; i < count; i++) {
         const fileName = `file${i}.txt`;
@@ -640,27 +577,24 @@ Content of file[1]
       return files;
     };
 
-    const createFile = (filePath: string, content = '') => {
+    const createFile = (filePath: string, content = "") => {
       const fullPath = path.join(tempRootDir, filePath);
       fs.mkdirSync(path.dirname(fullPath), { recursive: true });
       fs.writeFileSync(fullPath, content);
     };
 
-    it('should process files in parallel', async () => {
+    it("should process files in parallel", async () => {
       // Mock detectFileType to add artificial delay to simulate I/O
-      const detectFileTypeSpy = vi.spyOn(
-        await import('../utils/fileUtils.js'),
-        'detectFileType',
-      );
+      const detectFileTypeSpy = vi.spyOn(await import("../utils/fileUtils.js"), "detectFileType");
 
       // Create files
       const fileCount = 4;
-      const files = createMultipleFiles(fileCount, 'Batch test');
+      const files = createMultipleFiles(fileCount, "Batch test");
 
       // Mock with 10ms delay per file to simulate I/O operations
       detectFileTypeSpy.mockImplementation(async (_filePath: string) => {
         await new Promise((resolve) => setTimeout(resolve, 10));
-        return 'text';
+        return "text";
       });
 
       const params = { include: files };
@@ -672,25 +606,25 @@ Content of file[1]
       const content = result.llmContent as string[];
       expect(content).toHaveLength(fileCount + 1);
       for (let i = 0; i < fileCount; i++) {
-        expect(content.join('')).toContain(`Batch test ${i}`);
+        expect(content.join("")).toContain(`Batch test ${i}`);
       }
 
       // Cleanup mock
       detectFileTypeSpy.mockRestore();
     });
 
-    it('should handle batch processing errors gracefully', async () => {
+    it("should handle batch processing errors gracefully", async () => {
       // Create mix of valid and problematic files
-      createFile('valid1.txt', 'Valid content 1');
-      createFile('valid2.txt', 'Valid content 2');
-      createFile('valid3.txt', 'Valid content 3');
+      createFile("valid1.txt", "Valid content 1");
+      createFile("valid2.txt", "Valid content 2");
+      createFile("valid3.txt", "Valid content 3");
 
       const params = {
         include: [
-          'valid1.txt',
-          'valid2.txt',
-          'nonexistent-file.txt', // This will fail
-          'valid3.txt',
+          "valid1.txt",
+          "valid2.txt",
+          "nonexistent-file.txt", // This will fail
+          "valid3.txt",
         ],
       };
 
@@ -700,36 +634,33 @@ Content of file[1]
 
       // Should successfully process valid files despite one failure
       expect(content.length).toBeGreaterThanOrEqual(3);
-      expect(result.returnDisplay).toContain('Successfully read');
+      expect(result.returnDisplay).toContain("Successfully read");
 
       // Verify valid files were processed
-      const expectedPath1 = path.join(tempRootDir, 'valid1.txt');
-      const expectedPath3 = path.join(tempRootDir, 'valid3.txt');
+      const expectedPath1 = path.join(tempRootDir, "valid1.txt");
+      const expectedPath3 = path.join(tempRootDir, "valid3.txt");
       expect(content.some((c) => c.includes(expectedPath1))).toBe(true);
       expect(content.some((c) => c.includes(expectedPath3))).toBe(true);
     });
 
-    it('should execute file operations concurrently', async () => {
+    it("should execute file operations concurrently", async () => {
       // Track execution order to verify concurrency
       const executionOrder: string[] = [];
-      const detectFileTypeSpy = vi.spyOn(
-        await import('../utils/fileUtils.js'),
-        'detectFileType',
-      );
+      const detectFileTypeSpy = vi.spyOn(await import("../utils/fileUtils.js"), "detectFileType");
 
-      const files = ['file1.txt', 'file2.txt', 'file3.txt'];
-      files.forEach((file) => createFile(file, 'test content'));
+      const files = ["file1.txt", "file2.txt", "file3.txt"];
+      files.forEach((file) => createFile(file, "test content"));
 
       // Mock to track concurrent vs sequential execution
       detectFileTypeSpy.mockImplementation(async (filePath: string) => {
-        const fileName = filePath.split('/').pop() || '';
+        const fileName = filePath.split("/").pop() || "";
         executionOrder.push(`start:${fileName}`);
 
         // Add delay to make timing differences visible
         await new Promise((resolve) => setTimeout(resolve, 50));
 
         executionOrder.push(`end:${fileName}`);
-        return 'text';
+        return "text";
       });
 
       const invocation = tool.build({ include: files });
@@ -739,15 +670,11 @@ Content of file[1]
       // In parallel execution: all "start:" events should come before all "end:" events
       // In sequential execution: "start:file1", "end:file1", "start:file2", "end:file2", etc.
 
-      const startEvents = executionOrder.filter((e) =>
-        e.startsWith('start:'),
-      ).length;
-      const firstEndIndex = executionOrder.findIndex((e) =>
-        e.startsWith('end:'),
-      );
+      const startEvents = executionOrder.filter((e) => e.startsWith("start:")).length;
+      const firstEndIndex = executionOrder.findIndex((e) => e.startsWith("end:"));
       const startsBeforeFirstEnd = executionOrder
         .slice(0, firstEndIndex)
-        .filter((e) => e.startsWith('start:')).length;
+        .filter((e) => e.startsWith("start:")).length;
 
       // For parallel processing, ALL start events should happen before the first end event
       expect(startsBeforeFirstEnd).toBe(startEvents); // Should PASS with parallel implementation
diff --git a/packages/gemini-core/src/tools/read-many-files.ts b/packages/gemini-core/src/tools/read-many-files.ts
index b484c30e8..dd01b6de4 100644
--- a/packages/gemini-core/src/tools/read-many-files.ts
+++ b/packages/gemini-core/src/tools/read-many-files.ts
@@ -4,31 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { getErrorMessage } from '../utils/errors.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { glob, escape } from 'glob';
-import type { ProcessedFileReadResult } from '../utils/fileUtils.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { PartListUnion } from "@google/genai";
+import { escape, glob } from "glob";
+import { type Config, DEFAULT_FILE_FILTERING_OPTIONS } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { getProgrammingLanguage } from "../telemetry/telemetry-utils.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { getErrorMessage } from "../utils/errors.js";
+import type { ProcessedFileReadResult } from "../utils/fileUtils.js";
 import {
-  detectFileType,
-  processSingleFileContent,
   DEFAULT_ENCODING,
+  detectFileType,
   getSpecificMimeType,
-} from '../utils/fileUtils.js';
-import type { PartListUnion } from '@google/genai';
-import {
-  type Config,
-  DEFAULT_FILE_FILTERING_OPTIONS,
-} from '../config/config.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getProgrammingLanguage } from '../telemetry/telemetry-utils.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { ToolErrorType } from './tool-error.js';
-import { READ_MANY_FILES_TOOL_NAME } from './tool-names.js';
+  processSingleFileContent,
+} from "../utils/fileUtils.js";
+import { ToolErrorType } from "./tool-error.js";
+import { READ_MANY_FILES_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 /**
  * Parameters for the ReadManyFilesTool.
@@ -97,13 +94,10 @@ function getDefaultExcludes(config?: Config): string[] {
   return config?.getFileExclusions().getReadManyFilesExcludes() ?? [];
 }
 
-const DEFAULT_OUTPUT_SEPARATOR_FORMAT = '--- {filePath} ---';
-const DEFAULT_OUTPUT_TERMINATOR = '\n--- End of content ---';
+const DEFAULT_OUTPUT_SEPARATOR_FORMAT = "--- {filePath} ---";
+const DEFAULT_OUTPUT_TERMINATOR = "\n--- End of content ---";
 
-class ReadManyFilesToolInvocation extends BaseToolInvocation<
-  ReadManyFilesParams,
-  ToolResult
-> {
+class ReadManyFilesToolInvocation extends BaseToolInvocation<ReadManyFilesParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: ReadManyFilesParams,
@@ -116,7 +110,7 @@ class ReadManyFilesToolInvocation extends BaseToolInvocation<
 
   getDescription(): string {
     const pathDesc = `using patterns: 
-${this.params.include.join('`, `')}
+${this.params.include.join("`, `")}
  (within target directory: 
 ${this.config.getTargetDir()}
 ) `;
@@ -124,25 +118,22 @@ ${this.config.getTargetDir()}
     // Determine the final list of exclusion patterns exactly as in execute method
     const paramExcludes = this.params.exclude || [];
     const paramUseDefaultExcludes = this.params.useDefaultExcludes !== false;
-    const finalExclusionPatternsForDescription: string[] =
-      paramUseDefaultExcludes
-        ? [...getDefaultExcludes(this.config), ...paramExcludes]
-        : [...paramExcludes];
+    const finalExclusionPatternsForDescription: string[] = paramUseDefaultExcludes
+      ? [...getDefaultExcludes(this.config), ...paramExcludes]
+      : [...paramExcludes];
 
     const excludeDesc = `Excluding: ${
       finalExclusionPatternsForDescription.length > 0
         ? `patterns like 
 ${finalExclusionPatternsForDescription
   .slice(0, 2)
-  .join(
-    '`, `',
-  )}${finalExclusionPatternsForDescription.length > 2 ? '...`' : '`'}`
-        : 'none specified'
+  .join("`, `")}${finalExclusionPatternsForDescription.length > 2 ? "...`" : "`"}`
+        : "none specified"
     }`;
 
     return `Will attempt to read and concatenate files ${pathDesc}. ${excludeDesc}. File encoding: ${DEFAULT_ENCODING}. Separator: "${DEFAULT_OUTPUT_SEPARATOR_FORMAT.replace(
-      '{filePath}',
-      'path/to/file.ext',
+      "{filePath}",
+      "path/to/file.ext",
     )}".`;
   }
 
@@ -165,7 +156,7 @@ ${finalExclusionPatternsForDescription
       for (const dir of workspaceDirs) {
         const processedPatterns = [];
         for (const p of include) {
-          const normalizedP = p.replace(/\\/g, '/');
+          const normalizedP = p.replace(/\\/g, "/");
           const fullPath = path.join(dir, normalizedP);
           if (fs.existsSync(fullPath)) {
             processedPatterns.push(escape(normalizedP));
@@ -193,25 +184,22 @@ ${finalExclusionPatternsForDescription
       );
 
       const fileDiscovery = this.config.getFileService();
-      const { filteredPaths, ignoredCount } =
-        fileDiscovery.filterFilesWithReport(relativeEntries, {
-          respectGitIgnore:
-            this.params.file_filtering_options?.respect_git_ignore ??
-            this.config.getFileFilteringOptions().respectGitIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
-          respectGeminiIgnore:
-            this.params.file_filtering_options?.respect_gemini_ignore ??
-            this.config.getFileFilteringOptions().respectGeminiIgnore ??
-            DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
-        });
+      const { filteredPaths, ignoredCount } = fileDiscovery.filterFilesWithReport(relativeEntries, {
+        respectGitIgnore:
+          this.params.file_filtering_options?.respect_git_ignore ??
+          this.config.getFileFilteringOptions().respectGitIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
+        respectGeminiIgnore:
+          this.params.file_filtering_options?.respect_gemini_ignore ??
+          this.config.getFileFilteringOptions().respectGeminiIgnore ??
+          DEFAULT_FILE_FILTERING_OPTIONS.respectGeminiIgnore,
+      });
 
       for (const relativePath of filteredPaths) {
         // Security check: ensure the glob library didn't return something outside the workspace.
 
         const fullPath = path.resolve(this.config.getTargetDir(), relativePath);
-        if (
-          !this.config.getWorkspaceContext().isPathWithinWorkspace(fullPath)
-        ) {
+        if (!this.config.getWorkspaceContext().isPathWithinWorkspace(fullPath)) {
           skippedFiles.push({
             path: fullPath,
             reason: `Security: Glob library returned path outside workspace. Path: ${fullPath}`,
@@ -225,7 +213,7 @@ ${finalExclusionPatternsForDescription
       if (ignoredCount > 0) {
         skippedFiles.push({
           path: `${ignoredCount} file(s)`,
-          reason: 'ignored by project ignore files',
+          reason: "ignored by project ignore files",
         });
       }
     } catch (error) {
@@ -247,16 +235,13 @@ ${finalExclusionPatternsForDescription
         try {
           const relativePathForDisplay = path
             .relative(this.config.getTargetDir(), filePath)
-            .replace(/\\/g, '/');
+            .replace(/\\/g, "/");
 
           const fileType = await detectFileType(filePath);
 
-          if (fileType === 'image' || fileType === 'pdf') {
+          if (fileType === "image" || fileType === "pdf") {
             const fileExtension = path.extname(filePath).toLowerCase();
-            const fileNameWithoutExtension = path.basename(
-              filePath,
-              fileExtension,
-            );
+            const fileNameWithoutExtension = path.basename(filePath, fileExtension);
             const requestedExplicitly = include.some(
               (pattern: string) =>
                 pattern.toLowerCase().includes(fileExtension) ||
@@ -268,8 +253,7 @@ ${finalExclusionPatternsForDescription
                 success: false,
                 filePath,
                 relativePathForDisplay,
-                reason:
-                  'asset file (image/pdf) was not explicitly requested by name or extension',
+                reason: "asset file (image/pdf) was not explicitly requested by name or extension",
               };
             }
           }
@@ -299,7 +283,7 @@ ${finalExclusionPatternsForDescription
         } catch (error) {
           const relativePathForDisplay = path
             .relative(this.config.getTargetDir(), filePath)
-            .replace(/\\/g, '/');
+            .replace(/\\/g, "/");
 
           return {
             success: false,
@@ -314,7 +298,7 @@ ${finalExclusionPatternsForDescription
     const results = await Promise.allSettled(fileProcessingPromises);
 
     for (const result of results) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         const fileResult = result.value;
 
         if (!fileResult.success) {
@@ -325,15 +309,11 @@ ${finalExclusionPatternsForDescription
           });
         } else {
           // Handle successfully processed files
-          const { filePath, relativePathForDisplay, fileReadResult } =
-            fileResult;
+          const { filePath, relativePathForDisplay, fileReadResult } = fileResult;
 
-          if (typeof fileReadResult.llmContent === 'string') {
-            const separator = DEFAULT_OUTPUT_SEPARATOR_FORMAT.replace(
-              '{filePath}',
-              filePath,
-            );
-            let fileContentForLlm = '';
+          if (typeof fileReadResult.llmContent === "string") {
+            const separator = DEFAULT_OUTPUT_SEPARATOR_FORMAT.replace("{filePath}", filePath);
+            let fileContentForLlm = "";
             if (fileReadResult.isTruncated) {
               fileContentForLlm += `[WARNING: This file was truncated. To view the full content, use the 'read_file' tool on this specific file.]\n\n`;
             }
@@ -347,8 +327,8 @@ ${finalExclusionPatternsForDescription
           processedFilesRelativePaths.push(relativePathForDisplay);
 
           const lines =
-            typeof fileReadResult.llmContent === 'string'
-              ? fileReadResult.llmContent.split('\n').length
+            typeof fileReadResult.llmContent === "string"
+              ? fileReadResult.llmContent.split("\n").length
               : undefined;
           const mimetype = getSpecificMimeType(filePath);
           const programming_language = getProgrammingLanguage({
@@ -369,7 +349,7 @@ ${finalExclusionPatternsForDescription
       } else {
         // Handle Promise rejection (unexpected errors)
         skippedFiles.push({
-          path: 'unknown',
+          path: "unknown",
           reason: `Unexpected error: ${result.reason}`,
         });
       }
@@ -380,14 +360,10 @@ ${finalExclusionPatternsForDescription
       displayMessage += `Successfully read and concatenated content from **${processedFilesRelativePaths.length} file(s)**.\n`;
       if (processedFilesRelativePaths.length <= 10) {
         displayMessage += `\n**Processed Files:**\n`;
-        processedFilesRelativePaths.forEach(
-          (p) => (displayMessage += `- \`${p}\`\n`),
-        );
+        processedFilesRelativePaths.forEach((p) => (displayMessage += `- \`${p}\`\n`));
       } else {
         displayMessage += `\n**Processed Files (first 10 shown):**\n`;
-        processedFilesRelativePaths
-          .slice(0, 10)
-          .forEach((p) => (displayMessage += `- \`${p}\`\n`));
+        processedFilesRelativePaths.slice(0, 10).forEach((p) => (displayMessage += `- \`${p}\`\n`));
         displayMessage += `- ...and ${processedFilesRelativePaths.length - 10} more.\n`;
       }
     }
@@ -403,25 +379,18 @@ ${finalExclusionPatternsForDescription
       }
       skippedFiles
         .slice(0, 5)
-        .forEach(
-          (f) => (displayMessage += `- \`${f.path}\` (Reason: ${f.reason})\n`),
-        );
+        .forEach((f) => (displayMessage += `- \`${f.path}\` (Reason: ${f.reason})\n`));
       if (skippedFiles.length > 5) {
         displayMessage += `- ...and ${skippedFiles.length - 5} more.\n`;
       }
-    } else if (
-      processedFilesRelativePaths.length === 0 &&
-      skippedFiles.length === 0
-    ) {
+    } else if (processedFilesRelativePaths.length === 0 && skippedFiles.length === 0) {
       displayMessage += `No files were read and concatenated based on the criteria.\n`;
     }
 
     if (contentParts.length > 0) {
       contentParts.push(DEFAULT_OUTPUT_TERMINATOR);
     } else {
-      contentParts.push(
-        'No files matching the criteria were found or all were skipped.',
-      );
+      contentParts.push("No files matching the criteria were found or all were skipped.");
     }
     return {
       llmContent: contentParts,
@@ -435,10 +404,7 @@ ${finalExclusionPatternsForDescription
  * within a specified target directory. The content is concatenated.
  * It is intended to run in an environment with access to the local file system (e.g., a Node.js backend).
  */
-export class ReadManyFilesTool extends BaseDeclarativeTool<
-  ReadManyFilesParams,
-  ToolResult
-> {
+export class ReadManyFilesTool extends BaseDeclarativeTool<ReadManyFilesParams, ToolResult> {
   static readonly Name = READ_MANY_FILES_TOOL_NAME;
 
   constructor(
@@ -446,12 +412,12 @@ export class ReadManyFilesTool extends BaseDeclarativeTool<
     messageBus?: MessageBus,
   ) {
     const parameterSchema = {
-      type: 'object',
+      type: "object",
       properties: {
         include: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'string',
+            type: "string",
             minLength: 1,
           },
           minItems: 1,
@@ -459,9 +425,9 @@ export class ReadManyFilesTool extends BaseDeclarativeTool<
             'An array of glob patterns or paths. Examples: ["src/**/*.ts"], ["README.md", "docs/"]',
         },
         exclude: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'string',
+            type: "string",
             minLength: 1,
           },
           description:
@@ -469,41 +435,40 @@ export class ReadManyFilesTool extends BaseDeclarativeTool<
           default: [],
         },
         recursive: {
-          type: 'boolean',
+          type: "boolean",
           description:
-            'Optional. Whether to search recursively (primarily controlled by `**` in glob patterns). Defaults to true.',
+            "Optional. Whether to search recursively (primarily controlled by `**` in glob patterns). Defaults to true.",
           default: true,
         },
         useDefaultExcludes: {
-          type: 'boolean',
+          type: "boolean",
           description:
-            'Optional. Whether to apply a list of default exclusion patterns (e.g., node_modules, .git, binary files). Defaults to true.',
+            "Optional. Whether to apply a list of default exclusion patterns (e.g., node_modules, .git, binary files). Defaults to true.",
           default: true,
         },
         file_filtering_options: {
-          description:
-            'Whether to respect ignore patterns from .gitignore or .geminiignore',
-          type: 'object',
+          description: "Whether to respect ignore patterns from .gitignore or .geminiignore",
+          type: "object",
           properties: {
             respect_git_ignore: {
               description:
-                'Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.',
-              type: 'boolean',
+                "Optional: Whether to respect .gitignore patterns when listing files. Only available in git repositories. Defaults to true.",
+              type: "boolean",
             },
             respect_gemini_ignore: {
               description:
-                'Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.',
-              type: 'boolean',
+                "Optional: Whether to respect .geminiignore patterns when listing files. Defaults to true.",
+              type: "boolean",
             },
           },
         },
       },
-      required: ['include'],
+      required: ["include"],
     };
 
     super(
       ReadManyFilesTool.Name,
-      'ReadManyFiles',
+      "ReadManyFiles",
       `Reads content from multiple files specified by glob patterns within a configured target directory. For text files, it concatenates their content into a single string. It is primarily designed for text-based files. However, it can also process image (e.g., .png, .jpg) and PDF (.pdf) files if their file names or extensions are explicitly included in the 'include' argument. For these explicitly requested non-text files, their data is read and included in a format suitable for model consumption (e.g., base64 encoded).
 
 This tool is useful when you need to understand or analyze a collection of files, such as:
diff --git a/packages/gemini-core/src/tools/ripGrep.test.ts b/packages/gemini-core/src/tools/ripGrep.test.ts
index e3c3ec694..2f1330391 100644
--- a/packages/gemini-core/src/tools/ripGrep.test.ts
+++ b/packages/gemini-core/src/tools/ripGrep.test.ts
@@ -4,50 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  afterAll,
-  vi,
-} from 'vitest';
-import type { RipGrepToolParams } from './ripGrep.js';
-import { canUseRipgrep, RipGrepTool, ensureRgPath } from './ripGrep.js';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import type { Config } from '../config/config.js';
-import { Storage } from '../config/storage.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import type { ChildProcess } from 'node:child_process';
-import { spawn } from 'node:child_process';
-import { downloadRipGrep } from '@joshua.litt/get-ripgrep';
+import type { ChildProcess } from "node:child_process";
+import { spawn } from "node:child_process";
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { downloadRipGrep } from "@joshua.litt/get-ripgrep";
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import type { RipGrepToolParams } from "./ripGrep.js";
+import { canUseRipgrep, ensureRgPath, RipGrepTool } from "./ripGrep.js";
+
 // Mock dependencies for canUseRipgrep
-vi.mock('@joshua.litt/get-ripgrep', () => ({
+vi.mock("@joshua.litt/get-ripgrep", () => ({
   downloadRipGrep: vi.fn(),
 }));
 
 // Mock child_process for ripgrep calls
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   spawn: vi.fn(),
 }));
 
 const mockSpawn = vi.mocked(spawn);
 const downloadRipGrepMock = vi.mocked(downloadRipGrep);
 const originalGetGlobalBinDir = Storage.getGlobalBinDir.bind(Storage);
-const storageSpy = vi.spyOn(Storage, 'getGlobalBinDir');
+const storageSpy = vi.spyOn(Storage, "getGlobalBinDir");
 
-describe('canUseRipgrep', () => {
+describe("canUseRipgrep", () => {
   let tempRootDir: string;
   let binDir: string;
 
   beforeEach(async () => {
     downloadRipGrepMock.mockReset();
     downloadRipGrepMock.mockResolvedValue(undefined);
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
-    binDir = path.join(tempRootDir, 'bin');
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "ripgrep-bin-"));
+    binDir = path.join(tempRootDir, "bin");
     await fs.mkdir(binDir, { recursive: true });
     storageSpy.mockImplementation(() => binDir);
   });
@@ -57,24 +50,22 @@ describe('canUseRipgrep', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  it('should return true if ripgrep already exists', async () => {
-    const candidateNames =
-      process.platform === 'win32' ? ['rg.exe', 'rg'] : ['rg'];
+  it("should return true if ripgrep already exists", async () => {
+    const candidateNames = process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
     const existingPath = path.join(binDir, candidateNames[0]);
-    await fs.writeFile(existingPath, '');
+    await fs.writeFile(existingPath, "");
 
     const result = await canUseRipgrep();
     expect(result).toBe(true);
     expect(downloadRipGrepMock).not.toHaveBeenCalled();
   });
 
-  it('should download ripgrep and return true if it does not exist initially', async () => {
-    const candidateNames =
-      process.platform === 'win32' ? ['rg.exe', 'rg'] : ['rg'];
+  it("should download ripgrep and return true if it does not exist initially", async () => {
+    const candidateNames = process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
     const expectedPath = path.join(binDir, candidateNames[0]);
 
     downloadRipGrepMock.mockImplementation(async () => {
-      await fs.writeFile(expectedPath, '');
+      await fs.writeFile(expectedPath, "");
     });
 
     const result = await canUseRipgrep();
@@ -84,31 +75,30 @@ describe('canUseRipgrep', () => {
     await expect(fs.access(expectedPath)).resolves.toBeUndefined();
   });
 
-  it('should return false if download fails and file does not exist', async () => {
+  it("should return false if download fails and file does not exist", async () => {
     const result = await canUseRipgrep();
 
     expect(result).toBe(false);
     expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
   });
 
-  it('should propagate errors from downloadRipGrep', async () => {
-    const error = new Error('Download failed');
+  it("should propagate errors from downloadRipGrep", async () => {
+    const error = new Error("Download failed");
     downloadRipGrepMock.mockRejectedValue(error);
 
     await expect(canUseRipgrep()).rejects.toThrow(error);
     expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
   });
 
-  it('should only download once when called concurrently', async () => {
-    const candidateNames =
-      process.platform === 'win32' ? ['rg.exe', 'rg'] : ['rg'];
+  it("should only download once when called concurrently", async () => {
+    const candidateNames = process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
     const expectedPath = path.join(binDir, candidateNames[0]);
 
     downloadRipGrepMock.mockImplementation(
       () =>
         new Promise<void>((resolve, reject) => {
           setTimeout(() => {
-            fs.writeFile(expectedPath, '')
+            fs.writeFile(expectedPath, "")
               .then(() => resolve())
               .catch(reject);
           }, 0);
@@ -127,15 +117,15 @@ describe('canUseRipgrep', () => {
   });
 });
 
-describe('ensureRgPath', () => {
+describe("ensureRgPath", () => {
   let tempRootDir: string;
   let binDir: string;
 
   beforeEach(async () => {
     downloadRipGrepMock.mockReset();
     downloadRipGrepMock.mockResolvedValue(undefined);
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
-    binDir = path.join(tempRootDir, 'bin');
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "ripgrep-bin-"));
+    binDir = path.join(tempRootDir, "bin");
     await fs.mkdir(binDir, { recursive: true });
     storageSpy.mockImplementation(() => binDir);
   });
@@ -145,24 +135,22 @@ describe('ensureRgPath', () => {
     await fs.rm(tempRootDir, { recursive: true, force: true });
   });
 
-  it('should return rg path if ripgrep already exists', async () => {
-    const candidateNames =
-      process.platform === 'win32' ? ['rg.exe', 'rg'] : ['rg'];
+  it("should return rg path if ripgrep already exists", async () => {
+    const candidateNames = process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
     const existingPath = path.join(binDir, candidateNames[0]);
-    await fs.writeFile(existingPath, '');
+    await fs.writeFile(existingPath, "");
 
     const rgPath = await ensureRgPath();
     expect(rgPath).toBe(existingPath);
     expect(downloadRipGrep).not.toHaveBeenCalled();
   });
 
-  it('should return rg path if ripgrep is downloaded successfully', async () => {
-    const candidateNames =
-      process.platform === 'win32' ? ['rg.exe', 'rg'] : ['rg'];
+  it("should return rg path if ripgrep is downloaded successfully", async () => {
+    const candidateNames = process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
     const expectedPath = path.join(binDir, candidateNames[0]);
 
     downloadRipGrepMock.mockImplementation(async () => {
-      await fs.writeFile(expectedPath, '');
+      await fs.writeFile(expectedPath, "");
     });
 
     const rgPath = await ensureRgPath();
@@ -171,24 +159,24 @@ describe('ensureRgPath', () => {
     await expect(fs.access(expectedPath)).resolves.toBeUndefined();
   });
 
-  it('should throw an error if ripgrep cannot be used after download attempt', async () => {
-    await expect(ensureRgPath()).rejects.toThrow('Cannot use ripgrep.');
+  it("should throw an error if ripgrep cannot be used after download attempt", async () => {
+    await expect(ensureRgPath()).rejects.toThrow("Cannot use ripgrep.");
     expect(downloadRipGrep).toHaveBeenCalledTimes(1);
   });
 
-  it('should propagate errors from downloadRipGrep', async () => {
-    const error = new Error('Download failed');
+  it("should propagate errors from downloadRipGrep", async () => {
+    const error = new Error("Download failed");
     downloadRipGrepMock.mockRejectedValue(error);
 
     await expect(ensureRgPath()).rejects.toThrow(error);
     expect(downloadRipGrep).toHaveBeenCalledWith(binDir);
   });
 
-  it.runIf(process.platform === 'win32')(
-    'should detect ripgrep when only rg.exe exists on Windows',
+  it.runIf(process.platform === "win32")(
+    "should detect ripgrep when only rg.exe exists on Windows",
     async () => {
-      const expectedRgExePath = path.join(binDir, 'rg.exe');
-      await fs.writeFile(expectedRgExePath, '');
+      const expectedRgExePath = path.join(binDir, "rg.exe");
+      await fs.writeFile(expectedRgExePath, "");
 
       const rgPath = await ensureRgPath();
       expect(rgPath).toBe(expectedRgExePath);
@@ -200,11 +188,7 @@ describe('ensureRgPath', () => {
 
 // Helper function to create mock spawn implementations
 function createMockSpawn(
-  options: {
-    outputData?: string;
-    exitCode?: number;
-    signal?: string;
-  } = {},
+  options: { outputData?: string; exitCode?: number; signal?: string } = {},
 ) {
   const { outputData, exitCode = 0, signal } = options;
 
@@ -226,12 +210,10 @@ function createMockSpawn(
     // Set up event listeners immediately
     setTimeout(() => {
       const stdoutDataHandler = mockProcess.stdout.on.mock.calls.find(
-        (call) => call[0] === 'data',
+        (call) => call[0] === "data",
       )?.[1];
 
-      const closeHandler = mockProcess.on.mock.calls.find(
-        (call) => call[0] === 'close',
-      )?.[1];
+      const closeHandler = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
       if (stdoutDataHandler && outputData) {
         stdoutDataHandler(Buffer.from(outputData));
@@ -246,7 +228,7 @@ function createMockSpawn(
   };
 }
 
-describe('RipGrepTool', () => {
+describe("RipGrepTool", () => {
   let tempRootDir: string;
   let tempBinRoot: string;
   let binDir: string;
@@ -264,33 +246,27 @@ describe('RipGrepTool', () => {
     downloadRipGrepMock.mockReset();
     downloadRipGrepMock.mockResolvedValue(undefined);
     mockSpawn.mockReset();
-    tempBinRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'ripgrep-bin-'));
-    binDir = path.join(tempBinRoot, 'bin');
+    tempBinRoot = await fs.mkdtemp(path.join(os.tmpdir(), "ripgrep-bin-"));
+    binDir = path.join(tempBinRoot, "bin");
     await fs.mkdir(binDir, { recursive: true });
-    const binaryName = process.platform === 'win32' ? 'rg.exe' : 'rg';
+    const binaryName = process.platform === "win32" ? "rg.exe" : "rg";
     ripgrepBinaryPath = path.join(binDir, binaryName);
-    await fs.writeFile(ripgrepBinaryPath, '');
+    await fs.writeFile(ripgrepBinaryPath, "");
     storageSpy.mockImplementation(() => binDir);
-    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'grep-tool-root-'));
+    tempRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-root-"));
     grepTool = new RipGrepTool(mockConfig);
 
     // Create some test files and directories
+    await fs.writeFile(path.join(tempRootDir, "fileA.txt"), "hello world\nsecond line with world");
     await fs.writeFile(
-      path.join(tempRootDir, 'fileA.txt'),
-      'hello world\nsecond line with world',
-    );
-    await fs.writeFile(
-      path.join(tempRootDir, 'fileB.js'),
+      path.join(tempRootDir, "fileB.js"),
       'const foo = "bar";\nfunction baz() { return "hello"; }',
     );
-    await fs.mkdir(path.join(tempRootDir, 'sub'));
-    await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileC.txt'),
-      'another world in sub dir',
-    );
+    await fs.mkdir(path.join(tempRootDir, "sub"));
+    await fs.writeFile(path.join(tempRootDir, "sub", "fileC.txt"), "another world in sub dir");
     await fs.writeFile(
-      path.join(tempRootDir, 'sub', 'fileD.md'),
-      '# Markdown file\nThis is a test.',
+      path.join(tempRootDir, "sub", "fileD.md"),
+      "# Markdown file\nThis is a test.",
     );
   });
 
@@ -300,175 +276,162 @@ describe('RipGrepTool', () => {
     await fs.rm(tempBinRoot, { recursive: true, force: true });
   });
 
-  describe('validateToolParams', () => {
-    it('should return null for valid params (pattern only)', () => {
-      const params: RipGrepToolParams = { pattern: 'hello' };
+  describe("validateToolParams", () => {
+    it("should return null for valid params (pattern only)", () => {
+      const params: RipGrepToolParams = { pattern: "hello" };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return null for valid params (pattern and path)', () => {
-      const params: RipGrepToolParams = { pattern: 'hello', dir_path: '.' };
+    it("should return null for valid params (pattern and path)", () => {
+      const params: RipGrepToolParams = { pattern: "hello", dir_path: "." };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return null for valid params (pattern, path, and include)', () => {
+    it("should return null for valid params (pattern, path, and include)", () => {
       const params: RipGrepToolParams = {
-        pattern: 'hello',
-        dir_path: '.',
-        include: '*.txt',
+        pattern: "hello",
+        dir_path: ".",
+        include: "*.txt",
       };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return error if pattern is missing', () => {
-      const params = { dir_path: '.' } as unknown as RipGrepToolParams;
+    it("should return error if pattern is missing", () => {
+      const params = { dir_path: "." } as unknown as RipGrepToolParams;
       expect(grepTool.validateToolParams(params)).toBe(
         `params must have required property 'pattern'`,
       );
     });
 
-    it('should return null for what would be an invalid regex pattern', () => {
-      const params: RipGrepToolParams = { pattern: '[[' };
+    it("should return null for what would be an invalid regex pattern", () => {
+      const params: RipGrepToolParams = { pattern: "[[" };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return error if path does not exist', () => {
+    it("should return error if path does not exist", () => {
       const params: RipGrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'nonexistent',
+        pattern: "hello",
+        dir_path: "nonexistent",
       };
       // Check for the core error message, as the full path might vary
-      expect(grepTool.validateToolParams(params)).toContain(
-        'Path does not exist',
-      );
-      expect(grepTool.validateToolParams(params)).toContain('nonexistent');
+      expect(grepTool.validateToolParams(params)).toContain("Path does not exist");
+      expect(grepTool.validateToolParams(params)).toContain("nonexistent");
     });
 
-    it('should allow path to be a file', async () => {
-      const filePath = path.join(tempRootDir, 'fileA.txt');
+    it("should allow path to be a file", async () => {
+      const filePath = path.join(tempRootDir, "fileA.txt");
       const params: RipGrepToolParams = {
-        pattern: 'hello',
+        pattern: "hello",
         dir_path: filePath,
       };
       expect(grepTool.validateToolParams(params)).toBeNull();
     });
   });
 
-  describe('execute', () => {
-    it('should find matches for a simple pattern in all files', async () => {
+  describe("execute", () => {
+    it("should find matches for a simple pattern in all files", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 1,
-                lines: { text: 'hello world\n' },
+                lines: { text: "hello world\n" },
               },
             }) +
-            '\n' +
+            "\n" +
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 2,
-                lines: { text: 'second line with world\n' },
+                lines: { text: "second line with world\n" },
               },
             }) +
-            '\n' +
+            "\n" +
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'sub/fileC.txt' },
+                path: { text: "sub/fileC.txt" },
                 line_number: 1,
-                lines: { text: 'another world in sub dir\n' },
+                lines: { text: "another world in sub dir\n" },
               },
             }) +
-            '\n',
+            "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 3 matches for pattern "world" in path "."',
-      );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain(
-        `File: ${path.join('sub', 'fileC.txt')}`,
-      );
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 3 matches');
+      expect(result.llmContent).toContain('Found 3 matches for pattern "world" in path "."');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain(`File: ${path.join("sub", "fileC.txt")}`);
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 3 matches");
     });
 
-    it('should find matches in a specific path', async () => {
+    it("should find matches in a specific path", async () => {
       // Setup specific mock for this test - searching in 'sub' should only return matches from that directory
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileC.txt' },
+                path: { text: "fileC.txt" },
                 line_number: 1,
-                lines: { text: 'another world in sub dir\n' },
+                lines: { text: "another world in sub dir\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'world', dir_path: 'sub' };
+      const params: RipGrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt'); // Path relative to 'sub'
-      expect(result.llmContent).toContain('L1: another world in sub dir');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt"); // Path relative to 'sub'
+      expect(result.llmContent).toContain("L1: another world in sub dir");
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob', async () => {
+    it("should find matches with an include glob", async () => {
       // Setup specific mock for this test
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileB.js' },
+                path: { text: "fileB.js" },
                 line_number: 2,
                 lines: { text: 'function baz() { return "hello"; }\n' },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'hello', include: '*.js' };
+      const params: RipGrepToolParams = { pattern: "hello", include: "*.js" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in path "." (filter: "*.js"):',
       );
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
-    it('should find matches with an include glob and path', async () => {
-      await fs.writeFile(
-        path.join(tempRootDir, 'sub', 'another.js'),
-        'const greeting = "hello";',
-      );
+    it("should find matches with an include glob and path", async () => {
+      await fs.writeFile(path.join(tempRootDir, "sub", "another.js"), 'const greeting = "hello";');
 
       // Setup specific mock for this test - searching for 'hello' in 'sub' with '*.js' filter
       mockSpawn.mockImplementationOnce(() => {
@@ -487,25 +450,21 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             // Only return match from the .js file in sub directory
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'another.js' },
+                    path: { text: "another.js" },
                     line_number: 1,
                     lines: { text: 'const greeting = "hello";\n' },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -518,18 +477,18 @@ describe('RipGrepTool', () => {
       });
 
       const params: RipGrepToolParams = {
-        pattern: 'hello',
-        dir_path: 'sub',
-        include: '*.js',
+        pattern: "hello",
+        dir_path: "sub",
+        include: "*.js",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'Found 1 match for pattern "hello" in path "sub" (filter: "*.js")',
       );
-      expect(result.llmContent).toContain('File: another.js');
+      expect(result.llmContent).toContain("File: another.js");
       expect(result.llmContent).toContain('L1: const greeting = "hello";');
-      expect(result.returnDisplay).toBe('Found 1 match');
+      expect(result.returnDisplay).toBe("Found 1 match");
     });
 
     it('should return "No matches found" when pattern does not exist', async () => {
@@ -540,32 +499,30 @@ describe('RipGrepTool', () => {
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'nonexistentpattern' };
+      const params: RipGrepToolParams = { pattern: "nonexistentpattern" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(result.llmContent).toContain(
         'No matches found for pattern "nonexistentpattern" in path ".".',
       );
-      expect(result.returnDisplay).toBe('No matches found');
+      expect(result.returnDisplay).toBe("No matches found");
     });
 
-    it('should return an error from ripgrep for invalid regex pattern', async () => {
+    it("should return an error from ripgrep for invalid regex pattern", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           exitCode: 2,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: '[[' };
+      const params: RipGrepToolParams = { pattern: "[[" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('ripgrep exited with code 2');
-      expect(result.returnDisplay).toContain(
-        'Error: ripgrep exited with code 2',
-      );
+      expect(result.llmContent).toContain("ripgrep exited with code 2");
+      expect(result.returnDisplay).toContain("Error: ripgrep exited with code 2");
     });
 
-    it('should handle regex special characters correctly', async () => {
+    it("should handle regex special characters correctly", async () => {
       // Setup specific mock for this test - regex pattern 'foo.*bar' should match 'const foo = "bar";'
       mockSpawn.mockImplementationOnce(() => {
         const mockProcess = {
@@ -583,25 +540,21 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             // Return match for the regex pattern
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'fileB.js' },
+                    path: { text: "fileB.js" },
                     line_number: 1,
                     lines: { text: 'const foo = "bar";\n' },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -613,17 +566,15 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'foo.*bar' }; // Matches 'const foo = "bar";'
+      const params: RipGrepToolParams = { pattern: "foo.*bar" }; // Matches 'const foo = "bar";'
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "foo.*bar" in path ".":',
-      );
-      expect(result.llmContent).toContain('File: fileB.js');
+      expect(result.llmContent).toContain('Found 1 match for pattern "foo.*bar" in path ".":');
+      expect(result.llmContent).toContain("File: fileB.js");
       expect(result.llmContent).toContain('L1: const foo = "bar";');
     });
 
-    it('should be case-insensitive by default (JS fallback)', async () => {
+    it("should be case-insensitive by default (JS fallback)", async () => {
       // Setup specific mock for this test - case insensitive search for 'HELLO'
       mockSpawn.mockImplementationOnce(() => {
         const mockProcess = {
@@ -641,35 +592,31 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             // Return case-insensitive matches for 'HELLO'
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'fileA.txt' },
+                    path: { text: "fileA.txt" },
                     line_number: 1,
-                    lines: { text: 'hello world\n' },
+                    lines: { text: "hello world\n" },
                   },
                 }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'fileB.js' },
+                      path: { text: "fileB.js" },
                       line_number: 2,
                       lines: { text: 'function baz() { return "hello"; }\n' },
                     },
                   }) +
-                  '\n',
+                  "\n",
               ),
             );
           }
@@ -681,61 +628,49 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'HELLO' };
+      const params: RipGrepToolParams = { pattern: "HELLO" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain(
-        'Found 2 matches for pattern "HELLO" in path ".":',
-      );
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('File: fileB.js');
-      expect(result.llmContent).toContain(
-        'L2: function baz() { return "hello"; }',
-      );
+      expect(result.llmContent).toContain('Found 2 matches for pattern "HELLO" in path ".":');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("File: fileB.js");
+      expect(result.llmContent).toContain('L2: function baz() { return "hello"; }');
     });
 
-    it('should throw an error if params are invalid', async () => {
-      const params = { dir_path: '.' } as unknown as RipGrepToolParams; // Invalid: pattern missing
-      expect(() => grepTool.build(params)).toThrow(
-        /params must have required property 'pattern'/,
-      );
+    it("should throw an error if params are invalid", async () => {
+      const params = { dir_path: "." } as unknown as RipGrepToolParams; // Invalid: pattern missing
+      expect(() => grepTool.build(params)).toThrow(/params must have required property 'pattern'/);
     });
 
-    it('should throw an error if ripgrep is not available', async () => {
+    it("should throw an error if ripgrep is not available", async () => {
       await fs.rm(ripgrepBinaryPath, { force: true });
       downloadRipGrepMock.mockResolvedValue(undefined);
 
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
 
       expect(await invocation.execute(abortSignal)).toStrictEqual({
-        llmContent: 'Error during grep search operation: Cannot use ripgrep.',
-        returnDisplay: 'Error: Cannot use ripgrep.',
+        llmContent: "Error during grep search operation: Cannot use ripgrep.",
+        returnDisplay: "Error: Cannot use ripgrep.",
       });
     });
   });
 
-  describe('multi-directory workspace', () => {
-    it('should search only CWD when no path is specified (default behavior)', async () => {
+  describe("multi-directory workspace", () => {
+    it("should search only CWD when no path is specified (default behavior)", async () => {
       // Create additional directory with test files
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
       await fs.writeFile(
-        path.join(secondDir, 'other.txt'),
-        'hello from second directory\nworld in second',
-      );
-      await fs.writeFile(
-        path.join(secondDir, 'another.js'),
-        'function world() { return "test"; }',
+        path.join(secondDir, "other.txt"),
+        "hello from second directory\nworld in second",
       );
+      await fs.writeFile(path.join(secondDir, "another.js"), 'function world() { return "test"; }');
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getDebugMode: () => false,
       } as unknown as Config;
 
@@ -760,65 +695,63 @@ describe('RipGrepTool', () => {
 
         setTimeout(() => {
           const stdoutDataHandler = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
+            (call) => call[0] === "data",
           )?.[1];
 
-          const closeHandler = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const closeHandler = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
-          let outputData = '';
+          let outputData = "";
           if (callCount === 1) {
             // First directory (tempRootDir)
             outputData =
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'fileA.txt' },
+                  path: { text: "fileA.txt" },
                   line_number: 1,
-                  lines: { text: 'hello world\n' },
+                  lines: { text: "hello world\n" },
                 },
               }) +
-              '\n' +
+              "\n" +
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'fileA.txt' },
+                  path: { text: "fileA.txt" },
                   line_number: 2,
-                  lines: { text: 'second line with world\n' },
+                  lines: { text: "second line with world\n" },
                 },
               }) +
-              '\n' +
+              "\n" +
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'sub/fileC.txt' },
+                  path: { text: "sub/fileC.txt" },
                   line_number: 1,
-                  lines: { text: 'another world in sub dir\n' },
+                  lines: { text: "another world in sub dir\n" },
                 },
               }) +
-              '\n';
+              "\n";
           } else if (callCount === 2) {
             // Second directory (secondDir)
             outputData =
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'other.txt' },
+                  path: { text: "other.txt" },
                   line_number: 2,
-                  lines: { text: 'world in second\n' },
+                  lines: { text: "world in second\n" },
                 },
               }) +
-              '\n' +
+              "\n" +
               JSON.stringify({
-                type: 'match',
+                type: "match",
                 data: {
-                  path: { text: 'another.js' },
+                  path: { text: "another.js" },
                   line_number: 1,
                   lines: { text: 'function world() { return "test"; }\n' },
                 },
               }) +
-              '\n';
+              "\n";
           }
 
           if (stdoutDataHandler && outputData) {
@@ -834,49 +767,44 @@ describe('RipGrepTool', () => {
       });
 
       const multiDirGrepTool = new RipGrepTool(multiDirConfig);
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should find matches in CWD only (default behavior now)
-      expect(result.llmContent).toContain(
-        'Found 3 matches for pattern "world" in path "."',
-      );
+      expect(result.llmContent).toContain('Found 3 matches for pattern "world" in path "."');
 
       // Matches from first directory
-      expect(result.llmContent).toContain('fileA.txt');
-      expect(result.llmContent).toContain('L1: hello world');
-      expect(result.llmContent).toContain('L2: second line with world');
-      expect(result.llmContent).toContain('fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain("fileA.txt");
+      expect(result.llmContent).toContain("L1: hello world");
+      expect(result.llmContent).toContain("L2: second line with world");
+      expect(result.llmContent).toContain("fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Should NOT find matches from second directory
-      expect(result.llmContent).not.toContain('other.txt');
-      expect(result.llmContent).not.toContain('world in second');
-      expect(result.llmContent).not.toContain('another.js');
-      expect(result.llmContent).not.toContain('function world()');
+      expect(result.llmContent).not.toContain("other.txt");
+      expect(result.llmContent).not.toContain("world in second");
+      expect(result.llmContent).not.toContain("another.js");
+      expect(result.llmContent).not.toContain("function world()");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
       mockSpawn.mockClear();
     });
 
-    it('should search only specified path within workspace directories', async () => {
+    it("should search only specified path within workspace directories", async () => {
       // Create additional directory
-      const secondDir = await fs.mkdtemp(
-        path.join(os.tmpdir(), 'grep-tool-second-'),
-      );
-      await fs.mkdir(path.join(secondDir, 'sub'));
+      const secondDir = await fs.mkdtemp(path.join(os.tmpdir(), "grep-tool-second-"));
+      await fs.mkdir(path.join(secondDir, "sub"));
       await fs.writeFile(
-        path.join(secondDir, 'sub', 'test.txt'),
-        'hello from second sub directory',
+        path.join(secondDir, "sub", "test.txt"),
+        "hello from second sub directory",
       );
 
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, [secondDir]),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, [secondDir]),
         getDebugMode: () => false,
       } as unknown as Config;
 
@@ -897,24 +825,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'fileC.txt' },
+                    path: { text: "fileC.txt" },
                     line_number: 1,
-                    lines: { text: 'another world in sub dir\n' },
+                    lines: { text: "another world in sub dir\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -929,29 +853,27 @@ describe('RipGrepTool', () => {
       const multiDirGrepTool = new RipGrepTool(multiDirConfig);
 
       // Search only in the 'sub' directory of the first workspace
-      const params: RipGrepToolParams = { pattern: 'world', dir_path: 'sub' };
+      const params: RipGrepToolParams = { pattern: "world", dir_path: "sub" };
       const invocation = multiDirGrepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should only find matches in the specified sub directory
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "world" in path "sub"',
-      );
-      expect(result.llmContent).toContain('File: fileC.txt');
-      expect(result.llmContent).toContain('L1: another world in sub dir');
+      expect(result.llmContent).toContain('Found 1 match for pattern "world" in path "sub"');
+      expect(result.llmContent).toContain("File: fileC.txt");
+      expect(result.llmContent).toContain("L1: another world in sub dir");
 
       // Should not contain matches from second directory
-      expect(result.llmContent).not.toContain('test.txt');
+      expect(result.llmContent).not.toContain("test.txt");
 
       // Clean up
       await fs.rm(secondDir, { recursive: true, force: true });
     });
   });
 
-  describe('abort signal handling', () => {
-    it('should handle AbortSignal during search', async () => {
+  describe("abort signal handling", () => {
+    it("should handle AbortSignal during search", async () => {
       const controller = new AbortController();
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
 
       controller.abort();
@@ -960,7 +882,7 @@ describe('RipGrepTool', () => {
       expect(result).toBeDefined();
     });
 
-    it('should abort streaming search when signal is triggered', async () => {
+    it("should abort streaming search when signal is triggered", async () => {
       // Setup specific mock for this test - simulate process being killed due to abort
       mockSpawn.mockImplementationOnce(() => {
         const mockProcess = {
@@ -979,13 +901,11 @@ describe('RipGrepTool', () => {
 
         // Simulate process being aborted - use setTimeout to ensure handlers are registered first
         setTimeout(() => {
-          const closeHandler = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const closeHandler = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (closeHandler) {
             // Simulate process killed by signal (code is null, signal is SIGTERM)
-            closeHandler(null, 'SIGTERM');
+            closeHandler(null, "SIGTERM");
           }
         }, 0);
 
@@ -993,7 +913,7 @@ describe('RipGrepTool', () => {
       });
 
       const controller = new AbortController();
-      const params: RipGrepToolParams = { pattern: 'test' };
+      const params: RipGrepToolParams = { pattern: "test" };
       const invocation = grepTool.build(params);
 
       // Abort immediately before starting the search
@@ -1001,25 +921,23 @@ describe('RipGrepTool', () => {
 
       const result = await invocation.execute(controller.signal);
       expect(result.llmContent).toContain(
-        'Error during grep search operation: ripgrep exited with code null',
-      );
-      expect(result.returnDisplay).toContain(
-        'Error: ripgrep exited with code null',
+        "Error during grep search operation: ripgrep exited with code null",
       );
+      expect(result.returnDisplay).toContain("Error: ripgrep exited with code null");
     });
   });
 
-  describe('error handling and edge cases', () => {
-    it('should handle workspace boundary violations', () => {
+  describe("error handling and edge cases", () => {
+    it("should handle workspace boundary violations", () => {
       const params: RipGrepToolParams = {
-        pattern: 'test',
-        dir_path: '../outside',
+        pattern: "test",
+        dir_path: "../outside",
       };
       expect(() => grepTool.build(params)).toThrow(/Path validation failed/);
     });
 
-    it('should handle empty directories gracefully', async () => {
-      const emptyDir = path.join(tempRootDir, 'empty');
+    it("should handle empty directories gracefully", async () => {
+      const emptyDir = path.join(tempRootDir, "empty");
       await fs.mkdir(emptyDir);
 
       // Setup specific mock for this test - searching in empty directory should return no matches
@@ -1039,9 +957,7 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onClose) {
             onClose(1);
@@ -1051,16 +967,16 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'test', dir_path: 'empty' };
+      const params: RipGrepToolParams = { pattern: "test", dir_path: "empty" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('No matches found');
-      expect(result.returnDisplay).toBe('No matches found');
+      expect(result.llmContent).toContain("No matches found");
+      expect(result.returnDisplay).toBe("No matches found");
     });
 
-    it('should handle empty files correctly', async () => {
-      await fs.writeFile(path.join(tempRootDir, 'empty.txt'), '');
+    it("should handle empty files correctly", async () => {
+      await fs.writeFile(path.join(tempRootDir, "empty.txt"), "");
 
       // Setup specific mock for this test - searching for anything in empty files should return no matches
       mockSpawn.mockImplementationOnce(() => {
@@ -1079,9 +995,7 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onClose) {
             onClose(1);
@@ -1091,19 +1005,16 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'anything' };
+      const params: RipGrepToolParams = { pattern: "anything" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('No matches found');
+      expect(result.llmContent).toContain("No matches found");
     });
 
-    it('should handle special characters in file names', async () => {
-      const specialFileName = 'file with spaces & symbols!.txt';
-      await fs.writeFile(
-        path.join(tempRootDir, specialFileName),
-        'hello world with special chars',
-      );
+    it("should handle special characters in file names", async () => {
+      const specialFileName = "file with spaces & symbols!.txt";
+      await fs.writeFile(path.join(tempRootDir, specialFileName), "hello world with special chars");
 
       // Setup specific mock for this test - searching for 'world' should find the file with special characters
       mockSpawn.mockImplementationOnce(() => {
@@ -1122,24 +1033,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
                     path: { text: specialFileName },
                     line_number: 1,
-                    lines: { text: 'hello world with special chars\n' },
+                    lines: { text: "hello world with special chars\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1151,21 +1058,18 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'world' };
+      const params: RipGrepToolParams = { pattern: "world" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       expect(result.llmContent).toContain(specialFileName);
-      expect(result.llmContent).toContain('hello world with special chars');
+      expect(result.llmContent).toContain("hello world with special chars");
     });
 
-    it('should handle deeply nested directories', async () => {
-      const deepPath = path.join(tempRootDir, 'a', 'b', 'c', 'd', 'e');
+    it("should handle deeply nested directories", async () => {
+      const deepPath = path.join(tempRootDir, "a", "b", "c", "d", "e");
       await fs.mkdir(deepPath, { recursive: true });
-      await fs.writeFile(
-        path.join(deepPath, 'deep.txt'),
-        'content in deep directory',
-      );
+      await fs.writeFile(path.join(deepPath, "deep.txt"), "content in deep directory");
 
       // Setup specific mock for this test - searching for 'deep' should find the deeply nested file
       mockSpawn.mockImplementationOnce(() => {
@@ -1184,24 +1088,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'a/b/c/d/e/deep.txt' },
+                    path: { text: "a/b/c/d/e/deep.txt" },
                     line_number: 1,
-                    lines: { text: 'content in deep directory\n' },
+                    lines: { text: "content in deep directory\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1213,19 +1113,19 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'deep' };
+      const params: RipGrepToolParams = { pattern: "deep" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('deep.txt');
-      expect(result.llmContent).toContain('content in deep directory');
+      expect(result.llmContent).toContain("deep.txt");
+      expect(result.llmContent).toContain("content in deep directory");
     });
   });
 
-  describe('regex pattern validation', () => {
-    it('should handle complex regex patterns', async () => {
+  describe("regex pattern validation", () => {
+    it("should handle complex regex patterns", async () => {
       await fs.writeFile(
-        path.join(tempRootDir, 'code.js'),
+        path.join(tempRootDir, "code.js"),
         'function getName() { return "test"; }\nconst getValue = () => "value";',
       );
 
@@ -1246,24 +1146,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'code.js' },
+                    path: { text: "code.js" },
                     line_number: 1,
                     lines: { text: 'function getName() { return "test"; }\n' },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1275,18 +1171,18 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'function\\s+\\w+\\s*\\(' };
+      const params: RipGrepToolParams = { pattern: "function\\s+\\w+\\s*\\(" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('function getName()');
-      expect(result.llmContent).not.toContain('const getValue');
+      expect(result.llmContent).toContain("function getName()");
+      expect(result.llmContent).not.toContain("const getValue");
     });
 
-    it('should handle case sensitivity correctly in JS fallback', async () => {
+    it("should handle case sensitivity correctly in JS fallback", async () => {
       await fs.writeFile(
-        path.join(tempRootDir, 'case.txt'),
-        'Hello World\nhello world\nHELLO WORLD',
+        path.join(tempRootDir, "case.txt"),
+        "Hello World\nhello world\nHELLO WORLD",
       );
 
       // Setup specific mock for this test - case insensitive search should match all variants
@@ -1306,43 +1202,39 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'case.txt' },
+                    path: { text: "case.txt" },
                     line_number: 1,
-                    lines: { text: 'Hello World\n' },
+                    lines: { text: "Hello World\n" },
                   },
                 }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'case.txt' },
+                      path: { text: "case.txt" },
                       line_number: 2,
-                      lines: { text: 'hello world\n' },
+                      lines: { text: "hello world\n" },
                     },
                   }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'case.txt' },
+                      path: { text: "case.txt" },
                       line_number: 3,
-                      lines: { text: 'HELLO WORLD\n' },
+                      lines: { text: "HELLO WORLD\n" },
                     },
                   }) +
-                  '\n',
+                  "\n",
               ),
             );
           }
@@ -1354,19 +1246,19 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: 'hello' };
+      const params: RipGrepToolParams = { pattern: "hello" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Hello World');
-      expect(result.llmContent).toContain('hello world');
-      expect(result.llmContent).toContain('HELLO WORLD');
+      expect(result.llmContent).toContain("Hello World");
+      expect(result.llmContent).toContain("hello world");
+      expect(result.llmContent).toContain("HELLO WORLD");
     });
 
-    it('should handle escaped regex special characters', async () => {
+    it("should handle escaped regex special characters", async () => {
       await fs.writeFile(
-        path.join(tempRootDir, 'special.txt'),
-        'Price: $19.99\nRegex: [a-z]+ pattern\nEmail: test@example.com',
+        path.join(tempRootDir, "special.txt"),
+        "Price: $19.99\nRegex: [a-z]+ pattern\nEmail: test@example.com",
       );
 
       // Setup specific mock for this test - escaped regex pattern should match price format
@@ -1386,24 +1278,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'special.txt' },
+                    path: { text: "special.txt" },
                     line_number: 1,
-                    lines: { text: 'Price: $19.99\n' },
+                    lines: { text: "Price: $19.99\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1415,27 +1303,21 @@ describe('RipGrepTool', () => {
         return mockProcess as unknown as ChildProcess;
       });
 
-      const params: RipGrepToolParams = { pattern: '\\$\\d+\\.\\d+' };
+      const params: RipGrepToolParams = { pattern: "\\$\\d+\\.\\d+" };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('Price: $19.99');
-      expect(result.llmContent).not.toContain('Email: test@example.com');
+      expect(result.llmContent).toContain("Price: $19.99");
+      expect(result.llmContent).not.toContain("Email: test@example.com");
     });
   });
 
-  describe('include pattern filtering', () => {
-    it('should handle multiple file extensions in include pattern', async () => {
-      await fs.writeFile(
-        path.join(tempRootDir, 'test.ts'),
-        'typescript content',
-      );
-      await fs.writeFile(path.join(tempRootDir, 'test.tsx'), 'tsx content');
-      await fs.writeFile(
-        path.join(tempRootDir, 'test.js'),
-        'javascript content',
-      );
-      await fs.writeFile(path.join(tempRootDir, 'test.txt'), 'text content');
+  describe("include pattern filtering", () => {
+    it("should handle multiple file extensions in include pattern", async () => {
+      await fs.writeFile(path.join(tempRootDir, "test.ts"), "typescript content");
+      await fs.writeFile(path.join(tempRootDir, "test.tsx"), "tsx content");
+      await fs.writeFile(path.join(tempRootDir, "test.js"), "javascript content");
+      await fs.writeFile(path.join(tempRootDir, "test.txt"), "text content");
 
       // Setup specific mock for this test - include pattern should filter to only ts/tsx files
       mockSpawn.mockImplementationOnce(() => {
@@ -1454,34 +1336,30 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'test.ts' },
+                    path: { text: "test.ts" },
                     line_number: 1,
-                    lines: { text: 'typescript content\n' },
+                    lines: { text: "typescript content\n" },
                   },
                 }) +
-                  '\n' +
+                  "\n" +
                   JSON.stringify({
-                    type: 'match',
+                    type: "match",
                     data: {
-                      path: { text: 'test.tsx' },
+                      path: { text: "test.tsx" },
                       line_number: 1,
-                      lines: { text: 'tsx content\n' },
+                      lines: { text: "tsx content\n" },
                     },
                   }) +
-                  '\n',
+                  "\n",
               ),
             );
           }
@@ -1494,25 +1372,22 @@ describe('RipGrepTool', () => {
       });
 
       const params: RipGrepToolParams = {
-        pattern: 'content',
-        include: '*.{ts,tsx}',
+        pattern: "content",
+        include: "*.{ts,tsx}",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('test.ts');
-      expect(result.llmContent).toContain('test.tsx');
-      expect(result.llmContent).not.toContain('test.js');
-      expect(result.llmContent).not.toContain('test.txt');
+      expect(result.llmContent).toContain("test.ts");
+      expect(result.llmContent).toContain("test.tsx");
+      expect(result.llmContent).not.toContain("test.js");
+      expect(result.llmContent).not.toContain("test.txt");
     });
 
-    it('should handle directory patterns in include', async () => {
-      await fs.mkdir(path.join(tempRootDir, 'src'), { recursive: true });
-      await fs.writeFile(
-        path.join(tempRootDir, 'src', 'main.ts'),
-        'source code',
-      );
-      await fs.writeFile(path.join(tempRootDir, 'other.ts'), 'other code');
+    it("should handle directory patterns in include", async () => {
+      await fs.mkdir(path.join(tempRootDir, "src"), { recursive: true });
+      await fs.writeFile(path.join(tempRootDir, "src", "main.ts"), "source code");
+      await fs.writeFile(path.join(tempRootDir, "other.ts"), "other code");
 
       // Setup specific mock for this test - include pattern should filter to only src/** files
       mockSpawn.mockImplementationOnce(() => {
@@ -1531,24 +1406,20 @@ describe('RipGrepTool', () => {
         };
 
         setTimeout(() => {
-          const onData = mockProcess.stdout.on.mock.calls.find(
-            (call) => call[0] === 'data',
-          )?.[1];
-          const onClose = mockProcess.on.mock.calls.find(
-            (call) => call[0] === 'close',
-          )?.[1];
+          const onData = mockProcess.stdout.on.mock.calls.find((call) => call[0] === "data")?.[1];
+          const onClose = mockProcess.on.mock.calls.find((call) => call[0] === "close")?.[1];
 
           if (onData) {
             onData(
               Buffer.from(
                 JSON.stringify({
-                  type: 'match',
+                  type: "match",
                   data: {
-                    path: { text: 'src/main.ts' },
+                    path: { text: "src/main.ts" },
                     line_number: 1,
-                    lines: { text: 'source code\n' },
+                    lines: { text: "source code\n" },
                   },
-                }) + '\n',
+                }) + "\n",
               ),
             );
           }
@@ -1561,166 +1432,161 @@ describe('RipGrepTool', () => {
       });
 
       const params: RipGrepToolParams = {
-        pattern: 'code',
-        include: 'src/**',
+        pattern: "code",
+        include: "src/**",
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toContain('main.ts');
-      expect(result.llmContent).not.toContain('other.ts');
+      expect(result.llmContent).toContain("main.ts");
+      expect(result.llmContent).not.toContain("other.ts");
     });
   });
 
-  describe('advanced search options', () => {
-    it('should handle case_sensitive parameter', async () => {
+  describe("advanced search options", () => {
+    it("should handle case_sensitive parameter", async () => {
       // Case-insensitive search (default)
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 1,
-                lines: { text: 'hello world\n' },
+                lines: { text: "hello world\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
-      let params: RipGrepToolParams = { pattern: 'HELLO' };
+      let params: RipGrepToolParams = { pattern: "HELLO" };
       let invocation = grepTool.build(params);
       let result = await invocation.execute(abortSignal);
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.arrayContaining(['--ignore-case']),
+        expect.arrayContaining(["--ignore-case"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "HELLO"');
-      expect(result.llmContent).toContain('L1: hello world');
+      expect(result.llmContent).toContain("L1: hello world");
 
       // Case-sensitive search
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 1,
-                lines: { text: 'HELLO world\n' },
+                lines: { text: "HELLO world\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
-      params = { pattern: 'HELLO', case_sensitive: true };
+      params = { pattern: "HELLO", case_sensitive: true };
       invocation = grepTool.build(params);
       result = await invocation.execute(abortSignal);
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.not.arrayContaining(['--ignore-case']),
+        expect.not.arrayContaining(["--ignore-case"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "HELLO"');
-      expect(result.llmContent).toContain('L1: HELLO world');
+      expect(result.llmContent).toContain("L1: HELLO world");
     });
 
-    it('should handle fixed_strings parameter', async () => {
+    it("should handle fixed_strings parameter", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 1,
-                lines: { text: 'hello.world\n' },
+                lines: { text: "hello.world\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
       const params: RipGrepToolParams = {
-        pattern: 'hello.world',
+        pattern: "hello.world",
         fixed_strings: true,
       };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.arrayContaining(['--fixed-strings']),
+        expect.arrayContaining(["--fixed-strings"]),
         expect.anything(),
       );
-      expect(result.llmContent).toContain(
-        'Found 1 match for pattern "hello.world"',
-      );
-      expect(result.llmContent).toContain('L1: hello.world');
+      expect(result.llmContent).toContain('Found 1 match for pattern "hello.world"');
+      expect(result.llmContent).toContain("L1: hello.world");
     });
 
-    it('should handle no_ignore parameter', async () => {
+    it("should handle no_ignore parameter", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'ignored.log' },
+                path: { text: "ignored.log" },
                 line_number: 1,
-                lines: { text: 'secret log entry\n' },
+                lines: { text: "secret log entry\n" },
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
-      const params: RipGrepToolParams = { pattern: 'secret', no_ignore: true };
+      const params: RipGrepToolParams = { pattern: "secret", no_ignore: true };
       const invocation = grepTool.build(params);
       const result = await invocation.execute(abortSignal);
 
       // Should have --no-ignore
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.arrayContaining(['--no-ignore']),
+        expect.arrayContaining(["--no-ignore"]),
         expect.anything(),
       );
 
       // Should NOT have default excludes when no_ignore is true
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.not.arrayContaining(['--glob', '!node_modules']),
+        expect.not.arrayContaining(["--glob", "!node_modules"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "secret"');
-      expect(result.llmContent).toContain('File: ignored.log');
-      expect(result.llmContent).toContain('L1: secret log entry');
+      expect(result.llmContent).toContain("File: ignored.log");
+      expect(result.llmContent).toContain("L1: secret log entry");
     });
 
-    it('should handle context parameters', async () => {
+    it("should handle context parameters", async () => {
       mockSpawn.mockImplementationOnce(
         createMockSpawn({
           outputData:
             JSON.stringify({
-              type: 'match',
+              type: "match",
               data: {
-                path: { text: 'fileA.txt' },
+                path: { text: "fileA.txt" },
                 line_number: 2,
-                lines: { text: 'second line with world\n' },
-                lines_before: [{ text: 'hello world\n' }],
-                lines_after: [
-                  { text: 'third line\n' },
-                  { text: 'fourth line\n' },
-                ],
+                lines: { text: "second line with world\n" },
+                lines_before: [{ text: "hello world\n" }],
+                lines_after: [{ text: "third line\n" }, { text: "fourth line\n" }],
               },
-            }) + '\n',
+            }) + "\n",
           exitCode: 0,
         }),
       );
 
       const params: RipGrepToolParams = {
-        pattern: 'world',
+        pattern: "world",
         context: 1,
         after: 2,
         before: 1,
@@ -1730,89 +1596,77 @@ describe('RipGrepTool', () => {
 
       expect(mockSpawn).toHaveBeenLastCalledWith(
         expect.anything(),
-        expect.arrayContaining([
-          '--context',
-          '1',
-          '--after-context',
-          '2',
-          '--before-context',
-          '1',
-        ]),
+        expect.arrayContaining(["--context", "1", "--after-context", "2", "--before-context", "1"]),
         expect.anything(),
       );
       expect(result.llmContent).toContain('Found 1 match for pattern "world"');
-      expect(result.llmContent).toContain('File: fileA.txt');
-      expect(result.llmContent).toContain('L2: second line with world');
+      expect(result.llmContent).toContain("File: fileA.txt");
+      expect(result.llmContent).toContain("L2: second line with world");
       // Note: Ripgrep JSON output for context lines doesn't include line numbers for context lines directly
       // The current parsing only extracts the matched line, so we only assert on that.
     });
   });
 
-  describe('getDescription', () => {
-    it('should generate correct description with pattern only', () => {
-      const params: RipGrepToolParams = { pattern: 'testPattern' };
+  describe("getDescription", () => {
+    it("should generate correct description with pattern only", () => {
+      const params: RipGrepToolParams = { pattern: "testPattern" };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' within ./");
     });
 
-    it('should generate correct description with pattern and include', () => {
+    it("should generate correct description with pattern and include", () => {
       const params: RipGrepToolParams = {
-        pattern: 'testPattern',
-        include: '*.ts',
+        pattern: "testPattern",
+        include: "*.ts",
       };
       const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toBe(
-        "'testPattern' in *.ts within ./",
-      );
+      expect(invocation.getDescription()).toBe("'testPattern' in *.ts within ./");
     });
 
-    it('should generate correct description with pattern and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: RipGrepToolParams = {
-        pattern: 'testPattern',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
       // The path will be relative to the tempRootDir, so we check for containment.
       expect(invocation.getDescription()).toContain("'testPattern' within");
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
 
-    it('should use ./ when no path is specified (defaults to CWD)', () => {
+    it("should use ./ when no path is specified (defaults to CWD)", () => {
       // Create a mock config with multiple directories
       const multiDirConfig = {
         getTargetDir: () => tempRootDir,
-        getWorkspaceContext: () =>
-          createMockWorkspaceContext(tempRootDir, ['/another/dir']),
+        getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir, ["/another/dir"]),
         getDebugMode: () => false,
       } as unknown as Config;
 
       const multiDirGrepTool = new RipGrepTool(multiDirConfig);
-      const params: RipGrepToolParams = { pattern: 'testPattern' };
+      const params: RipGrepToolParams = { pattern: "testPattern" };
       const invocation = multiDirGrepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' within ./");
     });
 
-    it('should generate correct description with pattern, include, and path', async () => {
-      const dirPath = path.join(tempRootDir, 'src', 'app');
+    it("should generate correct description with pattern, include, and path", async () => {
+      const dirPath = path.join(tempRootDir, "src", "app");
       await fs.mkdir(dirPath, { recursive: true });
       const params: RipGrepToolParams = {
-        pattern: 'testPattern',
-        include: '*.ts',
-        dir_path: path.join('src', 'app'),
+        pattern: "testPattern",
+        include: "*.ts",
+        dir_path: path.join("src", "app"),
       };
       const invocation = grepTool.build(params);
-      expect(invocation.getDescription()).toContain(
-        "'testPattern' in *.ts within",
-      );
-      expect(invocation.getDescription()).toContain(path.join('src', 'app'));
+      expect(invocation.getDescription()).toContain("'testPattern' in *.ts within");
+      expect(invocation.getDescription()).toContain(path.join("src", "app"));
     });
 
-    it('should use ./ for root path in description', () => {
+    it("should use ./ for root path in description", () => {
       const params: RipGrepToolParams = {
-        pattern: 'testPattern',
-        dir_path: '.',
+        pattern: "testPattern",
+        dir_path: ".",
       };
       const invocation = grepTool.build(params);
       expect(invocation.getDescription()).toBe("'testPattern' within ./");
diff --git a/packages/gemini-core/src/tools/ripGrep.ts b/packages/gemini-core/src/tools/ripGrep.ts
index 674fedb55..f78f40162 100644
--- a/packages/gemini-core/src/tools/ripGrep.ts
+++ b/packages/gemini-core/src/tools/ripGrep.ts
@@ -4,30 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import fs from 'node:fs';
-import path from 'node:path';
-import { spawn } from 'node:child_process';
-import { downloadRipGrep } from '@joshua.litt/get-ripgrep';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { SchemaValidator } from '../utils/schemaValidator.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { fileExists } from '../utils/fileUtils.js';
-import { Storage } from '../config/storage.js';
-import { GREP_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import {
-  FileExclusions,
-  COMMON_DIRECTORY_EXCLUDES,
-} from '../utils/ignorePatterns.js';
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { downloadRipGrep } from "@joshua.litt/get-ripgrep";
+import type { Config } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { fileExists } from "../utils/fileUtils.js";
+import { COMMON_DIRECTORY_EXCLUDES, FileExclusions } from "../utils/ignorePatterns.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { SchemaValidator } from "../utils/schemaValidator.js";
+import { GREP_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 const DEFAULT_TOTAL_MAX_MATCHES = 20000;
 
 function getRgCandidateFilenames(): readonly string[] {
-  return process.platform === 'win32' ? ['rg.exe', 'rg'] : ['rg'];
+  return process.platform === "win32" ? ["rg.exe", "rg"] : ["rg"];
 }
 
 async function resolveExistingRgPath(): Promise<string | null> {
@@ -76,7 +73,7 @@ export async function ensureRgPath(): Promise<string> {
   if (downloadedPath) {
     return downloadedPath;
   }
-  throw new Error('Cannot use ripgrep.');
+  throw new Error("Cannot use ripgrep.");
 }
 
 /**
@@ -86,10 +83,7 @@ export async function ensureRgPath(): Promise<string> {
  * @returns The absolute path if valid and exists, or null if no path specified.
  * @throws {Error} If path is outside root, doesn't exist, or isn't a directory/file.
  */
-function resolveAndValidatePath(
-  config: Config,
-  relativePath?: string,
-): string | null {
+function resolveAndValidatePath(config: Config, relativePath?: string): string | null {
   if (!relativePath) {
     return null;
   }
@@ -102,7 +96,7 @@ function resolveAndValidatePath(
   if (!workspaceContext.isPathWithinWorkspace(targetPath)) {
     const directories = workspaceContext.getDirectories();
     throw new Error(
-      `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(', ')}`,
+      `Path validation failed: Attempted path "${relativePath}" resolves outside the allowed workspace directories: ${directories.join(", ")}`,
     );
   }
 
@@ -110,12 +104,10 @@ function resolveAndValidatePath(
   try {
     const stats = fs.statSync(targetPath);
     if (!stats.isDirectory() && !stats.isFile()) {
-      throw new Error(
-        `Path is not a valid directory or file: ${targetPath} (CWD: ${targetDir})`,
-      );
+      throw new Error(`Path is not a valid directory or file: ${targetPath} (CWD: ${targetDir})`);
     }
   } catch (error: unknown) {
-    if (isNodeError(error) && error.code === 'ENOENT') {
+    if (isNodeError(error) && error.code === "ENOENT") {
       throw new Error(`Path does not exist: ${targetPath} (CWD: ${targetDir})`);
     }
     throw new Error(`Failed to access path stats for ${targetPath}: ${error}`);
@@ -183,10 +175,7 @@ interface GrepMatch {
   line: string;
 }
 
-class GrepToolInvocation extends BaseToolInvocation<
-  RipGrepToolParams,
-  ToolResult
-> {
+class GrepToolInvocation extends BaseToolInvocation<RipGrepToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: RipGrepToolParams,
@@ -201,7 +190,7 @@ class GrepToolInvocation extends BaseToolInvocation<
     try {
       // Default to '.' if path is explicitly undefined/null.
       // This forces CWD search instead of 'all workspaces' search by default.
-      const pathParam = this.params.dir_path || '.';
+      const pathParam = this.params.dir_path || ".";
 
       const searchDirAbs = resolveAndValidatePath(this.config, pathParam);
       const searchDirDisplay = pathParam;
@@ -230,7 +219,7 @@ class GrepToolInvocation extends BaseToolInvocation<
 
       const searchLocationDescription = `in path "${searchDirDisplay}"`;
       if (allMatches.length === 0) {
-        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}.`;
+        const noMatchMsg = `No matches found for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}.`;
         return { llmContent: noMatchMsg, returnDisplay: `No matches found` };
       }
 
@@ -250,9 +239,9 @@ class GrepToolInvocation extends BaseToolInvocation<
       );
 
       const matchCount = allMatches.length;
-      const matchTerm = matchCount === 1 ? 'match' : 'matches';
+      const matchTerm = matchCount === 1 ? "match" : "matches";
 
-      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ''}`;
+      let llmContent = `Found ${matchCount} ${matchTerm} for pattern "${this.params.pattern}" ${searchLocationDescription}${this.params.include ? ` (filter: "${this.params.include}")` : ""}`;
 
       if (wasTruncated) {
         llmContent += ` (results limited to ${totalMaxMatches} matches for performance)`;
@@ -266,7 +255,7 @@ class GrepToolInvocation extends BaseToolInvocation<
           const trimmedLine = match.line.trim();
           llmContent += `L${match.lineNumber}: ${trimmedLine}\n`;
         });
-        llmContent += '---\n';
+        llmContent += "---\n";
       }
 
       let displayMessage = `Found ${matchCount} ${matchTerm}`;
@@ -288,21 +277,18 @@ class GrepToolInvocation extends BaseToolInvocation<
     }
   }
 
-  private parseRipgrepJsonOutput(
-    output: string,
-    basePath: string,
-  ): GrepMatch[] {
+  private parseRipgrepJsonOutput(output: string, basePath: string): GrepMatch[] {
     const results: GrepMatch[] = [];
     if (!output) return results;
 
-    const lines = output.trim().split('\n');
+    const lines = output.trim().split("\n");
 
     for (const line of lines) {
       if (!line.trim()) continue;
 
       try {
         const json = JSON.parse(line);
-        if (json.type === 'match') {
+        if (json.type === "match") {
           const match = json.data;
           // Defensive check: ensure text properties exist (skips binary/invalid encoding)
           if (match.path?.text && match.lines?.text) {
@@ -347,49 +333,49 @@ class GrepToolInvocation extends BaseToolInvocation<
       no_ignore,
     } = options;
 
-    const rgArgs = ['--json'];
+    const rgArgs = ["--json"];
 
     if (!case_sensitive) {
-      rgArgs.push('--ignore-case');
+      rgArgs.push("--ignore-case");
     }
 
     if (fixed_strings) {
-      rgArgs.push('--fixed-strings');
+      rgArgs.push("--fixed-strings");
       rgArgs.push(pattern);
     } else {
-      rgArgs.push('--regexp', pattern);
+      rgArgs.push("--regexp", pattern);
     }
 
     if (context) {
-      rgArgs.push('--context', context.toString());
+      rgArgs.push("--context", context.toString());
     }
     if (after) {
-      rgArgs.push('--after-context', after.toString());
+      rgArgs.push("--after-context", after.toString());
     }
     if (before) {
-      rgArgs.push('--before-context', before.toString());
+      rgArgs.push("--before-context", before.toString());
     }
     if (no_ignore) {
-      rgArgs.push('--no-ignore');
+      rgArgs.push("--no-ignore");
     }
 
     if (include) {
-      rgArgs.push('--glob', include);
+      rgArgs.push("--glob", include);
     }
 
     if (!no_ignore) {
       const fileExclusions = new FileExclusions(this.config);
       const excludes = fileExclusions.getGlobExcludes([
         ...COMMON_DIRECTORY_EXCLUDES,
-        '*.log',
-        '*.tmp',
+        "*.log",
+        "*.tmp",
       ]);
       excludes.forEach((exclude) => {
-        rgArgs.push('--glob', `!${exclude}`);
+        rgArgs.push("--glob", `!${exclude}`);
       });
     }
 
-    rgArgs.push('--threads', '4');
+    rgArgs.push("--threads", "4");
     rgArgs.push(absolutePath);
 
     try {
@@ -408,13 +394,13 @@ class GrepToolInvocation extends BaseToolInvocation<
           }
         };
 
-        options.signal.addEventListener('abort', cleanup, { once: true });
+        options.signal.addEventListener("abort", cleanup, { once: true });
 
-        child.stdout.on('data', (chunk) => stdoutChunks.push(chunk));
-        child.stderr.on('data', (chunk) => stderrChunks.push(chunk));
+        child.stdout.on("data", (chunk) => stdoutChunks.push(chunk));
+        child.stderr.on("data", (chunk) => stderrChunks.push(chunk));
 
-        child.on('error', (err) => {
-          options.signal.removeEventListener('abort', cleanup);
+        child.on("error", (err) => {
+          options.signal.removeEventListener("abort", cleanup);
           reject(
             new Error(
               `Failed to start ripgrep: ${err.message}. Please ensure @lvce-editor/ripgrep is properly installed.`,
@@ -422,19 +408,17 @@ class GrepToolInvocation extends BaseToolInvocation<
           );
         });
 
-        child.on('close', (code) => {
-          options.signal.removeEventListener('abort', cleanup);
-          const stdoutData = Buffer.concat(stdoutChunks).toString('utf8');
-          const stderrData = Buffer.concat(stderrChunks).toString('utf8');
+        child.on("close", (code) => {
+          options.signal.removeEventListener("abort", cleanup);
+          const stdoutData = Buffer.concat(stdoutChunks).toString("utf8");
+          const stderrData = Buffer.concat(stderrChunks).toString("utf8");
 
           if (code === 0) {
             resolve(stdoutData);
           } else if (code === 1) {
-            resolve(''); // No matches found
+            resolve(""); // No matches found
           } else {
-            reject(
-              new Error(`ripgrep exited with code ${code}: ${stderrData}`),
-            );
+            reject(new Error(`ripgrep exited with code ${code}: ${stderrData}`));
           }
         });
       });
@@ -456,15 +440,12 @@ class GrepToolInvocation extends BaseToolInvocation<
     if (this.params.include) {
       description += ` in ${this.params.include}`;
     }
-    const pathParam = this.params.dir_path || '.';
+    const pathParam = this.params.dir_path || ".";
     const resolvedPath = path.resolve(this.config.getTargetDir(), pathParam);
-    if (resolvedPath === this.config.getTargetDir() || pathParam === '.') {
+    if (resolvedPath === this.config.getTargetDir() || pathParam === ".") {
       description += ` within ./`;
     } else {
-      const relativePath = makeRelative(
-        resolvedPath,
-        this.config.getTargetDir(),
-      );
+      const relativePath = makeRelative(resolvedPath, this.config.getTargetDir());
       description += ` within ${shortenPath(relativePath)}`;
     }
     return description;
@@ -474,10 +455,7 @@ class GrepToolInvocation extends BaseToolInvocation<
 /**
  * Implementation of the Grep tool logic (moved from CLI)
  */
-export class RipGrepTool extends BaseDeclarativeTool<
-  RipGrepToolParams,
-  ToolResult
-> {
+export class RipGrepTool extends BaseDeclarativeTool<RipGrepToolParams, ToolResult> {
   static readonly Name = GREP_TOOL_NAME;
 
   constructor(
@@ -486,7 +464,7 @@ export class RipGrepTool extends BaseDeclarativeTool<
   ) {
     super(
       RipGrepTool.Name,
-      'SearchText',
+      "SearchText",
       'FAST, optimized search powered by `ripgrep`. PREFERRED over standard `run_shell_command("grep ...")` due to better performance and automatic output limiting (max 20k matches).',
       Kind.Search,
       {
@@ -494,51 +472,51 @@ export class RipGrepTool extends BaseDeclarativeTool<
           pattern: {
             description:
               "The pattern to search for. By default, treated as a Rust-flavored regular expression. Use '\\b' for precise symbol matching (e.g., '\\bMatchMe\\b').",
-            type: 'string',
+            type: "string",
           },
           dir_path: {
             description:
               "Directory or file to search. Directories are searched recursively. Relative paths are resolved against current working directory. Defaults to current working directory ('.') if omitted.",
-            type: 'string',
+            type: "string",
           },
           include: {
             description:
               "Glob pattern to filter files (e.g., '*.ts', 'src/**'). Recommended for large repositories to reduce noise. Defaults to all files if omitted.",
-            type: 'string',
+            type: "string",
           },
           case_sensitive: {
             description:
-              'If true, search is case-sensitive. Defaults to false (ignore case) if omitted.',
-            type: 'boolean',
+              "If true, search is case-sensitive. Defaults to false (ignore case) if omitted.",
+            type: "boolean",
           },
           fixed_strings: {
             description:
-              'If true, treats the `pattern` as a literal string instead of a regular expression. Defaults to false (basic regex) if omitted.',
-            type: 'boolean',
+              "If true, treats the `pattern` as a literal string instead of a regular expression. Defaults to false (basic regex) if omitted.",
+            type: "boolean",
           },
           context: {
             description:
-              'Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.',
-            type: 'integer',
+              "Show this many lines of context around each match (equivalent to grep -C). Defaults to 0 if omitted.",
+            type: "integer",
           },
           after: {
             description:
-              'Show this many lines after each match (equivalent to grep -A). Defaults to 0 if omitted.',
-            type: 'integer',
+              "Show this many lines after each match (equivalent to grep -A). Defaults to 0 if omitted.",
+            type: "integer",
           },
           before: {
             description:
-              'Show this many lines before each match (equivalent to grep -B). Defaults to 0 if omitted.',
-            type: 'integer',
+              "Show this many lines before each match (equivalent to grep -B). Defaults to 0 if omitted.",
+            type: "integer",
           },
           no_ignore: {
             description:
-              'If true, searches all files including those usually ignored (like in .gitignore, build/, dist/, etc). Defaults to false if omitted.',
-            type: 'boolean',
+              "If true, searches all files including those usually ignored (like in .gitignore, build/, dist/, etc). Defaults to false if omitted.",
+            type: "boolean",
           },
         },
-        required: ['pattern'],
-        type: 'object',
+        required: ["pattern"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -552,10 +530,7 @@ export class RipGrepTool extends BaseDeclarativeTool<
    * @returns An error message string if invalid, null otherwise
    */
   override validateToolParams(params: RipGrepToolParams): string | null {
-    const errors = SchemaValidator.validate(
-      this.schema.parametersJsonSchema,
-      params,
-    );
+    const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
     if (errors) {
       return errors;
     }
@@ -578,12 +553,6 @@ export class RipGrepTool extends BaseDeclarativeTool<
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<RipGrepToolParams, ToolResult> {
-    return new GrepToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new GrepToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-core/src/tools/shell.test.ts b/packages/gemini-core/src/tools/shell.test.ts
index 21b027cef..050963c69 100644
--- a/packages/gemini-core/src/tools/shell.test.ts
+++ b/packages/gemini-core/src/tools/shell.test.ts
@@ -4,25 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeAll,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
 
 const mockPlatform = vi.hoisted(() => vi.fn());
 
 const mockShellExecutionService = vi.hoisted(() => vi.fn());
-vi.mock('../services/shellExecutionService.js', () => ({
+vi.mock("../services/shellExecutionService.js", () => ({
   ShellExecutionService: { execute: mockShellExecutionService },
 }));
 
-vi.mock('node:os', async (importOriginal) => {
+vi.mock("node:os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof os>();
   return {
     ...actualOs,
@@ -33,35 +24,31 @@ vi.mock('node:os', async (importOriginal) => {
     platform: mockPlatform,
   };
 });
-vi.mock('crypto');
-vi.mock('../utils/summarizer.js');
-
-import {
-  initializeShellParsers,
-  isCommandAllowed,
-} from '../utils/shell-utils.js';
-import { ShellTool } from './shell.js';
-import { type Config } from '../config/config.js';
+vi.mock("crypto");
+vi.mock("../utils/summarizer.js");
+
+import * as crypto from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import { EOL } from "node:os";
+import * as path from "node:path";
+import { type Config } from "../config/config.js";
 import {
   type ShellExecutionResult,
   type ShellOutputEvent,
-} from '../services/shellExecutionService.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import { EOL } from 'node:os';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import * as summarizer from '../utils/summarizer.js';
-import { ToolErrorType } from './tool-error.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { OUTPUT_UPDATE_INTERVAL_MS } from './shell.js';
-import { SHELL_TOOL_NAME } from './tool-names.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-const originalComSpec = process.env['ComSpec'];
-const itWindowsOnly = process.platform === 'win32' ? it : it.skip;
-
-describe('ShellTool', () => {
+} from "../services/shellExecutionService.js";
+import { initializeShellParsers, isCommandAllowed } from "../utils/shell-utils.js";
+import * as summarizer from "../utils/summarizer.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { OUTPUT_UPDATE_INTERVAL_MS, ShellTool } from "./shell.js";
+import { ToolErrorType } from "./tool-error.js";
+import { SHELL_TOOL_NAME } from "./tool-names.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+
+const originalComSpec = process.env["ComSpec"];
+const itWindowsOnly = process.platform === "win32" ? it : it.skip;
+
+describe("ShellTool", () => {
   beforeAll(async () => {
     await initializeShellParsers();
   });
@@ -75,20 +62,18 @@ describe('ShellTool', () => {
   beforeEach(() => {
     vi.clearAllMocks();
 
-    tempRootDir = fs.mkdtempSync(path.join(os.tmpdir(), 'shell-test-'));
-    fs.mkdirSync(path.join(tempRootDir, 'subdir'));
+    tempRootDir = fs.mkdtempSync(path.join(os.tmpdir(), "shell-test-"));
+    fs.mkdirSync(path.join(tempRootDir, "subdir"));
 
     mockConfig = {
       getAllowedTools: vi.fn().mockReturnValue([]),
-      getApprovalMode: vi.fn().mockReturnValue('strict'),
+      getApprovalMode: vi.fn().mockReturnValue("strict"),
       getCoreTools: vi.fn().mockReturnValue([]),
       getExcludeTools: vi.fn().mockReturnValue(new Set([])),
       getDebugMode: vi.fn().mockReturnValue(false),
       getTargetDir: vi.fn().mockReturnValue(tempRootDir),
       getSummarizeToolOutputConfig: vi.fn().mockReturnValue(undefined),
-      getWorkspaceContext: vi
-        .fn()
-        .mockReturnValue(new WorkspaceContext(tempRootDir)),
+      getWorkspaceContext: vi.fn().mockReturnValue(new WorkspaceContext(tempRootDir)),
       getGeminiClient: vi.fn(),
       getEnableInteractiveShell: vi.fn().mockReturnValue(false),
       isInteractive: vi.fn().mockReturnValue(true),
@@ -96,12 +81,9 @@ describe('ShellTool', () => {
 
     shellTool = new ShellTool(mockConfig);
 
-    mockPlatform.mockReturnValue('linux');
-    (vi.mocked(crypto.randomBytes) as Mock).mockReturnValue(
-      Buffer.from('abcdef', 'hex'),
-    );
-    process.env['ComSpec'] =
-      'C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe';
+    mockPlatform.mockReturnValue("linux");
+    (vi.mocked(crypto.randomBytes) as Mock).mockReturnValue(Buffer.from("abcdef", "hex"));
+    process.env["ComSpec"] = "C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe";
 
     // Capture the output callback to simulate streaming events from the service
     mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
@@ -120,96 +102,85 @@ describe('ShellTool', () => {
       fs.rmSync(tempRootDir, { recursive: true, force: true });
     }
     if (originalComSpec === undefined) {
-      delete process.env['ComSpec'];
+      delete process.env["ComSpec"];
     } else {
-      process.env['ComSpec'] = originalComSpec;
+      process.env["ComSpec"] = originalComSpec;
     }
   });
 
-  describe('isCommandAllowed', () => {
-    it('should allow a command if no restrictions are provided', () => {
+  describe("isCommandAllowed", () => {
+    it("should allow a command if no restrictions are provided", () => {
       (mockConfig.getCoreTools as Mock).mockReturnValue(undefined);
       (mockConfig.getExcludeTools as Mock).mockReturnValue(undefined);
-      expect(isCommandAllowed('goodCommand --safe', mockConfig).allowed).toBe(
-        true,
-      );
+      expect(isCommandAllowed("goodCommand --safe", mockConfig).allowed).toBe(true);
     });
 
-    it('should allow a command with command substitution using $()', () => {
-      const evaluation = isCommandAllowed(
-        'echo $(goodCommand --safe)',
-        mockConfig,
-      );
+    it("should allow a command with command substitution using $()", () => {
+      const evaluation = isCommandAllowed("echo $(goodCommand --safe)", mockConfig);
       expect(evaluation.allowed).toBe(true);
       expect(evaluation.reason).toBeUndefined();
     });
   });
 
-  describe('build', () => {
-    it('should return an invocation for a valid command', () => {
-      const invocation = shellTool.build({ command: 'goodCommand --safe' });
+  describe("build", () => {
+    it("should return an invocation for a valid command", () => {
+      const invocation = shellTool.build({ command: "goodCommand --safe" });
       expect(invocation).toBeDefined();
     });
 
-    it('should throw an error for an empty command', () => {
-      expect(() => shellTool.build({ command: ' ' })).toThrow(
-        'Command cannot be empty.',
-      );
+    it("should throw an error for an empty command", () => {
+      expect(() => shellTool.build({ command: " " })).toThrow("Command cannot be empty.");
     });
 
-    it('should return an invocation for a valid relative directory path', () => {
+    it("should return an invocation for a valid relative directory path", () => {
       const invocation = shellTool.build({
-        command: 'ls',
-        dir_path: 'subdir',
+        command: "ls",
+        dir_path: "subdir",
       });
       expect(invocation).toBeDefined();
     });
 
-    it('should throw an error for a directory outside the workspace', () => {
-      const outsidePath = path.resolve(tempRootDir, '../outside');
-      expect(() =>
-        shellTool.build({ command: 'ls', dir_path: outsidePath }),
-      ).toThrow(
+    it("should throw an error for a directory outside the workspace", () => {
+      const outsidePath = path.resolve(tempRootDir, "../outside");
+      expect(() => shellTool.build({ command: "ls", dir_path: outsidePath })).toThrow(
         `Directory '${outsidePath}' is not within any of the registered workspace directories.`,
       );
     });
 
-    it('should return an invocation for a valid absolute directory path', () => {
+    it("should return an invocation for a valid absolute directory path", () => {
       const invocation = shellTool.build({
-        command: 'ls',
-        dir_path: path.join(tempRootDir, 'subdir'),
+        command: "ls",
+        dir_path: path.join(tempRootDir, "subdir"),
       });
       expect(invocation).toBeDefined();
     });
   });
 
-  describe('execute', () => {
+  describe("execute", () => {
     const mockAbortSignal = new AbortController().signal;
 
-    const resolveShellExecution = (
-      result: Partial<ShellExecutionResult> = {},
-    ) => {
+    const resolveShellExecution = (result: Partial<ShellExecutionResult> = {}) => {
       const fullResult: ShellExecutionResult = {
-        rawOutput: Buffer.from(result.output || ''),
-        output: 'Success',
+        rawOutput: Buffer.from(result.output || ""),
+        output: "Success",
         exitCode: 0,
         signal: null,
         error: null,
         aborted: false,
         pid: 12345,
-        executionMethod: 'child_process',
+        executionMethod: "child_process",
         ...result,
       };
       resolveExecutionPromise(fullResult);
     };
 
-    it('should wrap command on linux and parse pgrep output', async () => {
-      const invocation = shellTool.build({ command: 'my-command &' });
+    it("should wrap command on linux and parse pgrep output", async () => {
+      const invocation = shellTool.build({ command: "my-command &" });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution({ pid: 54321 });
 
       // Simulate pgrep output file creation by the shell command
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       fs.writeFileSync(tmpFile, `54321${EOL}54322${EOL}`);
 
       const result = await promise;
@@ -223,22 +194,22 @@ describe('ShellTool', () => {
         false,
         {},
       );
-      expect(result.llmContent).toContain('Background PIDs: 54322');
+      expect(result.llmContent).toContain("Background PIDs: 54322");
       // The file should be deleted by the tool
       expect(fs.existsSync(tmpFile)).toBe(false);
     });
 
-    it('should use the provided absolute directory as cwd', async () => {
-      const subdir = path.join(tempRootDir, 'subdir');
+    it("should use the provided absolute directory as cwd", async () => {
+      const subdir = path.join(tempRootDir, "subdir");
       const invocation = shellTool.build({
-        command: 'ls',
+        command: "ls",
         dir_path: subdir,
       });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution();
       await promise;
 
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       const wrappedCommand = `{ ls; }; __code=$?; pgrep -g 0 >${tmpFile} 2>&1; exit $__code;`;
       expect(mockShellExecutionService).toHaveBeenCalledWith(
         wrappedCommand,
@@ -250,20 +221,20 @@ describe('ShellTool', () => {
       );
     });
 
-    it('should use the provided relative directory as cwd', async () => {
+    it("should use the provided relative directory as cwd", async () => {
       const invocation = shellTool.build({
-        command: 'ls',
-        dir_path: 'subdir',
+        command: "ls",
+        dir_path: "subdir",
       });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution();
       await promise;
 
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       const wrappedCommand = `{ ls; }; __code=$?; pgrep -g 0 >${tmpFile} 2>&1; exit $__code;`;
       expect(mockShellExecutionService).toHaveBeenCalledWith(
         wrappedCommand,
-        path.join(tempRootDir, 'subdir'),
+        path.join(tempRootDir, "subdir"),
         expect.any(Function),
         mockAbortSignal,
         false,
@@ -272,24 +243,24 @@ describe('ShellTool', () => {
     });
 
     itWindowsOnly(
-      'should not wrap command on windows',
+      "should not wrap command on windows",
       async () => {
-        mockPlatform.mockReturnValue('win32');
-        const invocation = shellTool.build({ command: 'dir' });
+        mockPlatform.mockReturnValue("win32");
+        const invocation = shellTool.build({ command: "dir" });
         const promise = invocation.execute(mockAbortSignal);
         resolveShellExecution({
-          rawOutput: Buffer.from(''),
-          output: '',
+          rawOutput: Buffer.from(""),
+          output: "",
           exitCode: 0,
           signal: null,
           error: null,
           aborted: false,
           pid: 12345,
-          executionMethod: 'child_process',
+          executionMethod: "child_process",
         });
         await promise;
         expect(mockShellExecutionService).toHaveBeenCalledWith(
-          'dir',
+          "dir",
           tempRootDir,
           expect.any(Function),
           mockAbortSignal,
@@ -300,29 +271,29 @@ describe('ShellTool', () => {
       20000,
     );
 
-    it('should format error messages correctly', async () => {
-      const error = new Error('wrapped command failed');
-      const invocation = shellTool.build({ command: 'user-command' });
+    it("should format error messages correctly", async () => {
+      const error = new Error("wrapped command failed");
+      const invocation = shellTool.build({ command: "user-command" });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution({
         error,
         exitCode: 1,
-        output: 'err',
-        rawOutput: Buffer.from('err'),
+        output: "err",
+        rawOutput: Buffer.from("err"),
         signal: null,
         aborted: false,
         pid: 12345,
-        executionMethod: 'child_process',
+        executionMethod: "child_process",
       });
 
       const result = await promise;
-      expect(result.llmContent).toContain('Error: wrapped command failed');
-      expect(result.llmContent).not.toContain('pgrep');
+      expect(result.llmContent).toContain("Error: wrapped command failed");
+      expect(result.llmContent).not.toContain("pgrep");
     });
 
-    it('should return a SHELL_EXECUTE_ERROR for a command failure', async () => {
-      const error = new Error('command failed');
-      const invocation = shellTool.build({ command: 'user-command' });
+    it("should return a SHELL_EXECUTE_ERROR for a command failure", async () => {
+      const error = new Error("command failed");
+      const invocation = shellTool.build({ command: "user-command" });
       const promise = invocation.execute(mockAbortSignal);
       resolveShellExecution({
         error,
@@ -333,87 +304,83 @@ describe('ShellTool', () => {
 
       expect(result.error).toBeDefined();
       expect(result.error?.type).toBe(ToolErrorType.SHELL_EXECUTE_ERROR);
-      expect(result.error?.message).toBe('command failed');
+      expect(result.error?.message).toBe("command failed");
     });
 
-    it('should throw an error for invalid parameters', () => {
-      expect(() => shellTool.build({ command: '' })).toThrow(
-        'Command cannot be empty.',
-      );
+    it("should throw an error for invalid parameters", () => {
+      expect(() => shellTool.build({ command: "" })).toThrow("Command cannot be empty.");
     });
 
-    it('should summarize output when configured', async () => {
+    it("should summarize output when configured", async () => {
       (mockConfig.getSummarizeToolOutputConfig as Mock).mockReturnValue({
         [SHELL_TOOL_NAME]: { tokenBudget: 1000 },
       });
-      vi.mocked(summarizer.summarizeToolOutput).mockResolvedValue(
-        'summarized output',
-      );
+      vi.mocked(summarizer.summarizeToolOutput).mockResolvedValue("summarized output");
 
-      const invocation = shellTool.build({ command: 'ls' });
+      const invocation = shellTool.build({ command: "ls" });
       const promise = invocation.execute(mockAbortSignal);
       resolveExecutionPromise({
-        output: 'long output',
-        rawOutput: Buffer.from('long output'),
+        output: "long output",
+        rawOutput: Buffer.from("long output"),
         exitCode: 0,
         signal: null,
         error: null,
         aborted: false,
         pid: 12345,
-        executionMethod: 'child_process',
+        executionMethod: "child_process",
       });
 
       const result = await promise;
 
       expect(summarizer.summarizeToolOutput).toHaveBeenCalledWith(
         mockConfig,
-        { model: 'summarizer-shell' },
+        { model: "summarizer-shell" },
         expect.any(String),
         mockConfig.getGeminiClient(),
         mockAbortSignal,
       );
-      expect(result.llmContent).toBe('summarized output');
-      expect(result.returnDisplay).toBe('long output');
+      expect(result.llmContent).toBe("summarized output");
+      expect(result.returnDisplay).toBe("long output");
     });
 
-    it('should clean up the temp file on synchronous execution error', async () => {
-      const error = new Error('sync spawn error');
+    it("should clean up the temp file on synchronous execution error", async () => {
+      const error = new Error("sync spawn error");
       mockShellExecutionService.mockImplementation(() => {
         // Create the temp file before throwing to simulate it being left behind
-        const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
-        fs.writeFileSync(tmpFile, '');
+        const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
+        fs.writeFileSync(tmpFile, "");
         throw error;
       });
 
-      const invocation = shellTool.build({ command: 'a-command' });
+      const invocation = shellTool.build({ command: "a-command" });
       await expect(invocation.execute(mockAbortSignal)).rejects.toThrow(error);
 
-      const tmpFile = path.join(os.tmpdir(), 'shell_pgrep_abcdef.tmp');
+      const tmpFile = path.join(os.tmpdir(), "shell_pgrep_abcdef.tmp");
       expect(fs.existsSync(tmpFile)).toBe(false);
     });
 
-    describe('Streaming to `updateOutput`', () => {
+    describe("Streaming to `updateOutput`", () => {
       let updateOutputMock: Mock;
       beforeEach(() => {
-        vi.useFakeTimers({ toFake: ['Date'] });
+        vi.useFakeTimers({ toFake: ["Date"] });
         updateOutputMock = vi.fn();
       });
       afterEach(() => {
         vi.useRealTimers();
       });
 
-      it('should immediately show binary detection message and throttle progress', async () => {
-        const invocation = shellTool.build({ command: 'cat img' });
+      it("should immediately show binary detection message and throttle progress", async () => {
+        const invocation = shellTool.build({ command: "cat img" });
         const promise = invocation.execute(mockAbortSignal, updateOutputMock);
 
-        mockShellOutputCallback({ type: 'binary_detected' });
+        mockShellOutputCallback({ type: "binary_detected" });
         expect(updateOutputMock).toHaveBeenCalledOnce();
         expect(updateOutputMock).toHaveBeenCalledWith(
-          '[Binary output detected. Halting stream...]',
+          "[Binary output detected. Halting stream...]",
         );
 
         mockShellOutputCallback({
-          type: 'binary_progress',
+          type: "binary_progress",
           bytesReceived: 1024,
         });
         expect(updateOutputMock).toHaveBeenCalledOnce();
@@ -423,127 +390,109 @@ describe('ShellTool', () => {
 
         // Send a SECOND progress event. This one will trigger the flush.
         mockShellOutputCallback({
-          type: 'binary_progress',
+          type: "binary_progress",
           bytesReceived: 2048,
         });
 
         // Now it should be called a second time with the latest progress.
         expect(updateOutputMock).toHaveBeenCalledTimes(2);
         expect(updateOutputMock).toHaveBeenLastCalledWith(
-          '[Receiving binary output... 2.0 KB received]',
+          "[Receiving binary output... 2.0 KB received]",
         );
 
         resolveExecutionPromise({
-          rawOutput: Buffer.from(''),
-          output: '',
+          rawOutput: Buffer.from(""),
+          output: "",
           exitCode: 0,
           signal: null,
           error: null,
           aborted: false,
           pid: 12345,
-          executionMethod: 'child_process',
+          executionMethod: "child_process",
         });
         await promise;
       });
     });
   });
 
-  describe('shouldConfirmExecute', () => {
+  describe("shouldConfirmExecute", () => {
     it('should request confirmation for a new command and allowlist it on "Always"', async () => {
-      const params = { command: 'npm install' };
+      const params = { command: "npm install" };
       const invocation = shellTool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(confirmation).not.toBe(false);
-      expect(confirmation && confirmation.type).toBe('exec');
+      expect(confirmation && confirmation.type).toBe("exec");
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      await (confirmation as any).onConfirm(
-        ToolConfirmationOutcome.ProceedAlways,
-      );
+      await (confirmation as any).onConfirm(ToolConfirmationOutcome.ProceedAlways);
 
       // Should now be allowlisted
-      const secondInvocation = shellTool.build({ command: 'npm test' });
+      const secondInvocation = shellTool.build({ command: "npm test" });
       const secondConfirmation = await secondInvocation.shouldConfirmExecute(
         new AbortController().signal,
       );
       expect(secondConfirmation).toBe(false);
     });
 
-    it('should throw an error if validation fails', () => {
-      expect(() => shellTool.build({ command: '' })).toThrow();
+    it("should throw an error if validation fails", () => {
+      expect(() => shellTool.build({ command: "" })).toThrow();
     });
 
-    describe('in non-interactive mode', () => {
+    describe("in non-interactive mode", () => {
       beforeEach(() => {
         (mockConfig.isInteractive as Mock).mockReturnValue(false);
       });
 
-      it('should not throw an error or block for an allowed command', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue(['ShellTool(wc)']);
-        const invocation = shellTool.build({ command: 'wc -l foo.txt' });
-        const confirmation = await invocation.shouldConfirmExecute(
-          new AbortController().signal,
-        );
+      it("should not throw an error or block for an allowed command", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc)"]);
+        const invocation = shellTool.build({ command: "wc -l foo.txt" });
+        const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
         expect(confirmation).toBe(false);
       });
 
-      it('should not throw an error or block for an allowed command with arguments', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(wc -l)',
-        ]);
-        const invocation = shellTool.build({ command: 'wc -l foo.txt' });
-        const confirmation = await invocation.shouldConfirmExecute(
-          new AbortController().signal,
-        );
+      it("should not throw an error or block for an allowed command with arguments", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc -l)"]);
+        const invocation = shellTool.build({ command: "wc -l foo.txt" });
+        const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
         expect(confirmation).toBe(false);
       });
 
-      it('should throw an error for command that is not allowed', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(wc -l)',
-        ]);
-        const invocation = shellTool.build({ command: 'madeupcommand' });
-        await expect(
-          invocation.shouldConfirmExecute(new AbortController().signal),
-        ).rejects.toThrow('madeupcommand');
+      it("should throw an error for command that is not allowed", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc -l)"]);
+        const invocation = shellTool.build({ command: "madeupcommand" });
+        await expect(invocation.shouldConfirmExecute(new AbortController().signal)).rejects.toThrow(
+          "madeupcommand",
+        );
       });
 
-      it('should throw an error for a command that is a prefix of an allowed command', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(wc -l)',
-        ]);
-        const invocation = shellTool.build({ command: 'wc' });
-        await expect(
-          invocation.shouldConfirmExecute(new AbortController().signal),
-        ).rejects.toThrow('wc');
+      it("should throw an error for a command that is a prefix of an allowed command", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(wc -l)"]);
+        const invocation = shellTool.build({ command: "wc" });
+        await expect(invocation.shouldConfirmExecute(new AbortController().signal)).rejects.toThrow(
+          "wc",
+        );
       });
 
-      it('should require all segments of a chained command to be allowlisted', async () => {
-        (mockConfig.getAllowedTools as Mock).mockReturnValue([
-          'ShellTool(echo)',
-        ]);
+      it("should require all segments of a chained command to be allowlisted", async () => {
+        (mockConfig.getAllowedTools as Mock).mockReturnValue(["ShellTool(echo)"]);
         const invocation = shellTool.build({ command: 'echo "foo" && ls -l' });
-        await expect(
-          invocation.shouldConfirmExecute(new AbortController().signal),
-        ).rejects.toThrow(
+        await expect(invocation.shouldConfirmExecute(new AbortController().signal)).rejects.toThrow(
           'Command "echo "foo" && ls -l" is not in the list of allowed tools for non-interactive mode.',
         );
       });
     });
   });
 
-  describe('getDescription', () => {
-    it('should return the windows description when on windows', () => {
-      mockPlatform.mockReturnValue('win32');
+  describe("getDescription", () => {
+    it("should return the windows description when on windows", () => {
+      mockPlatform.mockReturnValue("win32");
       const shellTool = new ShellTool(mockConfig);
       expect(shellTool.description).toMatchSnapshot();
     });
 
-    it('should return the non-windows description when not on windows', () => {
-      mockPlatform.mockReturnValue('linux');
+    it("should return the non-windows description when not on windows", () => {
+      mockPlatform.mockReturnValue("linux");
       const shellTool = new ShellTool(mockConfig);
       expect(shellTool.description).toMatchSnapshot();
     });
diff --git a/packages/gemini-core/src/tools/shell.ts b/packages/gemini-core/src/tools/shell.ts
index 99fd7cd61..a09ad658b 100644
--- a/packages/gemini-core/src/tools/shell.ts
+++ b/packages/gemini-core/src/tools/shell.ts
@@ -4,45 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import os, { EOL } from 'node:os';
-import crypto from 'node:crypto';
-import type { Config } from '../config/config.js';
-import { debugLogger, type AnyToolInvocation } from '../index.js';
-import { ToolErrorType } from './tool-error.js';
-import type {
-  ToolInvocation,
-  ToolResult,
-  ToolCallConfirmationDetails,
-  ToolExecuteConfirmationDetails,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  ToolConfirmationOutcome,
-  Kind,
-} from './tools.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import { getErrorMessage } from '../utils/errors.js';
-import { summarizeToolOutput } from '../utils/summarizer.js';
-import type {
-  ShellExecutionConfig,
-  ShellOutputEvent,
-} from '../services/shellExecutionService.js';
-import { ShellExecutionService } from '../services/shellExecutionService.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
+import crypto from "node:crypto";
+import fs from "node:fs";
+import os, { EOL } from "node:os";
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { type AnyToolInvocation, debugLogger } from "../index.js";
+import { ApprovalMode } from "../policy/types.js";
+import type { ShellExecutionConfig, ShellOutputEvent } from "../services/shellExecutionService.js";
+import { ShellExecutionService } from "../services/shellExecutionService.js";
+
+import { getErrorMessage } from "../utils/errors.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
 import {
   getCommandRoots,
   initializeShellParsers,
   isCommandAllowed,
   isShellInvocationAllowlisted,
   stripShellWrapper,
-} from '../utils/shell-utils.js';
-import { SHELL_TOOL_NAME } from './tool-names.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+} from "../utils/shell-utils.js";
+import { summarizeToolOutput } from "../utils/summarizer.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { ToolErrorType } from "./tool-error.js";
+import { SHELL_TOOL_NAME } from "./tool-names.js";
+import type {
+  ToolCallConfirmationDetails,
+  ToolExecuteConfirmationDetails,
+  ToolInvocation,
+  ToolResult,
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 
@@ -52,10 +44,7 @@ export interface ShellToolParams {
   dir_path?: string;
 }
 
-export class ShellToolInvocation extends BaseToolInvocation<
-  ShellToolParams,
-  ToolResult
-> {
+export class ShellToolInvocation extends BaseToolInvocation<ShellToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: ShellToolParams,
@@ -78,7 +67,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
     }
     // append optional (description), replacing any line breaks with spaces
     if (this.params.description) {
-      description += ` (${this.params.description.replace(/\n/g, ' ')})`;
+      description += ` (${this.params.description.replace(/\n/g, " ")})`;
     }
     return description;
   }
@@ -93,10 +82,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
     // waiting for user input. If a tool is not fully allowed (e.g. via
     // --allowed-tools="ShellTool(wc)"), we should throw an error instead of
     // prompting for confirmation. This check is skipped in YOLO mode.
-    if (
-      !this.config.isInteractive() &&
-      this.config.getApprovalMode() !== ApprovalMode.YOLO
-    ) {
+    if (!this.config.isInteractive() && this.config.getApprovalMode() !== ApprovalMode.YOLO) {
       if (this.isInvocationAllowlisted(command)) {
         // If it's an allowed shell command, we don't need to confirm execution.
         return false;
@@ -107,19 +93,17 @@ export class ShellToolInvocation extends BaseToolInvocation<
       );
     }
 
-    const commandsToConfirm = rootCommands.filter(
-      (command) => !this.allowlist.has(command),
-    );
+    const commandsToConfirm = rootCommands.filter((command) => !this.allowlist.has(command));
 
     if (commandsToConfirm.length === 0) {
       return false; // already approved and allowlisted
     }
 
     const confirmationDetails: ToolExecuteConfirmationDetails = {
-      type: 'exec',
-      title: 'Confirm Shell Command',
+      type: "exec",
+      title: "Confirm Shell Command",
       command: this.params.command,
-      rootCommand: commandsToConfirm.join(', '),
+      rootCommand: commandsToConfirm.join(", "),
       onConfirm: async (outcome: ToolConfirmationOutcome) => {
         if (outcome === ToolConfirmationOutcome.ProceedAlways) {
           commandsToConfirm.forEach((command) => this.allowlist.add(command));
@@ -139,15 +123,13 @@ export class ShellToolInvocation extends BaseToolInvocation<
 
     if (signal.aborted) {
       return {
-        llmContent: 'Command was cancelled by user before it could start.',
-        returnDisplay: 'Command cancelled by user.',
+        llmContent: "Command was cancelled by user before it could start.",
+        returnDisplay: "Command cancelled by user.",
       };
     }
 
-    const isWindows = os.platform() === 'win32';
-    const tempFileName = `shell_pgrep_${crypto
-      .randomBytes(6)
-      .toString('hex')}.tmp`;
+    const isWindows = os.platform() === "win32";
+    const tempFileName = `shell_pgrep_${crypto.randomBytes(6).toString("hex")}.tmp`;
     const tempFilePath = path.join(os.tmpdir(), tempFileName);
 
     try {
@@ -157,7 +139,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
         : (() => {
             // wrap command to append subprocess pids (via pgrep) to temporary file
             let command = strippedCommand.trim();
-            if (!command.endsWith('&')) command += ';';
+            if (!command.endsWith("&")) command += ";";
             return `{ ${command} }; __code=$?; pgrep -g 0 >${tempFilePath} 2>&1; exit $__code;`;
           })();
 
@@ -165,56 +147,54 @@ export class ShellToolInvocation extends BaseToolInvocation<
         ? path.resolve(this.config.getTargetDir(), this.params.dir_path)
         : this.config.getTargetDir();
 
-      let cumulativeOutput: string | AnsiOutput = '';
+      let cumulativeOutput: string | AnsiOutput = "";
       let lastUpdateTime = Date.now();
       let isBinaryStream = false;
 
-      const { result: resultPromise, pid } =
-        await ShellExecutionService.execute(
-          commandToExecute,
-          cwd,
-          (event: ShellOutputEvent) => {
-            if (!updateOutput) {
-              return;
-            }
-
-            let shouldUpdate = false;
+      const { result: resultPromise, pid } = await ShellExecutionService.execute(
+        commandToExecute,
+        cwd,
+        (event: ShellOutputEvent) => {
+          if (!updateOutput) {
+            return;
+          }
 
-            switch (event.type) {
-              case 'data':
-                if (isBinaryStream) break;
-                cumulativeOutput = event.chunk;
+          let shouldUpdate = false;
+
+          switch (event.type) {
+            case "data":
+              if (isBinaryStream) break;
+              cumulativeOutput = event.chunk;
+              shouldUpdate = true;
+              break;
+            case "binary_detected":
+              isBinaryStream = true;
+              cumulativeOutput = "[Binary output detected. Halting stream...]";
+              shouldUpdate = true;
+              break;
+            case "binary_progress":
+              isBinaryStream = true;
+              cumulativeOutput = `[Receiving binary output... ${formatMemoryUsage(
+                event.bytesReceived,
+              )} received]`;
+              if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
                 shouldUpdate = true;
-                break;
-              case 'binary_detected':
-                isBinaryStream = true;
-                cumulativeOutput =
-                  '[Binary output detected. Halting stream...]';
-                shouldUpdate = true;
-                break;
-              case 'binary_progress':
-                isBinaryStream = true;
-                cumulativeOutput = `[Receiving binary output... ${formatMemoryUsage(
-                  event.bytesReceived,
-                )} received]`;
-                if (Date.now() - lastUpdateTime > OUTPUT_UPDATE_INTERVAL_MS) {
-                  shouldUpdate = true;
-                }
-                break;
-              default: {
-                throw new Error('An unhandled ShellOutputEvent was found.');
               }
+              break;
+            default: {
+              throw new Error("An unhandled ShellOutputEvent was found.");
             }
+          }
 
-            if (shouldUpdate) {
-              updateOutput(cumulativeOutput);
-              lastUpdateTime = Date.now();
-            }
-          },
-          signal,
-          this.config.getEnableInteractiveShell(),
-          shellExecutionConfig ?? {},
-        );
+          if (shouldUpdate) {
+            updateOutput(cumulativeOutput);
+            lastUpdateTime = Date.now();
+          }
+        },
+        signal,
+        this.config.getEnableInteractiveShell(),
+        shellExecutionConfig ?? {},
+      );
 
       if (pid && setPidCallback) {
         setPidCallback(pid);
@@ -223,12 +203,9 @@ export class ShellToolInvocation extends BaseToolInvocation<
       const result = await resultPromise;
 
       const backgroundPIDs: number[] = [];
-      if (os.platform() !== 'win32') {
+      if (os.platform() !== "win32") {
         if (fs.existsSync(tempFilePath)) {
-          const pgrepLines = fs
-            .readFileSync(tempFilePath, 'utf8')
-            .split(EOL)
-            .filter(Boolean);
+          const pgrepLines = fs.readFileSync(tempFilePath, "utf8").split(EOL).filter(Boolean);
           for (const line of pgrepLines) {
             if (!/^\d+$/.test(line)) {
               debugLogger.error(`pgrep: ${line}`);
@@ -240,41 +217,39 @@ export class ShellToolInvocation extends BaseToolInvocation<
           }
         } else {
           if (!signal.aborted) {
-            debugLogger.error('missing pgrep output');
+            debugLogger.error("missing pgrep output");
           }
         }
       }
 
-      let llmContent = '';
+      let llmContent = "";
       if (result.aborted) {
-        llmContent = 'Command was cancelled by user before it could complete.';
+        llmContent = "Command was cancelled by user before it could complete.";
         if (result.output.trim()) {
           llmContent += ` Below is the output before it was cancelled:\n${result.output}`;
         } else {
-          llmContent += ' There was no output before it was cancelled.';
+          llmContent += " There was no output before it was cancelled.";
         }
       } else {
         // Create a formatted error string for display, replacing the wrapper command
         // with the user-facing command.
         const finalError = result.error
           ? result.error.message.replace(commandToExecute, this.params.command)
-          : '(none)';
+          : "(none)";
 
         llmContent = [
           `Command: ${this.params.command}`,
-          `Directory: ${this.params.dir_path || '(root)'}`,
-          `Output: ${result.output || '(empty)'}`,
+          `Directory: ${this.params.dir_path || "(root)"}`,
+          `Output: ${result.output || "(empty)"}`,
           `Error: ${finalError}`, // Use the cleaned error string.
-          `Exit Code: ${result.exitCode ?? '(none)'}`,
-          `Signal: ${result.signal ?? '(none)'}`,
-          `Background PIDs: ${
-            backgroundPIDs.length ? backgroundPIDs.join(', ') : '(none)'
-          }`,
-          `Process Group PGID: ${result.pid ?? '(none)'}`,
-        ].join('\n');
+          `Exit Code: ${result.exitCode ?? "(none)"}`,
+          `Signal: ${result.signal ?? "(none)"}`,
+          `Background PIDs: ${backgroundPIDs.length ? backgroundPIDs.join(", ") : "(none)"}`,
+          `Process Group PGID: ${result.pid ?? "(none)"}`,
+        ].join("\n");
       }
 
-      let returnDisplayMessage = '';
+      let returnDisplayMessage = "";
       if (this.config.getDebugMode()) {
         returnDisplayMessage = llmContent;
       } else {
@@ -282,13 +257,11 @@ export class ShellToolInvocation extends BaseToolInvocation<
           returnDisplayMessage = result.output;
         } else {
           if (result.aborted) {
-            returnDisplayMessage = 'Command cancelled by user.';
+            returnDisplayMessage = "Command cancelled by user.";
           } else if (result.signal) {
             returnDisplayMessage = `Command terminated by signal: ${result.signal}`;
           } else if (result.error) {
-            returnDisplayMessage = `Command failed: ${getErrorMessage(
-              result.error,
-            )}`;
+            returnDisplayMessage = `Command failed: ${getErrorMessage(result.error)}`;
           } else if (result.exitCode !== null && result.exitCode !== 0) {
             returnDisplayMessage = `Command exited with code: ${result.exitCode}`;
           }
@@ -309,7 +282,7 @@ export class ShellToolInvocation extends BaseToolInvocation<
       if (summarizeConfig && summarizeConfig[SHELL_TOOL_NAME]) {
         const summary = await summarizeToolOutput(
           this.config,
-          { model: 'summarizer-shell' },
+          { model: "summarizer-shell" },
           llmContent,
           this.config.getGeminiClient(),
           signal,
@@ -359,7 +332,7 @@ function getShellToolDescription(): string {
       Background PIDs: List of background processes started or \`(none)\`.
       Process Group PGID: Process group started or \`(none)\``;
 
-  if (os.platform() === 'win32') {
+  if (os.platform() === "win32") {
     return `This tool executes a given shell command as \`powershell.exe -NoProfile -Command <command>\`. Command can start background processes using PowerShell constructs such as \`Start-Process -NoNewWindow\` or \`Start-Job\`.${returnedInfo}`;
   } else {
     return `This tool executes a given shell command as \`bash -c <command>\`. Command can start background processes using \`&\`. Command is executed as a subprocess that leads its own process group. Command process group can be terminated as \`kill -- -PGID\` or signaled as \`kill -s SIGNAL -- -PGID\`.${returnedInfo}`;
@@ -367,17 +340,14 @@ function getShellToolDescription(): string {
 }
 
 function getCommandDescription(): string {
-  if (os.platform() === 'win32') {
-    return 'Exact command to execute as `powershell.exe -NoProfile -Command <command>`';
+  if (os.platform() === "win32") {
+    return "Exact command to execute as `powershell.exe -NoProfile -Command <command>`";
   } else {
-    return 'Exact bash command to execute as `bash -c <command>`';
+    return "Exact bash command to execute as `bash -c <command>`";
   }
 }
 
-export class ShellTool extends BaseDeclarativeTool<
-  ShellToolParams,
-  ToolResult
-> {
+export class ShellTool extends BaseDeclarativeTool<ShellToolParams, ToolResult> {
   static readonly Name = SHELL_TOOL_NAME;
 
   private allowlist: Set<string> = new Set();
@@ -391,28 +361,28 @@ export class ShellTool extends BaseDeclarativeTool<
     });
     super(
       ShellTool.Name,
-      'Shell',
+      "Shell",
       getShellToolDescription(),
       Kind.Execute,
       {
-        type: 'object',
+        type: "object",
         properties: {
           command: {
-            type: 'string',
+            type: "string",
             description: getCommandDescription(),
           },
           description: {
-            type: 'string',
+            type: "string",
             description:
-              'Brief description of the command for the user. Be specific and concise. Ideally a single sentence. Can be up to 3 sentences for clarity. No line breaks.',
+              "Brief description of the command for the user. Be specific and concise. Ideally a single sentence. Can be up to 3 sentences for clarity. No line breaks.",
           },
           dir_path: {
-            type: 'string',
+            type: "string",
             description:
-              '(OPTIONAL) The path of the directory to run the command in. If not provided, the project root directory is used. Must be a directory within the workspace and must already exist.',
+              "(OPTIONAL) The path of the directory to run the command in. If not provided, the project root directory is used. Must be a directory within the workspace and must already exist.",
           },
         },
-        required: ['command'],
+        required: ["command"],
       },
       false, // output is not markdown
       true, // output can be updated
@@ -420,31 +390,24 @@ export class ShellTool extends BaseDeclarativeTool<
     );
   }
 
-  protected override validateToolParamValues(
-    params: ShellToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: ShellToolParams): string | null {
     if (!params.command.trim()) {
-      return 'Command cannot be empty.';
+      return "Command cannot be empty.";
     }
 
     const commandCheck = isCommandAllowed(params.command, this.config);
     if (!commandCheck.allowed) {
       if (!commandCheck.reason) {
-        debugLogger.error(
-          'Unexpected: isCommandAllowed returned false without a reason',
-        );
+        debugLogger.error("Unexpected: isCommandAllowed returned false without a reason");
         return `Command is not allowed: ${params.command}`;
       }
       return commandCheck.reason;
     }
     if (getCommandRoots(params.command).length === 0) {
-      return 'Could not identify command root to obtain permission from user.';
+      return "Could not identify command root to obtain permission from user.";
     }
     if (params.dir_path) {
-      const resolvedPath = path.resolve(
-        this.config.getTargetDir(),
-        params.dir_path,
-      );
+      const resolvedPath = path.resolve(this.config.getTargetDir(), params.dir_path);
       const workspaceContext = this.config.getWorkspaceContext();
       if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
         return `Directory '${resolvedPath}' is not within any of the registered workspace directories.`;
diff --git a/packages/gemini-core/src/tools/smart-edit.test.ts b/packages/gemini-core/src/tools/smart-edit.test.ts
index f2aac0c50..4ad89c86c 100644
--- a/packages/gemini-core/src/tools/smart-edit.test.ts
+++ b/packages/gemini-core/src/tools/smart-edit.test.ts
@@ -10,56 +10,44 @@ const mockFixLLMEditWithInstruction = vi.hoisted(() => vi.fn());
 const mockGenerateJson = vi.hoisted(() => vi.fn());
 const mockOpenDiff = vi.hoisted(() => vi.fn());
 
-import { IdeClient } from '../ide/ide-client.js';
+import { IdeClient } from "../ide/ide-client.js";
 
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn(),
   },
 }));
 
-vi.mock('../utils/llm-edit-fixer.js', () => ({
+vi.mock("../utils/llm-edit-fixer.js", () => ({
   FixLLMEditWithInstruction: mockFixLLMEditWithInstruction,
 }));
 
-vi.mock('../core/client.js', () => ({
+vi.mock("../core/client.js", () => ({
   GeminiClient: vi.fn().mockImplementation(() => ({
     generateJson: mockGenerateJson,
     getHistory: vi.fn().mockResolvedValue([]),
   })),
 }));
 
-vi.mock('../utils/editor.js', () => ({
+vi.mock("../utils/editor.js", () => ({
   openDiff: mockOpenDiff,
 }));
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  vi,
-  type Mock,
-} from 'vitest';
-import {
-  SmartEditTool,
-  type EditToolParams,
-  calculateReplacement,
-} from './smart-edit.js';
-import { type FileDiff, ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import { ApprovalMode } from '../policy/types.js';
-import { type Config } from '../config/config.js';
-import { type Content, type Part, type SchemaUnion } from '@google/genai';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-
-describe('SmartEditTool', () => {
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { type Content, type Part, type SchemaUnion } from "@google/genai";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { ApprovalMode } from "../policy/types.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import { calculateReplacement, type EditToolParams, SmartEditTool } from "./smart-edit.js";
+import { ToolErrorType } from "./tool-error.js";
+import { type FileDiff, ToolConfirmationOutcome } from "./tools.js";
+
+describe("SmartEditTool", () => {
   let tool: SmartEditTool;
   let tempDir: string;
   let rootDir: string;
@@ -70,8 +58,8 @@ describe('SmartEditTool', () => {
 
   beforeEach(() => {
     vi.restoreAllMocks();
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'smart-edit-tool-test-'));
-    rootDir = path.join(tempDir, 'root');
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "smart-edit-tool-test-"));
+    rootDir = path.join(tempDir, "root");
     fs.mkdirSync(rootDir);
 
     geminiClient = {
@@ -87,8 +75,8 @@ describe('SmartEditTool', () => {
 
     mockConfig = {
       getUsageStatisticsEnabled: vi.fn(() => true),
-      getSessionId: vi.fn(() => 'mock-session-id'),
-      getContentGeneratorConfig: vi.fn(() => ({ authType: 'mock' })),
+      getSessionId: vi.fn(() => "mock-session-id"),
+      getContentGeneratorConfig: vi.fn(() => ({ authType: "mock" })),
       getUseSmartEdit: vi.fn(() => false),
       getUseModelRouter: vi.fn(() => false),
       getProxy: vi.fn(() => undefined),
@@ -100,8 +88,8 @@ describe('SmartEditTool', () => {
       getWorkspaceContext: () => createMockWorkspaceContext(rootDir),
       getFileSystemService: () => fileSystemService,
       getIdeMode: () => false,
-      getApiKey: () => 'test-api-key',
-      getModel: () => 'test-model',
+      getApiKey: () => "test-api-key",
+      getModel: () => "test-model",
       getSandbox: () => false,
       getDebugMode: () => false,
       getQuestion: () => undefined,
@@ -110,8 +98,8 @@ describe('SmartEditTool', () => {
       getToolCallCommand: () => undefined,
       getMcpServerCommand: () => undefined,
       getMcpServers: () => undefined,
-      getUserAgent: () => 'test-agent',
-      getUserMemory: () => '',
+      getUserAgent: () => "test-agent",
+      getUserMemory: () => "",
       setUserMemory: vi.fn(),
       getGeminiMdFileCount: () => 0,
       setGeminiMdFileCount: vi.fn(),
@@ -125,46 +113,39 @@ describe('SmartEditTool', () => {
     mockFixLLMEditWithInstruction.mockReset();
     mockFixLLMEditWithInstruction.mockResolvedValue({
       noChangesRequired: false,
-      search: '',
-      replace: '',
-      explanation: 'LLM fix failed',
+      search: "",
+      replace: "",
+      explanation: "LLM fix failed",
     });
 
     mockGenerateJson.mockReset();
-    mockGenerateJson.mockImplementation(
-      async (contents: Content[], schema: SchemaUnion) => {
-        const userContent = contents.find((c: Content) => c.role === 'user');
-        let promptText = '';
-        if (userContent && userContent.parts) {
-          promptText = userContent.parts
-            .filter((p: Part) => typeof (p as any).text === 'string')
-            .map((p: Part) => (p as any).text)
-            .join('\n');
-        }
-        const snippetMatch = promptText.match(
-          /Problematic target snippet:\n```\n([\s\S]*?)\n```/,
-        );
-        const problematicSnippet =
-          snippetMatch && snippetMatch[1] ? snippetMatch[1] : '';
+    mockGenerateJson.mockImplementation(async (contents: Content[], schema: SchemaUnion) => {
+      const userContent = contents.find((c: Content) => c.role === "user");
+      let promptText = "";
+      if (userContent && userContent.parts) {
+        promptText = userContent.parts
+          .filter((p: Part) => typeof (p as any).text === "string")
+          .map((p: Part) => (p as any).text)
+          .join("\n");
+      }
+      const snippetMatch = promptText.match(/Problematic target snippet:\n```\n([\s\S]*?)\n```/);
+      const problematicSnippet = snippetMatch && snippetMatch[1] ? snippetMatch[1] : "";
 
-        if (((schema as any).properties as any)?.corrected_target_snippet) {
-          return Promise.resolve({
-            corrected_target_snippet: problematicSnippet,
-          });
-        }
-        if (((schema as any).properties as any)?.corrected_new_string) {
-          const originalNewStringMatch = promptText.match(
-            /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
-          );
-          const originalNewString =
-            originalNewStringMatch && originalNewStringMatch[1]
-              ? originalNewStringMatch[1]
-              : '';
-          return Promise.resolve({ corrected_new_string: originalNewString });
-        }
-        return Promise.resolve({});
-      },
-    );
+      if (((schema as any).properties as any)?.corrected_target_snippet) {
+        return Promise.resolve({
+          corrected_target_snippet: problematicSnippet,
+        });
+      }
+      if (((schema as any).properties as any)?.corrected_new_string) {
+        const originalNewStringMatch = promptText.match(
+          /original_new_string \(what was intended to replace original_old_string\):\n```\n([\s\S]*?)\n```/,
+        );
+        const originalNewString =
+          originalNewStringMatch && originalNewStringMatch[1] ? originalNewStringMatch[1] : "";
+        return Promise.resolve({ corrected_new_string: originalNewString });
+      }
+      return Promise.resolve({});
+    });
 
     tool = new SmartEditTool(mockConfig);
   });
@@ -173,49 +154,49 @@ describe('SmartEditTool', () => {
     fs.rmSync(tempDir, { recursive: true, force: true });
   });
 
-  describe('calculateReplacement', () => {
+  describe("calculateReplacement", () => {
     const abortSignal = new AbortController().signal;
 
-    it('should perform an exact replacement', async () => {
-      const content = 'hello world';
+    it("should perform an exact replacement", async () => {
+      const content = "hello world";
       const result = await calculateReplacement(mockConfig, {
         params: {
-          file_path: 'test.txt',
-          instruction: 'test',
-          old_string: 'world',
-          new_string: 'moon',
+          file_path: "test.txt",
+          instruction: "test",
+          old_string: "world",
+          new_string: "moon",
         },
         currentContent: content,
         abortSignal,
       });
-      expect(result.newContent).toBe('hello moon');
+      expect(result.newContent).toBe("hello moon");
       expect(result.occurrences).toBe(1);
     });
 
-    it('should perform a flexible, whitespace-insensitive replacement', async () => {
-      const content = '  hello\n    world\n';
+    it("should perform a flexible, whitespace-insensitive replacement", async () => {
+      const content = "  hello\n    world\n";
       const result = await calculateReplacement(mockConfig, {
         params: {
-          file_path: 'test.txt',
-          instruction: 'test',
-          old_string: 'hello\nworld',
-          new_string: 'goodbye\nmoon',
+          file_path: "test.txt",
+          instruction: "test",
+          old_string: "hello\nworld",
+          new_string: "goodbye\nmoon",
         },
         currentContent: content,
         abortSignal,
       });
-      expect(result.newContent).toBe('  goodbye\n  moon\n');
+      expect(result.newContent).toBe("  goodbye\n  moon\n");
       expect(result.occurrences).toBe(1);
     });
 
-    it('should return 0 occurrences if no match is found', async () => {
-      const content = 'hello world';
+    it("should return 0 occurrences if no match is found", async () => {
+      const content = "hello world";
       const result = await calculateReplacement(mockConfig, {
         params: {
-          file_path: 'test.txt',
-          instruction: 'test',
-          old_string: 'nomatch',
-          new_string: 'moon',
+          file_path: "test.txt",
+          instruction: "test",
+          old_string: "nomatch",
+          new_string: "moon",
         },
         currentContent: content,
         abortSignal,
@@ -224,46 +205,45 @@ describe('SmartEditTool', () => {
       expect(result.occurrences).toBe(0);
     });
 
-    it('should perform a regex-based replacement for flexible intra-line whitespace', async () => {
+    it("should perform a regex-based replacement for flexible intra-line whitespace", async () => {
       // This case would fail with the previous exact and line-trimming flexible logic
       // because the whitespace *within* the line is different.
-      const content = '  function  myFunc( a, b ) {\n    return a + b;\n  }';
+      const content = "  function  myFunc( a, b ) {\n    return a + b;\n  }";
       const result = await calculateReplacement(mockConfig, {
         params: {
-          file_path: 'test.js',
-          instruction: 'test',
-          old_string: 'function myFunc(a, b) {', // Note the normalized whitespace
-          new_string: 'const yourFunc = (a, b) => {',
+          file_path: "test.js",
+          instruction: "test",
+          old_string: "function myFunc(a, b) {", // Note the normalized whitespace
+          new_string: "const yourFunc = (a, b) => {",
         },
         currentContent: content,
         abortSignal,
       });
 
       // The indentation from the original line should be preserved and applied to the new string.
-      const expectedContent =
-        '  const yourFunc = (a, b) => {\n    return a + b;\n  }';
+      const expectedContent = "  const yourFunc = (a, b) => {\n    return a + b;\n  }";
       expect(result.newContent).toBe(expectedContent);
       expect(result.occurrences).toBe(1);
     });
   });
 
-  describe('validateToolParams', () => {
-    it('should return null for valid params', () => {
+  describe("validateToolParams", () => {
+    it("should return null for valid params", () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'test.txt'),
-        instruction: 'An instruction',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "test.txt"),
+        instruction: "An instruction",
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(params)).toBeNull();
     });
 
-    it('should return an error if path is outside the workspace', () => {
+    it("should return an error if path is outside the workspace", () => {
       const params: EditToolParams = {
-        file_path: path.join(os.tmpdir(), 'outside.txt'),
-        instruction: 'An instruction',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(os.tmpdir(), "outside.txt"),
+        instruction: "An instruction",
+        old_string: "old",
+        new_string: "new",
       };
       expect(tool.validateToolParams(params)).toMatch(
         /must be within one of the workspace directories/,
@@ -271,30 +251,28 @@ describe('SmartEditTool', () => {
     });
   });
 
-  describe('execute', () => {
-    const testFile = 'execute_me.txt';
+  describe("execute", () => {
+    const testFile = "execute_me.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should reject when calculateEdit fails after an abort signal', async () => {
+    it("should reject when calculateEdit fails after an abort signal", async () => {
       const params: EditToolParams = {
-        file_path: path.join(rootDir, 'abort-execute.txt'),
-        instruction: 'Abort during execute',
-        old_string: 'old',
-        new_string: 'new',
+        file_path: path.join(rootDir, "abort-execute.txt"),
+        instruction: "Abort during execute",
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error(
-        'Abort requested during smart edit execution',
-      );
+      const abortError = new Error("Abort requested during smart edit execution");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -302,68 +280,64 @@ describe('SmartEditTool', () => {
           throw abortError;
         });
 
-      await expect(invocation.execute(abortController.signal)).rejects.toBe(
-        abortError,
-      );
+      await expect(invocation.execute(abortController.signal)).rejects.toBe(abortError);
 
       calculateSpy.mockRestore();
     });
 
-    it('should edit an existing file and return diff with fileName', async () => {
-      const initialContent = 'This is some old text.';
-      const newContent = 'This is some new text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should edit an existing file and return diff with fileName", async () => {
+      const initialContent = "This is some old text.";
+      const newContent = "This is some new text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace old with new',
-        old_string: 'old',
-        new_string: 'new',
+        instruction: "Replace old with new",
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(newContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(newContent);
       const display = result.returnDisplay as FileDiff;
       expect(display.fileDiff).toMatch(initialContent);
       expect(display.fileDiff).toMatch(newContent);
       expect(display.fileName).toBe(testFile);
     });
 
-    it('should return error if old_string is not found in file', async () => {
-      fs.writeFileSync(filePath, 'Some content.', 'utf8');
+    it("should return error if old_string is not found in file", async () => {
+      fs.writeFileSync(filePath, "Some content.", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace non-existent text',
-        old_string: 'nonexistent',
-        new_string: 'replacement',
+        instruction: "Replace non-existent text",
+        old_string: "nonexistent",
+        new_string: "replacement",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.llmContent).toMatch(/0 occurrences found for old_string/);
-      expect(result.returnDisplay).toMatch(
-        /Failed to edit, could not find the string to replace./,
-      );
+      expect(result.returnDisplay).toMatch(/Failed to edit, could not find the string to replace./);
       expect(mockFixLLMEditWithInstruction).toHaveBeenCalled();
     });
 
-    it('should succeed if FixLLMEditWithInstruction corrects the params', async () => {
-      const initialContent = 'This is some original text.';
-      const finalContent = 'This is some brand new text.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should succeed if FixLLMEditWithInstruction corrects the params", async () => {
+      const initialContent = "This is some original text.";
+      const finalContent = "This is some brand new text.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace original with brand new',
-        old_string: 'wrong text', // This will fail first
-        new_string: 'brand new text',
+        instruction: "Replace original with brand new",
+        old_string: "wrong text", // This will fail first
+        new_string: "brand new text",
       };
 
       mockFixLLMEditWithInstruction.mockResolvedValueOnce({
         noChangesRequired: false,
-        search: 'original text', // The corrected search string
-        replace: 'brand new text',
-        explanation: 'Corrected the search string to match the file content.',
+        search: "original text", // The corrected search string
+        replace: "brand new text",
+        explanation: "Corrected the search string to match the file content.",
       });
 
       const invocation = tool.build(params);
@@ -371,99 +345,93 @@ describe('SmartEditTool', () => {
 
       expect(result.error).toBeUndefined();
       expect(result.llmContent).toMatch(/Successfully modified file/);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(finalContent);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(finalContent);
       expect(mockFixLLMEditWithInstruction).toHaveBeenCalledTimes(1);
     });
 
-    it('should preserve CRLF line endings when editing a file', async () => {
-      const initialContent = 'line one\r\nline two\r\n';
-      const newContent = 'line one\r\nline three\r\n';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should preserve CRLF line endings when editing a file", async () => {
+      const initialContent = "line one\r\nline two\r\n";
+      const newContent = "line one\r\nline three\r\n";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace two with three',
-        old_string: 'line two',
-        new_string: 'line three',
+        instruction: "Replace two with three",
+        old_string: "line two",
+        new_string: "line three",
       };
 
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
-      const finalContent = fs.readFileSync(filePath, 'utf8');
+      const finalContent = fs.readFileSync(filePath, "utf8");
       expect(finalContent).toBe(newContent);
     });
 
-    it('should create a new file with CRLF line endings if new_string has them', async () => {
-      const newContentWithCRLF = 'new line one\r\nnew line two\r\n';
+    it("should create a new file with CRLF line endings if new_string has them", async () => {
+      const newContentWithCRLF = "new line one\r\nnew line two\r\n";
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Create a new file',
-        old_string: '',
+        instruction: "Create a new file",
+        old_string: "",
         new_string: newContentWithCRLF,
       };
 
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
-      const finalContent = fs.readFileSync(filePath, 'utf8');
+      const finalContent = fs.readFileSync(filePath, "utf8");
       expect(finalContent).toBe(newContentWithCRLF);
     });
 
-    it('should return NO_CHANGE if FixLLMEditWithInstruction determines no changes are needed', async () => {
-      const initialContent = 'The price is $100.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should return NO_CHANGE if FixLLMEditWithInstruction determines no changes are needed", async () => {
+      const initialContent = "The price is $100.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Ensure the price is $100',
-        old_string: 'price is $50', // Incorrect old string
-        new_string: 'price is $100',
+        instruction: "Ensure the price is $100",
+        old_string: "price is $50", // Incorrect old string
+        new_string: "price is $100",
       };
 
       mockFixLLMEditWithInstruction.mockResolvedValueOnce({
         noChangesRequired: true,
-        search: '',
-        replace: '',
-        explanation: 'The price is already correctly set to $100.',
+        search: "",
+        replace: "",
+        explanation: "The price is already correctly set to $100.",
       });
 
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.error?.type).toBe(
-        ToolErrorType.EDIT_NO_CHANGE_LLM_JUDGEMENT,
-      );
-      expect(result.llmContent).toMatch(
-        /A secondary check by an LLM determined/,
-      );
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(initialContent); // File is unchanged
+      expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_CHANGE_LLM_JUDGEMENT);
+      expect(result.llmContent).toMatch(/A secondary check by an LLM determined/);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(initialContent); // File is unchanged
     });
   });
 
-  describe('self-correction with content refresh to pull in external edits', () => {
-    const testFile = 'test.txt';
+  describe("self-correction with content refresh to pull in external edits", () => {
+    const testFile = "test.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should use refreshed file content for self-correction if file was modified externally', async () => {
-      const initialContent = 'This is the original content.';
-      const externallyModifiedContent =
-        'This is the externally modified content.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should use refreshed file content for self-correction if file was modified externally", async () => {
+      const initialContent = "This is the original content.";
+      const externallyModifiedContent = "This is the externally modified content.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
 
       const params: EditToolParams = {
         file_path: filePath,
-        instruction:
-          'Replace "externally modified content" with "externally modified string"',
-        old_string: 'externally modified content', // This will fail the first attempt, triggering self-correction.
-        new_string: 'externally modified string',
+        instruction: 'Replace "externally modified content" with "externally modified string"',
+        old_string: "externally modified content", // This will fail the first attempt, triggering self-correction.
+        new_string: "externally modified string",
       };
 
       // Spy on `readTextFile` to simulate an external file change between reads.
       const readTextFileSpy = vi
-        .spyOn(fileSystemService, 'readTextFile')
+        .spyOn(fileSystemService, "readTextFile")
         .mockResolvedValueOnce(initialContent) // First call in `calculateEdit`
         .mockResolvedValueOnce(externallyModifiedContent); // Second call in `attemptSelfCorrection`
 
@@ -479,7 +447,7 @@ describe('SmartEditTool', () => {
         params.old_string,
         params.new_string,
         expect.stringContaining(
-          'However, the file has been modified by either the user or an external process',
+          "However, the file has been modified by either the user or an external process",
         ), // errorForLlmEditFixer
         externallyModifiedContent, // The new content for correction
         expect.any(Object), // baseLlmClient
@@ -488,129 +456,121 @@ describe('SmartEditTool', () => {
     });
   });
 
-  describe('Error Scenarios', () => {
-    const testFile = 'error_test.txt';
+  describe("Error Scenarios", () => {
+    const testFile = "error_test.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should return FILE_NOT_FOUND error', async () => {
+    it("should return FILE_NOT_FOUND error", async () => {
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'test',
-        old_string: 'any',
-        new_string: 'new',
+        instruction: "test",
+        old_string: "any",
+        new_string: "new",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.FILE_NOT_FOUND);
     });
 
-    it('should return ATTEMPT_TO_CREATE_EXISTING_FILE error', async () => {
-      fs.writeFileSync(filePath, 'existing content', 'utf8');
+    it("should return ATTEMPT_TO_CREATE_EXISTING_FILE error", async () => {
+      fs.writeFileSync(filePath, "existing content", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'test',
-        old_string: '',
-        new_string: 'new content',
+        instruction: "test",
+        old_string: "",
+        new_string: "new content",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.error?.type).toBe(
-        ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE,
-      );
+      expect(result.error?.type).toBe(ToolErrorType.ATTEMPT_TO_CREATE_EXISTING_FILE);
     });
 
-    it('should return NO_OCCURRENCE_FOUND error', async () => {
-      fs.writeFileSync(filePath, 'content', 'utf8');
+    it("should return NO_OCCURRENCE_FOUND error", async () => {
+      fs.writeFileSync(filePath, "content", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'test',
-        old_string: 'not-found',
-        new_string: 'new',
+        instruction: "test",
+        old_string: "not-found",
+        new_string: "new",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.EDIT_NO_OCCURRENCE_FOUND);
     });
 
-    it('should return EXPECTED_OCCURRENCE_MISMATCH error', async () => {
-      fs.writeFileSync(filePath, 'one one two', 'utf8');
+    it("should return EXPECTED_OCCURRENCE_MISMATCH error", async () => {
+      fs.writeFileSync(filePath, "one one two", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'test',
-        old_string: 'one',
-        new_string: 'new',
+        instruction: "test",
+        old_string: "one",
+        new_string: "new",
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.error?.type).toBe(
-        ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
-      );
+      expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
     });
   });
 
-  describe('expected_replacements', () => {
-    const testFile = 'replacements_test.txt';
+  describe("expected_replacements", () => {
+    const testFile = "replacements_test.txt";
     let filePath: string;
 
     beforeEach(() => {
       filePath = path.join(rootDir, testFile);
     });
 
-    it('should succeed when occurrences match expected_replacements', async () => {
-      fs.writeFileSync(filePath, 'foo foo foo', 'utf8');
+    it("should succeed when occurrences match expected_replacements", async () => {
+      fs.writeFileSync(filePath, "foo foo foo", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace all foo with bar',
-        old_string: 'foo',
-        new_string: 'bar',
+        instruction: "Replace all foo with bar",
+        old_string: "foo",
+        new_string: "bar",
         expected_replacements: 3,
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error).toBeUndefined();
-      expect(fs.readFileSync(filePath, 'utf8')).toBe('bar bar bar');
+      expect(fs.readFileSync(filePath, "utf8")).toBe("bar bar bar");
     });
 
-    it('should fail when occurrences do not match expected_replacements', async () => {
-      fs.writeFileSync(filePath, 'foo foo foo', 'utf8');
+    it("should fail when occurrences do not match expected_replacements", async () => {
+      fs.writeFileSync(filePath, "foo foo foo", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace all foo with bar',
-        old_string: 'foo',
-        new_string: 'bar',
+        instruction: "Replace all foo with bar",
+        old_string: "foo",
+        new_string: "bar",
         expected_replacements: 2,
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
-      expect(result.error?.type).toBe(
-        ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
-      );
+      expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
     });
 
-    it('should default to 1 expected replacement if not specified', async () => {
-      fs.writeFileSync(filePath, 'foo foo', 'utf8');
+    it("should default to 1 expected replacement if not specified", async () => {
+      fs.writeFileSync(filePath, "foo foo", "utf8");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Replace foo with bar',
-        old_string: 'foo',
-        new_string: 'bar',
+        instruction: "Replace foo with bar",
+        old_string: "foo",
+        new_string: "bar",
         // expected_replacements is undefined, defaults to 1
       };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       // Should fail because there are 2 occurrences but default expectation is 1
-      expect(result.error?.type).toBe(
-        ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH,
-      );
+      expect(result.error?.type).toBe(ToolErrorType.EDIT_EXPECTED_OCCURRENCE_MISMATCH);
     });
   });
 
-  describe('IDE mode', () => {
-    const testFile = 'edit_me.txt';
+  describe("IDE mode", () => {
+    const testFile = "edit_me.txt";
     let filePath: string;
     let ideClient: any;
 
@@ -624,31 +584,29 @@ describe('SmartEditTool', () => {
       (mockConfig as any).getIdeMode = () => true;
     });
 
-    it('should call ideClient.openDiff and update params on confirmation', async () => {
-      const initialContent = 'some old content here';
-      const newContent = 'some new content here';
-      const modifiedContent = 'some modified content here';
+    it("should call ideClient.openDiff and update params on confirmation", async () => {
+      const initialContent = "some old content here";
+      const newContent = "some new content here";
+      const modifiedContent = "some modified content here";
       fs.writeFileSync(filePath, initialContent);
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'test',
-        old_string: 'old',
-        new_string: 'new',
+        instruction: "test",
+        old_string: "old",
+        new_string: "new",
       };
 
       ideClient.openDiff.mockResolvedValueOnce({
-        status: 'accepted',
+        status: "accepted",
         content: modifiedContent,
       });
 
       const invocation = tool.build(params);
-      const confirmation = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmation = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       expect(ideClient.openDiff).toHaveBeenCalledWith(filePath, newContent);
 
-      if (confirmation && 'onConfirm' in confirmation) {
+      if (confirmation && "onConfirm" in confirmation) {
         await confirmation.onConfirm(ToolConfirmationOutcome.ProceedOnce);
       }
 
@@ -657,24 +615,22 @@ describe('SmartEditTool', () => {
     });
   });
 
-  describe('shouldConfirmExecute', () => {
-    it('should rethrow calculateEdit errors when the abort signal is triggered', async () => {
-      const filePath = path.join(rootDir, 'abort-confirmation.txt');
+  describe("shouldConfirmExecute", () => {
+    it("should rethrow calculateEdit errors when the abort signal is triggered", async () => {
+      const filePath = path.join(rootDir, "abort-confirmation.txt");
       const params: EditToolParams = {
         file_path: filePath,
-        instruction: 'Abort during confirmation',
-        old_string: 'old',
-        new_string: 'new',
+        instruction: "Abort during confirmation",
+        old_string: "old",
+        new_string: "new",
       };
 
       const invocation = tool.build(params);
       const abortController = new AbortController();
-      const abortError = new Error(
-        'Abort requested during smart edit confirmation',
-      );
+      const abortError = new Error("Abort requested during smart edit confirmation");
 
       const calculateSpy = vi
-        .spyOn(invocation as any, 'calculateEdit')
+        .spyOn(invocation as any, "calculateEdit")
         .mockImplementation(async () => {
           if (!abortController.signal.aborted) {
             abortController.abort();
@@ -682,16 +638,16 @@ describe('SmartEditTool', () => {
           throw abortError;
         });
 
-      await expect(
-        invocation.shouldConfirmExecute(abortController.signal),
-      ).rejects.toBe(abortError);
+      await expect(invocation.shouldConfirmExecute(abortController.signal)).rejects.toBe(
+        abortError,
+      );
 
       calculateSpy.mockRestore();
     });
   });
 
-  describe('multiple file edits', () => {
-    it('should perform multiple removals and report correct diff stats', async () => {
+  describe("multiple file edits", () => {
+    it("should perform multiple removals and report correct diff stats", async () => {
       const numFiles = 10;
       const files: Array<{
         path: string;
@@ -706,23 +662,17 @@ describe('SmartEditTool', () => {
         const fileName = `test-file-${i}.txt`;
         const filePath = path.join(rootDir, fileName);
         const numLines = Math.floor(Math.random() * 6) + 5; // 5 to 10 lines
-        const lines = Array.from(
-          { length: numLines },
-          (_, j) => `File ${i}, Line ${j + 1}`,
-        );
-        const content = lines.join('\n') + '\n';
+        const lines = Array.from({ length: numLines }, (_, j) => `File ${i}, Line ${j + 1}`);
+        const content = lines.join("\n") + "\n";
 
         // Determine which lines to remove (2 or 3 lines)
         const numLinesToRemove = Math.floor(Math.random() * 2) + 2; // 2 or 3
         expectedLinesRemoved.push(numLinesToRemove);
         const startLineToRemove = 1; // Start removing from the second line
-        const linesToRemove = lines.slice(
-          startLineToRemove,
-          startLineToRemove + numLinesToRemove,
-        );
-        const toRemove = linesToRemove.join('\n') + '\n';
+        const linesToRemove = lines.slice(startLineToRemove, startLineToRemove + numLinesToRemove);
+        const toRemove = linesToRemove.join("\n") + "\n";
 
-        fs.writeFileSync(filePath, content, 'utf8');
+        fs.writeFileSync(filePath, content, "utf8");
         files.push({
           path: filePath,
           initialContent: content,
@@ -736,21 +686,19 @@ describe('SmartEditTool', () => {
           file_path: file.path,
           instruction: `Remove lines from the file`,
           old_string: file.toRemove,
-          new_string: '', // Removing the content
-          ai_proposed_string: '',
+          new_string: "", // Removing the content
+          ai_proposed_string: "",
         };
         const invocation = tool.build(params);
         const result = await invocation.execute(new AbortController().signal);
 
         if (
           result.returnDisplay &&
-          typeof result.returnDisplay === 'object' &&
-          'diffStat' in result.returnDisplay &&
+          typeof result.returnDisplay === "object" &&
+          "diffStat" in result.returnDisplay &&
           result.returnDisplay.diffStat
         ) {
-          actualLinesRemoved.push(
-            result.returnDisplay.diffStat?.model_removed_lines,
-          );
+          actualLinesRemoved.push(result.returnDisplay.diffStat?.model_removed_lines);
         } else if (result.error) {
           console.error(`Edit failed for ${file.path}:`, result.error);
         }
@@ -758,21 +706,15 @@ describe('SmartEditTool', () => {
 
       // 3. Assert that the content was removed from each file
       for (const file of files) {
-        const finalContent = fs.readFileSync(file.path, 'utf8');
-        const expectedContent = file.initialContent.replace(file.toRemove, '');
+        const finalContent = fs.readFileSync(file.path, "utf8");
+        const expectedContent = file.initialContent.replace(file.toRemove, "");
         expect(finalContent).toBe(expectedContent);
         expect(finalContent).not.toContain(file.toRemove);
       }
 
       // 4. Assert that the total number of removed lines matches the diffStat total
-      const totalExpectedRemoved = expectedLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
-      const totalActualRemoved = actualLinesRemoved.reduce(
-        (sum, current) => sum + current,
-        0,
-      );
+      const totalExpectedRemoved = expectedLinesRemoved.reduce((sum, current) => sum + current, 0);
+      const totalActualRemoved = actualLinesRemoved.reduce((sum, current) => sum + current, 0);
       expect(totalActualRemoved).toBe(totalExpectedRemoved);
     });
   });
diff --git a/packages/gemini-core/src/tools/smart-edit.ts b/packages/gemini-core/src/tools/smart-edit.ts
index 4d5fdce37..51ec98e9c 100644
--- a/packages/gemini-core/src/tools/smart-edit.ts
+++ b/packages/gemini-core/src/tools/smart-edit.ts
@@ -4,10 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import * as Diff from 'diff';
+import * as crypto from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logSmartEditCorrectionEvent, logSmartEditStrategy } from "../telemetry/loggers.js";
+import { SmartEditCorrectionEvent, SmartEditStrategyEvent } from "../telemetry/types.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { isNodeError } from "../utils/errors.js";
+import { FixLLMEditWithInstruction } from "../utils/llm-edit-fixer.js";
+import { correctPath } from "../utils/pathCorrector.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { safeLiteralReplace } from "../utils/textUtils.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import { applyReplacement } from "./edit.js";
+import { type ModifiableDeclarativeTool, type ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from "./tool-names.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
@@ -19,31 +36,8 @@ import {
   type ToolLocation,
   type ToolResult,
   type ToolResultDisplay,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { isNodeError } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import {
-  type ModifiableDeclarativeTool,
-  type ModifyContext,
-} from './modifiable-tool.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { FixLLMEditWithInstruction } from '../utils/llm-edit-fixer.js';
-import { applyReplacement } from './edit.js';
-import { safeLiteralReplace } from '../utils/textUtils.js';
-import { SmartEditStrategyEvent } from '../telemetry/types.js';
-import { logSmartEditStrategy } from '../telemetry/loggers.js';
-import { SmartEditCorrectionEvent } from '../telemetry/types.js';
-import { logSmartEditCorrectionEvent } from '../telemetry/loggers.js';
-
-import { correctPath } from '../utils/pathCorrector.js';
-import { EDIT_TOOL_NAME, READ_FILE_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+} from "./tools.js";
+
 interface ReplacementContext {
   params: EditToolParams;
   currentContent: string;
@@ -63,18 +57,15 @@ interface ReplacementResult {
  * @returns A hex-encoded hash string.
  */
 function hashContent(content: string): string {
-  return crypto.createHash('sha256').update(content).digest('hex');
+  return crypto.createHash("sha256").update(content).digest("hex");
 }
 
-function restoreTrailingNewline(
-  originalContent: string,
-  modifiedContent: string,
-): string {
-  const hadTrailingNewline = originalContent.endsWith('\n');
-  if (hadTrailingNewline && !modifiedContent.endsWith('\n')) {
-    return modifiedContent + '\n';
-  } else if (!hadTrailingNewline && modifiedContent.endsWith('\n')) {
-    return modifiedContent.replace(/\n$/, '');
+function restoreTrailingNewline(originalContent: string, modifiedContent: string): string {
+  const hadTrailingNewline = originalContent.endsWith("\n");
+  if (hadTrailingNewline && !modifiedContent.endsWith("\n")) {
+    return modifiedContent + "\n";
+  } else if (!hadTrailingNewline && modifiedContent.endsWith("\n")) {
+    return modifiedContent.replace(/\n$/, "");
   }
   return modifiedContent;
 }
@@ -85,7 +76,7 @@ function restoreTrailingNewline(
  * @returns The escaped string.
  */
 function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // $& means the whole matched string
 }
 
 async function calculateExactReplacement(
@@ -95,16 +86,12 @@ async function calculateExactReplacement(
   const { old_string, new_string } = params;
 
   const normalizedCode = currentContent;
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
   const exactOccurrences = normalizedCode.split(normalizedSearch).length - 1;
   if (exactOccurrences > 0) {
-    let modifiedCode = safeLiteralReplace(
-      normalizedCode,
-      normalizedSearch,
-      normalizedReplace,
-    );
+    let modifiedCode = safeLiteralReplace(normalizedCode, normalizedSearch, normalizedReplace);
     modifiedCode = restoreTrailingNewline(currentContent, modifiedCode);
     return {
       newContent: modifiedCode,
@@ -124,14 +111,12 @@ async function calculateFlexibleReplacement(
   const { old_string, new_string } = params;
 
   const normalizedCode = currentContent;
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
   const sourceLines = normalizedCode.match(/.*(?:\n|$)/g)?.slice(0, -1) ?? [];
-  const searchLinesStripped = normalizedSearch
-    .split('\n')
-    .map((line: string) => line.trim());
-  const replaceLines = normalizedReplace.split('\n');
+  const searchLinesStripped = normalizedSearch.split("\n").map((line: string) => line.trim());
+  const replaceLines = normalizedReplace.split("\n");
 
   let flexibleOccurrences = 0;
   let i = 0;
@@ -146,15 +131,9 @@ async function calculateFlexibleReplacement(
       flexibleOccurrences++;
       const firstLineInMatch = window[0];
       const indentationMatch = firstLineInMatch.match(/^(\s*)/);
-      const indentation = indentationMatch ? indentationMatch[1] : '';
-      const newBlockWithIndent = replaceLines.map(
-        (line: string) => `${indentation}${line}`,
-      );
-      sourceLines.splice(
-        i,
-        searchLinesStripped.length,
-        newBlockWithIndent.join('\n'),
-      );
+      const indentation = indentationMatch ? indentationMatch[1] : "";
+      const newBlockWithIndent = replaceLines.map((line: string) => `${indentation}${line}`);
+      sourceLines.splice(i, searchLinesStripped.length, newBlockWithIndent.join("\n"));
       i += replaceLines.length;
     } else {
       i++;
@@ -162,7 +141,7 @@ async function calculateFlexibleReplacement(
   }
 
   if (flexibleOccurrences > 0) {
-    let modifiedCode = sourceLines.join('');
+    let modifiedCode = sourceLines.join("");
     modifiedCode = restoreTrailingNewline(currentContent, modifiedCode);
     return {
       newContent: modifiedCode,
@@ -182,12 +161,12 @@ async function calculateRegexReplacement(
   const { old_string, new_string } = params;
 
   // Normalize line endings for consistent processing.
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
   // This logic is ported from your Python implementation.
   // It builds a flexible, multi-line regex from a search string.
-  const delimiters = ['(', ')', ':', '[', ']', '{', '}', '>', '<', '='];
+  const delimiters = ["(", ")", ":", "[", "]", "{", "}", ">", "<", "="];
 
   let processedString = normalizedSearch;
   for (const delim of delimiters) {
@@ -203,12 +182,12 @@ async function calculateRegexReplacement(
 
   const escapedTokens = tokens.map(escapeRegex);
   // Join tokens with `\s*` to allow for flexible whitespace between them.
-  const pattern = escapedTokens.join('\\s*');
+  const pattern = escapedTokens.join("\\s*");
 
   // The final pattern captures leading whitespace (indentation) and then matches the token pattern.
   // 'm' flag enables multi-line mode, so '^' matches the start of any line.
   const finalPattern = `^(\\s*)${pattern}`;
-  const flexibleRegex = new RegExp(finalPattern, 'm');
+  const flexibleRegex = new RegExp(finalPattern, "m");
 
   const match = flexibleRegex.exec(currentContent);
 
@@ -216,18 +195,13 @@ async function calculateRegexReplacement(
     return null;
   }
 
-  const indentation = match[1] || '';
-  const newLines = normalizedReplace.split('\n');
-  const newBlockWithIndent = newLines
-    .map((line) => `${indentation}${line}`)
-    .join('\n');
+  const indentation = match[1] || "";
+  const newLines = normalizedReplace.split("\n");
+  const newBlockWithIndent = newLines.map((line) => `${indentation}${line}`).join("\n");
 
   // Use replace with the regex to substitute the matched content.
   // Since the regex doesn't have the 'g' flag, it will only replace the first occurrence.
-  const modifiedCode = currentContent.replace(
-    flexibleRegex,
-    newBlockWithIndent,
-  );
+  const modifiedCode = currentContent.replace(flexibleRegex, newBlockWithIndent);
 
   return {
     newContent: restoreTrailingNewline(currentContent, modifiedCode),
@@ -242,10 +216,10 @@ async function calculateRegexReplacement(
  * @param content The string content to analyze.
  * @returns '\r\n' for Windows-style, '\n' for Unix-style.
  */
-function detectLineEnding(content: string): '\r\n' | '\n' {
+function detectLineEnding(content: string): "\r\n" | "\n" {
   // If a Carriage Return is found, assume Windows-style endings.
   // This is a simple but effective heuristic.
-  return content.includes('\r\n') ? '\r\n' : '\n';
+  return content.includes("\r\n") ? "\r\n" : "\n";
 }
 
 export async function calculateReplacement(
@@ -254,10 +228,10 @@ export async function calculateReplacement(
 ): Promise<ReplacementResult> {
   const { currentContent, params } = context;
   const { old_string, new_string } = params;
-  const normalizedSearch = old_string.replace(/\r\n/g, '\n');
-  const normalizedReplace = new_string.replace(/\r\n/g, '\n');
+  const normalizedSearch = old_string.replace(/\r\n/g, "\n");
+  const normalizedReplace = new_string.replace(/\r\n/g, "\n");
 
-  if (normalizedSearch === '') {
+  if (normalizedSearch === "") {
     return {
       newContent: currentContent,
       occurrences: 0,
@@ -268,21 +242,21 @@ export async function calculateReplacement(
 
   const exactResult = await calculateExactReplacement(context);
   if (exactResult) {
-    const event = new SmartEditStrategyEvent('exact');
+    const event = new SmartEditStrategyEvent("exact");
     logSmartEditStrategy(config, event);
     return exactResult;
   }
 
   const flexibleResult = await calculateFlexibleReplacement(context);
   if (flexibleResult) {
-    const event = new SmartEditStrategyEvent('flexible');
+    const event = new SmartEditStrategyEvent("flexible");
     logSmartEditStrategy(config, event);
     return flexibleResult;
   }
 
   const regexResult = await calculateRegexReplacement(context);
   if (regexResult) {
-    const event = new SmartEditStrategyEvent('regex');
+    const event = new SmartEditStrategyEvent("regex");
     logSmartEditStrategy(config, event);
     return regexResult;
   }
@@ -302,8 +276,7 @@ export function getErrorReplaceResult(
   finalOldString: string,
   finalNewString: string,
 ) {
-  let error: { display: string; raw: string; type: ToolErrorType } | undefined =
-    undefined;
+  let error: { display: string; raw: string; type: ToolErrorType } | undefined = undefined;
   if (occurrences === 0) {
     error = {
       display: `Failed to edit, could not find the string to replace.`,
@@ -311,8 +284,7 @@ export function getErrorReplaceResult(
       type: ToolErrorType.EDIT_NO_OCCURRENCE_FOUND,
     };
   } else if (occurrences !== expectedReplacements) {
-    const occurrenceTerm =
-      expectedReplacements === 1 ? 'occurrence' : 'occurrences';
+    const occurrenceTerm = expectedReplacements === 1 ? "occurrence" : "occurrences";
 
     error = {
       display: `Failed to edit, expected ${expectedReplacements} ${occurrenceTerm} but found ${occurrences}.`,
@@ -376,7 +348,7 @@ interface CalculatedEdit {
   occurrences: number;
   error?: { display: string; raw: string; type: ToolErrorType };
   isNewFile: boolean;
-  originalLineEnding: '\r\n' | '\n';
+  originalLineEnding: "\r\n" | "\n";
 }
 
 class EditToolInvocation
@@ -402,7 +374,7 @@ class EditToolInvocation
     currentContent: string,
     initialError: { display: string; raw: string; type: ToolErrorType },
     abortSignal: AbortSignal,
-    originalLineEnding: '\r\n' | '\n',
+    originalLineEnding: "\r\n" | "\n",
   ): Promise<CalculatedEdit> {
     // In order to keep from clobbering edits made outside our system,
     // check if the file has been modified since we first read it.
@@ -410,15 +382,13 @@ class EditToolInvocation
     let contentForLlmEditFixer = currentContent;
 
     const initialContentHash = hashContent(currentContent);
-    const onDiskContent = await this.config
-      .getFileSystemService()
-      .readTextFile(params.file_path);
-    const onDiskContentHash = hashContent(onDiskContent.replace(/\r\n/g, '\n'));
+    const onDiskContent = await this.config.getFileSystemService().readTextFile(params.file_path);
+    const onDiskContentHash = hashContent(onDiskContent.replace(/\r\n/g, "\n"));
 
     if (initialContentHash !== onDiskContentHash) {
       // The file has changed on disk since we first read it.
       // Use the latest content for the correction attempt.
-      contentForLlmEditFixer = onDiskContent.replace(/\r\n/g, '\n');
+      contentForLlmEditFixer = onDiskContent.replace(/\r\n/g, "\n");
       errorForLlmEditFixer = `The initial edit attempt failed with the following error: "${initialError.raw}". However, the file has been modified by either the user or an external process since that edit attempt. The file content provided to you is the latest version. Please base your correction on this new content.`;
     }
 
@@ -479,7 +449,7 @@ class EditToolInvocation
 
     if (secondError) {
       // The fix failed, log failure and return the original error
-      const event = new SmartEditCorrectionEvent('failure');
+      const event = new SmartEditCorrectionEvent("failure");
       logSmartEditCorrectionEvent(this.config, event);
 
       return {
@@ -492,7 +462,7 @@ class EditToolInvocation
       };
     }
 
-    const event = new SmartEditCorrectionEvent('success');
+    const event = new SmartEditCorrectionEvent("success");
     logSmartEditCorrectionEvent(this.config, event);
 
     return {
@@ -518,23 +488,21 @@ class EditToolInvocation
     const expectedReplacements = params.expected_replacements ?? 1;
     let currentContent: string | null = null;
     let fileExists = false;
-    let originalLineEnding: '\r\n' | '\n' = '\n'; // Default for new files
+    let originalLineEnding: "\r\n" | "\n" = "\n"; // Default for new files
 
     try {
-      currentContent = await this.config
-        .getFileSystemService()
-        .readTextFile(params.file_path);
+      currentContent = await this.config.getFileSystemService().readTextFile(params.file_path);
       originalLineEnding = detectLineEnding(currentContent);
-      currentContent = currentContent.replace(/\r\n/g, '\n');
+      currentContent = currentContent.replace(/\r\n/g, "\n");
       fileExists = true;
     } catch (err: unknown) {
-      if (!isNodeError(err) || err.code !== 'ENOENT') {
+      if (!isNodeError(err) || err.code !== "ENOENT") {
         throw err;
       }
       fileExists = false;
     }
 
-    const isNewFile = params.old_string === '' && !fileExists;
+    const isNewFile = params.old_string === "" && !fileExists;
 
     if (isNewFile) {
       return {
@@ -551,7 +519,7 @@ class EditToolInvocation
     if (!fileExists) {
       return {
         currentContent,
-        newContent: '',
+        newContent: "",
         occurrences: 0,
         isNewFile: false,
         error: {
@@ -566,7 +534,7 @@ class EditToolInvocation
     if (currentContent === null) {
       return {
         currentContent,
-        newContent: '',
+        newContent: "",
         occurrences: 0,
         isNewFile: false,
         error: {
@@ -578,7 +546,7 @@ class EditToolInvocation
       };
     }
 
-    if (params.old_string === '') {
+    if (params.old_string === "") {
       return {
         currentContent,
         newContent: currentContent,
@@ -659,10 +627,10 @@ class EditToolInvocation
     const fileName = path.basename(this.params.file_path);
     const fileDiff = Diff.createPatch(
       fileName,
-      editData.currentContent ?? '',
+      editData.currentContent ?? "",
       editData.newContent,
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
     const ideClient = await IdeClient.getInstance();
@@ -672,7 +640,7 @@ class EditToolInvocation
         : undefined;
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Edit: ${shortenPath(makeRelative(this.params.file_path, this.config.getTargetDir()))}`,
       fileName,
       filePath: this.params.file_path,
@@ -686,10 +654,10 @@ class EditToolInvocation
 
         if (ideConfirmation) {
           const result = await ideConfirmation;
-          if (result.status === 'accepted' && result.content) {
+          if (result.status === "accepted" && result.content) {
             // TODO(chrstn): See https://github.com/google-gemini/gemini-cli/pull/5618#discussion_r2255413084
             // for info on a possible race condition where the file is modified on disk while being edited.
-            this.params.old_string = editData.currentContent ?? '';
+            this.params.old_string = editData.currentContent ?? "";
             this.params.new_string = result.content;
           }
         }
@@ -700,20 +668,17 @@ class EditToolInvocation
   }
 
   getDescription(): string {
-    const relativePath = makeRelative(
-      this.params.file_path,
-      this.config.getTargetDir(),
-    );
-    if (this.params.old_string === '') {
+    const relativePath = makeRelative(this.params.file_path, this.config.getTargetDir());
+    if (this.params.old_string === "") {
       return `Create ${shortenPath(relativePath)}`;
     }
 
     const oldStringSnippet =
-      this.params.old_string.split('\n')[0].substring(0, 30) +
-      (this.params.old_string.length > 30 ? '...' : '');
+      this.params.old_string.split("\n")[0].substring(0, 30) +
+      (this.params.old_string.length > 30 ? "..." : "");
     const newStringSnippet =
-      this.params.new_string.split('\n')[0].substring(0, 30) +
-      (this.params.new_string.length > 30 ? '...' : '');
+      this.params.new_string.split("\n")[0].substring(0, 30) +
+      (this.params.new_string.length > 30 ? "..." : "");
 
     if (this.params.old_string === this.params.new_string) {
       return `No file changes to ${shortenPath(relativePath)}`;
@@ -761,12 +726,10 @@ class EditToolInvocation
       let finalContent = editData.newContent;
 
       // Restore original line endings if they were CRLF
-      if (!editData.isNewFile && editData.originalLineEnding === '\r\n') {
-        finalContent = finalContent.replace(/\n/g, '\r\n');
+      if (!editData.isNewFile && editData.originalLineEnding === "\r\n") {
+        finalContent = finalContent.replace(/\n/g, "\r\n");
       }
-      await this.config
-        .getFileSystemService()
-        .writeTextFile(this.params.file_path, finalContent);
+      await this.config.getFileSystemService().writeTextFile(this.params.file_path, finalContent);
 
       let displayResult: ToolResultDisplay;
       if (editData.isNewFile) {
@@ -777,16 +740,16 @@ class EditToolInvocation
         const fileName = path.basename(this.params.file_path);
         const fileDiff = Diff.createPatch(
           fileName,
-          editData.currentContent ?? '', // Should not be null here if not isNewFile
+          editData.currentContent ?? "", // Should not be null here if not isNewFile
           editData.newContent,
-          'Current',
-          'Proposed',
+          "Current",
+          "Proposed",
           DEFAULT_DIFF_OPTIONS,
         );
 
         const diffStat = getDiffStat(
           fileName,
-          editData.currentContent ?? '',
+          editData.currentContent ?? "",
           editData.newContent,
           this.params.new_string,
         );
@@ -811,7 +774,7 @@ class EditToolInvocation
       }
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -853,7 +816,7 @@ export class SmartEditTool
   ) {
     super(
       SmartEditTool.Name,
-      'Edit',
+      "Edit",
       `Replaces text within a file. By default, replaces a single occurrence, but can replace multiple occurrences when \`expected_replacements\` is specified. This tool requires providing significant context around the change to ensure precise targeting. Always use the ${READ_FILE_TOOL_NAME} tool to examine the file's current content before attempting a text replacement.
       
       The user has the ability to modify the \`new_string\` content. If modified, this will be stated in the response.
@@ -870,8 +833,8 @@ export class SmartEditTool
       {
         properties: {
           file_path: {
-            description: 'The path to the file to modify.',
-            type: 'string',
+            description: "The path to the file to modify.",
+            type: "string",
           },
           instruction: {
             description: `A clear, semantic instruction for the code change, acting as a high-quality prompt for an expert LLM assistant. It must be self-contained and explain the goal of the change.
@@ -889,27 +852,27 @@ A good instruction should concisely answer:
 - "Fix the bug." (Doesn't explain the bug or the fix)
 - "Replace the line with this new line." (Brittle, just repeats the other parameters)
 `,
-            type: 'string',
+            type: "string",
           },
           old_string: {
             description:
-              'The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.',
-            type: 'string',
+              "The exact literal text to replace, preferably unescaped. For single replacements (default), include at least 3 lines of context BEFORE and AFTER the target text, matching whitespace and indentation precisely. If this string is not the exact literal text (i.e. you escaped it) or does not match exactly, the tool will fail.",
+            type: "string",
           },
           new_string: {
             description:
-              'The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.',
-            type: 'string',
+              "The exact literal text to replace `old_string` with, preferably unescaped. Provide the EXACT text. Ensure the resulting code is correct and idiomatic.",
+            type: "string",
           },
           expected_replacements: {
-            type: 'number',
+            type: "number",
             description:
-              'Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.',
+              "Number of replacements expected. Defaults to 1 if not specified. Use when you want to replace multiple occurrences.",
             minimum: 1,
           },
         },
-        required: ['file_path', 'instruction', 'old_string', 'new_string'],
-        type: 'object',
+        required: ["file_path", "instruction", "old_string", "new_string"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -922,9 +885,7 @@ A good instruction should concisely answer:
    * @param params Parameters to validate
    * @returns Error message string or null if valid
    */
-  protected override validateToolParamValues(
-    params: EditToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: EditToolParams): string | null {
     if (!params.file_path) {
       return "The 'file_path' parameter must be non-empty.";
     }
@@ -943,15 +904,13 @@ A good instruction should concisely answer:
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(params.file_path)) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(', ')}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
 
     return null;
   }
 
-  protected createInvocation(
-    params: EditToolParams,
-  ): ToolInvocation<EditToolParams, ToolResult> {
+  protected createInvocation(params: EditToolParams): ToolInvocation<EditToolParams, ToolResult> {
     return new EditToolInvocation(
       this.config,
       params,
@@ -966,12 +925,10 @@ A good instruction should concisely answer:
       getFilePath: (params: EditToolParams) => params.file_path,
       getCurrentContent: async (params: EditToolParams): Promise<string> => {
         try {
-          return this.config
-            .getFileSystemService()
-            .readTextFile(params.file_path);
+          return this.config.getFileSystemService().readTextFile(params.file_path);
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       getProposedContent: async (params: EditToolParams): Promise<string> => {
@@ -983,11 +940,11 @@ A good instruction should concisely answer:
             currentContent,
             params.old_string,
             params.new_string,
-            params.old_string === '' && currentContent === '',
+            params.old_string === "" && currentContent === "",
           );
         } catch (err) {
-          if (!isNodeError(err) || err.code !== 'ENOENT') throw err;
-          return '';
+          if (!isNodeError(err) || err.code !== "ENOENT") throw err;
+          return "";
         }
       },
       createUpdatedParams: (
diff --git a/packages/gemini-core/src/tools/tool-error.ts b/packages/gemini-core/src/tools/tool-error.ts
index 50ce99f2e..44d284ee9 100644
--- a/packages/gemini-core/src/tools/tool-error.ts
+++ b/packages/gemini-core/src/tools/tool-error.ts
@@ -13,64 +13,64 @@
  */
 export enum ToolErrorType {
   // General Errors
-  INVALID_TOOL_PARAMS = 'invalid_tool_params',
-  UNKNOWN = 'unknown',
-  UNHANDLED_EXCEPTION = 'unhandled_exception',
-  TOOL_NOT_REGISTERED = 'tool_not_registered',
-  EXECUTION_FAILED = 'execution_failed',
+  INVALID_TOOL_PARAMS = "invalid_tool_params",
+  UNKNOWN = "unknown",
+  UNHANDLED_EXCEPTION = "unhandled_exception",
+  TOOL_NOT_REGISTERED = "tool_not_registered",
+  EXECUTION_FAILED = "execution_failed",
 
   // File System Errors
-  FILE_NOT_FOUND = 'file_not_found',
-  FILE_WRITE_FAILURE = 'file_write_failure',
-  READ_CONTENT_FAILURE = 'read_content_failure',
-  ATTEMPT_TO_CREATE_EXISTING_FILE = 'attempt_to_create_existing_file',
-  FILE_TOO_LARGE = 'file_too_large',
-  PERMISSION_DENIED = 'permission_denied',
-  NO_SPACE_LEFT = 'no_space_left',
-  TARGET_IS_DIRECTORY = 'target_is_directory',
-  PATH_NOT_IN_WORKSPACE = 'path_not_in_workspace',
-  SEARCH_PATH_NOT_FOUND = 'search_path_not_found',
-  SEARCH_PATH_NOT_A_DIRECTORY = 'search_path_not_a_directory',
+  FILE_NOT_FOUND = "file_not_found",
+  FILE_WRITE_FAILURE = "file_write_failure",
+  READ_CONTENT_FAILURE = "read_content_failure",
+  ATTEMPT_TO_CREATE_EXISTING_FILE = "attempt_to_create_existing_file",
+  FILE_TOO_LARGE = "file_too_large",
+  PERMISSION_DENIED = "permission_denied",
+  NO_SPACE_LEFT = "no_space_left",
+  TARGET_IS_DIRECTORY = "target_is_directory",
+  PATH_NOT_IN_WORKSPACE = "path_not_in_workspace",
+  SEARCH_PATH_NOT_FOUND = "search_path_not_found",
+  SEARCH_PATH_NOT_A_DIRECTORY = "search_path_not_a_directory",
 
   // Edit-specific Errors
-  EDIT_PREPARATION_FAILURE = 'edit_preparation_failure',
-  EDIT_NO_OCCURRENCE_FOUND = 'edit_no_occurrence_found',
-  EDIT_EXPECTED_OCCURRENCE_MISMATCH = 'edit_expected_occurrence_mismatch',
-  EDIT_NO_CHANGE = 'edit_no_change',
-  EDIT_NO_CHANGE_LLM_JUDGEMENT = 'edit_no_change_llm_judgement',
+  EDIT_PREPARATION_FAILURE = "edit_preparation_failure",
+  EDIT_NO_OCCURRENCE_FOUND = "edit_no_occurrence_found",
+  EDIT_EXPECTED_OCCURRENCE_MISMATCH = "edit_expected_occurrence_mismatch",
+  EDIT_NO_CHANGE = "edit_no_change",
+  EDIT_NO_CHANGE_LLM_JUDGEMENT = "edit_no_change_llm_judgement",
 
   // Glob-specific Errors
-  GLOB_EXECUTION_ERROR = 'glob_execution_error',
+  GLOB_EXECUTION_ERROR = "glob_execution_error",
 
   // Grep-specific Errors
-  GREP_EXECUTION_ERROR = 'grep_execution_error',
+  GREP_EXECUTION_ERROR = "grep_execution_error",
 
   // Ls-specific Errors
-  LS_EXECUTION_ERROR = 'ls_execution_error',
-  PATH_IS_NOT_A_DIRECTORY = 'path_is_not_a_directory',
+  LS_EXECUTION_ERROR = "ls_execution_error",
+  PATH_IS_NOT_A_DIRECTORY = "path_is_not_a_directory",
 
   // MCP-specific Errors
-  MCP_TOOL_ERROR = 'mcp_tool_error',
+  MCP_TOOL_ERROR = "mcp_tool_error",
 
   // Memory-specific Errors
-  MEMORY_TOOL_EXECUTION_ERROR = 'memory_tool_execution_error',
+  MEMORY_TOOL_EXECUTION_ERROR = "memory_tool_execution_error",
 
   // ReadManyFiles-specific Errors
-  READ_MANY_FILES_SEARCH_ERROR = 'read_many_files_search_error',
+  READ_MANY_FILES_SEARCH_ERROR = "read_many_files_search_error",
 
   // Shell errors
-  SHELL_EXECUTE_ERROR = 'shell_execute_error',
+  SHELL_EXECUTE_ERROR = "shell_execute_error",
 
   // DiscoveredTool-specific Errors
-  DISCOVERED_TOOL_EXECUTION_ERROR = 'discovered_tool_execution_error',
+  DISCOVERED_TOOL_EXECUTION_ERROR = "discovered_tool_execution_error",
 
   // WebFetch-specific Errors
-  WEB_FETCH_NO_URL_IN_PROMPT = 'web_fetch_no_url_in_prompt',
-  WEB_FETCH_FALLBACK_FAILED = 'web_fetch_fallback_failed',
-  WEB_FETCH_PROCESSING_ERROR = 'web_fetch_processing_error',
+  WEB_FETCH_NO_URL_IN_PROMPT = "web_fetch_no_url_in_prompt",
+  WEB_FETCH_FALLBACK_FAILED = "web_fetch_fallback_failed",
+  WEB_FETCH_PROCESSING_ERROR = "web_fetch_processing_error",
 
   // WebSearch-specific Errors
-  WEB_SEARCH_FAILED = 'web_search_failed',
+  WEB_SEARCH_FAILED = "web_search_failed",
 }
 
 /**
diff --git a/packages/gemini-core/src/tools/tool-names.ts b/packages/gemini-core/src/tools/tool-names.ts
index 77ce28fe8..d76f5cc31 100644
--- a/packages/gemini-core/src/tools/tool-names.ts
+++ b/packages/gemini-core/src/tools/tool-names.ts
@@ -8,15 +8,15 @@
 // This prevents circular dependencies that can occur when other modules (like agents)
 // need to reference a tool's name without importing the tool's implementation.
 
-export const GLOB_TOOL_NAME = 'glob';
-export const WRITE_TODOS_TOOL_NAME = 'write_todos';
-export const WRITE_FILE_TOOL_NAME = 'write_file';
-export const WEB_SEARCH_TOOL_NAME = 'google_web_search';
-export const WEB_FETCH_TOOL_NAME = 'web_fetch';
-export const EDIT_TOOL_NAME = 'replace';
-export const SHELL_TOOL_NAME = 'run_shell_command';
-export const GREP_TOOL_NAME = 'search_file_content';
-export const READ_MANY_FILES_TOOL_NAME = 'read_many_files';
-export const READ_FILE_TOOL_NAME = 'read_file';
-export const LS_TOOL_NAME = 'list_directory';
-export const MEMORY_TOOL_NAME = 'save_memory';
+export const GLOB_TOOL_NAME = "glob";
+export const WRITE_TODOS_TOOL_NAME = "write_todos";
+export const WRITE_FILE_TOOL_NAME = "write_file";
+export const WEB_SEARCH_TOOL_NAME = "google_web_search";
+export const WEB_FETCH_TOOL_NAME = "web_fetch";
+export const EDIT_TOOL_NAME = "replace";
+export const SHELL_TOOL_NAME = "run_shell_command";
+export const GREP_TOOL_NAME = "search_file_content";
+export const READ_MANY_FILES_TOOL_NAME = "read_many_files";
+export const READ_FILE_TOOL_NAME = "read_file";
+export const LS_TOOL_NAME = "list_directory";
+export const MEMORY_TOOL_NAME = "save_memory";
diff --git a/packages/gemini-core/src/tools/tool-registry.test.ts b/packages/gemini-core/src/tools/tool-registry.test.ts
index 17218aaaa..3b33ab423 100644
--- a/packages/gemini-core/src/tools/tool-registry.test.ts
+++ b/packages/gemini-core/src/tools/tool-registry.test.ts
@@ -4,33 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { spawn } from "node:child_process";
+import fs from "node:fs";
+import type { CallableTool, FunctionDeclaration } from "@google/genai";
+import { mcpToTool } from "@google/genai";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mocked, MockInstance } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { ConfigParameters } from '../config/config.js';
-import { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
-import {
-  ToolRegistry,
-  DiscoveredTool,
-  DISCOVERED_TOOL_PREFIX,
-} from './tool-registry.js';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-import type { FunctionDeclaration, CallableTool } from '@google/genai';
-import { mcpToTool } from '@google/genai';
-import { spawn } from 'node:child_process';
-
-import fs from 'node:fs';
-import { MockTool } from '../test-utils/mock-tool.js';
-import { ToolErrorType } from './tool-error.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-
-vi.mock('node:fs');
+import type { Mocked, MockInstance } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ConfigParameters } from "../config/config.js";
+import { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { ApprovalMode } from "../policy/types.js";
+import { MockTool } from "../test-utils/mock-tool.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { DISCOVERED_TOOL_PREFIX, DiscoveredTool, ToolRegistry } from "./tool-registry.js";
+
+vi.mock("node:fs");
 
 // Mock node:child_process
-vi.mock('node:child_process', async () => {
-  const actual = await vi.importActual('node:child_process');
+vi.mock("node:child_process", async () => {
+  const actual = await vi.importActual("node:child_process");
   return {
     ...actual,
     execSync: vi.fn(),
@@ -44,7 +38,7 @@ const mockMcpClientOnError = vi.fn();
 const mockStdioTransportClose = vi.fn();
 const mockSseTransportClose = vi.fn();
 
-vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
+vi.mock("@modelcontextprotocol/sdk/client/index.js", () => {
   const MockClient = vi.fn().mockImplementation(() => ({
     connect: mockMcpClientConnect,
     set onerror(handler: any) {
@@ -54,7 +48,7 @@ vi.mock('@modelcontextprotocol/sdk/client/index.js', () => {
   return { Client: MockClient };
 });
 
-vi.mock('@modelcontextprotocol/sdk/client/stdio.js', () => {
+vi.mock("@modelcontextprotocol/sdk/client/stdio.js", () => {
   const MockStdioClientTransport = vi.fn().mockImplementation(() => ({
     stderr: {
       on: vi.fn(),
@@ -64,7 +58,7 @@ vi.mock('@modelcontextprotocol/sdk/client/stdio.js', () => {
   return { StdioClientTransport: MockStdioClientTransport };
 });
 
-vi.mock('@modelcontextprotocol/sdk/client/sse.js', () => {
+vi.mock("@modelcontextprotocol/sdk/client/sse.js", () => {
   const MockSSEClientTransport = vi.fn().mockImplementation(() => ({
     close: mockSseTransportClose,
   }));
@@ -72,9 +66,8 @@ vi.mock('@modelcontextprotocol/sdk/client/sse.js', () => {
 });
 
 // Mock @google/genai mcpToTool
-vi.mock('@google/genai', async () => {
-  const actualGenai =
-    await vi.importActual<typeof import('@google/genai')>('@google/genai');
+vi.mock("@google/genai", async () => {
+  const actualGenai = await vi.importActual<typeof import("@google/genai")>("@google/genai");
   return {
     ...actualGenai,
     mcpToTool: vi.fn().mockImplementation(() => ({
@@ -85,33 +78,29 @@ vi.mock('@google/genai', async () => {
 });
 
 // Helper to create a mock CallableTool for specific test needs
-const createMockCallableTool = (
-  toolDeclarations: FunctionDeclaration[],
-): Mocked<CallableTool> => ({
+const createMockCallableTool = (toolDeclarations: FunctionDeclaration[]): Mocked<CallableTool> => ({
   tool: vi.fn().mockResolvedValue({ functionDeclarations: toolDeclarations }),
   callTool: vi.fn(),
 });
 
 const baseConfigParams: ConfigParameters = {
-  cwd: '/tmp',
-  model: 'test-model',
-  embeddingModel: 'test-embedding-model',
+  cwd: "/tmp",
+  model: "test-model",
+  embeddingModel: "test-embedding-model",
   sandbox: undefined,
-  targetDir: '/test/dir',
+  targetDir: "/test/dir",
   debugMode: false,
-  userMemory: '',
+  userMemory: "",
   geminiMdFileCount: 0,
   approvalMode: ApprovalMode.DEFAULT,
-  sessionId: 'test-session-id',
+  sessionId: "test-session-id",
 };
 
-describe('ToolRegistry', () => {
+describe("ToolRegistry", () => {
   let config: Config;
   let toolRegistry: ToolRegistry;
   let mockConfigGetToolDiscoveryCommand: ReturnType<typeof vi.spyOn>;
-  let mockConfigGetExcludedTools: MockInstance<
-    typeof Config.prototype.getExcludeTools
-  >;
+  let mockConfigGetExcludedTools: MockInstance<typeof Config.prototype.getExcludeTools>;
 
   beforeEach(() => {
     vi.mocked(fs.existsSync).mockReturnValue(true);
@@ -120,10 +109,10 @@ describe('ToolRegistry', () => {
     } as fs.Stats);
     config = new Config(baseConfigParams);
     toolRegistry = new ToolRegistry(config);
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(console, 'debug').mockImplementation(() => {});
-    vi.spyOn(console, 'log').mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(console, "debug").mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
 
     mockMcpClientConnect.mockReset().mockResolvedValue(undefined);
     mockStdioTransportClose.mockReset();
@@ -131,14 +120,11 @@ describe('ToolRegistry', () => {
     vi.mocked(mcpToTool).mockClear();
     vi.mocked(mcpToTool).mockReturnValue(createMockCallableTool([]));
 
-    mockConfigGetToolDiscoveryCommand = vi.spyOn(
-      config,
-      'getToolDiscoveryCommand',
-    );
-    mockConfigGetExcludedTools = vi.spyOn(config, 'getExcludeTools');
-    vi.spyOn(config, 'getMcpServers');
-    vi.spyOn(config, 'getMcpServerCommand');
-    vi.spyOn(config, 'getPromptRegistry').mockReturnValue({
+    mockConfigGetToolDiscoveryCommand = vi.spyOn(config, "getToolDiscoveryCommand");
+    mockConfigGetExcludedTools = vi.spyOn(config, "getExcludeTools");
+    vi.spyOn(config, "getMcpServers");
+    vi.spyOn(config, "getMcpServerCommand");
+    vi.spyOn(config, "getPromptRegistry").mockReturnValue({
       clear: vi.fn(),
       removePromptsByServer: vi.fn(),
     } as any);
@@ -148,58 +134,58 @@ describe('ToolRegistry', () => {
     vi.restoreAllMocks();
   });
 
-  describe('registerTool', () => {
-    it('should register a new tool', () => {
-      const tool = new MockTool({ name: 'mock-tool' });
+  describe("registerTool", () => {
+    it("should register a new tool", () => {
+      const tool = new MockTool({ name: "mock-tool" });
       toolRegistry.registerTool(tool);
-      expect(toolRegistry.getTool('mock-tool')).toBe(tool);
+      expect(toolRegistry.getTool("mock-tool")).toBe(tool);
     });
   });
 
-  describe('excluded tools', () => {
+  describe("excluded tools", () => {
     const simpleTool = new MockTool({
-      name: 'tool-a',
-      displayName: 'Tool a',
+      name: "tool-a",
+      displayName: "Tool a",
     });
     const excludedTool = new ExcludedMockTool({
-      name: 'excluded-tool-class',
-      displayName: 'Excluded Tool Class',
+      name: "excluded-tool-class",
+      displayName: "Excluded Tool Class",
     });
     const mockCallable = {} as CallableTool;
     const mcpTool = new DiscoveredMCPTool(
       mockCallable,
-      'mcp-server',
-      'excluded-mcp-tool',
-      'description',
+      "mcp-server",
+      "excluded-mcp-tool",
+      "description",
       {},
     );
     const allowedTool = new MockTool({
-      name: 'allowed-tool',
-      displayName: 'Allowed Tool',
+      name: "allowed-tool",
+      displayName: "Allowed Tool",
     });
 
     it.each([
       {
-        name: 'should match simple names',
+        name: "should match simple names",
         tools: [simpleTool],
-        excludedTools: ['tool-a'],
+        excludedTools: ["tool-a"],
       },
       {
-        name: 'should match simple MCP tool names, when qualified or unqualified',
+        name: "should match simple MCP tool names, when qualified or unqualified",
         tools: [mcpTool, mcpTool.asFullyQualifiedTool()],
         excludedTools: [mcpTool.name],
       },
       {
-        name: 'should match qualified MCP tool names when qualified or unqualified',
+        name: "should match qualified MCP tool names when qualified or unqualified",
         tools: [mcpTool, mcpTool.asFullyQualifiedTool()],
         excludedTools: [`${mcpTool.getFullyQualifiedPrefix()}${mcpTool.name}`],
       },
       {
-        name: 'should match class names',
+        name: "should match class names",
         tools: [excludedTool],
-        excludedTools: ['ExcludedMockTool'],
+        excludedTools: ["ExcludedMockTool"],
       },
-    ])('$name', ({ tools, excludedTools }) => {
+    ])("$name", ({ tools, excludedTools }) => {
       toolRegistry.registerTool(allowedTool);
       for (const tool of tools) {
         toolRegistry.registerTool(tool);
@@ -213,24 +199,20 @@ describe('ToolRegistry', () => {
       );
       for (const tool of tools) {
         expect(toolRegistry.getTool(tool.name)).toBeUndefined();
-        expect(
-          toolRegistry.getFunctionDeclarationsFiltered([tool.name]),
-        ).toHaveLength(0);
+        expect(toolRegistry.getFunctionDeclarationsFiltered([tool.name])).toHaveLength(0);
         if (tool instanceof DiscoveredMCPTool) {
-          expect(toolRegistry.getToolsByServer(tool.serverName)).toHaveLength(
-            0,
-          );
+          expect(toolRegistry.getToolsByServer(tool.serverName)).toHaveLength(0);
         }
       }
     });
   });
 
-  describe('getAllTools', () => {
-    it('should return all registered tools sorted alphabetically by displayName', () => {
+  describe("getAllTools", () => {
+    it("should return all registered tools sorted alphabetically by displayName", () => {
       // Register tools with displayNames in non-alphabetical order
-      const toolC = new MockTool({ name: 'c-tool', displayName: 'Tool C' });
-      const toolA = new MockTool({ name: 'a-tool', displayName: 'Tool A' });
-      const toolB = new MockTool({ name: 'b-tool', displayName: 'Tool B' });
+      const toolC = new MockTool({ name: "c-tool", displayName: "Tool C" });
+      const toolA = new MockTool({ name: "a-tool", displayName: "Tool A" });
+      const toolB = new MockTool({ name: "b-tool", displayName: "Tool B" });
 
       toolRegistry.registerTool(toolC);
       toolRegistry.registerTool(toolA);
@@ -240,16 +222,16 @@ describe('ToolRegistry', () => {
       const displayNames = allTools.map((t) => t.displayName);
 
       // Assert that the returned array is sorted by displayName
-      expect(displayNames).toEqual(['Tool A', 'Tool B', 'Tool C']);
+      expect(displayNames).toEqual(["Tool A", "Tool B", "Tool C"]);
     });
   });
 
-  describe('getAllToolNames', () => {
-    it('should return all registered tool names', () => {
+  describe("getAllToolNames", () => {
+    it("should return all registered tool names", () => {
       // Register tools with displayNames in non-alphabetical order
-      const toolC = new MockTool({ name: 'c-tool', displayName: 'Tool C' });
-      const toolA = new MockTool({ name: 'a-tool', displayName: 'Tool A' });
-      const toolB = new MockTool({ name: 'b-tool', displayName: 'Tool B' });
+      const toolC = new MockTool({ name: "c-tool", displayName: "Tool C" });
+      const toolA = new MockTool({ name: "a-tool", displayName: "Tool A" });
+      const toolB = new MockTool({ name: "b-tool", displayName: "Tool B" });
 
       toolRegistry.registerTool(toolC);
       toolRegistry.registerTool(toolA);
@@ -258,50 +240,32 @@ describe('ToolRegistry', () => {
       const toolNames = toolRegistry.getAllToolNames();
 
       // Assert that the returned array contains all tool names
-      expect(toolNames).toEqual(['c-tool', 'a-tool', 'b-tool']);
+      expect(toolNames).toEqual(["c-tool", "a-tool", "b-tool"]);
     });
   });
 
-  describe('getToolsByServer', () => {
-    it('should return an empty array if no tools match the server name', () => {
-      toolRegistry.registerTool(new MockTool({ name: 'mock-tool' }));
-      expect(toolRegistry.getToolsByServer('any-mcp-server')).toEqual([]);
+  describe("getToolsByServer", () => {
+    it("should return an empty array if no tools match the server name", () => {
+      toolRegistry.registerTool(new MockTool({ name: "mock-tool" }));
+      expect(toolRegistry.getToolsByServer("any-mcp-server")).toEqual([]);
     });
 
-    it('should return only tools matching the server name, sorted by name', async () => {
-      const server1Name = 'mcp-server-uno';
-      const server2Name = 'mcp-server-dos';
+    it("should return only tools matching the server name, sorted by name", async () => {
+      const server1Name = "mcp-server-uno";
+      const server2Name = "mcp-server-dos";
       const mockCallable = {} as CallableTool;
-      const mcpTool1_c = new DiscoveredMCPTool(
-        mockCallable,
-        server1Name,
-        'zebra-tool',
-        'd1',
-        {},
-      );
-      const mcpTool1_a = new DiscoveredMCPTool(
-        mockCallable,
-        server1Name,
-        'apple-tool',
-        'd2',
-        {},
-      );
-      const mcpTool1_b = new DiscoveredMCPTool(
-        mockCallable,
-        server1Name,
-        'banana-tool',
-        'd3',
-        {},
-      );
+      const mcpTool1_c = new DiscoveredMCPTool(mockCallable, server1Name, "zebra-tool", "d1", {});
+      const mcpTool1_a = new DiscoveredMCPTool(mockCallable, server1Name, "apple-tool", "d2", {});
+      const mcpTool1_b = new DiscoveredMCPTool(mockCallable, server1Name, "banana-tool", "d3", {});
 
       const mcpTool2 = new DiscoveredMCPTool(
         mockCallable,
         server2Name,
-        'tool-on-server2',
-        'd4',
+        "tool-on-server2",
+        "d4",
         {},
       );
-      const nonMcpTool = new MockTool({ name: 'regular-tool' });
+      const nonMcpTool = new MockTool({ name: "regular-tool" });
 
       toolRegistry.registerTool(mcpTool1_c);
       toolRegistry.registerTool(mcpTool1_a);
@@ -314,7 +278,7 @@ describe('ToolRegistry', () => {
 
       // Assert that the array has the correct tools and is sorted by name
       expect(toolsFromServer1).toHaveLength(3);
-      expect(toolNames).toEqual(['apple-tool', 'banana-tool', 'zebra-tool']);
+      expect(toolNames).toEqual(["apple-tool", "banana-tool", "zebra-tool"]);
 
       // Assert that all returned tools are indeed from the correct server
       for (const tool of toolsFromServer1) {
@@ -328,32 +292,20 @@ describe('ToolRegistry', () => {
     });
   });
 
-  describe('sortTools', () => {
-    it('should sort tools by priority: built-in, discovered, then MCP (by server name)', () => {
-      const builtIn1 = new MockTool({ name: 'builtin-1' });
-      const builtIn2 = new MockTool({ name: 'builtin-2' });
+  describe("sortTools", () => {
+    it("should sort tools by priority: built-in, discovered, then MCP (by server name)", () => {
+      const builtIn1 = new MockTool({ name: "builtin-1" });
+      const builtIn2 = new MockTool({ name: "builtin-2" });
       const discovered1 = new DiscoveredTool(
         config,
-        'discovered-1',
-        DISCOVERED_TOOL_PREFIX + 'discovered-1',
-        'desc',
+        "discovered-1",
+        DISCOVERED_TOOL_PREFIX + "discovered-1",
+        "desc",
         {},
       );
       const mockCallable = {} as CallableTool;
-      const mcpZebra = new DiscoveredMCPTool(
-        mockCallable,
-        'zebra-server',
-        'mcp-zebra',
-        'desc',
-        {},
-      );
-      const mcpApple = new DiscoveredMCPTool(
-        mockCallable,
-        'apple-server',
-        'mcp-apple',
-        'desc',
-        {},
-      );
+      const mcpZebra = new DiscoveredMCPTool(mockCallable, "zebra-server", "mcp-zebra", "desc", {});
+      const mcpApple = new DiscoveredMCPTool(mockCallable, "apple-server", "mcp-apple", "desc", {});
 
       // Register in mixed order
       toolRegistry.registerTool(mcpZebra);
@@ -365,29 +317,29 @@ describe('ToolRegistry', () => {
       toolRegistry.sortTools();
 
       expect(toolRegistry.getAllToolNames()).toEqual([
-        'builtin-1',
-        'builtin-2',
-        DISCOVERED_TOOL_PREFIX + 'discovered-1',
-        'mcp-apple',
-        'mcp-zebra',
+        "builtin-1",
+        "builtin-2",
+        DISCOVERED_TOOL_PREFIX + "discovered-1",
+        "mcp-apple",
+        "mcp-zebra",
       ]);
     });
   });
 
-  describe('discoverTools', () => {
-    it('should will preserve tool parametersJsonSchema during discovery from command', async () => {
-      const discoveryCommand = 'my-discovery-command';
+  describe("discoverTools", () => {
+    it("should will preserve tool parametersJsonSchema during discovery from command", async () => {
+      const discoveryCommand = "my-discovery-command";
       mockConfigGetToolDiscoveryCommand.mockReturnValue(discoveryCommand);
 
       const unsanitizedToolDeclaration: FunctionDeclaration = {
-        name: 'tool-with-bad-format',
-        description: 'A tool with an invalid format property',
+        name: "tool-with-bad-format",
+        description: "A tool with an invalid format property",
         parametersJsonSchema: {
-          type: 'object',
+          type: "object",
           properties: {
             some_string: {
-              type: 'string',
-              format: 'uuid', // This is an unsupported format
+              type: "string",
+              format: "uuid", // This is an unsupported format
             },
           },
         },
@@ -403,13 +355,9 @@ describe('ToolRegistry', () => {
 
       // Simulate stdout data
       mockChildProcess.stdout.on.mockImplementation((event, callback) => {
-        if (event === 'data') {
+        if (event === "data") {
           callback(
-            Buffer.from(
-              JSON.stringify([
-                { function_declarations: [unsanitizedToolDeclaration] },
-              ]),
-            ),
+            Buffer.from(JSON.stringify([{ function_declarations: [unsanitizedToolDeclaration] }])),
           );
         }
         return mockChildProcess as any;
@@ -417,7 +365,7 @@ describe('ToolRegistry', () => {
 
       // Simulate process close
       mockChildProcess.on.mockImplementation((event, callback) => {
-        if (event === 'close') {
+        if (event === "close") {
           callback(0);
         }
         return mockChildProcess as any;
@@ -425,34 +373,31 @@ describe('ToolRegistry', () => {
 
       await toolRegistry.discoverAllTools();
 
-      const discoveredTool = toolRegistry.getTool(
-        DISCOVERED_TOOL_PREFIX + 'tool-with-bad-format',
-      );
+      const discoveredTool = toolRegistry.getTool(DISCOVERED_TOOL_PREFIX + "tool-with-bad-format");
       expect(discoveredTool).toBeDefined();
 
-      const registeredParams = (discoveredTool as DiscoveredTool).schema
-        .parametersJsonSchema;
+      const registeredParams = (discoveredTool as DiscoveredTool).schema.parametersJsonSchema;
       expect(registeredParams).toStrictEqual({
-        type: 'object',
+        type: "object",
         properties: {
           some_string: {
-            type: 'string',
-            format: 'uuid',
+            type: "string",
+            format: "uuid",
           },
         },
       });
     });
 
-    it('should return a DISCOVERED_TOOL_EXECUTION_ERROR on tool failure', async () => {
-      const discoveryCommand = 'my-discovery-command';
+    it("should return a DISCOVERED_TOOL_EXECUTION_ERROR on tool failure", async () => {
+      const discoveryCommand = "my-discovery-command";
       mockConfigGetToolDiscoveryCommand.mockReturnValue(discoveryCommand);
-      vi.spyOn(config, 'getToolCallCommand').mockReturnValue('my-call-command');
+      vi.spyOn(config, "getToolCallCommand").mockReturnValue("my-call-command");
 
       const toolDeclaration: FunctionDeclaration = {
-        name: 'failing-tool',
-        description: 'A tool that fails',
+        name: "failing-tool",
+        description: "A tool that fails",
         parametersJsonSchema: {
-          type: 'object',
+          type: "object",
           properties: {},
         },
       };
@@ -467,24 +412,18 @@ describe('ToolRegistry', () => {
       mockSpawn.mockReturnValueOnce(discoveryProcess as any);
 
       discoveryProcess.stdout.on.mockImplementation((event, callback) => {
-        if (event === 'data') {
-          callback(
-            Buffer.from(
-              JSON.stringify([{ functionDeclarations: [toolDeclaration] }]),
-            ),
-          );
+        if (event === "data") {
+          callback(Buffer.from(JSON.stringify([{ functionDeclarations: [toolDeclaration] }])));
         }
       });
       discoveryProcess.on.mockImplementation((event, callback) => {
-        if (event === 'close') {
+        if (event === "close") {
           callback(0);
         }
       });
 
       await toolRegistry.discoverAllTools();
-      const discoveredTool = toolRegistry.getTool(
-        DISCOVERED_TOOL_PREFIX + 'failing-tool',
-      );
+      const discoveredTool = toolRegistry.getTool(DISCOVERED_TOOL_PREFIX + "failing-tool");
       expect(discoveredTool).toBeDefined();
 
       // --- Execution Mock ---
@@ -500,12 +439,12 @@ describe('ToolRegistry', () => {
       mockSpawn.mockReturnValueOnce(executionProcess as any);
 
       executionProcess.stderr.on.mockImplementation((event, callback) => {
-        if (event === 'data') {
-          callback(Buffer.from('Something went wrong'));
+        if (event === "data") {
+          callback(Buffer.from("Something went wrong"));
         }
       });
       executionProcess.on.mockImplementation((event, callback) => {
-        if (event === 'close') {
+        if (event === "close") {
           callback(1); // Non-zero exit code
         }
       });
@@ -513,15 +452,13 @@ describe('ToolRegistry', () => {
       const invocation = (discoveredTool as DiscoveredTool).build({});
       const result = await invocation.execute(new AbortController().signal);
 
-      expect(result.error?.type).toBe(
-        ToolErrorType.DISCOVERED_TOOL_EXECUTION_ERROR,
-      );
-      expect(result.llmContent).toContain('Stderr: Something went wrong');
-      expect(result.llmContent).toContain('Exit Code: 1');
+      expect(result.error?.type).toBe(ToolErrorType.DISCOVERED_TOOL_EXECUTION_ERROR);
+      expect(result.llmContent).toContain("Stderr: Something went wrong");
+      expect(result.llmContent).toContain("Exit Code: 1");
     });
 
-    it('should pass MessageBus to DiscoveredTool and its invocations', async () => {
-      const discoveryCommand = 'my-discovery-command';
+    it("should pass MessageBus to DiscoveredTool and its invocations", async () => {
+      const discoveryCommand = "my-discovery-command";
       mockConfigGetToolDiscoveryCommand.mockReturnValue(discoveryCommand);
 
       // Mock MessageBus
@@ -533,9 +470,9 @@ describe('ToolRegistry', () => {
       toolRegistry.setMessageBus(mockMessageBus);
 
       const toolDeclaration: FunctionDeclaration = {
-        name: 'policy-test-tool',
-        description: 'tests policy',
-        parametersJsonSchema: { type: 'object', properties: {} },
+        name: "policy-test-tool",
+        description: "tests policy",
+        parametersJsonSchema: { type: "object", properties: {} },
       };
 
       const mockSpawn = vi.mocked(spawn);
@@ -548,24 +485,18 @@ describe('ToolRegistry', () => {
       mockSpawn.mockReturnValueOnce(discoveryProcess as any);
 
       discoveryProcess.stdout.on.mockImplementation((event, callback) => {
-        if (event === 'data') {
-          callback(
-            Buffer.from(
-              JSON.stringify([{ functionDeclarations: [toolDeclaration] }]),
-            ),
-          );
+        if (event === "data") {
+          callback(Buffer.from(JSON.stringify([{ functionDeclarations: [toolDeclaration] }])));
         }
       });
       discoveryProcess.on.mockImplementation((event, callback) => {
-        if (event === 'close') {
+        if (event === "close") {
           callback(0);
         }
       });
 
       await toolRegistry.discoverAllTools();
-      const tool = toolRegistry.getTool(
-        DISCOVERED_TOOL_PREFIX + 'policy-test-tool',
-      );
+      const tool = toolRegistry.getTool(DISCOVERED_TOOL_PREFIX + "policy-test-tool");
       expect(tool).toBeDefined();
 
       // Verify DiscoveredTool has the message bus
@@ -578,16 +509,16 @@ describe('ToolRegistry', () => {
     });
   });
 
-  describe('DiscoveredToolInvocation', () => {
-    it('should return the stringified params from getDescription', () => {
+  describe("DiscoveredToolInvocation", () => {
+    it("should return the stringified params from getDescription", () => {
       const tool = new DiscoveredTool(
         config,
-        'test-tool',
-        DISCOVERED_TOOL_PREFIX + 'test-tool',
-        'A test tool',
+        "test-tool",
+        DISCOVERED_TOOL_PREFIX + "test-tool",
+        "A test tool",
         {},
       );
-      const params = { param: 'testValue' };
+      const params = { param: "testValue" };
       const invocation = tool.build(params);
       const description = invocation.getDescription();
       expect(description).toBe(JSON.stringify(params));
diff --git a/packages/gemini-core/src/tools/tool-registry.ts b/packages/gemini-core/src/tools/tool-registry.ts
index c59e82e93..95f11ecbd 100644
--- a/packages/gemini-core/src/tools/tool-registry.ts
+++ b/packages/gemini-core/src/tools/tool-registry.ts
@@ -4,32 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FunctionDeclaration } from '@google/genai';
-import type {
-  AnyDeclarativeTool,
-  ToolResult,
-  ToolInvocation,
-} from './tools.js';
-import { Kind, BaseDeclarativeTool, BaseToolInvocation } from './tools.js';
-import type { Config } from '../config/config.js';
-import { spawn } from 'node:child_process';
-import { StringDecoder } from 'node:string_decoder';
-import { DiscoveredMCPTool } from './mcp-tool.js';
-import { parse } from 'shell-quote';
-import { ToolErrorType } from './tool-error.js';
-import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { debugLogger } from '../utils/debugLogger.js';
-import { coreEvents } from '../utils/events.js';
-
-export const DISCOVERED_TOOL_PREFIX = 'discovered_tool_';
+import { spawn } from "node:child_process";
+import { StringDecoder } from "node:string_decoder";
+import type { FunctionDeclaration } from "@google/genai";
+import { parse } from "shell-quote";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { coreEvents } from "../utils/events.js";
+import { safeJsonStringify } from "../utils/safeJsonStringify.js";
+import { DiscoveredMCPTool } from "./mcp-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { AnyDeclarativeTool, ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
+
+export const DISCOVERED_TOOL_PREFIX = "discovered_tool_";
 
 type ToolParams = Record<string, unknown>;
 
-class DiscoveredToolInvocation extends BaseToolInvocation<
-  ToolParams,
-  ToolResult
-> {
+class DiscoveredToolInvocation extends BaseToolInvocation<ToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     private readonly originalToolName: string,
@@ -53,8 +46,8 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
     child.stdin.write(JSON.stringify(this.params));
     child.stdin.end();
 
-    let stdout = '';
-    let stderr = '';
+    let stdout = "";
+    let stderr = "";
     let error: Error | null = null;
     let code: number | null = null;
     let signal: NodeJS.Signals | null = null;
@@ -72,10 +65,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
         error = err;
       };
 
-      const onClose = (
-        _code: number | null,
-        _signal: NodeJS.Signals | null,
-      ) => {
+      const onClose = (_code: number | null, _signal: NodeJS.Signals | null) => {
         code = _code;
         signal = _signal;
         cleanup();
@@ -83,30 +73,30 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
       };
 
       const cleanup = () => {
-        child.stdout.removeListener('data', onStdout);
-        child.stderr.removeListener('data', onStderr);
-        child.removeListener('error', onError);
-        child.removeListener('close', onClose);
+        child.stdout.removeListener("data", onStdout);
+        child.stderr.removeListener("data", onStderr);
+        child.removeListener("error", onError);
+        child.removeListener("close", onClose);
         if (child.connected) {
           child.disconnect();
         }
       };
 
-      child.stdout.on('data', onStdout);
-      child.stderr.on('data', onStderr);
-      child.on('error', onError);
-      child.on('close', onClose);
+      child.stdout.on("data", onStdout);
+      child.stderr.on("data", onStderr);
+      child.on("error", onError);
+      child.on("close", onClose);
     });
 
     // if there is any error, non-zero exit code, signal, or stderr, return error details instead of stdout
     if (error || code !== 0 || signal || stderr) {
       const llmContent = [
-        `Stdout: ${stdout || '(empty)'}`,
-        `Stderr: ${stderr || '(empty)'}`,
-        `Error: ${error ?? '(none)'}`,
-        `Exit Code: ${code ?? '(none)'}`,
-        `Signal: ${signal ?? '(none)'}`,
-      ].join('\n');
+        `Stdout: ${stdout || "(empty)"}`,
+        `Stderr: ${stderr || "(empty)"}`,
+        `Error: ${error ?? "(none)"}`,
+        `Exit Code: ${code ?? "(none)"}`,
+        `Signal: ${signal ?? "(none)"}`,
+      ].join("\n");
       return {
         llmContent,
         returnDisplay: llmContent,
@@ -124,10 +114,7 @@ class DiscoveredToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class DiscoveredTool extends BaseDeclarativeTool<
-  ToolParams,
-  ToolResult
-> {
+export class DiscoveredTool extends BaseDeclarativeTool<ToolParams, ToolResult> {
   private readonly originalName: string;
 
   constructor(
@@ -221,9 +208,7 @@ export class ToolRegistry {
         tool = tool.asFullyQualifiedTool();
       } else {
         // Decide on behavior: throw error, log warning, or allow overwrite
-        debugLogger.warn(
-          `Tool with name "${tool.name}" is already registered. Overwriting.`,
-        );
+        debugLogger.warn(`Tool with name "${tool.name}" is already registered. Overwriting.`);
       }
     }
     this.allKnownTools.set(tool.name, tool);
@@ -306,15 +291,13 @@ export class ToolRegistry {
     try {
       const cmdParts = parse(discoveryCmd);
       if (cmdParts.length === 0) {
-        throw new Error(
-          'Tool discovery command is empty or contains only whitespace.',
-        );
+        throw new Error("Tool discovery command is empty or contains only whitespace.");
       }
       const proc = spawn(cmdParts[0] as string, cmdParts.slice(1) as string[]);
-      let stdout = '';
-      const stdoutDecoder = new StringDecoder('utf8');
-      let stderr = '';
-      const stderrDecoder = new StringDecoder('utf8');
+      let stdout = "";
+      const stdoutDecoder = new StringDecoder("utf8");
+      let stderr = "";
+      const stderrDecoder = new StringDecoder("utf8");
       let sizeLimitExceeded = false;
       const MAX_STDOUT_SIZE = 10 * 1024 * 1024; // 10MB limit
       const MAX_STDERR_SIZE = 10 * 1024 * 1024; // 10MB limit
@@ -322,7 +305,7 @@ export class ToolRegistry {
       let stdoutByteLength = 0;
       let stderrByteLength = 0;
 
-      proc.stdout.on('data', (data) => {
+      proc.stdout.on("data", (data) => {
         if (sizeLimitExceeded) return;
         if (stdoutByteLength + data.length > MAX_STDOUT_SIZE) {
           sizeLimitExceeded = true;
@@ -333,7 +316,7 @@ export class ToolRegistry {
         stdout += stdoutDecoder.write(data);
       });
 
-      proc.stderr.on('data', (data) => {
+      proc.stderr.on("data", (data) => {
         if (sizeLimitExceeded) return;
         if (stderrByteLength + data.length > MAX_STDERR_SIZE) {
           sizeLimitExceeded = true;
@@ -345,8 +328,8 @@ export class ToolRegistry {
       });
 
       await new Promise<void>((resolve, reject) => {
-        proc.on('error', reject);
-        proc.on('close', (code) => {
+        proc.on("error", reject);
+        proc.on("close", (code) => {
           stdout += stdoutDecoder.end();
           stderr += stderrDecoder.end();
 
@@ -360,13 +343,11 @@ export class ToolRegistry {
 
           if (code !== 0) {
             coreEvents.emitFeedback(
-              'error',
+              "error",
               `Tool discovery command failed with code ${code}.`,
               stderr,
             );
-            return reject(
-              new Error(`Tool discovery command failed with exit code ${code}`),
-            );
+            return reject(new Error(`Tool discovery command failed with exit code ${code}`));
           }
           resolve();
         });
@@ -377,18 +358,16 @@ export class ToolRegistry {
       const discoveredItems = JSON.parse(stdout.trim());
 
       if (!discoveredItems || !Array.isArray(discoveredItems)) {
-        throw new Error(
-          'Tool discovery command did not return a JSON array of tools.',
-        );
+        throw new Error("Tool discovery command did not return a JSON array of tools.");
       }
 
       for (const tool of discoveredItems) {
-        if (tool && typeof tool === 'object') {
-          if (Array.isArray(tool['function_declarations'])) {
-            functions.push(...tool['function_declarations']);
-          } else if (Array.isArray(tool['functionDeclarations'])) {
-            functions.push(...tool['functionDeclarations']);
-          } else if (tool['name']) {
+        if (tool && typeof tool === "object") {
+          if (Array.isArray(tool["function_declarations"])) {
+            functions.push(...tool["function_declarations"]);
+          } else if (Array.isArray(tool["functionDeclarations"])) {
+            functions.push(...tool["functionDeclarations"]);
+          } else if (tool["name"]) {
             functions.push(tool as FunctionDeclaration);
           }
         }
@@ -396,12 +375,12 @@ export class ToolRegistry {
       // register each function as a tool
       for (const func of functions) {
         if (!func.name) {
-          debugLogger.warn('Discovered a tool with no name. Skipping.');
+          debugLogger.warn("Discovered a tool with no name. Skipping.");
           continue;
         }
         const parameters =
           func.parametersJsonSchema &&
-          typeof func.parametersJsonSchema === 'object' &&
+          typeof func.parametersJsonSchema === "object" &&
           !Array.isArray(func.parametersJsonSchema)
             ? func.parametersJsonSchema
             : {};
@@ -410,7 +389,7 @@ export class ToolRegistry {
             this.config,
             func.name,
             DISCOVERED_TOOL_PREFIX + func.name,
-            func.description ?? '',
+            func.description ?? "",
             parameters as Record<string, unknown>,
             this.messageBus,
           ),
@@ -441,19 +420,14 @@ export class ToolRegistry {
    * @param excludeTools (optional, helps performance for repeated calls)
    * @returns Whether or not the `tool` is not excluded.
    */
-  private isActiveTool(
-    tool: AnyDeclarativeTool,
-    excludeTools?: Set<string>,
-  ): boolean {
+  private isActiveTool(tool: AnyDeclarativeTool, excludeTools?: Set<string>): boolean {
     excludeTools ??= this.config.getExcludeTools() ?? new Set([]);
-    const normalizedClassName = tool.constructor.name.replace(/^_+/, '');
+    const normalizedClassName = tool.constructor.name.replace(/^_+/, "");
     const possibleNames = [tool.name, normalizedClassName];
     if (tool instanceof DiscoveredMCPTool) {
       // Check both the unqualified and qualified name for MCP tools.
       if (tool.name.startsWith(tool.getFullyQualifiedPrefix())) {
-        possibleNames.push(
-          tool.name.substring(tool.getFullyQualifiedPrefix().length),
-        );
+        possibleNames.push(tool.name.substring(tool.getFullyQualifiedPrefix().length));
       } else {
         possibleNames.push(`${tool.getFullyQualifiedPrefix()}${tool.name}`);
       }
@@ -503,9 +477,7 @@ export class ToolRegistry {
    * Returns an array of all registered and discovered tool instances.
    */
   getAllTools(): AnyDeclarativeTool[] {
-    return this.getActiveTools().sort((a, b) =>
-      a.displayName.localeCompare(b.displayName),
-    );
+    return this.getActiveTools().sort((a, b) => a.displayName.localeCompare(b.displayName));
   }
 
   /**
diff --git a/packages/gemini-core/src/tools/tools.test.ts b/packages/gemini-core/src/tools/tools.test.ts
index 38827268c..f20953596 100644
--- a/packages/gemini-core/src/tools/tools.test.ts
+++ b/packages/gemini-core/src/tools/tools.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { DeclarativeTool, hasCycleInSchema, Kind } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
+import { describe, expect, it, vi } from "vitest";
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { DeclarativeTool, hasCycleInSchema, Kind } from "./tools.js";
 
 class TestToolInvocation implements ToolInvocation<object, ToolResult> {
   constructor(
@@ -16,7 +16,7 @@ class TestToolInvocation implements ToolInvocation<object, ToolResult> {
   ) {}
 
   getDescription(): string {
-    return 'A test invocation';
+    return "A test invocation";
   }
 
   toolLocations() {
@@ -36,7 +36,7 @@ class TestTool extends DeclarativeTool<object, ToolResult> {
   private readonly buildFn: (params: object) => TestToolInvocation;
 
   constructor(buildFn: (params: object) => TestToolInvocation) {
-    super('test-tool', 'Test Tool', 'A tool for testing', Kind.Other, {});
+    super("test-tool", "Test Tool", "A tool for testing", Kind.Other, {});
     this.buildFn = buildFn;
   }
 
@@ -45,17 +45,17 @@ class TestTool extends DeclarativeTool<object, ToolResult> {
   }
 }
 
-describe('DeclarativeTool', () => {
-  describe('validateBuildAndExecute', () => {
+describe("DeclarativeTool", () => {
+  describe("validateBuildAndExecute", () => {
     const abortSignal = new AbortController().signal;
 
-    it('should return INVALID_TOOL_PARAMS error if build fails', async () => {
-      const buildError = new Error('Invalid build parameters');
+    it("should return INVALID_TOOL_PARAMS error if build fails", async () => {
+      const buildError = new Error("Invalid build parameters");
       const buildFn = vi.fn().mockImplementation(() => {
         throw buildError;
       });
       const tool = new TestTool(buildFn);
-      const params = { foo: 'bar' };
+      const params = { foo: "bar" };
 
       const result = await tool.validateBuildAndExecute(params, abortSignal);
 
@@ -70,13 +70,13 @@ describe('DeclarativeTool', () => {
       });
     });
 
-    it('should return EXECUTION_FAILED error if execute fails', async () => {
-      const executeError = new Error('Execution failed');
+    it("should return EXECUTION_FAILED error if execute fails", async () => {
+      const executeError = new Error("Execution failed");
       const executeFn = vi.fn().mockRejectedValue(executeError);
       const invocation = new TestToolInvocation({}, executeFn);
       const buildFn = vi.fn().mockReturnValue(invocation);
       const tool = new TestTool(buildFn);
-      const params = { foo: 'bar' };
+      const params = { foo: "bar" };
 
       const result = await tool.validateBuildAndExecute(params, abortSignal);
 
@@ -92,16 +92,16 @@ describe('DeclarativeTool', () => {
       });
     });
 
-    it('should return the result of execute on success', async () => {
+    it("should return the result of execute on success", async () => {
       const successResult: ToolResult = {
-        llmContent: 'Success!',
-        returnDisplay: 'Success!',
+        llmContent: "Success!",
+        returnDisplay: "Success!",
       };
       const executeFn = vi.fn().mockResolvedValue(successResult);
       const invocation = new TestToolInvocation({}, executeFn);
       const buildFn = vi.fn().mockReturnValue(invocation);
       const tool = new TestTool(buildFn);
-      const params = { foo: 'bar' };
+      const params = { foo: "bar" };
 
       const result = await tool.validateBuildAndExecute(params, abortSignal);
 
@@ -112,26 +112,26 @@ describe('DeclarativeTool', () => {
   });
 });
 
-describe('hasCycleInSchema', () => {
-  it('should detect a simple direct cycle', () => {
+describe("hasCycleInSchema", () => {
+  it("should detect a simple direct cycle", () => {
     const schema = {
       properties: {
         data: {
-          $ref: '#/properties/data',
+          $ref: "#/properties/data",
         },
       },
     };
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should detect a cycle from object properties referencing parent properties', () => {
+  it("should detect a cycle from object properties referencing parent properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         data: {
-          type: 'object',
+          type: "object",
           properties: {
-            child: { $ref: '#/properties/data' },
+            child: { $ref: "#/properties/data" },
           },
         },
       },
@@ -139,16 +139,16 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should detect a cycle from array items referencing parent properties', () => {
+  it("should detect a cycle from array items referencing parent properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         data: {
-          type: 'array',
+          type: "array",
           items: {
-            type: 'object',
+            type: "object",
             properties: {
-              child: { $ref: '#/properties/data/items' },
+              child: { $ref: "#/properties/data/items" },
             },
           },
         },
@@ -157,20 +157,20 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should detect a cycle between sibling properties', () => {
+  it("should detect a cycle between sibling properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         a: {
-          type: 'object',
+          type: "object",
           properties: {
-            child: { $ref: '#/properties/b' },
+            child: { $ref: "#/properties/b" },
           },
         },
         b: {
-          type: 'object',
+          type: "object",
           properties: {
-            child: { $ref: '#/properties/a' },
+            child: { $ref: "#/properties/a" },
           },
         },
       },
@@ -178,19 +178,19 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(true);
   });
 
-  it('should not detect a cycle in a valid schema', () => {
+  it("should not detect a cycle in a valid schema", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
-        name: { type: 'string' },
-        address: { $ref: '#/definitions/address' },
+        name: { type: "string" },
+        address: { $ref: "#/definitions/address" },
       },
       definitions: {
         address: {
-          type: 'object',
+          type: "object",
           properties: {
-            street: { type: 'string' },
-            city: { type: 'string' },
+            street: { type: "string" },
+            city: { type: "string" },
           },
         },
       },
@@ -198,33 +198,33 @@ describe('hasCycleInSchema', () => {
     expect(hasCycleInSchema(schema)).toBe(false);
   });
 
-  it('should handle non-cyclic sibling refs', () => {
+  it("should handle non-cyclic sibling refs", () => {
     const schema = {
       properties: {
-        a: { $ref: '#/definitions/stringDef' },
-        b: { $ref: '#/definitions/stringDef' },
+        a: { $ref: "#/definitions/stringDef" },
+        b: { $ref: "#/definitions/stringDef" },
       },
       definitions: {
-        stringDef: { type: 'string' },
+        stringDef: { type: "string" },
       },
     };
     expect(hasCycleInSchema(schema)).toBe(false);
   });
 
-  it('should handle nested but not cyclic refs', () => {
+  it("should handle nested but not cyclic refs", () => {
     const schema = {
       properties: {
-        a: { $ref: '#/definitions/defA' },
+        a: { $ref: "#/definitions/defA" },
       },
       definitions: {
-        defA: { properties: { b: { $ref: '#/definitions/defB' } } },
-        defB: { type: 'string' },
+        defA: { properties: { b: { $ref: "#/definitions/defB" } } },
+        defB: { type: "string" },
       },
     };
     expect(hasCycleInSchema(schema)).toBe(false);
   });
 
-  it('should return false for an empty schema', () => {
+  it("should return false for an empty schema", () => {
     expect(hasCycleInSchema({})).toBe(false);
   });
 });
diff --git a/packages/gemini-core/src/tools/tools.ts b/packages/gemini-core/src/tools/tools.ts
index 5c741fb08..b64a810fb 100644
--- a/packages/gemini-core/src/tools/tools.ts
+++ b/packages/gemini-core/src/tools/tools.ts
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FunctionDeclaration, PartListUnion } from '@google/genai';
-import { ToolErrorType } from './tool-error.js';
-import type { DiffUpdateResult } from '../ide/ide-client.js';
-import type { ShellExecutionConfig } from '../services/shellExecutionService.js';
-import { SchemaValidator } from '../utils/schemaValidator.js';
-import type { AnsiOutput } from '../utils/terminalSerializer.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
+import type { FunctionDeclaration, PartListUnion } from "@google/genai";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
 import {
   MessageBusType,
   type ToolConfirmationRequest,
   type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
+} from "../confirmation-bus/types.js";
+import type { DiffUpdateResult } from "../ide/ide-client.js";
+import type { ShellExecutionConfig } from "../services/shellExecutionService.js";
+import { SchemaValidator } from "../utils/schemaValidator.js";
+import type { AnsiOutput } from "../utils/terminalSerializer.js";
+import { ToolErrorType } from "./tool-error.js";
 
 /**
  * Represents a validated and ready-to-execute tool call.
  * An instance of this is created by a `ToolBuilder`.
  */
-export interface ToolInvocation<
-  TParams extends object,
-  TResult extends ToolResult,
-> {
+export interface ToolInvocation<TParams extends object, TResult extends ToolResult> {
   /**
    * The validated parameters for this specific invocation.
    */
@@ -48,9 +45,7 @@ export interface ToolInvocation<
    * Determines if the tool should prompt for confirmation before execution.
    * @returns Confirmation details or false if no confirmation is needed.
    */
-  shouldConfirmExecute(
-    abortSignal: AbortSignal,
-  ): Promise<ToolCallConfirmationDetails | false>;
+  shouldConfirmExecute(abortSignal: AbortSignal): Promise<ToolCallConfirmationDetails | false>;
 
   /**
    * Executes the tool with the validated parameters.
@@ -68,10 +63,8 @@ export interface ToolInvocation<
 /**
  * A convenience base class for ToolInvocation.
  */
-export abstract class BaseToolInvocation<
-  TParams extends object,
-  TResult extends ToolResult,
-> implements ToolInvocation<TParams, TResult>
+export abstract class BaseToolInvocation<TParams extends object, TResult extends ToolResult>
+  implements ToolInvocation<TParams, TResult>
 {
   constructor(
     readonly params: TParams,
@@ -92,19 +85,17 @@ export abstract class BaseToolInvocation<
   ): Promise<ToolCallConfirmationDetails | false> {
     if (this.messageBus) {
       const decision = await this.getMessageBusDecision(abortSignal);
-      if (decision === 'ALLOW') {
+      if (decision === "ALLOW") {
         return false;
       }
 
-      if (decision === 'DENY') {
+      if (decision === "DENY") {
         throw new Error(
-          `Tool execution for "${
-            this._toolDisplayName || this._toolName
-          }" denied by policy.`,
+          `Tool execution for "${this._toolDisplayName || this._toolName}" denied by policy.`,
         );
       }
 
-      if (decision === 'ASK_USER') {
+      if (decision === "ASK_USER") {
         return this.getConfirmationDetails(abortSignal);
       }
     }
@@ -125,7 +116,7 @@ export abstract class BaseToolInvocation<
     }
 
     const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
+      type: "info",
       title: `Confirm: ${this._toolDisplayName || this._toolName}`,
       prompt: this.getDescription(),
       onConfirm: async (outcome: ToolConfirmationOutcome) => {
@@ -144,11 +135,11 @@ export abstract class BaseToolInvocation<
 
   protected getMessageBusDecision(
     abortSignal: AbortSignal,
-  ): Promise<'ALLOW' | 'DENY' | 'ASK_USER'> {
+  ): Promise<"ALLOW" | "DENY" | "ASK_USER"> {
     if (!this.messageBus) {
       // If there's no message bus, we can't make a decision, so we allow.
       // The legacy confirmation flow will still apply if the tool needs it.
-      return Promise.resolve('ALLOW');
+      return Promise.resolve("ALLOW");
     }
 
     const correlationId = randomUUID();
@@ -157,9 +148,9 @@ export abstract class BaseToolInvocation<
       args: this.params as Record<string, unknown>,
     };
 
-    return new Promise<'ALLOW' | 'DENY' | 'ASK_USER'>((resolve) => {
+    return new Promise<"ALLOW" | "DENY" | "ASK_USER">((resolve) => {
       if (!this.messageBus) {
-        resolve('ALLOW');
+        resolve("ALLOW");
         return;
       }
 
@@ -170,20 +161,17 @@ export abstract class BaseToolInvocation<
           clearTimeout(timeoutId);
           timeoutId = undefined;
         }
-        abortSignal.removeEventListener('abort', abortHandler);
-        this.messageBus?.unsubscribe(
-          MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-          responseHandler,
-        );
+        abortSignal.removeEventListener("abort", abortHandler);
+        this.messageBus?.unsubscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
       };
 
       const abortHandler = () => {
         cleanup();
-        resolve('DENY');
+        resolve("DENY");
       };
 
       if (abortSignal.aborted) {
-        resolve('DENY');
+        resolve("DENY");
         return;
       }
 
@@ -191,26 +179,23 @@ export abstract class BaseToolInvocation<
         if (response.correlationId === correlationId) {
           cleanup();
           if (response.requiresUserConfirmation) {
-            resolve('ASK_USER');
+            resolve("ASK_USER");
           } else if (response.confirmed) {
-            resolve('ALLOW');
+            resolve("ALLOW");
           } else {
-            resolve('DENY');
+            resolve("DENY");
           }
         }
       };
 
-      abortSignal.addEventListener('abort', abortHandler);
+      abortSignal.addEventListener("abort", abortHandler);
 
       timeoutId = setTimeout(() => {
         cleanup();
-        resolve('ASK_USER'); // Default to ASK_USER on timeout
+        resolve("ASK_USER"); // Default to ASK_USER on timeout
       }, 30000);
 
-      this.messageBus.subscribe(
-        MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        responseHandler,
-      );
+      this.messageBus.subscribe(MessageBusType.TOOL_CONFIRMATION_RESPONSE, responseHandler);
 
       const request: ToolConfirmationRequest = {
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
@@ -223,7 +208,7 @@ export abstract class BaseToolInvocation<
         this.messageBus.publish(request);
       } catch (_error) {
         cleanup();
-        resolve('ALLOW');
+        resolve("ALLOW");
       }
     });
   }
@@ -243,10 +228,7 @@ export type AnyToolInvocation = ToolInvocation<object, ToolResult>;
 /**
  * Interface for a tool builder that validates parameters and creates invocations.
  */
-export interface ToolBuilder<
-  TParams extends object,
-  TResult extends ToolResult,
-> {
+export interface ToolBuilder<TParams extends object, TResult extends ToolResult> {
   /**
    * The internal name of the tool (used for API calls).
    */
@@ -294,10 +276,8 @@ export interface ToolBuilder<
  * New base class for tools that separates validation from execution.
  * New tools should extend this class.
  */
-export abstract class DeclarativeTool<
-  TParams extends object,
-  TResult extends ToolResult,
-> implements ToolBuilder<TParams, TResult>
+export abstract class DeclarativeTool<TParams extends object, TResult extends ToolResult>
+  implements ToolBuilder<TParams, TResult>
 {
   constructor(
     readonly name: string,
@@ -364,9 +344,7 @@ export abstract class DeclarativeTool<
    * @param params The raw, untrusted parameters from the model.
    * @returns A `ToolInvocation` instance.
    */
-  private silentBuild(
-    params: TParams,
-  ): ToolInvocation<TParams, TResult> | Error {
+  private silentBuild(params: TParams): ToolInvocation<TParams, TResult> | Error {
     try {
       return this.build(params);
     } catch (e) {
@@ -384,10 +362,7 @@ export abstract class DeclarativeTool<
    * @params abortSignal a signal to abort.
    * @returns The result of the tool execution.
    */
-  async validateBuildAndExecute(
-    params: TParams,
-    abortSignal: AbortSignal,
-  ): Promise<ToolResult> {
+  async validateBuildAndExecute(params: TParams, abortSignal: AbortSignal): Promise<ToolResult> {
     const invocationOrError = this.silentBuild(params);
     if (invocationOrError instanceof Error) {
       const errorMessage = invocationOrError.message;
@@ -404,8 +379,7 @@ export abstract class DeclarativeTool<
     try {
       return await invocationOrError.execute(abortSignal);
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       return {
         llmContent: `Error: Tool call execution failed. Reason: ${errorMessage}`,
         returnDisplay: errorMessage,
@@ -433,19 +407,11 @@ export abstract class BaseDeclarativeTool<
     if (validationError) {
       throw new Error(validationError);
     }
-    return this.createInvocation(
-      params,
-      this.messageBus,
-      this.name,
-      this.displayName,
-    );
+    return this.createInvocation(params, this.messageBus, this.name, this.displayName);
   }
 
   override validateToolParams(params: TParams): string | null {
-    const errors = SchemaValidator.validate(
-      this.schema.parametersJsonSchema,
-      params,
-    );
+    const errors = SchemaValidator.validate(this.schema.parametersJsonSchema, params);
 
     if (errors) {
       return errors;
@@ -478,11 +444,11 @@ export type AnyDeclarativeTool = DeclarativeTool<object, ToolResult>;
  */
 export function isTool(obj: unknown): obj is AnyDeclarativeTool {
   return (
-    typeof obj === 'object' &&
+    typeof obj === "object" &&
     obj !== null &&
-    'name' in obj &&
-    'build' in obj &&
-    typeof (obj as AnyDeclarativeTool).build === 'function'
+    "name" in obj &&
+    "build" in obj &&
+    typeof (obj as AnyDeclarativeTool).build === "function"
   );
 }
 
@@ -518,17 +484,13 @@ export interface ToolResult {
  */
 export function hasCycleInSchema(schema: object): boolean {
   function resolveRef(ref: string): object | null {
-    if (!ref.startsWith('#/')) {
+    if (!ref.startsWith("#/")) {
       return null;
     }
-    const path = ref.substring(2).split('/');
+    const path = ref.substring(2).split("/");
     let current: unknown = schema;
     for (const segment of path) {
-      if (
-        typeof current !== 'object' ||
-        current === null ||
-        !Object.prototype.hasOwnProperty.call(current, segment)
-      ) {
+      if (typeof current !== "object" || current === null || !Object.hasOwn(current, segment)) {
         return null;
       }
       current = (current as Record<string, unknown>)[segment];
@@ -536,12 +498,8 @@ export function hasCycleInSchema(schema: object): boolean {
     return current as object;
   }
 
-  function traverse(
-    node: unknown,
-    visitedRefs: Set<string>,
-    pathRefs: Set<string>,
-  ): boolean {
-    if (typeof node !== 'object' || node === null) {
+  function traverse(node: unknown, visitedRefs: Set<string>, pathRefs: Set<string>): boolean {
+    if (typeof node !== "object" || node === null) {
       return false;
     }
 
@@ -554,9 +512,9 @@ export function hasCycleInSchema(schema: object): boolean {
       return false;
     }
 
-    if ('$ref' in node && typeof node.$ref === 'string') {
+    if ("$ref" in node && typeof node.$ref === "string") {
       const ref = node.$ref;
-      if (ref === '#' || ref === '#/' || pathRefs.has(ref)) {
+      if (ref === "#" || ref === "#/" || pathRefs.has(ref)) {
         // A ref to just '#/' is always a cycle.
         return true; // Cycle detected!
       }
@@ -577,14 +535,8 @@ export function hasCycleInSchema(schema: object): boolean {
 
     // Crawl all the properties of node
     for (const key in node) {
-      if (Object.prototype.hasOwnProperty.call(node, key)) {
-        if (
-          traverse(
-            (node as Record<string, unknown>)[key],
-            visitedRefs,
-            pathRefs,
-          )
-        ) {
+      if (Object.hasOwn(node, key)) {
+        if (traverse((node as Record<string, unknown>)[key], visitedRefs, pathRefs)) {
           return true;
         }
       }
@@ -602,7 +554,7 @@ export interface TodoList {
 
 export type ToolResultDisplay = string | FileDiff | AnsiOutput | TodoList;
 
-export type TodoStatus = 'pending' | 'in_progress' | 'completed' | 'cancelled';
+export type TodoStatus = "pending" | "in_progress" | "completed" | "cancelled";
 
 export interface Todo {
   description: string;
@@ -629,12 +581,9 @@ export interface DiffStat {
 }
 
 export interface ToolEditConfirmationDetails {
-  type: 'edit';
+  type: "edit";
   title: string;
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    payload?: ToolConfirmationPayload,
-  ) => Promise<void>;
+  onConfirm: (outcome: ToolConfirmationOutcome, payload?: ToolConfirmationPayload) => Promise<void>;
   fileName: string;
   filePath: string;
   fileDiff: string;
@@ -651,7 +600,7 @@ export interface ToolConfirmationPayload {
 }
 
 export interface ToolExecuteConfirmationDetails {
-  type: 'exec';
+  type: "exec";
   title: string;
   onConfirm: (outcome: ToolConfirmationOutcome) => Promise<void>;
   command: string;
@@ -659,7 +608,7 @@ export interface ToolExecuteConfirmationDetails {
 }
 
 export interface ToolMcpConfirmationDetails {
-  type: 'mcp';
+  type: "mcp";
   title: string;
   serverName: string;
   toolName: string;
@@ -668,7 +617,7 @@ export interface ToolMcpConfirmationDetails {
 }
 
 export interface ToolInfoConfirmationDetails {
-  type: 'info';
+  type: "info";
   title: string;
   onConfirm: (outcome: ToolConfirmationOutcome) => Promise<void>;
   prompt: string;
@@ -682,33 +631,28 @@ export type ToolCallConfirmationDetails =
   | ToolInfoConfirmationDetails;
 
 export enum ToolConfirmationOutcome {
-  ProceedOnce = 'proceed_once',
-  ProceedAlways = 'proceed_always',
-  ProceedAlwaysServer = 'proceed_always_server',
-  ProceedAlwaysTool = 'proceed_always_tool',
-  ModifyWithEditor = 'modify_with_editor',
-  Cancel = 'cancel',
+  ProceedOnce = "proceed_once",
+  ProceedAlways = "proceed_always",
+  ProceedAlwaysServer = "proceed_always_server",
+  ProceedAlwaysTool = "proceed_always_tool",
+  ModifyWithEditor = "modify_with_editor",
+  Cancel = "cancel",
 }
 
 export enum Kind {
-  Read = 'read',
-  Edit = 'edit',
-  Delete = 'delete',
-  Move = 'move',
-  Search = 'search',
-  Execute = 'execute',
-  Think = 'think',
-  Fetch = 'fetch',
-  Other = 'other',
+  Read = "read",
+  Edit = "edit",
+  Delete = "delete",
+  Move = "move",
+  Search = "search",
+  Execute = "execute",
+  Think = "think",
+  Fetch = "fetch",
+  Other = "other",
 }
 
 // Function kinds that have side effects
-export const MUTATOR_KINDS: Kind[] = [
-  Kind.Edit,
-  Kind.Delete,
-  Kind.Move,
-  Kind.Execute,
-] as const;
+export const MUTATOR_KINDS: Kind[] = [Kind.Edit, Kind.Delete, Kind.Move, Kind.Execute] as const;
 
 export interface ToolLocation {
   // Absolute path to the file
diff --git a/packages/gemini-core/src/tools/web-fetch.test.ts b/packages/gemini-core/src/tools/web-fetch.test.ts
index bda4a1548..1ca813f20 100644
--- a/packages/gemini-core/src/tools/web-fetch.test.ts
+++ b/packages/gemini-core/src/tools/web-fetch.test.ts
@@ -4,41 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { WebFetchTool, parsePrompt } from './web-fetch.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import * as fetchUtils from '../utils/fetch.js';
-import { MessageBus } from '../confirmation-bus/message-bus.js';
-import { PolicyEngine } from '../policy/policy-engine.js';
-import {
-  MessageBusType,
-  type ToolConfirmationResponse,
-} from '../confirmation-bus/types.js';
-import { randomUUID } from 'node:crypto';
-import {
-  logWebFetchFallbackAttempt,
-  WebFetchFallbackAttemptEvent,
-} from '../telemetry/index.js';
-import { convert } from 'html-to-text';
+import { randomUUID } from "node:crypto";
+import { convert } from "html-to-text";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { MessageBus } from "../confirmation-bus/message-bus.js";
+import { MessageBusType, type ToolConfirmationResponse } from "../confirmation-bus/types.js";
+import { PolicyEngine } from "../policy/policy-engine.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logWebFetchFallbackAttempt, WebFetchFallbackAttemptEvent } from "../telemetry/index.js";
+import * as fetchUtils from "../utils/fetch.js";
+import { ToolErrorType } from "./tool-error.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+import { parsePrompt, WebFetchTool } from "./web-fetch.js";
 
 const mockGenerateContent = vi.fn();
 const mockGetGeminiClient = vi.fn(() => ({
   generateContent: mockGenerateContent,
 }));
 
-vi.mock('html-to-text', () => ({
+vi.mock("html-to-text", () => ({
   convert: vi.fn((text) => `Converted: ${text}`),
 }));
 
-vi.mock('../telemetry/index.js', () => ({
+vi.mock("../telemetry/index.js", () => ({
   logWebFetchFallbackAttempt: vi.fn(),
   WebFetchFallbackAttemptEvent: vi.fn(),
 }));
 
-vi.mock('../utils/fetch.js', async (importOriginal) => {
+vi.mock("../utils/fetch.js", async (importOriginal) => {
   const actual = await importOriginal<typeof fetchUtils>();
   return {
     ...actual,
@@ -47,92 +41,89 @@ vi.mock('../utils/fetch.js', async (importOriginal) => {
   };
 });
 
-vi.mock('node:crypto', () => ({
+vi.mock("node:crypto", () => ({
   randomUUID: vi.fn(),
 }));
 
-describe('parsePrompt', () => {
-  it('should extract valid URLs separated by whitespace', () => {
-    const prompt = 'Go to https://example.com and http://google.com';
+describe("parsePrompt", () => {
+  it("should extract valid URLs separated by whitespace", () => {
+    const prompt = "Go to https://example.com and http://google.com";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(errors).toHaveLength(0);
     expect(validUrls).toHaveLength(2);
-    expect(validUrls[0]).toBe('https://example.com/');
-    expect(validUrls[1]).toBe('http://google.com/');
+    expect(validUrls[0]).toBe("https://example.com/");
+    expect(validUrls[1]).toBe("http://google.com/");
   });
 
-  it('should accept URLs with trailing punctuation', () => {
-    const prompt = 'Check https://example.com.';
+  it("should accept URLs with trailing punctuation", () => {
+    const prompt = "Check https://example.com.";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(errors).toHaveLength(0);
     expect(validUrls).toHaveLength(1);
-    expect(validUrls[0]).toBe('https://example.com./');
+    expect(validUrls[0]).toBe("https://example.com./");
   });
 
-  it('should detect URLs wrapped in punctuation as malformed', () => {
-    const prompt = 'Read (https://example.com)';
+  it("should detect URLs wrapped in punctuation as malformed", () => {
+    const prompt = "Read (https://example.com)";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(0);
     expect(errors).toHaveLength(1);
-    expect(errors[0]).toContain('Malformed URL detected');
-    expect(errors[0]).toContain('(https://example.com)');
+    expect(errors[0]).toContain("Malformed URL detected");
+    expect(errors[0]).toContain("(https://example.com)");
   });
 
-  it('should detect unsupported protocols (httpshttps://)', () => {
-    const prompt =
-      'Summarize httpshttps://github.com/JuliaLang/julia/issues/58346';
+  it("should detect unsupported protocols (httpshttps://)", () => {
+    const prompt = "Summarize httpshttps://github.com/JuliaLang/julia/issues/58346";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(0);
     expect(errors).toHaveLength(1);
-    expect(errors[0]).toContain('Unsupported protocol');
-    expect(errors[0]).toContain(
-      'httpshttps://github.com/JuliaLang/julia/issues/58346',
-    );
+    expect(errors[0]).toContain("Unsupported protocol");
+    expect(errors[0]).toContain("httpshttps://github.com/JuliaLang/julia/issues/58346");
   });
 
-  it('should detect unsupported protocols (ftp://)', () => {
-    const prompt = 'ftp://example.com/file.txt';
+  it("should detect unsupported protocols (ftp://)", () => {
+    const prompt = "ftp://example.com/file.txt";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(0);
     expect(errors).toHaveLength(1);
-    expect(errors[0]).toContain('Unsupported protocol');
+    expect(errors[0]).toContain("Unsupported protocol");
   });
 
-  it('should detect malformed URLs', () => {
+  it("should detect malformed URLs", () => {
     // http:// is not a valid URL in Node's new URL()
-    const prompt = 'http://';
+    const prompt = "http://";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(0);
     expect(errors).toHaveLength(1);
-    expect(errors[0]).toContain('Malformed URL detected');
+    expect(errors[0]).toContain("Malformed URL detected");
   });
 
-  it('should handle prompts with no URLs', () => {
-    const prompt = 'hello world';
+  it("should handle prompts with no URLs", () => {
+    const prompt = "hello world";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(0);
     expect(errors).toHaveLength(0);
   });
 
-  it('should handle mixed valid and invalid URLs', () => {
-    const prompt = 'Valid: https://google.com, Invalid: ftp://bad.com';
+  it("should handle mixed valid and invalid URLs", () => {
+    const prompt = "Valid: https://google.com, Invalid: ftp://bad.com";
     const { validUrls, errors } = parsePrompt(prompt);
 
     expect(validUrls).toHaveLength(1);
-    expect(validUrls[0]).toBe('https://google.com,/');
+    expect(validUrls[0]).toBe("https://google.com,/");
     expect(errors).toHaveLength(1);
-    expect(errors[0]).toContain('ftp://bad.com');
+    expect(errors[0]).toContain("ftp://bad.com");
   });
 });
 
-describe('WebFetchTool', () => {
+describe("WebFetchTool", () => {
   let mockConfig: Config;
 
   beforeEach(() => {
@@ -152,71 +143,65 @@ describe('WebFetchTool', () => {
     } as unknown as Config;
   });
 
-  describe('validateToolParamValues', () => {
-    it('should throw if prompt is empty', () => {
+  describe("validateToolParamValues", () => {
+    it("should throw if prompt is empty", () => {
       const tool = new WebFetchTool(mockConfig);
-      expect(() => tool.build({ prompt: '' })).toThrow(
-        "The 'prompt' parameter cannot be empty",
-      );
+      expect(() => tool.build({ prompt: "" })).toThrow("The 'prompt' parameter cannot be empty");
     });
 
-    it('should throw if prompt contains no URLs', () => {
+    it("should throw if prompt contains no URLs", () => {
       const tool = new WebFetchTool(mockConfig);
-      expect(() => tool.build({ prompt: 'hello world' })).toThrow(
+      expect(() => tool.build({ prompt: "hello world" })).toThrow(
         "The 'prompt' must contain at least one valid URL",
       );
     });
 
-    it('should throw if prompt contains malformed URLs (httpshttps://)', () => {
+    it("should throw if prompt contains malformed URLs (httpshttps://)", () => {
       const tool = new WebFetchTool(mockConfig);
-      const prompt = 'fetch httpshttps://example.com';
-      expect(() => tool.build({ prompt })).toThrow('Error(s) in prompt URLs:');
+      const prompt = "fetch httpshttps://example.com";
+      expect(() => tool.build({ prompt })).toThrow("Error(s) in prompt URLs:");
     });
 
-    it('should pass if prompt contains at least one valid URL', () => {
+    it("should pass if prompt contains at least one valid URL", () => {
       const tool = new WebFetchTool(mockConfig);
-      expect(() =>
-        tool.build({ prompt: 'fetch https://example.com' }),
-      ).not.toThrow();
+      expect(() => tool.build({ prompt: "fetch https://example.com" })).not.toThrow();
     });
   });
 
-  describe('execute', () => {
-    it('should return WEB_FETCH_FALLBACK_FAILED on fallback fetch failure', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockRejectedValue(
-        new Error('fetch failed'),
-      );
+  describe("execute", () => {
+    it("should return WEB_FETCH_FALLBACK_FAILED on fallback fetch failure", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(true);
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockRejectedValue(new Error("fetch failed"));
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://private.ip' };
+      const params = { prompt: "fetch https://private.ip" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.WEB_FETCH_FALLBACK_FAILED);
     });
 
-    it('should return WEB_FETCH_PROCESSING_ERROR on general processing failure', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
-      mockGenerateContent.mockRejectedValue(new Error('API error'));
+    it("should return WEB_FETCH_PROCESSING_ERROR on general processing failure", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
+      mockGenerateContent.mockRejectedValue(new Error("API error"));
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://public.ip' };
+      const params = { prompt: "fetch https://public.ip" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error?.type).toBe(ToolErrorType.WEB_FETCH_PROCESSING_ERROR);
     });
 
-    it('should log telemetry when falling back due to private IP', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(true);
+    it("should log telemetry when falling back due to private IP", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(true);
       // Mock fetchWithTimeout to succeed so fallback proceeds
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
-        text: () => Promise.resolve('some content'),
+        text: () => Promise.resolve("some content"),
       } as Response);
       mockGenerateContent.mockResolvedValue({
-        candidates: [{ content: { parts: [{ text: 'fallback response' }] } }],
+        candidates: [{ content: { parts: [{ text: "fallback response" }] } }],
       });
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://private.ip' };
+      const params = { prompt: "fetch https://private.ip" };
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
@@ -224,27 +209,27 @@ describe('WebFetchTool', () => {
         mockConfig,
         expect.any(WebFetchFallbackAttemptEvent),
       );
-      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith('private_ip');
+      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith("private_ip");
     });
 
-    it('should log telemetry when falling back due to primary fetch failure', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
+    it("should log telemetry when falling back due to primary fetch failure", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
       // Mock primary fetch to return empty response, triggering fallback
       mockGenerateContent.mockResolvedValueOnce({
         candidates: [],
       });
       // Mock fetchWithTimeout to succeed so fallback proceeds
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
-        text: () => Promise.resolve('some content'),
+        text: () => Promise.resolve("some content"),
       } as Response);
       // Mock fallback LLM call
       mockGenerateContent.mockResolvedValueOnce({
-        candidates: [{ content: { parts: [{ text: 'fallback response' }] } }],
+        candidates: [{ content: { parts: [{ text: "fallback response" }] } }],
       });
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://public.ip' };
+      const params = { prompt: "fetch https://public.ip" };
       const invocation = tool.build(params);
       await invocation.execute(new AbortController().signal);
 
@@ -252,26 +237,24 @@ describe('WebFetchTool', () => {
         mockConfig,
         expect.any(WebFetchFallbackAttemptEvent),
       );
-      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith(
-        'primary_failed',
-      );
+      expect(WebFetchFallbackAttemptEvent).toHaveBeenCalledWith("primary_failed");
     });
   });
 
-  describe('execute (fallback)', () => {
+  describe("execute (fallback)", () => {
     beforeEach(() => {
       // Force fallback by mocking primary fetch to fail
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
       mockGenerateContent.mockResolvedValueOnce({
         candidates: [],
       });
     });
 
-    it('should convert HTML content using html-to-text', async () => {
-      const htmlContent = '<html><body><h1>Hello</h1></body></html>';
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+    it("should convert HTML content using html-to-text", async () => {
+      const htmlContent = "<html><body><h1>Hello</h1></body></html>";
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
-        headers: new Headers({ 'content-type': 'text/html; charset=utf-8' }),
+        headers: new Headers({ "content-type": "text/html; charset=utf-8" }),
         text: () => Promise.resolve(htmlContent),
       } as Response);
 
@@ -281,25 +264,25 @@ describe('WebFetchTool', () => {
       }));
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(convert).toHaveBeenCalledWith(htmlContent, {
         wordwrap: false,
         selectors: [
-          { selector: 'a', options: { ignoreHref: true } },
-          { selector: 'img', format: 'skip' },
+          { selector: "a", options: { ignoreHref: true } },
+          { selector: "img", format: "skip" },
         ],
       });
       expect(result.llmContent).toContain(`Converted: ${htmlContent}`);
     });
 
-    it('should return raw text for JSON content', async () => {
+    it("should return raw text for JSON content", async () => {
       const jsonContent = '{"key": "value"}';
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
-        headers: new Headers({ 'content-type': 'application/json' }),
+        headers: new Headers({ "content-type": "application/json" }),
         text: () => Promise.resolve(jsonContent),
       } as Response);
 
@@ -309,7 +292,7 @@ describe('WebFetchTool', () => {
       }));
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
@@ -317,11 +300,11 @@ describe('WebFetchTool', () => {
       expect(result.llmContent).toContain(jsonContent);
     });
 
-    it('should return raw text for plain text content', async () => {
-      const textContent = 'Just some text.';
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+    it("should return raw text for plain text content", async () => {
+      const textContent = "Just some text.";
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
-        headers: new Headers({ 'content-type': 'text/plain' }),
+        headers: new Headers({ "content-type": "text/plain" }),
         text: () => Promise.resolve(textContent),
       } as Response);
 
@@ -331,7 +314,7 @@ describe('WebFetchTool', () => {
       }));
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
@@ -339,9 +322,9 @@ describe('WebFetchTool', () => {
       expect(result.llmContent).toContain(textContent);
     });
 
-    it('should treat content with no Content-Type header as HTML', async () => {
-      const content = '<p>No header</p>';
-      vi.spyOn(fetchUtils, 'fetchWithTimeout').mockResolvedValue({
+    it("should treat content with no Content-Type header as HTML", async () => {
+      const content = "<p>No header</p>";
+      vi.spyOn(fetchUtils, "fetchWithTimeout").mockResolvedValue({
         ok: true,
         headers: new Headers(),
         text: () => Promise.resolve(content),
@@ -353,44 +336,43 @@ describe('WebFetchTool', () => {
       }));
 
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const result = await invocation.execute(new AbortController().signal);
 
       expect(convert).toHaveBeenCalledWith(content, {
         wordwrap: false,
         selectors: [
-          { selector: 'a', options: { ignoreHref: true } },
-          { selector: 'img', format: 'skip' },
+          { selector: "a", options: { ignoreHref: true } },
+          { selector: "img", format: "skip" },
         ],
       });
       expect(result.llmContent).toContain(`Converted: ${content}`);
     });
   });
 
-  describe('shouldConfirmExecute', () => {
-    it('should return confirmation details with the correct prompt and parsed urls', async () => {
+  describe("shouldConfirmExecute", () => {
+    it("should return confirmation details with the correct prompt and parsed urls", async () => {
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
         new AbortController().signal,
       );
 
       expect(confirmationDetails).toEqual({
-        type: 'info',
-        title: 'Confirm Web Fetch',
-        prompt: 'fetch https://example.com',
-        urls: ['https://example.com/'],
+        type: "info",
+        title: "Confirm Web Fetch",
+        prompt: "fetch https://example.com",
+        urls: ["https://example.com/"],
         onConfirm: expect.any(Function),
       });
     });
 
-    it('should convert github urls to raw format', async () => {
+    it("should convert github urls to raw format", async () => {
       const tool = new WebFetchTool(mockConfig);
       const params = {
-        prompt:
-          'fetch https://github.com/google/gemini-react/blob/main/README.md',
+        prompt: "fetch https://github.com/google/gemini-react/blob/main/README.md",
       };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
@@ -398,23 +380,18 @@ describe('WebFetchTool', () => {
       );
 
       expect(confirmationDetails).toEqual({
-        type: 'info',
-        title: 'Confirm Web Fetch',
-        prompt:
-          'fetch https://github.com/google/gemini-react/blob/main/README.md',
-        urls: [
-          'https://raw.githubusercontent.com/google/gemini-react/main/README.md',
-        ],
+        type: "info",
+        title: "Confirm Web Fetch",
+        prompt: "fetch https://github.com/google/gemini-react/blob/main/README.md",
+        urls: ["https://raw.githubusercontent.com/google/gemini-react/main/README.md"],
         onConfirm: expect.any(Function),
       });
     });
 
-    it('should return false if approval mode is AUTO_EDIT', async () => {
-      vi.spyOn(mockConfig, 'getApprovalMode').mockReturnValue(
-        ApprovalMode.AUTO_EDIT,
-      );
+    it("should return false if approval mode is AUTO_EDIT", async () => {
+      vi.spyOn(mockConfig, "getApprovalMode").mockReturnValue(ApprovalMode.AUTO_EDIT);
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
         new AbortController().signal,
@@ -423,9 +400,9 @@ describe('WebFetchTool', () => {
       expect(confirmationDetails).toBe(false);
     });
 
-    it('should call setApprovalMode when onConfirm is called with ProceedAlways', async () => {
+    it("should call setApprovalMode when onConfirm is called with ProceedAlways", async () => {
       const tool = new WebFetchTool(mockConfig);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
       const confirmationDetails = await invocation.shouldConfirmExecute(
         new AbortController().signal,
@@ -433,21 +410,17 @@ describe('WebFetchTool', () => {
 
       if (
         confirmationDetails &&
-        typeof confirmationDetails === 'object' &&
-        'onConfirm' in confirmationDetails
+        typeof confirmationDetails === "object" &&
+        "onConfirm" in confirmationDetails
       ) {
-        await confirmationDetails.onConfirm(
-          ToolConfirmationOutcome.ProceedAlways,
-        );
+        await confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedAlways);
       }
 
-      expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(
-        ApprovalMode.AUTO_EDIT,
-      );
+      expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
     });
   });
 
-  describe('Message Bus Integration', () => {
+  describe("Message Bus Integration", () => {
     let policyEngine: PolicyEngine;
     let messageBus: MessageBus;
     let mockUUID: Mock;
@@ -456,32 +429,30 @@ describe('WebFetchTool', () => {
       policyEngine = new PolicyEngine();
       messageBus = new MessageBus(policyEngine);
       mockUUID = vi.mocked(randomUUID);
-      mockUUID.mockReturnValue('test-correlation-id');
+      mockUUID.mockReturnValue("test-correlation-id");
     });
 
-    it('should use message bus for confirmation when available', async () => {
+    it("should use message bus for confirmation when available", async () => {
       const tool = new WebFetchTool(mockConfig, messageBus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
       // Mock message bus publish and subscribe
-      const publishSpy = vi.spyOn(messageBus, 'publish');
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const unsubscribeSpy = vi.spyOn(messageBus, 'unsubscribe');
+      const publishSpy = vi.spyOn(messageBus, "publish");
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const unsubscribeSpy = vi.spyOn(messageBus, "unsubscribe");
 
       // Start confirmation process
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Verify confirmation request was published
       expect(publishSpy).toHaveBeenCalledWith({
         type: MessageBusType.TOOL_CONFIRMATION_REQUEST,
         toolCall: {
-          name: 'web_fetch',
-          args: { prompt: 'fetch https://example.com' },
+          name: "web_fetch",
+          args: { prompt: "fetch https://example.com" },
         },
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
       });
 
       // Verify subscription to response
@@ -494,7 +465,7 @@ describe('WebFetchTool', () => {
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const response: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
         confirmed: true,
       };
 
@@ -505,22 +476,20 @@ describe('WebFetchTool', () => {
       expect(unsubscribeSpy).toHaveBeenCalled();
     });
 
-    it('should reject promise when confirmation is denied via message bus', async () => {
+    it("should reject promise when confirmation is denied via message bus", async () => {
       const tool = new WebFetchTool(mockConfig, messageBus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Simulate denial response
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const response: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
         confirmed: false,
       };
 
@@ -532,35 +501,31 @@ describe('WebFetchTool', () => {
       );
     });
 
-    it('should handle timeout gracefully', async () => {
+    it("should handle timeout gracefully", async () => {
       vi.useFakeTimers();
 
       const tool = new WebFetchTool(mockConfig, messageBus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Fast-forward past timeout
       await vi.advanceTimersByTimeAsync(30000);
       const result = await confirmationPromise;
       expect(result).not.toBe(false);
-      expect(result).toHaveProperty('type', 'info');
+      expect(result).toHaveProperty("type", "info");
 
       vi.useRealTimers();
     });
 
-    it('should handle abort signal during confirmation', async () => {
+    it("should handle abort signal during confirmation", async () => {
       const tool = new WebFetchTool(mockConfig, messageBus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
       const abortController = new AbortController();
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        abortController.signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(abortController.signal);
 
       // Abort the operation
       abortController.abort();
@@ -570,37 +535,33 @@ describe('WebFetchTool', () => {
       );
     });
 
-    it('should fall back to legacy confirmation when no message bus', async () => {
+    it("should fall back to legacy confirmation when no message bus", async () => {
       const tool = new WebFetchTool(mockConfig); // No message bus
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Should use legacy confirmation flow (returns confirmation details, not false)
       expect(result).not.toBe(false);
-      expect(result).toHaveProperty('type', 'info');
+      expect(result).toHaveProperty("type", "info");
     });
 
-    it('should ignore responses with wrong correlation ID', async () => {
+    it("should ignore responses with wrong correlation ID", async () => {
       vi.useFakeTimers();
 
       const tool = new WebFetchTool(mockConfig, messageBus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Send response with wrong correlation ID
       const responseHandler = subscribeSpy.mock.calls[0][1];
       const wrongResponse: ToolConfirmationResponse = {
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'wrong-id',
+        correlationId: "wrong-id",
         confirmed: true,
       };
 
@@ -610,56 +571,52 @@ describe('WebFetchTool', () => {
       await vi.advanceTimersByTimeAsync(30000);
       const result = await confirmationPromise;
       expect(result).not.toBe(false);
-      expect(result).toHaveProperty('type', 'info');
+      expect(result).toHaveProperty("type", "info");
 
       vi.useRealTimers();
     });
 
-    it('should handle message bus publish errors gracefully', async () => {
+    it("should handle message bus publish errors gracefully", async () => {
       const tool = new WebFetchTool(mockConfig, messageBus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
       // Mock publish to throw error
-      vi.spyOn(messageBus, 'publish').mockImplementation(() => {
-        throw new Error('Message bus error');
+      vi.spyOn(messageBus, "publish").mockImplementation(() => {
+        throw new Error("Message bus error");
       });
 
-      const result = await invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const result = await invocation.shouldConfirmExecute(new AbortController().signal);
       expect(result).toBe(false); // Should gracefully fall back
     });
 
-    it('should execute normally after confirmation approval', async () => {
-      vi.spyOn(fetchUtils, 'isPrivateIp').mockReturnValue(false);
+    it("should execute normally after confirmation approval", async () => {
+      vi.spyOn(fetchUtils, "isPrivateIp").mockReturnValue(false);
       mockGenerateContent.mockResolvedValue({
         candidates: [
           {
             content: {
-              parts: [{ text: 'Fetched content from https://example.com' }],
-              role: 'model',
+              parts: [{ text: "Fetched content from https://example.com" }],
+              role: "model",
             },
           },
         ],
       });
 
       const tool = new WebFetchTool(mockConfig, messageBus);
-      const params = { prompt: 'fetch https://example.com' };
+      const params = { prompt: "fetch https://example.com" };
       const invocation = tool.build(params);
 
-      const subscribeSpy = vi.spyOn(messageBus, 'subscribe');
+      const subscribeSpy = vi.spyOn(messageBus, "subscribe");
 
       // Start confirmation
-      const confirmationPromise = invocation.shouldConfirmExecute(
-        new AbortController().signal,
-      );
+      const confirmationPromise = invocation.shouldConfirmExecute(new AbortController().signal);
 
       // Approve via message bus
       const responseHandler = subscribeSpy.mock.calls[0][1];
       responseHandler({
         type: MessageBusType.TOOL_CONFIRMATION_RESPONSE,
-        correlationId: 'test-correlation-id',
+        correlationId: "test-correlation-id",
         confirmed: true,
       });
 
@@ -668,7 +625,7 @@ describe('WebFetchTool', () => {
       // Execute the tool
       const result = await invocation.execute(new AbortController().signal);
       expect(result.error).toBeUndefined();
-      expect(result.llmContent).toContain('Fetched content');
+      expect(result.llmContent).toContain("Fetched content");
     });
   });
 });
diff --git a/packages/gemini-core/src/tools/web-fetch.ts b/packages/gemini-core/src/tools/web-fetch.ts
index 79676851c..614340437 100644
--- a/packages/gemini-core/src/tools/web-fetch.ts
+++ b/packages/gemini-core/src/tools/web-fetch.ts
@@ -4,31 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ToolCallConfirmationDetails,
-  ToolInvocation,
-  ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { ToolErrorType } from './tool-error.js';
-import { getErrorMessage } from '../utils/errors.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import { getResponseText } from '../utils/partUtils.js';
-import { fetchWithTimeout, isPrivateIp } from '../utils/fetch.js';
-import { convert } from 'html-to-text';
-import {
-  logWebFetchFallbackAttempt,
-  WebFetchFallbackAttemptEvent,
-} from '../telemetry/index.js';
-import { WEB_FETCH_TOOL_NAME } from './tool-names.js';
-import { debugLogger } from '../utils/debugLogger.js';
+import { convert } from "html-to-text";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logWebFetchFallbackAttempt, WebFetchFallbackAttemptEvent } from "../telemetry/index.js";
+import { debugLogger } from "../utils/debugLogger.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { fetchWithTimeout, isPrivateIp } from "../utils/fetch.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { ToolErrorType } from "./tool-error.js";
+import { WEB_FETCH_TOOL_NAME } from "./tool-names.js";
+import type { ToolCallConfirmationDetails, ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 const URL_FETCH_TIMEOUT_MS = 10000;
 const MAX_CONTENT_LENGTH = 100000;
@@ -48,13 +36,13 @@ export function parsePrompt(text: string): {
     if (!token) continue;
 
     // Heuristic to check if the url appears to contain URL-like chars.
-    if (token.includes('://')) {
+    if (token.includes("://")) {
       try {
         // Validate with new URL()
         const url = new URL(token);
 
         // Allowlist protocols
-        if (['http:', 'https:'].includes(url.protocol)) {
+        if (["http:", "https:"].includes(url.protocol)) {
           validUrls.push(url.href);
         } else {
           errors.push(
@@ -102,10 +90,7 @@ export interface WebFetchToolParams {
   prompt: string;
 }
 
-class WebFetchToolInvocation extends BaseToolInvocation<
-  WebFetchToolParams,
-  ToolResult
-> {
+class WebFetchToolInvocation extends BaseToolInvocation<WebFetchToolParams, ToolResult> {
   constructor(
     private readonly config: Config,
     params: WebFetchToolParams,
@@ -122,10 +107,8 @@ class WebFetchToolInvocation extends BaseToolInvocation<
     let url = urls[0];
 
     // Convert GitHub blob URL to raw URL
-    if (url.includes('github.com') && url.includes('/blob/')) {
-      url = url
-        .replace('github.com', 'raw.githubusercontent.com')
-        .replace('/blob/', '/');
+    if (url.includes("github.com") && url.includes("/blob/")) {
+      url = url.replace("github.com", "raw.githubusercontent.com").replace("/blob/", "/");
     }
 
     try {
@@ -137,19 +120,16 @@ class WebFetchToolInvocation extends BaseToolInvocation<
       }
 
       const rawContent = await response.text();
-      const contentType = response.headers.get('content-type') || '';
+      const contentType = response.headers.get("content-type") || "";
       let textContent: string;
 
       // Only use html-to-text if content type is HTML, or if no content type is provided (assume HTML)
-      if (
-        contentType.toLowerCase().includes('text/html') ||
-        contentType === ''
-      ) {
+      if (contentType.toLowerCase().includes("text/html") || contentType === "") {
         textContent = convert(rawContent, {
           wordwrap: false,
           selectors: [
-            { selector: 'a', options: { ignoreHref: true } },
-            { selector: 'img', format: 'skip' },
+            { selector: "a", options: { ignoreHref: true } },
+            { selector: "img", format: "skip" },
           ],
         });
       } else {
@@ -169,11 +149,11 @@ ${textContent}
 ---
 `;
       const result = await geminiClient.generateContent(
-        { model: 'web-fetch-fallback' },
-        [{ role: 'user', parts: [{ text: fallbackPrompt }] }],
+        { model: "web-fetch-fallback" },
+        [{ role: "user", parts: [{ text: fallbackPrompt }] }],
         signal,
       );
-      const resultText = getResponseText(result) || '';
+      const resultText = getResponseText(result) || "";
       return {
         llmContent: resultText,
         returnDisplay: `Content for ${url} processed using fallback fetch.`,
@@ -195,7 +175,7 @@ ${textContent}
   getDescription(): string {
     const displayPrompt =
       this.params.prompt.length > 100
-        ? this.params.prompt.substring(0, 97) + '...'
+        ? this.params.prompt.substring(0, 97) + "..."
         : this.params.prompt;
     return `Processing URLs and instructions from prompt: "${displayPrompt}"`;
   }
@@ -212,16 +192,14 @@ ${textContent}
     // URL and the actual URL to be fetched.
     const { validUrls } = parsePrompt(this.params.prompt);
     const urls = validUrls.map((url) => {
-      if (url.includes('github.com') && url.includes('/blob/')) {
-        return url
-          .replace('github.com', 'raw.githubusercontent.com')
-          .replace('/blob/', '/');
+      if (url.includes("github.com") && url.includes("/blob/")) {
+        return url.replace("github.com", "raw.githubusercontent.com").replace("/blob/", "/");
       }
       return url;
     });
 
     const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
+      type: "info",
       title: `Confirm Web Fetch`,
       prompt: this.params.prompt,
       urls,
@@ -241,10 +219,7 @@ ${textContent}
     const isPrivate = isPrivateIp(url);
 
     if (isPrivate) {
-      logWebFetchFallbackAttempt(
-        this.config,
-        new WebFetchFallbackAttemptEvent('private_ip'),
-      );
+      logWebFetchFallbackAttempt(this.config, new WebFetchFallbackAttemptEvent("private_ip"));
       return this.executeFallback(signal);
     }
 
@@ -252,25 +227,20 @@ ${textContent}
 
     try {
       const response = await geminiClient.generateContent(
-        { model: 'web-fetch' },
-        [{ role: 'user', parts: [{ text: userPrompt }] }],
+        { model: "web-fetch" },
+        [{ role: "user", parts: [{ text: userPrompt }] }],
         signal, // Pass signal
       );
 
       debugLogger.debug(
-        `[WebFetchTool] Full response for prompt "${userPrompt.substring(
-          0,
-          50,
-        )}...":`,
+        `[WebFetchTool] Full response for prompt "${userPrompt.substring(0, 50)}...":`,
         JSON.stringify(response, null, 2),
       );
 
-      let responseText = getResponseText(response) || '';
+      let responseText = getResponseText(response) || "";
       const urlContextMeta = response.candidates?.[0]?.urlContextMetadata;
       const groundingMetadata = response.candidates?.[0]?.groundingMetadata;
-      const sources = groundingMetadata?.groundingChunks as
-        | GroundingChunkItem[]
-        | undefined;
+      const sources = groundingMetadata?.groundingChunks as GroundingChunkItem[] | undefined;
       const groundingSupports = groundingMetadata?.groundingSupports as
         | GroundingSupportItem[]
         | undefined;
@@ -278,14 +248,9 @@ ${textContent}
       // Error Handling
       let processingError = false;
 
-      if (
-        urlContextMeta?.urlMetadata &&
-        urlContextMeta.urlMetadata.length > 0
-      ) {
-        const allStatuses = urlContextMeta.urlMetadata.map(
-          (m) => m.urlRetrievalStatus,
-        );
-        if (allStatuses.every((s) => s !== 'URL_RETRIEVAL_STATUS_SUCCESS')) {
+      if (urlContextMeta?.urlMetadata && urlContextMeta.urlMetadata.length > 0) {
+        const allStatuses = urlContextMeta.urlMetadata.map((m) => m.urlRetrievalStatus);
+        if (allStatuses.every((s) => s !== "URL_RETRIEVAL_STATUS_SUCCESS")) {
           processingError = true;
         }
       } else if (!responseText.trim() && !sources?.length) {
@@ -293,28 +258,21 @@ ${textContent}
         processingError = true;
       }
 
-      if (
-        !processingError &&
-        !responseText.trim() &&
-        (!sources || sources.length === 0)
-      ) {
+      if (!processingError && !responseText.trim() && (!sources || sources.length === 0)) {
         // Successfully retrieved some URL (or no specific error from urlContextMeta), but no usable text or grounding data.
         processingError = true;
       }
 
       if (processingError) {
-        logWebFetchFallbackAttempt(
-          this.config,
-          new WebFetchFallbackAttemptEvent('primary_failed'),
-        );
+        logWebFetchFallbackAttempt(this.config, new WebFetchFallbackAttemptEvent("primary_failed"));
         return this.executeFallback(signal);
       }
 
       const sourceListFormatted: string[] = [];
       if (sources && sources.length > 0) {
         sources.forEach((source: GroundingChunkItem, index: number) => {
-          const title = source.web?.title || 'Untitled';
-          const uri = source.web?.uri || 'Unknown URI'; // Fallback if URI is missing
+          const title = source.web?.title || "Untitled";
+          const uri = source.web?.uri || "Unknown URI"; // Fallback if URI is missing
           sourceListFormatted.push(`[${index + 1}] ${title} (${uri})`);
         });
 
@@ -324,7 +282,7 @@ ${textContent}
             if (support.segment && support.groundingChunkIndices) {
               const citationMarker = support.groundingChunkIndices
                 .map((chunkIndex: number) => `[${chunkIndex + 1}]`)
-                .join('');
+                .join("");
               insertions.push({
                 index: support.segment.endIndex,
                 marker: citationMarker,
@@ -333,18 +291,18 @@ ${textContent}
           });
 
           insertions.sort((a, b) => b.index - a.index);
-          const responseChars = responseText.split('');
+          const responseChars = responseText.split("");
           insertions.forEach((insertion) => {
             responseChars.splice(insertion.index, 0, insertion.marker);
           });
-          responseText = responseChars.join('');
+          responseText = responseChars.join("");
         }
 
         if (sourceListFormatted.length > 0) {
           responseText += `
 
 Sources:
-${sourceListFormatted.join('\n')}`;
+${sourceListFormatted.join("\n")}`;
         }
       }
 
@@ -379,10 +337,7 @@ ${sourceListFormatted.join('\n')}`;
 /**
  * Implementation of the WebFetch tool logic
  */
-export class WebFetchTool extends BaseDeclarativeTool<
-  WebFetchToolParams,
-  ToolResult
-> {
+export class WebFetchTool extends BaseDeclarativeTool<WebFetchToolParams, ToolResult> {
   static readonly Name = WEB_FETCH_TOOL_NAME;
 
   constructor(
@@ -391,7 +346,7 @@ export class WebFetchTool extends BaseDeclarativeTool<
   ) {
     super(
       WebFetchTool.Name,
-      'WebFetch',
+      "WebFetch",
       "Processes content from URL(s), including local and private network addresses (e.g., localhost), embedded in a prompt. Include up to 20 URLs and instructions (e.g., summarize, extract specific data) directly in the 'prompt' parameter.",
       Kind.Fetch,
       {
@@ -399,11 +354,11 @@ export class WebFetchTool extends BaseDeclarativeTool<
           prompt: {
             description:
               'A comprehensive prompt that includes the URL(s) (up to 20) to fetch and specific instructions on how to process their content (e.g., "Summarize https://example.com/article and extract key points from https://another.com/data"). All URLs to be fetched must be valid and complete, starting with "http://" or "https://", and be fully-formed with a valid hostname (e.g., a domain name like "example.com" or an IP address). For example, "https://example.com" is valid, but "example.com" is not.',
-            type: 'string',
+            type: "string",
           },
         },
-        required: ['prompt'],
-        type: 'object',
+        required: ["prompt"],
+        type: "object",
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -411,17 +366,15 @@ export class WebFetchTool extends BaseDeclarativeTool<
     );
   }
 
-  protected override validateToolParamValues(
-    params: WebFetchToolParams,
-  ): string | null {
-    if (!params.prompt || params.prompt.trim() === '') {
+  protected override validateToolParamValues(params: WebFetchToolParams): string | null {
+    if (!params.prompt || params.prompt.trim() === "") {
       return "The 'prompt' parameter cannot be empty and must contain URL(s) and instructions.";
     }
 
     const { validUrls, errors } = parsePrompt(params.prompt);
 
     if (errors.length > 0) {
-      return `Error(s) in prompt URLs:\n- ${errors.join('\n- ')}`;
+      return `Error(s) in prompt URLs:\n- ${errors.join("\n- ")}`;
     }
 
     if (validUrls.length === 0) {
@@ -437,12 +390,6 @@ export class WebFetchTool extends BaseDeclarativeTool<
     _toolName?: string,
     _toolDisplayName?: string,
   ): ToolInvocation<WebFetchToolParams, ToolResult> {
-    return new WebFetchToolInvocation(
-      this.config,
-      params,
-      messageBus,
-      _toolName,
-      _toolDisplayName,
-    );
+    return new WebFetchToolInvocation(this.config, params, messageBus, _toolName, _toolDisplayName);
   }
 }
diff --git a/packages/gemini-core/src/tools/web-search.test.ts b/packages/gemini-core/src/tools/web-search.test.ts
index 560e17e4c..11d7eb4e2 100644
--- a/packages/gemini-core/src/tools/web-search.test.ts
+++ b/packages/gemini-core/src/tools/web-search.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { WebSearchToolParams } from './web-search.js';
-import { WebSearchTool } from './web-search.js';
-import type { Config } from '../config/config.js';
-import { GeminiClient } from '../core/client.js';
-import { ToolErrorType } from './tool-error.js';
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { GeminiClient } from "../core/client.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { WebSearchToolParams } from "./web-search.js";
+import { WebSearchTool } from "./web-search.js";
 
 // Mock GeminiClient and Config constructor
-vi.mock('../core/client.js');
-vi.mock('../config/config.js');
+vi.mock("../core/client.js");
+vi.mock("../config/config.js");
 
-describe('WebSearchTool', () => {
+describe("WebSearchTool", () => {
   const abortSignal = new AbortController().signal;
   let mockGeminiClient: GeminiClient;
   let tool: WebSearchTool;
@@ -40,48 +40,42 @@ describe('WebSearchTool', () => {
     vi.restoreAllMocks();
   });
 
-  describe('build', () => {
-    it('should return an invocation for a valid query', () => {
-      const params: WebSearchToolParams = { query: 'test query' };
+  describe("build", () => {
+    it("should return an invocation for a valid query", () => {
+      const params: WebSearchToolParams = { query: "test query" };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
       expect(invocation.params).toEqual(params);
     });
 
-    it('should throw an error for an empty query', () => {
-      const params: WebSearchToolParams = { query: '' };
-      expect(() => tool.build(params)).toThrow(
-        "The 'query' parameter cannot be empty.",
-      );
+    it("should throw an error for an empty query", () => {
+      const params: WebSearchToolParams = { query: "" };
+      expect(() => tool.build(params)).toThrow("The 'query' parameter cannot be empty.");
     });
 
-    it('should throw an error for a query with only whitespace', () => {
-      const params: WebSearchToolParams = { query: '   ' };
-      expect(() => tool.build(params)).toThrow(
-        "The 'query' parameter cannot be empty.",
-      );
+    it("should throw an error for a query with only whitespace", () => {
+      const params: WebSearchToolParams = { query: "   " };
+      expect(() => tool.build(params)).toThrow("The 'query' parameter cannot be empty.");
     });
   });
 
-  describe('getDescription', () => {
-    it('should return a description of the search', () => {
-      const params: WebSearchToolParams = { query: 'test query' };
+  describe("getDescription", () => {
+    it("should return a description of the search", () => {
+      const params: WebSearchToolParams = { query: "test query" };
       const invocation = tool.build(params);
-      expect(invocation.getDescription()).toBe(
-        'Searching the web for: "test query"',
-      );
+      expect(invocation.getDescription()).toBe('Searching the web for: "test query"');
     });
   });
 
-  describe('execute', () => {
-    it('should return search results for a successful query', async () => {
-      const params: WebSearchToolParams = { query: 'successful query' };
+  describe("execute", () => {
+    it("should return search results for a successful query", async () => {
+      const params: WebSearchToolParams = { query: "successful query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'Here are your results.' }],
+              role: "model",
+              parts: [{ text: "Here are your results." }],
             },
           },
         ],
@@ -93,20 +87,18 @@ describe('WebSearchTool', () => {
       expect(result.llmContent).toBe(
         'Web search results for "successful query":\n\nHere are your results.',
       );
-      expect(result.returnDisplay).toBe(
-        'Search results for "successful query" returned.',
-      );
+      expect(result.returnDisplay).toBe('Search results for "successful query" returned.');
       expect(result.sources).toBeUndefined();
     });
 
-    it('should handle no search results found', async () => {
-      const params: WebSearchToolParams = { query: 'no results query' };
+    it("should handle no search results found", async () => {
+      const params: WebSearchToolParams = { query: "no results query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: '' }],
+              role: "model",
+              parts: [{ text: "" }],
             },
           },
         ],
@@ -118,36 +110,36 @@ describe('WebSearchTool', () => {
       expect(result.llmContent).toBe(
         'No search results or information found for query: "no results query"',
       );
-      expect(result.returnDisplay).toBe('No information found.');
+      expect(result.returnDisplay).toBe("No information found.");
     });
 
-    it('should return a WEB_SEARCH_FAILED error on failure', async () => {
-      const params: WebSearchToolParams = { query: 'error query' };
-      const testError = new Error('API Failure');
+    it("should return a WEB_SEARCH_FAILED error on failure", async () => {
+      const params: WebSearchToolParams = { query: "error query" };
+      const testError = new Error("API Failure");
       (mockGeminiClient.generateContent as Mock).mockRejectedValue(testError);
 
       const invocation = tool.build(params);
       const result = await invocation.execute(abortSignal);
 
       expect(result.error?.type).toBe(ToolErrorType.WEB_SEARCH_FAILED);
-      expect(result.llmContent).toContain('Error:');
-      expect(result.llmContent).toContain('API Failure');
-      expect(result.returnDisplay).toBe('Error performing web search.');
+      expect(result.llmContent).toContain("Error:");
+      expect(result.llmContent).toContain("API Failure");
+      expect(result.returnDisplay).toBe("Error performing web search.");
     });
 
-    it('should correctly format results with sources and citations', async () => {
-      const params: WebSearchToolParams = { query: 'grounding query' };
+    it("should correctly format results with sources and citations", async () => {
+      const params: WebSearchToolParams = { query: "grounding query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'This is a test response.' }],
+              role: "model",
+              parts: [{ text: "This is a test response." }],
             },
             groundingMetadata: {
               groundingChunks: [
-                { web: { uri: 'https://example.com', title: 'Example Site' } },
-                { web: { uri: 'https://google.com', title: 'Google' } },
+                { web: { uri: "https://example.com", title: "Example Site" } },
+                { web: { uri: "https://google.com", title: "Google" } },
               ],
               groundingSupports: [
                 {
@@ -176,39 +168,37 @@ Sources:
 [2] Google (https://google.com)`;
 
       expect(result.llmContent).toBe(expectedLlmContent);
-      expect(result.returnDisplay).toBe(
-        'Search results for "grounding query" returned.',
-      );
+      expect(result.returnDisplay).toBe('Search results for "grounding query" returned.');
       expect(result.sources).toHaveLength(2);
     });
 
-    it('should insert markers at correct byte positions for multibyte text', async () => {
-      const params: WebSearchToolParams = { query: 'multibyte query' };
+    it("should insert markers at correct byte positions for multibyte text", async () => {
+      const params: WebSearchToolParams = { query: "multibyte query" };
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [
           {
             content: {
-              role: 'model',
-              parts: [{ text: 'こんにちは! Gemini CLI✨️' }],
+              role: "model",
+              parts: [{ text: "こんにちは! Gemini CLI✨️" }],
             },
             groundingMetadata: {
               groundingChunks: [
                 {
                   web: {
-                    title: 'Japanese Greeting',
-                    uri: 'https://example.test/japanese-greeting',
+                    title: "Japanese Greeting",
+                    uri: "https://example.test/japanese-greeting",
                   },
                 },
                 {
                   web: {
-                    title: 'google-gemini/gemini-cli',
-                    uri: 'https://github.com/google-gemini/gemini-cli',
+                    title: "google-gemini/gemini-cli",
+                    uri: "https://github.com/google-gemini/gemini-cli",
                   },
                 },
                 {
                   web: {
-                    title: 'Gemini CLI: your open-source AI agent',
-                    uri: 'https://blog.google/technology/developers/introducing-gemini-cli-open-source-ai-agent/',
+                    title: "Gemini CLI: your open-source AI agent",
+                    uri: "https://blog.google/technology/developers/introducing-gemini-cli-open-source-ai-agent/",
                   },
                 },
               ],
@@ -248,9 +238,7 @@ Sources:
 [3] Gemini CLI: your open-source AI agent (https://blog.google/technology/developers/introducing-gemini-cli-open-source-ai-agent/)`;
 
       expect(result.llmContent).toBe(expectedLlmContent);
-      expect(result.returnDisplay).toBe(
-        'Search results for "multibyte query" returned.',
-      );
+      expect(result.returnDisplay).toBe('Search results for "multibyte query" returned.');
       expect(result.sources).toHaveLength(3);
     });
   });
diff --git a/packages/gemini-core/src/tools/web-search.ts b/packages/gemini-core/src/tools/web-search.ts
index c85ca02a6..11cc5351a 100644
--- a/packages/gemini-core/src/tools/web-search.ts
+++ b/packages/gemini-core/src/tools/web-search.ts
@@ -4,16 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { WEB_SEARCH_TOOL_NAME } from './tool-names.js';
-import type { GroundingMetadata } from '@google/genai';
-import type { ToolInvocation, ToolResult } from './tools.js';
-import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-
-import { getErrorMessage } from '../utils/errors.js';
-import { type Config } from '../config/config.js';
-import { getResponseText } from '../utils/partUtils.js';
+import type { GroundingMetadata } from "@google/genai";
+import { type Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { getErrorMessage } from "../utils/errors.js";
+import { getResponseText } from "../utils/partUtils.js";
+import { ToolErrorType } from "./tool-error.js";
+import { WEB_SEARCH_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation, ToolResult } from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind } from "./tools.js";
 
 interface GroundingChunkWeb {
   uri?: string;
@@ -53,14 +52,11 @@ export interface WebSearchToolParams {
  */
 export interface WebSearchToolResult extends ToolResult {
   sources?: GroundingMetadata extends { groundingChunks: GroundingChunkItem[] }
-    ? GroundingMetadata['groundingChunks']
+    ? GroundingMetadata["groundingChunks"]
     : GroundingChunkItem[];
 }
 
-class WebSearchToolInvocation extends BaseToolInvocation<
-  WebSearchToolParams,
-  WebSearchToolResult
-> {
+class WebSearchToolInvocation extends BaseToolInvocation<WebSearchToolParams, WebSearchToolResult> {
   constructor(
     private readonly config: Config,
     params: WebSearchToolParams,
@@ -80,16 +76,14 @@ class WebSearchToolInvocation extends BaseToolInvocation<
 
     try {
       const response = await geminiClient.generateContent(
-        { model: 'web-search' },
-        [{ role: 'user', parts: [{ text: this.params.query }] }],
+        { model: "web-search" },
+        [{ role: "user", parts: [{ text: this.params.query }] }],
         signal,
       );
 
       const responseText = getResponseText(response);
       const groundingMetadata = response.candidates?.[0]?.groundingMetadata;
-      const sources = groundingMetadata?.groundingChunks as
-        | GroundingChunkItem[]
-        | undefined;
+      const sources = groundingMetadata?.groundingChunks as GroundingChunkItem[] | undefined;
       const groundingSupports = groundingMetadata?.groundingSupports as
         | GroundingSupportItem[]
         | undefined;
@@ -97,7 +91,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
       if (!responseText || !responseText.trim()) {
         return {
           llmContent: `No search results or information found for query: "${this.params.query}"`,
-          returnDisplay: 'No information found.',
+          returnDisplay: "No information found.",
         };
       }
 
@@ -106,8 +100,8 @@ class WebSearchToolInvocation extends BaseToolInvocation<
 
       if (sources && sources.length > 0) {
         sources.forEach((source: GroundingChunkItem, index: number) => {
-          const title = source.web?.title || 'Untitled';
-          const uri = source.web?.uri || 'No URI';
+          const title = source.web?.title || "Untitled";
+          const uri = source.web?.uri || "No URI";
           sourceListFormatted.push(`[${index + 1}] ${title} (${uri})`);
         });
 
@@ -117,7 +111,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
             if (support.segment && support.groundingChunkIndices) {
               const citationMarker = support.groundingChunkIndices
                 .map((chunkIndex: number) => `[${chunkIndex + 1}]`)
-                .join('');
+                .join("");
               insertions.push({
                 index: support.segment.endIndex,
                 marker: citationMarker,
@@ -153,8 +147,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
         }
 
         if (sourceListFormatted.length > 0) {
-          modifiedResponseText +=
-            '\n\nSources:\n' + sourceListFormatted.join('\n');
+          modifiedResponseText += "\n\nSources:\n" + sourceListFormatted.join("\n");
         }
       }
 
@@ -183,10 +176,7 @@ class WebSearchToolInvocation extends BaseToolInvocation<
 /**
  * A tool to perform web searches using Google Search via the Gemini API.
  */
-export class WebSearchTool extends BaseDeclarativeTool<
-  WebSearchToolParams,
-  WebSearchToolResult
-> {
+export class WebSearchTool extends BaseDeclarativeTool<WebSearchToolParams, WebSearchToolResult> {
   static readonly Name = WEB_SEARCH_TOOL_NAME;
 
   constructor(
@@ -195,18 +185,18 @@ export class WebSearchTool extends BaseDeclarativeTool<
   ) {
     super(
       WebSearchTool.Name,
-      'GoogleSearch',
-      'Performs a web search using Google Search (via the Gemini API) and returns the results. This tool is useful for finding information on the internet based on a query.',
+      "GoogleSearch",
+      "Performs a web search using Google Search (via the Gemini API) and returns the results. This tool is useful for finding information on the internet based on a query.",
       Kind.Search,
       {
-        type: 'object',
+        type: "object",
         properties: {
           query: {
-            type: 'string',
-            description: 'The search query to find information on the web.',
+            type: "string",
+            description: "The search query to find information on the web.",
           },
         },
-        required: ['query'],
+        required: ["query"],
       },
       true, // isOutputMarkdown
       false, // canUpdateOutput
@@ -219,10 +209,8 @@ export class WebSearchTool extends BaseDeclarativeTool<
    * @param params The parameters to validate
    * @returns An error message string if validation fails, null if valid
    */
-  protected override validateToolParamValues(
-    params: WebSearchToolParams,
-  ): string | null {
-    if (!params.query || params.query.trim() === '') {
+  protected override validateToolParamValues(params: WebSearchToolParams): string | null {
+    if (!params.query || params.query.trim() === "") {
       return "The 'query' parameter cannot be empty.";
     }
     return null;
diff --git a/packages/gemini-core/src/tools/write-file.test.ts b/packages/gemini-core/src/tools/write-file.test.ts
index a3b092d82..b450719d3 100644
--- a/packages/gemini-core/src/tools/write-file.test.ts
+++ b/packages/gemini-core/src/tools/write-file.test.ts
@@ -4,45 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  vi,
-  type Mocked,
-} from 'vitest';
-import type { WriteFileToolParams } from './write-file.js';
-import { getCorrectedFileContent, WriteFileTool } from './write-file.js';
-import { ToolErrorType } from './tool-error.js';
-import type { FileDiff, ToolEditConfirmationDetails } from './tools.js';
-import { ToolConfirmationOutcome } from './tools.js';
-import { type EditToolParams } from './edit.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-import type { ToolRegistry } from './tool-registry.js';
-import path from 'node:path';
-import fs from 'node:fs';
-import os from 'node:os';
-import { GeminiClient } from '../core/client.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { CorrectedEditResult } from '../utils/editCorrector.js';
-import {
-  ensureCorrectEdit,
-  ensureCorrectFileContent,
-} from '../utils/editCorrector.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import type { DiffUpdateResult } from '../ide/ide-client.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { WorkspaceContext } from '../utils/workspaceContext.js';
-
-const rootDir = path.resolve(os.tmpdir(), 'gemini-cli-test-root');
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { GeminiClient } from "../core/client.js";
+import type { DiffUpdateResult } from "../ide/ide-client.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import type { CorrectedEditResult } from "../utils/editCorrector.js";
+import { ensureCorrectEdit, ensureCorrectFileContent } from "../utils/editCorrector.js";
+import { WorkspaceContext } from "../utils/workspaceContext.js";
+import { type EditToolParams } from "./edit.js";
+import { ToolErrorType } from "./tool-error.js";
+import type { ToolRegistry } from "./tool-registry.js";
+import type { FileDiff, ToolEditConfirmationDetails } from "./tools.js";
+import { ToolConfirmationOutcome } from "./tools.js";
+import type { WriteFileToolParams } from "./write-file.js";
+import { getCorrectedFileContent, WriteFileTool } from "./write-file.js";
+
+const rootDir = path.resolve(os.tmpdir(), "gemini-cli-test-root");
 
 // --- MOCKS ---
-vi.mock('../core/client.js');
-vi.mock('../utils/editCorrector.js');
-vi.mock('../ide/ide-client.js', () => ({
+vi.mock("../core/client.js");
+vi.mock("../utils/editCorrector.js");
+vi.mock("../ide/ide-client.js", () => ({
   IdeClient: {
     getInstance: vi.fn(),
   },
@@ -58,12 +47,8 @@ const mockIdeClient = {
 
 // Wire up the mocked functions to be used by the actual module imports
 vi.mocked(ensureCorrectEdit).mockImplementation(mockEnsureCorrectEdit);
-vi.mocked(ensureCorrectFileContent).mockImplementation(
-  mockEnsureCorrectFileContent,
-);
-vi.mocked(IdeClient.getInstance).mockResolvedValue(
-  mockIdeClient as unknown as IdeClient,
-);
+vi.mocked(ensureCorrectFileContent).mockImplementation(mockEnsureCorrectFileContent);
+vi.mocked(IdeClient.getInstance).mockResolvedValue(mockIdeClient as unknown as IdeClient);
 
 // Mock Config
 const fsService = new StandardFileSystemService();
@@ -76,8 +61,8 @@ const mockConfigInternal = {
   getFileSystemService: () => fsService,
   getIdeMode: vi.fn(() => false),
   getWorkspaceContext: () => new WorkspaceContext(rootDir),
-  getApiKey: () => 'test-key',
-  getModel: () => 'test-model',
+  getApiKey: () => "test-key",
+  getModel: () => "test-model",
   getSandbox: () => false,
   getDebugMode: () => false,
   getQuestion: () => undefined,
@@ -86,8 +71,8 @@ const mockConfigInternal = {
   getToolCallCommand: () => undefined,
   getMcpServerCommand: () => undefined,
   getMcpServers: () => undefined,
-  getUserAgent: () => 'test-agent',
-  getUserMemory: () => '',
+  getUserAgent: () => "test-agent",
+  getUserMemory: () => "",
   setUserMemory: vi.fn(),
   getGeminiMdFileCount: () => 0,
   setGeminiMdFileCount: vi.fn(),
@@ -100,31 +85,27 @@ const mockConfigInternal = {
 };
 const mockConfig = mockConfigInternal as unknown as Config;
 
-vi.mock('../telemetry/loggers.js', () => ({
+vi.mock("../telemetry/loggers.js", () => ({
   logFileOperation: vi.fn(),
 }));
 
 // --- END MOCKS ---
 
-describe('WriteFileTool', () => {
+describe("WriteFileTool", () => {
   let tool: WriteFileTool;
   let tempDir: string;
 
   beforeEach(() => {
     vi.clearAllMocks();
     // Create a unique temporary directory for files created outside the root
-    tempDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'write-file-test-external-'),
-    );
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "write-file-test-external-"));
     // Ensure the rootDir for the tool exists
     if (!fs.existsSync(rootDir)) {
       fs.mkdirSync(rootDir, { recursive: true });
     }
 
     // Setup GeminiClient mock
-    mockGeminiClientInstance = new (vi.mocked(GeminiClient))(
-      mockConfig,
-    ) as Mocked<GeminiClient>;
+    mockGeminiClientInstance = new (vi.mocked(GeminiClient))(mockConfig) as Mocked<GeminiClient>;
     vi.mocked(GeminiClient).mockImplementation(() => mockGeminiClientInstance);
 
     // Setup BaseLlmClient mock
@@ -133,17 +114,11 @@ describe('WriteFileTool', () => {
     } as unknown as Mocked<BaseLlmClient>;
 
     vi.mocked(ensureCorrectEdit).mockImplementation(mockEnsureCorrectEdit);
-    vi.mocked(ensureCorrectFileContent).mockImplementation(
-      mockEnsureCorrectFileContent,
-    );
+    vi.mocked(ensureCorrectFileContent).mockImplementation(mockEnsureCorrectFileContent);
 
     // Now that mock instances are initialized, set the mock implementations for config getters
-    mockConfigInternal.getGeminiClient.mockReturnValue(
-      mockGeminiClientInstance,
-    );
-    mockConfigInternal.getBaseLlmClient.mockReturnValue(
-      mockBaseLlmClientInstance,
-    );
+    mockConfigInternal.getGeminiClient.mockReturnValue(mockGeminiClientInstance);
+    mockConfigInternal.getBaseLlmClient.mockReturnValue(mockBaseLlmClientInstance);
 
     tool = new WriteFileTool(mockConfig);
 
@@ -164,10 +139,10 @@ describe('WriteFileTool', () => {
         signal?: AbortSignal,
       ): Promise<CorrectedEditResult> => {
         if (signal?.aborted) {
-          return Promise.reject(new Error('Aborted'));
+          return Promise.reject(new Error("Aborted"));
         }
         return Promise.resolve({
-          params: { ...params, new_string: params.new_string ?? '' },
+          params: { ...params, new_string: params.new_string ?? "" },
           occurrences: 1,
         });
       },
@@ -179,9 +154,9 @@ describe('WriteFileTool', () => {
         signal?: AbortSignal,
       ): Promise<string> => {
         if (signal?.aborted) {
-          return Promise.reject(new Error('Aborted'));
+          return Promise.reject(new Error("Aborted"));
         }
-        return Promise.resolve(content ?? '');
+        return Promise.resolve(content ?? "");
       },
     );
   });
@@ -197,76 +172,74 @@ describe('WriteFileTool', () => {
     vi.clearAllMocks();
   });
 
-  describe('build', () => {
-    it('should return an invocation for a valid absolute path within root', () => {
+  describe("build", () => {
+    it("should return an invocation for a valid absolute path within root", () => {
       const params = {
-        file_path: path.join(rootDir, 'test.txt'),
-        content: 'hello',
+        file_path: path.join(rootDir, "test.txt"),
+        content: "hello",
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
       expect(invocation.params).toEqual(params);
     });
 
-    it('should return an invocation for a valid relative path within root', () => {
+    it("should return an invocation for a valid relative path within root", () => {
       const params = {
-        file_path: 'test.txt',
-        content: 'hello',
+        file_path: "test.txt",
+        content: "hello",
       };
       const invocation = tool.build(params);
       expect(invocation).toBeDefined();
       expect(invocation.params).toEqual(params);
     });
 
-    it('should throw an error for a path outside root', () => {
-      const outsidePath = path.resolve(tempDir, 'outside-root.txt');
+    it("should throw an error for a path outside root", () => {
+      const outsidePath = path.resolve(tempDir, "outside-root.txt");
       const params = {
         file_path: outsidePath,
-        content: 'hello',
+        content: "hello",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories/,
       );
     });
 
-    it('should throw an error if path is a directory', () => {
-      const dirAsFilePath = path.join(rootDir, 'a_directory');
+    it("should throw an error if path is a directory", () => {
+      const dirAsFilePath = path.join(rootDir, "a_directory");
       fs.mkdirSync(dirAsFilePath);
       const params = {
         file_path: dirAsFilePath,
-        content: 'hello',
+        content: "hello",
       };
-      expect(() => tool.build(params)).toThrow(
-        `Path is a directory, not a file: ${dirAsFilePath}`,
-      );
+      expect(() => tool.build(params)).toThrow(`Path is a directory, not a file: ${dirAsFilePath}`);
     });
 
-    it('should throw an error if the content is null', () => {
-      const dirAsFilePath = path.join(rootDir, 'a_directory');
+    it("should throw an error if the content is null", () => {
+      const dirAsFilePath = path.join(rootDir, "a_directory");
       fs.mkdirSync(dirAsFilePath);
       const params = {
         file_path: dirAsFilePath,
         content: null,
       } as unknown as WriteFileToolParams; // Intentionally non-conforming
-      expect(() => tool.build(params)).toThrow('params/content must be string');
+      expect(() => tool.build(params)).toThrow("params/content must be string");
     });
 
-    it('should throw error if the file_path is empty', () => {
-      const dirAsFilePath = path.join(rootDir, 'a_directory');
+    it("should throw error if the file_path is empty", () => {
+      const dirAsFilePath = path.join(rootDir, "a_directory");
       fs.mkdirSync(dirAsFilePath);
       const params = {
-        file_path: '',
-        content: '',
+        file_path: "",
+        content: "",
       };
       expect(() => tool.build(params)).toThrow(`Missing or empty "file_path"`);
     });
   });
 
-  describe('getCorrectedFileContent', () => {
-    it('should call ensureCorrectFileContent for a new file', async () => {
-      const filePath = path.join(rootDir, 'new_corrected_file.txt');
-      const proposedContent = 'Proposed new content.';
-      const correctedContent = 'Corrected new content.';
+  describe("getCorrectedFileContent", () => {
+    it("should call ensureCorrectFileContent for a new file", async () => {
+      const filePath = path.join(rootDir, "new_corrected_file.txt");
+      const proposedContent = "Proposed new content.";
+      const correctedContent = "Corrected new content.";
       const abortSignal = new AbortController().signal;
       // Ensure the mock is set for this specific test case if needed, or rely on beforeEach
       mockEnsureCorrectFileContent.mockResolvedValue(correctedContent);
@@ -285,18 +258,18 @@ describe('WriteFileTool', () => {
       );
       expect(mockEnsureCorrectEdit).not.toHaveBeenCalled();
       expect(result.correctedContent).toBe(correctedContent);
-      expect(result.originalContent).toBe('');
+      expect(result.originalContent).toBe("");
       expect(result.fileExists).toBe(false);
       expect(result.error).toBeUndefined();
     });
 
-    it('should call ensureCorrectEdit for an existing file', async () => {
-      const filePath = path.join(rootDir, 'existing_corrected_file.txt');
-      const originalContent = 'Original existing content.';
-      const proposedContent = 'Proposed replacement content.';
-      const correctedProposedContent = 'Corrected replacement content.';
+    it("should call ensureCorrectEdit for an existing file", async () => {
+      const filePath = path.join(rootDir, "existing_corrected_file.txt");
+      const originalContent = "Original existing content.";
+      const proposedContent = "Proposed replacement content.";
+      const correctedProposedContent = "Corrected replacement content.";
       const abortSignal = new AbortController().signal;
-      fs.writeFileSync(filePath, originalContent, 'utf8');
+      fs.writeFileSync(filePath, originalContent, "utf8");
 
       // Ensure this mock is active and returns the correct structure
       mockEnsureCorrectEdit.mockResolvedValue({
@@ -334,16 +307,14 @@ describe('WriteFileTool', () => {
       expect(result.error).toBeUndefined();
     });
 
-    it('should return error if reading an existing file fails (e.g. permissions)', async () => {
-      const filePath = path.join(rootDir, 'unreadable_file.txt');
-      const proposedContent = 'some content';
+    it("should return error if reading an existing file fails (e.g. permissions)", async () => {
+      const filePath = path.join(rootDir, "unreadable_file.txt");
+      const proposedContent = "some content";
       const abortSignal = new AbortController().signal;
-      fs.writeFileSync(filePath, 'content', { mode: 0o000 });
+      fs.writeFileSync(filePath, "content", { mode: 0o000 });
 
-      const readError = new Error('Permission denied');
-      vi.spyOn(fsService, 'readTextFile').mockImplementationOnce(() =>
-        Promise.reject(readError),
-      );
+      const readError = new Error("Permission denied");
+      vi.spyOn(fsService, "readTextFile").mockImplementationOnce(() => Promise.reject(readError));
 
       const result = await getCorrectedFileContent(
         mockConfig,
@@ -356,10 +327,10 @@ describe('WriteFileTool', () => {
       expect(mockEnsureCorrectEdit).not.toHaveBeenCalled();
       expect(mockEnsureCorrectFileContent).not.toHaveBeenCalled();
       expect(result.correctedContent).toBe(proposedContent);
-      expect(result.originalContent).toBe('');
+      expect(result.originalContent).toBe("");
       expect(result.fileExists).toBe(true);
       expect(result.error).toEqual({
-        message: 'Permission denied',
+        message: "Permission denied",
         code: undefined,
       });
 
@@ -367,18 +338,16 @@ describe('WriteFileTool', () => {
     });
   });
 
-  describe('shouldConfirmExecute', () => {
+  describe("shouldConfirmExecute", () => {
     const abortSignal = new AbortController().signal;
 
-    it('should return false if _getCorrectedFileContent returns an error', async () => {
-      const filePath = path.join(rootDir, 'confirm_error_file.txt');
-      const params = { file_path: filePath, content: 'test content' };
-      fs.writeFileSync(filePath, 'original', { mode: 0o000 });
+    it("should return false if _getCorrectedFileContent returns an error", async () => {
+      const filePath = path.join(rootDir, "confirm_error_file.txt");
+      const params = { file_path: filePath, content: "test content" };
+      fs.writeFileSync(filePath, "original", { mode: 0o000 });
 
-      const readError = new Error('Simulated read error for confirmation');
-      vi.spyOn(fsService, 'readTextFile').mockImplementationOnce(() =>
-        Promise.reject(readError),
-      );
+      const readError = new Error("Simulated read error for confirmation");
+      vi.spyOn(fsService, "readTextFile").mockImplementationOnce(() => Promise.reject(readError));
 
       const invocation = tool.build(params);
       const confirmation = await invocation.shouldConfirmExecute(abortSignal);
@@ -387,10 +356,10 @@ describe('WriteFileTool', () => {
       fs.chmodSync(filePath, 0o600);
     });
 
-    it('should request confirmation with diff for a new file (with corrected content)', async () => {
-      const filePath = path.join(rootDir, 'confirm_new_file.txt');
-      const proposedContent = 'Proposed new content for confirmation.';
-      const correctedContent = 'Corrected new content for confirmation.';
+    it("should request confirmation with diff for a new file (with corrected content)", async () => {
+      const filePath = path.join(rootDir, "confirm_new_file.txt");
+      const proposedContent = "Proposed new content for confirmation.";
+      const correctedContent = "Corrected new content for confirmation.";
       mockEnsureCorrectFileContent.mockResolvedValue(correctedContent); // Ensure this mock is active
 
       const params = { file_path: filePath, content: proposedContent };
@@ -407,25 +376,20 @@ describe('WriteFileTool', () => {
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Write: ${path.basename(filePath)}`,
-          fileName: 'confirm_new_file.txt',
+          fileName: "confirm_new_file.txt",
           fileDiff: expect.stringContaining(correctedContent),
         }),
       );
-      expect(confirmation.fileDiff).toMatch(
-        /--- confirm_new_file.txt\tCurrent/,
-      );
-      expect(confirmation.fileDiff).toMatch(
-        /\+\+\+ confirm_new_file.txt\tProposed/,
-      );
+      expect(confirmation.fileDiff).toMatch(/--- confirm_new_file.txt\tCurrent/);
+      expect(confirmation.fileDiff).toMatch(/\+\+\+ confirm_new_file.txt\tProposed/);
     });
 
-    it('should request confirmation with diff for an existing file (with corrected content)', async () => {
-      const filePath = path.join(rootDir, 'confirm_existing_file.txt');
-      const originalContent = 'Original content for confirmation.';
-      const proposedContent = 'Proposed replacement for confirmation.';
-      const correctedProposedContent =
-        'Corrected replacement for confirmation.';
-      fs.writeFileSync(filePath, originalContent, 'utf8');
+    it("should request confirmation with diff for an existing file (with corrected content)", async () => {
+      const filePath = path.join(rootDir, "confirm_existing_file.txt");
+      const originalContent = "Original content for confirmation.";
+      const proposedContent = "Proposed replacement for confirmation.";
+      const correctedProposedContent = "Corrected replacement for confirmation.";
+      fs.writeFileSync(filePath, originalContent, "utf8");
 
       mockEnsureCorrectEdit.mockResolvedValue({
         params: {
@@ -457,29 +421,29 @@ describe('WriteFileTool', () => {
       expect(confirmation).toEqual(
         expect.objectContaining({
           title: `Confirm Write: ${path.basename(filePath)}`,
-          fileName: 'confirm_existing_file.txt',
+          fileName: "confirm_existing_file.txt",
           fileDiff: expect.stringContaining(correctedProposedContent),
         }),
       );
       expect(confirmation.fileDiff).toMatch(
-        originalContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
+        originalContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"),
       );
     });
 
-    describe('with IDE integration', () => {
+    describe("with IDE integration", () => {
       beforeEach(() => {
         // Enable IDE mode and set connection status for these tests
         mockConfigInternal.getIdeMode.mockReturnValue(true);
         mockIdeClient.isDiffingEnabled.mockReturnValue(true);
         mockIdeClient.openDiff.mockResolvedValue({
-          status: 'accepted',
-          content: 'ide-modified-content',
+          status: "accepted",
+          content: "ide-modified-content",
         });
       });
 
-      it('should call openDiff and await it when in IDE mode and connected', async () => {
-        const filePath = path.join(rootDir, 'ide_confirm_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+      it("should call openDiff and await it when in IDE mode and connected", async () => {
+        const filePath = path.join(rootDir, "ide_confirm_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         const confirmation = (await invocation.shouldConfirmExecute(
@@ -488,17 +452,17 @@ describe('WriteFileTool', () => {
 
         expect(mockIdeClient.openDiff).toHaveBeenCalledWith(
           filePath,
-          'test', // The corrected content
+          "test", // The corrected content
         );
         // Ensure the promise is awaited by checking the result
         expect(confirmation.ideConfirmation).toBeDefined();
         await confirmation.ideConfirmation; // Should resolve
       });
 
-      it('should not call openDiff if not in IDE mode', async () => {
+      it("should not call openDiff if not in IDE mode", async () => {
         mockConfigInternal.getIdeMode.mockReturnValue(false);
-        const filePath = path.join(rootDir, 'ide_disabled_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+        const filePath = path.join(rootDir, "ide_disabled_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         await invocation.shouldConfirmExecute(abortSignal);
@@ -506,10 +470,10 @@ describe('WriteFileTool', () => {
         expect(mockIdeClient.openDiff).not.toHaveBeenCalled();
       });
 
-      it('should not call openDiff if IDE is not connected', async () => {
+      it("should not call openDiff if IDE is not connected", async () => {
         mockIdeClient.isDiffingEnabled.mockReturnValue(false);
-        const filePath = path.join(rootDir, 'ide_disconnected_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+        const filePath = path.join(rootDir, "ide_disconnected_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         await invocation.shouldConfirmExecute(abortSignal);
@@ -517,9 +481,9 @@ describe('WriteFileTool', () => {
         expect(mockIdeClient.openDiff).not.toHaveBeenCalled();
       });
 
-      it('should update params.content with IDE content when onConfirm is called', async () => {
-        const filePath = path.join(rootDir, 'ide_onconfirm_file.txt');
-        const params = { file_path: filePath, content: 'original-content' };
+      it("should update params.content with IDE content when onConfirm is called", async () => {
+        const filePath = path.join(rootDir, "ide_onconfirm_file.txt");
+        const params = { file_path: filePath, content: "original-content" };
         const invocation = tool.build(params);
 
         // This is the key part: get the confirmation details
@@ -534,19 +498,19 @@ describe('WriteFileTool', () => {
         await confirmation.onConfirm!(ToolConfirmationOutcome.ProceedOnce);
 
         // Now, check if the original `params` object (captured by the invocation) was modified
-        expect(invocation.params.content).toBe('ide-modified-content');
+        expect(invocation.params.content).toBe("ide-modified-content");
       });
 
-      it('should not await ideConfirmation promise', async () => {
-        const filePath = path.join(rootDir, 'ide_no_await_file.txt');
-        const params = { file_path: filePath, content: 'test' };
+      it("should not await ideConfirmation promise", async () => {
+        const filePath = path.join(rootDir, "ide_no_await_file.txt");
+        const params = { file_path: filePath, content: "test" };
         const invocation = tool.build(params);
 
         let diffPromiseResolved = false;
         const diffPromise = new Promise<DiffUpdateResult>((resolve) => {
           setTimeout(() => {
             diffPromiseResolved = true;
-            resolve({ status: 'accepted', content: 'ide-modified-content' });
+            resolve({ status: "accepted", content: "ide-modified-content" });
           }, 50); // A small delay to ensure the check happens before resolution
         });
         mockIdeClient.openDiff.mockReturnValue(diffPromise);
@@ -568,13 +532,13 @@ describe('WriteFileTool', () => {
     });
   });
 
-  describe('execute', () => {
+  describe("execute", () => {
     const abortSignal = new AbortController().signal;
 
-    it('should write a new file with a relative path', async () => {
-      const relativePath = 'execute_relative_new_file.txt';
+    it("should write a new file with a relative path", async () => {
+      const relativePath = "execute_relative_new_file.txt";
       const filePath = path.join(rootDir, relativePath);
-      const content = 'Content for relative path file.';
+      const content = "Content for relative path file.";
       mockEnsureCorrectFileContent.mockResolvedValue(content);
 
       const params = { file_path: relativePath, content };
@@ -582,43 +546,40 @@ describe('WriteFileTool', () => {
 
       const result = await invocation.execute(abortSignal);
 
-      expect(result.llmContent).toMatch(
-        /Successfully created and wrote to new file/,
-      );
+      expect(result.llmContent).toMatch(/Successfully created and wrote to new file/);
       expect(fs.existsSync(filePath)).toBe(true);
       const writtenContent = await fsService.readTextFile(filePath);
       expect(writtenContent).toBe(content);
     });
 
-    it('should return error if _getCorrectedFileContent returns an error during execute', async () => {
-      const filePath = path.join(rootDir, 'execute_error_file.txt');
-      const params = { file_path: filePath, content: 'test content' };
-      fs.writeFileSync(filePath, 'original', { mode: 0o000 });
+    it("should return error if _getCorrectedFileContent returns an error during execute", async () => {
+      const filePath = path.join(rootDir, "execute_error_file.txt");
+      const params = { file_path: filePath, content: "test content" };
+      fs.writeFileSync(filePath, "original", { mode: 0o000 });
 
-      vi.spyOn(fsService, 'readTextFile').mockImplementationOnce(() => {
-        const readError = new Error('Simulated read error for execute');
+      vi.spyOn(fsService, "readTextFile").mockImplementationOnce(() => {
+        const readError = new Error("Simulated read error for execute");
         return Promise.reject(readError);
       });
 
       const invocation = tool.build(params);
       const result = await invocation.execute(abortSignal);
-      expect(result.llmContent).toContain('Error checking existing file');
+      expect(result.llmContent).toContain("Error checking existing file");
       expect(result.returnDisplay).toMatch(
         /Error checking existing file: Simulated read error for execute/,
       );
       expect(result.error).toEqual({
-        message:
-          'Error checking existing file: Simulated read error for execute',
+        message: "Error checking existing file: Simulated read error for execute",
         type: ToolErrorType.FILE_WRITE_FAILURE,
       });
 
       fs.chmodSync(filePath, 0o600);
     });
 
-    it('should write a new file with corrected content and return diff', async () => {
-      const filePath = path.join(rootDir, 'execute_new_corrected_file.txt');
-      const proposedContent = 'Proposed new content for execute.';
-      const correctedContent = 'Corrected new content for execute.';
+    it("should write a new file with corrected content and return diff", async () => {
+      const filePath = path.join(rootDir, "execute_new_corrected_file.txt");
+      const proposedContent = "Proposed new content for execute.";
+      const correctedContent = "Corrected new content for execute.";
       mockEnsureCorrectFileContent.mockResolvedValue(correctedContent);
 
       const params = { file_path: filePath, content: proposedContent };
@@ -626,8 +587,8 @@ describe('WriteFileTool', () => {
 
       const confirmDetails = await invocation.shouldConfirmExecute(abortSignal);
       if (
-        typeof confirmDetails === 'object' &&
-        'onConfirm' in confirmDetails &&
+        typeof confirmDetails === "object" &&
+        "onConfirm" in confirmDetails &&
         confirmDetails.onConfirm
       ) {
         await confirmDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
@@ -640,34 +601,23 @@ describe('WriteFileTool', () => {
         mockBaseLlmClientInstance,
         abortSignal,
       );
-      expect(result.llmContent).toMatch(
-        /Successfully created and wrote to new file/,
-      );
+      expect(result.llmContent).toMatch(/Successfully created and wrote to new file/);
       expect(fs.existsSync(filePath)).toBe(true);
       const writtenContent = await fsService.readTextFile(filePath);
       expect(writtenContent).toBe(correctedContent);
       const display = result.returnDisplay as FileDiff;
-      expect(display.fileName).toBe('execute_new_corrected_file.txt');
-      expect(display.fileDiff).toMatch(
-        /--- execute_new_corrected_file.txt\tOriginal/,
-      );
-      expect(display.fileDiff).toMatch(
-        /\+\+\+ execute_new_corrected_file.txt\tWritten/,
-      );
-      expect(display.fileDiff).toMatch(
-        correctedContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
-      );
+      expect(display.fileName).toBe("execute_new_corrected_file.txt");
+      expect(display.fileDiff).toMatch(/--- execute_new_corrected_file.txt\tOriginal/);
+      expect(display.fileDiff).toMatch(/\+\+\+ execute_new_corrected_file.txt\tWritten/);
+      expect(display.fileDiff).toMatch(correctedContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"));
     });
 
-    it('should overwrite an existing file with corrected content and return diff', async () => {
-      const filePath = path.join(
-        rootDir,
-        'execute_existing_corrected_file.txt',
-      );
-      const initialContent = 'Initial content for execute.';
-      const proposedContent = 'Proposed overwrite for execute.';
-      const correctedProposedContent = 'Corrected overwrite for execute.';
-      fs.writeFileSync(filePath, initialContent, 'utf8');
+    it("should overwrite an existing file with corrected content and return diff", async () => {
+      const filePath = path.join(rootDir, "execute_existing_corrected_file.txt");
+      const initialContent = "Initial content for execute.";
+      const proposedContent = "Proposed overwrite for execute.";
+      const correctedProposedContent = "Corrected overwrite for execute.";
+      fs.writeFileSync(filePath, initialContent, "utf8");
 
       mockEnsureCorrectEdit.mockResolvedValue({
         params: {
@@ -683,8 +633,8 @@ describe('WriteFileTool', () => {
 
       const confirmDetails = await invocation.shouldConfirmExecute(abortSignal);
       if (
-        typeof confirmDetails === 'object' &&
-        'onConfirm' in confirmDetails &&
+        typeof confirmDetails === "object" &&
+        "onConfirm" in confirmDetails &&
         confirmDetails.onConfirm
       ) {
         await confirmDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
@@ -708,19 +658,17 @@ describe('WriteFileTool', () => {
       const writtenContent = await fsService.readTextFile(filePath);
       expect(writtenContent).toBe(correctedProposedContent);
       const display = result.returnDisplay as FileDiff;
-      expect(display.fileName).toBe('execute_existing_corrected_file.txt');
+      expect(display.fileName).toBe("execute_existing_corrected_file.txt");
+      expect(display.fileDiff).toMatch(initialContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"));
       expect(display.fileDiff).toMatch(
-        initialContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
-      );
-      expect(display.fileDiff).toMatch(
-        correctedProposedContent.replace(/[.*+?^${}()|[\\]\\]/g, '\\$&'),
+        correctedProposedContent.replace(/[.*+?^${}()|[\\]\\]/g, "\\$&"),
       );
     });
 
-    it('should create directory if it does not exist', async () => {
-      const dirPath = path.join(rootDir, 'new_dir_for_write');
-      const filePath = path.join(dirPath, 'file_in_new_dir.txt');
-      const content = 'Content in new directory';
+    it("should create directory if it does not exist", async () => {
+      const dirPath = path.join(rootDir, "new_dir_for_write");
+      const filePath = path.join(dirPath, "file_in_new_dir.txt");
+      const content = "Content in new directory";
       mockEnsureCorrectFileContent.mockResolvedValue(content); // Ensure this mock is active
 
       const params = { file_path: filePath, content };
@@ -728,8 +676,8 @@ describe('WriteFileTool', () => {
       // Simulate confirmation if your logic requires it before execute, or remove if not needed for this path
       const confirmDetails = await invocation.shouldConfirmExecute(abortSignal);
       if (
-        typeof confirmDetails === 'object' &&
-        'onConfirm' in confirmDetails &&
+        typeof confirmDetails === "object" &&
+        "onConfirm" in confirmDetails &&
         confirmDetails.onConfirm
       ) {
         await confirmDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
@@ -740,12 +688,12 @@ describe('WriteFileTool', () => {
       expect(fs.existsSync(dirPath)).toBe(true);
       expect(fs.statSync(dirPath).isDirectory()).toBe(true);
       expect(fs.existsSync(filePath)).toBe(true);
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(content);
+      expect(fs.readFileSync(filePath, "utf8")).toBe(content);
     });
 
-    it('should include modification message when proposed content is modified', async () => {
-      const filePath = path.join(rootDir, 'new_file_modified.txt');
-      const content = 'New file content modified by user';
+    it("should include modification message when proposed content is modified", async () => {
+      const filePath = path.join(rootDir, "new_file_modified.txt");
+      const content = "New file content modified by user";
       mockEnsureCorrectFileContent.mockResolvedValue(content);
 
       const params = {
@@ -759,9 +707,9 @@ describe('WriteFileTool', () => {
       expect(result.llmContent).toMatch(/User modified the `content`/);
     });
 
-    it('should not include modification message when proposed content is not modified', async () => {
-      const filePath = path.join(rootDir, 'new_file_unmodified.txt');
-      const content = 'New file content not modified';
+    it("should not include modification message when proposed content is not modified", async () => {
+      const filePath = path.join(rootDir, "new_file_unmodified.txt");
+      const content = "New file content not modified";
       mockEnsureCorrectFileContent.mockResolvedValue(content);
 
       const params = {
@@ -775,9 +723,9 @@ describe('WriteFileTool', () => {
       expect(result.llmContent).not.toMatch(/User modified the `content`/);
     });
 
-    it('should not include modification message when modified_by_user is not provided', async () => {
-      const filePath = path.join(rootDir, 'new_file_unmodified.txt');
-      const content = 'New file content not modified';
+    it("should not include modification message when modified_by_user is not provided", async () => {
+      const filePath = path.join(rootDir, "new_file_unmodified.txt");
+      const content = "New file content not modified";
       mockEnsureCorrectFileContent.mockResolvedValue(content);
 
       const params = {
@@ -791,19 +739,19 @@ describe('WriteFileTool', () => {
     });
   });
 
-  describe('workspace boundary validation', () => {
-    it('should validate paths are within workspace root', () => {
+  describe("workspace boundary validation", () => {
+    it("should validate paths are within workspace root", () => {
       const params = {
-        file_path: path.join(rootDir, 'file.txt'),
-        content: 'test content',
+        file_path: path.join(rootDir, "file.txt"),
+        content: "test content",
       };
       expect(() => tool.build(params)).not.toThrow();
     });
 
-    it('should reject paths outside workspace root', () => {
+    it("should reject paths outside workspace root", () => {
       const params = {
-        file_path: '/etc/passwd',
-        content: 'malicious',
+        file_path: "/etc/passwd",
+        content: "malicious",
       };
       expect(() => tool.build(params)).toThrow(
         /File path must be within one of the workspace directories/,
@@ -811,17 +759,17 @@ describe('WriteFileTool', () => {
     });
   });
 
-  describe('specific error types for write failures', () => {
+  describe("specific error types for write failures", () => {
     const abortSignal = new AbortController().signal;
 
-    it('should return PERMISSION_DENIED error when write fails with EACCES', async () => {
-      const filePath = path.join(rootDir, 'permission_denied_file.txt');
-      const content = 'test content';
+    it("should return PERMISSION_DENIED error when write fails with EACCES", async () => {
+      const filePath = path.join(rootDir, "permission_denied_file.txt");
+      const content = "test content";
 
       // Mock FileSystemService writeTextFile to throw EACCES error
-      vi.spyOn(fsService, 'writeTextFile').mockImplementationOnce(() => {
-        const error = new Error('Permission denied') as NodeJS.ErrnoException;
-        error.code = 'EACCES';
+      vi.spyOn(fsService, "writeTextFile").mockImplementationOnce(() => {
+        const error = new Error("Permission denied") as NodeJS.ErrnoException;
+        error.code = "EACCES";
         return Promise.reject(error);
       });
 
@@ -838,16 +786,14 @@ describe('WriteFileTool', () => {
       );
     });
 
-    it('should return NO_SPACE_LEFT error when write fails with ENOSPC', async () => {
-      const filePath = path.join(rootDir, 'no_space_file.txt');
-      const content = 'test content';
+    it("should return NO_SPACE_LEFT error when write fails with ENOSPC", async () => {
+      const filePath = path.join(rootDir, "no_space_file.txt");
+      const content = "test content";
 
       // Mock FileSystemService writeTextFile to throw ENOSPC error
-      vi.spyOn(fsService, 'writeTextFile').mockImplementationOnce(() => {
-        const error = new Error(
-          'No space left on device',
-        ) as NodeJS.ErrnoException;
-        error.code = 'ENOSPC';
+      vi.spyOn(fsService, "writeTextFile").mockImplementationOnce(() => {
+        const error = new Error("No space left on device") as NodeJS.ErrnoException;
+        error.code = "ENOSPC";
         return Promise.reject(error);
       });
 
@@ -856,21 +802,17 @@ describe('WriteFileTool', () => {
       const result = await invocation.execute(abortSignal);
 
       expect(result.error?.type).toBe(ToolErrorType.NO_SPACE_LEFT);
-      expect(result.llmContent).toContain(
-        `No space left on device: ${filePath} (ENOSPC)`,
-      );
-      expect(result.returnDisplay).toContain(
-        `No space left on device: ${filePath} (ENOSPC)`,
-      );
+      expect(result.llmContent).toContain(`No space left on device: ${filePath} (ENOSPC)`);
+      expect(result.returnDisplay).toContain(`No space left on device: ${filePath} (ENOSPC)`);
     });
 
-    it('should return TARGET_IS_DIRECTORY error when write fails with EISDIR', async () => {
-      const dirPath = path.join(rootDir, 'test_directory');
-      const content = 'test content';
+    it("should return TARGET_IS_DIRECTORY error when write fails with EISDIR", async () => {
+      const dirPath = path.join(rootDir, "test_directory");
+      const content = "test content";
 
       // Mock fs.existsSync to return false to bypass validation
       const originalExistsSync = fs.existsSync;
-      vi.spyOn(fs, 'existsSync').mockImplementation((path) => {
+      vi.spyOn(fs, "existsSync").mockImplementation((path) => {
         if (path === dirPath) {
           return false; // Pretend directory doesn't exist to bypass validation
         }
@@ -878,9 +820,9 @@ describe('WriteFileTool', () => {
       });
 
       // Mock FileSystemService writeTextFile to throw EISDIR error
-      vi.spyOn(fsService, 'writeTextFile').mockImplementationOnce(() => {
-        const error = new Error('Is a directory') as NodeJS.ErrnoException;
-        error.code = 'EISDIR';
+      vi.spyOn(fsService, "writeTextFile").mockImplementationOnce(() => {
+        const error = new Error("Is a directory") as NodeJS.ErrnoException;
+        error.code = "EISDIR";
         return Promise.reject(error);
       });
 
@@ -889,26 +831,24 @@ describe('WriteFileTool', () => {
       const result = await invocation.execute(abortSignal);
 
       expect(result.error?.type).toBe(ToolErrorType.TARGET_IS_DIRECTORY);
-      expect(result.llmContent).toContain(
-        `Target is a directory, not a file: ${dirPath} (EISDIR)`,
-      );
+      expect(result.llmContent).toContain(`Target is a directory, not a file: ${dirPath} (EISDIR)`);
       expect(result.returnDisplay).toContain(
         `Target is a directory, not a file: ${dirPath} (EISDIR)`,
       );
 
-      vi.spyOn(fs, 'existsSync').mockImplementation(originalExistsSync);
+      vi.spyOn(fs, "existsSync").mockImplementation(originalExistsSync);
     });
 
-    it('should return FILE_WRITE_FAILURE for generic write errors', async () => {
-      const filePath = path.join(rootDir, 'generic_error_file.txt');
-      const content = 'test content';
+    it("should return FILE_WRITE_FAILURE for generic write errors", async () => {
+      const filePath = path.join(rootDir, "generic_error_file.txt");
+      const content = "test content";
 
       // Ensure fs.existsSync is not mocked for this test
       vi.restoreAllMocks();
 
       // Mock FileSystemService writeTextFile to throw generic error
-      vi.spyOn(fsService, 'writeTextFile').mockImplementationOnce(() =>
-        Promise.reject(new Error('Generic write error')),
+      vi.spyOn(fsService, "writeTextFile").mockImplementationOnce(() =>
+        Promise.reject(new Error("Generic write error")),
       );
 
       const params = { file_path: filePath, content };
@@ -916,12 +856,8 @@ describe('WriteFileTool', () => {
       const result = await invocation.execute(abortSignal);
 
       expect(result.error?.type).toBe(ToolErrorType.FILE_WRITE_FAILURE);
-      expect(result.llmContent).toContain(
-        'Error writing to file: Generic write error',
-      );
-      expect(result.returnDisplay).toContain(
-        'Error writing to file: Generic write error',
-      );
+      expect(result.llmContent).toContain("Error writing to file: Generic write error");
+      expect(result.returnDisplay).toContain("Error writing to file: Generic write error");
     });
   });
 });
diff --git a/packages/gemini-core/src/tools/write-file.ts b/packages/gemini-core/src/tools/write-file.ts
index ad9a6a758..b48d33a45 100644
--- a/packages/gemini-core/src/tools/write-file.ts
+++ b/packages/gemini-core/src/tools/write-file.ts
@@ -4,13 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import * as Diff from 'diff';
-import { WRITE_FILE_TOOL_NAME } from './tool-names.js';
-import type { Config } from '../config/config.js';
-import { ApprovalMode } from '../policy/types.js';
-
+import fs from "node:fs";
+import path from "node:path";
+import * as Diff from "diff";
+import type { Config } from "../config/config.js";
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { IdeClient } from "../ide/ide-client.js";
+import { ApprovalMode } from "../policy/types.js";
+import { logFileOperation } from "../telemetry/loggers.js";
+import { FileOperation } from "../telemetry/metrics.js";
+import { FileOperationEvent } from "../telemetry/types.js";
+import { ensureCorrectEdit, ensureCorrectFileContent } from "../utils/editCorrector.js";
+import { getErrorMessage, isNodeError } from "../utils/errors.js";
+import { getSpecificMimeType } from "../utils/fileUtils.js";
+import { getLanguageFromFilePath } from "../utils/language-detection.js";
+import { makeRelative, shortenPath } from "../utils/paths.js";
+import { DEFAULT_DIFF_OPTIONS, getDiffStat } from "./diffOptions.js";
+import type { ModifiableDeclarativeTool, ModifyContext } from "./modifiable-tool.js";
+import { ToolErrorType } from "./tool-error.js";
+import { WRITE_FILE_TOOL_NAME } from "./tool-names.js";
 import type {
   FileDiff,
   ToolCallConfirmationDetails,
@@ -18,32 +30,8 @@ import type {
   ToolInvocation,
   ToolLocation,
   ToolResult,
-} from './tools.js';
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  Kind,
-  ToolConfirmationOutcome,
-} from './tools.js';
-import { ToolErrorType } from './tool-error.js';
-import { makeRelative, shortenPath } from '../utils/paths.js';
-import { getErrorMessage, isNodeError } from '../utils/errors.js';
-import {
-  ensureCorrectEdit,
-  ensureCorrectFileContent,
-} from '../utils/editCorrector.js';
-import { DEFAULT_DIFF_OPTIONS, getDiffStat } from './diffOptions.js';
-import type {
-  ModifiableDeclarativeTool,
-  ModifyContext,
-} from './modifiable-tool.js';
-import { IdeClient } from '../ide/ide-client.js';
-import { logFileOperation } from '../telemetry/loggers.js';
-import { FileOperationEvent } from '../telemetry/types.js';
-import { FileOperation } from '../telemetry/metrics.js';
-import { getSpecificMimeType } from '../utils/fileUtils.js';
-import { getLanguageFromFilePath } from '../utils/language-detection.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
+} from "./tools.js";
+import { BaseDeclarativeTool, BaseToolInvocation, Kind, ToolConfirmationOutcome } from "./tools.js";
 
 /**
  * Parameters for the WriteFile tool
@@ -83,23 +71,21 @@ export async function getCorrectedFileContent(
   proposedContent: string,
   abortSignal: AbortSignal,
 ): Promise<GetCorrectedFileContentResult> {
-  let originalContent = '';
+  let originalContent = "";
   let fileExists = false;
   let correctedContent = proposedContent;
 
   try {
-    originalContent = await config
-      .getFileSystemService()
-      .readTextFile(filePath);
+    originalContent = await config.getFileSystemService().readTextFile(filePath);
     fileExists = true; // File exists and was read
   } catch (err) {
-    if (isNodeError(err) && err.code === 'ENOENT') {
+    if (isNodeError(err) && err.code === "ENOENT") {
       fileExists = false;
-      originalContent = '';
+      originalContent = "";
     } else {
       // File exists but could not be read (permissions, etc.)
       fileExists = true; // Mark as existing but problematic
-      originalContent = ''; // Can't use its content
+      originalContent = ""; // Can't use its content
       const error = {
         message: getErrorMessage(err),
         code: isNodeError(err) ? err.code : undefined,
@@ -139,10 +125,7 @@ export async function getCorrectedFileContent(
   return { originalContent, correctedContent, fileExists };
 }
 
-class WriteFileToolInvocation extends BaseToolInvocation<
-  WriteFileToolParams,
-  ToolResult
-> {
+class WriteFileToolInvocation extends BaseToolInvocation<WriteFileToolParams, ToolResult> {
   private readonly resolvedPath: string;
 
   constructor(
@@ -153,10 +136,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
     displayName?: string,
   ) {
     super(params, messageBus, toolName, displayName);
-    this.resolvedPath = path.resolve(
-      this.config.getTargetDir(),
-      this.params.file_path,
-    );
+    this.resolvedPath = path.resolve(this.config.getTargetDir(), this.params.file_path);
   }
 
   override toolLocations(): ToolLocation[] {
@@ -164,10 +144,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
   }
 
   override getDescription(): string {
-    const relativePath = makeRelative(
-      this.resolvedPath,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.resolvedPath, this.config.getTargetDir());
     return `Writing to ${shortenPath(relativePath)}`;
   }
 
@@ -191,18 +168,15 @@ class WriteFileToolInvocation extends BaseToolInvocation<
     }
 
     const { originalContent, correctedContent } = correctedContentResult;
-    const relativePath = makeRelative(
-      this.resolvedPath,
-      this.config.getTargetDir(),
-    );
+    const relativePath = makeRelative(this.resolvedPath, this.config.getTargetDir());
     const fileName = path.basename(this.resolvedPath);
 
     const fileDiff = Diff.createPatch(
       fileName,
       originalContent, // Original content (empty if new file or unreadable)
       correctedContent, // Content after potential correction
-      'Current',
-      'Proposed',
+      "Current",
+      "Proposed",
       DEFAULT_DIFF_OPTIONS,
     );
 
@@ -213,7 +187,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         : undefined;
 
     const confirmationDetails: ToolEditConfirmationDetails = {
-      type: 'edit',
+      type: "edit",
       title: `Confirm Write: ${shortenPath(relativePath)}`,
       fileName,
       filePath: this.resolvedPath,
@@ -227,7 +201,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
 
         if (ideConfirmation) {
           const result = await ideConfirmation;
-          if (result.status === 'accepted' && result.content) {
+          if (result.status === "accepted" && result.content) {
             this.params.content = result.content;
           }
         }
@@ -261,17 +235,12 @@ class WriteFileToolInvocation extends BaseToolInvocation<
       };
     }
 
-    const {
-      originalContent,
-      correctedContent: fileContent,
-      fileExists,
-    } = correctedContentResult;
+    const { originalContent, correctedContent: fileContent, fileExists } = correctedContentResult;
     // fileExists is true if the file existed (and was readable or unreadable but caught by readError).
     // fileExists is false if the file did not exist (ENOENT).
     const isNewFile =
       !fileExists ||
-      (correctedContentResult.error !== undefined &&
-        !correctedContentResult.fileExists);
+      (correctedContentResult.error !== undefined && !correctedContentResult.fileExists);
 
     try {
       const dirName = path.dirname(this.resolvedPath);
@@ -279,9 +248,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         fs.mkdirSync(dirName, { recursive: true });
       }
 
-      await this.config
-        .getFileSystemService()
-        .writeTextFile(this.resolvedPath, fileContent);
+      await this.config.getFileSystemService().writeTextFile(this.resolvedPath, fileContent);
 
       // Generate diff for display result
       const fileName = path.basename(this.resolvedPath);
@@ -289,15 +256,15 @@ class WriteFileToolInvocation extends BaseToolInvocation<
       // but for the diff, we want to show the original content as it was before the write if possible.
       // However, if it was unreadable, currentContentForDiff will be empty.
       const currentContentForDiff = correctedContentResult.error
-        ? '' // Or some indicator of unreadable content
+        ? "" // Or some indicator of unreadable content
         : originalContent;
 
       const fileDiff = Diff.createPatch(
         fileName,
         currentContentForDiff,
         fileContent,
-        'Original',
-        'Written',
+        "Original",
+        "Written",
         DEFAULT_DIFF_OPTIONS,
       );
 
@@ -315,9 +282,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
           : `Successfully overwrote file: ${this.resolvedPath}.`,
       ];
       if (modified_by_user) {
-        llmSuccessMessageParts.push(
-          `User modified the \`content\` to be: ${content}`,
-        );
+        llmSuccessMessageParts.push(`User modified the \`content\` to be: ${content}`);
       }
 
       // Log file operation for telemetry (without diff_stat to avoid double-counting)
@@ -331,7 +296,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         new FileOperationEvent(
           WRITE_FILE_TOOL_NAME,
           operation,
-          fileContent.split('\n').length,
+          fileContent.split("\n").length,
           mimetype,
           extension,
           programmingLanguage,
@@ -347,7 +312,7 @@ class WriteFileToolInvocation extends BaseToolInvocation<
       };
 
       return {
-        llmContent: llmSuccessMessageParts.join(' '),
+        llmContent: llmSuccessMessageParts.join(" "),
         returnDisplay: displayResult,
       };
     } catch (error) {
@@ -360,20 +325,20 @@ class WriteFileToolInvocation extends BaseToolInvocation<
         errorMsg = `Error writing to file '${this.resolvedPath}': ${error.message} (${error.code})`;
 
         // Log specific error types for better debugging
-        if (error.code === 'EACCES') {
+        if (error.code === "EACCES") {
           errorMsg = `Permission denied writing to file: ${this.resolvedPath} (${error.code})`;
           errorType = ToolErrorType.PERMISSION_DENIED;
-        } else if (error.code === 'ENOSPC') {
+        } else if (error.code === "ENOSPC") {
           errorMsg = `No space left on device: ${this.resolvedPath} (${error.code})`;
           errorType = ToolErrorType.NO_SPACE_LEFT;
-        } else if (error.code === 'EISDIR') {
+        } else if (error.code === "EISDIR") {
           errorMsg = `Target is a directory, not a file: ${this.resolvedPath} (${error.code})`;
           errorType = ToolErrorType.TARGET_IS_DIRECTORY;
         }
 
         // Include stack trace in debug mode for better troubleshooting
         if (this.config.getDebugMode() && error.stack) {
-          console.error('Write file error stack:', error.stack);
+          console.error("Write file error stack:", error.stack);
         }
       } else if (error instanceof Error) {
         errorMsg = `Error writing to file: ${error.message}`;
@@ -408,7 +373,7 @@ export class WriteFileTool
   ) {
     super(
       WriteFileTool.Name,
-      'WriteFile',
+      "WriteFile",
       `Writes content to a specified file in the local filesystem.
 
       The user has the ability to modify \`content\`. If modified, this will be stated in the response.`,
@@ -416,16 +381,16 @@ export class WriteFileTool
       {
         properties: {
           file_path: {
-            description: 'The path to the file to write to.',
-            type: 'string',
+            description: "The path to the file to write to.",
+            type: "string",
           },
           content: {
-            description: 'The content to write to the file.',
-            type: 'string',
+            description: "The content to write to the file.",
+            type: "string",
           },
         },
-        required: ['file_path', 'content'],
-        type: 'object',
+        required: ["file_path", "content"],
+        type: "object",
       },
       true,
       false,
@@ -433,9 +398,7 @@ export class WriteFileTool
     );
   }
 
-  protected override validateToolParamValues(
-    params: WriteFileToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: WriteFileToolParams): string | null {
     const filePath = params.file_path;
 
     if (!filePath) {
@@ -447,9 +410,7 @@ export class WriteFileTool
     const workspaceContext = this.config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(resolvedPath)) {
       const directories = workspaceContext.getDirectories();
-      return `File path must be within one of the workspace directories: ${directories.join(
-        ', ',
-      )}`;
+      return `File path must be within one of the workspace directories: ${directories.join(", ")}`;
     }
 
     try {
@@ -480,9 +441,7 @@ export class WriteFileTool
     );
   }
 
-  getModifyContext(
-    abortSignal: AbortSignal,
-  ): ModifyContext<WriteFileToolParams> {
+  getModifyContext(abortSignal: AbortSignal): ModifyContext<WriteFileToolParams> {
     return {
       getFilePath: (params: WriteFileToolParams) => params.file_path,
       getCurrentContent: async (params: WriteFileToolParams) => {
diff --git a/packages/gemini-core/src/tools/write-todos.test.ts b/packages/gemini-core/src/tools/write-todos.test.ts
index 9c2bc36fa..e5319d182 100644
--- a/packages/gemini-core/src/tools/write-todos.test.ts
+++ b/packages/gemini-core/src/tools/write-todos.test.ts
@@ -4,73 +4,73 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it } from 'vitest';
-import { WriteTodosTool, type WriteTodosToolParams } from './write-todos.js';
+import { describe, expect, it } from "vitest";
+import { WriteTodosTool, type WriteTodosToolParams } from "./write-todos.js";
 
-describe('WriteTodosTool', () => {
+describe("WriteTodosTool", () => {
   const tool = new WriteTodosTool();
   const signal = new AbortController().signal;
 
-  describe('validation', () => {
-    it('should not throw for valid parameters', async () => {
+  describe("validation", () => {
+    it("should not throw for valid parameters", async () => {
       const params: WriteTodosToolParams = {
         todos: [
-          { description: 'Task 1', status: 'pending' },
-          { description: 'Task 2', status: 'in_progress' },
-          { description: 'Task 3', status: 'completed' },
+          { description: "Task 1", status: "pending" },
+          { description: "Task 2", status: "in_progress" },
+          { description: "Task 3", status: "completed" },
         ],
       };
       await expect(tool.buildAndExecute(params, signal)).resolves.toBeDefined();
     });
 
-    it('should not throw for an empty list', async () => {
+    it("should not throw for an empty list", async () => {
       const params: WriteTodosToolParams = {
         todos: [],
       };
       await expect(tool.buildAndExecute(params, signal)).resolves.toBeDefined();
     });
 
-    it('should throw an error if todos is not an array', async () => {
+    it("should throw an error if todos is not an array", async () => {
       const params = {
-        todos: 'not-an-array',
+        todos: "not-an-array",
       } as unknown as WriteTodosToolParams;
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'params/todos must be array',
+        "params/todos must be array",
       );
     });
 
-    it('should throw an error if a todo item is not an object', async () => {
+    it("should throw an error if a todo item is not an object", async () => {
       const params = {
-        todos: ['not-an-object'],
+        todos: ["not-an-object"],
       } as unknown as WriteTodosToolParams;
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'params/todos/0 must be object',
+        "params/todos/0 must be object",
       );
     });
 
-    it('should throw an error if a todo description is missing or empty', async () => {
+    it("should throw an error if a todo description is missing or empty", async () => {
       const params: WriteTodosToolParams = {
-        todos: [{ description: '  ', status: 'pending' }],
+        todos: [{ description: "  ", status: "pending" }],
       };
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'Each todo must have a non-empty description string',
+        "Each todo must have a non-empty description string",
       );
     });
 
-    it('should throw an error if a todo status is invalid', async () => {
+    it("should throw an error if a todo status is invalid", async () => {
       const params = {
-        todos: [{ description: 'Task 1', status: 'invalid-status' }],
+        todos: [{ description: "Task 1", status: "invalid-status" }],
       } as unknown as WriteTodosToolParams;
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
-        'params/todos/0/status must be equal to one of the allowed values',
+        "params/todos/0/status must be equal to one of the allowed values",
       );
     });
 
-    it('should throw an error if more than one task is in_progress', async () => {
+    it("should throw an error if more than one task is in_progress", async () => {
       const params: WriteTodosToolParams = {
         todos: [
-          { description: 'Task 1', status: 'in_progress' },
-          { description: 'Task 2', status: 'in_progress' },
+          { description: "Task 1", status: "in_progress" },
+          { description: "Task 2", status: "in_progress" },
         ],
       };
       await expect(tool.buildAndExecute(params, signal)).rejects.toThrow(
@@ -79,22 +79,22 @@ describe('WriteTodosTool', () => {
     });
   });
 
-  describe('execute', () => {
-    it('should return a success message for clearing the list', async () => {
+  describe("execute", () => {
+    it("should return a success message for clearing the list", async () => {
       const params: WriteTodosToolParams = {
         todos: [],
       };
       const result = await tool.buildAndExecute(params, signal);
-      expect(result.llmContent).toBe('Successfully cleared the todo list.');
+      expect(result.llmContent).toBe("Successfully cleared the todo list.");
       expect(result.returnDisplay).toEqual({ todos: [] });
     });
 
-    it('should return a formatted todo list on success', async () => {
+    it("should return a formatted todo list on success", async () => {
       const params: WriteTodosToolParams = {
         todos: [
-          { description: 'First task', status: 'completed' },
-          { description: 'Second task', status: 'in_progress' },
-          { description: 'Third task', status: 'pending' },
+          { description: "First task", status: "completed" },
+          { description: "Second task", status: "in_progress" },
+          { description: "Third task", status: "pending" },
         ],
       };
       const result = await tool.buildAndExecute(params, signal);
diff --git a/packages/gemini-core/src/tools/write-todos.ts b/packages/gemini-core/src/tools/write-todos.ts
index deb2dd057..acaa21ea9 100644
--- a/packages/gemini-core/src/tools/write-todos.ts
+++ b/packages/gemini-core/src/tools/write-todos.ts
@@ -4,23 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolInvocation } from './tools.js';
+import type { MessageBus } from "../confirmation-bus/message-bus.js";
+import { WRITE_TODOS_TOOL_NAME } from "./tool-names.js";
+import type { ToolInvocation } from "./tools.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   Kind,
   type Todo,
   type ToolResult,
-} from './tools.js';
-import type { MessageBus } from '../confirmation-bus/message-bus.js';
-import { WRITE_TODOS_TOOL_NAME } from './tool-names.js';
+} from "./tools.js";
 
-const TODO_STATUSES = [
-  'pending',
-  'in_progress',
-  'completed',
-  'cancelled',
-] as const;
+const TODO_STATUSES = ["pending", "in_progress", "completed", "cancelled"] as const;
 
 // Inspired by langchain/deepagents.
 export const WRITE_TODOS_DESCRIPTION = `This tool can help you list out the current subtasks that are required to be completed for a given user request. The list of subtasks helps you keep track of the current task, organize complex queries and help ensure that you don't miss any steps. With this list, the user can also see the current progress you are making in executing a given task.
@@ -95,10 +90,7 @@ export interface WriteTodosToolParams {
   todos: Todo[];
 }
 
-class WriteTodosToolInvocation extends BaseToolInvocation<
-  WriteTodosToolParams,
-  ToolResult
-> {
+class WriteTodosToolInvocation extends BaseToolInvocation<WriteTodosToolParams, ToolResult> {
   constructor(
     params: WriteTodosToolParams,
     messageBus?: MessageBus,
@@ -111,7 +103,7 @@ class WriteTodosToolInvocation extends BaseToolInvocation<
   getDescription(): string {
     const count = this.params.todos?.length ?? 0;
     if (count === 0) {
-      return 'Cleared todo list';
+      return "Cleared todo list";
     }
     return `Set ${count} todo(s)`;
   }
@@ -122,15 +114,13 @@ class WriteTodosToolInvocation extends BaseToolInvocation<
   ): Promise<ToolResult> {
     const todos = this.params.todos ?? [];
     const todoListString = todos
-      .map(
-        (todo, index) => `${index + 1}. [${todo.status}] ${todo.description}`,
-      )
-      .join('\n');
+      .map((todo, index) => `${index + 1}. [${todo.status}] ${todo.description}`)
+      .join("\n");
 
     const llmContent =
       todos.length > 0
         ? `Successfully updated the todo list. The current list is now:\n${todoListString}`
-        : 'Successfully cleared the todo list.';
+        : "Successfully cleared the todo list.";
 
     return {
       llmContent,
@@ -139,71 +129,57 @@ class WriteTodosToolInvocation extends BaseToolInvocation<
   }
 }
 
-export class WriteTodosTool extends BaseDeclarativeTool<
-  WriteTodosToolParams,
-  ToolResult
-> {
+export class WriteTodosTool extends BaseDeclarativeTool<WriteTodosToolParams, ToolResult> {
   static readonly Name = WRITE_TODOS_TOOL_NAME;
 
   constructor() {
-    super(
-      WriteTodosTool.Name,
-      'WriteTodos',
-      WRITE_TODOS_DESCRIPTION,
-      Kind.Other,
-      {
-        type: 'object',
-        properties: {
-          todos: {
-            type: 'array',
-            description:
-              'The complete list of todo items. This will replace the existing list.',
-            items: {
-              type: 'object',
-              description: 'A single todo item.',
-              properties: {
-                description: {
-                  type: 'string',
-                  description: 'The description of the task.',
-                },
-                status: {
-                  type: 'string',
-                  description: 'The current status of the task.',
-                  enum: TODO_STATUSES,
-                },
+    super(WriteTodosTool.Name, "WriteTodos", WRITE_TODOS_DESCRIPTION, Kind.Other, {
+      type: "object",
+      properties: {
+        todos: {
+          type: "array",
+          description: "The complete list of todo items. This will replace the existing list.",
+          items: {
+            type: "object",
+            description: "A single todo item.",
+            properties: {
+              description: {
+                type: "string",
+                description: "The description of the task.",
+              },
+              status: {
+                type: "string",
+                description: "The current status of the task.",
+                enum: TODO_STATUSES,
               },
-              required: ['description', 'status'],
             },
+            required: ["description", "status"],
           },
         },
-        required: ['todos'],
       },
-    );
+      required: ["todos"],
+    });
   }
 
-  protected override validateToolParamValues(
-    params: WriteTodosToolParams,
-  ): string | null {
+  protected override validateToolParamValues(params: WriteTodosToolParams): string | null {
     const todos = params?.todos;
     if (!params || !Array.isArray(todos)) {
-      return '`todos` parameter must be an array';
+      return "`todos` parameter must be an array";
     }
 
     for (const todo of todos) {
-      if (typeof todo !== 'object' || todo === null) {
-        return 'Each todo item must be an object';
+      if (typeof todo !== "object" || todo === null) {
+        return "Each todo item must be an object";
       }
-      if (typeof todo.description !== 'string' || !todo.description.trim()) {
-        return 'Each todo must have a non-empty description string';
+      if (typeof todo.description !== "string" || !todo.description.trim()) {
+        return "Each todo must have a non-empty description string";
       }
       if (!TODO_STATUSES.includes(todo.status)) {
-        return `Each todo must have a valid status (${TODO_STATUSES.join(', ')})`;
+        return `Each todo must have a valid status (${TODO_STATUSES.join(", ")})`;
       }
     }
 
-    const inProgressCount = todos.filter(
-      (todo: Todo) => todo.status === 'in_progress',
-    ).length;
+    const inProgressCount = todos.filter((todo: Todo) => todo.status === "in_progress").length;
 
     if (inProgressCount > 1) {
       return 'Invalid parameters: Only one task can be "in_progress" at a time.';
@@ -218,11 +194,6 @@ export class WriteTodosTool extends BaseDeclarativeTool<
     _toolName?: string,
     _displayName?: string,
   ): ToolInvocation<WriteTodosToolParams, ToolResult> {
-    return new WriteTodosToolInvocation(
-      params,
-      _messageBus,
-      _toolName,
-      _displayName,
-    );
+    return new WriteTodosToolInvocation(params, _messageBus, _toolName, _displayName);
   }
 }
diff --git a/packages/gemini-core/src/utils/bfsFileSearch.test.ts b/packages/gemini-core/src/utils/bfsFileSearch.test.ts
index 7fb2022b5..d4860e63e 100644
--- a/packages/gemini-core/src/utils/bfsFileSearch.test.ts
+++ b/packages/gemini-core/src/utils/bfsFileSearch.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fsPromises from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { bfsFileSearch } from './bfsFileSearch.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-
-describe('bfsFileSearch', () => {
+import * as fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { bfsFileSearch } from "./bfsFileSearch.js";
+
+describe("bfsFileSearch", () => {
   let testRootDir: string;
 
   async function createEmptyDir(...pathSegments: string[]) {
@@ -28,105 +28,88 @@ describe('bfsFileSearch', () => {
   }
 
   beforeEach(async () => {
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'bfs-file-search-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "bfs-file-search-test-"));
   });
 
   afterEach(async () => {
     await fsPromises.rm(testRootDir, { recursive: true, force: true });
   });
 
-  it('should find a file in the root directory', async () => {
-    const targetFilePath = await createTestFile('content', 'target.txt');
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should find a file in the root directory", async () => {
+    const targetFilePath = await createTestFile("content", "target.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should find a file in a nested directory', async () => {
-    const targetFilePath = await createTestFile(
-      'content',
-      'a',
-      'b',
-      'target.txt',
-    );
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should find a file in a nested directory", async () => {
+    const targetFilePath = await createTestFile("content", "a", "b", "target.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should find multiple files with the same name', async () => {
-    const targetFilePath1 = await createTestFile('content1', 'a', 'target.txt');
-    const targetFilePath2 = await createTestFile('content2', 'b', 'target.txt');
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should find multiple files with the same name", async () => {
+    const targetFilePath1 = await createTestFile("content1", "a", "target.txt");
+    const targetFilePath2 = await createTestFile("content2", "b", "target.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     result.sort();
     expect(result).toEqual([targetFilePath1, targetFilePath2].sort());
   });
 
-  it('should return an empty array if no file is found', async () => {
-    await createTestFile('content', 'other.txt');
-    const result = await bfsFileSearch(testRootDir, { fileName: 'target.txt' });
+  it("should return an empty array if no file is found", async () => {
+    await createTestFile("content", "other.txt");
+    const result = await bfsFileSearch(testRootDir, { fileName: "target.txt" });
     expect(result).toEqual([]);
   });
 
-  it('should ignore directories specified in ignoreDirs', async () => {
-    await createTestFile('content', 'ignored', 'target.txt');
-    const targetFilePath = await createTestFile(
-      'content',
-      'not-ignored',
-      'target.txt',
-    );
+  it("should ignore directories specified in ignoreDirs", async () => {
+    await createTestFile("content", "ignored", "target.txt");
+    const targetFilePath = await createTestFile("content", "not-ignored", "target.txt");
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'target.txt',
-      ignoreDirs: ['ignored'],
+      fileName: "target.txt",
+      ignoreDirs: ["ignored"],
     });
     expect(result).toEqual([targetFilePath]);
   });
 
-  it('should respect the maxDirs limit and not find the file', async () => {
-    await createTestFile('content', 'a', 'b', 'c', 'target.txt');
+  it("should respect the maxDirs limit and not find the file", async () => {
+    await createTestFile("content", "a", "b", "c", "target.txt");
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'target.txt',
+      fileName: "target.txt",
       maxDirs: 3,
     });
     expect(result).toEqual([]);
   });
 
-  it('should respect the maxDirs limit and find the file', async () => {
-    const targetFilePath = await createTestFile(
-      'content',
-      'a',
-      'b',
-      'c',
-      'target.txt',
-    );
+  it("should respect the maxDirs limit and find the file", async () => {
+    const targetFilePath = await createTestFile("content", "a", "b", "c", "target.txt");
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'target.txt',
+      fileName: "target.txt",
       maxDirs: 4,
     });
     expect(result).toEqual([targetFilePath]);
   });
 
-  describe('with FileDiscoveryService', () => {
+  describe("with FileDiscoveryService", () => {
     let projectRoot: string;
 
     beforeEach(async () => {
-      projectRoot = await createEmptyDir('project');
+      projectRoot = await createEmptyDir("project");
     });
 
-    it('should ignore gitignored files', async () => {
-      await createEmptyDir('project', '.git');
-      await createTestFile('node_modules/', 'project', '.gitignore');
-      await createTestFile('content', 'project', 'node_modules', 'target.txt');
+    it("should ignore gitignored files", async () => {
+      await createEmptyDir("project", ".git");
+      await createTestFile("node_modules/", "project", ".gitignore");
+      await createTestFile("content", "project", "node_modules", "target.txt");
       const targetFilePath = await createTestFile(
-        'content',
-        'project',
-        'not-ignored',
-        'target.txt',
+        "content",
+        "project",
+        "not-ignored",
+        "target.txt",
       );
 
       const fileService = new FileDiscoveryService(projectRoot);
       const result = await bfsFileSearch(projectRoot, {
-        fileName: 'target.txt',
+        fileName: "target.txt",
         fileService,
         fileFilteringOptions: {
           respectGitIgnore: true,
@@ -137,19 +120,19 @@ describe('bfsFileSearch', () => {
       expect(result).toEqual([targetFilePath]);
     });
 
-    it('should ignore geminiignored files', async () => {
-      await createTestFile('node_modules/', 'project', '.geminiignore');
-      await createTestFile('content', 'project', 'node_modules', 'target.txt');
+    it("should ignore geminiignored files", async () => {
+      await createTestFile("node_modules/", "project", ".geminiignore");
+      await createTestFile("content", "project", "node_modules", "target.txt");
       const targetFilePath = await createTestFile(
-        'content',
-        'project',
-        'not-ignored',
-        'target.txt',
+        "content",
+        "project",
+        "not-ignored",
+        "target.txt",
       );
 
       const fileService = new FileDiscoveryService(projectRoot);
       const result = await bfsFileSearch(projectRoot, {
-        fileName: 'target.txt',
+        fileName: "target.txt",
         fileService,
         fileFilteringOptions: {
           respectGitIgnore: false,
@@ -160,25 +143,15 @@ describe('bfsFileSearch', () => {
       expect(result).toEqual([targetFilePath]);
     });
 
-    it('should not ignore files if respect flags are false', async () => {
-      await createEmptyDir('project', '.git');
-      await createTestFile('node_modules/', 'project', '.gitignore');
-      const target1 = await createTestFile(
-        'content',
-        'project',
-        'node_modules',
-        'target.txt',
-      );
-      const target2 = await createTestFile(
-        'content',
-        'project',
-        'not-ignored',
-        'target.txt',
-      );
+    it("should not ignore files if respect flags are false", async () => {
+      await createEmptyDir("project", ".git");
+      await createTestFile("node_modules/", "project", ".gitignore");
+      const target1 = await createTestFile("content", "project", "node_modules", "target.txt");
+      const target2 = await createTestFile("content", "project", "not-ignored", "target.txt");
 
       const fileService = new FileDiscoveryService(projectRoot);
       const result = await bfsFileSearch(projectRoot, {
-        fileName: 'target.txt',
+        fileName: "target.txt",
         fileService,
         fileFilteringOptions: {
           respectGitIgnore: false,
@@ -190,7 +163,7 @@ describe('bfsFileSearch', () => {
     });
   });
 
-  it('should find all files in a complex directory structure', async () => {
+  it("should find all files in a complex directory structure", async () => {
     // Create a complex directory structure to test correctness at scale
     // without flaky performance checks.
     const numDirs = 50;
@@ -200,26 +173,22 @@ describe('bfsFileSearch', () => {
     const dirCreationPromises: Array<Promise<unknown>> = [];
     for (let i = 0; i < numDirs; i++) {
       dirCreationPromises.push(createEmptyDir(`dir${i}`));
-      dirCreationPromises.push(createEmptyDir(`dir${i}`, 'subdir1'));
-      dirCreationPromises.push(createEmptyDir(`dir${i}`, 'subdir2'));
-      dirCreationPromises.push(createEmptyDir(`dir${i}`, 'subdir1', 'deep'));
+      dirCreationPromises.push(createEmptyDir(`dir${i}`, "subdir1"));
+      dirCreationPromises.push(createEmptyDir(`dir${i}`, "subdir2"));
+      dirCreationPromises.push(createEmptyDir(`dir${i}`, "subdir1", "deep"));
     }
     await Promise.all(dirCreationPromises);
 
     const fileCreationPromises: Array<Promise<string>> = [];
     for (let i = 0; i < numTargetDirs; i++) {
       // Add target files in some directories
-      fileCreationPromises.push(
-        createTestFile('content', `dir${i}`, 'GEMINI.md'),
-      );
-      fileCreationPromises.push(
-        createTestFile('content', `dir${i}`, 'subdir1', 'GEMINI.md'),
-      );
+      fileCreationPromises.push(createTestFile("content", `dir${i}`, "GEMINI.md"));
+      fileCreationPromises.push(createTestFile("content", `dir${i}`, "subdir1", "GEMINI.md"));
     }
     const expectedFiles = await Promise.all(fileCreationPromises);
 
     const result = await bfsFileSearch(testRootDir, {
-      fileName: 'GEMINI.md',
+      fileName: "GEMINI.md",
       // Provide a generous maxDirs limit to ensure it doesn't prematurely stop
       // in this large test case. Total dirs created is 200.
       maxDirs: 250,
diff --git a/packages/gemini-core/src/utils/bfsFileSearch.ts b/packages/gemini-core/src/utils/bfsFileSearch.ts
index 36006335a..349f20b32 100644
--- a/packages/gemini-core/src/utils/bfsFileSearch.ts
+++ b/packages/gemini-core/src/utils/bfsFileSearch.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { debugLogger } from './debugLogger.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FileFilteringOptions } from "../config/constants.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { debugLogger } from "./debugLogger.js";
+
 // Simple console logger for now.
 // TODO: Integrate with a more robust server-side logger.
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) =>
-    debugLogger.debug('[DEBUG] [BfsFileSearch]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [BfsFileSearch]", ...args),
 };
 
 interface BfsFileSearchOptions {
@@ -37,13 +37,7 @@ export async function bfsFileSearch(
   rootDir: string,
   options: BfsFileSearchOptions,
 ): Promise<string[]> {
-  const {
-    fileName,
-    ignoreDirs = [],
-    maxDirs = Infinity,
-    debug = false,
-    fileService,
-  } = options;
+  const { fileName, ignoreDirs = [], maxDirs = Infinity, debug = false, fileService } = options;
   const foundFiles: string[] = [];
   const queue: string[] = [rootDir];
   const visited = new Set<string>();
@@ -73,9 +67,7 @@ export async function bfsFileSearch(
     if (currentBatch.length === 0) continue;
 
     if (debug) {
-      logger.debug(
-        `Scanning [${scannedDirCount}/${maxDirs}]: batch of ${currentBatch.length}`,
-      );
+      logger.debug(`Scanning [${scannedDirCount}/${maxDirs}]: batch of ${currentBatch.length}`);
     }
 
     // Read directories in parallel instead of one by one
@@ -85,10 +77,8 @@ export async function bfsFileSearch(
         return { currentDir, entries };
       } catch (error) {
         // Warn user that a directory could not be read, as this affects search results.
-        const message = (error as Error)?.message ?? 'Unknown error';
-        debugLogger.warn(
-          `[WARN] Skipping unreadable directory: ${currentDir} (${message})`,
-        );
+        const message = (error as Error)?.message ?? "Unknown error";
+        debugLogger.warn(`[WARN] Skipping unreadable directory: ${currentDir} (${message})`);
         if (debug) {
           logger.debug(`Full error for ${currentDir}:`, error);
         }
@@ -114,8 +104,7 @@ export async function bfsFileSearch(
         if (
           fileService?.shouldIgnoreFile(fullPath, {
             respectGitIgnore: options.fileFilteringOptions?.respectGitIgnore,
-            respectGeminiIgnore:
-              options.fileFilteringOptions?.respectGeminiIgnore,
+            respectGeminiIgnore: options.fileFilteringOptions?.respectGeminiIgnore,
           })
         ) {
           continue;
diff --git a/packages/gemini-core/src/utils/browser.ts b/packages/gemini-core/src/utils/browser.ts
index 35ee74611..10b4b9a19 100644
--- a/packages/gemini-core/src/utils/browser.ts
+++ b/packages/gemini-core/src/utils/browser.ts
@@ -14,29 +14,26 @@
 export function shouldAttemptBrowserLaunch(): boolean {
   // A list of browser names that indicate we should not attempt to open a
   // web browser for the user.
-  const browserBlocklist = ['www-browser'];
-  const browserEnv = process.env['BROWSER'];
+  const browserBlocklist = ["www-browser"];
+  const browserEnv = process.env["BROWSER"];
   if (browserEnv && browserBlocklist.includes(browserEnv)) {
     return false;
   }
   // Common environment variables used in CI/CD or other non-interactive shells.
-  if (
-    process.env['CI'] ||
-    process.env['DEBIAN_FRONTEND'] === 'noninteractive'
-  ) {
+  if (process.env["CI"] || process.env["DEBIAN_FRONTEND"] === "noninteractive") {
     return false;
   }
 
   // The presence of SSH_CONNECTION indicates a remote session.
   // We should not attempt to launch a browser unless a display is explicitly available
   // (checked below for Linux).
-  const isSSH = !!process.env['SSH_CONNECTION'];
+  const isSSH = !!process.env["SSH_CONNECTION"];
 
   // On Linux, the presence of a display server is a strong indicator of a GUI.
-  if (process.platform === 'linux') {
+  if (process.platform === "linux") {
     // These are environment variables that can indicate a running compositor on
     // Linux.
-    const displayVariables = ['DISPLAY', 'WAYLAND_DISPLAY', 'MIR_SOCKET'];
+    const displayVariables = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"];
     const hasDisplay = displayVariables.some((v) => !!process.env[v]);
     if (!hasDisplay) {
       return false;
@@ -45,7 +42,7 @@ export function shouldAttemptBrowserLaunch(): boolean {
 
   // If in an SSH session on a non-Linux OS (e.g., macOS), don't launch browser.
   // The Linux case is handled above (it's allowed if DISPLAY is set).
-  if (isSSH && process.platform !== 'linux') {
+  if (isSSH && process.platform !== "linux") {
     return false;
   }
 
diff --git a/packages/gemini-core/src/utils/channel.test.ts b/packages/gemini-core/src/utils/channel.test.ts
index 8dc554e4d..a53818da2 100644
--- a/packages/gemini-core/src/utils/channel.test.ts
+++ b/packages/gemini-core/src/utils/channel.test.ts
@@ -4,212 +4,200 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import {
-  ReleaseChannel,
+  _clearCache,
   getReleaseChannel,
   isNightly,
   isPreview,
   isStable,
-  _clearCache,
-} from './channel.js';
-import * as packageJson from './package.js';
+  ReleaseChannel,
+} from "./channel.js";
+import * as packageJson from "./package.js";
 
-vi.mock('./package.js', () => ({
+vi.mock("./package.js", () => ({
   getPackageJson: vi.fn(),
 }));
 
-describe('channel', () => {
+describe("channel", () => {
   beforeEach(() => {
     vi.resetAllMocks();
     _clearCache();
   });
 
-  describe('isStable', () => {
-    it('should return true for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("isStable", () => {
+    it("should return true for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(true);
+      await expect(isStable("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return false for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return false for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return false for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+    it("should return false if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return false if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(isStable('/test/dir')).resolves.toBe(false);
+      await expect(isStable("/test/dir")).resolves.toBe(false);
     });
   });
 
-  describe('isNightly', () => {
-    it('should return false for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("isNightly", () => {
+    it("should return false for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(false);
+      await expect(isNightly("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return true for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return true for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(true);
+      await expect(isNightly("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return false for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return false for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(false);
+      await expect(isNightly("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return true if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(isNightly('/test/dir')).resolves.toBe(true);
+    it("should return true if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(isNightly("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return true if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return true if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(isNightly('/test/dir')).resolves.toBe(true);
+      await expect(isNightly("/test/dir")).resolves.toBe(true);
     });
   });
 
-  describe('isPreview', () => {
-    it('should return false for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("isPreview", () => {
+    it("should return false for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return false for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return true for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return true for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(true);
+      await expect(isPreview("/test/dir")).resolves.toBe(true);
     });
 
-    it('should return false if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+    it("should return false if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
 
-    it('should return false if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return false if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
     });
   });
 
-  describe('getReleaseChannel', () => {
-    it('should return STABLE for a stable version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0',
+  describe("getReleaseChannel", () => {
+    it("should return STABLE for a stable version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.STABLE,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.STABLE);
     });
 
-    it('should return NIGHTLY for a nightly version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-nightly.1',
+    it("should return NIGHTLY for a nightly version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-nightly.1",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.NIGHTLY,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.NIGHTLY);
     });
 
-    it('should return PREVIEW for a preview version', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
-        version: '1.0.0-preview.1',
+    it("should return PREVIEW for a preview version", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
+        version: "1.0.0-preview.1",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.PREVIEW,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.PREVIEW);
     });
 
-    it('should return NIGHTLY if package.json is not found', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue(undefined);
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.NIGHTLY,
-      );
+    it("should return NIGHTLY if package.json is not found", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue(undefined);
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.NIGHTLY);
     });
 
-    it('should return NIGHTLY if version is not defined', async () => {
-      vi.spyOn(packageJson, 'getPackageJson').mockResolvedValue({
-        name: 'test',
+    it("should return NIGHTLY if version is not defined", async () => {
+      vi.spyOn(packageJson, "getPackageJson").mockResolvedValue({
+        name: "test",
       });
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.NIGHTLY,
-      );
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.NIGHTLY);
     });
   });
 
-  describe('memoization', () => {
-    it('should only call getPackageJson once for the same cwd', async () => {
+  describe("memoization", () => {
+    it("should only call getPackageJson once for the same cwd", async () => {
       const spy = vi
-        .spyOn(packageJson, 'getPackageJson')
-        .mockResolvedValue({ name: 'test', version: '1.0.0' });
+        .spyOn(packageJson, "getPackageJson")
+        .mockResolvedValue({ name: "test", version: "1.0.0" });
 
-      await expect(isStable('/test/dir')).resolves.toBe(true);
-      await expect(isNightly('/test/dir')).resolves.toBe(false);
-      await expect(isPreview('/test/dir')).resolves.toBe(false);
-      await expect(getReleaseChannel('/test/dir')).resolves.toBe(
-        ReleaseChannel.STABLE,
-      );
+      await expect(isStable("/test/dir")).resolves.toBe(true);
+      await expect(isNightly("/test/dir")).resolves.toBe(false);
+      await expect(isPreview("/test/dir")).resolves.toBe(false);
+      await expect(getReleaseChannel("/test/dir")).resolves.toBe(ReleaseChannel.STABLE);
 
       expect(spy).toHaveBeenCalledTimes(1);
     });
 
-    it('should call getPackageJson again for a different cwd', async () => {
+    it("should call getPackageJson again for a different cwd", async () => {
       const spy = vi
-        .spyOn(packageJson, 'getPackageJson')
-        .mockResolvedValue({ name: 'test', version: '1.0.0' });
+        .spyOn(packageJson, "getPackageJson")
+        .mockResolvedValue({ name: "test", version: "1.0.0" });
 
-      await expect(isStable('/test/dir1')).resolves.toBe(true);
-      await expect(isStable('/test/dir2')).resolves.toBe(true);
+      await expect(isStable("/test/dir1")).resolves.toBe(true);
+      await expect(isStable("/test/dir2")).resolves.toBe(true);
 
       expect(spy).toHaveBeenCalledTimes(2);
     });
diff --git a/packages/gemini-core/src/utils/channel.ts b/packages/gemini-core/src/utils/channel.ts
index 09b654b76..5e3a1d388 100644
--- a/packages/gemini-core/src/utils/channel.ts
+++ b/packages/gemini-core/src/utils/channel.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getPackageJson } from './package.js';
+import { getPackageJson } from "./package.js";
 
 export enum ReleaseChannel {
-  NIGHTLY = 'nightly',
-  PREVIEW = 'preview',
-  STABLE = 'stable',
+  NIGHTLY = "nightly",
+  PREVIEW = "preview",
+  STABLE = "stable",
 }
 
 const cache = new Map<string, ReleaseChannel>();
@@ -28,12 +28,12 @@ export async function getReleaseChannel(cwd: string): Promise<ReleaseChannel> {
   }
 
   const packageJson = await getPackageJson(cwd);
-  const version = packageJson?.version ?? '';
+  const version = packageJson?.version ?? "";
 
   let channel: ReleaseChannel;
-  if (version.includes('nightly') || version === '') {
+  if (version.includes("nightly") || version === "") {
     channel = ReleaseChannel.NIGHTLY;
-  } else if (version.includes('preview')) {
+  } else if (version.includes("preview")) {
     channel = ReleaseChannel.PREVIEW;
   } else {
     channel = ReleaseChannel.STABLE;
diff --git a/packages/gemini-core/src/utils/debugLogger.test.ts b/packages/gemini-core/src/utils/debugLogger.test.ts
index ac52f2f69..845a2a432 100644
--- a/packages/gemini-core/src/utils/debugLogger.test.ts
+++ b/packages/gemini-core/src/utils/debugLogger.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { debugLogger } from './debugLogger.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { debugLogger } from "./debugLogger.js";
 
-describe('DebugLogger', () => {
+describe("DebugLogger", () => {
   // Spy on all console methods before each test
   beforeEach(() => {
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(console, 'debug').mockImplementation(() => {});
+    vi.spyOn(console, "log").mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(console, "debug").mockImplementation(() => {});
   });
 
   // Restore original console methods after each test
@@ -21,53 +21,53 @@ describe('DebugLogger', () => {
     vi.restoreAllMocks();
   });
 
-  it('should call console.log with the correct arguments', () => {
-    const message = 'This is a log message';
-    const data = { key: 'value' };
+  it("should call console.log with the correct arguments", () => {
+    const message = "This is a log message";
+    const data = { key: "value" };
     debugLogger.log(message, data);
     expect(console.log).toHaveBeenCalledWith(message, data);
     expect(console.log).toHaveBeenCalledTimes(1);
   });
 
-  it('should call console.warn with the correct arguments', () => {
-    const message = 'This is a warning message';
+  it("should call console.warn with the correct arguments", () => {
+    const message = "This is a warning message";
     const data = [1, 2, 3];
     debugLogger.warn(message, data);
     expect(console.warn).toHaveBeenCalledWith(message, data);
     expect(console.warn).toHaveBeenCalledTimes(1);
   });
 
-  it('should call console.error with the correct arguments', () => {
-    const message = 'This is an error message';
-    const error = new Error('Something went wrong');
+  it("should call console.error with the correct arguments", () => {
+    const message = "This is an error message";
+    const error = new Error("Something went wrong");
     debugLogger.error(message, error);
     expect(console.error).toHaveBeenCalledWith(message, error);
     expect(console.error).toHaveBeenCalledTimes(1);
   });
 
-  it('should call console.debug with the correct arguments', () => {
-    const message = 'This is a debug message';
-    const obj = { a: { b: 'c' } };
+  it("should call console.debug with the correct arguments", () => {
+    const message = "This is a debug message";
+    const obj = { a: { b: "c" } };
     debugLogger.debug(message, obj);
     expect(console.debug).toHaveBeenCalledWith(message, obj);
     expect(console.debug).toHaveBeenCalledTimes(1);
   });
 
-  it('should handle multiple arguments correctly for all methods', () => {
-    debugLogger.log('one', 2, true);
-    expect(console.log).toHaveBeenCalledWith('one', 2, true);
+  it("should handle multiple arguments correctly for all methods", () => {
+    debugLogger.log("one", 2, true);
+    expect(console.log).toHaveBeenCalledWith("one", 2, true);
 
-    debugLogger.warn('one', 2, false);
-    expect(console.warn).toHaveBeenCalledWith('one', 2, false);
+    debugLogger.warn("one", 2, false);
+    expect(console.warn).toHaveBeenCalledWith("one", 2, false);
 
-    debugLogger.error('one', 2, null);
-    expect(console.error).toHaveBeenCalledWith('one', 2, null);
+    debugLogger.error("one", 2, null);
+    expect(console.error).toHaveBeenCalledWith("one", 2, null);
 
-    debugLogger.debug('one', 2, undefined);
-    expect(console.debug).toHaveBeenCalledWith('one', 2, undefined);
+    debugLogger.debug("one", 2, undefined);
+    expect(console.debug).toHaveBeenCalledWith("one", 2, undefined);
   });
 
-  it('should handle calls with no arguments', () => {
+  it("should handle calls with no arguments", () => {
     debugLogger.log();
     expect(console.log).toHaveBeenCalledWith();
     expect(console.log).toHaveBeenCalledTimes(1);
diff --git a/packages/gemini-core/src/utils/delay.test.ts b/packages/gemini-core/src/utils/delay.test.ts
index 2f9a4d070..b1ce18699 100644
--- a/packages/gemini-core/src/utils/delay.test.ts
+++ b/packages/gemini-core/src/utils/delay.test.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest';
-import { delay } from './delay.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { delay } from "./delay.js";
 
-describe('abortableDelay', () => {
+describe("abortableDelay", () => {
   beforeEach(() => {
     vi.useFakeTimers();
   });
@@ -17,13 +17,13 @@ describe('abortableDelay', () => {
     vi.restoreAllMocks();
   });
 
-  it('resolves after the specified duration without a signal', async () => {
+  it("resolves after the specified duration without a signal", async () => {
     const promise = delay(100);
     await vi.advanceTimersByTimeAsync(100);
     await expect(promise).resolves.toBeUndefined();
   });
 
-  it('resolves when a non-aborted signal is provided', async () => {
+  it("resolves when a non-aborted signal is provided", async () => {
     const controller = new AbortController();
     const promise = delay(200, controller.signal);
 
@@ -32,17 +32,17 @@ describe('abortableDelay', () => {
     await expect(promise).resolves.toBeUndefined();
   });
 
-  it('rejects immediately if the signal is already aborted', async () => {
+  it("rejects immediately if the signal is already aborted", async () => {
     const controller = new AbortController();
     controller.abort();
 
     await expect(delay(50, controller.signal)).rejects.toMatchObject({
-      name: 'AbortError',
-      message: 'Aborted',
+      name: "AbortError",
+      message: "Aborted",
     });
   });
 
-  it('rejects if the signal aborts while waiting', async () => {
+  it("rejects if the signal aborts while waiting", async () => {
     const controller = new AbortController();
     const promise = delay(500, controller.signal);
 
@@ -50,20 +50,18 @@ describe('abortableDelay', () => {
     controller.abort();
 
     await expect(promise).rejects.toMatchObject({
-      name: 'AbortError',
-      message: 'Aborted',
+      name: "AbortError",
+      message: "Aborted",
     });
   });
 
-  it('cleans up signal listeners after resolving', async () => {
+  it("cleans up signal listeners after resolving", async () => {
     const removeEventListener = vi.fn();
     const mockSignal = {
       aborted: false,
-      addEventListener: vi
-        .fn()
-        .mockImplementation((_type: string, listener: () => void) => {
-          mockSignal.__listener = listener;
-        }),
+      addEventListener: vi.fn().mockImplementation((_type: string, listener: () => void) => {
+        mockSignal.__listener = listener;
+      }),
       removeEventListener,
       __listener: undefined as (() => void) | undefined,
     } as unknown as AbortSignal & { __listener?: () => void };
@@ -78,12 +76,9 @@ describe('abortableDelay', () => {
   });
 
   // Technically unnecessary due to `onceTrue` but good sanity check
-  it('cleans up signal listeners when aborted before completion', async () => {
+  it("cleans up signal listeners when aborted before completion", async () => {
     const controller = new AbortController();
-    const removeEventListenerSpy = vi.spyOn(
-      controller.signal,
-      'removeEventListener',
-    );
+    const removeEventListenerSpy = vi.spyOn(controller.signal, "removeEventListener");
 
     const promise = delay(400, controller.signal);
 
@@ -91,13 +86,13 @@ describe('abortableDelay', () => {
     controller.abort();
 
     await expect(promise).rejects.toMatchObject({
-      name: 'AbortError',
+      name: "AbortError",
     });
     expect(removeEventListenerSpy).toHaveBeenCalledTimes(1);
   });
 
-  it('cleans up timeout when aborted before completion', async () => {
-    const clearTimeoutSpy = vi.spyOn(global, 'clearTimeout');
+  it("cleans up timeout when aborted before completion", async () => {
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
     const controller = new AbortController();
     const promise = delay(400, controller.signal);
 
@@ -105,7 +100,7 @@ describe('abortableDelay', () => {
     controller.abort();
 
     await expect(promise).rejects.toMatchObject({
-      name: 'AbortError',
+      name: "AbortError",
     });
     expect(clearTimeoutSpy).toHaveBeenCalled();
   });
diff --git a/packages/gemini-core/src/utils/delay.ts b/packages/gemini-core/src/utils/delay.ts
index d48db4951..c8e0e0bda 100644
--- a/packages/gemini-core/src/utils/delay.ts
+++ b/packages/gemini-core/src/utils/delay.ts
@@ -8,8 +8,8 @@
  * Factory to create a standard abort error for delay helpers.
  */
 export function createAbortError(): Error {
-  const abortError = new Error('Aborted');
-  abortError.name = 'AbortError';
+  const abortError = new Error("Aborted");
+  abortError.name = "AbortError";
   return abortError;
 }
 
@@ -34,15 +34,15 @@ export function delay(ms: number, signal?: AbortSignal): Promise<void> {
   return new Promise((resolve, reject) => {
     const onAbort = () => {
       clearTimeout(timeoutId);
-      signal.removeEventListener('abort', onAbort);
+      signal.removeEventListener("abort", onAbort);
       reject(createAbortError());
     };
 
     const timeoutId = setTimeout(() => {
-      signal.removeEventListener('abort', onAbort);
+      signal.removeEventListener("abort", onAbort);
       resolve();
     }, ms);
 
-    signal.addEventListener('abort', onAbort, { once: true });
+    signal.addEventListener("abort", onAbort, { once: true });
   });
 }
diff --git a/packages/gemini-core/src/utils/editCorrector.test.ts b/packages/gemini-core/src/utils/editCorrector.test.ts
index dbe1fea7f..eb66860fa 100644
--- a/packages/gemini-core/src/utils/editCorrector.test.ts
+++ b/packages/gemini-core/src/utils/editCorrector.test.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, type Mocked } from 'vitest';
-import * as fs from 'node:fs';
-import { EDIT_TOOL_NAME } from '../tools/tool-names.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import { EDIT_TOOL_NAME } from "../tools/tool-names.js";
 
 // MOCKS
 let callCount = 0;
@@ -19,140 +19,121 @@ let mockGenerateJson: any;
 let mockStartChat: any;
 let mockSendMessageStream: any;
 
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   statSync: vi.fn(),
   mkdirSync: vi.fn(),
 }));
 
-vi.mock('../core/client.js', () => ({
-  GeminiClient: vi.fn().mockImplementation(function (
-    this: any,
-    _config: Config,
-  ) {
+vi.mock("../core/client.js", () => ({
+  GeminiClient: vi.fn().mockImplementation(function (this: any, _config: Config) {
     this.startChat = (...params: any[]) => mockStartChat(...params);
-    this.sendMessageStream = (...params: any[]) =>
-      mockSendMessageStream(...params);
+    this.sendMessageStream = (...params: any[]) => mockSendMessageStream(...params);
     return this;
   }),
 }));
+
 // END MOCKS
 
+import type { Config } from "../config/config.js";
+import { GeminiClient } from "../core/client.js";
+import { ToolRegistry } from "../tools/tool-registry.js";
 import {
   countOccurrences,
   ensureCorrectEdit,
   ensureCorrectFileContent,
-  unescapeStringForGeminiBug,
   resetEditCorrectorCaches_TEST_ONLY,
-} from './editCorrector.js';
-import { GeminiClient } from '../core/client.js';
-import type { Config } from '../config/config.js';
-import { ToolRegistry } from '../tools/tool-registry.js';
+  unescapeStringForGeminiBug,
+} from "./editCorrector.js";
 
-vi.mock('../tools/tool-registry.js');
+vi.mock("../tools/tool-registry.js");
 
-describe('editCorrector', () => {
-  describe('countOccurrences', () => {
-    it('should return 0 for empty string', () => {
-      expect(countOccurrences('', 'a')).toBe(0);
+describe("editCorrector", () => {
+  describe("countOccurrences", () => {
+    it("should return 0 for empty string", () => {
+      expect(countOccurrences("", "a")).toBe(0);
     });
-    it('should return 0 for empty substring', () => {
-      expect(countOccurrences('abc', '')).toBe(0);
+    it("should return 0 for empty substring", () => {
+      expect(countOccurrences("abc", "")).toBe(0);
     });
-    it('should return 0 if substring is not found', () => {
-      expect(countOccurrences('abc', 'd')).toBe(0);
+    it("should return 0 if substring is not found", () => {
+      expect(countOccurrences("abc", "d")).toBe(0);
     });
-    it('should return 1 if substring is found once', () => {
-      expect(countOccurrences('abc', 'b')).toBe(1);
+    it("should return 1 if substring is found once", () => {
+      expect(countOccurrences("abc", "b")).toBe(1);
     });
-    it('should return correct count for multiple occurrences', () => {
-      expect(countOccurrences('ababa', 'a')).toBe(3);
-      expect(countOccurrences('ababab', 'ab')).toBe(3);
+    it("should return correct count for multiple occurrences", () => {
+      expect(countOccurrences("ababa", "a")).toBe(3);
+      expect(countOccurrences("ababab", "ab")).toBe(3);
     });
-    it('should count non-overlapping occurrences', () => {
-      expect(countOccurrences('aaaaa', 'aa')).toBe(2);
-      expect(countOccurrences('ababab', 'aba')).toBe(1);
+    it("should count non-overlapping occurrences", () => {
+      expect(countOccurrences("aaaaa", "aa")).toBe(2);
+      expect(countOccurrences("ababab", "aba")).toBe(1);
     });
-    it('should correctly count occurrences when substring is longer', () => {
-      expect(countOccurrences('abc', 'abcdef')).toBe(0);
+    it("should correctly count occurrences when substring is longer", () => {
+      expect(countOccurrences("abc", "abcdef")).toBe(0);
     });
-    it('should be case-sensitive', () => {
-      expect(countOccurrences('abcABC', 'a')).toBe(1);
-      expect(countOccurrences('abcABC', 'A')).toBe(1);
+    it("should be case-sensitive", () => {
+      expect(countOccurrences("abcABC", "a")).toBe(1);
+      expect(countOccurrences("abcABC", "A")).toBe(1);
     });
   });
 
-  describe('unescapeStringForGeminiBug', () => {
-    it('should unescape common sequences', () => {
-      expect(unescapeStringForGeminiBug('\\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('\\t')).toBe('\t');
+  describe("unescapeStringForGeminiBug", () => {
+    it("should unescape common sequences", () => {
+      expect(unescapeStringForGeminiBug("\\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("\\t")).toBe("\t");
       expect(unescapeStringForGeminiBug("\\'")).toBe("'");
       expect(unescapeStringForGeminiBug('\\"')).toBe('"');
-      expect(unescapeStringForGeminiBug('\\`')).toBe('`');
+      expect(unescapeStringForGeminiBug("\\`")).toBe("`");
     });
-    it('should handle multiple escaped sequences', () => {
-      expect(unescapeStringForGeminiBug('Hello\\nWorld\\tTest')).toBe(
-        'Hello\nWorld\tTest',
-      );
+    it("should handle multiple escaped sequences", () => {
+      expect(unescapeStringForGeminiBug("Hello\\nWorld\\tTest")).toBe("Hello\nWorld\tTest");
     });
-    it('should not alter already correct sequences', () => {
-      expect(unescapeStringForGeminiBug('\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('Correct string')).toBe(
-        'Correct string',
-      );
+    it("should not alter already correct sequences", () => {
+      expect(unescapeStringForGeminiBug("\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("Correct string")).toBe("Correct string");
     });
-    it('should handle mixed correct and incorrect sequences', () => {
-      expect(unescapeStringForGeminiBug('\\nCorrect\t\\`')).toBe(
-        '\nCorrect\t`',
-      );
+    it("should handle mixed correct and incorrect sequences", () => {
+      expect(unescapeStringForGeminiBug("\\nCorrect\t\\`")).toBe("\nCorrect\t`");
     });
-    it('should handle backslash followed by actual newline character', () => {
-      expect(unescapeStringForGeminiBug('\\\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('First line\\\nSecond line')).toBe(
-        'First line\nSecond line',
+    it("should handle backslash followed by actual newline character", () => {
+      expect(unescapeStringForGeminiBug("\\\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("First line\\\nSecond line")).toBe(
+        "First line\nSecond line",
       );
     });
-    it('should handle multiple backslashes before an escapable character (aggressive unescaping)', () => {
-      expect(unescapeStringForGeminiBug('\\\\n')).toBe('\n');
-      expect(unescapeStringForGeminiBug('\\\\\\t')).toBe('\t');
-      expect(unescapeStringForGeminiBug('\\\\\\\\`')).toBe('`');
-    });
-    it('should return empty string for empty input', () => {
-      expect(unescapeStringForGeminiBug('')).toBe('');
+    it("should handle multiple backslashes before an escapable character (aggressive unescaping)", () => {
+      expect(unescapeStringForGeminiBug("\\\\n")).toBe("\n");
+      expect(unescapeStringForGeminiBug("\\\\\\t")).toBe("\t");
+      expect(unescapeStringForGeminiBug("\\\\\\\\`")).toBe("`");
     });
-    it('should not alter strings with no targeted escape sequences', () => {
-      expect(unescapeStringForGeminiBug('abc def')).toBe('abc def');
-      expect(unescapeStringForGeminiBug('C:\\Folder\\File')).toBe(
-        'C:\\Folder\\File',
-      );
+    it("should return empty string for empty input", () => {
+      expect(unescapeStringForGeminiBug("")).toBe("");
     });
-    it('should correctly process strings with some targeted escapes', () => {
-      expect(unescapeStringForGeminiBug('C:\\Users\\name')).toBe(
-        'C:\\Users\name',
-      );
+    it("should not alter strings with no targeted escape sequences", () => {
+      expect(unescapeStringForGeminiBug("abc def")).toBe("abc def");
+      expect(unescapeStringForGeminiBug("C:\\Folder\\File")).toBe("C:\\Folder\\File");
     });
-    it('should handle complex cases with mixed slashes and characters', () => {
-      expect(
-        unescapeStringForGeminiBug('\\\\\\\nLine1\\\nLine2\\tTab\\\\`Tick\\"'),
-      ).toBe('\nLine1\nLine2\tTab`Tick"');
+    it("should correctly process strings with some targeted escapes", () => {
+      expect(unescapeStringForGeminiBug("C:\\Users\\name")).toBe("C:\\Users\name");
     });
-    it('should handle escaped backslashes', () => {
-      expect(unescapeStringForGeminiBug('\\\\')).toBe('\\');
-      expect(unescapeStringForGeminiBug('C:\\\\Users')).toBe('C:\\Users');
-      expect(unescapeStringForGeminiBug('path\\\\to\\\\file')).toBe(
-        'path\to\\file',
+    it("should handle complex cases with mixed slashes and characters", () => {
+      expect(unescapeStringForGeminiBug('\\\\\\\nLine1\\\nLine2\\tTab\\\\`Tick\\"')).toBe(
+        '\nLine1\nLine2\tTab`Tick"',
       );
     });
-    it('should handle escaped backslashes mixed with other escapes (aggressive unescaping)', () => {
-      expect(unescapeStringForGeminiBug('line1\\\\\\nline2')).toBe(
-        'line1\nline2',
-      );
-      expect(unescapeStringForGeminiBug('quote\\\\"text\\\\nline')).toBe(
-        'quote"text\nline',
-      );
+    it("should handle escaped backslashes", () => {
+      expect(unescapeStringForGeminiBug("\\\\")).toBe("\\");
+      expect(unescapeStringForGeminiBug("C:\\\\Users")).toBe("C:\\Users");
+      expect(unescapeStringForGeminiBug("path\\\\to\\\\file")).toBe("path\to\\file");
+    });
+    it("should handle escaped backslashes mixed with other escapes (aggressive unescaping)", () => {
+      expect(unescapeStringForGeminiBug("line1\\\\\\nline2")).toBe("line1\nline2");
+      expect(unescapeStringForGeminiBug('quote\\\\"text\\\\nline')).toBe('quote"text\nline');
     });
   });
 
-  describe('ensureCorrectEdit', () => {
+  describe("ensureCorrectEdit", () => {
     let mockGeminiClientInstance: Mocked<GeminiClient>;
     let mockBaseLlmClientInstance: Mocked<BaseLlmClient>;
     let mockToolRegistry: Mocked<ToolRegistry>;
@@ -162,10 +143,10 @@ describe('editCorrector', () => {
     beforeEach(() => {
       mockToolRegistry = new ToolRegistry({} as Config) as Mocked<ToolRegistry>;
       const configParams = {
-        apiKey: 'test-api-key',
-        model: 'test-model',
+        apiKey: "test-api-key",
+        model: "test-model",
         sandbox: false as boolean | string,
-        targetDir: '/test',
+        targetDir: "/test",
         debugMode: false,
         question: undefined as string | undefined,
 
@@ -174,8 +155,8 @@ describe('editCorrector', () => {
         toolCallCommand: undefined as string | undefined,
         mcpServerCommand: undefined as string | undefined,
         mcpServers: undefined as Record<string, any> | undefined,
-        userAgent: 'test-agent',
-        userMemory: '',
+        userAgent: "test-agent",
+        userMemory: "",
         geminiMdFileCount: 0,
         alwaysSkipModificationConfirmation: false,
       };
@@ -215,31 +196,27 @@ describe('editCorrector', () => {
 
       callCount = 0;
       mockResponses.length = 0;
-      mockGenerateJson = vi
-        .fn()
-        .mockImplementation((_contents, _schema, signal) => {
-          // Check if the signal is aborted. If so, throw an error or return a specific response.
-          if (signal && signal.aborted) {
-            return Promise.reject(new Error('Aborted')); // Or some other specific error/response
-          }
-          const response = mockResponses[callCount];
-          callCount++;
-          if (response === undefined) return Promise.resolve({});
-          return Promise.resolve(response);
-        });
+      mockGenerateJson = vi.fn().mockImplementation((_contents, _schema, signal) => {
+        // Check if the signal is aborted. If so, throw an error or return a specific response.
+        if (signal && signal.aborted) {
+          return Promise.reject(new Error("Aborted")); // Or some other specific error/response
+        }
+        const response = mockResponses[callCount];
+        callCount++;
+        if (response === undefined) return Promise.resolve({});
+        return Promise.resolve(response);
+      });
       mockStartChat = vi.fn();
       mockSendMessageStream = vi.fn();
 
-      mockGeminiClientInstance = new GeminiClient(
-        mockConfigInstance,
-      ) as Mocked<GeminiClient>;
+      mockGeminiClientInstance = new GeminiClient(mockConfigInstance) as Mocked<GeminiClient>;
       mockGeminiClientInstance.getHistory = vi.fn().mockResolvedValue([]);
       mockBaseLlmClientInstance = {
         generateJson: mockGenerateJson,
         config: {
           generationConfigService: {
             getResolvedConfig: vi.fn().mockReturnValue({
-              model: 'edit-corrector',
+              model: "edit-corrector",
               generateContentConfig: {},
             }),
           },
@@ -248,19 +225,19 @@ describe('editCorrector', () => {
       resetEditCorrectorCaches_TEST_ONLY();
     });
 
-    describe('Scenario Group 1: originalParams.old_string matches currentContent directly', () => {
-      it('Test 1.1: old_string (no literal \\), new_string (escaped by Gemini) -> new_string unescaped', async () => {
-        const currentContent = 'This is a test string to find me.';
+    describe("Scenario Group 1: originalParams.old_string matches currentContent directly", () => {
+      it("Test 1.1: old_string (no literal \\), new_string (escaped by Gemini) -> new_string unescaped", async () => {
+        const currentContent = "This is a test string to find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
+          file_path: "/test/file.txt",
+          old_string: "find me",
           new_string: 'replace with \\"this\\"',
         };
         mockResponses.push({
           corrected_new_string_escaping: 'replace with "this"',
         });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -269,18 +246,18 @@ describe('editCorrector', () => {
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(1);
         expect(result.params.new_string).toBe('replace with "this"');
-        expect(result.params.old_string).toBe('find me');
+        expect(result.params.old_string).toBe("find me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 1.2: old_string (no literal \\), new_string (correctly formatted) -> new_string unchanged', async () => {
-        const currentContent = 'This is a test string to find me.';
+      it("Test 1.2: old_string (no literal \\), new_string (correctly formatted) -> new_string unchanged", async () => {
+        const currentContent = "This is a test string to find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
-          new_string: 'replace with this',
+          file_path: "/test/file.txt",
+          old_string: "find me",
+          new_string: "replace with this",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -288,22 +265,22 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with this');
-        expect(result.params.old_string).toBe('find me');
+        expect(result.params.new_string).toBe("replace with this");
+        expect(result.params.old_string).toBe("find me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 1.3: old_string (with literal \\), new_string (escaped by Gemini) -> new_string unchanged (still escaped)', async () => {
-        const currentContent = 'This is a test string to find\\me.';
+      it("Test 1.3: old_string (with literal \\), new_string (escaped by Gemini) -> new_string unchanged (still escaped)", async () => {
+        const currentContent = "This is a test string to find\\me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find\\me',
+          file_path: "/test/file.txt",
+          old_string: "find\\me",
           new_string: 'replace with \\"this\\"',
         };
         mockResponses.push({
           corrected_new_string_escaping: 'replace with "this"',
         });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -312,18 +289,18 @@ describe('editCorrector', () => {
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(1);
         expect(result.params.new_string).toBe('replace with "this"');
-        expect(result.params.old_string).toBe('find\\me');
+        expect(result.params.old_string).toBe("find\\me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 1.4: old_string (with literal \\), new_string (correctly formatted) -> new_string unchanged', async () => {
-        const currentContent = 'This is a test string to find\\me.';
+      it("Test 1.4: old_string (with literal \\), new_string (correctly formatted) -> new_string unchanged", async () => {
+        const currentContent = "This is a test string to find\\me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find\\me',
-          new_string: 'replace with this',
+          file_path: "/test/file.txt",
+          old_string: "find\\me",
+          new_string: "replace with this",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -331,23 +308,23 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with this');
-        expect(result.params.old_string).toBe('find\\me');
+        expect(result.params.new_string).toBe("replace with this");
+        expect(result.params.old_string).toBe("find\\me");
         expect(result.occurrences).toBe(1);
       });
     });
 
-    describe('Scenario Group 2: originalParams.old_string does NOT match, but unescapeStringForGeminiBug(originalParams.old_string) DOES match', () => {
-      it('Test 2.1: old_string (over-escaped, no intended literal \\), new_string (escaped by Gemini) -> new_string unescaped', async () => {
+    describe("Scenario Group 2: originalParams.old_string does NOT match, but unescapeStringForGeminiBug(originalParams.old_string) DOES match", () => {
+      it("Test 2.1: old_string (over-escaped, no intended literal \\), new_string (escaped by Gemini) -> new_string unescaped", async () => {
         const currentContent = 'This is a test string to find "me".';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'find \\"me\\"',
           new_string: 'replace with \\"this\\"',
         };
         mockResponses.push({ corrected_new_string: 'replace with "this"' });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -359,15 +336,15 @@ describe('editCorrector', () => {
         expect(result.params.old_string).toBe('find "me"');
         expect(result.occurrences).toBe(1);
       });
-      it('Test 2.2: old_string (over-escaped, no intended literal \\), new_string (correctly formatted) -> new_string unescaped (harmlessly)', async () => {
+      it("Test 2.2: old_string (over-escaped, no intended literal \\), new_string (correctly formatted) -> new_string unescaped (harmlessly)", async () => {
         const currentContent = 'This is a test string to find "me".';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'find \\"me\\"',
-          new_string: 'replace with this',
+          new_string: "replace with this",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -375,19 +352,19 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with this');
+        expect(result.params.new_string).toBe("replace with this");
         expect(result.params.old_string).toBe('find "me"');
         expect(result.occurrences).toBe(1);
       });
-      it('Test 2.3: old_string (over-escaped, with intended literal \\), new_string (simple) -> new_string corrected', async () => {
-        const currentContent = 'This is a test string to find \\me.';
+      it("Test 2.3: old_string (over-escaped, with intended literal \\), new_string (simple) -> new_string corrected", async () => {
+        const currentContent = "This is a test string to find \\me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find \\\\me',
-          new_string: 'replace with foobar',
+          file_path: "/test/file.txt",
+          old_string: "find \\\\me",
+          new_string: "replace with foobar",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -395,24 +372,24 @@ describe('editCorrector', () => {
           abortSignal,
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(0);
-        expect(result.params.new_string).toBe('replace with foobar');
-        expect(result.params.old_string).toBe('find \\me');
+        expect(result.params.new_string).toBe("replace with foobar");
+        expect(result.params.old_string).toBe("find \\me");
         expect(result.occurrences).toBe(1);
       });
     });
 
-    describe('Scenario Group 3: LLM Correction Path', () => {
-      it('Test 3.1: old_string (no literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is double unescaped', async () => {
-        const currentContent = 'This is a test string to corrected find me.';
+    describe("Scenario Group 3: LLM Correction Path", () => {
+      it("Test 3.1: old_string (no literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is double unescaped", async () => {
+        const currentContent = "This is a test string to corrected find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
+          file_path: "/test/file.txt",
+          old_string: "find me",
           new_string: 'replace with \\\\"this\\\\"',
         };
         const llmNewString = 'LLM says replace with "that"';
         mockResponses.push({ corrected_new_string_escaping: llmNewString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -421,22 +398,22 @@ describe('editCorrector', () => {
         );
         expect(mockGenerateJson).toHaveBeenCalledTimes(1);
         expect(result.params.new_string).toBe(llmNewString);
-        expect(result.params.old_string).toBe('find me');
+        expect(result.params.old_string).toBe("find me");
         expect(result.occurrences).toBe(1);
       });
-      it('Test 3.2: old_string (with literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is unescaped once', async () => {
-        const currentContent = 'This is a test string to corrected find me.';
+      it("Test 3.2: old_string (with literal \\), new_string (escaped by Gemini), LLM re-escapes new_string -> final new_string is unescaped once", async () => {
+        const currentContent = "This is a test string to corrected find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find\\me',
+          file_path: "/test/file.txt",
+          old_string: "find\\me",
           new_string: 'replace with \\\\"this\\\\"',
         };
-        const llmCorrectedOldString = 'corrected find me';
+        const llmCorrectedOldString = "corrected find me";
         const llmNewString = 'LLM says replace with "that"';
         mockResponses.push({ corrected_target_snippet: llmCorrectedOldString });
         mockResponses.push({ corrected_new_string: llmNewString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -448,17 +425,17 @@ describe('editCorrector', () => {
         expect(result.params.old_string).toBe(llmCorrectedOldString);
         expect(result.occurrences).toBe(1);
       });
-      it('Test 3.3: old_string needs LLM, new_string is fine -> old_string corrected, new_string original', async () => {
-        const currentContent = 'This is a test string to be corrected.';
+      it("Test 3.3: old_string needs LLM, new_string is fine -> old_string corrected, new_string original", async () => {
+        const currentContent = "This is a test string to be corrected.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'fiiind me',
+          file_path: "/test/file.txt",
+          old_string: "fiiind me",
           new_string: 'replace with "this"',
         };
-        const llmCorrectedOldString = 'to be corrected';
+        const llmCorrectedOldString = "to be corrected";
         mockResponses.push({ corrected_target_snippet: llmCorrectedOldString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -470,11 +447,11 @@ describe('editCorrector', () => {
         expect(result.params.old_string).toBe(llmCorrectedOldString);
         expect(result.occurrences).toBe(1);
       });
-      it('Test 3.4: LLM correction path, correctNewString returns the originalNewString it was passed (which was unescaped) -> final new_string is unescaped', async () => {
-        const currentContent = 'This is a test string to corrected find me.';
+      it("Test 3.4: LLM correction path, correctNewString returns the originalNewString it was passed (which was unescaped) -> final new_string is unescaped", async () => {
+        const currentContent = "This is a test string to corrected find me.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'find me',
+          file_path: "/test/file.txt",
+          old_string: "find me",
           new_string: 'replace with \\\\"this\\\\"',
         };
         const newStringForLLMAndReturnedByLLM = 'replace with "this"';
@@ -482,7 +459,7 @@ describe('editCorrector', () => {
           corrected_new_string_escaping: newStringForLLMAndReturnedByLLM,
         });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -495,17 +472,17 @@ describe('editCorrector', () => {
       });
     });
 
-    describe('Scenario Group 4: No Match Found / Multiple Matches', () => {
-      it('Test 4.1: No version of old_string (original, unescaped, LLM-corrected) matches -> returns original params, 0 occurrences', async () => {
-        const currentContent = 'This content has nothing to find.';
+    describe("Scenario Group 4: No Match Found / Multiple Matches", () => {
+      it("Test 4.1: No version of old_string (original, unescaped, LLM-corrected) matches -> returns original params, 0 occurrences", async () => {
+        const currentContent = "This content has nothing to find.";
         const originalParams = {
-          file_path: '/test/file.txt',
-          old_string: 'nonexistent string',
-          new_string: 'some new string',
+          file_path: "/test/file.txt",
+          old_string: "nonexistent string",
+          new_string: "some new string",
         };
-        mockResponses.push({ corrected_target_snippet: 'still nonexistent' });
+        mockResponses.push({ corrected_target_snippet: "still nonexistent" });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -516,16 +493,15 @@ describe('editCorrector', () => {
         expect(result.params).toEqual(originalParams);
         expect(result.occurrences).toBe(0);
       });
-      it('Test 4.2: unescapedOldStringAttempt results in >1 occurrences -> returns original params, count occurrences', async () => {
-        const currentContent =
-          'This content has find "me" and also find "me" again.';
+      it("Test 4.2: unescapedOldStringAttempt results in >1 occurrences -> returns original params, count occurrences", async () => {
+        const currentContent = 'This content has find "me" and also find "me" again.';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'find "me"',
-          new_string: 'some new string',
+          new_string: "some new string",
         };
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -538,11 +514,11 @@ describe('editCorrector', () => {
       });
     });
 
-    describe('Scenario Group 5: Specific unescapeStringForGeminiBug checks (integrated into ensureCorrectEdit)', () => {
-      it('Test 5.1: old_string needs LLM to become currentContent, new_string also needs correction', async () => {
+    describe("Scenario Group 5: Specific unescapeStringForGeminiBug checks (integrated into ensureCorrectEdit)", () => {
+      it("Test 5.1: old_string needs LLM to become currentContent, new_string also needs correction", async () => {
         const currentContent = 'const x = "a\nbc\\"def\\"';
         const originalParams = {
-          file_path: '/test/file.txt',
+          file_path: "/test/file.txt",
           old_string: 'const x = \\"a\\nbc\\\\"def\\\\"',
           new_string: 'const y = \\"new\\nval\\\\"content\\\\"',
         };
@@ -550,7 +526,7 @@ describe('editCorrector', () => {
         mockResponses.push({ corrected_target_snippet: currentContent });
         mockResponses.push({ corrected_new_string: expectedFinalNewString });
         const result = await ensureCorrectEdit(
-          '/test/file.txt',
+          "/test/file.txt",
           currentContent,
           originalParams,
           mockGeminiClientInstance,
@@ -564,29 +540,28 @@ describe('editCorrector', () => {
       });
     });
 
-    describe('Scenario Group 6: Concurrent Edits', () => {
-      it('Test 6.1: should return early if file was modified by another process', async () => {
-        const filePath = '/test/file.txt';
-        const currentContent =
-          'This content has been modified by someone else.';
+    describe("Scenario Group 6: Concurrent Edits", () => {
+      it("Test 6.1: should return early if file was modified by another process", async () => {
+        const filePath = "/test/file.txt";
+        const currentContent = "This content has been modified by someone else.";
         const originalParams = {
           file_path: filePath,
-          old_string: 'nonexistent string',
-          new_string: 'some new string',
+          old_string: "nonexistent string",
+          new_string: "some new string",
         };
 
         const now = Date.now();
         const lastEditTime = now - 5000; // 5 seconds ago
 
         // Mock the file's modification time to be recent
-        vi.spyOn(fs, 'statSync').mockReturnValue({
+        vi.spyOn(fs, "statSync").mockReturnValue({
           mtimeMs: now,
         } as fs.Stats);
 
         // Mock the last edit timestamp from our history to be in the past
         const history = [
           {
-            role: 'model',
+            role: "model",
             parts: [
               {
                 functionResponse: {
@@ -602,9 +577,7 @@ describe('editCorrector', () => {
             ],
           },
         ];
-        (mockGeminiClientInstance.getHistory as Mock).mockResolvedValue(
-          history,
-        );
+        (mockGeminiClientInstance.getHistory as Mock).mockResolvedValue(history);
 
         const result = await ensureCorrectEdit(
           filePath,
@@ -621,31 +594,29 @@ describe('editCorrector', () => {
     });
   });
 
-  describe('ensureCorrectFileContent', () => {
+  describe("ensureCorrectFileContent", () => {
     let mockBaseLlmClientInstance: Mocked<BaseLlmClient>;
     const abortSignal = new AbortController().signal;
 
     beforeEach(() => {
       callCount = 0;
       mockResponses.length = 0;
-      mockGenerateJson = vi
-        .fn()
-        .mockImplementation((_contents, _schema, signal) => {
-          if (signal && signal.aborted) {
-            return Promise.reject(new Error('Aborted'));
-          }
-          const response = mockResponses[callCount];
-          callCount++;
-          if (response === undefined) return Promise.resolve({});
-          return Promise.resolve(response);
-        });
+      mockGenerateJson = vi.fn().mockImplementation((_contents, _schema, signal) => {
+        if (signal && signal.aborted) {
+          return Promise.reject(new Error("Aborted"));
+        }
+        const response = mockResponses[callCount];
+        callCount++;
+        if (response === undefined) return Promise.resolve({});
+        return Promise.resolve(response);
+      });
 
       mockBaseLlmClientInstance = {
         generateJson: mockGenerateJson,
         config: {
           generationConfigService: {
             getResolvedConfig: vi.fn().mockReturnValue({
-              model: 'edit-corrector',
+              model: "edit-corrector",
               generateContentConfig: {},
             }),
           },
@@ -654,8 +625,8 @@ describe('editCorrector', () => {
       resetEditCorrectorCaches_TEST_ONLY();
     });
 
-    it('should return content unchanged if no escaping issues detected', async () => {
-      const content = 'This is normal content without escaping issues';
+    it("should return content unchanged if no escaping issues detected", async () => {
+      const content = "This is normal content without escaping issues";
       const result = await ensureCorrectFileContent(
         content,
         mockBaseLlmClientInstance,
@@ -665,7 +636,7 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(0);
     });
 
-    it('should call correctStringEscaping for potentially escaped content', async () => {
+    it("should call correctStringEscaping for potentially escaped content", async () => {
       const content = 'console.log(\\"Hello World\\");';
       const correctedContent = 'console.log("Hello World");';
       mockResponses.push({
@@ -682,7 +653,7 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle correctStringEscaping returning corrected content via correct property name', async () => {
+    it("should handle correctStringEscaping returning corrected content via correct property name", async () => {
       // This test specifically verifies the property name fix
       const content = 'const message = \\"Hello\\nWorld\\";';
       const correctedContent = 'const message = "Hello\nWorld";';
@@ -702,7 +673,7 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     });
 
-    it('should return original content if LLM correction fails', async () => {
+    it("should return original content if LLM correction fails", async () => {
       const content = 'console.log(\\"Hello World\\");';
       // Mock empty response to simulate LLM failure
       mockResponses.push({});
@@ -717,11 +688,9 @@ describe('editCorrector', () => {
       expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle various escape sequences that need correction', async () => {
-      const content =
-        'const obj = { name: \\"John\\", age: 30, bio: \\"Developer\\nEngineer\\" };';
-      const correctedContent =
-        'const obj = { name: "John", age: 30, bio: "Developer\nEngineer" };';
+    it("should handle various escape sequences that need correction", async () => {
+      const content = 'const obj = { name: \\"John\\", age: 30, bio: \\"Developer\\nEngineer\\" };';
+      const correctedContent = 'const obj = { name: "John", age: 30, bio: "Developer\nEngineer" };';
 
       mockResponses.push({
         corrected_string_escaping: correctedContent,
diff --git a/packages/gemini-core/src/utils/editCorrector.ts b/packages/gemini-core/src/utils/editCorrector.ts
index 46a374ec1..1047b79ae 100644
--- a/packages/gemini-core/src/utils/editCorrector.ts
+++ b/packages/gemini-core/src/utils/editCorrector.ts
@@ -4,24 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import type { GeminiClient } from '../core/client.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { EditToolParams } from '../tools/edit.js';
+import * as fs from "node:fs";
+import type { Content } from "@google/genai";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { GeminiClient } from "../core/client.js";
+import type { EditToolParams } from "../tools/edit.js";
 import {
   EDIT_TOOL_NAME,
   GREP_TOOL_NAME,
   READ_FILE_TOOL_NAME,
   READ_MANY_FILES_TOOL_NAME,
   WRITE_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { LruCache } from './LruCache.js';
-import {
-  isFunctionResponse,
-  isFunctionCall,
-} from '../utils/messageInspectors.js';
-import * as fs from 'node:fs';
-import { promptIdContext } from './promptIdContext.js';
+} from "../tools/tool-names.js";
+import { isFunctionCall, isFunctionResponse } from "../utils/messageInspectors.js";
+import { LruCache } from "./LruCache.js";
+import { promptIdContext } from "./promptIdContext.js";
 
 const CODE_CORRECTION_SYSTEM_PROMPT = `
 You are an expert code-editing assistant. Your task is to analyze a failed edit attempt and provide a corrected version of the text snippets.
@@ -38,9 +35,7 @@ function getPromptId(): string {
 const MAX_CACHE_SIZE = 50;
 
 // Cache for ensureCorrectEdit results
-const editCorrectionCache = new LruCache<string, CorrectedEditResult>(
-  MAX_CACHE_SIZE,
-);
+const editCorrectionCache = new LruCache<string, CorrectedEditResult>(MAX_CACHE_SIZE);
 
 // Cache for ensureCorrectFileContent results
 const fileContentCorrectionCache = new LruCache<string, string>(MAX_CACHE_SIZE);
@@ -69,7 +64,7 @@ export interface CorrectedEditResult {
  * @returns -1 if the timestamp could not be extracted, else the timestamp (as a number)
  */
 function getTimestampFromFunctionId(fcnId: string): number {
-  const idParts = fcnId.split('-');
+  const idParts = fcnId.split("-");
   if (idParts.length > 2) {
     const timestamp = parseInt(idParts[1], 10);
     if (!isNaN(timestamp)) {
@@ -86,10 +81,7 @@ function getTimestampFromFunctionId(fcnId: string): number {
  * @param client the geminiClient, so that we can get the history
  * @returns a DateTime (as a number) of when the last edit occurred, or -1 if no edit was found.
  */
-async function findLastEditTimestamp(
-  filePath: string,
-  client: GeminiClient,
-): Promise<number> {
+async function findLastEditTimestamp(filePath: string, client: GeminiClient): Promise<number> {
   const history = (await client.getHistory()) ?? [];
 
   // Tools that may reference the file path in their FunctionResponse `output`.
@@ -126,9 +118,9 @@ async function findLastEditTimestamp(
         toolsInResp.has(part.functionResponse.name)
       ) {
         const { response } = part.functionResponse;
-        if (response && !('error' in response) && 'output' in response) {
+        if (response && !("error" in response) && "output" in response) {
           id = part.functionResponse.id;
-          content = response['output'];
+          content = response["output"];
         }
       }
 
@@ -140,8 +132,8 @@ async function findLastEditTimestamp(
       // as the best guess to if error/failed occurred with the response.
       const stringified = JSON.stringify(content);
       if (
-        !stringified.includes('Error') && // only applicable for functionResponse
-        !stringified.includes('Failed') && // only applicable for functionResponse
+        !stringified.includes("Error") && // only applicable for functionResponse
+        !stringified.includes("Failed") && // only applicable for functionResponse
         stringified.includes(filePath)
       ) {
         return getTimestampFromFunctionId(id);
@@ -179,8 +171,7 @@ export async function ensureCorrectEdit(
 
   let finalNewString = originalParams.new_string;
   const newStringPotentiallyEscaped =
-    unescapeStringForGeminiBug(originalParams.new_string) !==
-    originalParams.new_string;
+    unescapeStringForGeminiBug(originalParams.new_string) !== originalParams.new_string;
 
   const expectedReplacements = originalParams.expected_replacements ?? 1;
 
@@ -228,9 +219,7 @@ export async function ensureCorrectEdit(
     return result;
   } else {
     // occurrences is 0 or some other unexpected state initially
-    const unescapedOldStringAttempt = unescapeStringForGeminiBug(
-      originalParams.old_string,
-    );
+    const unescapedOldStringAttempt = unescapeStringForGeminiBug(originalParams.old_string);
     occurrences = countOccurrences(currentContent, unescapedOldStringAttempt);
 
     if (occurrences === expectedReplacements) {
@@ -249,10 +238,7 @@ export async function ensureCorrectEdit(
         // In order to keep from clobbering edits made outside our system,
         // let's check if there was a more recent edit to the file than what
         // our system has done
-        const lastEditedByUsTime = await findLastEditTimestamp(
-          filePath,
-          geminiClient,
-        );
+        const lastEditedByUsTime = await findLastEditTimestamp(filePath, geminiClient);
 
         // Add a 1-second buffer to account for timing inaccuracies. If the file
         // was modified more than a second after the last edit tool was run, we
@@ -279,10 +265,7 @@ export async function ensureCorrectEdit(
         unescapedOldStringAttempt,
         abortSignal,
       );
-      const llmOldOccurrences = countOccurrences(
-        currentContent,
-        llmCorrectedOldString,
-      );
+      const llmOldOccurrences = countOccurrences(currentContent, llmCorrectedOldString);
 
       if (llmOldOccurrences === expectedReplacements) {
         finalOldString = llmCorrectedOldString;
@@ -352,33 +335,28 @@ export async function ensureCorrectFileContent(
     return cachedResult;
   }
 
-  const contentPotentiallyEscaped =
-    unescapeStringForGeminiBug(content) !== content;
+  const contentPotentiallyEscaped = unescapeStringForGeminiBug(content) !== content;
   if (!contentPotentiallyEscaped) {
     fileContentCorrectionCache.set(content, content);
     return content;
   }
 
-  const correctedContent = await correctStringEscaping(
-    content,
-    baseLlmClient,
-    abortSignal,
-  );
+  const correctedContent = await correctStringEscaping(content, baseLlmClient, abortSignal);
   fileContentCorrectionCache.set(content, correctedContent);
   return correctedContent;
 }
 
 // Define the expected JSON schema for the LLM response for old_string correction
 const OLD_STRING_CORRECTION_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_target_snippet: {
-      type: 'string',
+      type: "string",
       description:
-        'The corrected version of the target snippet that exactly and uniquely matches a segment within the provided file content.',
+        "The corrected version of the target snippet that exactly and uniquely matches a segment within the provided file content.",
     },
   },
-  required: ['corrected_target_snippet'],
+  required: ["corrected_target_snippet"],
 };
 
 export async function correctOldStringMismatch(
@@ -402,17 +380,17 @@ File Content:
 ${fileContent}
 \`\`\`
 
-For example, if the problematic target snippet was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and the file content had content that looked like "\nconst greeting = \`Hello ${'\\`'}\${name}${'\\`'}\`;", then corrected_target_snippet should likely be "\nconst greeting = \`Hello ${'\\`'}\${name}${'\\`'}\`;" to fix the incorrect escaping to match the original file content.
+For example, if the problematic target snippet was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and the file content had content that looked like "\nconst greeting = \`Hello ${"\\`"}\${name}${"\\`"}\`;", then corrected_target_snippet should likely be "\nconst greeting = \`Hello ${"\\`"}\${name}${"\\`"}\`;" to fix the incorrect escaping to match the original file content.
 If the differences are only in whitespace or formatting, apply similar whitespace/formatting changes to the corrected_target_snippet.
 
 Return ONLY the corrected target snippet in the specified JSON format with the key 'corrected_target_snippet'. If no clear, unique match can be found, return an empty string for 'corrected_target_snippet'.
 `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: OLD_STRING_CORRECTION_SCHEMA,
       abortSignal,
@@ -422,10 +400,10 @@ Return ONLY the corrected target snippet in the specified JSON format with the k
 
     if (
       result &&
-      typeof result['corrected_target_snippet'] === 'string' &&
-      result['corrected_target_snippet'].length > 0
+      typeof result["corrected_target_snippet"] === "string" &&
+      result["corrected_target_snippet"].length > 0
     ) {
-      return result['corrected_target_snippet'];
+      return result["corrected_target_snippet"];
     } else {
       return problematicSnippet;
     }
@@ -434,10 +412,7 @@ Return ONLY the corrected target snippet in the specified JSON format with the k
       throw error;
     }
 
-    console.error(
-      'Error during LLM call for old string snippet correction:',
-      error,
-    );
+    console.error("Error during LLM call for old string snippet correction:", error);
 
     return problematicSnippet;
   }
@@ -445,15 +420,15 @@ Return ONLY the corrected target snippet in the specified JSON format with the k
 
 // Define the expected JSON schema for the new_string correction LLM response
 const NEW_STRING_CORRECTION_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_new_string: {
-      type: 'string',
+      type: "string",
       description:
-        'The original_new_string adjusted to be a suitable replacement for the corrected_old_string, while maintaining the original intent of the change.',
+        "The original_new_string adjusted to be a suitable replacement for the corrected_old_string, while maintaining the original intent of the change.",
     },
   },
-  required: ['corrected_new_string'],
+  required: ["corrected_new_string"],
 };
 
 /**
@@ -491,17 +466,17 @@ ${originalNewString}
 
 Task: Based on the differences between original_old_string and corrected_old_string, and the content of original_new_string, generate a corrected_new_string. This corrected_new_string should be what original_new_string would have been if it was designed to replace corrected_old_string directly, while maintaining the spirit of the original transformation.
 
-For example, if original_old_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and corrected_old_string is "\nconst greeting = \`Hello ${'\\`'}\${name}${'\\`'}\`;", and original_new_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name} \${lastName}\\\\\`\`;", then corrected_new_string should likely be "\nconst greeting = \`Hello ${'\\`'}\${name} \${lastName}${'\\`'}\`;" to fix the incorrect escaping.
+For example, if original_old_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name}\\\\\`\`;" and corrected_old_string is "\nconst greeting = \`Hello ${"\\`"}\${name}${"\\`"}\`;", and original_new_string was "\\\\\\nconst greeting = \`Hello \\\\\`\${name} \${lastName}\\\\\`\`;", then corrected_new_string should likely be "\nconst greeting = \`Hello ${"\\`"}\${name} \${lastName}${"\\`"}\`;" to fix the incorrect escaping.
 If the differences are only in whitespace or formatting, apply similar whitespace/formatting changes to the corrected_new_string.
 
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string'. If no adjustment is deemed necessary or possible, return the original_new_string.
   `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: NEW_STRING_CORRECTION_SCHEMA,
       abortSignal,
@@ -511,10 +486,10 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
 
     if (
       result &&
-      typeof result['corrected_new_string'] === 'string' &&
-      result['corrected_new_string'].length > 0
+      typeof result["corrected_new_string"] === "string" &&
+      result["corrected_new_string"].length > 0
     ) {
-      return result['corrected_new_string'];
+      return result["corrected_new_string"];
     } else {
       return originalNewString;
     }
@@ -523,21 +498,21 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
       throw error;
     }
 
-    console.error('Error during LLM call for new_string correction:', error);
+    console.error("Error during LLM call for new_string correction:", error);
     return originalNewString;
   }
 }
 
 const CORRECT_NEW_STRING_ESCAPING_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_new_string_escaping: {
-      type: 'string',
+      type: "string",
       description:
-        'The new_string with corrected escaping, ensuring it is a proper replacement for the old_string, especially considering potential over-escaping issues from previous LLM generations.',
+        "The new_string with corrected escaping, ensuring it is a proper replacement for the old_string, especially considering potential over-escaping issues from previous LLM generations.",
     },
   },
-  required: ['corrected_new_string_escaping'],
+  required: ["corrected_new_string_escaping"],
 };
 
 export async function correctNewStringEscaping(
@@ -567,11 +542,11 @@ If potentially_problematic_new_string is console.log(\\"Hello World\\"), it shou
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_new_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_new_string.
   `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: CORRECT_NEW_STRING_ESCAPING_SCHEMA,
       abortSignal,
@@ -581,10 +556,10 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
 
     if (
       result &&
-      typeof result['corrected_new_string_escaping'] === 'string' &&
-      result['corrected_new_string_escaping'].length > 0
+      typeof result["corrected_new_string_escaping"] === "string" &&
+      result["corrected_new_string_escaping"].length > 0
     ) {
-      return result['corrected_new_string_escaping'];
+      return result["corrected_new_string_escaping"];
     } else {
       return potentiallyProblematicNewString;
     }
@@ -593,24 +568,21 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
       throw error;
     }
 
-    console.error(
-      'Error during LLM call for new_string escaping correction:',
-      error,
-    );
+    console.error("Error during LLM call for new_string escaping correction:", error);
     return potentiallyProblematicNewString;
   }
 }
 
 const CORRECT_STRING_ESCAPING_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     corrected_string_escaping: {
-      type: 'string',
+      type: "string",
       description:
-        'The string with corrected escaping, ensuring it is valid, specially considering potential over-escaping issues from previous LLM generations.',
+        "The string with corrected escaping, ensuring it is valid, specially considering potential over-escaping issues from previous LLM generations.",
     },
   },
-  required: ['corrected_string_escaping'],
+  required: ["corrected_string_escaping"],
 };
 
 export async function correctStringEscaping(
@@ -634,11 +606,11 @@ If potentially_problematic_string is console.log(\\"Hello World\\"), it should b
 Return ONLY the corrected string in the specified JSON format with the key 'corrected_string_escaping'. If no escaping correction is needed, return the original potentially_problematic_string.
   `.trim();
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
 
   try {
     const result = await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'edit-corrector' },
+      modelConfigKey: { model: "edit-corrector" },
       contents,
       schema: CORRECT_STRING_ESCAPING_SCHEMA,
       abortSignal,
@@ -648,10 +620,10 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
 
     if (
       result &&
-      typeof result['corrected_string_escaping'] === 'string' &&
-      result['corrected_string_escaping'].length > 0
+      typeof result["corrected_string_escaping"] === "string" &&
+      result["corrected_string_escaping"].length > 0
     ) {
-      return result['corrected_string_escaping'];
+      return result["corrected_string_escaping"];
     } else {
       return potentiallyProblematicString;
     }
@@ -660,10 +632,7 @@ Return ONLY the corrected string in the specified JSON format with the key 'corr
       throw error;
     }
 
-    console.error(
-      'Error during LLM call for string escaping correction:',
-      error,
-    );
+    console.error("Error during LLM call for string escaping correction:", error);
     return potentiallyProblematicString;
   }
 }
@@ -676,10 +645,7 @@ function trimPairIfPossible(
 ) {
   const trimmedTargetString = target.trim();
   if (target.length !== trimmedTargetString.length) {
-    const trimmedTargetOccurrences = countOccurrences(
-      currentContent,
-      trimmedTargetString,
-    );
+    const trimmedTargetOccurrences = countOccurrences(currentContent, trimmedTargetString);
 
     if (trimmedTargetOccurrences === expectedReplacements) {
       const trimmedReactiveString = trimIfTargetTrims.trim();
@@ -710,43 +676,40 @@ export function unescapeStringForGeminiBug(inputString: string): string {
   //        string might have something like "\\\n" (a literal backslash followed by a newline).
   // g : Global flag, to replace all occurrences.
 
-  return inputString.replace(
-    /\\+(n|t|r|'|"|`|\\|\n)/g,
-    (match, capturedChar) => {
-      // 'match' is the entire erroneous sequence, e.g., if the input (in memory) was "\\\\`", match is "\\\\`".
-      // 'capturedChar' is the character that determines the true meaning, e.g., '`'.
-
-      switch (capturedChar) {
-        case 'n':
-          return '\n'; // Correctly escaped: \n (newline character)
-        case 't':
-          return '\t'; // Correctly escaped: \t (tab character)
-        case 'r':
-          return '\r'; // Correctly escaped: \r (carriage return character)
-        case "'":
-          return "'"; // Correctly escaped: ' (apostrophe character)
-        case '"':
-          return '"'; // Correctly escaped: " (quotation mark character)
-        case '`':
-          return '`'; // Correctly escaped: ` (backtick character)
-        case '\\': // This handles when 'capturedChar' is a literal backslash
-          return '\\'; // Replace escaped backslash (e.g., "\\\\") with single backslash
-        case '\n': // This handles when 'capturedChar' is an actual newline
-          return '\n'; // Replace the whole erroneous sequence (e.g., "\\\n" in memory) with a clean newline
-        default:
-          // This fallback should ideally not be reached if the regex captures correctly.
-          // It would return the original matched sequence if an unexpected character was captured.
-          return match;
-      }
-    },
-  );
+  return inputString.replace(/\\+(n|t|r|'|"|`|\\|\n)/g, (match, capturedChar) => {
+    // 'match' is the entire erroneous sequence, e.g., if the input (in memory) was "\\\\`", match is "\\\\`".
+    // 'capturedChar' is the character that determines the true meaning, e.g., '`'.
+
+    switch (capturedChar) {
+      case "n":
+        return "\n"; // Correctly escaped: \n (newline character)
+      case "t":
+        return "\t"; // Correctly escaped: \t (tab character)
+      case "r":
+        return "\r"; // Correctly escaped: \r (carriage return character)
+      case "'":
+        return "'"; // Correctly escaped: ' (apostrophe character)
+      case '"':
+        return '"'; // Correctly escaped: " (quotation mark character)
+      case "`":
+        return "`"; // Correctly escaped: ` (backtick character)
+      case "\\": // This handles when 'capturedChar' is a literal backslash
+        return "\\"; // Replace escaped backslash (e.g., "\\\\") with single backslash
+      case "\n": // This handles when 'capturedChar' is an actual newline
+        return "\n"; // Replace the whole erroneous sequence (e.g., "\\\n" in memory) with a clean newline
+      default:
+        // This fallback should ideally not be reached if the regex captures correctly.
+        // It would return the original matched sequence if an unexpected character was captured.
+        return match;
+    }
+  });
 }
 
 /**
  * Counts occurrences of a substring in a string
  */
 export function countOccurrences(str: string, substr: string): number {
-  if (substr === '') {
+  if (substr === "") {
     return 0;
   }
   let count = 0;
diff --git a/packages/gemini-core/src/utils/editor.test.ts b/packages/gemini-core/src/utils/editor.test.ts
index acc9e1a1a..5ce58851c 100644
--- a/packages/gemini-core/src/utils/editor.test.ts
+++ b/packages/gemini-core/src/utils/editor.test.ts
@@ -4,26 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { execSync, spawn, spawnSync } from "node:child_process";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
 import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import {
+  allowEditorTypeInSandbox,
   checkHasEditorType,
+  type EditorType,
   getDiffCommand,
-  openDiff,
-  allowEditorTypeInSandbox,
   isEditorAvailable,
-  type EditorType,
-} from './editor.js';
-import { execSync, spawn, spawnSync } from 'node:child_process';
+  openDiff,
+} from "./editor.js";
 
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   execSync: vi.fn(),
   spawn: vi.fn(),
   spawnSync: vi.fn(() => ({ error: null, status: 0 })),
@@ -31,11 +23,11 @@ vi.mock('child_process', () => ({
 
 const originalPlatform = process.platform;
 
-describe('editor utils', () => {
+describe("editor utils", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.unstubAllEnvs();
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
       writable: true,
     });
@@ -44,53 +36,51 @@ describe('editor utils', () => {
   afterEach(() => {
     vi.restoreAllMocks();
     vi.unstubAllEnvs();
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
       writable: true,
     });
   });
 
-  describe('checkHasEditorType', () => {
+  describe("checkHasEditorType", () => {
     const testCases: Array<{
       editor: EditorType;
       commands: string[];
       win32Commands: string[];
     }> = [
-      { editor: 'vscode', commands: ['code'], win32Commands: ['code.cmd'] },
+      { editor: "vscode", commands: ["code"], win32Commands: ["code.cmd"] },
       {
-        editor: 'vscodium',
-        commands: ['codium'],
-        win32Commands: ['codium.cmd'],
+        editor: "vscodium",
+        commands: ["codium"],
+        win32Commands: ["codium.cmd"],
       },
       {
-        editor: 'windsurf',
-        commands: ['windsurf'],
-        win32Commands: ['windsurf'],
+        editor: "windsurf",
+        commands: ["windsurf"],
+        win32Commands: ["windsurf"],
       },
-      { editor: 'cursor', commands: ['cursor'], win32Commands: ['cursor'] },
-      { editor: 'vim', commands: ['vim'], win32Commands: ['vim'] },
-      { editor: 'neovim', commands: ['nvim'], win32Commands: ['nvim'] },
-      { editor: 'zed', commands: ['zed', 'zeditor'], win32Commands: ['zed'] },
-      { editor: 'emacs', commands: ['emacs'], win32Commands: ['emacs.exe'] },
+      { editor: "cursor", commands: ["cursor"], win32Commands: ["cursor"] },
+      { editor: "vim", commands: ["vim"], win32Commands: ["vim"] },
+      { editor: "neovim", commands: ["nvim"], win32Commands: ["nvim"] },
+      { editor: "zed", commands: ["zed", "zeditor"], win32Commands: ["zed"] },
+      { editor: "emacs", commands: ["emacs"], win32Commands: ["emacs.exe"] },
     ];
 
     for (const { editor, commands, win32Commands } of testCases) {
       describe(`${editor}`, () => {
         // Non-windows tests
         it(`should return true if first command "${commands[0]}" exists on non-windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'linux' });
-          (execSync as Mock).mockReturnValue(
-            Buffer.from(`/usr/bin/${commands[0]}`),
-          );
+          Object.defineProperty(process, "platform", { value: "linux" });
+          (execSync as Mock).mockReturnValue(Buffer.from(`/usr/bin/${commands[0]}`));
           expect(checkHasEditorType(editor)).toBe(true);
           expect(execSync).toHaveBeenCalledWith(`command -v ${commands[0]}`, {
-            stdio: 'ignore',
+            stdio: "ignore",
           });
         });
 
         if (commands.length > 1) {
           it(`should return true if first command doesn't exist but second command "${commands[1]}" exists on non-windows`, () => {
-            Object.defineProperty(process, 'platform', { value: 'linux' });
+            Object.defineProperty(process, "platform", { value: "linux" });
             (execSync as Mock)
               .mockImplementationOnce(() => {
                 throw new Error(); // first command not found
@@ -102,7 +92,7 @@ describe('editor utils', () => {
         }
 
         it(`should return false if none of the commands exist on non-windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'linux' });
+          Object.defineProperty(process, "platform", { value: "linux" });
           (execSync as Mock).mockImplementation(() => {
             throw new Error(); // all commands not found
           });
@@ -112,36 +102,31 @@ describe('editor utils', () => {
 
         // Windows tests
         it(`should return true if first command "${win32Commands[0]}" exists on windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'win32' });
+          Object.defineProperty(process, "platform", { value: "win32" });
           (execSync as Mock).mockReturnValue(
             Buffer.from(`C:\\Program Files\\...\\${win32Commands[0]}`),
           );
           expect(checkHasEditorType(editor)).toBe(true);
-          expect(execSync).toHaveBeenCalledWith(
-            `where.exe ${win32Commands[0]}`,
-            {
-              stdio: 'ignore',
-            },
-          );
+          expect(execSync).toHaveBeenCalledWith(`where.exe ${win32Commands[0]}`, {
+            stdio: "ignore",
+          });
         });
 
         if (win32Commands.length > 1) {
           it(`should return true if first command doesn't exist but second command "${win32Commands[1]}" exists on windows`, () => {
-            Object.defineProperty(process, 'platform', { value: 'win32' });
+            Object.defineProperty(process, "platform", { value: "win32" });
             (execSync as Mock)
               .mockImplementationOnce(() => {
                 throw new Error(); // first command not found
               })
-              .mockReturnValueOnce(
-                Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`),
-              ); // second command found
+              .mockReturnValueOnce(Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`)); // second command found
             expect(checkHasEditorType(editor)).toBe(true);
             expect(execSync).toHaveBeenCalledTimes(2);
           });
         }
 
         it(`should return false if none of the commands exist on windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'win32' });
+          Object.defineProperty(process, "platform", { value: "win32" });
           (execSync as Mock).mockImplementation(() => {
             throw new Error(); // all commands not found
           });
@@ -152,113 +137,109 @@ describe('editor utils', () => {
     }
   });
 
-  describe('getDiffCommand', () => {
+  describe("getDiffCommand", () => {
     const guiEditors: Array<{
       editor: EditorType;
       commands: string[];
       win32Commands: string[];
     }> = [
-      { editor: 'vscode', commands: ['code'], win32Commands: ['code.cmd'] },
+      { editor: "vscode", commands: ["code"], win32Commands: ["code.cmd"] },
       {
-        editor: 'vscodium',
-        commands: ['codium'],
-        win32Commands: ['codium.cmd'],
+        editor: "vscodium",
+        commands: ["codium"],
+        win32Commands: ["codium.cmd"],
       },
       {
-        editor: 'windsurf',
-        commands: ['windsurf'],
-        win32Commands: ['windsurf'],
+        editor: "windsurf",
+        commands: ["windsurf"],
+        win32Commands: ["windsurf"],
       },
-      { editor: 'cursor', commands: ['cursor'], win32Commands: ['cursor'] },
-      { editor: 'zed', commands: ['zed', 'zeditor'], win32Commands: ['zed'] },
+      { editor: "cursor", commands: ["cursor"], win32Commands: ["cursor"] },
+      { editor: "zed", commands: ["zed", "zeditor"], win32Commands: ["zed"] },
     ];
 
     for (const { editor, commands, win32Commands } of guiEditors) {
       // Non-windows tests
       it(`should use first command "${commands[0]}" when it exists on non-windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'linux' });
-        (execSync as Mock).mockReturnValue(
-          Buffer.from(`/usr/bin/${commands[0]}`),
-        );
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        Object.defineProperty(process, "platform", { value: "linux" });
+        (execSync as Mock).mockReturnValue(Buffer.from(`/usr/bin/${commands[0]}`));
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: commands[0],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
 
       if (commands.length > 1) {
         it(`should use second command "${commands[1]}" when first doesn't exist on non-windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'linux' });
+          Object.defineProperty(process, "platform", { value: "linux" });
           (execSync as Mock)
             .mockImplementationOnce(() => {
               throw new Error(); // first command not found
             })
             .mockReturnValueOnce(Buffer.from(`/usr/bin/${commands[1]}`)); // second command found
 
-          const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+          const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
           expect(diffCommand).toEqual({
             command: commands[1],
-            args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+            args: ["--wait", "--diff", "old.txt", "new.txt"],
           });
         });
       }
 
       it(`should fall back to last command "${commands[commands.length - 1]}" when none exist on non-windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'linux' });
+        Object.defineProperty(process, "platform", { value: "linux" });
         (execSync as Mock).mockImplementation(() => {
           throw new Error(); // all commands not found
         });
 
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: commands[commands.length - 1],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
 
       // Windows tests
       it(`should use first command "${win32Commands[0]}" when it exists on windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'win32' });
+        Object.defineProperty(process, "platform", { value: "win32" });
         (execSync as Mock).mockReturnValue(
           Buffer.from(`C:\\Program Files\\...\\${win32Commands[0]}`),
         );
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: win32Commands[0],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
 
       if (win32Commands.length > 1) {
         it(`should use second command "${win32Commands[1]}" when first doesn't exist on windows`, () => {
-          Object.defineProperty(process, 'platform', { value: 'win32' });
+          Object.defineProperty(process, "platform", { value: "win32" });
           (execSync as Mock)
             .mockImplementationOnce(() => {
               throw new Error(); // first command not found
             })
-            .mockReturnValueOnce(
-              Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`),
-            ); // second command found
+            .mockReturnValueOnce(Buffer.from(`C:\\Program Files\\...\\${win32Commands[1]}`)); // second command found
 
-          const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+          const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
           expect(diffCommand).toEqual({
             command: win32Commands[1],
-            args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+            args: ["--wait", "--diff", "old.txt", "new.txt"],
           });
         });
       }
 
       it(`should fall back to last command "${win32Commands[win32Commands.length - 1]}" when none exist on windows`, () => {
-        Object.defineProperty(process, 'platform', { value: 'win32' });
+        Object.defineProperty(process, "platform", { value: "win32" });
         (execSync as Mock).mockImplementation(() => {
           throw new Error(); // all commands not found
         });
 
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command: win32Commands[win32Commands.length - 1],
-          args: ['--wait', '--diff', 'old.txt', 'new.txt'],
+          args: ["--wait", "--diff", "old.txt", "new.txt"],
         });
       });
     }
@@ -267,224 +248,196 @@ describe('editor utils', () => {
       editor: EditorType;
       command: string;
     }> = [
-      { editor: 'vim', command: 'vim' },
-      { editor: 'neovim', command: 'nvim' },
+      { editor: "vim", command: "vim" },
+      { editor: "neovim", command: "nvim" },
     ];
 
     for (const { editor, command } of terminalEditors) {
       it(`should return the correct command for ${editor}`, () => {
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor);
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor);
         expect(diffCommand).toEqual({
           command,
           args: [
-            '-d',
-            '-i',
-            'NONE',
-            '-c',
-            'wincmd h | set readonly | wincmd l',
-            '-c',
-            'highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000',
-            '-c',
-            'set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
-            '-c',
-            'wincmd h | setlocal statusline=OLD\\ FILE',
-            '-c',
-            'wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
-            '-c',
-            'autocmd BufWritePost * wqa',
-            'old.txt',
-            'new.txt',
+            "-d",
+            "-i",
+            "NONE",
+            "-c",
+            "wincmd h | set readonly | wincmd l",
+            "-c",
+            "highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000",
+            "-c",
+            "set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
+            "-c",
+            "wincmd h | setlocal statusline=OLD\\ FILE",
+            "-c",
+            "wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
+            "-c",
+            "autocmd BufWritePost * wqa",
+            "old.txt",
+            "new.txt",
           ],
         });
       });
     }
 
-    it('should return the correct command for emacs', () => {
-      const command = getDiffCommand('old.txt', 'new.txt', 'emacs');
+    it("should return the correct command for emacs", () => {
+      const command = getDiffCommand("old.txt", "new.txt", "emacs");
       expect(command).toEqual({
-        command: 'emacs',
-        args: ['--eval', '(ediff "old.txt" "new.txt")'],
+        command: "emacs",
+        args: ["--eval", '(ediff "old.txt" "new.txt")'],
       });
     });
 
-    it('should return null for an unsupported editor', () => {
+    it("should return null for an unsupported editor", () => {
       // @ts-expect-error Testing unsupported editor
-      const command = getDiffCommand('old.txt', 'new.txt', 'foobar');
+      const command = getDiffCommand("old.txt", "new.txt", "foobar");
       expect(command).toBeNull();
     });
   });
 
-  describe('openDiff', () => {
-    const guiEditors: EditorType[] = [
-      'vscode',
-      'vscodium',
-      'windsurf',
-      'cursor',
-      'zed',
-    ];
+  describe("openDiff", () => {
+    const guiEditors: EditorType[] = ["vscode", "vscodium", "windsurf", "cursor", "zed"];
 
     for (const editor of guiEditors) {
       it(`should call spawn for ${editor}`, async () => {
         const mockSpawnOn = vi.fn((event, cb) => {
-          if (event === 'close') {
+          if (event === "close") {
             cb(0);
           }
         });
         (spawn as Mock).mockReturnValue({ on: mockSpawnOn });
 
-        await openDiff('old.txt', 'new.txt', editor, () => {});
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor)!;
-        expect(spawn).toHaveBeenCalledWith(
-          diffCommand.command,
-          diffCommand.args,
-          {
-            stdio: 'inherit',
-            shell: process.platform === 'win32',
-          },
-        );
-        expect(mockSpawnOn).toHaveBeenCalledWith('close', expect.any(Function));
-        expect(mockSpawnOn).toHaveBeenCalledWith('error', expect.any(Function));
+        await openDiff("old.txt", "new.txt", editor, () => {});
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor)!;
+        expect(spawn).toHaveBeenCalledWith(diffCommand.command, diffCommand.args, {
+          stdio: "inherit",
+          shell: process.platform === "win32",
+        });
+        expect(mockSpawnOn).toHaveBeenCalledWith("close", expect.any(Function));
+        expect(mockSpawnOn).toHaveBeenCalledWith("error", expect.any(Function));
       });
 
       it(`should reject if spawn for ${editor} fails`, async () => {
-        const mockError = new Error('spawn error');
+        const mockError = new Error("spawn error");
         const mockSpawnOn = vi.fn((event, cb) => {
-          if (event === 'error') {
+          if (event === "error") {
             cb(mockError);
           }
         });
         (spawn as Mock).mockReturnValue({ on: mockSpawnOn });
 
-        await expect(
-          openDiff('old.txt', 'new.txt', editor, () => {}),
-        ).rejects.toThrow('spawn error');
+        await expect(openDiff("old.txt", "new.txt", editor, () => {})).rejects.toThrow(
+          "spawn error",
+        );
       });
 
       it(`should reject if ${editor} exits with non-zero code`, async () => {
         const mockSpawnOn = vi.fn((event, cb) => {
-          if (event === 'close') {
+          if (event === "close") {
             cb(1);
           }
         });
         (spawn as Mock).mockReturnValue({ on: mockSpawnOn });
 
-        await expect(
-          openDiff('old.txt', 'new.txt', editor, () => {}),
-        ).rejects.toThrow(`${editor} exited with code 1`);
+        await expect(openDiff("old.txt", "new.txt", editor, () => {})).rejects.toThrow(
+          `${editor} exited with code 1`,
+        );
       });
     }
 
-    const terminalEditors: EditorType[] = ['vim', 'neovim', 'emacs'];
+    const terminalEditors: EditorType[] = ["vim", "neovim", "emacs"];
 
     for (const editor of terminalEditors) {
       it(`should call spawnSync for ${editor}`, async () => {
-        await openDiff('old.txt', 'new.txt', editor, () => {});
-        const diffCommand = getDiffCommand('old.txt', 'new.txt', editor)!;
-        expect(spawnSync).toHaveBeenCalledWith(
-          diffCommand.command,
-          diffCommand.args,
-          {
-            stdio: 'inherit',
-          },
-        );
+        await openDiff("old.txt", "new.txt", editor, () => {});
+        const diffCommand = getDiffCommand("old.txt", "new.txt", editor)!;
+        expect(spawnSync).toHaveBeenCalledWith(diffCommand.command, diffCommand.args, {
+          stdio: "inherit",
+        });
       });
     }
 
-    it('should log an error if diff command is not available', async () => {
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it("should log an error if diff command is not available", async () => {
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
       // @ts-expect-error Testing unsupported editor
-      await openDiff('old.txt', 'new.txt', 'foobar', () => {});
+      await openDiff("old.txt", "new.txt", "foobar", () => {});
       expect(consoleErrorSpy).toHaveBeenCalledWith(
-        'No diff tool available. Install a supported editor.',
+        "No diff tool available. Install a supported editor.",
       );
     });
 
-    describe('onEditorClose callback', () => {
-      const terminalEditors: EditorType[] = ['vim', 'neovim', 'emacs'];
+    describe("onEditorClose callback", () => {
+      const terminalEditors: EditorType[] = ["vim", "neovim", "emacs"];
       for (const editor of terminalEditors) {
         it(`should call onEditorClose for ${editor} on close`, async () => {
           const onEditorClose = vi.fn();
-          await openDiff('old.txt', 'new.txt', editor, onEditorClose);
+          await openDiff("old.txt", "new.txt", editor, onEditorClose);
           expect(onEditorClose).toHaveBeenCalledTimes(1);
         });
 
         it(`should call onEditorClose for ${editor} on error`, async () => {
           const onEditorClose = vi.fn();
-          const mockError = new Error('spawn error');
+          const mockError = new Error("spawn error");
           (spawnSync as Mock).mockImplementation(() => {
             throw mockError;
           });
 
-          await expect(
-            openDiff('old.txt', 'new.txt', editor, onEditorClose),
-          ).rejects.toThrow('spawn error');
+          await expect(openDiff("old.txt", "new.txt", editor, onEditorClose)).rejects.toThrow(
+            "spawn error",
+          );
           expect(onEditorClose).toHaveBeenCalledTimes(1);
         });
       }
 
-      const guiEditors: EditorType[] = [
-        'vscode',
-        'vscodium',
-        'windsurf',
-        'cursor',
-        'zed',
-      ];
+      const guiEditors: EditorType[] = ["vscode", "vscodium", "windsurf", "cursor", "zed"];
       for (const editor of guiEditors) {
         it(`should not call onEditorClose for ${editor}`, async () => {
           const onEditorClose = vi.fn();
           const mockSpawnOn = vi.fn((event, cb) => {
-            if (event === 'close') {
+            if (event === "close") {
               cb(0);
             }
           });
           (spawn as Mock).mockReturnValue({ on: mockSpawnOn });
-          await openDiff('old.txt', 'new.txt', editor, onEditorClose);
+          await openDiff("old.txt", "new.txt", editor, onEditorClose);
           expect(onEditorClose).not.toHaveBeenCalled();
         });
       }
     });
   });
 
-  describe('allowEditorTypeInSandbox', () => {
-    it('should allow vim in sandbox mode', () => {
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(allowEditorTypeInSandbox('vim')).toBe(true);
+  describe("allowEditorTypeInSandbox", () => {
+    it("should allow vim in sandbox mode", () => {
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(allowEditorTypeInSandbox("vim")).toBe(true);
     });
 
-    it('should allow vim when not in sandbox mode', () => {
-      expect(allowEditorTypeInSandbox('vim')).toBe(true);
+    it("should allow vim when not in sandbox mode", () => {
+      expect(allowEditorTypeInSandbox("vim")).toBe(true);
     });
 
-    it('should allow emacs in sandbox mode', () => {
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(allowEditorTypeInSandbox('emacs')).toBe(true);
+    it("should allow emacs in sandbox mode", () => {
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(allowEditorTypeInSandbox("emacs")).toBe(true);
     });
 
-    it('should allow emacs when not in sandbox mode', () => {
-      expect(allowEditorTypeInSandbox('emacs')).toBe(true);
+    it("should allow emacs when not in sandbox mode", () => {
+      expect(allowEditorTypeInSandbox("emacs")).toBe(true);
     });
 
-    it('should allow neovim in sandbox mode', () => {
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(allowEditorTypeInSandbox('neovim')).toBe(true);
+    it("should allow neovim in sandbox mode", () => {
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(allowEditorTypeInSandbox("neovim")).toBe(true);
     });
 
-    it('should allow neovim when not in sandbox mode', () => {
-      expect(allowEditorTypeInSandbox('neovim')).toBe(true);
+    it("should allow neovim when not in sandbox mode", () => {
+      expect(allowEditorTypeInSandbox("neovim")).toBe(true);
     });
 
-    const guiEditors: EditorType[] = [
-      'vscode',
-      'vscodium',
-      'windsurf',
-      'cursor',
-      'zed',
-    ];
+    const guiEditors: EditorType[] = ["vscode", "vscodium", "windsurf", "cursor", "zed"];
     for (const editor of guiEditors) {
       it(`should not allow ${editor} in sandbox mode`, () => {
-        vi.stubEnv('SANDBOX', 'sandbox');
+        vi.stubEnv("SANDBOX", "sandbox");
         expect(allowEditorTypeInSandbox(editor)).toBe(false);
       });
 
@@ -494,53 +447,53 @@ describe('editor utils', () => {
     }
   });
 
-  describe('isEditorAvailable', () => {
-    it('should return false for undefined editor', () => {
+  describe("isEditorAvailable", () => {
+    it("should return false for undefined editor", () => {
       expect(isEditorAvailable(undefined)).toBe(false);
     });
 
-    it('should return false for empty string editor', () => {
-      expect(isEditorAvailable('')).toBe(false);
+    it("should return false for empty string editor", () => {
+      expect(isEditorAvailable("")).toBe(false);
     });
 
-    it('should return false for invalid editor type', () => {
-      expect(isEditorAvailable('invalid-editor')).toBe(false);
+    it("should return false for invalid editor type", () => {
+      expect(isEditorAvailable("invalid-editor")).toBe(false);
     });
 
-    it('should return true for vscode when installed and not in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/code'));
-      expect(isEditorAvailable('vscode')).toBe(true);
+    it("should return true for vscode when installed and not in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/code"));
+      expect(isEditorAvailable("vscode")).toBe(true);
     });
 
-    it('should return false for vscode when not installed and not in sandbox mode', () => {
+    it("should return false for vscode when not installed and not in sandbox mode", () => {
       (execSync as Mock).mockImplementation(() => {
         throw new Error();
       });
-      expect(isEditorAvailable('vscode')).toBe(false);
+      expect(isEditorAvailable("vscode")).toBe(false);
     });
 
-    it('should return false for vscode when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/code'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('vscode')).toBe(false);
+    it("should return false for vscode when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/code"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("vscode")).toBe(false);
     });
 
-    it('should return true for vim when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/vim'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('vim')).toBe(true);
+    it("should return true for vim when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/vim"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("vim")).toBe(true);
     });
 
-    it('should return true for emacs when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/emacs'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('emacs')).toBe(true);
+    it("should return true for emacs when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/emacs"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("emacs")).toBe(true);
     });
 
-    it('should return true for neovim when installed and in sandbox mode', () => {
-      (execSync as Mock).mockReturnValue(Buffer.from('/usr/bin/nvim'));
-      vi.stubEnv('SANDBOX', 'sandbox');
-      expect(isEditorAvailable('neovim')).toBe(true);
+    it("should return true for neovim when installed and in sandbox mode", () => {
+      (execSync as Mock).mockReturnValue(Buffer.from("/usr/bin/nvim"));
+      vi.stubEnv("SANDBOX", "sandbox");
+      expect(isEditorAvailable("neovim")).toBe(true);
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/editor.ts b/packages/gemini-core/src/utils/editor.ts
index 896a34825..e06a71e14 100644
--- a/packages/gemini-core/src/utils/editor.ts
+++ b/packages/gemini-core/src/utils/editor.ts
@@ -4,30 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync, spawn, spawnSync } from 'node:child_process';
-import { debugLogger } from './debugLogger.js';
+import { execSync, spawn, spawnSync } from "node:child_process";
+import { debugLogger } from "./debugLogger.js";
 
 export type EditorType =
-  | 'vscode'
-  | 'vscodium'
-  | 'windsurf'
-  | 'cursor'
-  | 'vim'
-  | 'neovim'
-  | 'zed'
-  | 'emacs';
+  | "vscode"
+  | "vscodium"
+  | "windsurf"
+  | "cursor"
+  | "vim"
+  | "neovim"
+  | "zed"
+  | "emacs";
 
 function isValidEditorType(editor: string): editor is EditorType {
-  return [
-    'vscode',
-    'vscodium',
-    'windsurf',
-    'cursor',
-    'vim',
-    'neovim',
-    'zed',
-    'emacs',
-  ].includes(editor);
+  return ["vscode", "vscodium", "windsurf", "cursor", "vim", "neovim", "zed", "emacs"].includes(
+    editor,
+  );
 }
 
 interface DiffCommand {
@@ -37,10 +30,9 @@ interface DiffCommand {
 
 function commandExists(cmd: string): boolean {
   try {
-    execSync(
-      process.platform === 'win32' ? `where.exe ${cmd}` : `command -v ${cmd}`,
-      { stdio: 'ignore' },
-    );
+    execSync(process.platform === "win32" ? `where.exe ${cmd}` : `command -v ${cmd}`, {
+      stdio: "ignore",
+    });
     return true;
   } catch {
     return false;
@@ -51,30 +43,26 @@ function commandExists(cmd: string): boolean {
  * Editor command configurations for different platforms.
  * Each editor can have multiple possible command names, listed in order of preference.
  */
-const editorCommands: Record<
-  EditorType,
-  { win32: string[]; default: string[] }
-> = {
-  vscode: { win32: ['code.cmd'], default: ['code'] },
-  vscodium: { win32: ['codium.cmd'], default: ['codium'] },
-  windsurf: { win32: ['windsurf'], default: ['windsurf'] },
-  cursor: { win32: ['cursor'], default: ['cursor'] },
-  vim: { win32: ['vim'], default: ['vim'] },
-  neovim: { win32: ['nvim'], default: ['nvim'] },
-  zed: { win32: ['zed'], default: ['zed', 'zeditor'] },
-  emacs: { win32: ['emacs.exe'], default: ['emacs'] },
+const editorCommands: Record<EditorType, { win32: string[]; default: string[] }> = {
+  vscode: { win32: ["code.cmd"], default: ["code"] },
+  vscodium: { win32: ["codium.cmd"], default: ["codium"] },
+  windsurf: { win32: ["windsurf"], default: ["windsurf"] },
+  cursor: { win32: ["cursor"], default: ["cursor"] },
+  vim: { win32: ["vim"], default: ["vim"] },
+  neovim: { win32: ["nvim"], default: ["nvim"] },
+  zed: { win32: ["zed"], default: ["zed", "zeditor"] },
+  emacs: { win32: ["emacs.exe"], default: ["emacs"] },
 };
 
 export function checkHasEditorType(editor: EditorType): boolean {
   const commandConfig = editorCommands[editor];
-  const commands =
-    process.platform === 'win32' ? commandConfig.win32 : commandConfig.default;
+  const commands = process.platform === "win32" ? commandConfig.win32 : commandConfig.default;
   return commands.some((cmd) => commandExists(cmd));
 }
 
 export function allowEditorTypeInSandbox(editor: EditorType): boolean {
-  const notUsingSandbox = !process.env['SANDBOX'];
-  if (['vscode', 'vscodium', 'windsurf', 'cursor', 'zed'].includes(editor)) {
+  const notUsingSandbox = !process.env["SANDBOX"];
+  if (["vscode", "vscodium", "windsurf", "cursor", "zed"].includes(editor)) {
     return notUsingSandbox;
   }
   // For terminal-based editors like vim and emacs, allow in sandbox.
@@ -104,52 +92,50 @@ export function getDiffCommand(
     return null;
   }
   const commandConfig = editorCommands[editor];
-  const commands =
-    process.platform === 'win32' ? commandConfig.win32 : commandConfig.default;
+  const commands = process.platform === "win32" ? commandConfig.win32 : commandConfig.default;
   const command =
-    commands.slice(0, -1).find((cmd) => commandExists(cmd)) ||
-    commands[commands.length - 1];
+    commands.slice(0, -1).find((cmd) => commandExists(cmd)) || commands[commands.length - 1];
 
   switch (editor) {
-    case 'vscode':
-    case 'vscodium':
-    case 'windsurf':
-    case 'cursor':
-    case 'zed':
-      return { command, args: ['--wait', '--diff', oldPath, newPath] };
-    case 'vim':
-    case 'neovim':
+    case "vscode":
+    case "vscodium":
+    case "windsurf":
+    case "cursor":
+    case "zed":
+      return { command, args: ["--wait", "--diff", oldPath, newPath] };
+    case "vim":
+    case "neovim":
       return {
         command,
         args: [
-          '-d',
+          "-d",
           // skip viminfo file to avoid E138 errors
-          '-i',
-          'NONE',
+          "-i",
+          "NONE",
           // make the left window read-only and the right window editable
-          '-c',
-          'wincmd h | set readonly | wincmd l',
+          "-c",
+          "wincmd h | set readonly | wincmd l",
           // set up colors for diffs
-          '-c',
-          'highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000',
+          "-c",
+          "highlight DiffAdd cterm=bold ctermbg=22 guibg=#005f00 | highlight DiffChange cterm=bold ctermbg=24 guibg=#005f87 | highlight DiffText ctermbg=21 guibg=#0000af | highlight DiffDelete ctermbg=52 guibg=#5f0000",
           // Show helpful messages
-          '-c',
-          'set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
-          '-c',
-          'wincmd h | setlocal statusline=OLD\\ FILE',
-          '-c',
-          'wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)',
+          "-c",
+          "set showtabline=2 | set tabline=[Instructions]\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
+          "-c",
+          "wincmd h | setlocal statusline=OLD\\ FILE",
+          "-c",
+          "wincmd l | setlocal statusline=%#StatusBold#NEW\\ FILE\\ :wqa(save\\ &\\ quit)\\ \\|\\ i/esc(toggle\\ edit\\ mode)",
           // Auto close all windows when one is closed
-          '-c',
-          'autocmd BufWritePost * wqa',
+          "-c",
+          "autocmd BufWritePost * wqa",
           oldPath,
           newPath,
         ],
       };
-    case 'emacs':
+    case "emacs":
       return {
-        command: 'emacs',
-        args: ['--eval', `(ediff "${oldPath}" "${newPath}")`],
+        command: "emacs",
+        args: ["--eval", `(ediff "${oldPath}" "${newPath}")`],
       };
     default:
       return null;
@@ -169,16 +155,16 @@ export async function openDiff(
 ): Promise<void> {
   const diffCommand = getDiffCommand(oldPath, newPath, editor);
   if (!diffCommand) {
-    debugLogger.error('No diff tool available. Install a supported editor.');
+    debugLogger.error("No diff tool available. Install a supported editor.");
     return;
   }
 
-  const isTerminalEditor = ['vim', 'emacs', 'neovim'].includes(editor);
+  const isTerminalEditor = ["vim", "emacs", "neovim"].includes(editor);
 
   if (isTerminalEditor) {
     try {
       const result = spawnSync(diffCommand.command, diffCommand.args, {
-        stdio: 'inherit',
+        stdio: "inherit",
       });
       if (result.error) {
         throw result.error;
@@ -194,11 +180,11 @@ export async function openDiff(
 
   return new Promise<void>((resolve, reject) => {
     const childProcess = spawn(diffCommand.command, diffCommand.args, {
-      stdio: 'inherit',
-      shell: process.platform === 'win32',
+      stdio: "inherit",
+      shell: process.platform === "win32",
     });
 
-    childProcess.on('close', (code) => {
+    childProcess.on("close", (code) => {
       if (code === 0) {
         resolve();
       } else {
@@ -206,7 +192,7 @@ export async function openDiff(
       }
     });
 
-    childProcess.on('error', (error) => {
+    childProcess.on("error", (error) => {
       reject(error);
     });
   });
diff --git a/packages/gemini-core/src/utils/environmentContext.test.ts b/packages/gemini-core/src/utils/environmentContext.test.ts
index 609c03d82..54273cd90 100644
--- a/packages/gemini-core/src/utils/environmentContext.test.ts
+++ b/packages/gemini-core/src/utils/environmentContext.test.ts
@@ -4,84 +4,72 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import {
-  getEnvironmentContext,
-  getDirectoryContextString,
-} from './environmentContext.js';
-import type { Config } from '../config/config.js';
-import type { Storage } from '../config/storage.js';
-import { getFolderStructure } from './getFolderStructure.js';
-
-vi.mock('../config/config.js');
-vi.mock('./getFolderStructure.js', () => ({
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { Storage } from "../config/storage.js";
+import { getDirectoryContextString, getEnvironmentContext } from "./environmentContext.js";
+import { getFolderStructure } from "./getFolderStructure.js";
+
+vi.mock("../config/config.js");
+vi.mock("./getFolderStructure.js", () => ({
   getFolderStructure: vi.fn(),
 }));
-vi.mock('../tools/read-many-files.js');
+vi.mock("../tools/read-many-files.js");
 
-describe('getDirectoryContextString', () => {
+describe("getDirectoryContextString", () => {
   let mockConfig: Partial<Config>;
 
   beforeEach(() => {
     mockConfig = {
       getWorkspaceContext: vi.fn().mockReturnValue({
-        getDirectories: vi.fn().mockReturnValue(['/test/dir']),
+        getDirectories: vi.fn().mockReturnValue(["/test/dir"]),
       }),
       getFileService: vi.fn(),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
       } as unknown as Storage,
     };
-    vi.mocked(getFolderStructure).mockResolvedValue('Mock Folder Structure');
+    vi.mocked(getFolderStructure).mockResolvedValue("Mock Folder Structure");
   });
 
   afterEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should return context string for a single directory', async () => {
+  it("should return context string for a single directory", async () => {
     const contextString = await getDirectoryContextString(mockConfig as Config);
+    expect(contextString).toContain("I'm currently working in the directory: /test/dir");
     expect(contextString).toContain(
-      "I'm currently working in the directory: /test/dir",
-    );
-    expect(contextString).toContain(
-      'Here is the folder structure of the current working directories:\n\nMock Folder Structure',
+      "Here is the folder structure of the current working directories:\n\nMock Folder Structure",
     );
   });
 
-  it('should return context string for multiple directories', async () => {
-    (
-      vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock
-    ).mockReturnValue(['/test/dir1', '/test/dir2']);
+  it("should return context string for multiple directories", async () => {
+    (vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock).mockReturnValue([
+      "/test/dir1",
+      "/test/dir2",
+    ]);
     vi.mocked(getFolderStructure)
-      .mockResolvedValueOnce('Structure 1')
-      .mockResolvedValueOnce('Structure 2');
+      .mockResolvedValueOnce("Structure 1")
+      .mockResolvedValueOnce("Structure 2");
 
     const contextString = await getDirectoryContextString(mockConfig as Config);
     expect(contextString).toContain(
       "I'm currently working in the following directories:\n  - /test/dir1\n  - /test/dir2",
     );
     expect(contextString).toContain(
-      'Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2',
+      "Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2",
     );
   });
 });
 
-describe('getEnvironmentContext', () => {
+describe("getEnvironmentContext", () => {
   let mockConfig: Partial<Config>;
   let mockToolRegistry: { getTool: Mock };
 
   beforeEach(() => {
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-08-05T12:00:00Z'));
+    vi.setSystemTime(new Date("2025-08-05T12:00:00Z"));
 
     mockToolRegistry = {
       getTool: vi.fn(),
@@ -89,17 +77,17 @@ describe('getEnvironmentContext', () => {
 
     mockConfig = {
       getWorkspaceContext: vi.fn().mockReturnValue({
-        getDirectories: vi.fn().mockReturnValue(['/test/dir']),
+        getDirectories: vi.fn().mockReturnValue(["/test/dir"]),
       }),
       getFileService: vi.fn(),
 
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project-temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/project-temp"),
       } as unknown as Storage,
     };
 
-    vi.mocked(getFolderStructure).mockResolvedValue('Mock Folder Structure');
+    vi.mocked(getFolderStructure).mockResolvedValue("Mock Folder Structure");
   });
 
   afterEach(() => {
@@ -107,7 +95,7 @@ describe('getEnvironmentContext', () => {
     vi.resetAllMocks();
   });
 
-  it('should return basic environment context for a single directory', async () => {
+  it("should return basic environment context for a single directory", async () => {
     const parts = await getEnvironmentContext(mockConfig as Config);
 
     expect(parts.length).toBe(1);
@@ -116,24 +104,23 @@ describe('getEnvironmentContext', () => {
     expect(context).toContain("Today's date is");
     expect(context).toContain("(formatted according to the user's locale)");
     expect(context).toContain(`My operating system is: ${process.platform}`);
+    expect(context).toContain("I'm currently working in the directory: /test/dir");
     expect(context).toContain(
-      "I'm currently working in the directory: /test/dir",
-    );
-    expect(context).toContain(
-      'Here is the folder structure of the current working directories:\n\nMock Folder Structure',
+      "Here is the folder structure of the current working directories:\n\nMock Folder Structure",
     );
-    expect(getFolderStructure).toHaveBeenCalledWith('/test/dir', {
+    expect(getFolderStructure).toHaveBeenCalledWith("/test/dir", {
       fileService: undefined,
     });
   });
 
-  it('should return basic environment context for multiple directories', async () => {
-    (
-      vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock
-    ).mockReturnValue(['/test/dir1', '/test/dir2']);
+  it("should return basic environment context for multiple directories", async () => {
+    (vi.mocked(mockConfig.getWorkspaceContext!)().getDirectories as Mock).mockReturnValue([
+      "/test/dir1",
+      "/test/dir2",
+    ]);
     vi.mocked(getFolderStructure)
-      .mockResolvedValueOnce('Structure 1')
-      .mockResolvedValueOnce('Structure 2');
+      .mockResolvedValueOnce("Structure 1")
+      .mockResolvedValueOnce("Structure 2");
 
     const parts = await getEnvironmentContext(mockConfig as Config);
 
@@ -144,15 +131,15 @@ describe('getEnvironmentContext', () => {
       "I'm currently working in the following directories:\n  - /test/dir1\n  - /test/dir2",
     );
     expect(context).toContain(
-      'Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2',
+      "Here is the folder structure of the current working directories:\n\nStructure 1\nStructure 2",
     );
     expect(getFolderStructure).toHaveBeenCalledTimes(2);
   });
 
-  it('should handle read_many_files returning no content', async () => {
+  it("should handle read_many_files returning no content", async () => {
     const mockReadManyFilesTool = {
       build: vi.fn().mockReturnValue({
-        execute: vi.fn().mockResolvedValue({ llmContent: '' }),
+        execute: vi.fn().mockResolvedValue({ llmContent: "" }),
       }),
     };
     mockToolRegistry.getTool.mockReturnValue(mockReadManyFilesTool);
@@ -162,7 +149,7 @@ describe('getEnvironmentContext', () => {
     expect(parts.length).toBe(1); // No extra part added
   });
 
-  it('should handle read_many_files tool not being found', async () => {
+  it("should handle read_many_files tool not being found", async () => {
     mockToolRegistry.getTool.mockReturnValue(null);
 
     const parts = await getEnvironmentContext(mockConfig as Config);
diff --git a/packages/gemini-core/src/utils/environmentContext.ts b/packages/gemini-core/src/utils/environmentContext.ts
index 162c2e596..bb51f6f1e 100644
--- a/packages/gemini-core/src/utils/environmentContext.ts
+++ b/packages/gemini-core/src/utils/environmentContext.ts
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Part, Content } from '@google/genai';
-import type { Config } from '../config/config.js';
-import { getFolderStructure } from './getFolderStructure.js';
+import type { Content, Part } from "@google/genai";
+import type { Config } from "../config/config.js";
+import { getFolderStructure } from "./getFolderStructure.js";
 
 /**
  * Generates a string describing the current workspace directories and their structures.
  * @param {Config} config - The runtime configuration and services.
  * @returns {Promise<string>} A promise that resolves to the directory context string.
  */
-export async function getDirectoryContextString(
-  config: Config,
-): Promise<string> {
+export async function getDirectoryContextString(config: Config): Promise<string> {
   const workspaceContext = config.getWorkspaceContext();
   const workspaceDirectories = workspaceContext.getDirectories();
 
@@ -27,13 +25,13 @@ export async function getDirectoryContextString(
     ),
   );
 
-  const folderStructure = folderStructures.join('\n');
+  const folderStructure = folderStructures.join("\n");
 
   let workingDirPreamble: string;
   if (workspaceDirectories.length === 1) {
     workingDirPreamble = `I'm currently working in the directory: ${workspaceDirectories[0]}`;
   } else {
-    const dirList = workspaceDirectories.map((dir) => `  - ${dir}`).join('\n');
+    const dirList = workspaceDirectories.map((dir) => `  - ${dir}`).join("\n");
     workingDirPreamble = `I'm currently working in the following directories:\n${dirList}`;
   }
 
@@ -52,10 +50,10 @@ ${folderStructure}`;
  */
 export async function getEnvironmentContext(config: Config): Promise<Part[]> {
   const today = new Date().toLocaleDateString(undefined, {
-    weekday: 'long',
-    year: 'numeric',
-    month: 'long',
-    day: 'numeric',
+    weekday: "long",
+    year: "numeric",
+    month: "long",
+    day: "numeric",
   });
   const platform = process.platform;
   const directoryContext = await getDirectoryContextString(config);
@@ -79,7 +77,7 @@ export async function getInitialChatHistory(
   extraHistory?: Content[],
 ): Promise<Content[]> {
   const envParts = await getEnvironmentContext(config);
-  const envContextString = envParts.map((part) => part.text || '').join('\n\n');
+  const envContextString = envParts.map((part) => part.text || "").join("\n\n");
 
   const allSetupText = `
 ${envContextString}
@@ -91,7 +89,7 @@ My setup is complete. I will provide my first command in the next turn.
 
   return [
     {
-      role: 'user',
+      role: "user",
       parts: [{ text: allSetupText }],
     },
     ...(extraHistory ?? []),
diff --git a/packages/gemini-core/src/utils/errorParsing.test.ts b/packages/gemini-core/src/utils/errorParsing.test.ts
index 291145d2e..8e565a4a9 100644
--- a/packages/gemini-core/src/utils/errorParsing.test.ts
+++ b/packages/gemini-core/src/utils/errorParsing.test.ts
@@ -4,76 +4,70 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseAndFormatApiError } from './errorParsing.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { AuthType } from '../core/contentGenerator.js';
-import type { StructuredError } from '../core/turn.js';
+import { describe, expect, it } from "vitest";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import type { StructuredError } from "../core/turn.js";
+import { parseAndFormatApiError } from "./errorParsing.js";
 
-describe('parseAndFormatApiError', () => {
-  const vertexMessage = 'request a quota increase through Vertex';
-  const geminiMessage = 'request a quota increase through AI Studio';
+describe("parseAndFormatApiError", () => {
+  const vertexMessage = "request a quota increase through Vertex";
+  const geminiMessage = "request a quota increase through AI Studio";
 
-  it('should format a valid API error JSON', () => {
+  it("should format a valid API error JSON", () => {
     const errorMessage =
       'got status: 400 Bad Request. {"error":{"code":400,"message":"API key not valid. Please pass a valid API key.","status":"INVALID_ARGUMENT"}}';
     const expected =
-      '[API Error: API key not valid. Please pass a valid API key. (Status: INVALID_ARGUMENT)]';
+      "[API Error: API key not valid. Please pass a valid API key. (Status: INVALID_ARGUMENT)]";
     expect(parseAndFormatApiError(errorMessage)).toBe(expected);
   });
 
-  it('should format a 429 API error with the default message', () => {
+  it("should format a 429 API error with the default message", () => {
     const errorMessage =
       'got status: 429 Too Many Requests. {"error":{"code":429,"message":"Rate limit exceeded","status":"RESOURCE_EXHAUSTED"}}';
     const result = parseAndFormatApiError(
       errorMessage,
       undefined,
       undefined,
-      'gemini-2.5-pro',
+      "gemini-2.5-pro",
       DEFAULT_GEMINI_FLASH_MODEL,
     );
-    expect(result).toContain('[API Error: Rate limit exceeded');
+    expect(result).toContain("[API Error: Rate limit exceeded");
     expect(result).toContain(
-      'Possible quota limitations in place or slow response times detected. Switching to the gemini-2.5-flash model',
+      "Possible quota limitations in place or slow response times detected. Switching to the gemini-2.5-flash model",
     );
   });
 
-  it('should format a 429 API error with the vertex message', () => {
+  it("should format a 429 API error with the vertex message", () => {
     const errorMessage =
       'got status: 429 Too Many Requests. {"error":{"code":429,"message":"Rate limit exceeded","status":"RESOURCE_EXHAUSTED"}}';
     const result = parseAndFormatApiError(errorMessage, AuthType.USE_VERTEX_AI);
-    expect(result).toContain('[API Error: Rate limit exceeded');
+    expect(result).toContain("[API Error: Rate limit exceeded");
     expect(result).toContain(vertexMessage);
   });
 
-  it('should return the original message if it is not a JSON error', () => {
-    const errorMessage = 'This is a plain old error message';
-    expect(parseAndFormatApiError(errorMessage)).toBe(
-      `[API Error: ${errorMessage}]`,
-    );
+  it("should return the original message if it is not a JSON error", () => {
+    const errorMessage = "This is a plain old error message";
+    expect(parseAndFormatApiError(errorMessage)).toBe(`[API Error: ${errorMessage}]`);
   });
 
-  it('should return the original message for malformed JSON', () => {
+  it("should return the original message for malformed JSON", () => {
     const errorMessage = '[Stream Error: {"error": "malformed}';
-    expect(parseAndFormatApiError(errorMessage)).toBe(
-      `[API Error: ${errorMessage}]`,
-    );
+    expect(parseAndFormatApiError(errorMessage)).toBe(`[API Error: ${errorMessage}]`);
   });
 
-  it('should handle JSON that does not match the ApiError structure', () => {
+  it("should handle JSON that does not match the ApiError structure", () => {
     const errorMessage = '[Stream Error: {"not_an_error": "some other json"}]';
-    expect(parseAndFormatApiError(errorMessage)).toBe(
-      `[API Error: ${errorMessage}]`,
-    );
+    expect(parseAndFormatApiError(errorMessage)).toBe(`[API Error: ${errorMessage}]`);
   });
 
-  it('should format a nested API error', () => {
+  it("should format a nested API error", () => {
     const nestedErrorMessage = JSON.stringify({
       error: {
         code: 429,
         message:
           "Gemini 2.5 Pro Preview doesn't have a free quota tier. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.",
-        status: 'RESOURCE_EXHAUSTED',
+        status: "RESOURCE_EXHAUSTED",
       },
     });
 
@@ -81,37 +75,37 @@ describe('parseAndFormatApiError', () => {
       error: {
         code: 429,
         message: nestedErrorMessage,
-        status: 'Too Many Requests',
+        status: "Too Many Requests",
       },
     });
 
     const result = parseAndFormatApiError(errorMessage, AuthType.USE_GEMINI);
-    expect(result).toContain('Gemini 2.5 Pro Preview');
+    expect(result).toContain("Gemini 2.5 Pro Preview");
     expect(result).toContain(geminiMessage);
   });
 
-  it('should format a StructuredError', () => {
+  it("should format a StructuredError", () => {
     const error: StructuredError = {
-      message: 'A structured error occurred',
+      message: "A structured error occurred",
       status: 500,
     };
-    const expected = '[API Error: A structured error occurred]';
+    const expected = "[API Error: A structured error occurred]";
     expect(parseAndFormatApiError(error)).toBe(expected);
   });
 
-  it('should format a 429 StructuredError with the vertex message', () => {
+  it("should format a 429 StructuredError with the vertex message", () => {
     const error: StructuredError = {
-      message: 'Rate limit exceeded',
+      message: "Rate limit exceeded",
       status: 429,
     };
     const result = parseAndFormatApiError(error, AuthType.USE_VERTEX_AI);
-    expect(result).toContain('[API Error: Rate limit exceeded]');
+    expect(result).toContain("[API Error: Rate limit exceeded]");
     expect(result).toContain(vertexMessage);
   });
 
-  it('should handle an unknown error type', () => {
+  it("should handle an unknown error type", () => {
     const error = 12345;
-    const expected = '[API Error: An unknown error occurred.]';
+    const expected = "[API Error: An unknown error occurred.]";
     expect(parseAndFormatApiError(error)).toBe(expected);
   });
 });
diff --git a/packages/gemini-core/src/utils/errorParsing.ts b/packages/gemini-core/src/utils/errorParsing.ts
index bad61ea9e..2f27ecff6 100644
--- a/packages/gemini-core/src/utils/errorParsing.ts
+++ b/packages/gemini-core/src/utils/errorParsing.ts
@@ -4,24 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isApiError, isStructuredError } from './quotaErrorDetection.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import type { UserTierId } from '../code_assist/types.js';
-import { AuthType } from '../core/contentGenerator.js';
+import type { UserTierId } from "../code_assist/types.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+import { isApiError, isStructuredError } from "./quotaErrorDetection.js";
 
 const RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI =
-  '\nPlease wait and try again later. To increase your limits, request a quota increase through AI Studio, or switch to another /auth method';
+  "\nPlease wait and try again later. To increase your limits, request a quota increase through AI Studio, or switch to another /auth method";
 const RATE_LIMIT_ERROR_MESSAGE_VERTEX =
-  '\nPlease wait and try again later. To increase your limits, request a quota increase through Vertex, or switch to another /auth method';
-const getRateLimitErrorMessageDefault = (
-  fallbackModel: string = DEFAULT_GEMINI_FLASH_MODEL,
-) =>
+  "\nPlease wait and try again later. To increase your limits, request a quota increase through Vertex, or switch to another /auth method";
+const getRateLimitErrorMessageDefault = (fallbackModel: string = DEFAULT_GEMINI_FLASH_MODEL) =>
   `\nPossible quota limitations in place or slow response times detected. Switching to the ${fallbackModel} model for the rest of this session.`;
 
-function getRateLimitMessage(
-  authType?: AuthType,
-  fallbackModel?: string,
-): string {
+function getRateLimitMessage(authType?: AuthType, fallbackModel?: string): string {
   switch (authType) {
     case AuthType.USE_GEMINI:
       return RATE_LIMIT_ERROR_MESSAGE_USE_GEMINI;
@@ -48,8 +43,8 @@ export function parseAndFormatApiError(
   }
 
   // The error message might be a string containing a JSON object.
-  if (typeof error === 'string') {
-    const jsonStart = error.indexOf('{');
+  if (typeof error === "string") {
+    const jsonStart = error.indexOf("{");
     if (jsonStart === -1) {
       return `[API Error: ${error}]`; // Not a JSON error, return as is.
     }
@@ -81,5 +76,5 @@ export function parseAndFormatApiError(
     return `[API Error: ${error}]`;
   }
 
-  return '[API Error: An unknown error occurred.]';
+  return "[API Error: An unknown error occurred.]";
 }
diff --git a/packages/gemini-core/src/utils/errorReporting.test.ts b/packages/gemini-core/src/utils/errorReporting.test.ts
index 6b92c2499..8f334a96e 100644
--- a/packages/gemini-core/src/utils/errorReporting.test.ts
+++ b/packages/gemini-core/src/utils/errorReporting.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-import { reportError } from './errorReporting.js';
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { reportError } from "./errorReporting.js";
 
 // Use a type alias for SpyInstance as it's not directly exported
 type SpyInstance = ReturnType<typeof vi.spyOn>;
 
-describe('reportError', () => {
+describe("reportError", () => {
   let consoleErrorSpy: SpyInstance;
   let testDir: string;
-  const MOCK_TIMESTAMP = '2025-01-01T00-00-00-000Z';
+  const MOCK_TIMESTAMP = "2025-01-01T00-00-00-000Z";
 
   beforeEach(async () => {
     // Create a temporary directory for logs
-    testDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-report-test-'));
+    testDir = await fs.mkdtemp(path.join(os.tmpdir(), "gemini-report-test-"));
     vi.resetAllMocks();
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(Date.prototype, 'toISOString').mockReturnValue(MOCK_TIMESTAMP);
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    vi.spyOn(Date.prototype, "toISOString").mockReturnValue(MOCK_TIMESTAMP);
   });
 
   afterEach(async () => {
@@ -35,22 +35,22 @@ describe('reportError', () => {
   const getExpectedReportPath = (type: string) =>
     path.join(testDir, `gemini-client-error-${type}-${MOCK_TIMESTAMP}.json`);
 
-  it('should generate a report and log the path', async () => {
-    const error = new Error('Test error');
-    error.stack = 'Test stack';
-    const baseMessage = 'An error occurred.';
-    const context = { data: 'test context' };
-    const type = 'test-type';
+  it("should generate a report and log the path", async () => {
+    const error = new Error("Test error");
+    error.stack = "Test stack";
+    const baseMessage = "An error occurred.";
+    const context = { data: "test context" };
+    const type = "test-type";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, context, type, testDir);
 
     // Verify the file was written
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Test error', stack: 'Test stack' },
+      error: { message: "Test error", stack: "Test stack" },
       context,
     });
 
@@ -60,19 +60,19 @@ describe('reportError', () => {
     );
   });
 
-  it('should handle errors that are plain objects with a message property', async () => {
-    const error = { message: 'Test plain object error' };
-    const baseMessage = 'Another error.';
-    const type = 'general';
+  it("should handle errors that are plain objects with a message property", async () => {
+    const error = { message: "Test plain object error" };
+    const baseMessage = "Another error.";
+    const type = "general";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, undefined, type, testDir);
 
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Test plain object error' },
+      error: { message: "Test plain object error" },
     });
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -80,19 +80,19 @@ describe('reportError', () => {
     );
   });
 
-  it('should handle string errors', async () => {
-    const error = 'Just a string error';
-    const baseMessage = 'String error occurred.';
-    const type = 'general';
+  it("should handle string errors", async () => {
+    const error = "Just a string error";
+    const baseMessage = "String error occurred.";
+    const type = "general";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, undefined, type, testDir);
 
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Just a string error' },
+      error: { message: "Just a string error" },
     });
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -100,12 +100,12 @@ describe('reportError', () => {
     );
   });
 
-  it('should log fallback message if writing report fails', async () => {
-    const error = new Error('Main error');
-    const baseMessage = 'Failed operation.';
-    const context = ['some context'];
-    const type = 'general';
-    const nonExistentDir = path.join(testDir, 'non-existent-dir');
+  it("should log fallback message if writing report fails", async () => {
+    const error = new Error("Main error");
+    const baseMessage = "Failed operation.";
+    const context = ["some context"];
+    const type = "general";
+    const nonExistentDir = path.join(testDir, "non-existent-dir");
 
     await reportError(error, baseMessage, context, type, nonExistentDir);
 
@@ -114,27 +114,25 @@ describe('reportError', () => {
       expect.any(Error), // The actual write error
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Original error that triggered report generation:',
+      "Original error that triggered report generation:",
       error,
     );
-    expect(consoleErrorSpy).toHaveBeenCalledWith('Original context:', context);
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Original context:", context);
   });
 
-  it('should handle stringification failure of report content (e.g. BigInt in context)', async () => {
-    const error = new Error('Main error');
-    error.stack = 'Main stack';
-    const baseMessage = 'Failed operation with BigInt.';
+  it("should handle stringification failure of report content (e.g. BigInt in context)", async () => {
+    const error = new Error("Main error");
+    error.stack = "Main stack";
+    const baseMessage = "Failed operation with BigInt.";
     const context = { a: BigInt(1) }; // BigInt cannot be stringified by JSON.stringify
-    const type = 'bigint-fail';
-    const stringifyError = new TypeError(
-      'Do not know how to serialize a BigInt',
-    );
+    const type = "bigint-fail";
+    const stringifyError = new TypeError("Do not know how to serialize a BigInt");
     const expectedMinimalReportPath = getExpectedReportPath(type);
 
     // Simulate JSON.stringify throwing an error for the full report
     const originalJsonStringify = JSON.stringify;
     let callCount = 0;
-    vi.spyOn(JSON, 'stringify').mockImplementation((value, replacer, space) => {
+    vi.spyOn(JSON, "stringify").mockImplementation((value, replacer, space) => {
       callCount++;
       if (callCount === 1) {
         // First call is for the full report content
@@ -151,15 +149,15 @@ describe('reportError', () => {
       stringifyError,
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Original error that triggered report generation:',
+      "Original error that triggered report generation:",
       error,
     );
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Original context could not be stringified or included in report.',
+      "Original context could not be stringified or included in report.",
     );
 
     // Check that it writes a minimal report
-    const reportContent = await fs.readFile(expectedMinimalReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedMinimalReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
     expect(parsedReport).toEqual({
       error: { message: error.message, stack: error.stack },
@@ -170,20 +168,20 @@ describe('reportError', () => {
     );
   });
 
-  it('should generate a report without context if context is not provided', async () => {
-    const error = new Error('Error without context');
-    error.stack = 'No context stack';
-    const baseMessage = 'Simple error.';
-    const type = 'general';
+  it("should generate a report without context if context is not provided", async () => {
+    const error = new Error("Error without context");
+    error.stack = "No context stack";
+    const baseMessage = "Simple error.";
+    const type = "general";
     const expectedReportPath = getExpectedReportPath(type);
 
     await reportError(error, baseMessage, undefined, type, testDir);
 
-    const reportContent = await fs.readFile(expectedReportPath, 'utf-8');
+    const reportContent = await fs.readFile(expectedReportPath, "utf-8");
     const parsedReport = JSON.parse(reportContent);
 
     expect(parsedReport).toEqual({
-      error: { message: 'Error without context', stack: 'No context stack' },
+      error: { message: "Error without context", stack: "No context stack" },
     });
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
diff --git a/packages/gemini-core/src/utils/errorReporting.ts b/packages/gemini-core/src/utils/errorReporting.ts
index 9743d3241..bf7bc27f3 100644
--- a/packages/gemini-core/src/utils/errorReporting.ts
+++ b/packages/gemini-core/src/utils/errorReporting.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-import type { Content } from '@google/genai';
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import type { Content } from "@google/genai";
 
 interface ErrorReportData {
   error: { message: string; stack?: string } | { message: string };
@@ -26,21 +26,17 @@ export async function reportError(
   error: Error | unknown,
   baseMessage: string,
   context?: Content[] | Record<string, unknown> | unknown[],
-  type = 'general',
+  type = "general",
   reportingDir = os.tmpdir(), // for testing
 ): Promise<void> {
-  const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+  const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
   const reportFileName = `gemini-client-error-${type}-${timestamp}.json`;
   const reportPath = path.join(reportingDir, reportFileName);
 
   let errorToReport: { message: string; stack?: string };
   if (error instanceof Error) {
     errorToReport = { message: error.message, stack: error.stack };
-  } else if (
-    typeof error === 'object' &&
-    error !== null &&
-    'message' in error
-  ) {
+  } else if (typeof error === "object" && error !== null && "message" in error) {
     errorToReport = {
       message: String((error as { message: unknown }).message),
     };
@@ -63,11 +59,9 @@ export async function reportError(
       `${baseMessage} Could not stringify report content (likely due to context):`,
       stringifyError,
     );
-    console.error('Original error that triggered report generation:', error);
+    console.error("Original error that triggered report generation:", error);
     if (context) {
-      console.error(
-        'Original context could not be stringified or included in report.',
-      );
+      console.error("Original context could not be stringified or included in report.");
     }
     // Fallback: try to report only the error if context was the issue
     try {
@@ -96,21 +90,21 @@ export async function reportError(
       writeError,
     );
     // Log the original error as a fallback if report writing fails
-    console.error('Original error that triggered report generation:', error);
+    console.error("Original error that triggered report generation:", error);
     if (context) {
       // Context was stringifiable, but writing the file failed.
       // We already have stringifiedReportContent, but it might be too large for console.
       // So, we try to log the original context object, and if that fails, its stringified version (truncated).
       try {
-        console.error('Original context:', context);
+        console.error("Original context:", context);
       } catch {
         try {
           console.error(
-            'Original context (stringified, truncated):',
+            "Original context (stringified, truncated):",
             JSON.stringify(context).substring(0, 1000),
           );
         } catch {
-          console.error('Original context could not be logged or stringified.');
+          console.error("Original context could not be logged or stringified.");
         }
       }
     }
diff --git a/packages/gemini-core/src/utils/errors.ts b/packages/gemini-core/src/utils/errors.ts
index fa5d8bf6d..80ecf6987 100644
--- a/packages/gemini-core/src/utils/errors.ts
+++ b/packages/gemini-core/src/utils/errors.ts
@@ -11,7 +11,7 @@ interface GaxiosError {
 }
 
 export function isNodeError(error: unknown): error is NodeJS.ErrnoException {
-  return error instanceof Error && 'code' in error;
+  return error instanceof Error && "code" in error;
 }
 
 export function getErrorMessage(error: unknown): string {
@@ -21,7 +21,7 @@ export function getErrorMessage(error: unknown): string {
   try {
     return String(error);
   } catch {
-    return 'Failed to get error details';
+    return "Failed to get error details";
   }
 }
 
@@ -71,9 +71,9 @@ export class FatalCancellationError extends FatalError {
 }
 
 export class CanceledError extends Error {
-  constructor(message = 'The operation was canceled.') {
+  constructor(message = "The operation was canceled.") {
     super(message);
-    this.name = 'CanceledError';
+    this.name = "CanceledError";
   }
 }
 
@@ -89,7 +89,7 @@ interface ResponseData {
 }
 
 export function toFriendlyError(error: unknown): unknown {
-  if (error && typeof error === 'object' && 'response' in error) {
+  if (error && typeof error === "object" && "response" in error) {
     const gaxiosError = error as GaxiosError;
     const data = parseResponseData(gaxiosError);
     if (data.error && data.error.message && data.error.code) {
@@ -112,7 +112,7 @@ export function toFriendlyError(error: unknown): unknown {
 
 function parseResponseData(error: GaxiosError): ResponseData {
   // Inexplicably, Gaxios sometimes doesn't JSONify the response data.
-  if (typeof error.response?.data === 'string') {
+  if (typeof error.response?.data === "string") {
     return JSON.parse(error.response?.data) as ResponseData;
   }
   return error.response?.data as ResponseData;
diff --git a/packages/gemini-core/src/utils/events.test.ts b/packages/gemini-core/src/utils/events.test.ts
index 9ba660bf2..b72792ef5 100644
--- a/packages/gemini-core/src/utils/events.test.ts
+++ b/packages/gemini-core/src/utils/events.test.ts
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import {
-  CoreEventEmitter,
-  CoreEvent,
-  type UserFeedbackPayload,
-} from './events.js';
-
-describe('CoreEventEmitter', () => {
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { CoreEvent, CoreEventEmitter, type UserFeedbackPayload } from "./events.js";
+
+describe("CoreEventEmitter", () => {
   let events: CoreEventEmitter;
 
   beforeEach(() => {
     events = new CoreEventEmitter();
   });
 
-  it('should emit feedback immediately when a listener is present', () => {
+  it("should emit feedback immediately when a listener is present", () => {
     const listener = vi.fn();
     events.on(CoreEvent.UserFeedback, listener);
 
     const payload = {
-      severity: 'info' as const,
-      message: 'Test message',
+      severity: "info" as const,
+      message: "Test message",
     };
 
     events.emitFeedback(payload.severity, payload.message);
@@ -33,11 +29,11 @@ describe('CoreEventEmitter', () => {
     expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
   });
 
-  it('should buffer feedback when no listener is present', () => {
+  it("should buffer feedback when no listener is present", () => {
     const listener = vi.fn();
     const payload = {
-      severity: 'warning' as const,
-      message: 'Buffered message',
+      severity: "warning" as const,
+      message: "Buffered message",
     };
 
     // Emit while no listeners attached
@@ -52,12 +48,12 @@ describe('CoreEventEmitter', () => {
     expect(listener).toHaveBeenCalledWith(expect.objectContaining(payload));
   });
 
-  it('should respect the backlog size limit and maintain FIFO order', () => {
+  it("should respect the backlog size limit and maintain FIFO order", () => {
     const listener = vi.fn();
     const MAX_BACKLOG_SIZE = 10000;
 
     for (let i = 0; i < MAX_BACKLOG_SIZE + 10; i++) {
-      events.emitFeedback('info', `Message ${i}`);
+      events.emitFeedback("info", `Message ${i}`);
     }
 
     events.on(CoreEvent.UserFeedback, listener);
@@ -65,16 +61,16 @@ describe('CoreEventEmitter', () => {
 
     expect(listener).toHaveBeenCalledTimes(MAX_BACKLOG_SIZE);
     // Verify strictly that the FIRST call was Message 10 (0-9 dropped)
-    expect(listener.mock.calls[0][0]).toMatchObject({ message: 'Message 10' });
+    expect(listener.mock.calls[0][0]).toMatchObject({ message: "Message 10" });
     // Verify strictly that the LAST call was Message 109
     expect(listener.mock.lastCall?.[0]).toMatchObject({
       message: `Message ${MAX_BACKLOG_SIZE + 9}`,
     });
   });
 
-  it('should clear the backlog after draining', () => {
+  it("should clear the backlog after draining", () => {
     const listener = vi.fn();
-    events.emitFeedback('error', 'Test error');
+    events.emitFeedback("error", "Test error");
 
     events.on(CoreEvent.UserFeedback, listener);
     events.drainFeedbackBacklog();
@@ -85,55 +81,55 @@ describe('CoreEventEmitter', () => {
     expect(listener).not.toHaveBeenCalled();
   });
 
-  it('should include optional error object in payload', () => {
+  it("should include optional error object in payload", () => {
     const listener = vi.fn();
     events.on(CoreEvent.UserFeedback, listener);
 
-    const error = new Error('Original error');
-    events.emitFeedback('error', 'Something went wrong', error);
+    const error = new Error("Original error");
+    events.emitFeedback("error", "Something went wrong", error);
 
     expect(listener).toHaveBeenCalledWith(
       expect.objectContaining({
-        severity: 'error',
-        message: 'Something went wrong',
+        severity: "error",
+        message: "Something went wrong",
         error,
       }),
     );
   });
 
-  it('should handle multiple listeners correctly', () => {
+  it("should handle multiple listeners correctly", () => {
     const listenerA = vi.fn();
     const listenerB = vi.fn();
 
     events.on(CoreEvent.UserFeedback, listenerA);
     events.on(CoreEvent.UserFeedback, listenerB);
 
-    events.emitFeedback('info', 'Broadcast message');
+    events.emitFeedback("info", "Broadcast message");
 
     expect(listenerA).toHaveBeenCalledTimes(1);
     expect(listenerB).toHaveBeenCalledTimes(1);
   });
 
-  it('should stop receiving events after off() is called', () => {
+  it("should stop receiving events after off() is called", () => {
     const listener = vi.fn();
     events.on(CoreEvent.UserFeedback, listener);
 
-    events.emitFeedback('info', 'First message');
+    events.emitFeedback("info", "First message");
     expect(listener).toHaveBeenCalledTimes(1);
 
     events.off(CoreEvent.UserFeedback, listener);
-    events.emitFeedback('info', 'Second message');
+    events.emitFeedback("info", "Second message");
     expect(listener).toHaveBeenCalledTimes(1); // Still 1
   });
 
-  it('should handle re-entrant feedback emission during draining safely', () => {
-    events.emitFeedback('info', 'Buffered 1');
-    events.emitFeedback('info', 'Buffered 2');
+  it("should handle re-entrant feedback emission during draining safely", () => {
+    events.emitFeedback("info", "Buffered 1");
+    events.emitFeedback("info", "Buffered 2");
 
     const listener = vi.fn((payload: UserFeedbackPayload) => {
       // When 'Buffered 1' is received, immediately emit another event.
-      if (payload.message === 'Buffered 1') {
-        events.emitFeedback('warning', 'Re-entrant message');
+      if (payload.message === "Buffered 1") {
+        events.emitFeedback("warning", "Re-entrant message");
       }
     });
 
@@ -150,19 +146,19 @@ describe('CoreEventEmitter', () => {
     // 7. listener fires for 'Buffered 2'
 
     expect(listener).toHaveBeenCalledTimes(3);
-    expect(listener.mock.calls[0][0]).toMatchObject({ message: 'Buffered 1' });
+    expect(listener.mock.calls[0][0]).toMatchObject({ message: "Buffered 1" });
     expect(listener.mock.calls[1][0]).toMatchObject({
-      message: 'Re-entrant message',
+      message: "Re-entrant message",
     });
-    expect(listener.mock.calls[2][0]).toMatchObject({ message: 'Buffered 2' });
+    expect(listener.mock.calls[2][0]).toMatchObject({ message: "Buffered 2" });
   });
 
-  describe('ModelChanged Event', () => {
-    it('should emit ModelChanged event with correct payload', () => {
+  describe("ModelChanged Event", () => {
+    it("should emit ModelChanged event with correct payload", () => {
       const listener = vi.fn();
       events.on(CoreEvent.ModelChanged, listener);
 
-      const newModel = 'gemini-2.5-pro';
+      const newModel = "gemini-2.5-pro";
       events.emitModelChanged(newModel);
 
       expect(listener).toHaveBeenCalledTimes(1);
diff --git a/packages/gemini-core/src/utils/events.ts b/packages/gemini-core/src/utils/events.ts
index 3df9c39a9..6728da15c 100644
--- a/packages/gemini-core/src/utils/events.ts
+++ b/packages/gemini-core/src/utils/events.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
-import type { LoadServerHierarchicalMemoryResponse } from './memoryDiscovery.js';
+import { EventEmitter } from "node:events";
+import type { LoadServerHierarchicalMemoryResponse } from "./memoryDiscovery.js";
 
 /**
  * Defines the severity level for user-facing feedback.
  * This maps loosely to UI `MessageType`
  */
-export type FeedbackSeverity = 'info' | 'warning' | 'error';
+export type FeedbackSeverity = "info" | "warning" | "error";
 
 /**
  * Payload for the 'user-feedback' event.
@@ -60,10 +60,10 @@ export interface ModelChangedPayload {
 export type MemoryChangedPayload = LoadServerHierarchicalMemoryResponse;
 
 export enum CoreEvent {
-  UserFeedback = 'user-feedback',
-  FallbackModeChanged = 'fallback-mode-changed',
-  ModelChanged = 'model-changed',
-  MemoryChanged = 'memory-changed',
+  UserFeedback = "user-feedback",
+  FallbackModeChanged = "fallback-mode-changed",
+  ModelChanged = "model-changed",
+  MemoryChanged = "memory-changed",
 }
 
 export interface CoreEvents {
@@ -85,11 +85,7 @@ export class CoreEventEmitter extends EventEmitter<CoreEvents> {
    * Sends actionable feedback to the user.
    * Buffers automatically if the UI hasn't subscribed yet.
    */
-  emitFeedback(
-    severity: FeedbackSeverity,
-    message: string,
-    error?: unknown,
-  ): void {
+  emitFeedback(severity: FeedbackSeverity, message: string, error?: unknown): void {
     const payload: UserFeedbackPayload = { severity, message, error };
 
     if (this.listenerCount(CoreEvent.UserFeedback) === 0) {
diff --git a/packages/gemini-core/src/utils/extensionLoader.test.ts b/packages/gemini-core/src/utils/extensionLoader.test.ts
index a9328ccd7..4a241fda9 100644
--- a/packages/gemini-core/src/utils/extensionLoader.test.ts
+++ b/packages/gemini-core/src/utils/extensionLoader.test.ts
@@ -4,54 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  expect,
-  it,
-  vi,
-  beforeEach,
-  afterEach,
-  type MockInstance,
-} from 'vitest';
-import { SimpleExtensionLoader } from './extensionLoader.js';
-import type { Config, GeminiCLIExtension } from '../config/config.js';
-import { type McpClientManager } from '../tools/mcp-client-manager.js';
-import type { GeminiClient } from '../core/client.js';
+import { afterEach, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest";
+import type { Config, GeminiCLIExtension } from "../config/config.js";
+import type { GeminiClient } from "../core/client.js";
+import { type McpClientManager } from "../tools/mcp-client-manager.js";
+import { SimpleExtensionLoader } from "./extensionLoader.js";
 
 const mockRefreshServerHierarchicalMemory = vi.hoisted(() => vi.fn());
 
-vi.mock('./memoryDiscovery.js', async (importActual) => {
-  const actual = await importActual<typeof import('./memoryDiscovery.js')>();
+vi.mock("./memoryDiscovery.js", async (importActual) => {
+  const actual = await importActual<typeof import("./memoryDiscovery.js")>();
   return {
     ...actual,
     refreshServerHierarchicalMemory: mockRefreshServerHierarchicalMemory,
   };
 });
 
-describe('SimpleExtensionLoader', () => {
+describe("SimpleExtensionLoader", () => {
   let mockConfig: Config;
   let extensionReloadingEnabled: boolean;
   let mockMcpClientManager: McpClientManager;
-  let mockGeminiClientSetTools: MockInstance<
-    typeof GeminiClient.prototype.setTools
-  >;
+  let mockGeminiClientSetTools: MockInstance<typeof GeminiClient.prototype.setTools>;
 
   const activeExtension: GeminiCLIExtension = {
-    name: 'test-extension',
+    name: "test-extension",
     isActive: true,
-    version: '1.0.0',
-    path: '/path/to/extension',
+    version: "1.0.0",
+    path: "/path/to/extension",
     contextFiles: [],
-    excludeTools: ['some-tool'],
-    id: '123',
+    excludeTools: ["some-tool"],
+    id: "123",
   };
   const inactiveExtension: GeminiCLIExtension = {
-    name: 'test-extension',
+    name: "test-extension",
     isActive: false,
-    version: '1.0.0',
-    path: '/path/to/extension',
+    version: "1.0.0",
+    path: "/path/to/extension",
     contextFiles: [],
-    id: '123',
+    id: "123",
   };
 
   beforeEach(() => {
@@ -75,22 +65,20 @@ describe('SimpleExtensionLoader', () => {
     vi.restoreAllMocks();
   });
 
-  it('should start active extensions', async () => {
+  it("should start active extensions", async () => {
     const loader = new SimpleExtensionLoader([activeExtension]);
     await loader.start(mockConfig);
-    expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(
-      activeExtension,
-    );
+    expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
   });
 
-  it('should not start inactive extensions', async () => {
+  it("should not start inactive extensions", async () => {
     const loader = new SimpleExtensionLoader([inactiveExtension]);
     await loader.start(mockConfig);
     expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
   });
 
-  describe('interactive extension loading and unloading', () => {
-    it('should not call `start` or `stop` if the loader is not already started', async () => {
+  describe("interactive extension loading and unloading", () => {
+    it("should not call `start` or `stop` if the loader is not already started", async () => {
       const loader = new SimpleExtensionLoader([]);
       await loader.loadExtension(activeExtension);
       expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
@@ -98,83 +86,78 @@ describe('SimpleExtensionLoader', () => {
       expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
     });
 
-    it('should start extensions that were explicitly loaded prior to initializing the loader', async () => {
+    it("should start extensions that were explicitly loaded prior to initializing the loader", async () => {
       const loader = new SimpleExtensionLoader([]);
       await loader.loadExtension(activeExtension);
       expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
       await loader.start(mockConfig);
-      expect(
-        mockMcpClientManager.startExtension,
-      ).toHaveBeenCalledExactlyOnceWith(activeExtension);
+      expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(activeExtension);
     });
 
-    describe.each([true, false])(
-      'when enableExtensionReloading === $i',
-      (reloadingEnabled) => {
-        beforeEach(() => {
-          extensionReloadingEnabled = reloadingEnabled;
-        });
-
-        it(`should ${reloadingEnabled ? '' : 'not '}reload extension features`, async () => {
-          const loader = new SimpleExtensionLoader([]);
-          await loader.start(mockConfig);
+    describe.each([true, false])("when enableExtensionReloading === $i", (reloadingEnabled) => {
+      beforeEach(() => {
+        extensionReloadingEnabled = reloadingEnabled;
+      });
+
+      it(`should ${reloadingEnabled ? "" : "not "}reload extension features`, async () => {
+        const loader = new SimpleExtensionLoader([]);
+        await loader.start(mockConfig);
+        expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+        await loader.loadExtension(activeExtension);
+        if (reloadingEnabled) {
+          expect(mockMcpClientManager.startExtension).toHaveBeenCalledExactlyOnceWith(
+            activeExtension,
+          );
+          expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
+          expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
+        } else {
           expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
+          expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
+          expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
+        }
+        mockRefreshServerHierarchicalMemory.mockClear();
+        mockGeminiClientSetTools.mockClear();
+
+        await loader.unloadExtension(activeExtension);
+        if (reloadingEnabled) {
+          expect(mockMcpClientManager.stopExtension).toHaveBeenCalledExactlyOnceWith(
+            activeExtension,
+          );
+          expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
+          expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
+        } else {
+          expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
+          expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
+          expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
+        }
+      });
+
+      it.runIf(reloadingEnabled)(
+        "Should only reload memory once all extensions are done",
+        async () => {
+          const anotherExtension = {
+            ...activeExtension,
+            name: "another-extension",
+          };
+          const loader = new SimpleExtensionLoader([]);
           await loader.loadExtension(activeExtension);
-          if (reloadingEnabled) {
-            expect(
-              mockMcpClientManager.startExtension,
-            ).toHaveBeenCalledExactlyOnceWith(activeExtension);
-            expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
-            expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
-          } else {
-            expect(mockMcpClientManager.startExtension).not.toHaveBeenCalled();
-            expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
-            expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
-          }
-          mockRefreshServerHierarchicalMemory.mockClear();
-          mockGeminiClientSetTools.mockClear();
-
-          await loader.unloadExtension(activeExtension);
-          if (reloadingEnabled) {
-            expect(
-              mockMcpClientManager.stopExtension,
-            ).toHaveBeenCalledExactlyOnceWith(activeExtension);
-            expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
-            expect(mockGeminiClientSetTools).toHaveBeenCalledOnce();
-          } else {
-            expect(mockMcpClientManager.stopExtension).not.toHaveBeenCalled();
-            expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
-            expect(mockGeminiClientSetTools).not.toHaveBeenCalledOnce();
-          }
-        });
-
-        it.runIf(reloadingEnabled)(
-          'Should only reload memory once all extensions are done',
-          async () => {
-            const anotherExtension = {
-              ...activeExtension,
-              name: 'another-extension',
-            };
-            const loader = new SimpleExtensionLoader([]);
-            await loader.loadExtension(activeExtension);
-            await loader.start(mockConfig);
-            expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
-            await Promise.all([
-              loader.unloadExtension(activeExtension),
-              loader.loadExtension(anotherExtension),
-            ]);
-            expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
-          },
-        );
-      },
-    );
+          await loader.start(mockConfig);
+          expect(mockRefreshServerHierarchicalMemory).not.toHaveBeenCalled();
+          await Promise.all([
+            loader.unloadExtension(activeExtension),
+            loader.loadExtension(anotherExtension),
+          ]);
+          expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
+        },
+      );
+    });
   });
 
-  describe('restartExtension', () => {
-    it('should stop and then start the extension', async () => {
+  describe("restartExtension", () => {
+    it("should stop and then start the extension", async () => {
       const loader = new TestingSimpleExtensionLoader([activeExtension]);
-      vi.spyOn(loader, 'stopExtension');
-      vi.spyOn(loader, 'startExtension');
+      vi.spyOn(loader, "stopExtension");
+      vi.spyOn(loader, "startExtension");
       await loader.start(mockConfig);
       await loader.restartExtension(activeExtension);
       expect(loader.stopExtension).toHaveBeenCalledWith(activeExtension);
diff --git a/packages/gemini-core/src/utils/extensionLoader.ts b/packages/gemini-core/src/utils/extensionLoader.ts
index 707f30cb4..1ba223aa0 100644
--- a/packages/gemini-core/src/utils/extensionLoader.ts
+++ b/packages/gemini-core/src/utils/extensionLoader.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { EventEmitter } from 'node:events';
-import type { Config, GeminiCLIExtension } from '../config/config.js';
-import { refreshServerHierarchicalMemory } from './memoryDiscovery.js';
+import type { EventEmitter } from "node:events";
+import type { Config, GeminiCLIExtension } from "../config/config.js";
+import { refreshServerHierarchicalMemory } from "./memoryDiscovery.js";
 
 export abstract class ExtensionLoader {
   // Assigned in `start`.
@@ -41,7 +41,7 @@ export abstract class ExtensionLoader {
       if (!this.config) {
         this.config = config;
       } else {
-        throw new Error('Already started, you may only call `start` once.');
+        throw new Error("Already started, you may only call `start` once.");
       }
       await Promise.all(
         this.getExtensions()
@@ -64,10 +64,10 @@ export abstract class ExtensionLoader {
    */
   protected async startExtension(extension: GeminiCLIExtension) {
     if (!this.config) {
-      throw new Error('Cannot call `startExtension` prior to calling `start`.');
+      throw new Error("Cannot call `startExtension` prior to calling `start`.");
     }
     this.startingCount++;
-    this.eventEmitter?.emit('extensionsStarting', {
+    this.eventEmitter?.emit("extensionsStarting", {
       total: this.startingCount,
       completed: this.startCompletedCount,
     });
@@ -84,7 +84,7 @@ export abstract class ExtensionLoader {
       // useSlashCommandProcessor hook which responds to events fired here today.
     } finally {
       this.startCompletedCount++;
-      this.eventEmitter?.emit('extensionsStarting', {
+      this.eventEmitter?.emit("extensionsStarting", {
         total: this.startingCount,
         completed: this.startCompletedCount,
       });
@@ -98,9 +98,7 @@ export abstract class ExtensionLoader {
 
   private async maybeRefreshMemories(): Promise<void> {
     if (!this.config) {
-      throw new Error(
-        'Cannot refresh gemini memories prior to calling `start`.',
-      );
+      throw new Error("Cannot refresh gemini memories prior to calling `start`.");
     }
     if (
       !this.isStarting && // Don't refresh memories on the first call to `start`.
@@ -118,9 +116,7 @@ export abstract class ExtensionLoader {
    * Refreshes the gemini tools list if it is initialized and the extension has
    * any excludeTools settings.
    */
-  private async maybeRefreshGeminiTools(
-    extension: GeminiCLIExtension,
-  ): Promise<void> {
+  private async maybeRefreshGeminiTools(extension: GeminiCLIExtension): Promise<void> {
     if (extension.excludeTools && extension.excludeTools.length > 0) {
       const geminiClient = this.config?.getGeminiClient();
       if (geminiClient?.isInitialized()) {
@@ -134,9 +130,7 @@ export abstract class ExtensionLoader {
    * then calls `startExtension` to include all extension features into the
    * program.
    */
-  protected maybeStartExtension(
-    extension: GeminiCLIExtension,
-  ): Promise<void> | undefined {
+  protected maybeStartExtension(extension: GeminiCLIExtension): Promise<void> | undefined {
     if (this.config && this.config.getEnableExtensionReloading()) {
       return this.startExtension(extension);
     }
@@ -154,10 +148,10 @@ export abstract class ExtensionLoader {
    */
   protected async stopExtension(extension: GeminiCLIExtension) {
     if (!this.config) {
-      throw new Error('Cannot call `stopExtension` prior to calling `start`.');
+      throw new Error("Cannot call `stopExtension` prior to calling `start`.");
     }
     this.stoppingCount++;
-    this.eventEmitter?.emit('extensionsStopping', {
+    this.eventEmitter?.emit("extensionsStopping", {
       total: this.stoppingCount,
       completed: this.stopCompletedCount,
     });
@@ -175,7 +169,7 @@ export abstract class ExtensionLoader {
       // useSlashCommandProcessor hook which responds to events fired here today.
     } finally {
       this.stopCompletedCount++;
-      this.eventEmitter?.emit('extensionsStopping', {
+      this.eventEmitter?.emit("extensionsStopping", {
         total: this.stoppingCount,
         completed: this.stopCompletedCount,
       });
@@ -192,9 +186,7 @@ export abstract class ExtensionLoader {
    * then this also performs all necessary steps to remove all extension
    * features from the rest of the system.
    */
-  protected maybeStopExtension(
-    extension: GeminiCLIExtension,
-  ): Promise<void> | undefined {
+  protected maybeStopExtension(extension: GeminiCLIExtension): Promise<void> | undefined {
     if (this.config && this.config.getEnableExtensionReloading()) {
       return this.stopExtension(extension);
     }
diff --git a/packages/gemini-core/src/utils/fetch.ts b/packages/gemini-core/src/utils/fetch.ts
index ba9bb83c8..89fd0515a 100644
--- a/packages/gemini-core/src/utils/fetch.ts
+++ b/packages/gemini-core/src/utils/fetch.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getErrorMessage, isNodeError } from './errors.js';
-import { URL } from 'node:url';
-import { ProxyAgent, setGlobalDispatcher } from 'undici';
+import { URL } from "node:url";
+import { ProxyAgent, setGlobalDispatcher } from "undici";
+import { getErrorMessage, isNodeError } from "./errors.js";
 
 const PRIVATE_IP_RANGES = [
   /^10\./,
@@ -24,7 +24,7 @@ export class FetchError extends Error {
     public code?: string,
   ) {
     super(message);
-    this.name = 'FetchError';
+    this.name = "FetchError";
   }
 }
 
@@ -37,10 +37,7 @@ export function isPrivateIp(url: string): boolean {
   }
 }
 
-export async function fetchWithTimeout(
-  url: string,
-  timeout: number,
-): Promise<Response> {
+export async function fetchWithTimeout(url: string, timeout: number): Promise<Response> {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), timeout);
 
@@ -48,8 +45,8 @@ export async function fetchWithTimeout(
     const response = await fetch(url, { signal: controller.signal });
     return response;
   } catch (error) {
-    if (isNodeError(error) && error.code === 'ABORT_ERR') {
-      throw new FetchError(`Request timed out after ${timeout}ms`, 'ETIMEDOUT');
+    if (isNodeError(error) && error.code === "ABORT_ERR") {
+      throw new FetchError(`Request timed out after ${timeout}ms`, "ETIMEDOUT");
     }
     throw new FetchError(getErrorMessage(error));
   } finally {
diff --git a/packages/gemini-core/src/utils/fileUtils.test.ts b/packages/gemini-core/src/utils/fileUtils.test.ts
index e0015e105..e4d7cd07a 100644
--- a/packages/gemini-core/src/utils/fileUtils.test.ts
+++ b/packages/gemini-core/src/utils/fileUtils.test.ts
@@ -4,45 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-
-import * as actualNodeFs from 'node:fs'; // For setup/teardown
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import os from 'node:os';
-import { fileURLToPath } from 'node:url';
+import fs, * as actualNodeFs from "node:fs";
+import fsPromises from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 // eslint-disable-next-line import/no-internal-modules
-import mime from 'mime/lite';
-
+import mime from "mime/lite";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
 import {
-  isWithinRoot,
-  isBinaryFile,
+  detectBOM,
   detectFileType,
+  fileExists,
+  isBinaryFile,
+  isWithinRoot,
   processSingleFileContent,
-  detectBOM,
   readFileWithEncoding,
-  fileExists,
   readWasmBinaryFromDisk,
-} from './fileUtils.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
+} from "./fileUtils.js";
 
-vi.mock('mime/lite', () => ({
+vi.mock("mime/lite", () => ({
   default: { getType: vi.fn() },
   getType: vi.fn(),
 }));
 
 const mockMimeGetType = mime.getType as Mock;
 
-describe('fileUtils', () => {
+describe("fileUtils", () => {
   let tempRootDir: string;
   const originalProcessCwd = process.cwd;
 
@@ -56,17 +45,15 @@ describe('fileUtils', () => {
   beforeEach(() => {
     vi.resetAllMocks(); // Reset all mocks, including mime.getType
 
-    tempRootDir = actualNodeFs.mkdtempSync(
-      path.join(os.tmpdir(), 'fileUtils-test-'),
-    );
+    tempRootDir = actualNodeFs.mkdtempSync(path.join(os.tmpdir(), "fileUtils-test-"));
     process.cwd = vi.fn(() => tempRootDir); // Mock cwd if necessary for relative path logic within tests
 
-    testTextFilePath = path.join(tempRootDir, 'test.txt');
-    testImageFilePath = path.join(tempRootDir, 'image.png');
-    testPdfFilePath = path.join(tempRootDir, 'document.pdf');
-    testBinaryFilePath = path.join(tempRootDir, 'app.exe');
-    nonexistentFilePath = path.join(tempRootDir, 'nonexistent.txt');
-    directoryPath = path.join(tempRootDir, 'subdir');
+    testTextFilePath = path.join(tempRootDir, "test.txt");
+    testImageFilePath = path.join(tempRootDir, "image.png");
+    testPdfFilePath = path.join(tempRootDir, "document.pdf");
+    testBinaryFilePath = path.join(tempRootDir, "app.exe");
+    nonexistentFilePath = path.join(tempRootDir, "nonexistent.txt");
+    directoryPath = path.join(tempRootDir, "subdir");
 
     actualNodeFs.mkdirSync(directoryPath, { recursive: true }); // Ensure subdir exists
   });
@@ -79,119 +66,111 @@ describe('fileUtils', () => {
     vi.restoreAllMocks(); // Restore any spies
   });
 
-  describe('readWasmBinaryFromDisk', () => {
-    it('loads a WASM binary from disk as a Uint8Array', async () => {
-      const wasmFixtureUrl = new URL(
-        './__fixtures__/dummy.wasm',
-        import.meta.url,
-      );
+  describe("readWasmBinaryFromDisk", () => {
+    it("loads a WASM binary from disk as a Uint8Array", async () => {
+      const wasmFixtureUrl = new URL("./__fixtures__/dummy.wasm", import.meta.url);
       const wasmFixturePath = fileURLToPath(wasmFixtureUrl);
       const result = await readWasmBinaryFromDisk(wasmFixturePath);
-      const expectedBytes = new Uint8Array(
-        await fsPromises.readFile(wasmFixturePath),
-      );
+      const expectedBytes = new Uint8Array(await fsPromises.readFile(wasmFixturePath));
 
       expect(result).toBeInstanceOf(Uint8Array);
       expect(result).toStrictEqual(expectedBytes);
     });
   });
 
-  describe('isWithinRoot', () => {
-    const defaultRoot = path.resolve('/project/root');
+  describe("isWithinRoot", () => {
+    const defaultRoot = path.resolve("/project/root");
 
     it.each([
       {
-        name: 'a path directly within the root',
-        path: path.join(defaultRoot, 'file.txt'),
+        name: "a path directly within the root",
+        path: path.join(defaultRoot, "file.txt"),
         expected: true,
       },
       {
-        name: 'a path in a subdirectory within the root',
-        path: path.join(defaultRoot, 'subdir', 'file.txt'),
+        name: "a path in a subdirectory within the root",
+        path: path.join(defaultRoot, "subdir", "file.txt"),
         expected: true,
       },
-      { name: 'the root path itself', path: defaultRoot, expected: true },
+      { name: "the root path itself", path: defaultRoot, expected: true },
       {
-        name: 'a path with a trailing slash',
-        path: path.join(defaultRoot, 'file.txt') + path.sep,
+        name: "a path with a trailing slash",
+        path: path.join(defaultRoot, "file.txt") + path.sep,
         expected: true,
       },
       {
-        name: 'the root path with a trailing slash',
+        name: "the root path with a trailing slash",
         path: defaultRoot + path.sep,
         expected: true,
       },
       {
-        name: 'a sub-path of the path to check',
-        path: path.resolve('/project/root/sub'),
-        root: path.resolve('/project/root'),
+        name: "a sub-path of the path to check",
+        path: path.resolve("/project/root/sub"),
+        root: path.resolve("/project/root"),
         expected: true,
       },
       {
-        name: 'a path outside the root',
-        path: path.resolve('/project/other', 'file.txt'),
+        name: "a path outside the root",
+        path: path.resolve("/project/other", "file.txt"),
         expected: false,
       },
       {
-        name: 'an unrelated path',
-        path: path.resolve('/unrelated', 'file.txt'),
+        name: "an unrelated path",
+        path: path.resolve("/unrelated", "file.txt"),
         expected: false,
       },
       {
-        name: 'a path that only partially matches the root prefix',
-        path: path.resolve('/project/root-but-actually-different'),
+        name: "a path that only partially matches the root prefix",
+        path: path.resolve("/project/root-but-actually-different"),
         expected: false,
       },
       {
-        name: 'a root path that is a sub-path of the path to check',
-        path: path.resolve('/project/root'),
-        root: path.resolve('/project/root/sub'),
+        name: "a root path that is a sub-path of the path to check",
+        path: path.resolve("/project/root"),
+        root: path.resolve("/project/root/sub"),
         expected: false,
       },
       {
-        name: 'a POSIX path inside',
-        path: '/project/root/file.txt',
-        root: '/project/root',
+        name: "a POSIX path inside",
+        path: "/project/root/file.txt",
+        root: "/project/root",
         expected: true,
       },
       {
-        name: 'a POSIX path outside',
-        path: '/project/other/file.txt',
-        root: '/project/root',
+        name: "a POSIX path outside",
+        path: "/project/other/file.txt",
+        root: "/project/root",
         expected: false,
       },
-    ])(
-      'should return $expected for $name',
-      ({ path: testPath, root, expected }) => {
-        expect(isWithinRoot(testPath, root || defaultRoot)).toBe(expected);
-      },
-    );
+    ])("should return $expected for $name", ({ path: testPath, root, expected }) => {
+      expect(isWithinRoot(testPath, root || defaultRoot)).toBe(expected);
+    });
   });
 
-  describe('fileExists', () => {
-    it('should return true if the file exists', async () => {
-      const testFile = path.join(tempRootDir, 'exists.txt');
-      actualNodeFs.writeFileSync(testFile, 'content');
+  describe("fileExists", () => {
+    it("should return true if the file exists", async () => {
+      const testFile = path.join(tempRootDir, "exists.txt");
+      actualNodeFs.writeFileSync(testFile, "content");
       await expect(fileExists(testFile)).resolves.toBe(true);
     });
 
-    it('should return false if the file does not exist', async () => {
-      const testFile = path.join(tempRootDir, 'does-not-exist.txt');
+    it("should return false if the file does not exist", async () => {
+      const testFile = path.join(tempRootDir, "does-not-exist.txt");
       await expect(fileExists(testFile)).resolves.toBe(false);
     });
 
-    it('should return true for a directory that exists', async () => {
-      const testDir = path.join(tempRootDir, 'exists-dir');
+    it("should return true for a directory that exists", async () => {
+      const testDir = path.join(tempRootDir, "exists-dir");
       actualNodeFs.mkdirSync(testDir);
       await expect(fileExists(testDir)).resolves.toBe(true);
     });
   });
 
-  describe('isBinaryFile', () => {
+  describe("isBinaryFile", () => {
     let filePathForBinaryTest: string;
 
     beforeEach(() => {
-      filePathForBinaryTest = path.join(tempRootDir, 'binaryCheck.tmp');
+      filePathForBinaryTest = path.join(tempRootDir, "binaryCheck.tmp");
     });
 
     afterEach(() => {
@@ -200,20 +179,20 @@ describe('fileUtils', () => {
       }
     });
 
-    it('should return false for an empty file', async () => {
-      actualNodeFs.writeFileSync(filePathForBinaryTest, '');
+    it("should return false for an empty file", async () => {
+      actualNodeFs.writeFileSync(filePathForBinaryTest, "");
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(false);
     });
 
-    it('should return false for a typical text file', async () => {
+    it("should return false for a typical text file", async () => {
       actualNodeFs.writeFileSync(
         filePathForBinaryTest,
-        'Hello, world!\nThis is a test file with normal text content.',
+        "Hello, world!\nThis is a test file with normal text content.",
       );
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(false);
     });
 
-    it('should return true for a file with many null bytes', async () => {
+    it("should return true for a file with many null bytes", async () => {
       const binaryContent = Buffer.from([
         0x48, 0x65, 0x00, 0x6c, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00,
       ]); // "He\0llo\0\0\0\0\0"
@@ -221,7 +200,7 @@ describe('fileUtils', () => {
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(true);
     });
 
-    it('should return true for a file with high percentage of non-printable ASCII', async () => {
+    it("should return true for a file with high percentage of non-printable ASCII", async () => {
       const binaryContent = Buffer.from([
         0x41, 0x42, 0x01, 0x02, 0x03, 0x04, 0x05, 0x43, 0x44, 0x06,
       ]); // AB\x01\x02\x03\x04\x05CD\x06
@@ -229,7 +208,7 @@ describe('fileUtils', () => {
       expect(await isBinaryFile(filePathForBinaryTest)).toBe(true);
     });
 
-    it('should return false if file access fails (e.g., ENOENT)', async () => {
+    it("should return false if file access fails (e.g., ENOENT)", async () => {
       // Ensure the file does not exist
       if (actualNodeFs.existsSync(filePathForBinaryTest)) {
         actualNodeFs.unlinkSync(filePathForBinaryTest);
@@ -238,15 +217,12 @@ describe('fileUtils', () => {
     });
   });
 
-  describe('BOM detection and encoding', () => {
+  describe("BOM detection and encoding", () => {
     let testDir: string;
 
     beforeEach(async () => {
       testDir = await fsPromises.mkdtemp(
-        path.join(
-          await fsPromises.realpath(os.tmpdir()),
-          'fileUtils-bom-test-',
-        ),
+        path.join(await fsPromises.realpath(os.tmpdir()), "fileUtils-bom-test-"),
       );
     });
 
@@ -256,91 +232,85 @@ describe('fileUtils', () => {
       }
     });
 
-    describe('detectBOM', () => {
-      it('should detect UTF-8 BOM', () => {
-        const buf = Buffer.from([
-          0xef, 0xbb, 0xbf, 0x48, 0x65, 0x6c, 0x6c, 0x6f,
-        ]);
+    describe("detectBOM", () => {
+      it("should detect UTF-8 BOM", () => {
+        const buf = Buffer.from([0xef, 0xbb, 0xbf, 0x48, 0x65, 0x6c, 0x6c, 0x6f]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf8', bomLength: 3 });
+        expect(result).toEqual({ encoding: "utf8", bomLength: 3 });
       });
 
-      it('should detect UTF-16 LE BOM', () => {
+      it("should detect UTF-16 LE BOM", () => {
         const buf = Buffer.from([0xff, 0xfe, 0x48, 0x00, 0x65, 0x00]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf16le', bomLength: 2 });
+        expect(result).toEqual({ encoding: "utf16le", bomLength: 2 });
       });
 
-      it('should detect UTF-16 BE BOM', () => {
+      it("should detect UTF-16 BE BOM", () => {
         const buf = Buffer.from([0xfe, 0xff, 0x00, 0x48, 0x00, 0x65]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf16be', bomLength: 2 });
+        expect(result).toEqual({ encoding: "utf16be", bomLength: 2 });
       });
 
-      it('should detect UTF-32 LE BOM', () => {
-        const buf = Buffer.from([
-          0xff, 0xfe, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00,
-        ]);
+      it("should detect UTF-32 LE BOM", () => {
+        const buf = Buffer.from([0xff, 0xfe, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf32le', bomLength: 4 });
+        expect(result).toEqual({ encoding: "utf32le", bomLength: 4 });
       });
 
-      it('should detect UTF-32 BE BOM', () => {
-        const buf = Buffer.from([
-          0x00, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x48,
-        ]);
+      it("should detect UTF-32 BE BOM", () => {
+        const buf = Buffer.from([0x00, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x00, 0x48]);
         const result = detectBOM(buf);
-        expect(result).toEqual({ encoding: 'utf32be', bomLength: 4 });
+        expect(result).toEqual({ encoding: "utf32be", bomLength: 4 });
       });
 
-      it('should return null for no BOM', () => {
+      it("should return null for no BOM", () => {
         const buf = Buffer.from([0x48, 0x65, 0x6c, 0x6c, 0x6f]);
         const result = detectBOM(buf);
         expect(result).toBeNull();
       });
 
-      it('should return null for empty buffer', () => {
+      it("should return null for empty buffer", () => {
         const buf = Buffer.alloc(0);
         const result = detectBOM(buf);
         expect(result).toBeNull();
       });
 
-      it('should return null for partial BOM', () => {
+      it("should return null for partial BOM", () => {
         const buf = Buffer.from([0xef, 0xbb]); // Incomplete UTF-8 BOM
         const result = detectBOM(buf);
         expect(result).toBeNull();
       });
     });
 
-    describe('readFileWithEncoding', () => {
-      it('should read UTF-8 BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+    describe("readFileWithEncoding", () => {
+      it("should read UTF-8 BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf8Bom = Buffer.from([0xef, 0xbb, 0xbf]);
-        const utf8Content = Buffer.from(content, 'utf8');
+        const utf8Content = Buffer.from(content, "utf8");
         const fullBuffer = Buffer.concat([utf8Bom, utf8Content]);
 
-        const filePath = path.join(testDir, 'utf8-bom.txt');
+        const filePath = path.join(testDir, "utf8-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-16 LE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-16 LE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf16leBom = Buffer.from([0xff, 0xfe]);
-        const utf16leContent = Buffer.from(content, 'utf16le');
+        const utf16leContent = Buffer.from(content, "utf16le");
         const fullBuffer = Buffer.concat([utf16leBom, utf16leContent]);
 
-        const filePath = path.join(testDir, 'utf16le-bom.txt');
+        const filePath = path.join(testDir, "utf16le-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-16 BE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-16 BE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         // Manually encode UTF-16 BE: each char as big-endian 16-bit
         const utf16beBom = Buffer.from([0xfe, 0xff]);
         const chars = Array.from(content);
@@ -362,15 +332,15 @@ describe('fileUtils', () => {
         const utf16beContent = Buffer.from(utf16beBytes);
         const fullBuffer = Buffer.concat([utf16beBom, utf16beContent]);
 
-        const filePath = path.join(testDir, 'utf16be-bom.txt');
+        const filePath = path.join(testDir, "utf16be-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-32 LE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-32 LE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf32leBom = Buffer.from([0xff, 0xfe, 0x00, 0x00]);
 
         const utf32leBytes: number[] = [];
@@ -387,15 +357,15 @@ describe('fileUtils', () => {
         const utf32leContent = Buffer.from(utf32leBytes);
         const fullBuffer = Buffer.concat([utf32leBom, utf32leContent]);
 
-        const filePath = path.join(testDir, 'utf32le-bom.txt');
+        const filePath = path.join(testDir, "utf32le-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read UTF-32 BE BOM file correctly', async () => {
-        const content = 'Hello, 世界! 🌍';
+      it("should read UTF-32 BE BOM file correctly", async () => {
+        const content = "Hello, 世界! 🌍";
         const utf32beBom = Buffer.from([0x00, 0x00, 0xfe, 0xff]);
 
         const utf32beBytes: number[] = [];
@@ -412,59 +382,59 @@ describe('fileUtils', () => {
         const utf32beContent = Buffer.from(utf32beBytes);
         const fullBuffer = Buffer.concat([utf32beBom, utf32beContent]);
 
-        const filePath = path.join(testDir, 'utf32be-bom.txt');
+        const filePath = path.join(testDir, "utf32be-bom.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should read file without BOM as UTF-8', async () => {
-        const content = 'Hello, 世界!';
-        const filePath = path.join(testDir, 'no-bom.txt');
-        await fsPromises.writeFile(filePath, content, 'utf8');
+      it("should read file without BOM as UTF-8", async () => {
+        const content = "Hello, 世界!";
+        const filePath = path.join(testDir, "no-bom.txt");
+        await fsPromises.writeFile(filePath, content, "utf8");
 
         const result = await readFileWithEncoding(filePath);
         expect(result).toBe(content);
       });
 
-      it('should handle empty file', async () => {
-        const filePath = path.join(testDir, 'empty.txt');
-        await fsPromises.writeFile(filePath, '');
+      it("should handle empty file", async () => {
+        const filePath = path.join(testDir, "empty.txt");
+        await fsPromises.writeFile(filePath, "");
 
         const result = await readFileWithEncoding(filePath);
-        expect(result).toBe('');
+        expect(result).toBe("");
       });
     });
 
-    describe('isBinaryFile with BOM awareness', () => {
-      it('should not treat UTF-8 BOM file as binary', async () => {
-        const content = 'Hello, world!';
+    describe("isBinaryFile with BOM awareness", () => {
+      it("should not treat UTF-8 BOM file as binary", async () => {
+        const content = "Hello, world!";
         const utf8Bom = Buffer.from([0xef, 0xbb, 0xbf]);
-        const utf8Content = Buffer.from(content, 'utf8');
+        const utf8Content = Buffer.from(content, "utf8");
         const fullBuffer = Buffer.concat([utf8Bom, utf8Content]);
 
-        const filePath = path.join(testDir, 'utf8-bom-test.txt');
+        const filePath = path.join(testDir, "utf8-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-16 LE BOM file as binary', async () => {
-        const content = 'Hello, world!';
+      it("should not treat UTF-16 LE BOM file as binary", async () => {
+        const content = "Hello, world!";
         const utf16leBom = Buffer.from([0xff, 0xfe]);
-        const utf16leContent = Buffer.from(content, 'utf16le');
+        const utf16leContent = Buffer.from(content, "utf16le");
         const fullBuffer = Buffer.concat([utf16leBom, utf16leContent]);
 
-        const filePath = path.join(testDir, 'utf16le-bom-test.txt');
+        const filePath = path.join(testDir, "utf16le-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-16 BE BOM file as binary', async () => {
+      it("should not treat UTF-16 BE BOM file as binary", async () => {
         const utf16beBom = Buffer.from([0xfe, 0xff]);
         // Simple ASCII in UTF-16 BE
         const utf16beContent = Buffer.from([
@@ -497,14 +467,14 @@ describe('fileUtils', () => {
         ]);
         const fullBuffer = Buffer.concat([utf16beBom, utf16beContent]);
 
-        const filePath = path.join(testDir, 'utf16be-bom-test.txt');
+        const filePath = path.join(testDir, "utf16be-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-32 LE BOM file as binary', async () => {
+      it("should not treat UTF-32 LE BOM file as binary", async () => {
         const utf32leBom = Buffer.from([0xff, 0xfe, 0x00, 0x00]);
         const utf32leContent = Buffer.from([
           0x48,
@@ -530,14 +500,14 @@ describe('fileUtils', () => {
         ]);
         const fullBuffer = Buffer.concat([utf32leBom, utf32leContent]);
 
-        const filePath = path.join(testDir, 'utf32le-bom-test.txt');
+        const filePath = path.join(testDir, "utf32le-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should not treat UTF-32 BE BOM file as binary', async () => {
+      it("should not treat UTF-32 BE BOM file as binary", async () => {
         const utf32beBom = Buffer.from([0x00, 0x00, 0xfe, 0xff]);
         const utf32beContent = Buffer.from([
           0x00,
@@ -563,34 +533,30 @@ describe('fileUtils', () => {
         ]);
         const fullBuffer = Buffer.concat([utf32beBom, utf32beContent]);
 
-        const filePath = path.join(testDir, 'utf32be-bom-test.txt');
+        const filePath = path.join(testDir, "utf32be-bom-test.txt");
         await fsPromises.writeFile(filePath, fullBuffer);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(false);
       });
 
-      it('should still treat actual binary file as binary', async () => {
+      it("should still treat actual binary file as binary", async () => {
         // PNG header + some binary data with null bytes
-        const pngHeader = Buffer.from([
-          0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-        ]);
-        const binaryData = Buffer.from([
-          0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
-        ]); // IHDR chunk with nulls
+        const pngHeader = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
+        const binaryData = Buffer.from([0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52]); // IHDR chunk with nulls
         const fullContent = Buffer.concat([pngHeader, binaryData]);
-        const filePath = path.join(testDir, 'test.png');
+        const filePath = path.join(testDir, "test.png");
         await fsPromises.writeFile(filePath, fullContent);
 
         const result = await isBinaryFile(filePath);
         expect(result).toBe(true);
       });
 
-      it('should treat file with null bytes (no BOM) as binary', async () => {
+      it("should treat file with null bytes (no BOM) as binary", async () => {
         const content = Buffer.from([
           0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x77, 0x6f, 0x72, 0x6c, 0x64,
         ]);
-        const filePath = path.join(testDir, 'null-bytes.bin');
+        const filePath = path.join(testDir, "null-bytes.bin");
         await fsPromises.writeFile(filePath, content);
 
         const result = await isBinaryFile(filePath);
@@ -599,13 +565,13 @@ describe('fileUtils', () => {
     });
   });
 
-  describe('detectFileType', () => {
+  describe("detectFileType", () => {
     let filePathForDetectTest: string;
 
     beforeEach(() => {
-      filePathForDetectTest = path.join(tempRootDir, 'detectType.tmp');
+      filePathForDetectTest = path.join(tempRootDir, "detectType.tmp");
       // Default: create as a text file for isBinaryFile fallback
-      actualNodeFs.writeFileSync(filePathForDetectTest, 'Plain text content');
+      actualNodeFs.writeFileSync(filePathForDetectTest, "Plain text content");
     });
 
     afterEach(() => {
@@ -615,68 +581,61 @@ describe('fileUtils', () => {
       vi.restoreAllMocks(); // Restore spies on actualNodeFs
     });
 
-    it('should detect typescript type by extension (ts, mts, cts, tsx)', async () => {
-      expect(await detectFileType('file.ts')).toBe('text');
-      expect(await detectFileType('file.test.ts')).toBe('text');
-      expect(await detectFileType('file.mts')).toBe('text');
-      expect(await detectFileType('vite.config.mts')).toBe('text');
-      expect(await detectFileType('file.cts')).toBe('text');
-      expect(await detectFileType('component.tsx')).toBe('text');
+    it("should detect typescript type by extension (ts, mts, cts, tsx)", async () => {
+      expect(await detectFileType("file.ts")).toBe("text");
+      expect(await detectFileType("file.test.ts")).toBe("text");
+      expect(await detectFileType("file.mts")).toBe("text");
+      expect(await detectFileType("vite.config.mts")).toBe("text");
+      expect(await detectFileType("file.cts")).toBe("text");
+      expect(await detectFileType("component.tsx")).toBe("text");
     });
 
     it.each([
-      { type: 'image', file: 'file.png', mime: 'image/png' },
-      { type: 'image', file: 'file.jpg', mime: 'image/jpeg' },
-      { type: 'pdf', file: 'file.pdf', mime: 'application/pdf' },
-      { type: 'audio', file: 'song.mp3', mime: 'audio/mpeg' },
-      { type: 'video', file: 'movie.mp4', mime: 'video/mp4' },
-      { type: 'binary', file: 'archive.zip', mime: 'application/zip' },
-      { type: 'binary', file: 'app.exe', mime: 'application/octet-stream' },
-    ])(
-      'should detect $type type for $file by extension',
-      async ({ file, mime, type }) => {
-        mockMimeGetType.mockReturnValueOnce(mime);
-        expect(await detectFileType(file)).toBe(type);
-      },
-    );
+      { type: "image", file: "file.png", mime: "image/png" },
+      { type: "image", file: "file.jpg", mime: "image/jpeg" },
+      { type: "pdf", file: "file.pdf", mime: "application/pdf" },
+      { type: "audio", file: "song.mp3", mime: "audio/mpeg" },
+      { type: "video", file: "movie.mp4", mime: "video/mp4" },
+      { type: "binary", file: "archive.zip", mime: "application/zip" },
+      { type: "binary", file: "app.exe", mime: "application/octet-stream" },
+    ])("should detect $type type for $file by extension", async ({ file, mime, type }) => {
+      mockMimeGetType.mockReturnValueOnce(mime);
+      expect(await detectFileType(file)).toBe(type);
+    });
 
-    it('should detect svg type by extension', async () => {
-      expect(await detectFileType('image.svg')).toBe('svg');
-      expect(await detectFileType('image.icon.svg')).toBe('svg');
+    it("should detect svg type by extension", async () => {
+      expect(await detectFileType("image.svg")).toBe("svg");
+      expect(await detectFileType("image.icon.svg")).toBe("svg");
     });
 
-    it('should use isBinaryFile for unknown extensions and detect as binary', async () => {
+    it("should use isBinaryFile for unknown extensions and detect as binary", async () => {
       mockMimeGetType.mockReturnValueOnce(false); // Unknown mime type
       // Create a file that isBinaryFile will identify as binary
       const binaryContent = Buffer.from([
         0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
       ]);
       actualNodeFs.writeFileSync(filePathForDetectTest, binaryContent);
-      expect(await detectFileType(filePathForDetectTest)).toBe('binary');
+      expect(await detectFileType(filePathForDetectTest)).toBe("binary");
     });
 
-    it('should default to text if mime type is unknown and content is not binary', async () => {
+    it("should default to text if mime type is unknown and content is not binary", async () => {
       mockMimeGetType.mockReturnValueOnce(false); // Unknown mime type
       // filePathForDetectTest is already a text file by default from beforeEach
-      expect(await detectFileType(filePathForDetectTest)).toBe('text');
+      expect(await detectFileType(filePathForDetectTest)).toBe("text");
     });
   });
 
-  describe('processSingleFileContent', () => {
+  describe("processSingleFileContent", () => {
     beforeEach(() => {
       // Ensure files exist for statSync checks before readFile might be mocked
-      if (actualNodeFs.existsSync(testTextFilePath))
-        actualNodeFs.unlinkSync(testTextFilePath);
-      if (actualNodeFs.existsSync(testImageFilePath))
-        actualNodeFs.unlinkSync(testImageFilePath);
-      if (actualNodeFs.existsSync(testPdfFilePath))
-        actualNodeFs.unlinkSync(testPdfFilePath);
-      if (actualNodeFs.existsSync(testBinaryFilePath))
-        actualNodeFs.unlinkSync(testBinaryFilePath);
-    });
-
-    it('should read a text file successfully', async () => {
-      const content = 'Line 1\\nLine 2\\nLine 3';
+      if (actualNodeFs.existsSync(testTextFilePath)) actualNodeFs.unlinkSync(testTextFilePath);
+      if (actualNodeFs.existsSync(testImageFilePath)) actualNodeFs.unlinkSync(testImageFilePath);
+      if (actualNodeFs.existsSync(testPdfFilePath)) actualNodeFs.unlinkSync(testPdfFilePath);
+      if (actualNodeFs.existsSync(testBinaryFilePath)) actualNodeFs.unlinkSync(testBinaryFilePath);
+    });
+
+    it("should read a text file successfully", async () => {
+      const content = "Line 1\\nLine 2\\nLine 3";
       actualNodeFs.writeFileSync(testTextFilePath, content);
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -684,103 +643,97 @@ describe('fileUtils', () => {
         new StandardFileSystemService(),
       );
       expect(result.llmContent).toBe(content);
-      expect(result.returnDisplay).toBe('');
+      expect(result.returnDisplay).toBe("");
       expect(result.error).toBeUndefined();
     });
 
-    it('should handle file not found', async () => {
+    it("should handle file not found", async () => {
       const result = await processSingleFileContent(
         nonexistentFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('File not found');
-      expect(result.returnDisplay).toContain('File not found');
+      expect(result.error).toContain("File not found");
+      expect(result.returnDisplay).toContain("File not found");
     });
 
-    it('should handle read errors for text files', async () => {
-      actualNodeFs.writeFileSync(testTextFilePath, 'content'); // File must exist for initial statSync
-      const readError = new Error('Simulated read error');
-      vi.spyOn(fsPromises, 'readFile').mockRejectedValueOnce(readError);
+    it("should handle read errors for text files", async () => {
+      actualNodeFs.writeFileSync(testTextFilePath, "content"); // File must exist for initial statSync
+      const readError = new Error("Simulated read error");
+      vi.spyOn(fsPromises, "readFile").mockRejectedValueOnce(readError);
 
       const result = await processSingleFileContent(
         testTextFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('Simulated read error');
-      expect(result.returnDisplay).toContain('Simulated read error');
+      expect(result.error).toContain("Simulated read error");
+      expect(result.returnDisplay).toContain("Simulated read error");
     });
 
-    it('should handle read errors for image/pdf files', async () => {
-      actualNodeFs.writeFileSync(testImageFilePath, 'content'); // File must exist
-      mockMimeGetType.mockReturnValue('image/png');
-      const readError = new Error('Simulated image read error');
-      vi.spyOn(fsPromises, 'readFile').mockRejectedValueOnce(readError);
+    it("should handle read errors for image/pdf files", async () => {
+      actualNodeFs.writeFileSync(testImageFilePath, "content"); // File must exist
+      mockMimeGetType.mockReturnValue("image/png");
+      const readError = new Error("Simulated image read error");
+      vi.spyOn(fsPromises, "readFile").mockRejectedValueOnce(readError);
 
       const result = await processSingleFileContent(
         testImageFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('Simulated image read error');
-      expect(result.returnDisplay).toContain('Simulated image read error');
+      expect(result.error).toContain("Simulated image read error");
+      expect(result.returnDisplay).toContain("Simulated image read error");
     });
 
-    it('should process an image file', async () => {
-      const fakePngData = Buffer.from('fake png data');
+    it("should process an image file", async () => {
+      const fakePngData = Buffer.from("fake png data");
       actualNodeFs.writeFileSync(testImageFilePath, fakePngData);
-      mockMimeGetType.mockReturnValue('image/png');
+      mockMimeGetType.mockReturnValue("image/png");
       const result = await processSingleFileContent(
         testImageFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(
-        (result.llmContent as { inlineData: unknown }).inlineData,
-      ).toBeDefined();
-      expect(
-        (result.llmContent as { inlineData: { mimeType: string } }).inlineData
-          .mimeType,
-      ).toBe('image/png');
-      expect(
-        (result.llmContent as { inlineData: { data: string } }).inlineData.data,
-      ).toBe(fakePngData.toString('base64'));
-      expect(result.returnDisplay).toContain('Read image file: image.png');
-    });
-
-    it('should process a PDF file', async () => {
-      const fakePdfData = Buffer.from('fake pdf data');
+      expect((result.llmContent as { inlineData: unknown }).inlineData).toBeDefined();
+      expect((result.llmContent as { inlineData: { mimeType: string } }).inlineData.mimeType).toBe(
+        "image/png",
+      );
+      expect((result.llmContent as { inlineData: { data: string } }).inlineData.data).toBe(
+        fakePngData.toString("base64"),
+      );
+      expect(result.returnDisplay).toContain("Read image file: image.png");
+    });
+
+    it("should process a PDF file", async () => {
+      const fakePdfData = Buffer.from("fake pdf data");
       actualNodeFs.writeFileSync(testPdfFilePath, fakePdfData);
-      mockMimeGetType.mockReturnValue('application/pdf');
+      mockMimeGetType.mockReturnValue("application/pdf");
       const result = await processSingleFileContent(
         testPdfFilePath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(
-        (result.llmContent as { inlineData: unknown }).inlineData,
-      ).toBeDefined();
-      expect(
-        (result.llmContent as { inlineData: { mimeType: string } }).inlineData
-          .mimeType,
-      ).toBe('application/pdf');
-      expect(
-        (result.llmContent as { inlineData: { data: string } }).inlineData.data,
-      ).toBe(fakePdfData.toString('base64'));
-      expect(result.returnDisplay).toContain('Read pdf file: document.pdf');
-    });
-
-    it('should read an SVG file as text when under 1MB', async () => {
+      expect((result.llmContent as { inlineData: unknown }).inlineData).toBeDefined();
+      expect((result.llmContent as { inlineData: { mimeType: string } }).inlineData.mimeType).toBe(
+        "application/pdf",
+      );
+      expect((result.llmContent as { inlineData: { data: string } }).inlineData.data).toBe(
+        fakePdfData.toString("base64"),
+      );
+      expect(result.returnDisplay).toContain("Read pdf file: document.pdf");
+    });
+
+    it("should read an SVG file as text when under 1MB", async () => {
       const svgContent = `
     <svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">
       <rect width="100" height="100" fill="blue" />
     </svg>
   `;
-      const testSvgFilePath = path.join(tempRootDir, 'test.svg');
-      actualNodeFs.writeFileSync(testSvgFilePath, svgContent, 'utf-8');
+      const testSvgFilePath = path.join(tempRootDir, "test.svg");
+      actualNodeFs.writeFileSync(testSvgFilePath, svgContent, "utf-8");
 
-      mockMimeGetType.mockReturnValue('image/svg+xml');
+      mockMimeGetType.mockReturnValue("image/svg+xml");
 
       const result = await processSingleFileContent(
         testSvgFilePath,
@@ -789,15 +742,12 @@ describe('fileUtils', () => {
       );
 
       expect(result.llmContent).toBe(svgContent);
-      expect(result.returnDisplay).toContain('Read SVG as text');
+      expect(result.returnDisplay).toContain("Read SVG as text");
     });
 
-    it('should skip binary files', async () => {
-      actualNodeFs.writeFileSync(
-        testBinaryFilePath,
-        Buffer.from([0x00, 0x01, 0x02]),
-      );
-      mockMimeGetType.mockReturnValueOnce('application/octet-stream');
+    it("should skip binary files", async () => {
+      actualNodeFs.writeFileSync(testBinaryFilePath, Buffer.from([0x00, 0x01, 0x02]));
+      mockMimeGetType.mockReturnValueOnce("application/octet-stream");
       // isBinaryFile will operate on the real file.
 
       const result = await processSingleFileContent(
@@ -805,25 +755,23 @@ describe('fileUtils', () => {
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.llmContent).toContain(
-        'Cannot display content of binary file',
-      );
-      expect(result.returnDisplay).toContain('Skipped binary file: app.exe');
+      expect(result.llmContent).toContain("Cannot display content of binary file");
+      expect(result.returnDisplay).toContain("Skipped binary file: app.exe");
     });
 
-    it('should handle path being a directory', async () => {
+    it("should handle path being a directory", async () => {
       const result = await processSingleFileContent(
         directoryPath,
         tempRootDir,
         new StandardFileSystemService(),
       );
-      expect(result.error).toContain('Path is a directory');
-      expect(result.returnDisplay).toContain('Path is a directory');
+      expect(result.error).toContain("Path is a directory");
+      expect(result.returnDisplay).toContain("Path is a directory");
     });
 
-    it('should paginate text files correctly (offset and limit)', async () => {
+    it("should paginate text files correctly (offset and limit)", async () => {
       const lines = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -832,18 +780,18 @@ describe('fileUtils', () => {
         5,
         5,
       ); // Read lines 6-10
-      const expectedContent = lines.slice(5, 10).join('\n');
+      const expectedContent = lines.slice(5, 10).join("\n");
 
       expect(result.llmContent).toBe(expectedContent);
-      expect(result.returnDisplay).toBe('Read lines 6-10 of 20 from test.txt');
+      expect(result.returnDisplay).toBe("Read lines 6-10 of 20 from test.txt");
       expect(result.isTruncated).toBe(true);
       expect(result.originalLineCount).toBe(20);
       expect(result.linesShown).toEqual([6, 10]);
     });
 
-    it('should identify truncation when reading the end of a file', async () => {
+    it("should identify truncation when reading the end of a file", async () => {
       const lines = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       // Read from line 11 to 20. The start is not 0, so it's truncated.
       const result = await processSingleFileContent(
@@ -853,18 +801,18 @@ describe('fileUtils', () => {
         10,
         10,
       );
-      const expectedContent = lines.slice(10, 20).join('\n');
+      const expectedContent = lines.slice(10, 20).join("\n");
 
       expect(result.llmContent).toContain(expectedContent);
-      expect(result.returnDisplay).toBe('Read lines 11-20 of 20 from test.txt');
+      expect(result.returnDisplay).toBe("Read lines 11-20 of 20 from test.txt");
       expect(result.isTruncated).toBe(true); // This is the key check for the bug
       expect(result.originalLineCount).toBe(20);
       expect(result.linesShown).toEqual([11, 20]);
     });
 
-    it('should handle limit exceeding file length', async () => {
-      const lines = ['Line 1', 'Line 2'];
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+    it("should handle limit exceeding file length", async () => {
+      const lines = ["Line 1", "Line 2"];
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -873,21 +821,18 @@ describe('fileUtils', () => {
         0,
         10,
       );
-      const expectedContent = lines.join('\n');
+      const expectedContent = lines.join("\n");
 
       expect(result.llmContent).toBe(expectedContent);
-      expect(result.returnDisplay).toBe('');
+      expect(result.returnDisplay).toBe("");
       expect(result.isTruncated).toBe(false);
       expect(result.originalLineCount).toBe(2);
       expect(result.linesShown).toEqual([1, 2]);
     });
 
-    it('should truncate long lines in text files', async () => {
-      const longLine = 'a'.repeat(2500);
-      actualNodeFs.writeFileSync(
-        testTextFilePath,
-        `Short line\n${longLine}\nAnother short line`,
-      );
+    it("should truncate long lines in text files", async () => {
+      const longLine = "a".repeat(2500);
+      actualNodeFs.writeFileSync(testTextFilePath, `Short line\n${longLine}\nAnother short line`);
 
       const result = await processSingleFileContent(
         testTextFilePath,
@@ -895,20 +840,18 @@ describe('fileUtils', () => {
         new StandardFileSystemService(),
       );
 
-      expect(result.llmContent).toContain('Short line');
-      expect(result.llmContent).toContain(
-        longLine.substring(0, 2000) + '... [truncated]',
-      );
-      expect(result.llmContent).toContain('Another short line');
+      expect(result.llmContent).toContain("Short line");
+      expect(result.llmContent).toContain(longLine.substring(0, 2000) + "... [truncated]");
+      expect(result.llmContent).toContain("Another short line");
       expect(result.returnDisplay).toBe(
-        'Read all 3 lines from test.txt (some lines were shortened)',
+        "Read all 3 lines from test.txt (some lines were shortened)",
       );
       expect(result.isTruncated).toBe(true);
     });
 
-    it('should truncate when line count exceeds the limit', async () => {
+    it("should truncate when line count exceeds the limit", async () => {
       const lines = Array.from({ length: 11 }, (_, i) => `Line ${i + 1}`);
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       // Read 5 lines, but there are 11 total
       const result = await processSingleFileContent(
@@ -920,14 +863,14 @@ describe('fileUtils', () => {
       );
 
       expect(result.isTruncated).toBe(true);
-      expect(result.returnDisplay).toBe('Read lines 1-5 of 11 from test.txt');
+      expect(result.returnDisplay).toBe("Read lines 1-5 of 11 from test.txt");
     });
 
-    it('should truncate when a line length exceeds the character limit', async () => {
-      const longLine = 'b'.repeat(2500);
+    it("should truncate when a line length exceeds the character limit", async () => {
+      const longLine = "b".repeat(2500);
       const lines = Array.from({ length: 10 }, (_, i) => `Line ${i + 1}`);
       lines.push(longLine); // Total 11 lines
-      actualNodeFs.writeFileSync(testTextFilePath, lines.join('\n'));
+      actualNodeFs.writeFileSync(testTextFilePath, lines.join("\n"));
 
       // Read all 11 lines, including the long one
       const result = await processSingleFileContent(
@@ -940,20 +883,14 @@ describe('fileUtils', () => {
 
       expect(result.isTruncated).toBe(true);
       expect(result.returnDisplay).toBe(
-        'Read all 11 lines from test.txt (some lines were shortened)',
+        "Read all 11 lines from test.txt (some lines were shortened)",
       );
     });
 
-    it('should truncate both line count and line length when both exceed limits', async () => {
-      const linesWithLongInMiddle = Array.from(
-        { length: 20 },
-        (_, i) => `Line ${i + 1}`,
-      );
-      linesWithLongInMiddle[4] = 'c'.repeat(2500);
-      actualNodeFs.writeFileSync(
-        testTextFilePath,
-        linesWithLongInMiddle.join('\n'),
-      );
+    it("should truncate both line count and line length when both exceed limits", async () => {
+      const linesWithLongInMiddle = Array.from({ length: 20 }, (_, i) => `Line ${i + 1}`);
+      linesWithLongInMiddle[4] = "c".repeat(2500);
+      actualNodeFs.writeFileSync(testTextFilePath, linesWithLongInMiddle.join("\n"));
 
       // Read 10 lines out of 20, including the long line
       const result = await processSingleFileContent(
@@ -965,16 +902,16 @@ describe('fileUtils', () => {
       );
       expect(result.isTruncated).toBe(true);
       expect(result.returnDisplay).toBe(
-        'Read lines 1-10 of 20 from test.txt (some lines were shortened)',
+        "Read lines 1-10 of 20 from test.txt (some lines were shortened)",
       );
     });
 
-    it('should return an error if the file size exceeds 20MB', async () => {
+    it("should return an error if the file size exceeds 20MB", async () => {
       // Create a small test file
-      actualNodeFs.writeFileSync(testTextFilePath, 'test content');
+      actualNodeFs.writeFileSync(testTextFilePath, "test content");
 
       // Spy on fs.promises.stat to return a large file size
-      const statSpy = vi.spyOn(fs.promises, 'stat').mockResolvedValueOnce({
+      const statSpy = vi.spyOn(fs.promises, "stat").mockResolvedValueOnce({
         size: 21 * 1024 * 1024,
         isDirectory: () => false,
       } as fs.Stats);
@@ -986,11 +923,9 @@ describe('fileUtils', () => {
           new StandardFileSystemService(),
         );
 
-        expect(result.error).toContain('File size exceeds the 20MB limit');
-        expect(result.returnDisplay).toContain(
-          'File size exceeds the 20MB limit',
-        );
-        expect(result.llmContent).toContain('File size exceeds the 20MB limit');
+        expect(result.error).toContain("File size exceeds the 20MB limit");
+        expect(result.returnDisplay).toContain("File size exceeds the 20MB limit");
+        expect(result.llmContent).toContain("File size exceeds the 20MB limit");
       } finally {
         statSpy.mockRestore();
       }
diff --git a/packages/gemini-core/src/utils/fileUtils.ts b/packages/gemini-core/src/utils/fileUtils.ts
index 321162f19..02834222f 100644
--- a/packages/gemini-core/src/utils/fileUtils.ts
+++ b/packages/gemini-core/src/utils/fileUtils.ts
@@ -4,23 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
-import type { PartUnion } from '@google/genai';
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import { createRequire as createModuleRequire } from "node:module";
+import path from "node:path";
+import type { PartUnion } from "@google/genai";
 // eslint-disable-next-line import/no-internal-modules
-import mime from 'mime/lite';
-import type { FileSystemService } from '../services/fileSystemService.js';
-import { ToolErrorType } from '../tools/tool-error.js';
-import { BINARY_EXTENSIONS } from './ignorePatterns.js';
-import { createRequire as createModuleRequire } from 'node:module';
-import { debugLogger } from './debugLogger.js';
+import mime from "mime/lite";
+import type { FileSystemService } from "../services/fileSystemService.js";
+import { ToolErrorType } from "../tools/tool-error.js";
+import { debugLogger } from "./debugLogger.js";
+import { BINARY_EXTENSIONS } from "./ignorePatterns.js";
 
 const requireModule = createModuleRequire(import.meta.url);
 
-export async function readWasmBinaryFromDisk(
-  specifier: string,
-): Promise<Uint8Array> {
+export async function readWasmBinaryFromDisk(specifier: string): Promise<Uint8Array> {
   const resolvedPath = requireModule.resolve(specifier);
   const buffer = await fsPromises.readFile(resolvedPath);
   return new Uint8Array(buffer);
@@ -46,7 +44,7 @@ export async function loadWasmBinary(
   try {
     return await readWasmBinaryFromDisk(fallbackSpecifier);
   } catch (error) {
-    throw new Error('WASM binary module did not provide a Uint8Array export', {
+    throw new Error("WASM binary module did not provide a Uint8Array export", {
       cause: error,
     });
   }
@@ -57,11 +55,11 @@ const DEFAULT_MAX_LINES_TEXT_FILE = 2000;
 const MAX_LINE_LENGTH_TEXT_FILE = 2000;
 
 // Default values for encoding and separator format
-export const DEFAULT_ENCODING: BufferEncoding = 'utf-8';
+export const DEFAULT_ENCODING: BufferEncoding = "utf-8";
 
 // --- Unicode BOM detection & decoding helpers --------------------------------
 
-type UnicodeEncoding = 'utf8' | 'utf16le' | 'utf16be' | 'utf32le' | 'utf32be';
+type UnicodeEncoding = "utf8" | "utf16le" | "utf16be" | "utf32le" | "utf32be";
 
 interface BOMInfo {
   encoding: UnicodeEncoding;
@@ -75,28 +73,18 @@ interface BOMInfo {
 export function detectBOM(buf: Buffer): BOMInfo | null {
   if (buf.length >= 4) {
     // UTF-32 LE: FF FE 00 00
-    if (
-      buf[0] === 0xff &&
-      buf[1] === 0xfe &&
-      buf[2] === 0x00 &&
-      buf[3] === 0x00
-    ) {
-      return { encoding: 'utf32le', bomLength: 4 };
+    if (buf[0] === 0xff && buf[1] === 0xfe && buf[2] === 0x00 && buf[3] === 0x00) {
+      return { encoding: "utf32le", bomLength: 4 };
     }
     // UTF-32 BE: 00 00 FE FF
-    if (
-      buf[0] === 0x00 &&
-      buf[1] === 0x00 &&
-      buf[2] === 0xfe &&
-      buf[3] === 0xff
-    ) {
-      return { encoding: 'utf32be', bomLength: 4 };
+    if (buf[0] === 0x00 && buf[1] === 0x00 && buf[2] === 0xfe && buf[3] === 0xff) {
+      return { encoding: "utf32be", bomLength: 4 };
     }
   }
   if (buf.length >= 3) {
     // UTF-8: EF BB BF
     if (buf[0] === 0xef && buf[1] === 0xbb && buf[2] === 0xbf) {
-      return { encoding: 'utf8', bomLength: 3 };
+      return { encoding: "utf8", bomLength: 3 };
     }
   }
   if (buf.length >= 2) {
@@ -106,11 +94,11 @@ export function detectBOM(buf: Buffer): BOMInfo | null {
       buf[1] === 0xfe &&
       (buf.length < 4 || buf[2] !== 0x00 || buf[3] !== 0x00)
     ) {
-      return { encoding: 'utf16le', bomLength: 2 };
+      return { encoding: "utf16le", bomLength: 2 };
     }
     // UTF-16 BE: FE FF
     if (buf[0] === 0xfe && buf[1] === 0xff) {
-      return { encoding: 'utf16be', bomLength: 2 };
+      return { encoding: "utf16be", bomLength: 2 };
     }
   }
   return null;
@@ -121,10 +109,10 @@ export function detectBOM(buf: Buffer): BOMInfo | null {
  * (Node has 'utf16le' but not 'utf16be'.)
  */
 function decodeUTF16BE(buf: Buffer): string {
-  if (buf.length === 0) return '';
+  if (buf.length === 0) return "";
   const swapped = Buffer.from(buf); // swap16 mutates in place, so copy
   swapped.swap16();
-  return swapped.toString('utf16le');
+  return swapped.toString("utf16le");
 }
 
 /**
@@ -132,26 +120,18 @@ function decodeUTF16BE(buf: Buffer): string {
  * Invalid code points are replaced with U+FFFD, partial trailing bytes are ignored.
  */
 function decodeUTF32(buf: Buffer, littleEndian: boolean): string {
-  if (buf.length < 4) return '';
+  if (buf.length < 4) return "";
   const usable = buf.length - (buf.length % 4);
-  let out = '';
+  let out = "";
   for (let i = 0; i < usable; i += 4) {
     const cp = littleEndian
-      ? (buf[i] |
-          (buf[i + 1] << 8) |
-          (buf[i + 2] << 16) |
-          (buf[i + 3] << 24)) >>>
-        0
-      : (buf[i + 3] |
-          (buf[i + 2] << 8) |
-          (buf[i + 1] << 16) |
-          (buf[i] << 24)) >>>
-        0;
+      ? (buf[i] | (buf[i + 1] << 8) | (buf[i + 2] << 16) | (buf[i + 3] << 24)) >>> 0
+      : (buf[i + 3] | (buf[i + 2] << 8) | (buf[i + 1] << 16) | (buf[i] << 24)) >>> 0;
     // Valid planes: 0x0000..0x10FFFF excluding surrogates
     if (cp <= 0x10ffff && !(cp >= 0xd800 && cp <= 0xdfff)) {
       out += String.fromCodePoint(cp);
     } else {
-      out += '\uFFFD';
+      out += "\uFFFD";
     }
   }
   return out;
@@ -164,30 +144,30 @@ function decodeUTF32(buf: Buffer, littleEndian: boolean): string {
 export async function readFileWithEncoding(filePath: string): Promise<string> {
   // Read the file once; detect BOM and decode from the single buffer.
   const full = await fs.promises.readFile(filePath);
-  if (full.length === 0) return '';
+  if (full.length === 0) return "";
 
   const bom = detectBOM(full);
   if (!bom) {
     // No BOM → treat as UTF‑8
-    return full.toString('utf8');
+    return full.toString("utf8");
   }
 
   // Strip BOM and decode per encoding
   const content = full.subarray(bom.bomLength);
   switch (bom.encoding) {
-    case 'utf8':
-      return content.toString('utf8');
-    case 'utf16le':
-      return content.toString('utf16le');
-    case 'utf16be':
+    case "utf8":
+      return content.toString("utf8");
+    case "utf16le":
+      return content.toString("utf16le");
+    case "utf16be":
       return decodeUTF16BE(content);
-    case 'utf32le':
+    case "utf32le":
       return decodeUTF32(content, true);
-    case 'utf32be':
+    case "utf32be":
       return decodeUTF32(content, false);
     default:
       // Defensive fallback; should be unreachable
-      return content.toString('utf8');
+      return content.toString("utf8");
   }
 }
 
@@ -198,7 +178,7 @@ export async function readFileWithEncoding(filePath: string): Promise<string> {
  */
 export function getSpecificMimeType(filePath: string): string | undefined {
   const lookedUpMime = mime.getType(filePath);
-  return typeof lookedUpMime === 'string' ? lookedUpMime : undefined;
+  return typeof lookedUpMime === "string" ? lookedUpMime : undefined;
 }
 
 /**
@@ -207,18 +187,14 @@ export function getSpecificMimeType(filePath: string): string | undefined {
  * @param rootDirectory The absolute root directory.
  * @returns True if the path is within the root directory, false otherwise.
  */
-export function isWithinRoot(
-  pathToCheck: string,
-  rootDirectory: string,
-): boolean {
+export function isWithinRoot(pathToCheck: string, rootDirectory: string): boolean {
   const normalizedPathToCheck = path.resolve(pathToCheck);
   const normalizedRootDirectory = path.resolve(rootDirectory);
 
   // Ensure the rootDirectory path ends with a separator for correct startsWith comparison,
   // unless it's the root path itself (e.g., '/' or 'C:\').
   const rootWithSeparator =
-    normalizedRootDirectory === path.sep ||
-    normalizedRootDirectory.endsWith(path.sep)
+    normalizedRootDirectory === path.sep || normalizedRootDirectory.endsWith(path.sep)
       ? normalizedRootDirectory
       : normalizedRootDirectory + path.sep;
 
@@ -236,7 +212,7 @@ export function isWithinRoot(
 export async function isBinaryFile(filePath: string): Promise<boolean> {
   let fh: fs.promises.FileHandle | null = null;
   try {
-    fh = await fs.promises.open(filePath, 'r');
+    fh = await fs.promises.open(filePath, "r");
     const stats = await fh.stat();
     const fileSize = stats.size;
     if (fileSize === 0) return false; // empty is not binary
@@ -287,49 +263,49 @@ export async function isBinaryFile(filePath: string): Promise<boolean> {
  */
 export async function detectFileType(
   filePath: string,
-): Promise<'text' | 'image' | 'pdf' | 'audio' | 'video' | 'binary' | 'svg'> {
+): Promise<"text" | "image" | "pdf" | "audio" | "video" | "binary" | "svg"> {
   const ext = path.extname(filePath).toLowerCase();
 
   // The mimetype for various TypeScript extensions (ts, mts, cts, tsx) can be
   // MPEG transport stream (a video format), but we want to assume these are
   // TypeScript files instead.
-  if (['.ts', '.mts', '.cts'].includes(ext)) {
-    return 'text';
+  if ([".ts", ".mts", ".cts"].includes(ext)) {
+    return "text";
   }
 
-  if (ext === '.svg') {
-    return 'svg';
+  if (ext === ".svg") {
+    return "svg";
   }
 
   const lookedUpMimeType = mime.getType(filePath); // Returns null if not found, or the mime type string
   if (lookedUpMimeType) {
-    if (lookedUpMimeType.startsWith('image/')) {
-      return 'image';
+    if (lookedUpMimeType.startsWith("image/")) {
+      return "image";
     }
-    if (lookedUpMimeType.startsWith('audio/')) {
-      return 'audio';
+    if (lookedUpMimeType.startsWith("audio/")) {
+      return "audio";
     }
-    if (lookedUpMimeType.startsWith('video/')) {
-      return 'video';
+    if (lookedUpMimeType.startsWith("video/")) {
+      return "video";
     }
-    if (lookedUpMimeType === 'application/pdf') {
-      return 'pdf';
+    if (lookedUpMimeType === "application/pdf") {
+      return "pdf";
     }
   }
 
   // Stricter binary check for common non-text extensions before content check
   // These are often not well-covered by mime-types or might be misidentified.
   if (BINARY_EXTENSIONS.includes(ext)) {
-    return 'binary';
+    return "binary";
   }
 
   // Fall back to content-based check if mime type wasn't conclusive for image/pdf
   // and it's not a known binary extension.
   if (await isBinaryFile(filePath)) {
-    return 'binary';
+    return "binary";
   }
 
-  return 'text';
+  return "text";
 }
 
 export interface ProcessedFileReadResult {
@@ -361,9 +337,8 @@ export async function processSingleFileContent(
     if (!fs.existsSync(filePath)) {
       // Sync check is acceptable before async read
       return {
-        llmContent:
-          'Could not read file because no file was found at the specified path.',
-        returnDisplay: 'File not found.',
+        llmContent: "Could not read file because no file was found at the specified path.",
+        returnDisplay: "File not found.",
         error: `File not found: ${filePath}`,
         errorType: ToolErrorType.FILE_NOT_FOUND,
       };
@@ -371,9 +346,8 @@ export async function processSingleFileContent(
     const stats = await fs.promises.stat(filePath);
     if (stats.isDirectory()) {
       return {
-        llmContent:
-          'Could not read file because the provided path is a directory, not a file.',
-        returnDisplay: 'Path is a directory.',
+        llmContent: "Could not read file because the provided path is a directory, not a file.",
+        returnDisplay: "Path is a directory.",
         error: `Path is a directory, not a file: ${filePath}`,
         errorType: ToolErrorType.TARGET_IS_DIRECTORY,
       };
@@ -382,26 +356,24 @@ export async function processSingleFileContent(
     const fileSizeInMB = stats.size / (1024 * 1024);
     if (fileSizeInMB > 20) {
       return {
-        llmContent: 'File size exceeds the 20MB limit.',
-        returnDisplay: 'File size exceeds the 20MB limit.',
+        llmContent: "File size exceeds the 20MB limit.",
+        returnDisplay: "File size exceeds the 20MB limit.",
         error: `File size exceeds the 20MB limit: ${filePath} (${fileSizeInMB.toFixed(2)}MB)`,
         errorType: ToolErrorType.FILE_TOO_LARGE,
       };
     }
 
     const fileType = await detectFileType(filePath);
-    const relativePathForDisplay = path
-      .relative(rootDirectory, filePath)
-      .replace(/\\/g, '/');
+    const relativePathForDisplay = path.relative(rootDirectory, filePath).replace(/\\/g, "/");
 
     switch (fileType) {
-      case 'binary': {
+      case "binary": {
         return {
           llmContent: `Cannot display content of binary file: ${relativePathForDisplay}`,
           returnDisplay: `Skipped binary file: ${relativePathForDisplay}`,
         };
       }
-      case 'svg': {
+      case "svg": {
         const SVG_MAX_SIZE_BYTES = 1 * 1024 * 1024;
         if (stats.size > SVG_MAX_SIZE_BYTES) {
           return {
@@ -415,15 +387,14 @@ export async function processSingleFileContent(
           returnDisplay: `Read SVG as text: ${relativePathForDisplay}`,
         };
       }
-      case 'text': {
+      case "text": {
         // Use BOM-aware reader to avoid leaving a BOM character in content and to support UTF-16/32 transparently
         const content = await readFileWithEncoding(filePath);
-        const lines = content.split('\n');
+        const lines = content.split("\n");
         const originalLineCount = lines.length;
 
         const startLine = offset || 0;
-        const effectiveLimit =
-          limit === undefined ? DEFAULT_MAX_LINES_TEXT_FILE : limit;
+        const effectiveLimit = limit === undefined ? DEFAULT_MAX_LINES_TEXT_FILE : limit;
         // Ensure endLine does not exceed originalLineCount
         const endLine = Math.min(startLine + effectiveLimit, originalLineCount);
         // Ensure selectedLines doesn't try to slice beyond array bounds if startLine is too high
@@ -434,26 +405,23 @@ export async function processSingleFileContent(
         const formattedLines = selectedLines.map((line) => {
           if (line.length > MAX_LINE_LENGTH_TEXT_FILE) {
             linesWereTruncatedInLength = true;
-            return (
-              line.substring(0, MAX_LINE_LENGTH_TEXT_FILE) + '... [truncated]'
-            );
+            return line.substring(0, MAX_LINE_LENGTH_TEXT_FILE) + "... [truncated]";
           }
           return line;
         });
 
-        const contentRangeTruncated =
-          startLine > 0 || endLine < originalLineCount;
+        const contentRangeTruncated = startLine > 0 || endLine < originalLineCount;
         const isTruncated = contentRangeTruncated || linesWereTruncatedInLength;
-        const llmContent = formattedLines.join('\n');
+        const llmContent = formattedLines.join("\n");
 
         // By default, return nothing to streamline the common case of a successful read_file.
-        let returnDisplay = '';
+        let returnDisplay = "";
         if (contentRangeTruncated) {
           returnDisplay = `Read lines ${
             actualStartLine + 1
           }-${endLine} of ${originalLineCount} from ${relativePathForDisplay}`;
           if (linesWereTruncatedInLength) {
-            returnDisplay += ' (some lines were shortened)';
+            returnDisplay += " (some lines were shortened)";
           }
         } else if (linesWereTruncatedInLength) {
           returnDisplay = `Read all ${originalLineCount} lines from ${relativePathForDisplay} (some lines were shortened)`;
@@ -467,17 +435,17 @@ export async function processSingleFileContent(
           linesShown: [actualStartLine + 1, endLine],
         };
       }
-      case 'image':
-      case 'pdf':
-      case 'audio':
-      case 'video': {
+      case "image":
+      case "pdf":
+      case "audio":
+      case "video": {
         const contentBuffer = await fs.promises.readFile(filePath);
-        const base64Data = contentBuffer.toString('base64');
+        const base64Data = contentBuffer.toString("base64");
         return {
           llmContent: {
             inlineData: {
               data: base64Data,
-              mimeType: mime.getType(filePath) || 'application/octet-stream',
+              mimeType: mime.getType(filePath) || "application/octet-stream",
             },
           },
           returnDisplay: `Read ${fileType} file: ${relativePathForDisplay}`,
@@ -495,9 +463,7 @@ export async function processSingleFileContent(
     }
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    const displayPath = path
-      .relative(rootDirectory, filePath)
-      .replace(/\\/g, '/');
+    const displayPath = path.relative(rootDirectory, filePath).replace(/\\/g, "/");
     return {
       llmContent: `Error reading file ${displayPath}: ${errorMessage}`,
       returnDisplay: `Error reading file ${displayPath}: ${errorMessage}`,
diff --git a/packages/gemini-core/src/utils/filesearch/crawlCache.test.ts b/packages/gemini-core/src/utils/filesearch/crawlCache.test.ts
index c8ca0df2e..7a1ec5b06 100644
--- a/packages/gemini-core/src/utils/filesearch/crawlCache.test.ts
+++ b/packages/gemini-core/src/utils/filesearch/crawlCache.test.ts
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
-import { getCacheKey, read, write, clear } from './crawlCache.js';
-
-describe('CrawlCache', () => {
-  describe('getCacheKey', () => {
-    it('should generate a consistent hash', () => {
-      const key1 = getCacheKey('/foo', 'bar');
-      const key2 = getCacheKey('/foo', 'bar');
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { clear, getCacheKey, read, write } from "./crawlCache.js";
+
+describe("CrawlCache", () => {
+  describe("getCacheKey", () => {
+    it("should generate a consistent hash", () => {
+      const key1 = getCacheKey("/foo", "bar");
+      const key2 = getCacheKey("/foo", "bar");
       expect(key1).toBe(key2);
     });
 
-    it('should generate a different hash for different directories', () => {
-      const key1 = getCacheKey('/foo', 'bar');
-      const key2 = getCacheKey('/bar', 'bar');
+    it("should generate a different hash for different directories", () => {
+      const key1 = getCacheKey("/foo", "bar");
+      const key2 = getCacheKey("/bar", "bar");
       expect(key1).not.toBe(key2);
     });
 
-    it('should generate a different hash for different ignore content', () => {
-      const key1 = getCacheKey('/foo', 'bar');
-      const key2 = getCacheKey('/foo', 'baz');
+    it("should generate a different hash for different ignore content", () => {
+      const key1 = getCacheKey("/foo", "bar");
+      const key2 = getCacheKey("/foo", "baz");
       expect(key1).not.toBe(key2);
     });
 
-    it('should generate a different hash for different maxDepth values', () => {
-      const key1 = getCacheKey('/foo', 'bar', 1);
-      const key2 = getCacheKey('/foo', 'bar', 2);
-      const key3 = getCacheKey('/foo', 'bar', undefined);
-      const key4 = getCacheKey('/foo', 'bar');
+    it("should generate a different hash for different maxDepth values", () => {
+      const key1 = getCacheKey("/foo", "bar", 1);
+      const key2 = getCacheKey("/foo", "bar", 2);
+      const key3 = getCacheKey("/foo", "bar", undefined);
+      const key4 = getCacheKey("/foo", "bar");
       expect(key1).not.toBe(key2);
       expect(key1).not.toBe(key3);
       expect(key2).not.toBe(key3);
@@ -39,7 +39,7 @@ describe('CrawlCache', () => {
     });
   });
 
-  describe('in-memory cache operations', () => {
+  describe("in-memory cache operations", () => {
     beforeEach(() => {
       // Ensure a clean slate before each test
       clear();
@@ -50,32 +50,32 @@ describe('CrawlCache', () => {
       vi.useRealTimers();
     });
 
-    it('should write and read data from the cache', () => {
-      const key = 'test-key';
-      const data = ['foo', 'bar'];
+    it("should write and read data from the cache", () => {
+      const key = "test-key";
+      const data = ["foo", "bar"];
       write(key, data, 10000); // 10 second TTL
       const cachedData = read(key);
       expect(cachedData).toEqual(data);
     });
 
-    it('should return undefined for a nonexistent key', () => {
-      const cachedData = read('nonexistent-key');
+    it("should return undefined for a nonexistent key", () => {
+      const cachedData = read("nonexistent-key");
       expect(cachedData).toBeUndefined();
     });
 
-    it('should clear the cache', () => {
-      const key = 'test-key';
-      const data = ['foo', 'bar'];
+    it("should clear the cache", () => {
+      const key = "test-key";
+      const data = ["foo", "bar"];
       write(key, data, 10000);
       clear();
       const cachedData = read(key);
       expect(cachedData).toBeUndefined();
     });
 
-    it('should automatically evict a cache entry after its TTL expires', async () => {
+    it("should automatically evict a cache entry after its TTL expires", async () => {
       vi.useFakeTimers();
-      const key = 'ttl-key';
-      const data = ['foo'];
+      const key = "ttl-key";
+      const data = ["foo"];
       const ttl = 5000; // 5 seconds
 
       write(key, data, ttl);
@@ -92,11 +92,11 @@ describe('CrawlCache', () => {
       expect(read(key)).toBeUndefined();
     });
 
-    it('should reset the timer when an entry is updated', async () => {
+    it("should reset the timer when an entry is updated", async () => {
       vi.useFakeTimers();
-      const key = 'update-key';
-      const initialData = ['initial'];
-      const updatedData = ['updated'];
+      const key = "update-key";
+      const initialData = ["initial"];
+      const updatedData = ["updated"];
       const ttl = 5000; // 5 seconds
 
       // Write initial data
diff --git a/packages/gemini-core/src/utils/filesearch/crawlCache.ts b/packages/gemini-core/src/utils/filesearch/crawlCache.ts
index b905c9dfc..b13cf6812 100644
--- a/packages/gemini-core/src/utils/filesearch/crawlCache.ts
+++ b/packages/gemini-core/src/utils/filesearch/crawlCache.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import crypto from 'node:crypto';
+import crypto from "node:crypto";
 
 const crawlCache = new Map<string, string[]>();
 const cacheTimers = new Map<string, NodeJS.Timeout>();
@@ -19,13 +19,13 @@ export const getCacheKey = (
   ignoreContent: string,
   maxDepth?: number,
 ): string => {
-  const hash = crypto.createHash('sha256');
+  const hash = crypto.createHash("sha256");
   hash.update(directory);
   hash.update(ignoreContent);
   if (maxDepth !== undefined) {
     hash.update(String(maxDepth));
   }
-  return hash.digest('hex');
+  return hash.digest("hex");
 };
 
 /**
diff --git a/packages/gemini-core/src/utils/filesearch/crawler.test.ts b/packages/gemini-core/src/utils/filesearch/crawler.test.ts
index c2865f440..2bef4654b 100644
--- a/packages/gemini-core/src/utils/filesearch/crawler.test.ts
+++ b/packages/gemini-core/src/utils/filesearch/crawler.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach, vi, beforeEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as cache from './crawlCache.js';
-import { crawl } from './crawler.js';
-import { createTmpDir, cleanupTmpDir } from '@google/gemini-cli-test-utils';
-import type { Ignore } from './ignore.js';
-import { loadIgnoreRules } from './ignore.js';
-
-describe('crawler', () => {
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { cleanupTmpDir, createTmpDir } from "@google/gemini-cli-test-utils";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import * as cache from "./crawlCache.js";
+import { crawl } from "./crawler.js";
+import type { Ignore } from "./ignore.js";
+import { loadIgnoreRules } from "./ignore.js";
+
+describe("crawler", () => {
   let tmpDir: string;
   afterEach(async () => {
     if (tmpDir) {
@@ -22,11 +22,11 @@ describe('crawler', () => {
     vi.restoreAllMocks();
   });
 
-  it('should use .geminiignore rules', async () => {
+  it("should use .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.geminiignore': 'dist/',
-      dist: ['ignored.js'],
-      src: ['not-ignored.js'],
+      ".geminiignore": "dist/",
+      dist: ["ignored.js"],
+      src: ["not-ignored.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -45,22 +45,17 @@ describe('crawler', () => {
     });
 
     expect(results).toEqual(
-      expect.arrayContaining([
-        '.',
-        'src/',
-        '.geminiignore',
-        'src/not-ignored.js',
-      ]),
+      expect.arrayContaining([".", "src/", ".geminiignore", "src/not-ignored.js"]),
     );
   });
 
-  it('should combine .gitignore and .geminiignore rules', async () => {
+  it("should combine .gitignore and .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': 'dist/',
-      '.geminiignore': 'build/',
-      dist: ['ignored-by-git.js'],
-      build: ['ignored-by-gemini.js'],
-      src: ['not-ignored.js'],
+      ".gitignore": "dist/",
+      ".geminiignore": "build/",
+      dist: ["ignored-by-git.js"],
+      build: ["ignored-by-gemini.js"],
+      src: ["not-ignored.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -79,27 +74,21 @@ describe('crawler', () => {
     });
 
     expect(results).toEqual(
-      expect.arrayContaining([
-        '.',
-        'src/',
-        '.geminiignore',
-        '.gitignore',
-        'src/not-ignored.js',
-      ]),
+      expect.arrayContaining([".", "src/", ".geminiignore", ".gitignore", "src/not-ignored.js"]),
     );
   });
 
-  it('should use ignoreDirs option', async () => {
+  it("should use ignoreDirs option", async () => {
     tmpDir = await createTmpDir({
-      logs: ['some.log'],
-      src: ['main.js'],
+      logs: ["some.log"],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
       useGitignore: false,
       useGeminiignore: false,
-      ignoreDirs: ['logs'],
+      ignoreDirs: ["logs"],
     });
 
     const results = await crawl({
@@ -110,21 +99,17 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', 'src/main.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", "src/main.js"]));
   });
 
-  it('should handle negated directories', async () => {
+  it("should handle negated directories", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['build/**', '!build/public', '!build/public/**'].join(
-        '\n',
-      ),
+      ".gitignore": ["build/**", "!build/public", "!build/public/**"].join("\n"),
       build: {
-        'private.js': '',
-        public: ['index.html'],
+        "private.js": "",
+        public: ["index.html"],
       },
-      src: ['main.js'],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -144,22 +129,22 @@ describe('crawler', () => {
 
     expect(results).toEqual(
       expect.arrayContaining([
-        '.',
-        'build/',
-        'build/public/',
-        'src/',
-        '.gitignore',
-        'build/public/index.html',
-        'src/main.js',
+        ".",
+        "build/",
+        "build/public/",
+        "src/",
+        ".gitignore",
+        "build/public/index.html",
+        "src/main.js",
       ]),
     );
   });
 
-  it('should handle root-level file negation', async () => {
+  it("should handle root-level file negation", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['*.mk', '!Foo.mk'].join('\n'),
-      'bar.mk': '',
-      'Foo.mk': '',
+      ".gitignore": ["*.mk", "!Foo.mk"].join("\n"),
+      "bar.mk": "",
+      "Foo.mk": "",
     });
 
     const ignore = loadIgnoreRules({
@@ -177,26 +162,24 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', '.gitignore', 'Foo.mk', 'bar.mk']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", ".gitignore", "Foo.mk", "bar.mk"]));
   });
 
-  it('should handle directory negation with glob', async () => {
+  it("should handle directory negation with glob", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': [
-        'third_party/**',
-        '!third_party/foo',
-        '!third_party/foo/bar',
-        '!third_party/foo/bar/baz_buffer',
-      ].join('\n'),
+      ".gitignore": [
+        "third_party/**",
+        "!third_party/foo",
+        "!third_party/foo/bar",
+        "!third_party/foo/bar/baz_buffer",
+      ].join("\n"),
       third_party: {
         foo: {
           bar: {
-            baz_buffer: '',
+            baz_buffer: "",
           },
         },
-        ignore_this: '',
+        ignore_this: "",
       },
     });
 
@@ -217,21 +200,21 @@ describe('crawler', () => {
 
     expect(results).toEqual(
       expect.arrayContaining([
-        '.',
-        'third_party/',
-        'third_party/foo/',
-        'third_party/foo/bar/',
-        '.gitignore',
-        'third_party/foo/bar/baz_buffer',
+        ".",
+        "third_party/",
+        "third_party/foo/",
+        "third_party/foo/bar/",
+        ".gitignore",
+        "third_party/foo/bar/baz_buffer",
       ]),
     );
   });
 
-  it('should correctly handle negated patterns in .gitignore', async () => {
+  it("should correctly handle negated patterns in .gitignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['dist/**', '!dist/keep.js'].join('\n'),
-      dist: ['ignore.js', 'keep.js'],
-      src: ['main.js'],
+      ".gitignore": ["dist/**", "!dist/keep.js"].join("\n"),
+      dist: ["ignore.js", "keep.js"],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -250,20 +233,13 @@ describe('crawler', () => {
     });
 
     expect(results).toEqual(
-      expect.arrayContaining([
-        '.',
-        'dist/',
-        'src/',
-        '.gitignore',
-        'dist/keep.js',
-        'src/main.js',
-      ]),
+      expect.arrayContaining([".", "dist/", "src/", ".gitignore", "dist/keep.js", "src/main.js"]),
     );
   });
 
-  it('should initialize correctly when ignore files are missing', async () => {
+  it("should initialize correctly when ignore files are missing", async () => {
     tmpDir = await createTmpDir({
-      src: ['file1.js'],
+      src: ["file1.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -280,15 +256,13 @@ describe('crawler', () => {
       cache: false,
       cacheTtl: 0,
     });
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', 'src/file1.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", "src/file1.js"]));
   });
 
-  it('should handle empty or commented-only ignore files', async () => {
+  it("should handle empty or commented-only ignore files", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '# This is a comment\n\n   \n',
-      src: ['main.js'],
+      ".gitignore": "# This is a comment\n\n   \n",
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -306,15 +280,13 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', '.gitignore', 'src/main.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", ".gitignore", "src/main.js"]));
   });
 
-  it('should always ignore the .git directory', async () => {
+  it("should always ignore the .git directory", async () => {
     tmpDir = await createTmpDir({
-      '.git': ['config', 'HEAD'],
-      src: ['main.js'],
+      ".git": ["config", "HEAD"],
+      src: ["main.js"],
     });
 
     const ignore = loadIgnoreRules({
@@ -332,12 +304,10 @@ describe('crawler', () => {
       cacheTtl: 0,
     });
 
-    expect(results).toEqual(
-      expect.arrayContaining(['.', 'src/', 'src/main.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining([".", "src/", "src/main.js"]));
   });
 
-  describe('with in-memory cache', () => {
+  describe("with in-memory cache", () => {
     beforeEach(() => {
       cache.clear();
       vi.useFakeTimers();
@@ -347,8 +317,8 @@ describe('crawler', () => {
       vi.useRealTimers();
     });
 
-    it('should hit the cache for subsequent crawls', async () => {
-      tmpDir = await createTmpDir({ 'file1.js': '' });
+    it("should hit the cache for subsequent crawls", async () => {
+      tmpDir = await createTmpDir({ "file1.js": "" });
       const ignore = loadIgnoreRules({
         projectRoot: tmpDir,
         useGitignore: false,
@@ -363,7 +333,7 @@ describe('crawler', () => {
         cacheTtl: 10,
       };
 
-      const crawlSpy = vi.spyOn(cache, 'read');
+      const crawlSpy = vi.spyOn(cache, "read");
 
       await crawl(options);
       expect(crawlSpy).toHaveBeenCalledTimes(1);
@@ -380,11 +350,11 @@ describe('crawler', () => {
       expect(cache.read(cacheKey)).toBeDefined();
     });
 
-    it('should miss the cache when ignore rules change', async () => {
+    it("should miss the cache when ignore rules change", async () => {
       tmpDir = await createTmpDir({
-        '.gitignore': 'a.txt',
-        'a.txt': '',
-        'b.txt': '',
+        ".gitignore": "a.txt",
+        "a.txt": "",
+        "b.txt": "",
       });
       const getIgnore = () =>
         loadIgnoreRules({
@@ -404,23 +374,19 @@ describe('crawler', () => {
       // Initial crawl to populate the cache
       const ignore1 = getIgnore();
       const results1 = await crawl(getOptions(ignore1));
-      expect(results1).toEqual(
-        expect.arrayContaining(['.', '.gitignore', 'b.txt']),
-      );
+      expect(results1).toEqual(expect.arrayContaining([".", ".gitignore", "b.txt"]));
 
       // Modify the ignore file
-      await fs.writeFile(path.join(tmpDir, '.gitignore'), 'b.txt');
+      await fs.writeFile(path.join(tmpDir, ".gitignore"), "b.txt");
 
       // Second crawl should miss the cache and trigger a recrawl
       const ignore2 = getIgnore();
       const results2 = await crawl(getOptions(ignore2));
-      expect(results2).toEqual(
-        expect.arrayContaining(['.', '.gitignore', 'a.txt']),
-      );
+      expect(results2).toEqual(expect.arrayContaining([".", ".gitignore", "a.txt"]));
     });
 
-    it('should miss the cache after TTL expires', async () => {
-      tmpDir = await createTmpDir({ 'file1.js': '' });
+    it("should miss the cache after TTL expires", async () => {
+      tmpDir = await createTmpDir({ "file1.js": "" });
       const ignore = loadIgnoreRules({
         projectRoot: tmpDir,
         useGitignore: false,
@@ -435,8 +401,8 @@ describe('crawler', () => {
         cacheTtl: 10, // 10 seconds
       };
 
-      const readSpy = vi.spyOn(cache, 'read');
-      const writeSpy = vi.spyOn(cache, 'write');
+      const readSpy = vi.spyOn(cache, "read");
+      const writeSpy = vi.spyOn(cache, "write");
 
       await crawl(options);
       expect(readSpy).toHaveBeenCalledTimes(1);
@@ -450,8 +416,8 @@ describe('crawler', () => {
       expect(writeSpy).toHaveBeenCalledTimes(2);
     });
 
-    it('should miss the cache when maxDepth changes', async () => {
-      tmpDir = await createTmpDir({ 'file1.js': '' });
+    it("should miss the cache when maxDepth changes", async () => {
+      tmpDir = await createTmpDir({ "file1.js": "" });
       const ignore = loadIgnoreRules({
         projectRoot: tmpDir,
         useGitignore: false,
@@ -467,8 +433,8 @@ describe('crawler', () => {
         maxDepth,
       });
 
-      const readSpy = vi.spyOn(cache, 'read');
-      const writeSpy = vi.spyOn(cache, 'write');
+      const readSpy = vi.spyOn(cache, "read");
+      const writeSpy = vi.spyOn(cache, "write");
 
       // 1. First crawl with maxDepth: 1
       await crawl(getOptions(1));
@@ -487,16 +453,16 @@ describe('crawler', () => {
     });
   });
 
-  describe('with maxDepth', () => {
+  describe("with maxDepth", () => {
     beforeEach(async () => {
       tmpDir = await createTmpDir({
-        'file-root.txt': '',
+        "file-root.txt": "",
         level1: {
-          'file-level1.txt': '',
+          "file-level1.txt": "",
           level2: {
-            'file-level2.txt': '',
+            "file-level2.txt": "",
             level3: {
-              'file-level3.txt': '',
+              "file-level3.txt": "",
             },
           },
         },
@@ -520,53 +486,51 @@ describe('crawler', () => {
       });
     };
 
-    it('should only crawl top-level files when maxDepth is 0', async () => {
+    it("should only crawl top-level files when maxDepth is 0", async () => {
       const results = await getCrawlResults(0);
-      expect(results).toEqual(
-        expect.arrayContaining(['.', 'level1/', 'file-root.txt']),
-      );
+      expect(results).toEqual(expect.arrayContaining([".", "level1/", "file-root.txt"]));
     });
 
-    it('should crawl one level deep when maxDepth is 1', async () => {
+    it("should crawl one level deep when maxDepth is 1", async () => {
       const results = await getCrawlResults(1);
       expect(results).toEqual(
         expect.arrayContaining([
-          '.',
-          'level1/',
-          'level1/level2/',
-          'file-root.txt',
-          'level1/file-level1.txt',
+          ".",
+          "level1/",
+          "level1/level2/",
+          "file-root.txt",
+          "level1/file-level1.txt",
         ]),
       );
     });
 
-    it('should crawl two levels deep when maxDepth is 2', async () => {
+    it("should crawl two levels deep when maxDepth is 2", async () => {
       const results = await getCrawlResults(2);
       expect(results).toEqual(
         expect.arrayContaining([
-          '.',
-          'level1/',
-          'level1/level2/',
-          'level1/level2/level3/',
-          'file-root.txt',
-          'level1/file-level1.txt',
-          'level1/level2/file-level2.txt',
+          ".",
+          "level1/",
+          "level1/level2/",
+          "level1/level2/level3/",
+          "file-root.txt",
+          "level1/file-level1.txt",
+          "level1/level2/file-level2.txt",
         ]),
       );
     });
 
-    it('should perform a full recursive crawl when maxDepth is undefined', async () => {
+    it("should perform a full recursive crawl when maxDepth is undefined", async () => {
       const results = await getCrawlResults(undefined);
       expect(results).toEqual(
         expect.arrayContaining([
-          '.',
-          'level1/',
-          'level1/level2/',
-          'level1/level2/level3/',
-          'file-root.txt',
-          'level1/file-level1.txt',
-          'level1/level2/file-level2.txt',
-          'level1/level2/level3/file-level3.txt',
+          ".",
+          "level1/",
+          "level1/level2/",
+          "level1/level2/level3/",
+          "file-root.txt",
+          "level1/file-level1.txt",
+          "level1/level2/file-level2.txt",
+          "level1/level2/level3/file-level3.txt",
         ]),
       );
     });
diff --git a/packages/gemini-core/src/utils/filesearch/crawler.ts b/packages/gemini-core/src/utils/filesearch/crawler.ts
index 9184ba328..4a1b7f22d 100644
--- a/packages/gemini-core/src/utils/filesearch/crawler.ts
+++ b/packages/gemini-core/src/utils/filesearch/crawler.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { fdir } from 'fdir';
-import type { Ignore } from './ignore.js';
-import * as cache from './crawlCache.js';
+import path from "node:path";
+import { fdir } from "fdir";
+import * as cache from "./crawlCache.js";
+import type { Ignore } from "./ignore.js";
 
 export interface CrawlOptions {
   // The directory to start the crawl from.
@@ -50,7 +50,7 @@ export async function crawl(options: CrawlOptions): Promise<string[]> {
     const api = new fdir()
       .withRelativePaths()
       .withDirs()
-      .withPathSeparator('/') // Always use unix style paths
+      .withPathSeparator("/") // Always use unix style paths
       .exclude((_, dirPath) => {
         const relativePath = path.posix.relative(posixCrawlDirectory, dirPath);
         return dirFilter(`${relativePath}/`);
@@ -68,9 +68,7 @@ export async function crawl(options: CrawlOptions): Promise<string[]> {
 
   const relativeToCrawlDir = path.posix.relative(posixCwd, posixCrawlDirectory);
 
-  const relativeToCwdResults = results.map((p) =>
-    path.posix.join(relativeToCrawlDir, p),
-  );
+  const relativeToCwdResults = results.map((p) => path.posix.join(relativeToCrawlDir, p));
 
   if (options.cache) {
     const cacheKey = cache.getCacheKey(
diff --git a/packages/gemini-core/src/utils/filesearch/fileSearch.test.ts b/packages/gemini-core/src/utils/filesearch/fileSearch.test.ts
index 1b61cdf3f..60804aad3 100644
--- a/packages/gemini-core/src/utils/filesearch/fileSearch.test.ts
+++ b/packages/gemini-core/src/utils/filesearch/fileSearch.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach, vi } from 'vitest';
-import { FileSearchFactory, AbortError, filter } from './fileSearch.js';
-import { createTmpDir, cleanupTmpDir } from '@google/gemini-cli-test-utils';
+import { cleanupTmpDir, createTmpDir } from "@google/gemini-cli-test-utils";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { AbortError, FileSearchFactory, filter } from "./fileSearch.js";
 
-describe('FileSearch', () => {
+describe("FileSearch", () => {
   let tmpDir: string;
   afterEach(async () => {
     if (tmpDir) {
@@ -17,11 +17,11 @@ describe('FileSearch', () => {
     vi.restoreAllMocks();
   });
 
-  it('should use .geminiignore rules', async () => {
+  it("should use .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.geminiignore': 'dist/',
-      dist: ['ignored.js'],
-      src: ['not-ignored.js'],
+      ".geminiignore": "dist/",
+      dist: ["ignored.js"],
+      src: ["not-ignored.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -36,18 +36,18 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', '.geminiignore', 'src/not-ignored.js']);
+    expect(results).toEqual(["src/", ".geminiignore", "src/not-ignored.js"]);
   });
 
-  it('should combine .gitignore and .geminiignore rules', async () => {
+  it("should combine .gitignore and .geminiignore rules", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': 'dist/',
-      '.geminiignore': 'build/',
-      dist: ['ignored-by-git.js'],
-      build: ['ignored-by-gemini.js'],
-      src: ['not-ignored.js'],
+      ".gitignore": "dist/",
+      ".geminiignore": "build/",
+      dist: ["ignored-by-git.js"],
+      build: ["ignored-by-gemini.js"],
+      src: ["not-ignored.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -62,27 +62,22 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual([
-      'src/',
-      '.geminiignore',
-      '.gitignore',
-      'src/not-ignored.js',
-    ]);
+    expect(results).toEqual(["src/", ".geminiignore", ".gitignore", "src/not-ignored.js"]);
   });
 
-  it('should use ignoreDirs option', async () => {
+  it("should use ignoreDirs option", async () => {
     tmpDir = await createTmpDir({
-      logs: ['some.log'],
-      src: ['main.js'],
+      logs: ["some.log"],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
       projectRoot: tmpDir,
       useGitignore: false,
       useGeminiignore: false,
-      ignoreDirs: ['logs'],
+      ignoreDirs: ["logs"],
       cache: false,
       cacheTtl: 0,
       enableRecursiveFileSearch: true,
@@ -90,21 +85,19 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', 'src/main.js']);
+    expect(results).toEqual(["src/", "src/main.js"]);
   });
 
-  it('should handle negated directories', async () => {
+  it("should handle negated directories", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['build/**', '!build/public', '!build/public/**'].join(
-        '\n',
-      ),
+      ".gitignore": ["build/**", "!build/public", "!build/public/**"].join("\n"),
       build: {
-        'private.js': '',
-        public: ['index.html'],
+        "private.js": "",
+        public: ["index.html"],
       },
-      src: ['main.js'],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -119,24 +112,24 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
     expect(results).toEqual([
-      'build/',
-      'build/public/',
-      'src/',
-      '.gitignore',
-      'build/public/index.html',
-      'src/main.js',
+      "build/",
+      "build/public/",
+      "src/",
+      ".gitignore",
+      "build/public/index.html",
+      "src/main.js",
     ]);
   });
 
-  it('should filter results with a search pattern', async () => {
+  it("should filter results with a search pattern", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'main.js': '',
-        'util.ts': '',
-        'style.css': '',
+        "main.js": "",
+        "util.ts": "",
+        "style.css": "",
       },
     });
 
@@ -152,16 +145,16 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('**/*.js');
+    const results = await fileSearch.search("**/*.js");
 
-    expect(results).toEqual(['src/main.js']);
+    expect(results).toEqual(["src/main.js"]);
   });
 
-  it('should handle root-level file negation', async () => {
+  it("should handle root-level file negation", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['*.mk', '!Foo.mk'].join('\n'),
-      'bar.mk': '',
-      'Foo.mk': '',
+      ".gitignore": ["*.mk", "!Foo.mk"].join("\n"),
+      "bar.mk": "",
+      "Foo.mk": "",
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -176,26 +169,26 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['.gitignore', 'Foo.mk']);
+    expect(results).toEqual([".gitignore", "Foo.mk"]);
   });
 
-  it('should handle directory negation with glob', async () => {
+  it("should handle directory negation with glob", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': [
-        'third_party/**',
-        '!third_party/foo',
-        '!third_party/foo/bar',
-        '!third_party/foo/bar/baz_buffer',
-      ].join('\n'),
+      ".gitignore": [
+        "third_party/**",
+        "!third_party/foo",
+        "!third_party/foo/bar",
+        "!third_party/foo/bar/baz_buffer",
+      ].join("\n"),
       third_party: {
         foo: {
           bar: {
-            baz_buffer: '',
+            baz_buffer: "",
           },
         },
-        ignore_this: '',
+        ignore_this: "",
       },
     });
 
@@ -211,22 +204,22 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
     expect(results).toEqual([
-      'third_party/',
-      'third_party/foo/',
-      'third_party/foo/bar/',
-      '.gitignore',
-      'third_party/foo/bar/baz_buffer',
+      "third_party/",
+      "third_party/foo/",
+      "third_party/foo/bar/",
+      ".gitignore",
+      "third_party/foo/bar/baz_buffer",
     ]);
   });
 
-  it('should correctly handle negated patterns in .gitignore', async () => {
+  it("should correctly handle negated patterns in .gitignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': ['dist/**', '!dist/keep.js'].join('\n'),
-      dist: ['ignore.js', 'keep.js'],
-      src: ['main.js'],
+      ".gitignore": ["dist/**", "!dist/keep.js"].join("\n"),
+      dist: ["ignore.js", "keep.js"],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -241,22 +234,16 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual([
-      'dist/',
-      'src/',
-      '.gitignore',
-      'dist/keep.js',
-      'src/main.js',
-    ]);
+    expect(results).toEqual(["dist/", "src/", ".gitignore", "dist/keep.js", "src/main.js"]);
   });
 
   // New test cases start here
 
-  it('should initialize correctly when ignore files are missing', async () => {
+  it("should initialize correctly when ignore files are missing", async () => {
     tmpDir = await createTmpDir({
-      src: ['file1.js'],
+      src: ["file1.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -272,17 +259,17 @@ describe('FileSearch', () => {
 
     // Expect no errors to be thrown during initialization
     await expect(fileSearch.initialize()).resolves.toBeUndefined();
-    const results = await fileSearch.search('');
-    expect(results).toEqual(['src/', 'src/file1.js']);
+    const results = await fileSearch.search("");
+    expect(results).toEqual(["src/", "src/file1.js"]);
   });
 
-  it('should respect maxResults option in search', async () => {
+  it("should respect maxResults option in search", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file1.js': '',
-        'file2.js': '',
-        'file3.js': '',
-        'file4.js': '',
+        "file1.js": "",
+        "file2.js": "",
+        "file3.js": "",
+        "file4.js": "",
       },
     });
 
@@ -298,17 +285,17 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('**/*.js', { maxResults: 2 });
+    const results = await fileSearch.search("**/*.js", { maxResults: 2 });
 
-    expect(results).toEqual(['src/file1.js', 'src/file2.js']); // Assuming alphabetical sort
+    expect(results).toEqual(["src/file1.js", "src/file2.js"]); // Assuming alphabetical sort
   });
 
-  it('should use fzf for fuzzy matching when pattern does not contain wildcards', async () => {
+  it("should use fzf for fuzzy matching when pattern does not contain wildcards", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'main.js': '',
-        'util.ts': '',
-        'style.css': '',
+        "main.js": "",
+        "util.ts": "",
+        "style.css": "",
       },
     });
 
@@ -324,17 +311,17 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('sst');
+    const results = await fileSearch.search("sst");
 
-    expect(results).toEqual(['src/style.css']);
+    expect(results).toEqual(["src/style.css"]);
   });
 
-  it('should not use fzf for fuzzy matching when disableFuzzySearch is true', async () => {
+  it("should not use fzf for fuzzy matching when disableFuzzySearch is true", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file1.js': '',
-        'flexible.js': '',
-        'other.ts': '',
+        "file1.js": "",
+        "flexible.js": "",
+        "other.ts": "",
       },
     });
 
@@ -350,17 +337,17 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('fle');
+    const results = await fileSearch.search("fle");
 
-    expect(results).toEqual(['src/flexible.js']);
+    expect(results).toEqual(["src/flexible.js"]);
   });
 
-  it('should use fzf for fuzzy matching when disableFuzzySearch is false', async () => {
+  it("should use fzf for fuzzy matching when disableFuzzySearch is false", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file1.js': '',
-        'flexible.js': '',
-        'other.ts': '',
+        "file1.js": "",
+        "flexible.js": "",
+        "other.ts": "",
       },
     });
 
@@ -376,16 +363,14 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('fle');
+    const results = await fileSearch.search("fle");
 
-    expect(results).toEqual(
-      expect.arrayContaining(['src/file1.js', 'src/flexible.js']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["src/file1.js", "src/flexible.js"]));
   });
 
-  it('should return empty array when no matches are found', async () => {
+  it("should return empty array when no matches are found", async () => {
     tmpDir = await createTmpDir({
-      src: ['file1.js'],
+      src: ["file1.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -400,16 +385,16 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('nonexistent-file.xyz');
+    const results = await fileSearch.search("nonexistent-file.xyz");
 
     expect(results).toEqual([]);
   });
 
-  it('should throw AbortError when filter is aborted', async () => {
+  it("should throw AbortError when filter is aborted", async () => {
     const controller = new AbortController();
     const dummyPaths = Array.from({ length: 5000 }, (_, i) => `file${i}.js`); // Large array to ensure yielding
 
-    const filterPromise = filter(dummyPaths, '*.js', controller.signal);
+    const filterPromise = filter(dummyPaths, "*.js", controller.signal);
 
     // Abort after a short delay to ensure filter has started
     setTimeout(() => controller.abort(), 1);
@@ -417,7 +402,7 @@ describe('FileSearch', () => {
     await expect(filterPromise).rejects.toThrow(AbortError);
   });
 
-  it('should throw an error if search is called before initialization', async () => {
+  it("should throw an error if search is called before initialization", async () => {
     tmpDir = await createTmpDir({});
     const fileSearch = FileSearchFactory.create({
       projectRoot: tmpDir,
@@ -430,15 +415,15 @@ describe('FileSearch', () => {
       disableFuzzySearch: false,
     });
 
-    await expect(fileSearch.search('')).rejects.toThrow(
-      'Engine not initialized. Call initialize() first.',
+    await expect(fileSearch.search("")).rejects.toThrow(
+      "Engine not initialized. Call initialize() first.",
     );
   });
 
-  it('should handle empty or commented-only ignore files', async () => {
+  it("should handle empty or commented-only ignore files", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '# This is a comment\n\n   \n',
-      src: ['main.js'],
+      ".gitignore": "# This is a comment\n\n   \n",
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -453,15 +438,15 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', '.gitignore', 'src/main.js']);
+    expect(results).toEqual(["src/", ".gitignore", "src/main.js"]);
   });
 
-  it('should always ignore the .git directory', async () => {
+  it("should always ignore the .git directory", async () => {
     tmpDir = await createTmpDir({
-      '.git': ['config', 'HEAD'],
-      src: ['main.js'],
+      ".git": ["config", "HEAD"],
+      src: ["main.js"],
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -476,15 +461,15 @@ describe('FileSearch', () => {
     });
 
     await fileSearch.initialize();
-    const results = await fileSearch.search('');
+    const results = await fileSearch.search("");
 
-    expect(results).toEqual(['src/', 'src/main.js']);
+    expect(results).toEqual(["src/", "src/main.js"]);
   });
 
-  it('should be cancellable via AbortSignal', async () => {
+  it("should be cancellable via AbortSignal", async () => {
     const largeDir: Record<string, string> = {};
     for (let i = 0; i < 100; i++) {
-      largeDir[`file${i}.js`] = '';
+      largeDir[`file${i}.js`] = "";
     }
     tmpDir = await createTmpDir(largeDir);
 
@@ -502,7 +487,7 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     const controller = new AbortController();
-    const searchPromise = fileSearch.search('**/*.js', {
+    const searchPromise = fileSearch.search("**/*.js", {
       signal: controller.signal,
     });
 
@@ -514,13 +499,13 @@ describe('FileSearch', () => {
     await expect(searchPromise).rejects.toThrow(AbortError);
   });
 
-  it('should leverage ResultCache for bestBaseQuery optimization', async () => {
+  it("should leverage ResultCache for bestBaseQuery optimization", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'foo.js': '',
-        'bar.ts': '',
+        "foo.js": "",
+        "bar.ts": "",
         nested: {
-          'baz.js': '',
+          "baz.js": "",
         },
       },
     });
@@ -539,30 +524,30 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     // Perform a broad search to prime the cache
-    const broadResults = await fileSearch.search('src/**');
+    const broadResults = await fileSearch.search("src/**");
     expect(broadResults).toEqual([
-      'src/',
-      'src/nested/',
-      'src/bar.ts',
-      'src/foo.js',
-      'src/nested/baz.js',
+      "src/",
+      "src/nested/",
+      "src/bar.ts",
+      "src/foo.js",
+      "src/nested/baz.js",
     ]);
 
     // Perform a more specific search that should leverage the broad search's cached results
-    const specificResults = await fileSearch.search('src/**/*.js');
-    expect(specificResults).toEqual(['src/foo.js', 'src/nested/baz.js']);
+    const specificResults = await fileSearch.search("src/**/*.js");
+    expect(specificResults).toEqual(["src/foo.js", "src/nested/baz.js"]);
 
     // Although we can't directly inspect ResultCache.hits/misses from here,
     // the correctness of specificResults after a broad search implicitly
     // verifies that the caching mechanism, including bestBaseQuery, is working.
   });
 
-  it('should be case-insensitive by default', async () => {
+  it("should be case-insensitive by default", async () => {
     tmpDir = await createTmpDir({
-      'File1.Js': '',
-      'file2.js': '',
-      'FILE3.JS': '',
-      'other.txt': '',
+      "File1.Js": "",
+      "file2.js": "",
+      "FILE3.JS": "",
+      "other.txt": "",
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -579,34 +564,28 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     // Search with a lowercase pattern
-    let results = await fileSearch.search('file*.js');
+    let results = await fileSearch.search("file*.js");
     expect(results).toHaveLength(3);
-    expect(results).toEqual(
-      expect.arrayContaining(['File1.Js', 'file2.js', 'FILE3.JS']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["File1.Js", "file2.js", "FILE3.JS"]));
 
     // Search with an uppercase pattern
-    results = await fileSearch.search('FILE*.JS');
+    results = await fileSearch.search("FILE*.JS");
     expect(results).toHaveLength(3);
-    expect(results).toEqual(
-      expect.arrayContaining(['File1.Js', 'file2.js', 'FILE3.JS']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["File1.Js", "file2.js", "FILE3.JS"]));
 
     // Search with a mixed-case pattern
-    results = await fileSearch.search('FiLe*.Js');
+    results = await fileSearch.search("FiLe*.Js");
     expect(results).toHaveLength(3);
-    expect(results).toEqual(
-      expect.arrayContaining(['File1.Js', 'file2.js', 'FILE3.JS']),
-    );
+    expect(results).toEqual(expect.arrayContaining(["File1.Js", "file2.js", "FILE3.JS"]));
   });
 
-  it('should respect maxResults even when the cache returns an exact match', async () => {
+  it("should respect maxResults even when the cache returns an exact match", async () => {
     tmpDir = await createTmpDir({
-      'file1.js': '',
-      'file2.js': '',
-      'file3.js': '',
-      'file4.js': '',
-      'file5.js': '',
+      "file1.js": "",
+      "file2.js": "",
+      "file3.js": "",
+      "file4.js": "",
+      "file5.js": "",
     });
 
     const fileSearch = FileSearchFactory.create({
@@ -623,27 +602,21 @@ describe('FileSearch', () => {
     await fileSearch.initialize();
 
     // 1. Perform a broad search to populate the cache with an exact match.
-    const initialResults = await fileSearch.search('*.js');
-    expect(initialResults).toEqual([
-      'file1.js',
-      'file2.js',
-      'file3.js',
-      'file4.js',
-      'file5.js',
-    ]);
+    const initialResults = await fileSearch.search("*.js");
+    expect(initialResults).toEqual(["file1.js", "file2.js", "file3.js", "file4.js", "file5.js"]);
 
     // 2. Perform the same search again, but this time with a maxResults limit.
-    const limitedResults = await fileSearch.search('*.js', { maxResults: 2 });
+    const limitedResults = await fileSearch.search("*.js", { maxResults: 2 });
 
     // 3. Assert that the maxResults limit was respected, even with a cache hit.
-    expect(limitedResults).toEqual(['file1.js', 'file2.js']);
+    expect(limitedResults).toEqual(["file1.js", "file2.js"]);
   });
 
-  it('should handle file paths with special characters that need escaping', async () => {
+  it("should handle file paths with special characters that need escaping", async () => {
     tmpDir = await createTmpDir({
       src: {
-        'file with (special) chars.txt': '',
-        'another-file.txt': '',
+        "file with (special) chars.txt": "",
+        "another-file.txt": "",
       },
     });
 
@@ -662,19 +635,17 @@ describe('FileSearch', () => {
 
     // Search for the file using a pattern that contains special characters.
     // The `unescapePath` function should handle the escaped path correctly.
-    const results = await fileSearch.search(
-      'src/file with \\(special\\) chars.txt',
-    );
+    const results = await fileSearch.search("src/file with \\(special\\) chars.txt");
 
-    expect(results).toEqual(['src/file with (special) chars.txt']);
+    expect(results).toEqual(["src/file with (special) chars.txt"]);
   });
 
-  describe('DirectoryFileSearch', () => {
-    it('should search for files in the current directory', async () => {
+  describe("DirectoryFileSearch", () => {
+    it("should search for files in the current directory", async () => {
       tmpDir = await createTmpDir({
-        'file1.js': '',
-        'file2.ts': '',
-        'file3.js': '',
+        "file1.js": "",
+        "file2.ts": "",
+        "file3.js": "",
       });
 
       const fileSearch = FileSearchFactory.create({
@@ -689,16 +660,16 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('*.js');
-      expect(results).toEqual(['file1.js', 'file3.js']);
+      const results = await fileSearch.search("*.js");
+      expect(results).toEqual(["file1.js", "file3.js"]);
     });
 
-    it('should search for files in a subdirectory', async () => {
+    it("should search for files in a subdirectory", async () => {
       tmpDir = await createTmpDir({
-        'file1.js': '',
+        "file1.js": "",
         src: {
-          'file2.js': '',
-          'file3.ts': '',
+          "file2.js": "",
+          "file3.ts": "",
         },
       });
 
@@ -714,16 +685,16 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('src/*.js');
-      expect(results).toEqual(['src/file2.js']);
+      const results = await fileSearch.search("src/*.js");
+      expect(results).toEqual(["src/file2.js"]);
     });
 
-    it('should list all files in a directory', async () => {
+    it("should list all files in a directory", async () => {
       tmpDir = await createTmpDir({
-        'file1.js': '',
+        "file1.js": "",
         src: {
-          'file2.js': '',
-          'file3.ts': '',
+          "file2.js": "",
+          "file3.ts": "",
         },
       });
 
@@ -739,15 +710,15 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('src/');
-      expect(results).toEqual(['src/file2.js', 'src/file3.ts']);
+      const results = await fileSearch.search("src/");
+      expect(results).toEqual(["src/file2.js", "src/file3.ts"]);
     });
 
-    it('should respect ignore rules', async () => {
+    it("should respect ignore rules", async () => {
       tmpDir = await createTmpDir({
-        '.gitignore': '*.js',
-        'file1.js': '',
-        'file2.ts': '',
+        ".gitignore": "*.js",
+        "file1.js": "",
+        "file2.ts": "",
       });
 
       const fileSearch = FileSearchFactory.create({
@@ -762,8 +733,8 @@ describe('FileSearch', () => {
       });
 
       await fileSearch.initialize();
-      const results = await fileSearch.search('*');
-      expect(results).toEqual(['.gitignore', 'file2.ts']);
+      const results = await fileSearch.search("*");
+      expect(results).toEqual([".gitignore", "file2.ts"]);
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/filesearch/fileSearch.ts b/packages/gemini-core/src/utils/filesearch/fileSearch.ts
index 046e73cf8..459629908 100644
--- a/packages/gemini-core/src/utils/filesearch/fileSearch.ts
+++ b/packages/gemini-core/src/utils/filesearch/fileSearch.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import picomatch from 'picomatch';
-import type { Ignore } from './ignore.js';
-import { loadIgnoreRules } from './ignore.js';
-import { ResultCache } from './result-cache.js';
-import { crawl } from './crawler.js';
-import type { FzfResultItem } from 'fzf';
-import { AsyncFzf } from 'fzf';
-import { unescapePath } from '../paths.js';
+import path from "node:path";
+import type { FzfResultItem } from "fzf";
+import { AsyncFzf } from "fzf";
+import picomatch from "picomatch";
+import { unescapePath } from "../paths.js";
+import { crawl } from "./crawler.js";
+import type { Ignore } from "./ignore.js";
+import { loadIgnoreRules } from "./ignore.js";
+import { ResultCache } from "./result-cache.js";
 
 export interface FileSearchOptions {
   projectRoot: string;
@@ -27,9 +27,9 @@ export interface FileSearchOptions {
 }
 
 export class AbortError extends Error {
-  constructor(message = 'Search aborted') {
+  constructor(message = "Search aborted") {
     super(message);
-    this.name = 'AbortError';
+    this.name = "AbortError";
   }
 }
 
@@ -67,8 +67,8 @@ export async function filter(
   }
 
   results.sort((a, b) => {
-    const aIsDir = a.endsWith('/');
-    const bIsDir = b.endsWith('/');
+    const aIsDir = a.endsWith("/");
+    const bIsDir = b.endsWith("/");
 
     if (aIsDir && !bIsDir) return -1;
     if (!aIsDir && bIsDir) return 1;
@@ -113,30 +113,22 @@ class RecursiveFileSearch implements FileSearch {
     this.buildResultCache();
   }
 
-  async search(
-    pattern: string,
-    options: SearchOptions = {},
-  ): Promise<string[]> {
-    if (
-      !this.resultCache ||
-      (!this.fzf && !this.options.disableFuzzySearch) ||
-      !this.ignore
-    ) {
-      throw new Error('Engine not initialized. Call initialize() first.');
+  async search(pattern: string, options: SearchOptions = {}): Promise<string[]> {
+    if (!this.resultCache || (!this.fzf && !this.options.disableFuzzySearch) || !this.ignore) {
+      throw new Error("Engine not initialized. Call initialize() first.");
     }
 
-    pattern = unescapePath(pattern) || '*';
+    pattern = unescapePath(pattern) || "*";
 
     let filteredCandidates;
-    const { files: candidates, isExactMatch } =
-      await this.resultCache!.get(pattern);
+    const { files: candidates, isExactMatch } = await this.resultCache!.get(pattern);
 
     if (isExactMatch) {
       // Use the cached result.
       filteredCandidates = candidates;
     } else {
       let shouldCache = true;
-      if (pattern.includes('*') || !this.fzf) {
+      if (pattern.includes("*") || !this.fzf) {
         filteredCandidates = await filter(candidates, pattern, options.signal);
       } else {
         filteredCandidates = await this.fzf
@@ -168,7 +160,7 @@ class RecursiveFileSearch implements FileSearch {
       if (results.length >= (options.maxResults ?? Infinity)) {
         break;
       }
-      if (candidate === '.') {
+      if (candidate === ".") {
         continue;
       }
       if (!fileFilter(candidate)) {
@@ -185,7 +177,7 @@ class RecursiveFileSearch implements FileSearch {
       // occurence of the pattern. We use it for search spaces that have >20k
       // files, because the v2 algorithm is just too slow in those cases.
       this.fzf = new AsyncFzf(this.allFiles, {
-        fuzzy: this.allFiles.length > 20000 ? 'v1' : 'v2',
+        fuzzy: this.allFiles.length > 20000 ? "v1" : "v2",
       });
     }
   }
@@ -200,16 +192,13 @@ class DirectoryFileSearch implements FileSearch {
     this.ignore = loadIgnoreRules(this.options);
   }
 
-  async search(
-    pattern: string,
-    options: SearchOptions = {},
-  ): Promise<string[]> {
+  async search(pattern: string, options: SearchOptions = {}): Promise<string[]> {
     if (!this.ignore) {
-      throw new Error('Engine not initialized. Call initialize() first.');
+      throw new Error("Engine not initialized. Call initialize() first.");
     }
-    pattern = pattern || '*';
+    pattern = pattern || "*";
 
-    const dir = pattern.endsWith('/') ? pattern : path.dirname(pattern);
+    const dir = pattern.endsWith("/") ? pattern : path.dirname(pattern);
     const results = await crawl({
       crawlDirectory: path.join(this.options.projectRoot, dir),
       cwd: this.options.projectRoot,
@@ -227,7 +216,7 @@ class DirectoryFileSearch implements FileSearch {
       if (finalResults.length >= (options.maxResults ?? Infinity)) {
         break;
       }
-      if (candidate === '.') {
+      if (candidate === ".") {
         continue;
       }
       if (!fileFilter(candidate)) {
diff --git a/packages/gemini-core/src/utils/filesearch/ignore.test.ts b/packages/gemini-core/src/utils/filesearch/ignore.test.ts
index f65ecd72c..da7ad8e97 100644
--- a/packages/gemini-core/src/utils/filesearch/ignore.test.ts
+++ b/packages/gemini-core/src/utils/filesearch/ignore.test.ts
@@ -4,68 +4,68 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach } from 'vitest';
-import { Ignore, loadIgnoreRules } from './ignore.js';
-import { createTmpDir, cleanupTmpDir } from '@google/gemini-cli-test-utils';
-
-describe('Ignore', () => {
-  describe('getDirectoryFilter', () => {
-    it('should ignore directories matching directory patterns', () => {
-      const ig = new Ignore().add(['foo/', 'bar/']);
+import { cleanupTmpDir, createTmpDir } from "@google/gemini-cli-test-utils";
+import { afterEach, describe, expect, it } from "vitest";
+import { Ignore, loadIgnoreRules } from "./ignore.js";
+
+describe("Ignore", () => {
+  describe("getDirectoryFilter", () => {
+    it("should ignore directories matching directory patterns", () => {
+      const ig = new Ignore().add(["foo/", "bar/"]);
       const dirFilter = ig.getDirectoryFilter();
-      expect(dirFilter('foo/')).toBe(true);
-      expect(dirFilter('bar/')).toBe(true);
-      expect(dirFilter('baz/')).toBe(false);
+      expect(dirFilter("foo/")).toBe(true);
+      expect(dirFilter("bar/")).toBe(true);
+      expect(dirFilter("baz/")).toBe(false);
     });
 
-    it('should not ignore directories with file patterns', () => {
-      const ig = new Ignore().add(['foo.js', '*.log']);
+    it("should not ignore directories with file patterns", () => {
+      const ig = new Ignore().add(["foo.js", "*.log"]);
       const dirFilter = ig.getDirectoryFilter();
-      expect(dirFilter('foo.js')).toBe(false);
-      expect(dirFilter('foo.log')).toBe(false);
+      expect(dirFilter("foo.js")).toBe(false);
+      expect(dirFilter("foo.log")).toBe(false);
     });
   });
 
-  describe('getFileFilter', () => {
-    it('should not ignore files with directory patterns', () => {
-      const ig = new Ignore().add(['foo/', 'bar/']);
+  describe("getFileFilter", () => {
+    it("should not ignore files with directory patterns", () => {
+      const ig = new Ignore().add(["foo/", "bar/"]);
       const fileFilter = ig.getFileFilter();
-      expect(fileFilter('foo')).toBe(false);
-      expect(fileFilter('foo/file.txt')).toBe(false);
+      expect(fileFilter("foo")).toBe(false);
+      expect(fileFilter("foo/file.txt")).toBe(false);
     });
 
-    it('should ignore files matching file patterns', () => {
-      const ig = new Ignore().add(['*.log', 'foo.js']);
+    it("should ignore files matching file patterns", () => {
+      const ig = new Ignore().add(["*.log", "foo.js"]);
       const fileFilter = ig.getFileFilter();
-      expect(fileFilter('foo.log')).toBe(true);
-      expect(fileFilter('foo.js')).toBe(true);
-      expect(fileFilter('bar.txt')).toBe(false);
+      expect(fileFilter("foo.log")).toBe(true);
+      expect(fileFilter("foo.js")).toBe(true);
+      expect(fileFilter("bar.txt")).toBe(false);
     });
   });
 
-  it('should accumulate patterns across multiple add() calls', () => {
-    const ig = new Ignore().add('foo.js');
-    ig.add('bar.js');
+  it("should accumulate patterns across multiple add() calls", () => {
+    const ig = new Ignore().add("foo.js");
+    ig.add("bar.js");
     const fileFilter = ig.getFileFilter();
-    expect(fileFilter('foo.js')).toBe(true);
-    expect(fileFilter('bar.js')).toBe(true);
-    expect(fileFilter('baz.js')).toBe(false);
+    expect(fileFilter("foo.js")).toBe(true);
+    expect(fileFilter("bar.js")).toBe(true);
+    expect(fileFilter("baz.js")).toBe(false);
   });
 
-  it('should return a stable and consistent fingerprint', () => {
-    const ig1 = new Ignore().add(['foo', '!bar']);
-    const ig2 = new Ignore().add('foo\n!bar');
+  it("should return a stable and consistent fingerprint", () => {
+    const ig1 = new Ignore().add(["foo", "!bar"]);
+    const ig2 = new Ignore().add("foo\n!bar");
 
     // Fingerprints should be identical for the same rules.
     expect(ig1.getFingerprint()).toBe(ig2.getFingerprint());
 
     // Adding a new rule should change the fingerprint.
-    ig2.add('baz');
+    ig2.add("baz");
     expect(ig1.getFingerprint()).not.toBe(ig2.getFingerprint());
   });
 });
 
-describe('loadIgnoreRules', () => {
+describe("loadIgnoreRules", () => {
   let tmpDir: string;
 
   afterEach(async () => {
@@ -74,9 +74,9 @@ describe('loadIgnoreRules', () => {
     }
   });
 
-  it('should load rules from .gitignore', async () => {
+  it("should load rules from .gitignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '*.log',
+      ".gitignore": "*.log",
     });
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -85,13 +85,13 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('test.log')).toBe(true);
-    expect(fileFilter('test.txt')).toBe(false);
+    expect(fileFilter("test.log")).toBe(true);
+    expect(fileFilter("test.txt")).toBe(false);
   });
 
-  it('should load rules from .geminiignore', async () => {
+  it("should load rules from .geminiignore", async () => {
     tmpDir = await createTmpDir({
-      '.geminiignore': '*.log',
+      ".geminiignore": "*.log",
     });
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -100,14 +100,14 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('test.log')).toBe(true);
-    expect(fileFilter('test.txt')).toBe(false);
+    expect(fileFilter("test.log")).toBe(true);
+    expect(fileFilter("test.txt")).toBe(false);
   });
 
-  it('should combine rules from .gitignore and .geminiignore', async () => {
+  it("should combine rules from .gitignore and .geminiignore", async () => {
     tmpDir = await createTmpDir({
-      '.gitignore': '*.log',
-      '.geminiignore': '*.txt',
+      ".gitignore": "*.log",
+      ".geminiignore": "*.txt",
     });
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -116,25 +116,25 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('test.log')).toBe(true);
-    expect(fileFilter('test.txt')).toBe(true);
-    expect(fileFilter('test.md')).toBe(false);
+    expect(fileFilter("test.log")).toBe(true);
+    expect(fileFilter("test.txt")).toBe(true);
+    expect(fileFilter("test.md")).toBe(false);
   });
 
-  it('should add ignoreDirs', async () => {
+  it("should add ignoreDirs", async () => {
     tmpDir = await createTmpDir({});
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
       useGitignore: false,
       useGeminiignore: false,
-      ignoreDirs: ['logs/'],
+      ignoreDirs: ["logs/"],
     });
     const dirFilter = ignore.getDirectoryFilter();
-    expect(dirFilter('logs/')).toBe(true);
-    expect(dirFilter('src/')).toBe(false);
+    expect(dirFilter("logs/")).toBe(true);
+    expect(dirFilter("src/")).toBe(false);
   });
 
-  it('should handle missing ignore files gracefully', async () => {
+  it("should handle missing ignore files gracefully", async () => {
     tmpDir = await createTmpDir({});
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -143,10 +143,10 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const fileFilter = ignore.getFileFilter();
-    expect(fileFilter('anyfile.txt')).toBe(false);
+    expect(fileFilter("anyfile.txt")).toBe(false);
   });
 
-  it('should always add .git to the ignore list', async () => {
+  it("should always add .git to the ignore list", async () => {
     tmpDir = await createTmpDir({});
     const ignore = loadIgnoreRules({
       projectRoot: tmpDir,
@@ -155,6 +155,6 @@ describe('loadIgnoreRules', () => {
       ignoreDirs: [],
     });
     const dirFilter = ignore.getDirectoryFilter();
-    expect(dirFilter('.git/')).toBe(true);
+    expect(dirFilter(".git/")).toBe(true);
   });
 });
diff --git a/packages/gemini-core/src/utils/filesearch/ignore.ts b/packages/gemini-core/src/utils/filesearch/ignore.ts
index a39066f58..e78f7af52 100644
--- a/packages/gemini-core/src/utils/filesearch/ignore.ts
+++ b/packages/gemini-core/src/utils/filesearch/ignore.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import ignore from 'ignore';
-import picomatch from 'picomatch';
+import fs from "node:fs";
+import path from "node:path";
+import ignore from "ignore";
+import picomatch from "picomatch";
 
-const hasFileExtension = picomatch('**/*[*.]*');
+const hasFileExtension = picomatch("**/*[*.]*");
 
 export interface LoadIgnoreRulesOptions {
   projectRoot: string;
@@ -21,23 +21,23 @@ export interface LoadIgnoreRulesOptions {
 export function loadIgnoreRules(options: LoadIgnoreRulesOptions): Ignore {
   const ignorer = new Ignore();
   if (options.useGitignore) {
-    const gitignorePath = path.join(options.projectRoot, '.gitignore');
+    const gitignorePath = path.join(options.projectRoot, ".gitignore");
     if (fs.existsSync(gitignorePath)) {
-      ignorer.add(fs.readFileSync(gitignorePath, 'utf8'));
+      ignorer.add(fs.readFileSync(gitignorePath, "utf8"));
     }
   }
 
   if (options.useGeminiignore) {
-    const geminiignorePath = path.join(options.projectRoot, '.geminiignore');
+    const geminiignorePath = path.join(options.projectRoot, ".geminiignore");
     if (fs.existsSync(geminiignorePath)) {
-      ignorer.add(fs.readFileSync(geminiignorePath, 'utf8'));
+      ignorer.add(fs.readFileSync(geminiignorePath, "utf8"));
     }
   }
 
-  const ignoreDirs = ['.git', ...options.ignoreDirs];
+  const ignoreDirs = [".git", ...options.ignoreDirs];
   ignorer.add(
     ignoreDirs.map((dir) => {
-      if (dir.endsWith('/')) {
+      if (dir.endsWith("/")) {
         return dir;
       }
       return `${dir}/`;
@@ -59,21 +59,20 @@ export class Ignore {
    * @returns The `Ignore` instance for chaining.
    */
   add(patterns: string | string[]): this {
-    if (typeof patterns === 'string') {
+    if (typeof patterns === "string") {
       patterns = patterns.split(/\r?\n/);
     }
 
     for (const p of patterns) {
       const pattern = p.trim();
 
-      if (pattern === '' || pattern.startsWith('#')) {
+      if (pattern === "" || pattern.startsWith("#")) {
         continue;
       }
 
       this.allPatterns.push(pattern);
 
-      const isPositiveDirPattern =
-        pattern.endsWith('/') && !pattern.startsWith('!');
+      const isPositiveDirPattern = pattern.endsWith("/") && !pattern.startsWith("!");
 
       if (isPositiveDirPattern) {
         this.dirIgnorer.add(pattern);
@@ -126,6 +125,6 @@ export class Ignore {
    * @returns A string fingerprint of the ignore patterns.
    */
   getFingerprint(): string {
-    return this.allPatterns.join('\n');
+    return this.allPatterns.join("\n");
   }
 }
diff --git a/packages/gemini-core/src/utils/filesearch/result-cache.test.ts b/packages/gemini-core/src/utils/filesearch/result-cache.test.ts
index fcfa3f00a..eb1c62d60 100644
--- a/packages/gemini-core/src/utils/filesearch/result-cache.test.ts
+++ b/packages/gemini-core/src/utils/filesearch/result-cache.test.ts
@@ -4,52 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { test, expect } from 'vitest';
-import { ResultCache } from './result-cache.js';
+import { expect, test } from "vitest";
+import { ResultCache } from "./result-cache.js";
 
-test('ResultCache basic usage', async () => {
+test("ResultCache basic usage", async () => {
   const files = [
-    'foo.txt',
-    'bar.js',
-    'baz.md',
-    'subdir/file.txt',
-    'subdir/other.js',
-    'subdir/nested/file.md',
+    "foo.txt",
+    "bar.js",
+    "baz.md",
+    "subdir/file.txt",
+    "subdir/other.js",
+    "subdir/nested/file.md",
   ];
   const cache = new ResultCache(files);
-  const { files: resultFiles, isExactMatch } = await cache.get('*.js');
+  const { files: resultFiles, isExactMatch } = await cache.get("*.js");
   expect(resultFiles).toEqual(files);
   expect(isExactMatch).toBe(false);
 });
 
-test('ResultCache cache hit/miss', async () => {
-  const files = ['foo.txt', 'bar.js', 'baz.md'];
+test("ResultCache cache hit/miss", async () => {
+  const files = ["foo.txt", "bar.js", "baz.md"];
   const cache = new ResultCache(files);
   // First call: miss
-  const { files: result1Files, isExactMatch: isExactMatch1 } =
-    await cache.get('*.js');
+  const { files: result1Files, isExactMatch: isExactMatch1 } = await cache.get("*.js");
   expect(result1Files).toEqual(files);
   expect(isExactMatch1).toBe(false);
 
   // Simulate FileSearch applying the filter and setting the result
-  cache.set('*.js', ['bar.js']);
+  cache.set("*.js", ["bar.js"]);
 
   // Second call: hit
-  const { files: result2Files, isExactMatch: isExactMatch2 } =
-    await cache.get('*.js');
-  expect(result2Files).toEqual(['bar.js']);
+  const { files: result2Files, isExactMatch: isExactMatch2 } = await cache.get("*.js");
+  expect(result2Files).toEqual(["bar.js"]);
   expect(isExactMatch2).toBe(true);
 });
 
-test('ResultCache best base query', async () => {
-  const files = ['foo.txt', 'foobar.js', 'baz.md'];
+test("ResultCache best base query", async () => {
+  const files = ["foo.txt", "foobar.js", "baz.md"];
   const cache = new ResultCache(files);
 
   // Cache a broader query
-  cache.set('foo', ['foo.txt', 'foobar.js']);
+  cache.set("foo", ["foo.txt", "foobar.js"]);
 
   // Search for a more specific query that starts with the broader one
-  const { files: resultFiles, isExactMatch } = await cache.get('foobar');
-  expect(resultFiles).toEqual(['foo.txt', 'foobar.js']);
+  const { files: resultFiles, isExactMatch } = await cache.get("foobar");
+  expect(resultFiles).toEqual(["foo.txt", "foobar.js"]);
   expect(isExactMatch).toBe(false);
 });
diff --git a/packages/gemini-core/src/utils/filesearch/result-cache.ts b/packages/gemini-core/src/utils/filesearch/result-cache.ts
index cf0c2b4b1..274444d17 100644
--- a/packages/gemini-core/src/utils/filesearch/result-cache.ts
+++ b/packages/gemini-core/src/utils/filesearch/result-cache.ts
@@ -24,9 +24,7 @@ export class ResultCache {
    * @returns An object containing the files to search and a boolean indicating
    *          if the result is an exact cache hit.
    */
-  async get(
-    query: string,
-  ): Promise<{ files: string[]; isExactMatch: boolean }> {
+  async get(query: string): Promise<{ files: string[]; isExactMatch: boolean }> {
     const isCacheHit = this.cache.has(query);
 
     if (isCacheHit) {
@@ -42,16 +40,14 @@ export class ResultCache {
     // from the results of the "foo" search.
     // This finds the most specific, already-cached query that is a prefix
     // of the current query.
-    let bestBaseQuery = '';
+    let bestBaseQuery = "";
     for (const key of this.cache?.keys?.() ?? []) {
       if (query.startsWith(key) && key.length > bestBaseQuery.length) {
         bestBaseQuery = key;
       }
     }
 
-    const filesToSearch = bestBaseQuery
-      ? this.cache.get(bestBaseQuery)!
-      : this.allFiles;
+    const filesToSearch = bestBaseQuery ? this.cache.get(bestBaseQuery)! : this.allFiles;
 
     return { files: filesToSearch, isExactMatch: false };
   }
diff --git a/packages/gemini-core/src/utils/flashFallback.test.ts b/packages/gemini-core/src/utils/flashFallback.test.ts
index a3f08f5df..6d5d3640f 100644
--- a/packages/gemini-core/src/utils/flashFallback.test.ts
+++ b/packages/gemini-core/src/utils/flashFallback.test.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { Config } from '../config/config.js';
-import fs from 'node:fs';
+import fs from "node:fs";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_FLASH_MODEL } from "../config/models.js";
+import { AuthType } from "../core/contentGenerator.js";
+// Import the new types (Assuming this test file is in packages/core/src/utils/)
+import type { FallbackModelHandler } from "../fallback/types.js";
+import type { GoogleApiError } from "./googleErrors.js";
+import { TerminalQuotaError } from "./googleQuotaErrors.js";
+import { retryWithBackoff } from "./retry.js";
 import {
-  setSimulate429,
   disableSimulationAfterFallback,
-  shouldSimulate429,
   resetRequestCounter,
-} from './testUtils.js';
-import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
-import { retryWithBackoff } from './retry.js';
-import { AuthType } from '../core/contentGenerator.js';
-// Import the new types (Assuming this test file is in packages/core/src/utils/)
-import type { FallbackModelHandler } from '../fallback/types.js';
-import type { GoogleApiError } from './googleErrors.js';
-import { TerminalQuotaError } from './googleQuotaErrors.js';
+  setSimulate429,
+  shouldSimulate429,
+} from "./testUtils.js";
 
-vi.mock('node:fs');
+vi.mock("node:fs");
 
 // Update the description to reflect that this tests the retry utility's integration
-describe('Retry Utility Fallback Integration', () => {
+describe("Retry Utility Fallback Integration", () => {
   let config: Config;
   let mockGoogleApiError: GoogleApiError;
 
@@ -34,15 +34,15 @@ describe('Retry Utility Fallback Integration', () => {
       isDirectory: () => true,
     } as fs.Stats);
     config = new Config({
-      sessionId: 'test-session',
-      targetDir: '/test',
+      sessionId: "test-session",
+      targetDir: "/test",
       debugMode: false,
-      cwd: '/test',
-      model: 'gemini-2.5-pro',
+      cwd: "/test",
+      model: "gemini-2.5-pro",
     });
     mockGoogleApiError = {
       code: 429,
-      message: 'mock error',
+      message: "mock error",
       details: [],
     };
 
@@ -52,37 +52,33 @@ describe('Retry Utility Fallback Integration', () => {
   });
 
   // This test validates the Config's ability to store and execute the handler contract.
-  it('should execute the injected FallbackHandler contract correctly', async () => {
+  it("should execute the injected FallbackHandler contract correctly", async () => {
     // Set up a minimal handler for testing, ensuring it matches the new type.
-    const fallbackHandler: FallbackModelHandler = async () => 'retry';
+    const fallbackHandler: FallbackModelHandler = async () => "retry";
 
     // Use the generalized setter
     config.setFallbackModelHandler(fallbackHandler);
 
     // Call the handler directly via the config property
     const result = await config.fallbackModelHandler!(
-      'gemini-2.5-pro',
+      "gemini-2.5-pro",
       DEFAULT_GEMINI_FLASH_MODEL,
-      new Error('test'),
+      new Error("test"),
     );
 
     // Verify it returns the correct intent
-    expect(result).toBe('retry');
+    expect(result).toBe("retry");
   });
 
   // This test validates the retry utility's logic for triggering the callback.
-  it('should trigger onPersistent429 on TerminalQuotaError for OAuth users', async () => {
+  it("should trigger onPersistent429 on TerminalQuotaError for OAuth users", async () => {
     let fallbackCalled = false;
 
     const mockApiCall = vi
       .fn()
-      .mockRejectedValueOnce(
-        new TerminalQuotaError('Daily limit', mockGoogleApiError),
-      )
-      .mockRejectedValueOnce(
-        new TerminalQuotaError('Daily limit', mockGoogleApiError),
-      )
-      .mockResolvedValueOnce('success after fallback');
+      .mockRejectedValueOnce(new TerminalQuotaError("Daily limit", mockGoogleApiError))
+      .mockRejectedValueOnce(new TerminalQuotaError("Daily limit", mockGoogleApiError))
+      .mockResolvedValueOnce("success after fallback");
 
     const mockPersistent429Callback = vi.fn(async (_authType?: string) => {
       fallbackCalled = true;
@@ -102,18 +98,16 @@ describe('Retry Utility Fallback Integration', () => {
       AuthType.LOGIN_WITH_GOOGLE,
       expect.any(TerminalQuotaError),
     );
-    expect(result).toBe('success after fallback');
+    expect(result).toBe("success after fallback");
     expect(mockApiCall).toHaveBeenCalledTimes(3);
   });
 
-  it('should not trigger onPersistent429 for API key users', async () => {
+  it("should not trigger onPersistent429 for API key users", async () => {
     const fallbackCallback = vi.fn();
 
     const mockApiCall = vi
       .fn()
-      .mockRejectedValueOnce(
-        new TerminalQuotaError('Daily limit', mockGoogleApiError),
-      );
+      .mockRejectedValueOnce(new TerminalQuotaError("Daily limit", mockGoogleApiError));
 
     const promise = retryWithBackoff(mockApiCall, {
       maxAttempts: 2,
@@ -123,13 +117,13 @@ describe('Retry Utility Fallback Integration', () => {
       authType: AuthType.USE_GEMINI, // API key auth type
     });
 
-    await expect(promise).rejects.toThrow('Daily limit');
+    await expect(promise).rejects.toThrow("Daily limit");
     expect(fallbackCallback).not.toHaveBeenCalled();
     expect(mockApiCall).toHaveBeenCalledTimes(1);
   });
 
   // This test validates the test utilities themselves.
-  it('should properly disable simulation state after fallback (Test Utility)', () => {
+  it("should properly disable simulation state after fallback (Test Utility)", () => {
     // Enable simulation
     setSimulate429(true);
 
diff --git a/packages/gemini-core/src/utils/formatters.test.ts b/packages/gemini-core/src/utils/formatters.test.ts
index 305b2d0ad..f164f3063 100644
--- a/packages/gemini-core/src/utils/formatters.test.ts
+++ b/packages/gemini-core/src/utils/formatters.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 
-import { bytesToMB, formatMemoryUsage } from './formatters.js';
+import { bytesToMB, formatMemoryUsage } from "./formatters.js";
 
-describe('bytesToMB', () => {
-  it('converts bytes to megabytes', () => {
+describe("bytesToMB", () => {
+  it("converts bytes to megabytes", () => {
     expect(bytesToMB(0)).toBe(0);
     expect(bytesToMB(512 * 1024)).toBeCloseTo(0.5, 5);
     expect(bytesToMB(5 * 1024 * 1024)).toBe(5);
   });
 });
 
-describe('formatMemoryUsage', () => {
-  it('formats values below one megabyte in KB', () => {
-    expect(formatMemoryUsage(512 * 1024)).toBe('512.0 KB');
+describe("formatMemoryUsage", () => {
+  it("formats values below one megabyte in KB", () => {
+    expect(formatMemoryUsage(512 * 1024)).toBe("512.0 KB");
   });
 
-  it('formats values below one gigabyte in MB', () => {
-    expect(formatMemoryUsage(5 * 1024 * 1024)).toBe('5.0 MB');
+  it("formats values below one gigabyte in MB", () => {
+    expect(formatMemoryUsage(5 * 1024 * 1024)).toBe("5.0 MB");
   });
 
-  it('formats values of one gigabyte or larger in GB', () => {
-    expect(formatMemoryUsage(2 * 1024 * 1024 * 1024)).toBe('2.00 GB');
+  it("formats values of one gigabyte or larger in GB", () => {
+    expect(formatMemoryUsage(2 * 1024 * 1024 * 1024)).toBe("2.00 GB");
   });
 });
diff --git a/packages/gemini-core/src/utils/geminiIgnoreParser.test.ts b/packages/gemini-core/src/utils/geminiIgnoreParser.test.ts
index bf85cd8c6..1435d43c2 100644
--- a/packages/gemini-core/src/utils/geminiIgnoreParser.test.ts
+++ b/packages/gemini-core/src/utils/geminiIgnoreParser.test.ts
@@ -4,25 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { GeminiIgnoreParser } from './geminiIgnoreParser.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GeminiIgnoreParser } from "./geminiIgnoreParser.js";
 
-describe('GeminiIgnoreParser', () => {
+describe("GeminiIgnoreParser", () => {
   let projectRoot: string;
 
-  async function createTestFile(filePath: string, content = '') {
+  async function createTestFile(filePath: string, content = "") {
     const fullPath = path.join(projectRoot, filePath);
     await fs.mkdir(path.dirname(fullPath), { recursive: true });
     await fs.writeFile(fullPath, content);
   }
 
   beforeEach(async () => {
-    projectRoot = await fs.mkdtemp(
-      path.join(os.tmpdir(), 'geminiignore-test-'),
-    );
+    projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), "geminiignore-test-"));
   });
 
   afterEach(async () => {
@@ -30,41 +28,30 @@ describe('GeminiIgnoreParser', () => {
     vi.restoreAllMocks();
   });
 
-  describe('when .geminiignore exists', () => {
+  describe("when .geminiignore exists", () => {
     beforeEach(async () => {
-      await createTestFile(
-        '.geminiignore',
-        'ignored.txt\n# A comment\n/ignored_dir/\n',
-      );
-      await createTestFile('ignored.txt', 'ignored');
-      await createTestFile('not_ignored.txt', 'not ignored');
-      await createTestFile(
-        path.join('ignored_dir', 'file.txt'),
-        'in ignored dir',
-      );
-      await createTestFile(
-        path.join('subdir', 'not_ignored.txt'),
-        'not ignored',
-      );
+      await createTestFile(".geminiignore", "ignored.txt\n# A comment\n/ignored_dir/\n");
+      await createTestFile("ignored.txt", "ignored");
+      await createTestFile("not_ignored.txt", "not ignored");
+      await createTestFile(path.join("ignored_dir", "file.txt"), "in ignored dir");
+      await createTestFile(path.join("subdir", "not_ignored.txt"), "not ignored");
     });
 
-    it('should ignore files specified in .geminiignore', () => {
+    it("should ignore files specified in .geminiignore", () => {
       const parser = new GeminiIgnoreParser(projectRoot);
-      expect(parser.getPatterns()).toEqual(['ignored.txt', '/ignored_dir/']);
-      expect(parser.isIgnored('ignored.txt')).toBe(true);
-      expect(parser.isIgnored('not_ignored.txt')).toBe(false);
-      expect(parser.isIgnored(path.join('ignored_dir', 'file.txt'))).toBe(true);
-      expect(parser.isIgnored(path.join('subdir', 'not_ignored.txt'))).toBe(
-        false,
-      );
+      expect(parser.getPatterns()).toEqual(["ignored.txt", "/ignored_dir/"]);
+      expect(parser.isIgnored("ignored.txt")).toBe(true);
+      expect(parser.isIgnored("not_ignored.txt")).toBe(false);
+      expect(parser.isIgnored(path.join("ignored_dir", "file.txt"))).toBe(true);
+      expect(parser.isIgnored(path.join("subdir", "not_ignored.txt"))).toBe(false);
     });
   });
 
-  describe('when .geminiignore does not exist', () => {
-    it('should not load any patterns and not ignore any files', () => {
+  describe("when .geminiignore does not exist", () => {
+    it("should not load any patterns and not ignore any files", () => {
       const parser = new GeminiIgnoreParser(projectRoot);
       expect(parser.getPatterns()).toEqual([]);
-      expect(parser.isIgnored('any_file.txt')).toBe(false);
+      expect(parser.isIgnored("any_file.txt")).toBe(false);
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/geminiIgnoreParser.ts b/packages/gemini-core/src/utils/geminiIgnoreParser.ts
index 8518923de..c0fcee734 100644
--- a/packages/gemini-core/src/utils/geminiIgnoreParser.ts
+++ b/packages/gemini-core/src/utils/geminiIgnoreParser.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import ignore from 'ignore';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import ignore from "ignore";
 
 export interface GeminiIgnoreFilter {
   isIgnored(filePath: string): boolean;
@@ -24,19 +24,19 @@ export class GeminiIgnoreParser implements GeminiIgnoreFilter {
   }
 
   private loadPatterns(): void {
-    const patternsFilePath = path.join(this.projectRoot, '.geminiignore');
+    const patternsFilePath = path.join(this.projectRoot, ".geminiignore");
     let content: string;
     try {
-      content = fs.readFileSync(patternsFilePath, 'utf-8');
+      content = fs.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       // ignore file not found
       return;
     }
 
-    this.patterns = (content ?? '')
-      .split('\n')
+    this.patterns = (content ?? "")
+      .split("\n")
       .map((p) => p.trim())
-      .filter((p) => p !== '' && !p.startsWith('#'));
+      .filter((p) => p !== "" && !p.startsWith("#"));
 
     this.ig.add(this.patterns);
   }
@@ -46,29 +46,25 @@ export class GeminiIgnoreParser implements GeminiIgnoreFilter {
       return false;
     }
 
-    if (!filePath || typeof filePath !== 'string') {
+    if (!filePath || typeof filePath !== "string") {
       return false;
     }
 
-    if (
-      filePath.startsWith('\\') ||
-      filePath === '/' ||
-      filePath.includes('\0')
-    ) {
+    if (filePath.startsWith("\\") || filePath === "/" || filePath.includes("\0")) {
       return false;
     }
 
     const resolved = path.resolve(this.projectRoot, filePath);
     const relativePath = path.relative(this.projectRoot, resolved);
 
-    if (relativePath === '' || relativePath.startsWith('..')) {
+    if (relativePath === "" || relativePath.startsWith("..")) {
       return false;
     }
 
     // Even in windows, Ignore expects forward slashes.
-    const normalizedPath = relativePath.replace(/\\/g, '/');
+    const normalizedPath = relativePath.replace(/\\/g, "/");
 
-    if (normalizedPath.startsWith('/') || normalizedPath === '') {
+    if (normalizedPath.startsWith("/") || normalizedPath === "") {
       return false;
     }
 
diff --git a/packages/gemini-core/src/utils/generateContentResponseUtilities.test.ts b/packages/gemini-core/src/utils/generateContentResponseUtilities.test.ts
index 5f99fa8d4..0ba56cd07 100644
--- a/packages/gemini-core/src/utils/generateContentResponseUtilities.test.ts
+++ b/packages/gemini-core/src/utils/generateContentResponseUtilities.test.ts
@@ -4,28 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import type { GenerateContentResponse, Part, SafetyRating } from "@google/genai";
+import { FinishReason } from "@google/genai";
+import { describe, expect, it } from "vitest";
 import {
-  getResponseTextFromParts,
   getFunctionCalls,
-  getFunctionCallsFromParts,
   getFunctionCallsAsJson,
+  getFunctionCallsFromParts,
   getFunctionCallsFromPartsAsJson,
+  getResponseTextFromParts,
   getStructuredResponse,
   getStructuredResponseFromParts,
-} from './generateContentResponseUtilities.js';
-import type {
-  GenerateContentResponse,
-  Part,
-  SafetyRating,
-} from '@google/genai';
-import { FinishReason } from '@google/genai';
+} from "./generateContentResponseUtilities.js";
 
 const mockTextPart = (text: string): Part => ({ text });
-const mockFunctionCallPart = (
-  name: string,
-  args?: Record<string, unknown>,
-): Part => ({
+const mockFunctionCallPart = (name: string, args?: Record<string, unknown>): Part => ({
   functionCall: { name, args: args ?? {} },
 });
 
@@ -38,7 +31,7 @@ const mockResponse = (
     {
       content: {
         parts,
-        role: 'model',
+        role: "model",
       },
       index: 0,
       finishReason,
@@ -56,7 +49,7 @@ const mockResponse = (
 });
 
 const minimalMockResponse = (
-  candidates: GenerateContentResponse['candidates'],
+  candidates: GenerateContentResponse["candidates"],
 ): GenerateContentResponse => ({
   candidates,
   promptFeedback: { safetyRatings: [] },
@@ -67,99 +60,91 @@ const minimalMockResponse = (
   codeExecutionResult: undefined,
 });
 
-describe('generateContentResponseUtilities', () => {
-  describe('getResponseTextFromParts', () => {
-    it('should return undefined for no parts', () => {
+describe("generateContentResponseUtilities", () => {
+  describe("getResponseTextFromParts", () => {
+    it("should return undefined for no parts", () => {
       expect(getResponseTextFromParts([])).toBeUndefined();
     });
-    it('should extract text from a single text part', () => {
-      expect(getResponseTextFromParts([mockTextPart('Hello')])).toBe('Hello');
+    it("should extract text from a single text part", () => {
+      expect(getResponseTextFromParts([mockTextPart("Hello")])).toBe("Hello");
     });
-    it('should concatenate text from multiple text parts', () => {
-      expect(
-        getResponseTextFromParts([
-          mockTextPart('Hello '),
-          mockTextPart('World'),
-        ]),
-      ).toBe('Hello World');
+    it("should concatenate text from multiple text parts", () => {
+      expect(getResponseTextFromParts([mockTextPart("Hello "), mockTextPart("World")])).toBe(
+        "Hello World",
+      );
     });
-    it('should ignore function call parts', () => {
+    it("should ignore function call parts", () => {
       expect(
         getResponseTextFromParts([
-          mockTextPart('Hello '),
-          mockFunctionCallPart('testFunc'),
-          mockTextPart('World'),
+          mockTextPart("Hello "),
+          mockFunctionCallPart("testFunc"),
+          mockTextPart("World"),
         ]),
-      ).toBe('Hello World');
+      ).toBe("Hello World");
     });
-    it('should return undefined if only function call parts exist', () => {
+    it("should return undefined if only function call parts exist", () => {
       expect(
         getResponseTextFromParts([
-          mockFunctionCallPart('testFunc'),
-          mockFunctionCallPart('anotherFunc'),
+          mockFunctionCallPart("testFunc"),
+          mockFunctionCallPart("anotherFunc"),
         ]),
       ).toBeUndefined();
     });
   });
 
-  describe('getFunctionCalls', () => {
-    it('should return undefined for no candidates', () => {
+  describe("getFunctionCalls", () => {
+    it("should return undefined for no candidates", () => {
       expect(getFunctionCalls(minimalMockResponse(undefined))).toBeUndefined();
     });
-    it('should return undefined for empty candidates array', () => {
+    it("should return undefined for empty candidates array", () => {
       expect(getFunctionCalls(minimalMockResponse([]))).toBeUndefined();
     });
-    it('should return undefined for no parts', () => {
+    it("should return undefined for no parts", () => {
       const response = mockResponse([]);
       expect(getFunctionCalls(response)).toBeUndefined();
     });
-    it('should extract a single function call', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
-      const response = mockResponse([
-        mockFunctionCallPart(func.name, func.args),
-      ]);
+    it("should extract a single function call", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
+      const response = mockResponse([mockFunctionCallPart(func.name, func.args)]);
       expect(getFunctionCalls(response)).toEqual([func]);
     });
-    it('should extract multiple function calls', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+    it("should extract multiple function calls", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       const response = mockResponse([
         mockFunctionCallPart(func1.name, func1.args),
         mockFunctionCallPart(func2.name, func2.args),
       ]);
       expect(getFunctionCalls(response)).toEqual([func1, func2]);
     });
-    it('should ignore text parts', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
+    it("should ignore text parts", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
       const response = mockResponse([
-        mockTextPart('Some text'),
+        mockTextPart("Some text"),
         mockFunctionCallPart(func.name, func.args),
-        mockTextPart('More text'),
+        mockTextPart("More text"),
       ]);
       expect(getFunctionCalls(response)).toEqual([func]);
     });
-    it('should return undefined if only text parts exist', () => {
-      const response = mockResponse([
-        mockTextPart('Some text'),
-        mockTextPart('More text'),
-      ]);
+    it("should return undefined if only text parts exist", () => {
+      const response = mockResponse([mockTextPart("Some text"), mockTextPart("More text")]);
       expect(getFunctionCalls(response)).toBeUndefined();
     });
   });
 
-  describe('getFunctionCallsFromParts', () => {
-    it('should return undefined for no parts', () => {
+  describe("getFunctionCallsFromParts", () => {
+    it("should return undefined for no parts", () => {
       expect(getFunctionCallsFromParts([])).toBeUndefined();
     });
-    it('should extract a single function call', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
-      expect(
-        getFunctionCallsFromParts([mockFunctionCallPart(func.name, func.args)]),
-      ).toEqual([func]);
+    it("should extract a single function call", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
+      expect(getFunctionCallsFromParts([mockFunctionCallPart(func.name, func.args)])).toEqual([
+        func,
+      ]);
     });
-    it('should extract multiple function calls', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+    it("should extract multiple function calls", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       expect(
         getFunctionCallsFromParts([
           mockFunctionCallPart(func1.name, func1.args),
@@ -167,78 +152,73 @@ describe('generateContentResponseUtilities', () => {
         ]),
       ).toEqual([func1, func2]);
     });
-    it('should ignore text parts', () => {
-      const func = { name: 'testFunc', args: { a: 1 } };
+    it("should ignore text parts", () => {
+      const func = { name: "testFunc", args: { a: 1 } };
       expect(
         getFunctionCallsFromParts([
-          mockTextPart('Some text'),
+          mockTextPart("Some text"),
           mockFunctionCallPart(func.name, func.args),
-          mockTextPart('More text'),
+          mockTextPart("More text"),
         ]),
       ).toEqual([func]);
     });
-    it('should return undefined if only text parts exist', () => {
+    it("should return undefined if only text parts exist", () => {
       expect(
-        getFunctionCallsFromParts([
-          mockTextPart('Some text'),
-          mockTextPart('More text'),
-        ]),
+        getFunctionCallsFromParts([mockTextPart("Some text"), mockTextPart("More text")]),
       ).toBeUndefined();
     });
   });
 
-  describe('getFunctionCallsAsJson', () => {
-    it('should return JSON string of function calls', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+  describe("getFunctionCallsAsJson", () => {
+    it("should return JSON string of function calls", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       const response = mockResponse([
         mockFunctionCallPart(func1.name, func1.args),
-        mockTextPart('text in between'),
+        mockTextPart("text in between"),
         mockFunctionCallPart(func2.name, func2.args),
       ]);
       const expectedJson = JSON.stringify([func1, func2], null, 2);
       expect(getFunctionCallsAsJson(response)).toBe(expectedJson);
     });
-    it('should return undefined if no function calls', () => {
-      const response = mockResponse([mockTextPart('Hello')]);
+    it("should return undefined if no function calls", () => {
+      const response = mockResponse([mockTextPart("Hello")]);
       expect(getFunctionCallsAsJson(response)).toBeUndefined();
     });
   });
 
-  describe('getFunctionCallsFromPartsAsJson', () => {
-    it('should return JSON string of function calls from parts', () => {
-      const func1 = { name: 'testFunc1', args: { a: 1 } };
-      const func2 = { name: 'testFunc2', args: { b: 2 } };
+  describe("getFunctionCallsFromPartsAsJson", () => {
+    it("should return JSON string of function calls from parts", () => {
+      const func1 = { name: "testFunc1", args: { a: 1 } };
+      const func2 = { name: "testFunc2", args: { b: 2 } };
       const parts = [
         mockFunctionCallPart(func1.name, func1.args),
-        mockTextPart('text in between'),
+        mockTextPart("text in between"),
         mockFunctionCallPart(func2.name, func2.args),
       ];
       const expectedJson = JSON.stringify([func1, func2], null, 2);
       expect(getFunctionCallsFromPartsAsJson(parts)).toBe(expectedJson);
     });
-    it('should return undefined if no function calls in parts', () => {
-      const parts = [mockTextPart('Hello')];
+    it("should return undefined if no function calls in parts", () => {
+      const parts = [mockTextPart("Hello")];
       expect(getFunctionCallsFromPartsAsJson(parts)).toBeUndefined();
     });
   });
 
-  describe('getStructuredResponse', () => {
-    it('should return only text if only text exists', () => {
-      const response = mockResponse([mockTextPart('Hello World')]);
-      expect(getStructuredResponse(response)).toBe('Hello World');
+  describe("getStructuredResponse", () => {
+    it("should return only text if only text exists", () => {
+      const response = mockResponse([mockTextPart("Hello World")]);
+      expect(getStructuredResponse(response)).toBe("Hello World");
     });
-    it('should return only function call JSON if only function calls exist', () => {
-      const func = { name: 'testFunc', args: { data: 'payload' } };
-      const response = mockResponse([
-        mockFunctionCallPart(func.name, func.args),
-      ]);
+    it("should return only function call JSON if only function calls exist", () => {
+      const func = { name: "testFunc", args: { data: "payload" } };
+      const response = mockResponse([mockFunctionCallPart(func.name, func.args)]);
       const expectedJson = JSON.stringify([func], null, 2);
       expect(getStructuredResponse(response)).toBe(expectedJson);
     });
-    it('should return text and function call JSON if both exist', () => {
-      const text = 'Consider this data:';
-      const func = { name: 'processData', args: { item: 42 } };
+    it("should return text and function call JSON if both exist", () => {
+      const text = "Consider this data:";
+      const func = { name: "processData", args: { item: 42 } };
       const response = mockResponse([
         mockTextPart(text),
         mockFunctionCallPart(func.name, func.args),
@@ -246,36 +226,31 @@ describe('generateContentResponseUtilities', () => {
       const expectedJson = JSON.stringify([func], null, 2);
       expect(getStructuredResponse(response)).toBe(`${text}\n${expectedJson}`);
     });
-    it('should return undefined if neither text nor function calls exist', () => {
+    it("should return undefined if neither text nor function calls exist", () => {
       const response = mockResponse([]);
       expect(getStructuredResponse(response)).toBeUndefined();
     });
   });
 
-  describe('getStructuredResponseFromParts', () => {
-    it('should return only text if only text exists in parts', () => {
-      const parts = [mockTextPart('Hello World')];
-      expect(getStructuredResponseFromParts(parts)).toBe('Hello World');
+  describe("getStructuredResponseFromParts", () => {
+    it("should return only text if only text exists in parts", () => {
+      const parts = [mockTextPart("Hello World")];
+      expect(getStructuredResponseFromParts(parts)).toBe("Hello World");
     });
-    it('should return only function call JSON if only function calls exist in parts', () => {
-      const func = { name: 'testFunc', args: { data: 'payload' } };
+    it("should return only function call JSON if only function calls exist in parts", () => {
+      const func = { name: "testFunc", args: { data: "payload" } };
       const parts = [mockFunctionCallPart(func.name, func.args)];
       const expectedJson = JSON.stringify([func], null, 2);
       expect(getStructuredResponseFromParts(parts)).toBe(expectedJson);
     });
-    it('should return text and function call JSON if both exist in parts', () => {
-      const text = 'Consider this data:';
-      const func = { name: 'processData', args: { item: 42 } };
-      const parts = [
-        mockTextPart(text),
-        mockFunctionCallPart(func.name, func.args),
-      ];
+    it("should return text and function call JSON if both exist in parts", () => {
+      const text = "Consider this data:";
+      const func = { name: "processData", args: { item: 42 } };
+      const parts = [mockTextPart(text), mockFunctionCallPart(func.name, func.args)];
       const expectedJson = JSON.stringify([func], null, 2);
-      expect(getStructuredResponseFromParts(parts)).toBe(
-        `${text}\n${expectedJson}`,
-      );
+      expect(getStructuredResponseFromParts(parts)).toBe(`${text}\n${expectedJson}`);
     });
-    it('should return undefined if neither text nor function calls exist in parts', () => {
+    it("should return undefined if neither text nor function calls exist in parts", () => {
       const parts: Part[] = [];
       expect(getStructuredResponseFromParts(parts)).toBeUndefined();
     });
diff --git a/packages/gemini-core/src/utils/generateContentResponseUtilities.ts b/packages/gemini-core/src/utils/generateContentResponseUtilities.ts
index 8d5bec9f4..30c136c2f 100644
--- a/packages/gemini-core/src/utils/generateContentResponseUtilities.ts
+++ b/packages/gemini-core/src/utils/generateContentResponseUtilities.ts
@@ -4,12 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  GenerateContentResponse,
-  Part,
-  FunctionCall,
-} from '@google/genai';
-import { getResponseText } from './partUtils.js';
+import type { FunctionCall, GenerateContentResponse, Part } from "@google/genai";
+import { getResponseText } from "./partUtils.js";
 
 export function getResponseTextFromParts(parts: Part[]): string | undefined {
   if (!parts) {
@@ -17,17 +13,15 @@ export function getResponseTextFromParts(parts: Part[]): string | undefined {
   }
   const textSegments = parts
     .map((part) => part.text)
-    .filter((text): text is string => typeof text === 'string');
+    .filter((text): text is string => typeof text === "string");
 
   if (textSegments.length === 0) {
     return undefined;
   }
-  return textSegments.join('');
+  return textSegments.join("");
 }
 
-export function getFunctionCalls(
-  response: GenerateContentResponse,
-): FunctionCall[] | undefined {
+export function getFunctionCalls(response: GenerateContentResponse): FunctionCall[] | undefined {
   const parts = response.candidates?.[0]?.content?.parts;
   if (!parts) {
     return undefined;
@@ -38,9 +32,7 @@ export function getFunctionCalls(
   return functionCallParts.length > 0 ? functionCallParts : undefined;
 }
 
-export function getFunctionCallsFromParts(
-  parts: Part[],
-): FunctionCall[] | undefined {
+export function getFunctionCallsFromParts(parts: Part[]): FunctionCall[] | undefined {
   if (!parts) {
     return undefined;
   }
@@ -50,9 +42,7 @@ export function getFunctionCallsFromParts(
   return functionCallParts.length > 0 ? functionCallParts : undefined;
 }
 
-export function getFunctionCallsAsJson(
-  response: GenerateContentResponse,
-): string | undefined {
+export function getFunctionCallsAsJson(response: GenerateContentResponse): string | undefined {
   const functionCalls = getFunctionCalls(response);
   if (!functionCalls) {
     return undefined;
@@ -60,9 +50,7 @@ export function getFunctionCallsAsJson(
   return JSON.stringify(functionCalls, null, 2);
 }
 
-export function getFunctionCallsFromPartsAsJson(
-  parts: Part[],
-): string | undefined {
+export function getFunctionCallsFromPartsAsJson(parts: Part[]): string | undefined {
   const functionCalls = getFunctionCallsFromParts(parts);
   if (!functionCalls) {
     return undefined;
@@ -70,9 +58,7 @@ export function getFunctionCallsFromPartsAsJson(
   return JSON.stringify(functionCalls, null, 2);
 }
 
-export function getStructuredResponse(
-  response: GenerateContentResponse,
-): string | undefined {
+export function getStructuredResponse(response: GenerateContentResponse): string | undefined {
   const textContent = getResponseText(response);
   const functionCallsJson = getFunctionCallsAsJson(response);
 
@@ -88,9 +74,7 @@ export function getStructuredResponse(
   return undefined;
 }
 
-export function getStructuredResponseFromParts(
-  parts: Part[],
-): string | undefined {
+export function getStructuredResponseFromParts(parts: Part[]): string | undefined {
   const textContent = getResponseTextFromParts(parts);
   const functionCallsJson = getFunctionCallsFromPartsAsJson(parts);
 
diff --git a/packages/gemini-core/src/utils/getFolderStructure.test.ts b/packages/gemini-core/src/utils/getFolderStructure.test.ts
index 5b8e18c08..950da455c 100644
--- a/packages/gemini-core/src/utils/getFolderStructure.test.ts
+++ b/packages/gemini-core/src/utils/getFolderStructure.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import fsPromises from 'node:fs/promises';
-import * as nodePath from 'node:path';
-import * as os from 'node:os';
-import { getFolderStructure } from './getFolderStructure.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import * as path from 'node:path';
-import { GEMINI_DIR } from './paths.js';
-
-describe('getFolderStructure', () => {
+import fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as nodePath from "node:path";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { getFolderStructure } from "./getFolderStructure.js";
+import { GEMINI_DIR } from "./paths.js";
+
+describe("getFolderStructure", () => {
   let testRootDir: string;
 
   async function createEmptyDir(...pathSegments: string[]) {
@@ -24,24 +24,22 @@ describe('getFolderStructure', () => {
   async function createTestFile(...pathSegments: string[]) {
     const fullPath = path.join(testRootDir, ...pathSegments);
     await fsPromises.mkdir(path.dirname(fullPath), { recursive: true });
-    await fsPromises.writeFile(fullPath, '');
+    await fsPromises.writeFile(fullPath, "");
     return fullPath;
   }
 
   beforeEach(async () => {
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'folder-structure-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "folder-structure-test-"));
   });
 
   afterEach(async () => {
     await fsPromises.rm(testRootDir, { recursive: true, force: true });
   });
 
-  it('should return basic folder structure', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.js');
-    await createTestFile('subfolderB', 'fileB1.md');
+  it("should return basic folder structure", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.js");
+    await createTestFile("subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir);
     expect(structure.trim()).toBe(
@@ -57,7 +55,7 @@ ${testRootDir}${path.sep}
     );
   });
 
-  it('should handle an empty folder', async () => {
+  it("should handle an empty folder", async () => {
     const structure = await getFolderStructure(testRootDir);
     expect(structure.trim()).toBe(
       `
@@ -70,14 +68,14 @@ ${testRootDir}${path.sep}
     );
   });
 
-  it('should ignore folders specified in ignoredFolders (default)', async () => {
-    await createTestFile('.hiddenfile');
-    await createTestFile('file1.txt');
-    await createEmptyDir('emptyFolder');
-    await createTestFile('node_modules', 'somepackage', 'index.js');
-    await createTestFile('subfolderA', 'fileA1.ts');
-    await createTestFile('subfolderA', 'fileA2.js');
-    await createTestFile('subfolderA', 'subfolderB', 'fileB1.md');
+  it("should ignore folders specified in ignoredFolders (default)", async () => {
+    await createTestFile(".hiddenfile");
+    await createTestFile("file1.txt");
+    await createEmptyDir("emptyFolder");
+    await createTestFile("node_modules", "somepackage", "index.js");
+    await createTestFile("subfolderA", "fileA1.ts");
+    await createTestFile("subfolderA", "fileA2.js");
+    await createTestFile("subfolderA", "subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir);
     expect(structure.trim()).toBe(
@@ -98,15 +96,15 @@ ${testRootDir}${path.sep}
     );
   });
 
-  it('should ignore folders specified in custom ignoredFolders', async () => {
-    await createTestFile('.hiddenfile');
-    await createTestFile('file1.txt');
-    await createEmptyDir('emptyFolder');
-    await createTestFile('node_modules', 'somepackage', 'index.js');
-    await createTestFile('subfolderA', 'fileA1.ts');
+  it("should ignore folders specified in custom ignoredFolders", async () => {
+    await createTestFile(".hiddenfile");
+    await createTestFile("file1.txt");
+    await createEmptyDir("emptyFolder");
+    await createTestFile("node_modules", "somepackage", "index.js");
+    await createTestFile("subfolderA", "fileA1.ts");
 
     const structure = await getFolderStructure(testRootDir, {
-      ignoredFolders: new Set(['subfolderA', 'node_modules']),
+      ignoredFolders: new Set(["subfolderA", "node_modules"]),
     });
     const expected = `
 Showing up to 200 items (files + folders). Folders or files indicated with ... contain more items not shown, were ignored, or the display limit (200 items) was reached.
@@ -121,10 +119,10 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should filter files by fileIncludePattern', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.js');
-    await createTestFile('subfolderB', 'fileB1.md');
+  it("should filter files by fileIncludePattern", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.js");
+    await createTestFile("subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir, {
       fileIncludePattern: /\.ts$/,
@@ -139,10 +137,10 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should handle maxItems truncation for files within a folder', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.js');
-    await createTestFile('subfolderB', 'fileB1.md');
+  it("should handle maxItems truncation for files within a folder", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.js");
+    await createTestFile("subfolderB", "fileB1.md");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 3,
@@ -158,9 +156,9 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should handle maxItems truncation for subfolders', async () => {
+  it("should handle maxItems truncation for subfolders", async () => {
     for (let i = 0; i < 5; i++) {
-      await createTestFile(`folder-${i}`, 'child.txt');
+      await createTestFile(`folder-${i}`, "child.txt");
     }
 
     const structure = await getFolderStructure(testRootDir, {
@@ -179,10 +177,10 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expectedRevised);
   });
 
-  it('should handle maxItems that only allows the root folder itself', async () => {
-    await createTestFile('fileA1.ts');
-    await createTestFile('fileA2.ts');
-    await createTestFile('subfolderB', 'fileB1.ts');
+  it("should handle maxItems that only allows the root folder itself", async () => {
+    await createTestFile("fileA1.ts");
+    await createTestFile("fileA2.ts");
+    await createTestFile("subfolderB", "fileB1.ts");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 1,
@@ -198,16 +196,16 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should handle non-existent directory', async () => {
-    const nonExistentPath = path.join(testRootDir, 'non-existent');
+  it("should handle non-existent directory", async () => {
+    const nonExistentPath = path.join(testRootDir, "non-existent");
     const structure = await getFolderStructure(nonExistentPath);
     expect(structure).toContain(
       `Error: Could not read directory "${nonExistentPath}". Check path and permissions.`,
     );
   });
 
-  it('should handle deep folder structure within limits', async () => {
-    await createTestFile('level1', 'level2', 'level3', 'file.txt');
+  it("should handle deep folder structure within limits", async () => {
+    await createTestFile("level1", "level2", "level3", "file.txt");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 10,
@@ -224,8 +222,8 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  it('should truncate deep folder structure if maxItems is small', async () => {
-    await createTestFile('level1', 'level2', 'level3', 'file.txt');
+  it("should truncate deep folder structure if maxItems is small", async () => {
+    await createTestFile("level1", "level2", "level3", "file.txt");
 
     const structure = await getFolderStructure(testRootDir, {
       maxItems: 3,
@@ -241,43 +239,40 @@ ${testRootDir}${path.sep}
     expect(structure.trim()).toBe(expected);
   });
 
-  describe('with gitignore', () => {
+  describe("with gitignore", () => {
     beforeEach(async () => {
-      await fsPromises.mkdir(path.join(testRootDir, '.git'), {
+      await fsPromises.mkdir(path.join(testRootDir, ".git"), {
         recursive: true,
       });
     });
 
-    it('should ignore files and folders specified in .gitignore', async () => {
+    it("should ignore files and folders specified in .gitignore", async () => {
       await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.gitignore'),
-        'ignored.txt\nnode_modules/\n.gemini/*\n!/.gemini/config.yaml',
+        nodePath.join(testRootDir, ".gitignore"),
+        "ignored.txt\nnode_modules/\n.gemini/*\n!/.gemini/config.yaml",
       );
-      await createTestFile('file1.txt');
-      await createTestFile('node_modules', 'some-package', 'index.js');
-      await createTestFile('ignored.txt');
-      await createTestFile(GEMINI_DIR, 'config.yaml');
-      await createTestFile(GEMINI_DIR, 'logs.json');
+      await createTestFile("file1.txt");
+      await createTestFile("node_modules", "some-package", "index.js");
+      await createTestFile("ignored.txt");
+      await createTestFile(GEMINI_DIR, "config.yaml");
+      await createTestFile(GEMINI_DIR, "logs.json");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
         fileService,
       });
 
-      expect(structure).not.toContain('ignored.txt');
+      expect(structure).not.toContain("ignored.txt");
       expect(structure).toContain(`node_modules${path.sep}...`);
-      expect(structure).not.toContain('logs.json');
-      expect(structure).toContain('config.yaml');
-      expect(structure).toContain('file1.txt');
+      expect(structure).not.toContain("logs.json");
+      expect(structure).toContain("config.yaml");
+      expect(structure).toContain("file1.txt");
     });
 
-    it('should not ignore files if respectGitIgnore is false', async () => {
-      await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.gitignore'),
-        'ignored.txt',
-      );
-      await createTestFile('file1.txt');
-      await createTestFile('ignored.txt');
+    it("should not ignore files if respectGitIgnore is false", async () => {
+      await fsPromises.writeFile(nodePath.join(testRootDir, ".gitignore"), "ignored.txt");
+      await createTestFile("file1.txt");
+      await createTestFile("ignored.txt");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
@@ -288,42 +283,42 @@ ${testRootDir}${path.sep}
         },
       });
 
-      expect(structure).toContain('ignored.txt');
-      expect(structure).toContain('file1.txt');
+      expect(structure).toContain("ignored.txt");
+      expect(structure).toContain("file1.txt");
     });
   });
 
-  describe('with geminiignore', () => {
-    it('should ignore geminiignore files by default', async () => {
+  describe("with geminiignore", () => {
+    it("should ignore geminiignore files by default", async () => {
       await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.geminiignore'),
-        'ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml',
+        nodePath.join(testRootDir, ".geminiignore"),
+        "ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml",
       );
-      await createTestFile('file1.txt');
-      await createTestFile('node_modules', 'some-package', 'index.js');
-      await createTestFile('ignored.txt');
-      await createTestFile(GEMINI_DIR, 'config.yaml');
-      await createTestFile(GEMINI_DIR, 'logs.json');
+      await createTestFile("file1.txt");
+      await createTestFile("node_modules", "some-package", "index.js");
+      await createTestFile("ignored.txt");
+      await createTestFile(GEMINI_DIR, "config.yaml");
+      await createTestFile(GEMINI_DIR, "logs.json");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
         fileService,
       });
-      expect(structure).not.toContain('ignored.txt');
+      expect(structure).not.toContain("ignored.txt");
       expect(structure).toContain(`node_modules${path.sep}...`);
-      expect(structure).not.toContain('logs.json');
+      expect(structure).not.toContain("logs.json");
     });
 
-    it('should not ignore files if respectGeminiIgnore is false', async () => {
+    it("should not ignore files if respectGeminiIgnore is false", async () => {
       await fsPromises.writeFile(
-        nodePath.join(testRootDir, '.geminiignore'),
-        'ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml',
+        nodePath.join(testRootDir, ".geminiignore"),
+        "ignored.txt\nnode_modules/\n.gemini/\n!/.gemini/config.yaml",
       );
-      await createTestFile('file1.txt');
-      await createTestFile('node_modules', 'some-package', 'index.js');
-      await createTestFile('ignored.txt');
-      await createTestFile(GEMINI_DIR, 'config.yaml');
-      await createTestFile(GEMINI_DIR, 'logs.json');
+      await createTestFile("file1.txt");
+      await createTestFile("node_modules", "some-package", "index.js");
+      await createTestFile("ignored.txt");
+      await createTestFile(GEMINI_DIR, "config.yaml");
+      await createTestFile(GEMINI_DIR, "logs.json");
 
       const fileService = new FileDiscoveryService(testRootDir);
       const structure = await getFolderStructure(testRootDir, {
@@ -333,7 +328,7 @@ ${testRootDir}${path.sep}
           respectGitIgnore: true, // Explicitly disable gemini ignore only
         },
       });
-      expect(structure).toContain('ignored.txt');
+      expect(structure).toContain("ignored.txt");
       // node_modules is still ignored by default
       expect(structure).toContain(`node_modules${path.sep}...`);
     });
diff --git a/packages/gemini-core/src/utils/getFolderStructure.ts b/packages/gemini-core/src/utils/getFolderStructure.ts
index 141d4f542..0bcf681d8 100644
--- a/packages/gemini-core/src/utils/getFolderStructure.ts
+++ b/packages/gemini-core/src/utils/getFolderStructure.ts
@@ -4,21 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import type { Dirent } from 'node:fs';
-import * as path from 'node:path';
-import { getErrorMessage, isNodeError } from './errors.js';
-import type {
-  FileDiscoveryService,
-  FilterFilesOptions,
-} from '../services/fileDiscoveryService.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { debugLogger } from './debugLogger.js';
+import type { Dirent } from "node:fs";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { FileFilteringOptions } from "../config/constants.js";
+import { DEFAULT_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { FileDiscoveryService, FilterFilesOptions } from "../services/fileDiscoveryService.js";
+import { debugLogger } from "./debugLogger.js";
+import { getErrorMessage, isNodeError } from "./errors.js";
 
 const MAX_ITEMS = 200;
-const TRUNCATION_INDICATOR = '...';
-const DEFAULT_IGNORED_FOLDERS = new Set(['node_modules', '.git', 'dist']);
+const TRUNCATION_INDICATOR = "...";
+const DEFAULT_IGNORED_FOLDERS = new Set(["node_modules", ".git", "dist"]);
 
 // --- Interfaces ---
 
@@ -37,7 +34,7 @@ interface FolderStructureOptions {
 }
 // Define a type for the merged options where fileIncludePattern remains optional
 type MergedFolderStructureOptions = Required<
-  Omit<FolderStructureOptions, 'fileIncludePattern' | 'fileService'>
+  Omit<FolderStructureOptions, "fileIncludePattern" | "fileService">
 > & {
   fileIncludePattern?: RegExp;
   fileService?: FileDiscoveryService;
@@ -104,14 +101,9 @@ async function readFullStructure(
       // Sort entries alphabetically by name for consistent processing order
       entries = rawEntries.sort((a, b) => a.name.localeCompare(b.name));
     } catch (error: unknown) {
-      if (
-        isNodeError(error) &&
-        (error.code === 'EACCES' || error.code === 'ENOENT')
-      ) {
-        debugLogger.warn(
-          `Warning: Could not read directory ${currentPath}: ${error.message}`,
-        );
-        if (currentPath === rootPath && error.code === 'ENOENT') {
+      if (isNodeError(error) && (error.code === "EACCES" || error.code === "ENOENT")) {
+        debugLogger.warn(`Warning: Could not read directory ${currentPath}: ${error.message}`);
+        if (currentPath === rootPath && error.code === "ENOENT") {
           return null; // Root directory itself not found
         }
         // For other EACCES/ENOENT on subdirectories, just skip them.
@@ -136,15 +128,10 @@ async function readFullStructure(
         }
         const fileName = entry.name;
         const filePath = path.join(currentPath, fileName);
-        if (
-          options.fileService?.shouldIgnoreFile(filePath, filterFileOptions)
-        ) {
+        if (options.fileService?.shouldIgnoreFile(filePath, filterFileOptions)) {
           continue;
         }
-        if (
-          !options.fileIncludePattern ||
-          options.fileIncludePattern.test(fileName)
-        ) {
+        if (!options.fileIncludePattern || options.fileIncludePattern.test(fileName)) {
           filesInCurrentDir.push(fileName);
           currentItemCount++;
           folderInfo.totalFiles++;
@@ -171,10 +158,7 @@ async function readFullStructure(
         const subFolderPath = path.join(currentPath, subFolderName);
 
         const isIgnored =
-          options.fileService?.shouldIgnoreFile(
-            subFolderPath,
-            filterFileOptions,
-          ) ?? false;
+          options.fileService?.shouldIgnoreFile(subFolderPath, filterFileOptions) ?? false;
 
         if (options.ignoredFolders.has(subFolderName) || isIgnored) {
           const ignoredSubFolder: FullFolderInfo = {
@@ -228,7 +212,7 @@ function formatStructure(
   isProcessingRootNode: boolean,
   builder: string[],
 ): void {
-  const connector = isLastChildOfParent ? '└───' : '├───';
+  const connector = isLastChildOfParent ? "└───" : "├───";
 
   // The root node of the structure (the one passed initially to getFolderStructure)
   // is not printed with a connector line itself, only its name as a header.
@@ -236,7 +220,7 @@ function formatStructure(
   // Ignored root nodes ARE printed with a connector.
   if (!isProcessingRootNode || node.isIgnored) {
     builder.push(
-      `${currentIndent}${connector}${node.name}${path.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ''}`,
+      `${currentIndent}${connector}${node.name}${path.sep}${node.isIgnored ? TRUNCATION_INDICATOR : ""}`,
     );
   }
 
@@ -244,31 +228,27 @@ function formatStructure(
   // If *this* node was the root of the whole structure, its children start with no indent before their connectors.
   // Otherwise, children's indent extends from the current node's indent.
   const indentForChildren = isProcessingRootNode
-    ? ''
-    : currentIndent + (isLastChildOfParent ? '    ' : '│   ');
+    ? ""
+    : currentIndent + (isLastChildOfParent ? "    " : "│   ");
 
   // Render files of the current node
   const fileCount = node.files.length;
   for (let i = 0; i < fileCount; i++) {
     const isLastFileAmongSiblings =
-      i === fileCount - 1 &&
-      node.subFolders.length === 0 &&
-      !node.hasMoreSubfolders;
-    const fileConnector = isLastFileAmongSiblings ? '└───' : '├───';
+      i === fileCount - 1 && node.subFolders.length === 0 && !node.hasMoreSubfolders;
+    const fileConnector = isLastFileAmongSiblings ? "└───" : "├───";
     builder.push(`${indentForChildren}${fileConnector}${node.files[i]}`);
   }
   if (node.hasMoreFiles) {
-    const isLastIndicatorAmongSiblings =
-      node.subFolders.length === 0 && !node.hasMoreSubfolders;
-    const fileConnector = isLastIndicatorAmongSiblings ? '└───' : '├───';
+    const isLastIndicatorAmongSiblings = node.subFolders.length === 0 && !node.hasMoreSubfolders;
+    const fileConnector = isLastIndicatorAmongSiblings ? "└───" : "├───";
     builder.push(`${indentForChildren}${fileConnector}${TRUNCATION_INDICATOR}`);
   }
 
   // Render subfolders of the current node
   const subFolderCount = node.subFolders.length;
   for (let i = 0; i < subFolderCount; i++) {
-    const isLastSubfolderAmongSiblings =
-      i === subFolderCount - 1 && !node.hasMoreSubfolders;
+    const isLastSubfolderAmongSiblings = i === subFolderCount - 1 && !node.hasMoreSubfolders;
     // Children are never the root node being processed initially.
     formatStructure(
       node.subFolders[i],
@@ -304,8 +284,7 @@ export async function getFolderStructure(
     ignoredFolders: options?.ignoredFolders ?? DEFAULT_IGNORED_FOLDERS,
     fileIncludePattern: options?.fileIncludePattern,
     fileService: options?.fileService,
-    fileFilteringOptions:
-      options?.fileFilteringOptions ?? DEFAULT_FILE_FILTERING_OPTIONS,
+    fileFilteringOptions: options?.fileFilteringOptions ?? DEFAULT_FILE_FILTERING_OPTIONS,
   };
 
   try {
@@ -319,7 +298,7 @@ export async function getFolderStructure(
     // 2. Format the structure into a string
     const structureLines: string[] = [];
     // Pass true for isRoot for the initial call
-    formatStructure(structureRoot, '', true, true, structureLines);
+    formatStructure(structureRoot, "", true, true, structureLines);
 
     // 3. Build the final output string
     function isTruncated(node: FullFolderInfo): boolean {
@@ -340,7 +319,7 @@ export async function getFolderStructure(
       summary += ` Folders or files indicated with ${TRUNCATION_INDICATOR} contain more items not shown, were ignored, or the display limit (${mergedOptions.maxItems} items) was reached.`;
     }
 
-    return `${summary}\n\n${resolvedPath}${path.sep}\n${structureLines.join('\n')}`;
+    return `${summary}\n\n${resolvedPath}${path.sep}\n${structureLines.join("\n")}`;
   } catch (error: unknown) {
     console.error(`Error getting folder structure for ${resolvedPath}:`, error);
     return `Error processing directory "${resolvedPath}": ${getErrorMessage(error)}`;
diff --git a/packages/gemini-core/src/utils/getPty.ts b/packages/gemini-core/src/utils/getPty.ts
index 2d7cb16fc..2e61bc620 100644
--- a/packages/gemini-core/src/utils/getPty.ts
+++ b/packages/gemini-core/src/utils/getPty.ts
@@ -7,7 +7,7 @@
 export type PtyImplementation = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   module: any;
-  name: 'lydell-node-pty' | 'node-pty';
+  name: "lydell-node-pty" | "node-pty";
 } | null;
 
 export interface PtyProcess {
@@ -19,14 +19,14 @@ export interface PtyProcess {
 
 export const getPty = async (): Promise<PtyImplementation> => {
   try {
-    const lydell = '@lydell/node-pty';
+    const lydell = "@lydell/node-pty";
     const module = await import(lydell);
-    return { module, name: 'lydell-node-pty' };
+    return { module, name: "lydell-node-pty" };
   } catch (_e) {
     try {
-      const nodePty = 'node-pty';
+      const nodePty = "node-pty";
       const module = await import(nodePty);
-      return { module, name: 'node-pty' };
+      return { module, name: "node-pty" };
     } catch (_e2) {
       return null;
     }
diff --git a/packages/gemini-core/src/utils/gitIgnoreParser.test.ts b/packages/gemini-core/src/utils/gitIgnoreParser.test.ts
index 2afeb823d..3a9c9a8a0 100644
--- a/packages/gemini-core/src/utils/gitIgnoreParser.test.ts
+++ b/packages/gemini-core/src/utils/gitIgnoreParser.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { GitIgnoreParser } from './gitIgnoreParser.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as os from 'node:os';
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { GitIgnoreParser } from "./gitIgnoreParser.js";
 
-describe('GitIgnoreParser', () => {
+describe("GitIgnoreParser", () => {
   let parser: GitIgnoreParser;
   let projectRoot: string;
 
-  async function createTestFile(filePath: string, content = '') {
+  async function createTestFile(filePath: string, content = "") {
     const fullPath = path.join(projectRoot, filePath);
     await fs.mkdir(path.dirname(fullPath), { recursive: true });
     await fs.writeFile(fullPath, content);
   }
 
   async function setupGitRepo() {
-    await fs.mkdir(path.join(projectRoot, '.git'), { recursive: true });
+    await fs.mkdir(path.join(projectRoot, ".git"), { recursive: true });
   }
 
   beforeEach(async () => {
-    projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'gitignore-test-'));
+    projectRoot = await fs.mkdtemp(path.join(os.tmpdir(), "gitignore-test-"));
     parser = new GitIgnoreParser(projectRoot);
   });
 
@@ -33,16 +33,16 @@ describe('GitIgnoreParser', () => {
     await fs.rm(projectRoot, { recursive: true, force: true });
   });
 
-  describe('Basic ignore behaviors', () => {
+  describe("Basic ignore behaviors", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should not ignore files when no .gitignore exists', async () => {
-      expect(parser.isIgnored('file.txt')).toBe(false);
+    it("should not ignore files when no .gitignore exists", async () => {
+      expect(parser.isIgnored("file.txt")).toBe(false);
     });
 
-    it('should ignore files based on a root .gitignore', async () => {
+    it("should ignore files based on a root .gitignore", async () => {
       const gitignoreContent = `
 # Comment
 node_modules/
@@ -50,30 +50,25 @@ node_modules/
 /dist
 .env
 `;
-      await createTestFile('.gitignore', gitignoreContent);
+      await createTestFile(".gitignore", gitignoreContent);
 
-      expect(parser.isIgnored(path.join('node_modules', 'some-lib'))).toBe(
-        true,
-      );
-      expect(parser.isIgnored(path.join('src', 'app.log'))).toBe(true);
-      expect(parser.isIgnored(path.join('dist', 'index.js'))).toBe(true);
-      expect(parser.isIgnored('.env')).toBe(true);
-      expect(parser.isIgnored('src/index.js')).toBe(false);
+      expect(parser.isIgnored(path.join("node_modules", "some-lib"))).toBe(true);
+      expect(parser.isIgnored(path.join("src", "app.log"))).toBe(true);
+      expect(parser.isIgnored(path.join("dist", "index.js"))).toBe(true);
+      expect(parser.isIgnored(".env")).toBe(true);
+      expect(parser.isIgnored("src/index.js")).toBe(false);
     });
 
-    it('should handle git exclude file', async () => {
-      await createTestFile(
-        path.join('.git', 'info', 'exclude'),
-        'temp/\n*.tmp',
-      );
+    it("should handle git exclude file", async () => {
+      await createTestFile(path.join(".git", "info", "exclude"), "temp/\n*.tmp");
 
-      expect(parser.isIgnored(path.join('temp', 'file.txt'))).toBe(true);
-      expect(parser.isIgnored(path.join('src', 'file.tmp'))).toBe(true);
-      expect(parser.isIgnored('src/file.js')).toBe(false);
+      expect(parser.isIgnored(path.join("temp", "file.txt"))).toBe(true);
+      expect(parser.isIgnored(path.join("src", "file.tmp"))).toBe(true);
+      expect(parser.isIgnored("src/file.js")).toBe(false);
     });
   });
 
-  describe('isIgnored path handling', () => {
+  describe("isIgnored path handling", () => {
     beforeEach(async () => {
       await setupGitRepo();
       const gitignoreContent = `
@@ -84,228 +79,218 @@ node_modules/
 src/*.tmp
 !src/important.tmp
 `;
-      await createTestFile('.gitignore', gitignoreContent);
+      await createTestFile(".gitignore", gitignoreContent);
     });
 
-    it('should always ignore .git directory', () => {
-      expect(parser.isIgnored('.git')).toBe(true);
-      expect(parser.isIgnored(path.join('.git', 'config'))).toBe(true);
-      expect(parser.isIgnored(path.join(projectRoot, '.git', 'HEAD'))).toBe(
-        true,
-      );
+    it("should always ignore .git directory", () => {
+      expect(parser.isIgnored(".git")).toBe(true);
+      expect(parser.isIgnored(path.join(".git", "config"))).toBe(true);
+      expect(parser.isIgnored(path.join(projectRoot, ".git", "HEAD"))).toBe(true);
     });
 
-    it('should ignore files matching patterns', () => {
-      expect(
-        parser.isIgnored(path.join('node_modules', 'package', 'index.js')),
-      ).toBe(true);
-      expect(parser.isIgnored('app.log')).toBe(true);
-      expect(parser.isIgnored(path.join('logs', 'app.log'))).toBe(true);
-      expect(parser.isIgnored(path.join('dist', 'bundle.js'))).toBe(true);
-      expect(parser.isIgnored('.env')).toBe(true);
-      expect(parser.isIgnored(path.join('config', '.env'))).toBe(false); // .env is anchored to root
+    it("should ignore files matching patterns", () => {
+      expect(parser.isIgnored(path.join("node_modules", "package", "index.js"))).toBe(true);
+      expect(parser.isIgnored("app.log")).toBe(true);
+      expect(parser.isIgnored(path.join("logs", "app.log"))).toBe(true);
+      expect(parser.isIgnored(path.join("dist", "bundle.js"))).toBe(true);
+      expect(parser.isIgnored(".env")).toBe(true);
+      expect(parser.isIgnored(path.join("config", ".env"))).toBe(false); // .env is anchored to root
     });
 
-    it('should ignore files with path-specific patterns', () => {
-      expect(parser.isIgnored(path.join('src', 'temp.tmp'))).toBe(true);
-      expect(parser.isIgnored(path.join('other', 'temp.tmp'))).toBe(false);
+    it("should ignore files with path-specific patterns", () => {
+      expect(parser.isIgnored(path.join("src", "temp.tmp"))).toBe(true);
+      expect(parser.isIgnored(path.join("other", "temp.tmp"))).toBe(false);
     });
 
-    it('should handle negation patterns', () => {
-      expect(parser.isIgnored(path.join('src', 'important.tmp'))).toBe(false);
+    it("should handle negation patterns", () => {
+      expect(parser.isIgnored(path.join("src", "important.tmp"))).toBe(false);
     });
 
-    it('should not ignore files that do not match patterns', () => {
-      expect(parser.isIgnored(path.join('src', 'index.ts'))).toBe(false);
-      expect(parser.isIgnored('README.md')).toBe(false);
+    it("should not ignore files that do not match patterns", () => {
+      expect(parser.isIgnored(path.join("src", "index.ts"))).toBe(false);
+      expect(parser.isIgnored("README.md")).toBe(false);
     });
 
-    it('should handle absolute paths correctly', () => {
-      const absolutePath = path.join(projectRoot, 'node_modules', 'lib');
+    it("should handle absolute paths correctly", () => {
+      const absolutePath = path.join(projectRoot, "node_modules", "lib");
       expect(parser.isIgnored(absolutePath)).toBe(true);
     });
 
-    it('should handle paths outside project root by not ignoring them', () => {
-      const outsidePath = path.resolve(projectRoot, '..', 'other', 'file.txt');
+    it("should handle paths outside project root by not ignoring them", () => {
+      const outsidePath = path.resolve(projectRoot, "..", "other", "file.txt");
       expect(parser.isIgnored(outsidePath)).toBe(false);
     });
 
-    it('should handle relative paths correctly', () => {
-      expect(parser.isIgnored(path.join('node_modules', 'some-package'))).toBe(
-        true,
-      );
-      expect(
-        parser.isIgnored(path.join('..', 'some', 'other', 'file.txt')),
-      ).toBe(false);
+    it("should handle relative paths correctly", () => {
+      expect(parser.isIgnored(path.join("node_modules", "some-package"))).toBe(true);
+      expect(parser.isIgnored(path.join("..", "some", "other", "file.txt"))).toBe(false);
     });
 
-    it('should normalize path separators on Windows', () => {
-      expect(parser.isIgnored(path.join('node_modules', 'package'))).toBe(true);
-      expect(parser.isIgnored(path.join('src', 'temp.tmp'))).toBe(true);
+    it("should normalize path separators on Windows", () => {
+      expect(parser.isIgnored(path.join("node_modules", "package"))).toBe(true);
+      expect(parser.isIgnored(path.join("src", "temp.tmp"))).toBe(true);
     });
 
     it('should handle root path "/" without throwing error', () => {
-      expect(() => parser.isIgnored('/')).not.toThrow();
-      expect(parser.isIgnored('/')).toBe(false);
+      expect(() => parser.isIgnored("/")).not.toThrow();
+      expect(parser.isIgnored("/")).toBe(false);
     });
 
-    it('should handle absolute-like paths without throwing error', () => {
-      expect(() => parser.isIgnored('/some/path')).not.toThrow();
-      expect(parser.isIgnored('/some/path')).toBe(false);
+    it("should handle absolute-like paths without throwing error", () => {
+      expect(() => parser.isIgnored("/some/path")).not.toThrow();
+      expect(parser.isIgnored("/some/path")).toBe(false);
     });
 
-    it('should handle paths that start with forward slash', () => {
-      expect(() => parser.isIgnored('/node_modules')).not.toThrow();
-      expect(parser.isIgnored('/node_modules')).toBe(false);
+    it("should handle paths that start with forward slash", () => {
+      expect(() => parser.isIgnored("/node_modules")).not.toThrow();
+      expect(parser.isIgnored("/node_modules")).toBe(false);
     });
 
-    it('should handle backslash-prefixed files without crashing', () => {
-      expect(() => parser.isIgnored('\\backslash-file-test.txt')).not.toThrow();
-      expect(parser.isIgnored('\\backslash-file-test.txt')).toBe(false);
+    it("should handle backslash-prefixed files without crashing", () => {
+      expect(() => parser.isIgnored("\\backslash-file-test.txt")).not.toThrow();
+      expect(parser.isIgnored("\\backslash-file-test.txt")).toBe(false);
     });
 
-    it('should handle files with absolute-like names', () => {
-      expect(() => parser.isIgnored('/backslash-file-test.txt')).not.toThrow();
-      expect(parser.isIgnored('/backslash-file-test.txt')).toBe(false);
+    it("should handle files with absolute-like names", () => {
+      expect(() => parser.isIgnored("/backslash-file-test.txt")).not.toThrow();
+      expect(parser.isIgnored("/backslash-file-test.txt")).toBe(false);
     });
   });
 
-  describe('nested .gitignore files', () => {
+  describe("nested .gitignore files", () => {
     beforeEach(async () => {
       await setupGitRepo();
       // Root .gitignore
-      await createTestFile('.gitignore', 'root-ignored.txt');
+      await createTestFile(".gitignore", "root-ignored.txt");
       // Nested .gitignore 1
-      await createTestFile('a/.gitignore', '/b\nc');
+      await createTestFile("a/.gitignore", "/b\nc");
       // Nested .gitignore 2
-      await createTestFile('a/d/.gitignore', 'e.txt\nf/g');
+      await createTestFile("a/d/.gitignore", "e.txt\nf/g");
     });
 
-    it('should handle nested .gitignore files correctly', async () => {
+    it("should handle nested .gitignore files correctly", async () => {
       // From root .gitignore
-      expect(parser.isIgnored('root-ignored.txt')).toBe(true);
-      expect(parser.isIgnored('a/root-ignored.txt')).toBe(true);
+      expect(parser.isIgnored("root-ignored.txt")).toBe(true);
+      expect(parser.isIgnored("a/root-ignored.txt")).toBe(true);
 
       // From a/.gitignore: /b
-      expect(parser.isIgnored('a/b')).toBe(true);
-      expect(parser.isIgnored('b')).toBe(false);
-      expect(parser.isIgnored('a/x/b')).toBe(false);
+      expect(parser.isIgnored("a/b")).toBe(true);
+      expect(parser.isIgnored("b")).toBe(false);
+      expect(parser.isIgnored("a/x/b")).toBe(false);
 
       // From a/.gitignore: c
-      expect(parser.isIgnored('a/c')).toBe(true);
-      expect(parser.isIgnored('a/x/y/c')).toBe(true);
-      expect(parser.isIgnored('c')).toBe(false);
+      expect(parser.isIgnored("a/c")).toBe(true);
+      expect(parser.isIgnored("a/x/y/c")).toBe(true);
+      expect(parser.isIgnored("c")).toBe(false);
 
       // From a/d/.gitignore: e.txt
-      expect(parser.isIgnored('a/d/e.txt')).toBe(true);
-      expect(parser.isIgnored('a/d/x/e.txt')).toBe(true);
-      expect(parser.isIgnored('a/e.txt')).toBe(false);
+      expect(parser.isIgnored("a/d/e.txt")).toBe(true);
+      expect(parser.isIgnored("a/d/x/e.txt")).toBe(true);
+      expect(parser.isIgnored("a/e.txt")).toBe(false);
 
       // From a/d/.gitignore: f/g
-      expect(parser.isIgnored('a/d/f/g')).toBe(true);
-      expect(parser.isIgnored('a/f/g')).toBe(false);
+      expect(parser.isIgnored("a/d/f/g")).toBe(true);
+      expect(parser.isIgnored("a/f/g")).toBe(false);
     });
   });
 
-  describe('precedence rules', () => {
+  describe("precedence rules", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should prioritize nested .gitignore over root .gitignore', async () => {
-      await createTestFile('.gitignore', '*.log');
-      await createTestFile('a/b/.gitignore', '!special.log');
+    it("should prioritize nested .gitignore over root .gitignore", async () => {
+      await createTestFile(".gitignore", "*.log");
+      await createTestFile("a/b/.gitignore", "!special.log");
 
-      expect(parser.isIgnored('a/b/any.log')).toBe(true);
-      expect(parser.isIgnored('a/b/special.log')).toBe(false);
+      expect(parser.isIgnored("a/b/any.log")).toBe(true);
+      expect(parser.isIgnored("a/b/special.log")).toBe(false);
     });
 
-    it('should prioritize .gitignore over .git/info/exclude', async () => {
+    it("should prioritize .gitignore over .git/info/exclude", async () => {
       // Exclude all .log files
-      await createTestFile(path.join('.git', 'info', 'exclude'), '*.log');
+      await createTestFile(path.join(".git", "info", "exclude"), "*.log");
       // But make an exception in the root .gitignore
-      await createTestFile('.gitignore', '!important.log');
+      await createTestFile(".gitignore", "!important.log");
 
-      expect(parser.isIgnored('some.log')).toBe(true);
-      expect(parser.isIgnored('important.log')).toBe(false);
-      expect(parser.isIgnored(path.join('subdir', 'some.log'))).toBe(true);
-      expect(parser.isIgnored(path.join('subdir', 'important.log'))).toBe(
-        false,
-      );
+      expect(parser.isIgnored("some.log")).toBe(true);
+      expect(parser.isIgnored("important.log")).toBe(false);
+      expect(parser.isIgnored(path.join("subdir", "some.log"))).toBe(true);
+      expect(parser.isIgnored(path.join("subdir", "important.log"))).toBe(false);
     });
   });
-  describe('Escaped Characters', () => {
+  describe("Escaped Characters", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should correctly handle escaped characters in .gitignore', async () => {
-      await createTestFile('.gitignore', '\\#foo\n\\!bar');
+    it("should correctly handle escaped characters in .gitignore", async () => {
+      await createTestFile(".gitignore", "\\#foo\n\\!bar");
       // Create files with special characters in names
-      await createTestFile('bla/#foo', 'content');
-      await createTestFile('bla/!bar', 'content');
+      await createTestFile("bla/#foo", "content");
+      await createTestFile("bla/!bar", "content");
 
       // These should be ignored based on the escaped patterns
-      expect(parser.isIgnored('bla/#foo')).toBe(true);
-      expect(parser.isIgnored('bla/!bar')).toBe(true);
+      expect(parser.isIgnored("bla/#foo")).toBe(true);
+      expect(parser.isIgnored("bla/!bar")).toBe(true);
     });
   });
 
-  describe('Trailing Spaces', () => {
+  describe("Trailing Spaces", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should correctly handle significant trailing spaces', async () => {
-      await createTestFile('.gitignore', 'foo\\ \nbar ');
-      await createTestFile('foo ', 'content');
-      await createTestFile('bar', 'content');
-      await createTestFile('bar ', 'content');
+    it("should correctly handle significant trailing spaces", async () => {
+      await createTestFile(".gitignore", "foo\\ \nbar ");
+      await createTestFile("foo ", "content");
+      await createTestFile("bar", "content");
+      await createTestFile("bar ", "content");
 
       // 'foo\ ' should match 'foo '
-      expect(parser.isIgnored('foo ')).toBe(true);
+      expect(parser.isIgnored("foo ")).toBe(true);
 
       // 'bar ' should be trimmed to 'bar'
-      expect(parser.isIgnored('bar')).toBe(true);
-      expect(parser.isIgnored('bar ')).toBe(false);
+      expect(parser.isIgnored("bar")).toBe(true);
+      expect(parser.isIgnored("bar ")).toBe(false);
     });
   });
 
-  describe('Extra Patterns', () => {
+  describe("Extra Patterns", () => {
     beforeEach(async () => {
       await setupGitRepo();
     });
 
-    it('should apply extraPatterns with higher precedence than .gitignore', async () => {
-      await createTestFile('.gitignore', '*.txt');
+    it("should apply extraPatterns with higher precedence than .gitignore", async () => {
+      await createTestFile(".gitignore", "*.txt");
 
-      const extraPatterns = ['!important.txt', 'temp/'];
+      const extraPatterns = ["!important.txt", "temp/"];
       parser = new GitIgnoreParser(projectRoot, extraPatterns);
 
-      expect(parser.isIgnored('file.txt')).toBe(true);
-      expect(parser.isIgnored('important.txt')).toBe(false); // Un-ignored by extraPatterns
-      expect(parser.isIgnored('temp/file.js')).toBe(true); // Ignored by extraPatterns
+      expect(parser.isIgnored("file.txt")).toBe(true);
+      expect(parser.isIgnored("important.txt")).toBe(false); // Un-ignored by extraPatterns
+      expect(parser.isIgnored("temp/file.js")).toBe(true); // Ignored by extraPatterns
     });
 
-    it('should handle extraPatterns that unignore directories', async () => {
-      await createTestFile('.gitignore', '/foo/\n/a/*/c/');
+    it("should handle extraPatterns that unignore directories", async () => {
+      await createTestFile(".gitignore", "/foo/\n/a/*/c/");
 
-      const extraPatterns = ['!foo/', '!a/*/c/'];
+      const extraPatterns = ["!foo/", "!a/*/c/"];
       parser = new GitIgnoreParser(projectRoot, extraPatterns);
 
-      expect(parser.isIgnored('foo/bar/file.txt')).toBe(false);
-      expect(parser.isIgnored('a/b/c/file.txt')).toBe(false);
+      expect(parser.isIgnored("foo/bar/file.txt")).toBe(false);
+      expect(parser.isIgnored("a/b/c/file.txt")).toBe(false);
     });
 
-    it('should handle extraPatterns that unignore directories with nested gitignore', async () => {
-      await createTestFile('.gitignore', '/foo/');
-      await createTestFile('foo/bar/.gitignore', 'file.txt');
+    it("should handle extraPatterns that unignore directories with nested gitignore", async () => {
+      await createTestFile(".gitignore", "/foo/");
+      await createTestFile("foo/bar/.gitignore", "file.txt");
 
-      const extraPatterns = ['!foo/'];
+      const extraPatterns = ["!foo/"];
       parser = new GitIgnoreParser(projectRoot, extraPatterns);
 
-      expect(parser.isIgnored('foo/bar/file.txt')).toBe(true);
-      expect(parser.isIgnored('foo/bar/file2.txt')).toBe(false);
+      expect(parser.isIgnored("foo/bar/file.txt")).toBe(true);
+      expect(parser.isIgnored("foo/bar/file2.txt")).toBe(false);
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/gitIgnoreParser.ts b/packages/gemini-core/src/utils/gitIgnoreParser.ts
index f2dc3d1a2..6e0cff439 100644
--- a/packages/gemini-core/src/utils/gitIgnoreParser.ts
+++ b/packages/gemini-core/src/utils/gitIgnoreParser.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import ignore from 'ignore';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import ignore from "ignore";
 
 export interface GitIgnoreFilter {
   isIgnored(filePath: string): boolean;
@@ -25,98 +25,90 @@ export class GitIgnoreParser implements GitIgnoreFilter {
     this.projectRoot = path.resolve(projectRoot);
     if (this.extraPatterns) {
       // extraPatterns are assumed to be from project root (like .geminiignore)
-      this.processedExtraPatterns = this.processPatterns(
-        this.extraPatterns,
-        '.',
-      );
+      this.processedExtraPatterns = this.processPatterns(this.extraPatterns, ".");
     }
   }
 
   private loadPatternsForFile(patternsFilePath: string): string[] {
     let content: string;
     try {
-      content = fs.readFileSync(patternsFilePath, 'utf-8');
+      content = fs.readFileSync(patternsFilePath, "utf-8");
     } catch (_error) {
       return [];
     }
 
-    const isExcludeFile = patternsFilePath.endsWith(
-      path.join('.git', 'info', 'exclude'),
-    );
+    const isExcludeFile = patternsFilePath.endsWith(path.join(".git", "info", "exclude"));
 
     const relativeBaseDir = isExcludeFile
-      ? '.'
+      ? "."
       : path
           .dirname(path.relative(this.projectRoot, patternsFilePath))
           .split(path.sep)
           .join(path.posix.sep);
 
-    const rawPatterns = content.split('\n');
+    const rawPatterns = content.split("\n");
     return this.processPatterns(rawPatterns, relativeBaseDir);
   }
 
-  private processPatterns(
-    rawPatterns: string[],
-    relativeBaseDir: string,
-  ): string[] {
+  private processPatterns(rawPatterns: string[], relativeBaseDir: string): string[] {
     return rawPatterns
       .map((p) => p.trimStart())
-      .filter((p) => p !== '' && !p.startsWith('#'))
+      .filter((p) => p !== "" && !p.startsWith("#"))
       .map((p) => {
-        const isNegative = p.startsWith('!');
+        const isNegative = p.startsWith("!");
         if (isNegative) {
           p = p.substring(1);
         }
 
-        const isAnchoredInFile = p.startsWith('/');
+        const isAnchoredInFile = p.startsWith("/");
         if (isAnchoredInFile) {
           p = p.substring(1);
         }
 
         // An empty pattern can result from a negated pattern like `!`,
         // which we can ignore.
-        if (p === '') {
-          return '';
+        if (p === "") {
+          return "";
         }
 
         let newPattern = p;
-        if (relativeBaseDir && relativeBaseDir !== '.') {
+        if (relativeBaseDir && relativeBaseDir !== ".") {
           // Only in nested .gitignore files, the patterns need to be modified according to:
           // - If `a/b/.gitignore` defines `/c` then it needs to be changed to `/a/b/c`
           // - If `a/b/.gitignore` defines `c` then it needs to be changed to `/a/b/**/c`
           // - If `a/b/.gitignore` defines `c/d` then it needs to be changed to `/a/b/c/d`
 
-          if (!isAnchoredInFile && !p.includes('/')) {
+          if (!isAnchoredInFile && !p.includes("/")) {
             // If no slash and not anchored in file, it matches files in any
             // subdirectory.
-            newPattern = path.posix.join('**', p);
+            newPattern = path.posix.join("**", p);
           }
 
           // Prepend the .gitignore file's directory.
           newPattern = path.posix.join(relativeBaseDir, newPattern);
 
           // Anchor the pattern to a nested gitignore directory.
-          if (!newPattern.startsWith('/')) {
-            newPattern = '/' + newPattern;
+          if (!newPattern.startsWith("/")) {
+            newPattern = "/" + newPattern;
           }
         }
 
         // Anchor the pattern if originally anchored
-        if (isAnchoredInFile && !newPattern.startsWith('/')) {
-          newPattern = '/' + newPattern;
+        if (isAnchoredInFile && !newPattern.startsWith("/")) {
+          newPattern = "/" + newPattern;
         }
 
         if (isNegative) {
-          newPattern = '!' + newPattern;
+          newPattern = "!" + newPattern;
         }
 
         return newPattern;
       })
-      .filter((p) => p !== '');
+      .filter((p) => p !== "");
   }
 
   isIgnored(filePath: string): boolean {
-    if (!filePath || typeof filePath !== 'string') {
+    if (!filePath || typeof filePath !== "string") {
       return false;
     }
 
@@ -129,30 +121,25 @@ export class GitIgnoreParser implements GitIgnoreFilter {
       const resolved = path.resolve(this.projectRoot, filePath);
       const relativePath = path.relative(this.projectRoot, resolved);
 
-      if (relativePath === '' || relativePath.startsWith('..')) {
+      if (relativePath === "" || relativePath.startsWith("..")) {
         return false;
       }
 
       // Even in windows, Ignore expects forward slashes.
-      const normalizedPath = relativePath.replace(/\\/g, '/');
+      const normalizedPath = relativePath.replace(/\\/g, "/");
 
-      if (normalizedPath.startsWith('/') || normalizedPath === '') {
+      if (normalizedPath.startsWith("/") || normalizedPath === "") {
         return false;
       }
 
       const ig = ignore();
 
       // Always ignore .git directory
-      ig.add('.git');
+      ig.add(".git");
 
       // Load global patterns from .git/info/exclude on first call
       if (this.globalPatterns === undefined) {
-        const excludeFile = path.join(
-          this.projectRoot,
-          '.git',
-          'info',
-          'exclude',
-        );
+        const excludeFile = path.join(this.projectRoot, ".git", "info", "exclude");
         this.globalPatterns = fs.existsSync(excludeFile)
           ? this.loadPatternsForFile(excludeFile)
           : [];
@@ -172,10 +159,8 @@ export class GitIgnoreParser implements GitIgnoreFilter {
       for (const dir of dirsToVisit) {
         const relativeDir = path.relative(this.projectRoot, dir);
         if (relativeDir) {
-          const normalizedRelativeDir = relativeDir.replace(/\\/g, '/');
-          const igPlusExtras = ignore()
-            .add(ig)
-            .add(this.processedExtraPatterns);
+          const normalizedRelativeDir = relativeDir.replace(/\\/g, "/");
+          const igPlusExtras = ignore().add(ig).add(this.processedExtraPatterns);
           if (igPlusExtras.ignores(normalizedRelativeDir)) {
             // This directory is ignored by an ancestor's .gitignore.
             // According to git behavior, we don't need to process this
@@ -191,7 +176,7 @@ export class GitIgnoreParser implements GitIgnoreFilter {
             ig.add(patterns);
           }
         } else {
-          const gitignorePath = path.join(dir, '.gitignore');
+          const gitignorePath = path.join(dir, ".gitignore");
           if (fs.existsSync(gitignorePath)) {
             const patterns = this.loadPatternsForFile(gitignorePath);
 
diff --git a/packages/gemini-core/src/utils/gitUtils.ts b/packages/gemini-core/src/utils/gitUtils.ts
index 9ac8f1b04..b4b2efb40 100644
--- a/packages/gemini-core/src/utils/gitUtils.ts
+++ b/packages/gemini-core/src/utils/gitUtils.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
+import * as fs from "node:fs";
+import * as path from "node:path";
 
 /**
  * Checks if a directory is within a git repository
@@ -17,7 +17,7 @@ export function isGitRepository(directory: string): boolean {
     let currentDir = path.resolve(directory);
 
     while (true) {
-      const gitDir = path.join(currentDir, '.git');
+      const gitDir = path.join(currentDir, ".git");
 
       // Check if .git exists (either as directory or file for worktrees)
       if (fs.existsSync(gitDir)) {
@@ -51,7 +51,7 @@ export function findGitRoot(directory: string): string | null {
     let currentDir = path.resolve(directory);
 
     while (true) {
-      const gitDir = path.join(currentDir, '.git');
+      const gitDir = path.join(currentDir, ".git");
 
       if (fs.existsSync(gitDir)) {
         return currentDir;
diff --git a/packages/gemini-core/src/utils/googleErrors.test.ts b/packages/gemini-core/src/utils/googleErrors.test.ts
index c051fb031..c376c43a8 100644
--- a/packages/gemini-core/src/utils/googleErrors.test.ts
+++ b/packages/gemini-core/src/utils/googleErrors.test.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseGoogleApiError } from './googleErrors.js';
-import type { QuotaFailure } from './googleErrors.js';
+import { describe, expect, it } from "vitest";
+import type { QuotaFailure } from "./googleErrors.js";
+import { parseGoogleApiError } from "./googleErrors.js";
 
-describe('parseGoogleApiError', () => {
-  it('should return null for non-gaxios errors', () => {
-    expect(parseGoogleApiError(new Error('vanilla error'))).toBeNull();
+describe("parseGoogleApiError", () => {
+  it("should return null for non-gaxios errors", () => {
+    expect(parseGoogleApiError(new Error("vanilla error"))).toBeNull();
     expect(parseGoogleApiError(null)).toBeNull();
     expect(parseGoogleApiError({})).toBeNull();
   });
 
-  it('should parse a standard gaxios error', () => {
+  it("should parse a standard gaxios error", () => {
     const mockError = {
       response: {
         status: 429,
         data: {
           error: {
             code: 429,
-            message: 'Quota exceeded',
+            message: "Quota exceeded",
             details: [
               {
-                '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-                violations: [{ subject: 'user', description: 'daily limit' }],
+                "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+                violations: [{ subject: "user", description: "daily limit" }],
               },
             ],
           },
@@ -37,22 +37,22 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
     expect(parsed?.details).toHaveLength(1);
     const detail = parsed?.details[0] as QuotaFailure;
-    expect(detail['@type']).toBe('type.googleapis.com/google.rpc.QuotaFailure');
-    expect(detail.violations[0].description).toBe('daily limit');
+    expect(detail["@type"]).toBe("type.googleapis.com/google.rpc.QuotaFailure");
+    expect(detail.violations[0].description).toBe("daily limit");
   });
 
-  it('should parse an error with details stringified in the message', () => {
+  it("should parse an error with details stringified in the message", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Inner quota message',
+        message: "Inner quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '10s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "10s",
           },
         ],
       },
@@ -74,22 +74,20 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Inner quota message');
+    expect(parsed?.message).toBe("Inner quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should return null if details are not in the expected format', () => {
+  it("should return null if details are not in the expected format", () => {
     const mockError = {
       response: {
         status: 400,
         data: {
           error: {
             code: 400,
-            message: 'Bad Request',
-            details: 'just a string', // Invalid details format
+            message: "Bad Request",
+            details: "just a string", // Invalid details format
           },
         },
       },
@@ -97,18 +95,18 @@ describe('parseGoogleApiError', () => {
     expect(parseGoogleApiError(mockError)).toBeNull();
   });
 
-  it('should return null if there are no valid details', () => {
+  it("should return null if there are no valid details", () => {
     const mockError = {
       response: {
         status: 400,
         data: {
           error: {
             code: 400,
-            message: 'Bad Request',
+            message: "Bad Request",
             details: [
               {
                 // missing '@type'
-                reason: 'some reason',
+                reason: "some reason",
               },
             ],
           },
@@ -118,15 +116,15 @@ describe('parseGoogleApiError', () => {
     expect(parseGoogleApiError(mockError)).toBeNull();
   });
 
-  it('should parse a doubly nested error in the message', () => {
+  it("should parse a doubly nested error in the message", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Innermost quota message',
+        message: "Innermost quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '20s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "20s",
           },
         ],
       },
@@ -156,22 +154,20 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Innermost quota message');
+    expect(parsed?.message).toBe("Innermost quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should parse an error that is not in a response object', () => {
+  it("should parse an error that is not in a response object", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Innermost quota message',
+        message: "Innermost quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '20s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "20s",
           },
         ],
       },
@@ -188,22 +184,20 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Innermost quota message');
+    expect(parsed?.message).toBe("Innermost quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should parse an error that is a JSON string', () => {
+  it("should parse an error that is a JSON string", () => {
     const innerError = {
       error: {
         code: 429,
-        message: 'Innermost quota message',
+        message: "Innermost quota message",
         details: [
           {
-            '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-            retryDelay: '20s',
+            "@type": "type.googleapis.com/google.rpc.RetryInfo",
+            retryDelay: "20s",
           },
         ],
       },
@@ -220,44 +214,38 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(JSON.stringify(mockError));
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Innermost quota message');
+    expect(parsed?.message).toBe("Innermost quota message");
     expect(parsed?.details).toHaveLength(1);
-    expect(parsed?.details[0]['@type']).toBe(
-      'type.googleapis.com/google.rpc.RetryInfo',
-    );
+    expect(parsed?.details[0]["@type"]).toBe("type.googleapis.com/google.rpc.RetryInfo");
   });
 
-  it('should parse the user-provided nested error string', () => {
+  it("should parse the user-provided nested error string", () => {
     const userErrorString =
       '{"error":{"message":"{\\n  \\"error\\": {\\n    \\"code\\": 429,\\n    \\"message\\": \\"You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count, limit: 10000\\\\nPlease retry in 40.025771073s.\\",\\n    \\"status\\": \\"RESOURCE_EXHAUSTED\\",\\n    \\"details\\": [\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.DebugInfo\\",\\n        \\"detail\\": \\"[ORIGINAL ERROR] generic::resource_exhausted: You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count, limit: 10000\\\\nPlease retry in 40.025771073s. [google.rpc.error_details_ext] { message: \\\\\\"You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count, limit: 10000\\\\\\\\nPlease retry in 40.025771073s.\\\\\\" }\\"\\n      },\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.QuotaFailure\\",\\n        \\"violations\\": [\\n          {\\n            \\"quotaMetric\\": \\"generativelanguage.googleapis.com/generate_content_paid_tier_input_token_count\\",\\n            \\"quotaId\\": \\"GenerateContentPaidTierInputTokensPerModelPerMinute\\",\\n            \\"quotaDimensions\\": {\\n              \\"location\\": \\"global\\",\\n              \\"model\\": \\"gemini-2.5-pro\\"\\n            },\\n            \\"quotaValue\\": \\"10000\\"\\n          }\\n        ]\\n      },\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.Help\\",\\n        \\"links\\": [\\n          {\\n            \\"description\\": \\"Learn more about Gemini API quotas\\",\\n            \\"url\\": \\"https://ai.google.dev/gemini-api/docs/rate-limits\\"\\n          }\\n        ]\\n      },\\n      {\\n        \\"@type\\": \\"type.googleapis.com/google.rpc.RetryInfo\\",\\n        \\"retryDelay\\": \\"40s\\"\\n      }\\n    ]\\n  }\\n}\\n","code":429,"status":"Too Many Requests"}}';
 
     const parsed = parseGoogleApiError(userErrorString);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toContain('You exceeded your current quota');
+    expect(parsed?.message).toContain("You exceeded your current quota");
     expect(parsed?.details).toHaveLength(4);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.QuotaFailure',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure"),
     ).toBe(true);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.RetryInfo',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo"),
     ).toBe(true);
   });
 
-  it('should parse an error that is an array', () => {
+  it("should parse an error that is an array", () => {
     const mockError = [
       {
         error: {
           code: 429,
-          message: 'Quota exceeded',
+          message: "Quota exceeded",
           details: [
             {
-              '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-              violations: [{ subject: 'user', description: 'daily limit' }],
+              "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+              violations: [{ subject: "user", description: "daily limit" }],
             },
           ],
         },
@@ -267,10 +255,10 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
   });
 
-  it('should parse a gaxios error where data is an array', () => {
+  it("should parse a gaxios error where data is an array", () => {
     const mockError = {
       response: {
         status: 429,
@@ -278,11 +266,11 @@ describe('parseGoogleApiError', () => {
           {
             error: {
               code: 429,
-              message: 'Quota exceeded',
+              message: "Quota exceeded",
               details: [
                 {
-                  '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-                  violations: [{ subject: 'user', description: 'daily limit' }],
+                  "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+                  violations: [{ subject: "user", description: "daily limit" }],
                 },
               ],
             },
@@ -294,10 +282,10 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
   });
 
-  it('should parse a gaxios error where data is a stringified array', () => {
+  it("should parse a gaxios error where data is a stringified array", () => {
     const mockError = {
       response: {
         status: 429,
@@ -305,11 +293,11 @@ describe('parseGoogleApiError', () => {
           {
             error: {
               code: 429,
-              message: 'Quota exceeded',
+              message: "Quota exceeded",
               details: [
                 {
-                  '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
-                  violations: [{ subject: 'user', description: 'daily limit' }],
+                  "@type": "type.googleapis.com/google.rpc.QuotaFailure",
+                  violations: [{ subject: "user", description: "daily limit" }],
                 },
               ],
             },
@@ -321,18 +309,18 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(mockError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toBe('Quota exceeded');
+    expect(parsed?.message).toBe("Quota exceeded");
   });
 
-  it('should parse an error with a malformed @type key (returned by Gemini API)', () => {
+  it("should parse an error with a malformed @type key (returned by Gemini API)", () => {
     const malformedError = {
-      name: 'API Error',
+      name: "API Error",
       message: {
         error: {
           message:
             '{\n  "error": {\n    "code": 429,\n    "message": "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 54.887755558s.",\n    "status": "RESOURCE_EXHAUSTED",\n    "details": [\n      {\n        " @type": "type.googleapis.com/google.rpc.DebugInfo",\n        "detail": "[ORIGINAL ERROR] generic::resource_exhausted: You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\\nPlease retry in 54.887755558s. [google.rpc.error_details_ext] { message: \\"You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\\\\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\\\\nPlease retry in 54.887755558s.\\" }"\n      },\n      {\n" @type": "type.googleapis.com/google.rpc.QuotaFailure",\n        "violations": [\n          {\n            "quotaMetric": "generativelanguage.googleapis.com/generate_content_free_tier_requests",\n            "quotaId": "GenerateRequestsPerMinutePerProjectPerModel-FreeTier",\n            "quotaDimensions": {\n              "location": "global",\n"model": "gemini-2.5-pro"\n            },\n            "quotaValue": "2"\n          }\n        ]\n      },\n      {\n" @type": "type.googleapis.com/google.rpc.Help",\n        "links": [\n          {\n            "description": "Learn more about Gemini API quotas",\n            "url": "https://ai.google.dev/gemini-api/docs/rate-limits"\n          }\n        ]\n      },\n      {\n" @type": "type.googleapis.com/google.rpc.RetryInfo",\n        "retryDelay": "54s"\n      }\n    ]\n  }\n}\n',
           code: 429,
-          status: 'Too Many Requests',
+          status: "Too Many Requests",
         },
       },
     };
@@ -340,17 +328,13 @@ describe('parseGoogleApiError', () => {
     const parsed = parseGoogleApiError(malformedError);
     expect(parsed).not.toBeNull();
     expect(parsed?.code).toBe(429);
-    expect(parsed?.message).toContain('You exceeded your current quota');
+    expect(parsed?.message).toContain("You exceeded your current quota");
     expect(parsed?.details).toHaveLength(4);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.QuotaFailure',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure"),
     ).toBe(true);
     expect(
-      parsed?.details.some(
-        (d) => d['@type'] === 'type.googleapis.com/google.rpc.RetryInfo',
-      ),
+      parsed?.details.some((d) => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo"),
     ).toBe(true);
   });
 });
diff --git a/packages/gemini-core/src/utils/googleErrors.ts b/packages/gemini-core/src/utils/googleErrors.ts
index d7c15ac0b..e6e283669 100644
--- a/packages/gemini-core/src/utils/googleErrors.ts
+++ b/packages/gemini-core/src/utils/googleErrors.ts
@@ -14,25 +14,25 @@
  */
 
 export interface ErrorInfo {
-  '@type': 'type.googleapis.com/google.rpc.ErrorInfo';
+  "@type": "type.googleapis.com/google.rpc.ErrorInfo";
   reason: string;
   domain: string;
   metadata: { [key: string]: string };
 }
 
 export interface RetryInfo {
-  '@type': 'type.googleapis.com/google.rpc.RetryInfo';
+  "@type": "type.googleapis.com/google.rpc.RetryInfo";
   retryDelay: string; // e.g. "51820.638305887s"
 }
 
 export interface DebugInfo {
-  '@type': 'type.googleapis.com/google.rpc.DebugInfo';
+  "@type": "type.googleapis.com/google.rpc.DebugInfo";
   stackEntries: string[];
   detail: string;
 }
 
 export interface QuotaFailure {
-  '@type': 'type.googleapis.com/google.rpc.QuotaFailure';
+  "@type": "type.googleapis.com/google.rpc.QuotaFailure";
   violations: Array<{
     subject?: string;
     description?: string;
@@ -46,7 +46,7 @@ export interface QuotaFailure {
 }
 
 export interface PreconditionFailure {
-  '@type': 'type.googleapis.com/google.rpc.PreconditionFailure';
+  "@type": "type.googleapis.com/google.rpc.PreconditionFailure";
   violations: Array<{
     type: string;
     subject: string;
@@ -55,13 +55,13 @@ export interface PreconditionFailure {
 }
 
 export interface LocalizedMessage {
-  '@type': 'type.googleapis.com/google.rpc.LocalizedMessage';
+  "@type": "type.googleapis.com/google.rpc.LocalizedMessage";
   locale: string;
   message: string;
 }
 
 export interface BadRequest {
-  '@type': 'type.googleapis.com/google.rpc.BadRequest';
+  "@type": "type.googleapis.com/google.rpc.BadRequest";
   fieldViolations: Array<{
     field: string;
     description: string;
@@ -71,13 +71,13 @@ export interface BadRequest {
 }
 
 export interface RequestInfo {
-  '@type': 'type.googleapis.com/google.rpc.RequestInfo';
+  "@type": "type.googleapis.com/google.rpc.RequestInfo";
   requestId: string;
   servingData: string;
 }
 
 export interface ResourceInfo {
-  '@type': 'type.googleapis.com/google.rpc.ResourceInfo';
+  "@type": "type.googleapis.com/google.rpc.ResourceInfo";
   resourceType: string;
   resourceName: string;
   owner: string;
@@ -85,7 +85,7 @@ export interface ResourceInfo {
 }
 
 export interface Help {
-  '@type': 'type.googleapis.com/google.rpc.Help';
+  "@type": "type.googleapis.com/google.rpc.Help";
   links: Array<{
     description: string;
     url: string;
@@ -136,7 +136,7 @@ export function parseGoogleApiError(error: unknown): GoogleApiError | null {
   let errorObj: unknown = error;
 
   // If error is a string, try to parse it.
-  if (typeof errorObj === 'string') {
+  if (typeof errorObj === "string") {
     try {
       errorObj = JSON.parse(errorObj);
     } catch (_) {
@@ -149,25 +149,20 @@ export function parseGoogleApiError(error: unknown): GoogleApiError | null {
     errorObj = errorObj[0];
   }
 
-  if (typeof errorObj !== 'object' || errorObj === null) {
+  if (typeof errorObj !== "object" || errorObj === null) {
     return null;
   }
 
-  let currentError: ErrorShape | undefined =
-    fromGaxiosError(errorObj) ?? fromApiError(errorObj);
+  let currentError: ErrorShape | undefined = fromGaxiosError(errorObj) ?? fromApiError(errorObj);
 
   let depth = 0;
   const maxDepth = 10;
   // Handle cases where the actual error object is stringified inside the message
   // by drilling down until we find an error that doesn't have a stringified message.
-  while (
-    currentError &&
-    typeof currentError.message === 'string' &&
-    depth < maxDepth
-  ) {
+  while (currentError && typeof currentError.message === "string" && depth < maxDepth) {
     try {
       const parsedMessage = JSON.parse(
-        currentError.message.replace(/\u00A0/g, '').replace(/\n/g, ' '),
+        currentError.message.replace(/\u00A0/g, "").replace(/\n/g, " "),
       );
       if (parsedMessage.error) {
         currentError = parsedMessage.error;
@@ -193,14 +188,12 @@ export function parseGoogleApiError(error: unknown): GoogleApiError | null {
   if (Array.isArray(errorDetails) && code && message) {
     const details: GoogleApiErrorDetail[] = [];
     for (const detail of errorDetails) {
-      if (detail && typeof detail === 'object') {
+      if (detail && typeof detail === "object") {
         const detailObj = detail as Record<string, unknown>;
-        const typeKey = Object.keys(detailObj).find(
-          (key) => key.trim() === '@type',
-        );
+        const typeKey = Object.keys(detailObj).find((key) => key.trim() === "@type");
         if (typeKey) {
-          if (typeKey !== '@type') {
-            detailObj['@type'] = detailObj[typeKey];
+          if (typeKey !== "@type") {
+            detailObj["@type"] = detailObj[typeKey];
             delete detailObj[typeKey];
           }
           // We can just cast it; the consumer will have to switch on @type
@@ -239,7 +232,7 @@ function fromGaxiosError(errorObj: object): ErrorShape | undefined {
   if (gaxiosError.response?.data) {
     let data = gaxiosError.response.data;
 
-    if (typeof data === 'string') {
+    if (typeof data === "string") {
       try {
         data = JSON.parse(data);
       } catch (_) {
@@ -251,8 +244,8 @@ function fromGaxiosError(errorObj: object): ErrorShape | undefined {
       data = data[0];
     }
 
-    if (typeof data === 'object' && data !== null) {
-      if ('error' in data) {
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
         outerError = (data as { error: ErrorShape }).error;
       }
     }
@@ -283,7 +276,7 @@ function fromApiError(errorObj: object): ErrorShape | undefined {
   if (apiError.message) {
     let data = apiError.message;
 
-    if (typeof data === 'string') {
+    if (typeof data === "string") {
       try {
         data = JSON.parse(data);
       } catch (_) {
@@ -295,8 +288,8 @@ function fromApiError(errorObj: object): ErrorShape | undefined {
       data = data[0];
     }
 
-    if (typeof data === 'object' && data !== null) {
-      if ('error' in data) {
+    if (typeof data === "object" && data !== null) {
+      if ("error" in data) {
         outerError = (data as { error: ErrorShape }).error;
       }
     }
diff --git a/packages/gemini-core/src/utils/googleQuotaErrors.test.ts b/packages/gemini-core/src/utils/googleQuotaErrors.test.ts
index 34836119a..0107b938d 100644
--- a/packages/gemini-core/src/utils/googleQuotaErrors.test.ts
+++ b/packages/gemini-core/src/utils/googleQuotaErrors.test.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach } from 'vitest';
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { GoogleApiError } from "./googleErrors.js";
+import * as errorParser from "./googleErrors.js";
 import {
   classifyGoogleError,
   RetryableQuotaError,
   TerminalQuotaError,
-} from './googleQuotaErrors.js';
-import * as errorParser from './googleErrors.js';
-import type { GoogleApiError } from './googleErrors.js';
+} from "./googleQuotaErrors.js";
 
-describe('classifyGoogleError', () => {
+describe("classifyGoogleError", () => {
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should return original error if not a Google API error', () => {
-    const regularError = new Error('Something went wrong');
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(null);
+  it("should return original error if not a Google API error", () => {
+    const regularError = new Error("Something went wrong");
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(null);
     const result = classifyGoogleError(regularError);
     expect(result).toBe(regularError);
   });
@@ -31,11 +31,11 @@ describe('classifyGoogleError', () => {
         message:
           '{"error": {"code": 429, "status": 429, "message": "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 44.097740004s.", "details": [{"detail": "??? to (unknown) : APP_ERROR(8) You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 44.097740004s."}]}}',
         code: 429,
-        status: 'Too Many Requests',
+        status: "Too Many Requests",
       },
     };
     const rawError = new Error(JSON.stringify(complexError));
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(null);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(null);
 
     const result = classifyGoogleError(rawError);
 
@@ -50,11 +50,11 @@ describe('classifyGoogleError', () => {
         message:
           '{"error": {"code": 429, "status": 429, "message": "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 900.2ms.", "details": [{"detail": "??? to (unknown) : APP_ERROR(8) You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits. To monitor your current usage, head to: https://ai.dev/usage?tab=rate-limit. \n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 900.2ms."}]}}',
         code: 429,
-        status: 'Too Many Requests',
+        status: "Too Many Requests",
       },
     });
     const rawError = new Error(complexErrorString);
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(null);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(null);
 
     const result = classifyGoogleError(rawError);
 
@@ -63,13 +63,13 @@ describe('classifyGoogleError', () => {
     expect((result as RetryableQuotaError).message).toBe(rawError.message);
   });
 
-  it('should return original error if code is not 429', () => {
+  it("should return original error if code is not 429", () => {
     const apiError: GoogleApiError = {
       code: 500,
-      message: 'Server error',
+      message: "Server error",
       details: [],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const originalError = new Error();
     const result = classifyGoogleError(originalError);
     expect(result).toBe(originalError);
@@ -77,266 +77,261 @@ describe('classifyGoogleError', () => {
     expect(result).not.toBeInstanceOf(RetryableQuotaError);
   });
 
-  it('should return TerminalQuotaError for daily quota violations in QuotaFailure', () => {
+  it("should return TerminalQuotaError for daily quota violations in QuotaFailure", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              subject: 'user',
-              description: 'daily limit',
-              quotaId: 'RequestsPerDay-limit',
+              subject: "user",
+              description: "daily limit",
+              quotaId: "RequestsPerDay-limit",
             },
           ],
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
     expect((result as TerminalQuotaError).cause).toBe(apiError);
   });
 
-  it('should return TerminalQuotaError for daily quota violations in ErrorInfo', () => {
+  it("should return TerminalQuotaError for daily quota violations in ErrorInfo", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'QUOTA_EXCEEDED',
-          domain: 'googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "QUOTA_EXCEEDED",
+          domain: "googleapis.com",
           metadata: {
-            quota_limit: 'RequestsPerDay_PerProject_PerUser',
+            quota_limit: "RequestsPerDay_PerProject_PerUser",
           },
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should return TerminalQuotaError for long retry delays', () => {
+  it("should return TerminalQuotaError for long retry delays", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Too many requests',
+      message: "Too many requests",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '301s', // > 5 minutes
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "301s", // > 5 minutes
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should return RetryableQuotaError for short retry delays', () => {
+  it("should return RetryableQuotaError for short retry delays", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Too many requests',
+      message: "Too many requests",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '45.123s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "45.123s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(45123);
   });
 
-  it('should return RetryableQuotaError for per-minute quota violations in QuotaFailure', () => {
+  it("should return RetryableQuotaError for per-minute quota violations in QuotaFailure", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              subject: 'user',
-              description: 'per minute limit',
-              quotaId: 'RequestsPerMinute-limit',
+              subject: "user",
+              description: "per minute limit",
+              quotaId: "RequestsPerMinute-limit",
             },
           ],
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(60000);
   });
 
-  it('should return RetryableQuotaError for per-minute quota violations in ErrorInfo', () => {
+  it("should return RetryableQuotaError for per-minute quota violations in ErrorInfo", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'QUOTA_EXCEEDED',
-          domain: 'googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "QUOTA_EXCEEDED",
+          domain: "googleapis.com",
           metadata: {
-            quota_limit: 'RequestsPerMinute_PerProject_PerUser',
+            quota_limit: "RequestsPerMinute_PerProject_PerUser",
           },
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(60000);
   });
 
-  it('should return RetryableQuotaError for another short retry delay', () => {
+  it("should return RetryableQuotaError for another short retry delay", () => {
     const apiError: GoogleApiError = {
       code: 429,
       message:
-        'You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 56.185908122s.',
+        "You exceeded your current quota, please check your plan and billing details. For more information on this error, head to: https://ai.google.dev/gemini-api/docs/rate-limits.\n* Quota exceeded for metric: generativelanguage.googleapis.com/generate_content_free_tier_requests, limit: 2\nPlease retry in 56.185908122s.",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              quotaMetric:
-                'generativelanguage.googleapis.com/generate_content_free_tier_requests',
-              quotaId: 'GenerateRequestsPerMinutePerProjectPerModel-FreeTier',
+              quotaMetric: "generativelanguage.googleapis.com/generate_content_free_tier_requests",
+              quotaId: "GenerateRequestsPerMinutePerProjectPerModel-FreeTier",
               quotaDimensions: {
-                location: 'global',
-                model: 'gemini-2.5-pro',
+                location: "global",
+                model: "gemini-2.5-pro",
               },
-              quotaValue: '2',
+              quotaValue: "2",
             },
           ],
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.Help',
+          "@type": "type.googleapis.com/google.rpc.Help",
           links: [
             {
-              description: 'Learn more about Gemini API quotas',
-              url: 'https://ai.google.dev/gemini-api/docs/rate-limits',
+              description: "Learn more about Gemini API quotas",
+              url: "https://ai.google.dev/gemini-api/docs/rate-limits",
             },
           ],
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '56s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "56s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
     expect((result as RetryableQuotaError).retryDelayMs).toBe(56000);
   });
 
-  it('should return RetryableQuotaError for Cloud Code RATE_LIMIT_EXCEEDED with retry delay', () => {
+  it("should return RetryableQuotaError for Cloud Code RATE_LIMIT_EXCEEDED with retry delay", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message:
-        'You have exhausted your capacity on this model. Your quota will reset after 0s.',
+      message: "You have exhausted your capacity on this model. Your quota will reset after 0s.",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'RATE_LIMIT_EXCEEDED',
-          domain: 'cloudcode-pa.googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "RATE_LIMIT_EXCEEDED",
+          domain: "cloudcode-pa.googleapis.com",
           metadata: {
-            uiMessage: 'true',
-            model: 'gemini-2.5-pro',
-            quotaResetDelay: '539.477544ms',
-            quotaResetTimeStamp: '2025-10-20T19:14:08Z',
+            uiMessage: "true",
+            model: "gemini-2.5-pro",
+            quotaResetDelay: "539.477544ms",
+            quotaResetTimeStamp: "2025-10-20T19:14:08Z",
           },
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '0.539477544s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "0.539477544s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(RetryableQuotaError);
-    expect((result as RetryableQuotaError).retryDelayMs).toBeCloseTo(
-      539.477544,
-    );
+    expect((result as RetryableQuotaError).retryDelayMs).toBeCloseTo(539.477544);
   });
 
-  it('should return TerminalQuotaError for Cloud Code QUOTA_EXHAUSTED', () => {
+  it("should return TerminalQuotaError for Cloud Code QUOTA_EXHAUSTED", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message:
-        'You have exhausted your capacity on this model. Your quota will reset after 0s.',
+      message: "You have exhausted your capacity on this model. Your quota will reset after 0s.",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.ErrorInfo',
-          reason: 'QUOTA_EXHAUSTED',
-          domain: 'cloudcode-pa.googleapis.com',
+          "@type": "type.googleapis.com/google.rpc.ErrorInfo",
+          reason: "QUOTA_EXHAUSTED",
+          domain: "cloudcode-pa.googleapis.com",
           metadata: {
-            uiMessage: 'true',
-            model: 'gemini-2.5-pro',
-            quotaResetDelay: '539.477544ms',
-            quotaResetTimeStamp: '2025-10-20T19:14:08Z',
+            uiMessage: "true",
+            model: "gemini-2.5-pro",
+            quotaResetDelay: "539.477544ms",
+            quotaResetTimeStamp: "2025-10-20T19:14:08Z",
           },
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '0.539477544s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "0.539477544s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should prioritize daily limit over retry info', () => {
+  it("should prioritize daily limit over retry info", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Quota exceeded',
+      message: "Quota exceeded",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.QuotaFailure',
+          "@type": "type.googleapis.com/google.rpc.QuotaFailure",
           violations: [
             {
-              subject: 'user',
-              description: 'daily limit',
-              quotaId: 'RequestsPerDay-limit',
+              subject: "user",
+              description: "daily limit",
+              quotaId: "RequestsPerDay-limit",
             },
           ],
         },
         {
-          '@type': 'type.googleapis.com/google.rpc.RetryInfo',
-          retryDelay: '10s',
+          "@type": "type.googleapis.com/google.rpc.RetryInfo",
+          retryDelay: "10s",
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const result = classifyGoogleError(new Error());
     expect(result).toBeInstanceOf(TerminalQuotaError);
   });
 
-  it('should return original error for 429 without specific details', () => {
+  it("should return original error for 429 without specific details", () => {
     const apiError: GoogleApiError = {
       code: 429,
-      message: 'Too many requests',
+      message: "Too many requests",
       details: [
         {
-          '@type': 'type.googleapis.com/google.rpc.DebugInfo',
-          detail: 'some debug info',
+          "@type": "type.googleapis.com/google.rpc.DebugInfo",
+          detail: "some debug info",
           stackEntries: [],
         },
       ],
     };
-    vi.spyOn(errorParser, 'parseGoogleApiError').mockReturnValue(apiError);
+    vi.spyOn(errorParser, "parseGoogleApiError").mockReturnValue(apiError);
     const originalError = new Error();
     const result = classifyGoogleError(originalError);
     expect(result).toBe(originalError);
diff --git a/packages/gemini-core/src/utils/googleQuotaErrors.ts b/packages/gemini-core/src/utils/googleQuotaErrors.ts
index f09d8b247..0c706d60d 100644
--- a/packages/gemini-core/src/utils/googleQuotaErrors.ts
+++ b/packages/gemini-core/src/utils/googleQuotaErrors.ts
@@ -4,13 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ErrorInfo,
-  GoogleApiError,
-  QuotaFailure,
-  RetryInfo,
-} from './googleErrors.js';
-import { parseGoogleApiError } from './googleErrors.js';
+import type { ErrorInfo, GoogleApiError, QuotaFailure, RetryInfo } from "./googleErrors.js";
+import { parseGoogleApiError } from "./googleErrors.js";
 
 /**
  * A non-retryable error indicating a hard quota limit has been reached (e.g., daily limit).
@@ -21,7 +16,7 @@ export class TerminalQuotaError extends Error {
     override readonly cause: GoogleApiError,
   ) {
     super(message);
-    this.name = 'TerminalQuotaError';
+    this.name = "TerminalQuotaError";
   }
 }
 
@@ -37,7 +32,7 @@ export class RetryableQuotaError extends Error {
     retryDelaySeconds: number,
   ) {
     super(message);
-    this.name = 'RetryableQuotaError';
+    this.name = "RetryableQuotaError";
     this.retryDelayMs = retryDelaySeconds * 1000;
   }
 }
@@ -48,11 +43,11 @@ export class RetryableQuotaError extends Error {
  * @returns The duration in seconds, or null if parsing fails.
  */
 function parseDurationInSeconds(duration: string): number | null {
-  if (duration.endsWith('ms')) {
+  if (duration.endsWith("ms")) {
     const milliseconds = parseFloat(duration.slice(0, -2));
     return isNaN(milliseconds) ? null : milliseconds / 1000;
   }
-  if (duration.endsWith('s')) {
+  if (duration.endsWith("s")) {
     const seconds = parseFloat(duration.slice(0, -1));
     return isNaN(seconds) ? null : seconds;
   }
@@ -99,25 +94,22 @@ export function classifyGoogleError(error: unknown): unknown {
   }
 
   const quotaFailure = googleApiError.details.find(
-    (d): d is QuotaFailure =>
-      d['@type'] === 'type.googleapis.com/google.rpc.QuotaFailure',
+    (d): d is QuotaFailure => d["@type"] === "type.googleapis.com/google.rpc.QuotaFailure",
   );
 
   const errorInfo = googleApiError.details.find(
-    (d): d is ErrorInfo =>
-      d['@type'] === 'type.googleapis.com/google.rpc.ErrorInfo',
+    (d): d is ErrorInfo => d["@type"] === "type.googleapis.com/google.rpc.ErrorInfo",
   );
 
   const retryInfo = googleApiError.details.find(
-    (d): d is RetryInfo =>
-      d['@type'] === 'type.googleapis.com/google.rpc.RetryInfo',
+    (d): d is RetryInfo => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo",
   );
 
   // 1. Check for long-term limits in QuotaFailure or ErrorInfo
   if (quotaFailure) {
     for (const violation of quotaFailure.violations) {
-      const quotaId = violation.quotaId ?? '';
-      if (quotaId.includes('PerDay') || quotaId.includes('Daily')) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerDay") || quotaId.includes("Daily")) {
         return new TerminalQuotaError(
           `You have exhausted your daily quota on this model.`,
           googleApiError,
@@ -130,12 +122,12 @@ export function classifyGoogleError(error: unknown): unknown {
     // New Cloud Code API quota handling
     if (errorInfo.domain) {
       const validDomains = [
-        'cloudcode-pa.googleapis.com',
-        'staging-cloudcode-pa.googleapis.com',
-        'autopush-cloudcode-pa.googleapis.com',
+        "cloudcode-pa.googleapis.com",
+        "staging-cloudcode-pa.googleapis.com",
+        "autopush-cloudcode-pa.googleapis.com",
       ];
       if (validDomains.includes(errorInfo.domain)) {
-        if (errorInfo.reason === 'RATE_LIMIT_EXCEEDED') {
+        if (errorInfo.reason === "RATE_LIMIT_EXCEEDED") {
           let delaySeconds = 10; // Default retry of 10s
           if (retryInfo?.retryDelay) {
             const parsedDelay = parseDurationInSeconds(retryInfo.retryDelay);
@@ -143,24 +135,17 @@ export function classifyGoogleError(error: unknown): unknown {
               delaySeconds = parsedDelay;
             }
           }
-          return new RetryableQuotaError(
-            `${googleApiError.message}`,
-            googleApiError,
-            delaySeconds,
-          );
+          return new RetryableQuotaError(`${googleApiError.message}`, googleApiError, delaySeconds);
         }
-        if (errorInfo.reason === 'QUOTA_EXHAUSTED') {
-          return new TerminalQuotaError(
-            `${googleApiError.message}`,
-            googleApiError,
-          );
+        if (errorInfo.reason === "QUOTA_EXHAUSTED") {
+          return new TerminalQuotaError(`${googleApiError.message}`, googleApiError);
         }
       }
     }
 
     // Existing Cloud Code API quota handling
-    const quotaLimit = errorInfo.metadata?.['quota_limit'] ?? '';
-    if (quotaLimit.includes('PerDay') || quotaLimit.includes('Daily')) {
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerDay") || quotaLimit.includes("Daily")) {
       return new TerminalQuotaError(
         `You have exhausted your daily quota on this model.`,
         googleApiError,
@@ -190,8 +175,8 @@ export function classifyGoogleError(error: unknown): unknown {
   // 3. Check for short-term limits in QuotaFailure or ErrorInfo
   if (quotaFailure) {
     for (const violation of quotaFailure.violations) {
-      const quotaId = violation.quotaId ?? '';
-      if (quotaId.includes('PerMinute')) {
+      const quotaId = violation.quotaId ?? "";
+      if (quotaId.includes("PerMinute")) {
         return new RetryableQuotaError(
           `${googleApiError.message}\nSuggested retry after 60s.`,
           googleApiError,
@@ -202,8 +187,8 @@ export function classifyGoogleError(error: unknown): unknown {
   }
 
   if (errorInfo) {
-    const quotaLimit = errorInfo.metadata?.['quota_limit'] ?? '';
-    if (quotaLimit.includes('PerMinute')) {
+    const quotaLimit = errorInfo.metadata?.["quota_limit"] ?? "";
+    if (quotaLimit.includes("PerMinute")) {
       return new RetryableQuotaError(
         `${errorInfo.reason}\nSuggested retry after 60s.`,
         googleApiError,
diff --git a/packages/gemini-core/src/utils/ignorePatterns.test.ts b/packages/gemini-core/src/utils/ignorePatterns.test.ts
index 58f504f98..808e5cc8e 100644
--- a/packages/gemini-core/src/utils/ignorePatterns.test.ts
+++ b/packages/gemini-core/src/utils/ignorePatterns.test.ts
@@ -4,94 +4,94 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
+import { describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
 import {
-  FileExclusions,
   BINARY_EXTENSIONS,
   extractExtensionsFromPatterns,
-} from './ignorePatterns.js';
-import type { Config } from '../config/config.js';
+  FileExclusions,
+} from "./ignorePatterns.js";
 
 // Mock the memoryTool module
-vi.mock('../tools/memoryTool.js', () => ({
-  getCurrentGeminiMdFilename: vi.fn(() => 'GEMINI.md'),
+vi.mock("../tools/memoryTool.js", () => ({
+  getCurrentGeminiMdFilename: vi.fn(() => "GEMINI.md"),
 }));
 
-describe('FileExclusions', () => {
-  describe('getCoreIgnorePatterns', () => {
-    it('should return basic ignore patterns', () => {
+describe("FileExclusions", () => {
+  describe("getCoreIgnorePatterns", () => {
+    it("should return basic ignore patterns", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getCoreIgnorePatterns();
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/bower_components/**');
-      expect(patterns).toContain('**/.svn/**');
-      expect(patterns).toContain('**/.hg/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/bower_components/**");
+      expect(patterns).toContain("**/.svn/**");
+      expect(patterns).toContain("**/.hg/**");
       expect(patterns).toHaveLength(5);
     });
   });
 
-  describe('getDefaultExcludePatterns', () => {
-    it('should return comprehensive patterns by default', () => {
+  describe("getDefaultExcludePatterns", () => {
+    it("should return comprehensive patterns by default", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns();
 
       // Should include core patterns
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
 
       // Should include directory excludes
-      expect(patterns).toContain('**/.vscode/**');
-      expect(patterns).toContain('**/dist/**');
-      expect(patterns).toContain('**/build/**');
+      expect(patterns).toContain("**/.vscode/**");
+      expect(patterns).toContain("**/dist/**");
+      expect(patterns).toContain("**/build/**");
 
       // Should include binary patterns
-      expect(patterns).toContain('**/*.exe');
-      expect(patterns).toContain('**/*.jar');
+      expect(patterns).toContain("**/*.exe");
+      expect(patterns).toContain("**/*.jar");
 
       // Should include system files
-      expect(patterns).toContain('**/.DS_Store');
-      expect(patterns).toContain('**/.env');
+      expect(patterns).toContain("**/.DS_Store");
+      expect(patterns).toContain("**/.env");
 
       // Should include dynamic patterns
-      expect(patterns).toContain('**/GEMINI.md');
+      expect(patterns).toContain("**/GEMINI.md");
     });
 
-    it('should respect includeDefaults option', () => {
+    it("should respect includeDefaults option", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns({
         includeDefaults: false,
         includeDynamicPatterns: false,
       });
 
-      expect(patterns).not.toContain('**/node_modules/**');
-      expect(patterns).not.toContain('**/.git/**');
-      expect(patterns).not.toContain('**/GEMINI.md');
+      expect(patterns).not.toContain("**/node_modules/**");
+      expect(patterns).not.toContain("**/.git/**");
+      expect(patterns).not.toContain("**/GEMINI.md");
       expect(patterns).toHaveLength(0);
     });
 
-    it('should include custom patterns', () => {
+    it("should include custom patterns", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns({
-        customPatterns: ['**/custom/**', '**/*.custom'],
+        customPatterns: ["**/custom/**", "**/*.custom"],
       });
 
-      expect(patterns).toContain('**/custom/**');
-      expect(patterns).toContain('**/*.custom');
+      expect(patterns).toContain("**/custom/**");
+      expect(patterns).toContain("**/*.custom");
     });
 
-    it('should include runtime patterns', () => {
+    it("should include runtime patterns", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getDefaultExcludePatterns({
-        runtimePatterns: ['**/temp/**', '**/*.tmp'],
+        runtimePatterns: ["**/temp/**", "**/*.tmp"],
       });
 
-      expect(patterns).toContain('**/temp/**');
-      expect(patterns).toContain('**/*.tmp');
+      expect(patterns).toContain("**/temp/**");
+      expect(patterns).toContain("**/*.tmp");
     });
 
-    it('should respect includeDynamicPatterns option', () => {
+    it("should respect includeDynamicPatterns option", () => {
       const excluder = new FileExclusions();
       const patternsWithDynamic = excluder.getDefaultExcludePatterns({
         includeDynamicPatterns: true,
@@ -100,96 +100,96 @@ describe('FileExclusions', () => {
         includeDynamicPatterns: false,
       });
 
-      expect(patternsWithDynamic).toContain('**/GEMINI.md');
-      expect(patternsWithoutDynamic).not.toContain('**/GEMINI.md');
+      expect(patternsWithDynamic).toContain("**/GEMINI.md");
+      expect(patternsWithoutDynamic).not.toContain("**/GEMINI.md");
     });
   });
 
-  describe('getReadManyFilesExcludes', () => {
-    it('should provide legacy compatibility', () => {
+  describe("getReadManyFilesExcludes", () => {
+    it("should provide legacy compatibility", () => {
       const excluder = new FileExclusions();
-      const patterns = excluder.getReadManyFilesExcludes(['**/*.log']);
+      const patterns = excluder.getReadManyFilesExcludes(["**/*.log"]);
 
       // Should include all default patterns
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/GEMINI.md');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/GEMINI.md");
 
       // Should include additional excludes
-      expect(patterns).toContain('**/*.log');
+      expect(patterns).toContain("**/*.log");
     });
   });
 
-  describe('getGlobExcludes', () => {
-    it('should return core patterns for glob operations', () => {
+  describe("getGlobExcludes", () => {
+    it("should return core patterns for glob operations", () => {
       const excluder = new FileExclusions();
       const patterns = excluder.getGlobExcludes();
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/bower_components/**');
-      expect(patterns).toContain('**/.svn/**');
-      expect(patterns).toContain('**/.hg/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/bower_components/**");
+      expect(patterns).toContain("**/.svn/**");
+      expect(patterns).toContain("**/.hg/**");
 
       // Should not include comprehensive patterns by default
       expect(patterns).toHaveLength(5);
     });
 
-    it('should include additional excludes', () => {
+    it("should include additional excludes", () => {
       const excluder = new FileExclusions();
-      const patterns = excluder.getGlobExcludes(['**/temp/**']);
+      const patterns = excluder.getGlobExcludes(["**/temp/**"]);
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/temp/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/temp/**");
     });
   });
 
-  describe('with Config', () => {
-    it('should use config custom excludes when available', () => {
+  describe("with Config", () => {
+    it("should use config custom excludes when available", () => {
       const mockConfig = {
-        getCustomExcludes: vi.fn(() => ['**/config-exclude/**']),
+        getCustomExcludes: vi.fn(() => ["**/config-exclude/**"]),
       } as unknown as Config;
 
       const excluder = new FileExclusions(mockConfig);
       const patterns = excluder.getDefaultExcludePatterns();
 
-      expect(patterns).toContain('**/config-exclude/**');
+      expect(patterns).toContain("**/config-exclude/**");
       expect(mockConfig.getCustomExcludes).toHaveBeenCalled();
     });
 
-    it('should handle config without getCustomExcludes method', () => {
+    it("should handle config without getCustomExcludes method", () => {
       const mockConfig = {} as Config;
 
       const excluder = new FileExclusions(mockConfig);
       const patterns = excluder.getDefaultExcludePatterns();
 
       // Should not throw and should include default patterns
-      expect(patterns).toContain('**/node_modules/**');
+      expect(patterns).toContain("**/node_modules/**");
       expect(patterns.length).toBeGreaterThan(0);
     });
 
-    it('should include config custom excludes in glob patterns', () => {
+    it("should include config custom excludes in glob patterns", () => {
       const mockConfig = {
-        getCustomExcludes: vi.fn(() => ['**/config-glob/**']),
+        getCustomExcludes: vi.fn(() => ["**/config-glob/**"]),
       } as unknown as Config;
 
       const excluder = new FileExclusions(mockConfig);
       const patterns = excluder.getGlobExcludes();
 
-      expect(patterns).toContain('**/node_modules/**');
-      expect(patterns).toContain('**/.git/**');
-      expect(patterns).toContain('**/config-glob/**');
+      expect(patterns).toContain("**/node_modules/**");
+      expect(patterns).toContain("**/.git/**");
+      expect(patterns).toContain("**/config-glob/**");
     });
   });
 
-  describe('buildExcludePatterns', () => {
-    it('should be an alias for getDefaultExcludePatterns', () => {
+  describe("buildExcludePatterns", () => {
+    it("should be an alias for getDefaultExcludePatterns", () => {
       const excluder = new FileExclusions();
       const options = {
         includeDefaults: true,
-        customPatterns: ['**/test/**'],
-        runtimePatterns: ['**/runtime/**'],
+        customPatterns: ["**/test/**"],
+        runtimePatterns: ["**/runtime/**"],
       };
 
       const defaultPatterns = excluder.getDefaultExcludePatterns(options);
@@ -200,109 +200,101 @@ describe('FileExclusions', () => {
   });
 });
 
-describe('BINARY_EXTENSIONS', () => {
+describe("BINARY_EXTENSIONS", () => {
   it.each([
-    ['common binary file extensions', ['.exe', '.dll', '.jar', '.zip']],
-    ['additional binary extensions', ['.dat', '.obj', '.wasm']],
-    ['media file extensions', ['.pdf', '.png', '.jpg']],
-  ])('should include %s', (_, extensions) => {
+    ["common binary file extensions", [".exe", ".dll", ".jar", ".zip"]],
+    ["additional binary extensions", [".dat", ".obj", ".wasm"]],
+    ["media file extensions", [".pdf", ".png", ".jpg"]],
+  ])("should include %s", (_, extensions) => {
     extensions.forEach((ext) => {
       expect(BINARY_EXTENSIONS).toContain(ext);
     });
   });
 
-  it('should be sorted', () => {
+  it("should be sorted", () => {
     const sortedExtensions = [...BINARY_EXTENSIONS].sort();
     expect(BINARY_EXTENSIONS).toEqual(sortedExtensions);
   });
 
-  it('should not contain invalid extensions from brace patterns', () => {
+  it("should not contain invalid extensions from brace patterns", () => {
     // If brace expansion was not handled correctly, we would see invalid extensions like '.{jpg,png}'
     const invalidExtensions = BINARY_EXTENSIONS.filter(
-      (ext) => ext.includes('{') || ext.includes('}'),
+      (ext) => ext.includes("{") || ext.includes("}"),
     );
     expect(invalidExtensions).toHaveLength(0);
   });
 });
 
-describe('extractExtensionsFromPatterns', () => {
+describe("extractExtensionsFromPatterns", () => {
   it.each([
+    ["simple extensions", ["**/*.exe", "**/*.jar", "**/*.zip"], [".exe", ".jar", ".zip"]],
+    ["compound extensions", ["**/*.tar.gz", "**/*.min.js", "**/*.d.ts"], [".gz", ".js", ".ts"]],
     [
-      'simple extensions',
-      ['**/*.exe', '**/*.jar', '**/*.zip'],
-      ['.exe', '.jar', '.zip'],
-    ],
-    [
-      'compound extensions',
-      ['**/*.tar.gz', '**/*.min.js', '**/*.d.ts'],
-      ['.gz', '.js', '.ts'],
-    ],
-    [
-      'dotfiles',
-      ['**/*.gitignore', '**/*.profile', '**/*.bashrc'],
-      ['.bashrc', '.gitignore', '.profile'],
+      "dotfiles",
+      ["**/*.gitignore", "**/*.profile", "**/*.bashrc"],
+      [".bashrc", ".gitignore", ".profile"],
     ],
-  ])('should extract %s', (_, patterns, expected) => {
+  ])("should extract %s", (_, patterns, expected) => {
     const result = extractExtensionsFromPatterns(patterns);
     expect(result).toEqual(expected);
   });
 
-  it('should handle brace expansion patterns', () => {
-    const patterns = ['**/*.{js,ts}', '**/*.{jpg,png}'];
+  it("should handle brace expansion patterns", () => {
+    const patterns = ["**/*.{js,ts}", "**/*.{jpg,png}"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toContain('.js');
-    expect(result).toContain('.ts');
-    expect(result).toContain('.jpg');
-    expect(result).toContain('.png');
-    expect(result).not.toContain('.{js,ts}');
-    expect(result).not.toContain('.{jpg,png}');
+    expect(result).toContain(".js");
+    expect(result).toContain(".ts");
+    expect(result).toContain(".jpg");
+    expect(result).toContain(".png");
+    expect(result).not.toContain(".{js,ts}");
+    expect(result).not.toContain(".{jpg,png}");
   });
 
-  it('should combine simple and brace expansion patterns', () => {
-    const patterns = ['**/*.exe', '**/*.{js,ts}', '**/*.pdf'];
+  it("should combine simple and brace expansion patterns", () => {
+    const patterns = ["**/*.exe", "**/*.{js,ts}", "**/*.pdf"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toContain('.exe');
-    expect(result).toContain('.js');
-    expect(result).toContain('.ts');
-    expect(result).toContain('.pdf');
+    expect(result).toContain(".exe");
+    expect(result).toContain(".js");
+    expect(result).toContain(".ts");
+    expect(result).toContain(".pdf");
   });
 
-  it('should handle empty brace expansion', () => {
-    const patterns = ['**/*.{}', '**/*.{,}'];
+  it("should handle empty brace expansion", () => {
+    const patterns = ["**/*.{}", "**/*.{,}"];
     const result = extractExtensionsFromPatterns(patterns);
 
     // Empty extensions should be filtered out
     expect(result).toHaveLength(0);
   });
 
-  it('should ignore invalid patterns', () => {
-    const patterns = ['no-asterisk.exe', '**/*no-dot', '**/*.{unclosed'];
+  it("should ignore invalid patterns", () => {
+    const patterns = ["no-asterisk.exe", "**/*no-dot", "**/*.{unclosed"];
     const result = extractExtensionsFromPatterns(patterns);
 
     expect(result).toHaveLength(0);
   });
 
-  it('should remove duplicates and sort results', () => {
-    const patterns = ['**/*.js', '**/*.{js,ts}', '**/*.ts'];
+  it("should remove duplicates and sort results", () => {
+    const patterns = ["**/*.js", "**/*.{js,ts}", "**/*.ts"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toEqual(['.js', '.ts']);
+    expect(result).toEqual([".js", ".ts"]);
   });
 
-  it('should handle complex brace patterns with multiple extensions', () => {
-    const patterns = ['**/*.{html,css,js,jsx,ts,tsx}'];
+  it("should handle complex brace patterns with multiple extensions", () => {
+    const patterns = ["**/*.{html,css,js,jsx,ts,tsx}"];
     const result = extractExtensionsFromPatterns(patterns);
 
-    expect(result).toEqual(['.css', '.html', '.js', '.jsx', '.ts', '.tsx']);
+    expect(result).toEqual([".css", ".html", ".js", ".jsx", ".ts", ".tsx"]);
   });
 
-  it('should handle edge cases with path.extname', () => {
-    const patterns = ['**/*.hidden.', '**/*.config.json'];
+  it("should handle edge cases with path.extname", () => {
+    const patterns = ["**/*.hidden.", "**/*.config.json"];
     const result = extractExtensionsFromPatterns(patterns);
 
     // Should handle edge cases properly (trailing dots are filtered out)
-    expect(result).toEqual(['.json']);
+    expect(result).toEqual([".json"]);
   });
 });
diff --git a/packages/gemini-core/src/utils/ignorePatterns.ts b/packages/gemini-core/src/utils/ignorePatterns.ts
index 9f9776db5..e34ebb6c7 100644
--- a/packages/gemini-core/src/utils/ignorePatterns.ts
+++ b/packages/gemini-core/src/utils/ignorePatterns.ts
@@ -4,49 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import type { Config } from '../config/config.js';
-import { getCurrentGeminiMdFilename } from '../tools/memoryTool.js';
+import path from "node:path";
+import type { Config } from "../config/config.js";
+import { getCurrentGeminiMdFilename } from "../tools/memoryTool.js";
 
 /**
  * Common ignore patterns used across multiple tools for basic exclusions.
  * These are the most commonly ignored directories in development projects.
  */
 export const COMMON_IGNORE_PATTERNS: string[] = [
-  '**/node_modules/**',
-  '**/.git/**',
-  '**/bower_components/**',
-  '**/.svn/**',
-  '**/.hg/**',
+  "**/node_modules/**",
+  "**/.git/**",
+  "**/bower_components/**",
+  "**/.svn/**",
+  "**/.hg/**",
 ];
 
 /**
  * Binary file extension patterns that are typically excluded from text processing.
  */
 export const BINARY_FILE_PATTERNS: string[] = [
-  '**/*.bin',
-  '**/*.exe',
-  '**/*.dll',
-  '**/*.so',
-  '**/*.dylib',
-  '**/*.class',
-  '**/*.jar',
-  '**/*.war',
-  '**/*.zip',
-  '**/*.tar',
-  '**/*.gz',
-  '**/*.bz2',
-  '**/*.rar',
-  '**/*.7z',
-  '**/*.doc',
-  '**/*.docx',
-  '**/*.xls',
-  '**/*.xlsx',
-  '**/*.ppt',
-  '**/*.pptx',
-  '**/*.odt',
-  '**/*.ods',
-  '**/*.odp',
+  "**/*.bin",
+  "**/*.exe",
+  "**/*.dll",
+  "**/*.so",
+  "**/*.dylib",
+  "**/*.class",
+  "**/*.jar",
+  "**/*.war",
+  "**/*.zip",
+  "**/*.tar",
+  "**/*.gz",
+  "**/*.bz2",
+  "**/*.rar",
+  "**/*.7z",
+  "**/*.doc",
+  "**/*.docx",
+  "**/*.xls",
+  "**/*.xlsx",
+  "**/*.ppt",
+  "**/*.pptx",
+  "**/*.odt",
+  "**/*.ods",
+  "**/*.odp",
 ];
 
 /**
@@ -54,37 +54,37 @@ export const BINARY_FILE_PATTERNS: string[] = [
  * These files can be processed as inlineData when explicitly requested.
  */
 export const MEDIA_FILE_PATTERNS: string[] = [
-  '**/*.pdf',
-  '**/*.png',
-  '**/*.jpg',
-  '**/*.jpeg',
-  '**/*.gif',
-  '**/*.webp',
-  '**/*.bmp',
-  '**/*.svg',
+  "**/*.pdf",
+  "**/*.png",
+  "**/*.jpg",
+  "**/*.jpeg",
+  "**/*.gif",
+  "**/*.webp",
+  "**/*.bmp",
+  "**/*.svg",
 ];
 
 /**
  * Common directory patterns that are typically ignored in development projects.
  */
 export const COMMON_DIRECTORY_EXCLUDES: string[] = [
-  '**/.vscode/**',
-  '**/.idea/**',
-  '**/dist/**',
-  '**/build/**',
-  '**/coverage/**',
-  '**/__pycache__/**',
+  "**/.vscode/**",
+  "**/.idea/**",
+  "**/dist/**",
+  "**/build/**",
+  "**/coverage/**",
+  "**/__pycache__/**",
 ];
 
 /**
  * Python-specific patterns.
  */
-export const PYTHON_EXCLUDES: string[] = ['**/*.pyc', '**/*.pyo'];
+export const PYTHON_EXCLUDES: string[] = ["**/*.pyc", "**/*.pyo"];
 
 /**
  * System and environment file patterns.
  */
-export const SYSTEM_FILE_EXCLUDES: string[] = ['**/.DS_Store', '**/.env'];
+export const SYSTEM_FILE_EXCLUDES: string[] = ["**/.DS_Store", "**/.env"];
 
 /**
  * Comprehensive file exclusion patterns combining all common ignore patterns.
@@ -222,23 +222,23 @@ export class FileExclusions {
 export function extractExtensionsFromPatterns(patterns: string[]): string[] {
   const extensions = new Set(
     patterns
-      .filter((pattern) => pattern.includes('*.'))
+      .filter((pattern) => pattern.includes("*."))
       .flatMap((pattern) => {
-        const extPart = pattern.substring(pattern.lastIndexOf('*.') + 1);
+        const extPart = pattern.substring(pattern.lastIndexOf("*.") + 1);
         // Handle brace expansion e.g. `**/*.{jpg,png}`
-        if (extPart.startsWith('.{') && extPart.endsWith('}')) {
+        if (extPart.startsWith(".{") && extPart.endsWith("}")) {
           const inner = extPart.slice(2, -1); // get 'jpg,png'
           return inner
-            .split(',')
+            .split(",")
             .map((ext) => `.${ext.trim()}`)
-            .filter((ext) => ext !== '.');
+            .filter((ext) => ext !== ".");
         }
         // Handle simple/compound/dotfile extensions
         if (
-          extPart.startsWith('.') &&
-          !extPart.includes('/') &&
-          !extPart.includes('{') &&
-          !extPart.includes('}')
+          extPart.startsWith(".") &&
+          !extPart.includes("/") &&
+          !extPart.includes("{") &&
+          !extPart.includes("}")
         ) {
           // Using path.extname on a dummy file handles various cases like
           // '.tar.gz' -> '.gz' and '.profile' -> '.profile' correctly.
@@ -246,9 +246,7 @@ export function extractExtensionsFromPatterns(patterns: string[]): string[] {
           // If extname returns empty (e.g. for '.'), use the original part.
           // Then filter out empty or '.' results and invalid double dot patterns.
           const result = extracted || extPart;
-          return result && result !== '.' && !result.substring(1).includes('.')
-            ? [result]
-            : [];
+          return result && result !== "." && !result.substring(1).includes(".") ? [result] : [];
         }
         return [];
       }),
@@ -267,10 +265,10 @@ export const BINARY_EXTENSIONS: string[] = [
     ...PYTHON_EXCLUDES,
   ]),
   // Additional binary extensions not in the main patterns
-  '.dat',
-  '.obj',
-  '.o',
-  '.a',
-  '.lib',
-  '.wasm',
+  ".dat",
+  ".obj",
+  ".o",
+  ".a",
+  ".lib",
+  ".wasm",
 ].sort();
diff --git a/packages/gemini-core/src/utils/installationManager.test.ts b/packages/gemini-core/src/utils/installationManager.test.ts
index 132c73e98..10fe9f79e 100644
--- a/packages/gemini-core/src/utils/installationManager.test.ts
+++ b/packages/gemini-core/src/utils/installationManager.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { InstallationManager } from './installationManager.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import path from 'node:path';
-import { randomUUID } from 'node:crypto';
-import { GEMINI_DIR } from './paths.js';
-
-vi.mock('node:fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:fs')>();
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { InstallationManager } from "./installationManager.js";
+import { GEMINI_DIR } from "./paths.js";
+
+vi.mock("node:fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:fs")>();
   return {
     ...actual,
     readFileSync: vi.fn(actual.readFileSync),
@@ -22,32 +22,29 @@ vi.mock('node:fs', async (importOriginal) => {
   } as typeof actual;
 });
 
-vi.mock('os', async (importOriginal) => {
-  const os = await importOriginal<typeof import('os')>();
+vi.mock("os", async (importOriginal) => {
+  const os = await importOriginal<typeof import("os")>();
   return {
     ...os,
     homedir: vi.fn(),
   };
 });
 
-vi.mock('crypto', async (importOriginal) => {
-  const crypto = await importOriginal<typeof import('crypto')>();
+vi.mock("crypto", async (importOriginal) => {
+  const crypto = await importOriginal<typeof import("crypto")>();
   return {
     ...crypto,
     randomUUID: vi.fn(),
   };
 });
 
-describe('InstallationManager', () => {
+describe("InstallationManager", () => {
   let tempHomeDir: string;
   let installationManager: InstallationManager;
-  const installationIdFile = () =>
-    path.join(tempHomeDir, GEMINI_DIR, 'installation_id');
+  const installationIdFile = () => path.join(tempHomeDir, GEMINI_DIR, "installation_id");
 
   beforeEach(() => {
-    tempHomeDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-    );
+    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
     (os.homedir as Mock).mockReturnValue(tempHomeDir);
     installationManager = new InstallationManager();
   });
@@ -57,20 +54,20 @@ describe('InstallationManager', () => {
     vi.clearAllMocks();
   });
 
-  describe('getInstallationId', () => {
-    it('should create and write a new installation ID if one does not exist', () => {
-      const newId = 'new-uuid-123';
+  describe("getInstallationId", () => {
+    it("should create and write a new installation ID if one does not exist", () => {
+      const newId = "new-uuid-123";
       (randomUUID as Mock).mockReturnValue(newId);
 
       const installationId = installationManager.getInstallationId();
 
       expect(installationId).toBe(newId);
       expect(fs.existsSync(installationIdFile())).toBe(true);
-      expect(fs.readFileSync(installationIdFile(), 'utf-8')).toBe(newId);
+      expect(fs.readFileSync(installationIdFile(), "utf-8")).toBe(newId);
     });
 
-    it('should read an existing installation ID from a file', () => {
-      const existingId = 'existing-uuid-123';
+    it("should read an existing installation ID from a file", () => {
+      const existingId = "existing-uuid-123";
       fs.mkdirSync(path.dirname(installationIdFile()), { recursive: true });
       fs.writeFileSync(installationIdFile(), existingId);
 
@@ -79,25 +76,23 @@ describe('InstallationManager', () => {
       expect(installationId).toBe(existingId);
     });
 
-    it('should return the same ID on subsequent calls', () => {
+    it("should return the same ID on subsequent calls", () => {
       const firstId = installationManager.getInstallationId();
       const secondId = installationManager.getInstallationId();
       expect(secondId).toBe(firstId);
     });
 
-    it('should handle read errors and return a fallback ID', () => {
+    it("should handle read errors and return a fallback ID", () => {
       vi.mocked(fs.existsSync).mockReturnValueOnce(true);
       const readSpy = vi.mocked(fs.readFileSync);
       readSpy.mockImplementationOnce(() => {
-        throw new Error('Read error');
+        throw new Error("Read error");
       });
-      const consoleWarnSpy = vi
-        .spyOn(console, 'warn')
-        .mockImplementation(() => {});
+      const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
       const id = installationManager.getInstallationId();
 
-      expect(id).toBe('123456789');
+      expect(id).toBe("123456789");
       expect(consoleWarnSpy).toHaveBeenCalled();
     });
   });
diff --git a/packages/gemini-core/src/utils/installationManager.ts b/packages/gemini-core/src/utils/installationManager.ts
index 3fa05c030..3e46854e2 100644
--- a/packages/gemini-core/src/utils/installationManager.ts
+++ b/packages/gemini-core/src/utils/installationManager.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { randomUUID } from 'node:crypto';
-import * as path from 'node:path';
-import { Storage } from '../config/storage.js';
-import { debugLogger } from './debugLogger.js';
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { Storage } from "../config/storage.js";
+import { debugLogger } from "./debugLogger.js";
 
 export class InstallationManager {
   private getInstallationIdPath(): string {
@@ -18,9 +18,7 @@ export class InstallationManager {
   private readInstallationIdFromFile(): string | null {
     const installationIdFile = this.getInstallationIdPath();
     if (fs.existsSync(installationIdFile)) {
-      const installationid = fs
-        .readFileSync(installationIdFile, 'utf-8')
-        .trim();
+      const installationid = fs.readFileSync(installationIdFile, "utf-8").trim();
       return installationid || null;
     }
     return null;
@@ -30,7 +28,7 @@ export class InstallationManager {
     const installationIdFile = this.getInstallationIdPath();
     const dir = path.dirname(installationIdFile);
     fs.mkdirSync(dir, { recursive: true });
-    fs.writeFileSync(installationIdFile, installationId, 'utf-8');
+    fs.writeFileSync(installationIdFile, installationId, "utf-8");
   }
 
   /**
@@ -49,11 +47,8 @@ export class InstallationManager {
 
       return installationId;
     } catch (error) {
-      debugLogger.warn(
-        'Error accessing installation ID file, generating ephemeral ID:',
-        error,
-      );
-      return '123456789';
+      debugLogger.warn("Error accessing installation ID file, generating ephemeral ID:", error);
+      return "123456789";
     }
   }
 }
diff --git a/packages/gemini-core/src/utils/language-detection.ts b/packages/gemini-core/src/utils/language-detection.ts
index ebbefe8b3..6335bd9b0 100644
--- a/packages/gemini-core/src/utils/language-detection.ts
+++ b/packages/gemini-core/src/utils/language-detection.ts
@@ -4,93 +4,93 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
+import * as path from "node:path";
 
 const extensionToLanguageMap: { [key: string]: string } = {
-  '.ts': 'TypeScript',
-  '.js': 'JavaScript',
-  '.mjs': 'JavaScript',
-  '.cjs': 'JavaScript',
-  '.jsx': 'JavaScript',
-  '.tsx': 'TypeScript',
-  '.py': 'Python',
-  '.java': 'Java',
-  '.go': 'Go',
-  '.rb': 'Ruby',
-  '.php': 'PHP',
-  '.phtml': 'PHP',
-  '.cs': 'C#',
-  '.cpp': 'C++',
-  '.cxx': 'C++',
-  '.cc': 'C++',
-  '.c': 'C',
-  '.h': 'C/C++',
-  '.hpp': 'C++',
-  '.swift': 'Swift',
-  '.kt': 'Kotlin',
-  '.rs': 'Rust',
-  '.m': 'Objective-C',
-  '.mm': 'Objective-C',
-  '.pl': 'Perl',
-  '.pm': 'Perl',
-  '.lua': 'Lua',
-  '.r': 'R',
-  '.scala': 'Scala',
-  '.sc': 'Scala',
-  '.sh': 'Shell',
-  '.ps1': 'PowerShell',
-  '.bat': 'Batch',
-  '.cmd': 'Batch',
-  '.sql': 'SQL',
-  '.html': 'HTML',
-  '.htm': 'HTML',
-  '.css': 'CSS',
-  '.less': 'Less',
-  '.sass': 'Sass',
-  '.scss': 'Sass',
-  '.json': 'JSON',
-  '.xml': 'XML',
-  '.yaml': 'YAML',
-  '.yml': 'YAML',
-  '.md': 'Markdown',
-  '.markdown': 'Markdown',
-  '.dockerfile': 'Dockerfile',
-  '.vim': 'Vim script',
-  '.vb': 'Visual Basic',
-  '.fs': 'F#',
-  '.clj': 'Clojure',
-  '.cljs': 'Clojure',
-  '.dart': 'Dart',
-  '.ex': 'Elixir',
-  '.erl': 'Erlang',
-  '.hs': 'Haskell',
-  '.lisp': 'Lisp',
-  '.rkt': 'Racket',
-  '.groovy': 'Groovy',
-  '.jl': 'Julia',
-  '.tex': 'LaTeX',
-  '.ino': 'Arduino',
-  '.asm': 'Assembly',
-  '.s': 'Assembly',
-  '.toml': 'TOML',
-  '.vue': 'Vue',
-  '.svelte': 'Svelte',
-  '.gohtml': 'Go Template',
-  '.hbs': 'Handlebars',
-  '.ejs': 'EJS',
-  '.erb': 'ERB',
-  '.jsp': 'JSP',
-  '.dockerignore': 'Docker',
-  '.gitignore': 'Git',
-  '.npmignore': 'npm',
-  '.editorconfig': 'EditorConfig',
-  '.prettierrc': 'Prettier',
-  '.eslintrc': 'ESLint',
-  '.babelrc': 'Babel',
-  '.tsconfig': 'TypeScript',
-  '.flow': 'Flow',
-  '.graphql': 'GraphQL',
-  '.proto': 'Protocol Buffers',
+  ".ts": "TypeScript",
+  ".js": "JavaScript",
+  ".mjs": "JavaScript",
+  ".cjs": "JavaScript",
+  ".jsx": "JavaScript",
+  ".tsx": "TypeScript",
+  ".py": "Python",
+  ".java": "Java",
+  ".go": "Go",
+  ".rb": "Ruby",
+  ".php": "PHP",
+  ".phtml": "PHP",
+  ".cs": "C#",
+  ".cpp": "C++",
+  ".cxx": "C++",
+  ".cc": "C++",
+  ".c": "C",
+  ".h": "C/C++",
+  ".hpp": "C++",
+  ".swift": "Swift",
+  ".kt": "Kotlin",
+  ".rs": "Rust",
+  ".m": "Objective-C",
+  ".mm": "Objective-C",
+  ".pl": "Perl",
+  ".pm": "Perl",
+  ".lua": "Lua",
+  ".r": "R",
+  ".scala": "Scala",
+  ".sc": "Scala",
+  ".sh": "Shell",
+  ".ps1": "PowerShell",
+  ".bat": "Batch",
+  ".cmd": "Batch",
+  ".sql": "SQL",
+  ".html": "HTML",
+  ".htm": "HTML",
+  ".css": "CSS",
+  ".less": "Less",
+  ".sass": "Sass",
+  ".scss": "Sass",
+  ".json": "JSON",
+  ".xml": "XML",
+  ".yaml": "YAML",
+  ".yml": "YAML",
+  ".md": "Markdown",
+  ".markdown": "Markdown",
+  ".dockerfile": "Dockerfile",
+  ".vim": "Vim script",
+  ".vb": "Visual Basic",
+  ".fs": "F#",
+  ".clj": "Clojure",
+  ".cljs": "Clojure",
+  ".dart": "Dart",
+  ".ex": "Elixir",
+  ".erl": "Erlang",
+  ".hs": "Haskell",
+  ".lisp": "Lisp",
+  ".rkt": "Racket",
+  ".groovy": "Groovy",
+  ".jl": "Julia",
+  ".tex": "LaTeX",
+  ".ino": "Arduino",
+  ".asm": "Assembly",
+  ".s": "Assembly",
+  ".toml": "TOML",
+  ".vue": "Vue",
+  ".svelte": "Svelte",
+  ".gohtml": "Go Template",
+  ".hbs": "Handlebars",
+  ".ejs": "EJS",
+  ".erb": "ERB",
+  ".jsp": "JSP",
+  ".dockerignore": "Docker",
+  ".gitignore": "Git",
+  ".npmignore": "npm",
+  ".editorconfig": "EditorConfig",
+  ".prettierrc": "Prettier",
+  ".eslintrc": "ESLint",
+  ".babelrc": "Babel",
+  ".tsconfig": "TypeScript",
+  ".flow": "Flow",
+  ".graphql": "GraphQL",
+  ".proto": "Protocol Buffers",
 };
 
 export function getLanguageFromFilePath(filePath: string): string | undefined {
diff --git a/packages/gemini-core/src/utils/llm-edit-fixer.test.ts b/packages/gemini-core/src/utils/llm-edit-fixer.test.ts
index de8940ded..a744628c9 100644
--- a/packages/gemini-core/src/utils/llm-edit-fixer.test.ts
+++ b/packages/gemini-core/src/utils/llm-edit-fixer.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
 import {
   FixLLMEditWithInstruction,
   resetLlmEditFixerCaches_TEST_ONLY,
   type SearchReplaceEdit,
-} from './llm-edit-fixer.js';
-import { promptIdContext } from './promptIdContext.js';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
+} from "./llm-edit-fixer.js";
+import { promptIdContext } from "./promptIdContext.js";
 
 // Mock the BaseLlmClient
 const mockGenerateJson = vi.fn();
@@ -20,19 +20,19 @@ const mockBaseLlmClient = {
   config: {
     generationConfigService: {
       getResolvedConfig: vi.fn().mockReturnValue({
-        model: 'edit-corrector',
+        model: "edit-corrector",
         generateContentConfig: {},
       }),
     },
   },
 } as unknown as BaseLlmClient;
 
-describe('FixLLMEditWithInstruction', () => {
-  const instruction = 'Replace the title';
-  const old_string = '<h1>Old Title</h1>';
-  const new_string = '<h1>New Title</h1>';
-  const error = 'String not found';
-  const current_content = '<body><h1>Old Title</h1></body>';
+describe("FixLLMEditWithInstruction", () => {
+  const instruction = "Replace the title";
+  const old_string = "<h1>Old Title</h1>";
+  const new_string = "<h1>New Title</h1>";
+  const error = "String not found";
+  const current_content = "<body><h1>Old Title</h1></body>";
   const abortController = new AbortController();
   const abortSignal = abortController.signal;
 
@@ -40,13 +40,9 @@ describe('FixLLMEditWithInstruction', () => {
     vi.useFakeTimers();
     vi.clearAllMocks();
     // Mock AbortSignal.timeout to use setTimeout so it respects fake timers
-    vi.spyOn(AbortSignal, 'timeout').mockImplementation((ms) => {
+    vi.spyOn(AbortSignal, "timeout").mockImplementation((ms) => {
       const controller = new AbortController();
-      setTimeout(
-        () =>
-          controller.abort(new DOMException('TimeoutError', 'TimeoutError')),
-        ms,
-      );
+      setTimeout(() => controller.abort(new DOMException("TimeoutError", "TimeoutError")), ms);
       return controller.signal;
     });
     resetLlmEditFixerCaches_TEST_ONLY(); // Ensure cache is cleared before each test
@@ -58,14 +54,14 @@ describe('FixLLMEditWithInstruction', () => {
   });
 
   const mockApiResponse: SearchReplaceEdit = {
-    search: '<h1>Old Title</h1>',
-    replace: '<h1>New Title</h1>',
+    search: "<h1>Old Title</h1>",
+    replace: "<h1>New Title</h1>",
     noChangesRequired: false,
-    explanation: 'The original search was correct.',
+    explanation: "The original search was correct.",
   };
 
-  it('should use the promptId from the AsyncLocalStorage context when available', async () => {
-    const testPromptId = 'test-prompt-id-12345';
+  it("should use the promptId from the AsyncLocalStorage context when available", async () => {
+    const testPromptId = "test-prompt-id-12345";
     mockGenerateJson.mockResolvedValue(mockApiResponse);
 
     await promptIdContext.run(testPromptId, async () => {
@@ -89,11 +85,9 @@ describe('FixLLMEditWithInstruction', () => {
     );
   });
 
-  it('should generate and use a fallback promptId when context is not available', async () => {
+  it("should generate and use a fallback promptId when context is not available", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const consoleWarnSpy = vi
-      .spyOn(console, 'warn')
-      .mockImplementation(() => {});
+    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
 
     // Run the function outside of any context
     await FixLLMEditWithInstruction(
@@ -109,7 +103,7 @@ describe('FixLLMEditWithInstruction', () => {
     // Verify the warning was logged
     expect(consoleWarnSpy).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Could not find promptId in context. This is unexpected. Using a fallback ID: llm-fixer-fallback-',
+        "Could not find promptId in context. This is unexpected. Using a fallback ID: llm-fixer-fallback-",
       ),
     );
 
@@ -117,7 +111,7 @@ describe('FixLLMEditWithInstruction', () => {
     expect(mockGenerateJson).toHaveBeenCalledTimes(1);
     expect(mockGenerateJson).toHaveBeenCalledWith(
       expect.objectContaining({
-        promptId: expect.stringContaining('llm-fixer-fallback-'),
+        promptId: expect.stringContaining("llm-fixer-fallback-"),
       }),
     );
 
@@ -125,9 +119,9 @@ describe('FixLLMEditWithInstruction', () => {
     consoleWarnSpy.mockRestore();
   });
 
-  it('should construct the user prompt correctly', async () => {
+  it("should construct the user prompt correctly", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const promptId = 'test-prompt-id-prompt-construction';
+    const promptId = "test-prompt-id-prompt-construction";
 
     await promptIdContext.run(promptId, async () => {
       await FixLLMEditWithInstruction(
@@ -144,20 +138,16 @@ describe('FixLLMEditWithInstruction', () => {
     const generateJsonCall = mockGenerateJson.mock.calls[0][0];
     const userPromptContent = generateJsonCall.contents[0].parts[0].text;
 
-    expect(userPromptContent).toContain(
-      `<instruction>\n${instruction}\n</instruction>`,
-    );
+    expect(userPromptContent).toContain(`<instruction>\n${instruction}\n</instruction>`);
     expect(userPromptContent).toContain(`<search>\n${old_string}\n</search>`);
     expect(userPromptContent).toContain(`<replace>\n${new_string}\n</replace>`);
     expect(userPromptContent).toContain(`<error>\n${error}\n</error>`);
-    expect(userPromptContent).toContain(
-      `<file_content>\n${current_content}\n</file_content>`,
-    );
+    expect(userPromptContent).toContain(`<file_content>\n${current_content}\n</file_content>`);
   });
 
-  it('should return a cached result on subsequent identical calls', async () => {
+  it("should return a cached result on subsequent identical calls", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const testPromptId = 'test-prompt-id-caching';
+    const testPromptId = "test-prompt-id-caching";
 
     await promptIdContext.run(testPromptId, async () => {
       // First call - should call the API
@@ -189,9 +179,9 @@ describe('FixLLMEditWithInstruction', () => {
     });
   });
 
-  it('should not use cache for calls with different parameters', async () => {
+  it("should not use cache for calls with different parameters", async () => {
     mockGenerateJson.mockResolvedValue(mockApiResponse);
-    const testPromptId = 'test-prompt-id-cache-miss';
+    const testPromptId = "test-prompt-id-cache-miss";
 
     await promptIdContext.run(testPromptId, async () => {
       // First call
@@ -207,7 +197,7 @@ describe('FixLLMEditWithInstruction', () => {
 
       // Second call with a different instruction
       await FixLLMEditWithInstruction(
-        'A different instruction',
+        "A different instruction",
         old_string,
         new_string,
         error,
@@ -221,40 +211,38 @@ describe('FixLLMEditWithInstruction', () => {
     });
   });
 
-  describe('cache collision prevention', () => {
-    it('should prevent cache collisions when parameters contain separator sequences', async () => {
+  describe("cache collision prevention", () => {
+    it("should prevent cache collisions when parameters contain separator sequences", async () => {
       // This test would have failed with the old string concatenation approach
       // but passes with JSON.stringify implementation
 
       const firstResponse: SearchReplaceEdit = {
-        search: 'original text',
-        replace: 'first replacement',
+        search: "original text",
+        replace: "first replacement",
         noChangesRequired: false,
-        explanation: 'First edit correction',
+        explanation: "First edit correction",
       };
 
       const secondResponse: SearchReplaceEdit = {
-        search: 'different text',
-        replace: 'second replacement',
+        search: "different text",
+        replace: "second replacement",
         noChangesRequired: false,
-        explanation: 'Second edit correction',
+        explanation: "Second edit correction",
       };
 
-      mockGenerateJson
-        .mockResolvedValueOnce(firstResponse)
-        .mockResolvedValueOnce(secondResponse);
+      mockGenerateJson.mockResolvedValueOnce(firstResponse).mockResolvedValueOnce(secondResponse);
 
-      const testPromptId = 'cache-collision-test';
+      const testPromptId = "cache-collision-test";
 
       await promptIdContext.run(testPromptId, async () => {
         // Scenario 1: Parameters that would create collision with string concatenation
         // Cache key with old method would be: "Fix YAML---content---update--some---data--error"
         const call1 = await FixLLMEditWithInstruction(
-          'Fix YAML', // instruction
-          'content', // old_string
-          'update--some', // new_string (contains --)
-          'data', // current_content
-          'error', // error
+          "Fix YAML", // instruction
+          "content", // old_string
+          "update--some", // new_string (contains --)
+          "data", // current_content
+          "error", // error
           mockBaseLlmClient,
           abortSignal,
         );
@@ -262,11 +250,11 @@ describe('FixLLMEditWithInstruction', () => {
         // Scenario 2: Different parameters that would create same cache key with concatenation
         // Cache key with old method would be: "Fix YAML---content---update--some---data--error"
         const call2 = await FixLLMEditWithInstruction(
-          'Fix YAML---content---update', // instruction (contains ---)
-          'some---data', // old_string (contains ---)
-          'error', // new_string
-          '', // current_content
-          '', // error
+          "Fix YAML---content---update", // instruction (contains ---)
+          "some---data", // old_string (contains ---)
+          "error", // new_string
+          "", // current_content
+          "", // error
           mockBaseLlmClient,
           abortSignal,
         );
@@ -283,48 +271,46 @@ describe('FixLLMEditWithInstruction', () => {
       });
     });
 
-    it('should handle YAML frontmatter without cache collisions', async () => {
+    it("should handle YAML frontmatter without cache collisions", async () => {
       // Real-world test case with YAML frontmatter containing ---
 
       const yamlResponse: SearchReplaceEdit = {
-        search: '---\ntitle: Old\n---',
-        replace: '---\ntitle: New\n---',
+        search: "---\ntitle: Old\n---",
+        replace: "---\ntitle: New\n---",
         noChangesRequired: false,
-        explanation: 'Updated YAML frontmatter',
+        explanation: "Updated YAML frontmatter",
       };
 
       const contentResponse: SearchReplaceEdit = {
-        search: 'old content',
-        replace: 'new content',
+        search: "old content",
+        replace: "new content",
         noChangesRequired: false,
-        explanation: 'Updated content',
+        explanation: "Updated content",
       };
 
-      mockGenerateJson
-        .mockResolvedValueOnce(yamlResponse)
-        .mockResolvedValueOnce(contentResponse);
+      mockGenerateJson.mockResolvedValueOnce(yamlResponse).mockResolvedValueOnce(contentResponse);
 
-      const testPromptId = 'yaml-frontmatter-test';
+      const testPromptId = "yaml-frontmatter-test";
 
       await promptIdContext.run(testPromptId, async () => {
         // Call 1: Edit YAML frontmatter
         const yamlEdit = await FixLLMEditWithInstruction(
-          'Update YAML frontmatter',
-          '---\ntitle: Old\n---', // Contains ---
-          '---\ntitle: New\n---', // Contains ---
-          'Some markdown content',
-          'YAML parse error',
+          "Update YAML frontmatter",
+          "---\ntitle: Old\n---", // Contains ---
+          "---\ntitle: New\n---", // Contains ---
+          "Some markdown content",
+          "YAML parse error",
           mockBaseLlmClient,
           abortSignal,
         );
 
         // Call 2: Edit regular content
         const contentEdit = await FixLLMEditWithInstruction(
-          'Update content',
-          'old content',
-          'new content',
-          'Different file content',
-          'Content not found',
+          "Update content",
+          "old content",
+          "new content",
+          "Different file content",
+          "Content not found",
           mockBaseLlmClient,
           abortSignal,
         );
@@ -340,22 +326,22 @@ describe('FixLLMEditWithInstruction', () => {
     });
   });
 
-  it('should return null if the LLM call times out', async () => {
+  it("should return null if the LLM call times out", async () => {
     mockGenerateJson.mockImplementation(
       async ({ abortSignal }) =>
         // Simulate a long-running operation that never resolves on its own.
         // It will only reject when the abort signal is triggered by the timeout.
         new Promise((_resolve, reject) => {
           if (abortSignal?.aborted) {
-            return reject(new DOMException('Aborted', 'AbortError'));
+            return reject(new DOMException("Aborted", "AbortError"));
           }
-          abortSignal?.addEventListener('abort', () => {
-            reject(new DOMException('Aborted', 'AbortError'));
+          abortSignal?.addEventListener("abort", () => {
+            reject(new DOMException("Aborted", "AbortError"));
           });
         }),
     );
 
-    const testPromptId = 'test-prompt-id-timeout';
+    const testPromptId = "test-prompt-id-timeout";
 
     const fixPromise = promptIdContext.run(testPromptId, () =>
       FixLLMEditWithInstruction(
diff --git a/packages/gemini-core/src/utils/llm-edit-fixer.ts b/packages/gemini-core/src/utils/llm-edit-fixer.ts
index 363c973cd..3454885d9 100644
--- a/packages/gemini-core/src/utils/llm-edit-fixer.ts
+++ b/packages/gemini-core/src/utils/llm-edit-fixer.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createHash } from 'node:crypto';
-import { type Content, Type } from '@google/genai';
-import { type BaseLlmClient } from '../core/baseLlmClient.js';
-import { LruCache } from './LruCache.js';
-import { promptIdContext } from './promptIdContext.js';
-import { debugLogger } from './debugLogger.js';
+import { createHash } from "node:crypto";
+import { type Content, Type } from "@google/genai";
+import { type BaseLlmClient } from "../core/baseLlmClient.js";
+import { debugLogger } from "./debugLogger.js";
+import { LruCache } from "./LruCache.js";
+import { promptIdContext } from "./promptIdContext.js";
 
 const MAX_CACHE_SIZE = 50;
 const GENERATE_JSON_TIMEOUT_MS = 40000; // 40 seconds
@@ -81,17 +81,14 @@ const SearchReplaceEditSchema = {
     replace: { type: Type.STRING },
     noChangesRequired: { type: Type.BOOLEAN },
   },
-  required: ['search', 'replace', 'explanation'],
+  required: ["search", "replace", "explanation"],
 };
 
-const editCorrectionWithInstructionCache = new LruCache<
-  string,
-  SearchReplaceEdit
->(MAX_CACHE_SIZE);
+const editCorrectionWithInstructionCache = new LruCache<string, SearchReplaceEdit>(MAX_CACHE_SIZE);
 
 async function generateJsonWithTimeout<T>(
   client: BaseLlmClient,
-  params: Parameters<BaseLlmClient['generateJson']>[0],
+  params: Parameters<BaseLlmClient["generateJson"]>[0],
   timeoutMs: number,
 ): Promise<T | null> {
   try {
@@ -144,30 +141,22 @@ export async function FixLLMEditWithInstruction(
     );
   }
 
-  const cacheKey = createHash('sha256')
-    .update(
-      JSON.stringify([
-        current_content,
-        old_string,
-        new_string,
-        instruction,
-        error,
-      ]),
-    )
-    .digest('hex');
+  const cacheKey = createHash("sha256")
+    .update(JSON.stringify([current_content, old_string, new_string, instruction, error]))
+    .digest("hex");
   const cachedResult = editCorrectionWithInstructionCache.get(cacheKey);
   if (cachedResult) {
     return cachedResult;
   }
-  const userPrompt = EDIT_USER_PROMPT.replace('{instruction}', instruction)
-    .replace('{old_string}', old_string)
-    .replace('{new_string}', new_string)
-    .replace('{error}', error)
-    .replace('{current_content}', current_content);
+  const userPrompt = EDIT_USER_PROMPT.replace("{instruction}", instruction)
+    .replace("{old_string}", old_string)
+    .replace("{new_string}", new_string)
+    .replace("{error}", error)
+    .replace("{current_content}", current_content);
 
   const contents: Content[] = [
     {
-      role: 'user',
+      role: "user",
       parts: [{ text: userPrompt }],
     },
   ];
@@ -175,7 +164,7 @@ export async function FixLLMEditWithInstruction(
   const result = await generateJsonWithTimeout<SearchReplaceEdit>(
     baseLlmClient,
     {
-      modelConfigKey: { model: 'llm-edit-fixer' },
+      modelConfigKey: { model: "llm-edit-fixer" },
       contents,
       schema: SearchReplaceEditSchema,
       abortSignal,
diff --git a/packages/gemini-core/src/utils/memoryDiscovery.test.ts b/packages/gemini-core/src/utils/memoryDiscovery.test.ts
index fd34310af..f0d744d92 100644
--- a/packages/gemini-core/src/utils/memoryDiscovery.test.ts
+++ b/packages/gemini-core/src/utils/memoryDiscovery.test.ts
@@ -4,29 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fsPromises from 'node:fs/promises';
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Config, type GeminiCLIExtension } from "../config/config.js";
+import { Storage } from "../config/storage.js";
+import { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { DEFAULT_CONTEXT_FILENAME, setGeminiMdFilename } from "../tools/memoryTool.js";
+import { CoreEvent, coreEvents } from "./events.js";
+import { SimpleExtensionLoader } from "./extensionLoader.js";
 import {
-  loadServerHierarchicalMemory,
-  loadGlobalMemory,
   loadEnvironmentMemory,
+  loadGlobalMemory,
   loadJitSubdirectoryMemory,
+  loadServerHierarchicalMemory,
   refreshServerHierarchicalMemory,
-} from './memoryDiscovery.js';
-import {
-  setGeminiMdFilename,
-  DEFAULT_CONTEXT_FILENAME,
-} from '../tools/memoryTool.js';
-import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { GEMINI_DIR } from './paths.js';
-import { Config, type GeminiCLIExtension } from '../config/config.js';
-import { Storage } from '../config/storage.js';
-import { SimpleExtensionLoader } from './extensionLoader.js';
-import { CoreEvent, coreEvents } from './events.js';
-
-vi.mock('os', async (importOriginal) => {
+} from "./memoryDiscovery.js";
+import { GEMINI_DIR } from "./paths.js";
+
+vi.mock("os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof os>();
   return {
     ...actualOs,
@@ -34,7 +31,7 @@ vi.mock('os', async (importOriginal) => {
   };
 });
 
-describe('memoryDiscovery', () => {
+describe("memoryDiscovery", () => {
   const DEFAULT_FOLDER_TRUST = true;
   let testRootDir: string;
   let cwd: string;
@@ -53,18 +50,16 @@ describe('memoryDiscovery', () => {
   }
 
   beforeEach(async () => {
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'folder-structure-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "folder-structure-test-"));
 
     vi.resetAllMocks();
     // Set environment variables to indicate test environment
-    vi.stubEnv('NODE_ENV', 'test');
-    vi.stubEnv('VITEST', 'true');
+    vi.stubEnv("NODE_ENV", "test");
+    vi.stubEnv("VITEST", "true");
 
-    projectRoot = await createEmptyDir(path.join(testRootDir, 'project'));
-    cwd = await createEmptyDir(path.join(projectRoot, 'src'));
-    homedir = await createEmptyDir(path.join(testRootDir, 'userhome'));
+    projectRoot = await createEmptyDir(path.join(testRootDir, "project"));
+    cwd = await createEmptyDir(path.join(projectRoot, "src"));
+    homedir = await createEmptyDir(path.join(testRootDir, "userhome"));
     vi.mocked(os.homedir).mockReturnValue(homedir);
   });
 
@@ -82,16 +77,10 @@ describe('memoryDiscovery', () => {
     });
   });
 
-  describe('when untrusted', () => {
-    it('does not load context files from untrusted workspaces', async () => {
-      await createTestFile(
-        path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-        'Project root memory',
-      );
-      await createTestFile(
-        path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-        'Src directory memory',
-      );
+  describe("when untrusted", () => {
+    it("does not load context files from untrusted workspaces", async () => {
+      await createTestFile(path.join(projectRoot, DEFAULT_CONTEXT_FILENAME), "Project root memory");
+      await createTestFile(path.join(cwd, DEFAULT_CONTEXT_FILENAME), "Src directory memory");
       const result = await loadServerHierarchicalMemory(
         cwd,
         [],
@@ -102,33 +91,32 @@ describe('memoryDiscovery', () => {
       );
 
       expect(result).toEqual({
-        memoryContent: '',
+        memoryContent: "",
         fileCount: 0,
         filePaths: [],
       });
     });
 
-    it('loads context from outside the untrusted workspace', async () => {
+    it("loads context from outside the untrusted workspace", async () => {
       await createTestFile(
         path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-        'Project root memory', // Untrusted
+        "Project root memory", // Untrusted
       );
       await createTestFile(
         path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-        'Src directory memory', // Untrusted
+        "Src directory memory", // Untrusted
       );
 
       const filepath = path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME);
-      await createTestFile(filepath, 'default context content'); // In user home dir (outside untrusted space).
-      const { fileCount, memoryContent, filePaths } =
-        await loadServerHierarchicalMemory(
-          cwd,
-          [],
-          false,
-          new FileDiscoveryService(projectRoot),
-          new SimpleExtensionLoader([]),
-          false, // untrusted
-        );
+      await createTestFile(filepath, "default context content"); // In user home dir (outside untrusted space).
+      const { fileCount, memoryContent, filePaths } = await loadServerHierarchicalMemory(
+        cwd,
+        [],
+        false,
+        new FileDiscoveryService(projectRoot),
+        new SimpleExtensionLoader([]),
+        false, // untrusted
+      );
 
       expect(fileCount).toEqual(1);
       expect(memoryContent).toContain(path.relative(cwd, filepath).toString());
@@ -136,7 +124,7 @@ describe('memoryDiscovery', () => {
     });
   });
 
-  it('should return empty memory and count if no context files are found', async () => {
+  it("should return empty memory and count if no context files are found", async () => {
     const result = await loadServerHierarchicalMemory(
       cwd,
       [],
@@ -147,16 +135,16 @@ describe('memoryDiscovery', () => {
     );
 
     expect(result).toEqual({
-      memoryContent: '',
+      memoryContent: "",
       fileCount: 0,
       filePaths: [],
     });
   });
 
-  it('should load only the global context file if present and others are not (default filename)', async () => {
+  it("should load only the global context file if present and others are not (default filename)", async () => {
     const defaultContextFile = await createTestFile(
       path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME),
-      'default context content',
+      "default context content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -177,13 +165,13 @@ default context content
     });
   });
 
-  it('should load only the global custom context file if present and filename is changed', async () => {
-    const customFilename = 'CUSTOM_AGENTS.md';
+  it("should load only the global custom context file if present and filename is changed", async () => {
+    const customFilename = "CUSTOM_AGENTS.md";
     setGeminiMdFilename(customFilename);
 
     const customContextFile = await createTestFile(
       path.join(homedir, GEMINI_DIR, customFilename),
-      'custom context content',
+      "custom context content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -204,17 +192,17 @@ custom context content
     });
   });
 
-  it('should load context files by upward traversal with custom filename', async () => {
-    const customFilename = 'PROJECT_CONTEXT.md';
+  it("should load context files by upward traversal with custom filename", async () => {
+    const customFilename = "PROJECT_CONTEXT.md";
     setGeminiMdFilename(customFilename);
 
     const projectContextFile = await createTestFile(
       path.join(projectRoot, customFilename),
-      'project context content',
+      "project context content",
     );
     const cwdContextFile = await createTestFile(
       path.join(cwd, customFilename),
-      'cwd context content',
+      "cwd context content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -239,18 +227,15 @@ cwd context content
     });
   });
 
-  it('should load context files by downward traversal with custom filename', async () => {
-    const customFilename = 'LOCAL_CONTEXT.md';
+  it("should load context files by downward traversal with custom filename", async () => {
+    const customFilename = "LOCAL_CONTEXT.md";
     setGeminiMdFilename(customFilename);
 
     const subdirCustomFile = await createTestFile(
-      path.join(cwd, 'subdir', customFilename),
-      'Subdir custom memory',
-    );
-    const cwdCustomFile = await createTestFile(
-      path.join(cwd, customFilename),
-      'CWD custom memory',
+      path.join(cwd, "subdir", customFilename),
+      "Subdir custom memory",
     );
+    const cwdCustomFile = await createTestFile(path.join(cwd, customFilename), "CWD custom memory");
 
     const result = await loadServerHierarchicalMemory(
       cwd,
@@ -266,22 +251,22 @@ cwd context content
 CWD custom memory
 --- End of Context from: ${customFilename} ---
 
---- Context from: ${path.join('subdir', customFilename)} ---
+--- Context from: ${path.join("subdir", customFilename)} ---
 Subdir custom memory
---- End of Context from: ${path.join('subdir', customFilename)} ---`,
+--- End of Context from: ${path.join("subdir", customFilename)} ---`,
       fileCount: 2,
       filePaths: [cwdCustomFile, subdirCustomFile],
     });
   });
 
-  it('should load ORIGINAL_GEMINI_MD_FILENAME files by upward traversal from CWD to project root', async () => {
+  it("should load ORIGINAL_GEMINI_MD_FILENAME files by upward traversal from CWD to project root", async () => {
     const projectRootGeminiFile = await createTestFile(
       path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-      'Project root memory',
+      "Project root memory",
     );
     const srcGeminiFile = await createTestFile(
       path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-      'Src directory memory',
+      "Src directory memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -306,14 +291,14 @@ Src directory memory
     });
   });
 
-  it('should load ORIGINAL_GEMINI_MD_FILENAME files by downward traversal from CWD', async () => {
+  it("should load ORIGINAL_GEMINI_MD_FILENAME files by downward traversal from CWD", async () => {
     const subDirGeminiFile = await createTestFile(
-      path.join(cwd, 'subdir', DEFAULT_CONTEXT_FILENAME),
-      'Subdir memory',
+      path.join(cwd, "subdir", DEFAULT_CONTEXT_FILENAME),
+      "Subdir memory",
     );
     const cwdGeminiFile = await createTestFile(
       path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-      'CWD memory',
+      "CWD memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -330,34 +315,34 @@ Src directory memory
 CWD memory
 --- End of Context from: ${DEFAULT_CONTEXT_FILENAME} ---
 
---- Context from: ${path.join('subdir', DEFAULT_CONTEXT_FILENAME)} ---
+--- Context from: ${path.join("subdir", DEFAULT_CONTEXT_FILENAME)} ---
 Subdir memory
---- End of Context from: ${path.join('subdir', DEFAULT_CONTEXT_FILENAME)} ---`,
+--- End of Context from: ${path.join("subdir", DEFAULT_CONTEXT_FILENAME)} ---`,
       fileCount: 2,
       filePaths: [cwdGeminiFile, subDirGeminiFile],
     });
   });
 
-  it('should load and correctly order global, upward, and downward ORIGINAL_GEMINI_MD_FILENAME files', async () => {
+  it("should load and correctly order global, upward, and downward ORIGINAL_GEMINI_MD_FILENAME files", async () => {
     const defaultContextFile = await createTestFile(
       path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME),
-      'default context content',
+      "default context content",
     );
     const rootGeminiFile = await createTestFile(
       path.join(testRootDir, DEFAULT_CONTEXT_FILENAME),
-      'Project parent memory',
+      "Project parent memory",
     );
     const projectRootGeminiFile = await createTestFile(
       path.join(projectRoot, DEFAULT_CONTEXT_FILENAME),
-      'Project root memory',
+      "Project root memory",
     );
     const cwdGeminiFile = await createTestFile(
       path.join(cwd, DEFAULT_CONTEXT_FILENAME),
-      'CWD memory',
+      "CWD memory",
     );
     const subDirGeminiFile = await createTestFile(
-      path.join(cwd, 'sub', DEFAULT_CONTEXT_FILENAME),
-      'Subdir memory',
+      path.join(cwd, "sub", DEFAULT_CONTEXT_FILENAME),
+      "Subdir memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -400,17 +385,17 @@ Subdir memory
     });
   });
 
-  it('should ignore specified directories during downward scan', async () => {
-    await createEmptyDir(path.join(projectRoot, '.git'));
-    await createTestFile(path.join(projectRoot, '.gitignore'), 'node_modules');
+  it("should ignore specified directories during downward scan", async () => {
+    await createEmptyDir(path.join(projectRoot, ".git"));
+    await createTestFile(path.join(projectRoot, ".gitignore"), "node_modules");
 
     await createTestFile(
-      path.join(cwd, 'node_modules', DEFAULT_CONTEXT_FILENAME),
-      'Ignored memory',
+      path.join(cwd, "node_modules", DEFAULT_CONTEXT_FILENAME),
+      "Ignored memory",
     );
     const regularSubDirGeminiFile = await createTestFile(
-      path.join(cwd, 'my_code', DEFAULT_CONTEXT_FILENAME),
-      'My code memory',
+      path.join(cwd, "my_code", DEFAULT_CONTEXT_FILENAME),
+      "My code memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -420,7 +405,7 @@ Subdir memory
       new FileDiscoveryService(projectRoot),
       new SimpleExtensionLoader([]),
       DEFAULT_FOLDER_TRUST,
-      'tree',
+      "tree",
       {
         respectGitIgnore: true,
         respectGeminiIgnore: true,
@@ -437,10 +422,8 @@ My code memory
     });
   });
 
-  it('should respect the maxDirs parameter during downward scan', async () => {
-    const consoleDebugSpy = vi
-      .spyOn(console, 'debug')
-      .mockImplementation(() => {});
+  it("should respect the maxDirs parameter during downward scan", async () => {
+    const consoleDebugSpy = vi.spyOn(console, "debug").mockImplementation(() => {});
 
     // Create directories in parallel for better performance
     const dirPromises = Array.from({ length: 2 }, (_, i) =>
@@ -456,7 +439,7 @@ My code memory
       new FileDiscoveryService(projectRoot),
       new SimpleExtensionLoader([]),
       DEFAULT_FOLDER_TRUST,
-      'tree', // importFormat
+      "tree", // importFormat
       {
         respectGitIgnore: true,
         respectGeminiIgnore: true,
@@ -465,8 +448,8 @@ My code memory
     );
 
     expect(consoleDebugSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[DEBUG] [BfsFileSearch]'),
-      expect.stringContaining('Scanning [1/1]:'),
+      expect.stringContaining("[DEBUG] [BfsFileSearch]"),
+      expect.stringContaining("Scanning [1/1]:"),
     );
 
     vi.mocked(console.debug).mockRestore();
@@ -481,16 +464,16 @@ My code memory
     );
 
     expect(result).toEqual({
-      memoryContent: '',
+      memoryContent: "",
       fileCount: 0,
       filePaths: [],
     });
   });
 
-  it('should load extension context file paths', async () => {
+  it("should load extension context file paths", async () => {
     const extensionFilePath = await createTestFile(
-      path.join(testRootDir, 'extensions/ext1/GEMINI.md'),
-      'Extension memory content',
+      path.join(testRootDir, "extensions/ext1/GEMINI.md"),
+      "Extension memory content",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -516,13 +499,11 @@ Extension memory content
     });
   });
 
-  it('should load memory from included directories', async () => {
-    const includedDir = await createEmptyDir(
-      path.join(testRootDir, 'included'),
-    );
+  it("should load memory from included directories", async () => {
+    const includedDir = await createEmptyDir(path.join(testRootDir, "included"));
     const includedFile = await createTestFile(
       path.join(includedDir, DEFAULT_CONTEXT_FILENAME),
-      'included directory memory',
+      "included directory memory",
     );
 
     const result = await loadServerHierarchicalMemory(
@@ -543,15 +524,13 @@ included directory memory
     });
   });
 
-  it('should handle multiple directories and files in parallel correctly', async () => {
+  it("should handle multiple directories and files in parallel correctly", async () => {
     // Create multiple test directories with GEMINI.md files
     const numDirs = 5;
     const createdFiles: string[] = [];
 
     for (let i = 0; i < numDirs; i++) {
-      const dirPath = await createEmptyDir(
-        path.join(testRootDir, `project-${i}`),
-      );
+      const dirPath = await createEmptyDir(path.join(testRootDir, `project-${i}`));
       const filePath = await createTestFile(
         path.join(dirPath, DEFAULT_CONTEXT_FILENAME),
         `Content from project ${i}`,
@@ -580,18 +559,18 @@ included directory memory
     }
   });
 
-  it('should preserve order and prevent duplicates when processing multiple directories', async () => {
+  it("should preserve order and prevent duplicates when processing multiple directories", async () => {
     // Create overlapping directory structure
-    const parentDir = await createEmptyDir(path.join(testRootDir, 'parent'));
-    const childDir = await createEmptyDir(path.join(parentDir, 'child'));
+    const parentDir = await createEmptyDir(path.join(testRootDir, "parent"));
+    const childDir = await createEmptyDir(path.join(parentDir, "child"));
 
     const parentFile = await createTestFile(
       path.join(parentDir, DEFAULT_CONTEXT_FILENAME),
-      'Parent content',
+      "Parent content",
     );
     const childFile = await createTestFile(
       path.join(childDir, DEFAULT_CONTEXT_FILENAME),
-      'Child content',
+      "Child content",
     );
 
     // Include both parent and child directories
@@ -606,47 +585,43 @@ included directory memory
 
     // Should have both files without duplicates
     expect(result.fileCount).toBe(2);
-    expect(result.memoryContent).toContain('Parent content');
-    expect(result.memoryContent).toContain('Child content');
+    expect(result.memoryContent).toContain("Parent content");
+    expect(result.memoryContent).toContain("Child content");
     expect(result.filePaths.sort()).toEqual([parentFile, childFile].sort());
 
     // Check that files are not duplicated
-    const parentOccurrences = (
-      result.memoryContent.match(/Parent content/g) || []
-    ).length;
-    const childOccurrences = (
-      result.memoryContent.match(/Child content/g) || []
-    ).length;
+    const parentOccurrences = (result.memoryContent.match(/Parent content/g) || []).length;
+    const childOccurrences = (result.memoryContent.match(/Child content/g) || []).length;
     expect(parentOccurrences).toBe(1);
     expect(childOccurrences).toBe(1);
   });
 
-  describe('loadGlobalMemory', () => {
-    it('should load global memory file if it exists', async () => {
+  describe("loadGlobalMemory", () => {
+    it("should load global memory file if it exists", async () => {
       const globalMemoryFile = await createTestFile(
         path.join(homedir, GEMINI_DIR, DEFAULT_CONTEXT_FILENAME),
-        'Global memory content',
+        "Global memory content",
       );
 
       const result = await loadGlobalMemory();
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(globalMemoryFile);
-      expect(result.files[0].content).toBe('Global memory content');
+      expect(result.files[0].content).toBe("Global memory content");
     });
 
-    it('should return empty content if global memory file does not exist', async () => {
+    it("should return empty content if global memory file does not exist", async () => {
       const result = await loadGlobalMemory();
 
       expect(result.files).toHaveLength(0);
     });
   });
 
-  describe('loadEnvironmentMemory', () => {
-    it('should load extension memory', async () => {
+  describe("loadEnvironmentMemory", () => {
+    it("should load extension memory", async () => {
       const extFile = await createTestFile(
-        path.join(testRootDir, 'ext', 'GEMINI.md'),
-        'Extension content',
+        path.join(testRootDir, "ext", "GEMINI.md"),
+        "Extension content",
       );
       const mockExtensionLoader = new SimpleExtensionLoader([
         {
@@ -659,114 +634,85 @@ included directory memory
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(extFile);
-      expect(result.files[0].content).toBe('Extension content');
+      expect(result.files[0].content).toBe("Extension content");
     });
 
-    it('should NOT traverse upward beyond trusted root (even with .git)', async () => {
+    it("should NOT traverse upward beyond trusted root (even with .git)", async () => {
       // Setup: /temp/parent/repo/.git
-      const parentDir = await createEmptyDir(path.join(testRootDir, 'parent'));
-      const repoDir = await createEmptyDir(path.join(parentDir, 'repo'));
-      await createEmptyDir(path.join(repoDir, '.git'));
-      const srcDir = await createEmptyDir(path.join(repoDir, 'src'));
+      const parentDir = await createEmptyDir(path.join(testRootDir, "parent"));
+      const repoDir = await createEmptyDir(path.join(parentDir, "repo"));
+      await createEmptyDir(path.join(repoDir, ".git"));
+      const srcDir = await createEmptyDir(path.join(repoDir, "src"));
 
-      await createTestFile(
-        path.join(parentDir, DEFAULT_CONTEXT_FILENAME),
-        'Parent content',
-      );
-      await createTestFile(
-        path.join(repoDir, DEFAULT_CONTEXT_FILENAME),
-        'Repo content',
-      );
+      await createTestFile(path.join(parentDir, DEFAULT_CONTEXT_FILENAME), "Parent content");
+      await createTestFile(path.join(repoDir, DEFAULT_CONTEXT_FILENAME), "Repo content");
       const srcFile = await createTestFile(
         path.join(srcDir, DEFAULT_CONTEXT_FILENAME),
-        'Src content',
+        "Src content",
       );
 
       // Trust srcDir. Should ONLY load srcFile.
       // Repo and Parent are NOT trusted.
-      const result = await loadEnvironmentMemory(
-        [srcDir],
-        new SimpleExtensionLoader([]),
-      );
+      const result = await loadEnvironmentMemory([srcDir], new SimpleExtensionLoader([]));
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(srcFile);
-      expect(result.files[0].content).toBe('Src content');
+      expect(result.files[0].content).toBe("Src content");
     });
 
-    it('should NOT traverse upward beyond trusted root (no .git)', async () => {
+    it("should NOT traverse upward beyond trusted root (no .git)", async () => {
       // Setup: /homedir/docs/notes (no .git anywhere)
-      const docsDir = await createEmptyDir(path.join(homedir, 'docs'));
-      const notesDir = await createEmptyDir(path.join(docsDir, 'notes'));
+      const docsDir = await createEmptyDir(path.join(homedir, "docs"));
+      const notesDir = await createEmptyDir(path.join(docsDir, "notes"));
 
-      await createTestFile(
-        path.join(homedir, DEFAULT_CONTEXT_FILENAME),
-        'Home content',
-      );
+      await createTestFile(path.join(homedir, DEFAULT_CONTEXT_FILENAME), "Home content");
       const docsFile = await createTestFile(
         path.join(docsDir, DEFAULT_CONTEXT_FILENAME),
-        'Docs content',
+        "Docs content",
       );
 
       // Trust notesDir. Should load NOTHING because notesDir has no file,
       // and we do not traverse up to docsDir.
-      const resultNotes = await loadEnvironmentMemory(
-        [notesDir],
-        new SimpleExtensionLoader([]),
-      );
+      const resultNotes = await loadEnvironmentMemory([notesDir], new SimpleExtensionLoader([]));
       expect(resultNotes.files).toHaveLength(0);
 
       // Trust docsDir. Should load docsFile, but NOT homeFile.
-      const resultDocs = await loadEnvironmentMemory(
-        [docsDir],
-        new SimpleExtensionLoader([]),
-      );
+      const resultDocs = await loadEnvironmentMemory([docsDir], new SimpleExtensionLoader([]));
       expect(resultDocs.files).toHaveLength(1);
       expect(resultDocs.files[0].path).toBe(docsFile);
-      expect(resultDocs.files[0].content).toBe('Docs content');
+      expect(resultDocs.files[0].content).toBe("Docs content");
     });
 
-    it('should deduplicate paths when same root is trusted multiple times', async () => {
-      const repoDir = await createEmptyDir(path.join(testRootDir, 'repo'));
-      await createEmptyDir(path.join(repoDir, '.git'));
+    it("should deduplicate paths when same root is trusted multiple times", async () => {
+      const repoDir = await createEmptyDir(path.join(testRootDir, "repo"));
+      await createEmptyDir(path.join(repoDir, ".git"));
 
       const repoFile = await createTestFile(
         path.join(repoDir, DEFAULT_CONTEXT_FILENAME),
-        'Repo content',
+        "Repo content",
       );
 
       // Trust repoDir twice.
-      const result = await loadEnvironmentMemory(
-        [repoDir, repoDir],
-        new SimpleExtensionLoader([]),
-      );
+      const result = await loadEnvironmentMemory([repoDir, repoDir], new SimpleExtensionLoader([]));
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(repoFile);
     });
 
-    it('should keep multiple memory files from the same directory adjacent and in order', async () => {
+    it("should keep multiple memory files from the same directory adjacent and in order", async () => {
       // Configure multiple memory filenames
-      setGeminiMdFilename(['PRIMARY.md', 'SECONDARY.md']);
+      setGeminiMdFilename(["PRIMARY.md", "SECONDARY.md"]);
 
-      const dir = await createEmptyDir(
-        path.join(testRootDir, 'multi_file_dir'),
-      );
-      await createEmptyDir(path.join(dir, '.git'));
+      const dir = await createEmptyDir(path.join(testRootDir, "multi_file_dir"));
+      await createEmptyDir(path.join(dir, ".git"));
 
-      const primaryFile = await createTestFile(
-        path.join(dir, 'PRIMARY.md'),
-        'Primary content',
-      );
+      const primaryFile = await createTestFile(path.join(dir, "PRIMARY.md"), "Primary content");
       const secondaryFile = await createTestFile(
-        path.join(dir, 'SECONDARY.md'),
-        'Secondary content',
+        path.join(dir, "SECONDARY.md"),
+        "Secondary content",
       );
 
-      const result = await loadEnvironmentMemory(
-        [dir],
-        new SimpleExtensionLoader([]),
-      );
+      const result = await loadEnvironmentMemory([dir], new SimpleExtensionLoader([]));
 
       expect(result.files).toHaveLength(2);
       // Verify order: PRIMARY should come before SECONDARY because they are
@@ -774,120 +720,97 @@ included directory memory
       // if in same dir.
       expect(result.files[0].path).toBe(primaryFile);
       expect(result.files[1].path).toBe(secondaryFile);
-      expect(result.files[0].content).toBe('Primary content');
-      expect(result.files[1].content).toBe('Secondary content');
+      expect(result.files[0].content).toBe("Primary content");
+      expect(result.files[1].content).toBe("Secondary content");
     });
   });
 
-  describe('loadJitSubdirectoryMemory', () => {
-    it('should load JIT memory when target is inside a trusted root', async () => {
-      const rootDir = await createEmptyDir(path.join(testRootDir, 'jit_root'));
-      const subDir = await createEmptyDir(path.join(rootDir, 'subdir'));
-      const targetFile = path.join(subDir, 'target.txt');
+  describe("loadJitSubdirectoryMemory", () => {
+    it("should load JIT memory when target is inside a trusted root", async () => {
+      const rootDir = await createEmptyDir(path.join(testRootDir, "jit_root"));
+      const subDir = await createEmptyDir(path.join(rootDir, "subdir"));
+      const targetFile = path.join(subDir, "target.txt");
 
       const subDirMemory = await createTestFile(
         path.join(subDir, DEFAULT_CONTEXT_FILENAME),
-        'Subdir JIT content',
+        "Subdir JIT content",
       );
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [rootDir],
-        new Set(),
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [rootDir], new Set());
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(subDirMemory);
-      expect(result.files[0].content).toBe('Subdir JIT content');
+      expect(result.files[0].content).toBe("Subdir JIT content");
     });
 
-    it('should skip JIT memory when target is outside trusted roots', async () => {
-      const trustedRoot = await createEmptyDir(
-        path.join(testRootDir, 'trusted'),
-      );
-      const untrustedDir = await createEmptyDir(
-        path.join(testRootDir, 'untrusted'),
-      );
-      const targetFile = path.join(untrustedDir, 'target.txt');
+    it("should skip JIT memory when target is outside trusted roots", async () => {
+      const trustedRoot = await createEmptyDir(path.join(testRootDir, "trusted"));
+      const untrustedDir = await createEmptyDir(path.join(testRootDir, "untrusted"));
+      const targetFile = path.join(untrustedDir, "target.txt");
 
-      await createTestFile(
-        path.join(untrustedDir, DEFAULT_CONTEXT_FILENAME),
-        'Untrusted content',
-      );
+      await createTestFile(path.join(untrustedDir, DEFAULT_CONTEXT_FILENAME), "Untrusted content");
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [trustedRoot],
-        new Set(),
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [trustedRoot], new Set());
 
       expect(result.files).toHaveLength(0);
     });
 
-    it('should skip already loaded paths', async () => {
-      const rootDir = await createEmptyDir(path.join(testRootDir, 'jit_root'));
-      const subDir = await createEmptyDir(path.join(rootDir, 'subdir'));
-      const targetFile = path.join(subDir, 'target.txt');
+    it("should skip already loaded paths", async () => {
+      const rootDir = await createEmptyDir(path.join(testRootDir, "jit_root"));
+      const subDir = await createEmptyDir(path.join(rootDir, "subdir"));
+      const targetFile = path.join(subDir, "target.txt");
 
       const rootMemory = await createTestFile(
         path.join(rootDir, DEFAULT_CONTEXT_FILENAME),
-        'Root content',
+        "Root content",
       );
       const subDirMemory = await createTestFile(
         path.join(subDir, DEFAULT_CONTEXT_FILENAME),
-        'Subdir content',
+        "Subdir content",
       );
 
       // Simulate root memory already loaded (e.g., by loadEnvironmentMemory)
       const alreadyLoaded = new Set([rootMemory]);
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [rootDir],
-        alreadyLoaded,
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [rootDir], alreadyLoaded);
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(subDirMemory);
-      expect(result.files[0].content).toBe('Subdir content');
+      expect(result.files[0].content).toBe("Subdir content");
     });
 
-    it('should use the deepest trusted root when multiple nested roots exist', async () => {
-      const outerRoot = await createEmptyDir(path.join(testRootDir, 'outer'));
-      const innerRoot = await createEmptyDir(path.join(outerRoot, 'inner'));
-      const targetFile = path.join(innerRoot, 'target.txt');
+    it("should use the deepest trusted root when multiple nested roots exist", async () => {
+      const outerRoot = await createEmptyDir(path.join(testRootDir, "outer"));
+      const innerRoot = await createEmptyDir(path.join(outerRoot, "inner"));
+      const targetFile = path.join(innerRoot, "target.txt");
 
       const outerMemory = await createTestFile(
         path.join(outerRoot, DEFAULT_CONTEXT_FILENAME),
-        'Outer content',
+        "Outer content",
       );
       const innerMemory = await createTestFile(
         path.join(innerRoot, DEFAULT_CONTEXT_FILENAME),
-        'Inner content',
+        "Inner content",
       );
 
-      const result = await loadJitSubdirectoryMemory(
-        targetFile,
-        [outerRoot, innerRoot],
-        new Set(),
-      );
+      const result = await loadJitSubdirectoryMemory(targetFile, [outerRoot, innerRoot], new Set());
 
       expect(result.files).toHaveLength(1);
       expect(result.files[0].path).toBe(innerMemory);
-      expect(result.files[0].content).toBe('Inner content');
+      expect(result.files[0].content).toBe("Inner content");
       // Ensure outer memory is NOT loaded
       expect(result.files.find((f) => f.path === outerMemory)).toBeUndefined();
     });
   });
 
-  it('refreshServerHierarchicalMemory should refresh memory and update config', async () => {
+  it("refreshServerHierarchicalMemory should refresh memory and update config", async () => {
     const extensionLoader = new SimpleExtensionLoader([]);
     const config = new Config({
-      sessionId: '1',
+      sessionId: "1",
       targetDir: cwd,
       cwd,
       debugMode: false,
-      model: 'fake-model',
+      model: "fake-model",
       extensionLoader,
     });
     const result = await loadServerHierarchicalMemory(
@@ -905,16 +828,16 @@ included directory memory
 
     // Now add an extension with a memory file
     const extensionsDir = new Storage(homedir).getExtensionsDir();
-    const extensionPath = path.join(extensionsDir, 'new-extension');
-    const contextFilePath = path.join(extensionPath, 'CustomContext.md');
+    const extensionPath = path.join(extensionsDir, "new-extension");
+    const contextFilePath = path.join(extensionPath, "CustomContext.md");
     await fsPromises.mkdir(extensionPath, { recursive: true });
-    await fsPromises.writeFile(contextFilePath, 'Really cool custom context!');
+    await fsPromises.writeFile(contextFilePath, "Really cool custom context!");
     await extensionLoader.loadExtension({
-      name: 'new-extension',
+      name: "new-extension",
       isActive: true,
       contextFiles: [contextFilePath],
-      version: '1.0.0',
-      id: '1234',
+      version: "1.0.0",
+      id: "1234",
       path: extensionPath,
     });
 
@@ -923,13 +846,9 @@ included directory memory
     const refreshResult = await refreshServerHierarchicalMemory(config);
     expect(refreshResult.fileCount).equals(1);
     expect(config.getGeminiMdFileCount()).equals(refreshResult.fileCount);
-    expect(refreshResult.memoryContent).toContain(
-      'Really cool custom context!',
-    );
+    expect(refreshResult.memoryContent).toContain("Really cool custom context!");
     expect(config.getUserMemory()).equals(refreshResult.memoryContent);
-    expect(refreshResult.filePaths[0]).toContain(
-      path.join(extensionPath, 'CustomContext.md'),
-    );
+    expect(refreshResult.filePaths[0]).toContain(path.join(extensionPath, "CustomContext.md"));
     expect(config.getGeminiMdFilePaths()).equals(refreshResult.filePaths);
     expect(mockEventListener).toHaveBeenCalledExactlyOnceWith(refreshResult);
   });
diff --git a/packages/gemini-core/src/utils/memoryDiscovery.ts b/packages/gemini-core/src/utils/memoryDiscovery.ts
index 6a74abc8a..32a7ac580 100644
--- a/packages/gemini-core/src/utils/memoryDiscovery.ts
+++ b/packages/gemini-core/src/utils/memoryDiscovery.ts
@@ -4,34 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as fsSync from 'node:fs';
-import * as path from 'node:path';
-import { homedir } from 'node:os';
-import { bfsFileSearch } from './bfsFileSearch.js';
-import { getAllGeminiMdFilenames } from '../tools/memoryTool.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
-import { processImports } from './memoryImportProcessor.js';
-import type { FileFilteringOptions } from '../config/constants.js';
-import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from '../config/constants.js';
-import { GEMINI_DIR } from './paths.js';
-import type { ExtensionLoader } from './extensionLoader.js';
-import { debugLogger } from './debugLogger.js';
-import type { Config } from '../config/config.js';
-import { CoreEvent, coreEvents } from './events.js';
+import * as fsSync from "node:fs";
+import * as fs from "node:fs/promises";
+import { homedir } from "node:os";
+import * as path from "node:path";
+import type { Config } from "../config/config.js";
+import type { FileFilteringOptions } from "../config/constants.js";
+import { DEFAULT_MEMORY_FILE_FILTERING_OPTIONS } from "../config/constants.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { getAllGeminiMdFilenames } from "../tools/memoryTool.js";
+import { bfsFileSearch } from "./bfsFileSearch.js";
+import { debugLogger } from "./debugLogger.js";
+import { CoreEvent, coreEvents } from "./events.js";
+import type { ExtensionLoader } from "./extensionLoader.js";
+import { processImports } from "./memoryImportProcessor.js";
+import { GEMINI_DIR } from "./paths.js";
 
 // Simple console logger, similar to the one previously in CLI's config.ts
 // TODO: Integrate with a more robust server-side logger if available/appropriate.
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) =>
-    debugLogger.debug('[DEBUG] [MemoryDiscovery]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [MemoryDiscovery]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  warn: (...args: any[]) =>
-    debugLogger.warn('[WARN] [MemoryDiscovery]', ...args),
+  warn: (...args: any[]) => debugLogger.warn("[WARN] [MemoryDiscovery]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: (...args: any[]) =>
-    console.error('[ERROR] [MemoryDiscovery]', ...args),
+  error: (...args: any[]) => console.error("[ERROR] [MemoryDiscovery]", ...args),
 };
 
 interface GeminiFileContent {
@@ -42,7 +39,7 @@ interface GeminiFileContent {
 async function findProjectRoot(startDir: string): Promise<string | null> {
   let currentDir = path.resolve(startDir);
   while (true) {
-    const gitPath = path.join(currentDir, '.git');
+    const gitPath = path.join(currentDir, ".git");
     try {
       const stats = await fs.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -52,22 +49,19 @@ async function findProjectRoot(startDir: string): Promise<string | null> {
       // Don't log ENOENT errors as they're expected when .git doesn't exist
       // Also don't log errors in test environments, which often have mocked fs
       const isENOENT =
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error !== null &&
-        'code' in error &&
-        (error as { code: string }).code === 'ENOENT';
+        "code" in error &&
+        (error as { code: string }).code === "ENOENT";
 
       // Only log unexpected errors in non-test environments
       // process.env['NODE_ENV'] === 'test' or VITEST are common test indicators
-      const isTestEnv =
-        process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
+      const isTestEnv = process.env["NODE_ENV"] === "test" || process.env["VITEST"];
 
       if (!isENOENT && !isTestEnv) {
-        if (typeof error === 'object' && error !== null && 'code' in error) {
+        if (typeof error === "object" && error !== null && "code" in error) {
           const fsError = error as { code: string; message: string };
-          logger.warn(
-            `Error checking for .git directory at ${gitPath}: ${fsError.message}`,
-          );
+          logger.warn(`Error checking for .git directory at ${gitPath}: ${fsError.message}`);
         } else {
           logger.warn(
             `Non-standard error checking for .git directory at ${gitPath}: ${String(error)}`,
@@ -93,10 +87,7 @@ async function getGeminiMdFilePathsInternal(
   fileFilteringOptions: FileFilteringOptions,
   maxDirs: number,
 ): Promise<string[]> {
-  const dirs = new Set<string>([
-    ...includeDirectoriesToReadGemini,
-    currentWorkingDirectory,
-  ]);
+  const dirs = new Set<string>([...includeDirectoriesToReadGemini, currentWorkingDirectory]);
 
   // Process directories in parallel with concurrency limit to prevent EMFILE errors
   const CONCURRENT_LIMIT = 10;
@@ -120,7 +111,7 @@ async function getGeminiMdFilePathsInternal(
     const batchResults = await Promise.allSettled(batchPromises);
 
     for (const result of batchResults) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         pathsArrays.push(result.value);
       } else {
         const error = result.reason;
@@ -149,20 +140,13 @@ async function getGeminiMdFilePathsInternalForEachDir(
 
   for (const geminiMdFilename of geminiMdFilenames) {
     const resolvedHome = path.resolve(userHomePath);
-    const globalMemoryPath = path.join(
-      resolvedHome,
-      GEMINI_DIR,
-      geminiMdFilename,
-    );
+    const globalMemoryPath = path.join(resolvedHome, GEMINI_DIR, geminiMdFilename);
 
     // This part that finds the global file always runs.
     try {
       await fs.access(globalMemoryPath, fsSync.constants.R_OK);
       allPaths.add(globalMemoryPath);
-      if (debugMode)
-        logger.debug(
-          `Found readable global ${geminiMdFilename}: ${globalMemoryPath}`,
-        );
+      if (debugMode) logger.debug(`Found readable global ${geminiMdFilename}: ${globalMemoryPath}`);
     } catch {
       // It's okay if it's not found.
     }
@@ -172,19 +156,14 @@ async function getGeminiMdFilePathsInternalForEachDir(
     if (dir && folderTrust) {
       const resolvedCwd = path.resolve(dir);
       if (debugMode)
-        logger.debug(
-          `Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`,
-        );
+        logger.debug(`Searching for ${geminiMdFilename} starting from CWD: ${resolvedCwd}`);
 
       const projectRoot = await findProjectRoot(resolvedCwd);
-      if (debugMode)
-        logger.debug(`Determined project root: ${projectRoot ?? 'None'}`);
+      if (debugMode) logger.debug(`Determined project root: ${projectRoot ?? "None"}`);
 
       const upwardPaths: string[] = [];
       let currentDir = resolvedCwd;
-      const ultimateStopDir = projectRoot
-        ? path.dirname(projectRoot)
-        : path.dirname(resolvedHome);
+      const ultimateStopDir = projectRoot ? path.dirname(projectRoot) : path.dirname(resolvedHome);
 
       while (currentDir && currentDir !== path.dirname(currentDir)) {
         if (currentDir === path.join(resolvedHome, GEMINI_DIR)) {
@@ -232,9 +211,7 @@ async function getGeminiMdFilePathsInternalForEachDir(
 
   if (debugMode)
     logger.debug(
-      `Final ordered ${getAllGeminiMdFilenames()} paths to read: ${JSON.stringify(
-        finalPaths,
-      )}`,
+      `Final ordered ${getAllGeminiMdFilenames()} paths to read: ${JSON.stringify(finalPaths)}`,
     );
   return finalPaths;
 }
@@ -242,7 +219,7 @@ async function getGeminiMdFilePathsInternalForEachDir(
 async function readGeminiMdFiles(
   filePaths: string[],
   debugMode: boolean,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
 ): Promise<GeminiFileContent[]> {
   // Process files in parallel with concurrency limit to prevent EMFILE errors
   const CONCURRENT_LIMIT = 20; // Higher limit for file reads as they're typically faster
@@ -250,46 +227,42 @@ async function readGeminiMdFiles(
 
   for (let i = 0; i < filePaths.length; i += CONCURRENT_LIMIT) {
     const batch = filePaths.slice(i, i + CONCURRENT_LIMIT);
-    const batchPromises = batch.map(
-      async (filePath): Promise<GeminiFileContent> => {
-        try {
-          const content = await fs.readFile(filePath, 'utf-8');
-
-          // Process imports in the content
-          const processedResult = await processImports(
-            content,
-            path.dirname(filePath),
-            debugMode,
-            undefined,
-            undefined,
-            importFormat,
+    const batchPromises = batch.map(async (filePath): Promise<GeminiFileContent> => {
+      try {
+        const content = await fs.readFile(filePath, "utf-8");
+
+        // Process imports in the content
+        const processedResult = await processImports(
+          content,
+          path.dirname(filePath),
+          debugMode,
+          undefined,
+          undefined,
+          importFormat,
+        );
+        if (debugMode)
+          logger.debug(
+            `Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`,
+          );
+
+        return { filePath, content: processedResult.content };
+      } catch (error: unknown) {
+        const isTestEnv = process.env["NODE_ENV"] === "test" || process.env["VITEST"];
+        if (!isTestEnv) {
+          const message = error instanceof Error ? error.message : String(error);
+          logger.warn(
+            `Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`,
           );
-          if (debugMode)
-            logger.debug(
-              `Successfully read and processed imports: ${filePath} (Length: ${processedResult.content.length})`,
-            );
-
-          return { filePath, content: processedResult.content };
-        } catch (error: unknown) {
-          const isTestEnv =
-            process.env['NODE_ENV'] === 'test' || process.env['VITEST'];
-          if (!isTestEnv) {
-            const message =
-              error instanceof Error ? error.message : String(error);
-            logger.warn(
-              `Warning: Could not read ${getAllGeminiMdFilenames()} file at ${filePath}. Error: ${message}`,
-            );
-          }
-          if (debugMode) logger.debug(`Failed to read: ${filePath}`);
-          return { filePath, content: null }; // Still include it with null content
         }
-      },
-    );
+        if (debugMode) logger.debug(`Failed to read: ${filePath}`);
+        return { filePath, content: null }; // Still include it with null content
+      }
+    });
 
     const batchResults = await Promise.allSettled(batchPromises);
 
     for (const result of batchResults) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         results.push(result.value);
       } else {
         // This case shouldn't happen since we catch all errors above,
@@ -310,7 +283,7 @@ function concatenateInstructions(
   currentWorkingDirectoryForDisplay: string,
 ): string {
   return instructionContents
-    .filter((item) => typeof item.content === 'string')
+    .filter((item) => typeof item.content === "string")
     .map((item) => {
       const trimmedContent = (item.content as string).trim();
       if (trimmedContent.length === 0) {
@@ -322,16 +295,14 @@ function concatenateInstructions(
       return `--- Context from: ${displayPath} ---\n${trimmedContent}\n--- End of Context from: ${displayPath} ---`;
     })
     .filter((block): block is string => block !== null)
-    .join('\n\n');
+    .join("\n\n");
 }
 
 export interface MemoryLoadResult {
   files: Array<{ path: string; content: string }>;
 }
 
-export async function loadGlobalMemory(
-  debugMode: boolean = false,
-): Promise<MemoryLoadResult> {
+export async function loadGlobalMemory(debugMode: boolean = false): Promise<MemoryLoadResult> {
   const userHome = homedir();
   const geminiMdFilenames = getAllGeminiMdFilenames();
 
@@ -344,16 +315,14 @@ export async function loadGlobalMemory(
       }
       return globalPath;
     } catch {
-      debugLogger.debug('A global memory file was not found.');
+      debugLogger.debug("A global memory file was not found.");
       return null;
     }
   });
 
-  const foundPaths = (await Promise.all(accessChecks)).filter(
-    (p): p is string => p !== null,
-  );
+  const foundPaths = (await Promise.all(accessChecks)).filter((p): p is string => p !== null);
 
-  const contents = await readGeminiMdFiles(foundPaths, debugMode, 'tree');
+  const contents = await readGeminiMdFiles(foundPaths, debugMode, "tree");
 
   return {
     files: contents
@@ -383,9 +352,7 @@ async function findUpwardGeminiFiles(
   const globalGeminiDir = path.join(homedir(), GEMINI_DIR);
 
   if (debugMode) {
-    logger.debug(
-      `Starting upward search from ${currentDir} stopping at ${resolvedStopDir}`,
-    );
+    logger.debug(`Starting upward search from ${currentDir} stopping at ${resolvedStopDir}`);
   }
 
   while (true) {
@@ -410,10 +377,7 @@ async function findUpwardGeminiFiles(
 
     upwardPaths.unshift(...foundPathsInDir);
 
-    if (
-      currentDir === resolvedStopDir ||
-      currentDir === path.dirname(currentDir)
-    ) {
+    if (currentDir === resolvedStopDir || currentDir === path.dirname(currentDir)) {
       break;
     }
     currentDir = path.dirname(currentDir);
@@ -450,7 +414,7 @@ export async function loadEnvironmentMemory(
   extensionPaths.forEach((p) => allPaths.add(p));
 
   const sortedPaths = Array.from(allPaths).sort();
-  const contents = await readGeminiMdFiles(sortedPaths, debugMode, 'tree');
+  const contents = await readGeminiMdFiles(sortedPaths, debugMode, "tree");
 
   return {
     files: contents
@@ -479,7 +443,7 @@ export async function loadServerHierarchicalMemory(
   fileService: FileDiscoveryService,
   extensionLoader: ExtensionLoader,
   folderTrust: boolean,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
   fileFilteringOptions?: FileFilteringOptions,
   maxDirs: number = 200,
 ): Promise<LoadServerHierarchicalMemoryResponse> {
@@ -490,7 +454,7 @@ export async function loadServerHierarchicalMemory(
 
   // If it is the home directory, pass an empty string to the core memory
   // function to signal that it should skip the workspace search.
-  currentWorkingDirectory = isHomeDirectory ? '' : currentWorkingDirectory;
+  currentWorkingDirectory = isHomeDirectory ? "" : currentWorkingDirectory;
 
   if (debugMode)
     logger.debug(
@@ -520,28 +484,15 @@ export async function loadServerHierarchicalMemory(
   );
 
   if (filePaths.length === 0) {
-    if (debugMode)
-      logger.debug('No GEMINI.md files found in hierarchy of the workspace.');
-    return { memoryContent: '', fileCount: 0, filePaths: [] };
+    if (debugMode) logger.debug("No GEMINI.md files found in hierarchy of the workspace.");
+    return { memoryContent: "", fileCount: 0, filePaths: [] };
   }
-  const contentsWithPaths = await readGeminiMdFiles(
-    filePaths,
-    debugMode,
-    importFormat,
-  );
+  const contentsWithPaths = await readGeminiMdFiles(filePaths, debugMode, importFormat);
   // Pass CWD for relative path display in concatenated content
-  const combinedInstructions = concatenateInstructions(
-    contentsWithPaths,
-    currentWorkingDirectory,
-  );
-  if (debugMode)
-    logger.debug(
-      `Combined instructions length: ${combinedInstructions.length}`,
-    );
+  const combinedInstructions = concatenateInstructions(contentsWithPaths, currentWorkingDirectory);
+  if (debugMode) logger.debug(`Combined instructions length: ${combinedInstructions.length}`);
   if (debugMode && combinedInstructions.length > 0)
-    logger.debug(
-      `Combined instructions (snippet): ${combinedInstructions.substring(0, 500)}...`,
-    );
+    logger.debug(`Combined instructions (snippet): ${combinedInstructions.substring(0, 500)}...`);
   return {
     memoryContent: combinedInstructions,
     fileCount: contentsWithPaths.length,
@@ -598,25 +549,17 @@ export async function loadJitSubdirectoryMemory(
 
   if (!bestRoot) {
     if (debugMode) {
-      logger.debug(
-        `JIT memory skipped: ${resolvedTarget} is not in any trusted root.`,
-      );
+      logger.debug(`JIT memory skipped: ${resolvedTarget} is not in any trusted root.`);
     }
     return { files: [] };
   }
 
   if (debugMode) {
-    logger.debug(
-      `Loading JIT memory for ${resolvedTarget} (Trusted root: ${bestRoot})`,
-    );
+    logger.debug(`Loading JIT memory for ${resolvedTarget} (Trusted root: ${bestRoot})`);
   }
 
   // Traverse from target up to the trusted root
-  const potentialPaths = await findUpwardGeminiFiles(
-    resolvedTarget,
-    bestRoot,
-    debugMode,
-  );
+  const potentialPaths = await findUpwardGeminiFiles(resolvedTarget, bestRoot, debugMode);
 
   // Filter out already loaded paths
   const newPaths = potentialPaths.filter((p) => !alreadyLoadedPaths.has(p));
@@ -629,7 +572,7 @@ export async function loadJitSubdirectoryMemory(
     logger.debug(`Found new JIT memory files: ${JSON.stringify(newPaths)}`);
   }
 
-  const contents = await readGeminiMdFiles(newPaths, debugMode, 'tree');
+  const contents = await readGeminiMdFiles(newPaths, debugMode, "tree");
 
   return {
     files: contents
diff --git a/packages/gemini-core/src/utils/memoryImportProcessor.test.ts b/packages/gemini-core/src/utils/memoryImportProcessor.test.ts
index 0fcaf080d..60ad7c7c4 100644
--- a/packages/gemini-core/src/utils/memoryImportProcessor.test.ts
+++ b/packages/gemini-core/src/utils/memoryImportProcessor.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { marked } from 'marked';
-import { processImports, validateImportPath } from './memoryImportProcessor.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { marked } from "marked";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { processImports, validateImportPath } from "./memoryImportProcessor.js";
 
 // Helper function to create platform-agnostic test paths
 function testPath(...segments: string[]): string {
@@ -17,9 +17,9 @@ function testPath(...segments: string[]): string {
 
   // Join remaining segments with the platform-specific separator
   for (let i = 1; i < segments.length; i++) {
-    if (segments[i].startsWith('/') || segments[i].startsWith('\\')) {
+    if (segments[i].startsWith("/") || segments[i].startsWith("\\")) {
       // If segment starts with a separator, remove the trailing separator from the result
-      result = path.normalize(result.replace(/[\\/]+$/, '') + segments[i]);
+      result = path.normalize(result.replace(/[\\/]+$/, "") + segments[i]);
     } else {
       // Otherwise join with the platform separator
       result = path.join(result, segments[i]);
@@ -29,7 +29,7 @@ function testPath(...segments: string[]): string {
   return path.normalize(result);
 }
 
-vi.mock('fs/promises');
+vi.mock("fs/promises");
 const mockedFs = vi.mocked(fs);
 
 // Mock console methods to capture warnings
@@ -47,7 +47,7 @@ const findMarkdownComments = (content: string): string[] => {
   function walkTokens(tokenList: unknown[]) {
     for (const token of tokenList) {
       const t = token as { type: string; raw: string; tokens?: unknown[] };
-      if (t.type === 'html' && t.raw.includes('<!--')) {
+      if (t.type === "html" && t.raw.includes("<!--")) {
         comments.push(t.raw.trim());
       }
       if (t.tokens) {
@@ -60,23 +60,21 @@ const findMarkdownComments = (content: string): string[] => {
   return comments;
 };
 
-const findCodeBlocks = (
-  content: string,
-): Array<{ type: string; content: string }> => {
+const findCodeBlocks = (content: string): Array<{ type: string; content: string }> => {
   const tokens = parseMarkdown(content);
   const codeBlocks: Array<{ type: string; content: string }> = [];
 
   function walkTokens(tokenList: unknown[]) {
     for (const token of tokenList) {
       const t = token as { type: string; text: string; tokens?: unknown[] };
-      if (t.type === 'code') {
+      if (t.type === "code") {
         codeBlocks.push({
-          type: 'code_block',
+          type: "code_block",
           content: t.text,
         });
-      } else if (t.type === 'codespan') {
+      } else if (t.type === "codespan") {
         codeBlocks.push({
-          type: 'inline_code',
+          type: "inline_code",
           content: t.text,
         });
       }
@@ -90,7 +88,7 @@ const findCodeBlocks = (
   return codeBlocks;
 };
 
-describe('memoryImportProcessor', () => {
+describe("memoryImportProcessor", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     // Mock console methods
@@ -106,11 +104,11 @@ describe('memoryImportProcessor', () => {
     console.debug = originalConsoleDebug;
   });
 
-  describe('processImports', () => {
-    it('should process basic md file imports', async () => {
-      const content = 'Some content @./test.md more content';
-      const basePath = testPath('test', 'path');
-      const importedContent = '# Imported Content\nThis is imported.';
+  describe("processImports", () => {
+    it("should process basic md file imports", async () => {
+      const content = "Some content @./test.md more content";
+      const basePath = testPath("test", "path");
+      const importedContent = "# Imported Content\nThis is imported.";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(importedContent);
@@ -119,12 +117,8 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find HTML comments (import markers)
       const comments = findMarkdownComments(result.content);
-      expect(comments.some((c) => c.includes('Imported from: ./test.md'))).toBe(
-        true,
-      );
-      expect(
-        comments.some((c) => c.includes('End of import from: ./test.md')),
-      ).toBe(true);
+      expect(comments.some((c) => c.includes("Imported from: ./test.md"))).toBe(true);
+      expect(comments.some((c) => c.includes("End of import from: ./test.md"))).toBe(true);
 
       // Verify the imported content is present
       expect(result.content).toContain(importedContent);
@@ -134,17 +128,13 @@ describe('memoryImportProcessor', () => {
       expect(tokens).toBeDefined();
       expect(tokens.length).toBeGreaterThan(0);
 
-      expect(mockedFs.readFile).toHaveBeenCalledWith(
-        path.resolve(basePath, './test.md'),
-        'utf-8',
-      );
+      expect(mockedFs.readFile).toHaveBeenCalledWith(path.resolve(basePath, "./test.md"), "utf-8");
     });
 
-    it('should import non-md files just like md files', async () => {
-      const content = 'Some content @./instructions.txt more content';
-      const basePath = testPath('test', 'path');
-      const importedContent =
-        '# Instructions\nThis is a text file with markdown.';
+    it("should import non-md files just like md files", async () => {
+      const content = "Some content @./instructions.txt more content";
+      const basePath = testPath("test", "path");
+      const importedContent = "# Instructions\nThis is a text file with markdown.";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(importedContent);
@@ -153,37 +143,29 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find import comments
       const comments = findMarkdownComments(result.content);
-      expect(
-        comments.some((c) => c.includes('Imported from: ./instructions.txt')),
-      ).toBe(true);
-      expect(
-        comments.some((c) =>
-          c.includes('End of import from: ./instructions.txt'),
-        ),
-      ).toBe(true);
+      expect(comments.some((c) => c.includes("Imported from: ./instructions.txt"))).toBe(true);
+      expect(comments.some((c) => c.includes("End of import from: ./instructions.txt"))).toBe(true);
 
       // Use marked to parse and validate the imported content structure
       const tokens = parseMarkdown(result.content);
 
       // Find headers in the parsed content
-      const headers = tokens.filter((token) => token.type === 'heading');
-      expect(
-        headers.some((h) => (h as { text: string }).text === 'Instructions'),
-      ).toBe(true);
+      const headers = tokens.filter((token) => token.type === "heading");
+      expect(headers.some((h) => (h as { text: string }).text === "Instructions")).toBe(true);
 
       // Verify the imported content is present
       expect(result.content).toContain(importedContent);
       expect(console.warn).not.toHaveBeenCalled();
       expect(mockedFs.readFile).toHaveBeenCalledWith(
-        path.resolve(basePath, './instructions.txt'),
-        'utf-8',
+        path.resolve(basePath, "./instructions.txt"),
+        "utf-8",
       );
     });
 
-    it('should handle circular imports', async () => {
-      const content = 'Content @./circular.md more content';
-      const basePath = testPath('test', 'path');
-      const circularContent = 'Circular @./main.md content';
+    it("should handle circular imports", async () => {
+      const content = "Content @./circular.md more content";
+      const basePath = testPath("test", "path");
+      const circularContent = "Circular @./main.md content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(circularContent);
@@ -193,38 +175,34 @@ describe('memoryImportProcessor', () => {
         processedFiles: new Set<string>(),
         maxDepth: 10,
         currentDepth: 0,
-        currentFile: testPath('test', 'path', 'main.md'), // Simulate we're processing main.md
+        currentFile: testPath("test", "path", "main.md"), // Simulate we're processing main.md
       };
 
       const result = await processImports(content, basePath, true, importState);
 
       // The circular import should be detected when processing the nested import
-      expect(result.content).toContain(
-        '<!-- File already processed: ./main.md -->',
-      );
+      expect(result.content).toContain("<!-- File already processed: ./main.md -->");
     });
 
-    it('should handle file not found errors', async () => {
-      const content = 'Content @./nonexistent.md more content';
-      const basePath = testPath('test', 'path');
+    it("should handle file not found errors", async () => {
+      const content = "Content @./nonexistent.md more content";
+      const basePath = testPath("test", "path");
 
-      mockedFs.access.mockRejectedValue(new Error('File not found'));
+      mockedFs.access.mockRejectedValue(new Error("File not found"));
 
       const result = await processImports(content, basePath, true);
 
-      expect(result.content).toContain(
-        '<!-- Import failed: ./nonexistent.md - File not found -->',
-      );
+      expect(result.content).toContain("<!-- Import failed: ./nonexistent.md - File not found -->");
       expect(console.error).toHaveBeenCalledWith(
-        '[ERROR] [ImportProcessor]',
-        'Failed to import ./nonexistent.md: File not found',
+        "[ERROR] [ImportProcessor]",
+        "Failed to import ./nonexistent.md: File not found",
       );
     });
 
-    it('should respect max depth limit', async () => {
-      const content = 'Content @./deep.md more content';
-      const basePath = testPath('test', 'path');
-      const deepContent = 'Deep @./deeper.md content';
+    it("should respect max depth limit", async () => {
+      const content = "Content @./deep.md more content";
+      const basePath = testPath("test", "path");
+      const deepContent = "Deep @./deeper.md content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(deepContent);
@@ -238,34 +216,32 @@ describe('memoryImportProcessor', () => {
       const result = await processImports(content, basePath, true, importState);
 
       expect(console.warn).toHaveBeenCalledWith(
-        '[WARN] [ImportProcessor]',
-        'Maximum import depth (1) reached. Stopping import processing.',
+        "[WARN] [ImportProcessor]",
+        "Maximum import depth (1) reached. Stopping import processing.",
       );
       expect(result.content).toBe(content);
     });
 
-    it('should handle nested imports recursively', async () => {
-      const content = 'Main @./nested.md content';
-      const basePath = testPath('test', 'path');
-      const nestedContent = 'Nested @./inner.md content';
-      const innerContent = 'Inner content';
+    it("should handle nested imports recursively", async () => {
+      const content = "Main @./nested.md content";
+      const basePath = testPath("test", "path");
+      const nestedContent = "Nested @./inner.md content";
+      const innerContent = "Inner content";
 
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(nestedContent)
-        .mockResolvedValueOnce(innerContent);
+      mockedFs.readFile.mockResolvedValueOnce(nestedContent).mockResolvedValueOnce(innerContent);
 
       const result = await processImports(content, basePath, true);
 
-      expect(result.content).toContain('<!-- Imported from: ./nested.md -->');
-      expect(result.content).toContain('<!-- Imported from: ./inner.md -->');
+      expect(result.content).toContain("<!-- Imported from: ./nested.md -->");
+      expect(result.content).toContain("<!-- Imported from: ./inner.md -->");
       expect(result.content).toContain(innerContent);
     });
 
-    it('should handle absolute paths in imports', async () => {
-      const content = 'Content @/absolute/path/file.md more content';
-      const basePath = testPath('test', 'path');
-      const importedContent = 'Absolute path content';
+    it("should handle absolute paths in imports", async () => {
+      const content = "Content @/absolute/path/file.md more content";
+      const basePath = testPath("test", "path");
+      const importedContent = "Absolute path content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile.mockResolvedValue(importedContent);
@@ -273,53 +249,45 @@ describe('memoryImportProcessor', () => {
       const result = await processImports(content, basePath, true);
 
       expect(result.content).toContain(
-        '<!-- Import failed: /absolute/path/file.md - Path traversal attempt -->',
+        "<!-- Import failed: /absolute/path/file.md - Path traversal attempt -->",
       );
     });
 
-    it('should handle multiple imports in same content', async () => {
-      const content = 'Start @./first.md middle @./second.md end';
-      const basePath = testPath('test', 'path');
-      const firstContent = 'First content';
-      const secondContent = 'Second content';
+    it("should handle multiple imports in same content", async () => {
+      const content = "Start @./first.md middle @./second.md end";
+      const basePath = testPath("test", "path");
+      const firstContent = "First content";
+      const secondContent = "Second content";
 
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(firstContent)
-        .mockResolvedValueOnce(secondContent);
+      mockedFs.readFile.mockResolvedValueOnce(firstContent).mockResolvedValueOnce(secondContent);
 
       const result = await processImports(content, basePath, true);
 
-      expect(result.content).toContain('<!-- Imported from: ./first.md -->');
-      expect(result.content).toContain('<!-- Imported from: ./second.md -->');
+      expect(result.content).toContain("<!-- Imported from: ./first.md -->");
+      expect(result.content).toContain("<!-- Imported from: ./second.md -->");
       expect(result.content).toContain(firstContent);
       expect(result.content).toContain(secondContent);
     });
 
-    it('should ignore imports inside code blocks', async () => {
+    it("should ignore imports inside code blocks", async () => {
       const content = [
-        'Normal content @./should-import.md',
-        '```',
-        'code block with @./should-not-import.md',
-        '```',
-        'More content @./should-import2.md',
-      ].join('\n');
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedContent1 = 'Imported 1';
-      const importedContent2 = 'Imported 2';
+        "Normal content @./should-import.md",
+        "```",
+        "code block with @./should-not-import.md",
+        "```",
+        "More content @./should-import2.md",
+      ].join("\n");
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedContent1 = "Imported 1";
+      const importedContent2 = "Imported 2";
       // Only the imports outside code blocks should be processed
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
         .mockResolvedValueOnce(importedContent1)
         .mockResolvedValueOnce(importedContent2);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       // Use marked to verify imported content is present
       expect(result.content).toContain(importedContent1);
@@ -328,38 +296,30 @@ describe('memoryImportProcessor', () => {
       // Use marked to find code blocks and verify the import wasn't processed
       const codeBlocks = findCodeBlocks(result.content);
       const hasUnprocessedImport = codeBlocks.some((block) =>
-        block.content.includes('@./should-not-import.md'),
+        block.content.includes("@./should-not-import.md"),
       );
       expect(hasUnprocessedImport).toBe(true);
 
       // Verify no import comment was created for the code block import
       const comments = findMarkdownComments(result.content);
-      expect(comments.some((c) => c.includes('should-not-import.md'))).toBe(
-        false,
-      );
+      expect(comments.some((c) => c.includes("should-not-import.md"))).toBe(false);
     });
 
-    it('should ignore imports inside inline code', async () => {
+    it("should ignore imports inside inline code", async () => {
       const content = [
-        'Normal content @./should-import.md',
-        '`code with import @./should-not-import.md`',
-        'More content @./should-import2.md',
-      ].join('\n');
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedContent1 = 'Imported 1';
-      const importedContent2 = 'Imported 2';
+        "Normal content @./should-import.md",
+        "`code with import @./should-not-import.md`",
+        "More content @./should-import2.md",
+      ].join("\n");
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedContent1 = "Imported 1";
+      const importedContent2 = "Imported 2";
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
         .mockResolvedValueOnce(importedContent1)
         .mockResolvedValueOnce(importedContent2);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       // Verify imported content is present
       expect(result.content).toContain(importedContent1);
@@ -367,132 +327,96 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find inline code spans
       const codeBlocks = findCodeBlocks(result.content);
-      const inlineCodeSpans = codeBlocks.filter(
-        (block) => block.type === 'inline_code',
-      );
+      const inlineCodeSpans = codeBlocks.filter((block) => block.type === "inline_code");
 
       // Verify the inline code span still contains the unprocessed import
-      expect(
-        inlineCodeSpans.some((span) =>
-          span.content.includes('@./should-not-import.md'),
-        ),
-      ).toBe(true);
+      expect(inlineCodeSpans.some((span) => span.content.includes("@./should-not-import.md"))).toBe(
+        true,
+      );
 
       // Verify no import comments were created for inline code imports
       const comments = findMarkdownComments(result.content);
-      expect(comments.some((c) => c.includes('should-not-import.md'))).toBe(
-        false,
-      );
+      expect(comments.some((c) => c.includes("should-not-import.md"))).toBe(false);
     });
 
-    it('should handle nested tokens and non-unique content correctly', async () => {
+    it("should handle nested tokens and non-unique content correctly", async () => {
       // This test verifies the robust findCodeRegions implementation
       // that recursively walks the token tree and handles non-unique content
       const content = [
-        'Normal content @./should-import.md',
-        'Paragraph with `inline code @./should-not-import.md` and more text.',
-        'Another paragraph with the same `inline code @./should-not-import.md` text.',
-        'More content @./should-import2.md',
-      ].join('\n');
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedContent1 = 'Imported 1';
-      const importedContent2 = 'Imported 2';
+        "Normal content @./should-import.md",
+        "Paragraph with `inline code @./should-not-import.md` and more text.",
+        "Another paragraph with the same `inline code @./should-not-import.md` text.",
+        "More content @./should-import2.md",
+      ].join("\n");
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedContent1 = "Imported 1";
+      const importedContent2 = "Imported 2";
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
         .mockResolvedValueOnce(importedContent1)
         .mockResolvedValueOnce(importedContent2);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       // Should process imports outside code regions
       expect(result.content).toContain(importedContent1);
       expect(result.content).toContain(importedContent2);
 
       // Should preserve imports inside inline code (both occurrences)
-      expect(result.content).toContain('`inline code @./should-not-import.md`');
+      expect(result.content).toContain("`inline code @./should-not-import.md`");
 
       // Should not have processed the imports inside code regions
-      expect(result.content).not.toContain(
-        '<!-- Imported from: ./should-not-import.md -->',
-      );
+      expect(result.content).not.toContain("<!-- Imported from: ./should-not-import.md -->");
     });
 
-    it('should not process imports in repeated inline code blocks', async () => {
-      const content = '`@noimport` and `@noimport`';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
+    it("should not process imports in repeated inline code blocks", async () => {
+      const content = "`@noimport` and `@noimport`";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
 
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
 
       expect(result.content).toBe(content);
     });
 
-    it('should not import when @ is inside an inline code block', async () => {
-      const content =
-        'We should not ` @import` when the symbol is inside an inline code string.';
-      const testRootDir = testPath('test', 'project');
+    it("should not import when @ is inside an inline code block", async () => {
+      const content = "We should not ` @import` when the symbol is inside an inline code string.";
+      const testRootDir = testPath("test", "project");
       const result = await processImports(content, testRootDir);
       expect(result.content).toBe(content);
       expect(result.importTree.imports).toBeUndefined();
     });
 
-    it('should allow imports from parent and subdirectories within project root', async () => {
-      const content =
-        'Parent import: @../parent.md Subdir import: @./components/sub.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const importedParent = 'Parent file content';
-      const importedSub = 'Subdir file content';
+    it("should allow imports from parent and subdirectories within project root", async () => {
+      const content = "Parent import: @../parent.md Subdir import: @./components/sub.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const importedParent = "Parent file content";
+      const importedSub = "Subdir file content";
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(importedParent)
-        .mockResolvedValueOnce(importedSub);
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+      mockedFs.readFile.mockResolvedValueOnce(importedParent).mockResolvedValueOnce(importedSub);
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
       expect(result.content).toContain(importedParent);
       expect(result.content).toContain(importedSub);
     });
 
-    it('should reject imports outside project root', async () => {
-      const content = 'Outside import: @../../../etc/passwd';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-      );
+    it("should reject imports outside project root", async () => {
+      const content = "Outside import: @../../../etc/passwd";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const result = await processImports(content, basePath, true, undefined, projectRoot);
       expect(result.content).toContain(
-        '<!-- Import failed: ../../../etc/passwd - Path traversal attempt -->',
+        "<!-- Import failed: ../../../etc/passwd - Path traversal attempt -->",
       );
     });
 
-    it('should build import tree structure', async () => {
-      const content = 'Main content @./nested.md @./simple.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const nestedContent = 'Nested @./inner.md content';
-      const simpleContent = 'Simple content';
-      const innerContent = 'Inner content';
+    it("should build import tree structure", async () => {
+      const content = "Main content @./nested.md @./simple.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const nestedContent = "Nested @./inner.md content";
+      const simpleContent = "Simple content";
+      const innerContent = "Inner content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
@@ -504,13 +428,11 @@ describe('memoryImportProcessor', () => {
 
       // Use marked to find and validate import comments
       const comments = findMarkdownComments(result.content);
-      const importComments = comments.filter((c) =>
-        c.includes('Imported from:'),
-      );
+      const importComments = comments.filter((c) => c.includes("Imported from:"));
 
-      expect(importComments.some((c) => c.includes('./nested.md'))).toBe(true);
-      expect(importComments.some((c) => c.includes('./simple.md'))).toBe(true);
-      expect(importComments.some((c) => c.includes('./inner.md'))).toBe(true);
+      expect(importComments.some((c) => c.includes("./nested.md"))).toBe(true);
+      expect(importComments.some((c) => c.includes("./simple.md"))).toBe(true);
+      expect(importComments.some((c) => c.includes("./inner.md"))).toBe(true);
 
       // Use marked to validate the markdown structure is well-formed
       const tokens = parseMarkdown(result.content);
@@ -519,45 +441,43 @@ describe('memoryImportProcessor', () => {
 
       // Verify the content contains expected text using marked parsing
       const textContent = tokens
-        .filter((token) => token.type === 'paragraph')
+        .filter((token) => token.type === "paragraph")
         .map((token) => token.raw)
-        .join(' ');
+        .join(" ");
 
-      expect(textContent).toContain('Main content');
-      expect(textContent).toContain('Nested');
-      expect(textContent).toContain('Simple content');
-      expect(textContent).toContain('Inner content');
+      expect(textContent).toContain("Main content");
+      expect(textContent).toContain("Nested");
+      expect(textContent).toContain("Simple content");
+      expect(textContent).toContain("Inner content");
 
       // Verify import tree structure
-      expect(result.importTree.path).toBe('unknown'); // No currentFile set in test
+      expect(result.importTree.path).toBe("unknown"); // No currentFile set in test
       expect(result.importTree.imports).toHaveLength(2);
 
       // First import: nested.md
       // Check that the paths match using includes to handle potential absolute/relative differences
-      const expectedNestedPath = testPath(projectRoot, 'src', 'nested.md');
+      const expectedNestedPath = testPath(projectRoot, "src", "nested.md");
 
       expect(result.importTree.imports![0].path).toContain(expectedNestedPath);
       expect(result.importTree.imports![0].imports).toHaveLength(1);
 
-      const expectedInnerPath = testPath(projectRoot, 'src', 'inner.md');
-      expect(result.importTree.imports![0].imports![0].path).toContain(
-        expectedInnerPath,
-      );
+      const expectedInnerPath = testPath(projectRoot, "src", "inner.md");
+      expect(result.importTree.imports![0].imports![0].path).toContain(expectedInnerPath);
       expect(result.importTree.imports![0].imports![0].imports).toBeUndefined();
 
       // Second import: simple.md
-      const expectedSimplePath = testPath(projectRoot, 'src', 'simple.md');
+      const expectedSimplePath = testPath(projectRoot, "src", "simple.md");
       expect(result.importTree.imports![1].path).toContain(expectedSimplePath);
       expect(result.importTree.imports![1].imports).toBeUndefined();
     });
 
-    it('should produce flat output in Claude-style with unique files in order', async () => {
-      const content = 'Main @./nested.md content @./simple.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const nestedContent = 'Nested @./inner.md content';
-      const simpleContent = 'Simple content';
-      const innerContent = 'Inner content';
+    it("should produce flat output in Claude-style with unique files in order", async () => {
+      const content = "Main @./nested.md content @./simple.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const nestedContent = "Nested @./inner.md content";
+      const simpleContent = "Simple content";
+      const innerContent = "Inner content";
 
       mockedFs.access.mockResolvedValue(undefined);
       mockedFs.readFile
@@ -565,14 +485,7 @@ describe('memoryImportProcessor', () => {
         .mockResolvedValueOnce(simpleContent)
         .mockResolvedValueOnce(innerContent);
 
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-        'flat',
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot, "flat");
 
       // Use marked to parse the output and validate structure
       const tokens = parseMarkdown(result.content);
@@ -585,14 +498,14 @@ describe('memoryImportProcessor', () => {
       function walkTokens(tokenList: unknown[]) {
         for (const token of tokenList) {
           const t = token as { type: string; raw: string; tokens?: unknown[] };
-          if (t.type === 'paragraph' && t.raw.includes('--- File:')) {
+          if (t.type === "paragraph" && t.raw.includes("--- File:")) {
             const match = t.raw.match(/--- File: (.+?) ---/);
             if (match) {
               // Normalize the path before adding to fileMarkers
               fileMarkers.push(path.normalize(match[1]));
             }
           }
-          if (t.type === 'paragraph' && t.raw.includes('--- End of File:')) {
+          if (t.type === "paragraph" && t.raw.includes("--- End of File:")) {
             const match = t.raw.match(/--- End of File: (.+?) ---/);
             if (match) {
               // Normalize the path before adding to endMarkers
@@ -608,7 +521,7 @@ describe('memoryImportProcessor', () => {
       walkTokens(tokens);
 
       // Verify all expected files are present
-      const expectedFiles = ['nested.md', 'simple.md', 'inner.md'];
+      const expectedFiles = ["nested.md", "simple.md", "inner.md"];
 
       // Check that each expected file is present in the content
       expectedFiles.forEach((file) => {
@@ -616,22 +529,20 @@ describe('memoryImportProcessor', () => {
       });
 
       // Verify content is present
-      expect(result.content).toContain(
-        'Main @./nested.md content @./simple.md',
-      );
-      expect(result.content).toContain('Nested @./inner.md content');
-      expect(result.content).toContain('Simple content');
-      expect(result.content).toContain('Inner content');
+      expect(result.content).toContain("Main @./nested.md content @./simple.md");
+      expect(result.content).toContain("Nested @./inner.md content");
+      expect(result.content).toContain("Simple content");
+      expect(result.content).toContain("Inner content");
 
       // Verify end markers exist
       expect(endMarkers.length).toBeGreaterThan(0);
     });
 
-    it('should not duplicate files in flat output if imported multiple times', async () => {
-      const content = 'Main @./dup.md again @./dup.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const dupContent = 'Duplicated content';
+    it("should not duplicate files in flat output if imported multiple times", async () => {
+      const content = "Main @./dup.md again @./dup.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const dupContent = "Duplicated content";
 
       // Reset mocks
       mockedFs.access.mockReset();
@@ -647,7 +558,7 @@ describe('memoryImportProcessor', () => {
         true, // followImports
         undefined, // allowedPaths
         projectRoot,
-        'flat', // outputFormat
+        "flat", // outputFormat
       );
 
       // Verify readFile was called only once for dup.md
@@ -655,78 +566,61 @@ describe('memoryImportProcessor', () => {
 
       // Check that the content contains the file content only once
       const contentStr = result.content;
-      const firstIndex = contentStr.indexOf('Duplicated content');
-      const lastIndex = contentStr.lastIndexOf('Duplicated content');
+      const firstIndex = contentStr.indexOf("Duplicated content");
+      const lastIndex = contentStr.lastIndexOf("Duplicated content");
       expect(firstIndex).toBeGreaterThan(-1); // Content should exist
       expect(firstIndex).toBe(lastIndex); // Should only appear once
     });
 
-    it('should handle nested imports in flat output', async () => {
-      const content = 'Root @./a.md';
-      const projectRoot = testPath('test', 'project');
-      const basePath = testPath(projectRoot, 'src');
-      const aContent = 'A @./b.md';
-      const bContent = 'B content';
+    it("should handle nested imports in flat output", async () => {
+      const content = "Root @./a.md";
+      const projectRoot = testPath("test", "project");
+      const basePath = testPath(projectRoot, "src");
+      const aContent = "A @./b.md";
+      const bContent = "B content";
 
       mockedFs.access.mockResolvedValue(undefined);
-      mockedFs.readFile
-        .mockResolvedValueOnce(aContent)
-        .mockResolvedValueOnce(bContent);
+      mockedFs.readFile.mockResolvedValueOnce(aContent).mockResolvedValueOnce(bContent);
 
-      const result = await processImports(
-        content,
-        basePath,
-        true,
-        undefined,
-        projectRoot,
-        'flat',
-      );
+      const result = await processImports(content, basePath, true, undefined, projectRoot, "flat");
 
       // Verify all files are present by checking for their basenames
-      expect(result.content).toContain('a.md');
-      expect(result.content).toContain('b.md');
+      expect(result.content).toContain("a.md");
+      expect(result.content).toContain("b.md");
 
       // Verify content is in the correct order
       const contentStr = result.content;
-      const aIndex = contentStr.indexOf('a.md');
-      const bIndex = contentStr.indexOf('b.md');
-      const rootIndex = contentStr.indexOf('Root @./a.md');
+      const aIndex = contentStr.indexOf("a.md");
+      const bIndex = contentStr.indexOf("b.md");
+      const rootIndex = contentStr.indexOf("Root @./a.md");
 
       expect(rootIndex).toBeLessThan(aIndex);
       expect(aIndex).toBeLessThan(bIndex);
 
       // Verify content is present
-      expect(result.content).toContain('Root @./a.md');
-      expect(result.content).toContain('A @./b.md');
-      expect(result.content).toContain('B content');
+      expect(result.content).toContain("Root @./a.md");
+      expect(result.content).toContain("A @./b.md");
+      expect(result.content).toContain("B content");
     });
   });
 
-  describe('validateImportPath', () => {
-    it('should reject URLs', () => {
-      const basePath = testPath('base');
-      const allowedPath = testPath('allowed');
-      expect(
-        validateImportPath('https://example.com/file.md', basePath, [
-          allowedPath,
-        ]),
-      ).toBe(false);
-      expect(
-        validateImportPath('http://example.com/file.md', basePath, [
-          allowedPath,
-        ]),
-      ).toBe(false);
-      expect(
-        validateImportPath('file:///path/to/file.md', basePath, [allowedPath]),
-      ).toBe(false);
+  describe("validateImportPath", () => {
+    it("should reject URLs", () => {
+      const basePath = testPath("base");
+      const allowedPath = testPath("allowed");
+      expect(validateImportPath("https://example.com/file.md", basePath, [allowedPath])).toBe(
+        false,
+      );
+      expect(validateImportPath("http://example.com/file.md", basePath, [allowedPath])).toBe(false);
+      expect(validateImportPath("file:///path/to/file.md", basePath, [allowedPath])).toBe(false);
     });
 
-    it('should allow paths within allowed directories', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowedPath = path.resolve(testPath('allowed'));
+    it("should allow paths within allowed directories", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowedPath = path.resolve(testPath("allowed"));
 
       // Test relative paths - resolve them against basePath
-      const relativePath = './file.md';
+      const relativePath = "./file.md";
       path.resolve(basePath, relativePath);
       expect(validateImportPath(relativePath, basePath, [basePath])).toBe(true);
 
@@ -734,144 +628,106 @@ describe('memoryImportProcessor', () => {
       const parentPath = path.dirname(basePath);
       if (parentPath !== basePath) {
         // Only test if parent is different
-        const parentRelativePath = '../file.md';
+        const parentRelativePath = "../file.md";
         path.resolve(basePath, parentRelativePath);
-        expect(
-          validateImportPath(parentRelativePath, basePath, [parentPath]),
-        ).toBe(true);
+        expect(validateImportPath(parentRelativePath, basePath, [parentPath])).toBe(true);
 
-        path.resolve(basePath, 'sub');
-        const resultSub = validateImportPath('sub', basePath, [basePath]);
+        path.resolve(basePath, "sub");
+        const resultSub = validateImportPath("sub", basePath, [basePath]);
         expect(resultSub).toBe(true);
       }
 
       // Test allowed path access - use a file within the allowed directory
-      const allowedSubPath = 'nested';
-      const allowedFilePath = path.join(allowedPath, allowedSubPath, 'file.md');
-      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(
-        true,
-      );
+      const allowedSubPath = "nested";
+      const allowedFilePath = path.join(allowedPath, allowedSubPath, "file.md");
+      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(true);
     });
 
-    it('should reject paths outside allowed directories', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowedPath = path.resolve(testPath('allowed'));
-      const forbiddenPath = path.resolve(testPath('forbidden'));
+    it("should reject paths outside allowed directories", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowedPath = path.resolve(testPath("allowed"));
+      const forbiddenPath = path.resolve(testPath("forbidden"));
 
       // Forbidden path should be blocked
-      expect(validateImportPath(forbiddenPath, basePath, [allowedPath])).toBe(
-        false,
-      );
+      expect(validateImportPath(forbiddenPath, basePath, [allowedPath])).toBe(false);
 
       // Relative path to forbidden directory should be blocked
-      const relativeToForbidden = path.relative(
-        basePath,
-        path.join(forbiddenPath, 'file.md'),
-      );
-      expect(
-        validateImportPath(relativeToForbidden, basePath, [allowedPath]),
-      ).toBe(false);
+      const relativeToForbidden = path.relative(basePath, path.join(forbiddenPath, "file.md"));
+      expect(validateImportPath(relativeToForbidden, basePath, [allowedPath])).toBe(false);
 
       // Path that tries to escape the base directory should be blocked
-      const escapingPath = path.join('..', '..', 'sensitive', 'file.md');
-      expect(validateImportPath(escapingPath, basePath, [basePath])).toBe(
-        false,
-      );
+      const escapingPath = path.join("..", "..", "sensitive", "file.md");
+      expect(validateImportPath(escapingPath, basePath, [basePath])).toBe(false);
     });
 
-    it('should handle multiple allowed directories', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowed1 = path.resolve(testPath('allowed1'));
-      const allowed2 = path.resolve(testPath('allowed2'));
+    it("should handle multiple allowed directories", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowed1 = path.resolve(testPath("allowed1"));
+      const allowed2 = path.resolve(testPath("allowed2"));
 
       // File not in any allowed path
-      const otherPath = path.resolve(testPath('other', 'file.md'));
-      expect(
-        validateImportPath(otherPath, basePath, [allowed1, allowed2]),
-      ).toBe(false);
+      const otherPath = path.resolve(testPath("other", "file.md"));
+      expect(validateImportPath(otherPath, basePath, [allowed1, allowed2])).toBe(false);
 
       // File in first allowed path
-      const file1 = path.join(allowed1, 'nested', 'file.md');
-      expect(validateImportPath(file1, basePath, [allowed1, allowed2])).toBe(
-        true,
-      );
+      const file1 = path.join(allowed1, "nested", "file.md");
+      expect(validateImportPath(file1, basePath, [allowed1, allowed2])).toBe(true);
 
       // File in second allowed path
-      const file2 = path.join(allowed2, 'nested', 'file.md');
-      expect(validateImportPath(file2, basePath, [allowed1, allowed2])).toBe(
-        true,
-      );
+      const file2 = path.join(allowed2, "nested", "file.md");
+      expect(validateImportPath(file2, basePath, [allowed1, allowed2])).toBe(true);
 
       // Test with relative path to allowed directory
       const relativeToAllowed1 = path.relative(basePath, file1);
-      expect(
-        validateImportPath(relativeToAllowed1, basePath, [allowed1, allowed2]),
-      ).toBe(true);
+      expect(validateImportPath(relativeToAllowed1, basePath, [allowed1, allowed2])).toBe(true);
     });
 
-    it('should handle relative paths correctly', () => {
-      const basePath = path.resolve(testPath('base'));
-      const parentPath = path.resolve(testPath('parent'));
+    it("should handle relative paths correctly", () => {
+      const basePath = path.resolve(testPath("base"));
+      const parentPath = path.resolve(testPath("parent"));
 
       // Current directory file access
-      expect(validateImportPath('file.md', basePath, [basePath])).toBe(true);
+      expect(validateImportPath("file.md", basePath, [basePath])).toBe(true);
 
       // Explicit current directory file access
-      expect(validateImportPath('./file.md', basePath, [basePath])).toBe(true);
+      expect(validateImportPath("./file.md", basePath, [basePath])).toBe(true);
 
       // Parent directory access - should be blocked unless parent is in allowed paths
-      const parentFile = path.join(parentPath, 'file.md');
+      const parentFile = path.join(parentPath, "file.md");
       const relativeToParent = path.relative(basePath, parentFile);
-      expect(validateImportPath(relativeToParent, basePath, [basePath])).toBe(
-        false,
-      );
+      expect(validateImportPath(relativeToParent, basePath, [basePath])).toBe(false);
 
       // Parent directory access when parent is in allowed paths
-      expect(
-        validateImportPath(relativeToParent, basePath, [basePath, parentPath]),
-      ).toBe(true);
+      expect(validateImportPath(relativeToParent, basePath, [basePath, parentPath])).toBe(true);
 
       // Nested relative path
-      const nestedPath = path.join('nested', 'sub', 'file.md');
+      const nestedPath = path.join("nested", "sub", "file.md");
       expect(validateImportPath(nestedPath, basePath, [basePath])).toBe(true);
     });
 
-    it('should handle absolute paths correctly', () => {
-      const basePath = path.resolve(testPath('base'));
-      const allowedPath = path.resolve(testPath('allowed'));
-      const forbiddenPath = path.resolve(testPath('forbidden'));
+    it("should handle absolute paths correctly", () => {
+      const basePath = path.resolve(testPath("base"));
+      const allowedPath = path.resolve(testPath("allowed"));
+      const forbiddenPath = path.resolve(testPath("forbidden"));
 
       // Allowed path should work - file directly in allowed directory
-      const allowedFilePath = path.join(allowedPath, 'file.md');
-      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(
-        true,
-      );
+      const allowedFilePath = path.join(allowedPath, "file.md");
+      expect(validateImportPath(allowedFilePath, basePath, [allowedPath])).toBe(true);
 
       // Allowed path should work - file in subdirectory of allowed directory
-      const allowedNestedPath = path.join(allowedPath, 'nested', 'file.md');
-      expect(
-        validateImportPath(allowedNestedPath, basePath, [allowedPath]),
-      ).toBe(true);
+      const allowedNestedPath = path.join(allowedPath, "nested", "file.md");
+      expect(validateImportPath(allowedNestedPath, basePath, [allowedPath])).toBe(true);
 
       // Forbidden path should be blocked
-      const forbiddenFilePath = path.join(forbiddenPath, 'file.md');
-      expect(
-        validateImportPath(forbiddenFilePath, basePath, [allowedPath]),
-      ).toBe(false);
+      const forbiddenFilePath = path.join(forbiddenPath, "file.md");
+      expect(validateImportPath(forbiddenFilePath, basePath, [allowedPath])).toBe(false);
 
       // Relative path to allowed directory should work
       const relativeToAllowed = path.relative(basePath, allowedFilePath);
-      expect(
-        validateImportPath(relativeToAllowed, basePath, [allowedPath]),
-      ).toBe(true);
+      expect(validateImportPath(relativeToAllowed, basePath, [allowedPath])).toBe(true);
 
       // Path that resolves to the same file but via different relative segments
-      const dotPath = path.join(
-        '.',
-        '..',
-        path.basename(allowedPath),
-        'file.md',
-      );
+      const dotPath = path.join(".", "..", path.basename(allowedPath), "file.md");
       expect(validateImportPath(dotPath, basePath, [allowedPath])).toBe(true);
     });
   });
diff --git a/packages/gemini-core/src/utils/memoryImportProcessor.ts b/packages/gemini-core/src/utils/memoryImportProcessor.ts
index eafee3340..77eea5f5a 100644
--- a/packages/gemini-core/src/utils/memoryImportProcessor.ts
+++ b/packages/gemini-core/src/utils/memoryImportProcessor.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isSubpath } from './paths.js';
-import { marked, type Token } from 'marked';
-import { debugLogger } from './debugLogger.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { marked, type Token } from "marked";
+import { debugLogger } from "./debugLogger.js";
+import { isSubpath } from "./paths.js";
 
 // Simple console logger for import processing
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  debug: (...args: any[]) =>
-    debugLogger.debug('[DEBUG] [ImportProcessor]', ...args),
+  debug: (...args: any[]) => debugLogger.debug("[DEBUG] [ImportProcessor]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  warn: (...args: any[]) =>
-    debugLogger.warn('[WARN] [ImportProcessor]', ...args),
+  warn: (...args: any[]) => debugLogger.warn("[WARN] [ImportProcessor]", ...args),
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: (...args: any[]) =>
-    console.error('[ERROR] [ImportProcessor]', ...args),
+  error: (...args: any[]) => console.error("[ERROR] [ImportProcessor]", ...args),
 };
 
 /**
@@ -53,7 +50,7 @@ export interface ProcessImportsResult {
 async function findProjectRoot(startDir: string): Promise<string> {
   let currentDir = path.resolve(startDir);
   while (true) {
-    const gitPath = path.join(currentDir, '.git');
+    const gitPath = path.join(currentDir, ".git");
     try {
       const stats = await fs.lstat(gitPath);
       if (stats.isDirectory()) {
@@ -76,10 +73,10 @@ async function findProjectRoot(startDir: string): Promise<string> {
 // Add a type guard for error objects
 function hasMessage(err: unknown): err is { message: string } {
   return (
-    typeof err === 'object' &&
+    typeof err === "object" &&
     err !== null &&
-    'message' in err &&
-    typeof (err as { message: unknown }).message === 'string'
+    "message" in err &&
+    typeof (err as { message: unknown }).message === "string"
   );
 }
 
@@ -88,16 +85,14 @@ function hasMessage(err: unknown): err is { message: string } {
  * Finds all import statements in content without using regex
  * @returns Array of {start, _end, path} objects for each import found
  */
-function findImports(
-  content: string,
-): Array<{ start: number; _end: number; path: string }> {
+function findImports(content: string): Array<{ start: number; _end: number; path: string }> {
   const imports: Array<{ start: number; _end: number; path: string }> = [];
   let i = 0;
   const len = content.length;
 
   while (i < len) {
     // Find next @ symbol
-    i = content.indexOf('@', i);
+    i = content.indexOf("@", i);
     if (i === -1) break;
 
     // Check if it's a word boundary (not part of another word)
@@ -108,12 +103,7 @@ function findImports(
 
     // Find the end of the import path (whitespace or newline)
     let j = i + 1;
-    while (
-      j < len &&
-      !isWhitespace(content[j]) &&
-      content[j] !== '\n' &&
-      content[j] !== '\r'
-    ) {
+    while (j < len && !isWhitespace(content[j]) && content[j] !== "\n" && content[j] !== "\r") {
       j++;
     }
 
@@ -123,9 +113,7 @@ function findImports(
     // Basic validation (starts with ./ or / or letter)
     if (
       importPath.length > 0 &&
-      (importPath[0] === '.' ||
-        importPath[0] === '/' ||
-        isLetter(importPath[0]))
+      (importPath[0] === "." || importPath[0] === "/" || isLetter(importPath[0]))
     ) {
       imports.push({
         start: i,
@@ -141,7 +129,7 @@ function findImports(
 }
 
 function isWhitespace(char: string): boolean {
-  return char === ' ' || char === '\t' || char === '\n' || char === '\r';
+  return char === " " || char === "\t" || char === "\n" || char === "\r";
 }
 
 function isLetter(char: string): boolean {
@@ -158,11 +146,11 @@ function findCodeRegions(content: string): Array<[number, number]> {
   let offset = 0;
 
   function walk(token: Token, baseOffset: number) {
-    if (token.type === 'code' || token.type === 'codespan') {
+    if (token.type === "code" || token.type === "codespan") {
       regions.push([baseOffset, baseOffset + token.raw.length]);
     }
 
-    if ('tokens' in token && token.tokens) {
+    if ("tokens" in token && token.tokens) {
       let childOffset = 0;
       for (const child of token.tokens) {
         const childIndexInParent = token.raw.indexOf(child.raw, childOffset);
@@ -207,7 +195,7 @@ export async function processImports(
     currentDepth: 0,
   },
   projectRoot?: string,
-  importFormat: 'flat' | 'tree' = 'tree',
+  importFormat: "flat" | "tree" = "tree",
 ): Promise<ProcessImportsResult> {
   if (!projectRoot) {
     projectRoot = await findProjectRoot(basePath);
@@ -221,12 +209,12 @@ export async function processImports(
     }
     return {
       content,
-      importTree: { path: importState.currentFile || 'unknown' },
+      importTree: { path: importState.currentFile || "unknown" },
     };
   }
 
   // --- FLAT FORMAT LOGIC ---
-  if (importFormat === 'flat') {
+  if (importFormat === "flat") {
     // Use a queue to process files in order of first encounter, and a set to avoid duplicates
     const flatFiles: Array<{ path: string; content: string }> = [];
     // Track processed files across the entire operation
@@ -261,18 +249,13 @@ export async function processImports(
 
         // Skip if inside a code region
         if (
-          codeRegions.some(
-            ([regionStart, regionEnd]) =>
-              start >= regionStart && start < regionEnd,
-          )
+          codeRegions.some(([regionStart, regionEnd]) => start >= regionStart && start < regionEnd)
         ) {
           continue;
         }
 
         // Validate import path
-        if (
-          !validateImportPath(importPath, fileBasePath, [projectRoot || ''])
-        ) {
+        if (!validateImportPath(importPath, fileBasePath, [projectRoot || ""])) {
           continue;
         }
 
@@ -284,19 +267,14 @@ export async function processImports(
 
         try {
           await fs.access(fullPath);
-          const importedContent = await fs.readFile(fullPath, 'utf-8');
+          const importedContent = await fs.readFile(fullPath, "utf-8");
 
           // Process the imported file
-          await processFlat(
-            importedContent,
-            path.dirname(fullPath),
-            normalizedFullPath,
-            depth + 1,
-          );
+          await processFlat(importedContent, path.dirname(fullPath), normalizedFullPath, depth + 1);
         } catch (error) {
           if (debugMode) {
             logger.warn(
-              `Failed to import ${fullPath}: ${hasMessage(error) ? error.message : 'Unknown error'}`,
+              `Failed to import ${fullPath}: ${hasMessage(error) ? error.message : "Unknown error"}`,
             );
           }
           // Continue with other imports even if one fails
@@ -305,18 +283,13 @@ export async function processImports(
     }
 
     // Start with the root file (current file)
-    const rootPath = path.normalize(
-      importState.currentFile || path.resolve(basePath),
-    );
+    const rootPath = path.normalize(importState.currentFile || path.resolve(basePath));
     await processFlat(content, basePath, rootPath, 0);
 
     // Concatenate all unique files in order, Claude-style
     const flatContent = flatFiles
-      .map(
-        (f) =>
-          `--- File: ${f.path} ---\n${f.content.trim()}\n--- End of File: ${f.path} ---`,
-      )
-      .join('\n\n');
+      .map((f) => `--- File: ${f.path} ---\n${f.content.trim()}\n--- End of File: ${f.path} ---`)
+      .join("\n\n");
 
     return {
       content: flatContent,
@@ -326,7 +299,7 @@ export async function processImports(
 
   // --- TREE FORMAT LOGIC (existing) ---
   const codeRegions = findCodeRegions(content);
-  let result = '';
+  let result = "";
   let lastIndex = 0;
   const imports: MemoryFile[] = [];
   const importsList = findImports(content);
@@ -342,7 +315,7 @@ export async function processImports(
       continue;
     }
     // Validate import path to prevent path traversal attacks
-    if (!validateImportPath(importPath, basePath, [projectRoot || ''])) {
+    if (!validateImportPath(importPath, basePath, [projectRoot || ""])) {
       result += `<!-- Import failed: ${importPath} - Path traversal attempt -->`;
       continue;
     }
@@ -353,7 +326,7 @@ export async function processImports(
     }
     try {
       await fs.access(fullPath);
-      const fileContent = await fs.readFile(fullPath, 'utf-8');
+      const fileContent = await fs.readFile(fullPath, "utf-8");
       // Mark this file as processed for this import chain
       const newImportState: ImportState = {
         ...importState,
@@ -373,10 +346,10 @@ export async function processImports(
       result += `<!-- Imported from: ${importPath} -->\n${imported.content}\n<!-- End of import from: ${importPath} -->`;
       imports.push(imported.importTree);
     } catch (err: unknown) {
-      let message = 'Unknown error';
+      let message = "Unknown error";
       if (hasMessage(err)) {
         message = err.message;
-      } else if (typeof err === 'string') {
+      } else if (typeof err === "string") {
         message = err;
       }
       logger.error(`Failed to import ${importPath}: ${message}`);
@@ -389,7 +362,7 @@ export async function processImports(
   return {
     content: result,
     importTree: {
-      path: importState.currentFile || 'unknown',
+      path: importState.currentFile || "unknown",
       imports: imports.length > 0 ? imports : undefined,
     },
   };
@@ -407,7 +380,5 @@ export function validateImportPath(
 
   const resolvedPath = path.resolve(basePath, importPath);
 
-  return allowedDirectories.some((allowedDir) =>
-    isSubpath(allowedDir, resolvedPath),
-  );
+  return allowedDirectories.some((allowedDir) => isSubpath(allowedDir, resolvedPath));
 }
diff --git a/packages/gemini-core/src/utils/messageInspectors.ts b/packages/gemini-core/src/utils/messageInspectors.ts
index 9a7709469..3150ea0e6 100644
--- a/packages/gemini-core/src/utils/messageInspectors.ts
+++ b/packages/gemini-core/src/utils/messageInspectors.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
+import type { Content } from "@google/genai";
 
 export function isFunctionResponse(content: Content): boolean {
   return (
-    content.role === 'user' &&
+    content.role === "user" &&
     !!content.parts &&
     content.parts.every((part) => !!part.functionResponse)
   );
@@ -16,7 +16,7 @@ export function isFunctionResponse(content: Content): boolean {
 
 export function isFunctionCall(content: Content): boolean {
   return (
-    content.role === 'model' &&
+    content.role === "model" &&
     !!content.parts &&
     content.parts.every((part) => !!part.functionCall)
   );
diff --git a/packages/gemini-core/src/utils/nextSpeakerChecker.test.ts b/packages/gemini-core/src/utils/nextSpeakerChecker.test.ts
index 0a50e4bee..b9df16180 100644
--- a/packages/gemini-core/src/utils/nextSpeakerChecker.test.ts
+++ b/packages/gemini-core/src/utils/nextSpeakerChecker.test.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Content } from '@google/genai';
-import { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { ContentGenerator } from '../core/contentGenerator.js';
-import type { Config } from '../config/config.js';
-import type { NextSpeakerResponse } from './nextSpeakerChecker.js';
-import { checkNextSpeaker } from './nextSpeakerChecker.js';
-import { GeminiChat } from '../core/geminiChat.js';
+import type { Content } from "@google/genai";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { ContentGenerator } from "../core/contentGenerator.js";
+import { GeminiChat } from "../core/geminiChat.js";
+import type { NextSpeakerResponse } from "./nextSpeakerChecker.js";
+import { checkNextSpeaker } from "./nextSpeakerChecker.js";
 
 // Mock fs module to prevent actual file system operations during tests
 const mockFileSystem = new Map<string, string>();
 
-vi.mock('node:fs', () => {
+vi.mock("node:fs", () => {
   const fsModule = {
     mkdirSync: vi.fn(),
     writeFileSync: vi.fn((path: string, data: string) => {
@@ -27,8 +27,8 @@ vi.mock('node:fs', () => {
       if (mockFileSystem.has(path)) {
         return mockFileSystem.get(path);
       }
-      throw Object.assign(new Error('ENOENT: no such file or directory'), {
-        code: 'ENOENT',
+      throw Object.assign(new Error("ENOENT: no such file or directory"), {
+        code: "ENOENT",
       });
     }),
     existsSync: vi.fn((path: string) => mockFileSystem.has(path)),
@@ -41,28 +41,28 @@ vi.mock('node:fs', () => {
 });
 
 // Mock GeminiClient and Config constructor
-vi.mock('../core/baseLlmClient.js');
-vi.mock('../config/config.js');
+vi.mock("../core/baseLlmClient.js");
+vi.mock("../config/config.js");
 
-describe('checkNextSpeaker', () => {
+describe("checkNextSpeaker", () => {
   let chatInstance: GeminiChat;
   let mockConfig: Config;
   let mockBaseLlmClient: BaseLlmClient;
   const abortSignal = new AbortController().signal;
-  const promptId = 'test-prompt-id';
+  const promptId = "test-prompt-id";
 
   beforeEach(() => {
     vi.resetAllMocks();
     const mockResolvedConfig = {
-      model: 'next-speaker-v1',
+      model: "next-speaker-v1",
       generateContentConfig: {},
     };
     mockConfig = {
-      getProjectRoot: vi.fn().mockReturnValue('/test/project/root'),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getModel: () => 'test-model',
+      getProjectRoot: vi.fn().mockReturnValue("/test/project/root"),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
+      getModel: () => "test-model",
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/temp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/temp"),
       },
       modelConfigService: {
         getResolvedConfig: vi.fn().mockReturnValue(mockResolvedConfig),
@@ -87,192 +87,137 @@ describe('checkNextSpeaker', () => {
     );
 
     // Spy on getHistory for chatInstance
-    vi.spyOn(chatInstance, 'getHistory');
+    vi.spyOn(chatInstance, "getHistory");
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should return null if history is empty', async () => {
+  it("should return null if history is empty", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([]);
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
-  it('should return null if the last speaker was the user', async () => {
+  it("should return null if the last speaker was the user", async () => {
     vi.mocked(chatInstance.getHistory).mockReturnValue([
-      { role: 'user', parts: [{ text: 'Hello' }] },
+      { role: "user", parts: [{ text: "Hello" }] },
     ]);
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
     expect(mockBaseLlmClient.generateJson).not.toHaveBeenCalled();
   });
 
   it("should return { next_speaker: 'model' } when model intends to continue", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'I will now do something.' }] },
+      { role: "model", parts: [{ text: "I will now do something." }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model stated it will do something.',
-      next_speaker: 'model',
+      reasoning: "Model stated it will do something.",
+      next_speaker: "model",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toEqual(mockApiResponse);
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalledTimes(1);
   });
 
   it("should return { next_speaker: 'user' } when model asks a question", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'What would you like to do?' }] },
+      { role: "model", parts: [{ text: "What would you like to do?" }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model asked a question.',
-      next_speaker: 'user',
+      reasoning: "Model asked a question.",
+      next_speaker: "user",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toEqual(mockApiResponse);
   });
 
   it("should return { next_speaker: 'user' } when model makes a statement", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'This is a statement.' }] },
+      { role: "model", parts: [{ text: "This is a statement." }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model made a statement, awaiting user input.',
-      next_speaker: 'user',
+      reasoning: "Model made a statement, awaiting user input.",
+      next_speaker: "user",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toEqual(mockApiResponse);
   });
 
-  it('should return null if baseLlmClient.generateJson throws an error', async () => {
-    const consoleWarnSpy = vi
-      .spyOn(console, 'warn')
-      .mockImplementation(() => {});
+  it("should return null if baseLlmClient.generateJson throws an error", async () => {
+    const consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
-    (mockBaseLlmClient.generateJson as Mock).mockRejectedValue(
-      new Error('API Error'),
-    );
+    (mockBaseLlmClient.generateJson as Mock).mockRejectedValue(new Error("API Error"));
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
     consoleWarnSpy.mockRestore();
   });
 
-  it('should return null if baseLlmClient.generateJson returns invalid JSON (missing next_speaker)', async () => {
+  it("should return null if baseLlmClient.generateJson returns invalid JSON (missing next_speaker)", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue({
-      reasoning: 'This is incomplete.',
+      reasoning: "This is incomplete.",
     } as unknown as NextSpeakerResponse); // Type assertion to simulate invalid response
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
   });
 
-  it('should return null if baseLlmClient.generateJson returns a non-string next_speaker', async () => {
+  it("should return null if baseLlmClient.generateJson returns a non-string next_speaker", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue({
-      reasoning: 'Model made a statement, awaiting user input.',
+      reasoning: "Model made a statement, awaiting user input.",
       next_speaker: 123, // Invalid type
     } as unknown as NextSpeakerResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
   });
 
-  it('should return null if baseLlmClient.generateJson returns an invalid next_speaker string value', async () => {
+  it("should return null if baseLlmClient.generateJson returns an invalid next_speaker string value", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue({
-      reasoning: 'Model made a statement, awaiting user input.',
-      next_speaker: 'neither', // Invalid enum value
+      reasoning: "Model made a statement, awaiting user input.",
+      next_speaker: "neither", // Invalid enum value
     } as unknown as NextSpeakerResponse);
 
-    const result = await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    const result = await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
     expect(result).toBeNull();
   });
 
-  it('should call generateJson with the correct parameters', async () => {
+  it("should call generateJson with the correct parameters", async () => {
     (chatInstance.getHistory as Mock).mockReturnValue([
-      { role: 'model', parts: [{ text: 'Some model output.' }] },
+      { role: "model", parts: [{ text: "Some model output." }] },
     ] as Content[]);
     const mockApiResponse: NextSpeakerResponse = {
-      reasoning: 'Model made a statement, awaiting user input.',
-      next_speaker: 'user',
+      reasoning: "Model made a statement, awaiting user input.",
+      next_speaker: "user",
     };
     (mockBaseLlmClient.generateJson as Mock).mockResolvedValue(mockApiResponse);
 
-    await checkNextSpeaker(
-      chatInstance,
-      mockBaseLlmClient,
-      abortSignal,
-      promptId,
-    );
+    await checkNextSpeaker(chatInstance, mockBaseLlmClient, abortSignal, promptId);
 
     expect(mockBaseLlmClient.generateJson).toHaveBeenCalled();
-    const generateJsonCall = (mockBaseLlmClient.generateJson as Mock).mock
-      .calls[0][0];
-    expect(generateJsonCall.modelConfigKey.model).toBe('next-speaker-checker');
+    const generateJsonCall = (mockBaseLlmClient.generateJson as Mock).mock.calls[0][0];
+    expect(generateJsonCall.modelConfigKey.model).toBe("next-speaker-checker");
     expect(generateJsonCall.promptId).toBe(promptId);
   });
 });
diff --git a/packages/gemini-core/src/utils/nextSpeakerChecker.ts b/packages/gemini-core/src/utils/nextSpeakerChecker.ts
index 76b1c6a44..ab00a9fd9 100644
--- a/packages/gemini-core/src/utils/nextSpeakerChecker.ts
+++ b/packages/gemini-core/src/utils/nextSpeakerChecker.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Content } from '@google/genai';
-import type { BaseLlmClient } from '../core/baseLlmClient.js';
-import type { GeminiChat } from '../core/geminiChat.js';
-import { isFunctionResponse } from './messageInspectors.js';
-import { debugLogger } from './debugLogger.js';
+import type { Content } from "@google/genai";
+import type { BaseLlmClient } from "../core/baseLlmClient.js";
+import type { GeminiChat } from "../core/geminiChat.js";
+import { debugLogger } from "./debugLogger.js";
+import { isFunctionResponse } from "./messageInspectors.js";
 
 const CHECK_PROMPT = `Analyze *only* the content and structure of your immediately preceding response (your last turn in the conversation history). Based *strictly* on that response, determine who should logically speak next: the 'user' or the 'model' (you).
 **Decision Rules (apply in order):**
@@ -17,26 +17,26 @@ const CHECK_PROMPT = `Analyze *only* the content and structure of your immediate
 3.  **Waiting for User:** If your last response completed a thought, statement, or task *and* does not meet the criteria for Rule 1 (Model Continues) or Rule 2 (Question to User), it implies a pause expecting user input or reaction. In this case, the **'user'** should speak next.`;
 
 const RESPONSE_SCHEMA: Record<string, unknown> = {
-  type: 'object',
+  type: "object",
   properties: {
     reasoning: {
-      type: 'string',
+      type: "string",
       description:
         "Brief explanation justifying the 'next_speaker' choice based *strictly* on the applicable rule and the content/structure of the preceding turn.",
     },
     next_speaker: {
-      type: 'string',
-      enum: ['user', 'model'],
+      type: "string",
+      enum: ["user", "model"],
       description:
-        'Who should speak next based *only* on the preceding turn and the decision rules',
+        "Who should speak next based *only* on the preceding turn and the decision rules",
     },
   },
-  required: ['reasoning', 'next_speaker'],
+  required: ["reasoning", "next_speaker"],
 };
 
 export interface NextSpeakerResponse {
   reasoning: string;
-  next_speaker: 'user' | 'model';
+  next_speaker: "user" | "model";
 }
 
 export async function checkNextSpeaker(
@@ -64,40 +64,35 @@ export async function checkNextSpeaker(
   if (comprehensiveHistory.length === 0) {
     return null;
   }
-  const lastComprehensiveMessage =
-    comprehensiveHistory[comprehensiveHistory.length - 1];
+  const lastComprehensiveMessage = comprehensiveHistory[comprehensiveHistory.length - 1];
 
   // If the last message is a user message containing only function_responses,
   // then the model should speak next.
-  if (
-    lastComprehensiveMessage &&
-    isFunctionResponse(lastComprehensiveMessage)
-  ) {
+  if (lastComprehensiveMessage && isFunctionResponse(lastComprehensiveMessage)) {
     return {
-      reasoning:
-        'The last message was a function response, so the model should speak next.',
-      next_speaker: 'model',
+      reasoning: "The last message was a function response, so the model should speak next.",
+      next_speaker: "model",
     };
   }
 
   if (
     lastComprehensiveMessage &&
-    lastComprehensiveMessage.role === 'model' &&
+    lastComprehensiveMessage.role === "model" &&
     lastComprehensiveMessage.parts &&
     lastComprehensiveMessage.parts.length === 0
   ) {
-    lastComprehensiveMessage.parts.push({ text: '' });
+    lastComprehensiveMessage.parts.push({ text: "" });
     return {
       reasoning:
-        'The last message was a filler model message with no content (nothing for user to act on), model should speak next.',
-      next_speaker: 'model',
+        "The last message was a filler model message with no content (nothing for user to act on), model should speak next.",
+      next_speaker: "model",
     };
   }
 
   // Things checked out. Let's proceed to potentially making an LLM request.
 
   const lastMessage = curatedHistory[curatedHistory.length - 1];
-  if (!lastMessage || lastMessage.role !== 'model') {
+  if (!lastMessage || lastMessage.role !== "model") {
     // Cannot determine next speaker if the last turn wasn't from the model
     // or if history is empty.
     return null;
@@ -105,12 +100,12 @@ export async function checkNextSpeaker(
 
   const contents: Content[] = [
     ...curatedHistory,
-    { role: 'user', parts: [{ text: CHECK_PROMPT }] },
+    { role: "user", parts: [{ text: CHECK_PROMPT }] },
   ];
 
   try {
     const parsedResponse = (await baseLlmClient.generateJson({
-      modelConfigKey: { model: 'next-speaker-checker' },
+      modelConfigKey: { model: "next-speaker-checker" },
       contents,
       schema: RESPONSE_SCHEMA,
       abortSignal,
@@ -120,14 +115,14 @@ export async function checkNextSpeaker(
     if (
       parsedResponse &&
       parsedResponse.next_speaker &&
-      ['user', 'model'].includes(parsedResponse.next_speaker)
+      ["user", "model"].includes(parsedResponse.next_speaker)
     ) {
       return parsedResponse;
     }
     return null;
   } catch (error) {
     debugLogger.warn(
-      'Failed to talk to Gemini endpoint when seeing if conversation should continue.',
+      "Failed to talk to Gemini endpoint when seeing if conversation should continue.",
       error,
     );
     return null;
diff --git a/packages/gemini-core/src/utils/package.ts b/packages/gemini-core/src/utils/package.ts
index 0ef7673f5..c222c9cdb 100644
--- a/packages/gemini-core/src/utils/package.ts
+++ b/packages/gemini-core/src/utils/package.ts
@@ -4,10 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  readPackageUp,
-  type PackageJson as BasePackageJson,
-} from 'read-package-up';
+import { type PackageJson as BasePackageJson, readPackageUp } from "read-package-up";
 
 export type PackageJson = BasePackageJson & {
   config?: {
@@ -15,9 +12,7 @@ export type PackageJson = BasePackageJson & {
   };
 };
 
-export async function getPackageJson(
-  cwd: string,
-): Promise<PackageJson | undefined> {
+export async function getPackageJson(cwd: string): Promise<PackageJson | undefined> {
   const result = await readPackageUp({ cwd });
   if (!result) {
     // TODO: Maybe bubble this up as an error.
diff --git a/packages/gemini-core/src/utils/partUtils.test.ts b/packages/gemini-core/src/utils/partUtils.test.ts
index d53010725..4e5a4becc 100644
--- a/packages/gemini-core/src/utils/partUtils.test.ts
+++ b/packages/gemini-core/src/utils/partUtils.test.ts
@@ -4,21 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import type { GenerateContentResponse, Part, PartUnion } from "@google/genai";
+import { describe, expect, it } from "vitest";
 import {
-  partToString,
-  getResponseText,
-  flatMapTextParts,
   appendToLastTextPart,
-} from './partUtils.js';
-import type { GenerateContentResponse, Part, PartUnion } from '@google/genai';
+  flatMapTextParts,
+  getResponseText,
+  partToString,
+} from "./partUtils.js";
 
 const mockResponse = (
   parts?: Array<{ text?: string; functionCall?: unknown }>,
 ): GenerateContentResponse => ({
-  candidates: parts
-    ? [{ content: { parts: parts as Part[], role: 'model' }, index: 0 }]
-    : [],
+  candidates: parts ? [{ content: { parts: parts as Part[], role: "model" }, index: 0 }] : [],
   promptFeedback: { safetyRatings: [] },
   text: undefined,
   data: undefined,
@@ -27,148 +25,142 @@ const mockResponse = (
   codeExecutionResult: undefined,
 });
 
-describe('partUtils', () => {
-  describe('partToString (default behavior)', () => {
-    it('should return empty string for undefined or null', () => {
+describe("partUtils", () => {
+  describe("partToString (default behavior)", () => {
+    it("should return empty string for undefined or null", () => {
       // @ts-expect-error Testing invalid input
-      expect(partToString(undefined)).toBe('');
+      expect(partToString(undefined)).toBe("");
       // @ts-expect-error Testing invalid input
-      expect(partToString(null)).toBe('');
+      expect(partToString(null)).toBe("");
     });
 
-    it('should return string input unchanged', () => {
-      expect(partToString('hello')).toBe('hello');
+    it("should return string input unchanged", () => {
+      expect(partToString("hello")).toBe("hello");
     });
 
-    it('should concatenate strings from an array', () => {
-      expect(partToString(['a', 'b'])).toBe('ab');
+    it("should concatenate strings from an array", () => {
+      expect(partToString(["a", "b"])).toBe("ab");
     });
 
-    it('should return text property when provided a text part', () => {
-      expect(partToString({ text: 'hi' })).toBe('hi');
+    it("should return text property when provided a text part", () => {
+      expect(partToString({ text: "hi" })).toBe("hi");
     });
 
-    it('should return empty string for non-text parts', () => {
-      const part: Part = { inlineData: { mimeType: 'image/png', data: '' } };
-      expect(partToString(part)).toBe('');
-      const part2: Part = { functionCall: { name: 'test' } };
-      expect(partToString(part2)).toBe('');
+    it("should return empty string for non-text parts", () => {
+      const part: Part = { inlineData: { mimeType: "image/png", data: "" } };
+      expect(partToString(part)).toBe("");
+      const part2: Part = { functionCall: { name: "test" } };
+      expect(partToString(part2)).toBe("");
     });
   });
 
-  describe('partToString (verbose)', () => {
+  describe("partToString (verbose)", () => {
     const verboseOptions = { verbose: true };
 
-    it('should return empty string for undefined or null', () => {
+    it("should return empty string for undefined or null", () => {
       // @ts-expect-error Testing invalid input
-      expect(partToString(undefined, verboseOptions)).toBe('');
+      expect(partToString(undefined, verboseOptions)).toBe("");
       // @ts-expect-error Testing invalid input
-      expect(partToString(null, verboseOptions)).toBe('');
+      expect(partToString(null, verboseOptions)).toBe("");
     });
 
-    it('should return string input unchanged', () => {
-      expect(partToString('hello', verboseOptions)).toBe('hello');
+    it("should return string input unchanged", () => {
+      expect(partToString("hello", verboseOptions)).toBe("hello");
     });
 
-    it('should join parts if the value is an array', () => {
-      const parts = ['hello', { text: ' world' }];
-      expect(partToString(parts, verboseOptions)).toBe('hello world');
+    it("should join parts if the value is an array", () => {
+      const parts = ["hello", { text: " world" }];
+      expect(partToString(parts, verboseOptions)).toBe("hello world");
     });
 
-    it('should return the text property if the part is an object with text', () => {
-      const part: Part = { text: 'hello world' };
-      expect(partToString(part, verboseOptions)).toBe('hello world');
+    it("should return the text property if the part is an object with text", () => {
+      const part: Part = { text: "hello world" };
+      expect(partToString(part, verboseOptions)).toBe("hello world");
     });
 
-    it('should return descriptive string for videoMetadata part', () => {
+    it("should return descriptive string for videoMetadata part", () => {
       const part = { videoMetadata: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe('[Video Metadata]');
+      expect(partToString(part, verboseOptions)).toBe("[Video Metadata]");
     });
 
-    it('should return descriptive string for thought part', () => {
-      const part = { thought: 'thinking' } as unknown as Part;
-      expect(partToString(part, verboseOptions)).toBe('[Thought: thinking]');
+    it("should return descriptive string for thought part", () => {
+      const part = { thought: "thinking" } as unknown as Part;
+      expect(partToString(part, verboseOptions)).toBe("[Thought: thinking]");
     });
 
-    it('should return descriptive string for codeExecutionResult part', () => {
+    it("should return descriptive string for codeExecutionResult part", () => {
       const part = { codeExecutionResult: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe(
-        '[Code Execution Result]',
-      );
+      expect(partToString(part, verboseOptions)).toBe("[Code Execution Result]");
     });
 
-    it('should return descriptive string for executableCode part', () => {
+    it("should return descriptive string for executableCode part", () => {
       const part = { executableCode: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe('[Executable Code]');
+      expect(partToString(part, verboseOptions)).toBe("[Executable Code]");
     });
 
-    it('should return descriptive string for fileData part', () => {
+    it("should return descriptive string for fileData part", () => {
       const part = { fileData: {} } as Part;
-      expect(partToString(part, verboseOptions)).toBe('[File Data]');
+      expect(partToString(part, verboseOptions)).toBe("[File Data]");
     });
 
-    it('should return descriptive string for functionCall part', () => {
-      const part = { functionCall: { name: 'myFunction' } } as Part;
-      expect(partToString(part, verboseOptions)).toBe(
-        '[Function Call: myFunction]',
-      );
+    it("should return descriptive string for functionCall part", () => {
+      const part = { functionCall: { name: "myFunction" } } as Part;
+      expect(partToString(part, verboseOptions)).toBe("[Function Call: myFunction]");
     });
 
-    it('should return descriptive string for functionResponse part', () => {
-      const part = { functionResponse: { name: 'myFunction' } } as Part;
-      expect(partToString(part, verboseOptions)).toBe(
-        '[Function Response: myFunction]',
-      );
+    it("should return descriptive string for functionResponse part", () => {
+      const part = { functionResponse: { name: "myFunction" } } as Part;
+      expect(partToString(part, verboseOptions)).toBe("[Function Response: myFunction]");
     });
 
-    it('should return descriptive string for inlineData part', () => {
-      const part = { inlineData: { mimeType: 'image/png', data: '' } } as Part;
-      expect(partToString(part, verboseOptions)).toBe('<image/png>');
+    it("should return descriptive string for inlineData part", () => {
+      const part = { inlineData: { mimeType: "image/png", data: "" } } as Part;
+      expect(partToString(part, verboseOptions)).toBe("<image/png>");
     });
 
-    it('should return an empty string for an unknown part type', () => {
+    it("should return an empty string for an unknown part type", () => {
       const part: Part = {};
-      expect(partToString(part, verboseOptions)).toBe('');
+      expect(partToString(part, verboseOptions)).toBe("");
     });
 
-    it('should handle complex nested arrays with various part types', () => {
+    it("should handle complex nested arrays with various part types", () => {
       const parts = [
-        'start ',
-        { text: 'middle' },
+        "start ",
+        { text: "middle" },
         [
-          { functionCall: { name: 'func1' } },
-          ' end',
-          { inlineData: { mimeType: 'audio/mp3', data: '' } },
+          { functionCall: { name: "func1" } },
+          " end",
+          { inlineData: { mimeType: "audio/mp3", data: "" } },
         ],
       ];
       expect(partToString(parts as Part, verboseOptions)).toBe(
-        'start middle[Function Call: func1] end<audio/mp3>',
+        "start middle[Function Call: func1] end<audio/mp3>",
       );
     });
   });
 
-  describe('getResponseText', () => {
-    it('should return null when no candidates exist', () => {
+  describe("getResponseText", () => {
+    it("should return null when no candidates exist", () => {
       const response = mockResponse(undefined);
       expect(getResponseText(response)).toBeNull();
     });
 
-    it('should return concatenated text from first candidate', () => {
-      const result = mockResponse([{ text: 'a' }, { text: 'b' }]);
-      expect(getResponseText(result)).toBe('ab');
+    it("should return concatenated text from first candidate", () => {
+      const result = mockResponse([{ text: "a" }, { text: "b" }]);
+      expect(getResponseText(result)).toBe("ab");
     });
 
-    it('should ignore parts without text', () => {
-      const result = mockResponse([{ functionCall: {} }, { text: 'hello' }]);
-      expect(getResponseText(result)).toBe('hello');
+    it("should ignore parts without text", () => {
+      const result = mockResponse([{ functionCall: {} }, { text: "hello" }]);
+      expect(getResponseText(result)).toBe("hello");
     });
 
-    it('should return null when candidate has no parts', () => {
+    it("should return null when candidate has no parts", () => {
       const result = mockResponse([]);
       expect(getResponseText(result)).toBeNull();
     });
 
-    it('should return null if the first candidate has no content property', () => {
+    it("should return null if the first candidate has no content property", () => {
       const response: GenerateContentResponse = {
         candidates: [
           {
@@ -186,116 +178,105 @@ describe('partUtils', () => {
     });
   });
 
-  describe('flatMapTextParts', () => {
+  describe("flatMapTextParts", () => {
     // A simple async transform function that splits a string into character parts.
     const splitCharsTransform = async (text: string): Promise<PartUnion[]> =>
-      text.split('').map((char) => ({ text: char }));
+      text.split("").map((char) => ({ text: char }));
 
-    it('should return an empty array for empty input', async () => {
+    it("should return an empty array for empty input", async () => {
       const result = await flatMapTextParts([], splitCharsTransform);
       expect(result).toEqual([]);
     });
 
-    it('should transform a simple string input', async () => {
-      const result = await flatMapTextParts('hi', splitCharsTransform);
-      expect(result).toEqual([{ text: 'h' }, { text: 'i' }]);
+    it("should transform a simple string input", async () => {
+      const result = await flatMapTextParts("hi", splitCharsTransform);
+      expect(result).toEqual([{ text: "h" }, { text: "i" }]);
     });
 
-    it('should transform a single text part object', async () => {
-      const result = await flatMapTextParts(
-        { text: 'cat' },
-        splitCharsTransform,
-      );
-      expect(result).toEqual([{ text: 'c' }, { text: 'a' }, { text: 't' }]);
+    it("should transform a single text part object", async () => {
+      const result = await flatMapTextParts({ text: "cat" }, splitCharsTransform);
+      expect(result).toEqual([{ text: "c" }, { text: "a" }, { text: "t" }]);
     });
 
-    it('should transform an array of text parts and flatten the result', async () => {
+    it("should transform an array of text parts and flatten the result", async () => {
       // A transform that duplicates the text to test the "flatMap" behavior.
       const duplicateTransform = async (text: string): Promise<PartUnion[]> => [
         { text: `${text}` },
         { text: `${text}` },
       ];
-      const parts = [{ text: 'a' }, { text: 'b' }];
+      const parts = [{ text: "a" }, { text: "b" }];
       const result = await flatMapTextParts(parts, duplicateTransform);
-      expect(result).toEqual([
-        { text: 'a' },
-        { text: 'a' },
-        { text: 'b' },
-        { text: 'b' },
-      ]);
+      expect(result).toEqual([{ text: "a" }, { text: "a" }, { text: "b" }, { text: "b" }]);
     });
 
-    it('should pass through non-text parts unmodified', async () => {
-      const nonTextPart: Part = { functionCall: { name: 'do_stuff' } };
+    it("should pass through non-text parts unmodified", async () => {
+      const nonTextPart: Part = { functionCall: { name: "do_stuff" } };
       const result = await flatMapTextParts(nonTextPart, splitCharsTransform);
       expect(result).toEqual([nonTextPart]);
     });
 
-    it('should handle a mix of text and non-text parts in an array', async () => {
+    it("should handle a mix of text and non-text parts in an array", async () => {
       const nonTextPart: Part = {
-        inlineData: { mimeType: 'image/jpeg', data: '' },
+        inlineData: { mimeType: "image/jpeg", data: "" },
       };
-      const parts: PartUnion[] = [{ text: 'go' }, nonTextPart, ' stop'];
+      const parts: PartUnion[] = [{ text: "go" }, nonTextPart, " stop"];
       const result = await flatMapTextParts(parts, splitCharsTransform);
       expect(result).toEqual([
-        { text: 'g' },
-        { text: 'o' },
+        { text: "g" },
+        { text: "o" },
         nonTextPart, // Should be passed through
-        { text: ' ' },
-        { text: 's' },
-        { text: 't' },
-        { text: 'o' },
-        { text: 'p' },
+        { text: " " },
+        { text: "s" },
+        { text: "t" },
+        { text: "o" },
+        { text: "p" },
       ]);
     });
 
-    it('should handle a transform that returns an empty array', async () => {
+    it("should handle a transform that returns an empty array", async () => {
       const removeTransform = async (_text: string): Promise<PartUnion[]> => [];
-      const parts: PartUnion[] = [
-        { text: 'remove' },
-        { functionCall: { name: 'keep' } },
-      ];
+      const parts: PartUnion[] = [{ text: "remove" }, { functionCall: { name: "keep" } }];
       const result = await flatMapTextParts(parts, removeTransform);
-      expect(result).toEqual([{ functionCall: { name: 'keep' } }]);
+      expect(result).toEqual([{ functionCall: { name: "keep" } }]);
     });
   });
 
-  describe('appendToLastTextPart', () => {
-    it('should append to an empty prompt', () => {
+  describe("appendToLastTextPart", () => {
+    it("should append to an empty prompt", () => {
       const prompt: PartUnion[] = [];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual([{ text: 'new text' }]);
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual([{ text: "new text" }]);
     });
 
-    it('should append to a prompt with a string as the last part', () => {
-      const prompt: PartUnion[] = ['first part'];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual(['first part\n\nnew text']);
+    it("should append to a prompt with a string as the last part", () => {
+      const prompt: PartUnion[] = ["first part"];
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual(["first part\n\nnew text"]);
     });
 
-    it('should append to a prompt with a text part object as the last part', () => {
-      const prompt: PartUnion[] = [{ text: 'first part' }];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual([{ text: 'first part\n\nnew text' }]);
+    it("should append to a prompt with a text part object as the last part", () => {
+      const prompt: PartUnion[] = [{ text: "first part" }];
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual([{ text: "first part\n\nnew text" }]);
     });
 
-    it('should append a new text part if the last part is not a text part', () => {
-      const nonTextPart: Part = { functionCall: { name: 'do_stuff' } };
+    it("should append a new text part if the last part is not a text part", () => {
+      const nonTextPart: Part = { functionCall: { name: "do_stuff" } };
       const prompt: PartUnion[] = [nonTextPart];
-      const result = appendToLastTextPart(prompt, 'new text');
-      expect(result).toEqual([nonTextPart, { text: '\n\nnew text' }]);
+      const result = appendToLastTextPart(prompt, "new text");
+      expect(result).toEqual([nonTextPart, { text: "\n\nnew text" }]);
     });
 
-    it('should not append anything if the text to append is empty', () => {
-      const prompt: PartUnion[] = ['first part'];
-      const result = appendToLastTextPart(prompt, '');
-      expect(result).toEqual(['first part']);
+    it("should not append anything if the text to append is empty", () => {
+      const prompt: PartUnion[] = ["first part"];
+      const result = appendToLastTextPart(prompt, "");
+      expect(result).toEqual(["first part"]);
     });
 
-    it('should use a custom separator', () => {
-      const prompt: PartUnion[] = ['first part'];
-      const result = appendToLastTextPart(prompt, 'new text', '---');
-      expect(result).toEqual(['first part---new text']);
+    it("should use a custom separator", () => {
+      const prompt: PartUnion[] = ["first part"];
+      const result = appendToLastTextPart(prompt, "new text", "---");
+      expect(result).toEqual(["first part---new text"]);
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/partUtils.ts b/packages/gemini-core/src/utils/partUtils.ts
index f5195c11c..c9216e313 100644
--- a/packages/gemini-core/src/utils/partUtils.ts
+++ b/packages/gemini-core/src/utils/partUtils.ts
@@ -4,29 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  GenerateContentResponse,
-  PartListUnion,
-  Part,
-  PartUnion,
-} from '@google/genai';
+import type { GenerateContentResponse, Part, PartListUnion, PartUnion } from "@google/genai";
 
 /**
  * Converts a PartListUnion into a string.
  * If verbose is true, includes summary representations of non-text parts.
  */
-export function partToString(
-  value: PartListUnion,
-  options?: { verbose?: boolean },
-): string {
+export function partToString(value: PartListUnion, options?: { verbose?: boolean }): string {
   if (!value) {
-    return '';
+    return "";
   }
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     return value;
   }
   if (Array.isArray(value)) {
-    return value.map((part) => partToString(part, options)).join('');
+    return value.map((part) => partToString(part, options)).join("");
   }
 
   // Cast to Part, assuming it might contain project-specific fields
@@ -66,24 +58,18 @@ export function partToString(
     }
   }
 
-  return part.text ?? '';
+  return part.text ?? "";
 }
 
-export function getResponseText(
-  response: GenerateContentResponse,
-): string | null {
+export function getResponseText(response: GenerateContentResponse): string | null {
   if (response.candidates && response.candidates.length > 0) {
     const candidate = response.candidates[0];
 
-    if (
-      candidate.content &&
-      candidate.content.parts &&
-      candidate.content.parts.length > 0
-    ) {
+    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
       return candidate.content.parts
         .filter((part) => part.text)
         .map((part) => part.text)
-        .join('');
+        .join("");
     }
   }
   return null;
@@ -106,15 +92,15 @@ export async function flatMapTextParts(
   const result: PartUnion[] = [];
   const partArray = Array.isArray(parts)
     ? parts
-    : typeof parts === 'string'
+    : typeof parts === "string"
       ? [{ text: parts }]
       : [parts];
 
   for (const part of partArray) {
     let textToProcess: string | undefined;
-    if (typeof part === 'string') {
+    if (typeof part === "string") {
       textToProcess = part;
-    } else if ('text' in part) {
+    } else if ("text" in part) {
       textToProcess = part.text;
     }
 
@@ -141,7 +127,7 @@ export async function flatMapTextParts(
 export function appendToLastTextPart(
   prompt: PartUnion[],
   textToAppend: string,
-  separator = '\n\n',
+  separator = "\n\n",
 ): PartUnion[] {
   if (!textToAppend) {
     return prompt;
@@ -154,9 +140,9 @@ export function appendToLastTextPart(
   const newPrompt = [...prompt];
   const lastPart = newPrompt.at(-1);
 
-  if (typeof lastPart === 'string') {
+  if (typeof lastPart === "string") {
     newPrompt[newPrompt.length - 1] = `${lastPart}${separator}${textToAppend}`;
-  } else if (lastPart && 'text' in lastPart) {
+  } else if (lastPart && "text" in lastPart) {
     newPrompt[newPrompt.length - 1] = {
       ...lastPart,
       text: `${lastPart.text}${separator}${textToAppend}`,
diff --git a/packages/gemini-core/src/utils/pathCorrector.test.ts b/packages/gemini-core/src/utils/pathCorrector.test.ts
index 351618369..227daa5f2 100644
--- a/packages/gemini-core/src/utils/pathCorrector.test.ts
+++ b/packages/gemini-core/src/utils/pathCorrector.test.ts
@@ -4,32 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import type { Config } from '../config/config.js';
-import { createMockWorkspaceContext } from '../test-utils/mockWorkspaceContext.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import { correctPath } from './pathCorrector.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { createMockWorkspaceContext } from "../test-utils/mockWorkspaceContext.js";
+import { correctPath } from "./pathCorrector.js";
 
-describe('pathCorrector', () => {
+describe("pathCorrector", () => {
   let tempDir: string;
   let rootDir: string;
   let otherWorkspaceDir: string;
   let mockConfig: Config;
 
   beforeEach(() => {
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'path-corrector-test-'));
-    rootDir = path.join(tempDir, 'root');
-    otherWorkspaceDir = path.join(tempDir, 'other');
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "path-corrector-test-"));
+    rootDir = path.join(tempDir, "root");
+    otherWorkspaceDir = path.join(tempDir, "other");
     fs.mkdirSync(rootDir, { recursive: true });
     fs.mkdirSync(otherWorkspaceDir, { recursive: true });
 
     mockConfig = {
       getTargetDir: () => rootDir,
-      getWorkspaceContext: () =>
-        createMockWorkspaceContext(rootDir, [otherWorkspaceDir]),
+      getWorkspaceContext: () => createMockWorkspaceContext(rootDir, [otherWorkspaceDir]),
       getFileSystemService: () => new StandardFileSystemService(),
     } as unknown as Config;
   });
@@ -39,9 +38,9 @@ describe('pathCorrector', () => {
     vi.restoreAllMocks();
   });
 
-  it('should correct a relative path if it is unambiguous in the target dir', () => {
-    const testFile = 'unique.txt';
-    fs.writeFileSync(path.join(rootDir, testFile), 'content');
+  it("should correct a relative path if it is unambiguous in the target dir", () => {
+    const testFile = "unique.txt";
+    fs.writeFileSync(path.join(rootDir, testFile), "content");
 
     const result = correctPath(testFile, mockConfig);
 
@@ -51,12 +50,12 @@ describe('pathCorrector', () => {
     }
   });
 
-  it('should correct a partial relative path if it is unambiguous in another workspace dir', () => {
-    const subDir = path.join(otherWorkspaceDir, 'sub');
+  it("should correct a partial relative path if it is unambiguous in another workspace dir", () => {
+    const subDir = path.join(otherWorkspaceDir, "sub");
     fs.mkdirSync(subDir);
-    const testFile = 'file.txt';
+    const testFile = "file.txt";
     const fullPath = path.join(subDir, testFile);
-    fs.writeFileSync(fullPath, 'content');
+    fs.writeFileSync(fullPath, "content");
 
     const result = correctPath(testFile, mockConfig);
 
@@ -66,26 +65,26 @@ describe('pathCorrector', () => {
     }
   });
 
-  it('should return an error for a relative path that does not exist', () => {
-    const result = correctPath('nonexistent.txt', mockConfig);
+  it("should return an error for a relative path that does not exist", () => {
+    const result = correctPath("nonexistent.txt", mockConfig);
     expect(result.success).toBe(false);
     if (!result.success) {
       expect(result.error).toMatch(
         /File not found for 'nonexistent.txt' and path is not absolute./,
       );
     } else {
-      expect.fail('Expected path correction to fail.');
+      expect.fail("Expected path correction to fail.");
     }
   });
 
-  it('should return an error for an ambiguous path', () => {
-    const ambiguousFile = 'component.ts';
-    const subDir1 = path.join(rootDir, 'module1');
-    const subDir2 = path.join(otherWorkspaceDir, 'module2');
+  it("should return an error for an ambiguous path", () => {
+    const ambiguousFile = "component.ts";
+    const subDir1 = path.join(rootDir, "module1");
+    const subDir2 = path.join(otherWorkspaceDir, "module2");
     fs.mkdirSync(subDir1, { recursive: true });
     fs.mkdirSync(subDir2, { recursive: true });
-    fs.writeFileSync(path.join(subDir1, ambiguousFile), 'content 1');
-    fs.writeFileSync(path.join(subDir2, ambiguousFile), 'content 2');
+    fs.writeFileSync(path.join(subDir1, ambiguousFile), "content 1");
+    fs.writeFileSync(path.join(subDir2, ambiguousFile), "content 2");
 
     const result = correctPath(ambiguousFile, mockConfig);
 
@@ -95,7 +94,7 @@ describe('pathCorrector', () => {
         /The file path 'component.ts' is ambiguous and matches multiple files./,
       );
     } else {
-      expect.fail('Expected path correction to fail.');
+      expect.fail("Expected path correction to fail.");
     }
   });
 });
diff --git a/packages/gemini-core/src/utils/pathCorrector.ts b/packages/gemini-core/src/utils/pathCorrector.ts
index 94576c43e..28af63d44 100644
--- a/packages/gemini-core/src/utils/pathCorrector.ts
+++ b/packages/gemini-core/src/utils/pathCorrector.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import type { Config } from '../config/config.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { Config } from "../config/config.js";
 
 type SuccessfulPathCorrection = {
   success: true;
@@ -26,13 +26,8 @@ type FailedPathCorrection = {
  * @param config The application configuration.
  * @returns A `PathCorrectionResult` object with either a `correctedPath` or an `error`.
  */
-export type PathCorrectionResult =
-  | SuccessfulPathCorrection
-  | FailedPathCorrection;
-export function correctPath(
-  filePath: string,
-  config: Config,
-): PathCorrectionResult {
+export type PathCorrectionResult = SuccessfulPathCorrection | FailedPathCorrection;
+export function correctPath(filePath: string, config: Config): PathCorrectionResult {
   // Check for direct path relative to the primary target directory.
   const directPath = path.join(config.getTargetDir(), filePath);
   if (fs.existsSync(directPath)) {
@@ -55,7 +50,7 @@ export function correctPath(
   if (foundFiles.length > 1) {
     return {
       success: false,
-      error: `The file path '${filePath}' is ambiguous and matches multiple files. Please provide a more specific path. Matches: ${foundFiles.join(', ')}`,
+      error: `The file path '${filePath}' is ambiguous and matches multiple files. Please provide a more specific path. Matches: ${foundFiles.join(", ")}`,
     };
   }
 
diff --git a/packages/gemini-core/src/utils/pathReader.test.ts b/packages/gemini-core/src/utils/pathReader.test.ts
index 0aa4e308e..be59fefc2 100644
--- a/packages/gemini-core/src/utils/pathReader.test.ts
+++ b/packages/gemini-core/src/utils/pathReader.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, afterEach, vi } from 'vitest';
-import mock from 'mock-fs';
-import * as path from 'node:path';
-import { WorkspaceContext } from './workspaceContext.js';
-import { readPathFromWorkspace } from './pathReader.js';
-import type { Config } from '../config/config.js';
-import { StandardFileSystemService } from '../services/fileSystemService.js';
-import type { FileDiscoveryService } from '../services/fileDiscoveryService.js';
+import * as path from "node:path";
+import mock from "mock-fs";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { FileDiscoveryService } from "../services/fileDiscoveryService.js";
+import { StandardFileSystemService } from "../services/fileSystemService.js";
+import { readPathFromWorkspace } from "./pathReader.js";
+import { WorkspaceContext } from "./workspaceContext.js";
 
 // --- Helper for creating a mock Config object ---
 // We use the actual implementations of WorkspaceContext and FileSystemService
@@ -39,113 +39,111 @@ const createMockConfig = (
   } as unknown as Config;
 };
 
-describe('readPathFromWorkspace', () => {
-  const CWD = path.resolve('/test/cwd');
-  const OTHER_DIR = path.resolve('/test/other');
-  const OUTSIDE_DIR = path.resolve('/test/outside');
+describe("readPathFromWorkspace", () => {
+  const CWD = path.resolve("/test/cwd");
+  const OTHER_DIR = path.resolve("/test/other");
+  const OUTSIDE_DIR = path.resolve("/test/outside");
 
   afterEach(() => {
     mock.restore();
     vi.resetAllMocks();
   });
 
-  it('should read a text file from the CWD', async () => {
+  it("should read a text file from the CWD", async () => {
     mock({
       [CWD]: {
-        'file.txt': 'hello from cwd',
+        "file.txt": "hello from cwd",
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('file.txt', config);
+    const result = await readPathFromWorkspace("file.txt", config);
     // Expect [string] for text content
-    expect(result).toEqual(['hello from cwd']);
+    expect(result).toEqual(["hello from cwd"]);
     expect(mockFileService.filterFiles).toHaveBeenCalled();
   });
 
-  it('should read a file from a secondary workspace directory', async () => {
+  it("should read a file from a secondary workspace directory", async () => {
     mock({
       [CWD]: {},
       [OTHER_DIR]: {
-        'file.txt': 'hello from other dir',
+        "file.txt": "hello from other dir",
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
-    const result = await readPathFromWorkspace('file.txt', config);
-    expect(result).toEqual(['hello from other dir']);
+    const result = await readPathFromWorkspace("file.txt", config);
+    expect(result).toEqual(["hello from other dir"]);
   });
 
-  it('should prioritize CWD when file exists in both CWD and secondary dir', async () => {
+  it("should prioritize CWD when file exists in both CWD and secondary dir", async () => {
     mock({
       [CWD]: {
-        'file.txt': 'hello from cwd',
+        "file.txt": "hello from cwd",
       },
       [OTHER_DIR]: {
-        'file.txt': 'hello from other dir',
+        "file.txt": "hello from other dir",
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
-    const result = await readPathFromWorkspace('file.txt', config);
-    expect(result).toEqual(['hello from cwd']);
+    const result = await readPathFromWorkspace("file.txt", config);
+    expect(result).toEqual(["hello from cwd"]);
   });
 
-  it('should read an image file and return it as inlineData (Part object)', async () => {
+  it("should read an image file and return it as inlineData (Part object)", async () => {
     // Use a real PNG header for robustness
-    const imageData = Buffer.from([
-      0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-    ]);
+    const imageData = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
     mock({
       [CWD]: {
-        'image.png': imageData,
+        "image.png": imageData,
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('image.png', config);
+    const result = await readPathFromWorkspace("image.png", config);
     // Expect [Part] for image content
     expect(result).toEqual([
       {
         inlineData: {
-          mimeType: 'image/png',
-          data: imageData.toString('base64'),
+          mimeType: "image/png",
+          data: imageData.toString("base64"),
         },
       },
     ]);
   });
 
-  it('should read a generic binary file and return an info string', async () => {
+  it("should read a generic binary file and return an info string", async () => {
     // Data that is clearly binary (null bytes)
     const binaryData = Buffer.from([0x00, 0x01, 0x02, 0x03]);
     mock({
       [CWD]: {
-        'data.bin': binaryData,
+        "data.bin": binaryData,
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('data.bin', config);
+    const result = await readPathFromWorkspace("data.bin", config);
     // Expect [string] containing the skip message from fileUtils
-    expect(result).toEqual(['Cannot display content of binary file: data.bin']);
+    expect(result).toEqual(["Cannot display content of binary file: data.bin"]);
   });
 
-  it('should read a file from an absolute path if within workspace', async () => {
-    const absPath = path.join(OTHER_DIR, 'abs.txt');
+  it("should read a file from an absolute path if within workspace", async () => {
+    const absPath = path.join(OTHER_DIR, "abs.txt");
     mock({
       [CWD]: {},
       [OTHER_DIR]: {
-        'abs.txt': 'absolute content',
+        "abs.txt": "absolute content",
       },
     });
     const mockFileService = {
@@ -153,16 +151,16 @@ describe('readPathFromWorkspace', () => {
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [OTHER_DIR], mockFileService);
     const result = await readPathFromWorkspace(absPath, config);
-    expect(result).toEqual(['absolute content']);
+    expect(result).toEqual(["absolute content"]);
   });
 
-  describe('Directory Expansion', () => {
-    it('should expand a directory and read the content of its files', async () => {
+  describe("Directory Expansion", () => {
+    it("should expand a directory and read the content of its files", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'file1.txt': 'content of file 1',
-            'file2.md': 'content of file 2',
+          "my-dir": {
+            "file1.txt": "content of file 1",
+            "file2.md": "content of file 2",
           },
         },
       });
@@ -170,38 +168,34 @@ describe('readPathFromWorkspace', () => {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('my-dir', config);
+      const result = await readPathFromWorkspace("my-dir", config);
 
       // Convert to a single string for easier, order-independent checking
       const resultText = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
           // This part is important for handling binary/image data which isn't just text
-          if (typeof p === 'object' && p && 'inlineData' in p) return '';
+          if (typeof p === "object" && p && "inlineData" in p) return "";
           return p;
         })
-        .join('');
+        .join("");
 
-      expect(resultText).toContain(
-        '--- Start of content for directory: my-dir ---',
-      );
-      expect(resultText).toContain('--- file1.txt ---');
-      expect(resultText).toContain('content of file 1');
-      expect(resultText).toContain('--- file2.md ---');
-      expect(resultText).toContain('content of file 2');
-      expect(resultText).toContain(
-        '--- End of content for directory: my-dir ---',
-      );
+      expect(resultText).toContain("--- Start of content for directory: my-dir ---");
+      expect(resultText).toContain("--- file1.txt ---");
+      expect(resultText).toContain("content of file 1");
+      expect(resultText).toContain("--- file2.md ---");
+      expect(resultText).toContain("content of file 2");
+      expect(resultText).toContain("--- End of content for directory: my-dir ---");
     });
 
-    it('should recursively expand a directory and read all nested files', async () => {
+    it("should recursively expand a directory and read all nested files", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'file1.txt': 'content of file 1',
-            'sub-dir': {
-              'nested.txt': 'nested content',
+          "my-dir": {
+            "file1.txt": "content of file 1",
+            "sub-dir": {
+              "nested.txt": "nested content",
             },
           },
         },
@@ -210,36 +204,32 @@ describe('readPathFromWorkspace', () => {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('my-dir', config);
+      const result = await readPathFromWorkspace("my-dir", config);
 
       const resultText = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
-          return '';
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
+          return "";
         })
-        .join('');
+        .join("");
 
-      expect(resultText).toContain('content of file 1');
-      expect(resultText).toContain('nested content');
-      expect(resultText).toContain(
-        `--- ${path.join('sub-dir', 'nested.txt')} ---`,
-      );
+      expect(resultText).toContain("content of file 1");
+      expect(resultText).toContain("nested content");
+      expect(resultText).toContain(`--- ${path.join("sub-dir", "nested.txt")} ---`);
     });
 
-    it('should handle mixed content and include files from subdirectories', async () => {
-      const imageData = Buffer.from([
-        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a,
-      ]);
+    it("should handle mixed content and include files from subdirectories", async () => {
+      const imageData = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
       mock({
         [CWD]: {
-          'mixed-dir': {
-            'info.txt': 'some text',
-            'photo.png': imageData,
-            'sub-dir': {
-              'nested.txt': 'this should be included',
+          "mixed-dir": {
+            "info.txt": "some text",
+            "photo.png": imageData,
+            "sub-dir": {
+              "nested.txt": "this should be included",
             },
-            'empty-sub-dir': {},
+            "empty-sub-dir": {},
           },
         },
       });
@@ -247,104 +237,97 @@ describe('readPathFromWorkspace', () => {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('mixed-dir', config);
+      const result = await readPathFromWorkspace("mixed-dir", config);
 
       // Check for the text part
       const textContent = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
-          return ''; // Ignore non-text parts for this assertion
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
+          return ""; // Ignore non-text parts for this assertion
         })
-        .join('');
-      expect(textContent).toContain('some text');
-      expect(textContent).toContain('this should be included');
+        .join("");
+      expect(textContent).toContain("some text");
+      expect(textContent).toContain("this should be included");
 
       // Check for the image part
-      const imagePart = result.find(
-        (p) => typeof p === 'object' && 'inlineData' in p,
-      );
+      const imagePart = result.find((p) => typeof p === "object" && "inlineData" in p);
       expect(imagePart).toEqual({
         inlineData: {
-          mimeType: 'image/png',
-          data: imageData.toString('base64'),
+          mimeType: "image/png",
+          data: imageData.toString("base64"),
         },
       });
     });
 
-    it('should handle an empty directory', async () => {
+    it("should handle an empty directory", async () => {
       mock({
         [CWD]: {
-          'empty-dir': {},
+          "empty-dir": {},
         },
       });
       const mockFileService = {
         filterFiles: vi.fn((files) => files),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('empty-dir', config);
+      const result = await readPathFromWorkspace("empty-dir", config);
       expect(result).toEqual([
-        { text: '--- Start of content for directory: empty-dir ---\n' },
-        { text: '--- End of content for directory: empty-dir ---' },
+        { text: "--- Start of content for directory: empty-dir ---\n" },
+        { text: "--- End of content for directory: empty-dir ---" },
       ]);
     });
   });
 
-  describe('File Ignoring', () => {
-    it('should return an empty array for an ignored file', async () => {
+  describe("File Ignoring", () => {
+    it("should return an empty array for an ignored file", async () => {
       mock({
         [CWD]: {
-          'ignored.txt': 'ignored content',
+          "ignored.txt": "ignored content",
         },
       });
       const mockFileService = {
         filterFiles: vi.fn(() => []), // Simulate the file being filtered out
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('ignored.txt', config);
+      const result = await readPathFromWorkspace("ignored.txt", config);
       expect(result).toEqual([]);
-      expect(mockFileService.filterFiles).toHaveBeenCalledWith(
-        ['ignored.txt'],
-        {
-          respectGitIgnore: true,
-          respectGeminiIgnore: true,
-        },
-      );
+      expect(mockFileService.filterFiles).toHaveBeenCalledWith(["ignored.txt"], {
+        respectGitIgnore: true,
+        respectGeminiIgnore: true,
+      });
     });
 
-    it('should not read ignored files when expanding a directory', async () => {
+    it("should not read ignored files when expanding a directory", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'not-ignored.txt': 'visible',
-            'ignored.log': 'invisible',
+          "my-dir": {
+            "not-ignored.txt": "visible",
+            "ignored.log": "invisible",
           },
         },
       });
       const mockFileService = {
-        filterFiles: vi.fn((files: string[]) =>
-          files.filter((f) => !f.endsWith('ignored.log')),
-        ),
+        filterFiles: vi.fn((files: string[]) => files.filter((f) => !f.endsWith("ignored.log"))),
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
-      const result = await readPathFromWorkspace('my-dir', config);
+      const result = await readPathFromWorkspace("my-dir", config);
       const resultText = result
         .map((p) => {
-          if (typeof p === 'string') return p;
-          if (typeof p === 'object' && p && 'text' in p) return p.text;
-          return '';
+          if (typeof p === "string") return p;
+          if (typeof p === "object" && p && "text" in p) return p.text;
+          return "";
         })
-        .join('');
+        .join("");
 
-      expect(resultText).toContain('visible');
-      expect(resultText).not.toContain('invisible');
+      expect(resultText).toContain("visible");
+      expect(resultText).not.toContain("invisible");
       expect(mockFileService.filterFiles).toHaveBeenCalled();
     });
 
-    it('should pass correct ignore flags to file service for a single file', async () => {
+    it("should pass correct ignore flags to file service for a single file", async () => {
       mock({
         [CWD]: {
-          'file.txt': 'content',
+          "file.txt": "content",
         },
       });
       const mockFileService = {
@@ -354,18 +337,18 @@ describe('readPathFromWorkspace', () => {
         respectGitIgnore: false,
         respectGeminiIgnore: true,
       });
-      await readPathFromWorkspace('file.txt', config);
-      expect(mockFileService.filterFiles).toHaveBeenCalledWith(['file.txt'], {
+      await readPathFromWorkspace("file.txt", config);
+      expect(mockFileService.filterFiles).toHaveBeenCalledWith(["file.txt"], {
         respectGitIgnore: false,
         respectGeminiIgnore: true,
       });
     });
 
-    it('should pass correct ignore flags to file service for a directory', async () => {
+    it("should pass correct ignore flags to file service for a directory", async () => {
       mock({
         [CWD]: {
-          'my-dir': {
-            'file.txt': 'content',
+          "my-dir": {
+            "file.txt": "content",
           },
         },
       });
@@ -376,23 +359,20 @@ describe('readPathFromWorkspace', () => {
         respectGitIgnore: true,
         respectGeminiIgnore: false,
       });
-      await readPathFromWorkspace('my-dir', config);
-      expect(mockFileService.filterFiles).toHaveBeenCalledWith(
-        [path.join('my-dir', 'file.txt')],
-        {
-          respectGitIgnore: true,
-          respectGeminiIgnore: false,
-        },
-      );
+      await readPathFromWorkspace("my-dir", config);
+      expect(mockFileService.filterFiles).toHaveBeenCalledWith([path.join("my-dir", "file.txt")], {
+        respectGitIgnore: true,
+        respectGeminiIgnore: false,
+      });
     });
   });
 
-  it('should throw an error for an absolute path outside the workspace', async () => {
-    const absPath = path.join(OUTSIDE_DIR, 'secret.txt');
+  it("should throw an error for an absolute path outside the workspace", async () => {
+    const absPath = path.join(OUTSIDE_DIR, "secret.txt");
     mock({
       [CWD]: {},
       [OUTSIDE_DIR]: {
-        'secret.txt': 'secrets',
+        "secret.txt": "secrets",
       },
     });
     // OUTSIDE_DIR is not added to the config's workspace
@@ -402,25 +382,25 @@ describe('readPathFromWorkspace', () => {
     );
   });
 
-  it('should throw an error if a relative path is not found anywhere', async () => {
+  it("should throw an error if a relative path is not found anywhere", async () => {
     mock({
       [CWD]: {},
       [OTHER_DIR]: {},
     });
     const config = createMockConfig(CWD, [OTHER_DIR]);
-    await expect(
-      readPathFromWorkspace('not-found.txt', config),
-    ).rejects.toThrow('Path not found in workspace: not-found.txt');
+    await expect(readPathFromWorkspace("not-found.txt", config)).rejects.toThrow(
+      "Path not found in workspace: not-found.txt",
+    );
   });
 
   // mock-fs permission simulation is unreliable on Windows.
-  it.skipIf(process.platform === 'win32')(
-    'should return an error string if reading a file with no permissions',
+  it.skipIf(process.platform === "win32")(
+    "should return an error string if reading a file with no permissions",
     async () => {
       mock({
         [CWD]: {
-          'unreadable.txt': mock.file({
-            content: 'you cannot read me',
+          "unreadable.txt": mock.file({
+            content: "you cannot read me",
             mode: 0o222, // Write-only
           }),
         },
@@ -430,30 +410,30 @@ describe('readPathFromWorkspace', () => {
       } as unknown as FileDiscoveryService;
       const config = createMockConfig(CWD, [], mockFileService);
       // processSingleFileContent catches the error and returns an error string.
-      const result = await readPathFromWorkspace('unreadable.txt', config);
+      const result = await readPathFromWorkspace("unreadable.txt", config);
       const textResult = result[0] as string;
 
       // processSingleFileContent formats errors using the relative path from the target dir (CWD).
-      expect(textResult).toContain('Error reading file unreadable.txt');
+      expect(textResult).toContain("Error reading file unreadable.txt");
       expect(textResult).toMatch(/(EACCES|permission denied)/i);
     },
   );
 
-  it('should return an error string for files exceeding the size limit', async () => {
+  it("should return an error string for files exceeding the size limit", async () => {
     // Mock a file slightly larger than the 20MB limit defined in fileUtils.ts
-    const largeContent = 'a'.repeat(21 * 1024 * 1024); // 21MB
+    const largeContent = "a".repeat(21 * 1024 * 1024); // 21MB
     mock({
       [CWD]: {
-        'large.txt': largeContent,
+        "large.txt": largeContent,
       },
     });
     const mockFileService = {
       filterFiles: vi.fn((files) => files),
     } as unknown as FileDiscoveryService;
     const config = createMockConfig(CWD, [], mockFileService);
-    const result = await readPathFromWorkspace('large.txt', config);
+    const result = await readPathFromWorkspace("large.txt", config);
     const textResult = result[0] as string;
     // The error message comes directly from processSingleFileContent
-    expect(textResult).toBe('File size exceeds the 20MB limit.');
+    expect(textResult).toBe("File size exceeds the 20MB limit.");
   });
 });
diff --git a/packages/gemini-core/src/utils/pathReader.ts b/packages/gemini-core/src/utils/pathReader.ts
index 486ce2a82..ec697a8e9 100644
--- a/packages/gemini-core/src/utils/pathReader.ts
+++ b/packages/gemini-core/src/utils/pathReader.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { glob } from 'glob';
-import type { PartUnion } from '@google/genai';
-import { processSingleFileContent } from './fileUtils.js';
-import type { Config } from '../config/config.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import type { PartUnion } from "@google/genai";
+import { glob } from "glob";
+import type { Config } from "../config/config.js";
+import { processSingleFileContent } from "./fileUtils.js";
 
 /**
  * Reads the content of a file or recursively expands a directory from
@@ -20,19 +20,14 @@ import type { Config } from '../config/config.js';
  * @returns A promise that resolves to an array of PartUnion (string | Part).
  * @throws An error if the path is not found or is outside the workspace.
  */
-export async function readPathFromWorkspace(
-  pathStr: string,
-  config: Config,
-): Promise<PartUnion[]> {
+export async function readPathFromWorkspace(pathStr: string, config: Config): Promise<PartUnion[]> {
   const workspace = config.getWorkspaceContext();
   const fileService = config.getFileService();
   let absolutePath: string | null = null;
 
   if (path.isAbsolute(pathStr)) {
     if (!workspace.isPathWithinWorkspace(pathStr)) {
-      throw new Error(
-        `Absolute path is outside of the allowed workspace: ${pathStr}`,
-      );
+      throw new Error(`Absolute path is outside of the allowed workspace: ${pathStr}`);
     }
     absolutePath = pathStr;
   } else {
@@ -62,23 +57,19 @@ export async function readPathFromWorkspace(
     });
 
     // Use glob to recursively find all files within the directory.
-    const files = await glob('**/*', {
+    const files = await glob("**/*", {
       cwd: absolutePath,
       nodir: true, // We only want files
       dot: true, // Include dotfiles
       absolute: true,
     });
 
-    const relativeFiles = files.map((p) =>
-      path.relative(config.getTargetDir(), p),
-    );
+    const relativeFiles = files.map((p) => path.relative(config.getTargetDir(), p));
     const filteredFiles = fileService.filterFiles(relativeFiles, {
       respectGitIgnore: config.getFileFilteringRespectGitIgnore(),
       respectGeminiIgnore: config.getFileFilteringRespectGeminiIgnore(),
     });
-    const finalFiles = filteredFiles.map((p) =>
-      path.resolve(config.getTargetDir(), p),
-    );
+    const finalFiles = filteredFiles.map((p) => path.resolve(config.getTargetDir(), p));
 
     for (const filePath of finalFiles) {
       const relativePathForDisplay = path.relative(absolutePath, filePath);
@@ -89,7 +80,7 @@ export async function readPathFromWorkspace(
         config.getFileSystemService(),
       );
       allParts.push(result.llmContent);
-      allParts.push({ text: '\n' }); // Add a newline for separation
+      allParts.push({ text: "\n" }); // Add a newline for separation
     }
 
     allParts.push({ text: `--- End of content for directory: ${pathStr} ---` });
diff --git a/packages/gemini-core/src/utils/paths.test.ts b/packages/gemini-core/src/utils/paths.test.ts
index 210dc8b44..10a1fa0d0 100644
--- a/packages/gemini-core/src/utils/paths.test.ts
+++ b/packages/gemini-core/src/utils/paths.test.ts
@@ -4,132 +4,122 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
-import { escapePath, unescapePath, isSubpath, shortenPath } from './paths.js';
+import { afterAll, beforeAll, describe, expect, it } from "vitest";
+import { escapePath, isSubpath, shortenPath, unescapePath } from "./paths.js";
 
-describe('escapePath', () => {
+describe("escapePath", () => {
   it.each([
-    ['spaces', 'my file.txt', 'my\\ file.txt'],
-    ['tabs', 'file\twith\ttabs.txt', 'file\\\twith\\\ttabs.txt'],
-    ['parentheses', 'file(1).txt', 'file\\(1\\).txt'],
-    ['square brackets', 'file[backup].txt', 'file\\[backup\\].txt'],
-    ['curly braces', 'file{temp}.txt', 'file\\{temp\\}.txt'],
-    ['semicolons', 'file;name.txt', 'file\\;name.txt'],
-    ['ampersands', 'file&name.txt', 'file\\&name.txt'],
-    ['pipes', 'file|name.txt', 'file\\|name.txt'],
-    ['asterisks', 'file*.txt', 'file\\*.txt'],
-    ['question marks', 'file?.txt', 'file\\?.txt'],
-    ['dollar signs', 'file$name.txt', 'file\\$name.txt'],
-    ['backticks', 'file`name.txt', 'file\\`name.txt'],
-    ['single quotes', "file'name.txt", "file\\'name.txt"],
-    ['double quotes', 'file"name.txt', 'file\\"name.txt'],
-    ['hash symbols', 'file#name.txt', 'file\\#name.txt'],
-    ['exclamation marks', 'file!name.txt', 'file\\!name.txt'],
-    ['tildes', 'file~name.txt', 'file\\~name.txt'],
-    [
-      'less than and greater than signs',
-      'file<name>.txt',
-      'file\\<name\\>.txt',
-    ],
-  ])('should escape %s', (_, input, expected) => {
+    ["spaces", "my file.txt", "my\\ file.txt"],
+    ["tabs", "file\twith\ttabs.txt", "file\\\twith\\\ttabs.txt"],
+    ["parentheses", "file(1).txt", "file\\(1\\).txt"],
+    ["square brackets", "file[backup].txt", "file\\[backup\\].txt"],
+    ["curly braces", "file{temp}.txt", "file\\{temp\\}.txt"],
+    ["semicolons", "file;name.txt", "file\\;name.txt"],
+    ["ampersands", "file&name.txt", "file\\&name.txt"],
+    ["pipes", "file|name.txt", "file\\|name.txt"],
+    ["asterisks", "file*.txt", "file\\*.txt"],
+    ["question marks", "file?.txt", "file\\?.txt"],
+    ["dollar signs", "file$name.txt", "file\\$name.txt"],
+    ["backticks", "file`name.txt", "file\\`name.txt"],
+    ["single quotes", "file'name.txt", "file\\'name.txt"],
+    ["double quotes", 'file"name.txt', 'file\\"name.txt'],
+    ["hash symbols", "file#name.txt", "file\\#name.txt"],
+    ["exclamation marks", "file!name.txt", "file\\!name.txt"],
+    ["tildes", "file~name.txt", "file\\~name.txt"],
+    ["less than and greater than signs", "file<name>.txt", "file\\<name\\>.txt"],
+  ])("should escape %s", (_, input, expected) => {
     expect(escapePath(input)).toBe(expected);
   });
 
-  it('should handle multiple special characters', () => {
-    expect(escapePath('my file (backup) [v1.2].txt')).toBe(
-      'my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt',
+  it("should handle multiple special characters", () => {
+    expect(escapePath("my file (backup) [v1.2].txt")).toBe(
+      "my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt",
     );
   });
 
-  it('should not double-escape already escaped characters', () => {
-    expect(escapePath('my\\ file.txt')).toBe('my\\ file.txt');
-    expect(escapePath('file\\(name\\).txt')).toBe('file\\(name\\).txt');
+  it("should not double-escape already escaped characters", () => {
+    expect(escapePath("my\\ file.txt")).toBe("my\\ file.txt");
+    expect(escapePath("file\\(name\\).txt")).toBe("file\\(name\\).txt");
   });
 
-  it('should handle escaped backslashes correctly', () => {
+  it("should handle escaped backslashes correctly", () => {
     // Double backslash (escaped backslash) followed by space should escape the space
-    expect(escapePath('path\\\\ file.txt')).toBe('path\\\\\\ file.txt');
+    expect(escapePath("path\\\\ file.txt")).toBe("path\\\\\\ file.txt");
     // Triple backslash (escaped backslash + escaping backslash) followed by space should not double-escape
-    expect(escapePath('path\\\\\\ file.txt')).toBe('path\\\\\\ file.txt');
+    expect(escapePath("path\\\\\\ file.txt")).toBe("path\\\\\\ file.txt");
     // Quadruple backslash (two escaped backslashes) followed by space should escape the space
-    expect(escapePath('path\\\\\\\\ file.txt')).toBe('path\\\\\\\\\\ file.txt');
+    expect(escapePath("path\\\\\\\\ file.txt")).toBe("path\\\\\\\\\\ file.txt");
   });
 
-  it('should handle complex escaped backslash scenarios', () => {
+  it("should handle complex escaped backslash scenarios", () => {
     // Escaped backslash before special character that needs escaping
-    expect(escapePath('file\\\\(test).txt')).toBe('file\\\\\\(test\\).txt');
+    expect(escapePath("file\\\\(test).txt")).toBe("file\\\\\\(test\\).txt");
     // Multiple escaped backslashes
-    expect(escapePath('path\\\\\\\\with space.txt')).toBe(
-      'path\\\\\\\\with\\ space.txt',
-    );
+    expect(escapePath("path\\\\\\\\with space.txt")).toBe("path\\\\\\\\with\\ space.txt");
   });
 
-  it('should handle paths without special characters', () => {
-    expect(escapePath('normalfile.txt')).toBe('normalfile.txt');
-    expect(escapePath('path/to/normalfile.txt')).toBe('path/to/normalfile.txt');
+  it("should handle paths without special characters", () => {
+    expect(escapePath("normalfile.txt")).toBe("normalfile.txt");
+    expect(escapePath("path/to/normalfile.txt")).toBe("path/to/normalfile.txt");
   });
 
-  it('should handle complex real-world examples', () => {
-    expect(escapePath('My Documents/Project (2024)/file [backup].txt')).toBe(
-      'My\\ Documents/Project\\ \\(2024\\)/file\\ \\[backup\\].txt',
+  it("should handle complex real-world examples", () => {
+    expect(escapePath("My Documents/Project (2024)/file [backup].txt")).toBe(
+      "My\\ Documents/Project\\ \\(2024\\)/file\\ \\[backup\\].txt",
     );
-    expect(escapePath('file with $special &chars!.txt')).toBe(
-      'file\\ with\\ \\$special\\ \\&chars\\!.txt',
+    expect(escapePath("file with $special &chars!.txt")).toBe(
+      "file\\ with\\ \\$special\\ \\&chars\\!.txt",
     );
   });
 
-  it('should handle empty strings', () => {
-    expect(escapePath('')).toBe('');
+  it("should handle empty strings", () => {
+    expect(escapePath("")).toBe("");
   });
 
-  it('should handle paths with only special characters', () => {
-    expect(escapePath(' ()[]{};&|*?$`\'"#!~<>')).toBe(
-      '\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\\'\\"\\#\\!\\~\\<\\>',
+  it("should handle paths with only special characters", () => {
+    expect(escapePath(" ()[]{};&|*?$`'\"#!~<>")).toBe(
+      "\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\'\\\"\\#\\!\\~\\<\\>",
     );
   });
 });
 
-describe('unescapePath', () => {
+describe("unescapePath", () => {
   it.each([
-    ['spaces', 'my\\ file.txt', 'my file.txt'],
-    ['tabs', 'file\\\twith\\\ttabs.txt', 'file\twith\ttabs.txt'],
-    ['parentheses', 'file\\(1\\).txt', 'file(1).txt'],
-    ['square brackets', 'file\\[backup\\].txt', 'file[backup].txt'],
-    ['curly braces', 'file\\{temp\\}.txt', 'file{temp}.txt'],
-  ])('should unescape %s', (_, input, expected) => {
+    ["spaces", "my\\ file.txt", "my file.txt"],
+    ["tabs", "file\\\twith\\\ttabs.txt", "file\twith\ttabs.txt"],
+    ["parentheses", "file\\(1\\).txt", "file(1).txt"],
+    ["square brackets", "file\\[backup\\].txt", "file[backup].txt"],
+    ["curly braces", "file\\{temp\\}.txt", "file{temp}.txt"],
+  ])("should unescape %s", (_, input, expected) => {
     expect(unescapePath(input)).toBe(expected);
   });
 
-  it('should unescape multiple special characters', () => {
-    expect(unescapePath('my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt')).toBe(
-      'my file (backup) [v1.2].txt',
+  it("should unescape multiple special characters", () => {
+    expect(unescapePath("my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt")).toBe(
+      "my file (backup) [v1.2].txt",
     );
   });
 
-  it('should handle paths without escaped characters', () => {
-    expect(unescapePath('normalfile.txt')).toBe('normalfile.txt');
-    expect(unescapePath('path/to/normalfile.txt')).toBe(
-      'path/to/normalfile.txt',
-    );
+  it("should handle paths without escaped characters", () => {
+    expect(unescapePath("normalfile.txt")).toBe("normalfile.txt");
+    expect(unescapePath("path/to/normalfile.txt")).toBe("path/to/normalfile.txt");
   });
 
-  it('should handle all special characters', () => {
-    expect(
-      unescapePath(
-        '\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\\'\\"\\#\\!\\~\\<\\>',
-      ),
-    ).toBe(' ()[]{};&|*?$`\'"#!~<>');
+  it("should handle all special characters", () => {
+    expect(unescapePath("\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\'\\\"\\#\\!\\~\\<\\>")).toBe(
+      " ()[]{};&|*?$`'\"#!~<>",
+    );
   });
 
-  it('should be the inverse of escapePath', () => {
+  it("should be the inverse of escapePath", () => {
     const testCases = [
-      'my file.txt',
-      'file(1).txt',
-      'file[backup].txt',
-      'My Documents/Project (2024)/file [backup].txt',
-      'file with $special &chars!.txt',
-      ' ()[]{};&|*?$`\'"#!~<>',
-      'file\twith\ttabs.txt',
+      "my file.txt",
+      "file(1).txt",
+      "file[backup].txt",
+      "My Documents/Project (2024)/file [backup].txt",
+      "file with $special &chars!.txt",
+      " ()[]{};&|*?$`'\"#!~<>",
+      "file\twith\ttabs.txt",
     ];
 
     testCases.forEach((testCase) => {
@@ -137,337 +127,313 @@ describe('unescapePath', () => {
     });
   });
 
-  it('should handle empty strings', () => {
-    expect(unescapePath('')).toBe('');
+  it("should handle empty strings", () => {
+    expect(unescapePath("")).toBe("");
   });
 
-  it('should not affect backslashes not followed by special characters', () => {
-    expect(unescapePath('file\\name.txt')).toBe('file\\name.txt');
-    expect(unescapePath('path\\to\\file.txt')).toBe('path\\to\\file.txt');
+  it("should not affect backslashes not followed by special characters", () => {
+    expect(unescapePath("file\\name.txt")).toBe("file\\name.txt");
+    expect(unescapePath("path\\to\\file.txt")).toBe("path\\to\\file.txt");
   });
 
-  it('should handle escaped backslashes in unescaping', () => {
+  it("should handle escaped backslashes in unescaping", () => {
     // Should correctly unescape when there are escaped backslashes
-    expect(unescapePath('path\\\\\\ file.txt')).toBe('path\\\\ file.txt');
-    expect(unescapePath('path\\\\\\\\\\ file.txt')).toBe(
-      'path\\\\\\\\ file.txt',
-    );
-    expect(unescapePath('file\\\\\\(test\\).txt')).toBe('file\\\\(test).txt');
+    expect(unescapePath("path\\\\\\ file.txt")).toBe("path\\\\ file.txt");
+    expect(unescapePath("path\\\\\\\\\\ file.txt")).toBe("path\\\\\\\\ file.txt");
+    expect(unescapePath("file\\\\\\(test\\).txt")).toBe("file\\\\(test).txt");
   });
 });
 
-describe('isSubpath', () => {
-  it('should return true for a direct subpath', () => {
-    expect(isSubpath('/a/b', '/a/b/c')).toBe(true);
+describe("isSubpath", () => {
+  it("should return true for a direct subpath", () => {
+    expect(isSubpath("/a/b", "/a/b/c")).toBe(true);
   });
 
-  it('should return true for the same path', () => {
-    expect(isSubpath('/a/b', '/a/b')).toBe(true);
+  it("should return true for the same path", () => {
+    expect(isSubpath("/a/b", "/a/b")).toBe(true);
   });
 
-  it('should return false for a parent path', () => {
-    expect(isSubpath('/a/b/c', '/a/b')).toBe(false);
+  it("should return false for a parent path", () => {
+    expect(isSubpath("/a/b/c", "/a/b")).toBe(false);
   });
 
-  it('should return false for a completely different path', () => {
-    expect(isSubpath('/a/b', '/x/y')).toBe(false);
+  it("should return false for a completely different path", () => {
+    expect(isSubpath("/a/b", "/x/y")).toBe(false);
   });
 
-  it('should handle relative paths', () => {
-    expect(isSubpath('a/b', 'a/b/c')).toBe(true);
-    expect(isSubpath('a/b', 'a/c')).toBe(false);
+  it("should handle relative paths", () => {
+    expect(isSubpath("a/b", "a/b/c")).toBe(true);
+    expect(isSubpath("a/b", "a/c")).toBe(false);
   });
 
-  it('should handle paths with ..', () => {
-    expect(isSubpath('/a/b', '/a/b/../b/c')).toBe(true);
-    expect(isSubpath('/a/b', '/a/c/../b')).toBe(true);
+  it("should handle paths with ..", () => {
+    expect(isSubpath("/a/b", "/a/b/../b/c")).toBe(true);
+    expect(isSubpath("/a/b", "/a/c/../b")).toBe(true);
   });
 
-  it('should handle root paths', () => {
-    expect(isSubpath('/', '/a')).toBe(true);
-    expect(isSubpath('/a', '/')).toBe(false);
+  it("should handle root paths", () => {
+    expect(isSubpath("/", "/a")).toBe(true);
+    expect(isSubpath("/a", "/")).toBe(false);
   });
 
-  it('should handle trailing slashes', () => {
-    expect(isSubpath('/a/b/', '/a/b/c')).toBe(true);
-    expect(isSubpath('/a/b', '/a/b/c/')).toBe(true);
-    expect(isSubpath('/a/b/', '/a/b/c/')).toBe(true);
+  it("should handle trailing slashes", () => {
+    expect(isSubpath("/a/b/", "/a/b/c")).toBe(true);
+    expect(isSubpath("/a/b", "/a/b/c/")).toBe(true);
+    expect(isSubpath("/a/b/", "/a/b/c/")).toBe(true);
   });
 });
 
-describe('isSubpath on Windows', () => {
+describe("isSubpath on Windows", () => {
   const originalPlatform = process.platform;
 
   beforeAll(() => {
-    Object.defineProperty(process, 'platform', {
-      value: 'win32',
+    Object.defineProperty(process, "platform", {
+      value: "win32",
     });
   });
 
   afterAll(() => {
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
     });
   });
 
-  it('should return true for a direct subpath on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'C:\\Users\\Test\\file.txt')).toBe(
-      true,
-    );
+  it("should return true for a direct subpath on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should return true for the same path on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'C:\\Users\\Test')).toBe(true);
+  it("should return true for the same path on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "C:\\Users\\Test")).toBe(true);
   });
 
-  it('should return false for a parent path on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test\\file.txt', 'C:\\Users\\Test')).toBe(
-      false,
-    );
+  it("should return false for a parent path on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test\\file.txt", "C:\\Users\\Test")).toBe(false);
   });
 
-  it('should return false for a different drive on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'D:\\Users\\Test')).toBe(false);
+  it("should return false for a different drive on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "D:\\Users\\Test")).toBe(false);
   });
 
-  it('should be case-insensitive for drive letters on Windows', () => {
-    expect(isSubpath('c:\\Users\\Test', 'C:\\Users\\Test\\file.txt')).toBe(
-      true,
-    );
+  it("should be case-insensitive for drive letters on Windows", () => {
+    expect(isSubpath("c:\\Users\\Test", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should be case-insensitive for path components on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test', 'c:\\users\\test\\file.txt')).toBe(
-      true,
-    );
+  it("should be case-insensitive for path components on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test", "c:\\users\\test\\file.txt")).toBe(true);
   });
 
-  it('should handle mixed slashes on Windows', () => {
-    expect(isSubpath('C:/Users/Test', 'C:\\Users\\Test\\file.txt')).toBe(true);
+  it("should handle mixed slashes on Windows", () => {
+    expect(isSubpath("C:/Users/Test", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should handle trailing slashes on Windows', () => {
-    expect(isSubpath('C:\\Users\\Test\\', 'C:\\Users\\Test\\file.txt')).toBe(
-      true,
-    );
+  it("should handle trailing slashes on Windows", () => {
+    expect(isSubpath("C:\\Users\\Test\\", "C:\\Users\\Test\\file.txt")).toBe(true);
   });
 
-  it('should handle relative paths correctly on Windows', () => {
-    expect(isSubpath('Users\\Test', 'Users\\Test\\file.txt')).toBe(true);
-    expect(isSubpath('Users\\Test\\file.txt', 'Users\\Test')).toBe(false);
+  it("should handle relative paths correctly on Windows", () => {
+    expect(isSubpath("Users\\Test", "Users\\Test\\file.txt")).toBe(true);
+    expect(isSubpath("Users\\Test\\file.txt", "Users\\Test")).toBe(false);
   });
 });
 
-describe('shortenPath', () => {
-  describe.skipIf(process.platform === 'win32')('on POSIX', () => {
-    it('should not shorten a path that is shorter than maxLen', () => {
-      const p = '/path/to/file.txt';
+describe("shortenPath", () => {
+  describe.skipIf(process.platform === "win32")("on POSIX", () => {
+    it("should not shorten a path that is shorter than maxLen", () => {
+      const p = "/path/to/file.txt";
       expect(shortenPath(p, 40)).toBe(p);
     });
 
-    it('should not shorten a path that is equal to maxLen', () => {
-      const p = '/path/to/file.txt';
+    it("should not shorten a path that is equal to maxLen", () => {
+      const p = "/path/to/file.txt";
       expect(shortenPath(p, p.length)).toBe(p);
     });
 
-    it('should shorten a long path, keeping start and end from a short limit', () => {
-      const p = '/path/to/a/very/long/directory/name/file.txt';
-      expect(shortenPath(p, 25)).toBe('/path/.../name/file.txt');
+    it("should shorten a long path, keeping start and end from a short limit", () => {
+      const p = "/path/to/a/very/long/directory/name/file.txt";
+      expect(shortenPath(p, 25)).toBe("/path/.../name/file.txt");
     });
 
-    it('should shorten a long path, keeping more from the end from a longer limit', () => {
-      const p = '/path/to/a/very/long/directory/name/file.txt';
-      expect(shortenPath(p, 35)).toBe('/path/.../directory/name/file.txt');
+    it("should shorten a long path, keeping more from the end from a longer limit", () => {
+      const p = "/path/to/a/very/long/directory/name/file.txt";
+      expect(shortenPath(p, 35)).toBe("/path/.../directory/name/file.txt");
     });
 
-    it('should handle deep paths where few segments from the end fit', () => {
-      const p = '/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt';
-      expect(shortenPath(p, 20)).toBe('/a/.../y/z/file.txt');
+    it("should handle deep paths where few segments from the end fit", () => {
+      const p = "/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt";
+      expect(shortenPath(p, 20)).toBe("/a/.../y/z/file.txt");
     });
 
-    it('should handle deep paths where many segments from the end fit', () => {
-      const p = '/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt';
-      expect(shortenPath(p, 45)).toBe(
-        '/a/.../l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt',
-      );
+    it("should handle deep paths where many segments from the end fit", () => {
+      const p = "/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt";
+      expect(shortenPath(p, 45)).toBe("/a/.../l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/file.txt");
     });
 
-    it('should handle a long filename in the root when it needs shortening', () => {
-      const p = '/a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        '/a-very-long-filen...o-be-shortened.txt',
-      );
+    it("should handle a long filename in the root when it needs shortening", () => {
+      const p = "/a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("/a-very-long-filen...o-be-shortened.txt");
     });
 
-    it('should handle root path', () => {
-      const p = '/';
-      expect(shortenPath(p, 10)).toBe('/');
+    it("should handle root path", () => {
+      const p = "/";
+      expect(shortenPath(p, 10)).toBe("/");
     });
 
-    it('should handle a path with one long segment after root', () => {
-      const p = '/a-very-long-directory-name';
-      expect(shortenPath(p, 20)).toBe('/a-very-...ory-name');
+    it("should handle a path with one long segment after root", () => {
+      const p = "/a-very-long-directory-name";
+      expect(shortenPath(p, 20)).toBe("/a-very-...ory-name");
     });
 
-    it('should handle a path with just a long filename (no root)', () => {
-      const p = 'a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        'a-very-long-filena...o-be-shortened.txt',
-      );
+    it("should handle a path with just a long filename (no root)", () => {
+      const p = "a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("a-very-long-filena...o-be-shortened.txt");
     });
 
-    it('should fallback to truncating earlier segments while keeping the last intact', () => {
-      const p = '/abcdef/fghij.txt';
+    it("should fallback to truncating earlier segments while keeping the last intact", () => {
+      const p = "/abcdef/fghij.txt";
       const result = shortenPath(p, 10);
-      expect(result).toBe('/fghij.txt');
+      expect(result).toBe("/fghij.txt");
       expect(result.length).toBeLessThanOrEqual(10);
     });
 
-    it('should fallback by truncating start and middle segments when needed', () => {
-      const p = '/averylongcomponentname/another/short.txt';
+    it("should fallback by truncating start and middle segments when needed", () => {
+      const p = "/averylongcomponentname/another/short.txt";
       const result = shortenPath(p, 25);
-      expect(result).toBe('/averylo.../.../short.txt');
+      expect(result).toBe("/averylo.../.../short.txt");
       expect(result.length).toBeLessThanOrEqual(25);
     });
 
-    it('should show only the last segment when maxLen is tiny', () => {
-      const p = '/foo/bar/baz.txt';
+    it("should show only the last segment when maxLen is tiny", () => {
+      const p = "/foo/bar/baz.txt";
       const result = shortenPath(p, 8);
-      expect(result).toBe('/baz.txt');
+      expect(result).toBe("/baz.txt");
       expect(result.length).toBeLessThanOrEqual(8);
     });
 
-    it('should fall back to simple truncation when the last segment exceeds maxLen', () => {
-      const longFile = 'x'.repeat(60) + '.txt';
+    it("should fall back to simple truncation when the last segment exceeds maxLen", () => {
+      const longFile = "x".repeat(60) + ".txt";
       const p = `/really/long/${longFile}`;
       const result = shortenPath(p, 50);
-      expect(result).toBe('/really/long/xxxxxxxxxx...xxxxxxxxxxxxxxxxxxx.txt');
+      expect(result).toBe("/really/long/xxxxxxxxxx...xxxxxxxxxxxxxxxxxxx.txt");
       expect(result.length).toBeLessThanOrEqual(50);
     });
 
-    it('should handle relative paths without a root', () => {
-      const p = 'foo/bar/baz/qux.txt';
+    it("should handle relative paths without a root", () => {
+      const p = "foo/bar/baz/qux.txt";
       const result = shortenPath(p, 18);
-      expect(result).toBe('foo/.../qux.txt');
+      expect(result).toBe("foo/.../qux.txt");
       expect(result.length).toBeLessThanOrEqual(18);
     });
 
-    it('should ignore empty segments created by repeated separators', () => {
-      const p = '/foo//bar///baz/verylongname.txt';
+    it("should ignore empty segments created by repeated separators", () => {
+      const p = "/foo//bar///baz/verylongname.txt";
       const result = shortenPath(p, 20);
-      expect(result).toBe('.../verylongname.txt');
+      expect(result).toBe(".../verylongname.txt");
       expect(result.length).toBeLessThanOrEqual(20);
     });
   });
 
-  describe.skipIf(process.platform !== 'win32')('on Windows', () => {
-    it('should not shorten a path that is shorter than maxLen', () => {
-      const p = 'C\\Users\\Test\\file.txt';
+  describe.skipIf(process.platform !== "win32")("on Windows", () => {
+    it("should not shorten a path that is shorter than maxLen", () => {
+      const p = "C\\Users\\Test\\file.txt";
       expect(shortenPath(p, 40)).toBe(p);
     });
 
-    it('should not shorten a path that is equal to maxLen', () => {
-      const p = 'C\\path\\to\\file.txt';
+    it("should not shorten a path that is equal to maxLen", () => {
+      const p = "C\\path\\to\\file.txt";
       expect(shortenPath(p, p.length)).toBe(p);
     });
 
-    it('should shorten a long path, keeping start and end from a short limit', () => {
-      const p = 'C\\path\\to\\a\\very\\long\\directory\\name\\file.txt';
-      expect(shortenPath(p, 30)).toBe('C\\...\\directory\\name\\file.txt');
+    it("should shorten a long path, keeping start and end from a short limit", () => {
+      const p = "C\\path\\to\\a\\very\\long\\directory\\name\\file.txt";
+      expect(shortenPath(p, 30)).toBe("C\\...\\directory\\name\\file.txt");
     });
 
-    it('should shorten a long path, keeping more from the end from a longer limit', () => {
-      const p = 'C\\path\\to\\a\\very\\long\\directory\\name\\file.txt';
-      expect(shortenPath(p, 42)).toBe(
-        'C\\...\\a\\very\\long\\directory\\name\\file.txt',
-      );
+    it("should shorten a long path, keeping more from the end from a longer limit", () => {
+      const p = "C\\path\\to\\a\\very\\long\\directory\\name\\file.txt";
+      expect(shortenPath(p, 42)).toBe("C\\...\\a\\very\\long\\directory\\name\\file.txt");
     });
 
-    it('should handle deep paths where few segments from the end fit', () => {
+    it("should handle deep paths where few segments from the end fit", () => {
       const p =
-        'C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt';
-      expect(shortenPath(p, 22)).toBe('C\\...\\w\\x\\y\\z\\file.txt');
+        "C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt";
+      expect(shortenPath(p, 22)).toBe("C\\...\\w\\x\\y\\z\\file.txt");
     });
 
-    it('should handle deep paths where many segments from the end fit', () => {
+    it("should handle deep paths where many segments from the end fit", () => {
       const p =
-        'C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt';
+        "C\\a\\b\\c\\d\\e\\f\\g\\h\\i\\j\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt";
       expect(shortenPath(p, 47)).toBe(
-        'C\\...\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt',
+        "C\\...\\k\\l\\m\\n\\o\\p\\q\\r\\s\\t\\u\\v\\w\\x\\y\\z\\file.txt",
       );
     });
 
-    it('should handle a long filename in the root when it needs shortening', () => {
-      const p = 'C\\a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        'C\\a-very-long-file...o-be-shortened.txt',
-      );
+    it("should handle a long filename in the root when it needs shortening", () => {
+      const p = "C\\a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("C\\a-very-long-file...o-be-shortened.txt");
     });
 
-    it('should handle root path', () => {
-      const p = 'C\\';
-      expect(shortenPath(p, 10)).toBe('C\\');
+    it("should handle root path", () => {
+      const p = "C\\";
+      expect(shortenPath(p, 10)).toBe("C\\");
     });
 
-    it('should handle a path with one long segment after root', () => {
-      const p = 'C\\a-very-long-directory-name';
-      expect(shortenPath(p, 22)).toBe('C\\a-very-...tory-name');
+    it("should handle a path with one long segment after root", () => {
+      const p = "C\\a-very-long-directory-name";
+      expect(shortenPath(p, 22)).toBe("C\\a-very-...tory-name");
     });
 
-    it('should handle a path with just a long filename (no root)', () => {
-      const p = 'a-very-long-filename-that-needs-to-be-shortened.txt';
-      expect(shortenPath(p, 40)).toBe(
-        'a-very-long-filena...o-be-shortened.txt',
-      );
+    it("should handle a path with just a long filename (no root)", () => {
+      const p = "a-very-long-filename-that-needs-to-be-shortened.txt";
+      expect(shortenPath(p, 40)).toBe("a-very-long-filena...o-be-shortened.txt");
     });
 
-    it('should fallback to truncating earlier segments while keeping the last intact', () => {
-      const p = 'C\\abcdef\\fghij.txt';
+    it("should fallback to truncating earlier segments while keeping the last intact", () => {
+      const p = "C\\abcdef\\fghij.txt";
       const result = shortenPath(p, 15);
-      expect(result).toBe('C\\...\\fghij.txt');
+      expect(result).toBe("C\\...\\fghij.txt");
       expect(result.length).toBeLessThanOrEqual(15);
     });
 
-    it('should fallback by truncating start and middle segments when needed', () => {
-      const p = 'C\\averylongcomponentname\\another\\short.txt';
+    it("should fallback by truncating start and middle segments when needed", () => {
+      const p = "C\\averylongcomponentname\\another\\short.txt";
       const result = shortenPath(p, 30);
-      expect(result).toBe('C\\...\\another\\short.txt');
+      expect(result).toBe("C\\...\\another\\short.txt");
       expect(result.length).toBeLessThanOrEqual(30);
     });
 
-    it('should show only the last segment for tiny maxLen values', () => {
-      const p = 'C\\foo\\bar\\baz.txt';
+    it("should show only the last segment for tiny maxLen values", () => {
+      const p = "C\\foo\\bar\\baz.txt";
       const result = shortenPath(p, 12);
-      expect(result).toBe('...\\baz.txt');
+      expect(result).toBe("...\\baz.txt");
       expect(result.length).toBeLessThanOrEqual(12);
     });
 
-    it('should keep the drive prefix when space allows', () => {
-      const p = 'C\\foo\\bar\\baz.txt';
+    it("should keep the drive prefix when space allows", () => {
+      const p = "C\\foo\\bar\\baz.txt";
       const result = shortenPath(p, 14);
-      expect(result).toBe('C\\...\\baz.txt');
+      expect(result).toBe("C\\...\\baz.txt");
       expect(result.length).toBeLessThanOrEqual(14);
     });
 
-    it('should fall back when the last segment exceeds maxLen on Windows', () => {
-      const longFile = 'x'.repeat(60) + '.txt';
+    it("should fall back when the last segment exceeds maxLen on Windows", () => {
+      const longFile = "x".repeat(60) + ".txt";
       const p = `C\\really\\long\\${longFile}`;
       const result = shortenPath(p, 40);
-      expect(result).toBe('C\\really\\long\\xxxx...xxxxxxxxxxxxxx.txt');
+      expect(result).toBe("C\\really\\long\\xxxx...xxxxxxxxxxxxxx.txt");
       expect(result.length).toBeLessThanOrEqual(40);
     });
 
-    it('should handle UNC paths with limited space', () => {
-      const p = '\\server\\share\\deep\\path\\file.txt';
+    it("should handle UNC paths with limited space", () => {
+      const p = "\\server\\share\\deep\\path\\file.txt";
       const result = shortenPath(p, 25);
-      expect(result).toBe('\\server\\...\\path\\file.txt');
+      expect(result).toBe("\\server\\...\\path\\file.txt");
       expect(result.length).toBeLessThanOrEqual(25);
     });
 
-    it('should collapse UNC paths further when maxLen shrinks', () => {
-      const p = '\\server\\share\\deep\\path\\file.txt';
+    it("should collapse UNC paths further when maxLen shrinks", () => {
+      const p = "\\server\\share\\deep\\path\\file.txt";
       const result = shortenPath(p, 18);
-      expect(result).toBe('\\s...\\...\\file.txt');
+      expect(result).toBe("\\s...\\...\\file.txt");
       expect(result.length).toBeLessThanOrEqual(18);
     });
   });
diff --git a/packages/gemini-core/src/utils/paths.ts b/packages/gemini-core/src/utils/paths.ts
index c32a3ce9f..654cb5d5e 100644
--- a/packages/gemini-core/src/utils/paths.ts
+++ b/packages/gemini-core/src/utils/paths.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import os from 'node:os';
-import * as crypto from 'node:crypto';
+import * as crypto from "node:crypto";
+import os from "node:os";
+import path from "node:path";
 
-export const GEMINI_DIR = '.gemini';
-export const GOOGLE_ACCOUNTS_FILENAME = 'google_accounts.json';
+export const GEMINI_DIR = ".gemini";
+export const GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
 
 /**
  * Special characters that need to be escaped in file paths for shell compatibility.
@@ -26,7 +26,7 @@ export const SHELL_SPECIAL_CHARS = /[ \t()[\]{};|*?$`'"#&<>!~]/;
 export function tildeifyPath(path: string): string {
   const homeDir = os.homedir();
   if (path.startsWith(homeDir)) {
-    return path.replace(homeDir, '~');
+    return path.replace(homeDir, "~");
   }
   return path;
 }
@@ -43,14 +43,14 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
   const simpleTruncate = () => {
     const keepLen = Math.floor((maxLen - 3) / 2);
     if (keepLen <= 0) {
-      return filePath.substring(0, maxLen - 3) + '...';
+      return filePath.substring(0, maxLen - 3) + "...";
     }
     const start = filePath.substring(0, keepLen);
     const end = filePath.substring(filePath.length - keepLen);
     return `${start}...${end}`;
   };
 
-  type TruncateMode = 'start' | 'end' | 'center';
+  type TruncateMode = "start" | "end" | "center";
 
   const truncateComponent = (
     component: string,
@@ -62,29 +62,27 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
     }
 
     if (targetLength <= 0) {
-      return '';
+      return "";
     }
 
     if (targetLength <= 3) {
-      if (mode === 'end') {
+      if (mode === "end") {
         return component.slice(-targetLength);
       }
       return component.slice(0, targetLength);
     }
 
-    if (mode === 'start') {
+    if (mode === "start") {
       return `${component.slice(0, targetLength - 3)}...`;
     }
 
-    if (mode === 'end') {
+    if (mode === "end") {
       return `...${component.slice(component.length - (targetLength - 3))}`;
     }
 
     const front = Math.ceil((targetLength - 3) / 2);
     const back = targetLength - 3 - front;
-    return `${component.slice(0, front)}...${component.slice(
-      component.length - back,
-    )}`;
+    return `${component.slice(0, front)}...${component.slice(component.length - back)}`;
   };
 
   const parsedPath = path.parse(filePath);
@@ -93,7 +91,7 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
 
   // Get segments of the path *after* the root
   const relativePath = filePath.substring(root.length);
-  const segments = relativePath.split(separator).filter((s) => s !== ''); // Filter out empty segments
+  const segments = relativePath.split(separator).filter((s) => s !== ""); // Filter out empty segments
 
   // Handle cases with no segments after root (e.g., "/", "C:\") or only one segment
   if (segments.length <= 1) {
@@ -131,12 +129,12 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
   const components = [firstDir, ...endPartSegments];
   const componentModes: TruncateMode[] = components.map((_, index) => {
     if (index === 0) {
-      return 'start';
+      return "start";
     }
     if (index === components.length - 1) {
-      return 'end';
+      return "end";
     }
-    return 'center';
+    return "center";
   });
 
   const separatorsCount = endPartSegments.length + 1;
@@ -240,10 +238,7 @@ export function shortenPath(filePath: string, maxLen: number = 35): string {
  * @param rootDirectory The absolute path of the directory to make the target path relative to.
  * @returns The relative path from rootDirectory to targetPath.
  */
-export function makeRelative(
-  targetPath: string,
-  rootDirectory: string,
-): string {
+export function makeRelative(targetPath: string, rootDirectory: string): string {
   if (!path.isAbsolute(targetPath)) {
     return targetPath;
   }
@@ -251,7 +246,7 @@ export function makeRelative(
   const relativePath = path.relative(resolvedRootDirectory, targetPath);
 
   // If the paths are the same, path.relative returns '', return '.' instead
-  return relativePath || '.';
+  return relativePath || ".";
 }
 
 /**
@@ -260,13 +255,13 @@ export function makeRelative(
  * asterisks, question marks, dollar signs, backticks, quotes, hash, and other shell metacharacters.
  */
 export function escapePath(filePath: string): string {
-  let result = '';
+  let result = "";
   for (let i = 0; i < filePath.length; i++) {
     const char = filePath[i];
 
     // Count consecutive backslashes before this character
     let backslashCount = 0;
-    for (let j = i - 1; j >= 0 && filePath[j] === '\\'; j--) {
+    for (let j = i - 1; j >= 0 && filePath[j] === "\\"; j--) {
       backslashCount++;
     }
 
@@ -275,7 +270,7 @@ export function escapePath(filePath: string): string {
 
     // Only escape if not already escaped
     if (!isAlreadyEscaped && SHELL_SPECIAL_CHARS.test(char)) {
-      result += '\\' + char;
+      result += "\\" + char;
     } else {
       result += char;
     }
@@ -289,8 +284,8 @@ export function escapePath(filePath: string): string {
  */
 export function unescapePath(filePath: string): string {
   return filePath.replace(
-    new RegExp(`\\\\([${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`, 'g'),
-    '$1',
+    new RegExp(`\\\\([${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`, "g"),
+    "$1",
   );
 }
 
@@ -300,7 +295,7 @@ export function unescapePath(filePath: string): string {
  * @returns A SHA256 hash of the project root path.
  */
 export function getProjectHash(projectRoot: string): string {
-  return crypto.createHash('sha256').update(projectRoot).digest('hex');
+  return crypto.createHash("sha256").update(projectRoot).digest("hex");
 }
 
 /**
@@ -310,7 +305,7 @@ export function getProjectHash(projectRoot: string): string {
  * @returns True if childPath is a subpath of parentPath, false otherwise.
  */
 export function isSubpath(parentPath: string, childPath: string): boolean {
-  const isWindows = os.platform() === 'win32';
+  const isWindows = os.platform() === "win32";
   const pathModule = isWindows ? path.win32 : path;
 
   // On Windows, path.relative is case-insensitive. On POSIX, it's case-sensitive.
@@ -318,7 +313,7 @@ export function isSubpath(parentPath: string, childPath: string): boolean {
 
   return (
     !relative.startsWith(`..${pathModule.sep}`) &&
-    relative !== '..' &&
+    relative !== ".." &&
     !pathModule.isAbsolute(relative)
   );
 }
diff --git a/packages/gemini-core/src/utils/promptIdContext.ts b/packages/gemini-core/src/utils/promptIdContext.ts
index 6344bd0b8..ee933e989 100644
--- a/packages/gemini-core/src/utils/promptIdContext.ts
+++ b/packages/gemini-core/src/utils/promptIdContext.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AsyncLocalStorage } from 'node:async_hooks';
+import { AsyncLocalStorage } from "node:async_hooks";
 
 export const promptIdContext = new AsyncLocalStorage<string>();
diff --git a/packages/gemini-core/src/utils/quotaErrorDetection.ts b/packages/gemini-core/src/utils/quotaErrorDetection.ts
index 893e48b0f..52de1971a 100644
--- a/packages/gemini-core/src/utils/quotaErrorDetection.ts
+++ b/packages/gemini-core/src/utils/quotaErrorDetection.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { StructuredError } from '../core/turn.js';
+import type { StructuredError } from "../core/turn.js";
 
 export interface ApiError {
   error: {
@@ -17,19 +17,19 @@ export interface ApiError {
 
 export function isApiError(error: unknown): error is ApiError {
   return (
-    typeof error === 'object' &&
+    typeof error === "object" &&
     error !== null &&
-    'error' in error &&
-    typeof (error as ApiError).error === 'object' &&
-    'message' in (error as ApiError).error
+    "error" in error &&
+    typeof (error as ApiError).error === "object" &&
+    "message" in (error as ApiError).error
   );
 }
 
 export function isStructuredError(error: unknown): error is StructuredError {
   return (
-    typeof error === 'object' &&
+    typeof error === "object" &&
     error !== null &&
-    'message' in error &&
-    typeof (error as StructuredError).message === 'string'
+    "message" in error &&
+    typeof (error as StructuredError).message === "string"
   );
 }
diff --git a/packages/gemini-core/src/utils/retry.test.ts b/packages/gemini-core/src/utils/retry.test.ts
index e0297e890..7d4cf50c9 100644
--- a/packages/gemini-core/src/utils/retry.test.ts
+++ b/packages/gemini-core/src/utils/retry.test.ts
@@ -4,24 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { ApiError } from "@google/genai";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { ApiError } from '@google/genai';
-import { AuthType } from '../core/contentGenerator.js';
-import type { HttpError } from './retry.js';
-import { retryWithBackoff } from './retry.js';
-import { setSimulate429 } from './testUtils.js';
-import { debugLogger } from './debugLogger.js';
-import {
-  TerminalQuotaError,
-  RetryableQuotaError,
-} from './googleQuotaErrors.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { AuthType } from "../core/contentGenerator.js";
+import { debugLogger } from "./debugLogger.js";
+import { RetryableQuotaError, TerminalQuotaError } from "./googleQuotaErrors.js";
+import type { HttpError } from "./retry.js";
+import { retryWithBackoff } from "./retry.js";
+import { setSimulate429 } from "./testUtils.js";
 
 // Helper to create a mock function that fails a certain number of times
-const createFailingFunction = (
-  failures: number,
-  successValue: string = 'success',
-) => {
+const createFailingFunction = (failures: number, successValue: string = "success") => {
   let attempts = 0;
   return vi.fn(async () => {
     attempts++;
@@ -39,11 +33,11 @@ const createFailingFunction = (
 class NonRetryableError extends Error {
   constructor(message: string) {
     super(message);
-    this.name = 'NonRetryableError';
+    this.name = "NonRetryableError";
   }
 }
 
-describe('retryWithBackoff', () => {
+describe("retryWithBackoff", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     // Disable 429 simulation for tests
@@ -57,14 +51,14 @@ describe('retryWithBackoff', () => {
     vi.useRealTimers();
   });
 
-  it('should return the result on the first attempt if successful', async () => {
+  it("should return the result on the first attempt if successful", async () => {
     const mockFn = createFailingFunction(0);
     const result = await retryWithBackoff(mockFn);
-    expect(result).toBe('success');
+    expect(result).toBe("success");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should retry and succeed if failures are within maxAttempts', async () => {
+  it("should retry and succeed if failures are within maxAttempts", async () => {
     const mockFn = createFailingFunction(2);
     const promise = retryWithBackoff(mockFn, {
       maxAttempts: 3,
@@ -74,11 +68,11 @@ describe('retryWithBackoff', () => {
     await vi.runAllTimersAsync(); // Ensure all delays and retries complete
 
     const result = await promise;
-    expect(result).toBe('success');
+    expect(result).toBe("success");
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should throw an error if all attempts fail', async () => {
+  it("should throw an error if all attempts fail", async () => {
     const mockFn = createFailingFunction(3);
 
     // 1. Start the retryable operation, which returns a promise.
@@ -89,7 +83,7 @@ describe('retryWithBackoff', () => {
 
     // 2. Run timers and await expectation in parallel.
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow("Simulated error attempt 3"),
       vi.runAllTimersAsync(),
     ]);
 
@@ -97,7 +91,7 @@ describe('retryWithBackoff', () => {
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should default to 3 maxAttempts if no options are provided', async () => {
+  it("should default to 3 maxAttempts if no options are provided", async () => {
     // This function will fail more than 3 times to ensure all retries are used.
     const mockFn = createFailingFunction(10);
 
@@ -105,14 +99,14 @@ describe('retryWithBackoff', () => {
 
     // Expect it to fail with the error from the 5th attempt.
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow("Simulated error attempt 3"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should default to 3 maxAttempts if options.maxAttempts is undefined', async () => {
+  it("should default to 3 maxAttempts if options.maxAttempts is undefined", async () => {
     // This function will fail more than 3 times to ensure all retries are used.
     const mockFn = createFailingFunction(10);
 
@@ -120,44 +114,43 @@ describe('retryWithBackoff', () => {
 
     // Expect it to fail with the error from the 5th attempt.
     await Promise.all([
-      expect(promise).rejects.toThrow('Simulated error attempt 3'),
+      expect(promise).rejects.toThrow("Simulated error attempt 3"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(3);
   });
 
-  it('should not retry if shouldRetry returns false', async () => {
+  it("should not retry if shouldRetry returns false", async () => {
     const mockFn = vi.fn(async () => {
-      throw new NonRetryableError('Non-retryable error');
+      throw new NonRetryableError("Non-retryable error");
     });
-    const shouldRetryOnError = (error: Error) =>
-      !(error instanceof NonRetryableError);
+    const shouldRetryOnError = (error: Error) => !(error instanceof NonRetryableError);
 
     const promise = retryWithBackoff(mockFn, {
       shouldRetryOnError,
       initialDelayMs: 10,
     });
 
-    await expect(promise).rejects.toThrow('Non-retryable error');
+    await expect(promise).rejects.toThrow("Non-retryable error");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should throw an error if maxAttempts is not a positive number', async () => {
+  it("should throw an error if maxAttempts is not a positive number", async () => {
     const mockFn = createFailingFunction(1);
 
     // Test with 0
     await expect(retryWithBackoff(mockFn, { maxAttempts: 0 })).rejects.toThrow(
-      'maxAttempts must be a positive number.',
+      "maxAttempts must be a positive number.",
     );
 
     // The function should not be called at all if validation fails
     expect(mockFn).not.toHaveBeenCalled();
   });
 
-  it('should use default shouldRetry if not provided, retrying on ApiError 429', async () => {
+  it("should use default shouldRetry if not provided, retrying on ApiError 429", async () => {
     const mockFn = vi.fn(async () => {
-      throw new ApiError({ message: 'Too Many Requests', status: 429 });
+      throw new ApiError({ message: "Too Many Requests", status: 429 });
     });
 
     const promise = retryWithBackoff(mockFn, {
@@ -166,29 +159,29 @@ describe('retryWithBackoff', () => {
     });
 
     await Promise.all([
-      expect(promise).rejects.toThrow('Too Many Requests'),
+      expect(promise).rejects.toThrow("Too Many Requests"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(2);
   });
 
-  it('should use default shouldRetry if not provided, not retrying on ApiError 400', async () => {
+  it("should use default shouldRetry if not provided, not retrying on ApiError 400", async () => {
     const mockFn = vi.fn(async () => {
-      throw new ApiError({ message: 'Bad Request', status: 400 });
+      throw new ApiError({ message: "Bad Request", status: 400 });
     });
 
     const promise = retryWithBackoff(mockFn, {
       maxAttempts: 2,
       initialDelayMs: 10,
     });
-    await expect(promise).rejects.toThrow('Bad Request');
+    await expect(promise).rejects.toThrow("Bad Request");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should use default shouldRetry if not provided, retrying on generic error with status 429', async () => {
+  it("should use default shouldRetry if not provided, retrying on generic error with status 429", async () => {
     const mockFn = vi.fn(async () => {
-      const error = new Error('Too Many Requests') as any;
+      const error = new Error("Too Many Requests") as any;
       error.status = 429;
       throw error;
     });
@@ -200,16 +193,16 @@ describe('retryWithBackoff', () => {
 
     // Run timers and await expectation in parallel.
     await Promise.all([
-      expect(promise).rejects.toThrow('Too Many Requests'),
+      expect(promise).rejects.toThrow("Too Many Requests"),
       vi.runAllTimersAsync(),
     ]);
 
     expect(mockFn).toHaveBeenCalledTimes(2);
   });
 
-  it('should use default shouldRetry if not provided, not retrying on generic error with status 400', async () => {
+  it("should use default shouldRetry if not provided, not retrying on generic error with status 400", async () => {
     const mockFn = vi.fn(async () => {
-      const error = new Error('Bad Request') as any;
+      const error = new Error("Bad Request") as any;
       error.status = 400;
       throw error;
     });
@@ -218,13 +211,13 @@ describe('retryWithBackoff', () => {
       maxAttempts: 2,
       initialDelayMs: 10,
     });
-    await expect(promise).rejects.toThrow('Bad Request');
+    await expect(promise).rejects.toThrow("Bad Request");
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should respect maxDelayMs', async () => {
+  it("should respect maxDelayMs", async () => {
     const mockFn = createFailingFunction(3);
-    const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+    const setTimeoutSpy = vi.spyOn(global, "setTimeout");
 
     const promise = retryWithBackoff(mockFn, {
       maxAttempts: 4,
@@ -249,9 +242,9 @@ describe('retryWithBackoff', () => {
     expect(delays[2]).toBeLessThanOrEqual(250 * 1.3);
   });
 
-  it('should handle jitter correctly, ensuring varied delays', async () => {
+  it("should handle jitter correctly, ensuring varied delays", async () => {
     let mockFn = createFailingFunction(5);
-    const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+    const setTimeoutSpy = vi.spyOn(global, "setTimeout");
 
     // Run retryWithBackoff multiple times to observe jitter
     const runRetry = () =>
@@ -264,14 +257,9 @@ describe('retryWithBackoff', () => {
     // We expect rejections as mockFn fails 5 times
     const promise1 = runRetry();
     // Run timers and await expectation in parallel.
-    await Promise.all([
-      expect(promise1).rejects.toThrow(),
-      vi.runAllTimersAsync(),
-    ]);
+    await Promise.all([expect(promise1).rejects.toThrow(), vi.runAllTimersAsync()]);
 
-    const firstDelaySet = setTimeoutSpy.mock.calls.map(
-      (call) => call[1] as number,
-    );
+    const firstDelaySet = setTimeoutSpy.mock.calls.map((call) => call[1] as number);
     setTimeoutSpy.mockClear(); // Clear calls for the next run
 
     // Reset mockFn to reset its internal attempt counter for the next run
@@ -279,14 +267,9 @@ describe('retryWithBackoff', () => {
 
     const promise2 = runRetry();
     // Run timers and await expectation in parallel.
-    await Promise.all([
-      expect(promise2).rejects.toThrow(),
-      vi.runAllTimersAsync(),
-    ]);
+    await Promise.all([expect(promise2).rejects.toThrow(), vi.runAllTimersAsync()]);
 
-    const secondDelaySet = setTimeoutSpy.mock.calls.map(
-      (call) => call[1] as number,
-    );
+    const secondDelaySet = setTimeoutSpy.mock.calls.map((call) => call[1] as number);
 
     // Check that the delays are not exactly the same due to jitter
     // This is a probabilistic test, but with +/-30% jitter, it's highly likely they differ.
@@ -295,7 +278,7 @@ describe('retryWithBackoff', () => {
       expect(firstDelaySet[0]).not.toBe(secondDelaySet[0]);
     } else {
       // If somehow no delays were captured (e.g. test setup issue), fail explicitly
-      throw new Error('Delays were not captured for jitter test');
+      throw new Error("Delays were not captured for jitter test");
     }
 
     // Ensure delays are within the expected jitter range [70, 130] for initialDelayMs = 100
@@ -305,13 +288,13 @@ describe('retryWithBackoff', () => {
     });
   });
 
-  describe('Fetch error retries', () => {
-    const fetchErrorMsg = 'exception TypeError: fetch failed sending request';
+  describe("Fetch error retries", () => {
+    const fetchErrorMsg = "exception TypeError: fetch failed sending request";
 
-    it('should retry on specific fetch error when retryFetchErrors is true', async () => {
+    it("should retry on specific fetch error when retryFetchErrors is true", async () => {
       const mockFn = vi.fn();
       mockFn.mockRejectedValueOnce(new Error(fetchErrorMsg));
-      mockFn.mockResolvedValueOnce('success');
+      mockFn.mockResolvedValueOnce("success");
 
       const promise = retryWithBackoff(mockFn, {
         retryFetchErrors: true,
@@ -321,35 +304,35 @@ describe('retryWithBackoff', () => {
       await vi.runAllTimersAsync();
 
       const result = await promise;
-      expect(result).toBe('success');
+      expect(result).toBe("success");
       expect(mockFn).toHaveBeenCalledTimes(2);
     });
 
-    it.each([false, undefined])(
-      'should not retry on specific fetch error when retryFetchErrors is %s',
-      async (retryFetchErrors) => {
-        const mockFn = vi.fn().mockRejectedValue(new Error(fetchErrorMsg));
+    it.each([
+      false,
+      undefined,
+    ])("should not retry on specific fetch error when retryFetchErrors is %s", async (retryFetchErrors) => {
+      const mockFn = vi.fn().mockRejectedValue(new Error(fetchErrorMsg));
 
-        const promise = retryWithBackoff(mockFn, {
-          retryFetchErrors,
-        });
+      const promise = retryWithBackoff(mockFn, {
+        retryFetchErrors,
+      });
 
-        await expect(promise).rejects.toThrow(fetchErrorMsg);
-        expect(mockFn).toHaveBeenCalledTimes(1);
-      },
-    );
+      await expect(promise).rejects.toThrow(fetchErrorMsg);
+      expect(mockFn).toHaveBeenCalledTimes(1);
+    });
   });
 
-  describe('Flash model fallback for OAuth users', () => {
-    it('should trigger fallback for OAuth personal users on TerminalQuotaError', async () => {
-      const fallbackCallback = vi.fn().mockResolvedValue('gemini-2.5-flash');
+  describe("Flash model fallback for OAuth users", () => {
+    it("should trigger fallback for OAuth personal users on TerminalQuotaError", async () => {
+      const fallbackCallback = vi.fn().mockResolvedValue("gemini-2.5-flash");
 
       let fallbackOccurred = false;
       const mockFn = vi.fn().mockImplementation(async () => {
         if (!fallbackOccurred) {
-          throw new TerminalQuotaError('Daily limit reached', {} as any);
+          throw new TerminalQuotaError("Daily limit reached", {} as any);
         }
-        return 'success';
+        return "success";
       });
 
       const promise = retryWithBackoff(mockFn, {
@@ -359,23 +342,23 @@ describe('retryWithBackoff', () => {
           fallbackOccurred = true;
           return await fallbackCallback(authType, error);
         },
-        authType: 'oauth-personal',
+        authType: "oauth-personal",
       });
 
       await vi.runAllTimersAsync();
 
-      await expect(promise).resolves.toBe('success');
+      await expect(promise).resolves.toBe("success");
       expect(fallbackCallback).toHaveBeenCalledWith(
-        'oauth-personal',
+        "oauth-personal",
         expect.any(TerminalQuotaError),
       );
       expect(mockFn).toHaveBeenCalledTimes(2);
     });
 
-    it('should use retryDelayMs from RetryableQuotaError', async () => {
-      const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+    it("should use retryDelayMs from RetryableQuotaError", async () => {
+      const setTimeoutSpy = vi.spyOn(global, "setTimeout");
       const mockFn = vi.fn().mockImplementation(async () => {
-        throw new RetryableQuotaError('Per-minute limit', {} as any, 12.345);
+        throw new RetryableQuotaError("Per-minute limit", {} as any, 12.345);
       });
 
       const promise = retryWithBackoff(mockFn, {
@@ -392,30 +375,31 @@ describe('retryWithBackoff', () => {
       expect(setTimeoutSpy).toHaveBeenCalledWith(expect.any(Function), 12345);
     });
 
-    it.each([[AuthType.USE_GEMINI], [AuthType.USE_VERTEX_AI], [undefined]])(
-      'should not trigger fallback for non-Google auth users (authType: %s) on TerminalQuotaError',
-      async (authType) => {
-        const fallbackCallback = vi.fn();
-        const mockFn = vi.fn().mockImplementation(async () => {
-          throw new TerminalQuotaError('Daily limit reached', {} as any);
-        });
-
-        const promise = retryWithBackoff(mockFn, {
-          maxAttempts: 3,
-          onPersistent429: fallbackCallback,
-          authType,
-        });
-
-        await expect(promise).rejects.toThrow('Daily limit reached');
-        expect(fallbackCallback).not.toHaveBeenCalled();
-        expect(mockFn).toHaveBeenCalledTimes(1);
-      },
-    );
+    it.each([
+      [AuthType.USE_GEMINI],
+      [AuthType.USE_VERTEX_AI],
+      [undefined],
+    ])("should not trigger fallback for non-Google auth users (authType: %s) on TerminalQuotaError", async (authType) => {
+      const fallbackCallback = vi.fn();
+      const mockFn = vi.fn().mockImplementation(async () => {
+        throw new TerminalQuotaError("Daily limit reached", {} as any);
+      });
+
+      const promise = retryWithBackoff(mockFn, {
+        maxAttempts: 3,
+        onPersistent429: fallbackCallback,
+        authType,
+      });
+
+      await expect(promise).rejects.toThrow("Daily limit reached");
+      expect(fallbackCallback).not.toHaveBeenCalled();
+      expect(mockFn).toHaveBeenCalledTimes(1);
+    });
   });
-  it('should abort the retry loop when the signal is aborted', async () => {
+  it("should abort the retry loop when the signal is aborted", async () => {
     const abortController = new AbortController();
     const mockFn = vi.fn().mockImplementation(async () => {
-      const error: HttpError = new Error('Server error');
+      const error: HttpError = new Error("Server error");
       error.status = 500;
       throw error;
     });
@@ -428,9 +412,7 @@ describe('retryWithBackoff', () => {
     await vi.advanceTimersByTimeAsync(50);
     abortController.abort();
 
-    await expect(promise).rejects.toThrow(
-      expect.objectContaining({ name: 'AbortError' }),
-    );
+    await expect(promise).rejects.toThrow(expect.objectContaining({ name: "AbortError" }));
     expect(mockFn).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/packages/gemini-core/src/utils/retry.ts b/packages/gemini-core/src/utils/retry.ts
index edb8f9bb8..16b57d4ac 100644
--- a/packages/gemini-core/src/utils/retry.ts
+++ b/packages/gemini-core/src/utils/retry.ts
@@ -4,19 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { GenerateContentResponse } from '@google/genai';
-import { ApiError } from '@google/genai';
-import { AuthType } from '../core/contentGenerator.js';
+import type { GenerateContentResponse } from "@google/genai";
+import { ApiError } from "@google/genai";
+import { AuthType } from "../core/contentGenerator.js";
+import { debugLogger } from "./debugLogger.js";
+import { createAbortError, delay } from "./delay.js";
 import {
   classifyGoogleError,
   RetryableQuotaError,
   TerminalQuotaError,
-} from './googleQuotaErrors.js';
-import { delay, createAbortError } from './delay.js';
-import { debugLogger } from './debugLogger.js';
+} from "./googleQuotaErrors.js";
 
-const FETCH_FAILED_MESSAGE =
-  'exception TypeError: fetch failed sending request';
+const FETCH_FAILED_MESSAGE = "exception TypeError: fetch failed sending request";
 
 export interface HttpError extends Error {
   status?: number;
@@ -28,10 +27,7 @@ export interface RetryOptions {
   maxDelayMs: number;
   shouldRetryOnError: (error: Error, retryFetchErrors?: boolean) => boolean;
   shouldRetryOnContent?: (content: GenerateContentResponse) => boolean;
-  onPersistent429?: (
-    authType?: string,
-    error?: unknown,
-  ) => Promise<string | boolean | null>;
+  onPersistent429?: (authType?: string, error?: unknown) => Promise<string | boolean | null>;
   authType?: string;
   retryFetchErrors?: boolean;
   signal?: AbortSignal;
@@ -51,15 +47,8 @@ const DEFAULT_RETRY_OPTIONS: RetryOptions = {
  * @param retryFetchErrors Whether to retry on specific fetch errors.
  * @returns True if the error is a transient error, false otherwise.
  */
-function defaultShouldRetry(
-  error: Error | unknown,
-  retryFetchErrors?: boolean,
-): boolean {
-  if (
-    retryFetchErrors &&
-    error instanceof Error &&
-    error.message.includes(FETCH_FAILED_MESSAGE)
-  ) {
+function defaultShouldRetry(error: Error | unknown, retryFetchErrors?: boolean): boolean {
+  if (retryFetchErrors && error instanceof Error && error.message.includes(FETCH_FAILED_MESSAGE)) {
     return true;
   }
 
@@ -95,7 +84,7 @@ export async function retryWithBackoff<T>(
   }
 
   if (options?.maxAttempts !== undefined && options.maxAttempts <= 0) {
-    throw new Error('maxAttempts must be a positive number.');
+    throw new Error("maxAttempts must be a positive number.");
   }
 
   const cleanOptions = options
@@ -128,10 +117,7 @@ export async function retryWithBackoff<T>(
     try {
       const result = await fn();
 
-      if (
-        shouldRetryOnContent &&
-        shouldRetryOnContent(result as GenerateContentResponse)
-      ) {
+      if (shouldRetryOnContent && shouldRetryOnContent(result as GenerateContentResponse)) {
         const jitter = currentDelay * 0.3 * (Math.random() * 2 - 1);
         const delayWithJitter = Math.max(0, currentDelay + jitter);
         await delay(delayWithJitter, signal);
@@ -141,7 +127,7 @@ export async function retryWithBackoff<T>(
 
       return result;
     } catch (error) {
-      if (error instanceof Error && error.name === 'AbortError') {
+      if (error instanceof Error && error.name === "AbortError") {
         throw error;
       }
 
@@ -150,17 +136,14 @@ export async function retryWithBackoff<T>(
       if (classifiedError instanceof TerminalQuotaError) {
         if (onPersistent429 && authType === AuthType.LOGIN_WITH_GOOGLE) {
           try {
-            const fallbackModel = await onPersistent429(
-              authType,
-              classifiedError,
-            );
+            const fallbackModel = await onPersistent429(authType, classifiedError);
             if (fallbackModel) {
               attempt = 0; // Reset attempts and retry with the new model.
               currentDelay = initialDelayMs;
               continue;
             }
           } catch (fallbackError) {
-            debugLogger.warn('Fallback to Flash model failed:', fallbackError);
+            debugLogger.warn("Fallback to Flash model failed:", fallbackError);
           }
         }
         throw classifiedError; // Throw if no fallback or fallback failed.
@@ -170,17 +153,14 @@ export async function retryWithBackoff<T>(
         if (attempt >= maxAttempts) {
           if (onPersistent429 && authType === AuthType.LOGIN_WITH_GOOGLE) {
             try {
-              const fallbackModel = await onPersistent429(
-                authType,
-                classifiedError,
-              );
+              const fallbackModel = await onPersistent429(authType, classifiedError);
               if (fallbackModel) {
                 attempt = 0; // Reset attempts and retry with the new model.
                 currentDelay = initialDelayMs;
                 continue;
               }
             } catch (fallbackError) {
-              console.warn('Model fallback failed:', fallbackError);
+              console.warn("Model fallback failed:", fallbackError);
             }
           }
           throw classifiedError;
@@ -193,10 +173,7 @@ export async function retryWithBackoff<T>(
       }
 
       // Generic retry logic for other errors
-      if (
-        attempt >= maxAttempts ||
-        !shouldRetryOnError(error as Error, retryFetchErrors)
-      ) {
+      if (attempt >= maxAttempts || !shouldRetryOnError(error as Error, retryFetchErrors)) {
         throw error;
       }
 
@@ -211,7 +188,7 @@ export async function retryWithBackoff<T>(
     }
   }
 
-  throw new Error('Retry attempts exhausted');
+  throw new Error("Retry attempts exhausted");
 }
 
 /**
@@ -220,20 +197,18 @@ export async function retryWithBackoff<T>(
  * @returns The HTTP status code, or undefined if not found.
  */
 export function getErrorStatus(error: unknown): number | undefined {
-  if (typeof error === 'object' && error !== null) {
-    if ('status' in error && typeof error.status === 'number') {
+  if (typeof error === "object" && error !== null) {
+    if ("status" in error && typeof error.status === "number") {
       return error.status;
     }
     // Check for error.response.status (common in axios errors)
     if (
-      'response' in error &&
-      typeof (error as { response?: unknown }).response === 'object' &&
+      "response" in error &&
+      typeof (error as { response?: unknown }).response === "object" &&
       (error as { response?: unknown }).response !== null
     ) {
-      const response = (
-        error as { response: { status?: unknown; headers?: unknown } }
-      ).response;
-      if ('status' in response && typeof response.status === 'number') {
+      const response = (error as { response: { status?: unknown; headers?: unknown } }).response;
+      if ("status" in response && typeof response.status === "number") {
         return response.status;
       }
     }
@@ -247,11 +222,7 @@ export function getErrorStatus(error: unknown): number | undefined {
  * @param error The error that caused the retry.
  * @param errorStatus The HTTP status code of the error, if available.
  */
-function logRetryAttempt(
-  attempt: number,
-  error: unknown,
-  errorStatus?: number,
-): void {
+function logRetryAttempt(attempt: number, error: unknown, errorStatus?: number): void {
   let message = `Attempt ${attempt} failed. Retrying with backoff...`;
   if (errorStatus) {
     message = `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...`;
@@ -263,16 +234,13 @@ function logRetryAttempt(
     console.error(message, error);
   } else if (error instanceof Error) {
     // Fallback for errors that might not have a status but have a message
-    if (error.message.includes('429')) {
+    if (error.message.includes("429")) {
       debugLogger.warn(
         `Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`,
         error,
       );
     } else if (error.message.match(/5\d{2}/)) {
-      console.error(
-        `Attempt ${attempt} failed with 5xx error. Retrying with backoff...`,
-        error,
-      );
+      console.error(`Attempt ${attempt} failed with 5xx error. Retrying with backoff...`, error);
     } else {
       debugLogger.warn(message, error); // Default to warn for other errors
     }
diff --git a/packages/gemini-core/src/utils/safeJsonStringify.test.ts b/packages/gemini-core/src/utils/safeJsonStringify.test.ts
index 9a38c0488..cbe353e79 100644
--- a/packages/gemini-core/src/utils/safeJsonStringify.test.ts
+++ b/packages/gemini-core/src/utils/safeJsonStringify.test.ts
@@ -4,54 +4,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { safeJsonStringify } from './safeJsonStringify.js';
+import { describe, expect, it } from "vitest";
+import { safeJsonStringify } from "./safeJsonStringify.js";
 
-describe('safeJsonStringify', () => {
-  it('should stringify normal objects without issues', () => {
-    const obj = { name: 'test', value: 42 };
+describe("safeJsonStringify", () => {
+  it("should stringify normal objects without issues", () => {
+    const obj = { name: "test", value: 42 };
     const result = safeJsonStringify(obj);
     expect(result).toBe('{"name":"test","value":42}');
   });
 
-  it('should handle circular references by replacing them with [Circular]', () => {
+  it("should handle circular references by replacing them with [Circular]", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const obj: any = { name: 'test' };
+    const obj: any = { name: "test" };
     obj.circular = obj; // Create circular reference
 
     const result = safeJsonStringify(obj);
     expect(result).toBe('{"name":"test","circular":"[Circular]"}');
   });
 
-  it('should handle complex circular structures like HttpsProxyAgent', () => {
+  it("should handle complex circular structures like HttpsProxyAgent", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const agent: any = {
       sockets: {},
-      options: { host: 'example.com' },
+      options: { host: "example.com" },
     };
-    agent.sockets['example.com'] = [{ agent }];
+    agent.sockets["example.com"] = [{ agent }];
 
     const result = safeJsonStringify(agent);
-    expect(result).toContain('[Circular]');
-    expect(result).toContain('example.com');
+    expect(result).toContain("[Circular]");
+    expect(result).toContain("example.com");
   });
 
-  it('should respect the space parameter for formatting', () => {
-    const obj = { name: 'test', value: 42 };
+  it("should respect the space parameter for formatting", () => {
+    const obj = { name: "test", value: 42 };
     const result = safeJsonStringify(obj, 2);
     expect(result).toBe('{\n  "name": "test",\n  "value": 42\n}');
   });
 
-  it('should handle circular references with formatting', () => {
+  it("should handle circular references with formatting", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const obj: any = { name: 'test' };
+    const obj: any = { name: "test" };
     obj.circular = obj;
 
     const result = safeJsonStringify(obj, 2);
     expect(result).toBe('{\n  "name": "test",\n  "circular": "[Circular]"\n}');
   });
 
-  it('should handle arrays with circular references', () => {
+  it("should handle arrays with circular references", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const arr: any[] = [{ id: 1 }];
     arr[0].parent = arr; // Create circular reference
@@ -60,14 +60,14 @@ describe('safeJsonStringify', () => {
     expect(result).toBe('[{"id":1,"parent":"[Circular]"}]');
   });
 
-  it('should handle null and undefined values', () => {
-    expect(safeJsonStringify(null)).toBe('null');
+  it("should handle null and undefined values", () => {
+    expect(safeJsonStringify(null)).toBe("null");
     expect(safeJsonStringify(undefined)).toBe(undefined);
   });
 
-  it('should handle primitive values', () => {
-    expect(safeJsonStringify('test')).toBe('"test"');
-    expect(safeJsonStringify(42)).toBe('42');
-    expect(safeJsonStringify(true)).toBe('true');
+  it("should handle primitive values", () => {
+    expect(safeJsonStringify("test")).toBe('"test"');
+    expect(safeJsonStringify(42)).toBe("42");
+    expect(safeJsonStringify(true)).toBe("true");
   });
 });
diff --git a/packages/gemini-core/src/utils/safeJsonStringify.ts b/packages/gemini-core/src/utils/safeJsonStringify.ts
index 00eeee8cd..0611f48c0 100644
--- a/packages/gemini-core/src/utils/safeJsonStringify.ts
+++ b/packages/gemini-core/src/utils/safeJsonStringify.ts
@@ -11,19 +11,16 @@
  * @param space - Optional space parameter for formatting (defaults to no formatting)
  * @returns JSON string with circular references replaced by [Circular]
  */
-import type { Config } from '../config/config.js';
+import type { Config } from "../config/config.js";
 
-export function safeJsonStringify(
-  obj: unknown,
-  space?: string | number,
-): string {
+export function safeJsonStringify(obj: unknown, space?: string | number): string {
   const seen = new WeakSet();
   return JSON.stringify(
     obj,
     (key, value) => {
-      if (typeof value === 'object' && value !== null) {
+      if (typeof value === "object" && value !== null) {
         if (seen.has(value)) {
-          return '[Circular]';
+          return "[Circular]";
         }
         seen.add(value);
       }
@@ -38,7 +35,7 @@ function removeEmptyObjects(data: any): object {
   const cleanedObject: { [key: string]: unknown } = {};
   for (const k in data) {
     const v = data[k];
-    if (v !== null && v !== undefined && typeof v === 'boolean') {
+    if (v !== null && v !== undefined && typeof v === "boolean") {
       cleanedObject[k] = v;
     }
   }
@@ -60,9 +57,9 @@ export function safeJsonStringifyBooleanValuesOnly(obj: any): string {
       configSeen = true;
       return value;
     }
-    if (typeof value === 'boolean') {
+    if (typeof value === "boolean") {
       return value;
     }
-    return '';
+    return "";
   });
 }
diff --git a/packages/gemini-core/src/utils/schemaValidator.test.ts b/packages/gemini-core/src/utils/schemaValidator.test.ts
index ecd10321d..e3525d2c9 100644
--- a/packages/gemini-core/src/utils/schemaValidator.test.ts
+++ b/packages/gemini-core/src/utils/schemaValidator.test.ts
@@ -4,121 +4,119 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, expect, it } from 'vitest';
-import { SchemaValidator } from './schemaValidator.js';
+import { describe, expect, it } from "vitest";
+import { SchemaValidator } from "./schemaValidator.js";
 
-describe('SchemaValidator', () => {
-  it('should allow any params if schema is undefined', () => {
+describe("SchemaValidator", () => {
+  it("should allow any params if schema is undefined", () => {
     const params = {
-      foo: 'bar',
+      foo: "bar",
     };
     expect(SchemaValidator.validate(undefined, params)).toBeNull();
   });
 
-  it('rejects null params', () => {
+  it("rejects null params", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         foo: {
-          type: 'string',
+          type: "string",
         },
       },
     };
-    expect(SchemaValidator.validate(schema, null)).toBe(
-      'Value of params must be an object',
-    );
+    expect(SchemaValidator.validate(schema, null)).toBe("Value of params must be an object");
   });
 
-  it('rejects params that are not objects', () => {
+  it("rejects params that are not objects", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         foo: {
-          type: 'string',
+          type: "string",
         },
       },
     };
-    expect(SchemaValidator.validate(schema, 'not an object')).toBe(
-      'Value of params must be an object',
+    expect(SchemaValidator.validate(schema, "not an object")).toBe(
+      "Value of params must be an object",
     );
   });
 
-  it('allows schema with extra properties', () => {
+  it("allows schema with extra properties", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         example_enum: {
-          type: 'string',
-          enum: ['FOO', 'BAR'],
+          type: "string",
+          enum: ["FOO", "BAR"],
           // enum-descriptions is not part of the JSON schema spec.
           // This test verifies that the SchemaValidator allows the
           // use of extra keywords, like this one, in the schema.
-          'enum-descriptions': ['a foo', 'a bar'],
+          "enum-descriptions": ["a foo", "a bar"],
         },
       },
     };
     const params = {
-      example_enum: 'BAR',
+      example_enum: "BAR",
     };
 
     expect(SchemaValidator.validate(schema, params)).toBeNull();
   });
 
-  it('allows custom format values', () => {
+  it("allows custom format values", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         duration: {
-          type: 'string',
+          type: "string",
           // See: https://cloud.google.com/docs/discovery/type-format
-          format: 'google-duration',
+          format: "google-duration",
         },
         mask: {
-          type: 'string',
-          format: 'google-fieldmask',
+          type: "string",
+          format: "google-fieldmask",
         },
         foo: {
-          type: 'string',
-          format: 'something-totally-custom',
+          type: "string",
+          format: "something-totally-custom",
         },
       },
     };
     const params = {
-      duration: '10s',
-      mask: 'foo.bar,biz.baz',
-      foo: 'some value',
+      duration: "10s",
+      mask: "foo.bar,biz.baz",
+      foo: "some value",
     };
     expect(SchemaValidator.validate(schema, params)).toBeNull();
   });
 
-  it('allows valid values for known formats', () => {
+  it("allows valid values for known formats", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         today: {
-          type: 'string',
-          format: 'date',
+          type: "string",
+          format: "date",
         },
       },
     };
     const params = {
-      today: '2025-04-08',
+      today: "2025-04-08",
     };
     expect(SchemaValidator.validate(schema, params)).toBeNull();
   });
 
-  it('rejects invalid values for known formats', () => {
+  it("rejects invalid values for known formats", () => {
     const schema = {
-      type: 'object',
+      type: "object",
       properties: {
         today: {
-          type: 'string',
-          format: 'date',
+          type: "string",
+          format: "date",
         },
       },
     };
     const params = {
-      today: 'this is not a date',
+      today: "this is not a date",
     };
     expect(SchemaValidator.validate(schema, params)).not.toBeNull();
   });
diff --git a/packages/gemini-core/src/utils/schemaValidator.ts b/packages/gemini-core/src/utils/schemaValidator.ts
index 9c7376e4d..895287030 100644
--- a/packages/gemini-core/src/utils/schemaValidator.ts
+++ b/packages/gemini-core/src/utils/schemaValidator.ts
@@ -4,8 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import AjvPkg from 'ajv';
-import * as addFormats from 'ajv-formats';
+import AjvPkg from "ajv";
+import * as addFormats from "ajv-formats";
+
 // Ajv's ESM/CJS interop: use 'any' for compatibility as recommended by Ajv docs
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const AjvClass = (AjvPkg as any).default || AjvPkg;
@@ -37,13 +38,13 @@ export class SchemaValidator {
     if (!schema) {
       return null;
     }
-    if (typeof data !== 'object' || data === null) {
-      return 'Value of params must be an object';
+    if (typeof data !== "object" || data === null) {
+      return "Value of params must be an object";
     }
     const validate = ajValidator.compile(schema);
     const valid = validate(data);
     if (!valid && validate.errors) {
-      return ajValidator.errorsText(validate.errors, { dataVar: 'params' });
+      return ajValidator.errorsText(validate.errors, { dataVar: "params" });
     }
     return null;
   }
diff --git a/packages/gemini-core/src/utils/secure-browser-launcher.test.ts b/packages/gemini-core/src/utils/secure-browser-launcher.test.ts
index de27ce6ff..ec2789a91 100644
--- a/packages/gemini-core/src/utils/secure-browser-launcher.test.ts
+++ b/packages/gemini-core/src/utils/secure-browser-launcher.test.ts
@@ -4,96 +4,84 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { openBrowserSecurely } from './secure-browser-launcher.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { openBrowserSecurely } from "./secure-browser-launcher.js";
 
 // Create mock function using vi.hoisted
 const mockExecFile = vi.hoisted(() => vi.fn());
 
 // Mock modules
-vi.mock('node:child_process');
-vi.mock('node:util', () => ({
+vi.mock("node:child_process");
+vi.mock("node:util", () => ({
   promisify: () => mockExecFile,
 }));
 
-describe('secure-browser-launcher', () => {
+describe("secure-browser-launcher", () => {
   let originalPlatform: PropertyDescriptor | undefined;
 
   beforeEach(() => {
     vi.clearAllMocks();
-    mockExecFile.mockResolvedValue({ stdout: '', stderr: '' });
-    originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');
+    mockExecFile.mockResolvedValue({ stdout: "", stderr: "" });
+    originalPlatform = Object.getOwnPropertyDescriptor(process, "platform");
   });
 
   afterEach(() => {
     if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform);
+      Object.defineProperty(process, "platform", originalPlatform);
     }
   });
 
   function setPlatform(platform: string) {
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: platform,
       configurable: true,
     });
   }
 
-  describe('URL validation', () => {
-    it('should allow valid HTTP URLs', async () => {
-      setPlatform('darwin');
-      await openBrowserSecurely('http://example.com');
-      expect(mockExecFile).toHaveBeenCalledWith(
-        'open',
-        ['http://example.com'],
-        expect.any(Object),
-      );
+  describe("URL validation", () => {
+    it("should allow valid HTTP URLs", async () => {
+      setPlatform("darwin");
+      await openBrowserSecurely("http://example.com");
+      expect(mockExecFile).toHaveBeenCalledWith("open", ["http://example.com"], expect.any(Object));
     });
 
-    it('should allow valid HTTPS URLs', async () => {
-      setPlatform('darwin');
-      await openBrowserSecurely('https://example.com');
+    it("should allow valid HTTPS URLs", async () => {
+      setPlatform("darwin");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'open',
-        ['https://example.com'],
+        "open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
 
-    it('should reject non-HTTP(S) protocols', async () => {
-      await expect(openBrowserSecurely('file:///etc/passwd')).rejects.toThrow(
-        'Unsafe protocol',
-      );
-      await expect(openBrowserSecurely('javascript:alert(1)')).rejects.toThrow(
-        'Unsafe protocol',
-      );
-      await expect(openBrowserSecurely('ftp://example.com')).rejects.toThrow(
-        'Unsafe protocol',
-      );
+    it("should reject non-HTTP(S) protocols", async () => {
+      await expect(openBrowserSecurely("file:///etc/passwd")).rejects.toThrow("Unsafe protocol");
+      await expect(openBrowserSecurely("javascript:alert(1)")).rejects.toThrow("Unsafe protocol");
+      await expect(openBrowserSecurely("ftp://example.com")).rejects.toThrow("Unsafe protocol");
     });
 
-    it('should reject invalid URLs', async () => {
-      await expect(openBrowserSecurely('not-a-url')).rejects.toThrow(
-        'Invalid URL',
-      );
-      await expect(openBrowserSecurely('')).rejects.toThrow('Invalid URL');
+    it("should reject invalid URLs", async () => {
+      await expect(openBrowserSecurely("not-a-url")).rejects.toThrow("Invalid URL");
+      await expect(openBrowserSecurely("")).rejects.toThrow("Invalid URL");
     });
 
-    it('should reject URLs with control characters', async () => {
-      await expect(
-        openBrowserSecurely('http://example.com\nmalicious-command'),
-      ).rejects.toThrow('invalid characters');
-      await expect(
-        openBrowserSecurely('http://example.com\rmalicious-command'),
-      ).rejects.toThrow('invalid characters');
-      await expect(
-        openBrowserSecurely('http://example.com\x00'),
-      ).rejects.toThrow('invalid characters');
+    it("should reject URLs with control characters", async () => {
+      await expect(openBrowserSecurely("http://example.com\nmalicious-command")).rejects.toThrow(
+        "invalid characters",
+      );
+      await expect(openBrowserSecurely("http://example.com\rmalicious-command")).rejects.toThrow(
+        "invalid characters",
+      );
+      await expect(openBrowserSecurely("http://example.com\x00")).rejects.toThrow(
+        "invalid characters",
+      );
     });
   });
 
-  describe('Command injection prevention', () => {
-    it('should prevent PowerShell command injection on Windows', async () => {
-      setPlatform('win32');
+  describe("Command injection prevention", () => {
+    it("should prevent PowerShell command injection on Windows", async () => {
+      setPlatform("win32");
 
       // The POC from the vulnerability report
       const maliciousUrl =
@@ -103,58 +91,53 @@ describe('secure-browser-launcher', () => {
 
       // Verify that execFile was called (not exec) and the URL is passed safely
       expect(mockExecFile).toHaveBeenCalledWith(
-        'powershell.exe',
+        "powershell.exe",
         [
-          '-NoProfile',
-          '-NonInteractive',
-          '-WindowStyle',
-          'Hidden',
-          '-Command',
+          "-NoProfile",
+          "-NonInteractive",
+          "-WindowStyle",
+          "Hidden",
+          "-Command",
           `Start-Process '${maliciousUrl.replace(/'/g, "''")}'`,
         ],
         expect.any(Object),
       );
     });
 
-    it('should handle URLs with special shell characters safely', async () => {
-      setPlatform('darwin');
+    it("should handle URLs with special shell characters safely", async () => {
+      setPlatform("darwin");
 
       const urlsWithSpecialChars = [
-        'http://example.com/path?param=value&other=$value',
-        'http://example.com/path#fragment;command',
-        'http://example.com/$(whoami)',
-        'http://example.com/`command`',
-        'http://example.com/|pipe',
-        'http://example.com/>redirect',
+        "http://example.com/path?param=value&other=$value",
+        "http://example.com/path#fragment;command",
+        "http://example.com/$(whoami)",
+        "http://example.com/`command`",
+        "http://example.com/|pipe",
+        "http://example.com/>redirect",
       ];
 
       for (const url of urlsWithSpecialChars) {
         await openBrowserSecurely(url);
         // Verify the URL is passed as an argument, not interpreted by shell
-        expect(mockExecFile).toHaveBeenCalledWith(
-          'open',
-          [url],
-          expect.any(Object),
-        );
+        expect(mockExecFile).toHaveBeenCalledWith("open", [url], expect.any(Object));
       }
     });
 
-    it('should properly escape single quotes in URLs on Windows', async () => {
-      setPlatform('win32');
+    it("should properly escape single quotes in URLs on Windows", async () => {
+      setPlatform("win32");
 
-      const urlWithSingleQuotes =
-        "http://example.com/path?name=O'Brien&test='value'";
+      const urlWithSingleQuotes = "http://example.com/path?name=O'Brien&test='value'";
       await openBrowserSecurely(urlWithSingleQuotes);
 
       // Verify that single quotes are escaped by doubling them
       expect(mockExecFile).toHaveBeenCalledWith(
-        'powershell.exe',
+        "powershell.exe",
         [
-          '-NoProfile',
-          '-NonInteractive',
-          '-WindowStyle',
-          'Hidden',
-          '-Command',
+          "-NoProfile",
+          "-NonInteractive",
+          "-WindowStyle",
+          "Hidden",
+          "-Command",
           `Start-Process 'http://example.com/path?name=O''Brien&test=''value'''`,
         ],
         expect.any(Object),
@@ -162,79 +145,76 @@ describe('secure-browser-launcher', () => {
     });
   });
 
-  describe('Platform-specific behavior', () => {
-    it('should use correct command on macOS', async () => {
-      setPlatform('darwin');
-      await openBrowserSecurely('https://example.com');
+  describe("Platform-specific behavior", () => {
+    it("should use correct command on macOS", async () => {
+      setPlatform("darwin");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'open',
-        ['https://example.com'],
+        "open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
 
-    it('should use PowerShell on Windows', async () => {
-      setPlatform('win32');
-      await openBrowserSecurely('https://example.com');
+    it("should use PowerShell on Windows", async () => {
+      setPlatform("win32");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'powershell.exe',
-        expect.arrayContaining([
-          '-Command',
-          `Start-Process 'https://example.com'`,
-        ]),
+        "powershell.exe",
+        expect.arrayContaining(["-Command", `Start-Process 'https://example.com'`]),
         expect.any(Object),
       );
     });
 
-    it('should use xdg-open on Linux', async () => {
-      setPlatform('linux');
-      await openBrowserSecurely('https://example.com');
+    it("should use xdg-open on Linux", async () => {
+      setPlatform("linux");
+      await openBrowserSecurely("https://example.com");
       expect(mockExecFile).toHaveBeenCalledWith(
-        'xdg-open',
-        ['https://example.com'],
+        "xdg-open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
 
-    it('should throw on unsupported platforms', async () => {
-      setPlatform('aix');
-      await expect(openBrowserSecurely('https://example.com')).rejects.toThrow(
-        'Unsupported platform',
+    it("should throw on unsupported platforms", async () => {
+      setPlatform("aix");
+      await expect(openBrowserSecurely("https://example.com")).rejects.toThrow(
+        "Unsupported platform",
       );
     });
   });
 
-  describe('Error handling', () => {
-    it('should handle browser launch failures gracefully', async () => {
-      setPlatform('darwin');
-      mockExecFile.mockRejectedValueOnce(new Error('Command not found'));
+  describe("Error handling", () => {
+    it("should handle browser launch failures gracefully", async () => {
+      setPlatform("darwin");
+      mockExecFile.mockRejectedValueOnce(new Error("Command not found"));
 
-      await expect(openBrowserSecurely('https://example.com')).rejects.toThrow(
-        'Failed to open browser',
+      await expect(openBrowserSecurely("https://example.com")).rejects.toThrow(
+        "Failed to open browser",
       );
     });
 
-    it('should try fallback browsers on Linux', async () => {
-      setPlatform('linux');
+    it("should try fallback browsers on Linux", async () => {
+      setPlatform("linux");
 
       // First call to xdg-open fails
-      mockExecFile.mockRejectedValueOnce(new Error('Command not found'));
+      mockExecFile.mockRejectedValueOnce(new Error("Command not found"));
       // Second call to gnome-open succeeds
-      mockExecFile.mockResolvedValueOnce({ stdout: '', stderr: '' });
+      mockExecFile.mockResolvedValueOnce({ stdout: "", stderr: "" });
 
-      await openBrowserSecurely('https://example.com');
+      await openBrowserSecurely("https://example.com");
 
       expect(mockExecFile).toHaveBeenCalledTimes(2);
       expect(mockExecFile).toHaveBeenNthCalledWith(
         1,
-        'xdg-open',
-        ['https://example.com'],
+        "xdg-open",
+        ["https://example.com"],
         expect.any(Object),
       );
       expect(mockExecFile).toHaveBeenNthCalledWith(
         2,
-        'gnome-open',
-        ['https://example.com'],
+        "gnome-open",
+        ["https://example.com"],
         expect.any(Object),
       );
     });
diff --git a/packages/gemini-core/src/utils/secure-browser-launcher.ts b/packages/gemini-core/src/utils/secure-browser-launcher.ts
index c60a646d1..fb15f0869 100644
--- a/packages/gemini-core/src/utils/secure-browser-launcher.ts
+++ b/packages/gemini-core/src/utils/secure-browser-launcher.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { platform } from 'node:os';
-import { URL } from 'node:url';
+import { execFile } from "node:child_process";
+import { platform } from "node:os";
+import { URL } from "node:url";
+import { promisify } from "node:util";
 
 const execFileAsync = promisify(execFile);
 
@@ -28,16 +28,14 @@ function validateUrl(url: string): void {
   }
 
   // Only allow HTTP and HTTPS protocols
-  if (parsedUrl.protocol !== 'http:' && parsedUrl.protocol !== 'https:') {
-    throw new Error(
-      `Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`,
-    );
+  if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+    throw new Error(`Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`);
   }
 
   // Additional validation: ensure no newlines or control characters
   // eslint-disable-next-line no-control-regex
   if (/[\r\n\x00-\x1f]/.test(url)) {
-    throw new Error('URL contains invalid characters');
+    throw new Error("URL contains invalid characters");
   }
 }
 
@@ -60,32 +58,32 @@ export async function openBrowserSecurely(url: string): Promise<void> {
   let args: string[];
 
   switch (platformName) {
-    case 'darwin':
+    case "darwin":
       // macOS
-      command = 'open';
+      command = "open";
       args = [url];
       break;
 
-    case 'win32':
+    case "win32":
       // Windows - use PowerShell with Start-Process
       // This avoids the cmd.exe shell which is vulnerable to injection
-      command = 'powershell.exe';
+      command = "powershell.exe";
       args = [
-        '-NoProfile',
-        '-NonInteractive',
-        '-WindowStyle',
-        'Hidden',
-        '-Command',
+        "-NoProfile",
+        "-NonInteractive",
+        "-WindowStyle",
+        "Hidden",
+        "-Command",
         `Start-Process '${url.replace(/'/g, "''")}'`,
       ];
       break;
 
-    case 'linux':
-    case 'freebsd':
-    case 'openbsd':
+    case "linux":
+    case "freebsd":
+    case "openbsd":
       // Linux and BSD variants
       // Try xdg-open first, fall back to other options
-      command = 'xdg-open';
+      command = "xdg-open";
       args = [url];
       break;
 
@@ -102,7 +100,7 @@ export async function openBrowserSecurely(url: string): Promise<void> {
     },
     // Detach the browser process so it doesn't block
     detached: true,
-    stdio: 'ignore',
+    stdio: "ignore",
   };
 
   try {
@@ -110,18 +108,10 @@ export async function openBrowserSecurely(url: string): Promise<void> {
   } catch (error) {
     // For Linux, try fallback commands if xdg-open fails
     if (
-      (platformName === 'linux' ||
-        platformName === 'freebsd' ||
-        platformName === 'openbsd') &&
-      command === 'xdg-open'
+      (platformName === "linux" || platformName === "freebsd" || platformName === "openbsd") &&
+      command === "xdg-open"
     ) {
-      const fallbackCommands = [
-        'gnome-open',
-        'kde-open',
-        'firefox',
-        'chromium',
-        'google-chrome',
-      ];
+      const fallbackCommands = ["gnome-open", "kde-open", "firefox", "chromium", "google-chrome"];
 
       for (const fallbackCommand of fallbackCommands) {
         try {
@@ -136,7 +126,7 @@ export async function openBrowserSecurely(url: string): Promise<void> {
 
     // Re-throw the error if all attempts failed
     throw new Error(
-      `Failed to open browser: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      `Failed to open browser: ${error instanceof Error ? error.message : "Unknown error"}`,
     );
   }
 }
@@ -150,29 +140,26 @@ export async function openBrowserSecurely(url: string): Promise<void> {
 export function shouldLaunchBrowser(): boolean {
   // A list of browser names that indicate we should not attempt to open a
   // web browser for the user.
-  const browserBlocklist = ['www-browser'];
-  const browserEnv = process.env['BROWSER'];
+  const browserBlocklist = ["www-browser"];
+  const browserEnv = process.env["BROWSER"];
   if (browserEnv && browserBlocklist.includes(browserEnv)) {
     return false;
   }
 
   // Common environment variables used in CI/CD or other non-interactive shells.
-  if (
-    process.env['CI'] ||
-    process.env['DEBIAN_FRONTEND'] === 'noninteractive'
-  ) {
+  if (process.env["CI"] || process.env["DEBIAN_FRONTEND"] === "noninteractive") {
     return false;
   }
 
   // The presence of SSH_CONNECTION indicates a remote session.
   // We should not attempt to launch a browser unless a display is explicitly available
   // (checked below for Linux).
-  const isSSH = !!process.env['SSH_CONNECTION'];
+  const isSSH = !!process.env["SSH_CONNECTION"];
 
   // On Linux, the presence of a display server is a strong indicator of a GUI.
-  if (platform() === 'linux') {
+  if (platform() === "linux") {
     // These are environment variables that can indicate a running compositor on Linux.
-    const displayVariables = ['DISPLAY', 'WAYLAND_DISPLAY', 'MIR_SOCKET'];
+    const displayVariables = ["DISPLAY", "WAYLAND_DISPLAY", "MIR_SOCKET"];
     const hasDisplay = displayVariables.some((v) => !!process.env[v]);
     if (!hasDisplay) {
       return false;
@@ -181,7 +168,7 @@ export function shouldLaunchBrowser(): boolean {
 
   // If in an SSH session on a non-Linux OS (e.g., macOS), don't launch browser.
   // The Linux case is handled above (it's allowed if DISPLAY is set).
-  if (isSSH && platform() !== 'linux') {
+  if (isSSH && platform() !== "linux") {
     return false;
   }
 
diff --git a/packages/gemini-core/src/utils/session.ts b/packages/gemini-core/src/utils/session.ts
index 96cdbbf48..ae8694433 100644
--- a/packages/gemini-core/src/utils/session.ts
+++ b/packages/gemini-core/src/utils/session.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { randomUUID } from 'node:crypto';
+import { randomUUID } from "node:crypto";
 
 export const sessionId = randomUUID();
diff --git a/packages/gemini-core/src/utils/shell-utils.test.ts b/packages/gemini-core/src/utils/shell-utils.test.ts
index 6414664e8..b082621a4 100644
--- a/packages/gemini-core/src/utils/shell-utils.test.ts
+++ b/packages/gemini-core/src/utils/shell-utils.test.ts
@@ -4,31 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  expect,
-  describe,
-  it,
-  beforeEach,
-  beforeAll,
-  vi,
-  afterEach,
-} from 'vitest';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Config } from "../config/config.js";
+import type { AnyToolInvocation } from "../index.js";
 import {
   checkCommandPermissions,
   escapeShellArg,
   getCommandRoots,
   getShellConfiguration,
-  isCommandAllowed,
   initializeShellParsers,
-  stripShellWrapper,
+  isCommandAllowed,
   isShellInvocationAllowlisted,
-} from './shell-utils.js';
-import type { Config } from '../config/config.js';
-import type { AnyToolInvocation } from '../index.js';
+  stripShellWrapper,
+} from "./shell-utils.js";
 
 const mockPlatform = vi.hoisted(() => vi.fn());
 const mockHomedir = vi.hoisted(() => vi.fn());
-vi.mock('os', () => ({
+vi.mock("os", () => ({
   default: {
     platform: mockPlatform,
     homedir: mockHomedir,
@@ -38,24 +30,22 @@ vi.mock('os', () => ({
 }));
 
 const mockQuote = vi.hoisted(() => vi.fn());
-vi.mock('shell-quote', () => ({
+vi.mock("shell-quote", () => ({
   quote: mockQuote,
 }));
 
 let config: Config;
-const isWindowsRuntime = process.platform === 'win32';
+const isWindowsRuntime = process.platform === "win32";
 const describeWindowsOnly = isWindowsRuntime ? describe : describe.skip;
 
 beforeAll(async () => {
-  mockPlatform.mockReturnValue('linux');
+  mockPlatform.mockReturnValue("linux");
   await initializeShellParsers();
 });
 
 beforeEach(() => {
-  mockPlatform.mockReturnValue('linux');
-  mockQuote.mockImplementation((args: string[]) =>
-    args.map((arg) => `'${arg}'`).join(' '),
-  );
+  mockPlatform.mockReturnValue("linux");
+  mockQuote.mockImplementation((args: string[]) => args.map((arg) => `'${arg}'`).join(" "));
   config = {
     getCoreTools: () => [],
     getExcludeTools: () => new Set([]),
@@ -67,109 +57,87 @@ afterEach(() => {
   vi.clearAllMocks();
 });
 
-describe('isCommandAllowed', () => {
-  it('should allow a command if no restrictions are provided', () => {
-    const result = isCommandAllowed('goodCommand --safe', config);
+describe("isCommandAllowed", () => {
+  it("should allow a command if no restrictions are provided", () => {
+    const result = isCommandAllowed("goodCommand --safe", config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should allow a command if it is in the global allowlist', () => {
-    config.getCoreTools = () => ['ShellTool(goodCommand)'];
-    const result = isCommandAllowed('goodCommand --safe', config);
+  it("should allow a command if it is in the global allowlist", () => {
+    config.getCoreTools = () => ["ShellTool(goodCommand)"];
+    const result = isCommandAllowed("goodCommand --safe", config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should block a command if it is not in a strict global allowlist', () => {
-    config.getCoreTools = () => ['ShellTool(goodCommand --safe)'];
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should block a command if it is not in a strict global allowlist", () => {
+    config.getCoreTools = () => ["ShellTool(goodCommand --safe)"];
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "badCommand --danger"`,
     );
   });
 
-  it('should block a command if it is in the blocked list', () => {
-    config.getExcludeTools = () => new Set(['ShellTool(badCommand --danger)']);
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should block a command if it is in the blocked list", () => {
+    config.getExcludeTools = () => new Set(["ShellTool(badCommand --danger)"]);
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should prioritize the blocklist over the allowlist', () => {
-    config.getCoreTools = () => ['ShellTool(badCommand --danger)'];
-    config.getExcludeTools = () => new Set(['ShellTool(badCommand --danger)']);
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should prioritize the blocklist over the allowlist", () => {
+    config.getCoreTools = () => ["ShellTool(badCommand --danger)"];
+    config.getExcludeTools = () => new Set(["ShellTool(badCommand --danger)"]);
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should allow any command when a wildcard is in coreTools', () => {
-    config.getCoreTools = () => ['ShellTool'];
-    const result = isCommandAllowed('any random command', config);
+  it("should allow any command when a wildcard is in coreTools", () => {
+    config.getCoreTools = () => ["ShellTool"];
+    const result = isCommandAllowed("any random command", config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should block any command when a wildcard is in excludeTools', () => {
-    config.getExcludeTools = () => new Set(['run_shell_command']);
-    const result = isCommandAllowed('any random command', config);
+  it("should block any command when a wildcard is in excludeTools", () => {
+    config.getExcludeTools = () => new Set(["run_shell_command"]);
+    const result = isCommandAllowed("any random command", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      'Shell tool is globally disabled in configuration',
-    );
+    expect(result.reason).toBe("Shell tool is globally disabled in configuration");
   });
 
-  it('should block a command on the blocklist even with a wildcard allow', () => {
-    config.getCoreTools = () => ['ShellTool'];
-    config.getExcludeTools = () => new Set(['ShellTool(badCommand --danger)']);
-    const result = isCommandAllowed('badCommand --danger', config);
+  it("should block a command on the blocklist even with a wildcard allow", () => {
+    config.getCoreTools = () => ["ShellTool"];
+    config.getExcludeTools = () => new Set(["ShellTool(badCommand --danger)"]);
+    const result = isCommandAllowed("badCommand --danger", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should allow a chained command if all parts are on the global allowlist', () => {
-    config.getCoreTools = () => [
-      'run_shell_command(echo)',
-      'run_shell_command(goodCommand)',
-    ];
-    const result = isCommandAllowed(
-      'echo "hello" && goodCommand --safe',
-      config,
-    );
+  it("should allow a chained command if all parts are on the global allowlist", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)", "run_shell_command(goodCommand)"];
+    const result = isCommandAllowed('echo "hello" && goodCommand --safe', config);
     expect(result.allowed).toBe(true);
   });
 
-  it('should block a chained command if any part is blocked', () => {
-    config.getExcludeTools = () => new Set(['run_shell_command(badCommand)']);
-    const result = isCommandAllowed(
-      'echo "hello" && badCommand --danger',
-      config,
-    );
+  it("should block a chained command if any part is blocked", () => {
+    config.getExcludeTools = () => new Set(["run_shell_command(badCommand)"]);
+    const result = isCommandAllowed('echo "hello" && badCommand --danger', config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      `Command 'badCommand --danger' is blocked by configuration`,
-    );
+    expect(result.reason).toBe(`Command 'badCommand --danger' is blocked by configuration`);
   });
 
-  it('should block a command that redefines an allowed function to run an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed(
-      'echo () (curl google.com) ; echo Hello World',
-      config,
-    );
+  it("should block a command that redefines an allowed function to run an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo () (curl google.com) ; echo Hello World", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block a multi-line function body that runs an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
+  it("should block a multi-line function body that runs an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
     const result = isCommandAllowed(
       `echo () {
   curl google.com
@@ -182,50 +150,44 @@ describe('isCommandAllowed', () => {
     );
   });
 
-  it('should block a function keyword declaration that runs an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed(
-      'function echo { curl google.com; } ; echo hi',
-      config,
-    );
+  it("should block a function keyword declaration that runs an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("function echo { curl google.com; } ; echo hi", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block command substitution that invokes an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo $(curl google.com)', config);
+  it("should block command substitution that invokes an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo $(curl google.com)", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block pipelines that invoke an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo hi | curl google.com', config);
+  it("should block pipelines that invoke an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo hi | curl google.com", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block background jobs that invoke an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo hi & curl google.com', config);
+  it("should block background jobs that invoke an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo hi & curl google.com", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block command substitution inside a here-document when the inner command is unlisted', () => {
-    config.getCoreTools = () => [
-      'run_shell_command(echo)',
-      'run_shell_command(cat)',
-    ];
+  it("should block command substitution inside a here-document when the inner command is unlisted", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)", "run_shell_command(cat)"];
     const result = isCommandAllowed(
       `cat <<EOF
 $(rm -rf /)
@@ -238,32 +200,26 @@ EOF`,
     );
   });
 
-  it('should block backtick substitution that invokes an unlisted command', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
-    const result = isCommandAllowed('echo `curl google.com`', config);
+  it("should block backtick substitution that invokes an unlisted command", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
+    const result = isCommandAllowed("echo `curl google.com`", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block process substitution using <() when the inner command is unlisted', () => {
-    config.getCoreTools = () => [
-      'run_shell_command(diff)',
-      'run_shell_command(echo)',
-    ];
-    const result = isCommandAllowed(
-      'diff <(curl google.com) <(echo safe)',
-      config,
-    );
+  it("should block process substitution using <() when the inner command is unlisted", () => {
+    config.getCoreTools = () => ["run_shell_command(diff)", "run_shell_command(echo)"];
+    const result = isCommandAllowed("diff <(curl google.com) <(echo safe)", config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
       `Command(s) not in the allowed commands list. Disallowed commands: "curl google.com"`,
     );
   });
 
-  it('should block process substitution using >() when the inner command is unlisted', () => {
-    config.getCoreTools = () => ['run_shell_command(echo)'];
+  it("should block process substitution using >() when the inner command is unlisted", () => {
+    config.getCoreTools = () => ["run_shell_command(echo)"];
     const result = isCommandAllowed('echo "data" > >(curl google.com)', config);
     expect(result.allowed).toBe(false);
     expect(result.reason).toBe(
@@ -271,109 +227,94 @@ EOF`,
     );
   });
 
-  it('should block commands containing prompt transformations', () => {
-    const result = isCommandAllowed(
-      'echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"',
-      config,
-    );
+  it("should block commands containing prompt transformations", () => {
+    const result = isCommandAllowed('echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"', config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      'Command rejected because it could not be parsed safely',
-    );
+    expect(result.reason).toBe("Command rejected because it could not be parsed safely");
   });
 
-  it('should block simple prompt transformation expansions', () => {
-    const result = isCommandAllowed('echo ${foo@P}', config);
+  it("should block simple prompt transformation expansions", () => {
+    const result = isCommandAllowed("echo ${foo@P}", config);
     expect(result.allowed).toBe(false);
-    expect(result.reason).toBe(
-      'Command rejected because it could not be parsed safely',
-    );
+    expect(result.reason).toBe("Command rejected because it could not be parsed safely");
   });
 
-  describe('command substitution', () => {
-    it('should allow command substitution using `$(...)`', () => {
-      const result = isCommandAllowed('echo $(goodCommand --safe)', config);
+  describe("command substitution", () => {
+    it("should allow command substitution using `$(...)`", () => {
+      const result = isCommandAllowed("echo $(goodCommand --safe)", config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow command substitution using `<(...)`', () => {
-      const result = isCommandAllowed('diff <(ls) <(ls -a)', config);
+    it("should allow command substitution using `<(...)`", () => {
+      const result = isCommandAllowed("diff <(ls) <(ls -a)", config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow command substitution using `>(...)`', () => {
-      const result = isCommandAllowed(
-        'echo "Log message" > >(tee log.txt)',
-        config,
-      );
+    it("should allow command substitution using `>(...)`", () => {
+      const result = isCommandAllowed('echo "Log message" > >(tee log.txt)', config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow command substitution using backticks', () => {
-      const result = isCommandAllowed('echo `goodCommand --safe`', config);
+    it("should allow command substitution using backticks", () => {
+      const result = isCommandAllowed("echo `goodCommand --safe`", config);
       expect(result.allowed).toBe(true);
       expect(result.reason).toBeUndefined();
     });
 
-    it('should allow substitution-like patterns inside single quotes', () => {
-      config.getCoreTools = () => ['ShellTool(echo)'];
+    it("should allow substitution-like patterns inside single quotes", () => {
+      config.getCoreTools = () => ["ShellTool(echo)"];
       const result = isCommandAllowed("echo '$(pwd)'", config);
       expect(result.allowed).toBe(true);
     });
 
-    it('should block a command when parsing fails', () => {
-      const result = isCommandAllowed('ls &&', config);
+    it("should block a command when parsing fails", () => {
+      const result = isCommandAllowed("ls &&", config);
       expect(result.allowed).toBe(false);
-      expect(result.reason).toBe(
-        'Command rejected because it could not be parsed safely',
-      );
+      expect(result.reason).toBe("Command rejected because it could not be parsed safely");
     });
   });
 });
 
-describe('checkCommandPermissions', () => {
+describe("checkCommandPermissions", () => {
   describe('in "Default Allow" mode (no sessionAllowlist)', () => {
-    it('should return a detailed success object for an allowed command', () => {
-      const result = checkCommandPermissions('goodCommand --safe', config);
+    it("should return a detailed success object for an allowed command", () => {
+      const result = checkCommandPermissions("goodCommand --safe", config);
       expect(result).toEqual({
         allAllowed: true,
         disallowedCommands: [],
       });
     });
 
-    it('should block commands that cannot be parsed safely', () => {
-      const result = checkCommandPermissions('ls &&', config);
+    it("should block commands that cannot be parsed safely", () => {
+      const result = checkCommandPermissions("ls &&", config);
       expect(result).toEqual({
         allAllowed: false,
-        disallowedCommands: ['ls &&'],
-        blockReason: 'Command rejected because it could not be parsed safely',
+        disallowedCommands: ["ls &&"],
+        blockReason: "Command rejected because it could not be parsed safely",
         isHardDenial: true,
       });
     });
 
-    it('should return a detailed failure object for a blocked command', () => {
-      config.getExcludeTools = () => new Set(['ShellTool(badCommand)']);
-      const result = checkCommandPermissions('badCommand --danger', config);
+    it("should return a detailed failure object for a blocked command", () => {
+      config.getExcludeTools = () => new Set(["ShellTool(badCommand)"]);
+      const result = checkCommandPermissions("badCommand --danger", config);
       expect(result).toEqual({
         allAllowed: false,
-        disallowedCommands: ['badCommand --danger'],
+        disallowedCommands: ["badCommand --danger"],
         blockReason: `Command 'badCommand --danger' is blocked by configuration`,
         isHardDenial: true,
       });
     });
 
-    it('should return a detailed failure object for a command not on a strict allowlist', () => {
-      config.getCoreTools = () => ['ShellTool(goodCommand)'];
-      const result = checkCommandPermissions(
-        'git status && goodCommand',
-        config,
-      );
+    it("should return a detailed failure object for a command not on a strict allowlist", () => {
+      config.getCoreTools = () => ["ShellTool(goodCommand)"];
+      const result = checkCommandPermissions("git status && goodCommand", config);
       expect(result).toEqual({
         allAllowed: false,
-        disallowedCommands: ['git status'],
+        disallowedCommands: ["git status"],
         blockReason: `Command(s) not in the allowed commands list. Disallowed commands: "git status"`,
         isHardDenial: false,
       });
@@ -381,368 +322,343 @@ describe('checkCommandPermissions', () => {
   });
 
   describe('in "Default Deny" mode (with sessionAllowlist)', () => {
-    it('should allow a command on the sessionAllowlist', () => {
+    it("should allow a command on the sessionAllowlist", () => {
       const result = checkCommandPermissions(
-        'goodCommand --safe',
+        "goodCommand --safe",
         config,
-        new Set(['goodCommand --safe']),
+        new Set(["goodCommand --safe"]),
       );
       expect(result.allAllowed).toBe(true);
     });
 
-    it('should block a command not on the sessionAllowlist or global allowlist', () => {
+    it("should block a command not on the sessionAllowlist or global allowlist", () => {
       const result = checkCommandPermissions(
-        'badCommand --danger',
+        "badCommand --danger",
         config,
-        new Set(['goodCommand --safe']),
+        new Set(["goodCommand --safe"]),
       );
       expect(result.allAllowed).toBe(false);
-      expect(result.blockReason).toContain(
-        'not on the global or session allowlist',
-      );
-      expect(result.disallowedCommands).toEqual(['badCommand --danger']);
+      expect(result.blockReason).toContain("not on the global or session allowlist");
+      expect(result.disallowedCommands).toEqual(["badCommand --danger"]);
     });
 
-    it('should allow a command on the global allowlist even if not on the session allowlist', () => {
-      config.getCoreTools = () => ['ShellTool(git status)'];
-      const result = checkCommandPermissions(
-        'git status',
-        config,
-        new Set(['goodCommand --safe']),
-      );
+    it("should allow a command on the global allowlist even if not on the session allowlist", () => {
+      config.getCoreTools = () => ["ShellTool(git status)"];
+      const result = checkCommandPermissions("git status", config, new Set(["goodCommand --safe"]));
       expect(result.allAllowed).toBe(true);
     });
 
-    it('should allow a chained command if parts are on different allowlists', () => {
-      config.getCoreTools = () => ['ShellTool(git status)'];
+    it("should allow a chained command if parts are on different allowlists", () => {
+      config.getCoreTools = () => ["ShellTool(git status)"];
       const result = checkCommandPermissions(
-        'git status && git commit',
+        "git status && git commit",
         config,
-        new Set(['git commit']),
+        new Set(["git commit"]),
       );
       expect(result.allAllowed).toBe(true);
     });
 
-    it('should block a command on the sessionAllowlist if it is also globally blocked', () => {
-      config.getExcludeTools = () => new Set(['run_shell_command(badCommand)']);
+    it("should block a command on the sessionAllowlist if it is also globally blocked", () => {
+      config.getExcludeTools = () => new Set(["run_shell_command(badCommand)"]);
       const result = checkCommandPermissions(
-        'badCommand --danger',
+        "badCommand --danger",
         config,
-        new Set(['badCommand --danger']),
+        new Set(["badCommand --danger"]),
       );
       expect(result.allAllowed).toBe(false);
-      expect(result.blockReason).toContain('is blocked by configuration');
+      expect(result.blockReason).toContain("is blocked by configuration");
     });
 
-    it('should block a chained command if one part is not on any allowlist', () => {
-      config.getCoreTools = () => ['run_shell_command(echo)'];
+    it("should block a chained command if one part is not on any allowlist", () => {
+      config.getCoreTools = () => ["run_shell_command(echo)"];
       const result = checkCommandPermissions(
         'echo "hello" && badCommand --danger',
         config,
-        new Set(['echo']),
+        new Set(["echo"]),
       );
       expect(result.allAllowed).toBe(false);
-      expect(result.disallowedCommands).toEqual(['badCommand --danger']);
+      expect(result.disallowedCommands).toEqual(["badCommand --danger"]);
     });
   });
 });
 
-describe('getCommandRoots', () => {
-  it('should return a single command', () => {
-    expect(getCommandRoots('ls -l')).toEqual(['ls']);
+describe("getCommandRoots", () => {
+  it("should return a single command", () => {
+    expect(getCommandRoots("ls -l")).toEqual(["ls"]);
   });
 
-  it('should handle paths and return the binary name', () => {
-    expect(getCommandRoots('/usr/local/bin/node script.js')).toEqual(['node']);
+  it("should handle paths and return the binary name", () => {
+    expect(getCommandRoots("/usr/local/bin/node script.js")).toEqual(["node"]);
   });
 
-  it('should return an empty array for an empty string', () => {
-    expect(getCommandRoots('')).toEqual([]);
+  it("should return an empty array for an empty string", () => {
+    expect(getCommandRoots("")).toEqual([]);
   });
 
-  it('should handle a mix of operators', () => {
-    const result = getCommandRoots('a;b|c&&d||e&f');
-    expect(result).toEqual(['a', 'b', 'c', 'd', 'e', 'f']);
+  it("should handle a mix of operators", () => {
+    const result = getCommandRoots("a;b|c&&d||e&f");
+    expect(result).toEqual(["a", "b", "c", "d", "e", "f"]);
   });
 
-  it('should correctly parse a chained command with quotes', () => {
+  it("should correctly parse a chained command with quotes", () => {
     const result = getCommandRoots('echo "hello" && git commit -m "feat"');
-    expect(result).toEqual(['echo', 'git']);
+    expect(result).toEqual(["echo", "git"]);
   });
 
-  it('should include nested command substitutions', () => {
-    const result = getCommandRoots('echo $(badCommand --danger)');
-    expect(result).toEqual(['echo', 'badCommand']);
+  it("should include nested command substitutions", () => {
+    const result = getCommandRoots("echo $(badCommand --danger)");
+    expect(result).toEqual(["echo", "badCommand"]);
   });
 
-  it('should include process substitutions', () => {
-    const result = getCommandRoots('diff <(ls) <(ls -a)');
-    expect(result).toEqual(['diff', 'ls', 'ls']);
+  it("should include process substitutions", () => {
+    const result = getCommandRoots("diff <(ls) <(ls -a)");
+    expect(result).toEqual(["diff", "ls", "ls"]);
   });
 
-  it('should include backtick substitutions', () => {
-    const result = getCommandRoots('echo `badCommand --danger`');
-    expect(result).toEqual(['echo', 'badCommand']);
+  it("should include backtick substitutions", () => {
+    const result = getCommandRoots("echo `badCommand --danger`");
+    expect(result).toEqual(["echo", "badCommand"]);
   });
 
-  it('should treat parameter expansions with prompt transformations as unsafe', () => {
-    const roots = getCommandRoots(
-      'echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"',
-    );
+  it("should treat parameter expansions with prompt transformations as unsafe", () => {
+    const roots = getCommandRoots('echo "${var1=aa\\140 env| ls -l\\140}${var1@P}"');
     expect(roots).toEqual([]);
   });
 
-  it('should not return roots for prompt transformation expansions', () => {
-    const roots = getCommandRoots('echo ${foo@P}');
+  it("should not return roots for prompt transformation expansions", () => {
+    const roots = getCommandRoots("echo ${foo@P}");
     expect(roots).toEqual([]);
   });
 });
 
-describeWindowsOnly('PowerShell integration', () => {
-  const originalComSpec = process.env['ComSpec'];
+describeWindowsOnly("PowerShell integration", () => {
+  const originalComSpec = process.env["ComSpec"];
 
   beforeEach(() => {
-    mockPlatform.mockReturnValue('win32');
-    const systemRoot = process.env['SystemRoot'] || 'C:\\\\Windows';
-    process.env['ComSpec'] =
+    mockPlatform.mockReturnValue("win32");
+    const systemRoot = process.env["SystemRoot"] || "C:\\\\Windows";
+    process.env["ComSpec"] =
       `${systemRoot}\\\\System32\\\\WindowsPowerShell\\\\v1.0\\\\powershell.exe`;
   });
 
   afterEach(() => {
     if (originalComSpec === undefined) {
-      delete process.env['ComSpec'];
+      delete process.env["ComSpec"];
     } else {
-      process.env['ComSpec'] = originalComSpec;
+      process.env["ComSpec"] = originalComSpec;
     }
   });
 
-  it('should return command roots using PowerShell AST output', () => {
-    const roots = getCommandRoots('Get-ChildItem | Select-Object Name');
+  it("should return command roots using PowerShell AST output", () => {
+    const roots = getCommandRoots("Get-ChildItem | Select-Object Name");
     expect(roots.length).toBeGreaterThan(0);
-    expect(roots).toContain('Get-ChildItem');
+    expect(roots).toContain("Get-ChildItem");
   });
 
-  it('should block commands when PowerShell parser reports errors', () => {
-    const { allowed, reason } = isCommandAllowed('Get-ChildItem |', config);
+  it("should block commands when PowerShell parser reports errors", () => {
+    const { allowed, reason } = isCommandAllowed("Get-ChildItem |", config);
     expect(allowed).toBe(false);
-    expect(reason).toBe(
-      'Command rejected because it could not be parsed safely',
-    );
+    expect(reason).toBe("Command rejected because it could not be parsed safely");
   });
 });
 
-describe('stripShellWrapper', () => {
-  it('should strip sh -c with quotes', () => {
-    expect(stripShellWrapper('sh -c "ls -l"')).toEqual('ls -l');
+describe("stripShellWrapper", () => {
+  it("should strip sh -c with quotes", () => {
+    expect(stripShellWrapper('sh -c "ls -l"')).toEqual("ls -l");
   });
 
-  it('should strip bash -c with extra whitespace', () => {
-    expect(stripShellWrapper('  bash  -c  "ls -l"  ')).toEqual('ls -l');
+  it("should strip bash -c with extra whitespace", () => {
+    expect(stripShellWrapper('  bash  -c  "ls -l"  ')).toEqual("ls -l");
   });
 
-  it('should strip zsh -c without quotes', () => {
-    expect(stripShellWrapper('zsh -c ls -l')).toEqual('ls -l');
+  it("should strip zsh -c without quotes", () => {
+    expect(stripShellWrapper("zsh -c ls -l")).toEqual("ls -l");
   });
 
-  it('should strip cmd.exe /c', () => {
-    expect(stripShellWrapper('cmd.exe /c "dir"')).toEqual('dir');
+  it("should strip cmd.exe /c", () => {
+    expect(stripShellWrapper('cmd.exe /c "dir"')).toEqual("dir");
   });
 
-  it('should strip powershell.exe -Command with optional -NoProfile', () => {
-    expect(
-      stripShellWrapper('powershell.exe -NoProfile -Command "Get-ChildItem"'),
-    ).toEqual('Get-ChildItem');
-    expect(
-      stripShellWrapper('powershell.exe -Command "Get-ChildItem"'),
-    ).toEqual('Get-ChildItem');
+  it("should strip powershell.exe -Command with optional -NoProfile", () => {
+    expect(stripShellWrapper('powershell.exe -NoProfile -Command "Get-ChildItem"')).toEqual(
+      "Get-ChildItem",
+    );
+    expect(stripShellWrapper('powershell.exe -Command "Get-ChildItem"')).toEqual("Get-ChildItem");
   });
 
-  it('should strip pwsh -Command wrapper', () => {
-    expect(
-      stripShellWrapper('pwsh -NoProfile -Command "Get-ChildItem"'),
-    ).toEqual('Get-ChildItem');
+  it("should strip pwsh -Command wrapper", () => {
+    expect(stripShellWrapper('pwsh -NoProfile -Command "Get-ChildItem"')).toEqual("Get-ChildItem");
   });
 
-  it('should not strip anything if no wrapper is present', () => {
-    expect(stripShellWrapper('ls -l')).toEqual('ls -l');
+  it("should not strip anything if no wrapper is present", () => {
+    expect(stripShellWrapper("ls -l")).toEqual("ls -l");
   });
 });
 
-describe('isShellInvocationAllowlisted', () => {
+describe("isShellInvocationAllowlisted", () => {
   function createInvocation(command: string): AnyToolInvocation {
     return { params: { command } } as unknown as AnyToolInvocation;
   }
 
-  it('should return false when any chained command segment is not allowlisted', () => {
-    const invocation = createInvocation(
-      'git status && rm -rf /tmp/should-not-run',
-    );
-    expect(
-      isShellInvocationAllowlisted(invocation, ['run_shell_command(git)']),
-    ).toBe(false);
+  it("should return false when any chained command segment is not allowlisted", () => {
+    const invocation = createInvocation("git status && rm -rf /tmp/should-not-run");
+    expect(isShellInvocationAllowlisted(invocation, ["run_shell_command(git)"])).toBe(false);
   });
 
-  it('should return true when every segment is explicitly allowlisted', () => {
-    const invocation = createInvocation(
-      'git status && rm -rf /tmp/should-run && git diff',
-    );
+  it("should return true when every segment is explicitly allowlisted", () => {
+    const invocation = createInvocation("git status && rm -rf /tmp/should-run && git diff");
     expect(
       isShellInvocationAllowlisted(invocation, [
-        'run_shell_command(git)',
-        'run_shell_command(rm -rf)',
+        "run_shell_command(git)",
+        "run_shell_command(rm -rf)",
       ]),
     ).toBe(true);
   });
 
-  it('should return true when the allowlist contains a wildcard shell entry', () => {
-    const invocation = createInvocation('git status && rm -rf /tmp/should-run');
-    expect(
-      isShellInvocationAllowlisted(invocation, ['run_shell_command']),
-    ).toBe(true);
+  it("should return true when the allowlist contains a wildcard shell entry", () => {
+    const invocation = createInvocation("git status && rm -rf /tmp/should-run");
+    expect(isShellInvocationAllowlisted(invocation, ["run_shell_command"])).toBe(true);
   });
 
-  it('should treat piped commands as separate segments that must be allowlisted', () => {
-    const invocation = createInvocation('git status | tail -n 1');
-    expect(
-      isShellInvocationAllowlisted(invocation, ['run_shell_command(git)']),
-    ).toBe(false);
+  it("should treat piped commands as separate segments that must be allowlisted", () => {
+    const invocation = createInvocation("git status | tail -n 1");
+    expect(isShellInvocationAllowlisted(invocation, ["run_shell_command(git)"])).toBe(false);
     expect(
       isShellInvocationAllowlisted(invocation, [
-        'run_shell_command(git)',
-        'run_shell_command(tail)',
+        "run_shell_command(git)",
+        "run_shell_command(tail)",
       ]),
     ).toBe(true);
   });
 });
 
-describe('escapeShellArg', () => {
-  describe('POSIX (bash)', () => {
-    it('should use shell-quote for escaping', () => {
+describe("escapeShellArg", () => {
+  describe("POSIX (bash)", () => {
+    it("should use shell-quote for escaping", () => {
       mockQuote.mockReturnValueOnce("'escaped value'");
-      const result = escapeShellArg('raw value', 'bash');
-      expect(mockQuote).toHaveBeenCalledWith(['raw value']);
+      const result = escapeShellArg("raw value", "bash");
+      expect(mockQuote).toHaveBeenCalledWith(["raw value"]);
       expect(result).toBe("'escaped value'");
     });
 
-    it('should handle empty strings', () => {
-      const result = escapeShellArg('', 'bash');
-      expect(result).toBe('');
+    it("should handle empty strings", () => {
+      const result = escapeShellArg("", "bash");
+      expect(result).toBe("");
       expect(mockQuote).not.toHaveBeenCalled();
     });
   });
 
-  describe('Windows', () => {
-    describe('when shell is cmd.exe', () => {
-      it('should wrap simple arguments in double quotes', () => {
-        const result = escapeShellArg('search term', 'cmd');
+  describe("Windows", () => {
+    describe("when shell is cmd.exe", () => {
+      it("should wrap simple arguments in double quotes", () => {
+        const result = escapeShellArg("search term", "cmd");
         expect(result).toBe('"search term"');
       });
 
-      it('should escape internal double quotes by doubling them', () => {
-        const result = escapeShellArg('He said "Hello"', 'cmd');
+      it("should escape internal double quotes by doubling them", () => {
+        const result = escapeShellArg('He said "Hello"', "cmd");
         expect(result).toBe('"He said ""Hello"""');
       });
 
-      it('should handle empty strings', () => {
-        const result = escapeShellArg('', 'cmd');
-        expect(result).toBe('');
+      it("should handle empty strings", () => {
+        const result = escapeShellArg("", "cmd");
+        expect(result).toBe("");
       });
     });
 
-    describe('when shell is PowerShell', () => {
-      it('should wrap simple arguments in single quotes', () => {
-        const result = escapeShellArg('search term', 'powershell');
+    describe("when shell is PowerShell", () => {
+      it("should wrap simple arguments in single quotes", () => {
+        const result = escapeShellArg("search term", "powershell");
         expect(result).toBe("'search term'");
       });
 
-      it('should escape internal single quotes by doubling them', () => {
-        const result = escapeShellArg("It's a test", 'powershell');
+      it("should escape internal single quotes by doubling them", () => {
+        const result = escapeShellArg("It's a test", "powershell");
         expect(result).toBe("'It''s a test'");
       });
 
-      it('should handle double quotes without escaping them', () => {
-        const result = escapeShellArg('He said "Hello"', 'powershell');
-        expect(result).toBe('\'He said "Hello"\'');
+      it("should handle double quotes without escaping them", () => {
+        const result = escapeShellArg('He said "Hello"', "powershell");
+        expect(result).toBe("'He said \"Hello\"'");
       });
 
-      it('should handle empty strings', () => {
-        const result = escapeShellArg('', 'powershell');
-        expect(result).toBe('');
+      it("should handle empty strings", () => {
+        const result = escapeShellArg("", "powershell");
+        expect(result).toBe("");
       });
     });
   });
 });
 
-describe('getShellConfiguration', () => {
+describe("getShellConfiguration", () => {
   const originalEnv = { ...process.env };
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  it('should return bash configuration on Linux', () => {
-    mockPlatform.mockReturnValue('linux');
+  it("should return bash configuration on Linux", () => {
+    mockPlatform.mockReturnValue("linux");
     const config = getShellConfiguration();
-    expect(config.executable).toBe('bash');
-    expect(config.argsPrefix).toEqual(['-c']);
-    expect(config.shell).toBe('bash');
+    expect(config.executable).toBe("bash");
+    expect(config.argsPrefix).toEqual(["-c"]);
+    expect(config.shell).toBe("bash");
   });
 
-  it('should return bash configuration on macOS (darwin)', () => {
-    mockPlatform.mockReturnValue('darwin');
+  it("should return bash configuration on macOS (darwin)", () => {
+    mockPlatform.mockReturnValue("darwin");
     const config = getShellConfiguration();
-    expect(config.executable).toBe('bash');
-    expect(config.argsPrefix).toEqual(['-c']);
-    expect(config.shell).toBe('bash');
+    expect(config.executable).toBe("bash");
+    expect(config.argsPrefix).toEqual(["-c"]);
+    expect(config.shell).toBe("bash");
   });
 
-  describe('on Windows', () => {
+  describe("on Windows", () => {
     beforeEach(() => {
-      mockPlatform.mockReturnValue('win32');
+      mockPlatform.mockReturnValue("win32");
     });
 
-    it('should return PowerShell configuration by default', () => {
-      delete process.env['ComSpec'];
+    it("should return PowerShell configuration by default", () => {
+      delete process.env["ComSpec"];
       const config = getShellConfiguration();
-      expect(config.executable).toBe('powershell.exe');
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.executable).toBe("powershell.exe");
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should ignore ComSpec when pointing to cmd.exe', () => {
-      const cmdPath = 'C:\\WINDOWS\\system32\\cmd.exe';
-      process.env['ComSpec'] = cmdPath;
+    it("should ignore ComSpec when pointing to cmd.exe", () => {
+      const cmdPath = "C:\\WINDOWS\\system32\\cmd.exe";
+      process.env["ComSpec"] = cmdPath;
       const config = getShellConfiguration();
-      expect(config.executable).toBe('powershell.exe');
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.executable).toBe("powershell.exe");
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should return PowerShell configuration if ComSpec points to powershell.exe', () => {
-      const psPath =
-        'C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe';
-      process.env['ComSpec'] = psPath;
+    it("should return PowerShell configuration if ComSpec points to powershell.exe", () => {
+      const psPath = "C:\\WINDOWS\\System32\\WindowsPowerShell\\v1.0\\powershell.exe";
+      process.env["ComSpec"] = psPath;
       const config = getShellConfiguration();
       expect(config.executable).toBe(psPath);
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should return PowerShell configuration if ComSpec points to pwsh.exe', () => {
-      const pwshPath = 'C:\\Program Files\\PowerShell\\7\\pwsh.exe';
-      process.env['ComSpec'] = pwshPath;
+    it("should return PowerShell configuration if ComSpec points to pwsh.exe", () => {
+      const pwshPath = "C:\\Program Files\\PowerShell\\7\\pwsh.exe";
+      process.env["ComSpec"] = pwshPath;
       const config = getShellConfiguration();
       expect(config.executable).toBe(pwshPath);
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
 
-    it('should be case-insensitive when checking ComSpec', () => {
-      process.env['ComSpec'] = 'C:\\Path\\To\\POWERSHELL.EXE';
+    it("should be case-insensitive when checking ComSpec", () => {
+      process.env["ComSpec"] = "C:\\Path\\To\\POWERSHELL.EXE";
       const config = getShellConfiguration();
-      expect(config.executable).toBe('C:\\Path\\To\\POWERSHELL.EXE');
-      expect(config.argsPrefix).toEqual(['-NoProfile', '-Command']);
-      expect(config.shell).toBe('powershell');
+      expect(config.executable).toBe("C:\\Path\\To\\POWERSHELL.EXE");
+      expect(config.argsPrefix).toEqual(["-NoProfile", "-Command"]);
+      expect(config.shell).toBe("powershell");
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/shell-utils.ts b/packages/gemini-core/src/utils/shell-utils.ts
index 2528c9ebc..2247d4806 100644
--- a/packages/gemini-core/src/utils/shell-utils.ts
+++ b/packages/gemini-core/src/utils/shell-utils.ts
@@ -4,26 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AnyToolInvocation } from '../index.js';
-import type { Config } from '../config/config.js';
-import os from 'node:os';
-import { quote } from 'shell-quote';
-import { doesToolInvocationMatch } from './tool-utils.js';
-import {
-  spawn,
-  spawnSync,
-  type SpawnOptionsWithoutStdio,
-} from 'node:child_process';
-import type { Node } from 'web-tree-sitter';
-import { Language, Parser } from 'web-tree-sitter';
-import { loadWasmBinary } from './fileUtils.js';
-
-export const SHELL_TOOL_NAMES = ['run_shell_command', 'ShellTool'];
+import { type SpawnOptionsWithoutStdio, spawn, spawnSync } from "node:child_process";
+import os from "node:os";
+import { quote } from "shell-quote";
+import type { Node } from "web-tree-sitter";
+import { Language, Parser } from "web-tree-sitter";
+import type { Config } from "../config/config.js";
+import type { AnyToolInvocation } from "../index.js";
+import { loadWasmBinary } from "./fileUtils.js";
+import { doesToolInvocationMatch } from "./tool-utils.js";
+
+export const SHELL_TOOL_NAMES = ["run_shell_command", "ShellTool"];
 
 /**
  * An identifier for the shell type.
  */
-export type ShellType = 'cmd' | 'powershell' | 'bash';
+export type ShellType = "cmd" | "powershell" | "bash";
 
 /**
  * Defines the configuration required to execute a command string within a specific shell.
@@ -46,7 +42,7 @@ let treeSitterInitializationError: Error | null = null;
 class ShellParserInitializationError extends Error {
   constructor(cause: Error) {
     super(`Failed to initialize bash parser: ${cause.message}`, { cause });
-    this.name = 'ShellParserInitializationError';
+    this.name = "ShellParserInitializationError";
   }
 }
 
@@ -54,10 +50,10 @@ function toError(value: unknown): Error {
   if (value instanceof Error) {
     return value;
   }
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     return new Error(value);
   }
-  return new Error('Unknown tree-sitter initialization error', {
+  return new Error("Unknown tree-sitter initialization error", {
     cause: value,
   });
 }
@@ -69,16 +65,16 @@ async function loadBashLanguage(): Promise<void> {
       loadWasmBinary(
         () =>
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore resolved by esbuild-plugin-wasm during bundling
-          import('web-tree-sitter/tree-sitter.wasm?binary'),
-        'web-tree-sitter/tree-sitter.wasm',
+          // @ts-expect-error resolved by esbuild-plugin-wasm during bundling
+          import("web-tree-sitter/tree-sitter.wasm?binary"),
+        "web-tree-sitter/tree-sitter.wasm",
       ),
       loadWasmBinary(
         () =>
           // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore resolved by esbuild-plugin-wasm during bundling
-          import('tree-sitter-bash/tree-sitter-bash.wasm?binary'),
-        'tree-sitter-bash/tree-sitter-bash.wasm',
+          // @ts-expect-error resolved by esbuild-plugin-wasm during bundling
+          import("tree-sitter-bash/tree-sitter-bash.wasm?binary"),
+        "tree-sitter-bash/tree-sitter-bash.wasm",
       ),
     ]);
 
@@ -117,7 +113,7 @@ interface CommandParseResult {
   hasError: boolean;
 }
 
-const POWERSHELL_COMMAND_ENV = '__GCLI_POWERSHELL_COMMAND__';
+const POWERSHELL_COMMAND_ENV = "__GCLI_POWERSHELL_COMMAND__";
 
 // Encode the parser script as UTF-16LE base64 so we can pass it via PowerShell's -EncodedCommand flag;
 // this avoids brittle quoting/escaping when spawning PowerShell and ensures the script is received byte-for-byte.
@@ -153,8 +149,8 @@ foreach ($commandAst in $commandAsts) {
   commands = $commandObjects
 } | ConvertTo-Json -Compress
 `,
-  'utf16le',
-).toString('base64');
+  "utf16le",
+).toString("base64");
 
 function createParser(): Parser | null {
   if (!bashLanguage) {
@@ -203,16 +199,16 @@ function normalizeCommandName(raw: string): string {
 
 function extractNameFromNode(node: Node): string | null {
   switch (node.type) {
-    case 'command': {
-      const nameNode = node.childForFieldName('name');
+    case "command": {
+      const nameNode = node.childForFieldName("name");
       if (!nameNode) {
         return null;
       }
       return normalizeCommandName(nameNode.text);
     }
-    case 'declaration_command':
-    case 'unset_command':
-    case 'test_command': {
+    case "declaration_command":
+    case "unset_command":
+    case "test_command": {
       const firstChild = node.child(0);
       if (!firstChild) {
         return null;
@@ -224,10 +220,7 @@ function extractNameFromNode(node: Node): string | null {
   }
 }
 
-function collectCommandDetails(
-  root: Node,
-  source: string,
-): ParsedCommandDetail[] {
+function collectCommandDetails(root: Node, source: string): ParsedCommandDetail[] {
   const stack: Node[] = [root];
   const details: ParsedCommandDetail[] = [];
 
@@ -265,15 +258,12 @@ function hasPromptCommandTransform(root: Node): boolean {
       continue;
     }
 
-    if (current.type === 'expansion') {
+    if (current.type === "expansion") {
       for (let i = 0; i < current.childCount - 1; i += 1) {
         const operatorNode = current.child(i);
         const transformNode = current.child(i + 1);
 
-        if (
-          operatorNode?.type === '@' &&
-          transformNode?.text?.toLowerCase() === 'p'
-        ) {
+        if (operatorNode?.type === "@" && transformNode?.text?.toLowerCase() === "p") {
           return true;
         }
       }
@@ -311,9 +301,7 @@ function parseBashCommandDetails(command: string): CommandParseResult | null {
   return {
     details,
     hasError:
-      tree.rootNode.hasError ||
-      details.length === 0 ||
-      hasPromptCommandTransform(tree.rootNode),
+      tree.rootNode.hasError || details.length === 0 || hasPromptCommandTransform(tree.rootNode),
   };
 }
 
@@ -332,19 +320,13 @@ function parsePowerShellCommandDetails(
   try {
     const result = spawnSync(
       executable,
-      [
-        '-NoLogo',
-        '-NoProfile',
-        '-NonInteractive',
-        '-EncodedCommand',
-        POWERSHELL_PARSER_SCRIPT,
-      ],
+      ["-NoLogo", "-NoProfile", "-NonInteractive", "-EncodedCommand", POWERSHELL_PARSER_SCRIPT],
       {
         env: {
           ...process.env,
           [POWERSHELL_COMMAND_ENV]: command,
         },
-        encoding: 'utf-8',
+        encoding: "utf-8",
       },
     );
 
@@ -352,7 +334,7 @@ function parsePowerShellCommandDetails(
       return null;
     }
 
-    const output = (result.stdout ?? '').toString().trim();
+    const output = (result.stdout ?? "").toString().trim();
     if (!output) {
       return { details: [], hasError: true };
     }
@@ -373,15 +355,12 @@ function parsePowerShellCommandDetails(
 
     const details = (parsed.commands ?? [])
       .map((commandDetail) => {
-        if (!commandDetail || typeof commandDetail.name !== 'string') {
+        if (!commandDetail || typeof commandDetail.name !== "string") {
           return null;
         }
 
         const name = normalizeCommandName(commandDetail.name);
-        const text =
-          typeof commandDetail.text === 'string'
-            ? commandDetail.text.trim()
-            : command;
+        const text = typeof commandDetail.text === "string" ? commandDetail.text.trim() : command;
 
         return {
           name,
@@ -402,11 +381,11 @@ function parsePowerShellCommandDetails(
 function parseCommandDetails(command: string): CommandParseResult | null {
   const configuration = getShellConfiguration();
 
-  if (configuration.shell === 'powershell') {
+  if (configuration.shell === "powershell") {
     return parsePowerShellCommandDetails(command, configuration.executable);
   }
 
-  if (configuration.shell === 'bash') {
+  if (configuration.shell === "bash") {
     return parseBashCommandDetails(command);
   }
 
@@ -423,37 +402,34 @@ function parseCommandDetails(command: string): CommandParseResult | null {
  */
 export function getShellConfiguration(): ShellConfiguration {
   if (isWindows()) {
-    const comSpec = process.env['ComSpec'];
+    const comSpec = process.env["ComSpec"];
     if (comSpec) {
       const executable = comSpec.toLowerCase();
-      if (
-        executable.endsWith('powershell.exe') ||
-        executable.endsWith('pwsh.exe')
-      ) {
+      if (executable.endsWith("powershell.exe") || executable.endsWith("pwsh.exe")) {
         return {
           executable: comSpec,
-          argsPrefix: ['-NoProfile', '-Command'],
-          shell: 'powershell',
+          argsPrefix: ["-NoProfile", "-Command"],
+          shell: "powershell",
         };
       }
     }
 
     // Default to PowerShell for all other Windows configurations.
     return {
-      executable: 'powershell.exe',
-      argsPrefix: ['-NoProfile', '-Command'],
-      shell: 'powershell',
+      executable: "powershell.exe",
+      argsPrefix: ["-NoProfile", "-Command"],
+      shell: "powershell",
     };
   }
 
   // Unix-like systems (Linux, macOS)
-  return { executable: 'bash', argsPrefix: ['-c'], shell: 'bash' };
+  return { executable: "bash", argsPrefix: ["-c"], shell: "bash" };
 }
 
 /**
  * Export the platform detection constant for use in process management (e.g., killing processes).
  */
-export const isWindows = () => os.platform() === 'win32';
+export const isWindows = () => os.platform() === "win32";
 
 /**
  * Escapes a string so that it can be safely used as a single argument
@@ -465,17 +441,17 @@ export const isWindows = () => os.platform() === 'win32';
  */
 export function escapeShellArg(arg: string, shell: ShellType): string {
   if (!arg) {
-    return '';
+    return "";
   }
 
   switch (shell) {
-    case 'powershell':
+    case "powershell":
       // For PowerShell, wrap in single quotes and escape internal single quotes by doubling them.
       return `'${arg.replace(/'/g, "''")}'`;
-    case 'cmd':
+    case "cmd":
       // Simple Windows escaping for cmd.exe: wrap in double quotes and escape inner double quotes.
       return `"${arg.replace(/"/g, '""')}"`;
-    case 'bash':
+    case "bash":
     default:
       // POSIX shell escaping using shell-quote.
       return quote([arg]);
@@ -591,41 +567,35 @@ export function checkCommandPermissions(
     return {
       allAllowed: false,
       disallowedCommands: [command],
-      blockReason: 'Command rejected because it could not be parsed safely',
+      blockReason: "Command rejected because it could not be parsed safely",
       isHardDenial: true,
     };
   }
 
-  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, ' ');
+  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, " ");
   const commandsToValidate = parseResult.details
     .map((detail) => normalize(detail.text))
     .filter(Boolean);
   const invocation: AnyToolInvocation & { params: { command: string } } = {
-    params: { command: '' },
+    params: { command: "" },
   } as AnyToolInvocation & { params: { command: string } };
 
   // 1. Blocklist Check (Highest Priority)
   const excludeTools = config.getExcludeTools() || new Set([]);
-  const isWildcardBlocked = SHELL_TOOL_NAMES.some((name) =>
-    excludeTools.has(name),
-  );
+  const isWildcardBlocked = SHELL_TOOL_NAMES.some((name) => excludeTools.has(name));
 
   if (isWildcardBlocked) {
     return {
       allAllowed: false,
       disallowedCommands: commandsToValidate,
-      blockReason: 'Shell tool is globally disabled in configuration',
+      blockReason: "Shell tool is globally disabled in configuration",
       isHardDenial: true,
     };
   }
 
   for (const cmd of commandsToValidate) {
-    invocation.params['command'] = cmd;
-    if (
-      doesToolInvocationMatch('run_shell_command', invocation, [
-        ...excludeTools,
-      ])
-    ) {
+    invocation.params["command"] = cmd;
+    if (doesToolInvocationMatch("run_shell_command", invocation, [...excludeTools])) {
       return {
         allAllowed: false,
         disallowedCommands: [cmd],
@@ -636,9 +606,7 @@ export function checkCommandPermissions(
   }
 
   const coreTools = config.getCoreTools() || [];
-  const isWildcardAllowed = SHELL_TOOL_NAMES.some((name) =>
-    coreTools.includes(name),
-  );
+  const isWildcardAllowed = SHELL_TOOL_NAMES.some((name) => coreTools.includes(name));
 
   // If there's a global wildcard, all commands are allowed at this point
   // because they have already passed the blocklist check.
@@ -652,25 +620,17 @@ export function checkCommandPermissions(
     // "DEFAULT DENY" MODE: A session allowlist is provided.
     // All commands must be in either the session or global allowlist.
     const normalizedSessionAllowlist = new Set(
-      [...sessionAllowlist].flatMap((cmd) =>
-        SHELL_TOOL_NAMES.map((name) => `${name}(${cmd})`),
-      ),
+      [...sessionAllowlist].flatMap((cmd) => SHELL_TOOL_NAMES.map((name) => `${name}(${cmd})`)),
     );
 
     for (const cmd of commandsToValidate) {
-      invocation.params['command'] = cmd;
-      const isSessionAllowed = doesToolInvocationMatch(
-        'run_shell_command',
-        invocation,
-        [...normalizedSessionAllowlist],
-      );
+      invocation.params["command"] = cmd;
+      const isSessionAllowed = doesToolInvocationMatch("run_shell_command", invocation, [
+        ...normalizedSessionAllowlist,
+      ]);
       if (isSessionAllowed) continue;
 
-      const isGloballyAllowed = doesToolInvocationMatch(
-        'run_shell_command',
-        invocation,
-        coreTools,
-      );
+      const isGloballyAllowed = doesToolInvocationMatch("run_shell_command", invocation, coreTools);
       if (isGloballyAllowed) continue;
 
       disallowedCommands.push(cmd);
@@ -682,22 +642,21 @@ export function checkCommandPermissions(
         disallowedCommands,
         blockReason: `Command(s) not on the global or session allowlist. Disallowed commands: ${disallowedCommands
           .map((c) => JSON.stringify(c))
-          .join(', ')}`,
+          .join(", ")}`,
         isHardDenial: false, // This is a soft denial; confirmation is possible.
       };
     }
   } else {
     // "DEFAULT ALLOW" MODE: No session allowlist.
     const hasSpecificAllowedCommands =
-      coreTools.filter((tool) =>
-        SHELL_TOOL_NAMES.some((name) => tool.startsWith(`${name}(`)),
-      ).length > 0;
+      coreTools.filter((tool) => SHELL_TOOL_NAMES.some((name) => tool.startsWith(`${name}(`)))
+        .length > 0;
 
     if (hasSpecificAllowedCommands) {
       for (const cmd of commandsToValidate) {
-        invocation.params['command'] = cmd;
+        invocation.params["command"] = cmd;
         const isGloballyAllowed = doesToolInvocationMatch(
-          'run_shell_command',
+          "run_shell_command",
           invocation,
           coreTools,
         );
@@ -711,7 +670,7 @@ export function checkCommandPermissions(
           disallowedCommands,
           blockReason: `Command(s) not in the allowed commands list. Disallowed commands: ${disallowedCommands
             .map((c) => JSON.stringify(c))
-            .join(', ')}`,
+            .join(", ")}`,
           isHardDenial: false, // This is a soft denial.
         };
       }
@@ -742,18 +701,18 @@ export const spawnAsync = (
 ): Promise<{ stdout: string; stderr: string }> =>
   new Promise((resolve, reject) => {
     const child = spawn(command, args, options);
-    let stdout = '';
-    let stderr = '';
+    let stdout = "";
+    let stderr = "";
 
-    child.stdout.on('data', (data) => {
+    child.stdout.on("data", (data) => {
       stdout += data.toString();
     });
 
-    child.stderr.on('data', (data) => {
+    child.stderr.on("data", (data) => {
       stderr += data.toString();
     });
 
-    child.on('close', (code) => {
+    child.on("close", (code) => {
       if (code === 0) {
         resolve({ stdout, stderr });
       } else {
@@ -761,7 +720,7 @@ export const spawnAsync = (
       }
     });
 
-    child.on('error', (err) => {
+    child.on("error", (err) => {
       reject(err);
     });
   });
@@ -796,9 +755,7 @@ export function isShellInvocationAllowlisted(
     return false;
   }
 
-  const hasShellWildcard = allowedPatterns.some((pattern) =>
-    SHELL_TOOL_NAMES.includes(pattern),
-  );
+  const hasShellWildcard = allowedPatterns.some((pattern) => SHELL_TOOL_NAMES.includes(pattern));
   const hasShellSpecificPattern = allowedPatterns.some((pattern) =>
     SHELL_TOOL_NAMES.some((name) => pattern.startsWith(`${name}(`)),
   );
@@ -812,16 +769,16 @@ export function isShellInvocationAllowlisted(
   }
 
   if (
-    !('params' in invocation) ||
-    typeof invocation.params !== 'object' ||
+    !("params" in invocation) ||
+    typeof invocation.params !== "object" ||
     invocation.params === null ||
-    !('command' in invocation.params)
+    !("command" in invocation.params)
   ) {
     return false;
   }
 
   const commandValue = (invocation.params as { command?: unknown }).command;
-  if (typeof commandValue !== 'string' || !commandValue.trim()) {
+  if (typeof commandValue !== "string" || !commandValue.trim()) {
     return false;
   }
 
@@ -832,7 +789,7 @@ export function isShellInvocationAllowlisted(
     return false;
   }
 
-  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, ' ');
+  const normalize = (cmd: string): string => cmd.trim().replace(/\s+/g, " ");
   const commandsToValidate = parseResult.details
     .map((detail) => normalize(detail.text))
     .filter(Boolean);
diff --git a/packages/gemini-core/src/utils/summarizer.test.ts b/packages/gemini-core/src/utils/summarizer.test.ts
index e44196f9d..74754eba8 100644
--- a/packages/gemini-core/src/utils/summarizer.test.ts
+++ b/packages/gemini-core/src/utils/summarizer.test.ts
@@ -4,33 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { GeminiClient } from '../core/client.js';
-import { Config } from '../config/config.js';
-import {
-  summarizeToolOutput,
-  llmSummarizer,
-  defaultSummarizer,
-} from './summarizer.js';
-import type { ToolResult } from '../tools/tools.js';
-import type {
-  ModelConfigService,
-  ResolvedModelConfig,
-} from '../services/modelConfigService.js';
-import { DEFAULT_GEMINI_MODEL } from '../config/models.js';
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Config } from "../config/config.js";
+import { DEFAULT_GEMINI_MODEL } from "../config/models.js";
+import { GeminiClient } from "../core/client.js";
+import type { ModelConfigService, ResolvedModelConfig } from "../services/modelConfigService.js";
+import type { ToolResult } from "../tools/tools.js";
+import { defaultSummarizer, llmSummarizer, summarizeToolOutput } from "./summarizer.js";
 
 // Mock GeminiClient and Config constructor
-vi.mock('../core/client.js');
-vi.mock('../config/config.js');
+vi.mock("../core/client.js");
+vi.mock("../config/config.js");
 
-describe('summarizers', () => {
+describe("summarizers", () => {
   let mockGeminiClient: GeminiClient;
   let MockConfig: Mock;
   let mockConfigInstance: Config;
   const abortSignal = new AbortController().signal;
   const mockResolvedConfig = {
-    model: 'gemini-pro',
+    model: "gemini-pro",
     generateContentConfig: {
       maxOutputTokens: 2000,
     },
@@ -39,10 +32,10 @@ describe('summarizers', () => {
   beforeEach(() => {
     MockConfig = vi.mocked(Config);
     mockConfigInstance = new MockConfig(
-      'test-api-key',
-      'gemini-pro',
+      "test-api-key",
+      "gemini-pro",
       false,
-      '.',
+      ".",
       false,
       undefined,
       false,
@@ -57,7 +50,7 @@ describe('summarizers', () => {
     mockGeminiClient = new GeminiClient(mockConfigInstance);
     (mockGeminiClient.generateContent as Mock) = vi.fn();
 
-    vi.spyOn(console, 'error').mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -65,9 +58,9 @@ describe('summarizers', () => {
     (console.error as Mock).mockRestore();
   });
 
-  describe('summarizeToolOutput', () => {
-    it('should return original text if it is shorter than maxLength', async () => {
-      const shortText = 'This is a short text.';
+  describe("summarizeToolOutput", () => {
+    it("should return original text if it is shorter than maxLength", async () => {
+      const shortText = "This is a short text.";
       const result = await summarizeToolOutput(
         mockConfigInstance,
         { model: DEFAULT_GEMINI_MODEL },
@@ -79,8 +72,8 @@ describe('summarizers', () => {
       expect(mockGeminiClient.generateContent).not.toHaveBeenCalled();
     });
 
-    it('should return original text if it is empty', async () => {
-      const emptyText = '';
+    it("should return original text if it is empty", async () => {
+      const emptyText = "";
       const result = await summarizeToolOutput(
         mockConfigInstance,
         { model: DEFAULT_GEMINI_MODEL },
@@ -92,9 +85,9 @@ describe('summarizers', () => {
       expect(mockGeminiClient.generateContent).not.toHaveBeenCalled();
     });
 
-    it('should call generateContent if text is longer than maxLength', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
-      const summary = 'This is a summary.';
+    it("should call generateContent if text is longer than maxLength", async () => {
+      const longText = "This is a very long text.".repeat(200);
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
@@ -110,9 +103,9 @@ describe('summarizers', () => {
       expect(result).toBe(summary);
     });
 
-    it('should return original text if generateContent throws an error', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
-      const error = new Error('API Error');
+    it("should return original text if generateContent throws an error", async () => {
+      const longText = "This is a very long text.".repeat(200);
+      const error = new Error("API Error");
       (mockGeminiClient.generateContent as Mock).mockRejectedValue(error);
 
       const result = await summarizeToolOutput(
@@ -127,16 +120,16 @@ describe('summarizers', () => {
       expect(result).toBe(longText);
     });
 
-    it('should construct the correct prompt for summarization', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
-      const summary = 'This is a summary.';
+    it("should construct the correct prompt for summarization", async () => {
+      const longText = "This is a very long text.".repeat(200);
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
       (mockConfigInstance.modelConfigService as unknown) = {
         getResolvedConfig() {
           return {
-            model: 'gemini-pro-limited',
+            model: "gemini-pro-limited",
             generateContentConfig: {
               maxOutputTokens: 1000,
             },
@@ -146,7 +139,7 @@ describe('summarizers', () => {
 
       await summarizeToolOutput(
         mockConfigInstance,
-        { model: 'gemini-pro-limited' },
+        { model: "gemini-pro-limited" },
         longText,
         mockGeminiClient,
         abortSignal,
@@ -165,20 +158,19 @@ Text to summarize:
 
 Return the summary string which should first contain an overall summarization of text followed by the full stack trace of errors and warnings in the tool output.
 `;
-      const calledWith = (mockGeminiClient.generateContent as Mock).mock
-        .calls[0];
+      const calledWith = (mockGeminiClient.generateContent as Mock).mock.calls[0];
       const contents = calledWith[1];
       expect(contents[0].parts[0].text).toBe(expectedPrompt);
     });
   });
 
-  describe('llmSummarizer', () => {
-    it('should summarize tool output using summarizeToolOutput', async () => {
+  describe("llmSummarizer", () => {
+    it("should summarize tool output using summarizeToolOutput", async () => {
       const toolResult: ToolResult = {
-        llmContent: 'This is a very long text.'.repeat(200),
-        returnDisplay: '',
+        llmContent: "This is a very long text.".repeat(200),
+        returnDisplay: "",
       };
-      const summary = 'This is a summary.';
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
@@ -194,13 +186,13 @@ Return the summary string which should first contain an overall summarization of
       expect(result).toBe(summary);
     });
 
-    it('should handle different llmContent types', async () => {
-      const longText = 'This is a very long text.'.repeat(200);
+    it("should handle different llmContent types", async () => {
+      const longText = "This is a very long text.".repeat(200);
       const toolResult: ToolResult = {
         llmContent: [{ text: longText }],
-        returnDisplay: '',
+        returnDisplay: "",
       };
-      const summary = 'This is a summary.';
+      const summary = "This is a summary.";
       (mockGeminiClient.generateContent as Mock).mockResolvedValue({
         candidates: [{ content: { parts: [{ text: summary }] } }],
       });
@@ -213,19 +205,18 @@ Return the summary string which should first contain an overall summarization of
       );
 
       expect(mockGeminiClient.generateContent).toHaveBeenCalledTimes(1);
-      const calledWith = (mockGeminiClient.generateContent as Mock).mock
-        .calls[0];
+      const calledWith = (mockGeminiClient.generateContent as Mock).mock.calls[0];
       const contents = calledWith[1];
       expect(contents[0].parts[0].text).toContain(`"${longText}"`);
       expect(result).toBe(summary);
     });
   });
 
-  describe('defaultSummarizer', () => {
-    it('should stringify the llmContent', async () => {
+  describe("defaultSummarizer", () => {
+    it("should stringify the llmContent", async () => {
       const toolResult: ToolResult = {
-        llmContent: { text: 'some data' },
-        returnDisplay: '',
+        llmContent: { text: "some data" },
+        returnDisplay: "",
       };
 
       const result = await defaultSummarizer(
@@ -235,7 +226,7 @@ Return the summary string which should first contain an overall summarization of
         abortSignal,
       );
 
-      expect(result).toBe(JSON.stringify({ text: 'some data' }));
+      expect(result).toBe(JSON.stringify({ text: "some data" }));
       expect(mockGeminiClient.generateContent).not.toHaveBeenCalled();
     });
   });
diff --git a/packages/gemini-core/src/utils/summarizer.ts b/packages/gemini-core/src/utils/summarizer.ts
index b25961e14..ce8b0fa45 100644
--- a/packages/gemini-core/src/utils/summarizer.ts
+++ b/packages/gemini-core/src/utils/summarizer.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolResult } from '../tools/tools.js';
-import type { Content } from '@google/genai';
-import type { GeminiClient } from '../core/client.js';
-import { getResponseText, partToString } from './partUtils.js';
-import { debugLogger } from './debugLogger.js';
-import type { ModelConfigKey } from '../services/modelConfigService.js';
-import type { Config } from '../config/config.js';
+import type { Content } from "@google/genai";
+import type { Config } from "../config/config.js";
+import type { GeminiClient } from "../core/client.js";
+import type { ModelConfigKey } from "../services/modelConfigService.js";
+import type { ToolResult } from "../tools/tools.js";
+import { debugLogger } from "./debugLogger.js";
+import { getResponseText, partToString } from "./partUtils.js";
 
 /**
  * A function that summarizes the result of a tool execution.
@@ -54,15 +54,10 @@ Text to summarize:
 Return the summary string which should first contain an overall summarization of text followed by the full stack trace of errors and warnings in the tool output.
 `;
 
-export const llmSummarizer: Summarizer = async (
-  config,
-  result,
-  geminiClient,
-  abortSignal,
-) =>
+export const llmSummarizer: Summarizer = async (config, result, geminiClient, abortSignal) =>
   summarizeToolOutput(
     config,
-    { model: 'summarizer-default' },
+    { model: "summarizer-default" },
     partToString(result.llmContent),
     geminiClient,
     abortSignal,
@@ -76,19 +71,19 @@ export async function summarizeToolOutput(
   abortSignal: AbortSignal,
 ): Promise<string> {
   const maxOutputTokens =
-    config.modelConfigService.getResolvedConfig(modelConfigKey)
-      .generateContentConfig.maxOutputTokens ?? 2000;
+    config.modelConfigService.getResolvedConfig(modelConfigKey).generateContentConfig
+      .maxOutputTokens ?? 2000;
   // There is going to be a slight difference here since we are comparing length of string with maxOutputTokens.
   // This is meant to be a ballpark estimation of if we need to summarize the tool output.
   if (!textToSummarize || textToSummarize.length < maxOutputTokens) {
     return textToSummarize;
   }
   const prompt = SUMMARIZE_TOOL_OUTPUT_PROMPT.replace(
-    '{maxOutputTokens}',
+    "{maxOutputTokens}",
     String(maxOutputTokens),
-  ).replace('{textToSummarize}', textToSummarize);
+  ).replace("{textToSummarize}", textToSummarize);
 
-  const contents: Content[] = [{ role: 'user', parts: [{ text: prompt }] }];
+  const contents: Content[] = [{ role: "user", parts: [{ text: prompt }] }];
   try {
     const parsedResponse = await geminiClient.generateContent(
       modelConfigKey,
@@ -97,7 +92,7 @@ export async function summarizeToolOutput(
     );
     return getResponseText(parsedResponse) || textToSummarize;
   } catch (error) {
-    debugLogger.warn('Failed to summarize tool output.', error);
+    debugLogger.warn("Failed to summarize tool output.", error);
     return textToSummarize;
   }
 }
diff --git a/packages/gemini-core/src/utils/systemEncoding.test.ts b/packages/gemini-core/src/utils/systemEncoding.test.ts
index bb594dd1e..735bf2f2a 100644
--- a/packages/gemini-core/src/utils/systemEncoding.test.ts
+++ b/packages/gemini-core/src/utils/systemEncoding.test.ts
@@ -4,33 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { execSync } from 'node:child_process';
-import * as os from 'node:os';
-import { detect as chardetDetect } from 'chardet';
+import { execSync } from "node:child_process";
+import * as os from "node:os";
+import { detect as chardetDetect } from "chardet";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 // Mock dependencies
-vi.mock('child_process');
-vi.mock('os');
-vi.mock('chardet');
+vi.mock("child_process");
+vi.mock("os");
+vi.mock("chardet");
 
 // Import the functions we want to test after refactoring
 import {
+  detectEncodingFromBuffer,
   getCachedEncodingForBuffer,
   getSystemEncoding,
-  windowsCodePageToEncoding,
-  detectEncodingFromBuffer,
   resetEncodingCache,
-} from './systemEncoding.js';
+  windowsCodePageToEncoding,
+} from "./systemEncoding.js";
 
-describe('Shell Command Processor - Encoding Functions', () => {
+describe("Shell Command Processor - Encoding Functions", () => {
   let consoleWarnSpy: ReturnType<typeof vi.spyOn>;
   let mockedExecSync: ReturnType<typeof vi.mocked<typeof execSync>>;
   let mockedOsPlatform: ReturnType<typeof vi.mocked<() => string>>;
   let mockedChardetDetect: ReturnType<typeof vi.mocked<typeof chardetDetect>>;
 
   beforeEach(() => {
-    consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+    consoleWarnSpy = vi.spyOn(console, "warn").mockImplementation(() => {});
     mockedExecSync = vi.mocked(execSync);
     mockedOsPlatform = vi.mocked(os.platform);
     mockedChardetDetect = vi.mocked(chardetDetect);
@@ -39,9 +39,9 @@ describe('Shell Command Processor - Encoding Functions', () => {
     resetEncodingCache();
 
     // Clear environment variables that might affect tests
-    delete process.env['LC_ALL'];
-    delete process.env['LC_CTYPE'];
-    delete process.env['LANG'];
+    delete process.env["LC_ALL"];
+    delete process.env["LC_CTYPE"];
+    delete process.env["LANG"];
   });
 
   afterEach(() => {
@@ -49,366 +49,351 @@ describe('Shell Command Processor - Encoding Functions', () => {
     resetEncodingCache();
   });
 
-  describe('windowsCodePageToEncoding', () => {
-    it('should map common Windows code pages correctly', () => {
-      expect(windowsCodePageToEncoding(437)).toBe('cp437');
-      expect(windowsCodePageToEncoding(850)).toBe('cp850');
-      expect(windowsCodePageToEncoding(65001)).toBe('utf-8');
-      expect(windowsCodePageToEncoding(1252)).toBe('windows-1252');
-      expect(windowsCodePageToEncoding(932)).toBe('shift_jis');
-      expect(windowsCodePageToEncoding(936)).toBe('gb2312');
-      expect(windowsCodePageToEncoding(949)).toBe('euc-kr');
-      expect(windowsCodePageToEncoding(950)).toBe('big5');
-      expect(windowsCodePageToEncoding(1200)).toBe('utf-16le');
-      expect(windowsCodePageToEncoding(1201)).toBe('utf-16be');
-    });
-
-    it('should return null for unmapped code pages and warn', () => {
+  describe("windowsCodePageToEncoding", () => {
+    it("should map common Windows code pages correctly", () => {
+      expect(windowsCodePageToEncoding(437)).toBe("cp437");
+      expect(windowsCodePageToEncoding(850)).toBe("cp850");
+      expect(windowsCodePageToEncoding(65001)).toBe("utf-8");
+      expect(windowsCodePageToEncoding(1252)).toBe("windows-1252");
+      expect(windowsCodePageToEncoding(932)).toBe("shift_jis");
+      expect(windowsCodePageToEncoding(936)).toBe("gb2312");
+      expect(windowsCodePageToEncoding(949)).toBe("euc-kr");
+      expect(windowsCodePageToEncoding(950)).toBe("big5");
+      expect(windowsCodePageToEncoding(1200)).toBe("utf-16le");
+      expect(windowsCodePageToEncoding(1201)).toBe("utf-16be");
+    });
+
+    it("should return null for unmapped code pages and warn", () => {
       expect(windowsCodePageToEncoding(99999)).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Unable to determine encoding for windows code page 99999.',
+        "Unable to determine encoding for windows code page 99999.",
       );
     });
 
-    it('should handle all Windows-specific code pages', () => {
-      expect(windowsCodePageToEncoding(874)).toBe('windows-874');
-      expect(windowsCodePageToEncoding(1250)).toBe('windows-1250');
-      expect(windowsCodePageToEncoding(1251)).toBe('windows-1251');
-      expect(windowsCodePageToEncoding(1253)).toBe('windows-1253');
-      expect(windowsCodePageToEncoding(1254)).toBe('windows-1254');
-      expect(windowsCodePageToEncoding(1255)).toBe('windows-1255');
-      expect(windowsCodePageToEncoding(1256)).toBe('windows-1256');
-      expect(windowsCodePageToEncoding(1257)).toBe('windows-1257');
-      expect(windowsCodePageToEncoding(1258)).toBe('windows-1258');
+    it("should handle all Windows-specific code pages", () => {
+      expect(windowsCodePageToEncoding(874)).toBe("windows-874");
+      expect(windowsCodePageToEncoding(1250)).toBe("windows-1250");
+      expect(windowsCodePageToEncoding(1251)).toBe("windows-1251");
+      expect(windowsCodePageToEncoding(1253)).toBe("windows-1253");
+      expect(windowsCodePageToEncoding(1254)).toBe("windows-1254");
+      expect(windowsCodePageToEncoding(1255)).toBe("windows-1255");
+      expect(windowsCodePageToEncoding(1256)).toBe("windows-1256");
+      expect(windowsCodePageToEncoding(1257)).toBe("windows-1257");
+      expect(windowsCodePageToEncoding(1258)).toBe("windows-1258");
     });
   });
 
-  describe('detectEncodingFromBuffer', () => {
-    it('should detect encoding using chardet successfully', () => {
-      const buffer = Buffer.from('test content', 'utf8');
-      mockedChardetDetect.mockReturnValue('UTF-8');
+  describe("detectEncodingFromBuffer", () => {
+    it("should detect encoding using chardet successfully", () => {
+      const buffer = Buffer.from("test content", "utf8");
+      mockedChardetDetect.mockReturnValue("UTF-8");
 
       const result = detectEncodingFromBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
       expect(mockedChardetDetect).toHaveBeenCalledWith(buffer);
     });
 
-    it('should handle chardet returning mixed case encoding', () => {
-      const buffer = Buffer.from('test content', 'utf8');
-      mockedChardetDetect.mockReturnValue('ISO-8859-1');
+    it("should handle chardet returning mixed case encoding", () => {
+      const buffer = Buffer.from("test content", "utf8");
+      mockedChardetDetect.mockReturnValue("ISO-8859-1");
 
       const result = detectEncodingFromBuffer(buffer);
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
 
-    it('should return null when chardet fails', () => {
-      const buffer = Buffer.from('test content', 'utf8');
+    it("should return null when chardet fails", () => {
+      const buffer = Buffer.from("test content", "utf8");
       mockedChardetDetect.mockImplementation(() => {
-        throw new Error('Detection failed');
+        throw new Error("Detection failed");
       });
 
       const result = detectEncodingFromBuffer(buffer);
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Failed to detect encoding with chardet:',
+        "Failed to detect encoding with chardet:",
         expect.any(Error),
       );
     });
 
-    it('should return null when chardet returns null', () => {
-      const buffer = Buffer.from('test content', 'utf8');
+    it("should return null when chardet returns null", () => {
+      const buffer = Buffer.from("test content", "utf8");
       mockedChardetDetect.mockReturnValue(null);
 
       const result = detectEncodingFromBuffer(buffer);
       expect(result).toBe(null);
     });
 
-    it('should return null when chardet returns non-string', () => {
-      const buffer = Buffer.from('test content', 'utf8');
-      mockedChardetDetect.mockReturnValue([
-        'utf-8',
-        'iso-8859-1',
-      ] as unknown as string);
+    it("should return null when chardet returns non-string", () => {
+      const buffer = Buffer.from("test content", "utf8");
+      mockedChardetDetect.mockReturnValue(["utf-8", "iso-8859-1"] as unknown as string);
 
       const result = detectEncodingFromBuffer(buffer);
       expect(result).toBe(null);
     });
   });
 
-  describe('getSystemEncoding - Windows', () => {
+  describe("getSystemEncoding - Windows", () => {
     beforeEach(() => {
-      mockedOsPlatform.mockReturnValue('win32');
+      mockedOsPlatform.mockReturnValue("win32");
     });
 
-    it('should parse Windows chcp output correctly', () => {
-      mockedExecSync.mockReturnValue('Active code page: 65001');
+    it("should parse Windows chcp output correctly", () => {
+      mockedExecSync.mockReturnValue("Active code page: 65001");
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
-      expect(mockedExecSync).toHaveBeenCalledWith('chcp', { encoding: 'utf8' });
+      expect(result).toBe("utf-8");
+      expect(mockedExecSync).toHaveBeenCalledWith("chcp", { encoding: "utf8" });
     });
 
-    it('should handle different chcp output formats', () => {
-      mockedExecSync.mockReturnValue('Current code page: 1252');
+    it("should handle different chcp output formats", () => {
+      mockedExecSync.mockReturnValue("Current code page: 1252");
 
       const result = getSystemEncoding();
-      expect(result).toBe('windows-1252');
+      expect(result).toBe("windows-1252");
     });
 
-    it('should handle chcp output with extra whitespace', () => {
-      mockedExecSync.mockReturnValue('Active code page:   437   ');
+    it("should handle chcp output with extra whitespace", () => {
+      mockedExecSync.mockReturnValue("Active code page:   437   ");
 
       const result = getSystemEncoding();
-      expect(result).toBe('cp437');
+      expect(result).toBe("cp437");
     });
 
-    it('should return null when chcp command fails', () => {
+    it("should return null when chcp command fails", () => {
       mockedExecSync.mockImplementation(() => {
-        throw new Error('Command failed');
+        throw new Error("Command failed");
       });
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          "Failed to get Windows code page using 'chcp' command",
-        ),
+        expect.stringContaining("Failed to get Windows code page using 'chcp' command"),
       );
     });
 
-    it('should return null when chcp output cannot be parsed', () => {
-      mockedExecSync.mockReturnValue('Unexpected output format');
+    it("should return null when chcp output cannot be parsed", () => {
+      mockedExecSync.mockReturnValue("Unexpected output format");
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          "Failed to get Windows code page using 'chcp' command",
-        ),
+        expect.stringContaining("Failed to get Windows code page using 'chcp' command"),
       );
     });
 
-    it('should return null when code page is not a number', () => {
-      mockedExecSync.mockReturnValue('Active code page: abc');
+    it("should return null when code page is not a number", () => {
+      mockedExecSync.mockReturnValue("Active code page: abc");
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          "Failed to get Windows code page using 'chcp' command",
-        ),
+        expect.stringContaining("Failed to get Windows code page using 'chcp' command"),
       );
     });
 
-    it('should return null when code page maps to null', () => {
-      mockedExecSync.mockReturnValue('Active code page: 99999');
+    it("should return null when code page maps to null", () => {
+      mockedExecSync.mockReturnValue("Active code page: 99999");
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
       // Should warn about unknown code page from windowsCodePageToEncoding
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Unable to determine encoding for windows code page 99999.',
+        "Unable to determine encoding for windows code page 99999.",
       );
     });
   });
 
-  describe('getSystemEncoding - Unix-like', () => {
+  describe("getSystemEncoding - Unix-like", () => {
     beforeEach(() => {
-      mockedOsPlatform.mockReturnValue('linux');
+      mockedOsPlatform.mockReturnValue("linux");
     });
 
-    it('should parse locale from LC_ALL environment variable', () => {
-      process.env['LC_ALL'] = 'en_US.UTF-8';
+    it("should parse locale from LC_ALL environment variable", () => {
+      process.env["LC_ALL"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should parse locale from LC_CTYPE when LC_ALL is not set', () => {
-      process.env['LC_CTYPE'] = 'fr_FR.ISO-8859-1';
+    it("should parse locale from LC_CTYPE when LC_ALL is not set", () => {
+      process.env["LC_CTYPE"] = "fr_FR.ISO-8859-1";
 
       const result = getSystemEncoding();
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
 
-    it('should parse locale from LANG when LC_ALL and LC_CTYPE are not set', () => {
-      process.env['LANG'] = 'de_DE.UTF-8';
+    it("should parse locale from LANG when LC_ALL and LC_CTYPE are not set", () => {
+      process.env["LANG"] = "de_DE.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle locale charmap command when environment variables are empty', () => {
-      mockedExecSync.mockReturnValue('UTF-8\n');
+    it("should handle locale charmap command when environment variables are empty", () => {
+      mockedExecSync.mockReturnValue("UTF-8\n");
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
-      expect(mockedExecSync).toHaveBeenCalledWith('locale charmap', {
-        encoding: 'utf8',
+      expect(result).toBe("utf-8");
+      expect(mockedExecSync).toHaveBeenCalledWith("locale charmap", {
+        encoding: "utf8",
       });
     });
 
-    it('should handle locale charmap with mixed case', () => {
-      mockedExecSync.mockReturnValue('ISO-8859-1\n');
+    it("should handle locale charmap with mixed case", () => {
+      mockedExecSync.mockReturnValue("ISO-8859-1\n");
 
       const result = getSystemEncoding();
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
 
-    it('should return null when locale charmap fails', () => {
+    it("should return null when locale charmap fails", () => {
       mockedExecSync.mockImplementation(() => {
-        throw new Error('Command failed');
+        throw new Error("Command failed");
       });
 
       const result = getSystemEncoding();
       expect(result).toBe(null);
-      expect(consoleWarnSpy).toHaveBeenCalledWith(
-        'Failed to get locale charmap.',
-      );
+      expect(consoleWarnSpy).toHaveBeenCalledWith("Failed to get locale charmap.");
     });
 
-    it('should handle locale without encoding (no dot)', () => {
-      process.env['LANG'] = 'C';
+    it("should handle locale without encoding (no dot)", () => {
+      process.env["LANG"] = "C";
 
       const result = getSystemEncoding();
-      expect(result).toBe('c');
+      expect(result).toBe("c");
     });
 
-    it('should handle empty locale environment variables', () => {
-      process.env['LC_ALL'] = '';
-      process.env['LC_CTYPE'] = '';
-      process.env['LANG'] = '';
-      mockedExecSync.mockReturnValue('UTF-8');
+    it("should handle empty locale environment variables", () => {
+      process.env["LC_ALL"] = "";
+      process.env["LC_CTYPE"] = "";
+      process.env["LANG"] = "";
+      mockedExecSync.mockReturnValue("UTF-8");
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should return locale as-is when locale format has no dot', () => {
-      process.env['LANG'] = 'invalid_format';
+    it("should return locale as-is when locale format has no dot", () => {
+      process.env["LANG"] = "invalid_format";
 
       const result = getSystemEncoding();
-      expect(result).toBe('invalid_format');
+      expect(result).toBe("invalid_format");
     });
 
-    it('should prioritize LC_ALL over other environment variables', () => {
-      process.env['LC_ALL'] = 'en_US.UTF-8';
-      process.env['LC_CTYPE'] = 'fr_FR.ISO-8859-1';
-      process.env['LANG'] = 'de_DE.CP1252';
+    it("should prioritize LC_ALL over other environment variables", () => {
+      process.env["LC_ALL"] = "en_US.UTF-8";
+      process.env["LC_CTYPE"] = "fr_FR.ISO-8859-1";
+      process.env["LANG"] = "de_DE.CP1252";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should prioritize LC_CTYPE over LANG', () => {
-      process.env['LC_CTYPE'] = 'fr_FR.ISO-8859-1';
-      process.env['LANG'] = 'de_DE.CP1252';
+    it("should prioritize LC_CTYPE over LANG", () => {
+      process.env["LC_CTYPE"] = "fr_FR.ISO-8859-1";
+      process.env["LANG"] = "de_DE.CP1252";
 
       const result = getSystemEncoding();
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
     });
   });
 
-  describe('getEncodingForBuffer', () => {
+  describe("getEncodingForBuffer", () => {
     beforeEach(() => {
-      mockedOsPlatform.mockReturnValue('linux');
+      mockedOsPlatform.mockReturnValue("linux");
     });
 
-    it('should use cached system encoding on subsequent calls', () => {
-      process.env['LANG'] = 'en_US.UTF-8';
-      const buffer = Buffer.from('test');
+    it("should use cached system encoding on subsequent calls", () => {
+      process.env["LANG"] = "en_US.UTF-8";
+      const buffer = Buffer.from("test");
 
       // First call
       const result1 = getCachedEncodingForBuffer(buffer);
-      expect(result1).toBe('utf-8');
+      expect(result1).toBe("utf-8");
 
       // Change environment (should not affect cached result)
-      process.env['LANG'] = 'fr_FR.ISO-8859-1';
+      process.env["LANG"] = "fr_FR.ISO-8859-1";
 
       // Second call should use cached value
       const result2 = getCachedEncodingForBuffer(buffer);
-      expect(result2).toBe('utf-8');
+      expect(result2).toBe("utf-8");
     });
 
-    it('should fall back to buffer detection when system encoding fails', () => {
+    it("should fall back to buffer detection when system encoding fails", () => {
       // No environment variables set
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      const buffer = Buffer.from('test');
-      mockedChardetDetect.mockReturnValue('ISO-8859-1');
+      const buffer = Buffer.from("test");
+      mockedChardetDetect.mockReturnValue("ISO-8859-1");
 
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('iso-8859-1');
+      expect(result).toBe("iso-8859-1");
       expect(mockedChardetDetect).toHaveBeenCalledWith(buffer);
     });
 
-    it('should fall back to utf-8 when both system and buffer detection fail', () => {
+    it("should fall back to utf-8 when both system and buffer detection fail", () => {
       // System encoding fails
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
       // Buffer detection fails
       mockedChardetDetect.mockImplementation(() => {
-        throw new Error('chardet failed');
+        throw new Error("chardet failed");
       });
 
-      const buffer = Buffer.from('test');
+      const buffer = Buffer.from("test");
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should not cache buffer detection results', () => {
+    it("should not cache buffer detection results", () => {
       // System encoding fails initially
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      const buffer1 = Buffer.from('test1');
-      const buffer2 = Buffer.from('test2');
+      const buffer1 = Buffer.from("test1");
+      const buffer2 = Buffer.from("test2");
 
-      mockedChardetDetect
-        .mockReturnValueOnce('ISO-8859-1')
-        .mockReturnValueOnce('UTF-16');
+      mockedChardetDetect.mockReturnValueOnce("ISO-8859-1").mockReturnValueOnce("UTF-16");
 
       const result1 = getCachedEncodingForBuffer(buffer1);
       const result2 = getCachedEncodingForBuffer(buffer2);
 
-      expect(result1).toBe('iso-8859-1');
-      expect(result2).toBe('utf-16');
+      expect(result1).toBe("iso-8859-1");
+      expect(result2).toBe("utf-16");
       expect(mockedChardetDetect).toHaveBeenCalledTimes(2);
     });
 
-    it('should handle Windows system encoding', () => {
-      mockedOsPlatform.mockReturnValue('win32');
-      mockedExecSync.mockReturnValue('Active code page: 1252');
+    it("should handle Windows system encoding", () => {
+      mockedOsPlatform.mockReturnValue("win32");
+      mockedExecSync.mockReturnValue("Active code page: 1252");
 
-      const buffer = Buffer.from('test');
+      const buffer = Buffer.from("test");
       const result = getCachedEncodingForBuffer(buffer);
 
-      expect(result).toBe('windows-1252');
+      expect(result).toBe("windows-1252");
     });
 
-    it('should cache null system encoding result', () => {
+    it("should cache null system encoding result", () => {
       // Reset the cache specifically for this test
       resetEncodingCache();
 
       // Ensure we're on Unix-like for this test
-      mockedOsPlatform.mockReturnValue('linux');
+      mockedOsPlatform.mockReturnValue("linux");
 
       // System encoding detection returns null
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      const buffer1 = Buffer.from('test1');
-      const buffer2 = Buffer.from('test2');
+      const buffer1 = Buffer.from("test1");
+      const buffer2 = Buffer.from("test2");
 
-      mockedChardetDetect
-        .mockReturnValueOnce('ISO-8859-1')
-        .mockReturnValueOnce('UTF-16');
+      mockedChardetDetect.mockReturnValueOnce("ISO-8859-1").mockReturnValueOnce("UTF-16");
 
       // Clear any previous calls from beforeEach setup or previous tests
       mockedExecSync.mockClear();
@@ -418,79 +403,79 @@ describe('Shell Command Processor - Encoding Functions', () => {
 
       // Should call execSync only once due to caching (null result is cached)
       expect(mockedExecSync).toHaveBeenCalledTimes(1);
-      expect(result1).toBe('iso-8859-1');
-      expect(result2).toBe('utf-16');
+      expect(result1).toBe("iso-8859-1");
+      expect(result2).toBe("utf-16");
 
       // Call a third time to verify cache is still used
-      const buffer3 = Buffer.from('test3');
-      mockedChardetDetect.mockReturnValueOnce('UTF-32');
+      const buffer3 = Buffer.from("test3");
+      mockedChardetDetect.mockReturnValueOnce("UTF-32");
       const result3 = getCachedEncodingForBuffer(buffer3);
 
       // Still should be only one call to execSync
       expect(mockedExecSync).toHaveBeenCalledTimes(1);
-      expect(result3).toBe('utf-32');
+      expect(result3).toBe("utf-32");
     });
   });
 
-  describe('Cross-platform behavior', () => {
-    it('should work correctly on macOS', () => {
-      mockedOsPlatform.mockReturnValue('darwin');
-      process.env['LANG'] = 'en_US.UTF-8';
+  describe("Cross-platform behavior", () => {
+    it("should work correctly on macOS", () => {
+      mockedOsPlatform.mockReturnValue("darwin");
+      process.env["LANG"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should work correctly on other Unix-like systems', () => {
-      mockedOsPlatform.mockReturnValue('freebsd');
-      process.env['LANG'] = 'en_US.UTF-8';
+    it("should work correctly on other Unix-like systems", () => {
+      mockedOsPlatform.mockReturnValue("freebsd");
+      process.env["LANG"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle unknown platforms as Unix-like', () => {
-      mockedOsPlatform.mockReturnValue('unknown' as NodeJS.Platform);
-      process.env['LANG'] = 'en_US.UTF-8';
+    it("should handle unknown platforms as Unix-like", () => {
+      mockedOsPlatform.mockReturnValue("unknown" as NodeJS.Platform);
+      process.env["LANG"] = "en_US.UTF-8";
 
       const result = getSystemEncoding();
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
   });
 
-  describe('Edge cases and error handling', () => {
-    it('should handle empty buffer gracefully', () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      process.env['LANG'] = 'en_US.UTF-8';
+  describe("Edge cases and error handling", () => {
+    it("should handle empty buffer gracefully", () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      process.env["LANG"] = "en_US.UTF-8";
 
       const buffer = Buffer.alloc(0);
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle very large buffers', () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      process.env['LANG'] = 'en_US.UTF-8';
+    it("should handle very large buffers", () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      process.env["LANG"] = "en_US.UTF-8";
 
-      const buffer = Buffer.alloc(1024 * 1024, 'a');
+      const buffer = Buffer.alloc(1024 * 1024, "a");
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
 
-    it('should handle Unicode content', () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      const unicodeText = '你好世界 🌍 ñoño';
+    it("should handle Unicode content", () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      const unicodeText = "你好世界 🌍 ñoño";
 
       // System encoding fails
       mockedExecSync.mockImplementation(() => {
-        throw new Error('locale command failed');
+        throw new Error("locale command failed");
       });
 
-      mockedChardetDetect.mockReturnValue('UTF-8');
+      mockedChardetDetect.mockReturnValue("UTF-8");
 
-      const buffer = Buffer.from(unicodeText, 'utf8');
+      const buffer = Buffer.from(unicodeText, "utf8");
       const result = getCachedEncodingForBuffer(buffer);
-      expect(result).toBe('utf-8');
+      expect(result).toBe("utf-8");
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/systemEncoding.ts b/packages/gemini-core/src/utils/systemEncoding.ts
index 298eed05a..65ec00fcb 100644
--- a/packages/gemini-core/src/utils/systemEncoding.ts
+++ b/packages/gemini-core/src/utils/systemEncoding.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { execSync } from 'node:child_process';
-import os from 'node:os';
-import { detect as chardetDetect } from 'chardet';
-import { debugLogger } from './debugLogger.js';
+import { execSync } from "node:child_process";
+import os from "node:os";
+import { detect as chardetDetect } from "chardet";
+import { debugLogger } from "./debugLogger.js";
 
 // Cache for system encoding to avoid repeated detection
 // Use undefined to indicate "not yet checked" vs null meaning "checked but failed"
@@ -39,7 +39,7 @@ export function getCachedEncodingForBuffer(buffer: Buffer): string {
   }
 
   // Otherwise, detect from this specific buffer (don't cache this result)
-  return detectEncodingFromBuffer(buffer) || 'utf-8';
+  return detectEncodingFromBuffer(buffer) || "utf-8";
 }
 
 /**
@@ -52,9 +52,9 @@ export function getCachedEncodingForBuffer(buffer: Buffer): string {
  */
 export function getSystemEncoding(): string | null {
   // Windows
-  if (os.platform() === 'win32') {
+  if (os.platform() === "win32") {
     try {
-      const output = execSync('chcp', { encoding: 'utf8' });
+      const output = execSync("chcp", { encoding: "utf8" });
       const match = output.match(/:\s*(\d+)/);
       if (match) {
         const codePage = parseInt(match[1], 10);
@@ -63,9 +63,7 @@ export function getSystemEncoding(): string | null {
         }
       }
       // Only warn if we can't parse the output format, not if windowsCodePageToEncoding fails
-      throw new Error(
-        `Unable to parse Windows code page from 'chcp' output "${output.trim()}". `,
-      );
+      throw new Error(`Unable to parse Windows code page from 'chcp' output "${output.trim()}". `);
     } catch (error) {
       debugLogger.warn(
         `Failed to get Windows code page using 'chcp' command: ${error instanceof Error ? error.message : String(error)}. ` +
@@ -80,16 +78,14 @@ export function getSystemEncoding(): string | null {
   // system encoding. However, these environment variables might not always
   // be set or accurate. Handle cases where none of these variables are set.
   const env = process.env;
-  let locale = env['LC_ALL'] || env['LC_CTYPE'] || env['LANG'] || '';
+  let locale = env["LC_ALL"] || env["LC_CTYPE"] || env["LANG"] || "";
 
   // Fallback to querying the system directly when environment variables are missing
   if (!locale) {
     try {
-      locale = execSync('locale charmap', { encoding: 'utf8' })
-        .toString()
-        .trim();
+      locale = execSync("locale charmap", { encoding: "utf8" }).toString().trim();
     } catch (_e) {
-      debugLogger.warn('Failed to get locale charmap.');
+      debugLogger.warn("Failed to get locale charmap.");
       return null;
     }
   }
@@ -100,7 +96,7 @@ export function getSystemEncoding(): string | null {
   }
 
   // Handle cases where locale charmap returns just the encoding name (e.g., "UTF-8")
-  if (locale && !locale.includes('.')) {
+  if (locale && !locale.includes(".")) {
     return locale.toLowerCase();
   }
 
@@ -115,27 +111,27 @@ export function getSystemEncoding(): string | null {
 export function windowsCodePageToEncoding(cp: number): string | null {
   // Most common mappings; extend as needed
   const map: { [key: number]: string } = {
-    437: 'cp437',
-    850: 'cp850',
-    852: 'cp852',
-    866: 'cp866',
-    874: 'windows-874',
-    932: 'shift_jis',
-    936: 'gb2312',
-    949: 'euc-kr',
-    950: 'big5',
-    1200: 'utf-16le',
-    1201: 'utf-16be',
-    1250: 'windows-1250',
-    1251: 'windows-1251',
-    1252: 'windows-1252',
-    1253: 'windows-1253',
-    1254: 'windows-1254',
-    1255: 'windows-1255',
-    1256: 'windows-1256',
-    1257: 'windows-1257',
-    1258: 'windows-1258',
-    65001: 'utf-8',
+    437: "cp437",
+    850: "cp850",
+    852: "cp852",
+    866: "cp866",
+    874: "windows-874",
+    932: "shift_jis",
+    936: "gb2312",
+    949: "euc-kr",
+    950: "big5",
+    1200: "utf-16le",
+    1201: "utf-16be",
+    1250: "windows-1250",
+    1251: "windows-1251",
+    1252: "windows-1252",
+    1253: "windows-1253",
+    1254: "windows-1254",
+    1255: "windows-1255",
+    1256: "windows-1256",
+    1257: "windows-1257",
+    1258: "windows-1258",
+    65001: "utf-8",
   };
 
   if (map[cp]) {
@@ -156,11 +152,11 @@ export function windowsCodePageToEncoding(cp: number): string | null {
 export function detectEncodingFromBuffer(buffer: Buffer): string | null {
   try {
     const detected = chardetDetect(buffer);
-    if (detected && typeof detected === 'string') {
+    if (detected && typeof detected === "string") {
       return detected.toLowerCase();
     }
   } catch (error) {
-    debugLogger.warn('Failed to detect encoding with chardet:', error);
+    debugLogger.warn("Failed to detect encoding with chardet:", error);
   }
 
   return null;
diff --git a/packages/gemini-core/src/utils/terminalSerializer.test.ts b/packages/gemini-core/src/utils/terminalSerializer.test.ts
index fd6241d04..541b9d164 100644
--- a/packages/gemini-core/src/utils/terminalSerializer.test.ts
+++ b/packages/gemini-core/src/utils/terminalSerializer.test.ts
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { Terminal } from '@xterm/headless';
-import {
-  serializeTerminalToObject,
-  convertColorToHex,
-  ColorMode,
-} from './terminalSerializer.js';
+import { Terminal } from "@xterm/headless";
+import { describe, expect, it } from "vitest";
+import { ColorMode, convertColorToHex, serializeTerminalToObject } from "./terminalSerializer.js";
 
-const RED_FG = '\x1b[31m';
-const RESET = '\x1b[0m';
+const RED_FG = "\x1b[31m";
+const RESET = "\x1b[0m";
 
 function writeToTerminal(terminal: Terminal, data: string): Promise<void> {
   return new Promise((resolve) => {
@@ -21,9 +17,9 @@ function writeToTerminal(terminal: Terminal, data: string): Promise<void> {
   });
 }
 
-describe('terminalSerializer', () => {
-  describe('serializeTerminalToObject', () => {
-    it('should handle an empty terminal', () => {
+describe("terminalSerializer", () => {
+  describe("serializeTerminalToObject", () => {
+    it("should handle an empty terminal", () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
@@ -34,95 +30,95 @@ describe('terminalSerializer', () => {
       result.forEach((line) => {
         // Expect each line to be either empty or contain a single token with spaces
         if (line.length > 0) {
-          expect(line[0].text.trim()).toBe('');
+          expect(line[0].text.trim()).toBe("");
         }
       });
     });
 
-    it('should serialize a single line of text', async () => {
+    it("should serialize a single line of text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, 'Hello, world!');
+      await writeToTerminal(terminal, "Hello, world!");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].text).toContain('Hello, world!');
+      expect(result[0][0].text).toContain("Hello, world!");
     });
 
-    it('should serialize multiple lines of text', async () => {
+    it("should serialize multiple lines of text", async () => {
       const terminal = new Terminal({
         cols: 7,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, 'Line 1\r\nLine 2');
+      await writeToTerminal(terminal, "Line 1\r\nLine 2");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].text).toBe('Line 1 ');
-      expect(result[1][0].text).toBe('Line 2');
+      expect(result[0][0].text).toBe("Line 1 ");
+      expect(result[1][0].text).toBe("Line 2");
     });
 
-    it('should handle bold text', async () => {
+    it("should handle bold text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[1mBold text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[1mBold text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].bold).toBe(true);
-      expect(result[0][0].text).toBe('Bold text');
+      expect(result[0][0].text).toBe("Bold text");
     });
 
-    it('should handle italic text', async () => {
+    it("should handle italic text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[3mItalic text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[3mItalic text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].italic).toBe(true);
-      expect(result[0][0].text).toBe('Italic text');
+      expect(result[0][0].text).toBe("Italic text");
     });
 
-    it('should handle underlined text', async () => {
+    it("should handle underlined text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[4mUnderlined text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[4mUnderlined text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].underline).toBe(true);
-      expect(result[0][0].text).toBe('Underlined text');
+      expect(result[0][0].text).toBe("Underlined text");
     });
 
-    it('should handle dim text', async () => {
+    it("should handle dim text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[2mDim text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[2mDim text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].dim).toBe(true);
-      expect(result[0][0].text).toBe('Dim text');
+      expect(result[0][0].text).toBe("Dim text");
     });
 
-    it('should handle inverse text', async () => {
+    it("should handle inverse text", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[7mInverse text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[7mInverse text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].inverse).toBe(true);
-      expect(result[0][0].text).toBe('Inverse text');
+      expect(result[0][0].text).toBe("Inverse text");
     });
 
-    it('should handle foreground colors', async () => {
+    it("should handle foreground colors", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
@@ -130,68 +126,68 @@ describe('terminalSerializer', () => {
       });
       await writeToTerminal(terminal, `${RED_FG}Red text${RESET}`);
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].fg).toBe('#800000');
-      expect(result[0][0].text).toBe('Red text');
+      expect(result[0][0].fg).toBe("#800000");
+      expect(result[0][0].text).toBe("Red text");
     });
 
-    it('should handle background colors', async () => {
+    it("should handle background colors", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[42mGreen background\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[42mGreen background\x1b[0m");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].bg).toBe('#008000');
-      expect(result[0][0].text).toBe('Green background');
+      expect(result[0][0].bg).toBe("#008000");
+      expect(result[0][0].text).toBe("Green background");
     });
 
-    it('should handle RGB colors', async () => {
+    it("should handle RGB colors", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[38;2;100;200;50mRGB text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[38;2;100;200;50mRGB text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
-      expect(result[0][0].fg).toBe('#64c832');
-      expect(result[0][0].text).toBe('RGB text');
+      expect(result[0][0].fg).toBe("#64c832");
+      expect(result[0][0].text).toBe("RGB text");
     });
 
-    it('should handle a combination of styles', async () => {
+    it("should handle a combination of styles", async () => {
       const terminal = new Terminal({
         cols: 80,
         rows: 24,
         allowProposedApi: true,
       });
-      await writeToTerminal(terminal, '\x1b[1;31;42mStyled text\x1b[0m');
+      await writeToTerminal(terminal, "\x1b[1;31;42mStyled text\x1b[0m");
       const result = serializeTerminalToObject(terminal);
       expect(result[0][0].bold).toBe(true);
-      expect(result[0][0].fg).toBe('#800000');
-      expect(result[0][0].bg).toBe('#008000');
-      expect(result[0][0].text).toBe('Styled text');
+      expect(result[0][0].fg).toBe("#800000");
+      expect(result[0][0].bg).toBe("#008000");
+      expect(result[0][0].text).toBe("Styled text");
     });
   });
-  describe('convertColorToHex', () => {
-    it('should convert RGB color to hex', () => {
+  describe("convertColorToHex", () => {
+    it("should convert RGB color to hex", () => {
       const color = (100 << 16) | (200 << 8) | 50;
-      const hex = convertColorToHex(color, ColorMode.RGB, '#000000');
-      expect(hex).toBe('#64c832');
+      const hex = convertColorToHex(color, ColorMode.RGB, "#000000");
+      expect(hex).toBe("#64c832");
     });
 
-    it('should convert palette color to hex', () => {
-      const hex = convertColorToHex(1, ColorMode.PALETTE, '#000000');
-      expect(hex).toBe('#800000');
+    it("should convert palette color to hex", () => {
+      const hex = convertColorToHex(1, ColorMode.PALETTE, "#000000");
+      expect(hex).toBe("#800000");
     });
 
-    it('should return default color for ColorMode.DEFAULT', () => {
-      const hex = convertColorToHex(0, ColorMode.DEFAULT, '#ffffff');
-      expect(hex).toBe('#ffffff');
+    it("should return default color for ColorMode.DEFAULT", () => {
+      const hex = convertColorToHex(0, ColorMode.DEFAULT, "#ffffff");
+      expect(hex).toBe("#ffffff");
     });
 
-    it('should return default color for invalid palette index', () => {
-      const hex = convertColorToHex(999, ColorMode.PALETTE, '#000000');
-      expect(hex).toBe('#000000');
+    it("should return default color for invalid palette index", () => {
+      const hex = convertColorToHex(999, ColorMode.PALETTE, "#000000");
+      expect(hex).toBe("#000000");
     });
   });
 });
diff --git a/packages/gemini-core/src/utils/terminalSerializer.ts b/packages/gemini-core/src/utils/terminalSerializer.ts
index 7bcd2a4ce..70befccb8 100644
--- a/packages/gemini-core/src/utils/terminalSerializer.ts
+++ b/packages/gemini-core/src/utils/terminalSerializer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { IBufferCell, Terminal } from '@xterm/headless';
+import type { IBufferCell, Terminal } from "@xterm/headless";
 export interface AnsiToken {
   text: string;
   bold: boolean;
@@ -45,13 +45,7 @@ class Cell {
   fgColorMode: ColorMode = ColorMode.DEFAULT;
   bgColorMode: ColorMode = ColorMode.DEFAULT;
 
-  constructor(
-    cell: IBufferCell | null,
-    x: number,
-    y: number,
-    cursorX: number,
-    cursorY: number,
-  ) {
+  constructor(cell: IBufferCell | null, x: number, y: number, cursorX: number, cursorY: number) {
     this.cell = cell;
     this.x = x;
     this.y = y;
@@ -112,7 +106,7 @@ class Cell {
   }
 
   getChars(): string {
-    return this.cell?.getChars() || ' ';
+    return this.cell?.getChars() || " ";
   }
 
   isAttribute(attribute: Attribute): boolean {
@@ -135,8 +129,8 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
   const buffer = terminal.buffer.active;
   const cursorX = buffer.cursorX;
   const cursorY = buffer.cursorY;
-  const defaultFg = '';
-  const defaultBg = '';
+  const defaultFg = "";
+  const defaultBg = "";
 
   const result: AnsiOutput = [];
 
@@ -149,7 +143,7 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
     }
 
     let lastCell = new Cell(null, -1, -1, cursorX, cursorY);
-    let currentText = '';
+    let currentText = "";
 
     for (let x = 0; x < terminal.cols; x++) {
       const cellData = line.getCell(x);
@@ -163,14 +157,13 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
             italic: lastCell.isAttribute(Attribute.italic),
             underline: lastCell.isAttribute(Attribute.underline),
             dim: lastCell.isAttribute(Attribute.dim),
-            inverse:
-              lastCell.isAttribute(Attribute.inverse) || lastCell.isCursor(),
+            inverse: lastCell.isAttribute(Attribute.inverse) || lastCell.isCursor(),
             fg: convertColorToHex(lastCell.fg, lastCell.fgColorMode, defaultFg),
             bg: convertColorToHex(lastCell.bg, lastCell.bgColorMode, defaultBg),
           };
           currentLine.push(token);
         }
-        currentText = '';
+        currentText = "";
       }
       currentText += cell.getChars();
       lastCell = cell;
@@ -198,262 +191,262 @@ export function serializeTerminalToObject(terminal: Terminal): AnsiOutput {
 
 // ANSI color palette from https://en.wikipedia.org/wiki/ANSI_escape_code#8-bit
 const ANSI_COLORS = [
-  '#000000',
-  '#800000',
-  '#008000',
-  '#808000',
-  '#000080',
-  '#800080',
-  '#008080',
-  '#c0c0c0',
-  '#808080',
-  '#ff0000',
-  '#00ff00',
-  '#ffff00',
-  '#0000ff',
-  '#ff00ff',
-  '#00ffff',
-  '#ffffff',
-  '#000000',
-  '#00005f',
-  '#000087',
-  '#0000af',
-  '#0000d7',
-  '#0000ff',
-  '#005f00',
-  '#005f5f',
-  '#005f87',
-  '#005faf',
-  '#005fd7',
-  '#005fff',
-  '#008700',
-  '#00875f',
-  '#008787',
-  '#0087af',
-  '#0087d7',
-  '#0087ff',
-  '#00af00',
-  '#00af5f',
-  '#00af87',
-  '#00afaf',
-  '#00afd7',
-  '#00afff',
-  '#00d700',
-  '#00d75f',
-  '#00d787',
-  '#00d7af',
-  '#00d7d7',
-  '#00d7ff',
-  '#00ff00',
-  '#00ff5f',
-  '#00ff87',
-  '#00ffaf',
-  '#00ffd7',
-  '#00ffff',
-  '#5f0000',
-  '#5f005f',
-  '#5f0087',
-  '#5f00af',
-  '#5f00d7',
-  '#5f00ff',
-  '#5f5f00',
-  '#5f5f5f',
-  '#5f5f87',
-  '#5f5faf',
-  '#5f5fd7',
-  '#5f5fff',
-  '#5f8700',
-  '#5f875f',
-  '#5f8787',
-  '#5f87af',
-  '#5f87d7',
-  '#5f87ff',
-  '#5faf00',
-  '#5faf5f',
-  '#5faf87',
-  '#5fafaf',
-  '#5fafd7',
-  '#5fafff',
-  '#5fd700',
-  '#5fd75f',
-  '#5fd787',
-  '#5fd7af',
-  '#5fd7d7',
-  '#5fd7ff',
-  '#5fff00',
-  '#5fff5f',
-  '#5fff87',
-  '#5fffaf',
-  '#5fffd7',
-  '#5fffff',
-  '#870000',
-  '#87005f',
-  '#870087',
-  '#8700af',
-  '#8700d7',
-  '#8700ff',
-  '#875f00',
-  '#875f5f',
-  '#875f87',
-  '#875faf',
-  '#875fd7',
-  '#875fff',
-  '#878700',
-  '#87875f',
-  '#878787',
-  '#8787af',
-  '#8787d7',
-  '#8787ff',
-  '#87af00',
-  '#87af5f',
-  '#87af87',
-  '#87afaf',
-  '#87afd7',
-  '#87afff',
-  '#87d700',
-  '#87d75f',
-  '#87d787',
-  '#87d7af',
-  '#87d7d7',
-  '#87d7ff',
-  '#87ff00',
-  '#87ff5f',
-  '#87ff87',
-  '#87ffaf',
-  '#87ffd7',
-  '#87ffff',
-  '#af0000',
-  '#af005f',
-  '#af0087',
-  '#af00af',
-  '#af00d7',
-  '#af00ff',
-  '#af5f00',
-  '#af5f5f',
-  '#af5f87',
-  '#af5faf',
-  '#af5fd7',
-  '#af5fff',
-  '#af8700',
-  '#af875f',
-  '#af8787',
-  '#af87af',
-  '#af87d7',
-  '#af87ff',
-  '#afaf00',
-  '#afaf5f',
-  '#afaf87',
-  '#afafaf',
-  '#afafd7',
-  '#afafff',
-  '#afd700',
-  '#afd75f',
-  '#afd787',
-  '#afd7af',
-  '#afd7d7',
-  '#afd7ff',
-  '#afff00',
-  '#afff5f',
-  '#afff87',
-  '#afffaf',
-  '#afffd7',
-  '#afffff',
-  '#d70000',
-  '#d7005f',
-  '#d70087',
-  '#d700af',
-  '#d700d7',
-  '#d700ff',
-  '#d75f00',
-  '#d75f5f',
-  '#d75f87',
-  '#d75faf',
-  '#d75fd7',
-  '#d75fff',
-  '#d78700',
-  '#d7875f',
-  '#d78787',
-  '#d787af',
-  '#d787d7',
-  '#d787ff',
-  '#d7af00',
-  '#d7af5f',
-  '#d7af87',
-  '#d7afaf',
-  '#d7afd7',
-  '#d7afff',
-  '#d7d700',
-  '#d7d75f',
-  '#d7d787',
-  '#d7d7af',
-  '#d7d7d7',
-  '#d7d7ff',
-  '#d7ff00',
-  '#d7ff5f',
-  '#d7ff87',
-  '#d7ffaf',
-  '#d7ffd7',
-  '#d7ffff',
-  '#ff0000',
-  '#ff005f',
-  '#ff0087',
-  '#ff00af',
-  '#ff00d7',
-  '#ff00ff',
-  '#ff5f00',
-  '#ff5f5f',
-  '#ff5f87',
-  '#ff5faf',
-  '#ff5fd7',
-  '#ff5fff',
-  '#ff8700',
-  '#ff875f',
-  '#ff8787',
-  '#ff87af',
-  '#ff87d7',
-  '#ff87ff',
-  '#ffaf00',
-  '#ffaf5f',
-  '#ffaf87',
-  '#ffafaf',
-  '#ffafd7',
-  '#ffafff',
-  '#ffd700',
-  '#ffd75f',
-  '#ffd787',
-  '#ffd7af',
-  '#ffd7d7',
-  '#ffd7ff',
-  '#ffff00',
-  '#ffff5f',
-  '#ffff87',
-  '#ffffaf',
-  '#ffffd7',
-  '#ffffff',
-  '#080808',
-  '#121212',
-  '#1c1c1c',
-  '#262626',
-  '#303030',
-  '#3a3a3a',
-  '#444444',
-  '#4e4e4e',
-  '#585858',
-  '#626262',
-  '#6c6c6c',
-  '#767676',
-  '#808080',
-  '#8a8a8a',
-  '#949494',
-  '#9e9e9e',
-  '#a8a8a8',
-  '#b2b2b2',
-  '#bcbcbc',
-  '#c6c6c6',
-  '#d0d0d0',
-  '#dadada',
-  '#e4e4e4',
-  '#eeeeee',
+  "#000000",
+  "#800000",
+  "#008000",
+  "#808000",
+  "#000080",
+  "#800080",
+  "#008080",
+  "#c0c0c0",
+  "#808080",
+  "#ff0000",
+  "#00ff00",
+  "#ffff00",
+  "#0000ff",
+  "#ff00ff",
+  "#00ffff",
+  "#ffffff",
+  "#000000",
+  "#00005f",
+  "#000087",
+  "#0000af",
+  "#0000d7",
+  "#0000ff",
+  "#005f00",
+  "#005f5f",
+  "#005f87",
+  "#005faf",
+  "#005fd7",
+  "#005fff",
+  "#008700",
+  "#00875f",
+  "#008787",
+  "#0087af",
+  "#0087d7",
+  "#0087ff",
+  "#00af00",
+  "#00af5f",
+  "#00af87",
+  "#00afaf",
+  "#00afd7",
+  "#00afff",
+  "#00d700",
+  "#00d75f",
+  "#00d787",
+  "#00d7af",
+  "#00d7d7",
+  "#00d7ff",
+  "#00ff00",
+  "#00ff5f",
+  "#00ff87",
+  "#00ffaf",
+  "#00ffd7",
+  "#00ffff",
+  "#5f0000",
+  "#5f005f",
+  "#5f0087",
+  "#5f00af",
+  "#5f00d7",
+  "#5f00ff",
+  "#5f5f00",
+  "#5f5f5f",
+  "#5f5f87",
+  "#5f5faf",
+  "#5f5fd7",
+  "#5f5fff",
+  "#5f8700",
+  "#5f875f",
+  "#5f8787",
+  "#5f87af",
+  "#5f87d7",
+  "#5f87ff",
+  "#5faf00",
+  "#5faf5f",
+  "#5faf87",
+  "#5fafaf",
+  "#5fafd7",
+  "#5fafff",
+  "#5fd700",
+  "#5fd75f",
+  "#5fd787",
+  "#5fd7af",
+  "#5fd7d7",
+  "#5fd7ff",
+  "#5fff00",
+  "#5fff5f",
+  "#5fff87",
+  "#5fffaf",
+  "#5fffd7",
+  "#5fffff",
+  "#870000",
+  "#87005f",
+  "#870087",
+  "#8700af",
+  "#8700d7",
+  "#8700ff",
+  "#875f00",
+  "#875f5f",
+  "#875f87",
+  "#875faf",
+  "#875fd7",
+  "#875fff",
+  "#878700",
+  "#87875f",
+  "#878787",
+  "#8787af",
+  "#8787d7",
+  "#8787ff",
+  "#87af00",
+  "#87af5f",
+  "#87af87",
+  "#87afaf",
+  "#87afd7",
+  "#87afff",
+  "#87d700",
+  "#87d75f",
+  "#87d787",
+  "#87d7af",
+  "#87d7d7",
+  "#87d7ff",
+  "#87ff00",
+  "#87ff5f",
+  "#87ff87",
+  "#87ffaf",
+  "#87ffd7",
+  "#87ffff",
+  "#af0000",
+  "#af005f",
+  "#af0087",
+  "#af00af",
+  "#af00d7",
+  "#af00ff",
+  "#af5f00",
+  "#af5f5f",
+  "#af5f87",
+  "#af5faf",
+  "#af5fd7",
+  "#af5fff",
+  "#af8700",
+  "#af875f",
+  "#af8787",
+  "#af87af",
+  "#af87d7",
+  "#af87ff",
+  "#afaf00",
+  "#afaf5f",
+  "#afaf87",
+  "#afafaf",
+  "#afafd7",
+  "#afafff",
+  "#afd700",
+  "#afd75f",
+  "#afd787",
+  "#afd7af",
+  "#afd7d7",
+  "#afd7ff",
+  "#afff00",
+  "#afff5f",
+  "#afff87",
+  "#afffaf",
+  "#afffd7",
+  "#afffff",
+  "#d70000",
+  "#d7005f",
+  "#d70087",
+  "#d700af",
+  "#d700d7",
+  "#d700ff",
+  "#d75f00",
+  "#d75f5f",
+  "#d75f87",
+  "#d75faf",
+  "#d75fd7",
+  "#d75fff",
+  "#d78700",
+  "#d7875f",
+  "#d78787",
+  "#d787af",
+  "#d787d7",
+  "#d787ff",
+  "#d7af00",
+  "#d7af5f",
+  "#d7af87",
+  "#d7afaf",
+  "#d7afd7",
+  "#d7afff",
+  "#d7d700",
+  "#d7d75f",
+  "#d7d787",
+  "#d7d7af",
+  "#d7d7d7",
+  "#d7d7ff",
+  "#d7ff00",
+  "#d7ff5f",
+  "#d7ff87",
+  "#d7ffaf",
+  "#d7ffd7",
+  "#d7ffff",
+  "#ff0000",
+  "#ff005f",
+  "#ff0087",
+  "#ff00af",
+  "#ff00d7",
+  "#ff00ff",
+  "#ff5f00",
+  "#ff5f5f",
+  "#ff5f87",
+  "#ff5faf",
+  "#ff5fd7",
+  "#ff5fff",
+  "#ff8700",
+  "#ff875f",
+  "#ff8787",
+  "#ff87af",
+  "#ff87d7",
+  "#ff87ff",
+  "#ffaf00",
+  "#ffaf5f",
+  "#ffaf87",
+  "#ffafaf",
+  "#ffafd7",
+  "#ffafff",
+  "#ffd700",
+  "#ffd75f",
+  "#ffd787",
+  "#ffd7af",
+  "#ffd7d7",
+  "#ffd7ff",
+  "#ffff00",
+  "#ffff5f",
+  "#ffff87",
+  "#ffffaf",
+  "#ffffd7",
+  "#ffffff",
+  "#080808",
+  "#121212",
+  "#1c1c1c",
+  "#262626",
+  "#303030",
+  "#3a3a3a",
+  "#444444",
+  "#4e4e4e",
+  "#585858",
+  "#626262",
+  "#6c6c6c",
+  "#767676",
+  "#808080",
+  "#8a8a8a",
+  "#949494",
+  "#9e9e9e",
+  "#a8a8a8",
+  "#b2b2b2",
+  "#bcbcbc",
+  "#c6c6c6",
+  "#d0d0d0",
+  "#dadada",
+  "#e4e4e4",
+  "#eeeeee",
 ];
 
 export function convertColorToHex(
@@ -465,9 +458,9 @@ export function convertColorToHex(
     const r = (color >> 16) & 255;
     const g = (color >> 8) & 255;
     const b = color & 255;
-    return `#${r.toString(16).padStart(2, '0')}${g
+    return `#${r.toString(16).padStart(2, "0")}${g
       .toString(16)
-      .padStart(2, '0')}${b.toString(16).padStart(2, '0')}`;
+      .padStart(2, "0")}${b.toString(16).padStart(2, "0")}`;
   }
   if (colorMode === ColorMode.PALETTE) {
     return ANSI_COLORS[color] || defaultColor;
diff --git a/packages/gemini-core/src/utils/testUtils.ts b/packages/gemini-core/src/utils/testUtils.ts
index a0010b105..566fda202 100644
--- a/packages/gemini-core/src/utils/testUtils.ts
+++ b/packages/gemini-core/src/utils/testUtils.ts
@@ -56,7 +56,7 @@ export function disableSimulationAfterFallback(): void {
  * Create a simulated 429 error response
  */
 export function createSimulated429Error(): Error {
-  const error = new Error('Rate limit exceeded (simulated)') as Error & {
+  const error = new Error("Rate limit exceeded (simulated)") as Error & {
     status: number;
   };
   error.status = 429;
@@ -74,11 +74,7 @@ export function resetSimulationState(): void {
 /**
  * Enable/disable 429 simulation programmatically (for tests)
  */
-export function setSimulate429(
-  enabled: boolean,
-  afterRequests = 0,
-  forAuthType?: string,
-): void {
+export function setSimulate429(enabled: boolean, afterRequests = 0, forAuthType?: string): void {
   simulate429Enabled = enabled;
   simulate429AfterRequests = afterRequests;
   simulate429ForAuthType = forAuthType;
diff --git a/packages/gemini-core/src/utils/textUtils.test.ts b/packages/gemini-core/src/utils/textUtils.test.ts
index c1468c111..5f127aaa7 100644
--- a/packages/gemini-core/src/utils/textUtils.test.ts
+++ b/packages/gemini-core/src/utils/textUtils.test.ts
@@ -4,34 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { safeLiteralReplace } from './textUtils.js';
+import { describe, expect, it } from "vitest";
+import { safeLiteralReplace } from "./textUtils.js";
 
-describe('safeLiteralReplace', () => {
-  it('returns original string when oldString empty or not found', () => {
-    expect(safeLiteralReplace('abc', '', 'X')).toBe('abc');
-    expect(safeLiteralReplace('abc', 'z', 'X')).toBe('abc');
+describe("safeLiteralReplace", () => {
+  it("returns original string when oldString empty or not found", () => {
+    expect(safeLiteralReplace("abc", "", "X")).toBe("abc");
+    expect(safeLiteralReplace("abc", "z", "X")).toBe("abc");
   });
 
-  it('fast path when newString has no $', () => {
-    expect(safeLiteralReplace('abc', 'b', 'X')).toBe('aXc');
+  it("fast path when newString has no $", () => {
+    expect(safeLiteralReplace("abc", "b", "X")).toBe("aXc");
   });
 
-  it('treats $ literally', () => {
-    expect(safeLiteralReplace('foo', 'foo', "bar$'baz")).toBe("bar$'baz");
+  it("treats $ literally", () => {
+    expect(safeLiteralReplace("foo", "foo", "bar$'baz")).toBe("bar$'baz");
   });
 
   it("does not interpret replacement patterns like $&, $', $` and $1", () => {
-    expect(safeLiteralReplace('hello', 'hello', '$&-replacement')).toBe(
-      '$&-replacement',
-    );
-    expect(safeLiteralReplace('mid', 'mid', 'new$`content')).toBe(
-      'new$`content',
-    );
-    expect(safeLiteralReplace('test', 'test', '$1$2value')).toBe('$1$2value');
+    expect(safeLiteralReplace("hello", "hello", "$&-replacement")).toBe("$&-replacement");
+    expect(safeLiteralReplace("mid", "mid", "new$`content")).toBe("new$`content");
+    expect(safeLiteralReplace("test", "test", "$1$2value")).toBe("$1$2value");
   });
 
-  it('preserves end-of-line $ in regex-like text', () => {
+  it("preserves end-of-line $ in regex-like text", () => {
     const current = "| select('match', '^[sv]d[a-z]$')";
     const oldStr = "'^[sv]d[a-z]$'";
     const newStr = "'^[sv]d[a-z]$' # updated";
@@ -39,41 +35,37 @@ describe('safeLiteralReplace', () => {
     expect(safeLiteralReplace(current, oldStr, newStr)).toBe(expected);
   });
 
-  it('handles multiple $ characters', () => {
-    expect(safeLiteralReplace('x', 'x', '$$$')).toBe('$$$');
+  it("handles multiple $ characters", () => {
+    expect(safeLiteralReplace("x", "x", "$$$")).toBe("$$$");
   });
 
-  it('preserves pre-escaped $$ literally', () => {
-    expect(safeLiteralReplace('x', 'x', '$$value')).toBe('$$value');
+  it("preserves pre-escaped $$ literally", () => {
+    expect(safeLiteralReplace("x", "x", "$$value")).toBe("$$value");
   });
 
-  it('handles complex malicious patterns from PR #7871', () => {
-    const original = 'The price is PRICE.';
-    const result = safeLiteralReplace(
-      original,
-      'PRICE',
-      "$& Wow, that's a lot! $'",
-    );
+  it("handles complex malicious patterns from PR #7871", () => {
+    const original = "The price is PRICE.";
+    const result = safeLiteralReplace(original, "PRICE", "$& Wow, that's a lot! $'");
     expect(result).toBe("The price is $& Wow, that's a lot! $'.");
   });
 
-  it('handles multiple replacements correctly', () => {
-    const text = 'Replace FOO and FOO again';
-    const result = safeLiteralReplace(text, 'FOO', '$100');
-    expect(result).toBe('Replace $100 and $100 again');
+  it("handles multiple replacements correctly", () => {
+    const text = "Replace FOO and FOO again";
+    const result = safeLiteralReplace(text, "FOO", "$100");
+    expect(result).toBe("Replace $100 and $100 again");
   });
 
-  it('preserves $ at different positions', () => {
-    expect(safeLiteralReplace('test', 'test', '$')).toBe('$');
-    expect(safeLiteralReplace('test', 'test', 'prefix$')).toBe('prefix$');
-    expect(safeLiteralReplace('test', 'test', '$suffix')).toBe('$suffix');
+  it("preserves $ at different positions", () => {
+    expect(safeLiteralReplace("test", "test", "$")).toBe("$");
+    expect(safeLiteralReplace("test", "test", "prefix$")).toBe("prefix$");
+    expect(safeLiteralReplace("test", "test", "$suffix")).toBe("$suffix");
   });
 
-  it('handles edge case with $$$$', () => {
-    expect(safeLiteralReplace('x', 'x', '$$$$')).toBe('$$$$');
+  it("handles edge case with $$$$", () => {
+    expect(safeLiteralReplace("x", "x", "$$$$")).toBe("$$$$");
   });
 
-  it('handles newString with only dollar signs', () => {
-    expect(safeLiteralReplace('abc', 'b', '$$')).toBe('a$$c');
+  it("handles newString with only dollar signs", () => {
+    expect(safeLiteralReplace("abc", "b", "$$")).toBe("a$$c");
   });
 });
diff --git a/packages/gemini-core/src/utils/textUtils.ts b/packages/gemini-core/src/utils/textUtils.ts
index 693ab48fe..b7c54e87d 100644
--- a/packages/gemini-core/src/utils/textUtils.ts
+++ b/packages/gemini-core/src/utils/textUtils.ts
@@ -8,20 +8,16 @@
  * Safely replaces text with literal strings, avoiding ECMAScript GetSubstitution issues.
  * Escapes $ characters to prevent template interpretation.
  */
-export function safeLiteralReplace(
-  str: string,
-  oldString: string,
-  newString: string,
-): string {
-  if (oldString === '' || !str.includes(oldString)) {
+export function safeLiteralReplace(str: string, oldString: string, newString: string): string {
+  if (oldString === "" || !str.includes(oldString)) {
     return str;
   }
 
-  if (!newString.includes('$')) {
+  if (!newString.includes("$")) {
     return str.replaceAll(oldString, newString);
   }
 
-  const escapedNewString = newString.replaceAll('$', '$$$$');
+  const escapedNewString = newString.replaceAll("$", "$$$$");
   return str.replaceAll(oldString, escapedNewString);
 }
 
@@ -32,10 +28,7 @@ export function safeLiteralReplace(
  * @param sampleSize The number of bytes from the start of the buffer to test.
  * @returns True if a NULL byte is found, false otherwise.
  */
-export function isBinary(
-  data: Buffer | null | undefined,
-  sampleSize = 512,
-): boolean {
+export function isBinary(data: Buffer | null | undefined, sampleSize = 512): boolean {
   if (!data) {
     return false;
   }
diff --git a/packages/gemini-core/src/utils/thoughtUtils.test.ts b/packages/gemini-core/src/utils/thoughtUtils.test.ts
index 88d11c6c0..cb82d5e96 100644
--- a/packages/gemini-core/src/utils/thoughtUtils.test.ts
+++ b/packages/gemini-core/src/utils/thoughtUtils.test.ts
@@ -4,77 +4,76 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseThought } from './thoughtUtils.js';
+import { describe, expect, it } from "vitest";
+import { parseThought } from "./thoughtUtils.js";
 
-describe('parseThought', () => {
+describe("parseThought", () => {
   it.each([
     {
-      name: 'a standard thought with subject and description',
-      rawText: '**Subject:** This is the description.',
+      name: "a standard thought with subject and description",
+      rawText: "**Subject:** This is the description.",
       expected: {
-        subject: 'Subject:',
-        description: 'This is the description.',
+        subject: "Subject:",
+        description: "This is the description.",
       },
     },
     {
-      name: 'leading and trailing whitespace in the raw string',
-      rawText: '  **Subject** description with spaces   ',
-      expected: { subject: 'Subject', description: 'description with spaces' },
+      name: "leading and trailing whitespace in the raw string",
+      rawText: "  **Subject** description with spaces   ",
+      expected: { subject: "Subject", description: "description with spaces" },
     },
     {
-      name: 'whitespace surrounding the subject content',
-      rawText: '** Subject  **',
-      expected: { subject: 'Subject', description: '' },
+      name: "whitespace surrounding the subject content",
+      rawText: "** Subject  **",
+      expected: { subject: "Subject", description: "" },
     },
     {
-      name: 'a thought with only a subject',
-      rawText: '**Only Subject**',
-      expected: { subject: 'Only Subject', description: '' },
+      name: "a thought with only a subject",
+      rawText: "**Only Subject**",
+      expected: { subject: "Only Subject", description: "" },
     },
     {
-      name: 'a thought with only a description (no subject)',
-      rawText: 'This is just a description.',
-      expected: { subject: '', description: 'This is just a description.' },
+      name: "a thought with only a description (no subject)",
+      rawText: "This is just a description.",
+      expected: { subject: "", description: "This is just a description." },
     },
     {
-      name: 'an empty string input',
-      rawText: '',
-      expected: { subject: '', description: '' },
+      name: "an empty string input",
+      rawText: "",
+      expected: { subject: "", description: "" },
     },
     {
-      name: 'newlines within the subject and description',
-      rawText:
-        '**Multi-line\nSubject**\nHere is a description\nspread across lines.',
+      name: "newlines within the subject and description",
+      rawText: "**Multi-line\nSubject**\nHere is a description\nspread across lines.",
       expected: {
-        subject: 'Multi-line\nSubject',
-        description: 'Here is a description\nspread across lines.',
+        subject: "Multi-line\nSubject",
+        description: "Here is a description\nspread across lines.",
       },
     },
     {
-      name: 'only the first subject if multiple are present',
-      rawText: '**First** some text **Second**',
-      expected: { subject: 'First', description: 'some text **Second**' },
+      name: "only the first subject if multiple are present",
+      rawText: "**First** some text **Second**",
+      expected: { subject: "First", description: "some text **Second**" },
     },
     {
-      name: 'text before and after the subject',
-      rawText: 'Prefix text **Subject** Suffix text.',
+      name: "text before and after the subject",
+      rawText: "Prefix text **Subject** Suffix text.",
       expected: {
-        subject: 'Subject',
-        description: 'Prefix text  Suffix text.',
+        subject: "Subject",
+        description: "Prefix text  Suffix text.",
       },
     },
     {
-      name: 'an unclosed subject tag',
-      rawText: 'Text with **an unclosed subject',
-      expected: { subject: '', description: 'Text with **an unclosed subject' },
+      name: "an unclosed subject tag",
+      rawText: "Text with **an unclosed subject",
+      expected: { subject: "", description: "Text with **an unclosed subject" },
     },
     {
-      name: 'an empty subject tag',
-      rawText: 'A thought with **** in the middle.',
-      expected: { subject: '', description: 'A thought with  in the middle.' },
+      name: "an empty subject tag",
+      rawText: "A thought with **** in the middle.",
+      expected: { subject: "", description: "A thought with  in the middle." },
     },
-  ])('should correctly parse $name', ({ rawText, expected }) => {
+  ])("should correctly parse $name", ({ rawText, expected }) => {
     expect(parseThought(rawText)).toEqual(expected);
   });
 });
diff --git a/packages/gemini-core/src/utils/thoughtUtils.ts b/packages/gemini-core/src/utils/thoughtUtils.ts
index c97a39a32..dd6f31e5e 100644
--- a/packages/gemini-core/src/utils/thoughtUtils.ts
+++ b/packages/gemini-core/src/utils/thoughtUtils.ts
@@ -9,8 +9,8 @@ export type ThoughtSummary = {
   description: string;
 };
 
-const START_DELIMITER = '**';
-const END_DELIMITER = '**';
+const START_DELIMITER = "**";
+const END_DELIMITER = "**";
 
 /**
  * Parses a raw thought string into a structured ThoughtSummary object.
@@ -27,27 +27,21 @@ export function parseThought(rawText: string): ThoughtSummary {
   const startIndex = rawText.indexOf(START_DELIMITER);
   if (startIndex === -1) {
     // No start delimiter found, the whole text is the description.
-    return { subject: '', description: rawText.trim() };
+    return { subject: "", description: rawText.trim() };
   }
 
-  const endIndex = rawText.indexOf(
-    END_DELIMITER,
-    startIndex + START_DELIMITER.length,
-  );
+  const endIndex = rawText.indexOf(END_DELIMITER, startIndex + START_DELIMITER.length);
   if (endIndex === -1) {
     // Start delimiter found but no end delimiter, so it's not a valid subject.
     // Treat the entire string as the description.
-    return { subject: '', description: rawText.trim() };
+    return { subject: "", description: rawText.trim() };
   }
 
-  const subject = rawText
-    .substring(startIndex + START_DELIMITER.length, endIndex)
-    .trim();
+  const subject = rawText.substring(startIndex + START_DELIMITER.length, endIndex).trim();
 
   // The description is everything before the start delimiter and after the end delimiter.
   const description = (
-    rawText.substring(0, startIndex) +
-    rawText.substring(endIndex + END_DELIMITER.length)
+    rawText.substring(0, startIndex) + rawText.substring(endIndex + END_DELIMITER.length)
   ).trim();
 
   return { subject, description };
diff --git a/packages/gemini-core/src/utils/tool-utils.test.ts b/packages/gemini-core/src/utils/tool-utils.test.ts
index 672bc7230..d52d88811 100644
--- a/packages/gemini-core/src/utils/tool-utils.test.ts
+++ b/packages/gemini-core/src/utils/tool-utils.test.ts
@@ -4,99 +4,75 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { expect, describe, it } from 'vitest';
-import { doesToolInvocationMatch } from './tool-utils.js';
-import type { AnyToolInvocation, Config } from '../index.js';
-import { ReadFileTool } from '../tools/read-file.js';
+import { describe, expect, it } from "vitest";
+import type { AnyToolInvocation, Config } from "../index.js";
+import { ReadFileTool } from "../tools/read-file.js";
+import { doesToolInvocationMatch } from "./tool-utils.js";
 
-describe('doesToolInvocationMatch', () => {
-  it('should not match a partial command prefix', () => {
+describe("doesToolInvocationMatch", () => {
+  it("should not match a partial command prefix", () => {
     const invocation = {
-      params: { command: 'git commitsomething' },
+      params: { command: "git commitsomething" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(git commit)'];
-    const result = doesToolInvocationMatch(
-      'run_shell_command',
-      invocation,
-      patterns,
-    );
+    const patterns = ["ShellTool(git commit)"];
+    const result = doesToolInvocationMatch("run_shell_command", invocation, patterns);
     expect(result).toBe(false);
   });
 
-  it('should match an exact command', () => {
+  it("should match an exact command", () => {
     const invocation = {
-      params: { command: 'git status' },
+      params: { command: "git status" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(git status)'];
-    const result = doesToolInvocationMatch(
-      'run_shell_command',
-      invocation,
-      patterns,
-    );
+    const patterns = ["ShellTool(git status)"];
+    const result = doesToolInvocationMatch("run_shell_command", invocation, patterns);
     expect(result).toBe(true);
   });
 
-  it('should match a command with an alias', () => {
+  it("should match a command with an alias", () => {
     const invocation = {
-      params: { command: 'wc -l' },
+      params: { command: "wc -l" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(wc)'];
-    const result = doesToolInvocationMatch('ShellTool', invocation, patterns);
+    const patterns = ["ShellTool(wc)"];
+    const result = doesToolInvocationMatch("ShellTool", invocation, patterns);
     expect(result).toBe(true);
   });
 
-  it('should match a command that is a prefix', () => {
+  it("should match a command that is a prefix", () => {
     const invocation = {
-      params: { command: 'git status -v' },
+      params: { command: "git status -v" },
     } as AnyToolInvocation;
-    const patterns = ['ShellTool(git status)'];
-    const result = doesToolInvocationMatch(
-      'run_shell_command',
-      invocation,
-      patterns,
-    );
+    const patterns = ["ShellTool(git status)"];
+    const result = doesToolInvocationMatch("run_shell_command", invocation, patterns);
     expect(result).toBe(true);
   });
 
-  describe('for non-shell tools', () => {
+  describe("for non-shell tools", () => {
     const readFileTool = new ReadFileTool({} as Config);
     const invocation = {
-      params: { file: 'test.txt' },
+      params: { file: "test.txt" },
     } as AnyToolInvocation;
 
-    it('should match by tool name', () => {
-      const patterns = ['read_file'];
-      const result = doesToolInvocationMatch(
-        readFileTool,
-        invocation,
-        patterns,
-      );
+    it("should match by tool name", () => {
+      const patterns = ["read_file"];
+      const result = doesToolInvocationMatch(readFileTool, invocation, patterns);
       expect(result).toBe(true);
     });
 
-    it('should match by tool class name', () => {
-      const patterns = ['ReadFileTool'];
-      const result = doesToolInvocationMatch(
-        readFileTool,
-        invocation,
-        patterns,
-      );
+    it("should match by tool class name", () => {
+      const patterns = ["ReadFileTool"];
+      const result = doesToolInvocationMatch(readFileTool, invocation, patterns);
       expect(result).toBe(true);
     });
 
-    it('should not match if neither name is in the patterns', () => {
-      const patterns = ['some_other_tool', 'AnotherToolClass'];
-      const result = doesToolInvocationMatch(
-        readFileTool,
-        invocation,
-        patterns,
-      );
+    it("should not match if neither name is in the patterns", () => {
+      const patterns = ["some_other_tool", "AnotherToolClass"];
+      const result = doesToolInvocationMatch(readFileTool, invocation, patterns);
       expect(result).toBe(false);
     });
 
-    it('should match by tool name when passed as a string', () => {
-      const patterns = ['read_file'];
-      const result = doesToolInvocationMatch('read_file', invocation, patterns);
+    it("should match by tool name when passed as a string", () => {
+      const patterns = ["read_file"];
+      const result = doesToolInvocationMatch("read_file", invocation, patterns);
       expect(result).toBe(true);
     });
   });
diff --git a/packages/gemini-core/src/utils/tool-utils.ts b/packages/gemini-core/src/utils/tool-utils.ts
index ebf73f90b..81b2291ac 100644
--- a/packages/gemini-core/src/utils/tool-utils.ts
+++ b/packages/gemini-core/src/utils/tool-utils.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AnyDeclarativeTool, AnyToolInvocation } from '../index.js';
-import { isTool } from '../index.js';
-import { SHELL_TOOL_NAMES } from './shell-utils.js';
+import type { AnyDeclarativeTool, AnyToolInvocation } from "../index.js";
+import { isTool } from "../index.js";
+import { SHELL_TOOL_NAMES } from "./shell-utils.js";
 
 /**
  * Checks if a tool invocation matches any of a list of patterns.
@@ -37,7 +37,7 @@ export function doesToolInvocationMatch(
   }
 
   for (const pattern of patterns) {
-    const openParen = pattern.indexOf('(');
+    const openParen = pattern.indexOf("(");
 
     if (openParen === -1) {
       // No arguments, just a tool name
@@ -52,17 +52,17 @@ export function doesToolInvocationMatch(
       continue;
     }
 
-    if (!pattern.endsWith(')')) {
+    if (!pattern.endsWith(")")) {
       continue;
     }
 
     const argPattern = pattern.substring(openParen + 1, pattern.length - 1);
 
     let command: string;
-    if (typeof invocation === 'string') {
+    if (typeof invocation === "string") {
       command = invocation;
     } else {
-      if (!('command' in invocation.params)) {
+      if (!("command" in invocation.params)) {
         // This invocation has no command - nothing to check.
         continue;
       }
@@ -70,7 +70,7 @@ export function doesToolInvocationMatch(
     }
 
     if (toolNames.some((name) => SHELL_TOOL_NAMES.includes(name))) {
-      if (command === argPattern || command.startsWith(argPattern + ' ')) {
+      if (command === argPattern || command.startsWith(argPattern + " ")) {
         return true;
       }
     }
diff --git a/packages/gemini-core/src/utils/userAccountManager.test.ts b/packages/gemini-core/src/utils/userAccountManager.test.ts
index d2657cf20..0cbcb496a 100644
--- a/packages/gemini-core/src/utils/userAccountManager.test.ts
+++ b/packages/gemini-core/src/utils/userAccountManager.test.ts
@@ -4,34 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { UserAccountManager } from './userAccountManager.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import path from 'node:path';
-import { GEMINI_DIR } from './paths.js';
-
-vi.mock('os', async (importOriginal) => {
-  const os = await importOriginal<typeof import('os')>();
+import * as fs from "node:fs";
+import * as os from "node:os";
+import path from "node:path";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GEMINI_DIR } from "./paths.js";
+import { UserAccountManager } from "./userAccountManager.js";
+
+vi.mock("os", async (importOriginal) => {
+  const os = await importOriginal<typeof import("os")>();
   return {
     ...os,
     homedir: vi.fn(),
   };
 });
 
-describe('UserAccountManager', () => {
+describe("UserAccountManager", () => {
   let tempHomeDir: string;
   let userAccountManager: UserAccountManager;
   let accountsFile: () => string;
 
   beforeEach(() => {
-    tempHomeDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-    );
+    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
     (os.homedir as Mock).mockReturnValue(tempHomeDir);
-    accountsFile = () =>
-      path.join(tempHomeDir, GEMINI_DIR, 'google_accounts.json');
+    accountsFile = () => path.join(tempHomeDir, GEMINI_DIR, "google_accounts.json");
     userAccountManager = new UserAccountManager();
   });
 
@@ -40,35 +37,31 @@ describe('UserAccountManager', () => {
     vi.clearAllMocks();
   });
 
-  describe('cacheGoogleAccount', () => {
-    it('should create directory and write initial account file', async () => {
-      await userAccountManager.cacheGoogleAccount('test1@google.com');
+  describe("cacheGoogleAccount", () => {
+    it("should create directory and write initial account file", async () => {
+      await userAccountManager.cacheGoogleAccount("test1@google.com");
 
       // Verify Google Account ID was cached
       expect(fs.existsSync(accountsFile())).toBe(true);
-      expect(fs.readFileSync(accountsFile(), 'utf-8')).toBe(
-        JSON.stringify({ active: 'test1@google.com', old: [] }, null, 2),
+      expect(fs.readFileSync(accountsFile(), "utf-8")).toBe(
+        JSON.stringify({ active: "test1@google.com", old: [] }, null, 2),
       );
     });
 
-    it('should update active account and move previous to old', async () => {
+    it("should update active account and move previous to old", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify(
-          { active: 'test2@google.com', old: ['test1@google.com'] },
-          null,
-          2,
-        ),
+        JSON.stringify({ active: "test2@google.com", old: ["test1@google.com"] }, null, 2),
       );
 
-      await userAccountManager.cacheGoogleAccount('test3@google.com');
+      await userAccountManager.cacheGoogleAccount("test3@google.com");
 
-      expect(fs.readFileSync(accountsFile(), 'utf-8')).toBe(
+      expect(fs.readFileSync(accountsFile(), "utf-8")).toBe(
         JSON.stringify(
           {
-            active: 'test3@google.com',
-            old: ['test1@google.com', 'test2@google.com'],
+            active: "test3@google.com",
+            old: ["test1@google.com", "test2@google.com"],
           },
           null,
           2,
@@ -76,93 +69,79 @@ describe('UserAccountManager', () => {
       );
     });
 
-    it('should not add a duplicate to the old list', async () => {
+    it("should not add a duplicate to the old list", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify(
-          { active: 'test1@google.com', old: ['test2@google.com'] },
-          null,
-          2,
-        ),
+        JSON.stringify({ active: "test1@google.com", old: ["test2@google.com"] }, null, 2),
       );
-      await userAccountManager.cacheGoogleAccount('test2@google.com');
-      await userAccountManager.cacheGoogleAccount('test1@google.com');
+      await userAccountManager.cacheGoogleAccount("test2@google.com");
+      await userAccountManager.cacheGoogleAccount("test1@google.com");
 
-      expect(fs.readFileSync(accountsFile(), 'utf-8')).toBe(
-        JSON.stringify(
-          { active: 'test1@google.com', old: ['test2@google.com'] },
-          null,
-          2,
-        ),
+      expect(fs.readFileSync(accountsFile(), "utf-8")).toBe(
+        JSON.stringify({ active: "test1@google.com", old: ["test2@google.com"] }, null, 2),
       );
     });
 
-    it('should handle corrupted JSON by starting fresh', async () => {
+    it("should handle corrupted JSON by starting fresh", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), 'not valid json');
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), "not valid json");
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
-      await userAccountManager.cacheGoogleAccount('test1@google.com');
+      await userAccountManager.cacheGoogleAccount("test1@google.com");
 
       expect(consoleLogSpy).toHaveBeenCalled();
-      expect(JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'))).toEqual({
-        active: 'test1@google.com',
+      expect(JSON.parse(fs.readFileSync(accountsFile(), "utf-8"))).toEqual({
+        active: "test1@google.com",
         old: [],
       });
     });
 
-    it('should handle valid JSON with incorrect schema by starting fresh', async () => {
+    it("should handle valid JSON with incorrect schema by starting fresh", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify({ active: 'test1@google.com', old: 'not-an-array' }),
+        JSON.stringify({ active: "test1@google.com", old: "not-an-array" }),
       );
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
-      await userAccountManager.cacheGoogleAccount('test2@google.com');
+      await userAccountManager.cacheGoogleAccount("test2@google.com");
 
       expect(consoleLogSpy).toHaveBeenCalled();
-      expect(JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'))).toEqual({
-        active: 'test2@google.com',
+      expect(JSON.parse(fs.readFileSync(accountsFile(), "utf-8"))).toEqual({
+        active: "test2@google.com",
         old: [],
       });
     });
   });
 
-  describe('getCachedGoogleAccount', () => {
-    it('should return the active account if file exists and is valid', () => {
+  describe("getCachedGoogleAccount", () => {
+    it("should return the active account if file exists and is valid", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify({ active: 'active@google.com', old: [] }, null, 2),
+        JSON.stringify({ active: "active@google.com", old: [] }, null, 2),
       );
       const account = userAccountManager.getCachedGoogleAccount();
-      expect(account).toBe('active@google.com');
+      expect(account).toBe("active@google.com");
     });
 
-    it('should return null if file does not exist', () => {
+    it("should return null if file does not exist", () => {
       const account = userAccountManager.getCachedGoogleAccount();
       expect(account).toBeNull();
     });
 
-    it('should return null if file is empty', () => {
+    it("should return null if file is empty", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), '');
+      fs.writeFileSync(accountsFile(), "");
       const account = userAccountManager.getCachedGoogleAccount();
       expect(account).toBeNull();
     });
 
-    it('should return null and log if file is corrupted', () => {
+    it("should return null and log if file is corrupted", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(accountsFile(), '{ "active": "test@google.com"'); // Invalid JSON
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       const account = userAccountManager.getCachedGoogleAccount();
 
@@ -170,7 +149,7 @@ describe('UserAccountManager', () => {
       expect(consoleLogSpy).toHaveBeenCalled();
     });
 
-    it('should return null if active key is missing', () => {
+    it("should return null if active key is missing", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(accountsFile(), JSON.stringify({ old: [] }));
       const account = userAccountManager.getCachedGoogleAccount();
@@ -178,71 +157,65 @@ describe('UserAccountManager', () => {
     });
   });
 
-  describe('clearCachedGoogleAccount', () => {
-    it('should set active to null and move it to old', async () => {
+  describe("clearCachedGoogleAccount", () => {
+    it("should set active to null and move it to old", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify(
-          { active: 'active@google.com', old: ['old1@google.com'] },
-          null,
-          2,
-        ),
+        JSON.stringify({ active: "active@google.com", old: ["old1@google.com"] }, null, 2),
       );
 
       await userAccountManager.clearCachedGoogleAccount();
 
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
-      expect(stored.old).toEqual(['old1@google.com', 'active@google.com']);
+      expect(stored.old).toEqual(["old1@google.com", "active@google.com"]);
     });
 
-    it('should handle empty file gracefully', async () => {
+    it("should handle empty file gracefully", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), '');
+      fs.writeFileSync(accountsFile(), "");
       await userAccountManager.clearCachedGoogleAccount();
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
       expect(stored.old).toEqual([]);
     });
 
-    it('should handle corrupted JSON by creating a fresh file', async () => {
+    it("should handle corrupted JSON by creating a fresh file", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), 'not valid json');
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), "not valid json");
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       await userAccountManager.clearCachedGoogleAccount();
 
       expect(consoleLogSpy).toHaveBeenCalled();
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
       expect(stored.old).toEqual([]);
     });
 
-    it('should be idempotent if active account is already null', async () => {
+    it("should be idempotent if active account is already null", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
-        JSON.stringify({ active: null, old: ['old1@google.com'] }, null, 2),
+        JSON.stringify({ active: null, old: ["old1@google.com"] }, null, 2),
       );
 
       await userAccountManager.clearCachedGoogleAccount();
 
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
-      expect(stored.old).toEqual(['old1@google.com']);
+      expect(stored.old).toEqual(["old1@google.com"]);
     });
 
-    it('should not add a duplicate to the old list', async () => {
+    it("should not add a duplicate to the old list", async () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify(
           {
-            active: 'active@google.com',
-            old: ['active@google.com'],
+            active: "active@google.com",
+            old: ["active@google.com"],
           },
           null,
           2,
@@ -251,88 +224,78 @@ describe('UserAccountManager', () => {
 
       await userAccountManager.clearCachedGoogleAccount();
 
-      const stored = JSON.parse(fs.readFileSync(accountsFile(), 'utf-8'));
+      const stored = JSON.parse(fs.readFileSync(accountsFile(), "utf-8"));
       expect(stored.active).toBeNull();
-      expect(stored.old).toEqual(['active@google.com']);
+      expect(stored.old).toEqual(["active@google.com"]);
     });
   });
 
-  describe('getLifetimeGoogleAccounts', () => {
-    it('should return 0 if the file does not exist', () => {
+  describe("getLifetimeGoogleAccounts", () => {
+    it("should return 0 if the file does not exist", () => {
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
     });
 
-    it('should return 0 if the file is empty', () => {
+    it("should return 0 if the file is empty", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), '');
+      fs.writeFileSync(accountsFile(), "");
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
     });
 
-    it('should return 0 if the file is corrupted', () => {
+    it("should return 0 if the file is corrupted", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(accountsFile(), 'invalid json');
-      const consoleDebugSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), "invalid json");
+      const consoleDebugSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
       expect(consoleDebugSpy).toHaveBeenCalled();
     });
 
-    it('should return 1 if there is only an active account', () => {
+    it("should return 1 if there is only an active account", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(
-        accountsFile(),
-        JSON.stringify({ active: 'test1@google.com', old: [] }),
-      );
+      fs.writeFileSync(accountsFile(), JSON.stringify({ active: "test1@google.com", old: [] }));
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(1);
     });
 
-    it('should correctly count old accounts when active is null', () => {
+    it("should correctly count old accounts when active is null", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify({
           active: null,
-          old: ['test1@google.com', 'test2@google.com'],
+          old: ["test1@google.com", "test2@google.com"],
         }),
       );
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(2);
     });
 
-    it('should correctly count both active and old accounts', () => {
+    it("should correctly count both active and old accounts", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify({
-          active: 'test3@google.com',
-          old: ['test1@google.com', 'test2@google.com'],
+          active: "test3@google.com",
+          old: ["test1@google.com", "test2@google.com"],
         }),
       );
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(3);
     });
 
-    it('should handle valid JSON with incorrect schema by returning 0', () => {
+    it("should handle valid JSON with incorrect schema by returning 0", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
-      fs.writeFileSync(
-        accountsFile(),
-        JSON.stringify({ active: null, old: 1 }),
-      );
-      const consoleLogSpy = vi
-        .spyOn(console, 'log')
-        .mockImplementation(() => {});
+      fs.writeFileSync(accountsFile(), JSON.stringify({ active: null, old: 1 }));
+      const consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
 
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(0);
       expect(consoleLogSpy).toHaveBeenCalled();
     });
 
-    it('should not double count if active account is also in old list', () => {
+    it("should not double count if active account is also in old list", () => {
       fs.mkdirSync(path.dirname(accountsFile()), { recursive: true });
       fs.writeFileSync(
         accountsFile(),
         JSON.stringify({
-          active: 'test1@google.com',
-          old: ['test1@google.com', 'test2@google.com'],
+          active: "test1@google.com",
+          old: ["test1@google.com", "test2@google.com"],
         }),
       );
       expect(userAccountManager.getLifetimeGoogleAccounts()).toBe(2);
diff --git a/packages/gemini-core/src/utils/userAccountManager.ts b/packages/gemini-core/src/utils/userAccountManager.ts
index 83d27d947..9b9d87fe5 100644
--- a/packages/gemini-core/src/utils/userAccountManager.ts
+++ b/packages/gemini-core/src/utils/userAccountManager.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import { promises as fsp, readFileSync } from 'node:fs';
-import { Storage } from '../config/storage.js';
-import { debugLogger } from './debugLogger.js';
+import { promises as fsp, readFileSync } from "node:fs";
+import path from "node:path";
+import { Storage } from "../config/storage.js";
+import { debugLogger } from "./debugLogger.js";
 
 interface UserAccounts {
   active: string | null;
@@ -33,18 +33,17 @@ export class UserAccountManager {
     const parsed = JSON.parse(content);
 
     // Inlined validation logic
-    if (typeof parsed !== 'object' || parsed === null) {
-      debugLogger.log('Invalid accounts file schema, starting fresh.');
+    if (typeof parsed !== "object" || parsed === null) {
+      debugLogger.log("Invalid accounts file schema, starting fresh.");
       return defaultState;
     }
     const { active, old } = parsed as Partial<UserAccounts>;
     const isValid =
-      (active === undefined || active === null || typeof active === 'string') &&
-      (old === undefined ||
-        (Array.isArray(old) && old.every((i) => typeof i === 'string')));
+      (active === undefined || active === null || typeof active === "string") &&
+      (old === undefined || (Array.isArray(old) && old.every((i) => typeof i === "string")));
 
     if (!isValid) {
-      debugLogger.log('Invalid accounts file schema, starting fresh.');
+      debugLogger.log("Invalid accounts file schema, starting fresh.");
       return defaultState;
     }
 
@@ -57,20 +56,13 @@ export class UserAccountManager {
   private readAccountsSync(filePath: string): UserAccounts {
     const defaultState = { active: null, old: [] };
     try {
-      const content = readFileSync(filePath, 'utf-8');
+      const content = readFileSync(filePath, "utf-8");
       return this.parseAndValidateAccounts(content);
     } catch (error) {
-      if (
-        error instanceof Error &&
-        'code' in error &&
-        error.code === 'ENOENT'
-      ) {
+      if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return defaultState;
       }
-      debugLogger.log(
-        'Error during sync read of accounts, starting fresh.',
-        error,
-      );
+      debugLogger.log("Error during sync read of accounts, starting fresh.", error);
       return defaultState;
     }
   }
@@ -78,17 +70,13 @@ export class UserAccountManager {
   private async readAccounts(filePath: string): Promise<UserAccounts> {
     const defaultState = { active: null, old: [] };
     try {
-      const content = await fsp.readFile(filePath, 'utf-8');
+      const content = await fsp.readFile(filePath, "utf-8");
       return this.parseAndValidateAccounts(content);
     } catch (error) {
-      if (
-        error instanceof Error &&
-        'code' in error &&
-        error.code === 'ENOENT'
-      ) {
+      if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return defaultState;
       }
-      debugLogger.log('Could not parse accounts file, starting fresh.', error);
+      debugLogger.log("Could not parse accounts file, starting fresh.", error);
       return defaultState;
     }
   }
@@ -109,7 +97,7 @@ export class UserAccountManager {
     accounts.old = accounts.old.filter((oldEmail) => oldEmail !== email);
 
     accounts.active = email;
-    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), 'utf-8');
+    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), "utf-8");
   }
 
   getCachedGoogleAccount(): string | null {
@@ -139,6 +127,6 @@ export class UserAccountManager {
       accounts.active = null;
     }
 
-    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), 'utf-8');
+    await fsp.writeFile(filePath, JSON.stringify(accounts, null, 2), "utf-8");
   }
 }
diff --git a/packages/gemini-core/src/utils/workspaceContext.test.ts b/packages/gemini-core/src/utils/workspaceContext.test.ts
index 99c64eddc..ae655d873 100644
--- a/packages/gemini-core/src/utils/workspaceContext.test.ts
+++ b/packages/gemini-core/src/utils/workspaceContext.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { WorkspaceContext } from './workspaceContext.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { WorkspaceContext } from "./workspaceContext.js";
 
-describe('WorkspaceContext with real filesystem', () => {
+describe("WorkspaceContext with real filesystem", () => {
   let tempDir: string;
   let cwd: string;
   let otherDir: string;
@@ -18,12 +18,10 @@ describe('WorkspaceContext with real filesystem', () => {
   beforeEach(() => {
     // os.tmpdir() can return a path using a symlink (this is standard on macOS)
     // Use fs.realpathSync to fully resolve the absolute path.
-    tempDir = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'workspace-context-test-')),
-    );
+    tempDir = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "workspace-context-test-")));
 
-    cwd = path.join(tempDir, 'project');
-    otherDir = path.join(tempDir, 'other-project');
+    cwd = path.join(tempDir, "project");
+    otherDir = path.join(tempDir, "other-project");
 
     fs.mkdirSync(cwd, { recursive: true });
     fs.mkdirSync(otherDir, { recursive: true });
@@ -33,22 +31,22 @@ describe('WorkspaceContext with real filesystem', () => {
     fs.rmSync(tempDir, { recursive: true, force: true });
   });
 
-  describe('initialization', () => {
-    it('should initialize with a single directory (cwd)', () => {
+  describe("initialization", () => {
+    it("should initialize with a single directory (cwd)", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const directories = workspaceContext.getDirectories();
 
       expect(directories).toEqual([cwd]);
     });
 
-    it('should validate and resolve directories to absolute paths', () => {
+    it("should validate and resolve directories to absolute paths", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
       const directories = workspaceContext.getDirectories();
 
       expect(directories).toEqual([cwd, otherDir]);
     });
 
-    it('should handle empty initialization', () => {
+    it("should handle empty initialization", () => {
       const workspaceContext = new WorkspaceContext(cwd, []);
       const directories = workspaceContext.getDirectories();
       expect(directories).toHaveLength(1);
@@ -56,8 +54,8 @@ describe('WorkspaceContext with real filesystem', () => {
     });
   });
 
-  describe('adding directories', () => {
-    it('should add valid directories', () => {
+  describe("adding directories", () => {
+    it("should add valid directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       workspaceContext.addDirectory(otherDir);
       const directories = workspaceContext.getDirectories();
@@ -65,7 +63,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(directories).toEqual([cwd, otherDir]);
     });
 
-    it('should resolve relative paths to absolute', () => {
+    it("should resolve relative paths to absolute", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const relativePath = path.relative(cwd, otherDir);
       workspaceContext.addDirectory(relativePath);
@@ -74,7 +72,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(directories).toEqual([cwd, otherDir]);
     });
 
-    it('should prevent duplicate directories', () => {
+    it("should prevent duplicate directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       workspaceContext.addDirectory(otherDir);
       workspaceContext.addDirectory(otherDir);
@@ -83,68 +81,65 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(directories).toHaveLength(2);
     });
 
-    it.skipIf(os.platform() === 'win32')(
-      'should handle symbolic links correctly',
-      () => {
-        const realDir = path.join(tempDir, 'real');
-        fs.mkdirSync(realDir, { recursive: true });
-        const symlinkDir = path.join(tempDir, 'symlink-to-real');
-        fs.symlinkSync(realDir, symlinkDir, 'dir');
-        const workspaceContext = new WorkspaceContext(cwd);
-        workspaceContext.addDirectory(symlinkDir);
+    it.skipIf(os.platform() === "win32")("should handle symbolic links correctly", () => {
+      const realDir = path.join(tempDir, "real");
+      fs.mkdirSync(realDir, { recursive: true });
+      const symlinkDir = path.join(tempDir, "symlink-to-real");
+      fs.symlinkSync(realDir, symlinkDir, "dir");
+      const workspaceContext = new WorkspaceContext(cwd);
+      workspaceContext.addDirectory(symlinkDir);
 
-        const directories = workspaceContext.getDirectories();
+      const directories = workspaceContext.getDirectories();
 
-        expect(directories).toEqual([cwd, realDir]);
-      },
-    );
+      expect(directories).toEqual([cwd, realDir]);
+    });
   });
 
-  describe('path validation', () => {
-    it('should accept paths within workspace directories', () => {
+  describe("path validation", () => {
+    it("should accept paths within workspace directories", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const validPath1 = path.join(cwd, 'src', 'file.ts');
-      const validPath2 = path.join(otherDir, 'lib', 'module.js');
+      const validPath1 = path.join(cwd, "src", "file.ts");
+      const validPath2 = path.join(otherDir, "lib", "module.js");
 
       fs.mkdirSync(path.dirname(validPath1), { recursive: true });
-      fs.writeFileSync(validPath1, 'content');
+      fs.writeFileSync(validPath1, "content");
       fs.mkdirSync(path.dirname(validPath2), { recursive: true });
-      fs.writeFileSync(validPath2, 'content');
+      fs.writeFileSync(validPath2, "content");
 
       expect(workspaceContext.isPathWithinWorkspace(validPath1)).toBe(true);
       expect(workspaceContext.isPathWithinWorkspace(validPath2)).toBe(true);
     });
 
-    it('should accept non-existent paths within workspace directories', () => {
+    it("should accept non-existent paths within workspace directories", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const validPath1 = path.join(cwd, 'src', 'file.ts');
-      const validPath2 = path.join(otherDir, 'lib', 'module.js');
+      const validPath1 = path.join(cwd, "src", "file.ts");
+      const validPath2 = path.join(otherDir, "lib", "module.js");
 
       expect(workspaceContext.isPathWithinWorkspace(validPath1)).toBe(true);
       expect(workspaceContext.isPathWithinWorkspace(validPath2)).toBe(true);
     });
 
-    it('should reject paths outside workspace', () => {
+    it("should reject paths outside workspace", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const invalidPath = path.join(tempDir, 'outside-workspace', 'file.txt');
+      const invalidPath = path.join(tempDir, "outside-workspace", "file.txt");
 
       expect(workspaceContext.isPathWithinWorkspace(invalidPath)).toBe(false);
     });
 
-    it('should reject non-existent paths outside workspace', () => {
+    it("should reject non-existent paths outside workspace", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const invalidPath = path.join(tempDir, 'outside-workspace', 'file.txt');
+      const invalidPath = path.join(tempDir, "outside-workspace", "file.txt");
 
       expect(workspaceContext.isPathWithinWorkspace(invalidPath)).toBe(false);
     });
 
-    it('should handle nested directories correctly', () => {
+    it("should handle nested directories correctly", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const nestedPath = path.join(cwd, 'deeply', 'nested', 'path', 'file.txt');
+      const nestedPath = path.join(cwd, "deeply", "nested", "path", "file.txt");
       expect(workspaceContext.isPathWithinWorkspace(nestedPath)).toBe(true);
     });
 
-    it('should handle edge cases (root, parent references)', () => {
+    it("should handle edge cases (root, parent references)", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
       const rootPath = path.parse(tempDir).root;
       const parentPath = path.dirname(cwd);
@@ -153,42 +148,40 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(workspaceContext.isPathWithinWorkspace(parentPath)).toBe(false);
     });
 
-    it('should handle non-existent paths correctly', () => {
+    it("should handle non-existent paths correctly", () => {
       const workspaceContext = new WorkspaceContext(cwd, [otherDir]);
-      const nonExistentPath = path.join(cwd, 'does-not-exist.txt');
-      expect(workspaceContext.isPathWithinWorkspace(nonExistentPath)).toBe(
-        true,
-      );
+      const nonExistentPath = path.join(cwd, "does-not-exist.txt");
+      expect(workspaceContext.isPathWithinWorkspace(nonExistentPath)).toBe(true);
     });
 
-    describe.skipIf(os.platform() === 'win32')('with symbolic link', () => {
-      describe('in the workspace', () => {
+    describe.skipIf(os.platform() === "win32")("with symbolic link", () => {
+      describe("in the workspace", () => {
         let realDir: string;
         let symlinkDir: string;
         beforeEach(() => {
-          realDir = path.join(cwd, 'real-dir');
+          realDir = path.join(cwd, "real-dir");
           fs.mkdirSync(realDir, { recursive: true });
 
-          symlinkDir = path.join(cwd, 'symlink-file');
-          fs.symlinkSync(realDir, symlinkDir, 'dir');
+          symlinkDir = path.join(cwd, "symlink-file");
+          fs.symlinkSync(realDir, symlinkDir, "dir");
         });
 
-        it('should accept dir paths', () => {
+        it("should accept dir paths", () => {
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(symlinkDir)).toBe(true);
         });
 
-        it('should accept non-existent paths', () => {
-          const filePath = path.join(symlinkDir, 'does-not-exist.txt');
+        it("should accept non-existent paths", () => {
+          const filePath = path.join(symlinkDir, "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(filePath)).toBe(true);
         });
 
-        it('should accept non-existent deep paths', () => {
-          const filePath = path.join(symlinkDir, 'deep', 'does-not-exist.txt');
+        it("should accept non-existent deep paths", () => {
+          const filePath = path.join(symlinkDir, "deep", "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
@@ -196,45 +189,43 @@ describe('WorkspaceContext with real filesystem', () => {
         });
       });
 
-      describe('outside the workspace', () => {
+      describe("outside the workspace", () => {
         let realDir: string;
         let symlinkDir: string;
         beforeEach(() => {
-          realDir = path.join(tempDir, 'real-dir');
+          realDir = path.join(tempDir, "real-dir");
           fs.mkdirSync(realDir, { recursive: true });
 
-          symlinkDir = path.join(cwd, 'symlink-file');
-          fs.symlinkSync(realDir, symlinkDir, 'dir');
+          symlinkDir = path.join(cwd, "symlink-file");
+          fs.symlinkSync(realDir, symlinkDir, "dir");
         });
 
-        it('should reject dir paths', () => {
+        it("should reject dir paths", () => {
           const workspaceContext = new WorkspaceContext(cwd);
 
-          expect(workspaceContext.isPathWithinWorkspace(symlinkDir)).toBe(
-            false,
-          );
+          expect(workspaceContext.isPathWithinWorkspace(symlinkDir)).toBe(false);
         });
 
-        it('should reject non-existent paths', () => {
-          const filePath = path.join(symlinkDir, 'does-not-exist.txt');
+        it("should reject non-existent paths", () => {
+          const filePath = path.join(symlinkDir, "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(filePath)).toBe(false);
         });
 
-        it('should reject non-existent deep paths', () => {
-          const filePath = path.join(symlinkDir, 'deep', 'does-not-exist.txt');
+        it("should reject non-existent deep paths", () => {
+          const filePath = path.join(symlinkDir, "deep", "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
           expect(workspaceContext.isPathWithinWorkspace(filePath)).toBe(false);
         });
 
-        it('should reject partially non-existent deep paths', () => {
-          const deepDir = path.join(symlinkDir, 'deep');
+        it("should reject partially non-existent deep paths", () => {
+          const deepDir = path.join(symlinkDir, "deep");
           fs.mkdirSync(deepDir, { recursive: true });
-          const filePath = path.join(deepDir, 'does-not-exist.txt');
+          const filePath = path.join(deepDir, "does-not-exist.txt");
 
           const workspaceContext = new WorkspaceContext(cwd);
 
@@ -242,36 +233,36 @@ describe('WorkspaceContext with real filesystem', () => {
         });
       });
 
-      it('should reject symbolic file links outside the workspace', () => {
-        const realFile = path.join(tempDir, 'real-file.txt');
-        fs.writeFileSync(realFile, 'content');
+      it("should reject symbolic file links outside the workspace", () => {
+        const realFile = path.join(tempDir, "real-file.txt");
+        fs.writeFileSync(realFile, "content");
 
-        const symlinkFile = path.join(cwd, 'symlink-to-real-file');
-        fs.symlinkSync(realFile, symlinkFile, 'file');
+        const symlinkFile = path.join(cwd, "symlink-to-real-file");
+        fs.symlinkSync(realFile, symlinkFile, "file");
 
         const workspaceContext = new WorkspaceContext(cwd);
 
         expect(workspaceContext.isPathWithinWorkspace(symlinkFile)).toBe(false);
       });
 
-      it('should reject non-existent symbolic file links outside the workspace', () => {
-        const realFile = path.join(tempDir, 'real-file.txt');
+      it("should reject non-existent symbolic file links outside the workspace", () => {
+        const realFile = path.join(tempDir, "real-file.txt");
 
-        const symlinkFile = path.join(cwd, 'symlink-to-real-file');
-        fs.symlinkSync(realFile, symlinkFile, 'file');
+        const symlinkFile = path.join(cwd, "symlink-to-real-file");
+        fs.symlinkSync(realFile, symlinkFile, "file");
 
         const workspaceContext = new WorkspaceContext(cwd);
 
         expect(workspaceContext.isPathWithinWorkspace(symlinkFile)).toBe(false);
       });
 
-      it('should handle circular symlinks gracefully', () => {
+      it("should handle circular symlinks gracefully", () => {
         const workspaceContext = new WorkspaceContext(cwd);
-        const linkA = path.join(cwd, 'link-a');
-        const linkB = path.join(cwd, 'link-b');
+        const linkA = path.join(cwd, "link-a");
+        const linkB = path.join(cwd, "link-b");
         // Create a circular dependency: linkA -> linkB -> linkA
-        fs.symlinkSync(linkB, linkA, 'dir');
-        fs.symlinkSync(linkA, linkB, 'dir');
+        fs.symlinkSync(linkB, linkA, "dir");
+        fs.symlinkSync(linkA, linkB, "dir");
 
         // fs.realpathSync should throw ELOOP, and isPathWithinWorkspace should
         // handle it gracefully and return false.
@@ -281,8 +272,8 @@ describe('WorkspaceContext with real filesystem', () => {
     });
   });
 
-  describe('onDirectoriesChanged', () => {
-    it('should call listener when adding a directory', () => {
+  describe("onDirectoriesChanged", () => {
+    it("should call listener when adding a directory", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(listener);
@@ -292,7 +283,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).toHaveBeenCalledOnce();
     });
 
-    it('should not call listener when adding a duplicate directory', () => {
+    it("should not call listener when adding a duplicate directory", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       workspaceContext.addDirectory(otherDir);
       const listener = vi.fn();
@@ -303,7 +294,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).not.toHaveBeenCalled();
     });
 
-    it('should call listener when setting different directories', () => {
+    it("should call listener when setting different directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(listener);
@@ -313,7 +304,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).toHaveBeenCalledOnce();
     });
 
-    it('should not call listener when setting same directories', () => {
+    it("should not call listener when setting same directories", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(listener);
@@ -323,7 +314,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).not.toHaveBeenCalled();
     });
 
-    it('should support multiple listeners', () => {
+    it("should support multiple listeners", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener1 = vi.fn();
       const listener2 = vi.fn();
@@ -336,7 +327,7 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener2).toHaveBeenCalledOnce();
     });
 
-    it('should allow unsubscribing a listener', () => {
+    it("should allow unsubscribing a listener", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const listener = vi.fn();
       const unsubscribe = workspaceContext.onDirectoriesChanged(listener);
@@ -347,10 +338,10 @@ describe('WorkspaceContext with real filesystem', () => {
       expect(listener).not.toHaveBeenCalled();
     });
 
-    it('should not fail if a listener throws an error', () => {
+    it("should not fail if a listener throws an error", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const errorListener = () => {
-        throw new Error('test error');
+        throw new Error("test error");
       };
       const listener = vi.fn();
       workspaceContext.onDirectoriesChanged(errorListener);
@@ -363,8 +354,8 @@ describe('WorkspaceContext with real filesystem', () => {
     });
   });
 
-  describe('getDirectories', () => {
-    it('should return a copy of directories array', () => {
+  describe("getDirectories", () => {
+    it("should return a copy of directories array", () => {
       const workspaceContext = new WorkspaceContext(cwd);
       const dirs1 = workspaceContext.getDirectories();
       const dirs2 = workspaceContext.getDirectories();
@@ -375,7 +366,7 @@ describe('WorkspaceContext with real filesystem', () => {
   });
 });
 
-describe('WorkspaceContext with optional directories', () => {
+describe("WorkspaceContext with optional directories", () => {
   let tempDir: string;
   let cwd: string;
   let existingDir1: string;
@@ -384,18 +375,18 @@ describe('WorkspaceContext with optional directories', () => {
 
   beforeEach(() => {
     tempDir = fs.realpathSync(
-      fs.mkdtempSync(path.join(os.tmpdir(), 'workspace-context-optional-')),
+      fs.mkdtempSync(path.join(os.tmpdir(), "workspace-context-optional-")),
     );
-    cwd = path.join(tempDir, 'project');
-    existingDir1 = path.join(tempDir, 'existing-dir-1');
-    existingDir2 = path.join(tempDir, 'existing-dir-2');
-    nonExistentDir = path.join(tempDir, 'non-existent-dir');
+    cwd = path.join(tempDir, "project");
+    existingDir1 = path.join(tempDir, "existing-dir-1");
+    existingDir2 = path.join(tempDir, "existing-dir-2");
+    nonExistentDir = path.join(tempDir, "non-existent-dir");
 
     fs.mkdirSync(cwd, { recursive: true });
     fs.mkdirSync(existingDir1, { recursive: true });
     fs.mkdirSync(existingDir2, { recursive: true });
 
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
+    vi.spyOn(console, "warn").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -403,11 +394,8 @@ describe('WorkspaceContext with optional directories', () => {
     vi.restoreAllMocks();
   });
 
-  it('should skip a missing optional directory and log a warning', () => {
-    const workspaceContext = new WorkspaceContext(cwd, [
-      nonExistentDir,
-      existingDir1,
-    ]);
+  it("should skip a missing optional directory and log a warning", () => {
+    const workspaceContext = new WorkspaceContext(cwd, [nonExistentDir, existingDir1]);
     const directories = workspaceContext.getDirectories();
     expect(directories).toEqual([cwd, existingDir1]);
     expect(console.warn).toHaveBeenCalledTimes(1);
@@ -416,7 +404,7 @@ describe('WorkspaceContext with optional directories', () => {
     );
   });
 
-  it('should include an existing optional directory', () => {
+  it("should include an existing optional directory", () => {
     const workspaceContext = new WorkspaceContext(cwd, [existingDir1]);
     const directories = workspaceContext.getDirectories();
     expect(directories).toEqual([cwd, existingDir1]);
diff --git a/packages/gemini-core/src/utils/workspaceContext.ts b/packages/gemini-core/src/utils/workspaceContext.ts
index c1da8794b..dc3928598 100755
--- a/packages/gemini-core/src/utils/workspaceContext.ts
+++ b/packages/gemini-core/src/utils/workspaceContext.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isNodeError } from '../utils/errors.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { debugLogger } from './debugLogger.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { isNodeError } from "../utils/errors.js";
+import { debugLogger } from "./debugLogger.js";
 
 export type Unsubscribe = () => void;
 
@@ -155,7 +155,7 @@ export class WorkspaceContext {
     } catch (e: unknown) {
       if (
         isNodeError(e) &&
-        e.code === 'ENOENT' &&
+        e.code === "ENOENT" &&
         e.path &&
         // realpathSync does not set e.path correctly for symlinks to
         // non-existent files.
@@ -174,16 +174,9 @@ export class WorkspaceContext {
    * @param rootDirectory The absolute root directory
    * @returns True if the path is within the root directory, false otherwise
    */
-  private isPathWithinRoot(
-    pathToCheck: string,
-    rootDirectory: string,
-  ): boolean {
+  private isPathWithinRoot(pathToCheck: string, rootDirectory: string): boolean {
     const relative = path.relative(rootDirectory, pathToCheck);
-    return (
-      !relative.startsWith(`..${path.sep}`) &&
-      relative !== '..' &&
-      !path.isAbsolute(relative)
-    );
+    return !relative.startsWith(`..${path.sep}`) && relative !== ".." && !path.isAbsolute(relative);
   }
 
   /**
@@ -191,7 +184,7 @@ export class WorkspaceContext {
    */
   private isFileSymlink(filePath: string): boolean {
     try {
-      return !fs.readlinkSync(filePath).endsWith('/');
+      return !fs.readlinkSync(filePath).endsWith("/");
     } catch (_error) {
       return false;
     }
diff --git a/packages/mcp/client/__tests__/client.spec.ts b/packages/mcp/client/__tests__/client.spec.ts
index f3f5533ee..7b239e4df 100644
--- a/packages/mcp/client/__tests__/client.spec.ts
+++ b/packages/mcp/client/__tests__/client.spec.ts
@@ -1,21 +1,21 @@
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { McpClient } from '../src/client.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { McpClient } from "../src/client.js";
 import {
   McpConnectionError,
-  McpToolNotFoundError,
   McpInvocationError,
   McpTimeoutError,
-} from '../src/errors.js';
+  McpToolNotFoundError,
+} from "../src/errors.js";
 
 // Mock fetch globally
 global.fetch = vi.fn();
 
-describe('@airiscode/mcp-client - McpClient', () => {
+describe("@airiscode/mcp-client - McpClient", () => {
   let client: McpClient;
 
   beforeEach(() => {
     client = new McpClient({
-      gatewayUrl: 'http://localhost:3000',
+      gatewayUrl: "http://localhost:3000",
       timeout: 5000,
       enableCache: true,
     });
@@ -26,16 +26,16 @@ describe('@airiscode/mcp-client - McpClient', () => {
     vi.restoreAllMocks();
   });
 
-  describe('listTools', () => {
-    it('should list available tools', async () => {
+  describe("listTools", () => {
+    it("should list available tools", async () => {
       const mockResponse = {
         tools: [
-          { name: 'mindbase_search', description: 'Search MindBase' },
-          { name: 'mindbase_store', description: 'Store in MindBase' },
-          { name: 'supabase_query', description: 'Query Supabase' },
+          { name: "mindbase_search", description: "Search MindBase" },
+          { name: "mindbase_store", description: "Store in MindBase" },
+          { name: "supabase_query", description: "Query Supabase" },
         ],
         total: 3,
-        servers: ['mindbase', 'supabase'],
+        servers: ["mindbase", "supabase"],
       };
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -47,18 +47,18 @@ describe('@airiscode/mcp-client - McpClient', () => {
 
       expect(result.tools).toHaveLength(3);
       expect(result.total).toBe(3);
-      expect(result.servers).toContain('mindbase');
-      expect(result.servers).toContain('supabase');
+      expect(result.servers).toContain("mindbase");
+      expect(result.servers).toContain("supabase");
     });
 
-    it('should filter by server', async () => {
+    it("should filter by server", async () => {
       const mockResponse = {
         tools: [
-          { name: 'mindbase_search', description: 'Search MindBase' },
-          { name: 'mindbase_store', description: 'Store in MindBase' },
+          { name: "mindbase_search", description: "Search MindBase" },
+          { name: "mindbase_store", description: "Store in MindBase" },
         ],
         total: 2,
-        servers: ['mindbase'],
+        servers: ["mindbase"],
       };
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -66,35 +66,35 @@ describe('@airiscode/mcp-client - McpClient', () => {
         json: async () => mockResponse,
       } as Response);
 
-      const result = await client.listTools('mindbase');
+      const result = await client.listTools("mindbase");
 
       expect(result.tools).toHaveLength(2);
       expect(fetch).toHaveBeenCalledWith(
-        'http://localhost:3000/mcp/tools?server=mindbase',
-        expect.any(Object)
+        "http://localhost:3000/mcp/tools?server=mindbase",
+        expect.any(Object),
       );
     });
 
-    it('should handle connection errors', async () => {
-      vi.mocked(fetch).mockRejectedValueOnce(new Error('Network error'));
+    it("should handle connection errors", async () => {
+      vi.mocked(fetch).mockRejectedValueOnce(new Error("Network error"));
 
       await expect(client.listTools()).rejects.toThrow(McpConnectionError);
     });
   });
 
-  describe('getToolSpec', () => {
-    it('should fetch tool specification', async () => {
+  describe("getToolSpec", () => {
+    it("should fetch tool specification", async () => {
       const mockSpec = {
-        name: 'mindbase_search',
-        description: 'Search MindBase for relevant information',
+        name: "mindbase_search",
+        description: "Search MindBase for relevant information",
         inputSchema: {
-          type: 'object',
+          type: "object",
           properties: {
-            query: { type: 'string' },
-            limit: { type: 'number' },
+            query: { type: "string" },
+            limit: { type: "number" },
           },
         },
-        server: 'mindbase',
+        server: "mindbase",
       };
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -102,20 +102,20 @@ describe('@airiscode/mcp-client - McpClient', () => {
         json: async () => mockSpec,
       } as Response);
 
-      const spec = await client.getToolSpec('mindbase_search');
+      const spec = await client.getToolSpec("mindbase_search");
 
-      expect(spec.name).toBe('mindbase_search');
+      expect(spec.name).toBe("mindbase_search");
       expect(spec.description).toBeDefined();
       expect(spec.inputSchema).toBeDefined();
-      expect(spec.server).toBe('mindbase');
+      expect(spec.server).toBe("mindbase");
     });
 
-    it('should cache tool specs', async () => {
+    it("should cache tool specs", async () => {
       const mockSpec = {
-        name: 'test_tool',
-        description: 'Test tool',
+        name: "test_tool",
+        description: "Test tool",
         inputSchema: {},
-        server: 'test',
+        server: "test",
       };
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -124,25 +124,25 @@ describe('@airiscode/mcp-client - McpClient', () => {
       } as Response);
 
       // First call - should fetch
-      await client.getToolSpec('test_tool');
+      await client.getToolSpec("test_tool");
       expect(fetch).toHaveBeenCalledTimes(1);
 
       // Second call - should use cache
-      await client.getToolSpec('test_tool');
+      await client.getToolSpec("test_tool");
       expect(fetch).toHaveBeenCalledTimes(1); // No additional fetch
     });
 
-    it('should bypass cache after TTL expires', async () => {
+    it("should bypass cache after TTL expires", async () => {
       const shortTTLClient = new McpClient({
-        gatewayUrl: 'http://localhost:3000',
+        gatewayUrl: "http://localhost:3000",
         cacheTTL: 10, // 10ms
       });
 
       const mockSpec = {
-        name: 'test_tool',
-        description: 'Test tool',
+        name: "test_tool",
+        description: "Test tool",
         inputSchema: {},
-        server: 'test',
+        server: "test",
       };
 
       vi.mocked(fetch).mockResolvedValue({
@@ -151,37 +151,35 @@ describe('@airiscode/mcp-client - McpClient', () => {
       } as Response);
 
       // First call
-      await shortTTLClient.getToolSpec('test_tool');
+      await shortTTLClient.getToolSpec("test_tool");
       expect(fetch).toHaveBeenCalledTimes(1);
 
       // Wait for TTL to expire
       await new Promise((resolve) => setTimeout(resolve, 15));
 
       // Second call - cache expired, should fetch again
-      await shortTTLClient.getToolSpec('test_tool');
+      await shortTTLClient.getToolSpec("test_tool");
       expect(fetch).toHaveBeenCalledTimes(2);
     });
 
-    it('should throw McpToolNotFoundError for 404', async () => {
+    it("should throw McpToolNotFoundError for 404", async () => {
       vi.mocked(fetch).mockResolvedValueOnce({
         ok: false,
         status: 404,
-        statusText: 'Not Found',
+        statusText: "Not Found",
       } as Response);
 
-      await expect(client.getToolSpec('non_existent_tool')).rejects.toThrow(
-        McpToolNotFoundError
-      );
+      await expect(client.getToolSpec("non_existent_tool")).rejects.toThrow(McpToolNotFoundError);
     });
   });
 
-  describe('invokeTool', () => {
-    it('should invoke a tool successfully', async () => {
+  describe("invokeTool", () => {
+    it("should invoke a tool successfully", async () => {
       const mockResult = {
         data: {
           results: [
-            { content: 'Result 1', score: 0.95 },
-            { content: 'Result 2', score: 0.87 },
+            { content: "Result 1", score: 0.95 },
+            { content: "Result 2", score: 0.87 },
           ],
         },
       };
@@ -192,8 +190,8 @@ describe('@airiscode/mcp-client - McpClient', () => {
       } as Response);
 
       const result = await client.invokeTool({
-        name: 'mindbase_search',
-        arguments: { query: 'test query', limit: 5 },
+        name: "mindbase_search",
+        arguments: { query: "test query", limit: 5 },
       });
 
       expect(result.success).toBe(true);
@@ -202,72 +200,72 @@ describe('@airiscode/mcp-client - McpClient', () => {
       expect(result.executionTime).toBeGreaterThanOrEqual(0);
     });
 
-    it('should send correct POST request', async () => {
+    it("should send correct POST request", async () => {
       vi.mocked(fetch).mockResolvedValueOnce({
         ok: true,
         json: async () => ({ data: {} }),
       } as Response);
 
       await client.invokeTool({
-        name: 'test_tool',
-        arguments: { key: 'value' },
+        name: "test_tool",
+        arguments: { key: "value" },
       });
 
       expect(fetch).toHaveBeenCalledWith(
-        'http://localhost:3000/mcp/tools/test_tool/invoke',
+        "http://localhost:3000/mcp/tools/test_tool/invoke",
         expect.objectContaining({
-          method: 'POST',
-          body: JSON.stringify({ key: 'value' }),
-        })
+          method: "POST",
+          body: JSON.stringify({ key: "value" }),
+        }),
       );
     });
 
-    it('should handle invocation errors', async () => {
+    it("should handle invocation errors", async () => {
       vi.mocked(fetch).mockResolvedValueOnce({
         ok: false,
         status: 500,
-        statusText: 'Internal Server Error',
+        statusText: "Internal Server Error",
       } as Response);
 
       await expect(
         client.invokeTool({
-          name: 'failing_tool',
+          name: "failing_tool",
           arguments: {},
-        })
+        }),
       ).rejects.toThrow(McpInvocationError);
     });
 
-    it('should throw McpToolNotFoundError for 404', async () => {
+    it("should throw McpToolNotFoundError for 404", async () => {
       vi.mocked(fetch).mockResolvedValueOnce({
         ok: false,
         status: 404,
-        statusText: 'Not Found',
+        statusText: "Not Found",
       } as Response);
 
       await expect(
         client.invokeTool({
-          name: 'non_existent_tool',
+          name: "non_existent_tool",
           arguments: {},
-        })
+        }),
       ).rejects.toThrow(McpToolNotFoundError);
     });
   });
 
-  describe('listServers', () => {
-    it('should list available servers', async () => {
+  describe("listServers", () => {
+    it("should list available servers", async () => {
       const mockResponse = {
         servers: [
           {
-            name: 'mindbase',
-            version: '1.0.0',
+            name: "mindbase",
+            version: "1.0.0",
             toolCount: 5,
-            status: 'online',
+            status: "online",
           },
           {
-            name: 'supabase',
-            version: '2.0.0',
+            name: "supabase",
+            version: "2.0.0",
             toolCount: 10,
-            status: 'online',
+            status: "online",
           },
         ],
         total: 2,
@@ -282,17 +280,17 @@ describe('@airiscode/mcp-client - McpClient', () => {
 
       expect(result.servers).toHaveLength(2);
       expect(result.total).toBe(2);
-      expect(result.servers[0].name).toBe('mindbase');
+      expect(result.servers[0].name).toBe("mindbase");
     });
   });
 
-  describe('getServerInfo', () => {
-    it('should get server information', async () => {
+  describe("getServerInfo", () => {
+    it("should get server information", async () => {
       const mockInfo = {
-        name: 'mindbase',
-        version: '1.0.0',
+        name: "mindbase",
+        version: "1.0.0",
         toolCount: 5,
-        status: 'online' as const,
+        status: "online" as const,
       };
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -300,21 +298,21 @@ describe('@airiscode/mcp-client - McpClient', () => {
         json: async () => mockInfo,
       } as Response);
 
-      const info = await client.getServerInfo('mindbase');
+      const info = await client.getServerInfo("mindbase");
 
-      expect(info.name).toBe('mindbase');
-      expect(info.status).toBe('online');
+      expect(info.name).toBe("mindbase");
+      expect(info.status).toBe("online");
       expect(info.toolCount).toBe(5);
     });
   });
 
-  describe('cache management', () => {
-    it('should clear cache', async () => {
+  describe("cache management", () => {
+    it("should clear cache", async () => {
       const mockSpec = {
-        name: 'test_tool',
-        description: 'Test',
+        name: "test_tool",
+        description: "Test",
         inputSchema: {},
-        server: 'test',
+        server: "test",
       };
 
       vi.mocked(fetch).mockResolvedValue({
@@ -323,22 +321,22 @@ describe('@airiscode/mcp-client - McpClient', () => {
       } as Response);
 
       // Fetch and cache
-      await client.getToolSpec('test_tool');
+      await client.getToolSpec("test_tool");
       expect(fetch).toHaveBeenCalledTimes(1);
 
       // Clear cache
       client.clearCache();
 
       // Should fetch again
-      await client.getToolSpec('test_tool');
+      await client.getToolSpec("test_tool");
       expect(fetch).toHaveBeenCalledTimes(2);
     });
   });
 
-  describe('configuration', () => {
-    it('should use custom gateway URL', async () => {
+  describe("configuration", () => {
+    it("should use custom gateway URL", async () => {
       const customClient = new McpClient({
-        gatewayUrl: 'http://custom-gateway:8080',
+        gatewayUrl: "http://custom-gateway:8080",
       });
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -349,15 +347,15 @@ describe('@airiscode/mcp-client - McpClient', () => {
       await customClient.listTools();
 
       expect(fetch).toHaveBeenCalledWith(
-        'http://custom-gateway:8080/mcp/tools',
-        expect.any(Object)
+        "http://custom-gateway:8080/mcp/tools",
+        expect.any(Object),
       );
     });
 
-    it('should include API key in headers', async () => {
+    it("should include API key in headers", async () => {
       const authClient = new McpClient({
-        gatewayUrl: 'http://localhost:3000',
-        apiKey: 'test-api-key',
+        gatewayUrl: "http://localhost:3000",
+        apiKey: "test-api-key",
       });
 
       vi.mocked(fetch).mockResolvedValueOnce({
@@ -369,18 +367,18 @@ describe('@airiscode/mcp-client - McpClient', () => {
 
       const fetchCall = vi.mocked(fetch).mock.calls[0];
       const headers = fetchCall[1]?.headers as Record<string, string>;
-      expect(headers['Authorization']).toBe('Bearer test-api-key');
+      expect(headers["Authorization"]).toBe("Bearer test-api-key");
     });
 
-    it('should update configuration', () => {
+    it("should update configuration", () => {
       client.updateConfig({ timeout: 10000 });
       const config = client.getConfig();
       expect(config.timeout).toBe(10000);
     });
   });
 
-  describe('timeout handling', () => {
-    it('should timeout on slow requests', async () => {
+  describe("timeout handling", () => {
+    it("should timeout on slow requests", async () => {
       const slowClient = new McpClient({ timeout: 100 });
 
       vi.mocked(fetch).mockImplementationOnce(
@@ -392,9 +390,9 @@ describe('@airiscode/mcp-client - McpClient', () => {
                   ok: true,
                   json: async () => ({}),
                 } as Response),
-              200
+              200,
             );
-          })
+          }),
       );
 
       await expect(slowClient.listTools()).rejects.toThrow(McpTimeoutError);
diff --git a/packages/mcp/client/package.json b/packages/mcp/client/package.json
index 187be96fd..1b96e494b 100644
--- a/packages/mcp/client/package.json
+++ b/packages/mcp/client/package.json
@@ -14,7 +14,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/mcp/client/src/client.ts b/packages/mcp/client/src/client.ts
index c6046b154..fce6fe471 100644
--- a/packages/mcp/client/src/client.ts
+++ b/packages/mcp/client/src/client.ts
@@ -2,23 +2,23 @@
  * MCP client implementation
  */
 
-import type {
-  McpClientConfig,
-  McpToolMeta,
-  McpToolSpec,
-  McpToolInvocation,
-  McpToolResult,
-  McpListToolsResponse,
-  McpListServersResponse,
-  McpServerInfo,
-} from './types.js';
 import {
   McpConnectionError,
-  McpToolNotFoundError,
   McpInvocationError,
-  McpTimeoutError,
   McpServerError,
-} from './errors.js';
+  McpTimeoutError,
+  McpToolNotFoundError,
+} from "./errors.js";
+import type {
+  McpClientConfig,
+  McpListServersResponse,
+  McpListToolsResponse,
+  McpServerInfo,
+  McpToolInvocation,
+  McpToolMeta,
+  McpToolResult,
+  McpToolSpec,
+} from "./types.js";
 
 /**
  * MCP client for communicating with AIRIS MCP Gateway
@@ -36,9 +36,9 @@ export class McpClient {
 
   constructor(config: McpClientConfig = {}) {
     this.config = {
-      gatewayUrl: config.gatewayUrl || 'http://localhost:3000',
+      gatewayUrl: config.gatewayUrl || "http://localhost:3000",
       timeout: config.timeout || 30000,
-      apiKey: config.apiKey || '',
+      apiKey: config.apiKey || "",
       headers: config.headers || {},
       enableCache: config.enableCache !== false,
       cacheTTL: config.cacheTTL || 300000, // 5 minutes
@@ -49,9 +49,9 @@ export class McpClient {
    * List available tools (metadata only, lazy loading)
    */
   async listTools(server?: string): Promise<McpListToolsResponse> {
-    const url = new URL('/mcp/tools', this.config.gatewayUrl);
+    const url = new URL("/mcp/tools", this.config.gatewayUrl);
     if (server) {
-      url.searchParams.set('server', server);
+      url.searchParams.set("server", server);
     }
 
     try {
@@ -65,8 +65,8 @@ export class McpClient {
       };
     } catch (error) {
       throw new McpConnectionError(
-        `Failed to list tools: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        url.toString()
+        `Failed to list tools: ${error instanceof Error ? error.message : "Unknown error"}`,
+        url.toString(),
       );
     }
   }
@@ -105,8 +105,8 @@ export class McpClient {
         throw new McpToolNotFoundError(name);
       }
       throw new McpConnectionError(
-        `Failed to get tool spec: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        url
+        `Failed to get tool spec: ${error instanceof Error ? error.message : "Unknown error"}`,
+        url,
       );
     }
   }
@@ -121,7 +121,7 @@ export class McpClient {
 
     try {
       const response = await this.fetch(url, {
-        method: 'POST',
+        method: "POST",
         body: JSON.stringify(invocation.arguments),
       });
 
@@ -134,16 +134,15 @@ export class McpClient {
         executionTime,
       };
     } catch (error) {
-      const executionTime = Date.now() - startTime;
 
       if (error instanceof McpServerError && error.statusCode === 404) {
         throw new McpToolNotFoundError(invocation.name);
       }
 
       throw new McpInvocationError(
-        `Tool invocation failed: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Tool invocation failed: ${error instanceof Error ? error.message : "Unknown error"}`,
         invocation.name,
-        error
+        error,
       );
     }
   }
@@ -164,8 +163,8 @@ export class McpClient {
       };
     } catch (error) {
       throw new McpConnectionError(
-        `Failed to list servers: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        url
+        `Failed to list servers: ${error instanceof Error ? error.message : "Unknown error"}`,
+        url,
       );
     }
   }
@@ -181,8 +180,8 @@ export class McpClient {
       return (await response.json()) as McpServerInfo;
     } catch (error) {
       throw new McpConnectionError(
-        `Failed to get server info: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        url
+        `Failed to get server info: ${error instanceof Error ? error.message : "Unknown error"}`,
+        url,
       );
     }
   }
@@ -218,24 +217,24 @@ export class McpClient {
       method?: string;
       headers?: Record<string, string>;
       body?: string;
-    }
+    },
   ): Promise<Response> {
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), this.config.timeout);
 
     try {
       const headers: Record<string, string> = {
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
         ...this.config.headers,
         ...options?.headers,
       };
 
       if (this.config.apiKey) {
-        headers['Authorization'] = `Bearer ${this.config.apiKey}`;
+        headers["Authorization"] = `Bearer ${this.config.apiKey}`;
       }
 
       const response = await fetch(url, {
-        method: options?.method || 'GET',
+        method: options?.method || "GET",
         headers,
         body: options?.body,
         signal: controller.signal,
@@ -245,13 +244,13 @@ export class McpClient {
         throw new McpServerError(
           `HTTP ${response.status}: ${response.statusText}`,
           undefined,
-          response.status
+          response.status,
         );
       }
 
       return response;
     } catch (error) {
-      if (error instanceof Error && error.name === 'AbortError') {
+      if (error instanceof Error && error.name === "AbortError") {
         throw new McpTimeoutError(`Request timed out after ${this.config.timeout}ms`);
       }
       throw error;
diff --git a/packages/mcp/client/src/errors.ts b/packages/mcp/client/src/errors.ts
index b7db9b1dd..93c5e7bd3 100644
--- a/packages/mcp/client/src/errors.ts
+++ b/packages/mcp/client/src/errors.ts
@@ -6,9 +6,12 @@
  * Base error for MCP client issues
  */
 export class McpError extends Error {
-  constructor(message: string, public readonly code?: string) {
+  constructor(
+    message: string,
+    public readonly code?: string,
+  ) {
     super(message);
-    this.name = 'McpError';
+    this.name = "McpError";
   }
 }
 
@@ -16,9 +19,12 @@ export class McpError extends Error {
  * Error when MCP connection fails
  */
 export class McpConnectionError extends McpError {
-  constructor(message: string, public readonly url?: string) {
-    super(message, 'MCP_CONNECTION_ERROR');
-    this.name = 'McpConnectionError';
+  constructor(
+    message: string,
+    public readonly url?: string,
+  ) {
+    super(message, "MCP_CONNECTION_ERROR");
+    this.name = "McpConnectionError";
   }
 }
 
@@ -27,8 +33,8 @@ export class McpConnectionError extends McpError {
  */
 export class McpToolNotFoundError extends McpError {
   constructor(toolName: string) {
-    super(`Tool not found: ${toolName}`, 'MCP_TOOL_NOT_FOUND');
-    this.name = 'McpToolNotFoundError';
+    super(`Tool not found: ${toolName}`, "MCP_TOOL_NOT_FOUND");
+    this.name = "McpToolNotFoundError";
   }
 }
 
@@ -39,10 +45,10 @@ export class McpInvocationError extends McpError {
   constructor(
     message: string,
     public readonly toolName: string,
-    public readonly details?: unknown
+    public readonly details?: unknown,
   ) {
-    super(message, 'MCP_INVOCATION_ERROR');
-    this.name = 'McpInvocationError';
+    super(message, "MCP_INVOCATION_ERROR");
+    this.name = "McpInvocationError";
   }
 }
 
@@ -50,9 +56,9 @@ export class McpInvocationError extends McpError {
  * Error when request times out
  */
 export class McpTimeoutError extends McpError {
-  constructor(message: string = 'MCP request timed out') {
-    super(message, 'MCP_TIMEOUT_ERROR');
-    this.name = 'McpTimeoutError';
+  constructor(message: string = "MCP request timed out") {
+    super(message, "MCP_TIMEOUT_ERROR");
+    this.name = "McpTimeoutError";
   }
 }
 
@@ -63,9 +69,9 @@ export class McpServerError extends McpError {
   constructor(
     message: string,
     public readonly server?: string,
-    public readonly statusCode?: number
+    public readonly statusCode?: number,
   ) {
-    super(message, 'MCP_SERVER_ERROR');
-    this.name = 'McpServerError';
+    super(message, "MCP_SERVER_ERROR");
+    this.name = "McpServerError";
   }
 }
diff --git a/packages/mcp/client/src/index.ts b/packages/mcp/client/src/index.ts
index f3aa21f5f..6480bafd2 100644
--- a/packages/mcp/client/src/index.ts
+++ b/packages/mcp/client/src/index.ts
@@ -3,6 +3,6 @@
  * MCP (Model Context Protocol) client for AIRIS Gateway
  */
 
-export * from './types.js';
-export * from './client.js';
-export * from './errors.js';
+export * from "./client.js";
+export * from "./errors.js";
+export * from "./types.js";
diff --git a/packages/mcp/client/src/types.ts b/packages/mcp/client/src/types.ts
index 12d030809..847813838 100644
--- a/packages/mcp/client/src/types.ts
+++ b/packages/mcp/client/src/types.ts
@@ -65,7 +65,7 @@ export interface McpServerInfo {
   /** Available tools count */
   toolCount: number;
   /** Server status */
-  status: 'online' | 'offline' | 'error';
+  status: "online" | "offline" | "error";
 }
 
 /**
diff --git a/packages/mcp/gateway-client/package.json b/packages/mcp/gateway-client/package.json
index 32c9281ec..87d23da0e 100644
--- a/packages/mcp/gateway-client/package.json
+++ b/packages/mcp/gateway-client/package.json
@@ -8,7 +8,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/mcp/gateway-client/src/client.ts b/packages/mcp/gateway-client/src/client.ts
index 12cf38752..f4e02d995 100644
--- a/packages/mcp/gateway-client/src/client.ts
+++ b/packages/mcp/gateway-client/src/client.ts
@@ -3,14 +3,14 @@
  * Responsibility: HTTP/SSE communication with Gateway API
  */
 
-import { request } from 'undici';
+import { request } from "undici";
 import type {
-  GatewayConfig,
-  GatewayStatus,
   EnableServerRequest,
   EnableServerResponse,
+  GatewayConfig,
+  GatewayStatus,
   ToolDescription,
-} from './types.js';
+} from "./types.js";
 
 export class MCPGatewayClient {
   private baseURL: string;
@@ -28,7 +28,7 @@ export class MCPGatewayClient {
    */
   async getStatus(): Promise<GatewayStatus> {
     const response = await request(`${this.baseURL}/api/v1/status`, {
-      method: 'GET',
+      method: "GET",
       headers: this.getHeaders(),
       headersTimeout: this.timeout,
     });
@@ -37,7 +37,7 @@ export class MCPGatewayClient {
       throw new Error(`Gateway status failed: ${response.statusCode}`);
     }
 
-    return await response.body.json() as GatewayStatus;
+    return (await response.body.json()) as GatewayStatus;
   }
 
   /**
@@ -46,47 +46,40 @@ export class MCPGatewayClient {
   async getAlwaysOnTools(): Promise<ToolDescription[]> {
     const status = await this.getStatus();
     return status.servers
-      .filter(s => status.alwaysOn.includes(s.name) && s.enabled)
-      .flatMap(s => s.tools);
+      .filter((s) => status.alwaysOn.includes(s.name) && s.enabled)
+      .flatMap((s) => s.tools);
   }
 
   /**
    * Enable a lazy server on-demand
    */
-  async enableServer(
-    req: EnableServerRequest
-  ): Promise<EnableServerResponse> {
+  async enableServer(req: EnableServerRequest): Promise<EnableServerResponse> {
     const response = await request(`${this.baseURL}/api/v1/servers/enable`, {
-      method: 'POST',
+      method: "POST",
       headers: {
         ...this.getHeaders(),
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       body: JSON.stringify(req),
       headersTimeout: this.timeout,
     });
 
     if (response.statusCode !== 200) {
-      throw new Error(
-        `Enable server ${req.serverName} failed: ${response.statusCode}`
-      );
+      throw new Error(`Enable server ${req.serverName} failed: ${response.statusCode}`);
     }
 
-    return await response.body.json() as EnableServerResponse;
+    return (await response.body.json()) as EnableServerResponse;
   }
 
   /**
    * Disable a lazy server
    */
   async disableServer(serverName: string): Promise<void> {
-    const response = await request(
-      `${this.baseURL}/api/v1/servers/${serverName}/disable`,
-      {
-        method: 'POST',
-        headers: this.getHeaders(),
-        headersTimeout: this.timeout,
-      }
-    );
+    const response = await request(`${this.baseURL}/api/v1/servers/${serverName}/disable`, {
+      method: "POST",
+      headers: this.getHeaders(),
+      headersTimeout: this.timeout,
+    });
 
     if (response.statusCode !== 200) {
       throw new Error(`Disable server ${serverName} failed: ${response.statusCode}`);
@@ -99,13 +92,13 @@ export class MCPGatewayClient {
   async invokeTool(
     serverName: string,
     toolName: string,
-    args: Record<string, unknown>
+    args: Record<string, unknown>,
   ): Promise<unknown> {
     const response = await request(`${this.baseURL}/api/v1/mcp/invoke`, {
-      method: 'POST',
+      method: "POST",
       headers: {
         ...this.getHeaders(),
-        'Content-Type': 'application/json',
+        "Content-Type": "application/json",
       },
       body: JSON.stringify({
         server: serverName,
@@ -116,9 +109,7 @@ export class MCPGatewayClient {
     });
 
     if (response.statusCode !== 200) {
-      throw new Error(
-        `Tool invocation ${serverName}:${toolName} failed: ${response.statusCode}`
-      );
+      throw new Error(`Tool invocation ${serverName}:${toolName} failed: ${response.statusCode}`);
     }
 
     return await response.body.json();
@@ -126,11 +117,11 @@ export class MCPGatewayClient {
 
   private getHeaders(): Record<string, string> {
     const headers: Record<string, string> = {
-      'User-Agent': 'AIRIS-Code/0.1.0',
+      "User-Agent": "AIRIS-Code/0.1.0",
     };
 
     if (this.apiKey) {
-      headers['Authorization'] = `Bearer ${this.apiKey}`;
+      headers["Authorization"] = `Bearer ${this.apiKey}`;
     }
 
     return headers;
diff --git a/packages/mcp/gateway-client/src/index.ts b/packages/mcp/gateway-client/src/index.ts
index a1ad9aa2f..46815ad8a 100644
--- a/packages/mcp/gateway-client/src/index.ts
+++ b/packages/mcp/gateway-client/src/index.ts
@@ -1,2 +1,2 @@
-export * from './client.js';
-export * from './types.js';
+export * from "./client.js";
+export * from "./types.js";
diff --git a/packages/mcp/lazy-loader/package.json b/packages/mcp/lazy-loader/package.json
index 6559d0844..41f0b912e 100644
--- a/packages/mcp/lazy-loader/package.json
+++ b/packages/mcp/lazy-loader/package.json
@@ -8,7 +8,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/mcp/lazy-loader/src/index.ts b/packages/mcp/lazy-loader/src/index.ts
index 676cecdd8..dd8245678 100644
--- a/packages/mcp/lazy-loader/src/index.ts
+++ b/packages/mcp/lazy-loader/src/index.ts
@@ -1 +1 @@
-export * from './loader.js';
+export * from "./loader.js";
diff --git a/packages/mcp/lazy-loader/src/loader.ts b/packages/mcp/lazy-loader/src/loader.ts
index 9994c0bb2..8eb925968 100644
--- a/packages/mcp/lazy-loader/src/loader.ts
+++ b/packages/mcp/lazy-loader/src/loader.ts
@@ -3,7 +3,7 @@
  * Responsibility: On-demand server enabling and tool description loading
  */
 
-import { MCPGatewayClient, type ToolDescription } from '@airiscode/mcp-gateway-client';
+import { MCPGatewayClient, type ToolDescription } from "@airiscode/mcp-gateway-client";
 
 export interface LoaderConfig {
   client: MCPGatewayClient;
@@ -23,10 +23,7 @@ export class LazyMCPLoader {
   /**
    * Enable a lazy server and get its tool descriptions
    */
-  async enableServer(
-    serverName: string,
-    env?: Record<string, string>
-  ): Promise<ToolDescription[]> {
+  async enableServer(serverName: string, env?: Record<string, string>): Promise<ToolDescription[]> {
     if (this.enabledServers.has(serverName)) {
       // Already enabled, skip
       return [];
diff --git a/packages/mcp/registry/__tests__/registry.spec.ts b/packages/mcp/registry/__tests__/registry.spec.ts
index c0630719f..636471a9b 100644
--- a/packages/mcp/registry/__tests__/registry.spec.ts
+++ b/packages/mcp/registry/__tests__/registry.spec.ts
@@ -1,9 +1,9 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { ToolRegistry } from '../src/registry.js';
-import { McpClient } from '@airiscode/mcp-client';
+import { McpClient } from "@airiscode/mcp-client";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ToolRegistry } from "../src/registry.js";
 
 // Mock MCP Client
-vi.mock('@airiscode/mcp-client', () => ({
+vi.mock("@airiscode/mcp-client", () => ({
   McpClient: vi.fn(() => ({
     listTools: vi.fn(),
     getToolSpec: vi.fn(),
@@ -11,7 +11,7 @@ vi.mock('@airiscode/mcp-client', () => ({
   })),
 }));
 
-describe('@airiscode/mcp-registry - ToolRegistry', () => {
+describe("@airiscode/mcp-registry - ToolRegistry", () => {
   let registry: ToolRegistry;
   let mockClient: any;
 
@@ -28,13 +28,13 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
     });
   });
 
-  describe('initialize', () => {
-    it('should fetch available tools', async () => {
+  describe("initialize", () => {
+    it("should fetch available tools", async () => {
       mockClient.listTools.mockResolvedValueOnce({
         tools: [
-          { name: 'mindbase_search' },
-          { name: 'mindbase_store' },
-          { name: 'supabase_query' },
+          { name: "mindbase_search" },
+          { name: "mindbase_store" },
+          { name: "supabase_query" },
         ],
         total: 3,
       });
@@ -43,98 +43,98 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
 
       const tools = registry.getAvailableTools();
       expect(tools).toHaveLength(3);
-      expect(tools).toContain('mindbase_search');
-      expect(tools).toContain('mindbase_store');
-      expect(tools).toContain('supabase_query');
+      expect(tools).toContain("mindbase_search");
+      expect(tools).toContain("mindbase_store");
+      expect(tools).toContain("supabase_query");
     });
 
-    it('should preload specified tools', async () => {
+    it("should preload specified tools", async () => {
       const preloadRegistry = new ToolRegistry(mockClient, {
-        preloadTools: ['mindbase_search', 'supabase_query'],
+        preloadTools: ["mindbase_search", "supabase_query"],
       });
 
       mockClient.listTools.mockResolvedValueOnce({
         tools: [
-          { name: 'mindbase_search' },
-          { name: 'mindbase_store' },
-          { name: 'supabase_query' },
+          { name: "mindbase_search" },
+          { name: "mindbase_store" },
+          { name: "supabase_query" },
         ],
         total: 3,
       });
 
       mockClient.getToolSpec.mockResolvedValue({
-        name: 'test_tool',
-        description: 'Test tool',
+        name: "test_tool",
+        description: "Test tool",
         inputSchema: {},
-        server: 'test',
+        server: "test",
       });
 
       await preloadRegistry.initialize();
 
-      expect(mockClient.getToolSpec).toHaveBeenCalledWith('mindbase_search');
-      expect(mockClient.getToolSpec).toHaveBeenCalledWith('supabase_query');
+      expect(mockClient.getToolSpec).toHaveBeenCalledWith("mindbase_search");
+      expect(mockClient.getToolSpec).toHaveBeenCalledWith("supabase_query");
       expect(mockClient.getToolSpec).toHaveBeenCalledTimes(2);
     });
   });
 
-  describe('hasTool', () => {
+  describe("hasTool", () => {
     beforeEach(async () => {
       mockClient.listTools.mockResolvedValueOnce({
-        tools: [{ name: 'mindbase_search' }, { name: 'mindbase_store' }],
+        tools: [{ name: "mindbase_search" }, { name: "mindbase_store" }],
         total: 2,
       });
       await registry.initialize();
     });
 
-    it('should return true for available tools', () => {
-      expect(registry.hasTool('mindbase_search')).toBe(true);
-      expect(registry.hasTool('mindbase_store')).toBe(true);
+    it("should return true for available tools", () => {
+      expect(registry.hasTool("mindbase_search")).toBe(true);
+      expect(registry.hasTool("mindbase_store")).toBe(true);
     });
 
-    it('should return false for unavailable tools', () => {
-      expect(registry.hasTool('non_existent_tool')).toBe(false);
+    it("should return false for unavailable tools", () => {
+      expect(registry.hasTool("non_existent_tool")).toBe(false);
     });
   });
 
-  describe('resolveToolSpec', () => {
+  describe("resolveToolSpec", () => {
     beforeEach(async () => {
       mockClient.listTools.mockResolvedValueOnce({
-        tools: [{ name: 'test_tool' }],
+        tools: [{ name: "test_tool" }],
         total: 1,
       });
       await registry.initialize();
     });
 
-    it('should fetch and cache tool spec', async () => {
+    it("should fetch and cache tool spec", async () => {
       const mockSpec = {
-        name: 'test_tool',
-        description: 'Test tool',
-        inputSchema: { type: 'object' },
-        server: 'test',
+        name: "test_tool",
+        description: "Test tool",
+        inputSchema: { type: "object" },
+        server: "test",
       };
 
       mockClient.getToolSpec.mockResolvedValueOnce(mockSpec);
 
       // First call
-      const spec1 = await registry.resolveToolSpec('test_tool');
+      const spec1 = await registry.resolveToolSpec("test_tool");
       expect(spec1).toEqual(mockSpec);
       expect(mockClient.getToolSpec).toHaveBeenCalledTimes(1);
 
       // Second call - should use cache
-      const spec2 = await registry.resolveToolSpec('test_tool');
+      const spec2 = await registry.resolveToolSpec("test_tool");
       expect(spec2).toEqual(mockSpec);
       expect(mockClient.getToolSpec).toHaveBeenCalledTimes(1); // No additional call
     });
   });
 
-  describe('searchTools', () => {
+  describe("searchTools", () => {
     beforeEach(async () => {
       mockClient.listTools.mockResolvedValueOnce({
         tools: [
-          { name: 'mindbase_search' },
-          { name: 'mindbase_store' },
-          { name: 'supabase_query' },
-          { name: 'context7_fetch' },
+          { name: "mindbase_search" },
+          { name: "mindbase_store" },
+          { name: "supabase_query" },
+          { name: "context7_fetch" },
         ],
         total: 4,
       });
@@ -142,56 +142,55 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
       mockClient.getToolSpec.mockImplementation(async (name: string) => ({
         name,
         description:
-          name === 'mindbase_search'
-            ? 'Search MindBase for information'
-            : name === 'mindbase_store'
-            ? 'Store data in MindBase'
-            : name === 'supabase_query'
-            ? 'Query Supabase database'
-            : 'Fetch context from Context7',
+          name === "mindbase_search"
+            ? "Search MindBase for information"
+            : name === "mindbase_store"
+              ? "Store data in MindBase"
+              : name === "supabase_query"
+                ? "Query Supabase database"
+                : "Fetch context from Context7",
         inputSchema: {},
-        server:
-          name.startsWith('mindbase')
-            ? 'mindbase'
-            : name.startsWith('supabase')
-            ? 'supabase'
-            : 'context7',
+        server: name.startsWith("mindbase")
+          ? "mindbase"
+          : name.startsWith("supabase")
+            ? "supabase"
+            : "context7",
       }));
 
       await registry.initialize();
     });
 
-    it('should find tools by keyword', async () => {
+    it("should find tools by keyword", async () => {
       const matches = await registry.searchTools({
-        keywords: ['search'],
+        keywords: ["search"],
       });
 
       expect(matches.length).toBeGreaterThan(0);
-      expect(matches[0].tool.name).toBe('mindbase_search');
+      expect(matches[0].tool.name).toBe("mindbase_search");
       expect(matches[0].score).toBeGreaterThan(0);
     });
 
-    it('should filter by server', async () => {
+    it("should filter by server", async () => {
       const matches = await registry.searchTools({
-        server: 'mindbase',
+        server: "mindbase",
       });
 
       expect(matches).toHaveLength(2);
-      expect(matches.every((m) => m.tool.server === 'mindbase')).toBe(true);
+      expect(matches.every((m) => m.tool.server === "mindbase")).toBe(true);
     });
 
-    it('should apply minimum score filter', async () => {
+    it("should apply minimum score filter", async () => {
       const matches = await registry.searchTools({
-        keywords: ['database'],
+        keywords: ["database"],
         minScore: 0.4,
       });
 
       expect(matches.every((m) => m.score >= 0.4)).toBe(true);
     });
 
-    it('should sort by score descending', async () => {
+    it("should sort by score descending", async () => {
       const matches = await registry.searchTools({
-        keywords: ['mindbase'],
+        keywords: ["mindbase"],
       });
 
       for (let i = 1; i < matches.length; i++) {
@@ -199,7 +198,7 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
       }
     });
 
-    it('should return all tools when no keywords', async () => {
+    it("should return all tools when no keywords", async () => {
       const matches = await registry.searchTools({});
 
       expect(matches).toHaveLength(4);
@@ -207,65 +206,65 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
     });
   });
 
-  describe('invokeTool', () => {
+  describe("invokeTool", () => {
     beforeEach(async () => {
       mockClient.listTools.mockResolvedValueOnce({
-        tools: [{ name: 'test_tool' }],
+        tools: [{ name: "test_tool" }],
         total: 1,
       });
       await registry.initialize();
     });
 
-    it('should invoke tool and track history', async () => {
+    it("should invoke tool and track history", async () => {
       const mockResult = {
         success: true,
-        data: { result: 'success' },
+        data: { result: "success" },
         executionTime: 100,
       };
 
       mockClient.invokeTool.mockResolvedValueOnce(mockResult);
 
       const result = await registry.invokeTool({
-        name: 'test_tool',
-        arguments: { key: 'value' },
+        name: "test_tool",
+        arguments: { key: "value" },
       });
 
       expect(result).toEqual(mockResult);
 
-      const history = registry.getInvocationHistory('test_tool');
+      const history = registry.getInvocationHistory("test_tool");
       expect(history).toHaveLength(1);
-      expect(history[0].toolName).toBe('test_tool');
+      expect(history[0].toolName).toBe("test_tool");
       expect(history[0].success).toBe(true);
-      expect(history[0].arguments).toEqual({ key: 'value' });
+      expect(history[0].arguments).toEqual({ key: "value" });
     });
 
-    it('should track failed invocations', async () => {
-      const error = new Error('Invocation failed');
+    it("should track failed invocations", async () => {
+      const error = new Error("Invocation failed");
       mockClient.invokeTool.mockRejectedValueOnce(error);
 
       await expect(
         registry.invokeTool({
-          name: 'test_tool',
+          name: "test_tool",
           arguments: {},
-        })
-      ).rejects.toThrow('Invocation failed');
+        }),
+      ).rejects.toThrow("Invocation failed");
 
-      const history = registry.getInvocationHistory('test_tool');
+      const history = registry.getInvocationHistory("test_tool");
       expect(history).toHaveLength(1);
       expect(history[0].success).toBe(false);
     });
   });
 
-  describe('getToolStats', () => {
+  describe("getToolStats", () => {
     beforeEach(async () => {
       mockClient.listTools.mockResolvedValueOnce({
-        tools: [{ name: 'test_tool' }],
+        tools: [{ name: "test_tool" }],
         total: 1,
       });
       await registry.initialize();
     });
 
-    it('should calculate tool statistics', async () => {
+    it("should calculate tool statistics", async () => {
       mockClient.invokeTool.mockResolvedValue({
         success: true,
         data: {},
@@ -273,14 +272,14 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
       });
 
       // Successful invocations
-      await registry.invokeTool({ name: 'test_tool', arguments: {} });
-      await registry.invokeTool({ name: 'test_tool', arguments: {} });
+      await registry.invokeTool({ name: "test_tool", arguments: {} });
+      await registry.invokeTool({ name: "test_tool", arguments: {} });
 
       // Failed invocation
-      mockClient.invokeTool.mockRejectedValueOnce(new Error('Failed'));
-      await registry.invokeTool({ name: 'test_tool', arguments: {} }).catch(() => {});
+      mockClient.invokeTool.mockRejectedValueOnce(new Error("Failed"));
+      await registry.invokeTool({ name: "test_tool", arguments: {} }).catch(() => {});
 
-      const stats = registry.getToolStats('test_tool');
+      const stats = registry.getToolStats("test_tool");
 
       expect(stats.invocations).toBe(3);
       expect(stats.successes).toBe(2);
@@ -288,8 +287,8 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
       expect(stats.avgExecutionTime).toBeGreaterThan(0);
     });
 
-    it('should return zero stats for unused tool', () => {
-      const stats = registry.getToolStats('unused_tool');
+    it("should return zero stats for unused tool", () => {
+      const stats = registry.getToolStats("unused_tool");
 
       expect(stats.invocations).toBe(0);
       expect(stats.successes).toBe(0);
@@ -298,10 +297,10 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
     });
   });
 
-  describe('clearHistory', () => {
+  describe("clearHistory", () => {
     beforeEach(async () => {
       mockClient.listTools.mockResolvedValueOnce({
-        tools: [{ name: 'test_tool' }],
+        tools: [{ name: "test_tool" }],
         total: 1,
       });
       await registry.initialize();
@@ -313,8 +312,8 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
       });
     });
 
-    it('should clear invocation history', async () => {
-      await registry.invokeTool({ name: 'test_tool', arguments: {} });
+    it("should clear invocation history", async () => {
+      await registry.invokeTool({ name: "test_tool", arguments: {} });
       expect(registry.getInvocationHistory()).toHaveLength(1);
 
       registry.clearHistory();
@@ -322,10 +321,10 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
     });
   });
 
-  describe('reload', () => {
-    it('should reload available tools', async () => {
+  describe("reload", () => {
+    it("should reload available tools", async () => {
       mockClient.listTools.mockResolvedValueOnce({
-        tools: [{ name: 'tool1' }],
+        tools: [{ name: "tool1" }],
         total: 1,
       });
 
@@ -333,7 +332,7 @@ describe('@airiscode/mcp-registry - ToolRegistry', () => {
       expect(registry.getAvailableTools()).toHaveLength(1);
 
       mockClient.listTools.mockResolvedValueOnce({
-        tools: [{ name: 'tool1' }, { name: 'tool2' }],
+        tools: [{ name: "tool1" }, { name: "tool2" }],
         total: 2,
       });
 
diff --git a/packages/mcp/registry/package.json b/packages/mcp/registry/package.json
index afd90babb..07543a80e 100644
--- a/packages/mcp/registry/package.json
+++ b/packages/mcp/registry/package.json
@@ -14,7 +14,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/mcp/registry/src/cache.ts b/packages/mcp/registry/src/cache.ts
index b3ddf924b..6d42f6b18 100644
--- a/packages/mcp/registry/src/cache.ts
+++ b/packages/mcp/registry/src/cache.ts
@@ -3,7 +3,7 @@
  * Responsibility: Cache tool descriptions to minimize Gateway API calls
  */
 
-import type { ToolDescription } from '@airiscode/mcp-gateway-client';
+import type { ToolDescription } from "@airiscode/mcp-gateway-client";
 
 export class ToolDescriptionCache {
   private cache = new Map<string, ToolDescription[]>();
diff --git a/packages/mcp/registry/src/categories.ts b/packages/mcp/registry/src/categories.ts
index 3e482f8d5..a7dd33608 100644
--- a/packages/mcp/registry/src/categories.ts
+++ b/packages/mcp/registry/src/categories.ts
@@ -4,32 +4,32 @@
  */
 
 export const ALWAYS_ON_SERVERS = [
-  'filesystem',
-  'context7',
-  'sequential-thinking',
-  'serena',
-  'mindbase',
-  'self-management',
+  "filesystem",
+  "context7",
+  "sequential-thinking",
+  "serena",
+  "mindbase",
+  "self-management",
 ] as const;
 
 export const LAZY_SERVERS = [
-  'playwright',
-  'puppeteer',
-  'chrome-devtools',
-  'magic',
-  'tavily',
-  'supabase',
-  'mongodb',
-  'notion',
-  'slack',
-  'figma',
-  'mcp-postgres-server',
-  'morphllm-fast-apply',
-  'sqlite',
+  "playwright",
+  "puppeteer",
+  "chrome-devtools",
+  "magic",
+  "tavily",
+  "supabase",
+  "mongodb",
+  "notion",
+  "slack",
+  "figma",
+  "mcp-postgres-server",
+  "morphllm-fast-apply",
+  "sqlite",
 ] as const;
 
-export type AlwaysOnServer = typeof ALWAYS_ON_SERVERS[number];
-export type LazyServer = typeof LAZY_SERVERS[number];
+export type AlwaysOnServer = (typeof ALWAYS_ON_SERVERS)[number];
+export type LazyServer = (typeof LAZY_SERVERS)[number];
 export type ServerName = AlwaysOnServer | LazyServer;
 
 export function isAlwaysOn(serverName: string): serverName is AlwaysOnServer {
diff --git a/packages/mcp/registry/src/index.ts b/packages/mcp/registry/src/index.ts
index e701e1969..e6942d8b4 100644
--- a/packages/mcp/registry/src/index.ts
+++ b/packages/mcp/registry/src/index.ts
@@ -3,5 +3,5 @@
  * MCP tool registry with lazy loading and caching
  */
 
-export * from './registry.js';
-export * from './types.js';
+export * from "./registry.js";
+export * from "./types.js";
diff --git a/packages/mcp/registry/src/registry.ts b/packages/mcp/registry/src/registry.ts
index 78a6f75e2..a6f1d39ee 100644
--- a/packages/mcp/registry/src/registry.ts
+++ b/packages/mcp/registry/src/registry.ts
@@ -2,13 +2,8 @@
  * Tool registry implementation
  */
 
-import { McpClient, McpToolSpec, McpToolInvocation, McpToolResult } from '@airiscode/mcp-client';
-import type {
-  RegistryConfig,
-  ToolMatch,
-  ToolSearchQuery,
-  ToolInvocationRecord,
-} from './types.js';
+import { McpClient, McpToolInvocation, McpToolResult, McpToolSpec } from "@airiscode/mcp-client";
+import type { RegistryConfig, ToolInvocationRecord, ToolMatch, ToolSearchQuery } from "./types.js";
 
 /**
  * Tool registry for managing MCP tools
@@ -27,12 +22,12 @@ export class ToolRegistry {
 
   constructor(
     private mcpClient: McpClient,
-    config: RegistryConfig = {}
+    config: RegistryConfig = {},
   ) {
     this.config = {
       lazyLoading: config.lazyLoading !== false,
       preloadTools: config.preloadTools || [],
-      selectionStrategy: config.selectionStrategy || 'best-match',
+      selectionStrategy: config.selectionStrategy || "best-match",
     };
   }
 
@@ -45,9 +40,7 @@ export class ToolRegistry {
 
     // Preload specified tools
     if (this.config.preloadTools.length > 0) {
-      await Promise.all(
-        this.config.preloadTools.map((name) => this.resolveToolSpec(name))
-      );
+      await Promise.all(this.config.preloadTools.map((name) => this.resolveToolSpec(name)));
     }
   }
 
@@ -185,8 +178,7 @@ export class ToolRegistry {
     }
 
     const successes = records.filter((r) => r.success).length;
-    const avgExecutionTime =
-      records.reduce((sum, r) => sum + r.executionTime, 0) / records.length;
+    const avgExecutionTime = records.reduce((sum, r) => sum + r.executionTime, 0) / records.length;
 
     return {
       invocations: records.length,
@@ -263,6 +255,6 @@ export class ToolRegistry {
       reasons.push(`from server "${query.server}"`);
     }
 
-    return reasons.length > 0 ? reasons.join(', ') : 'default match';
+    return reasons.length > 0 ? reasons.join(", ") : "default match";
   }
 }
diff --git a/packages/mcp/registry/src/types.ts b/packages/mcp/registry/src/types.ts
index 10cb438a0..59c767e87 100644
--- a/packages/mcp/registry/src/types.ts
+++ b/packages/mcp/registry/src/types.ts
@@ -2,7 +2,7 @@
  * Tool registry types
  */
 
-import type { McpToolSpec } from '@airiscode/mcp-client';
+import type { McpToolSpec } from "@airiscode/mcp-client";
 
 /**
  * Registry configuration
@@ -13,7 +13,7 @@ export interface RegistryConfig {
   /** Preload popular tools */
   preloadTools?: string[];
   /** Tool selection strategy */
-  selectionStrategy?: 'first-match' | 'best-match' | 'all';
+  selectionStrategy?: "first-match" | "best-match" | "all";
 }
 
 /**
diff --git a/packages/mcp/session/package.json b/packages/mcp/session/package.json
index 7f68cba32..0b7fd604f 100644
--- a/packages/mcp/session/package.json
+++ b/packages/mcp/session/package.json
@@ -8,7 +8,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/mcp/session/src/index.ts b/packages/mcp/session/src/index.ts
index 9d97b9d63..4a5b5dd7a 100644
--- a/packages/mcp/session/src/index.ts
+++ b/packages/mcp/session/src/index.ts
@@ -1 +1 @@
-export * from './manager.js';
+export * from "./manager.js";
diff --git a/packages/mcp/session/src/manager.ts b/packages/mcp/session/src/manager.ts
index ef8f1c7be..c23f83f1a 100644
--- a/packages/mcp/session/src/manager.ts
+++ b/packages/mcp/session/src/manager.ts
@@ -4,11 +4,11 @@
  */
 
 import {
-  MCPGatewayClient,
   type GatewayConfig,
+  MCPGatewayClient,
   type ToolDescription,
-} from '@airiscode/mcp-gateway-client';
-import { LazyMCPLoader } from '@airiscode/mcp-lazy-loader';
+} from "@airiscode/mcp-gateway-client";
+import { LazyMCPLoader } from "@airiscode/mcp-lazy-loader";
 
 export interface SessionConfig extends GatewayConfig {
   sessionId: string;
@@ -58,7 +58,7 @@ export class MCPSessionManager {
       this.state.startedAt = new Date();
     } catch (error) {
       throw new Error(
-        `Failed to initialize MCP session: ${error instanceof Error ? error.message : String(error)}`
+        `Failed to initialize MCP session: ${error instanceof Error ? error.message : String(error)}`,
       );
     }
   }
@@ -68,10 +68,10 @@ export class MCPSessionManager {
    */
   async enableLazyServer(
     serverName: string,
-    env?: Record<string, string>
+    env?: Record<string, string>,
   ): Promise<ToolDescription[]> {
     if (!this.state.connected) {
-      throw new Error('Session not initialized');
+      throw new Error("Session not initialized");
     }
 
     return await this.loader.enableServer(serverName, env);
@@ -113,10 +113,10 @@ export class MCPSessionManager {
   async invokeTool(
     serverName: string,
     toolName: string,
-    args: Record<string, unknown>
+    args: Record<string, unknown>,
   ): Promise<unknown> {
     if (!this.state.connected) {
-      throw new Error('Session not initialized');
+      throw new Error("Session not initialized");
     }
 
     return await this.client.invokeTool(serverName, toolName, args);
@@ -128,9 +128,7 @@ export class MCPSessionManager {
   async cleanup(): Promise<void> {
     // Disable all lazy servers
     const enabledServers = this.loader.getEnabledServers();
-    await Promise.all(
-      enabledServers.map((server) => this.loader.disableServer(server))
-    );
+    await Promise.all(enabledServers.map((server) => this.loader.disableServer(server)));
 
     this.state.connected = false;
     this.state.lazyTools.clear();
diff --git a/packages/policies/__tests__/policies.spec.ts b/packages/policies/__tests__/policies.spec.ts
index 306cdec62..fa9f8a0d4 100644
--- a/packages/policies/__tests__/policies.spec.ts
+++ b/packages/policies/__tests__/policies.spec.ts
@@ -1,50 +1,50 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
   ApprovalsLevel,
-  TrustLevel,
-  DEFAULT_POLICY,
   AUTONOMOUS_POLICY,
-  RESTRICTED_POLICY,
+  DEFAULT_POLICY,
   parsePolicyProfile,
+  RESTRICTED_POLICY,
   safeParsePolicyProfile,
-} from '../src/index.js';
+  TrustLevel,
+} from "../src/index.js";
 
-describe('@airiscode/policies', () => {
-  describe('PolicyProfile validation', () => {
-    it('should validate a valid policy profile', () => {
+describe("@airiscode/policies", () => {
+  describe("PolicyProfile validation", () => {
+    it("should validate a valid policy profile", () => {
       const result = safeParsePolicyProfile({
-        approvals: 'on-failure',
-        trust: 'sandboxed',
+        approvals: "on-failure",
+        trust: "sandboxed",
         guardStrict: true,
       });
 
       expect(result.success).toBe(true);
     });
 
-    it('should reject invalid approvals level', () => {
+    it("should reject invalid approvals level", () => {
       const result = safeParsePolicyProfile({
-        approvals: 'invalid',
-        trust: 'sandboxed',
+        approvals: "invalid",
+        trust: "sandboxed",
         guardStrict: true,
       });
 
       expect(result.success).toBe(false);
     });
 
-    it('should reject invalid trust level', () => {
+    it("should reject invalid trust level", () => {
       const result = safeParsePolicyProfile({
-        approvals: 'never',
-        trust: 'invalid',
+        approvals: "never",
+        trust: "invalid",
         guardStrict: true,
       });
 
       expect(result.success).toBe(false);
     });
 
-    it('should parse valid policy profile', () => {
+    it("should parse valid policy profile", () => {
       const profile = parsePolicyProfile({
-        approvals: 'on-request',
-        trust: 'restricted',
+        approvals: "on-request",
+        trust: "restricted",
         guardStrict: false,
       });
 
@@ -54,19 +54,19 @@ describe('@airiscode/policies', () => {
     });
   });
 
-  describe('Default policies', () => {
-    it('should have valid DEFAULT_POLICY', () => {
+  describe("Default policies", () => {
+    it("should have valid DEFAULT_POLICY", () => {
       expect(DEFAULT_POLICY.approvals).toBe(ApprovalsLevel.ON_FAILURE);
       expect(DEFAULT_POLICY.trust).toBe(TrustLevel.SANDBOXED);
       expect(DEFAULT_POLICY.guardStrict).toBe(true);
     });
 
-    it('should have valid AUTONOMOUS_POLICY', () => {
+    it("should have valid AUTONOMOUS_POLICY", () => {
       expect(AUTONOMOUS_POLICY.approvals).toBe(ApprovalsLevel.NEVER);
       expect(AUTONOMOUS_POLICY.trust).toBe(TrustLevel.SANDBOXED);
     });
 
-    it('should have valid RESTRICTED_POLICY', () => {
+    it("should have valid RESTRICTED_POLICY", () => {
       expect(RESTRICTED_POLICY.approvals).toBe(ApprovalsLevel.ON_REQUEST);
       expect(RESTRICTED_POLICY.trust).toBe(TrustLevel.RESTRICTED);
     });
diff --git a/packages/policies/package.json b/packages/policies/package.json
index 860a38c0f..f69cb5b78 100644
--- a/packages/policies/package.json
+++ b/packages/policies/package.json
@@ -15,7 +15,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/policies/src/defaults.ts b/packages/policies/src/defaults.ts
index 7d6ba679b..180657e8e 100644
--- a/packages/policies/src/defaults.ts
+++ b/packages/policies/src/defaults.ts
@@ -2,7 +2,7 @@
  * Default policy profiles
  */
 
-import { PolicyProfile, ApprovalsLevel, TrustLevel } from './types.js';
+import { ApprovalsLevel, PolicyProfile, TrustLevel } from "./types.js";
 
 /**
  * Default policy profile (recommended for most use cases)
diff --git a/packages/policies/src/index.ts b/packages/policies/src/index.ts
index 963a13430..66eee314e 100644
--- a/packages/policies/src/index.ts
+++ b/packages/policies/src/index.ts
@@ -3,6 +3,6 @@
  * Policy profiles and approval/trust level definitions
  */
 
-export * from './types.js';
-export * from './schemas.js';
-export * from './defaults.js';
+export * from "./defaults.js";
+export * from "./schemas.js";
+export * from "./types.js";
diff --git a/packages/policies/src/schemas.ts b/packages/policies/src/schemas.ts
index d857ecfa4..73bc6b0dd 100644
--- a/packages/policies/src/schemas.ts
+++ b/packages/policies/src/schemas.ts
@@ -2,8 +2,8 @@
  * Zod schemas for runtime validation of policy profiles
  */
 
-import { z } from 'zod';
-import { ApprovalsLevel, TrustLevel } from './types.js';
+import { z } from "zod";
+import { ApprovalsLevel, TrustLevel } from "./types.js";
 
 /**
  * Zod schema for ApprovalsLevel
diff --git a/packages/policies/src/types.ts b/packages/policies/src/types.ts
index e1e14efa1..ef5a7a2c8 100644
--- a/packages/policies/src/types.ts
+++ b/packages/policies/src/types.ts
@@ -7,11 +7,11 @@
  */
 export enum ApprovalsLevel {
   /** Fully autonomous, no user approval required */
-  NEVER = 'never',
+  NEVER = "never",
   /** Pause for user input when errors occur */
-  ON_FAILURE = 'on-failure',
+  ON_FAILURE = "on-failure",
   /** Require explicit user approval before executing actions */
-  ON_REQUEST = 'on-request',
+  ON_REQUEST = "on-request",
 }
 
 /**
@@ -19,11 +19,11 @@ export enum ApprovalsLevel {
  */
 export enum TrustLevel {
   /** Read-only filesystem, shell disabled */
-  RESTRICTED = 'restricted',
+  RESTRICTED = "restricted",
   /** Workspace write allowed, external network blocked */
-  SANDBOXED = 'sandboxed',
+  SANDBOXED = "sandboxed",
   /** Full access, but Shell Guard still blocks dangerous commands */
-  UNTRUSTED = 'untrusted',
+  UNTRUSTED = "untrusted",
 }
 
 /**
diff --git a/packages/runners/docker/__tests__/docker-runner.spec.ts b/packages/runners/docker/__tests__/docker-runner.spec.ts
index 605b17e29..30d341413 100644
--- a/packages/runners/docker/__tests__/docker-runner.spec.ts
+++ b/packages/runners/docker/__tests__/docker-runner.spec.ts
@@ -1,9 +1,9 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { DockerRunner } from '../src/docker-runner.js';
-import { DockerOperation } from '../src/types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { DockerRunner } from "../src/docker-runner.js";
+import { DockerOperation } from "../src/types.js";
 
 // Mock dockerode
-vi.mock('dockerode', () => ({
+vi.mock("dockerode", () => ({
   default: vi.fn(() => ({
     listContainers: vi.fn(),
     getContainer: vi.fn(),
@@ -18,43 +18,39 @@ vi.mock('dockerode', () => ({
 }));
 
 // Mock child_process
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   spawn: vi.fn(),
 }));
 
-describe('@airiscode/runners-docker - DockerRunner', () => {
+describe("@airiscode/runners-docker - DockerRunner", () => {
   let runner: DockerRunner;
   let mockDocker: any;
 
   beforeEach(async () => {
-    const Docker = (await import('dockerode')).default;
+    const Docker = (await import("dockerode")).default;
     mockDocker = new Docker();
-    runner = new DockerRunner('/test/project');
+    runner = new DockerRunner("/test/project");
   });
 
-  describe('listContainers', () => {
-    it('should list running containers', async () => {
+  describe("listContainers", () => {
+    it("should list running containers", async () => {
       mockDocker.listContainers.mockResolvedValueOnce([
         {
-          Id: 'container1',
-          Names: ['/app-web'],
-          Image: 'nginx:latest',
-          State: 'running',
-          Status: 'Up 2 hours',
-          Ports: [
-            { PrivatePort: 80, PublicPort: 8080, Type: 'tcp' },
-          ],
+          Id: "container1",
+          Names: ["/app-web"],
+          Image: "nginx:latest",
+          State: "running",
+          Status: "Up 2 hours",
+          Ports: [{ PrivatePort: 80, PublicPort: 8080, Type: "tcp" }],
           Created: 1704067200,
         },
         {
-          Id: 'container2',
-          Names: ['/app-db'],
-          Image: 'postgres:15',
-          State: 'running',
-          Status: 'Up 2 hours',
-          Ports: [
-            { PrivatePort: 5432, Type: 'tcp' },
-          ],
+          Id: "container2",
+          Names: ["/app-db"],
+          Image: "postgres:15",
+          State: "running",
+          Status: "Up 2 hours",
+          Ports: [{ PrivatePort: 5432, Type: "tcp" }],
           Created: 1704067200,
         },
       ]);
@@ -64,21 +60,21 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
       expect(result.ok).toBe(true);
       if (result.ok) {
         expect(result.value).toHaveLength(2);
-        expect(result.value[0].name).toBe('app-web');
-        expect(result.value[0].state).toBe('running');
+        expect(result.value[0].name).toBe("app-web");
+        expect(result.value[0].state).toBe("running");
         expect(result.value[0].ports).toHaveLength(1);
         expect(result.value[0].ports[0].publicPort).toBe(8080);
       }
     });
 
-    it('should list all containers including stopped', async () => {
+    it("should list all containers including stopped", async () => {
       mockDocker.listContainers.mockResolvedValueOnce([
         {
-          Id: 'container1',
-          Names: ['/app-web'],
-          Image: 'nginx:latest',
-          State: 'exited',
-          Status: 'Exited (0) 1 hour ago',
+          Id: "container1",
+          Names: ["/app-web"],
+          Image: "nginx:latest",
+          State: "exited",
+          Status: "Exited (0) 1 hour ago",
           Ports: [],
           Created: 1704067200,
         },
@@ -90,10 +86,8 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
       expect(mockDocker.listContainers).toHaveBeenCalledWith({ all: true });
     });
 
-    it('should handle errors', async () => {
-      mockDocker.listContainers.mockRejectedValueOnce(
-        new Error('Docker daemon not running')
-      );
+    it("should handle errors", async () => {
+      mockDocker.listContainers.mockRejectedValueOnce(new Error("Docker daemon not running"));
 
       const result = await runner.listContainers();
 
@@ -104,20 +98,20 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
     });
   });
 
-  describe('getContainerHealth', () => {
-    it('should get healthy container status', async () => {
+  describe("getContainerHealth", () => {
+    it("should get healthy container status", async () => {
       const mockContainer = {
         inspect: vi.fn().mockResolvedValue({
           State: {
             Health: {
-              Status: 'healthy',
+              Status: "healthy",
               FailingStreak: 0,
               Log: [
                 {
                   ExitCode: 0,
-                  Output: 'Health check passed',
-                  Start: '2024-01-01T00:00:00Z',
-                  End: '2024-01-01T00:00:01Z',
+                  Output: "Health check passed",
+                  Start: "2024-01-01T00:00:00Z",
+                  End: "2024-01-01T00:00:01Z",
                 },
               ],
             },
@@ -127,23 +121,23 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
 
       mockDocker.getContainer.mockReturnValueOnce(mockContainer);
 
-      const result = await runner.getContainerHealth('container1');
+      const result = await runner.getContainerHealth("container1");
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.value.status).toBe('healthy');
+        expect(result.value.status).toBe("healthy");
         expect(result.value.failingStreak).toBe(0);
         expect(result.value.lastCheck).toBeDefined();
         expect(result.value.lastCheck?.exitCode).toBe(0);
       }
     });
 
-    it('should handle unhealthy container', async () => {
+    it("should handle unhealthy container", async () => {
       const mockContainer = {
         inspect: vi.fn().mockResolvedValue({
           State: {
             Health: {
-              Status: 'unhealthy',
+              Status: "unhealthy",
               FailingStreak: 3,
               Log: [],
             },
@@ -153,16 +147,16 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
 
       mockDocker.getContainer.mockReturnValueOnce(mockContainer);
 
-      const result = await runner.getContainerHealth('container1');
+      const result = await runner.getContainerHealth("container1");
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.value.status).toBe('unhealthy');
+        expect(result.value.status).toBe("unhealthy");
         expect(result.value.failingStreak).toBe(3);
       }
     });
 
-    it('should handle container without health check', async () => {
+    it("should handle container without health check", async () => {
       const mockContainer = {
         inspect: vi.fn().mockResolvedValue({
           State: {},
@@ -171,17 +165,17 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
 
       mockDocker.getContainer.mockReturnValueOnce(mockContainer);
 
-      const result = await runner.getContainerHealth('container1');
+      const result = await runner.getContainerHealth("container1");
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.value.status).toBe('none');
+        expect(result.value.status).toBe("none");
       }
     });
   });
 
-  describe('getContainerStats', () => {
-    it('should get container stats', async () => {
+  describe("getContainerStats", () => {
+    it("should get container stats", async () => {
       const mockContainer = {
         stats: vi.fn().mockResolvedValue({
           cpu_stats: {
@@ -205,8 +199,8 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
           },
           blkio_stats: {
             io_service_bytes_recursive: [
-              { op: 'read', value: 2000000 },
-              { op: 'write', value: 1000000 },
+              { op: "read", value: 2000000 },
+              { op: "write", value: 1000000 },
             ],
           },
           pids_stats: {
@@ -217,7 +211,7 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
 
       mockDocker.getContainer.mockReturnValueOnce(mockContainer);
 
-      const result = await runner.getContainerStats('container1');
+      const result = await runner.getContainerStats("container1");
 
       expect(result.ok).toBe(true);
       if (result.ok) {
@@ -234,16 +228,16 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
     });
   });
 
-  describe('getContainerLogs', () => {
-    it('should get container logs', async () => {
-      const mockLogs = 'Log line 1\nLog line 2\nLog line 3';
+  describe("getContainerLogs", () => {
+    it("should get container logs", async () => {
+      const mockLogs = "Log line 1\nLog line 2\nLog line 3";
       const mockContainer = {
         logs: vi.fn().mockResolvedValue(Buffer.from(mockLogs)),
       };
 
       mockDocker.getContainer.mockReturnValueOnce(mockContainer);
 
-      const result = await runner.getContainerLogs('container1');
+      const result = await runner.getContainerLogs("container1");
 
       expect(result.ok).toBe(true);
       if (result.ok) {
@@ -251,14 +245,14 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
       }
     });
 
-    it('should get logs with options', async () => {
+    it("should get logs with options", async () => {
       const mockContainer = {
-        logs: vi.fn().mockResolvedValue(Buffer.from('logs')),
+        logs: vi.fn().mockResolvedValue(Buffer.from("logs")),
       };
 
       mockDocker.getContainer.mockReturnValueOnce(mockContainer);
 
-      await runner.getContainerLogs('container1', {
+      await runner.getContainerLogs("container1", {
         tail: 100,
         timestamps: true,
         follow: false,
@@ -275,18 +269,18 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
     });
   });
 
-  describe('listImages', () => {
-    it('should list images', async () => {
+  describe("listImages", () => {
+    it("should list images", async () => {
       mockDocker.listImages.mockResolvedValueOnce([
         {
-          Id: 'image1',
-          RepoTags: ['nginx:latest', 'nginx:1.25'],
+          Id: "image1",
+          RepoTags: ["nginx:latest", "nginx:1.25"],
           Size: 142000000,
           Created: 1704067200,
         },
         {
-          Id: 'image2',
-          RepoTags: ['postgres:15'],
+          Id: "image2",
+          RepoTags: ["postgres:15"],
           Size: 379000000,
           Created: 1704067200,
         },
@@ -297,41 +291,39 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
       expect(result.ok).toBe(true);
       if (result.ok) {
         expect(result.value).toHaveLength(2);
-        expect(result.value[0].tags).toContain('nginx:latest');
-        expect(result.value[1].tags).toContain('postgres:15');
+        expect(result.value[0].tags).toContain("nginx:latest");
+        expect(result.value[1].tags).toContain("postgres:15");
       }
     });
   });
 
-  describe('pullImage', () => {
-    it('should pull image', async () => {
+  describe("pullImage", () => {
+    it("should pull image", async () => {
       const mockStream = {};
       mockDocker.pull.mockImplementation(
         (name: string, callback: (err: null, stream: any) => void) => {
           callback(null, mockStream);
-        }
+        },
       );
 
       mockDocker.modem.followProgress.mockImplementation(
         (_stream: any, callback: (err: null) => void) => {
           callback(null);
-        }
+        },
       );
 
-      const result = await runner.pullImage('nginx:latest');
+      const result = await runner.pullImage("nginx:latest");
 
       expect(result.ok).toBe(true);
-      expect(mockDocker.pull).toHaveBeenCalledWith('nginx:latest', expect.any(Function));
+      expect(mockDocker.pull).toHaveBeenCalledWith("nginx:latest", expect.any(Function));
     });
 
-    it('should handle pull errors', async () => {
-      mockDocker.pull.mockImplementation(
-        (_name: string, callback: (err: Error) => void) => {
-          callback(new Error('Image not found'));
-        }
-      );
+    it("should handle pull errors", async () => {
+      mockDocker.pull.mockImplementation((_name: string, callback: (err: Error) => void) => {
+        callback(new Error("Image not found"));
+      });
 
-      const result = await runner.pullImage('invalid:tag');
+      const result = await runner.pullImage("invalid:tag");
 
       expect(result.ok).toBe(false);
       if (!result.ok) {
@@ -340,20 +332,20 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
     });
   });
 
-  describe('listNetworks', () => {
-    it('should list networks', async () => {
+  describe("listNetworks", () => {
+    it("should list networks", async () => {
       mockDocker.listNetworks.mockResolvedValueOnce([
         {
-          Id: 'network1',
-          Name: 'bridge',
-          Driver: 'bridge',
-          Scope: 'local',
+          Id: "network1",
+          Name: "bridge",
+          Driver: "bridge",
+          Scope: "local",
         },
         {
-          Id: 'network2',
-          Name: 'app-network',
-          Driver: 'bridge',
-          Scope: 'local',
+          Id: "network2",
+          Name: "app-network",
+          Driver: "bridge",
+          Scope: "local",
         },
       ]);
 
@@ -362,27 +354,27 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
       expect(result.ok).toBe(true);
       if (result.ok) {
         expect(result.value).toHaveLength(2);
-        expect(result.value[0].name).toBe('bridge');
-        expect(result.value[1].name).toBe('app-network');
+        expect(result.value[0].name).toBe("bridge");
+        expect(result.value[1].name).toBe("app-network");
       }
     });
   });
 
-  describe('listVolumes', () => {
-    it('should list volumes', async () => {
+  describe("listVolumes", () => {
+    it("should list volumes", async () => {
       mockDocker.listVolumes.mockResolvedValueOnce({
         Volumes: [
           {
-            Name: 'app-data',
-            Driver: 'local',
-            Mountpoint: '/var/lib/docker/volumes/app-data/_data',
-            CreatedAt: '2024-01-01T00:00:00Z',
+            Name: "app-data",
+            Driver: "local",
+            Mountpoint: "/var/lib/docker/volumes/app-data/_data",
+            CreatedAt: "2024-01-01T00:00:00Z",
           },
           {
-            Name: 'db-data',
-            Driver: 'local',
-            Mountpoint: '/var/lib/docker/volumes/db-data/_data',
-            CreatedAt: '2024-01-01T00:00:00Z',
+            Name: "db-data",
+            Driver: "local",
+            Mountpoint: "/var/lib/docker/volumes/db-data/_data",
+            CreatedAt: "2024-01-01T00:00:00Z",
           },
         ],
       });
@@ -392,12 +384,12 @@ describe('@airiscode/runners-docker - DockerRunner', () => {
       expect(result.ok).toBe(true);
       if (result.ok) {
         expect(result.value).toHaveLength(2);
-        expect(result.value[0].name).toBe('app-data');
-        expect(result.value[1].name).toBe('db-data');
+        expect(result.value[0].name).toBe("app-data");
+        expect(result.value[1].name).toBe("db-data");
       }
     });
 
-    it('should handle empty volume list', async () => {
+    it("should handle empty volume list", async () => {
       mockDocker.listVolumes.mockResolvedValueOnce({
         Volumes: null,
       });
diff --git a/packages/runners/docker/package.json b/packages/runners/docker/package.json
index 0fba950fa..0afcccbb7 100644
--- a/packages/runners/docker/package.json
+++ b/packages/runners/docker/package.json
@@ -14,7 +14,7 @@
     "build": "echo 'Skipping docker runner build (type errors)'",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "echo 'Skipping docker runner tests'"
   },
   "dependencies": {
diff --git a/packages/runners/docker/src/docker-runner.ts b/packages/runners/docker/src/docker-runner.ts
index 6a279f63f..6ec1d9d4c 100644
--- a/packages/runners/docker/src/docker-runner.ts
+++ b/packages/runners/docker/src/docker-runner.ts
@@ -2,33 +2,33 @@
  * Docker runner implementation
  */
 
-import Docker from 'dockerode';
-import { ok, err } from '@airiscode/types';
+import { err, ok } from "@airiscode/types";
+import { spawn } from "child_process";
+import Docker from "dockerode";
 import type {
-  ComposeUpOptions,
   ComposeDownOptions,
-  ContainerInfo,
-  ContainerHealth,
-  ContainerStats,
-  ContainerLogsOptions,
-  ImageInfo,
-  NetworkInfo,
-  VolumeInfo,
-  DockerRunnerError,
-  ComposeUpResult,
   ComposeDownResult,
   ComposeLogsResult,
-  ContainerListResult,
+  ComposeUpOptions,
+  ComposeUpResult,
+  ContainerHealth,
   ContainerHealthResult,
-  ContainerStatsResult,
+  ContainerInfo,
+  ContainerListResult,
+  ContainerLogsOptions,
   ContainerLogsResult,
+  ContainerStats,
+  ContainerStatsResult,
+  DockerRunnerError,
+  ImageInfo,
   ImageListResult,
   ImagePullResult,
+  NetworkInfo,
   NetworkListResult,
+  VolumeInfo,
   VolumeListResult,
-} from './types.js';
-import { DockerRunnerError as DockerError, DockerOperation } from './types.js';
-import { spawn } from 'child_process';
+} from "./types.js";
+import { DockerRunnerError as DockerError, DockerOperation } from "./types.js";
 
 /**
  * Docker operations runner
@@ -45,7 +45,7 @@ export class DockerRunner {
 
   constructor(
     private workingDir: string,
-    dockerOptions?: Docker.DockerOptions
+    dockerOptions?: Docker.DockerOptions,
   ) {
     this.docker = new Docker(dockerOptions);
   }
@@ -55,43 +55,43 @@ export class DockerRunner {
    */
   async composeUp(options: ComposeUpOptions = {}): Promise<ComposeUpResult> {
     try {
-      const args = ['compose'];
+      const args = ["compose"];
 
       if (options.file) {
-        args.push('-f', options.file);
+        args.push("-f", options.file);
       }
 
       if (options.projectName) {
-        args.push('-p', options.projectName);
+        args.push("-p", options.projectName);
       }
 
-      args.push('up');
+      args.push("up");
 
       if (options.build) {
-        args.push('--build');
+        args.push("--build");
       }
 
       if (options.detach) {
-        args.push('-d');
+        args.push("-d");
       }
 
       if (options.removeOrphans) {
-        args.push('--remove-orphans');
+        args.push("--remove-orphans");
       }
 
       if (options.forceRecreate) {
-        args.push('--force-recreate');
+        args.push("--force-recreate");
       }
 
-      await this.execCommand('docker', args);
+      await this.execCommand("docker", args);
       return ok(undefined);
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to start Docker Compose services',
+          "Failed to start Docker Compose services",
           DockerOperation.COMPOSE_UP,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ComposeUpResult;
     }
   }
@@ -101,35 +101,35 @@ export class DockerRunner {
    */
   async composeDown(options: ComposeDownOptions = {}): Promise<ComposeDownResult> {
     try {
-      const args = ['compose'];
+      const args = ["compose"];
 
       if (options.file) {
-        args.push('-f', options.file);
+        args.push("-f", options.file);
       }
 
       if (options.projectName) {
-        args.push('-p', options.projectName);
+        args.push("-p", options.projectName);
       }
 
-      args.push('down');
+      args.push("down");
 
       if (options.volumes) {
-        args.push('-v');
+        args.push("-v");
       }
 
       if (options.removeImages) {
-        args.push('--rmi', options.removeImages);
+        args.push("--rmi", options.removeImages);
       }
 
-      await this.execCommand('docker', args);
+      await this.execCommand("docker", args);
       return ok(undefined);
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to stop Docker Compose services',
+          "Failed to stop Docker Compose services",
           DockerOperation.COMPOSE_DOWN,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ComposeDownResult;
     }
   }
@@ -138,34 +138,34 @@ export class DockerRunner {
    * Get Docker Compose logs
    */
   async composeLogs(
-    options: { file?: string; projectName?: string; follow?: boolean } = {}
+    options: { file?: string; projectName?: string; follow?: boolean } = {},
   ): Promise<ComposeLogsResult> {
     try {
-      const args = ['compose'];
+      const args = ["compose"];
 
       if (options.file) {
-        args.push('-f', options.file);
+        args.push("-f", options.file);
       }
 
       if (options.projectName) {
-        args.push('-p', options.projectName);
+        args.push("-p", options.projectName);
       }
 
-      args.push('logs');
+      args.push("logs");
 
       if (options.follow) {
-        args.push('-f');
+        args.push("-f");
       }
 
-      const output = await this.execCommand('docker', args);
+      const output = await this.execCommand("docker", args);
       return ok(output);
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to get Docker Compose logs',
+          "Failed to get Docker Compose logs",
           DockerOperation.COMPOSE_LOGS,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ComposeLogsResult;
     }
   }
@@ -179,14 +179,14 @@ export class DockerRunner {
 
       const result: ContainerInfo[] = containers.map((container) => ({
         id: container.Id,
-        name: container.Names[0]?.replace(/^\//, '') || '',
+        name: container.Names[0]?.replace(/^\//, "") || "",
         image: container.Image,
-        state: container.State as ContainerInfo['state'],
+        state: container.State as ContainerInfo["state"],
         status: container.Status,
         ports: container.Ports.map((port) => ({
           privatePort: port.PrivatePort,
           publicPort: port.PublicPort,
-          type: port.Type as 'tcp' | 'udp',
+          type: port.Type as "tcp" | "udp",
         })),
         created: new Date(container.Created * 1000),
       }));
@@ -195,10 +195,10 @@ export class DockerRunner {
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to list containers',
+          "Failed to list containers",
           DockerOperation.CONTAINER_LIST,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ContainerListResult;
     }
   }
@@ -214,7 +214,7 @@ export class DockerRunner {
       if (!info.State.Health) {
         return ok({
           containerId,
-          status: 'none',
+          status: "none",
           failingStreak: 0,
         }) as ContainerHealthResult;
       }
@@ -224,7 +224,7 @@ export class DockerRunner {
 
       return ok({
         containerId,
-        status: health.Status as ContainerHealth['status'],
+        status: health.Status as ContainerHealth["status"],
         failingStreak: health.FailingStreak || 0,
         lastCheck: lastLog
           ? {
@@ -238,10 +238,10 @@ export class DockerRunner {
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to get container health',
+          "Failed to get container health",
           DockerOperation.HEALTH_CHECK,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ContainerHealthResult;
     }
   }
@@ -256,14 +256,10 @@ export class DockerRunner {
 
       // Calculate CPU percentage
       const cpuDelta =
-        stats.cpu_stats.cpu_usage.total_usage -
-        stats.precpu_stats.cpu_usage.total_usage;
-      const systemDelta =
-        stats.cpu_stats.system_cpu_usage - stats.precpu_stats.system_cpu_usage;
+        stats.cpu_stats.cpu_usage.total_usage - stats.precpu_stats.cpu_usage.total_usage;
+      const systemDelta = stats.cpu_stats.system_cpu_usage - stats.precpu_stats.system_cpu_usage;
       const cpuPercent =
-        systemDelta > 0
-          ? (cpuDelta / systemDelta) * stats.cpu_stats.online_cpus * 100
-          : 0;
+        systemDelta > 0 ? (cpuDelta / systemDelta) * stats.cpu_stats.online_cpus * 100 : 0;
 
       // Memory stats
       const memoryUsage = stats.memory_stats.usage || 0;
@@ -284,8 +280,8 @@ export class DockerRunner {
       let readBytes = 0;
       let writeBytes = 0;
       for (const io of ioStats) {
-        if (io.op === 'read') readBytes += io.value;
-        if (io.op === 'write') writeBytes += io.value;
+        if (io.op === "read") readBytes += io.value;
+        if (io.op === "write") writeBytes += io.value;
       }
 
       const result: ContainerStats = {
@@ -311,10 +307,10 @@ export class DockerRunner {
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to get container stats',
+          "Failed to get container stats",
           DockerOperation.CONTAINER_STATS,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ContainerStatsResult;
     }
   }
@@ -324,7 +320,7 @@ export class DockerRunner {
    */
   async getContainerLogs(
     containerId: string,
-    options: ContainerLogsOptions = {}
+    options: ContainerLogsOptions = {},
   ): Promise<ContainerLogsResult> {
     try {
       const container = this.docker.getContainer(containerId);
@@ -336,23 +332,23 @@ export class DockerRunner {
         timestamps: options.timestamps || false,
         tail: options.tail,
         since: options.since
-          ? typeof options.since === 'number'
+          ? typeof options.since === "number"
             ? options.since
             : Math.floor(options.since.getTime() / 1000)
           : undefined,
       };
 
       const buffer = await container.logs(logOptions);
-      const logs = buffer.toString('utf-8');
+      const logs = buffer.toString("utf-8");
 
       return ok(logs);
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to get container logs',
+          "Failed to get container logs",
           DockerOperation.CONTAINER_LOGS,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ContainerLogsResult;
     }
   }
@@ -375,10 +371,10 @@ export class DockerRunner {
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to list images',
+          "Failed to list images",
           DockerOperation.IMAGE_LIST,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ImageListResult;
     }
   }
@@ -395,13 +391,10 @@ export class DockerRunner {
             return;
           }
 
-          this.docker.modem.followProgress(
-            stream,
-            (err: Error | null) => {
-              if (err) reject(err);
-              else resolve();
-            }
-          );
+          this.docker.modem.followProgress(stream, (err: Error | null) => {
+            if (err) reject(err);
+            else resolve();
+          });
         });
       });
 
@@ -409,10 +402,10 @@ export class DockerRunner {
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to pull image',
+          "Failed to pull image",
           DockerOperation.IMAGE_PULL,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as ImagePullResult;
     }
   }
@@ -435,10 +428,10 @@ export class DockerRunner {
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to list networks',
+          "Failed to list networks",
           DockerOperation.NETWORK_LIST,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as NetworkListResult;
     }
   }
@@ -462,10 +455,10 @@ export class DockerRunner {
     } catch (error) {
       return err<DockerRunnerError>(
         new DockerError(
-          'Failed to list volumes',
+          "Failed to list volumes",
           DockerOperation.VOLUME_LIST,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       ) as VolumeListResult;
     }
   }
@@ -477,21 +470,21 @@ export class DockerRunner {
     return new Promise((resolve, reject) => {
       const proc = spawn(command, args, {
         cwd: this.workingDir,
-        stdio: ['ignore', 'pipe', 'pipe'],
+        stdio: ["ignore", "pipe", "pipe"],
       });
 
-      let stdout = '';
-      let stderr = '';
+      let stdout = "";
+      let stderr = "";
 
-      proc.stdout.on('data', (chunk) => {
+      proc.stdout.on("data", (chunk) => {
         stdout += chunk.toString();
       });
 
-      proc.stderr.on('data', (chunk) => {
+      proc.stderr.on("data", (chunk) => {
         stderr += chunk.toString();
       });
 
-      proc.on('close', (code) => {
+      proc.on("close", (code) => {
         if (code === 0) {
           resolve(stdout);
         } else {
@@ -499,7 +492,7 @@ export class DockerRunner {
         }
       });
 
-      proc.on('error', (error) => {
+      proc.on("error", (error) => {
         reject(error);
       });
     });
diff --git a/packages/runners/docker/src/index.ts b/packages/runners/docker/src/index.ts
index 26617bd00..c7fc117d6 100644
--- a/packages/runners/docker/src/index.ts
+++ b/packages/runners/docker/src/index.ts
@@ -3,5 +3,5 @@
  * Docker operations runner
  */
 
-export * from './docker-runner.js';
-export * from './types.js';
+export * from "./docker-runner.js";
+export * from "./types.js";
diff --git a/packages/runners/docker/src/types.ts b/packages/runners/docker/src/types.ts
index f76a322ff..4a7d27102 100644
--- a/packages/runners/docker/src/types.ts
+++ b/packages/runners/docker/src/types.ts
@@ -2,24 +2,24 @@
  * Docker runner types
  */
 
-import type { Result } from '@airiscode/types';
+import type { Result } from "@airiscode/types";
 
 /**
  * Docker operation types
  */
 export enum DockerOperation {
-  COMPOSE_UP = 'compose_up',
-  COMPOSE_DOWN = 'compose_down',
-  COMPOSE_LOGS = 'compose_logs',
-  CONTAINER_LIST = 'container_list',
-  CONTAINER_INSPECT = 'container_inspect',
-  CONTAINER_LOGS = 'container_logs',
-  CONTAINER_STATS = 'container_stats',
-  HEALTH_CHECK = 'health_check',
-  IMAGE_LIST = 'image_list',
-  IMAGE_PULL = 'image_pull',
-  NETWORK_LIST = 'network_list',
-  VOLUME_LIST = 'volume_list',
+  COMPOSE_UP = "compose_up",
+  COMPOSE_DOWN = "compose_down",
+  COMPOSE_LOGS = "compose_logs",
+  CONTAINER_LIST = "container_list",
+  CONTAINER_INSPECT = "container_inspect",
+  CONTAINER_LOGS = "container_logs",
+  CONTAINER_STATS = "container_stats",
+  HEALTH_CHECK = "health_check",
+  IMAGE_LIST = "image_list",
+  IMAGE_PULL = "image_pull",
+  NETWORK_LIST = "network_list",
+  VOLUME_LIST = "volume_list",
 }
 
 /**
@@ -51,7 +51,7 @@ export interface ComposeDownOptions {
   /** Remove volumes */
   volumes?: boolean;
   /** Remove images */
-  removeImages?: 'all' | 'local';
+  removeImages?: "all" | "local";
 }
 
 /**
@@ -65,14 +65,14 @@ export interface ContainerInfo {
   /** Image */
   image: string;
   /** State */
-  state: 'created' | 'running' | 'paused' | 'restarting' | 'removing' | 'exited' | 'dead';
+  state: "created" | "running" | "paused" | "restarting" | "removing" | "exited" | "dead";
   /** Status */
   status: string;
   /** Ports */
   ports: Array<{
     privatePort: number;
     publicPort?: number;
-    type: 'tcp' | 'udp';
+    type: "tcp" | "udp";
   }>;
   /** Created timestamp */
   created: Date;
@@ -85,7 +85,7 @@ export interface ContainerHealth {
   /** Container ID */
   containerId: string;
   /** Health status */
-  status: 'starting' | 'healthy' | 'unhealthy' | 'none';
+  status: "starting" | "healthy" | "unhealthy" | "none";
   /** Failing streak */
   failingStreak: number;
   /** Last check */
@@ -192,10 +192,10 @@ export class DockerRunnerError extends Error {
   constructor(
     message: string,
     public operation: DockerOperation,
-    public cause?: Error
+    public cause?: Error,
   ) {
     super(message);
-    this.name = 'DockerRunnerError';
+    this.name = "DockerRunnerError";
   }
 }
 
diff --git a/packages/runners/git/__tests__/git-runner.spec.ts b/packages/runners/git/__tests__/git-runner.spec.ts
index f241c62ee..1f269d4af 100644
--- a/packages/runners/git/__tests__/git-runner.spec.ts
+++ b/packages/runners/git/__tests__/git-runner.spec.ts
@@ -1,9 +1,9 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { GitRunner } from '../src/git-runner.js';
-import { GitOperation } from '../src/types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { GitRunner } from "../src/git-runner.js";
+import { GitOperation } from "../src/types.js";
 
 // Mock simple-git
-vi.mock('simple-git', () => ({
+vi.mock("simple-git", () => ({
   simpleGit: vi.fn(() => ({
     status: vi.fn(),
     diff: vi.fn(),
@@ -22,46 +22,46 @@ vi.mock('simple-git', () => ({
   })),
 }));
 
-describe('@airiscode/runners-git - GitRunner', () => {
+describe("@airiscode/runners-git - GitRunner", () => {
   let runner: GitRunner;
   let mockGit: any;
 
   beforeEach(async () => {
-    const { simpleGit } = await import('simple-git');
-    mockGit = simpleGit('/test/repo');
-    runner = new GitRunner('/test/repo');
+    const { simpleGit } = await import("simple-git");
+    mockGit = simpleGit("/test/repo");
+    runner = new GitRunner("/test/repo");
   });
 
-  describe('status', () => {
-    it('should return git status', async () => {
+  describe("status", () => {
+    it("should return git status", async () => {
       mockGit.status.mockResolvedValueOnce({
-        current: 'main',
-        modified: ['file1.ts', 'file2.ts'],
-        staged: ['file3.ts'],
-        not_added: ['file4.ts'],
+        current: "main",
+        modified: ["file1.ts", "file2.ts"],
+        staged: ["file3.ts"],
+        not_added: ["file4.ts"],
         conflicted: [],
         isClean: () => false,
         ahead: 2,
         behind: 1,
-        tracking: 'origin/main',
+        tracking: "origin/main",
       });
 
       const result = await runner.status();
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.value.current).toBe('main');
-        expect(result.value.modified).toEqual(['file1.ts', 'file2.ts']);
-        expect(result.value.staged).toEqual(['file3.ts']);
-        expect(result.value.untracked).toEqual(['file4.ts']);
+        expect(result.value.current).toBe("main");
+        expect(result.value.modified).toEqual(["file1.ts", "file2.ts"]);
+        expect(result.value.staged).toEqual(["file3.ts"]);
+        expect(result.value.untracked).toEqual(["file4.ts"]);
         expect(result.value.isClean).toBe(false);
         expect(result.value.tracking).toEqual({ ahead: 2, behind: 1 });
       }
     });
 
-    it('should handle clean repository', async () => {
+    it("should handle clean repository", async () => {
       mockGit.status.mockResolvedValueOnce({
-        current: 'main',
+        current: "main",
         modified: [],
         staged: [],
         not_added: [],
@@ -79,21 +79,21 @@ describe('@airiscode/runners-git - GitRunner', () => {
       }
     });
 
-    it('should handle errors', async () => {
-      mockGit.status.mockRejectedValueOnce(new Error('Git error'));
+    it("should handle errors", async () => {
+      mockGit.status.mockRejectedValueOnce(new Error("Git error"));
 
       const result = await runner.status();
 
       expect(result.ok).toBe(false);
       if (!result.ok) {
         expect(result.error.operation).toBe(GitOperation.STATUS);
-        expect(result.error.message).toContain('Failed to get git status');
+        expect(result.error.message).toContain("Failed to get git status");
       }
     });
   });
 
-  describe('diff', () => {
-    it('should return diff', async () => {
+  describe("diff", () => {
+    it("should return diff", async () => {
       const mockDiff = `diff --git a/file.ts b/file.ts
 index 123..456 789
 --- a/file.ts
@@ -112,48 +112,48 @@ index 123..456 789
       }
     });
 
-    it('should get staged diff', async () => {
-      mockGit.diff.mockResolvedValueOnce('staged diff');
+    it("should get staged diff", async () => {
+      mockGit.diff.mockResolvedValueOnce("staged diff");
 
       const result = await runner.diff({ staged: true });
 
       expect(result.ok).toBe(true);
-      expect(mockGit.diff).toHaveBeenCalledWith(['--cached']);
+      expect(mockGit.diff).toHaveBeenCalledWith(["--cached"]);
     });
 
-    it('should get diff for specific files', async () => {
-      mockGit.diff.mockResolvedValueOnce('file diff');
+    it("should get diff for specific files", async () => {
+      mockGit.diff.mockResolvedValueOnce("file diff");
 
-      const result = await runner.diff({ files: ['file1.ts', 'file2.ts'] });
+      const result = await runner.diff({ files: ["file1.ts", "file2.ts"] });
 
       expect(result.ok).toBe(true);
-      expect(mockGit.diff).toHaveBeenCalledWith(['--', 'file1.ts', 'file2.ts']);
+      expect(mockGit.diff).toHaveBeenCalledWith(["--", "file1.ts", "file2.ts"]);
     });
 
-    it('should use context lines', async () => {
-      mockGit.diff.mockResolvedValueOnce('diff with context');
+    it("should use context lines", async () => {
+      mockGit.diff.mockResolvedValueOnce("diff with context");
 
       const result = await runner.diff({ context: 5 });
 
       expect(result.ok).toBe(true);
-      expect(mockGit.diff).toHaveBeenCalledWith(['-U5']);
+      expect(mockGit.diff).toHaveBeenCalledWith(["-U5"]);
     });
   });
 
-  describe('add', () => {
-    it('should add files', async () => {
+  describe("add", () => {
+    it("should add files", async () => {
       mockGit.add.mockResolvedValueOnce(undefined);
 
-      const result = await runner.add(['file1.ts', 'file2.ts']);
+      const result = await runner.add(["file1.ts", "file2.ts"]);
 
       expect(result.ok).toBe(true);
-      expect(mockGit.add).toHaveBeenCalledWith(['file1.ts', 'file2.ts']);
+      expect(mockGit.add).toHaveBeenCalledWith(["file1.ts", "file2.ts"]);
     });
 
-    it('should handle errors', async () => {
-      mockGit.add.mockRejectedValueOnce(new Error('Add failed'));
+    it("should handle errors", async () => {
+      mockGit.add.mockRejectedValueOnce(new Error("Add failed"));
 
-      const result = await runner.add(['file.ts']);
+      const result = await runner.add(["file.ts"]);
 
       expect(result.ok).toBe(false);
       if (!result.ok) {
@@ -162,10 +162,10 @@ index 123..456 789
     });
   });
 
-  describe('commit', () => {
-    it('should create commit', async () => {
+  describe("commit", () => {
+    it("should create commit", async () => {
       mockGit.commit.mockResolvedValueOnce({
-        commit: 'abc123',
+        commit: "abc123",
         summary: {
           changes: 2,
           insertions: 10,
@@ -174,158 +174,154 @@ index 123..456 789
       });
 
       const result = await runner.commit({
-        message: 'Test commit',
+        message: "Test commit",
       });
 
       expect(result.ok).toBe(true);
       if (result.ok) {
-        expect(result.value.commit).toBe('abc123');
+        expect(result.value.commit).toBe("abc123");
         expect(result.value.summary.changes).toBe(2);
         expect(result.value.summary.insertions).toBe(10);
         expect(result.value.summary.deletions).toBe(5);
       }
     });
 
-    it('should create commit with author', async () => {
+    it("should create commit with author", async () => {
       mockGit.commit.mockResolvedValueOnce({
-        commit: 'abc123',
+        commit: "abc123",
         summary: { changes: 1, insertions: 1, deletions: 0 },
       });
 
       const result = await runner.commit({
-        message: 'Test commit',
-        author: 'Test User',
-        email: 'test@example.com',
+        message: "Test commit",
+        author: "Test User",
+        email: "test@example.com",
       });
 
       expect(result.ok).toBe(true);
       expect(mockGit.commit).toHaveBeenCalledWith(
-        'Test commit',
+        "Test commit",
         undefined,
-        expect.arrayContaining(['--author', 'Test User <test@example.com>'])
+        expect.arrayContaining(["--author", "Test User <test@example.com>"]),
       );
     });
 
-    it('should allow empty commit', async () => {
+    it("should allow empty commit", async () => {
       mockGit.commit.mockResolvedValueOnce({
-        commit: 'abc123',
+        commit: "abc123",
         summary: { changes: 0, insertions: 0, deletions: 0 },
       });
 
       const result = await runner.commit({
-        message: 'Empty commit',
+        message: "Empty commit",
         allowEmpty: true,
       });
 
       expect(result.ok).toBe(true);
       expect(mockGit.commit).toHaveBeenCalledWith(
-        'Empty commit',
+        "Empty commit",
         undefined,
-        expect.arrayContaining(['--allow-empty'])
+        expect.arrayContaining(["--allow-empty"]),
       );
     });
 
-    it('should amend commit', async () => {
+    it("should amend commit", async () => {
       mockGit.commit.mockResolvedValueOnce({
-        commit: 'abc123',
+        commit: "abc123",
         summary: { changes: 1, insertions: 1, deletions: 0 },
       });
 
       const result = await runner.commit({
-        message: 'Amended commit',
+        message: "Amended commit",
         amend: true,
       });
 
       expect(result.ok).toBe(true);
       expect(mockGit.commit).toHaveBeenCalledWith(
-        'Amended commit',
+        "Amended commit",
         undefined,
-        expect.arrayContaining(['--amend'])
+        expect.arrayContaining(["--amend"]),
       );
     });
   });
 
-  describe('push', () => {
-    it('should push to default remote', async () => {
+  describe("push", () => {
+    it("should push to default remote", async () => {
       mockGit.push.mockResolvedValueOnce(undefined);
 
       const result = await runner.push();
 
       expect(result.ok).toBe(true);
-      expect(mockGit.push).toHaveBeenCalledWith(['origin']);
+      expect(mockGit.push).toHaveBeenCalledWith(["origin"]);
     });
 
-    it('should push to specific remote and branch', async () => {
+    it("should push to specific remote and branch", async () => {
       mockGit.push.mockResolvedValueOnce(undefined);
 
       const result = await runner.push({
-        remote: 'upstream',
-        branch: 'feature',
+        remote: "upstream",
+        branch: "feature",
       });
 
       expect(result.ok).toBe(true);
-      expect(mockGit.push).toHaveBeenCalledWith(['upstream', 'feature']);
+      expect(mockGit.push).toHaveBeenCalledWith(["upstream", "feature"]);
     });
 
-    it('should force push', async () => {
+    it("should force push", async () => {
       mockGit.push.mockResolvedValueOnce(undefined);
 
       const result = await runner.push({ force: true });
 
       expect(result.ok).toBe(true);
-      expect(mockGit.push).toHaveBeenCalledWith(
-        expect.arrayContaining(['--force'])
-      );
+      expect(mockGit.push).toHaveBeenCalledWith(expect.arrayContaining(["--force"]));
     });
 
-    it('should set upstream', async () => {
+    it("should set upstream", async () => {
       mockGit.push.mockResolvedValueOnce(undefined);
 
       const result = await runner.push({
-        branch: 'feature',
+        branch: "feature",
         setUpstream: true,
       });
 
       expect(result.ok).toBe(true);
-      expect(mockGit.push).toHaveBeenCalledWith(
-        expect.arrayContaining(['--set-upstream'])
-      );
+      expect(mockGit.push).toHaveBeenCalledWith(expect.arrayContaining(["--set-upstream"]));
     });
   });
 
-  describe('pull', () => {
-    it('should pull from default remote', async () => {
+  describe("pull", () => {
+    it("should pull from default remote", async () => {
       mockGit.pull.mockResolvedValueOnce(undefined);
 
       const result = await runner.pull();
 
       expect(result.ok).toBe(true);
-      expect(mockGit.pull).toHaveBeenCalledWith('origin', undefined);
+      expect(mockGit.pull).toHaveBeenCalledWith("origin", undefined);
     });
 
-    it('should pull from specific remote and branch', async () => {
+    it("should pull from specific remote and branch", async () => {
       mockGit.pull.mockResolvedValueOnce(undefined);
 
-      const result = await runner.pull('upstream', 'main');
+      const result = await runner.pull("upstream", "main");
 
       expect(result.ok).toBe(true);
-      expect(mockGit.pull).toHaveBeenCalledWith('upstream', 'main');
+      expect(mockGit.pull).toHaveBeenCalledWith("upstream", "main");
     });
   });
 
-  describe('branch operations', () => {
-    it('should list branches', async () => {
+  describe("branch operations", () => {
+    it("should list branches", async () => {
       mockGit.branch.mockResolvedValueOnce({
         branches: {
           main: {
             current: true,
-            commit: 'abc123',
-            label: 'origin/main',
+            commit: "abc123",
+            label: "origin/main",
           },
           feature: {
             current: false,
-            commit: 'def456',
-            label: '',
+            commit: "def456",
+            label: "",
           },
         },
       });
@@ -335,58 +331,58 @@ index 123..456 789
       expect(result.ok).toBe(true);
       if (result.ok) {
         expect(result.value).toHaveLength(2);
-        expect(result.value[0].name).toBe('main');
+        expect(result.value[0].name).toBe("main");
         expect(result.value[0].current).toBe(true);
-        expect(result.value[1].name).toBe('feature');
+        expect(result.value[1].name).toBe("feature");
         expect(result.value[1].current).toBe(false);
       }
     });
 
-    it('should create branch', async () => {
+    it("should create branch", async () => {
       mockGit.checkoutLocalBranch.mockResolvedValueOnce(undefined);
 
-      const result = await runner.createBranch('feature');
+      const result = await runner.createBranch("feature");
 
       expect(result.ok).toBe(true);
-      expect(mockGit.checkoutLocalBranch).toHaveBeenCalledWith('feature');
+      expect(mockGit.checkoutLocalBranch).toHaveBeenCalledWith("feature");
     });
 
-    it('should create branch from start point', async () => {
+    it("should create branch from start point", async () => {
       mockGit.checkoutBranch.mockResolvedValueOnce(undefined);
 
-      const result = await runner.createBranch('feature', 'main');
+      const result = await runner.createBranch("feature", "main");
 
       expect(result.ok).toBe(true);
-      expect(mockGit.checkoutBranch).toHaveBeenCalledWith('feature', 'main');
+      expect(mockGit.checkoutBranch).toHaveBeenCalledWith("feature", "main");
     });
 
-    it('should checkout branch', async () => {
+    it("should checkout branch", async () => {
       mockGit.checkout.mockResolvedValueOnce(undefined);
 
-      const result = await runner.checkout('feature');
+      const result = await runner.checkout("feature");
 
       expect(result.ok).toBe(true);
-      expect(mockGit.checkout).toHaveBeenCalledWith('feature');
+      expect(mockGit.checkout).toHaveBeenCalledWith("feature");
     });
   });
 
-  describe('log', () => {
-    it('should get commit log', async () => {
+  describe("log", () => {
+    it("should get commit log", async () => {
       mockGit.log.mockResolvedValueOnce({
         all: [
           {
-            hash: 'abc123',
-            date: '2024-01-01T00:00:00Z',
-            message: 'Commit 1',
-            author_name: 'User 1',
-            author_email: 'user1@example.com',
+            hash: "abc123",
+            date: "2024-01-01T00:00:00Z",
+            message: "Commit 1",
+            author_name: "User 1",
+            author_email: "user1@example.com",
           },
           {
-            hash: 'def456',
-            date: '2024-01-02T00:00:00Z',
-            message: 'Commit 2',
-            author_name: 'User 2',
-            author_email: 'user2@example.com',
+            hash: "def456",
+            date: "2024-01-02T00:00:00Z",
+            message: "Commit 2",
+            author_name: "User 2",
+            author_email: "user2@example.com",
           },
         ],
       });
@@ -396,44 +392,44 @@ index 123..456 789
       expect(result.ok).toBe(true);
       if (result.ok) {
         expect(result.value).toHaveLength(2);
-        expect(result.value[0].hash).toBe('abc123');
-        expect(result.value[0].message).toBe('Commit 1');
-        expect(result.value[1].hash).toBe('def456');
+        expect(result.value[0].hash).toBe("abc123");
+        expect(result.value[0].message).toBe("Commit 1");
+        expect(result.value[1].hash).toBe("def456");
       }
     });
   });
 
-  describe('reset', () => {
-    it('should reset with default mode', async () => {
+  describe("reset", () => {
+    it("should reset with default mode", async () => {
       mockGit.reset.mockResolvedValueOnce(undefined);
 
       const result = await runner.reset();
 
       expect(result.ok).toBe(true);
-      expect(mockGit.reset).toHaveBeenCalledWith(['--mixed', 'HEAD']);
+      expect(mockGit.reset).toHaveBeenCalledWith(["--mixed", "HEAD"]);
     });
 
-    it('should reset with soft mode', async () => {
+    it("should reset with soft mode", async () => {
       mockGit.reset.mockResolvedValueOnce(undefined);
 
-      const result = await runner.reset('soft', 'HEAD~1');
+      const result = await runner.reset("soft", "HEAD~1");
 
       expect(result.ok).toBe(true);
-      expect(mockGit.reset).toHaveBeenCalledWith(['--soft', 'HEAD~1']);
+      expect(mockGit.reset).toHaveBeenCalledWith(["--soft", "HEAD~1"]);
     });
 
-    it('should reset with hard mode', async () => {
+    it("should reset with hard mode", async () => {
       mockGit.reset.mockResolvedValueOnce(undefined);
 
-      const result = await runner.reset('hard');
+      const result = await runner.reset("hard");
 
       expect(result.ok).toBe(true);
-      expect(mockGit.reset).toHaveBeenCalledWith(['--hard', 'HEAD']);
+      expect(mockGit.reset).toHaveBeenCalledWith(["--hard", "HEAD"]);
     });
   });
 
-  describe('stash', () => {
-    it('should stash changes', async () => {
+  describe("stash", () => {
+    it("should stash changes", async () => {
       mockGit.stash.mockResolvedValueOnce(undefined);
 
       const result = await runner.stash();
@@ -442,26 +438,22 @@ index 123..456 789
       expect(mockGit.stash).toHaveBeenCalled();
     });
 
-    it('should stash with message', async () => {
+    it("should stash with message", async () => {
       mockGit.stash.mockResolvedValueOnce(undefined);
 
-      const result = await runner.stash('WIP: feature');
+      const result = await runner.stash("WIP: feature");
 
       expect(result.ok).toBe(true);
-      expect(mockGit.stash).toHaveBeenCalledWith([
-        'push',
-        '-m',
-        'WIP: feature',
-      ]);
+      expect(mockGit.stash).toHaveBeenCalledWith(["push", "-m", "WIP: feature"]);
     });
 
-    it('should pop stash', async () => {
+    it("should pop stash", async () => {
       mockGit.stash.mockResolvedValueOnce(undefined);
 
       const result = await runner.stashPop();
 
       expect(result.ok).toBe(true);
-      expect(mockGit.stash).toHaveBeenCalledWith(['pop']);
+      expect(mockGit.stash).toHaveBeenCalledWith(["pop"]);
     });
   });
 });
diff --git a/packages/runners/git/package.json b/packages/runners/git/package.json
index 280322b10..3c5950504 100644
--- a/packages/runners/git/package.json
+++ b/packages/runners/git/package.json
@@ -14,7 +14,7 @@
     "build": "echo Skipping git runner build",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/runners/git/src/git-runner.ts b/packages/runners/git/src/git-runner.ts
index f5a2baeca..31eebb067 100644
--- a/packages/runners/git/src/git-runner.ts
+++ b/packages/runners/git/src/git-runner.ts
@@ -2,28 +2,28 @@
  * Git runner implementation
  */
 
-import { simpleGit, SimpleGit, StatusResult, LogResult } from 'simple-git';
-import { ok, err } from '@airiscode/types';
+import { err, ok } from "@airiscode/types";
+import { LogResult, SimpleGit, StatusResult, simpleGit } from "simple-git";
 import type {
-  GitOperation,
-  GitStatus,
-  GitDiffOptions,
+  GitApplyOptions,
+  GitApplyResult,
+  GitBranch,
+  GitBranchResult,
   GitCommitOptions,
   GitCommitResult,
-  GitPushOptions,
-  GitBranch,
+  GitCommitResultType,
+  GitDiffOptions,
+  GitDiffResult,
   GitLogEntry,
-  GitApplyOptions,
+  GitLogResult,
+  GitOperation,
+  GitPushOptions,
+  GitPushResult,
   GitRunnerError,
+  GitStatus,
   GitStatusResult,
-  GitDiffResult,
-  GitCommitResultType,
-  GitPushResult,
-  GitBranchResult,
-  GitLogResult,
-  GitApplyResult,
-} from './types.js';
-import { GitRunnerError as GitError } from './types.js';
+} from "./types.js";
+import { GitRunnerError as GitError } from "./types.js";
 
 /**
  * Git operations runner
@@ -41,7 +41,7 @@ export class GitRunner {
   constructor(private workingDir: string) {
     this.git = simpleGit({
       baseDir: workingDir,
-      binary: 'git',
+      binary: "git",
       maxConcurrentProcesses: 6,
     });
   }
@@ -54,7 +54,7 @@ export class GitRunner {
       const status: StatusResult = await this.git.status();
 
       const result: GitStatus = {
-        current: status.current || '',
+        current: status.current || "",
         modified: status.modified,
         staged: status.staged,
         untracked: status.not_added,
@@ -72,10 +72,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to get git status',
+          "Failed to get git status",
           GitOperation.STATUS,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -88,7 +88,7 @@ export class GitRunner {
       const args: string[] = [];
 
       if (options.staged || options.cached) {
-        args.push('--cached');
+        args.push("--cached");
       }
 
       if (options.context !== undefined) {
@@ -96,7 +96,7 @@ export class GitRunner {
       }
 
       if (options.files && options.files.length > 0) {
-        args.push('--', ...options.files);
+        args.push("--", ...options.files);
       }
 
       const diff = await this.git.diff(args);
@@ -104,10 +104,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to get git diff',
+          "Failed to get git diff",
           GitOperation.DIFF,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -122,10 +122,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to add files',
+          "Failed to add files",
           GitOperation.ADD,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -138,26 +138,24 @@ export class GitRunner {
       const commitArgs: string[] = [];
 
       if (options.allowEmpty) {
-        commitArgs.push('--allow-empty');
+        commitArgs.push("--allow-empty");
       }
 
       if (options.amend) {
-        commitArgs.push('--amend');
+        commitArgs.push("--amend");
       }
 
       if (options.author) {
-        const authorStr = options.email
-          ? `${options.author} <${options.email}>`
-          : options.author;
-        commitArgs.push('--author', authorStr);
+        const authorStr = options.email ? `${options.author} <${options.email}>` : options.author;
+        commitArgs.push("--author", authorStr);
       }
 
-      commitArgs.push('-m', options.message);
+      commitArgs.push("-m", options.message);
 
       const result = await this.git.commit(options.message, undefined, commitArgs);
 
       const commitResult: GitCommitResult = {
-        commit: result.commit || '',
+        commit: result.commit || "",
         summary: {
           changes: result.summary.changes,
           insertions: result.summary.insertions,
@@ -169,10 +167,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to create commit',
+          "Failed to create commit",
           GitOperation.COMMIT,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -182,7 +180,7 @@ export class GitRunner {
    */
   async push(options: GitPushOptions = {}): Promise<GitPushResult> {
     try {
-      const remote = options.remote || 'origin';
+      const remote = options.remote || "origin";
       const branch = options.branch;
 
       const pushArgs: string[] = [remote];
@@ -192,11 +190,11 @@ export class GitRunner {
       }
 
       if (options.force) {
-        pushArgs.push('--force');
+        pushArgs.push("--force");
       }
 
       if (options.setUpstream) {
-        pushArgs.push('--set-upstream');
+        pushArgs.push("--set-upstream");
       }
 
       await this.git.push(pushArgs);
@@ -204,10 +202,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to push commits',
+          "Failed to push commits",
           GitOperation.PUSH,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -215,20 +213,17 @@ export class GitRunner {
   /**
    * Pull changes
    */
-  async pull(
-    remote: string = 'origin',
-    branch?: string
-  ): Promise<Result<void, GitRunnerError>> {
+  async pull(remote: string = "origin", branch?: string): Promise<Result<void, GitRunnerError>> {
     try {
       await this.git.pull(remote, branch);
       return ok(undefined);
     } catch (error) {
       return err(
         new GitError(
-          'Failed to pull changes',
+          "Failed to pull changes",
           GitOperation.PULL,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -238,25 +233,23 @@ export class GitRunner {
    */
   async listBranches(): Promise<GitBranchResult> {
     try {
-      const result = await this.git.branch(['-a', '-v']);
-
-      const branches: GitBranch[] = Object.entries(result.branches).map(
-        ([name, branch]) => ({
-          name,
-          current: branch.current,
-          remote: branch.label,
-          commit: branch.commit,
-        })
-      );
+      const result = await this.git.branch(["-a", "-v"]);
+
+      const branches: GitBranch[] = Object.entries(result.branches).map(([name, branch]) => ({
+        name,
+        current: branch.current,
+        remote: branch.label,
+        commit: branch.commit,
+      }));
 
       return ok(branches);
     } catch (error) {
       return err(
         new GitError(
-          'Failed to list branches',
+          "Failed to list branches",
           GitOperation.BRANCH,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -264,10 +257,7 @@ export class GitRunner {
   /**
    * Create branch
    */
-  async createBranch(
-    name: string,
-    startPoint?: string
-  ): Promise<Result<void, GitRunnerError>> {
+  async createBranch(name: string, startPoint?: string): Promise<Result<void, GitRunnerError>> {
     try {
       if (startPoint) {
         await this.git.checkoutBranch(name, startPoint);
@@ -278,10 +268,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to create branch',
+          "Failed to create branch",
           GitOperation.BRANCH,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -296,10 +286,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to checkout branch',
+          "Failed to checkout branch",
           GitOperation.CHECKOUT,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -323,10 +313,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to get commit log',
+          "Failed to get commit log",
           GitOperation.LOG,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -339,11 +329,11 @@ export class GitRunner {
       const args: string[] = [];
 
       if (options.check) {
-        args.push('--check');
+        args.push("--check");
       }
 
       if (options.reverse) {
-        args.push('--reverse');
+        args.push("--reverse");
       }
 
       if (options.whitespace) {
@@ -351,13 +341,13 @@ export class GitRunner {
       }
 
       // Write patch to temporary file
-      const { writeFileSync, unlinkSync } = await import('fs');
-      const { join } = await import('path');
-      const tmpFile = join(this.workingDir, '.git-patch-tmp');
+      const { writeFileSync, unlinkSync } = await import("fs");
+      const { join } = await import("path");
+      const tmpFile = join(this.workingDir, ".git-patch-tmp");
 
       try {
         writeFileSync(tmpFile, options.patch);
-        await this.git.raw(['apply', ...args, tmpFile]);
+        await this.git.raw(["apply", ...args, tmpFile]);
         return ok(undefined);
       } finally {
         try {
@@ -369,10 +359,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to apply patch',
+          "Failed to apply patch",
           GitOperation.APPLY,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -381,8 +371,8 @@ export class GitRunner {
    * Reset changes
    */
   async reset(
-    mode: 'soft' | 'mixed' | 'hard' = 'mixed',
-    ref: string = 'HEAD'
+    mode: "soft" | "mixed" | "hard" = "mixed",
+    ref: string = "HEAD",
   ): Promise<Result<void, GitRunnerError>> {
     try {
       await this.git.reset([`--${mode}`, ref]);
@@ -390,10 +380,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to reset changes',
+          "Failed to reset changes",
           GitOperation.RESET,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -404,7 +394,7 @@ export class GitRunner {
   async stash(message?: string): Promise<Result<void, GitRunnerError>> {
     try {
       if (message) {
-        await this.git.stash(['push', '-m', message]);
+        await this.git.stash(["push", "-m", message]);
       } else {
         await this.git.stash();
       }
@@ -412,10 +402,10 @@ export class GitRunner {
     } catch (error) {
       return err(
         new GitError(
-          'Failed to stash changes',
+          "Failed to stash changes",
           GitOperation.STASH,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -425,15 +415,15 @@ export class GitRunner {
    */
   async stashPop(): Promise<Result<void, GitRunnerError>> {
     try {
-      await this.git.stash(['pop']);
+      await this.git.stash(["pop"]);
       return ok(undefined);
     } catch (error) {
       return err(
         new GitError(
-          'Failed to pop stash',
+          "Failed to pop stash",
           GitOperation.STASH,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
diff --git a/packages/runners/git/src/index.ts b/packages/runners/git/src/index.ts
index 37a984eaa..7ea5b07b1 100644
--- a/packages/runners/git/src/index.ts
+++ b/packages/runners/git/src/index.ts
@@ -3,5 +3,5 @@
  * Git operations runner
  */
 
-export * from './git-runner.js';
-export * from './types.js';
+export * from "./git-runner.js";
+export * from "./types.js";
diff --git a/packages/runners/git/src/types.ts b/packages/runners/git/src/types.ts
index 5dc64daaf..b1d40bd4a 100644
--- a/packages/runners/git/src/types.ts
+++ b/packages/runners/git/src/types.ts
@@ -2,24 +2,24 @@
  * Git runner types
  */
 
-import type { Result } from '@airiscode/types';
+import type { Result } from "@airiscode/types";
 
 /**
  * Git operation types
  */
 export enum GitOperation {
-  STATUS = 'status',
-  DIFF = 'diff',
-  ADD = 'add',
-  COMMIT = 'commit',
-  PUSH = 'push',
-  PULL = 'pull',
-  BRANCH = 'branch',
-  CHECKOUT = 'checkout',
-  LOG = 'log',
-  RESET = 'reset',
-  STASH = 'stash',
-  APPLY = 'apply',
+  STATUS = "status",
+  DIFF = "diff",
+  ADD = "add",
+  COMMIT = "commit",
+  PUSH = "push",
+  PULL = "pull",
+  BRANCH = "branch",
+  CHECKOUT = "checkout",
+  LOG = "log",
+  RESET = "reset",
+  STASH = "stash",
+  APPLY = "apply",
 }
 
 /**
@@ -144,7 +144,7 @@ export interface GitApplyOptions {
   /** Reverse patch */
   reverse?: boolean;
   /** Whitespace handling */
-  whitespace?: 'nowarn' | 'warn' | 'fix' | 'error';
+  whitespace?: "nowarn" | "warn" | "fix" | "error";
 }
 
 /**
@@ -154,10 +154,10 @@ export class GitRunnerError extends Error {
   constructor(
     message: string,
     public operation: GitOperation,
-    public cause?: Error
+    public cause?: Error,
   ) {
     super(message);
-    this.name = 'GitRunnerError';
+    this.name = "GitRunnerError";
   }
 }
 
diff --git a/packages/runners/test/__tests__/test-runner.spec.ts b/packages/runners/test/__tests__/test-runner.spec.ts
index ba1206f96..12f30539d 100644
--- a/packages/runners/test/__tests__/test-runner.spec.ts
+++ b/packages/runners/test/__tests__/test-runner.spec.ts
@@ -1,58 +1,58 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { TestRunner } from '../src/test-runner.js';
-import { TestFramework } from '../src/types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { TestRunner } from "../src/test-runner.js";
+import { TestFramework } from "../src/types.js";
 
 // Mock child_process
-vi.mock('child_process', () => ({
+vi.mock("child_process", () => ({
   spawn: vi.fn(),
 }));
 
 // Mock fs
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   existsSync: vi.fn(),
   readFileSync: vi.fn(),
 }));
 
-describe('@airiscode/runners-test - TestRunner', () => {
+describe("@airiscode/runners-test - TestRunner", () => {
   let runner: TestRunner;
   let mockSpawn: any;
   let mockExistsSync: any;
   let mockReadFileSync: any;
 
   beforeEach(async () => {
-    const { spawn } = await import('child_process');
-    const { existsSync, readFileSync } = await import('fs');
+    const { spawn } = await import("child_process");
+    const { existsSync, readFileSync } = await import("fs");
 
     mockSpawn = spawn as any;
     mockExistsSync = existsSync as any;
     mockReadFileSync = readFileSync as any;
 
-    runner = new TestRunner('/test/project');
+    runner = new TestRunner("/test/project");
 
     // Reset mocks
     vi.clearAllMocks();
   });
 
-  describe('framework detection', () => {
-    it('should detect vitest', async () => {
+  describe("framework detection", () => {
+    it("should detect vitest", async () => {
       mockExistsSync.mockReturnValueOnce(true);
       mockReadFileSync.mockReturnValueOnce(
         JSON.stringify({
-          devDependencies: { vitest: '^1.0.0' },
-        })
+          devDependencies: { vitest: "^1.0.0" },
+        }),
       );
 
       mockSpawn.mockReturnValueOnce({
         stdout: {
           on: vi.fn((event, cb) => {
-            if (event === 'data') {
-              cb('Tests  5 passed (5)');
+            if (event === "data") {
+              cb("Tests  5 passed (5)");
             }
           }),
         },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -64,23 +64,23 @@ describe('@airiscode/runners-test - TestRunner', () => {
       }
     });
 
-    it('should detect jest', async () => {
+    it("should detect jest", async () => {
       mockExistsSync.mockReturnValueOnce(true);
       mockReadFileSync.mockReturnValueOnce(
         JSON.stringify({
-          devDependencies: { jest: '^29.0.0' },
-        })
+          devDependencies: { jest: "^29.0.0" },
+        }),
       );
 
       mockSpawn.mockReturnValueOnce({
         stdout: {
           on: vi.fn((event, cb) => {
-            if (event === 'data') cb('Tests  3 passed (3)');
+            if (event === "data") cb("Tests  3 passed (3)");
           }),
         },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -92,22 +92,22 @@ describe('@airiscode/runners-test - TestRunner', () => {
       }
     });
 
-    it('should detect pytest', async () => {
+    it("should detect pytest", async () => {
       mockExistsSync.mockImplementation((path: string) => {
-        if (path.includes('package.json')) return false;
-        if (path.includes('pytest.ini')) return true;
+        if (path.includes("package.json")) return false;
+        if (path.includes("pytest.ini")) return true;
         return false;
       });
 
       mockSpawn.mockReturnValueOnce({
         stdout: {
           on: vi.fn((event, cb) => {
-            if (event === 'data') cb('5 passed');
+            if (event === "data") cb("5 passed");
           }),
         },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -119,23 +119,23 @@ describe('@airiscode/runners-test - TestRunner', () => {
       }
     });
 
-    it('should detect go test', async () => {
+    it("should detect go test", async () => {
       mockExistsSync.mockImplementation((path: string) => {
-        if (path.includes('package.json')) return false;
-        if (path.includes('pytest.ini')) return false;
-        if (path.includes('go.mod')) return true;
+        if (path.includes("package.json")) return false;
+        if (path.includes("pytest.ini")) return false;
+        if (path.includes("go.mod")) return true;
         return false;
       });
 
       mockSpawn.mockReturnValueOnce({
         stdout: {
           on: vi.fn((event, cb) => {
-            if (event === 'data') cb('ok  \tmodule/package\t0.5s');
+            if (event === "data") cb("ok  \tmodule/package\t0.5s");
           }),
         },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -148,28 +148,28 @@ describe('@airiscode/runners-test - TestRunner', () => {
     });
   });
 
-  describe('run tests', () => {
+  describe("run tests", () => {
     beforeEach(() => {
       mockExistsSync.mockReturnValueOnce(true);
       mockReadFileSync.mockReturnValueOnce(
         JSON.stringify({
-          devDependencies: { vitest: '^1.0.0' },
-        })
+          devDependencies: { vitest: "^1.0.0" },
+        }),
       );
     });
 
-    it('should run tests successfully', async () => {
+    it("should run tests successfully", async () => {
       mockSpawn.mockReturnValueOnce({
         stdout: {
           on: vi.fn((event, cb) => {
-            if (event === 'data') {
-              cb('Tests  5 passed (5)\n');
+            if (event === "data") {
+              cb("Tests  5 passed (5)\n");
             }
           }),
         },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -184,18 +184,18 @@ describe('@airiscode/runners-test - TestRunner', () => {
       }
     });
 
-    it('should handle failed tests', async () => {
+    it("should handle failed tests", async () => {
       mockSpawn.mockReturnValueOnce({
         stdout: {
           on: vi.fn((event, cb) => {
-            if (event === 'data') {
-              cb('Tests  3 passed\n2 failed\n');
+            if (event === "data") {
+              cb("Tests  3 passed\n2 failed\n");
             }
           }),
         },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(1);
+          if (event === "close") cb(1);
         }),
       });
 
@@ -211,11 +211,11 @@ describe('@airiscode/runners-test - TestRunner', () => {
       }
     });
 
-    it('should run with coverage', async () => {
+    it("should run with coverage", async () => {
       mockSpawn.mockReturnValueOnce({
         stdout: {
           on: vi.fn((event, cb) => {
-            if (event === 'data') {
+            if (event === "data") {
               cb(`Tests  5 passed (5)
 All files      |   85.5 |   90.2 |   78.3 |   85.5 |`);
             }
@@ -223,7 +223,7 @@ All files      |   85.5 |   90.2 |   78.3 |   85.5 |`);
         },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -240,46 +240,46 @@ All files      |   85.5 |   90.2 |   78.3 |   85.5 |`);
       }
     });
 
-    it('should run with custom options', async () => {
+    it("should run with custom options", async () => {
       mockSpawn.mockReturnValueOnce({
         stdout: { on: vi.fn() },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
       await runner.run({
         framework: TestFramework.VITEST,
-        files: ['src/**/*.test.ts'],
+        files: ["src/**/*.test.ts"],
         watch: false,
         verbose: true,
         bail: true,
-        grep: 'should pass',
+        grep: "should pass",
       });
 
       const [command, args] = mockSpawn.mock.calls[0];
-      expect(command).toBe('vitest');
-      expect(args).toContain('--reporter=verbose');
-      expect(args).toContain('--bail');
-      expect(args).toContain('--grep');
-      expect(args).toContain('should pass');
-      expect(args).toContain('src/**/*.test.ts');
+      expect(command).toBe("vitest");
+      expect(args).toContain("--reporter=verbose");
+      expect(args).toContain("--bail");
+      expect(args).toContain("--grep");
+      expect(args).toContain("should pass");
+      expect(args).toContain("src/**/*.test.ts");
     });
   });
 
-  describe('framework-specific commands', () => {
-    it('should build jest command', async () => {
+  describe("framework-specific commands", () => {
+    it("should build jest command", async () => {
       mockExistsSync.mockReturnValueOnce(true);
       mockReadFileSync.mockReturnValueOnce(
-        JSON.stringify({ devDependencies: { jest: '^29.0.0' } })
+        JSON.stringify({ devDependencies: { jest: "^29.0.0" } }),
       );
 
       mockSpawn.mockReturnValueOnce({
         stdout: { on: vi.fn() },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -289,42 +289,42 @@ All files      |   85.5 |   90.2 |   78.3 |   85.5 |`);
       });
 
       const [command, args] = mockSpawn.mock.calls[0];
-      expect(command).toBe('jest');
-      expect(args).toContain('--coverage');
-      expect(args).toContain('--verbose');
+      expect(command).toBe("jest");
+      expect(args).toContain("--coverage");
+      expect(args).toContain("--verbose");
     });
 
-    it('should build mocha command', async () => {
+    it("should build mocha command", async () => {
       mockSpawn.mockReturnValueOnce({
         stdout: { on: vi.fn() },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
       await runner.run({
         framework: TestFramework.MOCHA,
         bail: true,
-        grep: 'integration',
+        grep: "integration",
         timeout: 5000,
       });
 
       const [command, args] = mockSpawn.mock.calls[0];
-      expect(command).toBe('mocha');
-      expect(args).toContain('--bail');
-      expect(args).toContain('--grep');
-      expect(args).toContain('integration');
-      expect(args).toContain('--timeout');
-      expect(args).toContain('5000');
+      expect(command).toBe("mocha");
+      expect(args).toContain("--bail");
+      expect(args).toContain("--grep");
+      expect(args).toContain("integration");
+      expect(args).toContain("--timeout");
+      expect(args).toContain("5000");
     });
 
-    it('should build pytest command', async () => {
+    it("should build pytest command", async () => {
       mockSpawn.mockReturnValueOnce({
         stdout: { on: vi.fn() },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -333,24 +333,24 @@ All files      |   85.5 |   90.2 |   78.3 |   85.5 |`);
         verbose: true,
         bail: true,
         coverage: true,
-        grep: 'unit',
+        grep: "unit",
       });
 
       const [command, args] = mockSpawn.mock.calls[0];
-      expect(command).toBe('pytest');
-      expect(args).toContain('-v');
-      expect(args).toContain('-x');
-      expect(args).toContain('--cov');
-      expect(args).toContain('-k');
-      expect(args).toContain('unit');
+      expect(command).toBe("pytest");
+      expect(args).toContain("-v");
+      expect(args).toContain("-x");
+      expect(args).toContain("--cov");
+      expect(args).toContain("-k");
+      expect(args).toContain("unit");
     });
 
-    it('should build go test command', async () => {
+    it("should build go test command", async () => {
       mockSpawn.mockReturnValueOnce({
         stdout: { on: vi.fn() },
         stderr: { on: vi.fn() },
         on: vi.fn((event, cb) => {
-          if (event === 'close') cb(0);
+          if (event === "close") cb(0);
         }),
       });
 
@@ -358,31 +358,31 @@ All files      |   85.5 |   90.2 |   78.3 |   85.5 |`);
         framework: TestFramework.GO_TEST,
         verbose: true,
         coverage: true,
-        grep: 'TestIntegration',
+        grep: "TestIntegration",
         timeout: 10000,
       });
 
       const [command, args] = mockSpawn.mock.calls[0];
-      expect(command).toBe('go');
-      expect(args).toContain('test');
-      expect(args).toContain('-v');
-      expect(args).toContain('-cover');
-      expect(args).toContain('-run');
-      expect(args).toContain('TestIntegration');
-      expect(args).toContain('-timeout');
-      expect(args).toContain('10000ms');
+      expect(command).toBe("go");
+      expect(args).toContain("test");
+      expect(args).toContain("-v");
+      expect(args).toContain("-cover");
+      expect(args).toContain("-run");
+      expect(args).toContain("TestIntegration");
+      expect(args).toContain("-timeout");
+      expect(args).toContain("10000ms");
     });
   });
 
-  describe('error handling', () => {
-    it('should handle missing framework', async () => {
+  describe("error handling", () => {
+    it("should handle missing framework", async () => {
       mockExistsSync.mockReturnValue(false);
 
       const result = await runner.run({});
 
       expect(result.ok).toBe(false);
       if (!result.ok) {
-        expect(result.error.message).toContain('Could not detect test framework');
+        expect(result.error.message).toContain("Could not detect test framework");
       }
     });
   });
diff --git a/packages/runners/test/package.json b/packages/runners/test/package.json
index 013f44594..ac8e1bd74 100644
--- a/packages/runners/test/package.json
+++ b/packages/runners/test/package.json
@@ -14,7 +14,7 @@
     "build": "echo Skipping test runner build",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/runners/test/src/index.ts b/packages/runners/test/src/index.ts
index dd0131864..d4c436684 100644
--- a/packages/runners/test/src/index.ts
+++ b/packages/runners/test/src/index.ts
@@ -3,5 +3,5 @@
  * Test execution runner
  */
 
-export * from './test-runner.js';
-export * from './types.js';
+export * from "./test-runner.js";
+export * from "./types.js";
diff --git a/packages/runners/test/src/test-runner.ts b/packages/runners/test/src/test-runner.ts
index 43399f2f6..c67dc1217 100644
--- a/packages/runners/test/src/test-runner.ts
+++ b/packages/runners/test/src/test-runner.ts
@@ -2,20 +2,20 @@
  * Test runner implementation
  */
 
-import { spawn } from 'child_process';
-import { ok, err } from '@airiscode/types';
+import { err, ok } from "@airiscode/types";
+import { spawn } from "child_process";
 import type {
+  CoverageReport,
   TestFramework,
-  TestRunOptions,
-  TestRunResult,
-  TestSuiteResult,
   TestResult,
-  TestStatus,
-  CoverageReport,
   TestRunnerError,
+  TestRunOptions,
+  TestRunResult,
   TestRunResultType,
-} from './types.js';
-import { TestRunnerError as TestError } from './types.js';
+  TestStatus,
+  TestSuiteResult,
+} from "./types.js";
+import { TestRunnerError as TestError } from "./types.js";
 
 /**
  * Test execution runner
@@ -39,7 +39,7 @@ export class TestRunner {
 
       if (!framework) {
         return err(
-          new TestError('Could not detect test framework. Please specify framework explicitly.')
+          new TestError("Could not detect test framework. Please specify framework explicitly."),
         );
       }
 
@@ -53,10 +53,10 @@ export class TestRunner {
     } catch (error) {
       return err(
         new TestError(
-          'Failed to run tests',
+          "Failed to run tests",
           options.framework,
-          error instanceof Error ? error : undefined
-        )
+          error instanceof Error ? error : undefined,
+        ),
       );
     }
   }
@@ -65,34 +65,34 @@ export class TestRunner {
    * Auto-detect test framework
    */
   private async detectFramework(): Promise<TestFramework | null> {
-    const { existsSync, readFileSync } = await import('fs');
-    const { join } = await import('path');
+    const { existsSync, readFileSync } = await import("fs");
+    const { join } = await import("path");
 
     // Check package.json for framework dependencies
-    const packageJsonPath = join(this.workingDir, 'package.json');
+    const packageJsonPath = join(this.workingDir, "package.json");
     if (existsSync(packageJsonPath)) {
-      const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf-8'));
+      const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
       const deps = {
         ...packageJson.dependencies,
         ...packageJson.devDependencies,
       };
 
       if (deps.vitest) return TestFramework.VITEST;
-      if (deps.jest || deps['@types/jest']) return TestFramework.JEST;
+      if (deps.jest || deps["@types/jest"]) return TestFramework.JEST;
       if (deps.mocha) return TestFramework.MOCHA;
       if (deps.ava) return TestFramework.AVA;
     }
 
     // Check for Python pytest
-    const pytestConfig = join(this.workingDir, 'pytest.ini');
+    const pytestConfig = join(this.workingDir, "pytest.ini");
     if (existsSync(pytestConfig)) return TestFramework.PYTEST;
 
     // Check for Go
-    const goMod = join(this.workingDir, 'go.mod');
+    const goMod = join(this.workingDir, "go.mod");
     if (existsSync(goMod)) return TestFramework.GO_TEST;
 
     // Check for Rust
-    const cargoToml = join(this.workingDir, 'Cargo.toml');
+    const cargoToml = join(this.workingDir, "Cargo.toml");
     if (existsSync(cargoToml)) return TestFramework.CARGO_TEST;
 
     return null;
@@ -103,7 +103,7 @@ export class TestRunner {
    */
   private buildCommand(
     framework: TestFramework,
-    options: TestRunOptions
+    options: TestRunOptions,
   ): { command: string; args: string[] } {
     switch (framework) {
       case TestFramework.VITEST:
@@ -126,111 +126,111 @@ export class TestRunner {
   }
 
   private buildVitestCommand(options: TestRunOptions): { command: string; args: string[] } {
-    const args = ['run'];
+    const args = ["run"];
 
-    if (options.watch) args.push('--watch');
-    if (options.coverage) args.push('--coverage');
-    if (options.verbose) args.push('--reporter=verbose');
-    if (options.bail) args.push('--bail', '1');
-    if (options.grep) args.push('--grep', options.grep);
+    if (options.watch) args.push("--watch");
+    if (options.coverage) args.push("--coverage");
+    if (options.verbose) args.push("--reporter=verbose");
+    if (options.bail) args.push("--bail", "1");
+    if (options.grep) args.push("--grep", options.grep);
 
     if (options.files && options.files.length > 0) {
       args.push(...options.files);
     }
 
-    return { command: 'vitest', args };
+    return { command: "vitest", args };
   }
 
   private buildJestCommand(options: TestRunOptions): { command: string; args: string[] } {
     const args: string[] = [];
 
-    if (options.watch) args.push('--watch');
-    if (options.coverage) args.push('--coverage');
-    if (options.verbose) args.push('--verbose');
-    if (options.bail) args.push('--bail');
-    if (options.grep) args.push('--testNamePattern', options.grep);
+    if (options.watch) args.push("--watch");
+    if (options.coverage) args.push("--coverage");
+    if (options.verbose) args.push("--verbose");
+    if (options.bail) args.push("--bail");
+    if (options.grep) args.push("--testNamePattern", options.grep);
 
     if (options.files && options.files.length > 0) {
       args.push(...options.files);
     }
 
-    return { command: 'jest', args };
+    return { command: "jest", args };
   }
 
   private buildMochaCommand(options: TestRunOptions): { command: string; args: string[] } {
     const args: string[] = [];
 
-    if (options.watch) args.push('--watch');
-    if (options.bail) args.push('--bail');
-    if (options.grep) args.push('--grep', options.grep);
-    if (options.timeout) args.push('--timeout', options.timeout.toString());
+    if (options.watch) args.push("--watch");
+    if (options.bail) args.push("--bail");
+    if (options.grep) args.push("--grep", options.grep);
+    if (options.timeout) args.push("--timeout", options.timeout.toString());
 
     if (options.files && options.files.length > 0) {
       args.push(...options.files);
     } else {
-      args.push('test/**/*.test.{js,ts}');
+      args.push("test/**/*.test.{js,ts}");
     }
 
-    return { command: 'mocha', args };
+    return { command: "mocha", args };
   }
 
   private buildAvaCommand(options: TestRunOptions): { command: string; args: string[] } {
     const args: string[] = [];
 
-    if (options.watch) args.push('--watch');
-    if (options.verbose) args.push('--verbose');
-    if (options.bail) args.push('--fail-fast');
-    if (options.grep) args.push('--match', options.grep);
+    if (options.watch) args.push("--watch");
+    if (options.verbose) args.push("--verbose");
+    if (options.bail) args.push("--fail-fast");
+    if (options.grep) args.push("--match", options.grep);
 
     if (options.files && options.files.length > 0) {
       args.push(...options.files);
     }
 
-    return { command: 'ava', args };
+    return { command: "ava", args };
   }
 
   private buildPytestCommand(options: TestRunOptions): { command: string; args: string[] } {
     const args: string[] = [];
 
-    if (options.verbose) args.push('-v');
-    if (options.bail) args.push('-x');
-    if (options.grep) args.push('-k', options.grep);
-    if (options.coverage) args.push('--cov');
+    if (options.verbose) args.push("-v");
+    if (options.bail) args.push("-x");
+    if (options.grep) args.push("-k", options.grep);
+    if (options.coverage) args.push("--cov");
 
     if (options.files && options.files.length > 0) {
       args.push(...options.files);
     }
 
-    return { command: 'pytest', args };
+    return { command: "pytest", args };
   }
 
   private buildGoTestCommand(options: TestRunOptions): { command: string; args: string[] } {
-    const args = ['test'];
+    const args = ["test"];
 
-    if (options.verbose) args.push('-v');
-    if (options.coverage) args.push('-cover');
-    if (options.grep) args.push('-run', options.grep);
-    if (options.timeout) args.push('-timeout', `${options.timeout}ms`);
+    if (options.verbose) args.push("-v");
+    if (options.coverage) args.push("-cover");
+    if (options.grep) args.push("-run", options.grep);
+    if (options.timeout) args.push("-timeout", `${options.timeout}ms`);
 
     if (options.files && options.files.length > 0) {
       args.push(...options.files);
     } else {
-      args.push('./...');
+      args.push("./...");
     }
 
-    return { command: 'go', args };
+    return { command: "go", args };
   }
 
   private buildCargoTestCommand(options: TestRunOptions): { command: string; args: string[] } {
-    const args = ['test'];
+    const args = ["test"];
 
-    if (options.verbose) args.push('--verbose');
+    if (options.verbose) args.push("--verbose");
     if (options.grep) args.push(options.grep);
 
     // Cargo test doesn't support individual file selection
     // Tests are selected by name pattern
 
-    return { command: 'cargo', args };
+    return { command: "cargo", args };
   }
 
   /**
@@ -239,27 +239,27 @@ export class TestRunner {
   private execCommand(
     command: string,
     args: string[],
-    env?: Record<string, string>
+    env?: Record<string, string>,
   ): Promise<{ stdout: string; stderr: string; exitCode: number }> {
     return new Promise((resolve) => {
       const proc = spawn(command, args, {
         cwd: this.workingDir,
         env: { ...process.env, ...env },
-        stdio: ['ignore', 'pipe', 'pipe'],
+        stdio: ["ignore", "pipe", "pipe"],
       });
 
-      let stdout = '';
-      let stderr = '';
+      let stdout = "";
+      let stderr = "";
 
-      proc.stdout.on('data', (chunk) => {
+      proc.stdout.on("data", (chunk) => {
         stdout += chunk.toString();
       });
 
-      proc.stderr.on('data', (chunk) => {
+      proc.stderr.on("data", (chunk) => {
         stderr += chunk.toString();
       });
 
-      proc.on('close', (code) => {
+      proc.on("close", (code) => {
         resolve({ stdout, stderr, exitCode: code || 0 });
       });
     });
@@ -271,12 +271,12 @@ export class TestRunner {
   private parseOutput(
     framework: TestFramework,
     output: { stdout: string; stderr: string; exitCode: number },
-    coverageEnabled?: boolean
+    coverageEnabled?: boolean,
   ): TestRunResult {
     // This is a simplified parser
     // In production, you'd use framework-specific parsers or JSON reporters
 
-    const lines = output.stdout.split('\n');
+    const lines = output.stdout.split("\n");
     const suites: TestSuiteResult[] = [];
     let totalTests = 0;
     let passedTests = 0;
@@ -343,7 +343,9 @@ export class TestRunner {
     };
 
     // Look for coverage percentage patterns
-    const coverageMatch = output.match(/All files\s+\|\s+([\d.]+)\s+\|\s+([\d.]+)\s+\|\s+([\d.]+)\s+\|\s+([\d.]+)/);
+    const coverageMatch = output.match(
+      /All files\s+\|\s+([\d.]+)\s+\|\s+([\d.]+)\s+\|\s+([\d.]+)\s+\|\s+([\d.]+)/,
+    );
 
     if (coverageMatch) {
       return {
diff --git a/packages/runners/test/src/types.ts b/packages/runners/test/src/types.ts
index 3f44d635a..3f4ee7152 100644
--- a/packages/runners/test/src/types.ts
+++ b/packages/runners/test/src/types.ts
@@ -2,19 +2,19 @@
  * Test runner types
  */
 
-import type { Result } from '@airiscode/types';
+import type { Result } from "@airiscode/types";
 
 /**
  * Test framework types
  */
 export enum TestFramework {
-  VITEST = 'vitest',
-  JEST = 'jest',
-  MOCHA = 'mocha',
-  AVA = 'ava',
-  PYTEST = 'pytest',
-  GO_TEST = 'go_test',
-  CARGO_TEST = 'cargo_test',
+  VITEST = "vitest",
+  JEST = "jest",
+  MOCHA = "mocha",
+  AVA = "ava",
+  PYTEST = "pytest",
+  GO_TEST = "go_test",
+  CARGO_TEST = "cargo_test",
 }
 
 /**
@@ -45,10 +45,10 @@ export interface TestRunOptions {
  * Test result status
  */
 export enum TestStatus {
-  PASSED = 'passed',
-  FAILED = 'failed',
-  SKIPPED = 'skipped',
-  TODO = 'todo',
+  PASSED = "passed",
+  FAILED = "failed",
+  SKIPPED = "skipped",
+  TODO = "todo",
 }
 
 /**
@@ -152,10 +152,10 @@ export class TestRunnerError extends Error {
   constructor(
     message: string,
     public framework?: TestFramework,
-    public cause?: Error
+    public cause?: Error,
   ) {
     super(message);
-    this.name = 'TestRunnerError';
+    this.name = "TestRunnerError";
   }
 }
 
diff --git a/packages/sandbox/__tests__/shell-guard.spec.ts b/packages/sandbox/__tests__/shell-guard.spec.ts
index 69212bdbb..ddcb52a7f 100644
--- a/packages/sandbox/__tests__/shell-guard.spec.ts
+++ b/packages/sandbox/__tests__/shell-guard.spec.ts
@@ -1,92 +1,92 @@
-import { describe, it, expect } from 'vitest';
-import { ShellGuard } from '../src/shell-guard.js';
-import { TrustLevel, ApprovalsLevel } from '@airiscode/policies';
+import { ApprovalsLevel, TrustLevel } from "@airiscode/policies";
+import { describe, expect, it } from "vitest";
+import { ShellGuard } from "../src/shell-guard.js";
 
-describe('@airiscode/sandbox - ShellGuard', () => {
-  describe('RESTRICTED trust level', () => {
-    it('should block all commands in restricted mode', () => {
+describe("@airiscode/sandbox - ShellGuard", () => {
+  describe("RESTRICTED trust level", () => {
+    it("should block all commands in restricted mode", () => {
       const guard = new ShellGuard({
         approvals: ApprovalsLevel.NEVER,
         trust: TrustLevel.RESTRICTED,
         guardStrict: true,
       });
 
-      const result = guard.evaluate('ls -la');
+      const result = guard.evaluate("ls -la");
       expect(result.allowed).toBe(false);
-      expect(result.reason).toContain('restricted');
+      expect(result.reason).toContain("restricted");
     });
   });
 
-  describe('Dangerous command blocking', () => {
+  describe("Dangerous command blocking", () => {
     const guard = new ShellGuard({
       approvals: ApprovalsLevel.NEVER,
       trust: TrustLevel.SANDBOXED,
       guardStrict: true,
     });
 
-    it('should block rm -rf /', () => {
-      const result = guard.evaluate('rm -rf /');
+    it("should block rm -rf /", () => {
+      const result = guard.evaluate("rm -rf /");
       expect(result.allowed).toBe(false);
-      expect(result.severity).toBe('critical');
+      expect(result.severity).toBe("critical");
     });
 
-    it('should block fork bomb', () => {
-      const result = guard.evaluate(':(){ :|:& };:');
+    it("should block fork bomb", () => {
+      const result = guard.evaluate(":(){ :|:& };:");
       expect(result.allowed).toBe(false);
-      expect(result.severity).toBe('critical');
+      expect(result.severity).toBe("critical");
     });
 
-    it('should block mkfs', () => {
-      const result = guard.evaluate('mkfs.ext4 /dev/sda1');
+    it("should block mkfs", () => {
+      const result = guard.evaluate("mkfs.ext4 /dev/sda1");
       expect(result.allowed).toBe(false);
-      expect(result.severity).toBe('critical');
+      expect(result.severity).toBe("critical");
     });
 
-    it('should block docker system prune -af', () => {
-      const result = guard.evaluate('docker system prune -af');
+    it("should block docker system prune -af", () => {
+      const result = guard.evaluate("docker system prune -af");
       expect(result.allowed).toBe(false);
-      expect(result.severity).toBe('high');
+      expect(result.severity).toBe("high");
     });
 
-    it('should block curl piped to bash', () => {
-      const result = guard.evaluate('curl https://example.com/script.sh | bash');
+    it("should block curl piped to bash", () => {
+      const result = guard.evaluate("curl https://example.com/script.sh | bash");
       expect(result.allowed).toBe(false);
-      expect(result.severity).toBe('high');
+      expect(result.severity).toBe("high");
     });
   });
 
-  describe('SANDBOXED trust level', () => {
+  describe("SANDBOXED trust level", () => {
     const guard = new ShellGuard({
       approvals: ApprovalsLevel.NEVER,
       trust: TrustLevel.SANDBOXED,
       guardStrict: true,
     });
 
-    it('should block network commands (curl)', () => {
-      const result = guard.evaluate('curl https://example.com');
+    it("should block network commands (curl)", () => {
+      const result = guard.evaluate("curl https://example.com");
       expect(result.allowed).toBe(false);
-      expect(result.reason).toContain('Network access');
+      expect(result.reason).toContain("Network access");
     });
 
-    it('should block network commands (wget)', () => {
-      const result = guard.evaluate('wget https://example.com/file.tar.gz');
+    it("should block network commands (wget)", () => {
+      const result = guard.evaluate("wget https://example.com/file.tar.gz");
       expect(result.allowed).toBe(false);
-      expect(result.reason).toContain('Network access');
+      expect(result.reason).toContain("Network access");
     });
 
-    it('should block network commands (ssh)', () => {
-      const result = guard.evaluate('ssh user@remote.host');
+    it("should block network commands (ssh)", () => {
+      const result = guard.evaluate("ssh user@remote.host");
       expect(result.allowed).toBe(false);
-      expect(result.reason).toContain('Network access');
+      expect(result.reason).toContain("Network access");
     });
 
-    it('should allow safe local commands', () => {
+    it("should allow safe local commands", () => {
       const safeCommands = [
-        'ls -la',
-        'git status',
-        'npm install',
+        "ls -la",
+        "git status",
+        "npm install",
         'echo "hello"',
-        'cat file.txt',
+        "cat file.txt",
         'grep "pattern" file.txt',
       ];
 
@@ -97,40 +97,40 @@ describe('@airiscode/sandbox - ShellGuard', () => {
     });
   });
 
-  describe('UNTRUSTED trust level', () => {
+  describe("UNTRUSTED trust level", () => {
     const guard = new ShellGuard({
       approvals: ApprovalsLevel.NEVER,
       trust: TrustLevel.UNTRUSTED,
       guardStrict: true,
     });
 
-    it('should allow network commands in untrusted mode', () => {
-      const result = guard.evaluate('curl https://example.com');
+    it("should allow network commands in untrusted mode", () => {
+      const result = guard.evaluate("curl https://example.com");
       expect(result.allowed).toBe(true);
     });
 
-    it('should still block dangerous commands', () => {
-      const result = guard.evaluate('rm -rf /');
+    it("should still block dangerous commands", () => {
+      const result = guard.evaluate("rm -rf /");
       expect(result.allowed).toBe(false);
     });
   });
 
-  describe('Command suggestions', () => {
+  describe("Command suggestions", () => {
     const guard = new ShellGuard({
       approvals: ApprovalsLevel.NEVER,
       trust: TrustLevel.SANDBOXED,
       guardStrict: true,
     });
 
-    it('should suggest alternative for rm -rf /', () => {
-      const suggestion = guard.suggestAlternative('rm -rf /');
-      expect(suggestion).toBe('rm -rf ./');
+    it("should suggest alternative for rm -rf /", () => {
+      const suggestion = guard.suggestAlternative("rm -rf /");
+      expect(suggestion).toBe("rm -rf ./");
     });
 
-    it('should suggest alternative for docker prune', () => {
-      const suggestion = guard.suggestAlternative('docker system prune -af');
-      expect(suggestion).toContain('docker system prune');
-      expect(suggestion).not.toContain('-af');
+    it("should suggest alternative for docker prune", () => {
+      const suggestion = guard.suggestAlternative("docker system prune -af");
+      expect(suggestion).toContain("docker system prune");
+      expect(suggestion).not.toContain("-af");
     });
   });
 });
diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
index 225701439..7bccdb104 100644
--- a/packages/sandbox/package.json
+++ b/packages/sandbox/package.json
@@ -15,7 +15,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {
diff --git a/packages/sandbox/shell-guard.ts b/packages/sandbox/shell-guard.ts
index 5d40488bb..97afcafaa 100644
--- a/packages/sandbox/shell-guard.ts
+++ b/packages/sandbox/shell-guard.ts
@@ -5,9 +5,9 @@
  * All shell execution MUST flow through this guard.
  */
 
-import * as yaml from 'yaml';
-import * as fs from 'fs/promises';
-import * as path from 'path';
+import * as fs from "fs/promises";
+import * as path from "path";
+import * as yaml from "yaml";
 
 export interface GuardConfig {
   version: number;
@@ -38,7 +38,7 @@ export interface GuardVerdict {
   timeout_sec: number;
 }
 
-export type TrustLevel = 'restricted' | 'sandboxed' | 'untrusted';
+export type TrustLevel = "restricted" | "sandboxed" | "untrusted";
 
 export class ShellGuard {
   private config: GuardConfig;
@@ -49,14 +49,8 @@ export class ShellGuard {
   }
 
   async init(configPath?: string): Promise<void> {
-    const defaultPath = path.join(
-      __dirname,
-      '../policies/schemas/guard.schema.yaml'
-    );
-    const yamlContent = await fs.readFile(
-      configPath || defaultPath,
-      'utf-8'
-    );
+    const defaultPath = path.join(__dirname, "../policies/schemas/guard.schema.yaml");
+    const yamlContent = await fs.readFile(configPath || defaultPath, "utf-8");
     this.config = yaml.parse(yamlContent);
   }
 
@@ -66,7 +60,7 @@ export class ShellGuard {
   evaluate(command: string, trustLevel: TrustLevel): GuardVerdict {
     // 1. Check denylist (absolute blocks)
     for (const rule of this.config.denylist) {
-      const regex = new RegExp(rule.pattern, 'i');
+      const regex = new RegExp(rule.pattern, "i");
       if (regex.test(command)) {
         return {
           allowed: false,
@@ -79,10 +73,7 @@ export class ShellGuard {
     // 2. Apply rewrites based on trust level
     let rewrittenCommand = command;
     for (const rewrite of this.config.rewrites) {
-      if (
-        !rewrite.when_trust ||
-        rewrite.when_trust === trustLevel
-      ) {
+      if (!rewrite.when_trust || rewrite.when_trust === trustLevel) {
         const regex = new RegExp(rewrite.from);
         if (regex.test(command)) {
           rewrittenCommand = command.replace(regex, rewrite.to);
@@ -96,8 +87,7 @@ export class ShellGuard {
 
     return {
       allowed: true,
-      rewritten_command:
-        rewrittenCommand !== command ? rewrittenCommand : undefined,
+      rewritten_command: rewrittenCommand !== command ? rewrittenCommand : undefined,
       timeout_sec,
     };
   }
@@ -115,15 +105,12 @@ export class ShellGuard {
   /**
    * Validate filesystem access based on trust level
    */
-  validateFsAccess(
-    paths: string[],
-    trustLevel: TrustLevel
-  ): { allowed: boolean; reason?: string } {
-    if (trustLevel === 'restricted') {
+  validateFsAccess(paths: string[], trustLevel: TrustLevel): { allowed: boolean; reason?: string } {
+    if (trustLevel === "restricted") {
       // Read-only: reject all writes
       return {
         allowed: false,
-        reason: 'Filesystem writes disabled in restricted mode',
+        reason: "Filesystem writes disabled in restricted mode",
       };
     }
 
@@ -139,9 +126,9 @@ export class ShellGuard {
       }
 
       // Check write root (sandboxed mode)
-      if (trustLevel === 'sandboxed') {
+      if (trustLevel === "sandboxed") {
         const writeRoot = this.config.fs.write_root;
-        if (!p.startsWith(writeRoot) && !p.startsWith('./')) {
+        if (!p.startsWith(writeRoot) && !p.startsWith("./")) {
           return {
             allowed: false,
             reason: `Write outside workspace root: ${p}`,
@@ -159,9 +146,7 @@ export class ShellGuard {
  */
 let guardInstance: ShellGuard | null = null;
 
-export async function getGuard(
-  configPath?: string
-): Promise<ShellGuard> {
+export async function getGuard(configPath?: string): Promise<ShellGuard> {
   if (!guardInstance) {
     guardInstance = new ShellGuard(configPath);
     await guardInstance.init(configPath);
diff --git a/packages/sandbox/src/deny-list.ts b/packages/sandbox/src/deny-list.ts
index 894da292d..de85d4da0 100644
--- a/packages/sandbox/src/deny-list.ts
+++ b/packages/sandbox/src/deny-list.ts
@@ -5,7 +5,7 @@
 export interface DenyPattern {
   pattern: RegExp;
   reason: string;
-  severity: 'critical' | 'high' | 'medium';
+  severity: "critical" | "high" | "medium";
 }
 
 /**
@@ -14,33 +14,33 @@ export interface DenyPattern {
 const CRITICAL_PATTERNS: DenyPattern[] = [
   {
     pattern: /rm\s+-rf\s+\//,
-    reason: 'Attempting to delete root directory',
-    severity: 'critical',
+    reason: "Attempting to delete root directory",
+    severity: "critical",
   },
   {
     pattern: /rm\s+-rf\s+~/,
-    reason: 'Attempting to delete home directory',
-    severity: 'critical',
+    reason: "Attempting to delete home directory",
+    severity: "critical",
   },
   {
     pattern: /:\(\)\s*{\s*:\|:&\s*};:/,
-    reason: 'Fork bomb detected',
-    severity: 'critical',
+    reason: "Fork bomb detected",
+    severity: "critical",
   },
   {
     pattern: /mkfs/,
-    reason: 'Attempting to format filesystem',
-    severity: 'critical',
+    reason: "Attempting to format filesystem",
+    severity: "critical",
   },
   {
     pattern: /dd\s+if=.*of=\/dev\/(sd[a-z]|hd[a-z]|nvme\d+n\d+)/,
-    reason: 'Attempting to write to raw disk device',
-    severity: 'critical',
+    reason: "Attempting to write to raw disk device",
+    severity: "critical",
   },
   {
     pattern: /chmod\s+-R\s+777\s+\//,
-    reason: 'Attempting to set world-writable permissions on root',
-    severity: 'critical',
+    reason: "Attempting to set world-writable permissions on root",
+    severity: "critical",
   },
 ];
 
@@ -50,28 +50,28 @@ const CRITICAL_PATTERNS: DenyPattern[] = [
 const HIGH_PATTERNS: DenyPattern[] = [
   {
     pattern: /docker\s+system\s+prune\s+-a/,
-    reason: 'Attempting to prune all Docker resources',
-    severity: 'high',
+    reason: "Attempting to prune all Docker resources",
+    severity: "high",
   },
   {
     pattern: /curl.*\|\s*(sudo\s+)?bash/,
-    reason: 'Executing remote script with elevated privileges',
-    severity: 'high',
+    reason: "Executing remote script with elevated privileges",
+    severity: "high",
   },
   {
     pattern: /wget.*\|\s*(sudo\s+)?sh/,
-    reason: 'Executing remote script with elevated privileges',
-    severity: 'high',
+    reason: "Executing remote script with elevated privileges",
+    severity: "high",
   },
   {
     pattern: /sudo\s+chmod\s+u\+s/,
-    reason: 'Setting SUID bit with sudo',
-    severity: 'high',
+    reason: "Setting SUID bit with sudo",
+    severity: "high",
   },
   {
     pattern: />\s*\/dev\/(sda|hda|nvme)/,
-    reason: 'Redirecting output to disk device',
-    severity: 'high',
+    reason: "Redirecting output to disk device",
+    severity: "high",
   },
 ];
 
@@ -81,18 +81,18 @@ const HIGH_PATTERNS: DenyPattern[] = [
 const MEDIUM_PATTERNS: DenyPattern[] = [
   {
     pattern: /rm\s+-rf\s+\*$/,
-    reason: 'Recursive deletion of all files in current directory',
-    severity: 'medium',
+    reason: "Recursive deletion of all files in current directory",
+    severity: "medium",
   },
   {
     pattern: /pkill\s+-9\s+-U/,
-    reason: 'Force killing all processes for a user',
-    severity: 'medium',
+    reason: "Force killing all processes for a user",
+    severity: "medium",
   },
   {
     pattern: /iptables\s+-F/,
-    reason: 'Flushing iptables rules',
-    severity: 'medium',
+    reason: "Flushing iptables rules",
+    severity: "medium",
   },
 ];
 
diff --git a/packages/sandbox/src/index.ts b/packages/sandbox/src/index.ts
index f45fe6e51..31c29c302 100644
--- a/packages/sandbox/src/index.ts
+++ b/packages/sandbox/src/index.ts
@@ -3,5 +3,5 @@
  * Shell Guard and command safety validation
  */
 
-export * from './shell-guard.js';
-export * from './deny-list.js';
+export * from "./deny-list.js";
+export * from "./shell-guard.js";
diff --git a/packages/sandbox/src/shell-guard.ts b/packages/sandbox/src/shell-guard.ts
index b0764f1fb..ddf73c215 100644
--- a/packages/sandbox/src/shell-guard.ts
+++ b/packages/sandbox/src/shell-guard.ts
@@ -2,8 +2,8 @@
  * Shell Guard - Command safety validation
  */
 
-import { PolicyProfile, TrustLevel } from '@airiscode/policies';
-import { findMatchingDenyPattern } from './deny-list.js';
+import { PolicyProfile, TrustLevel } from "@airiscode/policies";
+import { findMatchingDenyPattern } from "./deny-list.js";
 
 /**
  * Result of Shell Guard evaluation
@@ -16,7 +16,7 @@ export interface GuardResult {
   /** Suggested rewrite of the command (if applicable) */
   rewritten?: string;
   /** Severity level (if blocked) */
-  severity?: 'critical' | 'high' | 'medium';
+  severity?: "critical" | "high" | "medium";
 }
 
 /**
@@ -33,8 +33,8 @@ export class ShellGuard {
     if (this.policy.trust === TrustLevel.RESTRICTED) {
       return {
         allowed: false,
-        reason: 'Shell execution is disabled in restricted trust mode',
-        severity: 'high',
+        reason: "Shell execution is disabled in restricted trust mode",
+        severity: "high",
       };
     }
 
@@ -65,14 +65,14 @@ export class ShellGuard {
    */
   private checkNetworkCommand(command: string): GuardResult {
     const networkPatterns = [
-      { pattern: /\bcurl\b/, tool: 'curl' },
-      { pattern: /\bwget\b/, tool: 'wget' },
-      { pattern: /\bssh\b/, tool: 'ssh' },
-      { pattern: /\bscp\b/, tool: 'scp' },
-      { pattern: /\brsync\b.*:/, tool: 'rsync' },
-      { pattern: /\bftp\b/, tool: 'ftp' },
-      { pattern: /\btelnet\b/, tool: 'telnet' },
-      { pattern: /\bnc\b/, tool: 'netcat' },
+      { pattern: /\bcurl\b/, tool: "curl" },
+      { pattern: /\bwget\b/, tool: "wget" },
+      { pattern: /\bssh\b/, tool: "ssh" },
+      { pattern: /\bscp\b/, tool: "scp" },
+      { pattern: /\brsync\b.*:/, tool: "rsync" },
+      { pattern: /\bftp\b/, tool: "ftp" },
+      { pattern: /\btelnet\b/, tool: "telnet" },
+      { pattern: /\bnc\b/, tool: "netcat" },
     ];
 
     for (const { pattern, tool } of networkPatterns) {
@@ -80,7 +80,7 @@ export class ShellGuard {
         return {
           allowed: false,
           reason: `Network access (${tool}) is blocked in sandboxed trust mode`,
-          severity: 'medium',
+          severity: "medium",
         };
       }
     }
@@ -94,12 +94,12 @@ export class ShellGuard {
   suggestAlternative(command: string): string | null {
     // rm -rf / -> rm -rf ./
     if (/rm\s+-rf\s+\//.test(command)) {
-      return command.replace(/rm\s+-rf\s+\//, 'rm -rf ./');
+      return command.replace(/rm\s+-rf\s+\//, "rm -rf ./");
     }
 
     // docker system prune -af -> docker system prune
     if (/docker\s+system\s+prune\s+-af/.test(command)) {
-      return command.replace(/-af/, '');
+      return command.replace(/-af/, "");
     }
 
     return null;
diff --git a/packages/types/__tests__/index.spec.ts b/packages/types/__tests__/index.spec.ts
index a10f5ce7e..e31346d4e 100644
--- a/packages/types/__tests__/index.spec.ts
+++ b/packages/types/__tests__/index.spec.ts
@@ -1,8 +1,8 @@
-import { describe, it, expect } from 'vitest';
-import { ok, err } from '../src/common.js';
+import { describe, expect, it } from "vitest";
+import { err, ok } from "../src/common.js";
 
-describe('@airiscode/types', () => {
-  it('should export common types', () => {
+describe("@airiscode/types", () => {
+  it("should export common types", () => {
     const result = ok(42);
     expect(result.ok).toBe(true);
     if (result.ok) {
@@ -10,11 +10,11 @@ describe('@airiscode/types', () => {
     }
   });
 
-  it('should handle error results', () => {
-    const result = err(new Error('test error'));
+  it("should handle error results", () => {
+    const result = err(new Error("test error"));
     expect(result.ok).toBe(false);
     if (!result.ok) {
-      expect(result.error.message).toBe('test error');
+      expect(result.error.message).toBe("test error");
     }
   });
 });
diff --git a/packages/types/package.json b/packages/types/package.json
index 55653690e..cd82b85df 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -15,7 +15,7 @@
     "build": "tsc",
     "dev": "tsc --watch",
     "clean": "rm -rf dist",
-    "lint": "eslint src --ext .ts",
+    "lint": "biome check .",
     "test": "vitest run"
   },
   "dependencies": {},
diff --git a/packages/types/src/common.ts b/packages/types/src/common.ts
index d13ecd496..70b571945 100644
--- a/packages/types/src/common.ts
+++ b/packages/types/src/common.ts
@@ -17,9 +17,7 @@ export interface SemVer {
   patch: number;
 }
 
-export type Result<T, E = Error> =
-  | { ok: true; value: T }
-  | { ok: false; error: E };
+export type Result<T, E = Error> = { ok: true; value: T } | { ok: false; error: E };
 
 export function ok<T>(value: T): Result<T> {
   return { ok: true, value };
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index cb6247ffa..2f4a3b10a 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -3,4 +3,4 @@
  * Shared TypeScript types for airiscode monorepo
  */
 
-export * from './common.js';
+export * from "./common.js";
diff --git a/packages/ui-gemini/package.json b/packages/ui-gemini/package.json
index 5e9dad7e6..0de708a96 100644
--- a/packages/ui-gemini/package.json
+++ b/packages/ui-gemini/package.json
@@ -12,7 +12,7 @@
     "build": "echo 'Skipping ui-gemini build temporarily (depends on gemini-cli-core)'",
     "build:real": "tsc -b",
     "start": "node dist/index.js",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "biome check .",
     "test": "vitest run",
     "typecheck": "tsc --noEmit"
   },
diff --git a/packages/ui-gemini/src/commands/extensions.test.tsx b/packages/ui-gemini/src/commands/extensions.test.tsx
index d8aae8b35..35ffae05f 100644
--- a/packages/ui-gemini/src/commands/extensions.test.tsx
+++ b/packages/ui-gemini/src/commands/extensions.test.tsx
@@ -4,45 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { extensionsCommand } from './extensions.js';
+import { describe, expect, it, vi } from "vitest";
+import { extensionsCommand } from "./extensions.js";
 
 // Mock subcommands
-vi.mock('./extensions/install.js', () => ({
-  installCommand: { command: 'install' },
+vi.mock("./extensions/install.js", () => ({
+  installCommand: { command: "install" },
 }));
-vi.mock('./extensions/uninstall.js', () => ({
-  uninstallCommand: { command: 'uninstall' },
+vi.mock("./extensions/uninstall.js", () => ({
+  uninstallCommand: { command: "uninstall" },
 }));
-vi.mock('./extensions/list.js', () => ({ listCommand: { command: 'list' } }));
-vi.mock('./extensions/update.js', () => ({
-  updateCommand: { command: 'update' },
+vi.mock("./extensions/list.js", () => ({ listCommand: { command: "list" } }));
+vi.mock("./extensions/update.js", () => ({
+  updateCommand: { command: "update" },
 }));
-vi.mock('./extensions/disable.js', () => ({
-  disableCommand: { command: 'disable' },
+vi.mock("./extensions/disable.js", () => ({
+  disableCommand: { command: "disable" },
 }));
-vi.mock('./extensions/enable.js', () => ({
-  enableCommand: { command: 'enable' },
+vi.mock("./extensions/enable.js", () => ({
+  enableCommand: { command: "enable" },
 }));
-vi.mock('./extensions/link.js', () => ({ linkCommand: { command: 'link' } }));
-vi.mock('./extensions/new.js', () => ({ newCommand: { command: 'new' } }));
-vi.mock('./extensions/validate.js', () => ({
-  validateCommand: { command: 'validate' },
+vi.mock("./extensions/link.js", () => ({ linkCommand: { command: "link" } }));
+vi.mock("./extensions/new.js", () => ({ newCommand: { command: "new" } }));
+vi.mock("./extensions/validate.js", () => ({
+  validateCommand: { command: "validate" },
 }));
 
 // Mock gemini.js
-vi.mock('../gemini.js', () => ({
+vi.mock("../gemini.js", () => ({
   initializeOutputListenersAndFlush: vi.fn(),
 }));
 
-describe('extensionsCommand', () => {
-  it('should have correct command and aliases', () => {
-    expect(extensionsCommand.command).toBe('extensions <command>');
-    expect(extensionsCommand.aliases).toEqual(['extension']);
-    expect(extensionsCommand.describe).toBe('Manage Gemini CLI extensions.');
+describe("extensionsCommand", () => {
+  it("should have correct command and aliases", () => {
+    expect(extensionsCommand.command).toBe("extensions <command>");
+    expect(extensionsCommand.aliases).toEqual(["extension"]);
+    expect(extensionsCommand.describe).toBe("Manage Gemini CLI extensions.");
   });
 
-  it('should register all subcommands in builder', () => {
+  it("should register all subcommands in builder", () => {
     const mockYargs = {
       middleware: vi.fn().mockReturnThis(),
       command: vi.fn().mockReturnThis(),
@@ -54,20 +54,20 @@ describe('extensionsCommand', () => {
     extensionsCommand.builder(mockYargs);
 
     expect(mockYargs.middleware).toHaveBeenCalled();
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'install' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'uninstall' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'list' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'update' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'disable' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'enable' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'link' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'new' });
-    expect(mockYargs.command).toHaveBeenCalledWith({ command: 'validate' });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "install" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "uninstall" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "list" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "update" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "disable" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "enable" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "link" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "new" });
+    expect(mockYargs.command).toHaveBeenCalledWith({ command: "validate" });
     expect(mockYargs.demandCommand).toHaveBeenCalledWith(1, expect.any(String));
     expect(mockYargs.version).toHaveBeenCalledWith(false);
   });
 
-  it('should have a handler that does nothing', () => {
+  it("should have a handler that does nothing", () => {
     // @ts-expect-error - Handler doesn't take arguments in this case
     expect(extensionsCommand.handler()).toBeUndefined();
   });
diff --git a/packages/ui-gemini/src/commands/extensions.tsx b/packages/ui-gemini/src/commands/extensions.tsx
index b2cf160e9..5bf6639b4 100644
--- a/packages/ui-gemini/src/commands/extensions.tsx
+++ b/packages/ui-gemini/src/commands/extensions.tsx
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { installCommand } from './extensions/install.js';
-import { uninstallCommand } from './extensions/uninstall.js';
-import { listCommand } from './extensions/list.js';
-import { updateCommand } from './extensions/update.js';
-import { disableCommand } from './extensions/disable.js';
-import { enableCommand } from './extensions/enable.js';
-import { linkCommand } from './extensions/link.js';
-import { newCommand } from './extensions/new.js';
-import { validateCommand } from './extensions/validate.js';
-import { settingsCommand } from './extensions/settings.js';
-import { initializeOutputListenersAndFlush } from '../gemini.js';
+import type { CommandModule } from "yargs";
+import { initializeOutputListenersAndFlush } from "../gemini.js";
+import { disableCommand } from "./extensions/disable.js";
+import { enableCommand } from "./extensions/enable.js";
+import { installCommand } from "./extensions/install.js";
+import { linkCommand } from "./extensions/link.js";
+import { listCommand } from "./extensions/list.js";
+import { newCommand } from "./extensions/new.js";
+import { settingsCommand } from "./extensions/settings.js";
+import { uninstallCommand } from "./extensions/uninstall.js";
+import { updateCommand } from "./extensions/update.js";
+import { validateCommand } from "./extensions/validate.js";
 
 export const extensionsCommand: CommandModule = {
-  command: 'extensions <command>',
-  aliases: ['extension'],
-  describe: 'Manage Gemini CLI extensions.',
+  command: "extensions <command>",
+  aliases: ["extension"],
+  describe: "Manage Gemini CLI extensions.",
   builder: (yargs) =>
     yargs
       .middleware(() => initializeOutputListenersAndFlush())
@@ -34,7 +34,7 @@ export const extensionsCommand: CommandModule = {
       .command(newCommand)
       .command(validateCommand)
       .command(settingsCommand)
-      .demandCommand(1, 'You need at least one command before continuing.')
+      .demandCommand(1, "You need at least one command before continuing.")
       .version(false),
   handler: () => {
     // This handler is not called when a subcommand is provided.
diff --git a/packages/ui-gemini/src/commands/extensions/disable.test.ts b/packages/ui-gemini/src/commands/extensions/disable.test.ts
index 71aae1592..c9815e23e 100644
--- a/packages/ui-gemini/src/commands/extensions/disable.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/disable.test.ts
@@ -4,40 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { format } from 'node:util';
-import { type CommandModule, type Argv } from 'yargs';
-import { handleDisable, disableCommand } from './disable.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import {
-  loadSettings,
-  SettingScope,
-  type LoadedSettings,
-} from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
+import { format } from "node:util";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Argv, type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { type LoadedSettings, loadSettings, SettingScope } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { disableCommand, handleDisable } from "./disable.js";
 
 // Mock dependencies
 const emitConsoleLog = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
   log: vi.fn((message, ...args) => {
-    emitConsoleLog('log', format(message, ...args));
+    emitConsoleLog("log", format(message, ...args));
   }),
   error: vi.fn((message, ...args) => {
-    emitConsoleLog('error', format(message, ...args));
+    emitConsoleLog("error", format(message, ...args));
   }),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: {
@@ -47,20 +34,20 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('../../config/extension-manager.js');
-vi.mock('../../config/settings.js');
-vi.mock('../../utils/errors.js');
-vi.mock('../../config/extensions/consent.js', () => ({
+vi.mock("../../config/extension-manager.js");
+vi.mock("../../config/settings.js");
+vi.mock("../../utils/errors.js");
+vi.mock("../../config/extensions/consent.js", () => ({
   requestConsentNonInteractive: vi.fn(),
 }));
-vi.mock('../../config/extensions/extensionSettings.js', () => ({
+vi.mock("../../config/extensions/extensionSettings.js", () => ({
   promptForSetting: vi.fn(),
 }));
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions disable command', () => {
+describe("extensions disable command", () => {
   const mockLoadSettings = vi.mocked(loadSettings);
   const mockGetErrorMessage = vi.mocked(getErrorMessage);
   const mockExtensionManager = vi.mocked(ExtensionManager);
@@ -70,92 +57,79 @@ describe('extensions disable command', () => {
     mockLoadSettings.mockReturnValue({
       merged: {},
     } as unknown as LoadedSettings);
-    mockExtensionManager.prototype.loadExtensions = vi
-      .fn()
-      .mockResolvedValue(undefined);
-    mockExtensionManager.prototype.disableExtension = vi
-      .fn()
-      .mockResolvedValue(undefined);
+    mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue(undefined);
+    mockExtensionManager.prototype.disableExtension = vi.fn().mockResolvedValue(undefined);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('handleDisable', () => {
+  describe("handleDisable", () => {
     it.each([
       {
-        name: 'my-extension',
+        name: "my-extension",
         scope: undefined,
         expectedScope: SettingScope.User,
-        expectedLog:
-          'Extension "my-extension" successfully disabled for scope "undefined".',
+        expectedLog: 'Extension "my-extension" successfully disabled for scope "undefined".',
       },
       {
-        name: 'my-extension',
-        scope: 'user',
+        name: "my-extension",
+        scope: "user",
         expectedScope: SettingScope.User,
-        expectedLog:
-          'Extension "my-extension" successfully disabled for scope "user".',
+        expectedLog: 'Extension "my-extension" successfully disabled for scope "user".',
       },
       {
-        name: 'my-extension',
-        scope: 'workspace',
+        name: "my-extension",
+        scope: "workspace",
         expectedScope: SettingScope.Workspace,
-        expectedLog:
-          'Extension "my-extension" successfully disabled for scope "workspace".',
+        expectedLog: 'Extension "my-extension" successfully disabled for scope "workspace".',
       },
-    ])(
-      'should disable an extension in the $expectedScope scope when scope is $scope',
-      async ({ name, scope, expectedScope, expectedLog }) => {
-        const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-        await handleDisable({ name, scope });
-        expect(mockExtensionManager).toHaveBeenCalledWith(
-          expect.objectContaining({
-            workspaceDir: '/test/dir',
-          }),
-        );
-        expect(
-          mockExtensionManager.prototype.loadExtensions,
-        ).toHaveBeenCalled();
-        expect(
-          mockExtensionManager.prototype.disableExtension,
-        ).toHaveBeenCalledWith(name, expectedScope);
-        expect(emitConsoleLog).toHaveBeenCalledWith('log', expectedLog);
-        mockCwd.mockRestore();
-      },
-    );
+    ])("should disable an extension in the $expectedScope scope when scope is $scope", async ({
+      name,
+      scope,
+      expectedScope,
+      expectedLog,
+    }) => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      await handleDisable({ name, scope });
+      expect(mockExtensionManager).toHaveBeenCalledWith(
+        expect.objectContaining({
+          workspaceDir: "/test/dir",
+        }),
+      );
+      expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
+      expect(mockExtensionManager.prototype.disableExtension).toHaveBeenCalledWith(
+        name,
+        expectedScope,
+      );
+      expect(emitConsoleLog).toHaveBeenCalledWith("log", expectedLog);
+      mockCwd.mockRestore();
+    });
 
-    it('should log an error message and exit with code 1 when extension disabling fails', async () => {
+    it("should log an error message and exit with code 1 when extension disabling fails", async () => {
       const mockProcessExit = vi
-        .spyOn(process, 'exit')
-        .mockImplementation((() => {}) as (
-          code?: string | number | null | undefined,
-        ) => never);
-      const error = new Error('Disable failed');
-      (
-        mockExtensionManager.prototype.disableExtension as Mock
-      ).mockRejectedValue(error);
-      mockGetErrorMessage.mockReturnValue('Disable failed message');
-      await handleDisable({ name: 'my-extension' });
-      expect(emitConsoleLog).toHaveBeenCalledWith(
-        'error',
-        'Disable failed message',
-      );
+        .spyOn(process, "exit")
+        .mockImplementation((() => {}) as (code?: string | number | null | undefined) => never);
+      const error = new Error("Disable failed");
+      (mockExtensionManager.prototype.disableExtension as Mock).mockRejectedValue(error);
+      mockGetErrorMessage.mockReturnValue("Disable failed message");
+      await handleDisable({ name: "my-extension" });
+      expect(emitConsoleLog).toHaveBeenCalledWith("error", "Disable failed message");
       expect(mockProcessExit).toHaveBeenCalledWith(1);
       mockProcessExit.mockRestore();
     });
   });
 
-  describe('disableCommand', () => {
+  describe("disableCommand", () => {
     const command = disableCommand as CommandModule;
 
-    it('should have correct command and describe', () => {
-      expect(command.command).toBe('disable [--scope] <name>');
-      expect(command.describe).toBe('Disables an extension.');
+    it("should have correct command and describe", () => {
+      expect(command.command).toBe("disable [--scope] <name>");
+      expect(command.describe).toBe("Disables an extension.");
     });
 
-    describe('builder', () => {
+    describe("builder", () => {
       interface MockYargs {
         positional: Mock;
         option: Mock;
@@ -172,74 +146,69 @@ describe('extensions disable command', () => {
         };
       });
 
-      it('should configure positional and option arguments', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
-        expect(yargsMock.positional).toHaveBeenCalledWith('name', {
-          describe: 'The name of the extension to disable.',
-          type: 'string',
+      it("should configure positional and option arguments", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
+        expect(yargsMock.positional).toHaveBeenCalledWith("name", {
+          describe: "The name of the extension to disable.",
+          type: "string",
         });
-        expect(yargsMock.option).toHaveBeenCalledWith('scope', {
-          describe: 'The scope to disable the extension in.',
-          type: 'string',
+        expect(yargsMock.option).toHaveBeenCalledWith("scope", {
+          describe: "The scope to disable the extension in.",
+          type: "string",
           default: SettingScope.User,
         });
         expect(yargsMock.check).toHaveBeenCalled();
       });
 
-      it('check function should throw for invalid scope', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
+      it("check function should throw for invalid scope", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
         const checkCallback = yargsMock.check.mock.calls[0][0];
         const expectedError = `Invalid scope: invalid. Please use one of ${Object.values(
           SettingScope,
         )
           .map((s) => s.toLowerCase())
-          .join(', ')}.`;
-        expect(() => checkCallback({ scope: 'invalid' })).toThrow(
-          expectedError,
-        );
+          .join(", ")}.`;
+        expect(() => checkCallback({ scope: "invalid" })).toThrow(expectedError);
       });
 
-      it.each(['user', 'workspace', 'USER', 'WorkSpace'])(
-        'check function should return true for valid scope "%s"',
-        (scope) => {
-          (command.builder as (yargs: Argv) => Argv)(
-            yargsMock as unknown as Argv,
-          );
-          const checkCallback = yargsMock.check.mock.calls[0][0];
-          expect(checkCallback({ scope })).toBe(true);
-        },
-      );
+      it.each([
+        "user",
+        "workspace",
+        "USER",
+        "WorkSpace",
+      ])('check function should return true for valid scope "%s"', (scope) => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
+        const checkCallback = yargsMock.check.mock.calls[0][0];
+        expect(checkCallback({ scope })).toBe(true);
+      });
     });
 
-    it('handler should trigger extension disabling', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+    it("handler should trigger extension disabling", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       interface TestArgv {
         name: string;
         scope: string;
         [key: string]: unknown;
       }
       const argv: TestArgv = {
-        name: 'test-ext',
-        scope: 'workspace',
+        name: "test-ext",
+        scope: "workspace",
         _: [],
-        $0: '',
+        $0: "",
       };
       await (command.handler as unknown as (args: TestArgv) => void)(argv);
       expect(mockExtensionManager).toHaveBeenCalledWith(
         expect.objectContaining({
-          workspaceDir: '/test/dir',
+          workspaceDir: "/test/dir",
         }),
       );
       expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
-      expect(
-        mockExtensionManager.prototype.disableExtension,
-      ).toHaveBeenCalledWith('test-ext', SettingScope.Workspace);
+      expect(mockExtensionManager.prototype.disableExtension).toHaveBeenCalledWith(
+        "test-ext",
+        SettingScope.Workspace,
+      );
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "test-ext" successfully disabled for scope "workspace".',
       );
       mockCwd.mockRestore();
diff --git a/packages/ui-gemini/src/commands/extensions/disable.ts b/packages/ui-gemini/src/commands/extensions/disable.ts
index 9ab8fcf8e..ba88314b4 100644
--- a/packages/ui-gemini/src/commands/extensions/disable.ts
+++ b/packages/ui-gemini/src/commands/extensions/disable.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type CommandModule } from 'yargs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { exitCli } from "../utils.js";
 
 interface DisableArgs {
   name: string;
@@ -29,17 +29,12 @@ export async function handleDisable(args: DisableArgs) {
   await extensionManager.loadExtensions();
 
   try {
-    if (args.scope?.toLowerCase() === 'workspace') {
-      await extensionManager.disableExtension(
-        args.name,
-        SettingScope.Workspace,
-      );
+    if (args.scope?.toLowerCase() === "workspace") {
+      await extensionManager.disableExtension(args.name, SettingScope.Workspace);
     } else {
       await extensionManager.disableExtension(args.name, SettingScope.User);
     }
-    debugLogger.log(
-      `Extension "${args.name}" successfully disabled for scope "${args.scope}".`,
-    );
+    debugLogger.log(`Extension "${args.name}" successfully disabled for scope "${args.scope}".`);
   } catch (error) {
     debugLogger.error(getErrorMessage(error));
     process.exit(1);
@@ -47,17 +42,17 @@ export async function handleDisable(args: DisableArgs) {
 }
 
 export const disableCommand: CommandModule = {
-  command: 'disable [--scope] <name>',
-  describe: 'Disables an extension.',
+  command: "disable [--scope] <name>",
+  describe: "Disables an extension.",
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: 'The name of the extension to disable.',
-        type: 'string',
+      .positional("name", {
+        describe: "The name of the extension to disable.",
+        type: "string",
       })
-      .option('scope', {
-        describe: 'The scope to disable the extension in.',
-        type: 'string',
+      .option("scope", {
+        describe: "The scope to disable the extension in.",
+        type: "string",
         default: SettingScope.User,
       })
       .check((argv) => {
@@ -68,19 +63,17 @@ export const disableCommand: CommandModule = {
             .includes((argv.scope as string).toLowerCase())
         ) {
           throw new Error(
-            `Invalid scope: ${argv.scope}. Please use one of ${Object.values(
-              SettingScope,
-            )
+            `Invalid scope: ${argv.scope}. Please use one of ${Object.values(SettingScope)
               .map((s) => s.toLowerCase())
-              .join(', ')}.`,
+              .join(", ")}.`,
           );
         }
         return true;
       }),
   handler: async (argv) => {
     await handleDisable({
-      name: argv['name'] as string,
-      scope: argv['scope'] as string,
+      name: argv["name"] as string,
+      scope: argv["scope"] as string,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/extensions/enable.test.ts b/packages/ui-gemini/src/commands/extensions/enable.test.ts
index f0877477b..a40c90467 100644
--- a/packages/ui-gemini/src/commands/extensions/enable.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/enable.test.ts
@@ -4,40 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { format } from 'node:util';
-import { type CommandModule, type Argv } from 'yargs';
-import { handleEnable, enableCommand } from './enable.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import {
-  loadSettings,
-  SettingScope,
-  type LoadedSettings,
-} from '../../config/settings.js';
-import { FatalConfigError } from '@airiscode/gemini-cli-core';
+import { format } from "node:util";
+import { FatalConfigError } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Argv, type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { type LoadedSettings, loadSettings, SettingScope } from "../../config/settings.js";
+import { enableCommand, handleEnable } from "./enable.js";
 
 // Mock dependencies
 const emitConsoleLog = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
   log: vi.fn((message, ...args) => {
-    emitConsoleLog('log', format(message, ...args));
+    emitConsoleLog("log", format(message, ...args));
   }),
   error: vi.fn((message, ...args) => {
-    emitConsoleLog('error', format(message, ...args));
+    emitConsoleLog("error", format(message, ...args));
   }),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: {
@@ -48,21 +35,21 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
     FatalConfigError: class extends Error {
       constructor(message: string) {
         super(message);
-        this.name = 'FatalConfigError';
+        this.name = "FatalConfigError";
       }
     },
   };
 });
 
-vi.mock('../../config/extension-manager.js');
-vi.mock('../../config/settings.js');
-vi.mock('../../config/extensions/consent.js');
-vi.mock('../../config/extensions/extensionSettings.js');
-vi.mock('../utils.js', () => ({
+vi.mock("../../config/extension-manager.js");
+vi.mock("../../config/settings.js");
+vi.mock("../../config/extensions/consent.js");
+vi.mock("../../config/extensions/extensionSettings.js");
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions enable command', () => {
+describe("extensions enable command", () => {
   const mockLoadSettings = vi.mocked(loadSettings);
   const mockExtensionManager = vi.mocked(ExtensionManager);
 
@@ -71,9 +58,7 @@ describe('extensions enable command', () => {
     mockLoadSettings.mockReturnValue({
       merged: {},
     } as unknown as LoadedSettings);
-    mockExtensionManager.prototype.loadExtensions = vi
-      .fn()
-      .mockResolvedValue(undefined);
+    mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue(undefined);
     mockExtensionManager.prototype.enableExtension = vi.fn();
   });
 
@@ -81,70 +66,67 @@ describe('extensions enable command', () => {
     vi.restoreAllMocks();
   });
 
-  describe('handleEnable', () => {
+  describe("handleEnable", () => {
     it.each([
       {
-        name: 'my-extension',
+        name: "my-extension",
         scope: undefined,
         expectedScope: SettingScope.User,
-        expectedLog:
-          'Extension "my-extension" successfully enabled in all scopes.',
+        expectedLog: 'Extension "my-extension" successfully enabled in all scopes.',
       },
       {
-        name: 'my-extension',
-        scope: 'workspace',
+        name: "my-extension",
+        scope: "workspace",
         expectedScope: SettingScope.Workspace,
-        expectedLog:
-          'Extension "my-extension" successfully enabled for scope "workspace".',
+        expectedLog: 'Extension "my-extension" successfully enabled for scope "workspace".',
       },
-    ])(
-      'should enable an extension in the $expectedScope scope when scope is $scope',
-      async ({ name, scope, expectedScope, expectedLog }) => {
-        const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-        await handleEnable({ name, scope });
-
-        expect(mockExtensionManager).toHaveBeenCalledWith(
-          expect.objectContaining({
-            workspaceDir: '/test/dir',
-          }),
-        );
-        expect(
-          mockExtensionManager.prototype.loadExtensions,
-        ).toHaveBeenCalled();
-        expect(
-          mockExtensionManager.prototype.enableExtension,
-        ).toHaveBeenCalledWith(name, expectedScope);
-        expect(emitConsoleLog).toHaveBeenCalledWith('log', expectedLog);
-        mockCwd.mockRestore();
-      },
-    );
-
-    it('should throw FatalConfigError when extension enabling fails', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-      const error = new Error('Enable failed');
-      (
-        mockExtensionManager.prototype.enableExtension as Mock
-      ).mockImplementation(() => {
+    ])("should enable an extension in the $expectedScope scope when scope is $scope", async ({
+      name,
+      scope,
+      expectedScope,
+      expectedLog,
+    }) => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      await handleEnable({ name, scope });
+
+      expect(mockExtensionManager).toHaveBeenCalledWith(
+        expect.objectContaining({
+          workspaceDir: "/test/dir",
+        }),
+      );
+      expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
+      expect(mockExtensionManager.prototype.enableExtension).toHaveBeenCalledWith(
+        name,
+        expectedScope,
+      );
+      expect(emitConsoleLog).toHaveBeenCalledWith("log", expectedLog);
+      mockCwd.mockRestore();
+    });
+
+    it("should throw FatalConfigError when extension enabling fails", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      const error = new Error("Enable failed");
+      (mockExtensionManager.prototype.enableExtension as Mock).mockImplementation(() => {
         throw error;
       });
 
-      const promise = handleEnable({ name: 'my-extension' });
+      const promise = handleEnable({ name: "my-extension" });
       await expect(promise).rejects.toThrow(FatalConfigError);
-      await expect(promise).rejects.toThrow('Enable failed');
+      await expect(promise).rejects.toThrow("Enable failed");
 
       mockCwd.mockRestore();
     });
   });
 
-  describe('enableCommand', () => {
+  describe("enableCommand", () => {
     const command = enableCommand as CommandModule;
 
-    it('should have correct command and describe', () => {
-      expect(command.command).toBe('enable [--scope] <name>');
-      expect(command.describe).toBe('Enables an extension.');
+    it("should have correct command and describe", () => {
+      expect(command.command).toBe("enable [--scope] <name>");
+      expect(command.describe).toBe("Enables an extension.");
     });
 
-    describe('builder', () => {
+    describe("builder", () => {
       interface MockYargs {
         positional: Mock;
         option: Mock;
@@ -160,56 +142,51 @@ describe('extensions enable command', () => {
         };
       });
 
-      it('should configure positional and option arguments', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
-        expect(yargsMock.positional).toHaveBeenCalledWith('name', {
-          describe: 'The name of the extension to enable.',
-          type: 'string',
+      it("should configure positional and option arguments", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
+        expect(yargsMock.positional).toHaveBeenCalledWith("name", {
+          describe: "The name of the extension to enable.",
+          type: "string",
         });
-        expect(yargsMock.option).toHaveBeenCalledWith('scope', {
+        expect(yargsMock.option).toHaveBeenCalledWith("scope", {
           describe:
-            'The scope to enable the extension in. If not set, will be enabled in all scopes.',
-          type: 'string',
+            "The scope to enable the extension in. If not set, will be enabled in all scopes.",
+          type: "string",
         });
         expect(yargsMock.check).toHaveBeenCalled();
       });
 
-      it('check function should throw for invalid scope', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
+      it("check function should throw for invalid scope", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
         const checkCallback = yargsMock.check.mock.calls[0][0];
         const expectedError = `Invalid scope: invalid. Please use one of ${Object.values(
           SettingScope,
         )
           .map((s) => s.toLowerCase())
-          .join(', ')}.`;
-        expect(() => checkCallback({ scope: 'invalid' })).toThrow(
-          expectedError,
-        );
+          .join(", ")}.`;
+        expect(() => checkCallback({ scope: "invalid" })).toThrow(expectedError);
       });
     });
 
-    it('handler should call handleEnable', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+    it("handler should call handleEnable", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       interface TestArgv {
         name: string;
         scope: string;
         [key: string]: unknown;
       }
       const argv: TestArgv = {
-        name: 'test-ext',
-        scope: 'workspace',
+        name: "test-ext",
+        scope: "workspace",
         _: [],
-        $0: '',
+        $0: "",
       };
       await (command.handler as unknown as (args: TestArgv) => void)(argv);
 
-      expect(
-        mockExtensionManager.prototype.enableExtension,
-      ).toHaveBeenCalledWith('test-ext', SettingScope.Workspace);
+      expect(mockExtensionManager.prototype.enableExtension).toHaveBeenCalledWith(
+        "test-ext",
+        SettingScope.Workspace,
+      );
       mockCwd.mockRestore();
     });
   });
diff --git a/packages/ui-gemini/src/commands/extensions/enable.ts b/packages/ui-gemini/src/commands/extensions/enable.ts
index 6e6b26396..cb95535d0 100644
--- a/packages/ui-gemini/src/commands/extensions/enable.ts
+++ b/packages/ui-gemini/src/commands/extensions/enable.ts
@@ -4,17 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type CommandModule } from 'yargs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import {
-  debugLogger,
-  FatalConfigError,
-  getErrorMessage,
-} from '@airiscode/gemini-cli-core';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
+import { debugLogger, FatalConfigError, getErrorMessage } from "@airiscode/gemini-cli-core";
+import { type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { exitCli } from "../utils.js";
 
 interface EnableArgs {
   name: string;
@@ -32,19 +28,15 @@ export async function handleEnable(args: EnableArgs) {
   await extensionManager.loadExtensions();
 
   try {
-    if (args.scope?.toLowerCase() === 'workspace') {
+    if (args.scope?.toLowerCase() === "workspace") {
       await extensionManager.enableExtension(args.name, SettingScope.Workspace);
     } else {
       await extensionManager.enableExtension(args.name, SettingScope.User);
     }
     if (args.scope) {
-      debugLogger.log(
-        `Extension "${args.name}" successfully enabled for scope "${args.scope}".`,
-      );
+      debugLogger.log(`Extension "${args.name}" successfully enabled for scope "${args.scope}".`);
     } else {
-      debugLogger.log(
-        `Extension "${args.name}" successfully enabled in all scopes.`,
-      );
+      debugLogger.log(`Extension "${args.name}" successfully enabled in all scopes.`);
     }
   } catch (error) {
     throw new FatalConfigError(getErrorMessage(error));
@@ -52,18 +44,18 @@ export async function handleEnable(args: EnableArgs) {
 }
 
 export const enableCommand: CommandModule = {
-  command: 'enable [--scope] <name>',
-  describe: 'Enables an extension.',
+  command: "enable [--scope] <name>",
+  describe: "Enables an extension.",
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: 'The name of the extension to enable.',
-        type: 'string',
+      .positional("name", {
+        describe: "The name of the extension to enable.",
+        type: "string",
       })
-      .option('scope', {
+      .option("scope", {
         describe:
-          'The scope to enable the extension in. If not set, will be enabled in all scopes.',
-        type: 'string',
+          "The scope to enable the extension in. If not set, will be enabled in all scopes.",
+        type: "string",
       })
       .check((argv) => {
         if (
@@ -73,19 +65,17 @@ export const enableCommand: CommandModule = {
             .includes((argv.scope as string).toLowerCase())
         ) {
           throw new Error(
-            `Invalid scope: ${argv.scope}. Please use one of ${Object.values(
-              SettingScope,
-            )
+            `Invalid scope: ${argv.scope}. Please use one of ${Object.values(SettingScope)
               .map((s) => s.toLowerCase())
-              .join(', ')}.`,
+              .join(", ")}.`,
           );
         }
         return true;
       }),
   handler: async (argv) => {
     await handleEnable({
-      name: argv['name'] as string,
-      scope: argv['scope'] as string,
+      name: argv["name"] as string,
+      scope: argv["scope"] as string,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.test.ts b/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.test.ts
index 6b732ae98..bd0ac6183 100644
--- a/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.test.ts
@@ -4,25 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { z } from 'zod';
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { z } from "zod";
 
 // Mock the MCP server and transport
 const mockRegisterTool = vi.fn();
 const mockRegisterPrompt = vi.fn();
 const mockConnect = vi.fn();
 
-vi.mock('@modelcontextprotocol/sdk/server/mcp.js', () => ({
+vi.mock("@modelcontextprotocol/sdk/server/mcp.js", () => ({
   McpServer: vi.fn().mockImplementation(() => ({
     registerTool: mockRegisterTool,
     registerPrompt: mockRegisterPrompt,
@@ -30,14 +22,14 @@ vi.mock('@modelcontextprotocol/sdk/server/mcp.js', () => ({
   })),
 }));
 
-vi.mock('@modelcontextprotocol/sdk/server/stdio.js', () => ({
+vi.mock("@modelcontextprotocol/sdk/server/stdio.js", () => ({
   StdioServerTransport: vi.fn(),
 }));
 
-describe('MCP Server Example', () => {
+describe("MCP Server Example", () => {
   beforeEach(async () => {
     // Dynamically import the server setup after mocks are in place
-    await import('./example.js');
+    await import("./example.js");
   });
 
   afterEach(() => {
@@ -45,18 +37,18 @@ describe('MCP Server Example', () => {
     vi.resetModules();
   });
 
-  it('should create an McpServer with the correct name and version', () => {
+  it("should create an McpServer with the correct name and version", () => {
     expect(McpServer).toHaveBeenCalledWith({
-      name: 'prompt-server',
-      version: '1.0.0',
+      name: "prompt-server",
+      version: "1.0.0",
     });
   });
 
   it('should register the "fetch_posts" tool', () => {
     expect(mockRegisterTool).toHaveBeenCalledWith(
-      'fetch_posts',
+      "fetch_posts",
       {
-        description: 'Fetches a list of posts from a public API.',
+        description: "Fetches a list of posts from a public API.",
         inputSchema: z.object({}).shape,
       },
       expect.any(Function),
@@ -65,26 +57,26 @@ describe('MCP Server Example', () => {
 
   it('should register the "poem-writer" prompt', () => {
     expect(mockRegisterPrompt).toHaveBeenCalledWith(
-      'poem-writer',
+      "poem-writer",
       {
-        title: 'Poem Writer',
-        description: 'Write a nice haiku',
+        title: "Poem Writer",
+        description: "Write a nice haiku",
         argsSchema: expect.any(Object),
       },
       expect.any(Function),
     );
   });
 
-  it('should connect the server to an StdioServerTransport', () => {
+  it("should connect the server to an StdioServerTransport", () => {
     expect(StdioServerTransport).toHaveBeenCalled();
     expect(mockConnect).toHaveBeenCalledWith(expect.any(StdioServerTransport));
   });
 
-  describe('fetch_posts tool implementation', () => {
-    it('should fetch posts and return a formatted response', async () => {
+  describe("fetch_posts tool implementation", () => {
+    it("should fetch posts and return a formatted response", async () => {
       const mockPosts = [
-        { id: 1, title: 'Post 1' },
-        { id: 2, title: 'Post 2' },
+        { id: 1, title: "Post 1" },
+        { id: 2, title: "Post 2" },
       ];
       global.fetch = vi.fn().mockResolvedValue({
         json: vi.fn().mockResolvedValue(mockPosts),
@@ -93,13 +85,11 @@ describe('MCP Server Example', () => {
       const toolFn = (mockRegisterTool as Mock).mock.calls[0][2];
       const result = await toolFn();
 
-      expect(global.fetch).toHaveBeenCalledWith(
-        'https://jsonplaceholder.typicode.com/posts',
-      );
+      expect(global.fetch).toHaveBeenCalledWith("https://jsonplaceholder.typicode.com/posts");
       expect(result).toEqual({
         content: [
           {
-            type: 'text',
+            type: "text",
             text: JSON.stringify({ posts: mockPosts }),
           },
         ],
@@ -107,33 +97,33 @@ describe('MCP Server Example', () => {
     });
   });
 
-  describe('poem-writer prompt implementation', () => {
-    it('should generate a prompt with a title', () => {
+  describe("poem-writer prompt implementation", () => {
+    it("should generate a prompt with a title", () => {
       const promptFn = (mockRegisterPrompt as Mock).mock.calls[0][2];
-      const result = promptFn({ title: 'My Poem' });
+      const result = promptFn({ title: "My Poem" });
       expect(result).toEqual({
         messages: [
           {
-            role: 'user',
+            role: "user",
             content: {
-              type: 'text',
-              text: 'Write a haiku called My Poem. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables ',
+              type: "text",
+              text: "Write a haiku called My Poem. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables ",
             },
           },
         ],
       });
     });
 
-    it('should generate a prompt with a title and mood', () => {
+    it("should generate a prompt with a title and mood", () => {
       const promptFn = (mockRegisterPrompt as Mock).mock.calls[0][2];
-      const result = promptFn({ title: 'My Poem', mood: 'sad' });
+      const result = promptFn({ title: "My Poem", mood: "sad" });
       expect(result).toEqual({
         messages: [
           {
-            role: 'user',
+            role: "user",
             content: {
-              type: 'text',
-              text: 'Write a haiku with the mood sad called My Poem. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables ',
+              type: "text",
+              text: "Write a haiku with the mood sad called My Poem. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables ",
             },
           },
         ],
diff --git a/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.ts b/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.ts
index 21e01e17c..c946453e6 100644
--- a/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.ts
+++ b/packages/ui-gemini/src/commands/extensions/examples/mcp-server/example.ts
@@ -4,31 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { z } from 'zod';
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { z } from "zod";
 
 const server = new McpServer({
-  name: 'prompt-server',
-  version: '1.0.0',
+  name: "prompt-server",
+  version: "1.0.0",
 });
 
 server.registerTool(
-  'fetch_posts',
+  "fetch_posts",
   {
-    description: 'Fetches a list of posts from a public API.',
+    description: "Fetches a list of posts from a public API.",
     inputSchema: z.object({}).shape,
   },
   async () => {
-    const apiResponse = await fetch(
-      'https://jsonplaceholder.typicode.com/posts',
-    );
+    const apiResponse = await fetch("https://jsonplaceholder.typicode.com/posts");
     const posts = await apiResponse.json();
     const response = { posts: posts.slice(0, 5) };
     return {
       content: [
         {
-          type: 'text',
+          type: "text",
           text: JSON.stringify(response),
         },
       ],
@@ -37,19 +35,19 @@ server.registerTool(
 );
 
 server.registerPrompt(
-  'poem-writer',
+  "poem-writer",
   {
-    title: 'Poem Writer',
-    description: 'Write a nice haiku',
+    title: "Poem Writer",
+    description: "Write a nice haiku",
     argsSchema: { title: z.string(), mood: z.string().optional() },
   },
   ({ title, mood }) => ({
     messages: [
       {
-        role: 'user',
+        role: "user",
         content: {
-          type: 'text',
-          text: `Write a haiku${mood ? ` with the mood ${mood}` : ''} called ${title}. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables `,
+          type: "text",
+          text: `Write a haiku${mood ? ` with the mood ${mood}` : ""} called ${title}. Note that a haiku is 5 syllables followed by 7 syllables followed by 5 syllables `,
         },
       },
     ],
diff --git a/packages/ui-gemini/src/commands/extensions/install.test.ts b/packages/ui-gemini/src/commands/extensions/install.test.ts
index 30d584817..1a14c4b93 100644
--- a/packages/ui-gemini/src/commands/extensions/install.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/install.test.ts
@@ -4,30 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, type MockInstance, type Mock } from 'vitest';
-import { handleInstall, installCommand } from './install.js';
-import yargs from 'yargs';
-import { debugLogger, type GeminiCLIExtension } from '@airiscode/gemini-cli-core';
-import type { ExtensionManager } from '../../config/extension-manager.js';
-import type { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import type * as fs from 'node:fs/promises';
-import type { Stats } from 'node:fs';
+import type { Stats } from "node:fs";
+import type * as fs from "node:fs/promises";
+import { debugLogger, type GeminiCLIExtension } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, type Mock, type MockInstance, vi } from "vitest";
+import yargs from "yargs";
+import type { ExtensionManager } from "../../config/extension-manager.js";
+import type { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { handleInstall, installCommand } from "./install.js";
 
 const mockInstallOrUpdateExtension: Mock<
   typeof ExtensionManager.prototype.installOrUpdateExtension
 > = vi.hoisted(() => vi.fn());
-const mockRequestConsentNonInteractive: Mock<
-  typeof requestConsentNonInteractive
-> = vi.hoisted(() => vi.fn());
+const mockRequestConsentNonInteractive: Mock<typeof requestConsentNonInteractive> = vi.hoisted(() =>
+  vi.fn(),
+);
 const mockStat: Mock<typeof fs.stat> = vi.hoisted(() => vi.fn());
 
-vi.mock('../../config/extensions/consent.js', () => ({
+vi.mock("../../config/extensions/consent.js", () => ({
   requestConsentNonInteractive: mockRequestConsentNonInteractive,
 }));
 
-vi.mock('../../config/extension-manager.ts', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../../config/extension-manager.js')>();
+vi.mock("../../config/extension-manager.ts", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../../config/extension-manager.js")>();
   return {
     ...actual,
     ExtensionManager: vi.fn().mockImplementation(() => ({
@@ -37,41 +36,39 @@ vi.mock('../../config/extension-manager.ts', async (importOriginal) => {
   };
 });
 
-vi.mock('../../utils/errors.js', () => ({
+vi.mock("../../utils/errors.js", () => ({
   getErrorMessage: vi.fn((error: Error) => error.message),
 }));
 
-vi.mock('node:fs/promises', () => ({
+vi.mock("node:fs/promises", () => ({
   stat: mockStat,
   default: {
     stat: mockStat,
   },
 }));
 
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions install command', () => {
-  it('should fail if no source is provided', () => {
+describe("extensions install command", () => {
+  it("should fail if no source is provided", () => {
     const validationParser = yargs([]).command(installCommand).fail(false);
-    expect(() => validationParser.parse('install')).toThrow(
-      'Not enough non-option arguments: got 0, need at least 1',
+    expect(() => validationParser.parse("install")).toThrow(
+      "Not enough non-option arguments: got 0, need at least 1",
     );
   });
 });
 
-describe('handleInstall', () => {
+describe("handleInstall", () => {
   let debugLogSpy: MockInstance;
   let debugErrorSpy: MockInstance;
   let processSpy: MockInstance;
 
   beforeEach(() => {
-    debugLogSpy = vi.spyOn(debugLogger, 'log');
-    debugErrorSpy = vi.spyOn(debugLogger, 'error');
-    processSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation(() => undefined as never);
+    debugLogSpy = vi.spyOn(debugLogger, "log");
+    debugErrorSpy = vi.spyOn(debugLogger, "error");
+    processSpy = vi.spyOn(process, "exit").mockImplementation(() => undefined as never);
   });
 
   afterEach(() => {
@@ -81,13 +78,13 @@ describe('handleInstall', () => {
     vi.clearAllMocks();
   });
 
-  it('should install an extension from a http source', async () => {
+  it("should install an extension from a http source", async () => {
     mockInstallOrUpdateExtension.mockResolvedValue({
-      name: 'http-extension',
+      name: "http-extension",
     } as unknown as GeminiCLIExtension);
 
     await handleInstall({
-      source: 'http://google.com',
+      source: "http://google.com",
     });
 
     expect(debugLogSpy).toHaveBeenCalledWith(
@@ -95,13 +92,13 @@ describe('handleInstall', () => {
     );
   });
 
-  it('should install an extension from a https source', async () => {
+  it("should install an extension from a https source", async () => {
     mockInstallOrUpdateExtension.mockResolvedValue({
-      name: 'https-extension',
+      name: "https-extension",
     } as unknown as GeminiCLIExtension);
 
     await handleInstall({
-      source: 'https://google.com',
+      source: "https://google.com",
     });
 
     expect(debugLogSpy).toHaveBeenCalledWith(
@@ -109,13 +106,13 @@ describe('handleInstall', () => {
     );
   });
 
-  it('should install an extension from a git source', async () => {
+  it("should install an extension from a git source", async () => {
     mockInstallOrUpdateExtension.mockResolvedValue({
-      name: 'git-extension',
+      name: "git-extension",
     } as unknown as GeminiCLIExtension);
 
     await handleInstall({
-      source: 'git@some-url',
+      source: "git@some-url",
     });
 
     expect(debugLogSpy).toHaveBeenCalledWith(
@@ -123,23 +120,23 @@ describe('handleInstall', () => {
     );
   });
 
-  it('throws an error from an unknown source', async () => {
-    mockStat.mockRejectedValue(new Error('ENOENT: no such file or directory'));
+  it("throws an error from an unknown source", async () => {
+    mockStat.mockRejectedValue(new Error("ENOENT: no such file or directory"));
     await handleInstall({
-      source: 'test://google.com',
+      source: "test://google.com",
     });
 
-    expect(debugErrorSpy).toHaveBeenCalledWith('Install source not found.');
+    expect(debugErrorSpy).toHaveBeenCalledWith("Install source not found.");
     expect(processSpy).toHaveBeenCalledWith(1);
   });
 
-  it('should install an extension from a sso source', async () => {
+  it("should install an extension from a sso source", async () => {
     mockInstallOrUpdateExtension.mockResolvedValue({
-      name: 'sso-extension',
+      name: "sso-extension",
     } as unknown as GeminiCLIExtension);
 
     await handleInstall({
-      source: 'sso://google.com',
+      source: "sso://google.com",
     });
 
     expect(debugLogSpy).toHaveBeenCalledWith(
@@ -147,13 +144,13 @@ describe('handleInstall', () => {
     );
   });
 
-  it('should install an extension from a local path', async () => {
+  it("should install an extension from a local path", async () => {
     mockInstallOrUpdateExtension.mockResolvedValue({
-      name: 'local-extension',
+      name: "local-extension",
     } as unknown as GeminiCLIExtension);
     mockStat.mockResolvedValue({} as Stats);
     await handleInstall({
-      source: '/some/path',
+      source: "/some/path",
     });
 
     expect(debugLogSpy).toHaveBeenCalledWith(
@@ -161,14 +158,12 @@ describe('handleInstall', () => {
     );
   });
 
-  it('should throw an error if install extension fails', async () => {
-    mockInstallOrUpdateExtension.mockRejectedValue(
-      new Error('Install extension failed'),
-    );
+  it("should throw an error if install extension fails", async () => {
+    mockInstallOrUpdateExtension.mockRejectedValue(new Error("Install extension failed"));
 
-    await handleInstall({ source: 'git@some-url' });
+    await handleInstall({ source: "git@some-url" });
 
-    expect(debugErrorSpy).toHaveBeenCalledWith('Install extension failed');
+    expect(debugErrorSpy).toHaveBeenCalledWith("Install extension failed");
     expect(processSpy).toHaveBeenCalledWith(1);
   });
 });
diff --git a/packages/ui-gemini/src/commands/extensions/install.ts b/packages/ui-gemini/src/commands/extensions/install.ts
index ad6f3a2cd..4dd896916 100644
--- a/packages/ui-gemini/src/commands/extensions/install.ts
+++ b/packages/ui-gemini/src/commands/extensions/install.ts
@@ -4,21 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import {
-  debugLogger,
-  type ExtensionInstallMetadata,
-} from '@airiscode/gemini-cli-core';
-import { getErrorMessage } from '../../utils/errors.js';
-import { stat } from 'node:fs/promises';
+import { stat } from "node:fs/promises";
+import { debugLogger, type ExtensionInstallMetadata } from "@airiscode/gemini-cli-core";
+import type { CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
 import {
   INSTALL_WARNING_MESSAGE,
   requestConsentNonInteractive,
-} from '../../config/extensions/consent.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings } from '../../config/settings.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
+} from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { exitCli } from "../utils.js";
 
 interface InstallArgs {
   source: string;
@@ -33,32 +30,30 @@ export async function handleInstall(args: InstallArgs) {
     let installMetadata: ExtensionInstallMetadata;
     const { source } = args;
     if (
-      source.startsWith('http://') ||
-      source.startsWith('https://') ||
-      source.startsWith('git@') ||
-      source.startsWith('sso://')
+      source.startsWith("http://") ||
+      source.startsWith("https://") ||
+      source.startsWith("git@") ||
+      source.startsWith("sso://")
     ) {
       installMetadata = {
         source,
-        type: 'git',
+        type: "git",
         ref: args.ref,
         autoUpdate: args.autoUpdate,
         allowPreRelease: args.allowPreRelease,
       };
     } else {
       if (args.ref || args.autoUpdate) {
-        throw new Error(
-          '--ref and --auto-update are not applicable for local extensions.',
-        );
+        throw new Error("--ref and --auto-update are not applicable for local extensions.");
       }
       try {
         await stat(source);
         installMetadata = {
           source,
-          type: 'local',
+          type: "local",
         };
       } catch {
-        throw new Error('Install source not found.');
+        throw new Error("Install source not found.");
       }
     }
 
@@ -66,7 +61,7 @@ export async function handleInstall(args: InstallArgs) {
       ? () => Promise.resolve(true)
       : requestConsentNonInteractive;
     if (args.consent) {
-      debugLogger.log('You have consented to the following:');
+      debugLogger.log("You have consented to the following:");
       debugLogger.log(INSTALL_WARNING_MESSAGE);
     }
 
@@ -78,11 +73,8 @@ export async function handleInstall(args: InstallArgs) {
       settings: loadSettings(workspaceDir).merged,
     });
     await extensionManager.loadExtensions();
-    const extension =
-      await extensionManager.installOrUpdateExtension(installMetadata);
-    debugLogger.log(
-      `Extension "${extension.name}" installed successfully and enabled.`,
-    );
+    const extension = await extensionManager.installOrUpdateExtension(installMetadata);
+    debugLogger.log(`Extension "${extension.name}" installed successfully and enabled.`);
   } catch (error) {
     debugLogger.error(getErrorMessage(error));
     process.exit(1);
@@ -90,46 +82,46 @@ export async function handleInstall(args: InstallArgs) {
 }
 
 export const installCommand: CommandModule = {
-  command: 'install <source> [--auto-update] [--pre-release]',
-  describe: 'Installs an extension from a git repository URL or a local path.',
+  command: "install <source> [--auto-update] [--pre-release]",
+  describe: "Installs an extension from a git repository URL or a local path.",
   builder: (yargs) =>
     yargs
-      .positional('source', {
-        describe: 'The github URL or local path of the extension to install.',
-        type: 'string',
+      .positional("source", {
+        describe: "The github URL or local path of the extension to install.",
+        type: "string",
         demandOption: true,
       })
-      .option('ref', {
-        describe: 'The git ref to install from.',
-        type: 'string',
+      .option("ref", {
+        describe: "The git ref to install from.",
+        type: "string",
       })
-      .option('auto-update', {
-        describe: 'Enable auto-update for this extension.',
-        type: 'boolean',
+      .option("auto-update", {
+        describe: "Enable auto-update for this extension.",
+        type: "boolean",
       })
-      .option('pre-release', {
-        describe: 'Enable pre-release versions for this extension.',
-        type: 'boolean',
+      .option("pre-release", {
+        describe: "Enable pre-release versions for this extension.",
+        type: "boolean",
       })
-      .option('consent', {
+      .option("consent", {
         describe:
-          'Acknowledge the security risks of installing an extension and skip the confirmation prompt.',
-        type: 'boolean',
+          "Acknowledge the security risks of installing an extension and skip the confirmation prompt.",
+        type: "boolean",
         default: false,
       })
       .check((argv) => {
         if (!argv.source) {
-          throw new Error('The source argument must be provided.');
+          throw new Error("The source argument must be provided.");
         }
         return true;
       }),
   handler: async (argv) => {
     await handleInstall({
-      source: argv['source'] as string,
-      ref: argv['ref'] as string | undefined,
-      autoUpdate: argv['auto-update'] as boolean | undefined,
-      allowPreRelease: argv['pre-release'] as boolean | undefined,
-      consent: argv['consent'] as boolean | undefined,
+      source: argv["source"] as string,
+      ref: argv["ref"] as string | undefined,
+      autoUpdate: argv["auto-update"] as boolean | undefined,
+      allowPreRelease: argv["pre-release"] as boolean | undefined,
+      consent: argv["consent"] as boolean | undefined,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/extensions/link.test.ts b/packages/ui-gemini/src/commands/extensions/link.test.ts
index f7972d300..664140513 100644
--- a/packages/ui-gemini/src/commands/extensions/link.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/link.test.ts
@@ -4,36 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { format } from 'node:util';
-import { type CommandModule, type Argv } from 'yargs';
-import { handleLink, linkCommand } from './link.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings, type LoadedSettings } from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
+import { format } from "node:util";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Argv, type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { type LoadedSettings, loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { handleLink, linkCommand } from "./link.js";
 
 // Mock dependencies
 const emitConsoleLog = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
   log: vi.fn((message, ...args) => {
-    emitConsoleLog('log', format(message, ...args));
+    emitConsoleLog("log", format(message, ...args));
   }),
   error: vi.fn((message, ...args) => {
-    emitConsoleLog('error', format(message, ...args));
+    emitConsoleLog("error", format(message, ...args));
   }),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: {
@@ -43,20 +34,20 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('../../config/extension-manager.js');
-vi.mock('../../config/settings.js');
-vi.mock('../../utils/errors.js');
-vi.mock('../../config/extensions/consent.js', () => ({
+vi.mock("../../config/extension-manager.js");
+vi.mock("../../config/settings.js");
+vi.mock("../../utils/errors.js");
+vi.mock("../../config/extensions/consent.js", () => ({
   requestConsentNonInteractive: vi.fn(),
 }));
-vi.mock('../../config/extensions/extensionSettings.js', () => ({
+vi.mock("../../config/extensions/extensionSettings.js", () => ({
   promptForSetting: vi.fn(),
 }));
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions link command', () => {
+describe("extensions link command", () => {
   const mockLoadSettings = vi.mocked(loadSettings);
   const mockGetErrorMessage = vi.mocked(getErrorMessage);
   const mockExtensionManager = vi.mocked(ExtensionManager);
@@ -66,76 +57,65 @@ describe('extensions link command', () => {
     mockLoadSettings.mockReturnValue({
       merged: {},
     } as unknown as LoadedSettings);
-    mockExtensionManager.prototype.loadExtensions = vi
-      .fn()
-      .mockResolvedValue(undefined);
+    mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue(undefined);
     mockExtensionManager.prototype.installOrUpdateExtension = vi
       .fn()
-      .mockResolvedValue({ name: 'my-linked-extension' });
+      .mockResolvedValue({ name: "my-linked-extension" });
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('handleLink', () => {
-    it('should link an extension from a local path', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-      await handleLink({ path: '/local/path/to/extension' });
+  describe("handleLink", () => {
+    it("should link an extension from a local path", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      await handleLink({ path: "/local/path/to/extension" });
 
       expect(mockExtensionManager).toHaveBeenCalledWith(
         expect.objectContaining({
-          workspaceDir: '/test/dir',
+          workspaceDir: "/test/dir",
         }),
       );
       expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
-      expect(
-        mockExtensionManager.prototype.installOrUpdateExtension,
-      ).toHaveBeenCalledWith({
-        source: '/local/path/to/extension',
-        type: 'link',
+      expect(mockExtensionManager.prototype.installOrUpdateExtension).toHaveBeenCalledWith({
+        source: "/local/path/to/extension",
+        type: "link",
       });
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "my-linked-extension" linked successfully and enabled.',
       );
       mockCwd.mockRestore();
     });
 
-    it('should log an error message and exit with code 1 when linking fails', async () => {
+    it("should log an error message and exit with code 1 when linking fails", async () => {
       const mockProcessExit = vi
-        .spyOn(process, 'exit')
-        .mockImplementation((() => {}) as (
-          code?: string | number | null | undefined,
-        ) => never);
-      const error = new Error('Link failed');
-      (
-        mockExtensionManager.prototype.installOrUpdateExtension as Mock
-      ).mockRejectedValue(error);
-      mockGetErrorMessage.mockReturnValue('Link failed message');
-
-      await handleLink({ path: '/local/path/to/extension' });
+        .spyOn(process, "exit")
+        .mockImplementation((() => {}) as (code?: string | number | null | undefined) => never);
+      const error = new Error("Link failed");
+      (mockExtensionManager.prototype.installOrUpdateExtension as Mock).mockRejectedValue(error);
+      mockGetErrorMessage.mockReturnValue("Link failed message");
 
-      expect(emitConsoleLog).toHaveBeenCalledWith(
-        'error',
-        'Link failed message',
-      );
+      await handleLink({ path: "/local/path/to/extension" });
+
+      expect(emitConsoleLog).toHaveBeenCalledWith("error", "Link failed message");
       expect(mockProcessExit).toHaveBeenCalledWith(1);
       mockProcessExit.mockRestore();
     });
   });
 
-  describe('linkCommand', () => {
+  describe("linkCommand", () => {
     const command = linkCommand as CommandModule;
 
-    it('should have correct command and describe', () => {
-      expect(command.command).toBe('link <path>');
+    it("should have correct command and describe", () => {
+      expect(command.command).toBe("link <path>");
       expect(command.describe).toBe(
-        'Links an extension from a local path. Updates made to the local path will always be reflected.',
+        "Links an extension from a local path. Updates made to the local path will always be reflected.",
       );
     });
 
-    describe('builder', () => {
+    describe("builder", () => {
       interface MockYargs {
         positional: Mock;
         option: Mock;
@@ -151,42 +131,38 @@ describe('extensions link command', () => {
         };
       });
 
-      it('should configure positional argument', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
-        expect(yargsMock.positional).toHaveBeenCalledWith('path', {
-          describe: 'The name of the extension to link.',
-          type: 'string',
+      it("should configure positional argument", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
+        expect(yargsMock.positional).toHaveBeenCalledWith("path", {
+          describe: "The name of the extension to link.",
+          type: "string",
         });
-        expect(yargsMock.option).toHaveBeenCalledWith('consent', {
+        expect(yargsMock.option).toHaveBeenCalledWith("consent", {
           describe:
-            'Acknowledge the security risks of installing an extension and skip the confirmation prompt.',
-          type: 'boolean',
+            "Acknowledge the security risks of installing an extension and skip the confirmation prompt.",
+          type: "boolean",
           default: false,
         });
         expect(yargsMock.check).toHaveBeenCalled();
       });
     });
 
-    it('handler should call handleLink', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+    it("handler should call handleLink", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       interface TestArgv {
         path: string;
         [key: string]: unknown;
       }
       const argv: TestArgv = {
-        path: '/local/path/to/extension',
+        path: "/local/path/to/extension",
         _: [],
-        $0: '',
+        $0: "",
       };
       await (command.handler as unknown as (args: TestArgv) => void)(argv);
 
-      expect(
-        mockExtensionManager.prototype.installOrUpdateExtension,
-      ).toHaveBeenCalledWith({
-        source: '/local/path/to/extension',
-        type: 'link',
+      expect(mockExtensionManager.prototype.installOrUpdateExtension).toHaveBeenCalledWith({
+        source: "/local/path/to/extension",
+        type: "link",
       });
       mockCwd.mockRestore();
     });
diff --git a/packages/ui-gemini/src/commands/extensions/link.ts b/packages/ui-gemini/src/commands/extensions/link.ts
index dc989ba71..146cc0fb9 100644
--- a/packages/ui-gemini/src/commands/extensions/link.ts
+++ b/packages/ui-gemini/src/commands/extensions/link.ts
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import {
-  debugLogger,
-  type ExtensionInstallMetadata,
-} from '@airiscode/gemini-cli-core';
-
-import { getErrorMessage } from '../../utils/errors.js';
+import { debugLogger, type ExtensionInstallMetadata } from "@airiscode/gemini-cli-core";
+import type { CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
 import {
   INSTALL_WARNING_MESSAGE,
   requestConsentNonInteractive,
-} from '../../config/extensions/consent.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings } from '../../config/settings.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
+} from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { exitCli } from "../utils.js";
 
 interface InstallArgs {
   path: string;
@@ -29,13 +25,13 @@ export async function handleLink(args: InstallArgs) {
   try {
     const installMetadata: ExtensionInstallMetadata = {
       source: args.path,
-      type: 'link',
+      type: "link",
     };
     const requestConsent = args.consent
       ? () => Promise.resolve(true)
       : requestConsentNonInteractive;
     if (args.consent) {
-      debugLogger.log('You have consented to the following:');
+      debugLogger.log("You have consented to the following:");
       debugLogger.log(INSTALL_WARNING_MESSAGE);
     }
     const workspaceDir = process.cwd();
@@ -46,11 +42,8 @@ export async function handleLink(args: InstallArgs) {
       settings: loadSettings(workspaceDir).merged,
     });
     await extensionManager.loadExtensions();
-    const extension =
-      await extensionManager.installOrUpdateExtension(installMetadata);
-    debugLogger.log(
-      `Extension "${extension.name}" linked successfully and enabled.`,
-    );
+    const extension = await extensionManager.installOrUpdateExtension(installMetadata);
+    debugLogger.log(`Extension "${extension.name}" linked successfully and enabled.`);
   } catch (error) {
     debugLogger.error(getErrorMessage(error));
     process.exit(1);
@@ -58,26 +51,26 @@ export async function handleLink(args: InstallArgs) {
 }
 
 export const linkCommand: CommandModule = {
-  command: 'link <path>',
+  command: "link <path>",
   describe:
-    'Links an extension from a local path. Updates made to the local path will always be reflected.',
+    "Links an extension from a local path. Updates made to the local path will always be reflected.",
   builder: (yargs) =>
     yargs
-      .positional('path', {
-        describe: 'The name of the extension to link.',
-        type: 'string',
+      .positional("path", {
+        describe: "The name of the extension to link.",
+        type: "string",
       })
-      .option('consent', {
+      .option("consent", {
         describe:
-          'Acknowledge the security risks of installing an extension and skip the confirmation prompt.',
-        type: 'boolean',
+          "Acknowledge the security risks of installing an extension and skip the confirmation prompt.",
+        type: "boolean",
         default: false,
       })
       .check((_) => true),
   handler: async (argv) => {
     await handleLink({
-      path: argv['path'] as string,
-      consent: argv['consent'] as boolean | undefined,
+      path: argv["path"] as string,
+      consent: argv["consent"] as boolean | undefined,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/extensions/list.test.ts b/packages/ui-gemini/src/commands/extensions/list.test.ts
index 430f601b6..90da4d2d2 100644
--- a/packages/ui-gemini/src/commands/extensions/list.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/list.test.ts
@@ -4,28 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { format } from 'node:util';
-import { type CommandModule } from 'yargs';
-import { handleList, listCommand } from './list.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings, type LoadedSettings } from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
+import { format } from "node:util";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { type LoadedSettings, loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { handleList, listCommand } from "./list.js";
 
 // Mock dependencies
 const emitConsoleLog = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
   log: vi.fn((message, ...args) => {
-    emitConsoleLog('log', format(message, ...args));
+    emitConsoleLog("log", format(message, ...args));
   }),
   error: vi.fn((message, ...args) => {
-    emitConsoleLog('error', format(message, ...args));
+    emitConsoleLog("error", format(message, ...args));
   }),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: {
@@ -35,20 +34,20 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('../../config/extension-manager.js');
-vi.mock('../../config/settings.js');
-vi.mock('../../utils/errors.js');
-vi.mock('../../config/extensions/consent.js', () => ({
+vi.mock("../../config/extension-manager.js");
+vi.mock("../../config/settings.js");
+vi.mock("../../utils/errors.js");
+vi.mock("../../config/extensions/consent.js", () => ({
   requestConsentNonInteractive: vi.fn(),
 }));
-vi.mock('../../config/extensions/extensionSettings.js', () => ({
+vi.mock("../../config/extensions/extensionSettings.js", () => ({
   promptForSetting: vi.fn(),
 }));
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions list command', () => {
+describe("extensions list command", () => {
   const mockLoadSettings = vi.mocked(loadSettings);
   const mockGetErrorMessage = vi.mocked(getErrorMessage);
   const mockExtensionManager = vi.mocked(ExtensionManager);
@@ -64,77 +63,56 @@ describe('extensions list command', () => {
     vi.restoreAllMocks();
   });
 
-  describe('handleList', () => {
-    it('should log a message if no extensions are installed', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-      mockExtensionManager.prototype.loadExtensions = vi
-        .fn()
-        .mockResolvedValue([]);
+  describe("handleList", () => {
+    it("should log a message if no extensions are installed", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue([]);
       await handleList();
 
-      expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
-        'No extensions installed.',
-      );
+      expect(emitConsoleLog).toHaveBeenCalledWith("log", "No extensions installed.");
       mockCwd.mockRestore();
     });
 
-    it('should list all installed extensions', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+    it("should list all installed extensions", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       const extensions = [
-        { name: 'ext1', version: '1.0.0' },
-        { name: 'ext2', version: '2.0.0' },
+        { name: "ext1", version: "1.0.0" },
+        { name: "ext2", version: "2.0.0" },
       ];
-      mockExtensionManager.prototype.loadExtensions = vi
-        .fn()
-        .mockResolvedValue(extensions);
-      mockExtensionManager.prototype.toOutputString = vi.fn(
-        (ext) => `${ext.name}@${ext.version}`,
-      );
+      mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue(extensions);
+      mockExtensionManager.prototype.toOutputString = vi.fn((ext) => `${ext.name}@${ext.version}`);
       await handleList();
 
-      expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
-        'ext1@1.0.0\n\next2@2.0.0',
-      );
+      expect(emitConsoleLog).toHaveBeenCalledWith("log", "ext1@1.0.0\n\next2@2.0.0");
       mockCwd.mockRestore();
     });
 
-    it('should log an error message and exit with code 1 when listing fails', async () => {
+    it("should log an error message and exit with code 1 when listing fails", async () => {
       const mockProcessExit = vi
-        .spyOn(process, 'exit')
-        .mockImplementation((() => {}) as (
-          code?: string | number | null | undefined,
-        ) => never);
-      const error = new Error('List failed');
-      mockExtensionManager.prototype.loadExtensions = vi
-        .fn()
-        .mockRejectedValue(error);
-      mockGetErrorMessage.mockReturnValue('List failed message');
+        .spyOn(process, "exit")
+        .mockImplementation((() => {}) as (code?: string | number | null | undefined) => never);
+      const error = new Error("List failed");
+      mockExtensionManager.prototype.loadExtensions = vi.fn().mockRejectedValue(error);
+      mockGetErrorMessage.mockReturnValue("List failed message");
 
       await handleList();
 
-      expect(emitConsoleLog).toHaveBeenCalledWith(
-        'error',
-        'List failed message',
-      );
+      expect(emitConsoleLog).toHaveBeenCalledWith("error", "List failed message");
       expect(mockProcessExit).toHaveBeenCalledWith(1);
       mockProcessExit.mockRestore();
     });
   });
 
-  describe('listCommand', () => {
+  describe("listCommand", () => {
     const command = listCommand as CommandModule;
 
-    it('should have correct command and describe', () => {
-      expect(command.command).toBe('list');
-      expect(command.describe).toBe('Lists installed extensions.');
+    it("should have correct command and describe", () => {
+      expect(command.command).toBe("list");
+      expect(command.describe).toBe("Lists installed extensions.");
     });
 
-    it('handler should call handleList', async () => {
-      mockExtensionManager.prototype.loadExtensions = vi
-        .fn()
-        .mockResolvedValue([]);
+    it("handler should call handleList", async () => {
+      mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue([]);
       await (command.handler as () => Promise<void>)();
       expect(mockExtensionManager.prototype.loadExtensions).toHaveBeenCalled();
     });
diff --git a/packages/ui-gemini/src/commands/extensions/list.ts b/packages/ui-gemini/src/commands/extensions/list.ts
index 4599be4fd..e163806cd 100644
--- a/packages/ui-gemini/src/commands/extensions/list.ts
+++ b/packages/ui-gemini/src/commands/extensions/list.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { getErrorMessage } from '../../utils/errors.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { loadSettings } from '../../config/settings.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import type { CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { exitCli } from "../utils.js";
 
 export async function handleList() {
   try {
@@ -24,15 +24,13 @@ export async function handleList() {
     });
     const extensions = await extensionManager.loadExtensions();
     if (extensions.length === 0) {
-      debugLogger.log('No extensions installed.');
+      debugLogger.log("No extensions installed.");
       return;
     }
     debugLogger.log(
       extensions
-        .map((extension, _): string =>
-          extensionManager.toOutputString(extension),
-        )
-        .join('\n\n'),
+        .map((extension, _): string => extensionManager.toOutputString(extension))
+        .join("\n\n"),
     );
   } catch (error) {
     debugLogger.error(getErrorMessage(error));
@@ -41,8 +39,8 @@ export async function handleList() {
 }
 
 export const listCommand: CommandModule = {
-  command: 'list',
-  describe: 'Lists installed extensions.',
+  command: "list",
+  describe: "Lists installed extensions.",
   builder: (yargs) => yargs,
   handler: async () => {
     await handleList();
diff --git a/packages/ui-gemini/src/commands/extensions/new.test.ts b/packages/ui-gemini/src/commands/extensions/new.test.ts
index 2400ac61a..61232c675 100644
--- a/packages/ui-gemini/src/commands/extensions/new.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/new.test.ts
@@ -4,88 +4,88 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { newCommand } from './new.js';
-import yargs from 'yargs';
-import * as fsPromises from 'node:fs/promises';
-import path from 'node:path';
-
-vi.mock('node:fs/promises');
-vi.mock('../utils.js', () => ({
+import * as fsPromises from "node:fs/promises";
+import path from "node:path";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import yargs from "yargs";
+import { newCommand } from "./new.js";
+
+vi.mock("node:fs/promises");
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
 const mockedFs = vi.mocked(fsPromises);
 
-describe('extensions new command', () => {
+describe("extensions new command", () => {
   beforeEach(() => {
     vi.resetAllMocks();
 
     const fakeFiles = [
-      { name: 'context', isDirectory: () => true },
-      { name: 'custom-commands', isDirectory: () => true },
-      { name: 'mcp-server', isDirectory: () => true },
+      { name: "context", isDirectory: () => true },
+      { name: "custom-commands", isDirectory: () => true },
+      { name: "mcp-server", isDirectory: () => true },
     ];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     mockedFs.readdir.mockResolvedValue(fakeFiles as any);
   });
 
-  it('should fail if no path is provided', async () => {
-    const parser = yargs([]).command(newCommand).fail(false).locale('en');
-    await expect(parser.parseAsync('new')).rejects.toThrow(
-      'Not enough non-option arguments: got 0, need at least 1',
+  it("should fail if no path is provided", async () => {
+    const parser = yargs([]).command(newCommand).fail(false).locale("en");
+    await expect(parser.parseAsync("new")).rejects.toThrow(
+      "Not enough non-option arguments: got 0, need at least 1",
     );
   });
 
-  it('should create directory when no template is provided', async () => {
-    mockedFs.access.mockRejectedValue(new Error('ENOENT'));
+  it("should create directory when no template is provided", async () => {
+    mockedFs.access.mockRejectedValue(new Error("ENOENT"));
     mockedFs.mkdir.mockResolvedValue(undefined);
 
     const parser = yargs([]).command(newCommand).fail(false);
 
-    await parser.parseAsync('new /some/path');
+    await parser.parseAsync("new /some/path");
 
-    expect(mockedFs.mkdir).toHaveBeenCalledWith('/some/path', {
+    expect(mockedFs.mkdir).toHaveBeenCalledWith("/some/path", {
       recursive: true,
     });
     expect(mockedFs.cp).not.toHaveBeenCalled();
   });
 
-  it('should create directory and copy files when path does not exist', async () => {
-    mockedFs.access.mockRejectedValue(new Error('ENOENT'));
+  it("should create directory and copy files when path does not exist", async () => {
+    mockedFs.access.mockRejectedValue(new Error("ENOENT"));
     mockedFs.mkdir.mockResolvedValue(undefined);
     mockedFs.cp.mockResolvedValue(undefined);
 
     const parser = yargs([]).command(newCommand).fail(false);
 
-    await parser.parseAsync('new /some/path context');
+    await parser.parseAsync("new /some/path context");
 
-    expect(mockedFs.mkdir).toHaveBeenCalledWith('/some/path', {
+    expect(mockedFs.mkdir).toHaveBeenCalledWith("/some/path", {
       recursive: true,
     });
     expect(mockedFs.cp).toHaveBeenCalledWith(
-      expect.stringContaining(path.normalize('context/context')),
-      path.normalize('/some/path/context'),
+      expect.stringContaining(path.normalize("context/context")),
+      path.normalize("/some/path/context"),
       { recursive: true },
     );
     expect(mockedFs.cp).toHaveBeenCalledWith(
-      expect.stringContaining(path.normalize('context/custom-commands')),
-      path.normalize('/some/path/custom-commands'),
+      expect.stringContaining(path.normalize("context/custom-commands")),
+      path.normalize("/some/path/custom-commands"),
       { recursive: true },
     );
     expect(mockedFs.cp).toHaveBeenCalledWith(
-      expect.stringContaining(path.normalize('context/mcp-server')),
-      path.normalize('/some/path/mcp-server'),
+      expect.stringContaining(path.normalize("context/mcp-server")),
+      path.normalize("/some/path/mcp-server"),
       { recursive: true },
     );
   });
 
-  it('should throw an error if the path already exists', async () => {
+  it("should throw an error if the path already exists", async () => {
     mockedFs.access.mockResolvedValue(undefined);
     const parser = yargs([]).command(newCommand).fail(false);
 
-    await expect(parser.parseAsync('new /some/path context')).rejects.toThrow(
-      'Path already exists: /some/path',
+    await expect(parser.parseAsync("new /some/path context")).rejects.toThrow(
+      "Path already exists: /some/path",
     );
 
     expect(mockedFs.mkdir).not.toHaveBeenCalled();
diff --git a/packages/ui-gemini/src/commands/extensions/new.ts b/packages/ui-gemini/src/commands/extensions/new.ts
index 44c39c4f0..57a0f8c1e 100644
--- a/packages/ui-gemini/src/commands/extensions/new.ts
+++ b/packages/ui-gemini/src/commands/extensions/new.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { access, cp, mkdir, readdir, writeFile } from 'node:fs/promises';
-import { join, dirname, basename } from 'node:path';
-import type { CommandModule } from 'yargs';
-import { fileURLToPath } from 'node:url';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { exitCli } from '../utils.js';
+import { access, cp, mkdir, readdir, writeFile } from "node:fs/promises";
+import { basename, dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import type { CommandModule } from "yargs";
+import { exitCli } from "../utils.js";
 
 interface NewArgs {
   path: string;
@@ -19,7 +19,7 @@ interface NewArgs {
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-const EXAMPLES_PATH = join(__dirname, 'examples');
+const EXAMPLES_PATH = join(__dirname, "examples");
 
 async function pathExists(path: string) {
   try {
@@ -60,12 +60,9 @@ async function handleNew(args: NewArgs) {
     const extensionName = basename(args.path);
     const manifest = {
       name: extensionName,
-      version: '1.0.0',
+      version: "1.0.0",
     };
-    await writeFile(
-      join(args.path, 'gemini-extension.json'),
-      JSON.stringify(manifest, null, 2),
-    );
+    await writeFile(join(args.path, "gemini-extension.json"), JSON.stringify(manifest, null, 2));
     debugLogger.log(`Successfully created new extension at ${args.path}.`);
   }
   debugLogger.log(
@@ -75,31 +72,29 @@ async function handleNew(args: NewArgs) {
 
 async function getBoilerplateChoices() {
   const entries = await readdir(EXAMPLES_PATH, { withFileTypes: true });
-  return entries
-    .filter((entry) => entry.isDirectory())
-    .map((entry) => entry.name);
+  return entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name);
 }
 
 export const newCommand: CommandModule = {
-  command: 'new <path> [template]',
-  describe: 'Create a new extension from a boilerplate example.',
+  command: "new <path> [template]",
+  describe: "Create a new extension from a boilerplate example.",
   builder: async (yargs) => {
     const choices = await getBoilerplateChoices();
     return yargs
-      .positional('path', {
-        describe: 'The path to create the extension in.',
-        type: 'string',
+      .positional("path", {
+        describe: "The path to create the extension in.",
+        type: "string",
       })
-      .positional('template', {
-        describe: 'The boilerplate template to use.',
-        type: 'string',
+      .positional("template", {
+        describe: "The boilerplate template to use.",
+        type: "string",
         choices,
       });
   },
   handler: async (args) => {
     await handleNew({
-      path: args['path'] as string,
-      template: args['template'] as string | undefined,
+      path: args["path"] as string,
+      template: args["template"] as string | undefined,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/extensions/settings.ts b/packages/ui-gemini/src/commands/extensions/settings.ts
index 63d743e38..ae1bf6478 100644
--- a/packages/ui-gemini/src/commands/extensions/settings.ts
+++ b/packages/ui-gemini/src/commands/extensions/settings.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import type { CommandModule } from "yargs";
 import {
-  updateSetting,
-  promptForSetting,
   ExtensionSettingScope,
   getScopedEnvContents,
-} from '../../config/extensions/extensionSettings.js';
-import { getExtensionAndManager } from './utils.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { exitCli } from '../utils.js';
+  promptForSetting,
+  updateSetting,
+} from "../../config/extensions/extensionSettings.js";
+import { exitCli } from "../utils.js";
+import { getExtensionAndManager } from "./utils.js";
 
 // --- SET COMMAND ---
 interface SetArgs {
@@ -23,25 +23,25 @@ interface SetArgs {
 }
 
 const setCommand: CommandModule<object, SetArgs> = {
-  command: 'set [--scope] <name> <setting>',
-  describe: 'Set a specific setting for an extension.',
+  command: "set [--scope] <name> <setting>",
+  describe: "Set a specific setting for an extension.",
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: 'Name of the extension to configure.',
-        type: 'string',
+      .positional("name", {
+        describe: "Name of the extension to configure.",
+        type: "string",
         demandOption: true,
       })
-      .positional('setting', {
-        describe: 'The setting to configure (name or env var).',
-        type: 'string',
+      .positional("setting", {
+        describe: "The setting to configure (name or env var).",
+        type: "string",
         demandOption: true,
       })
-      .option('scope', {
-        describe: 'The scope to set the setting in.',
-        type: 'string',
-        choices: ['user', 'workspace'],
-        default: 'user',
+      .option("scope", {
+        describe: "The scope to set the setting in.",
+        type: "string",
+        choices: ["user", "workspace"],
+        default: "user",
       }),
   handler: async (args) => {
     const { name, setting, scope } = args;
@@ -49,13 +49,9 @@ const setCommand: CommandModule<object, SetArgs> = {
     if (!extension || !extensionManager) {
       return;
     }
-    const extensionConfig = extensionManager.loadExtensionConfig(
-      extension.path,
-    );
+    const extensionConfig = extensionManager.loadExtensionConfig(extension.path);
     if (!extensionConfig) {
-      debugLogger.error(
-        `Could not find configuration for extension "${name}".`,
-      );
+      debugLogger.error(`Could not find configuration for extension "${name}".`);
       return;
     }
     await updateSetting(
@@ -75,12 +71,12 @@ interface ListArgs {
 }
 
 const listCommand: CommandModule<object, ListArgs> = {
-  command: 'list <name>',
-  describe: 'List all settings for an extension.',
+  command: "list <name>",
+  describe: "List all settings for an extension.",
   builder: (yargs) =>
-    yargs.positional('name', {
-      describe: 'Name of the extension.',
-      type: 'string',
+    yargs.positional("name", {
+      describe: "Name of the extension.",
+      type: "string",
       demandOption: true,
     }),
   handler: async (args) => {
@@ -89,14 +85,8 @@ const listCommand: CommandModule<object, ListArgs> = {
     if (!extension || !extensionManager) {
       return;
     }
-    const extensionConfig = extensionManager.loadExtensionConfig(
-      extension.path,
-    );
-    if (
-      !extensionConfig ||
-      !extensionConfig.settings ||
-      extensionConfig.settings.length === 0
-    ) {
+    const extensionConfig = extensionManager.loadExtensionConfig(extension.path);
+    if (!extensionConfig || !extensionConfig.settings || extensionConfig.settings.length === 0) {
       debugLogger.log(`Extension "${name}" has no settings to configure.`);
       return;
     }
@@ -117,18 +107,18 @@ const listCommand: CommandModule<object, ListArgs> = {
     for (const setting of extensionConfig.settings) {
       const value = mergedSettings[setting.envVar];
       let displayValue: string;
-      let scopeInfo = '';
+      let scopeInfo = "";
 
       if (workspaceSettings[setting.envVar] !== undefined) {
-        scopeInfo = ' (workspace)';
+        scopeInfo = " (workspace)";
       } else if (userSettings[setting.envVar] !== undefined) {
-        scopeInfo = ' (user)';
+        scopeInfo = " (user)";
       }
 
       if (value === undefined) {
-        displayValue = '[not set]';
+        displayValue = "[not set]";
       } else if (setting.sensitive) {
-        displayValue = '[value stored in keychain]';
+        displayValue = "[value stored in keychain]";
       } else {
         displayValue = value;
       }
@@ -143,13 +133,13 @@ const listCommand: CommandModule<object, ListArgs> = {
 
 // --- SETTINGS COMMAND ---
 export const settingsCommand: CommandModule = {
-  command: 'settings <command>',
-  describe: 'Manage extension settings.',
+  command: "settings <command>",
+  describe: "Manage extension settings.",
   builder: (yargs) =>
     yargs
       .command(setCommand)
       .command(listCommand)
-      .demandCommand(1, 'You need to specify a command (set or list).')
+      .demandCommand(1, "You need to specify a command (set or list).")
       .version(false),
   handler: () => {
     // This handler is not called when a subcommand is provided.
diff --git a/packages/ui-gemini/src/commands/extensions/uninstall.test.ts b/packages/ui-gemini/src/commands/extensions/uninstall.test.ts
index 83be23bbc..467efbe55 100644
--- a/packages/ui-gemini/src/commands/extensions/uninstall.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/uninstall.test.ts
@@ -4,21 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { format } from 'node:util';
-import { type CommandModule, type Argv } from 'yargs';
-import { handleUninstall, uninstallCommand } from './uninstall.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings, type LoadedSettings } from '../../config/settings.js';
-import { getErrorMessage } from '../../utils/errors.js';
+import { format } from "node:util";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Argv, type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { type LoadedSettings, loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { handleUninstall, uninstallCommand } from "./uninstall.js";
 
 // NOTE: This file uses vi.hoisted() mocks to enable testing of sequential
 // mock behaviors (mockResolvedValueOnce/mockRejectedValueOnce chaining).
@@ -30,9 +22,8 @@ const mockUninstallExtension = vi.hoisted(() => vi.fn());
 const mockLoadExtensions = vi.hoisted(() => vi.fn());
 
 // Mock dependencies with hoisted functions
-vi.mock('../../config/extension-manager.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../../config/extension-manager.js')>();
+vi.mock("../../config/extension-manager.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../../config/extension-manager.js")>();
   return {
     ...actual,
     ExtensionManager: vi.fn().mockImplementation(() => ({
@@ -48,16 +39,15 @@ vi.mock('../../config/extension-manager.js', async (importOriginal) => {
 const emitConsoleLog = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
   log: vi.fn((message, ...args) => {
-    emitConsoleLog('log', format(message, ...args));
+    emitConsoleLog("log", format(message, ...args));
   }),
   error: vi.fn((message, ...args) => {
-    emitConsoleLog('error', format(message, ...args));
+    emitConsoleLog("error", format(message, ...args));
   }),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: {
@@ -67,19 +57,19 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('../../config/settings.js');
-vi.mock('../../utils/errors.js');
-vi.mock('../../config/extensions/consent.js', () => ({
+vi.mock("../../config/settings.js");
+vi.mock("../../utils/errors.js");
+vi.mock("../../config/extensions/consent.js", () => ({
   requestConsentNonInteractive: vi.fn(),
 }));
-vi.mock('../../config/extensions/extensionSettings.js', () => ({
+vi.mock("../../config/extensions/extensionSettings.js", () => ({
   promptForSetting: vi.fn(),
 }));
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions uninstall command', () => {
+describe("extensions uninstall command", () => {
   const mockLoadSettings = vi.mocked(loadSettings);
   const mockGetErrorMessage = vi.mocked(getErrorMessage);
   const mockExtensionManager = vi.mocked(ExtensionManager);
@@ -96,85 +86,80 @@ describe('extensions uninstall command', () => {
     vi.clearAllMocks();
   });
 
-  describe('handleUninstall', () => {
-    it('should uninstall a single extension', async () => {
+  describe("handleUninstall", () => {
+    it("should uninstall a single extension", async () => {
       mockLoadExtensions.mockResolvedValue(undefined);
       mockUninstallExtension.mockResolvedValue(undefined);
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-      await handleUninstall({ names: ['my-extension'] });
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      await handleUninstall({ names: ["my-extension"] });
 
       expect(mockExtensionManager).toHaveBeenCalledWith(
         expect.objectContaining({
-          workspaceDir: '/test/dir',
+          workspaceDir: "/test/dir",
         }),
       );
       expect(mockLoadExtensions).toHaveBeenCalled();
-      expect(mockUninstallExtension).toHaveBeenCalledWith(
-        'my-extension',
-        false,
-      );
+      expect(mockUninstallExtension).toHaveBeenCalledWith("my-extension", false);
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "my-extension" successfully uninstalled.',
       );
       mockCwd.mockRestore();
     });
 
-    it('should uninstall multiple extensions', async () => {
+    it("should uninstall multiple extensions", async () => {
       mockLoadExtensions.mockResolvedValue(undefined);
       mockUninstallExtension.mockResolvedValue(undefined);
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-      await handleUninstall({ names: ['ext1', 'ext2', 'ext3'] });
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      await handleUninstall({ names: ["ext1", "ext2", "ext3"] });
 
       expect(mockUninstallExtension).toHaveBeenCalledTimes(3);
-      expect(mockUninstallExtension).toHaveBeenCalledWith('ext1', false);
-      expect(mockUninstallExtension).toHaveBeenCalledWith('ext2', false);
-      expect(mockUninstallExtension).toHaveBeenCalledWith('ext3', false);
+      expect(mockUninstallExtension).toHaveBeenCalledWith("ext1", false);
+      expect(mockUninstallExtension).toHaveBeenCalledWith("ext2", false);
+      expect(mockUninstallExtension).toHaveBeenCalledWith("ext3", false);
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "ext1" successfully uninstalled.',
       );
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "ext2" successfully uninstalled.',
       );
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "ext3" successfully uninstalled.',
       );
       mockCwd.mockRestore();
     });
 
-    it('should report errors for failed uninstalls but continue with others', async () => {
+    it("should report errors for failed uninstalls but continue with others", async () => {
       mockLoadExtensions.mockResolvedValue(undefined);
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       const mockProcessExit = vi
-        .spyOn(process, 'exit')
-        .mockImplementation((() => {}) as (
-          code?: string | number | null | undefined,
-        ) => never);
+        .spyOn(process, "exit")
+        .mockImplementation((() => {}) as (code?: string | number | null | undefined) => never);
 
-      const error = new Error('Extension not found');
+      const error = new Error("Extension not found");
       // Chain sequential mock behaviors - this works with hoisted mocks
       mockUninstallExtension
         .mockResolvedValueOnce(undefined)
         .mockRejectedValueOnce(error)
         .mockResolvedValueOnce(undefined);
-      mockGetErrorMessage.mockReturnValue('Extension not found');
+      mockGetErrorMessage.mockReturnValue("Extension not found");
 
-      await handleUninstall({ names: ['ext1', 'ext2', 'ext3'] });
+      await handleUninstall({ names: ["ext1", "ext2", "ext3"] });
 
       expect(mockUninstallExtension).toHaveBeenCalledTimes(3);
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "ext1" successfully uninstalled.',
       );
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'error',
+        "error",
         'Failed to uninstall "ext2": Extension not found',
       );
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'log',
+        "log",
         'Extension "ext3" successfully uninstalled.',
       );
       expect(mockProcessExit).toHaveBeenCalledWith(1);
@@ -182,26 +167,24 @@ describe('extensions uninstall command', () => {
       mockCwd.mockRestore();
     });
 
-    it('should exit with error code if all uninstalls fail', async () => {
+    it("should exit with error code if all uninstalls fail", async () => {
       mockLoadExtensions.mockResolvedValue(undefined);
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       const mockProcessExit = vi
-        .spyOn(process, 'exit')
-        .mockImplementation((() => {}) as (
-          code?: string | number | null | undefined,
-        ) => never);
-      const error = new Error('Extension not found');
+        .spyOn(process, "exit")
+        .mockImplementation((() => {}) as (code?: string | number | null | undefined) => never);
+      const error = new Error("Extension not found");
       mockUninstallExtension.mockRejectedValue(error);
-      mockGetErrorMessage.mockReturnValue('Extension not found');
+      mockGetErrorMessage.mockReturnValue("Extension not found");
 
-      await handleUninstall({ names: ['ext1', 'ext2'] });
+      await handleUninstall({ names: ["ext1", "ext2"] });
 
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'error',
+        "error",
         'Failed to uninstall "ext1": Extension not found',
       );
       expect(emitConsoleLog).toHaveBeenCalledWith(
-        'error',
+        "error",
         'Failed to uninstall "ext2": Extension not found',
       );
       expect(mockProcessExit).toHaveBeenCalledWith(1);
@@ -209,38 +192,33 @@ describe('extensions uninstall command', () => {
       mockCwd.mockRestore();
     });
 
-    it('should log an error message and exit with code 1 when initialization fails', async () => {
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+    it("should log an error message and exit with code 1 when initialization fails", async () => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       const mockProcessExit = vi
-        .spyOn(process, 'exit')
-        .mockImplementation((() => {}) as (
-          code?: string | number | null | undefined,
-        ) => never);
-      const error = new Error('Initialization failed');
+        .spyOn(process, "exit")
+        .mockImplementation((() => {}) as (code?: string | number | null | undefined) => never);
+      const error = new Error("Initialization failed");
       mockLoadExtensions.mockRejectedValue(error);
-      mockGetErrorMessage.mockReturnValue('Initialization failed message');
+      mockGetErrorMessage.mockReturnValue("Initialization failed message");
 
-      await handleUninstall({ names: ['my-extension'] });
+      await handleUninstall({ names: ["my-extension"] });
 
-      expect(emitConsoleLog).toHaveBeenCalledWith(
-        'error',
-        'Initialization failed message',
-      );
+      expect(emitConsoleLog).toHaveBeenCalledWith("error", "Initialization failed message");
       expect(mockProcessExit).toHaveBeenCalledWith(1);
       mockProcessExit.mockRestore();
       mockCwd.mockRestore();
     });
   });
 
-  describe('uninstallCommand', () => {
+  describe("uninstallCommand", () => {
     const command = uninstallCommand as CommandModule;
 
-    it('should have correct command and describe', () => {
-      expect(command.command).toBe('uninstall <names..>');
-      expect(command.describe).toBe('Uninstalls one or more extensions.');
+    it("should have correct command and describe", () => {
+      expect(command.command).toBe("uninstall <names..>");
+      expect(command.describe).toBe("Uninstalls one or more extensions.");
     });
 
-    describe('builder', () => {
+    describe("builder", () => {
       interface MockYargs {
         positional: Mock;
         check: Mock;
@@ -254,45 +232,37 @@ describe('extensions uninstall command', () => {
         };
       });
 
-      it('should configure positional argument', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
-        expect(yargsMock.positional).toHaveBeenCalledWith('names', {
-          describe:
-            'The name(s) or source path(s) of the extension(s) to uninstall.',
-          type: 'string',
+      it("should configure positional argument", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
+        expect(yargsMock.positional).toHaveBeenCalledWith("names", {
+          describe: "The name(s) or source path(s) of the extension(s) to uninstall.",
+          type: "string",
           array: true,
         });
         expect(yargsMock.check).toHaveBeenCalled();
       });
 
-      it('check function should throw for missing names', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
+      it("check function should throw for missing names", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
         const checkCallback = yargsMock.check.mock.calls[0][0];
         expect(() => checkCallback({ names: [] })).toThrow(
-          'Please include at least one extension name to uninstall as a positional argument.',
+          "Please include at least one extension name to uninstall as a positional argument.",
         );
       });
     });
 
-    it('handler should call handleUninstall', async () => {
+    it("handler should call handleUninstall", async () => {
       mockLoadExtensions.mockResolvedValue(undefined);
       mockUninstallExtension.mockResolvedValue(undefined);
-      const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
       interface TestArgv {
         names: string[];
         [key: string]: unknown;
       }
-      const argv: TestArgv = { names: ['my-extension'], _: [], $0: '' };
+      const argv: TestArgv = { names: ["my-extension"], _: [], $0: "" };
       await (command.handler as unknown as (args: TestArgv) => void)(argv);
 
-      expect(mockUninstallExtension).toHaveBeenCalledWith(
-        'my-extension',
-        false,
-      );
+      expect(mockUninstallExtension).toHaveBeenCalledWith("my-extension", false);
       mockCwd.mockRestore();
     });
   });
diff --git a/packages/ui-gemini/src/commands/extensions/uninstall.ts b/packages/ui-gemini/src/commands/extensions/uninstall.ts
index 2c5819813..df460723f 100644
--- a/packages/ui-gemini/src/commands/extensions/uninstall.ts
+++ b/packages/ui-gemini/src/commands/extensions/uninstall.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { getErrorMessage } from '../../utils/errors.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings } from '../../config/settings.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import type { CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { exitCli } from "../utils.js";
 
 interface UninstallArgs {
   names: string[]; // can be extension names or source URLs.
@@ -51,27 +51,26 @@ export async function handleUninstall(args: UninstallArgs) {
 }
 
 export const uninstallCommand: CommandModule = {
-  command: 'uninstall <names..>',
-  describe: 'Uninstalls one or more extensions.',
+  command: "uninstall <names..>",
+  describe: "Uninstalls one or more extensions.",
   builder: (yargs) =>
     yargs
-      .positional('names', {
-        describe:
-          'The name(s) or source path(s) of the extension(s) to uninstall.',
-        type: 'string',
+      .positional("names", {
+        describe: "The name(s) or source path(s) of the extension(s) to uninstall.",
+        type: "string",
         array: true,
       })
       .check((argv) => {
         if (!argv.names || (argv.names as string[]).length === 0) {
           throw new Error(
-            'Please include at least one extension name to uninstall as a positional argument.',
+            "Please include at least one extension name to uninstall as a positional argument.",
           );
         }
         return true;
       }),
   handler: async (argv) => {
     await handleUninstall({
-      names: argv['names'] as string[],
+      names: argv["names"] as string[],
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/extensions/update.test.ts b/packages/ui-gemini/src/commands/extensions/update.test.ts
index 765b39c47..5df523c6f 100644
--- a/packages/ui-gemini/src/commands/extensions/update.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/update.test.ts
@@ -4,38 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { format } from 'node:util';
-import { type CommandModule, type Argv } from 'yargs';
-import { handleUpdate, updateCommand } from './update.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings, type LoadedSettings } from '../../config/settings.js';
-import * as update from '../../config/extensions/update.js';
-import * as github from '../../config/extensions/github.js';
-import { ExtensionUpdateState } from '../../ui/state/extensions.js';
+import { format } from "node:util";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Argv, type CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import * as github from "../../config/extensions/github.js";
+import * as update from "../../config/extensions/update.js";
+import { type LoadedSettings, loadSettings } from "../../config/settings.js";
+import { ExtensionUpdateState } from "../../ui/state/extensions.js";
+import { handleUpdate, updateCommand } from "./update.js";
 
 // Mock dependencies
 const emitConsoleLog = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
   log: vi.fn((message, ...args) => {
-    emitConsoleLog('log', format(message, ...args));
+    emitConsoleLog("log", format(message, ...args));
   }),
   error: vi.fn((message, ...args) => {
-    emitConsoleLog('error', format(message, ...args));
+    emitConsoleLog("error", format(message, ...args));
   }),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: {
@@ -45,32 +36,28 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('../../config/extension-manager.js');
-vi.mock('../../config/settings.js');
-vi.mock('../../utils/errors.js');
-vi.mock('../../config/extensions/update.js');
-vi.mock('../../config/extensions/github.js');
-vi.mock('../../config/extensions/consent.js', () => ({
+vi.mock("../../config/extension-manager.js");
+vi.mock("../../config/settings.js");
+vi.mock("../../utils/errors.js");
+vi.mock("../../config/extensions/update.js");
+vi.mock("../../config/extensions/github.js");
+vi.mock("../../config/extensions/consent.js", () => ({
   requestConsentNonInteractive: vi.fn(),
 }));
-vi.mock('../../config/extensions/extensionSettings.js', () => ({
+vi.mock("../../config/extensions/extensionSettings.js", () => ({
   promptForSetting: vi.fn(),
 }));
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions update command', () => {
+describe("extensions update command", () => {
   const mockLoadSettings = vi.mocked(loadSettings);
   const mockExtensionManager = vi.mocked(ExtensionManager);
   const mockUpdateExtension = vi.mocked(update.updateExtension);
   const mockCheckForExtensionUpdate = vi.mocked(github.checkForExtensionUpdate);
-  const mockCheckForAllExtensionUpdates = vi.mocked(
-    update.checkForAllExtensionUpdates,
-  );
-  const mockUpdateAllUpdatableExtensions = vi.mocked(
-    update.updateAllUpdatableExtensions,
-  );
+  const mockCheckForAllExtensionUpdates = vi.mocked(update.checkForAllExtensionUpdates);
+  const mockUpdateAllUpdatableExtensions = vi.mocked(update.updateAllUpdatableExtensions);
 
   beforeEach(async () => {
     vi.clearAllMocks();
@@ -83,12 +70,11 @@ describe('extensions update command', () => {
     vi.restoreAllMocks();
   });
 
-  describe('handleUpdate', () => {
+  describe("handleUpdate", () => {
     it.each([
       {
         state: ExtensionUpdateState.UPDATE_AVAILABLE,
-        expectedLog:
-          'Extension "my-extension" successfully updated: 1.0.0 → 1.1.0.',
+        expectedLog: 'Extension "my-extension" successfully updated: 1.0.0 → 1.1.0.',
         shouldCallUpdateExtension: true,
       },
       {
@@ -96,75 +82,69 @@ describe('extensions update command', () => {
         expectedLog: 'Extension "my-extension" is already up to date.',
         shouldCallUpdateExtension: false,
       },
-    ])(
-      'should handle single extension update state: $state',
-      async ({ state, expectedLog, shouldCallUpdateExtension }) => {
-        const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-        const extensions = [{ name: 'my-extension', installMetadata: {} }];
-        mockExtensionManager.prototype.loadExtensions = vi
-          .fn()
-          .mockResolvedValue(extensions);
-        mockCheckForExtensionUpdate.mockResolvedValue(state);
-        mockUpdateExtension.mockResolvedValue({
-          name: 'my-extension',
-          originalVersion: '1.0.0',
-          updatedVersion: '1.1.0',
-        });
-
-        await handleUpdate({ name: 'my-extension' });
-
-        expect(emitConsoleLog).toHaveBeenCalledWith('log', expectedLog);
-        if (shouldCallUpdateExtension) {
-          expect(mockUpdateExtension).toHaveBeenCalled();
-        } else {
-          expect(mockUpdateExtension).not.toHaveBeenCalled();
-        }
-        mockCwd.mockRestore();
-      },
-    );
+    ])("should handle single extension update state: $state", async ({
+      state,
+      expectedLog,
+      shouldCallUpdateExtension,
+    }) => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      const extensions = [{ name: "my-extension", installMetadata: {} }];
+      mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue(extensions);
+      mockCheckForExtensionUpdate.mockResolvedValue(state);
+      mockUpdateExtension.mockResolvedValue({
+        name: "my-extension",
+        originalVersion: "1.0.0",
+        updatedVersion: "1.1.0",
+      });
+
+      await handleUpdate({ name: "my-extension" });
+
+      expect(emitConsoleLog).toHaveBeenCalledWith("log", expectedLog);
+      if (shouldCallUpdateExtension) {
+        expect(mockUpdateExtension).toHaveBeenCalled();
+      } else {
+        expect(mockUpdateExtension).not.toHaveBeenCalled();
+      }
+      mockCwd.mockRestore();
+    });
 
     it.each([
       {
         updatedExtensions: [
-          { name: 'ext1', originalVersion: '1.0.0', updatedVersion: '1.1.0' },
-          { name: 'ext2', originalVersion: '2.0.0', updatedVersion: '2.1.0' },
+          { name: "ext1", originalVersion: "1.0.0", updatedVersion: "1.1.0" },
+          { name: "ext2", originalVersion: "2.0.0", updatedVersion: "2.1.0" },
         ],
         expectedLog:
           'Extension "ext1" successfully updated: 1.0.0 → 1.1.0.\nExtension "ext2" successfully updated: 2.0.0 → 2.1.0.',
       },
       {
         updatedExtensions: [],
-        expectedLog: 'No extensions to update.',
-      },
-    ])(
-      'should handle updating all extensions: %s',
-      async ({ updatedExtensions, expectedLog }) => {
-        const mockCwd = vi.spyOn(process, 'cwd').mockReturnValue('/test/dir');
-        mockExtensionManager.prototype.loadExtensions = vi
-          .fn()
-          .mockResolvedValue([]);
-        mockCheckForAllExtensionUpdates.mockResolvedValue(undefined);
-        mockUpdateAllUpdatableExtensions.mockResolvedValue(updatedExtensions);
-
-        await handleUpdate({ all: true });
-
-        expect(emitConsoleLog).toHaveBeenCalledWith('log', expectedLog);
-        mockCwd.mockRestore();
+        expectedLog: "No extensions to update.",
       },
-    );
+    ])("should handle updating all extensions: %s", async ({ updatedExtensions, expectedLog }) => {
+      const mockCwd = vi.spyOn(process, "cwd").mockReturnValue("/test/dir");
+      mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue([]);
+      mockCheckForAllExtensionUpdates.mockResolvedValue(undefined);
+      mockUpdateAllUpdatableExtensions.mockResolvedValue(updatedExtensions);
+
+      await handleUpdate({ all: true });
+
+      expect(emitConsoleLog).toHaveBeenCalledWith("log", expectedLog);
+      mockCwd.mockRestore();
+    });
   });
 
-  describe('updateCommand', () => {
+  describe("updateCommand", () => {
     const command = updateCommand as CommandModule;
 
-    it('should have correct command and describe', () => {
-      expect(command.command).toBe('update [<name>] [--all]');
+    it("should have correct command and describe", () => {
+      expect(command.command).toBe("update [<name>] [--all]");
       expect(command.describe).toBe(
-        'Updates all extensions or a named extension to the latest version.',
+        "Updates all extensions or a named extension to the latest version.",
       );
     });
 
-    describe('builder', () => {
+    describe("builder", () => {
       interface MockYargs {
         positional: Mock;
         option: Mock;
@@ -182,49 +162,35 @@ describe('extensions update command', () => {
         };
       });
 
-      it('should configure arguments', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
-        expect(yargsMock.positional).toHaveBeenCalledWith(
-          'name',
-          expect.any(Object),
-        );
-        expect(yargsMock.option).toHaveBeenCalledWith(
-          'all',
-          expect.any(Object),
-        );
-        expect(yargsMock.conflicts).toHaveBeenCalledWith('name', 'all');
+      it("should configure arguments", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
+        expect(yargsMock.positional).toHaveBeenCalledWith("name", expect.any(Object));
+        expect(yargsMock.option).toHaveBeenCalledWith("all", expect.any(Object));
+        expect(yargsMock.conflicts).toHaveBeenCalledWith("name", "all");
         expect(yargsMock.check).toHaveBeenCalled();
       });
 
-      it('check function should throw an error if neither a name nor --all is provided', () => {
-        (command.builder as (yargs: Argv) => Argv)(
-          yargsMock as unknown as Argv,
-        );
+      it("check function should throw an error if neither a name nor --all is provided", () => {
+        (command.builder as (yargs: Argv) => Argv)(yargsMock as unknown as Argv);
         const checkCallback = yargsMock.check.mock.calls[0][0];
         expect(() => checkCallback({ name: undefined, all: false })).toThrow(
-          'Either an extension name or --all must be provided',
+          "Either an extension name or --all must be provided",
         );
       });
     });
 
-    it('handler should call handleUpdate', async () => {
-      const extensions = [{ name: 'my-extension', installMetadata: {} }];
-      mockExtensionManager.prototype.loadExtensions = vi
-        .fn()
-        .mockResolvedValue(extensions);
-      mockCheckForExtensionUpdate.mockResolvedValue(
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-      );
+    it("handler should call handleUpdate", async () => {
+      const extensions = [{ name: "my-extension", installMetadata: {} }];
+      mockExtensionManager.prototype.loadExtensions = vi.fn().mockResolvedValue(extensions);
+      mockCheckForExtensionUpdate.mockResolvedValue(ExtensionUpdateState.UPDATE_AVAILABLE);
       mockUpdateExtension.mockResolvedValue({
-        name: 'my-extension',
-        originalVersion: '1.0.0',
-        updatedVersion: '1.1.0',
+        name: "my-extension",
+        originalVersion: "1.0.0",
+        updatedVersion: "1.1.0",
       });
 
       await (command.handler as (args: object) => Promise<void>)({
-        name: 'my-extension',
+        name: "my-extension",
       });
 
       expect(mockUpdateExtension).toHaveBeenCalled();
diff --git a/packages/ui-gemini/src/commands/extensions/update.ts b/packages/ui-gemini/src/commands/extensions/update.ts
index 46be9f10b..76bdd32ea 100644
--- a/packages/ui-gemini/src/commands/extensions/update.ts
+++ b/packages/ui-gemini/src/commands/extensions/update.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import type { CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { checkForExtensionUpdate } from "../../config/extensions/github.js";
 import {
-  updateAllUpdatableExtensions,
-  type ExtensionUpdateInfo,
   checkForAllExtensionUpdates,
+  type ExtensionUpdateInfo,
+  updateAllUpdatableExtensions,
   updateExtension,
-} from '../../config/extensions/update.js';
-import { checkForExtensionUpdate } from '../../config/extensions/github.js';
-import { getErrorMessage } from '../../utils/errors.js';
-import { ExtensionUpdateState } from '../../ui/state/extensions.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { loadSettings } from '../../config/settings.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
+} from "../../config/extensions/update.js";
+import { loadSettings } from "../../config/settings.js";
+import { ExtensionUpdateState } from "../../ui/state/extensions.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { exitCli } from "../utils.js";
 
 interface UpdateArgs {
   name?: string;
@@ -42,9 +42,7 @@ export async function handleUpdate(args: UpdateArgs) {
   const extensions = await extensionManager.loadExtensions();
   if (args.name) {
     try {
-      const extension = extensions.find(
-        (extension) => extension.name === args.name,
-      );
+      const extension = extensions.find((extension) => extension.name === args.name);
       if (!extension) {
         debugLogger.log(`Extension "${args.name}" not found.`);
         return;
@@ -55,10 +53,7 @@ export async function handleUpdate(args: UpdateArgs) {
         );
         return;
       }
-      const updateState = await checkForExtensionUpdate(
-        extension,
-        extensionManager,
-      );
+      const updateState = await checkForExtensionUpdate(extension, extensionManager);
       if (updateState !== ExtensionUpdateState.UPDATE_AVAILABLE) {
         debugLogger.log(`Extension "${args.name}" is already up to date.`);
         return;
@@ -71,10 +66,7 @@ export async function handleUpdate(args: UpdateArgs) {
         () => {},
         settings.experimental?.extensionReloading,
       ))!;
-      if (
-        updatedExtensionInfo.originalVersion !==
-        updatedExtensionInfo.updatedVersion
-      ) {
+      if (updatedExtensionInfo.originalVersion !== updatedExtensionInfo.updatedVersion) {
         debugLogger.log(
           `Extension "${args.name}" successfully updated: ${updatedExtensionInfo.originalVersion} → ${updatedExtensionInfo.updatedVersion}.`,
         );
@@ -88,31 +80,25 @@ export async function handleUpdate(args: UpdateArgs) {
   if (args.all) {
     try {
       const extensionState = new Map();
-      await checkForAllExtensionUpdates(
-        extensions,
-        extensionManager,
-        (action) => {
-          if (action.type === 'SET_STATE') {
-            extensionState.set(action.payload.name, {
-              status: action.payload.state,
-            });
-          }
-        },
-      );
+      await checkForAllExtensionUpdates(extensions, extensionManager, (action) => {
+        if (action.type === "SET_STATE") {
+          extensionState.set(action.payload.name, {
+            status: action.payload.state,
+          });
+        }
+      });
       let updateInfos = await updateAllUpdatableExtensions(
         extensions,
         extensionState,
         extensionManager,
         () => {},
       );
-      updateInfos = updateInfos.filter(
-        (info) => info.originalVersion !== info.updatedVersion,
-      );
+      updateInfos = updateInfos.filter((info) => info.originalVersion !== info.updatedVersion);
       if (updateInfos.length === 0) {
-        debugLogger.log('No extensions to update.');
+        debugLogger.log("No extensions to update.");
         return;
       }
-      debugLogger.log(updateInfos.map((info) => updateOutput(info)).join('\n'));
+      debugLogger.log(updateInfos.map((info) => updateOutput(info)).join("\n"));
     } catch (error) {
       debugLogger.error(getErrorMessage(error));
     }
@@ -120,30 +106,29 @@ export async function handleUpdate(args: UpdateArgs) {
 }
 
 export const updateCommand: CommandModule = {
-  command: 'update [<name>] [--all]',
-  describe:
-    'Updates all extensions or a named extension to the latest version.',
+  command: "update [<name>] [--all]",
+  describe: "Updates all extensions or a named extension to the latest version.",
   builder: (yargs) =>
     yargs
-      .positional('name', {
-        describe: 'The name of the extension to update.',
-        type: 'string',
+      .positional("name", {
+        describe: "The name of the extension to update.",
+        type: "string",
       })
-      .option('all', {
-        describe: 'Update all extensions.',
-        type: 'boolean',
+      .option("all", {
+        describe: "Update all extensions.",
+        type: "boolean",
       })
-      .conflicts('name', 'all')
+      .conflicts("name", "all")
       .check((argv) => {
         if (!argv.all && !argv.name) {
-          throw new Error('Either an extension name or --all must be provided');
+          throw new Error("Either an extension name or --all must be provided");
         }
         return true;
       }),
   handler: async (argv) => {
     await handleUpdate({
-      name: argv['name'] as string | undefined,
-      all: argv['all'] as boolean | undefined,
+      name: argv["name"] as string | undefined,
+      all: argv["all"] as boolean | undefined,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/extensions/utils.ts b/packages/ui-gemini/src/commands/extensions/utils.ts
index ddc591850..d479d15f8 100644
--- a/packages/ui-gemini/src/commands/extensions/utils.ts
+++ b/packages/ui-gemini/src/commands/extensions/utils.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { loadSettings } from '../../config/settings.js';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings } from "../../config/settings.js";
 
 export async function getExtensionAndManager(name: string) {
   const workspaceDir = process.cwd();
@@ -19,9 +19,7 @@ export async function getExtensionAndManager(name: string) {
     settings: loadSettings(workspaceDir).merged,
   });
   await extensionManager.loadExtensions();
-  const extension = extensionManager
-    .getExtensions()
-    .find((ext) => ext.name === name);
+  const extension = extensionManager.getExtensions().find((ext) => ext.name === name);
 
   if (!extension) {
     debugLogger.error(`Extension "${name}" is not installed.`);
diff --git a/packages/ui-gemini/src/commands/extensions/validate.test.ts b/packages/ui-gemini/src/commands/extensions/validate.test.ts
index 0b5825acd..db8f68536 100644
--- a/packages/ui-gemini/src/commands/extensions/validate.test.ts
+++ b/packages/ui-gemini/src/commands/extensions/validate.test.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { describe, it, expect, vi, type MockInstance } from 'vitest';
-import { handleValidate, validateCommand } from './validate.js';
-import yargs from 'yargs';
-import { createExtension } from '../../test-utils/createExtension.js';
-import path from 'node:path';
-import * as os from 'node:os';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import path from "node:path";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, type MockInstance, vi } from "vitest";
+import yargs from "yargs";
+import { createExtension } from "../../test-utils/createExtension.js";
+import { handleValidate, validateCommand } from "./validate.js";
 
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('extensions validate command', () => {
-  it('should fail if no path is provided', () => {
+describe("extensions validate command", () => {
+  it("should fail if no path is provided", () => {
     const validationParser = yargs([]).command(validateCommand).fail(false);
-    expect(() => validationParser.parse('validate')).toThrow(
-      'Not enough non-option arguments: got 0, need at least 1',
+    expect(() => validationParser.parse("validate")).toThrow(
+      "Not enough non-option arguments: got 0, need at least 1",
     );
   });
 });
 
-describe('handleValidate', () => {
+describe("handleValidate", () => {
   let debugLoggerLogSpy: MockInstance;
   let debugLoggerWarnSpy: MockInstance;
   let debugLoggerErrorSpy: MockInstance;
@@ -35,15 +35,13 @@ describe('handleValidate', () => {
   let tempWorkspaceDir: string;
 
   beforeEach(() => {
-    debugLoggerLogSpy = vi.spyOn(debugLogger, 'log');
-    debugLoggerWarnSpy = vi.spyOn(debugLogger, 'warn');
-    debugLoggerErrorSpy = vi.spyOn(debugLogger, 'error');
-    processSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation(() => undefined as never);
-    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'test-home'));
-    tempWorkspaceDir = fs.mkdtempSync(path.join(tempHomeDir, 'test-workspace'));
-    vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
+    debugLoggerLogSpy = vi.spyOn(debugLogger, "log");
+    debugLoggerWarnSpy = vi.spyOn(debugLogger, "warn");
+    debugLoggerErrorSpy = vi.spyOn(debugLogger, "error");
+    processSpy = vi.spyOn(process, "exit").mockImplementation(() => undefined as never);
+    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "test-home"));
+    tempWorkspaceDir = fs.mkdtempSync(path.join(tempHomeDir, "test-workspace"));
+    vi.spyOn(process, "cwd").mockReturnValue(tempWorkspaceDir);
   });
 
   afterEach(() => {
@@ -52,30 +50,30 @@ describe('handleValidate', () => {
     fs.rmSync(tempWorkspaceDir, { recursive: true, force: true });
   });
 
-  it('should validate an extension from a local dir', async () => {
+  it("should validate an extension from a local dir", async () => {
     createExtension({
       extensionsDir: tempWorkspaceDir,
-      name: 'local-ext-name',
-      version: '1.0.0',
+      name: "local-ext-name",
+      version: "1.0.0",
     });
 
     await handleValidate({
-      path: 'local-ext-name',
+      path: "local-ext-name",
     });
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      'Extension local-ext-name has been successfully validated.',
+      "Extension local-ext-name has been successfully validated.",
     );
   });
 
-  it('should throw an error if the extension name is invalid', async () => {
+  it("should throw an error if the extension name is invalid", async () => {
     createExtension({
       extensionsDir: tempWorkspaceDir,
-      name: 'INVALID_NAME',
-      version: '1.0.0',
+      name: "INVALID_NAME",
+      version: "1.0.0",
     });
 
     await handleValidate({
-      path: 'INVALID_NAME',
+      path: "INVALID_NAME",
     });
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
       expect.stringContaining(
@@ -85,40 +83,38 @@ describe('handleValidate', () => {
     expect(processSpy).toHaveBeenCalledWith(1);
   });
 
-  it('should warn if version is not formatted with semver', async () => {
+  it("should warn if version is not formatted with semver", async () => {
     createExtension({
       extensionsDir: tempWorkspaceDir,
-      name: 'valid-name',
-      version: '1',
+      name: "valid-name",
+      version: "1",
     });
 
     await handleValidate({
-      path: 'valid-name',
+      path: "valid-name",
     });
     expect(debugLoggerWarnSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        "Version '1' does not appear to be standard semver (e.g., 1.0.0).",
-      ),
+      expect.stringContaining("Version '1' does not appear to be standard semver (e.g., 1.0.0)."),
     );
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      'Extension valid-name has been successfully validated.',
+      "Extension valid-name has been successfully validated.",
     );
   });
 
-  it('should throw an error if context files are missing', async () => {
+  it("should throw an error if context files are missing", async () => {
     createExtension({
       extensionsDir: tempWorkspaceDir,
-      name: 'valid-name',
-      version: '1.0.0',
-      contextFileName: 'contextFile.md',
+      name: "valid-name",
+      version: "1.0.0",
+      contextFileName: "contextFile.md",
     });
-    fs.rmSync(path.join(tempWorkspaceDir, 'valid-name/contextFile.md'));
+    fs.rmSync(path.join(tempWorkspaceDir, "valid-name/contextFile.md"));
     await handleValidate({
-      path: 'valid-name',
+      path: "valid-name",
     });
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
       expect.stringContaining(
-        'The following context files referenced in gemini-extension.json are missing: contextFile.md',
+        "The following context files referenced in gemini-extension.json are missing: contextFile.md",
       ),
     );
     expect(processSpy).toHaveBeenCalledWith(1);
diff --git a/packages/ui-gemini/src/commands/extensions/validate.ts b/packages/ui-gemini/src/commands/extensions/validate.ts
index 5c21505e9..f1624cb1e 100644
--- a/packages/ui-gemini/src/commands/extensions/validate.ts
+++ b/packages/ui-gemini/src/commands/extensions/validate.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import semver from 'semver';
-import { getErrorMessage } from '../../utils/errors.js';
-import type { ExtensionConfig } from '../../config/extension.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { loadSettings } from '../../config/settings.js';
-import { exitCli } from '../utils.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import semver from "semver";
+import type { CommandModule } from "yargs";
+import type { ExtensionConfig } from "../../config/extension.js";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { exitCli } from "../utils.js";
 
 interface ValidateArgs {
   path: string;
@@ -40,8 +40,7 @@ async function validateExtension(args: ValidateArgs) {
     settings: loadSettings(workspaceDir).merged,
   });
   const absoluteInputPath = path.resolve(args.path);
-  const extensionConfig: ExtensionConfig =
-    extensionManager.loadExtensionConfig(absoluteInputPath);
+  const extensionConfig: ExtensionConfig = extensionManager.loadExtensionConfig(absoluteInputPath);
   const warnings: string[] = [];
   const errors: string[] = [];
 
@@ -52,10 +51,7 @@ async function validateExtension(args: ValidateArgs) {
 
     const missingContextFiles: string[] = [];
     for (const contextFilePath of contextFileNames) {
-      const contextFileAbsolutePath = path.resolve(
-        absoluteInputPath,
-        contextFilePath,
-      );
+      const contextFileAbsolutePath = path.resolve(absoluteInputPath, contextFilePath);
       if (!fs.existsSync(contextFileAbsolutePath)) {
         missingContextFiles.push(contextFilePath);
       }
@@ -74,33 +70,33 @@ async function validateExtension(args: ValidateArgs) {
   }
 
   if (warnings.length > 0) {
-    debugLogger.warn('Validation warnings:');
+    debugLogger.warn("Validation warnings:");
     for (const warning of warnings) {
       debugLogger.warn(`  - ${warning}`);
     }
   }
 
   if (errors.length > 0) {
-    debugLogger.error('Validation failed with the following errors:');
+    debugLogger.error("Validation failed with the following errors:");
     for (const error of errors) {
       debugLogger.error(`  - ${error}`);
     }
-    throw new Error('Extension validation failed.');
+    throw new Error("Extension validation failed.");
   }
 }
 
 export const validateCommand: CommandModule = {
-  command: 'validate <path>',
-  describe: 'Validates an extension from a local path.',
+  command: "validate <path>",
+  describe: "Validates an extension from a local path.",
   builder: (yargs) =>
-    yargs.positional('path', {
-      describe: 'The path of the extension to validate.',
-      type: 'string',
+    yargs.positional("path", {
+      describe: "The path of the extension to validate.",
+      type: "string",
       demandOption: true,
     }),
   handler: async (args) => {
     await handleValidate({
-      path: args['path'] as string,
+      path: args["path"] as string,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/hooks.tsx b/packages/ui-gemini/src/commands/hooks.tsx
index 4475d33ab..6197875b5 100644
--- a/packages/ui-gemini/src/commands/hooks.tsx
+++ b/packages/ui-gemini/src/commands/hooks.tsx
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import { migrateCommand } from './hooks/migrate.js';
-import { initializeOutputListenersAndFlush } from '../gemini.js';
+import type { CommandModule } from "yargs";
+import { initializeOutputListenersAndFlush } from "../gemini.js";
+import { migrateCommand } from "./hooks/migrate.js";
 
 export const hooksCommand: CommandModule = {
-  command: 'hooks <command>',
-  aliases: ['hook'],
-  describe: 'Manage Gemini CLI hooks.',
+  command: "hooks <command>",
+  aliases: ["hook"],
+  describe: "Manage Gemini CLI hooks.",
   builder: (yargs) =>
     yargs
       .middleware(() => initializeOutputListenersAndFlush())
       .command(migrateCommand)
-      .demandCommand(1, 'You need at least one command before continuing.')
+      .demandCommand(1, "You need at least one command before continuing.")
       .version(false),
   handler: () => {
     // This handler is not called when a subcommand is provided.
diff --git a/packages/ui-gemini/src/commands/hooks/migrate.test.ts b/packages/ui-gemini/src/commands/hooks/migrate.test.ts
index d8e20760b..d8c829869 100644
--- a/packages/ui-gemini/src/commands/hooks/migrate.test.ts
+++ b/packages/ui-gemini/src/commands/hooks/migrate.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs";
+import { debugLogger } from "@airiscode/gemini-cli-core";
 import {
+  afterEach,
+  beforeEach,
   describe,
-  it,
   expect,
-  vi,
-  beforeEach,
-  afterEach,
+  it,
   type Mock,
   type MockInstance,
-} from 'vitest';
-import * as fs from 'node:fs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { handleMigrateFromClaude } from './migrate.js';
-
-vi.mock('node:fs');
-vi.mock('../utils.js', () => ({
+  vi,
+} from "vitest";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { handleMigrateFromClaude } from "./migrate.js";
+
+vi.mock("node:fs");
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-vi.mock('../../config/settings.js', async () => {
-  const actual = await vi.importActual('../../config/settings.js');
+vi.mock("../../config/settings.js", async () => {
+  const actual = await vi.importActual("../../config/settings.js");
   return {
     ...actual,
     loadSettings: vi.fn(),
@@ -35,7 +35,7 @@ vi.mock('../../config/settings.js', async () => {
 const mockedLoadSettings = loadSettings as Mock;
 const mockedFs = vi.mocked(fs);
 
-describe('migrate command', () => {
+describe("migrate command", () => {
   let mockSetValue: Mock;
   let debugLoggerLogSpy: MockInstance;
   let debugLoggerErrorSpy: MockInstance;
@@ -45,23 +45,19 @@ describe('migrate command', () => {
     vi.resetAllMocks();
 
     mockSetValue = vi.fn();
-    debugLoggerLogSpy = vi
-      .spyOn(debugLogger, 'log')
-      .mockImplementation(() => {});
-    debugLoggerErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
+    debugLoggerLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
+    debugLoggerErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
     // Mock process.cwd()
     originalCwd = process.cwd;
-    process.cwd = vi.fn(() => '/test/project');
+    process.cwd = vi.fn(() => "/test/project");
 
     mockedLoadSettings.mockReturnValue({
       merged: {
         hooks: {},
       },
       setValue: mockSetValue,
-      workspace: { path: '/test/project/.gemini' },
+      workspace: { path: "/test/project/.gemini" },
     });
   });
 
@@ -70,26 +66,26 @@ describe('migrate command', () => {
     vi.restoreAllMocks();
   });
 
-  it('should log error when no Claude settings files exist', async () => {
+  it("should log error when no Claude settings files exist", async () => {
     mockedFs.existsSync.mockReturnValue(false);
 
     await handleMigrateFromClaude();
 
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      'No Claude Code settings found in .claude directory. Expected settings.json or settings.local.json',
+      "No Claude Code settings found in .claude directory. Expected settings.json or settings.local.json",
     );
     expect(mockSetValue).not.toHaveBeenCalled();
   });
 
-  it('should migrate hooks from settings.json when it exists', async () => {
+  it("should migrate hooks from settings.json when it exists", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
-            matcher: 'Edit',
+            matcher: "Edit",
             hooks: [
               {
-                type: 'command',
+                type: "command",
                 command: 'echo "Before Edit"',
                 timeout: 30,
               },
@@ -99,9 +95,7 @@ describe('migrate command', () => {
       },
     };
 
-    mockedFs.existsSync.mockImplementation((path) =>
-      path.toString().endsWith('settings.json'),
-    );
+    mockedFs.existsSync.mockImplementation((path) => path.toString().endsWith("settings.json"));
 
     mockedFs.readFileSync.mockReturnValue(JSON.stringify(claudeSettings));
 
@@ -109,15 +103,15 @@ describe('migrate command', () => {
 
     expect(mockSetValue).toHaveBeenCalledWith(
       SettingScope.Workspace,
-      'hooks',
+      "hooks",
       expect.objectContaining({
         BeforeTool: expect.arrayContaining([
           expect.objectContaining({
-            matcher: 'replace',
+            matcher: "replace",
             hooks: expect.arrayContaining([
               expect.objectContaining({
                 command: 'echo "Before Edit"',
-                type: 'command',
+                type: "command",
                 timeout: 30,
               }),
             ]),
@@ -127,24 +121,24 @@ describe('migrate command', () => {
     );
 
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Found Claude Code settings'),
+      expect.stringContaining("Found Claude Code settings"),
     );
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Migrating 1 hook event'),
+      expect.stringContaining("Migrating 1 hook event"),
     );
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      '✓ Hooks successfully migrated to .gemini/settings.json',
+      "✓ Hooks successfully migrated to .gemini/settings.json",
     );
   });
 
-  it('should prefer settings.local.json over settings.json', async () => {
+  it("should prefer settings.local.json over settings.json", async () => {
     const localSettings = {
       hooks: {
         SessionStart: [
           {
             hooks: [
               {
-                type: 'command',
+                type: "command",
                 command: 'echo "Local session start"',
               },
             ],
@@ -159,30 +153,30 @@ describe('migrate command', () => {
     await handleMigrateFromClaude();
 
     expect(mockedFs.readFileSync).toHaveBeenCalledWith(
-      expect.stringContaining('settings.local.json'),
-      'utf-8',
+      expect.stringContaining("settings.local.json"),
+      "utf-8",
     );
     expect(mockSetValue).toHaveBeenCalledWith(
       SettingScope.Workspace,
-      'hooks',
+      "hooks",
       expect.objectContaining({
         SessionStart: expect.any(Array),
       }),
     );
   });
 
-  it('should migrate all supported event types', async () => {
+  it("should migrate all supported event types", async () => {
     const claudeSettings = {
       hooks: {
-        PreToolUse: [{ hooks: [{ type: 'command', command: 'echo 1' }] }],
-        PostToolUse: [{ hooks: [{ type: 'command', command: 'echo 2' }] }],
-        UserPromptSubmit: [{ hooks: [{ type: 'command', command: 'echo 3' }] }],
-        Stop: [{ hooks: [{ type: 'command', command: 'echo 4' }] }],
-        SubAgentStop: [{ hooks: [{ type: 'command', command: 'echo 5' }] }],
-        SessionStart: [{ hooks: [{ type: 'command', command: 'echo 6' }] }],
-        SessionEnd: [{ hooks: [{ type: 'command', command: 'echo 7' }] }],
-        PreCompact: [{ hooks: [{ type: 'command', command: 'echo 8' }] }],
-        Notification: [{ hooks: [{ type: 'command', command: 'echo 9' }] }],
+        PreToolUse: [{ hooks: [{ type: "command", command: "echo 1" }] }],
+        PostToolUse: [{ hooks: [{ type: "command", command: "echo 2" }] }],
+        UserPromptSubmit: [{ hooks: [{ type: "command", command: "echo 3" }] }],
+        Stop: [{ hooks: [{ type: "command", command: "echo 4" }] }],
+        SubAgentStop: [{ hooks: [{ type: "command", command: "echo 5" }] }],
+        SessionStart: [{ hooks: [{ type: "command", command: "echo 6" }] }],
+        SessionEnd: [{ hooks: [{ type: "command", command: "echo 7" }] }],
+        PreCompact: [{ hooks: [{ type: "command", command: "echo 8" }] }],
+        Notification: [{ hooks: [{ type: "command", command: "echo 9" }] }],
       },
     };
 
@@ -193,23 +187,23 @@ describe('migrate command', () => {
 
     const migratedHooks = mockSetValue.mock.calls[0][2];
 
-    expect(migratedHooks).toHaveProperty('BeforeTool');
-    expect(migratedHooks).toHaveProperty('AfterTool');
-    expect(migratedHooks).toHaveProperty('BeforeAgent');
-    expect(migratedHooks).toHaveProperty('AfterAgent');
-    expect(migratedHooks).toHaveProperty('SessionStart');
-    expect(migratedHooks).toHaveProperty('SessionEnd');
-    expect(migratedHooks).toHaveProperty('PreCompress');
-    expect(migratedHooks).toHaveProperty('Notification');
+    expect(migratedHooks).toHaveProperty("BeforeTool");
+    expect(migratedHooks).toHaveProperty("AfterTool");
+    expect(migratedHooks).toHaveProperty("BeforeAgent");
+    expect(migratedHooks).toHaveProperty("AfterAgent");
+    expect(migratedHooks).toHaveProperty("SessionStart");
+    expect(migratedHooks).toHaveProperty("SessionEnd");
+    expect(migratedHooks).toHaveProperty("PreCompress");
+    expect(migratedHooks).toHaveProperty("Notification");
   });
 
-  it('should transform tool names in matchers', async () => {
+  it("should transform tool names in matchers", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
-            matcher: 'Edit|Bash|Read|Write|Glob|Grep',
-            hooks: [{ type: 'command', command: 'echo "test"' }],
+            matcher: "Edit|Bash|Read|Write|Glob|Grep",
+            hooks: [{ type: "command", command: 'echo "test"' }],
           },
         ],
       },
@@ -222,19 +216,19 @@ describe('migrate command', () => {
 
     const migratedHooks = mockSetValue.mock.calls[0][2];
     expect(migratedHooks.BeforeTool[0].matcher).toBe(
-      'replace|run_shell_command|read_file|write_file|glob|grep',
+      "replace|run_shell_command|read_file|write_file|glob|grep",
     );
   });
 
-  it('should replace $CLAUDE_PROJECT_DIR with $GEMINI_PROJECT_DIR', async () => {
+  it("should replace $CLAUDE_PROJECT_DIR with $GEMINI_PROJECT_DIR", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
             hooks: [
               {
-                type: 'command',
-                command: 'cd $CLAUDE_PROJECT_DIR && ls',
+                type: "command",
+                command: "cd $CLAUDE_PROJECT_DIR && ls",
               },
             ],
           },
@@ -248,18 +242,16 @@ describe('migrate command', () => {
     await handleMigrateFromClaude();
 
     const migratedHooks = mockSetValue.mock.calls[0][2];
-    expect(migratedHooks.BeforeTool[0].hooks[0].command).toBe(
-      'cd $GEMINI_PROJECT_DIR && ls',
-    );
+    expect(migratedHooks.BeforeTool[0].hooks[0].command).toBe("cd $GEMINI_PROJECT_DIR && ls");
   });
 
-  it('should preserve sequential flag', async () => {
+  it("should preserve sequential flag", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
             sequential: true,
-            hooks: [{ type: 'command', command: 'echo "test"' }],
+            hooks: [{ type: "command", command: 'echo "test"' }],
           },
         ],
       },
@@ -274,14 +266,14 @@ describe('migrate command', () => {
     expect(migratedHooks.BeforeTool[0].sequential).toBe(true);
   });
 
-  it('should preserve timeout values', async () => {
+  it("should preserve timeout values", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
             hooks: [
               {
-                type: 'command',
+                type: "command",
                 command: 'echo "test"',
                 timeout: 60,
               },
@@ -300,12 +292,12 @@ describe('migrate command', () => {
     expect(migratedHooks.BeforeTool[0].hooks[0].timeout).toBe(60);
   });
 
-  it('should merge with existing Gemini hooks', async () => {
+  it("should merge with existing Gemini hooks", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
-            hooks: [{ type: 'command', command: 'echo "claude"' }],
+            hooks: [{ type: "command", command: 'echo "claude"' }],
           },
         ],
       },
@@ -316,13 +308,13 @@ describe('migrate command', () => {
         hooks: {
           AfterTool: [
             {
-              hooks: [{ type: 'command', command: 'echo "existing"' }],
+              hooks: [{ type: "command", command: 'echo "existing"' }],
             },
           ],
         },
       },
       setValue: mockSetValue,
-      workspace: { path: '/test/project/.gemini' },
+      workspace: { path: "/test/project/.gemini" },
     });
 
     mockedFs.existsSync.mockReturnValue(true);
@@ -331,13 +323,13 @@ describe('migrate command', () => {
     await handleMigrateFromClaude();
 
     const migratedHooks = mockSetValue.mock.calls[0][2];
-    expect(migratedHooks).toHaveProperty('BeforeTool');
-    expect(migratedHooks).toHaveProperty('AfterTool');
+    expect(migratedHooks).toHaveProperty("BeforeTool");
+    expect(migratedHooks).toHaveProperty("AfterTool");
     expect(migratedHooks.AfterTool[0].hooks[0].command).toBe('echo "existing"');
     expect(migratedHooks.BeforeTool[0].hooks[0].command).toBe('echo "claude"');
   });
 
-  it('should handle JSON with comments', async () => {
+  it("should handle JSON with comments", async () => {
     const claudeSettingsWithComments = `{
       // This is a comment
       "hooks": {
@@ -362,28 +354,26 @@ describe('migrate command', () => {
 
     expect(mockSetValue).toHaveBeenCalledWith(
       SettingScope.Workspace,
-      'hooks',
+      "hooks",
       expect.objectContaining({
         BeforeTool: expect.any(Array),
       }),
     );
   });
 
-  it('should handle malformed JSON gracefully', async () => {
+  it("should handle malformed JSON gracefully", async () => {
     mockedFs.existsSync.mockReturnValue(true);
-    mockedFs.readFileSync.mockReturnValue('{ invalid json }');
+    mockedFs.readFileSync.mockReturnValue("{ invalid json }");
 
     await handleMigrateFromClaude();
 
-    expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Error reading'),
-    );
+    expect(debugLoggerErrorSpy).toHaveBeenCalledWith(expect.stringContaining("Error reading"));
     expect(mockSetValue).not.toHaveBeenCalled();
   });
 
-  it('should log info when no hooks are found in Claude settings', async () => {
+  it("should log info when no hooks are found in Claude settings", async () => {
     const claudeSettings = {
-      someOtherSetting: 'value',
+      someOtherSetting: "value",
     };
 
     mockedFs.existsSync.mockReturnValue(true);
@@ -392,17 +382,17 @@ describe('migrate command', () => {
     await handleMigrateFromClaude();
 
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      'No hooks found in Claude Code settings to migrate.',
+      "No hooks found in Claude Code settings to migrate.",
     );
     expect(mockSetValue).not.toHaveBeenCalled();
   });
 
-  it('should handle setValue errors gracefully', async () => {
+  it("should handle setValue errors gracefully", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
-            hooks: [{ type: 'command', command: 'echo "test"' }],
+            hooks: [{ type: "command", command: 'echo "test"' }],
           },
         ],
       },
@@ -411,25 +401,23 @@ describe('migrate command', () => {
     mockedFs.existsSync.mockReturnValue(true);
     mockedFs.readFileSync.mockReturnValue(JSON.stringify(claudeSettings));
     mockSetValue.mockImplementation(() => {
-      throw new Error('Failed to save');
+      throw new Error("Failed to save");
     });
 
     await handleMigrateFromClaude();
 
-    expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      'Error saving migrated hooks: Failed to save',
-    );
+    expect(debugLoggerErrorSpy).toHaveBeenCalledWith("Error saving migrated hooks: Failed to save");
   });
 
-  it('should handle hooks with matcher but no command', async () => {
+  it("should handle hooks with matcher but no command", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
-            matcher: 'Edit',
+            matcher: "Edit",
             hooks: [
               {
-                type: 'command',
+                type: "command",
               },
             ],
           },
@@ -443,11 +431,11 @@ describe('migrate command', () => {
     await handleMigrateFromClaude();
 
     const migratedHooks = mockSetValue.mock.calls[0][2];
-    expect(migratedHooks.BeforeTool[0].matcher).toBe('replace');
-    expect(migratedHooks.BeforeTool[0].hooks[0].type).toBe('command');
+    expect(migratedHooks.BeforeTool[0].matcher).toBe("replace");
+    expect(migratedHooks.BeforeTool[0].hooks[0].type).toBe("command");
   });
 
-  it('should handle empty hooks array', async () => {
+  it("should handle empty hooks array", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
@@ -467,13 +455,13 @@ describe('migrate command', () => {
     expect(migratedHooks.BeforeTool[0].hooks).toEqual([]);
   });
 
-  it('should handle non-array event config gracefully', async () => {
+  it("should handle non-array event config gracefully", async () => {
     const claudeSettings = {
       hooks: {
-        PreToolUse: 'not an array',
+        PreToolUse: "not an array",
         PostToolUse: [
           {
-            hooks: [{ type: 'command', command: 'echo "test"' }],
+            hooks: [{ type: "command", command: 'echo "test"' }],
           },
         ],
       },
@@ -485,16 +473,16 @@ describe('migrate command', () => {
     await handleMigrateFromClaude();
 
     const migratedHooks = mockSetValue.mock.calls[0][2];
-    expect(migratedHooks).not.toHaveProperty('BeforeTool');
-    expect(migratedHooks).toHaveProperty('AfterTool');
+    expect(migratedHooks).not.toHaveProperty("BeforeTool");
+    expect(migratedHooks).toHaveProperty("AfterTool");
   });
 
-  it('should display migration instructions after successful migration', async () => {
+  it("should display migration instructions after successful migration", async () => {
     const claudeSettings = {
       hooks: {
         PreToolUse: [
           {
-            hooks: [{ type: 'command', command: 'echo "test"' }],
+            hooks: [{ type: "command", command: 'echo "test"' }],
           },
         ],
       },
@@ -506,13 +494,13 @@ describe('migrate command', () => {
     await handleMigrateFromClaude();
 
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      '✓ Hooks successfully migrated to .gemini/settings.json',
+      "✓ Hooks successfully migrated to .gemini/settings.json",
     );
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      '\nMigration complete! Please review the migrated hooks in .gemini/settings.json',
+      "\nMigration complete! Please review the migrated hooks in .gemini/settings.json",
     );
     expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-      'Note: Set tools.enableHooks to true in your settings to enable the hook system.',
+      "Note: Set tools.enableHooks to true in your settings to enable the hook system.",
     );
   });
 });
diff --git a/packages/ui-gemini/src/commands/hooks/migrate.ts b/packages/ui-gemini/src/commands/hooks/migrate.ts
index 654a51c17..a6e6006b7 100644
--- a/packages/ui-gemini/src/commands/hooks/migrate.ts
+++ b/packages/ui-gemini/src/commands/hooks/migrate.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandModule } from 'yargs';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { debugLogger, getErrorMessage } from '@airiscode/gemini-cli-core';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { exitCli } from '../utils.js';
-import stripJsonComments from 'strip-json-comments';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { debugLogger, getErrorMessage } from "@airiscode/gemini-cli-core";
+import stripJsonComments from "strip-json-comments";
+import type { CommandModule } from "yargs";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { exitCli } from "../utils.js";
 
 interface MigrateArgs {
   fromClaude: boolean;
@@ -20,28 +20,28 @@ interface MigrateArgs {
  * Mapping from Claude Code event names to Gemini event names
  */
 const EVENT_MAPPING: Record<string, string> = {
-  PreToolUse: 'BeforeTool',
-  PostToolUse: 'AfterTool',
-  UserPromptSubmit: 'BeforeAgent',
-  Stop: 'AfterAgent',
-  SubAgentStop: 'AfterAgent', // Gemini doesn't have sub-agents, map to AfterAgent
-  SessionStart: 'SessionStart',
-  SessionEnd: 'SessionEnd',
-  PreCompact: 'PreCompress',
-  Notification: 'Notification',
+  PreToolUse: "BeforeTool",
+  PostToolUse: "AfterTool",
+  UserPromptSubmit: "BeforeAgent",
+  Stop: "AfterAgent",
+  SubAgentStop: "AfterAgent", // Gemini doesn't have sub-agents, map to AfterAgent
+  SessionStart: "SessionStart",
+  SessionEnd: "SessionEnd",
+  PreCompact: "PreCompress",
+  Notification: "Notification",
 };
 
 /**
  * Mapping from Claude Code tool names to Gemini tool names
  */
 const TOOL_NAME_MAPPING: Record<string, string> = {
-  Edit: 'replace',
-  Bash: 'run_shell_command',
-  Read: 'read_file',
-  Write: 'write_file',
-  Glob: 'glob',
-  Grep: 'grep',
-  LS: 'ls',
+  Edit: "replace",
+  Bash: "run_shell_command",
+  Read: "read_file",
+  Write: "write_file",
+  Glob: "glob",
+  Grep: "grep",
+  LS: "ls",
 };
 
 /**
@@ -53,10 +53,7 @@ function transformMatcher(matcher: string | undefined): string | undefined {
   let transformed = matcher;
   for (const [claudeName, geminiName] of Object.entries(TOOL_NAME_MAPPING)) {
     // Replace exact matches and matches within regex alternations
-    transformed = transformed.replace(
-      new RegExp(`\\b${claudeName}\\b`, 'g'),
-      geminiName,
-    );
+    transformed = transformed.replace(new RegExp(`\\b${claudeName}\\b`, "g"), geminiName);
   }
 
   return transformed;
@@ -66,7 +63,7 @@ function transformMatcher(matcher: string | undefined): string | undefined {
  * Migrate a Claude Code hook configuration to Gemini format
  */
 function migrateClaudeHook(claudeHook: unknown): unknown {
-  if (!claudeHook || typeof claudeHook !== 'object') {
+  if (!claudeHook || typeof claudeHook !== "object") {
     return claudeHook;
   }
 
@@ -74,26 +71,26 @@ function migrateClaudeHook(claudeHook: unknown): unknown {
   const migrated: Record<string, unknown> = {};
 
   // Map command field
-  if ('command' in hook) {
-    migrated['command'] = hook['command'];
+  if ("command" in hook) {
+    migrated["command"] = hook["command"];
 
     // Replace CLAUDE_PROJECT_DIR with GEMINI_PROJECT_DIR in command
-    if (typeof migrated['command'] === 'string') {
-      migrated['command'] = migrated['command'].replace(
+    if (typeof migrated["command"] === "string") {
+      migrated["command"] = migrated["command"].replace(
         /\$CLAUDE_PROJECT_DIR/g,
-        '$GEMINI_PROJECT_DIR',
+        "$GEMINI_PROJECT_DIR",
       );
     }
   }
 
   // Map type field
-  if ('type' in hook && hook['type'] === 'command') {
-    migrated['type'] = 'command';
+  if ("type" in hook && hook["type"] === "command") {
+    migrated["type"] = "command";
   }
 
   // Map timeout field (Claude uses seconds, Gemini uses seconds)
-  if ('timeout' in hook && typeof hook['timeout'] === 'number') {
-    migrated['timeout'] = hook['timeout'];
+  if ("timeout" in hook && typeof hook["timeout"] === "number") {
+    migrated["timeout"] = hook["timeout"];
   }
 
   return migrated;
@@ -103,7 +100,7 @@ function migrateClaudeHook(claudeHook: unknown): unknown {
  * Migrate Claude Code hooks configuration to Gemini format
  */
 function migrateClaudeHooks(claudeConfig: unknown): Record<string, unknown> {
-  if (!claudeConfig || typeof claudeConfig !== 'object') {
+  if (!claudeConfig || typeof claudeConfig !== "object") {
     return {};
   }
 
@@ -111,8 +108,8 @@ function migrateClaudeHooks(claudeConfig: unknown): Record<string, unknown> {
   const geminiHooks: Record<string, unknown> = {};
 
   // Check if there's a hooks section
-  const hooksSection = config['hooks'] as Record<string, unknown> | undefined;
-  if (!hooksSection || typeof hooksSection !== 'object') {
+  const hooksSection = config["hooks"] as Record<string, unknown> | undefined;
+  if (!hooksSection || typeof hooksSection !== "object") {
     return {};
   }
 
@@ -126,7 +123,7 @@ function migrateClaudeHooks(claudeConfig: unknown): Record<string, unknown> {
 
     // Migrate each hook definition
     const migratedDefinitions = eventConfig.map((def: unknown) => {
-      if (!def || typeof def !== 'object') {
+      if (!def || typeof def !== "object") {
         return def;
       }
 
@@ -134,21 +131,18 @@ function migrateClaudeHooks(claudeConfig: unknown): Record<string, unknown> {
       const migratedDef: Record<string, unknown> = {};
 
       // Transform matcher
-      if (
-        'matcher' in definition &&
-        typeof definition['matcher'] === 'string'
-      ) {
-        migratedDef['matcher'] = transformMatcher(definition['matcher']);
+      if ("matcher" in definition && typeof definition["matcher"] === "string") {
+        migratedDef["matcher"] = transformMatcher(definition["matcher"]);
       }
 
       // Copy sequential flag
-      if ('sequential' in definition) {
-        migratedDef['sequential'] = definition['sequential'];
+      if ("sequential" in definition) {
+        migratedDef["sequential"] = definition["sequential"];
       }
 
       // Migrate hooks array
-      if ('hooks' in definition && Array.isArray(definition['hooks'])) {
-        migratedDef['hooks'] = definition['hooks'].map(migrateClaudeHook);
+      if ("hooks" in definition && Array.isArray(definition["hooks"])) {
+        migratedDef["hooks"] = definition["hooks"].map(migrateClaudeHook);
       }
 
       return migratedDef;
@@ -167,43 +161,33 @@ export async function handleMigrateFromClaude() {
   const workingDir = process.cwd();
 
   // Look for Claude settings in .claude directory
-  const claudeDir = path.join(workingDir, '.claude');
-  const claudeSettingsPath = path.join(claudeDir, 'settings.json');
-  const claudeLocalSettingsPath = path.join(claudeDir, 'settings.local.json');
+  const claudeDir = path.join(workingDir, ".claude");
+  const claudeSettingsPath = path.join(claudeDir, "settings.json");
+  const claudeLocalSettingsPath = path.join(claudeDir, "settings.local.json");
 
   let claudeSettings: Record<string, unknown> | null = null;
-  let sourceFile = '';
+  let sourceFile = "";
 
   // Try to read settings.local.json first, then settings.json
   if (fs.existsSync(claudeLocalSettingsPath)) {
     sourceFile = claudeLocalSettingsPath;
     try {
-      const content = fs.readFileSync(claudeLocalSettingsPath, 'utf-8');
-      claudeSettings = JSON.parse(stripJsonComments(content)) as Record<
-        string,
-        unknown
-      >;
+      const content = fs.readFileSync(claudeLocalSettingsPath, "utf-8");
+      claudeSettings = JSON.parse(stripJsonComments(content)) as Record<string, unknown>;
     } catch (error) {
-      debugLogger.error(
-        `Error reading ${claudeLocalSettingsPath}: ${getErrorMessage(error)}`,
-      );
+      debugLogger.error(`Error reading ${claudeLocalSettingsPath}: ${getErrorMessage(error)}`);
     }
   } else if (fs.existsSync(claudeSettingsPath)) {
     sourceFile = claudeSettingsPath;
     try {
-      const content = fs.readFileSync(claudeSettingsPath, 'utf-8');
-      claudeSettings = JSON.parse(stripJsonComments(content)) as Record<
-        string,
-        unknown
-      >;
+      const content = fs.readFileSync(claudeSettingsPath, "utf-8");
+      claudeSettings = JSON.parse(stripJsonComments(content)) as Record<string, unknown>;
     } catch (error) {
-      debugLogger.error(
-        `Error reading ${claudeSettingsPath}: ${getErrorMessage(error)}`,
-      );
+      debugLogger.error(`Error reading ${claudeSettingsPath}: ${getErrorMessage(error)}`);
     }
   } else {
     debugLogger.error(
-      'No Claude Code settings found in .claude directory. Expected settings.json or settings.local.json',
+      "No Claude Code settings found in .claude directory. Expected settings.json or settings.local.json",
     );
     return;
   }
@@ -218,32 +202,29 @@ export async function handleMigrateFromClaude() {
   const migratedHooks = migrateClaudeHooks(claudeSettings);
 
   if (Object.keys(migratedHooks).length === 0) {
-    debugLogger.log('No hooks found in Claude Code settings to migrate.');
+    debugLogger.log("No hooks found in Claude Code settings to migrate.");
     return;
   }
 
-  debugLogger.log(
-    `Migrating ${Object.keys(migratedHooks).length} hook event(s)...`,
-  );
+  debugLogger.log(`Migrating ${Object.keys(migratedHooks).length} hook event(s)...`);
 
   // Load current Gemini settings
   const settings = loadSettings(workingDir);
 
   // Merge migrated hooks with existing hooks
-  const existingHooks =
-    (settings.merged.hooks as Record<string, unknown>) || {};
+  const existingHooks = (settings.merged.hooks as Record<string, unknown>) || {};
   const mergedHooks = { ...existingHooks, ...migratedHooks };
 
   // Update settings (setValue automatically saves)
   try {
-    settings.setValue(SettingScope.Workspace, 'hooks', mergedHooks);
+    settings.setValue(SettingScope.Workspace, "hooks", mergedHooks);
 
-    debugLogger.log('✓ Hooks successfully migrated to .gemini/settings.json');
+    debugLogger.log("✓ Hooks successfully migrated to .gemini/settings.json");
     debugLogger.log(
-      '\nMigration complete! Please review the migrated hooks in .gemini/settings.json',
+      "\nMigration complete! Please review the migrated hooks in .gemini/settings.json",
     );
     debugLogger.log(
-      'Note: Set tools.enableHooks to true in your settings to enable the hook system.',
+      "Note: Set tools.enableHooks to true in your settings to enable the hook system.",
     );
   } catch (error) {
     debugLogger.error(`Error saving migrated hooks: ${getErrorMessage(error)}`);
@@ -251,12 +232,12 @@ export async function handleMigrateFromClaude() {
 }
 
 export const migrateCommand: CommandModule = {
-  command: 'migrate',
-  describe: 'Migrate hooks from Claude Code to Gemini CLI',
+  command: "migrate",
+  describe: "Migrate hooks from Claude Code to Gemini CLI",
   builder: (yargs) =>
-    yargs.option('from-claude', {
-      describe: 'Migrate from Claude Code hooks',
-      type: 'boolean',
+    yargs.option("from-claude", {
+      describe: "Migrate from Claude Code hooks",
+      type: "boolean",
       default: false,
     }),
   handler: async (argv) => {
@@ -265,7 +246,7 @@ export const migrateCommand: CommandModule = {
       await handleMigrateFromClaude();
     } else {
       debugLogger.log(
-        'Usage: gemini hooks migrate --from-claude\n\nMigrate hooks from Claude Code to Gemini CLI format.',
+        "Usage: gemini hooks migrate --from-claude\n\nMigrate hooks from Claude Code to Gemini CLI format.",
       );
     }
     await exitCli();
diff --git a/packages/ui-gemini/src/commands/mcp.test.ts b/packages/ui-gemini/src/commands/mcp.test.ts
index 4e476ddad..200ce60ff 100644
--- a/packages/ui-gemini/src/commands/mcp.test.ts
+++ b/packages/ui-gemini/src/commands/mcp.test.ts
@@ -4,54 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { mcpCommand } from './mcp.js';
-import { type Argv } from 'yargs';
-import yargs from 'yargs';
+import { describe, expect, it, vi } from "vitest";
+import yargs, { type Argv } from "yargs";
+import { mcpCommand } from "./mcp.js";
 
-describe('mcp command', () => {
-  it('should have correct command definition', () => {
-    expect(mcpCommand.command).toBe('mcp');
-    expect(mcpCommand.describe).toBe('Manage MCP servers');
-    expect(typeof mcpCommand.builder).toBe('function');
-    expect(typeof mcpCommand.handler).toBe('function');
+describe("mcp command", () => {
+  it("should have correct command definition", () => {
+    expect(mcpCommand.command).toBe("mcp");
+    expect(mcpCommand.describe).toBe("Manage MCP servers");
+    expect(typeof mcpCommand.builder).toBe("function");
+    expect(typeof mcpCommand.handler).toBe("function");
   });
 
-  it('should show help when no subcommand is provided', async () => {
+  it("should show help when no subcommand is provided", async () => {
     const yargsInstance = yargs();
     (mcpCommand.builder as (y: Argv) => Argv)(yargsInstance);
 
     const parser = yargsInstance.command(mcpCommand).help();
 
     // Mock console.log and console.error to catch help output
-    const consoleLogMock = vi
-      .spyOn(console, 'log')
-      .mockImplementation(() => {});
-    const consoleErrorMock = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
+    const consoleLogMock = vi.spyOn(console, "log").mockImplementation(() => {});
+    const consoleErrorMock = vi.spyOn(console, "error").mockImplementation(() => {});
 
     try {
-      await parser.parse('mcp');
+      await parser.parse("mcp");
     } catch (_error) {
       // yargs might throw an error when demandCommand is not met
     }
 
     // Check if help output is shown
     const helpOutput =
-      consoleLogMock.mock.calls.join('\n') +
-      consoleErrorMock.mock.calls.join('\n');
-    expect(helpOutput).toContain('Manage MCP servers');
-    expect(helpOutput).toContain('Commands:');
-    expect(helpOutput).toContain('add');
-    expect(helpOutput).toContain('remove');
-    expect(helpOutput).toContain('list');
+      consoleLogMock.mock.calls.join("\n") + consoleErrorMock.mock.calls.join("\n");
+    expect(helpOutput).toContain("Manage MCP servers");
+    expect(helpOutput).toContain("Commands:");
+    expect(helpOutput).toContain("add");
+    expect(helpOutput).toContain("remove");
+    expect(helpOutput).toContain("list");
 
     consoleLogMock.mockRestore();
     consoleErrorMock.mockRestore();
   });
 
-  it('should register add, remove, and list subcommands', () => {
+  it("should register add, remove, and list subcommands", () => {
     const mockYargs = {
       command: vi.fn().mockReturnThis(),
       demandCommand: vi.fn().mockReturnThis(),
@@ -67,13 +61,13 @@ describe('mcp command', () => {
     const commandCalls = mockYargs.command.mock.calls;
     const commandNames = commandCalls.map((call) => call[0].command);
 
-    expect(commandNames).toContain('add <name> <commandOrUrl> [args...]');
-    expect(commandNames).toContain('remove <name>');
-    expect(commandNames).toContain('list');
+    expect(commandNames).toContain("add <name> <commandOrUrl> [args...]");
+    expect(commandNames).toContain("remove <name>");
+    expect(commandNames).toContain("list");
 
     expect(mockYargs.demandCommand).toHaveBeenCalledWith(
       1,
-      'You need at least one command before continuing.',
+      "You need at least one command before continuing.",
     );
   });
 });
diff --git a/packages/ui-gemini/src/commands/mcp.ts b/packages/ui-gemini/src/commands/mcp.ts
index f09680dbd..a2228324e 100644
--- a/packages/ui-gemini/src/commands/mcp.ts
+++ b/packages/ui-gemini/src/commands/mcp.ts
@@ -5,22 +5,22 @@
  */
 
 // File for 'gemini mcp' command
-import type { CommandModule, Argv } from 'yargs';
-import { addCommand } from './mcp/add.js';
-import { removeCommand } from './mcp/remove.js';
-import { listCommand } from './mcp/list.js';
-import { initializeOutputListenersAndFlush } from '../gemini.js';
+import type { Argv, CommandModule } from "yargs";
+import { initializeOutputListenersAndFlush } from "../gemini.js";
+import { addCommand } from "./mcp/add.js";
+import { listCommand } from "./mcp/list.js";
+import { removeCommand } from "./mcp/remove.js";
 
 export const mcpCommand: CommandModule = {
-  command: 'mcp',
-  describe: 'Manage MCP servers',
+  command: "mcp",
+  describe: "Manage MCP servers",
   builder: (yargs: Argv) =>
     yargs
       .middleware(() => initializeOutputListenersAndFlush())
       .command(addCommand)
       .command(removeCommand)
       .command(listCommand)
-      .demandCommand(1, 'You need at least one command before continuing.')
+      .demandCommand(1, "You need at least one command before continuing.")
       .version(false),
   handler: () => {
     // yargs will automatically show help if no subcommand is provided
diff --git a/packages/ui-gemini/src/commands/mcp/add.test.ts b/packages/ui-gemini/src/commands/mcp/add.test.ts
index df9682ae2..071032d2b 100644
--- a/packages/ui-gemini/src/commands/mcp/add.test.ts
+++ b/packages/ui-gemini/src/commands/mcp/add.test.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, type Mock, type MockInstance } from 'vitest';
-import yargs, { type Argv } from 'yargs';
-import { addCommand } from './add.js';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, type Mock, type MockInstance, vi } from "vitest";
+import yargs, { type Argv } from "yargs";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { addCommand } from "./add.js";
 
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-vi.mock('fs/promises', () => ({
+vi.mock("fs/promises", () => ({
   readFile: vi.fn(),
   writeFile: vi.fn(),
 }));
 
-vi.mock('os', () => {
-  const homedir = vi.fn(() => '/home/user');
+vi.mock("os", () => {
+  const homedir = vi.fn(() => "/home/user");
   return {
     default: {
       homedir,
@@ -29,8 +29,8 @@ vi.mock('os', () => {
   };
 });
 
-vi.mock('../../config/settings.js', async () => {
-  const actual = await vi.importActual('../../config/settings.js');
+vi.mock("../../config/settings.js", async () => {
+  const actual = await vi.importActual("../../config/settings.js");
   return {
     ...actual,
     loadSettings: vi.fn(),
@@ -39,7 +39,7 @@ vi.mock('../../config/settings.js', async () => {
 
 const mockedLoadSettings = loadSettings as Mock;
 
-describe('mcp add command', () => {
+describe("mcp add command", () => {
   let parser: Argv;
   let mockSetValue: Mock;
   let mockConsoleError: Mock;
@@ -51,281 +51,243 @@ describe('mcp add command', () => {
     parser = yargsInstance;
     mockSetValue = vi.fn();
     mockConsoleError = vi.fn();
-    debugLoggerErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(mockConsoleError);
+    debugLoggerErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
+    vi.spyOn(console, "error").mockImplementation(mockConsoleError);
     mockedLoadSettings.mockReturnValue({
       forScope: () => ({ settings: {} }),
       setValue: mockSetValue,
-      workspace: { path: '/path/to/project' },
-      user: { path: '/home/user' },
+      workspace: { path: "/path/to/project" },
+      user: { path: "/home/user" },
     });
   });
 
-  it('should add a stdio server to project settings', async () => {
-    await parser.parseAsync(
-      'add -e FOO=bar my-server /path/to/server arg1 arg2',
-    );
+  it("should add a stdio server to project settings", async () => {
+    await parser.parseAsync("add -e FOO=bar my-server /path/to/server arg1 arg2");
 
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'my-server': {
-          command: '/path/to/server',
-          args: ['arg1', 'arg2'],
-          env: { FOO: 'bar' },
-        },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, "mcpServers", {
+      "my-server": {
+        command: "/path/to/server",
+        args: ["arg1", "arg2"],
+        env: { FOO: "bar" },
       },
-    );
+    });
   });
 
-  it('should handle multiple env vars before positional args', async () => {
-    await parser.parseAsync(
-      'add -e FOO=bar -e BAZ=qux my-server /path/to/server',
-    );
+  it("should handle multiple env vars before positional args", async () => {
+    await parser.parseAsync("add -e FOO=bar -e BAZ=qux my-server /path/to/server");
 
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'my-server': {
-          command: '/path/to/server',
-          args: [],
-          env: { FOO: 'bar', BAZ: 'qux' },
-        },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, "mcpServers", {
+      "my-server": {
+        command: "/path/to/server",
+        args: [],
+        env: { FOO: "bar", BAZ: "qux" },
       },
-    );
+    });
   });
 
-  it('should add an sse server to user settings', async () => {
+  it("should add an sse server to user settings", async () => {
     await parser.parseAsync(
       'add --transport sse --scope user -H "X-API-Key: your-key" sse-server https://example.com/sse-endpoint',
     );
 
-    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', {
-      'sse-server': {
-        url: 'https://example.com/sse-endpoint',
-        type: 'sse',
-        headers: { 'X-API-Key': 'your-key' },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, "mcpServers", {
+      "sse-server": {
+        url: "https://example.com/sse-endpoint",
+        type: "sse",
+        headers: { "X-API-Key": "your-key" },
       },
     });
   });
 
-  it('should add an http server to project settings', async () => {
+  it("should add an http server to project settings", async () => {
     await parser.parseAsync(
       'add --transport http -H "Authorization: Bearer your-token" http-server https://example.com/mcp',
     );
 
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'http-server': {
-          url: 'https://example.com/mcp',
-          type: 'http',
-          headers: { Authorization: 'Bearer your-token' },
-        },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, "mcpServers", {
+      "http-server": {
+        url: "https://example.com/mcp",
+        type: "http",
+        headers: { Authorization: "Bearer your-token" },
       },
-    );
+    });
   });
 
-  it('should add an sse server using --type alias', async () => {
+  it("should add an sse server using --type alias", async () => {
     await parser.parseAsync(
       'add --type sse --scope user -H "X-API-Key: your-key" sse-server https://example.com/sse',
     );
 
-    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, 'mcpServers', {
-      'sse-server': {
-        url: 'https://example.com/sse',
-        type: 'sse',
-        headers: { 'X-API-Key': 'your-key' },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.User, "mcpServers", {
+      "sse-server": {
+        url: "https://example.com/sse",
+        type: "sse",
+        headers: { "X-API-Key": "your-key" },
       },
     });
   });
 
-  it('should add an http server using --type alias', async () => {
+  it("should add an http server using --type alias", async () => {
     await parser.parseAsync(
       'add --type http -H "Authorization: Bearer your-token" http-server https://example.com/mcp',
     );
 
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'http-server': {
-          url: 'https://example.com/mcp',
-          type: 'http',
-          headers: { Authorization: 'Bearer your-token' },
-        },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, "mcpServers", {
+      "http-server": {
+        url: "https://example.com/mcp",
+        type: "http",
+        headers: { Authorization: "Bearer your-token" },
       },
-    );
+    });
   });
 
-  it('should handle MCP server args with -- separator', async () => {
-    await parser.parseAsync(
-      'add my-server npx -- -y http://example.com/some-package',
-    );
+  it("should handle MCP server args with -- separator", async () => {
+    await parser.parseAsync("add my-server npx -- -y http://example.com/some-package");
 
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'my-server': {
-          command: 'npx',
-          args: ['-y', 'http://example.com/some-package'],
-        },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, "mcpServers", {
+      "my-server": {
+        command: "npx",
+        args: ["-y", "http://example.com/some-package"],
       },
-    );
+    });
   });
 
-  it('should handle unknown options as MCP server args', async () => {
-    await parser.parseAsync(
-      'add test-server npx -y http://example.com/some-package',
-    );
+  it("should handle unknown options as MCP server args", async () => {
+    await parser.parseAsync("add test-server npx -y http://example.com/some-package");
 
-    expect(mockSetValue).toHaveBeenCalledWith(
-      SettingScope.Workspace,
-      'mcpServers',
-      {
-        'test-server': {
-          command: 'npx',
-          args: ['-y', 'http://example.com/some-package'],
-        },
+    expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, "mcpServers", {
+      "test-server": {
+        command: "npx",
+        args: ["-y", "http://example.com/some-package"],
       },
-    );
+    });
   });
 
-  describe('when handling scope and directory', () => {
-    const serverName = 'test-server';
-    const command = 'echo';
+  describe("when handling scope and directory", () => {
+    const serverName = "test-server";
+    const command = "echo";
 
     const setupMocks = (cwd: string, workspacePath: string) => {
-      vi.spyOn(process, 'cwd').mockReturnValue(cwd);
+      vi.spyOn(process, "cwd").mockReturnValue(cwd);
       mockedLoadSettings.mockReturnValue({
         forScope: () => ({ settings: {} }),
         setValue: mockSetValue,
         workspace: { path: workspacePath },
-        user: { path: '/home/user' },
+        user: { path: "/home/user" },
       });
     };
 
-    describe('when in a project directory', () => {
+    describe("when in a project directory", () => {
       beforeEach(() => {
-        setupMocks('/path/to/project', '/path/to/project');
+        setupMocks("/path/to/project", "/path/to/project");
       });
 
-      it('should use project scope by default', async () => {
+      it("should use project scope by default", async () => {
         await parser.parseAsync(`add ${serverName} ${command}`);
         expect(mockSetValue).toHaveBeenCalledWith(
           SettingScope.Workspace,
-          'mcpServers',
+          "mcpServers",
           expect.any(Object),
         );
       });
 
-      it('should use project scope when --scope=project is used', async () => {
+      it("should use project scope when --scope=project is used", async () => {
         await parser.parseAsync(`add --scope project ${serverName} ${command}`);
         expect(mockSetValue).toHaveBeenCalledWith(
           SettingScope.Workspace,
-          'mcpServers',
+          "mcpServers",
           expect.any(Object),
         );
       });
 
-      it('should use user scope when --scope=user is used', async () => {
+      it("should use user scope when --scope=user is used", async () => {
         await parser.parseAsync(`add --scope user ${serverName} ${command}`);
         expect(mockSetValue).toHaveBeenCalledWith(
           SettingScope.User,
-          'mcpServers',
+          "mcpServers",
           expect.any(Object),
         );
       });
     });
 
-    describe('when in a subdirectory of a project', () => {
+    describe("when in a subdirectory of a project", () => {
       beforeEach(() => {
-        setupMocks('/path/to/project/subdir', '/path/to/project');
+        setupMocks("/path/to/project/subdir", "/path/to/project");
       });
 
-      it('should use project scope by default', async () => {
+      it("should use project scope by default", async () => {
         await parser.parseAsync(`add ${serverName} ${command}`);
         expect(mockSetValue).toHaveBeenCalledWith(
           SettingScope.Workspace,
-          'mcpServers',
+          "mcpServers",
           expect.any(Object),
         );
       });
     });
 
-    describe('when in the home directory', () => {
+    describe("when in the home directory", () => {
       beforeEach(() => {
-        setupMocks('/home/user', '/home/user');
+        setupMocks("/home/user", "/home/user");
       });
 
-      it('should show an error by default', async () => {
-        const mockProcessExit = vi
-          .spyOn(process, 'exit')
-          .mockImplementation((() => {
-            throw new Error('process.exit called');
-          }) as (code?: number | string | null) => never);
+      it("should show an error by default", async () => {
+        const mockProcessExit = vi.spyOn(process, "exit").mockImplementation((() => {
+          throw new Error("process.exit called");
+        }) as (code?: number | string | null) => never);
 
-        await expect(
-          parser.parseAsync(`add ${serverName} ${command}`),
-        ).rejects.toThrow('process.exit called');
+        await expect(parser.parseAsync(`add ${serverName} ${command}`)).rejects.toThrow(
+          "process.exit called",
+        );
 
         expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-          'Error: Please use --scope user to edit settings in the home directory.',
+          "Error: Please use --scope user to edit settings in the home directory.",
         );
         expect(mockProcessExit).toHaveBeenCalledWith(1);
         expect(mockSetValue).not.toHaveBeenCalled();
       });
 
-      it('should show an error when --scope=project is used explicitly', async () => {
-        const mockProcessExit = vi
-          .spyOn(process, 'exit')
-          .mockImplementation((() => {
-            throw new Error('process.exit called');
-          }) as (code?: number | string | null) => never);
+      it("should show an error when --scope=project is used explicitly", async () => {
+        const mockProcessExit = vi.spyOn(process, "exit").mockImplementation((() => {
+          throw new Error("process.exit called");
+        }) as (code?: number | string | null) => never);
 
         await expect(
           parser.parseAsync(`add --scope project ${serverName} ${command}`),
-        ).rejects.toThrow('process.exit called');
+        ).rejects.toThrow("process.exit called");
 
         expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-          'Error: Please use --scope user to edit settings in the home directory.',
+          "Error: Please use --scope user to edit settings in the home directory.",
         );
         expect(mockProcessExit).toHaveBeenCalledWith(1);
         expect(mockSetValue).not.toHaveBeenCalled();
       });
 
-      it('should use user scope when --scope=user is used', async () => {
+      it("should use user scope when --scope=user is used", async () => {
         await parser.parseAsync(`add --scope user ${serverName} ${command}`);
         expect(mockSetValue).toHaveBeenCalledWith(
           SettingScope.User,
-          'mcpServers',
+          "mcpServers",
           expect.any(Object),
         );
         expect(debugLoggerErrorSpy).not.toHaveBeenCalled();
       });
     });
 
-    describe('when in a subdirectory of home (not a project)', () => {
+    describe("when in a subdirectory of home (not a project)", () => {
       beforeEach(() => {
-        setupMocks('/home/user/some/dir', '/home/user/some/dir');
+        setupMocks("/home/user/some/dir", "/home/user/some/dir");
       });
 
-      it('should use project scope by default', async () => {
+      it("should use project scope by default", async () => {
         await parser.parseAsync(`add ${serverName} ${command}`);
         expect(mockSetValue).toHaveBeenCalledWith(
           SettingScope.Workspace,
-          'mcpServers',
+          "mcpServers",
           expect.any(Object),
         );
       });
 
-      it('should write to the WORKSPACE scope, not the USER scope', async () => {
+      it("should write to the WORKSPACE scope, not the USER scope", async () => {
         await parser.parseAsync(`add my-new-server echo`);
 
         // We expect setValue to be called once.
@@ -339,27 +301,27 @@ describe('mcp add command', () => {
       });
     });
 
-    describe('when outside of home (not a project)', () => {
+    describe("when outside of home (not a project)", () => {
       beforeEach(() => {
-        setupMocks('/tmp/foo', '/tmp/foo');
+        setupMocks("/tmp/foo", "/tmp/foo");
       });
 
-      it('should use project scope by default', async () => {
+      it("should use project scope by default", async () => {
         await parser.parseAsync(`add ${serverName} ${command}`);
         expect(mockSetValue).toHaveBeenCalledWith(
           SettingScope.Workspace,
-          'mcpServers',
+          "mcpServers",
           expect.any(Object),
         );
       });
     });
   });
 
-  describe('when updating an existing server', () => {
-    const serverName = 'existing-server';
-    const initialCommand = 'echo old';
-    const updatedCommand = 'echo';
-    const updatedArgs = ['new'];
+  describe("when updating an existing server", () => {
+    const serverName = "existing-server";
+    const initialCommand = "echo old";
+    const updatedCommand = "echo";
+    const updatedArgs = ["new"];
 
     beforeEach(() => {
       mockedLoadSettings.mockReturnValue({
@@ -373,18 +335,16 @@ describe('mcp add command', () => {
           },
         }),
         setValue: mockSetValue,
-        workspace: { path: '/path/to/project' },
-        user: { path: '/home/user' },
+        workspace: { path: "/path/to/project" },
+        user: { path: "/home/user" },
       });
     });
 
-    it('should update the existing server in the project scope', async () => {
-      await parser.parseAsync(
-        `add ${serverName} ${updatedCommand} ${updatedArgs.join(' ')}`,
-      );
+    it("should update the existing server in the project scope", async () => {
+      await parser.parseAsync(`add ${serverName} ${updatedCommand} ${updatedArgs.join(" ")}`);
       expect(mockSetValue).toHaveBeenCalledWith(
         SettingScope.Workspace,
-        'mcpServers',
+        "mcpServers",
         expect.objectContaining({
           [serverName]: expect.objectContaining({
             command: updatedCommand,
@@ -394,13 +354,13 @@ describe('mcp add command', () => {
       );
     });
 
-    it('should update the existing server in the user scope', async () => {
+    it("should update the existing server in the user scope", async () => {
       await parser.parseAsync(
-        `add --scope user ${serverName} ${updatedCommand} ${updatedArgs.join(' ')}`,
+        `add --scope user ${serverName} ${updatedCommand} ${updatedArgs.join(" ")}`,
       );
       expect(mockSetValue).toHaveBeenCalledWith(
         SettingScope.User,
-        'mcpServers',
+        "mcpServers",
         expect.objectContaining({
           [serverName]: expect.objectContaining({
             command: updatedCommand,
diff --git a/packages/ui-gemini/src/commands/mcp/add.ts b/packages/ui-gemini/src/commands/mcp/add.ts
index eda20d17a..484d60cbf 100644
--- a/packages/ui-gemini/src/commands/mcp/add.ts
+++ b/packages/ui-gemini/src/commands/mcp/add.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { debugLogger, type MCPServerConfig } from "@airiscode/gemini-cli-core";
 // File for 'gemini mcp add' command
-import type { CommandModule } from 'yargs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { debugLogger, type MCPServerConfig } from '@airiscode/gemini-cli-core';
-import { exitCli } from '../utils.js';
+import type { CommandModule } from "yargs";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { exitCli } from "../utils.js";
 
 async function addMcpServer(
   name: string,
@@ -26,37 +26,25 @@ async function addMcpServer(
     excludeTools?: string[];
   },
 ) {
-  const {
-    scope,
-    transport,
-    env,
-    header,
-    timeout,
-    trust,
-    description,
-    includeTools,
-    excludeTools,
-  } = options;
+  const { scope, transport, env, header, timeout, trust, description, includeTools, excludeTools } =
+    options;
 
   const settings = loadSettings(process.cwd());
   const inHome = settings.workspace.path === settings.user.path;
 
-  if (scope === 'project' && inHome) {
-    debugLogger.error(
-      'Error: Please use --scope user to edit settings in the home directory.',
-    );
+  if (scope === "project" && inHome) {
+    debugLogger.error("Error: Please use --scope user to edit settings in the home directory.");
     process.exit(1);
   }
 
-  const settingsScope =
-    scope === 'user' ? SettingScope.User : SettingScope.Workspace;
+  const settingsScope = scope === "user" ? SettingScope.User : SettingScope.Workspace;
 
   let newServer: Partial<MCPServerConfig> = {};
 
   const headers = header?.reduce(
     (acc, curr) => {
-      const [key, ...valueParts] = curr.split(':');
-      const value = valueParts.join(':').trim();
+      const [key, ...valueParts] = curr.split(":");
+      const value = valueParts.join(":").trim();
       if (key.trim() && value) {
         acc[key.trim()] = value;
       }
@@ -66,10 +54,10 @@ async function addMcpServer(
   );
 
   switch (transport) {
-    case 'sse':
+    case "sse":
       newServer = {
         url: commandOrUrl,
-        type: 'sse',
+        type: "sse",
         headers,
         timeout,
         trust,
@@ -78,10 +66,10 @@ async function addMcpServer(
         excludeTools,
       };
       break;
-    case 'http':
+    case "http":
       newServer = {
         url: commandOrUrl,
-        type: 'http',
+        type: "http",
         headers,
         timeout,
         trust,
@@ -90,14 +78,14 @@ async function addMcpServer(
         excludeTools,
       };
       break;
-    case 'stdio':
+    case "stdio":
     default:
       newServer = {
         command: commandOrUrl,
         args: args?.map(String),
         env: env?.reduce(
           (acc, curr) => {
-            const [key, value] = curr.split('=');
+            const [key, value] = curr.split("=");
             if (key && value) {
               acc[key] = value;
             }
@@ -119,118 +107,113 @@ async function addMcpServer(
 
   const isExistingServer = !!mcpServers[name];
   if (isExistingServer) {
-    debugLogger.log(
-      `MCP server "${name}" is already configured within ${scope} settings.`,
-    );
+    debugLogger.log(`MCP server "${name}" is already configured within ${scope} settings.`);
   }
 
   mcpServers[name] = newServer as MCPServerConfig;
 
-  settings.setValue(settingsScope, 'mcpServers', mcpServers);
+  settings.setValue(settingsScope, "mcpServers", mcpServers);
 
   if (isExistingServer) {
     debugLogger.log(`MCP server "${name}" updated in ${scope} settings.`);
   } else {
-    debugLogger.log(
-      `MCP server "${name}" added to ${scope} settings. (${transport})`,
-    );
+    debugLogger.log(`MCP server "${name}" added to ${scope} settings. (${transport})`);
   }
 }
 
 export const addCommand: CommandModule = {
-  command: 'add <name> <commandOrUrl> [args...]',
-  describe: 'Add a server',
+  command: "add <name> <commandOrUrl> [args...]",
+  describe: "Add a server",
   builder: (yargs) =>
     yargs
-      .usage('Usage: gemini mcp add [options] <name> <commandOrUrl> [args...]')
+      .usage("Usage: gemini mcp add [options] <name> <commandOrUrl> [args...]")
       .parserConfiguration({
-        'unknown-options-as-args': true, // Pass unknown options as server args
-        'populate--': true, // Populate server args after -- separator
+        "unknown-options-as-args": true, // Pass unknown options as server args
+        "populate--": true, // Populate server args after -- separator
       })
-      .positional('name', {
-        describe: 'Name of the server',
-        type: 'string',
+      .positional("name", {
+        describe: "Name of the server",
+        type: "string",
         demandOption: true,
       })
-      .positional('commandOrUrl', {
-        describe: 'Command (stdio) or URL (sse, http)',
-        type: 'string',
+      .positional("commandOrUrl", {
+        describe: "Command (stdio) or URL (sse, http)",
+        type: "string",
         demandOption: true,
       })
-      .option('scope', {
-        alias: 's',
-        describe: 'Configuration scope (user or project)',
-        type: 'string',
-        default: 'project',
-        choices: ['user', 'project'],
+      .option("scope", {
+        alias: "s",
+        describe: "Configuration scope (user or project)",
+        type: "string",
+        default: "project",
+        choices: ["user", "project"],
       })
-      .option('transport', {
-        alias: ['t', 'type'],
-        describe: 'Transport type (stdio, sse, http)',
-        type: 'string',
-        default: 'stdio',
-        choices: ['stdio', 'sse', 'http'],
+      .option("transport", {
+        alias: ["t", "type"],
+        describe: "Transport type (stdio, sse, http)",
+        type: "string",
+        default: "stdio",
+        choices: ["stdio", "sse", "http"],
       })
-      .option('env', {
-        alias: 'e',
-        describe: 'Set environment variables (e.g. -e KEY=value)',
-        type: 'array',
+      .option("env", {
+        alias: "e",
+        describe: "Set environment variables (e.g. -e KEY=value)",
+        type: "array",
         string: true,
         nargs: 1,
       })
-      .option('header', {
-        alias: 'H',
+      .option("header", {
+        alias: "H",
         describe:
           'Set HTTP headers for SSE and HTTP transports (e.g. -H "X-Api-Key: abc123" -H "Authorization: Bearer abc123")',
-        type: 'array',
+        type: "array",
         string: true,
         nargs: 1,
       })
-      .option('timeout', {
-        describe: 'Set connection timeout in milliseconds',
-        type: 'number',
+      .option("timeout", {
+        describe: "Set connection timeout in milliseconds",
+        type: "number",
       })
-      .option('trust', {
-        describe:
-          'Trust the server (bypass all tool call confirmation prompts)',
-        type: 'boolean',
+      .option("trust", {
+        describe: "Trust the server (bypass all tool call confirmation prompts)",
+        type: "boolean",
       })
-      .option('description', {
-        describe: 'Set the description for the server',
-        type: 'string',
+      .option("description", {
+        describe: "Set the description for the server",
+        type: "string",
       })
-      .option('include-tools', {
-        describe: 'A comma-separated list of tools to include',
-        type: 'array',
+      .option("include-tools", {
+        describe: "A comma-separated list of tools to include",
+        type: "array",
         string: true,
       })
-      .option('exclude-tools', {
-        describe: 'A comma-separated list of tools to exclude',
-        type: 'array',
+      .option("exclude-tools", {
+        describe: "A comma-separated list of tools to exclude",
+        type: "array",
         string: true,
       })
       .middleware((argv) => {
         // Handle -- separator args as server args if present
-        if (argv['--']) {
-          const existingArgs = (argv['args'] as Array<string | number>) || [];
-          argv['args'] = [...existingArgs, ...(argv['--'] as string[])];
+        if (argv["--"]) {
+          const existingArgs = (argv["args"] as Array<string | number>) || [];
+          argv["args"] = [...existingArgs, ...(argv["--"] as string[])];
         }
       }),
   handler: async (argv) => {
     await addMcpServer(
-      argv['name'] as string,
-      argv['commandOrUrl'] as string,
-      argv['args'] as Array<string | number>,
+      argv["name"] as string,
+      argv["commandOrUrl"] as string,
+      argv["args"] as Array<string | number>,
       {
-        scope: argv['scope'] as string,
-        transport: argv['transport'] as string,
-        env: argv['env'] as string[],
-        header: argv['header'] as string[],
-        timeout: argv['timeout'] as number | undefined,
-        trust: argv['trust'] as boolean | undefined,
-        description: argv['description'] as string | undefined,
-        includeTools: argv['includeTools'] as string[] | undefined,
-        excludeTools: argv['excludeTools'] as string[] | undefined,
+        scope: argv["scope"] as string,
+        transport: argv["transport"] as string,
+        env: argv["env"] as string[],
+        header: argv["header"] as string[],
+        timeout: argv["timeout"] as number | undefined,
+        trust: argv["trust"] as boolean | undefined,
+        description: argv["description"] as string | undefined,
+        includeTools: argv["includeTools"] as string[] | undefined,
+        excludeTools: argv["excludeTools"] as string[] | undefined,
       },
     );
     await exitCli();
diff --git a/packages/ui-gemini/src/commands/mcp/list.test.ts b/packages/ui-gemini/src/commands/mcp/list.test.ts
index c8333fcad..a23436530 100644
--- a/packages/ui-gemini/src/commands/mcp/list.test.ts
+++ b/packages/ui-gemini/src/commands/mcp/list.test.ts
@@ -4,52 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
-import { listMcpServers } from './list.js';
-import { loadSettings } from '../../config/settings.js';
-import { createTransport, debugLogger } from '@airiscode/gemini-cli-core';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { ExtensionStorage } from '../../config/extensions/storage.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-
-vi.mock('../../config/settings.js', () => ({
+import { createTransport, debugLogger } from "@airiscode/gemini-cli-core";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { ExtensionStorage } from "../../config/extensions/storage.js";
+import { loadSettings } from "../../config/settings.js";
+import { listMcpServers } from "./list.js";
+
+vi.mock("../../config/settings.js", () => ({
   loadSettings: vi.fn(),
 }));
-vi.mock('../../config/extensions/storage.js', () => ({
+vi.mock("../../config/extensions/storage.js", () => ({
   ExtensionStorage: {
     getUserExtensionsDir: vi.fn(),
   },
 }));
-vi.mock('../../config/extension-manager.js');
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("../../config/extension-manager.js");
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...original,
     createTransport: vi.fn(),
     MCPServerStatus: {
-      CONNECTED: 'CONNECTED',
-      CONNECTING: 'CONNECTING',
-      DISCONNECTED: 'DISCONNECTED',
+      CONNECTED: "CONNECTED",
+      CONNECTING: "CONNECTING",
+      DISCONNECTED: "DISCONNECTED",
     },
     Storage: vi.fn().mockImplementation((_cwd: string) => ({
-      getGlobalSettingsPath: () => '/tmp/gemini/settings.json',
-      getWorkspaceSettingsPath: () => '/tmp/gemini/workspace-settings.json',
-      getProjectTempDir: () => '/test/home/.gemini/tmp/mocked_hash',
+      getGlobalSettingsPath: () => "/tmp/gemini/settings.json",
+      getWorkspaceSettingsPath: () => "/tmp/gemini/workspace-settings.json",
+      getProjectTempDir: () => "/test/home/.gemini/tmp/mocked_hash",
     })),
-    GEMINI_DIR: '.gemini',
-    getErrorMessage: (e: unknown) =>
-      e instanceof Error ? e.message : String(e),
+    GEMINI_DIR: ".gemini",
+    getErrorMessage: (e: unknown) => (e instanceof Error ? e.message : String(e)),
   };
 });
-vi.mock('@modelcontextprotocol/sdk/client/index.js');
+vi.mock("@modelcontextprotocol/sdk/client/index.js");
 
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-const mockedGetUserExtensionsDir =
-  ExtensionStorage.getUserExtensionsDir as Mock;
+const mockedGetUserExtensionsDir = ExtensionStorage.getUserExtensionsDir as Mock;
 const mockedLoadSettings = loadSettings as Mock;
 const mockedCreateTransport = createTransport as Mock;
 const MockedClient = Client as Mock;
@@ -69,14 +66,14 @@ interface MockTransport {
   close: Mock;
 }
 
-describe('mcp list command', () => {
+describe("mcp list command", () => {
   let mockClient: MockClient;
   let mockExtensionManager: MockExtensionManager;
   let mockTransport: MockTransport;
 
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.spyOn(debugLogger, 'log').mockImplementation(() => {});
+    vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
     mockTransport = { close: vi.fn() };
     mockClient = {
@@ -92,24 +89,24 @@ describe('mcp list command', () => {
     MockedExtensionManager.mockImplementation(() => mockExtensionManager);
     mockedCreateTransport.mockResolvedValue(mockTransport);
     mockExtensionManager.loadExtensions.mockReturnValue([]);
-    mockedGetUserExtensionsDir.mockReturnValue('/mocked/extensions/dir');
+    mockedGetUserExtensionsDir.mockReturnValue("/mocked/extensions/dir");
   });
 
-  it('should display message when no servers configured', async () => {
+  it("should display message when no servers configured", async () => {
     mockedLoadSettings.mockReturnValue({ merged: { mcpServers: {} } });
 
     await listMcpServers();
 
-    expect(debugLogger.log).toHaveBeenCalledWith('No MCP servers configured.');
+    expect(debugLogger.log).toHaveBeenCalledWith("No MCP servers configured.");
   });
 
-  it('should display different server types with connected status', async () => {
+  it("should display different server types with connected status", async () => {
     mockedLoadSettings.mockReturnValue({
       merged: {
         mcpServers: {
-          'stdio-server': { command: '/path/to/server', args: ['arg1'] },
-          'sse-server': { url: 'https://example.com/sse' },
-          'http-server': { httpUrl: 'https://example.com/http' },
+          "stdio-server": { command: "/path/to/server", args: ["arg1"] },
+          "sse-server": { url: "https://example.com/sse" },
+          "http-server": { httpUrl: "https://example.com/http" },
         },
       },
     });
@@ -119,55 +116,47 @@ describe('mcp list command', () => {
 
     await listMcpServers();
 
-    expect(debugLogger.log).toHaveBeenCalledWith('Configured MCP servers:\n');
+    expect(debugLogger.log).toHaveBeenCalledWith("Configured MCP servers:\n");
     expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'stdio-server: /path/to/server arg1 (stdio) - Connected',
-      ),
+      expect.stringContaining("stdio-server: /path/to/server arg1 (stdio) - Connected"),
     );
     expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'sse-server: https://example.com/sse (sse) - Connected',
-      ),
+      expect.stringContaining("sse-server: https://example.com/sse (sse) - Connected"),
     );
     expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'http-server: https://example.com/http (http) - Connected',
-      ),
+      expect.stringContaining("http-server: https://example.com/http (http) - Connected"),
     );
   });
 
-  it('should display disconnected status when connection fails', async () => {
+  it("should display disconnected status when connection fails", async () => {
     mockedLoadSettings.mockReturnValue({
       merged: {
         mcpServers: {
-          'test-server': { command: '/test/server' },
+          "test-server": { command: "/test/server" },
         },
       },
     });
 
-    mockClient.connect.mockRejectedValue(new Error('Connection failed'));
+    mockClient.connect.mockRejectedValue(new Error("Connection failed"));
 
     await listMcpServers();
 
     expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'test-server: /test/server  (stdio) - Disconnected',
-      ),
+      expect.stringContaining("test-server: /test/server  (stdio) - Disconnected"),
     );
   });
 
-  it('should merge extension servers with config servers', async () => {
+  it("should merge extension servers with config servers", async () => {
     mockedLoadSettings.mockReturnValue({
       merged: {
-        mcpServers: { 'config-server': { command: '/config/server' } },
+        mcpServers: { "config-server": { command: "/config/server" } },
       },
     });
 
     mockExtensionManager.loadExtensions.mockReturnValue([
       {
-        name: 'test-extension',
-        mcpServers: { 'extension-server': { command: '/ext/server' } },
+        name: "test-extension",
+        mcpServers: { "extension-server": { command: "/ext/server" } },
       },
     ]);
 
@@ -177,13 +166,11 @@ describe('mcp list command', () => {
     await listMcpServers();
 
     expect(debugLogger.log).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'config-server: /config/server  (stdio) - Connected',
-      ),
+      expect.stringContaining("config-server: /config/server  (stdio) - Connected"),
     );
     expect(debugLogger.log).toHaveBeenCalledWith(
       expect.stringContaining(
-        'extension-server (from test-extension): /ext/server  (stdio) - Connected',
+        "extension-server (from test-extension): /ext/server  (stdio) - Connected",
       ),
     );
   });
diff --git a/packages/ui-gemini/src/commands/mcp/list.ts b/packages/ui-gemini/src/commands/mcp/list.ts
index a489ca4c6..639e2d98c 100644
--- a/packages/ui-gemini/src/commands/mcp/list.ts
+++ b/packages/ui-gemini/src/commands/mcp/list.ts
@@ -4,29 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { MCPServerConfig } from "@airiscode/gemini-cli-core";
+import { createTransport, debugLogger, MCPServerStatus } from "@airiscode/gemini-cli-core";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 // File for 'gemini mcp list' command
-import type { CommandModule } from 'yargs';
-import { loadSettings } from '../../config/settings.js';
-import type { MCPServerConfig } from '@airiscode/gemini-cli-core';
-import {
-  MCPServerStatus,
-  createTransport,
-  debugLogger,
-} from '@airiscode/gemini-cli-core';
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { requestConsentNonInteractive } from '../../config/extensions/consent.js';
-import { promptForSetting } from '../../config/extensions/extensionSettings.js';
-import { exitCli } from '../utils.js';
-
-const COLOR_GREEN = '\u001b[32m';
-const COLOR_YELLOW = '\u001b[33m';
-const COLOR_RED = '\u001b[31m';
-const RESET_COLOR = '\u001b[0m';
-
-async function getMcpServersFromConfig(): Promise<
-  Record<string, MCPServerConfig>
-> {
+import type { CommandModule } from "yargs";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { requestConsentNonInteractive } from "../../config/extensions/consent.js";
+import { promptForSetting } from "../../config/extensions/extensionSettings.js";
+import { loadSettings } from "../../config/settings.js";
+import { exitCli } from "../utils.js";
+
+const COLOR_GREEN = "\u001b[32m";
+const COLOR_YELLOW = "\u001b[33m";
+const COLOR_RED = "\u001b[31m";
+const RESET_COLOR = "\u001b[0m";
+
+async function getMcpServersFromConfig(): Promise<Record<string, MCPServerConfig>> {
   const settings = loadSettings();
   const extensionManager = new ExtensionManager({
     settings: settings.merged,
@@ -55,8 +49,8 @@ async function testMCPConnection(
   config: MCPServerConfig,
 ): Promise<MCPServerStatus> {
   const client = new Client({
-    name: 'mcp-test-client',
-    version: '0.0.1',
+    name: "mcp-test-client",
+    version: "0.0.1",
   });
 
   let transport;
@@ -96,45 +90,43 @@ export async function listMcpServers(): Promise<void> {
   const serverNames = Object.keys(mcpServers);
 
   if (serverNames.length === 0) {
-    debugLogger.log('No MCP servers configured.');
+    debugLogger.log("No MCP servers configured.");
     return;
   }
 
-  debugLogger.log('Configured MCP servers:\n');
+  debugLogger.log("Configured MCP servers:\n");
 
   for (const serverName of serverNames) {
     const server = mcpServers[serverName];
 
     const status = await getServerStatus(serverName, server);
 
-    let statusIndicator = '';
-    let statusText = '';
+    let statusIndicator = "";
+    let statusText = "";
     switch (status) {
       case MCPServerStatus.CONNECTED:
-        statusIndicator = COLOR_GREEN + '✓' + RESET_COLOR;
-        statusText = 'Connected';
+        statusIndicator = COLOR_GREEN + "✓" + RESET_COLOR;
+        statusText = "Connected";
         break;
       case MCPServerStatus.CONNECTING:
-        statusIndicator = COLOR_YELLOW + '…' + RESET_COLOR;
-        statusText = 'Connecting';
+        statusIndicator = COLOR_YELLOW + "…" + RESET_COLOR;
+        statusText = "Connecting";
         break;
       case MCPServerStatus.DISCONNECTED:
       default:
-        statusIndicator = COLOR_RED + '✗' + RESET_COLOR;
-        statusText = 'Disconnected';
+        statusIndicator = COLOR_RED + "✗" + RESET_COLOR;
+        statusText = "Disconnected";
         break;
     }
 
     let serverInfo =
-      serverName +
-      (server.extension?.name ? ` (from ${server.extension.name})` : '') +
-      ': ';
+      serverName + (server.extension?.name ? ` (from ${server.extension.name})` : "") + ": ";
     if (server.httpUrl) {
       serverInfo += `${server.httpUrl} (http)`;
     } else if (server.url) {
       serverInfo += `${server.url} (sse)`;
     } else if (server.command) {
-      serverInfo += `${server.command} ${server.args?.join(' ') || ''} (stdio)`;
+      serverInfo += `${server.command} ${server.args?.join(" ") || ""} (stdio)`;
     }
 
     debugLogger.log(`${statusIndicator} ${serverInfo} - ${statusText}`);
@@ -142,8 +134,8 @@ export async function listMcpServers(): Promise<void> {
 }
 
 export const listCommand: CommandModule = {
-  command: 'list',
-  describe: 'List all configured MCP servers',
+  command: "list",
+  describe: "List all configured MCP servers",
   handler: async () => {
     await listMcpServers();
     await exitCli();
diff --git a/packages/ui-gemini/src/commands/mcp/remove.test.ts b/packages/ui-gemini/src/commands/mcp/remove.test.ts
index 1ad172c50..4fabfe98c 100644
--- a/packages/ui-gemini/src/commands/mcp/remove.test.ts
+++ b/packages/ui-gemini/src/commands/mcp/remove.test.ts
@@ -4,34 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import yargs, { type Argv } from 'yargs';
-import { SettingScope, type LoadedSettings } from '../../config/settings.js';
-import { removeCommand } from './remove.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { GEMINI_DIR, debugLogger } from '@airiscode/gemini-cli-core';
-
-vi.mock('fs/promises', () => ({
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { debugLogger, GEMINI_DIR } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import yargs, { type Argv } from "yargs";
+import { type LoadedSettings, SettingScope } from "../../config/settings.js";
+import { removeCommand } from "./remove.js";
+
+vi.mock("fs/promises", () => ({
   readFile: vi.fn(),
   writeFile: vi.fn(),
 }));
 
-vi.mock('../utils.js', () => ({
+vi.mock("../utils.js", () => ({
   exitCli: vi.fn(),
 }));
 
-describe('mcp remove command', () => {
-  describe('unit tests with mocks', () => {
+describe("mcp remove command", () => {
+  describe("unit tests with mocks", () => {
     let parser: Argv;
     let mockSetValue: Mock;
     let mockSettings: Record<string, unknown>;
@@ -42,41 +34,32 @@ describe('mcp remove command', () => {
       mockSetValue = vi.fn();
       mockSettings = {
         mcpServers: {
-          'test-server': {
+          "test-server": {
             command: 'echo "hello"',
           },
         },
       };
 
-      vi.spyOn(
-        await import('../../config/settings.js'),
-        'loadSettings',
-      ).mockReturnValue({
+      vi.spyOn(await import("../../config/settings.js"), "loadSettings").mockReturnValue({
         forScope: () => ({ settings: mockSettings }),
         setValue: mockSetValue,
-        workspace: { path: '/path/to/project' },
-        user: { path: '/home/user' },
+        workspace: { path: "/path/to/project" },
+        user: { path: "/home/user" },
       } as unknown as LoadedSettings);
 
       const yargsInstance = yargs([]).command(removeCommand);
       parser = yargsInstance;
     });
 
-    it('should remove a server from project settings', async () => {
-      await parser.parseAsync('remove test-server');
+    it("should remove a server from project settings", async () => {
+      await parser.parseAsync("remove test-server");
 
-      expect(mockSetValue).toHaveBeenCalledWith(
-        SettingScope.Workspace,
-        'mcpServers',
-        {},
-      );
+      expect(mockSetValue).toHaveBeenCalledWith(SettingScope.Workspace, "mcpServers", {});
     });
 
-    it('should show a message if server not found', async () => {
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
-      await parser.parseAsync('remove non-existent-server');
+    it("should show a message if server not found", async () => {
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
+      await parser.parseAsync("remove non-existent-server");
 
       expect(mockSetValue).not.toHaveBeenCalled();
       expect(debugLogSpy).toHaveBeenCalledWith(
@@ -86,7 +69,7 @@ describe('mcp remove command', () => {
     });
   });
 
-  describe('integration tests with real file I/O', () => {
+  describe("integration tests with real file I/O", () => {
     let tempDir: string;
     let settingsDir: string;
     let settingsPath: string;
@@ -97,12 +80,12 @@ describe('mcp remove command', () => {
       vi.resetAllMocks();
       vi.restoreAllMocks();
 
-      tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mcp-remove-test-'));
+      tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "mcp-remove-test-"));
       settingsDir = path.join(tempDir, GEMINI_DIR);
-      settingsPath = path.join(settingsDir, 'settings.json');
+      settingsPath = path.join(settingsDir, "settings.json");
       fs.mkdirSync(settingsDir, { recursive: true });
 
-      cwdSpy = vi.spyOn(process, 'cwd').mockReturnValue(tempDir);
+      cwdSpy = vi.spyOn(process, "cwd").mockReturnValue(tempDir);
 
       parser = yargs([]).command(removeCommand);
     });
@@ -115,7 +98,7 @@ describe('mcp remove command', () => {
       }
     });
 
-    it('should actually remove a server from the settings file', async () => {
+    it("should actually remove a server from the settings file", async () => {
       const originalContent = `{
         "mcpServers": {
           "server-to-keep": {
@@ -128,14 +111,12 @@ describe('mcp remove command', () => {
           }
         }
       }`;
-      fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+      fs.writeFileSync(settingsPath, originalContent, "utf-8");
 
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
-      await parser.parseAsync('remove server-to-remove');
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
+      await parser.parseAsync("remove server-to-remove");
 
-      const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
+      const updatedContent = fs.readFileSync(settingsPath, "utf-8");
       expect(updatedContent).toContain('"server-to-keep"');
       expect(updatedContent).not.toContain('"server-to-remove"');
 
@@ -146,7 +127,7 @@ describe('mcp remove command', () => {
       debugLogSpy.mockRestore();
     });
 
-    it('should preserve comments when removing a server', async () => {
+    it("should preserve comments when removing a server", async () => {
       const originalContent = `{
         "mcpServers": {
           // Server to keep
@@ -161,23 +142,21 @@ describe('mcp remove command', () => {
           }
         }
       }`;
-      fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+      fs.writeFileSync(settingsPath, originalContent, "utf-8");
 
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
-      await parser.parseAsync('remove oldServer');
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
+      await parser.parseAsync("remove oldServer");
 
-      const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
-      expect(updatedContent).toContain('// Server to keep');
+      const updatedContent = fs.readFileSync(settingsPath, "utf-8");
+      expect(updatedContent).toContain("// Server to keep");
       expect(updatedContent).toContain('"context7"');
       expect(updatedContent).not.toContain('"oldServer"');
-      expect(updatedContent).toContain('// Server to remove');
+      expect(updatedContent).toContain("// Server to remove");
 
       debugLogSpy.mockRestore();
     });
 
-    it('should handle removing the only server', async () => {
+    it("should handle removing the only server", async () => {
       const originalContent = `{
         "mcpServers": {
           "only-server": {
@@ -186,14 +165,12 @@ describe('mcp remove command', () => {
           }
         }
       }`;
-      fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+      fs.writeFileSync(settingsPath, originalContent, "utf-8");
 
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
-      await parser.parseAsync('remove only-server');
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
+      await parser.parseAsync("remove only-server");
 
-      const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
+      const updatedContent = fs.readFileSync(settingsPath, "utf-8");
       expect(updatedContent).toContain('"mcpServers"');
       expect(updatedContent).not.toContain('"only-server"');
       expect(updatedContent).toMatch(/"mcpServers"\s*:\s*\{\s*\}/);
@@ -201,7 +178,7 @@ describe('mcp remove command', () => {
       debugLogSpy.mockRestore();
     });
 
-    it('should preserve other settings when removing a server', async () => {
+    it("should preserve other settings when removing a server", async () => {
       // Create settings file with other settings
       // Note: "model" will be migrated to "model": { "name": ... } format
       const originalContent = `{
@@ -222,14 +199,12 @@ describe('mcp remove command', () => {
           "theme": "dark"
         }
       }`;
-      fs.writeFileSync(settingsPath, originalContent, 'utf-8');
+      fs.writeFileSync(settingsPath, originalContent, "utf-8");
 
-      const debugLogSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
-      await parser.parseAsync('remove server1');
+      const debugLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
+      await parser.parseAsync("remove server1");
 
-      const updatedContent = fs.readFileSync(settingsPath, 'utf-8');
+      const updatedContent = fs.readFileSync(settingsPath, "utf-8");
       expect(updatedContent).toContain('"model"');
       expect(updatedContent).toContain('"gemini-2.5-pro"');
       expect(updatedContent).toContain('"server2"');
diff --git a/packages/ui-gemini/src/commands/mcp/remove.ts b/packages/ui-gemini/src/commands/mcp/remove.ts
index 15f342779..83e25f789 100644
--- a/packages/ui-gemini/src/commands/mcp/remove.ts
+++ b/packages/ui-gemini/src/commands/mcp/remove.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { debugLogger } from "@airiscode/gemini-cli-core";
 // File for 'gemini mcp remove' command
-import type { CommandModule } from 'yargs';
-import { loadSettings, SettingScope } from '../../config/settings.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { exitCli } from '../utils.js';
+import type { CommandModule } from "yargs";
+import { loadSettings, SettingScope } from "../../config/settings.js";
+import { exitCli } from "../utils.js";
 
 async function removeMcpServer(
   name: string,
@@ -17,8 +17,7 @@ async function removeMcpServer(
   },
 ) {
   const { scope } = options;
-  const settingsScope =
-    scope === 'user' ? SettingScope.User : SettingScope.Workspace;
+  const settingsScope = scope === "user" ? SettingScope.User : SettingScope.Workspace;
   const settings = loadSettings();
 
   const existingSettings = settings.forScope(settingsScope).settings;
@@ -31,32 +30,32 @@ async function removeMcpServer(
 
   delete mcpServers[name];
 
-  settings.setValue(settingsScope, 'mcpServers', mcpServers);
+  settings.setValue(settingsScope, "mcpServers", mcpServers);
 
   debugLogger.log(`Server "${name}" removed from ${scope} settings.`);
 }
 
 export const removeCommand: CommandModule = {
-  command: 'remove <name>',
-  describe: 'Remove a server',
+  command: "remove <name>",
+  describe: "Remove a server",
   builder: (yargs) =>
     yargs
-      .usage('Usage: gemini mcp remove [options] <name>')
-      .positional('name', {
-        describe: 'Name of the server',
-        type: 'string',
+      .usage("Usage: gemini mcp remove [options] <name>")
+      .positional("name", {
+        describe: "Name of the server",
+        type: "string",
         demandOption: true,
       })
-      .option('scope', {
-        alias: 's',
-        describe: 'Configuration scope (user or project)',
-        type: 'string',
-        default: 'project',
-        choices: ['user', 'project'],
+      .option("scope", {
+        alias: "s",
+        describe: "Configuration scope (user or project)",
+        type: "string",
+        default: "project",
+        choices: ["user", "project"],
       }),
   handler: async (argv) => {
-    await removeMcpServer(argv['name'] as string, {
-      scope: argv['scope'] as string,
+    await removeMcpServer(argv["name"] as string, {
+      scope: argv["scope"] as string,
     });
     await exitCli();
   },
diff --git a/packages/ui-gemini/src/commands/utils.test.ts b/packages/ui-gemini/src/commands/utils.test.ts
index 648893ab2..1e245a796 100644
--- a/packages/ui-gemini/src/commands/utils.test.ts
+++ b/packages/ui-gemini/src/commands/utils.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { exitCli } from './utils.js';
-import { runExitCleanup } from '../utils/cleanup.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { runExitCleanup } from "../utils/cleanup.js";
+import { exitCli } from "./utils.js";
 
-vi.mock('../utils/cleanup.js', () => ({
+vi.mock("../utils/cleanup.js", () => ({
   runExitCleanup: vi.fn(),
 }));
 
-describe('utils', () => {
+describe("utils", () => {
   const originalProcessExit = process.exit;
 
   beforeEach(() => {
@@ -25,14 +25,14 @@ describe('utils', () => {
     vi.clearAllMocks();
   });
 
-  describe('exitCli', () => {
-    it('should call runExitCleanup and process.exit with default exit code 0', async () => {
+  describe("exitCli", () => {
+    it("should call runExitCleanup and process.exit with default exit code 0", async () => {
       await exitCli();
       expect(runExitCleanup).toHaveBeenCalled();
       expect(process.exit).toHaveBeenCalledWith(0);
     });
 
-    it('should call runExitCleanup and process.exit with specified exit code', async () => {
+    it("should call runExitCleanup and process.exit with specified exit code", async () => {
       await exitCli(1);
       expect(runExitCleanup).toHaveBeenCalled();
       expect(process.exit).toHaveBeenCalledWith(1);
diff --git a/packages/ui-gemini/src/commands/utils.ts b/packages/ui-gemini/src/commands/utils.ts
index 33c5c142a..0c74509f9 100644
--- a/packages/ui-gemini/src/commands/utils.ts
+++ b/packages/ui-gemini/src/commands/utils.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { runExitCleanup } from '../utils/cleanup.js';
+import { runExitCleanup } from "../utils/cleanup.js";
 
 export async function exitCli(exitCode = 0) {
   await runExitCleanup();
diff --git a/packages/ui-gemini/src/config/auth.test.ts b/packages/ui-gemini/src/config/auth.test.ts
index d68d9e1a2..b7e69adc6 100644
--- a/packages/ui-gemini/src/config/auth.test.ts
+++ b/packages/ui-gemini/src/config/auth.test.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AuthType } from '@airiscode/gemini-cli-core';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { validateAuthMethod } from './auth.js';
+import { AuthType } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { validateAuthMethod } from "./auth.js";
 
-vi.mock('./settings.js', () => ({
+vi.mock("./settings.js", () => ({
   loadEnvironment: vi.fn(),
   loadSettings: vi.fn().mockReturnValue({
     merged: vi.fn().mockReturnValue({}),
   }),
 }));
 
-describe('validateAuthMethod', () => {
+describe("validateAuthMethod", () => {
   beforeEach(() => {
-    vi.stubEnv('GEMINI_API_KEY', undefined);
-    vi.stubEnv('GOOGLE_CLOUD_PROJECT', undefined);
-    vi.stubEnv('GOOGLE_CLOUD_LOCATION', undefined);
-    vi.stubEnv('GOOGLE_API_KEY', undefined);
+    vi.stubEnv("GEMINI_API_KEY", undefined);
+    vi.stubEnv("GOOGLE_CLOUD_PROJECT", undefined);
+    vi.stubEnv("GOOGLE_CLOUD_LOCATION", undefined);
+    vi.stubEnv("GOOGLE_API_KEY", undefined);
   });
 
   afterEach(() => {
@@ -29,68 +29,66 @@ describe('validateAuthMethod', () => {
 
   it.each([
     {
-      description: 'should return null for LOGIN_WITH_GOOGLE',
+      description: "should return null for LOGIN_WITH_GOOGLE",
       authType: AuthType.LOGIN_WITH_GOOGLE,
       envs: {},
       expected: null,
     },
     {
-      description: 'should return null for COMPUTE_ADC',
+      description: "should return null for COMPUTE_ADC",
       authType: AuthType.COMPUTE_ADC,
       envs: {},
       expected: null,
     },
     {
-      description: 'should return null for USE_GEMINI if GEMINI_API_KEY is set',
+      description: "should return null for USE_GEMINI if GEMINI_API_KEY is set",
       authType: AuthType.USE_GEMINI,
-      envs: { GEMINI_API_KEY: 'test-key' },
+      envs: { GEMINI_API_KEY: "test-key" },
       expected: null,
     },
     {
-      description:
-        'should return an error message for USE_GEMINI if GEMINI_API_KEY is not set',
+      description: "should return an error message for USE_GEMINI if GEMINI_API_KEY is not set",
       authType: AuthType.USE_GEMINI,
       envs: {},
       expected:
-        'When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\n' +
-        'Update your environment and try again (no reload needed if using .env)!',
+        "When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\n" +
+        "Update your environment and try again (no reload needed if using .env)!",
     },
     {
       description:
-        'should return null for USE_VERTEX_AI if GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION are set',
+        "should return null for USE_VERTEX_AI if GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION are set",
       authType: AuthType.USE_VERTEX_AI,
       envs: {
-        GOOGLE_CLOUD_PROJECT: 'test-project',
-        GOOGLE_CLOUD_LOCATION: 'test-location',
+        GOOGLE_CLOUD_PROJECT: "test-project",
+        GOOGLE_CLOUD_LOCATION: "test-location",
       },
       expected: null,
     },
     {
-      description:
-        'should return null for USE_VERTEX_AI if GOOGLE_API_KEY is set',
+      description: "should return null for USE_VERTEX_AI if GOOGLE_API_KEY is set",
       authType: AuthType.USE_VERTEX_AI,
-      envs: { GOOGLE_API_KEY: 'test-api-key' },
+      envs: { GOOGLE_API_KEY: "test-api-key" },
       expected: null,
     },
     {
       description:
-        'should return an error message for USE_VERTEX_AI if no required environment variables are set',
+        "should return an error message for USE_VERTEX_AI if no required environment variables are set",
       authType: AuthType.USE_VERTEX_AI,
       envs: {},
       expected:
-        'When using Vertex AI, you must specify either:\n' +
-        '• GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION environment variables.\n' +
-        '• GOOGLE_API_KEY environment variable (if using express mode).\n' +
-        'Update your environment and try again (no reload needed if using .env)!',
+        "When using Vertex AI, you must specify either:\n" +
+        "• GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION environment variables.\n" +
+        "• GOOGLE_API_KEY environment variable (if using express mode).\n" +
+        "Update your environment and try again (no reload needed if using .env)!",
     },
     {
-      description: 'should return an error message for an invalid auth method',
+      description: "should return an error message for an invalid auth method",
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      authType: 'invalid-method' as any,
+      authType: "invalid-method" as any,
       envs: {},
-      expected: 'Invalid auth method selected.',
+      expected: "Invalid auth method selected.",
     },
-  ])('$description', ({ authType, envs, expected }) => {
+  ])("$description", ({ authType, envs, expected }) => {
     for (const [key, value] of Object.entries(envs)) {
       vi.stubEnv(key, value as string);
     }
diff --git a/packages/ui-gemini/src/config/auth.ts b/packages/ui-gemini/src/config/auth.ts
index a81667c01..0c7846418 100644
--- a/packages/ui-gemini/src/config/auth.ts
+++ b/packages/ui-gemini/src/config/auth.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AuthType } from '@airiscode/gemini-cli-core';
-import { loadEnvironment, loadSettings } from './settings.js';
+import { AuthType } from "@airiscode/gemini-cli-core";
+import { loadEnvironment, loadSettings } from "./settings.js";
 
 export function validateAuthMethod(authMethod: string): string | null {
   loadEnvironment(loadSettings().merged);
-  if (
-    authMethod === AuthType.LOGIN_WITH_GOOGLE ||
-    authMethod === AuthType.COMPUTE_ADC
-  ) {
+  if (authMethod === AuthType.LOGIN_WITH_GOOGLE || authMethod === AuthType.COMPUTE_ADC) {
     return null;
   }
 
   if (authMethod === AuthType.USE_GEMINI) {
-    if (!process.env['GEMINI_API_KEY']) {
+    if (!process.env["GEMINI_API_KEY"]) {
       return (
-        'When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\n' +
-        'Update your environment and try again (no reload needed if using .env)!'
+        "When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\n" +
+        "Update your environment and try again (no reload needed if using .env)!"
       );
     }
     return null;
@@ -28,19 +25,18 @@ export function validateAuthMethod(authMethod: string): string | null {
 
   if (authMethod === AuthType.USE_VERTEX_AI) {
     const hasVertexProjectLocationConfig =
-      !!process.env['GOOGLE_CLOUD_PROJECT'] &&
-      !!process.env['GOOGLE_CLOUD_LOCATION'];
-    const hasGoogleApiKey = !!process.env['GOOGLE_API_KEY'];
+      !!process.env["GOOGLE_CLOUD_PROJECT"] && !!process.env["GOOGLE_CLOUD_LOCATION"];
+    const hasGoogleApiKey = !!process.env["GOOGLE_API_KEY"];
     if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
       return (
-        'When using Vertex AI, you must specify either:\n' +
-        '• GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION environment variables.\n' +
-        '• GOOGLE_API_KEY environment variable (if using express mode).\n' +
-        'Update your environment and try again (no reload needed if using .env)!'
+        "When using Vertex AI, you must specify either:\n" +
+        "• GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION environment variables.\n" +
+        "• GOOGLE_API_KEY environment variable (if using express mode).\n" +
+        "Update your environment and try again (no reload needed if using .env)!"
       );
     }
     return null;
   }
 
-  return 'Invalid auth method selected.';
+  return "Invalid auth method selected.";
 }
diff --git a/packages/ui-gemini/src/config/config.integration.test.ts b/packages/ui-gemini/src/config/config.integration.test.ts
index e5ecb03da..3bb664031 100644
--- a/packages/ui-gemini/src/config/config.integration.test.ts
+++ b/packages/ui-gemini/src/config/config.integration.test.ts
@@ -4,27 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  afterAll,
-  afterEach,
-  beforeAll,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-} from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { tmpdir } from 'node:os';
-import type { ConfigParameters } from '@airiscode/gemini-cli-core';
-import {
-  Config,
-  DEFAULT_FILE_FILTERING_OPTIONS,
-} from '@airiscode/gemini-cli-core';
-import type { Settings } from './settingsSchema.js';
-import { http, HttpResponse } from 'msw';
-import { setupServer } from 'msw/node';
+import * as fs from "node:fs";
+import { tmpdir } from "node:os";
+import * as path from "node:path";
+import type { ConfigParameters } from "@airiscode/gemini-cli-core";
+import { Config, DEFAULT_FILE_FILTERING_OPTIONS } from "@airiscode/gemini-cli-core";
+import { HttpResponse, http } from "msw";
+import { setupServer } from "msw/node";
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Settings } from "./settingsSchema.js";
 
 export const server = setupServer();
 
@@ -41,11 +29,11 @@ afterAll(() => {
   server.close();
 });
 
-const CLEARCUT_URL = 'https://play.googleapis.com/log';
+const CLEARCUT_URL = "https://play.googleapis.com/log";
 
 // Mock file discovery service and tool registry
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actual = await vi.importActual('@airiscode/gemini-cli-core');
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actual = await vi.importActual("@airiscode/gemini-cli-core");
   return {
     ...actual,
     FileDiscoveryService: vi.fn().mockImplementation(() => ({
@@ -55,14 +43,14 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
   };
 });
 
-describe('Configuration Integration Tests', () => {
+describe("Configuration Integration Tests", () => {
   let tempDir: string;
 
   beforeEach(() => {
     server.resetHandlers(http.post(CLEARCUT_URL, () => HttpResponse.text()));
 
-    tempDir = fs.mkdtempSync(path.join(tmpdir(), 'gemini-cli-test-'));
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
+    tempDir = fs.mkdtempSync(path.join(tmpdir(), "gemini-cli-test-"));
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
     vi.clearAllMocks();
   });
 
@@ -73,38 +61,34 @@ describe('Configuration Integration Tests', () => {
     }
   });
 
-  describe('File Filtering and Configuration', () => {
+  describe("File Filtering and Configuration", () => {
     it.each([
       {
-        description:
-          'should load default file filtering settings when fileFiltering is missing',
+        description: "should load default file filtering settings when fileFiltering is missing",
         fileFiltering: undefined,
         expected: DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
       },
       {
-        description:
-          'should load custom file filtering settings from configuration',
+        description: "should load custom file filtering settings from configuration",
         fileFiltering: { respectGitIgnore: false },
         expected: false,
       },
       {
-        description:
-          'should respect file filtering settings from configuration',
+        description: "should respect file filtering settings from configuration",
         fileFiltering: { respectGitIgnore: true },
         expected: true,
       },
       {
-        description:
-          'should handle empty fileFiltering object gracefully and use defaults',
+        description: "should handle empty fileFiltering object gracefully and use defaults",
         fileFiltering: {},
         expected: DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
       },
-    ])('$description', async ({ fileFiltering, expected }) => {
+    ])("$description", async ({ fileFiltering, expected }) => {
       const configParams: ConfigParameters = {
-        sessionId: 'test-session',
-        cwd: '/tmp',
-        model: 'test-model',
-        embeddingModel: 'test-embedding-model',
+        sessionId: "test-session",
+        cwd: "/tmp",
+        model: "test-model",
+        embeddingModel: "test-embedding-model",
         sandbox: undefined,
         targetDir: tempDir,
         debugMode: false,
@@ -117,22 +101,22 @@ describe('Configuration Integration Tests', () => {
     });
   });
 
-  describe('Real-world Configuration Scenarios', () => {
+  describe("Real-world Configuration Scenarios", () => {
     it.each([
       {
-        description: 'should handle a security-focused configuration',
+        description: "should handle a security-focused configuration",
         respectGitIgnore: true,
       },
       {
-        description: 'should handle a CI/CD environment configuration',
+        description: "should handle a CI/CD environment configuration",
         respectGitIgnore: false,
       },
-    ])('$description', async ({ respectGitIgnore }) => {
+    ])("$description", async ({ respectGitIgnore }) => {
       const configParams: ConfigParameters = {
-        sessionId: 'test-session',
-        cwd: '/tmp',
-        model: 'test-model',
-        embeddingModel: 'test-embedding-model',
+        sessionId: "test-session",
+        cwd: "/tmp",
+        model: "test-model",
+        embeddingModel: "test-embedding-model",
         sandbox: undefined,
         targetDir: tempDir,
         debugMode: false,
@@ -147,13 +131,13 @@ describe('Configuration Integration Tests', () => {
     });
   });
 
-  describe('Checkpointing Configuration', () => {
-    it('should enable checkpointing when the setting is true', async () => {
+  describe("Checkpointing Configuration", () => {
+    it("should enable checkpointing when the setting is true", async () => {
       const configParams: ConfigParameters = {
-        sessionId: 'test-session',
-        cwd: '/tmp',
-        model: 'test-model',
-        embeddingModel: 'test-embedding-model',
+        sessionId: "test-session",
+        cwd: "/tmp",
+        model: "test-model",
+        embeddingModel: "test-embedding-model",
         sandbox: undefined,
         targetDir: tempDir,
         debugMode: false,
@@ -166,49 +150,42 @@ describe('Configuration Integration Tests', () => {
     });
   });
 
-  describe('Approval Mode Integration Tests', () => {
-    let parseArguments: typeof import('./config.js').parseArguments;
+  describe("Approval Mode Integration Tests", () => {
+    let parseArguments: typeof import("./config.js").parseArguments;
 
     beforeEach(async () => {
       // Import the argument parsing function for integration testing
-      const { parseArguments: parseArgs } = await import('./config.js');
+      const { parseArguments: parseArgs } = await import("./config.js");
       parseArguments = parseArgs;
     });
 
     it.each([
       {
-        description: 'should parse --approval-mode=auto_edit correctly',
-        argv: [
-          'node',
-          'script.js',
-          '--approval-mode',
-          'auto_edit',
-          '-p',
-          'test',
-        ],
-        expected: { approvalMode: 'auto_edit', prompt: 'test', yolo: false },
+        description: "should parse --approval-mode=auto_edit correctly",
+        argv: ["node", "script.js", "--approval-mode", "auto_edit", "-p", "test"],
+        expected: { approvalMode: "auto_edit", prompt: "test", yolo: false },
       },
       {
-        description: 'should parse --approval-mode=yolo correctly',
-        argv: ['node', 'script.js', '--approval-mode', 'yolo', '-p', 'test'],
-        expected: { approvalMode: 'yolo', prompt: 'test', yolo: false },
+        description: "should parse --approval-mode=yolo correctly",
+        argv: ["node", "script.js", "--approval-mode", "yolo", "-p", "test"],
+        expected: { approvalMode: "yolo", prompt: "test", yolo: false },
       },
       {
-        description: 'should parse --approval-mode=default correctly',
-        argv: ['node', 'script.js', '--approval-mode', 'default', '-p', 'test'],
-        expected: { approvalMode: 'default', prompt: 'test', yolo: false },
+        description: "should parse --approval-mode=default correctly",
+        argv: ["node", "script.js", "--approval-mode", "default", "-p", "test"],
+        expected: { approvalMode: "default", prompt: "test", yolo: false },
       },
       {
-        description: 'should parse legacy --yolo flag correctly',
-        argv: ['node', 'script.js', '--yolo', '-p', 'test'],
-        expected: { yolo: true, approvalMode: undefined, prompt: 'test' },
+        description: "should parse legacy --yolo flag correctly",
+        argv: ["node", "script.js", "--yolo", "-p", "test"],
+        expected: { yolo: true, approvalMode: undefined, prompt: "test" },
       },
       {
-        description: 'should handle no approval mode arguments',
-        argv: ['node', 'script.js', '-p', 'test'],
-        expected: { approvalMode: undefined, yolo: false, prompt: 'test' },
+        description: "should handle no approval mode arguments",
+        argv: ["node", "script.js", "-p", "test"],
+        expected: { approvalMode: undefined, yolo: false, prompt: "test" },
       },
-    ])('$description', async ({ argv, expected }) => {
+    ])("$description", async ({ argv, expected }) => {
       const originalArgv = process.argv;
       try {
         process.argv = argv;
@@ -223,15 +200,14 @@ describe('Configuration Integration Tests', () => {
 
     it.each([
       {
-        description: 'should reject invalid approval mode values',
-        argv: ['node', 'script.js', '--approval-mode', 'invalid_mode'],
+        description: "should reject invalid approval mode values",
+        argv: ["node", "script.js", "--approval-mode", "invalid_mode"],
       },
       {
-        description:
-          'should reject conflicting --yolo and --approval-mode flags',
-        argv: ['node', 'script.js', '--yolo', '--approval-mode', 'default'],
+        description: "should reject conflicting --yolo and --approval-mode flags",
+        argv: ["node", "script.js", "--yolo", "--approval-mode", "default"],
       },
-    ])('$description', async ({ argv }) => {
+    ])("$description", async ({ argv }) => {
       const originalArgv = process.argv;
       try {
         process.argv = argv;
diff --git a/packages/ui-gemini/src/config/config.test.ts b/packages/ui-gemini/src/config/config.test.ts
index 24e63b80c..3ce0d446f 100644
--- a/packages/ui-gemini/src/config/config.test.ts
+++ b/packages/ui-gemini/src/config/config.test.ts
@@ -4,51 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as os from "node:os";
+import * as path from "node:path";
+import * as ServerConfig from "@airiscode/gemini-cli-core";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS,
+  debugLogger,
+  EDIT_TOOL_NAME,
+  type ExtensionLoader,
   OutputFormat,
   SHELL_TOOL_NAME,
-  WRITE_FILE_TOOL_NAME,
-  EDIT_TOOL_NAME,
   WEB_FETCH_TOOL_NAME,
-  type ExtensionLoader,
-  debugLogger,
-} from '@airiscode/gemini-cli-core';
-import { loadCliConfig, parseArguments, type CliArgs } from './config.js';
-import type { Settings } from './settings.js';
-import * as ServerConfig from '@airiscode/gemini-cli-core';
-import { isWorkspaceTrusted } from './trustedFolders.js';
-import { ExtensionManager } from './extension-manager.js';
-import { RESUME_LATEST } from '../utils/sessionUtils.js';
-
-vi.mock('./trustedFolders.js', () => ({
-  isWorkspaceTrusted: vi
-    .fn()
-    .mockReturnValue({ isTrusted: true, source: 'file' }), // Default to trusted
+  WRITE_FILE_TOOL_NAME,
+} from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { RESUME_LATEST } from "../utils/sessionUtils.js";
+import { type CliArgs, loadCliConfig, parseArguments } from "./config.js";
+import { ExtensionManager } from "./extension-manager.js";
+import type { Settings } from "./settings.js";
+import { isWorkspaceTrusted } from "./trustedFolders.js";
+
+vi.mock("./trustedFolders.js", () => ({
+  isWorkspaceTrusted: vi.fn().mockReturnValue({ isTrusted: true, source: "file" }), // Default to trusted
 }));
 
-vi.mock('./sandboxConfig.js', () => ({
+vi.mock("./sandboxConfig.js", () => ({
   loadSandboxConfig: vi.fn().mockResolvedValue(undefined),
 }));
 
-vi.mock('fs', async (importOriginal) => {
-  const actualFs = await importOriginal<typeof import('fs')>();
-  const pathMod = await import('node:path');
-  const mockHome = pathMod.resolve(pathMod.sep, 'mock', 'home', 'user');
+vi.mock("fs", async (importOriginal) => {
+  const actualFs = await importOriginal<typeof import("fs")>();
+  const pathMod = await import("node:path");
+  const mockHome = pathMod.resolve(pathMod.sep, "mock", "home", "user");
   const MOCK_CWD1 = process.cwd();
-  const MOCK_CWD2 = pathMod.resolve(pathMod.sep, 'home', 'user', 'project');
+  const MOCK_CWD2 = pathMod.resolve(pathMod.sep, "home", "user", "project");
 
   const mockPaths = new Set([
     MOCK_CWD1,
     MOCK_CWD2,
-    pathMod.resolve(pathMod.sep, 'cli', 'path1'),
-    pathMod.resolve(pathMod.sep, 'settings', 'path1'),
-    pathMod.join(mockHome, 'settings', 'path2'),
-    pathMod.join(MOCK_CWD2, 'cli', 'path2'),
-    pathMod.join(MOCK_CWD2, 'settings', 'path3'),
+    pathMod.resolve(pathMod.sep, "cli", "path1"),
+    pathMod.resolve(pathMod.sep, "settings", "path1"),
+    pathMod.join(mockHome, "settings", "path2"),
+    pathMod.join(MOCK_CWD2, "cli", "path2"),
+    pathMod.join(MOCK_CWD2, "settings", "path3"),
   ]);
 
   return {
@@ -58,36 +56,32 @@ vi.mock('fs', async (importOriginal) => {
     existsSync: vi.fn((p) => mockPaths.has(p.toString())),
     statSync: vi.fn((p) => {
       if (mockPaths.has(p.toString())) {
-        return { isDirectory: () => true } as unknown as import('fs').Stats;
+        return { isDirectory: () => true } as unknown as import("fs").Stats;
       }
-      return (actualFs as typeof import('fs')).statSync(p as unknown as string);
+      return (actualFs as typeof import("fs")).statSync(p as unknown as string);
     }),
     realpathSync: vi.fn((p) => p),
   };
 });
 
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof os>();
   return {
     ...actualOs,
-    homedir: vi.fn(() => path.resolve(path.sep, 'mock', 'home', 'user')),
+    homedir: vi.fn(() => path.resolve(path.sep, "mock", "home", "user")),
   };
 });
 
-vi.mock('open', () => ({
+vi.mock("open", () => ({
   default: vi.fn(),
 }));
 
-vi.mock('read-package-up', () => ({
-  readPackageUp: vi.fn(() =>
-    Promise.resolve({ packageJson: { version: 'test-version' } }),
-  ),
+vi.mock("read-package-up", () => ({
+  readPackageUp: vi.fn(() => Promise.resolve({ packageJson: { version: "test-version" } })),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actualServer = await vi.importActual<typeof ServerConfig>(
-    '@airiscode/gemini-cli-core',
-  );
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actualServer = await vi.importActual<typeof ServerConfig>("@airiscode/gemini-cli-core");
   return {
     ...actualServer,
     IdeClient: {
@@ -99,19 +93,10 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
     },
     loadEnvironment: vi.fn(),
     loadServerHierarchicalMemory: vi.fn(
-      (
-        cwd,
-        dirs,
-        debug,
-        fileService,
-        extensionLoader: ExtensionLoader,
-        _maxDirs,
-      ) => {
-        const extensionPaths = extensionLoader
-          .getExtensions()
-          .flatMap((e) => e.contextFiles);
+      (cwd, dirs, debug, fileService, extensionLoader: ExtensionLoader, _maxDirs) => {
+        const extensionPaths = extensionLoader.getExtensions().flatMap((e) => e.contextFiles);
         return Promise.resolve({
-          memoryContent: extensionPaths.join(',') || '',
+          memoryContent: extensionPaths.join(",") || "",
           fileCount: extensionPaths?.length || 0,
           filePaths: extensionPaths,
         });
@@ -128,307 +113,252 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
   };
 });
 
-vi.mock('./extension-manager.js');
+vi.mock("./extension-manager.js");
 
 // Global setup to ensure clean environment for all tests in this file
 const originalArgv = process.argv;
-const originalGeminiModel = process.env['GEMINI_MODEL'];
+const originalGeminiModel = process.env["GEMINI_MODEL"];
 
 beforeEach(() => {
-  delete process.env['GEMINI_MODEL'];
+  delete process.env["GEMINI_MODEL"];
 });
 
 afterEach(() => {
   process.argv = originalArgv;
   if (originalGeminiModel !== undefined) {
-    process.env['GEMINI_MODEL'] = originalGeminiModel;
+    process.env["GEMINI_MODEL"] = originalGeminiModel;
   } else {
-    delete process.env['GEMINI_MODEL'];
+    delete process.env["GEMINI_MODEL"];
   }
 });
 
-describe('parseArguments', () => {
+describe("parseArguments", () => {
   it.each([
     {
-      description: 'long flags',
+      description: "long flags",
       argv: [
-        'node',
-        'script.js',
-        '--prompt',
-        'test prompt',
-        '--prompt-interactive',
-        'interactive prompt',
+        "node",
+        "script.js",
+        "--prompt",
+        "test prompt",
+        "--prompt-interactive",
+        "interactive prompt",
       ],
     },
     {
-      description: 'short flags',
-      argv: [
-        'node',
-        'script.js',
-        '-p',
-        'test prompt',
-        '-i',
-        'interactive prompt',
-      ],
+      description: "short flags",
+      argv: ["node", "script.js", "-p", "test prompt", "-i", "interactive prompt"],
     },
-  ])(
-    'should throw an error when using conflicting prompt flags ($description)',
-    async ({ argv }) => {
-      process.argv = argv;
+  ])("should throw an error when using conflicting prompt flags ($description)", async ({
+    argv,
+  }) => {
+    process.argv = argv;
 
-      const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-        throw new Error('process.exit called');
-      });
+    const mockExit = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("process.exit called");
+    });
 
-      const mockConsoleError = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    const mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {});
 
-      await expect(parseArguments({} as Settings)).rejects.toThrow(
-        'process.exit called',
-      );
+    await expect(parseArguments({} as Settings)).rejects.toThrow("process.exit called");
 
-      expect(mockConsoleError).toHaveBeenCalledWith(
-        expect.stringContaining(
-          'Cannot use both --prompt (-p) and --prompt-interactive (-i) together',
-        ),
-      );
+    expect(mockConsoleError).toHaveBeenCalledWith(
+      expect.stringContaining(
+        "Cannot use both --prompt (-p) and --prompt-interactive (-i) together",
+      ),
+    );
 
-      mockExit.mockRestore();
-      mockConsoleError.mockRestore();
-    },
-  );
+    mockExit.mockRestore();
+    mockConsoleError.mockRestore();
+  });
 
   it.each([
     {
-      description: 'should allow --prompt without --prompt-interactive',
-      argv: ['node', 'script.js', '--prompt', 'test prompt'],
-      expected: { prompt: 'test prompt', promptInteractive: undefined },
+      description: "should allow --prompt without --prompt-interactive",
+      argv: ["node", "script.js", "--prompt", "test prompt"],
+      expected: { prompt: "test prompt", promptInteractive: undefined },
     },
     {
-      description: 'should allow --prompt-interactive without --prompt',
-      argv: ['node', 'script.js', '--prompt-interactive', 'interactive prompt'],
-      expected: { prompt: undefined, promptInteractive: 'interactive prompt' },
+      description: "should allow --prompt-interactive without --prompt",
+      argv: ["node", "script.js", "--prompt-interactive", "interactive prompt"],
+      expected: { prompt: undefined, promptInteractive: "interactive prompt" },
     },
     {
-      description: 'should allow -i flag as alias for --prompt-interactive',
-      argv: ['node', 'script.js', '-i', 'interactive prompt'],
-      expected: { prompt: undefined, promptInteractive: 'interactive prompt' },
+      description: "should allow -i flag as alias for --prompt-interactive",
+      argv: ["node", "script.js", "-i", "interactive prompt"],
+      expected: { prompt: undefined, promptInteractive: "interactive prompt" },
     },
-  ])('$description', async ({ argv, expected }) => {
+  ])("$description", async ({ argv, expected }) => {
     process.argv = argv;
     const parsedArgs = await parseArguments({} as Settings);
     expect(parsedArgs.prompt).toBe(expected.prompt);
     expect(parsedArgs.promptInteractive).toBe(expected.promptInteractive);
   });
 
-  describe('positional arguments and @commands', () => {
+  describe("positional arguments and @commands", () => {
     it.each([
       {
-        description:
-          'should convert positional query argument to prompt by default',
-        argv: ['node', 'script.js', 'Hi Gemini'],
-        expectedQuery: 'Hi Gemini',
+        description: "should convert positional query argument to prompt by default",
+        argv: ["node", "script.js", "Hi Gemini"],
+        expectedQuery: "Hi Gemini",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description:
-          'should map @path to prompt (one-shot) when it starts with @',
-        argv: ['node', 'script.js', '@path ./file.md'],
-        expectedQuery: '@path ./file.md',
+        description: "should map @path to prompt (one-shot) when it starts with @",
+        argv: ["node", "script.js", "@path ./file.md"],
+        expectedQuery: "@path ./file.md",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description:
-          'should map @path to prompt even when config flags are present',
-        argv: [
-          'node',
-          'script.js',
-          '@path',
-          './file.md',
-          '--model',
-          'gemini-2.5-pro',
-        ],
-        expectedQuery: '@path ./file.md',
-        expectedModel: 'gemini-2.5-pro',
+        description: "should map @path to prompt even when config flags are present",
+        argv: ["node", "script.js", "@path", "./file.md", "--model", "gemini-2.5-pro"],
+        expectedQuery: "@path ./file.md",
+        expectedModel: "gemini-2.5-pro",
         debug: false,
       },
       {
-        description:
-          'maps unquoted positional @path + arg to prompt (one-shot)',
-        argv: ['node', 'script.js', '@path', './file.md'],
-        expectedQuery: '@path ./file.md',
+        description: "maps unquoted positional @path + arg to prompt (one-shot)",
+        argv: ["node", "script.js", "@path", "./file.md"],
+        expectedQuery: "@path ./file.md",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description:
-          'should handle multiple @path arguments in a single command (one-shot)',
-        argv: [
-          'node',
-          'script.js',
-          '@path',
-          './file1.md',
-          '@path',
-          './file2.md',
-        ],
-        expectedQuery: '@path ./file1.md @path ./file2.md',
+        description: "should handle multiple @path arguments in a single command (one-shot)",
+        argv: ["node", "script.js", "@path", "./file1.md", "@path", "./file2.md"],
+        expectedQuery: "@path ./file1.md @path ./file2.md",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description:
-          'should handle mixed quoted and unquoted @path arguments (one-shot)',
-        argv: [
-          'node',
-          'script.js',
-          '@path ./file1.md',
-          '@path',
-          './file2.md',
-          'additional text',
-        ],
-        expectedQuery: '@path ./file1.md @path ./file2.md additional text',
+        description: "should handle mixed quoted and unquoted @path arguments (one-shot)",
+        argv: ["node", "script.js", "@path ./file1.md", "@path", "./file2.md", "additional text"],
+        expectedQuery: "@path ./file1.md @path ./file2.md additional text",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description: 'should map @path to prompt with ambient flags (debug)',
-        argv: ['node', 'script.js', '@path', './file.md', '--debug'],
-        expectedQuery: '@path ./file.md',
+        description: "should map @path to prompt with ambient flags (debug)",
+        argv: ["node", "script.js", "@path", "./file.md", "--debug"],
+        expectedQuery: "@path ./file.md",
         expectedModel: undefined,
         debug: true,
       },
       {
-        description: 'should map @include to prompt (one-shot)',
-        argv: ['node', 'script.js', '@include src/'],
-        expectedQuery: '@include src/',
+        description: "should map @include to prompt (one-shot)",
+        argv: ["node", "script.js", "@include src/"],
+        expectedQuery: "@include src/",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description: 'should map @search to prompt (one-shot)',
-        argv: ['node', 'script.js', '@search pattern'],
-        expectedQuery: '@search pattern',
+        description: "should map @search to prompt (one-shot)",
+        argv: ["node", "script.js", "@search pattern"],
+        expectedQuery: "@search pattern",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description: 'should map @web to prompt (one-shot)',
-        argv: ['node', 'script.js', '@web query'],
-        expectedQuery: '@web query',
+        description: "should map @web to prompt (one-shot)",
+        argv: ["node", "script.js", "@web query"],
+        expectedQuery: "@web query",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description: 'should map @git to prompt (one-shot)',
-        argv: ['node', 'script.js', '@git status'],
-        expectedQuery: '@git status',
+        description: "should map @git to prompt (one-shot)",
+        argv: ["node", "script.js", "@git status"],
+        expectedQuery: "@git status",
         expectedModel: undefined,
         debug: false,
       },
       {
-        description: 'should handle @command with leading whitespace',
-        argv: ['node', 'script.js', '  @path ./file.md'],
-        expectedQuery: '  @path ./file.md',
+        description: "should handle @command with leading whitespace",
+        argv: ["node", "script.js", "  @path ./file.md"],
+        expectedQuery: "  @path ./file.md",
         expectedModel: undefined,
         debug: false,
       },
-    ])(
-      '$description',
-      async ({ argv, expectedQuery, expectedModel, debug }) => {
-        process.argv = argv;
-        const parsedArgs = await parseArguments({} as Settings);
-        expect(parsedArgs.query).toBe(expectedQuery);
-        expect(parsedArgs.prompt).toBe(expectedQuery);
-        expect(parsedArgs.promptInteractive).toBeUndefined();
-        if (expectedModel) {
-          expect(parsedArgs.model).toBe(expectedModel);
-        }
-        if (debug) {
-          expect(parsedArgs.debug).toBe(true);
-        }
-      },
-    );
+    ])("$description", async ({ argv, expectedQuery, expectedModel, debug }) => {
+      process.argv = argv;
+      const parsedArgs = await parseArguments({} as Settings);
+      expect(parsedArgs.query).toBe(expectedQuery);
+      expect(parsedArgs.prompt).toBe(expectedQuery);
+      expect(parsedArgs.promptInteractive).toBeUndefined();
+      if (expectedModel) {
+        expect(parsedArgs.model).toBe(expectedModel);
+      }
+      if (debug) {
+        expect(parsedArgs.debug).toBe(true);
+      }
+    });
   });
 
   it.each([
     {
-      description: 'long flags',
-      argv: ['node', 'script.js', '--yolo', '--approval-mode', 'default'],
+      description: "long flags",
+      argv: ["node", "script.js", "--yolo", "--approval-mode", "default"],
     },
     {
-      description: 'short flags',
-      argv: ['node', 'script.js', '-y', '--approval-mode', 'yolo'],
+      description: "short flags",
+      argv: ["node", "script.js", "-y", "--approval-mode", "yolo"],
     },
-  ])(
-    'should throw an error when using conflicting yolo/approval-mode flags ($description)',
-    async ({ argv }) => {
-      process.argv = argv;
+  ])("should throw an error when using conflicting yolo/approval-mode flags ($description)", async ({
+    argv,
+  }) => {
+    process.argv = argv;
 
-      const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-        throw new Error('process.exit called');
-      });
+    const mockExit = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("process.exit called");
+    });
 
-      const mockConsoleError = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    const mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {});
 
-      await expect(parseArguments({} as Settings)).rejects.toThrow(
-        'process.exit called',
-      );
+    await expect(parseArguments({} as Settings)).rejects.toThrow("process.exit called");
 
-      expect(mockConsoleError).toHaveBeenCalledWith(
-        expect.stringContaining(
-          'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.',
-        ),
-      );
+    expect(mockConsoleError).toHaveBeenCalledWith(
+      expect.stringContaining(
+        "Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.",
+      ),
+    );
 
-      mockExit.mockRestore();
-      mockConsoleError.mockRestore();
-    },
-  );
+    mockExit.mockRestore();
+    mockConsoleError.mockRestore();
+  });
 
   it.each([
     {
-      description: 'should allow --approval-mode without --yolo',
-      argv: ['node', 'script.js', '--approval-mode', 'auto_edit'],
-      expected: { approvalMode: 'auto_edit', yolo: false },
+      description: "should allow --approval-mode without --yolo",
+      argv: ["node", "script.js", "--approval-mode", "auto_edit"],
+      expected: { approvalMode: "auto_edit", yolo: false },
     },
     {
-      description: 'should allow --yolo without --approval-mode',
-      argv: ['node', 'script.js', '--yolo'],
+      description: "should allow --yolo without --approval-mode",
+      argv: ["node", "script.js", "--yolo"],
       expected: { approvalMode: undefined, yolo: true },
     },
-  ])('$description', async ({ argv, expected }) => {
+  ])("$description", async ({ argv, expected }) => {
     process.argv = argv;
     const parsedArgs = await parseArguments({} as Settings);
     expect(parsedArgs.approvalMode).toBe(expected.approvalMode);
     expect(parsedArgs.yolo).toBe(expected.yolo);
   });
 
-  it('should reject invalid --approval-mode values', async () => {
-    process.argv = ['node', 'script.js', '--approval-mode', 'invalid'];
+  it("should reject invalid --approval-mode values", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "invalid"];
 
-    const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-      throw new Error('process.exit called');
+    const mockExit = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("process.exit called");
     });
 
-    const mockConsoleError = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    const debugErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
+    const mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+    const debugErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
-    await expect(parseArguments({} as Settings)).rejects.toThrow(
-      'process.exit called',
-    );
+    await expect(parseArguments({} as Settings)).rejects.toThrow("process.exit called");
 
-    expect(debugErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Invalid values:'),
-    );
+    expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining("Invalid values:"));
     expect(mockConsoleError).toHaveBeenCalled();
 
     mockExit.mockRestore();
@@ -436,106 +366,86 @@ describe('parseArguments', () => {
     debugErrorSpy.mockRestore();
   });
 
-  it('should allow resuming a session without prompt argument in non-interactive mode (expecting stdin)', async () => {
+  it("should allow resuming a session without prompt argument in non-interactive mode (expecting stdin)", async () => {
     const originalIsTTY = process.stdin.isTTY;
     process.stdin.isTTY = false;
-    process.argv = ['node', 'script.js', '--resume', 'session-id'];
+    process.argv = ["node", "script.js", "--resume", "session-id"];
 
     try {
       const argv = await parseArguments({} as Settings);
-      expect(argv.resume).toBe('session-id');
+      expect(argv.resume).toBe("session-id");
     } finally {
       process.stdin.isTTY = originalIsTTY;
     }
   });
 
-  it('should return RESUME_LATEST constant when --resume is passed without a value', async () => {
+  it("should return RESUME_LATEST constant when --resume is passed without a value", async () => {
     const originalIsTTY = process.stdin.isTTY;
     process.stdin.isTTY = true; // Make it interactive to avoid validation error
-    process.argv = ['node', 'script.js', '--resume'];
+    process.argv = ["node", "script.js", "--resume"];
 
     try {
       const argv = await parseArguments({} as Settings);
       expect(argv.resume).toBe(RESUME_LATEST);
-      expect(argv.resume).toBe('latest');
+      expect(argv.resume).toBe("latest");
     } finally {
       process.stdin.isTTY = originalIsTTY;
     }
   });
 
-  it('should support comma-separated values for --allowed-tools', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--allowed-tools',
-      'read_file,ShellTool(git status)',
-    ];
+  it("should support comma-separated values for --allowed-tools", async () => {
+    process.argv = ["node", "script.js", "--allowed-tools", "read_file,ShellTool(git status)"];
     const argv = await parseArguments({} as Settings);
-    expect(argv.allowedTools).toEqual(['read_file', 'ShellTool(git status)']);
+    expect(argv.allowedTools).toEqual(["read_file", "ShellTool(git status)"]);
   });
 
-  it('should support comma-separated values for --allowed-mcp-server-names', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--allowed-mcp-server-names',
-      'server1,server2',
-    ];
+  it("should support comma-separated values for --allowed-mcp-server-names", async () => {
+    process.argv = ["node", "script.js", "--allowed-mcp-server-names", "server1,server2"];
     const argv = await parseArguments({} as Settings);
-    expect(argv.allowedMcpServerNames).toEqual(['server1', 'server2']);
+    expect(argv.allowedMcpServerNames).toEqual(["server1", "server2"]);
   });
 
-  it('should support comma-separated values for --extensions', async () => {
-    process.argv = ['node', 'script.js', '--extensions', 'ext1,ext2'];
+  it("should support comma-separated values for --extensions", async () => {
+    process.argv = ["node", "script.js", "--extensions", "ext1,ext2"];
     const argv = await parseArguments({} as Settings);
-    expect(argv.extensions).toEqual(['ext1', 'ext2']);
+    expect(argv.extensions).toEqual(["ext1", "ext2"]);
   });
 
-  it('should correctly parse positional arguments when flags with arguments are present', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--model',
-      'test-model-string',
-      'my-positional-arg',
-    ];
+  it("should correctly parse positional arguments when flags with arguments are present", async () => {
+    process.argv = ["node", "script.js", "--model", "test-model-string", "my-positional-arg"];
     const argv = await parseArguments({} as Settings);
-    expect(argv.model).toBe('test-model-string');
-    expect(argv.query).toBe('my-positional-arg');
+    expect(argv.model).toBe("test-model-string");
+    expect(argv.query).toBe("my-positional-arg");
   });
 
-  it('should handle long positional prompts with multiple flags', async () => {
+  it("should handle long positional prompts with multiple flags", async () => {
     process.argv = [
-      'node',
-      'script.js',
-      '-e',
-      'none',
-      '--approval-mode=auto_edit',
-      '--allowed-tools=ShellTool',
-      '--allowed-tools=ShellTool(whoami)',
-      '--allowed-tools=ShellTool(wc)',
-      'Use whoami to write a poem in file poem.md about my username in pig latin and use wc to tell me how many lines are in the poem you wrote.',
+      "node",
+      "script.js",
+      "-e",
+      "none",
+      "--approval-mode=auto_edit",
+      "--allowed-tools=ShellTool",
+      "--allowed-tools=ShellTool(whoami)",
+      "--allowed-tools=ShellTool(wc)",
+      "Use whoami to write a poem in file poem.md about my username in pig latin and use wc to tell me how many lines are in the poem you wrote.",
     ];
     const argv = await parseArguments({} as Settings);
-    expect(argv.extensions).toEqual(['none']);
-    expect(argv.approvalMode).toBe('auto_edit');
-    expect(argv.allowedTools).toEqual([
-      'ShellTool',
-      'ShellTool(whoami)',
-      'ShellTool(wc)',
-    ]);
+    expect(argv.extensions).toEqual(["none"]);
+    expect(argv.approvalMode).toBe("auto_edit");
+    expect(argv.allowedTools).toEqual(["ShellTool", "ShellTool(whoami)", "ShellTool(wc)"]);
     expect(argv.query).toBe(
-      'Use whoami to write a poem in file poem.md about my username in pig latin and use wc to tell me how many lines are in the poem you wrote.',
+      "Use whoami to write a poem in file poem.md about my username in pig latin and use wc to tell me how many lines are in the poem you wrote.",
     );
   });
 });
 
-describe('loadCliConfig', () => {
+describe("loadCliConfig", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -543,14 +453,9 @@ describe('loadCliConfig', () => {
     vi.restoreAllMocks();
   });
 
-  describe('Proxy configuration', () => {
+  describe("Proxy configuration", () => {
     const originalProxyEnv: { [key: string]: string | undefined } = {};
-    const proxyEnvVars = [
-      'HTTP_PROXY',
-      'HTTPS_PROXY',
-      'http_proxy',
-      'https_proxy',
-    ];
+    const proxyEnvVars = ["HTTP_PROXY", "HTTPS_PROXY", "http_proxy", "https_proxy"];
 
     beforeEach(() => {
       for (const key of proxyEnvVars) {
@@ -570,39 +475,39 @@ describe('loadCliConfig', () => {
     });
 
     it(`should leave proxy to empty by default`, async () => {
-      process.argv = ['node', 'script.js'];
+      process.argv = ["node", "script.js"];
       const argv = await parseArguments({} as Settings);
       const settings: Settings = {};
-      const config = await loadCliConfig(settings, 'test-session', argv);
+      const config = await loadCliConfig(settings, "test-session", argv);
       expect(config.getProxy()).toBeFalsy();
     });
 
-    const proxy_url = 'http://localhost:7890';
+    const proxy_url = "http://localhost:7890";
     const testCases = [
       {
         input: {
-          env_name: 'https_proxy',
+          env_name: "https_proxy",
           proxy_url,
         },
         expected: proxy_url,
       },
       {
         input: {
-          env_name: 'http_proxy',
+          env_name: "http_proxy",
           proxy_url,
         },
         expected: proxy_url,
       },
       {
         input: {
-          env_name: 'HTTPS_PROXY',
+          env_name: "HTTPS_PROXY",
           proxy_url,
         },
         expected: proxy_url,
       },
       {
         input: {
-          env_name: 'HTTP_PROXY',
+          env_name: "HTTP_PROXY",
           proxy_url,
         },
         expected: proxy_url,
@@ -611,20 +516,20 @@ describe('loadCliConfig', () => {
     testCases.forEach(({ input, expected }) => {
       it(`should set proxy to ${expected} according to environment variable [${input.env_name}]`, async () => {
         vi.stubEnv(input.env_name, input.proxy_url);
-        process.argv = ['node', 'script.js'];
+        process.argv = ["node", "script.js"];
         const argv = await parseArguments({} as Settings);
         const settings: Settings = {};
-        const config = await loadCliConfig(settings, 'test-session', argv);
+        const config = await loadCliConfig(settings, "test-session", argv);
         expect(config.getProxy()).toBe(expected);
       });
     });
   });
 
-  it('should use default fileFilter options when unconfigured', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should use default fileFilter options when unconfigured", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getFileFilteringRespectGitIgnore()).toBe(
       DEFAULT_FILE_FILTERING_OPTIONS.respectGitIgnore,
     );
@@ -633,19 +538,19 @@ describe('loadCliConfig', () => {
     );
   });
 
-  it('should default enableMessageBusIntegration to true when unconfigured', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should default enableMessageBusIntegration to true when unconfigured", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config['enableMessageBusIntegration']).toBe(true);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config["enableMessageBusIntegration"]).toBe(true);
   });
 });
 
-describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
+describe("Hierarchical Memory Loading (config.ts) - Placeholder Suite", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
     // Other common mocks would be reset here.
   });
 
@@ -653,40 +558,37 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
     vi.restoreAllMocks();
   });
 
-  it('should pass extension context file paths to loadServerHierarchicalMemory', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should pass extension context file paths to loadServerHierarchicalMemory", async () => {
+    process.argv = ["node", "script.js"];
     const settings: Settings = {};
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([
       {
-        path: '/path/to/ext1',
-        name: 'ext1',
-        id: 'ext1-id',
-        version: '1.0.0',
-        contextFiles: ['/path/to/ext1/GEMINI.md'],
+        path: "/path/to/ext1",
+        name: "ext1",
+        id: "ext1-id",
+        version: "1.0.0",
+        contextFiles: ["/path/to/ext1/GEMINI.md"],
         isActive: true,
       },
       {
-        path: '/path/to/ext2',
-        name: 'ext2',
-        id: 'ext2-id',
-        version: '1.0.0',
+        path: "/path/to/ext2",
+        name: "ext2",
+        id: "ext2-id",
+        version: "1.0.0",
         contextFiles: [],
         isActive: true,
       },
       {
-        path: '/path/to/ext3',
-        name: 'ext3',
-        id: 'ext3-id',
-        version: '1.0.0',
-        contextFiles: [
-          '/path/to/ext3/context1.md',
-          '/path/to/ext3/context2.md',
-        ],
+        path: "/path/to/ext3",
+        name: "ext3",
+        id: "ext3-id",
+        version: "1.0.0",
+        contextFiles: ["/path/to/ext3/context1.md", "/path/to/ext3/context2.md"],
         isActive: true,
       },
     ]);
     const argv = await parseArguments({} as Settings);
-    await loadCliConfig(settings, 'session-id', argv);
+    await loadCliConfig(settings, "session-id", argv);
     expect(ServerConfig.loadServerHierarchicalMemory).toHaveBeenCalledWith(
       expect.any(String),
       [],
@@ -694,7 +596,7 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
       expect.any(Object),
       expect.any(ExtensionManager),
       true,
-      'tree',
+      "tree",
       {
         respectGitIgnore: false,
         respectGeminiIgnore: true,
@@ -704,26 +606,26 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
   });
 });
 
-describe('mergeMcpServers', () => {
-  it('should not modify the original settings object', async () => {
+describe("mergeMcpServers", () => {
+  it("should not modify the original settings object", async () => {
     const settings: Settings = {
       mcpServers: {
-        'test-server': {
-          url: 'http://localhost:8080',
+        "test-server": {
+          url: "http://localhost:8080",
         },
       },
     };
 
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([
       {
-        path: '/path/to/ext1',
-        name: 'ext1',
-        id: 'ext1-id',
+        path: "/path/to/ext1",
+        name: "ext1",
+        id: "ext1-id",
 
-        version: '1.0.0',
+        version: "1.0.0",
         mcpServers: {
-          'ext1-server': {
-            url: 'http://localhost:8081',
+          "ext1-server": {
+            url: "http://localhost:8081",
           },
         },
         contextFiles: [],
@@ -731,14 +633,14 @@ describe('mergeMcpServers', () => {
       },
     ]);
     const originalSettings = JSON.parse(JSON.stringify(settings));
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    await loadCliConfig(settings, 'test-session', argv);
+    await loadCliConfig(settings, "test-session", argv);
     expect(settings).toEqual(originalSettings);
   });
 });
 
-describe('mergeExcludeTools', () => {
+describe("mergeExcludeTools", () => {
   const defaultExcludes = new Set([
     SHELL_TOOL_NAME,
     EDIT_TOOL_NAME,
@@ -748,7 +650,7 @@ describe('mergeExcludeTools', () => {
   const originalIsTTY = process.stdin.isTTY;
 
   beforeEach(() => {
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
     process.stdin.isTTY = true;
   });
 
@@ -756,165 +658,161 @@ describe('mergeExcludeTools', () => {
     process.stdin.isTTY = originalIsTTY;
   });
 
-  it('should merge excludeTools from settings and extensions', async () => {
-    const settings: Settings = { tools: { exclude: ['tool1', 'tool2'] } };
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
+  it("should merge excludeTools from settings and extensions", async () => {
+    const settings: Settings = { tools: { exclude: ["tool1", "tool2"] } };
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([
       {
-        path: '/path/to/ext1',
-        name: 'ext1',
-        id: 'ext1-id',
-        version: '1.0.0',
-        excludeTools: ['tool3', 'tool4'],
+        path: "/path/to/ext1",
+        name: "ext1",
+        id: "ext1-id",
+        version: "1.0.0",
+        excludeTools: ["tool3", "tool4"],
         contextFiles: [],
         isActive: true,
       },
       {
-        path: '/path/to/ext2',
-        name: 'ext2',
-        id: 'ext2-id',
-        version: '1.0.0',
-        excludeTools: ['tool5'],
+        path: "/path/to/ext2",
+        name: "ext2",
+        id: "ext2-id",
+        version: "1.0.0",
+        excludeTools: ["tool5"],
         contextFiles: [],
         isActive: true,
       },
     ]);
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const config = await loadCliConfig(
       settings,
 
-      'test-session',
+      "test-session",
       argv,
     );
     expect(config.getExcludeTools()).toEqual(
-      new Set(['tool1', 'tool2', 'tool3', 'tool4', 'tool5']),
+      new Set(["tool1", "tool2", "tool3", "tool4", "tool5"]),
     );
     expect(config.getExcludeTools()).toHaveLength(5);
   });
 
-  it('should handle overlapping excludeTools between settings and extensions', async () => {
-    const settings: Settings = { tools: { exclude: ['tool1', 'tool2'] } };
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
+  it("should handle overlapping excludeTools between settings and extensions", async () => {
+    const settings: Settings = { tools: { exclude: ["tool1", "tool2"] } };
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([
       {
-        path: '/path/to/ext1',
-        name: 'ext1',
-        id: 'ext1-id',
-        version: '1.0.0',
-        excludeTools: ['tool2', 'tool3'],
+        path: "/path/to/ext1",
+        name: "ext1",
+        id: "ext1-id",
+        version: "1.0.0",
+        excludeTools: ["tool2", "tool3"],
         contextFiles: [],
         isActive: true,
       },
     ]);
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(
-      new Set(['tool1', 'tool2', 'tool3']),
-    );
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getExcludeTools()).toEqual(new Set(["tool1", "tool2", "tool3"]));
     expect(config.getExcludeTools()).toHaveLength(3);
   });
 
-  it('should handle overlapping excludeTools between extensions', async () => {
-    const settings: Settings = { tools: { exclude: ['tool1'] } };
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
+  it("should handle overlapping excludeTools between extensions", async () => {
+    const settings: Settings = { tools: { exclude: ["tool1"] } };
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([
       {
-        path: '/path/to/ext1',
-        name: 'ext1',
-        id: 'ext1-id',
-        version: '1.0.0',
-        excludeTools: ['tool2', 'tool3'],
+        path: "/path/to/ext1",
+        name: "ext1",
+        id: "ext1-id",
+        version: "1.0.0",
+        excludeTools: ["tool2", "tool3"],
         contextFiles: [],
         isActive: true,
       },
       {
-        path: '/path/to/ext2',
-        name: 'ext2',
-        id: 'ext2-id',
-        version: '1.0.0',
-        excludeTools: ['tool3', 'tool4'],
+        path: "/path/to/ext2",
+        name: "ext2",
+        id: "ext2-id",
+        version: "1.0.0",
+        excludeTools: ["tool3", "tool4"],
         contextFiles: [],
         isActive: true,
       },
     ]);
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(
-      new Set(['tool1', 'tool2', 'tool3', 'tool4']),
-    );
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getExcludeTools()).toEqual(new Set(["tool1", "tool2", "tool3", "tool4"]));
     expect(config.getExcludeTools()).toHaveLength(4);
   });
 
-  it('should return an empty array when no excludeTools are specified and it is interactive', async () => {
+  it("should return an empty array when no excludeTools are specified and it is interactive", async () => {
     process.stdin.isTTY = true;
     const settings: Settings = {};
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getExcludeTools()).toEqual(new Set([]));
   });
 
-  it('should return default excludes when no excludeTools are specified and it is not interactive', async () => {
+  it("should return default excludes when no excludeTools are specified and it is not interactive", async () => {
     process.stdin.isTTY = false;
     const settings: Settings = {};
-    process.argv = ['node', 'script.js', '-p', 'test'];
+    process.argv = ["node", "script.js", "-p", "test"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getExcludeTools()).toEqual(defaultExcludes);
   });
 
-  it('should handle settings with excludeTools but no extensions', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should handle settings with excludeTools but no extensions", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const settings: Settings = { tools: { exclude: ['tool1', 'tool2'] } };
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(new Set(['tool1', 'tool2']));
+    const settings: Settings = { tools: { exclude: ["tool1", "tool2"] } };
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getExcludeTools()).toEqual(new Set(["tool1", "tool2"]));
     expect(config.getExcludeTools()).toHaveLength(2);
   });
 
-  it('should handle extensions with excludeTools but no settings', async () => {
+  it("should handle extensions with excludeTools but no settings", async () => {
     const settings: Settings = {};
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([
       {
-        path: '/path/to/ext',
-        name: 'ext1',
-        id: 'ext1-id',
-        version: '1.0.0',
-        excludeTools: ['tool1', 'tool2'],
+        path: "/path/to/ext",
+        name: "ext1",
+        id: "ext1-id",
+        version: "1.0.0",
+        excludeTools: ["tool1", "tool2"],
         contextFiles: [],
         isActive: true,
       },
     ]);
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getExcludeTools()).toEqual(new Set(['tool1', 'tool2']));
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getExcludeTools()).toEqual(new Set(["tool1", "tool2"]));
     expect(config.getExcludeTools()).toHaveLength(2);
   });
 
-  it('should not modify the original settings object', async () => {
-    const settings: Settings = { tools: { exclude: ['tool1'] } };
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([
+  it("should not modify the original settings object", async () => {
+    const settings: Settings = { tools: { exclude: ["tool1"] } };
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([
       {
-        path: '/path/to/ext',
-        name: 'ext1',
-        id: 'ext1-id',
-        version: '1.0.0',
-        excludeTools: ['tool2'],
+        path: "/path/to/ext",
+        name: "ext1",
+        id: "ext1-id",
+        version: "1.0.0",
+        excludeTools: ["tool2"],
         contextFiles: [],
         isActive: true,
       },
     ]);
     const originalSettings = JSON.parse(JSON.stringify(settings));
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    await loadCliConfig(settings, 'test-session', argv);
+    await loadCliConfig(settings, "test-session", argv);
     expect(settings).toEqual(originalSettings);
   });
 });
 
-describe('Approval mode tool exclusion logic', () => {
+describe("Approval mode tool exclusion logic", () => {
   const originalIsTTY = process.stdin.isTTY;
 
   beforeEach(() => {
@@ -923,18 +821,18 @@ describe('Approval mode tool exclusion logic', () => {
       isTrusted: true,
       source: undefined,
     });
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
     process.stdin.isTTY = originalIsTTY;
   });
 
-  it('should exclude all interactive tools in non-interactive mode with default approval mode', async () => {
-    process.argv = ['node', 'script.js', '-p', 'test'];
+  it("should exclude all interactive tools in non-interactive mode with default approval mode", async () => {
+    process.argv = ["node", "script.js", "-p", "test"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
 
     const excludedTools = config.getExcludeTools();
     expect(excludedTools).toContain(SHELL_TOOL_NAME);
@@ -942,19 +840,12 @@ describe('Approval mode tool exclusion logic', () => {
     expect(excludedTools).toContain(WRITE_FILE_TOOL_NAME);
   });
 
-  it('should exclude all interactive tools in non-interactive mode with explicit default approval mode', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--approval-mode',
-      'default',
-      '-p',
-      'test',
-    ];
+  it("should exclude all interactive tools in non-interactive mode with explicit default approval mode", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "default", "-p", "test"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
 
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
 
     const excludedTools = config.getExcludeTools();
     expect(excludedTools).toContain(SHELL_TOOL_NAME);
@@ -962,19 +853,12 @@ describe('Approval mode tool exclusion logic', () => {
     expect(excludedTools).toContain(WRITE_FILE_TOOL_NAME);
   });
 
-  it('should exclude only shell tools in non-interactive mode with auto_edit approval mode', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--approval-mode',
-      'auto_edit',
-      '-p',
-      'test',
-    ];
+  it("should exclude only shell tools in non-interactive mode with auto_edit approval mode", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "auto_edit", "-p", "test"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
 
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
 
     const excludedTools = config.getExcludeTools();
     expect(excludedTools).toContain(SHELL_TOOL_NAME);
@@ -982,19 +866,12 @@ describe('Approval mode tool exclusion logic', () => {
     expect(excludedTools).not.toContain(WRITE_FILE_TOOL_NAME);
   });
 
-  it('should exclude no interactive tools in non-interactive mode with yolo approval mode', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--approval-mode',
-      'yolo',
-      '-p',
-      'test',
-    ];
+  it("should exclude no interactive tools in non-interactive mode with yolo approval mode", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "yolo", "-p", "test"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
 
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
 
     const excludedTools = config.getExcludeTools();
     expect(excludedTools).not.toContain(SHELL_TOOL_NAME);
@@ -1002,12 +879,12 @@ describe('Approval mode tool exclusion logic', () => {
     expect(excludedTools).not.toContain(WRITE_FILE_TOOL_NAME);
   });
 
-  it('should exclude no interactive tools in non-interactive mode with legacy yolo flag', async () => {
-    process.argv = ['node', 'script.js', '--yolo', '-p', 'test'];
+  it("should exclude no interactive tools in non-interactive mode with legacy yolo flag", async () => {
+    process.argv = ["node", "script.js", "--yolo", "-p", "test"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
 
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
 
     const excludedTools = config.getExcludeTools();
     expect(excludedTools).not.toContain(SHELL_TOOL_NAME);
@@ -1015,15 +892,15 @@ describe('Approval mode tool exclusion logic', () => {
     expect(excludedTools).not.toContain(WRITE_FILE_TOOL_NAME);
   });
 
-  it('should not exclude interactive tools in interactive mode regardless of approval mode', async () => {
+  it("should not exclude interactive tools in interactive mode regardless of approval mode", async () => {
     process.stdin.isTTY = true; // Interactive mode
 
     const testCases = [
-      { args: ['node', 'script.js'] }, // default
-      { args: ['node', 'script.js', '--approval-mode', 'default'] },
-      { args: ['node', 'script.js', '--approval-mode', 'auto_edit'] },
-      { args: ['node', 'script.js', '--approval-mode', 'yolo'] },
-      { args: ['node', 'script.js', '--yolo'] },
+      { args: ["node", "script.js"] }, // default
+      { args: ["node", "script.js", "--approval-mode", "default"] },
+      { args: ["node", "script.js", "--approval-mode", "auto_edit"] },
+      { args: ["node", "script.js", "--approval-mode", "yolo"] },
+      { args: ["node", "script.js", "--yolo"] },
     ];
 
     for (const testCase of testCases) {
@@ -1031,7 +908,7 @@ describe('Approval mode tool exclusion logic', () => {
       const argv = await parseArguments({} as Settings);
       const settings: Settings = {};
 
-      const config = await loadCliConfig(settings, 'test-session', argv);
+      const config = await loadCliConfig(settings, "test-session", argv);
 
       const excludedTools = config.getExcludeTools();
       expect(excludedTools).not.toContain(SHELL_TOOL_NAME);
@@ -1040,29 +917,22 @@ describe('Approval mode tool exclusion logic', () => {
     }
   });
 
-  it('should merge approval mode exclusions with settings exclusions in auto_edit mode', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--approval-mode',
-      'auto_edit',
-      '-p',
-      'test',
-    ];
+  it("should merge approval mode exclusions with settings exclusions in auto_edit mode", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "auto_edit", "-p", "test"];
     const argv = await parseArguments({} as Settings);
-    const settings: Settings = { tools: { exclude: ['custom_tool'] } };
+    const settings: Settings = { tools: { exclude: ["custom_tool"] } };
 
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
 
     const excludedTools = config.getExcludeTools();
-    expect(excludedTools).toContain('custom_tool'); // From settings
+    expect(excludedTools).toContain("custom_tool"); // From settings
     expect(excludedTools).toContain(SHELL_TOOL_NAME); // From approval mode
     expect(excludedTools).not.toContain(EDIT_TOOL_NAME); // Should be allowed in auto_edit
     expect(excludedTools).not.toContain(WRITE_FILE_TOOL_NAME); // Should be allowed in auto_edit
   });
 
-  it('should throw an error if YOLO mode is attempted when disableYoloMode is true', async () => {
-    process.argv = ['node', 'script.js', '--yolo'];
+  it("should throw an error if YOLO mode is attempted when disableYoloMode is true", async () => {
+    process.argv = ["node", "script.js", "--yolo"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       security: {
@@ -1070,35 +940,33 @@ describe('Approval mode tool exclusion logic', () => {
       },
     };
 
-    await expect(loadCliConfig(settings, 'test-session', argv)).rejects.toThrow(
-      'Cannot start in YOLO mode when it is disabled by settings',
+    await expect(loadCliConfig(settings, "test-session", argv)).rejects.toThrow(
+      "Cannot start in YOLO mode when it is disabled by settings",
     );
   });
 
-  it('should throw an error for invalid approval mode values in loadCliConfig', async () => {
+  it("should throw an error for invalid approval mode values in loadCliConfig", async () => {
     // Create a mock argv with an invalid approval mode that bypasses argument parsing validation
     const invalidArgv: Partial<CliArgs> & { approvalMode: string } = {
-      approvalMode: 'invalid_mode',
-      promptInteractive: '',
-      prompt: '',
+      approvalMode: "invalid_mode",
+      promptInteractive: "",
+      prompt: "",
       yolo: false,
     };
 
     const settings: Settings = {};
-    await expect(
-      loadCliConfig(settings, 'test-session', invalidArgv as CliArgs),
-    ).rejects.toThrow(
-      'Invalid approval mode: invalid_mode. Valid values are: yolo, auto_edit, default',
+    await expect(loadCliConfig(settings, "test-session", invalidArgv as CliArgs)).rejects.toThrow(
+      "Invalid approval mode: invalid_mode. Valid values are: yolo, auto_edit, default",
     );
   });
 });
 
-describe('loadCliConfig with allowed-mcp-server-names', () => {
+describe("loadCliConfig with allowed-mcp-server-names", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1108,221 +976,211 @@ describe('loadCliConfig with allowed-mcp-server-names', () => {
 
   const baseSettings: Settings = {
     mcpServers: {
-      server1: { url: 'http://localhost:8080' },
-      server2: { url: 'http://localhost:8081' },
-      server3: { url: 'http://localhost:8082' },
+      server1: { url: "http://localhost:8080" },
+      server2: { url: "http://localhost:8081" },
+      server3: { url: "http://localhost:8082" },
     },
   };
 
-  it('should allow all MCP servers if the flag is not provided', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should allow all MCP servers if the flag is not provided", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(baseSettings, 'test-session', argv);
+    const config = await loadCliConfig(baseSettings, "test-session", argv);
     expect(config.getMcpServers()).toEqual(baseSettings.mcpServers);
   });
 
-  it('should allow only the specified MCP server', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--allowed-mcp-server-names',
-      'server1',
-    ];
+  it("should allow only the specified MCP server", async () => {
+    process.argv = ["node", "script.js", "--allowed-mcp-server-names", "server1"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(baseSettings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['server1']);
+    const config = await loadCliConfig(baseSettings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual(["server1"]);
   });
 
-  it('should allow multiple specified MCP servers', async () => {
+  it("should allow multiple specified MCP servers", async () => {
     process.argv = [
-      'node',
-      'script.js',
-      '--allowed-mcp-server-names',
-      'server1',
-      '--allowed-mcp-server-names',
-      'server3',
+      "node",
+      "script.js",
+      "--allowed-mcp-server-names",
+      "server1",
+      "--allowed-mcp-server-names",
+      "server3",
     ];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(baseSettings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['server1', 'server3']);
+    const config = await loadCliConfig(baseSettings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual(["server1", "server3"]);
   });
 
-  it('should handle server names that do not exist', async () => {
+  it("should handle server names that do not exist", async () => {
     process.argv = [
-      'node',
-      'script.js',
-      '--allowed-mcp-server-names',
-      'server1',
-      '--allowed-mcp-server-names',
-      'server4',
+      "node",
+      "script.js",
+      "--allowed-mcp-server-names",
+      "server1",
+      "--allowed-mcp-server-names",
+      "server4",
     ];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(baseSettings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['server1', 'server4']);
+    const config = await loadCliConfig(baseSettings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual(["server1", "server4"]);
   });
 
-  it('should allow no MCP servers if the flag is provided but empty', async () => {
-    process.argv = ['node', 'script.js', '--allowed-mcp-server-names', ''];
+  it("should allow no MCP servers if the flag is provided but empty", async () => {
+    process.argv = ["node", "script.js", "--allowed-mcp-server-names", ""];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(baseSettings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['']);
+    const config = await loadCliConfig(baseSettings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual([""]);
   });
 
-  it('should read allowMCPServers from settings', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should read allowMCPServers from settings", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ...baseSettings,
-      mcp: { allowed: ['server1', 'server2'] },
+      mcp: { allowed: ["server1", "server2"] },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['server1', 'server2']);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual(["server1", "server2"]);
   });
 
-  it('should read excludeMCPServers from settings', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should read excludeMCPServers from settings", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ...baseSettings,
-      mcp: { excluded: ['server1', 'server2'] },
+      mcp: { excluded: ["server1", "server2"] },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getBlockedMcpServers()).toEqual(['server1', 'server2']);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getBlockedMcpServers()).toEqual(["server1", "server2"]);
   });
 
-  it('should override allowMCPServers with excludeMCPServers if overlapping', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should override allowMCPServers with excludeMCPServers if overlapping", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ...baseSettings,
       mcp: {
-        excluded: ['server1'],
-        allowed: ['server1', 'server2'],
+        excluded: ["server1"],
+        allowed: ["server1", "server2"],
       },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['server1', 'server2']);
-    expect(config.getBlockedMcpServers()).toEqual(['server1']);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual(["server1", "server2"]);
+    expect(config.getBlockedMcpServers()).toEqual(["server1"]);
   });
 
-  it('should prioritize mcp server flag if set', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--allowed-mcp-server-names',
-      'server1',
-    ];
+  it("should prioritize mcp server flag if set", async () => {
+    process.argv = ["node", "script.js", "--allowed-mcp-server-names", "server1"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ...baseSettings,
       mcp: {
-        excluded: ['server1'],
-        allowed: ['server2'],
+        excluded: ["server1"],
+        allowed: ["server2"],
       },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['server1']);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual(["server1"]);
   });
 
-  it('should prioritize CLI flag over both allowed and excluded settings', async () => {
+  it("should prioritize CLI flag over both allowed and excluded settings", async () => {
     process.argv = [
-      'node',
-      'script.js',
-      '--allowed-mcp-server-names',
-      'server2',
-      '--allowed-mcp-server-names',
-      'server3',
+      "node",
+      "script.js",
+      "--allowed-mcp-server-names",
+      "server2",
+      "--allowed-mcp-server-names",
+      "server3",
     ];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ...baseSettings,
       mcp: {
-        allowed: ['server1', 'server2'], // Should be ignored
-        excluded: ['server3'], // Should be ignored
+        allowed: ["server1", "server2"], // Should be ignored
+        excluded: ["server3"], // Should be ignored
       },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getAllowedMcpServers()).toEqual(['server2', 'server3']);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getAllowedMcpServers()).toEqual(["server2", "server3"]);
     expect(config.getBlockedMcpServers()).toEqual([]);
   });
 });
 
-describe('loadCliConfig model selection', () => {
+describe("loadCliConfig model selection", () => {
   beforeEach(() => {
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
     vi.resetAllMocks();
   });
 
-  it('selects a model from settings.json if provided', async () => {
-    process.argv = ['node', 'script.js'];
+  it("selects a model from settings.json if provided", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const config = await loadCliConfig(
       {
         model: {
-          name: 'gemini-2.5-pro',
+          name: "gemini-2.5-pro",
         },
       },
-      'test-session',
+      "test-session",
       argv,
     );
 
-    expect(config.getModel()).toBe('gemini-2.5-pro');
+    expect(config.getModel()).toBe("gemini-2.5-pro");
   });
 
-  it('uses the default gemini model if nothing is set', async () => {
-    process.argv = ['node', 'script.js']; // No model set.
+  it("uses the default gemini model if nothing is set", async () => {
+    process.argv = ["node", "script.js"]; // No model set.
     const argv = await parseArguments({} as Settings);
     const config = await loadCliConfig(
       {
         // No model set.
       },
-      'test-session',
+      "test-session",
       argv,
     );
 
-    expect(config.getModel()).toBe('auto');
+    expect(config.getModel()).toBe("auto");
   });
 
-  it('always prefers model from argv', async () => {
-    process.argv = ['node', 'script.js', '--model', 'gemini-2.5-flash-preview'];
+  it("always prefers model from argv", async () => {
+    process.argv = ["node", "script.js", "--model", "gemini-2.5-flash-preview"];
     const argv = await parseArguments({} as Settings);
     const config = await loadCliConfig(
       {
         model: {
-          name: 'gemini-2.5-pro',
+          name: "gemini-2.5-pro",
         },
       },
-      'test-session',
+      "test-session",
       argv,
     );
 
-    expect(config.getModel()).toBe('gemini-2.5-flash-preview');
+    expect(config.getModel()).toBe("gemini-2.5-flash-preview");
   });
 
-  it('selects the model from argv if provided', async () => {
-    process.argv = ['node', 'script.js', '--model', 'gemini-2.5-flash-preview'];
+  it("selects the model from argv if provided", async () => {
+    process.argv = ["node", "script.js", "--model", "gemini-2.5-flash-preview"];
     const argv = await parseArguments({} as Settings);
     const config = await loadCliConfig(
       {
         // No model provided via settings.
       },
-      'test-session',
+      "test-session",
       argv,
     );
 
-    expect(config.getModel()).toBe('gemini-2.5-flash-preview');
+    expect(config.getModel()).toBe("gemini-2.5-flash-preview");
   });
 });
 
-describe('loadCliConfig folderTrust', () => {
+describe("loadCliConfig folderTrust", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1330,8 +1188,8 @@ describe('loadCliConfig folderTrust', () => {
     vi.restoreAllMocks();
   });
 
-  it('should be false when folderTrust is false', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should be false when folderTrust is false", async () => {
+    process.argv = ["node", "script.js"];
     const settings: Settings = {
       security: {
         folderTrust: {
@@ -1340,12 +1198,12 @@ describe('loadCliConfig folderTrust', () => {
       },
     };
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getFolderTrust()).toBe(false);
   });
 
-  it('should be true when folderTrust is true', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should be true when folderTrust is true", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       security: {
@@ -1354,80 +1212,74 @@ describe('loadCliConfig folderTrust', () => {
         },
       },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getFolderTrust()).toBe(true);
   });
 
-  it('should be false by default', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should be false by default", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getFolderTrust()).toBe(false);
   });
 });
 
-describe('loadCliConfig with includeDirectories', () => {
+describe("loadCliConfig with includeDirectories", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue(
-      path.resolve(path.sep, 'mock', 'home', 'user'),
-    );
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(process, 'cwd').mockReturnValue(
-      path.resolve(path.sep, 'home', 'user', 'project'),
-    );
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue(path.resolve(path.sep, "mock", "home", "user"));
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    vi.spyOn(process, "cwd").mockReturnValue(path.resolve(path.sep, "home", "user", "project"));
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should combine and resolve paths from settings and CLI arguments', async () => {
-    const mockCwd = path.resolve(path.sep, 'home', 'user', 'project');
+  it("should combine and resolve paths from settings and CLI arguments", async () => {
+    const mockCwd = path.resolve(path.sep, "home", "user", "project");
     process.argv = [
-      'node',
-      'script.js',
-      '--include-directories',
-      `${path.resolve(path.sep, 'cli', 'path1')},${path.join(mockCwd, 'cli', 'path2')}`,
+      "node",
+      "script.js",
+      "--include-directories",
+      `${path.resolve(path.sep, "cli", "path1")},${path.join(mockCwd, "cli", "path2")}`,
     ];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       context: {
         includeDirectories: [
-          path.resolve(path.sep, 'settings', 'path1'),
-          path.join(os.homedir(), 'settings', 'path2'),
-          path.join(mockCwd, 'settings', 'path3'),
+          path.resolve(path.sep, "settings", "path1"),
+          path.join(os.homedir(), "settings", "path2"),
+          path.join(mockCwd, "settings", "path3"),
         ],
       },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     const expected = [
       mockCwd,
-      path.resolve(path.sep, 'cli', 'path1'),
-      path.join(mockCwd, 'cli', 'path2'),
-      path.resolve(path.sep, 'settings', 'path1'),
-      path.join(os.homedir(), 'settings', 'path2'),
-      path.join(mockCwd, 'settings', 'path3'),
+      path.resolve(path.sep, "cli", "path1"),
+      path.join(mockCwd, "cli", "path2"),
+      path.resolve(path.sep, "settings", "path1"),
+      path.join(os.homedir(), "settings", "path2"),
+      path.join(mockCwd, "settings", "path3"),
     ];
     const directories = config.getWorkspaceContext().getDirectories();
     expect(directories).toEqual([mockCwd]);
     expect(config.getPendingIncludeDirectories()).toEqual(
       expect.arrayContaining(expected.filter((dir) => dir !== mockCwd)),
     );
-    expect(config.getPendingIncludeDirectories()).toHaveLength(
-      expected.length - 1,
-    );
+    expect(config.getPendingIncludeDirectories()).toHaveLength(expected.length - 1);
   });
 });
 
-describe('loadCliConfig compressionThreshold', () => {
+describe("loadCliConfig compressionThreshold", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1435,33 +1287,33 @@ describe('loadCliConfig compressionThreshold', () => {
     vi.restoreAllMocks();
   });
 
-  it('should pass settings to the core config', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should pass settings to the core config", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       model: {
         compressionThreshold: 0.5,
       },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(await config.getCompressionThreshold()).toBe(0.5);
   });
 
-  it('should have undefined compressionThreshold if not in settings', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should have undefined compressionThreshold if not in settings", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(await config.getCompressionThreshold()).toBeUndefined();
   });
 });
 
-describe('loadCliConfig useRipgrep', () => {
+describe("loadCliConfig useRipgrep", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1469,37 +1321,37 @@ describe('loadCliConfig useRipgrep', () => {
     vi.restoreAllMocks();
   });
 
-  it('should be true by default when useRipgrep is not set in settings', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should be true by default when useRipgrep is not set in settings", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getUseRipgrep()).toBe(true);
   });
 
-  it('should be false when useRipgrep is set to false in settings', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should be false when useRipgrep is set to false in settings", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = { tools: { useRipgrep: false } };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getUseRipgrep()).toBe(false);
   });
 
-  it('should be true when useRipgrep is explicitly set to true in settings', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should be true when useRipgrep is explicitly set to true in settings", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = { tools: { useRipgrep: true } };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getUseRipgrep()).toBe(true);
   });
 });
 
-describe('screenReader configuration', () => {
+describe("screenReader configuration", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1507,58 +1359,58 @@ describe('screenReader configuration', () => {
     vi.restoreAllMocks();
   });
 
-  it('should use screenReader value from settings if CLI flag is not present (settings true)', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should use screenReader value from settings if CLI flag is not present (settings true)", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ui: { accessibility: { screenReader: true } },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getScreenReader()).toBe(true);
   });
 
-  it('should use screenReader value from settings if CLI flag is not present (settings false)', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should use screenReader value from settings if CLI flag is not present (settings false)", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ui: { accessibility: { screenReader: false } },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getScreenReader()).toBe(false);
   });
 
-  it('should prioritize --screen-reader CLI flag (true) over settings (false)', async () => {
-    process.argv = ['node', 'script.js', '--screen-reader'];
+  it("should prioritize --screen-reader CLI flag (true) over settings (false)", async () => {
+    process.argv = ["node", "script.js", "--screen-reader"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       ui: { accessibility: { screenReader: false } },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getScreenReader()).toBe(true);
   });
 
-  it('should be false by default when no flag or setting is present', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should be false by default when no flag or setting is present", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {};
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getScreenReader()).toBe(false);
   });
 });
 
-describe('loadCliConfig tool exclusions', () => {
+describe("loadCliConfig tool exclusions", () => {
   const originalIsTTY = process.stdin.isTTY;
 
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
     process.stdin.isTTY = true;
     vi.mocked(isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
       source: undefined,
     });
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1567,124 +1419,96 @@ describe('loadCliConfig tool exclusions', () => {
     vi.restoreAllMocks();
   });
 
-  it('should not exclude interactive tools in interactive mode without YOLO', async () => {
+  it("should not exclude interactive tools in interactive mode without YOLO", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
-    expect(config.getExcludeTools()).not.toContain('run_shell_command');
-    expect(config.getExcludeTools()).not.toContain('replace');
-    expect(config.getExcludeTools()).not.toContain('write_file');
+    const config = await loadCliConfig({}, "test-session", argv);
+    expect(config.getExcludeTools()).not.toContain("run_shell_command");
+    expect(config.getExcludeTools()).not.toContain("replace");
+    expect(config.getExcludeTools()).not.toContain("write_file");
   });
 
-  it('should not exclude interactive tools in interactive mode with YOLO', async () => {
+  it("should not exclude interactive tools in interactive mode with YOLO", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js', '--yolo'];
+    process.argv = ["node", "script.js", "--yolo"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
-    expect(config.getExcludeTools()).not.toContain('run_shell_command');
-    expect(config.getExcludeTools()).not.toContain('replace');
-    expect(config.getExcludeTools()).not.toContain('write_file');
+    const config = await loadCliConfig({}, "test-session", argv);
+    expect(config.getExcludeTools()).not.toContain("run_shell_command");
+    expect(config.getExcludeTools()).not.toContain("replace");
+    expect(config.getExcludeTools()).not.toContain("write_file");
   });
 
-  it('should exclude interactive tools in non-interactive mode without YOLO', async () => {
+  it("should exclude interactive tools in non-interactive mode without YOLO", async () => {
     process.stdin.isTTY = false;
-    process.argv = ['node', 'script.js', '-p', 'test'];
+    process.argv = ["node", "script.js", "-p", "test"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
-    expect(config.getExcludeTools()).toContain('run_shell_command');
-    expect(config.getExcludeTools()).toContain('replace');
-    expect(config.getExcludeTools()).toContain('write_file');
+    const config = await loadCliConfig({}, "test-session", argv);
+    expect(config.getExcludeTools()).toContain("run_shell_command");
+    expect(config.getExcludeTools()).toContain("replace");
+    expect(config.getExcludeTools()).toContain("write_file");
   });
 
-  it('should not exclude interactive tools in non-interactive mode with YOLO', async () => {
+  it("should not exclude interactive tools in non-interactive mode with YOLO", async () => {
     process.stdin.isTTY = false;
-    process.argv = ['node', 'script.js', '-p', 'test', '--yolo'];
+    process.argv = ["node", "script.js", "-p", "test", "--yolo"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
-    expect(config.getExcludeTools()).not.toContain('run_shell_command');
-    expect(config.getExcludeTools()).not.toContain('replace');
-    expect(config.getExcludeTools()).not.toContain('write_file');
+    const config = await loadCliConfig({}, "test-session", argv);
+    expect(config.getExcludeTools()).not.toContain("run_shell_command");
+    expect(config.getExcludeTools()).not.toContain("replace");
+    expect(config.getExcludeTools()).not.toContain("write_file");
   });
 
   it('should not exclude shell tool in non-interactive mode when --allowed-tools="ShellTool" is set', async () => {
     process.stdin.isTTY = false;
-    process.argv = [
-      'node',
-      'script.js',
-      '-p',
-      'test',
-      '--allowed-tools',
-      'ShellTool',
-    ];
+    process.argv = ["node", "script.js", "-p", "test", "--allowed-tools", "ShellTool"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getExcludeTools()).not.toContain(SHELL_TOOL_NAME);
   });
 
-  it('should exclude web-fetch in non-interactive mode when not allowed', async () => {
+  it("should exclude web-fetch in non-interactive mode when not allowed", async () => {
     process.stdin.isTTY = false;
-    process.argv = ['node', 'script.js', '-p', 'test'];
+    process.argv = ["node", "script.js", "-p", "test"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getExcludeTools()).toContain(WEB_FETCH_TOOL_NAME);
   });
 
-  it('should not exclude web-fetch in non-interactive mode when allowed', async () => {
+  it("should not exclude web-fetch in non-interactive mode when allowed", async () => {
     process.stdin.isTTY = false;
-    process.argv = [
-      'node',
-      'script.js',
-      '-p',
-      'test',
-      '--allowed-tools',
-      WEB_FETCH_TOOL_NAME,
-    ];
+    process.argv = ["node", "script.js", "-p", "test", "--allowed-tools", WEB_FETCH_TOOL_NAME];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getExcludeTools()).not.toContain(WEB_FETCH_TOOL_NAME);
   });
 
   it('should not exclude shell tool in non-interactive mode when --allowed-tools="run_shell_command" is set', async () => {
     process.stdin.isTTY = false;
-    process.argv = [
-      'node',
-      'script.js',
-      '-p',
-      'test',
-      '--allowed-tools',
-      'run_shell_command',
-    ];
+    process.argv = ["node", "script.js", "-p", "test", "--allowed-tools", "run_shell_command"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getExcludeTools()).not.toContain(SHELL_TOOL_NAME);
   });
 
   it('should not exclude shell tool in non-interactive mode when --allowed-tools="ShellTool(wc)" is set', async () => {
     process.stdin.isTTY = false;
-    process.argv = [
-      'node',
-      'script.js',
-      '-p',
-      'test',
-      '--allowed-tools',
-      'ShellTool(wc)',
-    ];
+    process.argv = ["node", "script.js", "-p", "test", "--allowed-tools", "ShellTool(wc)"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getExcludeTools()).not.toContain(SHELL_TOOL_NAME);
   });
 });
 
-describe('loadCliConfig interactive', () => {
+describe("loadCliConfig interactive", () => {
   const originalIsTTY = process.stdin.isTTY;
 
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
     process.stdin.isTTY = true;
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1693,156 +1517,139 @@ describe('loadCliConfig interactive', () => {
     vi.restoreAllMocks();
   });
 
-  it('should be interactive if isTTY and no prompt', async () => {
+  it("should be interactive if isTTY and no prompt", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(true);
   });
 
-  it('should be interactive if prompt-interactive is set', async () => {
+  it("should be interactive if prompt-interactive is set", async () => {
     process.stdin.isTTY = false;
-    process.argv = ['node', 'script.js', '--prompt-interactive', 'test'];
+    process.argv = ["node", "script.js", "--prompt-interactive", "test"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(true);
   });
 
-  it('should not be interactive if not isTTY and no prompt', async () => {
+  it("should not be interactive if not isTTY and no prompt", async () => {
     process.stdin.isTTY = false;
-    process.argv = ['node', 'script.js'];
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
   });
 
-  it('should not be interactive if prompt is set', async () => {
+  it("should not be interactive if prompt is set", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js', '--prompt', 'test'];
+    process.argv = ["node", "script.js", "--prompt", "test"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
   });
 
-  it('should not be interactive if positional prompt words are provided with other flags', async () => {
+  it("should not be interactive if positional prompt words are provided with other flags", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js', '--model', 'gemini-2.5-pro', 'Hello'];
+    process.argv = ["node", "script.js", "--model", "gemini-2.5-pro", "Hello"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
   });
 
-  it('should not be interactive if positional prompt words are provided with multiple flags', async () => {
+  it("should not be interactive if positional prompt words are provided with multiple flags", async () => {
     process.stdin.isTTY = true;
-    process.argv = [
-      'node',
-      'script.js',
-      '--model',
-      'gemini-2.5-pro',
-      '--yolo',
-      'Hello world',
-    ];
+    process.argv = ["node", "script.js", "--model", "gemini-2.5-pro", "--yolo", "Hello world"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
     // Verify the question is preserved for one-shot execution
-    expect(argv.prompt).toBe('Hello world');
+    expect(argv.prompt).toBe("Hello world");
     expect(argv.promptInteractive).toBeUndefined();
   });
 
-  it('should not be interactive if positional prompt words are provided with extensions flag', async () => {
+  it("should not be interactive if positional prompt words are provided with extensions flag", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js', '-e', 'none', 'hello'];
+    process.argv = ["node", "script.js", "-e", "none", "hello"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
-    expect(argv.query).toBe('hello');
-    expect(argv.extensions).toEqual(['none']);
+    expect(argv.query).toBe("hello");
+    expect(argv.extensions).toEqual(["none"]);
   });
 
-  it('should handle multiple positional words correctly', async () => {
+  it("should handle multiple positional words correctly", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js', 'hello world how are you'];
+    process.argv = ["node", "script.js", "hello world how are you"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
-    expect(argv.query).toBe('hello world how are you');
-    expect(argv.prompt).toBe('hello world how are you');
+    expect(argv.query).toBe("hello world how are you");
+    expect(argv.prompt).toBe("hello world how are you");
   });
 
-  it('should handle multiple positional words with flags', async () => {
+  it("should handle multiple positional words with flags", async () => {
     process.stdin.isTTY = true;
     process.argv = [
-      'node',
-      'script.js',
-      '--model',
-      'gemini-2.5-pro',
-      'write',
-      'a',
-      'function',
-      'to',
-      'sort',
-      'array',
+      "node",
+      "script.js",
+      "--model",
+      "gemini-2.5-pro",
+      "write",
+      "a",
+      "function",
+      "to",
+      "sort",
+      "array",
     ];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
-    expect(argv.query).toBe('write a function to sort array');
-    expect(argv.model).toBe('gemini-2.5-pro');
+    expect(argv.query).toBe("write a function to sort array");
+    expect(argv.model).toBe("gemini-2.5-pro");
   });
 
-  it('should handle empty positional arguments', async () => {
+  it("should handle empty positional arguments", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js', ''];
+    process.argv = ["node", "script.js", ""];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(true);
     expect(argv.query).toBeUndefined();
   });
 
-  it('should handle extensions flag with positional arguments correctly', async () => {
+  it("should handle extensions flag with positional arguments correctly", async () => {
     process.stdin.isTTY = true;
-    process.argv = [
-      'node',
-      'script.js',
-      '-e',
-      'none',
-      'hello',
-      'world',
-      'how',
-      'are',
-      'you',
-    ];
+    process.argv = ["node", "script.js", "-e", "none", "hello", "world", "how", "are", "you"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(false);
-    expect(argv.query).toBe('hello world how are you');
-    expect(argv.extensions).toEqual(['none']);
+    expect(argv.query).toBe("hello world how are you");
+    expect(argv.extensions).toEqual(["none"]);
   });
 
-  it('should be interactive if no positional prompt words are provided with flags', async () => {
+  it("should be interactive if no positional prompt words are provided with flags", async () => {
     process.stdin.isTTY = true;
-    process.argv = ['node', 'script.js', '--model', 'gemini-2.5-pro'];
+    process.argv = ["node", "script.js", "--model", "gemini-2.5-pro"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.isInteractive()).toBe(true);
   });
 });
 
-describe('loadCliConfig approval mode', () => {
+describe("loadCliConfig approval mode", () => {
   const originalArgv = process.argv;
 
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    process.argv = ['node', 'script.js']; // Reset argv for each test
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    process.argv = ["node", "script.js"]; // Reset argv for each test
     vi.mocked(isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
       source: undefined,
     });
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1851,114 +1658,114 @@ describe('loadCliConfig approval mode', () => {
     vi.restoreAllMocks();
   });
 
-  it('should default to DEFAULT approval mode when no flags are set', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should default to DEFAULT approval mode when no flags are set", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
   });
 
-  it('should set YOLO approval mode when --yolo flag is used', async () => {
-    process.argv = ['node', 'script.js', '--yolo'];
+  it("should set YOLO approval mode when --yolo flag is used", async () => {
+    process.argv = ["node", "script.js", "--yolo"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
   });
 
-  it('should set YOLO approval mode when -y flag is used', async () => {
-    process.argv = ['node', 'script.js', '-y'];
+  it("should set YOLO approval mode when -y flag is used", async () => {
+    process.argv = ["node", "script.js", "-y"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
   });
 
-  it('should set DEFAULT approval mode when --approval-mode=default', async () => {
-    process.argv = ['node', 'script.js', '--approval-mode', 'default'];
+  it("should set DEFAULT approval mode when --approval-mode=default", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "default"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
   });
 
-  it('should set AUTO_EDIT approval mode when --approval-mode=auto_edit', async () => {
-    process.argv = ['node', 'script.js', '--approval-mode', 'auto_edit'];
+  it("should set AUTO_EDIT approval mode when --approval-mode=auto_edit", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "auto_edit"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.AUTO_EDIT);
   });
 
-  it('should set YOLO approval mode when --approval-mode=yolo', async () => {
-    process.argv = ['node', 'script.js', '--approval-mode', 'yolo'];
+  it("should set YOLO approval mode when --approval-mode=yolo", async () => {
+    process.argv = ["node", "script.js", "--approval-mode", "yolo"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
   });
 
-  it('should prioritize --approval-mode over --yolo when both would be valid (but validation prevents this)', async () => {
+  it("should prioritize --approval-mode over --yolo when both would be valid (but validation prevents this)", async () => {
     // Note: This test documents the intended behavior, but in practice the validation
     // prevents both flags from being used together
-    process.argv = ['node', 'script.js', '--approval-mode', 'default'];
+    process.argv = ["node", "script.js", "--approval-mode", "default"];
     const argv = await parseArguments({} as Settings);
     // Manually set yolo to true to simulate what would happen if validation didn't prevent it
     argv.yolo = true;
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
   });
 
-  it('should fall back to --yolo behavior when --approval-mode is not set', async () => {
-    process.argv = ['node', 'script.js', '--yolo'];
+  it("should fall back to --yolo behavior when --approval-mode is not set", async () => {
+    process.argv = ["node", "script.js", "--yolo"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.YOLO);
   });
 
   // --- Untrusted Folder Scenarios ---
-  describe('when folder is NOT trusted', () => {
+  describe("when folder is NOT trusted", () => {
     beforeEach(() => {
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: false,
-        source: 'file',
+        source: "file",
       });
     });
 
-    it('should override --approval-mode=yolo to DEFAULT', async () => {
-      process.argv = ['node', 'script.js', '--approval-mode', 'yolo'];
+    it("should override --approval-mode=yolo to DEFAULT", async () => {
+      process.argv = ["node", "script.js", "--approval-mode", "yolo"];
       const argv = await parseArguments({} as Settings);
-      const config = await loadCliConfig({}, 'test-session', argv);
+      const config = await loadCliConfig({}, "test-session", argv);
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
 
-    it('should override --approval-mode=auto_edit to DEFAULT', async () => {
-      process.argv = ['node', 'script.js', '--approval-mode', 'auto_edit'];
+    it("should override --approval-mode=auto_edit to DEFAULT", async () => {
+      process.argv = ["node", "script.js", "--approval-mode", "auto_edit"];
       const argv = await parseArguments({} as Settings);
-      const config = await loadCliConfig({}, 'test-session', argv);
+      const config = await loadCliConfig({}, "test-session", argv);
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
 
-    it('should override --yolo flag to DEFAULT', async () => {
-      process.argv = ['node', 'script.js', '--yolo'];
+    it("should override --yolo flag to DEFAULT", async () => {
+      process.argv = ["node", "script.js", "--yolo"];
       const argv = await parseArguments({} as Settings);
-      const config = await loadCliConfig({}, 'test-session', argv);
+      const config = await loadCliConfig({}, "test-session", argv);
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
 
-    it('should remain DEFAULT when --approval-mode=default', async () => {
-      process.argv = ['node', 'script.js', '--approval-mode', 'default'];
+    it("should remain DEFAULT when --approval-mode=default", async () => {
+      process.argv = ["node", "script.js", "--approval-mode", "default"];
       const argv = await parseArguments({} as Settings);
-      const config = await loadCliConfig({}, 'test-session', argv);
+      const config = await loadCliConfig({}, "test-session", argv);
       expect(config.getApprovalMode()).toBe(ServerConfig.ApprovalMode.DEFAULT);
     });
   });
 });
 
-describe('loadCliConfig fileFiltering', () => {
+describe("loadCliConfig fileFiltering", () => {
   const originalArgv = process.argv;
 
   beforeEach(() => {
     vi.resetAllMocks();
-    vi.mocked(os.homedir).mockReturnValue('/mock/home/user');
-    vi.stubEnv('GEMINI_API_KEY', 'test-api-key');
-    process.argv = ['node', 'script.js']; // Reset argv for each test
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.mocked(os.homedir).mockReturnValue("/mock/home/user");
+    vi.stubEnv("GEMINI_API_KEY", "test-api-key");
+    process.argv = ["node", "script.js"]; // Reset argv for each test
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
@@ -1967,136 +1774,127 @@ describe('loadCliConfig fileFiltering', () => {
     vi.restoreAllMocks();
   });
 
-  type FileFilteringSettings = NonNullable<
-    NonNullable<Settings['context']>['fileFiltering']
-  >;
+  type FileFilteringSettings = NonNullable<NonNullable<Settings["context"]>["fileFiltering"]>;
   const testCases: Array<{
     property: keyof FileFilteringSettings;
     getter: (config: ServerConfig.Config) => boolean;
     value: boolean;
   }> = [
     {
-      property: 'disableFuzzySearch',
+      property: "disableFuzzySearch",
       getter: (c) => c.getFileFilteringDisableFuzzySearch(),
       value: true,
     },
     {
-      property: 'disableFuzzySearch',
+      property: "disableFuzzySearch",
       getter: (c) => c.getFileFilteringDisableFuzzySearch(),
       value: false,
     },
     {
-      property: 'respectGitIgnore',
+      property: "respectGitIgnore",
       getter: (c) => c.getFileFilteringRespectGitIgnore(),
       value: true,
     },
     {
-      property: 'respectGitIgnore',
+      property: "respectGitIgnore",
       getter: (c) => c.getFileFilteringRespectGitIgnore(),
       value: false,
     },
     {
-      property: 'respectGeminiIgnore',
+      property: "respectGeminiIgnore",
       getter: (c) => c.getFileFilteringRespectGeminiIgnore(),
       value: true,
     },
     {
-      property: 'respectGeminiIgnore',
+      property: "respectGeminiIgnore",
       getter: (c) => c.getFileFilteringRespectGeminiIgnore(),
       value: false,
     },
     {
-      property: 'enableRecursiveFileSearch',
+      property: "enableRecursiveFileSearch",
       getter: (c) => c.getEnableRecursiveFileSearch(),
       value: true,
     },
     {
-      property: 'enableRecursiveFileSearch',
+      property: "enableRecursiveFileSearch",
       getter: (c) => c.getEnableRecursiveFileSearch(),
       value: false,
     },
   ];
 
-  it.each(testCases)(
-    'should pass $property from settings to config when $value',
-    async ({ property, getter, value }) => {
-      const settings: Settings = {
-        context: {
-          fileFiltering: { [property]: value },
-        },
-      };
-      const argv = await parseArguments(settings);
-      const config = await loadCliConfig(settings, 'test-session', argv);
-      expect(getter(config)).toBe(value);
-    },
-  );
+  it.each(testCases)("should pass $property from settings to config when $value", async ({
+    property,
+    getter,
+    value,
+  }) => {
+    const settings: Settings = {
+      context: {
+        fileFiltering: { [property]: value },
+      },
+    };
+    const argv = await parseArguments(settings);
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(getter(config)).toBe(value);
+  });
 });
 
-describe('Output format', () => {
+describe("Output format", () => {
   beforeEach(() => {
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
 
   afterEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should default to TEXT', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should default to TEXT", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getOutputFormat()).toBe(OutputFormat.TEXT);
   });
 
-  it('should use the format from settings', async () => {
-    process.argv = ['node', 'script.js'];
+  it("should use the format from settings", async () => {
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const config = await loadCliConfig(
       { output: { format: OutputFormat.JSON } },
-      'test-session',
+      "test-session",
       argv,
     );
     expect(config.getOutputFormat()).toBe(OutputFormat.JSON);
   });
 
-  it('should prioritize the format from argv', async () => {
-    process.argv = ['node', 'script.js', '--output-format', 'json'];
+  it("should prioritize the format from argv", async () => {
+    process.argv = ["node", "script.js", "--output-format", "json"];
     const argv = await parseArguments({} as Settings);
     const config = await loadCliConfig(
       { output: { format: OutputFormat.JSON } },
-      'test-session',
+      "test-session",
       argv,
     );
     expect(config.getOutputFormat()).toBe(OutputFormat.JSON);
   });
 
-  it('should accept stream-json as a valid output format', async () => {
-    process.argv = ['node', 'script.js', '--output-format', 'stream-json'];
+  it("should accept stream-json as a valid output format", async () => {
+    process.argv = ["node", "script.js", "--output-format", "stream-json"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getOutputFormat()).toBe(OutputFormat.STREAM_JSON);
   });
 
-  it('should error on invalid --output-format argument', async () => {
-    process.argv = ['node', 'script.js', '--output-format', 'invalid'];
+  it("should error on invalid --output-format argument", async () => {
+    process.argv = ["node", "script.js", "--output-format", "invalid"];
 
-    const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-      throw new Error('process.exit called');
+    const mockExit = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("process.exit called");
     });
 
-    const mockConsoleError = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    const debugErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
+    const mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+    const debugErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
-    await expect(parseArguments({} as Settings)).rejects.toThrow(
-      'process.exit called',
-    );
-    expect(debugErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Invalid values:'),
-    );
+    await expect(parseArguments({} as Settings)).rejects.toThrow("process.exit called");
+    expect(debugErrorSpy).toHaveBeenCalledWith(expect.stringContaining("Invalid values:"));
     expect(mockConsoleError).toHaveBeenCalled();
 
     mockExit.mockRestore();
@@ -2105,41 +1903,28 @@ describe('Output format', () => {
   });
 });
 
-describe('parseArguments with positional prompt', () => {
+describe("parseArguments with positional prompt", () => {
   const originalArgv = process.argv;
 
   afterEach(() => {
     process.argv = originalArgv;
   });
 
-  it('should throw an error when both a positional prompt and the --prompt flag are used', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      'positional',
-      'prompt',
-      '--prompt',
-      'test prompt',
-    ];
+  it("should throw an error when both a positional prompt and the --prompt flag are used", async () => {
+    process.argv = ["node", "script.js", "positional", "prompt", "--prompt", "test prompt"];
 
-    const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
-      throw new Error('process.exit called');
+    const mockExit = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("process.exit called");
     });
 
-    const mockConsoleError = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    const debugErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
+    const mockConsoleError = vi.spyOn(console, "error").mockImplementation(() => {});
+    const debugErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
-    await expect(parseArguments({} as Settings)).rejects.toThrow(
-      'process.exit called',
-    );
+    await expect(parseArguments({} as Settings)).rejects.toThrow("process.exit called");
 
     expect(debugErrorSpy).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Cannot use both a positional prompt and the --prompt (-p) flag together',
+        "Cannot use both a positional prompt and the --prompt (-p) flag together",
       ),
     );
 
@@ -2148,180 +1933,172 @@ describe('parseArguments with positional prompt', () => {
     debugErrorSpy.mockRestore();
   });
 
-  it('should correctly parse a positional prompt to query field', async () => {
-    process.argv = ['node', 'script.js', 'positional', 'prompt'];
+  it("should correctly parse a positional prompt to query field", async () => {
+    process.argv = ["node", "script.js", "positional", "prompt"];
     const argv = await parseArguments({} as Settings);
-    expect(argv.query).toBe('positional prompt');
+    expect(argv.query).toBe("positional prompt");
     // Since no explicit prompt flags are set and query doesn't start with @, should map to prompt (one-shot)
-    expect(argv.prompt).toBe('positional prompt');
+    expect(argv.prompt).toBe("positional prompt");
     expect(argv.promptInteractive).toBeUndefined();
   });
 
-  it('should have correct positional argument description', async () => {
+  it("should have correct positional argument description", async () => {
     // Test that the positional argument has the expected description
-    const yargsInstance = await import('./config.js');
+    const yargsInstance = await import("./config.js");
     // This test verifies that the positional 'query' argument is properly configured
     // with the description: "Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive."
-    process.argv = ['node', 'script.js', 'test', 'query'];
+    process.argv = ["node", "script.js", "test", "query"];
     const argv = await yargsInstance.parseArguments({} as Settings);
-    expect(argv.query).toBe('test query');
+    expect(argv.query).toBe("test query");
   });
 
-  it('should correctly parse a prompt from the --prompt flag', async () => {
-    process.argv = ['node', 'script.js', '--prompt', 'test prompt'];
+  it("should correctly parse a prompt from the --prompt flag", async () => {
+    process.argv = ["node", "script.js", "--prompt", "test prompt"];
     const argv = await parseArguments({} as Settings);
-    expect(argv.prompt).toBe('test prompt');
+    expect(argv.prompt).toBe("test prompt");
   });
 });
 
-describe('Telemetry configuration via environment variables', () => {
+describe("Telemetry configuration via environment variables", () => {
   beforeEach(() => {
-    vi.spyOn(ExtensionManager.prototype, 'getExtensions').mockReturnValue([]);
+    vi.spyOn(ExtensionManager.prototype, "getExtensions").mockReturnValue([]);
   });
   afterEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should prioritize GEMINI_TELEMETRY_ENABLED over settings', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_ENABLED', 'true');
-    process.argv = ['node', 'script.js'];
+  it("should prioritize GEMINI_TELEMETRY_ENABLED over settings", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_ENABLED", "true");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = { telemetry: { enabled: false } };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getTelemetryEnabled()).toBe(true);
   });
 
-  it('should prioritize GEMINI_TELEMETRY_TARGET over settings', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'gcp');
-    process.argv = ['node', 'script.js'];
+  it("should prioritize GEMINI_TELEMETRY_TARGET over settings", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_TARGET", "gcp");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       telemetry: { target: ServerConfig.TelemetryTarget.LOCAL },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getTelemetryTarget()).toBe('gcp');
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getTelemetryTarget()).toBe("gcp");
   });
 
-  it('should throw when GEMINI_TELEMETRY_TARGET is invalid', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_TARGET', 'bogus');
-    process.argv = ['node', 'script.js'];
+  it("should throw when GEMINI_TELEMETRY_TARGET is invalid", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_TARGET", "bogus");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       telemetry: { target: ServerConfig.TelemetryTarget.GCP },
     };
-    await expect(loadCliConfig(settings, 'test-session', argv)).rejects.toThrow(
+    await expect(loadCliConfig(settings, "test-session", argv)).rejects.toThrow(
       /Invalid telemetry configuration: .*Invalid telemetry target/i,
     );
     vi.unstubAllEnvs();
   });
 
-  it('should prioritize GEMINI_TELEMETRY_OTLP_ENDPOINT over settings and default env var', async () => {
-    vi.stubEnv('OTEL_EXPORTER_OTLP_ENDPOINT', 'http://default.env.com');
-    vi.stubEnv('GEMINI_TELEMETRY_OTLP_ENDPOINT', 'http://gemini.env.com');
-    process.argv = ['node', 'script.js'];
+  it("should prioritize GEMINI_TELEMETRY_OTLP_ENDPOINT over settings and default env var", async () => {
+    vi.stubEnv("OTEL_EXPORTER_OTLP_ENDPOINT", "http://default.env.com");
+    vi.stubEnv("GEMINI_TELEMETRY_OTLP_ENDPOINT", "http://gemini.env.com");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
-      telemetry: { otlpEndpoint: 'http://settings.com' },
+      telemetry: { otlpEndpoint: "http://settings.com" },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getTelemetryOtlpEndpoint()).toBe('http://gemini.env.com');
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getTelemetryOtlpEndpoint()).toBe("http://gemini.env.com");
   });
 
-  it('should prioritize GEMINI_TELEMETRY_OTLP_PROTOCOL over settings', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_OTLP_PROTOCOL', 'http');
-    process.argv = ['node', 'script.js'];
+  it("should prioritize GEMINI_TELEMETRY_OTLP_PROTOCOL over settings", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_OTLP_PROTOCOL", "http");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const settings: Settings = { telemetry: { otlpProtocol: 'grpc' } };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getTelemetryOtlpProtocol()).toBe('http');
+    const settings: Settings = { telemetry: { otlpProtocol: "grpc" } };
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getTelemetryOtlpProtocol()).toBe("http");
   });
 
-  it('should prioritize GEMINI_TELEMETRY_LOG_PROMPTS over settings', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_LOG_PROMPTS', 'false');
-    process.argv = ['node', 'script.js'];
+  it("should prioritize GEMINI_TELEMETRY_LOG_PROMPTS over settings", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_LOG_PROMPTS", "false");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = { telemetry: { logPrompts: true } };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getTelemetryLogPromptsEnabled()).toBe(false);
   });
 
-  it('should prioritize GEMINI_TELEMETRY_OUTFILE over settings', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_OUTFILE', '/gemini/env/telemetry.log');
-    process.argv = ['node', 'script.js'];
+  it("should prioritize GEMINI_TELEMETRY_OUTFILE over settings", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_OUTFILE", "/gemini/env/telemetry.log");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
-      telemetry: { outfile: '/settings/telemetry.log' },
+      telemetry: { outfile: "/settings/telemetry.log" },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getTelemetryOutfile()).toBe('/gemini/env/telemetry.log');
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getTelemetryOutfile()).toBe("/gemini/env/telemetry.log");
   });
 
-  it('should prioritize GEMINI_TELEMETRY_USE_COLLECTOR over settings', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_USE_COLLECTOR', 'true');
-    process.argv = ['node', 'script.js'];
+  it("should prioritize GEMINI_TELEMETRY_USE_COLLECTOR over settings", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_USE_COLLECTOR", "true");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = { telemetry: { useCollector: false } };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getTelemetryUseCollector()).toBe(true);
   });
 
-  it('should use settings value when GEMINI_TELEMETRY_ENABLED is not set', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_ENABLED', undefined);
-    process.argv = ['node', 'script.js'];
+  it("should use settings value when GEMINI_TELEMETRY_ENABLED is not set", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_ENABLED", undefined);
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = { telemetry: { enabled: true } };
-    const config = await loadCliConfig(settings, 'test-session', argv);
+    const config = await loadCliConfig(settings, "test-session", argv);
     expect(config.getTelemetryEnabled()).toBe(true);
   });
 
-  it('should use settings value when GEMINI_TELEMETRY_TARGET is not set', async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_TARGET', undefined);
-    process.argv = ['node', 'script.js'];
+  it("should use settings value when GEMINI_TELEMETRY_TARGET is not set", async () => {
+    vi.stubEnv("GEMINI_TELEMETRY_TARGET", undefined);
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
     const settings: Settings = {
       telemetry: { target: ServerConfig.TelemetryTarget.LOCAL },
     };
-    const config = await loadCliConfig(settings, 'test-session', argv);
-    expect(config.getTelemetryTarget()).toBe('local');
+    const config = await loadCliConfig(settings, "test-session", argv);
+    expect(config.getTelemetryTarget()).toBe("local");
   });
 
   it("should treat GEMINI_TELEMETRY_ENABLED='1' as true", async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_ENABLED', '1');
-    process.argv = ['node', 'script.js'];
+    vi.stubEnv("GEMINI_TELEMETRY_ENABLED", "1");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getTelemetryEnabled()).toBe(true);
   });
 
   it("should treat GEMINI_TELEMETRY_ENABLED='0' as false", async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_ENABLED', '0');
-    process.argv = ['node', 'script.js'];
+    vi.stubEnv("GEMINI_TELEMETRY_ENABLED", "0");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(
-      { telemetry: { enabled: true } },
-      'test-session',
-      argv,
-    );
+    const config = await loadCliConfig({ telemetry: { enabled: true } }, "test-session", argv);
     expect(config.getTelemetryEnabled()).toBe(false);
   });
 
   it("should treat GEMINI_TELEMETRY_LOG_PROMPTS='1' as true", async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_LOG_PROMPTS', '1');
-    process.argv = ['node', 'script.js'];
+    vi.stubEnv("GEMINI_TELEMETRY_LOG_PROMPTS", "1");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig({}, 'test-session', argv);
+    const config = await loadCliConfig({}, "test-session", argv);
     expect(config.getTelemetryLogPromptsEnabled()).toBe(true);
   });
 
   it("should treat GEMINI_TELEMETRY_LOG_PROMPTS='false' as false", async () => {
-    vi.stubEnv('GEMINI_TELEMETRY_LOG_PROMPTS', 'false');
-    process.argv = ['node', 'script.js'];
+    vi.stubEnv("GEMINI_TELEMETRY_LOG_PROMPTS", "false");
+    process.argv = ["node", "script.js"];
     const argv = await parseArguments({} as Settings);
-    const config = await loadCliConfig(
-      { telemetry: { logPrompts: true } },
-      'test-session',
-      argv,
-    );
+    const config = await loadCliConfig({ telemetry: { logPrompts: true } }, "test-session", argv);
     expect(config.getTelemetryLogPromptsEnabled()).toBe(false);
   });
 });
diff --git a/packages/ui-gemini/src/config/config.ts b/packages/ui-gemini/src/config/config.ts
index 537eebb4b..409fb9f5b 100755
--- a/packages/ui-gemini/src/config/config.ts
+++ b/packages/ui-gemini/src/config/config.ts
@@ -4,50 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import yargs from 'yargs/yargs';
-import { hideBin } from 'yargs/helpers';
-import process from 'node:process';
-import { mcpCommand } from '../commands/mcp.js';
-import type { OutputFormat } from '@airiscode/gemini-cli-core';
-import { extensionsCommand } from '../commands/extensions.js';
-import { hooksCommand } from '../commands/hooks.js';
+import process from "node:process";
+import type { EventEmitter } from "node:stream";
+import type { ExtensionEvents, OutputFormat } from "@airiscode/gemini-cli-core";
 import {
-  Config,
-  setGeminiMdFilename as setServerGeminiMdFilename,
-  getCurrentGeminiMdFilename,
   ApprovalMode,
-  DEFAULT_GEMINI_MODEL_AUTO,
-  DEFAULT_GEMINI_EMBEDDING_MODEL,
+  Config,
   DEFAULT_FILE_FILTERING_OPTIONS,
+  DEFAULT_GEMINI_EMBEDDING_MODEL,
+  DEFAULT_GEMINI_MODEL_AUTO,
   DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-  FileDiscoveryService,
-  WRITE_FILE_TOOL_NAME,
-  SHELL_TOOL_NAMES,
-  SHELL_TOOL_NAME,
-  resolveTelemetrySettings,
+  debugLogger,
+  EDIT_TOOL_NAME,
   FatalConfigError,
+  FileDiscoveryService,
+  getCurrentGeminiMdFilename,
   getPty,
-  EDIT_TOOL_NAME,
-  debugLogger,
+  getVersion,
   loadServerHierarchicalMemory,
+  resolveTelemetrySettings,
+  SHELL_TOOL_NAME,
+  SHELL_TOOL_NAMES,
+  setGeminiMdFilename as setServerGeminiMdFilename,
   WEB_FETCH_TOOL_NAME,
-  getVersion,
-} from '@airiscode/gemini-cli-core';
-import type { Settings } from './settings.js';
-
-import { loadSandboxConfig } from './sandboxConfig.js';
-import { resolvePath } from '../utils/resolvePath.js';
-import { appEvents } from '../utils/events.js';
-import { RESUME_LATEST } from '../utils/sessionUtils.js';
-
-import { isWorkspaceTrusted } from './trustedFolders.js';
-import { createPolicyEngineConfig } from './policy.js';
-import { ExtensionManager } from './extension-manager.js';
-import type { ExtensionEvents } from '@airiscode/gemini-cli-core';
-import { requestConsentNonInteractive } from './extensions/consent.js';
-import { promptForSetting } from './extensions/extensionSettings.js';
-import type { EventEmitter } from 'node:stream';
-import { runExitCleanup } from '../utils/cleanup.js';
+  WRITE_FILE_TOOL_NAME,
+} from "@airiscode/gemini-cli-core";
+import { hideBin } from "yargs/helpers";
+import yargs from "yargs/yargs";
+import { extensionsCommand } from "../commands/extensions.js";
+import { hooksCommand } from "../commands/hooks.js";
+import { mcpCommand } from "../commands/mcp.js";
+import { runExitCleanup } from "../utils/cleanup.js";
+import { appEvents } from "../utils/events.js";
+import { resolvePath } from "../utils/resolvePath.js";
+import { RESUME_LATEST } from "../utils/sessionUtils.js";
+import { ExtensionManager } from "./extension-manager.js";
+import { requestConsentNonInteractive } from "./extensions/consent.js";
+import { promptForSetting } from "./extensions/extensionSettings.js";
+import { createPolicyEngineConfig } from "./policy.js";
+import { loadSandboxConfig } from "./sandboxConfig.js";
+import type { Settings } from "./settings.js";
+import { isWorkspaceTrusted } from "./trustedFolders.js";
 
 export interface CliArgs {
   query: string | undefined;
@@ -79,108 +76,104 @@ export interface CliArgs {
 export async function parseArguments(settings: Settings): Promise<CliArgs> {
   const rawArgv = hideBin(process.argv);
   const yargsInstance = yargs(rawArgv)
-    .locale('en')
-    .scriptName('gemini')
+    .locale("en")
+    .scriptName("gemini")
     .usage(
-      'Usage: gemini [options] [command]\n\nGemini CLI - Launch an interactive CLI, use -p/--prompt for non-interactive mode',
+      "Usage: gemini [options] [command]\n\nGemini CLI - Launch an interactive CLI, use -p/--prompt for non-interactive mode",
     )
 
-    .option('debug', {
-      alias: 'd',
-      type: 'boolean',
-      description: 'Run in debug mode?',
+    .option("debug", {
+      alias: "d",
+      type: "boolean",
+      description: "Run in debug mode?",
       default: false,
     })
-    .command('$0 [query..]', 'Launch Gemini CLI', (yargsInstance) =>
+    .command("$0 [query..]", "Launch Gemini CLI", (yargsInstance) =>
       yargsInstance
-        .positional('query', {
+        .positional("query", {
           description:
-            'Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive.',
+            "Positional prompt. Defaults to one-shot; use -i/--prompt-interactive for interactive.",
         })
-        .option('model', {
-          alias: 'm',
-          type: 'string',
+        .option("model", {
+          alias: "m",
+          type: "string",
           nargs: 1,
           description: `Model`,
         })
-        .option('prompt', {
-          alias: 'p',
-          type: 'string',
+        .option("prompt", {
+          alias: "p",
+          type: "string",
           nargs: 1,
-          description: 'Prompt. Appended to input on stdin (if any).',
+          description: "Prompt. Appended to input on stdin (if any).",
         })
-        .option('prompt-interactive', {
-          alias: 'i',
-          type: 'string',
+        .option("prompt-interactive", {
+          alias: "i",
+          type: "string",
           nargs: 1,
-          description:
-            'Execute the provided prompt and continue in interactive mode',
+          description: "Execute the provided prompt and continue in interactive mode",
         })
-        .option('sandbox', {
-          alias: 's',
-          type: 'boolean',
-          description: 'Run in sandbox?',
+        .option("sandbox", {
+          alias: "s",
+          type: "boolean",
+          description: "Run in sandbox?",
         })
 
-        .option('yolo', {
-          alias: 'y',
-          type: 'boolean',
+        .option("yolo", {
+          alias: "y",
+          type: "boolean",
           description:
-            'Automatically accept all actions (aka YOLO mode, see https://www.youtube.com/watch?v=xvFZjo5PgG0 for more details)?',
+            "Automatically accept all actions (aka YOLO mode, see https://www.youtube.com/watch?v=xvFZjo5PgG0 for more details)?",
           default: false,
         })
-        .option('approval-mode', {
-          type: 'string',
+        .option("approval-mode", {
+          type: "string",
           nargs: 1,
-          choices: ['default', 'auto_edit', 'yolo'],
+          choices: ["default", "auto_edit", "yolo"],
           description:
-            'Set the approval mode: default (prompt for approval), auto_edit (auto-approve edit tools), yolo (auto-approve all tools)',
+            "Set the approval mode: default (prompt for approval), auto_edit (auto-approve edit tools), yolo (auto-approve all tools)",
         })
-        .option('experimental-acp', {
-          type: 'boolean',
-          description: 'Starts the agent in ACP mode',
+        .option("experimental-acp", {
+          type: "boolean",
+          description: "Starts the agent in ACP mode",
         })
-        .option('allowed-mcp-server-names', {
-          type: 'array',
+        .option("allowed-mcp-server-names", {
+          type: "array",
           string: true,
           nargs: 1,
-          description: 'Allowed MCP server names',
+          description: "Allowed MCP server names",
           coerce: (mcpServerNames: string[]) =>
             // Handle comma-separated values
             mcpServerNames.flatMap((mcpServerName) =>
-              mcpServerName.split(',').map((m) => m.trim()),
+              mcpServerName.split(",").map((m) => m.trim()),
             ),
         })
-        .option('allowed-tools', {
-          type: 'array',
+        .option("allowed-tools", {
+          type: "array",
           string: true,
           nargs: 1,
-          description: 'Tools that are allowed to run without confirmation',
+          description: "Tools that are allowed to run without confirmation",
           coerce: (tools: string[]) =>
             // Handle comma-separated values
-            tools.flatMap((tool) => tool.split(',').map((t) => t.trim())),
+            tools.flatMap((tool) => tool.split(",").map((t) => t.trim())),
         })
-        .option('extensions', {
-          alias: 'e',
-          type: 'array',
+        .option("extensions", {
+          alias: "e",
+          type: "array",
           string: true,
           nargs: 1,
-          description:
-            'A list of extensions to use. If not provided, all extensions are used.',
+          description: "A list of extensions to use. If not provided, all extensions are used.",
           coerce: (extensions: string[]) =>
             // Handle comma-separated values
-            extensions.flatMap((extension) =>
-              extension.split(',').map((e) => e.trim()),
-            ),
+            extensions.flatMap((extension) => extension.split(",").map((e) => e.trim())),
         })
-        .option('list-extensions', {
-          alias: 'l',
-          type: 'boolean',
-          description: 'List all available extensions and exit.',
+        .option("list-extensions", {
+          alias: "l",
+          type: "boolean",
+          description: "List all available extensions and exit.",
         })
-        .option('resume', {
-          alias: 'r',
-          type: 'string',
+        .option("resume", {
+          alias: "r",
+          type: "string",
           // `skipValidation` so that we can distinguish between it being passed with a value, without
           // one, and not being passed at all.
           skipValidation: true,
@@ -191,56 +184,55 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
             // When --resume passed without a value (`gemini --resume`): value = "" (string)
             // When --resume not passed at all: this `coerce` function is not called at all, and
             //   `yargsInstance.argv.resume` is undefined.
-            if (value === '') {
+            if (value === "") {
               return RESUME_LATEST;
             }
             return value;
           },
         })
-        .option('list-sessions', {
-          type: 'boolean',
-          description:
-            'List available sessions for the current project and exit.',
+        .option("list-sessions", {
+          type: "boolean",
+          description: "List available sessions for the current project and exit.",
         })
-        .option('delete-session', {
-          type: 'string',
+        .option("delete-session", {
+          type: "string",
           description:
-            'Delete a session by index number (use --list-sessions to see available sessions).',
+            "Delete a session by index number (use --list-sessions to see available sessions).",
         })
-        .option('include-directories', {
-          type: 'array',
+        .option("include-directories", {
+          type: "array",
           string: true,
           nargs: 1,
           description:
-            'Additional directories to include in the workspace (comma-separated or multiple --include-directories)',
+            "Additional directories to include in the workspace (comma-separated or multiple --include-directories)",
           coerce: (dirs: string[]) =>
             // Handle comma-separated values
-            dirs.flatMap((dir) => dir.split(',').map((d) => d.trim())),
+            dirs.flatMap((dir) => dir.split(",").map((d) => d.trim())),
         })
-        .option('screen-reader', {
-          type: 'boolean',
-          description: 'Enable screen reader mode for accessibility.',
+        .option("screen-reader", {
+          type: "boolean",
+          description: "Enable screen reader mode for accessibility.",
         })
-        .option('output-format', {
-          alias: 'o',
-          type: 'string',
+        .option("output-format", {
+          alias: "o",
+          type: "string",
           nargs: 1,
-          description: 'The format of the CLI output.',
-          choices: ['text', 'json', 'stream-json'],
+          description: "The format of the CLI output.",
+          choices: ["text", "json", "stream-json"],
         })
-        .option('fake-responses', {
-          type: 'string',
-          description: 'Path to a file with fake model responses for testing.',
+        .option("fake-responses", {
+          type: "string",
+          description: "Path to a file with fake model responses for testing.",
           hidden: true,
         })
-        .option('record-responses', {
-          type: 'string',
-          description: 'Path to a file to record model responses for testing.',
+        .option("record-responses", {
+          type: "string",
+          description: "Path to a file to record model responses for testing.",
           hidden: true,
         })
         .deprecateOption(
-          'prompt',
-          'Use the positional prompt instead. This flag will be removed in a future version.',
+          "prompt",
+          "Use the positional prompt instead. This flag will be removed in a future version.",
         ),
     )
     // Register MCP subcommands
@@ -253,27 +245,23 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
     .check((argv) => {
       // The 'query' positional can be a string (for one arg) or string[] (for multiple).
       // This guard safely checks if any positional argument was provided.
-      const query = argv['query'] as string | string[] | undefined;
-      const hasPositionalQuery = Array.isArray(query)
-        ? query.length > 0
-        : !!query;
+      const query = argv["query"] as string | string[] | undefined;
+      const hasPositionalQuery = Array.isArray(query) ? query.length > 0 : !!query;
 
-      if (argv['prompt'] && hasPositionalQuery) {
-        return 'Cannot use both a positional prompt and the --prompt (-p) flag together';
+      if (argv["prompt"] && hasPositionalQuery) {
+        return "Cannot use both a positional prompt and the --prompt (-p) flag together";
       }
-      if (argv['prompt'] && argv['promptInteractive']) {
-        return 'Cannot use both --prompt (-p) and --prompt-interactive (-i) together';
+      if (argv["prompt"] && argv["promptInteractive"]) {
+        return "Cannot use both --prompt (-p) and --prompt-interactive (-i) together";
       }
-      if (argv['yolo'] && argv['approvalMode']) {
-        return 'Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.';
+      if (argv["yolo"] && argv["approvalMode"]) {
+        return "Cannot use both --yolo (-y) and --approval-mode together. Use --approval-mode=yolo instead.";
       }
       if (
-        argv['outputFormat'] &&
-        !['text', 'json', 'stream-json'].includes(
-          argv['outputFormat'] as string,
-        )
+        argv["outputFormat"] &&
+        !["text", "json", "stream-json"].includes(argv["outputFormat"] as string)
       ) {
-        return `Invalid values:\n  Argument: output-format, Given: "${argv['outputFormat']}", Choices: "text", "json", "stream-json"`;
+        return `Invalid values:\n  Argument: output-format, Given: "${argv["outputFormat"]}", Choices: "text", "json", "stream-json"`;
       }
       return true;
     });
@@ -289,9 +277,9 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
 
   yargsInstance
     .version(await getVersion()) // This will enable the --version flag based on package.json
-    .alias('v', 'version')
+    .alias("v", "version")
     .help()
-    .alias('h', 'help')
+    .alias("h", "help")
     .strict()
     .demandCommand(0, 0) // Allow base command to run with no subcommands
     .exitProcess(false);
@@ -309,30 +297,28 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
   }
 
   // Handle help and version flags manually since we disabled exitProcess
-  if (result['help'] || result['version']) {
+  if (result["help"] || result["version"]) {
     await runExitCleanup();
     process.exit(0);
   }
 
   // Normalize query args: handle both quoted "@path file" and unquoted @path file
   const queryArg = (result as { query?: string | string[] | undefined }).query;
-  const q: string | undefined = Array.isArray(queryArg)
-    ? queryArg.join(' ')
-    : queryArg;
+  const q: string | undefined = Array.isArray(queryArg) ? queryArg.join(" ") : queryArg;
 
   // Route positional args: explicit -i flag -> interactive; else -> one-shot (even for @commands)
-  if (q && !result['prompt']) {
+  if (q && !result["prompt"]) {
     const hasExplicitInteractive =
-      result['promptInteractive'] === '' || !!result['promptInteractive'];
+      result["promptInteractive"] === "" || !!result["promptInteractive"];
     if (hasExplicitInteractive) {
-      result['promptInteractive'] = q;
+      result["promptInteractive"] = q;
     } else {
-      result['prompt'] = q;
+      result["prompt"] = q;
     }
   }
 
   // Keep CliArgs.query as a string for downstream typing
-  (result as Record<string, unknown>)['query'] = q || undefined;
+  (result as Record<string, unknown>)["query"] = q || undefined;
 
   // The import format is now only controlled by settings.memoryImportFormat
   // We no longer accept it as a CLI argument
@@ -354,10 +340,7 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
  * @param allowedToolsSet A set of explicitly allowed tool names for quick lookups.
  * @returns A function that takes a tool name and returns `true` if it should be excluded.
  */
-function createToolExclusionFilter(
-  allowedTools: string[],
-  allowedToolsSet: Set<string>,
-) {
+function createToolExclusionFilter(allowedTools: string[], allowedToolsSet: Set<string>) {
   return (tool: string): boolean => {
     if (tool === SHELL_TOOL_NAME) {
       // If any of the allowed tools is ShellTool (even with subcommands), don't exclude it.
@@ -372,9 +355,7 @@ function createToolExclusionFilter(
 export function isDebugMode(argv: CliArgs): boolean {
   return (
     argv.debug ||
-    [process.env['DEBUG'], process.env['DEBUG_MODE']].some(
-      (v) => v === 'true' || v === '1',
-    )
+    [process.env["DEBUG"], process.env["DEBUG_MODE"]].some((v) => v === "true" || v === "1")
   );
 }
 
@@ -387,10 +368,10 @@ export async function loadCliConfig(
   const debugMode = isDebugMode(argv);
 
   if (argv.sandbox) {
-    process.env['GEMINI_SANDBOX'] = 'true';
+    process.env["GEMINI_SANDBOX"] = "true";
   }
 
-  const memoryImportFormat = settings.context?.importFormat || 'tree';
+  const memoryImportFormat = settings.context?.importFormat || "tree";
 
   const ideMode = settings.ide?.enabled ?? false;
 
@@ -435,33 +416,32 @@ export async function loadCliConfig(
   await extensionManager.loadExtensions();
 
   // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
-  const { memoryContent, fileCount, filePaths } =
-    await loadServerHierarchicalMemory(
-      cwd,
-      [],
-      debugMode,
-      fileService,
-      extensionManager,
-      trustedFolder,
-      memoryImportFormat,
-      memoryFileFiltering,
-      settings.context?.discoveryMaxDirs,
-    );
+  const { memoryContent, fileCount, filePaths } = await loadServerHierarchicalMemory(
+    cwd,
+    [],
+    debugMode,
+    fileService,
+    extensionManager,
+    trustedFolder,
+    memoryImportFormat,
+    memoryFileFiltering,
+    settings.context?.discoveryMaxDirs,
+  );
 
-  const question = argv.promptInteractive || argv.prompt || '';
+  const question = argv.promptInteractive || argv.prompt || "";
 
   // Determine approval mode with backward compatibility
   let approvalMode: ApprovalMode;
   if (argv.approvalMode) {
     // New --approval-mode flag takes precedence
     switch (argv.approvalMode) {
-      case 'yolo':
+      case "yolo":
         approvalMode = ApprovalMode.YOLO;
         break;
-      case 'auto_edit':
+      case "auto_edit":
         approvalMode = ApprovalMode.AUTO_EDIT;
         break;
-      case 'default':
+      case "default":
         approvalMode = ApprovalMode.DEFAULT;
         break;
       default:
@@ -471,23 +451,18 @@ export async function loadCliConfig(
     }
   } else {
     // Fallback to legacy --yolo flag behavior
-    approvalMode =
-      argv.yolo || false ? ApprovalMode.YOLO : ApprovalMode.DEFAULT;
+    approvalMode = argv.yolo || false ? ApprovalMode.YOLO : ApprovalMode.DEFAULT;
   }
 
   // Override approval mode if disableYoloMode is set.
   if (settings.security?.disableYoloMode) {
     if (approvalMode === ApprovalMode.YOLO) {
       debugLogger.error('YOLO mode is disabled by the "disableYolo" setting.');
-      throw new FatalConfigError(
-        'Cannot start in YOLO mode when it is disabled by settings',
-      );
+      throw new FatalConfigError("Cannot start in YOLO mode when it is disabled by settings");
     }
     approvalMode = ApprovalMode.DEFAULT;
   } else if (approvalMode === ApprovalMode.YOLO) {
-    debugLogger.warn(
-      'YOLO mode is enabled. All tool calls will be automatically approved.',
-    );
+    debugLogger.warn("YOLO mode is enabled. All tool calls will be automatically approved.");
   }
 
   // Force approval mode to default if the folder is not trusted.
@@ -506,20 +481,14 @@ export async function loadCliConfig(
     });
   } catch (err) {
     if (err instanceof FatalConfigError) {
-      throw new FatalConfigError(
-        `Invalid telemetry configuration: ${err.message}.`,
-      );
+      throw new FatalConfigError(`Invalid telemetry configuration: ${err.message}.`);
     }
     throw err;
   }
 
-  const policyEngineConfig = await createPolicyEngineConfig(
-    settings,
-    approvalMode,
-  );
+  const policyEngineConfig = await createPolicyEngineConfig(settings, approvalMode);
 
-  const enableMessageBusIntegration =
-    settings.tools?.enableMessageBusIntegration ?? true;
+  const enableMessageBusIntegration = settings.tools?.enableMessageBusIntegration ?? true;
 
   const allowedTools = argv.allowedTools || settings.tools?.allowed || [];
   const allowedToolsSet = new Set(allowedTools);
@@ -541,10 +510,7 @@ export async function loadCliConfig(
     ];
     const autoEditExcludes = [SHELL_TOOL_NAME];
 
-    const toolExclusionFilter = createToolExclusionFilter(
-      allowedTools,
-      allowedToolsSet,
-    );
+    const toolExclusionFilter = createToolExclusionFilter(allowedTools, allowedToolsSet);
 
     switch (approvalMode) {
       case ApprovalMode.DEFAULT:
@@ -571,10 +537,7 @@ export async function loadCliConfig(
 
   const defaultModel = DEFAULT_GEMINI_MODEL_AUTO;
   const resolvedModel: string =
-    argv.model ||
-    process.env['GEMINI_MODEL'] ||
-    settings.model?.name ||
-    defaultModel;
+    argv.model || process.env["GEMINI_MODEL"] || settings.model?.name || defaultModel;
 
   const sandboxConfig = await loadSandboxConfig(settings, argv);
   const screenReader =
@@ -590,8 +553,7 @@ export async function loadCliConfig(
     sandbox: sandboxConfig,
     targetDir: cwd,
     includeDirectories,
-    loadMemoryFromIncludeDirectories:
-      settings.context?.loadMemoryFromIncludeDirectories || false,
+    loadMemoryFromIncludeDirectories: settings.context?.loadMemoryFromIncludeDirectories || false,
     debugMode,
     question,
     previewFeatures: settings.general?.previewFeatures,
@@ -623,10 +585,10 @@ export async function loadCliConfig(
     fileFiltering,
     checkpointing: settings.general?.checkpointing?.enabled,
     proxy:
-      process.env['HTTPS_PROXY'] ||
-      process.env['https_proxy'] ||
-      process.env['HTTP_PROXY'] ||
-      process.env['http_proxy'],
+      process.env["HTTPS_PROXY"] ||
+      process.env["https_proxy"] ||
+      process.env["HTTP_PROXY"] ||
+      process.env["http_proxy"],
     cwd,
     fileDiscoveryService: fileService,
     bugCommand: settings.advanced?.bugCommand,
@@ -640,10 +602,9 @@ export async function loadCliConfig(
     extensionLoader: extensionManager,
     enableExtensionReloading: settings.experimental?.extensionReloading,
     enableAgents: settings.experimental?.enableAgents,
-    enableModelAvailabilityService:
-      settings.experimental?.isModelAvailabilityServiceEnabled,
+    enableModelAvailabilityService: settings.experimental?.isModelAvailabilityServiceEnabled,
     experimentalJitContext: settings.experimental?.jitContext,
-    noBrowser: !!process.env['NO_BROWSER'],
+    noBrowser: !!process.env["NO_BROWSER"],
     summarizeToolOutput: settings.model?.summarizeToolOutput,
     ideMode,
     compressionThreshold: settings.model?.compressionThreshold,
@@ -651,8 +612,7 @@ export async function loadCliConfig(
     interactive,
     trustedFolder,
     useRipgrep: settings.tools?.useRipgrep,
-    enableInteractiveShell:
-      settings.tools?.shell?.enableInteractiveShell ?? true,
+    enableInteractiveShell: settings.tools?.shell?.enableInteractiveShell ?? true,
     shellToolInactivityTimeout: settings.tools?.shell?.inactivityTimeout,
     skipNextSpeakerCheck: settings.model?.skipNextSpeakerCheck,
     enablePromptCompletion: settings.general?.enablePromptCompletion ?? false,
@@ -666,8 +626,7 @@ export async function loadCliConfig(
       format: (argv.outputFormat ?? settings.output?.format) as OutputFormat,
     },
     enableMessageBusIntegration,
-    codebaseInvestigatorSettings:
-      settings.experimental?.codebaseInvestigatorSettings,
+    codebaseInvestigatorSettings: settings.experimental?.codebaseInvestigatorSettings,
     fakeResponses: argv.fakeResponses,
     recordResponses: argv.recordResponses,
     retryFetchErrors: settings.general?.retryFetchErrors ?? false,
@@ -679,13 +638,7 @@ export async function loadCliConfig(
   });
 }
 
-function mergeExcludeTools(
-  settings: Settings,
-  extraExcludes?: string[] | undefined,
-): string[] {
-  const allExcludeTools = new Set([
-    ...(settings.tools?.exclude || []),
-    ...(extraExcludes || []),
-  ]);
+function mergeExcludeTools(settings: Settings, extraExcludes?: string[] | undefined): string[] {
+  const allExcludeTools = new Set([...(settings.tools?.exclude || []), ...(extraExcludes || [])]);
   return [...allExcludeTools];
 }
diff --git a/packages/ui-gemini/src/config/extension-manager.ts b/packages/ui-gemini/src/config/extension-manager.ts
index a3bb8251a..8c7b71248 100644
--- a/packages/ui-gemini/src/config/extension-manager.ts
+++ b/packages/ui-gemini/src/config/extension-manager.ts
@@ -4,61 +4,53 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import chalk from 'chalk';
-import { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
-import { type Settings, SettingScope } from './settings.js';
-import { createHash, randomUUID } from 'node:crypto';
-import { loadInstallMetadata, type ExtensionConfig } from './extension.js';
-import {
-  isWorkspaceTrusted,
-  loadTrustedFolders,
-  TrustLevel,
-} from './trustedFolders.js';
-import {
-  cloneFromGit,
-  downloadFromGitHubRelease,
-  tryParseGithubUrl,
-} from './extensions/github.js';
+import { createHash, randomUUID } from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import type { EventEmitter } from "node:stream";
 import {
   Config,
   debugLogger,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
+  type ExtensionEvents,
   ExtensionInstallEvent,
+  type ExtensionInstallMetadata,
   ExtensionLoader,
   ExtensionUninstallEvent,
   ExtensionUpdateEvent,
+  type GeminiCLIExtension,
   getErrorMessage,
+  type HookDefinition,
+  type HookEventName,
   logExtensionDisable,
   logExtensionEnable,
   logExtensionInstallEvent,
   logExtensionUninstall,
   logExtensionUpdateEvent,
-  type ExtensionEvents,
   type MCPServerConfig,
-  type ExtensionInstallMetadata,
-  type GeminiCLIExtension,
-  type HookDefinition,
-  type HookEventName,
-} from '@airiscode/gemini-cli-core';
-import { maybeRequestConsentOrFail } from './extensions/consent.js';
-import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
-import { ExtensionStorage } from './extensions/storage.js';
+} from "@airiscode/gemini-cli-core";
+import chalk from "chalk";
+import { resolveEnvVarsInObject } from "../utils/envVarResolver.js";
+import { type ExtensionConfig, loadInstallMetadata } from "./extension.js";
+import { maybeRequestConsentOrFail } from "./extensions/consent.js";
+import { ExtensionEnablementManager } from "./extensions/extensionEnablement.js";
+import {
+  type ExtensionSetting,
+  getEnvContents,
+  maybePromptForSettings,
+} from "./extensions/extensionSettings.js";
+import { cloneFromGit, downloadFromGitHubRelease, tryParseGithubUrl } from "./extensions/github.js";
+import { ExtensionStorage } from "./extensions/storage.js";
 import {
   EXTENSIONS_CONFIG_FILENAME,
   INSTALL_METADATA_FILENAME,
-  recursivelyHydrateStrings,
   type JsonObject,
-} from './extensions/variables.js';
-import {
-  getEnvContents,
-  maybePromptForSettings,
-  type ExtensionSetting,
-} from './extensions/extensionSettings.js';
-import type { EventEmitter } from 'node:stream';
+  recursivelyHydrateStrings,
+} from "./extensions/variables.js";
+import { SettingScope, type Settings } from "./settings.js";
+import { isWorkspaceTrusted, loadTrustedFolders, TrustLevel } from "./trustedFolders.js";
 
 interface ExtensionManagerParams {
   enabledExtensionOverrides?: string[];
@@ -78,9 +70,7 @@ export class ExtensionManager extends ExtensionLoader {
   private extensionEnablementManager: ExtensionEnablementManager;
   private settings: Settings;
   private requestConsent: (consent: string) => Promise<boolean>;
-  private requestSetting:
-    | ((setting: ExtensionSetting) => Promise<string>)
-    | undefined;
+  private requestSetting: ((setting: ExtensionSetting) => Promise<string>) | undefined;
   private telemetryConfig: Config;
   private workspaceDir: string;
   private loadedExtensions: GeminiCLIExtension[] | undefined;
@@ -98,30 +88,24 @@ export class ExtensionManager extends ExtensionLoader {
       sessionId: randomUUID(),
       targetDir: options.workspaceDir,
       cwd: options.workspaceDir,
-      model: '',
+      model: "",
       debugMode: false,
     });
     this.requestConsent = options.requestConsent;
     this.requestSetting = options.requestSetting ?? undefined;
   }
 
-  setRequestConsent(
-    requestConsent: (consent: string) => Promise<boolean>,
-  ): void {
+  setRequestConsent(requestConsent: (consent: string) => Promise<boolean>): void {
     this.requestConsent = requestConsent;
   }
 
-  setRequestSetting(
-    requestSetting?: (setting: ExtensionSetting) => Promise<string>,
-  ): void {
+  setRequestSetting(requestSetting?: (setting: ExtensionSetting) => Promise<string>): void {
     this.requestSetting = requestSetting;
   }
 
   getExtensions(): GeminiCLIExtension[] {
     if (!this.loadedExtensions) {
-      throw new Error(
-        'Extensions not yet loaded, must call `loadExtensions` first',
-      );
+      throw new Error("Extensions not yet loaded, must call `loadExtensions` first");
     }
     return this.loadedExtensions!;
   }
@@ -131,12 +115,11 @@ export class ExtensionManager extends ExtensionLoader {
     previousExtensionConfig?: ExtensionConfig,
   ): Promise<GeminiCLIExtension> {
     if (
-      (installMetadata.type === 'git' ||
-        installMetadata.type === 'github-release') &&
+      (installMetadata.type === "git" || installMetadata.type === "github-release") &&
       this.settings.security?.blockGitExtensions
     ) {
       throw new Error(
-        'Installing extensions from remote sources is disallowed by your current settings.',
+        "Installing extensions from remote sources is disallowed by your current settings.",
       );
     }
     const isUpdate = !!previousExtensionConfig;
@@ -163,25 +146,19 @@ export class ExtensionManager extends ExtensionLoader {
 
       if (
         !path.isAbsolute(installMetadata.source) &&
-        (installMetadata.type === 'local' || installMetadata.type === 'link')
+        (installMetadata.type === "local" || installMetadata.type === "link")
       ) {
-        installMetadata.source = path.resolve(
-          this.workspaceDir,
-          installMetadata.source,
-        );
+        installMetadata.source = path.resolve(this.workspaceDir, installMetadata.source);
       }
 
       let tempDir: string | undefined;
 
-      if (
-        installMetadata.type === 'git' ||
-        installMetadata.type === 'github-release'
-      ) {
+      if (installMetadata.type === "git" || installMetadata.type === "github-release") {
         tempDir = await ExtensionStorage.createTmpDir();
         const parsedGithubParts = tryParseGithubUrl(installMetadata.source);
         if (!parsedGithubParts) {
           await cloneFromGit(installMetadata, tempDir);
-          installMetadata.type = 'git';
+          installMetadata.type = "git";
         } else {
           const result = await downloadFromGitHubRelease(
             installMetadata,
@@ -194,15 +171,14 @@ export class ExtensionManager extends ExtensionLoader {
           } else if (
             // This repo has no github releases, and wasn't explicitly installed
             // from a github release, unconditionally just clone it.
-            (result.failureReason === 'no release data' &&
-              installMetadata.type === 'git') ||
+            (result.failureReason === "no release data" && installMetadata.type === "git") ||
             // Otherwise ask the user if they would like to try a git clone.
             (await this.requestConsent(
               `Error downloading github release for ${installMetadata.source} with the following error: ${result.errorMessage}.\n\nWould you like to attempt to install via "git clone" instead?`,
             ))
           ) {
             await cloneFromGit(installMetadata, tempDir);
-            installMetadata.type = 'git';
+            installMetadata.type = "git";
           } else {
             throw new Error(
               `Failed to install extension ${installMetadata.source}: ${result.errorMessage}`,
@@ -210,10 +186,7 @@ export class ExtensionManager extends ExtensionLoader {
           }
         }
         localSourcePath = tempDir;
-      } else if (
-        installMetadata.type === 'local' ||
-        installMetadata.type === 'link'
-      ) {
+      } else if (installMetadata.type === "local" || installMetadata.type === "link") {
         localSourcePath = installMetadata.source;
       } else {
         throw new Error(`Unsupported install type: ${installMetadata.type}`);
@@ -223,12 +196,8 @@ export class ExtensionManager extends ExtensionLoader {
         newExtensionConfig = this.loadExtensionConfig(localSourcePath);
 
         if (isUpdate && installMetadata.autoUpdate) {
-          const oldSettings = new Set(
-            previousExtensionConfig.settings?.map((s) => s.name) || [],
-          );
-          const newSettings = new Set(
-            newExtensionConfig.settings?.map((s) => s.name) || [],
-          );
+          const oldSettings = new Set(previousExtensionConfig.settings?.map((s) => s.name) || []);
+          const newSettings = new Set(newExtensionConfig.settings?.map((s) => s.name) || []);
 
           const settingsAreEqual =
             oldSettings.size === newSettings.size &&
@@ -255,9 +224,7 @@ export class ExtensionManager extends ExtensionLoader {
           );
         }
 
-        const newHasHooks = fs.existsSync(
-          path.join(localSourcePath, 'hooks', 'hooks.json'),
-        );
+        const newHasHooks = fs.existsSync(path.join(localSourcePath, "hooks", "hooks.json"));
         let previousHasHooks = false;
         if (isUpdate && previous && previous.hooks) {
           previousHasHooks = Object.keys(previous.hooks).length > 0;
@@ -271,15 +238,10 @@ export class ExtensionManager extends ExtensionLoader {
           previousHasHooks,
         );
         const extensionId = getExtensionId(newExtensionConfig, installMetadata);
-        const destinationPath = new ExtensionStorage(
-          newExtensionName,
-        ).getExtensionDir();
+        const destinationPath = new ExtensionStorage(newExtensionName).getExtensionDir();
         let previousSettings: Record<string, string> | undefined;
         if (isUpdate) {
-          previousSettings = await getEnvContents(
-            previousExtensionConfig,
-            extensionId,
-          );
+          previousSettings = await getEnvContents(previousExtensionConfig, extensionId);
           await this.uninstallExtension(newExtensionName, isUpdate);
         }
 
@@ -294,27 +256,20 @@ export class ExtensionManager extends ExtensionLoader {
               previousSettings,
             );
           } else {
-            await maybePromptForSettings(
-              newExtensionConfig,
-              extensionId,
-              this.requestSetting,
-            );
+            await maybePromptForSettings(newExtensionConfig, extensionId, this.requestSetting);
           }
         }
 
         if (
-          installMetadata.type === 'local' ||
-          installMetadata.type === 'git' ||
-          installMetadata.type === 'github-release'
+          installMetadata.type === "local" ||
+          installMetadata.type === "git" ||
+          installMetadata.type === "github-release"
         ) {
           await copyExtension(localSourcePath, destinationPath);
         }
 
         const metadataString = JSON.stringify(installMetadata, null, 2);
-        const metadataPath = path.join(
-          destinationPath,
-          INSTALL_METADATA_FILENAME,
-        );
+        const metadataPath = path.join(destinationPath, INSTALL_METADATA_FILENAME);
         await fs.promises.writeFile(metadataPath, metadataString);
 
         // TODO: Gracefully handle this call failing, we should back up the old
@@ -332,7 +287,7 @@ export class ExtensionManager extends ExtensionLoader {
               newExtensionConfig.version,
               previousExtensionConfig.version,
               installMetadata.type,
-              'success',
+              "success",
             ),
           );
         } else {
@@ -343,7 +298,7 @@ export class ExtensionManager extends ExtensionLoader {
               getExtensionId(newExtensionConfig, installMetadata),
               newExtensionConfig.version,
               installMetadata.type,
-              'success',
+              "success",
             ),
           );
           // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -366,30 +321,28 @@ export class ExtensionManager extends ExtensionLoader {
         }
       }
       const config = newExtensionConfig ?? previousExtensionConfig;
-      const extensionId = config
-        ? getExtensionId(config, installMetadata)
-        : undefined;
+      const extensionId = config ? getExtensionId(config, installMetadata) : undefined;
       if (isUpdate) {
         await logExtensionUpdateEvent(
           this.telemetryConfig,
           new ExtensionUpdateEvent(
-            hashValue(config?.name ?? ''),
-            extensionId ?? '',
-            newExtensionConfig?.version ?? '',
+            hashValue(config?.name ?? ""),
+            extensionId ?? "",
+            newExtensionConfig?.version ?? "",
             previousExtensionConfig.version,
             installMetadata.type,
-            'error',
+            "error",
           ),
         );
       } else {
         await logExtensionInstallEvent(
           this.telemetryConfig,
           new ExtensionInstallEvent(
-            hashValue(newExtensionConfig?.name ?? ''),
-            extensionId ?? '',
-            newExtensionConfig?.version ?? '',
+            hashValue(newExtensionConfig?.name ?? ""),
+            extensionId ?? "",
+            newExtensionConfig?.version ?? "",
             installMetadata.type,
-            'error',
+            "error",
           ),
         );
       }
@@ -397,25 +350,19 @@ export class ExtensionManager extends ExtensionLoader {
     }
   }
 
-  async uninstallExtension(
-    extensionIdentifier: string,
-    isUpdate: boolean,
-  ): Promise<void> {
+  async uninstallExtension(extensionIdentifier: string, isUpdate: boolean): Promise<void> {
     const installedExtensions = this.getExtensions();
     const extension = installedExtensions.find(
       (installed) =>
         installed.name.toLowerCase() === extensionIdentifier.toLowerCase() ||
-        installed.installMetadata?.source.toLowerCase() ===
-          extensionIdentifier.toLowerCase(),
+        installed.installMetadata?.source.toLowerCase() === extensionIdentifier.toLowerCase(),
     );
     if (!extension) {
       throw new Error(`Extension not found.`);
     }
     await this.unloadExtension(extension);
     const storage = new ExtensionStorage(
-      extension.installMetadata?.type === 'link'
-        ? extension.name
-        : path.basename(extension.path),
+      extension.installMetadata?.type === "link" ? extension.name : path.basename(extension.path),
     );
 
     await fs.promises.rm(storage.getExtensionDir(), {
@@ -431,11 +378,7 @@ export class ExtensionManager extends ExtensionLoader {
 
     await logExtensionUninstall(
       this.telemetryConfig,
-      new ExtensionUninstallEvent(
-        hashValue(extension.name),
-        extension.id,
-        'success',
-      ),
+      new ExtensionUninstallEvent(hashValue(extension.name), extension.id, "success"),
     );
   }
 
@@ -444,7 +387,7 @@ export class ExtensionManager extends ExtensionLoader {
    */
   async loadExtensions(): Promise<GeminiCLIExtension[]> {
     if (this.loadedExtensions) {
-      throw new Error('Extensions already loaded, only load extensions once.');
+      throw new Error("Extensions already loaded, only load extensions once.");
     }
     const extensionsDir = ExtensionStorage.getUserExtensionsDir();
     this.loadedExtensions = [];
@@ -461,9 +404,7 @@ export class ExtensionManager extends ExtensionLoader {
   /**
    * Adds `extension` to the list of extensions and starts it if appropriate.
    */
-  private async loadExtension(
-    extensionDir: string,
-  ): Promise<GeminiCLIExtension | null> {
+  private async loadExtension(extensionDir: string): Promise<GeminiCLIExtension | null> {
     this.loadedExtensions ??= [];
     if (!fs.statSync(extensionDir).isDirectory()) {
       return null;
@@ -472,46 +413,33 @@ export class ExtensionManager extends ExtensionLoader {
     const installMetadata = loadInstallMetadata(extensionDir);
     let effectiveExtensionPath = extensionDir;
     if (
-      (installMetadata?.type === 'git' ||
-        installMetadata?.type === 'github-release') &&
+      (installMetadata?.type === "git" || installMetadata?.type === "github-release") &&
       this.settings.security?.blockGitExtensions
     ) {
       return null;
     }
 
-    if (installMetadata?.type === 'link') {
+    if (installMetadata?.type === "link") {
       effectiveExtensionPath = installMetadata.source;
     }
 
     try {
       let config = this.loadExtensionConfig(effectiveExtensionPath);
-      if (
-        this.getExtensions().find((extension) => extension.name === config.name)
-      ) {
-        throw new Error(
-          `Extension with name ${config.name} already was loaded.`,
-        );
+      if (this.getExtensions().find((extension) => extension.name === config.name)) {
+        throw new Error(`Extension with name ${config.name} already was loaded.`);
       }
 
-      const customEnv = await getEnvContents(
-        config,
-        getExtensionId(config, installMetadata),
-      );
+      const customEnv = await getEnvContents(config, getExtensionId(config, installMetadata));
       config = resolveEnvVarsInObject(config, customEnv);
 
       if (config.mcpServers) {
         config.mcpServers = Object.fromEntries(
-          Object.entries(config.mcpServers).map(([key, value]) => [
-            key,
-            filterMcpConfig(value),
-          ]),
+          Object.entries(config.mcpServers).map(([key, value]) => [key, filterMcpConfig(value)]),
         );
       }
 
       const contextFiles = getContextFileNames(config)
-        .map((contextFileName) =>
-          path.join(effectiveExtensionPath, contextFileName),
-        )
+        .map((contextFileName) => path.join(effectiveExtensionPath, contextFileName))
         .filter((contextFilePath) => fs.existsSync(contextFilePath));
 
       let hooks: { [K in HookEventName]?: HookDefinition[] } | undefined;
@@ -531,10 +459,7 @@ export class ExtensionManager extends ExtensionLoader {
         mcpServers: config.mcpServers,
         excludeTools: config.excludeTools,
         hooks,
-        isActive: this.extensionEnablementManager.isEnabled(
-          config.name,
-          this.workspaceDir,
-        ),
+        isActive: this.extensionEnablementManager.isEnabled(config.name, this.workspaceDir),
         id: getExtensionId(config, installMetadata),
       };
       this.loadedExtensions = [...this.loadedExtensions, extension];
@@ -543,9 +468,7 @@ export class ExtensionManager extends ExtensionLoader {
       return extension;
     } catch (e) {
       debugLogger.error(
-        `Warning: Skipping extension in ${effectiveExtensionPath}: ${getErrorMessage(
-          e,
-        )}`,
+        `Warning: Skipping extension in ${effectiveExtensionPath}: ${getErrorMessage(e)}`,
       );
       return null;
     }
@@ -555,12 +478,8 @@ export class ExtensionManager extends ExtensionLoader {
    * Removes `extension` from the list of extensions and stops it if
    * appropriate.
    */
-  private unloadExtension(
-    extension: GeminiCLIExtension,
-  ): Promise<void> | undefined {
-    this.loadedExtensions = this.getExtensions().filter(
-      (entry) => extension !== entry,
-    );
+  private unloadExtension(extension: GeminiCLIExtension): Promise<void> | undefined {
+    this.loadedExtensions = this.getExtensions().filter((entry) => extension !== entry);
     return this.maybeStopExtension(extension);
   }
 
@@ -570,30 +489,25 @@ export class ExtensionManager extends ExtensionLoader {
       throw new Error(`Configuration file not found at ${configFilePath}`);
     }
     try {
-      const configContent = fs.readFileSync(configFilePath, 'utf-8');
+      const configContent = fs.readFileSync(configFilePath, "utf-8");
       const rawConfig = JSON.parse(configContent) as ExtensionConfig;
       if (!rawConfig.name || !rawConfig.version) {
         throw new Error(
           `Invalid configuration in ${configFilePath}: missing ${!rawConfig.name ? '"name"' : '"version"'}`,
         );
       }
-      const config = recursivelyHydrateStrings(
-        rawConfig as unknown as JsonObject,
-        {
-          extensionPath: extensionDir,
-          workspacePath: this.workspaceDir,
-          '/': path.sep,
-          pathSeparator: path.sep,
-        },
-      ) as unknown as ExtensionConfig;
+      const config = recursivelyHydrateStrings(rawConfig as unknown as JsonObject, {
+        extensionPath: extensionDir,
+        workspacePath: this.workspaceDir,
+        "/": path.sep,
+        pathSeparator: path.sep,
+      }) as unknown as ExtensionConfig;
 
       validateName(config.name);
       return config;
     } catch (e) {
       throw new Error(
-        `Failed to load extension config from ${configFilePath}: ${getErrorMessage(
-          e,
-        )}`,
+        `Failed to load extension config from ${configFilePath}: ${getErrorMessage(e)}`,
       );
     }
   }
@@ -602,16 +516,16 @@ export class ExtensionManager extends ExtensionLoader {
     extensionDir: string,
     context: { extensionPath: string; workspacePath: string },
   ): Promise<{ [K in HookEventName]?: HookDefinition[] } | undefined> {
-    const hooksFilePath = path.join(extensionDir, 'hooks', 'hooks.json');
+    const hooksFilePath = path.join(extensionDir, "hooks", "hooks.json");
 
     try {
-      const hooksContent = await fs.promises.readFile(hooksFilePath, 'utf-8');
+      const hooksContent = await fs.promises.readFile(hooksFilePath, "utf-8");
       const rawHooks = JSON.parse(hooksContent);
 
       if (
         !rawHooks ||
-        typeof rawHooks !== 'object' ||
-        typeof rawHooks.hooks !== 'object' ||
+        typeof rawHooks !== "object" ||
+        typeof rawHooks.hooks !== "object" ||
         rawHooks.hooks === null ||
         Array.isArray(rawHooks.hooks)
       ) {
@@ -622,40 +536,32 @@ export class ExtensionManager extends ExtensionLoader {
       }
 
       // Hydrate variables in the hooks configuration
-      const hydratedHooks = recursivelyHydrateStrings(
-        rawHooks.hooks as unknown as JsonObject,
-        {
-          ...context,
-          '/': path.sep,
-          pathSeparator: path.sep,
-        },
-      ) as { [K in HookEventName]?: HookDefinition[] };
+      const hydratedHooks = recursivelyHydrateStrings(rawHooks.hooks as unknown as JsonObject, {
+        ...context,
+        "/": path.sep,
+        pathSeparator: path.sep,
+      }) as { [K in HookEventName]?: HookDefinition[] };
 
       return hydratedHooks;
     } catch (e) {
-      if ((e as NodeJS.ErrnoException).code === 'ENOENT') {
+      if ((e as NodeJS.ErrnoException).code === "ENOENT") {
         return undefined; // File not found is not an error here.
       }
       debugLogger.warn(
-        `Failed to load extension hooks from ${hooksFilePath}: ${getErrorMessage(
-          e,
-        )}`,
+        `Failed to load extension hooks from ${hooksFilePath}: ${getErrorMessage(e)}`,
       );
       return undefined;
     }
   }
 
   toOutputString(extension: GeminiCLIExtension): string {
-    const userEnabled = this.extensionEnablementManager.isEnabled(
-      extension.name,
-      os.homedir(),
-    );
+    const userEnabled = this.extensionEnablementManager.isEnabled(extension.name, os.homedir());
     const workspaceEnabled = this.extensionEnablementManager.isEnabled(
       extension.name,
       this.workspaceDir,
     );
 
-    const status = workspaceEnabled ? chalk.green('✓') : chalk.red('✗');
+    const status = workspaceEnabled ? chalk.green("✓") : chalk.red("✗");
     let output = `${status} ${extension.name} (${extension.version})`;
     output += `\n ID: ${extension.id}`;
     output += `\n name: ${hashValue(extension.name)}`;
@@ -694,22 +600,16 @@ export class ExtensionManager extends ExtensionLoader {
   }
 
   async disableExtension(name: string, scope: SettingScope) {
-    if (
-      scope === SettingScope.System ||
-      scope === SettingScope.SystemDefaults
-    ) {
-      throw new Error('System and SystemDefaults scopes are not supported.');
+    if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) {
+      throw new Error("System and SystemDefaults scopes are not supported.");
     }
-    const extension = this.getExtensions().find(
-      (extension) => extension.name === name,
-    );
+    const extension = this.getExtensions().find((extension) => extension.name === name);
     if (!extension) {
       throw new Error(`Extension with name ${name} does not exist.`);
     }
 
     if (scope !== SettingScope.Session) {
-      const scopePath =
-        scope === SettingScope.Workspace ? this.workspaceDir : os.homedir();
+      const scopePath = scope === SettingScope.Workspace ? this.workspaceDir : os.homedir();
       this.extensionEnablementManager.disable(name, true, scopePath);
     }
     await logExtensionDisable(
@@ -729,22 +629,16 @@ export class ExtensionManager extends ExtensionLoader {
    * appropriate.
    */
   async enableExtension(name: string, scope: SettingScope) {
-    if (
-      scope === SettingScope.System ||
-      scope === SettingScope.SystemDefaults
-    ) {
-      throw new Error('System and SystemDefaults scopes are not supported.');
+    if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) {
+      throw new Error("System and SystemDefaults scopes are not supported.");
     }
-    const extension = this.getExtensions().find(
-      (extension) => extension.name === name,
-    );
+    const extension = this.getExtensions().find((extension) => extension.name === name);
     if (!extension) {
       throw new Error(`Extension with name ${name} does not exist.`);
     }
 
     if (scope !== SettingScope.Session) {
-      const scopePath =
-        scope === SettingScope.Workspace ? this.workspaceDir : os.homedir();
+      const scopePath = scope === SettingScope.Workspace ? this.workspaceDir : os.homedir();
       this.extensionEnablementManager.enable(name, true, scopePath);
     }
     await logExtensionEnable(
@@ -766,16 +660,13 @@ function filterMcpConfig(original: MCPServerConfig): MCPServerConfig {
   return Object.freeze(rest);
 }
 
-export async function copyExtension(
-  source: string,
-  destination: string,
-): Promise<void> {
+export async function copyExtension(source: string, destination: string): Promise<void> {
   await fs.promises.cp(source, destination, { recursive: true });
 }
 
 function getContextFileNames(config: ExtensionConfig): string[] {
   if (!config.contextFileName) {
-    return ['GEMINI.md'];
+    return ["GEMINI.md"];
   } else if (!Array.isArray(config.contextFileName)) {
     return [config.contextFileName];
   }
@@ -800,9 +691,7 @@ export function getExtensionId(
   // or project names.
   let idValue = config.name;
   const githubUrlParts =
-    installMetadata &&
-    (installMetadata.type === 'git' ||
-      installMetadata.type === 'github-release')
+    installMetadata && (installMetadata.type === "git" || installMetadata.type === "github-release")
       ? tryParseGithubUrl(installMetadata.source)
       : null;
   if (githubUrlParts) {
@@ -815,5 +704,5 @@ export function getExtensionId(
 }
 
 export function hashValue(value: string): string {
-  return createHash('sha256').update(value).digest('hex');
+  return createHash("sha256").update(value).digest("hex");
 }
diff --git a/packages/ui-gemini/src/config/extension.test.ts b/packages/ui-gemini/src/config/extension.test.ts
index 88fce9019..e2435f0c3 100644
--- a/packages/ui-gemini/src/config/extension.test.ts
+++ b/packages/ui-gemini/src/config/extension.test.ts
@@ -4,43 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { join } from "node:path";
 import {
-  vi,
-  type MockedFunction,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  afterAll,
-} from 'vitest';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import {
-  type GeminiCLIExtension,
-  ExtensionUninstallEvent,
   ExtensionDisableEvent,
   ExtensionEnableEvent,
+  ExtensionUninstallEvent,
+  type GeminiCLIExtension,
   KeychainTokenStorage,
-} from '@airiscode/gemini-cli-core';
-import { loadSettings, SettingScope } from './settings.js';
+} from "@airiscode/gemini-cli-core";
 import {
-  isWorkspaceTrusted,
-  resetTrustedFoldersForTesting,
-} from './trustedFolders.js';
-import { createExtension } from '../test-utils/createExtension.js';
-import { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
-import { join } from 'node:path';
+  afterAll,
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  type MockedFunction,
+  vi,
+} from "vitest";
+import { createExtension } from "../test-utils/createExtension.js";
+import { ExtensionManager, hashValue } from "./extension-manager.js";
+import { INSTALL_WARNING_MESSAGE } from "./extensions/consent.js";
+import { ExtensionEnablementManager } from "./extensions/extensionEnablement.js";
+import type { ExtensionSetting } from "./extensions/extensionSettings.js";
+import { ExtensionStorage } from "./extensions/storage.js";
 import {
   EXTENSIONS_CONFIG_FILENAME,
   EXTENSIONS_DIRECTORY_NAME,
   INSTALL_METADATA_FILENAME,
-} from './extensions/variables.js';
-import { hashValue, ExtensionManager } from './extension-manager.js';
-import { ExtensionStorage } from './extensions/storage.js';
-import { INSTALL_WARNING_MESSAGE } from './extensions/consent.js';
-import type { ExtensionSetting } from './extensions/extensionSettings.js';
+} from "./extensions/variables.js";
+import { loadSettings, SettingScope } from "./settings.js";
+import { isWorkspaceTrusted, resetTrustedFoldersForTesting } from "./trustedFolders.js";
 
 const mockGit = {
   clone: vi.fn(),
@@ -56,25 +53,24 @@ const mockGit = {
 
 const mockDownloadFromGithubRelease = vi.hoisted(() => vi.fn());
 
-vi.mock('./extensions/github.js', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('./extensions/github.js')>();
+vi.mock("./extensions/github.js", async (importOriginal) => {
+  const original = await importOriginal<typeof import("./extensions/github.js")>();
   return {
     ...original,
     downloadFromGitHubRelease: mockDownloadFromGithubRelease,
   };
 });
 
-vi.mock('simple-git', () => ({
+vi.mock("simple-git", () => ({
   simpleGit: vi.fn((path: string) => {
     mockGit.path.mockReturnValue(path);
     return mockGit;
   }),
 }));
 
-const mockHomedir = vi.hoisted(() => vi.fn(() => '/tmp/mock-home'));
+const mockHomedir = vi.hoisted(() => vi.fn(() => "/tmp/mock-home"));
 
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const mockedOs = await importOriginal<typeof os>();
   return {
     ...mockedOs,
@@ -82,8 +78,8 @@ vi.mock('os', async (importOriginal) => {
   };
 });
 
-vi.mock('./trustedFolders.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./trustedFolders.js')>();
+vi.mock("./trustedFolders.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./trustedFolders.js")>();
   return {
     ...actual,
     isWorkspaceTrusted: vi.fn(),
@@ -95,9 +91,8 @@ const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn());
 const mockLogExtensionUninstall = vi.hoisted(() => vi.fn());
 const mockLogExtensionUpdateEvent = vi.hoisted(() => vi.fn());
 const mockLogExtensionDisable = vi.hoisted(() => vi.fn());
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     logExtensionEnable: mockLogExtensionEnable,
@@ -119,8 +114,8 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('child_process', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('child_process')>();
+vi.mock("child_process", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("child_process")>();
   return {
     ...actual,
     execSync: vi.fn(),
@@ -135,15 +130,13 @@ interface MockKeychainStorage {
   isAvailable: ReturnType<typeof vi.fn>;
 }
 
-describe('extension tests', () => {
+describe("extension tests", () => {
   let tempHomeDir: string;
   let tempWorkspaceDir: string;
   let userExtensionsDir: string;
   let extensionManager: ExtensionManager;
   let mockRequestConsent: MockedFunction<(consent: string) => Promise<boolean>>;
-  let mockPromptForSettings: MockedFunction<
-    (setting: ExtensionSetting) => Promise<string>
-  >;
+  let mockPromptForSettings: MockedFunction<(setting: ExtensionSetting) => Promise<string>>;
   let mockKeychainStorage: MockKeychainStorage;
   let keychainData: Record<string, string>;
 
@@ -151,43 +144,33 @@ describe('extension tests', () => {
     vi.clearAllMocks();
     keychainData = {};
     mockKeychainStorage = {
-      getSecret: vi
-        .fn()
-        .mockImplementation(async (key: string) => keychainData[key] || null),
-      setSecret: vi
-        .fn()
-        .mockImplementation(async (key: string, value: string) => {
-          keychainData[key] = value;
-        }),
+      getSecret: vi.fn().mockImplementation(async (key: string) => keychainData[key] || null),
+      setSecret: vi.fn().mockImplementation(async (key: string, value: string) => {
+        keychainData[key] = value;
+      }),
       deleteSecret: vi.fn().mockImplementation(async (key: string) => {
         delete keychainData[key];
       }),
-      listSecrets: vi
-        .fn()
-        .mockImplementation(async () => Object.keys(keychainData)),
+      listSecrets: vi.fn().mockImplementation(async () => Object.keys(keychainData)),
       isAvailable: vi.fn().mockResolvedValue(true),
     };
-    (
-      KeychainTokenStorage as unknown as ReturnType<typeof vi.fn>
-    ).mockImplementation(() => mockKeychainStorage);
-    tempHomeDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-    );
-    tempWorkspaceDir = fs.mkdtempSync(
-      path.join(tempHomeDir, 'gemini-cli-test-workspace-'),
+    (KeychainTokenStorage as unknown as ReturnType<typeof vi.fn>).mockImplementation(
+      () => mockKeychainStorage,
     );
+    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
+    tempWorkspaceDir = fs.mkdtempSync(path.join(tempHomeDir, "gemini-cli-test-workspace-"));
     userExtensionsDir = path.join(tempHomeDir, EXTENSIONS_DIRECTORY_NAME);
     mockRequestConsent = vi.fn();
     mockRequestConsent.mockResolvedValue(true);
     mockPromptForSettings = vi.fn();
-    mockPromptForSettings.mockResolvedValue('');
+    mockPromptForSettings.mockResolvedValue("");
     fs.mkdirSync(userExtensionsDir, { recursive: true });
     vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
     vi.mocked(isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
       source: undefined,
     });
-    vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
+    vi.spyOn(process, "cwd").mockReturnValue(tempWorkspaceDir);
     extensionManager = new ExtensionManager({
       workspaceDir: tempWorkspaceDir,
       requestConsent: mockRequestConsent,
@@ -203,155 +186,144 @@ describe('extension tests', () => {
     vi.restoreAllMocks();
   });
 
-  describe('loadExtensions', () => {
-    it('should include extension path in loaded extension', async () => {
-      const extensionDir = path.join(userExtensionsDir, 'test-extension');
+  describe("loadExtensions", () => {
+    it("should include extension path in loaded extension", async () => {
+      const extensionDir = path.join(userExtensionsDir, "test-extension");
       fs.mkdirSync(extensionDir, { recursive: true });
 
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
       });
 
       const extensions = await extensionManager.loadExtensions();
       expect(extensions).toHaveLength(1);
       expect(extensions[0].path).toBe(extensionDir);
-      expect(extensions[0].name).toBe('test-extension');
+      expect(extensions[0].name).toBe("test-extension");
     });
 
-    it('should load context file path when GEMINI.md is present', async () => {
+    it("should load context file path when GEMINI.md is present", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'ext1',
-        version: '1.0.0',
+        name: "ext1",
+        version: "1.0.0",
         addContextFile: true,
       });
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'ext2',
-        version: '2.0.0',
+        name: "ext2",
+        version: "2.0.0",
       });
 
       const extensions = await extensionManager.loadExtensions();
 
       expect(extensions).toHaveLength(2);
-      const ext1 = extensions.find((e) => e.name === 'ext1');
-      const ext2 = extensions.find((e) => e.name === 'ext2');
-      expect(ext1?.contextFiles).toEqual([
-        path.join(userExtensionsDir, 'ext1', 'GEMINI.md'),
-      ]);
+      const ext1 = extensions.find((e) => e.name === "ext1");
+      const ext2 = extensions.find((e) => e.name === "ext2");
+      expect(ext1?.contextFiles).toEqual([path.join(userExtensionsDir, "ext1", "GEMINI.md")]);
       expect(ext2?.contextFiles).toEqual([]);
     });
 
-    it('should load context file path from the extension config', async () => {
+    it("should load context file path from the extension config", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'ext1',
-        version: '1.0.0',
+        name: "ext1",
+        version: "1.0.0",
         addContextFile: false,
-        contextFileName: 'my-context-file.md',
+        contextFileName: "my-context-file.md",
       });
 
       const extensions = await extensionManager.loadExtensions();
 
       expect(extensions).toHaveLength(1);
-      const ext1 = extensions.find((e) => e.name === 'ext1');
+      const ext1 = extensions.find((e) => e.name === "ext1");
       expect(ext1?.contextFiles).toEqual([
-        path.join(userExtensionsDir, 'ext1', 'my-context-file.md'),
+        path.join(userExtensionsDir, "ext1", "my-context-file.md"),
       ]);
     });
 
-    it('should annotate disabled extensions', async () => {
+    it("should annotate disabled extensions", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'disabled-extension',
-        version: '1.0.0',
+        name: "disabled-extension",
+        version: "1.0.0",
       });
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'enabled-extension',
-        version: '2.0.0',
+        name: "enabled-extension",
+        version: "2.0.0",
       });
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension(
-        'disabled-extension',
-        SettingScope.User,
-      );
+      await extensionManager.disableExtension("disabled-extension", SettingScope.User);
       const extensions = extensionManager.getExtensions();
       expect(extensions).toHaveLength(2);
-      expect(extensions[0].name).toBe('disabled-extension');
+      expect(extensions[0].name).toBe("disabled-extension");
       expect(extensions[0].isActive).toBe(false);
-      expect(extensions[1].name).toBe('enabled-extension');
+      expect(extensions[1].name).toBe("enabled-extension");
       expect(extensions[1].isActive).toBe(true);
     });
 
-    it('should hydrate variables', async () => {
+    it("should hydrate variables", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
         addContextFile: false,
         contextFileName: undefined,
         mcpServers: {
-          'test-server': {
-            cwd: '${extensionPath}${/}server',
+          "test-server": {
+            cwd: "${extensionPath}${/}server",
           },
         },
       });
 
       const extensions = await extensionManager.loadExtensions();
       expect(extensions).toHaveLength(1);
-      const expectedCwd = path.join(
-        userExtensionsDir,
-        'test-extension',
-        'server',
-      );
-      expect(extensions[0].mcpServers?.['test-server'].cwd).toBe(expectedCwd);
+      const expectedCwd = path.join(userExtensionsDir, "test-extension", "server");
+      expect(extensions[0].mcpServers?.["test-server"].cwd).toBe(expectedCwd);
     });
 
-    it('should load a linked extension correctly', async () => {
+    it("should load a linked extension correctly", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempWorkspaceDir,
-        name: 'my-linked-extension',
-        version: '1.0.0',
-        contextFileName: 'context.md',
+        name: "my-linked-extension",
+        version: "1.0.0",
+        contextFileName: "context.md",
       });
-      fs.writeFileSync(path.join(sourceExtDir, 'context.md'), 'linked context');
+      fs.writeFileSync(path.join(sourceExtDir, "context.md"), "linked context");
 
       await extensionManager.loadExtensions();
       const extension = await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'link',
+        type: "link",
       });
 
-      expect(extension.name).toEqual('my-linked-extension');
+      expect(extension.name).toEqual("my-linked-extension");
       const extensions = extensionManager.getExtensions();
       expect(extensions).toHaveLength(1);
 
       const linkedExt = extensions[0];
-      expect(linkedExt.name).toBe('my-linked-extension');
+      expect(linkedExt.name).toBe("my-linked-extension");
 
       expect(linkedExt.path).toBe(sourceExtDir);
       expect(linkedExt.installMetadata).toEqual({
         source: sourceExtDir,
-        type: 'link',
+        type: "link",
       });
-      expect(linkedExt.contextFiles).toEqual([
-        path.join(sourceExtDir, 'context.md'),
-      ]);
+      expect(linkedExt.contextFiles).toEqual([path.join(sourceExtDir, "context.md")]);
     });
 
-    it('should hydrate ${extensionPath} correctly for linked extensions', async () => {
+    it("should hydrate ${extensionPath} correctly for linked extensions", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempWorkspaceDir,
-        name: 'my-linked-extension-with-path',
-        version: '1.0.0',
+        name: "my-linked-extension-with-path",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node',
-            args: ['${extensionPath}${/}server${/}index.js'],
-            cwd: '${extensionPath}${/}server',
+          "test-server": {
+            command: "node",
+            args: ["${extensionPath}${/}server${/}index.js"],
+            cwd: "${extensionPath}${/}server",
           },
         },
       });
@@ -359,46 +331,41 @@ describe('extension tests', () => {
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'link',
+        type: "link",
       });
 
       const extensions = extensionManager.getExtensions();
       expect(extensions).toHaveLength(1);
-      expect(extensions[0].mcpServers?.['test-server'].cwd).toBe(
-        path.join(sourceExtDir, 'server'),
-      );
-      expect(extensions[0].mcpServers?.['test-server'].args).toEqual([
-        path.join(sourceExtDir, 'server', 'index.js'),
+      expect(extensions[0].mcpServers?.["test-server"].cwd).toBe(path.join(sourceExtDir, "server"));
+      expect(extensions[0].mcpServers?.["test-server"].args).toEqual([
+        path.join(sourceExtDir, "server", "index.js"),
       ]);
     });
 
-    it('should resolve environment variables in extension configuration', async () => {
-      process.env['TEST_API_KEY'] = 'test-api-key-123';
-      process.env['TEST_DB_URL'] = 'postgresql://localhost:5432/testdb';
+    it("should resolve environment variables in extension configuration", async () => {
+      process.env["TEST_API_KEY"] = "test-api-key-123";
+      process.env["TEST_DB_URL"] = "postgresql://localhost:5432/testdb";
 
       try {
-        const userExtensionsDir = path.join(
-          tempHomeDir,
-          EXTENSIONS_DIRECTORY_NAME,
-        );
+        const userExtensionsDir = path.join(tempHomeDir, EXTENSIONS_DIRECTORY_NAME);
         fs.mkdirSync(userExtensionsDir, { recursive: true });
 
-        const extDir = path.join(userExtensionsDir, 'test-extension');
+        const extDir = path.join(userExtensionsDir, "test-extension");
         fs.mkdirSync(extDir);
 
         // Write config to a separate file for clarity and good practices
         const configPath = path.join(extDir, EXTENSIONS_CONFIG_FILENAME);
         const extensionConfig = {
-          name: 'test-extension',
-          version: '1.0.0',
+          name: "test-extension",
+          version: "1.0.0",
           mcpServers: {
-            'test-server': {
-              command: 'node',
-              args: ['server.js'],
+            "test-server": {
+              command: "node",
+              args: ["server.js"],
               env: {
-                API_KEY: '$TEST_API_KEY',
-                DATABASE_URL: '${TEST_DB_URL}',
-                STATIC_VALUE: 'no-substitution',
+                API_KEY: "$TEST_API_KEY",
+                DATABASE_URL: "${TEST_DB_URL}",
+                STATIC_VALUE: "no-substitution",
               },
             },
           },
@@ -409,80 +376,75 @@ describe('extension tests', () => {
 
         expect(extensions).toHaveLength(1);
         const extension = extensions[0];
-        expect(extension.name).toBe('test-extension');
+        expect(extension.name).toBe("test-extension");
         expect(extension.mcpServers).toBeDefined();
 
-        const serverConfig = extension.mcpServers?.['test-server'];
+        const serverConfig = extension.mcpServers?.["test-server"];
         expect(serverConfig).toBeDefined();
         expect(serverConfig?.env).toBeDefined();
-        expect(serverConfig?.env?.['API_KEY']).toBe('test-api-key-123');
-        expect(serverConfig?.env?.['DATABASE_URL']).toBe(
-          'postgresql://localhost:5432/testdb',
-        );
-        expect(serverConfig?.env?.['STATIC_VALUE']).toBe('no-substitution');
+        expect(serverConfig?.env?.["API_KEY"]).toBe("test-api-key-123");
+        expect(serverConfig?.env?.["DATABASE_URL"]).toBe("postgresql://localhost:5432/testdb");
+        expect(serverConfig?.env?.["STATIC_VALUE"]).toBe("no-substitution");
       } finally {
-        delete process.env['TEST_API_KEY'];
-        delete process.env['TEST_DB_URL'];
+        delete process.env["TEST_API_KEY"];
+        delete process.env["TEST_DB_URL"];
       }
     });
 
-    it('should resolve environment variables from an extension .env file', async () => {
+    it("should resolve environment variables from an extension .env file", async () => {
       const extDir = createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node',
-            args: ['server.js'],
+          "test-server": {
+            command: "node",
+            args: ["server.js"],
             env: {
-              API_KEY: '$MY_API_KEY',
-              STATIC_VALUE: 'no-substitution',
+              API_KEY: "$MY_API_KEY",
+              STATIC_VALUE: "no-substitution",
             },
           },
         },
         settings: [
           {
-            name: 'My API Key',
-            description: 'API key for testing.',
-            envVar: 'MY_API_KEY',
+            name: "My API Key",
+            description: "API key for testing.",
+            envVar: "MY_API_KEY",
           },
         ],
       });
 
-      const envFilePath = path.join(extDir, '.env');
-      fs.writeFileSync(envFilePath, 'MY_API_KEY=test-key-from-file\n');
+      const envFilePath = path.join(extDir, ".env");
+      fs.writeFileSync(envFilePath, "MY_API_KEY=test-key-from-file\n");
 
       const extensions = await extensionManager.loadExtensions();
 
       expect(extensions).toHaveLength(1);
       const extension = extensions[0];
-      const serverConfig = extension.mcpServers!['test-server'];
+      const serverConfig = extension.mcpServers!["test-server"];
       expect(serverConfig.env).toBeDefined();
-      expect(serverConfig.env!['API_KEY']).toBe('test-key-from-file');
-      expect(serverConfig.env!['STATIC_VALUE']).toBe('no-substitution');
+      expect(serverConfig.env!["API_KEY"]).toBe("test-key-from-file");
+      expect(serverConfig.env!["STATIC_VALUE"]).toBe("no-substitution");
     });
 
-    it('should handle missing environment variables gracefully', async () => {
-      const userExtensionsDir = path.join(
-        tempHomeDir,
-        EXTENSIONS_DIRECTORY_NAME,
-      );
+    it("should handle missing environment variables gracefully", async () => {
+      const userExtensionsDir = path.join(tempHomeDir, EXTENSIONS_DIRECTORY_NAME);
       fs.mkdirSync(userExtensionsDir, { recursive: true });
 
-      const extDir = path.join(userExtensionsDir, 'test-extension');
+      const extDir = path.join(userExtensionsDir, "test-extension");
       fs.mkdirSync(extDir);
 
       const extensionConfig = {
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node',
-            args: ['server.js'],
+          "test-server": {
+            command: "node",
+            args: ["server.js"],
             env: {
-              MISSING_VAR: '$UNDEFINED_ENV_VAR',
-              MISSING_VAR_BRACES: '${ALSO_UNDEFINED}',
+              MISSING_VAR: "$UNDEFINED_ENV_VAR",
+              MISSING_VAR_BRACES: "${ALSO_UNDEFINED}",
             },
           },
         },
@@ -497,26 +459,24 @@ describe('extension tests', () => {
 
       expect(extensions).toHaveLength(1);
       const extension = extensions[0];
-      const serverConfig = extension.mcpServers!['test-server'];
+      const serverConfig = extension.mcpServers!["test-server"];
       expect(serverConfig.env).toBeDefined();
-      expect(serverConfig.env!['MISSING_VAR']).toBe('$UNDEFINED_ENV_VAR');
-      expect(serverConfig.env!['MISSING_VAR_BRACES']).toBe('${ALSO_UNDEFINED}');
+      expect(serverConfig.env!["MISSING_VAR"]).toBe("$UNDEFINED_ENV_VAR");
+      expect(serverConfig.env!["MISSING_VAR_BRACES"]).toBe("${ALSO_UNDEFINED}");
     });
 
-    it('should skip extensions with invalid JSON and log a warning', async () => {
-      const consoleSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it("should skip extensions with invalid JSON and log a warning", async () => {
+      const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       // Good extension
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'good-ext',
-        version: '1.0.0',
+        name: "good-ext",
+        version: "1.0.0",
       });
 
       // Bad extension
-      const badExtDir = path.join(userExtensionsDir, 'bad-ext');
+      const badExtDir = path.join(userExtensionsDir, "bad-ext");
       fs.mkdirSync(badExtDir);
       const badConfigPath = path.join(badExtDir, EXTENSIONS_CONFIG_FILENAME);
       fs.writeFileSync(badConfigPath, '{ "name": "bad-ext"'); // Malformed
@@ -524,7 +484,7 @@ describe('extension tests', () => {
       const extensions = await extensionManager.loadExtensions();
 
       expect(extensions).toHaveLength(1);
-      expect(extensions[0].name).toBe('good-ext');
+      expect(extensions[0].name).toBe("good-ext");
       expect(consoleSpy).toHaveBeenCalledExactlyOnceWith(
         expect.stringContaining(
           `Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}`,
@@ -534,28 +494,26 @@ describe('extension tests', () => {
       consoleSpy.mockRestore();
     });
 
-    it('should skip extensions with missing name and log a warning', async () => {
-      const consoleSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it("should skip extensions with missing name and log a warning", async () => {
+      const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       // Good extension
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'good-ext',
-        version: '1.0.0',
+        name: "good-ext",
+        version: "1.0.0",
       });
 
       // Bad extension
-      const badExtDir = path.join(userExtensionsDir, 'bad-ext-no-name');
+      const badExtDir = path.join(userExtensionsDir, "bad-ext-no-name");
       fs.mkdirSync(badExtDir);
       const badConfigPath = path.join(badExtDir, EXTENSIONS_CONFIG_FILENAME);
-      fs.writeFileSync(badConfigPath, JSON.stringify({ version: '1.0.0' }));
+      fs.writeFileSync(badConfigPath, JSON.stringify({ version: "1.0.0" }));
 
       const extensions = await extensionManager.loadExtensions();
 
       expect(extensions).toHaveLength(1);
-      expect(extensions[0].name).toBe('good-ext');
+      expect(extensions[0].name).toBe("good-ext");
       expect(consoleSpy).toHaveBeenCalledExactlyOnceWith(
         expect.stringContaining(
           `Warning: Skipping extension in ${badExtDir}: Failed to load extension config from ${badConfigPath}: Invalid configuration in ${badConfigPath}: missing "name"`,
@@ -565,15 +523,15 @@ describe('extension tests', () => {
       consoleSpy.mockRestore();
     });
 
-    it('should filter trust out of mcp servers', async () => {
+    it("should filter trust out of mcp servers", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node',
-            args: ['server.js'],
+          "test-server": {
+            command: "node",
+            args: ["server.js"],
             trust: true,
           },
         },
@@ -581,20 +539,18 @@ describe('extension tests', () => {
 
       const extensions = await extensionManager.loadExtensions();
       expect(extensions).toHaveLength(1);
-      expect(extensions[0].mcpServers?.['test-server'].trust).toBeUndefined();
+      expect(extensions[0].mcpServers?.["test-server"].trust).toBeUndefined();
     });
 
-    it('should throw an error for invalid extension names', async () => {
-      const consoleSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+    it("should throw an error for invalid extension names", async () => {
+      const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'bad_name',
-        version: '1.0.0',
+        name: "bad_name",
+        version: "1.0.0",
       });
       const extensions = await extensionManager.loadExtensions();
-      const extension = extensions.find((e) => e.name === 'bad_name');
+      const extension = extensions.find((e) => e.name === "bad_name");
 
       expect(extension).toBeUndefined();
       expect(consoleSpy).toHaveBeenCalledWith(
@@ -603,14 +559,14 @@ describe('extension tests', () => {
       consoleSpy.mockRestore();
     });
 
-    it('should not load github extensions if blockGitExtensions is set', async () => {
+    it("should not load github extensions if blockGitExtensions is set", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'my-ext',
-        version: '1.0.0',
+        name: "my-ext",
+        version: "1.0.0",
         installMetadata: {
-          type: 'git',
-          source: 'http://somehost.com/foo/bar',
+          type: "git",
+          source: "http://somehost.com/foo/bar",
         },
       });
 
@@ -626,117 +582,112 @@ describe('extension tests', () => {
         settings: blockGitExtensionsSetting,
       });
       const extensions = await extensionManager.loadExtensions();
-      const extension = extensions.find((e) => e.name === 'my-ext');
+      const extension = extensions.find((e) => e.name === "my-ext");
 
       expect(extension).toBeUndefined();
     });
 
-    describe('id generation', () => {
+    describe("id generation", () => {
       it.each([
         {
-          description: 'should generate id from source for non-github git urls',
+          description: "should generate id from source for non-github git urls",
           installMetadata: {
-            type: 'git' as const,
-            source: 'http://somehost.com/foo/bar',
+            type: "git" as const,
+            source: "http://somehost.com/foo/bar",
           },
-          expectedIdSource: 'http://somehost.com/foo/bar',
+          expectedIdSource: "http://somehost.com/foo/bar",
         },
         {
-          description:
-            'should generate id from owner/repo for github http urls',
+          description: "should generate id from owner/repo for github http urls",
           installMetadata: {
-            type: 'git' as const,
-            source: 'http://github.com/foo/bar',
+            type: "git" as const,
+            source: "http://github.com/foo/bar",
           },
-          expectedIdSource: 'https://github.com/foo/bar',
+          expectedIdSource: "https://github.com/foo/bar",
         },
         {
-          description: 'should generate id from owner/repo for github ssh urls',
+          description: "should generate id from owner/repo for github ssh urls",
           installMetadata: {
-            type: 'git' as const,
-            source: 'git@github.com:foo/bar',
+            type: "git" as const,
+            source: "git@github.com:foo/bar",
           },
-          expectedIdSource: 'https://github.com/foo/bar',
+          expectedIdSource: "https://github.com/foo/bar",
         },
         {
-          description:
-            'should generate id from source for github-release extension',
+          description: "should generate id from source for github-release extension",
           installMetadata: {
-            type: 'github-release' as const,
-            source: 'https://github.com/foo/bar',
+            type: "github-release" as const,
+            source: "https://github.com/foo/bar",
           },
-          expectedIdSource: 'https://github.com/foo/bar',
+          expectedIdSource: "https://github.com/foo/bar",
         },
         {
-          description:
-            'should generate id from the original source for local extension',
+          description: "should generate id from the original source for local extension",
           installMetadata: {
-            type: 'local' as const,
-            source: '/some/path',
+            type: "local" as const,
+            source: "/some/path",
           },
-          expectedIdSource: '/some/path',
+          expectedIdSource: "/some/path",
         },
-      ])('$description', async ({ installMetadata, expectedIdSource }) => {
+      ])("$description", async ({ installMetadata, expectedIdSource }) => {
         createExtension({
           extensionsDir: userExtensionsDir,
-          name: 'my-ext',
-          version: '1.0.0',
+          name: "my-ext",
+          version: "1.0.0",
           installMetadata,
         });
         const extensions = await extensionManager.loadExtensions();
-        const extension = extensions.find((e) => e.name === 'my-ext');
+        const extension = extensions.find((e) => e.name === "my-ext");
         expect(extension?.id).toBe(hashValue(expectedIdSource));
       });
 
-      it('should generate id from the original source for linked extensions', async () => {
-        const extDevelopmentDir = path.join(tempHomeDir, 'local_extensions');
+      it("should generate id from the original source for linked extensions", async () => {
+        const extDevelopmentDir = path.join(tempHomeDir, "local_extensions");
         const actualExtensionDir = createExtension({
           extensionsDir: extDevelopmentDir,
-          name: 'link-ext-name',
-          version: '1.0.0',
+          name: "link-ext-name",
+          version: "1.0.0",
         });
         await extensionManager.loadExtensions();
         await extensionManager.installOrUpdateExtension({
-          type: 'link',
+          type: "link",
           source: actualExtensionDir,
         });
 
-        const extension = extensionManager
-          .getExtensions()
-          .find((e) => e.name === 'link-ext-name');
+        const extension = extensionManager.getExtensions().find((e) => e.name === "link-ext-name");
         expect(extension?.id).toBe(hashValue(actualExtensionDir));
       });
 
-      it('should generate id from name for extension with no install metadata', async () => {
+      it("should generate id from name for extension with no install metadata", async () => {
         createExtension({
           extensionsDir: userExtensionsDir,
-          name: 'no-meta-name',
-          version: '1.0.0',
+          name: "no-meta-name",
+          version: "1.0.0",
         });
         const extensions = await extensionManager.loadExtensions();
-        const extension = extensions.find((e) => e.name === 'no-meta-name');
-        expect(extension?.id).toBe(hashValue('no-meta-name'));
+        const extension = extensions.find((e) => e.name === "no-meta-name");
+        expect(extension?.id).toBe(hashValue("no-meta-name"));
       });
 
-      it('should load extension hooks and hydrate variables', async () => {
+      it("should load extension hooks and hydrate variables", async () => {
         const extDir = createExtension({
           extensionsDir: userExtensionsDir,
-          name: 'hook-extension',
-          version: '1.0.0',
+          name: "hook-extension",
+          version: "1.0.0",
         });
 
-        const hooksDir = path.join(extDir, 'hooks');
+        const hooksDir = path.join(extDir, "hooks");
         fs.mkdirSync(hooksDir);
 
         const hooksConfig = {
           hooks: {
             BeforeTool: [
               {
-                matcher: '.*',
+                matcher: ".*",
                 hooks: [
                   {
-                    type: 'command',
-                    command: 'echo ${extensionPath}',
+                    type: "command",
+                    command: "echo ${extensionPath}",
                   },
                 ],
               },
@@ -744,10 +695,7 @@ describe('extension tests', () => {
           },
         };
 
-        fs.writeFileSync(
-          path.join(hooksDir, 'hooks.json'),
-          JSON.stringify(hooksConfig),
-        );
+        fs.writeFileSync(path.join(hooksDir, "hooks.json"), JSON.stringify(hooksConfig));
 
         const settings = loadSettings(tempWorkspaceDir).merged;
         if (!settings.tools) settings.tools = {};
@@ -766,22 +714,20 @@ describe('extension tests', () => {
 
         expect(extension.hooks).toBeDefined();
         expect(extension.hooks?.BeforeTool).toHaveLength(1);
-        expect(extension.hooks?.BeforeTool?.[0].hooks[0].command).toBe(
-          `echo ${extDir}`,
-        );
+        expect(extension.hooks?.BeforeTool?.[0].hooks[0].command).toBe(`echo ${extDir}`);
       });
 
-      it('should not load hooks if enableHooks is false', async () => {
+      it("should not load hooks if enableHooks is false", async () => {
         const extDir = createExtension({
           extensionsDir: userExtensionsDir,
-          name: 'hook-extension-disabled',
-          version: '1.0.0',
+          name: "hook-extension-disabled",
+          version: "1.0.0",
         });
 
-        const hooksDir = path.join(extDir, 'hooks');
+        const hooksDir = path.join(extDir, "hooks");
         fs.mkdirSync(hooksDir);
         fs.writeFileSync(
-          path.join(hooksDir, 'hooks.json'),
+          path.join(hooksDir, "hooks.json"),
           JSON.stringify({ hooks: { BeforeTool: [] } }),
         );
 
@@ -801,109 +747,103 @@ describe('extension tests', () => {
         expect(extensions[0].hooks).toBeUndefined();
       });
 
-      it('should warn about hooks during installation', async () => {
+      it("should warn about hooks during installation", async () => {
         const requestConsentSpy = vi.fn().mockResolvedValue(true);
         extensionManager.setRequestConsent(requestConsentSpy);
 
-        const sourceExtDir = path.join(
-          tempWorkspaceDir,
-          'hook-extension-source',
-        );
+        const sourceExtDir = path.join(tempWorkspaceDir, "hook-extension-source");
         fs.mkdirSync(sourceExtDir, { recursive: true });
 
-        const hooksDir = path.join(sourceExtDir, 'hooks');
+        const hooksDir = path.join(sourceExtDir, "hooks");
         fs.mkdirSync(hooksDir);
-        fs.writeFileSync(
-          path.join(hooksDir, 'hooks.json'),
-          JSON.stringify({ hooks: {} }),
-        );
+        fs.writeFileSync(path.join(hooksDir, "hooks.json"), JSON.stringify({ hooks: {} }));
 
         fs.writeFileSync(
-          path.join(sourceExtDir, 'gemini-extension.json'),
+          path.join(sourceExtDir, "gemini-extension.json"),
           JSON.stringify({
-            name: 'hook-extension-install',
-            version: '1.0.0',
+            name: "hook-extension-install",
+            version: "1.0.0",
           }),
         );
 
         await extensionManager.loadExtensions();
         await extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         });
 
         expect(requestConsentSpy).toHaveBeenCalledWith(
-          expect.stringContaining('⚠️  This extension contains Hooks'),
+          expect.stringContaining("⚠️  This extension contains Hooks"),
         );
       });
     });
   });
 
-  describe('installExtension', () => {
-    it('should install an extension from a local path', async () => {
+  describe("installExtension", () => {
+    it("should install an extension from a local path", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
-      const targetExtDir = path.join(userExtensionsDir, 'my-local-extension');
+      const targetExtDir = path.join(userExtensionsDir, "my-local-extension");
       const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
 
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
 
       expect(fs.existsSync(targetExtDir)).toBe(true);
       expect(fs.existsSync(metadataPath)).toBe(true);
-      const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
+      const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
       expect(metadata).toEqual({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
       fs.rmSync(targetExtDir, { recursive: true, force: true });
     });
 
-    it('should throw an error if the extension already exists', async () => {
+    it("should throw an error if the extension already exists", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
       ).rejects.toThrow(
         'Extension "my-local-extension" is already installed. Please uninstall it first.',
       );
     });
 
-    it('should throw an error and cleanup if gemini-extension.json is missing', async () => {
-      const sourceExtDir = path.join(tempHomeDir, 'bad-extension');
+    it("should throw an error and cleanup if gemini-extension.json is missing", async () => {
+      const sourceExtDir = path.join(tempHomeDir, "bad-extension");
       fs.mkdirSync(sourceExtDir, { recursive: true });
       const configPath = path.join(sourceExtDir, EXTENSIONS_CONFIG_FILENAME);
 
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
       ).rejects.toThrow(`Configuration file not found at ${configPath}`);
 
-      const targetExtDir = path.join(userExtensionsDir, 'bad-extension');
+      const targetExtDir = path.join(userExtensionsDir, "bad-extension");
       expect(fs.existsSync(targetExtDir)).toBe(false);
     });
 
-    it('should throw an error for invalid JSON in gemini-extension.json', async () => {
-      const sourceExtDir = path.join(tempHomeDir, 'bad-json-ext');
+    it("should throw an error for invalid JSON in gemini-extension.json", async () => {
+      const sourceExtDir = path.join(tempHomeDir, "bad-json-ext");
       fs.mkdirSync(sourceExtDir, { recursive: true });
       const configPath = path.join(sourceExtDir, EXTENSIONS_CONFIG_FILENAME);
       fs.writeFileSync(configPath, '{ "name": "bad-json", "version": "1.0.0"'); // Malformed JSON
@@ -911,41 +851,34 @@ describe('extension tests', () => {
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
       ).rejects.toThrow(
-        new RegExp(
-          `^Failed to load extension config from ${configPath.replace(
-            /\\/g,
-            '\\\\',
-          )}`,
-        ),
+        new RegExp(`^Failed to load extension config from ${configPath.replace(/\\/g, "\\\\")}`),
       );
     });
 
-    it('should throw an error for missing name in gemini-extension.json', async () => {
+    it("should throw an error for missing name in gemini-extension.json", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'missing-name-ext',
-        version: '1.0.0',
+        name: "missing-name-ext",
+        version: "1.0.0",
       });
       const configPath = path.join(sourceExtDir, EXTENSIONS_CONFIG_FILENAME);
       // Overwrite with invalid config
-      fs.writeFileSync(configPath, JSON.stringify({ version: '1.0.0' }));
+      fs.writeFileSync(configPath, JSON.stringify({ version: "1.0.0" }));
 
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
-      ).rejects.toThrow(
-        `Invalid configuration in ${configPath}: missing "name"`,
-      );
+      ).rejects.toThrow(`Invalid configuration in ${configPath}: missing "name"`);
     });
 
-    it('should install an extension from a git URL', async () => {
-      const gitUrl = 'https://somehost.com/somerepo.git';
-      const extensionName = 'some-extension';
+    it("should install an extension from a git URL", async () => {
+      const gitUrl = "https://somehost.com/somerepo.git";
+      const extensionName = "some-extension";
       const targetExtDir = path.join(userExtensionsDir, extensionName);
       const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
 
@@ -955,45 +888,45 @@ describe('extension tests', () => {
         });
         fs.writeFileSync(
           path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME),
-          JSON.stringify({ name: extensionName, version: '1.0.0' }),
+          JSON.stringify({ name: extensionName, version: "1.0.0" }),
         );
       });
-      mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
+      mockGit.getRemotes.mockResolvedValue([{ name: "origin" }]);
       mockDownloadFromGithubRelease.mockResolvedValue({
         success: false,
-        failureReason: 'no release data',
-        type: 'github-release',
+        failureReason: "no release data",
+        type: "github-release",
       });
 
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: gitUrl,
-        type: 'git',
+        type: "git",
       });
 
       expect(fs.existsSync(targetExtDir)).toBe(true);
       expect(fs.existsSync(metadataPath)).toBe(true);
-      const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
+      const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
       expect(metadata).toEqual({
         source: gitUrl,
-        type: 'git',
+        type: "git",
       });
     });
 
-    it('should install a linked extension', async () => {
+    it("should install a linked extension", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-linked-extension',
-        version: '1.0.0',
+        name: "my-linked-extension",
+        version: "1.0.0",
       });
-      const targetExtDir = path.join(userExtensionsDir, 'my-linked-extension');
+      const targetExtDir = path.join(userExtensionsDir, "my-linked-extension");
       const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
       const configPath = path.join(targetExtDir, EXTENSIONS_CONFIG_FILENAME);
 
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'link',
+        type: "link",
       });
 
       expect(fs.existsSync(targetExtDir)).toBe(true);
@@ -1001,16 +934,16 @@ describe('extension tests', () => {
 
       expect(fs.existsSync(configPath)).toBe(false);
 
-      const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
+      const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
       expect(metadata).toEqual({
         source: sourceExtDir,
-        type: 'link',
+        type: "link",
       });
       fs.rmSync(targetExtDir, { recursive: true, force: true });
     });
 
-    it('should not install a github extension if blockGitExtensions is set', async () => {
-      const gitUrl = 'https://somehost.com/somerepo.git';
+    it("should not install a github extension if blockGitExtensions is set", async () => {
+      const gitUrl = "https://somehost.com/somerepo.git";
       const blockGitExtensionsSetting = {
         security: {
           blockGitExtensions: true,
@@ -1026,28 +959,28 @@ describe('extension tests', () => {
       await expect(
         extensionManager.installOrUpdateExtension({
           source: gitUrl,
-          type: 'git',
+          type: "git",
         }),
       ).rejects.toThrow(
-        'Installing extensions from remote sources is disallowed by your current settings.',
+        "Installing extensions from remote sources is disallowed by your current settings.",
       );
     });
 
-    it('should prompt for trust if workspace is not trusted', async () => {
+    it("should prompt for trust if workspace is not trusted", async () => {
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: false,
         source: undefined,
       });
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
 
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
 
       expect(mockRequestConsent).toHaveBeenCalledWith(
@@ -1055,7 +988,7 @@ describe('extension tests', () => {
       );
     });
 
-    it('should not install if user denies trust', async () => {
+    it("should not install if user denies trust", async () => {
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: false,
         source: undefined,
@@ -1063,7 +996,7 @@ describe('extension tests', () => {
       mockRequestConsent.mockImplementation(async (message) => {
         if (
           message.includes(
-            'is not trusted. Do you want to trust this workspace to install extensions?',
+            "is not trusted. Do you want to trust this workspace to install extensions?",
           )
         ) {
           return false;
@@ -1072,129 +1005,120 @@ describe('extension tests', () => {
       });
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
 
       await extensionManager.loadExtensions();
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
       ).rejects.toThrow(
         `Could not install extension because the current workspace at ${tempWorkspaceDir} is not trusted.`,
       );
     });
 
-    it('should add the workspace to trusted folders if user consents', async () => {
-      const trustedFoldersPath = path.join(
-        tempHomeDir,
-        '.gemini',
-        'trustedFolders.json',
-      );
+    it("should add the workspace to trusted folders if user consents", async () => {
+      const trustedFoldersPath = path.join(tempHomeDir, ".gemini", "trustedFolders.json");
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: false,
         source: undefined,
       });
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
       expect(fs.existsSync(trustedFoldersPath)).toBe(true);
-      const trustedFolders = JSON.parse(
-        fs.readFileSync(trustedFoldersPath, 'utf-8'),
-      );
-      expect(trustedFolders[tempWorkspaceDir]).toBe('TRUST_FOLDER');
+      const trustedFolders = JSON.parse(fs.readFileSync(trustedFoldersPath, "utf-8"));
+      expect(trustedFolders[tempWorkspaceDir]).toBe("TRUST_FOLDER");
     });
 
-    describe.each([true, false])(
-      'with previous extension config: %s',
-      (isUpdate: boolean) => {
-        let sourceExtDir: string;
+    describe.each([true, false])("with previous extension config: %s", (isUpdate: boolean) => {
+      let sourceExtDir: string;
 
-        beforeEach(async () => {
-          sourceExtDir = createExtension({
-            extensionsDir: tempHomeDir,
-            name: 'my-local-extension',
-            version: '1.1.0',
-          });
-          await extensionManager.loadExtensions();
-          if (isUpdate) {
-            await extensionManager.installOrUpdateExtension({
-              source: sourceExtDir,
-              type: 'local',
-            });
-          }
-          // Clears out any calls to mocks from the above function calls.
-          vi.clearAllMocks();
+      beforeEach(async () => {
+        sourceExtDir = createExtension({
+          extensionsDir: tempHomeDir,
+          name: "my-local-extension",
+          version: "1.1.0",
         });
+        await extensionManager.loadExtensions();
+        if (isUpdate) {
+          await extensionManager.installOrUpdateExtension({
+            source: sourceExtDir,
+            type: "local",
+          });
+        }
+        // Clears out any calls to mocks from the above function calls.
+        vi.clearAllMocks();
+      });
 
-        it(`should log an ${isUpdate ? 'update' : 'install'} event to clearcut on success`, async () => {
-          await extensionManager.installOrUpdateExtension(
-            { source: sourceExtDir, type: 'local' },
-            isUpdate
-              ? {
-                  name: 'my-local-extension',
-                  version: '1.0.0',
-                }
-              : undefined,
-          );
+      it(`should log an ${isUpdate ? "update" : "install"} event to clearcut on success`, async () => {
+        await extensionManager.installOrUpdateExtension(
+          { source: sourceExtDir, type: "local" },
+          isUpdate
+            ? {
+                name: "my-local-extension",
+                version: "1.0.0",
+              }
+            : undefined,
+        );
 
-          if (isUpdate) {
-            expect(mockLogExtensionUpdateEvent).toHaveBeenCalled();
-            expect(mockLogExtensionInstallEvent).not.toHaveBeenCalled();
-          } else {
-            expect(mockLogExtensionInstallEvent).toHaveBeenCalled();
-            expect(mockLogExtensionUpdateEvent).not.toHaveBeenCalled();
-          }
-        });
+        if (isUpdate) {
+          expect(mockLogExtensionUpdateEvent).toHaveBeenCalled();
+          expect(mockLogExtensionInstallEvent).not.toHaveBeenCalled();
+        } else {
+          expect(mockLogExtensionInstallEvent).toHaveBeenCalled();
+          expect(mockLogExtensionUpdateEvent).not.toHaveBeenCalled();
+        }
+      });
 
-        it(`should ${isUpdate ? 'not ' : ''} alter the extension enablement configuration`, async () => {
-          const enablementManager = new ExtensionEnablementManager();
-          enablementManager.enable('my-local-extension', true, '/some/scope');
-
-          await extensionManager.installOrUpdateExtension(
-            { source: sourceExtDir, type: 'local' },
-            isUpdate
-              ? {
-                  name: 'my-local-extension',
-                  version: '1.0.0',
-                }
-              : undefined,
-          );
+      it(`should ${isUpdate ? "not " : ""} alter the extension enablement configuration`, async () => {
+        const enablementManager = new ExtensionEnablementManager();
+        enablementManager.enable("my-local-extension", true, "/some/scope");
 
-          const config = enablementManager.readConfig()['my-local-extension'];
-          if (isUpdate) {
-            expect(config).not.toBeUndefined();
-            expect(config.overrides).toContain('/some/scope/*');
-          } else {
-            expect(config).not.toContain('/some/scope/*');
-          }
-        });
-      },
-    );
+        await extensionManager.installOrUpdateExtension(
+          { source: sourceExtDir, type: "local" },
+          isUpdate
+            ? {
+                name: "my-local-extension",
+                version: "1.0.0",
+              }
+            : undefined,
+        );
+
+        const config = enablementManager.readConfig()["my-local-extension"];
+        if (isUpdate) {
+          expect(config).not.toBeUndefined();
+          expect(config.overrides).toContain("/some/scope/*");
+        } else {
+          expect(config).not.toContain("/some/scope/*");
+        }
+      });
+    });
 
-    it('should show users information on their ansi escaped mcp servers when installing', async () => {
+    it("should show users information on their ansi escaped mcp servers when installing", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node dobadthing \u001b[12D\u001b[K',
-            args: ['server.js'],
-            description: 'a local mcp server',
+          "test-server": {
+            command: "node dobadthing \u001b[12D\u001b[K",
+            args: ["server.js"],
+            description: "a local mcp server",
           },
-          'test-server-2': {
-            description: 'a remote mcp server',
-            httpUrl: 'https://google.com',
+          "test-server-2": {
+            description: "a remote mcp server",
+            httpUrl: "https://google.com",
           },
         },
       });
@@ -1203,10 +1127,10 @@ describe('extension tests', () => {
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
       ).resolves.toMatchObject({
-        name: 'my-local-extension',
+        name: "my-local-extension",
       });
 
       expect(mockRequestConsent).toHaveBeenCalledWith(
@@ -1218,15 +1142,15 @@ This extension will run the following MCP servers:
       );
     });
 
-    it('should continue installation if user accepts prompt for local extension with mcp servers', async () => {
+    it("should continue installation if user accepts prompt for local extension with mcp servers", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node',
-            args: ['server.js'],
+          "test-server": {
+            command: "node",
+            args: ["server.js"],
           },
         },
       });
@@ -1235,20 +1159,20 @@ This extension will run the following MCP servers:
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
-      ).resolves.toMatchObject({ name: 'my-local-extension' });
+      ).resolves.toMatchObject({ name: "my-local-extension" });
     });
 
-    it('should cancel installation if user declines prompt for local extension with mcp servers', async () => {
+    it("should cancel installation if user declines prompt for local extension with mcp servers", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node',
-            args: ['server.js'],
+          "test-server": {
+            command: "node",
+            args: ["server.js"],
           },
         },
       });
@@ -1257,47 +1181,47 @@ This extension will run the following MCP servers:
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
       ).rejects.toThrow('Installation cancelled for "my-local-extension".');
     });
 
-    it('should save the autoUpdate flag to the install metadata', async () => {
+    it("should save the autoUpdate flag to the install metadata", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
-      const targetExtDir = path.join(userExtensionsDir, 'my-local-extension');
+      const targetExtDir = path.join(userExtensionsDir, "my-local-extension");
       const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
 
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
         autoUpdate: true,
       });
 
       expect(fs.existsSync(targetExtDir)).toBe(true);
       expect(fs.existsSync(metadataPath)).toBe(true);
-      const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
+      const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
       expect(metadata).toEqual({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
         autoUpdate: true,
       });
       fs.rmSync(targetExtDir, { recursive: true, force: true });
     });
 
-    it('should ignore consent flow if not required', async () => {
+    it("should ignore consent flow if not required", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
         mcpServers: {
-          'test-server': {
-            command: 'node',
-            args: ['server.js'],
+          "test-server": {
+            command: "node",
+            args: ["server.js"],
           },
         },
       });
@@ -1306,33 +1230,33 @@ This extension will run the following MCP servers:
       // Install it with hard coded consent first.
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
       expect(mockRequestConsent).toHaveBeenCalledOnce();
 
       // Now update it without changing anything.
       await expect(
         extensionManager.installOrUpdateExtension(
-          { source: sourceExtDir, type: 'local' },
+          { source: sourceExtDir, type: "local" },
           // Provide its own existing config as the previous config.
           await extensionManager.loadExtensionConfig(sourceExtDir),
         ),
-      ).resolves.toMatchObject({ name: 'my-local-extension' });
+      ).resolves.toMatchObject({ name: "my-local-extension" });
 
       // Still only called once
       expect(mockRequestConsent).toHaveBeenCalledOnce();
     });
 
-    it('should prompt for settings if promptForSettings', async () => {
+    it("should prompt for settings if promptForSettings", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
         settings: [
           {
-            name: 'API Key',
-            description: 'Your API key for the service.',
-            envVar: 'MY_API_KEY',
+            name: "API Key",
+            description: "Your API key for the service.",
+            envVar: "MY_API_KEY",
           },
         ],
       });
@@ -1340,22 +1264,22 @@ This extension will run the following MCP servers:
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
 
       expect(mockPromptForSettings).toHaveBeenCalled();
     });
 
-    it('should not prompt for settings if promptForSettings is false', async () => {
+    it("should not prompt for settings if promptForSettings is false", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
         settings: [
           {
-            name: 'API Key',
-            description: 'Your API key for the service.',
-            envVar: 'MY_API_KEY',
+            name: "API Key",
+            description: "Your API key for the service.",
+            envVar: "MY_API_KEY",
           },
         ],
       });
@@ -1370,125 +1294,123 @@ This extension will run the following MCP servers:
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: sourceExtDir,
-        type: 'local',
+        type: "local",
       });
     });
 
-    it('should only prompt for new settings on update, and preserve old settings', async () => {
+    it("should only prompt for new settings on update, and preserve old settings", async () => {
       // 1. Create and install the "old" version of the extension.
       const oldSourceExtDir = createExtension({
         extensionsDir: tempHomeDir, // Create it in a temp location first
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
         settings: [
           {
-            name: 'API Key',
-            description: 'Your API key for the service.',
-            envVar: 'MY_API_KEY',
+            name: "API Key",
+            description: "Your API key for the service.",
+            envVar: "MY_API_KEY",
           },
         ],
       });
 
-      mockPromptForSettings.mockResolvedValueOnce('old-api-key');
+      mockPromptForSettings.mockResolvedValueOnce("old-api-key");
       await extensionManager.loadExtensions();
       // Install it so it exists in the userExtensionsDir
       await extensionManager.installOrUpdateExtension({
         source: oldSourceExtDir,
-        type: 'local',
+        type: "local",
       });
 
-      const envPath = new ExtensionStorage(
-        'my-local-extension',
-      ).getEnvFilePath();
+      const envPath = new ExtensionStorage("my-local-extension").getEnvFilePath();
       expect(fs.existsSync(envPath)).toBe(true);
-      let envContent = fs.readFileSync(envPath, 'utf-8');
-      expect(envContent).toContain('MY_API_KEY=old-api-key');
+      let envContent = fs.readFileSync(envPath, "utf-8");
+      expect(envContent).toContain("MY_API_KEY=old-api-key");
       expect(mockPromptForSettings).toHaveBeenCalledTimes(1);
 
       // 2. Create the "new" version of the extension in a new source directory.
       const newSourceExtDir = createExtension({
-        extensionsDir: path.join(tempHomeDir, 'new-source'), // Another temp location
-        name: 'my-local-extension', // Same name
-        version: '1.1.0', // New version
+        extensionsDir: path.join(tempHomeDir, "new-source"), // Another temp location
+        name: "my-local-extension", // Same name
+        version: "1.1.0", // New version
         settings: [
           {
-            name: 'API Key',
-            description: 'Your API key for the service.',
-            envVar: 'MY_API_KEY',
+            name: "API Key",
+            description: "Your API key for the service.",
+            envVar: "MY_API_KEY",
           },
           {
-            name: 'New Setting',
-            description: 'A new setting.',
-            envVar: 'NEW_SETTING',
+            name: "New Setting",
+            description: "A new setting.",
+            envVar: "NEW_SETTING",
           },
         ],
       });
 
       const previousExtensionConfig = extensionManager.loadExtensionConfig(
-        path.join(userExtensionsDir, 'my-local-extension'),
+        path.join(userExtensionsDir, "my-local-extension"),
       );
-      mockPromptForSettings.mockResolvedValueOnce('new-setting-value');
+      mockPromptForSettings.mockResolvedValueOnce("new-setting-value");
 
       // 3. Call installOrUpdateExtension to perform the update.
       await extensionManager.installOrUpdateExtension(
-        { source: newSourceExtDir, type: 'local' },
+        { source: newSourceExtDir, type: "local" },
         previousExtensionConfig,
       );
 
       expect(mockPromptForSettings).toHaveBeenCalledTimes(2);
       expect(mockPromptForSettings).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'New Setting' }),
+        expect.objectContaining({ name: "New Setting" }),
       );
 
       expect(fs.existsSync(envPath)).toBe(true);
-      envContent = fs.readFileSync(envPath, 'utf-8');
-      expect(envContent).toContain('MY_API_KEY=old-api-key');
-      expect(envContent).toContain('NEW_SETTING=new-setting-value');
+      envContent = fs.readFileSync(envPath, "utf-8");
+      expect(envContent).toContain("MY_API_KEY=old-api-key");
+      expect(envContent).toContain("NEW_SETTING=new-setting-value");
     });
 
-    it('should fail auto-update if settings have changed', async () => {
+    it("should fail auto-update if settings have changed", async () => {
       // 1. Install initial version with autoUpdate: true
       const oldSourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-auto-update-ext',
-        version: '1.0.0',
+        name: "my-auto-update-ext",
+        version: "1.0.0",
         settings: [
           {
-            name: 'OLD_SETTING',
-            envVar: 'OLD_SETTING',
-            description: 'An old setting',
+            name: "OLD_SETTING",
+            envVar: "OLD_SETTING",
+            description: "An old setting",
           },
         ],
       });
       await extensionManager.loadExtensions();
       await extensionManager.installOrUpdateExtension({
         source: oldSourceExtDir,
-        type: 'local',
+        type: "local",
         autoUpdate: true,
       });
 
       // 2. Create new version with different settings
       const newSourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'my-auto-update-ext',
-        version: '1.1.0',
+        name: "my-auto-update-ext",
+        version: "1.1.0",
         settings: [
           {
-            name: 'NEW_SETTING',
-            envVar: 'NEW_SETTING',
-            description: 'A new setting',
+            name: "NEW_SETTING",
+            envVar: "NEW_SETTING",
+            description: "A new setting",
           },
         ],
       });
 
       const previousExtensionConfig = extensionManager.loadExtensionConfig(
-        path.join(userExtensionsDir, 'my-auto-update-ext'),
+        path.join(userExtensionsDir, "my-auto-update-ext"),
       );
 
       // 3. Attempt to update and assert it fails
       await expect(
         extensionManager.installOrUpdateExtension(
-          { source: newSourceExtDir, type: 'local', autoUpdate: true },
+          { source: newSourceExtDir, type: "local", autoUpdate: true },
           previousExtensionConfig,
         ),
       ).rejects.toThrow(
@@ -1496,24 +1418,24 @@ This extension will run the following MCP servers:
       );
     });
 
-    it('should throw an error for invalid extension names', async () => {
+    it("should throw an error for invalid extension names", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: tempHomeDir,
-        name: 'bad_name',
-        version: '1.0.0',
+        name: "bad_name",
+        version: "1.0.0",
       });
 
       await expect(
         extensionManager.installOrUpdateExtension({
           source: sourceExtDir,
-          type: 'local',
+          type: "local",
         }),
       ).rejects.toThrow('Invalid extension name: "bad_name"');
     });
 
-    describe('installing from github', () => {
-      const gitUrl = 'https://github.com/google/gemini-test-extension.git';
-      const extensionName = 'gemini-test-extension';
+    describe("installing from github", () => {
+      const gitUrl = "https://github.com/google/gemini-test-extension.git";
+      const extensionName = "gemini-test-extension";
 
       beforeEach(() => {
         // Mock the git clone behavior for github installs that fallback to it.
@@ -1523,88 +1445,80 @@ This extension will run the following MCP servers:
           });
           fs.writeFileSync(
             path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME),
-            JSON.stringify({ name: extensionName, version: '1.0.0' }),
+            JSON.stringify({ name: extensionName, version: "1.0.0" }),
           );
         });
-        mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
+        mockGit.getRemotes.mockResolvedValue([{ name: "origin" }]);
       });
 
       afterEach(() => {
         vi.restoreAllMocks();
       });
 
-      it('should install from a github release successfully', async () => {
+      it("should install from a github release successfully", async () => {
         const targetExtDir = path.join(userExtensionsDir, extensionName);
         mockDownloadFromGithubRelease.mockResolvedValue({
           success: true,
-          tagName: 'v1.0.0',
-          type: 'github-release',
+          tagName: "v1.0.0",
+          type: "github-release",
         });
 
-        const tempDir = path.join(tempHomeDir, 'temp-ext');
+        const tempDir = path.join(tempHomeDir, "temp-ext");
         fs.mkdirSync(tempDir, { recursive: true });
         createExtension({
           extensionsDir: tempDir,
           name: extensionName,
-          version: '1.0.0',
+          version: "1.0.0",
         });
-        vi.spyOn(ExtensionStorage, 'createTmpDir').mockResolvedValue(
-          join(tempDir, extensionName),
-        );
+        vi.spyOn(ExtensionStorage, "createTmpDir").mockResolvedValue(join(tempDir, extensionName));
 
         await extensionManager.loadExtensions();
         await extensionManager.installOrUpdateExtension({
           source: gitUrl,
-          type: 'github-release',
+          type: "github-release",
         });
 
         expect(fs.existsSync(targetExtDir)).toBe(true);
         const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
         expect(fs.existsSync(metadataPath)).toBe(true);
-        const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
+        const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
         expect(metadata).toEqual({
           source: gitUrl,
-          type: 'github-release',
-          releaseTag: 'v1.0.0',
+          type: "github-release",
+          releaseTag: "v1.0.0",
         });
       });
 
-      it('should fallback to git clone if github release download fails and user consents', async () => {
+      it("should fallback to git clone if github release download fails and user consents", async () => {
         mockDownloadFromGithubRelease.mockResolvedValue({
           success: false,
-          failureReason: 'failed to download asset',
-          errorMessage: 'download failed',
-          type: 'github-release',
+          failureReason: "failed to download asset",
+          errorMessage: "download failed",
+          type: "github-release",
         });
 
         await extensionManager.loadExtensions();
         await extensionManager.installOrUpdateExtension(
-          { source: gitUrl, type: 'github-release' }, // Use github-release to force consent
+          { source: gitUrl, type: "github-release" }, // Use github-release to force consent
         );
 
         // It gets called once to ask for a git clone, and once to consent to
         // the actual extension features.
         expect(mockRequestConsent).toHaveBeenCalledTimes(2);
         expect(mockRequestConsent).toHaveBeenCalledWith(
-          expect.stringContaining(
-            'Would you like to attempt to install via "git clone" instead?',
-          ),
+          expect.stringContaining('Would you like to attempt to install via "git clone" instead?'),
         );
         expect(mockGit.clone).toHaveBeenCalled();
-        const metadataPath = path.join(
-          userExtensionsDir,
-          extensionName,
-          INSTALL_METADATA_FILENAME,
-        );
-        const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
-        expect(metadata.type).toBe('git');
+        const metadataPath = path.join(userExtensionsDir, extensionName, INSTALL_METADATA_FILENAME);
+        const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
+        expect(metadata.type).toBe("git");
       });
 
-      it('should throw an error if github release download fails and user denies consent', async () => {
+      it("should throw an error if github release download fails and user denies consent", async () => {
         mockDownloadFromGithubRelease.mockResolvedValue({
           success: false,
-          errorMessage: 'download failed',
-          type: 'github-release',
+          errorMessage: "download failed",
+          type: "github-release",
         });
         mockRequestConsent.mockResolvedValue(false);
 
@@ -1612,127 +1526,112 @@ This extension will run the following MCP servers:
         await expect(
           extensionManager.installOrUpdateExtension({
             source: gitUrl,
-            type: 'github-release',
+            type: "github-release",
           }),
-        ).rejects.toThrow(
-          `Failed to install extension ${gitUrl}: download failed`,
-        );
+        ).rejects.toThrow(`Failed to install extension ${gitUrl}: download failed`);
 
         expect(mockRequestConsent).toHaveBeenCalledExactlyOnceWith(
-          expect.stringContaining(
-            'Would you like to attempt to install via "git clone" instead?',
-          ),
+          expect.stringContaining('Would you like to attempt to install via "git clone" instead?'),
         );
         expect(mockGit.clone).not.toHaveBeenCalled();
       });
 
-      it('should fallback to git clone without consent if no release data is found on first install', async () => {
+      it("should fallback to git clone without consent if no release data is found on first install", async () => {
         mockDownloadFromGithubRelease.mockResolvedValue({
           success: false,
-          failureReason: 'no release data',
-          type: 'github-release',
+          failureReason: "no release data",
+          type: "github-release",
         });
 
         await extensionManager.loadExtensions();
         await extensionManager.installOrUpdateExtension({
           source: gitUrl,
-          type: 'git',
+          type: "git",
         });
 
         // We should not see the request to use git clone, this is a repo that
         // has no github releases so it is the only install method.
         expect(mockRequestConsent).toHaveBeenCalledExactlyOnceWith(
-          expect.stringContaining(
-            'Installing extension "gemini-test-extension"',
-          ),
+          expect.stringContaining('Installing extension "gemini-test-extension"'),
         );
         expect(mockGit.clone).toHaveBeenCalled();
-        const metadataPath = path.join(
-          userExtensionsDir,
-          extensionName,
-          INSTALL_METADATA_FILENAME,
-        );
-        const metadata = JSON.parse(fs.readFileSync(metadataPath, 'utf-8'));
-        expect(metadata.type).toBe('git');
+        const metadataPath = path.join(userExtensionsDir, extensionName, INSTALL_METADATA_FILENAME);
+        const metadata = JSON.parse(fs.readFileSync(metadataPath, "utf-8"));
+        expect(metadata.type).toBe("git");
       });
 
-      it('should ask for consent if no release data is found for an existing github-release extension', async () => {
+      it("should ask for consent if no release data is found for an existing github-release extension", async () => {
         mockDownloadFromGithubRelease.mockResolvedValue({
           success: false,
-          failureReason: 'no release data',
-          errorMessage: 'No release data found',
-          type: 'github-release',
+          failureReason: "no release data",
+          errorMessage: "No release data found",
+          type: "github-release",
         });
 
         await extensionManager.loadExtensions();
         await extensionManager.installOrUpdateExtension(
-          { source: gitUrl, type: 'github-release' }, // Note the type
+          { source: gitUrl, type: "github-release" }, // Note the type
         );
 
         expect(mockRequestConsent).toHaveBeenCalledWith(
-          expect.stringContaining(
-            'Would you like to attempt to install via "git clone" instead?',
-          ),
+          expect.stringContaining('Would you like to attempt to install via "git clone" instead?'),
         );
         expect(mockGit.clone).toHaveBeenCalled();
       });
     });
   });
 
-  describe('uninstallExtension', () => {
-    it('should uninstall an extension by name', async () => {
+  describe("uninstallExtension", () => {
+    it("should uninstall an extension by name", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
       await extensionManager.loadExtensions();
-      await extensionManager.uninstallExtension('my-local-extension', false);
+      await extensionManager.uninstallExtension("my-local-extension", false);
 
       expect(fs.existsSync(sourceExtDir)).toBe(false);
     });
 
-    it('should uninstall an extension by name and retain existing extensions', async () => {
+    it("should uninstall an extension by name and retain existing extensions", async () => {
       const sourceExtDir = createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'my-local-extension',
-        version: '1.0.0',
+        name: "my-local-extension",
+        version: "1.0.0",
       });
       const otherExtDir = createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'other-extension',
-        version: '1.0.0',
+        name: "other-extension",
+        version: "1.0.0",
       });
 
       await extensionManager.loadExtensions();
-      await extensionManager.uninstallExtension('my-local-extension', false);
+      await extensionManager.uninstallExtension("my-local-extension", false);
 
       expect(fs.existsSync(sourceExtDir)).toBe(false);
       expect(extensionManager.getExtensions()).toHaveLength(1);
       expect(fs.existsSync(otherExtDir)).toBe(true);
     });
 
-    it('should uninstall an extension on non-matching extension directory name', async () => {
+    it("should uninstall an extension on non-matching extension directory name", async () => {
       // Create an extension with a name that differs from the directory name.
       const sourceExtDir = createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'My-Local-Extension',
-        version: '1.0.0',
+        name: "My-Local-Extension",
+        version: "1.0.0",
       });
-      const newSourceExtDir = path.join(
-        userExtensionsDir,
-        'my-local-extension',
-      );
+      const newSourceExtDir = path.join(userExtensionsDir, "my-local-extension");
       fs.renameSync(sourceExtDir, newSourceExtDir);
 
       const otherExtDir = createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'other-extension',
-        version: '1.0.0',
+        name: "other-extension",
+        version: "1.0.0",
       });
 
       await extensionManager.loadExtensions();
-      await extensionManager.uninstallExtension('my-local-extension', false);
+      await extensionManager.uninstallExtension("my-local-extension", false);
 
       expect(fs.existsSync(sourceExtDir)).toBe(false);
       expect(fs.existsSync(newSourceExtDir)).toBe(false);
@@ -1740,30 +1639,27 @@ This extension will run the following MCP servers:
       expect(fs.existsSync(otherExtDir)).toBe(true);
     });
 
-    it('should throw an error if the extension does not exist', async () => {
+    it("should throw an error if the extension does not exist", async () => {
       await extensionManager.loadExtensions();
       await expect(
-        extensionManager.uninstallExtension('nonexistent-extension', false),
-      ).rejects.toThrow('Extension not found.');
+        extensionManager.uninstallExtension("nonexistent-extension", false),
+      ).rejects.toThrow("Extension not found.");
     });
 
-    describe.each([true, false])('with isUpdate: %s', (isUpdate: boolean) => {
-      it(`should ${isUpdate ? 'not ' : ''}log uninstall event`, async () => {
+    describe.each([true, false])("with isUpdate: %s", (isUpdate: boolean) => {
+      it(`should ${isUpdate ? "not " : ""}log uninstall event`, async () => {
         createExtension({
           extensionsDir: userExtensionsDir,
-          name: 'my-local-extension',
-          version: '1.0.0',
+          name: "my-local-extension",
+          version: "1.0.0",
           installMetadata: {
             source: userExtensionsDir,
-            type: 'local',
+            type: "local",
           },
         });
 
         await extensionManager.loadExtensions();
-        await extensionManager.uninstallExtension(
-          'my-local-extension',
-          isUpdate,
-        );
+        await extensionManager.uninstallExtension("my-local-extension", isUpdate);
 
         if (isUpdate) {
           expect(mockLogExtensionUninstall).not.toHaveBeenCalled();
@@ -1771,44 +1667,44 @@ This extension will run the following MCP servers:
         } else {
           expect(mockLogExtensionUninstall).toHaveBeenCalled();
           expect(ExtensionUninstallEvent).toHaveBeenCalledWith(
-            hashValue('my-local-extension'),
+            hashValue("my-local-extension"),
             hashValue(userExtensionsDir),
-            'success',
+            "success",
           );
         }
       });
 
-      it(`should ${isUpdate ? 'not ' : ''} alter the extension enablement configuration`, async () => {
+      it(`should ${isUpdate ? "not " : ""} alter the extension enablement configuration`, async () => {
         createExtension({
           extensionsDir: userExtensionsDir,
-          name: 'test-extension',
-          version: '1.0.0',
+          name: "test-extension",
+          version: "1.0.0",
         });
         const enablementManager = new ExtensionEnablementManager();
-        enablementManager.enable('test-extension', true, '/some/scope');
+        enablementManager.enable("test-extension", true, "/some/scope");
 
         await extensionManager.loadExtensions();
-        await extensionManager.uninstallExtension('test-extension', isUpdate);
+        await extensionManager.uninstallExtension("test-extension", isUpdate);
 
-        const config = enablementManager.readConfig()['test-extension'];
+        const config = enablementManager.readConfig()["test-extension"];
         if (isUpdate) {
           expect(config).not.toBeUndefined();
-          expect(config.overrides).toEqual(['/some/scope/*']);
+          expect(config.overrides).toEqual(["/some/scope/*"]);
         } else {
           expect(config).toBeUndefined();
         }
       });
     });
 
-    it('should uninstall an extension by its source URL', async () => {
-      const gitUrl = 'https://github.com/google/gemini-sql-extension.git';
+    it("should uninstall an extension by its source URL", async () => {
+      const gitUrl = "https://github.com/google/gemini-sql-extension.git";
       const sourceExtDir = createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'gemini-sql-extension',
-        version: '1.0.0',
+        name: "gemini-sql-extension",
+        version: "1.0.0",
         installMetadata: {
           source: gitUrl,
-          type: 'git',
+          type: "git",
         },
       });
 
@@ -1818,131 +1714,119 @@ This extension will run the following MCP servers:
       expect(fs.existsSync(sourceExtDir)).toBe(false);
       expect(mockLogExtensionUninstall).toHaveBeenCalled();
       expect(ExtensionUninstallEvent).toHaveBeenCalledWith(
-        hashValue('gemini-sql-extension'),
-        hashValue('https://github.com/google/gemini-sql-extension'),
-        'success',
+        hashValue("gemini-sql-extension"),
+        hashValue("https://github.com/google/gemini-sql-extension"),
+        "success",
       );
     });
 
-    it('should fail to uninstall by URL if an extension has no install metadata', async () => {
+    it("should fail to uninstall by URL if an extension has no install metadata", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'no-metadata-extension',
-        version: '1.0.0',
+        name: "no-metadata-extension",
+        version: "1.0.0",
         // No installMetadata provided
       });
 
       await extensionManager.loadExtensions();
       await expect(
         extensionManager.uninstallExtension(
-          'https://github.com/google/no-metadata-extension',
+          "https://github.com/google/no-metadata-extension",
           false,
         ),
-      ).rejects.toThrow('Extension not found.');
+      ).rejects.toThrow("Extension not found.");
     });
   });
 
-  describe('disableExtension', () => {
-    it('should disable an extension at the user scope', async () => {
+  describe("disableExtension", () => {
+    it("should disable an extension at the user scope", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'my-extension',
-        version: '1.0.0',
+        name: "my-extension",
+        version: "1.0.0",
       });
 
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension(
-        'my-extension',
-        SettingScope.User,
-      );
+      await extensionManager.disableExtension("my-extension", SettingScope.User);
       expect(
         isEnabled({
-          name: 'my-extension',
+          name: "my-extension",
           enabledForPath: tempWorkspaceDir,
         }),
       ).toBe(false);
     });
 
-    it('should disable an extension at the workspace scope', async () => {
+    it("should disable an extension at the workspace scope", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'my-extension',
-        version: '1.0.0',
+        name: "my-extension",
+        version: "1.0.0",
       });
 
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension(
-        'my-extension',
-        SettingScope.Workspace,
-      );
+      await extensionManager.disableExtension("my-extension", SettingScope.Workspace);
       expect(
         isEnabled({
-          name: 'my-extension',
+          name: "my-extension",
           enabledForPath: tempHomeDir,
         }),
       ).toBe(true);
       expect(
         isEnabled({
-          name: 'my-extension',
+          name: "my-extension",
           enabledForPath: tempWorkspaceDir,
         }),
       ).toBe(false);
     });
 
-    it('should handle disabling the same extension twice', async () => {
+    it("should handle disabling the same extension twice", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'my-extension',
-        version: '1.0.0',
+        name: "my-extension",
+        version: "1.0.0",
       });
 
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension(
-        'my-extension',
-        SettingScope.User,
-      );
-      await extensionManager.disableExtension(
-        'my-extension',
-        SettingScope.User,
-      );
+      await extensionManager.disableExtension("my-extension", SettingScope.User);
+      await extensionManager.disableExtension("my-extension", SettingScope.User);
       expect(
         isEnabled({
-          name: 'my-extension',
+          name: "my-extension",
           enabledForPath: tempWorkspaceDir,
         }),
       ).toBe(false);
     });
 
-    it('should throw an error if you request system scope', async () => {
+    it("should throw an error if you request system scope", async () => {
       await expect(async () =>
-        extensionManager.disableExtension('my-extension', SettingScope.System),
-      ).rejects.toThrow('System and SystemDefaults scopes are not supported.');
+        extensionManager.disableExtension("my-extension", SettingScope.System),
+      ).rejects.toThrow("System and SystemDefaults scopes are not supported.");
     });
 
-    it('should log a disable event', async () => {
+    it("should log a disable event", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'ext1',
-        version: '1.0.0',
+        name: "ext1",
+        version: "1.0.0",
         installMetadata: {
           source: userExtensionsDir,
-          type: 'local',
+          type: "local",
         },
       });
 
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension('ext1', SettingScope.Workspace);
+      await extensionManager.disableExtension("ext1", SettingScope.Workspace);
 
       expect(mockLogExtensionDisable).toHaveBeenCalled();
       expect(ExtensionDisableEvent).toHaveBeenCalledWith(
-        hashValue('ext1'),
+        hashValue("ext1"),
         hashValue(userExtensionsDir),
         SettingScope.Workspace,
       );
     });
   });
 
-  describe('enableExtension', () => {
+  describe("enableExtension", () => {
     afterAll(() => {
       vi.restoreAllMocks();
     });
@@ -1952,57 +1836,57 @@ This extension will run the following MCP servers:
       return extensions.filter((e) => e.isActive);
     };
 
-    it('should enable an extension at the user scope', async () => {
+    it("should enable an extension at the user scope", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'ext1',
-        version: '1.0.0',
+        name: "ext1",
+        version: "1.0.0",
       });
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension('ext1', SettingScope.User);
+      await extensionManager.disableExtension("ext1", SettingScope.User);
       let activeExtensions = getActiveExtensions();
       expect(activeExtensions).toHaveLength(0);
 
-      await extensionManager.enableExtension('ext1', SettingScope.User);
+      await extensionManager.enableExtension("ext1", SettingScope.User);
       activeExtensions = await getActiveExtensions();
       expect(activeExtensions).toHaveLength(1);
-      expect(activeExtensions[0].name).toBe('ext1');
+      expect(activeExtensions[0].name).toBe("ext1");
     });
 
-    it('should enable an extension at the workspace scope', async () => {
+    it("should enable an extension at the workspace scope", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'ext1',
-        version: '1.0.0',
+        name: "ext1",
+        version: "1.0.0",
       });
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension('ext1', SettingScope.Workspace);
+      await extensionManager.disableExtension("ext1", SettingScope.Workspace);
       let activeExtensions = getActiveExtensions();
       expect(activeExtensions).toHaveLength(0);
 
-      await extensionManager.enableExtension('ext1', SettingScope.Workspace);
+      await extensionManager.enableExtension("ext1", SettingScope.Workspace);
       activeExtensions = await getActiveExtensions();
       expect(activeExtensions).toHaveLength(1);
-      expect(activeExtensions[0].name).toBe('ext1');
+      expect(activeExtensions[0].name).toBe("ext1");
     });
 
-    it('should log an enable event', async () => {
+    it("should log an enable event", async () => {
       createExtension({
         extensionsDir: userExtensionsDir,
-        name: 'ext1',
-        version: '1.0.0',
+        name: "ext1",
+        version: "1.0.0",
         installMetadata: {
           source: userExtensionsDir,
-          type: 'local',
+          type: "local",
         },
       });
       await extensionManager.loadExtensions();
-      await extensionManager.disableExtension('ext1', SettingScope.Workspace);
-      await extensionManager.enableExtension('ext1', SettingScope.Workspace);
+      await extensionManager.disableExtension("ext1", SettingScope.Workspace);
+      await extensionManager.enableExtension("ext1", SettingScope.Workspace);
 
       expect(mockLogExtensionEnable).toHaveBeenCalled();
       expect(ExtensionEnableEvent).toHaveBeenCalledWith(
-        hashValue('ext1'),
+        hashValue("ext1"),
         hashValue(userExtensionsDir),
         SettingScope.Workspace,
       );
diff --git a/packages/ui-gemini/src/config/extension.ts b/packages/ui-gemini/src/config/extension.ts
index 2de86d334..e6b73109f 100644
--- a/packages/ui-gemini/src/config/extension.ts
+++ b/packages/ui-gemini/src/config/extension.ts
@@ -4,14 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  MCPServerConfig,
-  ExtensionInstallMetadata,
-} from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { INSTALL_METADATA_FILENAME } from './extensions/variables.js';
-import type { ExtensionSetting } from './extensions/extensionSettings.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { ExtensionInstallMetadata, MCPServerConfig } from "@airiscode/gemini-cli-core";
+import type { ExtensionSetting } from "./extensions/extensionSettings.js";
+import { INSTALL_METADATA_FILENAME } from "./extensions/variables.js";
 
 /**
  * Extension definition as written to disk in gemini-extension.json files.
@@ -35,12 +32,10 @@ export interface ExtensionUpdateInfo {
   updatedVersion: string;
 }
 
-export function loadInstallMetadata(
-  extensionDir: string,
-): ExtensionInstallMetadata | undefined {
+export function loadInstallMetadata(extensionDir: string): ExtensionInstallMetadata | undefined {
   const metadataFilePath = path.join(extensionDir, INSTALL_METADATA_FILENAME);
   try {
-    const configContent = fs.readFileSync(metadataFilePath, 'utf-8');
+    const configContent = fs.readFileSync(metadataFilePath, "utf-8");
     const metadata = JSON.parse(configContent) as ExtensionInstallMetadata;
     return metadata;
   } catch (_e) {
diff --git a/packages/ui-gemini/src/config/extensions/consent.test.ts b/packages/ui-gemini/src/config/extensions/consent.test.ts
index 9023531fe..a4694a976 100644
--- a/packages/ui-gemini/src/config/extensions/consent.test.ts
+++ b/packages/ui-gemini/src/config/extensions/consent.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ConfirmationRequest } from "../../ui/types.js";
+import type { ExtensionConfig } from "../extension.js";
 import {
-  requestConsentNonInteractive,
-  requestConsentInteractive,
-  maybeRequestConsentOrFail,
   INSTALL_WARNING_MESSAGE,
-} from './consent.js';
-import type { ConfirmationRequest } from '../../ui/types.js';
-import type { ExtensionConfig } from '../extension.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+  maybeRequestConsentOrFail,
+  requestConsentInteractive,
+  requestConsentNonInteractive,
+} from "./consent.js";
 
 const mockReadline = vi.hoisted(() => ({
   createInterface: vi.fn().mockReturnValue({
@@ -23,14 +23,13 @@ const mockReadline = vi.hoisted(() => ({
 }));
 
 // Mocking readline for non-interactive prompts
-vi.mock('node:readline', () => ({
+vi.mock("node:readline", () => ({
   default: mockReadline,
   createInterface: mockReadline.createInterface,
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     debugLogger: {
@@ -39,7 +38,7 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-describe('consent', () => {
+describe("consent", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
@@ -47,207 +46,159 @@ describe('consent', () => {
     vi.restoreAllMocks();
   });
 
-  describe('requestConsentNonInteractive', () => {
+  describe("requestConsentNonInteractive", () => {
     it.each([
-      { input: 'y', expected: true },
-      { input: 'Y', expected: true },
-      { input: '', expected: true },
-      { input: 'n', expected: false },
-      { input: 'N', expected: false },
-      { input: 'yes', expected: false },
-    ])(
-      'should return $expected for input "$input"',
-      async ({ input, expected }) => {
-        const questionMock = vi.fn().mockImplementation((_, callback) => {
-          callback(input);
-        });
-        mockReadline.createInterface.mockReturnValue({
-          question: questionMock,
-          close: vi.fn(),
-        });
+      { input: "y", expected: true },
+      { input: "Y", expected: true },
+      { input: "", expected: true },
+      { input: "n", expected: false },
+      { input: "N", expected: false },
+      { input: "yes", expected: false },
+    ])('should return $expected for input "$input"', async ({ input, expected }) => {
+      const questionMock = vi.fn().mockImplementation((_, callback) => {
+        callback(input);
+      });
+      mockReadline.createInterface.mockReturnValue({
+        question: questionMock,
+        close: vi.fn(),
+      });
 
-        const consent = await requestConsentNonInteractive('Test consent');
-        expect(debugLogger.log).toHaveBeenCalledWith('Test consent');
-        expect(questionMock).toHaveBeenCalledWith(
-          'Do you want to continue? [Y/n]: ',
-          expect.any(Function),
-        );
-        expect(consent).toBe(expected);
-      },
-    );
+      const consent = await requestConsentNonInteractive("Test consent");
+      expect(debugLogger.log).toHaveBeenCalledWith("Test consent");
+      expect(questionMock).toHaveBeenCalledWith(
+        "Do you want to continue? [Y/n]: ",
+        expect.any(Function),
+      );
+      expect(consent).toBe(expected);
+    });
   });
 
-  describe('requestConsentInteractive', () => {
+  describe("requestConsentInteractive", () => {
     it.each([
       { confirmed: true, expected: true },
       { confirmed: false, expected: false },
-    ])(
-      'should resolve with $expected when user confirms with $confirmed',
-      async ({ confirmed, expected }) => {
-        const addExtensionUpdateConfirmationRequest = vi
-          .fn()
-          .mockImplementation((request: ConfirmationRequest) => {
-            request.onConfirm(confirmed);
-          });
-
-        const consent = await requestConsentInteractive(
-          'Test consent',
-          addExtensionUpdateConfirmationRequest,
-        );
-
-        expect(addExtensionUpdateConfirmationRequest).toHaveBeenCalledWith({
-          prompt: 'Test consent\n\nDo you want to continue?',
-          onConfirm: expect.any(Function),
+    ])("should resolve with $expected when user confirms with $confirmed", async ({
+      confirmed,
+      expected,
+    }) => {
+      const addExtensionUpdateConfirmationRequest = vi
+        .fn()
+        .mockImplementation((request: ConfirmationRequest) => {
+          request.onConfirm(confirmed);
         });
-        expect(consent).toBe(expected);
-      },
-    );
+
+      const consent = await requestConsentInteractive(
+        "Test consent",
+        addExtensionUpdateConfirmationRequest,
+      );
+
+      expect(addExtensionUpdateConfirmationRequest).toHaveBeenCalledWith({
+        prompt: "Test consent\n\nDo you want to continue?",
+        onConfirm: expect.any(Function),
+      });
+      expect(consent).toBe(expected);
+    });
   });
 
-  describe('maybeRequestConsentOrFail', () => {
+  describe("maybeRequestConsentOrFail", () => {
     const baseConfig: ExtensionConfig = {
-      name: 'test-ext',
-      version: '1.0.0',
+      name: "test-ext",
+      version: "1.0.0",
     };
 
-    it('should request consent if there is no previous config', async () => {
+    it("should request consent if there is no previous config", async () => {
       const requestConsent = vi.fn().mockResolvedValue(true);
-      await maybeRequestConsentOrFail(
-        baseConfig,
-        requestConsent,
-        false,
-        undefined,
-      );
+      await maybeRequestConsentOrFail(baseConfig, requestConsent, false, undefined);
       expect(requestConsent).toHaveBeenCalledTimes(1);
     });
 
-    it('should not request consent if configs are identical', async () => {
+    it("should not request consent if configs are identical", async () => {
       const requestConsent = vi.fn().mockResolvedValue(true);
-      await maybeRequestConsentOrFail(
-        baseConfig,
-        requestConsent,
-        false,
-        baseConfig,
-        false,
-      );
+      await maybeRequestConsentOrFail(baseConfig, requestConsent, false, baseConfig, false);
       expect(requestConsent).not.toHaveBeenCalled();
     });
 
-    it('should throw an error if consent is denied', async () => {
+    it("should throw an error if consent is denied", async () => {
       const requestConsent = vi.fn().mockResolvedValue(false);
       await expect(
         maybeRequestConsentOrFail(baseConfig, requestConsent, false, undefined),
       ).rejects.toThrow('Installation cancelled for "test-ext".');
     });
 
-    describe('consent string generation', () => {
-      it('should generate a consent string with all fields', async () => {
+    describe("consent string generation", () => {
+      it("should generate a consent string with all fields", async () => {
         const config: ExtensionConfig = {
           ...baseConfig,
           mcpServers: {
-            server1: { command: 'npm', args: ['start'] },
-            server2: { httpUrl: 'https://remote.com' },
+            server1: { command: "npm", args: ["start"] },
+            server2: { httpUrl: "https://remote.com" },
           },
-          contextFileName: 'my-context.md',
-          excludeTools: ['tool1', 'tool2'],
+          contextFileName: "my-context.md",
+          excludeTools: ["tool1", "tool2"],
         };
         const requestConsent = vi.fn().mockResolvedValue(true);
-        await maybeRequestConsentOrFail(
-          config,
-          requestConsent,
-          false,
-          undefined,
-        );
+        await maybeRequestConsentOrFail(config, requestConsent, false, undefined);
 
         const expectedConsentString = [
           'Installing extension "test-ext".',
           INSTALL_WARNING_MESSAGE,
-          'This extension will run the following MCP servers:',
-          '  * server1 (local): npm start',
-          '  * server2 (remote): https://remote.com',
-          'This extension will append info to your gemini.md context using my-context.md',
-          'This extension will exclude the following core tools: tool1,tool2',
-        ].join('\n');
+          "This extension will run the following MCP servers:",
+          "  * server1 (local): npm start",
+          "  * server2 (remote): https://remote.com",
+          "This extension will append info to your gemini.md context using my-context.md",
+          "This extension will exclude the following core tools: tool1,tool2",
+        ].join("\n");
 
         expect(requestConsent).toHaveBeenCalledWith(expectedConsentString);
       });
 
-      it('should request consent if mcpServers change', async () => {
+      it("should request consent if mcpServers change", async () => {
         const prevConfig: ExtensionConfig = { ...baseConfig };
         const newConfig: ExtensionConfig = {
           ...baseConfig,
-          mcpServers: { server1: { command: 'npm', args: ['start'] } },
+          mcpServers: { server1: { command: "npm", args: ["start"] } },
         };
         const requestConsent = vi.fn().mockResolvedValue(true);
-        await maybeRequestConsentOrFail(
-          newConfig,
-          requestConsent,
-          false,
-          prevConfig,
-          false,
-        );
+        await maybeRequestConsentOrFail(newConfig, requestConsent, false, prevConfig, false);
         expect(requestConsent).toHaveBeenCalledTimes(1);
       });
 
-      it('should request consent if contextFileName changes', async () => {
+      it("should request consent if contextFileName changes", async () => {
         const prevConfig: ExtensionConfig = { ...baseConfig };
         const newConfig: ExtensionConfig = {
           ...baseConfig,
-          contextFileName: 'new-context.md',
+          contextFileName: "new-context.md",
         };
         const requestConsent = vi.fn().mockResolvedValue(true);
-        await maybeRequestConsentOrFail(
-          newConfig,
-          requestConsent,
-          false,
-          prevConfig,
-          false,
-        );
+        await maybeRequestConsentOrFail(newConfig, requestConsent, false, prevConfig, false);
         expect(requestConsent).toHaveBeenCalledTimes(1);
       });
 
-      it('should request consent if excludeTools changes', async () => {
+      it("should request consent if excludeTools changes", async () => {
         const prevConfig: ExtensionConfig = { ...baseConfig };
         const newConfig: ExtensionConfig = {
           ...baseConfig,
-          excludeTools: ['new-tool'],
+          excludeTools: ["new-tool"],
         };
         const requestConsent = vi.fn().mockResolvedValue(true);
-        await maybeRequestConsentOrFail(
-          newConfig,
-          requestConsent,
-          false,
-          prevConfig,
-          false,
-        );
+        await maybeRequestConsentOrFail(newConfig, requestConsent, false, prevConfig, false);
         expect(requestConsent).toHaveBeenCalledTimes(1);
       });
 
-      it('should include warning when hooks are present', async () => {
+      it("should include warning when hooks are present", async () => {
         const requestConsent = vi.fn().mockResolvedValue(true);
-        await maybeRequestConsentOrFail(
-          baseConfig,
-          requestConsent,
-          true,
-          undefined,
-        );
+        await maybeRequestConsentOrFail(baseConfig, requestConsent, true, undefined);
 
         expect(requestConsent).toHaveBeenCalledWith(
           expect.stringContaining(
-            '⚠️  This extension contains Hooks which can automatically execute commands.',
+            "⚠️  This extension contains Hooks which can automatically execute commands.",
           ),
         );
       });
 
-      it('should request consent if hooks status changes', async () => {
+      it("should request consent if hooks status changes", async () => {
         const requestConsent = vi.fn().mockResolvedValue(true);
-        await maybeRequestConsentOrFail(
-          baseConfig,
-          requestConsent,
-          true,
-          baseConfig,
-          false,
-        );
+        await maybeRequestConsentOrFail(baseConfig, requestConsent, true, baseConfig, false);
         expect(requestConsent).toHaveBeenCalledTimes(1);
       });
     });
diff --git a/packages/ui-gemini/src/config/extensions/consent.ts b/packages/ui-gemini/src/config/extensions/consent.ts
index b6f5c0ad5..59822204b 100644
--- a/packages/ui-gemini/src/config/extensions/consent.ts
+++ b/packages/ui-gemini/src/config/extensions/consent.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
 
-import type { ConfirmationRequest } from '../../ui/types.js';
-import { escapeAnsiCtrlCodes } from '../../ui/utils/textUtils.js';
-import type { ExtensionConfig } from '../extension.js';
+import type { ConfirmationRequest } from "../../ui/types.js";
+import { escapeAnsiCtrlCodes } from "../../ui/utils/textUtils.js";
+import type { ExtensionConfig } from "../extension.js";
 
 export const INSTALL_WARNING_MESSAGE =
-  '**The extension you are about to install may have been created by a third-party developer and sourced from a public repository. Google does not vet, endorse, or guarantee the functionality or security of extensions. Please carefully inspect any extension and its source code before installing to understand the permissions it requires and the actions it may perform.**';
+  "**The extension you are about to install may have been created by a third-party developer and sourced from a public repository. Google does not vet, endorse, or guarantee the functionality or security of extensions. Please carefully inspect any extension and its source code before installing to understand the permissions it requires and the actions it may perform.**";
 
 /**
  * Requests consent from the user to perform an action, by reading a Y/n
@@ -22,13 +22,9 @@ export const INSTALL_WARNING_MESSAGE =
  * @param consentDescription The description of the thing they will be consenting to.
  * @returns boolean, whether they consented or not.
  */
-export async function requestConsentNonInteractive(
-  consentDescription: string,
-): Promise<boolean> {
+export async function requestConsentNonInteractive(consentDescription: string): Promise<boolean> {
   debugLogger.log(consentDescription);
-  const result = await promptForConsentNonInteractive(
-    'Do you want to continue? [Y/n]: ',
-  );
+  const result = await promptForConsentNonInteractive("Do you want to continue? [Y/n]: ");
   return result;
 }
 
@@ -46,7 +42,7 @@ export async function requestConsentInteractive(
   addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
 ): Promise<boolean> {
   return promptForConsentInteractive(
-    consentDescription + '\n\nDo you want to continue?',
+    consentDescription + "\n\nDo you want to continue?",
     addExtensionUpdateConfirmationRequest,
   );
 }
@@ -59,10 +55,8 @@ export async function requestConsentInteractive(
  * @param prompt A yes/no prompt to ask the user
  * @returns Whether or not the user answers 'y' (yes). Defaults to 'yes' on enter.
  */
-async function promptForConsentNonInteractive(
-  prompt: string,
-): Promise<boolean> {
-  const readline = await import('node:readline');
+async function promptForConsentNonInteractive(prompt: string): Promise<boolean> {
+  const readline = await import("node:readline");
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout,
@@ -71,7 +65,7 @@ async function promptForConsentNonInteractive(
   return new Promise((resolve) => {
     rl.question(prompt, (answer) => {
       rl.close();
-      resolve(['y', ''].includes(answer.trim().toLowerCase()));
+      resolve(["y", ""].includes(answer.trim().toLowerCase()));
     });
   });
 }
@@ -103,10 +97,7 @@ async function promptForConsentInteractive(
  * Builds a consent string for installing an extension based on it's
  * extensionConfig.
  */
-function extensionConsentString(
-  extensionConfig: ExtensionConfig,
-  hasHooks: boolean,
-): string {
+function extensionConsentString(extensionConfig: ExtensionConfig, hasHooks: boolean): string {
   const sanitizedConfig = escapeAnsiCtrlCodes(extensionConfig);
   const output: string[] = [];
   const mcpServerEntries = Object.entries(sanitizedConfig.mcpServers || {});
@@ -114,13 +105,13 @@ function extensionConsentString(
   output.push(INSTALL_WARNING_MESSAGE);
 
   if (mcpServerEntries.length) {
-    output.push('This extension will run the following MCP servers:');
+    output.push("This extension will run the following MCP servers:");
     for (const [key, mcpServer] of mcpServerEntries) {
       const isLocal = !!mcpServer.command;
       const source =
         mcpServer.httpUrl ??
-        `${mcpServer.command || ''}${mcpServer.args ? ' ' + mcpServer.args.join(' ') : ''}`;
-      output.push(`  * ${key} (${isLocal ? 'local' : 'remote'}): ${source}`);
+        `${mcpServer.command || ""}${mcpServer.args ? " " + mcpServer.args.join(" ") : ""}`;
+      output.push(`  * ${key} (${isLocal ? "local" : "remote"}): ${source}`);
     }
   }
   if (sanitizedConfig.contextFileName) {
@@ -134,11 +125,9 @@ function extensionConsentString(
     );
   }
   if (hasHooks) {
-    output.push(
-      '⚠️  This extension contains Hooks which can automatically execute commands.',
-    );
+    output.push("⚠️  This extension contains Hooks which can automatically execute commands.");
   }
-  return output.join('\n');
+  return output.join("\n");
 }
 
 /**
diff --git a/packages/ui-gemini/src/config/extensions/extensionEnablement.test.ts b/packages/ui-gemini/src/config/extensions/extensionEnablement.test.ts
index 14697b0d1..ebf4d4ea5 100644
--- a/packages/ui-gemini/src/config/extensions/extensionEnablement.test.ts
+++ b/packages/ui-gemini/src/config/extensions/extensionEnablement.test.ts
@@ -4,25 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import fs from 'node:fs';
+import fs from "node:fs";
+import * as path from "node:path";
 
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { ExtensionEnablementManager, Override } from './extensionEnablement.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ExtensionEnablementManager, Override } from "./extensionEnablement.js";
 
-import { ExtensionStorage } from './storage.js';
+import { ExtensionStorage } from "./storage.js";
 
-vi.mock('./storage.js');
+vi.mock("./storage.js");
 
-import {
-  coreEvents,
-  GEMINI_DIR,
-  type GeminiCLIExtension,
-} from '@airiscode/gemini-cli-core';
+import { coreEvents, GEMINI_DIR, type GeminiCLIExtension } from "@airiscode/gemini-cli-core";
 
-vi.mock('node:os', () => ({
-  homedir: vi.fn().mockReturnValue('/virtual-home'),
-  tmpdir: vi.fn().mockReturnValue('/virtual-tmp'),
+vi.mock("node:os", () => ({
+  homedir: vi.fn().mockReturnValue("/virtual-home"),
+  tmpdir: vi.fn().mockReturnValue("/virtual-tmp"),
 }));
 
 const inMemoryFs: { [key: string]: string } = {};
@@ -30,7 +26,7 @@ const inMemoryFs: { [key: string]: string } = {};
 // Helper to create a temporary directory for testing
 function createTestDir() {
   const dirPath = `/virtual-tmp/gemini-test-${Math.random().toString(36).substring(2, 15)}`;
-  inMemoryFs[dirPath] = ''; // Simulate directory existence
+  inMemoryFs[dirPath] = ""; // Simulate directory existence
   return {
     path: dirPath,
     cleanup: () => {
@@ -46,7 +42,7 @@ function createTestDir() {
 let testDir: { path: string; cleanup: () => void };
 let manager: ExtensionEnablementManager;
 
-describe('ExtensionEnablementManager', () => {
+describe("ExtensionEnablementManager", () => {
   beforeEach(() => {
     // Clear the in-memory file system before each test
     for (const key in inMemoryFs) {
@@ -55,38 +51,28 @@ describe('ExtensionEnablementManager', () => {
     expect(Object.keys(inMemoryFs).length).toBe(0); // Add this assertion
 
     // Mock fs functions
-    vi.spyOn(fs, 'readFileSync').mockImplementation(
-      (path: fs.PathOrFileDescriptor) => {
-        const content = inMemoryFs[path.toString()];
-        if (content === undefined) {
-          const error = new Error(
-            `ENOENT: no such file or directory, open '${path}'`,
-          );
-          (error as NodeJS.ErrnoException).code = 'ENOENT';
-          throw error;
-        }
-        return content;
-      },
-    );
-    vi.spyOn(fs, 'writeFileSync').mockImplementation(
-      (
-        path: fs.PathOrFileDescriptor,
-        data: string | ArrayBufferView<ArrayBufferLike>,
-      ) => {
+    vi.spyOn(fs, "readFileSync").mockImplementation((path: fs.PathOrFileDescriptor) => {
+      const content = inMemoryFs[path.toString()];
+      if (content === undefined) {
+        const error = new Error(`ENOENT: no such file or directory, open '${path}'`);
+        (error as NodeJS.ErrnoException).code = "ENOENT";
+        throw error;
+      }
+      return content;
+    });
+    vi.spyOn(fs, "writeFileSync").mockImplementation(
+      (path: fs.PathOrFileDescriptor, data: string | ArrayBufferView<ArrayBufferLike>) => {
         inMemoryFs[path.toString()] = data.toString(); // Convert ArrayBufferView to string for inMemoryFs
       },
     );
-    vi.spyOn(fs, 'mkdirSync').mockImplementation(
-      (
-        _path: fs.PathLike,
-        _options?: fs.MakeDirectoryOptions | fs.Mode | null,
-      ) => undefined,
+    vi.spyOn(fs, "mkdirSync").mockImplementation(
+      (_path: fs.PathLike, _options?: fs.MakeDirectoryOptions | fs.Mode | null) => undefined,
     );
-    vi.spyOn(fs, 'mkdtempSync').mockImplementation((prefix: string) => {
-      const virtualPath = `/virtual-tmp/${prefix.replace(/[^a-zA-Z0-9]/g, '')}`;
+    vi.spyOn(fs, "mkdtempSync").mockImplementation((prefix: string) => {
+      const virtualPath = `/virtual-tmp/${prefix.replace(/[^a-zA-Z0-9]/g, "")}`;
       return virtualPath;
     });
-    vi.spyOn(fs, 'rmSync').mockImplementation(() => {});
+    vi.spyOn(fs, "rmSync").mockImplementation(() => {});
 
     testDir = createTestDir();
     vi.mocked(ExtensionStorage.getUserExtensionsDir).mockReturnValue(
@@ -102,433 +88,398 @@ describe('ExtensionEnablementManager', () => {
     (ExtensionEnablementManager as any).instance = undefined;
   });
 
-  describe('isEnabled', () => {
-    it('should return true if extension is not configured', () => {
-      expect(manager.isEnabled('ext-test', '/any/path')).toBe(true);
+  describe("isEnabled", () => {
+    it("should return true if extension is not configured", () => {
+      expect(manager.isEnabled("ext-test", "/any/path")).toBe(true);
     });
 
-    it('should return true if no overrides match', () => {
-      manager.disable('ext-test', false, '/another/path');
-      expect(manager.isEnabled('ext-test', '/any/path')).toBe(true);
+    it("should return true if no overrides match", () => {
+      manager.disable("ext-test", false, "/another/path");
+      expect(manager.isEnabled("ext-test", "/any/path")).toBe(true);
     });
 
-    it('should enable a path based on an override rule', () => {
-      manager.disable('ext-test', true, '/');
-      manager.enable('ext-test', true, '/home/user/projects/');
-      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
-        true,
-      );
+    it("should enable a path based on an override rule", () => {
+      manager.disable("ext-test", true, "/");
+      manager.enable("ext-test", true, "/home/user/projects/");
+      expect(manager.isEnabled("ext-test", "/home/user/projects/my-app")).toBe(true);
     });
 
-    it('should disable a path based on a disable override rule', () => {
-      manager.enable('ext-test', true, '/');
-      manager.disable('ext-test', true, '/home/user/projects/');
-      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
-        false,
-      );
+    it("should disable a path based on a disable override rule", () => {
+      manager.enable("ext-test", true, "/");
+      manager.disable("ext-test", true, "/home/user/projects/");
+      expect(manager.isEnabled("ext-test", "/home/user/projects/my-app")).toBe(false);
     });
 
-    it('should respect the last matching rule (enable wins)', () => {
-      manager.disable('ext-test', true, '/home/user/projects/');
-      manager.enable('ext-test', false, '/home/user/projects/my-app');
-      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
-        true,
-      );
+    it("should respect the last matching rule (enable wins)", () => {
+      manager.disable("ext-test", true, "/home/user/projects/");
+      manager.enable("ext-test", false, "/home/user/projects/my-app");
+      expect(manager.isEnabled("ext-test", "/home/user/projects/my-app")).toBe(true);
     });
 
-    it('should respect the last matching rule (disable wins)', () => {
-      manager.enable('ext-test', true, '/home/user/projects/');
-      manager.disable('ext-test', false, '/home/user/projects/my-app');
-      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
-        false,
-      );
+    it("should respect the last matching rule (disable wins)", () => {
+      manager.enable("ext-test", true, "/home/user/projects/");
+      manager.disable("ext-test", false, "/home/user/projects/my-app");
+      expect(manager.isEnabled("ext-test", "/home/user/projects/my-app")).toBe(false);
     });
 
-    it('should handle overlapping rules correctly', () => {
-      manager.enable('ext-test', true, '/home/user/projects');
-      manager.disable('ext-test', false, '/home/user/projects/my-app');
-      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
-        false,
-      );
-      expect(
-        manager.isEnabled('ext-test', '/home/user/projects/something-else'),
-      ).toBe(true);
+    it("should handle overlapping rules correctly", () => {
+      manager.enable("ext-test", true, "/home/user/projects");
+      manager.disable("ext-test", false, "/home/user/projects/my-app");
+      expect(manager.isEnabled("ext-test", "/home/user/projects/my-app")).toBe(false);
+      expect(manager.isEnabled("ext-test", "/home/user/projects/something-else")).toBe(true);
     });
   });
 
-  describe('remove', () => {
-    it('should remove an extension from the config', () => {
-      manager.enable('ext-test', true, '/path/to/dir');
+  describe("remove", () => {
+    it("should remove an extension from the config", () => {
+      manager.enable("ext-test", true, "/path/to/dir");
       const config = manager.readConfig();
-      expect(config['ext-test']).toBeDefined();
+      expect(config["ext-test"]).toBeDefined();
 
-      manager.remove('ext-test');
+      manager.remove("ext-test");
       const newConfig = manager.readConfig();
-      expect(newConfig['ext-test']).toBeUndefined();
+      expect(newConfig["ext-test"]).toBeUndefined();
     });
 
-    it('should not throw when removing a non-existent extension', () => {
+    it("should not throw when removing a non-existent extension", () => {
       const config = manager.readConfig();
-      expect(config['ext-test']).toBeUndefined();
-      expect(() => manager.remove('ext-test')).not.toThrow();
+      expect(config["ext-test"]).toBeUndefined();
+      expect(() => manager.remove("ext-test")).not.toThrow();
     });
   });
 
-  describe('readConfig', () => {
-    it('should return an empty object if the config file is corrupted', () => {
-      const configPath = path.join(
-        testDir.path,
-        GEMINI_DIR,
-        'extension-enablement.json',
-      );
+  describe("readConfig", () => {
+    it("should return an empty object if the config file is corrupted", () => {
+      const configPath = path.join(testDir.path, GEMINI_DIR, "extension-enablement.json");
       fs.mkdirSync(path.dirname(configPath), { recursive: true });
-      fs.writeFileSync(configPath, 'not a json');
+      fs.writeFileSync(configPath, "not a json");
       const config = manager.readConfig();
       expect(config).toEqual({});
     });
 
-    it('should return an empty object on generic read error', () => {
-      vi.spyOn(fs, 'readFileSync').mockImplementation(() => {
-        throw new Error('Read error');
+    it("should return an empty object on generic read error", () => {
+      vi.spyOn(fs, "readFileSync").mockImplementation(() => {
+        throw new Error("Read error");
       });
       const config = manager.readConfig();
       expect(config).toEqual({});
     });
   });
 
-  describe('includeSubdirs', () => {
-    it('should add a glob when enabling with includeSubdirs', () => {
-      manager.enable('ext-test', true, '/path/to/dir');
+  describe("includeSubdirs", () => {
+    it("should add a glob when enabling with includeSubdirs", () => {
+      manager.enable("ext-test", true, "/path/to/dir");
       const config = manager.readConfig();
-      expect(config['ext-test'].overrides).toContain('/path/to/dir/*');
+      expect(config["ext-test"].overrides).toContain("/path/to/dir/*");
     });
 
-    it('should not add a glob when enabling without includeSubdirs', () => {
-      manager.enable('ext-test', false, '/path/to/dir');
+    it("should not add a glob when enabling without includeSubdirs", () => {
+      manager.enable("ext-test", false, "/path/to/dir");
       const config = manager.readConfig();
-      expect(config['ext-test'].overrides).toContain('/path/to/dir/');
-      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
+      expect(config["ext-test"].overrides).toContain("/path/to/dir/");
+      expect(config["ext-test"].overrides).not.toContain("/path/to/dir/*");
     });
 
-    it('should add a glob when disabling with includeSubdirs', () => {
-      manager.disable('ext-test', true, '/path/to/dir');
+    it("should add a glob when disabling with includeSubdirs", () => {
+      manager.disable("ext-test", true, "/path/to/dir");
       const config = manager.readConfig();
-      expect(config['ext-test'].overrides).toContain('!/path/to/dir/*');
+      expect(config["ext-test"].overrides).toContain("!/path/to/dir/*");
     });
 
-    it('should remove conflicting glob rule when enabling without subdirs', () => {
-      manager.enable('ext-test', true, '/path/to/dir'); // Adds /path/to/dir*
-      manager.enable('ext-test', false, '/path/to/dir'); // Should remove the glob
+    it("should remove conflicting glob rule when enabling without subdirs", () => {
+      manager.enable("ext-test", true, "/path/to/dir"); // Adds /path/to/dir*
+      manager.enable("ext-test", false, "/path/to/dir"); // Should remove the glob
       const config = manager.readConfig();
-      expect(config['ext-test'].overrides).toContain('/path/to/dir/');
-      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
+      expect(config["ext-test"].overrides).toContain("/path/to/dir/");
+      expect(config["ext-test"].overrides).not.toContain("/path/to/dir/*");
     });
 
-    it('should remove conflicting non-glob rule when enabling with subdirs', () => {
-      manager.enable('ext-test', false, '/path/to/dir'); // Adds /path/to/dir
-      manager.enable('ext-test', true, '/path/to/dir'); // Should remove the non-glob
+    it("should remove conflicting non-glob rule when enabling with subdirs", () => {
+      manager.enable("ext-test", false, "/path/to/dir"); // Adds /path/to/dir
+      manager.enable("ext-test", true, "/path/to/dir"); // Should remove the non-glob
       const config = manager.readConfig();
-      expect(config['ext-test'].overrides).toContain('/path/to/dir/*');
-      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/');
+      expect(config["ext-test"].overrides).toContain("/path/to/dir/*");
+      expect(config["ext-test"].overrides).not.toContain("/path/to/dir/");
     });
 
-    it('should remove conflicting rules when disabling', () => {
-      manager.enable('ext-test', true, '/path/to/dir'); // enabled with glob
-      manager.disable('ext-test', false, '/path/to/dir'); // disabled without
+    it("should remove conflicting rules when disabling", () => {
+      manager.enable("ext-test", true, "/path/to/dir"); // enabled with glob
+      manager.disable("ext-test", false, "/path/to/dir"); // disabled without
       const config = manager.readConfig();
-      expect(config['ext-test'].overrides).toContain('!/path/to/dir/');
-      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
+      expect(config["ext-test"].overrides).toContain("!/path/to/dir/");
+      expect(config["ext-test"].overrides).not.toContain("/path/to/dir/*");
     });
 
-    it('should correctly evaluate isEnabled with subdirs', () => {
-      manager.disable('ext-test', true, '/');
-      manager.enable('ext-test', true, '/path/to/dir');
-      expect(manager.isEnabled('ext-test', '/path/to/dir/')).toBe(true);
-      expect(manager.isEnabled('ext-test', '/path/to/dir/sub/')).toBe(true);
-      expect(manager.isEnabled('ext-test', '/path/to/another/')).toBe(false);
+    it("should correctly evaluate isEnabled with subdirs", () => {
+      manager.disable("ext-test", true, "/");
+      manager.enable("ext-test", true, "/path/to/dir");
+      expect(manager.isEnabled("ext-test", "/path/to/dir/")).toBe(true);
+      expect(manager.isEnabled("ext-test", "/path/to/dir/sub/")).toBe(true);
+      expect(manager.isEnabled("ext-test", "/path/to/another/")).toBe(false);
     });
 
-    it('should correctly evaluate isEnabled without subdirs', () => {
-      manager.disable('ext-test', true, '/*');
-      manager.enable('ext-test', false, '/path/to/dir');
-      expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(true);
-      expect(manager.isEnabled('ext-test', '/path/to/dir/sub')).toBe(false);
+    it("should correctly evaluate isEnabled without subdirs", () => {
+      manager.disable("ext-test", true, "/*");
+      manager.enable("ext-test", false, "/path/to/dir");
+      expect(manager.isEnabled("ext-test", "/path/to/dir")).toBe(true);
+      expect(manager.isEnabled("ext-test", "/path/to/dir/sub")).toBe(false);
     });
   });
 
-  describe('pruning child rules', () => {
-    it('should remove child rules when enabling a parent with subdirs', () => {
+  describe("pruning child rules", () => {
+    it("should remove child rules when enabling a parent with subdirs", () => {
       // Pre-existing rules for children
-      manager.enable('ext-test', false, '/path/to/dir/subdir1');
-      manager.disable('ext-test', true, '/path/to/dir/subdir2');
-      manager.enable('ext-test', false, '/path/to/another/dir');
+      manager.enable("ext-test", false, "/path/to/dir/subdir1");
+      manager.disable("ext-test", true, "/path/to/dir/subdir2");
+      manager.enable("ext-test", false, "/path/to/another/dir");
 
       // Enable the parent directory
-      manager.enable('ext-test', true, '/path/to/dir');
+      manager.enable("ext-test", true, "/path/to/dir");
 
       const config = manager.readConfig();
-      const overrides = config['ext-test'].overrides;
+      const overrides = config["ext-test"].overrides;
 
       // The new parent rule should be present
       expect(overrides).toContain(`/path/to/dir/*`);
 
       // Child rules should be removed
-      expect(overrides).not.toContain('/path/to/dir/subdir1/');
+      expect(overrides).not.toContain("/path/to/dir/subdir1/");
       expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`);
 
       // Unrelated rules should remain
-      expect(overrides).toContain('/path/to/another/dir/');
+      expect(overrides).toContain("/path/to/another/dir/");
     });
 
-    it('should remove child rules when disabling a parent with subdirs', () => {
+    it("should remove child rules when disabling a parent with subdirs", () => {
       // Pre-existing rules for children
-      manager.enable('ext-test', false, '/path/to/dir/subdir1');
-      manager.disable('ext-test', true, '/path/to/dir/subdir2');
-      manager.enable('ext-test', false, '/path/to/another/dir');
+      manager.enable("ext-test", false, "/path/to/dir/subdir1");
+      manager.disable("ext-test", true, "/path/to/dir/subdir2");
+      manager.enable("ext-test", false, "/path/to/another/dir");
 
       // Disable the parent directory
-      manager.disable('ext-test', true, '/path/to/dir');
+      manager.disable("ext-test", true, "/path/to/dir");
 
       const config = manager.readConfig();
-      const overrides = config['ext-test'].overrides;
+      const overrides = config["ext-test"].overrides;
 
       // The new parent rule should be present
       expect(overrides).toContain(`!/path/to/dir/*`);
 
       // Child rules should be removed
-      expect(overrides).not.toContain('/path/to/dir/subdir1/');
+      expect(overrides).not.toContain("/path/to/dir/subdir1/");
       expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`);
 
       // Unrelated rules should remain
-      expect(overrides).toContain('/path/to/another/dir/');
+      expect(overrides).toContain("/path/to/another/dir/");
     });
 
-    it('should not remove child rules if includeSubdirs is false', () => {
-      manager.enable('ext-test', false, '/path/to/dir/subdir1');
-      manager.enable('ext-test', false, '/path/to/dir'); // Not including subdirs
+    it("should not remove child rules if includeSubdirs is false", () => {
+      manager.enable("ext-test", false, "/path/to/dir/subdir1");
+      manager.enable("ext-test", false, "/path/to/dir"); // Not including subdirs
 
       const config = manager.readConfig();
-      const overrides = config['ext-test'].overrides;
+      const overrides = config["ext-test"].overrides;
 
-      expect(overrides).toContain('/path/to/dir/subdir1/');
-      expect(overrides).toContain('/path/to/dir/');
+      expect(overrides).toContain("/path/to/dir/subdir1/");
+      expect(overrides).toContain("/path/to/dir/");
     });
   });
 
-  it('should correctly prioritize more specific enable rules', () => {
-    manager.disable('ext-test', true, '/Users/chrstn');
-    manager.enable('ext-test', true, '/Users/chrstn/gemini-cli');
+  it("should correctly prioritize more specific enable rules", () => {
+    manager.disable("ext-test", true, "/Users/chrstn");
+    manager.enable("ext-test", true, "/Users/chrstn/gemini-cli");
 
-    expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe(
-      true,
-    );
+    expect(manager.isEnabled("ext-test", "/Users/chrstn/gemini-cli")).toBe(true);
   });
 
-  it('should not disable subdirectories if includeSubdirs is false', () => {
-    manager.disable('ext-test', false, '/Users/chrstn');
-    expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe(
-      true,
-    );
+  it("should not disable subdirectories if includeSubdirs is false", () => {
+    manager.disable("ext-test", false, "/Users/chrstn");
+    expect(manager.isEnabled("ext-test", "/Users/chrstn/gemini-cli")).toBe(true);
   });
 
-  describe('extension overrides (-e <name>)', () => {
+  describe("extension overrides (-e <name>)", () => {
     beforeEach(() => {
-      manager = new ExtensionEnablementManager(['ext-test']);
+      manager = new ExtensionEnablementManager(["ext-test"]);
     });
 
-    it('can enable extensions, case-insensitive', () => {
-      manager.disable('ext-test', true, '/');
-      expect(manager.isEnabled('ext-test', '/')).toBe(true);
-      expect(manager.isEnabled('Ext-Test', '/')).toBe(true);
+    it("can enable extensions, case-insensitive", () => {
+      manager.disable("ext-test", true, "/");
+      expect(manager.isEnabled("ext-test", "/")).toBe(true);
+      expect(manager.isEnabled("Ext-Test", "/")).toBe(true);
       // Double check that it would have been disabled otherwise
-      expect(new ExtensionEnablementManager().isEnabled('ext-test', '/')).toBe(
-        false,
-      );
+      expect(new ExtensionEnablementManager().isEnabled("ext-test", "/")).toBe(false);
     });
 
-    it('disable all other extensions', () => {
-      manager = new ExtensionEnablementManager(['ext-test']);
-      manager.enable('ext-test-2', true, '/');
-      expect(manager.isEnabled('ext-test-2', '/')).toBe(false);
+    it("disable all other extensions", () => {
+      manager = new ExtensionEnablementManager(["ext-test"]);
+      manager.enable("ext-test-2", true, "/");
+      expect(manager.isEnabled("ext-test-2", "/")).toBe(false);
       // Double check that it would have been enabled otherwise
-      expect(
-        new ExtensionEnablementManager().isEnabled('ext-test-2', '/'),
-      ).toBe(true);
+      expect(new ExtensionEnablementManager().isEnabled("ext-test-2", "/")).toBe(true);
     });
 
-    it('none disables all extensions', () => {
-      manager = new ExtensionEnablementManager(['none']);
-      manager.enable('ext-test', true, '/');
-      expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(false);
+    it("none disables all extensions", () => {
+      manager = new ExtensionEnablementManager(["none"]);
+      manager.enable("ext-test", true, "/");
+      expect(manager.isEnabled("ext-test", "/path/to/dir")).toBe(false);
       // Double check that it would have been enabled otherwise
-      expect(new ExtensionEnablementManager().isEnabled('ext-test', '/')).toBe(
-        true,
-      );
+      expect(new ExtensionEnablementManager().isEnabled("ext-test", "/")).toBe(true);
     });
   });
 
-  describe('validateExtensionOverrides', () => {
+  describe("validateExtensionOverrides", () => {
     let coreEventsEmitSpy: ReturnType<typeof vi.spyOn>;
 
     beforeEach(() => {
-      coreEventsEmitSpy = vi.spyOn(coreEvents, 'emitFeedback');
+      coreEventsEmitSpy = vi.spyOn(coreEvents, "emitFeedback");
     });
 
     afterEach(() => {
       coreEventsEmitSpy.mockRestore();
     });
 
-    it('should not log an error if enabledExtensionNamesOverride is empty', () => {
+    it("should not log an error if enabledExtensionNamesOverride is empty", () => {
       const manager = new ExtensionEnablementManager([]);
       manager.validateExtensionOverrides([]);
       expect(coreEventsEmitSpy).not.toHaveBeenCalled();
     });
 
-    it('should not log an error if all enabledExtensionNamesOverride are valid', () => {
-      const manager = new ExtensionEnablementManager(['ext-one', 'ext-two']);
-      const extensions = [
-        { name: 'ext-one' },
-        { name: 'ext-two' },
-      ] as GeminiCLIExtension[];
+    it("should not log an error if all enabledExtensionNamesOverride are valid", () => {
+      const manager = new ExtensionEnablementManager(["ext-one", "ext-two"]);
+      const extensions = [{ name: "ext-one" }, { name: "ext-two" }] as GeminiCLIExtension[];
       manager.validateExtensionOverrides(extensions);
       expect(coreEventsEmitSpy).not.toHaveBeenCalled();
     });
 
-    it('should log an error for each invalid extension name in enabledExtensionNamesOverride', () => {
+    it("should log an error for each invalid extension name in enabledExtensionNamesOverride", () => {
       const manager = new ExtensionEnablementManager([
-        'ext-one',
-        'ext-invalid',
-        'ext-another-invalid',
+        "ext-one",
+        "ext-invalid",
+        "ext-another-invalid",
       ]);
-      const extensions = [
-        { name: 'ext-one' },
-        { name: 'ext-two' },
-      ] as GeminiCLIExtension[];
+      const extensions = [{ name: "ext-one" }, { name: "ext-two" }] as GeminiCLIExtension[];
       manager.validateExtensionOverrides(extensions);
       expect(coreEventsEmitSpy).toHaveBeenCalledTimes(2);
+      expect(coreEventsEmitSpy).toHaveBeenCalledWith("error", "Extension not found: ext-invalid");
       expect(coreEventsEmitSpy).toHaveBeenCalledWith(
-        'error',
-        'Extension not found: ext-invalid',
-      );
-      expect(coreEventsEmitSpy).toHaveBeenCalledWith(
-        'error',
-        'Extension not found: ext-another-invalid',
+        "error",
+        "Extension not found: ext-another-invalid",
       );
     });
 
     it('should not log an error if "none" is in enabledExtensionNamesOverride', () => {
-      const manager = new ExtensionEnablementManager(['none']);
+      const manager = new ExtensionEnablementManager(["none"]);
       manager.validateExtensionOverrides([]);
       expect(coreEventsEmitSpy).not.toHaveBeenCalled();
     });
   });
 });
 
-describe('Override', () => {
-  it('should create an override from input', () => {
-    const override = Override.fromInput('/path/to/dir', true);
+describe("Override", () => {
+  it("should create an override from input", () => {
+    const override = Override.fromInput("/path/to/dir", true);
     expect(override.baseRule).toBe(`/path/to/dir/`);
     expect(override.isDisable).toBe(false);
     expect(override.includeSubdirs).toBe(true);
   });
 
-  it('should create a disable override from input', () => {
-    const override = Override.fromInput('!/path/to/dir', false);
+  it("should create a disable override from input", () => {
+    const override = Override.fromInput("!/path/to/dir", false);
     expect(override.baseRule).toBe(`/path/to/dir/`);
     expect(override.isDisable).toBe(true);
     expect(override.includeSubdirs).toBe(false);
   });
 
-  it('should create an override from a file rule', () => {
-    const override = Override.fromFileRule('/path/to/dir/');
-    expect(override.baseRule).toBe('/path/to/dir/');
+  it("should create an override from a file rule", () => {
+    const override = Override.fromFileRule("/path/to/dir/");
+    expect(override.baseRule).toBe("/path/to/dir/");
     expect(override.isDisable).toBe(false);
     expect(override.includeSubdirs).toBe(false);
   });
 
-  it('should create an override from a file rule without a trailing slash', () => {
-    const override = Override.fromFileRule('/path/to/dir');
-    expect(override.baseRule).toBe('/path/to/dir');
+  it("should create an override from a file rule without a trailing slash", () => {
+    const override = Override.fromFileRule("/path/to/dir");
+    expect(override.baseRule).toBe("/path/to/dir");
     expect(override.isDisable).toBe(false);
     expect(override.includeSubdirs).toBe(false);
   });
 
-  it('should create a disable override from a file rule', () => {
-    const override = Override.fromFileRule('!/path/to/dir/');
+  it("should create a disable override from a file rule", () => {
+    const override = Override.fromFileRule("!/path/to/dir/");
     expect(override.isDisable).toBe(true);
-    expect(override.baseRule).toBe('/path/to/dir/');
+    expect(override.baseRule).toBe("/path/to/dir/");
     expect(override.includeSubdirs).toBe(false);
   });
 
-  it('should create an override with subdirs from a file rule', () => {
-    const override = Override.fromFileRule('/path/to/dir/*');
-    expect(override.baseRule).toBe('/path/to/dir/');
+  it("should create an override with subdirs from a file rule", () => {
+    const override = Override.fromFileRule("/path/to/dir/*");
+    expect(override.baseRule).toBe("/path/to/dir/");
     expect(override.isDisable).toBe(false);
     expect(override.includeSubdirs).toBe(true);
   });
 
-  it('should correctly identify conflicting overrides', () => {
-    const override1 = Override.fromInput('/path/to/dir', true);
-    const override2 = Override.fromInput('/path/to/dir', false);
+  it("should correctly identify conflicting overrides", () => {
+    const override1 = Override.fromInput("/path/to/dir", true);
+    const override2 = Override.fromInput("/path/to/dir", false);
     expect(override1.conflictsWith(override2)).toBe(true);
   });
 
-  it('should correctly identify non-conflicting overrides', () => {
-    const override1 = Override.fromInput('/path/to/dir', true);
-    const override2 = Override.fromInput('/path/to/another/dir', true);
+  it("should correctly identify non-conflicting overrides", () => {
+    const override1 = Override.fromInput("/path/to/dir", true);
+    const override2 = Override.fromInput("/path/to/another/dir", true);
     expect(override1.conflictsWith(override2)).toBe(false);
   });
 
-  it('should correctly identify equal overrides', () => {
-    const override1 = Override.fromInput('/path/to/dir', true);
-    const override2 = Override.fromInput('/path/to/dir', true);
+  it("should correctly identify equal overrides", () => {
+    const override1 = Override.fromInput("/path/to/dir", true);
+    const override2 = Override.fromInput("/path/to/dir", true);
     expect(override1.isEqualTo(override2)).toBe(true);
   });
 
-  it('should correctly identify unequal overrides', () => {
-    const override1 = Override.fromInput('/path/to/dir', true);
-    const override2 = Override.fromInput('!/path/to/dir', true);
+  it("should correctly identify unequal overrides", () => {
+    const override1 = Override.fromInput("/path/to/dir", true);
+    const override2 = Override.fromInput("!/path/to/dir", true);
     expect(override1.isEqualTo(override2)).toBe(false);
   });
 
-  it('should generate the correct regex', () => {
-    const override = Override.fromInput('/path/to/dir', true);
+  it("should generate the correct regex", () => {
+    const override = Override.fromInput("/path/to/dir", true);
     const regex = override.asRegex();
-    expect(regex.test('/path/to/dir/')).toBe(true);
-    expect(regex.test('/path/to/dir/subdir')).toBe(true);
-    expect(regex.test('/path/to/another/dir')).toBe(false);
+    expect(regex.test("/path/to/dir/")).toBe(true);
+    expect(regex.test("/path/to/dir/subdir")).toBe(true);
+    expect(regex.test("/path/to/another/dir")).toBe(false);
   });
 
-  it('should correctly identify child overrides', () => {
-    const parent = Override.fromInput('/path/to/dir', true);
-    const child = Override.fromInput('/path/to/dir/subdir', false);
+  it("should correctly identify child overrides", () => {
+    const parent = Override.fromInput("/path/to/dir", true);
+    const child = Override.fromInput("/path/to/dir/subdir", false);
     expect(child.isChildOf(parent)).toBe(true);
   });
 
-  it('should correctly identify child overrides with glob', () => {
-    const parent = Override.fromInput('/path/to/dir/*', true);
-    const child = Override.fromInput('/path/to/dir/subdir', false);
+  it("should correctly identify child overrides with glob", () => {
+    const parent = Override.fromInput("/path/to/dir/*", true);
+    const child = Override.fromInput("/path/to/dir/subdir", false);
     expect(child.isChildOf(parent)).toBe(true);
   });
 
-  it('should correctly identify non-child overrides', () => {
-    const parent = Override.fromInput('/path/to/dir', true);
-    const other = Override.fromInput('/path/to/another/dir', false);
+  it("should correctly identify non-child overrides", () => {
+    const parent = Override.fromInput("/path/to/dir", true);
+    const other = Override.fromInput("/path/to/another/dir", false);
     expect(other.isChildOf(parent)).toBe(false);
   });
 
-  it('should generate the correct output string', () => {
-    const override = Override.fromInput('/path/to/dir', true);
+  it("should generate the correct output string", () => {
+    const override = Override.fromInput("/path/to/dir", true);
     expect(override.output()).toBe(`/path/to/dir/*`);
   });
 
-  it('should generate the correct output string for a disable override', () => {
-    const override = Override.fromInput('!/path/to/dir', false);
+  it("should generate the correct output string for a disable override", () => {
+    const override = Override.fromInput("!/path/to/dir", false);
     expect(override.output()).toBe(`!/path/to/dir/`);
   });
 
-  it('should disable a path based on a disable override rule', () => {
-    const override = Override.fromInput('!/path/to/dir', false);
+  it("should disable a path based on a disable override rule", () => {
+    const override = Override.fromInput("!/path/to/dir", false);
     expect(override.output()).toBe(`!/path/to/dir/`);
   });
 });
diff --git a/packages/ui-gemini/src/config/extensions/extensionEnablement.ts b/packages/ui-gemini/src/config/extensions/extensionEnablement.ts
index e445f9f4d..1676b90c7 100644
--- a/packages/ui-gemini/src/config/extensions/extensionEnablement.ts
+++ b/packages/ui-gemini/src/config/extensions/extensionEnablement.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs';
-import path from 'node:path';
-import { coreEvents, type GeminiCLIExtension } from '@airiscode/gemini-cli-core';
-import { ExtensionStorage } from './storage.js';
+import fs from "node:fs";
+import path from "node:path";
+import { coreEvents, type GeminiCLIExtension } from "@airiscode/gemini-cli-core";
+import { ExtensionStorage } from "./storage.js";
 
 export interface ExtensionEnablementConfig {
   overrides: string[];
@@ -25,28 +25,23 @@ export class Override {
   ) {}
 
   static fromInput(inputRule: string, includeSubdirs: boolean): Override {
-    const isDisable = inputRule.startsWith('!');
+    const isDisable = inputRule.startsWith("!");
     let baseRule = isDisable ? inputRule.substring(1) : inputRule;
     baseRule = ensureLeadingAndTrailingSlash(baseRule);
     return new Override(baseRule, isDisable, includeSubdirs);
   }
 
   static fromFileRule(fileRule: string): Override {
-    const isDisable = fileRule.startsWith('!');
+    const isDisable = fileRule.startsWith("!");
     let baseRule = isDisable ? fileRule.substring(1) : fileRule;
-    const includeSubdirs = baseRule.endsWith('*');
-    baseRule = includeSubdirs
-      ? baseRule.substring(0, baseRule.length - 1)
-      : baseRule;
+    const includeSubdirs = baseRule.endsWith("*");
+    baseRule = includeSubdirs ? baseRule.substring(0, baseRule.length - 1) : baseRule;
     return new Override(baseRule, isDisable, includeSubdirs);
   }
 
   conflictsWith(other: Override): boolean {
     if (this.baseRule === other.baseRule) {
-      return (
-        this.includeSubdirs !== other.includeSubdirs ||
-        this.isDisable !== other.isDisable
-      );
+      return this.includeSubdirs !== other.includeSubdirs || this.isDisable !== other.isDisable;
     }
     return false;
   }
@@ -60,7 +55,7 @@ export class Override {
   }
 
   asRegex(): RegExp {
-    return globToRegex(`${this.baseRule}${this.includeSubdirs ? '*' : ''}`);
+    return globToRegex(`${this.baseRule}${this.includeSubdirs ? "*" : ""}`);
   }
 
   isChildOf(parent: Override) {
@@ -71,7 +66,7 @@ export class Override {
   }
 
   output(): string {
-    return `${this.isDisable ? '!' : ''}${this.baseRule}${this.includeSubdirs ? '*' : ''}`;
+    return `${this.isDisable ? "!" : ""}${this.baseRule}${this.includeSubdirs ? "*" : ""}`;
   }
 
   matchesPath(path: string) {
@@ -81,12 +76,12 @@ export class Override {
 
 const ensureLeadingAndTrailingSlash = function (dirPath: string): string {
   // Normalize separators to forward slashes for consistent matching across platforms.
-  let result = dirPath.replace(/\\/g, '/');
-  if (result.charAt(0) !== '/') {
-    result = '/' + result;
+  let result = dirPath.replace(/\\/g, "/");
+  if (result.charAt(0) !== "/") {
+    result = "/" + result;
   }
-  if (result.charAt(result.length - 1) !== '/') {
-    result = result + '/';
+  if (result.charAt(result.length - 1) !== "/") {
+    result = result + "/";
   }
   return result;
 };
@@ -100,8 +95,8 @@ const ensureLeadingAndTrailingSlash = function (dirPath: string): string {
  */
 function globToRegex(glob: string): RegExp {
   const regexString = glob
-    .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape special regex characters
-    .replace(/(\/?)\*/g, '($1.*)?'); // Convert * to optional group
+    .replace(/[.+?^${}()|[\]\\]/g, "\\$&") // Escape special regex characters
+    .replace(/(\/?)\*/g, "($1.*)?"); // Convert * to optional group
 
   return new RegExp(`^${regexString}$`);
 }
@@ -115,21 +110,16 @@ export class ExtensionEnablementManager {
 
   constructor(enabledExtensionNames?: string[]) {
     this.configDir = ExtensionStorage.getUserExtensionsDir();
-    this.configFilePath = path.join(
-      this.configDir,
-      'extension-enablement.json',
-    );
+    this.configFilePath = path.join(this.configDir, "extension-enablement.json");
     this.enabledExtensionNamesOverride =
       enabledExtensionNames?.map((name) => name.toLowerCase()) ?? [];
   }
 
   validateExtensionOverrides(extensions: GeminiCLIExtension[]) {
     for (const name of this.enabledExtensionNamesOverride) {
-      if (name === 'none') continue;
-      if (
-        !extensions.some((ext) => ext.name.toLowerCase() === name.toLowerCase())
-      ) {
-        coreEvents.emitFeedback('error', `Extension not found: ${name}`);
+      if (name === "none") continue;
+      if (!extensions.some((ext) => ext.name.toLowerCase() === name.toLowerCase())) {
+        coreEvents.emitFeedback("error", `Extension not found: ${name}`);
       }
     }
   }
@@ -147,7 +137,7 @@ export class ExtensionEnablementManager {
     // Typically, this comes from the user passing `-e none`.
     if (
       this.enabledExtensionNamesOverride.length === 1 &&
-      this.enabledExtensionNamesOverride[0] === 'none'
+      this.enabledExtensionNamesOverride[0] === "none"
     ) {
       return false;
     }
@@ -156,9 +146,7 @@ export class ExtensionEnablementManager {
     if (this.enabledExtensionNamesOverride.length > 0) {
       // When checking against overrides ONLY, we use a case insensitive match.
       // The override names are already lowercased in the constructor.
-      return this.enabledExtensionNamesOverride.includes(
-        extensionName.toLocaleLowerCase(),
-      );
+      return this.enabledExtensionNamesOverride.includes(extensionName.toLocaleLowerCase());
     }
 
     // Otherwise, we use the configuration settings
@@ -178,21 +166,13 @@ export class ExtensionEnablementManager {
 
   readConfig(): AllExtensionsEnablementConfig {
     try {
-      const content = fs.readFileSync(this.configFilePath, 'utf-8');
+      const content = fs.readFileSync(this.configFilePath, "utf-8");
       return JSON.parse(content);
     } catch (error) {
-      if (
-        error instanceof Error &&
-        'code' in error &&
-        error.code === 'ENOENT'
-      ) {
+      if (error instanceof Error && "code" in error && error.code === "ENOENT") {
         return {};
       }
-      coreEvents.emitFeedback(
-        'error',
-        'Failed to read extension enablement config.',
-        error,
-      );
+      coreEvents.emitFeedback("error", "Failed to read extension enablement config.", error);
       return {};
     }
   }
@@ -202,11 +182,7 @@ export class ExtensionEnablementManager {
     fs.writeFileSync(this.configFilePath, JSON.stringify(config, null, 2));
   }
 
-  enable(
-    extensionName: string,
-    includeSubdirs: boolean,
-    scopePath: string,
-  ): void {
+  enable(extensionName: string, includeSubdirs: boolean, scopePath: string): void {
     const config = this.readConfig();
     if (!config[extensionName]) {
       config[extensionName] = { overrides: [] };
@@ -214,10 +190,7 @@ export class ExtensionEnablementManager {
     const override = Override.fromInput(scopePath, includeSubdirs);
     const overrides = config[extensionName].overrides.filter((rule) => {
       const fileOverride = Override.fromFileRule(rule);
-      if (
-        fileOverride.conflictsWith(override) ||
-        fileOverride.isEqualTo(override)
-      ) {
+      if (fileOverride.conflictsWith(override) || fileOverride.isEqualTo(override)) {
         return false; // Remove conflicts and equivalent values.
       }
       return !fileOverride.isChildOf(override);
@@ -227,11 +200,7 @@ export class ExtensionEnablementManager {
     this.writeConfig(config);
   }
 
-  disable(
-    extensionName: string,
-    includeSubdirs: boolean,
-    scopePath: string,
-  ): void {
+  disable(extensionName: string, includeSubdirs: boolean, scopePath: string): void {
     this.enable(extensionName, includeSubdirs, `!${scopePath}`);
   }
 
diff --git a/packages/ui-gemini/src/config/extensions/extensionSettings.test.ts b/packages/ui-gemini/src/config/extensions/extensionSettings.test.ts
index 1228d49db..da58eba2b 100644
--- a/packages/ui-gemini/src/config/extensions/extensionSettings.test.ts
+++ b/packages/ui-gemini/src/config/extensions/extensionSettings.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import * as path from 'node:path';
-import * as os from 'node:os';
+import * as fs from "node:fs";
+import * as fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { KeychainTokenStorage } from "@airiscode/gemini-cli-core";
+import prompts from "prompts";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { ExtensionConfig } from "../extension.js";
 import {
+  type ExtensionSetting,
+  ExtensionSettingScope,
   getEnvContents,
+  getScopedEnvContents,
   maybePromptForSettings,
   promptForSetting,
-  type ExtensionSetting,
   updateSetting,
-  ExtensionSettingScope,
-  getScopedEnvContents,
-} from './extensionSettings.js';
-import type { ExtensionConfig } from '../extension.js';
-import { ExtensionStorage } from './storage.js';
-import prompts from 'prompts';
-import * as fsPromises from 'node:fs/promises';
-import * as fs from 'node:fs';
-import { KeychainTokenStorage } from '@airiscode/gemini-cli-core';
-import { EXTENSION_SETTINGS_FILENAME } from './variables.js';
-
-vi.mock('prompts');
-vi.mock('os', async (importOriginal) => {
+} from "./extensionSettings.js";
+import { ExtensionStorage } from "./storage.js";
+import { EXTENSION_SETTINGS_FILENAME } from "./variables.js";
+
+vi.mock("prompts");
+vi.mock("os", async (importOriginal) => {
   const mockedOs = await importOriginal<typeof os>();
   return {
     ...mockedOs,
@@ -33,16 +33,15 @@ vi.mock('os', async (importOriginal) => {
   };
 });
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     KeychainTokenStorage: vi.fn(),
   };
 });
 
-describe('extensionSettings', () => {
+describe("extensionSettings", () => {
   let tempHomeDir: string;
   let tempWorkspaceDir: string;
   let extensionDir: string;
@@ -51,47 +50,32 @@ describe('extensionSettings', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockKeychainData = {};
-    vi.mocked(KeychainTokenStorage).mockImplementation(
-      (serviceName: string) => {
-        if (!mockKeychainData[serviceName]) {
-          mockKeychainData[serviceName] = {};
-        }
-        const keychainData = mockKeychainData[serviceName];
-        return {
-          getSecret: vi
-            .fn()
-            .mockImplementation(
-              async (key: string) => keychainData[key] || null,
-            ),
-          setSecret: vi
-            .fn()
-            .mockImplementation(async (key: string, value: string) => {
-              keychainData[key] = value;
-            }),
-          deleteSecret: vi.fn().mockImplementation(async (key: string) => {
-            delete keychainData[key];
-          }),
-          listSecrets: vi
-            .fn()
-            .mockImplementation(async () => Object.keys(keychainData)),
-          isAvailable: vi.fn().mockResolvedValue(true),
-        } as unknown as KeychainTokenStorage;
-      },
-    );
+    vi.mocked(KeychainTokenStorage).mockImplementation((serviceName: string) => {
+      if (!mockKeychainData[serviceName]) {
+        mockKeychainData[serviceName] = {};
+      }
+      const keychainData = mockKeychainData[serviceName];
+      return {
+        getSecret: vi.fn().mockImplementation(async (key: string) => keychainData[key] || null),
+        setSecret: vi.fn().mockImplementation(async (key: string, value: string) => {
+          keychainData[key] = value;
+        }),
+        deleteSecret: vi.fn().mockImplementation(async (key: string) => {
+          delete keychainData[key];
+        }),
+        listSecrets: vi.fn().mockImplementation(async () => Object.keys(keychainData)),
+        isAvailable: vi.fn().mockResolvedValue(true),
+      } as unknown as KeychainTokenStorage;
+    });
     tempHomeDir = os.tmpdir() + path.sep + `gemini-cli-test-home-${Date.now()}`;
-    tempWorkspaceDir = path.join(
-      os.tmpdir(),
-      `gemini-cli-test-workspace-${Date.now()}`,
-    );
-    extensionDir = path.join(tempHomeDir, '.gemini', 'extensions', 'test-ext');
+    tempWorkspaceDir = path.join(os.tmpdir(), `gemini-cli-test-workspace-${Date.now()}`);
+    extensionDir = path.join(tempHomeDir, ".gemini", "extensions", "test-ext");
     // Spy and mock the method, but also create the directory so we can write to it.
-    vi.spyOn(ExtensionStorage.prototype, 'getExtensionDir').mockReturnValue(
-      extensionDir,
-    );
+    vi.spyOn(ExtensionStorage.prototype, "getExtensionDir").mockReturnValue(extensionDir);
     fs.mkdirSync(extensionDir, { recursive: true });
     fs.mkdirSync(tempWorkspaceDir, { recursive: true });
     vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
-    vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
+    vi.spyOn(process, "cwd").mockReturnValue(tempWorkspaceDir);
     vi.mocked(prompts).mockClear();
   });
 
@@ -101,83 +85,63 @@ describe('extensionSettings', () => {
     vi.restoreAllMocks();
   });
 
-  describe('maybePromptForSettings', () => {
-    const mockRequestSetting = vi.fn(
-      async (setting: ExtensionSetting) => `mock-${setting.envVar}`,
-    );
+  describe("maybePromptForSettings", () => {
+    const mockRequestSetting = vi.fn(async (setting: ExtensionSetting) => `mock-${setting.envVar}`);
 
     beforeEach(() => {
       mockRequestSetting.mockClear();
     });
 
-    it('should do nothing if settings are undefined', async () => {
-      const config: ExtensionConfig = { name: 'test-ext', version: '1.0.0' };
-      await maybePromptForSettings(
-        config,
-        '12345',
-        mockRequestSetting,
-        undefined,
-        undefined,
-      );
+    it("should do nothing if settings are undefined", async () => {
+      const config: ExtensionConfig = { name: "test-ext", version: "1.0.0" };
+      await maybePromptForSettings(config, "12345", mockRequestSetting, undefined, undefined);
       expect(mockRequestSetting).not.toHaveBeenCalled();
     });
 
-    it('should do nothing if settings are empty', async () => {
+    it("should do nothing if settings are empty", async () => {
       const config: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [],
       };
-      await maybePromptForSettings(
-        config,
-        '12345',
-        mockRequestSetting,
-        undefined,
-        undefined,
-      );
+      await maybePromptForSettings(config, "12345", mockRequestSetting, undefined, undefined);
       expect(mockRequestSetting).not.toHaveBeenCalled();
     });
 
-    it('should prompt for all settings if there is no previous config', async () => {
+    it("should prompt for all settings if there is no previous config", async () => {
       const config: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1' },
-          { name: 's2', description: 'd2', envVar: 'VAR2' },
+          { name: "s1", description: "d1", envVar: "VAR1" },
+          { name: "s2", description: "d2", envVar: "VAR2" },
         ],
       };
-      await maybePromptForSettings(
-        config,
-        '12345',
-        mockRequestSetting,
-        undefined,
-        undefined,
-      );
+      await maybePromptForSettings(config, "12345", mockRequestSetting, undefined, undefined);
       expect(mockRequestSetting).toHaveBeenCalledTimes(2);
       expect(mockRequestSetting).toHaveBeenCalledWith(config.settings![0]);
       expect(mockRequestSetting).toHaveBeenCalledWith(config.settings![1]);
     });
 
-    it('should only prompt for new settings', async () => {
+    it("should only prompt for new settings", async () => {
       const previousConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
-        settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+        name: "test-ext",
+        version: "1.0.0",
+        settings: [{ name: "s1", description: "d1", envVar: "VAR1" }],
       };
       const newConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1' },
-          { name: 's2', description: 'd2', envVar: 'VAR2' },
+          { name: "s1", description: "d1", envVar: "VAR1" },
+          { name: "s2", description: "d2", envVar: "VAR2" },
         ],
       };
-      const previousSettings = { VAR1: 'previous-VAR1' };
+      const previousSettings = { VAR1: "previous-VAR1" };
 
       await maybePromptForSettings(
         newConfig,
-        '12345',
+        "12345",
         mockRequestSetting,
         previousConfig,
         previousSettings,
@@ -186,113 +150,109 @@ describe('extensionSettings', () => {
       expect(mockRequestSetting).toHaveBeenCalledTimes(1);
       expect(mockRequestSetting).toHaveBeenCalledWith(newConfig.settings![1]);
 
-      const expectedEnvPath = path.join(extensionDir, '.env');
-      const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-      const expectedContent = 'VAR1=previous-VAR1\nVAR2=mock-VAR2\n';
+      const expectedEnvPath = path.join(extensionDir, ".env");
+      const actualContent = await fsPromises.readFile(expectedEnvPath, "utf-8");
+      const expectedContent = "VAR1=previous-VAR1\nVAR2=mock-VAR2\n";
       expect(actualContent).toBe(expectedContent);
     });
 
-    it('should clear settings if new config has no settings', async () => {
+    it("should clear settings if new config has no settings", async () => {
       const previousConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1' },
+          { name: "s1", description: "d1", envVar: "VAR1" },
           {
-            name: 's2',
-            description: 'd2',
-            envVar: 'SENSITIVE_VAR',
+            name: "s2",
+            description: "d2",
+            envVar: "SENSITIVE_VAR",
             sensitive: true,
           },
         ],
       };
       const newConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [],
       };
       const previousSettings = {
-        VAR1: 'previous-VAR1',
-        SENSITIVE_VAR: 'secret',
+        VAR1: "previous-VAR1",
+        SENSITIVE_VAR: "secret",
       };
-      const userKeychain = new KeychainTokenStorage(
-        `Gemini CLI Extensions test-ext 12345`,
-      );
-      await userKeychain.setSecret('SENSITIVE_VAR', 'secret');
-      const envPath = path.join(extensionDir, '.env');
-      await fsPromises.writeFile(envPath, 'VAR1=previous-VAR1');
+      const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+      await userKeychain.setSecret("SENSITIVE_VAR", "secret");
+      const envPath = path.join(extensionDir, ".env");
+      await fsPromises.writeFile(envPath, "VAR1=previous-VAR1");
 
       await maybePromptForSettings(
         newConfig,
-        '12345',
+        "12345",
         mockRequestSetting,
         previousConfig,
         previousSettings,
       );
 
       expect(mockRequestSetting).not.toHaveBeenCalled();
-      const actualContent = await fsPromises.readFile(envPath, 'utf-8');
-      expect(actualContent).toBe('');
-      expect(await userKeychain.getSecret('SENSITIVE_VAR')).toBeNull();
+      const actualContent = await fsPromises.readFile(envPath, "utf-8");
+      expect(actualContent).toBe("");
+      expect(await userKeychain.getSecret("SENSITIVE_VAR")).toBeNull();
     });
 
-    it('should remove sensitive settings from keychain', async () => {
+    it("should remove sensitive settings from keychain", async () => {
       const previousConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [
           {
-            name: 's1',
-            description: 'd1',
-            envVar: 'SENSITIVE_VAR',
+            name: "s1",
+            description: "d1",
+            envVar: "SENSITIVE_VAR",
             sensitive: true,
           },
         ],
       };
       const newConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [],
       };
-      const previousSettings = { SENSITIVE_VAR: 'secret' };
-      const userKeychain = new KeychainTokenStorage(
-        `Gemini CLI Extensions test-ext 12345`,
-      );
-      await userKeychain.setSecret('SENSITIVE_VAR', 'secret');
+      const previousSettings = { SENSITIVE_VAR: "secret" };
+      const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+      await userKeychain.setSecret("SENSITIVE_VAR", "secret");
 
       await maybePromptForSettings(
         newConfig,
-        '12345',
+        "12345",
         mockRequestSetting,
         previousConfig,
         previousSettings,
       );
 
-      expect(await userKeychain.getSecret('SENSITIVE_VAR')).toBeNull();
+      expect(await userKeychain.getSecret("SENSITIVE_VAR")).toBeNull();
     });
 
-    it('should remove settings that are no longer in the config', async () => {
+    it("should remove settings that are no longer in the config", async () => {
       const previousConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1' },
-          { name: 's2', description: 'd2', envVar: 'VAR2' },
+          { name: "s1", description: "d1", envVar: "VAR1" },
+          { name: "s2", description: "d2", envVar: "VAR2" },
         ],
       };
       const newConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
-        settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+        name: "test-ext",
+        version: "1.0.0",
+        settings: [{ name: "s1", description: "d1", envVar: "VAR1" }],
       };
       const previousSettings = {
-        VAR1: 'previous-VAR1',
-        VAR2: 'previous-VAR2',
+        VAR1: "previous-VAR1",
+        VAR2: "previous-VAR2",
       };
 
       await maybePromptForSettings(
         newConfig,
-        '12345',
+        "12345",
         mockRequestSetting,
         previousConfig,
         previousSettings,
@@ -300,32 +260,28 @@ describe('extensionSettings', () => {
 
       expect(mockRequestSetting).not.toHaveBeenCalled();
 
-      const expectedEnvPath = path.join(extensionDir, '.env');
-      const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-      const expectedContent = 'VAR1=previous-VAR1\n';
+      const expectedEnvPath = path.join(extensionDir, ".env");
+      const actualContent = await fsPromises.readFile(expectedEnvPath, "utf-8");
+      const expectedContent = "VAR1=previous-VAR1\n";
       expect(actualContent).toBe(expectedContent);
     });
 
-    it('should reprompt if a setting changes sensitivity', async () => {
+    it("should reprompt if a setting changes sensitivity", async () => {
       const previousConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
-        settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1', sensitive: false },
-        ],
+        name: "test-ext",
+        version: "1.0.0",
+        settings: [{ name: "s1", description: "d1", envVar: "VAR1", sensitive: false }],
       };
       const newConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
-        settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1', sensitive: true },
-        ],
+        name: "test-ext",
+        version: "1.0.0",
+        settings: [{ name: "s1", description: "d1", envVar: "VAR1", sensitive: true }],
       };
-      const previousSettings = { VAR1: 'previous-VAR1' };
+      const previousSettings = { VAR1: "previous-VAR1" };
 
       await maybePromptForSettings(
         newConfig,
-        '12345',
+        "12345",
         mockRequestSetting,
         previousConfig,
         previousSettings,
@@ -335,70 +291,64 @@ describe('extensionSettings', () => {
       expect(mockRequestSetting).toHaveBeenCalledWith(newConfig.settings![0]);
 
       // The value should now be in keychain, not the .env file.
-      const expectedEnvPath = path.join(extensionDir, '.env');
-      const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-      expect(actualContent).toBe('');
+      const expectedEnvPath = path.join(extensionDir, ".env");
+      const actualContent = await fsPromises.readFile(expectedEnvPath, "utf-8");
+      expect(actualContent).toBe("");
     });
 
-    it('should not prompt if settings are identical', async () => {
+    it("should not prompt if settings are identical", async () => {
       const previousConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1' },
-          { name: 's2', description: 'd2', envVar: 'VAR2' },
+          { name: "s1", description: "d1", envVar: "VAR1" },
+          { name: "s2", description: "d2", envVar: "VAR2" },
         ],
       };
       const newConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [
-          { name: 's1', description: 'd1', envVar: 'VAR1' },
-          { name: 's2', description: 'd2', envVar: 'VAR2' },
+          { name: "s1", description: "d1", envVar: "VAR1" },
+          { name: "s2", description: "d2", envVar: "VAR2" },
         ],
       };
       const previousSettings = {
-        VAR1: 'previous-VAR1',
-        VAR2: 'previous-VAR2',
+        VAR1: "previous-VAR1",
+        VAR2: "previous-VAR2",
       };
 
       await maybePromptForSettings(
         newConfig,
-        '12345',
+        "12345",
         mockRequestSetting,
         previousConfig,
         previousSettings,
       );
 
       expect(mockRequestSetting).not.toHaveBeenCalled();
-      const expectedEnvPath = path.join(extensionDir, '.env');
-      const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-      const expectedContent = 'VAR1=previous-VAR1\nVAR2=previous-VAR2\n';
+      const expectedEnvPath = path.join(extensionDir, ".env");
+      const actualContent = await fsPromises.readFile(expectedEnvPath, "utf-8");
+      const expectedContent = "VAR1=previous-VAR1\nVAR2=previous-VAR2\n";
       expect(actualContent).toBe(expectedContent);
     });
 
-    it('should wrap values with spaces in quotes', async () => {
+    it("should wrap values with spaces in quotes", async () => {
       const config: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
-        settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+        name: "test-ext",
+        version: "1.0.0",
+        settings: [{ name: "s1", description: "d1", envVar: "VAR1" }],
       };
-      mockRequestSetting.mockResolvedValue('a value with spaces');
+      mockRequestSetting.mockResolvedValue("a value with spaces");
 
-      await maybePromptForSettings(
-        config,
-        '12345',
-        mockRequestSetting,
-        undefined,
-        undefined,
-      );
+      await maybePromptForSettings(config, "12345", mockRequestSetting, undefined, undefined);
 
-      const expectedEnvPath = path.join(extensionDir, '.env');
-      const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
+      const expectedEnvPath = path.join(extensionDir, ".env");
+      const actualContent = await fsPromises.readFile(expectedEnvPath, "utf-8");
       expect(actualContent).toBe('VAR1="a value with spaces"\n');
     });
 
-    it('should not attempt to clear secrets if keychain is unavailable', async () => {
+    it("should not attempt to clear secrets if keychain is unavailable", async () => {
       // Arrange
       const mockIsAvailable = vi.fn().mockResolvedValue(false);
       const mockListSecrets = vi.fn();
@@ -415,25 +365,19 @@ describe('extensionSettings', () => {
       );
 
       const config: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
+        name: "test-ext",
+        version: "1.0.0",
         settings: [], // Empty settings triggers clearSettings
       };
 
       const previousConfig: ExtensionConfig = {
-        name: 'test-ext',
-        version: '1.0.0',
-        settings: [{ name: 's1', description: 'd1', envVar: 'VAR1' }],
+        name: "test-ext",
+        version: "1.0.0",
+        settings: [{ name: "s1", description: "d1", envVar: "VAR1" }],
       };
 
       // Act
-      await maybePromptForSettings(
-        config,
-        '12345',
-        mockRequestSetting,
-        previousConfig,
-        undefined,
-      );
+      await maybePromptForSettings(config, "12345", mockRequestSetting, previousConfig, undefined);
 
       // Assert
       expect(mockIsAvailable).toHaveBeenCalled();
@@ -441,112 +385,101 @@ describe('extensionSettings', () => {
     });
   });
 
-  describe('promptForSetting', () => {
+  describe("promptForSetting", () => {
     it.each([
       {
-        description:
-          'should use prompts with type "password" for sensitive settings',
+        description: 'should use prompts with type "password" for sensitive settings',
         setting: {
-          name: 'API Key',
-          description: 'Your secret key',
-          envVar: 'API_KEY',
+          name: "API Key",
+          description: "Your secret key",
+          envVar: "API_KEY",
           sensitive: true,
         },
-        expectedType: 'password',
-        promptValue: 'secret-key',
+        expectedType: "password",
+        promptValue: "secret-key",
       },
       {
-        description:
-          'should use prompts with type "text" for non-sensitive settings',
+        description: 'should use prompts with type "text" for non-sensitive settings',
         setting: {
-          name: 'Username',
-          description: 'Your public username',
-          envVar: 'USERNAME',
+          name: "Username",
+          description: "Your public username",
+          envVar: "USERNAME",
           sensitive: false,
         },
-        expectedType: 'text',
-        promptValue: 'test-user',
+        expectedType: "text",
+        promptValue: "test-user",
       },
       {
         description: 'should default to "text" if sensitive is undefined',
         setting: {
-          name: 'Username',
-          description: 'Your public username',
-          envVar: 'USERNAME',
+          name: "Username",
+          description: "Your public username",
+          envVar: "USERNAME",
         },
-        expectedType: 'text',
-        promptValue: 'test-user',
+        expectedType: "text",
+        promptValue: "test-user",
       },
-    ])('$description', async ({ setting, expectedType, promptValue }) => {
+    ])("$description", async ({ setting, expectedType, promptValue }) => {
       vi.mocked(prompts).mockResolvedValue({ value: promptValue });
 
       const result = await promptForSetting(setting as ExtensionSetting);
 
       expect(prompts).toHaveBeenCalledWith({
         type: expectedType,
-        name: 'value',
+        name: "value",
         message: `${setting.name}\n${setting.description}`,
       });
       expect(result).toBe(promptValue);
     });
 
-    it('should return undefined if the user cancels the prompt', async () => {
+    it("should return undefined if the user cancels the prompt", async () => {
       vi.mocked(prompts).mockResolvedValue({ value: undefined });
       const result = await promptForSetting({
-        name: 'Test',
-        description: 'Test desc',
-        envVar: 'TEST_VAR',
+        name: "Test",
+        description: "Test desc",
+        envVar: "TEST_VAR",
       });
       expect(result).toBeUndefined();
     });
   });
 
-  describe('getScopedEnvContents', () => {
+  describe("getScopedEnvContents", () => {
     const config: ExtensionConfig = {
-      name: 'test-ext',
-      version: '1.0.0',
+      name: "test-ext",
+      version: "1.0.0",
       settings: [
-        { name: 's1', description: 'd1', envVar: 'VAR1' },
+        { name: "s1", description: "d1", envVar: "VAR1" },
         {
-          name: 's2',
-          description: 'd2',
-          envVar: 'SENSITIVE_VAR',
+          name: "s2",
+          description: "d2",
+          envVar: "SENSITIVE_VAR",
           sensitive: true,
         },
       ],
     };
-    const extensionId = '12345';
+    const extensionId = "12345";
 
-    it('should return combined contents from user .env and keychain for USER scope', async () => {
+    it("should return combined contents from user .env and keychain for USER scope", async () => {
       const userEnvPath = path.join(extensionDir, EXTENSION_SETTINGS_FILENAME);
-      await fsPromises.writeFile(userEnvPath, 'VAR1=user-value1');
-      const userKeychain = new KeychainTokenStorage(
-        `Gemini CLI Extensions test-ext 12345`,
-      );
-      await userKeychain.setSecret('SENSITIVE_VAR', 'user-secret');
+      await fsPromises.writeFile(userEnvPath, "VAR1=user-value1");
+      const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+      await userKeychain.setSecret("SENSITIVE_VAR", "user-secret");
 
-      const contents = await getScopedEnvContents(
-        config,
-        extensionId,
-        ExtensionSettingScope.USER,
-      );
+      const contents = await getScopedEnvContents(config, extensionId, ExtensionSettingScope.USER);
 
       expect(contents).toEqual({
-        VAR1: 'user-value1',
-        SENSITIVE_VAR: 'user-secret',
+        VAR1: "user-value1",
+        SENSITIVE_VAR: "user-secret",
       });
     });
 
-    it('should return combined contents from workspace .env and keychain for WORKSPACE scope', async () => {
-      const workspaceEnvPath = path.join(
-        tempWorkspaceDir,
-        EXTENSION_SETTINGS_FILENAME,
-      );
-      await fsPromises.writeFile(workspaceEnvPath, 'VAR1=workspace-value1');
+    it("should return combined contents from workspace .env and keychain for WORKSPACE scope", async () => {
+      const workspaceEnvPath = path.join(tempWorkspaceDir, EXTENSION_SETTINGS_FILENAME);
+      await fsPromises.writeFile(workspaceEnvPath, "VAR1=workspace-value1");
       const workspaceKeychain = new KeychainTokenStorage(
         `Gemini CLI Extensions test-ext 12345 ${tempWorkspaceDir}`,
       );
-      await workspaceKeychain.setSecret('SENSITIVE_VAR', 'workspace-secret');
+      await workspaceKeychain.setSecret("SENSITIVE_VAR", "workspace-secret");
 
       const contents = await getScopedEnvContents(
         config,
@@ -555,134 +488,112 @@ describe('extensionSettings', () => {
       );
 
       expect(contents).toEqual({
-        VAR1: 'workspace-value1',
-        SENSITIVE_VAR: 'workspace-secret',
+        VAR1: "workspace-value1",
+        SENSITIVE_VAR: "workspace-secret",
       });
     });
   });
 
-  describe('getEnvContents (merged)', () => {
+  describe("getEnvContents (merged)", () => {
     const config: ExtensionConfig = {
-      name: 'test-ext',
-      version: '1.0.0',
+      name: "test-ext",
+      version: "1.0.0",
       settings: [
-        { name: 's1', description: 'd1', envVar: 'VAR1' },
-        { name: 's2', description: 'd2', envVar: 'VAR2', sensitive: true },
-        { name: 's3', description: 'd3', envVar: 'VAR3' },
+        { name: "s1", description: "d1", envVar: "VAR1" },
+        { name: "s2", description: "d2", envVar: "VAR2", sensitive: true },
+        { name: "s3", description: "d3", envVar: "VAR3" },
       ],
     };
-    const extensionId = '12345';
+    const extensionId = "12345";
 
-    it('should merge user and workspace settings, with workspace taking precedence', async () => {
+    it("should merge user and workspace settings, with workspace taking precedence", async () => {
       // User settings
       const userEnvPath = path.join(extensionDir, EXTENSION_SETTINGS_FILENAME);
-      await fsPromises.writeFile(
-        userEnvPath,
-        'VAR1=user-value1\nVAR3=user-value3',
-      );
+      await fsPromises.writeFile(userEnvPath, "VAR1=user-value1\nVAR3=user-value3");
       const userKeychain = new KeychainTokenStorage(
         `Gemini CLI Extensions test-ext ${extensionId}`,
       );
-      await userKeychain.setSecret('VAR2', 'user-secret2');
+      await userKeychain.setSecret("VAR2", "user-secret2");
 
       // Workspace settings
-      const workspaceEnvPath = path.join(
-        tempWorkspaceDir,
-        EXTENSION_SETTINGS_FILENAME,
-      );
-      await fsPromises.writeFile(workspaceEnvPath, 'VAR1=workspace-value1');
+      const workspaceEnvPath = path.join(tempWorkspaceDir, EXTENSION_SETTINGS_FILENAME);
+      await fsPromises.writeFile(workspaceEnvPath, "VAR1=workspace-value1");
       const workspaceKeychain = new KeychainTokenStorage(
         `Gemini CLI Extensions test-ext ${extensionId} ${tempWorkspaceDir}`,
       );
-      await workspaceKeychain.setSecret('VAR2', 'workspace-secret2');
+      await workspaceKeychain.setSecret("VAR2", "workspace-secret2");
 
       const contents = await getEnvContents(config, extensionId);
 
       expect(contents).toEqual({
-        VAR1: 'workspace-value1',
-        VAR2: 'workspace-secret2',
-        VAR3: 'user-value3',
+        VAR1: "workspace-value1",
+        VAR2: "workspace-secret2",
+        VAR3: "user-value3",
       });
     });
   });
 
-  describe('updateSetting', () => {
+  describe("updateSetting", () => {
     const config: ExtensionConfig = {
-      name: 'test-ext',
-      version: '1.0.0',
+      name: "test-ext",
+      version: "1.0.0",
       settings: [
-        { name: 's1', description: 'd1', envVar: 'VAR1' },
-        { name: 's2', description: 'd2', envVar: 'VAR2', sensitive: true },
+        { name: "s1", description: "d1", envVar: "VAR1" },
+        { name: "s2", description: "d2", envVar: "VAR2", sensitive: true },
       ],
     };
     const mockRequestSetting = vi.fn();
 
     beforeEach(async () => {
-      const userEnvPath = path.join(extensionDir, '.env');
-      await fsPromises.writeFile(userEnvPath, 'VAR1=value1\n');
-      const userKeychain = new KeychainTokenStorage(
-        `Gemini CLI Extensions test-ext 12345`,
-      );
-      await userKeychain.setSecret('VAR2', 'value2');
+      const userEnvPath = path.join(extensionDir, ".env");
+      await fsPromises.writeFile(userEnvPath, "VAR1=value1\n");
+      const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+      await userKeychain.setSecret("VAR2", "value2");
       mockRequestSetting.mockClear();
     });
 
-    it('should update a non-sensitive setting in USER scope', async () => {
-      mockRequestSetting.mockResolvedValue('new-value1');
+    it("should update a non-sensitive setting in USER scope", async () => {
+      mockRequestSetting.mockResolvedValue("new-value1");
 
-      await updateSetting(
-        config,
-        '12345',
-        'VAR1',
-        mockRequestSetting,
-        ExtensionSettingScope.USER,
-      );
+      await updateSetting(config, "12345", "VAR1", mockRequestSetting, ExtensionSettingScope.USER);
 
-      const expectedEnvPath = path.join(extensionDir, '.env');
-      const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-      expect(actualContent).toContain('VAR1=new-value1');
+      const expectedEnvPath = path.join(extensionDir, ".env");
+      const actualContent = await fsPromises.readFile(expectedEnvPath, "utf-8");
+      expect(actualContent).toContain("VAR1=new-value1");
     });
 
-    it('should update a non-sensitive setting in WORKSPACE scope', async () => {
-      mockRequestSetting.mockResolvedValue('new-workspace-value');
+    it("should update a non-sensitive setting in WORKSPACE scope", async () => {
+      mockRequestSetting.mockResolvedValue("new-workspace-value");
 
       await updateSetting(
         config,
-        '12345',
-        'VAR1',
+        "12345",
+        "VAR1",
         mockRequestSetting,
         ExtensionSettingScope.WORKSPACE,
       );
 
-      const expectedEnvPath = path.join(tempWorkspaceDir, '.env');
-      const actualContent = await fsPromises.readFile(expectedEnvPath, 'utf-8');
-      expect(actualContent).toContain('VAR1=new-workspace-value');
+      const expectedEnvPath = path.join(tempWorkspaceDir, ".env");
+      const actualContent = await fsPromises.readFile(expectedEnvPath, "utf-8");
+      expect(actualContent).toContain("VAR1=new-workspace-value");
     });
 
-    it('should update a sensitive setting in USER scope', async () => {
-      mockRequestSetting.mockResolvedValue('new-value2');
+    it("should update a sensitive setting in USER scope", async () => {
+      mockRequestSetting.mockResolvedValue("new-value2");
 
-      await updateSetting(
-        config,
-        '12345',
-        'VAR2',
-        mockRequestSetting,
-        ExtensionSettingScope.USER,
-      );
+      await updateSetting(config, "12345", "VAR2", mockRequestSetting, ExtensionSettingScope.USER);
 
-      const userKeychain = new KeychainTokenStorage(
-        `Gemini CLI Extensions test-ext 12345`,
-      );
-      expect(await userKeychain.getSecret('VAR2')).toBe('new-value2');
+      const userKeychain = new KeychainTokenStorage(`Gemini CLI Extensions test-ext 12345`);
+      expect(await userKeychain.getSecret("VAR2")).toBe("new-value2");
     });
 
-    it('should update a sensitive setting in WORKSPACE scope', async () => {
-      mockRequestSetting.mockResolvedValue('new-workspace-secret');
+    it("should update a sensitive setting in WORKSPACE scope", async () => {
+      mockRequestSetting.mockResolvedValue("new-workspace-secret");
 
       await updateSetting(
         config,
-        '12345',
-        'VAR2',
+        "12345",
+        "VAR2",
         mockRequestSetting,
         ExtensionSettingScope.WORKSPACE,
       );
@@ -690,41 +601,36 @@ describe('extensionSettings', () => {
       const workspaceKeychain = new KeychainTokenStorage(
         `Gemini CLI Extensions test-ext 12345 ${tempWorkspaceDir}`,
       );
-      expect(await workspaceKeychain.getSecret('VAR2')).toBe(
-        'new-workspace-secret',
-      );
+      expect(await workspaceKeychain.getSecret("VAR2")).toBe("new-workspace-secret");
     });
 
-    it('should leave existing, unmanaged .env variables intact when updating in WORKSPACE scope', async () => {
+    it("should leave existing, unmanaged .env variables intact when updating in WORKSPACE scope", async () => {
       // Setup a pre-existing .env file in the workspace with unmanaged variables
-      const workspaceEnvPath = path.join(tempWorkspaceDir, '.env');
+      const workspaceEnvPath = path.join(tempWorkspaceDir, ".env");
       const originalEnvContent =
-        'PROJECT_VAR_1=value_1\nPROJECT_VAR_2=value_2\nVAR1=original-value'; // VAR1 is managed by extension
+        "PROJECT_VAR_1=value_1\nPROJECT_VAR_2=value_2\nVAR1=original-value"; // VAR1 is managed by extension
       await fsPromises.writeFile(workspaceEnvPath, originalEnvContent);
 
       // Simulate updating an extension-managed non-sensitive setting
-      mockRequestSetting.mockResolvedValue('updated-value');
+      mockRequestSetting.mockResolvedValue("updated-value");
       await updateSetting(
         config,
-        '12345',
-        'VAR1',
+        "12345",
+        "VAR1",
         mockRequestSetting,
         ExtensionSettingScope.WORKSPACE,
       );
 
       // Read the .env file after update
-      const actualContent = await fsPromises.readFile(
-        workspaceEnvPath,
-        'utf-8',
-      );
+      const actualContent = await fsPromises.readFile(workspaceEnvPath, "utf-8");
 
       // Assert that original variables are intact and extension variable is updated
-      expect(actualContent).toContain('PROJECT_VAR_1=value_1');
-      expect(actualContent).toContain('PROJECT_VAR_2=value_2');
-      expect(actualContent).toContain('VAR1=updated-value');
+      expect(actualContent).toContain("PROJECT_VAR_1=value_1");
+      expect(actualContent).toContain("PROJECT_VAR_2=value_2");
+      expect(actualContent).toContain("VAR1=updated-value");
 
       // Ensure no other unexpected changes or deletions
-      const lines = actualContent.split('\n').filter((line) => line.length > 0);
+      const lines = actualContent.split("\n").filter((line) => line.length > 0);
       expect(lines).toHaveLength(3); // Should only have the three variables
     });
   });
diff --git a/packages/ui-gemini/src/config/extensions/extensionSettings.ts b/packages/ui-gemini/src/config/extensions/extensionSettings.ts
index 6e0309080..e797b41dd 100644
--- a/packages/ui-gemini/src/config/extensions/extensionSettings.ts
+++ b/packages/ui-gemini/src/config/extensions/extensionSettings.ts
@@ -4,21 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as fsSync from 'node:fs';
-import * as dotenv from 'dotenv';
-import * as path from 'node:path';
-
-import { ExtensionStorage } from './storage.js';
-import type { ExtensionConfig } from '../extension.js';
-
-import prompts from 'prompts';
-import { debugLogger, KeychainTokenStorage } from '@airiscode/gemini-cli-core';
-import { EXTENSION_SETTINGS_FILENAME } from './variables.js';
+import * as fsSync from "node:fs";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { debugLogger, KeychainTokenStorage } from "@airiscode/gemini-cli-core";
+import * as dotenv from "dotenv";
+import prompts from "prompts";
+import type { ExtensionConfig } from "../extension.js";
+import { ExtensionStorage } from "./storage.js";
+import { EXTENSION_SETTINGS_FILENAME } from "./variables.js";
 
 export enum ExtensionSettingScope {
-  USER = 'user',
-  WORKSPACE = 'workspace',
+  USER = "user",
+  WORKSPACE = "workspace",
 }
 
 export interface ExtensionSetting {
@@ -41,10 +39,7 @@ const getKeychainStorageName = (
   return base;
 };
 
-const getEnvFilePath = (
-  extensionName: string,
-  scope: ExtensionSettingScope,
-): string => {
+const getEnvFilePath = (extensionName: string, scope: ExtensionSettingScope): string => {
   if (scope === ExtensionSettingScope.WORKSPACE) {
     return path.join(process.cwd(), EXTENSION_SETTINGS_FILENAME);
   }
@@ -61,8 +56,7 @@ export async function maybePromptForSettings(
   const { name: extensionName, settings } = extensionConfig;
   if (
     (!settings || settings.length === 0) &&
-    (!previousExtensionConfig?.settings ||
-      previousExtensionConfig.settings.length === 0)
+    (!previousExtensionConfig?.settings || previousExtensionConfig.settings.length === 0)
   ) {
     return;
   }
@@ -79,10 +73,7 @@ export async function maybePromptForSettings(
     return;
   }
 
-  const settingsChanges = getSettingsChanges(
-    settings,
-    previousExtensionConfig?.settings ?? [],
-  );
+  const settingsChanges = getSettingsChanges(settings, previousExtensionConfig?.settings ?? []);
 
   const allSettings: Record<string, string> = { ...previousSettings };
 
@@ -94,9 +85,7 @@ export async function maybePromptForSettings(
     await keychain.deleteSecret(removedSensitiveSetting.envVar);
   }
 
-  for (const setting of settingsChanges.promptForSensitive.concat(
-    settingsChanges.promptForEnv,
-  )) {
+  for (const setting of settingsChanges.promptForSensitive.concat(settingsChanges.promptForEnv)) {
     const answer = await requestSetting(setting);
     allSettings[setting.envVar] = answer;
   }
@@ -120,20 +109,18 @@ export async function maybePromptForSettings(
 }
 
 function formatEnvContent(settings: Record<string, string>): string {
-  let envContent = '';
+  let envContent = "";
   for (const [key, value] of Object.entries(settings)) {
-    const formattedValue = value.includes(' ') ? `"${value}"` : value;
+    const formattedValue = value.includes(" ") ? `"${value}"` : value;
     envContent += `${key}=${formattedValue}\n`;
   }
   return envContent;
 }
 
-export async function promptForSetting(
-  setting: ExtensionSetting,
-): Promise<string> {
+export async function promptForSetting(setting: ExtensionSetting): Promise<string> {
   const response = await prompts({
-    type: setting.sensitive ? 'password' : 'text',
-    name: 'value',
+    type: setting.sensitive ? "password" : "text",
+    name: "value",
     message: `${setting.name}\n${setting.description}`,
   });
   return response.value;
@@ -151,7 +138,7 @@ export async function getScopedEnvContents(
   const envFilePath = getEnvFilePath(extensionName, scope);
   let customEnv: Record<string, string> = {};
   if (fsSync.existsSync(envFilePath)) {
-    const envFile = fsSync.readFileSync(envFilePath, 'utf-8');
+    const envFile = fsSync.readFileSync(envFilePath, "utf-8");
     customEnv = dotenv.parse(envFile);
   }
 
@@ -199,13 +186,11 @@ export async function updateSetting(
 ): Promise<void> {
   const { name: extensionName, settings } = extensionConfig;
   if (!settings || settings.length === 0) {
-    debugLogger.log('This extension does not have any settings.');
+    debugLogger.log("This extension does not have any settings.");
     return;
   }
 
-  const settingToUpdate = settings.find(
-    (s) => s.name === settingKey || s.envVar === settingKey,
-  );
+  const settingToUpdate = settings.find((s) => s.name === settingKey || s.envVar === settingKey);
 
   if (!settingToUpdate) {
     debugLogger.log(`Setting ${settingKey} not found.`);
@@ -225,9 +210,9 @@ export async function updateSetting(
   // For non-sensitive settings, we need to read the existing .env file,
   // update the value, and write it back, preserving any other values.
   const envFilePath = getEnvFilePath(extensionName, scope);
-  let envContent = '';
+  let envContent = "";
   if (fsSync.existsSync(envFilePath)) {
-    envContent = await fs.readFile(envFilePath, 'utf-8');
+    envContent = await fs.readFile(envFilePath, "utf-8");
   }
 
   const parsedEnv = dotenv.parse(envContent);
@@ -235,9 +220,7 @@ export async function updateSetting(
 
   // We only want to write back the variables that are not sensitive.
   const nonSensitiveSettings: Record<string, string> = {};
-  const sensitiveEnvVars = new Set(
-    settings.filter((s) => s.sensitive).map((s) => s.envVar),
-  );
+  const sensitiveEnvVars = new Set(settings.filter((s) => s.sensitive).map((s) => s.envVar));
   for (const [key, value] of Object.entries(parsedEnv)) {
     if (!sensitiveEnvVars.has(key)) {
       nonSensitiveSettings[key] = value;
@@ -270,24 +253,15 @@ function getSettingsChanges(
     promptForSensitive: sensitiveNew.filter(
       (s) => !sensitiveOld.some((old) => isSameSetting(s, old)),
     ),
-    removeSensitive: sensitiveOld.filter(
-      (s) => !sensitiveNew.some((neu) => isSameSetting(s, neu)),
-    ),
-    promptForEnv: envNew.filter(
-      (s) => !envOld.some((old) => isSameSetting(s, old)),
-    ),
-    removeEnv: envOld.filter(
-      (s) => !envNew.some((neu) => isSameSetting(s, neu)),
-    ),
+    removeSensitive: sensitiveOld.filter((s) => !sensitiveNew.some((neu) => isSameSetting(s, neu))),
+    promptForEnv: envNew.filter((s) => !envOld.some((old) => isSameSetting(s, old))),
+    removeEnv: envOld.filter((s) => !envNew.some((neu) => isSameSetting(s, neu))),
   };
 }
 
-async function clearSettings(
-  envFilePath: string,
-  keychain: KeychainTokenStorage,
-) {
+async function clearSettings(envFilePath: string, keychain: KeychainTokenStorage) {
   if (fsSync.existsSync(envFilePath)) {
-    await fs.writeFile(envFilePath, '');
+    await fs.writeFile(envFilePath, "");
   }
   if (!(await keychain.isAvailable())) {
     return;
diff --git a/packages/ui-gemini/src/config/extensions/github.test.ts b/packages/ui-gemini/src/config/extensions/github.test.ts
index 07e309e77..7d0a29733 100644
--- a/packages/ui-gemini/src/config/extensions/github.test.ts
+++ b/packages/ui-gemini/src/config/extensions/github.test.ts
@@ -4,41 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { EventEmitter } from "node:events";
+import * as fs from "node:fs";
+import * as https from "node:https";
+import * as os from "node:os";
+import type { ExtensionInstallMetadata, GeminiCLIExtension } from "@airiscode/gemini-cli-core";
+import * as extract from "extract-zip";
+import { type SimpleGit, simpleGit } from "simple-git";
+import * as tar from "tar";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ExtensionUpdateState } from "../../ui/state/extensions.js";
+import type { ExtensionConfig } from "../extension.js";
+import type { ExtensionManager } from "../extension-manager.js";
 import {
-  cloneFromGit,
-  tryParseGithubUrl,
-  fetchReleaseFromGithub,
   checkForExtensionUpdate,
-  downloadFromGitHubRelease,
-  findReleaseAsset,
+  cloneFromGit,
   downloadFile,
+  downloadFromGitHubRelease,
   extractFile,
-} from './github.js';
-import { simpleGit, type SimpleGit } from 'simple-git';
-import { ExtensionUpdateState } from '../../ui/state/extensions.js';
-import * as os from 'node:os';
-import * as fs from 'node:fs';
-import * as https from 'node:https';
-import * as tar from 'tar';
-import * as extract from 'extract-zip';
-import type { ExtensionManager } from '../extension-manager.js';
-import { fetchJson } from './github_fetch.js';
-import { EventEmitter } from 'node:events';
-import type {
-  GeminiCLIExtension,
-  ExtensionInstallMetadata,
-} from '@airiscode/gemini-cli-core';
-import type { ExtensionConfig } from '../extension.js';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+  fetchReleaseFromGithub,
+  findReleaseAsset,
+  tryParseGithubUrl,
+} from "./github.js";
+import { fetchJson } from "./github_fetch.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     Storage: {
-      getGlobalSettingsPath: vi.fn().mockReturnValue('/mock/settings.json'),
-      getGlobalGeminiDir: vi.fn().mockReturnValue('/mock/.gemini'),
+      getGlobalSettingsPath: vi.fn().mockReturnValue("/mock/settings.json"),
+      getGlobalGeminiDir: vi.fn().mockReturnValue("/mock/.gemini"),
     },
     debugLogger: {
       error: vi.fn(),
@@ -48,26 +44,26 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('simple-git');
-vi.mock('node:os');
-vi.mock('node:fs');
-vi.mock('node:https');
-vi.mock('tar');
-vi.mock('extract-zip');
-vi.mock('./github_fetch.js');
-vi.mock('../extension-manager.js');
+vi.mock("simple-git");
+vi.mock("node:os");
+vi.mock("node:fs");
+vi.mock("node:https");
+vi.mock("tar");
+vi.mock("extract-zip");
+vi.mock("./github_fetch.js");
+vi.mock("../extension-manager.js");
 // Mock settings.ts to avoid top-level side effects if possible, or just rely on Storage mock
-vi.mock('../settings.js', () => ({
+vi.mock("../settings.js", () => ({
   loadSettings: vi.fn(),
-  USER_SETTINGS_PATH: '/mock/settings.json',
+  USER_SETTINGS_PATH: "/mock/settings.json",
 }));
 
-describe('github.ts', () => {
+describe("github.ts", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  describe('cloneFromGit', () => {
+  describe("cloneFromGit", () => {
     let mockGit: {
       clone: ReturnType<typeof vi.fn>;
       getRemotes: ReturnType<typeof vi.fn>;
@@ -89,118 +85,105 @@ describe('github.ts', () => {
       vi.mocked(simpleGit).mockReturnValue(mockGit as unknown as SimpleGit);
     });
 
-    it('should clone, fetch and checkout a repo', async () => {
-      mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
+    it("should clone, fetch and checkout a repo", async () => {
+      mockGit.getRemotes.mockResolvedValue([{ name: "origin" }]);
 
       await cloneFromGit(
         {
-          type: 'git',
-          source: 'https://github.com/owner/repo.git',
-          ref: 'v1.0.0',
+          type: "git",
+          source: "https://github.com/owner/repo.git",
+          ref: "v1.0.0",
         },
-        '/dest',
+        "/dest",
       );
 
-      expect(mockGit.clone).toHaveBeenCalledWith(
-        'https://github.com/owner/repo.git',
-        './',
-        ['--depth', '1'],
-      );
-      expect(mockGit.fetch).toHaveBeenCalledWith('origin', 'v1.0.0');
-      expect(mockGit.checkout).toHaveBeenCalledWith('FETCH_HEAD');
+      expect(mockGit.clone).toHaveBeenCalledWith("https://github.com/owner/repo.git", "./", [
+        "--depth",
+        "1",
+      ]);
+      expect(mockGit.fetch).toHaveBeenCalledWith("origin", "v1.0.0");
+      expect(mockGit.checkout).toHaveBeenCalledWith("FETCH_HEAD");
     });
 
-    it('should throw if no remotes found', async () => {
+    it("should throw if no remotes found", async () => {
       mockGit.getRemotes.mockResolvedValue([]);
 
-      await expect(
-        cloneFromGit({ type: 'git', source: 'src' }, '/dest'),
-      ).rejects.toThrow('Unable to find any remotes');
+      await expect(cloneFromGit({ type: "git", source: "src" }, "/dest")).rejects.toThrow(
+        "Unable to find any remotes",
+      );
     });
 
-    it('should throw on clone error', async () => {
-      mockGit.clone.mockRejectedValue(new Error('Clone failed'));
+    it("should throw on clone error", async () => {
+      mockGit.clone.mockRejectedValue(new Error("Clone failed"));
 
-      await expect(
-        cloneFromGit({ type: 'git', source: 'src' }, '/dest'),
-      ).rejects.toThrow('Failed to clone Git repository');
+      await expect(cloneFromGit({ type: "git", source: "src" }, "/dest")).rejects.toThrow(
+        "Failed to clone Git repository",
+      );
     });
   });
 
-  describe('tryParseGithubUrl', () => {
+  describe("tryParseGithubUrl", () => {
     it.each([
-      ['https://github.com/owner/repo', 'owner', 'repo'],
-      ['https://github.com/owner/repo.git', 'owner', 'repo'],
-      ['git@github.com:owner/repo.git', 'owner', 'repo'],
-      ['owner/repo', 'owner', 'repo'],
-    ])('should parse %s to %s/%s', (url, owner, repo) => {
+      ["https://github.com/owner/repo", "owner", "repo"],
+      ["https://github.com/owner/repo.git", "owner", "repo"],
+      ["git@github.com:owner/repo.git", "owner", "repo"],
+      ["owner/repo", "owner", "repo"],
+    ])("should parse %s to %s/%s", (url, owner, repo) => {
       expect(tryParseGithubUrl(url)).toEqual({ owner, repo });
     });
 
     it.each([
-      'https://gitlab.com/owner/repo',
-      'https://my-git-host.com/owner/group/repo',
-      'git@gitlab.com:some-group/some-project/some-repo.git',
-    ])('should return null for non-GitHub URLs', (url) => {
+      "https://gitlab.com/owner/repo",
+      "https://my-git-host.com/owner/group/repo",
+      "git@gitlab.com:some-group/some-project/some-repo.git",
+    ])("should return null for non-GitHub URLs", (url) => {
       expect(tryParseGithubUrl(url)).toBeNull();
     });
 
-    it('should throw for invalid formats', () => {
-      expect(() => tryParseGithubUrl('invalid')).toThrow(
-        'Invalid GitHub repository source',
-      );
+    it("should throw for invalid formats", () => {
+      expect(() => tryParseGithubUrl("invalid")).toThrow("Invalid GitHub repository source");
     });
   });
 
-  describe('fetchReleaseFromGithub', () => {
-    it('should fetch latest release if no ref provided', async () => {
-      vi.mocked(fetchJson).mockResolvedValue({ tag_name: 'v1.0.0' });
+  describe("fetchReleaseFromGithub", () => {
+    it("should fetch latest release if no ref provided", async () => {
+      vi.mocked(fetchJson).mockResolvedValue({ tag_name: "v1.0.0" });
 
-      await fetchReleaseFromGithub('owner', 'repo');
+      await fetchReleaseFromGithub("owner", "repo");
 
       expect(fetchJson).toHaveBeenCalledWith(
-        'https://api.github.com/repos/owner/repo/releases/latest',
+        "https://api.github.com/repos/owner/repo/releases/latest",
       );
     });
 
-    it('should fetch specific ref if provided', async () => {
-      vi.mocked(fetchJson).mockResolvedValue({ tag_name: 'v1.0.0' });
+    it("should fetch specific ref if provided", async () => {
+      vi.mocked(fetchJson).mockResolvedValue({ tag_name: "v1.0.0" });
 
-      await fetchReleaseFromGithub('owner', 'repo', 'v1.0.0');
+      await fetchReleaseFromGithub("owner", "repo", "v1.0.0");
 
       expect(fetchJson).toHaveBeenCalledWith(
-        'https://api.github.com/repos/owner/repo/releases/tags/v1.0.0',
+        "https://api.github.com/repos/owner/repo/releases/tags/v1.0.0",
       );
     });
 
-    it('should handle pre-releases if allowed', async () => {
-      vi.mocked(fetchJson).mockResolvedValueOnce([{ tag_name: 'v1.0.0-beta' }]);
+    it("should handle pre-releases if allowed", async () => {
+      vi.mocked(fetchJson).mockResolvedValueOnce([{ tag_name: "v1.0.0-beta" }]);
 
-      const result = await fetchReleaseFromGithub(
-        'owner',
-        'repo',
-        undefined,
-        true,
-      );
+      const result = await fetchReleaseFromGithub("owner", "repo", undefined, true);
 
-      expect(result).toEqual({ tag_name: 'v1.0.0-beta' });
+      expect(result).toEqual({ tag_name: "v1.0.0-beta" });
     });
 
-    it('should return null if no releases found', async () => {
+    it("should return null if no releases found", async () => {
       vi.mocked(fetchJson).mockResolvedValueOnce([]);
 
-      const result = await fetchReleaseFromGithub(
-        'owner',
-        'repo',
-        undefined,
-        true,
-      );
+      const result = await fetchReleaseFromGithub("owner", "repo", undefined, true);
 
       expect(result).toBeNull();
     });
   });
 
-  describe('checkForExtensionUpdate', () => {
+  describe("checkForExtensionUpdate", () => {
     let mockExtensionManager: ExtensionManager;
     let mockGit: {
       getRemotes: ReturnType<typeof vi.fn>;
@@ -220,63 +203,57 @@ describe('github.ts', () => {
       vi.mocked(simpleGit).mockReturnValue(mockGit as unknown as SimpleGit);
     });
 
-    it('should return NOT_UPDATABLE for non-git/non-release extensions', async () => {
+    it("should return NOT_UPDATABLE for non-git/non-release extensions", async () => {
       vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue({
-        version: '1.0.0',
+        version: "1.0.0",
       } as unknown as ExtensionConfig);
 
       const linkExt = {
-        installMetadata: { type: 'link' },
+        installMetadata: { type: "link" },
       } as unknown as GeminiCLIExtension;
       expect(await checkForExtensionUpdate(linkExt, mockExtensionManager)).toBe(
         ExtensionUpdateState.NOT_UPDATABLE,
       );
     });
 
-    it('should return UPDATE_AVAILABLE if git remote hash differs', async () => {
-      mockGit.getRemotes.mockResolvedValue([
-        { name: 'origin', refs: { fetch: 'url' } },
-      ]);
-      mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
-      mockGit.revparse.mockResolvedValue('local-hash');
+    it("should return UPDATE_AVAILABLE if git remote hash differs", async () => {
+      mockGit.getRemotes.mockResolvedValue([{ name: "origin", refs: { fetch: "url" } }]);
+      mockGit.listRemote.mockResolvedValue("remote-hash\tHEAD");
+      mockGit.revparse.mockResolvedValue("local-hash");
 
       const ext = {
-        path: '/path',
-        installMetadata: { type: 'git', source: 'url' },
+        path: "/path",
+        installMetadata: { type: "git", source: "url" },
       } as unknown as GeminiCLIExtension;
       expect(await checkForExtensionUpdate(ext, mockExtensionManager)).toBe(
         ExtensionUpdateState.UPDATE_AVAILABLE,
       );
     });
 
-    it('should return UP_TO_DATE if git remote hash matches', async () => {
-      mockGit.getRemotes.mockResolvedValue([
-        { name: 'origin', refs: { fetch: 'url' } },
-      ]);
-      mockGit.listRemote.mockResolvedValue('hash\tHEAD');
-      mockGit.revparse.mockResolvedValue('hash');
+    it("should return UP_TO_DATE if git remote hash matches", async () => {
+      mockGit.getRemotes.mockResolvedValue([{ name: "origin", refs: { fetch: "url" } }]);
+      mockGit.listRemote.mockResolvedValue("hash\tHEAD");
+      mockGit.revparse.mockResolvedValue("hash");
 
       const ext = {
-        path: '/path',
-        installMetadata: { type: 'git', source: 'url' },
+        path: "/path",
+        installMetadata: { type: "git", source: "url" },
       } as unknown as GeminiCLIExtension;
       expect(await checkForExtensionUpdate(ext, mockExtensionManager)).toBe(
         ExtensionUpdateState.UP_TO_DATE,
       );
     });
 
-    it('should return NOT_UPDATABLE if local extension config cannot be loaded', async () => {
-      vi.mocked(mockExtensionManager.loadExtensionConfig).mockImplementation(
-        () => {
-          throw new Error('Config not found');
-        },
-      );
+    it("should return NOT_UPDATABLE if local extension config cannot be loaded", async () => {
+      vi.mocked(mockExtensionManager.loadExtensionConfig).mockImplementation(() => {
+        throw new Error("Config not found");
+      });
 
       const ext = {
-        name: 'local-ext',
-        version: '1.0.0',
-        path: '/path/to/installed/ext',
-        installMetadata: { type: 'local', source: '/path/to/source/ext' },
+        name: "local-ext",
+        version: "1.0.0",
+        path: "/path/to/installed/ext",
+        installMetadata: { type: "local", source: "/path/to/source/ext" },
       } as unknown as GeminiCLIExtension;
 
       expect(await checkForExtensionUpdate(ext, mockExtensionManager)).toBe(
@@ -285,47 +262,46 @@ describe('github.ts', () => {
     });
   });
 
-  describe('downloadFromGitHubRelease', () => {
-    it('should fail if no release data found', async () => {
+  describe("downloadFromGitHubRelease", () => {
+    it("should fail if no release data found", async () => {
       // Mock fetchJson to throw for latest release check
-      vi.mocked(fetchJson).mockRejectedValue(new Error('Not found'));
+      vi.mocked(fetchJson).mockRejectedValue(new Error("Not found"));
 
       const result = await downloadFromGitHubRelease(
         {
-          type: 'github-release',
-          source: 'owner/repo',
-          ref: 'v1',
+          type: "github-release",
+          source: "owner/repo",
+          ref: "v1",
         } as unknown as ExtensionInstallMetadata,
-        '/dest',
-        { owner: 'owner', repo: 'repo' },
+        "/dest",
+        { owner: "owner", repo: "repo" },
       );
 
       expect(result.success).toBe(false);
       if (!result.success) {
-        expect(result.failureReason).toBe('failed to fetch release data');
+        expect(result.failureReason).toBe("failed to fetch release data");
       }
     });
 
-    it('should use correct headers for release assets', async () => {
+    it("should use correct headers for release assets", async () => {
       vi.mocked(fetchJson).mockResolvedValue({
-        tag_name: 'v1.0.0',
-        assets: [{ name: 'asset.tar.gz', url: 'http://asset.url' }],
+        tag_name: "v1.0.0",
+        assets: [{ name: "asset.tar.gz", url: "http://asset.url" }],
       });
-      vi.mocked(os.platform).mockReturnValue('linux');
-      vi.mocked(os.arch).mockReturnValue('x64');
+      vi.mocked(os.platform).mockReturnValue("linux");
+      vi.mocked(os.arch).mockReturnValue("x64");
 
       // Mock https.get and fs.createWriteStream for downloadFile
       const mockReq = new EventEmitter();
-      const mockRes =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockRes = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockRes, { statusCode: 200, pipe: vi.fn() });
 
       vi.mocked(https.get).mockImplementation((url, options, cb) => {
-        if (typeof options === 'function') {
+        if (typeof options === "function") {
           cb = options;
         }
         if (cb) cb(mockRes);
-        return mockReq as unknown as import('node:http').ClientRequest;
+        return mockReq as unknown as import("node:http").ClientRequest;
       });
 
       const mockStream = new EventEmitter() as unknown as fs.WriteStream;
@@ -339,55 +315,52 @@ describe('github.ts', () => {
 
       const promise = downloadFromGitHubRelease(
         {
-          type: 'github-release',
-          source: 'owner/repo',
-          ref: 'v1.0.0',
+          type: "github-release",
+          source: "owner/repo",
+          ref: "v1.0.0",
         } as unknown as ExtensionInstallMetadata,
-        '/dest',
-        { owner: 'owner', repo: 'repo' },
+        "/dest",
+        { owner: "owner", repo: "repo" },
       );
 
       // Wait for downloadFile to be called and stream to be created
-      await vi.waitUntil(
-        () => vi.mocked(fs.createWriteStream).mock.calls.length > 0,
-      );
+      await vi.waitUntil(() => vi.mocked(fs.createWriteStream).mock.calls.length > 0);
 
       // Trigger stream events to complete download
-      mockRes.emit('end');
-      mockStream.emit('finish');
+      mockRes.emit("end");
+      mockStream.emit("finish");
 
       await promise;
 
       expect(https.get).toHaveBeenCalledWith(
-        'http://asset.url',
+        "http://asset.url",
         expect.objectContaining({
           headers: expect.objectContaining({
-            Accept: 'application/octet-stream',
+            Accept: "application/octet-stream",
           }),
         }),
         expect.anything(),
       );
     });
 
-    it('should use correct headers for source tarballs', async () => {
+    it("should use correct headers for source tarballs", async () => {
       vi.mocked(fetchJson).mockResolvedValue({
-        tag_name: 'v1.0.0',
+        tag_name: "v1.0.0",
         assets: [],
-        tarball_url: 'http://tarball.url',
+        tarball_url: "http://tarball.url",
       });
 
       // Mock https.get and fs.createWriteStream for downloadFile
       const mockReq = new EventEmitter();
-      const mockRes =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockRes = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockRes, { statusCode: 200, pipe: vi.fn() });
 
       vi.mocked(https.get).mockImplementation((url, options, cb) => {
-        if (typeof options === 'function') {
+        if (typeof options === "function") {
           cb = options;
         }
         if (cb) cb(mockRes);
-        return mockReq as unknown as import('node:http').ClientRequest;
+        return mockReq as unknown as import("node:http").ClientRequest;
       });
 
       const mockStream = new EventEmitter() as unknown as fs.WriteStream;
@@ -401,30 +374,28 @@ describe('github.ts', () => {
 
       const promise = downloadFromGitHubRelease(
         {
-          type: 'github-release',
-          source: 'owner/repo',
-          ref: 'v1.0.0',
+          type: "github-release",
+          source: "owner/repo",
+          ref: "v1.0.0",
         } as unknown as ExtensionInstallMetadata,
-        '/dest',
-        { owner: 'owner', repo: 'repo' },
+        "/dest",
+        { owner: "owner", repo: "repo" },
       );
 
       // Wait for downloadFile to be called and stream to be created
-      await vi.waitUntil(
-        () => vi.mocked(fs.createWriteStream).mock.calls.length > 0,
-      );
+      await vi.waitUntil(() => vi.mocked(fs.createWriteStream).mock.calls.length > 0);
 
       // Trigger stream events to complete download
-      mockRes.emit('end');
-      mockStream.emit('finish');
+      mockRes.emit("end");
+      mockStream.emit("finish");
 
       await promise;
 
       expect(https.get).toHaveBeenCalledWith(
-        'http://tarball.url',
+        "http://tarball.url",
         expect.objectContaining({
           headers: expect.objectContaining({
-            Accept: 'application/vnd.github+json',
+            Accept: "application/vnd.github+json",
           }),
         }),
         expect.anything(),
@@ -432,200 +403,185 @@ describe('github.ts', () => {
     });
   });
 
-  describe('findReleaseAsset', () => {
-    it('should find platform/arch specific asset', () => {
-      vi.mocked(os.platform).mockReturnValue('darwin');
-      vi.mocked(os.arch).mockReturnValue('arm64');
+  describe("findReleaseAsset", () => {
+    it("should find platform/arch specific asset", () => {
+      vi.mocked(os.platform).mockReturnValue("darwin");
+      vi.mocked(os.arch).mockReturnValue("arm64");
       const assets = [
-        { name: 'darwin.arm64.tar.gz', url: 'url1' },
-        { name: 'linux.x64.tar.gz', url: 'url2' },
+        { name: "darwin.arm64.tar.gz", url: "url1" },
+        { name: "linux.x64.tar.gz", url: "url2" },
       ];
       expect(findReleaseAsset(assets)).toEqual(assets[0]);
     });
 
-    it('should find generic asset', () => {
-      vi.mocked(os.platform).mockReturnValue('darwin');
-      const assets = [{ name: 'generic.tar.gz', url: 'url' }];
+    it("should find generic asset", () => {
+      vi.mocked(os.platform).mockReturnValue("darwin");
+      const assets = [{ name: "generic.tar.gz", url: "url" }];
       expect(findReleaseAsset(assets)).toEqual(assets[0]);
     });
   });
 
-  describe('downloadFile', () => {
-    it('should download file successfully', async () => {
+  describe("downloadFile", () => {
+    it("should download file successfully", async () => {
       const mockReq = new EventEmitter();
-      const mockRes =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockRes = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockRes, { statusCode: 200, pipe: vi.fn() });
 
       vi.mocked(https.get).mockImplementation((url, options, cb) => {
-        if (typeof options === 'function') {
+        if (typeof options === "function") {
           cb = options;
         }
         if (cb) cb(mockRes);
-        return mockReq as unknown as import('node:http').ClientRequest;
+        return mockReq as unknown as import("node:http").ClientRequest;
       });
 
       const mockStream = new EventEmitter() as unknown as fs.WriteStream;
       Object.assign(mockStream, { close: vi.fn((cb) => cb && cb()) });
       vi.mocked(fs.createWriteStream).mockReturnValue(mockStream);
 
-      const promise = downloadFile('url', '/dest');
-      mockRes.emit('end');
-      mockStream.emit('finish');
+      const promise = downloadFile("url", "/dest");
+      mockRes.emit("end");
+      mockStream.emit("finish");
 
       await expect(promise).resolves.toBeUndefined();
     });
 
-    it('should fail on non-200 status', async () => {
+    it("should fail on non-200 status", async () => {
       const mockReq = new EventEmitter();
-      const mockRes =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockRes = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockRes, { statusCode: 404 });
 
       vi.mocked(https.get).mockImplementation((url, options, cb) => {
-        if (typeof options === 'function') {
+        if (typeof options === "function") {
           cb = options;
         }
         if (cb) cb(mockRes);
-        return mockReq as unknown as import('node:http').ClientRequest;
+        return mockReq as unknown as import("node:http").ClientRequest;
       });
 
-      await expect(downloadFile('url', '/dest')).rejects.toThrow(
-        'Request failed with status code 404',
+      await expect(downloadFile("url", "/dest")).rejects.toThrow(
+        "Request failed with status code 404",
       );
     });
 
-    it('should follow redirects', async () => {
+    it("should follow redirects", async () => {
       const mockReq = new EventEmitter();
-      const mockResRedirect =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockResRedirect = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockResRedirect, {
         statusCode: 302,
-        headers: { location: 'new-url' },
+        headers: { location: "new-url" },
       });
 
-      const mockResSuccess =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockResSuccess = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockResSuccess, { statusCode: 200, pipe: vi.fn() });
 
       vi.mocked(https.get)
         .mockImplementationOnce((url, options, cb) => {
-          if (typeof options === 'function') cb = options;
+          if (typeof options === "function") cb = options;
           if (cb) cb(mockResRedirect);
-          return mockReq as unknown as import('node:http').ClientRequest;
+          return mockReq as unknown as import("node:http").ClientRequest;
         })
         .mockImplementationOnce((url, options, cb) => {
-          if (typeof options === 'function') cb = options;
+          if (typeof options === "function") cb = options;
           if (cb) cb(mockResSuccess);
-          return mockReq as unknown as import('node:http').ClientRequest;
+          return mockReq as unknown as import("node:http").ClientRequest;
         });
 
       const mockStream = new EventEmitter() as unknown as fs.WriteStream;
       Object.assign(mockStream, { close: vi.fn((cb) => cb && cb()) });
       vi.mocked(fs.createWriteStream).mockReturnValue(mockStream);
 
-      const promise = downloadFile('url', '/dest');
-      mockResSuccess.emit('end');
-      mockStream.emit('finish');
+      const promise = downloadFile("url", "/dest");
+      mockResSuccess.emit("end");
+      mockStream.emit("finish");
 
       await expect(promise).resolves.toBeUndefined();
       expect(https.get).toHaveBeenCalledTimes(2);
-      expect(https.get).toHaveBeenLastCalledWith(
-        'new-url',
-        expect.anything(),
-        expect.anything(),
-      );
+      expect(https.get).toHaveBeenLastCalledWith("new-url", expect.anything(), expect.anything());
     });
 
-    it('should fail after too many redirects', async () => {
+    it("should fail after too many redirects", async () => {
       const mockReq = new EventEmitter();
-      const mockResRedirect =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockResRedirect = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockResRedirect, {
         statusCode: 302,
-        headers: { location: 'new-url' },
+        headers: { location: "new-url" },
       });
 
       vi.mocked(https.get).mockImplementation((url, options, cb) => {
-        if (typeof options === 'function') cb = options;
+        if (typeof options === "function") cb = options;
         if (cb) cb(mockResRedirect);
-        return mockReq as unknown as import('node:http').ClientRequest;
+        return mockReq as unknown as import("node:http").ClientRequest;
       });
 
-      await expect(downloadFile('url', '/dest')).rejects.toThrow(
-        'Too many redirects',
-      );
+      await expect(downloadFile("url", "/dest")).rejects.toThrow("Too many redirects");
     }, 10000); // Increase timeout for this test if needed, though with mocks it should be fast
 
-    it('should fail if redirect location is missing', async () => {
+    it("should fail if redirect location is missing", async () => {
       const mockReq = new EventEmitter();
-      const mockResRedirect =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockResRedirect = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockResRedirect, {
         statusCode: 302,
         headers: {}, // No location
       });
 
       vi.mocked(https.get).mockImplementation((url, options, cb) => {
-        if (typeof options === 'function') cb = options;
+        if (typeof options === "function") cb = options;
         if (cb) cb(mockResRedirect);
-        return mockReq as unknown as import('node:http').ClientRequest;
+        return mockReq as unknown as import("node:http").ClientRequest;
       });
 
-      await expect(downloadFile('url', '/dest')).rejects.toThrow(
-        'Redirect response missing Location header',
+      await expect(downloadFile("url", "/dest")).rejects.toThrow(
+        "Redirect response missing Location header",
       );
     });
 
-    it('should pass custom headers', async () => {
+    it("should pass custom headers", async () => {
       const mockReq = new EventEmitter();
-      const mockRes =
-        new EventEmitter() as unknown as import('node:http').IncomingMessage;
+      const mockRes = new EventEmitter() as unknown as import("node:http").IncomingMessage;
       Object.assign(mockRes, { statusCode: 200, pipe: vi.fn() });
 
       vi.mocked(https.get).mockImplementation((url, options, cb) => {
-        if (typeof options === 'function') cb = options;
+        if (typeof options === "function") cb = options;
         if (cb) cb(mockRes);
-        return mockReq as unknown as import('node:http').ClientRequest;
+        return mockReq as unknown as import("node:http").ClientRequest;
       });
 
       const mockStream = new EventEmitter() as unknown as fs.WriteStream;
       Object.assign(mockStream, { close: vi.fn((cb) => cb && cb()) });
       vi.mocked(fs.createWriteStream).mockReturnValue(mockStream);
 
-      const promise = downloadFile('url', '/dest', {
-        headers: { 'X-Custom': 'value' },
+      const promise = downloadFile("url", "/dest", {
+        headers: { "X-Custom": "value" },
       });
-      mockRes.emit('end');
-      mockStream.emit('finish');
+      mockRes.emit("end");
+      mockStream.emit("finish");
 
       await expect(promise).resolves.toBeUndefined();
       expect(https.get).toHaveBeenCalledWith(
-        'url',
+        "url",
         expect.objectContaining({
-          headers: expect.objectContaining({ 'X-Custom': 'value' }),
+          headers: expect.objectContaining({ "X-Custom": "value" }),
         }),
         expect.anything(),
       );
     });
   });
 
-  describe('extractFile', () => {
-    it('should extract tar.gz using tar', async () => {
-      await extractFile('file.tar.gz', '/dest');
+  describe("extractFile", () => {
+    it("should extract tar.gz using tar", async () => {
+      await extractFile("file.tar.gz", "/dest");
       expect(tar.x).toHaveBeenCalled();
     });
 
-    it('should extract zip using extract-zip', async () => {
+    it("should extract zip using extract-zip", async () => {
       vi.mocked(extract.default || extract).mockResolvedValue(undefined);
-      await extractFile('file.zip', '/dest');
+      await extractFile("file.zip", "/dest");
       // Check if extract was called. Note: extract-zip export might be default or named depending on mock
     });
 
-    it('should throw for unsupported extensions', async () => {
-      await expect(extractFile('file.txt', '/dest')).rejects.toThrow(
-        'Unsupported file extension',
-      );
+    it("should throw for unsupported extensions", async () => {
+      await expect(extractFile("file.txt", "/dest")).rejects.toThrow("Unsupported file extension");
     });
   });
 });
diff --git a/packages/ui-gemini/src/config/extensions/github.ts b/packages/ui-gemini/src/config/extensions/github.ts
index 79e471d99..d5b166579 100644
--- a/packages/ui-gemini/src/config/extensions/github.ts
+++ b/packages/ui-gemini/src/config/extensions/github.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { simpleGit } from 'simple-git';
-import { getErrorMessage } from '../../utils/errors.js';
+import * as fs from "node:fs";
+import * as https from "node:https";
+import * as os from "node:os";
+import * as path from "node:path";
 import {
   debugLogger,
   type ExtensionInstallMetadata,
   type GeminiCLIExtension,
-} from '@airiscode/gemini-cli-core';
-import { ExtensionUpdateState } from '../../ui/state/extensions.js';
-import * as os from 'node:os';
-import * as https from 'node:https';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as tar from 'tar';
-import extract from 'extract-zip';
-import { fetchJson, getGitHubToken } from './github_fetch.js';
-import type { ExtensionConfig } from '../extension.js';
-import type { ExtensionManager } from '../extension-manager.js';
-import { EXTENSIONS_CONFIG_FILENAME } from './variables.js';
+} from "@airiscode/gemini-cli-core";
+import extract from "extract-zip";
+import { simpleGit } from "simple-git";
+import * as tar from "tar";
+import { ExtensionUpdateState } from "../../ui/state/extensions.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import type { ExtensionConfig } from "../extension.js";
+import type { ExtensionManager } from "../extension-manager.js";
+import { fetchJson, getGitHubToken } from "./github_fetch.js";
+import { EXTENSIONS_CONFIG_FILENAME } from "./variables.js";
 
 /**
  * Clones a Git repository to a specified local path.
@@ -39,10 +39,7 @@ export async function cloneFromGit(
     if (token) {
       try {
         const parsedUrl = new URL(sourceUrl);
-        if (
-          parsedUrl.protocol === 'https:' &&
-          parsedUrl.hostname === 'github.com'
-        ) {
+        if (parsedUrl.protocol === "https:" && parsedUrl.hostname === "github.com") {
           if (!parsedUrl.username) {
             parsedUrl.username = token;
           }
@@ -53,22 +50,20 @@ export async function cloneFromGit(
         // We let git handle the source as is.
       }
     }
-    await git.clone(sourceUrl, './', ['--depth', '1']);
+    await git.clone(sourceUrl, "./", ["--depth", "1"]);
 
     const remotes = await git.getRemotes(true);
     if (remotes.length === 0) {
-      throw new Error(
-        `Unable to find any remotes for repo ${installMetadata.source}`,
-      );
+      throw new Error(`Unable to find any remotes for repo ${installMetadata.source}`);
     }
 
-    const refToFetch = installMetadata.ref || 'HEAD';
+    const refToFetch = installMetadata.ref || "HEAD";
 
     await git.fetch(remotes[0].name, refToFetch);
 
     // After fetching, checkout FETCH_HEAD to get the content of the fetched ref.
     // This results in a detached HEAD state, which is fine for this purpose.
-    await git.checkout('FETCH_HEAD');
+    await git.checkout("FETCH_HEAD");
   } catch (error) {
     throw new Error(
       `Failed to clone Git repository from ${installMetadata.source} ${getErrorMessage(error)}`,
@@ -86,10 +81,10 @@ export interface GithubRepoInfo {
 
 export function tryParseGithubUrl(source: string): GithubRepoInfo | null {
   // Handle SCP-style SSH URLs.
-  if (source.startsWith('git@')) {
-    if (source.startsWith('git@github.com:')) {
+  if (source.startsWith("git@")) {
+    if (source.startsWith("git@github.com:")) {
       // It's a GitHub SSH URL, so normalize it for the URL parser.
-      source = source.replace('git@github.com:', '');
+      source = source.replace("git@github.com:", "");
     } else {
       // It's another provider's SSH URL (e.g., gitlab), so not a GitHub repo.
       return null;
@@ -99,7 +94,7 @@ export function tryParseGithubUrl(source: string): GithubRepoInfo | null {
   let parsedUrl: URL;
   try {
     // Use the standard URL constructor for backward compatibility.
-    parsedUrl = new URL(source, 'https://github.com');
+    parsedUrl = new URL(source, "https://github.com");
   } catch (e) {
     // Throw a TypeError to maintain a consistent error contract for invalid URLs.
     // This avoids a breaking change for consumers who might expect a TypeError.
@@ -109,14 +104,14 @@ export function tryParseGithubUrl(source: string): GithubRepoInfo | null {
   if (!parsedUrl) {
     throw new Error(`Invalid repo URL: ${source}`);
   }
-  if (parsedUrl?.host !== 'github.com') {
+  if (parsedUrl?.host !== "github.com") {
     return null;
   }
   // The pathname should be "/owner/repo".
   const parts = parsedUrl?.pathname
-    .split('/')
+    .split("/")
     // Remove the empty segments, fixes trailing and leading slashes
-    .filter((part) => part !== '');
+    .filter((part) => part !== "");
 
   if (parts?.length !== 2) {
     throw new Error(
@@ -124,7 +119,7 @@ export function tryParseGithubUrl(source: string): GithubRepoInfo | null {
     );
   }
   const owner = parts[0];
-  const repo = parts[1].replace('.git', '');
+  const repo = parts[1].replace(".git", "");
 
   return {
     owner,
@@ -139,18 +134,14 @@ export async function fetchReleaseFromGithub(
   allowPreRelease?: boolean,
 ): Promise<GithubReleaseData | null> {
   if (ref) {
-    return fetchJson(
-      `https://api.github.com/repos/${owner}/${repo}/releases/tags/${ref}`,
-    );
+    return fetchJson(`https://api.github.com/repos/${owner}/${repo}/releases/tags/${ref}`);
   }
 
   if (!allowPreRelease) {
     // Grab the release that is tagged as the "latest", github does not allow
     // this to be a pre-release so we can blindly grab it.
     try {
-      return await fetchJson(
-        `https://api.github.com/repos/${owner}/${repo}/releases/latest`,
-      );
+      return await fetchJson(`https://api.github.com/repos/${owner}/${repo}/releases/latest`);
     } catch (_) {
       // This can fail if there is no release marked latest. In that case
       // we want to just try the pre-release logic below.
@@ -172,12 +163,10 @@ export async function checkForExtensionUpdate(
   extensionManager: ExtensionManager,
 ): Promise<ExtensionUpdateState> {
   const installMetadata = extension.installMetadata;
-  if (installMetadata?.type === 'local') {
+  if (installMetadata?.type === "local") {
     let latestConfig: ExtensionConfig | undefined;
     try {
-      latestConfig = extensionManager.loadExtensionConfig(
-        installMetadata.source,
-      );
+      latestConfig = extensionManager.loadExtensionConfig(installMetadata.source);
     } catch (e) {
       debugLogger.warn(
         `Failed to check for update for local extension "${extension.name}". Could not load extension from source path: ${installMetadata.source}. Error: ${getErrorMessage(e)}`,
@@ -198,44 +187,39 @@ export async function checkForExtensionUpdate(
   }
   if (
     !installMetadata ||
-    (installMetadata.type !== 'git' &&
-      installMetadata.type !== 'github-release')
+    (installMetadata.type !== "git" && installMetadata.type !== "github-release")
   ) {
     return ExtensionUpdateState.NOT_UPDATABLE;
   }
   try {
-    if (installMetadata.type === 'git') {
+    if (installMetadata.type === "git") {
       const git = simpleGit(extension.path);
       const remotes = await git.getRemotes(true);
       if (remotes.length === 0) {
-        debugLogger.error('No git remotes found.');
+        debugLogger.error("No git remotes found.");
         return ExtensionUpdateState.ERROR;
       }
       const remoteUrl = remotes[0].refs.fetch;
       if (!remoteUrl) {
-        debugLogger.error(
-          `No fetch URL found for git remote ${remotes[0].name}.`,
-        );
+        debugLogger.error(`No fetch URL found for git remote ${remotes[0].name}.`);
         return ExtensionUpdateState.ERROR;
       }
 
       // Determine the ref to check on the remote.
-      const refToCheck = installMetadata.ref || 'HEAD';
+      const refToCheck = installMetadata.ref || "HEAD";
 
       const lsRemoteOutput = await git.listRemote([remoteUrl, refToCheck]);
 
-      if (typeof lsRemoteOutput !== 'string' || lsRemoteOutput.trim() === '') {
+      if (typeof lsRemoteOutput !== "string" || lsRemoteOutput.trim() === "") {
         debugLogger.error(`Git ref ${refToCheck} not found.`);
         return ExtensionUpdateState.ERROR;
       }
 
-      const remoteHash = lsRemoteOutput.split('\t')[0];
-      const localHash = await git.revparse(['HEAD']);
+      const remoteHash = lsRemoteOutput.split("\t")[0];
+      const localHash = await git.revparse(["HEAD"]);
 
       if (!remoteHash) {
-        debugLogger.error(
-          `Unable to parse hash from git ls-remote output "${lsRemoteOutput}"`,
-        );
+        debugLogger.error(`Unable to parse hash from git ls-remote output "${lsRemoteOutput}"`);
         return ExtensionUpdateState.ERROR;
       }
       if (remoteHash === localHash) {
@@ -250,9 +234,7 @@ export async function checkForExtensionUpdate(
       }
       const repoInfo = tryParseGithubUrl(source);
       if (!repoInfo) {
-        debugLogger.error(
-          `Source is not a valid GitHub repository for release checks: ${source}`,
-        );
+        debugLogger.error(`Source is not a valid GitHub repository for release checks: ${source}`);
         return ExtensionUpdateState.ERROR;
       }
       const { owner, repo } = repoInfo;
@@ -282,20 +264,20 @@ export async function checkForExtensionUpdate(
 export type GitHubDownloadResult =
   | {
       tagName?: string;
-      type: 'git' | 'github-release';
+      type: "git" | "github-release";
       success: false;
       failureReason:
-        | 'failed to fetch release data'
-        | 'no release data'
-        | 'no release asset found'
-        | 'failed to download asset'
-        | 'failed to extract asset'
-        | 'unknown';
+        | "failed to fetch release data"
+        | "no release data"
+        | "no release asset found"
+        | "failed to download asset"
+        | "failed to extract asset"
+        | "unknown";
       errorMessage: string;
     }
   | {
       tagName?: string;
-      type: 'git' | 'github-release';
+      type: "git" | "github-release";
       success: true;
     };
 export async function downloadFromGitHubRelease(
@@ -312,17 +294,17 @@ export async function downloadFromGitHubRelease(
       releaseData = await fetchReleaseFromGithub(owner, repo, ref, preRelease);
       if (!releaseData) {
         return {
-          failureReason: 'no release data',
+          failureReason: "no release data",
           success: false,
-          type: 'github-release',
+          type: "github-release",
           errorMessage: `No release data found for ${owner}/${repo} at tag ${ref}`,
         };
       }
     } catch (error) {
       return {
-        failureReason: 'failed to fetch release data',
+        failureReason: "failed to fetch release data",
         success: false,
-        type: 'github-release',
+        type: "github-release",
         errorMessage: `Failed to fetch release data for ${owner}/${repo} at tag ${ref}: ${getErrorMessage(error)}`,
       };
     }
@@ -347,9 +329,9 @@ export async function downloadFromGitHubRelease(
     }
     if (!archiveUrl) {
       return {
-        failureReason: 'no release asset found',
+        failureReason: "no release asset found",
         success: false,
-        type: 'github-release',
+        type: "github-release",
         tagName: releaseData.tag_name,
         errorMessage: `No assets found for release with tag ${releaseData.tag_name}`,
       };
@@ -358,10 +340,10 @@ export async function downloadFromGitHubRelease(
       fileName = path.basename(new URL(archiveUrl).pathname);
     }
     let downloadedAssetPath = path.join(destination, fileName);
-    if (isTar && !downloadedAssetPath.endsWith('.tar.gz')) {
-      downloadedAssetPath += '.tar.gz';
-    } else if (isZip && !downloadedAssetPath.endsWith('.zip')) {
-      downloadedAssetPath += '.zip';
+    if (isTar && !downloadedAssetPath.endsWith(".tar.gz")) {
+      downloadedAssetPath += ".tar.gz";
+    } else if (isZip && !downloadedAssetPath.endsWith(".zip")) {
+      downloadedAssetPath += ".zip";
     }
 
     try {
@@ -372,15 +354,15 @@ export async function downloadFromGitHubRelease(
       //    Sending 'application/octet-stream' for tarballs results in a 415 Unsupported Media Type error.
       const headers = {
         ...(asset
-          ? { Accept: 'application/octet-stream' }
-          : { Accept: 'application/vnd.github+json' }),
+          ? { Accept: "application/octet-stream" }
+          : { Accept: "application/vnd.github+json" }),
       };
       await downloadFile(archiveUrl, downloadedAssetPath, { headers });
     } catch (error) {
       return {
-        failureReason: 'failed to download asset',
+        failureReason: "failed to download asset",
         success: false,
-        type: 'github-release',
+        type: "github-release",
         tagName: releaseData.tag_name,
         errorMessage: `Failed to download asset from ${archiveUrl}: ${getErrorMessage(error)}`,
       };
@@ -390,9 +372,9 @@ export async function downloadFromGitHubRelease(
       await extractFile(downloadedAssetPath, destination);
     } catch (error) {
       return {
-        failureReason: 'failed to extract asset',
+        failureReason: "failed to extract asset",
         success: false,
-        type: 'github-release',
+        type: "github-release",
         tagName: releaseData.tag_name,
         errorMessage: `Failed to extract asset from ${downloadedAssetPath}: ${getErrorMessage(error)}`,
       };
@@ -410,17 +392,12 @@ export async function downloadFromGitHubRelease(
       const lonelyDir = entries.find((entry) => entry.isDirectory());
       if (
         lonelyDir &&
-        fs.existsSync(
-          path.join(destination, lonelyDir.name, EXTENSIONS_CONFIG_FILENAME),
-        )
+        fs.existsSync(path.join(destination, lonelyDir.name, EXTENSIONS_CONFIG_FILENAME))
       ) {
         const dirPathToExtract = path.join(destination, lonelyDir.name);
         const extractedDirFiles = await fs.promises.readdir(dirPathToExtract);
         for (const file of extractedDirFiles) {
-          await fs.promises.rename(
-            path.join(dirPathToExtract, file),
-            path.join(destination, file),
-          );
+          await fs.promises.rename(path.join(dirPathToExtract, file), path.join(destination, file));
         }
         await fs.promises.rmdir(dirPathToExtract);
       }
@@ -429,14 +406,14 @@ export async function downloadFromGitHubRelease(
     await fs.promises.unlink(downloadedAssetPath);
     return {
       tagName: releaseData.tag_name,
-      type: 'github-release',
+      type: "github-release",
       success: true,
     };
   } catch (error) {
     return {
-      failureReason: 'unknown',
+      failureReason: "unknown",
       success: false,
-      type: 'github-release',
+      type: "github-release",
       tagName: releaseData?.tag_name,
       errorMessage: `Failed to download release from ${installMetadata.source}: ${getErrorMessage(error)}`,
     };
@@ -471,9 +448,7 @@ export function findReleaseAsset(assets: Asset[]): Asset | undefined {
   }
 
   // Check for platform specific asset
-  const platformAsset = assets.find((asset) =>
-    asset.name.toLowerCase().startsWith(platformPrefix),
-  );
+  const platformAsset = assets.find((asset) => asset.name.toLowerCase().startsWith(platformPrefix));
   if (platformAsset) {
     return platformAsset;
   }
@@ -481,9 +456,9 @@ export function findReleaseAsset(assets: Asset[]): Asset | undefined {
   // Check for generic asset if only one is available
   const genericAsset = assets.find(
     (asset) =>
-      !asset.name.toLowerCase().includes('darwin') &&
-      !asset.name.toLowerCase().includes('linux') &&
-      !asset.name.toLowerCase().includes('win32'),
+      !asset.name.toLowerCase().includes("darwin") &&
+      !asset.name.toLowerCase().includes("linux") &&
+      !asset.name.toLowerCase().includes("win32"),
   );
   if (assets.length === 1) {
     return genericAsset;
@@ -503,13 +478,13 @@ export async function downloadFile(
   redirectCount: number = 0,
 ): Promise<void> {
   const headers: Record<string, string> = {
-    'User-agent': 'gemini-cli',
-    Accept: 'application/octet-stream',
+    "User-agent": "gemini-cli",
+    Accept: "application/octet-stream",
     ...options?.headers,
   };
   const token = getGitHubToken();
   if (token) {
-    headers['Authorization'] = `token ${token}`;
+    headers["Authorization"] = `token ${token}`;
   }
 
   return new Promise((resolve, reject) => {
@@ -517,13 +492,11 @@ export async function downloadFile(
       .get(url, { headers }, (res) => {
         if (res.statusCode === 302 || res.statusCode === 301) {
           if (redirectCount >= 10) {
-            return reject(new Error('Too many redirects'));
+            return reject(new Error("Too many redirects"));
           }
 
           if (!res.headers.location) {
-            return reject(
-              new Error('Redirect response missing Location header'),
-            );
+            return reject(new Error("Redirect response missing Location header"));
           }
           downloadFile(res.headers.location, dest, options, redirectCount + 1)
             .then(resolve)
@@ -531,25 +504,23 @@ export async function downloadFile(
           return;
         }
         if (res.statusCode !== 200) {
-          return reject(
-            new Error(`Request failed with status code ${res.statusCode}`),
-          );
+          return reject(new Error(`Request failed with status code ${res.statusCode}`));
         }
         const file = fs.createWriteStream(dest);
         res.pipe(file);
-        file.on('finish', () => file.close(resolve as () => void));
+        file.on("finish", () => file.close(resolve as () => void));
       })
-      .on('error', reject);
+      .on("error", reject);
   });
 }
 
 export async function extractFile(file: string, dest: string): Promise<void> {
-  if (file.endsWith('.tar.gz')) {
+  if (file.endsWith(".tar.gz")) {
     await tar.x({
       file,
       cwd: dest,
     });
-  } else if (file.endsWith('.zip')) {
+  } else if (file.endsWith(".zip")) {
     await extract(file, { dir: dest });
   } else {
     throw new Error(`Unsupported file extension for extraction: ${file}`);
diff --git a/packages/ui-gemini/src/config/extensions/github_fetch.test.ts b/packages/ui-gemini/src/config/extensions/github_fetch.test.ts
index fe6edbedb..affb11f23 100644
--- a/packages/ui-gemini/src/config/extensions/github_fetch.test.ts
+++ b/packages/ui-gemini/src/config/extensions/github_fetch.test.ts
@@ -4,79 +4,79 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
-import * as https from 'node:https';
-import { EventEmitter } from 'node:events';
-import { fetchJson, getGitHubToken } from './github_fetch.js';
-import type { ClientRequest, IncomingMessage } from 'node:http';
+import { EventEmitter } from "node:events";
+import type { ClientRequest, IncomingMessage } from "node:http";
+import * as https from "node:https";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { fetchJson, getGitHubToken } from "./github_fetch.js";
 
-vi.mock('node:https');
+vi.mock("node:https");
 
-describe('getGitHubToken', () => {
-  const originalToken = process.env['GITHUB_TOKEN'];
+describe("getGitHubToken", () => {
+  const originalToken = process.env["GITHUB_TOKEN"];
 
   afterEach(() => {
     if (originalToken) {
-      process.env['GITHUB_TOKEN'] = originalToken;
+      process.env["GITHUB_TOKEN"] = originalToken;
     } else {
-      delete process.env['GITHUB_TOKEN'];
+      delete process.env["GITHUB_TOKEN"];
     }
   });
 
-  it('should return the token if GITHUB_TOKEN is set', () => {
-    process.env['GITHUB_TOKEN'] = 'test-token';
-    expect(getGitHubToken()).toBe('test-token');
+  it("should return the token if GITHUB_TOKEN is set", () => {
+    process.env["GITHUB_TOKEN"] = "test-token";
+    expect(getGitHubToken()).toBe("test-token");
   });
 
-  it('should return undefined if GITHUB_TOKEN is not set', () => {
-    delete process.env['GITHUB_TOKEN'];
+  it("should return undefined if GITHUB_TOKEN is not set", () => {
+    delete process.env["GITHUB_TOKEN"];
     expect(getGitHubToken()).toBeUndefined();
   });
 });
 
-describe('fetchJson', () => {
+describe("fetchJson", () => {
   const getMock = vi.mocked(https.get);
 
   afterEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should fetch and parse JSON successfully', async () => {
+  it("should fetch and parse JSON successfully", async () => {
     getMock.mockImplementationOnce((_url, _options, callback) => {
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 200;
       (callback as (res: IncomingMessage) => void)(res);
-      res.emit('data', Buffer.from('{"foo":'));
-      res.emit('data', Buffer.from('"bar"}'));
-      res.emit('end');
+      res.emit("data", Buffer.from('{"foo":'));
+      res.emit("data", Buffer.from('"bar"}'));
+      res.emit("end");
       return new EventEmitter() as ClientRequest;
     });
-    await expect(fetchJson('https://example.com/data.json')).resolves.toEqual({
-      foo: 'bar',
+    await expect(fetchJson("https://example.com/data.json")).resolves.toEqual({
+      foo: "bar",
     });
   });
 
-  it('should handle redirects (301 and 302)', async () => {
+  it("should handle redirects (301 and 302)", async () => {
     // Test 302
     getMock.mockImplementationOnce((_url, _options, callback) => {
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 302;
-      res.headers = { location: 'https://example.com/final' };
+      res.headers = { location: "https://example.com/final" };
       (callback as (res: IncomingMessage) => void)(res);
-      res.emit('end');
+      res.emit("end");
       return new EventEmitter() as ClientRequest;
     });
     getMock.mockImplementationOnce((url, _options, callback) => {
-      expect(url).toBe('https://example.com/final');
+      expect(url).toBe("https://example.com/final");
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 200;
       (callback as (res: IncomingMessage) => void)(res);
-      res.emit('data', Buffer.from('{"success": true}'));
-      res.emit('end');
+      res.emit("data", Buffer.from('{"success": true}'));
+      res.emit("end");
       return new EventEmitter() as ClientRequest;
     });
 
-    await expect(fetchJson('https://example.com/redirect')).resolves.toEqual({
+    await expect(fetchJson("https://example.com/redirect")).resolves.toEqual({
       success: true,
     });
 
@@ -84,115 +84,113 @@ describe('fetchJson', () => {
     getMock.mockImplementationOnce((_url, _options, callback) => {
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 301;
-      res.headers = { location: 'https://example.com/final-permanent' };
+      res.headers = { location: "https://example.com/final-permanent" };
       (callback as (res: IncomingMessage) => void)(res);
-      res.emit('end');
+      res.emit("end");
       return new EventEmitter() as ClientRequest;
     });
     getMock.mockImplementationOnce((url, _options, callback) => {
-      expect(url).toBe('https://example.com/final-permanent');
+      expect(url).toBe("https://example.com/final-permanent");
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 200;
       (callback as (res: IncomingMessage) => void)(res);
-      res.emit('data', Buffer.from('{"permanent": true}'));
-      res.emit('end');
+      res.emit("data", Buffer.from('{"permanent": true}'));
+      res.emit("end");
       return new EventEmitter() as ClientRequest;
     });
 
-    await expect(
-      fetchJson('https://example.com/redirect-perm'),
-    ).resolves.toEqual({ permanent: true });
+    await expect(fetchJson("https://example.com/redirect-perm")).resolves.toEqual({
+      permanent: true,
+    });
   });
 
-  it('should reject on non-200/30x status code', async () => {
+  it("should reject on non-200/30x status code", async () => {
     getMock.mockImplementationOnce((_url, _options, callback) => {
       const res = new EventEmitter() as IncomingMessage;
       res.statusCode = 404;
       (callback as (res: IncomingMessage) => void)(res);
-      res.emit('end');
+      res.emit("end");
       return new EventEmitter() as ClientRequest;
     });
 
-    await expect(fetchJson('https://example.com/error')).rejects.toThrow(
-      'Request failed with status code 404',
+    await expect(fetchJson("https://example.com/error")).rejects.toThrow(
+      "Request failed with status code 404",
     );
   });
 
-  it('should reject on request error', async () => {
-    const error = new Error('Network error');
+  it("should reject on request error", async () => {
+    const error = new Error("Network error");
     getMock.mockImplementationOnce(() => {
       const req = new EventEmitter() as ClientRequest;
-      req.emit('error', error);
+      req.emit("error", error);
       return req;
     });
 
-    await expect(fetchJson('https://example.com/error')).rejects.toThrow(
-      'Network error',
-    );
+    await expect(fetchJson("https://example.com/error")).rejects.toThrow("Network error");
   });
 
-  describe('with GITHUB_TOKEN', () => {
-    const originalToken = process.env['GITHUB_TOKEN'];
+  describe("with GITHUB_TOKEN", () => {
+    const originalToken = process.env["GITHUB_TOKEN"];
 
     beforeEach(() => {
-      process.env['GITHUB_TOKEN'] = 'my-secret-token';
+      process.env["GITHUB_TOKEN"] = "my-secret-token";
     });
 
     afterEach(() => {
       if (originalToken) {
-        process.env['GITHUB_TOKEN'] = originalToken;
+        process.env["GITHUB_TOKEN"] = originalToken;
       } else {
-        delete process.env['GITHUB_TOKEN'];
+        delete process.env["GITHUB_TOKEN"];
       }
     });
 
-    it('should include Authorization header if token is present', async () => {
+    it("should include Authorization header if token is present", async () => {
       getMock.mockImplementationOnce((_url, options, callback) => {
         expect(options.headers).toEqual({
-          'User-Agent': 'gemini-cli',
-          Authorization: 'token my-secret-token',
+          "User-Agent": "gemini-cli",
+          Authorization: "token my-secret-token",
         });
         const res = new EventEmitter() as IncomingMessage;
         res.statusCode = 200;
         (callback as (res: IncomingMessage) => void)(res);
-        res.emit('data', Buffer.from('{"foo": "bar"}'));
-        res.emit('end');
+        res.emit("data", Buffer.from('{"foo": "bar"}'));
+        res.emit("end");
         return new EventEmitter() as ClientRequest;
       });
-      await expect(fetchJson('https://api.github.com/user')).resolves.toEqual({
-        foo: 'bar',
+      await expect(fetchJson("https://api.github.com/user")).resolves.toEqual({
+        foo: "bar",
       });
     });
   });
 
-  describe('without GITHUB_TOKEN', () => {
-    const originalToken = process.env['GITHUB_TOKEN'];
+  describe("without GITHUB_TOKEN", () => {
+    const originalToken = process.env["GITHUB_TOKEN"];
 
     beforeEach(() => {
-      delete process.env['GITHUB_TOKEN'];
+      delete process.env["GITHUB_TOKEN"];
     });
 
     afterEach(() => {
       if (originalToken) {
-        process.env['GITHUB_TOKEN'] = originalToken;
+        process.env["GITHUB_TOKEN"] = originalToken;
       }
     });
 
-    it('should not include Authorization header if token is not present', async () => {
+    it("should not include Authorization header if token is not present", async () => {
       getMock.mockImplementationOnce((_url, options, callback) => {
         expect(options.headers).toEqual({
-          'User-Agent': 'gemini-cli',
+          "User-Agent": "gemini-cli",
         });
         const res = new EventEmitter() as IncomingMessage;
         res.statusCode = 200;
         (callback as (res: IncomingMessage) => void)(res);
-        res.emit('data', Buffer.from('{"foo": "bar"}'));
-        res.emit('end');
+        res.emit("data", Buffer.from('{"foo": "bar"}'));
+        res.emit("end");
         return new EventEmitter() as ClientRequest;
       });
 
-      await expect(fetchJson('https://api.github.com/user')).resolves.toEqual({
-        foo: 'bar',
+      await expect(fetchJson("https://api.github.com/user")).resolves.toEqual({
+        foo: "bar",
       });
     });
   });
diff --git a/packages/ui-gemini/src/config/extensions/github_fetch.ts b/packages/ui-gemini/src/config/extensions/github_fetch.ts
index a4f9d29b7..cd03f855c 100644
--- a/packages/ui-gemini/src/config/extensions/github_fetch.ts
+++ b/packages/ui-gemini/src/config/extensions/github_fetch.ts
@@ -4,18 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as https from 'node:https';
+import * as https from "node:https";
 
 export function getGitHubToken(): string | undefined {
-  return process.env['GITHUB_TOKEN'];
+  return process.env["GITHUB_TOKEN"];
 }
 
-export async function fetchJson<T>(
-  url: string,
-  redirectCount: number = 0,
-): Promise<T> {
-  const headers: { 'User-Agent': string; Authorization?: string } = {
-    'User-Agent': 'gemini-cli',
+export async function fetchJson<T>(url: string, redirectCount: number = 0): Promise<T> {
+  const headers: { "User-Agent": string; Authorization?: string } = {
+    "User-Agent": "gemini-cli",
   };
   const token = getGitHubToken();
   if (token) {
@@ -26,28 +23,24 @@ export async function fetchJson<T>(
       .get(url, { headers }, (res) => {
         if (res.statusCode === 302 || res.statusCode === 301) {
           if (redirectCount >= 10) {
-            return reject(new Error('Too many redirects'));
+            return reject(new Error("Too many redirects"));
           }
           if (!res.headers.location) {
-            return reject(new Error('No location header in redirect response'));
+            return reject(new Error("No location header in redirect response"));
           }
-          fetchJson<T>(res.headers.location!, redirectCount++)
-            .then(resolve)
-            .catch(reject);
+          fetchJson<T>(res.headers.location!, redirectCount++).then(resolve).catch(reject);
           return;
         }
         if (res.statusCode !== 200) {
-          return reject(
-            new Error(`Request failed with status code ${res.statusCode}`),
-          );
+          return reject(new Error(`Request failed with status code ${res.statusCode}`));
         }
         const chunks: Buffer[] = [];
-        res.on('data', (chunk) => chunks.push(chunk));
-        res.on('end', () => {
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("end", () => {
           const data = Buffer.concat(chunks).toString();
           resolve(JSON.parse(data) as T);
         });
       })
-      .on('error', reject);
+      .on("error", reject);
   });
 }
diff --git a/packages/ui-gemini/src/config/extensions/storage.test.ts b/packages/ui-gemini/src/config/extensions/storage.test.ts
index 13057188f..84f977400 100644
--- a/packages/ui-gemini/src/config/extensions/storage.test.ts
+++ b/packages/ui-gemini/src/config/extensions/storage.test.ts
@@ -4,19 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { ExtensionStorage } from './storage.js';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import {
-  EXTENSION_SETTINGS_FILENAME,
-  EXTENSIONS_CONFIG_FILENAME,
-} from './variables.js';
-import { Storage } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { Storage } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ExtensionStorage } from "./storage.js";
+import { EXTENSION_SETTINGS_FILENAME, EXTENSIONS_CONFIG_FILENAME } from "./variables.js";
 
-vi.mock('node:os');
-vi.mock('node:fs', async (importOriginal) => {
+vi.mock("node:os");
+vi.mock("node:fs", async (importOriginal) => {
   const actual = await importOriginal<typeof fs>();
   return {
     ...actual,
@@ -26,11 +23,11 @@ vi.mock('node:fs', async (importOriginal) => {
     },
   };
 });
-vi.mock('@airiscode/gemini-cli-core');
+vi.mock("@airiscode/gemini-cli-core");
 
-describe('ExtensionStorage', () => {
-  const mockHomeDir = '/mock/home';
-  const extensionName = 'test-extension';
+describe("ExtensionStorage", () => {
+  const mockHomeDir = "/mock/home";
+  const extensionName = "test-extension";
   let storage: ExtensionStorage;
 
   beforeEach(() => {
@@ -38,8 +35,7 @@ describe('ExtensionStorage', () => {
     vi.mocked(Storage).mockImplementation(
       () =>
         ({
-          getExtensionsDir: () =>
-            path.join(mockHomeDir, '.gemini', 'extensions'),
+          getExtensionsDir: () => path.join(mockHomeDir, ".gemini", "extensions"),
         }) as any, // eslint-disable-line @typescript-eslint/no-explicit-any
     );
     storage = new ExtensionStorage(extensionName);
@@ -49,53 +45,46 @@ describe('ExtensionStorage', () => {
     vi.restoreAllMocks();
   });
 
-  it('should return the correct extension directory', () => {
-    const expectedDir = path.join(
-      mockHomeDir,
-      '.gemini',
-      'extensions',
-      extensionName,
-    );
+  it("should return the correct extension directory", () => {
+    const expectedDir = path.join(mockHomeDir, ".gemini", "extensions", extensionName);
     expect(storage.getExtensionDir()).toBe(expectedDir);
   });
 
-  it('should return the correct config path', () => {
+  it("should return the correct config path", () => {
     const expectedPath = path.join(
       mockHomeDir,
-      '.gemini',
-      'extensions',
+      ".gemini",
+      "extensions",
       extensionName,
       EXTENSIONS_CONFIG_FILENAME, // EXTENSIONS_CONFIG_FILENAME
     );
     expect(storage.getConfigPath()).toBe(expectedPath);
   });
 
-  it('should return the correct env file path', () => {
+  it("should return the correct env file path", () => {
     const expectedPath = path.join(
       mockHomeDir,
-      '.gemini',
-      'extensions',
+      ".gemini",
+      "extensions",
       extensionName,
       EXTENSION_SETTINGS_FILENAME, // EXTENSION_SETTINGS_FILENAME
     );
     expect(storage.getEnvFilePath()).toBe(expectedPath);
   });
 
-  it('should return the correct user extensions directory', () => {
-    const expectedDir = path.join(mockHomeDir, '.gemini', 'extensions');
+  it("should return the correct user extensions directory", () => {
+    const expectedDir = path.join(mockHomeDir, ".gemini", "extensions");
     expect(ExtensionStorage.getUserExtensionsDir()).toBe(expectedDir);
   });
 
-  it('should create a temporary directory', async () => {
-    const mockTmpDir = '/tmp/gemini-extension-123';
+  it("should create a temporary directory", async () => {
+    const mockTmpDir = "/tmp/gemini-extension-123";
     vi.mocked(fs.promises.mkdtemp).mockResolvedValue(mockTmpDir);
-    vi.mocked(os.tmpdir).mockReturnValue('/tmp');
+    vi.mocked(os.tmpdir).mockReturnValue("/tmp");
 
     const result = await ExtensionStorage.createTmpDir();
 
-    expect(fs.promises.mkdtemp).toHaveBeenCalledWith(
-      path.join('/tmp', 'gemini-extension'),
-    );
+    expect(fs.promises.mkdtemp).toHaveBeenCalledWith(path.join("/tmp", "gemini-extension"));
     expect(result).toBe(mockTmpDir);
   });
 });
diff --git a/packages/ui-gemini/src/config/extensions/storage.ts b/packages/ui-gemini/src/config/extensions/storage.ts
index 69970003b..50398bf51 100644
--- a/packages/ui-gemini/src/config/extensions/storage.ts
+++ b/packages/ui-gemini/src/config/extensions/storage.ts
@@ -4,14 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import {
-  EXTENSION_SETTINGS_FILENAME,
-  EXTENSIONS_CONFIG_FILENAME,
-} from './variables.js';
-import { Storage } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { Storage } from "@airiscode/gemini-cli-core";
+import { EXTENSION_SETTINGS_FILENAME, EXTENSIONS_CONFIG_FILENAME } from "./variables.js";
 
 export class ExtensionStorage {
   private readonly extensionName: string;
@@ -21,10 +18,7 @@ export class ExtensionStorage {
   }
 
   getExtensionDir(): string {
-    return path.join(
-      ExtensionStorage.getUserExtensionsDir(),
-      this.extensionName,
-    );
+    return path.join(ExtensionStorage.getUserExtensionsDir(), this.extensionName);
   }
 
   getConfigPath(): string {
@@ -40,6 +34,6 @@ export class ExtensionStorage {
   }
 
   static async createTmpDir(): Promise<string> {
-    return fs.promises.mkdtemp(path.join(os.tmpdir(), 'gemini-extension'));
+    return fs.promises.mkdtemp(path.join(os.tmpdir(), "gemini-extension"));
   }
 }
diff --git a/packages/ui-gemini/src/config/extensions/update.test.ts b/packages/ui-gemini/src/config/extensions/update.test.ts
index ff8f1c1a2..42bac7b18 100644
--- a/packages/ui-gemini/src/config/extensions/update.test.ts
+++ b/packages/ui-gemini/src/config/extensions/update.test.ts
@@ -4,46 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import * as fs from "node:fs";
+import type { GeminiCLIExtension } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { ExtensionUpdateState, type ExtensionUpdateStatus } from "../../ui/state/extensions.js";
+import { loadInstallMetadata } from "../extension.js";
+import type { ExtensionManager } from "../extension-manager.js";
+import { copyExtension } from "../extension-manager.js";
+import { checkForExtensionUpdate } from "./github.js";
+import { ExtensionStorage } from "./storage.js";
 import {
-  updateExtension,
-  updateAllUpdatableExtensions,
   checkForAllExtensionUpdates,
-} from './update.js';
-import {
-  ExtensionUpdateState,
-  type ExtensionUpdateStatus,
-} from '../../ui/state/extensions.js';
-import { ExtensionStorage } from './storage.js';
-import { copyExtension } from '../extension-manager.js';
-import { checkForExtensionUpdate } from './github.js';
-import { loadInstallMetadata } from '../extension.js';
-import * as fs from 'node:fs';
-import type { ExtensionManager } from '../extension-manager.js';
-import type { GeminiCLIExtension } from '@airiscode/gemini-cli-core';
+  updateAllUpdatableExtensions,
+  updateExtension,
+} from "./update.js";
 
 // Mock dependencies
-vi.mock('./storage.js', () => ({
+vi.mock("./storage.js", () => ({
   ExtensionStorage: {
     createTmpDir: vi.fn(),
   },
 }));
 
-vi.mock('../extension-manager.js', () => ({
+vi.mock("../extension-manager.js", () => ({
   copyExtension: vi.fn(),
   // We don't need to mock the class implementation if we pass a mock instance
 }));
 
-vi.mock('./github.js', () => ({
+vi.mock("./github.js", () => ({
   checkForExtensionUpdate: vi.fn(),
 }));
 
-vi.mock('../extension.js', () => ({
+vi.mock("../extension.js", () => ({
   loadInstallMetadata: vi.fn(),
 }));
 
-vi.mock('node:fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:fs')>();
+vi.mock("node:fs", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:fs")>();
   return {
     ...actual,
     promises: {
@@ -53,13 +50,13 @@ vi.mock('node:fs', async (importOriginal) => {
   };
 });
 
-describe('Extension Update Logic', () => {
+describe("Extension Update Logic", () => {
   let mockExtensionManager: ExtensionManager;
   let mockDispatch: ReturnType<typeof vi.fn>;
   const mockExtension: GeminiCLIExtension = {
-    name: 'test-extension',
-    version: '1.0.0',
-    path: '/path/to/extension',
+    name: "test-extension",
+    version: "1.0.0",
+    path: "/path/to/extension",
   } as GeminiCLIExtension;
 
   beforeEach(() => {
@@ -71,15 +68,15 @@ describe('Extension Update Logic', () => {
     mockDispatch = vi.fn();
 
     // Default mock behaviors
-    vi.mocked(ExtensionStorage.createTmpDir).mockResolvedValue('/tmp/mock-dir');
+    vi.mocked(ExtensionStorage.createTmpDir).mockResolvedValue("/tmp/mock-dir");
     vi.mocked(loadInstallMetadata).mockReturnValue({
-      source: 'https://example.com/repo.git',
-      type: 'git',
+      source: "https://example.com/repo.git",
+      type: "git",
     });
   });
 
-  describe('updateExtension', () => {
-    it('should return undefined if state is already UPDATING', async () => {
+  describe("updateExtension", () => {
+    it("should return undefined if state is already UPDATING", async () => {
       const result = await updateExtension(
         mockExtension,
         mockExtensionManager,
@@ -90,10 +87,10 @@ describe('Extension Update Logic', () => {
       expect(mockDispatch).not.toHaveBeenCalled();
     });
 
-    it('should throw error and set state to ERROR if install metadata type is unknown', async () => {
+    it("should throw error and set state to ERROR if install metadata type is unknown", async () => {
       vi.mocked(loadInstallMetadata).mockReturnValue({
         type: undefined,
-      } as unknown as import('@airiscode/gemini-cli-core').ExtensionInstallMetadata);
+      } as unknown as import("@airiscode/gemini-cli-core").ExtensionInstallMetadata);
 
       await expect(
         updateExtension(
@@ -102,17 +99,17 @@ describe('Extension Update Logic', () => {
           ExtensionUpdateState.UPDATE_AVAILABLE,
           mockDispatch,
         ),
-      ).rejects.toThrow('type is unknown');
+      ).rejects.toThrow("type is unknown");
 
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.UPDATING,
         },
       });
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.ERROR,
@@ -120,10 +117,10 @@ describe('Extension Update Logic', () => {
       });
     });
 
-    it('should throw error and set state to UP_TO_DATE if extension is linked', async () => {
+    it("should throw error and set state to UP_TO_DATE if extension is linked", async () => {
       vi.mocked(loadInstallMetadata).mockReturnValue({
-        type: 'link',
-        source: '',
+        type: "link",
+        source: "",
       });
 
       await expect(
@@ -133,10 +130,10 @@ describe('Extension Update Logic', () => {
           ExtensionUpdateState.UPDATE_AVAILABLE,
           mockDispatch,
         ),
-      ).rejects.toThrow('Extension is linked');
+      ).rejects.toThrow("Extension is linked");
 
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.UP_TO_DATE,
@@ -144,16 +141,14 @@ describe('Extension Update Logic', () => {
       });
     });
 
-    it('should successfully update extension and set state to UPDATED_NEEDS_RESTART by default', async () => {
+    it("should successfully update extension and set state to UPDATED_NEEDS_RESTART by default", async () => {
       vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue({
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
       });
-      vi.mocked(
-        mockExtensionManager.installOrUpdateExtension,
-      ).mockResolvedValue({
+      vi.mocked(mockExtensionManager.installOrUpdateExtension).mockResolvedValue({
         ...mockExtension,
-        version: '1.1.0',
+        version: "1.1.0",
       });
 
       const result = await updateExtension(
@@ -165,33 +160,31 @@ describe('Extension Update Logic', () => {
 
       expect(mockExtensionManager.installOrUpdateExtension).toHaveBeenCalled();
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.UPDATED_NEEDS_RESTART,
         },
       });
       expect(result).toEqual({
-        name: 'test-extension',
-        originalVersion: '1.0.0',
-        updatedVersion: '1.1.0',
+        name: "test-extension",
+        originalVersion: "1.0.0",
+        updatedVersion: "1.1.0",
       });
-      expect(fs.promises.rm).toHaveBeenCalledWith('/tmp/mock-dir', {
+      expect(fs.promises.rm).toHaveBeenCalledWith("/tmp/mock-dir", {
         recursive: true,
         force: true,
       });
     });
 
-    it('should set state to UPDATED if enableExtensionReloading is true', async () => {
+    it("should set state to UPDATED if enableExtensionReloading is true", async () => {
       vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue({
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
       });
-      vi.mocked(
-        mockExtensionManager.installOrUpdateExtension,
-      ).mockResolvedValue({
+      vi.mocked(mockExtensionManager.installOrUpdateExtension).mockResolvedValue({
         ...mockExtension,
-        version: '1.1.0',
+        version: "1.1.0",
       });
 
       await updateExtension(
@@ -203,7 +196,7 @@ describe('Extension Update Logic', () => {
       );
 
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.UPDATED,
@@ -211,14 +204,14 @@ describe('Extension Update Logic', () => {
       });
     });
 
-    it('should rollback and set state to ERROR if installation fails', async () => {
+    it("should rollback and set state to ERROR if installation fails", async () => {
       vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue({
-        name: 'test-extension',
-        version: '1.0.0',
+        name: "test-extension",
+        version: "1.0.0",
       });
-      vi.mocked(
-        mockExtensionManager.installOrUpdateExtension,
-      ).mockRejectedValue(new Error('Install failed'));
+      vi.mocked(mockExtensionManager.installOrUpdateExtension).mockRejectedValue(
+        new Error("Install failed"),
+      );
 
       await expect(
         updateExtension(
@@ -227,14 +220,11 @@ describe('Extension Update Logic', () => {
           ExtensionUpdateState.UPDATE_AVAILABLE,
           mockDispatch,
         ),
-      ).rejects.toThrow('Updated extension not found after installation');
+      ).rejects.toThrow("Updated extension not found after installation");
 
-      expect(copyExtension).toHaveBeenCalledWith(
-        '/tmp/mock-dir',
-        mockExtension.path,
-      );
+      expect(copyExtension).toHaveBeenCalledWith("/tmp/mock-dir", mockExtension.path);
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.ERROR,
@@ -244,26 +234,27 @@ describe('Extension Update Logic', () => {
     });
   });
 
-  describe('updateAllUpdatableExtensions', () => {
-    it('should update all extensions with UPDATE_AVAILABLE status', async () => {
+  describe("updateAllUpdatableExtensions", () => {
+    it("should update all extensions with UPDATE_AVAILABLE status", async () => {
       const extensions: GeminiCLIExtension[] = [
-        { ...mockExtension, name: 'ext1' },
-        { ...mockExtension, name: 'ext2' },
-        { ...mockExtension, name: 'ext3' },
+        { ...mockExtension, name: "ext1" },
+        { ...mockExtension, name: "ext2" },
+        { ...mockExtension, name: "ext3" },
       ];
       const extensionsState = new Map([
-        ['ext1', { status: ExtensionUpdateState.UPDATE_AVAILABLE }],
-        ['ext2', { status: ExtensionUpdateState.UP_TO_DATE }],
-        ['ext3', { status: ExtensionUpdateState.UPDATE_AVAILABLE }],
+        ["ext1", { status: ExtensionUpdateState.UPDATE_AVAILABLE }],
+        ["ext2", { status: ExtensionUpdateState.UP_TO_DATE }],
+        ["ext3", { status: ExtensionUpdateState.UPDATE_AVAILABLE }],
       ]);
 
       vi.mocked(mockExtensionManager.loadExtensionConfig).mockReturnValue({
-        name: 'ext',
-        version: '1.0.0',
+        name: "ext",
+        version: "1.0.0",
+      });
+      vi.mocked(mockExtensionManager.installOrUpdateExtension).mockResolvedValue({
+        ...mockExtension,
+        version: "1.1.0",
       });
-      vi.mocked(
-        mockExtensionManager.installOrUpdateExtension,
-      ).mockResolvedValue({ ...mockExtension, version: '1.1.0' });
 
       const results = await updateAllUpdatableExtensions(
         extensions,
@@ -273,34 +264,26 @@ describe('Extension Update Logic', () => {
       );
 
       expect(results).toHaveLength(2);
-      expect(results.map((r) => r.name)).toEqual(['ext1', 'ext3']);
-      expect(
-        mockExtensionManager.installOrUpdateExtension,
-      ).toHaveBeenCalledTimes(2);
+      expect(results.map((r) => r.name)).toEqual(["ext1", "ext3"]);
+      expect(mockExtensionManager.installOrUpdateExtension).toHaveBeenCalledTimes(2);
     });
   });
 
-  describe('checkForAllExtensionUpdates', () => {
-    it('should dispatch BATCH_CHECK_START and BATCH_CHECK_END', async () => {
+  describe("checkForAllExtensionUpdates", () => {
+    it("should dispatch BATCH_CHECK_START and BATCH_CHECK_END", async () => {
       await checkForAllExtensionUpdates([], mockExtensionManager, mockDispatch);
 
-      expect(mockDispatch).toHaveBeenCalledWith({ type: 'BATCH_CHECK_START' });
-      expect(mockDispatch).toHaveBeenCalledWith({ type: 'BATCH_CHECK_END' });
+      expect(mockDispatch).toHaveBeenCalledWith({ type: "BATCH_CHECK_START" });
+      expect(mockDispatch).toHaveBeenCalledWith({ type: "BATCH_CHECK_END" });
     });
 
-    it('should set state to NOT_UPDATABLE if no install metadata', async () => {
-      const extensions: GeminiCLIExtension[] = [
-        { ...mockExtension, installMetadata: undefined },
-      ];
+    it("should set state to NOT_UPDATABLE if no install metadata", async () => {
+      const extensions: GeminiCLIExtension[] = [{ ...mockExtension, installMetadata: undefined }];
 
-      await checkForAllExtensionUpdates(
-        extensions,
-        mockExtensionManager,
-        mockDispatch,
-      );
+      await checkForAllExtensionUpdates(extensions, mockExtensionManager, mockDispatch);
 
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.NOT_UPDATABLE,
@@ -308,29 +291,23 @@ describe('Extension Update Logic', () => {
       });
     });
 
-    it('should check for updates and update state', async () => {
+    it("should check for updates and update state", async () => {
       const extensions: GeminiCLIExtension[] = [
-        { ...mockExtension, installMetadata: { type: 'git', source: '...' } },
+        { ...mockExtension, installMetadata: { type: "git", source: "..." } },
       ];
-      vi.mocked(checkForExtensionUpdate).mockResolvedValue(
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-      );
+      vi.mocked(checkForExtensionUpdate).mockResolvedValue(ExtensionUpdateState.UPDATE_AVAILABLE);
 
-      await checkForAllExtensionUpdates(
-        extensions,
-        mockExtensionManager,
-        mockDispatch,
-      );
+      await checkForAllExtensionUpdates(extensions, mockExtensionManager, mockDispatch);
 
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.CHECKING_FOR_UPDATES,
         },
       });
       expect(mockDispatch).toHaveBeenCalledWith({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: mockExtension.name,
           state: ExtensionUpdateState.UPDATE_AVAILABLE,
diff --git a/packages/ui-gemini/src/config/extensions/update.ts b/packages/ui-gemini/src/config/extensions/update.ts
index 7545cd1c2..aa4673f25 100644
--- a/packages/ui-gemini/src/config/extensions/update.ts
+++ b/packages/ui-gemini/src/config/extensions/update.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs";
+import { debugLogger, type GeminiCLIExtension } from "@airiscode/gemini-cli-core";
 import {
   type ExtensionUpdateAction,
   ExtensionUpdateState,
   type ExtensionUpdateStatus,
-} from '../../ui/state/extensions.js';
-import { loadInstallMetadata } from '../extension.js';
-import { checkForExtensionUpdate } from './github.js';
-import { debugLogger, type GeminiCLIExtension } from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs';
-import { getErrorMessage } from '../../utils/errors.js';
-import { copyExtension, type ExtensionManager } from '../extension-manager.js';
-import { ExtensionStorage } from './storage.js';
+} from "../../ui/state/extensions.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { loadInstallMetadata } from "../extension.js";
+import { copyExtension, type ExtensionManager } from "../extension-manager.js";
+import { checkForExtensionUpdate } from "./github.js";
+import { ExtensionStorage } from "./storage.js";
 
 export interface ExtensionUpdateInfo {
   name: string;
@@ -34,23 +34,21 @@ export async function updateExtension(
     return undefined;
   }
   dispatchExtensionStateUpdate({
-    type: 'SET_STATE',
+    type: "SET_STATE",
     payload: { name: extension.name, state: ExtensionUpdateState.UPDATING },
   });
   const installMetadata = loadInstallMetadata(extension.path);
 
   if (!installMetadata?.type) {
     dispatchExtensionStateUpdate({
-      type: 'SET_STATE',
+      type: "SET_STATE",
       payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
     });
-    throw new Error(
-      `Extension ${extension.name} cannot be updated, type is unknown.`,
-    );
+    throw new Error(`Extension ${extension.name} cannot be updated, type is unknown.`);
   }
-  if (installMetadata?.type === 'link') {
+  if (installMetadata?.type === "link") {
     dispatchExtensionStateUpdate({
-      type: 'SET_STATE',
+      type: "SET_STATE",
       payload: { name: extension.name, state: ExtensionUpdateState.UP_TO_DATE },
     });
     throw new Error(`Extension is linked so does not need to be updated`);
@@ -59,9 +57,7 @@ export async function updateExtension(
 
   const tempDir = await ExtensionStorage.createTmpDir();
   try {
-    const previousExtensionConfig = extensionManager.loadExtensionConfig(
-      extension.path,
-    );
+    const previousExtensionConfig = extensionManager.loadExtensionConfig(extension.path);
     let updatedExtension: GeminiCLIExtension;
     try {
       updatedExtension = await extensionManager.installOrUpdateExtension(
@@ -70,16 +66,14 @@ export async function updateExtension(
       );
     } catch (e) {
       dispatchExtensionStateUpdate({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
       });
-      throw new Error(
-        `Updated extension not found after installation, got error:\n${e}`,
-      );
+      throw new Error(`Updated extension not found after installation, got error:\n${e}`);
     }
     const updatedVersion = updatedExtension.version;
     dispatchExtensionStateUpdate({
-      type: 'SET_STATE',
+      type: "SET_STATE",
       payload: {
         name: extension.name,
         state: enableExtensionReloading
@@ -93,11 +87,9 @@ export async function updateExtension(
       updatedVersion,
     };
   } catch (e) {
-    debugLogger.error(
-      `Error updating extension, rolling back. ${getErrorMessage(e)}`,
-    );
+    debugLogger.error(`Error updating extension, rolling back. ${getErrorMessage(e)}`);
     dispatchExtensionStateUpdate({
-      type: 'SET_STATE',
+      type: "SET_STATE",
       payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
     });
     await copyExtension(tempDir, extension.path);
@@ -119,8 +111,7 @@ export async function updateAllUpdatableExtensions(
       extensions
         .filter(
           (extension) =>
-            extensionsState.get(extension.name)?.status ===
-            ExtensionUpdateState.UPDATE_AVAILABLE,
+            extensionsState.get(extension.name)?.status === ExtensionUpdateState.UPDATE_AVAILABLE,
         )
         .map((extension) =>
           updateExtension(
@@ -145,13 +136,13 @@ export async function checkForAllExtensionUpdates(
   extensionManager: ExtensionManager,
   dispatch: (action: ExtensionUpdateAction) => void,
 ): Promise<void> {
-  dispatch({ type: 'BATCH_CHECK_START' });
+  dispatch({ type: "BATCH_CHECK_START" });
   try {
     const promises: Array<Promise<void>> = [];
     for (const extension of extensions) {
       if (!extension.installMetadata) {
         dispatch({
-          type: 'SET_STATE',
+          type: "SET_STATE",
           payload: {
             name: extension.name,
             state: ExtensionUpdateState.NOT_UPDATABLE,
@@ -160,7 +151,7 @@ export async function checkForAllExtensionUpdates(
         continue;
       }
       dispatch({
-        type: 'SET_STATE',
+        type: "SET_STATE",
         payload: {
           name: extension.name,
           state: ExtensionUpdateState.CHECKING_FOR_UPDATES,
@@ -169,7 +160,7 @@ export async function checkForAllExtensionUpdates(
       promises.push(
         checkForExtensionUpdate(extension, extensionManager).then((state) =>
           dispatch({
-            type: 'SET_STATE',
+            type: "SET_STATE",
             payload: { name: extension.name, state },
           }),
         ),
@@ -177,6 +168,6 @@ export async function checkForAllExtensionUpdates(
     }
     await Promise.all(promises);
   } finally {
-    dispatch({ type: 'BATCH_CHECK_END' });
+    dispatch({ type: "BATCH_CHECK_END" });
   }
 }
diff --git a/packages/ui-gemini/src/config/extensions/variableSchema.ts b/packages/ui-gemini/src/config/extensions/variableSchema.ts
index 0b8abc502..f1eca7a3a 100644
--- a/packages/ui-gemini/src/config/extensions/variableSchema.ts
+++ b/packages/ui-gemini/src/config/extensions/variableSchema.ts
@@ -5,7 +5,7 @@
  */
 
 export interface VariableDefinition {
-  type: 'string';
+  type: "string";
   description: string;
   default?: string;
   required?: boolean;
@@ -16,19 +16,19 @@ export interface VariableSchema {
 }
 
 const PATH_SEPARATOR_DEFINITION = {
-  type: 'string',
-  description: 'The path separator.',
+  type: "string",
+  description: "The path separator.",
 } as const;
 
 export const VARIABLE_SCHEMA = {
   extensionPath: {
-    type: 'string',
-    description: 'The path of the extension in the filesystem.',
+    type: "string",
+    description: "The path of the extension in the filesystem.",
   },
   workspacePath: {
-    type: 'string',
-    description: 'The absolute path of the current workspace.',
+    type: "string",
+    description: "The absolute path of the current workspace.",
   },
-  '/': PATH_SEPARATOR_DEFINITION,
+  "/": PATH_SEPARATOR_DEFINITION,
   pathSeparator: PATH_SEPARATOR_DEFINITION,
 } as const;
diff --git a/packages/ui-gemini/src/config/extensions/variables.test.ts b/packages/ui-gemini/src/config/extensions/variables.test.ts
index 576546ef0..bb43c91e0 100644
--- a/packages/ui-gemini/src/config/extensions/variables.test.ts
+++ b/packages/ui-gemini/src/config/extensions/variables.test.ts
@@ -4,118 +4,112 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { expect, describe, it } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
   hydrateString,
   recursivelyHydrateStrings,
-  validateVariables,
   type VariableContext,
-} from './variables.js';
+  validateVariables,
+} from "./variables.js";
 
-describe('validateVariables', () => {
-  it('should not throw if all required variables are present', () => {
+describe("validateVariables", () => {
+  it("should not throw if all required variables are present", () => {
     const schema = {
-      extensionPath: { type: 'string', description: 'test', required: true },
+      extensionPath: { type: "string", description: "test", required: true },
     } as const;
-    const context = { extensionPath: 'value' };
+    const context = { extensionPath: "value" };
     expect(() => validateVariables(context, schema)).not.toThrow();
   });
 
-  it('should throw if a required variable is missing', () => {
+  it("should throw if a required variable is missing", () => {
     const schema = {
-      extensionPath: { type: 'string', description: 'test', required: true },
+      extensionPath: { type: "string", description: "test", required: true },
     } as const;
     const context = {};
     expect(() => validateVariables(context, schema)).toThrow(
-      'Missing required variable: extensionPath',
+      "Missing required variable: extensionPath",
     );
   });
 });
 
-describe('hydrateString', () => {
-  it('should replace a single variable', () => {
+describe("hydrateString", () => {
+  it("should replace a single variable", () => {
     const context = {
-      extensionPath: 'path/my-extension',
+      extensionPath: "path/my-extension",
     };
-    const result = hydrateString('Hello, ${extensionPath}!', context);
-    expect(result).toBe('Hello, path/my-extension!');
+    const result = hydrateString("Hello, ${extensionPath}!", context);
+    expect(result).toBe("Hello, path/my-extension!");
   });
 
-  it('should replace multiple variables', () => {
+  it("should replace multiple variables", () => {
     const context = {
-      extensionPath: 'path/my-extension',
-      workspacePath: '/ws',
+      extensionPath: "path/my-extension",
+      workspacePath: "/ws",
     };
-    const result = hydrateString(
-      'Ext: ${extensionPath}, WS: ${workspacePath}',
-      context,
-    );
-    expect(result).toBe('Ext: path/my-extension, WS: /ws');
+    const result = hydrateString("Ext: ${extensionPath}, WS: ${workspacePath}", context);
+    expect(result).toBe("Ext: path/my-extension, WS: /ws");
   });
 
-  it('should ignore unknown variables', () => {
+  it("should ignore unknown variables", () => {
     const context = {
-      extensionPath: 'path/my-extension',
+      extensionPath: "path/my-extension",
     };
-    const result = hydrateString('Hello, ${unknown}!', context);
-    expect(result).toBe('Hello, ${unknown}!');
+    const result = hydrateString("Hello, ${unknown}!", context);
+    expect(result).toBe("Hello, ${unknown}!");
   });
 
-  it('should handle null and undefined context values', () => {
+  it("should handle null and undefined context values", () => {
     const context: VariableContext = {
       extensionPath: undefined,
     };
-    const result = hydrateString(
-      'Ext: ${extensionPath}, WS: ${workspacePath}',
-      context,
-    );
-    expect(result).toBe('Ext: ${extensionPath}, WS: ${workspacePath}');
+    const result = hydrateString("Ext: ${extensionPath}, WS: ${workspacePath}", context);
+    expect(result).toBe("Ext: ${extensionPath}, WS: ${workspacePath}");
   });
 });
 
-describe('recursivelyHydrateStrings', () => {
+describe("recursivelyHydrateStrings", () => {
   const context = {
-    extensionPath: 'path/my-extension',
-    workspacePath: '/ws',
+    extensionPath: "path/my-extension",
+    workspacePath: "/ws",
   };
 
-  it('should hydrate strings in a flat object', () => {
+  it("should hydrate strings in a flat object", () => {
     const obj = {
-      a: 'Hello, ${workspacePath}',
-      b: 'Hi, ${extensionPath}',
+      a: "Hello, ${workspacePath}",
+      b: "Hi, ${extensionPath}",
     };
     const result = recursivelyHydrateStrings(obj, context);
     expect(result).toEqual({
-      a: 'Hello, /ws',
-      b: 'Hi, path/my-extension',
+      a: "Hello, /ws",
+      b: "Hi, path/my-extension",
     });
   });
 
-  it('should hydrate strings in an array', () => {
-    const arr = ['${workspacePath}', '${extensionPath}'];
+  it("should hydrate strings in an array", () => {
+    const arr = ["${workspacePath}", "${extensionPath}"];
     const result = recursivelyHydrateStrings(arr, context);
-    expect(result).toEqual(['/ws', 'path/my-extension']);
+    expect(result).toEqual(["/ws", "path/my-extension"]);
   });
 
-  it('should hydrate strings in a nested object', () => {
+  it("should hydrate strings in a nested object", () => {
     const obj = {
-      a: 'Hello, ${workspacePath}',
+      a: "Hello, ${workspacePath}",
       b: {
-        c: 'Hi, ${extensionPath}',
-        d: ['${workspacePath}/foo'],
+        c: "Hi, ${extensionPath}",
+        d: ["${workspacePath}/foo"],
       },
     };
     const result = recursivelyHydrateStrings(obj, context);
     expect(result).toEqual({
-      a: 'Hello, /ws',
+      a: "Hello, /ws",
       b: {
-        c: 'Hi, path/my-extension',
-        d: ['/ws/foo'],
+        c: "Hi, path/my-extension",
+        d: ["/ws/foo"],
       },
     });
   });
 
-  it('should not modify non-string values', () => {
+  it("should not modify non-string values", () => {
     const obj = {
       a: 123,
       b: true,
diff --git a/packages/ui-gemini/src/config/extensions/variables.ts b/packages/ui-gemini/src/config/extensions/variables.ts
index ddc689671..95a41ed03 100644
--- a/packages/ui-gemini/src/config/extensions/variables.ts
+++ b/packages/ui-gemini/src/config/extensions/variables.ts
@@ -4,33 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as path from 'node:path';
-import { type VariableSchema, VARIABLE_SCHEMA } from './variableSchema.js';
-import { GEMINI_DIR } from '@airiscode/gemini-cli-core';
+import * as path from "node:path";
+import { GEMINI_DIR } from "@airiscode/gemini-cli-core";
+import { VARIABLE_SCHEMA, type VariableSchema } from "./variableSchema.js";
 
-export const EXTENSIONS_DIRECTORY_NAME = path.join(GEMINI_DIR, 'extensions');
-export const EXTENSIONS_CONFIG_FILENAME = 'gemini-extension.json';
-export const INSTALL_METADATA_FILENAME = '.gemini-extension-install.json';
-export const EXTENSION_SETTINGS_FILENAME = '.env';
+export const EXTENSIONS_DIRECTORY_NAME = path.join(GEMINI_DIR, "extensions");
+export const EXTENSIONS_CONFIG_FILENAME = "gemini-extension.json";
+export const INSTALL_METADATA_FILENAME = ".gemini-extension-install.json";
+export const EXTENSION_SETTINGS_FILENAME = ".env";
 
 export type JsonObject = { [key: string]: JsonValue };
 export type JsonArray = JsonValue[];
-export type JsonValue =
-  | string
-  | number
-  | boolean
-  | null
-  | JsonObject
-  | JsonArray;
+export type JsonValue = string | number | boolean | null | JsonObject | JsonArray;
 
 export type VariableContext = {
   [key in keyof typeof VARIABLE_SCHEMA]?: string;
 };
 
-export function validateVariables(
-  variables: VariableContext,
-  schema: VariableSchema,
-) {
+export function validateVariables(variables: VariableContext, schema: VariableSchema) {
   for (const key in schema) {
     const definition = schema[key];
     if (definition.required && !variables[key as keyof VariableContext]) {
@@ -49,20 +40,17 @@ export function hydrateString(str: string, context: VariableContext): string {
   );
 }
 
-export function recursivelyHydrateStrings(
-  obj: JsonValue,
-  values: VariableContext,
-): JsonValue {
-  if (typeof obj === 'string') {
+export function recursivelyHydrateStrings(obj: JsonValue, values: VariableContext): JsonValue {
+  if (typeof obj === "string") {
     return hydrateString(obj, values);
   }
   if (Array.isArray(obj)) {
     return obj.map((item) => recursivelyHydrateStrings(item, values));
   }
-  if (typeof obj === 'object' && obj !== null) {
+  if (typeof obj === "object" && obj !== null) {
     const newObj: JsonObject = {};
     for (const key in obj) {
-      if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      if (Object.hasOwn(obj, key)) {
         newObj[key] = recursivelyHydrateStrings(obj[key], values);
       }
     }
diff --git a/packages/ui-gemini/src/config/keyBindings.test.ts b/packages/ui-gemini/src/config/keyBindings.test.ts
index 2a4debd48..783705783 100644
--- a/packages/ui-gemini/src/config/keyBindings.test.ts
+++ b/packages/ui-gemini/src/config/keyBindings.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import type { KeyBindingConfig } from './keyBindings.js';
+import { describe, expect, it } from "vitest";
+import type { KeyBindingConfig } from "./keyBindings.js";
 import {
   Command,
   commandCategories,
   commandDescriptions,
   defaultKeyBindings,
-} from './keyBindings.js';
+} from "./keyBindings.js";
 
-describe('keyBindings config', () => {
-  describe('defaultKeyBindings', () => {
-    it('should have bindings for all commands', () => {
+describe("keyBindings config", () => {
+  describe("defaultKeyBindings", () => {
+    it("should have bindings for all commands", () => {
       const commands = Object.values(Command);
 
       for (const command of commands) {
@@ -25,7 +25,7 @@ describe('keyBindings config', () => {
       }
     });
 
-    it('should have valid key binding structures', () => {
+    it("should have valid key binding structures", () => {
       for (const [_, bindings] of Object.entries(defaultKeyBindings)) {
         for (const binding of bindings) {
           // Each binding should have either key or sequence, but not both
@@ -37,72 +37,72 @@ describe('keyBindings config', () => {
 
           // Modifier properties should be boolean or undefined
           if (binding.ctrl !== undefined) {
-            expect(typeof binding.ctrl).toBe('boolean');
+            expect(typeof binding.ctrl).toBe("boolean");
           }
           if (binding.shift !== undefined) {
-            expect(typeof binding.shift).toBe('boolean');
+            expect(typeof binding.shift).toBe("boolean");
           }
           if (binding.command !== undefined) {
-            expect(typeof binding.command).toBe('boolean');
+            expect(typeof binding.command).toBe("boolean");
           }
           if (binding.paste !== undefined) {
-            expect(typeof binding.paste).toBe('boolean');
+            expect(typeof binding.paste).toBe("boolean");
           }
         }
       }
     });
 
-    it('should export all required types', () => {
+    it("should export all required types", () => {
       // Basic type checks
-      expect(typeof Command.HOME).toBe('string');
-      expect(typeof Command.END).toBe('string');
+      expect(typeof Command.HOME).toBe("string");
+      expect(typeof Command.END).toBe("string");
 
       // Config should be readonly
       const config: KeyBindingConfig = defaultKeyBindings;
       expect(config[Command.HOME]).toBeDefined();
     });
 
-    it('should have correct specific bindings', () => {
+    it("should have correct specific bindings", () => {
       // Verify navigation ignores shift
       const navUp = defaultKeyBindings[Command.NAVIGATION_UP];
-      expect(navUp).toContainEqual({ key: 'up', shift: false });
+      expect(navUp).toContainEqual({ key: "up", shift: false });
 
       const navDown = defaultKeyBindings[Command.NAVIGATION_DOWN];
-      expect(navDown).toContainEqual({ key: 'down', shift: false });
+      expect(navDown).toContainEqual({ key: "down", shift: false });
 
       // Verify dialog navigation
       const dialogNavUp = defaultKeyBindings[Command.DIALOG_NAVIGATION_UP];
-      expect(dialogNavUp).toContainEqual({ key: 'up', shift: false });
-      expect(dialogNavUp).toContainEqual({ key: 'k', shift: false });
+      expect(dialogNavUp).toContainEqual({ key: "up", shift: false });
+      expect(dialogNavUp).toContainEqual({ key: "k", shift: false });
 
       const dialogNavDown = defaultKeyBindings[Command.DIALOG_NAVIGATION_DOWN];
-      expect(dialogNavDown).toContainEqual({ key: 'down', shift: false });
-      expect(dialogNavDown).toContainEqual({ key: 'j', shift: false });
+      expect(dialogNavDown).toContainEqual({ key: "down", shift: false });
+      expect(dialogNavDown).toContainEqual({ key: "j", shift: false });
 
       // Verify physical home/end keys
-      expect(defaultKeyBindings[Command.HOME]).toContainEqual({ key: 'home' });
-      expect(defaultKeyBindings[Command.END]).toContainEqual({ key: 'end' });
+      expect(defaultKeyBindings[Command.HOME]).toContainEqual({ key: "home" });
+      expect(defaultKeyBindings[Command.END]).toContainEqual({ key: "end" });
     });
   });
 
-  describe('command metadata', () => {
+  describe("command metadata", () => {
     const commandValues = Object.values(Command);
 
-    it('has a description entry for every command', () => {
+    it("has a description entry for every command", () => {
       const describedCommands = Object.keys(commandDescriptions);
       expect(describedCommands.sort()).toEqual([...commandValues].sort());
 
       for (const command of commandValues) {
-        expect(typeof commandDescriptions[command]).toBe('string');
+        expect(typeof commandDescriptions[command]).toBe("string");
         expect(commandDescriptions[command]?.trim()).not.toHaveLength(0);
       }
     });
 
-    it('categorizes each command exactly once', () => {
+    it("categorizes each command exactly once", () => {
       const seen = new Set<Command>();
 
       for (const category of commandCategories) {
-        expect(typeof category.title).toBe('string');
+        expect(typeof category.title).toBe("string");
         expect(Array.isArray(category.commands)).toBe(true);
 
         for (const command of category.commands) {
diff --git a/packages/ui-gemini/src/config/keyBindings.ts b/packages/ui-gemini/src/config/keyBindings.ts
index 497b359f2..8b8d0a5c4 100644
--- a/packages/ui-gemini/src/config/keyBindings.ts
+++ b/packages/ui-gemini/src/config/keyBindings.ts
@@ -9,72 +9,72 @@
  */
 export enum Command {
   // Basic bindings
-  RETURN = 'return',
-  ESCAPE = 'escape',
+  RETURN = "return",
+  ESCAPE = "escape",
 
   // Cursor movement
-  HOME = 'home',
-  END = 'end',
+  HOME = "home",
+  END = "end",
 
   // Text deletion
-  KILL_LINE_RIGHT = 'killLineRight',
-  KILL_LINE_LEFT = 'killLineLeft',
-  CLEAR_INPUT = 'clearInput',
-  DELETE_WORD_BACKWARD = 'deleteWordBackward',
+  KILL_LINE_RIGHT = "killLineRight",
+  KILL_LINE_LEFT = "killLineLeft",
+  CLEAR_INPUT = "clearInput",
+  DELETE_WORD_BACKWARD = "deleteWordBackward",
 
   // Screen control
-  CLEAR_SCREEN = 'clearScreen',
+  CLEAR_SCREEN = "clearScreen",
 
   // Scrolling
-  SCROLL_UP = 'scrollUp',
-  SCROLL_DOWN = 'scrollDown',
-  SCROLL_HOME = 'scrollHome',
-  SCROLL_END = 'scrollEnd',
-  PAGE_UP = 'pageUp',
-  PAGE_DOWN = 'pageDown',
+  SCROLL_UP = "scrollUp",
+  SCROLL_DOWN = "scrollDown",
+  SCROLL_HOME = "scrollHome",
+  SCROLL_END = "scrollEnd",
+  PAGE_UP = "pageUp",
+  PAGE_DOWN = "pageDown",
 
   // History navigation
-  HISTORY_UP = 'historyUp',
-  HISTORY_DOWN = 'historyDown',
-  NAVIGATION_UP = 'navigationUp',
-  NAVIGATION_DOWN = 'navigationDown',
+  HISTORY_UP = "historyUp",
+  HISTORY_DOWN = "historyDown",
+  NAVIGATION_UP = "navigationUp",
+  NAVIGATION_DOWN = "navigationDown",
 
   // Dialog navigation
-  DIALOG_NAVIGATION_UP = 'dialogNavigationUp',
-  DIALOG_NAVIGATION_DOWN = 'dialogNavigationDown',
+  DIALOG_NAVIGATION_UP = "dialogNavigationUp",
+  DIALOG_NAVIGATION_DOWN = "dialogNavigationDown",
 
   // Auto-completion
-  ACCEPT_SUGGESTION = 'acceptSuggestion',
-  COMPLETION_UP = 'completionUp',
-  COMPLETION_DOWN = 'completionDown',
+  ACCEPT_SUGGESTION = "acceptSuggestion",
+  COMPLETION_UP = "completionUp",
+  COMPLETION_DOWN = "completionDown",
 
   // Text input
-  SUBMIT = 'submit',
-  NEWLINE = 'newline',
+  SUBMIT = "submit",
+  NEWLINE = "newline",
 
   // External tools
-  OPEN_EXTERNAL_EDITOR = 'openExternalEditor',
-  PASTE_CLIPBOARD = 'pasteClipboard',
+  OPEN_EXTERNAL_EDITOR = "openExternalEditor",
+  PASTE_CLIPBOARD = "pasteClipboard",
 
   // App level bindings
-  SHOW_ERROR_DETAILS = 'showErrorDetails',
-  SHOW_FULL_TODOS = 'showFullTodos',
-  TOGGLE_IDE_CONTEXT_DETAIL = 'toggleIDEContextDetail',
-  TOGGLE_MARKDOWN = 'toggleMarkdown',
-  TOGGLE_COPY_MODE = 'toggleCopyMode',
-  QUIT = 'quit',
-  EXIT = 'exit',
-  SHOW_MORE_LINES = 'showMoreLines',
+  SHOW_ERROR_DETAILS = "showErrorDetails",
+  SHOW_FULL_TODOS = "showFullTodos",
+  TOGGLE_IDE_CONTEXT_DETAIL = "toggleIDEContextDetail",
+  TOGGLE_MARKDOWN = "toggleMarkdown",
+  TOGGLE_COPY_MODE = "toggleCopyMode",
+  QUIT = "quit",
+  EXIT = "exit",
+  SHOW_MORE_LINES = "showMoreLines",
 
   // Shell commands
-  REVERSE_SEARCH = 'reverseSearch',
-  SUBMIT_REVERSE_SEARCH = 'submitReverseSearch',
-  ACCEPT_SUGGESTION_REVERSE_SEARCH = 'acceptSuggestionReverseSearch',
-  TOGGLE_SHELL_INPUT_FOCUS = 'toggleShellInputFocus',
+  REVERSE_SEARCH = "reverseSearch",
+  SUBMIT_REVERSE_SEARCH = "submitReverseSearch",
+  ACCEPT_SUGGESTION_REVERSE_SEARCH = "acceptSuggestionReverseSearch",
+  TOGGLE_SHELL_INPUT_FOCUS = "toggleShellInputFocus",
 
   // Suggestion expansion
-  EXPAND_SUGGESTION = 'expandSuggestion',
-  COLLAPSE_SUGGESTION = 'collapseSuggestion',
+  EXPAND_SUGGESTION = "expandSuggestion",
+  COLLAPSE_SUGGESTION = "collapseSuggestion",
 }
 
 /**
@@ -108,69 +108,69 @@ export type KeyBindingConfig = {
  */
 export const defaultKeyBindings: KeyBindingConfig = {
   // Basic bindings
-  [Command.RETURN]: [{ key: 'return' }],
-  [Command.ESCAPE]: [{ key: 'escape' }],
+  [Command.RETURN]: [{ key: "return" }],
+  [Command.ESCAPE]: [{ key: "escape" }],
 
   // Cursor movement
-  [Command.HOME]: [{ key: 'a', ctrl: true }, { key: 'home' }],
-  [Command.END]: [{ key: 'e', ctrl: true }, { key: 'end' }],
+  [Command.HOME]: [{ key: "a", ctrl: true }, { key: "home" }],
+  [Command.END]: [{ key: "e", ctrl: true }, { key: "end" }],
 
   // Text deletion
-  [Command.KILL_LINE_RIGHT]: [{ key: 'k', ctrl: true }],
-  [Command.KILL_LINE_LEFT]: [{ key: 'u', ctrl: true }],
-  [Command.CLEAR_INPUT]: [{ key: 'c', ctrl: true }],
+  [Command.KILL_LINE_RIGHT]: [{ key: "k", ctrl: true }],
+  [Command.KILL_LINE_LEFT]: [{ key: "u", ctrl: true }],
+  [Command.CLEAR_INPUT]: [{ key: "c", ctrl: true }],
   // Added command (meta/alt/option) for mac compatibility
   [Command.DELETE_WORD_BACKWARD]: [
-    { key: 'backspace', ctrl: true },
-    { key: 'backspace', command: true },
+    { key: "backspace", ctrl: true },
+    { key: "backspace", command: true },
   ],
 
   // Screen control
-  [Command.CLEAR_SCREEN]: [{ key: 'l', ctrl: true }],
+  [Command.CLEAR_SCREEN]: [{ key: "l", ctrl: true }],
 
   // Scrolling
-  [Command.SCROLL_UP]: [{ key: 'up', shift: true }],
-  [Command.SCROLL_DOWN]: [{ key: 'down', shift: true }],
-  [Command.SCROLL_HOME]: [{ key: 'home' }],
-  [Command.SCROLL_END]: [{ key: 'end' }],
-  [Command.PAGE_UP]: [{ key: 'pageup' }],
-  [Command.PAGE_DOWN]: [{ key: 'pagedown' }],
+  [Command.SCROLL_UP]: [{ key: "up", shift: true }],
+  [Command.SCROLL_DOWN]: [{ key: "down", shift: true }],
+  [Command.SCROLL_HOME]: [{ key: "home" }],
+  [Command.SCROLL_END]: [{ key: "end" }],
+  [Command.PAGE_UP]: [{ key: "pageup" }],
+  [Command.PAGE_DOWN]: [{ key: "pagedown" }],
 
   // History navigation
-  [Command.HISTORY_UP]: [{ key: 'p', ctrl: true, shift: false }],
-  [Command.HISTORY_DOWN]: [{ key: 'n', ctrl: true, shift: false }],
-  [Command.NAVIGATION_UP]: [{ key: 'up', shift: false }],
-  [Command.NAVIGATION_DOWN]: [{ key: 'down', shift: false }],
+  [Command.HISTORY_UP]: [{ key: "p", ctrl: true, shift: false }],
+  [Command.HISTORY_DOWN]: [{ key: "n", ctrl: true, shift: false }],
+  [Command.NAVIGATION_UP]: [{ key: "up", shift: false }],
+  [Command.NAVIGATION_DOWN]: [{ key: "down", shift: false }],
 
   // Dialog navigation
   // Navigation shortcuts appropriate for dialogs where we do not need to accept
   // text input.
   [Command.DIALOG_NAVIGATION_UP]: [
-    { key: 'up', shift: false },
-    { key: 'k', shift: false },
+    { key: "up", shift: false },
+    { key: "k", shift: false },
   ],
   [Command.DIALOG_NAVIGATION_DOWN]: [
-    { key: 'down', shift: false },
-    { key: 'j', shift: false },
+    { key: "down", shift: false },
+    { key: "j", shift: false },
   ],
 
   // Auto-completion
-  [Command.ACCEPT_SUGGESTION]: [{ key: 'tab' }, { key: 'return', ctrl: false }],
+  [Command.ACCEPT_SUGGESTION]: [{ key: "tab" }, { key: "return", ctrl: false }],
   // Completion navigation (arrow or Ctrl+P/N)
   [Command.COMPLETION_UP]: [
-    { key: 'up', shift: false },
-    { key: 'p', ctrl: true, shift: false },
+    { key: "up", shift: false },
+    { key: "p", ctrl: true, shift: false },
   ],
   [Command.COMPLETION_DOWN]: [
-    { key: 'down', shift: false },
-    { key: 'n', ctrl: true, shift: false },
+    { key: "down", shift: false },
+    { key: "n", ctrl: true, shift: false },
   ],
 
   // Text input
   // Must also exclude shift to allow shift+enter for newline
   [Command.SUBMIT]: [
     {
-      key: 'return',
+      key: "return",
       ctrl: false,
       command: false,
       paste: false,
@@ -180,40 +180,40 @@ export const defaultKeyBindings: KeyBindingConfig = {
   // Split into multiple data-driven bindings
   // Now also includes shift+enter for multi-line input
   [Command.NEWLINE]: [
-    { key: 'return', ctrl: true },
-    { key: 'return', command: true },
-    { key: 'return', paste: true },
-    { key: 'return', shift: true },
-    { key: 'j', ctrl: true },
+    { key: "return", ctrl: true },
+    { key: "return", command: true },
+    { key: "return", paste: true },
+    { key: "return", shift: true },
+    { key: "j", ctrl: true },
   ],
 
   // External tools
   [Command.OPEN_EXTERNAL_EDITOR]: [
-    { key: 'x', ctrl: true },
-    { sequence: '\x18', ctrl: true },
+    { key: "x", ctrl: true },
+    { sequence: "\x18", ctrl: true },
   ],
-  [Command.PASTE_CLIPBOARD]: [{ key: 'v', ctrl: true }],
+  [Command.PASTE_CLIPBOARD]: [{ key: "v", ctrl: true }],
 
   // App level bindings
-  [Command.SHOW_ERROR_DETAILS]: [{ key: 'f12' }],
-  [Command.SHOW_FULL_TODOS]: [{ key: 't', ctrl: true }],
-  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: [{ key: 'g', ctrl: true }],
-  [Command.TOGGLE_MARKDOWN]: [{ key: 'm', command: true }],
-  [Command.TOGGLE_COPY_MODE]: [{ key: 's', ctrl: true }],
-  [Command.QUIT]: [{ key: 'c', ctrl: true }],
-  [Command.EXIT]: [{ key: 'd', ctrl: true }],
-  [Command.SHOW_MORE_LINES]: [{ key: 's', ctrl: true }],
+  [Command.SHOW_ERROR_DETAILS]: [{ key: "f12" }],
+  [Command.SHOW_FULL_TODOS]: [{ key: "t", ctrl: true }],
+  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: [{ key: "g", ctrl: true }],
+  [Command.TOGGLE_MARKDOWN]: [{ key: "m", command: true }],
+  [Command.TOGGLE_COPY_MODE]: [{ key: "s", ctrl: true }],
+  [Command.QUIT]: [{ key: "c", ctrl: true }],
+  [Command.EXIT]: [{ key: "d", ctrl: true }],
+  [Command.SHOW_MORE_LINES]: [{ key: "s", ctrl: true }],
 
   // Shell commands
-  [Command.REVERSE_SEARCH]: [{ key: 'r', ctrl: true }],
+  [Command.REVERSE_SEARCH]: [{ key: "r", ctrl: true }],
   // Note: original logic ONLY checked ctrl=false, ignored meta/shift/paste
-  [Command.SUBMIT_REVERSE_SEARCH]: [{ key: 'return', ctrl: false }],
-  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: 'tab' }],
-  [Command.TOGGLE_SHELL_INPUT_FOCUS]: [{ key: 'f', ctrl: true }],
+  [Command.SUBMIT_REVERSE_SEARCH]: [{ key: "return", ctrl: false }],
+  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: [{ key: "tab" }],
+  [Command.TOGGLE_SHELL_INPUT_FOCUS]: [{ key: "f", ctrl: true }],
 
   // Suggestion expansion
-  [Command.EXPAND_SUGGESTION]: [{ key: 'right' }],
-  [Command.COLLAPSE_SUGGESTION]: [{ key: 'left' }],
+  [Command.EXPAND_SUGGESTION]: [{ key: "right" }],
+  [Command.COLLAPSE_SUGGESTION]: [{ key: "left" }],
 };
 
 interface CommandCategory {
@@ -226,15 +226,15 @@ interface CommandCategory {
  */
 export const commandCategories: readonly CommandCategory[] = [
   {
-    title: 'Basic Controls',
+    title: "Basic Controls",
     commands: [Command.RETURN, Command.ESCAPE],
   },
   {
-    title: 'Cursor Movement',
+    title: "Cursor Movement",
     commands: [Command.HOME, Command.END],
   },
   {
-    title: 'Editing',
+    title: "Editing",
     commands: [
       Command.KILL_LINE_RIGHT,
       Command.KILL_LINE_LEFT,
@@ -243,11 +243,11 @@ export const commandCategories: readonly CommandCategory[] = [
     ],
   },
   {
-    title: 'Screen Control',
+    title: "Screen Control",
     commands: [Command.CLEAR_SCREEN],
   },
   {
-    title: 'Scrolling',
+    title: "Scrolling",
     commands: [
       Command.SCROLL_UP,
       Command.SCROLL_DOWN,
@@ -258,7 +258,7 @@ export const commandCategories: readonly CommandCategory[] = [
     ],
   },
   {
-    title: 'History & Search',
+    title: "History & Search",
     commands: [
       Command.HISTORY_UP,
       Command.HISTORY_DOWN,
@@ -268,7 +268,7 @@ export const commandCategories: readonly CommandCategory[] = [
     ],
   },
   {
-    title: 'Navigation',
+    title: "Navigation",
     commands: [
       Command.NAVIGATION_UP,
       Command.NAVIGATION_DOWN,
@@ -277,7 +277,7 @@ export const commandCategories: readonly CommandCategory[] = [
     ],
   },
   {
-    title: 'Suggestions & Completions',
+    title: "Suggestions & Completions",
     commands: [
       Command.ACCEPT_SUGGESTION,
       Command.COMPLETION_UP,
@@ -287,15 +287,15 @@ export const commandCategories: readonly CommandCategory[] = [
     ],
   },
   {
-    title: 'Text Input',
+    title: "Text Input",
     commands: [Command.SUBMIT, Command.NEWLINE],
   },
   {
-    title: 'External Tools',
+    title: "External Tools",
     commands: [Command.OPEN_EXTERNAL_EDITOR, Command.PASTE_CLIPBOARD],
   },
   {
-    title: 'App Controls',
+    title: "App Controls",
     commands: [
       Command.SHOW_ERROR_DETAILS,
       Command.SHOW_FULL_TODOS,
@@ -307,7 +307,7 @@ export const commandCategories: readonly CommandCategory[] = [
     ],
   },
   {
-    title: 'Session Control',
+    title: "Session Control",
     commands: [Command.QUIT, Command.EXIT],
   },
 ];
@@ -316,51 +316,46 @@ export const commandCategories: readonly CommandCategory[] = [
  * Human-readable descriptions for each command, used in docs/tooling.
  */
 export const commandDescriptions: Readonly<Record<Command, string>> = {
-  [Command.RETURN]: 'Confirm the current selection or choice.',
-  [Command.ESCAPE]: 'Dismiss dialogs or cancel the current focus.',
-  [Command.HOME]: 'Move the cursor to the start of the line.',
-  [Command.END]: 'Move the cursor to the end of the line.',
-  [Command.KILL_LINE_RIGHT]: 'Delete from the cursor to the end of the line.',
-  [Command.KILL_LINE_LEFT]: 'Delete from the cursor to the start of the line.',
-  [Command.CLEAR_INPUT]: 'Clear all text in the input field.',
-  [Command.DELETE_WORD_BACKWARD]: 'Delete the previous word.',
-  [Command.CLEAR_SCREEN]: 'Clear the terminal screen and redraw the UI.',
-  [Command.SCROLL_UP]: 'Scroll content up.',
-  [Command.SCROLL_DOWN]: 'Scroll content down.',
-  [Command.SCROLL_HOME]: 'Scroll to the top.',
-  [Command.SCROLL_END]: 'Scroll to the bottom.',
-  [Command.PAGE_UP]: 'Scroll up by one page.',
-  [Command.PAGE_DOWN]: 'Scroll down by one page.',
-  [Command.HISTORY_UP]: 'Show the previous entry in history.',
-  [Command.HISTORY_DOWN]: 'Show the next entry in history.',
-  [Command.NAVIGATION_UP]: 'Move selection up in lists.',
-  [Command.NAVIGATION_DOWN]: 'Move selection down in lists.',
-  [Command.DIALOG_NAVIGATION_UP]: 'Move up within dialog options.',
-  [Command.DIALOG_NAVIGATION_DOWN]: 'Move down within dialog options.',
-  [Command.ACCEPT_SUGGESTION]: 'Accept the inline suggestion.',
-  [Command.COMPLETION_UP]: 'Move to the previous completion option.',
-  [Command.COMPLETION_DOWN]: 'Move to the next completion option.',
-  [Command.SUBMIT]: 'Submit the current prompt.',
-  [Command.NEWLINE]: 'Insert a newline without submitting.',
-  [Command.OPEN_EXTERNAL_EDITOR]:
-    'Open the current prompt in an external editor.',
-  [Command.PASTE_CLIPBOARD]: 'Paste from the clipboard.',
-  [Command.SHOW_ERROR_DETAILS]: 'Toggle detailed error information.',
-  [Command.SHOW_FULL_TODOS]: 'Toggle the full TODO list.',
-  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: 'Toggle IDE context details.',
-  [Command.TOGGLE_MARKDOWN]: 'Toggle Markdown rendering.',
-  [Command.TOGGLE_COPY_MODE]:
-    'Toggle copy mode when the terminal is using the alternate buffer.',
-  [Command.QUIT]: 'Cancel the current request or quit the CLI.',
-  [Command.EXIT]: 'Exit the CLI when the input buffer is empty.',
-  [Command.SHOW_MORE_LINES]:
-    'Expand a height-constrained response to show additional lines.',
-  [Command.REVERSE_SEARCH]: 'Start reverse search through history.',
-  [Command.SUBMIT_REVERSE_SEARCH]: 'Insert the selected reverse-search match.',
-  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]:
-    'Accept a suggestion while reverse searching.',
-  [Command.TOGGLE_SHELL_INPUT_FOCUS]:
-    'Toggle focus between the shell and Gemini input.',
-  [Command.EXPAND_SUGGESTION]: 'Expand an inline suggestion.',
-  [Command.COLLAPSE_SUGGESTION]: 'Collapse an inline suggestion.',
+  [Command.RETURN]: "Confirm the current selection or choice.",
+  [Command.ESCAPE]: "Dismiss dialogs or cancel the current focus.",
+  [Command.HOME]: "Move the cursor to the start of the line.",
+  [Command.END]: "Move the cursor to the end of the line.",
+  [Command.KILL_LINE_RIGHT]: "Delete from the cursor to the end of the line.",
+  [Command.KILL_LINE_LEFT]: "Delete from the cursor to the start of the line.",
+  [Command.CLEAR_INPUT]: "Clear all text in the input field.",
+  [Command.DELETE_WORD_BACKWARD]: "Delete the previous word.",
+  [Command.CLEAR_SCREEN]: "Clear the terminal screen and redraw the UI.",
+  [Command.SCROLL_UP]: "Scroll content up.",
+  [Command.SCROLL_DOWN]: "Scroll content down.",
+  [Command.SCROLL_HOME]: "Scroll to the top.",
+  [Command.SCROLL_END]: "Scroll to the bottom.",
+  [Command.PAGE_UP]: "Scroll up by one page.",
+  [Command.PAGE_DOWN]: "Scroll down by one page.",
+  [Command.HISTORY_UP]: "Show the previous entry in history.",
+  [Command.HISTORY_DOWN]: "Show the next entry in history.",
+  [Command.NAVIGATION_UP]: "Move selection up in lists.",
+  [Command.NAVIGATION_DOWN]: "Move selection down in lists.",
+  [Command.DIALOG_NAVIGATION_UP]: "Move up within dialog options.",
+  [Command.DIALOG_NAVIGATION_DOWN]: "Move down within dialog options.",
+  [Command.ACCEPT_SUGGESTION]: "Accept the inline suggestion.",
+  [Command.COMPLETION_UP]: "Move to the previous completion option.",
+  [Command.COMPLETION_DOWN]: "Move to the next completion option.",
+  [Command.SUBMIT]: "Submit the current prompt.",
+  [Command.NEWLINE]: "Insert a newline without submitting.",
+  [Command.OPEN_EXTERNAL_EDITOR]: "Open the current prompt in an external editor.",
+  [Command.PASTE_CLIPBOARD]: "Paste from the clipboard.",
+  [Command.SHOW_ERROR_DETAILS]: "Toggle detailed error information.",
+  [Command.SHOW_FULL_TODOS]: "Toggle the full TODO list.",
+  [Command.TOGGLE_IDE_CONTEXT_DETAIL]: "Toggle IDE context details.",
+  [Command.TOGGLE_MARKDOWN]: "Toggle Markdown rendering.",
+  [Command.TOGGLE_COPY_MODE]: "Toggle copy mode when the terminal is using the alternate buffer.",
+  [Command.QUIT]: "Cancel the current request or quit the CLI.",
+  [Command.EXIT]: "Exit the CLI when the input buffer is empty.",
+  [Command.SHOW_MORE_LINES]: "Expand a height-constrained response to show additional lines.",
+  [Command.REVERSE_SEARCH]: "Start reverse search through history.",
+  [Command.SUBMIT_REVERSE_SEARCH]: "Insert the selected reverse-search match.",
+  [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: "Accept a suggestion while reverse searching.",
+  [Command.TOGGLE_SHELL_INPUT_FOCUS]: "Toggle focus between the shell and Gemini input.",
+  [Command.EXPAND_SUGGESTION]: "Expand an inline suggestion.",
+  [Command.COLLAPSE_SUGGESTION]: "Collapse an inline suggestion.",
 };
diff --git a/packages/ui-gemini/src/config/policy-engine.integration.test.ts b/packages/ui-gemini/src/config/policy-engine.integration.test.ts
index 33b917861..29bc6fdd6 100644
--- a/packages/ui-gemini/src/config/policy-engine.integration.test.ts
+++ b/packages/ui-gemini/src/config/policy-engine.integration.test.ts
@@ -4,483 +4,407 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import {
-  ApprovalMode,
-  PolicyDecision,
-  PolicyEngine,
-} from '@airiscode/gemini-cli-core';
-import { createPolicyEngineConfig } from './policy.js';
-import type { Settings } from './settings.js';
-
-describe('Policy Engine Integration Tests', () => {
-  describe('Policy configuration produces valid PolicyEngine config', () => {
-    it('should create a working PolicyEngine from basic settings', async () => {
+import { ApprovalMode, PolicyDecision, PolicyEngine } from "@airiscode/gemini-cli-core";
+import { describe, expect, it } from "vitest";
+import { createPolicyEngineConfig } from "./policy.js";
+import type { Settings } from "./settings.js";
+
+describe("Policy Engine Integration Tests", () => {
+  describe("Policy configuration produces valid PolicyEngine config", () => {
+    it("should create a working PolicyEngine from basic settings", async () => {
       const settings: Settings = {
         tools: {
-          allowed: ['run_shell_command'],
-          exclude: ['write_file'],
+          allowed: ["run_shell_command"],
+          exclude: ["write_file"],
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // Allowed tool should be allowed
-      expect(
-        (await engine.check({ name: 'run_shell_command' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "run_shell_command" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // Excluded tool should be denied
-      expect(
-        (await engine.check({ name: 'write_file' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "write_file" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
 
       // Other write tools should ask user
-      expect(
-        (await engine.check({ name: 'replace' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "replace" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
 
       // Unknown tools should use default
-      expect(
-        (await engine.check({ name: 'unknown_tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "unknown_tool" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should handle MCP server wildcard patterns correctly', async () => {
+    it("should handle MCP server wildcard patterns correctly", async () => {
       const settings: Settings = {
         mcp: {
-          allowed: ['allowed-server'],
-          excluded: ['blocked-server'],
+          allowed: ["allowed-server"],
+          excluded: ["blocked-server"],
         },
         mcpServers: {
-          'trusted-server': {
-            command: 'node',
-            args: ['server.js'],
+          "trusted-server": {
+            command: "node",
+            args: ["server.js"],
             trust: true,
           },
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // Tools from allowed server should be allowed
       // Tools from allowed server should be allowed
+      expect((await engine.check({ name: "allowed-server__tool1" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
       expect(
-        (await engine.check({ name: 'allowed-server__tool1' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (
-          await engine.check(
-            { name: 'allowed-server__another_tool' },
-            undefined,
-          )
-        ).decision,
+        (await engine.check({ name: "allowed-server__another_tool" }, undefined)).decision,
       ).toBe(PolicyDecision.ALLOW);
 
       // Tools from trusted server should be allowed
+      expect((await engine.check({ name: "trusted-server__tool1" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
       expect(
-        (await engine.check({ name: 'trusted-server__tool1' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (
-          await engine.check(
-            { name: 'trusted-server__special_tool' },
-            undefined,
-          )
-        ).decision,
+        (await engine.check({ name: "trusted-server__special_tool" }, undefined)).decision,
       ).toBe(PolicyDecision.ALLOW);
 
       // Tools from blocked server should be denied
-      expect(
-        (await engine.check({ name: 'blocked-server__tool1' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'blocked-server__any_tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "blocked-server__tool1" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "blocked-server__any_tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
 
       // Tools from unknown servers should use default
-      expect(
-        (await engine.check({ name: 'unknown-server__tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "unknown-server__tool" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should correctly prioritize specific tool excludes over MCP server wildcards', async () => {
+    it("should correctly prioritize specific tool excludes over MCP server wildcards", async () => {
       const settings: Settings = {
         mcp: {
-          allowed: ['my-server'],
+          allowed: ["my-server"],
         },
         tools: {
-          exclude: ['my-server__dangerous-tool'],
+          exclude: ["my-server__dangerous-tool"],
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // MCP server allowed (priority 2.1) provides general allow for server
       // MCP server allowed (priority 2.1) provides general allow for server
-      expect(
-        (await engine.check({ name: 'my-server__safe-tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "my-server__safe-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
       // But specific tool exclude (priority 2.4) wins over server allow
-      expect(
-        (await engine.check({ name: 'my-server__dangerous-tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "my-server__dangerous-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle complex mixed configurations', async () => {
+    it("should handle complex mixed configurations", async () => {
       const settings: Settings = {
         tools: {
           autoAccept: true, // Allows read-only tools
-          allowed: ['custom-tool', 'my-server__special-tool'],
-          exclude: ['glob', 'dangerous-tool'],
+          allowed: ["custom-tool", "my-server__special-tool"],
+          exclude: ["glob", "dangerous-tool"],
         },
         mcp: {
-          allowed: ['allowed-server'],
-          excluded: ['blocked-server'],
+          allowed: ["allowed-server"],
+          excluded: ["blocked-server"],
         },
         mcpServers: {
-          'trusted-server': {
-            command: 'node',
-            args: ['server.js'],
+          "trusted-server": {
+            command: "node",
+            args: ["server.js"],
             trust: true,
           },
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // Read-only tools should be allowed (autoAccept)
-      expect(
-        (await engine.check({ name: 'read_file' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'list_directory' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "read_file" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "list_directory" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // But glob is explicitly excluded, so it should be denied
-      expect((await engine.check({ name: 'glob' }, undefined)).decision).toBe(
-        PolicyDecision.DENY,
-      );
+      expect((await engine.check({ name: "glob" }, undefined)).decision).toBe(PolicyDecision.DENY);
 
       // Replace should ask user (normal write tool behavior)
-      expect(
-        (await engine.check({ name: 'replace' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "replace" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
 
       // Explicitly allowed tools
-      expect(
-        (await engine.check({ name: 'custom-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'my-server__special-tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "custom-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "my-server__special-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // MCP server tools
-      expect(
-        (await engine.check({ name: 'allowed-server__tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'trusted-server__tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'blocked-server__tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "allowed-server__tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "trusted-server__tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "blocked-server__tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
 
       // Write tools should ask by default
-      expect(
-        (await engine.check({ name: 'write_file' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "write_file" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should handle YOLO mode correctly', async () => {
+    it("should handle YOLO mode correctly", async () => {
       const settings: Settings = {
         tools: {
-          exclude: ['dangerous-tool'], // Even in YOLO, excludes should be respected
+          exclude: ["dangerous-tool"], // Even in YOLO, excludes should be respected
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.YOLO,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.YOLO);
       const engine = new PolicyEngine(config);
 
       // Most tools should be allowed in YOLO mode
-      expect(
-        (await engine.check({ name: 'run_shell_command' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'write_file' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'unknown_tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "run_shell_command" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "write_file" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "unknown_tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // But explicitly excluded tools should still be denied
-      expect(
-        (await engine.check({ name: 'dangerous-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "dangerous-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle AUTO_EDIT mode correctly', async () => {
+    it("should handle AUTO_EDIT mode correctly", async () => {
       const settings: Settings = {};
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.AUTO_EDIT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.AUTO_EDIT);
       const engine = new PolicyEngine(config);
 
       // Edit tools should be allowed in AUTO_EDIT mode
-      expect(
-        (await engine.check({ name: 'replace' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'write_file' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
+      expect((await engine.check({ name: "replace" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "write_file" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
 
       // Other tools should follow normal rules
-      expect(
-        (await engine.check({ name: 'run_shell_command' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "run_shell_command" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should verify priority ordering works correctly in practice', async () => {
+    it("should verify priority ordering works correctly in practice", async () => {
       const settings: Settings = {
         tools: {
           autoAccept: true, // Priority 50
-          allowed: ['specific-tool'], // Priority 100
-          exclude: ['blocked-tool'], // Priority 200
+          allowed: ["specific-tool"], // Priority 100
+          exclude: ["blocked-tool"], // Priority 200
         },
         mcp: {
-          allowed: ['mcp-server'], // Priority 85
-          excluded: ['blocked-server'], // Priority 195
+          allowed: ["mcp-server"], // Priority 85
+          excluded: ["blocked-server"], // Priority 195
         },
         mcpServers: {
-          'trusted-server': {
-            command: 'node',
-            args: ['server.js'],
+          "trusted-server": {
+            command: "node",
+            args: ["server.js"],
             trust: true, // Priority 90
           },
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // Test that priorities are applied correctly
       const rules = config.rules || [];
 
       // Find rules and verify their priorities
-      const blockedToolRule = rules.find((r) => r.toolName === 'blocked-tool');
+      const blockedToolRule = rules.find((r) => r.toolName === "blocked-tool");
       expect(blockedToolRule?.priority).toBe(2.4); // Command line exclude
 
-      const blockedServerRule = rules.find(
-        (r) => r.toolName === 'blocked-server__*',
-      );
+      const blockedServerRule = rules.find((r) => r.toolName === "blocked-server__*");
       expect(blockedServerRule?.priority).toBe(2.9); // MCP server exclude
 
-      const specificToolRule = rules.find(
-        (r) => r.toolName === 'specific-tool',
-      );
+      const specificToolRule = rules.find((r) => r.toolName === "specific-tool");
       expect(specificToolRule?.priority).toBe(2.3); // Command line allow
 
-      const trustedServerRule = rules.find(
-        (r) => r.toolName === 'trusted-server__*',
-      );
+      const trustedServerRule = rules.find((r) => r.toolName === "trusted-server__*");
       expect(trustedServerRule?.priority).toBe(2.2); // MCP trusted server
 
-      const mcpServerRule = rules.find((r) => r.toolName === 'mcp-server__*');
+      const mcpServerRule = rules.find((r) => r.toolName === "mcp-server__*");
       expect(mcpServerRule?.priority).toBe(2.1); // MCP allowed server
 
-      const readOnlyToolRule = rules.find((r) => r.toolName === 'glob');
+      const readOnlyToolRule = rules.find((r) => r.toolName === "glob");
       // Priority 50 in default tier → 1.05
       expect(readOnlyToolRule?.priority).toBeCloseTo(1.05, 5);
 
       // Verify the engine applies these priorities correctly
-      expect(
-        (await engine.check({ name: 'blocked-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'blocked-server__any' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'specific-tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'trusted-server__any' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect(
-        (await engine.check({ name: 'mcp-server__any' }, undefined)).decision,
-      ).toBe(PolicyDecision.ALLOW);
-      expect((await engine.check({ name: 'glob' }, undefined)).decision).toBe(
+      expect((await engine.check({ name: "blocked-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "blocked-server__any" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "specific-tool" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "trusted-server__any" }, undefined)).decision).toBe(
+        PolicyDecision.ALLOW,
+      );
+      expect((await engine.check({ name: "mcp-server__any" }, undefined)).decision).toBe(
         PolicyDecision.ALLOW,
       );
+      expect((await engine.check({ name: "glob" }, undefined)).decision).toBe(PolicyDecision.ALLOW);
     });
 
-    it('should handle edge case: MCP server with both trust and exclusion', async () => {
+    it("should handle edge case: MCP server with both trust and exclusion", async () => {
       const settings: Settings = {
         mcpServers: {
-          'conflicted-server': {
-            command: 'node',
-            args: ['server.js'],
+          "conflicted-server": {
+            command: "node",
+            args: ["server.js"],
             trust: true, // Priority 90 - ALLOW
           },
         },
         mcp: {
-          excluded: ['conflicted-server'], // Priority 195 - DENY
+          excluded: ["conflicted-server"], // Priority 195 - DENY
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // Exclusion (195) should win over trust (90)
-      expect(
-        (await engine.check({ name: 'conflicted-server__tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "conflicted-server__tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle edge case: specific tool allowed but server excluded', async () => {
+    it("should handle edge case: specific tool allowed but server excluded", async () => {
       const settings: Settings = {
         mcp: {
-          excluded: ['my-server'], // Priority 195 - DENY
+          excluded: ["my-server"], // Priority 195 - DENY
         },
         tools: {
-          allowed: ['my-server__special-tool'], // Priority 100 - ALLOW
+          allowed: ["my-server__special-tool"], // Priority 100 - ALLOW
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // Server exclusion (195) wins over specific tool allow (100)
       // This might be counterintuitive but follows the priority system
-      expect(
-        (await engine.check({ name: 'my-server__special-tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'my-server__other-tool' }, undefined))
-          .decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "my-server__special-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "my-server__other-tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should verify non-interactive mode transformation', async () => {
+    it("should verify non-interactive mode transformation", async () => {
       const settings: Settings = {};
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       // Enable non-interactive mode
       const engineConfig = { ...config, nonInteractive: true };
       const engine = new PolicyEngine(engineConfig);
 
       // ASK_USER should become DENY in non-interactive mode
-      expect(
-        (await engine.check({ name: 'unknown_tool' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
-      expect(
-        (await engine.check({ name: 'run_shell_command' }, undefined)).decision,
-      ).toBe(PolicyDecision.DENY);
+      expect((await engine.check({ name: "unknown_tool" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
+      expect((await engine.check({ name: "run_shell_command" }, undefined)).decision).toBe(
+        PolicyDecision.DENY,
+      );
     });
 
-    it('should handle empty settings gracefully', async () => {
+    it("should handle empty settings gracefully", async () => {
       const settings: Settings = {};
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const engine = new PolicyEngine(config);
 
       // Should have default rules for write tools
-      expect(
-        (await engine.check({ name: 'write_file' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
-      expect(
-        (await engine.check({ name: 'replace' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "write_file" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
+      expect((await engine.check({ name: "replace" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
 
       // Unknown tools should use default
-      expect(
-        (await engine.check({ name: 'unknown' }, undefined)).decision,
-      ).toBe(PolicyDecision.ASK_USER);
+      expect((await engine.check({ name: "unknown" }, undefined)).decision).toBe(
+        PolicyDecision.ASK_USER,
+      );
     });
 
-    it('should verify rules are created with correct priorities', async () => {
+    it("should verify rules are created with correct priorities", async () => {
       const settings: Settings = {
         tools: {
           autoAccept: true,
-          allowed: ['tool1', 'tool2'],
-          exclude: ['tool3'],
+          allowed: ["tool1", "tool2"],
+          exclude: ["tool3"],
         },
         mcp: {
-          allowed: ['server1'],
-          excluded: ['server2'],
+          allowed: ["server1"],
+          excluded: ["server2"],
         },
       };
 
-      const config = await createPolicyEngineConfig(
-        settings,
-        ApprovalMode.DEFAULT,
-      );
+      const config = await createPolicyEngineConfig(settings, ApprovalMode.DEFAULT);
       const rules = config.rules || [];
 
       // Verify each rule has the expected priority
-      const tool3Rule = rules.find((r) => r.toolName === 'tool3');
+      const tool3Rule = rules.find((r) => r.toolName === "tool3");
       expect(tool3Rule?.priority).toBe(2.4); // Excluded tools (user tier)
 
-      const server2Rule = rules.find((r) => r.toolName === 'server2__*');
+      const server2Rule = rules.find((r) => r.toolName === "server2__*");
       expect(server2Rule?.priority).toBe(2.9); // Excluded servers (user tier)
 
-      const tool1Rule = rules.find((r) => r.toolName === 'tool1');
+      const tool1Rule = rules.find((r) => r.toolName === "tool1");
       expect(tool1Rule?.priority).toBe(2.3); // Allowed tools (user tier)
 
-      const server1Rule = rules.find((r) => r.toolName === 'server1__*');
+      const server1Rule = rules.find((r) => r.toolName === "server1__*");
       expect(server1Rule?.priority).toBe(2.1); // Allowed servers (user tier)
 
-      const globRule = rules.find((r) => r.toolName === 'glob');
+      const globRule = rules.find((r) => r.toolName === "glob");
       // Priority 50 in default tier → 1.05
       expect(globRule?.priority).toBeCloseTo(1.05, 5); // Auto-accept read-only
 
diff --git a/packages/ui-gemini/src/config/policy.ts b/packages/ui-gemini/src/config/policy.ts
index 565caf2f4..e0d1803f6 100644
--- a/packages/ui-gemini/src/config/policy.ts
+++ b/packages/ui-gemini/src/config/policy.ts
@@ -5,15 +5,15 @@
  */
 
 import {
-  type PolicyEngineConfig,
   type ApprovalMode,
-  type PolicyEngine,
-  type MessageBus,
-  type PolicySettings,
   createPolicyEngineConfig as createCorePolicyEngineConfig,
   createPolicyUpdater as createCorePolicyUpdater,
-} from '@airiscode/gemini-cli-core';
-import { type Settings } from './settings.js';
+  type MessageBus,
+  type PolicyEngine,
+  type PolicyEngineConfig,
+  type PolicySettings,
+} from "@airiscode/gemini-cli-core";
+import { type Settings } from "./settings.js";
 
 export async function createPolicyEngineConfig(
   settings: Settings,
@@ -30,9 +30,6 @@ export async function createPolicyEngineConfig(
   return createCorePolicyEngineConfig(policySettings, approvalMode);
 }
 
-export function createPolicyUpdater(
-  policyEngine: PolicyEngine,
-  messageBus: MessageBus,
-) {
+export function createPolicyUpdater(policyEngine: PolicyEngine, messageBus: MessageBus) {
   return createCorePolicyUpdater(policyEngine, messageBus);
 }
diff --git a/packages/ui-gemini/src/config/sandboxConfig.test.ts b/packages/ui-gemini/src/config/sandboxConfig.test.ts
index eea7a0124..f1621a4e9 100644
--- a/packages/ui-gemini/src/config/sandboxConfig.test.ts
+++ b/packages/ui-gemini/src/config/sandboxConfig.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getPackageJson } from '@airiscode/gemini-cli-core';
-import commandExists from 'command-exists';
-import * as os from 'node:os';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { loadSandboxConfig } from './sandboxConfig.js';
+import * as os from "node:os";
+import { getPackageJson } from "@airiscode/gemini-cli-core";
+import commandExists from "command-exists";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { loadSandboxConfig } from "./sandboxConfig.js";
 
 // Mock dependencies
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
   const actual = await importOriginal();
   return {
     ...(actual as object),
@@ -19,19 +19,19 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
     FatalSandboxError: class extends Error {
       constructor(message: string) {
         super(message);
-        this.name = 'FatalSandboxError';
+        this.name = "FatalSandboxError";
       }
     },
   };
 });
 
-vi.mock('command-exists', () => ({
+vi.mock("command-exists", () => ({
   default: {
     sync: vi.fn(),
   },
 }));
 
-vi.mock('node:os', async (importOriginal) => {
+vi.mock("node:os", async (importOriginal) => {
   const actual = await importOriginal();
   return {
     ...(actual as object),
@@ -43,14 +43,14 @@ const mockedGetPackageJson = vi.mocked(getPackageJson);
 const mockedCommandExistsSync = vi.mocked(commandExists.sync);
 const mockedOsPlatform = vi.mocked(os.platform);
 
-describe('loadSandboxConfig', () => {
+describe("loadSandboxConfig", () => {
   const originalEnv = { ...process.env };
 
   beforeEach(() => {
     vi.resetAllMocks();
     process.env = { ...originalEnv };
     mockedGetPackageJson.mockResolvedValue({
-      config: { sandboxImageUri: 'default/image' },
+      config: { sandboxImageUri: "default/image" },
     });
   });
 
@@ -58,45 +58,45 @@ describe('loadSandboxConfig', () => {
     process.env = originalEnv;
   });
 
-  it('should return undefined if sandbox is explicitly disabled via argv', async () => {
+  it("should return undefined if sandbox is explicitly disabled via argv", async () => {
     const config = await loadSandboxConfig({}, { sandbox: false });
     expect(config).toBeUndefined();
   });
 
-  it('should return undefined if sandbox is explicitly disabled via settings', async () => {
+  it("should return undefined if sandbox is explicitly disabled via settings", async () => {
     const config = await loadSandboxConfig({ tools: { sandbox: false } }, {});
     expect(config).toBeUndefined();
   });
 
-  it('should return undefined if sandbox is not configured', async () => {
+  it("should return undefined if sandbox is not configured", async () => {
     const config = await loadSandboxConfig({}, {});
     expect(config).toBeUndefined();
   });
 
-  it('should return undefined if already inside a sandbox (SANDBOX env var is set)', async () => {
-    process.env['SANDBOX'] = '1';
+  it("should return undefined if already inside a sandbox (SANDBOX env var is set)", async () => {
+    process.env["SANDBOX"] = "1";
     const config = await loadSandboxConfig({}, { sandbox: true });
     expect(config).toBeUndefined();
   });
 
-  describe('with GEMINI_SANDBOX environment variable', () => {
-    it('should use docker if GEMINI_SANDBOX=docker and it exists', async () => {
-      process.env['GEMINI_SANDBOX'] = 'docker';
+  describe("with GEMINI_SANDBOX environment variable", () => {
+    it("should use docker if GEMINI_SANDBOX=docker and it exists", async () => {
+      process.env["GEMINI_SANDBOX"] = "docker";
       mockedCommandExistsSync.mockReturnValue(true);
       const config = await loadSandboxConfig({}, {});
-      expect(config).toEqual({ command: 'docker', image: 'default/image' });
-      expect(mockedCommandExistsSync).toHaveBeenCalledWith('docker');
+      expect(config).toEqual({ command: "docker", image: "default/image" });
+      expect(mockedCommandExistsSync).toHaveBeenCalledWith("docker");
     });
 
-    it('should throw if GEMINI_SANDBOX is an invalid command', async () => {
-      process.env['GEMINI_SANDBOX'] = 'invalid-command';
+    it("should throw if GEMINI_SANDBOX is an invalid command", async () => {
+      process.env["GEMINI_SANDBOX"] = "invalid-command";
       await expect(loadSandboxConfig({}, {})).rejects.toThrow(
         "Invalid sandbox command 'invalid-command'. Must be one of docker, podman, sandbox-exec",
       );
     });
 
-    it('should throw if GEMINI_SANDBOX command does not exist', async () => {
-      process.env['GEMINI_SANDBOX'] = 'docker';
+    it("should throw if GEMINI_SANDBOX command does not exist", async () => {
+      process.env["GEMINI_SANDBOX"] = "docker";
       mockedCommandExistsSync.mockReturnValue(false);
       await expect(loadSandboxConfig({}, {})).rejects.toThrow(
         "Missing sandbox command 'docker' (from GEMINI_SANDBOX)",
@@ -104,125 +104,120 @@ describe('loadSandboxConfig', () => {
     });
   });
 
-  describe('with sandbox: true', () => {
-    it('should use sandbox-exec on darwin if available', async () => {
-      mockedOsPlatform.mockReturnValue('darwin');
-      mockedCommandExistsSync.mockImplementation(
-        (cmd) => cmd === 'sandbox-exec',
-      );
+  describe("with sandbox: true", () => {
+    it("should use sandbox-exec on darwin if available", async () => {
+      mockedOsPlatform.mockReturnValue("darwin");
+      mockedCommandExistsSync.mockImplementation((cmd) => cmd === "sandbox-exec");
       const config = await loadSandboxConfig({}, { sandbox: true });
       expect(config).toEqual({
-        command: 'sandbox-exec',
-        image: 'default/image',
+        command: "sandbox-exec",
+        image: "default/image",
       });
     });
 
-    it('should prefer sandbox-exec over docker on darwin', async () => {
-      mockedOsPlatform.mockReturnValue('darwin');
+    it("should prefer sandbox-exec over docker on darwin", async () => {
+      mockedOsPlatform.mockReturnValue("darwin");
       mockedCommandExistsSync.mockReturnValue(true); // all commands exist
       const config = await loadSandboxConfig({}, { sandbox: true });
       expect(config).toEqual({
-        command: 'sandbox-exec',
-        image: 'default/image',
+        command: "sandbox-exec",
+        image: "default/image",
       });
     });
 
-    it('should use docker if available and sandbox is true', async () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      mockedCommandExistsSync.mockImplementation((cmd) => cmd === 'docker');
+    it("should use docker if available and sandbox is true", async () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      mockedCommandExistsSync.mockImplementation((cmd) => cmd === "docker");
       const config = await loadSandboxConfig({ tools: { sandbox: true } }, {});
-      expect(config).toEqual({ command: 'docker', image: 'default/image' });
+      expect(config).toEqual({ command: "docker", image: "default/image" });
     });
 
-    it('should use podman if available and docker is not', async () => {
-      mockedOsPlatform.mockReturnValue('linux');
-      mockedCommandExistsSync.mockImplementation((cmd) => cmd === 'podman');
+    it("should use podman if available and docker is not", async () => {
+      mockedOsPlatform.mockReturnValue("linux");
+      mockedCommandExistsSync.mockImplementation((cmd) => cmd === "podman");
       const config = await loadSandboxConfig({}, { sandbox: true });
-      expect(config).toEqual({ command: 'podman', image: 'default/image' });
+      expect(config).toEqual({ command: "podman", image: "default/image" });
     });
 
-    it('should throw if sandbox: true but no command is found', async () => {
-      mockedOsPlatform.mockReturnValue('linux');
+    it("should throw if sandbox: true but no command is found", async () => {
+      mockedOsPlatform.mockReturnValue("linux");
       mockedCommandExistsSync.mockReturnValue(false);
       await expect(loadSandboxConfig({}, { sandbox: true })).rejects.toThrow(
-        'GEMINI_SANDBOX is true but failed to determine command for sandbox; ' +
-          'install docker or podman or specify command in GEMINI_SANDBOX',
+        "GEMINI_SANDBOX is true but failed to determine command for sandbox; " +
+          "install docker or podman or specify command in GEMINI_SANDBOX",
       );
     });
   });
 
   describe("with sandbox: 'command'", () => {
-    it('should use the specified command if it exists', async () => {
+    it("should use the specified command if it exists", async () => {
       mockedCommandExistsSync.mockReturnValue(true);
-      const config = await loadSandboxConfig({}, { sandbox: 'podman' });
-      expect(config).toEqual({ command: 'podman', image: 'default/image' });
-      expect(mockedCommandExistsSync).toHaveBeenCalledWith('podman');
+      const config = await loadSandboxConfig({}, { sandbox: "podman" });
+      expect(config).toEqual({ command: "podman", image: "default/image" });
+      expect(mockedCommandExistsSync).toHaveBeenCalledWith("podman");
     });
 
-    it('should throw if the specified command does not exist', async () => {
+    it("should throw if the specified command does not exist", async () => {
       mockedCommandExistsSync.mockReturnValue(false);
-      await expect(
-        loadSandboxConfig({}, { sandbox: 'podman' }),
-      ).rejects.toThrow(
+      await expect(loadSandboxConfig({}, { sandbox: "podman" })).rejects.toThrow(
         "Missing sandbox command 'podman' (from GEMINI_SANDBOX)",
       );
     });
 
-    it('should throw if the specified command is invalid', async () => {
-      await expect(
-        loadSandboxConfig({}, { sandbox: 'invalid-command' }),
-      ).rejects.toThrow(
+    it("should throw if the specified command is invalid", async () => {
+      await expect(loadSandboxConfig({}, { sandbox: "invalid-command" })).rejects.toThrow(
         "Invalid sandbox command 'invalid-command'. Must be one of docker, podman, sandbox-exec",
       );
     });
   });
 
-  describe('image configuration', () => {
-    it('should use image from GEMINI_SANDBOX_IMAGE env var if set', async () => {
-      process.env['GEMINI_SANDBOX_IMAGE'] = 'env/image';
-      process.env['GEMINI_SANDBOX'] = 'docker';
+  describe("image configuration", () => {
+    it("should use image from GEMINI_SANDBOX_IMAGE env var if set", async () => {
+      process.env["GEMINI_SANDBOX_IMAGE"] = "env/image";
+      process.env["GEMINI_SANDBOX"] = "docker";
       mockedCommandExistsSync.mockReturnValue(true);
       const config = await loadSandboxConfig({}, {});
-      expect(config).toEqual({ command: 'docker', image: 'env/image' });
+      expect(config).toEqual({ command: "docker", image: "env/image" });
     });
 
-    it('should use image from package.json if env var is not set', async () => {
-      process.env['GEMINI_SANDBOX'] = 'docker';
+    it("should use image from package.json if env var is not set", async () => {
+      process.env["GEMINI_SANDBOX"] = "docker";
       mockedCommandExistsSync.mockReturnValue(true);
       const config = await loadSandboxConfig({}, {});
-      expect(config).toEqual({ command: 'docker', image: 'default/image' });
+      expect(config).toEqual({ command: "docker", image: "default/image" });
     });
 
-    it('should return undefined if command is found but no image is configured', async () => {
+    it("should return undefined if command is found but no image is configured", async () => {
       mockedGetPackageJson.mockResolvedValue({}); // no sandboxImageUri
-      process.env['GEMINI_SANDBOX'] = 'docker';
+      process.env["GEMINI_SANDBOX"] = "docker";
       mockedCommandExistsSync.mockReturnValue(true);
       const config = await loadSandboxConfig({}, {});
       expect(config).toBeUndefined();
     });
   });
 
-  describe('truthy/falsy sandbox values', () => {
+  describe("truthy/falsy sandbox values", () => {
     beforeEach(() => {
-      mockedOsPlatform.mockReturnValue('linux');
-      mockedCommandExistsSync.mockImplementation((cmd) => cmd === 'docker');
-    });
-
-    it.each([true, 'true', '1'])(
-      'should enable sandbox for value: %s',
-      async (value) => {
-        const config = await loadSandboxConfig({}, { sandbox: value });
-        expect(config).toEqual({ command: 'docker', image: 'default/image' });
-      },
-    );
-
-    it.each([false, 'false', '0', undefined, null, ''])(
-      'should disable sandbox for value: %s',
-      async (value) => {
-        // \`null\` is not a valid type for the arg, but good to test falsiness
-        const config = await loadSandboxConfig({}, { sandbox: value });
-        expect(config).toBeUndefined();
-      },
-    );
+      mockedOsPlatform.mockReturnValue("linux");
+      mockedCommandExistsSync.mockImplementation((cmd) => cmd === "docker");
+    });
+
+    it.each([true, "true", "1"])("should enable sandbox for value: %s", async (value) => {
+      const config = await loadSandboxConfig({}, { sandbox: value });
+      expect(config).toEqual({ command: "docker", image: "default/image" });
+    });
+
+    it.each([
+      false,
+      "false",
+      "0",
+      undefined,
+      null,
+      "",
+    ])("should disable sandbox for value: %s", async (value) => {
+      // \`null\` is not a valid type for the arg, but good to test falsiness
+      const config = await loadSandboxConfig({}, { sandbox: value });
+      expect(config).toBeUndefined();
+    });
   });
 });
diff --git a/packages/ui-gemini/src/config/sandboxConfig.ts b/packages/ui-gemini/src/config/sandboxConfig.ts
index 0797e1484..0fe5b86ee 100644
--- a/packages/ui-gemini/src/config/sandboxConfig.ts
+++ b/packages/ui-gemini/src/config/sandboxConfig.ts
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  getPackageJson,
-  type SandboxConfig,
-  FatalSandboxError,
-} from '@airiscode/gemini-cli-core';
-import commandExists from 'command-exists';
-import * as os from 'node:os';
-import type { Settings } from './settings.js';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
+import * as os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { FatalSandboxError, getPackageJson, type SandboxConfig } from "@airiscode/gemini-cli-core";
+import commandExists from "command-exists";
+import type { Settings } from "./settings.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -23,74 +19,64 @@ const __dirname = path.dirname(__filename);
 interface SandboxCliArgs {
   sandbox?: boolean | string | null;
 }
-const VALID_SANDBOX_COMMANDS: ReadonlyArray<SandboxConfig['command']> = [
-  'docker',
-  'podman',
-  'sandbox-exec',
+const VALID_SANDBOX_COMMANDS: ReadonlyArray<SandboxConfig["command"]> = [
+  "docker",
+  "podman",
+  "sandbox-exec",
 ];
 
-function isSandboxCommand(value: string): value is SandboxConfig['command'] {
+function isSandboxCommand(value: string): value is SandboxConfig["command"] {
   return (VALID_SANDBOX_COMMANDS as readonly string[]).includes(value);
 }
 
-function getSandboxCommand(
-  sandbox?: boolean | string | null,
-): SandboxConfig['command'] | '' {
+function getSandboxCommand(sandbox?: boolean | string | null): SandboxConfig["command"] | "" {
   // If the SANDBOX env var is set, we're already inside the sandbox.
-  if (process.env['SANDBOX']) {
-    return '';
+  if (process.env["SANDBOX"]) {
+    return "";
   }
 
   // note environment variable takes precedence over argument (from command line or settings)
-  const environmentConfiguredSandbox =
-    process.env['GEMINI_SANDBOX']?.toLowerCase().trim() ?? '';
-  sandbox =
-    environmentConfiguredSandbox?.length > 0
-      ? environmentConfiguredSandbox
-      : sandbox;
-  if (sandbox === '1' || sandbox === 'true') sandbox = true;
-  else if (sandbox === '0' || sandbox === 'false' || !sandbox) sandbox = false;
+  const environmentConfiguredSandbox = process.env["GEMINI_SANDBOX"]?.toLowerCase().trim() ?? "";
+  sandbox = environmentConfiguredSandbox?.length > 0 ? environmentConfiguredSandbox : sandbox;
+  if (sandbox === "1" || sandbox === "true") sandbox = true;
+  else if (sandbox === "0" || sandbox === "false" || !sandbox) sandbox = false;
 
   if (sandbox === false) {
-    return '';
+    return "";
   }
 
-  if (typeof sandbox === 'string' && sandbox) {
+  if (typeof sandbox === "string" && sandbox) {
     if (!isSandboxCommand(sandbox)) {
       throw new FatalSandboxError(
-        `Invalid sandbox command '${sandbox}'. Must be one of ${VALID_SANDBOX_COMMANDS.join(
-          ', ',
-        )}`,
+        `Invalid sandbox command '${sandbox}'. Must be one of ${VALID_SANDBOX_COMMANDS.join(", ")}`,
       );
     }
     // confirm that specified command exists
     if (commandExists.sync(sandbox)) {
       return sandbox;
     }
-    throw new FatalSandboxError(
-      `Missing sandbox command '${sandbox}' (from GEMINI_SANDBOX)`,
-    );
+    throw new FatalSandboxError(`Missing sandbox command '${sandbox}' (from GEMINI_SANDBOX)`);
   }
 
   // look for seatbelt, docker, or podman, in that order
   // for container-based sandboxing, require sandbox to be enabled explicitly
-  if (os.platform() === 'darwin' && commandExists.sync('sandbox-exec')) {
-    return 'sandbox-exec';
-  } else if (commandExists.sync('docker') && sandbox === true) {
-    return 'docker';
-  } else if (commandExists.sync('podman') && sandbox === true) {
-    return 'podman';
+  if (os.platform() === "darwin" && commandExists.sync("sandbox-exec")) {
+    return "sandbox-exec";
+  } else if (commandExists.sync("docker") && sandbox === true) {
+    return "docker";
+  } else if (commandExists.sync("podman") && sandbox === true) {
+    return "podman";
   }
 
   // throw an error if user requested sandbox but no command was found
   if (sandbox === true) {
     throw new FatalSandboxError(
-      'GEMINI_SANDBOX is true but failed to determine command for sandbox; ' +
-        'install docker or podman or specify command in GEMINI_SANDBOX',
+      "GEMINI_SANDBOX is true but failed to determine command for sandbox; " +
+        "install docker or podman or specify command in GEMINI_SANDBOX",
     );
   }
 
-  return '';
+  return "";
 }
 
 export async function loadSandboxConfig(
@@ -101,8 +87,7 @@ export async function loadSandboxConfig(
   const command = getSandboxCommand(sandboxOption);
 
   const packageJson = await getPackageJson(__dirname);
-  const image =
-    process.env['GEMINI_SANDBOX_IMAGE'] ?? packageJson?.config?.sandboxImageUri;
+  const image = process.env["GEMINI_SANDBOX_IMAGE"] ?? packageJson?.config?.sandboxImageUri;
 
   return command && image ? { command, image } : undefined;
 }
diff --git a/packages/ui-gemini/src/config/settingPaths.test.ts b/packages/ui-gemini/src/config/settingPaths.test.ts
index 0c98a7c83..a3a86baab 100644
--- a/packages/ui-gemini/src/config/settingPaths.test.ts
+++ b/packages/ui-gemini/src/config/settingPaths.test.ts
@@ -4,23 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { SettingPaths } from './settingPaths.js';
+import { describe, expect, it } from "vitest";
+import { SettingPaths } from "./settingPaths.js";
 
-describe('SettingPaths', () => {
-  it('should have the correct structure', () => {
+describe("SettingPaths", () => {
+  it("should have the correct structure", () => {
     expect(SettingPaths).toEqual({
       General: {
-        PreferredEditor: 'general.preferredEditor',
+        PreferredEditor: "general.preferredEditor",
       },
     });
   });
 
-  it('should be immutable', () => {
+  it("should be immutable", () => {
     expect(Object.isFrozen(SettingPaths)).toBe(false); // It's not frozen by default in JS unless Object.freeze is called, but it's `as const` in TS.
     // However, we can check if the values are correct.
-    expect(SettingPaths.General.PreferredEditor).toBe(
-      'general.preferredEditor',
-    );
+    expect(SettingPaths.General.PreferredEditor).toBe("general.preferredEditor");
   });
 });
diff --git a/packages/ui-gemini/src/config/settingPaths.ts b/packages/ui-gemini/src/config/settingPaths.ts
index 9ba046d9f..e6524cf81 100644
--- a/packages/ui-gemini/src/config/settingPaths.ts
+++ b/packages/ui-gemini/src/config/settingPaths.ts
@@ -6,6 +6,6 @@
 
 export const SettingPaths = {
   General: {
-    PreferredEditor: 'general.preferredEditor',
+    PreferredEditor: "general.preferredEditor",
   },
 } as const;
diff --git a/packages/ui-gemini/src/config/settings-validation.test.ts b/packages/ui-gemini/src/config/settings-validation.test.ts
index 8d4cc641f..7d5cd6e42 100644
--- a/packages/ui-gemini/src/config/settings-validation.test.ts
+++ b/packages/ui-gemini/src/config/settings-validation.test.ts
@@ -6,24 +6,24 @@
 
 /// <reference types="vitest/globals" />
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { z } from "zod";
 import {
-  validateSettings,
   formatValidationError,
   settingsZodSchema,
-} from './settings-validation.js';
-import { z } from 'zod';
+  validateSettings,
+} from "./settings-validation.js";
 
-describe('settings-validation', () => {
-  describe('validateSettings', () => {
-    it('should accept valid settings with correct model.name as string', () => {
+describe("settings-validation", () => {
+  describe("validateSettings", () => {
+    it("should accept valid settings with correct model.name as string", () => {
       const validSettings = {
         model: {
-          name: 'gemini-2.0-flash-exp',
+          name: "gemini-2.0-flash-exp",
           maxSessionTurns: 10,
         },
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
       };
 
@@ -31,7 +31,7 @@ describe('settings-validation', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should reject model.name as object instead of string', () => {
+    it("should reject model.name as object instead of string", () => {
       const invalidSettings = {
         model: {
           name: {
@@ -47,12 +47,12 @@ describe('settings-validation', () => {
       if (result.error) {
         const issues = result.error.issues;
         expect(issues.length).toBeGreaterThan(0);
-        expect(issues[0]?.path).toEqual(['model', 'name']);
-        expect(issues[0]?.code).toBe('invalid_type');
+        expect(issues[0]?.path).toEqual(["model", "name"]);
+        expect(issues[0]?.code).toBe("invalid_type");
       }
     });
 
-    it('should accept valid model.summarizeToolOutput structure', () => {
+    it("should accept valid model.summarizeToolOutput structure", () => {
       const validSettings = {
         model: {
           summarizeToolOutput: {
@@ -67,7 +67,7 @@ describe('settings-validation', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should reject invalid model.summarizeToolOutput structure', () => {
+    it("should reject invalid model.summarizeToolOutput structure", () => {
       const invalidSettings = {
         model: {
           summarizeToolOutput: {
@@ -85,7 +85,7 @@ describe('settings-validation', () => {
       // Now test with wrong type (string instead of object)
       const actuallyInvalidSettings = {
         model: {
-          summarizeToolOutput: 'invalid',
+          summarizeToolOutput: "invalid",
         },
       };
 
@@ -96,15 +96,15 @@ describe('settings-validation', () => {
       }
     });
 
-    it('should accept empty settings object', () => {
+    it("should accept empty settings object", () => {
       const emptySettings = {};
       const result = validateSettings(emptySettings);
       expect(result.success).toBe(true);
     });
 
-    it('should accept unknown top-level keys (for migration compatibility)', () => {
+    it("should accept unknown top-level keys (for migration compatibility)", () => {
       const settingsWithUnknownKey = {
-        unknownKey: 'some value',
+        unknownKey: "some value",
       };
 
       const result = validateSettings(settingsWithUnknownKey);
@@ -112,10 +112,10 @@ describe('settings-validation', () => {
       // Unknown keys are allowed via .passthrough() for migration scenarios
     });
 
-    it('should accept nested valid settings', () => {
+    it("should accept nested valid settings", () => {
       const validSettings = {
         ui: {
-          theme: 'dark',
+          theme: "dark",
           hideWindowTitle: true,
           footer: {
             hideCWD: false,
@@ -123,7 +123,7 @@ describe('settings-validation', () => {
           },
         },
         tools: {
-          sandbox: 'inherit',
+          sandbox: "inherit",
           autoAccept: false,
         },
       };
@@ -132,14 +132,14 @@ describe('settings-validation', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should validate array types correctly', () => {
+    it("should validate array types correctly", () => {
       const validSettings = {
         tools: {
-          allowed: ['git', 'npm'],
-          exclude: ['dangerous-tool'],
+          allowed: ["git", "npm"],
+          exclude: ["dangerous-tool"],
         },
         context: {
-          includeDirectories: ['/path/1', '/path/2'],
+          includeDirectories: ["/path/1", "/path/2"],
         },
       };
 
@@ -147,10 +147,10 @@ describe('settings-validation', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should reject invalid types in arrays', () => {
+    it("should reject invalid types in arrays", () => {
       const invalidSettings = {
         tools: {
-          allowed: ['git', 123],
+          allowed: ["git", 123],
         },
       };
 
@@ -158,7 +158,7 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
     });
 
-    it('should validate boolean fields correctly', () => {
+    it("should validate boolean fields correctly", () => {
       const validSettings = {
         general: {
           vimMode: true,
@@ -170,10 +170,10 @@ describe('settings-validation', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should reject non-boolean values for boolean fields', () => {
+    it("should reject non-boolean values for boolean fields", () => {
       const invalidSettings = {
         general: {
-          vimMode: 'yes',
+          vimMode: "yes",
         },
       };
 
@@ -181,7 +181,7 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
     });
 
-    it('should validate number fields correctly', () => {
+    it("should validate number fields correctly", () => {
       const validSettings = {
         model: {
           maxSessionTurns: 50,
@@ -193,14 +193,14 @@ describe('settings-validation', () => {
       expect(result.success).toBe(true);
     });
 
-    it('should validate complex nested mcpServers configuration', () => {
+    it("should validate complex nested mcpServers configuration", () => {
       const invalidSettings = {
         mcpServers: {
-          'my-server': {
+          "my-server": {
             command: 123, // Should be string
-            args: ['arg1'],
+            args: ["arg1"],
             env: {
-              VAR: 'value',
+              VAR: "value",
             },
           },
         },
@@ -211,23 +211,21 @@ describe('settings-validation', () => {
       if (result.error) {
         expect(result.error.issues.length).toBeGreaterThan(0);
         // Path should be mcpServers.my-server.command
-        const issue = result.error.issues.find((i) =>
-          i.path.includes('command'),
-        );
+        const issue = result.error.issues.find((i) => i.path.includes("command"));
         expect(issue).toBeDefined();
-        expect(issue?.code).toBe('invalid_type');
+        expect(issue?.code).toBe("invalid_type");
       }
     });
 
-    it('should validate complex nested customThemes configuration', () => {
+    it("should validate complex nested customThemes configuration", () => {
       const invalidSettings = {
         ui: {
           customThemes: {
-            'my-theme': {
-              type: 'custom',
+            "my-theme": {
+              type: "custom",
               // Missing 'name' property which is required
               text: {
-                primary: '#ffffff',
+                primary: "#ffffff",
               },
             },
           },
@@ -240,15 +238,15 @@ describe('settings-validation', () => {
         expect(result.error.issues.length).toBeGreaterThan(0);
         // Should complain about missing 'name'
         const issue = result.error.issues.find(
-          (i) => i.code === 'invalid_type' && i.message.includes('Required'),
+          (i) => i.code === "invalid_type" && i.message.includes("Required"),
         );
         expect(issue).toBeDefined();
       }
     });
   });
 
-  describe('formatValidationError', () => {
-    it('should format error with file path and helpful message for model.name', () => {
+  describe("formatValidationError", () => {
+    it("should format error with file path and helpful message for model.name", () => {
       const invalidSettings = {
         model: {
           name: {
@@ -261,27 +259,20 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
 
       if (result.error) {
-        const formatted = formatValidationError(
-          result.error,
-          '/path/to/settings.json',
-        );
+        const formatted = formatValidationError(result.error, "/path/to/settings.json");
 
-        expect(formatted).toContain('/path/to/settings.json');
-        expect(formatted).toContain('model.name');
-        expect(formatted).toContain('Expected: string, but received: object');
-        expect(formatted).toContain(
-          'Please fix the configuration and try again.',
-        );
-        expect(formatted).toContain(
-          'https://github.com/google-gemini/gemini-cli',
-        );
+        expect(formatted).toContain("/path/to/settings.json");
+        expect(formatted).toContain("model.name");
+        expect(formatted).toContain("Expected: string, but received: object");
+        expect(formatted).toContain("Please fix the configuration and try again.");
+        expect(formatted).toContain("https://github.com/google-gemini/gemini-cli");
       }
     });
 
-    it('should format error for model.summarizeToolOutput', () => {
+    it("should format error for model.summarizeToolOutput", () => {
       const invalidSettings = {
         model: {
-          summarizeToolOutput: 'wrong type',
+          summarizeToolOutput: "wrong type",
         },
       };
 
@@ -289,20 +280,17 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
 
       if (result.error) {
-        const formatted = formatValidationError(
-          result.error,
-          '~/.gemini/settings.json',
-        );
+        const formatted = formatValidationError(result.error, "~/.gemini/settings.json");
 
-        expect(formatted).toContain('~/.gemini/settings.json');
-        expect(formatted).toContain('model.summarizeToolOutput');
+        expect(formatted).toContain("~/.gemini/settings.json");
+        expect(formatted).toContain("model.summarizeToolOutput");
       }
     });
 
-    it('should include link to documentation', () => {
+    it("should include link to documentation", () => {
       const invalidSettings = {
         model: {
-          name: { invalid: 'object' }, // model.name should be a string
+          name: { invalid: "object" }, // model.name should be a string
         },
       };
 
@@ -310,20 +298,18 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
 
       if (result.error) {
-        const formatted = formatValidationError(result.error, 'test.json');
+        const formatted = formatValidationError(result.error, "test.json");
 
-        expect(formatted).toContain(
-          'https://github.com/google-gemini/gemini-cli',
-        );
-        expect(formatted).toContain('configuration.md');
+        expect(formatted).toContain("https://github.com/google-gemini/gemini-cli");
+        expect(formatted).toContain("configuration.md");
       }
     });
 
-    it('should list all validation errors', () => {
+    it("should list all validation errors", () => {
       const invalidSettings = {
         model: {
-          name: { invalid: 'object' },
-          maxSessionTurns: 'not a number',
+          name: { invalid: "object" },
+          maxSessionTurns: "not a number",
         },
       };
 
@@ -331,17 +317,17 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
 
       if (result.error) {
-        const formatted = formatValidationError(result.error, 'test.json');
+        const formatted = formatValidationError(result.error, "test.json");
 
         // Should have multiple errors listed
         expect(formatted.match(/Error in:/g)?.length).toBeGreaterThan(1);
       }
     });
 
-    it('should format array paths correctly (e.g. tools.allowed[0])', () => {
+    it("should format array paths correctly (e.g. tools.allowed[0])", () => {
       const invalidSettings = {
         tools: {
-          allowed: ['git', 123], // 123 is invalid, expected string
+          allowed: ["git", 123], // 123 is invalid, expected string
         },
       };
 
@@ -349,12 +335,12 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
 
       if (result.error) {
-        const formatted = formatValidationError(result.error, 'test.json');
-        expect(formatted).toContain('tools.allowed[1]');
+        const formatted = formatValidationError(result.error, "test.json");
+        expect(formatted).toContain("tools.allowed[1]");
       }
     });
 
-    it('should limit the number of displayed errors', () => {
+    it("should limit the number of displayed errors", () => {
       const invalidSettings = {
         tools: {
           // Create 6 invalid items to trigger the limit
@@ -366,29 +352,29 @@ describe('settings-validation', () => {
       expect(result.success).toBe(false);
 
       if (result.error) {
-        const formatted = formatValidationError(result.error, 'test.json');
+        const formatted = formatValidationError(result.error, "test.json");
         // Should see the first 5
-        expect(formatted).toContain('tools.allowed[0]');
-        expect(formatted).toContain('tools.allowed[4]');
+        expect(formatted).toContain("tools.allowed[0]");
+        expect(formatted).toContain("tools.allowed[4]");
         // Should NOT see the 6th
-        expect(formatted).not.toContain('tools.allowed[5]');
+        expect(formatted).not.toContain("tools.allowed[5]");
         // Should see the summary
-        expect(formatted).toContain('...and 1 more errors.');
+        expect(formatted).toContain("...and 1 more errors.");
       }
     });
   });
 
-  describe('settingsZodSchema', () => {
-    it('should be a valid Zod object schema', () => {
+  describe("settingsZodSchema", () => {
+    it("should be a valid Zod object schema", () => {
       expect(settingsZodSchema).toBeInstanceOf(z.ZodObject);
     });
 
-    it('should have optional fields', () => {
+    it("should have optional fields", () => {
       // All top-level fields should be optional
       const shape = settingsZodSchema.shape;
-      expect(shape['model']).toBeDefined();
-      expect(shape['ui']).toBeDefined();
-      expect(shape['tools']).toBeDefined();
+      expect(shape["model"]).toBeDefined();
+      expect(shape["ui"]).toBeDefined();
+      expect(shape["tools"]).toBeDefined();
 
       // Test that empty object is valid (all fields optional)
       const result = settingsZodSchema.safeParse({});
diff --git a/packages/ui-gemini/src/config/settings-validation.ts b/packages/ui-gemini/src/config/settings-validation.ts
index 17b335156..3ffbd43ce 100644
--- a/packages/ui-gemini/src/config/settings-validation.ts
+++ b/packages/ui-gemini/src/config/settings-validation.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
+import { z } from "zod";
 import {
   getSettingsSchema,
-  type SettingDefinition,
-  type SettingCollectionDefinition,
   SETTINGS_SCHEMA_DEFINITIONS,
-} from './settingsSchema.js';
+  type SettingCollectionDefinition,
+  type SettingDefinition,
+} from "./settingsSchema.js";
 
 // Helper to build Zod schema from the JSON-schema-like definitions
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -22,32 +22,28 @@ function buildZodSchemaFromJsonSchema(def: any): z.ZodTypeAny {
     );
   }
 
-  if (def.type === 'string') {
+  if (def.type === "string") {
     if (def.enum) return z.enum(def.enum as [string, ...string[]]);
     return z.string();
   }
-  if (def.type === 'number') return z.number();
-  if (def.type === 'boolean') return z.boolean();
+  if (def.type === "number") return z.number();
+  if (def.type === "boolean") return z.boolean();
 
-  if (def.type === 'array') {
+  if (def.type === "array") {
     if (def.items) {
       return z.array(buildZodSchemaFromJsonSchema(def.items));
     }
     return z.array(z.unknown());
   }
 
-  if (def.type === 'object') {
+  if (def.type === "object") {
     let schema;
     if (def.properties) {
       const shape: Record<string, z.ZodTypeAny> = {};
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       for (const [key, propDef] of Object.entries(def.properties) as any) {
         let propSchema = buildZodSchemaFromJsonSchema(propDef);
-        if (
-          def.required &&
-          Array.isArray(def.required) &&
-          def.required.includes(key)
-        ) {
+        if (def.required && Array.isArray(def.required) && def.required.includes(key)) {
           // keep it required
         } else {
           propSchema = propSchema.optional();
@@ -61,10 +57,8 @@ function buildZodSchemaFromJsonSchema(def: any): z.ZodTypeAny {
 
     if (def.additionalProperties === false) {
       schema = schema.strict();
-    } else if (typeof def.additionalProperties === 'object') {
-      schema = schema.catchall(
-        buildZodSchemaFromJsonSchema(def.additionalProperties),
-      );
+    } else if (typeof def.additionalProperties === "object") {
+      schema = schema.catchall(buildZodSchemaFromJsonSchema(def.additionalProperties));
     }
 
     return schema;
@@ -80,14 +74,12 @@ function buildEnumSchema(
   options: ReadonlyArray<{ value: string | number | boolean; label: string }>,
 ): z.ZodTypeAny {
   if (!options || options.length === 0) {
-    throw new Error(
-      `Enum type must have options defined. Check your settings schema definition.`,
-    );
+    throw new Error(`Enum type must have options defined. Check your settings schema definition.`);
   }
   const values = options.map((opt) => opt.value);
-  if (values.every((v) => typeof v === 'string')) {
+  if (values.every((v) => typeof v === "string")) {
     return z.enum(values as [string, ...string[]]);
-  } else if (values.every((v) => typeof v === 'number')) {
+  } else if (values.every((v) => typeof v === "number")) {
     return z.union(
       values.map((v) => z.literal(v)) as [
         z.ZodLiteral<number>,
@@ -122,15 +114,13 @@ function buildObjectShapeFromProperties(
 /**
  * Builds a Zod schema for primitive types (string, number, boolean)
  */
-function buildPrimitiveSchema(
-  type: 'string' | 'number' | 'boolean',
-): z.ZodTypeAny {
+function buildPrimitiveSchema(type: "string" | "number" | "boolean"): z.ZodTypeAny {
   switch (type) {
-    case 'string':
+    case "string":
       return z.string();
-    case 'number':
+    case "number":
       return z.number();
-    case 'boolean':
+    case "boolean":
       return z.boolean();
     default:
       return z.unknown();
@@ -147,14 +137,12 @@ for (const [name, def] of Object.entries(SETTINGS_SCHEMA_DEFINITIONS)) {
 /**
  * Recursively builds a Zod schema from a SettingDefinition
  */
-function buildZodSchemaFromDefinition(
-  definition: SettingDefinition,
-): z.ZodTypeAny {
+function buildZodSchemaFromDefinition(definition: SettingDefinition): z.ZodTypeAny {
   let baseSchema: z.ZodTypeAny;
 
   // Special handling for TelemetrySettings which can be boolean or object
-  if (definition.ref === 'TelemetrySettings') {
-    const objectSchema = REF_SCHEMAS['TelemetrySettings'];
+  if (definition.ref === "TelemetrySettings") {
+    const objectSchema = REF_SCHEMAS["TelemetrySettings"];
     if (objectSchema) {
       return z.union([z.boolean(), objectSchema]).optional();
     }
@@ -166,18 +154,18 @@ function buildZodSchemaFromDefinition(
   }
 
   switch (definition.type) {
-    case 'string':
-    case 'number':
-    case 'boolean':
+    case "string":
+    case "number":
+    case "boolean":
       baseSchema = buildPrimitiveSchema(definition.type);
       break;
 
-    case 'enum': {
+    case "enum": {
       baseSchema = buildEnumSchema(definition.options!);
       break;
     }
 
-    case 'array':
+    case "array":
       if (definition.items) {
         const itemSchema = buildZodSchemaFromCollection(definition.items);
         baseSchema = z.array(itemSchema);
@@ -186,21 +174,17 @@ function buildZodSchemaFromDefinition(
       }
       break;
 
-    case 'object':
+    case "object":
       if (definition.properties) {
         const shape = buildObjectShapeFromProperties(definition.properties);
         baseSchema = z.object(shape).passthrough();
 
         if (definition.additionalProperties) {
-          const additionalSchema = buildZodSchemaFromCollection(
-            definition.additionalProperties,
-          );
+          const additionalSchema = buildZodSchemaFromCollection(definition.additionalProperties);
           baseSchema = z.object(shape).catchall(additionalSchema);
         }
       } else if (definition.additionalProperties) {
-        const valueSchema = buildZodSchemaFromCollection(
-          definition.additionalProperties,
-        );
+        const valueSchema = buildZodSchemaFromCollection(definition.additionalProperties);
         baseSchema = z.record(z.string(), valueSchema);
       } else {
         baseSchema = z.record(z.string(), z.unknown());
@@ -218,31 +202,29 @@ function buildZodSchemaFromDefinition(
 /**
  * Builds a Zod schema from a SettingCollectionDefinition
  */
-function buildZodSchemaFromCollection(
-  collection: SettingCollectionDefinition,
-): z.ZodTypeAny {
+function buildZodSchemaFromCollection(collection: SettingCollectionDefinition): z.ZodTypeAny {
   if (collection.ref && collection.ref in REF_SCHEMAS) {
     return REF_SCHEMAS[collection.ref];
   }
 
   switch (collection.type) {
-    case 'string':
-    case 'number':
-    case 'boolean':
+    case "string":
+    case "number":
+    case "boolean":
       return buildPrimitiveSchema(collection.type);
 
-    case 'enum': {
+    case "enum": {
       return buildEnumSchema(collection.options!);
     }
 
-    case 'array':
+    case "array":
       if (collection.properties) {
         const shape = buildObjectShapeFromProperties(collection.properties);
         return z.array(z.object(shape));
       }
       return z.array(z.unknown());
 
-    case 'object':
+    case "object":
       if (collection.properties) {
         const shape = buildObjectShapeFromProperties(collection.properties);
         return z.object(shape).passthrough();
@@ -285,13 +267,10 @@ export function validateSettings(data: unknown): {
 /**
  * Format a Zod error into a helpful error message
  */
-export function formatValidationError(
-  error: z.ZodError,
-  filePath: string,
-): string {
+export function formatValidationError(error: z.ZodError, filePath: string): string {
   const lines: string[] = [];
   lines.push(`Invalid configuration in ${filePath}:`);
-  lines.push('');
+  lines.push("");
 
   const MAX_ERRORS_TO_DISPLAY = 5;
   const displayedIssues = error.issues.slice(0, MAX_ERRORS_TO_DISPLAY);
@@ -299,33 +278,29 @@ export function formatValidationError(
   for (const issue of displayedIssues) {
     const path = issue.path.reduce(
       (acc, curr) =>
-        typeof curr === 'number'
-          ? `${acc}[${curr}]`
-          : `${acc ? acc + '.' : ''}${curr}`,
-      '',
+        typeof curr === "number" ? `${acc}[${curr}]` : `${acc ? acc + "." : ""}${curr}`,
+      "",
     );
-    lines.push(`Error in: ${path || '(root)'}`);
+    lines.push(`Error in: ${path || "(root)"}`);
     lines.push(`    ${issue.message}`);
 
-    if (issue.code === 'invalid_type') {
+    if (issue.code === "invalid_type") {
       const expected = issue.expected;
       const received = issue.received;
       lines.push(`Expected: ${expected}, but received: ${received}`);
     }
-    lines.push('');
+    lines.push("");
   }
 
   if (error.issues.length > MAX_ERRORS_TO_DISPLAY) {
-    lines.push(
-      `...and ${error.issues.length - MAX_ERRORS_TO_DISPLAY} more errors.`,
-    );
-    lines.push('');
+    lines.push(`...and ${error.issues.length - MAX_ERRORS_TO_DISPLAY} more errors.`);
+    lines.push("");
   }
 
-  lines.push('Please fix the configuration and try again.');
+  lines.push("Please fix the configuration and try again.");
   lines.push(
-    'See: https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/configuration.md',
+    "See: https://github.com/google-gemini/gemini-cli/blob/main/docs/get-started/configuration.md",
   );
 
-  return lines.join('\n');
+  return lines.join("\n");
 }
diff --git a/packages/ui-gemini/src/config/settings.test.ts b/packages/ui-gemini/src/config/settings.test.ts
index a9ed46289..7e9aa0283 100644
--- a/packages/ui-gemini/src/config/settings.test.ts
+++ b/packages/ui-gemini/src/config/settings.test.ts
@@ -7,20 +7,20 @@
 /// <reference types="vitest/globals" />
 
 // Mock 'os' first.
-import * as osActual from 'node:os'; // Import for type info for the mock factory
+import * as osActual from "node:os"; // Import for type info for the mock factory
 
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof osActual>();
   return {
     ...actualOs,
-    homedir: vi.fn(() => '/mock/home/user'),
-    platform: vi.fn(() => 'linux'),
+    homedir: vi.fn(() => "/mock/home/user"),
+    platform: vi.fn(() => "linux"),
   };
 });
 
 // Mock './settings.js' to ensure it uses the mocked 'os.homedir()' for its internal constants.
-vi.mock('./settings.js', async (importActual) => {
-  const originalModule = await importActual<typeof import('./settings.js')>();
+vi.mock("./settings.js", async (importActual) => {
+  const originalModule = await importActual<typeof import("./settings.js")>();
   return {
     __esModule: true, // Ensure correct module shape
     ...originalModule, // Re-export all original members
@@ -29,59 +29,47 @@ vi.mock('./settings.js', async (importActual) => {
 });
 
 // Mock trustedFolders
-vi.mock('./trustedFolders.js', () => ({
-  isWorkspaceTrusted: vi
-    .fn()
-    .mockReturnValue({ isTrusted: true, source: 'file' }),
+vi.mock("./trustedFolders.js", () => ({
+  isWorkspaceTrusted: vi.fn().mockReturnValue({ isTrusted: true, source: "file" }),
 }));
 
+import * as fs from "node:fs"; // fs will be mocked separately
 // NOW import everything else, including the (now effectively re-exported) settings.js
-import path, * as pathActual from 'node:path'; // Restored for MOCK_WORKSPACE_SETTINGS_PATH
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mocked,
-  type Mock,
-} from 'vitest';
-import * as fs from 'node:fs'; // fs will be mocked separately
-import stripJsonComments from 'strip-json-comments'; // Will be mocked separately
-import { isWorkspaceTrusted } from './trustedFolders.js';
-
+import path, * as pathActual from "node:path"; // Restored for MOCK_WORKSPACE_SETTINGS_PATH
+import { FatalConfigError, GEMINI_DIR } from "@airiscode/gemini-cli-core";
+import stripJsonComments from "strip-json-comments"; // Will be mocked separately
+import { afterEach, beforeEach, describe, expect, it, type Mock, type Mocked, vi } from "vitest";
+import { updateSettingsFilePreservingFormat } from "../utils/commentJson.js";
+import { ExtensionManager } from "./extension-manager.js";
 // These imports will get the versions from the vi.mock('./settings.js', ...) factory.
 import {
-  loadSettings,
-  USER_SETTINGS_PATH, // This IS the mocked path.
-  getSystemSettingsPath,
   getSystemDefaultsPath,
-  migrateSettingsToV1,
-  needsMigration,
-  type Settings,
+  getSystemSettingsPath,
   loadEnvironment,
+  loadSettings,
   migrateDeprecatedSettings,
+  migrateSettingsToV1,
+  needsMigration,
   SettingScope,
-  saveSettings,
+  type Settings,
   type SettingsFile,
-} from './settings.js';
-import { FatalConfigError, GEMINI_DIR } from '@airiscode/gemini-cli-core';
-import { ExtensionManager } from './extension-manager.js';
-import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js';
+  saveSettings,
+  USER_SETTINGS_PATH, // This IS the mocked path.
+} from "./settings.js";
+import { isWorkspaceTrusted } from "./trustedFolders.js";
 
-const MOCK_WORKSPACE_DIR = '/mock/workspace';
+const MOCK_WORKSPACE_DIR = "/mock/workspace";
 // Use the (mocked) GEMINI_DIR for consistency
 const MOCK_WORKSPACE_SETTINGS_PATH = pathActual.join(
   MOCK_WORKSPACE_DIR,
   GEMINI_DIR,
-  'settings.json',
+  "settings.json",
 );
 
 // A more flexible type for test data that allows arbitrary properties.
 type TestSettings = Settings & { [key: string]: unknown };
 
-vi.mock('fs', async (importOriginal) => {
+vi.mock("fs", async (importOriginal) => {
   // Get all the functions from the real 'fs' module
   const actualFs = await importOriginal<typeof fs>();
 
@@ -96,30 +84,29 @@ vi.mock('fs', async (importOriginal) => {
   };
 });
 
-vi.mock('./extension.js');
+vi.mock("./extension.js");
 
 const mockCoreEvents = vi.hoisted(() => ({
   emitFeedback: vi.fn(),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: mockCoreEvents,
   };
 });
 
-vi.mock('../utils/commentJson.js', () => ({
+vi.mock("../utils/commentJson.js", () => ({
   updateSettingsFilePreservingFormat: vi.fn(),
 }));
 
-vi.mock('strip-json-comments', () => ({
+vi.mock("strip-json-comments", () => ({
   default: vi.fn((content) => content),
 }));
 
-describe('Settings Loading and Merging', () => {
+describe("Settings Loading and Merging", () => {
   let mockFsExistsSync: Mocked<typeof fs.existsSync>;
   let mockStripJsonComments: Mocked<typeof stripJsonComments>;
   let mockFsMkdirSync: Mocked<typeof fs.mkdirSync>;
@@ -131,16 +118,16 @@ describe('Settings Loading and Merging', () => {
     mockFsMkdirSync = vi.mocked(fs.mkdirSync);
     mockStripJsonComments = vi.mocked(stripJsonComments);
 
-    vi.mocked(osActual.homedir).mockReturnValue('/mock/home/user');
+    vi.mocked(osActual.homedir).mockReturnValue("/mock/home/user");
     (mockStripJsonComments as unknown as Mock).mockImplementation(
       (jsonString: string) => jsonString,
     );
     (mockFsExistsSync as Mock).mockReturnValue(false);
-    (fs.readFileSync as Mock).mockReturnValue('{}'); // Return valid empty JSON
+    (fs.readFileSync as Mock).mockReturnValue("{}"); // Return valid empty JSON
     (mockFsMkdirSync as Mock).mockImplementation(() => undefined);
     vi.mocked(isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
   });
 
@@ -148,8 +135,8 @@ describe('Settings Loading and Merging', () => {
     vi.restoreAllMocks();
   });
 
-  describe('loadSettings', () => {
-    it('should load empty settings if no files exist', () => {
+  describe("loadSettings", () => {
+    it("should load empty settings if no files exist", () => {
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.system.settings).toEqual({});
       expect(settings.user.settings).toEqual({});
@@ -159,53 +146,44 @@ describe('Settings Loading and Merging', () => {
 
     it.each([
       {
-        scope: 'system',
+        scope: "system",
         path: getSystemSettingsPath(),
         content: {
-          ui: { theme: 'system-default' },
+          ui: { theme: "system-default" },
           tools: { sandbox: false },
         },
       },
       {
-        scope: 'user',
+        scope: "user",
         path: USER_SETTINGS_PATH,
         content: {
-          ui: { theme: 'dark' },
-          context: { fileName: 'USER_CONTEXT.md' },
+          ui: { theme: "dark" },
+          context: { fileName: "USER_CONTEXT.md" },
         },
       },
       {
-        scope: 'workspace',
+        scope: "workspace",
         path: MOCK_WORKSPACE_SETTINGS_PATH,
         content: {
           tools: { sandbox: true },
-          context: { fileName: 'WORKSPACE_CONTEXT.md' },
+          context: { fileName: "WORKSPACE_CONTEXT.md" },
         },
       },
-    ])(
-      'should load $scope settings if only $scope file exists',
-      ({ scope, path, content }) => {
-        (mockFsExistsSync as Mock).mockImplementation(
-          (p: fs.PathLike) => p === path,
-        );
-        (fs.readFileSync as Mock).mockImplementation(
-          (p: fs.PathOrFileDescriptor) => {
-            if (p === path) return JSON.stringify(content);
-            return '{}';
-          },
-        );
+    ])("should load $scope settings if only $scope file exists", ({ scope, path, content }) => {
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === path);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === path) return JSON.stringify(content);
+        return "{}";
+      });
 
-        const settings = loadSettings(MOCK_WORKSPACE_DIR);
+      const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
-        expect(fs.readFileSync).toHaveBeenCalledWith(path, 'utf-8');
-        expect(
-          settings[scope as 'system' | 'user' | 'workspace'].settings,
-        ).toEqual(content);
-        expect(settings.merged).toEqual(content);
-      },
-    );
+      expect(fs.readFileSync).toHaveBeenCalledWith(path, "utf-8");
+      expect(settings[scope as "system" | "user" | "workspace"].settings).toEqual(content);
+      expect(settings.merged).toEqual(content);
+    });
 
-    it('should merge system, user and workspace settings, with system taking precedence over workspace, and workspace over user', () => {
+    it("should merge system, user and workspace settings, with system taking precedence over workspace, and workspace over user", () => {
       (mockFsExistsSync as Mock).mockImplementation(
         (p: fs.PathLike) =>
           p === getSystemSettingsPath() ||
@@ -214,51 +192,46 @@ describe('Settings Loading and Merging', () => {
       );
       const systemSettingsContent = {
         ui: {
-          theme: 'system-theme',
+          theme: "system-theme",
         },
         tools: {
           sandbox: false,
         },
         mcp: {
-          allowed: ['server1', 'server2'],
+          allowed: ["server1", "server2"],
         },
         telemetry: { enabled: false },
       };
       const userSettingsContent = {
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
         tools: {
           sandbox: true,
         },
         context: {
-          fileName: 'USER_CONTEXT.md',
+          fileName: "USER_CONTEXT.md",
         },
       };
       const workspaceSettingsContent = {
         tools: {
           sandbox: false,
-          core: ['tool1'],
+          core: ["tool1"],
         },
         context: {
-          fileName: 'WORKSPACE_CONTEXT.md',
+          fileName: "WORKSPACE_CONTEXT.md",
         },
         mcp: {
-          allowed: ['server1', 'server2', 'server3'],
+          allowed: ["server1", "server2", "server3"],
         },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
@@ -267,175 +240,155 @@ describe('Settings Loading and Merging', () => {
       expect(settings.workspace.settings).toEqual(workspaceSettingsContent);
       expect(settings.merged).toEqual({
         ui: {
-          theme: 'system-theme',
+          theme: "system-theme",
         },
         tools: {
           sandbox: false,
-          core: ['tool1'],
+          core: ["tool1"],
         },
         telemetry: { enabled: false },
         context: {
-          fileName: 'WORKSPACE_CONTEXT.md',
+          fileName: "WORKSPACE_CONTEXT.md",
         },
         mcp: {
-          allowed: ['server1', 'server2'],
+          allowed: ["server1", "server2"],
         },
       });
     });
 
-    it('should correctly migrate a complex legacy (v1) settings file', () => {
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
+    it("should correctly migrate a complex legacy (v1) settings file", () => {
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
       const legacySettingsContent = {
-        theme: 'legacy-dark',
+        theme: "legacy-dark",
         vimMode: true,
-        contextFileName: 'LEGACY_CONTEXT.md',
-        model: 'gemini-pro',
+        contextFileName: "LEGACY_CONTEXT.md",
+        model: "gemini-pro",
         mcpServers: {
-          'legacy-server-1': {
-            command: 'npm',
-            args: ['run', 'start:server1'],
-            description: 'Legacy Server 1',
+          "legacy-server-1": {
+            command: "npm",
+            args: ["run", "start:server1"],
+            description: "Legacy Server 1",
           },
-          'legacy-server-2': {
-            command: 'node',
-            args: ['server2.js'],
-            description: 'Legacy Server 2',
+          "legacy-server-2": {
+            command: "node",
+            args: ["server2.js"],
+            description: "Legacy Server 2",
           },
         },
-        allowMCPServers: ['legacy-server-1'],
-        someUnrecognizedSetting: 'should-be-preserved',
+        allowMCPServers: ["legacy-server-1"],
+        someUnrecognizedSetting: "should-be-preserved",
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(legacySettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(legacySettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.merged).toEqual({
         ui: {
-          theme: 'legacy-dark',
+          theme: "legacy-dark",
         },
         general: {
           vimMode: true,
         },
         context: {
-          fileName: 'LEGACY_CONTEXT.md',
+          fileName: "LEGACY_CONTEXT.md",
         },
         model: {
-          name: 'gemini-pro',
+          name: "gemini-pro",
         },
         mcpServers: {
-          'legacy-server-1': {
-            command: 'npm',
-            args: ['run', 'start:server1'],
-            description: 'Legacy Server 1',
+          "legacy-server-1": {
+            command: "npm",
+            args: ["run", "start:server1"],
+            description: "Legacy Server 1",
           },
-          'legacy-server-2': {
-            command: 'node',
-            args: ['server2.js'],
-            description: 'Legacy Server 2',
+          "legacy-server-2": {
+            command: "node",
+            args: ["server2.js"],
+            description: "Legacy Server 2",
           },
         },
         mcp: {
-          allowed: ['legacy-server-1'],
+          allowed: ["legacy-server-1"],
         },
-        someUnrecognizedSetting: 'should-be-preserved',
+        someUnrecognizedSetting: "should-be-preserved",
       });
     });
 
-    it('should rewrite allowedTools to tools.allowed during migration', () => {
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
+    it("should rewrite allowedTools to tools.allowed during migration", () => {
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
       const legacySettingsContent = {
-        allowedTools: ['fs', 'shell'],
+        allowedTools: ["fs", "shell"],
       };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(legacySettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(legacySettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
-      expect(settings.merged.tools?.allowed).toEqual(['fs', 'shell']);
-      expect((settings.merged as TestSettings)['allowedTools']).toBeUndefined();
+      expect(settings.merged.tools?.allowed).toEqual(["fs", "shell"]);
+      expect((settings.merged as TestSettings)["allowedTools"]).toBeUndefined();
     });
 
-    it('should correctly merge and migrate legacy array properties from multiple scopes', () => {
+    it("should correctly merge and migrate legacy array properties from multiple scopes", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const legacyUserSettings = {
-        includeDirectories: ['/user/dir'],
-        excludeTools: ['user-tool'],
-        excludedProjectEnvVars: ['USER_VAR'],
+        includeDirectories: ["/user/dir"],
+        excludeTools: ["user-tool"],
+        excludedProjectEnvVars: ["USER_VAR"],
       };
       const legacyWorkspaceSettings = {
-        includeDirectories: ['/workspace/dir'],
-        excludeTools: ['workspace-tool'],
-        excludedProjectEnvVars: ['WORKSPACE_VAR', 'USER_VAR'],
+        includeDirectories: ["/workspace/dir"],
+        excludeTools: ["workspace-tool"],
+        excludedProjectEnvVars: ["WORKSPACE_VAR", "USER_VAR"],
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(legacyUserSettings);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(legacyWorkspaceSettings);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(legacyUserSettings);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(legacyWorkspaceSettings);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       // Verify includeDirectories are concatenated
-      expect(settings.merged.context?.includeDirectories).toEqual([
-        '/user/dir',
-        '/workspace/dir',
-      ]);
+      expect(settings.merged.context?.includeDirectories).toEqual(["/user/dir", "/workspace/dir"]);
 
       // Verify excludeTools are concatenated and de-duped
-      expect(settings.merged.tools?.exclude).toEqual([
-        'user-tool',
-        'workspace-tool',
-      ]);
+      expect(settings.merged.tools?.exclude).toEqual(["user-tool", "workspace-tool"]);
 
       // Verify excludedProjectEnvVars are concatenated and de-duped
       expect(settings.merged.advanced?.excludedEnvVars).toEqual(
-        expect.arrayContaining(['USER_VAR', 'WORKSPACE_VAR']),
+        expect.arrayContaining(["USER_VAR", "WORKSPACE_VAR"]),
       );
       expect(settings.merged.advanced?.excludedEnvVars).toHaveLength(2);
     });
 
-    it('should merge all settings files with the correct precedence', () => {
+    it("should merge all settings files with the correct precedence", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const systemDefaultsContent = {
         ui: {
-          theme: 'default-theme',
+          theme: "default-theme",
         },
         tools: {
           sandbox: true,
         },
         telemetry: true,
         context: {
-          includeDirectories: ['/system/defaults/dir'],
+          includeDirectories: ["/system/defaults/dir"],
         },
       };
       const userSettingsContent = {
         ui: {
-          theme: 'user-theme',
+          theme: "user-theme",
         },
         context: {
-          fileName: 'USER_CONTEXT.md',
-          includeDirectories: ['/user/dir1', '/user/dir2'],
+          fileName: "USER_CONTEXT.md",
+          includeDirectories: ["/user/dir1", "/user/dir2"],
         },
       };
       const workspaceSettingsContent = {
@@ -443,33 +396,27 @@ describe('Settings Loading and Merging', () => {
           sandbox: false,
         },
         context: {
-          fileName: 'WORKSPACE_CONTEXT.md',
-          includeDirectories: ['/workspace/dir'],
+          fileName: "WORKSPACE_CONTEXT.md",
+          includeDirectories: ["/workspace/dir"],
         },
       };
       const systemSettingsContent = {
         ui: {
-          theme: 'system-theme',
+          theme: "system-theme",
         },
         telemetry: false,
         context: {
-          includeDirectories: ['/system/dir'],
+          includeDirectories: ["/system/dir"],
         },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemDefaultsPath())
-            return JSON.stringify(systemDefaultsContent);
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemDefaultsPath()) return JSON.stringify(systemDefaultsContent);
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
@@ -479,13 +426,13 @@ describe('Settings Loading and Merging', () => {
       expect(settings.workspace.settings).toEqual(workspaceSettingsContent);
       expect(settings.merged).toEqual({
         context: {
-          fileName: 'WORKSPACE_CONTEXT.md',
+          fileName: "WORKSPACE_CONTEXT.md",
           includeDirectories: [
-            '/system/defaults/dir',
-            '/user/dir1',
-            '/user/dir2',
-            '/workspace/dir',
-            '/system/dir',
+            "/system/defaults/dir",
+            "/user/dir1",
+            "/user/dir2",
+            "/workspace/dir",
+            "/system/dir",
           ],
         },
         telemetry: false,
@@ -493,12 +440,12 @@ describe('Settings Loading and Merging', () => {
           sandbox: false,
         },
         ui: {
-          theme: 'system-theme',
+          theme: "system-theme",
         },
       });
     });
 
-    it('should use folderTrust from workspace settings when trusted', () => {
+    it("should use folderTrust from workspace settings when trusted", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = {
         security: {
@@ -518,23 +465,18 @@ describe('Settings Loading and Merging', () => {
         // No folderTrust here
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.security?.folderTrust?.enabled).toBe(false); // Workspace setting should be used
     });
 
-    it('should use system folderTrust over user setting', () => {
+    it("should use system folderTrust over user setting", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = {
         security: {
@@ -558,23 +500,18 @@ describe('Settings Loading and Merging', () => {
         },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.security?.folderTrust?.enabled).toBe(true); // System setting should be used
     });
 
-    it('should not allow user or workspace to override system disableYoloMode', () => {
+    it("should not allow user or workspace to override system disableYoloMode", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = {
         security: {
@@ -592,17 +529,12 @@ describe('Settings Loading and Merging', () => {
         },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.security?.disableYoloMode).toBe(true); // System setting should be used
@@ -610,122 +542,105 @@ describe('Settings Loading and Merging', () => {
 
     it.each([
       {
-        description: 'contextFileName in user settings',
+        description: "contextFileName in user settings",
         path: USER_SETTINGS_PATH,
-        content: { context: { fileName: 'CUSTOM.md' } },
-        expected: { key: 'context.fileName', value: 'CUSTOM.md' },
+        content: { context: { fileName: "CUSTOM.md" } },
+        expected: { key: "context.fileName", value: "CUSTOM.md" },
       },
       {
-        description: 'contextFileName in workspace settings',
+        description: "contextFileName in workspace settings",
         path: MOCK_WORKSPACE_SETTINGS_PATH,
-        content: { context: { fileName: 'PROJECT_SPECIFIC.md' } },
-        expected: { key: 'context.fileName', value: 'PROJECT_SPECIFIC.md' },
+        content: { context: { fileName: "PROJECT_SPECIFIC.md" } },
+        expected: { key: "context.fileName", value: "PROJECT_SPECIFIC.md" },
       },
       {
-        description: 'excludedProjectEnvVars in user settings',
+        description: "excludedProjectEnvVars in user settings",
         path: USER_SETTINGS_PATH,
         content: {
-          advanced: { excludedEnvVars: ['DEBUG', 'NODE_ENV', 'CUSTOM_VAR'] },
+          advanced: { excludedEnvVars: ["DEBUG", "NODE_ENV", "CUSTOM_VAR"] },
         },
         expected: {
-          key: 'advanced.excludedEnvVars',
-          value: ['DEBUG', 'NODE_ENV', 'CUSTOM_VAR'],
+          key: "advanced.excludedEnvVars",
+          value: ["DEBUG", "NODE_ENV", "CUSTOM_VAR"],
         },
       },
       {
-        description: 'excludedProjectEnvVars in workspace settings',
+        description: "excludedProjectEnvVars in workspace settings",
         path: MOCK_WORKSPACE_SETTINGS_PATH,
         content: {
-          advanced: { excludedEnvVars: ['WORKSPACE_DEBUG', 'WORKSPACE_VAR'] },
+          advanced: { excludedEnvVars: ["WORKSPACE_DEBUG", "WORKSPACE_VAR"] },
         },
         expected: {
-          key: 'advanced.excludedEnvVars',
-          value: ['WORKSPACE_DEBUG', 'WORKSPACE_VAR'],
+          key: "advanced.excludedEnvVars",
+          value: ["WORKSPACE_DEBUG", "WORKSPACE_VAR"],
         },
       },
-    ])(
-      'should handle $description correctly',
-      ({ path, content, expected }) => {
-        (mockFsExistsSync as Mock).mockImplementation(
-          (p: fs.PathLike) => p === path,
-        );
-        (fs.readFileSync as Mock).mockImplementation(
-          (p: fs.PathOrFileDescriptor) => {
-            if (p === path) return JSON.stringify(content);
-            return '{}';
-          },
-        );
+    ])("should handle $description correctly", ({ path, content, expected }) => {
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === path);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === path) return JSON.stringify(content);
+        return "{}";
+      });
 
-        const settings = loadSettings(MOCK_WORKSPACE_DIR);
-        const keys = expected.key.split('.');
-        let result: unknown = settings.merged;
-        for (const key of keys) {
-          result = (result as { [key: string]: unknown })[key];
-        }
-        expect(result).toEqual(expected.value);
-      },
-    );
+      const settings = loadSettings(MOCK_WORKSPACE_DIR);
+      const keys = expected.key.split(".");
+      let result: unknown = settings.merged;
+      for (const key of keys) {
+        result = (result as { [key: string]: unknown })[key];
+      }
+      expect(result).toEqual(expected.value);
+    });
 
-    it('should merge excludedProjectEnvVars with workspace taking precedence over user', () => {
+    it("should merge excludedProjectEnvVars with workspace taking precedence over user", () => {
       (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) =>
-          p === USER_SETTINGS_PATH || p === MOCK_WORKSPACE_SETTINGS_PATH,
+        (p: fs.PathLike) => p === USER_SETTINGS_PATH || p === MOCK_WORKSPACE_SETTINGS_PATH,
       );
       const userSettingsContent = {
         general: {},
-        advanced: { excludedEnvVars: ['DEBUG', 'NODE_ENV', 'USER_VAR'] },
+        advanced: { excludedEnvVars: ["DEBUG", "NODE_ENV", "USER_VAR"] },
       };
       const workspaceSettingsContent = {
         general: {},
-        advanced: { excludedEnvVars: ['WORKSPACE_DEBUG', 'WORKSPACE_VAR'] },
+        advanced: { excludedEnvVars: ["WORKSPACE_DEBUG", "WORKSPACE_VAR"] },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.user.settings.advanced?.excludedEnvVars).toEqual([
-        'DEBUG',
-        'NODE_ENV',
-        'USER_VAR',
+        "DEBUG",
+        "NODE_ENV",
+        "USER_VAR",
       ]);
       expect(settings.workspace.settings.advanced?.excludedEnvVars).toEqual([
-        'WORKSPACE_DEBUG',
-        'WORKSPACE_VAR',
+        "WORKSPACE_DEBUG",
+        "WORKSPACE_VAR",
       ]);
       expect(settings.merged.advanced?.excludedEnvVars).toEqual([
-        'DEBUG',
-        'NODE_ENV',
-        'USER_VAR',
-        'WORKSPACE_DEBUG',
-        'WORKSPACE_VAR',
+        "DEBUG",
+        "NODE_ENV",
+        "USER_VAR",
+        "WORKSPACE_DEBUG",
+        "WORKSPACE_VAR",
       ]);
     });
 
-    it('should default contextFileName to undefined if not in any settings file', () => {
+    it("should default contextFileName to undefined if not in any settings file", () => {
       (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) =>
-          p === USER_SETTINGS_PATH || p === MOCK_WORKSPACE_SETTINGS_PATH,
+        (p: fs.PathLike) => p === USER_SETTINGS_PATH || p === MOCK_WORKSPACE_SETTINGS_PATH,
       );
-      const userSettingsContent = { ui: { theme: 'dark' } };
+      const userSettingsContent = { ui: { theme: "dark" } };
       const workspaceSettingsContent = { tools: { sandbox: true } };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.context?.fileName).toBeUndefined();
@@ -733,339 +648,300 @@ describe('Settings Loading and Merging', () => {
 
     it.each([
       {
-        scope: 'user',
+        scope: "user",
         path: USER_SETTINGS_PATH,
         content: { telemetry: { enabled: true } },
         expected: true,
       },
       {
-        scope: 'workspace',
+        scope: "workspace",
         path: MOCK_WORKSPACE_SETTINGS_PATH,
         content: { telemetry: { enabled: false } },
         expected: false,
       },
-    ])(
-      'should load telemetry setting from $scope settings',
-      ({ path, content, expected }) => {
-        (mockFsExistsSync as Mock).mockImplementation(
-          (p: fs.PathLike) => p === path,
-        );
-        (fs.readFileSync as Mock).mockImplementation(
-          (p: fs.PathOrFileDescriptor) => {
-            if (p === path) return JSON.stringify(content);
-            return '{}';
-          },
-        );
-        const settings = loadSettings(MOCK_WORKSPACE_DIR);
-        expect(settings.merged.telemetry?.enabled).toBe(expected);
-      },
-    );
+    ])("should load telemetry setting from $scope settings", ({ path, content, expected }) => {
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === path);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === path) return JSON.stringify(content);
+        return "{}";
+      });
+      const settings = loadSettings(MOCK_WORKSPACE_DIR);
+      expect(settings.merged.telemetry?.enabled).toBe(expected);
+    });
 
-    it('should prioritize workspace telemetry setting over user setting', () => {
+    it("should prioritize workspace telemetry setting over user setting", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = { telemetry: { enabled: true } };
       const workspaceSettingsContent = { telemetry: { enabled: false } };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.telemetry?.enabled).toBe(false);
     });
 
-    it('should have telemetry as undefined if not in any settings file', () => {
+    it("should have telemetry as undefined if not in any settings file", () => {
       (mockFsExistsSync as Mock).mockReturnValue(false); // No settings files exist
-      (fs.readFileSync as Mock).mockReturnValue('{}');
+      (fs.readFileSync as Mock).mockReturnValue("{}");
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.telemetry).toBeUndefined();
       expect(settings.merged.ui).toBeUndefined();
       expect(settings.merged.mcpServers).toBeUndefined();
     });
 
-    it('should merge MCP servers correctly, with workspace taking precedence', () => {
+    it("should merge MCP servers correctly, with workspace taking precedence", () => {
       (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) =>
-          p === USER_SETTINGS_PATH || p === MOCK_WORKSPACE_SETTINGS_PATH,
+        (p: fs.PathLike) => p === USER_SETTINGS_PATH || p === MOCK_WORKSPACE_SETTINGS_PATH,
       );
       const userSettingsContent = {
         mcpServers: {
-          'user-server': {
-            command: 'user-command',
-            args: ['--user-arg'],
-            description: 'User MCP server',
+          "user-server": {
+            command: "user-command",
+            args: ["--user-arg"],
+            description: "User MCP server",
           },
-          'shared-server': {
-            command: 'user-shared-command',
-            description: 'User shared server config',
+          "shared-server": {
+            command: "user-shared-command",
+            description: "User shared server config",
           },
         },
       };
       const workspaceSettingsContent = {
         mcpServers: {
-          'workspace-server': {
-            command: 'workspace-command',
-            args: ['--workspace-arg'],
-            description: 'Workspace MCP server',
+          "workspace-server": {
+            command: "workspace-command",
+            args: ["--workspace-arg"],
+            description: "Workspace MCP server",
           },
-          'shared-server': {
-            command: 'workspace-shared-command',
-            description: 'Workspace shared server config',
+          "shared-server": {
+            command: "workspace-shared-command",
+            description: "Workspace shared server config",
           },
         },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.user.settings).toEqual(userSettingsContent);
       expect(settings.workspace.settings).toEqual(workspaceSettingsContent);
       expect(settings.merged.mcpServers).toEqual({
-        'user-server': {
-          command: 'user-command',
-          args: ['--user-arg'],
-          description: 'User MCP server',
+        "user-server": {
+          command: "user-command",
+          args: ["--user-arg"],
+          description: "User MCP server",
         },
-        'workspace-server': {
-          command: 'workspace-command',
-          args: ['--workspace-arg'],
-          description: 'Workspace MCP server',
+        "workspace-server": {
+          command: "workspace-command",
+          args: ["--workspace-arg"],
+          description: "Workspace MCP server",
         },
-        'shared-server': {
-          command: 'workspace-shared-command',
-          description: 'Workspace shared server config',
+        "shared-server": {
+          command: "workspace-shared-command",
+          description: "Workspace shared server config",
         },
       });
     });
 
     it.each([
       {
-        scope: 'user',
+        scope: "user",
         path: USER_SETTINGS_PATH,
         content: {
           mcpServers: {
-            'user-only-server': {
-              command: 'user-only-command',
-              description: 'User only server',
+            "user-only-server": {
+              command: "user-only-command",
+              description: "User only server",
             },
           },
         },
         expected: {
-          'user-only-server': {
-            command: 'user-only-command',
-            description: 'User only server',
+          "user-only-server": {
+            command: "user-only-command",
+            description: "User only server",
           },
         },
       },
       {
-        scope: 'workspace',
+        scope: "workspace",
         path: MOCK_WORKSPACE_SETTINGS_PATH,
         content: {
           mcpServers: {
-            'workspace-only-server': {
-              command: 'workspace-only-command',
-              description: 'Workspace only server',
+            "workspace-only-server": {
+              command: "workspace-only-command",
+              description: "Workspace only server",
             },
           },
         },
         expected: {
-          'workspace-only-server': {
-            command: 'workspace-only-command',
-            description: 'Workspace only server',
+          "workspace-only-server": {
+            command: "workspace-only-command",
+            description: "Workspace only server",
           },
         },
       },
-    ])(
-      'should handle MCP servers when only in $scope settings',
-      ({ path, content, expected }) => {
-        (mockFsExistsSync as Mock).mockImplementation(
-          (p: fs.PathLike) => p === path,
-        );
-        (fs.readFileSync as Mock).mockImplementation(
-          (p: fs.PathOrFileDescriptor) => {
-            if (p === path) return JSON.stringify(content);
-            return '{}';
-          },
-        );
+    ])("should handle MCP servers when only in $scope settings", ({ path, content, expected }) => {
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === path);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === path) return JSON.stringify(content);
+        return "{}";
+      });
 
-        const settings = loadSettings(MOCK_WORKSPACE_DIR);
-        expect(settings.merged.mcpServers).toEqual(expected);
-      },
-    );
+      const settings = loadSettings(MOCK_WORKSPACE_DIR);
+      expect(settings.merged.mcpServers).toEqual(expected);
+    });
 
-    it('should have mcpServers as undefined if not in any settings file', () => {
+    it("should have mcpServers as undefined if not in any settings file", () => {
       (mockFsExistsSync as Mock).mockReturnValue(false); // No settings files exist
-      (fs.readFileSync as Mock).mockReturnValue('{}');
+      (fs.readFileSync as Mock).mockReturnValue("{}");
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.mcpServers).toBeUndefined();
     });
 
-    it('should merge MCP servers from system, user, and workspace with system taking precedence', () => {
+    it("should merge MCP servers from system, user, and workspace with system taking precedence", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const systemSettingsContent = {
         mcpServers: {
-          'shared-server': {
-            command: 'system-command',
-            args: ['--system-arg'],
+          "shared-server": {
+            command: "system-command",
+            args: ["--system-arg"],
           },
-          'system-only-server': {
-            command: 'system-only-command',
+          "system-only-server": {
+            command: "system-only-command",
           },
         },
       };
       const userSettingsContent = {
         mcpServers: {
-          'user-server': {
-            command: 'user-command',
+          "user-server": {
+            command: "user-command",
           },
-          'shared-server': {
-            command: 'user-command',
-            description: 'from user',
+          "shared-server": {
+            command: "user-command",
+            description: "from user",
           },
         },
       };
       const workspaceSettingsContent = {
         mcpServers: {
-          'workspace-server': {
-            command: 'workspace-command',
+          "workspace-server": {
+            command: "workspace-command",
           },
-          'shared-server': {
-            command: 'workspace-command',
-            args: ['--workspace-arg'],
+          "shared-server": {
+            command: "workspace-command",
+            args: ["--workspace-arg"],
           },
         },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.merged.mcpServers).toEqual({
-        'user-server': {
-          command: 'user-command',
+        "user-server": {
+          command: "user-command",
         },
-        'workspace-server': {
-          command: 'workspace-command',
+        "workspace-server": {
+          command: "workspace-command",
         },
-        'system-only-server': {
-          command: 'system-only-command',
+        "system-only-server": {
+          command: "system-only-command",
         },
-        'shared-server': {
-          command: 'system-command',
-          args: ['--system-arg'],
+        "shared-server": {
+          command: "system-command",
+          args: ["--system-arg"],
         },
       });
     });
 
-    it('should merge mcp allowed/excluded lists with system taking precedence over workspace', () => {
+    it("should merge mcp allowed/excluded lists with system taking precedence over workspace", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const systemSettingsContent = {
         mcp: {
-          allowed: ['system-allowed'],
+          allowed: ["system-allowed"],
         },
       };
       const userSettingsContent = {
         mcp: {
-          allowed: ['user-allowed'],
-          excluded: ['user-excluded'],
+          allowed: ["user-allowed"],
+          excluded: ["user-excluded"],
         },
       };
       const workspaceSettingsContent = {
         mcp: {
-          allowed: ['workspace-allowed'],
-          excluded: ['workspace-excluded'],
+          allowed: ["workspace-allowed"],
+          excluded: ["workspace-excluded"],
         },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.merged.mcp).toEqual({
-        allowed: ['system-allowed'],
-        excluded: ['workspace-excluded'],
+        allowed: ["system-allowed"],
+        excluded: ["workspace-excluded"],
       });
     });
 
-    describe('compressionThreshold settings', () => {
+    describe("compressionThreshold settings", () => {
       it.each([
         {
-          description:
-            'should be taken from user settings if only present there',
+          description: "should be taken from user settings if only present there",
           userContent: { model: { compressionThreshold: 0.5 } },
           workspaceContent: {},
           expected: 0.5,
         },
         {
-          description:
-            'should be taken from workspace settings if only present there',
+          description: "should be taken from workspace settings if only present there",
           userContent: {},
           workspaceContent: { model: { compressionThreshold: 0.8 } },
           expected: 0.8,
         },
         {
-          description:
-            'should prioritize workspace settings over user settings',
+          description: "should prioritize workspace settings over user settings",
           userContent: { model: { compressionThreshold: 0.5 } },
           workspaceContent: { model: { compressionThreshold: 0.8 } },
           expected: 0.8,
         },
         {
-          description: 'should be undefined if not in any settings file',
+          description: "should be undefined if not in any settings file",
           userContent: {},
           workspaceContent: {},
           expected: undefined,
         },
-      ])('$description', ({ userContent, workspaceContent, expected }) => {
+      ])("$description", ({ userContent, workspaceContent, expected }) => {
         (mockFsExistsSync as Mock).mockReturnValue(true);
-        (fs.readFileSync as Mock).mockImplementation(
-          (p: fs.PathOrFileDescriptor) => {
-            if (p === USER_SETTINGS_PATH) return JSON.stringify(userContent);
-            if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-              return JSON.stringify(workspaceContent);
-            return '{}';
-          },
-        );
+        (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+          if (p === USER_SETTINGS_PATH) return JSON.stringify(userContent);
+          if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceContent);
+          return "{}";
+        });
 
         const settings = loadSettings(MOCK_WORKSPACE_DIR);
         expect(settings.merged.model?.compressionThreshold).toEqual(expected);
       });
     });
 
-    it('should use user compressionThreshold if workspace does not define it', () => {
+    it("should use user compressionThreshold if workspace does not define it", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = {
         general: {},
@@ -1076,487 +952,384 @@ describe('Settings Loading and Merging', () => {
         model: {},
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.merged.model?.compressionThreshold).toEqual(0.5);
     });
 
-    it('should merge includeDirectories from all scopes', () => {
+    it("should merge includeDirectories from all scopes", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const systemSettingsContent = {
-        context: { includeDirectories: ['/system/dir'] },
+        context: { includeDirectories: ["/system/dir"] },
       };
       const systemDefaultsContent = {
-        context: { includeDirectories: ['/system/defaults/dir'] },
+        context: { includeDirectories: ["/system/defaults/dir"] },
       };
       const userSettingsContent = {
-        context: { includeDirectories: ['/user/dir1', '/user/dir2'] },
+        context: { includeDirectories: ["/user/dir1", "/user/dir2"] },
       };
       const workspaceSettingsContent = {
-        context: { includeDirectories: ['/workspace/dir'] },
+        context: { includeDirectories: ["/workspace/dir"] },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath())
-            return JSON.stringify(systemSettingsContent);
-          if (p === getSystemDefaultsPath())
-            return JSON.stringify(systemDefaultsContent);
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) return JSON.stringify(systemSettingsContent);
+        if (p === getSystemDefaultsPath()) return JSON.stringify(systemDefaultsContent);
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.merged.context?.includeDirectories).toEqual([
-        '/system/defaults/dir',
-        '/user/dir1',
-        '/user/dir2',
-        '/workspace/dir',
-        '/system/dir',
+        "/system/defaults/dir",
+        "/user/dir1",
+        "/user/dir2",
+        "/workspace/dir",
+        "/system/dir",
       ]);
     });
 
-    it('should handle JSON parsing errors gracefully', () => {
+    it("should handle JSON parsing errors gracefully", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true); // Both files "exist"
-      const invalidJsonContent = 'invalid json';
+      const invalidJsonContent = "invalid json";
       const userReadError = new SyntaxError(
         "Expected ',' or '}' after property value in JSON at position 10",
       );
-      const workspaceReadError = new SyntaxError(
-        'Unexpected token i in JSON at position 0',
-      );
+      const workspaceReadError = new SyntaxError("Unexpected token i in JSON at position 0");
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH) {
-            // Simulate JSON.parse throwing for user settings
-            vi.spyOn(JSON, 'parse').mockImplementationOnce(() => {
-              throw userReadError;
-            });
-            return invalidJsonContent; // Content that would cause JSON.parse to throw
-          }
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH) {
-            // Simulate JSON.parse throwing for workspace settings
-            vi.spyOn(JSON, 'parse').mockImplementationOnce(() => {
-              throw workspaceReadError;
-            });
-            return invalidJsonContent;
-          }
-          return '{}'; // Default for other reads
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) {
+          // Simulate JSON.parse throwing for user settings
+          vi.spyOn(JSON, "parse").mockImplementationOnce(() => {
+            throw userReadError;
+          });
+          return invalidJsonContent; // Content that would cause JSON.parse to throw
+        }
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) {
+          // Simulate JSON.parse throwing for workspace settings
+          vi.spyOn(JSON, "parse").mockImplementationOnce(() => {
+            throw workspaceReadError;
+          });
+          return invalidJsonContent;
+        }
+        return "{}"; // Default for other reads
+      });
 
       try {
         loadSettings(MOCK_WORKSPACE_DIR);
-        throw new Error('loadSettings should have thrown a FatalConfigError');
+        throw new Error("loadSettings should have thrown a FatalConfigError");
       } catch (e) {
         expect(e).toBeInstanceOf(FatalConfigError);
         const error = e as FatalConfigError;
-        expect(error.message).toContain(
-          `Error in ${USER_SETTINGS_PATH}: ${userReadError.message}`,
-        );
+        expect(error.message).toContain(`Error in ${USER_SETTINGS_PATH}: ${userReadError.message}`);
         expect(error.message).toContain(
           `Error in ${MOCK_WORKSPACE_SETTINGS_PATH}: ${workspaceReadError.message}`,
         );
-        expect(error.message).toContain(
-          'Please fix the configuration file(s) and try again.',
-        );
+        expect(error.message).toContain("Please fix the configuration file(s) and try again.");
       }
 
       // Restore JSON.parse mock if it was spied on specifically for this test
       vi.restoreAllMocks(); // Or more targeted restore if needed
     });
 
-    it('should resolve environment variables in user settings', () => {
-      process.env['TEST_API_KEY'] = 'user_api_key_from_env';
+    it("should resolve environment variables in user settings", () => {
+      process.env["TEST_API_KEY"] = "user_api_key_from_env";
       const userSettingsContent: TestSettings = {
-        apiKey: '$TEST_API_KEY',
-        someUrl: 'https://test.com/${TEST_API_KEY}',
+        apiKey: "$TEST_API_KEY",
+        someUrl: "https://test.com/${TEST_API_KEY}",
       };
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect((settings.user.settings as TestSettings)['apiKey']).toBe(
-        'user_api_key_from_env',
-      );
-      expect((settings.user.settings as TestSettings)['someUrl']).toBe(
-        'https://test.com/user_api_key_from_env',
+      expect((settings.user.settings as TestSettings)["apiKey"]).toBe("user_api_key_from_env");
+      expect((settings.user.settings as TestSettings)["someUrl"]).toBe(
+        "https://test.com/user_api_key_from_env",
       );
-      expect((settings.merged as TestSettings)['apiKey']).toBe(
-        'user_api_key_from_env',
-      );
-      delete process.env['TEST_API_KEY'];
+      expect((settings.merged as TestSettings)["apiKey"]).toBe("user_api_key_from_env");
+      delete process.env["TEST_API_KEY"];
     });
 
-    it('should resolve environment variables in workspace settings', () => {
-      process.env['WORKSPACE_ENDPOINT'] = 'workspace_endpoint_from_env';
+    it("should resolve environment variables in workspace settings", () => {
+      process.env["WORKSPACE_ENDPOINT"] = "workspace_endpoint_from_env";
       const workspaceSettingsContent: TestSettings = {
-        endpoint: '${WORKSPACE_ENDPOINT}/api',
-        nested: { value: '$WORKSPACE_ENDPOINT' },
+        endpoint: "${WORKSPACE_ENDPOINT}/api",
+        nested: { value: "$WORKSPACE_ENDPOINT" },
       };
       (mockFsExistsSync as Mock).mockImplementation(
         (p: fs.PathLike) => p === MOCK_WORKSPACE_SETTINGS_PATH,
       );
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect((settings.workspace.settings as TestSettings)['endpoint']).toBe(
-        'workspace_endpoint_from_env/api',
+      expect((settings.workspace.settings as TestSettings)["endpoint"]).toBe(
+        "workspace_endpoint_from_env/api",
       );
-      const nested = (settings.workspace.settings as TestSettings)[
-        'nested'
-      ] as Record<string, unknown>;
-      expect(nested['value']).toBe('workspace_endpoint_from_env');
-      expect((settings.merged as TestSettings)['endpoint']).toBe(
-        'workspace_endpoint_from_env/api',
-      );
-      delete process.env['WORKSPACE_ENDPOINT'];
+      const nested = (settings.workspace.settings as TestSettings)["nested"] as Record<
+        string,
+        unknown
+      >;
+      expect(nested["value"]).toBe("workspace_endpoint_from_env");
+      expect((settings.merged as TestSettings)["endpoint"]).toBe("workspace_endpoint_from_env/api");
+      delete process.env["WORKSPACE_ENDPOINT"];
     });
 
-    it('should correctly resolve and merge env variables from different scopes', () => {
-      process.env['SYSTEM_VAR'] = 'system_value';
-      process.env['USER_VAR'] = 'user_value';
-      process.env['WORKSPACE_VAR'] = 'workspace_value';
-      process.env['SHARED_VAR'] = 'final_value';
+    it("should correctly resolve and merge env variables from different scopes", () => {
+      process.env["SYSTEM_VAR"] = "system_value";
+      process.env["USER_VAR"] = "user_value";
+      process.env["WORKSPACE_VAR"] = "workspace_value";
+      process.env["SHARED_VAR"] = "final_value";
 
       const systemSettingsContent: TestSettings = {
-        configValue: '$SHARED_VAR',
-        systemOnly: '$SYSTEM_VAR',
+        configValue: "$SHARED_VAR",
+        systemOnly: "$SYSTEM_VAR",
       };
       const userSettingsContent: TestSettings = {
-        configValue: '$SHARED_VAR',
-        userOnly: '$USER_VAR',
+        configValue: "$SHARED_VAR",
+        userOnly: "$USER_VAR",
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
       };
       const workspaceSettingsContent: TestSettings = {
-        configValue: '$SHARED_VAR',
-        workspaceOnly: '$WORKSPACE_VAR',
+        configValue: "$SHARED_VAR",
+        workspaceOnly: "$WORKSPACE_VAR",
         ui: {
-          theme: 'light',
+          theme: "light",
         },
       };
 
       (mockFsExistsSync as Mock).mockReturnValue(true);
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === getSystemSettingsPath()) {
-            return JSON.stringify(systemSettingsContent);
-          }
-          if (p === USER_SETTINGS_PATH) {
-            return JSON.stringify(userSettingsContent);
-          }
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH) {
-            return JSON.stringify(workspaceSettingsContent);
-          }
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === getSystemSettingsPath()) {
+          return JSON.stringify(systemSettingsContent);
+        }
+        if (p === USER_SETTINGS_PATH) {
+          return JSON.stringify(userSettingsContent);
+        }
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) {
+          return JSON.stringify(workspaceSettingsContent);
+        }
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       // Check resolved values in individual scopes
-      expect((settings.system.settings as TestSettings)['configValue']).toBe(
-        'final_value',
-      );
-      expect((settings.system.settings as TestSettings)['systemOnly']).toBe(
-        'system_value',
+      expect((settings.system.settings as TestSettings)["configValue"]).toBe("final_value");
+      expect((settings.system.settings as TestSettings)["systemOnly"]).toBe("system_value");
+      expect((settings.user.settings as TestSettings)["configValue"]).toBe("final_value");
+      expect((settings.user.settings as TestSettings)["userOnly"]).toBe("user_value");
+      expect((settings.workspace.settings as TestSettings)["configValue"]).toBe("final_value");
+      expect((settings.workspace.settings as TestSettings)["workspaceOnly"]).toBe(
+        "workspace_value",
       );
-      expect((settings.user.settings as TestSettings)['configValue']).toBe(
-        'final_value',
-      );
-      expect((settings.user.settings as TestSettings)['userOnly']).toBe(
-        'user_value',
-      );
-      expect((settings.workspace.settings as TestSettings)['configValue']).toBe(
-        'final_value',
-      );
-      expect(
-        (settings.workspace.settings as TestSettings)['workspaceOnly'],
-      ).toBe('workspace_value');
 
       // Check merged values (system > workspace > user)
-      expect((settings.merged as TestSettings)['configValue']).toBe(
-        'final_value',
-      );
-      expect((settings.merged as TestSettings)['systemOnly']).toBe(
-        'system_value',
-      );
-      expect((settings.merged as TestSettings)['userOnly']).toBe('user_value');
-      expect((settings.merged as TestSettings)['workspaceOnly']).toBe(
-        'workspace_value',
-      );
-      expect(settings.merged.ui?.theme).toBe('light'); // workspace overrides user
+      expect((settings.merged as TestSettings)["configValue"]).toBe("final_value");
+      expect((settings.merged as TestSettings)["systemOnly"]).toBe("system_value");
+      expect((settings.merged as TestSettings)["userOnly"]).toBe("user_value");
+      expect((settings.merged as TestSettings)["workspaceOnly"]).toBe("workspace_value");
+      expect(settings.merged.ui?.theme).toBe("light"); // workspace overrides user
 
-      delete process.env['SYSTEM_VAR'];
-      delete process.env['USER_VAR'];
-      delete process.env['WORKSPACE_VAR'];
-      delete process.env['SHARED_VAR'];
+      delete process.env["SYSTEM_VAR"];
+      delete process.env["USER_VAR"];
+      delete process.env["WORKSPACE_VAR"];
+      delete process.env["SHARED_VAR"];
     });
 
-    it('should correctly merge dnsResolutionOrder with workspace taking precedence', () => {
+    it("should correctly merge dnsResolutionOrder with workspace taking precedence", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = {
-        advanced: { dnsResolutionOrder: 'ipv4first' },
+        advanced: { dnsResolutionOrder: "ipv4first" },
       };
       const workspaceSettingsContent = {
-        advanced: { dnsResolutionOrder: 'verbatim' },
+        advanced: { dnsResolutionOrder: "verbatim" },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect(settings.merged.advanced?.dnsResolutionOrder).toBe('verbatim');
+      expect(settings.merged.advanced?.dnsResolutionOrder).toBe("verbatim");
     });
 
-    it('should use user dnsResolutionOrder if workspace is not defined', () => {
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
+    it("should use user dnsResolutionOrder if workspace is not defined", () => {
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
       const userSettingsContent = {
-        advanced: { dnsResolutionOrder: 'verbatim' },
+        advanced: { dnsResolutionOrder: "verbatim" },
       };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect(settings.merged.advanced?.dnsResolutionOrder).toBe('verbatim');
+      expect(settings.merged.advanced?.dnsResolutionOrder).toBe("verbatim");
     });
 
-    it('should leave unresolved environment variables as is', () => {
-      const userSettingsContent: TestSettings = { apiKey: '$UNDEFINED_VAR' };
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+    it("should leave unresolved environment variables as is", () => {
+      const userSettingsContent: TestSettings = { apiKey: "$UNDEFINED_VAR" };
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect((settings.user.settings as TestSettings)['apiKey']).toBe(
-        '$UNDEFINED_VAR',
-      );
-      expect((settings.merged as TestSettings)['apiKey']).toBe(
-        '$UNDEFINED_VAR',
-      );
+      expect((settings.user.settings as TestSettings)["apiKey"]).toBe("$UNDEFINED_VAR");
+      expect((settings.merged as TestSettings)["apiKey"]).toBe("$UNDEFINED_VAR");
     });
 
-    it('should resolve multiple environment variables in a single string', () => {
-      process.env['VAR_A'] = 'valueA';
-      process.env['VAR_B'] = 'valueB';
+    it("should resolve multiple environment variables in a single string", () => {
+      process.env["VAR_A"] = "valueA";
+      process.env["VAR_B"] = "valueB";
       const userSettingsContent: TestSettings = {
-        path: '/path/$VAR_A/${VAR_B}/end',
+        path: "/path/$VAR_A/${VAR_B}/end",
       };
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect((settings.user.settings as TestSettings)['path']).toBe(
-        '/path/valueA/valueB/end',
-      );
-      delete process.env['VAR_A'];
-      delete process.env['VAR_B'];
+      expect((settings.user.settings as TestSettings)["path"]).toBe("/path/valueA/valueB/end");
+      delete process.env["VAR_A"];
+      delete process.env["VAR_B"];
     });
 
-    it('should resolve environment variables in arrays', () => {
-      process.env['ITEM_1'] = 'item1_env';
-      process.env['ITEM_2'] = 'item2_env';
+    it("should resolve environment variables in arrays", () => {
+      process.env["ITEM_1"] = "item1_env";
+      process.env["ITEM_2"] = "item2_env";
       const userSettingsContent: TestSettings = {
-        list: ['$ITEM_1', '${ITEM_2}', 'literal'],
+        list: ["$ITEM_1", "${ITEM_2}", "literal"],
       };
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect((settings.user.settings as TestSettings)['list']).toEqual([
-        'item1_env',
-        'item2_env',
-        'literal',
+      expect((settings.user.settings as TestSettings)["list"]).toEqual([
+        "item1_env",
+        "item2_env",
+        "literal",
       ]);
-      delete process.env['ITEM_1'];
-      delete process.env['ITEM_2'];
+      delete process.env["ITEM_1"];
+      delete process.env["ITEM_2"];
     });
 
-    it('should correctly pass through null, boolean, and number types, and handle undefined properties', () => {
-      process.env['MY_ENV_STRING'] = 'env_string_value';
-      process.env['MY_ENV_STRING_NESTED'] = 'env_string_nested_value';
+    it("should correctly pass through null, boolean, and number types, and handle undefined properties", () => {
+      process.env["MY_ENV_STRING"] = "env_string_value";
+      process.env["MY_ENV_STRING_NESTED"] = "env_string_nested_value";
 
       const userSettingsContent: TestSettings = {
         nullVal: null,
         trueVal: true,
         falseVal: false,
         numberVal: 123.45,
-        stringVal: '$MY_ENV_STRING',
+        stringVal: "$MY_ENV_STRING",
         nestedObj: {
           nestedNull: null,
           nestedBool: true,
           nestedNum: 0,
-          nestedString: 'literal',
-          anotherEnv: '${MY_ENV_STRING_NESTED}',
+          nestedString: "literal",
+          anotherEnv: "${MY_ENV_STRING_NESTED}",
         },
       };
 
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
-      expect((settings.user.settings as TestSettings)['nullVal']).toBeNull();
-      expect((settings.user.settings as TestSettings)['trueVal']).toBe(true);
-      expect((settings.user.settings as TestSettings)['falseVal']).toBe(false);
-      expect((settings.user.settings as TestSettings)['numberVal']).toBe(
-        123.45,
-      );
-      expect((settings.user.settings as TestSettings)['stringVal']).toBe(
-        'env_string_value',
-      );
-      expect(
-        (settings.user.settings as TestSettings)['undefinedVal'],
-      ).toBeUndefined();
-
-      const nestedObj = (settings.user.settings as TestSettings)[
-        'nestedObj'
-      ] as Record<string, unknown>;
-      expect(nestedObj['nestedNull']).toBeNull();
-      expect(nestedObj['nestedBool']).toBe(true);
-      expect(nestedObj['nestedNum']).toBe(0);
-      expect(nestedObj['nestedString']).toBe('literal');
-      expect(nestedObj['anotherEnv']).toBe('env_string_nested_value');
-
-      delete process.env['MY_ENV_STRING'];
-      delete process.env['MY_ENV_STRING_NESTED'];
-    });
-
-    it('should resolve multiple concatenated environment variables in a single string value', () => {
-      process.env['TEST_HOST'] = 'myhost';
-      process.env['TEST_PORT'] = '9090';
+      expect((settings.user.settings as TestSettings)["nullVal"]).toBeNull();
+      expect((settings.user.settings as TestSettings)["trueVal"]).toBe(true);
+      expect((settings.user.settings as TestSettings)["falseVal"]).toBe(false);
+      expect((settings.user.settings as TestSettings)["numberVal"]).toBe(123.45);
+      expect((settings.user.settings as TestSettings)["stringVal"]).toBe("env_string_value");
+      expect((settings.user.settings as TestSettings)["undefinedVal"]).toBeUndefined();
+
+      const nestedObj = (settings.user.settings as TestSettings)["nestedObj"] as Record<
+        string,
+        unknown
+      >;
+      expect(nestedObj["nestedNull"]).toBeNull();
+      expect(nestedObj["nestedBool"]).toBe(true);
+      expect(nestedObj["nestedNum"]).toBe(0);
+      expect(nestedObj["nestedString"]).toBe("literal");
+      expect(nestedObj["anotherEnv"]).toBe("env_string_nested_value");
+
+      delete process.env["MY_ENV_STRING"];
+      delete process.env["MY_ENV_STRING_NESTED"];
+    });
+
+    it("should resolve multiple concatenated environment variables in a single string value", () => {
+      process.env["TEST_HOST"] = "myhost";
+      process.env["TEST_PORT"] = "9090";
       const userSettingsContent: TestSettings = {
-        serverAddress: '${TEST_HOST}:${TEST_PORT}/api',
+        serverAddress: "${TEST_HOST}:${TEST_PORT}/api",
       };
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect((settings.user.settings as TestSettings)['serverAddress']).toBe(
-        'myhost:9090/api',
-      );
+      expect((settings.user.settings as TestSettings)["serverAddress"]).toBe("myhost:9090/api");
 
-      delete process.env['TEST_HOST'];
-      delete process.env['TEST_PORT'];
+      delete process.env["TEST_HOST"];
+      delete process.env["TEST_PORT"];
     });
 
-    describe('when GEMINI_CLI_SYSTEM_SETTINGS_PATH is set', () => {
-      const MOCK_ENV_SYSTEM_SETTINGS_PATH = '/mock/env/system/settings.json';
+    describe("when GEMINI_CLI_SYSTEM_SETTINGS_PATH is set", () => {
+      const MOCK_ENV_SYSTEM_SETTINGS_PATH = "/mock/env/system/settings.json";
 
       beforeEach(() => {
-        process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'] =
-          MOCK_ENV_SYSTEM_SETTINGS_PATH;
+        process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"] = MOCK_ENV_SYSTEM_SETTINGS_PATH;
       });
 
       afterEach(() => {
-        delete process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
+        delete process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"];
       });
 
-      it('should load system settings from the path specified in the environment variable', () => {
+      it("should load system settings from the path specified in the environment variable", () => {
         (mockFsExistsSync as Mock).mockImplementation(
           (p: fs.PathLike) => p === MOCK_ENV_SYSTEM_SETTINGS_PATH,
         );
         const systemSettingsContent = {
-          ui: { theme: 'env-var-theme' },
+          ui: { theme: "env-var-theme" },
           tools: { sandbox: true },
         };
-        (fs.readFileSync as Mock).mockImplementation(
-          (p: fs.PathOrFileDescriptor) => {
-            if (p === MOCK_ENV_SYSTEM_SETTINGS_PATH)
-              return JSON.stringify(systemSettingsContent);
-            return '{}';
-          },
-        );
+        (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+          if (p === MOCK_ENV_SYSTEM_SETTINGS_PATH) return JSON.stringify(systemSettingsContent);
+          return "{}";
+        });
 
         const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
-        expect(fs.readFileSync).toHaveBeenCalledWith(
-          MOCK_ENV_SYSTEM_SETTINGS_PATH,
-          'utf-8',
-        );
+        expect(fs.readFileSync).toHaveBeenCalledWith(MOCK_ENV_SYSTEM_SETTINGS_PATH, "utf-8");
         expect(settings.system.path).toBe(MOCK_ENV_SYSTEM_SETTINGS_PATH);
         expect(settings.system.settings).toEqual(systemSettingsContent);
         expect(settings.merged).toEqual({
@@ -1566,7 +1339,7 @@ describe('Settings Loading and Merging', () => {
     });
   });
 
-  describe('excludedProjectEnvVars integration', () => {
+  describe("excludedProjectEnvVars integration", () => {
     const originalEnv = { ...process.env };
 
     beforeEach(() => {
@@ -1577,55 +1350,46 @@ describe('Settings Loading and Merging', () => {
       process.env = originalEnv;
     });
 
-    it('should exclude DEBUG and DEBUG_MODE from project .env files by default', () => {
+    it("should exclude DEBUG and DEBUG_MODE from project .env files by default", () => {
       // Create a workspace settings file with excludedProjectEnvVars
       const workspaceSettingsContent = {
         general: {},
-        advanced: { excludedEnvVars: ['DEBUG', 'DEBUG_MODE'] },
+        advanced: { excludedEnvVars: ["DEBUG", "DEBUG_MODE"] },
       };
 
       (mockFsExistsSync as Mock).mockImplementation(
         (p: fs.PathLike) => p === MOCK_WORKSPACE_SETTINGS_PATH,
       );
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       // Mock findEnvFile to return a project .env file
-      const originalFindEnvFile = (
-        loadSettings as unknown as { findEnvFile: () => string }
-      ).findEnvFile;
-      (loadSettings as unknown as { findEnvFile: () => string }).findEnvFile =
-        () => '/mock/project/.env';
+      const originalFindEnvFile = (loadSettings as unknown as { findEnvFile: () => string })
+        .findEnvFile;
+      (loadSettings as unknown as { findEnvFile: () => string }).findEnvFile = () =>
+        "/mock/project/.env";
 
       // Mock fs.readFileSync for .env file content
       const originalReadFileSync = fs.readFileSync;
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === '/mock/project/.env') {
-            return 'DEBUG=true\nDEBUG_MODE=1\nGEMINI_API_KEY=test-key';
-          }
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH) {
-            return JSON.stringify(workspaceSettingsContent);
-          }
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === "/mock/project/.env") {
+          return "DEBUG=true\nDEBUG_MODE=1\nGEMINI_API_KEY=test-key";
+        }
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) {
+          return JSON.stringify(workspaceSettingsContent);
+        }
+        return "{}";
+      });
 
       try {
         // This will call loadEnvironment internally with the merged settings
         const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
         // Verify the settings were loaded correctly
-        expect(settings.merged.advanced?.excludedEnvVars).toEqual([
-          'DEBUG',
-          'DEBUG_MODE',
-        ]);
+        expect(settings.merged.advanced?.excludedEnvVars).toEqual(["DEBUG", "DEBUG_MODE"]);
 
         // Note: We can't directly test process.env changes here because the mocking
         // prevents the actual file system operations, but we can verify the settings
@@ -1637,173 +1401,150 @@ describe('Settings Loading and Merging', () => {
       }
     });
 
-    it('should respect custom excludedProjectEnvVars from user settings', () => {
+    it("should respect custom excludedProjectEnvVars from user settings", () => {
       const userSettingsContent = {
         general: {},
-        advanced: { excludedEnvVars: ['NODE_ENV', 'DEBUG'] },
+        advanced: { excludedEnvVars: ["NODE_ENV", "DEBUG"] },
       };
 
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
+      (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => p === USER_SETTINGS_PATH);
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
-      expect(settings.user.settings.advanced?.excludedEnvVars).toEqual([
-        'NODE_ENV',
-        'DEBUG',
-      ]);
-      expect(settings.merged.advanced?.excludedEnvVars).toEqual([
-        'NODE_ENV',
-        'DEBUG',
-      ]);
+      expect(settings.user.settings.advanced?.excludedEnvVars).toEqual(["NODE_ENV", "DEBUG"]);
+      expect(settings.merged.advanced?.excludedEnvVars).toEqual(["NODE_ENV", "DEBUG"]);
     });
 
-    it('should merge excludedProjectEnvVars with workspace taking precedence', () => {
+    it("should merge excludedProjectEnvVars with workspace taking precedence", () => {
       const userSettingsContent = {
         general: {},
-        advanced: { excludedEnvVars: ['DEBUG', 'NODE_ENV', 'USER_VAR'] },
+        advanced: { excludedEnvVars: ["DEBUG", "NODE_ENV", "USER_VAR"] },
       };
       const workspaceSettingsContent = {
         general: {},
-        advanced: { excludedEnvVars: ['WORKSPACE_DEBUG', 'WORKSPACE_VAR'] },
+        advanced: { excludedEnvVars: ["WORKSPACE_DEBUG", "WORKSPACE_VAR"] },
       };
 
       (mockFsExistsSync as Mock).mockReturnValue(true);
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.user.settings.advanced?.excludedEnvVars).toEqual([
-        'DEBUG',
-        'NODE_ENV',
-        'USER_VAR',
+        "DEBUG",
+        "NODE_ENV",
+        "USER_VAR",
       ]);
       expect(settings.workspace.settings.advanced?.excludedEnvVars).toEqual([
-        'WORKSPACE_DEBUG',
-        'WORKSPACE_VAR',
+        "WORKSPACE_DEBUG",
+        "WORKSPACE_VAR",
       ]);
       expect(settings.merged.advanced?.excludedEnvVars).toEqual([
-        'DEBUG',
-        'NODE_ENV',
-        'USER_VAR',
-        'WORKSPACE_DEBUG',
-        'WORKSPACE_VAR',
+        "DEBUG",
+        "NODE_ENV",
+        "USER_VAR",
+        "WORKSPACE_DEBUG",
+        "WORKSPACE_VAR",
       ]);
     });
   });
 
-  describe('with workspace trust', () => {
-    it('should merge workspace settings when workspace is trusted', () => {
+  describe("with workspace trust", () => {
+    it("should merge workspace settings when workspace is trusted", () => {
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = {
-        ui: { theme: 'dark' },
+        ui: { theme: "dark" },
         tools: { sandbox: false },
       };
       const workspaceSettingsContent = {
         tools: { sandbox: true },
-        context: { fileName: 'WORKSPACE.md' },
+        context: { fileName: "WORKSPACE.md" },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
       expect(settings.merged.tools?.sandbox).toBe(true);
-      expect(settings.merged.context?.fileName).toBe('WORKSPACE.md');
-      expect(settings.merged.ui?.theme).toBe('dark');
+      expect(settings.merged.context?.fileName).toBe("WORKSPACE.md");
+      expect(settings.merged.ui?.theme).toBe("dark");
     });
 
-    it('should NOT merge workspace settings when workspace is not trusted', () => {
+    it("should NOT merge workspace settings when workspace is not trusted", () => {
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: false,
-        source: 'file',
+        source: "file",
       });
       (mockFsExistsSync as Mock).mockReturnValue(true);
       const userSettingsContent = {
-        ui: { theme: 'dark' },
+        ui: { theme: "dark" },
         tools: { sandbox: false },
-        context: { fileName: 'USER.md' },
+        context: { fileName: "USER.md" },
       };
       const workspaceSettingsContent = {
         tools: { sandbox: true },
-        context: { fileName: 'WORKSPACE.md' },
+        context: { fileName: "WORKSPACE.md" },
       };
 
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const settings = loadSettings(MOCK_WORKSPACE_DIR);
 
       expect(settings.merged.tools?.sandbox).toBe(false); // User setting
-      expect(settings.merged.context?.fileName).toBe('USER.md'); // User setting
-      expect(settings.merged.ui?.theme).toBe('dark'); // User setting
+      expect(settings.merged.context?.fileName).toBe("USER.md"); // User setting
+      expect(settings.merged.ui?.theme).toBe("dark"); // User setting
     });
   });
 
-  describe('migrateSettingsToV1', () => {
-    it('should handle an empty object', () => {
+  describe("migrateSettingsToV1", () => {
+    it("should handle an empty object", () => {
       const v2Settings = {};
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({});
     });
 
-    it('should migrate a simple v2 settings object to v1', () => {
+    it("should migrate a simple v2 settings object to v1", () => {
       const v2Settings = {
         general: {
-          preferredEditor: 'vscode',
+          preferredEditor: "vscode",
           vimMode: true,
         },
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
       };
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({
-        preferredEditor: 'vscode',
+        preferredEditor: "vscode",
         vimMode: true,
-        theme: 'dark',
+        theme: "dark",
       });
     });
 
-    it('should handle nested properties correctly', () => {
+    it("should handle nested properties correctly", () => {
       const v2Settings = {
         security: {
           folderTrust: {
             enabled: true,
           },
           auth: {
-            selectedType: 'oauth',
+            selectedType: "oauth",
           },
         },
         advanced: {
@@ -1813,39 +1554,39 @@ describe('Settings Loading and Merging', () => {
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({
         folderTrust: true,
-        selectedAuthType: 'oauth',
+        selectedAuthType: "oauth",
         autoConfigureMaxOldSpaceSize: true,
       });
     });
 
-    it('should preserve mcpServers at the top level', () => {
+    it("should preserve mcpServers at the top level", () => {
       const v2Settings = {
         general: {
-          preferredEditor: 'vscode',
+          preferredEditor: "vscode",
         },
         mcpServers: {
-          'my-server': {
-            command: 'npm start',
+          "my-server": {
+            command: "npm start",
           },
         },
       };
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({
-        preferredEditor: 'vscode',
+        preferredEditor: "vscode",
         mcpServers: {
-          'my-server': {
-            command: 'npm start',
+          "my-server": {
+            command: "npm start",
           },
         },
       });
     });
 
-    it('should carry over unrecognized top-level properties', () => {
+    it("should carry over unrecognized top-level properties", () => {
       const v2Settings = {
         general: {
           vimMode: false,
         },
-        unrecognized: 'value',
+        unrecognized: "value",
         another: {
           nested: true,
         },
@@ -1853,14 +1594,14 @@ describe('Settings Loading and Merging', () => {
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({
         vimMode: false,
-        unrecognized: 'value',
+        unrecognized: "value",
         another: {
           nested: true,
         },
       });
     });
 
-    it('should handle a complex object with mixed properties', () => {
+    it("should handle a complex object with mixed properties", () => {
       const v2Settings = {
         general: {
           disableAutoUpdate: true,
@@ -1872,15 +1613,15 @@ describe('Settings Loading and Merging', () => {
           },
         },
         model: {
-          name: 'gemini-pro',
+          name: "gemini-pro",
         },
         mcpServers: {
-          'server-1': {
-            command: 'node server.js',
+          "server-1": {
+            command: "node server.js",
           },
         },
         unrecognized: {
-          should: 'be-preserved',
+          should: "be-preserved",
         },
       };
       const v1Settings = migrateSettingsToV1(v2Settings);
@@ -1890,57 +1631,57 @@ describe('Settings Loading and Merging', () => {
         customThemes: {
           myTheme: {},
         },
-        model: 'gemini-pro',
+        model: "gemini-pro",
         mcpServers: {
-          'server-1': {
-            command: 'node server.js',
+          "server-1": {
+            command: "node server.js",
           },
         },
         unrecognized: {
-          should: 'be-preserved',
+          should: "be-preserved",
         },
       });
     });
 
-    it('should not migrate a v1 settings object', () => {
+    it("should not migrate a v1 settings object", () => {
       const v1Settings = {
-        preferredEditor: 'vscode',
+        preferredEditor: "vscode",
         vimMode: true,
-        theme: 'dark',
+        theme: "dark",
       };
       const migratedSettings = migrateSettingsToV1(v1Settings);
       expect(migratedSettings).toEqual({
-        preferredEditor: 'vscode',
+        preferredEditor: "vscode",
         vimMode: true,
-        theme: 'dark',
+        theme: "dark",
       });
     });
 
-    it('should migrate a full v2 settings object to v1', () => {
+    it("should migrate a full v2 settings object to v1", () => {
       const v2Settings: TestSettings = {
         general: {
-          preferredEditor: 'code',
+          preferredEditor: "code",
           vimMode: true,
         },
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
         privacy: {
           usageStatisticsEnabled: false,
         },
         model: {
-          name: 'gemini-pro',
+          name: "gemini-pro",
         },
         context: {
-          fileName: 'CONTEXT.md',
-          includeDirectories: ['/src'],
+          fileName: "CONTEXT.md",
+          includeDirectories: ["/src"],
         },
         tools: {
           sandbox: true,
-          exclude: ['toolA'],
+          exclude: ["toolA"],
         },
         mcp: {
-          allowed: ['server1'],
+          allowed: ["server1"],
         },
         security: {
           folderTrust: {
@@ -1948,68 +1689,68 @@ describe('Settings Loading and Merging', () => {
           },
         },
         advanced: {
-          dnsResolutionOrder: 'ipv4first',
-          excludedEnvVars: ['SECRET'],
+          dnsResolutionOrder: "ipv4first",
+          excludedEnvVars: ["SECRET"],
         },
         mcpServers: {
-          'my-server': {
-            command: 'npm start',
+          "my-server": {
+            command: "npm start",
           },
         },
         unrecognizedTopLevel: {
-          value: 'should be preserved',
+          value: "should be preserved",
         },
       };
 
       const v1Settings = migrateSettingsToV1(v2Settings);
 
       expect(v1Settings).toEqual({
-        preferredEditor: 'code',
+        preferredEditor: "code",
         vimMode: true,
-        theme: 'dark',
+        theme: "dark",
         usageStatisticsEnabled: false,
-        model: 'gemini-pro',
-        contextFileName: 'CONTEXT.md',
-        includeDirectories: ['/src'],
+        model: "gemini-pro",
+        contextFileName: "CONTEXT.md",
+        includeDirectories: ["/src"],
         sandbox: true,
-        excludeTools: ['toolA'],
-        allowMCPServers: ['server1'],
+        excludeTools: ["toolA"],
+        allowMCPServers: ["server1"],
         folderTrust: true,
-        dnsResolutionOrder: 'ipv4first',
-        excludedProjectEnvVars: ['SECRET'],
+        dnsResolutionOrder: "ipv4first",
+        excludedProjectEnvVars: ["SECRET"],
         mcpServers: {
-          'my-server': {
-            command: 'npm start',
+          "my-server": {
+            command: "npm start",
           },
         },
         unrecognizedTopLevel: {
-          value: 'should be preserved',
+          value: "should be preserved",
         },
       });
     });
 
-    it('should handle partial v2 settings', () => {
+    it("should handle partial v2 settings", () => {
       const v2Settings: TestSettings = {
         general: {
           vimMode: false,
         },
         ui: {},
         model: {
-          name: 'gemini-2.5-pro',
+          name: "gemini-2.5-pro",
         },
-        unrecognized: 'value',
+        unrecognized: "value",
       };
 
       const v1Settings = migrateSettingsToV1(v2Settings);
 
       expect(v1Settings).toEqual({
         vimMode: false,
-        model: 'gemini-2.5-pro',
-        unrecognized: 'value',
+        model: "gemini-2.5-pro",
+        unrecognized: "value",
       });
     });
 
-    it('should handle settings with different data types', () => {
+    it("should handle settings with different data types", () => {
       const v2Settings: TestSettings = {
         general: {
           vimMode: false,
@@ -2041,7 +1782,7 @@ describe('Settings Loading and Merging', () => {
       });
     });
 
-    it('should preserve unrecognized top-level keys', () => {
+    it("should preserve unrecognized top-level keys", () => {
       const v2Settings: TestSettings = {
         general: {
           vimMode: true,
@@ -2050,7 +1791,7 @@ describe('Settings Loading and Merging', () => {
           a: 1,
           b: [2],
         },
-        anotherOne: 'hello',
+        anotherOne: "hello",
       };
 
       const v1Settings = migrateSettingsToV1(v2Settings);
@@ -2061,23 +1802,23 @@ describe('Settings Loading and Merging', () => {
           a: 1,
           b: [2],
         },
-        anotherOne: 'hello',
+        anotherOne: "hello",
       });
     });
 
-    it('should handle an empty v2 settings object', () => {
+    it("should handle an empty v2 settings object", () => {
       const v2Settings = {};
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({});
     });
 
-    it('should correctly handle mcpServers at the top level', () => {
+    it("should correctly handle mcpServers at the top level", () => {
       const v2Settings: TestSettings = {
         mcpServers: {
-          serverA: { command: 'a' },
+          serverA: { command: "a" },
         },
         mcp: {
-          allowed: ['serverA'],
+          allowed: ["serverA"],
         },
       };
 
@@ -2085,43 +1826,40 @@ describe('Settings Loading and Merging', () => {
 
       expect(v1Settings).toEqual({
         mcpServers: {
-          serverA: { command: 'a' },
+          serverA: { command: "a" },
         },
-        allowMCPServers: ['serverA'],
+        allowMCPServers: ["serverA"],
       });
     });
 
-    it('should correctly migrate customWittyPhrases', () => {
+    it("should correctly migrate customWittyPhrases", () => {
       const v2Settings: Partial<Settings> = {
         ui: {
-          customWittyPhrases: ['test phrase'],
+          customWittyPhrases: ["test phrase"],
         },
       };
       const v1Settings = migrateSettingsToV1(v2Settings as Settings);
       expect(v1Settings).toEqual({
-        customWittyPhrases: ['test phrase'],
+        customWittyPhrases: ["test phrase"],
       });
     });
   });
 
-  describe('loadEnvironment', () => {
-    function setup({
-      isFolderTrustEnabled = true,
-      isWorkspaceTrustedValue = true,
-    }) {
-      delete process.env['TESTTEST']; // reset
-      const geminiEnvPath = path.resolve(path.join(GEMINI_DIR, '.env'));
+  describe("loadEnvironment", () => {
+    function setup({ isFolderTrustEnabled = true, isWorkspaceTrustedValue = true }) {
+      delete process.env["TESTTEST"]; // reset
+      const geminiEnvPath = path.resolve(path.join(GEMINI_DIR, ".env"));
 
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: isWorkspaceTrustedValue,
-        source: 'file',
+        source: "file",
       });
       (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) =>
         [USER_SETTINGS_PATH, geminiEnvPath].includes(p.toString()),
       );
       const userSettingsContent: Settings = {
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
         security: {
           folderTrust: {
@@ -2129,43 +1867,40 @@ describe('Settings Loading and Merging', () => {
           },
         },
         context: {
-          fileName: 'USER_CONTEXT.md',
+          fileName: "USER_CONTEXT.md",
         },
       };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === geminiEnvPath) return 'TESTTEST=1234';
-          return '{}';
-        },
-      );
+      (fs.readFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === geminiEnvPath) return "TESTTEST=1234";
+        return "{}";
+      });
     }
 
-    it('sets environment variables from .env files', () => {
+    it("sets environment variables from .env files", () => {
       setup({ isFolderTrustEnabled: false, isWorkspaceTrustedValue: true });
       loadEnvironment(loadSettings(MOCK_WORKSPACE_DIR).merged);
 
-      expect(process.env['TESTTEST']).toEqual('1234');
+      expect(process.env["TESTTEST"]).toEqual("1234");
     });
 
-    it('does not load env files from untrusted spaces', () => {
+    it("does not load env files from untrusted spaces", () => {
       setup({ isFolderTrustEnabled: true, isWorkspaceTrustedValue: false });
       loadEnvironment(loadSettings(MOCK_WORKSPACE_DIR).merged);
 
-      expect(process.env['TESTTEST']).not.toEqual('1234');
+      expect(process.env["TESTTEST"]).not.toEqual("1234");
     });
   });
 
-  describe('needsMigration', () => {
-    it('should return false for an empty object', () => {
+  describe("needsMigration", () => {
+    it("should return false for an empty object", () => {
       expect(needsMigration({})).toBe(false);
     });
 
-    it('should return false for settings that are already in V2 format', () => {
+    it("should return false for settings that are already in V2 format", () => {
       const v2Settings: Partial<Settings> = {
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
         tools: {
           sandbox: true,
@@ -2174,16 +1909,16 @@ describe('Settings Loading and Merging', () => {
       expect(needsMigration(v2Settings)).toBe(false);
     });
 
-    it('should return true for settings with a V1 key that needs to be moved', () => {
+    it("should return true for settings with a V1 key that needs to be moved", () => {
       const v1Settings = {
-        theme: 'dark', // v1 key
+        theme: "dark", // v1 key
       };
       expect(needsMigration(v1Settings)).toBe(true);
     });
 
-    it('should return true for settings with a mix of V1 and V2 keys', () => {
+    it("should return true for settings with a mix of V1 and V2 keys", () => {
       const mixedSettings = {
-        theme: 'dark', // v1 key
+        theme: "dark", // v1 key
         tools: {
           sandbox: true, // v2 key
         },
@@ -2191,7 +1926,7 @@ describe('Settings Loading and Merging', () => {
       expect(needsMigration(mixedSettings)).toBe(true);
     });
 
-    it('should return false for settings with only V1 keys that are the same in V2', () => {
+    it("should return false for settings with only V1 keys that are the same in V2", () => {
       const v1Settings = {
         mcpServers: {},
         telemetry: {},
@@ -2200,31 +1935,31 @@ describe('Settings Loading and Merging', () => {
       expect(needsMigration(v1Settings)).toBe(false);
     });
 
-    it('should return true for settings with a mix of V1 keys that are the same in V2 and V1 keys that need moving', () => {
+    it("should return true for settings with a mix of V1 keys that are the same in V2 and V1 keys that need moving", () => {
       const v1Settings = {
         mcpServers: {}, // same in v2
-        theme: 'dark', // needs moving
+        theme: "dark", // needs moving
       };
       expect(needsMigration(v1Settings)).toBe(true);
     });
 
-    it('should return false for settings with unrecognized keys', () => {
+    it("should return false for settings with unrecognized keys", () => {
       const settings = {
-        someUnrecognizedKey: 'value',
+        someUnrecognizedKey: "value",
       };
       expect(needsMigration(settings)).toBe(false);
     });
 
-    it('should return false for settings with v2 keys and unrecognized keys', () => {
+    it("should return false for settings with v2 keys and unrecognized keys", () => {
       const settings = {
-        ui: { theme: 'dark' },
-        someUnrecognizedKey: 'value',
+        ui: { theme: "dark" },
+        someUnrecognizedKey: "value",
       };
       expect(needsMigration(settings)).toBe(false);
     });
   });
 
-  describe('migrateDeprecatedSettings', () => {
+  describe("migrateDeprecatedSettings", () => {
     let mockFsExistsSync: Mock;
     let mockFsReadFileSync: Mock;
 
@@ -2233,7 +1968,7 @@ describe('Settings Loading and Merging', () => {
       mockFsExistsSync = vi.mocked(fs.existsSync);
       (mockFsExistsSync as Mock).mockReturnValue(true);
       mockFsReadFileSync = vi.mocked(fs.readFileSync);
-      mockFsReadFileSync.mockReturnValue('{}');
+      mockFsReadFileSync.mockReturnValue("{}");
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: true,
         source: undefined,
@@ -2244,113 +1979,79 @@ describe('Settings Loading and Merging', () => {
       vi.restoreAllMocks();
     });
 
-    it('should migrate disabled extensions from user and workspace settings', () => {
+    it("should migrate disabled extensions from user and workspace settings", () => {
       const userSettingsContent = {
         extensions: {
-          disabled: ['user-ext-1', 'shared-ext'],
+          disabled: ["user-ext-1", "shared-ext"],
         },
       };
       const workspaceSettingsContent = {
         extensions: {
-          disabled: ['workspace-ext-1', 'shared-ext'],
+          disabled: ["workspace-ext-1", "shared-ext"],
         },
       };
 
-      (mockFsReadFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (mockFsReadFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const loadedSettings = loadSettings(MOCK_WORKSPACE_DIR);
-      const setValueSpy = vi.spyOn(loadedSettings, 'setValue');
+      const setValueSpy = vi.spyOn(loadedSettings, "setValue");
       const extensionManager = new ExtensionManager({
         settings: loadedSettings.merged,
         workspaceDir: MOCK_WORKSPACE_DIR,
         requestConsent: vi.fn(),
         requestSetting: vi.fn(),
       });
-      const mockDisableExtension = vi.spyOn(
-        extensionManager,
-        'disableExtension',
-      );
+      const mockDisableExtension = vi.spyOn(extensionManager, "disableExtension");
       mockDisableExtension.mockImplementation(async () => {});
 
       migrateDeprecatedSettings(loadedSettings, extensionManager);
 
       // Check user settings migration
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        'user-ext-1',
-        SettingScope.User,
-      );
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        'shared-ext',
-        SettingScope.User,
-      );
+      expect(mockDisableExtension).toHaveBeenCalledWith("user-ext-1", SettingScope.User);
+      expect(mockDisableExtension).toHaveBeenCalledWith("shared-ext", SettingScope.User);
 
       // Check workspace settings migration
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        'workspace-ext-1',
-        SettingScope.Workspace,
-      );
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        'shared-ext',
-        SettingScope.Workspace,
-      );
+      expect(mockDisableExtension).toHaveBeenCalledWith("workspace-ext-1", SettingScope.Workspace);
+      expect(mockDisableExtension).toHaveBeenCalledWith("shared-ext", SettingScope.Workspace);
 
       // Check that setValue was called to remove the deprecated setting
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.User,
-        'extensions',
-        {
-          disabled: undefined,
-        },
-      );
-      expect(setValueSpy).toHaveBeenCalledWith(
-        SettingScope.Workspace,
-        'extensions',
-        {
-          disabled: undefined,
-        },
-      );
+      expect(setValueSpy).toHaveBeenCalledWith(SettingScope.User, "extensions", {
+        disabled: undefined,
+      });
+      expect(setValueSpy).toHaveBeenCalledWith(SettingScope.Workspace, "extensions", {
+        disabled: undefined,
+      });
     });
 
-    it('should not do anything if there are no deprecated settings', () => {
+    it("should not do anything if there are no deprecated settings", () => {
       const userSettingsContent = {
         extensions: {
-          enabled: ['user-ext-1'],
+          enabled: ["user-ext-1"],
         },
       };
       const workspaceSettingsContent = {
-        someOtherSetting: 'value',
+        someOtherSetting: "value",
       };
 
-      (mockFsReadFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
-            return JSON.stringify(workspaceSettingsContent);
-          return '{}';
-        },
-      );
+      (mockFsReadFileSync as Mock).mockImplementation((p: fs.PathOrFileDescriptor) => {
+        if (p === USER_SETTINGS_PATH) return JSON.stringify(userSettingsContent);
+        if (p === MOCK_WORKSPACE_SETTINGS_PATH) return JSON.stringify(workspaceSettingsContent);
+        return "{}";
+      });
 
       const loadedSettings = loadSettings(MOCK_WORKSPACE_DIR);
-      const setValueSpy = vi.spyOn(loadedSettings, 'setValue');
+      const setValueSpy = vi.spyOn(loadedSettings, "setValue");
       const extensionManager = new ExtensionManager({
         settings: loadedSettings.merged,
         workspaceDir: MOCK_WORKSPACE_DIR,
         requestConsent: vi.fn(),
         requestSetting: vi.fn(),
       });
-      const mockDisableExtension = vi.spyOn(
-        extensionManager,
-        'disableExtension',
-      );
+      const mockDisableExtension = vi.spyOn(extensionManager, "disableExtension");
       mockDisableExtension.mockImplementation(async () => {});
 
       migrateDeprecatedSettings(loadedSettings, extensionManager);
@@ -2360,50 +2061,50 @@ describe('Settings Loading and Merging', () => {
     });
   });
 
-  describe('saveSettings', () => {
-    it('should save settings using updateSettingsFilePreservingFormat', () => {
+  describe("saveSettings", () => {
+    it("should save settings using updateSettingsFilePreservingFormat", () => {
       const mockUpdateSettings = vi.mocked(updateSettingsFilePreservingFormat);
       const settingsFile = {
-        path: '/mock/settings.json',
-        settings: { ui: { theme: 'dark' } },
-        originalSettings: { ui: { theme: 'dark' } },
+        path: "/mock/settings.json",
+        settings: { ui: { theme: "dark" } },
+        originalSettings: { ui: { theme: "dark" } },
       } as unknown as SettingsFile;
 
       saveSettings(settingsFile);
 
-      expect(mockUpdateSettings).toHaveBeenCalledWith('/mock/settings.json', {
-        ui: { theme: 'dark' },
+      expect(mockUpdateSettings).toHaveBeenCalledWith("/mock/settings.json", {
+        ui: { theme: "dark" },
       });
     });
 
-    it('should create directory if it does not exist', () => {
+    it("should create directory if it does not exist", () => {
       const mockFsExistsSync = vi.mocked(fs.existsSync);
       const mockFsMkdirSync = vi.mocked(fs.mkdirSync);
       mockFsExistsSync.mockReturnValue(false);
 
       const settingsFile = {
-        path: '/mock/new/dir/settings.json',
+        path: "/mock/new/dir/settings.json",
         settings: {},
         originalSettings: {},
       } as unknown as SettingsFile;
 
       saveSettings(settingsFile);
 
-      expect(mockFsExistsSync).toHaveBeenCalledWith('/mock/new/dir');
-      expect(mockFsMkdirSync).toHaveBeenCalledWith('/mock/new/dir', {
+      expect(mockFsExistsSync).toHaveBeenCalledWith("/mock/new/dir");
+      expect(mockFsMkdirSync).toHaveBeenCalledWith("/mock/new/dir", {
         recursive: true,
       });
     });
 
-    it('should emit error feedback if saving fails', () => {
+    it("should emit error feedback if saving fails", () => {
       const mockUpdateSettings = vi.mocked(updateSettingsFilePreservingFormat);
-      const error = new Error('Write failed');
+      const error = new Error("Write failed");
       mockUpdateSettings.mockImplementation(() => {
         throw error;
       });
 
       const settingsFile = {
-        path: '/mock/settings.json',
+        path: "/mock/settings.json",
         settings: {},
         originalSettings: {},
       } as unknown as SettingsFile;
@@ -2411,8 +2112,8 @@ describe('Settings Loading and Merging', () => {
       saveSettings(settingsFile);
 
       expect(mockCoreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'There was an error saving your latest settings changes.',
+        "error",
+        "There was an error saving your latest settings changes.",
         error,
       );
     });
diff --git a/packages/ui-gemini/src/config/settings.ts b/packages/ui-gemini/src/config/settings.ts
index 402bfd4dd..d1b0c03c3 100644
--- a/packages/ui-gemini/src/config/settings.ts
+++ b/packages/ui-gemini/src/config/settings.ts
@@ -4,40 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { homedir, platform } from 'node:os';
-import * as dotenv from 'dotenv';
-import process from 'node:process';
+import * as fs from "node:fs";
+import { homedir, platform } from "node:os";
+import * as path from "node:path";
+import process from "node:process";
 import {
+  coreEvents,
   debugLogger,
   FatalConfigError,
   GEMINI_DIR,
   getErrorMessage,
   Storage,
-  coreEvents,
-} from '@airiscode/gemini-cli-core';
-import stripJsonComments from 'strip-json-comments';
-import { DefaultLight } from '../ui/themes/default-light.js';
-import { DefaultDark } from '../ui/themes/default.js';
-import { isWorkspaceTrusted } from './trustedFolders.js';
+} from "@airiscode/gemini-cli-core";
+import * as dotenv from "dotenv";
+import stripJsonComments from "strip-json-comments";
+import { DefaultDark } from "../ui/themes/default.js";
+import { DefaultLight } from "../ui/themes/default-light.js";
+import { updateSettingsFilePreservingFormat } from "../utils/commentJson.js";
+import { customDeepMerge, type MergeableObject } from "../utils/deepMerge.js";
+import { resolveEnvVarsInObject } from "../utils/envVarResolver.js";
+import type { ExtensionManager } from "./extension-manager.js";
+import { SettingPaths } from "./settingPaths.js";
+import { formatValidationError, validateSettings } from "./settings-validation.js";
 import {
-  type Settings,
+  getSettingsSchema,
   type MemoryImportFormat,
   type MergeStrategy,
-  type SettingsSchema,
   type SettingDefinition,
-  getSettingsSchema,
-} from './settingsSchema.js';
-import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
-import { customDeepMerge, type MergeableObject } from '../utils/deepMerge.js';
-import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js';
-import type { ExtensionManager } from './extension-manager.js';
-import {
-  validateSettings,
-  formatValidationError,
-} from './settings-validation.js';
-import { SettingPaths } from './settingPaths.js';
+  type Settings,
+  type SettingsSchema,
+} from "./settingsSchema.js";
+import { isWorkspaceTrusted } from "./trustedFolders.js";
 
 function getMergeStrategyForPath(path: string[]): MergeStrategy | undefined {
   let current: SettingDefinition | undefined = undefined;
@@ -60,118 +57,115 @@ function getMergeStrategyForPath(path: string[]): MergeStrategy | undefined {
   return current?.mergeStrategy;
 }
 
-export type { Settings, MemoryImportFormat };
+export type { MemoryImportFormat, Settings };
 
 export const USER_SETTINGS_PATH = Storage.getGlobalSettingsPath();
 export const USER_SETTINGS_DIR = path.dirname(USER_SETTINGS_PATH);
-export const DEFAULT_EXCLUDED_ENV_VARS = ['DEBUG', 'DEBUG_MODE'];
+export const DEFAULT_EXCLUDED_ENV_VARS = ["DEBUG", "DEBUG_MODE"];
 
 const MIGRATE_V2_OVERWRITE = true;
 
 const MIGRATION_MAP: Record<string, string> = {
-  accessibility: 'ui.accessibility',
-  allowedTools: 'tools.allowed',
-  allowMCPServers: 'mcp.allowed',
-  autoAccept: 'tools.autoAccept',
-  autoConfigureMaxOldSpaceSize: 'advanced.autoConfigureMemory',
-  bugCommand: 'advanced.bugCommand',
-  chatCompression: 'model.compressionThreshold',
-  checkpointing: 'general.checkpointing',
-  coreTools: 'tools.core',
-  contextFileName: 'context.fileName',
-  customThemes: 'ui.customThemes',
-  customWittyPhrases: 'ui.customWittyPhrases',
-  debugKeystrokeLogging: 'general.debugKeystrokeLogging',
-  disableAutoUpdate: 'general.disableAutoUpdate',
-  disableUpdateNag: 'general.disableUpdateNag',
-  dnsResolutionOrder: 'advanced.dnsResolutionOrder',
-  enableMessageBusIntegration: 'tools.enableMessageBusIntegration',
-  enableHooks: 'tools.enableHooks',
-  enablePromptCompletion: 'general.enablePromptCompletion',
-  enforcedAuthType: 'security.auth.enforcedType',
-  excludeTools: 'tools.exclude',
-  excludeMCPServers: 'mcp.excluded',
-  excludedProjectEnvVars: 'advanced.excludedEnvVars',
-  extensionManagement: 'experimental.extensionManagement',
-  extensions: 'extensions',
-  fileFiltering: 'context.fileFiltering',
-  folderTrustFeature: 'security.folderTrust.featureEnabled',
-  folderTrust: 'security.folderTrust.enabled',
-  hasSeenIdeIntegrationNudge: 'ide.hasSeenNudge',
-  hideWindowTitle: 'ui.hideWindowTitle',
-  showStatusInTitle: 'ui.showStatusInTitle',
-  hideTips: 'ui.hideTips',
-  hideBanner: 'ui.hideBanner',
-  hideFooter: 'ui.hideFooter',
-  hideCWD: 'ui.footer.hideCWD',
-  hideSandboxStatus: 'ui.footer.hideSandboxStatus',
-  hideModelInfo: 'ui.footer.hideModelInfo',
-  hideContextSummary: 'ui.hideContextSummary',
-  showMemoryUsage: 'ui.showMemoryUsage',
-  showLineNumbers: 'ui.showLineNumbers',
-  showCitations: 'ui.showCitations',
-  ideMode: 'ide.enabled',
-  includeDirectories: 'context.includeDirectories',
-  loadMemoryFromIncludeDirectories: 'context.loadFromIncludeDirectories',
-  maxSessionTurns: 'model.maxSessionTurns',
-  mcpServers: 'mcpServers',
-  mcpServerCommand: 'mcp.serverCommand',
-  memoryImportFormat: 'context.importFormat',
-  memoryDiscoveryMaxDirs: 'context.discoveryMaxDirs',
-  model: 'model.name',
+  accessibility: "ui.accessibility",
+  allowedTools: "tools.allowed",
+  allowMCPServers: "mcp.allowed",
+  autoAccept: "tools.autoAccept",
+  autoConfigureMaxOldSpaceSize: "advanced.autoConfigureMemory",
+  bugCommand: "advanced.bugCommand",
+  chatCompression: "model.compressionThreshold",
+  checkpointing: "general.checkpointing",
+  coreTools: "tools.core",
+  contextFileName: "context.fileName",
+  customThemes: "ui.customThemes",
+  customWittyPhrases: "ui.customWittyPhrases",
+  debugKeystrokeLogging: "general.debugKeystrokeLogging",
+  disableAutoUpdate: "general.disableAutoUpdate",
+  disableUpdateNag: "general.disableUpdateNag",
+  dnsResolutionOrder: "advanced.dnsResolutionOrder",
+  enableMessageBusIntegration: "tools.enableMessageBusIntegration",
+  enableHooks: "tools.enableHooks",
+  enablePromptCompletion: "general.enablePromptCompletion",
+  enforcedAuthType: "security.auth.enforcedType",
+  excludeTools: "tools.exclude",
+  excludeMCPServers: "mcp.excluded",
+  excludedProjectEnvVars: "advanced.excludedEnvVars",
+  extensionManagement: "experimental.extensionManagement",
+  extensions: "extensions",
+  fileFiltering: "context.fileFiltering",
+  folderTrustFeature: "security.folderTrust.featureEnabled",
+  folderTrust: "security.folderTrust.enabled",
+  hasSeenIdeIntegrationNudge: "ide.hasSeenNudge",
+  hideWindowTitle: "ui.hideWindowTitle",
+  showStatusInTitle: "ui.showStatusInTitle",
+  hideTips: "ui.hideTips",
+  hideBanner: "ui.hideBanner",
+  hideFooter: "ui.hideFooter",
+  hideCWD: "ui.footer.hideCWD",
+  hideSandboxStatus: "ui.footer.hideSandboxStatus",
+  hideModelInfo: "ui.footer.hideModelInfo",
+  hideContextSummary: "ui.hideContextSummary",
+  showMemoryUsage: "ui.showMemoryUsage",
+  showLineNumbers: "ui.showLineNumbers",
+  showCitations: "ui.showCitations",
+  ideMode: "ide.enabled",
+  includeDirectories: "context.includeDirectories",
+  loadMemoryFromIncludeDirectories: "context.loadFromIncludeDirectories",
+  maxSessionTurns: "model.maxSessionTurns",
+  mcpServers: "mcpServers",
+  mcpServerCommand: "mcp.serverCommand",
+  memoryImportFormat: "context.importFormat",
+  memoryDiscoveryMaxDirs: "context.discoveryMaxDirs",
+  model: "model.name",
   preferredEditor: SettingPaths.General.PreferredEditor,
-  retryFetchErrors: 'general.retryFetchErrors',
-  sandbox: 'tools.sandbox',
-  selectedAuthType: 'security.auth.selectedType',
-  enableInteractiveShell: 'tools.shell.enableInteractiveShell',
-  shellPager: 'tools.shell.pager',
-  shellShowColor: 'tools.shell.showColor',
-  shellInactivityTimeout: 'tools.shell.inactivityTimeout',
-  skipNextSpeakerCheck: 'model.skipNextSpeakerCheck',
-  summarizeToolOutput: 'model.summarizeToolOutput',
-  telemetry: 'telemetry',
-  theme: 'ui.theme',
-  toolDiscoveryCommand: 'tools.discoveryCommand',
-  toolCallCommand: 'tools.callCommand',
-  usageStatisticsEnabled: 'privacy.usageStatisticsEnabled',
-  useExternalAuth: 'security.auth.useExternal',
-  useRipgrep: 'tools.useRipgrep',
-  vimMode: 'general.vimMode',
+  retryFetchErrors: "general.retryFetchErrors",
+  sandbox: "tools.sandbox",
+  selectedAuthType: "security.auth.selectedType",
+  enableInteractiveShell: "tools.shell.enableInteractiveShell",
+  shellPager: "tools.shell.pager",
+  shellShowColor: "tools.shell.showColor",
+  shellInactivityTimeout: "tools.shell.inactivityTimeout",
+  skipNextSpeakerCheck: "model.skipNextSpeakerCheck",
+  summarizeToolOutput: "model.summarizeToolOutput",
+  telemetry: "telemetry",
+  theme: "ui.theme",
+  toolDiscoveryCommand: "tools.discoveryCommand",
+  toolCallCommand: "tools.callCommand",
+  usageStatisticsEnabled: "privacy.usageStatisticsEnabled",
+  useExternalAuth: "security.auth.useExternal",
+  useRipgrep: "tools.useRipgrep",
+  vimMode: "general.vimMode",
 };
 
 export function getSystemSettingsPath(): string {
-  if (process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH']) {
-    return process.env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'];
+  if (process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"]) {
+    return process.env["GEMINI_CLI_SYSTEM_SETTINGS_PATH"];
   }
-  if (platform() === 'darwin') {
-    return '/Library/Application Support/GeminiCli/settings.json';
-  } else if (platform() === 'win32') {
-    return 'C:\\ProgramData\\gemini-cli\\settings.json';
+  if (platform() === "darwin") {
+    return "/Library/Application Support/GeminiCli/settings.json";
+  } else if (platform() === "win32") {
+    return "C:\\ProgramData\\gemini-cli\\settings.json";
   } else {
-    return '/etc/gemini-cli/settings.json';
+    return "/etc/gemini-cli/settings.json";
   }
 }
 
 export function getSystemDefaultsPath(): string {
-  if (process.env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH']) {
-    return process.env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH'];
+  if (process.env["GEMINI_CLI_SYSTEM_DEFAULTS_PATH"]) {
+    return process.env["GEMINI_CLI_SYSTEM_DEFAULTS_PATH"];
   }
-  return path.join(
-    path.dirname(getSystemSettingsPath()),
-    'system-defaults.json',
-  );
+  return path.join(path.dirname(getSystemSettingsPath()), "system-defaults.json");
 }
 
-export type { DnsResolutionOrder } from './settingsSchema.js';
+export type { DnsResolutionOrder } from "./settingsSchema.js";
 
 export enum SettingScope {
-  User = 'User',
-  Workspace = 'Workspace',
-  System = 'System',
-  SystemDefaults = 'SystemDefaults',
+  User = "User",
+  Workspace = "Workspace",
+  System = "System",
+  SystemDefaults = "SystemDefaults",
   // Note that this scope is not supported in the settings dialog at this time,
   // it is only supported for extensions.
-  Session = 'Session',
+  Session = "Session",
 }
 
 /**
@@ -197,9 +191,7 @@ const _loadableSettingScopes = [
  * A type guard function that checks if `scope` is a loadable settings scope,
  * and allows promotion to the `LoadableSettingsScope` type based on the result.
  */
-export function isLoadableSettingScope(
-  scope: SettingScope,
-): scope is LoadableSettingScope {
+export function isLoadableSettingScope(scope: SettingScope): scope is LoadableSettingScope {
   return _loadableSettingScopes.includes(scope);
 }
 
@@ -242,12 +234,8 @@ export interface SettingsFile {
   rawJson?: string;
 }
 
-function setNestedProperty(
-  obj: Record<string, unknown>,
-  path: string,
-  value: unknown,
-) {
-  const keys = path.split('.');
+function setNestedProperty(obj: Record<string, unknown>, path: string, value: unknown) {
+  const keys = path.split(".");
   const lastKey = keys.pop();
   if (!lastKey) return;
 
@@ -257,7 +245,7 @@ function setNestedProperty(
       current[key] = {};
     }
     const next = current[key];
-    if (typeof next === 'object' && next !== null) {
+    if (typeof next === "object" && next !== null) {
       current = next as Record<string, unknown>;
     } else {
       // This path is invalid, so we stop.
@@ -279,7 +267,7 @@ export function needsMigration(settings: Record<string, unknown>): boolean {
     // a V1 key that needs migration.
     if (
       KNOWN_V2_CONTAINERS.has(v1Key) &&
-      typeof settings[v1Key] === 'object' &&
+      typeof settings[v1Key] === "object" &&
       settings[v1Key] !== null
     ) {
       return false;
@@ -308,9 +296,9 @@ function migrateSettingsToV2(
   }
 
   // Preserve mcpServers at the top level
-  if (flatSettings['mcpServers']) {
-    v2Settings['mcpServers'] = flatSettings['mcpServers'];
-    flatKeys.delete('mcpServers');
+  if (flatSettings["mcpServers"]) {
+    v2Settings["mcpServers"] = flatSettings["mcpServers"];
+    flatKeys.delete("mcpServers");
   }
 
   // Carry over any unrecognized keys
@@ -319,10 +307,10 @@ function migrateSettingsToV2(
     const newValue = flatSettings[remainingKey];
 
     if (
-      typeof existingValue === 'object' &&
+      typeof existingValue === "object" &&
       existingValue !== null &&
       !Array.isArray(existingValue) &&
-      typeof newValue === 'object' &&
+      typeof newValue === "object" &&
       newValue !== null &&
       !Array.isArray(newValue)
     ) {
@@ -342,14 +330,11 @@ function migrateSettingsToV2(
   return v2Settings;
 }
 
-function getNestedProperty(
-  obj: Record<string, unknown>,
-  path: string,
-): unknown {
-  const keys = path.split('.');
+function getNestedProperty(obj: Record<string, unknown>, path: string): unknown {
+  const keys = path.split(".");
   let current: unknown = obj;
   for (const key of keys) {
-    if (typeof current !== 'object' || current === null || !(key in current)) {
+    if (typeof current !== "object" || current === null || !(key in current)) {
       return undefined;
     }
     current = (current as Record<string, unknown>)[key];
@@ -362,13 +347,9 @@ const REVERSE_MIGRATION_MAP: Record<string, string> = Object.fromEntries(
 );
 
 // Dynamically determine the top-level keys from the V2 settings structure.
-const KNOWN_V2_CONTAINERS = new Set(
-  Object.values(MIGRATION_MAP).map((path) => path.split('.')[0]),
-);
+const KNOWN_V2_CONTAINERS = new Set(Object.values(MIGRATION_MAP).map((path) => path.split(".")[0]));
 
-export function migrateSettingsToV1(
-  v2Settings: Record<string, unknown>,
-): Record<string, unknown> {
+export function migrateSettingsToV1(v2Settings: Record<string, unknown>): Record<string, unknown> {
   const v1Settings: Record<string, unknown> = {};
   const v2Keys = new Set(Object.keys(v2Settings));
 
@@ -376,14 +357,14 @@ export function migrateSettingsToV1(
     const value = getNestedProperty(v2Settings, newPath);
     if (value !== undefined) {
       v1Settings[oldKey] = value;
-      v2Keys.delete(newPath.split('.')[0]);
+      v2Keys.delete(newPath.split(".")[0]);
     }
   }
 
   // Preserve mcpServers at the top level
-  if (v2Settings['mcpServers']) {
-    v1Settings['mcpServers'] = v2Settings['mcpServers'];
-    v2Keys.delete('mcpServers');
+  if (v2Settings["mcpServers"]) {
+    v1Settings["mcpServers"] = v2Settings["mcpServers"];
+    v2Keys.delete("mcpServers");
   }
 
   // Carry over any unrecognized keys
@@ -396,7 +377,7 @@ export function migrateSettingsToV1(
     // Don't carry over empty objects that were just containers for migrated settings.
     if (
       KNOWN_V2_CONTAINERS.has(remainingKey) &&
-      typeof value === 'object' &&
+      typeof value === "object" &&
       value !== null &&
       !Array.isArray(value) &&
       Object.keys(value).length === 0
@@ -504,22 +485,22 @@ function findEnvFile(startDir: string): string | null {
   let currentDir = path.resolve(startDir);
   while (true) {
     // prefer gemini-specific .env under GEMINI_DIR
-    const geminiEnvPath = path.join(currentDir, GEMINI_DIR, '.env');
+    const geminiEnvPath = path.join(currentDir, GEMINI_DIR, ".env");
     if (fs.existsSync(geminiEnvPath)) {
       return geminiEnvPath;
     }
-    const envPath = path.join(currentDir, '.env');
+    const envPath = path.join(currentDir, ".env");
     if (fs.existsSync(envPath)) {
       return envPath;
     }
     const parentDir = path.dirname(currentDir);
     if (parentDir === currentDir || !parentDir) {
       // check .env under home as fallback, again preferring gemini-specific .env
-      const homeGeminiEnvPath = path.join(homedir(), GEMINI_DIR, '.env');
+      const homeGeminiEnvPath = path.join(homedir(), GEMINI_DIR, ".env");
       if (fs.existsSync(homeGeminiEnvPath)) {
         return homeGeminiEnvPath;
       }
-      const homeEnvPath = path.join(homedir(), '.env');
+      const homeEnvPath = path.join(homedir(), ".env");
       if (fs.existsSync(homeEnvPath)) {
         return homeEnvPath;
       }
@@ -538,16 +519,16 @@ export function setUpCloudShellEnvironment(envFilePath: string | null): void {
   if (envFilePath && fs.existsSync(envFilePath)) {
     const envFileContent = fs.readFileSync(envFilePath);
     const parsedEnv = dotenv.parse(envFileContent);
-    if (parsedEnv['GOOGLE_CLOUD_PROJECT']) {
+    if (parsedEnv["GOOGLE_CLOUD_PROJECT"]) {
       // .env file takes precedence in Cloud Shell
-      process.env['GOOGLE_CLOUD_PROJECT'] = parsedEnv['GOOGLE_CLOUD_PROJECT'];
+      process.env["GOOGLE_CLOUD_PROJECT"] = parsedEnv["GOOGLE_CLOUD_PROJECT"];
     } else {
       // If not in .env, set to default and override global
-      process.env['GOOGLE_CLOUD_PROJECT'] = 'cloudshell-gca';
+      process.env["GOOGLE_CLOUD_PROJECT"] = "cloudshell-gca";
     }
   } else {
     // If no .env file, set to default and override global
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'cloudshell-gca';
+    process.env["GOOGLE_CLOUD_PROJECT"] = "cloudshell-gca";
   }
 }
 
@@ -559,7 +540,7 @@ export function loadEnvironment(settings: Settings): void {
   }
 
   // Cloud Shell environment variable handling
-  if (process.env['CLOUD_SHELL'] === 'true') {
+  if (process.env["CLOUD_SHELL"] === "true") {
     setUpCloudShellEnvironment(envFilePath);
   }
 
@@ -567,11 +548,10 @@ export function loadEnvironment(settings: Settings): void {
     // Manually parse and load environment variables to handle exclusions correctly.
     // This avoids modifying environment variables that were already set from the shell.
     try {
-      const envFileContent = fs.readFileSync(envFilePath, 'utf-8');
+      const envFileContent = fs.readFileSync(envFilePath, "utf-8");
       const parsedEnv = dotenv.parse(envFileContent);
 
-      const excludedVars =
-        settings?.advanced?.excludedEnvVars || DEFAULT_EXCLUDED_ENV_VARS;
+      const excludedVars = settings?.advanced?.excludedEnvVars || DEFAULT_EXCLUDED_ENV_VARS;
       const isProjectEnvFile = !envFilePath.includes(GEMINI_DIR);
 
       for (const key in parsedEnv) {
@@ -597,9 +577,7 @@ export function loadEnvironment(settings: Settings): void {
  * Loads settings from user and workspace directories.
  * Project settings override user settings.
  */
-export function loadSettings(
-  workspaceDir: string = process.cwd(),
-): LoadedSettings {
+export function loadSettings(workspaceDir: string = process.cwd()): LoadedSettings {
   let systemSettings: Settings = {};
   let systemDefaultSettings: Settings = {};
   let userSettings: Settings = {};
@@ -624,9 +602,7 @@ export function loadSettings(
   // We expect homedir to always exist and be resolvable.
   const realHomeDir = fs.realpathSync(resolvedHomeDir);
 
-  const workspaceSettingsPath = new Storage(
-    workspaceDir,
-  ).getWorkspaceSettingsPath();
+  const workspaceSettingsPath = new Storage(workspaceDir).getWorkspaceSettingsPath();
 
   const loadAndMigrate = (
     filePath: string,
@@ -634,16 +610,12 @@ export function loadSettings(
   ): { settings: Settings; rawJson?: string } => {
     try {
       if (fs.existsSync(filePath)) {
-        const content = fs.readFileSync(filePath, 'utf-8');
+        const content = fs.readFileSync(filePath, "utf-8");
         const rawSettings: unknown = JSON.parse(stripJsonComments(content));
 
-        if (
-          typeof rawSettings !== 'object' ||
-          rawSettings === null ||
-          Array.isArray(rawSettings)
-        ) {
+        if (typeof rawSettings !== "object" || rawSettings === null || Array.isArray(rawSettings)) {
           settingsErrors.push({
-            message: 'Settings file is not a valid JSON object.',
+            message: "Settings file is not a valid JSON object.",
             path: filePath,
           });
           return { settings: {} };
@@ -656,17 +628,9 @@ export function loadSettings(
             if (MIGRATE_V2_OVERWRITE) {
               try {
                 fs.renameSync(filePath, `${filePath}.orig`);
-                fs.writeFileSync(
-                  filePath,
-                  JSON.stringify(migratedSettings, null, 2),
-                  'utf-8',
-                );
+                fs.writeFileSync(filePath, JSON.stringify(migratedSettings, null, 2), "utf-8");
               } catch (e) {
-                coreEvents.emitFeedback(
-                  'error',
-                  'Failed to migrate settings file.',
-                  e,
-                );
+                coreEvents.emitFeedback("error", "Failed to migrate settings file.", e);
               }
             } else {
               migratedInMemoryScopes.add(scope);
@@ -678,10 +642,7 @@ export function loadSettings(
         // Validate settings structure with Zod after migration
         const validationResult = validateSettings(settingsObject);
         if (!validationResult.success && validationResult.error) {
-          const errorMessage = formatValidationError(
-            validationResult.error,
-            filePath,
-          );
+          const errorMessage = formatValidationError(validationResult.error, filePath);
           throw new FatalConfigError(errorMessage);
         }
 
@@ -701,10 +662,7 @@ export function loadSettings(
   };
 
   const systemResult = loadAndMigrate(systemSettingsPath, SettingScope.System);
-  const systemDefaultsResult = loadAndMigrate(
-    systemDefaultsPath,
-    SettingScope.SystemDefaults,
-  );
+  const systemDefaultsResult = loadAndMigrate(systemDefaultsPath, SettingScope.SystemDefaults);
   const userResult = loadAndMigrate(USER_SETTINGS_PATH, SettingScope.User);
 
   let workspaceResult: { settings: Settings; rawJson?: string } = {
@@ -712,16 +670,11 @@ export function loadSettings(
     rawJson: undefined,
   };
   if (realWorkspaceDir !== realHomeDir) {
-    workspaceResult = loadAndMigrate(
-      workspaceSettingsPath,
-      SettingScope.Workspace,
-    );
+    workspaceResult = loadAndMigrate(workspaceSettingsPath, SettingScope.Workspace);
   }
 
   const systemOriginalSettings = structuredClone(systemResult.settings);
-  const systemDefaultsOriginalSettings = structuredClone(
-    systemDefaultsResult.settings,
-  );
+  const systemDefaultsOriginalSettings = structuredClone(systemDefaultsResult.settings);
   const userOriginalSettings = structuredClone(userResult.settings);
   const workspaceOriginalSettings = structuredClone(workspaceResult.settings);
 
@@ -732,14 +685,14 @@ export function loadSettings(
   workspaceSettings = resolveEnvVarsInObject(workspaceResult.settings);
 
   // Support legacy theme names
-  if (userSettings.ui?.theme === 'VS') {
+  if (userSettings.ui?.theme === "VS") {
     userSettings.ui.theme = DefaultLight.name;
-  } else if (userSettings.ui?.theme === 'VS2015') {
+  } else if (userSettings.ui?.theme === "VS2015") {
     userSettings.ui.theme = DefaultDark.name;
   }
-  if (workspaceSettings.ui?.theme === 'VS') {
+  if (workspaceSettings.ui?.theme === "VS") {
     workspaceSettings.ui.theme = DefaultLight.name;
-  } else if (workspaceSettings.ui?.theme === 'VS2015') {
+  } else if (workspaceSettings.ui?.theme === "VS2015") {
     workspaceSettings.ui.theme = DefaultDark.name;
   }
 
@@ -750,8 +703,7 @@ export function loadSettings(
     systemSettings,
     userSettings,
   );
-  const isTrusted =
-    isWorkspaceTrusted(initialTrustCheckSettings as Settings).isTrusted ?? true;
+  const isTrusted = isWorkspaceTrusted(initialTrustCheckSettings as Settings).isTrusted ?? true;
 
   // Create a temporary merged settings object to pass to loadEnvironment.
   const tempMergedSettings = mergeSettings(
@@ -769,11 +721,9 @@ export function loadSettings(
   // Create LoadedSettings first
 
   if (settingsErrors.length > 0) {
-    const errorMessages = settingsErrors.map(
-      (error) => `Error in ${error.path}: ${error.message}`,
-    );
+    const errorMessages = settingsErrors.map((error) => `Error in ${error.path}: ${error.message}`);
     throw new FatalConfigError(
-      `${errorMessages.join('\n')}\nPlease fix the configuration file(s) and try again.`,
+      `${errorMessages.join("\n")}\nPlease fix the configuration file(s) and try again.`,
     );
   }
 
@@ -825,7 +775,7 @@ export function migrateDeprecatedSettings(
       const newExtensionsValue = { ...settings.extensions };
       newExtensionsValue.disabled = undefined;
 
-      loadedSettings.setValue(scope, 'extensions', newExtensionsValue);
+      loadedSettings.setValue(scope, "extensions", newExtensionsValue);
     }
   };
 
@@ -843,9 +793,7 @@ export function saveSettings(settingsFile: SettingsFile): void {
 
     let settingsToSave = settingsFile.originalSettings;
     if (!MIGRATE_V2_OVERWRITE) {
-      settingsToSave = migrateSettingsToV1(
-        settingsToSave as Record<string, unknown>,
-      ) as Settings;
+      settingsToSave = migrateSettingsToV1(settingsToSave as Record<string, unknown>) as Settings;
     }
 
     // Use the format-preserving update function
@@ -855,8 +803,8 @@ export function saveSettings(settingsFile: SettingsFile): void {
     );
   } catch (error) {
     coreEvents.emitFeedback(
-      'error',
-      'There was an error saving your latest settings changes.',
+      "error",
+      "There was an error saving your latest settings changes.",
       error,
     );
   }
diff --git a/packages/ui-gemini/src/config/settingsSchema.test.ts b/packages/ui-gemini/src/config/settingsSchema.test.ts
index 95e15ca29..ccda14af2 100644
--- a/packages/ui-gemini/src/config/settingsSchema.test.ts
+++ b/packages/ui-gemini/src/config/settingsSchema.test.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
   getSettingsSchema,
   SETTINGS_SCHEMA_DEFINITIONS,
@@ -12,24 +12,24 @@ import {
   type SettingDefinition,
   type Settings,
   type SettingsSchema,
-} from './settingsSchema.js';
+} from "./settingsSchema.js";
 
-describe('SettingsSchema', () => {
-  describe('getSettingsSchema', () => {
-    it('should contain all expected top-level settings', () => {
+describe("SettingsSchema", () => {
+  describe("getSettingsSchema", () => {
+    it("should contain all expected top-level settings", () => {
       const expectedSettings: Array<keyof Settings> = [
-        'mcpServers',
-        'general',
-        'ui',
-        'ide',
-        'privacy',
-        'telemetry',
-        'model',
-        'context',
-        'tools',
-        'mcp',
-        'security',
-        'advanced',
+        "mcpServers",
+        "general",
+        "ui",
+        "ide",
+        "privacy",
+        "telemetry",
+        "model",
+        "context",
+        "tools",
+        "mcp",
+        "security",
+        "advanced",
       ];
 
       expectedSettings.forEach((setting) => {
@@ -37,81 +37,71 @@ describe('SettingsSchema', () => {
       });
     });
 
-    it('should have correct structure for each setting', () => {
+    it("should have correct structure for each setting", () => {
       Object.entries(getSettingsSchema()).forEach(([_key, definition]) => {
-        expect(definition).toHaveProperty('type');
-        expect(definition).toHaveProperty('label');
-        expect(definition).toHaveProperty('category');
-        expect(definition).toHaveProperty('requiresRestart');
-        expect(definition).toHaveProperty('default');
-        expect(typeof definition.type).toBe('string');
-        expect(typeof definition.label).toBe('string');
-        expect(typeof definition.category).toBe('string');
-        expect(typeof definition.requiresRestart).toBe('boolean');
+        expect(definition).toHaveProperty("type");
+        expect(definition).toHaveProperty("label");
+        expect(definition).toHaveProperty("category");
+        expect(definition).toHaveProperty("requiresRestart");
+        expect(definition).toHaveProperty("default");
+        expect(typeof definition.type).toBe("string");
+        expect(typeof definition.label).toBe("string");
+        expect(typeof definition.category).toBe("string");
+        expect(typeof definition.requiresRestart).toBe("boolean");
       });
     });
 
-    it('should have correct nested setting structure', () => {
+    it("should have correct nested setting structure", () => {
       const nestedSettings: Array<keyof Settings> = [
-        'general',
-        'ui',
-        'ide',
-        'privacy',
-        'model',
-        'context',
-        'tools',
-        'mcp',
-        'security',
-        'advanced',
+        "general",
+        "ui",
+        "ide",
+        "privacy",
+        "model",
+        "context",
+        "tools",
+        "mcp",
+        "security",
+        "advanced",
       ];
 
       nestedSettings.forEach((setting) => {
-        const definition = getSettingsSchema()[
-          setting as keyof Settings
-        ] as SettingDefinition;
-        expect(definition.type).toBe('object');
+        const definition = getSettingsSchema()[setting as keyof Settings] as SettingDefinition;
+        expect(definition.type).toBe("object");
         expect(definition.properties).toBeDefined();
-        expect(typeof definition.properties).toBe('object');
+        expect(typeof definition.properties).toBe("object");
       });
     });
 
-    it('should have accessibility nested properties', () => {
+    it("should have accessibility nested properties", () => {
+      expect(getSettingsSchema().ui?.properties?.accessibility?.properties).toBeDefined();
       expect(
-        getSettingsSchema().ui?.properties?.accessibility?.properties,
-      ).toBeDefined();
-      expect(
-        getSettingsSchema().ui?.properties?.accessibility.properties
-          ?.disableLoadingPhrases.type,
-      ).toBe('boolean');
+        getSettingsSchema().ui?.properties?.accessibility.properties?.disableLoadingPhrases.type,
+      ).toBe("boolean");
     });
 
-    it('should have checkpointing nested properties', () => {
+    it("should have checkpointing nested properties", () => {
       expect(
-        getSettingsSchema().general?.properties?.checkpointing.properties
-          ?.enabled,
+        getSettingsSchema().general?.properties?.checkpointing.properties?.enabled,
       ).toBeDefined();
-      expect(
-        getSettingsSchema().general?.properties?.checkpointing.properties
-          ?.enabled.type,
-      ).toBe('boolean');
+      expect(getSettingsSchema().general?.properties?.checkpointing.properties?.enabled.type).toBe(
+        "boolean",
+      );
     });
 
-    it('should have fileFiltering nested properties', () => {
+    it("should have fileFiltering nested properties", () => {
       expect(
-        getSettingsSchema().context.properties.fileFiltering.properties
-          ?.respectGitIgnore,
+        getSettingsSchema().context.properties.fileFiltering.properties?.respectGitIgnore,
       ).toBeDefined();
       expect(
-        getSettingsSchema().context.properties.fileFiltering.properties
-          ?.respectGeminiIgnore,
+        getSettingsSchema().context.properties.fileFiltering.properties?.respectGeminiIgnore,
       ).toBeDefined();
       expect(
-        getSettingsSchema().context.properties.fileFiltering.properties
-          ?.enableRecursiveFileSearch,
+        getSettingsSchema().context.properties.fileFiltering.properties?.enableRecursiveFileSearch,
       ).toBeDefined();
     });
 
-    it('should have unique categories', () => {
+    it("should have unique categories", () => {
       const categories = new Set();
 
       // Collect categories from top-level settings
@@ -122,30 +112,28 @@ describe('SettingsSchema', () => {
           properties?: Record<string, unknown>;
         };
         if (defWithProps.properties) {
-          Object.values(defWithProps.properties).forEach(
-            (nestedDef: unknown) => {
-              const nestedDefTyped = nestedDef as { category?: string };
-              if (nestedDefTyped.category) {
-                categories.add(nestedDefTyped.category);
-              }
-            },
-          );
+          Object.values(defWithProps.properties).forEach((nestedDef: unknown) => {
+            const nestedDefTyped = nestedDef as { category?: string };
+            if (nestedDefTyped.category) {
+              categories.add(nestedDefTyped.category);
+            }
+          });
         }
       });
 
       expect(categories.size).toBeGreaterThan(0);
-      expect(categories).toContain('General');
-      expect(categories).toContain('UI');
-      expect(categories).toContain('Advanced');
+      expect(categories).toContain("General");
+      expect(categories).toContain("UI");
+      expect(categories).toContain("Advanced");
     });
 
-    it('should have consistent default values for boolean settings', () => {
+    it("should have consistent default values for boolean settings", () => {
       const checkBooleanDefaults = (schema: SettingsSchema) => {
         Object.entries(schema).forEach(([, definition]) => {
           const def = definition as SettingDefinition;
-          if (def.type === 'boolean') {
+          if (def.type === "boolean") {
             // Boolean settings can have boolean or undefined defaults (for optional settings)
-            expect(['boolean', 'undefined']).toContain(typeof def.default);
+            expect(["boolean", "undefined"]).toContain(typeof def.default);
           }
           if (def.properties) {
             checkBooleanDefaults(def.properties);
@@ -156,224 +144,144 @@ describe('SettingsSchema', () => {
       checkBooleanDefaults(getSettingsSchema() as SettingsSchema);
     });
 
-    it('should have showInDialog property configured', () => {
+    it("should have showInDialog property configured", () => {
       // Check that user-facing settings are marked for dialog display
+      expect(getSettingsSchema().ui.properties.showMemoryUsage.showInDialog).toBe(true);
       expect(
-        getSettingsSchema().ui.properties.showMemoryUsage.showInDialog,
+        getSettingsSchema().ui.properties.footer.properties.hideContextPercentage.showInDialog,
       ).toBe(true);
-      expect(
-        getSettingsSchema().ui.properties.footer.properties
-          .hideContextPercentage.showInDialog,
-      ).toBe(true);
-      expect(getSettingsSchema().general.properties.vimMode.showInDialog).toBe(
-        true,
-      );
-      expect(getSettingsSchema().ide.properties.enabled.showInDialog).toBe(
-        true,
-      );
-      expect(
-        getSettingsSchema().general.properties.disableAutoUpdate.showInDialog,
-      ).toBe(true);
-      expect(
-        getSettingsSchema().ui.properties.hideWindowTitle.showInDialog,
-      ).toBe(true);
-      expect(getSettingsSchema().ui.properties.hideTips.showInDialog).toBe(
-        true,
-      );
-      expect(getSettingsSchema().ui.properties.hideBanner.showInDialog).toBe(
-        true,
+      expect(getSettingsSchema().general.properties.vimMode.showInDialog).toBe(true);
+      expect(getSettingsSchema().ide.properties.enabled.showInDialog).toBe(true);
+      expect(getSettingsSchema().general.properties.disableAutoUpdate.showInDialog).toBe(true);
+      expect(getSettingsSchema().ui.properties.hideWindowTitle.showInDialog).toBe(true);
+      expect(getSettingsSchema().ui.properties.hideTips.showInDialog).toBe(true);
+      expect(getSettingsSchema().ui.properties.hideBanner.showInDialog).toBe(true);
+      expect(getSettingsSchema().privacy.properties.usageStatisticsEnabled.showInDialog).toBe(
+        false,
       );
-      expect(
-        getSettingsSchema().privacy.properties.usageStatisticsEnabled
-          .showInDialog,
-      ).toBe(false);
 
       // Check that advanced settings are hidden from dialog
-      expect(getSettingsSchema().security.properties.auth.showInDialog).toBe(
-        false,
-      );
-      expect(getSettingsSchema().tools.properties.core.showInDialog).toBe(
-        false,
-      );
+      expect(getSettingsSchema().security.properties.auth.showInDialog).toBe(false);
+      expect(getSettingsSchema().tools.properties.core.showInDialog).toBe(false);
       expect(getSettingsSchema().mcpServers.showInDialog).toBe(false);
       expect(getSettingsSchema().telemetry.showInDialog).toBe(false);
 
       // Check that some settings are appropriately hidden
       expect(getSettingsSchema().ui.properties.theme.showInDialog).toBe(false); // Changed to false
-      expect(getSettingsSchema().ui.properties.customThemes.showInDialog).toBe(
-        false,
-      ); // Managed via theme editor
-      expect(
-        getSettingsSchema().general.properties.checkpointing.showInDialog,
-      ).toBe(false); // Experimental feature
-      expect(getSettingsSchema().ui.properties.accessibility.showInDialog).toBe(
-        false,
-      ); // Changed to false
-      expect(
-        getSettingsSchema().context.properties.fileFiltering.showInDialog,
-      ).toBe(false); // Changed to false
-      expect(
-        getSettingsSchema().general.properties.preferredEditor.showInDialog,
-      ).toBe(false); // Changed to false
-      expect(
-        getSettingsSchema().advanced.properties.autoConfigureMemory
-          .showInDialog,
-      ).toBe(false);
+      expect(getSettingsSchema().ui.properties.customThemes.showInDialog).toBe(false); // Managed via theme editor
+      expect(getSettingsSchema().general.properties.checkpointing.showInDialog).toBe(false); // Experimental feature
+      expect(getSettingsSchema().ui.properties.accessibility.showInDialog).toBe(false); // Changed to false
+      expect(getSettingsSchema().context.properties.fileFiltering.showInDialog).toBe(false); // Changed to false
+      expect(getSettingsSchema().general.properties.preferredEditor.showInDialog).toBe(false); // Changed to false
+      expect(getSettingsSchema().advanced.properties.autoConfigureMemory.showInDialog).toBe(false);
     });
 
-    it('should infer Settings type correctly', () => {
+    it("should infer Settings type correctly", () => {
       // This test ensures that the Settings type is properly inferred from the schema
       const settings: Settings = {
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
         context: {
-          includeDirectories: ['/path/to/dir'],
+          includeDirectories: ["/path/to/dir"],
           loadMemoryFromIncludeDirectories: true,
         },
       };
 
       // TypeScript should not complain about these properties
-      expect(settings.ui?.theme).toBe('dark');
-      expect(settings.context?.includeDirectories).toEqual(['/path/to/dir']);
+      expect(settings.ui?.theme).toBe("dark");
+      expect(settings.context?.includeDirectories).toEqual(["/path/to/dir"]);
       expect(settings.context?.loadMemoryFromIncludeDirectories).toBe(true);
     });
 
-    it('should have includeDirectories setting in schema', () => {
-      expect(
-        getSettingsSchema().context?.properties.includeDirectories,
-      ).toBeDefined();
-      expect(
-        getSettingsSchema().context?.properties.includeDirectories.type,
-      ).toBe('array');
-      expect(
-        getSettingsSchema().context?.properties.includeDirectories.category,
-      ).toBe('Context');
-      expect(
-        getSettingsSchema().context?.properties.includeDirectories.default,
-      ).toEqual([]);
+    it("should have includeDirectories setting in schema", () => {
+      expect(getSettingsSchema().context?.properties.includeDirectories).toBeDefined();
+      expect(getSettingsSchema().context?.properties.includeDirectories.type).toBe("array");
+      expect(getSettingsSchema().context?.properties.includeDirectories.category).toBe("Context");
+      expect(getSettingsSchema().context?.properties.includeDirectories.default).toEqual([]);
     });
 
-    it('should have loadMemoryFromIncludeDirectories setting in schema', () => {
+    it("should have loadMemoryFromIncludeDirectories setting in schema", () => {
       expect(
-        getSettingsSchema().context?.properties
-          .loadMemoryFromIncludeDirectories,
+        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories,
       ).toBeDefined();
+      expect(getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories.type).toBe(
+        "boolean",
+      );
       expect(
-        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
-          .type,
-      ).toBe('boolean');
-      expect(
-        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
-          .category,
-      ).toBe('Context');
-      expect(
-        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories
-          .default,
-      ).toBe(false);
+        getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories.category,
+      ).toBe("Context");
+      expect(getSettingsSchema().context?.properties.loadMemoryFromIncludeDirectories.default).toBe(
+        false,
+      );
     });
 
-    it('should have folderTrustFeature setting in schema', () => {
-      expect(
-        getSettingsSchema().security.properties.folderTrust.properties.enabled,
-      ).toBeDefined();
-      expect(
-        getSettingsSchema().security.properties.folderTrust.properties.enabled
-          .type,
-      ).toBe('boolean');
-      expect(
-        getSettingsSchema().security.properties.folderTrust.properties.enabled
-          .category,
-      ).toBe('Security');
-      expect(
-        getSettingsSchema().security.properties.folderTrust.properties.enabled
-          .default,
-      ).toBe(false);
+    it("should have folderTrustFeature setting in schema", () => {
+      expect(getSettingsSchema().security.properties.folderTrust.properties.enabled).toBeDefined();
+      expect(getSettingsSchema().security.properties.folderTrust.properties.enabled.type).toBe(
+        "boolean",
+      );
+      expect(getSettingsSchema().security.properties.folderTrust.properties.enabled.category).toBe(
+        "Security",
+      );
+      expect(getSettingsSchema().security.properties.folderTrust.properties.enabled.default).toBe(
+        false,
+      );
       expect(
-        getSettingsSchema().security.properties.folderTrust.properties.enabled
-          .showInDialog,
+        getSettingsSchema().security.properties.folderTrust.properties.enabled.showInDialog,
       ).toBe(true);
     });
 
-    it('should have debugKeystrokeLogging setting in schema', () => {
-      expect(
-        getSettingsSchema().general.properties.debugKeystrokeLogging,
-      ).toBeDefined();
-      expect(
-        getSettingsSchema().general.properties.debugKeystrokeLogging.type,
-      ).toBe('boolean');
-      expect(
-        getSettingsSchema().general.properties.debugKeystrokeLogging.category,
-      ).toBe('General');
-      expect(
-        getSettingsSchema().general.properties.debugKeystrokeLogging.default,
-      ).toBe(false);
-      expect(
-        getSettingsSchema().general.properties.debugKeystrokeLogging
-          .requiresRestart,
-      ).toBe(false);
-      expect(
-        getSettingsSchema().general.properties.debugKeystrokeLogging
-          .showInDialog,
-      ).toBe(true);
-      expect(
-        getSettingsSchema().general.properties.debugKeystrokeLogging
-          .description,
-      ).toBe('Enable debug logging of keystrokes to the console.');
+    it("should have debugKeystrokeLogging setting in schema", () => {
+      expect(getSettingsSchema().general.properties.debugKeystrokeLogging).toBeDefined();
+      expect(getSettingsSchema().general.properties.debugKeystrokeLogging.type).toBe("boolean");
+      expect(getSettingsSchema().general.properties.debugKeystrokeLogging.category).toBe("General");
+      expect(getSettingsSchema().general.properties.debugKeystrokeLogging.default).toBe(false);
+      expect(getSettingsSchema().general.properties.debugKeystrokeLogging.requiresRestart).toBe(
+        false,
+      );
+      expect(getSettingsSchema().general.properties.debugKeystrokeLogging.showInDialog).toBe(true);
+      expect(getSettingsSchema().general.properties.debugKeystrokeLogging.description).toBe(
+        "Enable debug logging of keystrokes to the console.",
+      );
     });
 
-    it('should have previewFeatures setting in schema', () => {
-      expect(
-        getSettingsSchema().general.properties.previewFeatures,
-      ).toBeDefined();
-      expect(getSettingsSchema().general.properties.previewFeatures.type).toBe(
-        'boolean',
+    it("should have previewFeatures setting in schema", () => {
+      expect(getSettingsSchema().general.properties.previewFeatures).toBeDefined();
+      expect(getSettingsSchema().general.properties.previewFeatures.type).toBe("boolean");
+      expect(getSettingsSchema().general.properties.previewFeatures.category).toBe("General");
+      expect(getSettingsSchema().general.properties.previewFeatures.default).toBe(false);
+      expect(getSettingsSchema().general.properties.previewFeatures.requiresRestart).toBe(false);
+      expect(getSettingsSchema().general.properties.previewFeatures.showInDialog).toBe(true);
+      expect(getSettingsSchema().general.properties.previewFeatures.description).toBe(
+        "Enable preview features (e.g., preview models).",
       );
-      expect(
-        getSettingsSchema().general.properties.previewFeatures.category,
-      ).toBe('General');
-      expect(
-        getSettingsSchema().general.properties.previewFeatures.default,
-      ).toBe(false);
-      expect(
-        getSettingsSchema().general.properties.previewFeatures.requiresRestart,
-      ).toBe(false);
-      expect(
-        getSettingsSchema().general.properties.previewFeatures.showInDialog,
-      ).toBe(true);
-      expect(
-        getSettingsSchema().general.properties.previewFeatures.description,
-      ).toBe('Enable preview features (e.g., preview models).');
     });
 
-    it('should have enableAgents setting in schema', () => {
+    it("should have enableAgents setting in schema", () => {
       const setting = getSettingsSchema().experimental.properties.enableAgents;
       expect(setting).toBeDefined();
-      expect(setting.type).toBe('boolean');
-      expect(setting.category).toBe('Experimental');
+      expect(setting.type).toBe("boolean");
+      expect(setting.category).toBe("Experimental");
       expect(setting.default).toBe(false);
       expect(setting.requiresRestart).toBe(true);
       expect(setting.showInDialog).toBe(false);
-      expect(setting.description).toBe('Enable local and remote subagents.');
+      expect(setting.description).toBe("Enable local and remote subagents.");
     });
 
-    it('should have isModelAvailabilityServiceEnabled setting in schema', () => {
-      const setting =
-        getSettingsSchema().experimental.properties
-          .isModelAvailabilityServiceEnabled;
+    it("should have isModelAvailabilityServiceEnabled setting in schema", () => {
+      const setting = getSettingsSchema().experimental.properties.isModelAvailabilityServiceEnabled;
       expect(setting).toBeDefined();
-      expect(setting.type).toBe('boolean');
-      expect(setting.category).toBe('Experimental');
+      expect(setting.type).toBe("boolean");
+      expect(setting.category).toBe("Experimental");
       expect(setting.default).toBe(false);
       expect(setting.requiresRestart).toBe(true);
       expect(setting.showInDialog).toBe(false);
-      expect(setting.description).toBe(
-        'Enable model routing using new availability service.',
-      );
+      expect(setting.description).toBe("Enable model routing using new availability service.");
     });
   });
 
-  it('has JSON schema definitions for every referenced ref', () => {
+  it("has JSON schema definitions for every referenced ref", () => {
     const schema = getSettingsSchema();
     const referenced = new Set<string>();
 
@@ -402,7 +310,7 @@ describe('SettingsSchema', () => {
       if (collection.properties) {
         Object.values(collection.properties).forEach(visitDefinition);
       }
-      if (collection.type === 'array' && collection.properties) {
+      if (collection.type === "array" && collection.properties) {
         Object.values(collection.properties).forEach(visitDefinition);
       }
     };
@@ -412,9 +320,7 @@ describe('SettingsSchema', () => {
     // Ensure definitions map doesn't accumulate stale entries.
     Object.keys(SETTINGS_SCHEMA_DEFINITIONS).forEach((key) => {
       if (!referenced.has(key)) {
-        throw new Error(
-          `Definition "${key}" is exported but never referenced in the schema`,
-        );
+        throw new Error(`Definition "${key}" is exported but never referenced in the schema`);
       }
     });
   });
diff --git a/packages/ui-gemini/src/config/settingsSchema.ts b/packages/ui-gemini/src/config/settingsSchema.ts
index c1490f8cf..f8a6c2a50 100644
--- a/packages/ui-gemini/src/config/settingsSchema.ts
+++ b/packages/ui-gemini/src/config/settingsSchema.ts
@@ -10,46 +10,31 @@
 // --------------------------------------------------------------------------
 
 import type {
-  MCPServerConfig,
+  AuthType,
   BugCommandSettings,
+  MCPServerConfig,
   TelemetrySettings,
-  AuthType,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
 import {
+  DEFAULT_MODEL_CONFIGS,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-  DEFAULT_MODEL_CONFIGS,
   GEMINI_MODEL_ALIAS_PRO,
-} from '@airiscode/gemini-cli-core';
-import type { CustomTheme } from '../ui/themes/theme.js';
-import type { SessionRetentionSettings } from './settings.js';
-import { DEFAULT_MIN_RETENTION } from '../utils/sessionCleanup.js';
+} from "@airiscode/gemini-cli-core";
+import type { CustomTheme } from "../ui/themes/theme.js";
+import { DEFAULT_MIN_RETENTION } from "../utils/sessionCleanup.js";
+import type { SessionRetentionSettings } from "./settings.js";
 
-export type SettingsType =
-  | 'boolean'
-  | 'string'
-  | 'number'
-  | 'array'
-  | 'object'
-  | 'enum';
+export type SettingsType = "boolean" | "string" | "number" | "array" | "object" | "enum";
 
-export type SettingsValue =
-  | boolean
-  | string
-  | number
-  | string[]
-  | object
-  | undefined;
+export type SettingsValue = boolean | string | number | string[] | object | undefined;
 
 /**
  * Setting datatypes that "toggle" through a fixed list of options
  * (e.g. an enum or true/false) rather than allowing for free form input
  * (like a number or string).
  */
-export const TOGGLE_TYPES: ReadonlySet<SettingsType | undefined> = new Set([
-  'boolean',
-  'enum',
-]);
+export const TOGGLE_TYPES: ReadonlySet<SettingsType | undefined> = new Set(["boolean", "enum"]);
 
 export interface SettingEnumOption {
   value: string | number;
@@ -57,14 +42,14 @@ export interface SettingEnumOption {
 }
 
 function oneLine(strings: TemplateStringsArray, ...values: unknown[]): string {
-  let result = '';
+  let result = "";
   for (let i = 0; i < strings.length; i++) {
     result += strings[i];
     if (i < values.length) {
       result += String(values[i]);
     }
   }
-  return result.replace(/\s+/g, ' ').trim();
+  return result.replace(/\s+/g, " ").trim();
 }
 
 export interface SettingCollectionDefinition {
@@ -87,13 +72,13 @@ export interface SettingCollectionDefinition {
 
 export enum MergeStrategy {
   // Replace the old value with the new value. This is the default.
-  REPLACE = 'replace',
+  REPLACE = "replace",
   // Concatenate arrays.
-  CONCAT = 'concat',
+  CONCAT = "concat",
   // Merge arrays, ensuring unique values.
-  UNION = 'union',
+  UNION = "union",
   // Shallow merge objects.
-  SHALLOW_MERGE = 'shallow_merge',
+  SHALLOW_MERGE = "shallow_merge",
 }
 
 export interface SettingDefinition {
@@ -129,8 +114,8 @@ export interface SettingsSchema {
   [key: string]: SettingDefinition;
 }
 
-export type MemoryImportFormat = 'tree' | 'flat';
-export type DnsResolutionOrder = 'ipv4first' | 'verbatim';
+export type MemoryImportFormat = "tree" | "flat";
+export type DnsResolutionOrder = "ipv4first" | "verbatim";
 
 /**
  * The canonical schema for all settings.
@@ -140,404 +125,395 @@ export type DnsResolutionOrder = 'ipv4first' | 'verbatim';
 const SETTINGS_SCHEMA = {
   // Maintained for compatibility/criticality
   mcpServers: {
-    type: 'object',
-    label: 'MCP Servers',
-    category: 'Advanced',
+    type: "object",
+    label: "MCP Servers",
+    category: "Advanced",
     requiresRestart: true,
     default: {} as Record<string, MCPServerConfig>,
-    description: 'Configuration for MCP servers.',
+    description: "Configuration for MCP servers.",
     showInDialog: false,
     mergeStrategy: MergeStrategy.SHALLOW_MERGE,
     additionalProperties: {
-      type: 'object',
-      ref: 'MCPServerConfig',
+      type: "object",
+      ref: "MCPServerConfig",
     },
   },
 
   general: {
-    type: 'object',
-    label: 'General',
-    category: 'General',
+    type: "object",
+    label: "General",
+    category: "General",
     requiresRestart: false,
     default: {},
-    description: 'General application settings.',
+    description: "General application settings.",
     showInDialog: false,
     properties: {
       previewFeatures: {
-        type: 'boolean',
-        label: 'Preview Features (e.g., models)',
-        category: 'General',
+        type: "boolean",
+        label: "Preview Features (e.g., models)",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description: 'Enable preview features (e.g., preview models).',
+        description: "Enable preview features (e.g., preview models).",
         showInDialog: true,
       },
       preferredEditor: {
-        type: 'string',
-        label: 'Preferred Editor',
-        category: 'General',
+        type: "string",
+        label: "Preferred Editor",
+        category: "General",
         requiresRestart: false,
         default: undefined as string | undefined,
-        description: 'The preferred editor to open files in.',
+        description: "The preferred editor to open files in.",
         showInDialog: false,
       },
       vimMode: {
-        type: 'boolean',
-        label: 'Vim Mode',
-        category: 'General',
+        type: "boolean",
+        label: "Vim Mode",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description: 'Enable Vim keybindings',
+        description: "Enable Vim keybindings",
         showInDialog: true,
       },
       disableAutoUpdate: {
-        type: 'boolean',
-        label: 'Disable Auto Update',
-        category: 'General',
+        type: "boolean",
+        label: "Disable Auto Update",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description: 'Disable automatic updates',
+        description: "Disable automatic updates",
         showInDialog: true,
       },
       disableUpdateNag: {
-        type: 'boolean',
-        label: 'Disable Update Nag',
-        category: 'General',
+        type: "boolean",
+        label: "Disable Update Nag",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description: 'Disable update notification prompts.',
+        description: "Disable update notification prompts.",
         showInDialog: false,
       },
       checkpointing: {
-        type: 'object',
-        label: 'Checkpointing',
-        category: 'General',
+        type: "object",
+        label: "Checkpointing",
+        category: "General",
         requiresRestart: true,
         default: {},
-        description: 'Session checkpointing settings.',
+        description: "Session checkpointing settings.",
         showInDialog: false,
         properties: {
           enabled: {
-            type: 'boolean',
-            label: 'Enable Checkpointing',
-            category: 'General',
+            type: "boolean",
+            label: "Enable Checkpointing",
+            category: "General",
             requiresRestart: true,
             default: false,
-            description: 'Enable session checkpointing for recovery',
+            description: "Enable session checkpointing for recovery",
             showInDialog: false,
           },
         },
       },
       enablePromptCompletion: {
-        type: 'boolean',
-        label: 'Enable Prompt Completion',
-        category: 'General',
+        type: "boolean",
+        label: "Enable Prompt Completion",
+        category: "General",
         requiresRestart: true,
         default: false,
-        description:
-          'Enable AI-powered prompt completion suggestions while typing.',
+        description: "Enable AI-powered prompt completion suggestions while typing.",
         showInDialog: true,
       },
       retryFetchErrors: {
-        type: 'boolean',
-        label: 'Retry Fetch Errors',
-        category: 'General',
+        type: "boolean",
+        label: "Retry Fetch Errors",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description:
-          'Retry on "exception TypeError: fetch failed sending request" errors.',
+        description: 'Retry on "exception TypeError: fetch failed sending request" errors.',
         showInDialog: false,
       },
       debugKeystrokeLogging: {
-        type: 'boolean',
-        label: 'Debug Keystroke Logging',
-        category: 'General',
+        type: "boolean",
+        label: "Debug Keystroke Logging",
+        category: "General",
         requiresRestart: false,
         default: false,
-        description: 'Enable debug logging of keystrokes to the console.',
+        description: "Enable debug logging of keystrokes to the console.",
         showInDialog: true,
       },
       sessionRetention: {
-        type: 'object',
-        label: 'Session Retention',
-        category: 'General',
+        type: "object",
+        label: "Session Retention",
+        category: "General",
         requiresRestart: false,
         default: undefined as SessionRetentionSettings | undefined,
         showInDialog: false,
         properties: {
           enabled: {
-            type: 'boolean',
-            label: 'Enable Session Cleanup',
-            category: 'General',
+            type: "boolean",
+            label: "Enable Session Cleanup",
+            category: "General",
             requiresRestart: false,
             default: false,
-            description: 'Enable automatic session cleanup',
+            description: "Enable automatic session cleanup",
             showInDialog: true,
           },
           maxAge: {
-            type: 'string',
-            label: 'Max Session Age',
-            category: 'General',
+            type: "string",
+            label: "Max Session Age",
+            category: "General",
             requiresRestart: false,
             default: undefined as string | undefined,
-            description:
-              'Maximum age of sessions to keep (e.g., "30d", "7d", "24h", "1w")',
+            description: 'Maximum age of sessions to keep (e.g., "30d", "7d", "24h", "1w")',
             showInDialog: false,
           },
           maxCount: {
-            type: 'number',
-            label: 'Max Session Count',
-            category: 'General',
+            type: "number",
+            label: "Max Session Count",
+            category: "General",
             requiresRestart: false,
             default: undefined as number | undefined,
-            description:
-              'Alternative: Maximum number of sessions to keep (most recent)',
+            description: "Alternative: Maximum number of sessions to keep (most recent)",
             showInDialog: false,
           },
           minRetention: {
-            type: 'string',
-            label: 'Min Retention Period',
-            category: 'General',
+            type: "string",
+            label: "Min Retention Period",
+            category: "General",
             requiresRestart: false,
             default: DEFAULT_MIN_RETENTION,
             description: `Minimum retention period (safety limit, defaults to "${DEFAULT_MIN_RETENTION}")`,
             showInDialog: false,
           },
         },
-        description: 'Settings for automatic session cleanup.',
+        description: "Settings for automatic session cleanup.",
       },
     },
   },
   output: {
-    type: 'object',
-    label: 'Output',
-    category: 'General',
+    type: "object",
+    label: "Output",
+    category: "General",
     requiresRestart: false,
     default: {},
-    description: 'Settings for the CLI output.',
+    description: "Settings for the CLI output.",
     showInDialog: false,
     properties: {
       format: {
-        type: 'enum',
-        label: 'Output Format',
-        category: 'General',
+        type: "enum",
+        label: "Output Format",
+        category: "General",
         requiresRestart: false,
-        default: 'text',
-        description: 'The format of the CLI output.',
+        default: "text",
+        description: "The format of the CLI output.",
         showInDialog: true,
         options: [
-          { value: 'text', label: 'Text' },
-          { value: 'json', label: 'JSON' },
+          { value: "text", label: "Text" },
+          { value: "json", label: "JSON" },
         ],
       },
     },
   },
 
   ui: {
-    type: 'object',
-    label: 'UI',
-    category: 'UI',
+    type: "object",
+    label: "UI",
+    category: "UI",
     requiresRestart: false,
     default: {},
-    description: 'User interface settings.',
+    description: "User interface settings.",
     showInDialog: false,
     properties: {
       theme: {
-        type: 'string',
-        label: 'Theme',
-        category: 'UI',
+        type: "string",
+        label: "Theme",
+        category: "UI",
         requiresRestart: false,
         default: undefined as string | undefined,
-        description:
-          'The color theme for the UI. See the CLI themes guide for available options.',
+        description: "The color theme for the UI. See the CLI themes guide for available options.",
         showInDialog: false,
       },
       customThemes: {
-        type: 'object',
-        label: 'Custom Themes',
-        category: 'UI',
+        type: "object",
+        label: "Custom Themes",
+        category: "UI",
         requiresRestart: false,
         default: {} as Record<string, CustomTheme>,
-        description: 'Custom theme definitions.',
+        description: "Custom theme definitions.",
         showInDialog: false,
         additionalProperties: {
-          type: 'object',
-          ref: 'CustomTheme',
+          type: "object",
+          ref: "CustomTheme",
         },
       },
       hideWindowTitle: {
-        type: 'boolean',
-        label: 'Hide Window Title',
-        category: 'UI',
+        type: "boolean",
+        label: "Hide Window Title",
+        category: "UI",
         requiresRestart: true,
         default: false,
-        description: 'Hide the window title bar',
+        description: "Hide the window title bar",
         showInDialog: true,
       },
       showStatusInTitle: {
-        type: 'boolean',
-        label: 'Show Status in Title',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Status in Title",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description:
-          'Show Gemini CLI status and thoughts in the terminal window title',
+        description: "Show Gemini CLI status and thoughts in the terminal window title",
         showInDialog: true,
       },
       hideTips: {
-        type: 'boolean',
-        label: 'Hide Tips',
-        category: 'UI',
+        type: "boolean",
+        label: "Hide Tips",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Hide helpful tips in the UI',
+        description: "Hide helpful tips in the UI",
         showInDialog: true,
       },
       hideBanner: {
-        type: 'boolean',
-        label: 'Hide Banner',
-        category: 'UI',
+        type: "boolean",
+        label: "Hide Banner",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Hide the application banner',
+        description: "Hide the application banner",
         showInDialog: true,
       },
       hideContextSummary: {
-        type: 'boolean',
-        label: 'Hide Context Summary',
-        category: 'UI',
+        type: "boolean",
+        label: "Hide Context Summary",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description:
-          'Hide the context summary (GEMINI.md, MCP servers) above the input.',
+        description: "Hide the context summary (GEMINI.md, MCP servers) above the input.",
         showInDialog: true,
       },
       footer: {
-        type: 'object',
-        label: 'Footer',
-        category: 'UI',
+        type: "object",
+        label: "Footer",
+        category: "UI",
         requiresRestart: false,
         default: {},
-        description: 'Settings for the footer.',
+        description: "Settings for the footer.",
         showInDialog: false,
         properties: {
           hideCWD: {
-            type: 'boolean',
-            label: 'Hide CWD',
-            category: 'UI',
+            type: "boolean",
+            label: "Hide CWD",
+            category: "UI",
             requiresRestart: false,
             default: false,
-            description:
-              'Hide the current working directory path in the footer.',
+            description: "Hide the current working directory path in the footer.",
             showInDialog: true,
           },
           hideSandboxStatus: {
-            type: 'boolean',
-            label: 'Hide Sandbox Status',
-            category: 'UI',
+            type: "boolean",
+            label: "Hide Sandbox Status",
+            category: "UI",
             requiresRestart: false,
             default: false,
-            description: 'Hide the sandbox status indicator in the footer.',
+            description: "Hide the sandbox status indicator in the footer.",
             showInDialog: true,
           },
           hideModelInfo: {
-            type: 'boolean',
-            label: 'Hide Model Info',
-            category: 'UI',
+            type: "boolean",
+            label: "Hide Model Info",
+            category: "UI",
             requiresRestart: false,
             default: false,
-            description: 'Hide the model name and context usage in the footer.',
+            description: "Hide the model name and context usage in the footer.",
             showInDialog: true,
           },
           hideContextPercentage: {
-            type: 'boolean',
-            label: 'Hide Context Window Percentage',
-            category: 'UI',
+            type: "boolean",
+            label: "Hide Context Window Percentage",
+            category: "UI",
             requiresRestart: false,
             default: true,
-            description: 'Hides the context window remaining percentage.',
+            description: "Hides the context window remaining percentage.",
             showInDialog: true,
           },
         },
       },
       hideFooter: {
-        type: 'boolean',
-        label: 'Hide Footer',
-        category: 'UI',
+        type: "boolean",
+        label: "Hide Footer",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Hide the footer from the UI',
+        description: "Hide the footer from the UI",
         showInDialog: true,
       },
       showMemoryUsage: {
-        type: 'boolean',
-        label: 'Show Memory Usage',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Memory Usage",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Display memory usage information in the UI',
+        description: "Display memory usage information in the UI",
         showInDialog: true,
       },
       showLineNumbers: {
-        type: 'boolean',
-        label: 'Show Line Numbers',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Line Numbers",
+        category: "UI",
         requiresRestart: false,
         default: true,
-        description: 'Show line numbers in the chat.',
+        description: "Show line numbers in the chat.",
         showInDialog: true,
       },
       showCitations: {
-        type: 'boolean',
-        label: 'Show Citations',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Citations",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Show citations for generated text in the chat.',
+        description: "Show citations for generated text in the chat.",
         showInDialog: true,
       },
       showModelInfoInChat: {
-        type: 'boolean',
-        label: 'Show Model Info In Chat',
-        category: 'UI',
+        type: "boolean",
+        label: "Show Model Info In Chat",
+        category: "UI",
         requiresRestart: false,
         default: false,
-        description: 'Show the model name in the chat for each model turn.',
+        description: "Show the model name in the chat for each model turn.",
         showInDialog: true,
       },
       useFullWidth: {
-        type: 'boolean',
-        label: 'Use Full Width',
-        category: 'UI',
+        type: "boolean",
+        label: "Use Full Width",
+        category: "UI",
         requiresRestart: false,
         default: true,
-        description: 'Use the entire width of the terminal for output.',
+        description: "Use the entire width of the terminal for output.",
         showInDialog: true,
       },
       useAlternateBuffer: {
-        type: 'boolean',
-        label: 'Use Alternate Screen Buffer',
-        category: 'UI',
+        type: "boolean",
+        label: "Use Alternate Screen Buffer",
+        category: "UI",
         requiresRestart: true,
         default: false,
-        description:
-          'Use an alternate screen buffer for the UI, preserving shell history.',
+        description: "Use an alternate screen buffer for the UI, preserving shell history.",
         showInDialog: true,
       },
       incrementalRendering: {
-        type: 'boolean',
-        label: 'Incremental Rendering',
-        category: 'UI',
+        type: "boolean",
+        label: "Incremental Rendering",
+        category: "UI",
         requiresRestart: true,
         default: true,
         description:
-          'Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled.',
+          "Enable incremental rendering for the UI. This option will reduce flickering but may cause rendering artifacts. Only supported when useAlternateBuffer is enabled.",
         showInDialog: true,
       },
       customWittyPhrases: {
-        type: 'array',
-        label: 'Custom Witty Phrases',
-        category: 'UI',
+        type: "array",
+        label: "Custom Witty Phrases",
+        category: "UI",
         requiresRestart: false,
         default: [] as string[],
         description: oneLine`
@@ -545,34 +521,33 @@ const SETTINGS_SCHEMA = {
           When provided, the CLI cycles through these instead of the defaults.
         `,
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
       },
       accessibility: {
-        type: 'object',
-        label: 'Accessibility',
-        category: 'UI',
+        type: "object",
+        label: "Accessibility",
+        category: "UI",
         requiresRestart: true,
         default: {},
-        description: 'Accessibility settings.',
+        description: "Accessibility settings.",
         showInDialog: false,
         properties: {
           disableLoadingPhrases: {
-            type: 'boolean',
-            label: 'Disable Loading Phrases',
-            category: 'UI',
+            type: "boolean",
+            label: "Disable Loading Phrases",
+            category: "UI",
             requiresRestart: true,
             default: false,
-            description: 'Disable loading phrases for accessibility',
+            description: "Disable loading phrases for accessibility",
             showInDialog: true,
           },
           screenReader: {
-            type: 'boolean',
-            label: 'Screen Reader Mode',
-            category: 'UI',
+            type: "boolean",
+            label: "Screen Reader Mode",
+            category: "UI",
             requiresRestart: true,
             default: false,
-            description:
-              'Render output in plain-text to be more screen reader accessible',
+            description: "Render output in plain-text to be more screen reader accessible",
             showInDialog: true,
           },
         },
@@ -581,103 +556,101 @@ const SETTINGS_SCHEMA = {
   },
 
   ide: {
-    type: 'object',
-    label: 'IDE',
-    category: 'IDE',
+    type: "object",
+    label: "IDE",
+    category: "IDE",
     requiresRestart: true,
     default: {},
-    description: 'IDE integration settings.',
+    description: "IDE integration settings.",
     showInDialog: false,
     properties: {
       enabled: {
-        type: 'boolean',
-        label: 'IDE Mode',
-        category: 'IDE',
+        type: "boolean",
+        label: "IDE Mode",
+        category: "IDE",
         requiresRestart: true,
         default: false,
-        description: 'Enable IDE integration mode',
+        description: "Enable IDE integration mode",
         showInDialog: true,
       },
       hasSeenNudge: {
-        type: 'boolean',
-        label: 'Has Seen IDE Integration Nudge',
-        category: 'IDE',
+        type: "boolean",
+        label: "Has Seen IDE Integration Nudge",
+        category: "IDE",
         requiresRestart: false,
         default: false,
-        description: 'Whether the user has seen the IDE integration nudge.',
+        description: "Whether the user has seen the IDE integration nudge.",
         showInDialog: false,
       },
     },
   },
 
   privacy: {
-    type: 'object',
-    label: 'Privacy',
-    category: 'Privacy',
+    type: "object",
+    label: "Privacy",
+    category: "Privacy",
     requiresRestart: true,
     default: {},
-    description: 'Privacy-related settings.',
+    description: "Privacy-related settings.",
     showInDialog: false,
     properties: {
       usageStatisticsEnabled: {
-        type: 'boolean',
-        label: 'Enable Usage Statistics',
-        category: 'Privacy',
+        type: "boolean",
+        label: "Enable Usage Statistics",
+        category: "Privacy",
         requiresRestart: true,
         default: true,
-        description: 'Enable collection of usage statistics',
+        description: "Enable collection of usage statistics",
         showInDialog: false,
       },
     },
   },
 
   telemetry: {
-    type: 'object',
-    label: 'Telemetry',
-    category: 'Advanced',
+    type: "object",
+    label: "Telemetry",
+    category: "Advanced",
     requiresRestart: true,
     default: undefined as TelemetrySettings | undefined,
-    description: 'Telemetry configuration.',
+    description: "Telemetry configuration.",
     showInDialog: false,
-    ref: 'TelemetrySettings',
+    ref: "TelemetrySettings",
   },
 
   model: {
-    type: 'object',
-    label: 'Model',
-    category: 'Model',
+    type: "object",
+    label: "Model",
+    category: "Model",
     requiresRestart: false,
     default: {},
-    description: 'Settings related to the generative model.',
+    description: "Settings related to the generative model.",
     showInDialog: false,
     properties: {
       name: {
-        type: 'string',
-        label: 'Model',
-        category: 'Model',
+        type: "string",
+        label: "Model",
+        category: "Model",
         requiresRestart: false,
         default: undefined as string | undefined,
-        description: 'The Gemini model to use for conversations.',
+        description: "The Gemini model to use for conversations.",
         showInDialog: false,
       },
       maxSessionTurns: {
-        type: 'number',
-        label: 'Max Session Turns',
-        category: 'Model',
+        type: "number",
+        label: "Max Session Turns",
+        category: "Model",
         requiresRestart: false,
         default: -1,
         description:
-          'Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.',
+          "Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.",
         showInDialog: true,
       },
       summarizeToolOutput: {
-        type: 'object',
-        label: 'Summarize Tool Output',
-        category: 'Model',
+        type: "object",
+        label: "Summarize Tool Output",
+        category: "Model",
         requiresRestart: false,
-        default: undefined as
-          | Record<string, { tokenBudget?: number }>
-          | undefined,
+        default: undefined as Record<string, { tokenBudget?: number }> | undefined,
         description: oneLine`
           Enables or disables summarization of tool output.
           Configure per-tool token budgets (for example {"run_shell_command": {"tokenBudget": 2000}}).
@@ -685,128 +658,127 @@ const SETTINGS_SCHEMA = {
         `,
         showInDialog: false,
         additionalProperties: {
-          type: 'object',
-          description:
-            'Per-tool summarization settings with an optional tokenBudget.',
-          ref: 'SummarizeToolOutputSettings',
+          type: "object",
+          description: "Per-tool summarization settings with an optional tokenBudget.",
+          ref: "SummarizeToolOutputSettings",
         },
       },
       compressionThreshold: {
-        type: 'number',
-        label: 'Compression Threshold',
-        category: 'Model',
+        type: "number",
+        label: "Compression Threshold",
+        category: "Model",
         requiresRestart: true,
         default: 0.5 as number,
         description:
-          'The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3).',
+          "The fraction of context usage at which to trigger context compression (e.g. 0.2, 0.3).",
         showInDialog: true,
       },
       skipNextSpeakerCheck: {
-        type: 'boolean',
-        label: 'Skip Next Speaker Check',
-        category: 'Model',
+        type: "boolean",
+        label: "Skip Next Speaker Check",
+        category: "Model",
         requiresRestart: false,
         default: true,
-        description: 'Skip the next speaker check.',
+        description: "Skip the next speaker check.",
         showInDialog: true,
       },
     },
   },
 
   modelConfigs: {
-    type: 'object',
-    label: 'Model Configs',
-    category: 'Model',
+    type: "object",
+    label: "Model Configs",
+    category: "Model",
     requiresRestart: false,
     default: DEFAULT_MODEL_CONFIGS,
-    description: 'Model configurations.',
+    description: "Model configurations.",
     showInDialog: false,
     properties: {
       aliases: {
-        type: 'object',
-        label: 'Model Config Aliases',
-        category: 'Model',
+        type: "object",
+        label: "Model Config Aliases",
+        category: "Model",
         requiresRestart: false,
         default: DEFAULT_MODEL_CONFIGS.aliases,
         description:
-          'Named presets for model configs. Can be used in place of a model name and can inherit from other aliases using an `extends` property.',
+          "Named presets for model configs. Can be used in place of a model name and can inherit from other aliases using an `extends` property.",
         showInDialog: false,
       },
       customAliases: {
-        type: 'object',
-        label: 'Custom Model Config Aliases',
-        category: 'Model',
+        type: "object",
+        label: "Custom Model Config Aliases",
+        category: "Model",
         requiresRestart: false,
         default: {},
         description:
-          'Custom named presets for model configs. These are merged with (and override) the built-in aliases.',
+          "Custom named presets for model configs. These are merged with (and override) the built-in aliases.",
         showInDialog: false,
       },
       customOverrides: {
-        type: 'array',
-        label: 'Custom Model Config Overrides',
-        category: 'Model',
+        type: "array",
+        label: "Custom Model Config Overrides",
+        category: "Model",
         requiresRestart: false,
         default: [],
         description:
-          'Custom model config overrides. These are merged with (and added to) the built-in overrides.',
+          "Custom model config overrides. These are merged with (and added to) the built-in overrides.",
         showInDialog: false,
       },
       overrides: {
-        type: 'array',
-        label: 'Model Config Overrides',
-        category: 'Model',
+        type: "array",
+        label: "Model Config Overrides",
+        category: "Model",
         requiresRestart: false,
         default: [],
         description:
-          'Apply specific configuration overrides based on matches, with a primary key of model (or alias). The most specific match will be used.',
+          "Apply specific configuration overrides based on matches, with a primary key of model (or alias). The most specific match will be used.",
         showInDialog: false,
       },
     },
   },
 
   context: {
-    type: 'object',
-    label: 'Context',
-    category: 'Context',
+    type: "object",
+    label: "Context",
+    category: "Context",
     requiresRestart: false,
     default: {},
-    description: 'Settings for managing context provided to the model.',
+    description: "Settings for managing context provided to the model.",
     showInDialog: false,
     properties: {
       fileName: {
-        type: 'string',
-        label: 'Context File Name',
-        category: 'Context',
+        type: "string",
+        label: "Context File Name",
+        category: "Context",
         requiresRestart: false,
         default: undefined as string | string[] | undefined,
-        ref: 'StringOrStringArray',
+        ref: "StringOrStringArray",
         description:
-          'The name of the context file or files to load into memory. Accepts either a single string or an array of strings.',
+          "The name of the context file or files to load into memory. Accepts either a single string or an array of strings.",
         showInDialog: false,
       },
       importFormat: {
-        type: 'string',
-        label: 'Memory Import Format',
-        category: 'Context',
+        type: "string",
+        label: "Memory Import Format",
+        category: "Context",
         requiresRestart: false,
         default: undefined as MemoryImportFormat | undefined,
-        description: 'The format to use when importing memory.',
+        description: "The format to use when importing memory.",
         showInDialog: false,
       },
       discoveryMaxDirs: {
-        type: 'number',
-        label: 'Memory Discovery Max Dirs',
-        category: 'Context',
+        type: "number",
+        label: "Memory Discovery Max Dirs",
+        category: "Context",
         requiresRestart: false,
         default: 200,
-        description: 'Maximum number of directories to search for memory.',
+        description: "Maximum number of directories to search for memory.",
         showInDialog: true,
       },
       includeDirectories: {
-        type: 'array',
-        label: 'Include Directories',
-        category: 'Context',
+        type: "array",
+        label: "Include Directories",
+        category: "Context",
         requiresRestart: false,
         default: [] as string[],
         description: oneLine`
@@ -814,13 +786,13 @@ const SETTINGS_SCHEMA = {
           Missing directories will be skipped with a warning.
         `,
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
         mergeStrategy: MergeStrategy.CONCAT,
       },
       loadMemoryFromIncludeDirectories: {
-        type: 'boolean',
-        label: 'Load Memory From Include Directories',
-        category: 'Context',
+        type: "boolean",
+        label: "Load Memory From Include Directories",
+        category: "Context",
         requiresRestart: false,
         default: false,
         description: oneLine`
@@ -830,36 +802,36 @@ const SETTINGS_SCHEMA = {
         showInDialog: true,
       },
       fileFiltering: {
-        type: 'object',
-        label: 'File Filtering',
-        category: 'Context',
+        type: "object",
+        label: "File Filtering",
+        category: "Context",
         requiresRestart: true,
         default: {},
-        description: 'Settings for git-aware file filtering.',
+        description: "Settings for git-aware file filtering.",
         showInDialog: false,
         properties: {
           respectGitIgnore: {
-            type: 'boolean',
-            label: 'Respect .gitignore',
-            category: 'Context',
+            type: "boolean",
+            label: "Respect .gitignore",
+            category: "Context",
             requiresRestart: true,
             default: true,
-            description: 'Respect .gitignore files when searching',
+            description: "Respect .gitignore files when searching",
             showInDialog: true,
           },
           respectGeminiIgnore: {
-            type: 'boolean',
-            label: 'Respect .geminiignore',
-            category: 'Context',
+            type: "boolean",
+            label: "Respect .geminiignore",
+            category: "Context",
             requiresRestart: true,
             default: true,
-            description: 'Respect .geminiignore files when searching',
+            description: "Respect .geminiignore files when searching",
             showInDialog: true,
           },
           enableRecursiveFileSearch: {
-            type: 'boolean',
-            label: 'Enable Recursive File Search',
-            category: 'Context',
+            type: "boolean",
+            label: "Enable Recursive File Search",
+            category: "Context",
             requiresRestart: true,
             default: true,
             description: oneLine`
@@ -868,12 +840,12 @@ const SETTINGS_SCHEMA = {
             showInDialog: true,
           },
           disableFuzzySearch: {
-            type: 'boolean',
-            label: 'Disable Fuzzy Search',
-            category: 'Context',
+            type: "boolean",
+            label: "Disable Fuzzy Search",
+            category: "Context",
             requiresRestart: true,
             default: false,
-            description: 'Disable fuzzy search when searching for files.',
+            description: "Disable fuzzy search when searching for files.",
             showInDialog: true,
           },
         },
@@ -882,21 +854,21 @@ const SETTINGS_SCHEMA = {
   },
 
   tools: {
-    type: 'object',
-    label: 'Tools',
-    category: 'Tools',
+    type: "object",
+    label: "Tools",
+    category: "Tools",
     requiresRestart: true,
     default: {},
-    description: 'Settings for built-in and custom tools.',
+    description: "Settings for built-in and custom tools.",
     showInDialog: false,
     properties: {
       sandbox: {
-        type: 'string',
-        label: 'Sandbox',
-        category: 'Tools',
+        type: "string",
+        label: "Sandbox",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as boolean | string | undefined,
-        ref: 'BooleanOrString',
+        ref: "BooleanOrString",
         description: oneLine`
           Sandbox execution environment.
           Set to a boolean to enable or disable the sandbox, or provide a string path to a sandbox profile.
@@ -904,18 +876,18 @@ const SETTINGS_SCHEMA = {
         showInDialog: false,
       },
       shell: {
-        type: 'object',
-        label: 'Shell',
-        category: 'Tools',
+        type: "object",
+        label: "Shell",
+        category: "Tools",
         requiresRestart: false,
         default: {},
-        description: 'Settings for shell execution.',
+        description: "Settings for shell execution.",
         showInDialog: false,
         properties: {
           enableInteractiveShell: {
-            type: 'boolean',
-            label: 'Enable Interactive Shell',
-            category: 'Tools',
+            type: "boolean",
+            label: "Enable Interactive Shell",
+            category: "Tools",
             requiresRestart: true,
             default: true,
             description: oneLine`
@@ -925,40 +897,39 @@ const SETTINGS_SCHEMA = {
             showInDialog: true,
           },
           pager: {
-            type: 'string',
-            label: 'Pager',
-            category: 'Tools',
+            type: "string",
+            label: "Pager",
+            category: "Tools",
             requiresRestart: false,
-            default: 'cat' as string | undefined,
-            description:
-              'The pager command to use for shell output. Defaults to `cat`.',
+            default: "cat" as string | undefined,
+            description: "The pager command to use for shell output. Defaults to `cat`.",
             showInDialog: false,
           },
           showColor: {
-            type: 'boolean',
-            label: 'Show Color',
-            category: 'Tools',
+            type: "boolean",
+            label: "Show Color",
+            category: "Tools",
             requiresRestart: false,
             default: false,
-            description: 'Show color in shell output.',
+            description: "Show color in shell output.",
             showInDialog: true,
           },
           inactivityTimeout: {
-            type: 'number',
-            label: 'Inactivity Timeout',
-            category: 'Tools',
+            type: "number",
+            label: "Inactivity Timeout",
+            category: "Tools",
             requiresRestart: false,
             default: 300,
             description:
-              'The maximum time in seconds allowed without output from the shell command. Defaults to 5 minutes.',
+              "The maximum time in seconds allowed without output from the shell command. Defaults to 5 minutes.",
             showInDialog: false,
           },
         },
       },
       autoAccept: {
-        type: 'boolean',
-        label: 'Auto Accept',
-        category: 'Tools',
+        type: "boolean",
+        label: "Auto Accept",
+        category: "Tools",
         requiresRestart: false,
         default: false,
         description: oneLine`
@@ -967,9 +938,9 @@ const SETTINGS_SCHEMA = {
         showInDialog: true,
       },
       core: {
-        type: 'array',
-        label: 'Core Tools',
-        category: 'Tools',
+        type: "array",
+        label: "Core Tools",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string[] | undefined,
         description: oneLine`
@@ -977,12 +948,12 @@ const SETTINGS_SCHEMA = {
           Match semantics mirror tools.allowed; see the built-in tools documentation for available names.
         `,
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
       },
       allowed: {
-        type: 'array',
-        label: 'Allowed Tools',
-        category: 'Advanced',
+        type: "array",
+        label: "Allowed Tools",
+        category: "Advanced",
         requiresRestart: true,
         default: undefined as string[] | undefined,
         description: oneLine`
@@ -991,32 +962,32 @@ const SETTINGS_SCHEMA = {
           See shell tool command restrictions for matching details.
         `,
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
       },
       exclude: {
-        type: 'array',
-        label: 'Exclude Tools',
-        category: 'Tools',
+        type: "array",
+        label: "Exclude Tools",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'Tool names to exclude from discovery.',
+        description: "Tool names to exclude from discovery.",
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
         mergeStrategy: MergeStrategy.UNION,
       },
       discoveryCommand: {
-        type: 'string',
-        label: 'Tool Discovery Command',
-        category: 'Tools',
+        type: "string",
+        label: "Tool Discovery Command",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string | undefined,
-        description: 'Command to run for tool discovery.',
+        description: "Command to run for tool discovery.",
         showInDialog: false,
       },
       callCommand: {
-        type: 'string',
-        label: 'Tool Call Command',
-        category: 'Tools',
+        type: "string",
+        label: "Tool Call Command",
+        category: "Tools",
         requiresRestart: true,
         default: undefined as string | undefined,
         description: oneLine`
@@ -1026,47 +997,47 @@ const SETTINGS_SCHEMA = {
         showInDialog: false,
       },
       useRipgrep: {
-        type: 'boolean',
-        label: 'Use Ripgrep',
-        category: 'Tools',
+        type: "boolean",
+        label: "Use Ripgrep",
+        category: "Tools",
         requiresRestart: false,
         default: true,
         description:
-          'Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.',
+          "Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.",
         showInDialog: true,
       },
       enableToolOutputTruncation: {
-        type: 'boolean',
-        label: 'Enable Tool Output Truncation',
-        category: 'General',
+        type: "boolean",
+        label: "Enable Tool Output Truncation",
+        category: "General",
         requiresRestart: true,
         default: true,
-        description: 'Enable truncation of large tool outputs.',
+        description: "Enable truncation of large tool outputs.",
         showInDialog: true,
       },
       truncateToolOutputThreshold: {
-        type: 'number',
-        label: 'Tool Output Truncation Threshold',
-        category: 'General',
+        type: "number",
+        label: "Tool Output Truncation Threshold",
+        category: "General",
         requiresRestart: true,
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
         description:
-          'Truncate tool output if it is larger than this many characters. Set to -1 to disable.',
+          "Truncate tool output if it is larger than this many characters. Set to -1 to disable.",
         showInDialog: true,
       },
       truncateToolOutputLines: {
-        type: 'number',
-        label: 'Tool Output Truncation Lines',
-        category: 'General',
+        type: "number",
+        label: "Tool Output Truncation Lines",
+        category: "General",
         requiresRestart: true,
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
-        description: 'The number of lines to keep when truncating tool output.',
+        description: "The number of lines to keep when truncating tool output.",
         showInDialog: true,
       },
       enableMessageBusIntegration: {
-        type: 'boolean',
-        label: 'Enable Message Bus Integration',
-        category: 'Tools',
+        type: "boolean",
+        label: "Enable Message Bus Integration",
+        category: "Tools",
         requiresRestart: true,
         default: true,
         description: oneLine`
@@ -1076,158 +1047,158 @@ const SETTINGS_SCHEMA = {
         showInDialog: true,
       },
       enableHooks: {
-        type: 'boolean',
-        label: 'Enable Hooks System',
-        category: 'Advanced',
+        type: "boolean",
+        label: "Enable Hooks System",
+        category: "Advanced",
         requiresRestart: true,
         default: false,
         description:
-          'Enable the hooks system for intercepting and customizing Gemini CLI behavior. When enabled, hooks configured in settings will execute at appropriate lifecycle events (BeforeTool, AfterTool, BeforeModel, etc.). Requires MessageBus integration.',
+          "Enable the hooks system for intercepting and customizing Gemini CLI behavior. When enabled, hooks configured in settings will execute at appropriate lifecycle events (BeforeTool, AfterTool, BeforeModel, etc.). Requires MessageBus integration.",
         showInDialog: false,
       },
     },
   },
 
   mcp: {
-    type: 'object',
-    label: 'MCP',
-    category: 'MCP',
+    type: "object",
+    label: "MCP",
+    category: "MCP",
     requiresRestart: true,
     default: {},
-    description: 'Settings for Model Context Protocol (MCP) servers.',
+    description: "Settings for Model Context Protocol (MCP) servers.",
     showInDialog: false,
     properties: {
       serverCommand: {
-        type: 'string',
-        label: 'MCP Server Command',
-        category: 'MCP',
+        type: "string",
+        label: "MCP Server Command",
+        category: "MCP",
         requiresRestart: true,
         default: undefined as string | undefined,
-        description: 'Command to start an MCP server.',
+        description: "Command to start an MCP server.",
         showInDialog: false,
       },
       allowed: {
-        type: 'array',
-        label: 'Allow MCP Servers',
-        category: 'MCP',
+        type: "array",
+        label: "Allow MCP Servers",
+        category: "MCP",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'A list of MCP servers to allow.',
+        description: "A list of MCP servers to allow.",
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
       },
       excluded: {
-        type: 'array',
-        label: 'Exclude MCP Servers',
-        category: 'MCP',
+        type: "array",
+        label: "Exclude MCP Servers",
+        category: "MCP",
         requiresRestart: true,
         default: undefined as string[] | undefined,
-        description: 'A list of MCP servers to exclude.',
+        description: "A list of MCP servers to exclude.",
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
       },
     },
   },
   useSmartEdit: {
-    type: 'boolean',
-    label: 'Use Smart Edit',
-    category: 'Advanced',
+    type: "boolean",
+    label: "Use Smart Edit",
+    category: "Advanced",
     requiresRestart: false,
     default: true,
-    description: 'Enable the smart-edit tool instead of the replace tool.',
+    description: "Enable the smart-edit tool instead of the replace tool.",
     showInDialog: false,
   },
   useWriteTodos: {
-    type: 'boolean',
-    label: 'Use WriteTodos',
-    category: 'Advanced',
+    type: "boolean",
+    label: "Use WriteTodos",
+    category: "Advanced",
     requiresRestart: false,
     default: true,
-    description: 'Enable the write_todos tool.',
+    description: "Enable the write_todos tool.",
     showInDialog: false,
   },
   security: {
-    type: 'object',
-    label: 'Security',
-    category: 'Security',
+    type: "object",
+    label: "Security",
+    category: "Security",
     requiresRestart: true,
     default: {},
-    description: 'Security-related settings.',
+    description: "Security-related settings.",
     showInDialog: false,
     properties: {
       disableYoloMode: {
-        type: 'boolean',
-        label: 'Disable YOLO Mode',
-        category: 'Security',
+        type: "boolean",
+        label: "Disable YOLO Mode",
+        category: "Security",
         requiresRestart: true,
         default: false,
-        description: 'Disable YOLO mode, even if enabled by a flag.',
+        description: "Disable YOLO mode, even if enabled by a flag.",
         showInDialog: true,
       },
       blockGitExtensions: {
-        type: 'boolean',
-        label: 'Blocks extensions from Git',
-        category: 'Security',
+        type: "boolean",
+        label: "Blocks extensions from Git",
+        category: "Security",
         requiresRestart: true,
         default: false,
-        description: 'Blocks installing and loading extensions from Git.',
+        description: "Blocks installing and loading extensions from Git.",
         showInDialog: true,
       },
       folderTrust: {
-        type: 'object',
-        label: 'Folder Trust',
-        category: 'Security',
+        type: "object",
+        label: "Folder Trust",
+        category: "Security",
         requiresRestart: false,
         default: {},
-        description: 'Settings for folder trust.',
+        description: "Settings for folder trust.",
         showInDialog: false,
         properties: {
           enabled: {
-            type: 'boolean',
-            label: 'Folder Trust',
-            category: 'Security',
+            type: "boolean",
+            label: "Folder Trust",
+            category: "Security",
             requiresRestart: true,
             default: false,
-            description: 'Setting to track whether Folder trust is enabled.',
+            description: "Setting to track whether Folder trust is enabled.",
             showInDialog: true,
           },
         },
       },
       auth: {
-        type: 'object',
-        label: 'Authentication',
-        category: 'Security',
+        type: "object",
+        label: "Authentication",
+        category: "Security",
         requiresRestart: true,
         default: {},
-        description: 'Authentication settings.',
+        description: "Authentication settings.",
         showInDialog: false,
         properties: {
           selectedType: {
-            type: 'string',
-            label: 'Selected Auth Type',
-            category: 'Security',
+            type: "string",
+            label: "Selected Auth Type",
+            category: "Security",
             requiresRestart: true,
             default: undefined as AuthType | undefined,
-            description: 'The currently selected authentication type.',
+            description: "The currently selected authentication type.",
             showInDialog: false,
           },
           enforcedType: {
-            type: 'string',
-            label: 'Enforced Auth Type',
-            category: 'Advanced',
+            type: "string",
+            label: "Enforced Auth Type",
+            category: "Advanced",
             requiresRestart: true,
             default: undefined as AuthType | undefined,
             description:
-              'The required auth type. If this does not match the selected auth type, the user will be prompted to re-authenticate.',
+              "The required auth type. If this does not match the selected auth type, the user will be prompted to re-authenticate.",
             showInDialog: false,
           },
           useExternal: {
-            type: 'boolean',
-            label: 'Use External Auth',
-            category: 'Security',
+            type: "boolean",
+            label: "Use External Auth",
+            category: "Security",
             requiresRestart: true,
             default: undefined as boolean | undefined,
-            description: 'Whether to use an external authentication flow.',
+            description: "Whether to use an external authentication flow.",
             showInDialog: false,
           },
         },
@@ -1236,167 +1207,162 @@ const SETTINGS_SCHEMA = {
   },
 
   advanced: {
-    type: 'object',
-    label: 'Advanced',
-    category: 'Advanced',
+    type: "object",
+    label: "Advanced",
+    category: "Advanced",
     requiresRestart: true,
     default: {},
-    description: 'Advanced settings for power users.',
+    description: "Advanced settings for power users.",
     showInDialog: false,
     properties: {
       autoConfigureMemory: {
-        type: 'boolean',
-        label: 'Auto Configure Max Old Space Size',
-        category: 'Advanced',
+        type: "boolean",
+        label: "Auto Configure Max Old Space Size",
+        category: "Advanced",
         requiresRestart: true,
         default: false,
-        description: 'Automatically configure Node.js memory limits',
+        description: "Automatically configure Node.js memory limits",
         showInDialog: false,
       },
       dnsResolutionOrder: {
-        type: 'string',
-        label: 'DNS Resolution Order',
-        category: 'Advanced',
+        type: "string",
+        label: "DNS Resolution Order",
+        category: "Advanced",
         requiresRestart: true,
         default: undefined as DnsResolutionOrder | undefined,
-        description: 'The DNS resolution order.',
+        description: "The DNS resolution order.",
         showInDialog: false,
       },
       excludedEnvVars: {
-        type: 'array',
-        label: 'Excluded Project Environment Variables',
-        category: 'Advanced',
+        type: "array",
+        label: "Excluded Project Environment Variables",
+        category: "Advanced",
         requiresRestart: false,
-        default: ['DEBUG', 'DEBUG_MODE'] as string[],
-        description: 'Environment variables to exclude from project context.',
+        default: ["DEBUG", "DEBUG_MODE"] as string[],
+        description: "Environment variables to exclude from project context.",
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
         mergeStrategy: MergeStrategy.UNION,
       },
       bugCommand: {
-        type: 'object',
-        label: 'Bug Command',
-        category: 'Advanced',
+        type: "object",
+        label: "Bug Command",
+        category: "Advanced",
         requiresRestart: false,
         default: undefined as BugCommandSettings | undefined,
-        description: 'Configuration for the bug report command.',
+        description: "Configuration for the bug report command.",
         showInDialog: false,
-        ref: 'BugCommandSettings',
+        ref: "BugCommandSettings",
       },
     },
   },
 
   experimental: {
-    type: 'object',
-    label: 'Experimental',
-    category: 'Experimental',
+    type: "object",
+    label: "Experimental",
+    category: "Experimental",
     requiresRestart: true,
     default: {},
-    description: 'Setting to enable experimental features',
+    description: "Setting to enable experimental features",
     showInDialog: false,
     properties: {
       enableAgents: {
-        type: 'boolean',
-        label: 'Enable Agents',
-        category: 'Experimental',
+        type: "boolean",
+        label: "Enable Agents",
+        category: "Experimental",
         requiresRestart: true,
         default: false,
-        description: 'Enable local and remote subagents.',
+        description: "Enable local and remote subagents.",
         showInDialog: false,
       },
       extensionManagement: {
-        type: 'boolean',
-        label: 'Extension Management',
-        category: 'Experimental',
+        type: "boolean",
+        label: "Extension Management",
+        category: "Experimental",
         requiresRestart: true,
         default: true,
-        description: 'Enable extension management features.',
+        description: "Enable extension management features.",
         showInDialog: false,
       },
       extensionReloading: {
-        type: 'boolean',
-        label: 'Extension Reloading',
-        category: 'Experimental',
+        type: "boolean",
+        label: "Extension Reloading",
+        category: "Experimental",
         requiresRestart: true,
         default: false,
-        description:
-          'Enables extension loading/unloading within the CLI session.',
+        description: "Enables extension loading/unloading within the CLI session.",
         showInDialog: false,
       },
       isModelAvailabilityServiceEnabled: {
-        type: 'boolean',
-        label: 'Enable Model Availability Service',
-        category: 'Experimental',
+        type: "boolean",
+        label: "Enable Model Availability Service",
+        category: "Experimental",
         requiresRestart: true,
         default: false,
-        description: 'Enable model routing using new availability service.',
+        description: "Enable model routing using new availability service.",
         showInDialog: false,
       },
       jitContext: {
-        type: 'boolean',
-        label: 'JIT Context Loading',
-        category: 'Experimental',
+        type: "boolean",
+        label: "JIT Context Loading",
+        category: "Experimental",
         requiresRestart: true,
         default: false,
-        description: 'Enable Just-In-Time (JIT) context loading.',
+        description: "Enable Just-In-Time (JIT) context loading.",
         showInDialog: false,
       },
       codebaseInvestigatorSettings: {
-        type: 'object',
-        label: 'Codebase Investigator Settings',
-        category: 'Experimental',
+        type: "object",
+        label: "Codebase Investigator Settings",
+        category: "Experimental",
         requiresRestart: true,
         default: {},
-        description: 'Configuration for Codebase Investigator.',
+        description: "Configuration for Codebase Investigator.",
         showInDialog: false,
         properties: {
           enabled: {
-            type: 'boolean',
-            label: 'Enable Codebase Investigator',
-            category: 'Experimental',
+            type: "boolean",
+            label: "Enable Codebase Investigator",
+            category: "Experimental",
             requiresRestart: true,
             default: true,
-            description: 'Enable the Codebase Investigator agent.',
+            description: "Enable the Codebase Investigator agent.",
             showInDialog: true,
           },
           maxNumTurns: {
-            type: 'number',
-            label: 'Codebase Investigator Max Num Turns',
-            category: 'Experimental',
+            type: "number",
+            label: "Codebase Investigator Max Num Turns",
+            category: "Experimental",
             requiresRestart: true,
             default: 10,
-            description:
-              'Maximum number of turns for the Codebase Investigator agent.',
+            description: "Maximum number of turns for the Codebase Investigator agent.",
             showInDialog: true,
           },
           maxTimeMinutes: {
-            type: 'number',
-            label: 'Max Time (Minutes)',
-            category: 'Experimental',
+            type: "number",
+            label: "Max Time (Minutes)",
+            category: "Experimental",
             requiresRestart: true,
             default: 3,
-            description:
-              'Maximum time for the Codebase Investigator agent (in minutes).',
+            description: "Maximum time for the Codebase Investigator agent (in minutes).",
             showInDialog: false,
           },
           thinkingBudget: {
-            type: 'number',
-            label: 'Thinking Budget',
-            category: 'Experimental',
+            type: "number",
+            label: "Thinking Budget",
+            category: "Experimental",
             requiresRestart: true,
             default: 8192,
-            description:
-              'The thinking budget for the Codebase Investigator agent.',
+            description: "The thinking budget for the Codebase Investigator agent.",
             showInDialog: false,
           },
           model: {
-            type: 'string',
-            label: 'Model',
-            category: 'Experimental',
+            type: "string",
+            label: "Model",
+            category: "Experimental",
             requiresRestart: true,
             default: GEMINI_MODEL_ALIAS_PRO,
-            description:
-              'The model to use for the Codebase Investigator agent.',
+            description: "The model to use for the Codebase Investigator agent.",
             showInDialog: false,
           },
         },
@@ -1405,202 +1371,199 @@ const SETTINGS_SCHEMA = {
   },
 
   extensions: {
-    type: 'object',
-    label: 'Extensions',
-    category: 'Extensions',
+    type: "object",
+    label: "Extensions",
+    category: "Extensions",
     requiresRestart: true,
     default: {},
-    description: 'Settings for extensions.',
+    description: "Settings for extensions.",
     showInDialog: false,
     properties: {
       disabled: {
-        type: 'array',
-        label: 'Disabled Extensions',
-        category: 'Extensions',
+        type: "array",
+        label: "Disabled Extensions",
+        category: "Extensions",
         requiresRestart: true,
         default: [] as string[],
-        description: 'List of disabled extensions.',
+        description: "List of disabled extensions.",
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
         mergeStrategy: MergeStrategy.UNION,
       },
       workspacesWithMigrationNudge: {
-        type: 'array',
-        label: 'Workspaces with Migration Nudge',
-        category: 'Extensions',
+        type: "array",
+        label: "Workspaces with Migration Nudge",
+        category: "Extensions",
         requiresRestart: false,
         default: [] as string[],
-        description:
-          'List of workspaces for which the migration nudge has been shown.',
+        description: "List of workspaces for which the migration nudge has been shown.",
         showInDialog: false,
-        items: { type: 'string' },
+        items: { type: "string" },
         mergeStrategy: MergeStrategy.UNION,
       },
     },
   },
 
   hooks: {
-    type: 'object',
-    label: 'Hooks',
-    category: 'Advanced',
+    type: "object",
+    label: "Hooks",
+    category: "Advanced",
     requiresRestart: false,
     default: {},
-    description:
-      'Hook configurations for intercepting and customizing agent behavior.',
+    description: "Hook configurations for intercepting and customizing agent behavior.",
     showInDialog: false,
     properties: {
       disabled: {
-        type: 'array',
-        label: 'Disabled Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Disabled Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [] as string[],
         description:
-          'List of hook names (commands) that should be disabled. Hooks in this list will not execute even if configured.',
+          "List of hook names (commands) that should be disabled. Hooks in this list will not execute even if configured.",
         showInDialog: false,
         items: {
-          type: 'string',
-          description: 'Hook command name',
+          type: "string",
+          description: "Hook command name",
         },
         mergeStrategy: MergeStrategy.UNION,
       },
       BeforeTool: {
-        type: 'array',
-        label: 'Before Tool Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Before Tool Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute before tool execution. Can intercept, validate, or modify tool calls.',
+          "Hooks that execute before tool execution. Can intercept, validate, or modify tool calls.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       AfterTool: {
-        type: 'array',
-        label: 'After Tool Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "After Tool Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute after tool execution. Can process results, log outputs, or trigger follow-up actions.',
+          "Hooks that execute after tool execution. Can process results, log outputs, or trigger follow-up actions.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       BeforeAgent: {
-        type: 'array',
-        label: 'Before Agent Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Before Agent Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute before agent loop starts. Can set up context or initialize resources.',
+          "Hooks that execute before agent loop starts. Can set up context or initialize resources.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       AfterAgent: {
-        type: 'array',
-        label: 'After Agent Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "After Agent Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute after agent loop completes. Can perform cleanup or summarize results.',
+          "Hooks that execute after agent loop completes. Can perform cleanup or summarize results.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       Notification: {
-        type: 'array',
-        label: 'Notification Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Notification Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute on notification events (errors, warnings, info). Can log or alert on specific conditions.',
+          "Hooks that execute on notification events (errors, warnings, info). Can log or alert on specific conditions.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       SessionStart: {
-        type: 'array',
-        label: 'Session Start Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Session Start Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute when a session starts. Can initialize session-specific resources or state.',
+          "Hooks that execute when a session starts. Can initialize session-specific resources or state.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       SessionEnd: {
-        type: 'array',
-        label: 'Session End Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Session End Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute when a session ends. Can perform cleanup or persist session data.',
+          "Hooks that execute when a session ends. Can perform cleanup or persist session data.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       PreCompress: {
-        type: 'array',
-        label: 'Pre-Compress Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Pre-Compress Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute before chat history compression. Can back up or analyze conversation before compression.',
+          "Hooks that execute before chat history compression. Can back up or analyze conversation before compression.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       BeforeModel: {
-        type: 'array',
-        label: 'Before Model Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Before Model Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute before LLM requests. Can modify prompts, inject context, or control model parameters.',
+          "Hooks that execute before LLM requests. Can modify prompts, inject context, or control model parameters.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       AfterModel: {
-        type: 'array',
-        label: 'After Model Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "After Model Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute after LLM responses. Can process outputs, extract information, or log interactions.',
+          "Hooks that execute after LLM responses. Can process outputs, extract information, or log interactions.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
       BeforeToolSelection: {
-        type: 'array',
-        label: 'Before Tool Selection Hooks',
-        category: 'Advanced',
+        type: "array",
+        label: "Before Tool Selection Hooks",
+        category: "Advanced",
         requiresRestart: false,
         default: [],
         description:
-          'Hooks that execute before tool selection. Can filter or prioritize available tools dynamically.',
+          "Hooks that execute before tool selection. Can filter or prioritize available tools dynamically.",
         showInDialog: false,
-        ref: 'HookDefinitionArray',
+        ref: "HookDefinitionArray",
         mergeStrategy: MergeStrategy.CONCAT,
       },
     },
     additionalProperties: {
-      type: 'array',
-      description:
-        'Custom hook event arrays that contain hook definitions for user-defined events',
+      type: "array",
+      description: "Custom hook event arrays that contain hook definitions for user-defined events",
       mergeStrategy: MergeStrategy.CONCAT,
     },
   },
@@ -1610,308 +1573,292 @@ export type SettingsSchemaType = typeof SETTINGS_SCHEMA;
 
 export type SettingsJsonSchemaDefinition = Record<string, unknown>;
 
-export const SETTINGS_SCHEMA_DEFINITIONS: Record<
-  string,
-  SettingsJsonSchemaDefinition
-> = {
+export const SETTINGS_SCHEMA_DEFINITIONS: Record<string, SettingsJsonSchemaDefinition> = {
   MCPServerConfig: {
-    type: 'object',
-    description:
-      'Definition of a Model Context Protocol (MCP) server configuration.',
+    type: "object",
+    description: "Definition of a Model Context Protocol (MCP) server configuration.",
     additionalProperties: false,
     properties: {
       command: {
-        type: 'string',
-        description: 'Executable invoked for stdio transport.',
+        type: "string",
+        description: "Executable invoked for stdio transport.",
       },
       args: {
-        type: 'array',
-        description: 'Command-line arguments for the stdio transport command.',
-        items: { type: 'string' },
+        type: "array",
+        description: "Command-line arguments for the stdio transport command.",
+        items: { type: "string" },
       },
       env: {
-        type: 'object',
-        description: 'Environment variables to set for the server process.',
-        additionalProperties: { type: 'string' },
+        type: "object",
+        description: "Environment variables to set for the server process.",
+        additionalProperties: { type: "string" },
       },
       cwd: {
-        type: 'string',
-        description: 'Working directory for the server process.',
+        type: "string",
+        description: "Working directory for the server process.",
       },
       url: {
-        type: 'string',
-        description: 'SSE transport URL.',
+        type: "string",
+        description: "SSE transport URL.",
       },
       httpUrl: {
-        type: 'string',
-        description: 'Streaming HTTP transport URL.',
+        type: "string",
+        description: "Streaming HTTP transport URL.",
       },
       headers: {
-        type: 'object',
-        description: 'Additional HTTP headers sent to the server.',
-        additionalProperties: { type: 'string' },
+        type: "object",
+        description: "Additional HTTP headers sent to the server.",
+        additionalProperties: { type: "string" },
       },
       tcp: {
-        type: 'string',
-        description: 'TCP address for websocket transport.',
+        type: "string",
+        description: "TCP address for websocket transport.",
       },
       timeout: {
-        type: 'number',
-        description: 'Timeout in milliseconds for MCP requests.',
+        type: "number",
+        description: "Timeout in milliseconds for MCP requests.",
       },
       trust: {
-        type: 'boolean',
+        type: "boolean",
         description:
-          'Marks the server as trusted. Trusted servers may gain additional capabilities.',
+          "Marks the server as trusted. Trusted servers may gain additional capabilities.",
       },
       description: {
-        type: 'string',
-        description: 'Human-readable description of the server.',
+        type: "string",
+        description: "Human-readable description of the server.",
       },
       includeTools: {
-        type: 'array',
+        type: "array",
         description:
-          'Subset of tools that should be enabled for this server. When omitted all tools are enabled.',
-        items: { type: 'string' },
+          "Subset of tools that should be enabled for this server. When omitted all tools are enabled.",
+        items: { type: "string" },
       },
       excludeTools: {
-        type: 'array',
-        description:
-          'Tools that should be disabled for this server even if exposed.',
-        items: { type: 'string' },
+        type: "array",
+        description: "Tools that should be disabled for this server even if exposed.",
+        items: { type: "string" },
       },
       extension: {
-        type: 'object',
-        description:
-          'Metadata describing the Gemini CLI extension that owns this MCP server.',
-        additionalProperties: { type: ['string', 'boolean', 'number'] },
+        type: "object",
+        description: "Metadata describing the Gemini CLI extension that owns this MCP server.",
+        additionalProperties: { type: ["string", "boolean", "number"] },
       },
       oauth: {
-        type: 'object',
-        description: 'OAuth configuration for authenticating with the server.',
+        type: "object",
+        description: "OAuth configuration for authenticating with the server.",
         additionalProperties: true,
       },
       authProviderType: {
-        type: 'string',
+        type: "string",
         description:
-          'Authentication provider used for acquiring credentials (for example `dynamic_discovery`).',
-        enum: [
-          'dynamic_discovery',
-          'google_credentials',
-          'service_account_impersonation',
-        ],
+          "Authentication provider used for acquiring credentials (for example `dynamic_discovery`).",
+        enum: ["dynamic_discovery", "google_credentials", "service_account_impersonation"],
       },
       targetAudience: {
-        type: 'string',
-        description:
-          'OAuth target audience (CLIENT_ID.apps.googleusercontent.com).',
+        type: "string",
+        description: "OAuth target audience (CLIENT_ID.apps.googleusercontent.com).",
       },
       targetServiceAccount: {
-        type: 'string',
-        description:
-          'Service account email to impersonate (name@project.iam.gserviceaccount.com).',
+        type: "string",
+        description: "Service account email to impersonate (name@project.iam.gserviceaccount.com).",
       },
     },
   },
   TelemetrySettings: {
-    type: 'object',
-    description: 'Telemetry configuration for Gemini CLI.',
+    type: "object",
+    description: "Telemetry configuration for Gemini CLI.",
     additionalProperties: false,
     properties: {
       enabled: {
-        type: 'boolean',
-        description: 'Enables telemetry emission.',
+        type: "boolean",
+        description: "Enables telemetry emission.",
       },
       target: {
-        type: 'string',
-        description:
-          'Telemetry destination (for example `stderr`, `stdout`, or `otlp`).',
+        type: "string",
+        description: "Telemetry destination (for example `stderr`, `stdout`, or `otlp`).",
       },
       otlpEndpoint: {
-        type: 'string',
-        description: 'Endpoint for OTLP exporters.',
+        type: "string",
+        description: "Endpoint for OTLP exporters.",
       },
       otlpProtocol: {
-        type: 'string',
-        description: 'Protocol for OTLP exporters.',
-        enum: ['grpc', 'http'],
+        type: "string",
+        description: "Protocol for OTLP exporters.",
+        enum: ["grpc", "http"],
       },
       logPrompts: {
-        type: 'boolean',
-        description: 'Whether prompts are logged in telemetry payloads.',
+        type: "boolean",
+        description: "Whether prompts are logged in telemetry payloads.",
       },
       outfile: {
-        type: 'string',
-        description: 'File path for writing telemetry output.',
+        type: "string",
+        description: "File path for writing telemetry output.",
       },
       useCollector: {
-        type: 'boolean',
-        description: 'Whether to forward telemetry to an OTLP collector.',
+        type: "boolean",
+        description: "Whether to forward telemetry to an OTLP collector.",
       },
       useCliAuth: {
-        type: 'boolean',
+        type: "boolean",
         description:
-          'Whether to use CLI authentication for telemetry (only for in-process exporters).',
+          "Whether to use CLI authentication for telemetry (only for in-process exporters).",
       },
     },
   },
   BugCommandSettings: {
-    type: 'object',
-    description: 'Configuration for the bug report helper command.',
+    type: "object",
+    description: "Configuration for the bug report helper command.",
     additionalProperties: false,
     properties: {
       urlTemplate: {
-        type: 'string',
+        type: "string",
         description:
-          'Template used to open a bug report URL. Variables in the template are populated at runtime.',
+          "Template used to open a bug report URL. Variables in the template are populated at runtime.",
       },
     },
-    required: ['urlTemplate'],
+    required: ["urlTemplate"],
   },
   SummarizeToolOutputSettings: {
-    type: 'object',
+    type: "object",
     description:
-      'Controls summarization behavior for individual tools. All properties are optional.',
+      "Controls summarization behavior for individual tools. All properties are optional.",
     additionalProperties: false,
     properties: {
       tokenBudget: {
-        type: 'number',
-        description:
-          'Maximum number of tokens used when summarizing tool output.',
+        type: "number",
+        description: "Maximum number of tokens used when summarizing tool output.",
       },
     },
   },
   CustomTheme: {
-    type: 'object',
+    type: "object",
     description:
-      'Custom theme definition used for styling Gemini CLI output. Colors are provided as hex strings or named ANSI colors.',
+      "Custom theme definition used for styling Gemini CLI output. Colors are provided as hex strings or named ANSI colors.",
     additionalProperties: false,
     properties: {
       type: {
-        type: 'string',
-        enum: ['custom'],
-        default: 'custom',
+        type: "string",
+        enum: ["custom"],
+        default: "custom",
       },
       name: {
-        type: 'string',
-        description: 'Theme display name.',
+        type: "string",
+        description: "Theme display name.",
       },
       text: {
-        type: 'object',
+        type: "object",
         additionalProperties: false,
         properties: {
-          primary: { type: 'string' },
-          secondary: { type: 'string' },
-          link: { type: 'string' },
-          accent: { type: 'string' },
+          primary: { type: "string" },
+          secondary: { type: "string" },
+          link: { type: "string" },
+          accent: { type: "string" },
         },
       },
       background: {
-        type: 'object',
+        type: "object",
         additionalProperties: false,
         properties: {
-          primary: { type: 'string' },
+          primary: { type: "string" },
           diff: {
-            type: 'object',
+            type: "object",
             additionalProperties: false,
             properties: {
-              added: { type: 'string' },
-              removed: { type: 'string' },
+              added: { type: "string" },
+              removed: { type: "string" },
             },
           },
         },
       },
       border: {
-        type: 'object',
+        type: "object",
         additionalProperties: false,
         properties: {
-          default: { type: 'string' },
-          focused: { type: 'string' },
+          default: { type: "string" },
+          focused: { type: "string" },
         },
       },
       ui: {
-        type: 'object',
+        type: "object",
         additionalProperties: false,
         properties: {
-          comment: { type: 'string' },
-          symbol: { type: 'string' },
+          comment: { type: "string" },
+          symbol: { type: "string" },
           gradient: {
-            type: 'array',
-            items: { type: 'string' },
+            type: "array",
+            items: { type: "string" },
           },
         },
       },
       status: {
-        type: 'object',
+        type: "object",
         additionalProperties: false,
         properties: {
-          error: { type: 'string' },
-          success: { type: 'string' },
-          warning: { type: 'string' },
+          error: { type: "string" },
+          success: { type: "string" },
+          warning: { type: "string" },
         },
       },
-      Background: { type: 'string' },
-      Foreground: { type: 'string' },
-      LightBlue: { type: 'string' },
-      AccentBlue: { type: 'string' },
-      AccentPurple: { type: 'string' },
-      AccentCyan: { type: 'string' },
-      AccentGreen: { type: 'string' },
-      AccentYellow: { type: 'string' },
-      AccentRed: { type: 'string' },
-      DiffAdded: { type: 'string' },
-      DiffRemoved: { type: 'string' },
-      Comment: { type: 'string' },
-      Gray: { type: 'string' },
-      DarkGray: { type: 'string' },
+      Background: { type: "string" },
+      Foreground: { type: "string" },
+      LightBlue: { type: "string" },
+      AccentBlue: { type: "string" },
+      AccentPurple: { type: "string" },
+      AccentCyan: { type: "string" },
+      AccentGreen: { type: "string" },
+      AccentYellow: { type: "string" },
+      AccentRed: { type: "string" },
+      DiffAdded: { type: "string" },
+      DiffRemoved: { type: "string" },
+      Comment: { type: "string" },
+      Gray: { type: "string" },
+      DarkGray: { type: "string" },
       GradientColors: {
-        type: 'array',
-        items: { type: 'string' },
+        type: "array",
+        items: { type: "string" },
       },
     },
-    required: ['type', 'name'],
+    required: ["type", "name"],
   },
   StringOrStringArray: {
-    description: 'Accepts either a single string or an array of strings.',
-    anyOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' } }],
+    description: "Accepts either a single string or an array of strings.",
+    anyOf: [{ type: "string" }, { type: "array", items: { type: "string" } }],
   },
   BooleanOrString: {
-    description: 'Accepts either a boolean flag or a string command name.',
-    anyOf: [{ type: 'boolean' }, { type: 'string' }],
+    description: "Accepts either a boolean flag or a string command name.",
+    anyOf: [{ type: "boolean" }, { type: "string" }],
   },
   HookDefinitionArray: {
-    type: 'array',
-    description: 'Array of hook definition objects for a specific event.',
+    type: "array",
+    description: "Array of hook definition objects for a specific event.",
     items: {
-      type: 'object',
-      description:
-        'Hook definition specifying matcher pattern and hook configurations.',
+      type: "object",
+      description: "Hook definition specifying matcher pattern and hook configurations.",
       properties: {
         matcher: {
-          type: 'string',
+          type: "string",
           description:
-            'Pattern to match against the event context (tool name, notification type, etc.). Supports exact match, regex (/pattern/), and wildcards (*).',
+            "Pattern to match against the event context (tool name, notification type, etc.). Supports exact match, regex (/pattern/), and wildcards (*).",
         },
         hooks: {
-          type: 'array',
-          description: 'Hooks to execute when the matcher matches.',
+          type: "array",
+          description: "Hooks to execute when the matcher matches.",
           items: {
-            type: 'object',
-            description: 'Individual hook configuration.',
+            type: "object",
+            description: "Individual hook configuration.",
             properties: {
               type: {
-                type: 'string',
-                description:
-                  'Type of hook (currently only "command" supported).',
+                type: "string",
+                description: 'Type of hook (currently only "command" supported).',
               },
               command: {
-                type: 'string',
+                type: "string",
                 description:
-                  'Shell command to execute. Receives JSON input via stdin and returns JSON output via stdout.',
+                  "Shell command to execute. Receives JSON input via stdin and returns JSON output via stdout.",
               },
               timeout: {
-                type: 'number',
-                description: 'Timeout in milliseconds for hook execution.',
+                type: "number",
+                description: "Timeout in milliseconds for hook execution.",
               },
             },
           },
@@ -1927,14 +1874,14 @@ export function getSettingsSchema(): SettingsSchemaType {
 
 type InferSettings<T extends SettingsSchema> = {
   -readonly [K in keyof T]?: T[K] extends { properties: SettingsSchema }
-    ? InferSettings<T[K]['properties']>
-    : T[K]['type'] extends 'enum'
-      ? T[K]['options'] extends readonly SettingEnumOption[]
-        ? T[K]['options'][number]['value']
-        : T[K]['default']
-      : T[K]['default'] extends boolean
+    ? InferSettings<T[K]["properties"]>
+    : T[K]["type"] extends "enum"
+      ? T[K]["options"] extends readonly SettingEnumOption[]
+        ? T[K]["options"][number]["value"]
+        : T[K]["default"]
+      : T[K]["default"] extends boolean
         ? boolean
-        : T[K]['default'];
+        : T[K]["default"];
 };
 
 export type Settings = InferSettings<SettingsSchemaType>;
diff --git a/packages/ui-gemini/src/config/trustedFolders.test.ts b/packages/ui-gemini/src/config/trustedFolders.test.ts
index e3c4d6ad2..2dd25bb88 100644
--- a/packages/ui-gemini/src/config/trustedFolders.test.ts
+++ b/packages/ui-gemini/src/config/trustedFolders.test.ts
@@ -4,39 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as osActual from 'node:os';
-import { FatalConfigError, ideContextStore } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import * as osActual from "node:os";
+import * as path from "node:path";
+import { FatalConfigError, ideContextStore } from "@airiscode/gemini-cli-core";
+import stripJsonComments from "strip-json-comments";
+import { afterEach, beforeEach, describe, expect, it, type Mock, type Mocked, vi } from "vitest";
+import type { Settings } from "./settings.js";
 import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mocked,
-  type Mock,
-} from 'vitest';
-import * as fs from 'node:fs';
-import stripJsonComments from 'strip-json-comments';
-import * as path from 'node:path';
-import {
-  loadTrustedFolders,
   getTrustedFoldersPath,
-  TrustLevel,
   isWorkspaceTrusted,
+  loadTrustedFolders,
   resetTrustedFoldersForTesting,
-} from './trustedFolders.js';
-import type { Settings } from './settings.js';
+  TrustLevel,
+} from "./trustedFolders.js";
 
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof osActual>();
   return {
     ...actualOs,
-    homedir: vi.fn(() => '/mock/home/user'),
-    platform: vi.fn(() => 'linux'),
+    homedir: vi.fn(() => "/mock/home/user"),
+    platform: vi.fn(() => "linux"),
   };
 });
-vi.mock('fs', async (importOriginal) => {
+vi.mock("fs", async (importOriginal) => {
   const actualFs = await importOriginal<typeof fs>();
   return {
     ...actualFs,
@@ -46,11 +37,11 @@ vi.mock('fs', async (importOriginal) => {
     mkdirSync: vi.fn(),
   };
 });
-vi.mock('strip-json-comments', () => ({
+vi.mock("strip-json-comments", () => ({
   default: vi.fn((content) => content),
 }));
 
-describe('Trusted Folders Loading', () => {
+describe("Trusted Folders Loading", () => {
   let mockFsExistsSync: Mocked<typeof fs.existsSync>;
   let mockStripJsonComments: Mocked<typeof stripJsonComments>;
   let mockFsWriteFileSync: Mocked<typeof fs.writeFileSync>;
@@ -61,32 +52,30 @@ describe('Trusted Folders Loading', () => {
     mockFsExistsSync = vi.mocked(fs.existsSync);
     mockStripJsonComments = vi.mocked(stripJsonComments);
     mockFsWriteFileSync = vi.mocked(fs.writeFileSync);
-    vi.mocked(osActual.homedir).mockReturnValue('/mock/home/user');
+    vi.mocked(osActual.homedir).mockReturnValue("/mock/home/user");
     (mockStripJsonComments as unknown as Mock).mockImplementation(
       (jsonString: string) => jsonString,
     );
     (mockFsExistsSync as Mock).mockReturnValue(false);
-    (fs.readFileSync as Mock).mockReturnValue('{}');
+    (fs.readFileSync as Mock).mockReturnValue("{}");
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should load empty rules if no files exist', () => {
+  it("should load empty rules if no files exist", () => {
     const { rules, errors } = loadTrustedFolders();
     expect(rules).toEqual([]);
     expect(errors).toEqual([]);
   });
 
-  describe('isPathTrusted', () => {
+  describe("isPathTrusted", () => {
     function setup({ config = {} as Record<string, TrustLevel> } = {}) {
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p) => p === getTrustedFoldersPath(),
-      );
+      (mockFsExistsSync as Mock).mockImplementation((p) => p === getTrustedFoldersPath());
       (fs.readFileSync as Mock).mockImplementation((p) => {
         if (p === getTrustedFoldersPath()) return JSON.stringify(config);
-        return '{}';
+        return "{}";
       });
 
       const folders = loadTrustedFolders();
@@ -94,111 +83,101 @@ describe('Trusted Folders Loading', () => {
       return { folders };
     }
 
-    it('provides a method to determine if a path is trusted', () => {
+    it("provides a method to determine if a path is trusted", () => {
       const { folders } = setup({
         config: {
-          './myfolder': TrustLevel.TRUST_FOLDER,
-          '/trustedparent/trustme': TrustLevel.TRUST_PARENT,
-          '/user/folder': TrustLevel.TRUST_FOLDER,
-          '/secret': TrustLevel.DO_NOT_TRUST,
-          '/secret/publickeys': TrustLevel.TRUST_FOLDER,
+          "./myfolder": TrustLevel.TRUST_FOLDER,
+          "/trustedparent/trustme": TrustLevel.TRUST_PARENT,
+          "/user/folder": TrustLevel.TRUST_FOLDER,
+          "/secret": TrustLevel.DO_NOT_TRUST,
+          "/secret/publickeys": TrustLevel.TRUST_FOLDER,
         },
       });
-      expect(folders.isPathTrusted('/secret')).toBe(false);
-      expect(folders.isPathTrusted('/user/folder')).toBe(true);
-      expect(folders.isPathTrusted('/secret/publickeys/public.pem')).toBe(true);
-      expect(folders.isPathTrusted('/user/folder/harhar')).toBe(true);
-      expect(folders.isPathTrusted('myfolder/somefile.jpg')).toBe(true);
-      expect(folders.isPathTrusted('/trustedparent/someotherfolder')).toBe(
-        true,
-      );
-      expect(folders.isPathTrusted('/trustedparent/trustme')).toBe(true);
+      expect(folders.isPathTrusted("/secret")).toBe(false);
+      expect(folders.isPathTrusted("/user/folder")).toBe(true);
+      expect(folders.isPathTrusted("/secret/publickeys/public.pem")).toBe(true);
+      expect(folders.isPathTrusted("/user/folder/harhar")).toBe(true);
+      expect(folders.isPathTrusted("myfolder/somefile.jpg")).toBe(true);
+      expect(folders.isPathTrusted("/trustedparent/someotherfolder")).toBe(true);
+      expect(folders.isPathTrusted("/trustedparent/trustme")).toBe(true);
 
       // No explicit rule covers this file
-      expect(folders.isPathTrusted('/secret/bankaccounts.json')).toBe(
-        undefined,
-      );
-      expect(folders.isPathTrusted('/secret/mine/privatekey.pem')).toBe(
-        undefined,
-      );
-      expect(folders.isPathTrusted('/user/someotherfolder')).toBe(undefined);
+      expect(folders.isPathTrusted("/secret/bankaccounts.json")).toBe(undefined);
+      expect(folders.isPathTrusted("/secret/mine/privatekey.pem")).toBe(undefined);
+      expect(folders.isPathTrusted("/user/someotherfolder")).toBe(undefined);
     });
   });
 
-  it('should load user rules if only user file exists', () => {
+  it("should load user rules if only user file exists", () => {
     const userPath = getTrustedFoldersPath();
     (mockFsExistsSync as Mock).mockImplementation((p) => p === userPath);
     const userContent = {
-      '/user/folder': TrustLevel.TRUST_FOLDER,
+      "/user/folder": TrustLevel.TRUST_FOLDER,
     };
     (fs.readFileSync as Mock).mockImplementation((p) => {
       if (p === userPath) return JSON.stringify(userContent);
-      return '{}';
+      return "{}";
     });
 
     const { rules, errors } = loadTrustedFolders();
-    expect(rules).toEqual([
-      { path: '/user/folder', trustLevel: TrustLevel.TRUST_FOLDER },
-    ]);
+    expect(rules).toEqual([{ path: "/user/folder", trustLevel: TrustLevel.TRUST_FOLDER }]);
     expect(errors).toEqual([]);
   });
 
-  it('should handle JSON parsing errors gracefully', () => {
+  it("should handle JSON parsing errors gracefully", () => {
     const userPath = getTrustedFoldersPath();
     (mockFsExistsSync as Mock).mockImplementation((p) => p === userPath);
     (fs.readFileSync as Mock).mockImplementation((p) => {
-      if (p === userPath) return 'invalid json';
-      return '{}';
+      if (p === userPath) return "invalid json";
+      return "{}";
     });
 
     const { rules, errors } = loadTrustedFolders();
     expect(rules).toEqual([]);
     expect(errors.length).toBe(1);
     expect(errors[0].path).toBe(userPath);
-    expect(errors[0].message).toContain('Unexpected token');
+    expect(errors[0].message).toContain("Unexpected token");
   });
 
-  it('should use GEMINI_CLI_TRUSTED_FOLDERS_PATH env var if set', () => {
-    const customPath = '/custom/path/to/trusted_folders.json';
-    process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'] = customPath;
+  it("should use GEMINI_CLI_TRUSTED_FOLDERS_PATH env var if set", () => {
+    const customPath = "/custom/path/to/trusted_folders.json";
+    process.env["GEMINI_CLI_TRUSTED_FOLDERS_PATH"] = customPath;
 
     (mockFsExistsSync as Mock).mockImplementation((p) => p === customPath);
     const userContent = {
-      '/user/folder/from/env': TrustLevel.TRUST_FOLDER,
+      "/user/folder/from/env": TrustLevel.TRUST_FOLDER,
     };
     (fs.readFileSync as Mock).mockImplementation((p) => {
       if (p === customPath) return JSON.stringify(userContent);
-      return '{}';
+      return "{}";
     });
 
     const { rules, errors } = loadTrustedFolders();
     expect(rules).toEqual([
       {
-        path: '/user/folder/from/env',
+        path: "/user/folder/from/env",
         trustLevel: TrustLevel.TRUST_FOLDER,
       },
     ]);
     expect(errors).toEqual([]);
 
-    delete process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'];
+    delete process.env["GEMINI_CLI_TRUSTED_FOLDERS_PATH"];
   });
 
-  it('setValue should update the user config and save it', () => {
+  it("setValue should update the user config and save it", () => {
     const loadedFolders = loadTrustedFolders();
-    loadedFolders.setValue('/new/path', TrustLevel.TRUST_FOLDER);
+    loadedFolders.setValue("/new/path", TrustLevel.TRUST_FOLDER);
 
-    expect(loadedFolders.user.config['/new/path']).toBe(
-      TrustLevel.TRUST_FOLDER,
-    );
+    expect(loadedFolders.user.config["/new/path"]).toBe(TrustLevel.TRUST_FOLDER);
     expect(mockFsWriteFileSync).toHaveBeenCalledWith(
       getTrustedFoldersPath(),
-      JSON.stringify({ '/new/path': TrustLevel.TRUST_FOLDER }, null, 2),
-      { encoding: 'utf-8', mode: 0o600 },
+      JSON.stringify({ "/new/path": TrustLevel.TRUST_FOLDER }, null, 2),
+      { encoding: "utf-8", mode: 0o600 },
     );
   });
 });
 
-describe('isWorkspaceTrusted', () => {
+describe("isWorkspaceTrusted", () => {
   let mockCwd: string;
   const mockRules: Record<string, TrustLevel> = {};
   const mockSettings: Settings = {
@@ -211,16 +190,14 @@ describe('isWorkspaceTrusted', () => {
 
   beforeEach(() => {
     resetTrustedFoldersForTesting();
-    vi.spyOn(process, 'cwd').mockImplementation(() => mockCwd);
-    vi.spyOn(fs, 'readFileSync').mockImplementation((p) => {
+    vi.spyOn(process, "cwd").mockImplementation(() => mockCwd);
+    vi.spyOn(fs, "readFileSync").mockImplementation((p) => {
       if (p === getTrustedFoldersPath()) {
         return JSON.stringify(mockRules);
       }
-      return '{}';
+      return "{}";
     });
-    vi.spyOn(fs, 'existsSync').mockImplementation(
-      (p) => p === getTrustedFoldersPath(),
-    );
+    vi.spyOn(fs, "existsSync").mockImplementation((p) => p === getTrustedFoldersPath());
   });
 
   afterEach(() => {
@@ -229,106 +206,102 @@ describe('isWorkspaceTrusted', () => {
     Object.keys(mockRules).forEach((key) => delete mockRules[key]);
   });
 
-  it('should throw a fatal error if the config is malformed', () => {
-    mockCwd = '/home/user/projectA';
+  it("should throw a fatal error if the config is malformed", () => {
+    mockCwd = "/home/user/projectA";
     // This mock needs to be specific to this test to override the one in beforeEach
-    vi.spyOn(fs, 'readFileSync').mockImplementation((p) => {
+    vi.spyOn(fs, "readFileSync").mockImplementation((p) => {
       if (p === getTrustedFoldersPath()) {
         return '{"foo": "bar",}'; // Malformed JSON with trailing comma
       }
-      return '{}';
+      return "{}";
     });
     expect(() => isWorkspaceTrusted(mockSettings)).toThrow(FatalConfigError);
-    expect(() => isWorkspaceTrusted(mockSettings)).toThrow(
-      /Please fix the configuration file/,
-    );
+    expect(() => isWorkspaceTrusted(mockSettings)).toThrow(/Please fix the configuration file/);
   });
 
-  it('should throw a fatal error if the config is not a JSON object', () => {
-    mockCwd = '/home/user/projectA';
-    vi.spyOn(fs, 'readFileSync').mockImplementation((p) => {
+  it("should throw a fatal error if the config is not a JSON object", () => {
+    mockCwd = "/home/user/projectA";
+    vi.spyOn(fs, "readFileSync").mockImplementation((p) => {
       if (p === getTrustedFoldersPath()) {
-        return 'null';
+        return "null";
       }
-      return '{}';
+      return "{}";
     });
     expect(() => isWorkspaceTrusted(mockSettings)).toThrow(FatalConfigError);
-    expect(() => isWorkspaceTrusted(mockSettings)).toThrow(
-      /not a valid JSON object/,
-    );
+    expect(() => isWorkspaceTrusted(mockSettings)).toThrow(/not a valid JSON object/);
   });
 
-  it('should return true for a directly trusted folder', () => {
-    mockCwd = '/home/user/projectA';
-    mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
+  it("should return true for a directly trusted folder", () => {
+    mockCwd = "/home/user/projectA";
+    mockRules["/home/user/projectA"] = TrustLevel.TRUST_FOLDER;
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
   });
 
-  it('should return true for a child of a trusted folder', () => {
-    mockCwd = '/home/user/projectA/src';
-    mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
+  it("should return true for a child of a trusted folder", () => {
+    mockCwd = "/home/user/projectA/src";
+    mockRules["/home/user/projectA"] = TrustLevel.TRUST_FOLDER;
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
   });
 
-  it('should return true for a child of a trusted parent folder', () => {
-    mockCwd = '/home/user/projectB';
-    mockRules['/home/user/projectB/somefile.txt'] = TrustLevel.TRUST_PARENT;
+  it("should return true for a child of a trusted parent folder", () => {
+    mockCwd = "/home/user/projectB";
+    mockRules["/home/user/projectB/somefile.txt"] = TrustLevel.TRUST_PARENT;
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
   });
 
-  it('should return false for a directly untrusted folder', () => {
-    mockCwd = '/home/user/untrusted';
-    mockRules['/home/user/untrusted'] = TrustLevel.DO_NOT_TRUST;
+  it("should return false for a directly untrusted folder", () => {
+    mockCwd = "/home/user/untrusted";
+    mockRules["/home/user/untrusted"] = TrustLevel.DO_NOT_TRUST;
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: false,
-      source: 'file',
+      source: "file",
     });
   });
 
-  it('should return undefined for a child of an untrusted folder', () => {
-    mockCwd = '/home/user/untrusted/src';
-    mockRules['/home/user/untrusted'] = TrustLevel.DO_NOT_TRUST;
+  it("should return undefined for a child of an untrusted folder", () => {
+    mockCwd = "/home/user/untrusted/src";
+    mockRules["/home/user/untrusted"] = TrustLevel.DO_NOT_TRUST;
     expect(isWorkspaceTrusted(mockSettings).isTrusted).toBeUndefined();
   });
 
-  it('should return undefined when no rules match', () => {
-    mockCwd = '/home/user/other';
-    mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
-    mockRules['/home/user/untrusted'] = TrustLevel.DO_NOT_TRUST;
+  it("should return undefined when no rules match", () => {
+    mockCwd = "/home/user/other";
+    mockRules["/home/user/projectA"] = TrustLevel.TRUST_FOLDER;
+    mockRules["/home/user/untrusted"] = TrustLevel.DO_NOT_TRUST;
     expect(isWorkspaceTrusted(mockSettings).isTrusted).toBeUndefined();
   });
 
-  it('should prioritize trust over distrust', () => {
-    mockCwd = '/home/user/projectA/untrusted';
-    mockRules['/home/user/projectA'] = TrustLevel.TRUST_FOLDER;
-    mockRules['/home/user/projectA/untrusted'] = TrustLevel.DO_NOT_TRUST;
+  it("should prioritize trust over distrust", () => {
+    mockCwd = "/home/user/projectA/untrusted";
+    mockRules["/home/user/projectA"] = TrustLevel.TRUST_FOLDER;
+    mockRules["/home/user/projectA/untrusted"] = TrustLevel.DO_NOT_TRUST;
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
   });
 
-  it('should handle path normalization', () => {
-    mockCwd = '/home/user/projectA';
-    mockRules[`/home/user/../user/${path.basename('/home/user/projectA')}`] =
+  it("should handle path normalization", () => {
+    mockCwd = "/home/user/projectA";
+    mockRules[`/home/user/../user/${path.basename("/home/user/projectA")}`] =
       TrustLevel.TRUST_FOLDER;
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
   });
 });
 
-describe('isWorkspaceTrusted with IDE override', () => {
+describe("isWorkspaceTrusted with IDE override", () => {
   afterEach(() => {
     vi.clearAllMocks();
     ideContextStore.clear();
@@ -343,42 +316,42 @@ describe('isWorkspaceTrusted with IDE override', () => {
     },
   };
 
-  it('should return true when ideTrust is true, ignoring config', () => {
+  it("should return true when ideTrust is true, ignoring config", () => {
     ideContextStore.set({ workspaceState: { isTrusted: true } });
     // Even if config says don't trust, ideTrust should win.
-    vi.spyOn(fs, 'readFileSync').mockReturnValue(
+    vi.spyOn(fs, "readFileSync").mockReturnValue(
       JSON.stringify({ [process.cwd()]: TrustLevel.DO_NOT_TRUST }),
     );
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: true,
-      source: 'ide',
+      source: "ide",
     });
   });
 
-  it('should return false when ideTrust is false, ignoring config', () => {
+  it("should return false when ideTrust is false, ignoring config", () => {
     ideContextStore.set({ workspaceState: { isTrusted: false } });
     // Even if config says trust, ideTrust should win.
-    vi.spyOn(fs, 'readFileSync').mockReturnValue(
+    vi.spyOn(fs, "readFileSync").mockReturnValue(
       JSON.stringify({ [process.cwd()]: TrustLevel.TRUST_FOLDER }),
     );
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: false,
-      source: 'ide',
+      source: "ide",
     });
   });
 
-  it('should fall back to config when ideTrust is undefined', () => {
-    vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-    vi.spyOn(fs, 'readFileSync').mockReturnValue(
+  it("should fall back to config when ideTrust is undefined", () => {
+    vi.spyOn(fs, "existsSync").mockReturnValue(true);
+    vi.spyOn(fs, "readFileSync").mockReturnValue(
       JSON.stringify({ [process.cwd()]: TrustLevel.TRUST_FOLDER }),
     );
     expect(isWorkspaceTrusted(mockSettings)).toEqual({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
   });
 
-  it('should always return true if folderTrust setting is disabled', () => {
+  it("should always return true if folderTrust setting is disabled", () => {
     const settings: Settings = {
       security: {
         folderTrust: {
@@ -394,19 +367,19 @@ describe('isWorkspaceTrusted with IDE override', () => {
   });
 });
 
-describe('Trusted Folders Caching', () => {
+describe("Trusted Folders Caching", () => {
   beforeEach(() => {
     resetTrustedFoldersForTesting();
     vi.mocked(fs.existsSync).mockReturnValue(true);
-    vi.mocked(fs.readFileSync).mockReturnValue('{}');
+    vi.mocked(fs.readFileSync).mockReturnValue("{}");
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should cache the loaded folders object', () => {
-    const readSpy = vi.spyOn(fs, 'readFileSync');
+  it("should cache the loaded folders object", () => {
+    const readSpy = vi.spyOn(fs, "readFileSync");
 
     // First call should read the file
     loadTrustedFolders();
diff --git a/packages/ui-gemini/src/config/trustedFolders.ts b/packages/ui-gemini/src/config/trustedFolders.ts
index a23bc8de7..53c90d540 100644
--- a/packages/ui-gemini/src/config/trustedFolders.ts
+++ b/packages/ui-gemini/src/config/trustedFolders.ts
@@ -4,36 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { homedir } from 'node:os';
+import * as fs from "node:fs";
+import { homedir } from "node:os";
+import * as path from "node:path";
 import {
   FatalConfigError,
+  GEMINI_DIR,
   getErrorMessage,
-  isWithinRoot,
   ideContextStore,
-  GEMINI_DIR,
-} from '@airiscode/gemini-cli-core';
-import type { Settings } from './settings.js';
-import stripJsonComments from 'strip-json-comments';
+  isWithinRoot,
+} from "@airiscode/gemini-cli-core";
+import stripJsonComments from "strip-json-comments";
+import type { Settings } from "./settings.js";
 
-export const TRUSTED_FOLDERS_FILENAME = 'trustedFolders.json';
+export const TRUSTED_FOLDERS_FILENAME = "trustedFolders.json";
 
 export function getUserSettingsDir(): string {
   return path.join(homedir(), GEMINI_DIR);
 }
 
 export function getTrustedFoldersPath(): string {
-  if (process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH']) {
-    return process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'];
+  if (process.env["GEMINI_CLI_TRUSTED_FOLDERS_PATH"]) {
+    return process.env["GEMINI_CLI_TRUSTED_FOLDERS_PATH"];
   }
   return path.join(getUserSettingsDir(), TRUSTED_FOLDERS_FILENAME);
 }
 
 export enum TrustLevel {
-  TRUST_FOLDER = 'TRUST_FOLDER',
-  TRUST_PARENT = 'TRUST_PARENT',
-  DO_NOT_TRUST = 'DO_NOT_TRUST',
+  TRUST_FOLDER = "TRUST_FOLDER",
+  TRUST_PARENT = "TRUST_PARENT",
+  DO_NOT_TRUST = "DO_NOT_TRUST",
 }
 
 export interface TrustRule {
@@ -53,7 +53,7 @@ export interface TrustedFoldersFile {
 
 export interface TrustResult {
   isTrusted: boolean | undefined;
-  source: 'ide' | 'file' | undefined;
+  source: "ide" | "file" | undefined;
 }
 
 export class LoadedTrustedFolders {
@@ -76,17 +76,15 @@ export class LoadedTrustedFolders {
    * @param location path
    * @returns
    */
-  isPathTrusted(
-    location: string,
-    config?: Record<string, TrustLevel>,
-  ): boolean | undefined {
+  isPathTrusted(location: string, config?: Record<string, TrustLevel>): boolean | undefined {
     const configToUse = config ?? this.user.config;
     const trustedPaths: string[] = [];
     const untrustedPaths: string[] = [];
 
-    for (const rule of Object.entries(configToUse).map(
-      ([path, trustLevel]) => ({ path, trustLevel }),
-    )) {
+    for (const rule of Object.entries(configToUse).map(([path, trustLevel]) => ({
+      path,
+      trustLevel,
+    }))) {
       switch (rule.trustLevel) {
         case TrustLevel.TRUST_FOLDER:
           trustedPaths.push(rule.path);
@@ -158,16 +156,12 @@ export function loadTrustedFolders(): LoadedTrustedFolders {
   // Load user trusted folders
   try {
     if (fs.existsSync(userPath)) {
-      const content = fs.readFileSync(userPath, 'utf-8');
+      const content = fs.readFileSync(userPath, "utf-8");
       const parsed: unknown = JSON.parse(stripJsonComments(content));
 
-      if (
-        typeof parsed !== 'object' ||
-        parsed === null ||
-        Array.isArray(parsed)
-      ) {
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
         errors.push({
-          message: 'Trusted folders file is not a valid JSON object.',
+          message: "Trusted folders file is not a valid JSON object.",
           path: userPath,
         });
       } else {
@@ -181,27 +175,21 @@ export function loadTrustedFolders(): LoadedTrustedFolders {
     });
   }
 
-  loadedTrustedFolders = new LoadedTrustedFolders(
-    { path: userPath, config: userConfig },
-    errors,
-  );
+  loadedTrustedFolders = new LoadedTrustedFolders({ path: userPath, config: userConfig }, errors);
   return loadedTrustedFolders;
 }
 
-export function saveTrustedFolders(
-  trustedFoldersFile: TrustedFoldersFile,
-): void {
+export function saveTrustedFolders(trustedFoldersFile: TrustedFoldersFile): void {
   // Ensure the directory exists
   const dirPath = path.dirname(trustedFoldersFile.path);
   if (!fs.existsSync(dirPath)) {
     fs.mkdirSync(dirPath, { recursive: true });
   }
 
-  fs.writeFileSync(
-    trustedFoldersFile.path,
-    JSON.stringify(trustedFoldersFile.config, null, 2),
-    { encoding: 'utf-8', mode: 0o600 },
-  );
+  fs.writeFileSync(trustedFoldersFile.path, JSON.stringify(trustedFoldersFile.config, null, 2), {
+    encoding: "utf-8",
+    mode: 0o600,
+  });
 }
 
 /** Is folder trust feature enabled per the current applied settings */
@@ -210,25 +198,21 @@ export function isFolderTrustEnabled(settings: Settings): boolean {
   return folderTrustSetting;
 }
 
-function getWorkspaceTrustFromLocalConfig(
-  trustConfig?: Record<string, TrustLevel>,
-): TrustResult {
+function getWorkspaceTrustFromLocalConfig(trustConfig?: Record<string, TrustLevel>): TrustResult {
   const folders = loadTrustedFolders();
   const configToUse = trustConfig ?? folders.user.config;
 
   if (folders.errors.length > 0) {
-    const errorMessages = folders.errors.map(
-      (error) => `Error in ${error.path}: ${error.message}`,
-    );
+    const errorMessages = folders.errors.map((error) => `Error in ${error.path}: ${error.message}`);
     throw new FatalConfigError(
-      `${errorMessages.join('\n')}\nPlease fix the configuration file and try again.`,
+      `${errorMessages.join("\n")}\nPlease fix the configuration file and try again.`,
     );
   }
 
   const isTrusted = folders.isPathTrusted(process.cwd(), configToUse);
   return {
     isTrusted,
-    source: isTrusted !== undefined ? 'file' : undefined,
+    source: isTrusted !== undefined ? "file" : undefined,
   };
 }
 
@@ -242,7 +226,7 @@ export function isWorkspaceTrusted(
 
   const ideTrust = ideContextStore.get()?.workspaceState?.isTrusted;
   if (ideTrust !== undefined) {
-    return { isTrusted: ideTrust, source: 'ide' };
+    return { isTrusted: ideTrust, source: "ide" };
   }
 
   // Fall back to the local user configuration
diff --git a/packages/ui-gemini/src/core/auth.test.ts b/packages/ui-gemini/src/core/auth.test.ts
index 5bc66db5c..131954c1c 100644
--- a/packages/ui-gemini/src/core/auth.test.ts
+++ b/packages/ui-gemini/src/core/auth.test.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { performInitialAuth } from './auth.js';
-import { type Config } from '@airiscode/gemini-cli-core';
+import { type Config } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { performInitialAuth } from "./auth.js";
 
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("@airiscode/gemini-cli-core", () => ({
   AuthType: {
-    OAUTH: 'oauth',
+    OAUTH: "oauth",
   },
   getErrorMessage: (e: unknown) => (e as Error).message,
 }));
 
 const AuthType = {
-  OAUTH: 'oauth',
+  OAUTH: "oauth",
 } as const;
 
-describe('auth', () => {
+describe("auth", () => {
   let mockConfig: Config;
 
   beforeEach(() => {
@@ -28,13 +28,13 @@ describe('auth', () => {
     } as unknown as Config;
   });
 
-  it('should return null if authType is undefined', async () => {
+  it("should return null if authType is undefined", async () => {
     const result = await performInitialAuth(mockConfig, undefined);
     expect(result).toBeNull();
     expect(mockConfig.refreshAuth).not.toHaveBeenCalled();
   });
 
-  it('should return null on successful auth', async () => {
+  it("should return null on successful auth", async () => {
     const result = await performInitialAuth(
       mockConfig,
       AuthType.OAUTH as unknown as Parameters<typeof performInitialAuth>[1],
@@ -43,14 +43,14 @@ describe('auth', () => {
     expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.OAUTH);
   });
 
-  it('should return error message on failed auth', async () => {
-    const error = new Error('Auth failed');
+  it("should return error message on failed auth", async () => {
+    const error = new Error("Auth failed");
     vi.mocked(mockConfig.refreshAuth).mockRejectedValue(error);
     const result = await performInitialAuth(
       mockConfig,
       AuthType.OAUTH as unknown as Parameters<typeof performInitialAuth>[1],
     );
-    expect(result).toBe('Failed to login. Message: Auth failed');
+    expect(result).toBe("Failed to login. Message: Auth failed");
     expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.OAUTH);
   });
 });
diff --git a/packages/ui-gemini/src/core/auth.ts b/packages/ui-gemini/src/core/auth.ts
index 5529dbfb8..259f9582f 100644
--- a/packages/ui-gemini/src/core/auth.ts
+++ b/packages/ui-gemini/src/core/auth.ts
@@ -4,11 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  type AuthType,
-  type Config,
-  getErrorMessage,
-} from '@airiscode/gemini-cli-core';
+import { type AuthType, type Config, getErrorMessage } from "@airiscode/gemini-cli-core";
 
 /**
  * Handles the initial authentication flow.
diff --git a/packages/ui-gemini/src/core/initializer.test.ts b/packages/ui-gemini/src/core/initializer.test.ts
index e46a6e68d..1db9f0b22 100644
--- a/packages/ui-gemini/src/core/initializer.test.ts
+++ b/packages/ui-gemini/src/core/initializer.test.ts
@@ -4,21 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { initializeApp } from './initializer.js';
 import {
+  type Config,
   IdeClient,
-  logIdeConnection,
   logCliConfiguration,
-  type Config,
-} from '@airiscode/gemini-cli-core';
-import { performInitialAuth } from './auth.js';
-import { validateTheme } from './theme.js';
-import { type LoadedSettings } from '../config/settings.js';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+  logIdeConnection,
+} from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { type LoadedSettings } from "../config/settings.js";
+import { performInitialAuth } from "./auth.js";
+import { initializeApp } from "./initializer.js";
+import { validateTheme } from "./theme.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     IdeClient: {
@@ -31,15 +30,15 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('./auth.js', () => ({
+vi.mock("./auth.js", () => ({
   performInitialAuth: vi.fn(),
 }));
 
-vi.mock('./theme.js', () => ({
+vi.mock("./theme.js", () => ({
   validateTheme: vi.fn(),
 }));
 
-describe('initializer', () => {
+describe("initializer", () => {
   let mockConfig: {
     getToolRegistry: ReturnType<typeof vi.fn>;
     getIdeMode: ReturnType<typeof vi.fn>;
@@ -61,7 +60,7 @@ describe('initializer', () => {
       merged: {
         security: {
           auth: {
-            selectedType: 'oauth',
+            selectedType: "oauth",
           },
         },
       },
@@ -69,18 +68,13 @@ describe('initializer', () => {
     mockIdeClient = {
       connect: vi.fn(),
     };
-    vi.mocked(IdeClient.getInstance).mockResolvedValue(
-      mockIdeClient as unknown as IdeClient,
-    );
+    vi.mocked(IdeClient.getInstance).mockResolvedValue(mockIdeClient as unknown as IdeClient);
     vi.mocked(performInitialAuth).mockResolvedValue(null);
     vi.mocked(validateTheme).mockReturnValue(null);
   });
 
-  it('should initialize correctly in non-IDE mode', async () => {
-    const result = await initializeApp(
-      mockConfig as unknown as Config,
-      mockSettings,
-    );
+  it("should initialize correctly in non-IDE mode", async () => {
+    const result = await initializeApp(mockConfig as unknown as Config, mockSettings);
 
     expect(result).toEqual({
       authError: null,
@@ -88,18 +82,15 @@ describe('initializer', () => {
       shouldOpenAuthDialog: false,
       geminiMdFileCount: 5,
     });
-    expect(performInitialAuth).toHaveBeenCalledWith(mockConfig, 'oauth');
+    expect(performInitialAuth).toHaveBeenCalledWith(mockConfig, "oauth");
     expect(validateTheme).toHaveBeenCalledWith(mockSettings);
     expect(logCliConfiguration).toHaveBeenCalled();
     expect(IdeClient.getInstance).not.toHaveBeenCalled();
   });
 
-  it('should initialize correctly in IDE mode', async () => {
+  it("should initialize correctly in IDE mode", async () => {
     mockConfig.getIdeMode.mockReturnValue(true);
-    const result = await initializeApp(
-      mockConfig as unknown as Config,
-      mockSettings,
-    );
+    const result = await initializeApp(mockConfig as unknown as Config, mockSettings);
 
     expect(result).toEqual({
       authError: null,
@@ -115,34 +106,25 @@ describe('initializer', () => {
     );
   });
 
-  it('should handle auth error', async () => {
-    vi.mocked(performInitialAuth).mockResolvedValue('Auth failed');
-    const result = await initializeApp(
-      mockConfig as unknown as Config,
-      mockSettings,
-    );
+  it("should handle auth error", async () => {
+    vi.mocked(performInitialAuth).mockResolvedValue("Auth failed");
+    const result = await initializeApp(mockConfig as unknown as Config, mockSettings);
 
-    expect(result.authError).toBe('Auth failed');
+    expect(result.authError).toBe("Auth failed");
     expect(result.shouldOpenAuthDialog).toBe(true);
   });
 
-  it('should handle undefined auth type', async () => {
+  it("should handle undefined auth type", async () => {
     mockSettings.merged.security!.auth!.selectedType = undefined;
-    const result = await initializeApp(
-      mockConfig as unknown as Config,
-      mockSettings,
-    );
+    const result = await initializeApp(mockConfig as unknown as Config, mockSettings);
 
     expect(result.shouldOpenAuthDialog).toBe(true);
   });
 
-  it('should handle theme error', async () => {
-    vi.mocked(validateTheme).mockReturnValue('Theme not found');
-    const result = await initializeApp(
-      mockConfig as unknown as Config,
-      mockSettings,
-    );
+  it("should handle theme error", async () => {
+    vi.mocked(validateTheme).mockReturnValue("Theme not found");
+    const result = await initializeApp(mockConfig as unknown as Config, mockSettings);
 
-    expect(result.themeError).toBe('Theme not found');
+    expect(result.themeError).toBe("Theme not found");
   });
 });
diff --git a/packages/ui-gemini/src/core/initializer.ts b/packages/ui-gemini/src/core/initializer.ts
index e063bdda7..3233340fb 100644
--- a/packages/ui-gemini/src/core/initializer.ts
+++ b/packages/ui-gemini/src/core/initializer.ts
@@ -5,18 +5,18 @@
  */
 
 import {
+  type Config,
   IdeClient,
   IdeConnectionEvent,
   IdeConnectionType,
+  logCliConfiguration,
   logIdeConnection,
-  type Config,
   StartSessionEvent,
-  logCliConfiguration,
   startupProfiler,
-} from '@airiscode/gemini-cli-core';
-import { type LoadedSettings } from '../config/settings.js';
-import { performInitialAuth } from './auth.js';
-import { validateTheme } from './theme.js';
+} from "@airiscode/gemini-cli-core";
+import { type LoadedSettings } from "../config/settings.js";
+import { performInitialAuth } from "./auth.js";
+import { validateTheme } from "./theme.js";
 
 export interface InitializationResult {
   authError: string | null;
@@ -36,21 +36,15 @@ export async function initializeApp(
   config: Config,
   settings: LoadedSettings,
 ): Promise<InitializationResult> {
-  const authHandle = startupProfiler.start('authenticate');
-  const authError = await performInitialAuth(
-    config,
-    settings.merged.security?.auth?.selectedType,
-  );
+  const authHandle = startupProfiler.start("authenticate");
+  const authError = await performInitialAuth(config, settings.merged.security?.auth?.selectedType);
   authHandle?.end();
   const themeError = validateTheme(settings);
 
   const shouldOpenAuthDialog =
     settings.merged.security?.auth?.selectedType === undefined || !!authError;
 
-  logCliConfiguration(
-    config,
-    new StartSessionEvent(config, config.getToolRegistry()),
-  );
+  logCliConfiguration(config, new StartSessionEvent(config, config.getToolRegistry()));
 
   if (config.getIdeMode()) {
     const ideClient = await IdeClient.getInstance();
diff --git a/packages/ui-gemini/src/core/theme.test.ts b/packages/ui-gemini/src/core/theme.test.ts
index fb57d2cde..f88f72a63 100644
--- a/packages/ui-gemini/src/core/theme.test.ts
+++ b/packages/ui-gemini/src/core/theme.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { validateTheme } from './theme.js';
-import { themeManager } from '../ui/themes/theme-manager.js';
-import { type LoadedSettings } from '../config/settings.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { type LoadedSettings } from "../config/settings.js";
+import { themeManager } from "../ui/themes/theme-manager.js";
+import { validateTheme } from "./theme.js";
 
-vi.mock('../ui/themes/theme-manager.js', () => ({
+vi.mock("../ui/themes/theme-manager.js", () => ({
   themeManager: {
     findThemeByName: vi.fn(),
   },
 }));
 
-describe('theme', () => {
+describe("theme", () => {
   let mockSettings: LoadedSettings;
 
   beforeEach(() => {
@@ -23,29 +23,29 @@ describe('theme', () => {
     mockSettings = {
       merged: {
         ui: {
-          theme: 'test-theme',
+          theme: "test-theme",
         },
       },
     } as unknown as LoadedSettings;
   });
 
-  it('should return null if theme is found', () => {
+  it("should return null if theme is found", () => {
     vi.mocked(themeManager.findThemeByName).mockReturnValue(
       {} as unknown as ReturnType<typeof themeManager.findThemeByName>,
     );
     const result = validateTheme(mockSettings);
     expect(result).toBeNull();
-    expect(themeManager.findThemeByName).toHaveBeenCalledWith('test-theme');
+    expect(themeManager.findThemeByName).toHaveBeenCalledWith("test-theme");
   });
 
-  it('should return error message if theme is not found', () => {
+  it("should return error message if theme is not found", () => {
     vi.mocked(themeManager.findThemeByName).mockReturnValue(undefined);
     const result = validateTheme(mockSettings);
     expect(result).toBe('Theme "test-theme" not found.');
-    expect(themeManager.findThemeByName).toHaveBeenCalledWith('test-theme');
+    expect(themeManager.findThemeByName).toHaveBeenCalledWith("test-theme");
   });
 
-  it('should return null if theme is undefined', () => {
+  it("should return null if theme is undefined", () => {
     mockSettings.merged.ui!.theme = undefined;
     const result = validateTheme(mockSettings);
     expect(result).toBeNull();
diff --git a/packages/ui-gemini/src/core/theme.ts b/packages/ui-gemini/src/core/theme.ts
index ed2805a5a..6999e6d1a 100644
--- a/packages/ui-gemini/src/core/theme.ts
+++ b/packages/ui-gemini/src/core/theme.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { themeManager } from '../ui/themes/theme-manager.js';
-import { type LoadedSettings } from '../config/settings.js';
+import { type LoadedSettings } from "../config/settings.js";
+import { themeManager } from "../ui/themes/theme-manager.js";
 
 /**
  * Validates the configured theme.
diff --git a/packages/ui-gemini/src/gemini.test.tsx b/packages/ui-gemini/src/gemini.test.tsx
index 131899358..fbaa6052d 100644
--- a/packages/ui-gemini/src/gemini.test.tsx
+++ b/packages/ui-gemini/src/gemini.test.tsx
@@ -4,58 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import os from "node:os";
+import v8 from "node:v8";
+import { type Config, debugLogger, type ResumedSessionData } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest";
+import { type CliArgs } from "./config/config.js";
+import { type LoadedSettings } from "./config/settings.js";
+import { type InitializationResult } from "./core/initializer.js";
 import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type MockInstance,
-} from 'vitest';
-import {
+  getNodeMemoryArgs,
   main,
   setupUnhandledRejectionHandler,
-  validateDnsResolutionOrder,
   startInteractiveUI,
-  getNodeMemoryArgs,
-} from './gemini.js';
-import os from 'node:os';
-import v8 from 'node:v8';
-import { type CliArgs } from './config/config.js';
-import { type LoadedSettings } from './config/settings.js';
-import { appEvents, AppEvent } from './utils/events.js';
-import {
-  type Config,
-  type ResumedSessionData,
-  debugLogger,
-} from '@airiscode/gemini-cli-core';
-import { act } from 'react';
-import { type InitializationResult } from './core/initializer.js';
+  validateDnsResolutionOrder,
+} from "./gemini.js";
+import { AppEvent, appEvents } from "./utils/events.js";
 
 const performance = vi.hoisted(() => ({
   now: vi.fn(),
 }));
-vi.stubGlobal('performance', performance);
+vi.stubGlobal("performance", performance);
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     recordSlowRender: vi.fn(),
     writeToStdout: vi.fn((...args) =>
-      process.stdout.write(
-        ...(args as Parameters<typeof process.stdout.write>),
-      ),
+      process.stdout.write(...(args as Parameters<typeof process.stdout.write>)),
     ),
     patchStdio: vi.fn(() => () => {}),
     createWorkingStdio: vi.fn(() => ({
       stdout: {
         write: vi.fn((...args) =>
-          process.stdout.write(
-            ...(args as Parameters<typeof process.stdout.write>),
-          ),
+          process.stdout.write(...(args as Parameters<typeof process.stdout.write>)),
         ),
         columns: 80,
         rows: 24,
@@ -70,17 +53,17 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
     disableMouseEvents: vi.fn(),
     enterAlternateScreen: vi.fn(),
     disableLineWrapping: vi.fn(),
-    getVersion: vi.fn(() => Promise.resolve('1.0.0')),
+    getVersion: vi.fn(() => Promise.resolve("1.0.0")),
   };
 });
 
-vi.mock('ink', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("ink")>();
   return {
     ...actual,
     render: vi.fn((_node, options) => {
       if (options.alternateBuffer) {
-        options.stdout.write('\x1b[?7l');
+        options.stdout.write("\x1b[?7l");
       }
       // Simulate rendering time for recordSlowRender test
       const start = performance.now();
@@ -101,13 +84,13 @@ vi.mock('ink', async (importOriginal) => {
 // Custom error to identify mock process.exit calls
 class MockProcessExitError extends Error {
   constructor(readonly code?: string | number | null | undefined) {
-    super('PROCESS_EXIT_MOCKED');
-    this.name = 'MockProcessExitError';
+    super("PROCESS_EXIT_MOCKED");
+    this.name = "MockProcessExitError";
   }
 }
 
 // Mock dependencies
-vi.mock('./config/settings.js', () => ({
+vi.mock("./config/settings.js", () => ({
   loadSettings: vi.fn().mockReturnValue({
     merged: {
       advanced: {},
@@ -115,43 +98,43 @@ vi.mock('./config/settings.js', () => ({
       ui: {},
     },
     setValue: vi.fn(),
-    forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+    forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
     errors: [],
   }),
   migrateDeprecatedSettings: vi.fn(),
   SettingScope: {
-    User: 'user',
-    Workspace: 'workspace',
-    System: 'system',
-    SystemDefaults: 'system-defaults',
+    User: "user",
+    Workspace: "workspace",
+    System: "system",
+    SystemDefaults: "system-defaults",
   },
 }));
 
-vi.mock('./config/config.js', () => ({
+vi.mock("./config/config.js", () => ({
   loadCliConfig: vi.fn().mockResolvedValue({
     getSandbox: vi.fn(() => false),
-    getQuestion: vi.fn(() => ''),
+    getQuestion: vi.fn(() => ""),
     isInteractive: () => false,
   } as unknown as Config),
   parseArguments: vi.fn().mockResolvedValue({}),
   isDebugMode: vi.fn(() => false),
 }));
 
-vi.mock('read-package-up', () => ({
+vi.mock("read-package-up", () => ({
   readPackageUp: vi.fn().mockResolvedValue({
-    packageJson: { name: 'test-pkg', version: 'test-version' },
-    path: '/fake/path/package.json',
+    packageJson: { name: "test-pkg", version: "test-version" },
+    path: "/fake/path/package.json",
   }),
 }));
 
-vi.mock('update-notifier', () => ({
+vi.mock("update-notifier", () => ({
   default: vi.fn(() => ({
     notify: vi.fn(),
   })),
 }));
 
-vi.mock('./utils/events.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./utils/events.js')>();
+vi.mock("./utils/events.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./utils/events.js")>();
   return {
     ...actual,
     appEvents: {
@@ -160,87 +143,83 @@ vi.mock('./utils/events.js', async (importOriginal) => {
   };
 });
 
-vi.mock('./utils/sandbox.js', () => ({
-  sandbox_command: vi.fn(() => ''), // Default to no sandbox command
+vi.mock("./utils/sandbox.js", () => ({
+  sandbox_command: vi.fn(() => ""), // Default to no sandbox command
   start_sandbox: vi.fn(() => Promise.resolve()), // Mock as an async function that resolves
 }));
 
-vi.mock('./utils/relaunch.js', () => ({
+vi.mock("./utils/relaunch.js", () => ({
   relaunchAppInChildProcess: vi.fn(),
   relaunchOnExitCode: vi.fn(),
 }));
 
-vi.mock('./config/sandboxConfig.js', () => ({
+vi.mock("./config/sandboxConfig.js", () => ({
   loadSandboxConfig: vi.fn(),
 }));
 
-vi.mock('./ui/utils/mouse.js', () => ({
+vi.mock("./ui/utils/mouse.js", () => ({
   enableMouseEvents: vi.fn(),
   disableMouseEvents: vi.fn(),
   parseMouseEvent: vi.fn(),
   isIncompleteMouseSequence: vi.fn(),
 }));
 
-describe('gemini.tsx main function', () => {
+describe("gemini.tsx main function", () => {
   let originalEnvGeminiSandbox: string | undefined;
   let originalEnvSandbox: string | undefined;
-  let initialUnhandledRejectionListeners: NodeJS.UnhandledRejectionListener[] =
-    [];
+  let initialUnhandledRejectionListeners: NodeJS.UnhandledRejectionListener[] = [];
 
   beforeEach(() => {
     // Store and clear sandbox-related env variables to ensure a consistent test environment
-    originalEnvGeminiSandbox = process.env['GEMINI_SANDBOX'];
-    originalEnvSandbox = process.env['SANDBOX'];
-    delete process.env['GEMINI_SANDBOX'];
-    delete process.env['SANDBOX'];
+    originalEnvGeminiSandbox = process.env["GEMINI_SANDBOX"];
+    originalEnvSandbox = process.env["SANDBOX"];
+    delete process.env["GEMINI_SANDBOX"];
+    delete process.env["SANDBOX"];
 
-    initialUnhandledRejectionListeners =
-      process.listeners('unhandledRejection');
+    initialUnhandledRejectionListeners = process.listeners("unhandledRejection");
   });
 
   afterEach(() => {
     // Restore original env variables
     if (originalEnvGeminiSandbox !== undefined) {
-      process.env['GEMINI_SANDBOX'] = originalEnvGeminiSandbox;
+      process.env["GEMINI_SANDBOX"] = originalEnvGeminiSandbox;
     } else {
-      delete process.env['GEMINI_SANDBOX'];
+      delete process.env["GEMINI_SANDBOX"];
     }
     if (originalEnvSandbox !== undefined) {
-      process.env['SANDBOX'] = originalEnvSandbox;
+      process.env["SANDBOX"] = originalEnvSandbox;
     } else {
-      delete process.env['SANDBOX'];
+      delete process.env["SANDBOX"];
     }
 
-    const currentListeners = process.listeners('unhandledRejection');
+    const currentListeners = process.listeners("unhandledRejection");
     currentListeners.forEach((listener) => {
       if (!initialUnhandledRejectionListeners.includes(listener)) {
-        process.removeListener('unhandledRejection', listener);
+        process.removeListener("unhandledRejection", listener);
       }
     });
     vi.restoreAllMocks();
   });
 
-  it('verifies that we dont load the config before relaunchAppInChildProcess', async () => {
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
-    const { relaunchAppInChildProcess } = await import('./utils/relaunch.js');
-    const { loadCliConfig } = await import('./config/config.js');
-    const { loadSettings } = await import('./config/settings.js');
-    const { loadSandboxConfig } = await import('./config/sandboxConfig.js');
+  it("verifies that we dont load the config before relaunchAppInChildProcess", async () => {
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
+    const { relaunchAppInChildProcess } = await import("./utils/relaunch.js");
+    const { loadCliConfig } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const { loadSandboxConfig } = await import("./config/sandboxConfig.js");
     vi.mocked(loadSandboxConfig).mockResolvedValue(undefined);
 
     const callOrder: string[] = [];
     vi.mocked(relaunchAppInChildProcess).mockImplementation(async () => {
-      callOrder.push('relaunch');
+      callOrder.push("relaunch");
     });
     vi.mocked(loadCliConfig).mockImplementation(async () => {
-      callOrder.push('loadCliConfig');
+      callOrder.push("loadCliConfig");
       return {
         isInteractive: () => false,
-        getQuestion: () => '',
+        getQuestion: () => "",
         getSandbox: () => false,
         getDebugMode: () => false,
         getListExtensions: () => false,
@@ -253,7 +232,7 @@ describe('gemini.tsx main function', () => {
         getExperimentalZedIntegration: () => false,
         getScreenReader: () => false,
         getGeminiMdFileCount: () => 0,
-        getProjectRoot: () => '/',
+        getProjectRoot: () => "/",
         getPolicyEngine: vi.fn(),
         getMessageBus: () => ({
           subscribe: vi.fn(),
@@ -261,14 +240,14 @@ describe('gemini.tsx main function', () => {
         getEnableHooks: () => false,
         getToolRegistry: vi.fn(),
         getContentGeneratorConfig: vi.fn(),
-        getModel: () => 'gemini-pro',
-        getEmbeddingModel: () => 'embedding-001',
-        getApprovalMode: () => 'default',
+        getModel: () => "gemini-pro",
+        getEmbeddingModel: () => "embedding-001",
+        getApprovalMode: () => "default",
         getCoreTools: () => [],
         getTelemetryEnabled: () => false,
         getTelemetryLogPromptsEnabled: () => false,
         getFileFilteringRespectGitIgnore: () => true,
-        getOutputFormat: () => 'text',
+        getOutputFormat: () => "text",
         getExtensions: () => [],
         getUsageStatisticsEnabled: () => false,
       } as unknown as Config;
@@ -281,7 +260,7 @@ describe('gemini.tsx main function', () => {
         ui: {},
       },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
     } as never);
     try {
       await main();
@@ -297,40 +276,38 @@ describe('gemini.tsx main function', () => {
     // initializing mcp servers.
     // For the sandbox case we still have to load a partial cli config.
     // we can authorize outside the sandbox.
-    expect(callOrder).toEqual(['relaunch', 'loadCliConfig']);
+    expect(callOrder).toEqual(["relaunch", "loadCliConfig"]);
     processExitSpy.mockRestore();
   });
 
-  it('should log unhandled promise rejections and open debug console on first error', async () => {
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
+  it("should log unhandled promise rejections and open debug console on first error", async () => {
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
     const appEventsMock = vi.mocked(appEvents);
-    const debugLoggerErrorSpy = vi.spyOn(debugLogger, 'error');
-    const rejectionError = new Error('Test unhandled rejection');
+    const debugLoggerErrorSpy = vi.spyOn(debugLogger, "error");
+    const rejectionError = new Error("Test unhandled rejection");
 
     setupUnhandledRejectionHandler();
     // Simulate an unhandled rejection.
     // We are not using Promise.reject here as vitest will catch it.
     // Instead we will dispatch the event manually.
-    process.emit('unhandledRejection', rejectionError, Promise.resolve());
+    process.emit("unhandledRejection", rejectionError, Promise.resolve());
 
     // We need to wait for the rejection handler to be called.
     await new Promise(process.nextTick);
 
     expect(appEventsMock.emit).toHaveBeenCalledWith(AppEvent.OpenDebugConsole);
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Unhandled Promise Rejection'),
+      expect.stringContaining("Unhandled Promise Rejection"),
     );
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Please file a bug report using the /bug tool.'),
+      expect.stringContaining("Please file a bug report using the /bug tool."),
     );
 
     // Simulate a second rejection
-    const secondRejectionError = new Error('Second test unhandled rejection');
-    process.emit('unhandledRejection', secondRejectionError, Promise.resolve());
+    const secondRejectionError = new Error("Second test unhandled rejection");
+    process.emit("unhandledRejection", secondRejectionError, Promise.resolve());
     await new Promise(process.nextTick);
 
     // Ensure emit was only called once for OpenDebugConsole
@@ -344,26 +321,26 @@ describe('gemini.tsx main function', () => {
   });
 });
 
-describe('setWindowTitle', () => {
-  it('should set window title when hideWindowTitle is false', async () => {
+describe("setWindowTitle", () => {
+  it("should set window title when hideWindowTitle is false", async () => {
     // setWindowTitle is not exported, but we can test its effect if we had a way to call it.
     // Since we can't easily call it directly without exporting it, we skip direct testing
     // and rely on startInteractiveUI tests which call it.
   });
 });
 
-describe('initializeOutputListenersAndFlush', () => {
+describe("initializeOutputListenersAndFlush", () => {
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should flush backlogs and setup listeners if no listeners exist', async () => {
-    const { coreEvents } = await import('@airiscode/gemini-cli-core');
-    const { initializeOutputListenersAndFlush } = await import('./gemini.js');
+  it("should flush backlogs and setup listeners if no listeners exist", async () => {
+    const { coreEvents } = await import("@airiscode/gemini-cli-core");
+    const { initializeOutputListenersAndFlush } = await import("./gemini.js");
 
     // Mock listenerCount to return 0
-    vi.spyOn(coreEvents, 'listenerCount').mockReturnValue(0);
-    const drainSpy = vi.spyOn(coreEvents, 'drainBacklogs');
+    vi.spyOn(coreEvents, "listenerCount").mockReturnValue(0);
+    const drainSpy = vi.spyOn(coreEvents, "drainBacklogs");
 
     initializeOutputListenersAndFlush();
 
@@ -373,26 +350,26 @@ describe('initializeOutputListenersAndFlush', () => {
   });
 });
 
-describe('getNodeMemoryArgs', () => {
+describe("getNodeMemoryArgs", () => {
   let osTotalMemSpy: MockInstance;
   let v8GetHeapStatisticsSpy: MockInstance;
 
   beforeEach(() => {
-    osTotalMemSpy = vi.spyOn(os, 'totalmem');
-    v8GetHeapStatisticsSpy = vi.spyOn(v8, 'getHeapStatistics');
-    delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+    osTotalMemSpy = vi.spyOn(os, "totalmem");
+    v8GetHeapStatisticsSpy = vi.spyOn(v8, "getHeapStatistics");
+    delete process.env["GEMINI_CLI_NO_RELAUNCH"];
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should return empty array if GEMINI_CLI_NO_RELAUNCH is set', () => {
-    process.env['GEMINI_CLI_NO_RELAUNCH'] = 'true';
+  it("should return empty array if GEMINI_CLI_NO_RELAUNCH is set", () => {
+    process.env["GEMINI_CLI_NO_RELAUNCH"] = "true";
     expect(getNodeMemoryArgs(false)).toEqual([]);
   });
 
-  it('should return empty array if current heap limit is sufficient', () => {
+  it("should return empty array if current heap limit is sufficient", () => {
     osTotalMemSpy.mockReturnValue(16 * 1024 * 1024 * 1024); // 16GB
     v8GetHeapStatisticsSpy.mockReturnValue({
       heap_size_limit: 8 * 1024 * 1024 * 1024, // 8GB
@@ -401,54 +378,50 @@ describe('getNodeMemoryArgs', () => {
     expect(getNodeMemoryArgs(false)).toEqual([]);
   });
 
-  it('should return memory args if current heap limit is insufficient', () => {
+  it("should return memory args if current heap limit is insufficient", () => {
     osTotalMemSpy.mockReturnValue(16 * 1024 * 1024 * 1024); // 16GB
     v8GetHeapStatisticsSpy.mockReturnValue({
       heap_size_limit: 4 * 1024 * 1024 * 1024, // 4GB
     });
     // Target is 50% of 16GB = 8GB. Current is 4GB. Relaunch needed.
-    expect(getNodeMemoryArgs(false)).toEqual(['--max-old-space-size=8192']);
+    expect(getNodeMemoryArgs(false)).toEqual(["--max-old-space-size=8192"]);
   });
 
-  it('should log debug info when isDebugMode is true', () => {
-    const debugSpy = vi.spyOn(debugLogger, 'debug');
+  it("should log debug info when isDebugMode is true", () => {
+    const debugSpy = vi.spyOn(debugLogger, "debug");
     osTotalMemSpy.mockReturnValue(16 * 1024 * 1024 * 1024);
     v8GetHeapStatisticsSpy.mockReturnValue({
       heap_size_limit: 4 * 1024 * 1024 * 1024,
     });
     getNodeMemoryArgs(true);
+    expect(debugSpy).toHaveBeenCalledWith(expect.stringContaining("Current heap size"));
     expect(debugSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Current heap size'),
-    );
-    expect(debugSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Need to relaunch with more memory'),
+      expect.stringContaining("Need to relaunch with more memory"),
     );
   });
 });
 
-describe('gemini.tsx main function kitty protocol', () => {
+describe("gemini.tsx main function kitty protocol", () => {
   let originalEnvNoRelaunch: string | undefined;
-  let setRawModeSpy: MockInstance<
-    (mode: boolean) => NodeJS.ReadStream & { fd: 0 }
-  >;
+  let setRawModeSpy: MockInstance<(mode: boolean) => NodeJS.ReadStream & { fd: 0 }>;
 
   beforeEach(() => {
     // Set no relaunch in tests since process spawning causing issues in tests
-    originalEnvNoRelaunch = process.env['GEMINI_CLI_NO_RELAUNCH'];
-    process.env['GEMINI_CLI_NO_RELAUNCH'] = 'true';
+    originalEnvNoRelaunch = process.env["GEMINI_CLI_NO_RELAUNCH"];
+    process.env["GEMINI_CLI_NO_RELAUNCH"] = "true";
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     if (!(process.stdin as any).setRawMode) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (process.stdin as any).setRawMode = vi.fn();
     }
-    setRawModeSpy = vi.spyOn(process.stdin, 'setRawMode');
+    setRawModeSpy = vi.spyOn(process.stdin, "setRawMode");
 
-    Object.defineProperty(process.stdin, 'isTTY', {
+    Object.defineProperty(process.stdin, "isTTY", {
       value: true,
       configurable: true,
     });
-    Object.defineProperty(process.stdin, 'isRaw', {
+    Object.defineProperty(process.stdin, "isRaw", {
       value: false,
       configurable: true,
     });
@@ -457,24 +430,20 @@ describe('gemini.tsx main function kitty protocol', () => {
   afterEach(() => {
     // Restore original env variables
     if (originalEnvNoRelaunch !== undefined) {
-      process.env['GEMINI_CLI_NO_RELAUNCH'] = originalEnvNoRelaunch;
+      process.env["GEMINI_CLI_NO_RELAUNCH"] = originalEnvNoRelaunch;
     } else {
-      delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+      delete process.env["GEMINI_CLI_NO_RELAUNCH"];
     }
     vi.restoreAllMocks();
   });
 
-  it('should call setRawMode and detectAndEnableKittyProtocol when isInteractive is true', async () => {
-    const { detectAndEnableKittyProtocol } = await import(
-      './ui/utils/kittyProtocolDetector.js'
-    );
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
+  it("should call setRawMode and detectAndEnableKittyProtocol when isInteractive is true", async () => {
+    const { detectAndEnableKittyProtocol } = await import("./ui/utils/kittyProtocolDetector.js");
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: () => true,
-      getQuestion: () => '',
+      getQuestion: () => "",
       getSandbox: () => false,
       getDebugMode: () => false,
       getListExtensions: () => false,
@@ -494,14 +463,14 @@ describe('gemini.tsx main function kitty protocol', () => {
       getEnableHooks: () => false,
       getToolRegistry: vi.fn(),
       getContentGeneratorConfig: vi.fn(),
-      getModel: () => 'gemini-pro',
-      getEmbeddingModel: () => 'embedding-001',
-      getApprovalMode: () => 'default',
+      getModel: () => "gemini-pro",
+      getEmbeddingModel: () => "embedding-001",
+      getApprovalMode: () => "default",
       getCoreTools: () => [],
       getTelemetryEnabled: () => false,
       getTelemetryLogPromptsEnabled: () => false,
       getFileFilteringRespectGitIgnore: () => true,
-      getOutputFormat: () => 'text',
+      getOutputFormat: () => "text",
       getExtensions: () => [],
       getUsageStatisticsEnabled: () => false,
     } as unknown as Config);
@@ -513,7 +482,7 @@ describe('gemini.tsx main function kitty protocol', () => {
         ui: {},
       },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
     } as never);
     vi.mocked(parseArguments).mockResolvedValue({
       model: undefined,
@@ -550,20 +519,16 @@ describe('gemini.tsx main function kitty protocol', () => {
   });
 
   it.each([
-    { flag: 'listExtensions' },
-    { flag: 'listSessions' },
-    { flag: 'deleteSession', value: 'session-id' },
-  ])('should handle --$flag flag', async ({ flag, value }) => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
-    const { listSessions, deleteSession } = await import('./utils/sessions.js');
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
+    { flag: "listExtensions" },
+    { flag: "listSessions" },
+    { flag: "deleteSession", value: "session-id" },
+  ])("should handle --$flag flag", async ({ flag, value }) => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const { listSessions, deleteSession } = await import("./utils/sessions.js");
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
 
     vi.mocked(loadSettings).mockReturnValue({
       merged: {
@@ -572,7 +537,7 @@ describe('gemini.tsx main function kitty protocol', () => {
         ui: {},
       },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -582,13 +547,13 @@ describe('gemini.tsx main function kitty protocol', () => {
 
     const mockConfig = {
       isInteractive: () => false,
-      getQuestion: () => '',
+      getQuestion: () => "",
       getSandbox: () => false,
       getDebugMode: () => false,
-      getListExtensions: () => flag === 'listExtensions',
-      getListSessions: () => flag === 'listSessions',
-      getDeleteSession: () => (flag === 'deleteSession' ? value : undefined),
-      getExtensions: () => [{ name: 'ext1' }],
+      getListExtensions: () => flag === "listExtensions",
+      getListSessions: () => flag === "listSessions",
+      getDeleteSession: () => (flag === "deleteSession" ? value : undefined),
+      getExtensions: () => [{ name: "ext1" }],
       getPolicyEngine: vi.fn(),
       getMessageBus: () => ({ subscribe: vi.fn() }),
       getEnableHooks: () => false,
@@ -600,18 +565,16 @@ describe('gemini.tsx main function kitty protocol', () => {
       getExperimentalZedIntegration: () => false,
       getScreenReader: () => false,
       getGeminiMdFileCount: () => 0,
-      getProjectRoot: () => '/',
+      getProjectRoot: () => "/",
     } as unknown as Config;
 
     vi.mocked(loadCliConfig).mockResolvedValue(mockConfig);
-    vi.mock('./utils/sessions.js', () => ({
+    vi.mock("./utils/sessions.js", () => ({
       listSessions: vi.fn(),
       deleteSession: vi.fn(),
     }));
 
-    const debugLoggerLogSpy = vi
-      .spyOn(debugLogger, 'log')
-      .mockImplementation(() => {});
+    const debugLoggerLogSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
 
     try {
       await main();
@@ -619,32 +582,26 @@ describe('gemini.tsx main function kitty protocol', () => {
       if (!(e instanceof MockProcessExitError)) throw e;
     }
 
-    if (flag === 'listExtensions') {
-      expect(debugLoggerLogSpy).toHaveBeenCalledWith(
-        expect.stringContaining('ext1'),
-      );
-    } else if (flag === 'listSessions') {
+    if (flag === "listExtensions") {
+      expect(debugLoggerLogSpy).toHaveBeenCalledWith(expect.stringContaining("ext1"));
+    } else if (flag === "listSessions") {
       expect(listSessions).toHaveBeenCalledWith(mockConfig);
-    } else if (flag === 'deleteSession') {
+    } else if (flag === "deleteSession") {
       expect(deleteSession).toHaveBeenCalledWith(mockConfig, value);
     }
     expect(processExitSpy).toHaveBeenCalledWith(0);
     processExitSpy.mockRestore();
   });
 
-  it('should handle sandbox activation', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSandboxConfig } = await import('./config/sandboxConfig.js');
-    const { start_sandbox } = await import('./utils/sandbox.js');
-    const { relaunchOnExitCode } = await import('./utils/relaunch.js');
-    const { loadSettings } = await import('./config/settings.js');
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
+  it("should handle sandbox activation", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSandboxConfig } = await import("./config/sandboxConfig.js");
+    const { start_sandbox } = await import("./utils/sandbox.js");
+    const { relaunchOnExitCode } = await import("./utils/relaunch.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
 
     vi.mocked(parseArguments).mockResolvedValue({
       promptInteractive: false,
@@ -657,13 +614,13 @@ describe('gemini.tsx main function kitty protocol', () => {
         ui: {},
       },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
     const mockConfig = {
       isInteractive: () => false,
-      getQuestion: () => '',
+      getQuestion: () => "",
       getSandbox: () => true,
       getDebugMode: () => false,
       getListExtensions: () => false,
@@ -681,7 +638,7 @@ describe('gemini.tsx main function kitty protocol', () => {
       getExperimentalZedIntegration: () => false,
       getScreenReader: () => false,
       getGeminiMdFileCount: () => 0,
-      getProjectRoot: () => '/',
+      getProjectRoot: () => "/",
       refreshAuth: vi.fn(),
     } as unknown as Config;
 
@@ -702,29 +659,23 @@ describe('gemini.tsx main function kitty protocol', () => {
     processExitSpy.mockRestore();
   });
 
-  it('should log warning when theme is not found', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
-    const { themeManager } = await import('./ui/themes/theme-manager.js');
-    const debugLoggerWarnSpy = vi
-      .spyOn(debugLogger, 'warn')
-      .mockImplementation(() => {});
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
+  it("should log warning when theme is not found", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const { themeManager } = await import("./ui/themes/theme-manager.js");
+    const debugLoggerWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
 
     vi.mocked(loadSettings).mockReturnValue({
       merged: {
         advanced: {},
         security: { auth: {} },
-        ui: { theme: 'non-existent-theme' },
+        ui: { theme: "non-existent-theme" },
       },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -733,7 +684,7 @@ describe('gemini.tsx main function kitty protocol', () => {
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: () => false,
-      getQuestion: () => 'test',
+      getQuestion: () => "test",
       getSandbox: () => false,
       getDebugMode: () => false,
       getPolicyEngine: vi.fn(),
@@ -747,24 +698,24 @@ describe('gemini.tsx main function kitty protocol', () => {
       getExperimentalZedIntegration: () => false,
       getScreenReader: () => false,
       getGeminiMdFileCount: () => 0,
-      getProjectRoot: () => '/',
+      getProjectRoot: () => "/",
       getListExtensions: () => false,
       getListSessions: () => false,
       getDeleteSession: () => undefined,
       getToolRegistry: vi.fn(),
       getExtensions: () => [],
-      getModel: () => 'gemini-pro',
-      getEmbeddingModel: () => 'embedding-001',
-      getApprovalMode: () => 'default',
+      getModel: () => "gemini-pro",
+      getEmbeddingModel: () => "embedding-001",
+      getApprovalMode: () => "default",
       getCoreTools: () => [],
       getTelemetryEnabled: () => false,
       getTelemetryLogPromptsEnabled: () => false,
       getFileFilteringRespectGitIgnore: () => true,
-      getOutputFormat: () => 'text',
+      getOutputFormat: () => "text",
       getUsageStatisticsEnabled: () => false,
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
-    vi.spyOn(themeManager, 'setActiveTheme').mockReturnValue(false);
+    vi.spyOn(themeManager, "setActiveTheme").mockReturnValue(false);
 
     try {
       await main();
@@ -778,44 +729,36 @@ describe('gemini.tsx main function kitty protocol', () => {
     processExitSpy.mockRestore();
   });
 
-  it('should handle session selector error', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
-    const { SessionSelector } = await import('./utils/sessionUtils.js');
+  it("should handle session selector error", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const { SessionSelector } = await import("./utils/sessionUtils.js");
     vi.mocked(SessionSelector).mockImplementation(
       () =>
         ({
-          resolveSession: vi
-            .fn()
-            .mockRejectedValue(new Error('Session not found')),
+          resolveSession: vi.fn().mockRejectedValue(new Error("Session not found")),
         }) as any, // eslint-disable-line @typescript-eslint/no-explicit-any
     );
 
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     vi.mocked(loadSettings).mockReturnValue({
-      merged: { advanced: {}, security: { auth: {} }, ui: { theme: 'test' } },
+      merged: { advanced: {}, security: { auth: {} }, ui: { theme: "test" } },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
     vi.mocked(parseArguments).mockResolvedValue({
       promptInteractive: false,
-      resume: 'session-id',
+      resume: "session-id",
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: () => true,
-      getQuestion: () => '',
+      getQuestion: () => "",
       getSandbox: () => false,
       getDebugMode: () => false,
       getPolicyEngine: vi.fn(),
@@ -829,20 +772,20 @@ describe('gemini.tsx main function kitty protocol', () => {
       getExperimentalZedIntegration: () => false,
       getScreenReader: () => false,
       getGeminiMdFileCount: () => 0,
-      getProjectRoot: () => '/',
+      getProjectRoot: () => "/",
       getListExtensions: () => false,
       getListSessions: () => false,
       getDeleteSession: () => undefined,
       getToolRegistry: vi.fn(),
       getExtensions: () => [],
-      getModel: () => 'gemini-pro',
-      getEmbeddingModel: () => 'embedding-001',
-      getApprovalMode: () => 'default',
+      getModel: () => "gemini-pro",
+      getEmbeddingModel: () => "embedding-001",
+      getApprovalMode: () => "default",
       getCoreTools: () => [],
       getTelemetryEnabled: () => false,
       getTelemetryLogPromptsEnabled: () => false,
       getFileFilteringRespectGitIgnore: () => true,
-      getOutputFormat: () => 'text',
+      getOutputFormat: () => "text",
       getUsageStatisticsEnabled: () => false,
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -853,37 +796,27 @@ describe('gemini.tsx main function kitty protocol', () => {
     }
 
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Error resuming session: Session not found'),
+      expect.stringContaining("Error resuming session: Session not found"),
     );
     expect(processExitSpy).toHaveBeenCalledWith(42);
     processExitSpy.mockRestore();
     consoleErrorSpy.mockRestore();
   });
 
-  it.skip('should log error when cleanupExpiredSessions fails', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
-    const { cleanupExpiredSessions } = await import(
-      './utils/sessionCleanup.js'
-    );
-    vi.mocked(cleanupExpiredSessions).mockRejectedValue(
-      new Error('Cleanup failed'),
-    );
-    const debugLoggerErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
+  it.skip("should log error when cleanupExpiredSessions fails", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const { cleanupExpiredSessions } = await import("./utils/sessionCleanup.js");
+    vi.mocked(cleanupExpiredSessions).mockRejectedValue(new Error("Cleanup failed"));
+    const debugLoggerErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
 
     vi.mocked(loadSettings).mockReturnValue({
       merged: { advanced: {}, security: { auth: {} }, ui: {} },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -892,7 +825,7 @@ describe('gemini.tsx main function kitty protocol', () => {
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: () => false,
-      getQuestion: () => 'test',
+      getQuestion: () => "test",
       getSandbox: () => false,
       getDebugMode: () => false,
       getPolicyEngine: vi.fn(),
@@ -906,20 +839,20 @@ describe('gemini.tsx main function kitty protocol', () => {
       getExperimentalZedIntegration: () => false,
       getScreenReader: () => false,
       getGeminiMdFileCount: () => 0,
-      getProjectRoot: () => '/',
+      getProjectRoot: () => "/",
       getListExtensions: () => false,
       getListSessions: () => false,
       getDeleteSession: () => undefined,
       getToolRegistry: vi.fn(),
       getExtensions: () => [],
-      getModel: () => 'gemini-pro',
-      getEmbeddingModel: () => 'embedding-001',
-      getApprovalMode: () => 'default',
+      getModel: () => "gemini-pro",
+      getEmbeddingModel: () => "embedding-001",
+      getApprovalMode: () => "default",
       getCoreTools: () => [],
       getTelemetryEnabled: () => false,
       getTelemetryLogPromptsEnabled: () => false,
       getFileFilteringRespectGitIgnore: () => true,
-      getOutputFormat: () => 'text',
+      getOutputFormat: () => "text",
       getUsageStatisticsEnabled: () => false,
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -932,30 +865,24 @@ describe('gemini.tsx main function kitty protocol', () => {
     }
 
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'Failed to cleanup expired sessions: Cleanup failed',
-      ),
+      expect.stringContaining("Failed to cleanup expired sessions: Cleanup failed"),
     );
     expect(processExitSpy).toHaveBeenCalledWith(0); // Should not exit on cleanup failure
     processExitSpy.mockRestore();
   });
 
-  it('should read from stdin in non-interactive mode', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
-    const { readStdin } = await import('./utils/readStdin.js');
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
+  it("should read from stdin in non-interactive mode", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const { readStdin } = await import("./utils/readStdin.js");
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
 
     vi.mocked(loadSettings).mockReturnValue({
       merged: { advanced: {}, security: { auth: {} }, ui: {} },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -964,7 +891,7 @@ describe('gemini.tsx main function kitty protocol', () => {
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: () => false,
-      getQuestion: () => 'test-question',
+      getQuestion: () => "test-question",
       getSandbox: () => false,
       getDebugMode: () => false,
       getPolicyEngine: vi.fn(),
@@ -978,37 +905,37 @@ describe('gemini.tsx main function kitty protocol', () => {
       getExperimentalZedIntegration: () => false,
       getScreenReader: () => false,
       getGeminiMdFileCount: () => 0,
-      getProjectRoot: () => '/',
+      getProjectRoot: () => "/",
       getListExtensions: () => false,
       getListSessions: () => false,
       getDeleteSession: () => undefined,
       getToolRegistry: vi.fn(),
       getExtensions: () => [],
-      getModel: () => 'gemini-pro',
-      getEmbeddingModel: () => 'embedding-001',
-      getApprovalMode: () => 'default',
+      getModel: () => "gemini-pro",
+      getEmbeddingModel: () => "embedding-001",
+      getApprovalMode: () => "default",
       getCoreTools: () => [],
       getTelemetryEnabled: () => false,
       getTelemetryLogPromptsEnabled: () => false,
       getFileFilteringRespectGitIgnore: () => true,
-      getOutputFormat: () => 'text',
+      getOutputFormat: () => "text",
       getUsageStatisticsEnabled: () => false,
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
-    vi.mock('./utils/readStdin.js', () => ({
-      readStdin: vi.fn().mockResolvedValue('stdin-data'),
+    vi.mock("./utils/readStdin.js", () => ({
+      readStdin: vi.fn().mockResolvedValue("stdin-data"),
     }));
     const runNonInteractiveSpy = vi.hoisted(() => vi.fn());
-    vi.mock('./nonInteractiveCli.js', () => ({
+    vi.mock("./nonInteractiveCli.js", () => ({
       runNonInteractive: runNonInteractiveSpy,
     }));
     runNonInteractiveSpy.mockClear();
-    vi.mock('./validateNonInterActiveAuth.js', () => ({
+    vi.mock("./validateNonInterActiveAuth.js", () => ({
       validateNonInteractiveAuth: vi.fn().mockResolvedValue({}),
     }));
 
     // Mock stdin to be non-TTY
-    Object.defineProperty(process.stdin, 'isTTY', {
+    Object.defineProperty(process.stdin, "isTTY", {
       value: false,
       configurable: true,
     });
@@ -1025,43 +952,41 @@ describe('gemini.tsx main function kitty protocol', () => {
     // Since vi.mock is hoisted, runNonInteractiveSpy is defined early.
     expect(runNonInteractiveSpy).toHaveBeenCalled();
     const callArgs = runNonInteractiveSpy.mock.calls[0][0];
-    expect(callArgs.input).toBe('test-question');
+    expect(callArgs.input).toBe("test-question");
     expect(processExitSpy).toHaveBeenCalledWith(0);
     processExitSpy.mockRestore();
-    Object.defineProperty(process.stdin, 'isTTY', {
+    Object.defineProperty(process.stdin, "isTTY", {
       value: true,
       configurable: true,
     });
   });
 });
 
-describe('gemini.tsx main function exit codes', () => {
+describe("gemini.tsx main function exit codes", () => {
   let originalEnvNoRelaunch: string | undefined;
 
   beforeEach(() => {
-    originalEnvNoRelaunch = process.env['GEMINI_CLI_NO_RELAUNCH'];
-    process.env['GEMINI_CLI_NO_RELAUNCH'] = 'true';
-    vi.spyOn(process, 'exit').mockImplementation((code) => {
+    originalEnvNoRelaunch = process.env["GEMINI_CLI_NO_RELAUNCH"];
+    process.env["GEMINI_CLI_NO_RELAUNCH"] = "true";
+    vi.spyOn(process, "exit").mockImplementation((code) => {
       throw new MockProcessExitError(code);
     });
     // Mock stderr to avoid cluttering output
-    vi.spyOn(process.stderr, 'write').mockImplementation(() => true);
+    vi.spyOn(process.stderr, "write").mockImplementation(() => true);
   });
 
   afterEach(() => {
     if (originalEnvNoRelaunch !== undefined) {
-      process.env['GEMINI_CLI_NO_RELAUNCH'] = originalEnvNoRelaunch;
+      process.env["GEMINI_CLI_NO_RELAUNCH"] = originalEnvNoRelaunch;
     } else {
-      delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+      delete process.env["GEMINI_CLI_NO_RELAUNCH"];
     }
     vi.restoreAllMocks();
   });
 
-  it('should exit with 42 for invalid input combination (prompt-interactive with non-TTY)', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
+  it("should exit with 42 for invalid input combination (prompt-interactive with non-TTY)", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
     vi.mocked(loadCliConfig).mockResolvedValue({} as Config);
     vi.mocked(loadSettings).mockReturnValue({
       merged: { security: { auth: {} }, ui: {} },
@@ -1070,61 +995,57 @@ describe('gemini.tsx main function exit codes', () => {
     vi.mocked(parseArguments).mockResolvedValue({
       promptInteractive: true,
     } as unknown as CliArgs);
-    Object.defineProperty(process.stdin, 'isTTY', {
+    Object.defineProperty(process.stdin, "isTTY", {
       value: false,
       configurable: true,
     });
 
     try {
       await main();
-      expect.fail('Should have thrown MockProcessExitError');
+      expect.fail("Should have thrown MockProcessExitError");
     } catch (e) {
       expect(e).toBeInstanceOf(MockProcessExitError);
       expect((e as MockProcessExitError).code).toBe(42);
     }
   });
 
-  it('should exit with 41 for auth failure during sandbox setup', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
-    const { loadSandboxConfig } = await import('./config/sandboxConfig.js');
+  it("should exit with 41 for auth failure during sandbox setup", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
+    const { loadSandboxConfig } = await import("./config/sandboxConfig.js");
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     vi.mocked(loadSandboxConfig).mockResolvedValue({} as any);
     vi.mocked(loadCliConfig).mockResolvedValue({
-      refreshAuth: vi.fn().mockRejectedValue(new Error('Auth failed')),
+      refreshAuth: vi.fn().mockRejectedValue(new Error("Auth failed")),
     } as unknown as Config);
     vi.mocked(loadSettings).mockReturnValue({
       merged: {
-        security: { auth: { selectedType: 'google', useExternal: false } },
+        security: { auth: { selectedType: "google", useExternal: false } },
         ui: {},
       },
       errors: [],
     } as never);
     vi.mocked(parseArguments).mockResolvedValue({} as unknown as CliArgs);
-    vi.mock('./config/auth.js', () => ({
+    vi.mock("./config/auth.js", () => ({
       validateAuthMethod: vi.fn().mockReturnValue(null),
     }));
 
     try {
       await main();
-      expect.fail('Should have thrown MockProcessExitError');
+      expect.fail("Should have thrown MockProcessExitError");
     } catch (e) {
       expect(e).toBeInstanceOf(MockProcessExitError);
       expect((e as MockProcessExitError).code).toBe(41);
     }
   });
 
-  it('should exit with 42 for session resume failure', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
+  it("should exit with 42 for session resume failure", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
 
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: () => false,
-      getQuestion: () => 'test',
+      getQuestion: () => "test",
       getSandbox: () => false,
       getDebugMode: () => false,
       getListExtensions: () => false,
@@ -1142,14 +1063,14 @@ describe('gemini.tsx main function exit codes', () => {
       getEnableHooks: () => false,
       getToolRegistry: vi.fn(),
       getContentGeneratorConfig: vi.fn(),
-      getModel: () => 'gemini-pro',
-      getEmbeddingModel: () => 'embedding-001',
-      getApprovalMode: () => 'default',
+      getModel: () => "gemini-pro",
+      getEmbeddingModel: () => "embedding-001",
+      getApprovalMode: () => "default",
       getCoreTools: () => [],
       getTelemetryEnabled: () => false,
       getTelemetryLogPromptsEnabled: () => false,
       getFileFilteringRespectGitIgnore: () => true,
-      getOutputFormat: () => 'text',
+      getOutputFormat: () => "text",
       getExtensions: () => [],
       getUsageStatisticsEnabled: () => false,
     } as unknown as Config);
@@ -1158,35 +1079,31 @@ describe('gemini.tsx main function exit codes', () => {
       errors: [],
     } as never);
     vi.mocked(parseArguments).mockResolvedValue({
-      resume: 'invalid-session',
+      resume: "invalid-session",
     } as unknown as CliArgs);
 
-    vi.mock('./utils/sessionUtils.js', () => ({
+    vi.mock("./utils/sessionUtils.js", () => ({
       SessionSelector: vi.fn().mockImplementation(() => ({
-        resolveSession: vi
-          .fn()
-          .mockRejectedValue(new Error('Session not found')),
+        resolveSession: vi.fn().mockRejectedValue(new Error("Session not found")),
       })),
     }));
 
     try {
       await main();
-      expect.fail('Should have thrown MockProcessExitError');
+      expect.fail("Should have thrown MockProcessExitError");
     } catch (e) {
       expect(e).toBeInstanceOf(MockProcessExitError);
       expect((e as MockProcessExitError).code).toBe(42);
     }
   });
 
-  it('should exit with 42 for no input provided', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
+  it("should exit with 42 for no input provided", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
 
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: () => false,
-      getQuestion: () => '',
+      getQuestion: () => "",
       getSandbox: () => false,
       getDebugMode: () => false,
       getListExtensions: () => false,
@@ -1204,14 +1121,14 @@ describe('gemini.tsx main function exit codes', () => {
       getEnableHooks: () => false,
       getToolRegistry: vi.fn(),
       getContentGeneratorConfig: vi.fn(),
-      getModel: () => 'gemini-pro',
-      getEmbeddingModel: () => 'embedding-001',
-      getApprovalMode: () => 'default',
+      getModel: () => "gemini-pro",
+      getEmbeddingModel: () => "embedding-001",
+      getApprovalMode: () => "default",
       getCoreTools: () => [],
       getTelemetryEnabled: () => false,
       getTelemetryLogPromptsEnabled: () => false,
       getFileFilteringRespectGitIgnore: () => true,
-      getOutputFormat: () => 'text',
+      getOutputFormat: () => "text",
       getExtensions: () => [],
       getUsageStatisticsEnabled: () => false,
     } as unknown as Config);
@@ -1220,14 +1137,14 @@ describe('gemini.tsx main function exit codes', () => {
       errors: [],
     } as never);
     vi.mocked(parseArguments).mockResolvedValue({} as unknown as CliArgs);
-    Object.defineProperty(process.stdin, 'isTTY', {
+    Object.defineProperty(process.stdin, "isTTY", {
       value: true, // Simulate TTY so it doesn't try to read stdin
       configurable: true,
     });
 
     try {
       await main();
-      expect.fail('Should have thrown MockProcessExitError');
+      expect.fail("Should have thrown MockProcessExitError");
     } catch (e) {
       expect(e).toBeInstanceOf(MockProcessExitError);
       expect((e as MockProcessExitError).code).toBe(42);
@@ -1235,13 +1152,11 @@ describe('gemini.tsx main function exit codes', () => {
   });
 });
 
-describe('validateDnsResolutionOrder', () => {
+describe("validateDnsResolutionOrder", () => {
   let debugLoggerWarnSpy: ReturnType<typeof vi.spyOn>;
 
   beforeEach(() => {
-    debugLoggerWarnSpy = vi
-      .spyOn(debugLogger, 'warn')
-      .mockImplementation(() => {});
+    debugLoggerWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -1249,32 +1164,32 @@ describe('validateDnsResolutionOrder', () => {
   });
 
   it('should return "ipv4first" when the input is "ipv4first"', () => {
-    expect(validateDnsResolutionOrder('ipv4first')).toBe('ipv4first');
+    expect(validateDnsResolutionOrder("ipv4first")).toBe("ipv4first");
     expect(debugLoggerWarnSpy).not.toHaveBeenCalled();
   });
 
   it('should return "verbatim" when the input is "verbatim"', () => {
-    expect(validateDnsResolutionOrder('verbatim')).toBe('verbatim');
+    expect(validateDnsResolutionOrder("verbatim")).toBe("verbatim");
     expect(debugLoggerWarnSpy).not.toHaveBeenCalled();
   });
 
   it('should return the default "ipv4first" when the input is undefined', () => {
-    expect(validateDnsResolutionOrder(undefined)).toBe('ipv4first');
+    expect(validateDnsResolutionOrder(undefined)).toBe("ipv4first");
     expect(debugLoggerWarnSpy).not.toHaveBeenCalled();
   });
 
   it('should return the default "ipv4first" and log a warning for an invalid string', () => {
-    expect(validateDnsResolutionOrder('invalid-value')).toBe('ipv4first');
+    expect(validateDnsResolutionOrder("invalid-value")).toBe("ipv4first");
     expect(debugLoggerWarnSpy).toHaveBeenCalledExactlyOnceWith(
       'Invalid value for dnsResolutionOrder in settings: "invalid-value". Using default "ipv4first".',
     );
   });
 });
 
-describe('startInteractiveUI', () => {
+describe("startInteractiveUI", () => {
   // Mock dependencies
   const mockConfig = {
-    getProjectRoot: () => '/root',
+    getProjectRoot: () => "/root",
     getScreenReader: () => false,
     getDebugMode: () => false,
   } as unknown as Config;
@@ -1286,8 +1201,8 @@ describe('startInteractiveUI', () => {
       },
     },
   } as LoadedSettings;
-  const mockStartupWarnings = ['warning1'];
-  const mockWorkspaceRoot = '/root';
+  const mockStartupWarnings = ["warning1"];
+  const mockWorkspaceRoot = "/root";
   const mockInitializationResult = {
     authError: null,
     themeError: null,
@@ -1295,16 +1210,16 @@ describe('startInteractiveUI', () => {
     geminiMdFileCount: 0,
   };
 
-  vi.mock('./ui/utils/kittyProtocolDetector.js', () => ({
+  vi.mock("./ui/utils/kittyProtocolDetector.js", () => ({
     detectAndEnableKittyProtocol: vi.fn(() => Promise.resolve(true)),
     isKittyProtocolSupported: vi.fn(() => true),
     isKittyProtocolEnabled: vi.fn(() => true),
   }));
-  vi.mock('./ui/utils/updateCheck.js', () => ({
+  vi.mock("./ui/utils/updateCheck.js", () => ({
     checkForUpdates: vi.fn(() => Promise.resolve(null)),
   }));
 
-  vi.mock('./utils/cleanup.js', () => ({
+  vi.mock("./utils/cleanup.js", () => ({
     cleanupCheckpoints: vi.fn(() => Promise.resolve()),
     registerCleanup: vi.fn(),
     runExitCleanup: vi.fn(),
@@ -1336,8 +1251,8 @@ describe('startInteractiveUI', () => {
     });
   }
 
-  it('should render the UI with proper React context and exitOnCtrlC disabled', async () => {
-    const { render } = await import('ink');
+  it("should render the UI with proper React context and exitOnCtrlC disabled", async () => {
+    const { render } = await import("ink");
     const renderSpy = vi.mocked(render);
 
     await startTestInteractiveUI(
@@ -1368,8 +1283,8 @@ describe('startInteractiveUI', () => {
     expect(reactElement).toBeDefined();
   });
 
-  it('should enable mouse events when alternate buffer is enabled', async () => {
-    const { enableMouseEvents } = await import('@airiscode/gemini-cli-core');
+  it("should enable mouse events when alternate buffer is enabled", async () => {
+    const { enableMouseEvents } = await import("@airiscode/gemini-cli-core");
     await startTestInteractiveUI(
       mockConfig,
       mockSettings,
@@ -1381,9 +1296,9 @@ describe('startInteractiveUI', () => {
     expect(enableMouseEvents).toHaveBeenCalled();
   });
 
-  it('should patch console', async () => {
-    const { ConsolePatcher } = await import('./ui/utils/ConsolePatcher.js');
-    const patchSpy = vi.spyOn(ConsolePatcher.prototype, 'patch');
+  it("should patch console", async () => {
+    const { ConsolePatcher } = await import("./ui/utils/ConsolePatcher.js");
+    const patchSpy = vi.spyOn(ConsolePatcher.prototype, "patch");
     await startTestInteractiveUI(
       mockConfig,
       mockSettings,
@@ -1395,10 +1310,10 @@ describe('startInteractiveUI', () => {
     expect(patchSpy).toHaveBeenCalled();
   });
 
-  it('should perform all startup tasks in correct order', async () => {
-    const { getVersion } = await import('@airiscode/gemini-cli-core');
-    const { checkForUpdates } = await import('./ui/utils/updateCheck.js');
-    const { registerCleanup } = await import('./utils/cleanup.js');
+  it("should perform all startup tasks in correct order", async () => {
+    const { getVersion } = await import("@airiscode/gemini-cli-core");
+    const { checkForUpdates } = await import("./ui/utils/updateCheck.js");
+    const { registerCleanup } = await import("./utils/cleanup.js");
 
     await startTestInteractiveUI(
       mockConfig,
@@ -1415,7 +1330,7 @@ describe('startInteractiveUI', () => {
 
     // Verify cleanup handler is registered with unmount function
     const cleanupFn = vi.mocked(registerCleanup).mock.calls[0][0];
-    expect(typeof cleanupFn).toBe('function');
+    expect(typeof cleanupFn).toBe("function");
 
     // checkForUpdates should be called asynchronously (not waited for)
     // We need a small delay to let it execute
@@ -1423,8 +1338,8 @@ describe('startInteractiveUI', () => {
     expect(checkForUpdates).toHaveBeenCalledTimes(1);
   });
 
-  it('should not recordSlowRender when less than threshold', async () => {
-    const { recordSlowRender } = await import('@airiscode/gemini-cli-core');
+  it("should not recordSlowRender when less than threshold", async () => {
+    const { recordSlowRender } = await import("@airiscode/gemini-cli-core");
     performance.now.mockReturnValueOnce(0);
     await startTestInteractiveUI(
       mockConfig,
@@ -1438,8 +1353,8 @@ describe('startInteractiveUI', () => {
     expect(recordSlowRender).not.toHaveBeenCalled();
   });
 
-  it('should call recordSlowRender when more than threshold', async () => {
-    const { recordSlowRender } = await import('@airiscode/gemini-cli-core');
+  it("should call recordSlowRender when more than threshold", async () => {
+    const { recordSlowRender } = await import("@airiscode/gemini-cli-core");
     performance.now.mockReturnValueOnce(0);
     performance.now.mockReturnValueOnce(300);
 
@@ -1459,17 +1374,15 @@ describe('startInteractiveUI', () => {
     {
       screenReader: true,
       expectedCalls: [],
-      name: 'should not disable line wrapping in screen reader mode',
+      name: "should not disable line wrapping in screen reader mode",
     },
     {
       screenReader: false,
-      expectedCalls: [['\x1b[?7l']],
-      name: 'should disable line wrapping when not in screen reader mode',
+      expectedCalls: [["\x1b[?7l"]],
+      name: "should disable line wrapping when not in screen reader mode",
     },
-  ])('$name', async ({ screenReader, expectedCalls }) => {
-    const writeSpy = vi
-      .spyOn(process.stdout, 'write')
-      .mockImplementation(() => true);
+  ])("$name", async ({ screenReader, expectedCalls }) => {
+    const writeSpy = vi.spyOn(process.stdout, "write").mockImplementation(() => true);
     const mockConfigWithScreenReader = {
       ...mockConfig,
       getScreenReader: () => screenReader,
@@ -1487,7 +1400,7 @@ describe('startInteractiveUI', () => {
     if (expectedCalls.length > 0) {
       expect(writeSpy).toHaveBeenCalledWith(expectedCalls[0][0]);
     } else {
-      expect(writeSpy).not.toHaveBeenCalledWith('\x1b[?7l');
+      expect(writeSpy).not.toHaveBeenCalledWith("\x1b[?7l");
     }
     writeSpy.mockRestore();
   });
diff --git a/packages/ui-gemini/src/gemini.tsx b/packages/ui-gemini/src/gemini.tsx
index 313877e85..b5d1ed97e 100644
--- a/packages/ui-gemini/src/gemini.tsx
+++ b/packages/ui-gemini/src/gemini.tsx
@@ -4,112 +4,98 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { render } from 'ink';
-import { AppContainer } from './ui/AppContainer.js';
-import { loadCliConfig, parseArguments } from './config/config.js';
-import * as cliConfig from './config/config.js';
-import { readStdin } from './utils/readStdin.js';
-import { basename } from 'node:path';
-import v8 from 'node:v8';
-import os from 'node:os';
-import dns from 'node:dns';
-import { start_sandbox } from './utils/sandbox.js';
-import type { DnsResolutionOrder, LoadedSettings } from './config/settings.js';
-import {
-  loadSettings,
-  migrateDeprecatedSettings,
-  SettingScope,
-} from './config/settings.js';
-import { themeManager } from './ui/themes/theme-manager.js';
-import { getStartupWarnings } from './utils/startupWarnings.js';
-import { getUserStartupWarnings } from './utils/userStartupWarnings.js';
-import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
-import { runNonInteractive } from './nonInteractiveCli.js';
-import {
-  cleanupCheckpoints,
-  registerCleanup,
-  registerSyncCleanup,
-  runExitCleanup,
-  registerTelemetryConfig,
-} from './utils/cleanup.js';
+import dns from "node:dns";
+import os from "node:os";
+import { basename } from "node:path";
+import v8 from "node:v8";
 import {
+  AuthType,
   type Config,
-  type ResumedSessionData,
-  type OutputPayload,
   type ConsoleLogPayload,
-  sessionId,
-  logUserPrompt,
-  AuthType,
-  getOauthClient,
-  UserPromptEvent,
-  debugLogger,
-  recordSlowRender,
-  coreEvents,
   CoreEvent,
+  coreEvents,
   createWorkingStdio,
-  patchStdio,
-  writeToStdout,
-  writeToStderr,
+  debugLogger,
+  disableLineWrapping,
   disableMouseEvents,
+  ExitCodes,
   enableMouseEvents,
   enterAlternateScreen,
-  disableLineWrapping,
-  shouldEnterAlternateScreen,
-  startupProfiler,
-  ExitCodes,
-  SessionStartSource,
-  SessionEndReason,
-  fireSessionStartHook,
   fireSessionEndHook,
+  fireSessionStartHook,
+  getOauthClient,
   getVersion,
-} from '@airiscode/gemini-cli-core';
-import {
-  initializeApp,
-  type InitializationResult,
-} from './core/initializer.js';
-import { validateAuthMethod } from './config/auth.js';
-import { setMaxSizedBoxDebugging } from './ui/components/shared/MaxSizedBox.js';
-import { runZedIntegration } from './zed-integration/zedIntegration.js';
-import { cleanupExpiredSessions } from './utils/sessionCleanup.js';
-import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
-import { detectAndEnableKittyProtocol } from './ui/utils/kittyProtocolDetector.js';
-import { checkForUpdates } from './ui/utils/updateCheck.js';
-import { handleAutoUpdate } from './utils/handleAutoUpdate.js';
-import { appEvents, AppEvent } from './utils/events.js';
-import { SessionSelector } from './utils/sessionUtils.js';
-import { computeWindowTitle } from './utils/windowTitle.js';
-import { SettingsContext } from './ui/contexts/SettingsContext.js';
-import { MouseProvider } from './ui/contexts/MouseContext.js';
-
-import { SessionStatsProvider } from './ui/contexts/SessionContext.js';
-import { VimModeProvider } from './ui/contexts/VimModeContext.js';
-import { KeypressProvider } from './ui/contexts/KeypressContext.js';
-import { useKittyKeyboardProtocol } from './ui/hooks/useKittyKeyboardProtocol.js';
+  logUserPrompt,
+  type OutputPayload,
+  patchStdio,
+  type ResumedSessionData,
+  recordSlowRender,
+  SessionEndReason,
+  SessionStartSource,
+  sessionId,
+  shouldEnterAlternateScreen,
+  startupProfiler,
+  UserPromptEvent,
+  writeToStderr,
+  writeToStdout,
+} from "@airiscode/gemini-cli-core";
+import { render } from "ink";
+import React from "react";
+import { validateAuthMethod } from "./config/auth.js";
+import * as cliConfig from "./config/config.js";
+import { loadCliConfig, parseArguments } from "./config/config.js";
+import { ExtensionManager } from "./config/extension-manager.js";
+import { requestConsentNonInteractive } from "./config/extensions/consent.js";
+import { createPolicyUpdater } from "./config/policy.js";
+import { loadSandboxConfig } from "./config/sandboxConfig.js";
+import type { DnsResolutionOrder, LoadedSettings } from "./config/settings.js";
+import { loadSettings, migrateDeprecatedSettings, SettingScope } from "./config/settings.js";
+import { type InitializationResult, initializeApp } from "./core/initializer.js";
+import { runNonInteractive } from "./nonInteractiveCli.js";
+import { AppContainer } from "./ui/AppContainer.js";
+import { profiler } from "./ui/components/DebugProfiler.js";
+import { setMaxSizedBoxDebugging } from "./ui/components/shared/MaxSizedBox.js";
+import { KeypressProvider } from "./ui/contexts/KeypressContext.js";
+import { MouseProvider } from "./ui/contexts/MouseContext.js";
+import { ScrollProvider } from "./ui/contexts/ScrollProvider.js";
+import { SessionStatsProvider } from "./ui/contexts/SessionContext.js";
+import { SettingsContext } from "./ui/contexts/SettingsContext.js";
+import { VimModeProvider } from "./ui/contexts/VimModeContext.js";
+import { isAlternateBufferEnabled } from "./ui/hooks/useAlternateBuffer.js";
+import { useKittyKeyboardProtocol } from "./ui/hooks/useKittyKeyboardProtocol.js";
+import { themeManager } from "./ui/themes/theme-manager.js";
+import { ConsolePatcher } from "./ui/utils/ConsolePatcher.js";
+import { detectAndEnableKittyProtocol } from "./ui/utils/kittyProtocolDetector.js";
+import { checkForUpdates } from "./ui/utils/updateCheck.js";
 import {
-  relaunchAppInChildProcess,
-  relaunchOnExitCode,
-} from './utils/relaunch.js';
-import { loadSandboxConfig } from './config/sandboxConfig.js';
-import { deleteSession, listSessions } from './utils/sessions.js';
-import { ExtensionManager } from './config/extension-manager.js';
-import { createPolicyUpdater } from './config/policy.js';
-import { requestConsentNonInteractive } from './config/extensions/consent.js';
-import { ScrollProvider } from './ui/contexts/ScrollProvider.js';
-import { isAlternateBufferEnabled } from './ui/hooks/useAlternateBuffer.js';
-
-import { profiler } from './ui/components/DebugProfiler.js';
+  cleanupCheckpoints,
+  registerCleanup,
+  registerSyncCleanup,
+  registerTelemetryConfig,
+  runExitCleanup,
+} from "./utils/cleanup.js";
+import { AppEvent, appEvents } from "./utils/events.js";
+import { handleAutoUpdate } from "./utils/handleAutoUpdate.js";
+import { readStdin } from "./utils/readStdin.js";
+import { relaunchAppInChildProcess, relaunchOnExitCode } from "./utils/relaunch.js";
+import { start_sandbox } from "./utils/sandbox.js";
+import { cleanupExpiredSessions } from "./utils/sessionCleanup.js";
+import { deleteSession, listSessions } from "./utils/sessions.js";
+import { SessionSelector } from "./utils/sessionUtils.js";
+import { getStartupWarnings } from "./utils/startupWarnings.js";
+import { getUserStartupWarnings } from "./utils/userStartupWarnings.js";
+import { computeWindowTitle } from "./utils/windowTitle.js";
+import { validateNonInteractiveAuth } from "./validateNonInterActiveAuth.js";
+import { runZedIntegration } from "./zed-integration/zedIntegration.js";
 
 const SLOW_RENDER_MS = 200;
 
-export function validateDnsResolutionOrder(
-  order: string | undefined,
-): DnsResolutionOrder {
-  const defaultValue: DnsResolutionOrder = 'ipv4first';
+export function validateDnsResolutionOrder(order: string | undefined): DnsResolutionOrder {
+  const defaultValue: DnsResolutionOrder = "ipv4first";
   if (order === undefined) {
     return defaultValue;
   }
-  if (order === 'ipv4first' || order === 'verbatim') {
+  if (order === "ipv4first" || order === "verbatim") {
     return order;
   }
   // We don't want to throw here, just warn and use the default.
@@ -122,19 +108,15 @@ export function validateDnsResolutionOrder(
 export function getNodeMemoryArgs(isDebugMode: boolean): string[] {
   const totalMemoryMB = os.totalmem() / (1024 * 1024);
   const heapStats = v8.getHeapStatistics();
-  const currentMaxOldSpaceSizeMb = Math.floor(
-    heapStats.heap_size_limit / 1024 / 1024,
-  );
+  const currentMaxOldSpaceSizeMb = Math.floor(heapStats.heap_size_limit / 1024 / 1024);
 
   // Set target to 50% of total memory
   const targetMaxOldSpaceSizeInMB = Math.floor(totalMemoryMB * 0.5);
   if (isDebugMode) {
-    debugLogger.debug(
-      `Current heap size ${currentMaxOldSpaceSizeMb.toFixed(2)} MB`,
-    );
+    debugLogger.debug(`Current heap size ${currentMaxOldSpaceSizeMb.toFixed(2)} MB`);
   }
 
-  if (process.env['GEMINI_CLI_NO_RELAUNCH']) {
+  if (process.env["GEMINI_CLI_NO_RELAUNCH"]) {
     return [];
   }
 
@@ -152,7 +134,7 @@ export function getNodeMemoryArgs(isDebugMode: boolean): string[] {
 
 export function setupUnhandledRejectionHandler() {
   let unhandledRejectionOccurred = false;
-  process.on('unhandledRejection', (reason, _promise) => {
+  process.on("unhandledRejection", (reason, _promise) => {
     const errorMessage = `=========================================
 This is an unexpected error. Please file a bug report using the /bug tool.
 CRITICAL: Unhandled Promise Rejection!
@@ -162,7 +144,7 @@ Reason: ${reason}${
         ? `
 Stack trace:
 ${reason.stack}`
-        : ''
+        : ""
     }`;
     debugLogger.error(errorMessage);
     if (!unhandledRejectionOccurred) {
@@ -221,9 +203,7 @@ export async function startInteractiveUI(
         >
           <MouseProvider
             mouseEventsEnabled={mouseEventsEnabled}
-            debugKeystrokeLogging={
-              settings.merged.general?.debugKeystrokeLogging
-            }
+            debugKeystrokeLogging={settings.merged.general?.debugKeystrokeLogging}
           >
             <ScrollProvider>
               <SessionStatsProvider>
@@ -245,7 +225,7 @@ export async function startInteractiveUI(
   };
 
   const instance = render(
-    process.env['DEBUG'] ? (
+    process.env["DEBUG"] ? (
       <React.StrictMode>
         <AppWrapper />
       </React.StrictMode>
@@ -267,8 +247,7 @@ export async function startInteractiveUI(
       patchConsole: false,
       alternateBuffer: useAlternateBuffer,
       incrementalRendering:
-        settings.merged.ui?.incrementalRendering !== false &&
-        useAlternateBuffer,
+        settings.merged.ui?.incrementalRendering !== false && useAlternateBuffer,
     },
   );
 
@@ -279,7 +258,7 @@ export async function startInteractiveUI(
     .catch((err) => {
       // Silently ignore update check errors.
       if (config.getDebugMode()) {
-        debugLogger.warn('Update check failed:', err);
+        debugLogger.warn("Update check failed:", err);
       }
     });
 
@@ -287,7 +266,7 @@ export async function startInteractiveUI(
 }
 
 export async function main() {
-  const cliStartupHandle = startupProfiler.start('cli_startup');
+  const cliStartupHandle = startupProfiler.start("cli_startup");
   const cleanupStdio = patchStdio();
   registerSyncCleanup(() => {
     // This is needed to ensure we don't lose any buffered output.
@@ -296,11 +275,11 @@ export async function main() {
   });
 
   setupUnhandledRejectionHandler();
-  const loadSettingsHandle = startupProfiler.start('load_settings');
+  const loadSettingsHandle = startupProfiler.start("load_settings");
   const settings = loadSettings();
   loadSettingsHandle?.end();
 
-  const migrateHandle = startupProfiler.start('migrate_settings');
+  const migrateHandle = startupProfiler.start("migrate_settings");
   migrateDeprecatedSettings(
     settings,
     // Temporary extension manager only used during this non-interactive UI phase.
@@ -315,14 +294,14 @@ export async function main() {
   migrateHandle?.end();
   await cleanupCheckpoints();
 
-  const parseArgsHandle = startupProfiler.start('parse_arguments');
+  const parseArgsHandle = startupProfiler.start("parse_arguments");
   const argv = await parseArguments(settings.merged);
   parseArgsHandle?.end();
 
   // Check for invalid input combinations early to prevent crashes
   if (argv.promptInteractive && !process.stdin.isTTY) {
     writeToStderr(
-      'Error: The --prompt-interactive flag cannot be used when input is piped from stdin.\n',
+      "Error: The --prompt-interactive flag cannot be used when input is piped from stdin.\n",
     );
     await runExitCleanup();
     process.exit(ExitCodes.FATAL_INPUT_ERROR);
@@ -349,14 +328,10 @@ export async function main() {
     settings.merged.security?.auth?.selectedType === AuthType.LEGACY_CLOUD_SHELL
   ) {
     if (
-      process.env['CLOUD_SHELL'] === 'true' ||
-      process.env['GEMINI_CLI_USE_COMPUTE_ADC'] === 'true'
+      process.env["CLOUD_SHELL"] === "true" ||
+      process.env["GEMINI_CLI_USE_COMPUTE_ADC"] === "true"
     ) {
-      settings.setValue(
-        SettingScope.User,
-        'selectedAuthType',
-        AuthType.COMPUTE_ADC,
-      );
+      settings.setValue(SettingScope.User, "selectedAuthType", AuthType.COMPUTE_ADC);
     }
   }
 
@@ -367,14 +342,12 @@ export async function main() {
     if (!themeManager.setActiveTheme(settings.merged.ui?.theme)) {
       // If the theme is not found during initial load, log a warning and continue.
       // The useThemeCommand hook in AppContainer.tsx will handle opening the dialog.
-      debugLogger.warn(
-        `Warning: Theme "${settings.merged.ui?.theme}" not found.`,
-      );
+      debugLogger.warn(`Warning: Theme "${settings.merged.ui?.theme}" not found.`);
     }
   }
 
   // hop into sandbox if we are outside and sandboxing is enabled
-  if (!process.env['SANDBOX']) {
+  if (!process.env["SANDBOX"]) {
     const memoryArgs = settings.merged.advanced?.autoConfigureMemory
       ? getNodeMemoryArgs(isDebugMode)
       : [];
@@ -386,11 +359,7 @@ export async function main() {
     // another way to decouple refreshAuth from requiring a config.
 
     if (sandboxConfig) {
-      const partialConfig = await loadCliConfig(
-        settings.merged,
-        sessionId,
-        argv,
-      );
+      const partialConfig = await loadCliConfig(settings.merged, sessionId, argv);
 
       if (
         settings.merged.security?.auth?.selectedType &&
@@ -398,45 +367,35 @@ export async function main() {
       ) {
         // Validate authentication here because the sandbox will interfere with the Oauth2 web redirect.
         try {
-          const err = validateAuthMethod(
-            settings.merged.security.auth.selectedType,
-          );
+          const err = validateAuthMethod(settings.merged.security.auth.selectedType);
           if (err) {
             throw new Error(err);
           }
 
-          await partialConfig.refreshAuth(
-            settings.merged.security.auth.selectedType,
-          );
+          await partialConfig.refreshAuth(settings.merged.security.auth.selectedType);
         } catch (err) {
-          debugLogger.error('Error authenticating:', err);
+          debugLogger.error("Error authenticating:", err);
           await runExitCleanup();
           process.exit(ExitCodes.FATAL_AUTHENTICATION_ERROR);
         }
       }
-      let stdinData = '';
+      let stdinData = "";
       if (!process.stdin.isTTY) {
         stdinData = await readStdin();
       }
 
       // This function is a copy of the one from sandbox.ts
       // It is moved here to decouple sandbox.ts from the CLI's argument structure.
-      const injectStdinIntoArgs = (
-        args: string[],
-        stdinData?: string,
-      ): string[] => {
+      const injectStdinIntoArgs = (args: string[], stdinData?: string): string[] => {
         const finalArgs = [...args];
         if (stdinData) {
-          const promptIndex = finalArgs.findIndex(
-            (arg) => arg === '--prompt' || arg === '-p',
-          );
+          const promptIndex = finalArgs.findIndex((arg) => arg === "--prompt" || arg === "-p");
           if (promptIndex > -1 && finalArgs.length > promptIndex + 1) {
             // If there's a prompt argument, prepend stdin to it
-            finalArgs[promptIndex + 1] =
-              `${stdinData}\n\n${finalArgs[promptIndex + 1]}`;
+            finalArgs[promptIndex + 1] = `${stdinData}\n\n${finalArgs[promptIndex + 1]}`;
           } else {
             // If there's no prompt argument, add stdin as the prompt
-            finalArgs.push('--prompt', stdinData);
+            finalArgs.push("--prompt", stdinData);
           }
         }
         return finalArgs;
@@ -460,7 +419,7 @@ export async function main() {
   // to run Gemini CLI. It is now safe to perform expensive initialization that
   // may have side effects.
   {
-    const loadConfigHandle = startupProfiler.start('load_cli_config');
+    const loadConfigHandle = startupProfiler.start("load_cli_config");
     const config = await loadCliConfig(settings.merged, sessionId, argv);
     loadConfigHandle?.end();
 
@@ -484,11 +443,11 @@ export async function main() {
     try {
       await cleanupExpiredSessions(config, settings.merged);
     } catch (e) {
-      debugLogger.error('Failed to cleanup expired sessions:', e);
+      debugLogger.error("Failed to cleanup expired sessions:", e);
     }
 
     if (config.getListExtensions()) {
-      debugLogger.log('Installed extensions:');
+      debugLogger.log("Installed extensions:");
       for (const extension of config.getExtensions()) {
         debugLogger.log(`- ${extension.name}`);
       }
@@ -505,10 +464,7 @@ export async function main() {
           await config.refreshAuth(authType);
         } catch (e) {
           // Auth failed - continue without summary generation capability
-          debugLogger.debug(
-            'Auth failed for --list-sessions, summaries may not be generated:',
-            e,
-          );
+          debugLogger.debug("Auth failed for --list-sessions, summaries may not be generated:", e);
         }
       }
 
@@ -532,10 +488,7 @@ export async function main() {
       process.stdin.setRawMode(true);
 
       if (
-        shouldEnterAlternateScreen(
-          isAlternateBufferEnabled(settings),
-          config.getScreenReader(),
-        )
+        shouldEnterAlternateScreen(isAlternateBufferEnabled(settings), config.getScreenReader())
       ) {
         enterAlternateScreen();
         disableLineWrapping();
@@ -544,10 +497,10 @@ export async function main() {
       }
 
       // This cleanup isn't strictly needed but may help in certain situations.
-      process.on('SIGTERM', () => {
+      process.on("SIGTERM", () => {
         process.stdin.setRawMode(wasRaw);
       });
-      process.on('SIGINT', () => {
+      process.on("SIGINT", () => {
         process.stdin.setRawMode(wasRaw);
       });
 
@@ -556,13 +509,12 @@ export async function main() {
     }
 
     setMaxSizedBoxDebugging(isDebugMode);
-    const initAppHandle = startupProfiler.start('initialize_app');
+    const initAppHandle = startupProfiler.start("initialize_app");
     const initializationResult = await initializeApp(config, settings);
     initAppHandle?.end();
 
     if (
-      settings.merged.security?.auth?.selectedType ===
-        AuthType.LOGIN_WITH_GOOGLE &&
+      settings.merged.security?.auth?.selectedType === AuthType.LOGIN_WITH_GOOGLE &&
       config.isBrowserLaunchSuppressed()
     ) {
       // Do oauth before app renders to make copying the link possible.
@@ -574,10 +526,7 @@ export async function main() {
     }
 
     let input = config.getQuestion();
-    const startupWarnings = [
-      ...(await getStartupWarnings()),
-      ...(await getUserStartupWarnings()),
-    ];
+    const startupWarnings = [...(await getStartupWarnings()), ...(await getUserStartupWarnings())];
 
     // Handle --resume flag
     let resumedSessionData: ResumedSessionData | undefined = undefined;
@@ -593,7 +542,7 @@ export async function main() {
         config.setSessionId(resumedSessionData.conversation.sessionId);
       } catch (error) {
         console.error(
-          `Error resuming session: ${error instanceof Error ? error.message : 'Unknown error'}`,
+          `Error resuming session: ${error instanceof Error ? error.message : "Unknown error"}`,
         );
         await runExitCleanup();
         process.exit(ExitCodes.FATAL_INPUT_ERROR);
@@ -668,12 +617,10 @@ export async function main() {
     );
 
     if (config.getDebugMode()) {
-      debugLogger.log('Session ID: %s', sessionId);
+      debugLogger.log("Session ID: %s", sessionId);
     }
 
-    const hasDeprecatedPromptArg = process.argv.some((arg) =>
-      arg.startsWith('--prompt'),
-    );
+    const hasDeprecatedPromptArg = process.argv.some((arg) => arg.startsWith("--prompt"));
     initializeOutputListenersAndFlush();
 
     await runNonInteractive({
@@ -695,7 +642,7 @@ function setWindowTitle(title: string, settings: LoadedSettings) {
     const windowTitle = computeWindowTitle(title);
     writeToStdout(`\x1b]2;${windowTitle}\x07`);
 
-    process.on('exit', () => {
+    process.on("exit", () => {
       writeToStdout(`\x1b]2;\x07`);
     });
   }
@@ -715,7 +662,7 @@ export function initializeOutputListenersAndFlush() {
     });
 
     coreEvents.on(CoreEvent.ConsoleLog, (payload: ConsoleLogPayload) => {
-      if (payload.type === 'error' || payload.type === 'warn') {
+      if (payload.type === "error" || payload.type === "warn") {
         writeToStderr(payload.content);
       } else {
         writeToStdout(payload.content);
diff --git a/packages/ui-gemini/src/gemini_cleanup.test.tsx b/packages/ui-gemini/src/gemini_cleanup.test.tsx
index f6857bc0e..12c12d6ea 100644
--- a/packages/ui-gemini/src/gemini_cleanup.test.tsx
+++ b/packages/ui-gemini/src/gemini_cleanup.test.tsx
@@ -4,22 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { main } from './gemini.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { type Config } from '@airiscode/gemini-cli-core';
+import { type Config, debugLogger } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { main } from "./gemini.js";
 
 // Custom error to identify mock process.exit calls
 class MockProcessExitError extends Error {
   constructor(readonly code?: string | number | null | undefined) {
-    super('PROCESS_EXIT_MOCKED');
-    this.name = 'MockProcessExitError';
+    super("PROCESS_EXIT_MOCKED");
+    this.name = "MockProcessExitError";
   }
 }
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     writeToStdout: vi.fn(),
@@ -41,8 +39,8 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('ink', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("ink")>();
   return {
     ...actual,
     render: vi.fn(() => ({
@@ -54,71 +52,71 @@ vi.mock('ink', async (importOriginal) => {
   };
 });
 
-vi.mock('./config/settings.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./config/settings.js')>();
+vi.mock("./config/settings.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./config/settings.js")>();
   return {
     ...actual,
     loadSettings: vi.fn().mockReturnValue({
       merged: { advanced: {}, security: { auth: {} }, ui: {} },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     }),
   };
 });
 
-vi.mock('./config/config.js', () => ({
+vi.mock("./config/config.js", () => ({
   loadCliConfig: vi.fn().mockResolvedValue({
     getSandbox: vi.fn(() => false),
-    getQuestion: vi.fn(() => ''),
+    getQuestion: vi.fn(() => ""),
     isInteractive: () => false,
   } as unknown as Config),
   parseArguments: vi.fn().mockResolvedValue({}),
   isDebugMode: vi.fn(() => false),
 }));
 
-vi.mock('read-package-up', () => ({
+vi.mock("read-package-up", () => ({
   readPackageUp: vi.fn().mockResolvedValue({
-    packageJson: { name: 'test-pkg', version: 'test-version' },
-    path: '/fake/path/package.json',
+    packageJson: { name: "test-pkg", version: "test-version" },
+    path: "/fake/path/package.json",
   }),
 }));
 
-vi.mock('update-notifier', () => ({
+vi.mock("update-notifier", () => ({
   default: vi.fn(() => ({ notify: vi.fn() })),
 }));
 
-vi.mock('./utils/events.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./utils/events.js')>();
+vi.mock("./utils/events.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./utils/events.js")>();
   return { ...actual, appEvents: { emit: vi.fn() } };
 });
 
-vi.mock('./utils/sandbox.js', () => ({
-  sandbox_command: vi.fn(() => ''),
+vi.mock("./utils/sandbox.js", () => ({
+  sandbox_command: vi.fn(() => ""),
   start_sandbox: vi.fn(() => Promise.resolve()),
 }));
 
-vi.mock('./utils/relaunch.js', () => ({
+vi.mock("./utils/relaunch.js", () => ({
   relaunchAppInChildProcess: vi.fn(),
   relaunchOnExitCode: vi.fn(),
 }));
 
-vi.mock('./config/sandboxConfig.js', () => ({
+vi.mock("./config/sandboxConfig.js", () => ({
   loadSandboxConfig: vi.fn(),
 }));
 
-vi.mock('./ui/utils/mouse.js', () => ({
+vi.mock("./ui/utils/mouse.js", () => ({
   enableMouseEvents: vi.fn(),
   disableMouseEvents: vi.fn(),
   parseMouseEvent: vi.fn(),
   isIncompleteMouseSequence: vi.fn(),
 }));
 
-vi.mock('./validateNonInterActiveAuth.js', () => ({
+vi.mock("./validateNonInterActiveAuth.js", () => ({
   validateNonInteractiveAuth: vi.fn().mockResolvedValue({}),
 }));
 
-vi.mock('./nonInteractiveCli.js', () => ({
+vi.mock("./nonInteractiveCli.js", () => ({
   runNonInteractive: vi.fn().mockResolvedValue(undefined),
 }));
 
@@ -127,52 +125,45 @@ const { cleanupMockState } = vi.hoisted(() => ({
 }));
 
 // Mock sessionCleanup.js at the top level
-vi.mock('./utils/sessionCleanup.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('./utils/sessionCleanup.js')>();
+vi.mock("./utils/sessionCleanup.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./utils/sessionCleanup.js")>();
   return {
     ...actual,
     cleanupExpiredSessions: async () => {
       cleanupMockState.called = true;
       if (cleanupMockState.shouldThrow) {
-        throw new Error('Cleanup failed');
+        throw new Error("Cleanup failed");
       }
     },
   };
 });
 
-describe('gemini.tsx main function cleanup', () => {
+describe("gemini.tsx main function cleanup", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    process.env['GEMINI_CLI_NO_RELAUNCH'] = 'true';
+    process.env["GEMINI_CLI_NO_RELAUNCH"] = "true";
   });
 
   afterEach(() => {
-    delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+    delete process.env["GEMINI_CLI_NO_RELAUNCH"];
     vi.restoreAllMocks();
   });
 
-  it('should log error when cleanupExpiredSessions fails', async () => {
-    const { loadCliConfig, parseArguments } = await import(
-      './config/config.js'
-    );
-    const { loadSettings } = await import('./config/settings.js');
+  it("should log error when cleanupExpiredSessions fails", async () => {
+    const { loadCliConfig, parseArguments } = await import("./config/config.js");
+    const { loadSettings } = await import("./config/settings.js");
     cleanupMockState.shouldThrow = true;
     cleanupMockState.called = false;
 
-    const debugLoggerErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((code) => {
-        throw new MockProcessExitError(code);
-      });
+    const debugLoggerErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
+    const processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
+      throw new MockProcessExitError(code);
+    });
 
     vi.mocked(loadSettings).mockReturnValue({
       merged: { advanced: {}, security: { auth: {} }, ui: {} },
       setValue: vi.fn(),
-      forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
+      forScope: () => ({ settings: {}, originalSettings: {}, path: "" }),
       errors: [],
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -181,7 +172,7 @@ describe('gemini.tsx main function cleanup', () => {
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
     vi.mocked(loadCliConfig).mockResolvedValue({
       isInteractive: vi.fn(() => false),
-      getQuestion: vi.fn(() => 'test'),
+      getQuestion: vi.fn(() => "test"),
       getSandbox: vi.fn(() => false),
       getDebugMode: vi.fn(() => false),
       getPolicyEngine: vi.fn(),
@@ -195,20 +186,20 @@ describe('gemini.tsx main function cleanup', () => {
       getExperimentalZedIntegration: vi.fn(() => false),
       getScreenReader: vi.fn(() => false),
       getGeminiMdFileCount: vi.fn(() => 0),
-      getProjectRoot: vi.fn(() => '/'),
+      getProjectRoot: vi.fn(() => "/"),
       getListExtensions: vi.fn(() => false),
       getListSessions: vi.fn(() => false),
       getDeleteSession: vi.fn(() => undefined),
       getToolRegistry: vi.fn(),
       getExtensions: vi.fn(() => []),
-      getModel: vi.fn(() => 'gemini-pro'),
-      getEmbeddingModel: vi.fn(() => 'embedding-001'),
-      getApprovalMode: vi.fn(() => 'default'),
+      getModel: vi.fn(() => "gemini-pro"),
+      getEmbeddingModel: vi.fn(() => "embedding-001"),
+      getApprovalMode: vi.fn(() => "default"),
       getCoreTools: vi.fn(() => []),
       getTelemetryEnabled: vi.fn(() => false),
       getTelemetryLogPromptsEnabled: vi.fn(() => false),
       getFileFilteringRespectGitIgnore: vi.fn(() => true),
-      getOutputFormat: vi.fn(() => 'text'),
+      getOutputFormat: vi.fn(() => "text"),
       getUsageStatisticsEnabled: vi.fn(() => false),
     } as any); // eslint-disable-line @typescript-eslint/no-explicit-any
 
@@ -220,8 +211,8 @@ describe('gemini.tsx main function cleanup', () => {
 
     expect(cleanupMockState.called).toBe(true);
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      'Failed to cleanup expired sessions:',
-      expect.objectContaining({ message: 'Cleanup failed' }),
+      "Failed to cleanup expired sessions:",
+      expect.objectContaining({ message: "Cleanup failed" }),
     );
     expect(processExitSpy).toHaveBeenCalledWith(0); // Should not exit on cleanup failure
     processExitSpy.mockRestore();
diff --git a/packages/ui-gemini/src/nonInteractiveCli.test.ts b/packages/ui-gemini/src/nonInteractiveCli.test.ts
index 5d5f78c31..14d1c7c86 100644
--- a/packages/ui-gemini/src/nonInteractiveCli.test.ts
+++ b/packages/ui-gemini/src/nonInteractiveCli.test.ts
@@ -5,39 +5,39 @@
  */
 
 import type {
+  AnyDeclarativeTool,
+  AnyToolInvocation,
   Config,
-  ToolRegistry,
   ServerGeminiStreamEvent,
   SessionMetrics,
-  AnyDeclarativeTool,
-  AnyToolInvocation,
+  ToolRegistry,
   UserFeedbackPayload,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
 import {
+  CoreEvent,
   executeToolCall,
-  ToolErrorType,
+  FatalInputError,
   GeminiEventType,
   OutputFormat,
+  ToolErrorType,
   uiTelemetryService,
-  FatalInputError,
-  CoreEvent,
-} from '@airiscode/gemini-cli-core';
-import type { Part } from '@google/genai';
-import { runNonInteractive } from './nonInteractiveCli.js';
+} from "@airiscode/gemini-cli-core";
+import type { Part } from "@google/genai";
 import {
+  afterEach,
+  beforeEach,
   describe,
-  it,
   expect,
-  beforeEach,
-  afterEach,
-  vi,
+  it,
   type Mock,
   type MockInstance,
-} from 'vitest';
-import type { LoadedSettings } from './config/settings.js';
+  vi,
+} from "vitest";
+import type { LoadedSettings } from "./config/settings.js";
+import { runNonInteractive } from "./nonInteractiveCli.js";
 
 // Mock core modules
-vi.mock('./ui/hooks/atCommandProcessor.js');
+vi.mock("./ui/hooks/atCommandProcessor.js");
 
 const mockCoreEvents = vi.hoisted(() => ({
   on: vi.fn(),
@@ -46,9 +46,8 @@ const mockCoreEvents = vi.hoisted(() => ({
   emit: vi.fn(),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
 
   class MockChatRecordingService {
     initialize = vi.fn();
@@ -75,16 +74,16 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
 
 const mockGetCommands = vi.hoisted(() => vi.fn());
 const mockCommandServiceCreate = vi.hoisted(() => vi.fn());
-vi.mock('./services/CommandService.js', () => ({
+vi.mock("./services/CommandService.js", () => ({
   CommandService: {
     create: mockCommandServiceCreate,
   },
 }));
 
-vi.mock('./services/FileCommandLoader.js');
-vi.mock('./services/McpPromptLoader.js');
+vi.mock("./services/FileCommandLoader.js");
+vi.mock("./services/McpPromptLoader.js");
 
-describe('runNonInteractive', () => {
+describe("runNonInteractive", () => {
   let mockConfig: Config;
   let mockSettings: LoadedSettings;
   let mockToolRegistry: ToolRegistry;
@@ -125,15 +124,11 @@ describe('runNonInteractive', () => {
       getCommands: mockGetCommands,
     });
 
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    processStdoutSpy = vi
-      .spyOn(process.stdout, 'write')
-      .mockImplementation(() => true);
-    vi.spyOn(process.stdout, 'on').mockImplementation(() => process.stdout);
-    processStderrSpy = vi
-      .spyOn(process.stderr, 'write')
-      .mockImplementation(() => true);
-    vi.spyOn(process, 'exit').mockImplementation((code) => {
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    processStdoutSpy = vi.spyOn(process.stdout, "write").mockImplementation(() => true);
+    vi.spyOn(process.stdout, "on").mockImplementation(() => process.stdout);
+    processStderrSpy = vi.spyOn(process.stderr, "write").mockImplementation(() => true);
+    vi.spyOn(process, "exit").mockImplementation((code) => {
       throw new Error(`process.exit(${code}) called`);
     });
 
@@ -158,26 +153,26 @@ describe('runNonInteractive', () => {
       getGeminiClient: vi.fn().mockReturnValue(mockGeminiClient),
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
       getMaxSessionTurns: vi.fn().mockReturnValue(10),
-      getSessionId: vi.fn().mockReturnValue('test-session-id'),
-      getProjectRoot: vi.fn().mockReturnValue('/test/project'),
+      getSessionId: vi.fn().mockReturnValue("test-session-id"),
+      getProjectRoot: vi.fn().mockReturnValue("/test/project"),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/test/project/.gemini/tmp'),
+        getProjectTempDir: vi.fn().mockReturnValue("/test/project/.gemini/tmp"),
       },
       getIdeMode: vi.fn().mockReturnValue(false),
 
       getContentGeneratorConfig: vi.fn().mockReturnValue({}),
       getDebugMode: vi.fn().mockReturnValue(false),
-      getOutputFormat: vi.fn().mockReturnValue('text'),
-      getModel: vi.fn().mockReturnValue('test-model'),
+      getOutputFormat: vi.fn().mockReturnValue("text"),
+      getModel: vi.fn().mockReturnValue("test-model"),
       getFolderTrust: vi.fn().mockReturnValue(false),
       isTrustedFolder: vi.fn().mockReturnValue(false),
     } as unknown as Config;
 
     mockSettings = {
-      system: { path: '', settings: {} },
-      systemDefaults: { path: '', settings: {} },
-      user: { path: '', settings: {} },
-      workspace: { path: '', settings: {} },
+      system: { path: "", settings: {} },
+      systemDefaults: { path: "", settings: {} },
+      user: { path: "", settings: {} },
+      workspace: { path: "", settings: {} },
       errors: [],
       setValue: vi.fn(),
       merged: {
@@ -193,9 +188,7 @@ describe('runNonInteractive', () => {
       computeMergedSettings: vi.fn(),
     } as unknown as LoadedSettings;
 
-    const { handleAtCommand } = await import(
-      './ui/hooks/atCommandProcessor.js'
-    );
+    const { handleAtCommand } = await import("./ui/hooks/atCommandProcessor.js");
     vi.mocked(handleAtCommand).mockImplementation(async ({ query }) => ({
       processedQuery: [{ text: query }],
       shouldProceed: true,
@@ -214,65 +207,62 @@ describe('runNonInteractive', () => {
     }
   }
 
-  const getWrittenOutput = () =>
-    processStdoutSpy.mock.calls.map((c) => c[0]).join('');
+  const getWrittenOutput = () => processStdoutSpy.mock.calls.map((c) => c[0]).join("");
 
-  it('should process input and write text output', async () => {
+  it("should process input and write text output", async () => {
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Hello' },
-      { type: GeminiEventType.Content, value: ' World' },
+      { type: GeminiEventType.Content, value: "Hello" },
+      { type: GeminiEventType.Content, value: " World" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Test input',
-      prompt_id: 'prompt-id-1',
+      input: "Test input",
+      prompt_id: "prompt-id-1",
     });
 
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledWith(
-      [{ text: 'Test input' }],
+      [{ text: "Test input" }],
       expect.any(AbortSignal),
-      'prompt-id-1',
+      "prompt-id-1",
     );
-    expect(getWrittenOutput()).toBe('Hello World\n');
+    expect(getWrittenOutput()).toBe("Hello World\n");
     // Note: Telemetry shutdown is now handled in runExitCleanup() in cleanup.ts
     // so we no longer expect shutdownTelemetry to be called directly here
   });
 
-  it('should handle a single tool call and respond', async () => {
+  it("should handle a single tool call and respond", async () => {
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'tool-1',
-        name: 'testTool',
-        args: { arg1: 'value1' },
+        callId: "tool-1",
+        name: "testTool",
+        args: { arg1: "value1" },
         isClientInitiated: false,
-        prompt_id: 'prompt-id-2',
+        prompt_id: "prompt-id-2",
       },
     };
-    const toolResponse: Part[] = [{ text: 'Tool response' }];
+    const toolResponse: Part[] = [{ text: "Tool response" }];
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'success',
+      status: "success",
       request: {
-        callId: 'tool-1',
-        name: 'testTool',
-        args: { arg1: 'value1' },
+        callId: "tool-1",
+        name: "testTool",
+        args: { arg1: "value1" },
         isClientInitiated: false,
-        prompt_id: 'prompt-id-2',
+        prompt_id: "prompt-id-2",
       },
       tool: {} as AnyDeclarativeTool,
       invocation: {} as AnyToolInvocation,
       response: {
         responseParts: toolResponse,
-        callId: 'tool-1',
+        callId: "tool-1",
         error: undefined,
         errorType: undefined,
         contentLength: undefined,
@@ -281,7 +271,7 @@ describe('runNonInteractive', () => {
 
     const firstCallEvents: ServerGeminiStreamEvent[] = [toolCallEvent];
     const secondCallEvents: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Final answer' },
+      { type: GeminiEventType.Content, value: "Final answer" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
@@ -295,26 +285,26 @@ describe('runNonInteractive', () => {
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Use a tool',
-      prompt_id: 'prompt-id-2',
+      input: "Use a tool",
+      prompt_id: "prompt-id-2",
     });
 
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(2);
     expect(mockCoreExecuteToolCall).toHaveBeenCalledWith(
       mockConfig,
-      expect.objectContaining({ name: 'testTool' }),
+      expect.objectContaining({ name: "testTool" }),
       expect.any(AbortSignal),
     );
     expect(mockGeminiClient.sendMessageStream).toHaveBeenNthCalledWith(
       2,
-      [{ text: 'Tool response' }],
+      [{ text: "Tool response" }],
       expect.any(AbortSignal),
-      'prompt-id-2',
+      "prompt-id-2",
     );
-    expect(getWrittenOutput()).toBe('Final answer\n');
+    expect(getWrittenOutput()).toBe("Final answer\n");
   });
 
-  it('should write a single newline between sequential text outputs from the model', async () => {
+  it("should write a single newline between sequential text outputs from the model", async () => {
     // This test simulates a multi-turn conversation to ensure that a single newline
     // is printed between each block of text output from the model.
 
@@ -322,40 +312,40 @@ describe('runNonInteractive', () => {
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'mock-tool',
-        name: 'mockTool',
+        callId: "mock-tool",
+        name: "mockTool",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-multi',
+        prompt_id: "prompt-id-multi",
       },
     };
 
     // 2. Mock the execution of the tools. We just need them to succeed.
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'success',
+      status: "success",
       request: toolCallEvent.value, // This is generic enough for both calls
       tool: {} as AnyDeclarativeTool,
       invocation: {} as AnyToolInvocation,
       response: {
         responseParts: [],
-        callId: 'mock-tool',
+        callId: "mock-tool",
       },
     });
 
     // 3. Define the sequence of events streamed from the mock model.
     // Turn 1: Model outputs text, then requests a tool call.
     const modelTurn1: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Use mock tool' },
+      { type: GeminiEventType.Content, value: "Use mock tool" },
       toolCallEvent,
     ];
     // Turn 2: Model outputs more text, then requests another tool call.
     const modelTurn2: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Use mock tool again' },
+      { type: GeminiEventType.Content, value: "Use mock tool again" },
       toolCallEvent,
     ];
     // Turn 3: Model outputs a final answer.
     const modelTurn3: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Finished.' },
+      { type: GeminiEventType.Content, value: "Finished." },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
@@ -371,8 +361,8 @@ describe('runNonInteractive', () => {
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Use mock tool multiple times',
-      prompt_id: 'prompt-id-multi',
+      input: "Use mock tool multiple times",
+      prompt_id: "prompt-id-multi",
     });
 
     // 5. Verify the output.
@@ -384,49 +374,49 @@ describe('runNonInteractive', () => {
     expect(mockCoreExecuteToolCall).toHaveBeenCalledTimes(2);
   });
 
-  it('should handle error during tool execution and should send error back to the model', async () => {
+  it("should handle error during tool execution and should send error back to the model", async () => {
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'tool-1',
-        name: 'errorTool',
+        callId: "tool-1",
+        name: "errorTool",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-3',
+        prompt_id: "prompt-id-3",
       },
     };
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'error',
+      status: "error",
       request: {
-        callId: 'tool-1',
-        name: 'errorTool',
+        callId: "tool-1",
+        name: "errorTool",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-3',
+        prompt_id: "prompt-id-3",
       },
       tool: {} as AnyDeclarativeTool,
       response: {
-        callId: 'tool-1',
-        error: new Error('Execution failed'),
+        callId: "tool-1",
+        error: new Error("Execution failed"),
         errorType: ToolErrorType.EXECUTION_FAILED,
         responseParts: [
           {
             functionResponse: {
-              name: 'errorTool',
+              name: "errorTool",
               response: {
-                output: 'Error: Execution failed',
+                output: "Error: Execution failed",
               },
             },
           },
         ],
-        resultDisplay: 'Execution failed',
+        resultDisplay: "Execution failed",
         contentLength: undefined,
       },
     });
     const finalResponse: ServerGeminiStreamEvent[] = [
       {
         type: GeminiEventType.Content,
-        value: 'Sorry, let me try again.',
+        value: "Sorry, let me try again.",
       },
       {
         type: GeminiEventType.Finished,
@@ -440,13 +430,13 @@ describe('runNonInteractive', () => {
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Trigger tool error',
-      prompt_id: 'prompt-id-3',
+      input: "Trigger tool error",
+      prompt_id: "prompt-id-3",
     });
 
     expect(mockCoreExecuteToolCall).toHaveBeenCalled();
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Error executing tool errorTool: Execution failed',
+      "Error executing tool errorTool: Execution failed",
     );
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(2);
     expect(mockGeminiClient.sendMessageStream).toHaveBeenNthCalledWith(
@@ -454,21 +444,21 @@ describe('runNonInteractive', () => {
       [
         {
           functionResponse: {
-            name: 'errorTool',
+            name: "errorTool",
             response: {
-              output: 'Error: Execution failed',
+              output: "Error: Execution failed",
             },
           },
         },
       ],
       expect.any(AbortSignal),
-      'prompt-id-3',
+      "prompt-id-3",
     );
-    expect(getWrittenOutput()).toBe('Sorry, let me try again.\n');
+    expect(getWrittenOutput()).toBe("Sorry, let me try again.\n");
   });
 
-  it('should exit with error if sendMessageStream throws initially', async () => {
-    const apiError = new Error('API connection failed');
+  it("should exit with error if sendMessageStream throws initially", async () => {
+    const apiError = new Error("API connection failed");
     mockGeminiClient.sendMessageStream.mockImplementation(() => {
       throw apiError;
     });
@@ -477,34 +467,34 @@ describe('runNonInteractive', () => {
       runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'Initial fail',
-        prompt_id: 'prompt-id-4',
+        input: "Initial fail",
+        prompt_id: "prompt-id-4",
       }),
     ).rejects.toThrow(apiError);
   });
 
-  it('should not exit if a tool is not found, and should send error back to model', async () => {
+  it("should not exit if a tool is not found, and should send error back to model", async () => {
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'tool-1',
-        name: 'nonexistentTool',
+        callId: "tool-1",
+        name: "nonexistentTool",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-5',
+        prompt_id: "prompt-id-5",
       },
     };
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'error',
+      status: "error",
       request: {
-        callId: 'tool-1',
-        name: 'nonexistentTool',
+        callId: "tool-1",
+        name: "nonexistentTool",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-5',
+        prompt_id: "prompt-id-5",
       },
       response: {
-        callId: 'tool-1',
+        callId: "tool-1",
         error: new Error('Tool "nonexistentTool" not found in registry.'),
         resultDisplay: 'Tool "nonexistentTool" not found in registry.',
         responseParts: [],
@@ -530,8 +520,8 @@ describe('runNonInteractive', () => {
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Trigger tool not found',
-      prompt_id: 'prompt-id-5',
+      input: "Trigger tool not found",
+      prompt_id: "prompt-id-5",
     });
 
     expect(mockCoreExecuteToolCall).toHaveBeenCalled();
@@ -542,32 +532,30 @@ describe('runNonInteractive', () => {
     expect(getWrittenOutput()).toBe("Sorry, I can't find that tool.\n");
   });
 
-  it('should exit when max session turns are exceeded', async () => {
+  it("should exit when max session turns are exceeded", async () => {
     vi.mocked(mockConfig.getMaxSessionTurns).mockReturnValue(0);
     await expect(
       runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'Trigger loop',
-        prompt_id: 'prompt-id-6',
+        input: "Trigger loop",
+        prompt_id: "prompt-id-6",
       }),
-    ).rejects.toThrow('process.exit(53) called');
+    ).rejects.toThrow("process.exit(53) called");
   });
 
-  it('should preprocess @include commands before sending to the model', async () => {
+  it("should preprocess @include commands before sending to the model", async () => {
     // 1. Mock the imported atCommandProcessor
-    const { handleAtCommand } = await import(
-      './ui/hooks/atCommandProcessor.js'
-    );
+    const { handleAtCommand } = await import("./ui/hooks/atCommandProcessor.js");
     const mockHandleAtCommand = vi.mocked(handleAtCommand);
 
     // 2. Define the raw input and the expected processed output
-    const rawInput = 'Summarize @file.txt';
+    const rawInput = "Summarize @file.txt";
     const processedParts: Part[] = [
-      { text: 'Summarize @file.txt' },
-      { text: '\n--- Content from referenced files ---\n' },
-      { text: 'This is the content of the file.' },
-      { text: '\n--- End of content ---' },
+      { text: "Summarize @file.txt" },
+      { text: "\n--- Content from referenced files ---\n" },
+      { text: "This is the content of the file." },
+      { text: "\n--- End of content ---" },
     ];
 
     // 3. Setup the mock to return the processed parts
@@ -578,68 +566,62 @@ describe('runNonInteractive', () => {
 
     // Mock a simple stream response from the Gemini client
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Summary complete.' },
+      { type: GeminiEventType.Content, value: "Summary complete." },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     // 4. Run the non-interactive mode with the raw input
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
       input: rawInput,
-      prompt_id: 'prompt-id-7',
+      prompt_id: "prompt-id-7",
     });
 
     // 5. Assert that sendMessageStream was called with the PROCESSED parts, not the raw input
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledWith(
       processedParts,
       expect.any(AbortSignal),
-      'prompt-id-7',
+      "prompt-id-7",
     );
 
     // 6. Assert the final output is correct
-    expect(getWrittenOutput()).toBe('Summary complete.\n');
+    expect(getWrittenOutput()).toBe("Summary complete.\n");
   });
 
-  it('should process input and write JSON output with stats', async () => {
+  it("should process input and write JSON output with stats", async () => {
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Hello World' },
+      { type: GeminiEventType.Content, value: "Hello World" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
-      MOCK_SESSION_METRICS,
-    );
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(MOCK_SESSION_METRICS);
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Test input',
-      prompt_id: 'prompt-id-1',
+      input: "Test input",
+      prompt_id: "prompt-id-1",
     });
 
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledWith(
-      [{ text: 'Test input' }],
+      [{ text: "Test input" }],
       expect.any(AbortSignal),
-      'prompt-id-1',
+      "prompt-id-1",
     );
     expect(processStdoutSpy).toHaveBeenCalledWith(
       JSON.stringify(
         {
-          session_id: 'test-session-id',
-          response: 'Hello World',
+          session_id: "test-session-id",
+          response: "Hello World",
           stats: MOCK_SESSION_METRICS,
         },
         null,
@@ -648,34 +630,34 @@ describe('runNonInteractive', () => {
     );
   });
 
-  it('should write JSON output with stats for tool-only commands (no text response)', async () => {
+  it("should write JSON output with stats for tool-only commands (no text response)", async () => {
     // Test the scenario where a command completes successfully with only tool calls
     // but no text response - this would have caught the original bug
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'tool-1',
-        name: 'testTool',
-        args: { arg1: 'value1' },
+        callId: "tool-1",
+        name: "testTool",
+        args: { arg1: "value1" },
         isClientInitiated: false,
-        prompt_id: 'prompt-id-tool-only',
+        prompt_id: "prompt-id-tool-only",
       },
     };
-    const toolResponse: Part[] = [{ text: 'Tool executed successfully' }];
+    const toolResponse: Part[] = [{ text: "Tool executed successfully" }];
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'success',
+      status: "success",
       request: {
-        callId: 'tool-1',
-        name: 'testTool',
-        args: { arg1: 'value1' },
+        callId: "tool-1",
+        name: "testTool",
+        args: { arg1: "value1" },
         isClientInitiated: false,
-        prompt_id: 'prompt-id-tool-only',
+        prompt_id: "prompt-id-tool-only",
       },
       tool: {} as AnyDeclarativeTool,
       invocation: {} as AnyToolInvocation,
       response: {
         responseParts: toolResponse,
-        callId: 'tool-1',
+        callId: "tool-1",
         error: undefined,
         errorType: undefined,
         contentLength: undefined,
@@ -704,21 +686,19 @@ describe('runNonInteractive', () => {
       .mockReturnValueOnce(createStreamFromEvents(secondCallEvents));
 
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
-      MOCK_SESSION_METRICS,
-    );
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(MOCK_SESSION_METRICS);
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Execute tool only',
-      prompt_id: 'prompt-id-tool-only',
+      input: "Execute tool only",
+      prompt_id: "prompt-id-tool-only",
     });
 
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledTimes(2);
     expect(mockCoreExecuteToolCall).toHaveBeenCalledWith(
       mockConfig,
-      expect.objectContaining({ name: 'testTool' }),
+      expect.objectContaining({ name: "testTool" }),
       expect.any(AbortSignal),
     );
 
@@ -726,8 +706,8 @@ describe('runNonInteractive', () => {
     expect(processStdoutSpy).toHaveBeenCalledWith(
       JSON.stringify(
         {
-          session_id: 'test-session-id',
-          response: '',
+          session_id: "test-session-id",
+          response: "",
           stats: MOCK_SESSION_METRICS,
         },
         null,
@@ -736,7 +716,7 @@ describe('runNonInteractive', () => {
     );
   });
 
-  it('should write JSON output with stats for empty response commands', async () => {
+  it("should write JSON output with stats for empty response commands", async () => {
     // Test the scenario where a command completes but produces no content at all
     const events: ServerGeminiStreamEvent[] = [
       {
@@ -744,33 +724,29 @@ describe('runNonInteractive', () => {
         value: { reason: undefined, usageMetadata: { totalTokenCount: 1 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
-      MOCK_SESSION_METRICS,
-    );
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(MOCK_SESSION_METRICS);
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Empty response test',
-      prompt_id: 'prompt-id-empty',
+      input: "Empty response test",
+      prompt_id: "prompt-id-empty",
     });
 
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledWith(
-      [{ text: 'Empty response test' }],
+      [{ text: "Empty response test" }],
       expect.any(AbortSignal),
-      'prompt-id-empty',
+      "prompt-id-empty",
     );
 
     // This should output JSON with empty response but include stats
     expect(processStdoutSpy).toHaveBeenCalledWith(
       JSON.stringify(
         {
-          session_id: 'test-session-id',
-          response: '',
+          session_id: "test-session-id",
+          response: "",
           stats: MOCK_SESSION_METRICS,
         },
         null,
@@ -779,43 +755,41 @@ describe('runNonInteractive', () => {
     );
   });
 
-  it('should handle errors in JSON format', async () => {
+  it("should handle errors in JSON format", async () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    const testError = new Error('Invalid input provided');
+    const testError = new Error("Invalid input provided");
 
     mockGeminiClient.sendMessageStream.mockImplementation(() => {
       throw testError;
     });
 
     // Mock console.error to capture JSON error output
-    const consoleErrorJsonSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
+    const consoleErrorJsonSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     let thrownError: Error | null = null;
     try {
       await runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'Test input',
-        prompt_id: 'prompt-id-error',
+        input: "Test input",
+        prompt_id: "prompt-id-error",
       });
       // Should not reach here
-      expect.fail('Expected process.exit to be called');
+      expect.fail("Expected process.exit to be called");
     } catch (error) {
       thrownError = error as Error;
     }
 
     // Should throw because of mocked process.exit
-    expect(thrownError?.message).toBe('process.exit(1) called');
+    expect(thrownError?.message).toBe("process.exit(1) called");
 
     expect(consoleErrorJsonSpy).toHaveBeenCalledWith(
       JSON.stringify(
         {
-          session_id: 'test-session-id',
+          session_id: "test-session-id",
           error: {
-            type: 'Error',
-            message: 'Invalid input provided',
+            type: "Error",
+            message: "Invalid input provided",
             code: 1,
           },
         },
@@ -825,43 +799,41 @@ describe('runNonInteractive', () => {
     );
   });
 
-  it('should handle FatalInputError with custom exit code in JSON format', async () => {
+  it("should handle FatalInputError with custom exit code in JSON format", async () => {
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
-    const fatalError = new FatalInputError('Invalid command syntax provided');
+    const fatalError = new FatalInputError("Invalid command syntax provided");
 
     mockGeminiClient.sendMessageStream.mockImplementation(() => {
       throw fatalError;
     });
 
     // Mock console.error to capture JSON error output
-    const consoleErrorJsonSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
+    const consoleErrorJsonSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     let thrownError: Error | null = null;
     try {
       await runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'Invalid syntax',
-        prompt_id: 'prompt-id-fatal',
+        input: "Invalid syntax",
+        prompt_id: "prompt-id-fatal",
       });
       // Should not reach here
-      expect.fail('Expected process.exit to be called');
+      expect.fail("Expected process.exit to be called");
     } catch (error) {
       thrownError = error as Error;
     }
 
     // Should throw because of mocked process.exit with custom exit code
-    expect(thrownError?.message).toBe('process.exit(42) called');
+    expect(thrownError?.message).toBe("process.exit(42) called");
 
     expect(consoleErrorJsonSpy).toHaveBeenCalledWith(
       JSON.stringify(
         {
-          session_id: 'test-session-id',
+          session_id: "test-session-id",
           error: {
-            type: 'FatalInputError',
-            message: 'Invalid command syntax provided',
+            type: "FatalInputError",
+            message: "Invalid command syntax provided",
             code: 42,
           },
         },
@@ -871,95 +843,86 @@ describe('runNonInteractive', () => {
     );
   });
 
-  it('should execute a slash command that returns a prompt', async () => {
+  it("should execute a slash command that returns a prompt", async () => {
     const mockCommand = {
-      name: 'testcommand',
-      description: 'a test command',
+      name: "testcommand",
+      description: "a test command",
       action: vi.fn().mockResolvedValue({
-        type: 'submit_prompt',
-        content: [{ text: 'Prompt from command' }],
+        type: "submit_prompt",
+        content: [{ text: "Prompt from command" }],
       }),
     };
     mockGetCommands.mockReturnValue([mockCommand]);
 
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Response from command' },
+      { type: GeminiEventType.Content, value: "Response from command" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: '/testcommand',
-      prompt_id: 'prompt-id-slash',
+      input: "/testcommand",
+      prompt_id: "prompt-id-slash",
     });
 
     // Ensure the prompt sent to the model is from the command, not the raw input
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledWith(
-      [{ text: 'Prompt from command' }],
+      [{ text: "Prompt from command" }],
       expect.any(AbortSignal),
-      'prompt-id-slash',
+      "prompt-id-slash",
     );
 
-    expect(getWrittenOutput()).toBe('Response from command\n');
+    expect(getWrittenOutput()).toBe("Response from command\n");
   });
 
-  it('should handle slash commands', async () => {
-    const nonInteractiveCliCommands = await import(
-      './nonInteractiveCliCommands.js'
-    );
-    const handleSlashCommandSpy = vi.spyOn(
-      nonInteractiveCliCommands,
-      'handleSlashCommand',
-    );
-    handleSlashCommandSpy.mockResolvedValue([{ text: 'Slash command output' }]);
+  it("should handle slash commands", async () => {
+    const nonInteractiveCliCommands = await import("./nonInteractiveCliCommands.js");
+    const handleSlashCommandSpy = vi.spyOn(nonInteractiveCliCommands, "handleSlashCommand");
+    handleSlashCommandSpy.mockResolvedValue([{ text: "Slash command output" }]);
 
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Response to slash command' },
+      { type: GeminiEventType.Content, value: "Response to slash command" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: '/help',
-      prompt_id: 'prompt-id-slash',
+      input: "/help",
+      prompt_id: "prompt-id-slash",
     });
 
     expect(handleSlashCommandSpy).toHaveBeenCalledWith(
-      '/help',
+      "/help",
       expect.any(AbortController),
       mockConfig,
       mockSettings,
     );
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledWith(
-      [{ text: 'Slash command output' }],
+      [{ text: "Slash command output" }],
       expect.any(AbortSignal),
-      'prompt-id-slash',
+      "prompt-id-slash",
     );
-    expect(getWrittenOutput()).toBe('Response to slash command\n');
+    expect(getWrittenOutput()).toBe("Response to slash command\n");
     handleSlashCommandSpy.mockRestore();
   });
 
-  it('should handle cancellation (Ctrl+C)', async () => {
+  it("should handle cancellation (Ctrl+C)", async () => {
     // Mock isTTY and setRawMode safely
     const originalIsTTY = process.stdin.isTTY;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const originalSetRawMode = (process.stdin as any).setRawMode;
 
-    Object.defineProperty(process.stdin, 'isTTY', {
+    Object.defineProperty(process.stdin, "isTTY", {
       value: true,
       configurable: true,
     });
@@ -968,50 +931,45 @@ describe('runNonInteractive', () => {
       (process.stdin as any).setRawMode = vi.fn();
     }
 
-    const stdinOnSpy = vi
-      .spyOn(process.stdin, 'on')
-      .mockImplementation(() => process.stdin);
+    const stdinOnSpy = vi.spyOn(process.stdin, "on").mockImplementation(() => process.stdin);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    vi.spyOn(process.stdin as any, 'setRawMode').mockImplementation(() => true);
-    vi.spyOn(process.stdin, 'resume').mockImplementation(() => process.stdin);
-    vi.spyOn(process.stdin, 'pause').mockImplementation(() => process.stdin);
-    vi.spyOn(process.stdin, 'removeAllListeners').mockImplementation(
-      () => process.stdin,
-    );
+    vi.spyOn(process.stdin as any, "setRawMode").mockImplementation(() => true);
+    vi.spyOn(process.stdin, "resume").mockImplementation(() => process.stdin);
+    vi.spyOn(process.stdin, "pause").mockImplementation(() => process.stdin);
+    vi.spyOn(process.stdin, "removeAllListeners").mockImplementation(() => process.stdin);
 
     // Spy on handleCancellationError to verify it's called
-    const errors = await import('./utils/errors.js');
+    const errors = await import("./utils/errors.js");
     const handleCancellationErrorSpy = vi
-      .spyOn(errors, 'handleCancellationError')
+      .spyOn(errors, "handleCancellationError")
       .mockImplementation(() => {
-        throw new Error('Cancelled');
+        throw new Error("Cancelled");
       });
 
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Thinking...' },
+      { type: GeminiEventType.Content, value: "Thinking..." },
     ];
     // Create a stream that responds to abortion
-    mockGeminiClient.sendMessageStream.mockImplementation(
-      (_messages, signal: AbortSignal) =>
-        (async function* () {
-          yield events[0];
-          await new Promise((resolve, reject) => {
-            const timeout = setTimeout(resolve, 1000);
-            signal.addEventListener('abort', () => {
-              clearTimeout(timeout);
-              setTimeout(() => {
-                reject(new Error('Aborted')); // This will be caught by nonInteractiveCli and passed to handleError
-              }, 300);
-            });
+    mockGeminiClient.sendMessageStream.mockImplementation((_messages, signal: AbortSignal) =>
+      (async function* () {
+        yield events[0];
+        await new Promise((resolve, reject) => {
+          const timeout = setTimeout(resolve, 1000);
+          signal.addEventListener("abort", () => {
+            clearTimeout(timeout);
+            setTimeout(() => {
+              reject(new Error("Aborted")); // This will be caught by nonInteractiveCli and passed to handleError
+            }, 300);
           });
-        })(),
+        });
+      })(),
     );
 
     const runPromise = runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Long running query',
-      prompt_id: 'prompt-id-cancel',
+      input: "Long running query",
+      prompt_id: "prompt-id-cancel",
     });
 
     // Wait a bit for setup to complete and listeners to be registered
@@ -1020,7 +978,7 @@ describe('runNonInteractive', () => {
     // Find the keypress handler registered by runNonInteractive
     const keypressCall = stdinOnSpy.mock.calls.find(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      (call) => (call[0] as any) === 'keypress',
+      (call) => (call[0] as any) === "keypress",
     );
     expect(keypressCall).toBeDefined();
     const keypressHandler = keypressCall?.[1] as (
@@ -1030,7 +988,7 @@ describe('runNonInteractive', () => {
 
     if (keypressHandler) {
       // Simulate Ctrl+C
-      keypressHandler('\u0003', { ctrl: true, name: 'c' });
+      keypressHandler("\u0003", { ctrl: true, name: "c" });
     }
 
     // The promise should reject with 'Aborted' because our mock stream throws it,
@@ -1046,18 +1004,18 @@ describe('runNonInteractive', () => {
 
     // Let's just check that the promise rejects with 'Aborted' for now,
     // which proves the abortion signal reached the stream.
-    await expect(runPromise).rejects.toThrow('Aborted');
+    await expect(runPromise).rejects.toThrow("Aborted");
 
     expect(
       processStderrSpy.mock.calls.some(
-        (call) => typeof call[0] === 'string' && call[0].includes('Cancelling'),
+        (call) => typeof call[0] === "string" && call[0].includes("Cancelling"),
       ),
     ).toBe(true);
 
     handleCancellationErrorSpy.mockRestore();
 
     // Restore original values
-    Object.defineProperty(process.stdin, 'isTTY', {
+    Object.defineProperty(process.stdin, "isTTY", {
       value: originalIsTTY,
       configurable: true,
     });
@@ -1072,13 +1030,13 @@ describe('runNonInteractive', () => {
     // but we can also do it manually if needed.
   });
 
-  it('should throw FatalInputError if a command requires confirmation', async () => {
+  it("should throw FatalInputError if a command requires confirmation", async () => {
     const mockCommand = {
-      name: 'confirm',
-      description: 'a command that needs confirmation',
+      name: "confirm",
+      description: "a command that needs confirmation",
       action: vi.fn().mockResolvedValue({
-        type: 'confirm_shell_commands',
-        commands: ['rm -rf /'],
+        type: "confirm_shell_commands",
+        commands: ["rm -rf /"],
       }),
     };
     mockGetCommands.mockReturnValue([mockCommand]);
@@ -1087,52 +1045,48 @@ describe('runNonInteractive', () => {
       runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: '/confirm',
-        prompt_id: 'prompt-id-confirm',
+        input: "/confirm",
+        prompt_id: "prompt-id-confirm",
       }),
-    ).rejects.toThrow(
-      'Exiting due to a confirmation prompt requested by the command.',
-    );
+    ).rejects.toThrow("Exiting due to a confirmation prompt requested by the command.");
   });
 
-  it('should treat an unknown slash command as a regular prompt', async () => {
+  it("should treat an unknown slash command as a regular prompt", async () => {
     // No commands are mocked, so any slash command is "unknown"
     mockGetCommands.mockReturnValue([]);
 
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Response to unknown' },
+      { type: GeminiEventType.Content, value: "Response to unknown" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: '/unknowncommand',
-      prompt_id: 'prompt-id-unknown',
+      input: "/unknowncommand",
+      prompt_id: "prompt-id-unknown",
     });
 
     // Ensure the raw input is sent to the model
     expect(mockGeminiClient.sendMessageStream).toHaveBeenCalledWith(
-      [{ text: '/unknowncommand' }],
+      [{ text: "/unknowncommand" }],
       expect.any(AbortSignal),
-      'prompt-id-unknown',
+      "prompt-id-unknown",
     );
 
-    expect(getWrittenOutput()).toBe('Response to unknown\n');
+    expect(getWrittenOutput()).toBe("Response to unknown\n");
   });
 
-  it('should throw for unhandled command result types', async () => {
+  it("should throw for unhandled command result types", async () => {
     const mockCommand = {
-      name: 'noaction',
-      description: 'unhandled type',
+      name: "noaction",
+      description: "unhandled type",
       action: vi.fn().mockResolvedValue({
-        type: 'unhandled',
+        type: "unhandled",
       }),
     };
     mockGetCommands.mockReturnValue([mockCommand]);
@@ -1141,73 +1095,67 @@ describe('runNonInteractive', () => {
       runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: '/noaction',
-        prompt_id: 'prompt-id-unhandled',
+        input: "/noaction",
+        prompt_id: "prompt-id-unhandled",
       }),
     ).rejects.toThrow(
-      'Exiting due to command result that is not supported in non-interactive mode.',
+      "Exiting due to command result that is not supported in non-interactive mode.",
     );
   });
 
-  it('should pass arguments to the slash command action', async () => {
+  it("should pass arguments to the slash command action", async () => {
     const mockAction = vi.fn().mockResolvedValue({
-      type: 'submit_prompt',
-      content: [{ text: 'Prompt from command' }],
+      type: "submit_prompt",
+      content: [{ text: "Prompt from command" }],
     });
     const mockCommand = {
-      name: 'testargs',
-      description: 'a test command',
+      name: "testargs",
+      description: "a test command",
       action: mockAction,
     };
     mockGetCommands.mockReturnValue([mockCommand]);
 
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Acknowledged' },
+      { type: GeminiEventType.Content, value: "Acknowledged" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 1 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: '/testargs arg1 arg2',
-      prompt_id: 'prompt-id-args',
+      input: "/testargs arg1 arg2",
+      prompt_id: "prompt-id-args",
     });
 
-    expect(mockAction).toHaveBeenCalledWith(expect.any(Object), 'arg1 arg2');
+    expect(mockAction).toHaveBeenCalledWith(expect.any(Object), "arg1 arg2");
 
-    expect(getWrittenOutput()).toBe('Acknowledged\n');
+    expect(getWrittenOutput()).toBe("Acknowledged\n");
   });
 
-  it('should instantiate CommandService with correct loaders for slash commands', async () => {
+  it("should instantiate CommandService with correct loaders for slash commands", async () => {
     // This test indirectly checks that handleSlashCommand is using the right loaders.
-    const { FileCommandLoader } = await import(
-      './services/FileCommandLoader.js'
-    );
-    const { McpPromptLoader } = await import('./services/McpPromptLoader.js');
+    const { FileCommandLoader } = await import("./services/FileCommandLoader.js");
+    const { McpPromptLoader } = await import("./services/McpPromptLoader.js");
 
     mockGetCommands.mockReturnValue([]); // No commands found, so it will fall through
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Acknowledged' },
+      { type: GeminiEventType.Content, value: "Acknowledged" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 1 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: '/mycommand',
-      prompt_id: 'prompt-id-loaders',
+      input: "/mycommand",
+      prompt_id: "prompt-id-loaders",
     });
 
     // Check that loaders were instantiated with the config
@@ -1224,43 +1172,43 @@ describe('runNonInteractive', () => {
     expect(loadersArg[1]).toBe(vi.mocked(FileCommandLoader).mock.instances[0]);
   });
 
-  it('should allow a normally-excluded tool when --allowed-tools is set', async () => {
+  it("should allow a normally-excluded tool when --allowed-tools is set", async () => {
     // By default, ShellTool is excluded in non-interactive mode.
     // This test ensures that --allowed-tools overrides this exclusion.
     vi.mocked(mockConfig.getToolRegistry).mockReturnValue({
       getTool: vi.fn().mockReturnValue({
-        name: 'ShellTool',
-        description: 'A shell tool',
+        name: "ShellTool",
+        description: "A shell tool",
         run: vi.fn(),
       }),
-      getFunctionDeclarations: vi.fn().mockReturnValue([{ name: 'ShellTool' }]),
+      getFunctionDeclarations: vi.fn().mockReturnValue([{ name: "ShellTool" }]),
     } as unknown as ToolRegistry);
 
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'tool-shell-1',
-        name: 'ShellTool',
-        args: { command: 'ls' },
+        callId: "tool-shell-1",
+        name: "ShellTool",
+        args: { command: "ls" },
         isClientInitiated: false,
-        prompt_id: 'prompt-id-allowed',
+        prompt_id: "prompt-id-allowed",
       },
     };
-    const toolResponse: Part[] = [{ text: 'file.txt' }];
+    const toolResponse: Part[] = [{ text: "file.txt" }];
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'success',
+      status: "success",
       request: {
-        callId: 'tool-shell-1',
-        name: 'ShellTool',
-        args: { command: 'ls' },
+        callId: "tool-shell-1",
+        name: "ShellTool",
+        args: { command: "ls" },
         isClientInitiated: false,
-        prompt_id: 'prompt-id-allowed',
+        prompt_id: "prompt-id-allowed",
       },
       tool: {} as AnyDeclarativeTool,
       invocation: {} as AnyToolInvocation,
       response: {
         responseParts: toolResponse,
-        callId: 'tool-shell-1',
+        callId: "tool-shell-1",
         error: undefined,
         errorType: undefined,
         contentLength: undefined,
@@ -1269,7 +1217,7 @@ describe('runNonInteractive', () => {
 
     const firstCallEvents: ServerGeminiStreamEvent[] = [toolCallEvent];
     const secondCallEvents: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'file.txt' },
+      { type: GeminiEventType.Content, value: "file.txt" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
@@ -1283,84 +1231,72 @@ describe('runNonInteractive', () => {
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'List the files',
-      prompt_id: 'prompt-id-allowed',
+      input: "List the files",
+      prompt_id: "prompt-id-allowed",
     });
 
     expect(mockCoreExecuteToolCall).toHaveBeenCalledWith(
       mockConfig,
-      expect.objectContaining({ name: 'ShellTool' }),
+      expect.objectContaining({ name: "ShellTool" }),
       expect.any(AbortSignal),
     );
-    expect(getWrittenOutput()).toBe('file.txt\n');
+    expect(getWrittenOutput()).toBe("file.txt\n");
   });
 
-  describe('CoreEvents Integration', () => {
-    it('subscribes to UserFeedback and drains backlog on start', async () => {
+  describe("CoreEvents Integration", () => {
+    it("subscribes to UserFeedback and drains backlog on start", async () => {
       const events: ServerGeminiStreamEvent[] = [
         {
           type: GeminiEventType.Finished,
           value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
         },
       ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(events),
-      );
+      mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
       await runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'test',
-        prompt_id: 'prompt-id-events',
+        input: "test",
+        prompt_id: "prompt-id-events",
       });
 
-      expect(mockCoreEvents.on).toHaveBeenCalledWith(
-        CoreEvent.UserFeedback,
-        expect.any(Function),
-      );
+      expect(mockCoreEvents.on).toHaveBeenCalledWith(CoreEvent.UserFeedback, expect.any(Function));
       expect(mockCoreEvents.drainBacklogs).toHaveBeenCalledTimes(1);
     });
 
-    it('unsubscribes from UserFeedback on finish', async () => {
+    it("unsubscribes from UserFeedback on finish", async () => {
       const events: ServerGeminiStreamEvent[] = [
         {
           type: GeminiEventType.Finished,
           value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
         },
       ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(events),
-      );
+      mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
       await runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'test',
-        prompt_id: 'prompt-id-events',
+        input: "test",
+        prompt_id: "prompt-id-events",
       });
 
-      expect(mockCoreEvents.off).toHaveBeenCalledWith(
-        CoreEvent.UserFeedback,
-        expect.any(Function),
-      );
+      expect(mockCoreEvents.off).toHaveBeenCalledWith(CoreEvent.UserFeedback, expect.any(Function));
     });
 
-    it('logs to process.stderr when UserFeedback event is received', async () => {
+    it("logs to process.stderr when UserFeedback event is received", async () => {
       const events: ServerGeminiStreamEvent[] = [
         {
           type: GeminiEventType.Finished,
           value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
         },
       ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(events),
-      );
+      mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
       await runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'test',
-        prompt_id: 'prompt-id-events',
+        input: "test",
+        prompt_id: "prompt-id-events",
       });
 
       // Get the registered handler
@@ -1371,17 +1307,15 @@ describe('runNonInteractive', () => {
 
       // Simulate an event
       const payload: UserFeedbackPayload = {
-        severity: 'error',
-        message: 'Test error message',
+        severity: "error",
+        message: "Test error message",
       };
       handler(payload);
 
-      expect(processStderrSpy).toHaveBeenCalledWith(
-        '[ERROR] Test error message\n',
-      );
+      expect(processStderrSpy).toHaveBeenCalledWith("[ERROR] Test error message\n");
     });
 
-    it('logs optional error object to process.stderr in debug mode', async () => {
+    it("logs optional error object to process.stderr in debug mode", async () => {
       vi.mocked(mockConfig.getDebugMode).mockReturnValue(true);
       const events: ServerGeminiStreamEvent[] = [
         {
@@ -1389,15 +1323,13 @@ describe('runNonInteractive', () => {
           value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
         },
       ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(events),
-      );
+      mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
       await runNonInteractive({
         config: mockConfig,
         settings: mockSettings,
-        input: 'test',
-        prompt_id: 'prompt-id-events',
+        input: "test",
+        prompt_id: "prompt-id-events",
       });
 
       // Get the registered handler
@@ -1407,117 +1339,105 @@ describe('runNonInteractive', () => {
       expect(handler).toBeDefined();
 
       // Simulate an event with error object
-      const errorObj = new Error('Original error');
+      const errorObj = new Error("Original error");
       // Mock stack for deterministic testing
-      errorObj.stack = 'Error: Original error\n    at test';
+      errorObj.stack = "Error: Original error\n    at test";
       const payload: UserFeedbackPayload = {
-        severity: 'warning',
-        message: 'Test warning message',
+        severity: "warning",
+        message: "Test warning message",
         error: errorObj,
       };
       handler(payload);
 
-      expect(processStderrSpy).toHaveBeenCalledWith(
-        '[WARNING] Test warning message\n',
-      );
-      expect(processStderrSpy).toHaveBeenCalledWith(
-        'Error: Original error\n    at test\n',
-      );
+      expect(processStderrSpy).toHaveBeenCalledWith("[WARNING] Test warning message\n");
+      expect(processStderrSpy).toHaveBeenCalledWith("Error: Original error\n    at test\n");
     });
   });
 
-  it('should display a deprecation warning if hasDeprecatedPromptArg is true', async () => {
+  it("should display a deprecation warning if hasDeprecatedPromptArg is true", async () => {
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Final Answer' },
+      { type: GeminiEventType.Content, value: "Final Answer" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Test input',
-      prompt_id: 'prompt-id-deprecated',
+      input: "Test input",
+      prompt_id: "prompt-id-deprecated",
       hasDeprecatedPromptArg: true,
     });
 
     expect(processStderrSpy).toHaveBeenCalledWith(
-      'The --prompt (-p) flag has been deprecated and will be removed in a future version. Please use a positional argument for your prompt. See gemini --help for more information.\n',
+      "The --prompt (-p) flag has been deprecated and will be removed in a future version. Please use a positional argument for your prompt. See gemini --help for more information.\n",
     );
-    expect(processStdoutSpy).toHaveBeenCalledWith('Final Answer');
+    expect(processStdoutSpy).toHaveBeenCalledWith("Final Answer");
   });
 
-  it('should display a deprecation warning for JSON format', async () => {
+  it("should display a deprecation warning for JSON format", async () => {
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Final Answer' },
+      { type: GeminiEventType.Content, value: "Final Answer" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
     vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.JSON);
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Test input',
-      prompt_id: 'prompt-id-deprecated-json',
+      input: "Test input",
+      prompt_id: "prompt-id-deprecated-json",
       hasDeprecatedPromptArg: true,
     });
 
     const deprecateText =
-      'The --prompt (-p) flag has been deprecated and will be removed in a future version. Please use a positional argument for your prompt. See gemini --help for more information.\n';
+      "The --prompt (-p) flag has been deprecated and will be removed in a future version. Please use a positional argument for your prompt. See gemini --help for more information.\n";
     expect(processStderrSpy).toHaveBeenCalledWith(deprecateText);
   });
 
-  it('should emit appropriate events for streaming JSON output', async () => {
-    vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
-      OutputFormat.STREAM_JSON,
-    );
-    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
-      MOCK_SESSION_METRICS,
-    );
+  it("should emit appropriate events for streaming JSON output", async () => {
+    vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.STREAM_JSON);
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(MOCK_SESSION_METRICS);
 
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'tool-1',
-        name: 'testTool',
-        args: { arg1: 'value1' },
+        callId: "tool-1",
+        name: "testTool",
+        args: { arg1: "value1" },
         isClientInitiated: false,
-        prompt_id: 'prompt-id-stream',
+        prompt_id: "prompt-id-stream",
       },
     };
 
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'success',
+      status: "success",
       request: toolCallEvent.value,
       tool: {} as AnyDeclarativeTool,
       invocation: {} as AnyToolInvocation,
       response: {
-        responseParts: [{ text: 'Tool response' }],
-        callId: 'tool-1',
+        responseParts: [{ text: "Tool response" }],
+        callId: "tool-1",
         error: undefined,
         errorType: undefined,
         contentLength: undefined,
-        resultDisplay: 'Tool executed successfully',
+        resultDisplay: "Tool executed successfully",
       },
     });
 
     const firstCallEvents: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Thinking...' },
+      { type: GeminiEventType.Content, value: "Thinking..." },
       toolCallEvent,
     ];
     const secondCallEvents: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Final answer' },
+      { type: GeminiEventType.Content, value: "Final answer" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 10 } },
@@ -1531,8 +1451,8 @@ describe('runNonInteractive', () => {
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Stream test',
-      prompt_id: 'prompt-id-stream',
+      input: "Stream test",
+      prompt_id: "prompt-id-stream",
     });
 
     const output = getWrittenOutput();
@@ -1542,159 +1462,138 @@ describe('runNonInteractive', () => {
     expect(sanitizedOutput).toMatchSnapshot();
   });
 
-  it('should handle EPIPE error gracefully', async () => {
+  it("should handle EPIPE error gracefully", async () => {
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Hello' },
-      { type: GeminiEventType.Content, value: ' World' },
+      { type: GeminiEventType.Content, value: "Hello" },
+      { type: GeminiEventType.Content, value: " World" },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     // Mock process.exit to track calls without throwing
-    vi.spyOn(process, 'exit').mockImplementation((_code) => undefined as never);
+    vi.spyOn(process, "exit").mockImplementation((_code) => undefined as never);
 
     // Simulate EPIPE error on stdout
     const stdoutErrorCallback = (process.stdout.on as Mock).mock.calls.find(
-      (call) => call[0] === 'error',
+      (call) => call[0] === "error",
     )?.[1];
 
     if (stdoutErrorCallback) {
-      stdoutErrorCallback({ code: 'EPIPE' });
+      stdoutErrorCallback({ code: "EPIPE" });
     }
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'EPIPE test',
-      prompt_id: 'prompt-id-epipe',
+      input: "EPIPE test",
+      prompt_id: "prompt-id-epipe",
     });
 
     // Since EPIPE is simulated, it might exit early or continue depending on timing,
     // but our main goal is to verify the handler is registered and handles EPIPE.
-    expect(process.stdout.on).toHaveBeenCalledWith(
-      'error',
-      expect.any(Function),
-    );
+    expect(process.stdout.on).toHaveBeenCalledWith("error", expect.any(Function));
   });
 
-  it('should resume chat when resumedSessionData is provided', async () => {
+  it("should resume chat when resumedSessionData is provided", async () => {
     const events: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Resumed' },
+      { type: GeminiEventType.Content, value: "Resumed" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } },
       },
     ];
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents(events),
-    );
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(events));
 
     const resumedSessionData = {
       conversation: {
-        sessionId: 'resumed-session-id',
-        messages: [
-          { role: 'user', parts: [{ text: 'Previous message' }] },
-        ] as any, // eslint-disable-line @typescript-eslint/no-explicit-any
+        sessionId: "resumed-session-id",
+        messages: [{ role: "user", parts: [{ text: "Previous message" }] }] as any, // eslint-disable-line @typescript-eslint/no-explicit-any
         startTime: new Date().toISOString(),
         lastUpdated: new Date().toISOString(),
-        firstUserMessage: 'Previous message',
-        projectHash: 'test-hash',
+        firstUserMessage: "Previous message",
+        projectHash: "test-hash",
       },
-      filePath: '/path/to/session.json',
+      filePath: "/path/to/session.json",
     };
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Continue',
-      prompt_id: 'prompt-id-resume',
+      input: "Continue",
+      prompt_id: "prompt-id-resume",
       resumedSessionData,
     });
 
-    expect(mockGeminiClient.resumeChat).toHaveBeenCalledWith(
-      expect.any(Array),
-      resumedSessionData,
-    );
-    expect(getWrittenOutput()).toBe('Resumed\n');
+    expect(mockGeminiClient.resumeChat).toHaveBeenCalledWith(expect.any(Array), resumedSessionData);
+    expect(getWrittenOutput()).toBe("Resumed\n");
   });
 
   it.each([
     {
-      name: 'loop detected',
-      events: [
-        { type: GeminiEventType.LoopDetected },
-      ] as ServerGeminiStreamEvent[],
-      input: 'Loop test',
-      promptId: 'prompt-id-loop',
+      name: "loop detected",
+      events: [{ type: GeminiEventType.LoopDetected }] as ServerGeminiStreamEvent[],
+      input: "Loop test",
+      promptId: "prompt-id-loop",
     },
     {
-      name: 'max session turns',
-      events: [
-        { type: GeminiEventType.MaxSessionTurns },
-      ] as ServerGeminiStreamEvent[],
-      input: 'Max turns test',
-      promptId: 'prompt-id-max-turns',
+      name: "max session turns",
+      events: [{ type: GeminiEventType.MaxSessionTurns }] as ServerGeminiStreamEvent[],
+      input: "Max turns test",
+      promptId: "prompt-id-max-turns",
     },
-  ])(
-    'should emit appropriate error event in streaming JSON mode: $name',
-    async ({ events, input, promptId }) => {
-      vi.mocked(mockConfig.getOutputFormat).mockReturnValue(
-        OutputFormat.STREAM_JSON,
-      );
-      vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(
-        MOCK_SESSION_METRICS,
-      );
+  ])("should emit appropriate error event in streaming JSON mode: $name", async ({
+    events,
+    input,
+    promptId,
+  }) => {
+    vi.mocked(mockConfig.getOutputFormat).mockReturnValue(OutputFormat.STREAM_JSON);
+    vi.mocked(uiTelemetryService.getMetrics).mockReturnValue(MOCK_SESSION_METRICS);
+
+    const streamEvents: ServerGeminiStreamEvent[] = [
+      ...events,
+      {
+        type: GeminiEventType.Finished,
+        value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
+      },
+    ];
+    mockGeminiClient.sendMessageStream.mockReturnValue(createStreamFromEvents(streamEvents));
 
-      const streamEvents: ServerGeminiStreamEvent[] = [
-        ...events,
-        {
-          type: GeminiEventType.Finished,
-          value: { reason: undefined, usageMetadata: { totalTokenCount: 0 } },
-        },
-      ];
-      mockGeminiClient.sendMessageStream.mockReturnValue(
-        createStreamFromEvents(streamEvents),
-      );
+    try {
+      await runNonInteractive({
+        config: mockConfig,
+        settings: mockSettings,
+        input,
+        prompt_id: promptId,
+      });
+    } catch (_error) {
+      // Expected exit
+    }
 
-      try {
-        await runNonInteractive({
-          config: mockConfig,
-          settings: mockSettings,
-          input,
-          prompt_id: promptId,
-        });
-      } catch (_error) {
-        // Expected exit
-      }
-
-      const output = getWrittenOutput();
-      const sanitizedOutput = output
-        .replace(/"timestamp":"[^"]+"/g, '"timestamp":"<TIMESTAMP>"')
-        .replace(/"duration_ms":\d+/g, '"duration_ms":<DURATION>');
-      expect(sanitizedOutput).toMatchSnapshot();
-    },
-  );
+    const output = getWrittenOutput();
+    const sanitizedOutput = output
+      .replace(/"timestamp":"[^"]+"/g, '"timestamp":"<TIMESTAMP>"')
+      .replace(/"duration_ms":\d+/g, '"duration_ms":<DURATION>');
+    expect(sanitizedOutput).toMatchSnapshot();
+  });
 
-  it('should log error when tool recording fails', async () => {
+  it("should log error when tool recording fails", async () => {
     const toolCallEvent: ServerGeminiStreamEvent = {
       type: GeminiEventType.ToolCallRequest,
       value: {
-        callId: 'tool-1',
-        name: 'testTool',
+        callId: "tool-1",
+        name: "testTool",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-tool-error',
+        prompt_id: "prompt-id-tool-error",
       },
     };
     mockCoreExecuteToolCall.mockResolvedValue({
-      status: 'success',
+      status: "success",
       request: toolCallEvent.value,
       tool: {} as AnyDeclarativeTool,
       invocation: {} as AnyToolInvocation,
       response: {
         responseParts: [],
-        callId: 'tool-1',
+        callId: "tool-1",
         error: undefined,
         errorType: undefined,
         contentLength: undefined,
@@ -1703,7 +1602,7 @@ describe('runNonInteractive', () => {
 
     const events: ServerGeminiStreamEvent[] = [
       toolCallEvent,
-      { type: GeminiEventType.Content, value: 'Done' },
+      { type: GeminiEventType.Content, value: "Done" },
       {
         type: GeminiEventType.Finished,
         value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } },
@@ -1713,7 +1612,7 @@ describe('runNonInteractive', () => {
       .mockReturnValueOnce(createStreamFromEvents(events))
       .mockReturnValueOnce(
         createStreamFromEvents([
-          { type: GeminiEventType.Content, value: 'Done' },
+          { type: GeminiEventType.Content, value: "Done" },
           {
             type: GeminiEventType.Finished,
             value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } },
@@ -1724,34 +1623,30 @@ describe('runNonInteractive', () => {
     // Mock getChat to throw when recording tool calls
     const mockChat = {
       recordCompletedToolCalls: vi.fn().mockImplementation(() => {
-        throw new Error('Recording failed');
+        throw new Error("Recording failed");
       }),
     };
     // @ts-expect-error - Mocking internal structure
     mockGeminiClient.getChat = vi.fn().mockReturnValue(mockChat);
     // @ts-expect-error - Mocking internal structure
-    mockGeminiClient.getCurrentSequenceModel = vi
-      .fn()
-      .mockReturnValue('model-1');
+    mockGeminiClient.getCurrentSequenceModel = vi.fn().mockReturnValue("model-1");
 
     // Mock debugLogger.error
-    const { debugLogger } = await import('@airiscode/gemini-cli-core');
-    const debugLoggerErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
+    const { debugLogger } = await import("@airiscode/gemini-cli-core");
+    const debugLoggerErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
 
     await runNonInteractive({
       config: mockConfig,
       settings: mockSettings,
-      input: 'Tool recording error test',
-      prompt_id: 'prompt-id-tool-error',
+      input: "Tool recording error test",
+      prompt_id: "prompt-id-tool-error",
     });
 
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
       expect.stringContaining(
-        'Error recording completed tool call information: Error: Recording failed',
+        "Error recording completed tool call information: Error: Recording failed",
       ),
     );
-    expect(getWrittenOutput()).toContain('Done');
+    expect(getWrittenOutput()).toContain("Done");
   });
 });
diff --git a/packages/ui-gemini/src/nonInteractiveCli.ts b/packages/ui-gemini/src/nonInteractiveCli.ts
index 456007560..2782e4242 100644
--- a/packages/ui-gemini/src/nonInteractiveCli.ts
+++ b/packages/ui-gemini/src/nonInteractiveCli.ts
@@ -4,45 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import readline from "node:readline";
 import type {
+  CompletedToolCall,
   Config,
-  ToolCallRequestInfo,
   ResumedSessionData,
-  CompletedToolCall,
+  ToolCallRequestInfo,
   UserFeedbackPayload,
-} from '@airiscode/gemini-cli-core';
-import { isSlashCommand } from './ui/utils/commandUtils.js';
-import type { LoadedSettings } from './config/settings.js';
+} from "@airiscode/gemini-cli-core";
 import {
+  CoreEvent,
+  coreEvents,
+  createWorkingStdio,
+  debugLogger,
   executeToolCall,
-  GeminiEventType,
   FatalInputError,
-  promptIdContext,
-  OutputFormat,
+  GeminiEventType,
   JsonFormatter,
-  StreamJsonFormatter,
   JsonStreamEventType,
+  OutputFormat,
+  promptIdContext,
+  StreamJsonFormatter,
   uiTelemetryService,
-  debugLogger,
-  coreEvents,
-  CoreEvent,
-  createWorkingStdio,
-} from '@airiscode/gemini-cli-core';
-
-import type { Content, Part } from '@google/genai';
-import readline from 'node:readline';
-
-import { convertSessionToHistoryFormats } from './ui/hooks/useSessionBrowser.js';
-import { handleSlashCommand } from './nonInteractiveCliCommands.js';
-import { ConsolePatcher } from './ui/utils/ConsolePatcher.js';
-import { handleAtCommand } from './ui/hooks/atCommandProcessor.js';
+} from "@airiscode/gemini-cli-core";
+import type { Content, Part } from "@google/genai";
+import type { LoadedSettings } from "./config/settings.js";
+import { handleSlashCommand } from "./nonInteractiveCliCommands.js";
+import { handleAtCommand } from "./ui/hooks/atCommandProcessor.js";
+import { convertSessionToHistoryFormats } from "./ui/hooks/useSessionBrowser.js";
+import { ConsolePatcher } from "./ui/utils/ConsolePatcher.js";
+import { isSlashCommand } from "./ui/utils/commandUtils.js";
+import { TextOutput } from "./ui/utils/textOutput.js";
 import {
-  handleError,
-  handleToolError,
   handleCancellationError,
+  handleError,
   handleMaxTurnsExceededError,
-} from './utils/errors.js';
-import { TextOutput } from './ui/utils/textOutput.js';
+  handleToolError,
+} from "./utils/errors.js";
 
 interface RunNonInteractiveParams {
   config: Config;
@@ -86,9 +84,7 @@ export async function runNonInteractive({
 
     const startTime = Date.now();
     const streamFormatter =
-      config.getOutputFormat() === OutputFormat.STREAM_JSON
-        ? new StreamJsonFormatter()
-        : null;
+      config.getOutputFormat() === OutputFormat.STREAM_JSON ? new StreamJsonFormatter() : null;
 
     const abortController = new AbortController();
 
@@ -121,12 +117,9 @@ export async function runNonInteractive({
       readline.emitKeypressEvents(process.stdin, rl);
 
       // Listen for Ctrl+C
-      const keypressHandler = (
-        str: string,
-        key: { name?: string; ctrl?: boolean },
-      ) => {
+      const keypressHandler = (str: string, key: { name?: string; ctrl?: boolean }) => {
         // Detect Ctrl+C: either ctrl+c key combo or raw character code 3
-        if ((key && key.ctrl && key.name === 'c') || str === '\u0003') {
+        if ((key && key.ctrl && key.name === "c") || str === "\u0003") {
           // Only handle once
           if (isAborting) {
             return;
@@ -137,7 +130,7 @@ export async function runNonInteractive({
           // Only show message if cancellation takes longer than 200ms
           // This reduces verbosity for fast cancellations
           cancelMessageTimer = setTimeout(() => {
-            process.stderr.write('\nCancelling...\n');
+            process.stderr.write("\nCancelling...\n");
           }, 200);
 
           abortController.abort();
@@ -146,7 +139,7 @@ export async function runNonInteractive({
         }
       };
 
-      process.stdin.on('keypress', keypressHandler);
+      process.stdin.on("keypress", keypressHandler);
     };
 
     const cleanupStdinCancellation = () => {
@@ -163,7 +156,7 @@ export async function runNonInteractive({
       }
 
       // Remove keypress listener
-      process.stdin.removeAllListeners('keypress');
+      process.stdin.removeAllListeners("keypress");
 
       // Restore stdin to original state
       if (process.stdin.isTTY) {
@@ -183,8 +176,8 @@ export async function runNonInteractive({
       coreEvents.drainBacklogs();
 
       // Handle EPIPE errors when the output is piped to a command that closes early.
-      process.stdout.on('error', (err: NodeJS.ErrnoException) => {
-        if (err.code === 'EPIPE') {
+      process.stdout.on("error", (err: NodeJS.ErrnoException) => {
+        if (err.code === "EPIPE") {
           // Exit gracefully if the pipe is closed.
           process.exit(0);
         }
@@ -195,9 +188,7 @@ export async function runNonInteractive({
       // Initialize chat.  Resume if resume data is passed.
       if (resumedSessionData) {
         await geminiClient.resumeChat(
-          convertSessionToHistoryFormats(
-            resumedSessionData.conversation.messages,
-          ).clientHistory,
+          convertSessionToHistoryFormats(resumedSessionData.conversation.messages).clientHistory,
           resumedSessionData,
         );
       }
@@ -242,9 +233,7 @@ export async function runNonInteractive({
         if (!shouldProceed || !processedQuery) {
           // An error occurred during @include processing (e.g., file not found).
           // The error message is already logged by handleAtCommand.
-          throw new FatalInputError(
-            'Exiting due to an error processing the @ command.',
-          );
+          throw new FatalInputError("Exiting due to an error processing the @ command.");
         }
         query = processedQuery as Part[];
       }
@@ -254,22 +243,22 @@ export async function runNonInteractive({
         streamFormatter.emitEvent({
           type: JsonStreamEventType.MESSAGE,
           timestamp: new Date().toISOString(),
-          role: 'user',
+          role: "user",
           content: input,
         });
       }
 
-      let currentMessages: Content[] = [{ role: 'user', parts: query }];
+      let currentMessages: Content[] = [{ role: "user", parts: query }];
 
       let turnCount = 0;
       const deprecateText =
-        'The --prompt (-p) flag has been deprecated and will be removed in a future version. Please use a positional argument for your prompt. See gemini --help for more information.\n';
+        "The --prompt (-p) flag has been deprecated and will be removed in a future version. Please use a positional argument for your prompt. See gemini --help for more information.\n";
       if (hasDeprecatedPromptArg) {
         if (streamFormatter) {
           streamFormatter.emitEvent({
             type: JsonStreamEventType.MESSAGE,
             timestamp: new Date().toISOString(),
-            role: 'assistant',
+            role: "assistant",
             content: deprecateText,
             delta: true,
           });
@@ -279,10 +268,7 @@ export async function runNonInteractive({
       }
       while (true) {
         turnCount++;
-        if (
-          config.getMaxSessionTurns() >= 0 &&
-          turnCount > config.getMaxSessionTurns()
-        ) {
+        if (config.getMaxSessionTurns() >= 0 && turnCount > config.getMaxSessionTurns()) {
           handleMaxTurnsExceededError(config);
         }
         const toolCallRequests: ToolCallRequestInfo[] = [];
@@ -293,7 +279,7 @@ export async function runNonInteractive({
           prompt_id,
         );
 
-        let responseText = '';
+        let responseText = "";
         for await (const event of responseStream) {
           if (abortController.signal.aborted) {
             handleCancellationError(config);
@@ -304,7 +290,7 @@ export async function runNonInteractive({
               streamFormatter.emitEvent({
                 type: JsonStreamEventType.MESSAGE,
                 timestamp: new Date().toISOString(),
-                role: 'assistant',
+                role: "assistant",
                 content: event.value,
                 delta: true,
               });
@@ -331,8 +317,8 @@ export async function runNonInteractive({
               streamFormatter.emitEvent({
                 type: JsonStreamEventType.ERROR,
                 timestamp: new Date().toISOString(),
-                severity: 'warning',
-                message: 'Loop detected, stopping execution',
+                severity: "warning",
+                message: "Loop detected, stopping execution",
               });
             }
           } else if (event.type === GeminiEventType.MaxSessionTurns) {
@@ -340,8 +326,8 @@ export async function runNonInteractive({
               streamFormatter.emitEvent({
                 type: JsonStreamEventType.ERROR,
                 timestamp: new Date().toISOString(),
-                severity: 'error',
-                message: 'Maximum session turns exceeded',
+                severity: "error",
+                message: "Maximum session turns exceeded",
               });
             }
           } else if (event.type === GeminiEventType.Error) {
@@ -369,14 +355,14 @@ export async function runNonInteractive({
                 type: JsonStreamEventType.TOOL_RESULT,
                 timestamp: new Date().toISOString(),
                 tool_id: requestInfo.callId,
-                status: toolResponse.error ? 'error' : 'success',
+                status: toolResponse.error ? "error" : "success",
                 output:
-                  typeof toolResponse.resultDisplay === 'string'
+                  typeof toolResponse.resultDisplay === "string"
                     ? toolResponse.resultDisplay
                     : undefined,
                 error: toolResponse.error
                   ? {
-                      type: toolResponse.errorType || 'TOOL_EXECUTION_ERROR',
+                      type: toolResponse.errorType || "TOOL_EXECUTION_ERROR",
                       message: toolResponse.error.message,
                     }
                   : undefined,
@@ -388,8 +374,8 @@ export async function runNonInteractive({
                 requestInfo.name,
                 toolResponse.error,
                 config,
-                toolResponse.errorType || 'TOOL_EXECUTION_ERROR',
-                typeof toolResponse.resultDisplay === 'string'
+                toolResponse.errorType || "TOOL_EXECUTION_ERROR",
+                typeof toolResponse.resultDisplay === "string"
                   ? toolResponse.resultDisplay
                   : undefined,
               );
@@ -402,18 +388,13 @@ export async function runNonInteractive({
 
           // Record tool calls with full metadata before sending responses to Gemini
           try {
-            const currentModel =
-              geminiClient.getCurrentSequenceModel() ?? config.getModel();
-            geminiClient
-              .getChat()
-              .recordCompletedToolCalls(currentModel, completedToolCalls);
+            const currentModel = geminiClient.getCurrentSequenceModel() ?? config.getModel();
+            geminiClient.getChat().recordCompletedToolCalls(currentModel, completedToolCalls);
           } catch (error) {
-            debugLogger.error(
-              `Error recording completed tool call information: ${error}`,
-            );
+            debugLogger.error(`Error recording completed tool call information: ${error}`);
           }
 
-          currentMessages = [{ role: 'user', parts: toolResponseParts }];
+          currentMessages = [{ role: "user", parts: toolResponseParts }];
         } else {
           // Emit final result event for streaming JSON
           if (streamFormatter) {
@@ -422,15 +403,13 @@ export async function runNonInteractive({
             streamFormatter.emitEvent({
               type: JsonStreamEventType.RESULT,
               timestamp: new Date().toISOString(),
-              status: 'success',
+              status: "success",
               stats: streamFormatter.convertToStreamStats(metrics, durationMs),
             });
           } else if (config.getOutputFormat() === OutputFormat.JSON) {
             const formatter = new JsonFormatter();
             const stats = uiTelemetryService.getMetrics();
-            textOutput.write(
-              formatter.format(config.getSessionId(), responseText, stats),
-            );
+            textOutput.write(formatter.format(config.getSessionId(), responseText, stats));
           } else {
             textOutput.ensureTrailingNewline(); // Ensure a final newline
           }
diff --git a/packages/ui-gemini/src/nonInteractiveCliCommands.ts b/packages/ui-gemini/src/nonInteractiveCliCommands.ts
index 2e6a0008c..019f0b23c 100644
--- a/packages/ui-gemini/src/nonInteractiveCliCommands.ts
+++ b/packages/ui-gemini/src/nonInteractiveCliCommands.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { PartListUnion } from '@google/genai';
-import { parseSlashCommand } from './utils/commands.js';
 import {
+  type Config,
   FatalInputError,
   Logger,
   uiTelemetryService,
-  type Config,
-} from '@airiscode/gemini-cli-core';
-import { CommandService } from './services/CommandService.js';
-import { FileCommandLoader } from './services/FileCommandLoader.js';
-import { McpPromptLoader } from './services/McpPromptLoader.js';
-import type { CommandContext } from './ui/commands/types.js';
-import { createNonInteractiveUI } from './ui/noninteractive/nonInteractiveUi.js';
-import type { LoadedSettings } from './config/settings.js';
-import type { SessionStatsState } from './ui/contexts/SessionContext.js';
+} from "@airiscode/gemini-cli-core";
+import type { PartListUnion } from "@google/genai";
+import type { LoadedSettings } from "./config/settings.js";
+import { CommandService } from "./services/CommandService.js";
+import { FileCommandLoader } from "./services/FileCommandLoader.js";
+import { McpPromptLoader } from "./services/McpPromptLoader.js";
+import type { CommandContext } from "./ui/commands/types.js";
+import type { SessionStatsState } from "./ui/contexts/SessionContext.js";
+import { createNonInteractiveUI } from "./ui/noninteractive/nonInteractiveUi.js";
+import { parseSlashCommand } from "./utils/commands.js";
 
 /**
  * Processes a slash command in a non-interactive environment.
@@ -35,7 +35,7 @@ export const handleSlashCommand = async (
   settings: LoadedSettings,
 ): Promise<PartListUnion | undefined> => {
   const trimmed = rawQuery.trim();
-  if (!trimmed.startsWith('/')) {
+  if (!trimmed.startsWith("/")) {
     return;
   }
 
@@ -58,7 +58,7 @@ export const handleSlashCommand = async (
         promptCount: 1,
       };
 
-      const logger = new Logger(config?.getSessionId() || '', config?.storage);
+      const logger = new Logger(config?.getSessionId() || "", config?.storage);
 
       const context: CommandContext = {
         services: {
@@ -83,9 +83,9 @@ export const handleSlashCommand = async (
 
       if (result) {
         switch (result.type) {
-          case 'submit_prompt':
+          case "submit_prompt":
             return result.content;
-          case 'confirm_shell_commands':
+          case "confirm_shell_commands":
             // This result indicates a command attempted to confirm shell commands.
             // However note that currently, ShellTool is excluded in non-interactive
             // mode unless 'YOLO mode' is active, so confirmation actually won't
@@ -93,11 +93,11 @@ export const handleSlashCommand = async (
             // This ensures that if a command *does* request confirmation (e.g.
             // in the future with more granular permissions), it's handled appropriately.
             throw new FatalInputError(
-              'Exiting due to a confirmation prompt requested by the command.',
+              "Exiting due to a confirmation prompt requested by the command.",
             );
           default:
             throw new FatalInputError(
-              'Exiting due to command result that is not supported in non-interactive mode.',
+              "Exiting due to command result that is not supported in non-interactive mode.",
             );
         }
       }
diff --git a/packages/ui-gemini/src/services/BuiltinCommandLoader.test.ts b/packages/ui-gemini/src/services/BuiltinCommandLoader.test.ts
index 2670cb96a..d3e438f9e 100644
--- a/packages/ui-gemini/src/services/BuiltinCommandLoader.test.ts
+++ b/packages/ui-gemini/src/services/BuiltinCommandLoader.test.ts
@@ -4,90 +4,89 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-vi.mock('../ui/commands/profileCommand.js', async () => {
-  const { CommandKind } = await import('../ui/commands/types.js');
+vi.mock("../ui/commands/profileCommand.js", async () => {
+  const { CommandKind } = await import("../ui/commands/types.js");
   return {
     profileCommand: {
-      name: 'profile',
-      description: 'Profile command',
+      name: "profile",
+      description: "Profile command",
       kind: CommandKind.BUILT_IN,
     },
   };
 });
 
-vi.mock('../ui/commands/aboutCommand.js', async () => {
-  const { CommandKind } = await import('../ui/commands/types.js');
+vi.mock("../ui/commands/aboutCommand.js", async () => {
+  const { CommandKind } = await import("../ui/commands/types.js");
   return {
     aboutCommand: {
-      name: 'about',
-      description: 'About the CLI',
+      name: "about",
+      description: "About the CLI",
       kind: CommandKind.BUILT_IN,
     },
   };
 });
 
-vi.mock('../ui/commands/ideCommand.js', async () => {
-  const { CommandKind } = await import('../ui/commands/types.js');
+vi.mock("../ui/commands/ideCommand.js", async () => {
+  const { CommandKind } = await import("../ui/commands/types.js");
   return {
     ideCommand: vi.fn().mockResolvedValue({
-      name: 'ide',
-      description: 'IDE command',
+      name: "ide",
+      description: "IDE command",
       kind: CommandKind.BUILT_IN,
     }),
   };
 });
-vi.mock('../ui/commands/restoreCommand.js', () => ({
+vi.mock("../ui/commands/restoreCommand.js", () => ({
   restoreCommand: vi.fn(),
 }));
-vi.mock('../ui/commands/permissionsCommand.js', async () => {
-  const { CommandKind } = await import('../ui/commands/types.js');
+vi.mock("../ui/commands/permissionsCommand.js", async () => {
+  const { CommandKind } = await import("../ui/commands/types.js");
   return {
     permissionsCommand: {
-      name: 'permissions',
-      description: 'Permissions command',
+      name: "permissions",
+      description: "Permissions command",
       kind: CommandKind.BUILT_IN,
     },
   };
 });
 
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { BuiltinCommandLoader } from './BuiltinCommandLoader.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { CommandKind } from '../ui/commands/types.js';
-
-import { restoreCommand } from '../ui/commands/restoreCommand.js';
-
-vi.mock('../ui/commands/authCommand.js', () => ({ authCommand: {} }));
-vi.mock('../ui/commands/bugCommand.js', () => ({ bugCommand: {} }));
-vi.mock('../ui/commands/chatCommand.js', () => ({ chatCommand: {} }));
-vi.mock('../ui/commands/clearCommand.js', () => ({ clearCommand: {} }));
-vi.mock('../ui/commands/compressCommand.js', () => ({ compressCommand: {} }));
-vi.mock('../ui/commands/corgiCommand.js', () => ({ corgiCommand: {} }));
-vi.mock('../ui/commands/docsCommand.js', () => ({ docsCommand: {} }));
-vi.mock('../ui/commands/editorCommand.js', () => ({ editorCommand: {} }));
-vi.mock('../ui/commands/extensionsCommand.js', () => ({
+import type { Config } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { restoreCommand } from "../ui/commands/restoreCommand.js";
+import { CommandKind } from "../ui/commands/types.js";
+import { BuiltinCommandLoader } from "./BuiltinCommandLoader.js";
+
+vi.mock("../ui/commands/authCommand.js", () => ({ authCommand: {} }));
+vi.mock("../ui/commands/bugCommand.js", () => ({ bugCommand: {} }));
+vi.mock("../ui/commands/chatCommand.js", () => ({ chatCommand: {} }));
+vi.mock("../ui/commands/clearCommand.js", () => ({ clearCommand: {} }));
+vi.mock("../ui/commands/compressCommand.js", () => ({ compressCommand: {} }));
+vi.mock("../ui/commands/corgiCommand.js", () => ({ corgiCommand: {} }));
+vi.mock("../ui/commands/docsCommand.js", () => ({ docsCommand: {} }));
+vi.mock("../ui/commands/editorCommand.js", () => ({ editorCommand: {} }));
+vi.mock("../ui/commands/extensionsCommand.js", () => ({
   extensionsCommand: () => ({}),
 }));
-vi.mock('../ui/commands/helpCommand.js', () => ({ helpCommand: {} }));
-vi.mock('../ui/commands/memoryCommand.js', () => ({ memoryCommand: {} }));
-vi.mock('../ui/commands/modelCommand.js', () => ({
-  modelCommand: { name: 'model' },
+vi.mock("../ui/commands/helpCommand.js", () => ({ helpCommand: {} }));
+vi.mock("../ui/commands/memoryCommand.js", () => ({ memoryCommand: {} }));
+vi.mock("../ui/commands/modelCommand.js", () => ({
+  modelCommand: { name: "model" },
 }));
-vi.mock('../ui/commands/privacyCommand.js', () => ({ privacyCommand: {} }));
-vi.mock('../ui/commands/quitCommand.js', () => ({ quitCommand: {} }));
-vi.mock('../ui/commands/resumeCommand.js', () => ({ resumeCommand: {} }));
-vi.mock('../ui/commands/statsCommand.js', () => ({ statsCommand: {} }));
-vi.mock('../ui/commands/themeCommand.js', () => ({ themeCommand: {} }));
-vi.mock('../ui/commands/toolsCommand.js', () => ({ toolsCommand: {} }));
-vi.mock('../ui/commands/mcpCommand.js', () => ({
+vi.mock("../ui/commands/privacyCommand.js", () => ({ privacyCommand: {} }));
+vi.mock("../ui/commands/quitCommand.js", () => ({ quitCommand: {} }));
+vi.mock("../ui/commands/resumeCommand.js", () => ({ resumeCommand: {} }));
+vi.mock("../ui/commands/statsCommand.js", () => ({ statsCommand: {} }));
+vi.mock("../ui/commands/themeCommand.js", () => ({ themeCommand: {} }));
+vi.mock("../ui/commands/toolsCommand.js", () => ({ toolsCommand: {} }));
+vi.mock("../ui/commands/mcpCommand.js", () => ({
   mcpCommand: {
-    name: 'mcp',
-    description: 'MCP command',
-    kind: 'BUILT_IN',
+    name: "mcp",
+    description: "MCP command",
+    kind: "BUILT_IN",
   },
 }));
 
-describe('BuiltinCommandLoader', () => {
+describe("BuiltinCommandLoader", () => {
   let mockConfig: Config;
 
   const restoreCommandMock = restoreCommand as Mock;
@@ -102,13 +101,13 @@ describe('BuiltinCommandLoader', () => {
     } as unknown as Config;
 
     restoreCommandMock.mockReturnValue({
-      name: 'restore',
-      description: 'Restore command',
+      name: "restore",
+      description: "Restore command",
       kind: CommandKind.BUILT_IN,
     });
   });
 
-  it('should correctly pass the config object to restore command factory', async () => {
+  it("should correctly pass the config object to restore command factory", async () => {
     const loader = new BuiltinCommandLoader(mockConfig);
     await loader.loadCommands(new AbortController().signal);
 
@@ -117,21 +116,21 @@ describe('BuiltinCommandLoader', () => {
     expect(restoreCommandMock).toHaveBeenCalledWith(mockConfig);
   });
 
-  it('should filter out null command definitions returned by factories', async () => {
+  it("should filter out null command definitions returned by factories", async () => {
     // ideCommand is now a constant SlashCommand
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
 
     // The 'ide' command should be present.
-    const ideCmd = commands.find((c) => c.name === 'ide');
+    const ideCmd = commands.find((c) => c.name === "ide");
     expect(ideCmd).toBeDefined();
 
     // Other commands should still be present.
-    const aboutCmd = commands.find((c) => c.name === 'about');
+    const aboutCmd = commands.find((c) => c.name === "about");
     expect(aboutCmd).toBeDefined();
   });
 
-  it('should handle a null config gracefully when calling factories', async () => {
+  it("should handle a null config gracefully when calling factories", async () => {
     const loader = new BuiltinCommandLoader(null);
     await loader.loadCommands(new AbortController().signal);
     // ideCommand is now a constant, no longer needs config
@@ -139,37 +138,37 @@ describe('BuiltinCommandLoader', () => {
     expect(restoreCommandMock).toHaveBeenCalledWith(null);
   });
 
-  it('should return a list of all loaded commands', async () => {
+  it("should return a list of all loaded commands", async () => {
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
 
-    const aboutCmd = commands.find((c) => c.name === 'about');
+    const aboutCmd = commands.find((c) => c.name === "about");
     expect(aboutCmd).toBeDefined();
     expect(aboutCmd?.kind).toBe(CommandKind.BUILT_IN);
 
-    const ideCmd = commands.find((c) => c.name === 'ide');
+    const ideCmd = commands.find((c) => c.name === "ide");
     expect(ideCmd).toBeDefined();
 
-    const mcpCmd = commands.find((c) => c.name === 'mcp');
+    const mcpCmd = commands.find((c) => c.name === "mcp");
     expect(mcpCmd).toBeDefined();
   });
 
-  it('should include permissions command when folder trust is enabled', async () => {
+  it("should include permissions command when folder trust is enabled", async () => {
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
-    const permissionsCmd = commands.find((c) => c.name === 'permissions');
+    const permissionsCmd = commands.find((c) => c.name === "permissions");
     expect(permissionsCmd).toBeDefined();
   });
 
-  it('should exclude permissions command when folder trust is disabled', async () => {
+  it("should exclude permissions command when folder trust is disabled", async () => {
     (mockConfig.getFolderTrust as Mock).mockReturnValue(false);
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
-    const permissionsCmd = commands.find((c) => c.name === 'permissions');
+    const permissionsCmd = commands.find((c) => c.name === "permissions");
     expect(permissionsCmd).toBeUndefined();
   });
 
-  it('should include policies command when message bus integration is enabled', async () => {
+  it("should include policies command when message bus integration is enabled", async () => {
     const mockConfigWithMessageBus = {
       ...mockConfig,
       getEnableMessageBusIntegration: () => true,
@@ -177,11 +176,11 @@ describe('BuiltinCommandLoader', () => {
     } as unknown as Config;
     const loader = new BuiltinCommandLoader(mockConfigWithMessageBus);
     const commands = await loader.loadCommands(new AbortController().signal);
-    const policiesCmd = commands.find((c) => c.name === 'policies');
+    const policiesCmd = commands.find((c) => c.name === "policies");
     expect(policiesCmd).toBeDefined();
   });
 
-  it('should exclude policies command when message bus integration is disabled', async () => {
+  it("should exclude policies command when message bus integration is disabled", async () => {
     const mockConfigWithoutMessageBus = {
       ...mockConfig,
       getEnableMessageBusIntegration: () => false,
@@ -189,12 +188,12 @@ describe('BuiltinCommandLoader', () => {
     } as unknown as Config;
     const loader = new BuiltinCommandLoader(mockConfigWithoutMessageBus);
     const commands = await loader.loadCommands(new AbortController().signal);
-    const policiesCmd = commands.find((c) => c.name === 'policies');
+    const policiesCmd = commands.find((c) => c.name === "policies");
     expect(policiesCmd).toBeUndefined();
   });
 });
 
-describe('BuiltinCommandLoader profile', () => {
+describe("BuiltinCommandLoader profile", () => {
   let mockConfig: Config;
 
   beforeEach(() => {
@@ -208,21 +207,21 @@ describe('BuiltinCommandLoader profile', () => {
     } as unknown as Config;
   });
 
-  it('should not include profile command when isDevelopment is false', async () => {
-    process.env['NODE_ENV'] = 'production';
-    const { BuiltinCommandLoader } = await import('./BuiltinCommandLoader.js');
+  it("should not include profile command when isDevelopment is false", async () => {
+    process.env["NODE_ENV"] = "production";
+    const { BuiltinCommandLoader } = await import("./BuiltinCommandLoader.js");
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
-    const profileCmd = commands.find((c) => c.name === 'profile');
+    const profileCmd = commands.find((c) => c.name === "profile");
     expect(profileCmd).toBeUndefined();
   });
 
-  it('should include profile command when isDevelopment is true', async () => {
-    process.env['NODE_ENV'] = 'development';
-    const { BuiltinCommandLoader } = await import('./BuiltinCommandLoader.js');
+  it("should include profile command when isDevelopment is true", async () => {
+    process.env["NODE_ENV"] = "development";
+    const { BuiltinCommandLoader } = await import("./BuiltinCommandLoader.js");
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
-    const profileCmd = commands.find((c) => c.name === 'profile');
+    const profileCmd = commands.find((c) => c.name === "profile");
     expect(profileCmd).toBeDefined();
   });
 });
diff --git a/packages/ui-gemini/src/services/BuiltinCommandLoader.ts b/packages/ui-gemini/src/services/BuiltinCommandLoader.ts
index ae130d480..840763358 100644
--- a/packages/ui-gemini/src/services/BuiltinCommandLoader.ts
+++ b/packages/ui-gemini/src/services/BuiltinCommandLoader.ts
@@ -4,44 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isDevelopment } from '../utils/installationInfo.js';
-import type { ICommandLoader } from './types.js';
-import type { SlashCommand } from '../ui/commands/types.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { startupProfiler } from '@airiscode/gemini-cli-core';
-import { aboutCommand } from '../ui/commands/aboutCommand.js';
-import { authCommand } from '../ui/commands/authCommand.js';
-import { bugCommand } from '../ui/commands/bugCommand.js';
-import { chatCommand } from '../ui/commands/chatCommand.js';
-import { clearCommand } from '../ui/commands/clearCommand.js';
-import { compressCommand } from '../ui/commands/compressCommand.js';
-import { copyCommand } from '../ui/commands/copyCommand.js';
-import { corgiCommand } from '../ui/commands/corgiCommand.js';
-import { docsCommand } from '../ui/commands/docsCommand.js';
-import { directoryCommand } from '../ui/commands/directoryCommand.js';
-import { editorCommand } from '../ui/commands/editorCommand.js';
-import { extensionsCommand } from '../ui/commands/extensionsCommand.js';
-import { helpCommand } from '../ui/commands/helpCommand.js';
-import { hooksCommand } from '../ui/commands/hooksCommand.js';
-import { ideCommand } from '../ui/commands/ideCommand.js';
-import { initCommand } from '../ui/commands/initCommand.js';
-import { mcpCommand } from '../ui/commands/mcpCommand.js';
-import { memoryCommand } from '../ui/commands/memoryCommand.js';
-import { modelCommand } from '../ui/commands/modelCommand.js';
-import { permissionsCommand } from '../ui/commands/permissionsCommand.js';
-import { privacyCommand } from '../ui/commands/privacyCommand.js';
-import { policiesCommand } from '../ui/commands/policiesCommand.js';
-import { profileCommand } from '../ui/commands/profileCommand.js';
-import { quitCommand } from '../ui/commands/quitCommand.js';
-import { restoreCommand } from '../ui/commands/restoreCommand.js';
-import { resumeCommand } from '../ui/commands/resumeCommand.js';
-import { statsCommand } from '../ui/commands/statsCommand.js';
-import { themeCommand } from '../ui/commands/themeCommand.js';
-import { toolsCommand } from '../ui/commands/toolsCommand.js';
-import { settingsCommand } from '../ui/commands/settingsCommand.js';
-import { vimCommand } from '../ui/commands/vimCommand.js';
-import { setupGithubCommand } from '../ui/commands/setupGithubCommand.js';
-import { terminalSetupCommand } from '../ui/commands/terminalSetupCommand.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { startupProfiler } from "@airiscode/gemini-cli-core";
+import { aboutCommand } from "../ui/commands/aboutCommand.js";
+import { authCommand } from "../ui/commands/authCommand.js";
+import { bugCommand } from "../ui/commands/bugCommand.js";
+import { chatCommand } from "../ui/commands/chatCommand.js";
+import { clearCommand } from "../ui/commands/clearCommand.js";
+import { compressCommand } from "../ui/commands/compressCommand.js";
+import { copyCommand } from "../ui/commands/copyCommand.js";
+import { corgiCommand } from "../ui/commands/corgiCommand.js";
+import { directoryCommand } from "../ui/commands/directoryCommand.js";
+import { docsCommand } from "../ui/commands/docsCommand.js";
+import { editorCommand } from "../ui/commands/editorCommand.js";
+import { extensionsCommand } from "../ui/commands/extensionsCommand.js";
+import { helpCommand } from "../ui/commands/helpCommand.js";
+import { hooksCommand } from "../ui/commands/hooksCommand.js";
+import { ideCommand } from "../ui/commands/ideCommand.js";
+import { initCommand } from "../ui/commands/initCommand.js";
+import { mcpCommand } from "../ui/commands/mcpCommand.js";
+import { memoryCommand } from "../ui/commands/memoryCommand.js";
+import { modelCommand } from "../ui/commands/modelCommand.js";
+import { permissionsCommand } from "../ui/commands/permissionsCommand.js";
+import { policiesCommand } from "../ui/commands/policiesCommand.js";
+import { privacyCommand } from "../ui/commands/privacyCommand.js";
+import { profileCommand } from "../ui/commands/profileCommand.js";
+import { quitCommand } from "../ui/commands/quitCommand.js";
+import { restoreCommand } from "../ui/commands/restoreCommand.js";
+import { resumeCommand } from "../ui/commands/resumeCommand.js";
+import { settingsCommand } from "../ui/commands/settingsCommand.js";
+import { setupGithubCommand } from "../ui/commands/setupGithubCommand.js";
+import { statsCommand } from "../ui/commands/statsCommand.js";
+import { terminalSetupCommand } from "../ui/commands/terminalSetupCommand.js";
+import { themeCommand } from "../ui/commands/themeCommand.js";
+import { toolsCommand } from "../ui/commands/toolsCommand.js";
+import type { SlashCommand } from "../ui/commands/types.js";
+import { vimCommand } from "../ui/commands/vimCommand.js";
+import { isDevelopment } from "../utils/installationInfo.js";
+import type { ICommandLoader } from "./types.js";
 
 /**
  * Loads the core, hard-coded slash commands that are an integral part
@@ -58,7 +58,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
    * @returns A promise that resolves to an array of `SlashCommand` objects.
    */
   async loadCommands(_signal: AbortSignal): Promise<SlashCommand[]> {
-    const handle = startupProfiler.start('load_builtin_commands');
+    const handle = startupProfiler.start("load_builtin_commands");
     const allDefinitions: Array<SlashCommand | null> = [
       aboutCommand,
       authCommand,
@@ -81,9 +81,7 @@ export class BuiltinCommandLoader implements ICommandLoader {
       modelCommand,
       ...(this.config?.getFolderTrust() ? [permissionsCommand] : []),
       privacyCommand,
-      ...(this.config?.getEnableMessageBusIntegration()
-        ? [policiesCommand]
-        : []),
+      ...(this.config?.getEnableMessageBusIntegration() ? [policiesCommand] : []),
       ...(isDevelopment ? [profileCommand] : []),
       quitCommand,
       restoreCommand(this.config),
diff --git a/packages/ui-gemini/src/services/CommandService.test.ts b/packages/ui-gemini/src/services/CommandService.test.ts
index 56008610a..2fc74f723 100644
--- a/packages/ui-gemini/src/services/CommandService.test.ts
+++ b/packages/ui-gemini/src/services/CommandService.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { CommandService } from './CommandService.js';
-import { type ICommandLoader } from './types.js';
-import { CommandKind, type SlashCommand } from '../ui/commands/types.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { CommandKind, type SlashCommand } from "../ui/commands/types.js";
+import { CommandService } from "./CommandService.js";
+import { type ICommandLoader } from "./types.js";
 
 const createMockCommand = (name: string, kind: CommandKind): SlashCommand => ({
   name,
@@ -17,10 +17,10 @@ const createMockCommand = (name: string, kind: CommandKind): SlashCommand => ({
   action: vi.fn(),
 });
 
-const mockCommandA = createMockCommand('command-a', CommandKind.BUILT_IN);
-const mockCommandB = createMockCommand('command-b', CommandKind.BUILT_IN);
-const mockCommandC = createMockCommand('command-c', CommandKind.FILE);
-const mockCommandB_Override = createMockCommand('command-b', CommandKind.FILE);
+const mockCommandA = createMockCommand("command-a", CommandKind.BUILT_IN);
+const mockCommandB = createMockCommand("command-b", CommandKind.BUILT_IN);
+const mockCommandC = createMockCommand("command-c", CommandKind.FILE);
+const mockCommandB_Override = createMockCommand("command-b", CommandKind.FILE);
 
 class MockCommandLoader implements ICommandLoader {
   private commandsToLoad: SlashCommand[];
@@ -29,86 +29,64 @@ class MockCommandLoader implements ICommandLoader {
     this.commandsToLoad = commandsToLoad;
   }
 
-  loadCommands = vi.fn(
-    async (): Promise<SlashCommand[]> => Promise.resolve(this.commandsToLoad),
-  );
+  loadCommands = vi.fn(async (): Promise<SlashCommand[]> => Promise.resolve(this.commandsToLoad));
 }
 
-describe('CommandService', () => {
+describe("CommandService", () => {
   beforeEach(() => {
-    vi.spyOn(debugLogger, 'debug').mockImplementation(() => {});
+    vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should load commands from a single loader', async () => {
+  it("should load commands from a single loader", async () => {
     const mockLoader = new MockCommandLoader([mockCommandA, mockCommandB]);
-    const service = await CommandService.create(
-      [mockLoader],
-      new AbortController().signal,
-    );
+    const service = await CommandService.create([mockLoader], new AbortController().signal);
 
     const commands = service.getCommands();
 
     expect(mockLoader.loadCommands).toHaveBeenCalledTimes(1);
     expect(commands).toHaveLength(2);
-    expect(commands).toEqual(
-      expect.arrayContaining([mockCommandA, mockCommandB]),
-    );
+    expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandB]));
   });
 
-  it('should aggregate commands from multiple loaders', async () => {
+  it("should aggregate commands from multiple loaders", async () => {
     const loader1 = new MockCommandLoader([mockCommandA]);
     const loader2 = new MockCommandLoader([mockCommandC]);
-    const service = await CommandService.create(
-      [loader1, loader2],
-      new AbortController().signal,
-    );
+    const service = await CommandService.create([loader1, loader2], new AbortController().signal);
 
     const commands = service.getCommands();
 
     expect(loader1.loadCommands).toHaveBeenCalledTimes(1);
     expect(loader2.loadCommands).toHaveBeenCalledTimes(1);
     expect(commands).toHaveLength(2);
-    expect(commands).toEqual(
-      expect.arrayContaining([mockCommandA, mockCommandC]),
-    );
+    expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandC]));
   });
 
-  it('should override commands from earlier loaders with those from later loaders', async () => {
+  it("should override commands from earlier loaders with those from later loaders", async () => {
     const loader1 = new MockCommandLoader([mockCommandA, mockCommandB]);
-    const loader2 = new MockCommandLoader([
-      mockCommandB_Override,
-      mockCommandC,
-    ]);
-    const service = await CommandService.create(
-      [loader1, loader2],
-      new AbortController().signal,
-    );
+    const loader2 = new MockCommandLoader([mockCommandB_Override, mockCommandC]);
+    const service = await CommandService.create([loader1, loader2], new AbortController().signal);
 
     const commands = service.getCommands();
 
     expect(commands).toHaveLength(3); // Should be A, C, and the overridden B.
 
     // The final list should contain the override from the *last* loader.
-    const commandB = commands.find((cmd) => cmd.name === 'command-b');
+    const commandB = commands.find((cmd) => cmd.name === "command-b");
     expect(commandB).toBeDefined();
     expect(commandB?.kind).toBe(CommandKind.FILE); // Verify it's the overridden version.
     expect(commandB).toEqual(mockCommandB_Override);
 
     // Ensure the other commands are still present.
     expect(commands).toEqual(
-      expect.arrayContaining([
-        mockCommandA,
-        mockCommandC,
-        mockCommandB_Override,
-      ]),
+      expect.arrayContaining([mockCommandA, mockCommandC, mockCommandB_Override]),
     );
   });
 
-  it('should handle loaders that return an empty array of commands gracefully', async () => {
+  it("should handle loaders that return an empty array of commands gracefully", async () => {
     const loader1 = new MockCommandLoader([mockCommandA]);
     const emptyLoader = new MockCommandLoader([]);
     const loader3 = new MockCommandLoader([mockCommandB]);
@@ -121,16 +99,14 @@ describe('CommandService', () => {
 
     expect(emptyLoader.loadCommands).toHaveBeenCalledTimes(1);
     expect(commands).toHaveLength(2);
-    expect(commands).toEqual(
-      expect.arrayContaining([mockCommandA, mockCommandB]),
-    );
+    expect(commands).toEqual(expect.arrayContaining([mockCommandA, mockCommandB]));
   });
 
-  it('should load commands from successful loaders even if one fails', async () => {
+  it("should load commands from successful loaders even if one fails", async () => {
     const successfulLoader = new MockCommandLoader([mockCommandA]);
     const failingLoader = new MockCommandLoader([]);
-    const error = new Error('Loader failed');
-    vi.spyOn(failingLoader, 'loadCommands').mockRejectedValue(error);
+    const error = new Error("Loader failed");
+    vi.spyOn(failingLoader, "loadCommands").mockRejectedValue(error);
 
     const service = await CommandService.create(
       [successfulLoader, failingLoader],
@@ -140,13 +116,10 @@ describe('CommandService', () => {
     const commands = service.getCommands();
     expect(commands).toHaveLength(1);
     expect(commands).toEqual([mockCommandA]);
-    expect(debugLogger.debug).toHaveBeenCalledWith(
-      'A command loader failed:',
-      error,
-    );
+    expect(debugLogger.debug).toHaveBeenCalledWith("A command loader failed:", error);
   });
 
-  it('getCommands should return a readonly array that cannot be mutated', async () => {
+  it("getCommands should return a readonly array that cannot be mutated", async () => {
     const service = await CommandService.create(
       [new MockCommandLoader([mockCommandA])],
       new AbortController().signal,
@@ -164,7 +137,7 @@ describe('CommandService', () => {
     expect(service.getCommands()).toHaveLength(1);
   });
 
-  it('should pass the abort signal to all loaders', async () => {
+  it("should pass the abort signal to all loaders", async () => {
     const controller = new AbortController();
     const signal = controller.signal;
 
@@ -179,26 +152,22 @@ describe('CommandService', () => {
     expect(loader2.loadCommands).toHaveBeenCalledWith(signal);
   });
 
-  it('should rename extension commands when they conflict', async () => {
-    const builtinCommand = createMockCommand('deploy', CommandKind.BUILT_IN);
-    const userCommand = createMockCommand('sync', CommandKind.FILE);
+  it("should rename extension commands when they conflict", async () => {
+    const builtinCommand = createMockCommand("deploy", CommandKind.BUILT_IN);
+    const userCommand = createMockCommand("sync", CommandKind.FILE);
     const extensionCommand1 = {
-      ...createMockCommand('deploy', CommandKind.FILE),
-      extensionName: 'firebase',
-      description: '[firebase] Deploy to Firebase',
+      ...createMockCommand("deploy", CommandKind.FILE),
+      extensionName: "firebase",
+      description: "[firebase] Deploy to Firebase",
     };
     const extensionCommand2 = {
-      ...createMockCommand('sync', CommandKind.FILE),
-      extensionName: 'git-helper',
-      description: '[git-helper] Sync with remote',
+      ...createMockCommand("sync", CommandKind.FILE),
+      extensionName: "git-helper",
+      description: "[git-helper] Sync with remote",
     };
 
     const mockLoader1 = new MockCommandLoader([builtinCommand]);
-    const mockLoader2 = new MockCommandLoader([
-      userCommand,
-      extensionCommand1,
-      extensionCommand2,
-    ]);
+    const mockLoader2 = new MockCommandLoader([userCommand, extensionCommand1, extensionCommand2]);
 
     const service = await CommandService.create(
       [mockLoader1, mockLoader2],
@@ -209,46 +178,34 @@ describe('CommandService', () => {
     expect(commands).toHaveLength(4);
 
     // Built-in command keeps original name
-    const deployBuiltin = commands.find(
-      (cmd) => cmd.name === 'deploy' && !cmd.extensionName,
-    );
+    const deployBuiltin = commands.find((cmd) => cmd.name === "deploy" && !cmd.extensionName);
     expect(deployBuiltin).toBeDefined();
     expect(deployBuiltin?.kind).toBe(CommandKind.BUILT_IN);
 
     // Extension command conflicting with built-in gets renamed
-    const deployExtension = commands.find(
-      (cmd) => cmd.name === 'firebase.deploy',
-    );
+    const deployExtension = commands.find((cmd) => cmd.name === "firebase.deploy");
     expect(deployExtension).toBeDefined();
-    expect(deployExtension?.extensionName).toBe('firebase');
+    expect(deployExtension?.extensionName).toBe("firebase");
 
     // User command keeps original name
-    const syncUser = commands.find(
-      (cmd) => cmd.name === 'sync' && !cmd.extensionName,
-    );
+    const syncUser = commands.find((cmd) => cmd.name === "sync" && !cmd.extensionName);
     expect(syncUser).toBeDefined();
     expect(syncUser?.kind).toBe(CommandKind.FILE);
 
     // Extension command conflicting with user command gets renamed
-    const syncExtension = commands.find(
-      (cmd) => cmd.name === 'git-helper.sync',
-    );
+    const syncExtension = commands.find((cmd) => cmd.name === "git-helper.sync");
     expect(syncExtension).toBeDefined();
-    expect(syncExtension?.extensionName).toBe('git-helper');
+    expect(syncExtension?.extensionName).toBe("git-helper");
   });
 
-  it('should handle user/project command override correctly', async () => {
-    const builtinCommand = createMockCommand('help', CommandKind.BUILT_IN);
-    const userCommand = createMockCommand('help', CommandKind.FILE);
-    const projectCommand = createMockCommand('deploy', CommandKind.FILE);
-    const userDeployCommand = createMockCommand('deploy', CommandKind.FILE);
+  it("should handle user/project command override correctly", async () => {
+    const builtinCommand = createMockCommand("help", CommandKind.BUILT_IN);
+    const userCommand = createMockCommand("help", CommandKind.FILE);
+    const projectCommand = createMockCommand("deploy", CommandKind.FILE);
+    const userDeployCommand = createMockCommand("deploy", CommandKind.FILE);
 
     const mockLoader1 = new MockCommandLoader([builtinCommand]);
-    const mockLoader2 = new MockCommandLoader([
-      userCommand,
-      userDeployCommand,
-      projectCommand,
-    ]);
+    const mockLoader2 = new MockCommandLoader([userCommand, userDeployCommand, projectCommand]);
 
     const service = await CommandService.create(
       [mockLoader1, mockLoader2],
@@ -259,73 +216,62 @@ describe('CommandService', () => {
     expect(commands).toHaveLength(2);
 
     // User command overrides built-in
-    const helpCommand = commands.find((cmd) => cmd.name === 'help');
+    const helpCommand = commands.find((cmd) => cmd.name === "help");
     expect(helpCommand).toBeDefined();
     expect(helpCommand?.kind).toBe(CommandKind.FILE);
 
     // Project command overrides user command (last wins)
-    const deployCommand = commands.find((cmd) => cmd.name === 'deploy');
+    const deployCommand = commands.find((cmd) => cmd.name === "deploy");
     expect(deployCommand).toBeDefined();
     expect(deployCommand?.kind).toBe(CommandKind.FILE);
   });
 
-  it('should handle secondary conflicts when renaming extension commands', async () => {
+  it("should handle secondary conflicts when renaming extension commands", async () => {
     // User has both /deploy and /gcp.deploy commands
-    const userCommand1 = createMockCommand('deploy', CommandKind.FILE);
-    const userCommand2 = createMockCommand('gcp.deploy', CommandKind.FILE);
+    const userCommand1 = createMockCommand("deploy", CommandKind.FILE);
+    const userCommand2 = createMockCommand("gcp.deploy", CommandKind.FILE);
 
     // Extension also has a deploy command that will conflict with user's /deploy
     const extensionCommand = {
-      ...createMockCommand('deploy', CommandKind.FILE),
-      extensionName: 'gcp',
-      description: '[gcp] Deploy to Google Cloud',
+      ...createMockCommand("deploy", CommandKind.FILE),
+      extensionName: "gcp",
+      description: "[gcp] Deploy to Google Cloud",
     };
 
-    const mockLoader = new MockCommandLoader([
-      userCommand1,
-      userCommand2,
-      extensionCommand,
-    ]);
+    const mockLoader = new MockCommandLoader([userCommand1, userCommand2, extensionCommand]);
 
-    const service = await CommandService.create(
-      [mockLoader],
-      new AbortController().signal,
-    );
+    const service = await CommandService.create([mockLoader], new AbortController().signal);
 
     const commands = service.getCommands();
     expect(commands).toHaveLength(3);
 
     // Original user command keeps its name
-    const deployUser = commands.find(
-      (cmd) => cmd.name === 'deploy' && !cmd.extensionName,
-    );
+    const deployUser = commands.find((cmd) => cmd.name === "deploy" && !cmd.extensionName);
     expect(deployUser).toBeDefined();
 
     // User's dot notation command keeps its name
-    const gcpDeployUser = commands.find(
-      (cmd) => cmd.name === 'gcp.deploy' && !cmd.extensionName,
-    );
+    const gcpDeployUser = commands.find((cmd) => cmd.name === "gcp.deploy" && !cmd.extensionName);
     expect(gcpDeployUser).toBeDefined();
 
     // Extension command gets renamed with suffix due to secondary conflict
     const deployExtension = commands.find(
-      (cmd) => cmd.name === 'gcp.deploy1' && cmd.extensionName === 'gcp',
+      (cmd) => cmd.name === "gcp.deploy1" && cmd.extensionName === "gcp",
     );
     expect(deployExtension).toBeDefined();
-    expect(deployExtension?.description).toBe('[gcp] Deploy to Google Cloud');
+    expect(deployExtension?.description).toBe("[gcp] Deploy to Google Cloud");
   });
 
-  it('should handle multiple secondary conflicts with incrementing suffixes', async () => {
+  it("should handle multiple secondary conflicts with incrementing suffixes", async () => {
     // User has /deploy, /gcp.deploy, and /gcp.deploy1
-    const userCommand1 = createMockCommand('deploy', CommandKind.FILE);
-    const userCommand2 = createMockCommand('gcp.deploy', CommandKind.FILE);
-    const userCommand3 = createMockCommand('gcp.deploy1', CommandKind.FILE);
+    const userCommand1 = createMockCommand("deploy", CommandKind.FILE);
+    const userCommand2 = createMockCommand("gcp.deploy", CommandKind.FILE);
+    const userCommand3 = createMockCommand("gcp.deploy1", CommandKind.FILE);
 
     // Extension has a deploy command
     const extensionCommand = {
-      ...createMockCommand('deploy', CommandKind.FILE),
-      extensionName: 'gcp',
-      description: '[gcp] Deploy to Google Cloud',
+      ...createMockCommand("deploy", CommandKind.FILE),
+      extensionName: "gcp",
+      description: "[gcp] Deploy to Google Cloud",
     };
 
     const mockLoader = new MockCommandLoader([
@@ -335,19 +281,16 @@ describe('CommandService', () => {
       extensionCommand,
     ]);
 
-    const service = await CommandService.create(
-      [mockLoader],
-      new AbortController().signal,
-    );
+    const service = await CommandService.create([mockLoader], new AbortController().signal);
 
     const commands = service.getCommands();
     expect(commands).toHaveLength(4);
 
     // Extension command gets renamed with suffix 2 due to multiple conflicts
     const deployExtension = commands.find(
-      (cmd) => cmd.name === 'gcp.deploy2' && cmd.extensionName === 'gcp',
+      (cmd) => cmd.name === "gcp.deploy2" && cmd.extensionName === "gcp",
     );
     expect(deployExtension).toBeDefined();
-    expect(deployExtension?.description).toBe('[gcp] Deploy to Google Cloud');
+    expect(deployExtension?.description).toBe("[gcp] Deploy to Google Cloud");
   });
 });
diff --git a/packages/ui-gemini/src/services/CommandService.ts b/packages/ui-gemini/src/services/CommandService.ts
index 40ed81d18..3e397cd84 100644
--- a/packages/ui-gemini/src/services/CommandService.ts
+++ b/packages/ui-gemini/src/services/CommandService.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import type { SlashCommand } from '../ui/commands/types.js';
-import type { ICommandLoader } from './types.js';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import type { SlashCommand } from "../ui/commands/types.js";
+import type { ICommandLoader } from "./types.js";
 
 /**
  * Orchestrates the discovery and loading of all slash commands for the CLI.
@@ -45,20 +45,15 @@ export class CommandService {
    * @param signal An AbortSignal to cancel the loading process.
    * @returns A promise that resolves to a new, fully initialized `CommandService` instance.
    */
-  static async create(
-    loaders: ICommandLoader[],
-    signal: AbortSignal,
-  ): Promise<CommandService> {
-    const results = await Promise.allSettled(
-      loaders.map((loader) => loader.loadCommands(signal)),
-    );
+  static async create(loaders: ICommandLoader[], signal: AbortSignal): Promise<CommandService> {
+    const results = await Promise.allSettled(loaders.map((loader) => loader.loadCommands(signal)));
 
     const allCommands: SlashCommand[] = [];
     for (const result of results) {
-      if (result.status === 'fulfilled') {
+      if (result.status === "fulfilled") {
         allCommands.push(...result.value);
       } else {
-        debugLogger.debug('A command loader failed:', result.reason);
+        debugLogger.debug("A command loader failed:", result.reason);
       }
     }
 
diff --git a/packages/ui-gemini/src/services/FileCommandLoader.test.ts b/packages/ui-gemini/src/services/FileCommandLoader.test.ts
index f7d48a14c..b521ac50e 100644
--- a/packages/ui-gemini/src/services/FileCommandLoader.test.ts
+++ b/packages/ui-gemini/src/services/FileCommandLoader.test.ts
@@ -4,35 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as glob from 'glob';
-import * as path from 'node:path';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { GEMINI_DIR, Storage } from '@airiscode/gemini-cli-core';
-import mock from 'mock-fs';
-import { FileCommandLoader } from './FileCommandLoader.js';
-import { assert, vi } from 'vitest';
-import { createMockCommandContext } from '../test-utils/mockCommandContext.js';
+import * as path from "node:path";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { GEMINI_DIR, Storage } from "@airiscode/gemini-cli-core";
+import * as glob from "glob";
+import mock from "mock-fs";
+import { assert, vi } from "vitest";
+import { createMockCommandContext } from "../test-utils/mockCommandContext.js";
+import type { CommandContext } from "../ui/commands/types.js";
+import { FileCommandLoader } from "./FileCommandLoader.js";
+import { DefaultArgumentProcessor } from "./prompt-processors/argumentProcessor.js";
+import { AtFileProcessor } from "./prompt-processors/atFileProcessor.js";
+import { ConfirmationRequiredError, ShellProcessor } from "./prompt-processors/shellProcessor.js";
 import {
+  type PromptPipelineContent,
   SHELL_INJECTION_TRIGGER,
   SHORTHAND_ARGS_PLACEHOLDER,
-  type PromptPipelineContent,
-} from './prompt-processors/types.js';
-import {
-  ConfirmationRequiredError,
-  ShellProcessor,
-} from './prompt-processors/shellProcessor.js';
-import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
-import type { CommandContext } from '../ui/commands/types.js';
-import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
+} from "./prompt-processors/types.js";
 
 const mockShellProcess = vi.hoisted(() => vi.fn());
 const mockAtFileProcess = vi.hoisted(() => vi.fn());
-vi.mock('./prompt-processors/atFileProcessor.js', () => ({
+vi.mock("./prompt-processors/atFileProcessor.js", () => ({
   AtFileProcessor: vi.fn().mockImplementation(() => ({
     process: mockAtFileProcess,
   })),
 }));
-vi.mock('./prompt-processors/shellProcessor.js', () => ({
+vi.mock("./prompt-processors/shellProcessor.js", () => ({
   ShellProcessor: vi.fn().mockImplementation(() => ({
     process: mockShellProcess,
   })),
@@ -42,25 +39,22 @@ vi.mock('./prompt-processors/shellProcessor.js', () => ({
       public commandsToConfirm: string[],
     ) {
       super(message);
-      this.name = 'ConfirmationRequiredError';
+      this.name = "ConfirmationRequiredError";
     }
   },
 }));
 
-vi.mock('./prompt-processors/argumentProcessor.js', async (importOriginal) => {
+vi.mock("./prompt-processors/argumentProcessor.js", async (importOriginal) => {
   const original =
-    await importOriginal<
-      typeof import('./prompt-processors/argumentProcessor.js')
-    >();
+    await importOriginal<typeof import("./prompt-processors/argumentProcessor.js")>();
   return {
     DefaultArgumentProcessor: vi
       .fn()
       .mockImplementation(() => new original.DefaultArgumentProcessor()),
   };
 });
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...original,
     Storage: original.Storage,
@@ -71,37 +65,31 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('glob', () => ({
+vi.mock("glob", () => ({
   glob: vi.fn(),
 }));
 
-describe('FileCommandLoader', () => {
+describe("FileCommandLoader", () => {
   const signal: AbortSignal = new AbortController().signal;
 
   beforeEach(async () => {
     vi.clearAllMocks();
-    const { glob: actualGlob } =
-      await vi.importActual<typeof import('glob')>('glob');
+    const { glob: actualGlob } = await vi.importActual<typeof import("glob")>("glob");
     vi.mocked(glob.glob).mockImplementation(actualGlob);
     mockShellProcess.mockImplementation(
       (prompt: PromptPipelineContent, context: CommandContext) => {
-        const userArgsRaw = context?.invocation?.args || '';
+        const userArgsRaw = context?.invocation?.args || "";
         // This is a simplified mock. A real implementation would need to iterate
         // through all parts and process only the text parts.
-        const firstTextPart = prompt.find(
-          (p) => typeof p === 'string' || 'text' in p,
-        );
-        let textContent = '';
-        if (typeof firstTextPart === 'string') {
+        const firstTextPart = prompt.find((p) => typeof p === "string" || "text" in p);
+        let textContent = "";
+        if (typeof firstTextPart === "string") {
           textContent = firstTextPart;
-        } else if (firstTextPart && 'text' in firstTextPart) {
-          textContent = firstTextPart.text ?? '';
+        } else if (firstTextPart && "text" in firstTextPart) {
+          textContent = firstTextPart.text ?? "";
         }
 
-        const processedText = textContent.replaceAll(
-          SHORTHAND_ARGS_PLACEHOLDER,
-          userArgsRaw,
-        );
+        const processedText = textContent.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
         return Promise.resolve([{ text: processedText }]);
       },
     );
@@ -112,11 +100,11 @@ describe('FileCommandLoader', () => {
     mock.restore();
   });
 
-  it('loads a single command from a file', async () => {
+  it("loads a single command from a file", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'test.toml': 'prompt = "This is a test prompt"',
+        "test.toml": 'prompt = "This is a test prompt"',
       },
     });
 
@@ -126,22 +114,22 @@ describe('FileCommandLoader', () => {
     expect(commands).toHaveLength(1);
     const command = commands[0];
     expect(command).toBeDefined();
-    expect(command.name).toBe('test');
+    expect(command.name).toBe("test");
 
     const result = await command.action?.(
       createMockCommandContext({
         invocation: {
-          raw: '/test',
-          name: 'test',
-          args: '',
+          raw: "/test",
+          name: "test",
+          args: "",
         },
       }),
-      '',
+      "",
     );
-    if (result?.type === 'submit_prompt') {
-      expect(result.content).toEqual([{ text: 'This is a test prompt' }]);
+    if (result?.type === "submit_prompt") {
+      expect(result.content).toEqual([{ text: "This is a test prompt" }]);
     } else {
-      assert.fail('Incorrect action type');
+      assert.fail("Incorrect action type");
     }
   });
 
@@ -151,63 +139,57 @@ describe('FileCommandLoader', () => {
   // validated on Linux and macOS.
   const itif = (condition: boolean) => (condition ? it : it.skip);
 
-  itif(process.platform !== 'win32')(
-    'loads commands from a symlinked directory',
-    async () => {
-      const userCommandsDir = Storage.getUserCommandsDir();
-      const realCommandsDir = '/real/commands';
-      mock({
-        [realCommandsDir]: {
-          'test.toml': 'prompt = "This is a test prompt"',
-        },
-        // Symlink the user commands directory to the real one
-        [userCommandsDir]: mock.symlink({
-          path: realCommandsDir,
-        }),
-      });
+  itif(process.platform !== "win32")("loads commands from a symlinked directory", async () => {
+    const userCommandsDir = Storage.getUserCommandsDir();
+    const realCommandsDir = "/real/commands";
+    mock({
+      [realCommandsDir]: {
+        "test.toml": 'prompt = "This is a test prompt"',
+      },
+      // Symlink the user commands directory to the real one
+      [userCommandsDir]: mock.symlink({
+        path: realCommandsDir,
+      }),
+    });
 
-      const loader = new FileCommandLoader(null as unknown as Config);
-      const commands = await loader.loadCommands(signal);
+    const loader = new FileCommandLoader(null as unknown as Config);
+    const commands = await loader.loadCommands(signal);
 
-      expect(commands).toHaveLength(1);
-      const command = commands[0];
-      expect(command).toBeDefined();
-      expect(command.name).toBe('test');
-    },
-  );
+    expect(commands).toHaveLength(1);
+    const command = commands[0];
+    expect(command).toBeDefined();
+    expect(command.name).toBe("test");
+  });
 
-  itif(process.platform !== 'win32')(
-    'loads commands from a symlinked subdirectory',
-    async () => {
-      const userCommandsDir = Storage.getUserCommandsDir();
-      const realNamespacedDir = '/real/namespaced-commands';
-      mock({
-        [userCommandsDir]: {
-          namespaced: mock.symlink({
-            path: realNamespacedDir,
-          }),
-        },
-        [realNamespacedDir]: {
-          'my-test.toml': 'prompt = "This is a test prompt"',
-        },
-      });
+  itif(process.platform !== "win32")("loads commands from a symlinked subdirectory", async () => {
+    const userCommandsDir = Storage.getUserCommandsDir();
+    const realNamespacedDir = "/real/namespaced-commands";
+    mock({
+      [userCommandsDir]: {
+        namespaced: mock.symlink({
+          path: realNamespacedDir,
+        }),
+      },
+      [realNamespacedDir]: {
+        "my-test.toml": 'prompt = "This is a test prompt"',
+      },
+    });
 
-      const loader = new FileCommandLoader(null as unknown as Config);
-      const commands = await loader.loadCommands(signal);
+    const loader = new FileCommandLoader(null as unknown as Config);
+    const commands = await loader.loadCommands(signal);
 
-      expect(commands).toHaveLength(1);
-      const command = commands[0];
-      expect(command).toBeDefined();
-      expect(command.name).toBe('namespaced:my-test');
-    },
-  );
+    expect(commands).toHaveLength(1);
+    const command = commands[0];
+    expect(command).toBeDefined();
+    expect(command.name).toBe("namespaced:my-test");
+  });
 
-  it('loads multiple commands', async () => {
+  it("loads multiple commands", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'test1.toml': 'prompt = "Prompt 1"',
-        'test2.toml': 'prompt = "Prompt 2"',
+        "test1.toml": 'prompt = "Prompt 1"',
+        "test2.toml": 'prompt = "Prompt 2"',
       },
     });
 
@@ -217,20 +199,20 @@ describe('FileCommandLoader', () => {
     expect(commands).toHaveLength(2);
   });
 
-  it('creates deeply nested namespaces correctly', async () => {
+  it("creates deeply nested namespaces correctly", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
 
     mock({
       [userCommandsDir]: {
         gcp: {
           pipelines: {
-            'run.toml': 'prompt = "run pipeline"',
+            "run.toml": 'prompt = "run pipeline"',
           },
         },
       },
     });
     const mockConfig = {
-      getProjectRoot: vi.fn(() => '/path/to/project'),
+      getProjectRoot: vi.fn(() => "/path/to/project"),
       getExtensions: vi.fn(() => []),
       getFolderTrust: vi.fn(() => false),
       isTrustedFolder: vi.fn(() => false),
@@ -238,15 +220,15 @@ describe('FileCommandLoader', () => {
     const loader = new FileCommandLoader(mockConfig);
     const commands = await loader.loadCommands(signal);
     expect(commands).toHaveLength(1);
-    expect(commands[0]!.name).toBe('gcp:pipelines:run');
+    expect(commands[0]!.name).toBe("gcp:pipelines:run");
   });
 
-  it('creates namespaces from nested directories', async () => {
+  it("creates namespaces from nested directories", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
         git: {
-          'commit.toml': 'prompt = "git commit prompt"',
+          "commit.toml": 'prompt = "git commit prompt"',
         },
       },
     });
@@ -257,20 +239,18 @@ describe('FileCommandLoader', () => {
     expect(commands).toHaveLength(1);
     const command = commands[0];
     expect(command).toBeDefined();
-    expect(command.name).toBe('git:commit');
+    expect(command.name).toBe("git:commit");
   });
 
-  it('returns both user and project commands in order', async () => {
+  it("returns both user and project commands in order", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
-    const projectCommandsDir = new Storage(
-      process.cwd(),
-    ).getProjectCommandsDir();
+    const projectCommandsDir = new Storage(process.cwd()).getProjectCommandsDir();
     mock({
       [userCommandsDir]: {
-        'test.toml': 'prompt = "User prompt"',
+        "test.toml": 'prompt = "User prompt"',
       },
       [projectCommandsDir]: {
-        'test.toml': 'prompt = "Project prompt"',
+        "test.toml": 'prompt = "Project prompt"',
       },
     });
 
@@ -287,41 +267,41 @@ describe('FileCommandLoader', () => {
     const userResult = await commands[0].action?.(
       createMockCommandContext({
         invocation: {
-          raw: '/test',
-          name: 'test',
-          args: '',
+          raw: "/test",
+          name: "test",
+          args: "",
         },
       }),
-      '',
+      "",
     );
-    if (userResult?.type === 'submit_prompt') {
-      expect(userResult.content).toEqual([{ text: 'User prompt' }]);
+    if (userResult?.type === "submit_prompt") {
+      expect(userResult.content).toEqual([{ text: "User prompt" }]);
     } else {
-      assert.fail('Incorrect action type for user command');
+      assert.fail("Incorrect action type for user command");
     }
     const projectResult = await commands[1].action?.(
       createMockCommandContext({
         invocation: {
-          raw: '/test',
-          name: 'test',
-          args: '',
+          raw: "/test",
+          name: "test",
+          args: "",
         },
       }),
-      '',
+      "",
     );
-    if (projectResult?.type === 'submit_prompt') {
-      expect(projectResult.content).toEqual([{ text: 'Project prompt' }]);
+    if (projectResult?.type === "submit_prompt") {
+      expect(projectResult.content).toEqual([{ text: "Project prompt" }]);
     } else {
-      assert.fail('Incorrect action type for project command');
+      assert.fail("Incorrect action type for project command");
     }
   });
 
-  it('ignores files with TOML syntax errors', async () => {
+  it("ignores files with TOML syntax errors", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'invalid.toml': 'this is not valid toml',
-        'good.toml': 'prompt = "This one is fine"',
+        "invalid.toml": "this is not valid toml",
+        "good.toml": 'prompt = "This one is fine"',
       },
     });
 
@@ -329,15 +309,15 @@ describe('FileCommandLoader', () => {
     const commands = await loader.loadCommands(signal);
 
     expect(commands).toHaveLength(1);
-    expect(commands[0].name).toBe('good');
+    expect(commands[0].name).toBe("good");
   });
 
-  it('ignores files that are semantically invalid (missing prompt)', async () => {
+  it("ignores files that are semantically invalid (missing prompt)", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'no_prompt.toml': 'description = "This file is missing a prompt"',
-        'good.toml': 'prompt = "This one is fine"',
+        "no_prompt.toml": 'description = "This file is missing a prompt"',
+        "good.toml": 'prompt = "This one is fine"',
       },
     });
 
@@ -345,14 +325,14 @@ describe('FileCommandLoader', () => {
     const commands = await loader.loadCommands(signal);
 
     expect(commands).toHaveLength(1);
-    expect(commands[0].name).toBe('good');
+    expect(commands[0].name).toBe("good");
   });
 
-  it('handles filename edge cases correctly', async () => {
+  it("handles filename edge cases correctly", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'test.v1.toml': 'prompt = "Test prompt"',
+        "test.v1.toml": 'prompt = "Test prompt"',
       },
     });
 
@@ -360,21 +340,21 @@ describe('FileCommandLoader', () => {
     const commands = await loader.loadCommands(signal);
     const command = commands[0];
     expect(command).toBeDefined();
-    expect(command.name).toBe('test.v1');
+    expect(command.name).toBe("test.v1");
   });
 
-  it('handles file system errors gracefully', async () => {
+  it("handles file system errors gracefully", async () => {
     mock({}); // Mock an empty file system
     const loader = new FileCommandLoader(null);
     const commands = await loader.loadCommands(signal);
     expect(commands).toHaveLength(0);
   });
 
-  it('uses a default description if not provided', async () => {
+  it("uses a default description if not provided", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'test.toml': 'prompt = "Test prompt"',
+        "test.toml": 'prompt = "Test prompt"',
       },
     });
 
@@ -382,14 +362,14 @@ describe('FileCommandLoader', () => {
     const commands = await loader.loadCommands(signal);
     const command = commands[0];
     expect(command).toBeDefined();
-    expect(command.description).toBe('Custom command from test.toml');
+    expect(command.description).toBe("Custom command from test.toml");
   });
 
-  it('uses the provided description', async () => {
+  it("uses the provided description", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'test.toml': 'prompt = "Test prompt"\ndescription = "My test command"',
+        "test.toml": 'prompt = "Test prompt"\ndescription = "My test command"',
       },
     });
 
@@ -397,14 +377,14 @@ describe('FileCommandLoader', () => {
     const commands = await loader.loadCommands(signal);
     const command = commands[0];
     expect(command).toBeDefined();
-    expect(command.description).toBe('My test command');
+    expect(command.description).toBe("My test command");
   });
 
-  it('should sanitize colons in filenames to prevent namespace conflicts', async () => {
+  it("should sanitize colons in filenames to prevent namespace conflicts", async () => {
     const userCommandsDir = Storage.getUserCommandsDir();
     mock({
       [userCommandsDir]: {
-        'legacy:command.toml': 'prompt = "This is a legacy command"',
+        "legacy:command.toml": 'prompt = "This is a legacy command"',
       },
     });
 
@@ -416,15 +396,15 @@ describe('FileCommandLoader', () => {
     expect(command).toBeDefined();
 
     // Verify that the ':' in the filename was replaced with an '_'
-    expect(command.name).toBe('legacy_command');
+    expect(command.name).toBe("legacy_command");
   });
 
-  describe('Processor Instantiation Logic', () => {
-    it('instantiates only DefaultArgumentProcessor if no {{args}} or !{} are present', async () => {
+  describe("Processor Instantiation Logic", () => {
+    it("instantiates only DefaultArgumentProcessor if no {{args}} or !{} are present", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'simple.toml': `prompt = "Just a regular prompt"`,
+          "simple.toml": `prompt = "Just a regular prompt"`,
         },
       });
 
@@ -435,11 +415,11 @@ describe('FileCommandLoader', () => {
       expect(DefaultArgumentProcessor).toHaveBeenCalledTimes(1);
     });
 
-    it('instantiates only ShellProcessor if {{args}} is present (but not !{})', async () => {
+    it("instantiates only ShellProcessor if {{args}} is present (but not !{})", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'args.toml': `prompt = "Prompt with {{args}}"`,
+          "args.toml": `prompt = "Prompt with {{args}}"`,
         },
       });
 
@@ -450,11 +430,11 @@ describe('FileCommandLoader', () => {
       expect(DefaultArgumentProcessor).not.toHaveBeenCalled();
     });
 
-    it('instantiates ShellProcessor and DefaultArgumentProcessor if !{} is present (but not {{args}})', async () => {
+    it("instantiates ShellProcessor and DefaultArgumentProcessor if !{} is present (but not {{args}})", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'shell.toml': `prompt = "Prompt with !{cmd}"`,
+          "shell.toml": `prompt = "Prompt with !{cmd}"`,
         },
       });
 
@@ -465,11 +445,11 @@ describe('FileCommandLoader', () => {
       expect(DefaultArgumentProcessor).toHaveBeenCalledTimes(1);
     });
 
-    it('instantiates only ShellProcessor if both {{args}} and !{} are present', async () => {
+    it("instantiates only ShellProcessor if both {{args}} and !{} are present", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'both.toml': `prompt = "Prompt with {{args}} and !{cmd}"`,
+          "both.toml": `prompt = "Prompt with {{args}} and !{cmd}"`,
         },
       });
 
@@ -480,11 +460,11 @@ describe('FileCommandLoader', () => {
       expect(DefaultArgumentProcessor).not.toHaveBeenCalled();
     });
 
-    it('instantiates AtFileProcessor and DefaultArgumentProcessor if @{} is present', async () => {
+    it("instantiates AtFileProcessor and DefaultArgumentProcessor if @{} is present", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'at-file.toml': `prompt = "Context: @{./my-file.txt}"`,
+          "at-file.toml": `prompt = "Context: @{./my-file.txt}"`,
         },
       });
 
@@ -496,11 +476,11 @@ describe('FileCommandLoader', () => {
       expect(DefaultArgumentProcessor).toHaveBeenCalledTimes(1);
     });
 
-    it('instantiates ShellProcessor and AtFileProcessor if !{} and @{} are present', async () => {
+    it("instantiates ShellProcessor and AtFileProcessor if !{} and @{} are present", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'shell-and-at.toml': `prompt = "Run !{cmd} with @{file.txt}"`,
+          "shell-and-at.toml": `prompt = "Run !{cmd} with @{file.txt}"`,
         },
       });
 
@@ -512,11 +492,11 @@ describe('FileCommandLoader', () => {
       expect(DefaultArgumentProcessor).toHaveBeenCalledTimes(1); // because no {{args}}
     });
 
-    it('instantiates only ShellProcessor and AtFileProcessor if {{args}} and @{} are present', async () => {
+    it("instantiates only ShellProcessor and AtFileProcessor if {{args}} and @{} are present", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'args-and-at.toml': `prompt = "Run {{args}} with @{file.txt}"`,
+          "args-and-at.toml": `prompt = "Run {{args}} with @{file.txt}"`,
         },
       });
 
@@ -529,33 +509,26 @@ describe('FileCommandLoader', () => {
     });
   });
 
-  describe('Extension Command Loading', () => {
-    it('loads commands from active extensions', async () => {
+  describe("Extension Command Loading", () => {
+    it("loads commands from active extensions", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
-      const projectCommandsDir = new Storage(
-        process.cwd(),
-      ).getProjectCommandsDir();
-      const extensionDir = path.join(
-        process.cwd(),
-        GEMINI_DIR,
-        'extensions',
-        'test-ext',
-      );
+      const projectCommandsDir = new Storage(process.cwd()).getProjectCommandsDir();
+      const extensionDir = path.join(process.cwd(), GEMINI_DIR, "extensions", "test-ext");
 
       mock({
         [userCommandsDir]: {
-          'user.toml': 'prompt = "User command"',
+          "user.toml": 'prompt = "User command"',
         },
         [projectCommandsDir]: {
-          'project.toml': 'prompt = "Project command"',
+          "project.toml": 'prompt = "Project command"',
         },
         [extensionDir]: {
-          'gemini-extension.json': JSON.stringify({
-            name: 'test-ext',
-            version: '1.0.0',
+          "gemini-extension.json": JSON.stringify({
+            name: "test-ext",
+            version: "1.0.0",
           }),
           commands: {
-            'ext.toml': 'prompt = "Extension command"',
+            "ext.toml": 'prompt = "Extension command"',
           },
         },
       });
@@ -564,8 +537,8 @@ describe('FileCommandLoader', () => {
         getProjectRoot: vi.fn(() => process.cwd()),
         getExtensions: vi.fn(() => [
           {
-            name: 'test-ext',
-            version: '1.0.0',
+            name: "test-ext",
+            version: "1.0.0",
             isActive: true,
             path: extensionDir,
           },
@@ -578,40 +551,33 @@ describe('FileCommandLoader', () => {
 
       expect(commands).toHaveLength(3);
       const commandNames = commands.map((cmd) => cmd.name);
-      expect(commandNames).toEqual(['user', 'project', 'ext']);
+      expect(commandNames).toEqual(["user", "project", "ext"]);
 
-      const extCommand = commands.find((cmd) => cmd.name === 'ext');
-      expect(extCommand?.extensionName).toBe('test-ext');
+      const extCommand = commands.find((cmd) => cmd.name === "ext");
+      expect(extCommand?.extensionName).toBe("test-ext");
       expect(extCommand?.description).toMatch(/^\[test-ext\]/);
     });
 
-    it('extension commands have extensionName metadata for conflict resolution', async () => {
+    it("extension commands have extensionName metadata for conflict resolution", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
-      const projectCommandsDir = new Storage(
-        process.cwd(),
-      ).getProjectCommandsDir();
-      const extensionDir = path.join(
-        process.cwd(),
-        GEMINI_DIR,
-        'extensions',
-        'test-ext',
-      );
+      const projectCommandsDir = new Storage(process.cwd()).getProjectCommandsDir();
+      const extensionDir = path.join(process.cwd(), GEMINI_DIR, "extensions", "test-ext");
 
       mock({
         [extensionDir]: {
-          'gemini-extension.json': JSON.stringify({
-            name: 'test-ext',
-            version: '1.0.0',
+          "gemini-extension.json": JSON.stringify({
+            name: "test-ext",
+            version: "1.0.0",
           }),
           commands: {
-            'deploy.toml': 'prompt = "Extension deploy command"',
+            "deploy.toml": 'prompt = "Extension deploy command"',
           },
         },
         [userCommandsDir]: {
-          'deploy.toml': 'prompt = "User deploy command"',
+          "deploy.toml": 'prompt = "User deploy command"',
         },
         [projectCommandsDir]: {
-          'deploy.toml': 'prompt = "Project deploy command"',
+          "deploy.toml": 'prompt = "Project deploy command"',
         },
       });
 
@@ -619,8 +585,8 @@ describe('FileCommandLoader', () => {
         getProjectRoot: vi.fn(() => process.cwd()),
         getExtensions: vi.fn(() => [
           {
-            name: 'test-ext',
-            version: '1.0.0',
+            name: "test-ext",
+            version: "1.0.0",
             isActive: true,
             path: extensionDir,
           },
@@ -634,90 +600,80 @@ describe('FileCommandLoader', () => {
       // Return all commands, even duplicates
       expect(commands).toHaveLength(3);
 
-      expect(commands[0].name).toBe('deploy');
+      expect(commands[0].name).toBe("deploy");
       expect(commands[0].extensionName).toBeUndefined();
       const result0 = await commands[0].action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/deploy',
-            name: 'deploy',
-            args: '',
+            raw: "/deploy",
+            name: "deploy",
+            args: "",
           },
         }),
-        '',
+        "",
       );
-      expect(result0?.type).toBe('submit_prompt');
-      if (result0?.type === 'submit_prompt') {
-        expect(result0.content).toEqual([{ text: 'User deploy command' }]);
+      expect(result0?.type).toBe("submit_prompt");
+      if (result0?.type === "submit_prompt") {
+        expect(result0.content).toEqual([{ text: "User deploy command" }]);
       }
 
-      expect(commands[1].name).toBe('deploy');
+      expect(commands[1].name).toBe("deploy");
       expect(commands[1].extensionName).toBeUndefined();
       const result1 = await commands[1].action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/deploy',
-            name: 'deploy',
-            args: '',
+            raw: "/deploy",
+            name: "deploy",
+            args: "",
           },
         }),
-        '',
+        "",
       );
-      expect(result1?.type).toBe('submit_prompt');
-      if (result1?.type === 'submit_prompt') {
-        expect(result1.content).toEqual([{ text: 'Project deploy command' }]);
+      expect(result1?.type).toBe("submit_prompt");
+      if (result1?.type === "submit_prompt") {
+        expect(result1.content).toEqual([{ text: "Project deploy command" }]);
       }
 
-      expect(commands[2].name).toBe('deploy');
-      expect(commands[2].extensionName).toBe('test-ext');
+      expect(commands[2].name).toBe("deploy");
+      expect(commands[2].extensionName).toBe("test-ext");
       expect(commands[2].description).toMatch(/^\[test-ext\]/);
       const result2 = await commands[2].action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/deploy',
-            name: 'deploy',
-            args: '',
+            raw: "/deploy",
+            name: "deploy",
+            args: "",
           },
         }),
-        '',
+        "",
       );
-      expect(result2?.type).toBe('submit_prompt');
-      if (result2?.type === 'submit_prompt') {
-        expect(result2.content).toEqual([{ text: 'Extension deploy command' }]);
+      expect(result2?.type).toBe("submit_prompt");
+      if (result2?.type === "submit_prompt") {
+        expect(result2.content).toEqual([{ text: "Extension deploy command" }]);
       }
     });
 
-    it('only loads commands from active extensions', async () => {
-      const extensionDir1 = path.join(
-        process.cwd(),
-        GEMINI_DIR,
-        'extensions',
-        'active-ext',
-      );
-      const extensionDir2 = path.join(
-        process.cwd(),
-        GEMINI_DIR,
-        'extensions',
-        'inactive-ext',
-      );
+    it("only loads commands from active extensions", async () => {
+      const extensionDir1 = path.join(process.cwd(), GEMINI_DIR, "extensions", "active-ext");
+      const extensionDir2 = path.join(process.cwd(), GEMINI_DIR, "extensions", "inactive-ext");
 
       mock({
         [extensionDir1]: {
-          'gemini-extension.json': JSON.stringify({
-            name: 'active-ext',
-            version: '1.0.0',
+          "gemini-extension.json": JSON.stringify({
+            name: "active-ext",
+            version: "1.0.0",
           }),
           commands: {
-            'active.toml': 'prompt = "Active extension command"',
+            "active.toml": 'prompt = "Active extension command"',
           },
         },
         [extensionDir2]: {
-          'gemini-extension.json': JSON.stringify({
-            name: 'inactive-ext',
-            version: '1.0.0',
+          "gemini-extension.json": JSON.stringify({
+            name: "inactive-ext",
+            version: "1.0.0",
           }),
           commands: {
-            'inactive.toml': 'prompt = "Inactive extension command"',
+            "inactive.toml": 'prompt = "Inactive extension command"',
           },
         },
       });
@@ -726,14 +682,14 @@ describe('FileCommandLoader', () => {
         getProjectRoot: vi.fn(() => process.cwd()),
         getExtensions: vi.fn(() => [
           {
-            name: 'active-ext',
-            version: '1.0.0',
+            name: "active-ext",
+            version: "1.0.0",
             isActive: true,
             path: extensionDir1,
           },
           {
-            name: 'inactive-ext',
-            version: '1.0.0',
+            name: "inactive-ext",
+            version: "1.0.0",
             isActive: false,
             path: extensionDir2,
           },
@@ -745,24 +701,19 @@ describe('FileCommandLoader', () => {
       const commands = await loader.loadCommands(signal);
 
       expect(commands).toHaveLength(1);
-      expect(commands[0].name).toBe('active');
-      expect(commands[0].extensionName).toBe('active-ext');
+      expect(commands[0].name).toBe("active");
+      expect(commands[0].extensionName).toBe("active-ext");
       expect(commands[0].description).toMatch(/^\[active-ext\]/);
     });
 
-    it('handles missing extension commands directory gracefully', async () => {
-      const extensionDir = path.join(
-        process.cwd(),
-        GEMINI_DIR,
-        'extensions',
-        'no-commands',
-      );
+    it("handles missing extension commands directory gracefully", async () => {
+      const extensionDir = path.join(process.cwd(), GEMINI_DIR, "extensions", "no-commands");
 
       mock({
         [extensionDir]: {
-          'gemini-extension.json': JSON.stringify({
-            name: 'no-commands',
-            version: '1.0.0',
+          "gemini-extension.json": JSON.stringify({
+            name: "no-commands",
+            version: "1.0.0",
           }),
           // No commands directory
         },
@@ -772,8 +723,8 @@ describe('FileCommandLoader', () => {
         getProjectRoot: vi.fn(() => process.cwd()),
         getExtensions: vi.fn(() => [
           {
-            name: 'no-commands',
-            version: '1.0.0',
+            name: "no-commands",
+            version: "1.0.0",
             isActive: true,
             path: extensionDir,
           },
@@ -786,28 +737,23 @@ describe('FileCommandLoader', () => {
       expect(commands).toHaveLength(0);
     });
 
-    it('handles nested command structure in extensions', async () => {
-      const extensionDir = path.join(
-        process.cwd(),
-        GEMINI_DIR,
-        'extensions',
-        'a',
-      );
+    it("handles nested command structure in extensions", async () => {
+      const extensionDir = path.join(process.cwd(), GEMINI_DIR, "extensions", "a");
 
       mock({
         [extensionDir]: {
-          'gemini-extension.json': JSON.stringify({
-            name: 'a',
-            version: '1.0.0',
+          "gemini-extension.json": JSON.stringify({
+            name: "a",
+            version: "1.0.0",
           }),
           commands: {
             b: {
-              'c.toml': 'prompt = "Nested command from extension a"',
+              "c.toml": 'prompt = "Nested command from extension a"',
               d: {
-                'e.toml': 'prompt = "Deeply nested command"',
+                "e.toml": 'prompt = "Deeply nested command"',
               },
             },
-            'simple.toml': 'prompt = "Simple command"',
+            "simple.toml": 'prompt = "Simple command"',
           },
         },
       });
@@ -815,7 +761,7 @@ describe('FileCommandLoader', () => {
       const mockConfig = {
         getProjectRoot: vi.fn(() => process.cwd()),
         getExtensions: vi.fn(() => [
-          { name: 'a', version: '1.0.0', isActive: true, path: extensionDir },
+          { name: "a", version: "1.0.0", isActive: true, path: extensionDir },
         ]),
         getFolderTrust: vi.fn(() => false),
         isTrustedFolder: vi.fn(() => false),
@@ -826,49 +772,42 @@ describe('FileCommandLoader', () => {
       expect(commands).toHaveLength(3);
 
       const commandNames = commands.map((cmd) => cmd.name).sort();
-      expect(commandNames).toEqual(['b:c', 'b:d:e', 'simple']);
+      expect(commandNames).toEqual(["b:c", "b:d:e", "simple"]);
 
-      const nestedCmd = commands.find((cmd) => cmd.name === 'b:c');
-      expect(nestedCmd?.extensionName).toBe('a');
+      const nestedCmd = commands.find((cmd) => cmd.name === "b:c");
+      expect(nestedCmd?.extensionName).toBe("a");
       expect(nestedCmd?.description).toMatch(/^\[a\]/);
       expect(nestedCmd).toBeDefined();
       const result = await nestedCmd!.action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/b:c',
-            name: 'b:c',
-            args: '',
+            raw: "/b:c",
+            name: "b:c",
+            args: "",
           },
         }),
-        '',
+        "",
       );
-      if (result?.type === 'submit_prompt') {
-        expect(result.content).toEqual([
-          { text: 'Nested command from extension a' },
-        ]);
+      if (result?.type === "submit_prompt") {
+        expect(result.content).toEqual([{ text: "Nested command from extension a" }]);
       } else {
-        assert.fail('Incorrect action type');
+        assert.fail("Incorrect action type");
       }
     });
 
-    it('correctly loads extensionId for extension commands', async () => {
-      const extensionId = 'my-test-ext-id-123';
-      const extensionDir = path.join(
-        process.cwd(),
-        GEMINI_DIR,
-        'extensions',
-        'my-test-ext',
-      );
+    it("correctly loads extensionId for extension commands", async () => {
+      const extensionId = "my-test-ext-id-123";
+      const extensionDir = path.join(process.cwd(), GEMINI_DIR, "extensions", "my-test-ext");
 
       mock({
         [extensionDir]: {
-          'gemini-extension.json': JSON.stringify({
-            name: 'my-test-ext',
+          "gemini-extension.json": JSON.stringify({
+            name: "my-test-ext",
             id: extensionId,
-            version: '1.0.0',
+            version: "1.0.0",
           }),
           commands: {
-            'my-cmd.toml': 'prompt = "My test command"',
+            "my-cmd.toml": 'prompt = "My test command"',
           },
         },
       });
@@ -877,9 +816,9 @@ describe('FileCommandLoader', () => {
         getProjectRoot: vi.fn(() => process.cwd()),
         getExtensions: vi.fn(() => [
           {
-            name: 'my-test-ext',
+            name: "my-test-ext",
             id: extensionId,
-            version: '1.0.0',
+            version: "1.0.0",
             isActive: true,
             path: extensionDir,
           },
@@ -892,113 +831,110 @@ describe('FileCommandLoader', () => {
 
       expect(commands).toHaveLength(1);
       const command = commands[0];
-      expect(command.name).toBe('my-cmd');
-      expect(command.extensionName).toBe('my-test-ext');
+      expect(command.name).toBe("my-cmd");
+      expect(command.extensionName).toBe("my-test-ext");
       expect(command.extensionId).toBe(extensionId);
     });
   });
 
-  describe('Argument Handling Integration (via ShellProcessor)', () => {
-    it('correctly processes a command with {{args}}', async () => {
+  describe("Argument Handling Integration (via ShellProcessor)", () => {
+    it("correctly processes a command with {{args}}", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'shorthand.toml':
+          "shorthand.toml":
             'prompt = "The user wants to: {{args}}"\ndescription = "Shorthand test"',
         },
       });
 
       const loader = new FileCommandLoader(null as unknown as Config);
       const commands = await loader.loadCommands(signal);
-      const command = commands.find((c) => c.name === 'shorthand');
+      const command = commands.find((c) => c.name === "shorthand");
       expect(command).toBeDefined();
 
       const result = await command!.action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/shorthand do something cool',
-            name: 'shorthand',
-            args: 'do something cool',
+            raw: "/shorthand do something cool",
+            name: "shorthand",
+            args: "do something cool",
           },
         }),
-        'do something cool',
+        "do something cool",
       );
-      expect(result?.type).toBe('submit_prompt');
-      if (result?.type === 'submit_prompt') {
-        expect(result.content).toEqual([
-          { text: 'The user wants to: do something cool' },
-        ]);
+      expect(result?.type).toBe("submit_prompt");
+      if (result?.type === "submit_prompt") {
+        expect(result.content).toEqual([{ text: "The user wants to: do something cool" }]);
       }
     });
   });
 
-  describe('Default Argument Processor Integration', () => {
-    it('correctly processes a command without {{args}}', async () => {
+  describe("Default Argument Processor Integration", () => {
+    it("correctly processes a command without {{args}}", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'model_led.toml':
+          "model_led.toml":
             'prompt = "This is the instruction."\ndescription = "Default processor test"',
         },
       });
 
       const loader = new FileCommandLoader(null as unknown as Config);
       const commands = await loader.loadCommands(signal);
-      const command = commands.find((c) => c.name === 'model_led');
+      const command = commands.find((c) => c.name === "model_led");
       expect(command).toBeDefined();
 
       const result = await command!.action?.(
         createMockCommandContext({
           invocation: {
             raw: '/model_led 1.2.0 added "a feature"',
-            name: 'model_led',
+            name: "model_led",
             args: '1.2.0 added "a feature"',
           },
         }),
         '1.2.0 added "a feature"',
       );
-      expect(result?.type).toBe('submit_prompt');
-      if (result?.type === 'submit_prompt') {
-        const expectedContent =
-          'This is the instruction.\n\n/model_led 1.2.0 added "a feature"';
+      expect(result?.type).toBe("submit_prompt");
+      if (result?.type === "submit_prompt") {
+        const expectedContent = 'This is the instruction.\n\n/model_led 1.2.0 added "a feature"';
         expect(result.content).toEqual([{ text: expectedContent }]);
       }
     });
   });
 
-  describe('Shell Processor Integration', () => {
-    it('instantiates ShellProcessor if {{args}} is present (even without shell trigger)', async () => {
+  describe("Shell Processor Integration", () => {
+    it("instantiates ShellProcessor if {{args}} is present (even without shell trigger)", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'args_only.toml': `prompt = "Hello {{args}}"`,
+          "args_only.toml": `prompt = "Hello {{args}}"`,
         },
       });
 
       const loader = new FileCommandLoader(null as unknown as Config);
       await loader.loadCommands(signal);
 
-      expect(ShellProcessor).toHaveBeenCalledWith('args_only');
+      expect(ShellProcessor).toHaveBeenCalledWith("args_only");
     });
-    it('instantiates ShellProcessor if the trigger is present', async () => {
+    it("instantiates ShellProcessor if the trigger is present", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'shell.toml': `prompt = "Run this: ${SHELL_INJECTION_TRIGGER}echo hello}"`,
+          "shell.toml": `prompt = "Run this: ${SHELL_INJECTION_TRIGGER}echo hello}"`,
         },
       });
 
       const loader = new FileCommandLoader(null as unknown as Config);
       await loader.loadCommands(signal);
 
-      expect(ShellProcessor).toHaveBeenCalledWith('shell');
+      expect(ShellProcessor).toHaveBeenCalledWith("shell");
     });
 
-    it('does not instantiate ShellProcessor if no triggers ({{args}} or !{}) are present', async () => {
+    it("does not instantiate ShellProcessor if no triggers ({{args}} or !{}) are present", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'regular.toml': `prompt = "Just a regular prompt"`,
+          "regular.toml": `prompt = "Just a regular prompt"`,
         },
       });
 
@@ -1012,118 +948,110 @@ describe('FileCommandLoader', () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'shell.toml': `prompt = "Run !{echo 'hello'}"`,
+          "shell.toml": `prompt = "Run !{echo 'hello'}"`,
         },
       });
-      mockShellProcess.mockResolvedValue([{ text: 'Run hello' }]);
+      mockShellProcess.mockResolvedValue([{ text: "Run hello" }]);
 
       const loader = new FileCommandLoader(null as unknown as Config);
       const commands = await loader.loadCommands(signal);
-      const command = commands.find((c) => c.name === 'shell');
+      const command = commands.find((c) => c.name === "shell");
       expect(command).toBeDefined();
 
       const result = await command!.action!(
         createMockCommandContext({
-          invocation: { raw: '/shell', name: 'shell', args: '' },
+          invocation: { raw: "/shell", name: "shell", args: "" },
         }),
-        '',
+        "",
       );
 
-      expect(result?.type).toBe('submit_prompt');
-      if (result?.type === 'submit_prompt') {
-        expect(result.content).toEqual([{ text: 'Run hello' }]);
+      expect(result?.type).toBe("submit_prompt");
+      if (result?.type === "submit_prompt") {
+        expect(result.content).toEqual([{ text: "Run hello" }]);
       }
     });
 
     it('returns a "confirm_shell_commands" action if shell processing requires it', async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
-      const rawInvocation = '/shell rm -rf /';
+      const rawInvocation = "/shell rm -rf /";
       mock({
         [userCommandsDir]: {
-          'shell.toml': `prompt = "Run !{rm -rf /}"`,
+          "shell.toml": `prompt = "Run !{rm -rf /}"`,
         },
       });
 
       // Mock the processor to throw the specific error
-      const error = new ConfirmationRequiredError('Confirmation needed', [
-        'rm -rf /',
-      ]);
+      const error = new ConfirmationRequiredError("Confirmation needed", ["rm -rf /"]);
       mockShellProcess.mockRejectedValue(error);
 
       const loader = new FileCommandLoader(null as unknown as Config);
       const commands = await loader.loadCommands(signal);
-      const command = commands.find((c) => c.name === 'shell');
+      const command = commands.find((c) => c.name === "shell");
       expect(command).toBeDefined();
 
       const result = await command!.action!(
         createMockCommandContext({
-          invocation: { raw: rawInvocation, name: 'shell', args: 'rm -rf /' },
+          invocation: { raw: rawInvocation, name: "shell", args: "rm -rf /" },
         }),
-        'rm -rf /',
+        "rm -rf /",
       );
 
-      expect(result?.type).toBe('confirm_shell_commands');
-      if (result?.type === 'confirm_shell_commands') {
-        expect(result.commandsToConfirm).toEqual(['rm -rf /']);
+      expect(result?.type).toBe("confirm_shell_commands");
+      if (result?.type === "confirm_shell_commands") {
+        expect(result.commandsToConfirm).toEqual(["rm -rf /"]);
         expect(result.originalInvocation.raw).toBe(rawInvocation);
       }
     });
 
-    it('re-throws other errors from the processor', async () => {
+    it("re-throws other errors from the processor", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'shell.toml': `prompt = "Run !{something}"`,
+          "shell.toml": `prompt = "Run !{something}"`,
         },
       });
 
-      const genericError = new Error('Something else went wrong');
+      const genericError = new Error("Something else went wrong");
       mockShellProcess.mockRejectedValue(genericError);
 
       const loader = new FileCommandLoader(null as unknown as Config);
       const commands = await loader.loadCommands(signal);
-      const command = commands.find((c) => c.name === 'shell');
+      const command = commands.find((c) => c.name === "shell");
       expect(command).toBeDefined();
 
       await expect(
         command!.action!(
           createMockCommandContext({
-            invocation: { raw: '/shell', name: 'shell', args: '' },
+            invocation: { raw: "/shell", name: "shell", args: "" },
           }),
-          '',
+          "",
         ),
-      ).rejects.toThrow('Something else went wrong');
+      ).rejects.toThrow("Something else went wrong");
     });
-    it('assembles the processor pipeline in the correct order (AtFile -> Shell -> Default)', async () => {
+    it("assembles the processor pipeline in the correct order (AtFile -> Shell -> Default)", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
           // This prompt uses !{}, @{}, but NOT {{args}}, so all processors should be active.
-          'pipeline.toml': `
+          "pipeline.toml": `
               prompt = "Shell says: !{echo foo}. File says: @{./bar.txt}"
             `,
         },
-        './bar.txt': 'bar content',
+        "./bar.txt": "bar content",
       });
 
       const defaultProcessMock = vi
         .fn()
         .mockImplementation((p: PromptPipelineContent) =>
-          Promise.resolve([
-            { text: `${(p[0] as { text: string }).text}-default-processed` },
-          ]),
+          Promise.resolve([{ text: `${(p[0] as { text: string }).text}-default-processed` }]),
         );
 
       mockShellProcess.mockImplementation((p: PromptPipelineContent) =>
-        Promise.resolve([
-          { text: `${(p[0] as { text: string }).text}-shell-processed` },
-        ]),
+        Promise.resolve([{ text: `${(p[0] as { text: string }).text}-shell-processed` }]),
       );
 
       mockAtFileProcess.mockImplementation((p: PromptPipelineContent) =>
-        Promise.resolve([
-          { text: `${(p[0] as { text: string }).text}-at-file-processed` },
-        ]),
+        Promise.resolve([{ text: `${(p[0] as { text: string }).text}-at-file-processed` }]),
       );
 
       vi.mocked(DefaultArgumentProcessor).mockImplementation(
@@ -1135,18 +1063,18 @@ describe('FileCommandLoader', () => {
 
       const loader = new FileCommandLoader(null as unknown as Config);
       const commands = await loader.loadCommands(signal);
-      const command = commands.find((c) => c.name === 'pipeline');
+      const command = commands.find((c) => c.name === "pipeline");
       expect(command).toBeDefined();
 
       const result = await command!.action!(
         createMockCommandContext({
           invocation: {
-            raw: '/pipeline baz',
-            name: 'pipeline',
-            args: 'baz',
+            raw: "/pipeline baz",
+            name: "pipeline",
+            args: "baz",
           },
         }),
-        'baz',
+        "baz",
       );
 
       expect(mockAtFileProcess.mock.invocationCallOrder[0]).toBeLessThan(
@@ -1159,67 +1087,59 @@ describe('FileCommandLoader', () => {
       // Verify the flow of the prompt through the processors
       // 1. AtFile processor runs first
       expect(mockAtFileProcess).toHaveBeenCalledWith(
-        [{ text: expect.stringContaining('@{./bar.txt}') }],
+        [{ text: expect.stringContaining("@{./bar.txt}") }],
         expect.any(Object),
       );
       // 2. Shell processor runs second
       expect(mockShellProcess).toHaveBeenCalledWith(
-        [{ text: expect.stringContaining('-at-file-processed') }],
+        [{ text: expect.stringContaining("-at-file-processed") }],
         expect.any(Object),
       );
       // 3. Default processor runs third
       expect(defaultProcessMock).toHaveBeenCalledWith(
-        [{ text: expect.stringContaining('-shell-processed') }],
+        [{ text: expect.stringContaining("-shell-processed") }],
         expect.any(Object),
       );
 
-      if (result?.type === 'submit_prompt') {
-        const contentAsArray = Array.isArray(result.content)
-          ? result.content
-          : [result.content];
+      if (result?.type === "submit_prompt") {
+        const contentAsArray = Array.isArray(result.content) ? result.content : [result.content];
         expect(contentAsArray.length).toBeGreaterThan(0);
         const firstPart = contentAsArray[0];
 
-        if (typeof firstPart === 'object' && firstPart && 'text' in firstPart) {
-          expect(firstPart.text).toContain(
-            '-at-file-processed-shell-processed-default-processed',
-          );
+        if (typeof firstPart === "object" && firstPart && "text" in firstPart) {
+          expect(firstPart.text).toContain("-at-file-processed-shell-processed-default-processed");
         } else {
-          assert.fail(
-            'First part of content is not a text part or is a string',
-          );
+          assert.fail("First part of content is not a text part or is a string");
         }
       } else {
-        assert.fail('Incorrect action type');
+        assert.fail("Incorrect action type");
       }
     });
   });
 
-  describe('@-file Processor Integration', () => {
-    it('correctly processes a command with @{file}', async () => {
+  describe("@-file Processor Integration", () => {
+    it("correctly processes a command with @{file}", async () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'at-file.toml':
+          "at-file.toml":
             'prompt = "Context from file: @{./test.txt}"\ndescription = "@-file test"',
         },
-        './test.txt': 'file content',
+        "./test.txt": "file content",
       });
 
-      mockAtFileProcess.mockImplementation(
-        async (prompt: PromptPipelineContent) => {
-          // A simplified mock of AtFileProcessor's behavior
-          const textContent = (prompt[0] as { text: string }).text;
-          if (textContent.includes('@{./test.txt}')) {
-            return [
-              {
-                text: textContent.replace('@{./test.txt}', 'file content'),
-              },
-            ];
-          }
-          return prompt;
-        },
-      );
+      mockAtFileProcess.mockImplementation(async (prompt: PromptPipelineContent) => {
+        // A simplified mock of AtFileProcessor's behavior
+        const textContent = (prompt[0] as { text: string }).text;
+        if (textContent.includes("@{./test.txt}")) {
+          return [
+            {
+              text: textContent.replace("@{./test.txt}", "file content"),
+            },
+          ];
+        }
+        return prompt;
+      });
 
       // Prevent default processor from interfering
       vi.mocked(DefaultArgumentProcessor).mockImplementation(
@@ -1231,32 +1151,30 @@ describe('FileCommandLoader', () => {
 
       const loader = new FileCommandLoader(null as unknown as Config);
       const commands = await loader.loadCommands(signal);
-      const command = commands.find((c) => c.name === 'at-file');
+      const command = commands.find((c) => c.name === "at-file");
       expect(command).toBeDefined();
 
       const result = await command!.action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/at-file',
-            name: 'at-file',
-            args: '',
+            raw: "/at-file",
+            name: "at-file",
+            args: "",
           },
         }),
-        '',
+        "",
       );
-      expect(result?.type).toBe('submit_prompt');
-      if (result?.type === 'submit_prompt') {
-        expect(result.content).toEqual([
-          { text: 'Context from file: file content' },
-        ]);
+      expect(result?.type).toBe("submit_prompt");
+      if (result?.type === "submit_prompt") {
+        expect(result.content).toEqual([{ text: "Context from file: file content" }]);
       }
     });
   });
 
-  describe('with folder trust enabled', () => {
-    it('loads multiple commands', async () => {
+  describe("with folder trust enabled", () => {
+    it("loads multiple commands", async () => {
       const mockConfig = {
-        getProjectRoot: vi.fn(() => '/path/to/project'),
+        getProjectRoot: vi.fn(() => "/path/to/project"),
         getExtensions: vi.fn(() => []),
         getFolderTrust: vi.fn(() => true),
         isTrustedFolder: vi.fn(() => true),
@@ -1264,8 +1182,8 @@ describe('FileCommandLoader', () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'test1.toml': 'prompt = "Prompt 1"',
-          'test2.toml': 'prompt = "Prompt 2"',
+          "test1.toml": 'prompt = "Prompt 1"',
+          "test2.toml": 'prompt = "Prompt 2"',
         },
       });
 
@@ -1275,9 +1193,9 @@ describe('FileCommandLoader', () => {
       expect(commands).toHaveLength(2);
     });
 
-    it('does not load when folder is not trusted', async () => {
+    it("does not load when folder is not trusted", async () => {
       const mockConfig = {
-        getProjectRoot: vi.fn(() => '/path/to/project'),
+        getProjectRoot: vi.fn(() => "/path/to/project"),
         getExtensions: vi.fn(() => []),
         getFolderTrust: vi.fn(() => true),
         isTrustedFolder: vi.fn(() => false),
@@ -1285,8 +1203,8 @@ describe('FileCommandLoader', () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'test1.toml': 'prompt = "Prompt 1"',
-          'test2.toml': 'prompt = "Prompt 2"',
+          "test1.toml": 'prompt = "Prompt 1"',
+          "test2.toml": 'prompt = "Prompt 2"',
         },
       });
 
@@ -1297,17 +1215,15 @@ describe('FileCommandLoader', () => {
     });
   });
 
-  describe('Aborted signal', () => {
-    it('does not log errors if the signal is aborted', async () => {
+  describe("Aborted signal", () => {
+    it("does not log errors if the signal is aborted", async () => {
       const controller = new AbortController();
       const abortSignal = controller.signal;
 
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       const mockConfig = {
-        getProjectRoot: vi.fn(() => '/path/to/project'),
+        getProjectRoot: vi.fn(() => "/path/to/project"),
         getExtensions: vi.fn(() => []),
         getFolderTrust: vi.fn(() => false),
         isTrustedFolder: vi.fn(() => false),
@@ -1317,14 +1233,14 @@ describe('FileCommandLoader', () => {
       const userCommandsDir = Storage.getUserCommandsDir();
       mock({
         [userCommandsDir]: {
-          'test1.toml': 'prompt = "Prompt 1"',
+          "test1.toml": 'prompt = "Prompt 1"',
         },
       });
 
       const loader = new FileCommandLoader(mockConfig);
 
       // Mock glob to throw an AbortError
-      const abortError = new DOMException('Aborted', 'AbortError');
+      const abortError = new DOMException("Aborted", "AbortError");
       vi.mocked(glob.glob).mockImplementation(async () => {
         controller.abort(); // Ensure the signal is aborted when the service checks
         throw abortError;
diff --git a/packages/ui-gemini/src/services/FileCommandLoader.ts b/packages/ui-gemini/src/services/FileCommandLoader.ts
index f515efa1d..f5e8c547c 100644
--- a/packages/ui-gemini/src/services/FileCommandLoader.ts
+++ b/packages/ui-gemini/src/services/FileCommandLoader.ts
@@ -4,35 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import toml from '@iarna/toml';
-import { glob } from 'glob';
-import { z } from 'zod';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { Storage } from '@airiscode/gemini-cli-core';
-import type { ICommandLoader } from './types.js';
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { Storage } from "@airiscode/gemini-cli-core";
+import toml from "@iarna/toml";
+import { glob } from "glob";
+import { z } from "zod";
 import type {
   CommandContext,
   SlashCommand,
   SlashCommandActionReturn,
-} from '../ui/commands/types.js';
-import { CommandKind } from '../ui/commands/types.js';
-import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
-import type {
-  IPromptProcessor,
-  PromptPipelineContent,
-} from './prompt-processors/types.js';
+} from "../ui/commands/types.js";
+import { CommandKind } from "../ui/commands/types.js";
+import { DefaultArgumentProcessor } from "./prompt-processors/argumentProcessor.js";
+import { AtFileProcessor } from "./prompt-processors/atFileProcessor.js";
+import { ConfirmationRequiredError, ShellProcessor } from "./prompt-processors/shellProcessor.js";
+import type { IPromptProcessor, PromptPipelineContent } from "./prompt-processors/types.js";
 import {
-  SHORTHAND_ARGS_PLACEHOLDER,
-  SHELL_INJECTION_TRIGGER,
   AT_FILE_INJECTION_TRIGGER,
-} from './prompt-processors/types.js';
-import {
-  ConfirmationRequiredError,
-  ShellProcessor,
-} from './prompt-processors/shellProcessor.js';
-import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
+  SHELL_INJECTION_TRIGGER,
+  SHORTHAND_ARGS_PLACEHOLDER,
+} from "./prompt-processors/types.js";
+import type { ICommandLoader } from "./types.js";
 
 interface CommandDirectory {
   path: string;
@@ -101,7 +95,7 @@ export class FileCommandLoader implements ICommandLoader {
     const commandDirs = this.getCommandDirectories();
     for (const dirInfo of commandDirs) {
       try {
-        const files = await glob('**/*.toml', {
+        const files = await glob("**/*.toml", {
           ...globOptions,
           cwd: dirInfo.path,
         });
@@ -122,14 +116,8 @@ export class FileCommandLoader implements ICommandLoader {
         // Add all commands without deduplication
         allCommands.push(...commands);
       } catch (error) {
-        if (
-          !signal.aborted &&
-          (error as { code?: string })?.code !== 'ENOENT'
-        ) {
-          console.error(
-            `[FileCommandLoader] Error loading commands from ${dirInfo.path}:`,
-            error,
-          );
+        if (!signal.aborted && (error as { code?: string })?.code !== "ENOENT") {
+          console.error(`[FileCommandLoader] Error loading commands from ${dirInfo.path}:`, error);
         }
       }
     }
@@ -161,7 +149,7 @@ export class FileCommandLoader implements ICommandLoader {
         .sort((a, b) => a.name.localeCompare(b.name)); // Sort alphabetically for deterministic loading
 
       const extensionCommandDirs = activeExtensions.map((ext) => ({
-        path: path.join(ext.path, 'commands'),
+        path: path.join(ext.path, "commands"),
         extensionName: ext.name,
         extensionId: ext.id,
       }));
@@ -187,7 +175,7 @@ export class FileCommandLoader implements ICommandLoader {
   ): Promise<SlashCommand | null> {
     let fileContent: string;
     try {
-      fileContent = await fs.readFile(filePath, 'utf-8');
+      fileContent = await fs.readFile(filePath, "utf-8");
     } catch (error: unknown) {
       console.error(
         `[FileCommandLoader] Failed to read file ${filePath}:`,
@@ -229,8 +217,8 @@ export class FileCommandLoader implements ICommandLoader {
       // Sanitize each path segment to prevent ambiguity. Since ':' is our
       // namespace separator, we replace any literal colons in filenames
       // with underscores to avoid naming conflicts.
-      .map((segment) => segment.replaceAll(':', '_'))
-      .join(':');
+      .map((segment) => segment.replaceAll(":", "_"))
+      .join(":");
 
     // Add extension name tag for extension commands
     const defaultDescription = `Custom command from ${path.basename(filePath)}`;
@@ -241,12 +229,8 @@ export class FileCommandLoader implements ICommandLoader {
 
     const processors: IPromptProcessor[] = [];
     const usesArgs = validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER);
-    const usesShellInjection = validDef.prompt.includes(
-      SHELL_INJECTION_TRIGGER,
-    );
-    const usesAtFileInjection = validDef.prompt.includes(
-      AT_FILE_INJECTION_TRIGGER,
-    );
+    const usesShellInjection = validDef.prompt.includes(SHELL_INJECTION_TRIGGER);
+    const usesAtFileInjection = validDef.prompt.includes(AT_FILE_INJECTION_TRIGGER);
 
     // 1. @-File Injection (Security First).
     // This runs first to ensure we're not executing shell commands that
@@ -273,33 +257,25 @@ export class FileCommandLoader implements ICommandLoader {
       kind: CommandKind.FILE,
       extensionName,
       extensionId,
-      action: async (
-        context: CommandContext,
-        _args: string,
-      ): Promise<SlashCommandActionReturn> => {
+      action: async (context: CommandContext, _args: string): Promise<SlashCommandActionReturn> => {
         if (!context.invocation) {
           console.error(
             `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`,
           );
           return {
-            type: 'submit_prompt',
+            type: "submit_prompt",
             content: [{ text: validDef.prompt }], // Fallback to unprocessed prompt
           };
         }
 
         try {
-          let processedContent: PromptPipelineContent = [
-            { text: validDef.prompt },
-          ];
+          let processedContent: PromptPipelineContent = [{ text: validDef.prompt }];
           for (const processor of processors) {
-            processedContent = await processor.process(
-              processedContent,
-              context,
-            );
+            processedContent = await processor.process(processedContent, context);
           }
 
           return {
-            type: 'submit_prompt',
+            type: "submit_prompt",
             content: processedContent,
           };
         } catch (e) {
@@ -307,7 +283,7 @@ export class FileCommandLoader implements ICommandLoader {
           if (e instanceof ConfirmationRequiredError) {
             // Halt and request confirmation from the UI layer.
             return {
-              type: 'confirm_shell_commands',
+              type: "confirm_shell_commands",
               commandsToConfirm: e.commandsToConfirm,
               originalInvocation: {
                 raw: context.invocation.raw,
diff --git a/packages/ui-gemini/src/services/McpPromptLoader.test.ts b/packages/ui-gemini/src/services/McpPromptLoader.test.ts
index 82f6313b4..f0177a0e4 100644
--- a/packages/ui-gemini/src/services/McpPromptLoader.test.ts
+++ b/packages/ui-gemini/src/services/McpPromptLoader.test.ts
@@ -4,341 +4,323 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { McpPromptLoader } from './McpPromptLoader.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import type { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { CommandKind, type CommandContext } from '../ui/commands/types.js';
-import * as cliCore from '@airiscode/gemini-cli-core';
+import type { Config } from "@airiscode/gemini-cli-core";
+import * as cliCore from "@airiscode/gemini-cli-core";
+import type { PromptArgument } from "@modelcontextprotocol/sdk/types.js";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { type CommandContext, CommandKind } from "../ui/commands/types.js";
+import { McpPromptLoader } from "./McpPromptLoader.js";
 
 // Define the mock prompt data at a higher scope
 const mockPrompt = {
-  name: 'test-prompt',
-  description: 'A test prompt.',
-  serverName: 'test-server',
+  name: "test-prompt",
+  description: "A test prompt.",
+  serverName: "test-server",
   arguments: [
-    { name: 'name', required: true, description: "The animal's name." },
-    { name: 'age', required: true, description: "The animal's age." },
-    { name: 'species', required: true, description: "The animal's species." },
+    { name: "name", required: true, description: "The animal's name." },
+    { name: "age", required: true, description: "The animal's age." },
+    { name: "species", required: true, description: "The animal's species." },
     {
-      name: 'enclosure',
+      name: "enclosure",
       required: false,
       description: "The animal's enclosure.",
     },
-    { name: 'trail', required: false, description: "The animal's trail." },
+    { name: "trail", required: false, description: "The animal's trail." },
   ],
   invoke: vi.fn().mockResolvedValue({
-    messages: [{ content: { type: 'text', text: 'Hello, world!' } }],
+    messages: [{ content: { type: "text", text: "Hello, world!" } }],
   }),
 };
 
-describe('McpPromptLoader', () => {
+describe("McpPromptLoader", () => {
   const mockConfig = {} as Config;
 
   // Use a beforeEach to set up and clean a spy for each test
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([mockPrompt]);
+    vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([mockPrompt]);
   });
 
   // --- `parseArgs` tests remain the same ---
 
-  describe('parseArgs', () => {
-    it('should handle multi-word positional arguments', () => {
+  describe("parseArgs", () => {
+    it("should handle multi-word positional arguments", () => {
       const loader = new McpPromptLoader(mockConfig);
       const promptArgs: PromptArgument[] = [
-        { name: 'arg1', required: true },
-        { name: 'arg2', required: true },
+        { name: "arg1", required: true },
+        { name: "arg2", required: true },
       ];
-      const userArgs = 'hello world';
+      const userArgs = "hello world";
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ arg1: 'hello', arg2: 'world' });
+      expect(result).toEqual({ arg1: "hello", arg2: "world" });
     });
 
-    it('should handle quoted multi-word positional arguments', () => {
+    it("should handle quoted multi-word positional arguments", () => {
       const loader = new McpPromptLoader(mockConfig);
       const promptArgs: PromptArgument[] = [
-        { name: 'arg1', required: true },
-        { name: 'arg2', required: true },
+        { name: "arg1", required: true },
+        { name: "arg2", required: true },
       ];
       const userArgs = '"hello world" foo';
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ arg1: 'hello world', arg2: 'foo' });
+      expect(result).toEqual({ arg1: "hello world", arg2: "foo" });
     });
 
-    it('should handle a single positional argument with multiple words', () => {
+    it("should handle a single positional argument with multiple words", () => {
       const loader = new McpPromptLoader(mockConfig);
-      const promptArgs: PromptArgument[] = [{ name: 'arg1', required: true }];
-      const userArgs = 'hello world';
+      const promptArgs: PromptArgument[] = [{ name: "arg1", required: true }];
+      const userArgs = "hello world";
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ arg1: 'hello world' });
+      expect(result).toEqual({ arg1: "hello world" });
     });
 
-    it('should handle escaped quotes in positional arguments', () => {
+    it("should handle escaped quotes in positional arguments", () => {
       const loader = new McpPromptLoader(mockConfig);
-      const promptArgs: PromptArgument[] = [{ name: 'arg1', required: true }];
+      const promptArgs: PromptArgument[] = [{ name: "arg1", required: true }];
       const userArgs = '"hello \\"world\\""';
       const result = loader.parseArgs(userArgs, promptArgs);
       expect(result).toEqual({ arg1: 'hello "world"' });
     });
 
-    it('should handle escaped backslashes in positional arguments', () => {
+    it("should handle escaped backslashes in positional arguments", () => {
       const loader = new McpPromptLoader(mockConfig);
-      const promptArgs: PromptArgument[] = [{ name: 'arg1', required: true }];
+      const promptArgs: PromptArgument[] = [{ name: "arg1", required: true }];
       const userArgs = '"hello\\\\world"';
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ arg1: 'hello\\world' });
+      expect(result).toEqual({ arg1: "hello\\world" });
     });
 
-    it('should handle named args followed by positional args', () => {
+    it("should handle named args followed by positional args", () => {
       const loader = new McpPromptLoader(mockConfig);
       const promptArgs: PromptArgument[] = [
-        { name: 'named', required: true },
-        { name: 'pos', required: true },
+        { name: "named", required: true },
+        { name: "pos", required: true },
       ];
       const userArgs = '--named="value" positional';
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ named: 'value', pos: 'positional' });
+      expect(result).toEqual({ named: "value", pos: "positional" });
     });
 
-    it('should handle positional args followed by named args', () => {
+    it("should handle positional args followed by named args", () => {
       const loader = new McpPromptLoader(mockConfig);
       const promptArgs: PromptArgument[] = [
-        { name: 'pos', required: true },
-        { name: 'named', required: true },
+        { name: "pos", required: true },
+        { name: "named", required: true },
       ];
       const userArgs = 'positional --named="value"';
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ pos: 'positional', named: 'value' });
+      expect(result).toEqual({ pos: "positional", named: "value" });
     });
 
-    it('should handle positional args interspersed with named args', () => {
+    it("should handle positional args interspersed with named args", () => {
       const loader = new McpPromptLoader(mockConfig);
       const promptArgs: PromptArgument[] = [
-        { name: 'pos1', required: true },
-        { name: 'named', required: true },
-        { name: 'pos2', required: true },
+        { name: "pos1", required: true },
+        { name: "named", required: true },
+        { name: "pos2", required: true },
       ];
       const userArgs = 'p1 --named="value" p2';
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ pos1: 'p1', named: 'value', pos2: 'p2' });
+      expect(result).toEqual({ pos1: "p1", named: "value", pos2: "p2" });
     });
 
-    it('should treat an escaped quote at the start as a literal', () => {
+    it("should treat an escaped quote at the start as a literal", () => {
       const loader = new McpPromptLoader(mockConfig);
       const promptArgs: PromptArgument[] = [
-        { name: 'arg1', required: true },
-        { name: 'arg2', required: true },
+        { name: "arg1", required: true },
+        { name: "arg2", required: true },
       ];
       const userArgs = '\\"hello world';
       const result = loader.parseArgs(userArgs, promptArgs);
-      expect(result).toEqual({ arg1: '"hello', arg2: 'world' });
+      expect(result).toEqual({ arg1: '"hello', arg2: "world" });
     });
 
-    it('should handle a complex mix of args', () => {
+    it("should handle a complex mix of args", () => {
       const loader = new McpPromptLoader(mockConfig);
       const promptArgs: PromptArgument[] = [
-        { name: 'pos1', required: true },
-        { name: 'named1', required: true },
-        { name: 'pos2', required: true },
-        { name: 'named2', required: true },
-        { name: 'pos3', required: true },
+        { name: "pos1", required: true },
+        { name: "named1", required: true },
+        { name: "pos2", required: true },
+        { name: "named2", required: true },
+        { name: "pos3", required: true },
       ];
       const userArgs =
         'p1 --named1="value 1" "p2 has spaces" --named2=value2 "p3 \\"with quotes\\""';
       const result = loader.parseArgs(userArgs, promptArgs);
       expect(result).toEqual({
-        pos1: 'p1',
-        named1: 'value 1',
-        pos2: 'p2 has spaces',
-        named2: 'value2',
+        pos1: "p1",
+        named1: "value 1",
+        pos2: "p2 has spaces",
+        named2: "value2",
         pos3: 'p3 "with quotes"',
       });
     });
   });
 
-  describe('loadCommands', () => {
+  describe("loadCommands", () => {
     const mockConfigWithPrompts = {
       getMcpClientManager: () => ({
         getMcpServers: () => ({
-          'test-server': { httpUrl: 'https://test-server.com' },
+          "test-server": { httpUrl: "https://test-server.com" },
         }),
       }),
     } as unknown as Config;
 
-    it('should load prompts as slash commands', async () => {
+    it("should load prompts as slash commands", async () => {
       const loader = new McpPromptLoader(mockConfigWithPrompts);
       const commands = await loader.loadCommands(new AbortController().signal);
       expect(commands).toHaveLength(1);
-      expect(commands[0].name).toBe('test-prompt');
-      expect(commands[0].description).toBe('A test prompt.');
+      expect(commands[0].name).toBe("test-prompt");
+      expect(commands[0].description).toBe("A test prompt.");
       expect(commands[0].kind).toBe(CommandKind.MCP_PROMPT);
     });
 
-    it('should sanitize prompt names by replacing spaces with hyphens', async () => {
+    it("should sanitize prompt names by replacing spaces with hyphens", async () => {
       const mockPromptWithSpaces = {
         ...mockPrompt,
-        name: 'Prompt Name',
+        name: "Prompt Name",
       };
-      vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([
-        mockPromptWithSpaces,
-      ]);
+      vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([mockPromptWithSpaces]);
 
       const loader = new McpPromptLoader(mockConfigWithPrompts);
       const commands = await loader.loadCommands(new AbortController().signal);
 
       expect(commands).toHaveLength(1);
-      expect(commands[0].name).toBe('Prompt-Name');
+      expect(commands[0].name).toBe("Prompt-Name");
       expect(commands[0].kind).toBe(CommandKind.MCP_PROMPT);
     });
 
-    it('should trim whitespace from prompt names before sanitizing', async () => {
+    it("should trim whitespace from prompt names before sanitizing", async () => {
       const mockPromptWithWhitespace = {
         ...mockPrompt,
-        name: '  Prompt Name  ',
+        name: "  Prompt Name  ",
       };
-      vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([
-        mockPromptWithWhitespace,
-      ]);
+      vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([mockPromptWithWhitespace]);
 
       const loader = new McpPromptLoader(mockConfigWithPrompts);
       const commands = await loader.loadCommands(new AbortController().signal);
 
       expect(commands).toHaveLength(1);
-      expect(commands[0].name).toBe('Prompt-Name');
+      expect(commands[0].name).toBe("Prompt-Name");
       expect(commands[0].kind).toBe(CommandKind.MCP_PROMPT);
     });
 
-    it('should handle prompt invocation successfully', async () => {
+    it("should handle prompt invocation successfully", async () => {
       const loader = new McpPromptLoader(mockConfigWithPrompts);
       const commands = await loader.loadCommands(new AbortController().signal);
       const action = commands[0].action!;
       const context = {} as CommandContext;
-      const result = await action(context, 'test-name 123 tiger');
+      const result = await action(context, "test-name 123 tiger");
       expect(mockPrompt.invoke).toHaveBeenCalledWith({
-        name: 'test-name',
-        age: '123',
-        species: 'tiger',
+        name: "test-name",
+        age: "123",
+        species: "tiger",
       });
       expect(result).toEqual({
-        type: 'submit_prompt',
-        content: JSON.stringify('Hello, world!'),
+        type: "submit_prompt",
+        content: JSON.stringify("Hello, world!"),
       });
     });
 
-    it('should return an error for missing required arguments', async () => {
+    it("should return an error for missing required arguments", async () => {
       const loader = new McpPromptLoader(mockConfigWithPrompts);
       const commands = await loader.loadCommands(new AbortController().signal);
       const action = commands[0].action!;
       const context = {} as CommandContext;
-      const result = await action(context, 'test-name');
+      const result = await action(context, "test-name");
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Missing required argument(s): --age, --species',
+        type: "message",
+        messageType: "error",
+        content: "Missing required argument(s): --age, --species",
       });
     });
 
-    it('should return an error message if prompt invocation fails', async () => {
-      vi.spyOn(mockPrompt, 'invoke').mockRejectedValue(
-        new Error('Invocation failed!'),
-      );
+    it("should return an error message if prompt invocation fails", async () => {
+      vi.spyOn(mockPrompt, "invoke").mockRejectedValue(new Error("Invocation failed!"));
       const loader = new McpPromptLoader(mockConfigWithPrompts);
       const commands = await loader.loadCommands(new AbortController().signal);
       const action = commands[0].action!;
       const context = {} as CommandContext;
-      const result = await action(context, 'test-name 123 tiger');
+      const result = await action(context, "test-name 123 tiger");
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Error: Invocation failed!',
+        type: "message",
+        messageType: "error",
+        content: "Error: Invocation failed!",
       });
     });
 
-    it('should return an empty array if config is not available', async () => {
+    it("should return an empty array if config is not available", async () => {
       const loader = new McpPromptLoader(null);
       const commands = await loader.loadCommands(new AbortController().signal);
       expect(commands).toEqual([]);
     });
 
-    describe('autoExecute', () => {
-      it('should set autoExecute to true for prompts with no arguments (undefined)', async () => {
-        vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([
+    describe("autoExecute", () => {
+      it("should set autoExecute to true for prompts with no arguments (undefined)", async () => {
+        vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([
           { ...mockPrompt, arguments: undefined },
         ]);
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         expect(commands[0].autoExecute).toBe(true);
       });
 
-      it('should set autoExecute to true for prompts with empty arguments array', async () => {
-        vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([
+      it("should set autoExecute to true for prompts with empty arguments array", async () => {
+        vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([
           { ...mockPrompt, arguments: [] },
         ]);
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         expect(commands[0].autoExecute).toBe(true);
       });
 
-      it('should set autoExecute to false for prompts with only optional arguments', async () => {
-        vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([
+      it("should set autoExecute to false for prompts with only optional arguments", async () => {
+        vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([
           {
             ...mockPrompt,
-            arguments: [{ name: 'optional', required: false }],
+            arguments: [{ name: "optional", required: false }],
           },
         ]);
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         expect(commands[0].autoExecute).toBe(false);
       });
 
-      it('should set autoExecute to false for prompts with required arguments', async () => {
-        vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([
+      it("should set autoExecute to false for prompts with required arguments", async () => {
+        vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([
           {
             ...mockPrompt,
-            arguments: [{ name: 'required', required: true }],
+            arguments: [{ name: "required", required: true }],
           },
         ]);
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         expect(commands[0].autoExecute).toBe(false);
       });
     });
 
-    describe('completion', () => {
-      it('should suggest no arguments when using positional arguments', async () => {
+    describe("completion", () => {
+      it("should suggest no arguments when using positional arguments", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {} as CommandContext;
-        const suggestions = await completion(context, 'test-name 6 tiger');
+        const suggestions = await completion(context, "test-name 6 tiger");
         expect(suggestions).toEqual([]);
       });
 
-      it('should suggest all arguments when none are present', async () => {
+      it("should suggest all arguments when none are present", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {
           invocation: {
-            raw: '/find ',
-            name: 'find',
-            args: '',
+            raw: "/find ",
+            name: "find",
+            args: "",
           },
         } as CommandContext;
-        const suggestions = await completion(context, '');
+        const suggestions = await completion(context, "");
         expect(suggestions).toEqual([
           '--name="',
           '--age="',
@@ -348,32 +330,24 @@ describe('McpPromptLoader', () => {
         ]);
       });
 
-      it('should suggest remaining arguments when some are present', async () => {
+      it("should suggest remaining arguments when some are present", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {
           invocation: {
             raw: '/find --name="test-name" --age="6" ',
-            name: 'find',
+            name: "find",
             args: '--name="test-name" --age="6"',
           },
         } as CommandContext;
-        const suggestions = await completion(context, '');
-        expect(suggestions).toEqual([
-          '--species="',
-          '--enclosure="',
-          '--trail="',
-        ]);
+        const suggestions = await completion(context, "");
+        expect(suggestions).toEqual(['--species="', '--enclosure="', '--trail="']);
       });
 
-      it('should suggest no arguments when all are present', async () => {
+      it("should suggest no arguments when all are present", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {} as CommandContext;
         const suggestions = await completion(
@@ -383,65 +357,57 @@ describe('McpPromptLoader', () => {
         expect(suggestions).toEqual([]);
       });
 
-      it('should suggest nothing for prompts with no arguments', async () => {
+      it("should suggest nothing for prompts with no arguments", async () => {
         // Temporarily override the mock to return a prompt with no args
-        vi.spyOn(cliCore, 'getMCPServerPrompts').mockReturnValue([
+        vi.spyOn(cliCore, "getMCPServerPrompts").mockReturnValue([
           { ...mockPrompt, arguments: [] },
         ]);
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {} as CommandContext;
-        const suggestions = await completion(context, '');
+        const suggestions = await completion(context, "");
         expect(suggestions).toEqual([]);
       });
 
-      it('should suggest arguments matching a partial argument', async () => {
+      it("should suggest arguments matching a partial argument", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {
           invocation: {
-            raw: '/find --s',
-            name: 'find',
-            args: '--s',
+            raw: "/find --s",
+            name: "find",
+            args: "--s",
           },
         } as CommandContext;
-        const suggestions = await completion(context, '--s');
+        const suggestions = await completion(context, "--s");
         expect(suggestions).toEqual(['--species="']);
       });
 
-      it('should suggest arguments even when a partial argument is parsed as a value', async () => {
+      it("should suggest arguments even when a partial argument is parsed as a value", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {
           invocation: {
             raw: '/find --name="test" --a',
-            name: 'find',
+            name: "find",
             args: '--name="test" --a',
           },
         } as CommandContext;
-        const suggestions = await completion(context, '--a');
+        const suggestions = await completion(context, "--a");
         expect(suggestions).toEqual(['--age="']);
       });
 
-      it('should auto-close the quote for a named argument value', async () => {
+      it("should auto-close the quote for a named argument value", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {
           invocation: {
             raw: '/find --name="test',
-            name: 'find',
+            name: "find",
             args: '--name="test',
           },
         } as CommandContext;
@@ -449,16 +415,14 @@ describe('McpPromptLoader', () => {
         expect(suggestions).toEqual(['--name="test"']);
       });
 
-      it('should auto-close the quote for an empty named argument value', async () => {
+      it("should auto-close the quote for an empty named argument value", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {
           invocation: {
             raw: '/find --name="',
-            name: 'find',
+            name: "find",
             args: '--name="',
           },
         } as CommandContext;
@@ -466,16 +430,14 @@ describe('McpPromptLoader', () => {
         expect(suggestions).toEqual(['--name=""']);
       });
 
-      it('should not add a quote if already present', async () => {
+      it("should not add a quote if already present", async () => {
         const loader = new McpPromptLoader(mockConfigWithPrompts);
-        const commands = await loader.loadCommands(
-          new AbortController().signal,
-        );
+        const commands = await loader.loadCommands(new AbortController().signal);
         const completion = commands[0].completion!;
         const context = {
           invocation: {
             raw: '/find --name="test"',
-            name: 'find',
+            name: "find",
             args: '--name="test"',
           },
         } as CommandContext;
diff --git a/packages/ui-gemini/src/services/McpPromptLoader.ts b/packages/ui-gemini/src/services/McpPromptLoader.ts
index 764580b01..a109fcc1a 100644
--- a/packages/ui-gemini/src/services/McpPromptLoader.ts
+++ b/packages/ui-gemini/src/services/McpPromptLoader.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/gemini-cli-core';
-import { getErrorMessage, getMCPServerPrompts } from '@airiscode/gemini-cli-core';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { getErrorMessage, getMCPServerPrompts } from "@airiscode/gemini-cli-core";
+import type { PromptArgument } from "@modelcontextprotocol/sdk/types.js";
 import type {
   CommandContext,
   SlashCommand,
   SlashCommandActionReturn,
-} from '../ui/commands/types.js';
-import { CommandKind } from '../ui/commands/types.js';
-import type { ICommandLoader } from './types.js';
-import type { PromptArgument } from '@modelcontextprotocol/sdk/types.js';
+} from "../ui/commands/types.js";
+import { CommandKind } from "../ui/commands/types.js";
+import type { ICommandLoader } from "./types.js";
 
 /**
  * Discovers and loads executable slash commands from prompts exposed by
@@ -39,7 +39,7 @@ export class McpPromptLoader implements ICommandLoader {
       const prompts = getMCPServerPrompts(this.config, serverName) || [];
       for (const prompt of prompts) {
         // Sanitize prompt names to ensure they are valid slash commands (e.g. "Prompt Name" -> "Prompt-Name")
-        const commandName = `${prompt.name}`.trim().replace(/\s+/g, '-');
+        const commandName = `${prompt.name}`.trim().replace(/\s+/g, "-");
         const newPromptCommand: SlashCommand = {
           name: commandName,
           description: prompt.description || `Invoke prompt ${prompt.name}`,
@@ -47,14 +47,14 @@ export class McpPromptLoader implements ICommandLoader {
           autoExecute: !prompt.arguments || prompt.arguments.length === 0,
           subCommands: [
             {
-              name: 'help',
-              description: 'Show help for this prompt',
+              name: "help",
+              description: "Show help for this prompt",
               kind: CommandKind.MCP_PROMPT,
               action: async (): Promise<SlashCommandActionReturn> => {
                 if (!prompt.arguments || prompt.arguments.length === 0) {
                   return {
-                    type: 'message',
-                    messageType: 'info',
+                    type: "message",
+                    messageType: "info",
                     content: `Prompt "${prompt.name}" has no arguments.`,
                   };
                 }
@@ -69,13 +69,11 @@ export class McpPromptLoader implements ICommandLoader {
                   if (arg.description) {
                     helpMessage += `    ${arg.description}\n`;
                   }
-                  helpMessage += `    (required: ${
-                    arg.required ? 'yes' : 'no'
-                  })\n\n`;
+                  helpMessage += `    (required: ${arg.required ? "yes" : "no"})\n\n`;
                 }
                 return {
-                  type: 'message',
-                  messageType: 'info',
+                  type: "message",
+                  messageType: "info",
                   content: helpMessage,
                 };
               },
@@ -87,80 +85,72 @@ export class McpPromptLoader implements ICommandLoader {
           ): Promise<SlashCommandActionReturn> => {
             if (!this.config) {
               return {
-                type: 'message',
-                messageType: 'error',
-                content: 'Config not loaded.',
+                type: "message",
+                messageType: "error",
+                content: "Config not loaded.",
               };
             }
 
             const promptInputs = this.parseArgs(args, prompt.arguments);
             if (promptInputs instanceof Error) {
               return {
-                type: 'message',
-                messageType: 'error',
+                type: "message",
+                messageType: "error",
                 content: promptInputs.message,
               };
             }
 
             try {
-              const mcpServers =
-                this.config.getMcpClientManager()?.getMcpServers() || {};
+              const mcpServers = this.config.getMcpClientManager()?.getMcpServers() || {};
               const mcpServerConfig = mcpServers[serverName];
               if (!mcpServerConfig) {
                 return {
-                  type: 'message',
-                  messageType: 'error',
+                  type: "message",
+                  messageType: "error",
                   content: `MCP server config not found for '${serverName}'.`,
                 };
               }
               const result = await prompt.invoke(promptInputs);
 
-              if (result['error']) {
+              if (result["error"]) {
                 return {
-                  type: 'message',
-                  messageType: 'error',
-                  content: `Error invoking prompt: ${result['error']}`,
+                  type: "message",
+                  messageType: "error",
+                  content: `Error invoking prompt: ${result["error"]}`,
                 };
               }
 
               const maybeContent = result.messages?.[0]?.content;
-              if (maybeContent.type !== 'text') {
+              if (maybeContent.type !== "text") {
                 return {
-                  type: 'message',
-                  messageType: 'error',
-                  content:
-                    'Received an empty or invalid prompt response from the server.',
+                  type: "message",
+                  messageType: "error",
+                  content: "Received an empty or invalid prompt response from the server.",
                 };
               }
 
               return {
-                type: 'submit_prompt',
+                type: "submit_prompt",
                 content: JSON.stringify(maybeContent.text),
               };
             } catch (error) {
               return {
-                type: 'message',
-                messageType: 'error',
+                type: "message",
+                messageType: "error",
                 content: `Error: ${getErrorMessage(error)}`,
               };
             }
           },
-          completion: async (
-            commandContext: CommandContext,
-            partialArg: string,
-          ) => {
+          completion: async (commandContext: CommandContext, partialArg: string) => {
             const invocation = commandContext.invocation;
             if (!prompt || !prompt.arguments || !invocation) {
               return [];
             }
-            const indexOfFirstSpace = invocation.raw.indexOf(' ') + 1;
+            const indexOfFirstSpace = invocation.raw.indexOf(" ") + 1;
             let promptInputs =
               indexOfFirstSpace === 0
                 ? {}
-                : this.parseArgs(
-                    invocation.raw.substring(indexOfFirstSpace),
-                    prompt.arguments,
-                  );
+                : this.parseArgs(invocation.raw.substring(indexOfFirstSpace), prompt.arguments);
             if (promptInputs instanceof Error) {
               promptInputs = {};
             }
@@ -241,7 +231,7 @@ export class McpPromptLoader implements ICommandLoader {
     while ((match = namedArgRegex.exec(userArgs)) !== null) {
       const key = match[1];
       // Extract the quoted or unquoted argument and remove escape chars.
-      const value = (match[2] ?? match[3]).replace(/\\(.)/g, '$1');
+      const value = (match[2] ?? match[3]).replace(/\\(.)/g, "$1");
       argValues[key] = value;
       // Capture text between matches as potential positional args
       if (match.index > lastIndex) {
@@ -255,13 +245,13 @@ export class McpPromptLoader implements ICommandLoader {
       positionalParts.push(userArgs.substring(lastIndex));
     }
 
-    const positionalArgsString = positionalParts.join('').trim();
+    const positionalArgsString = positionalParts.join("").trim();
     // extracts either quoted strings or non-quoted sequences of non-space characters.
     const positionalArgRegex = /(?:"((?:\\.|[^"\\])*)"|([^ ]+))/g;
     const positionalArgs: string[] = [];
     while ((match = positionalArgRegex.exec(positionalArgsString)) !== null) {
       // Extract the quoted or unquoted argument and remove escape chars.
-      positionalArgs.push((match[1] ?? match[2]).replace(/\\(.)/g, '$1'));
+      positionalArgs.push((match[1] ?? match[2]).replace(/\\(.)/g, "$1"));
     }
 
     if (!promptArgs) {
@@ -273,14 +263,12 @@ export class McpPromptLoader implements ICommandLoader {
       }
     }
 
-    const unfilledArgs = promptArgs.filter(
-      (arg) => arg.required && !promptInputs[arg.name],
-    );
+    const unfilledArgs = promptArgs.filter((arg) => arg.required && !promptInputs[arg.name]);
 
     if (unfilledArgs.length === 1) {
       // If we have only one unfilled arg, we don't require quotes we just
       // join all the given arguments together as if they were quoted.
-      promptInputs[unfilledArgs[0].name] = positionalArgs.join(' ');
+      promptInputs[unfilledArgs[0].name] = positionalArgs.join(" ");
     } else {
       const missingArgs: string[] = [];
       for (let i = 0; i < unfilledArgs.length; i++) {
@@ -291,9 +279,7 @@ export class McpPromptLoader implements ICommandLoader {
         }
       }
       if (missingArgs.length > 0) {
-        const missingArgNames = missingArgs
-          .map((name) => `--${name}`)
-          .join(', ');
+        const missingArgNames = missingArgs.map((name) => `--${name}`).join(", ");
         return new Error(`Missing required argument(s): ${missingArgNames}`);
       }
     }
diff --git a/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.test.ts b/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.test.ts
index 80bde1287..079681377 100644
--- a/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.test.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.test.ts
@@ -4,40 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { DefaultArgumentProcessor } from './argumentProcessor.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { DefaultArgumentProcessor } from "./argumentProcessor.js";
 
-describe('Argument Processors', () => {
-  describe('DefaultArgumentProcessor', () => {
+describe("Argument Processors", () => {
+  describe("DefaultArgumentProcessor", () => {
     const processor = new DefaultArgumentProcessor();
 
-    it('should append the full command if args are provided', async () => {
-      const prompt = [{ text: 'Parse the command.' }];
+    it("should append the full command if args are provided", async () => {
+      const prompt = [{ text: "Parse the command." }];
       const context = createMockCommandContext({
         invocation: {
           raw: '/mycommand arg1 "arg two"',
-          name: 'mycommand',
+          name: "mycommand",
           args: 'arg1 "arg two"',
         },
       });
       const result = await processor.process(prompt, context);
-      expect(result).toEqual([
-        { text: 'Parse the command.\n\n/mycommand arg1 "arg two"' },
-      ]);
+      expect(result).toEqual([{ text: 'Parse the command.\n\n/mycommand arg1 "arg two"' }]);
     });
 
-    it('should NOT append the full command if no args are provided', async () => {
-      const prompt = [{ text: 'Parse the command.' }];
+    it("should NOT append the full command if no args are provided", async () => {
+      const prompt = [{ text: "Parse the command." }];
       const context = createMockCommandContext({
         invocation: {
-          raw: '/mycommand',
-          name: 'mycommand',
-          args: '',
+          raw: "/mycommand",
+          name: "mycommand",
+          args: "",
         },
       });
       const result = await processor.process(prompt, context);
-      expect(result).toEqual([{ text: 'Parse the command.' }]);
+      expect(result).toEqual([{ text: "Parse the command." }]);
     });
   });
 });
diff --git a/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.ts b/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.ts
index b1ea2df62..2dcf0dde8 100644
--- a/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/argumentProcessor.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { appendToLastTextPart } from '@airiscode/gemini-cli-core';
-import type { IPromptProcessor, PromptPipelineContent } from './types.js';
-import type { CommandContext } from '../../ui/commands/types.js';
+import { appendToLastTextPart } from "@airiscode/gemini-cli-core";
+import type { CommandContext } from "../../ui/commands/types.js";
+import type { IPromptProcessor, PromptPipelineContent } from "./types.js";
 
 /**
  * Appends the user's full command invocation to the prompt if arguments are
diff --git a/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.test.ts b/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.test.ts
index 8b4841b3e..5638eae73 100644
--- a/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.test.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { type CommandContext } from '../../ui/commands/types.js';
-import { AtFileProcessor } from './atFileProcessor.js';
-import { MessageType } from '../../ui/types.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import type { PartUnion } from '@google/genai';
+import type { Config } from "@airiscode/gemini-cli-core";
+import type { PartUnion } from "@google/genai";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { type CommandContext } from "../../ui/commands/types.js";
+import { MessageType } from "../../ui/types.js";
+import { AtFileProcessor } from "./atFileProcessor.js";
 
 // Mock the core dependency
 const mockReadPathFromWorkspace = vi.hoisted(() => vi.fn());
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
   const original = await importOriginal<object>();
   return {
     ...original,
@@ -22,7 +22,7 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-describe('AtFileProcessor', () => {
+describe("AtFileProcessor", () => {
   let context: CommandContext;
   let mockConfig: Config;
 
@@ -41,23 +41,21 @@ describe('AtFileProcessor', () => {
 
     // Default mock success behavior: return content wrapped in a text part.
     mockReadPathFromWorkspace.mockImplementation(
-      async (path: string): Promise<PartUnion[]> => [
-        { text: `content of ${path}` },
-      ],
+      async (path: string): Promise<PartUnion[]> => [{ text: `content of ${path}` }],
     );
   });
 
-  it('should not change the prompt if no @{ trigger is present', async () => {
+  it("should not change the prompt if no @{ trigger is present", async () => {
     const processor = new AtFileProcessor();
-    const prompt: PartUnion[] = [{ text: 'This is a simple prompt.' }];
+    const prompt: PartUnion[] = [{ text: "This is a simple prompt." }];
     const result = await processor.process(prompt, context);
     expect(result).toEqual(prompt);
     expect(mockReadPathFromWorkspace).not.toHaveBeenCalled();
   });
 
-  it('should not change the prompt if config service is missing', async () => {
+  it("should not change the prompt if config service is missing", async () => {
     const processor = new AtFileProcessor();
-    const prompt: PartUnion[] = [{ text: 'Analyze @{file.txt}' }];
+    const prompt: PartUnion[] = [{ text: "Analyze @{file.txt}" }];
     const contextWithoutConfig = createMockCommandContext({
       services: {
         config: null,
@@ -68,115 +66,94 @@ describe('AtFileProcessor', () => {
     expect(mockReadPathFromWorkspace).not.toHaveBeenCalled();
   });
 
-  describe('Parsing Logic', () => {
-    it('should replace a single valid @{path/to/file.txt} placeholder', async () => {
+  describe("Parsing Logic", () => {
+    it("should replace a single valid @{path/to/file.txt} placeholder", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [
-        { text: 'Analyze this file: @{path/to/file.txt}' },
-      ];
+      const prompt: PartUnion[] = [{ text: "Analyze this file: @{path/to/file.txt}" }];
       const result = await processor.process(prompt, context);
-      expect(mockReadPathFromWorkspace).toHaveBeenCalledWith(
-        'path/to/file.txt',
-        mockConfig,
-      );
+      expect(mockReadPathFromWorkspace).toHaveBeenCalledWith("path/to/file.txt", mockConfig);
       expect(result).toEqual([
-        { text: 'Analyze this file: ' },
-        { text: 'content of path/to/file.txt' },
+        { text: "Analyze this file: " },
+        { text: "content of path/to/file.txt" },
       ]);
     });
 
-    it('should replace multiple different @{...} placeholders', async () => {
+    it("should replace multiple different @{...} placeholders", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [
-        { text: 'Compare @{file1.js} with @{file2.js}' },
-      ];
+      const prompt: PartUnion[] = [{ text: "Compare @{file1.js} with @{file2.js}" }];
       const result = await processor.process(prompt, context);
       expect(mockReadPathFromWorkspace).toHaveBeenCalledTimes(2);
-      expect(mockReadPathFromWorkspace).toHaveBeenCalledWith(
-        'file1.js',
-        mockConfig,
-      );
-      expect(mockReadPathFromWorkspace).toHaveBeenCalledWith(
-        'file2.js',
-        mockConfig,
-      );
+      expect(mockReadPathFromWorkspace).toHaveBeenCalledWith("file1.js", mockConfig);
+      expect(mockReadPathFromWorkspace).toHaveBeenCalledWith("file2.js", mockConfig);
       expect(result).toEqual([
-        { text: 'Compare ' },
-        { text: 'content of file1.js' },
-        { text: ' with ' },
-        { text: 'content of file2.js' },
+        { text: "Compare " },
+        { text: "content of file1.js" },
+        { text: " with " },
+        { text: "content of file2.js" },
       ]);
     });
 
-    it('should handle placeholders at the beginning, middle, and end', async () => {
+    it("should handle placeholders at the beginning, middle, and end", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [
-        { text: '@{start.txt} in the @{middle.txt} and @{end.txt}' },
-      ];
+      const prompt: PartUnion[] = [{ text: "@{start.txt} in the @{middle.txt} and @{end.txt}" }];
       const result = await processor.process(prompt, context);
       expect(result).toEqual([
-        { text: 'content of start.txt' },
-        { text: ' in the ' },
-        { text: 'content of middle.txt' },
-        { text: ' and ' },
-        { text: 'content of end.txt' },
+        { text: "content of start.txt" },
+        { text: " in the " },
+        { text: "content of middle.txt" },
+        { text: " and " },
+        { text: "content of end.txt" },
       ]);
     });
 
-    it('should correctly parse paths that contain balanced braces', async () => {
+    it("should correctly parse paths that contain balanced braces", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [
-        { text: 'Analyze @{path/with/{braces}/file.txt}' },
-      ];
+      const prompt: PartUnion[] = [{ text: "Analyze @{path/with/{braces}/file.txt}" }];
       const result = await processor.process(prompt, context);
       expect(mockReadPathFromWorkspace).toHaveBeenCalledWith(
-        'path/with/{braces}/file.txt',
+        "path/with/{braces}/file.txt",
         mockConfig,
       );
       expect(result).toEqual([
-        { text: 'Analyze ' },
-        { text: 'content of path/with/{braces}/file.txt' },
+        { text: "Analyze " },
+        { text: "content of path/with/{braces}/file.txt" },
       ]);
     });
 
-    it('should throw an error if the prompt contains an unclosed trigger', async () => {
+    it("should throw an error if the prompt contains an unclosed trigger", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [{ text: 'Hello @{world' }];
+      const prompt: PartUnion[] = [{ text: "Hello @{world" }];
       // The new parser throws an error for unclosed injections.
-      await expect(processor.process(prompt, context)).rejects.toThrow(
-        /Unclosed injection/,
-      );
+      await expect(processor.process(prompt, context)).rejects.toThrow(/Unclosed injection/);
     });
   });
 
-  describe('Integration and Error Handling', () => {
-    it('should leave the placeholder unmodified if readPathFromWorkspace throws', async () => {
+  describe("Integration and Error Handling", () => {
+    it("should leave the placeholder unmodified if readPathFromWorkspace throws", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [
-        { text: 'Analyze @{not-found.txt} and @{good-file.txt}' },
-      ];
+      const prompt: PartUnion[] = [{ text: "Analyze @{not-found.txt} and @{good-file.txt}" }];
       mockReadPathFromWorkspace.mockImplementation(async (path: string) => {
-        if (path === 'not-found.txt') {
-          throw new Error('File not found');
+        if (path === "not-found.txt") {
+          throw new Error("File not found");
         }
         return [{ text: `content of ${path}` }];
       });
 
       const result = await processor.process(prompt, context);
       expect(result).toEqual([
-        { text: 'Analyze ' },
-        { text: '@{not-found.txt}' }, // Placeholder is preserved as a text part
-        { text: ' and ' },
-        { text: 'content of good-file.txt' },
+        { text: "Analyze " },
+        { text: "@{not-found.txt}" }, // Placeholder is preserved as a text part
+        { text: " and " },
+        { text: "content of good-file.txt" },
       ]);
     });
   });
 
-  describe('UI Feedback', () => {
-    it('should call ui.addItem with an ERROR on failure', async () => {
+  describe("UI Feedback", () => {
+    it("should call ui.addItem with an ERROR on failure", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [{ text: 'Analyze @{bad-file.txt}' }];
-      mockReadPathFromWorkspace.mockRejectedValue(new Error('Access denied'));
+      const prompt: PartUnion[] = [{ text: "Analyze @{bad-file.txt}" }];
+      mockReadPathFromWorkspace.mockRejectedValue(new Error("Access denied"));
 
       await processor.process(prompt, context);
 
@@ -190,16 +167,16 @@ describe('AtFileProcessor', () => {
       );
     });
 
-    it('should call ui.addItem with a WARNING if the file was ignored', async () => {
+    it("should call ui.addItem with a WARNING if the file was ignored", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [{ text: 'Analyze @{ignored.txt}' }];
+      const prompt: PartUnion[] = [{ text: "Analyze @{ignored.txt}" }];
       // Simulate an ignored file by returning an empty array.
       mockReadPathFromWorkspace.mockResolvedValue([]);
 
       const result = await processor.process(prompt, context);
 
       // The placeholder should be removed, resulting in only the prefix.
-      expect(result).toEqual([{ text: 'Analyze ' }]);
+      expect(result).toEqual([{ text: "Analyze " }]);
 
       expect(context.ui.addItem).toHaveBeenCalledTimes(1);
       expect(context.ui.addItem).toHaveBeenCalledWith(
@@ -211,9 +188,9 @@ describe('AtFileProcessor', () => {
       );
     });
 
-    it('should NOT call ui.addItem on success', async () => {
+    it("should NOT call ui.addItem on success", async () => {
       const processor = new AtFileProcessor();
-      const prompt: PartUnion[] = [{ text: 'Analyze @{good-file.txt}' }];
+      const prompt: PartUnion[] = [{ text: "Analyze @{good-file.txt}" }];
       await processor.process(prompt, context);
       expect(context.ui.addItem).not.toHaveBeenCalled();
     });
diff --git a/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.ts b/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.ts
index 9172d7168..ea6854983 100644
--- a/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/atFileProcessor.ts
@@ -4,19 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  debugLogger,
-  flatMapTextParts,
-  readPathFromWorkspace,
-} from '@airiscode/gemini-cli-core';
-import type { CommandContext } from '../../ui/commands/types.js';
-import { MessageType } from '../../ui/types.js';
+import { debugLogger, flatMapTextParts, readPathFromWorkspace } from "@airiscode/gemini-cli-core";
+import type { CommandContext } from "../../ui/commands/types.js";
+import { MessageType } from "../../ui/types.js";
+import { extractInjections } from "./injectionParser.js";
 import {
   AT_FILE_INJECTION_TRIGGER,
   type IPromptProcessor,
   type PromptPipelineContent,
-} from './types.js';
-import { extractInjections } from './injectionParser.js';
+} from "./types.js";
 
 export class AtFileProcessor implements IPromptProcessor {
   constructor(private readonly commandName?: string) {}
@@ -35,11 +31,7 @@ export class AtFileProcessor implements IPromptProcessor {
         return [{ text }];
       }
 
-      const injections = extractInjections(
-        text,
-        AT_FILE_INJECTION_TRIGGER,
-        this.commandName,
-      );
+      const injections = extractInjections(text, AT_FILE_INJECTION_TRIGGER, this.commandName);
       if (injections.length === 0) {
         return [{ text }];
       }
@@ -58,30 +50,20 @@ export class AtFileProcessor implements IPromptProcessor {
           const fileContentParts = await readPathFromWorkspace(pathStr, config);
           if (fileContentParts.length === 0) {
             const uiMessage = `File '@{${pathStr}}' was ignored by .gitignore or .geminiignore and was not included in the prompt.`;
-            context.ui.addItem(
-              { type: MessageType.INFO, text: uiMessage },
-              Date.now(),
-            );
+            context.ui.addItem({ type: MessageType.INFO, text: uiMessage }, Date.now());
           }
           output.push(...fileContentParts);
         } catch (error) {
-          const message =
-            error instanceof Error ? error.message : String(error);
+          const message = error instanceof Error ? error.message : String(error);
           const uiMessage = `Failed to inject content for '@{${pathStr}}': ${message}`;
 
           // `context.invocation` should always be present at this point.
           debugLogger.error(
             `Error while loading custom command (${context.invocation!.name}) ${uiMessage}. Leaving placeholder in prompt.`,
           );
-          context.ui.addItem(
-            { type: MessageType.ERROR, text: uiMessage },
-            Date.now(),
-          );
+          context.ui.addItem({ type: MessageType.ERROR, text: uiMessage }, Date.now());
 
-          const placeholder = text.substring(
-            injection.startIndex,
-            injection.endIndex,
-          );
+          const placeholder = text.substring(injection.startIndex, injection.endIndex);
           output.push({ text: placeholder });
         }
         lastIndex = injection.endIndex;
diff --git a/packages/ui-gemini/src/services/prompt-processors/injectionParser.test.ts b/packages/ui-gemini/src/services/prompt-processors/injectionParser.test.ts
index 5ce0f8f79..d0d6d2f2a 100644
--- a/packages/ui-gemini/src/services/prompt-processors/injectionParser.test.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/injectionParser.test.ts
@@ -4,54 +4,54 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { extractInjections } from './injectionParser.js';
+import { describe, expect, it } from "vitest";
+import { extractInjections } from "./injectionParser.js";
 
-describe('extractInjections', () => {
-  const SHELL_TRIGGER = '!{';
-  const AT_FILE_TRIGGER = '@{';
+describe("extractInjections", () => {
+  const SHELL_TRIGGER = "!{";
+  const AT_FILE_TRIGGER = "@{";
 
-  describe('Basic Functionality', () => {
-    it('should return an empty array if no trigger is present', () => {
-      const prompt = 'This is a simple prompt without injections.';
+  describe("Basic Functionality", () => {
+    it("should return an empty array if no trigger is present", () => {
+      const prompt = "This is a simple prompt without injections.";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toEqual([]);
     });
 
-    it('should extract a single, simple injection', () => {
-      const prompt = 'Run this command: !{ls -la}';
+    it("should extract a single, simple injection", () => {
+      const prompt = "Run this command: !{ls -la}";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toEqual([
         {
-          content: 'ls -la',
+          content: "ls -la",
           startIndex: 18,
           endIndex: 27,
         },
       ]);
     });
 
-    it('should extract multiple injections', () => {
-      const prompt = 'First: !{cmd1}, Second: !{cmd2}';
+    it("should extract multiple injections", () => {
+      const prompt = "First: !{cmd1}, Second: !{cmd2}";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toHaveLength(2);
       expect(result[0]).toEqual({
-        content: 'cmd1',
+        content: "cmd1",
         startIndex: 7,
         endIndex: 14,
       });
       expect(result[1]).toEqual({
-        content: 'cmd2',
+        content: "cmd2",
         startIndex: 24,
         endIndex: 31,
       });
     });
 
-    it('should handle different triggers (e.g., @{)', () => {
-      const prompt = 'Read this file: @{path/to/file.txt}';
+    it("should handle different triggers (e.g., @{)", () => {
+      const prompt = "Read this file: @{path/to/file.txt}";
       const result = extractInjections(prompt, AT_FILE_TRIGGER);
       expect(result).toEqual([
         {
-          content: 'path/to/file.txt',
+          content: "path/to/file.txt",
           startIndex: 16,
           endIndex: 35,
         },
@@ -59,80 +59,80 @@ describe('extractInjections', () => {
     });
   });
 
-  describe('Positioning and Edge Cases', () => {
-    it('should handle injections at the start and end of the prompt', () => {
-      const prompt = '!{start} middle text !{end}';
+  describe("Positioning and Edge Cases", () => {
+    it("should handle injections at the start and end of the prompt", () => {
+      const prompt = "!{start} middle text !{end}";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toHaveLength(2);
       expect(result[0]).toEqual({
-        content: 'start',
+        content: "start",
         startIndex: 0,
         endIndex: 8,
       });
       expect(result[1]).toEqual({
-        content: 'end',
+        content: "end",
         startIndex: 21,
         endIndex: 27,
       });
     });
 
-    it('should handle adjacent injections', () => {
-      const prompt = '!{A}!{B}';
+    it("should handle adjacent injections", () => {
+      const prompt = "!{A}!{B}";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toHaveLength(2);
-      expect(result[0]).toEqual({ content: 'A', startIndex: 0, endIndex: 4 });
-      expect(result[1]).toEqual({ content: 'B', startIndex: 4, endIndex: 8 });
+      expect(result[0]).toEqual({ content: "A", startIndex: 0, endIndex: 4 });
+      expect(result[1]).toEqual({ content: "B", startIndex: 4, endIndex: 8 });
     });
 
-    it('should handle empty injections', () => {
-      const prompt = 'Empty: !{}';
+    it("should handle empty injections", () => {
+      const prompt = "Empty: !{}";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toEqual([
         {
-          content: '',
+          content: "",
           startIndex: 7,
           endIndex: 10,
         },
       ]);
     });
 
-    it('should trim whitespace within the content', () => {
-      const prompt = '!{  \n command with space  \t }';
+    it("should trim whitespace within the content", () => {
+      const prompt = "!{  \n command with space  \t }";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toEqual([
         {
-          content: 'command with space',
+          content: "command with space",
           startIndex: 0,
           endIndex: 29,
         },
       ]);
     });
 
-    it('should ignore similar patterns that are not the exact trigger', () => {
-      const prompt = 'Not a trigger: !(cmd) or {cmd} or ! {cmd}';
+    it("should ignore similar patterns that are not the exact trigger", () => {
+      const prompt = "Not a trigger: !(cmd) or {cmd} or ! {cmd}";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toEqual([]);
     });
 
-    it('should ignore extra closing braces before the trigger', () => {
-      const prompt = 'Ignore this } then !{run}';
+    it("should ignore extra closing braces before the trigger", () => {
+      const prompt = "Ignore this } then !{run}";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toEqual([
         {
-          content: 'run',
+          content: "run",
           startIndex: 19,
           endIndex: 25,
         },
       ]);
     });
 
-    it('should stop parsing at the first balanced closing brace (non-greedy)', () => {
+    it("should stop parsing at the first balanced closing brace (non-greedy)", () => {
       // This tests that the parser doesn't greedily consume extra closing braces
-      const prompt = 'Run !{ls -l}} extra braces';
+      const prompt = "Run !{ls -l}} extra braces";
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toEqual([
         {
-          content: 'ls -l',
+          content: "ls -l",
           startIndex: 4,
           endIndex: 12,
         },
@@ -140,22 +140,22 @@ describe('extractInjections', () => {
     });
   });
 
-  describe('Nested Braces (Balanced)', () => {
-    it('should correctly parse content with simple nested braces (e.g., JSON)', () => {
+  describe("Nested Braces (Balanced)", () => {
+    it("should correctly parse content with simple nested braces (e.g., JSON)", () => {
       const prompt = `Send JSON: !{curl -d '{"key": "value"}'}`;
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toHaveLength(1);
       expect(result[0].content).toBe(`curl -d '{"key": "value"}'`);
     });
 
-    it('should correctly parse content with shell constructs (e.g., awk)', () => {
+    it("should correctly parse content with shell constructs (e.g., awk)", () => {
       const prompt = `Process text: !{awk '{print $1}' file.txt}`;
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toHaveLength(1);
       expect(result[0].content).toBe(`awk '{print $1}' file.txt`);
     });
 
-    it('should correctly parse multiple levels of nesting', () => {
+    it("should correctly parse multiple levels of nesting", () => {
       const prompt = `!{level1 {level2 {level3}} suffix}`;
       const result = extractInjections(prompt, SHELL_TRIGGER);
       expect(result).toHaveLength(1);
@@ -163,14 +163,14 @@ describe('extractInjections', () => {
       expect(result[0].endIndex).toBe(prompt.length);
     });
 
-    it('should correctly parse paths containing balanced braces', () => {
-      const prompt = 'Analyze @{path/with/{braces}/file.txt}';
+    it("should correctly parse paths containing balanced braces", () => {
+      const prompt = "Analyze @{path/with/{braces}/file.txt}";
       const result = extractInjections(prompt, AT_FILE_TRIGGER);
       expect(result).toHaveLength(1);
-      expect(result[0].content).toBe('path/with/{braces}/file.txt');
+      expect(result[0].content).toBe("path/with/{braces}/file.txt");
     });
 
-    it('should correctly handle an injection containing the trigger itself', () => {
+    it("should correctly handle an injection containing the trigger itself", () => {
       // This works because the parser counts braces, it doesn't look for the trigger again until the current one is closed.
       const prompt = '!{echo "The trigger is !{ confusing }"}';
       const expectedContent = 'echo "The trigger is !{ confusing }"';
@@ -180,41 +180,39 @@ describe('extractInjections', () => {
     });
   });
 
-  describe('Error Handling (Unbalanced/Unclosed)', () => {
-    it('should throw an error for a simple unclosed injection', () => {
-      const prompt = 'This prompt has !{an unclosed trigger';
+  describe("Error Handling (Unbalanced/Unclosed)", () => {
+    it("should throw an error for a simple unclosed injection", () => {
+      const prompt = "This prompt has !{an unclosed trigger";
       expect(() => extractInjections(prompt, SHELL_TRIGGER)).toThrow(
         /Invalid syntax: Unclosed injection starting at index 16 \('!{'\)/,
       );
     });
 
-    it('should throw an error if the prompt ends inside a nested block', () => {
-      const prompt = 'This fails: !{outer {inner';
+    it("should throw an error if the prompt ends inside a nested block", () => {
+      const prompt = "This fails: !{outer {inner";
       expect(() => extractInjections(prompt, SHELL_TRIGGER)).toThrow(
         /Invalid syntax: Unclosed injection starting at index 12 \('!{'\)/,
       );
     });
 
-    it('should include the context name in the error message if provided', () => {
-      const prompt = 'Failing !{command';
-      const contextName = 'test-command';
-      expect(() =>
-        extractInjections(prompt, SHELL_TRIGGER, contextName),
-      ).toThrow(
+    it("should include the context name in the error message if provided", () => {
+      const prompt = "Failing !{command";
+      const contextName = "test-command";
+      expect(() => extractInjections(prompt, SHELL_TRIGGER, contextName)).toThrow(
         /Invalid syntax in command 'test-command': Unclosed injection starting at index 8/,
       );
     });
 
-    it('should throw if content contains unbalanced braces (e.g., missing closing)', () => {
+    it("should throw if content contains unbalanced braces (e.g., missing closing)", () => {
       // This is functionally the same as an unclosed injection from the parser's perspective.
-      const prompt = 'Analyze @{path/with/braces{example.txt}';
+      const prompt = "Analyze @{path/with/braces{example.txt}";
       expect(() => extractInjections(prompt, AT_FILE_TRIGGER)).toThrow(
         /Invalid syntax: Unclosed injection starting at index 8 \('@{'\)/,
       );
     });
 
-    it('should clearly state that unbalanced braces in content are not supported in the error', () => {
-      const prompt = 'Analyze @{path/with/braces{example.txt}';
+    it("should clearly state that unbalanced braces in content are not supported in the error", () => {
+      const prompt = "Analyze @{path/with/braces{example.txt}";
       expect(() => extractInjections(prompt, AT_FILE_TRIGGER)).toThrow(
         /Paths or commands with unbalanced braces are not supported directly/,
       );
diff --git a/packages/ui-gemini/src/services/prompt-processors/injectionParser.ts b/packages/ui-gemini/src/services/prompt-processors/injectionParser.ts
index 52d3226db..b31e9f7c3 100644
--- a/packages/ui-gemini/src/services/prompt-processors/injectionParser.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/injectionParser.ts
@@ -50,15 +50,12 @@ export function extractInjections(
     while (currentIndex < prompt.length) {
       const char = prompt[currentIndex];
 
-      if (char === '{') {
+      if (char === "{") {
         braceCount++;
-      } else if (char === '}') {
+      } else if (char === "}") {
         braceCount--;
         if (braceCount === 0) {
-          const injectionContent = prompt.substring(
-            startIndex + trigger.length,
-            currentIndex,
-          );
+          const injectionContent = prompt.substring(startIndex + trigger.length, currentIndex);
           const endIndex = currentIndex + 1;
 
           injections.push({
@@ -77,7 +74,7 @@ export function extractInjections(
 
     // Check if the inner loop finished without finding the closing brace.
     if (!foundEnd) {
-      const contextInfo = contextName ? ` in command '${contextName}'` : '';
+      const contextInfo = contextName ? ` in command '${contextName}'` : "";
       // Enforce strict parsing (Comment 1) and clarify limitations (Comment 2).
       throw new Error(
         `Invalid syntax${contextInfo}: Unclosed injection starting at index ${startIndex} ('${trigger}'). Ensure braces are balanced. Paths or commands with unbalanced braces are not supported directly.`,
diff --git a/packages/ui-gemini/src/services/prompt-processors/shellProcessor.test.ts b/packages/ui-gemini/src/services/prompt-processors/shellProcessor.test.ts
index a073db908..496a26461 100644
--- a/packages/ui-gemini/src/services/prompt-processors/shellProcessor.test.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/shellProcessor.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi, type Mock } from 'vitest';
-import { ConfirmationRequiredError, ShellProcessor } from './shellProcessor.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import type { CommandContext } from '../../ui/commands/types.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { ApprovalMode, getShellConfiguration } from '@airiscode/gemini-cli-core';
-import { quote } from 'shell-quote';
-import { createPartFromText } from '@google/genai';
-import type { PromptPipelineContent } from './types.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { ApprovalMode, getShellConfiguration } from "@airiscode/gemini-cli-core";
+import { createPartFromText } from "@google/genai";
+import { quote } from "shell-quote";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import type { CommandContext } from "../../ui/commands/types.js";
+import { ConfirmationRequiredError, ShellProcessor } from "./shellProcessor.js";
+import type { PromptPipelineContent } from "./types.js";
 
 // Helper function to determine the expected escaped string based on the current OS,
 // mirroring the logic in the actual `escapeShellArg` implementation.
@@ -20,11 +20,11 @@ function getExpectedEscapedArgForPlatform(arg: string): string {
   const { shell } = getShellConfiguration();
 
   switch (shell) {
-    case 'powershell':
+    case "powershell":
       return `'${arg.replace(/'/g, "''")}'`;
-    case 'cmd':
+    case "cmd":
       return `"${arg.replace(/"/g, '""')}"`;
-    case 'bash':
+    case "bash":
     default:
       return quote([arg]);
   }
@@ -38,7 +38,7 @@ function createPromptPipelineContent(text: string): PromptPipelineContent {
 const mockCheckCommandPermissions = vi.hoisted(() => vi.fn());
 const mockShellExecute = vi.hoisted(() => vi.fn());
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
   const original = await importOriginal<object>();
   return {
     ...original,
@@ -50,14 +50,14 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
 });
 
 const SUCCESS_RESULT = {
-  output: 'default shell output',
+  output: "default shell output",
   exitCode: 0,
   error: null,
   aborted: false,
   signal: null,
 };
 
-describe('ShellProcessor', () => {
+describe("ShellProcessor", () => {
   let context: CommandContext;
   let mockConfig: Partial<Config>;
 
@@ -65,7 +65,7 @@ describe('ShellProcessor', () => {
     vi.clearAllMocks();
 
     mockConfig = {
-      getTargetDir: vi.fn().mockReturnValue('/test/dir'),
+      getTargetDir: vi.fn().mockReturnValue("/test/dir"),
       getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
       getEnableInteractiveShell: vi.fn().mockReturnValue(false),
       getShellExecutionConfig: vi.fn().mockReturnValue({}),
@@ -73,9 +73,9 @@ describe('ShellProcessor', () => {
 
     context = createMockCommandContext({
       invocation: {
-        raw: '/cmd default args',
-        name: 'cmd',
-        args: 'default args',
+        raw: "/cmd default args",
+        name: "cmd",
+        args: "default args",
       },
       services: {
         config: mockConfig as Config,
@@ -95,66 +95,64 @@ describe('ShellProcessor', () => {
     });
   });
 
-  it('should throw an error if config is missing', async () => {
-    const processor = new ShellProcessor('test-command');
-    const prompt: PromptPipelineContent = createPromptPipelineContent('!{ls}');
+  it("should throw an error if config is missing", async () => {
+    const processor = new ShellProcessor("test-command");
+    const prompt: PromptPipelineContent = createPromptPipelineContent("!{ls}");
     const contextWithoutConfig = createMockCommandContext({
       services: {
         config: null,
       },
     });
 
-    await expect(
-      processor.process(prompt, contextWithoutConfig),
-    ).rejects.toThrow(/Security configuration not loaded/);
+    await expect(processor.process(prompt, contextWithoutConfig)).rejects.toThrow(
+      /Security configuration not loaded/,
+    );
   });
 
-  it('should not change the prompt if no shell injections are present', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should not change the prompt if no shell injections are present", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'This is a simple prompt with no injections.',
+      "This is a simple prompt with no injections.",
     );
     const result = await processor.process(prompt, context);
     expect(result).toEqual(prompt);
     expect(mockShellExecute).not.toHaveBeenCalled();
   });
 
-  it('should process a single valid shell injection if allowed', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should process a single valid shell injection if allowed", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'The current status is: !{git status}',
+      "The current status is: !{git status}",
     );
     mockCheckCommandPermissions.mockReturnValue({
       allAllowed: true,
       disallowedCommands: [],
     });
     mockShellExecute.mockReturnValue({
-      result: Promise.resolve({ ...SUCCESS_RESULT, output: 'On branch main' }),
+      result: Promise.resolve({ ...SUCCESS_RESULT, output: "On branch main" }),
     });
 
     const result = await processor.process(prompt, context);
 
     expect(mockCheckCommandPermissions).toHaveBeenCalledWith(
-      'git status',
+      "git status",
       expect.any(Object),
       context.session.sessionShellAllowlist,
     );
     expect(mockShellExecute).toHaveBeenCalledWith(
-      'git status',
+      "git status",
       expect.any(String),
       expect.any(Function),
       expect.any(Object),
       false,
       expect.any(Object),
     );
-    expect(result).toEqual([{ text: 'The current status is: On branch main' }]);
+    expect(result).toEqual([{ text: "The current status is: On branch main" }]);
   });
 
-  it('should process multiple valid shell injections if all are allowed', async () => {
-    const processor = new ShellProcessor('test-command');
-    const prompt: PromptPipelineContent = createPromptPipelineContent(
-      '!{git status} in !{pwd}',
-    );
+  it("should process multiple valid shell injections if all are allowed", async () => {
+    const processor = new ShellProcessor("test-command");
+    const prompt: PromptPipelineContent = createPromptPipelineContent("!{git status} in !{pwd}");
     mockCheckCommandPermissions.mockReturnValue({
       allAllowed: true,
       disallowedCommands: [],
@@ -164,74 +162,72 @@ describe('ShellProcessor', () => {
       .mockReturnValueOnce({
         result: Promise.resolve({
           ...SUCCESS_RESULT,
-          output: 'On branch main',
+          output: "On branch main",
         }),
       })
       .mockReturnValueOnce({
-        result: Promise.resolve({ ...SUCCESS_RESULT, output: '/usr/home' }),
+        result: Promise.resolve({ ...SUCCESS_RESULT, output: "/usr/home" }),
       });
 
     const result = await processor.process(prompt, context);
 
     expect(mockCheckCommandPermissions).toHaveBeenCalledTimes(2);
     expect(mockShellExecute).toHaveBeenCalledTimes(2);
-    expect(result).toEqual([{ text: 'On branch main in /usr/home' }]);
+    expect(result).toEqual([{ text: "On branch main in /usr/home" }]);
   });
 
-  it('should throw ConfirmationRequiredError if a command is not allowed in default mode', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should throw ConfirmationRequiredError if a command is not allowed in default mode", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'Do something dangerous: !{rm -rf /}',
+      "Do something dangerous: !{rm -rf /}",
     );
     mockCheckCommandPermissions.mockReturnValue({
       allAllowed: false,
-      disallowedCommands: ['rm -rf /'],
+      disallowedCommands: ["rm -rf /"],
     });
 
-    await expect(processor.process(prompt, context)).rejects.toThrow(
-      ConfirmationRequiredError,
-    );
+    await expect(processor.process(prompt, context)).rejects.toThrow(ConfirmationRequiredError);
   });
 
-  it('should NOT throw ConfirmationRequiredError if a command is not allowed but approval mode is YOLO', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should NOT throw ConfirmationRequiredError if a command is not allowed but approval mode is YOLO", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'Do something dangerous: !{rm -rf /}',
+      "Do something dangerous: !{rm -rf /}",
     );
     mockCheckCommandPermissions.mockReturnValue({
       allAllowed: false,
-      disallowedCommands: ['rm -rf /'],
+      disallowedCommands: ["rm -rf /"],
     });
     // Override the approval mode for this test
     (mockConfig.getApprovalMode as Mock).mockReturnValue(ApprovalMode.YOLO);
     mockShellExecute.mockReturnValue({
-      result: Promise.resolve({ ...SUCCESS_RESULT, output: 'deleted' }),
+      result: Promise.resolve({ ...SUCCESS_RESULT, output: "deleted" }),
     });
 
     const result = await processor.process(prompt, context);
 
     // It should proceed with execution
     expect(mockShellExecute).toHaveBeenCalledWith(
-      'rm -rf /',
+      "rm -rf /",
       expect.any(String),
       expect.any(Function),
       expect.any(Object),
       false,
       expect.any(Object),
     );
-    expect(result).toEqual([{ text: 'Do something dangerous: deleted' }]);
+    expect(result).toEqual([{ text: "Do something dangerous: deleted" }]);
   });
 
-  it('should still throw an error for a hard-denied command even in YOLO mode', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should still throw an error for a hard-denied command even in YOLO mode", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'Do something forbidden: !{reboot}',
+      "Do something forbidden: !{reboot}",
     );
     mockCheckCommandPermissions.mockReturnValue({
       allAllowed: false,
-      disallowedCommands: ['reboot'],
+      disallowedCommands: ["reboot"],
       isHardDenial: true, // This is the key difference
-      blockReason: 'System commands are blocked',
+      blockReason: "System commands are blocked",
     });
     // Set approval mode to YOLO
     (mockConfig.getApprovalMode as Mock).mockReturnValue(ApprovalMode.YOLO);
@@ -244,14 +240,14 @@ describe('ShellProcessor', () => {
     expect(mockShellExecute).not.toHaveBeenCalled();
   });
 
-  it('should throw ConfirmationRequiredError with the correct command', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should throw ConfirmationRequiredError with the correct command", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'Do something dangerous: !{rm -rf /}',
+      "Do something dangerous: !{rm -rf /}",
     );
     mockCheckCommandPermissions.mockReturnValue({
       allAllowed: false,
-      disallowedCommands: ['rm -rf /'],
+      disallowedCommands: ["rm -rf /"],
     });
 
     try {
@@ -261,24 +257,22 @@ describe('ShellProcessor', () => {
     } catch (e) {
       expect(e).toBeInstanceOf(ConfirmationRequiredError);
       if (e instanceof ConfirmationRequiredError) {
-        expect(e.commandsToConfirm).toEqual(['rm -rf /']);
+        expect(e.commandsToConfirm).toEqual(["rm -rf /"]);
       }
     }
 
     expect(mockShellExecute).not.toHaveBeenCalled();
   });
 
-  it('should throw ConfirmationRequiredError with multiple commands if multiple are disallowed', async () => {
-    const processor = new ShellProcessor('test-command');
-    const prompt: PromptPipelineContent = createPromptPipelineContent(
-      '!{cmd1} and !{cmd2}',
-    );
+  it("should throw ConfirmationRequiredError with multiple commands if multiple are disallowed", async () => {
+    const processor = new ShellProcessor("test-command");
+    const prompt: PromptPipelineContent = createPromptPipelineContent("!{cmd1} and !{cmd2}");
     mockCheckCommandPermissions.mockImplementation((cmd) => {
-      if (cmd === 'cmd1') {
-        return { allAllowed: false, disallowedCommands: ['cmd1'] };
+      if (cmd === "cmd1") {
+        return { allAllowed: false, disallowedCommands: ["cmd1"] };
       }
-      if (cmd === 'cmd2') {
-        return { allAllowed: false, disallowedCommands: ['cmd2'] };
+      if (cmd === "cmd2") {
+        return { allAllowed: false, disallowedCommands: ["cmd2"] };
       }
       return { allAllowed: true, disallowedCommands: [] };
     });
@@ -290,62 +284,58 @@ describe('ShellProcessor', () => {
     } catch (e) {
       expect(e).toBeInstanceOf(ConfirmationRequiredError);
       if (e instanceof ConfirmationRequiredError) {
-        expect(e.commandsToConfirm).toEqual(['cmd1', 'cmd2']);
+        expect(e.commandsToConfirm).toEqual(["cmd1", "cmd2"]);
       }
     }
   });
 
-  it('should not execute any commands if at least one requires confirmation', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should not execute any commands if at least one requires confirmation", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
       'First: !{echo "hello"}, Second: !{rm -rf /}',
     );
 
     mockCheckCommandPermissions.mockImplementation((cmd) => {
-      if (cmd.includes('rm')) {
+      if (cmd.includes("rm")) {
         return { allAllowed: false, disallowedCommands: [cmd] };
       }
       return { allAllowed: true, disallowedCommands: [] };
     });
 
-    await expect(processor.process(prompt, context)).rejects.toThrow(
-      ConfirmationRequiredError,
-    );
+    await expect(processor.process(prompt, context)).rejects.toThrow(ConfirmationRequiredError);
 
     // Ensure no commands were executed because the pipeline was halted.
     expect(mockShellExecute).not.toHaveBeenCalled();
   });
 
-  it('should only request confirmation for disallowed commands in a mixed prompt', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should only request confirmation for disallowed commands in a mixed prompt", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'Allowed: !{ls -l}, Disallowed: !{rm -rf /}',
+      "Allowed: !{ls -l}, Disallowed: !{rm -rf /}",
     );
 
     mockCheckCommandPermissions.mockImplementation((cmd) => ({
-      allAllowed: !cmd.includes('rm'),
-      disallowedCommands: cmd.includes('rm') ? [cmd] : [],
+      allAllowed: !cmd.includes("rm"),
+      disallowedCommands: cmd.includes("rm") ? [cmd] : [],
     }));
 
     try {
       await processor.process(prompt, context);
-      expect.fail('Should have thrown ConfirmationRequiredError');
+      expect.fail("Should have thrown ConfirmationRequiredError");
     } catch (e) {
       expect(e).toBeInstanceOf(ConfirmationRequiredError);
       if (e instanceof ConfirmationRequiredError) {
-        expect(e.commandsToConfirm).toEqual(['rm -rf /']);
+        expect(e.commandsToConfirm).toEqual(["rm -rf /"]);
       }
     }
   });
 
-  it('should execute all commands if they are on the session allowlist', async () => {
-    const processor = new ShellProcessor('test-command');
-    const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'Run !{cmd1} and !{cmd2}',
-    );
+  it("should execute all commands if they are on the session allowlist", async () => {
+    const processor = new ShellProcessor("test-command");
+    const prompt: PromptPipelineContent = createPromptPipelineContent("Run !{cmd1} and !{cmd2}");
 
     // Add commands to the session allowlist
-    context.session.sessionShellAllowlist = new Set(['cmd1', 'cmd2']);
+    context.session.sessionShellAllowlist = new Set(["cmd1", "cmd2"]);
 
     // checkCommandPermissions should now pass for these
     mockCheckCommandPermissions.mockReturnValue({
@@ -355,32 +345,32 @@ describe('ShellProcessor', () => {
 
     mockShellExecute
       .mockReturnValueOnce({
-        result: Promise.resolve({ ...SUCCESS_RESULT, output: 'output1' }),
+        result: Promise.resolve({ ...SUCCESS_RESULT, output: "output1" }),
       })
       .mockReturnValueOnce({
-        result: Promise.resolve({ ...SUCCESS_RESULT, output: 'output2' }),
+        result: Promise.resolve({ ...SUCCESS_RESULT, output: "output2" }),
       });
 
     const result = await processor.process(prompt, context);
 
     expect(mockCheckCommandPermissions).toHaveBeenCalledWith(
-      'cmd1',
+      "cmd1",
       expect.any(Object),
       context.session.sessionShellAllowlist,
     );
     expect(mockCheckCommandPermissions).toHaveBeenCalledWith(
-      'cmd2',
+      "cmd2",
       expect.any(Object),
       context.session.sessionShellAllowlist,
     );
     expect(mockShellExecute).toHaveBeenCalledTimes(2);
-    expect(result).toEqual([{ text: 'Run output1 and output2' }]);
+    expect(result).toEqual([{ text: "Run output1 and output2" }]);
   });
 
-  it('should trim whitespace from the command inside the injection before interpolation', async () => {
-    const processor = new ShellProcessor('test-command');
+  it("should trim whitespace from the command inside the injection before interpolation", async () => {
+    const processor = new ShellProcessor("test-command");
     const prompt: PromptPipelineContent = createPromptPipelineContent(
-      'Files: !{  ls {{args}} -l  }',
+      "Files: !{  ls {{args}} -l  }",
     );
 
     const rawArgs = context.invocation!.args;
@@ -394,7 +384,7 @@ describe('ShellProcessor', () => {
       disallowedCommands: [],
     });
     mockShellExecute.mockReturnValue({
-      result: Promise.resolve({ ...SUCCESS_RESULT, output: 'total 0' }),
+      result: Promise.resolve({ ...SUCCESS_RESULT, output: "total 0" }),
     });
 
     await processor.process(prompt, context);
@@ -414,10 +404,9 @@ describe('ShellProcessor', () => {
     );
   });
 
-  it('should handle an empty command inside the injection gracefully (skips execution)', async () => {
-    const processor = new ShellProcessor('test-command');
-    const prompt: PromptPipelineContent =
-      createPromptPipelineContent('This is weird: !{}');
+  it("should handle an empty command inside the injection gracefully (skips execution)", async () => {
+    const processor = new ShellProcessor("test-command");
+    const prompt: PromptPipelineContent = createPromptPipelineContent("This is weird: !{}");
 
     const result = await processor.process(prompt, context);
 
@@ -425,19 +414,18 @@ describe('ShellProcessor', () => {
     expect(mockShellExecute).not.toHaveBeenCalled();
 
     // It replaces !{} with an empty string.
-    expect(result).toEqual([{ text: 'This is weird: ' }]);
+    expect(result).toEqual([{ text: "This is weird: " }]);
   });
 
-  describe('Error Reporting', () => {
-    it('should append exit code and command name on failure', async () => {
-      const processor = new ShellProcessor('test-command');
-      const prompt: PromptPipelineContent =
-        createPromptPipelineContent('!{cmd}');
+  describe("Error Reporting", () => {
+    it("should append exit code and command name on failure", async () => {
+      const processor = new ShellProcessor("test-command");
+      const prompt: PromptPipelineContent = createPromptPipelineContent("!{cmd}");
       mockShellExecute.mockReturnValue({
         result: Promise.resolve({
           ...SUCCESS_RESULT,
-          output: 'some error output',
-          stderr: '',
+          output: "some error output",
+          stderr: "",
           exitCode: 1,
         }),
       });
@@ -451,17 +439,16 @@ describe('ShellProcessor', () => {
       ]);
     });
 
-    it('should append signal info and command name if terminated by signal', async () => {
-      const processor = new ShellProcessor('test-command');
-      const prompt: PromptPipelineContent =
-        createPromptPipelineContent('!{cmd}');
+    it("should append signal info and command name if terminated by signal", async () => {
+      const processor = new ShellProcessor("test-command");
+      const prompt: PromptPipelineContent = createPromptPipelineContent("!{cmd}");
       mockShellExecute.mockReturnValue({
         result: Promise.resolve({
           ...SUCCESS_RESULT,
-          output: 'output',
-          stderr: '',
+          output: "output",
+          stderr: "",
           exitCode: null,
-          signal: 'SIGTERM',
+          signal: "SIGTERM",
         }),
       });
 
@@ -474,16 +461,15 @@ describe('ShellProcessor', () => {
       ]);
     });
 
-    it('should throw a detailed error if the shell fails to spawn', async () => {
-      const processor = new ShellProcessor('test-command');
-      const prompt: PromptPipelineContent =
-        createPromptPipelineContent('!{bad-command}');
-      const spawnError = new Error('spawn EACCES');
+    it("should throw a detailed error if the shell fails to spawn", async () => {
+      const processor = new ShellProcessor("test-command");
+      const prompt: PromptPipelineContent = createPromptPipelineContent("!{bad-command}");
+      const spawnError = new Error("spawn EACCES");
       mockShellExecute.mockReturnValue({
         result: Promise.resolve({
           ...SUCCESS_RESULT,
-          stdout: '',
-          stderr: '',
+          stdout: "",
+          stderr: "",
           exitCode: null,
           error: spawnError,
           aborted: false,
@@ -495,17 +481,15 @@ describe('ShellProcessor', () => {
       );
     });
 
-    it('should report abort status with command name if aborted', async () => {
-      const processor = new ShellProcessor('test-command');
-      const prompt: PromptPipelineContent = createPromptPipelineContent(
-        '!{long-running-command}',
-      );
-      const spawnError = new Error('Aborted');
+    it("should report abort status with command name if aborted", async () => {
+      const processor = new ShellProcessor("test-command");
+      const prompt: PromptPipelineContent = createPromptPipelineContent("!{long-running-command}");
+      const spawnError = new Error("Aborted");
       mockShellExecute.mockReturnValue({
         result: Promise.resolve({
           ...SUCCESS_RESULT,
-          output: 'partial output',
-          stderr: '',
+          output: "partial output",
+          stderr: "",
           exitCode: null,
           error: spawnError,
           aborted: true, // Key difference
@@ -521,19 +505,17 @@ describe('ShellProcessor', () => {
     });
   });
 
-  describe('Context-Aware Argument Interpolation ({{args}})', () => {
-    const rawArgs = 'user input';
+  describe("Context-Aware Argument Interpolation ({{args}})", () => {
+    const rawArgs = "user input";
 
     beforeEach(() => {
       // Update context for these tests to use specific arguments
       context.invocation!.args = rawArgs;
     });
 
-    it('should perform raw replacement if no shell injections are present (optimization path)', async () => {
-      const processor = new ShellProcessor('test-command');
-      const prompt: PromptPipelineContent = createPromptPipelineContent(
-        'The user said: {{args}}',
-      );
+    it("should perform raw replacement if no shell injections are present (optimization path)", async () => {
+      const processor = new ShellProcessor("test-command");
+      const prompt: PromptPipelineContent = createPromptPipelineContent("The user said: {{args}}");
 
       const result = await processor.process(prompt, context);
 
@@ -541,13 +523,13 @@ describe('ShellProcessor', () => {
       expect(mockShellExecute).not.toHaveBeenCalled();
     });
 
-    it('should perform raw replacement outside !{} blocks', async () => {
-      const processor = new ShellProcessor('test-command');
+    it("should perform raw replacement outside !{} blocks", async () => {
+      const processor = new ShellProcessor("test-command");
       const prompt: PromptPipelineContent = createPromptPipelineContent(
         'Outside: {{args}}. Inside: !{echo "hello"}',
       );
       mockShellExecute.mockReturnValue({
-        result: Promise.resolve({ ...SUCCESS_RESULT, output: 'hello' }),
+        result: Promise.resolve({ ...SUCCESS_RESULT, output: "hello" }),
       });
 
       const result = await processor.process(prompt, context);
@@ -555,13 +537,13 @@ describe('ShellProcessor', () => {
       expect(result).toEqual([{ text: `Outside: ${rawArgs}. Inside: hello` }]);
     });
 
-    it('should perform escaped replacement inside !{} blocks', async () => {
-      const processor = new ShellProcessor('test-command');
+    it("should perform escaped replacement inside !{} blocks", async () => {
+      const processor = new ShellProcessor("test-command");
       const prompt: PromptPipelineContent = createPromptPipelineContent(
-        'Command: !{grep {{args}} file.txt}',
+        "Command: !{grep {{args}} file.txt}",
       );
       mockShellExecute.mockReturnValue({
-        result: Promise.resolve({ ...SUCCESS_RESULT, output: 'match found' }),
+        result: Promise.resolve({ ...SUCCESS_RESULT, output: "match found" }),
       });
 
       const result = await processor.process(prompt, context);
@@ -578,16 +560,16 @@ describe('ShellProcessor', () => {
         expect.any(Object),
       );
 
-      expect(result).toEqual([{ text: 'Command: match found' }]);
+      expect(result).toEqual([{ text: "Command: match found" }]);
     });
 
-    it('should handle both raw (outside) and escaped (inside) injection simultaneously', async () => {
-      const processor = new ShellProcessor('test-command');
+    it("should handle both raw (outside) and escaped (inside) injection simultaneously", async () => {
+      const processor = new ShellProcessor("test-command");
       const prompt: PromptPipelineContent = createPromptPipelineContent(
         'User "({{args}})" requested search: !{search {{args}}}',
       );
       mockShellExecute.mockReturnValue({
-        result: Promise.resolve({ ...SUCCESS_RESULT, output: 'results' }),
+        result: Promise.resolve({ ...SUCCESS_RESULT, output: "results" }),
       });
 
       const result = await processor.process(prompt, context);
@@ -603,15 +585,12 @@ describe('ShellProcessor', () => {
         expect.any(Object),
       );
 
-      expect(result).toEqual([
-        { text: `User "(${rawArgs})" requested search: results` },
-      ]);
+      expect(result).toEqual([{ text: `User "(${rawArgs})" requested search: results` }]);
     });
 
-    it('should perform security checks on the final, resolved (escaped) command', async () => {
-      const processor = new ShellProcessor('test-command');
-      const prompt: PromptPipelineContent =
-        createPromptPipelineContent('!{rm {{args}}}');
+    it("should perform security checks on the final, resolved (escaped) command", async () => {
+      const processor = new ShellProcessor("test-command");
+      const prompt: PromptPipelineContent = createPromptPipelineContent("!{rm {{args}}}");
 
       const expectedEscapedArgs = getExpectedEscapedArgForPlatform(rawArgs);
       const expectedResolvedCommand = `rm ${expectedEscapedArgs}`;
@@ -621,9 +600,7 @@ describe('ShellProcessor', () => {
         isHardDenial: false,
       });
 
-      await expect(processor.process(prompt, context)).rejects.toThrow(
-        ConfirmationRequiredError,
-      );
+      await expect(processor.process(prompt, context)).rejects.toThrow(ConfirmationRequiredError);
 
       expect(mockCheckCommandPermissions).toHaveBeenCalledWith(
         expectedResolvedCommand,
@@ -632,17 +609,16 @@ describe('ShellProcessor', () => {
       );
     });
 
-    it('should report the resolved command if a hard denial occurs', async () => {
-      const processor = new ShellProcessor('test-command');
-      const prompt: PromptPipelineContent =
-        createPromptPipelineContent('!{rm {{args}}}');
+    it("should report the resolved command if a hard denial occurs", async () => {
+      const processor = new ShellProcessor("test-command");
+      const prompt: PromptPipelineContent = createPromptPipelineContent("!{rm {{args}}}");
       const expectedEscapedArgs = getExpectedEscapedArgForPlatform(rawArgs);
       const expectedResolvedCommand = `rm ${expectedEscapedArgs}`;
       mockCheckCommandPermissions.mockReturnValue({
         allAllowed: false,
         disallowedCommands: [expectedResolvedCommand],
         isHardDenial: true,
-        blockReason: 'It is forbidden.',
+        blockReason: "It is forbidden.",
       });
 
       await expect(processor.process(prompt, context)).rejects.toThrow(
@@ -650,17 +626,16 @@ describe('ShellProcessor', () => {
       );
     });
   });
-  describe('Real-World Escaping Scenarios', () => {
-    it('should correctly handle multiline arguments', async () => {
-      const processor = new ShellProcessor('test-command');
-      const multilineArgs = 'first line\nsecond line';
+  describe("Real-World Escaping Scenarios", () => {
+    it("should correctly handle multiline arguments", async () => {
+      const processor = new ShellProcessor("test-command");
+      const multilineArgs = "first line\nsecond line";
       context.invocation!.args = multilineArgs;
       const prompt: PromptPipelineContent = createPromptPipelineContent(
-        'Commit message: !{git commit -m {{args}}}',
+        "Commit message: !{git commit -m {{args}}}",
       );
 
-      const expectedEscapedArgs =
-        getExpectedEscapedArgForPlatform(multilineArgs);
+      const expectedEscapedArgs = getExpectedEscapedArgForPlatform(multilineArgs);
       const expectedCommand = `git commit -m ${expectedEscapedArgs}`;
 
       await processor.process(prompt, context);
@@ -676,19 +651,18 @@ describe('ShellProcessor', () => {
     });
 
     it.each([
-      { name: 'spaces', input: 'file with spaces.txt' },
-      { name: 'double quotes', input: 'a "quoted" string' },
-      { name: 'single quotes', input: "it's a string" },
-      { name: 'command substitution (backticks)', input: '`reboot`' },
-      { name: 'command substitution (dollar)', input: '$(reboot)' },
-      { name: 'variable expansion', input: '$HOME' },
-      { name: 'command chaining (semicolon)', input: 'a; reboot' },
-      { name: 'command chaining (ampersand)', input: 'a && reboot' },
-    ])('should safely escape args containing $name', async ({ input }) => {
-      const processor = new ShellProcessor('test-command');
+      { name: "spaces", input: "file with spaces.txt" },
+      { name: "double quotes", input: 'a "quoted" string' },
+      { name: "single quotes", input: "it's a string" },
+      { name: "command substitution (backticks)", input: "`reboot`" },
+      { name: "command substitution (dollar)", input: "$(reboot)" },
+      { name: "variable expansion", input: "$HOME" },
+      { name: "command chaining (semicolon)", input: "a; reboot" },
+      { name: "command chaining (ampersand)", input: "a && reboot" },
+    ])("should safely escape args containing $name", async ({ input }) => {
+      const processor = new ShellProcessor("test-command");
       context.invocation!.args = input;
-      const prompt: PromptPipelineContent =
-        createPromptPipelineContent('!{echo {{args}}}');
+      const prompt: PromptPipelineContent = createPromptPipelineContent("!{echo {{args}}}");
 
       const expectedEscapedArgs = getExpectedEscapedArgForPlatform(input);
       const expectedCommand = `echo ${expectedEscapedArgs}`;
diff --git a/packages/ui-gemini/src/services/prompt-processors/shellProcessor.ts b/packages/ui-gemini/src/services/prompt-processors/shellProcessor.ts
index dc533a17a..ef3c6cf7f 100644
--- a/packages/ui-gemini/src/services/prompt-processors/shellProcessor.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/shellProcessor.ts
@@ -8,19 +8,16 @@ import {
   ApprovalMode,
   checkCommandPermissions,
   escapeShellArg,
+  flatMapTextParts,
   getShellConfiguration,
   ShellExecutionService,
-  flatMapTextParts,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
 
-import type { CommandContext } from '../../ui/commands/types.js';
-import type { IPromptProcessor, PromptPipelineContent } from './types.js';
-import {
-  SHELL_INJECTION_TRIGGER,
-  SHORTHAND_ARGS_PLACEHOLDER,
-} from './types.js';
-import { extractInjections, type Injection } from './injectionParser.js';
-import { themeManager } from '../../ui/themes/theme-manager.js';
+import type { CommandContext } from "../../ui/commands/types.js";
+import { themeManager } from "../../ui/themes/theme-manager.js";
+import { extractInjections, type Injection } from "./injectionParser.js";
+import type { IPromptProcessor, PromptPipelineContent } from "./types.js";
+import { SHELL_INJECTION_TRIGGER, SHORTHAND_ARGS_PLACEHOLDER } from "./types.js";
 
 export class ConfirmationRequiredError extends Error {
   constructor(
@@ -28,7 +25,7 @@ export class ConfirmationRequiredError extends Error {
     public commandsToConfirm: string[],
   ) {
     super(message);
-    this.name = 'ConfirmationRequiredError';
+    this.name = "ConfirmationRequiredError";
   }
 }
 
@@ -58,21 +55,17 @@ export class ShellProcessor implements IPromptProcessor {
     prompt: PromptPipelineContent,
     context: CommandContext,
   ): Promise<PromptPipelineContent> {
-    return flatMapTextParts(prompt, (text) =>
-      this.processString(text, context),
-    );
+    return flatMapTextParts(prompt, (text) => this.processString(text, context));
   }
 
   private async processString(
     prompt: string,
     context: CommandContext,
   ): Promise<PromptPipelineContent> {
-    const userArgsRaw = context.invocation?.args || '';
+    const userArgsRaw = context.invocation?.args || "";
 
     if (!prompt.includes(SHELL_INJECTION_TRIGGER)) {
-      return [
-        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) },
-      ];
+      return [{ text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }];
     }
 
     const config = context.services.config;
@@ -83,37 +76,26 @@ export class ShellProcessor implements IPromptProcessor {
     }
     const { sessionShellAllowlist } = context.session;
 
-    const injections = extractInjections(
-      prompt,
-      SHELL_INJECTION_TRIGGER,
-      this.commandName,
-    );
+    const injections = extractInjections(prompt, SHELL_INJECTION_TRIGGER, this.commandName);
 
     // If extractInjections found no closed blocks (and didn't throw), treat as raw.
     if (injections.length === 0) {
-      return [
-        { text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) },
-      ];
+      return [{ text: prompt.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw) }];
     }
 
     const { shell } = getShellConfiguration();
     const userArgsEscaped = escapeShellArg(userArgsRaw, shell);
 
-    const resolvedInjections: ResolvedShellInjection[] = injections.map(
-      (injection) => {
-        const command = injection.content;
+    const resolvedInjections: ResolvedShellInjection[] = injections.map((injection) => {
+      const command = injection.content;
 
-        if (command === '') {
-          return { ...injection, resolvedCommand: undefined };
-        }
+      if (command === "") {
+        return { ...injection, resolvedCommand: undefined };
+      }
 
-        const resolvedCommand = command.replaceAll(
-          SHORTHAND_ARGS_PLACEHOLDER,
-          userArgsEscaped,
-        );
-        return { ...injection, resolvedCommand };
-      },
-    );
+      const resolvedCommand = command.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsEscaped);
+      return { ...injection, resolvedCommand };
+    });
 
     const commandsToConfirm = new Set<string>();
     for (const injection of resolvedInjections) {
@@ -122,13 +104,16 @@ export class ShellProcessor implements IPromptProcessor {
       if (!command) continue;
 
       // Security check on the final, escaped command string.
-      const { allAllowed, disallowedCommands, blockReason, isHardDenial } =
-        checkCommandPermissions(command, config, sessionShellAllowlist);
+      const { allAllowed, disallowedCommands, blockReason, isHardDenial } = checkCommandPermissions(
+        command,
+        config,
+        sessionShellAllowlist,
+      );
 
       if (!allAllowed) {
         if (isHardDenial) {
           throw new Error(
-            `${this.commandName} cannot be run. Blocked command: "${command}". Reason: ${blockReason || 'Blocked by configuration.'}`,
+            `${this.commandName} cannot be run. Blocked command: "${command}". Reason: ${blockReason || "Blocked by configuration."}`,
           );
         }
 
@@ -142,21 +127,18 @@ export class ShellProcessor implements IPromptProcessor {
     // Handle confirmation requirements.
     if (commandsToConfirm.size > 0) {
       throw new ConfirmationRequiredError(
-        'Shell command confirmation required',
+        "Shell command confirmation required",
         Array.from(commandsToConfirm),
       );
     }
 
-    let processedPrompt = '';
+    let processedPrompt = "";
     let lastIndex = 0;
 
     for (const injection of resolvedInjections) {
       // Append the text segment BEFORE the injection, substituting {{args}} with RAW input.
       const segment = prompt.substring(lastIndex, injection.startIndex);
-      processedPrompt += segment.replaceAll(
-        SHORTHAND_ARGS_PLACEHOLDER,
-        userArgsRaw,
-      );
+      processedPrompt += segment.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
 
       // Execute the resolved command (which already has ESCAPED input).
       if (injection.resolvedCommand) {
@@ -190,10 +172,7 @@ export class ShellProcessor implements IPromptProcessor {
         // Append a status message if the command did not succeed.
         if (executionResult.aborted) {
           processedPrompt += `\n[Shell command '${injection.resolvedCommand}' aborted]`;
-        } else if (
-          executionResult.exitCode !== 0 &&
-          executionResult.exitCode !== null
-        ) {
+        } else if (executionResult.exitCode !== 0 && executionResult.exitCode !== null) {
           processedPrompt += `\n[Shell command '${injection.resolvedCommand}' exited with code ${executionResult.exitCode}]`;
         } else if (executionResult.signal !== null) {
           processedPrompt += `\n[Shell command '${injection.resolvedCommand}' terminated by signal ${executionResult.signal}]`;
@@ -205,10 +184,7 @@ export class ShellProcessor implements IPromptProcessor {
 
     // Append the remaining text AFTER the last injection, substituting {{args}} with RAW input.
     const finalSegment = prompt.substring(lastIndex);
-    processedPrompt += finalSegment.replaceAll(
-      SHORTHAND_ARGS_PLACEHOLDER,
-      userArgsRaw,
-    );
+    processedPrompt += finalSegment.replaceAll(SHORTHAND_ARGS_PLACEHOLDER, userArgsRaw);
 
     return [{ text: processedPrompt }];
   }
diff --git a/packages/ui-gemini/src/services/prompt-processors/types.ts b/packages/ui-gemini/src/services/prompt-processors/types.ts
index c68765744..f9af6ac40 100644
--- a/packages/ui-gemini/src/services/prompt-processors/types.ts
+++ b/packages/ui-gemini/src/services/prompt-processors/types.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandContext } from '../../ui/commands/types.js';
-import type { PartUnion } from '@google/genai';
+import type { PartUnion } from "@google/genai";
+import type { CommandContext } from "../../ui/commands/types.js";
 
 /**
  * Defines the input/output type for prompt processors.
@@ -30,10 +30,7 @@ export interface IPromptProcessor {
    * @returns A promise that resolves to the transformed prompt string, which
    *   will be passed to the next processor or, if it's the last one, sent to the model.
    */
-  process(
-    prompt: PromptPipelineContent,
-    context: CommandContext,
-  ): Promise<PromptPipelineContent>;
+  process(prompt: PromptPipelineContent, context: CommandContext): Promise<PromptPipelineContent>;
 }
 
 /**
@@ -41,14 +38,14 @@ export interface IPromptProcessor {
  * When used outside of !{...}, arguments are injected raw.
  * When used inside !{...}, arguments are shell-escaped.
  */
-export const SHORTHAND_ARGS_PLACEHOLDER = '{{args}}';
+export const SHORTHAND_ARGS_PLACEHOLDER = "{{args}}";
 
 /**
  * The trigger string for shell command injection in custom commands.
  */
-export const SHELL_INJECTION_TRIGGER = '!{';
+export const SHELL_INJECTION_TRIGGER = "!{";
 
 /**
  * The trigger string for at file injection in custom commands.
  */
-export const AT_FILE_INJECTION_TRIGGER = '@{';
+export const AT_FILE_INJECTION_TRIGGER = "@{";
diff --git a/packages/ui-gemini/src/services/types.ts b/packages/ui-gemini/src/services/types.ts
index 13a87687e..824d8e7e0 100644
--- a/packages/ui-gemini/src/services/types.ts
+++ b/packages/ui-gemini/src/services/types.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from '../ui/commands/types.js';
+import type { SlashCommand } from "../ui/commands/types.js";
 
 /**
  * Defines the contract for any class that can load and provide slash commands.
diff --git a/packages/ui-gemini/src/test-utils/async.ts b/packages/ui-gemini/src/test-utils/async.ts
index ad34cb581..d900ee88e 100644
--- a/packages/ui-gemini/src/test-utils/async.ts
+++ b/packages/ui-gemini/src/test-utils/async.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
+import { act } from "react";
 
 // The waitFor from vitest doesn't properly wrap in act(), so we have to
 // implement our own like the one in @testing-library/react
diff --git a/packages/ui-gemini/src/test-utils/createExtension.ts b/packages/ui-gemini/src/test-utils/createExtension.ts
index 536ee3491..ada4b36c6 100644
--- a/packages/ui-gemini/src/test-utils/createExtension.ts
+++ b/packages/ui-gemini/src/test-utils/createExtension.ts
@@ -4,22 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import {
-  type MCPServerConfig,
-  type ExtensionInstallMetadata,
-} from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { type ExtensionInstallMetadata, type MCPServerConfig } from "@airiscode/gemini-cli-core";
+import type { ExtensionSetting } from "../config/extensions/extensionSettings.js";
 import {
   EXTENSIONS_CONFIG_FILENAME,
   INSTALL_METADATA_FILENAME,
-} from '../config/extensions/variables.js';
-import type { ExtensionSetting } from '../config/extensions/extensionSettings.js';
+} from "../config/extensions/variables.js";
 
 export function createExtension({
-  extensionsDir = 'extensions-dir',
-  name = 'my-extension',
-  version = '1.0.0',
+  extensionsDir = "extensions-dir",
+  name = "my-extension",
+  version = "1.0.0",
   addContextFile = false,
   contextFileName = undefined as string | undefined,
   mcpServers = {} as Record<string, MCPServerConfig>,
@@ -34,18 +31,15 @@ export function createExtension({
   );
 
   if (addContextFile) {
-    fs.writeFileSync(path.join(extDir, 'GEMINI.md'), 'context');
+    fs.writeFileSync(path.join(extDir, "GEMINI.md"), "context");
   }
 
   if (contextFileName) {
-    fs.writeFileSync(path.join(extDir, contextFileName), 'context');
+    fs.writeFileSync(path.join(extDir, contextFileName), "context");
   }
 
   if (installMetadata) {
-    fs.writeFileSync(
-      path.join(extDir, INSTALL_METADATA_FILENAME),
-      JSON.stringify(installMetadata),
-    );
+    fs.writeFileSync(path.join(extDir, INSTALL_METADATA_FILENAME), JSON.stringify(installMetadata));
   }
   return extDir;
 }
diff --git a/packages/ui-gemini/src/test-utils/customMatchers.ts b/packages/ui-gemini/src/test-utils/customMatchers.ts
index 2a1b275ad..8e1d54784 100644
--- a/packages/ui-gemini/src/test-utils/customMatchers.ts
+++ b/packages/ui-gemini/src/test-utils/customMatchers.ts
@@ -12,9 +12,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Assertion } from 'vitest';
-import { expect } from 'vitest';
-import type { TextBuffer } from '../ui/components/shared/text-buffer.js';
+import type { Assertion } from "vitest";
+import { expect } from "vitest";
+import type { TextBuffer } from "../ui/components/shared/text-buffer.js";
 
 // RegExp to detect invalid characters: backspace, and ANSI escape codes
 // eslint-disable-next-line no-control-regex
@@ -28,7 +28,7 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
 
   for (let i = 0; i < buffer.lines.length; i++) {
     const line = buffer.lines[i];
-    if (line.includes('\n')) {
+    if (line.includes("\n")) {
       pass = false;
       invalidLines.push({ line: i, content: line });
       break; // Fail fast on newlines
@@ -42,11 +42,11 @@ function toHaveOnlyValidCharacters(this: Assertion, buffer: TextBuffer) {
   return {
     pass,
     message: () =>
-      `Expected buffer ${isNot ? 'not ' : ''}to have only valid characters, but found invalid characters in lines:\n${invalidLines
+      `Expected buffer ${isNot ? "not " : ""}to have only valid characters, but found invalid characters in lines:\n${invalidLines
         .map((l) => `  [${l.line}]: "${l.content}"`) /* This line was changed */
-        .join('\n')}`,
+        .join("\n")}`,
     actual: buffer.lines,
-    expected: 'Lines with no line breaks, backspaces, or escape codes.',
+    expected: "Lines with no line breaks, backspaces, or escape codes.",
   };
 }
 
@@ -56,7 +56,7 @@ expect.extend({
 } as any);
 
 // Extend Vitest's `expect` interface with the custom matcher's type definition.
-declare module 'vitest' {
+declare module "vitest" {
   interface Assertion<T> {
     toHaveOnlyValidCharacters(): T;
   }
diff --git a/packages/ui-gemini/src/test-utils/mockCommandContext.test.ts b/packages/ui-gemini/src/test-utils/mockCommandContext.test.ts
index 310bf7486..27aa16421 100644
--- a/packages/ui-gemini/src/test-utils/mockCommandContext.test.ts
+++ b/packages/ui-gemini/src/test-utils/mockCommandContext.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect } from 'vitest';
-import { createMockCommandContext } from './mockCommandContext.js';
+import { describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "./mockCommandContext.js";
 
-describe('createMockCommandContext', () => {
-  it('should return a valid CommandContext object with default mocks', () => {
+describe("createMockCommandContext", () => {
+  it("should return a valid CommandContext object with default mocks", () => {
     const context = createMockCommandContext();
 
     // Just a few spot checks to ensure the structure is correct
@@ -18,7 +18,7 @@ describe('createMockCommandContext', () => {
     expect(vi.isMockFunction(context.ui.addItem)).toBe(true);
   });
 
-  it('should apply top-level overrides correctly', () => {
+  it("should apply top-level overrides correctly", () => {
     const mockClear = vi.fn();
     const overrides = {
       ui: {
@@ -37,11 +37,11 @@ describe('createMockCommandContext', () => {
     expect(vi.isMockFunction(context.ui.addItem)).toBe(true);
   });
 
-  it('should apply deeply nested overrides correctly', () => {
+  it("should apply deeply nested overrides correctly", () => {
     // This is the most important test for factory's logic.
     const mockConfig = {
-      getProjectRoot: () => '/test/project',
-      getModel: () => 'gemini-pro',
+      getProjectRoot: () => "/test/project",
+      getModel: () => "gemini-pro",
     };
 
     const overrides = {
@@ -53,8 +53,8 @@ describe('createMockCommandContext', () => {
     const context = createMockCommandContext(overrides);
 
     expect(context.services.config).toBeDefined();
-    expect(context.services.config?.getModel()).toBe('gemini-pro');
-    expect(context.services.config?.getProjectRoot()).toBe('/test/project');
+    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();
diff --git a/packages/ui-gemini/src/test-utils/mockCommandContext.ts b/packages/ui-gemini/src/test-utils/mockCommandContext.ts
index e26b8e6aa..e4b3458eb 100644
--- a/packages/ui-gemini/src/test-utils/mockCommandContext.ts
+++ b/packages/ui-gemini/src/test-utils/mockCommandContext.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import type { CommandContext } from '../ui/commands/types.js';
-import type { LoadedSettings } from '../config/settings.js';
-import type { GitService } from '@airiscode/gemini-cli-core';
-import type { SessionStatsState } from '../ui/contexts/SessionContext.js';
+import type { GitService } from "@airiscode/gemini-cli-core";
+import { vi } from "vitest";
+import type { LoadedSettings } from "../config/settings.js";
+import type { CommandContext } from "../ui/commands/types.js";
+import type { SessionStatsState } from "../ui/contexts/SessionContext.js";
 
 // A utility type to make all properties of an object, and its nested objects, partial.
 type DeepPartial<T> = T extends object
@@ -29,9 +29,9 @@ export const createMockCommandContext = (
 ): CommandContext => {
   const defaultMocks: CommandContext = {
     invocation: {
-      raw: '',
-      name: '',
-      args: '',
+      raw: "",
+      name: "",
+      args: "",
     },
     services: {
       config: null,
@@ -83,14 +83,14 @@ export const createMockCommandContext = (
     const output = { ...target };
 
     for (const key in source) {
-      if (Object.prototype.hasOwnProperty.call(source, key)) {
+      if (Object.hasOwn(source, key)) {
         const sourceValue = source[key];
         const targetValue = output[key];
 
         if (
           // We only want to recursively merge plain objects
-          Object.prototype.toString.call(sourceValue) === '[object Object]' &&
-          Object.prototype.toString.call(targetValue) === '[object Object]'
+          Object.prototype.toString.call(sourceValue) === "[object Object]" &&
+          Object.prototype.toString.call(targetValue) === "[object Object]"
         ) {
           output[key] = merge(targetValue, sourceValue);
         } else {
diff --git a/packages/ui-gemini/src/test-utils/render.test.tsx b/packages/ui-gemini/src/test-utils/render.test.tsx
index fcf6f5ec0..36f99a33e 100644
--- a/packages/ui-gemini/src/test-utils/render.test.tsx
+++ b/packages/ui-gemini/src/test-utils/render.test.tsx
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { useState, useEffect } from 'react';
-import { Text } from 'ink';
-import { renderHook, render } from './render.js';
-import { waitFor } from './async.js';
-
-describe('render', () => {
-  it('should render a component', () => {
+import { Text } from "ink";
+import { useEffect, useState } from "react";
+import { describe, expect, it, vi } from "vitest";
+import { waitFor } from "./async.js";
+import { render, renderHook } from "./render.js";
+
+describe("render", () => {
+  it("should render a component", () => {
     const { lastFrame } = render(<Text>Hello World</Text>);
-    expect(lastFrame()).toBe('Hello World');
+    expect(lastFrame()).toBe("Hello World");
   });
 
-  it('should support rerender', () => {
+  it("should support rerender", () => {
     const { lastFrame, rerender } = render(<Text>Hello</Text>);
-    expect(lastFrame()).toBe('Hello');
+    expect(lastFrame()).toBe("Hello");
 
     rerender(<Text>World</Text>);
-    expect(lastFrame()).toBe('World');
+    expect(lastFrame()).toBe("World");
   });
 
-  it('should support unmount', () => {
+  it("should support unmount", () => {
     const cleanup = vi.fn();
     function TestComponent() {
       useEffect(() => cleanup, []);
@@ -38,8 +38,8 @@ describe('render', () => {
   });
 });
 
-describe('renderHook', () => {
-  it('should rerender with previous props when called without arguments', async () => {
+describe("renderHook", () => {
+  it("should rerender with previous props when called without arguments", async () => {
     const useTestHook = ({ value }: { value: number }) => {
       const [count, setCount] = useState(0);
       useEffect(() => {
@@ -68,7 +68,7 @@ describe('renderHook', () => {
     await waitFor(() => expect(result.current.count).toBe(2));
   });
 
-  it('should handle initial render without props', () => {
+  it("should handle initial render without props", () => {
     const useTestHook = () => {
       const [count, setCount] = useState(0);
       return { count, increment: () => setCount((c) => c + 1) };
@@ -82,13 +82,13 @@ describe('renderHook', () => {
     expect(result.current.count).toBe(0);
   });
 
-  it('should update props if undefined is passed explicitly', () => {
+  it("should update props if undefined is passed explicitly", () => {
     const useTestHook = (val: string | undefined) => val;
     const { result, rerender } = renderHook(useTestHook, {
-      initialProps: 'initial',
+      initialProps: "initial",
     });
 
-    expect(result.current).toBe('initial');
+    expect(result.current).toBe("initial");
 
     rerender(undefined);
     expect(result.current).toBeUndefined();
diff --git a/packages/ui-gemini/src/test-utils/render.tsx b/packages/ui-gemini/src/test-utils/render.tsx
index 9a4014fc0..cc22223dd 100644
--- a/packages/ui-gemini/src/test-utils/render.tsx
+++ b/packages/ui-gemini/src/test-utils/render.tsx
@@ -4,44 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render as inkRender } from 'ink-testing-library';
-import { Box } from 'ink';
-import type React from 'react';
-import { vi } from 'vitest';
-import { act, useState } from 'react';
-import { LoadedSettings, type Settings } from '../config/settings.js';
-import { KeypressProvider } from '../ui/contexts/KeypressContext.js';
-import { SettingsContext } from '../ui/contexts/SettingsContext.js';
-import { ShellFocusContext } from '../ui/contexts/ShellFocusContext.js';
-import { UIStateContext, type UIState } from '../ui/contexts/UIStateContext.js';
-import { StreamingState } from '../ui/types.js';
-import { ConfigContext } from '../ui/contexts/ConfigContext.js';
-import { calculateMainAreaWidth } from '../ui/utils/ui-sizing.js';
-import { VimModeProvider } from '../ui/contexts/VimModeContext.js';
-import { MouseProvider } from '../ui/contexts/MouseContext.js';
-import { ScrollProvider } from '../ui/contexts/ScrollProvider.js';
-import { StreamingContext } from '../ui/contexts/StreamingContext.js';
-import {
-  type UIActions,
-  UIActionsContext,
-} from '../ui/contexts/UIActionsContext.js';
-
-import { type Config } from '@airiscode/gemini-cli-core';
+import { type Config } from "@airiscode/gemini-cli-core";
+import { Box } from "ink";
+import { render as inkRender } from "ink-testing-library";
+import type React from "react";
+import { act, useState } from "react";
+import { vi } from "vitest";
+import { LoadedSettings, type Settings } from "../config/settings.js";
+import { ConfigContext } from "../ui/contexts/ConfigContext.js";
+import { KeypressProvider } from "../ui/contexts/KeypressContext.js";
+import { MouseProvider } from "../ui/contexts/MouseContext.js";
+import { ScrollProvider } from "../ui/contexts/ScrollProvider.js";
+import { SettingsContext } from "../ui/contexts/SettingsContext.js";
+import { ShellFocusContext } from "../ui/contexts/ShellFocusContext.js";
+import { StreamingContext } from "../ui/contexts/StreamingContext.js";
+import { type UIActions, UIActionsContext } from "../ui/contexts/UIActionsContext.js";
+import { type UIState, UIStateContext } from "../ui/contexts/UIStateContext.js";
+import { VimModeProvider } from "../ui/contexts/VimModeContext.js";
+import { StreamingState } from "../ui/types.js";
+import { calculateMainAreaWidth } from "../ui/utils/ui-sizing.js";
 
 // Wrapper around ink-testing-library's render that ensures act() is called
 export const render = (
   tree: React.ReactElement,
   terminalWidth?: number,
 ): ReturnType<typeof inkRender> => {
-  let renderResult: ReturnType<typeof inkRender> =
-    undefined as unknown as ReturnType<typeof inkRender>;
+  let renderResult: ReturnType<typeof inkRender> = undefined as unknown as ReturnType<
+    typeof inkRender
+  >;
   act(() => {
     renderResult = inkRender(tree);
   });
 
   if (terminalWidth !== undefined && renderResult?.stdout) {
     // Override the columns getter on the stdout instance provided by ink-testing-library
-    Object.defineProperty(renderResult.stdout, 'columns', {
+    Object.defineProperty(renderResult.stdout, "columns", {
       get: () => terminalWidth,
       configurable: true,
     });
@@ -71,7 +68,7 @@ export const render = (
 };
 
 export const simulateClick = async (
-  stdin: ReturnType<typeof inkRender>['stdin'],
+  stdin: ReturnType<typeof inkRender>["stdin"],
   col: number,
   row: number,
   button: 0 | 1 | 2 = 0, // 0 for left, 1 for middle, 2 for right
@@ -84,9 +81,8 @@ export const simulateClick = async (
 };
 
 const mockConfig = {
-  getModel: () => 'gemini-pro',
-  getTargetDir: () =>
-    '/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long',
+  getModel: () => "gemini-pro",
+  getTargetDir: () => "/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long",
   getDebugMode: () => false,
   isTrustedFolder: () => true,
   getIdeMode: () => false,
@@ -103,23 +99,21 @@ const configProxy = new Proxy(mockConfig, {
 });
 
 export const mockSettings = new LoadedSettings(
-  { path: '', settings: {}, originalSettings: {} },
-  { path: '', settings: {}, originalSettings: {} },
-  { path: '', settings: {}, originalSettings: {} },
-  { path: '', settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
+  { path: "", settings: {}, originalSettings: {} },
   true,
   new Set(),
 );
 
-export const createMockSettings = (
-  overrides: Partial<Settings>,
-): LoadedSettings => {
+export const createMockSettings = (overrides: Partial<Settings>): LoadedSettings => {
   const settings = overrides as Settings;
   return new LoadedSettings(
-    { path: '', settings: {}, originalSettings: {} },
-    { path: '', settings: {}, originalSettings: {} },
-    { path: '', settings, originalSettings: settings },
-    { path: '', settings: {}, originalSettings: {} },
+    { path: "", settings: {}, originalSettings: {} },
+    { path: "", settings: {}, originalSettings: {} },
+    { path: "", settings, originalSettings: settings },
+    { path: "", settings: {}, originalSettings: {} },
     true,
     new Set(),
   );
@@ -132,7 +126,7 @@ const baseMockUiState = {
   streamingState: StreamingState.Idle,
   mainAreaWidth: 100,
   terminalWidth: 120,
-  currentModel: 'gemini-pro',
+  currentModel: "gemini-pro",
 };
 
 const mockUIActions: UIActions = {
diff --git a/packages/ui-gemini/src/ui/App.test.tsx b/packages/ui-gemini/src/ui/App.test.tsx
index b6284a8f9..25a916394 100644
--- a/packages/ui-gemini/src/ui/App.test.tsx
+++ b/packages/ui-gemini/src/ui/App.test.tsx
@@ -4,59 +4,55 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, type Mock } from 'vitest';
-import { render } from '../test-utils/render.js';
-import { Text, useIsScreenReaderEnabled } from 'ink';
-import { makeFakeConfig } from '@airiscode/gemini-cli-core';
-import { App } from './App.js';
-import { UIStateContext, type UIState } from './contexts/UIStateContext.js';
-import { StreamingState } from './types.js';
-import { ConfigContext } from './contexts/ConfigContext.js';
-import { AppContext, type AppState } from './contexts/AppContext.js';
-import { SettingsContext } from './contexts/SettingsContext.js';
-import {
-  type SettingScope,
-  LoadedSettings,
-  type SettingsFile,
-} from '../config/settings.js';
-
-vi.mock('ink', async (importOriginal) => {
-  const original = await importOriginal<typeof import('ink')>();
+import { makeFakeConfig } from "@airiscode/gemini-cli-core";
+import { Text, useIsScreenReaderEnabled } from "ink";
+import { describe, expect, it, type Mock, vi } from "vitest";
+import { LoadedSettings, type SettingScope, type SettingsFile } from "../config/settings.js";
+import { render } from "../test-utils/render.js";
+import { App } from "./App.js";
+import { AppContext, type AppState } from "./contexts/AppContext.js";
+import { ConfigContext } from "./contexts/ConfigContext.js";
+import { SettingsContext } from "./contexts/SettingsContext.js";
+import { type UIState, UIStateContext } from "./contexts/UIStateContext.js";
+import { StreamingState } from "./types.js";
+
+vi.mock("ink", async (importOriginal) => {
+  const original = await importOriginal<typeof import("ink")>();
   return {
     ...original,
     useIsScreenReaderEnabled: vi.fn(),
   };
 });
 
-vi.mock('./components/MainContent.js', () => ({
+vi.mock("./components/MainContent.js", () => ({
   MainContent: () => <Text>MainContent</Text>,
 }));
 
-vi.mock('./components/DialogManager.js', () => ({
+vi.mock("./components/DialogManager.js", () => ({
   DialogManager: () => <Text>DialogManager</Text>,
 }));
 
-vi.mock('./components/Composer.js', () => ({
+vi.mock("./components/Composer.js", () => ({
   Composer: () => <Text>Composer</Text>,
 }));
 
-vi.mock('./components/Notifications.js', () => ({
+vi.mock("./components/Notifications.js", () => ({
   Notifications: () => <Text>Notifications</Text>,
 }));
 
-vi.mock('./components/QuittingDisplay.js', () => ({
+vi.mock("./components/QuittingDisplay.js", () => ({
   QuittingDisplay: () => <Text>Quitting...</Text>,
 }));
 
-vi.mock('./components/HistoryItemDisplay.js', () => ({
+vi.mock("./components/HistoryItemDisplay.js", () => ({
   HistoryItemDisplay: () => <Text>HistoryItemDisplay</Text>,
 }));
 
-vi.mock('./components/Footer.js', () => ({
+vi.mock("./components/Footer.js", () => ({
   Footer: () => <Text>Footer</Text>,
 }));
 
-describe('App', () => {
+describe("App", () => {
   const mockUIState: Partial<UIState> = {
     streamingState: StreamingState.Idle,
     quittingMessages: null,
@@ -73,8 +69,8 @@ describe('App', () => {
     history: [],
     pendingHistoryItems: [],
     bannerData: {
-      defaultText: 'Mock Banner Text',
-      warningText: '',
+      defaultText: "Mock Banner Text",
+      warningText: "",
     },
   };
 
@@ -83,7 +79,7 @@ describe('App', () => {
   const mockSettingsFile: SettingsFile = {
     settings: {},
     originalSettings: {},
-    path: '/mock/path',
+    path: "/mock/path",
   };
 
   const mockLoadedSettings = new LoadedSettings(
@@ -96,7 +92,7 @@ describe('App', () => {
   );
 
   const mockAppState: AppState = {
-    version: '1.0.0',
+    version: "1.0.0",
     startupWarnings: [],
   };
 
@@ -105,53 +101,51 @@ describe('App', () => {
       <AppContext.Provider value={mockAppState}>
         <ConfigContext.Provider value={mockConfig}>
           <SettingsContext.Provider value={mockLoadedSettings}>
-            <UIStateContext.Provider value={state}>
-              {ui}
-            </UIStateContext.Provider>
+            <UIStateContext.Provider value={state}>{ui}</UIStateContext.Provider>
           </SettingsContext.Provider>
         </ConfigContext.Provider>
       </AppContext.Provider>,
     );
 
-  it('should render main content and composer when not quitting', () => {
+  it("should render main content and composer when not quitting", () => {
     const { lastFrame } = renderWithProviders(<App />, mockUIState as UIState);
 
-    expect(lastFrame()).toContain('MainContent');
-    expect(lastFrame()).toContain('Notifications');
-    expect(lastFrame()).toContain('Composer');
+    expect(lastFrame()).toContain("MainContent");
+    expect(lastFrame()).toContain("Notifications");
+    expect(lastFrame()).toContain("Composer");
   });
 
-  it('should render quitting display when quittingMessages is set', () => {
+  it("should render quitting display when quittingMessages is set", () => {
     const quittingUIState = {
       ...mockUIState,
-      quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
+      quittingMessages: [{ id: 1, type: "user", text: "test" }],
     } as UIState;
 
     const { lastFrame } = renderWithProviders(<App />, quittingUIState);
 
-    expect(lastFrame()).toContain('Quitting...');
+    expect(lastFrame()).toContain("Quitting...");
   });
 
-  it('should render full history in alternate buffer mode when quittingMessages is set', () => {
+  it("should render full history in alternate buffer mode when quittingMessages is set", () => {
     const quittingUIState = {
       ...mockUIState,
-      quittingMessages: [{ id: 1, type: 'user', text: 'test' }],
-      history: [{ id: 1, type: 'user', text: 'history item' }],
-      pendingHistoryItems: [{ type: 'user', text: 'pending item' }],
+      quittingMessages: [{ id: 1, type: "user", text: "test" }],
+      history: [{ id: 1, type: "user", text: "history item" }],
+      pendingHistoryItems: [{ type: "user", text: "pending item" }],
     } as UIState;
 
     mockLoadedSettings.merged.ui = { useAlternateBuffer: true };
 
     const { lastFrame } = renderWithProviders(<App />, quittingUIState);
 
-    expect(lastFrame()).toContain('HistoryItemDisplay');
-    expect(lastFrame()).toContain('Quitting...');
+    expect(lastFrame()).toContain("HistoryItemDisplay");
+    expect(lastFrame()).toContain("Quitting...");
 
     // Reset settings
     mockLoadedSettings.merged.ui = { useAlternateBuffer: false };
   });
 
-  it('should render dialog manager when dialogs are visible', () => {
+  it("should render dialog manager when dialogs are visible", () => {
     const dialogUIState = {
       ...mockUIState,
       dialogsVisible: true,
@@ -159,67 +153,59 @@ describe('App', () => {
 
     const { lastFrame } = renderWithProviders(<App />, dialogUIState);
 
-    expect(lastFrame()).toContain('MainContent');
-    expect(lastFrame()).toContain('Notifications');
-    expect(lastFrame()).toContain('DialogManager');
+    expect(lastFrame()).toContain("MainContent");
+    expect(lastFrame()).toContain("Notifications");
+    expect(lastFrame()).toContain("DialogManager");
   });
 
   it.each([
-    { key: 'C', stateKey: 'ctrlCPressedOnce' },
-    { key: 'D', stateKey: 'ctrlDPressedOnce' },
-  ])(
-    'should show Ctrl+$key exit prompt when dialogs are visible and $stateKey is true',
-    ({ key, stateKey }) => {
-      const uiState = {
-        ...mockUIState,
-        dialogsVisible: true,
-        [stateKey]: true,
-      } as UIState;
+    { key: "C", stateKey: "ctrlCPressedOnce" },
+    { key: "D", stateKey: "ctrlDPressedOnce" },
+  ])("should show Ctrl+$key exit prompt when dialogs are visible and $stateKey is true", ({
+    key,
+    stateKey,
+  }) => {
+    const uiState = {
+      ...mockUIState,
+      dialogsVisible: true,
+      [stateKey]: true,
+    } as UIState;
 
-      const { lastFrame } = renderWithProviders(<App />, uiState);
+    const { lastFrame } = renderWithProviders(<App />, uiState);
 
-      expect(lastFrame()).toContain(`Press Ctrl+${key} again to exit.`);
-    },
-  );
+    expect(lastFrame()).toContain(`Press Ctrl+${key} again to exit.`);
+  });
 
-  it('should render ScreenReaderAppLayout when screen reader is enabled', () => {
+  it("should render ScreenReaderAppLayout when screen reader is enabled", () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
 
     const { lastFrame } = renderWithProviders(<App />, mockUIState as UIState);
 
-    expect(lastFrame()).toContain(
-      'Notifications\nFooter\nMainContent\nComposer',
-    );
+    expect(lastFrame()).toContain("Notifications\nFooter\nMainContent\nComposer");
   });
 
-  it('should render DefaultAppLayout when screen reader is not enabled', () => {
+  it("should render DefaultAppLayout when screen reader is not enabled", () => {
     (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
 
     const { lastFrame } = renderWithProviders(<App />, mockUIState as UIState);
 
-    expect(lastFrame()).toContain('MainContent\nNotifications\nComposer');
+    expect(lastFrame()).toContain("MainContent\nNotifications\nComposer");
   });
 
-  describe('Snapshots', () => {
-    it('renders default layout correctly', () => {
+  describe("Snapshots", () => {
+    it("renders default layout correctly", () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(false);
-      const { lastFrame } = renderWithProviders(
-        <App />,
-        mockUIState as UIState,
-      );
+      const { lastFrame } = renderWithProviders(<App />, mockUIState as UIState);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders screen reader layout correctly', () => {
+    it("renders screen reader layout correctly", () => {
       (useIsScreenReaderEnabled as Mock).mockReturnValue(true);
-      const { lastFrame } = renderWithProviders(
-        <App />,
-        mockUIState as UIState,
-      );
+      const { lastFrame } = renderWithProviders(<App />, mockUIState as UIState);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders with dialogs visible', () => {
+    it("renders with dialogs visible", () => {
       const dialogUIState = {
         ...mockUIState,
         dialogsVisible: true,
diff --git a/packages/ui-gemini/src/ui/App.tsx b/packages/ui-gemini/src/ui/App.tsx
index 2c3e424ae..f1b367827 100644
--- a/packages/ui-gemini/src/ui/App.tsx
+++ b/packages/ui-gemini/src/ui/App.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useIsScreenReaderEnabled } from 'ink';
-import { useUIState } from './contexts/UIStateContext.js';
-import { StreamingContext } from './contexts/StreamingContext.js';
-import { QuittingDisplay } from './components/QuittingDisplay.js';
-import { ScreenReaderAppLayout } from './layouts/ScreenReaderAppLayout.js';
-import { DefaultAppLayout } from './layouts/DefaultAppLayout.js';
-import { AlternateBufferQuittingDisplay } from './components/AlternateBufferQuittingDisplay.js';
-import { useAlternateBuffer } from './hooks/useAlternateBuffer.js';
+import { useIsScreenReaderEnabled } from "ink";
+import { AlternateBufferQuittingDisplay } from "./components/AlternateBufferQuittingDisplay.js";
+import { QuittingDisplay } from "./components/QuittingDisplay.js";
+import { StreamingContext } from "./contexts/StreamingContext.js";
+import { useUIState } from "./contexts/UIStateContext.js";
+import { useAlternateBuffer } from "./hooks/useAlternateBuffer.js";
+import { DefaultAppLayout } from "./layouts/DefaultAppLayout.js";
+import { ScreenReaderAppLayout } from "./layouts/ScreenReaderAppLayout.js";
 
 export const App = () => {
   const uiState = useUIState();
diff --git a/packages/ui-gemini/src/ui/AppContainer.test.tsx b/packages/ui-gemini/src/ui/AppContainer.test.tsx
index e0df5113e..488d830dc 100644
--- a/packages/ui-gemini/src/ui/AppContainer.test.tsx
+++ b/packages/ui-gemini/src/ui/AppContainer.test.tsx
@@ -5,29 +5,29 @@
  */
 
 import {
+  AuthType,
+  type Config,
+  CoreEvent,
+  makeFakeConfig,
+  type ResumedSessionData,
+  type UserFeedbackPayload,
+} from "@airiscode/gemini-cli-core";
+import { cleanup } from "ink-testing-library";
+import { act, useContext } from "react";
+import {
+  afterEach,
+  beforeEach,
   describe,
-  it,
   expect,
-  vi,
-  beforeEach,
-  afterEach,
+  it,
   type Mock,
   type MockedObject,
-} from 'vitest';
-import { render } from '../test-utils/render.js';
-import { waitFor } from '../test-utils/async.js';
-import { cleanup } from 'ink-testing-library';
-import { act, useContext } from 'react';
-import { AppContainer } from './AppContainer.js';
-import { SettingsContext } from './contexts/SettingsContext.js';
-import {
-  type Config,
-  makeFakeConfig,
-  CoreEvent,
-  type UserFeedbackPayload,
-  type ResumedSessionData,
-  AuthType,
-} from '@airiscode/gemini-cli-core';
+  vi,
+} from "vitest";
+import { waitFor } from "../test-utils/async.js";
+import { render } from "../test-utils/render.js";
+import { AppContainer } from "./AppContainer.js";
+import { SettingsContext } from "./contexts/SettingsContext.js";
 
 // Mock coreEvents
 const mockCoreEvents = vi.hoisted(() => ({
@@ -47,22 +47,17 @@ const mocks = vi.hoisted(() => ({
   mockStdout: { write: vi.fn() },
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     coreEvents: mockCoreEvents,
     IdeClient: mockIdeClient,
     writeToStdout: vi.fn((...args) =>
-      process.stdout.write(
-        ...(args as Parameters<typeof process.stdout.write>),
-      ),
+      process.stdout.write(...(args as Parameters<typeof process.stdout.write>)),
     ),
     writeToStderr: vi.fn((...args) =>
-      process.stderr.write(
-        ...(args as Parameters<typeof process.stderr.write>),
-      ),
+      process.stderr.write(...(args as Parameters<typeof process.stderr.write>)),
     ),
     patchStdio: vi.fn(() => () => {}),
     createWorkingStdio: vi.fn(() => ({
@@ -73,19 +68,17 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
     disableMouseEvents: vi.fn(),
   };
 });
-import ansiEscapes from 'ansi-escapes';
-import type { LoadedSettings } from '../config/settings.js';
-import type { InitializationResult } from '../core/initializer.js';
-import { useQuotaAndFallback } from './hooks/useQuotaAndFallback.js';
-import { UIStateContext, type UIState } from './contexts/UIStateContext.js';
-import {
-  UIActionsContext,
-  type UIActions,
-} from './contexts/UIActionsContext.js';
+
+import ansiEscapes from "ansi-escapes";
+import type { LoadedSettings } from "../config/settings.js";
+import type { InitializationResult } from "../core/initializer.js";
+import { type UIActions, UIActionsContext } from "./contexts/UIActionsContext.js";
+import { type UIState, UIStateContext } from "./contexts/UIStateContext.js";
+import { useQuotaAndFallback } from "./hooks/useQuotaAndFallback.js";
 
 // Mock useStdout to capture terminal title writes
-vi.mock('ink', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("ink")>();
   return {
     ...actual,
     useStdout: () => ({ stdout: mocks.mockStdout }),
@@ -103,78 +96,78 @@ function TestContextConsumer() {
   return null;
 }
 
-vi.mock('./App.js', () => ({
+vi.mock("./App.js", () => ({
   App: TestContextConsumer,
 }));
 
-vi.mock('./hooks/useQuotaAndFallback.js');
-vi.mock('./hooks/useHistoryManager.js');
-vi.mock('./hooks/useThemeCommand.js');
-vi.mock('./auth/useAuth.js');
-vi.mock('./hooks/useEditorSettings.js');
-vi.mock('./hooks/useSettingsCommand.js');
-vi.mock('./hooks/useModelCommand.js');
-vi.mock('./hooks/slashCommandProcessor.js');
-vi.mock('./hooks/useConsoleMessages.js');
-vi.mock('./hooks/useTerminalSize.js', () => ({
+vi.mock("./hooks/useQuotaAndFallback.js");
+vi.mock("./hooks/useHistoryManager.js");
+vi.mock("./hooks/useThemeCommand.js");
+vi.mock("./auth/useAuth.js");
+vi.mock("./hooks/useEditorSettings.js");
+vi.mock("./hooks/useSettingsCommand.js");
+vi.mock("./hooks/useModelCommand.js");
+vi.mock("./hooks/slashCommandProcessor.js");
+vi.mock("./hooks/useConsoleMessages.js");
+vi.mock("./hooks/useTerminalSize.js", () => ({
   useTerminalSize: vi.fn(() => ({ columns: 80, rows: 24 })),
 }));
-vi.mock('./hooks/useGeminiStream.js');
-vi.mock('./hooks/vim.js');
-vi.mock('./hooks/useFocus.js');
-vi.mock('./hooks/useBracketedPaste.js');
-vi.mock('./hooks/useKeypress.js');
-vi.mock('./hooks/useLoadingIndicator.js');
-vi.mock('./hooks/useFolderTrust.js');
-vi.mock('./hooks/useIdeTrustListener.js');
-vi.mock('./hooks/useMessageQueue.js');
-vi.mock('./hooks/useAutoAcceptIndicator.js');
-vi.mock('./hooks/useGitBranchName.js');
-vi.mock('./contexts/VimModeContext.js');
-vi.mock('./contexts/SessionContext.js');
-vi.mock('./components/shared/text-buffer.js');
-vi.mock('./hooks/useLogger.js');
-vi.mock('./hooks/useInputHistoryStore.js');
+vi.mock("./hooks/useGeminiStream.js");
+vi.mock("./hooks/vim.js");
+vi.mock("./hooks/useFocus.js");
+vi.mock("./hooks/useBracketedPaste.js");
+vi.mock("./hooks/useKeypress.js");
+vi.mock("./hooks/useLoadingIndicator.js");
+vi.mock("./hooks/useFolderTrust.js");
+vi.mock("./hooks/useIdeTrustListener.js");
+vi.mock("./hooks/useMessageQueue.js");
+vi.mock("./hooks/useAutoAcceptIndicator.js");
+vi.mock("./hooks/useGitBranchName.js");
+vi.mock("./contexts/VimModeContext.js");
+vi.mock("./contexts/SessionContext.js");
+vi.mock("./components/shared/text-buffer.js");
+vi.mock("./hooks/useLogger.js");
+vi.mock("./hooks/useInputHistoryStore.js");
 
 // Mock external utilities
-vi.mock('../utils/events.js');
-vi.mock('../utils/handleAutoUpdate.js');
-vi.mock('./utils/ConsolePatcher.js');
-vi.mock('../utils/cleanup.js');
-
-import { useHistory } from './hooks/useHistoryManager.js';
-import { useThemeCommand } from './hooks/useThemeCommand.js';
-import { useAuthCommand } from './auth/useAuth.js';
-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 { useConsoleMessages } from './hooks/useConsoleMessages.js';
-import { useGeminiStream } from './hooks/useGeminiStream.js';
-import { useVim } from './hooks/vim.js';
-import { useFolderTrust } from './hooks/useFolderTrust.js';
-import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
-import { useMessageQueue } from './hooks/useMessageQueue.js';
-import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
-import { useGitBranchName } from './hooks/useGitBranchName.js';
-import { useVimMode } from './contexts/VimModeContext.js';
-import { useSessionStats } from './contexts/SessionContext.js';
-import { useTextBuffer } from './components/shared/text-buffer.js';
-import { useLogger } from './hooks/useLogger.js';
-import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
-import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
-import { useKeypress, type Key } from './hooks/useKeypress.js';
-import { measureElement } from 'ink';
-import { useTerminalSize } from './hooks/useTerminalSize.js';
+vi.mock("../utils/events.js");
+vi.mock("../utils/handleAutoUpdate.js");
+vi.mock("./utils/ConsolePatcher.js");
+vi.mock("../utils/cleanup.js");
+
 import {
+  disableMouseEvents,
+  enableMouseEvents,
   ShellExecutionService,
   writeToStdout,
-  enableMouseEvents,
-  disableMouseEvents,
-} from '@airiscode/gemini-cli-core';
-import { type ExtensionManager } from '../config/extension-manager.js';
-
-describe('AppContainer State Management', () => {
+} from "@airiscode/gemini-cli-core";
+import { measureElement } from "ink";
+import { type ExtensionManager } from "../config/extension-manager.js";
+import { useAuthCommand } from "./auth/useAuth.js";
+import { useTextBuffer } from "./components/shared/text-buffer.js";
+import { useSessionStats } from "./contexts/SessionContext.js";
+import { useVimMode } from "./contexts/VimModeContext.js";
+import { useSlashCommandProcessor } from "./hooks/slashCommandProcessor.js";
+import { useAutoAcceptIndicator } from "./hooks/useAutoAcceptIndicator.js";
+import { useConsoleMessages } from "./hooks/useConsoleMessages.js";
+import { useEditorSettings } from "./hooks/useEditorSettings.js";
+import { useFolderTrust } from "./hooks/useFolderTrust.js";
+import { useGeminiStream } from "./hooks/useGeminiStream.js";
+import { useGitBranchName } from "./hooks/useGitBranchName.js";
+import { useHistory } from "./hooks/useHistoryManager.js";
+import { useIdeTrustListener } from "./hooks/useIdeTrustListener.js";
+import { useInputHistoryStore } from "./hooks/useInputHistoryStore.js";
+import { type Key, useKeypress } from "./hooks/useKeypress.js";
+import { useLoadingIndicator } from "./hooks/useLoadingIndicator.js";
+import { useLogger } from "./hooks/useLogger.js";
+import { useMessageQueue } from "./hooks/useMessageQueue.js";
+import { useModelCommand } from "./hooks/useModelCommand.js";
+import { useSettingsCommand } from "./hooks/useSettingsCommand.js";
+import { useTerminalSize } from "./hooks/useTerminalSize.js";
+import { useThemeCommand } from "./hooks/useThemeCommand.js";
+import { useVim } from "./hooks/vim.js";
+
+describe("AppContainer State Management", () => {
   let mockConfig: Config;
   let mockSettings: LoadedSettings;
   let mockInitResult: InitializationResult;
@@ -184,7 +177,7 @@ describe('AppContainer State Management', () => {
   const getAppContainer = ({
     settings = mockSettings,
     config = mockConfig,
-    version = '1.0.0',
+    version = "1.0.0",
     initResult = mockInitResult,
     startupWarnings,
     resumedSessionData,
@@ -243,11 +236,11 @@ describe('AppContainer State Management', () => {
     mocks.mockStdout.write.mockClear();
 
     // Mock computeWindowTitle function to centralize title logic testing
-    vi.mock('../utils/windowTitle.js', async () => ({
+    vi.mock("../utils/windowTitle.js", async () => ({
       computeWindowTitle: vi.fn(
         (folderName: string) =>
           // Default behavior: return "Gemini - {folderName}" unless CLI_TITLE is set
-          process.env['CLI_TITLE'] || `Gemini - ${folderName}`,
+          process.env["CLI_TITLE"] || `Gemini - ${folderName}`,
       ),
     }));
 
@@ -273,7 +266,7 @@ describe('AppContainer State Management', () => {
       handleThemeHighlight: vi.fn(),
     });
     mockedUseAuthCommand.mockReturnValue({
-      authState: 'authenticated',
+      authState: "authenticated",
       setAuthState: vi.fn(),
       authError: null,
       onAuthError: vi.fn(),
@@ -308,7 +301,7 @@ describe('AppContainer State Management', () => {
       clearConsoleMessages: vi.fn(),
     });
     mockedUseGeminiStream.mockReturnValue({
-      streamingState: 'idle',
+      streamingState: "idle",
       submitQuery: vi.fn(),
       initError: null,
       pendingHistoryItems: [],
@@ -323,23 +316,23 @@ describe('AppContainer State Management', () => {
     });
     mockedUseIdeTrustListener.mockReturnValue({
       needsRestart: false,
-      restartReason: 'NONE',
+      restartReason: "NONE",
     });
     mockedUseMessageQueue.mockReturnValue({
       messageQueue: [],
       addMessage: vi.fn(),
       clearQueue: vi.fn(),
-      getQueuedMessagesText: vi.fn().mockReturnValue(''),
+      getQueuedMessagesText: vi.fn().mockReturnValue(""),
     });
     mockedUseAutoAcceptIndicator.mockReturnValue(false);
-    mockedUseGitBranchName.mockReturnValue('main');
+    mockedUseGitBranchName.mockReturnValue("main");
     mockedUseVimMode.mockReturnValue({
       isVimEnabled: false,
       toggleVimEnabled: vi.fn(),
     });
     mockedUseSessionStats.mockReturnValue({ stats: {} });
     mockedUseTextBuffer.mockReturnValue({
-      text: '',
+      text: "",
       setText: vi.fn(),
       // Add other properties if AppContainer uses them
     });
@@ -352,15 +345,15 @@ describe('AppContainer State Management', () => {
       initializeFromLogger: vi.fn(),
     });
     mockedUseLoadingIndicator.mockReturnValue({
-      elapsedTime: '0.0s',
-      currentLoadingPhrase: '',
+      elapsedTime: "0.0s",
+      currentLoadingPhrase: "",
     });
 
     // Mock Config
     mockConfig = makeFakeConfig();
 
     // Mock config's getTargetDir to return consistent workspace directory
-    vi.spyOn(mockConfig, 'getTargetDir').mockReturnValue('/test/workspace');
+    vi.spyOn(mockConfig, "getTargetDir").mockReturnValue("/test/workspace");
 
     mockExtensionManager = vi.mockObject({
       getExtensions: vi.fn().mockReturnValue([]),
@@ -368,9 +361,7 @@ describe('AppContainer State Management', () => {
       setRequestSetting: vi.fn(),
       start: vi.fn(),
     } as unknown as ExtensionManager);
-    vi.spyOn(mockConfig, 'getExtensionLoader').mockReturnValue(
-      mockExtensionManager,
-    );
+    vi.spyOn(mockConfig, "getExtensionLoader").mockReturnValue(mockExtensionManager);
 
     // Mock LoadedSettings
     mockSettings = {
@@ -379,7 +370,7 @@ describe('AppContainer State Management', () => {
         hideFooter: false,
         hideTips: false,
         showMemoryUsage: false,
-        theme: 'default',
+        theme: "default",
         ui: {
           showStatusInTitle: false,
           hideWindowTitle: false,
@@ -401,15 +392,15 @@ describe('AppContainer State Management', () => {
     cleanup();
   });
 
-  describe('Basic Rendering', () => {
-    it('renders without crashing with minimal props', async () => {
+  describe("Basic Rendering", () => {
+    it("renders without crashing with minimal props", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
       unmount();
     });
 
-    it('renders with startup warnings', async () => {
-      const startupWarnings = ['Warning 1', 'Warning 2'];
+    it("renders with startup warnings", async () => {
+      const startupWarnings = ["Warning 1", "Warning 2"];
 
       const { unmount } = renderAppContainer({ startupWarnings });
       await waitFor(() => expect(capturedUIState).toBeTruthy());
@@ -417,11 +408,11 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('State Initialization', () => {
-    it('initializes with theme error from initialization result', async () => {
+  describe("State Initialization", () => {
+    it("initializes with theme error from initialization result", async () => {
       const initResultWithError = {
         ...mockInitResult,
-        themeError: 'Failed to load theme',
+        themeError: "Failed to load theme",
       };
 
       const { unmount } = renderAppContainer({
@@ -431,9 +422,9 @@ describe('AppContainer State Management', () => {
       unmount();
     });
 
-    it('handles debug mode state', () => {
+    it("handles debug mode state", () => {
       const debugConfig = makeFakeConfig();
-      vi.spyOn(debugConfig, 'getDebugMode').mockReturnValue(true);
+      vi.spyOn(debugConfig, "getDebugMode").mockReturnValue(true);
 
       expect(() => {
         renderAppContainer({ config: debugConfig });
@@ -441,36 +432,36 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Context Providers', () => {
-    it('provides AppContext with correct values', async () => {
-      const { unmount } = renderAppContainer({ version: '2.0.0' });
+  describe("Context Providers", () => {
+    it("provides AppContext with correct values", async () => {
+      const { unmount } = renderAppContainer({ version: "2.0.0" });
       await waitFor(() => expect(capturedUIState).toBeTruthy());
 
       // Should render and unmount cleanly
       expect(() => unmount()).not.toThrow();
     });
 
-    it('provides UIStateContext with state management', async () => {
+    it("provides UIStateContext with state management", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
       unmount();
     });
 
-    it('provides UIActionsContext with action handlers', async () => {
+    it("provides UIActionsContext with action handlers", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
       unmount();
     });
 
-    it('provides ConfigContext with config object', async () => {
+    it("provides ConfigContext with config object", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
       unmount();
     });
   });
 
-  describe('Settings Integration', () => {
-    it('handles settings with all display options disabled', async () => {
+  describe("Settings Integration", () => {
+    it("handles settings with all display options disabled", async () => {
       const settingsAllHidden = {
         merged: {
           hideBanner: true,
@@ -485,7 +476,7 @@ describe('AppContainer State Management', () => {
       unmount();
     });
 
-    it('handles settings with memory usage enabled', async () => {
+    it("handles settings with memory usage enabled", async () => {
       const settingsWithMemory = {
         merged: {
           hideBanner: false,
@@ -501,22 +492,23 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Version Handling', () => {
-    it.each(['1.0.0', '2.1.3-beta', '3.0.0-nightly'])(
-      'handles version format: %s',
-      async (version) => {
-        const { unmount } = renderAppContainer({ version });
-        await waitFor(() => expect(capturedUIState).toBeTruthy());
-        unmount();
-      },
-    );
+  describe("Version Handling", () => {
+    it.each([
+      "1.0.0",
+      "2.1.3-beta",
+      "3.0.0-nightly",
+    ])("handles version format: %s", async (version) => {
+      const { unmount } = renderAppContainer({ version });
+      await waitFor(() => expect(capturedUIState).toBeTruthy());
+      unmount();
+    });
   });
 
-  describe('Error Handling', () => {
-    it('handles config methods that might throw', async () => {
+  describe("Error Handling", () => {
+    it("handles config methods that might throw", async () => {
       const errorConfig = makeFakeConfig();
-      vi.spyOn(errorConfig, 'getModel').mockImplementation(() => {
-        throw new Error('Config error');
+      vi.spyOn(errorConfig, "getModel").mockImplementation(() => {
+        throw new Error("Config error");
       });
 
       // Should still render without crashing - errors should be handled internally
@@ -524,7 +516,7 @@ describe('AppContainer State Management', () => {
       unmount();
     });
 
-    it('handles undefined settings gracefully', async () => {
+    it("handles undefined settings gracefully", async () => {
       const undefinedSettings = {
         merged: {},
       } as LoadedSettings;
@@ -535,8 +527,8 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Provider Hierarchy', () => {
-    it('establishes correct provider nesting order', () => {
+  describe("Provider Hierarchy", () => {
+    it("establishes correct provider nesting order", () => {
       // This tests that all the context providers are properly nested
       // and that the component tree can be built without circular dependencies
       const { unmount } = renderAppContainer();
@@ -545,32 +537,32 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Session Resumption', () => {
-    it('handles resumed session data correctly', async () => {
+  describe("Session Resumption", () => {
+    it("handles resumed session data correctly", async () => {
       const mockResumedSessionData = {
         conversation: {
-          sessionId: 'test-session-123',
-          projectHash: 'test-project-hash',
-          startTime: '2024-01-01T00:00:00Z',
-          lastUpdated: '2024-01-01T00:00:01Z',
+          sessionId: "test-session-123",
+          projectHash: "test-project-hash",
+          startTime: "2024-01-01T00:00:00Z",
+          lastUpdated: "2024-01-01T00:00:01Z",
           messages: [
             {
-              id: 'msg-1',
-              type: 'user' as const,
-              content: 'Hello',
-              timestamp: '2024-01-01T00:00:00Z',
+              id: "msg-1",
+              type: "user" as const,
+              content: "Hello",
+              timestamp: "2024-01-01T00:00:00Z",
             },
             {
-              id: 'msg-2',
-              type: 'gemini' as const,
-              content: 'Hi there!',
-              role: 'model' as const,
-              parts: [{ text: 'Hi there!' }],
-              timestamp: '2024-01-01T00:00:01Z',
+              id: "msg-2",
+              type: "gemini" as const,
+              content: "Hi there!",
+              role: "model" as const,
+              parts: [{ text: "Hi there!" }],
+              timestamp: "2024-01-01T00:00:01Z",
             },
           ],
         },
-        filePath: '/tmp/test-session.json',
+        filePath: "/tmp/test-session.json",
       };
 
       let unmount: () => void;
@@ -578,7 +570,7 @@ describe('AppContainer State Management', () => {
         const result = renderAppContainer({
           config: mockConfig,
           settings: mockSettings,
-          version: '1.0.0',
+          version: "1.0.0",
           initResult: mockInitResult,
           resumedSessionData: mockResumedSessionData,
         });
@@ -589,13 +581,13 @@ describe('AppContainer State Management', () => {
       });
     });
 
-    it('renders without resumed session data', async () => {
+    it("renders without resumed session data", async () => {
       let unmount: () => void;
       await act(async () => {
         const result = renderAppContainer({
           config: mockConfig,
           settings: mockSettings,
-          version: '1.0.0',
+          version: "1.0.0",
           initResult: mockInitResult,
           resumedSessionData: undefined,
         });
@@ -606,7 +598,7 @@ describe('AppContainer State Management', () => {
       });
     });
 
-    it('initializes chat recording service when config has it', () => {
+    it("initializes chat recording service when config has it", () => {
       const mockChatRecordingService = {
         initialize: vi.fn(),
         recordMessage: vi.fn(),
@@ -630,20 +622,20 @@ describe('AppContainer State Management', () => {
         renderAppContainer({
           config: configWithRecording,
           settings: mockSettings,
-          version: '1.0.0',
+          version: "1.0.0",
           initResult: mockInitResult,
         });
       }).not.toThrow();
     });
   });
-  describe('Session Recording Integration', () => {
-    it('provides chat recording service configuration', () => {
+  describe("Session Recording Integration", () => {
+    it("provides chat recording service configuration", () => {
       const mockChatRecordingService = {
         initialize: vi.fn(),
         recordMessage: vi.fn(),
         recordMessageTokens: vi.fn(),
         recordToolCalls: vi.fn(),
-        getSessionId: vi.fn(() => 'test-session-123'),
+        getSessionId: vi.fn(() => "test-session-123"),
         getCurrentConversation: vi.fn(),
       };
 
@@ -658,14 +650,14 @@ describe('AppContainer State Management', () => {
       const configWithRecording = {
         ...mockConfig,
         getGeminiClient: vi.fn(() => mockGeminiClient),
-        getSessionId: vi.fn(() => 'test-session-123'),
+        getSessionId: vi.fn(() => "test-session-123"),
       } as unknown as Config;
 
       expect(() => {
         renderAppContainer({
           config: configWithRecording,
           settings: mockSettings,
-          version: '1.0.0',
+          version: "1.0.0",
           initResult: mockInitResult,
         });
       }).not.toThrow();
@@ -677,7 +669,7 @@ describe('AppContainer State Management', () => {
       expect(mockChatRecordingService.recordMessage).toBeDefined();
     });
 
-    it('handles session recording when messages are added', () => {
+    it("handles session recording when messages are added", () => {
       const mockRecordMessage = vi.fn();
       const mockRecordMessageTokens = vi.fn();
 
@@ -686,7 +678,7 @@ describe('AppContainer State Management', () => {
         recordMessage: mockRecordMessage,
         recordMessageTokens: mockRecordMessageTokens,
         recordToolCalls: vi.fn(),
-        getSessionId: vi.fn(() => 'test-session-123'),
+        getSessionId: vi.fn(() => "test-session-123"),
       };
 
       const mockGeminiClient = {
@@ -703,7 +695,7 @@ describe('AppContainer State Management', () => {
       renderAppContainer({
         config: configWithRecording,
         settings: mockSettings,
-        version: '1.0.0',
+        version: "1.0.0",
         initResult: mockInitResult,
       });
 
@@ -714,8 +706,8 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Session Resume Flow', () => {
-    it('accepts resumed session data', () => {
+  describe("Session Resume Flow", () => {
+    it("accepts resumed session data", () => {
       const mockResumeChat = vi.fn();
       const mockGeminiClient = {
         isInitialized: vi.fn(() => true),
@@ -736,36 +728,36 @@ describe('AppContainer State Management', () => {
 
       const resumedData = {
         conversation: {
-          sessionId: 'resumed-session-456',
-          projectHash: 'project-hash',
-          startTime: '2024-01-01T00:00:00Z',
-          lastUpdated: '2024-01-01T00:01:00Z',
+          sessionId: "resumed-session-456",
+          projectHash: "project-hash",
+          startTime: "2024-01-01T00:00:00Z",
+          lastUpdated: "2024-01-01T00:01:00Z",
           messages: [
             {
-              id: 'msg-1',
-              type: 'user' as const,
-              content: 'Previous question',
-              timestamp: '2024-01-01T00:00:00Z',
+              id: "msg-1",
+              type: "user" as const,
+              content: "Previous question",
+              timestamp: "2024-01-01T00:00:00Z",
             },
             {
-              id: 'msg-2',
-              type: 'gemini' as const,
-              content: 'Previous answer',
-              role: 'model' as const,
-              parts: [{ text: 'Previous answer' }],
-              timestamp: '2024-01-01T00:00:30Z',
+              id: "msg-2",
+              type: "gemini" as const,
+              content: "Previous answer",
+              role: "model" as const,
+              parts: [{ text: "Previous answer" }],
+              timestamp: "2024-01-01T00:00:30Z",
               tokenCount: { input: 10, output: 20 },
             },
           ],
         },
-        filePath: '/tmp/resumed-session.json',
+        filePath: "/tmp/resumed-session.json",
       };
 
       expect(() => {
         renderAppContainer({
           config: configWithClient,
           settings: mockSettings,
-          version: '1.0.0',
+          version: "1.0.0",
           initResult: mockInitResult,
           resumedSessionData: resumedData,
         });
@@ -776,7 +768,7 @@ describe('AppContainer State Management', () => {
       expect(resumedData.conversation.messages).toHaveLength(2);
     });
 
-    it('does not attempt resume when client is not initialized', () => {
+    it("does not attempt resume when client is not initialized", () => {
       const mockResumeChat = vi.fn();
       const mockGeminiClient = {
         isInitialized: vi.fn(() => false), // Not initialized
@@ -792,19 +784,19 @@ describe('AppContainer State Management', () => {
 
       const resumedData = {
         conversation: {
-          sessionId: 'test-session',
-          projectHash: 'project-hash',
-          startTime: '2024-01-01T00:00:00Z',
-          lastUpdated: '2024-01-01T00:01:00Z',
+          sessionId: "test-session",
+          projectHash: "project-hash",
+          startTime: "2024-01-01T00:00:00Z",
+          lastUpdated: "2024-01-01T00:01:00Z",
           messages: [],
         },
-        filePath: '/tmp/session.json',
+        filePath: "/tmp/session.json",
       };
 
       renderAppContainer({
         config: configWithClient,
         settings: mockSettings,
-        version: '1.0.0',
+        version: "1.0.0",
         initResult: mockInitResult,
         resumedSessionData: resumedData,
       });
@@ -814,8 +806,8 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Token Counting from Session Stats', () => {
-    it('tracks token counts from session messages', () => {
+  describe("Token Counting from Session Stats", () => {
+    it("tracks token counts from session messages", () => {
       // Session stats are provided through the SessionStatsProvider context
       // in the real app, not through the config directly
       const mockChatRecordingService = {
@@ -823,9 +815,9 @@ describe('AppContainer State Management', () => {
         recordMessage: vi.fn(),
         recordMessageTokens: vi.fn(),
         recordToolCalls: vi.fn(),
-        getSessionId: vi.fn(() => 'test-session-123'),
+        getSessionId: vi.fn(() => "test-session-123"),
         getCurrentConversation: vi.fn(() => ({
-          sessionId: 'test-session-123',
+          sessionId: "test-session-123",
           messages: [],
           totalInputTokens: 150,
           totalOutputTokens: 350,
@@ -846,7 +838,7 @@ describe('AppContainer State Management', () => {
       renderAppContainer({
         config: configWithRecording,
         settings: mockSettings,
-        version: '1.0.0',
+        version: "1.0.0",
         initResult: mockInitResult,
       });
 
@@ -857,8 +849,8 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Quota and Fallback Integration', () => {
-    it('passes a null proQuotaRequest to UIStateContext by default', async () => {
+  describe("Quota and Fallback Integration", () => {
+    it("passes a null proQuotaRequest to UIStateContext by default", async () => {
       // The default mock from beforeEach already sets proQuotaRequest to null
       const { unmount } = renderAppContainer();
       await waitFor(() => {
@@ -868,11 +860,11 @@ describe('AppContainer State Management', () => {
       unmount();
     });
 
-    it('passes a valid proQuotaRequest to UIStateContext when provided by the hook', async () => {
+    it("passes a valid proQuotaRequest to UIStateContext when provided by the hook", async () => {
       // Arrange: Create a mock request object that a UI dialog would receive
       const mockRequest = {
-        failedModel: 'gemini-pro',
-        fallbackModel: 'gemini-flash',
+        failedModel: "gemini-pro",
+        fallbackModel: "gemini-flash",
         resolve: vi.fn(),
       };
       mockedUseQuotaAndFallback.mockReturnValue({
@@ -889,7 +881,7 @@ describe('AppContainer State Management', () => {
       unmount();
     });
 
-    it('passes the handleProQuotaChoice function to UIActionsContext', async () => {
+    it("passes the handleProQuotaChoice function to UIActionsContext", async () => {
       // Arrange: Create a mock handler function
       const mockHandler = vi.fn();
       mockedUseQuotaAndFallback.mockReturnValue({
@@ -906,26 +898,26 @@ describe('AppContainer State Management', () => {
 
       // You can even verify that the plumbed function is callable
       act(() => {
-        capturedUIActions.handleProQuotaChoice('retry_later');
+        capturedUIActions.handleProQuotaChoice("retry_later");
       });
-      expect(mockHandler).toHaveBeenCalledWith('retry_later');
+      expect(mockHandler).toHaveBeenCalledWith("retry_later");
       unmount();
     });
   });
 
-  describe('Terminal Title Update Feature', () => {
+  describe("Terminal Title Update Feature", () => {
     beforeEach(() => {
       // Reset mock stdout for each test
       mocks.mockStdout.write.mockClear();
     });
 
-    it('verifies useStdout is mocked', async () => {
-      const { useStdout } = await import('ink');
+    it("verifies useStdout is mocked", async () => {
+      const { useStdout } = await import("ink");
       const { stdout } = useStdout();
       expect(stdout).toBe(mocks.mockStdout);
     });
 
-    it('should not update terminal title when showStatusInTitle is false', () => {
+    it("should not update terminal title when showStatusInTitle is false", () => {
       // Arrange: Set up mock settings with showStatusInTitle disabled
       const mockSettingsWithShowStatusFalse = {
         ...mockSettings,
@@ -946,14 +938,14 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that no title-related writes occurred
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(0);
       unmount();
     });
 
-    it('should not update terminal title when hideWindowTitle is true', () => {
+    it("should not update terminal title when hideWindowTitle is true", () => {
       // Arrange: Set up mock settings with hideWindowTitle enabled
       const mockSettingsWithHideTitleTrue = {
         ...mockSettings,
@@ -974,14 +966,14 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that no title-related writes occurred
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(0);
       unmount();
     });
 
-    it('should update terminal title with thought subject when in active state', () => {
+    it("should update terminal title with thought subject when in active state", () => {
       // Arrange: Set up mock settings with showStatusInTitle enabled
       const mockSettingsWithTitleEnabled = {
         ...mockSettings,
@@ -996,9 +988,9 @@ describe('AppContainer State Management', () => {
       } as unknown as LoadedSettings;
 
       // Mock the streaming state and thought
-      const thoughtSubject = 'Processing request';
+      const thoughtSubject = "Processing request";
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'responding',
+        streamingState: "responding",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
@@ -1013,17 +1005,15 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that title was updated with thought subject
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(1);
-      expect(titleWrites[0][0]).toBe(
-        `\x1b]2;${thoughtSubject.padEnd(80, ' ')}\x07`,
-      );
+      expect(titleWrites[0][0]).toBe(`\x1b]2;${thoughtSubject.padEnd(80, " ")}\x07`);
       unmount();
     });
 
-    it('should update terminal title with default text when in Idle state and no thought subject', () => {
+    it("should update terminal title with default text when in Idle state and no thought subject", () => {
       // Arrange: Set up mock settings with showStatusInTitle enabled
       const mockSettingsWithTitleEnabled = {
         ...mockSettings,
@@ -1039,7 +1029,7 @@ describe('AppContainer State Management', () => {
 
       // Mock the streaming state as Idle with no thought
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'idle',
+        streamingState: "idle",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
@@ -1054,17 +1044,15 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that title was updated with default Idle text
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(1);
-      expect(titleWrites[0][0]).toBe(
-        `\x1b]2;${'Gemini - workspace'.padEnd(80, ' ')}\x07`,
-      );
+      expect(titleWrites[0][0]).toBe(`\x1b]2;${"Gemini - workspace".padEnd(80, " ")}\x07`);
       unmount();
     });
 
-    it('should update terminal title when in WaitingForConfirmation state with thought subject', () => {
+    it("should update terminal title when in WaitingForConfirmation state with thought subject", () => {
       // Arrange: Set up mock settings with showStatusInTitle enabled
       const mockSettingsWithTitleEnabled = {
         ...mockSettings,
@@ -1079,9 +1067,9 @@ describe('AppContainer State Management', () => {
       } as unknown as LoadedSettings;
 
       // Mock the streaming state and thought
-      const thoughtSubject = 'Confirm tool execution';
+      const thoughtSubject = "Confirm tool execution";
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'waitingForConfirmation',
+        streamingState: "waitingForConfirmation",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
@@ -1096,17 +1084,15 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that title was updated with confirmation text
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(1);
-      expect(titleWrites[0][0]).toBe(
-        `\x1b]2;${thoughtSubject.padEnd(80, ' ')}\x07`,
-      );
+      expect(titleWrites[0][0]).toBe(`\x1b]2;${thoughtSubject.padEnd(80, " ")}\x07`);
       unmount();
     });
 
-    it('should pad title to exactly 80 characters', () => {
+    it("should pad title to exactly 80 characters", () => {
       // Arrange: Set up mock settings with showStatusInTitle enabled
       const mockSettingsWithTitleEnabled = {
         ...mockSettings,
@@ -1121,9 +1107,9 @@ describe('AppContainer State Management', () => {
       } as unknown as LoadedSettings;
 
       // Mock the streaming state and thought with a short subject
-      const shortTitle = 'Short';
+      const shortTitle = "Short";
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'responding',
+        streamingState: "responding",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
@@ -1138,21 +1124,21 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that title is padded to exactly 80 characters
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(1);
       const calledWith = titleWrites[0][0];
-      const expectedTitle = shortTitle.padEnd(80, ' ');
+      const expectedTitle = shortTitle.padEnd(80, " ");
 
       expect(calledWith).toContain(shortTitle);
-      expect(calledWith).toContain('\x1b]2;');
-      expect(calledWith).toContain('\x07');
-      expect(calledWith).toBe('\x1b]2;' + expectedTitle + '\x07');
+      expect(calledWith).toContain("\x1b]2;");
+      expect(calledWith).toContain("\x07");
+      expect(calledWith).toBe("\x1b]2;" + expectedTitle + "\x07");
       unmount();
     });
 
-    it('should use correct ANSI escape code format', () => {
+    it("should use correct ANSI escape code format", () => {
       // Arrange: Set up mock settings with showStatusInTitle enabled
       const mockSettingsWithTitleEnabled = {
         ...mockSettings,
@@ -1167,9 +1153,9 @@ describe('AppContainer State Management', () => {
       } as unknown as LoadedSettings;
 
       // Mock the streaming state and thought
-      const title = 'Test Title';
+      const title = "Test Title";
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'responding',
+        streamingState: "responding",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
@@ -1184,16 +1170,16 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that the correct ANSI escape sequence is used
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(1);
-      const expectedEscapeSequence = `\x1b]2;${title.padEnd(80, ' ')}\x07`;
+      const expectedEscapeSequence = `\x1b]2;${title.padEnd(80, " ")}\x07`;
       expect(titleWrites[0][0]).toBe(expectedEscapeSequence);
       unmount();
     });
 
-    it('should use CLI_TITLE environment variable when set', () => {
+    it("should use CLI_TITLE environment variable when set", () => {
       // Arrange: Set up mock settings with showStatusInTitle enabled
       const mockSettingsWithTitleEnabled = {
         ...mockSettings,
@@ -1208,11 +1194,11 @@ describe('AppContainer State Management', () => {
       } as unknown as LoadedSettings;
 
       // Mock CLI_TITLE environment variable
-      vi.stubEnv('CLI_TITLE', 'Custom Gemini Title');
+      vi.stubEnv("CLI_TITLE", "Custom Gemini Title");
 
       // Mock the streaming state as Idle with no thought
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'idle',
+        streamingState: "idle",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
@@ -1227,18 +1213,16 @@ describe('AppContainer State Management', () => {
 
       // Assert: Check that title was updated with CLI_TITLE value
       const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) =>
-        call[0].includes('\x1b]2;'),
+        call[0].includes("\x1b]2;"),
       );
 
       expect(titleWrites).toHaveLength(1);
-      expect(titleWrites[0][0]).toBe(
-        `\x1b]2;${'Custom Gemini Title'.padEnd(80, ' ')}\x07`,
-      );
+      expect(titleWrites[0][0]).toBe(`\x1b]2;${"Custom Gemini Title".padEnd(80, " ")}\x07`);
       unmount();
     });
   });
 
-  describe('Queue Error Message', () => {
+  describe("Queue Error Message", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
@@ -1247,7 +1231,7 @@ describe('AppContainer State Management', () => {
       vi.useRealTimers();
     });
 
-    it('should set and clear the queue error message after a timeout', async () => {
+    it("should set and clear the queue error message after a timeout", async () => {
       const { rerender, unmount } = renderAppContainer();
       await act(async () => {
         vi.advanceTimersByTime(0);
@@ -1256,10 +1240,10 @@ describe('AppContainer State Management', () => {
       expect(capturedUIState.queueErrorMessage).toBeNull();
 
       act(() => {
-        capturedUIActions.setQueueErrorMessage('Test error');
+        capturedUIActions.setQueueErrorMessage("Test error");
       });
       rerender(getAppContainer());
-      expect(capturedUIState.queueErrorMessage).toBe('Test error');
+      expect(capturedUIState.queueErrorMessage).toBe("Test error");
 
       act(() => {
         vi.advanceTimersByTime(3000);
@@ -1269,33 +1253,33 @@ describe('AppContainer State Management', () => {
       unmount();
     });
 
-    it('should reset the timer if a new error message is set', async () => {
+    it("should reset the timer if a new error message is set", async () => {
       const { rerender, unmount } = renderAppContainer();
       await act(async () => {
         vi.advanceTimersByTime(0);
       });
 
       act(() => {
-        capturedUIActions.setQueueErrorMessage('First error');
+        capturedUIActions.setQueueErrorMessage("First error");
       });
       rerender(getAppContainer());
-      expect(capturedUIState.queueErrorMessage).toBe('First error');
+      expect(capturedUIState.queueErrorMessage).toBe("First error");
 
       act(() => {
         vi.advanceTimersByTime(1500);
       });
 
       act(() => {
-        capturedUIActions.setQueueErrorMessage('Second error');
+        capturedUIActions.setQueueErrorMessage("Second error");
       });
       rerender(getAppContainer());
-      expect(capturedUIState.queueErrorMessage).toBe('Second error');
+      expect(capturedUIState.queueErrorMessage).toBe("Second error");
 
       act(() => {
         vi.advanceTimersByTime(2000);
       });
       rerender(getAppContainer());
-      expect(capturedUIState.queueErrorMessage).toBe('Second error');
+      expect(capturedUIState.queueErrorMessage).toBe("Second error");
 
       // 5. Advance time past the 3 second timeout from the second message
       act(() => {
@@ -1307,37 +1291,36 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Terminal Height Calculation', () => {
+  describe("Terminal Height Calculation", () => {
     const mockedMeasureElement = measureElement as Mock;
     const mockedUseTerminalSize = useTerminalSize as Mock;
 
-    it('should prevent terminal height from being less than 1', async () => {
-      const resizePtySpy = vi.spyOn(ShellExecutionService, 'resizePty');
+    it("should prevent terminal height from being less than 1", async () => {
+      const resizePtySpy = vi.spyOn(ShellExecutionService, "resizePty");
       // Arrange: Simulate a small terminal and a large footer
       mockedUseTerminalSize.mockReturnValue({ columns: 80, rows: 5 });
       mockedMeasureElement.mockReturnValue({ width: 80, height: 10 }); // Footer is taller than the screen
 
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'idle',
+        streamingState: "idle",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
         thought: null,
         cancelOngoingRequest: vi.fn(),
-        activePtyId: 'some-id',
+        activePtyId: "some-id",
       });
 
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(resizePtySpy).toHaveBeenCalled());
-      const lastCall =
-        resizePtySpy.mock.calls[resizePtySpy.mock.calls.length - 1];
+      const lastCall = resizePtySpy.mock.calls[resizePtySpy.mock.calls.length - 1];
       // Check the height argument specifically
       expect(lastCall[2]).toBe(1);
       unmount();
     });
   });
 
-  describe('Keyboard Input Handling (CTRL+C / CTRL+D)', () => {
+  describe("Keyboard Input Handling (CTRL+C / CTRL+D)", () => {
     let handleGlobalKeypress: (key: Key) => void;
     let mockHandleSlashCommand: Mock;
     let mockCancelOngoingRequest: Mock;
@@ -1359,7 +1342,7 @@ describe('AppContainer State Management', () => {
       for (let i = 0; i < times; i++) {
         act(() => {
           handleGlobalKeypress({
-            name: 'c',
+            name: "c",
             ctrl: false,
             meta: false,
             shift: false,
@@ -1390,7 +1373,7 @@ describe('AppContainer State Management', () => {
       // Mock request cancellation
       mockCancelOngoingRequest = vi.fn();
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'idle',
+        streamingState: "idle",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
@@ -1400,7 +1383,7 @@ describe('AppContainer State Management', () => {
 
       // Default empty text buffer
       mockedUseTextBuffer.mockReturnValue({
-        text: '',
+        text: "",
         setText: vi.fn(),
       });
 
@@ -1411,10 +1394,10 @@ describe('AppContainer State Management', () => {
       vi.useRealTimers();
     });
 
-    describe('CTRL+C', () => {
-      it('should cancel ongoing request on first press', async () => {
+    describe("CTRL+C", () => {
+      it("should cancel ongoing request on first press", async () => {
         mockedUseGeminiStream.mockReturnValue({
-          streamingState: 'responding',
+          streamingState: "responding",
           submitQuery: vi.fn(),
           initError: null,
           pendingHistoryItems: [],
@@ -1423,32 +1406,27 @@ describe('AppContainer State Management', () => {
         });
         await setupKeypressTest();
 
-        pressKey({ name: 'c', ctrl: true });
+        pressKey({ name: "c", ctrl: true });
 
         expect(mockCancelOngoingRequest).toHaveBeenCalledTimes(1);
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         unmount();
       });
 
-      it('should quit on second press', async () => {
+      it("should quit on second press", async () => {
         await setupKeypressTest();
 
-        pressKey({ name: 'c', ctrl: true }, 2);
+        pressKey({ name: "c", ctrl: true }, 2);
 
         expect(mockCancelOngoingRequest).toHaveBeenCalledTimes(2);
-        expect(mockHandleSlashCommand).toHaveBeenCalledWith(
-          '/quit',
-          undefined,
-          undefined,
-          false,
-        );
+        expect(mockHandleSlashCommand).toHaveBeenCalledWith("/quit", undefined, undefined, false);
         unmount();
       });
 
-      it('should reset press count after a timeout', async () => {
+      it("should reset press count after a timeout", async () => {
         await setupKeypressTest();
 
-        pressKey({ name: 'c', ctrl: true });
+        pressKey({ name: "c", ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
 
         // Advance timer past the reset threshold
@@ -1456,44 +1434,39 @@ describe('AppContainer State Management', () => {
           vi.advanceTimersByTime(1001);
         });
 
-        pressKey({ name: 'c', ctrl: true });
+        pressKey({ name: "c", ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         unmount();
       });
     });
 
-    describe('CTRL+D', () => {
-      it('should do nothing if text buffer is not empty', async () => {
+    describe("CTRL+D", () => {
+      it("should do nothing if text buffer is not empty", async () => {
         mockedUseTextBuffer.mockReturnValue({
-          text: 'some text',
+          text: "some text",
           setText: vi.fn(),
         });
         await setupKeypressTest();
 
-        pressKey({ name: 'd', ctrl: true }, 2);
+        pressKey({ name: "d", ctrl: true }, 2);
 
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         unmount();
       });
 
-      it('should quit on second press if buffer is empty', async () => {
+      it("should quit on second press if buffer is empty", async () => {
         await setupKeypressTest();
 
-        pressKey({ name: 'd', ctrl: true }, 2);
+        pressKey({ name: "d", ctrl: true }, 2);
 
-        expect(mockHandleSlashCommand).toHaveBeenCalledWith(
-          '/quit',
-          undefined,
-          undefined,
-          false,
-        );
+        expect(mockHandleSlashCommand).toHaveBeenCalledWith("/quit", undefined, undefined, false);
         unmount();
       });
 
-      it('should reset press count after a timeout', async () => {
+      it("should reset press count after a timeout", async () => {
         await setupKeypressTest();
 
-        pressKey({ name: 'd', ctrl: true });
+        pressKey({ name: "d", ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
 
         // Advance timer past the reset threshold
@@ -1501,14 +1474,14 @@ describe('AppContainer State Management', () => {
           vi.advanceTimersByTime(1001);
         });
 
-        pressKey({ name: 'd', ctrl: true });
+        pressKey({ name: "d", ctrl: true });
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         unmount();
       });
     });
   });
 
-  describe('Copy Mode (CTRL+S)', () => {
+  describe("Copy Mode (CTRL+S)", () => {
     let handleGlobalKeypress: (key: Key) => void;
     let rerender: () => void;
     let unmount: () => void;
@@ -1531,8 +1504,7 @@ describe('AppContainer State Management', () => {
         vi.advanceTimersByTime(0);
       });
 
-      rerender = () =>
-        renderResult.rerender(getAppContainer({ settings: testSettings }));
+      rerender = () => renderResult.rerender(getAppContainer({ settings: testSettings }));
       unmount = renderResult.unmount;
     };
 
@@ -1552,27 +1524,27 @@ describe('AppContainer State Management', () => {
       {
         isAlternateMode: false,
         shouldEnable: false,
-        modeName: 'Normal Mode',
+        modeName: "Normal Mode",
       },
       {
         isAlternateMode: true,
         shouldEnable: true,
-        modeName: 'Alternate Buffer Mode',
+        modeName: "Alternate Buffer Mode",
       },
-    ])('$modeName', ({ isAlternateMode, shouldEnable }) => {
-      it(`should ${shouldEnable ? 'toggle' : 'NOT toggle'} mouse off when Ctrl+S is pressed`, async () => {
+    ])("$modeName", ({ isAlternateMode, shouldEnable }) => {
+      it(`should ${shouldEnable ? "toggle" : "NOT toggle"} mouse off when Ctrl+S is pressed`, async () => {
         await setupCopyModeTest(isAlternateMode);
         mocks.mockStdout.write.mockClear(); // Clear initial enable call
 
         act(() => {
           handleGlobalKeypress({
-            name: 's',
+            name: "s",
             ctrl: true,
             meta: false,
             shift: false,
             paste: false,
             insertable: false,
-            sequence: '\x13',
+            sequence: "\x13",
           });
         });
         rerender();
@@ -1586,20 +1558,20 @@ describe('AppContainer State Management', () => {
       });
 
       if (shouldEnable) {
-        it('should toggle mouse back on when Ctrl+S is pressed again', async () => {
+        it("should toggle mouse back on when Ctrl+S is pressed again", async () => {
           await setupCopyModeTest(isAlternateMode);
           (writeToStdout as Mock).mockClear();
 
           // Turn it on (disable mouse)
           act(() => {
             handleGlobalKeypress({
-              name: 's',
+              name: "s",
               ctrl: true,
               meta: false,
               shift: false,
               paste: false,
               insertable: false,
-              sequence: '\x13',
+              sequence: "\x13",
             });
           });
           rerender();
@@ -1608,13 +1580,13 @@ describe('AppContainer State Management', () => {
           // Turn it off (enable mouse)
           act(() => {
             handleGlobalKeypress({
-              name: 'any', // Any key should exit copy mode
+              name: "any", // Any key should exit copy mode
               ctrl: false,
               meta: false,
               shift: false,
               paste: false,
               insertable: true,
-              sequence: 'a',
+              sequence: "a",
             });
           });
           rerender();
@@ -1623,19 +1595,19 @@ describe('AppContainer State Management', () => {
           unmount();
         });
 
-        it('should exit copy mode on any key press', async () => {
+        it("should exit copy mode on any key press", async () => {
           await setupCopyModeTest(isAlternateMode);
 
           // Enter copy mode
           act(() => {
             handleGlobalKeypress({
-              name: 's',
+              name: "s",
               ctrl: true,
               meta: false,
               shift: false,
               paste: false,
               insertable: false,
-              sequence: '\x13',
+              sequence: "\x13",
             });
           });
           rerender();
@@ -1645,13 +1617,13 @@ describe('AppContainer State Management', () => {
           // Press any other key
           act(() => {
             handleGlobalKeypress({
-              name: 'a',
+              name: "a",
               ctrl: false,
               meta: false,
               shift: false,
               paste: false,
               insertable: true,
-              sequence: 'a',
+              sequence: "a",
             });
           });
           rerender();
@@ -1664,8 +1636,8 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('Model Dialog Integration', () => {
-    it('should provide isModelDialogOpen in the UIStateContext', async () => {
+  describe("Model Dialog Integration", () => {
+    it("should provide isModelDialogOpen in the UIStateContext", async () => {
       mockedUseModelCommand.mockReturnValue({
         isModelDialogOpen: true,
         openModelDialog: vi.fn(),
@@ -1679,7 +1651,7 @@ describe('AppContainer State Management', () => {
       unmount();
     });
 
-    it('should provide model dialog actions in the UIActionsContext', async () => {
+    it("should provide model dialog actions in the UIActionsContext", async () => {
       const mockCloseModelDialog = vi.fn();
 
       mockedUseModelCommand.mockReturnValue({
@@ -1700,32 +1672,26 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('CoreEvents Integration', () => {
-    it('subscribes to UserFeedback and drains backlog on mount', async () => {
+  describe("CoreEvents Integration", () => {
+    it("subscribes to UserFeedback and drains backlog on mount", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
 
-      expect(mockCoreEvents.on).toHaveBeenCalledWith(
-        CoreEvent.UserFeedback,
-        expect.any(Function),
-      );
+      expect(mockCoreEvents.on).toHaveBeenCalledWith(CoreEvent.UserFeedback, expect.any(Function));
       expect(mockCoreEvents.drainBacklogs).toHaveBeenCalledTimes(1);
       unmount();
     });
 
-    it('unsubscribes from UserFeedback on unmount', async () => {
+    it("unsubscribes from UserFeedback on unmount", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
 
       unmount();
 
-      expect(mockCoreEvents.off).toHaveBeenCalledWith(
-        CoreEvent.UserFeedback,
-        expect.any(Function),
-      );
+      expect(mockCoreEvents.off).toHaveBeenCalledWith(CoreEvent.UserFeedback, expect.any(Function));
     });
 
-    it('adds history item when UserFeedback event is received', async () => {
+    it("adds history item when UserFeedback event is received", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
 
@@ -1737,8 +1703,8 @@ describe('AppContainer State Management', () => {
 
       // Simulate an event
       const payload: UserFeedbackPayload = {
-        severity: 'error',
-        message: 'Test error message',
+        severity: "error",
+        message: "Test error message",
       };
       act(() => {
         handler(payload);
@@ -1746,21 +1712,21 @@ describe('AppContainer State Management', () => {
 
       expect(mockedUseHistory().addItem).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'error',
-          text: 'Test error message',
+          type: "error",
+          text: "Test error message",
         }),
         expect.any(Number),
       );
       unmount();
     });
 
-    it('updates currentModel when ModelChanged event is received', async () => {
+    it("updates currentModel when ModelChanged event is received", async () => {
       // Arrange: Mock initial model
-      vi.spyOn(mockConfig, 'getModel').mockReturnValue('initial-model');
+      vi.spyOn(mockConfig, "getModel").mockReturnValue("initial-model");
 
       const { unmount } = renderAppContainer();
       await waitFor(() => {
-        expect(capturedUIState?.currentModel).toBe('initial-model');
+        expect(capturedUIState?.currentModel).toBe("initial-model");
       });
 
       // Get the registered handler for ModelChanged
@@ -1771,31 +1737,29 @@ describe('AppContainer State Management', () => {
 
       // Act: Simulate ModelChanged event
       act(() => {
-        handler({ model: 'new-model' });
+        handler({ model: "new-model" });
       });
 
       // Assert: Verify model is updated
-      expect(capturedUIState.currentModel).toBe('new-model');
+      expect(capturedUIState.currentModel).toBe("new-model");
       unmount();
     });
   });
 
-  describe('Shell Interaction', () => {
-    it('should not crash if resizing the pty fails', async () => {
-      const resizePtySpy = vi
-        .spyOn(ShellExecutionService, 'resizePty')
-        .mockImplementation(() => {
-          throw new Error('Cannot resize a pty that has already exited');
-        });
+  describe("Shell Interaction", () => {
+    it("should not crash if resizing the pty fails", async () => {
+      const resizePtySpy = vi.spyOn(ShellExecutionService, "resizePty").mockImplementation(() => {
+        throw new Error("Cannot resize a pty that has already exited");
+      });
 
       mockedUseGeminiStream.mockReturnValue({
-        streamingState: 'idle',
+        streamingState: "idle",
         submitQuery: vi.fn(),
         initError: null,
         pendingHistoryItems: [],
         thought: null,
         cancelOngoingRequest: vi.fn(),
-        activePtyId: 'some-pty-id', // Make sure activePtyId is set
+        activePtyId: "some-pty-id", // Make sure activePtyId is set
       });
 
       // The main assertion is that the render does not throw.
@@ -1805,12 +1769,12 @@ describe('AppContainer State Management', () => {
       unmount();
     });
   });
-  describe('Banner Text', () => {
-    it('should render placeholder banner text for USE_GEMINI auth type', async () => {
+  describe("Banner Text", () => {
+    it("should render placeholder banner text for USE_GEMINI auth type", async () => {
       const config = makeFakeConfig();
-      vi.spyOn(config, 'getContentGeneratorConfig').mockReturnValue({
+      vi.spyOn(config, "getContentGeneratorConfig").mockReturnValue({
         authType: AuthType.USE_GEMINI,
-        apiKey: 'fake-key',
+        apiKey: "fake-key",
       });
       const { unmount } = renderAppContainer();
       await waitFor(() => {
@@ -1820,7 +1784,7 @@ describe('AppContainer State Management', () => {
     });
   });
 
-  describe('onCancelSubmit Behavior', () => {
+  describe("onCancelSubmit Behavior", () => {
     let mockSetText: Mock;
 
     // Helper to extract arguments from the useGeminiStream hook call
@@ -1832,60 +1796,54 @@ describe('AppContainer State Management', () => {
     beforeEach(() => {
       mockSetText = vi.fn();
       mockedUseTextBuffer.mockReturnValue({
-        text: '',
+        text: "",
         setText: mockSetText,
       });
     });
 
-    it('clears the prompt when onCancelSubmit is called with shouldRestorePrompt=false', async () => {
+    it("clears the prompt when onCancelSubmit is called with shouldRestorePrompt=false", async () => {
       const { unmount } = renderAppContainer();
       await waitFor(() => expect(capturedUIState).toBeTruthy());
 
-      const { onCancelSubmit } = extractUseGeminiStreamArgs(
-        mockedUseGeminiStream.mock.lastCall!,
-      );
+      const { onCancelSubmit } = extractUseGeminiStreamArgs(mockedUseGeminiStream.mock.lastCall!);
 
       act(() => {
         onCancelSubmit(false);
       });
 
-      expect(mockSetText).toHaveBeenCalledWith('');
+      expect(mockSetText).toHaveBeenCalledWith("");
 
       unmount();
     });
 
-    it('restores the prompt when onCancelSubmit is called with shouldRestorePrompt=true (or undefined)', async () => {
+    it("restores the prompt when onCancelSubmit is called with shouldRestorePrompt=true (or undefined)", async () => {
       // Mock useInputHistoryStore to provide input history
       mockedUseInputHistoryStore.mockReturnValue({
-        inputHistory: ['previous message'],
+        inputHistory: ["previous message"],
         addInput: vi.fn(),
         initializeFromLogger: vi.fn(),
       });
 
       const { unmount } = renderAppContainer();
-      await waitFor(() =>
-        expect(capturedUIState.userMessages).toContain('previous message'),
-      );
+      await waitFor(() => expect(capturedUIState.userMessages).toContain("previous message"));
 
-      const { onCancelSubmit } = extractUseGeminiStreamArgs(
-        mockedUseGeminiStream.mock.lastCall!,
-      );
+      const { onCancelSubmit } = extractUseGeminiStreamArgs(mockedUseGeminiStream.mock.lastCall!);
 
       await act(async () => {
         onCancelSubmit(true);
       });
 
-      expect(mockSetText).toHaveBeenCalledWith('previous message');
+      expect(mockSetText).toHaveBeenCalledWith("previous message");
 
       unmount();
     });
 
-    it('input history is independent from conversation history (survives /clear)', async () => {
+    it("input history is independent from conversation history (survives /clear)", async () => {
       // This test verifies that input history (used for up-arrow navigation) is maintained
       // separately from conversation history and survives /clear operations.
       const mockAddInput = vi.fn();
       mockedUseInputHistoryStore.mockReturnValue({
-        inputHistory: ['first prompt', 'second prompt'],
+        inputHistory: ["first prompt", "second prompt"],
         addInput: mockAddInput,
         initializeFromLogger: vi.fn(),
       });
@@ -1893,10 +1851,8 @@ describe('AppContainer State Management', () => {
       const { unmount } = renderAppContainer();
 
       // Verify userMessages is populated from inputHistory
-      await waitFor(() =>
-        expect(capturedUIState.userMessages).toContain('first prompt'),
-      );
-      expect(capturedUIState.userMessages).toContain('second prompt');
+      await waitFor(() => expect(capturedUIState.userMessages).toContain("first prompt"));
+      expect(capturedUIState.userMessages).toContain("second prompt");
 
       // Clear the conversation history (simulating /clear command)
       const mockClearItems = vi.fn();
@@ -1910,20 +1866,18 @@ describe('AppContainer State Management', () => {
 
       // Verify that userMessages still contains the input history
       // (it should not be affected by clearing conversation history)
-      expect(capturedUIState.userMessages).toContain('first prompt');
-      expect(capturedUIState.userMessages).toContain('second prompt');
+      expect(capturedUIState.userMessages).toContain("first prompt");
+      expect(capturedUIState.userMessages).toContain("second prompt");
 
       unmount();
     });
   });
 
-  describe('Regression Tests', () => {
-    it('does not refresh static on startup if banner text is empty', async () => {
+  describe("Regression Tests", () => {
+    it("does not refresh static on startup if banner text is empty", async () => {
       // Mock banner text to be empty strings
-      vi.spyOn(mockConfig, 'getBannerTextNoCapacityIssues').mockResolvedValue(
-        '',
-      );
-      vi.spyOn(mockConfig, 'getBannerTextCapacityIssues').mockResolvedValue('');
+      vi.spyOn(mockConfig, "getBannerTextNoCapacityIssues").mockResolvedValue("");
+      vi.spyOn(mockConfig, "getBannerTextCapacityIssues").mockResolvedValue("");
 
       // Clear previous calls
       mocks.mockStdout.write.mockClear();
diff --git a/packages/ui-gemini/src/ui/AppContainer.tsx b/packages/ui-gemini/src/ui/AppContainer.tsx
index e5e3f63b1..cd7909f91 100644
--- a/packages/ui-gemini/src/ui/AppContainer.tsx
+++ b/packages/ui-gemini/src/ui/AppContainer.tsx
@@ -4,139 +4,124 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import * as fs from "node:fs";
+import { basename } from "node:path";
+import process from "node:process";
 import {
-  useMemo,
-  useState,
-  useCallback,
-  useEffect,
-  useRef,
-  useLayoutEffect,
-} from 'react';
-import { type DOMElement, measureElement } from 'ink';
-import { App } from './App.js';
-import { AppContext } from './contexts/AppContext.js';
-import { UIStateContext, type UIState } from './contexts/UIStateContext.js';
-import {
-  UIActionsContext,
-  type UIActions,
-} from './contexts/UIActionsContext.js';
-import { ConfigContext } from './contexts/ConfigContext.js';
-import {
-  type HistoryItem,
-  ToolCallStatus,
-  type HistoryItemWithoutId,
-  AuthState,
-} from './types.js';
-import { MessageType, StreamingState } from './types.js';
-import {
-  type EditorType,
+  AuthType,
   type Config,
-  type IdeInfo,
-  type IdeContext,
-  type UserTierId,
-  type UserFeedbackPayload,
+  CoreEvent,
+  clearCachedCredentialFile,
+  coreEvents,
   DEFAULT_GEMINI_FLASH_MODEL,
+  debugLogger,
+  disableLineWrapping,
+  disableMouseEvents,
+  type EditorType,
+  enableMouseEvents,
+  enterAlternateScreen,
+  fireSessionEndHook,
+  fireSessionStartHook,
+  generateSummary,
+  getAllGeminiMdFilenames,
+  getErrorMessage,
   IdeClient,
+  type IdeContext,
+  type IdeInfo,
   ideContextStore,
-  getErrorMessage,
-  getAllGeminiMdFilenames,
-  AuthType,
-  clearCachedCredentialFile,
+  type MemoryChangedPayload,
+  type ModelChangedPayload,
   type ResumedSessionData,
   recordExitFail,
+  refreshServerHierarchicalMemory,
+  SessionEndReason,
+  SessionStartSource,
   ShellExecutionService,
   saveApiKey,
-  debugLogger,
-  coreEvents,
-  CoreEvent,
-  refreshServerHierarchicalMemory,
-  type ModelChangedPayload,
-  type MemoryChangedPayload,
-  writeToStdout,
-  disableMouseEvents,
-  enterAlternateScreen,
-  enableMouseEvents,
-  disableLineWrapping,
   shouldEnterAlternateScreen,
   startupProfiler,
-  SessionStartSource,
-  SessionEndReason,
-  fireSessionStartHook,
-  fireSessionEndHook,
-  generateSummary,
-} from '@airiscode/gemini-cli-core';
-import { validateAuthMethod } from '../config/auth.js';
-import process from 'node:process';
-import { useHistory } from './hooks/useHistoryManager.js';
-import { useMemoryMonitor } from './hooks/useMemoryMonitor.js';
-import { useThemeCommand } from './hooks/useThemeCommand.js';
-import { useAuthCommand } from './auth/useAuth.js';
-import { useQuotaAndFallback } from './hooks/useQuotaAndFallback.js';
-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 { useVimMode } from './contexts/VimModeContext.js';
-import { useConsoleMessages } from './hooks/useConsoleMessages.js';
-import { useTerminalSize } from './hooks/useTerminalSize.js';
-import { calculatePromptWidths } from './components/InputPrompt.js';
-import { useApp, useStdout, useStdin } from 'ink';
-import { calculateMainAreaWidth } from './utils/ui-sizing.js';
-import ansiEscapes from 'ansi-escapes';
-import * as fs from 'node:fs';
-import { basename } from 'node:path';
-import { computeWindowTitle } from '../utils/windowTitle.js';
-import { useTextBuffer } from './components/shared/text-buffer.js';
-import { useLogger } from './hooks/useLogger.js';
-import { useGeminiStream } from './hooks/useGeminiStream.js';
-import { useVim } from './hooks/vim.js';
-import { type LoadableSettingScope, SettingScope } from '../config/settings.js';
-import { type InitializationResult } from '../core/initializer.js';
-import { useFocus } from './hooks/useFocus.js';
-import { useBracketedPaste } from './hooks/useBracketedPaste.js';
-import { useKeypress, type Key } from './hooks/useKeypress.js';
-import { keyMatchers, Command } from './keyMatchers.js';
-import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
-import { useFolderTrust } from './hooks/useFolderTrust.js';
-import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
-import { type IdeIntegrationNudgeResult } from './IdeIntegrationNudge.js';
-import { appEvents, AppEvent } from '../utils/events.js';
-import { type UpdateObject } from './utils/updateCheck.js';
-import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
-import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
-import { RELAUNCH_EXIT_CODE } from '../utils/processUtils.js';
-import type { SessionInfo } from '../utils/sessionUtils.js';
-import { useMessageQueue } from './hooks/useMessageQueue.js';
-import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
-import { useSessionStats } from './contexts/SessionContext.js';
-import { useGitBranchName } from './hooks/useGitBranchName.js';
+  type UserFeedbackPayload,
+  type UserTierId,
+  writeToStdout,
+} from "@airiscode/gemini-cli-core";
+import ansiEscapes from "ansi-escapes";
+import { type DOMElement, measureElement, useApp, useStdin, useStdout } from "ink";
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { validateAuthMethod } from "../config/auth.js";
+import { type ExtensionManager } from "../config/extension-manager.js";
+import { requestConsentInteractive } from "../config/extensions/consent.js";
+import { type LoadableSettingScope, SettingScope } from "../config/settings.js";
+import { isWorkspaceTrusted } from "../config/trustedFolders.js";
+import { type InitializationResult } from "../core/initializer.js";
+import { registerCleanup, runExitCleanup } from "../utils/cleanup.js";
+import { AppEvent, appEvents } from "../utils/events.js";
+import { setUpdateHandler } from "../utils/handleAutoUpdate.js";
+import { RELAUNCH_EXIT_CODE } from "../utils/processUtils.js";
+import type { SessionInfo } from "../utils/sessionUtils.js";
+import { computeWindowTitle } from "../utils/windowTitle.js";
+import { App } from "./App.js";
+import { useAuthCommand } from "./auth/useAuth.js";
+import { calculatePromptWidths } from "./components/InputPrompt.js";
+import { useTextBuffer } from "./components/shared/text-buffer.js";
+import { AppContext } from "./contexts/AppContext.js";
+import { ConfigContext } from "./contexts/ConfigContext.js";
+import { useSessionStats } from "./contexts/SessionContext.js";
+import { useSettings } from "./contexts/SettingsContext.js";
+import { ShellFocusContext } from "./contexts/ShellFocusContext.js";
+import { type UIActions, UIActionsContext } from "./contexts/UIActionsContext.js";
+import { type UIState, UIStateContext } from "./contexts/UIStateContext.js";
+import { useVimMode } from "./contexts/VimModeContext.js";
+import { useSlashCommandProcessor } from "./hooks/slashCommandProcessor.js";
+import { useAlternateBuffer } from "./hooks/useAlternateBuffer.js";
+import { useAutoAcceptIndicator } from "./hooks/useAutoAcceptIndicator.js";
+import { useBanner } from "./hooks/useBanner.js";
+import { useBracketedPaste } from "./hooks/useBracketedPaste.js";
+import { useConsoleMessages } from "./hooks/useConsoleMessages.js";
+import { useEditorSettings } from "./hooks/useEditorSettings.js";
+import { useConfirmUpdateRequests, useExtensionUpdates } from "./hooks/useExtensionUpdates.js";
+import { useFocus } from "./hooks/useFocus.js";
+import { useFolderTrust } from "./hooks/useFolderTrust.js";
+import { useGeminiStream } from "./hooks/useGeminiStream.js";
+import { useGitBranchName } from "./hooks/useGitBranchName.js";
+import { useHistory } from "./hooks/useHistoryManager.js";
+import { useIdeTrustListener } from "./hooks/useIdeTrustListener.js";
+import { useIncludeDirsTrust } from "./hooks/useIncludeDirsTrust.js";
+import { useInputHistoryStore } from "./hooks/useInputHistoryStore.js";
+import { type Key, useKeypress } from "./hooks/useKeypress.js";
+import { useLoadingIndicator } from "./hooks/useLoadingIndicator.js";
+import { useLogger } from "./hooks/useLogger.js";
+import { useMemoryMonitor } from "./hooks/useMemoryMonitor.js";
+import { useMessageQueue } from "./hooks/useMessageQueue.js";
+import { useModelCommand } from "./hooks/useModelCommand.js";
+import { useQuotaAndFallback } from "./hooks/useQuotaAndFallback.js";
+import { useSessionBrowser } from "./hooks/useSessionBrowser.js";
+import { useSessionResume } from "./hooks/useSessionResume.js";
+import { useSettingsCommand } from "./hooks/useSettingsCommand.js";
+import { useTerminalSize } from "./hooks/useTerminalSize.js";
+import { useThemeCommand } from "./hooks/useThemeCommand.js";
+import { useVim } from "./hooks/vim.js";
+import { type IdeIntegrationNudgeResult } from "./IdeIntegrationNudge.js";
+import { Command, keyMatchers } from "./keyMatchers.js";
 import {
-  useConfirmUpdateRequests,
-  useExtensionUpdates,
-} from './hooks/useExtensionUpdates.js';
-import { ShellFocusContext } from './contexts/ShellFocusContext.js';
-import { type ExtensionManager } from '../config/extension-manager.js';
-import { requestConsentInteractive } from '../config/extensions/consent.js';
-import { useSessionBrowser } from './hooks/useSessionBrowser.js';
-import { useSessionResume } from './hooks/useSessionResume.js';
-import { useIncludeDirsTrust } from './hooks/useIncludeDirsTrust.js';
-import { isWorkspaceTrusted } from '../config/trustedFolders.js';
-import { useAlternateBuffer } from './hooks/useAlternateBuffer.js';
-import { useSettings } from './contexts/SettingsContext.js';
-import { enableSupportedProtocol } from './utils/kittyProtocolDetector.js';
-import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
-import { enableBracketedPaste } from './utils/bracketedPaste.js';
-import { useBanner } from './hooks/useBanner.js';
+  AuthState,
+  type HistoryItem,
+  type HistoryItemWithoutId,
+  MessageType,
+  StreamingState,
+  ToolCallStatus,
+} from "./types.js";
+import { enableBracketedPaste } from "./utils/bracketedPaste.js";
+import { enableSupportedProtocol } from "./utils/kittyProtocolDetector.js";
+import { calculateMainAreaWidth } from "./utils/ui-sizing.js";
+import { type UpdateObject } from "./utils/updateCheck.js";
 
 const WARNING_PROMPT_DURATION_MS = 1000;
 const QUEUE_ERROR_DISPLAY_DURATION_MS = 3000;
 
 function isToolExecuting(pendingHistoryItems: HistoryItemWithoutId[]) {
   return pendingHistoryItems.some((item) => {
-    if (item && item.type === 'tool_group') {
-      return item.tools.some(
-        (tool) => ToolCallStatus.Executing === tool.status,
-      );
+    if (item && item.type === "tool_group") {
+      return item.tools.some((tool) => ToolCallStatus.Executing === tool.status);
     }
     return false;
   });
@@ -171,38 +156,29 @@ export const AppContainer = (props: AppContainerProps) => {
   const settings = useSettings();
   const isAlternateBuffer = useAlternateBuffer();
   const [corgiMode, setCorgiMode] = useState(false);
-  const [debugMessage, setDebugMessage] = useState<string>('');
-  const [quittingMessages, setQuittingMessages] = useState<
-    HistoryItem[] | null
-  >(null);
+  const [debugMessage, setDebugMessage] = useState<string>("");
+  const [quittingMessages, setQuittingMessages] = useState<HistoryItem[] | null>(null);
   const [showPrivacyNotice, setShowPrivacyNotice] = useState<boolean>(false);
-  const [themeError, setThemeError] = useState<string | null>(
-    initializationResult.themeError,
-  );
+  const [themeError, setThemeError] = useState<string | null>(initializationResult.themeError);
   const [isProcessing, setIsProcessing] = useState<boolean>(false);
   const [embeddedShellFocused, setEmbeddedShellFocused] = useState(false);
   const [showDebugProfiler, setShowDebugProfiler] = useState(false);
-  const [customDialog, setCustomDialog] = useState<React.ReactNode | null>(
-    null,
-  );
+  const [customDialog, setCustomDialog] = useState<React.ReactNode | null>(null);
   const [copyModeEnabled, setCopyModeEnabled] = useState(false);
   const [pendingRestorePrompt, setPendingRestorePrompt] = useState(false);
 
   const [shellModeActive, setShellModeActive] = useState(false);
-  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] =
-    useState<boolean>(false);
+  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = useState<boolean>(false);
   const [historyRemountKey, setHistoryRemountKey] = useState(0);
   const [updateInfo, setUpdateInfo] = useState<UpdateObject | null>(null);
   const [isTrustedFolder, setIsTrustedFolder] = useState<boolean | undefined>(
     isWorkspaceTrusted(settings.merged).isTrusted,
   );
 
-  const [queueErrorMessage, setQueueErrorMessage] = useState<string | null>(
-    null,
-  );
+  const [queueErrorMessage, setQueueErrorMessage] = useState<string | null>(null);
 
-  const [defaultBannerText, setDefaultBannerText] = useState('');
-  const [warningBannerText, setWarningBannerText] = useState('');
+  const [defaultBannerText, setDefaultBannerText] = useState("");
+  const [warningBannerText, setWarningBannerText] = useState("");
   const [bannerVisible, setBannerVisible] = useState(true);
 
   const bannerData = useMemo(
@@ -224,36 +200,27 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const { addConfirmUpdateExtensionRequest, confirmUpdateExtensionRequests } =
     useConfirmUpdateRequests();
-  const {
-    extensionsUpdateState,
-    extensionsUpdateStateInternal,
-    dispatchExtensionStateUpdate,
-  } = useExtensionUpdates(
-    extensionManager,
-    historyManager.addItem,
-    config.getEnableExtensionReloading(),
-  );
+  const { extensionsUpdateState, extensionsUpdateStateInternal, dispatchExtensionStateUpdate } =
+    useExtensionUpdates(
+      extensionManager,
+      historyManager.addItem,
+      config.getEnableExtensionReloading(),
+    );
 
   const [isPermissionsDialogOpen, setPermissionsDialogOpen] = useState(false);
   const [permissionsDialogProps, setPermissionsDialogProps] = useState<{
     targetDirectory?: string;
   } | null>(null);
-  const openPermissionsDialog = useCallback(
-    (props?: { targetDirectory?: string }) => {
-      setPermissionsDialogOpen(true);
-      setPermissionsDialogProps(props ?? null);
-    },
-    [],
-  );
+  const openPermissionsDialog = useCallback((props?: { targetDirectory?: string }) => {
+    setPermissionsDialogOpen(true);
+    setPermissionsDialogProps(props ?? null);
+  }, []);
   const closePermissionsDialog = useCallback(() => {
     setPermissionsDialogOpen(false);
     setPermissionsDialogProps(null);
   }, []);
 
-  const toggleDebugProfiler = useCallback(
-    () => setShowDebugProfiler((prev) => !prev),
-    [],
-  );
+  const toggleDebugProfiler = useCallback(() => setShowDebugProfiler((prev) => !prev), []);
 
   // Helper to determine the effective model, considering the fallback state.
   const getEffectiveModel = useCallback(() => {
@@ -270,8 +237,7 @@ export const AppContainer = (props: AppContainerProps) => {
   const [isConfigInitialized, setConfigInitialized] = useState(false);
 
   const logger = useLogger(config.storage);
-  const { inputHistory, addInput, initializeFromLogger } =
-    useInputHistoryStore();
+  const { inputHistory, addInput, initializeFromLogger } = useInputHistoryStore();
 
   // Terminal and layout hooks
   const { columns: terminalWidth, rows: terminalHeight } = useTerminalSize();
@@ -287,9 +253,7 @@ export const AppContainer = (props: AppContainerProps) => {
   const mainControlsRef = useRef<DOMElement>(null);
   // For performance profiling only
   const rootUiRef = useRef<DOMElement>(null);
-  const originalTitleRef = useRef(
-    computeWindowTitle(basename(config.getTargetDir())),
-  );
+  const originalTitleRef = useRef(computeWindowTitle(basename(config.getTargetDir())));
   const lastTitleRef = useRef<string | null>(null);
   const staticExtraHeight = 3;
 
@@ -315,7 +279,7 @@ export const AppContainer = (props: AppContainerProps) => {
 
       // Fire-and-forget: generate summary for previous session in background
       generateSummary(config).catch((e) => {
-        debugLogger.warn('Background summary generation failed:', e);
+        debugLogger.warn("Background summary generation failed:", e);
       });
     })();
     registerCleanup(async () => {
@@ -357,14 +321,12 @@ export const AppContainer = (props: AppContainerProps) => {
     };
   }, [getEffectiveModel]);
 
-  const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } =
-    useConsoleMessages();
+  const { consoleMessages, clearConsoleMessages: clearConsoleMessagesState } = useConsoleMessages();
 
   const mainAreaWidth = calculateMainAreaWidth(terminalWidth, settings);
   // Derive widths for InputPrompt using shared helper
   const { inputWidth, suggestionsWidth } = useMemo(() => {
-    const { inputWidth, suggestionsWidth } =
-      calculatePromptWidths(mainAreaWidth);
+    const { inputWidth, suggestionsWidth } = calculatePromptWidths(mainAreaWidth);
     return { inputWidth, suggestionsWidth };
   }, [mainAreaWidth]);
 
@@ -379,7 +341,7 @@ export const AppContainer = (props: AppContainerProps) => {
   }, []);
 
   const buffer = useTextBuffer({
-    initialText: '',
+    initialText: "",
     viewport: { height: 10, width: inputWidth },
     stdin,
     setRawMode,
@@ -401,9 +363,7 @@ export const AppContainer = (props: AppContainerProps) => {
   }, [setHistoryRemountKey, isAlternateBuffer, stdout]);
 
   const handleEditorClose = useCallback(() => {
-    if (
-      shouldEnterAlternateScreen(isAlternateBuffer, config.getScreenReader())
-    ) {
+    if (shouldEnterAlternateScreen(isAlternateBuffer, config.getScreenReader())) {
       // The editor may have exited alternate buffer mode so we need to
       // enter it again to be safe.
       enterAlternateScreen();
@@ -448,14 +408,8 @@ export const AppContainer = (props: AppContainerProps) => {
     initializationResult.themeError,
   );
 
-  const {
-    authState,
-    setAuthState,
-    authError,
-    onAuthError,
-    apiKeyDefaultValue,
-    reloadApiKey,
-  } = useAuthCommand(settings, config);
+  const { authState, setAuthState, authError, onAuthError, apiKeyDefaultValue, reloadApiKey } =
+    useAuthCommand(settings, config);
 
   const { proQuotaRequest, handleProQuotaChoice } = useQuotaAndFallback({
     config,
@@ -500,22 +454,17 @@ export const AppContainer = (props: AppContainerProps) => {
     async (authType: AuthType | undefined, scope: LoadableSettingScope) => {
       if (authType) {
         await clearCachedCredentialFile();
-        settings.setValue(scope, 'security.auth.selectedType', authType);
+        settings.setValue(scope, "security.auth.selectedType", authType);
 
         try {
           await config.refreshAuth(authType);
           setAuthState(AuthState.Authenticated);
         } catch (e) {
-          onAuthError(
-            `Failed to authenticate: ${e instanceof Error ? e.message : String(e)}`,
-          );
+          onAuthError(`Failed to authenticate: ${e instanceof Error ? e.message : String(e)}`);
           return;
         }
 
-        if (
-          authType === AuthType.LOGIN_WITH_GOOGLE &&
-          config.isBrowserLaunchSuppressed()
-        ) {
+        if (authType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
           await runExitCleanup();
           writeToStdout(`
 ----------------------------------------------------------------
@@ -535,9 +484,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       try {
         onAuthError(null);
         if (!apiKey.trim() && apiKey.length > 1) {
-          onAuthError(
-            'API key cannot be empty string with length greater than 1.',
-          );
+          onAuthError("API key cannot be empty string with length greater than 1.");
           return;
         }
 
@@ -546,9 +493,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         await config.refreshAuth(AuthType.USE_GEMINI);
         setAuthState(AuthState.Authenticated);
       } catch (e) {
-        onAuthError(
-          `Failed to save API key: ${e instanceof Error ? e.message : String(e)}`,
-        );
+        onAuthError(`Failed to save API key: ${e instanceof Error ? e.message : String(e)}`);
       }
     },
     [setAuthState, onAuthError, reloadApiKey, config],
@@ -572,8 +517,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     if (
       settings.merged.security?.auth?.enforcedType &&
       settings.merged.security?.auth.selectedType &&
-      settings.merged.security?.auth.enforcedType !==
-        settings.merged.security?.auth.selectedType
+      settings.merged.security?.auth.enforcedType !== settings.merged.security?.auth.selectedType
     ) {
       onAuthError(
         `Authentication is enforced to be ${settings.merged.security?.auth.enforcedType}, but you are currently using ${settings.merged.security?.auth.selectedType}.`,
@@ -582,9 +526,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       settings.merged.security?.auth?.selectedType &&
       !settings.merged.security?.auth?.useExternal
     ) {
-      const error = validateAuthMethod(
-        settings.merged.security.auth.selectedType,
-      );
+      const error = validateAuthMethod(settings.merged.security.auth.selectedType);
       if (error) {
         onAuthError(error);
       }
@@ -597,18 +539,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
   ]);
 
   const [editorError, setEditorError] = useState<string | null>(null);
-  const {
-    isEditorDialogOpen,
-    openEditorDialog,
-    handleEditorSelect,
-    exitEditorDialog,
-  } = useEditorSettings(settings, setEditorError, historyManager.addItem);
+  const { isEditorDialogOpen, openEditorDialog, handleEditorSelect, exitEditorDialog } =
+    useEditorSettings(settings, setEditorError, historyManager.addItem);
 
-  const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } =
-    useSettingsCommand();
+  const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
 
-  const { isModelDialogOpen, openModelDialog, closeModelDialog } =
-    useModelCommand();
+  const { isModelDialogOpen, openModelDialog, closeModelDialog } = useModelCommand();
 
   const { toggleVimEnabled } = useVimMode();
 
@@ -680,13 +616,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
     historyManager.addItem(
       {
         type: MessageType.INFO,
-        text: 'Refreshing hierarchical memory (GEMINI.md or other context files)...',
+        text: "Refreshing hierarchical memory (GEMINI.md or other context files)...",
       },
       Date.now(),
     );
     try {
-      const { memoryContent, fileCount } =
-        await refreshServerHierarchicalMemory(config);
+      const { memoryContent, fileCount } = await refreshServerHierarchicalMemory(config);
 
       historyManager.addItem(
         {
@@ -694,17 +629,14 @@ Logging in with Google... Restarting Gemini CLI to continue.
           text: `Memory refreshed successfully. ${
             memoryContent.length > 0
               ? `Loaded ${memoryContent.length} characters from ${fileCount} file(s).`
-              : 'No memory content found.'
+              : "No memory content found."
           }`,
         },
         Date.now(),
       );
       if (config.getDebugMode()) {
         debugLogger.log(
-          `[DEBUG] Refreshed memory content in config: ${memoryContent.substring(
-            0,
-            200,
-          )}...`,
+          `[DEBUG] Refreshed memory content in config: ${memoryContent.substring(0, 200)}...`,
         );
       }
     } catch (error) {
@@ -716,13 +648,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
         },
         Date.now(),
       );
-      debugLogger.warn('Error refreshing memory:', error);
+      debugLogger.warn("Error refreshing memory:", error);
     }
   }, [config, historyManager]);
 
-  const cancelHandlerRef = useRef<(shouldRestorePrompt?: boolean) => void>(
-    () => {},
-  );
+  const cancelHandlerRef = useRef<(shouldRestorePrompt?: boolean) => void>(() => {});
 
   const getPreferredEditor = useCallback(
     () => settings.merged.general?.preferredEditor as EditorType,
@@ -740,15 +670,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   useEffect(() => {
     if (pendingRestorePrompt) {
-      const lastHistoryUserMsg = historyManager.history.findLast(
-        (h) => h.type === 'user',
-      );
+      const lastHistoryUserMsg = historyManager.history.findLast((h) => h.type === "user");
       const lastUserMsg = inputHistory.at(-1);
 
       if (
         !lastHistoryUserMsg ||
-        (typeof lastHistoryUserMsg.text === 'string' &&
-          lastHistoryUserMsg.text === lastUserMsg)
+        (typeof lastHistoryUserMsg.text === "string" && lastHistoryUserMsg.text === lastUserMsg)
       ) {
         cancelHandlerRef.current(true);
         setPendingRestorePrompt(false);
@@ -795,17 +722,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
     onApprovalModeChange: handleApprovalModeChange,
   });
 
-  const {
-    messageQueue,
-    addMessage,
-    clearQueue,
-    getQueuedMessagesText,
-    popAllMessages,
-  } = useMessageQueue({
-    isConfigInitialized,
-    streamingState,
-    submitQuery,
-  });
+  const { messageQueue, addMessage, clearQueue, getQueuedMessagesText, popAllMessages } =
+    useMessageQueue({
+      isConfigInitialized,
+      streamingState,
+      submitQuery,
+    });
 
   cancelHandlerRef.current = useCallback(
     (shouldRestorePrompt: boolean = true) => {
@@ -814,12 +736,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
         ...pendingGeminiHistoryItems,
       ];
       if (isToolExecuting(pendingHistoryItems)) {
-        buffer.setText(''); // Just clear the prompt
+        buffer.setText(""); // Just clear the prompt
         return;
       }
 
       const lastUserMessage = inputHistory.at(-1);
-      let textToSet = shouldRestorePrompt ? lastUserMessage || '' : '';
+      let textToSet = shouldRestorePrompt ? lastUserMessage || "" : "";
 
       const queuedText = getQueuedMessagesText();
       if (queuedText) {
@@ -856,12 +778,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       console.clear();
     }
     refreshStatic();
-  }, [
-    historyManager,
-    clearConsoleMessagesState,
-    refreshStatic,
-    isAlternateBuffer,
-  ]);
+  }, [historyManager, clearConsoleMessagesState, refreshStatic, isAlternateBuffer]);
 
   const { handleInput: vimHandleInput } = useVim(buffer, handleFinalSubmit);
 
@@ -877,8 +794,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     !initError &&
     !isProcessing &&
     !!slashCommands &&
-    (streamingState === StreamingState.Idle ||
-      streamingState === StreamingState.Responding) &&
+    (streamingState === StreamingState.Idle || streamingState === StreamingState.Responding) &&
     !proQuotaRequest;
 
   const [controlsHeight, setControlsHeight] = useState(0);
@@ -886,10 +802,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
   useLayoutEffect(() => {
     if (mainControlsRef.current) {
       const fullFooterMeasurement = measureElement(mainControlsRef.current);
-      if (
-        fullFooterMeasurement.height > 0 &&
-        fullFooterMeasurement.height !== controlsHeight
-      ) {
+      if (fullFooterMeasurement.height > 0 && fullFooterMeasurement.height !== controlsHeight) {
         setControlsHeight(fullFooterMeasurement.height);
       }
     }
@@ -903,10 +816,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   config.setShellExecutionConfig({
     terminalWidth: Math.floor(terminalWidth * SHELL_WIDTH_FRACTION),
-    terminalHeight: Math.max(
-      Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING),
-      1,
-    ),
+    terminalHeight: Math.max(Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING), 1),
     pager: settings.merged.tools?.shell?.pager,
     showColor: settings.merged.tools?.shell?.showColor,
   });
@@ -934,19 +844,13 @@ Logging in with Google... Restarting Gemini CLI to continue.
         ShellExecutionService.resizePty(
           activePtyId,
           Math.floor(terminalWidth * SHELL_WIDTH_FRACTION),
-          Math.max(
-            Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING),
-            1,
-          ),
+          Math.max(Math.floor(availableTerminalHeight - SHELL_HEIGHT_PADDING), 1),
         );
       } catch (e) {
         // This can happen in a race condition where the pty exits
         // right before we try to resize it.
         if (
-          !(
-            e instanceof Error &&
-            e.message.includes('Cannot resize a pty that has already exited')
-          )
+          !(e instanceof Error && e.message.includes("Cannot resize a pty that has already exited"))
         ) {
           throw e;
         }
@@ -994,10 +898,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     getIde();
   }, []);
   const shouldShowIdePrompt = Boolean(
-    currentIDE &&
-      !config.getIdeMode() &&
-      !settings.merged.ide?.hasSeenNudge &&
-      !idePromptAnswered,
+    currentIDE && !config.getIdeMode() && !settings.merged.ide?.hasSeenNudge && !idePromptAnswered,
   );
 
   const [showErrorDetails, setShowErrorDetails] = useState<boolean>(false);
@@ -1009,19 +910,18 @@ Logging in with Google... Restarting Gemini CLI to continue.
   const [ctrlDPressCount, setCtrlDPressCount] = useState(0);
   const ctrlDTimerRef = useRef<NodeJS.Timeout | null>(null);
   const [constrainHeight, setConstrainHeight] = useState<boolean>(true);
-  const [ideContextState, setIdeContextState] = useState<
-    IdeContext | undefined
-  >();
+  const [ideContextState, setIdeContextState] = useState<IdeContext | undefined>();
   const [showEscapePrompt, setShowEscapePrompt] = useState(false);
   const [showIdeRestartPrompt, setShowIdeRestartPrompt] = useState(false);
   const [warningMessage, setWarningMessage] = useState<string | null>(null);
 
-  const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } =
-    useFolderTrust(settings, setIsTrustedFolder, historyManager.addItem);
-  const {
-    needsRestart: ideNeedsRestart,
-    restartReason: ideTrustRestartReason,
-  } = useIdeTrustListener();
+  const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(
+    settings,
+    setIsTrustedFolder,
+    historyManager.addItem,
+  );
+  const { needsRestart: ideNeedsRestart, restartReason: ideTrustRestartReason } =
+    useIdeTrustListener();
   const isInitialMount = useRef(true);
 
   useIncludeDirsTrust(config, isTrustedFolder, historyManager, setCustomDialog);
@@ -1040,10 +940,10 @@ Logging in with Google... Restarting Gemini CLI to continue.
     };
 
     const handleSelectionWarning = () => {
-      handleWarning('Press Ctrl-S to enter selection mode to copy text.');
+      handleWarning("Press Ctrl-S to enter selection mode to copy text.");
     };
     const handlePasteTimeout = () => {
-      handleWarning('Paste Timed out. Possibly due to slow connection.');
+      handleWarning("Paste Timed out. Possibly due to slow connection.");
     };
     appEvents.on(AppEvent.SelectionWarning, handleSelectionWarning);
     appEvents.on(AppEvent.PasteTimeout, handlePasteTimeout);
@@ -1117,7 +1017,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     }
     if (ctrlCPressCount > 1) {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      handleSlashCommand('/quit', undefined, undefined, false);
+      handleSlashCommand("/quit", undefined, undefined, false);
     } else {
       ctrlCTimerRef.current = setTimeout(() => {
         setCtrlCPressCount(0);
@@ -1136,7 +1036,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     }
     if (ctrlDPressCount > 1) {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      handleSlashCommand('/quit', undefined, undefined, false);
+      handleSlashCommand("/quit", undefined, undefined, false);
     } else {
       ctrlDTimerRef.current = setTimeout(() => {
         setCtrlDPressCount(0);
@@ -1151,20 +1051,12 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
   const handleIdePromptComplete = useCallback(
     (result: IdeIntegrationNudgeResult) => {
-      if (result.userSelection === 'yes') {
+      if (result.userSelection === "yes") {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        handleSlashCommand('/ide install');
-        settings.setValue(
-          SettingScope.User,
-          'hasSeenIdeIntegrationNudge',
-          true,
-        );
-      } else if (result.userSelection === 'dismiss') {
-        settings.setValue(
-          SettingScope.User,
-          'hasSeenIdeIntegrationNudge',
-          true,
-        );
+        handleSlashCommand("/ide install");
+        settings.setValue(SettingScope.User, "hasSeenIdeIntegrationNudge", true);
+      } else if (result.userSelection === "dismiss") {
+        settings.setValue(SettingScope.User, "hasSeenIdeIntegrationNudge", true);
       }
       setIdePromptAnswered(true);
     },
@@ -1189,7 +1081,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
       // Debug log keystrokes if enabled
       if (settings.merged.general?.debugKeystrokeLogging) {
-        debugLogger.log('[DEBUG] Keystroke:', JSON.stringify(key));
+        debugLogger.log("[DEBUG] Keystroke:", JSON.stringify(key));
       }
 
       if (isAlternateBuffer && keyMatchers[Command.TOGGLE_COPY_MODE](key)) {
@@ -1236,11 +1128,8 @@ Logging in with Google... Restarting Gemini CLI to continue.
         ideContextState
       ) {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        handleSlashCommand('/ide status');
-      } else if (
-        keyMatchers[Command.SHOW_MORE_LINES](key) &&
-        !enteringConstrainHeightMode
-      ) {
+        handleSlashCommand("/ide status");
+      } else if (keyMatchers[Command.SHOW_MORE_LINES](key) && !enteringConstrainHeightMode) {
         setConstrainHeight(false);
       } else if (keyMatchers[Command.TOGGLE_SHELL_INPUT_FOCUS](key)) {
         if (activePtyId || embeddedShellFocused) {
@@ -1274,24 +1163,18 @@ Logging in with Google... Restarting Gemini CLI to continue.
   // Update terminal title with Gemini CLI status and thoughts
   useEffect(() => {
     // Respect both showStatusInTitle and hideWindowTitle settings
-    if (
-      !settings.merged.ui?.showStatusInTitle ||
-      settings.merged.ui?.hideWindowTitle
-    )
-      return;
+    if (!settings.merged.ui?.showStatusInTitle || settings.merged.ui?.hideWindowTitle) return;
 
     let title;
     if (streamingState === StreamingState.Idle) {
       title = originalTitleRef.current;
     } else {
-      const statusText = thought?.subject
-        ?.replace(/[\r\n]+/g, ' ')
-        .substring(0, 80);
+      const statusText = thought?.subject?.replace(/[\r\n]+/g, " ").substring(0, 80);
       title = statusText || originalTitleRef.current;
     }
 
     // Pad the title to a fixed width to prevent taskbar icon resizing.
-    const paddedTitle = title.padEnd(80, ' ');
+    const paddedTitle = title.padEnd(80, " ");
 
     // Only update the title if it's different from the last value we set
     if (lastTitleRef.current !== paddedTitle) {
@@ -1311,19 +1194,17 @@ Logging in with Google... Restarting Gemini CLI to continue.
     const handleUserFeedback = (payload: UserFeedbackPayload) => {
       let type: MessageType;
       switch (payload.severity) {
-        case 'error':
+        case "error":
           type = MessageType.ERROR;
           break;
-        case 'warning':
+        case "warning":
           type = MessageType.WARNING;
           break;
-        case 'info':
+        case "info":
           type = MessageType.INFO;
           break;
         default:
-          throw new Error(
-            `Unexpected severity for user feedback: ${payload.severity}`,
-          );
+          throw new Error(`Unexpected severity for user feedback: ${payload.severity}`);
       }
 
       historyManager.addItem(
@@ -1336,10 +1217,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
 
       // If there is an attached error object, log it to the debug drawer.
       if (payload.error) {
-        debugLogger.warn(
-          `[Feedback Details for "${payload.message}"]`,
-          payload.error,
-        );
+        debugLogger.warn(`[Feedback Details for "${payload.message}"]`, payload.error);
       }
     };
 
@@ -1358,19 +1236,19 @@ Logging in with Google... Restarting Gemini CLI to continue.
     if (config.getDebugMode()) {
       return consoleMessages;
     }
-    return consoleMessages.filter((msg) => msg.type !== 'debug');
+    return consoleMessages.filter((msg) => msg.type !== "debug");
   }, [consoleMessages, config]);
 
   // Computed values
   const errorCount = useMemo(
     () =>
       filteredConsoleMessages
-        .filter((msg) => msg.type === 'error')
+        .filter((msg) => msg.type === "error")
         .reduce((total, msg) => total + msg.count, 0),
     [filteredConsoleMessages],
   );
 
-  const nightly = props.version.includes('nightly');
+  const nightly = props.version.includes("nightly");
 
   const dialogsVisible =
     shouldShowIdePrompt ||
@@ -1399,9 +1277,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems],
   );
 
-  const [geminiMdFileCount, setGeminiMdFileCount] = useState<number>(
-    config.getGeminiMdFileCount(),
-  );
+  const [geminiMdFileCount, setGeminiMdFileCount] = useState<number>(config.getGeminiMdFileCount());
   useEffect(() => {
     const handleMemoryChanged = (result: MemoryChangedPayload) => {
       setGeminiMdFileCount(result.fileCount);
@@ -1426,10 +1302,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
         setWarningBannerText(warningBanner);
         setBannerVisible(true);
         const authType = config.getContentGeneratorConfig()?.authType;
-        if (
-          authType === AuthType.USE_GEMINI ||
-          authType === AuthType.USE_VERTEX_AI
-        ) {
+        if (authType === AuthType.USE_GEMINI || authType === AuthType.USE_VERTEX_AI) {
           setDefaultBannerText(
             'Gemini 3 is now available.\nTo use Gemini 3, enable "Preview features" in /settings\nLearn more at https://goo.gle/enable-preview-features',
           );
@@ -1630,10 +1503,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
     ],
   );
 
-  const exitPrivacyNotice = useCallback(
-    () => setShowPrivacyNotice(false),
-    [setShowPrivacyNotice],
-  );
+  const exitPrivacyNotice = useCallback(() => setShowPrivacyNotice(false), [setShowPrivacyNotice]);
 
   const uiActions: UIActions = useMemo(
     () => ({
diff --git a/packages/ui-gemini/src/ui/IdeIntegrationNudge.test.tsx b/packages/ui-gemini/src/ui/IdeIntegrationNudge.test.tsx
index a91f2718b..cf5cf6722 100644
--- a/packages/ui-gemini/src/ui/IdeIntegrationNudge.test.tsx
+++ b/packages/ui-gemini/src/ui/IdeIntegrationNudge.test.tsx
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, afterEach } from 'vitest';
-import { render } from 'ink-testing-library';
-import { act } from 'react';
-import { IdeIntegrationNudge } from './IdeIntegrationNudge.js';
-import { KeypressProvider } from './contexts/KeypressContext.js';
+import { render } from "ink-testing-library";
+import { act } from "react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { KeypressProvider } from "./contexts/KeypressContext.js";
+import { IdeIntegrationNudge } from "./IdeIntegrationNudge.js";
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
-describe('IdeIntegrationNudge', () => {
+describe("IdeIntegrationNudge", () => {
   const defaultProps = {
     ide: {
-      name: 'vscode',
-      displayName: 'VS Code',
+      name: "vscode",
+      displayName: "VS Code",
     },
     onComplete: vi.fn(),
   };
@@ -31,19 +31,16 @@ describe('IdeIntegrationNudge', () => {
 
   beforeEach(() => {
     console.error = (...args) => {
-      if (
-        typeof args[0] === 'string' &&
-        /was not wrapped in act/.test(args[0])
-      ) {
+      if (typeof args[0] === "string" && /was not wrapped in act/.test(args[0])) {
         return;
       }
       originalError.call(console, ...args);
     };
-    vi.stubEnv('GEMINI_CLI_IDE_SERVER_PORT', '');
-    vi.stubEnv('GEMINI_CLI_IDE_WORKSPACE_PATH', '');
+    vi.stubEnv("GEMINI_CLI_IDE_SERVER_PORT", "");
+    vi.stubEnv("GEMINI_CLI_IDE_WORKSPACE_PATH", "");
   });
 
-  it('renders correctly with default options', async () => {
+  it("renders correctly with default options", async () => {
     const { lastFrame } = render(
       <KeypressProvider>
         <IdeIntegrationNudge {...defaultProps} />
@@ -54,9 +51,9 @@ describe('IdeIntegrationNudge', () => {
     });
     const frame = lastFrame();
 
-    expect(frame).toContain('Do you want to connect VS Code to Gemini CLI?');
-    expect(frame).toContain('Yes');
-    expect(frame).toContain('No (esc)');
+    expect(frame).toContain("Do you want to connect VS Code to Gemini CLI?");
+    expect(frame).toContain("Yes");
+    expect(frame).toContain("No (esc)");
     expect(frame).toContain("No, don't ask again");
   });
 
@@ -74,12 +71,12 @@ describe('IdeIntegrationNudge', () => {
 
     // "Yes" is the first option and selected by default usually.
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
       await delay(100);
     });
 
     expect(onComplete).toHaveBeenCalledWith({
-      userSelection: 'yes',
+      userSelection: "yes",
       isExtensionPreInstalled: false,
     });
   });
@@ -98,16 +95,16 @@ describe('IdeIntegrationNudge', () => {
 
     // Navigate down to "No (esc)"
     await act(async () => {
-      stdin.write('\u001B[B'); // Down arrow
+      stdin.write("\u001B[B"); // Down arrow
       await delay(100);
     });
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
       await delay(100);
     });
 
     expect(onComplete).toHaveBeenCalledWith({
-      userSelection: 'no',
+      userSelection: "no",
       isExtensionPreInstalled: false,
     });
   });
@@ -126,25 +123,25 @@ describe('IdeIntegrationNudge', () => {
 
     // Navigate down to "No, don't ask again"
     await act(async () => {
-      stdin.write('\u001B[B'); // Down arrow
+      stdin.write("\u001B[B"); // Down arrow
       await delay(100);
     });
     await act(async () => {
-      stdin.write('\u001B[B'); // Down arrow
+      stdin.write("\u001B[B"); // Down arrow
       await delay(100);
     });
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
       await delay(100);
     });
 
     expect(onComplete).toHaveBeenCalledWith({
-      userSelection: 'dismiss',
+      userSelection: "dismiss",
       isExtensionPreInstalled: false,
     });
   });
 
-  it('handles Escape key press', async () => {
+  it("handles Escape key press", async () => {
     const onComplete = vi.fn();
     const { stdin } = render(
       <KeypressProvider>
@@ -158,19 +155,19 @@ describe('IdeIntegrationNudge', () => {
 
     // Press Escape
     await act(async () => {
-      stdin.write('\u001B');
+      stdin.write("\u001B");
       await delay(100);
     });
 
     expect(onComplete).toHaveBeenCalledWith({
-      userSelection: 'no',
+      userSelection: "no",
       isExtensionPreInstalled: false,
     });
   });
 
-  it('displays correct text and handles selection when extension is pre-installed', async () => {
-    vi.stubEnv('GEMINI_CLI_IDE_SERVER_PORT', '1234');
-    vi.stubEnv('GEMINI_CLI_IDE_WORKSPACE_PATH', '/tmp');
+  it("displays correct text and handles selection when extension is pre-installed", async () => {
+    vi.stubEnv("GEMINI_CLI_IDE_SERVER_PORT", "1234");
+    vi.stubEnv("GEMINI_CLI_IDE_WORKSPACE_PATH", "/tmp");
 
     const onComplete = vi.fn();
     const { lastFrame, stdin } = render(
@@ -185,19 +182,17 @@ describe('IdeIntegrationNudge', () => {
 
     const frame = lastFrame();
 
-    expect(frame).toContain(
-      'If you select Yes, the CLI will have access to your open files',
-    );
+    expect(frame).toContain("If you select Yes, the CLI will have access to your open files");
     expect(frame).not.toContain("we'll install an extension");
 
     // Select "Yes"
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
       await delay(100);
     });
 
     expect(onComplete).toHaveBeenCalledWith({
-      userSelection: 'yes',
+      userSelection: "yes",
       isExtensionPreInstalled: true,
     });
   });
diff --git a/packages/ui-gemini/src/ui/IdeIntegrationNudge.tsx b/packages/ui-gemini/src/ui/IdeIntegrationNudge.tsx
index cbd2f4385..35f354212 100644
--- a/packages/ui-gemini/src/ui/IdeIntegrationNudge.tsx
+++ b/packages/ui-gemini/src/ui/IdeIntegrationNudge.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { IdeInfo } from '@airiscode/gemini-cli-core';
-import { Box, Text } from 'ink';
-import type { RadioSelectItem } from './components/shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './components/shared/RadioButtonSelect.js';
-import { useKeypress } from './hooks/useKeypress.js';
-import { theme } from './semantic-colors.js';
+import type { IdeInfo } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type { RadioSelectItem } from "./components/shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./components/shared/RadioButtonSelect.js";
+import { useKeypress } from "./hooks/useKeypress.js";
+import { theme } from "./semantic-colors.js";
 
 export type IdeIntegrationNudgeResult = {
-  userSelection: 'yes' | 'no' | 'dismiss';
+  userSelection: "yes" | "no" | "dismiss";
   isExtensionPreInstalled: boolean;
 };
 
@@ -21,15 +21,12 @@ interface IdeIntegrationNudgeProps {
   onComplete: (result: IdeIntegrationNudgeResult) => void;
 }
 
-export function IdeIntegrationNudge({
-  ide,
-  onComplete,
-}: IdeIntegrationNudgeProps) {
+export function IdeIntegrationNudge({ ide, onComplete }: IdeIntegrationNudgeProps) {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onComplete({
-          userSelection: 'no',
+          userSelection: "no",
           isExtensionPreInstalled: false,
         });
       }
@@ -40,30 +37,29 @@ export function IdeIntegrationNudge({
   const { displayName: ideName } = ide;
   // Assume extension is already installed if the env variables are set.
   const isExtensionPreInstalled =
-    !!process.env['GEMINI_CLI_IDE_SERVER_PORT'] &&
-    !!process.env['GEMINI_CLI_IDE_WORKSPACE_PATH'];
+    !!process.env["GEMINI_CLI_IDE_SERVER_PORT"] && !!process.env["GEMINI_CLI_IDE_WORKSPACE_PATH"];
 
   const OPTIONS: Array<RadioSelectItem<IdeIntegrationNudgeResult>> = [
     {
-      label: 'Yes',
+      label: "Yes",
       value: {
-        userSelection: 'yes',
+        userSelection: "yes",
         isExtensionPreInstalled,
       },
-      key: 'Yes',
+      key: "Yes",
     },
     {
-      label: 'No (esc)',
+      label: "No (esc)",
       value: {
-        userSelection: 'no',
+        userSelection: "no",
         isExtensionPreInstalled,
       },
-      key: 'No (esc)',
+      key: "No (esc)",
     },
     {
       label: "No, don't ask again",
       value: {
-        userSelection: 'dismiss',
+        userSelection: "dismiss",
         isExtensionPreInstalled,
       },
       key: "No, don't ask again",
@@ -72,10 +68,10 @@ export function IdeIntegrationNudge({
 
   const installText = isExtensionPreInstalled
     ? `If you select Yes, the CLI will have access to your open files and display diffs directly in ${
-        ideName ?? 'your editor'
+        ideName ?? "your editor"
       }.`
     : `If you select Yes, we'll install an extension that allows the CLI to access your open files and display diffs directly in ${
-        ideName ?? 'your editor'
+        ideName ?? "your editor"
       }.`;
 
   return (
@@ -89,8 +85,8 @@ export function IdeIntegrationNudge({
     >
       <Box marginBottom={1} flexDirection="column">
         <Text>
-          <Text color={theme.status.warning}>{'> '}</Text>
-          {`Do you want to connect ${ideName ?? 'your editor'} to Gemini CLI?`}
+          <Text color={theme.status.warning}>{"> "}</Text>
+          {`Do you want to connect ${ideName ?? "your editor"} to Gemini CLI?`}
         </Text>
         <Text color={theme.text.secondary}>{installText}</Text>
       </Box>
diff --git a/packages/ui-gemini/src/ui/auth/ApiAuthDialog.test.tsx b/packages/ui-gemini/src/ui/auth/ApiAuthDialog.test.tsx
index 1250c1d54..f23205d13 100644
--- a/packages/ui-gemini/src/ui/auth/ApiAuthDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/auth/ApiAuthDialog.test.tsx
@@ -4,25 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { ApiAuthDialog } from './ApiAuthDialog.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import {
-  useTextBuffer,
-  type TextBuffer,
-} from '../components/shared/text-buffer.js';
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { type TextBuffer, useTextBuffer } from "../components/shared/text-buffer.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { ApiAuthDialog } from "./ApiAuthDialog.js";
 
 // Mocks
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
-vi.mock('../components/shared/text-buffer.js', () => ({
+vi.mock("../components/shared/text-buffer.js", () => ({
   useTextBuffer: vi.fn(),
 }));
 
-vi.mock('../contexts/UIStateContext.js', () => ({
+vi.mock("../contexts/UIStateContext.js", () => ({
   useUIState: vi.fn(() => ({
     mainAreaWidth: 80,
   })),
@@ -31,7 +28,7 @@ vi.mock('../contexts/UIStateContext.js', () => ({
 const mockedUseKeypress = useKeypress as Mock;
 const mockedUseTextBuffer = useTextBuffer as Mock;
 
-describe('ApiAuthDialog', () => {
+describe("ApiAuthDialog", () => {
   const onSubmit = vi.fn();
   const onCancel = vi.fn();
   let mockBuffer: TextBuffer;
@@ -39,11 +36,11 @@ describe('ApiAuthDialog', () => {
   beforeEach(() => {
     vi.resetAllMocks();
     mockBuffer = {
-      text: '',
-      lines: [''],
+      text: "",
+      lines: [""],
       cursor: [0, 0],
       visualCursor: [0, 0],
-      viewportVisualLines: [''],
+      viewportVisualLines: [""],
       handleInput: vi.fn(),
       setText: vi.fn((newText) => {
         mockBuffer.text = newText;
@@ -53,24 +50,16 @@ describe('ApiAuthDialog', () => {
     mockedUseTextBuffer.mockReturnValue(mockBuffer);
   });
 
-  it('renders correctly', () => {
-    const { lastFrame } = render(
-      <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />,
-    );
+  it("renders correctly", () => {
+    const { lastFrame } = render(<ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />);
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders with a defaultValue', () => {
-    render(
-      <ApiAuthDialog
-        onSubmit={onSubmit}
-        onCancel={onCancel}
-        defaultValue="test-key"
-      />,
-    );
+  it("renders with a defaultValue", () => {
+    render(<ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} defaultValue="test-key" />);
     expect(mockedUseTextBuffer).toHaveBeenCalledWith(
       expect.objectContaining({
-        initialText: 'test-key',
+        initialText: "test-key",
         viewport: expect.objectContaining({
           height: 4,
         }),
@@ -80,41 +69,39 @@ describe('ApiAuthDialog', () => {
 
   it.each([
     {
-      keyName: 'return',
-      sequence: '\r',
+      keyName: "return",
+      sequence: "\r",
       expectedCall: onSubmit,
-      args: ['submitted-key'],
+      args: ["submitted-key"],
     },
-    { keyName: 'escape', sequence: '\u001b', expectedCall: onCancel, args: [] },
-  ])(
-    'calls $expectedCall.name when $keyName is pressed',
-    ({ keyName, sequence, expectedCall, args }) => {
-      mockBuffer.text = 'submitted-key'; // Set for the onSubmit case
-      render(<ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />);
-      const keypressHandler = mockedUseKeypress.mock.calls[0][0];
+    { keyName: "escape", sequence: "\u001b", expectedCall: onCancel, args: [] },
+  ])("calls $expectedCall.name when $keyName is pressed", ({
+    keyName,
+    sequence,
+    expectedCall,
+    args,
+  }) => {
+    mockBuffer.text = "submitted-key"; // Set for the onSubmit case
+    render(<ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} />);
+    const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
-      keypressHandler({
-        name: keyName,
-        sequence,
-        ctrl: false,
-        meta: false,
-        shift: false,
-        paste: false,
-      });
+    keypressHandler({
+      name: keyName,
+      sequence,
+      ctrl: false,
+      meta: false,
+      shift: false,
+      paste: false,
+    });
 
-      expect(expectedCall).toHaveBeenCalledWith(...args);
-    },
-  );
+    expect(expectedCall).toHaveBeenCalledWith(...args);
+  });
 
-  it('displays an error message', () => {
+  it("displays an error message", () => {
     const { lastFrame } = render(
-      <ApiAuthDialog
-        onSubmit={onSubmit}
-        onCancel={onCancel}
-        error="Invalid API Key"
-      />,
+      <ApiAuthDialog onSubmit={onSubmit} onCancel={onCancel} error="Invalid API Key" />,
     );
 
-    expect(lastFrame()).toContain('Invalid API Key');
+    expect(lastFrame()).toContain("Invalid API Key");
   });
 });
diff --git a/packages/ui-gemini/src/ui/auth/ApiAuthDialog.tsx b/packages/ui-gemini/src/ui/auth/ApiAuthDialog.tsx
index a1723efa2..3fcd81ebb 100644
--- a/packages/ui-gemini/src/ui/auth/ApiAuthDialog.tsx
+++ b/packages/ui-gemini/src/ui/auth/ApiAuthDialog.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { TextInput } from '../components/shared/TextInput.js';
-import { useTextBuffer } from '../components/shared/text-buffer.js';
-import { useUIState } from '../contexts/UIStateContext.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { TextInput } from "../components/shared/TextInput.js";
+import { useTextBuffer } from "../components/shared/text-buffer.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { theme } from "../semantic-colors.js";
 
 interface ApiAuthDialogProps {
   onSubmit: (apiKey: string) => void;
@@ -22,21 +22,20 @@ export function ApiAuthDialog({
   onSubmit,
   onCancel,
   error,
-  defaultValue = '',
+  defaultValue = "",
 }: ApiAuthDialogProps): React.JSX.Element {
   const { mainAreaWidth } = useUIState();
   const viewportWidth = mainAreaWidth - 8;
 
   const buffer = useTextBuffer({
-    initialText: defaultValue || '',
+    initialText: defaultValue || "",
     initialCursorOffset: defaultValue?.length || 0,
     viewport: {
       width: viewportWidth,
       height: 4,
     },
     isValidPath: () => false, // No path validation needed for API key
-    inputFilter: (text) =>
-      text.replace(/[^a-zA-Z0-9_-]/g, '').replace(/[\r\n]/g, ''),
+    inputFilter: (text) => text.replace(/[^a-zA-Z0-9_-]/g, "").replace(/[\r\n]/g, ""),
     singleLine: true,
   });
 
@@ -57,23 +56,15 @@ export function ApiAuthDialog({
       </Text>
       <Box marginTop={1} flexDirection="column">
         <Text color={theme.text.primary}>
-          Please enter your Gemini API key. It will be securely stored in your
-          system keychain.
+          Please enter your Gemini API key. It will be securely stored in your system keychain.
         </Text>
         <Text color={theme.text.secondary}>
-          You can get an API key from{' '}
-          <Text color={theme.text.link}>
-            https://aistudio.google.com/app/apikey
-          </Text>
+          You can get an API key from{" "}
+          <Text color={theme.text.link}>https://aistudio.google.com/app/apikey</Text>
         </Text>
       </Box>
       <Box marginTop={1} flexDirection="row">
-        <Box
-          borderStyle="round"
-          borderColor={theme.border.default}
-          paddingX={1}
-          flexGrow={1}
-        >
+        <Box borderStyle="round" borderColor={theme.border.default} paddingX={1} flexGrow={1}>
           <TextInput
             buffer={buffer}
             onSubmit={handleSubmit}
@@ -88,9 +79,7 @@ export function ApiAuthDialog({
         </Box>
       )}
       <Box marginTop={1}>
-        <Text color={theme.text.secondary}>
-          (Press Enter to submit, Esc to cancel)
-        </Text>
+        <Text color={theme.text.secondary}>(Press Enter to submit, Esc to cancel)</Text>
       </Box>
     </Box>
   );
diff --git a/packages/ui-gemini/src/ui/auth/AuthDialog.test.tsx b/packages/ui-gemini/src/ui/auth/AuthDialog.test.tsx
index eabd5c875..4fc0d177b 100644
--- a/packages/ui-gemini/src/ui/auth/AuthDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/auth/AuthDialog.test.tsx
@@ -4,56 +4,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { AuthDialog } from './AuthDialog.js';
-import { AuthType, type Config, debugLogger } from '@airiscode/gemini-cli-core';
-import type { LoadedSettings } from '../../config/settings.js';
-import { AuthState } from '../types.js';
-import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { validateAuthMethodWithSettings } from './useAuth.js';
-import { runExitCleanup } from '../../utils/cleanup.js';
-import { Text } from 'ink';
-import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
+import { AuthType, type Config, debugLogger } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { runExitCleanup } from "../../utils/cleanup.js";
+import { RELAUNCH_EXIT_CODE } from "../../utils/processUtils.js";
+import { RadioButtonSelect } from "../components/shared/RadioButtonSelect.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { AuthState } from "../types.js";
+import { AuthDialog } from "./AuthDialog.js";
+import { validateAuthMethodWithSettings } from "./useAuth.js";
 
 // Mocks
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     clearCachedCredentialFile: vi.fn(),
   };
 });
 
-vi.mock('../../utils/cleanup.js', () => ({
+vi.mock("../../utils/cleanup.js", () => ({
   runExitCleanup: vi.fn(),
 }));
 
-vi.mock('./useAuth.js', () => ({
+vi.mock("./useAuth.js", () => ({
   validateAuthMethodWithSettings: vi.fn(),
 }));
 
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
-vi.mock('../components/shared/RadioButtonSelect.js', () => ({
+vi.mock("../components/shared/RadioButtonSelect.js", () => ({
   RadioButtonSelect: vi.fn(({ items, initialIndex }) => (
     <>
       {items.map((item: { value: string; label: string }, index: number) => (
         <Text key={item.value}>
-          {index === initialIndex ? '(selected)' : '(not selected)'}{' '}
-          {item.label}
+          {index === initialIndex ? "(selected)" : "(not selected)"} {item.label}
         </Text>
       ))}
     </>
@@ -65,7 +55,7 @@ const mockedRadioButtonSelect = RadioButtonSelect as Mock;
 const mockedValidateAuthMethod = validateAuthMethodWithSettings as Mock;
 const mockedRunExitCleanup = runExitCleanup as Mock;
 
-describe('AuthDialog', () => {
+describe("AuthDialog", () => {
   let props: {
     config: Config;
     settings: LoadedSettings;
@@ -101,10 +91,9 @@ describe('AuthDialog', () => {
     process.env = originalEnv;
   });
 
-  describe('Environment Variable Effects on Auth Options', () => {
-    const cloudShellLabel = 'Use Cloud Shell user credentials';
-    const metadataServerLabel =
-      'Use metadata server application default credentials';
+  describe("Environment Variable Effects on Auth Options", () => {
+    const cloudShellLabel = "Use Cloud Shell user credentials";
+    const metadataServerLabel = "Use metadata server application default credentials";
     const computeAdcItem = (label: string) => ({
       label,
       value: AuthType.COMPUTE_ADC,
@@ -113,43 +102,41 @@ describe('AuthDialog', () => {
 
     it.each([
       {
-        env: { CLOUD_SHELL: 'true' },
+        env: { CLOUD_SHELL: "true" },
         shouldContain: [computeAdcItem(cloudShellLabel)],
         shouldNotContain: [computeAdcItem(metadataServerLabel)],
-        desc: 'in Cloud Shell',
+        desc: "in Cloud Shell",
       },
       {
-        env: { GEMINI_CLI_USE_COMPUTE_ADC: 'true' },
+        env: { GEMINI_CLI_USE_COMPUTE_ADC: "true" },
         shouldContain: [computeAdcItem(metadataServerLabel)],
         shouldNotContain: [computeAdcItem(cloudShellLabel)],
-        desc: 'with GEMINI_CLI_USE_COMPUTE_ADC',
+        desc: "with GEMINI_CLI_USE_COMPUTE_ADC",
       },
       {
         env: {},
         shouldContain: [],
-        shouldNotContain: [
-          computeAdcItem(cloudShellLabel),
-          computeAdcItem(metadataServerLabel),
-        ],
-        desc: 'by default',
+        shouldNotContain: [computeAdcItem(cloudShellLabel), computeAdcItem(metadataServerLabel)],
+        desc: "by default",
       },
-    ])(
-      'correctly shows/hides COMPUTE_ADC options $desc',
-      ({ env, shouldContain, shouldNotContain }) => {
-        process.env = { ...env };
-        renderWithProviders(<AuthDialog {...props} />);
-        const items = mockedRadioButtonSelect.mock.calls[0][0].items;
-        for (const item of shouldContain) {
-          expect(items).toContainEqual(item);
-        }
-        for (const item of shouldNotContain) {
-          expect(items).not.toContainEqual(item);
-        }
-      },
-    );
+    ])("correctly shows/hides COMPUTE_ADC options $desc", ({
+      env,
+      shouldContain,
+      shouldNotContain,
+    }) => {
+      process.env = { ...env };
+      renderWithProviders(<AuthDialog {...props} />);
+      const items = mockedRadioButtonSelect.mock.calls[0][0].items;
+      for (const item of shouldContain) {
+        expect(items).toContainEqual(item);
+      }
+      for (const item of shouldNotContain) {
+        expect(items).not.toContainEqual(item);
+      }
+    });
   });
 
-  it('filters auth types when enforcedType is set', () => {
+  it("filters auth types when enforcedType is set", () => {
     props.settings.merged.security!.auth!.enforcedType = AuthType.USE_GEMINI;
     renderWithProviders(<AuthDialog {...props} />);
     const items = mockedRadioButtonSelect.mock.calls[0][0].items;
@@ -157,43 +144,42 @@ describe('AuthDialog', () => {
     expect(items[0].value).toBe(AuthType.USE_GEMINI);
   });
 
-  it('sets initial index to 0 when enforcedType is set', () => {
+  it("sets initial index to 0 when enforcedType is set", () => {
     props.settings.merged.security!.auth!.enforcedType = AuthType.USE_GEMINI;
     renderWithProviders(<AuthDialog {...props} />);
     const { initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
     expect(initialIndex).toBe(0);
   });
 
-  describe('Initial Auth Type Selection', () => {
+  describe("Initial Auth Type Selection", () => {
     it.each([
       {
         setup: () => {
-          props.settings.merged.security!.auth!.selectedType =
-            AuthType.USE_VERTEX_AI;
+          props.settings.merged.security!.auth!.selectedType = AuthType.USE_VERTEX_AI;
         },
         expected: AuthType.USE_VERTEX_AI,
-        desc: 'from settings',
+        desc: "from settings",
       },
       {
         setup: () => {
-          process.env['GEMINI_DEFAULT_AUTH_TYPE'] = AuthType.USE_GEMINI;
+          process.env["GEMINI_DEFAULT_AUTH_TYPE"] = AuthType.USE_GEMINI;
         },
         expected: AuthType.USE_GEMINI,
-        desc: 'from GEMINI_DEFAULT_AUTH_TYPE env var',
+        desc: "from GEMINI_DEFAULT_AUTH_TYPE env var",
       },
       {
         setup: () => {
-          process.env['GEMINI_API_KEY'] = 'test-key';
+          process.env["GEMINI_API_KEY"] = "test-key";
         },
         expected: AuthType.USE_GEMINI,
-        desc: 'from GEMINI_API_KEY env var',
+        desc: "from GEMINI_API_KEY env var",
       },
       {
         setup: () => {},
         expected: AuthType.LOGIN_WITH_GOOGLE,
-        desc: 'defaults to Login with Google',
+        desc: "defaults to Login with Google",
       },
-    ])('selects initial auth type $desc', ({ setup, expected }) => {
+    ])("selects initial auth type $desc", ({ setup, expected }) => {
       setup();
       renderWithProviders(<AuthDialog {...props} />);
       const { items, initialIndex } = mockedRadioButtonSelect.mock.calls[0][0];
@@ -201,81 +187,64 @@ describe('AuthDialog', () => {
     });
   });
 
-  describe('handleAuthSelect', () => {
-    it('calls onAuthError if validation fails', () => {
-      mockedValidateAuthMethod.mockReturnValue('Invalid method');
+  describe("handleAuthSelect", () => {
+    it("calls onAuthError if validation fails", () => {
+      mockedValidateAuthMethod.mockReturnValue("Invalid method");
       renderWithProviders(<AuthDialog {...props} />);
-      const { onSelect: handleAuthSelect } =
-        mockedRadioButtonSelect.mock.calls[0][0];
+      const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
       handleAuthSelect(AuthType.USE_GEMINI);
 
-      expect(mockedValidateAuthMethod).toHaveBeenCalledWith(
-        AuthType.USE_GEMINI,
-        props.settings,
-      );
-      expect(props.onAuthError).toHaveBeenCalledWith('Invalid method');
+      expect(mockedValidateAuthMethod).toHaveBeenCalledWith(AuthType.USE_GEMINI, props.settings);
+      expect(props.onAuthError).toHaveBeenCalledWith("Invalid method");
       expect(props.settings.setValue).not.toHaveBeenCalled();
     });
 
-    it('skips API key dialog on initial setup if env var is present', async () => {
+    it("skips API key dialog on initial setup if env var is present", async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      process.env['GEMINI_API_KEY'] = 'test-key-from-env';
+      process.env["GEMINI_API_KEY"] = "test-key-from-env";
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
       renderWithProviders(<AuthDialog {...props} />);
-      const { onSelect: handleAuthSelect } =
-        mockedRadioButtonSelect.mock.calls[0][0];
+      const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
 
-      expect(props.setAuthState).toHaveBeenCalledWith(
-        AuthState.Unauthenticated,
-      );
+      expect(props.setAuthState).toHaveBeenCalledWith(AuthState.Unauthenticated);
     });
 
-    it('shows API key dialog on initial setup if no env var is present', async () => {
+    it("shows API key dialog on initial setup if no env var is present", async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
       // process.env['GEMINI_API_KEY'] is not set
       // props.settings.merged.security.auth.selectedType is undefined here, simulating initial setup
 
       renderWithProviders(<AuthDialog {...props} />);
-      const { onSelect: handleAuthSelect } =
-        mockedRadioButtonSelect.mock.calls[0][0];
+      const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
 
-      expect(props.setAuthState).toHaveBeenCalledWith(
-        AuthState.AwaitingApiKeyInput,
-      );
+      expect(props.setAuthState).toHaveBeenCalledWith(AuthState.AwaitingApiKeyInput);
     });
 
-    it('shows API key dialog on re-auth to allow editing', async () => {
+    it("shows API key dialog on re-auth to allow editing", async () => {
       mockedValidateAuthMethod.mockReturnValue(null);
-      process.env['GEMINI_API_KEY'] = 'test-key-from-env';
+      process.env["GEMINI_API_KEY"] = "test-key-from-env";
       // Simulate that the user has already authenticated once
-      props.settings.merged.security!.auth!.selectedType =
-        AuthType.LOGIN_WITH_GOOGLE;
+      props.settings.merged.security!.auth!.selectedType = AuthType.LOGIN_WITH_GOOGLE;
 
       renderWithProviders(<AuthDialog {...props} />);
-      const { onSelect: handleAuthSelect } =
-        mockedRadioButtonSelect.mock.calls[0][0];
+      const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.USE_GEMINI);
 
-      expect(props.setAuthState).toHaveBeenCalledWith(
-        AuthState.AwaitingApiKeyInput,
-      );
+      expect(props.setAuthState).toHaveBeenCalledWith(AuthState.AwaitingApiKeyInput);
     });
 
-    it('exits process for Login with Google when browser is suppressed', async () => {
+    it("exits process for Login with Google when browser is suppressed", async () => {
       vi.useFakeTimers();
-      const exitSpy = vi
-        .spyOn(process, 'exit')
-        .mockImplementation(() => undefined as never);
-      const logSpy = vi.spyOn(debugLogger, 'log').mockImplementation(() => {});
+      const exitSpy = vi.spyOn(process, "exit").mockImplementation(() => undefined as never);
+      const logSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
       vi.mocked(props.config.isBrowserLaunchSuppressed).mockReturnValue(true);
       mockedValidateAuthMethod.mockReturnValue(null);
 
       renderWithProviders(<AuthDialog {...props} />);
-      const { onSelect: handleAuthSelect } =
-        mockedRadioButtonSelect.mock.calls[0][0];
+      const { onSelect: handleAuthSelect } = mockedRadioButtonSelect.mock.calls[0][0];
       await handleAuthSelect(AuthType.LOGIN_WITH_GOOGLE);
 
       await vi.runAllTimersAsync();
@@ -289,18 +258,18 @@ describe('AuthDialog', () => {
     });
   });
 
-  it('displays authError when provided', () => {
-    props.authError = 'Something went wrong';
+  it("displays authError when provided", () => {
+    props.authError = "Something went wrong";
     const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
-    expect(lastFrame()).toContain('Something went wrong');
+    expect(lastFrame()).toContain("Something went wrong");
   });
 
-  describe('useKeypress', () => {
+  describe("useKeypress", () => {
     it.each([
       {
-        desc: 'does nothing on escape if authError is present',
+        desc: "does nothing on escape if authError is present",
         setup: () => {
-          props.authError = 'Some error';
+          props.authError = "Some error";
         },
         expectations: (p: typeof props) => {
           expect(p.onAuthError).not.toHaveBeenCalled();
@@ -308,51 +277,48 @@ describe('AuthDialog', () => {
         },
       },
       {
-        desc: 'calls onAuthError on escape if no auth method is set',
+        desc: "calls onAuthError on escape if no auth method is set",
         setup: () => {
           props.settings.merged.security!.auth!.selectedType = undefined;
         },
         expectations: (p: typeof props) => {
           expect(p.onAuthError).toHaveBeenCalledWith(
-            'You must select an auth method to proceed. Press Ctrl+C twice to exit.',
+            "You must select an auth method to proceed. Press Ctrl+C twice to exit.",
           );
         },
       },
       {
-        desc: 'calls setAuthState(Unauthenticated) on escape if auth method is set',
+        desc: "calls setAuthState(Unauthenticated) on escape if auth method is set",
         setup: () => {
-          props.settings.merged.security!.auth!.selectedType =
-            AuthType.USE_GEMINI;
+          props.settings.merged.security!.auth!.selectedType = AuthType.USE_GEMINI;
         },
         expectations: (p: typeof props) => {
-          expect(p.setAuthState).toHaveBeenCalledWith(
-            AuthState.Unauthenticated,
-          );
+          expect(p.setAuthState).toHaveBeenCalledWith(AuthState.Unauthenticated);
           expect(p.settings.setValue).not.toHaveBeenCalled();
         },
       },
-    ])('$desc', ({ setup, expectations }) => {
+    ])("$desc", ({ setup, expectations }) => {
       setup();
       renderWithProviders(<AuthDialog {...props} />);
       const keypressHandler = mockedUseKeypress.mock.calls[0][0];
-      keypressHandler({ name: 'escape' });
+      keypressHandler({ name: "escape" });
       expectations(props);
     });
   });
 
-  describe('Snapshots', () => {
-    it('renders correctly with default props', () => {
+  describe("Snapshots", () => {
+    it("renders correctly with default props", () => {
       const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders correctly with auth error', () => {
-      props.authError = 'Something went wrong';
+    it("renders correctly with auth error", () => {
+      props.authError = "Something went wrong";
       const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders correctly with enforced auth type', () => {
+    it("renders correctly with enforced auth type", () => {
       props.settings.merged.security!.auth!.enforcedType = AuthType.USE_GEMINI;
       const { lastFrame } = renderWithProviders(<AuthDialog {...props} />);
       expect(lastFrame()).toMatchSnapshot();
diff --git a/packages/ui-gemini/src/ui/auth/AuthDialog.tsx b/packages/ui-gemini/src/ui/auth/AuthDialog.tsx
index f640f722c..7fd24813d 100644
--- a/packages/ui-gemini/src/ui/auth/AuthDialog.tsx
+++ b/packages/ui-gemini/src/ui/auth/AuthDialog.tsx
@@ -4,26 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-} from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import {
-  AuthType,
-  clearCachedCredentialFile,
-  type Config,
-} from '@airiscode/gemini-cli-core';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { AuthState } from '../types.js';
-import { runExitCleanup } from '../../utils/cleanup.js';
-import { validateAuthMethodWithSettings } from './useAuth.js';
-import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
+import { AuthType, type Config, clearCachedCredentialFile } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useState } from "react";
+import type { LoadableSettingScope, LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { runExitCleanup } from "../../utils/cleanup.js";
+import { RELAUNCH_EXIT_CODE } from "../../utils/processUtils.js";
+import { RadioButtonSelect } from "../components/shared/RadioButtonSelect.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { AuthState } from "../types.js";
+import { validateAuthMethodWithSettings } from "./useAuth.js";
 
 interface AuthDialogProps {
   config: Config;
@@ -43,51 +36,46 @@ export function AuthDialog({
   const [exiting, setExiting] = useState(false);
   let items = [
     {
-      label: 'Login with Google',
+      label: "Login with Google",
       value: AuthType.LOGIN_WITH_GOOGLE,
       key: AuthType.LOGIN_WITH_GOOGLE,
     },
-    ...(process.env['CLOUD_SHELL'] === 'true'
+    ...(process.env["CLOUD_SHELL"] === "true"
       ? [
           {
-            label: 'Use Cloud Shell user credentials',
+            label: "Use Cloud Shell user credentials",
             value: AuthType.COMPUTE_ADC,
             key: AuthType.COMPUTE_ADC,
           },
         ]
-      : process.env['GEMINI_CLI_USE_COMPUTE_ADC'] === 'true'
+      : process.env["GEMINI_CLI_USE_COMPUTE_ADC"] === "true"
         ? [
             {
-              label: 'Use metadata server application default credentials',
+              label: "Use metadata server application default credentials",
               value: AuthType.COMPUTE_ADC,
               key: AuthType.COMPUTE_ADC,
             },
           ]
         : []),
     {
-      label: 'Use Gemini API Key',
+      label: "Use Gemini API Key",
       value: AuthType.USE_GEMINI,
       key: AuthType.USE_GEMINI,
     },
     {
-      label: 'Vertex AI',
+      label: "Vertex AI",
       value: AuthType.USE_VERTEX_AI,
       key: AuthType.USE_VERTEX_AI,
     },
   ];
 
   if (settings.merged.security?.auth?.enforcedType) {
-    items = items.filter(
-      (item) => item.value === settings.merged.security?.auth?.enforcedType,
-    );
+    items = items.filter((item) => item.value === settings.merged.security?.auth?.enforcedType);
   }
 
   let defaultAuthType = null;
-  const defaultAuthTypeEnv = process.env['GEMINI_DEFAULT_AUTH_TYPE'];
-  if (
-    defaultAuthTypeEnv &&
-    Object.values(AuthType).includes(defaultAuthTypeEnv as AuthType)
-  ) {
+  const defaultAuthTypeEnv = process.env["GEMINI_DEFAULT_AUTH_TYPE"];
+  if (defaultAuthTypeEnv && Object.values(AuthType).includes(defaultAuthTypeEnv as AuthType)) {
     defaultAuthType = defaultAuthTypeEnv as AuthType;
   }
 
@@ -100,7 +88,7 @@ export function AuthDialog({
       return item.value === defaultAuthType;
     }
 
-    if (process.env['GEMINI_API_KEY']) {
+    if (process.env["GEMINI_API_KEY"]) {
       return item.value === AuthType.USE_GEMINI;
     }
 
@@ -116,16 +104,12 @@ export function AuthDialog({
         return;
       }
       if (authType) {
-        const isInitialAuthSelection =
-          !settings.merged.security?.auth?.selectedType;
+        const isInitialAuthSelection = !settings.merged.security?.auth?.selectedType;
 
         await clearCachedCredentialFile();
 
-        settings.setValue(scope, 'security.auth.selectedType', authType);
-        if (
-          authType === AuthType.LOGIN_WITH_GOOGLE &&
-          config.isBrowserLaunchSuppressed()
-        ) {
+        settings.setValue(scope, "security.auth.selectedType", authType);
+        if (authType === AuthType.LOGIN_WITH_GOOGLE && config.isBrowserLaunchSuppressed()) {
           setExiting(true);
           setTimeout(async () => {
             await runExitCleanup();
@@ -135,7 +119,7 @@ export function AuthDialog({
         }
 
         if (authType === AuthType.USE_GEMINI) {
-          if (isInitialAuthSelection && process.env['GEMINI_API_KEY']) {
+          if (isInitialAuthSelection && process.env["GEMINI_API_KEY"]) {
             setAuthState(AuthState.Unauthenticated);
             return;
           } else {
@@ -161,7 +145,7 @@ export function AuthDialog({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         // Prevent exit if there is an error message.
         // This means they user is not authenticated yet.
         if (authError) {
@@ -169,9 +153,7 @@ export function AuthDialog({
         }
         if (settings.merged.security?.auth?.selectedType === undefined) {
           // Prevent exiting if no auth method is set
-          onAuthError(
-            'You must select an auth method to proceed. Press Ctrl+C twice to exit.',
-          );
+          onAuthError("You must select an auth method to proceed. Press Ctrl+C twice to exit.");
           return;
         }
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -242,9 +224,7 @@ export function AuthDialog({
         </Box>
         <Box marginTop={1}>
           <Text color={theme.text.link}>
-            {
-              'https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md'
-            }
+            {"https://github.com/google-gemini/gemini-cli/blob/main/docs/tos-privacy.md"}
           </Text>
         </Box>
       </Box>
diff --git a/packages/ui-gemini/src/ui/auth/AuthInProgress.test.tsx b/packages/ui-gemini/src/ui/auth/AuthInProgress.test.tsx
index 958cc9f82..b9aba31fd 100644
--- a/packages/ui-gemini/src/ui/auth/AuthInProgress.test.tsx
+++ b/packages/ui-gemini/src/ui/auth/AuthInProgress.test.tsx
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { render } from 'ink-testing-library';
-import { act } from 'react';
-import { AuthInProgress } from './AuthInProgress.js';
-import { useKeypress, type Key } from '../hooks/useKeypress.js';
+import { render } from "ink-testing-library";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { type Key, useKeypress } from "../hooks/useKeypress.js";
+import { AuthInProgress } from "./AuthInProgress.js";
 
 // Mock dependencies
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
-vi.mock('../components/CliSpinner.js', () => ({
-  CliSpinner: () => '[Spinner]',
+vi.mock("../components/CliSpinner.js", () => ({
+  CliSpinner: () => "[Spinner]",
 }));
 
-describe('AuthInProgress', () => {
+describe("AuthInProgress", () => {
   const onTimeout = vi.fn();
 
   const originalError = console.error;
@@ -28,10 +28,7 @@ describe('AuthInProgress', () => {
     vi.clearAllMocks();
     vi.useFakeTimers();
     console.error = (...args) => {
-      if (
-        typeof args[0] === 'string' &&
-        args[0].includes('was not wrapped in act')
-      ) {
+      if (typeof args[0] === "string" && args[0].includes("was not wrapped in act")) {
         return;
       }
       originalError.call(console, ...args);
@@ -43,29 +40,29 @@ describe('AuthInProgress', () => {
     vi.useRealTimers();
   });
 
-  it('renders initial state with spinner', () => {
+  it("renders initial state with spinner", () => {
     const { lastFrame } = render(<AuthInProgress onTimeout={onTimeout} />);
-    expect(lastFrame()).toContain('[Spinner] Waiting for auth...');
-    expect(lastFrame()).toContain('Press ESC or CTRL+C to cancel');
+    expect(lastFrame()).toContain("[Spinner] Waiting for auth...");
+    expect(lastFrame()).toContain("Press ESC or CTRL+C to cancel");
   });
 
-  it('calls onTimeout when ESC is pressed', () => {
+  it("calls onTimeout when ESC is pressed", () => {
     render(<AuthInProgress onTimeout={onTimeout} />);
     const keypressHandler = vi.mocked(useKeypress).mock.calls[0][0];
 
-    keypressHandler({ name: 'escape' } as unknown as Key);
+    keypressHandler({ name: "escape" } as unknown as Key);
     expect(onTimeout).toHaveBeenCalled();
   });
 
-  it('calls onTimeout when Ctrl+C is pressed', () => {
+  it("calls onTimeout when Ctrl+C is pressed", () => {
     render(<AuthInProgress onTimeout={onTimeout} />);
     const keypressHandler = vi.mocked(useKeypress).mock.calls[0][0];
 
-    keypressHandler({ name: 'c', ctrl: true } as unknown as Key);
+    keypressHandler({ name: "c", ctrl: true } as unknown as Key);
     expect(onTimeout).toHaveBeenCalled();
   });
 
-  it('calls onTimeout and shows timeout message after 3 minutes', async () => {
+  it("calls onTimeout and shows timeout message after 3 minutes", async () => {
     const { lastFrame } = render(<AuthInProgress onTimeout={onTimeout} />);
 
     await act(async () => {
@@ -73,13 +70,10 @@ describe('AuthInProgress', () => {
     });
 
     expect(onTimeout).toHaveBeenCalled();
-    await vi.waitUntil(
-      () => lastFrame()?.includes('Authentication timed out'),
-      { timeout: 1000 },
-    );
+    await vi.waitUntil(() => lastFrame()?.includes("Authentication timed out"), { timeout: 1000 });
   });
 
-  it('clears timer on unmount', () => {
+  it("clears timer on unmount", () => {
     const { unmount } = render(<AuthInProgress onTimeout={onTimeout} />);
     act(() => {
       unmount();
diff --git a/packages/ui-gemini/src/ui/auth/AuthInProgress.tsx b/packages/ui-gemini/src/ui/auth/AuthInProgress.tsx
index f5c5d7db6..a0a06b0f9 100644
--- a/packages/ui-gemini/src/ui/auth/AuthInProgress.tsx
+++ b/packages/ui-gemini/src/ui/auth/AuthInProgress.tsx
@@ -4,25 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import { CliSpinner } from '../components/CliSpinner.js';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import { CliSpinner } from "../components/CliSpinner.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 interface AuthInProgressProps {
   onTimeout: () => void;
 }
 
-export function AuthInProgress({
-  onTimeout,
-}: AuthInProgressProps): React.JSX.Element {
+export function AuthInProgress({ onTimeout }: AuthInProgressProps): React.JSX.Element {
   const [timedOut, setTimedOut] = useState(false);
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+      if (key.name === "escape" || (key.ctrl && key.name === "c")) {
         onTimeout();
       }
     },
@@ -47,14 +45,11 @@ export function AuthInProgress({
       width="100%"
     >
       {timedOut ? (
-        <Text color={theme.status.error}>
-          Authentication timed out. Please try again.
-        </Text>
+        <Text color={theme.status.error}>Authentication timed out. Please try again.</Text>
       ) : (
         <Box>
           <Text>
-            <CliSpinner type="dots" /> Waiting for auth... (Press ESC or CTRL+C
-            to cancel)
+            <CliSpinner type="dots" /> Waiting for auth... (Press ESC or CTRL+C to cancel)
           </Text>
         </Box>
       )}
diff --git a/packages/ui-gemini/src/ui/auth/useAuth.test.tsx b/packages/ui-gemini/src/ui/auth/useAuth.test.tsx
index 8a53a1c69..86e51f74b 100644
--- a/packages/ui-gemini/src/ui/auth/useAuth.test.tsx
+++ b/packages/ui-gemini/src/ui/auth/useAuth.test.tsx
@@ -4,52 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { renderHook } from '../../test-utils/render.js';
-import { useAuthCommand, validateAuthMethodWithSettings } from './useAuth.js';
-import { AuthType, type Config } from '@airiscode/gemini-cli-core';
-import { AuthState } from '../types.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { waitFor } from '../../test-utils/async.js';
+import { AuthType, type Config } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import { AuthState } from "../types.js";
+import { useAuthCommand, validateAuthMethodWithSettings } from "./useAuth.js";
 
 // Mock dependencies
 const mockLoadApiKey = vi.fn();
 const mockValidateAuthMethod = vi.fn();
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     loadApiKey: () => mockLoadApiKey(),
   };
 });
 
-vi.mock('../../config/auth.js', () => ({
+vi.mock("../../config/auth.js", () => ({
   validateAuthMethod: (authType: AuthType) => mockValidateAuthMethod(authType),
 }));
 
-describe('useAuth', () => {
+describe("useAuth", () => {
   beforeEach(() => {
     vi.resetAllMocks();
-    process.env['GEMINI_API_KEY'] = '';
-    process.env['GEMINI_DEFAULT_AUTH_TYPE'] = '';
+    process.env["GEMINI_API_KEY"] = "";
+    process.env["GEMINI_DEFAULT_AUTH_TYPE"] = "";
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  describe('validateAuthMethodWithSettings', () => {
-    it('should return error if auth type is enforced and does not match', () => {
+  describe("validateAuthMethodWithSettings", () => {
+    it("should return error if auth type is enforced and does not match", () => {
       const settings = {
         merged: {
           security: {
@@ -60,14 +51,11 @@ describe('useAuth', () => {
         },
       } as LoadedSettings;
 
-      const error = validateAuthMethodWithSettings(
-        AuthType.USE_GEMINI,
-        settings,
-      );
-      expect(error).toContain('Authentication is enforced to be oauth');
+      const error = validateAuthMethodWithSettings(AuthType.USE_GEMINI, settings);
+      expect(error).toContain("Authentication is enforced to be oauth");
     });
 
-    it('should return null if useExternal is true', () => {
+    it("should return null if useExternal is true", () => {
       const settings = {
         merged: {
           security: {
@@ -78,14 +66,11 @@ describe('useAuth', () => {
         },
       } as LoadedSettings;
 
-      const error = validateAuthMethodWithSettings(
-        AuthType.LOGIN_WITH_GOOGLE,
-        settings,
-      );
+      const error = validateAuthMethodWithSettings(AuthType.LOGIN_WITH_GOOGLE, settings);
       expect(error).toBeNull();
     });
 
-    it('should return null if authType is USE_GEMINI', () => {
+    it("should return null if authType is USE_GEMINI", () => {
       const settings = {
         merged: {
           security: {
@@ -94,14 +79,11 @@ describe('useAuth', () => {
         },
       } as LoadedSettings;
 
-      const error = validateAuthMethodWithSettings(
-        AuthType.USE_GEMINI,
-        settings,
-      );
+      const error = validateAuthMethodWithSettings(AuthType.USE_GEMINI, settings);
       expect(error).toBeNull();
     });
 
-    it('should call validateAuthMethod for other auth types', () => {
+    it("should call validateAuthMethod for other auth types", () => {
       const settings = {
         merged: {
           security: {
@@ -110,19 +92,14 @@ describe('useAuth', () => {
         },
       } as LoadedSettings;
 
-      mockValidateAuthMethod.mockReturnValue('Validation Error');
-      const error = validateAuthMethodWithSettings(
-        AuthType.LOGIN_WITH_GOOGLE,
-        settings,
-      );
-      expect(error).toBe('Validation Error');
-      expect(mockValidateAuthMethod).toHaveBeenCalledWith(
-        AuthType.LOGIN_WITH_GOOGLE,
-      );
+      mockValidateAuthMethod.mockReturnValue("Validation Error");
+      const error = validateAuthMethodWithSettings(AuthType.LOGIN_WITH_GOOGLE, settings);
+      expect(error).toBe("Validation Error");
+      expect(mockValidateAuthMethod).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE);
     });
   });
 
-  describe('useAuthCommand', () => {
+  describe("useAuthCommand", () => {
     const mockConfig = {
       refreshAuth: vi.fn(),
     } as unknown as Config;
@@ -138,41 +115,33 @@ describe('useAuth', () => {
         },
       }) as LoadedSettings;
 
-    it('should initialize with Unauthenticated state', () => {
+    it("should initialize with Unauthenticated state", () => {
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig),
       );
       expect(result.current.authState).toBe(AuthState.Unauthenticated);
     });
 
-    it('should set error if no auth type is selected and no env key', async () => {
-      const { result } = renderHook(() =>
-        useAuthCommand(createSettings(undefined), mockConfig),
-      );
+    it("should set error if no auth type is selected and no env key", async () => {
+      const { result } = renderHook(() => useAuthCommand(createSettings(undefined), mockConfig));
 
       await waitFor(() => {
-        expect(result.current.authError).toBe(
-          'No authentication method selected.',
-        );
+        expect(result.current.authError).toBe("No authentication method selected.");
         expect(result.current.authState).toBe(AuthState.Updating);
       });
     });
 
-    it('should set error if no auth type is selected but env key exists', async () => {
-      process.env['GEMINI_API_KEY'] = 'env-key';
-      const { result } = renderHook(() =>
-        useAuthCommand(createSettings(undefined), mockConfig),
-      );
+    it("should set error if no auth type is selected but env key exists", async () => {
+      process.env["GEMINI_API_KEY"] = "env-key";
+      const { result } = renderHook(() => useAuthCommand(createSettings(undefined), mockConfig));
 
       await waitFor(() => {
-        expect(result.current.authError).toContain(
-          'Existing API key detected (GEMINI_API_KEY)',
-        );
+        expect(result.current.authError).toContain("Existing API key detected (GEMINI_API_KEY)");
         expect(result.current.authState).toBe(AuthState.Updating);
       });
     });
 
-    it('should transition to AwaitingApiKeyInput if USE_GEMINI and no key found', async () => {
+    it("should transition to AwaitingApiKeyInput if USE_GEMINI and no key found", async () => {
       mockLoadApiKey.mockResolvedValue(null);
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.USE_GEMINI), mockConfig),
@@ -183,104 +152,92 @@ describe('useAuth', () => {
       });
     });
 
-    it('should authenticate if USE_GEMINI and key is found', async () => {
-      mockLoadApiKey.mockResolvedValue('stored-key');
+    it("should authenticate if USE_GEMINI and key is found", async () => {
+      mockLoadApiKey.mockResolvedValue("stored-key");
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.USE_GEMINI), mockConfig),
       );
 
       await waitFor(() => {
-        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-          AuthType.USE_GEMINI,
-        );
+        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.USE_GEMINI);
         expect(result.current.authState).toBe(AuthState.Authenticated);
-        expect(result.current.apiKeyDefaultValue).toBe('stored-key');
+        expect(result.current.apiKeyDefaultValue).toBe("stored-key");
       });
     });
 
-    it('should authenticate if USE_GEMINI and env key is found', async () => {
+    it("should authenticate if USE_GEMINI and env key is found", async () => {
       mockLoadApiKey.mockResolvedValue(null);
-      process.env['GEMINI_API_KEY'] = 'env-key';
+      process.env["GEMINI_API_KEY"] = "env-key";
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.USE_GEMINI), mockConfig),
       );
 
       await waitFor(() => {
-        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-          AuthType.USE_GEMINI,
-        );
+        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.USE_GEMINI);
         expect(result.current.authState).toBe(AuthState.Authenticated);
-        expect(result.current.apiKeyDefaultValue).toBe('env-key');
+        expect(result.current.apiKeyDefaultValue).toBe("env-key");
       });
     });
 
-    it('should prioritize env key over stored key when both are present', async () => {
-      mockLoadApiKey.mockResolvedValue('stored-key');
-      process.env['GEMINI_API_KEY'] = 'env-key';
+    it("should prioritize env key over stored key when both are present", async () => {
+      mockLoadApiKey.mockResolvedValue("stored-key");
+      process.env["GEMINI_API_KEY"] = "env-key";
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.USE_GEMINI), mockConfig),
       );
 
       await waitFor(() => {
-        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-          AuthType.USE_GEMINI,
-        );
+        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.USE_GEMINI);
         expect(result.current.authState).toBe(AuthState.Authenticated);
         // The environment key should take precedence
-        expect(result.current.apiKeyDefaultValue).toBe('env-key');
+        expect(result.current.apiKeyDefaultValue).toBe("env-key");
       });
     });
 
-    it('should set error if validation fails', async () => {
-      mockValidateAuthMethod.mockReturnValue('Validation Failed');
+    it("should set error if validation fails", async () => {
+      mockValidateAuthMethod.mockReturnValue("Validation Failed");
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig),
       );
 
       await waitFor(() => {
-        expect(result.current.authError).toBe('Validation Failed');
+        expect(result.current.authError).toBe("Validation Failed");
         expect(result.current.authState).toBe(AuthState.Updating);
       });
     });
 
-    it('should set error if GEMINI_DEFAULT_AUTH_TYPE is invalid', async () => {
-      process.env['GEMINI_DEFAULT_AUTH_TYPE'] = 'INVALID_TYPE';
+    it("should set error if GEMINI_DEFAULT_AUTH_TYPE is invalid", async () => {
+      process.env["GEMINI_DEFAULT_AUTH_TYPE"] = "INVALID_TYPE";
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig),
       );
 
       await waitFor(() => {
-        expect(result.current.authError).toContain(
-          'Invalid value for GEMINI_DEFAULT_AUTH_TYPE',
-        );
+        expect(result.current.authError).toContain("Invalid value for GEMINI_DEFAULT_AUTH_TYPE");
         expect(result.current.authState).toBe(AuthState.Updating);
       });
     });
 
-    it('should authenticate successfully for valid auth type', async () => {
+    it("should authenticate successfully for valid auth type", async () => {
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig),
       );
 
       await waitFor(() => {
-        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-          AuthType.LOGIN_WITH_GOOGLE,
-        );
+        expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE);
         expect(result.current.authState).toBe(AuthState.Authenticated);
         expect(result.current.authError).toBeNull();
       });
     });
 
-    it('should handle refreshAuth failure', async () => {
-      (mockConfig.refreshAuth as Mock).mockRejectedValue(
-        new Error('Auth Failed'),
-      );
+    it("should handle refreshAuth failure", async () => {
+      (mockConfig.refreshAuth as Mock).mockRejectedValue(new Error("Auth Failed"));
       const { result } = renderHook(() =>
         useAuthCommand(createSettings(AuthType.LOGIN_WITH_GOOGLE), mockConfig),
       );
 
       await waitFor(() => {
-        expect(result.current.authError).toContain('Failed to login');
+        expect(result.current.authError).toContain("Failed to login");
         expect(result.current.authState).toBe(AuthState.Updating);
       });
     });
diff --git a/packages/ui-gemini/src/ui/auth/useAuth.ts b/packages/ui-gemini/src/ui/auth/useAuth.ts
index 26a2be884..207e640f5 100644
--- a/packages/ui-gemini/src/ui/auth/useAuth.ts
+++ b/packages/ui-gemini/src/ui/auth/useAuth.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useCallback } from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
 import {
   AuthType,
   type Config,
-  loadApiKey,
   debugLogger,
-} from '@airiscode/gemini-cli-core';
-import { getErrorMessage } from '@airiscode/gemini-cli-core';
-import { AuthState } from '../types.js';
-import { validateAuthMethod } from '../../config/auth.js';
+  getErrorMessage,
+  loadApiKey,
+} from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useState } from "react";
+import { validateAuthMethod } from "../../config/auth.js";
+import type { LoadedSettings } from "../../config/settings.js";
+import { AuthState } from "../types.js";
 
 export function validateAuthMethodWithSettings(
   authType: AuthType,
@@ -35,14 +35,10 @@ export function validateAuthMethodWithSettings(
 }
 
 export const useAuthCommand = (settings: LoadedSettings, config: Config) => {
-  const [authState, setAuthState] = useState<AuthState>(
-    AuthState.Unauthenticated,
-  );
+  const [authState, setAuthState] = useState<AuthState>(AuthState.Unauthenticated);
 
   const [authError, setAuthError] = useState<string | null>(null);
-  const [apiKeyDefaultValue, setApiKeyDefaultValue] = useState<
-    string | undefined
-  >(undefined);
+  const [apiKeyDefaultValue, setApiKeyDefaultValue] = useState<string | undefined>(undefined);
 
   const onAuthError = useCallback(
     (error: string | null) => {
@@ -55,8 +51,8 @@ export const useAuthCommand = (settings: LoadedSettings, config: Config) => {
   );
 
   const reloadApiKey = useCallback(async () => {
-    const storedKey = (await loadApiKey()) ?? '';
-    const envKey = process.env['GEMINI_API_KEY'] ?? '';
+    const storedKey = (await loadApiKey()) ?? "";
+    const envKey = process.env["GEMINI_API_KEY"] ?? "";
     const key = envKey || storedKey;
     setApiKeyDefaultValue(key);
     return key; // Return the key for immediate use
@@ -78,12 +74,12 @@ export const useAuthCommand = (settings: LoadedSettings, config: Config) => {
 
       const authType = settings.merged.security?.auth?.selectedType;
       if (!authType) {
-        if (process.env['GEMINI_API_KEY']) {
+        if (process.env["GEMINI_API_KEY"]) {
           onAuthError(
             'Existing API key detected (GEMINI_API_KEY). Select "Gemini API Key" option to use it.',
           );
         } else {
-          onAuthError('No authentication method selected.');
+          onAuthError("No authentication method selected.");
         }
         return;
       }
@@ -102,14 +98,11 @@ export const useAuthCommand = (settings: LoadedSettings, config: Config) => {
         return;
       }
 
-      const defaultAuthType = process.env['GEMINI_DEFAULT_AUTH_TYPE'];
-      if (
-        defaultAuthType &&
-        !Object.values(AuthType).includes(defaultAuthType as AuthType)
-      ) {
+      const defaultAuthType = process.env["GEMINI_DEFAULT_AUTH_TYPE"];
+      if (defaultAuthType && !Object.values(AuthType).includes(defaultAuthType as AuthType)) {
         onAuthError(
           `Invalid value for GEMINI_DEFAULT_AUTH_TYPE: "${defaultAuthType}". ` +
-            `Valid values are: ${Object.values(AuthType).join(', ')}.`,
+            `Valid values are: ${Object.values(AuthType).join(", ")}.`,
         );
         return;
       }
@@ -124,15 +117,7 @@ export const useAuthCommand = (settings: LoadedSettings, config: Config) => {
         onAuthError(`Failed to login. Message: ${getErrorMessage(e)}`);
       }
     })();
-  }, [
-    settings,
-    config,
-    authState,
-    setAuthState,
-    setAuthError,
-    onAuthError,
-    reloadApiKey,
-  ]);
+  }, [settings, config, authState, setAuthState, setAuthError, onAuthError, reloadApiKey]);
 
   return {
     authState,
diff --git a/packages/ui-gemini/src/ui/colors.ts b/packages/ui-gemini/src/ui/colors.ts
index 87ec04b73..a747f5501 100644
--- a/packages/ui-gemini/src/ui/colors.ts
+++ b/packages/ui-gemini/src/ui/colors.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { themeManager } from './themes/theme-manager.js';
-import type { ColorsTheme } from './themes/theme.js';
+import type { ColorsTheme } from "./themes/theme.js";
+import { themeManager } from "./themes/theme-manager.js";
 
 export const Colors: ColorsTheme = {
   get type() {
diff --git a/packages/ui-gemini/src/ui/commands/aboutCommand.test.ts b/packages/ui-gemini/src/ui/commands/aboutCommand.test.ts
index 59ca6260f..be1926624 100644
--- a/packages/ui-gemini/src/ui/commands/aboutCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/aboutCommand.test.ts
@@ -4,31 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { aboutCommand } from './aboutCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
-import { IdeClient, getVersion } from '@airiscode/gemini-cli-core';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+import { getVersion, IdeClient } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { aboutCommand } from "./aboutCommand.js";
+import { type CommandContext } from "./types.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     IdeClient: {
       getInstance: vi.fn().mockResolvedValue({
-        getDetectedIdeDisplayName: vi.fn().mockReturnValue('test-ide'),
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue("test-ide"),
       }),
     },
     UserAccountManager: vi.fn().mockImplementation(() => ({
-      getCachedGoogleAccount: vi.fn().mockReturnValue('test-email@example.com'),
+      getCachedGoogleAccount: vi.fn().mockReturnValue("test-email@example.com"),
     })),
     getVersion: vi.fn(),
   };
 });
 
-describe('aboutCommand', () => {
+describe("aboutCommand", () => {
   let mockContext: CommandContext;
   const originalPlatform = process.platform;
   const originalEnv = { ...process.env };
@@ -44,7 +43,7 @@ describe('aboutCommand', () => {
           merged: {
             security: {
               auth: {
-                selectedType: 'test-auth',
+                selectedType: "test-auth",
               },
             },
           },
@@ -55,109 +54,107 @@ describe('aboutCommand', () => {
       },
     } as unknown as CommandContext);
 
-    vi.mocked(getVersion).mockResolvedValue('test-version');
-    vi.spyOn(mockContext.services.config!, 'getModel').mockReturnValue(
-      'test-model',
-    );
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-gcp-project';
-    Object.defineProperty(process, 'platform', {
-      value: 'test-os',
+    vi.mocked(getVersion).mockResolvedValue("test-version");
+    vi.spyOn(mockContext.services.config!, "getModel").mockReturnValue("test-model");
+    process.env["GOOGLE_CLOUD_PROJECT"] = "test-gcp-project";
+    Object.defineProperty(process, "platform", {
+      value: "test-os",
     });
   });
 
   afterEach(() => {
     vi.unstubAllEnvs();
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
     });
     process.env = originalEnv;
     vi.clearAllMocks();
   });
 
-  it('should have the correct name and description', () => {
-    expect(aboutCommand.name).toBe('about');
-    expect(aboutCommand.description).toBe('Show version info');
+  it("should have the correct name and description", () => {
+    expect(aboutCommand.name).toBe("about");
+    expect(aboutCommand.description).toBe("Show version info");
   });
 
-  it('should call addItem with all version info', async () => {
-    process.env['SANDBOX'] = '';
+  it("should call addItem with all version info", async () => {
+    process.env["SANDBOX"] = "";
     if (!aboutCommand.action) {
-      throw new Error('The about command must have an action.');
+      throw new Error("The about command must have an action.");
     }
 
-    await aboutCommand.action(mockContext, '');
+    await aboutCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
         type: MessageType.ABOUT,
-        cliVersion: 'test-version',
-        osVersion: 'test-os',
-        sandboxEnv: 'no sandbox',
-        modelVersion: 'test-model',
-        selectedAuthType: 'test-auth',
-        gcpProject: 'test-gcp-project',
-        ideClient: 'test-ide',
-        userEmail: 'test-email@example.com',
+        cliVersion: "test-version",
+        osVersion: "test-os",
+        sandboxEnv: "no sandbox",
+        modelVersion: "test-model",
+        selectedAuthType: "test-auth",
+        gcpProject: "test-gcp-project",
+        ideClient: "test-ide",
+        userEmail: "test-email@example.com",
       },
       expect.any(Number),
     );
   });
 
-  it('should show the correct sandbox environment variable', async () => {
-    process.env['SANDBOX'] = 'gemini-sandbox';
+  it("should show the correct sandbox environment variable", async () => {
+    process.env["SANDBOX"] = "gemini-sandbox";
     if (!aboutCommand.action) {
-      throw new Error('The about command must have an action.');
+      throw new Error("The about command must have an action.");
     }
 
-    await aboutCommand.action(mockContext, '');
+    await aboutCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
-        sandboxEnv: 'gemini-sandbox',
+        sandboxEnv: "gemini-sandbox",
       }),
       expect.any(Number),
     );
   });
 
-  it('should show sandbox-exec profile when applicable', async () => {
-    process.env['SANDBOX'] = 'sandbox-exec';
-    process.env['SEATBELT_PROFILE'] = 'test-profile';
+  it("should show sandbox-exec profile when applicable", async () => {
+    process.env["SANDBOX"] = "sandbox-exec";
+    process.env["SEATBELT_PROFILE"] = "test-profile";
     if (!aboutCommand.action) {
-      throw new Error('The about command must have an action.');
+      throw new Error("The about command must have an action.");
     }
 
-    await aboutCommand.action(mockContext, '');
+    await aboutCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
-        sandboxEnv: 'sandbox-exec (test-profile)',
+        sandboxEnv: "sandbox-exec (test-profile)",
       }),
       expect.any(Number),
     );
   });
 
-  it('should not show ide client when it is not detected', async () => {
+  it("should not show ide client when it is not detected", async () => {
     vi.mocked(IdeClient.getInstance).mockResolvedValue({
       getDetectedIdeDisplayName: vi.fn().mockReturnValue(undefined),
     } as unknown as IdeClient);
 
-    process.env['SANDBOX'] = '';
+    process.env["SANDBOX"] = "";
     if (!aboutCommand.action) {
-      throw new Error('The about command must have an action.');
+      throw new Error("The about command must have an action.");
     }
 
-    await aboutCommand.action(mockContext, '');
+    await aboutCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
         type: MessageType.ABOUT,
-        cliVersion: 'test-version',
-        osVersion: 'test-os',
-        sandboxEnv: 'no sandbox',
-        modelVersion: 'test-model',
-        selectedAuthType: 'test-auth',
-        gcpProject: 'test-gcp-project',
-        ideClient: '',
+        cliVersion: "test-version",
+        osVersion: "test-os",
+        sandboxEnv: "no sandbox",
+        modelVersion: "test-model",
+        selectedAuthType: "test-auth",
+        gcpProject: "test-gcp-project",
+        ideClient: "",
       }),
       expect.any(Number),
     );
diff --git a/packages/ui-gemini/src/ui/commands/aboutCommand.ts b/packages/ui-gemini/src/ui/commands/aboutCommand.ts
index bbfc74974..03c3cc82f 100644
--- a/packages/ui-gemini/src/ui/commands/aboutCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/aboutCommand.ts
@@ -4,47 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandContext, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import process from 'node:process';
-import { MessageType, type HistoryItemAbout } from '../types.js';
-import {
-  IdeClient,
-  UserAccountManager,
-  debugLogger,
-  getVersion,
-} from '@airiscode/gemini-cli-core';
+import process from "node:process";
+import { debugLogger, getVersion, IdeClient, UserAccountManager } from "@airiscode/gemini-cli-core";
+import { type HistoryItemAbout, MessageType } from "../types.js";
+import type { CommandContext, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const aboutCommand: SlashCommand = {
-  name: 'about',
-  description: 'Show version info',
+  name: "about",
+  description: "Show version info",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context) => {
     const osVersion = process.platform;
-    let sandboxEnv = 'no sandbox';
-    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
-      sandboxEnv = process.env['SANDBOX'];
-    } else if (process.env['SANDBOX'] === 'sandbox-exec') {
-      sandboxEnv = `sandbox-exec (${
-        process.env['SEATBELT_PROFILE'] || 'unknown'
-      })`;
+    let sandboxEnv = "no sandbox";
+    if (process.env["SANDBOX"] && process.env["SANDBOX"] !== "sandbox-exec") {
+      sandboxEnv = process.env["SANDBOX"];
+    } else if (process.env["SANDBOX"] === "sandbox-exec") {
+      sandboxEnv = `sandbox-exec (${process.env["SEATBELT_PROFILE"] || "unknown"})`;
     }
-    const modelVersion = context.services.config?.getModel() || 'Unknown';
+    const modelVersion = context.services.config?.getModel() || "Unknown";
     const cliVersion = await getVersion();
-    const selectedAuthType =
-      context.services.settings.merged.security?.auth?.selectedType || '';
-    const gcpProject = process.env['GOOGLE_CLOUD_PROJECT'] || '';
+    const selectedAuthType = context.services.settings.merged.security?.auth?.selectedType || "";
+    const gcpProject = process.env["GOOGLE_CLOUD_PROJECT"] || "";
     const ideClient = await getIdeClientName(context);
 
     const userAccountManager = new UserAccountManager();
     const cachedAccount = userAccountManager.getCachedGoogleAccount();
-    debugLogger.log('AboutCommand: Retrieved cached Google account', {
+    debugLogger.log("AboutCommand: Retrieved cached Google account", {
       cachedAccount,
     });
     const userEmail = cachedAccount ?? undefined;
 
-    const aboutItem: Omit<HistoryItemAbout, 'id'> = {
+    const aboutItem: Omit<HistoryItemAbout, "id"> = {
       type: MessageType.ABOUT,
       cliVersion,
       osVersion,
@@ -62,8 +54,8 @@ export const aboutCommand: SlashCommand = {
 
 async function getIdeClientName(context: CommandContext) {
   if (!context.services.config?.getIdeMode()) {
-    return '';
+    return "";
   }
   const ideClient = await IdeClient.getInstance();
-  return ideClient?.getDetectedIdeDisplayName() ?? '';
+  return ideClient?.getDetectedIdeDisplayName() ?? "";
 }
diff --git a/packages/ui-gemini/src/ui/commands/authCommand.test.ts b/packages/ui-gemini/src/ui/commands/authCommand.test.ts
index 6df88c3f7..edae3bcc5 100644
--- a/packages/ui-gemini/src/ui/commands/authCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/authCommand.test.ts
@@ -4,33 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { authCommand } from './authCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { authCommand } from "./authCommand.js";
+import { type CommandContext } from "./types.js";
 
-describe('authCommand', () => {
+describe("authCommand", () => {
   let mockContext: CommandContext;
 
   beforeEach(() => {
     mockContext = createMockCommandContext();
   });
 
-  it('should return a dialog action to open the auth dialog', () => {
+  it("should return a dialog action to open the auth dialog", () => {
     if (!authCommand.action) {
-      throw new Error('The auth command must have an action.');
+      throw new Error("The auth command must have an action.");
     }
 
-    const result = authCommand.action(mockContext, '');
+    const result = authCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'dialog',
-      dialog: 'auth',
+      type: "dialog",
+      dialog: "auth",
     });
   });
 
-  it('should have the correct name and description', () => {
-    expect(authCommand.name).toBe('auth');
-    expect(authCommand.description).toBe('Change the auth method');
+  it("should have the correct name and description", () => {
+    expect(authCommand.name).toBe("auth");
+    expect(authCommand.description).toBe("Change the auth method");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/authCommand.ts b/packages/ui-gemini/src/ui/commands/authCommand.ts
index dfb113e50..47891a9ea 100644
--- a/packages/ui-gemini/src/ui/commands/authCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/authCommand.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const authCommand: SlashCommand = {
-  name: 'auth',
-  description: 'Change the auth method',
+  name: "auth",
+  description: "Change the auth method",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (_context, _args): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'auth',
+    type: "dialog",
+    dialog: "auth",
   }),
 };
diff --git a/packages/ui-gemini/src/ui/commands/bugCommand.test.ts b/packages/ui-gemini/src/ui/commands/bugCommand.test.ts
index a70b565e3..c34b43f14 100644
--- a/packages/ui-gemini/src/ui/commands/bugCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/bugCommand.test.ts
@@ -4,46 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import open from 'open';
-import { bugCommand } from './bugCommand.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { getVersion } from '@airiscode/gemini-cli-core';
-import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
+import { getVersion } from "@airiscode/gemini-cli-core";
+import open from "open";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { GIT_COMMIT_INFO } from "../../generated/git-commit.js";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
+import { bugCommand } from "./bugCommand.js";
 
 // Mock dependencies
-vi.mock('open');
-vi.mock('../utils/formatters.js');
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("open");
+vi.mock("../utils/formatters.js");
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     IdeClient: {
       getInstance: () => ({
-        getDetectedIdeDisplayName: vi.fn().mockReturnValue('VSCode'),
+        getDetectedIdeDisplayName: vi.fn().mockReturnValue("VSCode"),
       }),
     },
-    sessionId: 'test-session-id',
+    sessionId: "test-session-id",
     getVersion: vi.fn(),
   };
 });
-vi.mock('node:process', () => ({
+vi.mock("node:process", () => ({
   default: {
-    platform: 'test-platform',
-    version: 'v20.0.0',
+    platform: "test-platform",
+    version: "v20.0.0",
     // Keep other necessary process properties if needed by other parts of the code
     env: process.env,
     memoryUsage: () => ({ rss: 0 }),
   },
 }));
 
-describe('bugCommand', () => {
+describe("bugCommand", () => {
   beforeEach(() => {
-    vi.mocked(getVersion).mockResolvedValue('0.1.0');
-    vi.mocked(formatMemoryUsage).mockReturnValue('100 MB');
-    vi.stubEnv('SANDBOX', 'gemini-test');
+    vi.mocked(getVersion).mockResolvedValue("0.1.0");
+    vi.mocked(formatMemoryUsage).mockReturnValue("100 MB");
+    vi.stubEnv("SANDBOX", "gemini-test");
   });
 
   afterEach(() => {
@@ -51,19 +50,19 @@ describe('bugCommand', () => {
     vi.clearAllMocks();
   });
 
-  it('should generate the default GitHub issue URL', async () => {
+  it("should generate the default GitHub issue URL", async () => {
     const mockContext = createMockCommandContext({
       services: {
         config: {
-          getModel: () => 'gemini-pro',
+          getModel: () => "gemini-pro",
           getBugCommand: () => undefined,
           getIdeMode: () => true,
         },
       },
     });
 
-    if (!bugCommand.action) throw new Error('Action is not defined');
-    await bugCommand.action(mockContext, 'A test bug');
+    if (!bugCommand.action) throw new Error("Action is not defined");
+    await bugCommand.action(mockContext, "A test bug");
 
     const expectedInfo = `
 * **CLI Version:** 0.1.0
@@ -76,27 +75,26 @@ describe('bugCommand', () => {
 * **IDE Client:** VSCode
 `;
     const expectedUrl =
-      'https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml&title=A%20test%20bug&info=' +
+      "https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml&title=A%20test%20bug&info=" +
       encodeURIComponent(expectedInfo);
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });
 
-  it('should use a custom URL template from config if provided', async () => {
-    const customTemplate =
-      'https://internal.bug-tracker.com/new?desc={title}&details={info}';
+  it("should use a custom URL template from config if provided", async () => {
+    const customTemplate = "https://internal.bug-tracker.com/new?desc={title}&details={info}";
     const mockContext = createMockCommandContext({
       services: {
         config: {
-          getModel: () => 'gemini-pro',
+          getModel: () => "gemini-pro",
           getBugCommand: () => ({ urlTemplate: customTemplate }),
           getIdeMode: () => true,
         },
       },
     });
 
-    if (!bugCommand.action) throw new Error('Action is not defined');
-    await bugCommand.action(mockContext, 'A custom bug');
+    if (!bugCommand.action) throw new Error("Action is not defined");
+    await bugCommand.action(mockContext, "A custom bug");
 
     const expectedInfo = `
 * **CLI Version:** 0.1.0
@@ -109,8 +107,8 @@ describe('bugCommand', () => {
 * **IDE Client:** VSCode
 `;
     const expectedUrl = customTemplate
-      .replace('{title}', encodeURIComponent('A custom bug'))
-      .replace('{info}', encodeURIComponent(expectedInfo));
+      .replace("{title}", encodeURIComponent("A custom bug"))
+      .replace("{info}", encodeURIComponent(expectedInfo));
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });
diff --git a/packages/ui-gemini/src/ui/commands/bugCommand.ts b/packages/ui-gemini/src/ui/commands/bugCommand.ts
index e0a85bc99..b1f6fa940 100644
--- a/packages/ui-gemini/src/ui/commands/bugCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/bugCommand.ts
@@ -4,37 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import open from 'open';
-import process from 'node:process';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { MessageType } from '../types.js';
-import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import { IdeClient, sessionId, getVersion } from '@airiscode/gemini-cli-core';
+import process from "node:process";
+import { getVersion, IdeClient, sessionId } from "@airiscode/gemini-cli-core";
+import open from "open";
+import { GIT_COMMIT_INFO } from "../../generated/git-commit.js";
+import { MessageType } from "../types.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 export const bugCommand: SlashCommand = {
-  name: 'bug',
-  description: 'Submit a bug report',
+  name: "bug",
+  description: "Submit a bug report",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: async (context: CommandContext, args?: string): Promise<void> => {
-    const bugDescription = (args || '').trim();
+    const bugDescription = (args || "").trim();
     const { config } = context.services;
 
     const osVersion = `${process.platform} ${process.version}`;
-    let sandboxEnv = 'no sandbox';
-    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
-      sandboxEnv = process.env['SANDBOX'].replace(/^gemini-(?:code-)?/, '');
-    } else if (process.env['SANDBOX'] === 'sandbox-exec') {
-      sandboxEnv = `sandbox-exec (${
-        process.env['SEATBELT_PROFILE'] || 'unknown'
-      })`;
+    let sandboxEnv = "no sandbox";
+    if (process.env["SANDBOX"] && process.env["SANDBOX"] !== "sandbox-exec") {
+      sandboxEnv = process.env["SANDBOX"].replace(/^gemini-(?:code-)?/, "");
+    } else if (process.env["SANDBOX"] === "sandbox-exec") {
+      sandboxEnv = `sandbox-exec (${process.env["SEATBELT_PROFILE"] || "unknown"})`;
     }
-    const modelVersion = config?.getModel() || 'Unknown';
+    const modelVersion = config?.getModel() || "Unknown";
     const cliVersion = await getVersion();
     const memoryUsage = formatMemoryUsage(process.memoryUsage().rss);
     const ideClient = await getIdeClientName(context);
@@ -53,7 +47,7 @@ export const bugCommand: SlashCommand = {
     }
 
     let bugReportUrl =
-      'https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml&title={title}&info={info}';
+      "https://github.com/google-gemini/gemini-cli/issues/new?template=bug_report.yml&title={title}&info={info}";
 
     const bugCommandSettings = config?.getBugCommand();
     if (bugCommandSettings?.urlTemplate) {
@@ -61,8 +55,8 @@ export const bugCommand: SlashCommand = {
     }
 
     bugReportUrl = bugReportUrl
-      .replace('{title}', encodeURIComponent(bugDescription))
-      .replace('{info}', encodeURIComponent(info));
+      .replace("{title}", encodeURIComponent(bugDescription))
+      .replace("{info}", encodeURIComponent(info));
 
     context.ui.addItem(
       {
@@ -75,8 +69,7 @@ export const bugCommand: SlashCommand = {
     try {
       await open(bugReportUrl);
     } catch (error) {
-      const errorMessage =
-        error instanceof Error ? error.message : String(error);
+      const errorMessage = error instanceof Error ? error.message : String(error);
       context.ui.addItem(
         {
           type: MessageType.ERROR,
@@ -90,8 +83,8 @@ export const bugCommand: SlashCommand = {
 
 async function getIdeClientName(context: CommandContext) {
   if (!context.services.config?.getIdeMode()) {
-    return '';
+    return "";
   }
   const ideClient = await IdeClient.getInstance();
-  return ideClient.getDetectedIdeDisplayName() ?? '';
+  return ideClient.getDetectedIdeDisplayName() ?? "";
 }
diff --git a/packages/ui-gemini/src/ui/commands/chatCommand.test.ts b/packages/ui-gemini/src/ui/commands/chatCommand.test.ts
index 74a9ef6a8..8beb968ec 100644
--- a/packages/ui-gemini/src/ui/commands/chatCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/chatCommand.test.ts
@@ -4,27 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mocked } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-
-import type { SlashCommand, CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import type { Content } from '@google/genai';
-import { AuthType, type GeminiClient } from '@airiscode/gemini-cli-core';
-
-import * as fsPromises from 'node:fs/promises';
-import { chatCommand, serializeHistoryToMarkdown } from './chatCommand.js';
-import type { Stats } from 'node:fs';
-import type { HistoryItemWithoutId } from '../types.js';
-import path from 'node:path';
-
-vi.mock('fs/promises', () => ({
+import type { Stats } from "node:fs";
+import * as fsPromises from "node:fs/promises";
+import path from "node:path";
+import { AuthType, type GeminiClient } from "@airiscode/gemini-cli-core";
+import type { Content } from "@google/genai";
+import type { Mocked } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import type { HistoryItemWithoutId } from "../types.js";
+import { chatCommand, serializeHistoryToMarkdown } from "./chatCommand.js";
+import type { CommandContext, SlashCommand } from "./types.js";
+
+vi.mock("fs/promises", () => ({
   stat: vi.fn(),
-  readdir: vi.fn().mockResolvedValue(['file1.txt', 'file2.txt'] as string[]),
+  readdir: vi.fn().mockResolvedValue(["file1.txt", "file2.txt"] as string[]),
   writeFile: vi.fn(),
 }));
 
-describe('chatCommand', () => {
+describe("chatCommand", () => {
   const mockFs = fsPromises as Mocked<typeof fsPromises>;
 
   let mockContext: CommandContext;
@@ -34,12 +32,8 @@ describe('chatCommand', () => {
   let mockDeleteCheckpoint: ReturnType<typeof vi.fn>;
   let mockGetHistory: ReturnType<typeof vi.fn>;
 
-  const getSubCommand = (
-    name: 'list' | 'save' | 'resume' | 'delete' | 'share',
-  ): SlashCommand => {
-    const subCommand = chatCommand.subCommands?.find(
-      (cmd) => cmd.name === name,
-    );
+  const getSubCommand = (name: "list" | "save" | "resume" | "delete" | "share"): SlashCommand => {
+    const subCommand = chatCommand.subCommands?.find((cmd) => cmd.name === name);
     if (!subCommand) {
       throw new Error(`/chat ${name} command not found.`);
     }
@@ -58,13 +52,13 @@ describe('chatCommand', () => {
     mockContext = createMockCommandContext({
       services: {
         config: {
-          getProjectRoot: () => '/project/root',
+          getProjectRoot: () => "/project/root",
           getGeminiClient: () =>
             ({
               getChat: mockGetChat,
             }) as unknown as GeminiClient,
           storage: {
-            getProjectTempDir: () => '/project/root/.gemini/tmp/mockhash',
+            getProjectTempDir: () => "/project/root/.gemini/tmp/mockhash",
           },
           getContentGeneratorConfig: () => ({
             authType: AuthType.LOGIN_WITH_GOOGLE,
@@ -84,21 +78,21 @@ describe('chatCommand', () => {
     vi.restoreAllMocks();
   });
 
-  it('should have the correct main command definition', () => {
-    expect(chatCommand.name).toBe('chat');
-    expect(chatCommand.description).toBe('Manage conversation history');
+  it("should have the correct main command definition", () => {
+    expect(chatCommand.name).toBe("chat");
+    expect(chatCommand.description).toBe("Manage conversation history");
     expect(chatCommand.subCommands).toHaveLength(5);
   });
 
-  describe('list subcommand', () => {
+  describe("list subcommand", () => {
     let listCommand: SlashCommand;
 
     beforeEach(() => {
-      listCommand = getSubCommand('list');
+      listCommand = getSubCommand("list");
     });
 
-    it('should add a chat_list item to the UI', async () => {
-      const fakeFiles = ['checkpoint-test1.json', 'checkpoint-test2.json'];
+    it("should add a chat_list item to the UI", async () => {
+      const fakeFiles = ["checkpoint-test1.json", "checkpoint-test2.json"];
       const date1 = new Date();
       const date2 = new Date(date1.getTime() + 1000);
 
@@ -106,24 +100,24 @@ describe('chatCommand', () => {
       mockFs.readdir.mockResolvedValue(fakeFiles as any);
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       mockFs.stat.mockImplementation(async (path: any): Promise<Stats> => {
-        if (path.endsWith('test1.json')) {
+        if (path.endsWith("test1.json")) {
           return { mtime: date1 } as Stats;
         }
         return { mtime: date2 } as Stats;
       });
 
-      await listCommand?.action?.(mockContext, '');
+      await listCommand?.action?.(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
-          type: 'chat_list',
+          type: "chat_list",
           chats: [
             {
-              name: 'test1',
+              name: "test1",
               mtime: date1.toISOString(),
             },
             {
-              name: 'test2',
+              name: "test2",
               mtime: date2.toISOString(),
             },
           ],
@@ -132,64 +126,64 @@ describe('chatCommand', () => {
       );
     });
   });
-  describe('save subcommand', () => {
+  describe("save subcommand", () => {
     let saveCommand: SlashCommand;
-    const tag = 'my-tag';
+    const tag = "my-tag";
     let mockCheckpointExists: ReturnType<typeof vi.fn>;
 
     beforeEach(() => {
-      saveCommand = getSubCommand('save');
+      saveCommand = getSubCommand("save");
       mockCheckpointExists = vi.fn().mockResolvedValue(false);
       mockContext.services.logger.checkpointExists = mockCheckpointExists;
     });
 
-    it('should return an error if tag is missing', async () => {
-      const result = await saveCommand?.action?.(mockContext, '  ');
+    it("should return an error if tag is missing", async () => {
+      const result = await saveCommand?.action?.(mockContext, "  ");
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Missing tag. Usage: /chat save <tag>',
+        type: "message",
+        messageType: "error",
+        content: "Missing tag. Usage: /chat save <tag>",
       });
     });
 
-    it('should inform if conversation history is empty or only contains system context', async () => {
+    it("should inform if conversation history is empty or only contains system context", async () => {
       mockGetHistory.mockReturnValue([]);
       let result = await saveCommand?.action?.(mockContext, tag);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: 'No conversation found to save.',
+        type: "message",
+        messageType: "info",
+        content: "No conversation found to save.",
       });
 
       mockGetHistory.mockReturnValue([
-        { role: 'user', parts: [{ text: 'context for our chat' }] },
-        { role: 'model', parts: [{ text: 'Got it. Thanks for the context!' }] },
+        { role: "user", parts: [{ text: "context for our chat" }] },
+        { role: "model", parts: [{ text: "Got it. Thanks for the context!" }] },
       ]);
       result = await saveCommand?.action?.(mockContext, tag);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: 'No conversation found to save.',
+        type: "message",
+        messageType: "info",
+        content: "No conversation found to save.",
       });
 
       mockGetHistory.mockReturnValue([
-        { role: 'user', parts: [{ text: 'context for our chat' }] },
-        { role: 'model', parts: [{ text: 'Got it. Thanks for the context!' }] },
-        { role: 'user', parts: [{ text: 'Hello, how are you?' }] },
+        { role: "user", parts: [{ text: "context for our chat" }] },
+        { role: "model", parts: [{ text: "Got it. Thanks for the context!" }] },
+        { role: "user", parts: [{ text: "Hello, how are you?" }] },
       ]);
       result = await saveCommand?.action?.(mockContext, tag);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation checkpoint saved with tag: ${tag}.`,
       });
     });
 
-    it('should return confirm_action if checkpoint already exists', async () => {
+    it("should return confirm_action if checkpoint already exists", async () => {
       mockCheckpointExists.mockResolvedValue(true);
       mockContext.invocation = {
         raw: `/chat save ${tag}`,
-        name: 'save',
+        name: "save",
         args: tag,
       };
 
@@ -198,19 +192,19 @@ describe('chatCommand', () => {
       expect(mockCheckpointExists).toHaveBeenCalledWith(tag);
       expect(mockSaveCheckpoint).not.toHaveBeenCalled();
       expect(result).toMatchObject({
-        type: 'confirm_action',
+        type: "confirm_action",
         originalInvocation: { raw: `/chat save ${tag}` },
       });
       // Check that prompt is a React element
-      expect(result).toHaveProperty('prompt');
+      expect(result).toHaveProperty("prompt");
     });
 
-    it('should save the conversation if overwrite is confirmed', async () => {
+    it("should save the conversation if overwrite is confirmed", async () => {
       const history: Content[] = [
-        { role: 'user', parts: [{ text: 'context for our chat' }] },
-        { role: 'model', parts: [{ text: 'Got it. Thanks for the context!' }] },
-        { role: 'user', parts: [{ text: 'hello' }] },
-        { role: 'model', parts: [{ text: 'Hi there!' }] },
+        { role: "user", parts: [{ text: "context for our chat" }] },
+        { role: "model", parts: [{ text: "Got it. Thanks for the context!" }] },
+        { role: "user", parts: [{ text: "hello" }] },
+        { role: "model", parts: [{ text: "Hi there!" }] },
       ];
       mockGetHistory.mockReturnValue(history);
       mockContext.overwriteConfirmed = true;
@@ -223,48 +217,48 @@ describe('chatCommand', () => {
         tag,
       );
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation checkpoint saved with tag: ${tag}.`,
       });
     });
   });
 
-  describe('resume subcommand', () => {
-    const goodTag = 'good-tag';
-    const badTag = 'bad-tag';
+  describe("resume subcommand", () => {
+    const goodTag = "good-tag";
+    const badTag = "bad-tag";
 
     let resumeCommand: SlashCommand;
     beforeEach(() => {
-      resumeCommand = getSubCommand('resume');
+      resumeCommand = getSubCommand("resume");
     });
 
-    it('should return an error if tag is missing', async () => {
-      const result = await resumeCommand?.action?.(mockContext, '');
+    it("should return an error if tag is missing", async () => {
+      const result = await resumeCommand?.action?.(mockContext, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Missing tag. Usage: /chat resume <tag>',
+        type: "message",
+        messageType: "error",
+        content: "Missing tag. Usage: /chat resume <tag>",
       });
     });
 
-    it('should inform if checkpoint is not found', async () => {
+    it("should inform if checkpoint is not found", async () => {
       mockLoadCheckpoint.mockResolvedValue({ history: [] });
 
       const result = await resumeCommand?.action?.(mockContext, badTag);
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `No saved checkpoint found with tag: ${badTag}.`,
       });
     });
 
-    it('should resume a conversation with matching authType', async () => {
+    it("should resume a conversation with matching authType", async () => {
       const conversation: Content[] = [
-        { role: 'user', parts: [{ text: 'hello gemini' }] },
-        { role: 'model', parts: [{ text: 'hello world' }] },
+        { role: "user", parts: [{ text: "hello gemini" }] },
+        { role: "model", parts: [{ text: "hello world" }] },
       ];
       mockLoadCheckpoint.mockResolvedValue({
         history: conversation,
@@ -274,19 +268,19 @@ describe('chatCommand', () => {
       const result = await resumeCommand?.action?.(mockContext, goodTag);
 
       expect(result).toEqual({
-        type: 'load_history',
+        type: "load_history",
         history: [
-          { type: 'user', text: 'hello gemini' },
-          { type: 'gemini', text: 'hello world' },
+          { type: "user", text: "hello gemini" },
+          { type: "gemini", text: "hello world" },
         ] as HistoryItemWithoutId[],
         clientHistory: conversation,
       });
     });
 
-    it('should block resuming a conversation with mismatched authType', async () => {
+    it("should block resuming a conversation with mismatched authType", async () => {
       const conversation: Content[] = [
-        { role: 'user', parts: [{ text: 'hello gemini' }] },
-        { role: 'model', parts: [{ text: 'hello world' }] },
+        { role: "user", parts: [{ text: "hello gemini" }] },
+        { role: "model", parts: [{ text: "hello world" }] },
       ];
       mockLoadCheckpoint.mockResolvedValue({
         history: conversation,
@@ -296,34 +290,34 @@ describe('chatCommand', () => {
       const result = await resumeCommand?.action?.(mockContext, goodTag);
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Cannot resume chat. It was saved with a different authentication method (${AuthType.USE_GEMINI}) than the current one (${AuthType.LOGIN_WITH_GOOGLE}).`,
       });
     });
 
-    it('should resume a legacy conversation without authType', async () => {
+    it("should resume a legacy conversation without authType", async () => {
       const conversation: Content[] = [
-        { role: 'user', parts: [{ text: 'hello gemini' }] },
-        { role: 'model', parts: [{ text: 'hello world' }] },
+        { role: "user", parts: [{ text: "hello gemini" }] },
+        { role: "model", parts: [{ text: "hello world" }] },
       ];
       mockLoadCheckpoint.mockResolvedValue({ history: conversation });
 
       const result = await resumeCommand?.action?.(mockContext, goodTag);
 
       expect(result).toEqual({
-        type: 'load_history',
+        type: "load_history",
         history: [
-          { type: 'user', text: 'hello gemini' },
-          { type: 'gemini', text: 'hello world' },
+          { type: "user", text: "hello gemini" },
+          { type: "gemini", text: "hello world" },
         ] as HistoryItemWithoutId[],
         clientHistory: conversation,
       });
     });
 
-    describe('completion', () => {
-      it('should provide completion suggestions', async () => {
-        const fakeFiles = ['checkpoint-alpha.json', 'checkpoint-beta.json'];
+    describe("completion", () => {
+      it("should provide completion suggestions", async () => {
+        const fakeFiles = ["checkpoint-alpha.json", "checkpoint-beta.json"];
         mockFs.readdir.mockImplementation(
           (async (_: string): Promise<string[]> =>
             fakeFiles as string[]) as unknown as typeof fsPromises.readdir,
@@ -336,74 +330,72 @@ describe('chatCommand', () => {
             }) as Stats) as unknown as typeof fsPromises.stat,
         );
 
-        const result = await resumeCommand?.completion?.(mockContext, 'a');
+        const result = await resumeCommand?.completion?.(mockContext, "a");
 
-        expect(result).toEqual(['alpha']);
+        expect(result).toEqual(["alpha"]);
       });
 
-      it('should suggest filenames sorted by modified time (newest first)', async () => {
-        const fakeFiles = ['checkpoint-test1.json', 'checkpoint-test2.json'];
+      it("should suggest filenames sorted by modified time (newest first)", async () => {
+        const fakeFiles = ["checkpoint-test1.json", "checkpoint-test2.json"];
         const date = new Date();
         mockFs.readdir.mockImplementation(
           (async (_: string): Promise<string[]> =>
             fakeFiles as string[]) as unknown as typeof fsPromises.readdir,
         );
-        mockFs.stat.mockImplementation((async (
-          path: string,
-        ): Promise<Stats> => {
-          if (path.endsWith('test1.json')) {
+        mockFs.stat.mockImplementation((async (path: string): Promise<Stats> => {
+          if (path.endsWith("test1.json")) {
             return { mtime: date } as Stats;
           }
           return { mtime: new Date(date.getTime() + 1000) } as Stats;
         }) as unknown as typeof fsPromises.stat);
 
-        const result = await resumeCommand?.completion?.(mockContext, '');
+        const result = await resumeCommand?.completion?.(mockContext, "");
         // Sort items by last modified time (newest first)
-        expect(result).toEqual(['test2', 'test1']);
+        expect(result).toEqual(["test2", "test1"]);
       });
     });
   });
 
-  describe('delete subcommand', () => {
+  describe("delete subcommand", () => {
     let deleteCommand: SlashCommand;
-    const tag = 'my-tag';
+    const tag = "my-tag";
     beforeEach(() => {
-      deleteCommand = getSubCommand('delete');
+      deleteCommand = getSubCommand("delete");
     });
 
-    it('should return an error if tag is missing', async () => {
-      const result = await deleteCommand?.action?.(mockContext, '  ');
+    it("should return an error if tag is missing", async () => {
+      const result = await deleteCommand?.action?.(mockContext, "  ");
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Missing tag. Usage: /chat delete <tag>',
+        type: "message",
+        messageType: "error",
+        content: "Missing tag. Usage: /chat delete <tag>",
       });
     });
 
-    it('should return an error if checkpoint is not found', async () => {
+    it("should return an error if checkpoint is not found", async () => {
       mockDeleteCheckpoint.mockResolvedValue(false);
       const result = await deleteCommand?.action?.(mockContext, tag);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Error: No checkpoint found with tag '${tag}'.`,
       });
     });
 
-    it('should delete the conversation', async () => {
+    it("should delete the conversation", async () => {
       const result = await deleteCommand?.action?.(mockContext, tag);
 
       expect(mockDeleteCheckpoint).toHaveBeenCalledWith(tag);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation checkpoint '${tag}' has been deleted.`,
       });
     });
 
-    describe('completion', () => {
-      it('should provide completion suggestions', async () => {
-        const fakeFiles = ['checkpoint-alpha.json', 'checkpoint-beta.json'];
+    describe("completion", () => {
+      it("should provide completion suggestions", async () => {
+        const fakeFiles = ["checkpoint-alpha.json", "checkpoint-beta.json"];
         mockFs.readdir.mockImplementation(
           (async (_: string): Promise<string[]> =>
             fakeFiles as string[]) as unknown as typeof fsPromises.readdir,
@@ -416,66 +408,63 @@ describe('chatCommand', () => {
             }) as Stats) as unknown as typeof fsPromises.stat,
         );
 
-        const result = await deleteCommand?.completion?.(mockContext, 'a');
+        const result = await deleteCommand?.completion?.(mockContext, "a");
 
-        expect(result).toEqual(['alpha']);
+        expect(result).toEqual(["alpha"]);
       });
     });
   });
 
-  describe('share subcommand', () => {
+  describe("share subcommand", () => {
     let shareCommand: SlashCommand;
     const mockHistory = [
-      { role: 'user', parts: [{ text: 'context' }] },
-      { role: 'model', parts: [{ text: 'context response' }] },
-      { role: 'user', parts: [{ text: 'Hello' }] },
-      { role: 'model', parts: [{ text: 'Hi there!' }] },
+      { role: "user", parts: [{ text: "context" }] },
+      { role: "model", parts: [{ text: "context response" }] },
+      { role: "user", parts: [{ text: "Hello" }] },
+      { role: "model", parts: [{ text: "Hi there!" }] },
     ];
 
     beforeEach(() => {
-      shareCommand = getSubCommand('share');
-      vi.spyOn(process, 'cwd').mockReturnValue(
-        path.resolve('/usr/local/google/home/myuser/gemini-cli'),
+      shareCommand = getSubCommand("share");
+      vi.spyOn(process, "cwd").mockReturnValue(
+        path.resolve("/usr/local/google/home/myuser/gemini-cli"),
       );
-      vi.spyOn(Date, 'now').mockReturnValue(1234567890);
+      vi.spyOn(Date, "now").mockReturnValue(1234567890);
       mockGetHistory.mockReturnValue(mockHistory);
       mockFs.writeFile.mockClear();
     });
 
-    it('should default to a json file if no path is provided', async () => {
-      const result = await shareCommand?.action?.(mockContext, '');
-      const expectedPath = path.join(
-        process.cwd(),
-        'gemini-conversation-1234567890.json',
-      );
+    it("should default to a json file if no path is provided", async () => {
+      const result = await shareCommand?.action?.(mockContext, "");
+      const expectedPath = path.join(process.cwd(), "gemini-conversation-1234567890.json");
       const [actualPath, actualContent] = mockFs.writeFile.mock.calls[0];
       expect(actualPath).toEqual(expectedPath);
       expect(actualContent).toEqual(JSON.stringify(mockHistory, null, 2));
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation shared to ${expectedPath}`,
       });
     });
 
-    it('should share the conversation to a JSON file', async () => {
-      const filePath = 'my-chat.json';
+    it("should share the conversation to a JSON file", async () => {
+      const filePath = "my-chat.json";
       const result = await shareCommand?.action?.(mockContext, filePath);
-      const expectedPath = path.join(process.cwd(), 'my-chat.json');
+      const expectedPath = path.join(process.cwd(), "my-chat.json");
       const [actualPath, actualContent] = mockFs.writeFile.mock.calls[0];
       expect(actualPath).toEqual(expectedPath);
       expect(actualContent).toEqual(JSON.stringify(mockHistory, null, 2));
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation shared to ${expectedPath}`,
       });
     });
 
-    it('should share the conversation to a Markdown file', async () => {
-      const filePath = 'my-chat.md';
+    it("should share the conversation to a Markdown file", async () => {
+      const filePath = "my-chat.md";
       const result = await shareCommand?.action?.(mockContext, filePath);
-      const expectedPath = path.join(process.cwd(), 'my-chat.md');
+      const expectedPath = path.join(process.cwd(), "my-chat.md");
       const [actualPath, actualContent] = mockFs.writeFile.mock.calls[0];
       expect(actualPath).toEqual(expectedPath);
       const expectedContent = `## USER 🧑‍💻
@@ -501,108 +490,108 @@ Hello
 Hi there!`;
       expect(actualContent).toEqual(expectedContent);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation shared to ${expectedPath}`,
       });
     });
 
-    it('should return an error for unsupported file extensions', async () => {
-      const filePath = 'my-chat.txt';
+    it("should return an error for unsupported file extensions", async () => {
+      const filePath = "my-chat.txt";
       const result = await shareCommand?.action?.(mockContext, filePath);
       expect(mockFs.writeFile).not.toHaveBeenCalled();
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Invalid file format. Only .md and .json are supported.',
+        type: "message",
+        messageType: "error",
+        content: "Invalid file format. Only .md and .json are supported.",
       });
     });
 
-    it('should inform if there is no conversation to share', async () => {
+    it("should inform if there is no conversation to share", async () => {
       mockGetHistory.mockReturnValue([
-        { role: 'user', parts: [{ text: 'context' }] },
-        { role: 'model', parts: [{ text: 'context response' }] },
+        { role: "user", parts: [{ text: "context" }] },
+        { role: "model", parts: [{ text: "context response" }] },
       ]);
-      const result = await shareCommand?.action?.(mockContext, 'my-chat.json');
+      const result = await shareCommand?.action?.(mockContext, "my-chat.json");
       expect(mockFs.writeFile).not.toHaveBeenCalled();
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: 'No conversation found to share.',
+        type: "message",
+        messageType: "info",
+        content: "No conversation found to share.",
       });
     });
 
-    it('should handle errors during file writing', async () => {
-      const error = new Error('Permission denied');
+    it("should handle errors during file writing", async () => {
+      const error = new Error("Permission denied");
       mockFs.writeFile.mockRejectedValue(error);
-      const result = await shareCommand?.action?.(mockContext, 'my-chat.json');
+      const result = await shareCommand?.action?.(mockContext, "my-chat.json");
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Error sharing conversation: ${error.message}`,
       });
     });
 
-    it('should output valid JSON schema', async () => {
-      const filePath = 'my-chat.json';
+    it("should output valid JSON schema", async () => {
+      const filePath = "my-chat.json";
       await shareCommand?.action?.(mockContext, filePath);
-      const expectedPath = path.join(process.cwd(), 'my-chat.json');
+      const expectedPath = path.join(process.cwd(), "my-chat.json");
       const [actualPath, actualContent] = mockFs.writeFile.mock.calls[0];
       expect(actualPath).toEqual(expectedPath);
       const parsedContent = JSON.parse(actualContent as string);
       expect(Array.isArray(parsedContent)).toBe(true);
       parsedContent.forEach((item: Content) => {
-        expect(item).toHaveProperty('role');
-        expect(item).toHaveProperty('parts');
+        expect(item).toHaveProperty("role");
+        expect(item).toHaveProperty("parts");
         expect(Array.isArray(item.parts)).toBe(true);
       });
     });
 
-    it('should output correct markdown format', async () => {
-      const filePath = 'my-chat.md';
+    it("should output correct markdown format", async () => {
+      const filePath = "my-chat.md";
       await shareCommand?.action?.(mockContext, filePath);
-      const expectedPath = path.join(process.cwd(), 'my-chat.md');
+      const expectedPath = path.join(process.cwd(), "my-chat.md");
       const [actualPath, actualContent] = mockFs.writeFile.mock.calls[0];
       expect(actualPath).toEqual(expectedPath);
-      const entries = (actualContent as string).split('\n\n---\n\n');
+      const entries = (actualContent as string).split("\n\n---\n\n");
       expect(entries.length).toBe(mockHistory.length);
       entries.forEach((entry: string, index: number) => {
         const { role, parts } = mockHistory[index];
-        const text = parts.map((p) => p.text).join('');
-        const roleIcon = role === 'user' ? '🧑‍💻' : '✨';
+        const text = parts.map((p) => p.text).join("");
+        const roleIcon = role === "user" ? "🧑‍💻" : "✨";
         expect(entry).toBe(`## ${role.toUpperCase()} ${roleIcon}\n\n${text}`);
       });
     });
   });
 
-  describe('serializeHistoryToMarkdown', () => {
-    it('should correctly serialize chat history to Markdown with icons', () => {
+  describe("serializeHistoryToMarkdown", () => {
+    it("should correctly serialize chat history to Markdown with icons", () => {
       const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        { role: 'model', parts: [{ text: 'Hi there!' }] },
-        { role: 'user', parts: [{ text: 'How are you?' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
+        { role: "model", parts: [{ text: "Hi there!" }] },
+        { role: "user", parts: [{ text: "How are you?" }] },
       ];
 
       const expectedMarkdown =
-        '## USER 🧑‍💻\n\nHello\n\n---\n\n' +
-        '## MODEL ✨\n\nHi there!\n\n---\n\n' +
-        '## USER 🧑‍💻\n\nHow are you?';
+        "## USER 🧑‍💻\n\nHello\n\n---\n\n" +
+        "## MODEL ✨\n\nHi there!\n\n---\n\n" +
+        "## USER 🧑‍💻\n\nHow are you?";
 
       const result = serializeHistoryToMarkdown(history);
       expect(result).toBe(expectedMarkdown);
     });
 
-    it('should handle empty history', () => {
+    it("should handle empty history", () => {
       const history: Content[] = [];
       const result = serializeHistoryToMarkdown(history);
-      expect(result).toBe('');
+      expect(result).toBe("");
     });
 
-    it('should handle items with no text parts', () => {
+    it("should handle items with no text parts", () => {
       const history: Content[] = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        { role: 'model', parts: [] },
-        { role: 'user', parts: [{ text: 'How are you?' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
+        { role: "model", parts: [] },
+        { role: "user", parts: [{ text: "How are you?" }] },
       ];
 
       const expectedMarkdown = `## USER 🧑‍💻
@@ -625,30 +614,30 @@ How are you?`;
       expect(result).toBe(expectedMarkdown);
     });
 
-    it('should correctly serialize function calls and responses', () => {
+    it("should correctly serialize function calls and responses", () => {
       const history: Content[] = [
         {
-          role: 'user',
-          parts: [{ text: 'Please call a function.' }],
+          role: "user",
+          parts: [{ text: "Please call a function." }],
         },
         {
-          role: 'model',
+          role: "model",
           parts: [
             {
               functionCall: {
-                name: 'my-function',
-                args: { arg1: 'value1' },
+                name: "my-function",
+                args: { arg1: "value1" },
               },
             },
           ],
         },
         {
-          role: 'user',
+          role: "user",
           parts: [
             {
               functionResponse: {
-                name: 'my-function',
-                response: { result: 'success' },
+                name: "my-function",
+                response: { result: "success" },
               },
             },
           ],
@@ -691,10 +680,10 @@ Please call a function.
       expect(result).toBe(expectedMarkdown);
     });
 
-    it('should handle items with undefined role', () => {
+    it("should handle items with undefined role", () => {
       const history: Array<Partial<Content>> = [
-        { role: 'user', parts: [{ text: 'Hello' }] },
-        { parts: [{ text: 'Hi there!' }] },
+        { role: "user", parts: [{ text: "Hello" }] },
+        { parts: [{ text: "Hi there!" }] },
       ];
 
       const expectedMarkdown = `## USER 🧑‍💻
diff --git a/packages/ui-gemini/src/ui/commands/chatCommand.ts b/packages/ui-gemini/src/ui/commands/chatCommand.ts
index 480f5a45f..175a981bd 100644
--- a/packages/ui-gemini/src/ui/commands/chatCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/chatCommand.ts
@@ -4,28 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fsPromises from 'node:fs/promises';
-import React from 'react';
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import type {
-  CommandContext,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import {
-  decodeTagName,
-  type MessageActionReturn,
-} from '@airiscode/gemini-cli-core';
-import path from 'node:path';
-import type {
-  HistoryItemWithoutId,
-  HistoryItemChatList,
-  ChatDetail,
-} from '../types.js';
-import { MessageType } from '../types.js';
-import type { Content } from '@google/genai';
+import * as fsPromises from "node:fs/promises";
+import path from "node:path";
+import { decodeTagName, type MessageActionReturn } from "@airiscode/gemini-cli-core";
+import type { Content } from "@google/genai";
+import { Text } from "ink";
+import React from "react";
+import { theme } from "../semantic-colors.js";
+import type { ChatDetail, HistoryItemChatList, HistoryItemWithoutId } from "../types.js";
+import { MessageType } from "../types.js";
+import type { CommandContext, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 const getSavedChatTags = async (
   context: CommandContext,
@@ -37,8 +26,8 @@ const getSavedChatTags = async (
     return [];
   }
   try {
-    const file_head = 'checkpoint-';
-    const file_tail = '.json';
+    const file_head = "checkpoint-";
+    const file_tail = ".json";
     const files = await fsPromises.readdir(geminiDir);
     const chatDetails: ChatDetail[] = [];
 
@@ -55,9 +44,7 @@ const getSavedChatTags = async (
     }
 
     chatDetails.sort((a, b) =>
-      mtSortDesc
-        ? b.mtime.localeCompare(a.mtime)
-        : a.mtime.localeCompare(b.mtime),
+      mtSortDesc ? b.mtime.localeCompare(a.mtime) : a.mtime.localeCompare(b.mtime),
     );
 
     return chatDetails;
@@ -67,8 +54,8 @@ const getSavedChatTags = async (
 };
 
 const listCommand: SlashCommand = {
-  name: 'list',
-  description: 'List saved conversation checkpoints',
+  name: "list",
+  description: "List saved conversation checkpoints",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context): Promise<void> => {
@@ -84,18 +71,17 @@ const listCommand: SlashCommand = {
 };
 
 const saveCommand: SlashCommand = {
-  name: 'save',
-  description:
-    'Save the current conversation as a checkpoint. Usage: /chat save <tag>',
+  name: "save",
+  description: "Save the current conversation as a checkpoint. Usage: /chat save <tag>",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: async (context, args): Promise<SlashCommandActionReturn | void> => {
     const tag = args.trim();
     if (!tag) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Missing tag. Usage: /chat save <tag>',
+        type: "message",
+        messageType: "error",
+        content: "Missing tag. Usage: /chat save <tag>",
       };
     }
 
@@ -106,13 +92,13 @@ const saveCommand: SlashCommand = {
       const exists = await logger.checkpointExists(tag);
       if (exists) {
         return {
-          type: 'confirm_action',
+          type: "confirm_action",
           prompt: React.createElement(
             Text,
             null,
-            'A checkpoint with the tag ',
+            "A checkpoint with the tag ",
             React.createElement(Text, { color: theme.text.accent }, tag),
-            ' already exists. Do you want to overwrite it?',
+            " already exists. Do you want to overwrite it?",
           ),
           originalInvocation: {
             raw: context.invocation?.raw || `/chat save ${tag}`,
@@ -124,9 +110,9 @@ const saveCommand: SlashCommand = {
     const chat = await config?.getGeminiClient()?.getChat();
     if (!chat) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'No chat client available to save conversation.',
+        type: "message",
+        messageType: "error",
+        content: "No chat client available to save conversation.",
       };
     }
 
@@ -135,36 +121,33 @@ const saveCommand: SlashCommand = {
       const authType = config?.getContentGeneratorConfig()?.authType;
       await logger.saveCheckpoint({ history, authType }, tag);
       return {
-        type: 'message',
-        messageType: 'info',
-        content: `Conversation checkpoint saved with tag: ${decodeTagName(
-          tag,
-        )}.`,
+        type: "message",
+        messageType: "info",
+        content: `Conversation checkpoint saved with tag: ${decodeTagName(tag)}.`,
       };
     } else {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: 'No conversation found to save.',
+        type: "message",
+        messageType: "info",
+        content: "No conversation found to save.",
       };
     }
   },
 };
 
 const resumeCommand: SlashCommand = {
-  name: 'resume',
-  altNames: ['load'],
-  description:
-    'Resume a conversation from a checkpoint. Usage: /chat resume <tag>',
+  name: "resume",
+  altNames: ["load"],
+  description: "Resume a conversation from a checkpoint. Usage: /chat resume <tag>",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context, args) => {
     const tag = args.trim();
     if (!tag) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Missing tag. Usage: /chat resume <tag>',
+        type: "message",
+        messageType: "error",
+        content: "Missing tag. Usage: /chat resume <tag>",
       };
     }
 
@@ -175,21 +158,17 @@ const resumeCommand: SlashCommand = {
 
     if (conversation.length === 0) {
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `No saved checkpoint found with tag: ${decodeTagName(tag)}.`,
       };
     }
 
     const currentAuthType = config?.getContentGeneratorConfig()?.authType;
-    if (
-      checkpoint.authType &&
-      currentAuthType &&
-      checkpoint.authType !== currentAuthType
-    ) {
+    if (checkpoint.authType && currentAuthType && checkpoint.authType !== currentAuthType) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Cannot resume chat. It was saved with a different authentication method (${checkpoint.authType}) than the current one (${currentAuthType}).`,
       };
     }
@@ -209,7 +188,7 @@ const resumeCommand: SlashCommand = {
         item.parts
           ?.filter((m) => !!m.text)
           .map((m) => m.text)
-          .join('') || '';
+          .join("") || "";
       if (!text) {
         continue;
       }
@@ -224,31 +203,29 @@ const resumeCommand: SlashCommand = {
       }
     }
     return {
-      type: 'load_history',
+      type: "load_history",
       history: uiHistory,
       clientHistory: conversation,
     };
   },
   completion: async (context, partialArg) => {
     const chatDetails = await getSavedChatTags(context, true);
-    return chatDetails
-      .map((chat) => chat.name)
-      .filter((name) => name.startsWith(partialArg));
+    return chatDetails.map((chat) => chat.name).filter((name) => name.startsWith(partialArg));
   },
 };
 
 const deleteCommand: SlashCommand = {
-  name: 'delete',
-  description: 'Delete a conversation checkpoint. Usage: /chat delete <tag>',
+  name: "delete",
+  description: "Delete a conversation checkpoint. Usage: /chat delete <tag>",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context, args): Promise<MessageActionReturn> => {
     const tag = args.trim();
     if (!tag) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Missing tag. Usage: /chat delete <tag>',
+        type: "message",
+        messageType: "error",
+        content: "Missing tag. Usage: /chat delete <tag>",
       };
     }
 
@@ -258,23 +235,21 @@ const deleteCommand: SlashCommand = {
 
     if (deleted) {
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation checkpoint '${decodeTagName(tag)}' has been deleted.`,
       };
     } else {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Error: No checkpoint found with tag '${decodeTagName(tag)}'.`,
       };
     }
   },
   completion: async (context, partialArg) => {
     const chatDetails = await getSavedChatTags(context, true);
-    return chatDetails
-      .map((chat) => chat.name)
-      .filter((name) => name.startsWith(partialArg));
+    return chatDetails.map((chat) => chat.name).filter((name) => name.startsWith(partialArg));
   },
 };
 
@@ -301,19 +276,19 @@ export function serializeHistoryToMarkdown(history: Content[]): string {
                 2,
               )}\n\`\`\``;
             }
-            return '';
+            return "";
           })
-          .join('') || '';
-      const roleIcon = item.role === 'user' ? '🧑‍💻' : '✨';
-      return `## ${(item.role || 'model').toUpperCase()} ${roleIcon}\n\n${text}`;
+          .join("") || "";
+      const roleIcon = item.role === "user" ? "🧑‍💻" : "✨";
+      return `## ${(item.role || "model").toUpperCase()} ${roleIcon}\n\n${text}`;
     })
-    .join('\n\n---\n\n');
+    .join("\n\n---\n\n");
 }
 
 const shareCommand: SlashCommand = {
-  name: 'share',
+  name: "share",
   description:
-    'Share the current conversation to a markdown or json file. Usage: /chat share <file>',
+    "Share the current conversation to a markdown or json file. Usage: /chat share <file>",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: async (context, args): Promise<MessageActionReturn> => {
@@ -324,20 +299,20 @@ const shareCommand: SlashCommand = {
 
     const filePath = path.resolve(filePathArg);
     const extension = path.extname(filePath);
-    if (extension !== '.md' && extension !== '.json') {
+    if (extension !== ".md" && extension !== ".json") {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Invalid file format. Only .md and .json are supported.',
+        type: "message",
+        messageType: "error",
+        content: "Invalid file format. Only .md and .json are supported.",
       };
     }
 
     const chat = await context.services.config?.getGeminiClient()?.getChat();
     if (!chat) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'No chat client available to share conversation.',
+        type: "message",
+        messageType: "error",
+        content: "No chat client available to share conversation.",
       };
     }
 
@@ -348,14 +323,14 @@ const shareCommand: SlashCommand = {
     // can't check for length 0.
     if (history.length <= 2) {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: 'No conversation found to share.',
+        type: "message",
+        messageType: "info",
+        content: "No conversation found to share.",
       };
     }
 
-    let content = '';
-    if (extension === '.json') {
+    let content = "";
+    if (extension === ".json") {
       content = JSON.stringify(history, null, 2);
     } else {
       content = serializeHistoryToMarkdown(history);
@@ -364,15 +339,15 @@ const shareCommand: SlashCommand = {
     try {
       await fsPromises.writeFile(filePath, content);
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Conversation shared to ${filePath}`,
       };
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : String(err);
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Error sharing conversation: ${errorMessage}`,
       };
     }
@@ -380,15 +355,9 @@ const shareCommand: SlashCommand = {
 };
 
 export const chatCommand: SlashCommand = {
-  name: 'chat',
-  description: 'Manage conversation history',
+  name: "chat",
+  description: "Manage conversation history",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
-  subCommands: [
-    listCommand,
-    saveCommand,
-    resumeCommand,
-    deleteCommand,
-    shareCommand,
-  ],
+  subCommands: [listCommand, saveCommand, resumeCommand, deleteCommand, shareCommand],
 };
diff --git a/packages/ui-gemini/src/ui/commands/clearCommand.test.ts b/packages/ui-gemini/src/ui/commands/clearCommand.test.ts
index bf8a861af..ec982e9b4 100644
--- a/packages/ui-gemini/src/ui/commands/clearCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/clearCommand.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { clearCommand } from './clearCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { clearCommand } from "./clearCommand.js";
+import { type CommandContext } from "./types.js";
 
 // Mock the telemetry service
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actual = await vi.importActual('@airiscode/gemini-cli-core');
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actual = await vi.importActual("@airiscode/gemini-cli-core");
   return {
     ...actual,
     uiTelemetryService: {
@@ -21,10 +21,10 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
   };
 });
 
-import type { GeminiClient } from '@airiscode/gemini-cli-core';
-import { uiTelemetryService } from '@airiscode/gemini-cli-core';
+import type { GeminiClient } from "@airiscode/gemini-cli-core";
+import { uiTelemetryService } from "@airiscode/gemini-cli-core";
 
-describe('clearCommand', () => {
+describe("clearCommand", () => {
   let mockContext: CommandContext;
   let mockResetChat: ReturnType<typeof vi.fn>;
 
@@ -51,15 +51,15 @@ describe('clearCommand', () => {
     });
   });
 
-  it('should set debug message, reset chat, reset telemetry, and clear UI when config is available', async () => {
+  it("should set debug message, reset chat, reset telemetry, and clear UI when config is available", async () => {
     if (!clearCommand.action) {
-      throw new Error('clearCommand must have an action.');
+      throw new Error("clearCommand must have an action.");
     }
 
-    await clearCommand.action(mockContext, '');
+    await clearCommand.action(mockContext, "");
 
     expect(mockContext.ui.setDebugMessage).toHaveBeenCalledWith(
-      'Clearing terminal and resetting chat.',
+      "Clearing terminal and resetting chat.",
     );
     expect(mockContext.ui.setDebugMessage).toHaveBeenCalledTimes(1);
 
@@ -72,20 +72,18 @@ describe('clearCommand', () => {
     const setDebugMessageOrder = (mockContext.ui.setDebugMessage as Mock).mock
       .invocationCallOrder[0];
     const resetChatOrder = mockResetChat.mock.invocationCallOrder[0];
-    const resetTelemetryOrder = (
-      uiTelemetryService.setLastPromptTokenCount as Mock
-    ).mock.invocationCallOrder[0];
-    const clearOrder = (mockContext.ui.clear as Mock).mock
+    const resetTelemetryOrder = (uiTelemetryService.setLastPromptTokenCount as Mock).mock
       .invocationCallOrder[0];
+    const clearOrder = (mockContext.ui.clear as Mock).mock.invocationCallOrder[0];
 
     expect(setDebugMessageOrder).toBeLessThan(resetChatOrder);
     expect(resetChatOrder).toBeLessThan(resetTelemetryOrder);
     expect(resetTelemetryOrder).toBeLessThan(clearOrder);
   });
 
-  it('should not attempt to reset chat if config service is not available', async () => {
+  it("should not attempt to reset chat if config service is not available", async () => {
     if (!clearCommand.action) {
-      throw new Error('clearCommand must have an action.');
+      throw new Error("clearCommand must have an action.");
     }
 
     const nullConfigContext = createMockCommandContext({
@@ -94,11 +92,9 @@ describe('clearCommand', () => {
       },
     });
 
-    await clearCommand.action(nullConfigContext, '');
+    await clearCommand.action(nullConfigContext, "");
 
-    expect(nullConfigContext.ui.setDebugMessage).toHaveBeenCalledWith(
-      'Clearing terminal.',
-    );
+    expect(nullConfigContext.ui.setDebugMessage).toHaveBeenCalledWith("Clearing terminal.");
     expect(mockResetChat).not.toHaveBeenCalled();
     expect(uiTelemetryService.setLastPromptTokenCount).toHaveBeenCalledWith(0);
     expect(uiTelemetryService.setLastPromptTokenCount).toHaveBeenCalledTimes(1);
diff --git a/packages/ui-gemini/src/ui/commands/clearCommand.ts b/packages/ui-gemini/src/ui/commands/clearCommand.ts
index db6c63073..400df3f5e 100644
--- a/packages/ui-gemini/src/ui/commands/clearCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/clearCommand.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { randomUUID } from "node:crypto";
 import {
-  uiTelemetryService,
   fireSessionEndHook,
   fireSessionStartHook,
+  flushTelemetry,
   SessionEndReason,
   SessionStartSource,
-  flushTelemetry,
-} from '@airiscode/gemini-cli-core';
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { randomUUID } from 'node:crypto';
+  uiTelemetryService,
+} from "@airiscode/gemini-cli-core";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const clearCommand: SlashCommand = {
-  name: 'clear',
-  description: 'Clear the screen and conversation history',
+  name: "clear",
+  description: "Clear the screen and conversation history",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context, _args) => {
@@ -36,12 +36,12 @@ export const clearCommand: SlashCommand = {
     }
 
     if (geminiClient) {
-      context.ui.setDebugMessage('Clearing terminal and resetting chat.');
+      context.ui.setDebugMessage("Clearing terminal and resetting chat.");
       // If resetChat fails, the exception will propagate and halt the command,
       // which is the correct behavior to signal a failure to the user.
       await geminiClient.resetChat();
     } else {
-      context.ui.setDebugMessage('Clearing terminal.');
+      context.ui.setDebugMessage("Clearing terminal.");
     }
 
     // Start a new conversation recording with a new session ID
diff --git a/packages/ui-gemini/src/ui/commands/compressCommand.test.ts b/packages/ui-gemini/src/ui/commands/compressCommand.test.ts
index 35da32fdf..012cb174f 100644
--- a/packages/ui-gemini/src/ui/commands/compressCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/compressCommand.test.ts
@@ -5,16 +5,16 @@
  */
 
 import {
-  CompressionStatus,
   type ChatCompressionInfo,
+  CompressionStatus,
   type GeminiClient,
-} from '@airiscode/gemini-cli-core';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { compressCommand } from './compressCommand.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
+} from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { compressCommand } from "./compressCommand.js";
 
-describe('compressCommand', () => {
+describe("compressCommand", () => {
   let context: ReturnType<typeof createMockCommandContext>;
   let mockTryCompressChat: ReturnType<typeof vi.fn>;
 
@@ -32,7 +32,7 @@ describe('compressCommand', () => {
     });
   });
 
-  it('should do nothing if a compression is already pending', async () => {
+  it("should do nothing if a compression is already pending", async () => {
     context.ui.pendingItem = {
       type: MessageType.COMPRESSION,
       compression: {
@@ -42,11 +42,11 @@ describe('compressCommand', () => {
         compressionStatus: null,
       },
     };
-    await compressCommand.action!(context, '');
+    await compressCommand.action!(context, "");
     expect(context.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
         type: MessageType.ERROR,
-        text: 'Already compressing, wait for previous request to complete',
+        text: "Already compressing, wait for previous request to complete",
       }),
       expect.any(Number),
     );
@@ -54,7 +54,7 @@ describe('compressCommand', () => {
     expect(mockTryCompressChat).not.toHaveBeenCalled();
   });
 
-  it('should set pending item, call tryCompressChat, and add result on success', async () => {
+  it("should set pending item, call tryCompressChat, and add result on success", async () => {
     const compressedResult: ChatCompressionInfo = {
       originalTokenCount: 200,
       compressionStatus: CompressionStatus.COMPRESSED,
@@ -62,7 +62,7 @@ describe('compressCommand', () => {
     };
     mockTryCompressChat.mockResolvedValue(compressedResult);
 
-    await compressCommand.action!(context, '');
+    await compressCommand.action!(context, "");
 
     expect(context.ui.setPendingItem).toHaveBeenNthCalledWith(1, {
       type: MessageType.COMPRESSION,
@@ -74,10 +74,7 @@ describe('compressCommand', () => {
       },
     });
 
-    expect(mockTryCompressChat).toHaveBeenCalledWith(
-      expect.stringMatching(/^compress-\d+$/),
-      true,
-    );
+    expect(mockTryCompressChat).toHaveBeenCalledWith(expect.stringMatching(/^compress-\d+$/), true);
 
     expect(context.ui.addItem).toHaveBeenCalledWith(
       {
@@ -95,26 +92,26 @@ describe('compressCommand', () => {
     expect(context.ui.setPendingItem).toHaveBeenNthCalledWith(2, null);
   });
 
-  it('should add an error message if tryCompressChat returns falsy', async () => {
+  it("should add an error message if tryCompressChat returns falsy", async () => {
     mockTryCompressChat.mockResolvedValue(null);
 
-    await compressCommand.action!(context, '');
+    await compressCommand.action!(context, "");
 
     expect(context.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
         type: MessageType.ERROR,
-        text: 'Failed to compress chat history.',
+        text: "Failed to compress chat history.",
       }),
       expect.any(Number),
     );
     expect(context.ui.setPendingItem).toHaveBeenCalledWith(null);
   });
 
-  it('should add an error message if tryCompressChat throws', async () => {
-    const error = new Error('Compression failed');
+  it("should add an error message if tryCompressChat throws", async () => {
+    const error = new Error("Compression failed");
     mockTryCompressChat.mockRejectedValue(error);
 
-    await compressCommand.action!(context, '');
+    await compressCommand.action!(context, "");
 
     expect(context.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -126,9 +123,9 @@ describe('compressCommand', () => {
     expect(context.ui.setPendingItem).toHaveBeenCalledWith(null);
   });
 
-  it('should clear the pending item in a finally block', async () => {
-    mockTryCompressChat.mockRejectedValue(new Error('some error'));
-    await compressCommand.action!(context, '');
+  it("should clear the pending item in a finally block", async () => {
+    mockTryCompressChat.mockRejectedValue(new Error("some error"));
+    await compressCommand.action!(context, "");
     expect(context.ui.setPendingItem).toHaveBeenCalledWith(null);
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/compressCommand.ts b/packages/ui-gemini/src/ui/commands/compressCommand.ts
index 3bb5b3438..25211cbfe 100644
--- a/packages/ui-gemini/src/ui/commands/compressCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/compressCommand.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { HistoryItemCompression } from '../types.js';
-import { MessageType } from '../types.js';
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import type { HistoryItemCompression } from "../types.js";
+import { MessageType } from "../types.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const compressCommand: SlashCommand = {
-  name: 'compress',
-  altNames: ['summarize'],
-  description: 'Compresses the context by replacing it with a summary',
+  name: "compress",
+  altNames: ["summarize"],
+  description: "Compresses the context by replacing it with a summary",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context) => {
@@ -21,7 +21,7 @@ export const compressCommand: SlashCommand = {
       ui.addItem(
         {
           type: MessageType.ERROR,
-          text: 'Already compressing, wait for previous request to complete',
+          text: "Already compressing, wait for previous request to complete",
         },
         Date.now(),
       );
@@ -61,7 +61,7 @@ export const compressCommand: SlashCommand = {
         ui.addItem(
           {
             type: MessageType.ERROR,
-            text: 'Failed to compress chat history.',
+            text: "Failed to compress chat history.",
           },
           Date.now(),
         );
@@ -70,9 +70,7 @@ export const compressCommand: SlashCommand = {
       ui.addItem(
         {
           type: MessageType.ERROR,
-          text: `Failed to compress chat history: ${
-            e instanceof Error ? e.message : String(e)
-          }`,
+          text: `Failed to compress chat history: ${e instanceof Error ? e.message : String(e)}`,
         },
         Date.now(),
       );
diff --git a/packages/ui-gemini/src/ui/commands/copyCommand.test.ts b/packages/ui-gemini/src/ui/commands/copyCommand.test.ts
index de7509040..0ff36dc0e 100644
--- a/packages/ui-gemini/src/ui/commands/copyCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/copyCommand.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { copyCommand } from './copyCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { copyToClipboard } from '../utils/commandUtils.js';
-
-vi.mock('../utils/commandUtils.js', () => ({
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { copyToClipboard } from "../utils/commandUtils.js";
+import { copyCommand } from "./copyCommand.js";
+import { type CommandContext } from "./types.js";
+
+vi.mock("../utils/commandUtils.js", () => ({
   copyToClipboard: vi.fn(),
 }));
 
-describe('copyCommand', () => {
+describe("copyCommand", () => {
   let mockContext: CommandContext;
   let mockCopyToClipboard: Mock;
   let mockGetChat: Mock;
@@ -43,124 +43,122 @@ describe('copyCommand', () => {
     });
   });
 
-  it('should return info message when no history is available', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should return info message when no history is available", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     mockGetChat.mockReturnValue(undefined);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'No output in history',
+      type: "message",
+      messageType: "info",
+      content: "No output in history",
     });
 
     expect(mockCopyToClipboard).not.toHaveBeenCalled();
   });
 
-  it('should return info message when history is empty', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should return info message when history is empty", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     mockGetHistory.mockReturnValue([]);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'No output in history',
+      type: "message",
+      messageType: "info",
+      content: "No output in history",
     });
 
     expect(mockCopyToClipboard).not.toHaveBeenCalled();
   });
 
-  it('should return info message when no AI messages are found in history', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should return info message when no AI messages are found in history", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithUserOnly = [
       {
-        role: 'user',
-        parts: [{ text: 'Hello' }],
+        role: "user",
+        parts: [{ text: "Hello" }],
       },
     ];
 
     mockGetHistory.mockReturnValue(historyWithUserOnly);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'No output in history',
+      type: "message",
+      messageType: "info",
+      content: "No output in history",
     });
 
     expect(mockCopyToClipboard).not.toHaveBeenCalled();
   });
 
-  it('should copy last AI message to clipboard successfully', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should copy last AI message to clipboard successfully", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithAiMessage = [
       {
-        role: 'user',
-        parts: [{ text: 'Hello' }],
+        role: "user",
+        parts: [{ text: "Hello" }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Hi there! How can I help you?' }],
+        role: "model",
+        parts: [{ text: "Hi there! How can I help you?" }],
       },
     ];
 
     mockGetHistory.mockReturnValue(historyWithAiMessage);
     mockCopyToClipboard.mockResolvedValue(undefined);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'Last output copied to the clipboard',
+      type: "message",
+      messageType: "info",
+      content: "Last output copied to the clipboard",
     });
 
-    expect(mockCopyToClipboard).toHaveBeenCalledWith(
-      'Hi there! How can I help you?',
-    );
+    expect(mockCopyToClipboard).toHaveBeenCalledWith("Hi there! How can I help you?");
   });
 
-  it('should handle multiple text parts in AI message', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should handle multiple text parts in AI message", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithMultipleParts = [
       {
-        role: 'model',
-        parts: [{ text: 'Part 1: ' }, { text: 'Part 2: ' }, { text: 'Part 3' }],
+        role: "model",
+        parts: [{ text: "Part 1: " }, { text: "Part 2: " }, { text: "Part 3" }],
       },
     ];
 
     mockGetHistory.mockReturnValue(historyWithMultipleParts);
     mockCopyToClipboard.mockResolvedValue(undefined);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
-    expect(mockCopyToClipboard).toHaveBeenCalledWith('Part 1: Part 2: Part 3');
+    expect(mockCopyToClipboard).toHaveBeenCalledWith("Part 1: Part 2: Part 3");
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'Last output copied to the clipboard',
+      type: "message",
+      messageType: "info",
+      content: "Last output copied to the clipboard",
     });
   });
 
-  it('should filter out non-text parts', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should filter out non-text parts", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithMixedParts = [
       {
-        role: 'model',
+        role: "model",
         parts: [
-          { text: 'Text part' },
-          { image: 'base64data' }, // Non-text part
-          { text: ' more text' },
+          { text: "Text part" },
+          { image: "base64data" }, // Non-text part
+          { text: " more text" },
         ],
       },
     ];
@@ -168,129 +166,129 @@ describe('copyCommand', () => {
     mockGetHistory.mockReturnValue(historyWithMixedParts);
     mockCopyToClipboard.mockResolvedValue(undefined);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
-    expect(mockCopyToClipboard).toHaveBeenCalledWith('Text part more text');
+    expect(mockCopyToClipboard).toHaveBeenCalledWith("Text part more text");
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'Last output copied to the clipboard',
+      type: "message",
+      messageType: "info",
+      content: "Last output copied to the clipboard",
     });
   });
 
-  it('should get the last AI message when multiple AI messages exist', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should get the last AI message when multiple AI messages exist", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithMultipleAiMessages = [
       {
-        role: 'model',
-        parts: [{ text: 'First AI response' }],
+        role: "model",
+        parts: [{ text: "First AI response" }],
       },
       {
-        role: 'user',
-        parts: [{ text: 'User message' }],
+        role: "user",
+        parts: [{ text: "User message" }],
       },
       {
-        role: 'model',
-        parts: [{ text: 'Second AI response' }],
+        role: "model",
+        parts: [{ text: "Second AI response" }],
       },
     ];
 
     mockGetHistory.mockReturnValue(historyWithMultipleAiMessages);
     mockCopyToClipboard.mockResolvedValue(undefined);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
-    expect(mockCopyToClipboard).toHaveBeenCalledWith('Second AI response');
+    expect(mockCopyToClipboard).toHaveBeenCalledWith("Second AI response");
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'Last output copied to the clipboard',
+      type: "message",
+      messageType: "info",
+      content: "Last output copied to the clipboard",
     });
   });
 
-  it('should handle clipboard copy error', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should handle clipboard copy error", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithAiMessage = [
       {
-        role: 'model',
-        parts: [{ text: 'AI response' }],
+        role: "model",
+        parts: [{ text: "AI response" }],
       },
     ];
 
     mockGetHistory.mockReturnValue(historyWithAiMessage);
-    const clipboardError = new Error('Clipboard access denied');
+    const clipboardError = new Error("Clipboard access denied");
     mockCopyToClipboard.mockRejectedValue(clipboardError);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Failed to copy to the clipboard. ${clipboardError.message}`,
     });
   });
 
-  it('should handle non-Error clipboard errors', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should handle non-Error clipboard errors", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithAiMessage = [
       {
-        role: 'model',
-        parts: [{ text: 'AI response' }],
+        role: "model",
+        parts: [{ text: "AI response" }],
       },
     ];
 
     mockGetHistory.mockReturnValue(historyWithAiMessage);
-    const rejectedValue = 'String error';
+    const rejectedValue = "String error";
     mockCopyToClipboard.mockRejectedValue(rejectedValue);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Failed to copy to the clipboard. ${rejectedValue}`,
     });
   });
 
-  it('should return info message when no text parts found in AI message', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should return info message when no text parts found in AI message", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const historyWithEmptyParts = [
       {
-        role: 'model',
-        parts: [{ image: 'base64data' }], // No text parts
+        role: "model",
+        parts: [{ image: "base64data" }], // No text parts
       },
     ];
 
     mockGetHistory.mockReturnValue(historyWithEmptyParts);
 
-    const result = await copyCommand.action(mockContext, '');
+    const result = await copyCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'Last AI output contains no text to copy.',
+      type: "message",
+      messageType: "info",
+      content: "Last AI output contains no text to copy.",
     });
 
     expect(mockCopyToClipboard).not.toHaveBeenCalled();
   });
 
-  it('should handle unavailable config service', async () => {
-    if (!copyCommand.action) throw new Error('Command has no action');
+  it("should handle unavailable config service", async () => {
+    if (!copyCommand.action) throw new Error("Command has no action");
 
     const nullConfigContext = createMockCommandContext({
       services: { config: null },
     });
 
-    const result = await copyCommand.action(nullConfigContext, '');
+    const result = await copyCommand.action(nullConfigContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content: 'No output in history',
+      type: "message",
+      messageType: "info",
+      content: "No output in history",
     });
 
     expect(mockCopyToClipboard).not.toHaveBeenCalled();
diff --git a/packages/ui-gemini/src/ui/commands/copyCommand.ts b/packages/ui-gemini/src/ui/commands/copyCommand.ts
index 14dc1bcf2..1cf41f97d 100644
--- a/packages/ui-gemini/src/ui/commands/copyCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/copyCommand.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { copyToClipboard } from '../utils/commandUtils.js';
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { copyToClipboard } from "../utils/commandUtils.js";
+import type { SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const copyCommand: SlashCommand = {
-  name: 'copy',
-  description: 'Copy the last result or code snippet to clipboard',
+  name: "copy",
+  description: "Copy the last result or code snippet to clipboard",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context, _args): Promise<SlashCommandActionReturn | void> => {
@@ -20,46 +20,46 @@ export const copyCommand: SlashCommand = {
 
     // Get the last message from the AI (model role)
     const lastAiMessage = history
-      ? history.filter((item) => item.role === 'model').pop()
+      ? history.filter((item) => item.role === "model").pop()
       : undefined;
 
     if (!lastAiMessage) {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: 'No output in history',
+        type: "message",
+        messageType: "info",
+        content: "No output in history",
       };
     }
     // Extract text from the parts
     const lastAiOutput = lastAiMessage.parts
       ?.filter((part) => part.text)
       .map((part) => part.text)
-      .join('');
+      .join("");
 
     if (lastAiOutput) {
       try {
         await copyToClipboard(lastAiOutput);
 
         return {
-          type: 'message',
-          messageType: 'info',
-          content: 'Last output copied to the clipboard',
+          type: "message",
+          messageType: "info",
+          content: "Last output copied to the clipboard",
         };
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
         debugLogger.debug(message);
 
         return {
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: `Failed to copy to the clipboard. ${message}`,
         };
       }
     } else {
       return {
-        type: 'message',
-        messageType: 'info',
-        content: 'Last AI output contains no text to copy.',
+        type: "message",
+        messageType: "info",
+        content: "Last AI output contains no text to copy.",
       };
     }
   },
diff --git a/packages/ui-gemini/src/ui/commands/corgiCommand.test.ts b/packages/ui-gemini/src/ui/commands/corgiCommand.test.ts
index 1976ca369..9f1921308 100644
--- a/packages/ui-gemini/src/ui/commands/corgiCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/corgiCommand.test.ts
@@ -4,31 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { corgiCommand } from './corgiCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { corgiCommand } from "./corgiCommand.js";
+import { type CommandContext } from "./types.js";
 
-describe('corgiCommand', () => {
+describe("corgiCommand", () => {
   let mockContext: CommandContext;
 
   beforeEach(() => {
     mockContext = createMockCommandContext();
-    vi.spyOn(mockContext.ui, 'toggleCorgiMode');
+    vi.spyOn(mockContext.ui, "toggleCorgiMode");
   });
 
-  it('should call the toggleCorgiMode function on the UI context', async () => {
+  it("should call the toggleCorgiMode function on the UI context", async () => {
     if (!corgiCommand.action) {
-      throw new Error('The corgi command must have an action.');
+      throw new Error("The corgi command must have an action.");
     }
 
-    await corgiCommand.action(mockContext, '');
+    await corgiCommand.action(mockContext, "");
 
     expect(mockContext.ui.toggleCorgiMode).toHaveBeenCalledTimes(1);
   });
 
-  it('should have the correct name and description', () => {
-    expect(corgiCommand.name).toBe('corgi');
-    expect(corgiCommand.description).toBe('Toggles corgi mode');
+  it("should have the correct name and description", () => {
+    expect(corgiCommand.name).toBe("corgi");
+    expect(corgiCommand.description).toBe("Toggles corgi mode");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/corgiCommand.ts b/packages/ui-gemini/src/ui/commands/corgiCommand.ts
index 87f1dd944..bbd78cbaa 100644
--- a/packages/ui-gemini/src/ui/commands/corgiCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/corgiCommand.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CommandKind, type SlashCommand } from './types.js';
+import { CommandKind, type SlashCommand } from "./types.js";
 
 export const corgiCommand: SlashCommand = {
-  name: 'corgi',
-  description: 'Toggles corgi mode',
+  name: "corgi",
+  description: "Toggles corgi mode",
   hidden: true,
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
diff --git a/packages/ui-gemini/src/ui/commands/directoryCommand.test.tsx b/packages/ui-gemini/src/ui/commands/directoryCommand.test.tsx
index 4f9e1fb69..d0586bcfc 100644
--- a/packages/ui-gemini/src/ui/commands/directoryCommand.test.tsx
+++ b/packages/ui-gemini/src/ui/commands/directoryCommand.test.tsx
@@ -4,29 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import type { Mock } from 'vitest';
-import { directoryCommand } from './directoryCommand.js';
-import { expandHomeDir } from '../utils/directoryUtils.js';
-import type { Config, WorkspaceContext } from '@airiscode/gemini-cli-core';
-import type { MultiFolderTrustDialogProps } from '../components/MultiFolderTrustDialog.js';
-import type { CommandContext, OpenCustomDialogActionReturn } from './types.js';
-import { MessageType } from '../types.js';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import * as trustedFolders from '../../config/trustedFolders.js';
-import type { LoadedTrustedFolders } from '../../config/trustedFolders.js';
-
-describe('directoryCommand', () => {
+import * as os from "node:os";
+import * as path from "node:path";
+import type { Config, WorkspaceContext } from "@airiscode/gemini-cli-core";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedTrustedFolders } from "../../config/trustedFolders.js";
+import * as trustedFolders from "../../config/trustedFolders.js";
+import type { MultiFolderTrustDialogProps } from "../components/MultiFolderTrustDialog.js";
+import { MessageType } from "../types.js";
+import { expandHomeDir } from "../utils/directoryUtils.js";
+import { directoryCommand } from "./directoryCommand.js";
+import type { CommandContext, OpenCustomDialogActionReturn } from "./types.js";
+
+describe("directoryCommand", () => {
   let mockContext: CommandContext;
   let mockConfig: Config;
   let mockWorkspaceContext: WorkspaceContext;
-  const addCommand = directoryCommand.subCommands?.find(
-    (c) => c.name === 'add',
-  );
-  const showCommand = directoryCommand.subCommands?.find(
-    (c) => c.name === 'show',
-  );
+  const addCommand = directoryCommand.subCommands?.find((c) => c.name === "add");
+  const showCommand = directoryCommand.subCommands?.find((c) => c.name === "show");
 
   beforeEach(() => {
     mockWorkspaceContext = {
@@ -34,8 +30,8 @@ describe('directoryCommand', () => {
       getDirectories: vi
         .fn()
         .mockReturnValue([
-          path.normalize('/home/user/project1'),
-          path.normalize('/home/user/project2'),
+          path.normalize("/home/user/project1"),
+          path.normalize("/home/user/project2"),
         ]),
     } as unknown as WorkspaceContext;
 
@@ -45,7 +41,7 @@ describe('directoryCommand', () => {
       getGeminiClient: vi.fn().mockReturnValue({
         addDirectoryContext: vi.fn(),
       }),
-      getWorkingDir: () => '/test/dir',
+      getWorkingDir: () => "/test/dir",
       shouldLoadMemoryFromIncludeDirectories: () => false,
       getDebugMode: () => false,
       getFileService: () => ({}),
@@ -69,53 +65,53 @@ describe('directoryCommand', () => {
     } as unknown as CommandContext;
   });
 
-  describe('show', () => {
-    it('should display the list of directories', () => {
-      if (!showCommand?.action) throw new Error('No action');
+  describe("show", () => {
+    it("should display the list of directories", () => {
+      if (!showCommand?.action) throw new Error("No action");
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      showCommand.action(mockContext, '');
+      showCommand.action(mockContext, "");
       expect(mockWorkspaceContext.getDirectories).toHaveBeenCalled();
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.INFO,
           text: `Current workspace directories:\n- ${path.normalize(
-            '/home/user/project1',
-          )}\n- ${path.normalize('/home/user/project2')}`,
+            "/home/user/project1",
+          )}\n- ${path.normalize("/home/user/project2")}`,
         }),
         expect.any(Number),
       );
     });
   });
 
-  describe('add', () => {
-    it('should show an error in a restrictive sandbox', async () => {
-      if (!addCommand?.action) throw new Error('No action');
+  describe("add", () => {
+    it("should show an error in a restrictive sandbox", async () => {
+      if (!addCommand?.action) throw new Error("No action");
       vi.mocked(mockConfig.isRestrictiveSandbox).mockReturnValue(true);
-      const result = await addCommand.action(mockContext, '/some/path');
+      const result = await addCommand.action(mockContext, "/some/path");
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content:
-          'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.',
+          "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.",
       });
     });
 
-    it('should show an error if no path is provided', () => {
-      if (!addCommand?.action) throw new Error('No action');
+    it("should show an error if no path is provided", () => {
+      if (!addCommand?.action) throw new Error("No action");
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      addCommand.action(mockContext, '');
+      addCommand.action(mockContext, "");
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.ERROR,
-          text: 'Please provide at least one path to add.',
+          text: "Please provide at least one path to add.",
         }),
         expect.any(Number),
       );
     });
 
-    it('should call addDirectory and show a success message for a single path', async () => {
-      const newPath = path.normalize('/home/user/new-project');
-      if (!addCommand?.action) throw new Error('No action');
+    it("should call addDirectory and show a success message for a single path", async () => {
+      const newPath = path.normalize("/home/user/new-project");
+      if (!addCommand?.action) throw new Error("No action");
       await addCommand.action(mockContext, newPath);
       expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(newPath);
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
@@ -127,10 +123,10 @@ describe('directoryCommand', () => {
       );
     });
 
-    it('should call addDirectory for each path and show a success message for multiple paths', async () => {
-      const newPath1 = path.normalize('/home/user/new-project1');
-      const newPath2 = path.normalize('/home/user/new-project2');
-      if (!addCommand?.action) throw new Error('No action');
+    it("should call addDirectory for each path and show a success message for multiple paths", async () => {
+      const newPath1 = path.normalize("/home/user/new-project1");
+      const newPath2 = path.normalize("/home/user/new-project2");
+      if (!addCommand?.action) throw new Error("No action");
       await addCommand.action(mockContext, `${newPath1},${newPath2}`);
       expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(newPath1);
       expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(newPath2);
@@ -143,13 +139,13 @@ describe('directoryCommand', () => {
       );
     });
 
-    it('should show an error if addDirectory throws an exception', async () => {
-      const error = new Error('Directory does not exist');
+    it("should show an error if addDirectory throws an exception", async () => {
+      const error = new Error("Directory does not exist");
       vi.mocked(mockWorkspaceContext.addDirectory).mockImplementation(() => {
         throw error;
       });
-      const newPath = path.normalize('/home/user/invalid-project');
-      if (!addCommand?.action) throw new Error('No action');
+      const newPath = path.normalize("/home/user/invalid-project");
+      if (!addCommand?.action) throw new Error("No action");
       await addCommand.action(mockContext, newPath);
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -160,19 +156,19 @@ describe('directoryCommand', () => {
       );
     });
 
-    it('should add directory directly when folder trust is disabled', async () => {
-      if (!addCommand?.action) throw new Error('No action');
-      vi.spyOn(trustedFolders, 'isFolderTrustEnabled').mockReturnValue(false);
-      const newPath = path.normalize('/home/user/new-project');
+    it("should add directory directly when folder trust is disabled", async () => {
+      if (!addCommand?.action) throw new Error("No action");
+      vi.spyOn(trustedFolders, "isFolderTrustEnabled").mockReturnValue(false);
+      const newPath = path.normalize("/home/user/new-project");
 
       await addCommand.action(mockContext, newPath);
 
       expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(newPath);
     });
 
-    it('should show an info message for an already added directory', async () => {
-      const existingPath = path.normalize('/home/user/project1');
-      if (!addCommand?.action) throw new Error('No action');
+    it("should show an info message for an already added directory", async () => {
+      const existingPath = path.normalize("/home/user/project1");
+      if (!addCommand?.action) throw new Error("No action");
       await addCommand.action(mockContext, existingPath);
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -181,24 +177,20 @@ describe('directoryCommand', () => {
         }),
         expect.any(Number),
       );
-      expect(mockWorkspaceContext.addDirectory).not.toHaveBeenCalledWith(
-        existingPath,
-      );
+      expect(mockWorkspaceContext.addDirectory).not.toHaveBeenCalledWith(existingPath);
     });
 
-    it('should handle a mix of successful and failed additions', async () => {
-      const validPath = path.normalize('/home/user/valid-project');
-      const invalidPath = path.normalize('/home/user/invalid-project');
-      const error = new Error('Directory does not exist');
-      vi.mocked(mockWorkspaceContext.addDirectory).mockImplementation(
-        (p: string) => {
-          if (p === invalidPath) {
-            throw error;
-          }
-        },
-      );
+    it("should handle a mix of successful and failed additions", async () => {
+      const validPath = path.normalize("/home/user/valid-project");
+      const invalidPath = path.normalize("/home/user/invalid-project");
+      const error = new Error("Directory does not exist");
+      vi.mocked(mockWorkspaceContext.addDirectory).mockImplementation((p: string) => {
+        if (p === invalidPath) {
+          throw error;
+        }
+      });
 
-      if (!addCommand?.action) throw new Error('No action');
+      if (!addCommand?.action) throw new Error("No action");
       await addCommand.action(mockContext, `${validPath},${invalidPath}`);
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
@@ -219,42 +211,40 @@ describe('directoryCommand', () => {
     });
   });
 
-  describe('add with folder trust enabled', () => {
+  describe("add with folder trust enabled", () => {
     let mockIsPathTrusted: Mock;
 
     beforeEach(() => {
-      vi.spyOn(trustedFolders, 'isFolderTrustEnabled').mockReturnValue(true);
-      vi.spyOn(trustedFolders, 'isWorkspaceTrusted').mockReturnValue({
+      vi.spyOn(trustedFolders, "isFolderTrustEnabled").mockReturnValue(true);
+      vi.spyOn(trustedFolders, "isWorkspaceTrusted").mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
       mockIsPathTrusted = vi.fn();
       const mockLoadedFolders = {
         isPathTrusted: mockIsPathTrusted,
       } as unknown as LoadedTrustedFolders;
-      vi.spyOn(trustedFolders, 'loadTrustedFolders').mockReturnValue(
-        mockLoadedFolders,
-      );
+      vi.spyOn(trustedFolders, "loadTrustedFolders").mockReturnValue(mockLoadedFolders);
     });
 
     afterEach(() => {
       vi.restoreAllMocks();
     });
 
-    it('should add a trusted directory', async () => {
-      if (!addCommand?.action) throw new Error('No action');
+    it("should add a trusted directory", async () => {
+      if (!addCommand?.action) throw new Error("No action");
       mockIsPathTrusted.mockReturnValue(true);
-      const newPath = path.normalize('/home/user/trusted-project');
+      const newPath = path.normalize("/home/user/trusted-project");
 
       await addCommand.action(mockContext, newPath);
 
       expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(newPath);
     });
 
-    it('should show an error for an untrusted directory', async () => {
-      if (!addCommand?.action) throw new Error('No action');
+    it("should show an error for an untrusted directory", async () => {
+      if (!addCommand?.action) throw new Error("No action");
       mockIsPathTrusted.mockReturnValue(false);
-      const newPath = path.normalize('/home/user/untrusted-project');
+      const newPath = path.normalize("/home/user/untrusted-project");
 
       await addCommand.action(mockContext, newPath);
 
@@ -262,29 +252,29 @@ describe('directoryCommand', () => {
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.ERROR,
-          text: expect.stringContaining('explicitly untrusted'),
+          text: expect.stringContaining("explicitly untrusted"),
         }),
         expect.any(Number),
       );
     });
 
-    it('should return a custom dialog for a directory with undefined trust', async () => {
-      if (!addCommand?.action) throw new Error('No action');
+    it("should return a custom dialog for a directory with undefined trust", async () => {
+      if (!addCommand?.action) throw new Error("No action");
       mockIsPathTrusted.mockReturnValue(undefined);
-      const newPath = path.normalize('/home/user/undefined-trust-project');
+      const newPath = path.normalize("/home/user/undefined-trust-project");
 
       const result = await addCommand.action(mockContext, newPath);
 
       expect(result).toEqual(
         expect.objectContaining({
-          type: 'custom_dialog',
+          type: "custom_dialog",
           component: expect.objectContaining({
             type: expect.any(Function), // React component for MultiFolderTrustDialog
           }),
         }),
       );
       if (!result) {
-        throw new Error('Command did not return a result');
+        throw new Error("Command did not return a result");
       }
       const component = (result as OpenCustomDialogActionReturn)
         .component as React.ReactElement<MultiFolderTrustDialogProps>;
@@ -292,12 +282,10 @@ describe('directoryCommand', () => {
     });
   });
 
-  it('should correctly expand a Windows-style home directory path', () => {
-    const windowsPath = '%userprofile%\\Documents';
-    const expectedPath = path.win32.join(os.homedir(), 'Documents');
+  it("should correctly expand a Windows-style home directory path", () => {
+    const windowsPath = "%userprofile%\\Documents";
+    const expectedPath = path.win32.join(os.homedir(), "Documents");
     const result = expandHomeDir(windowsPath);
-    expect(path.win32.normalize(result)).toBe(
-      path.win32.normalize(expectedPath),
-    );
+    expect(path.win32.normalize(result)).toBe(path.win32.normalize(expectedPath));
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/directoryCommand.tsx b/packages/ui-gemini/src/ui/commands/directoryCommand.tsx
index bf1459680..b14e72195 100644
--- a/packages/ui-gemini/src/ui/commands/directoryCommand.tsx
+++ b/packages/ui-gemini/src/ui/commands/directoryCommand.tsx
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { Config } from "@airiscode/gemini-cli-core";
+import { refreshServerHierarchicalMemory } from "@airiscode/gemini-cli-core";
 import {
   isFolderTrustEnabled,
   isWorkspaceTrusted,
   loadTrustedFolders,
-} from '../../config/trustedFolders.js';
-import { MultiFolderTrustDialog } from '../components/MultiFolderTrustDialog.js';
-import type { SlashCommand, CommandContext } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType, type HistoryItem } from '../types.js';
-import { refreshServerHierarchicalMemory } from '@airiscode/gemini-cli-core';
-import { expandHomeDir } from '../utils/directoryUtils.js';
-import type { Config } from '@airiscode/gemini-cli-core';
+} from "../../config/trustedFolders.js";
+import { MultiFolderTrustDialog } from "../components/MultiFolderTrustDialog.js";
+import { type HistoryItem, MessageType } from "../types.js";
+import { expandHomeDir } from "../utils/directoryUtils.js";
+import type { CommandContext, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 async function finishAddingDirectories(
   config: Config,
-  addItem: (itemData: Omit<HistoryItem, 'id'>, baseTimestamp: number) => number,
+  addItem: (itemData: Omit<HistoryItem, "id">, baseTimestamp: number) => number,
   added: string[],
   errors: string[],
 ) {
@@ -27,7 +27,7 @@ async function finishAddingDirectories(
     addItem(
       {
         type: MessageType.ERROR,
-        text: 'Configuration is not available.',
+        text: "Configuration is not available.",
       },
       Date.now(),
     );
@@ -41,7 +41,7 @@ async function finishAddingDirectories(
     addItem(
       {
         type: MessageType.INFO,
-        text: `Successfully added GEMINI.md files from the following directories if there are:\n- ${added.join('\n- ')}`,
+        text: `Successfully added GEMINI.md files from the following directories if there are:\n- ${added.join("\n- ")}`,
       },
       Date.now(),
     );
@@ -57,27 +57,26 @@ async function finishAddingDirectories(
     addItem(
       {
         type: MessageType.INFO,
-        text: `Successfully added directories:\n- ${added.join('\n- ')}`,
+        text: `Successfully added directories:\n- ${added.join("\n- ")}`,
       },
       Date.now(),
     );
   }
 
   if (errors.length > 0) {
-    addItem({ type: MessageType.ERROR, text: errors.join('\n') }, Date.now());
+    addItem({ type: MessageType.ERROR, text: errors.join("\n") }, Date.now());
   }
 }
 
 export const directoryCommand: SlashCommand = {
-  name: 'directory',
-  altNames: ['dir'],
-  description: 'Manage workspace directories',
+  name: "directory",
+  altNames: ["dir"],
+  description: "Manage workspace directories",
   kind: CommandKind.BUILT_IN,
   subCommands: [
     {
-      name: 'add',
-      description:
-        'Add directories to the workspace. Use comma to separate multiple paths',
+      name: "add",
+      description: "Add directories to the workspace. Use comma to separate multiple paths",
       kind: CommandKind.BUILT_IN,
       autoExecute: false,
       action: async (context: CommandContext, args: string) => {
@@ -85,13 +84,13 @@ export const directoryCommand: SlashCommand = {
           ui: { addItem },
           services: { config, settings },
         } = context;
-        const [...rest] = args.split(' ');
+        const [...rest] = args.split(" ");
 
         if (!config) {
           addItem(
             {
               type: MessageType.ERROR,
-              text: 'Configuration is not available.',
+              text: "Configuration is not available.",
             },
             Date.now(),
           );
@@ -100,22 +99,22 @@ export const directoryCommand: SlashCommand = {
 
         if (config.isRestrictiveSandbox()) {
           return {
-            type: 'message' as const,
-            messageType: 'error' as const,
+            type: "message" as const,
+            messageType: "error" as const,
             content:
-              'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.',
+              "The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.",
           };
         }
 
         const pathsToAdd = rest
-          .join(' ')
-          .split(',')
+          .join(" ")
+          .split(",")
           .filter((p) => p);
         if (pathsToAdd.length === 0) {
           addItem(
             {
               type: MessageType.ERROR,
-              text: 'Please provide at least one path to add.',
+              text: "Please provide at least one path to add.",
             },
             Date.now(),
           );
@@ -144,7 +143,7 @@ export const directoryCommand: SlashCommand = {
             {
               type: MessageType.INFO,
               text: `The following directories are already in the workspace:\n- ${alreadyAdded.join(
-                '\n- ',
+                "\n- ",
               )}`,
             },
             Date.now(),
@@ -179,7 +178,7 @@ export const directoryCommand: SlashCommand = {
           if (untrustedDirs.length > 0) {
             errors.push(
               `The following directories are explicitly untrusted and cannot be added to a trusted workspace:\n- ${untrustedDirs.join(
-                '\n- ',
+                "\n- ",
               )}\nPlease use the permissions command to modify their trust level.`,
             );
           }
@@ -196,7 +195,7 @@ export const directoryCommand: SlashCommand = {
 
           if (undefinedTrustDirs.length > 0) {
             return {
-              type: 'custom_dialog',
+              type: "custom_dialog",
               component: (
                 <MultiFolderTrustDialog
                   folders={undefinedTrustDirs}
@@ -217,9 +216,7 @@ export const directoryCommand: SlashCommand = {
               added.push(pathToAdd.trim());
             } catch (e) {
               const error = e as Error;
-              errors.push(
-                `Error adding '${pathToAdd.trim()}': ${error.message}`,
-              );
+              errors.push(`Error adding '${pathToAdd.trim()}': ${error.message}`);
             }
           }
         }
@@ -229,8 +226,8 @@ export const directoryCommand: SlashCommand = {
       },
     },
     {
-      name: 'show',
-      description: 'Show all directories in the workspace',
+      name: "show",
+      description: "Show all directories in the workspace",
       kind: CommandKind.BUILT_IN,
       action: async (context: CommandContext) => {
         const {
@@ -241,7 +238,7 @@ export const directoryCommand: SlashCommand = {
           addItem(
             {
               type: MessageType.ERROR,
-              text: 'Configuration is not available.',
+              text: "Configuration is not available.",
             },
             Date.now(),
           );
@@ -249,7 +246,7 @@ export const directoryCommand: SlashCommand = {
         }
         const workspaceContext = config.getWorkspaceContext();
         const directories = workspaceContext.getDirectories();
-        const directoryList = directories.map((dir) => `- ${dir}`).join('\n');
+        const directoryList = directories.map((dir) => `- ${dir}`).join("\n");
         addItem(
           {
             type: MessageType.INFO,
diff --git a/packages/ui-gemini/src/ui/commands/docsCommand.test.ts b/packages/ui-gemini/src/ui/commands/docsCommand.test.ts
index 58e2e1733..ec8f59f3f 100644
--- a/packages/ui-gemini/src/ui/commands/docsCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/docsCommand.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import open from 'open';
-import { docsCommand } from './docsCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
+import open from "open";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { docsCommand } from "./docsCommand.js";
+import { type CommandContext } from "./types.js";
 
 // Mock the 'open' library
-vi.mock('open', () => ({
+vi.mock("open", () => ({
   default: vi.fn(),
 }));
 
-describe('docsCommand', () => {
+describe("docsCommand", () => {
   let mockContext: CommandContext;
   beforeEach(() => {
     // Create a fresh mock context before each test
@@ -32,12 +32,12 @@ describe('docsCommand', () => {
 
   it("should add an info message and call 'open' in a non-sandbox environment", async () => {
     if (!docsCommand.action) {
-      throw new Error('docsCommand must have an action.');
+      throw new Error("docsCommand must have an action.");
     }
 
-    const docsUrl = 'https://goo.gle/gemini-cli-docs';
+    const docsUrl = "https://goo.gle/gemini-cli-docs";
 
-    await docsCommand.action(mockContext, '');
+    await docsCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
@@ -50,16 +50,16 @@ describe('docsCommand', () => {
     expect(open).toHaveBeenCalledWith(docsUrl);
   });
 
-  it('should only add an info message in a sandbox environment', async () => {
+  it("should only add an info message in a sandbox environment", async () => {
     if (!docsCommand.action) {
-      throw new Error('docsCommand must have an action.');
+      throw new Error("docsCommand must have an action.");
     }
 
     // Simulate a sandbox environment
-    vi.stubEnv('SANDBOX', 'gemini-sandbox');
-    const docsUrl = 'https://goo.gle/gemini-cli-docs';
+    vi.stubEnv("SANDBOX", "gemini-sandbox");
+    const docsUrl = "https://goo.gle/gemini-cli-docs";
 
-    await docsCommand.action(mockContext, '');
+    await docsCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
@@ -75,14 +75,14 @@ describe('docsCommand', () => {
 
   it("should not open browser for 'sandbox-exec'", async () => {
     if (!docsCommand.action) {
-      throw new Error('docsCommand must have an action.');
+      throw new Error("docsCommand must have an action.");
     }
 
     // Simulate the specific 'sandbox-exec' environment
-    vi.stubEnv('SANDBOX', 'sandbox-exec');
-    const docsUrl = 'https://goo.gle/gemini-cli-docs';
+    vi.stubEnv("SANDBOX", "sandbox-exec");
+    const docsUrl = "https://goo.gle/gemini-cli-docs";
 
-    await docsCommand.action(mockContext, '');
+    await docsCommand.action(mockContext, "");
 
     // The logic should fall through to the 'else' block
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
diff --git a/packages/ui-gemini/src/ui/commands/docsCommand.ts b/packages/ui-gemini/src/ui/commands/docsCommand.ts
index 6286557cd..771b77dbe 100644
--- a/packages/ui-gemini/src/ui/commands/docsCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/docsCommand.ts
@@ -4,24 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import open from 'open';
-import process from 'node:process';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { MessageType } from '../types.js';
+import process from "node:process";
+import open from "open";
+import { MessageType } from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 export const docsCommand: SlashCommand = {
-  name: 'docs',
-  description: 'Open full Gemini CLI documentation in your browser',
+  name: "docs",
+  description: "Open full Gemini CLI documentation in your browser",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context: CommandContext): Promise<void> => {
-    const docsUrl = 'https://goo.gle/gemini-cli-docs';
+    const docsUrl = "https://goo.gle/gemini-cli-docs";
 
-    if (process.env['SANDBOX'] && process.env['SANDBOX'] !== 'sandbox-exec') {
+    if (process.env["SANDBOX"] && process.env["SANDBOX"] !== "sandbox-exec") {
       context.ui.addItem(
         {
           type: MessageType.INFO,
diff --git a/packages/ui-gemini/src/ui/commands/editorCommand.test.ts b/packages/ui-gemini/src/ui/commands/editorCommand.test.ts
index 2b3f32235..25236c9fa 100644
--- a/packages/ui-gemini/src/ui/commands/editorCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/editorCommand.test.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { editorCommand } from './editorCommand.js';
+import { describe, expect, it } from "vitest";
 // 1. Import the mock context utility
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { editorCommand } from "./editorCommand.js";
 
-describe('editorCommand', () => {
-  it('should return a dialog action to open the editor dialog', () => {
+describe("editorCommand", () => {
+  it("should return a dialog action to open the editor dialog", () => {
     if (!editorCommand.action) {
-      throw new Error('The editor command must have an action.');
+      throw new Error("The editor command must have an action.");
     }
     const mockContext = createMockCommandContext();
-    const result = editorCommand.action(mockContext, '');
+    const result = editorCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'dialog',
-      dialog: 'editor',
+      type: "dialog",
+      dialog: "editor",
     });
   });
 
-  it('should have the correct name and description', () => {
-    expect(editorCommand.name).toBe('editor');
-    expect(editorCommand.description).toBe('Set external editor preference');
+  it("should have the correct name and description", () => {
+    expect(editorCommand.name).toBe("editor");
+    expect(editorCommand.description).toBe("Set external editor preference");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/editorCommand.ts b/packages/ui-gemini/src/ui/commands/editorCommand.ts
index e4e668ae5..a89559a79 100644
--- a/packages/ui-gemini/src/ui/commands/editorCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/editorCommand.ts
@@ -4,19 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  CommandKind,
-  type OpenDialogActionReturn,
-  type SlashCommand,
-} from './types.js';
+import { CommandKind, type OpenDialogActionReturn, type SlashCommand } from "./types.js";
 
 export const editorCommand: SlashCommand = {
-  name: 'editor',
-  description: 'Set external editor preference',
+  name: "editor",
+  description: "Set external editor preference",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'editor',
+    type: "dialog",
+    dialog: "editor",
   }),
 };
diff --git a/packages/ui-gemini/src/ui/commands/extensionsCommand.test.ts b/packages/ui-gemini/src/ui/commands/extensionsCommand.test.ts
index 1c189642a..3f305ca9d 100644
--- a/packages/ui-gemini/src/ui/commands/extensionsCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/extensionsCommand.test.ts
@@ -4,38 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  ExtensionLoader,
-  GeminiCLIExtension,
-} from '@airiscode/gemini-cli-core';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
+import type { ExtensionLoader, GeminiCLIExtension } from "@airiscode/gemini-cli-core";
+import open from "open";
+import { afterEach, beforeEach, describe, expect, it, type MockedFunction, vi } from "vitest";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { SettingScope } from "../../config/settings.js";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { type ExtensionUpdateAction } from "../state/extensions.js";
+import { MessageType } from "../types.js";
 import {
   completeExtensions,
   completeExtensionsAndScopes,
   extensionsCommand,
-} from './extensionsCommand.js';
-import { type CommandContext, type SlashCommand } from './types.js';
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type MockedFunction,
-} from 'vitest';
-import { type ExtensionUpdateAction } from '../state/extensions.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { SettingScope } from '../../config/settings.js';
-
-import open from 'open';
-
-vi.mock('open', () => ({
+} from "./extensionsCommand.js";
+import { type CommandContext, type SlashCommand } from "./types.js";
+
+vi.mock("open", () => ({
   default: vi.fn(),
 }));
 
-vi.mock('../../config/extensions/update.js', () => ({
+vi.mock("../../config/extensions/update.js", () => ({
   updateExtension: vi.fn(),
   checkForAllExtensionUpdates: vi.fn(),
 }));
@@ -45,46 +33,46 @@ const mockEnableExtension = vi.fn();
 const mockGetExtensions = vi.fn();
 
 const inactiveExt: GeminiCLIExtension = {
-  name: 'ext-one',
-  id: 'ext-one-id',
-  version: '1.0.0',
+  name: "ext-one",
+  id: "ext-one-id",
+  version: "1.0.0",
   isActive: false, // should suggest disabled extensions
-  path: '/test/dir/ext-one',
+  path: "/test/dir/ext-one",
   contextFiles: [],
   installMetadata: {
-    type: 'git',
+    type: "git",
     autoUpdate: false,
-    source: 'https://github.com/some/extension.git',
+    source: "https://github.com/some/extension.git",
   },
 };
 const activeExt: GeminiCLIExtension = {
-  name: 'ext-two',
-  id: 'ext-two-id',
-  version: '1.0.0',
+  name: "ext-two",
+  id: "ext-two-id",
+  version: "1.0.0",
   isActive: true, // should not suggest enabled extensions
-  path: '/test/dir/ext-two',
+  path: "/test/dir/ext-two",
   contextFiles: [],
   installMetadata: {
-    type: 'git',
+    type: "git",
     autoUpdate: false,
-    source: 'https://github.com/some/extension.git',
+    source: "https://github.com/some/extension.git",
   },
 };
 const allExt: GeminiCLIExtension = {
-  name: 'all-ext',
-  id: 'all-ext-id',
-  version: '1.0.0',
+  name: "all-ext",
+  id: "all-ext-id",
+  version: "1.0.0",
   isActive: true,
-  path: '/test/dir/all-ext',
+  path: "/test/dir/all-ext",
   contextFiles: [],
   installMetadata: {
-    type: 'git',
+    type: "git",
     autoUpdate: false,
-    source: 'https://github.com/some/extension.git',
+    source: "https://github.com/some/extension.git",
   },
 };
 
-describe('extensionsCommand', () => {
+describe("extensionsCommand", () => {
   let mockContext: CommandContext;
   const mockDispatchExtensionState = vi.fn();
 
@@ -106,7 +94,7 @@ describe('extensionsCommand', () => {
             });
             return actual;
           }),
-          getWorkingDir: () => '/test/dir',
+          getWorkingDir: () => "/test/dir",
         },
       },
       ui: {
@@ -120,11 +108,11 @@ describe('extensionsCommand', () => {
     vi.unstubAllEnvs();
   });
 
-  describe('list', () => {
-    it('should add an EXTENSIONS_LIST item to the UI', async () => {
+  describe("list", () => {
+    it("should add an EXTENSIONS_LIST item to the UI", async () => {
       const command = extensionsCommand();
-      if (!command.action) throw new Error('Action not defined');
-      await command.action(mockContext, '');
+      if (!command.action) throw new Error("Action not defined");
+      await command.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
@@ -135,60 +123,57 @@ describe('extensionsCommand', () => {
       );
     });
 
-    it('should show a message if no extensions are installed', async () => {
+    it("should show a message if no extensions are installed", async () => {
       mockGetExtensions.mockReturnValue([]);
       const command = extensionsCommand();
-      if (!command.action) throw new Error('Action not defined');
-      await command.action(mockContext, '');
+      if (!command.action) throw new Error("Action not defined");
+      await command.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'No extensions installed. Run `/extensions explore` to check out the gallery.',
+          text: "No extensions installed. Run `/extensions explore` to check out the gallery.",
         },
         expect.any(Number),
       );
     });
   });
 
-  describe('completeExtensions', () => {
+  describe("completeExtensions", () => {
     it.each([
       {
-        description: 'should return matching extension names',
-        partialArg: 'ext',
-        expected: ['ext-one', 'ext-two'],
+        description: "should return matching extension names",
+        partialArg: "ext",
+        expected: ["ext-one", "ext-two"],
       },
       {
-        description: 'should return --all when partialArg matches',
-        partialArg: '--al',
-        expected: ['--all'],
+        description: "should return --all when partialArg matches",
+        partialArg: "--al",
+        expected: ["--all"],
       },
       {
-        description:
-          'should return both extension names and --all when both match',
-        partialArg: 'all',
-        expected: ['--all', 'all-ext'],
+        description: "should return both extension names and --all when both match",
+        partialArg: "all",
+        expected: ["--all", "all-ext"],
       },
       {
-        description: 'should return an empty array if no matches',
-        partialArg: 'nomatch',
+        description: "should return an empty array if no matches",
+        partialArg: "nomatch",
         expected: [],
       },
       {
-        description:
-          'should suggest only disabled extension names for the enable command',
-        partialArg: 'ext',
-        expected: ['ext-one'],
-        command: 'enable',
+        description: "should suggest only disabled extension names for the enable command",
+        partialArg: "ext",
+        expected: ["ext-one"],
+        command: "enable",
       },
       {
-        description:
-          'should suggest only enabled extension names for the disable command',
-        partialArg: 'ext',
-        expected: ['ext-two'],
-        command: 'disable',
+        description: "should suggest only enabled extension names for the disable command",
+        partialArg: "ext",
+        expected: ["ext-two"],
+        command: "disable",
       },
-    ])('$description', async ({ partialArg, expected, command }) => {
+    ])("$description", async ({ partialArg, expected, command }) => {
       if (command) {
         mockContext.invocation!.name = command;
       }
@@ -197,92 +182,88 @@ describe('extensionsCommand', () => {
     });
   });
 
-  describe('completeExtensionsAndScopes', () => {
-    it('expands the list of suggestions with --scope args', () => {
-      const suggestions = completeExtensionsAndScopes(mockContext, 'ext');
+  describe("completeExtensionsAndScopes", () => {
+    it("expands the list of suggestions with --scope args", () => {
+      const suggestions = completeExtensionsAndScopes(mockContext, "ext");
       expect(suggestions).toEqual([
-        'ext-one --scope user',
-        'ext-one --scope workspace',
-        'ext-one --scope session',
-        'ext-two --scope user',
-        'ext-two --scope workspace',
-        'ext-two --scope session',
+        "ext-one --scope user",
+        "ext-one --scope workspace",
+        "ext-one --scope session",
+        "ext-two --scope user",
+        "ext-two --scope workspace",
+        "ext-two --scope session",
       ]);
     });
   });
 
-  describe('update', () => {
+  describe("update", () => {
     const updateAction = extensionsCommand().subCommands?.find(
-      (cmd) => cmd.name === 'update',
+      (cmd) => cmd.name === "update",
     )?.action;
 
     if (!updateAction) {
-      throw new Error('Update action not found');
+      throw new Error("Update action not found");
     }
 
-    it('should show usage if no args are provided', async () => {
-      await updateAction(mockContext, '');
+    it("should show usage if no args are provided", async () => {
+      await updateAction(mockContext, "");
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.ERROR,
-          text: 'Usage: /extensions update <extension-names>|--all',
+          text: "Usage: /extensions update <extension-names>|--all",
         },
         expect.any(Number),
       );
     });
 
-    it('should show a message if no extensions are installed', async () => {
+    it("should show a message if no extensions are installed", async () => {
       mockGetExtensions.mockReturnValue([]);
-      await updateAction(mockContext, 'ext-one');
+      await updateAction(mockContext, "ext-one");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'No extensions installed. Run `/extensions explore` to check out the gallery.',
+          text: "No extensions installed. Run `/extensions explore` to check out the gallery.",
         },
         expect.any(Number),
       );
     });
 
-    it('should inform user if there are no extensions to update with --all', async () => {
-      mockDispatchExtensionState.mockImplementationOnce(
-        (action: ExtensionUpdateAction) => {
-          if (action.type === 'SCHEDULE_UPDATE') {
-            action.payload.onComplete([]);
-          }
-        },
-      );
+    it("should inform user if there are no extensions to update with --all", async () => {
+      mockDispatchExtensionState.mockImplementationOnce((action: ExtensionUpdateAction) => {
+        if (action.type === "SCHEDULE_UPDATE") {
+          action.payload.onComplete([]);
+        }
+      });
 
-      await updateAction(mockContext, '--all');
+      await updateAction(mockContext, "--all");
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'No extensions to update.',
+          text: "No extensions to update.",
         },
         expect.any(Number),
       );
     });
 
-    it('should call setPendingItem and addItem in a finally block on success', async () => {
-      mockDispatchExtensionState.mockImplementationOnce(
-        (action: ExtensionUpdateAction) => {
-          if (action.type === 'SCHEDULE_UPDATE') {
-            action.payload.onComplete([
-              {
-                name: 'ext-one',
-                originalVersion: '1.0.0',
-                updatedVersion: '1.0.1',
-              },
-              {
-                name: 'ext-two',
-                originalVersion: '2.0.0',
-                updatedVersion: '2.0.1',
-              },
-            ]);
-          }
-        },
-      );
-      await updateAction(mockContext, '--all');
+    it("should call setPendingItem and addItem in a finally block on success", async () => {
+      mockDispatchExtensionState.mockImplementationOnce((action: ExtensionUpdateAction) => {
+        if (action.type === "SCHEDULE_UPDATE") {
+          action.payload.onComplete([
+            {
+              name: "ext-one",
+              originalVersion: "1.0.0",
+              updatedVersion: "1.0.1",
+            },
+            {
+              name: "ext-two",
+              originalVersion: "2.0.0",
+              updatedVersion: "2.0.1",
+            },
+          ]);
+        }
+      });
+      await updateAction(mockContext, "--all");
       expect(mockContext.ui.setPendingItem).toHaveBeenCalledWith({
         type: MessageType.EXTENSIONS_LIST,
         extensions: expect.any(Array),
@@ -297,11 +278,11 @@ describe('extensionsCommand', () => {
       );
     });
 
-    it('should call setPendingItem and addItem in a finally block on failure', async () => {
+    it("should call setPendingItem and addItem in a finally block on failure", async () => {
       mockDispatchExtensionState.mockImplementationOnce((_) => {
-        throw new Error('Something went wrong');
+        throw new Error("Something went wrong");
       });
-      await updateAction(mockContext, '--all');
+      await updateAction(mockContext, "--all");
       expect(mockContext.ui.setPendingItem).toHaveBeenCalledWith({
         type: MessageType.EXTENSIONS_LIST,
         extensions: expect.any(Array),
@@ -317,62 +298,58 @@ describe('extensionsCommand', () => {
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.ERROR,
-          text: 'Something went wrong',
+          text: "Something went wrong",
         },
         expect.any(Number),
       );
     });
 
-    it('should update a single extension by name', async () => {
-      mockDispatchExtensionState.mockImplementationOnce(
-        (action: ExtensionUpdateAction) => {
-          if (action.type === 'SCHEDULE_UPDATE') {
-            action.payload.onComplete([
-              {
-                name: 'ext-one',
-                originalVersion: '1.0.0',
-                updatedVersion: '1.0.1',
-              },
-            ]);
-          }
-        },
-      );
-      await updateAction(mockContext, 'ext-one');
+    it("should update a single extension by name", async () => {
+      mockDispatchExtensionState.mockImplementationOnce((action: ExtensionUpdateAction) => {
+        if (action.type === "SCHEDULE_UPDATE") {
+          action.payload.onComplete([
+            {
+              name: "ext-one",
+              originalVersion: "1.0.0",
+              updatedVersion: "1.0.1",
+            },
+          ]);
+        }
+      });
+      await updateAction(mockContext, "ext-one");
       expect(mockDispatchExtensionState).toHaveBeenCalledWith({
-        type: 'SCHEDULE_UPDATE',
+        type: "SCHEDULE_UPDATE",
         payload: {
           all: false,
-          names: ['ext-one'],
+          names: ["ext-one"],
           onComplete: expect.any(Function),
         },
       });
     });
 
-    it('should update multiple extensions by name', async () => {
-      mockDispatchExtensionState.mockImplementationOnce(
-        (action: ExtensionUpdateAction) => {
-          if (action.type === 'SCHEDULE_UPDATE') {
-            action.payload.onComplete([
-              {
-                name: 'ext-one',
-                originalVersion: '1.0.0',
-                updatedVersion: '1.0.1',
-              },
-              {
-                name: 'ext-two',
-                originalVersion: '1.0.0',
-                updatedVersion: '1.0.1',
-              },
-            ]);
-          }
-        },
-      );
-      await updateAction(mockContext, 'ext-one ext-two');
+    it("should update multiple extensions by name", async () => {
+      mockDispatchExtensionState.mockImplementationOnce((action: ExtensionUpdateAction) => {
+        if (action.type === "SCHEDULE_UPDATE") {
+          action.payload.onComplete([
+            {
+              name: "ext-one",
+              originalVersion: "1.0.0",
+              updatedVersion: "1.0.1",
+            },
+            {
+              name: "ext-two",
+              originalVersion: "1.0.0",
+              updatedVersion: "1.0.1",
+            },
+          ]);
+        }
+      });
+      await updateAction(mockContext, "ext-one ext-two");
       expect(mockDispatchExtensionState).toHaveBeenCalledWith({
-        type: 'SCHEDULE_UPDATE',
+        type: "SCHEDULE_UPDATE",
         payload: {
           all: false,
-          names: ['ext-one', 'ext-two'],
+          names: ["ext-one", "ext-two"],
           onComplete: expect.any(Function),
         },
       });
@@ -391,23 +368,23 @@ describe('extensionsCommand', () => {
     });
   });
 
-  describe('explore', () => {
+  describe("explore", () => {
     const exploreAction = extensionsCommand().subCommands?.find(
-      (cmd) => cmd.name === 'explore',
+      (cmd) => cmd.name === "explore",
     )?.action;
 
     if (!exploreAction) {
-      throw new Error('Explore action not found');
+      throw new Error("Explore action not found");
     }
 
     it("should add an info message and call 'open' in a non-sandbox environment", async () => {
       // Ensure no special environment variables that would affect behavior
-      vi.stubEnv('NODE_ENV', '');
-      vi.stubEnv('SANDBOX', '');
+      vi.stubEnv("NODE_ENV", "");
+      vi.stubEnv("SANDBOX", "");
 
-      await exploreAction(mockContext, '');
+      await exploreAction(mockContext, "");
 
-      const extensionsUrl = 'https://geminicli.com/extensions/';
+      const extensionsUrl = "https://geminicli.com/extensions/";
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
@@ -419,13 +396,13 @@ describe('extensionsCommand', () => {
       expect(open).toHaveBeenCalledWith(extensionsUrl);
     });
 
-    it('should only add an info message in a sandbox environment', async () => {
+    it("should only add an info message in a sandbox environment", async () => {
       // Simulate a sandbox environment
-      vi.stubEnv('NODE_ENV', '');
-      vi.stubEnv('SANDBOX', 'gemini-sandbox');
-      const extensionsUrl = 'https://geminicli.com/extensions/';
+      vi.stubEnv("NODE_ENV", "");
+      vi.stubEnv("SANDBOX", "gemini-sandbox");
+      const extensionsUrl = "https://geminicli.com/extensions/";
 
-      await exploreAction(mockContext, '');
+      await exploreAction(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
@@ -439,12 +416,12 @@ describe('extensionsCommand', () => {
       expect(open).not.toHaveBeenCalled();
     });
 
-    it('should add an info message and not call open in NODE_ENV test environment', async () => {
-      vi.stubEnv('NODE_ENV', 'test');
-      vi.stubEnv('SANDBOX', '');
-      const extensionsUrl = 'https://geminicli.com/extensions/';
+    it("should add an info message and not call open in NODE_ENV test environment", async () => {
+      vi.stubEnv("NODE_ENV", "test");
+      vi.stubEnv("SANDBOX", "");
+      const extensionsUrl = "https://geminicli.com/extensions/";
 
-      await exploreAction(mockContext, '');
+      await exploreAction(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
@@ -458,13 +435,13 @@ describe('extensionsCommand', () => {
       expect(open).not.toHaveBeenCalled();
     });
 
-    it('should handle errors when opening the browser', async () => {
-      vi.stubEnv('NODE_ENV', '');
-      const extensionsUrl = 'https://geminicli.com/extensions/';
-      const errorMessage = 'Failed to open browser';
+    it("should handle errors when opening the browser", async () => {
+      vi.stubEnv("NODE_ENV", "");
+      const extensionsUrl = "https://geminicli.com/extensions/";
+      const errorMessage = "Failed to open browser";
       vi.mocked(open).mockRejectedValue(new Error(errorMessage));
 
-      await exploreAction(mockContext, '');
+      await exploreAction(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
@@ -476,193 +453,161 @@ describe('extensionsCommand', () => {
     });
   });
 
-  describe('when enableExtensionReloading is true', () => {
-    it('should include enable and disable subcommands', () => {
+  describe("when enableExtensionReloading is true", () => {
+    it("should include enable and disable subcommands", () => {
       const command = extensionsCommand(true);
       const subCommandNames = command.subCommands?.map((cmd) => cmd.name);
-      expect(subCommandNames).toContain('enable');
-      expect(subCommandNames).toContain('disable');
+      expect(subCommandNames).toContain("enable");
+      expect(subCommandNames).toContain("disable");
     });
   });
 
-  describe('when enableExtensionReloading is false', () => {
-    it('should not include enable and disable subcommands', () => {
+  describe("when enableExtensionReloading is false", () => {
+    it("should not include enable and disable subcommands", () => {
       const command = extensionsCommand(false);
       const subCommandNames = command.subCommands?.map((cmd) => cmd.name);
-      expect(subCommandNames).not.toContain('enable');
-      expect(subCommandNames).not.toContain('disable');
+      expect(subCommandNames).not.toContain("enable");
+      expect(subCommandNames).not.toContain("disable");
     });
   });
 
-  describe('when enableExtensionReloading is not provided', () => {
-    it('should not include enable and disable subcommands by default', () => {
+  describe("when enableExtensionReloading is not provided", () => {
+    it("should not include enable and disable subcommands by default", () => {
       const command = extensionsCommand();
       const subCommandNames = command.subCommands?.map((cmd) => cmd.name);
-      expect(subCommandNames).not.toContain('enable');
-      expect(subCommandNames).not.toContain('disable');
+      expect(subCommandNames).not.toContain("enable");
+      expect(subCommandNames).not.toContain("disable");
     });
   });
 
-  describe('enable', () => {
-    let enableAction: SlashCommand['action'];
+  describe("enable", () => {
+    let enableAction: SlashCommand["action"];
 
     beforeEach(() => {
       enableAction = extensionsCommand(true).subCommands?.find(
-        (cmd) => cmd.name === 'enable',
+        (cmd) => cmd.name === "enable",
       )?.action;
 
       expect(enableAction).not.toBeNull();
 
-      mockContext.invocation!.name = 'enable';
+      mockContext.invocation!.name = "enable";
     });
 
-    it('should show usage if no extension name is provided', async () => {
-      await enableAction!(mockContext, '');
+    it("should show usage if no extension name is provided", async () => {
+      await enableAction!(mockContext, "");
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.ERROR,
-          text: 'Usage: /extensions enable <extension> [--scope=<user|workspace|session>]',
+          text: "Usage: /extensions enable <extension> [--scope=<user|workspace|session>]",
         },
         expect.any(Number),
       );
     });
 
-    it('should call enableExtension with the provided scope', async () => {
+    it("should call enableExtension with the provided scope", async () => {
       await enableAction!(mockContext, `${inactiveExt.name} --scope=user`);
-      expect(mockEnableExtension).toHaveBeenCalledWith(
-        inactiveExt.name,
-        SettingScope.User,
-      );
+      expect(mockEnableExtension).toHaveBeenCalledWith(inactiveExt.name, SettingScope.User);
 
       await enableAction!(mockContext, `${inactiveExt.name} --scope workspace`);
-      expect(mockEnableExtension).toHaveBeenCalledWith(
-        inactiveExt.name,
-        SettingScope.Workspace,
-      );
+      expect(mockEnableExtension).toHaveBeenCalledWith(inactiveExt.name, SettingScope.Workspace);
     });
 
-    it('should support --all', async () => {
+    it("should support --all", async () => {
       mockGetExtensions.mockReturnValue([
         inactiveExt,
-        { ...inactiveExt, name: 'another-inactive-ext' },
+        { ...inactiveExt, name: "another-inactive-ext" },
       ]);
-      await enableAction!(mockContext, '--all --scope session');
+      await enableAction!(mockContext, "--all --scope session");
+      expect(mockEnableExtension).toHaveBeenCalledWith(inactiveExt.name, SettingScope.Session);
       expect(mockEnableExtension).toHaveBeenCalledWith(
-        inactiveExt.name,
-        SettingScope.Session,
-      );
-      expect(mockEnableExtension).toHaveBeenCalledWith(
-        'another-inactive-ext',
+        "another-inactive-ext",
         SettingScope.Session,
       );
     });
   });
 
-  describe('disable', () => {
-    let disableAction: SlashCommand['action'];
+  describe("disable", () => {
+    let disableAction: SlashCommand["action"];
 
     beforeEach(() => {
       disableAction = extensionsCommand(true).subCommands?.find(
-        (cmd) => cmd.name === 'disable',
+        (cmd) => cmd.name === "disable",
       )?.action;
 
       expect(disableAction).not.toBeNull();
 
-      mockContext.invocation!.name = 'disable';
+      mockContext.invocation!.name = "disable";
     });
 
-    it('should show usage if no extension name is provided', async () => {
-      await disableAction!(mockContext, '');
+    it("should show usage if no extension name is provided", async () => {
+      await disableAction!(mockContext, "");
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.ERROR,
-          text: 'Usage: /extensions disable <extension> [--scope=<user|workspace|session>]',
+          text: "Usage: /extensions disable <extension> [--scope=<user|workspace|session>]",
         },
         expect.any(Number),
       );
     });
 
-    it('should call disableExtension with the provided scope', async () => {
+    it("should call disableExtension with the provided scope", async () => {
       await disableAction!(mockContext, `${activeExt.name} --scope=user`);
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        activeExt.name,
-        SettingScope.User,
-      );
+      expect(mockDisableExtension).toHaveBeenCalledWith(activeExt.name, SettingScope.User);
 
       await disableAction!(mockContext, `${activeExt.name} --scope workspace`);
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        activeExt.name,
-        SettingScope.Workspace,
-      );
+      expect(mockDisableExtension).toHaveBeenCalledWith(activeExt.name, SettingScope.Workspace);
     });
 
-    it('should support --all', async () => {
-      mockGetExtensions.mockReturnValue([
-        activeExt,
-        { ...activeExt, name: 'another-active-ext' },
-      ]);
-      await disableAction!(mockContext, '--all --scope session');
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        activeExt.name,
-        SettingScope.Session,
-      );
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        'another-active-ext',
-        SettingScope.Session,
-      );
+    it("should support --all", async () => {
+      mockGetExtensions.mockReturnValue([activeExt, { ...activeExt, name: "another-active-ext" }]);
+      await disableAction!(mockContext, "--all --scope session");
+      expect(mockDisableExtension).toHaveBeenCalledWith(activeExt.name, SettingScope.Session);
+      expect(mockDisableExtension).toHaveBeenCalledWith("another-active-ext", SettingScope.Session);
     });
   });
 
-  describe('restart', () => {
-    let restartAction: SlashCommand['action'];
-    let mockRestartExtension: MockedFunction<
-      typeof ExtensionLoader.prototype.restartExtension
-    >;
+  describe("restart", () => {
+    let restartAction: SlashCommand["action"];
+    let mockRestartExtension: MockedFunction<typeof ExtensionLoader.prototype.restartExtension>;
 
     beforeEach(() => {
-      restartAction = extensionsCommand().subCommands?.find(
-        (c) => c.name === 'restart',
-      )?.action;
+      restartAction = extensionsCommand().subCommands?.find((c) => c.name === "restart")?.action;
       expect(restartAction).not.toBeNull();
 
       mockRestartExtension = vi.fn();
-      mockContext.services.config!.getExtensionLoader = vi
-        .fn()
-        .mockImplementation(() => ({
-          getExtensions: mockGetExtensions,
-          restartExtension: mockRestartExtension,
-        }));
-      mockContext.invocation!.name = 'restart';
+      mockContext.services.config!.getExtensionLoader = vi.fn().mockImplementation(() => ({
+        getExtensions: mockGetExtensions,
+        restartExtension: mockRestartExtension,
+      }));
+      mockContext.invocation!.name = "restart";
     });
 
-    it('should show a message if no extensions are installed', async () => {
-      mockContext.services.config!.getExtensionLoader = vi
-        .fn()
-        .mockImplementation(() => ({
-          getExtensions: () => [],
-          restartExtension: mockRestartExtension,
-        }));
+    it("should show a message if no extensions are installed", async () => {
+      mockContext.services.config!.getExtensionLoader = vi.fn().mockImplementation(() => ({
+        getExtensions: () => [],
+        restartExtension: mockRestartExtension,
+      }));
 
-      await restartAction!(mockContext, '--all');
+      await restartAction!(mockContext, "--all");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'No extensions installed. Run `/extensions explore` to check out the gallery.',
+          text: "No extensions installed. Run `/extensions explore` to check out the gallery.",
         },
         expect.any(Number),
       );
     });
 
-    it('restarts all active extensions when --all is provided', async () => {
+    it("restarts all active extensions when --all is provided", async () => {
       const mockExtensions = [
-        { name: 'ext1', isActive: true },
-        { name: 'ext2', isActive: true },
-        { name: 'ext3', isActive: false },
+        { name: "ext1", isActive: true },
+        { name: "ext2", isActive: true },
+        { name: "ext3", isActive: false },
       ] as GeminiCLIExtension[];
       mockGetExtensions.mockReturnValue(mockExtensions);
 
-      await restartAction!(mockContext, '--all');
+      await restartAction!(mockContext, "--all");
 
       expect(mockRestartExtension).toHaveBeenCalledTimes(2);
       expect(mockRestartExtension).toHaveBeenCalledWith(mockExtensions[0]);
@@ -670,49 +615,49 @@ describe('extensionsCommand', () => {
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.INFO,
-          text: 'Restarting 2 extensions...',
+          text: "Restarting 2 extensions...",
         }),
         expect.any(Number),
       );
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.INFO,
-          text: '2 extensions restarted successfully.',
+          text: "2 extensions restarted successfully.",
         }),
         expect.any(Number),
       );
       expect(mockContext.ui.dispatchExtensionStateUpdate).toHaveBeenCalledWith({
-        type: 'RESTARTED',
-        payload: { name: 'ext1' },
+        type: "RESTARTED",
+        payload: { name: "ext1" },
       });
       expect(mockContext.ui.dispatchExtensionStateUpdate).toHaveBeenCalledWith({
-        type: 'RESTARTED',
-        payload: { name: 'ext2' },
+        type: "RESTARTED",
+        payload: { name: "ext2" },
       });
     });
 
-    it('restarts only specified active extensions', async () => {
+    it("restarts only specified active extensions", async () => {
       const mockExtensions = [
-        { name: 'ext1', isActive: false },
-        { name: 'ext2', isActive: true },
-        { name: 'ext3', isActive: true },
+        { name: "ext1", isActive: false },
+        { name: "ext2", isActive: true },
+        { name: "ext3", isActive: true },
       ] as GeminiCLIExtension[];
       mockGetExtensions.mockReturnValue(mockExtensions);
 
-      await restartAction!(mockContext, 'ext1 ext3');
+      await restartAction!(mockContext, "ext1 ext3");
 
       expect(mockRestartExtension).toHaveBeenCalledTimes(1);
       expect(mockRestartExtension).toHaveBeenCalledWith(mockExtensions[2]);
       expect(mockContext.ui.dispatchExtensionStateUpdate).toHaveBeenCalledWith({
-        type: 'RESTARTED',
-        payload: { name: 'ext3' },
+        type: "RESTARTED",
+        payload: { name: "ext3" },
       });
     });
 
-    it('shows an error if no extension loader is available', async () => {
+    it("shows an error if no extension loader is available", async () => {
       mockContext.services.config!.getExtensionLoader = vi.fn();
 
-      await restartAction!(mockContext, '--all');
+      await restartAction!(mockContext, "--all");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -724,85 +669,79 @@ describe('extensionsCommand', () => {
       expect(mockRestartExtension).not.toHaveBeenCalled();
     });
 
-    it('shows usage error for no arguments', async () => {
-      await restartAction!(mockContext, '');
+    it("shows usage error for no arguments", async () => {
+      await restartAction!(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.ERROR,
-          text: 'Usage: /extensions restart <extension-names>|--all',
+          text: "Usage: /extensions restart <extension-names>|--all",
         }),
         expect.any(Number),
       );
       expect(mockRestartExtension).not.toHaveBeenCalled();
     });
 
-    it('handles errors during extension restart', async () => {
-      const mockExtensions = [
-        { name: 'ext1', isActive: true },
-      ] as GeminiCLIExtension[];
+    it("handles errors during extension restart", async () => {
+      const mockExtensions = [{ name: "ext1", isActive: true }] as GeminiCLIExtension[];
       mockGetExtensions.mockReturnValue(mockExtensions);
-      mockRestartExtension.mockRejectedValue(new Error('Failed to restart'));
+      mockRestartExtension.mockRejectedValue(new Error("Failed to restart"));
 
-      await restartAction!(mockContext, '--all');
+      await restartAction!(mockContext, "--all");
 
       expect(mockRestartExtension).toHaveBeenCalledWith(mockExtensions[0]);
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.ERROR,
-          text: 'Failed to restart some extensions:\n  ext1: Failed to restart',
+          text: "Failed to restart some extensions:\n  ext1: Failed to restart",
         }),
         expect.any(Number),
       );
     });
 
-    it('shows a warning if an extension is not found', async () => {
-      const mockExtensions = [
-        { name: 'ext1', isActive: true },
-      ] as GeminiCLIExtension[];
+    it("shows a warning if an extension is not found", async () => {
+      const mockExtensions = [{ name: "ext1", isActive: true }] as GeminiCLIExtension[];
       mockGetExtensions.mockReturnValue(mockExtensions);
 
-      await restartAction!(mockContext, 'ext1 ext2');
+      await restartAction!(mockContext, "ext1 ext2");
 
       expect(mockRestartExtension).toHaveBeenCalledTimes(1);
       expect(mockRestartExtension).toHaveBeenCalledWith(mockExtensions[0]);
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.WARNING,
-          text: 'Extension(s) not found or not active: ext2',
+          text: "Extension(s) not found or not active: ext2",
         }),
         expect.any(Number),
       );
     });
 
-    it('does not restart any extensions if none are found', async () => {
-      const mockExtensions = [
-        { name: 'ext1', isActive: true },
-      ] as GeminiCLIExtension[];
+    it("does not restart any extensions if none are found", async () => {
+      const mockExtensions = [{ name: "ext1", isActive: true }] as GeminiCLIExtension[];
       mockGetExtensions.mockReturnValue(mockExtensions);
 
-      await restartAction!(mockContext, 'ext2 ext3');
+      await restartAction!(mockContext, "ext2 ext3");
 
       expect(mockRestartExtension).not.toHaveBeenCalled();
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.WARNING,
-          text: 'Extension(s) not found or not active: ext2, ext3',
+          text: "Extension(s) not found or not active: ext2, ext3",
         }),
         expect.any(Number),
       );
     });
 
-    it('should suggest only enabled extension names for the restart command', async () => {
-      mockContext.invocation!.name = 'restart';
+    it("should suggest only enabled extension names for the restart command", async () => {
+      mockContext.invocation!.name = "restart";
       const mockExtensions = [
-        { name: 'ext1', isActive: true },
-        { name: 'ext2', isActive: false },
+        { name: "ext1", isActive: true },
+        { name: "ext2", isActive: false },
       ] as GeminiCLIExtension[];
       mockGetExtensions.mockReturnValue(mockExtensions);
 
-      const suggestions = completeExtensions(mockContext, 'ext');
-      expect(suggestions).toEqual(['ext1']);
+      const suggestions = completeExtensions(mockContext, "ext");
+      expect(suggestions).toEqual(["ext1"]);
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/extensionsCommand.ts b/packages/ui-gemini/src/ui/commands/extensionsCommand.ts
index 4808a0896..a94d5a633 100644
--- a/packages/ui-gemini/src/ui/commands/extensionsCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/extensionsCommand.ts
@@ -4,35 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger, listExtensions } from '@airiscode/gemini-cli-core';
-import type { ExtensionUpdateInfo } from '../../config/extension.js';
-import { getErrorMessage } from '../../utils/errors.js';
+import process from "node:process";
+import { debugLogger, listExtensions } from "@airiscode/gemini-cli-core";
+import open from "open";
+import type { ExtensionUpdateInfo } from "../../config/extension.js";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { SettingScope } from "../../config/settings.js";
+import { getErrorMessage } from "../../utils/errors.js";
+import { theme } from "../semantic-colors.js";
 import {
   emptyIcon,
-  MessageType,
   type HistoryItemExtensionsList,
   type HistoryItemInfo,
-} from '../types.js';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import open from 'open';
-import process from 'node:process';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { SettingScope } from '../../config/settings.js';
-import { theme } from '../semantic-colors.js';
-
-function showMessageIfNoExtensions(
-  context: CommandContext,
-  extensions: unknown[],
-): boolean {
+  MessageType,
+} from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
+
+function showMessageIfNoExtensions(context: CommandContext, extensions: unknown[]): boolean {
   if (extensions.length === 0) {
     context.ui.addItem(
       {
         type: MessageType.INFO,
-        text: 'No extensions installed. Run `/extensions explore` to check out the gallery.',
+        text: "No extensions installed. Run `/extensions explore` to check out the gallery.",
       },
       Date.now(),
     );
@@ -42,9 +35,7 @@ function showMessageIfNoExtensions(
 }
 
 async function listAction(context: CommandContext) {
-  const extensions = context.services.config
-    ? listExtensions(context.services.config)
-    : [];
+  const extensions = context.services.config ? listExtensions(context.services.config) : [];
 
   if (showMessageIfNoExtensions(context, extensions)) {
     return;
@@ -59,15 +50,15 @@ async function listAction(context: CommandContext) {
 }
 
 function updateAction(context: CommandContext, args: string): Promise<void> {
-  const updateArgs = args.split(' ').filter((value) => value.length > 0);
-  const all = updateArgs.length === 1 && updateArgs[0] === '--all';
+  const updateArgs = args.split(" ").filter((value) => value.length > 0);
+  const all = updateArgs.length === 1 && updateArgs[0] === "--all";
   const names = all ? null : updateArgs;
 
   if (!all && names?.length === 0) {
     context.ui.addItem(
       {
         type: MessageType.ERROR,
-        text: 'Usage: /extensions update <extension-names>|--all',
+        text: "Usage: /extensions update <extension-names>|--all",
       },
       Date.now(),
     );
@@ -79,9 +70,7 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
     (resolve) => (resolveUpdateComplete = resolve),
   );
 
-  const extensions = context.services.config
-    ? listExtensions(context.services.config)
-    : [];
+  const extensions = context.services.config ? listExtensions(context.services.config) : [];
 
   if (showMessageIfNoExtensions(context, extensions)) {
     return Promise.resolve();
@@ -98,7 +87,7 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
       context.ui.addItem(
         {
           type: MessageType.INFO,
-          text: 'No extensions to update.',
+          text: "No extensions to update.",
         },
         Date.now(),
       );
@@ -112,7 +101,7 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
     context.ui.setPendingItem(historyItem);
 
     context.ui.dispatchExtensionStateUpdate({
-      type: 'SCHEDULE_UPDATE',
+      type: "SCHEDULE_UPDATE",
       payload: {
         all,
         names,
@@ -124,9 +113,7 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
     if (names?.length) {
       const extensions = listExtensions(context.services.config!);
       for (const name of names) {
-        const extension = extensions.find(
-          (extension) => extension.name === name,
-        );
+        const extension = extensions.find((extension) => extension.name === name);
         if (!extension) {
           context.ui.addItem(
             {
@@ -152,10 +139,7 @@ function updateAction(context: CommandContext, args: string): Promise<void> {
   return updateComplete.then((_) => {});
 }
 
-async function restartAction(
-  context: CommandContext,
-  args: string,
-): Promise<void> {
+async function restartAction(context: CommandContext, args: string): Promise<void> {
   const extensionLoader = context.services.config?.getExtensionLoader();
   if (!extensionLoader) {
     context.ui.addItem(
@@ -173,14 +157,14 @@ async function restartAction(
     return;
   }
 
-  const restartArgs = args.split(' ').filter((value) => value.length > 0);
-  const all = restartArgs.length === 1 && restartArgs[0] === '--all';
+  const restartArgs = args.split(" ").filter((value) => value.length > 0);
+  const all = restartArgs.length === 1 && restartArgs[0] === "--all";
   const names = all ? null : restartArgs;
   if (!all && names?.length === 0) {
     context.ui.addItem(
       {
         type: MessageType.ERROR,
-        text: 'Usage: /extensions restart <extension-names>|--all',
+        text: "Usage: /extensions restart <extension-names>|--all",
       },
       Date.now(),
     );
@@ -191,21 +175,16 @@ async function restartAction(
     .getExtensions()
     .filter((extension) => extension.isActive);
   if (names) {
-    extensionsToRestart = extensionsToRestart.filter((extension) =>
-      names.includes(extension.name),
-    );
+    extensionsToRestart = extensionsToRestart.filter((extension) => names.includes(extension.name));
     if (names.length !== extensionsToRestart.length) {
       const notFound = names.filter(
-        (name) =>
-          !extensionsToRestart.some((extension) => extension.name === name),
+        (name) => !extensionsToRestart.some((extension) => extension.name === name),
       );
       if (notFound.length > 0) {
         context.ui.addItem(
           {
             type: MessageType.WARNING,
-            text: `Extension(s) not found or not active: ${notFound.join(
-              ', ',
-            )}`,
+            text: `Extension(s) not found or not active: ${notFound.join(", ")}`,
           },
           Date.now(),
         );
@@ -217,7 +196,7 @@ async function restartAction(
     return;
   }
 
-  const s = extensionsToRestart.length > 1 ? 's' : '';
+  const s = extensionsToRestart.length > 1 ? "s" : "";
 
   const restartingMessage = {
     type: MessageType.INFO,
@@ -231,7 +210,7 @@ async function restartAction(
       if (extension.isActive) {
         await extensionLoader.restartExtension(extension);
         context.ui.dispatchExtensionStateUpdate({
-          type: 'RESTARTED',
+          type: "RESTARTED",
           payload: {
             name: extension.name,
           },
@@ -241,7 +220,7 @@ async function restartAction(
   );
 
   const failures = results.filter(
-    (result): result is PromiseRejectedResult => result.status === 'rejected',
+    (result): result is PromiseRejectedResult => result.status === "rejected",
   );
 
   if (failures.length > 0) {
@@ -250,7 +229,7 @@ async function restartAction(
         const extensionName = extensionsToRestart[index].name;
         return `${extensionName}: ${getErrorMessage(failure.reason)}`;
       })
-      .join('\n  ');
+      .join("\n  ");
     context.ui.addItem(
       {
         type: MessageType.ERROR,
@@ -270,10 +249,10 @@ async function restartAction(
 }
 
 async function exploreAction(context: CommandContext) {
-  const extensionsUrl = 'https://geminicli.com/extensions/';
+  const extensionsUrl = "https://geminicli.com/extensions/";
 
   // Only check for NODE_ENV for explicit test mode, not for unit test framework
-  if (process.env['NODE_ENV'] === 'test') {
+  if (process.env["NODE_ENV"] === "test") {
     context.ui.addItem(
       {
         type: MessageType.INFO,
@@ -281,10 +260,7 @@ async function exploreAction(context: CommandContext) {
       },
       Date.now(),
     );
-  } else if (
-    process.env['SANDBOX'] &&
-    process.env['SANDBOX'] !== 'sandbox-exec'
-  ) {
+  } else if (process.env["SANDBOX"] && process.env["SANDBOX"] !== "sandbox-exec") {
     context.ui.addItem(
       {
         type: MessageType.INFO,
@@ -324,18 +300,18 @@ function getEnableDisableContext(
 } | null {
   const extensionLoader = context.services.config?.getExtensionLoader();
   if (!(extensionLoader instanceof ExtensionManager)) {
-    debugLogger.error(
-      `Cannot ${context.invocation?.name} extensions in this environment`,
-    );
+    debugLogger.error(`Cannot ${context.invocation?.name} extensions in this environment`);
     return null;
   }
-  const parts = argumentsString.split(' ');
+  const parts = argumentsString.split(" ");
   const name = parts[0];
   if (
-    name === '' ||
+    name === "" ||
     !(
-      (parts.length === 2 && parts[1].startsWith('--scope=')) || // --scope=<scope>
-      (parts.length === 3 && parts[1] === '--scope') // --scope <scope>
+      (
+        (parts.length === 2 && parts[1].startsWith("--scope=")) || // --scope=<scope>
+        (parts.length === 3 && parts[1] === "--scope")
+      ) // --scope <scope>
     )
   ) {
     context.ui.addItem(
@@ -350,17 +326,17 @@ function getEnableDisableContext(
   let scope: SettingScope;
   // Transform `--scope=<scope>` to `--scope <scope>`.
   if (parts.length === 2) {
-    parts.push(...parts[1].split('='));
+    parts.push(...parts[1].split("="));
     parts.splice(1, 1);
   }
   switch (parts[2].toLowerCase()) {
-    case 'workspace':
+    case "workspace":
       scope = SettingScope.Workspace;
       break;
-    case 'user':
+    case "user":
       scope = SettingScope.User;
       break;
-    case 'session':
+    case "session":
       scope = SettingScope.Session;
       break;
     default:
@@ -375,12 +351,12 @@ function getEnableDisableContext(
       return null;
   }
   let names: string[] = [];
-  if (name === '--all') {
+  if (name === "--all") {
     let extensions = extensionLoader.getExtensions();
-    if (context.invocation?.name === 'enable') {
+    if (context.invocation?.name === "enable") {
       extensions = extensions.filter((ext) => !ext.isActive);
     }
-    if (context.invocation?.name === 'disable') {
+    if (context.invocation?.name === "disable") {
       extensions = extensions.filter((ext) => ext.isActive);
     }
     names = extensions.map((ext) => ext.name);
@@ -432,37 +408,26 @@ async function enableAction(context: CommandContext, args: string) {
 /**
  * Exported for testing.
  */
-export function completeExtensions(
-  context: CommandContext,
-  partialArg: string,
-) {
+export function completeExtensions(context: CommandContext, partialArg: string) {
   let extensions = context.services.config?.getExtensions() ?? [];
 
-  if (context.invocation?.name === 'enable') {
+  if (context.invocation?.name === "enable") {
     extensions = extensions.filter((ext) => !ext.isActive);
   }
-  if (
-    context.invocation?.name === 'disable' ||
-    context.invocation?.name === 'restart'
-  ) {
+  if (context.invocation?.name === "disable" || context.invocation?.name === "restart") {
     extensions = extensions.filter((ext) => ext.isActive);
   }
   const extensionNames = extensions.map((ext) => ext.name);
-  const suggestions = extensionNames.filter((name) =>
-    name.startsWith(partialArg),
-  );
+  const suggestions = extensionNames.filter((name) => name.startsWith(partialArg));
 
-  if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) {
-    suggestions.unshift('--all');
+  if ("--all".startsWith(partialArg) || "all".startsWith(partialArg)) {
+    suggestions.unshift("--all");
   }
 
   return suggestions;
 }
 
-export function completeExtensionsAndScopes(
-  context: CommandContext,
-  partialArg: string,
-) {
+export function completeExtensionsAndScopes(context: CommandContext, partialArg: string) {
   return completeExtensions(context, partialArg).flatMap((s) => [
     `${s} --scope user`,
     `${s} --scope workspace`,
@@ -471,16 +436,16 @@ export function completeExtensionsAndScopes(
 }
 
 const listExtensionsCommand: SlashCommand = {
-  name: 'list',
-  description: 'List active extensions',
+  name: "list",
+  description: "List active extensions",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: listAction,
 };
 
 const updateExtensionsCommand: SlashCommand = {
-  name: 'update',
-  description: 'Update extensions. Usage: update <extension-names>|--all',
+  name: "update",
+  description: "Update extensions. Usage: update <extension-names>|--all",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: updateAction,
@@ -488,8 +453,8 @@ const updateExtensionsCommand: SlashCommand = {
 };
 
 const disableCommand: SlashCommand = {
-  name: 'disable',
-  description: 'Disable an extension',
+  name: "disable",
+  description: "Disable an extension",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: disableAction,
@@ -497,8 +462,8 @@ const disableCommand: SlashCommand = {
 };
 
 const enableCommand: SlashCommand = {
-  name: 'enable',
-  description: 'Enable an extension',
+  name: "enable",
+  description: "Enable an extension",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: enableAction,
@@ -506,31 +471,27 @@ const enableCommand: SlashCommand = {
 };
 
 const exploreExtensionsCommand: SlashCommand = {
-  name: 'explore',
-  description: 'Open extensions page in your browser',
+  name: "explore",
+  description: "Open extensions page in your browser",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: exploreAction,
 };
 
 const restartCommand: SlashCommand = {
-  name: 'restart',
-  description: 'Restart all extensions',
+  name: "restart",
+  description: "Restart all extensions",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: restartAction,
   completion: completeExtensions,
 };
 
-export function extensionsCommand(
-  enableExtensionReloading?: boolean,
-): SlashCommand {
-  const conditionalCommands = enableExtensionReloading
-    ? [disableCommand, enableCommand]
-    : [];
+export function extensionsCommand(enableExtensionReloading?: boolean): SlashCommand {
+  const conditionalCommands = enableExtensionReloading ? [disableCommand, enableCommand] : [];
   return {
-    name: 'extensions',
-    description: 'Manage extensions',
+    name: "extensions",
+    description: "Manage extensions",
     kind: CommandKind.BUILT_IN,
     autoExecute: false,
     subCommands: [
diff --git a/packages/ui-gemini/src/ui/commands/helpCommand.test.ts b/packages/ui-gemini/src/ui/commands/helpCommand.test.ts
index 9eff142ba..473eaa352 100644
--- a/packages/ui-gemini/src/ui/commands/helpCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/helpCommand.test.ts
@@ -4,14 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { helpCommand } from './helpCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
-import { CommandKind } from './types.js';
-
-describe('helpCommand', () => {
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { helpCommand } from "./helpCommand.js";
+import { type CommandContext, CommandKind } from "./types.js";
+
+describe("helpCommand", () => {
   let mockContext: CommandContext;
   const originalEnv = { ...process.env };
 
@@ -28,12 +27,12 @@ describe('helpCommand', () => {
     vi.clearAllMocks();
   });
 
-  it('should add a help message to the UI history', async () => {
+  it("should add a help message to the UI history", async () => {
     if (!helpCommand.action) {
-      throw new Error('Help command has no action');
+      throw new Error("Help command has no action");
     }
 
-    await helpCommand.action(mockContext, '');
+    await helpCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -44,9 +43,9 @@ describe('helpCommand', () => {
     );
   });
 
-  it('should have the correct command properties', () => {
-    expect(helpCommand.name).toBe('help');
+  it("should have the correct command properties", () => {
+    expect(helpCommand.name).toBe("help");
     expect(helpCommand.kind).toBe(CommandKind.BUILT_IN);
-    expect(helpCommand.description).toBe('For help on gemini-cli');
+    expect(helpCommand.description).toBe("For help on gemini-cli");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/helpCommand.ts b/packages/ui-gemini/src/ui/commands/helpCommand.ts
index f7d469a7e..915a4d1c0 100644
--- a/packages/ui-gemini/src/ui/commands/helpCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/helpCommand.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType, type HistoryItemHelp } from '../types.js';
+import { type HistoryItemHelp, MessageType } from "../types.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const helpCommand: SlashCommand = {
-  name: 'help',
-  altNames: ['?'],
+  name: "help",
+  altNames: ["?"],
   kind: CommandKind.BUILT_IN,
-  description: 'For help on gemini-cli',
+  description: "For help on gemini-cli",
   autoExecute: true,
   action: async (context) => {
-    const helpItem: Omit<HistoryItemHelp, 'id'> = {
+    const helpItem: Omit<HistoryItemHelp, "id"> = {
       type: MessageType.HELP,
       timestamp: new Date(),
     };
diff --git a/packages/ui-gemini/src/ui/commands/hooksCommand.test.ts b/packages/ui-gemini/src/ui/commands/hooksCommand.test.ts
index eb9a637f8..2e3bcf699 100644
--- a/packages/ui-gemini/src/ui/commands/hooksCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/hooksCommand.test.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { hooksCommand } from './hooksCommand.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
-import type { HookRegistryEntry } from '@airiscode/gemini-cli-core';
-import { HookType, HookEventName, ConfigSource } from '@airiscode/gemini-cli-core';
-import type { CommandContext } from './types.js';
-
-describe('hooksCommand', () => {
+import type { HookRegistryEntry } from "@airiscode/gemini-cli-core";
+import { ConfigSource, HookEventName, HookType } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { hooksCommand } from "./hooksCommand.js";
+import type { CommandContext } from "./types.js";
+
+describe("hooksCommand", () => {
   let mockContext: CommandContext;
   let mockHookSystem: {
     getAllHooks: ReturnType<typeof vi.fn>;
@@ -71,32 +71,32 @@ describe('hooksCommand', () => {
     vi.restoreAllMocks();
   });
 
-  describe('root command', () => {
-    it('should have the correct name and description', () => {
-      expect(hooksCommand.name).toBe('hooks');
-      expect(hooksCommand.description).toBe('Manage hooks');
+  describe("root command", () => {
+    it("should have the correct name and description", () => {
+      expect(hooksCommand.name).toBe("hooks");
+      expect(hooksCommand.description).toBe("Manage hooks");
     });
 
-    it('should have all expected subcommands', () => {
+    it("should have all expected subcommands", () => {
       expect(hooksCommand.subCommands).toBeDefined();
       expect(hooksCommand.subCommands).toHaveLength(3);
 
       const subCommandNames = hooksCommand.subCommands!.map((cmd) => cmd.name);
-      expect(subCommandNames).toContain('panel');
-      expect(subCommandNames).toContain('enable');
-      expect(subCommandNames).toContain('disable');
+      expect(subCommandNames).toContain("panel");
+      expect(subCommandNames).toContain("enable");
+      expect(subCommandNames).toContain("disable");
     });
 
-    it('should delegate to panel action when invoked without subcommand', async () => {
+    it("should delegate to panel action when invoked without subcommand", async () => {
       if (!hooksCommand.action) {
-        throw new Error('hooks command must have an action');
+        throw new Error("hooks command must have an action");
       }
 
       mockHookSystem.getAllHooks.mockReturnValue([
-        createMockHook('test-hook', HookEventName.BeforeTool, true),
+        createMockHook("test-hook", HookEventName.BeforeTool, true),
       ]);
 
-      await hooksCommand.action(mockContext, '');
+      await hooksCommand.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -107,86 +107,76 @@ describe('hooksCommand', () => {
     });
   });
 
-  describe('panel subcommand', () => {
-    it('should return error when config is not loaded', async () => {
+  describe("panel subcommand", () => {
+    it("should return error when config is not loaded", async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
           config: null,
         },
       });
 
-      const panelCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'panel',
-      );
+      const panelCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "panel");
       if (!panelCmd?.action) {
-        throw new Error('panel command must have an action');
+        throw new Error("panel command must have an action");
       }
 
-      const result = await panelCmd.action(contextWithoutConfig, '');
+      const result = await panelCmd.action(contextWithoutConfig, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded.",
       });
     });
 
-    it('should return info message when hook system is not enabled', async () => {
+    it("should return info message when hook system is not enabled", async () => {
       mockConfig.getHookSystem.mockReturnValue(null);
 
-      const panelCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'panel',
-      );
+      const panelCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "panel");
       if (!panelCmd?.action) {
-        throw new Error('panel command must have an action');
+        throw new Error("panel command must have an action");
       }
 
-      const result = await panelCmd.action(mockContext, '');
+      const result = await panelCmd.action(mockContext, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content:
-          'Hook system is not enabled. Enable it in settings with tools.enableHooks',
+        type: "message",
+        messageType: "info",
+        content: "Hook system is not enabled. Enable it in settings with tools.enableHooks",
       });
     });
 
-    it('should return info message when no hooks are configured', async () => {
+    it("should return info message when no hooks are configured", async () => {
       mockHookSystem.getAllHooks.mockReturnValue([]);
 
-      const panelCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'panel',
-      );
+      const panelCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "panel");
       if (!panelCmd?.action) {
-        throw new Error('panel command must have an action');
+        throw new Error("panel command must have an action");
       }
 
-      const result = await panelCmd.action(mockContext, '');
+      const result = await panelCmd.action(mockContext, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content:
-          'No hooks configured. Add hooks to your settings to get started.',
+        type: "message",
+        messageType: "info",
+        content: "No hooks configured. Add hooks to your settings to get started.",
       });
     });
 
-    it('should display hooks list when hooks are configured', async () => {
+    it("should display hooks list when hooks are configured", async () => {
       const mockHooks: HookRegistryEntry[] = [
-        createMockHook('echo-test', HookEventName.BeforeTool, true),
-        createMockHook('notify', HookEventName.AfterAgent, false),
+        createMockHook("echo-test", HookEventName.BeforeTool, true),
+        createMockHook("notify", HookEventName.AfterAgent, false),
       ];
 
       mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
 
-      const panelCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'panel',
-      );
+      const panelCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "panel");
       if (!panelCmd?.action) {
-        throw new Error('panel command must have an action');
+        throw new Error("panel command must have an action");
       }
 
-      await panelCmd.action(mockContext, '');
+      await panelCmd.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -198,350 +188,312 @@ describe('hooksCommand', () => {
     });
   });
 
-  describe('enable subcommand', () => {
-    it('should return error when config is not loaded', async () => {
+  describe("enable subcommand", () => {
+    it("should return error when config is not loaded", async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
           config: null,
         },
       });
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.action) {
-        throw new Error('enable command must have an action');
+        throw new Error("enable command must have an action");
       }
 
-      const result = await enableCmd.action(contextWithoutConfig, 'test-hook');
+      const result = await enableCmd.action(contextWithoutConfig, "test-hook");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded.",
       });
     });
 
-    it('should return error when hook system is not enabled', async () => {
+    it("should return error when hook system is not enabled", async () => {
       mockConfig.getHookSystem.mockReturnValue(null);
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.action) {
-        throw new Error('enable command must have an action');
+        throw new Error("enable command must have an action");
       }
 
-      const result = await enableCmd.action(mockContext, 'test-hook');
+      const result = await enableCmd.action(mockContext, "test-hook");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Hook system is not enabled.',
+        type: "message",
+        messageType: "error",
+        content: "Hook system is not enabled.",
       });
     });
 
-    it('should return error when hook name is not provided', async () => {
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+    it("should return error when hook name is not provided", async () => {
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.action) {
-        throw new Error('enable command must have an action');
+        throw new Error("enable command must have an action");
       }
 
-      const result = await enableCmd.action(mockContext, '');
+      const result = await enableCmd.action(mockContext, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Usage: /hooks enable <hook-name>',
+        type: "message",
+        messageType: "error",
+        content: "Usage: /hooks enable <hook-name>",
       });
     });
 
-    it('should enable a hook and update settings', async () => {
+    it("should enable a hook and update settings", async () => {
       // Update the context's settings with disabled hooks
       mockContext.services.settings.merged.hooks = {
-        disabled: ['test-hook', 'other-hook'],
+        disabled: ["test-hook", "other-hook"],
       };
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.action) {
-        throw new Error('enable command must have an action');
+        throw new Error("enable command must have an action");
       }
 
-      const result = await enableCmd.action(mockContext, 'test-hook');
+      const result = await enableCmd.action(mockContext, "test-hook");
 
       expect(mockContext.services.settings.setValue).toHaveBeenCalledWith(
         expect.any(String),
-        'hooks.disabled',
-        ['other-hook'],
-      );
-      expect(mockHookSystem.setHookEnabled).toHaveBeenCalledWith(
-        'test-hook',
-        true,
+        "hooks.disabled",
+        ["other-hook"],
       );
+      expect(mockHookSystem.setHookEnabled).toHaveBeenCalledWith("test-hook", true);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: 'Hook "test-hook" enabled successfully.',
       });
     });
 
-    it('should handle error when enabling hook fails', async () => {
+    it("should handle error when enabling hook fails", async () => {
       mockSettings.setValue.mockImplementationOnce(() => {
-        throw new Error('Failed to save settings');
+        throw new Error("Failed to save settings");
       });
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.action) {
-        throw new Error('enable command must have an action');
+        throw new Error("enable command must have an action");
       }
 
-      const result = await enableCmd.action(mockContext, 'test-hook');
+      const result = await enableCmd.action(mockContext, "test-hook");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Failed to enable hook: Failed to save settings',
+        type: "message",
+        messageType: "error",
+        content: "Failed to enable hook: Failed to save settings",
       });
     });
   });
 
-  describe('disable subcommand', () => {
-    it('should return error when config is not loaded', async () => {
+  describe("disable subcommand", () => {
+    it("should return error when config is not loaded", async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
           config: null,
         },
       });
 
-      const disableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'disable',
-      );
+      const disableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "disable");
       if (!disableCmd?.action) {
-        throw new Error('disable command must have an action');
+        throw new Error("disable command must have an action");
       }
 
-      const result = await disableCmd.action(contextWithoutConfig, 'test-hook');
+      const result = await disableCmd.action(contextWithoutConfig, "test-hook");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded.",
       });
     });
 
-    it('should return error when hook system is not enabled', async () => {
+    it("should return error when hook system is not enabled", async () => {
       mockConfig.getHookSystem.mockReturnValue(null);
 
-      const disableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'disable',
-      );
+      const disableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "disable");
       if (!disableCmd?.action) {
-        throw new Error('disable command must have an action');
+        throw new Error("disable command must have an action");
       }
 
-      const result = await disableCmd.action(mockContext, 'test-hook');
+      const result = await disableCmd.action(mockContext, "test-hook");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Hook system is not enabled.',
+        type: "message",
+        messageType: "error",
+        content: "Hook system is not enabled.",
       });
     });
 
-    it('should return error when hook name is not provided', async () => {
-      const disableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'disable',
-      );
+    it("should return error when hook name is not provided", async () => {
+      const disableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "disable");
       if (!disableCmd?.action) {
-        throw new Error('disable command must have an action');
+        throw new Error("disable command must have an action");
       }
 
-      const result = await disableCmd.action(mockContext, '');
+      const result = await disableCmd.action(mockContext, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Usage: /hooks disable <hook-name>',
+        type: "message",
+        messageType: "error",
+        content: "Usage: /hooks disable <hook-name>",
       });
     });
 
-    it('should disable a hook and update settings', async () => {
+    it("should disable a hook and update settings", async () => {
       mockContext.services.settings.merged.hooks = {
         disabled: [],
       };
 
-      const disableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'disable',
-      );
+      const disableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "disable");
       if (!disableCmd?.action) {
-        throw new Error('disable command must have an action');
+        throw new Error("disable command must have an action");
       }
 
-      const result = await disableCmd.action(mockContext, 'test-hook');
+      const result = await disableCmd.action(mockContext, "test-hook");
 
       expect(mockContext.services.settings.setValue).toHaveBeenCalledWith(
         expect.any(String),
-        'hooks.disabled',
-        ['test-hook'],
-      );
-      expect(mockHookSystem.setHookEnabled).toHaveBeenCalledWith(
-        'test-hook',
-        false,
+        "hooks.disabled",
+        ["test-hook"],
       );
+      expect(mockHookSystem.setHookEnabled).toHaveBeenCalledWith("test-hook", false);
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: 'Hook "test-hook" disabled successfully.',
       });
     });
 
-    it('should return info when hook is already disabled', async () => {
+    it("should return info when hook is already disabled", async () => {
       // Update the context's settings with the hook already disabled
       mockContext.services.settings.merged.hooks = {
-        disabled: ['test-hook'],
+        disabled: ["test-hook"],
       };
 
-      const disableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'disable',
-      );
+      const disableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "disable");
       if (!disableCmd?.action) {
-        throw new Error('disable command must have an action');
+        throw new Error("disable command must have an action");
       }
 
-      const result = await disableCmd.action(mockContext, 'test-hook');
+      const result = await disableCmd.action(mockContext, "test-hook");
 
       expect(mockContext.services.settings.setValue).not.toHaveBeenCalled();
       expect(mockHookSystem.setHookEnabled).not.toHaveBeenCalled();
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: 'Hook "test-hook" is already disabled.',
       });
     });
 
-    it('should handle error when disabling hook fails', async () => {
+    it("should handle error when disabling hook fails", async () => {
       mockContext.services.settings.merged.hooks = {
         disabled: [],
       };
       mockSettings.setValue.mockImplementationOnce(() => {
-        throw new Error('Failed to save settings');
+        throw new Error("Failed to save settings");
       });
 
-      const disableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'disable',
-      );
+      const disableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "disable");
       if (!disableCmd?.action) {
-        throw new Error('disable command must have an action');
+        throw new Error("disable command must have an action");
       }
 
-      const result = await disableCmd.action(mockContext, 'test-hook');
+      const result = await disableCmd.action(mockContext, "test-hook");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Failed to disable hook: Failed to save settings',
+        type: "message",
+        messageType: "error",
+        content: "Failed to disable hook: Failed to save settings",
       });
     });
   });
 
-  describe('completion', () => {
-    it('should return empty array when config is not available', () => {
+  describe("completion", () => {
+    it("should return empty array when config is not available", () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
           config: null,
         },
       });
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.completion) {
-        throw new Error('enable command must have completion');
+        throw new Error("enable command must have completion");
       }
 
-      const result = enableCmd.completion(contextWithoutConfig, 'test');
+      const result = enableCmd.completion(contextWithoutConfig, "test");
       expect(result).toEqual([]);
     });
 
-    it('should return empty array when hook system is not enabled', () => {
+    it("should return empty array when hook system is not enabled", () => {
       mockConfig.getHookSystem.mockReturnValue(null);
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.completion) {
-        throw new Error('enable command must have completion');
+        throw new Error("enable command must have completion");
       }
 
-      const result = enableCmd.completion(mockContext, 'test');
+      const result = enableCmd.completion(mockContext, "test");
       expect(result).toEqual([]);
     });
 
-    it('should return matching hook names', () => {
+    it("should return matching hook names", () => {
       const mockHooks: HookRegistryEntry[] = [
-        createMockHook('test-hook-1', HookEventName.BeforeTool, true),
-        createMockHook('test-hook-2', HookEventName.AfterTool, true),
-        createMockHook('other-hook', HookEventName.AfterAgent, false),
+        createMockHook("test-hook-1", HookEventName.BeforeTool, true),
+        createMockHook("test-hook-2", HookEventName.AfterTool, true),
+        createMockHook("other-hook", HookEventName.AfterAgent, false),
       ];
 
       mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.completion) {
-        throw new Error('enable command must have completion');
+        throw new Error("enable command must have completion");
       }
 
-      const result = enableCmd.completion(mockContext, 'test');
-      expect(result).toEqual(['test-hook-1', 'test-hook-2']);
+      const result = enableCmd.completion(mockContext, "test");
+      expect(result).toEqual(["test-hook-1", "test-hook-2"]);
     });
 
-    it('should return all hook names when partial is empty', () => {
+    it("should return all hook names when partial is empty", () => {
       const mockHooks: HookRegistryEntry[] = [
-        createMockHook('hook-1', HookEventName.BeforeTool, true),
-        createMockHook('hook-2', HookEventName.AfterTool, true),
+        createMockHook("hook-1", HookEventName.BeforeTool, true),
+        createMockHook("hook-2", HookEventName.AfterTool, true),
       ];
 
       mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.completion) {
-        throw new Error('enable command must have completion');
+        throw new Error("enable command must have completion");
       }
 
-      const result = enableCmd.completion(mockContext, '');
-      expect(result).toEqual(['hook-1', 'hook-2']);
+      const result = enableCmd.completion(mockContext, "");
+      expect(result).toEqual(["hook-1", "hook-2"]);
     });
 
-    it('should handle hooks without command name gracefully', () => {
+    it("should handle hooks without command name gracefully", () => {
       const mockHooks: HookRegistryEntry[] = [
-        createMockHook('test-hook', HookEventName.BeforeTool, true),
+        createMockHook("test-hook", HookEventName.BeforeTool, true),
         {
-          ...createMockHook('', HookEventName.AfterTool, true),
-          config: { command: '', type: HookType.Command, timeout: 30 },
+          ...createMockHook("", HookEventName.AfterTool, true),
+          config: { command: "", type: HookType.Command, timeout: 30 },
         },
       ];
 
       mockHookSystem.getAllHooks.mockReturnValue(mockHooks);
 
-      const enableCmd = hooksCommand.subCommands!.find(
-        (cmd) => cmd.name === 'enable',
-      );
+      const enableCmd = hooksCommand.subCommands!.find((cmd) => cmd.name === "enable");
       if (!enableCmd?.completion) {
-        throw new Error('enable command must have completion');
+        throw new Error("enable command must have completion");
       }
 
-      const result = enableCmd.completion(mockContext, 'test');
-      expect(result).toEqual(['test-hook']);
+      const result = enableCmd.completion(mockContext, "test");
+      expect(result).toEqual(["test-hook"]);
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/hooksCommand.ts b/packages/ui-gemini/src/ui/commands/hooksCommand.ts
index c3860e828..cb9a0afc0 100644
--- a/packages/ui-gemini/src/ui/commands/hooksCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/hooksCommand.ts
@@ -4,48 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand, CommandContext } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType, type HistoryItemHooksList } from '../types.js';
-import type {
-  HookRegistryEntry,
-  MessageActionReturn,
-} from '@airiscode/gemini-cli-core';
-import { getErrorMessage } from '@airiscode/gemini-cli-core';
-import { SettingScope } from '../../config/settings.js';
+import type { HookRegistryEntry, MessageActionReturn } from "@airiscode/gemini-cli-core";
+import { getErrorMessage } from "@airiscode/gemini-cli-core";
+import { SettingScope } from "../../config/settings.js";
+import { type HistoryItemHooksList, MessageType } from "../types.js";
+import type { CommandContext, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 /**
  * Display a formatted list of hooks with their status
  */
-async function panelAction(
-  context: CommandContext,
-): Promise<void | MessageActionReturn> {
+async function panelAction(context: CommandContext): Promise<void | MessageActionReturn> {
   const { config } = context.services;
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Config not loaded.',
+      type: "message",
+      messageType: "error",
+      content: "Config not loaded.",
     };
   }
 
   const hookSystem = config.getHookSystem();
   if (!hookSystem) {
     return {
-      type: 'message',
-      messageType: 'info',
-      content:
-        'Hook system is not enabled. Enable it in settings with tools.enableHooks',
+      type: "message",
+      messageType: "info",
+      content: "Hook system is not enabled. Enable it in settings with tools.enableHooks",
     };
   }
 
   const allHooks = hookSystem.getAllHooks();
   if (allHooks.length === 0) {
     return {
-      type: 'message',
-      messageType: 'info',
-      content:
-        'No hooks configured. Add hooks to your settings to get started.',
+      type: "message",
+      messageType: "info",
+      content: "No hooks configured. Add hooks to your settings to get started.",
     };
   }
 
@@ -67,27 +60,27 @@ async function enableAction(
   const { config } = context.services;
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Config not loaded.',
+      type: "message",
+      messageType: "error",
+      content: "Config not loaded.",
     };
   }
 
   const hookSystem = config.getHookSystem();
   if (!hookSystem) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Hook system is not enabled.',
+      type: "message",
+      messageType: "error",
+      content: "Hook system is not enabled.",
     };
   }
 
   const hookName = args.trim();
   if (!hookName) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Usage: /hooks enable <hook-name>',
+      type: "message",
+      messageType: "error",
+      content: "Usage: /hooks enable <hook-name>",
     };
   }
 
@@ -96,26 +89,24 @@ async function enableAction(
   const disabledHooks = settings.merged.hooks?.disabled || ([] as string[]);
 
   // Remove from disabled list if present
-  const newDisabledHooks = disabledHooks.filter(
-    (name: string) => name !== hookName,
-  );
+  const newDisabledHooks = disabledHooks.filter((name: string) => name !== hookName);
 
   // Update settings (setValue automatically saves)
   try {
-    settings.setValue(SettingScope.User, 'hooks.disabled', newDisabledHooks);
+    settings.setValue(SettingScope.User, "hooks.disabled", newDisabledHooks);
 
     // Enable in hook system
     hookSystem.setHookEnabled(hookName, true);
 
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: `Hook "${hookName}" enabled successfully.`,
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Failed to enable hook: ${getErrorMessage(error)}`,
     };
   }
@@ -131,27 +122,27 @@ async function disableAction(
   const { config } = context.services;
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Config not loaded.',
+      type: "message",
+      messageType: "error",
+      content: "Config not loaded.",
     };
   }
 
   const hookSystem = config.getHookSystem();
   if (!hookSystem) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Hook system is not enabled.',
+      type: "message",
+      messageType: "error",
+      content: "Hook system is not enabled.",
     };
   }
 
   const hookName = args.trim();
   if (!hookName) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Usage: /hooks disable <hook-name>',
+      type: "message",
+      messageType: "error",
+      content: "Usage: /hooks disable <hook-name>",
     };
   }
 
@@ -165,27 +156,27 @@ async function disableAction(
 
     // Update settings (setValue automatically saves)
     try {
-      settings.setValue(SettingScope.User, 'hooks.disabled', newDisabledHooks);
+      settings.setValue(SettingScope.User, "hooks.disabled", newDisabledHooks);
 
       // Disable in hook system
       hookSystem.setHookEnabled(hookName, false);
 
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Hook "${hookName}" disabled successfully.`,
       };
     } catch (error) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Failed to disable hook: ${getErrorMessage(error)}`,
       };
     }
   } else {
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: `Hook "${hookName}" is already disabled.`,
     };
   }
@@ -194,10 +185,7 @@ async function disableAction(
 /**
  * Completion function for hook names
  */
-function completeHookNames(
-  context: CommandContext,
-  partialArg: string,
-): string[] {
+function completeHookNames(context: CommandContext, partialArg: string): string[] {
   const { config } = context.services;
   if (!config) return [];
 
@@ -213,20 +201,20 @@ function completeHookNames(
  * Get a display name for a hook
  */
 function getHookDisplayName(hook: HookRegistryEntry): string {
-  return hook.config.command || 'unknown-hook';
+  return hook.config.command || "unknown-hook";
 }
 
 const panelCommand: SlashCommand = {
-  name: 'panel',
-  altNames: ['list', 'show'],
-  description: 'Display all registered hooks with their status',
+  name: "panel",
+  altNames: ["list", "show"],
+  description: "Display all registered hooks with their status",
   kind: CommandKind.BUILT_IN,
   action: panelAction,
 };
 
 const enableCommand: SlashCommand = {
-  name: 'enable',
-  description: 'Enable a hook by name',
+  name: "enable",
+  description: "Enable a hook by name",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: enableAction,
@@ -234,8 +222,8 @@ const enableCommand: SlashCommand = {
 };
 
 const disableCommand: SlashCommand = {
-  name: 'disable',
-  description: 'Disable a hook by name',
+  name: "disable",
+  description: "Disable a hook by name",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: disableAction,
@@ -243,9 +231,9 @@ const disableCommand: SlashCommand = {
 };
 
 export const hooksCommand: SlashCommand = {
-  name: 'hooks',
-  description: 'Manage hooks',
+  name: "hooks",
+  description: "Manage hooks",
   kind: CommandKind.BUILT_IN,
   subCommands: [panelCommand, enableCommand, disableCommand],
-  action: async (context: CommandContext) => panelCommand.action!(context, ''),
+  action: async (context: CommandContext) => panelCommand.action!(context, ""),
 };
diff --git a/packages/ui-gemini/src/ui/commands/ideCommand.test.ts b/packages/ui-gemini/src/ui/commands/ideCommand.test.ts
index 2e1c79dcb..d387a5118 100644
--- a/packages/ui-gemini/src/ui/commands/ideCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/ideCommand.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MockInstance } from 'vitest';
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { ideCommand } from './ideCommand.js';
-import { type CommandContext } from './types.js';
-import { IDE_DEFINITIONS } from '@airiscode/gemini-cli-core';
-import * as core from '@airiscode/gemini-cli-core';
+import * as core from "@airiscode/gemini-cli-core";
+import { IDE_DEFINITIONS } from "@airiscode/gemini-cli-core";
+import type { MockInstance } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ideCommand } from "./ideCommand.js";
+import { type CommandContext } from "./types.js";
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
   const original = await importOriginal<typeof core>();
   return {
     ...original,
@@ -23,7 +23,7 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-describe('ideCommand', () => {
+describe("ideCommand", () => {
   let mockContext: CommandContext;
   let mockIdeClient: core.IdeClient;
   let platformSpy: MockInstance;
@@ -41,9 +41,7 @@ describe('ideCommand', () => {
     } as unknown as core.IdeClient;
 
     vi.mocked(core.IdeClient.getInstance).mockResolvedValue(mockIdeClient);
-    vi.mocked(mockIdeClient.getDetectedIdeDisplayName).mockReturnValue(
-      'VS Code',
-    );
+    vi.mocked(mockIdeClient.getDetectedIdeDisplayName).mockReturnValue("VS Code");
 
     mockContext = {
       ui: {
@@ -61,136 +59,132 @@ describe('ideCommand', () => {
       },
     } as unknown as CommandContext;
 
-    platformSpy = vi.spyOn(process, 'platform', 'get');
+    platformSpy = vi.spyOn(process, "platform", "get");
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('should return the ide command', async () => {
-    vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(
-      IDE_DEFINITIONS.vscode,
-    );
+  it("should return the ide command", async () => {
+    vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(IDE_DEFINITIONS.vscode);
     vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
       status: core.IDEConnectionStatus.Disconnected,
     });
     const command = await ideCommand();
     expect(command).not.toBeNull();
-    expect(command.name).toBe('ide');
+    expect(command.name).toBe("ide");
     expect(command.subCommands).toHaveLength(3);
-    expect(command.subCommands?.[0].name).toBe('enable');
-    expect(command.subCommands?.[1].name).toBe('status');
-    expect(command.subCommands?.[2].name).toBe('install');
+    expect(command.subCommands?.[0].name).toBe("enable");
+    expect(command.subCommands?.[1].name).toBe("status");
+    expect(command.subCommands?.[2].name).toBe("install");
   });
 
-  it('should show disable command when connected', async () => {
-    vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(
-      IDE_DEFINITIONS.vscode,
-    );
+  it("should show disable command when connected", async () => {
+    vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(IDE_DEFINITIONS.vscode);
     vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
       status: core.IDEConnectionStatus.Connected,
     });
     const command = await ideCommand();
     expect(command).not.toBeNull();
     const subCommandNames = command.subCommands?.map((cmd) => cmd.name);
-    expect(subCommandNames).toContain('disable');
-    expect(subCommandNames).not.toContain('enable');
+    expect(subCommandNames).toContain("disable");
+    expect(subCommandNames).not.toContain("enable");
   });
 
-  describe('status subcommand', () => {
+  describe("status subcommand", () => {
     beforeEach(() => {
-      vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(
-        IDE_DEFINITIONS.vscode,
-      );
+      vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(IDE_DEFINITIONS.vscode);
     });
 
-    it('should show connected status', async () => {
+    it("should show connected status", async () => {
       vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
         status: core.IDEConnectionStatus.Connected,
       });
       const command = await ideCommand();
-      const result = await command!.subCommands!.find(
-        (c) => c.name === 'status',
-      )!.action!(mockContext, '');
+      const result = await command!.subCommands!.find((c) => c.name === "status")!.action!(
+        mockContext,
+        "",
+      );
       expect(vi.mocked(mockIdeClient.getConnectionStatus)).toHaveBeenCalled();
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: '🟢 Connected to VS Code',
+        type: "message",
+        messageType: "info",
+        content: "🟢 Connected to VS Code",
       });
     });
 
-    it('should show connecting status', async () => {
+    it("should show connecting status", async () => {
       vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
         status: core.IDEConnectionStatus.Connecting,
       });
       const command = await ideCommand();
-      const result = await command!.subCommands!.find(
-        (c) => c.name === 'status',
-      )!.action!(mockContext, '');
+      const result = await command!.subCommands!.find((c) => c.name === "status")!.action!(
+        mockContext,
+        "",
+      );
       expect(vi.mocked(mockIdeClient.getConnectionStatus)).toHaveBeenCalled();
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `🟡 Connecting...`,
       });
     });
-    it('should show disconnected status', async () => {
+    it("should show disconnected status", async () => {
       vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
         status: core.IDEConnectionStatus.Disconnected,
       });
       const command = await ideCommand();
-      const result = await command!.subCommands!.find(
-        (c) => c.name === 'status',
-      )!.action!(mockContext, '');
+      const result = await command!.subCommands!.find((c) => c.name === "status")!.action!(
+        mockContext,
+        "",
+      );
       expect(vi.mocked(mockIdeClient.getConnectionStatus)).toHaveBeenCalled();
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `🔴 Disconnected`,
       });
     });
 
-    it('should show disconnected status with details', async () => {
-      const details = 'Something went wrong';
+    it("should show disconnected status with details", async () => {
+      const details = "Something went wrong";
       vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
         status: core.IDEConnectionStatus.Disconnected,
         details,
       });
       const command = await ideCommand();
-      const result = await command!.subCommands!.find(
-        (c) => c.name === 'status',
-      )!.action!(mockContext, '');
+      const result = await command!.subCommands!.find((c) => c.name === "status")!.action!(
+        mockContext,
+        "",
+      );
       expect(vi.mocked(mockIdeClient.getConnectionStatus)).toHaveBeenCalled();
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `🔴 Disconnected: ${details}`,
       });
     });
   });
 
-  describe('install subcommand', () => {
+  describe("install subcommand", () => {
     const mockInstall = vi.fn();
     beforeEach(() => {
-      vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(
-        IDE_DEFINITIONS.vscode,
-      );
+      vi.mocked(mockIdeClient.getCurrentIde).mockReturnValue(IDE_DEFINITIONS.vscode);
       vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
         status: core.IDEConnectionStatus.Disconnected,
       });
       vi.mocked(core.getIdeInstaller).mockReturnValue({
         install: mockInstall,
       });
-      platformSpy.mockReturnValue('linux');
+      platformSpy.mockReturnValue("linux");
     });
 
-    it('should install the extension', async () => {
+    it("should install the extension", async () => {
       vi.useFakeTimers();
       mockInstall.mockResolvedValue({
         success: true,
-        message: 'Successfully installed.',
+        message: "Successfully installed.",
       });
 
       const command = await ideCommand();
@@ -200,9 +194,10 @@ describe('ideCommand', () => {
         status: core.IDEConnectionStatus.Connected,
       });
 
-      const actionPromise = command!.subCommands!.find(
-        (c) => c.name === 'install',
-      )!.action!(mockContext, '');
+      const actionPromise = command!.subCommands!.find((c) => c.name === "install")!.action!(
+        mockContext,
+        "",
+      );
       await vi.runAllTimersAsync();
       await actionPromise;
 
@@ -210,53 +205,50 @@ describe('ideCommand', () => {
       expect(mockInstall).toHaveBeenCalled();
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'info',
+          type: "info",
           text: `Installing IDE companion...`,
         }),
         expect.any(Number),
       );
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'info',
-          text: 'Successfully installed.',
+          type: "info",
+          text: "Successfully installed.",
         }),
         expect.any(Number),
       );
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'info',
-          text: '🟢 Connected to VS Code',
+          type: "info",
+          text: "🟢 Connected to VS Code",
         }),
         expect.any(Number),
       );
       vi.useRealTimers();
     }, 10000);
 
-    it('should show an error if installation fails', async () => {
+    it("should show an error if installation fails", async () => {
       mockInstall.mockResolvedValue({
         success: false,
-        message: 'Installation failed.',
+        message: "Installation failed.",
       });
 
       const command = await ideCommand();
-      await command!.subCommands!.find((c) => c.name === 'install')!.action!(
-        mockContext,
-        '',
-      );
+      await command!.subCommands!.find((c) => c.name === "install")!.action!(mockContext, "");
 
       expect(core.getIdeInstaller).toHaveBeenCalledWith(IDE_DEFINITIONS.vscode);
       expect(mockInstall).toHaveBeenCalled();
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'info',
+          type: "info",
           text: `Installing IDE companion...`,
         }),
         expect.any(Number),
       );
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'error',
-          text: 'Installation failed.',
+          type: "error",
+          text: "Installation failed.",
         }),
         expect.any(Number),
       );
diff --git a/packages/ui-gemini/src/ui/commands/ideCommand.ts b/packages/ui-gemini/src/ui/commands/ideCommand.ts
index 3ba009211..773f63bdc 100644
--- a/packages/ui-gemini/src/ui/commands/ideCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/ideCommand.ts
@@ -4,43 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import path from "node:path";
 import {
   type Config,
-  IdeClient,
   type File,
-  logIdeConnection,
-  IdeConnectionEvent,
-  IdeConnectionType,
-} from '@airiscode/gemini-cli-core';
-import {
+  GEMINI_CLI_COMPANION_EXTENSION_NAME,
   getIdeInstaller,
   IDEConnectionStatus,
+  IdeClient,
+  IdeConnectionEvent,
+  IdeConnectionType,
   ideContextStore,
-  GEMINI_CLI_COMPANION_EXTENSION_NAME,
-} from '@airiscode/gemini-cli-core';
-import path from 'node:path';
-import type {
-  CommandContext,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import { SettingScope } from '../../config/settings.js';
+  logIdeConnection,
+} from "@airiscode/gemini-cli-core";
+import { SettingScope } from "../../config/settings.js";
+import type { CommandContext, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 function getIdeStatusMessage(ideClient: IdeClient): {
-  messageType: 'info' | 'error';
+  messageType: "info" | "error";
   content: string;
 } {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
     case IDEConnectionStatus.Connected:
       return {
-        messageType: 'info',
+        messageType: "info",
         content: `🟢 Connected to ${ideClient.getDetectedIdeDisplayName()}`,
       };
     case IDEConnectionStatus.Connecting:
       return {
-        messageType: 'info',
+        messageType: "info",
         content: `🟡 Connecting...`,
       };
     default: {
@@ -49,7 +43,7 @@ function getIdeStatusMessage(ideClient: IdeClient): {
         content += `: ${connection.details}`;
       }
       return {
-        messageType: 'error',
+        messageType: "error",
         content,
       };
     }
@@ -68,13 +62,11 @@ function formatFileList(openFiles: File[]): string {
       const basename = path.basename(file.path);
       const isDuplicate = (basenameCounts.get(basename) || 0) > 1;
       const parentDir = path.basename(path.dirname(file.path));
-      const displayName = isDuplicate
-        ? `${basename} (/${parentDir})`
-        : basename;
+      const displayName = isDuplicate ? `${basename} (/${parentDir})` : basename;
 
-      return `  - ${displayName}${file.isActive ? ' (active)' : ''}`;
+      return `  - ${displayName}${file.isActive ? " (active)" : ""}`;
     })
-    .join('\n');
+    .join("\n");
 
   const infoMessage = `
 (Note: The file list is limited to a number of recently accessed files within your workspace and only includes local files on disk)`;
@@ -83,7 +75,7 @@ function formatFileList(openFiles: File[]): string {
 }
 
 async function getIdeStatusMessageWithFiles(ideClient: IdeClient): Promise<{
-  messageType: 'info' | 'error';
+  messageType: "info" | "error";
   content: string;
 }> {
   const connection = ideClient.getConnectionStatus();
@@ -96,13 +88,13 @@ async function getIdeStatusMessageWithFiles(ideClient: IdeClient): Promise<{
         content += formatFileList(openFiles);
       }
       return {
-        messageType: 'info',
+        messageType: "info",
         content,
       };
     }
     case IDEConnectionStatus.Connecting:
       return {
-        messageType: 'info',
+        messageType: "info",
         content: `🟡 Connecting...`,
       };
     default: {
@@ -111,7 +103,7 @@ async function getIdeStatusMessageWithFiles(ideClient: IdeClient): Promise<{
         content += `: ${connection.details}`;
       }
       return {
-        messageType: 'error',
+        messageType: "error",
         content,
       };
     }
@@ -138,37 +130,36 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   const currentIDE = ideClient.getCurrentIde();
   if (!currentIDE) {
     return {
-      name: 'ide',
-      description: 'Manage IDE integration',
+      name: "ide",
+      description: "Manage IDE integration",
       kind: CommandKind.BUILT_IN,
       autoExecute: false,
       action: (): SlashCommandActionReturn =>
         ({
-          type: 'message',
-          messageType: 'error',
+          type: "message",
+          messageType: "error",
           content: `IDE integration is not supported in your current environment. To use this feature, run Gemini CLI in one of these supported IDEs: Antigravity, VS Code, or VS Code forks.`,
         }) as const,
     };
   }
 
   const ideSlashCommand: SlashCommand = {
-    name: 'ide',
-    description: 'Manage IDE integration',
+    name: "ide",
+    description: "Manage IDE integration",
     kind: CommandKind.BUILT_IN,
     autoExecute: false,
     subCommands: [],
   };
 
   const statusCommand: SlashCommand = {
-    name: 'status',
-    description: 'Check status of IDE integration',
+    name: "status",
+    description: "Check status of IDE integration",
     kind: CommandKind.BUILT_IN,
     autoExecute: true,
     action: async (): Promise<SlashCommandActionReturn> => {
-      const { messageType, content } =
-        await getIdeStatusMessageWithFiles(ideClient);
+      const { messageType, content } = await getIdeStatusMessageWithFiles(ideClient);
       return {
-        type: 'message',
+        type: "message",
         messageType,
         content,
       } as const;
@@ -176,7 +167,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   };
 
   const installCommand: SlashCommand = {
-    name: 'install',
+    name: "install",
     description: `Install required IDE companion for ${ideClient.getDetectedIdeDisplayName()}`,
     kind: CommandKind.BUILT_IN,
     autoExecute: true,
@@ -185,7 +176,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
       if (!installer) {
         context.ui.addItem(
           {
-            type: 'error',
+            type: "error",
             text: `No installer is available for ${ideClient.getDetectedIdeDisplayName()}. Please install the '${GEMINI_CLI_COMPANION_EXTENSION_NAME}' extension manually from the marketplace.`,
           },
           Date.now(),
@@ -195,7 +186,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
 
       context.ui.addItem(
         {
-          type: 'info',
+          type: "info",
           text: `Installing IDE companion...`,
         },
         Date.now(),
@@ -204,33 +195,26 @@ export const ideCommand = async (): Promise<SlashCommand> => {
       const result = await installer.install();
       context.ui.addItem(
         {
-          type: result.success ? 'info' : 'error',
+          type: result.success ? "info" : "error",
           text: result.message,
         },
         Date.now(),
       );
       if (result.success) {
-        context.services.settings.setValue(
-          SettingScope.User,
-          'ide.enabled',
-          true,
-        );
+        context.services.settings.setValue(SettingScope.User, "ide.enabled", true);
         // Poll for up to 5 seconds for the extension to activate.
         for (let i = 0; i < 10; i++) {
           await setIdeModeAndSyncConnection(context.services.config!, true, {
             logToConsole: false,
           });
-          if (
-            ideClient.getConnectionStatus().status ===
-            IDEConnectionStatus.Connected
-          ) {
+          if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
             break;
           }
           await new Promise((resolve) => setTimeout(resolve, 500));
         }
 
         const { messageType, content } = getIdeStatusMessage(ideClient);
-        if (messageType === 'error') {
+        if (messageType === "error") {
           context.ui.addItem(
             {
               type: messageType,
@@ -252,16 +236,12 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   };
 
   const enableCommand: SlashCommand = {
-    name: 'enable',
-    description: 'Enable IDE integration',
+    name: "enable",
+    description: "Enable IDE integration",
     kind: CommandKind.BUILT_IN,
     autoExecute: true,
     action: async (context: CommandContext) => {
-      context.services.settings.setValue(
-        SettingScope.User,
-        'ide.enabled',
-        true,
-      );
+      context.services.settings.setValue(SettingScope.User, "ide.enabled", true);
       await setIdeModeAndSyncConnection(context.services.config!, true);
       const { messageType, content } = getIdeStatusMessage(ideClient);
       context.ui.addItem(
@@ -275,16 +255,12 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   };
 
   const disableCommand: SlashCommand = {
-    name: 'disable',
-    description: 'Disable IDE integration',
+    name: "disable",
+    description: "Disable IDE integration",
     kind: CommandKind.BUILT_IN,
     autoExecute: true,
     action: async (context: CommandContext) => {
-      context.services.settings.setValue(
-        SettingScope.User,
-        'ide.enabled',
-        false,
-      );
+      context.services.settings.setValue(SettingScope.User, "ide.enabled", false);
       await setIdeModeAndSyncConnection(context.services.config!, false);
       const { messageType, content } = getIdeStatusMessage(ideClient);
       context.ui.addItem(
@@ -303,11 +279,7 @@ export const ideCommand = async (): Promise<SlashCommand> => {
   if (isConnected) {
     ideSlashCommand.subCommands = [statusCommand, disableCommand];
   } else {
-    ideSlashCommand.subCommands = [
-      enableCommand,
-      statusCommand,
-      installCommand,
-    ];
+    ideSlashCommand.subCommands = [enableCommand, statusCommand, installCommand];
   }
 
   return ideSlashCommand;
diff --git a/packages/ui-gemini/src/ui/commands/initCommand.test.ts b/packages/ui-gemini/src/ui/commands/initCommand.test.ts
index 43987821b..54eb10a7d 100644
--- a/packages/ui-gemini/src/ui/commands/initCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/initCommand.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { initCommand } from './initCommand.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import type { CommandContext } from './types.js';
-import type { SubmitPromptActionReturn } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { SubmitPromptActionReturn } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { initCommand } from "./initCommand.js";
+import type { CommandContext } from "./types.js";
 
 // Mock the 'fs' module
-vi.mock('fs', () => ({
+vi.mock("fs", () => ({
   existsSync: vi.fn(),
   writeFileSync: vi.fn(),
 }));
 
-describe('initCommand', () => {
+describe("initCommand", () => {
   let mockContext: CommandContext;
-  const targetDir = '/test/dir';
-  const geminiMdPath = path.join(targetDir, 'GEMINI.md');
+  const targetDir = "/test/dir";
+  const geminiMdPath = path.join(targetDir, "GEMINI.md");
 
   beforeEach(() => {
     // Create a fresh mock context for each test
@@ -39,54 +39,48 @@ describe('initCommand', () => {
     vi.clearAllMocks();
   });
 
-  it('should inform the user if GEMINI.md already exists', async () => {
+  it("should inform the user if GEMINI.md already exists", async () => {
     // Arrange: Simulate that the file exists
     vi.mocked(fs.existsSync).mockReturnValue(true);
 
     // Act: Run the command's action
-    const result = await initCommand.action!(mockContext, '');
+    const result = await initCommand.action!(mockContext, "");
 
     // Assert: Check for the correct informational message
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'info',
-      content:
-        'A GEMINI.md file already exists in this directory. No changes were made.',
+      type: "message",
+      messageType: "info",
+      content: "A GEMINI.md file already exists in this directory. No changes were made.",
     });
     // Assert: Ensure no file was written
     expect(fs.writeFileSync).not.toHaveBeenCalled();
   });
 
-  it('should create GEMINI.md and submit a prompt if it does not exist', async () => {
+  it("should create GEMINI.md and submit a prompt if it does not exist", async () => {
     // Arrange: Simulate that the file does not exist
     vi.mocked(fs.existsSync).mockReturnValue(false);
 
     // Act: Run the command's action
-    const result = (await initCommand.action!(
-      mockContext,
-      '',
-    )) as SubmitPromptActionReturn;
+    const result = (await initCommand.action!(mockContext, "")) as SubmitPromptActionReturn;
 
     // Assert: Check that writeFileSync was called correctly
-    expect(fs.writeFileSync).toHaveBeenCalledWith(geminiMdPath, '', 'utf8');
+    expect(fs.writeFileSync).toHaveBeenCalledWith(geminiMdPath, "", "utf8");
 
     // Assert: Check that an informational message was added to the UI
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
-        type: 'info',
-        text: 'Empty GEMINI.md created. Now analyzing the project to populate it.',
+        type: "info",
+        text: "Empty GEMINI.md created. Now analyzing the project to populate it.",
       },
       expect.any(Number),
     );
 
     // Assert: Check that the correct prompt is submitted
-    expect(result.type).toBe('submit_prompt');
-    expect(result.content).toContain(
-      'You are an AI agent that brings the power of Gemini',
-    );
+    expect(result.type).toBe("submit_prompt");
+    expect(result.content).toContain("You are an AI agent that brings the power of Gemini");
   });
 
-  it('should return an error if config is not available', async () => {
+  it("should return an error if config is not available", async () => {
     // Arrange: Create a context without config
     const noConfigContext = createMockCommandContext();
     if (noConfigContext.services) {
@@ -94,13 +88,13 @@ describe('initCommand', () => {
     }
 
     // Act: Run the command's action
-    const result = await initCommand.action!(noConfigContext, '');
+    const result = await initCommand.action!(noConfigContext, "");
 
     // Assert: Check for the correct error message
     expect(result).toEqual({
-      type: 'message',
-      messageType: 'error',
-      content: 'Configuration not available.',
+      type: "message",
+      messageType: "error",
+      content: "Configuration not available.",
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/initCommand.ts b/packages/ui-gemini/src/ui/commands/initCommand.ts
index f978fccdf..7a30a3f8b 100644
--- a/packages/ui-gemini/src/ui/commands/initCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/initCommand.ts
@@ -4,56 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import type {
-  CommandContext,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import type { CommandContext, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const initCommand: SlashCommand = {
-  name: 'init',
-  description: 'Analyzes the project and creates a tailored GEMINI.md file',
+  name: "init",
+  description: "Analyzes the project and creates a tailored GEMINI.md file",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
-  action: async (
-    context: CommandContext,
-    _args: string,
-  ): Promise<SlashCommandActionReturn> => {
+  action: async (context: CommandContext, _args: string): Promise<SlashCommandActionReturn> => {
     if (!context.services.config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Configuration not available.',
+        type: "message",
+        messageType: "error",
+        content: "Configuration not available.",
       };
     }
     const targetDir = context.services.config.getTargetDir();
-    const geminiMdPath = path.join(targetDir, 'GEMINI.md');
+    const geminiMdPath = path.join(targetDir, "GEMINI.md");
 
     if (fs.existsSync(geminiMdPath)) {
       return {
-        type: 'message',
-        messageType: 'info',
-        content:
-          'A GEMINI.md file already exists in this directory. No changes were made.',
+        type: "message",
+        messageType: "info",
+        content: "A GEMINI.md file already exists in this directory. No changes were made.",
       };
     }
 
     // Create an empty GEMINI.md file
-    fs.writeFileSync(geminiMdPath, '', 'utf8');
+    fs.writeFileSync(geminiMdPath, "", "utf8");
 
     context.ui.addItem(
       {
-        type: 'info',
-        text: 'Empty GEMINI.md created. Now analyzing the project to populate it.',
+        type: "info",
+        text: "Empty GEMINI.md created. Now analyzing the project to populate it.",
       },
       Date.now(),
     );
 
     return {
-      type: 'submit_prompt',
+      type: "submit_prompt",
       content: `
 You are an AI agent that brings the power of Gemini directly into the terminal. Your task is to analyze the current directory and generate a comprehensive GEMINI.md file to be used as instructional context for future interactions.
 
diff --git a/packages/ui-gemini/src/ui/commands/mcpCommand.test.ts b/packages/ui-gemini/src/ui/commands/mcpCommand.test.ts
index a907afd4c..3c2d2c6e3 100644
--- a/packages/ui-gemini/src/ui/commands/mcpCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/mcpCommand.test.ts
@@ -4,24 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { mcpCommand } from './mcpCommand.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import {
-  MCPServerStatus,
-  MCPDiscoveryState,
-  getMCPServerStatus,
-  getMCPDiscoveryState,
   DiscoveredMCPTool,
-} from '@airiscode/gemini-cli-core';
-
-import type { CallableTool } from '@google/genai';
-import { Type } from '@google/genai';
-import { MessageType } from '../types.js';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+  getMCPDiscoveryState,
+  getMCPServerStatus,
+  MCPDiscoveryState,
+  MCPServerStatus,
+} from "@airiscode/gemini-cli-core";
+import type { CallableTool } from "@google/genai";
+import { Type } from "@google/genai";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { mcpCommand } from "./mcpCommand.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   const mockAuthenticate = vi.fn();
   return {
     ...actual,
@@ -38,11 +36,7 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
 });
 
 // Helper function to create a mock DiscoveredMCPTool
-const createMockMCPTool = (
-  name: string,
-  serverName: string,
-  description?: string,
-) =>
+const createMockMCPTool = (name: string, serverName: string, description?: string) =>
   new DiscoveredMCPTool(
     {
       callTool: vi.fn(),
@@ -54,7 +48,7 @@ const createMockMCPTool = (
     { type: Type.OBJECT, properties: {} },
   );
 
-describe('mcpCommand', () => {
+describe("mcpCommand", () => {
   let mockContext: ReturnType<typeof createMockCommandContext>;
   let mockConfig: {
     getToolRegistry: ReturnType<typeof vi.fn>;
@@ -74,9 +68,7 @@ describe('mcpCommand', () => {
 
     // Default mock implementations
     vi.mocked(getMCPServerStatus).mockReturnValue(MCPServerStatus.CONNECTED);
-    vi.mocked(getMCPDiscoveryState).mockReturnValue(
-      MCPDiscoveryState.COMPLETED,
-    );
+    vi.mocked(getMCPDiscoveryState).mockReturnValue(MCPDiscoveryState.COMPLETED);
 
     // Create mock config with all necessary methods
     mockConfig = {
@@ -106,42 +98,42 @@ describe('mcpCommand', () => {
     });
   });
 
-  describe('basic functionality', () => {
-    it('should show an error if config is not available', async () => {
+  describe("basic functionality", () => {
+    it("should show an error if config is not available", async () => {
       const contextWithoutConfig = createMockCommandContext({
         services: {
           config: null,
         },
       });
 
-      const result = await mcpCommand.action!(contextWithoutConfig, '');
+      const result = await mcpCommand.action!(contextWithoutConfig, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded.",
       });
     });
 
-    it('should show an error if tool registry is not available', async () => {
+    it("should show an error if tool registry is not available", async () => {
       mockConfig.getToolRegistry = vi.fn().mockReturnValue(undefined);
 
-      const result = await mcpCommand.action!(mockContext, '');
+      const result = await mcpCommand.action!(mockContext, "");
 
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Could not retrieve tool registry.',
+        type: "message",
+        messageType: "error",
+        content: "Could not retrieve tool registry.",
       });
     });
   });
 
-  describe('with configured MCP servers', () => {
+  describe("with configured MCP servers", () => {
     beforeEach(() => {
       const mockMcpServers = {
-        server1: { command: 'cmd1' },
-        server2: { command: 'cmd2' },
-        server3: { command: 'cmd3' },
+        server1: { command: "cmd1" },
+        server2: { command: "cmd2" },
+        server3: { command: "cmd3" },
       };
 
       mockConfig.getMcpServers = vi.fn().mockReturnValue(mockMcpServers);
@@ -151,40 +143,33 @@ describe('mcpCommand', () => {
       });
     });
 
-    it('should display configured MCP servers with status indicators and their tools', async () => {
+    it("should display configured MCP servers with status indicators and their tools", async () => {
       // Setup getMCPServerStatus mock implementation
       vi.mocked(getMCPServerStatus).mockImplementation((serverName) => {
-        if (serverName === 'server1') return MCPServerStatus.CONNECTED;
-        if (serverName === 'server2') return MCPServerStatus.CONNECTED;
+        if (serverName === "server1") return MCPServerStatus.CONNECTED;
+        if (serverName === "server2") return MCPServerStatus.CONNECTED;
         return MCPServerStatus.DISCONNECTED; // server3
       });
 
       // Mock tools from each server using actual DiscoveredMCPTool instances
       const mockServer1Tools = [
-        createMockMCPTool('server1_tool1', 'server1'),
-        createMockMCPTool('server1_tool2', 'server1'),
+        createMockMCPTool("server1_tool1", "server1"),
+        createMockMCPTool("server1_tool2", "server1"),
       ];
-      const mockServer2Tools = [createMockMCPTool('server2_tool1', 'server2')];
-      const mockServer3Tools = [createMockMCPTool('server3_tool1', 'server3')];
+      const mockServer2Tools = [createMockMCPTool("server2_tool1", "server2")];
+      const mockServer3Tools = [createMockMCPTool("server3_tool1", "server3")];
 
-      const allTools = [
-        ...mockServer1Tools,
-        ...mockServer2Tools,
-        ...mockServer3Tools,
-      ];
+      const allTools = [...mockServer1Tools, ...mockServer2Tools, ...mockServer3Tools];
 
       mockConfig.getToolRegistry = vi.fn().mockReturnValue({
         getAllTools: vi.fn().mockReturnValue(allTools),
       });
 
-      const resourcesByServer: Record<
-        string,
-        Array<{ name: string; uri: string }>
-      > = {
+      const resourcesByServer: Record<string, Array<{ name: string; uri: string }>> = {
         server1: [
           {
-            name: 'Server1 Resource',
-            uri: 'file:///server1/resource1.txt',
+            name: "Server1 Resource",
+            uri: "file:///server1/resource1.txt",
           },
         ],
         server2: [],
@@ -201,7 +186,7 @@ describe('mcpCommand', () => {
         ),
       });
 
-      await mcpCommand.action!(mockContext, '');
+      await mcpCommand.action!(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -214,8 +199,8 @@ describe('mcpCommand', () => {
           })),
           resources: expect.arrayContaining([
             expect.objectContaining({
-              serverName: 'server1',
-              uri: 'file:///server1/resource1.txt',
+              serverName: "server1",
+              uri: "file:///server1/resource1.txt",
             }),
           ]),
         }),
@@ -223,11 +208,9 @@ describe('mcpCommand', () => {
       );
     });
 
-    it('should display tool descriptions when desc argument is used', async () => {
-      const descSubCommand = mcpCommand.subCommands!.find(
-        (c) => c.name === 'desc',
-      );
-      await descSubCommand!.action!(mockContext, '');
+    it("should display tool descriptions when desc argument is used", async () => {
+      const descSubCommand = mcpCommand.subCommands!.find((c) => c.name === "desc");
+      await descSubCommand!.action!(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -238,11 +221,9 @@ describe('mcpCommand', () => {
       );
     });
 
-    it('should not display descriptions when nodesc argument is used', async () => {
-      const listSubCommand = mcpCommand.subCommands!.find(
-        (c) => c.name === 'list',
-      );
-      await listSubCommand!.action!(mockContext, '');
+    it("should not display descriptions when nodesc argument is used", async () => {
+      const listSubCommand = mcpCommand.subCommands!.find((c) => c.name === "list");
+      await listSubCommand!.action!(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
diff --git a/packages/ui-gemini/src/ui/commands/mcpCommand.ts b/packages/ui-gemini/src/ui/commands/mcpCommand.ts
index d75edea8f..28665e528 100644
--- a/packages/ui-gemini/src/ui/commands/mcpCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/mcpCommand.ts
@@ -4,47 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  SlashCommand,
-  SlashCommandActionReturn,
-  CommandContext,
-} from './types.js';
-import { CommandKind } from './types.js';
 import type {
   DiscoveredMCPPrompt,
   DiscoveredMCPResource,
   MessageActionReturn,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
 import {
   DiscoveredMCPTool,
+  getErrorMessage,
   getMCPDiscoveryState,
   getMCPServerStatus,
   MCPDiscoveryState,
-  MCPServerStatus,
-  getErrorMessage,
   MCPOAuthTokenStorage,
+  MCPServerStatus,
   mcpServerRequiresOAuth,
-} from '@airiscode/gemini-cli-core';
-import { appEvents, AppEvent } from '../../utils/events.js';
-import { MessageType, type HistoryItemMcpStatus } from '../types.js';
+} from "@airiscode/gemini-cli-core";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { type HistoryItemMcpStatus, MessageType } from "../types.js";
+import type { CommandContext, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 const authCommand: SlashCommand = {
-  name: 'auth',
-  description: 'Authenticate with an OAuth-enabled MCP server',
+  name: "auth",
+  description: "Authenticate with an OAuth-enabled MCP server",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
-  action: async (
-    context: CommandContext,
-    args: string,
-  ): Promise<MessageActionReturn> => {
+  action: async (context: CommandContext, args: string): Promise<MessageActionReturn> => {
     const serverName = args.trim();
     const { config } = context.services;
 
     if (!config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded.",
       };
     }
 
@@ -58,35 +51,33 @@ const authCommand: SlashCommand = {
         .filter(([_, server]) => server.oauth?.enabled)
         .map(([name, _]) => name);
 
-      const detectedOAuthServers = Array.from(
-        mcpServerRequiresOAuth.keys(),
-      ).filter((name) => mcpServers[name]); // Only include configured servers
+      const detectedOAuthServers = Array.from(mcpServerRequiresOAuth.keys()).filter(
+        (name) => mcpServers[name],
+      ); // Only include configured servers
 
       // Combine and deduplicate
-      const allOAuthServers = [
-        ...new Set([...configuredOAuthServers, ...detectedOAuthServers]),
-      ];
+      const allOAuthServers = [...new Set([...configuredOAuthServers, ...detectedOAuthServers])];
 
       if (allOAuthServers.length === 0) {
         return {
-          type: 'message',
-          messageType: 'info',
-          content: 'No MCP servers configured with OAuth authentication.',
+          type: "message",
+          messageType: "info",
+          content: "No MCP servers configured with OAuth authentication.",
         };
       }
 
       return {
-        type: 'message',
-        messageType: 'info',
-        content: `MCP servers with OAuth authentication:\n${allOAuthServers.map((s) => `  - ${s}`).join('\n')}\n\nUse /mcp auth <server-name> to authenticate.`,
+        type: "message",
+        messageType: "info",
+        content: `MCP servers with OAuth authentication:\n${allOAuthServers.map((s) => `  - ${s}`).join("\n")}\n\nUse /mcp auth <server-name> to authenticate.`,
       };
     }
 
     const server = mcpServers[serverName];
     if (!server) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `MCP server '${serverName}' not found.`,
       };
     }
@@ -95,7 +86,7 @@ const authCommand: SlashCommand = {
     // The authentication process will discover OAuth requirements automatically
 
     const displayListener = (message: string) => {
-      context.ui.addItem({ type: 'info', text: message }, Date.now());
+      context.ui.addItem({ type: "info", text: message }, Date.now());
     };
 
     appEvents.on(AppEvent.OauthDisplayMessage, displayListener);
@@ -103,14 +94,14 @@ const authCommand: SlashCommand = {
     try {
       context.ui.addItem(
         {
-          type: 'info',
+          type: "info",
           text: `Starting OAuth authentication for MCP server '${serverName}'...`,
         },
         Date.now(),
       );
 
       // Import dynamically to avoid circular dependencies
-      const { MCPOAuthProvider } = await import('@airiscode/gemini-cli-core');
+      const { MCPOAuthProvider } = await import("@airiscode/gemini-cli-core");
 
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
@@ -119,16 +110,11 @@ const authCommand: SlashCommand = {
 
       const mcpServerUrl = server.httpUrl || server.url;
       const authProvider = new MCPOAuthProvider(new MCPOAuthTokenStorage());
-      await authProvider.authenticate(
-        serverName,
-        oauthConfig,
-        mcpServerUrl,
-        appEvents,
-      );
+      await authProvider.authenticate(serverName, oauthConfig, mcpServerUrl, appEvents);
 
       context.ui.addItem(
         {
-          type: 'info',
+          type: "info",
           text: `✅ Successfully authenticated with MCP server '${serverName}'!`,
         },
         Date.now(),
@@ -139,7 +125,7 @@ const authCommand: SlashCommand = {
       if (mcpClientManager) {
         context.ui.addItem(
           {
-            type: 'info',
+            type: "info",
             text: `Restarting MCP server '${serverName}'...`,
           },
           Date.now(),
@@ -156,14 +142,14 @@ const authCommand: SlashCommand = {
       context.ui.reloadCommands();
 
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Successfully authenticated and refreshed tools for '${serverName}'.`,
       };
     } catch (error) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`,
       };
     } finally {
@@ -175,9 +161,7 @@ const authCommand: SlashCommand = {
     if (!config) return [];
 
     const mcpServers = config.getMcpClientManager()?.getMcpServers() || {};
-    return Object.keys(mcpServers).filter((name) =>
-      name.startsWith(partialArg),
-    );
+    return Object.keys(mcpServers).filter((name) => name.startsWith(partialArg));
   },
 };
 
@@ -189,33 +173,31 @@ const listAction = async (
   const { config } = context.services;
   if (!config) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Config not loaded.',
+      type: "message",
+      messageType: "error",
+      content: "Config not loaded.",
     };
   }
 
   const toolRegistry = config.getToolRegistry();
   if (!toolRegistry) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Could not retrieve tool registry.',
+      type: "message",
+      messageType: "error",
+      content: "Could not retrieve tool registry.",
     };
   }
 
   const mcpServers = config.getMcpClientManager()?.getMcpServers() || {};
   const serverNames = Object.keys(mcpServers);
-  const blockedMcpServers =
-    config.getMcpClientManager()?.getBlockedMcpServers() || [];
+  const blockedMcpServers = config.getMcpClientManager()?.getBlockedMcpServers() || [];
 
   const connectingServers = serverNames.filter(
     (name) => getMCPServerStatus(name) === MCPServerStatus.CONNECTING,
   );
   const discoveryState = getMCPDiscoveryState();
   const discoveryInProgress =
-    discoveryState === MCPDiscoveryState.IN_PROGRESS ||
-    connectingServers.length > 0;
+    discoveryState === MCPDiscoveryState.IN_PROGRESS || connectingServers.length > 0;
 
   const allTools = toolRegistry.getAllTools();
   const mcpTools = allTools.filter(
@@ -226,19 +208,15 @@ const listAction = async (
   const mcpPrompts = promptRegistry
     .getAllPrompts()
     .filter(
-      (prompt) =>
-        'serverName' in prompt &&
-        serverNames.includes(prompt.serverName as string),
+      (prompt) => "serverName" in prompt && serverNames.includes(prompt.serverName as string),
     ) as DiscoveredMCPPrompt[];
 
   const resourceRegistry = config.getResourceRegistry();
   const mcpResources = resourceRegistry
     .getAllResources()
-    .filter((entry) =>
-      serverNames.includes(entry.serverName),
-    ) as DiscoveredMCPResource[];
+    .filter((entry) => serverNames.includes(entry.serverName)) as DiscoveredMCPResource[];
 
-  const authStatus: HistoryItemMcpStatus['authStatus'] = {};
+  const authStatus: HistoryItemMcpStatus["authStatus"] = {};
   const tokenStorage = new MCPOAuthTokenStorage();
   for (const serverName of serverNames) {
     const server = mcpServers[serverName];
@@ -247,15 +225,15 @@ const listAction = async (
       const creds = await tokenStorage.getCredentials(serverName);
       if (creds) {
         if (creds.token.expiresAt && creds.token.expiresAt < Date.now()) {
-          authStatus[serverName] = 'expired';
+          authStatus[serverName] = "expired";
         } else {
-          authStatus[serverName] = 'authenticated';
+          authStatus[serverName] = "authenticated";
         }
       } else {
-        authStatus[serverName] = 'unauthenticated';
+        authStatus[serverName] = "unauthenticated";
       }
     } else {
-      authStatus[serverName] = 'not-configured';
+      authStatus[serverName] = "not-configured";
     }
   }
 
@@ -292,62 +270,59 @@ const listAction = async (
 };
 
 const listCommand: SlashCommand = {
-  name: 'list',
-  altNames: ['ls', 'nodesc', 'nodescription'],
-  description: 'List configured MCP servers and tools',
+  name: "list",
+  altNames: ["ls", "nodesc", "nodescription"],
+  description: "List configured MCP servers and tools",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (context) => listAction(context),
 };
 
 const descCommand: SlashCommand = {
-  name: 'desc',
-  altNames: ['description'],
-  description: 'List configured MCP servers and tools with descriptions',
+  name: "desc",
+  altNames: ["description"],
+  description: "List configured MCP servers and tools with descriptions",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (context) => listAction(context, true),
 };
 
 const schemaCommand: SlashCommand = {
-  name: 'schema',
-  description:
-    'List configured MCP servers and tools with descriptions and schemas',
+  name: "schema",
+  description: "List configured MCP servers and tools with descriptions and schemas",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (context) => listAction(context, true, true),
 };
 
 const refreshCommand: SlashCommand = {
-  name: 'refresh',
-  description: 'Restarts MCP servers',
+  name: "refresh",
+  description: "Restarts MCP servers",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
-  action: async (
-    context: CommandContext,
-  ): Promise<void | SlashCommandActionReturn> => {
+  action: async (context: CommandContext): Promise<void | SlashCommandActionReturn> => {
     const { config } = context.services;
     if (!config) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Config not loaded.',
+        type: "message",
+        messageType: "error",
+        content: "Config not loaded.",
       };
     }
 
     const mcpClientManager = config.getMcpClientManager();
     if (!mcpClientManager) {
       return {
-        type: 'message',
-        messageType: 'error',
-        content: 'Could not retrieve mcp client manager.',
+        type: "message",
+        messageType: "error",
+        content: "Could not retrieve mcp client manager.",
       };
     }
 
     context.ui.addItem(
       {
-        type: 'info',
-        text: 'Restarting MCP servers...',
+        type: "info",
+        text: "Restarting MCP servers...",
       },
       Date.now(),
     );
@@ -363,21 +338,15 @@ const refreshCommand: SlashCommand = {
     // Reload the slash commands to reflect the changes.
     context.ui.reloadCommands();
 
-    return listCommand.action!(context, '');
+    return listCommand.action!(context, "");
   },
 };
 
 export const mcpCommand: SlashCommand = {
-  name: 'mcp',
-  description: 'Manage configured Model Context Protocol (MCP) servers',
+  name: "mcp",
+  description: "Manage configured Model Context Protocol (MCP) servers",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
-  subCommands: [
-    listCommand,
-    descCommand,
-    schemaCommand,
-    authCommand,
-    refreshCommand,
-  ],
+  subCommands: [listCommand, descCommand, schemaCommand, authCommand, refreshCommand],
   action: async (context: CommandContext) => listAction(context),
 };
diff --git a/packages/ui-gemini/src/ui/commands/memoryCommand.test.ts b/packages/ui-gemini/src/ui/commands/memoryCommand.test.ts
index 859693dfa..3ef676b8a 100644
--- a/packages/ui-gemini/src/ui/commands/memoryCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/memoryCommand.test.ts
@@ -4,24 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { memoryCommand } from './memoryCommand.js';
-import type { SlashCommand, CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
-import type { LoadedSettings } from '../../config/settings.js';
 import {
+  type FileDiscoveryService,
   getErrorMessage,
   refreshServerHierarchicalMemory,
   SimpleExtensionLoader,
-  type FileDiscoveryService,
-} from '@airiscode/gemini-cli-core';
-import type { LoadServerHierarchicalMemoryResponse } from '@airiscode/gemini-cli-core/index.js';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+} from "@airiscode/gemini-cli-core";
+import type { LoadServerHierarchicalMemoryResponse } from "@airiscode/gemini-cli-core/index.js";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { memoryCommand } from "./memoryCommand.js";
+import type { CommandContext, SlashCommand } from "./types.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...original,
     getErrorMessage: vi.fn((error: unknown) => {
@@ -32,31 +31,26 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-const mockRefreshServerHierarchicalMemory =
-  refreshServerHierarchicalMemory as Mock;
+const mockRefreshServerHierarchicalMemory = refreshServerHierarchicalMemory as Mock;
 
-describe('memoryCommand', () => {
+describe("memoryCommand", () => {
   let mockContext: CommandContext;
 
-  const getSubCommand = (
-    name: 'show' | 'add' | 'refresh' | 'list',
-  ): SlashCommand => {
-    const subCommand = memoryCommand.subCommands?.find(
-      (cmd) => cmd.name === name,
-    );
+  const getSubCommand = (name: "show" | "add" | "refresh" | "list"): SlashCommand => {
+    const subCommand = memoryCommand.subCommands?.find((cmd) => cmd.name === name);
     if (!subCommand) {
       throw new Error(`/memory ${name} command not found.`);
     }
     return subCommand;
   };
 
-  describe('/memory show', () => {
+  describe("/memory show", () => {
     let showCommand: SlashCommand;
     let mockGetUserMemory: Mock;
     let mockGetGeminiMdFileCount: Mock;
 
     beforeEach(() => {
-      showCommand = getSubCommand('show');
+      showCommand = getSubCommand("show");
 
       mockGetUserMemory = vi.fn();
       mockGetGeminiMdFileCount = vi.fn();
@@ -72,32 +66,32 @@ describe('memoryCommand', () => {
       });
     });
 
-    it('should display a message if memory is empty', async () => {
-      if (!showCommand.action) throw new Error('Command has no action');
+    it("should display a message if memory is empty", async () => {
+      if (!showCommand.action) throw new Error("Command has no action");
 
-      mockGetUserMemory.mockReturnValue('');
+      mockGetUserMemory.mockReturnValue("");
       mockGetGeminiMdFileCount.mockReturnValue(0);
 
-      await showCommand.action(mockContext, '');
+      await showCommand.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'Memory is currently empty.',
+          text: "Memory is currently empty.",
         },
         expect.any(Number),
       );
     });
 
-    it('should display the memory content and file count if it exists', async () => {
-      if (!showCommand.action) throw new Error('Command has no action');
+    it("should display the memory content and file count if it exists", async () => {
+      if (!showCommand.action) throw new Error("Command has no action");
 
-      const memoryContent = 'This is a test memory.';
+      const memoryContent = "This is a test memory.";
 
       mockGetUserMemory.mockReturnValue(memoryContent);
       mockGetGeminiMdFileCount.mockReturnValue(1);
 
-      await showCommand.action(mockContext, '');
+      await showCommand.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
@@ -109,31 +103,31 @@ describe('memoryCommand', () => {
     });
   });
 
-  describe('/memory add', () => {
+  describe("/memory add", () => {
     let addCommand: SlashCommand;
 
     beforeEach(() => {
-      addCommand = getSubCommand('add');
+      addCommand = getSubCommand("add");
       mockContext = createMockCommandContext();
     });
 
-    it('should return an error message if no arguments are provided', () => {
-      if (!addCommand.action) throw new Error('Command has no action');
+    it("should return an error message if no arguments are provided", () => {
+      if (!addCommand.action) throw new Error("Command has no action");
 
-      const result = addCommand.action(mockContext, '  ');
+      const result = addCommand.action(mockContext, "  ");
       expect(result).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Usage: /memory add <text to remember>',
+        type: "message",
+        messageType: "error",
+        content: "Usage: /memory add <text to remember>",
       });
 
       expect(mockContext.ui.addItem).not.toHaveBeenCalled();
     });
 
-    it('should return a tool action and add an info message when arguments are provided', () => {
-      if (!addCommand.action) throw new Error('Command has no action');
+    it("should return a tool action and add an info message when arguments are provided", () => {
+      if (!addCommand.action) throw new Error("Command has no action");
 
-      const fact = 'remember this';
+      const fact = "remember this";
       const result = addCommand.action(mockContext, `  ${fact}  `);
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
@@ -145,21 +139,21 @@ describe('memoryCommand', () => {
       );
 
       expect(result).toEqual({
-        type: 'tool',
-        toolName: 'save_memory',
+        type: "tool",
+        toolName: "save_memory",
         toolArgs: { fact },
       });
     });
   });
 
-  describe('/memory refresh', () => {
+  describe("/memory refresh", () => {
     let refreshCommand: SlashCommand;
     let mockSetUserMemory: Mock;
     let mockSetGeminiMdFileCount: Mock;
     let mockSetGeminiMdFilePaths: Mock;
 
     beforeEach(() => {
-      refreshCommand = getSubCommand('refresh');
+      refreshCommand = getSubCommand("refresh");
       mockSetUserMemory = vi.fn();
       mockSetGeminiMdFileCount = vi.fn();
       mockSetGeminiMdFilePaths = vi.fn();
@@ -168,7 +162,7 @@ describe('memoryCommand', () => {
         setUserMemory: mockSetUserMemory,
         setGeminiMdFileCount: mockSetGeminiMdFileCount,
         setGeminiMdFilePaths: mockSetGeminiMdFilePaths,
-        getWorkingDir: () => '/test/dir',
+        getWorkingDir: () => "/test/dir",
         getDebugMode: () => false,
         getFileService: () => ({}) as FileDiscoveryService,
         getExtensionLoader: () => new SimpleExtensionLoader([]),
@@ -182,9 +176,7 @@ describe('memoryCommand', () => {
           include: [],
         }),
         isTrustedFolder: () => false,
-        updateSystemInstructionIfInitialized: vi
-          .fn()
-          .mockResolvedValue(undefined),
+        updateSystemInstructionIfInitialized: vi.fn().mockResolvedValue(undefined),
       };
 
       mockContext = createMockCommandContext({
@@ -194,7 +186,7 @@ describe('memoryCommand', () => {
             merged: {
               memoryDiscoveryMaxDirs: 1000,
               context: {
-                importFormat: 'tree',
+                importFormat: "tree",
               },
             },
           } as unknown as LoadedSettings,
@@ -203,22 +195,22 @@ describe('memoryCommand', () => {
       mockRefreshServerHierarchicalMemory.mockClear();
     });
 
-    it('should display success message when memory is refreshed with content', async () => {
-      if (!refreshCommand.action) throw new Error('Command has no action');
+    it("should display success message when memory is refreshed with content", async () => {
+      if (!refreshCommand.action) throw new Error("Command has no action");
 
       const refreshResult: LoadServerHierarchicalMemoryResponse = {
-        memoryContent: 'new memory content',
+        memoryContent: "new memory content",
         fileCount: 2,
-        filePaths: ['/path/one/GEMINI.md', '/path/two/GEMINI.md'],
+        filePaths: ["/path/one/GEMINI.md", "/path/two/GEMINI.md"],
       };
       mockRefreshServerHierarchicalMemory.mockResolvedValue(refreshResult);
 
-      await refreshCommand.action(mockContext, '');
+      await refreshCommand.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'Refreshing memory from source files...',
+          text: "Refreshing memory from source files...",
         },
         expect.any(Number),
       );
@@ -228,38 +220,38 @@ describe('memoryCommand', () => {
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'Memory refreshed successfully. Loaded 18 characters from 2 file(s).',
+          text: "Memory refreshed successfully. Loaded 18 characters from 2 file(s).",
         },
         expect.any(Number),
       );
     });
 
-    it('should display success message when memory is refreshed with no content', async () => {
-      if (!refreshCommand.action) throw new Error('Command has no action');
+    it("should display success message when memory is refreshed with no content", async () => {
+      if (!refreshCommand.action) throw new Error("Command has no action");
 
-      const refreshResult = { memoryContent: '', fileCount: 0, filePaths: [] };
+      const refreshResult = { memoryContent: "", fileCount: 0, filePaths: [] };
       mockRefreshServerHierarchicalMemory.mockResolvedValue(refreshResult);
 
-      await refreshCommand.action(mockContext, '');
+      await refreshCommand.action(mockContext, "");
 
       expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'Memory refreshed successfully. No memory content found.',
+          text: "Memory refreshed successfully. No memory content found.",
         },
         expect.any(Number),
       );
     });
 
-    it('should display an error message if refreshing fails', async () => {
-      if (!refreshCommand.action) throw new Error('Command has no action');
+    it("should display an error message if refreshing fails", async () => {
+      if (!refreshCommand.action) throw new Error("Command has no action");
 
-      const error = new Error('Failed to read memory files.');
+      const error = new Error("Failed to read memory files.");
       mockRefreshServerHierarchicalMemory.mockRejectedValue(error);
 
-      await refreshCommand.action(mockContext, '');
+      await refreshCommand.action(mockContext, "");
 
       expect(mockRefreshServerHierarchicalMemory).toHaveBeenCalledOnce();
       expect(mockSetUserMemory).not.toHaveBeenCalled();
@@ -277,21 +269,19 @@ describe('memoryCommand', () => {
       expect(getErrorMessage).toHaveBeenCalledWith(error);
     });
 
-    it('should not throw if config service is unavailable', async () => {
-      if (!refreshCommand.action) throw new Error('Command has no action');
+    it("should not throw if config service is unavailable", async () => {
+      if (!refreshCommand.action) throw new Error("Command has no action");
 
       const nullConfigContext = createMockCommandContext({
         services: { config: null },
       });
 
-      await expect(
-        refreshCommand.action(nullConfigContext, ''),
-      ).resolves.toBeUndefined();
+      await expect(refreshCommand.action(nullConfigContext, "")).resolves.toBeUndefined();
 
       expect(nullConfigContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'Refreshing memory from source files...',
+          text: "Refreshing memory from source files...",
         },
         expect.any(Number),
       );
@@ -300,12 +290,12 @@ describe('memoryCommand', () => {
     });
   });
 
-  describe('/memory list', () => {
+  describe("/memory list", () => {
     let listCommand: SlashCommand;
     let mockGetGeminiMdfilePaths: Mock;
 
     beforeEach(() => {
-      listCommand = getSubCommand('list');
+      listCommand = getSubCommand("list");
       mockGetGeminiMdfilePaths = vi.fn();
       mockContext = createMockCommandContext({
         services: {
@@ -316,34 +306,34 @@ describe('memoryCommand', () => {
       });
     });
 
-    it('should display a message if no GEMINI.md files are found', async () => {
-      if (!listCommand.action) throw new Error('Command has no action');
+    it("should display a message if no GEMINI.md files are found", async () => {
+      if (!listCommand.action) throw new Error("Command has no action");
 
       mockGetGeminiMdfilePaths.mockReturnValue([]);
 
-      await listCommand.action(mockContext, '');
+      await listCommand.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: 'No GEMINI.md files in use.',
+          text: "No GEMINI.md files in use.",
         },
         expect.any(Number),
       );
     });
 
-    it('should display the file count and paths if they exist', async () => {
-      if (!listCommand.action) throw new Error('Command has no action');
+    it("should display the file count and paths if they exist", async () => {
+      if (!listCommand.action) throw new Error("Command has no action");
 
-      const filePaths = ['/path/one/GEMINI.md', '/path/two/GEMINI.md'];
+      const filePaths = ["/path/one/GEMINI.md", "/path/two/GEMINI.md"];
       mockGetGeminiMdfilePaths.mockReturnValue(filePaths);
 
-      await listCommand.action(mockContext, '');
+      await listCommand.action(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
           type: MessageType.INFO,
-          text: `There are 2 GEMINI.md file(s) in use:\n\n${filePaths.join('\n')}`,
+          text: `There are 2 GEMINI.md file(s) in use:\n\n${filePaths.join("\n")}`,
         },
         expect.any(Number),
       );
diff --git a/packages/ui-gemini/src/ui/commands/memoryCommand.ts b/packages/ui-gemini/src/ui/commands/memoryCommand.ts
index fa3041989..63da9ec6b 100644
--- a/packages/ui-gemini/src/ui/commands/memoryCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/memoryCommand.ts
@@ -4,33 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  getErrorMessage,
-  refreshServerHierarchicalMemory,
-} from '@airiscode/gemini-cli-core';
-import { MessageType } from '../types.js';
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
+import { getErrorMessage, refreshServerHierarchicalMemory } from "@airiscode/gemini-cli-core";
+import { MessageType } from "../types.js";
+import type { SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const memoryCommand: SlashCommand = {
-  name: 'memory',
-  description: 'Commands for interacting with memory',
+  name: "memory",
+  description: "Commands for interacting with memory",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   subCommands: [
     {
-      name: 'show',
-      description: 'Show the current memory contents',
+      name: "show",
+      description: "Show the current memory contents",
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context) => {
-        const memoryContent = context.services.config?.getUserMemory() || '';
+        const memoryContent = context.services.config?.getUserMemory() || "";
         const fileCount = context.services.config?.getGeminiMdFileCount() || 0;
 
         const messageContent =
           memoryContent.length > 0
             ? `Current memory content from ${fileCount} file(s):\n\n---\n${memoryContent}\n---`
-            : 'Memory is currently empty.';
+            : "Memory is currently empty.";
 
         context.ui.addItem(
           {
@@ -42,16 +39,16 @@ export const memoryCommand: SlashCommand = {
       },
     },
     {
-      name: 'add',
-      description: 'Add content to the memory',
+      name: "add",
+      description: "Add content to the memory",
       kind: CommandKind.BUILT_IN,
       autoExecute: false,
       action: (context, args): SlashCommandActionReturn | void => {
-        if (!args || args.trim() === '') {
+        if (!args || args.trim() === "") {
           return {
-            type: 'message',
-            messageType: 'error',
-            content: 'Usage: /memory add <text to remember>',
+            type: "message",
+            messageType: "error",
+            content: "Usage: /memory add <text to remember>",
           };
         }
 
@@ -64,22 +61,22 @@ export const memoryCommand: SlashCommand = {
         );
 
         return {
-          type: 'tool',
-          toolName: 'save_memory',
+          type: "tool",
+          toolName: "save_memory",
           toolArgs: { fact: args.trim() },
         };
       },
     },
     {
-      name: 'refresh',
-      description: 'Refresh the memory from the source',
+      name: "refresh",
+      description: "Refresh the memory from the source",
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context) => {
         context.ui.addItem(
           {
             type: MessageType.INFO,
-            text: 'Refreshing memory from source files...',
+            text: "Refreshing memory from source files...",
           },
           Date.now(),
         );
@@ -87,15 +84,14 @@ export const memoryCommand: SlashCommand = {
         try {
           const config = await context.services.config;
           if (config) {
-            const { memoryContent, fileCount } =
-              await refreshServerHierarchicalMemory(config);
+            const { memoryContent, fileCount } = await refreshServerHierarchicalMemory(config);
 
             await config.updateSystemInstructionIfInitialized();
 
             const successMessage =
               memoryContent.length > 0
                 ? `Memory refreshed successfully. Loaded ${memoryContent.length} characters from ${fileCount} file(s).`
-                : 'Memory refreshed successfully. No memory content found.';
+                : "Memory refreshed successfully. No memory content found.";
 
             context.ui.addItem(
               {
@@ -118,8 +114,8 @@ export const memoryCommand: SlashCommand = {
       },
     },
     {
-      name: 'list',
-      description: 'Lists the paths of the GEMINI.md files in use',
+      name: "list",
+      description: "Lists the paths of the GEMINI.md files in use",
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context) => {
@@ -128,8 +124,8 @@ export const memoryCommand: SlashCommand = {
 
         const messageContent =
           fileCount > 0
-            ? `There are ${fileCount} GEMINI.md file(s) in use:\n\n${filePaths.join('\n')}`
-            : 'No GEMINI.md files in use.';
+            ? `There are ${fileCount} GEMINI.md file(s) in use:\n\n${filePaths.join("\n")}`
+            : "No GEMINI.md files in use.";
 
         context.ui.addItem(
           {
diff --git a/packages/ui-gemini/src/ui/commands/modelCommand.test.ts b/packages/ui-gemini/src/ui/commands/modelCommand.test.ts
index 8bab5962b..21b0c4cc0 100644
--- a/packages/ui-gemini/src/ui/commands/modelCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/modelCommand.test.ts
@@ -4,35 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { modelCommand } from './modelCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { modelCommand } from "./modelCommand.js";
+import { type CommandContext } from "./types.js";
 
-describe('modelCommand', () => {
+describe("modelCommand", () => {
   let mockContext: CommandContext;
 
   beforeEach(() => {
     mockContext = createMockCommandContext();
   });
 
-  it('should return a dialog action to open the model dialog', async () => {
+  it("should return a dialog action to open the model dialog", async () => {
     if (!modelCommand.action) {
-      throw new Error('The model command must have an action.');
+      throw new Error("The model command must have an action.");
     }
 
-    const result = await modelCommand.action(mockContext, '');
+    const result = await modelCommand.action(mockContext, "");
 
     expect(result).toEqual({
-      type: 'dialog',
-      dialog: 'model',
+      type: "dialog",
+      dialog: "model",
     });
   });
 
-  it('should have the correct name and description', () => {
-    expect(modelCommand.name).toBe('model');
-    expect(modelCommand.description).toBe(
-      'Opens a dialog to configure the model',
-    );
+  it("should have the correct name and description", () => {
+    expect(modelCommand.name).toBe("model");
+    expect(modelCommand.description).toBe("Opens a dialog to configure the model");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/modelCommand.ts b/packages/ui-gemini/src/ui/commands/modelCommand.ts
index d355d0521..31e6cc08a 100644
--- a/packages/ui-gemini/src/ui/commands/modelCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/modelCommand.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CommandKind, type SlashCommand } from './types.js';
+import { CommandKind, type SlashCommand } from "./types.js";
 
 export const modelCommand: SlashCommand = {
-  name: 'model',
-  description: 'Opens a dialog to configure the model',
+  name: "model",
+  description: "Opens a dialog to configure the model",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async () => ({
-    type: 'dialog',
-    dialog: 'model',
+    type: "dialog",
+    dialog: "model",
   }),
 };
diff --git a/packages/ui-gemini/src/ui/commands/permissionsCommand.test.ts b/packages/ui-gemini/src/ui/commands/permissionsCommand.test.ts
index 48b08888b..2ec8543db 100644
--- a/packages/ui-gemini/src/ui/commands/permissionsCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/permissionsCommand.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import * as process from 'node:process';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { permissionsCommand } from './permissionsCommand.js';
-import { type CommandContext, CommandKind } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as process from "node:process";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { permissionsCommand } from "./permissionsCommand.js";
+import { type CommandContext, CommandKind } from "./types.js";
 
-vi.mock('node:fs');
+vi.mock("node:fs");
 
-describe('permissionsCommand', () => {
+describe("permissionsCommand", () => {
   let mockContext: CommandContext;
 
   beforeEach(() => {
@@ -28,89 +28,76 @@ describe('permissionsCommand', () => {
     vi.restoreAllMocks();
   });
 
-  it('should have the correct name and description', () => {
-    expect(permissionsCommand.name).toBe('permissions');
+  it("should have the correct name and description", () => {
+    expect(permissionsCommand.name).toBe("permissions");
     expect(permissionsCommand.description).toBe(
-      'Manage folder trust settings and other permissions',
+      "Manage folder trust settings and other permissions",
     );
   });
 
-  it('should be a built-in command', () => {
+  it("should be a built-in command", () => {
     expect(permissionsCommand.kind).toBe(CommandKind.BUILT_IN);
   });
 
-  it('should have a trust subcommand', () => {
-    const trustCommand = permissionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'trust',
-    );
+  it("should have a trust subcommand", () => {
+    const trustCommand = permissionsCommand.subCommands?.find((cmd) => cmd.name === "trust");
     expect(trustCommand).toBeDefined();
-    expect(trustCommand?.name).toBe('trust');
+    expect(trustCommand?.name).toBe("trust");
     expect(trustCommand?.description).toBe(
-      'Manage folder trust settings. Usage: /permissions trust [<directory-path>]',
+      "Manage folder trust settings. Usage: /permissions trust [<directory-path>]",
     );
     expect(trustCommand?.kind).toBe(CommandKind.BUILT_IN);
   });
 
-  it('should return an action to open the permissions dialog with a specified directory', () => {
-    const trustCommand = permissionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'trust',
-    );
-    const actionResult = trustCommand?.action?.(mockContext, '/test/dir');
+  it("should return an action to open the permissions dialog with a specified directory", () => {
+    const trustCommand = permissionsCommand.subCommands?.find((cmd) => cmd.name === "trust");
+    const actionResult = trustCommand?.action?.(mockContext, "/test/dir");
     expect(actionResult).toEqual({
-      type: 'dialog',
-      dialog: 'permissions',
+      type: "dialog",
+      dialog: "permissions",
       props: {
-        targetDirectory: path.resolve('/test/dir'),
+        targetDirectory: path.resolve("/test/dir"),
       },
     });
   });
 
-  it('should return an action to open the permissions dialog with the current directory if no path is provided', () => {
-    const trustCommand = permissionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'trust',
-    );
-    const actionResult = trustCommand?.action?.(mockContext, '');
+  it("should return an action to open the permissions dialog with the current directory if no path is provided", () => {
+    const trustCommand = permissionsCommand.subCommands?.find((cmd) => cmd.name === "trust");
+    const actionResult = trustCommand?.action?.(mockContext, "");
     expect(actionResult).toEqual({
-      type: 'dialog',
-      dialog: 'permissions',
+      type: "dialog",
+      dialog: "permissions",
       props: {
         targetDirectory: process.cwd(),
       },
     });
   });
 
-  it('should return an error message if the provided path does not exist', () => {
-    const trustCommand = permissionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'trust',
-    );
+  it("should return an error message if the provided path does not exist", () => {
+    const trustCommand = permissionsCommand.subCommands?.find((cmd) => cmd.name === "trust");
     vi.mocked(fs).statSync.mockImplementation(() => {
-      throw new Error('ENOENT: no such file or directory');
+      throw new Error("ENOENT: no such file or directory");
     });
-    const actionResult = trustCommand?.action?.(
-      mockContext,
-      '/nonexistent/dir',
-    );
+    const actionResult = trustCommand?.action?.(mockContext, "/nonexistent/dir");
     expect(actionResult).toEqual({
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Error accessing path: ${path.resolve(
-        '/nonexistent/dir',
+        "/nonexistent/dir",
       )}. ENOENT: no such file or directory`,
     });
   });
 
-  it('should return an error message if the provided path is not a directory', () => {
-    const trustCommand = permissionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'trust',
-    );
+  it("should return an error message if the provided path is not a directory", () => {
+    const trustCommand = permissionsCommand.subCommands?.find((cmd) => cmd.name === "trust");
     vi.mocked(fs).statSync.mockReturnValue({
       isDirectory: vi.fn(() => false),
     } as unknown as fs.Stats);
-    const actionResult = trustCommand?.action?.(mockContext, '/file/not/dir');
+    const actionResult = trustCommand?.action?.(mockContext, "/file/not/dir");
     expect(actionResult).toEqual({
-      type: 'message',
-      messageType: 'error',
-      content: `Path is not a directory: ${path.resolve('/file/not/dir')}`,
+      type: "message",
+      messageType: "error",
+      content: `Path is not a directory: ${path.resolve("/file/not/dir")}`,
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/permissionsCommand.ts b/packages/ui-gemini/src/ui/commands/permissionsCommand.ts
index 7aecbcf2a..a6bcf5f68 100644
--- a/packages/ui-gemini/src/ui/commands/permissionsCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/permissionsCommand.ts
@@ -4,27 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  OpenDialogActionReturn,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from './types.js';
-import { CommandKind } from './types.js';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import * as fs from 'node:fs';
-import { expandHomeDir } from '../utils/directoryUtils.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as process from "node:process";
+import { expandHomeDir } from "../utils/directoryUtils.js";
+import type { OpenDialogActionReturn, SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const permissionsCommand: SlashCommand = {
-  name: 'permissions',
-  description: 'Manage folder trust settings and other permissions',
+  name: "permissions",
+  description: "Manage folder trust settings and other permissions",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   subCommands: [
     {
-      name: 'trust',
-      description:
-        'Manage folder trust settings. Usage: /permissions trust [<directory-path>]',
+      name: "trust",
+      description: "Manage folder trust settings. Usage: /permissions trust [<directory-path>]",
       kind: CommandKind.BUILT_IN,
       autoExecute: false,
       action: (context, input): SlashCommandActionReturn => {
@@ -40,23 +35,23 @@ export const permissionsCommand: SlashCommand = {
         try {
           if (!fs.statSync(targetDirectory).isDirectory()) {
             return {
-              type: 'message',
-              messageType: 'error',
+              type: "message",
+              messageType: "error",
               content: `Path is not a directory: ${targetDirectory}`,
             };
           }
         } catch (e) {
           const message = e instanceof Error ? e.message : String(e);
           return {
-            type: 'message',
-            messageType: 'error',
+            type: "message",
+            messageType: "error",
             content: `Error accessing path: ${targetDirectory}. ${message}`,
           };
         }
 
         return {
-          type: 'dialog',
-          dialog: 'permissions',
+          type: "dialog",
+          dialog: "permissions",
           props: {
             targetDirectory,
           },
@@ -65,20 +60,20 @@ export const permissionsCommand: SlashCommand = {
     },
   ],
   action: (context, input): SlashCommandActionReturn => {
-    const parts = input.trim().split(' ');
+    const parts = input.trim().split(" ");
     const subcommand = parts[0];
 
     if (!subcommand) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Please provide a subcommand for /permissions. Usage: /permissions trust [<directory-path>]`,
       };
     }
 
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Invalid subcommand for /permissions: ${subcommand}. Usage: /permissions trust [<directory-path>]`,
     };
   },
diff --git a/packages/ui-gemini/src/ui/commands/policiesCommand.test.ts b/packages/ui-gemini/src/ui/commands/policiesCommand.test.ts
index cf450108b..82f95e2e2 100644
--- a/packages/ui-gemini/src/ui/commands/policiesCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/policiesCommand.test.ts
@@ -4,45 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { policiesCommand } from './policiesCommand.js';
-import { CommandKind } from './types.js';
-import { MessageType } from '../types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { type Config, PolicyDecision } from '@airiscode/gemini-cli-core';
+import { type Config, PolicyDecision } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { policiesCommand } from "./policiesCommand.js";
+import { CommandKind } from "./types.js";
 
-describe('policiesCommand', () => {
+describe("policiesCommand", () => {
   let mockContext: ReturnType<typeof createMockCommandContext>;
 
   beforeEach(() => {
     mockContext = createMockCommandContext();
   });
 
-  it('should have correct command definition', () => {
-    expect(policiesCommand.name).toBe('policies');
-    expect(policiesCommand.description).toBe('Manage policies');
+  it("should have correct command definition", () => {
+    expect(policiesCommand.name).toBe("policies");
+    expect(policiesCommand.description).toBe("Manage policies");
     expect(policiesCommand.kind).toBe(CommandKind.BUILT_IN);
     expect(policiesCommand.subCommands).toHaveLength(1);
-    expect(policiesCommand.subCommands![0].name).toBe('list');
+    expect(policiesCommand.subCommands![0].name).toBe("list");
   });
 
-  describe('list subcommand', () => {
-    it('should show error if config is missing', async () => {
+  describe("list subcommand", () => {
+    it("should show error if config is missing", async () => {
       mockContext.services.config = null;
       const listCommand = policiesCommand.subCommands![0];
 
-      await listCommand.action!(mockContext, '');
+      await listCommand.action!(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.ERROR,
-          text: 'Error: Config not available.',
+          text: "Error: Config not available.",
         }),
         expect.any(Number),
       );
     });
 
-    it('should show message when no policies are active', async () => {
+    it("should show message when no policies are active", async () => {
       const mockPolicyEngine = {
         getRules: vi.fn().mockReturnValue([]),
       };
@@ -51,22 +51,22 @@ describe('policiesCommand', () => {
       } as unknown as Config;
 
       const listCommand = policiesCommand.subCommands![0];
-      await listCommand.action!(mockContext, '');
+      await listCommand.action!(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.INFO,
-          text: 'No active policies.',
+          text: "No active policies.",
         }),
         expect.any(Number),
       );
     });
 
-    it('should list active policies in correct format', async () => {
+    it("should list active policies in correct format", async () => {
       const mockRules = [
         {
           decision: PolicyDecision.DENY,
-          toolName: 'dangerousTool',
+          toolName: "dangerousTool",
           priority: 10,
         },
         {
@@ -85,12 +85,12 @@ describe('policiesCommand', () => {
       } as unknown as Config;
 
       const listCommand = policiesCommand.subCommands![0];
-      await listCommand.action!(mockContext, '');
+      await listCommand.action!(mockContext, "");
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         expect.objectContaining({
           type: MessageType.INFO,
-          text: expect.stringContaining('**Active Policies**'),
+          text: expect.stringContaining("**Active Policies**"),
         }),
         expect.any(Number),
       );
@@ -98,11 +98,9 @@ describe('policiesCommand', () => {
       const call = vi.mocked(mockContext.ui.addItem).mock.calls[0];
       const content = (call[0] as { text: string }).text;
 
-      expect(content).toContain(
-        '1. **DENY** tool: `dangerousTool` [Priority: 10]',
-      );
-      expect(content).toContain('2. **ALLOW** all tools (args match: `safe`)');
-      expect(content).toContain('3. **ASK_USER** all tools');
+      expect(content).toContain("1. **DENY** tool: `dangerousTool` [Priority: 10]");
+      expect(content).toContain("2. **ALLOW** all tools (args match: `safe`)");
+      expect(content).toContain("3. **ASK_USER** all tools");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/policiesCommand.ts b/packages/ui-gemini/src/ui/commands/policiesCommand.ts
index cc6136c3d..d07545a8d 100644
--- a/packages/ui-gemini/src/ui/commands/policiesCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/policiesCommand.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CommandKind, type SlashCommand } from './types.js';
-import { MessageType } from '../types.js';
+import { MessageType } from "../types.js";
+import { CommandKind, type SlashCommand } from "./types.js";
 
 const listPoliciesCommand: SlashCommand = {
-  name: 'list',
-  description: 'List all active policies',
+  name: "list",
+  description: "List all active policies",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context) => {
@@ -18,7 +18,7 @@ const listPoliciesCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: 'Error: Config not available.',
+          text: "Error: Config not available.",
         },
         Date.now(),
       );
@@ -32,14 +32,14 @@ const listPoliciesCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.INFO,
-          text: 'No active policies.',
+          text: "No active policies.",
         },
         Date.now(),
       );
       return;
     }
 
-    let content = '**Active Policies**\n\n';
+    let content = "**Active Policies**\n\n";
     rules.forEach((rule, index) => {
       content += `${index + 1}. **${rule.decision.toUpperCase()}**`;
       if (rule.toolName) {
@@ -53,7 +53,7 @@ const listPoliciesCommand: SlashCommand = {
       if (rule.priority !== undefined) {
         content += ` [Priority: ${rule.priority}]`;
       }
-      content += '\n';
+      content += "\n";
     });
 
     context.ui.addItem(
@@ -67,8 +67,8 @@ const listPoliciesCommand: SlashCommand = {
 };
 
 export const policiesCommand: SlashCommand = {
-  name: 'policies',
-  description: 'Manage policies',
+  name: "policies",
+  description: "Manage policies",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   subCommands: [listPoliciesCommand],
diff --git a/packages/ui-gemini/src/ui/commands/privacyCommand.test.ts b/packages/ui-gemini/src/ui/commands/privacyCommand.test.ts
index 841ab88fd..714b1273e 100644
--- a/packages/ui-gemini/src/ui/commands/privacyCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/privacyCommand.test.ts
@@ -4,35 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { privacyCommand } from './privacyCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { privacyCommand } from "./privacyCommand.js";
+import { type CommandContext } from "./types.js";
 
-describe('privacyCommand', () => {
+describe("privacyCommand", () => {
   let mockContext: CommandContext;
 
   beforeEach(() => {
     mockContext = createMockCommandContext();
   });
 
-  it('should return a dialog action to open the privacy dialog', () => {
+  it("should return a dialog action to open the privacy dialog", () => {
     // Ensure the command has an action to test.
     if (!privacyCommand.action) {
-      throw new Error('The privacy command must have an action.');
+      throw new Error("The privacy command must have an action.");
     }
 
-    const result = privacyCommand.action(mockContext, '');
+    const result = privacyCommand.action(mockContext, "");
 
     // Assert that the action returns the correct object to trigger the privacy dialog.
     expect(result).toEqual({
-      type: 'dialog',
-      dialog: 'privacy',
+      type: "dialog",
+      dialog: "privacy",
     });
   });
 
-  it('should have the correct name and description', () => {
-    expect(privacyCommand.name).toBe('privacy');
-    expect(privacyCommand.description).toBe('Display the privacy notice');
+  it("should have the correct name and description", () => {
+    expect(privacyCommand.name).toBe("privacy");
+    expect(privacyCommand.description).toBe("Display the privacy notice");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/privacyCommand.ts b/packages/ui-gemini/src/ui/commands/privacyCommand.ts
index 4526de500..9cc782ba3 100644
--- a/packages/ui-gemini/src/ui/commands/privacyCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/privacyCommand.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const privacyCommand: SlashCommand = {
-  name: 'privacy',
-  description: 'Display the privacy notice',
+  name: "privacy",
+  description: "Display the privacy notice",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'privacy',
+    type: "dialog",
+    dialog: "privacy",
   }),
 };
diff --git a/packages/ui-gemini/src/ui/commands/profileCommand.ts b/packages/ui-gemini/src/ui/commands/profileCommand.ts
index 22ef6f37b..4f6a90ad8 100644
--- a/packages/ui-gemini/src/ui/commands/profileCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/profileCommand.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { isDevelopment } from '../../utils/installationInfo.js';
-import { CommandKind, type SlashCommand } from './types.js';
+import { isDevelopment } from "../../utils/installationInfo.js";
+import { CommandKind, type SlashCommand } from "./types.js";
 
 export const profileCommand: SlashCommand | null = isDevelopment
   ? {
-      name: 'profile',
+      name: "profile",
       kind: CommandKind.BUILT_IN,
-      description: 'Toggle the debug profile display',
+      description: "Toggle the debug profile display",
       autoExecute: true,
       action: async (context) => {
         context.ui.toggleDebugProfiler();
         return {
-          type: 'message',
-          messageType: 'info',
-          content: 'Toggled profile display.',
+          type: "message",
+          messageType: "info",
+          content: "Toggled profile display.",
         };
       },
     }
diff --git a/packages/ui-gemini/src/ui/commands/quitCommand.test.ts b/packages/ui-gemini/src/ui/commands/quitCommand.test.ts
index e67723fdf..c2aaaaa2f 100644
--- a/packages/ui-gemini/src/ui/commands/quitCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/quitCommand.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { quitCommand } from './quitCommand.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { formatDuration } from '../utils/formatters.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { formatDuration } from "../utils/formatters.js";
+import { quitCommand } from "./quitCommand.js";
 
-vi.mock('../utils/formatters.js');
+vi.mock("../utils/formatters.js");
 
-describe('quitCommand', () => {
+describe("quitCommand", () => {
   beforeEach(() => {
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-01-01T01:00:00Z'));
-    vi.mocked(formatDuration).mockReturnValue('1h 0m 0s');
+    vi.setSystemTime(new Date("2025-01-01T01:00:00Z"));
+    vi.mocked(formatDuration).mockReturnValue("1h 0m 0s");
   });
 
   afterEach(() => {
@@ -23,30 +23,30 @@ describe('quitCommand', () => {
     vi.clearAllMocks();
   });
 
-  it('returns a QuitActionReturn object with the correct messages', () => {
+  it("returns a QuitActionReturn object with the correct messages", () => {
     const mockContext = createMockCommandContext({
       session: {
         stats: {
-          sessionStartTime: new Date('2025-01-01T00:00:00Z'),
+          sessionStartTime: new Date("2025-01-01T00:00:00Z"),
         },
       },
     });
 
-    if (!quitCommand.action) throw new Error('Action is not defined');
-    const result = quitCommand.action(mockContext, 'quit');
+    if (!quitCommand.action) throw new Error("Action is not defined");
+    const result = quitCommand.action(mockContext, "quit");
 
     expect(formatDuration).toHaveBeenCalledWith(3600000); // 1 hour in ms
     expect(result).toEqual({
-      type: 'quit',
+      type: "quit",
       messages: [
         {
-          type: 'user',
-          text: '/quit',
+          type: "user",
+          text: "/quit",
           id: expect.any(Number),
         },
         {
-          type: 'quit',
-          duration: '1h 0m 0s',
+          type: "quit",
+          duration: "1h 0m 0s",
           id: expect.any(Number),
         },
       ],
diff --git a/packages/ui-gemini/src/ui/commands/quitCommand.ts b/packages/ui-gemini/src/ui/commands/quitCommand.ts
index ab879f22c..40749e877 100644
--- a/packages/ui-gemini/src/ui/commands/quitCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/quitCommand.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { formatDuration } from '../utils/formatters.js';
-import { CommandKind, type SlashCommand } from './types.js';
+import { formatDuration } from "../utils/formatters.js";
+import { CommandKind, type SlashCommand } from "./types.js";
 
 export const quitCommand: SlashCommand = {
-  name: 'quit',
-  altNames: ['exit'],
-  description: 'Exit the cli',
+  name: "quit",
+  altNames: ["exit"],
+  description: "Exit the cli",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (context) => {
@@ -19,15 +19,15 @@ export const quitCommand: SlashCommand = {
     const wallDuration = now - sessionStartTime.getTime();
 
     return {
-      type: 'quit',
+      type: "quit",
       messages: [
         {
-          type: 'user',
+          type: "user",
           text: `/quit`, // Keep it consistent, even if /exit was used
           id: now - 1,
         },
         {
-          type: 'quit',
+          type: "quit",
           duration: formatDuration(wallDuration),
           id: now,
         },
diff --git a/packages/ui-gemini/src/ui/commands/restoreCommand.test.ts b/packages/ui-gemini/src/ui/commands/restoreCommand.test.ts
index 1a2c65be6..d4015651a 100644
--- a/packages/ui-gemini/src/ui/commands/restoreCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/restoreCommand.test.ts
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { restoreCommand } from './restoreCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import {
-  GEMINI_DIR,
-  type Config,
-  type GitService,
-} from '@airiscode/gemini-cli-core';
-
-describe('restoreCommand', () => {
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import { type Config, GEMINI_DIR, type GitService } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { restoreCommand } from "./restoreCommand.js";
+import { type CommandContext } from "./types.js";
+
+describe("restoreCommand", () => {
   let mockContext: CommandContext;
   let mockConfig: Config;
   let mockGitService: GitService;
@@ -27,11 +23,9 @@ describe('restoreCommand', () => {
   let checkpointsDir: string;
 
   beforeEach(async () => {
-    testRootDir = await fs.mkdtemp(
-      path.join(os.tmpdir(), 'restore-command-test-'),
-    );
+    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "restore-command-test-"));
     geminiTempDir = path.join(testRootDir, GEMINI_DIR);
-    checkpointsDir = path.join(geminiTempDir, 'checkpoints');
+    checkpointsDir = path.join(geminiTempDir, "checkpoints");
     // The command itself creates this, but for tests it's easier to have it ready.
     // Some tests might remove it to test error paths.
     await fs.mkdir(checkpointsDir, { recursive: true });
@@ -65,16 +59,16 @@ describe('restoreCommand', () => {
     await fs.rm(testRootDir, { recursive: true, force: true });
   });
 
-  it('should return null if checkpointing is not enabled', () => {
+  it("should return null if checkpointing is not enabled", () => {
     vi.mocked(mockConfig.getCheckpointingEnabled).mockReturnValue(false);
 
     expect(restoreCommand(mockConfig)).toBeNull();
   });
 
-  it('should return the command if checkpointing is enabled', () => {
+  it("should return the command if checkpointing is enabled", () => {
     expect(restoreCommand(mockConfig)).toEqual(
       expect.objectContaining({
-        name: 'restore',
+        name: "restore",
         description: expect.any(String),
         action: expect.any(Function),
         completion: expect.any(Function),
@@ -82,126 +76,115 @@ describe('restoreCommand', () => {
     );
   });
 
-  describe('action', () => {
-    it('should return an error if temp dir is not found', async () => {
-      vi.mocked(
-        mockConfig.storage.getProjectTempCheckpointsDir,
-      ).mockReturnValue('');
-
-      expect(
-        await restoreCommand(mockConfig)?.action?.(mockContext, ''),
-      ).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'Could not determine the .gemini directory path.',
+  describe("action", () => {
+    it("should return an error if temp dir is not found", async () => {
+      vi.mocked(mockConfig.storage.getProjectTempCheckpointsDir).mockReturnValue("");
+
+      expect(await restoreCommand(mockConfig)?.action?.(mockContext, "")).toEqual({
+        type: "message",
+        messageType: "error",
+        content: "Could not determine the .gemini directory path.",
       });
     });
 
-    it('should inform when no checkpoints are found if no args are passed', async () => {
+    it("should inform when no checkpoints are found if no args are passed", async () => {
       // Remove the directory to ensure the command creates it.
       await fs.rm(checkpointsDir, { recursive: true, force: true });
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.action?.(mockContext, '')).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: 'No restorable tool calls found.',
+      expect(await command?.action?.(mockContext, "")).toEqual({
+        type: "message",
+        messageType: "info",
+        content: "No restorable tool calls found.",
       });
       // Verify the directory was created by the command.
       await expect(fs.stat(checkpointsDir)).resolves.toBeDefined();
     });
 
-    it('should list available checkpoints if no args are passed', async () => {
-      await fs.writeFile(path.join(checkpointsDir, 'test1.json'), '{}');
-      await fs.writeFile(path.join(checkpointsDir, 'test2.json'), '{}');
+    it("should list available checkpoints if no args are passed", async () => {
+      await fs.writeFile(path.join(checkpointsDir, "test1.json"), "{}");
+      await fs.writeFile(path.join(checkpointsDir, "test2.json"), "{}");
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.action?.(mockContext, '')).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: 'Available tool calls to restore:\n\ntest1\ntest2',
+      expect(await command?.action?.(mockContext, "")).toEqual({
+        type: "message",
+        messageType: "info",
+        content: "Available tool calls to restore:\n\ntest1\ntest2",
       });
     });
 
-    it('should return an error if the specified file is not found', async () => {
-      await fs.writeFile(path.join(checkpointsDir, 'test1.json'), '{}');
+    it("should return an error if the specified file is not found", async () => {
+      await fs.writeFile(path.join(checkpointsDir, "test1.json"), "{}");
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.action?.(mockContext, 'test2')).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: 'File not found: test2.json',
+      expect(await command?.action?.(mockContext, "test2")).toEqual({
+        type: "message",
+        messageType: "error",
+        content: "File not found: test2.json",
       });
     });
 
-    it('should handle file read errors gracefully', async () => {
-      const checkpointName = 'test1';
-      const checkpointPath = path.join(
-        checkpointsDir,
-        `${checkpointName}.json`,
-      );
+    it("should handle file read errors gracefully", async () => {
+      const checkpointName = "test1";
+      const checkpointPath = path.join(checkpointsDir, `${checkpointName}.json`);
       // Create a directory instead of a file to cause a read error.
       await fs.mkdir(checkpointPath);
       const command = restoreCommand(mockConfig);
 
       expect(await command?.action?.(mockContext, checkpointName)).toEqual({
-        type: 'message',
-        messageType: 'error',
-        content: expect.stringContaining(
-          'Could not read restorable tool calls.',
-        ),
+        type: "message",
+        messageType: "error",
+        content: expect.stringContaining("Could not read restorable tool calls."),
       });
     });
 
-    it('should restore a tool call and project state', async () => {
+    it("should restore a tool call and project state", async () => {
       const toolCallData = {
-        history: [{ type: 'user', text: 'do a thing', id: 123 }],
-        clientHistory: [{ role: 'user', parts: [{ text: 'do a thing' }] }],
-        commitHash: 'abcdef123',
-        toolCall: { name: 'run_shell_command', args: { command: 'ls' } },
+        history: [{ type: "user", text: "do a thing", id: 123 }],
+        clientHistory: [{ role: "user", parts: [{ text: "do a thing" }] }],
+        commitHash: "abcdef123",
+        toolCall: { name: "run_shell_command", args: { command: "ls" } },
       };
       await fs.writeFile(
-        path.join(checkpointsDir, 'my-checkpoint.json'),
+        path.join(checkpointsDir, "my-checkpoint.json"),
         JSON.stringify(toolCallData),
       );
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.action?.(mockContext, 'my-checkpoint')).toEqual({
-        type: 'tool',
-        toolName: 'run_shell_command',
-        toolArgs: { command: 'ls' },
+      expect(await command?.action?.(mockContext, "my-checkpoint")).toEqual({
+        type: "tool",
+        toolName: "run_shell_command",
+        toolArgs: { command: "ls" },
       });
-      expect(mockContext.ui.loadHistory).toHaveBeenCalledWith(
-        toolCallData.history,
-      );
+      expect(mockContext.ui.loadHistory).toHaveBeenCalledWith(toolCallData.history);
       expect(mockSetHistory).toHaveBeenCalledWith(toolCallData.clientHistory);
       expect(mockGitService.restoreProjectFromSnapshot).toHaveBeenCalledWith(
         toolCallData.commitHash,
       );
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
-          type: 'info',
-          text: 'Restored project to the state before the tool call.',
+          type: "info",
+          text: "Restored project to the state before the tool call.",
         },
         expect.any(Number),
       );
     });
 
-    it('should restore even if only toolCall is present', async () => {
+    it("should restore even if only toolCall is present", async () => {
       const toolCallData = {
-        toolCall: { name: 'run_shell_command', args: { command: 'ls' } },
+        toolCall: { name: "run_shell_command", args: { command: "ls" } },
       };
       await fs.writeFile(
-        path.join(checkpointsDir, 'my-checkpoint.json'),
+        path.join(checkpointsDir, "my-checkpoint.json"),
         JSON.stringify(toolCallData),
       );
 
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.action?.(mockContext, 'my-checkpoint')).toEqual({
-        type: 'tool',
-        toolName: 'run_shell_command',
-        toolArgs: { command: 'ls' },
+      expect(await command?.action?.(mockContext, "my-checkpoint")).toEqual({
+        type: "tool",
+        toolName: "run_shell_command",
+        toolArgs: { command: "ls" },
       });
 
       expect(mockContext.ui.loadHistory).not.toHaveBeenCalled();
@@ -210,8 +193,8 @@ describe('restoreCommand', () => {
     });
   });
 
-  it('should return an error for a checkpoint file missing the toolCall property', async () => {
-    const checkpointName = 'missing-toolcall';
+  it("should return an error for a checkpoint file missing the toolCall property", async () => {
+    const checkpointName = "missing-toolcall";
     await fs.writeFile(
       path.join(checkpointsDir, `${checkpointName}.json`),
       JSON.stringify({ history: [] }), // An object that is valid JSON but missing the 'toolCall' property
@@ -219,41 +202,35 @@ describe('restoreCommand', () => {
     const command = restoreCommand(mockConfig);
 
     expect(await command?.action?.(mockContext, checkpointName)).toEqual({
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       // A more specific error message would be ideal, but for now, we can assert the current behavior.
-      content: expect.stringContaining('Checkpoint file is invalid'),
+      content: expect.stringContaining("Checkpoint file is invalid"),
     });
   });
 
-  describe('completion', () => {
-    it('should return an empty array if temp dir is not found', async () => {
-      vi.mocked(mockConfig.storage.getProjectTempDir).mockReturnValue('');
+  describe("completion", () => {
+    it("should return an empty array if temp dir is not found", async () => {
+      vi.mocked(mockConfig.storage.getProjectTempDir).mockReturnValue("");
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.completion?.(mockContext, '')).toEqual([]);
+      expect(await command?.completion?.(mockContext, "")).toEqual([]);
     });
 
-    it('should return an empty array on readdir error', async () => {
+    it("should return an empty array on readdir error", async () => {
       await fs.rm(checkpointsDir, { recursive: true, force: true });
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.completion?.(mockContext, '')).toEqual([]);
+      expect(await command?.completion?.(mockContext, "")).toEqual([]);
     });
 
-    it('should return a list of checkpoint names', async () => {
-      await fs.writeFile(path.join(checkpointsDir, 'test1.json'), '{}');
-      await fs.writeFile(path.join(checkpointsDir, 'test2.json'), '{}');
-      await fs.writeFile(
-        path.join(checkpointsDir, 'not-a-checkpoint.txt'),
-        '{}',
-      );
+    it("should return a list of checkpoint names", async () => {
+      await fs.writeFile(path.join(checkpointsDir, "test1.json"), "{}");
+      await fs.writeFile(path.join(checkpointsDir, "test2.json"), "{}");
+      await fs.writeFile(path.join(checkpointsDir, "not-a-checkpoint.txt"), "{}");
       const command = restoreCommand(mockConfig);
 
-      expect(await command?.completion?.(mockContext, '')).toEqual([
-        'test1',
-        'test2',
-      ]);
+      expect(await command?.completion?.(mockContext, "")).toEqual(["test1", "test2"]);
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/restoreCommand.ts b/packages/ui-gemini/src/ui/commands/restoreCommand.ts
index 4f47e0ab3..77d47a329 100644
--- a/packages/ui-gemini/src/ui/commands/restoreCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/restoreCommand.ts
@@ -4,9 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import { z } from 'zod';
+import * as fs from "node:fs/promises";
+import path from "node:path";
 import {
   type Config,
   formatCheckpointDisplayList,
@@ -14,15 +13,16 @@ import {
   getTruncatedCheckpointNames,
   performRestore,
   type ToolCallData,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
+import type { Content } from "@google/genai";
+import { z } from "zod";
+import type { HistoryItem } from "../types.js";
 import {
   type CommandContext,
+  CommandKind,
   type SlashCommand,
   type SlashCommandActionReturn,
-  CommandKind,
-} from './types.js';
-import type { HistoryItem } from '../types.js';
-import type { Content } from '@google/genai';
+} from "./types.js";
 
 const HistoryItemSchema = z
   .object({
@@ -45,9 +45,9 @@ async function restoreAction(
 
   if (!checkpointDir) {
     return {
-      type: 'message',
-      messageType: 'error',
-      content: 'Could not determine the .gemini directory path.',
+      type: "message",
+      messageType: "error",
+      content: "Could not determine the .gemini directory path.",
     };
   }
 
@@ -55,42 +55,42 @@ async function restoreAction(
     // Ensure the directory exists before trying to read it.
     await fs.mkdir(checkpointDir, { recursive: true });
     const files = await fs.readdir(checkpointDir);
-    const jsonFiles = files.filter((file) => file.endsWith('.json'));
+    const jsonFiles = files.filter((file) => file.endsWith(".json"));
 
     if (!args) {
       if (jsonFiles.length === 0) {
         return {
-          type: 'message',
-          messageType: 'info',
-          content: 'No restorable tool calls found.',
+          type: "message",
+          messageType: "info",
+          content: "No restorable tool calls found.",
         };
       }
       const fileList = formatCheckpointDisplayList(jsonFiles);
       return {
-        type: 'message',
-        messageType: 'info',
+        type: "message",
+        messageType: "info",
         content: `Available tool calls to restore:\n\n${fileList}`,
       };
     }
 
-    const selectedFile = args.endsWith('.json') ? args : `${args}.json`;
+    const selectedFile = args.endsWith(".json") ? args : `${args}.json`;
 
     if (!jsonFiles.includes(selectedFile)) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `File not found: ${selectedFile}`,
       };
     }
 
     const filePath = path.join(checkpointDir, selectedFile);
-    const data = await fs.readFile(filePath, 'utf-8');
+    const data = await fs.readFile(filePath, "utf-8");
     const parseResult = ToolCallDataSchema.safeParse(JSON.parse(data));
 
     if (!parseResult.success) {
       return {
-        type: 'message',
-        messageType: 'error',
+        type: "message",
+        messageType: "error",
         content: `Checkpoint file is invalid: ${parseResult.error.message}`,
       };
     }
@@ -98,15 +98,12 @@ async function restoreAction(
     // We safely cast here because:
     // 1. ToolCallDataSchema strictly validates the existence of 'history' as an array and 'id'/'type' on each item.
     // 2. We trust that files valid according to this schema (written by useGeminiStream) contain the full HistoryItem structure.
-    const toolCallData = parseResult.data as ToolCallData<
-      HistoryItem[],
-      Record<string, unknown>
-    >;
+    const toolCallData = parseResult.data as ToolCallData<HistoryItem[], Record<string, unknown>>;
 
     const actionStream = performRestore(toolCallData, gitService);
 
     for await (const action of actionStream) {
-      if (action.type === 'message') {
+      if (action.type === "message") {
         addItem(
           {
             type: action.messageType,
@@ -114,34 +111,29 @@ async function restoreAction(
           },
           Date.now(),
         );
-      } else if (action.type === 'load_history' && loadHistory) {
+      } else if (action.type === "load_history" && loadHistory) {
         loadHistory(action.history);
         if (action.clientHistory) {
-          await config
-            ?.getGeminiClient()
-            ?.setHistory(action.clientHistory as Content[]);
+          await config?.getGeminiClient()?.setHistory(action.clientHistory as Content[]);
         }
       }
     }
 
     return {
-      type: 'tool',
+      type: "tool",
       toolName: toolCallData.toolCall.name,
       toolArgs: toolCallData.toolCall.args,
     };
   } catch (error) {
     return {
-      type: 'message',
-      messageType: 'error',
+      type: "message",
+      messageType: "error",
       content: `Could not read restorable tool calls. This is the error: ${error}`,
     };
   }
 }
 
-async function completion(
-  context: CommandContext,
-  _partialArg: string,
-): Promise<string[]> {
+async function completion(context: CommandContext, _partialArg: string): Promise<string[]> {
   const { services } = context;
   const { config } = services;
   const checkpointDir = config?.storage.getProjectTempCheckpointsDir();
@@ -150,7 +142,7 @@ async function completion(
   }
   try {
     const files = await fs.readdir(checkpointDir);
-    const jsonFiles = files.filter((file) => file.endsWith('.json'));
+    const jsonFiles = files.filter((file) => file.endsWith(".json"));
     return getTruncatedCheckpointNames(jsonFiles);
   } catch (_err) {
     return [];
@@ -163,9 +155,9 @@ export const restoreCommand = (config: Config | null): SlashCommand | null => {
   }
 
   return {
-    name: 'restore',
+    name: "restore",
     description:
-      'Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested',
+      "Restore a tool call. This will reset the conversation and file history to the state it was in when the tool call was suggested",
     kind: CommandKind.BUILT_IN,
     autoExecute: true,
     action: restoreAction,
diff --git a/packages/ui-gemini/src/ui/commands/resumeCommand.ts b/packages/ui-gemini/src/ui/commands/resumeCommand.ts
index 636dfef1b..52213a982 100644
--- a/packages/ui-gemini/src/ui/commands/resumeCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/resumeCommand.ts
@@ -4,23 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  OpenDialogActionReturn,
-  CommandContext,
-  SlashCommand,
-} from './types.js';
-import { CommandKind } from './types.js';
+import type { CommandContext, OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const resumeCommand: SlashCommand = {
-  name: 'resume',
-  description: 'Browse and resume auto-saved conversations',
+  name: "resume",
+  description: "Browse and resume auto-saved conversations",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
-  action: async (
-    _context: CommandContext,
-    _args: string,
-  ): Promise<OpenDialogActionReturn> => ({
-    type: 'dialog',
-    dialog: 'sessionBrowser',
+  action: async (_context: CommandContext, _args: string): Promise<OpenDialogActionReturn> => ({
+    type: "dialog",
+    dialog: "sessionBrowser",
   }),
 };
diff --git a/packages/ui-gemini/src/ui/commands/settingsCommand.test.ts b/packages/ui-gemini/src/ui/commands/settingsCommand.test.ts
index 96d0d5114..9b9544eb5 100644
--- a/packages/ui-gemini/src/ui/commands/settingsCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/settingsCommand.test.ts
@@ -4,33 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { settingsCommand } from './settingsCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { settingsCommand } from "./settingsCommand.js";
+import { type CommandContext } from "./types.js";
 
-describe('settingsCommand', () => {
+describe("settingsCommand", () => {
   let mockContext: CommandContext;
 
   beforeEach(() => {
     mockContext = createMockCommandContext();
   });
 
-  it('should return a dialog action to open the settings dialog', () => {
+  it("should return a dialog action to open the settings dialog", () => {
     if (!settingsCommand.action) {
-      throw new Error('The settings command must have an action.');
+      throw new Error("The settings command must have an action.");
     }
-    const result = settingsCommand.action(mockContext, '');
+    const result = settingsCommand.action(mockContext, "");
     expect(result).toEqual({
-      type: 'dialog',
-      dialog: 'settings',
+      type: "dialog",
+      dialog: "settings",
     });
   });
 
-  it('should have the correct name and description', () => {
-    expect(settingsCommand.name).toBe('settings');
-    expect(settingsCommand.description).toBe(
-      'View and edit Gemini CLI settings',
-    );
+  it("should have the correct name and description", () => {
+    expect(settingsCommand.name).toBe("settings");
+    expect(settingsCommand.description).toBe("View and edit Gemini CLI settings");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/settingsCommand.ts b/packages/ui-gemini/src/ui/commands/settingsCommand.ts
index 91b2c50cc..bf6daecaf 100644
--- a/packages/ui-gemini/src/ui/commands/settingsCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/settingsCommand.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const settingsCommand: SlashCommand = {
-  name: 'settings',
-  description: 'View and edit Gemini CLI settings',
+  name: "settings",
+  description: "View and edit Gemini CLI settings",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (_context, _args): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'settings',
+    type: "dialog",
+    dialog: "settings",
   }),
 };
diff --git a/packages/ui-gemini/src/ui/commands/setupGithubCommand.test.ts b/packages/ui-gemini/src/ui/commands/setupGithubCommand.test.ts
index 0abf45c05..08c40ebd9 100644
--- a/packages/ui-gemini/src/ui/commands/setupGithubCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/setupGithubCommand.test.ts
@@ -4,46 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import os from 'node:os';
-import path from 'node:path';
-import fs from 'node:fs/promises';
-
-import { vi, describe, expect, it, afterEach, beforeEach } from 'vitest';
-import * as gitUtils from '../../utils/gitUtils.js';
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import type { ToolActionReturn } from "@airiscode/gemini-cli-core";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import * as gitUtils from "../../utils/gitUtils.js";
+import * as commandUtils from "../utils/commandUtils.js";
 import {
+  GITHUB_WORKFLOW_PATHS,
   setupGithubCommand,
   updateGitignore,
-  GITHUB_WORKFLOW_PATHS,
-} from './setupGithubCommand.js';
-import type { CommandContext } from './types.js';
-import * as commandUtils from '../utils/commandUtils.js';
-import type { ToolActionReturn } from '@airiscode/gemini-cli-core';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+} from "./setupGithubCommand.js";
+import type { CommandContext } from "./types.js";
 
-vi.mock('child_process');
+vi.mock("child_process");
 
 // Mock fetch globally
 global.fetch = vi.fn();
 
-vi.mock('../../utils/gitUtils.js', () => ({
+vi.mock("../../utils/gitUtils.js", () => ({
   isGitHubRepository: vi.fn(),
   getGitRepoRoot: vi.fn(),
   getLatestGitHubRelease: vi.fn(),
   getGitHubRepoInfo: vi.fn(),
 }));
 
-vi.mock('../utils/commandUtils.js', () => ({
+vi.mock("../utils/commandUtils.js", () => ({
   getUrlOpenCommand: vi.fn(),
 }));
 
-describe('setupGithubCommand', async () => {
-  let scratchDir = '';
+describe("setupGithubCommand", async () => {
+  let scratchDir = "";
 
   beforeEach(async () => {
     vi.resetAllMocks();
-    scratchDir = await fs.mkdtemp(
-      path.join(os.tmpdir(), 'setup-github-command-'),
-    );
+    scratchDir = await fs.mkdtemp(path.join(os.tmpdir(), "setup-github-command-"));
   });
 
   afterEach(async () => {
@@ -51,12 +48,12 @@ describe('setupGithubCommand', async () => {
     if (scratchDir) await fs.rm(scratchDir, { recursive: true });
   });
 
-  it('downloads workflows, updates gitignore, and includes pipefail on non-windows', async () => {
-    vi.spyOn(process, 'platform', 'get').mockReturnValue('linux');
-    const fakeRepoOwner = 'fake';
-    const fakeRepoName = 'repo';
+  it("downloads workflows, updates gitignore, and includes pipefail on non-windows", async () => {
+    vi.spyOn(process, "platform", "get").mockReturnValue("linux");
+    const fakeRepoOwner = "fake";
+    const fakeRepoName = "repo";
     const fakeRepoRoot = scratchDir;
-    const fakeReleaseVersion = 'v1.2.3';
+    const fakeReleaseVersion = "v1.2.3";
 
     const workflows = GITHUB_WORKFLOW_PATHS.map((p) => path.basename(p));
 
@@ -64,51 +61,42 @@ describe('setupGithubCommand', async () => {
       const filename = path.basename(url.toString());
       return new Response(filename, {
         status: 200,
-        statusText: 'OK',
-        headers: { 'Content-Type': 'text/plain' },
+        statusText: "OK",
+        headers: { "Content-Type": "text/plain" },
       });
     });
 
     vi.mocked(gitUtils.isGitHubRepository).mockReturnValueOnce(true);
     vi.mocked(gitUtils.getGitRepoRoot).mockReturnValueOnce(fakeRepoRoot);
-    vi.mocked(gitUtils.getLatestGitHubRelease).mockResolvedValueOnce(
-      fakeReleaseVersion,
-    );
+    vi.mocked(gitUtils.getLatestGitHubRelease).mockResolvedValueOnce(fakeReleaseVersion);
     vi.mocked(gitUtils.getGitHubRepoInfo).mockReturnValue({
       owner: fakeRepoOwner,
       repo: fakeRepoName,
     });
-    vi.mocked(commandUtils.getUrlOpenCommand).mockReturnValueOnce(
-      'fakeOpenCommand',
-    );
+    vi.mocked(commandUtils.getUrlOpenCommand).mockReturnValueOnce("fakeOpenCommand");
 
     const result = (await setupGithubCommand.action?.(
       {} as CommandContext,
-      '',
+      "",
     )) as ToolActionReturn;
 
     const { command } = result.toolArgs;
 
     // Check for pipefail
-    expect(command).toContain('set -eEuo pipefail');
+    expect(command).toContain("set -eEuo pipefail");
 
     // Check that the other commands are still present
-    expect(command).toContain('fakeOpenCommand');
+    expect(command).toContain("fakeOpenCommand");
 
     // Verify that the workflows were downloaded
     for (const workflow of workflows) {
-      const workflowFile = path.join(
-        scratchDir,
-        '.github',
-        'workflows',
-        workflow,
-      );
-      const contents = await fs.readFile(workflowFile, 'utf8');
+      const workflowFile = path.join(scratchDir, ".github", "workflows", workflow);
+      const contents = await fs.readFile(workflowFile, "utf8");
       expect(contents).toContain(workflow);
     }
 
     // Verify that .gitignore was created with the expected entries
-    const gitignorePath = path.join(scratchDir, '.gitignore');
+    const gitignorePath = path.join(scratchDir, ".gitignore");
     const gitignoreExists = await fs
       .access(gitignorePath)
       .then(() => true)
@@ -116,69 +104,60 @@ describe('setupGithubCommand', async () => {
     expect(gitignoreExists).toBe(true);
 
     if (gitignoreExists) {
-      const gitignoreContent = await fs.readFile(gitignorePath, 'utf8');
-      expect(gitignoreContent).toContain('.gemini/');
-      expect(gitignoreContent).toContain('gha-creds-*.json');
+      const gitignoreContent = await fs.readFile(gitignorePath, "utf8");
+      expect(gitignoreContent).toContain(".gemini/");
+      expect(gitignoreContent).toContain("gha-creds-*.json");
     }
   });
 
-  it('downloads workflows, updates gitignore, and does not include pipefail on windows', async () => {
-    vi.spyOn(process, 'platform', 'get').mockReturnValue('win32');
-    const fakeRepoOwner = 'fake';
-    const fakeRepoName = 'repo';
+  it("downloads workflows, updates gitignore, and does not include pipefail on windows", async () => {
+    vi.spyOn(process, "platform", "get").mockReturnValue("win32");
+    const fakeRepoOwner = "fake";
+    const fakeRepoName = "repo";
     const fakeRepoRoot = scratchDir;
-    const fakeReleaseVersion = 'v1.2.3';
+    const fakeReleaseVersion = "v1.2.3";
 
     const workflows = GITHUB_WORKFLOW_PATHS.map((p) => path.basename(p));
     vi.mocked(global.fetch).mockImplementation(async (url) => {
       const filename = path.basename(url.toString());
       return new Response(filename, {
         status: 200,
-        statusText: 'OK',
-        headers: { 'Content-Type': 'text/plain' },
+        statusText: "OK",
+        headers: { "Content-Type": "text/plain" },
       });
     });
 
     vi.mocked(gitUtils.isGitHubRepository).mockReturnValueOnce(true);
     vi.mocked(gitUtils.getGitRepoRoot).mockReturnValueOnce(fakeRepoRoot);
-    vi.mocked(gitUtils.getLatestGitHubRelease).mockResolvedValueOnce(
-      fakeReleaseVersion,
-    );
+    vi.mocked(gitUtils.getLatestGitHubRelease).mockResolvedValueOnce(fakeReleaseVersion);
     vi.mocked(gitUtils.getGitHubRepoInfo).mockReturnValue({
       owner: fakeRepoOwner,
       repo: fakeRepoName,
     });
-    vi.mocked(commandUtils.getUrlOpenCommand).mockReturnValueOnce(
-      'fakeOpenCommand',
-    );
+    vi.mocked(commandUtils.getUrlOpenCommand).mockReturnValueOnce("fakeOpenCommand");
 
     const result = (await setupGithubCommand.action?.(
       {} as CommandContext,
-      '',
+      "",
     )) as ToolActionReturn;
 
     const { command } = result.toolArgs;
 
     // Check for pipefail
-    expect(command).not.toContain('set -eEuo pipefail');
+    expect(command).not.toContain("set -eEuo pipefail");
 
     // Check that the other commands are still present
-    expect(command).toContain('fakeOpenCommand');
+    expect(command).toContain("fakeOpenCommand");
 
     // Verify that the workflows were downloaded
     for (const workflow of workflows) {
-      const workflowFile = path.join(
-        scratchDir,
-        '.github',
-        'workflows',
-        workflow,
-      );
-      const contents = await fs.readFile(workflowFile, 'utf8');
+      const workflowFile = path.join(scratchDir, ".github", "workflows", workflow);
+      const contents = await fs.readFile(workflowFile, "utf8");
       expect(contents).toContain(workflow);
     }
 
     // Verify that .gitignore was created with the expected entries
-    const gitignorePath = path.join(scratchDir, '.gitignore');
+    const gitignorePath = path.join(scratchDir, ".gitignore");
     const gitignoreExists = await fs
       .access(gitignorePath)
       .then(() => true)
@@ -186,154 +165,145 @@ describe('setupGithubCommand', async () => {
     expect(gitignoreExists).toBe(true);
 
     if (gitignoreExists) {
-      const gitignoreContent = await fs.readFile(gitignorePath, 'utf8');
-      expect(gitignoreContent).toContain('.gemini/');
-      expect(gitignoreContent).toContain('gha-creds-*.json');
+      const gitignoreContent = await fs.readFile(gitignorePath, "utf8");
+      expect(gitignoreContent).toContain(".gemini/");
+      expect(gitignoreContent).toContain("gha-creds-*.json");
     }
   });
 
-  it('throws an error when download fails', async () => {
+  it("throws an error when download fails", async () => {
     const fakeRepoRoot = scratchDir;
-    const fakeReleaseVersion = 'v1.2.3';
+    const fakeReleaseVersion = "v1.2.3";
 
     vi.mocked(global.fetch).mockResolvedValue(
-      new Response('Not Found', {
+      new Response("Not Found", {
         status: 404,
-        statusText: 'Not Found',
+        statusText: "Not Found",
       }),
     );
 
     vi.mocked(gitUtils.isGitHubRepository).mockReturnValueOnce(true);
     vi.mocked(gitUtils.getGitRepoRoot).mockReturnValueOnce(fakeRepoRoot);
-    vi.mocked(gitUtils.getLatestGitHubRelease).mockResolvedValueOnce(
-      fakeReleaseVersion,
-    );
+    vi.mocked(gitUtils.getLatestGitHubRelease).mockResolvedValueOnce(fakeReleaseVersion);
     vi.mocked(gitUtils.getGitHubRepoInfo).mockReturnValue({
-      owner: 'fake',
-      repo: 'repo',
+      owner: "fake",
+      repo: "repo",
     });
 
-    await expect(
-      setupGithubCommand.action?.({} as CommandContext, ''),
-    ).rejects.toThrow(/Invalid response code downloading.*404 - Not Found/);
+    await expect(setupGithubCommand.action?.({} as CommandContext, "")).rejects.toThrow(
+      /Invalid response code downloading.*404 - Not Found/,
+    );
   });
 });
 
-describe('updateGitignore', () => {
-  let scratchDir = '';
+describe("updateGitignore", () => {
+  let scratchDir = "";
 
   beforeEach(async () => {
-    scratchDir = await fs.mkdtemp(path.join(os.tmpdir(), 'update-gitignore-'));
+    scratchDir = await fs.mkdtemp(path.join(os.tmpdir(), "update-gitignore-"));
   });
 
   afterEach(async () => {
     if (scratchDir) await fs.rm(scratchDir, { recursive: true });
   });
 
-  it('creates a new .gitignore file when none exists', async () => {
+  it("creates a new .gitignore file when none exists", async () => {
     await updateGitignore(scratchDir);
 
-    const gitignorePath = path.join(scratchDir, '.gitignore');
-    const content = await fs.readFile(gitignorePath, 'utf8');
+    const gitignorePath = path.join(scratchDir, ".gitignore");
+    const content = await fs.readFile(gitignorePath, "utf8");
 
-    expect(content).toBe('.gemini/\ngha-creds-*.json\n');
+    expect(content).toBe(".gemini/\ngha-creds-*.json\n");
   });
 
-  it('appends entries to existing .gitignore file', async () => {
-    const gitignorePath = path.join(scratchDir, '.gitignore');
-    const existingContent = '# Existing content\nnode_modules/\n';
+  it("appends entries to existing .gitignore file", async () => {
+    const gitignorePath = path.join(scratchDir, ".gitignore");
+    const existingContent = "# Existing content\nnode_modules/\n";
     await fs.writeFile(gitignorePath, existingContent);
 
     await updateGitignore(scratchDir);
 
-    const content = await fs.readFile(gitignorePath, 'utf8');
+    const content = await fs.readFile(gitignorePath, "utf8");
 
-    expect(content).toBe(
-      '# Existing content\nnode_modules/\n\n.gemini/\ngha-creds-*.json\n',
-    );
+    expect(content).toBe("# Existing content\nnode_modules/\n\n.gemini/\ngha-creds-*.json\n");
   });
 
-  it('does not add duplicate entries', async () => {
-    const gitignorePath = path.join(scratchDir, '.gitignore');
-    const existingContent = '.gemini/\nsome-other-file\ngha-creds-*.json\n';
+  it("does not add duplicate entries", async () => {
+    const gitignorePath = path.join(scratchDir, ".gitignore");
+    const existingContent = ".gemini/\nsome-other-file\ngha-creds-*.json\n";
     await fs.writeFile(gitignorePath, existingContent);
 
     await updateGitignore(scratchDir);
 
-    const content = await fs.readFile(gitignorePath, 'utf8');
+    const content = await fs.readFile(gitignorePath, "utf8");
 
     expect(content).toBe(existingContent);
   });
 
-  it('adds only missing entries when some already exist', async () => {
-    const gitignorePath = path.join(scratchDir, '.gitignore');
-    const existingContent = '.gemini/\nsome-other-file\n';
+  it("adds only missing entries when some already exist", async () => {
+    const gitignorePath = path.join(scratchDir, ".gitignore");
+    const existingContent = ".gemini/\nsome-other-file\n";
     await fs.writeFile(gitignorePath, existingContent);
 
     await updateGitignore(scratchDir);
 
-    const content = await fs.readFile(gitignorePath, 'utf8');
+    const content = await fs.readFile(gitignorePath, "utf8");
 
     // Should add only the missing gha-creds-*.json entry
-    expect(content).toBe('.gemini/\nsome-other-file\n\ngha-creds-*.json\n');
-    expect(content).toContain('gha-creds-*.json');
+    expect(content).toBe(".gemini/\nsome-other-file\n\ngha-creds-*.json\n");
+    expect(content).toContain("gha-creds-*.json");
     // Should not duplicate .gemini/ entry
     expect((content.match(/\.gemini\//g) || []).length).toBe(1);
   });
 
-  it('does not get confused by entries in comments or as substrings', async () => {
-    const gitignorePath = path.join(scratchDir, '.gitignore');
+  it("does not get confused by entries in comments or as substrings", async () => {
+    const gitignorePath = path.join(scratchDir, ".gitignore");
     const existingContent = [
-      '# This is a comment mentioning .gemini/ folder',
-      'my-app.gemini/config',
-      '# Another comment with gha-creds-*.json pattern',
-      'some-other-gha-creds-file.json',
-      '',
-    ].join('\n');
+      "# This is a comment mentioning .gemini/ folder",
+      "my-app.gemini/config",
+      "# Another comment with gha-creds-*.json pattern",
+      "some-other-gha-creds-file.json",
+      "",
+    ].join("\n");
     await fs.writeFile(gitignorePath, existingContent);
 
     await updateGitignore(scratchDir);
 
-    const content = await fs.readFile(gitignorePath, 'utf8');
+    const content = await fs.readFile(gitignorePath, "utf8");
 
     // Should add both entries since they don't actually exist as gitignore rules
-    expect(content).toContain('.gemini/');
-    expect(content).toContain('gha-creds-*.json');
+    expect(content).toContain(".gemini/");
+    expect(content).toContain("gha-creds-*.json");
 
     // Verify the entries were added (not just mentioned in comments)
     const lines = content
-      .split('\n')
-      .map((line) => line.split('#')[0].trim())
+      .split("\n")
+      .map((line) => line.split("#")[0].trim())
       .filter((line) => line);
-    expect(lines).toContain('.gemini/');
-    expect(lines).toContain('gha-creds-*.json');
-    expect(lines).toContain('my-app.gemini/config');
-    expect(lines).toContain('some-other-gha-creds-file.json');
+    expect(lines).toContain(".gemini/");
+    expect(lines).toContain("gha-creds-*.json");
+    expect(lines).toContain("my-app.gemini/config");
+    expect(lines).toContain("some-other-gha-creds-file.json");
   });
 
-  it('handles file system errors gracefully', async () => {
+  it("handles file system errors gracefully", async () => {
     // Try to update gitignore in a non-existent directory
-    const nonExistentDir = path.join(scratchDir, 'non-existent');
+    const nonExistentDir = path.join(scratchDir, "non-existent");
 
     // This should not throw an error
     await expect(updateGitignore(nonExistentDir)).resolves.toBeUndefined();
   });
 
-  it('handles permission errors gracefully', async () => {
-    const consoleSpy = vi
-      .spyOn(debugLogger, 'debug')
-      .mockImplementation(() => {});
+  it("handles permission errors gracefully", async () => {
+    const consoleSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
 
-    const fsModule = await import('node:fs');
+    const fsModule = await import("node:fs");
     const writeFileSpy = vi
-      .spyOn(fsModule.promises, 'writeFile')
-      .mockRejectedValue(new Error('Permission denied'));
+      .spyOn(fsModule.promises, "writeFile")
+      .mockRejectedValue(new Error("Permission denied"));
 
     await expect(updateGitignore(scratchDir)).resolves.toBeUndefined();
-    expect(consoleSpy).toHaveBeenCalledWith(
-      'Failed to update .gitignore:',
-      expect.any(Error),
-    );
+    expect(consoleSpy).toHaveBeenCalledWith("Failed to update .gitignore:", expect.any(Error));
 
     writeFileSpy.mockRestore();
     consoleSpy.mockRestore();
diff --git a/packages/ui-gemini/src/ui/commands/setupGithubCommand.ts b/packages/ui-gemini/src/ui/commands/setupGithubCommand.ts
index 90eefd081..678ebaab5 100644
--- a/packages/ui-gemini/src/ui/commands/setupGithubCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/setupGithubCommand.ts
@@ -4,42 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from 'node:path';
-import * as fs from 'node:fs';
-import { Writable } from 'node:stream';
-import { ProxyAgent } from 'undici';
-
-import type { CommandContext } from '../../ui/commands/types.js';
+import * as fs from "node:fs";
+import path from "node:path";
+import { Writable } from "node:stream";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { ProxyAgent } from "undici";
+import type { CommandContext } from "../../ui/commands/types.js";
+import { getUrlOpenCommand } from "../../ui/utils/commandUtils.js";
 import {
+  getGitHubRepoInfo,
   getGitRepoRoot,
   getLatestGitHubRelease,
   isGitHubRepository,
-  getGitHubRepoInfo,
-} from '../../utils/gitUtils.js';
-
-import type { SlashCommand, SlashCommandActionReturn } from './types.js';
-import { CommandKind } from './types.js';
-import { getUrlOpenCommand } from '../../ui/utils/commandUtils.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+} from "../../utils/gitUtils.js";
+import type { SlashCommand, SlashCommandActionReturn } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const GITHUB_WORKFLOW_PATHS = [
-  'gemini-dispatch/gemini-dispatch.yml',
-  'gemini-assistant/gemini-invoke.yml',
-  'issue-triage/gemini-triage.yml',
-  'issue-triage/gemini-scheduled-triage.yml',
-  'pr-review/gemini-review.yml',
+  "gemini-dispatch/gemini-dispatch.yml",
+  "gemini-assistant/gemini-invoke.yml",
+  "issue-triage/gemini-triage.yml",
+  "issue-triage/gemini-scheduled-triage.yml",
+  "pr-review/gemini-review.yml",
 ];
 
 export const GITHUB_COMMANDS_PATHS = [
-  'gemini-assistant/gemini-invoke.toml',
-  'issue-triage/gemini-scheduled-triage.toml',
-  'issue-triage/gemini-triage.toml',
-  'pr-review/gemini-review.toml',
+  "gemini-assistant/gemini-invoke.toml",
+  "issue-triage/gemini-scheduled-triage.toml",
+  "issue-triage/gemini-triage.toml",
+  "pr-review/gemini-review.toml",
 ];
 
-const REPO_DOWNLOAD_URL =
-  'https://raw.githubusercontent.com/google-github-actions/run-gemini-cli';
-const SOURCE_DIR = 'examples/workflows';
+const REPO_DOWNLOAD_URL = "https://raw.githubusercontent.com/google-github-actions/run-gemini-cli";
+const SOURCE_DIR = "examples/workflows";
 // Generate OS-specific commands to open the GitHub pages needed for setup.
 function getOpenUrlsCommands(readmeUrl: string): string[] {
   // Determine the OS-specific command to open URLs, ex: 'open', 'xdg-open', etc
@@ -62,15 +59,15 @@ function getOpenUrlsCommands(readmeUrl: string): string[] {
 
 // Add Gemini CLI specific entries to .gitignore file
 export async function updateGitignore(gitRepoRoot: string): Promise<void> {
-  const gitignoreEntries = ['.gemini/', 'gha-creds-*.json'];
+  const gitignoreEntries = [".gemini/", "gha-creds-*.json"];
 
-  const gitignorePath = path.join(gitRepoRoot, '.gitignore');
+  const gitignorePath = path.join(gitRepoRoot, ".gitignore");
   try {
     // Check if .gitignore exists and read its content
-    let existingContent = '';
+    let existingContent = "";
     let fileExists = true;
     try {
-      existingContent = await fs.promises.readFile(gitignorePath, 'utf8');
+      existingContent = await fs.promises.readFile(gitignorePath, "utf8");
     } catch (_error) {
       // File doesn't exist
       fileExists = false;
@@ -78,24 +75,22 @@ export async function updateGitignore(gitRepoRoot: string): Promise<void> {
 
     if (!fileExists) {
       // Create new .gitignore file with the entries
-      const contentToWrite = gitignoreEntries.join('\n') + '\n';
+      const contentToWrite = gitignoreEntries.join("\n") + "\n";
       await fs.promises.writeFile(gitignorePath, contentToWrite);
     } else {
       // Check which entries are missing
       const missingEntries = gitignoreEntries.filter(
         (entry) =>
-          !existingContent
-            .split(/\r?\n/)
-            .some((line) => line.split('#')[0].trim() === entry),
+          !existingContent.split(/\r?\n/).some((line) => line.split("#")[0].trim() === entry),
       );
 
       if (missingEntries.length > 0) {
-        const contentToAdd = '\n' + missingEntries.join('\n') + '\n';
+        const contentToAdd = "\n" + missingEntries.join("\n") + "\n";
         await fs.promises.appendFile(gitignorePath, contentToAdd);
       }
     }
   } catch (error) {
-    debugLogger.debug('Failed to update .gitignore:', error);
+    debugLogger.debug("Failed to update .gitignore:", error);
     // Continue without failing the whole command
   }
 }
@@ -119,12 +114,9 @@ async function downloadFiles({
       (async () => {
         const endpoint = `${REPO_DOWNLOAD_URL}/refs/tags/${releaseTag}/${SOURCE_DIR}/${fileBasename}`;
         const response = await fetch(endpoint, {
-          method: 'GET',
+          method: "GET",
           dispatcher: proxy ? new ProxyAgent(proxy) : undefined,
-          signal: AbortSignal.any([
-            AbortSignal.timeout(30_000),
-            abortController.signal,
-          ]),
+          signal: AbortSignal.any([AbortSignal.timeout(30_000), abortController.signal]),
         } as RequestInit);
 
         if (!response.ok) {
@@ -139,14 +131,11 @@ async function downloadFiles({
           );
         }
 
-        const destination = path.resolve(
-          targetDir,
-          path.basename(fileBasename),
-        );
+        const destination = path.resolve(targetDir, path.basename(fileBasename));
 
         const fileStream = fs.createWriteStream(destination, {
           mode: 0o644, // -rw-r--r--, user(rw), group(r), other(r)
-          flags: 'w', // write and overwrite
+          flags: "w", // write and overwrite
           flush: true,
         });
 
@@ -194,22 +183,20 @@ async function downloadSetupFiles({
       }),
     );
   } catch (error) {
-    debugLogger.debug('Failed to download required setup files: ', error);
+    debugLogger.debug("Failed to download required setup files: ", error);
     throw error;
   }
 }
 
 export const setupGithubCommand: SlashCommand = {
-  name: 'setup-github',
-  description: 'Set up GitHub Actions',
+  name: "setup-github",
+  description: "Set up GitHub Actions",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
-  action: async (
-    context: CommandContext,
-  ): Promise<SlashCommandActionReturn> => {
+  action: async (context: CommandContext): Promise<SlashCommandActionReturn> => {
     if (!isGitHubRepository()) {
       throw new Error(
-        'Unable to determine the GitHub repository. /setup-github must be run from a git repository.',
+        "Unable to determine the GitHub repository. /setup-github must be run from a git repository.",
       );
     }
 
@@ -220,7 +207,7 @@ export const setupGithubCommand: SlashCommand = {
     } catch (_error) {
       debugLogger.debug(`Failed to get git repo root:`, _error);
       throw new Error(
-        'Unable to determine the GitHub repository. /setup-github must be run from a git repository.',
+        "Unable to determine the GitHub repository. /setup-github must be run from a git repository.",
       );
     }
 
@@ -230,11 +217,11 @@ export const setupGithubCommand: SlashCommand = {
     const readmeUrl = `https://github.com/google-github-actions/run-gemini-cli/blob/${releaseTag}/README.md#quick-start`;
 
     // Create workflows directory
-    const workflowsDir = path.join(gitRepoRoot, '.github', 'workflows');
+    const workflowsDir = path.join(gitRepoRoot, ".github", "workflows");
     await createDirectory(workflowsDir);
 
     // Create commands directory
-    const commandsDir = path.join(gitRepoRoot, '.github', 'commands');
+    const commandsDir = path.join(gitRepoRoot, ".github", "commands");
     await createDirectory(commandsDir);
 
     await downloadSetupFiles({
@@ -251,21 +238,20 @@ export const setupGithubCommand: SlashCommand = {
 
     // Print out a message
     const commands = [];
-    if (process.platform !== 'win32') {
-      commands.push('set -eEuo pipefail');
+    if (process.platform !== "win32") {
+      commands.push("set -eEuo pipefail");
     }
     commands.push(
       `echo "Successfully downloaded ${GITHUB_WORKFLOW_PATHS.length} workflows , ${GITHUB_COMMANDS_PATHS.length} commands and updated .gitignore. Follow the steps in ${readmeUrl} (skipping the /setup-github step) to complete setup."`,
     );
     commands.push(...getOpenUrlsCommands(readmeUrl));
 
-    const command = `(${commands.join(' && ')})`;
+    const command = `(${commands.join(" && ")})`;
     return {
-      type: 'tool',
-      toolName: 'run_shell_command',
+      type: "tool",
+      toolName: "run_shell_command",
       toolArgs: {
-        description:
-          'Setting up GitHub Actions to triage issues and review PRs with Gemini.',
+        description: "Setting up GitHub Actions to triage issues and review PRs with Gemini.",
         command,
       },
     };
diff --git a/packages/ui-gemini/src/ui/commands/statsCommand.test.ts b/packages/ui-gemini/src/ui/commands/statsCommand.test.ts
index 13d007ac2..932470235 100644
--- a/packages/ui-gemini/src/ui/commands/statsCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/statsCommand.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { statsCommand } from './statsCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
-import { formatDuration } from '../utils/formatters.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { formatDuration } from "../utils/formatters.js";
+import { statsCommand } from "./statsCommand.js";
+import { type CommandContext } from "./types.js";
 
-describe('statsCommand', () => {
+describe("statsCommand", () => {
   let mockContext: CommandContext;
-  const startTime = new Date('2025-07-14T10:00:00.000Z');
-  const endTime = new Date('2025-07-14T10:00:30.000Z');
+  const startTime = new Date("2025-07-14T10:00:00.000Z");
+  const endTime = new Date("2025-07-14T10:00:30.000Z");
 
   beforeEach(() => {
     vi.useFakeTimers();
@@ -27,15 +27,13 @@ describe('statsCommand', () => {
     mockContext.session.stats.sessionStartTime = startTime;
   });
 
-  it('should display general session stats when run with no subcommand', () => {
-    if (!statsCommand.action) throw new Error('Command has no action');
+  it("should display general session stats when run with no subcommand", () => {
+    if (!statsCommand.action) throw new Error("Command has no action");
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    statsCommand.action(mockContext, '');
+    statsCommand.action(mockContext, "");
 
-    const expectedDuration = formatDuration(
-      endTime.getTime() - startTime.getTime(),
-    );
+    const expectedDuration = formatDuration(endTime.getTime() - startTime.getTime());
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
         type: MessageType.STATS,
@@ -46,13 +44,11 @@ describe('statsCommand', () => {
   });
 
   it('should display model stats when using the "model" subcommand', () => {
-    const modelSubCommand = statsCommand.subCommands?.find(
-      (sc) => sc.name === 'model',
-    );
-    if (!modelSubCommand?.action) throw new Error('Subcommand has no action');
+    const modelSubCommand = statsCommand.subCommands?.find((sc) => sc.name === "model");
+    if (!modelSubCommand?.action) throw new Error("Subcommand has no action");
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    modelSubCommand.action(mockContext, '');
+    modelSubCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
@@ -63,13 +59,11 @@ describe('statsCommand', () => {
   });
 
   it('should display tool stats when using the "tools" subcommand', () => {
-    const toolsSubCommand = statsCommand.subCommands?.find(
-      (sc) => sc.name === 'tools',
-    );
-    if (!toolsSubCommand?.action) throw new Error('Subcommand has no action');
+    const toolsSubCommand = statsCommand.subCommands?.find((sc) => sc.name === "tools");
+    if (!toolsSubCommand?.action) throw new Error("Subcommand has no action");
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    toolsSubCommand.action(mockContext, '');
+    toolsSubCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
diff --git a/packages/ui-gemini/src/ui/commands/statsCommand.ts b/packages/ui-gemini/src/ui/commands/statsCommand.ts
index e15cf2593..dddcbb30f 100644
--- a/packages/ui-gemini/src/ui/commands/statsCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/statsCommand.ts
@@ -4,15 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CodeAssistServer, getCodeAssistServer } from '@airiscode/gemini-cli-core';
-import type { HistoryItemStats } from '../types.js';
-import { MessageType } from '../types.js';
-import { formatDuration } from '../utils/formatters.js';
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
+import { CodeAssistServer, getCodeAssistServer } from "@airiscode/gemini-cli-core";
+import type { HistoryItemStats } from "../types.js";
+import { MessageType } from "../types.js";
+import { formatDuration } from "../utils/formatters.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 async function defaultSessionView(context: CommandContext) {
   const now = new Date();
@@ -21,7 +17,7 @@ async function defaultSessionView(context: CommandContext) {
     context.ui.addItem(
       {
         type: MessageType.ERROR,
-        text: 'Session start time is unavailable, cannot calculate stats.',
+        text: "Session start time is unavailable, cannot calculate stats.",
       },
       Date.now(),
     );
@@ -48,9 +44,9 @@ async function defaultSessionView(context: CommandContext) {
 }
 
 export const statsCommand: SlashCommand = {
-  name: 'stats',
-  altNames: ['usage'],
-  description: 'Check session stats. Usage: /stats [session|model|tools]',
+  name: "stats",
+  altNames: ["usage"],
+  description: "Check session stats. Usage: /stats [session|model|tools]",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: async (context: CommandContext) => {
@@ -58,8 +54,8 @@ export const statsCommand: SlashCommand = {
   },
   subCommands: [
     {
-      name: 'session',
-      description: 'Show session-specific usage statistics',
+      name: "session",
+      description: "Show session-specific usage statistics",
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: async (context: CommandContext) => {
@@ -67,8 +63,8 @@ export const statsCommand: SlashCommand = {
       },
     },
     {
-      name: 'model',
-      description: 'Show model-specific usage statistics',
+      name: "model",
+      description: "Show model-specific usage statistics",
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: (context: CommandContext) => {
@@ -81,8 +77,8 @@ export const statsCommand: SlashCommand = {
       },
     },
     {
-      name: 'tools',
-      description: 'Show tool-specific usage statistics',
+      name: "tools",
+      description: "Show tool-specific usage statistics",
       kind: CommandKind.BUILT_IN,
       autoExecute: true,
       action: (context: CommandContext) => {
diff --git a/packages/ui-gemini/src/ui/commands/terminalSetupCommand.test.ts b/packages/ui-gemini/src/ui/commands/terminalSetupCommand.test.ts
index 3bee0d591..ccbae8213 100644
--- a/packages/ui-gemini/src/ui/commands/terminalSetupCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/terminalSetupCommand.test.ts
@@ -4,82 +4,80 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { terminalSetupCommand } from './terminalSetupCommand.js';
-import * as terminalSetupModule from '../utils/terminalSetup.js';
-import type { CommandContext } from './types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import * as terminalSetupModule from "../utils/terminalSetup.js";
+import { terminalSetupCommand } from "./terminalSetupCommand.js";
+import type { CommandContext } from "./types.js";
 
-vi.mock('../utils/terminalSetup.js');
+vi.mock("../utils/terminalSetup.js");
 
-describe('terminalSetupCommand', () => {
+describe("terminalSetupCommand", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should have correct metadata', () => {
-    expect(terminalSetupCommand.name).toBe('terminal-setup');
-    expect(terminalSetupCommand.description).toContain('multiline input');
-    expect(terminalSetupCommand.kind).toBe('built-in');
+  it("should have correct metadata", () => {
+    expect(terminalSetupCommand.name).toBe("terminal-setup");
+    expect(terminalSetupCommand.description).toContain("multiline input");
+    expect(terminalSetupCommand.kind).toBe("built-in");
   });
 
-  it('should return success message when terminal setup succeeds', async () => {
-    vi.spyOn(terminalSetupModule, 'terminalSetup').mockResolvedValue({
+  it("should return success message when terminal setup succeeds", async () => {
+    vi.spyOn(terminalSetupModule, "terminalSetup").mockResolvedValue({
       success: true,
-      message: 'Terminal configured successfully',
+      message: "Terminal configured successfully",
     });
 
-    const result = await terminalSetupCommand.action!({} as CommandContext, '');
+    const result = await terminalSetupCommand.action!({} as CommandContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      content: 'Terminal configured successfully',
-      messageType: 'info',
+      type: "message",
+      content: "Terminal configured successfully",
+      messageType: "info",
     });
   });
 
-  it('should append restart message when terminal setup requires restart', async () => {
-    vi.spyOn(terminalSetupModule, 'terminalSetup').mockResolvedValue({
+  it("should append restart message when terminal setup requires restart", async () => {
+    vi.spyOn(terminalSetupModule, "terminalSetup").mockResolvedValue({
       success: true,
-      message: 'Terminal configured successfully',
+      message: "Terminal configured successfully",
       requiresRestart: true,
     });
 
-    const result = await terminalSetupCommand.action!({} as CommandContext, '');
+    const result = await terminalSetupCommand.action!({} as CommandContext, "");
 
     expect(result).toEqual({
-      type: 'message',
+      type: "message",
       content:
-        'Terminal configured successfully\n\nPlease restart your terminal for the changes to take effect.',
-      messageType: 'info',
+        "Terminal configured successfully\n\nPlease restart your terminal for the changes to take effect.",
+      messageType: "info",
     });
   });
 
-  it('should return error message when terminal setup fails', async () => {
-    vi.spyOn(terminalSetupModule, 'terminalSetup').mockResolvedValue({
+  it("should return error message when terminal setup fails", async () => {
+    vi.spyOn(terminalSetupModule, "terminalSetup").mockResolvedValue({
       success: false,
-      message: 'Failed to detect terminal',
+      message: "Failed to detect terminal",
     });
 
-    const result = await terminalSetupCommand.action!({} as CommandContext, '');
+    const result = await terminalSetupCommand.action!({} as CommandContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      content: 'Failed to detect terminal',
-      messageType: 'error',
+      type: "message",
+      content: "Failed to detect terminal",
+      messageType: "error",
     });
   });
 
-  it('should handle exceptions from terminal setup', async () => {
-    vi.spyOn(terminalSetupModule, 'terminalSetup').mockRejectedValue(
-      new Error('Unexpected error'),
-    );
+  it("should handle exceptions from terminal setup", async () => {
+    vi.spyOn(terminalSetupModule, "terminalSetup").mockRejectedValue(new Error("Unexpected error"));
 
-    const result = await terminalSetupCommand.action!({} as CommandContext, '');
+    const result = await terminalSetupCommand.action!({} as CommandContext, "");
 
     expect(result).toEqual({
-      type: 'message',
-      content: 'Failed to configure terminal: Error: Unexpected error',
-      messageType: 'error',
+      type: "message",
+      content: "Failed to configure terminal: Error: Unexpected error",
+      messageType: "error",
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/terminalSetupCommand.ts b/packages/ui-gemini/src/ui/commands/terminalSetupCommand.ts
index 82fa3e8b7..7347ce448 100644
--- a/packages/ui-gemini/src/ui/commands/terminalSetupCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/terminalSetupCommand.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { terminalSetup } from '../utils/terminalSetup.js';
-import { type MessageActionReturn } from '@airiscode/gemini-cli-core';
+import { type MessageActionReturn } from "@airiscode/gemini-cli-core";
+import { terminalSetup } from "../utils/terminalSetup.js";
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 /**
  * Command to configure terminal keybindings for multiline input support.
@@ -16,9 +16,8 @@ import { type MessageActionReturn } from '@airiscode/gemini-cli-core';
  * to support Shift+Enter and Ctrl+Enter for multiline input.
  */
 export const terminalSetupCommand: SlashCommand = {
-  name: 'terminal-setup',
-  description:
-    'Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf)',
+  name: "terminal-setup",
+  description: "Configure terminal keybindings for multiline input (VS Code, Cursor, Windsurf)",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (): Promise<MessageActionReturn> => {
@@ -27,20 +26,19 @@ export const terminalSetupCommand: SlashCommand = {
 
       let content = result.message;
       if (result.requiresRestart) {
-        content +=
-          '\n\nPlease restart your terminal for the changes to take effect.';
+        content += "\n\nPlease restart your terminal for the changes to take effect.";
       }
 
       return {
-        type: 'message',
+        type: "message",
         content,
-        messageType: result.success ? 'info' : 'error',
+        messageType: result.success ? "info" : "error",
       };
     } catch (error) {
       return {
-        type: 'message',
+        type: "message",
         content: `Failed to configure terminal: ${error}`,
-        messageType: 'error',
+        messageType: "error",
       };
     }
   },
diff --git a/packages/ui-gemini/src/ui/commands/themeCommand.test.ts b/packages/ui-gemini/src/ui/commands/themeCommand.test.ts
index 67a12bd2f..800c11fad 100644
--- a/packages/ui-gemini/src/ui/commands/themeCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/themeCommand.test.ts
@@ -4,35 +4,35 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import { themeCommand } from './themeCommand.js';
-import { type CommandContext } from './types.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import { beforeEach, describe, expect, it } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { themeCommand } from "./themeCommand.js";
+import { type CommandContext } from "./types.js";
 
-describe('themeCommand', () => {
+describe("themeCommand", () => {
   let mockContext: CommandContext;
 
   beforeEach(() => {
     mockContext = createMockCommandContext();
   });
 
-  it('should return a dialog action to open the theme dialog', () => {
+  it("should return a dialog action to open the theme dialog", () => {
     // Ensure the command has an action to test.
     if (!themeCommand.action) {
-      throw new Error('The theme command must have an action.');
+      throw new Error("The theme command must have an action.");
     }
 
-    const result = themeCommand.action(mockContext, '');
+    const result = themeCommand.action(mockContext, "");
 
     // Assert that the action returns the correct object to trigger the theme dialog.
     expect(result).toEqual({
-      type: 'dialog',
-      dialog: 'theme',
+      type: "dialog",
+      dialog: "theme",
     });
   });
 
-  it('should have the correct name and description', () => {
-    expect(themeCommand.name).toBe('theme');
-    expect(themeCommand.description).toBe('Change the theme');
+  it("should have the correct name and description", () => {
+    expect(themeCommand.name).toBe("theme");
+    expect(themeCommand.description).toBe("Change the theme");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/themeCommand.ts b/packages/ui-gemini/src/ui/commands/themeCommand.ts
index 4b72625d5..b6a2789cb 100644
--- a/packages/ui-gemini/src/ui/commands/themeCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/themeCommand.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { OpenDialogActionReturn, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import type { OpenDialogActionReturn, SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const themeCommand: SlashCommand = {
-  name: 'theme',
-  description: 'Change the theme',
+  name: "theme",
+  description: "Change the theme",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: (_context, _args): OpenDialogActionReturn => ({
-    type: 'dialog',
-    dialog: 'theme',
+    type: "dialog",
+    dialog: "theme",
   }),
 };
diff --git a/packages/ui-gemini/src/ui/commands/toolsCommand.test.ts b/packages/ui-gemini/src/ui/commands/toolsCommand.test.ts
index b9b9cb38f..4ad759f5d 100644
--- a/packages/ui-gemini/src/ui/commands/toolsCommand.test.ts
+++ b/packages/ui-gemini/src/ui/commands/toolsCommand.test.ts
@@ -4,31 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { vi } from 'vitest';
-import { describe, it, expect } from 'vitest';
-import { toolsCommand } from './toolsCommand.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import { MessageType } from '../types.js';
-import type { ToolBuilder, ToolResult } from '@airiscode/gemini-cli-core';
+import type { ToolBuilder, ToolResult } from "@airiscode/gemini-cli-core";
+import type { vi } from "vitest";
+import { describe, expect, it } from "vitest";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { MessageType } from "../types.js";
+import { toolsCommand } from "./toolsCommand.js";
 
 // Mock tools for testing
 const mockTools = [
   {
-    name: 'file-reader',
-    displayName: 'File Reader',
-    description: 'Reads files from the local system.',
+    name: "file-reader",
+    displayName: "File Reader",
+    description: "Reads files from the local system.",
     schema: {},
   },
   {
-    name: 'code-editor',
-    displayName: 'Code Editor',
-    description: 'Edits code files.',
+    name: "code-editor",
+    displayName: "Code Editor",
+    description: "Edits code files.",
     schema: {},
   },
 ] as unknown as Array<ToolBuilder<object, ToolResult>>;
 
-describe('toolsCommand', () => {
-  it('should display an error if the tool registry is unavailable', async () => {
+describe("toolsCommand", () => {
+  it("should display an error if the tool registry is unavailable", async () => {
     const mockContext = createMockCommandContext({
       services: {
         config: {
@@ -37,13 +37,13 @@ describe('toolsCommand', () => {
       },
     });
 
-    if (!toolsCommand.action) throw new Error('Action not defined');
-    await toolsCommand.action(mockContext, '');
+    if (!toolsCommand.action) throw new Error("Action not defined");
+    await toolsCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
         type: MessageType.ERROR,
-        text: 'Could not retrieve tool registry.',
+        text: "Could not retrieve tool registry.",
       },
       expect.any(Number),
     );
@@ -60,8 +60,8 @@ describe('toolsCommand', () => {
       },
     });
 
-    if (!toolsCommand.action) throw new Error('Action not defined');
-    await toolsCommand.action(mockContext, '');
+    if (!toolsCommand.action) throw new Error("Action not defined");
+    await toolsCommand.action(mockContext, "");
 
     expect(mockContext.ui.addItem).toHaveBeenCalledWith(
       {
@@ -73,7 +73,7 @@ describe('toolsCommand', () => {
     );
   });
 
-  it('should list tools without descriptions by default', async () => {
+  it("should list tools without descriptions by default", async () => {
     const mockContext = createMockCommandContext({
       services: {
         config: {
@@ -82,16 +82,15 @@ describe('toolsCommand', () => {
       },
     });
 
-    if (!toolsCommand.action) throw new Error('Action not defined');
-    await toolsCommand.action(mockContext, '');
+    if (!toolsCommand.action) throw new Error("Action not defined");
+    await toolsCommand.action(mockContext, "");
 
-    const [message] = (mockContext.ui.addItem as ReturnType<typeof vi.fn>).mock
-      .calls[0];
+    const [message] = (mockContext.ui.addItem as ReturnType<typeof vi.fn>).mock.calls[0];
     expect(message.type).toBe(MessageType.TOOLS_LIST);
     expect(message.showDescriptions).toBe(false);
     expect(message.tools).toHaveLength(2);
-    expect(message.tools[0].displayName).toBe('File Reader');
-    expect(message.tools[1].displayName).toBe('Code Editor');
+    expect(message.tools[0].displayName).toBe("File Reader");
+    expect(message.tools[1].displayName).toBe("Code Editor");
   });
 
   it('should list tools with descriptions when "desc" arg is passed', async () => {
@@ -103,17 +102,14 @@ describe('toolsCommand', () => {
       },
     });
 
-    if (!toolsCommand.action) throw new Error('Action not defined');
-    await toolsCommand.action(mockContext, 'desc');
+    if (!toolsCommand.action) throw new Error("Action not defined");
+    await toolsCommand.action(mockContext, "desc");
 
-    const [message] = (mockContext.ui.addItem as ReturnType<typeof vi.fn>).mock
-      .calls[0];
+    const [message] = (mockContext.ui.addItem as ReturnType<typeof vi.fn>).mock.calls[0];
     expect(message.type).toBe(MessageType.TOOLS_LIST);
     expect(message.showDescriptions).toBe(true);
     expect(message.tools).toHaveLength(2);
-    expect(message.tools[0].description).toBe(
-      'Reads files from the local system.',
-    );
-    expect(message.tools[1].description).toBe('Edits code files.');
+    expect(message.tools[0].description).toBe("Reads files from the local system.");
+    expect(message.tools[1].description).toBe("Edits code files.");
   });
 });
diff --git a/packages/ui-gemini/src/ui/commands/toolsCommand.ts b/packages/ui-gemini/src/ui/commands/toolsCommand.ts
index bbb86082f..f4e6ba95c 100644
--- a/packages/ui-gemini/src/ui/commands/toolsCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/toolsCommand.ts
@@ -4,16 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  type CommandContext,
-  type SlashCommand,
-  CommandKind,
-} from './types.js';
-import { MessageType, type HistoryItemToolsList } from '../types.js';
+import { type HistoryItemToolsList, MessageType } from "../types.js";
+import { type CommandContext, CommandKind, type SlashCommand } from "./types.js";
 
 export const toolsCommand: SlashCommand = {
-  name: 'tools',
-  description: 'List available Gemini CLI tools. Usage: /tools [desc]',
+  name: "tools",
+  description: "List available Gemini CLI tools. Usage: /tools [desc]",
   kind: CommandKind.BUILT_IN,
   autoExecute: false,
   action: async (context: CommandContext, args?: string): Promise<void> => {
@@ -21,7 +17,7 @@ export const toolsCommand: SlashCommand = {
 
     // Default to NOT showing descriptions. The user must opt in with an argument.
     let useShowDescriptions = false;
-    if (subCommand === 'desc' || subCommand === 'descriptions') {
+    if (subCommand === "desc" || subCommand === "descriptions") {
       useShowDescriptions = true;
     }
 
@@ -30,7 +26,7 @@ export const toolsCommand: SlashCommand = {
       context.ui.addItem(
         {
           type: MessageType.ERROR,
-          text: 'Could not retrieve tool registry.',
+          text: "Could not retrieve tool registry.",
         },
         Date.now(),
       );
@@ -39,7 +35,7 @@ export const toolsCommand: SlashCommand = {
 
     const tools = toolRegistry.getAllTools();
     // Filter out MCP tools by checking for the absence of a serverName property
-    const geminiTools = tools.filter((tool) => !('serverName' in tool));
+    const geminiTools = tools.filter((tool) => !("serverName" in tool));
 
     const toolsListItem: HistoryItemToolsList = {
       type: MessageType.TOOLS_LIST,
diff --git a/packages/ui-gemini/src/ui/commands/types.ts b/packages/ui-gemini/src/ui/commands/types.ts
index f7a2057fd..d76fe5ab3 100644
--- a/packages/ui-gemini/src/ui/commands/types.ts
+++ b/packages/ui-gemini/src/ui/commands/types.ts
@@ -4,25 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ReactNode } from 'react';
-import type {
-  HistoryItemWithoutId,
-  HistoryItem,
-  ConfirmationRequest,
-} from '../types.js';
-import type {
-  Config,
-  GitService,
-  Logger,
-  CommandActionReturn,
-} from '@airiscode/gemini-cli-core';
-import type { LoadedSettings } from '../../config/settings.js';
-import type { UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
-import type { SessionStatsState } from '../contexts/SessionContext.js';
-import type {
-  ExtensionUpdateAction,
-  ExtensionUpdateStatus,
-} from '../state/extensions.js';
+import type { CommandActionReturn, Config, GitService, Logger } from "@airiscode/gemini-cli-core";
+import type { ReactNode } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import type { SessionStatsState } from "../contexts/SessionContext.js";
+import type { UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import type { ExtensionUpdateAction, ExtensionUpdateStatus } from "../state/extensions.js";
+import type { ConfirmationRequest, HistoryItem, HistoryItemWithoutId } from "../types.js";
 
 // Grouped dependencies for clarity and easier mocking
 export interface CommandContext {
@@ -46,7 +34,7 @@ export interface CommandContext {
   // UI state and history management
   ui: {
     /** Adds a new item to the history display. */
-    addItem: UseHistoryManagerReturn['addItem'];
+    addItem: UseHistoryManagerReturn["addItem"];
     /** Clears all history items and the console screen. */
     clear: () => void;
     /**
@@ -67,7 +55,7 @@ export interface CommandContext {
      *
      * @param history The array of history items to load.
      */
-    loadHistory: UseHistoryManagerReturn['loadHistory'];
+    loadHistory: UseHistoryManagerReturn["loadHistory"];
     /** Toggles a special display mode. */
     toggleCorgiMode: () => void;
     toggleDebugProfiler: () => void;
@@ -90,7 +78,7 @@ export interface CommandContext {
 
 /** The return type for a command action that results in the app quitting. */
 export interface QuitActionReturn {
-  type: 'quit';
+  type: "quit";
   messages: HistoryItem[];
 }
 
@@ -98,19 +86,19 @@ export interface QuitActionReturn {
  * The return type for a command action that needs to open a dialog.
  */
 export interface OpenDialogActionReturn {
-  type: 'dialog';
+  type: "dialog";
   props?: Record<string, unknown>;
 
   dialog:
-    | 'help'
-    | 'auth'
-    | 'theme'
-    | 'editor'
-    | 'privacy'
-    | 'settings'
-    | 'sessionBrowser'
-    | 'model'
-    | 'permissions';
+    | "help"
+    | "auth"
+    | "theme"
+    | "editor"
+    | "privacy"
+    | "settings"
+    | "sessionBrowser"
+    | "model"
+    | "permissions";
 }
 
 /**
@@ -118,7 +106,7 @@ export interface OpenDialogActionReturn {
  * confirmation for a set of shell commands before proceeding.
  */
 export interface ConfirmShellCommandsActionReturn {
-  type: 'confirm_shell_commands';
+  type: "confirm_shell_commands";
   /** The list of shell commands that require user confirmation. */
   commandsToConfirm: string[];
   /** The original invocation context to be re-run after confirmation. */
@@ -128,7 +116,7 @@ export interface ConfirmShellCommandsActionReturn {
 }
 
 export interface ConfirmActionReturn {
-  type: 'confirm_action';
+  type: "confirm_action";
   /** The React node to display as the confirmation prompt. */
   prompt: ReactNode;
   /** The original invocation context to be re-run after confirmation. */
@@ -138,7 +126,7 @@ export interface ConfirmActionReturn {
 }
 
 export interface OpenCustomDialogActionReturn {
-  type: 'custom_dialog';
+  type: "custom_dialog";
   component: ReactNode;
 }
 
@@ -151,9 +139,9 @@ export type SlashCommandActionReturn =
   | OpenCustomDialogActionReturn;
 
 export enum CommandKind {
-  BUILT_IN = 'built-in',
-  FILE = 'file',
-  MCP_PROMPT = 'mcp-prompt',
+  BUILT_IN = "built-in",
+  FILE = "file",
+  MCP_PROMPT = "mcp-prompt",
 }
 
 // The standardized contract for any command in the system.
@@ -181,16 +169,10 @@ export interface SlashCommand {
   action?: (
     context: CommandContext,
     args: string, // TODO: Remove args. CommandContext now contains the complete invocation.
-  ) =>
-    | void
-    | SlashCommandActionReturn
-    | Promise<void | SlashCommandActionReturn>;
+  ) => void | SlashCommandActionReturn | Promise<void | SlashCommandActionReturn>;
 
   // Provides argument completion (e.g., completing a tag for `/chat resume <tag>`).
-  completion?: (
-    context: CommandContext,
-    partialArg: string,
-  ) => Promise<string[]> | string[];
+  completion?: (context: CommandContext, partialArg: string) => Promise<string[]> | string[];
 
   subCommands?: SlashCommand[];
 }
diff --git a/packages/ui-gemini/src/ui/commands/vimCommand.ts b/packages/ui-gemini/src/ui/commands/vimCommand.ts
index 972a230d3..bdda9b39e 100644
--- a/packages/ui-gemini/src/ui/commands/vimCommand.ts
+++ b/packages/ui-gemini/src/ui/commands/vimCommand.ts
@@ -4,23 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
+import type { SlashCommand } from "./types.js";
+import { CommandKind } from "./types.js";
 
 export const vimCommand: SlashCommand = {
-  name: 'vim',
-  description: 'Toggle vim mode on/off',
+  name: "vim",
+  description: "Toggle vim mode on/off",
   kind: CommandKind.BUILT_IN,
   autoExecute: true,
   action: async (context, _args) => {
     const newVimState = await context.ui.toggleVimEnabled();
 
-    const message = newVimState
-      ? 'Entered Vim mode. Run /vim again to exit.'
-      : 'Exited Vim mode.';
+    const message = newVimState ? "Entered Vim mode. Run /vim again to exit." : "Exited Vim mode.";
     return {
-      type: 'message',
-      messageType: 'info',
+      type: "message",
+      messageType: "info",
       content: message,
     };
   },
diff --git a/packages/ui-gemini/src/ui/components/AboutBox.test.tsx b/packages/ui-gemini/src/ui/components/AboutBox.test.tsx
index b6e5968e5..e6df5073f 100644
--- a/packages/ui-gemini/src/ui/components/AboutBox.test.tsx
+++ b/packages/ui-gemini/src/ui/components/AboutBox.test.tsx
@@ -4,43 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { AboutBox } from './AboutBox.js';
-import { describe, it, expect, vi } from 'vitest';
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { AboutBox } from "./AboutBox.js";
 
 // Mock GIT_COMMIT_INFO
-vi.mock('../../generated/git-commit.js', () => ({
-  GIT_COMMIT_INFO: 'mock-commit-hash',
+vi.mock("../../generated/git-commit.js", () => ({
+  GIT_COMMIT_INFO: "mock-commit-hash",
 }));
 
-describe('AboutBox', () => {
+describe("AboutBox", () => {
   const defaultProps = {
-    cliVersion: '1.0.0',
-    osVersion: 'macOS',
-    sandboxEnv: 'default',
-    modelVersion: 'gemini-pro',
-    selectedAuthType: 'oauth',
-    gcpProject: '',
-    ideClient: '',
+    cliVersion: "1.0.0",
+    osVersion: "macOS",
+    sandboxEnv: "default",
+    modelVersion: "gemini-pro",
+    selectedAuthType: "oauth",
+    gcpProject: "",
+    ideClient: "",
   };
 
-  it('renders with required props', () => {
+  it("renders with required props", () => {
     const { lastFrame } = render(<AboutBox {...defaultProps} />);
     const output = lastFrame();
-    expect(output).toContain('About Gemini CLI');
-    expect(output).toContain('1.0.0');
-    expect(output).toContain('mock-commit-hash');
-    expect(output).toContain('gemini-pro');
-    expect(output).toContain('default');
-    expect(output).toContain('macOS');
-    expect(output).toContain('OAuth');
+    expect(output).toContain("About Gemini CLI");
+    expect(output).toContain("1.0.0");
+    expect(output).toContain("mock-commit-hash");
+    expect(output).toContain("gemini-pro");
+    expect(output).toContain("default");
+    expect(output).toContain("macOS");
+    expect(output).toContain("OAuth");
   });
 
   it.each([
-    ['userEmail', 'test@example.com', 'User Email'],
-    ['gcpProject', 'my-project', 'GCP Project'],
-    ['ideClient', 'vscode', 'IDE Client'],
-  ])('renders optional prop %s', (prop, value, label) => {
+    ["userEmail", "test@example.com", "User Email"],
+    ["gcpProject", "my-project", "GCP Project"],
+    ["ideClient", "vscode", "IDE Client"],
+  ])("renders optional prop %s", (prop, value, label) => {
     const props = { ...defaultProps, [prop]: value };
     const { lastFrame } = render(<AboutBox {...props} />);
     const output = lastFrame();
@@ -48,10 +48,10 @@ describe('AboutBox', () => {
     expect(output).toContain(value);
   });
 
-  it('renders Auth Method correctly when not oauth', () => {
-    const props = { ...defaultProps, selectedAuthType: 'api-key' };
+  it("renders Auth Method correctly when not oauth", () => {
+    const props = { ...defaultProps, selectedAuthType: "api-key" };
     const { lastFrame } = render(<AboutBox {...props} />);
     const output = lastFrame();
-    expect(output).toContain('api-key');
+    expect(output).toContain("api-key");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/AboutBox.tsx b/packages/ui-gemini/src/ui/components/AboutBox.tsx
index b14b814f0..a2689c0c0 100644
--- a/packages/ui-gemini/src/ui/components/AboutBox.tsx
+++ b/packages/ui-gemini/src/ui/components/AboutBox.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { GIT_COMMIT_INFO } from '../../generated/git-commit.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { GIT_COMMIT_INFO } from "../../generated/git-commit.js";
+import { theme } from "../semantic-colors.js";
 
 interface AboutBoxProps {
   cliVersion: string;
@@ -53,7 +53,7 @@ export const AboutBox: React.FC<AboutBoxProps> = ({
         <Text color={theme.text.primary}>{cliVersion}</Text>
       </Box>
     </Box>
-    {GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO) && (
+    {GIT_COMMIT_INFO && !["N/A"].includes(GIT_COMMIT_INFO) && (
       <Box flexDirection="row">
         <Box width="35%">
           <Text bold color={theme.text.link}>
@@ -103,7 +103,7 @@ export const AboutBox: React.FC<AboutBoxProps> = ({
       </Box>
       <Box>
         <Text color={theme.text.primary}>
-          {selectedAuthType.startsWith('oauth') ? 'OAuth' : selectedAuthType}
+          {selectedAuthType.startsWith("oauth") ? "OAuth" : selectedAuthType}
         </Text>
       </Box>
     </Box>
diff --git a/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.test.tsx b/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.test.tsx
index f9f64d8f5..b837ca27f 100644
--- a/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.test.tsx
@@ -4,46 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { AlternateBufferQuittingDisplay } from './AlternateBufferQuittingDisplay.js';
-import { ToolCallStatus } from '../types.js';
-import type { HistoryItem, HistoryItemWithoutId } from '../types.js';
-import { Text } from 'ink';
-import { renderWithProviders } from '../../test-utils/render.js';
-import type { Config } from '@airiscode/gemini-cli-core';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import type { HistoryItem, HistoryItemWithoutId } from "../types.js";
+import { ToolCallStatus } from "../types.js";
+import { AlternateBufferQuittingDisplay } from "./AlternateBufferQuittingDisplay.js";
 
-vi.mock('../utils/terminalSetup.js', () => ({
+vi.mock("../utils/terminalSetup.js", () => ({
   getTerminalProgram: () => null,
 }));
 
-vi.mock('../contexts/AppContext.js', () => ({
+vi.mock("../contexts/AppContext.js", () => ({
   useAppContext: () => ({
-    version: '0.10.0',
+    version: "0.10.0",
   }),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     getMCPServerStatus: vi.fn(),
   };
 });
 
-vi.mock('../GeminiRespondingSpinner.js', () => ({
+vi.mock("../GeminiRespondingSpinner.js", () => ({
   GeminiRespondingSpinner: () => <Text>Spinner</Text>,
 }));
 
 const mockHistory: HistoryItem[] = [
   {
     id: 1,
-    type: 'tool_group',
+    type: "tool_group",
     tools: [
       {
-        callId: 'call1',
-        name: 'tool1',
-        description: 'Description for tool 1',
+        callId: "call1",
+        name: "tool1",
+        description: "Description for tool 1",
         status: ToolCallStatus.Success,
         resultDisplay: undefined,
         confirmationDetails: undefined,
@@ -52,12 +51,12 @@ const mockHistory: HistoryItem[] = [
   },
   {
     id: 2,
-    type: 'tool_group',
+    type: "tool_group",
     tools: [
       {
-        callId: 'call2',
-        name: 'tool2',
-        description: 'Description for tool 2',
+        callId: "call2",
+        name: "tool2",
+        description: "Description for tool 2",
         status: ToolCallStatus.Success,
         resultDisplay: undefined,
         confirmationDetails: undefined,
@@ -68,12 +67,12 @@ const mockHistory: HistoryItem[] = [
 
 const mockPendingHistoryItems: HistoryItemWithoutId[] = [
   {
-    type: 'tool_group',
+    type: "tool_group",
     tools: [
       {
-        callId: 'call3',
-        name: 'tool3',
-        description: 'Description for tool 3',
+        callId: "call3",
+        name: "tool3",
+        description: "Description for tool 3",
         status: ToolCallStatus.Pending,
         resultDisplay: undefined,
         confirmationDetails: undefined,
@@ -85,8 +84,8 @@ const mockPendingHistoryItems: HistoryItemWithoutId[] = [
 const mockConfig = {
   getScreenReader: () => false,
   getEnableInteractiveShell: () => false,
-  getModel: () => 'gemini-pro',
-  getTargetDir: () => '/tmp',
+  getModel: () => "gemini-pro",
+  getTargetDir: () => "/tmp",
   getDebugMode: () => false,
   getGeminiMdFileCount: () => 0,
   getExperiments: () => ({
@@ -96,7 +95,7 @@ const mockConfig = {
   getPreviewFeatures: () => false,
 } as unknown as Config;
 
-describe('AlternateBufferQuittingDisplay', () => {
+describe("AlternateBufferQuittingDisplay", () => {
   const baseUIState = {
     terminalWidth: 80,
     mainAreaWidth: 80,
@@ -105,87 +104,72 @@ describe('AlternateBufferQuittingDisplay', () => {
     embeddedShellFocused: false,
     renderMarkdown: false,
     bannerData: {
-      defaultText: '',
-      warningText: '',
+      defaultText: "",
+      warningText: "",
     },
   };
 
-  it('renders with active and pending tool messages', () => {
-    const { lastFrame } = renderWithProviders(
-      <AlternateBufferQuittingDisplay />,
-      {
-        uiState: {
-          ...baseUIState,
-          history: mockHistory,
-          pendingHistoryItems: mockPendingHistoryItems,
-        },
-        config: mockConfig,
+  it("renders with active and pending tool messages", () => {
+    const { lastFrame } = renderWithProviders(<AlternateBufferQuittingDisplay />, {
+      uiState: {
+        ...baseUIState,
+        history: mockHistory,
+        pendingHistoryItems: mockPendingHistoryItems,
       },
-    );
-    expect(lastFrame()).toMatchSnapshot('with_history_and_pending');
+      config: mockConfig,
+    });
+    expect(lastFrame()).toMatchSnapshot("with_history_and_pending");
   });
 
-  it('renders with empty history and no pending items', () => {
-    const { lastFrame } = renderWithProviders(
-      <AlternateBufferQuittingDisplay />,
-      {
-        uiState: {
-          ...baseUIState,
-          history: [],
-          pendingHistoryItems: [],
-        },
-        config: mockConfig,
+  it("renders with empty history and no pending items", () => {
+    const { lastFrame } = renderWithProviders(<AlternateBufferQuittingDisplay />, {
+      uiState: {
+        ...baseUIState,
+        history: [],
+        pendingHistoryItems: [],
       },
-    );
-    expect(lastFrame()).toMatchSnapshot('empty');
+      config: mockConfig,
+    });
+    expect(lastFrame()).toMatchSnapshot("empty");
   });
 
-  it('renders with history but no pending items', () => {
-    const { lastFrame } = renderWithProviders(
-      <AlternateBufferQuittingDisplay />,
-      {
-        uiState: {
-          ...baseUIState,
-          history: mockHistory,
-          pendingHistoryItems: [],
-        },
-        config: mockConfig,
+  it("renders with history but no pending items", () => {
+    const { lastFrame } = renderWithProviders(<AlternateBufferQuittingDisplay />, {
+      uiState: {
+        ...baseUIState,
+        history: mockHistory,
+        pendingHistoryItems: [],
       },
-    );
-    expect(lastFrame()).toMatchSnapshot('with_history_no_pending');
+      config: mockConfig,
+    });
+    expect(lastFrame()).toMatchSnapshot("with_history_no_pending");
   });
 
-  it('renders with pending items but no history', () => {
-    const { lastFrame } = renderWithProviders(
-      <AlternateBufferQuittingDisplay />,
-      {
-        uiState: {
-          ...baseUIState,
-          history: [],
-          pendingHistoryItems: mockPendingHistoryItems,
-        },
-        config: mockConfig,
+  it("renders with pending items but no history", () => {
+    const { lastFrame } = renderWithProviders(<AlternateBufferQuittingDisplay />, {
+      uiState: {
+        ...baseUIState,
+        history: [],
+        pendingHistoryItems: mockPendingHistoryItems,
       },
-    );
-    expect(lastFrame()).toMatchSnapshot('with_pending_no_history');
+      config: mockConfig,
+    });
+    expect(lastFrame()).toMatchSnapshot("with_pending_no_history");
   });
 
-  it('renders with user and gemini messages', () => {
+  it("renders with user and gemini messages", () => {
     const history: HistoryItem[] = [
-      { id: 1, type: 'user', text: 'Hello Gemini' },
-      { id: 2, type: 'gemini', text: 'Hello User!' },
+      { id: 1, type: "user", text: "Hello Gemini" },
+      { id: 2, type: "gemini", text: "Hello User!" },
     ];
-    const { lastFrame } = renderWithProviders(
-      <AlternateBufferQuittingDisplay />,
-      {
-        uiState: {
-          ...baseUIState,
-          history,
-          pendingHistoryItems: [],
-        },
-        config: mockConfig,
+    const { lastFrame } = renderWithProviders(<AlternateBufferQuittingDisplay />, {
+      uiState: {
+        ...baseUIState,
+        history,
+        pendingHistoryItems: [],
       },
-    );
-    expect(lastFrame()).toMatchSnapshot('with_user_gemini_messages');
+      config: mockConfig,
+    });
+    expect(lastFrame()).toMatchSnapshot("with_user_gemini_messages");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.tsx b/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.tsx
index 0defa735e..6f418f141 100644
--- a/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/AlternateBufferQuittingDisplay.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { AppHeader } from './AppHeader.js';
-import { HistoryItemDisplay } from './HistoryItemDisplay.js';
-import { QuittingDisplay } from './QuittingDisplay.js';
-import { useAppContext } from '../contexts/AppContext.js';
-import { MAX_GEMINI_MESSAGE_LINES } from '../constants.js';
+import { Box } from "ink";
+import { MAX_GEMINI_MESSAGE_LINES } from "../constants.js";
+import { useAppContext } from "../contexts/AppContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { AppHeader } from "./AppHeader.js";
+import { HistoryItemDisplay } from "./HistoryItemDisplay.js";
+import { QuittingDisplay } from "./QuittingDisplay.js";
 
 export const AlternateBufferQuittingDisplay = () => {
   const { version } = useAppContext();
@@ -22,12 +22,7 @@ export const AlternateBufferQuittingDisplay = () => {
   // Our version of Ink is clever and will render a final frame outside of
   // the alternate buffer on app exit.
   return (
-    <Box
-      flexDirection="column"
-      flexShrink={0}
-      flexGrow={0}
-      width={uiState.terminalWidth}
-    >
+    <Box flexDirection="column" flexShrink={0} flexGrow={0} width={uiState.terminalWidth}>
       <AppHeader key="app-header" version={version} />
       {uiState.history.map((h) => (
         <HistoryItemDisplay
diff --git a/packages/ui-gemini/src/ui/components/AnsiOutput.test.tsx b/packages/ui-gemini/src/ui/components/AnsiOutput.test.tsx
index 4b73fabfb..c52af84ef 100644
--- a/packages/ui-gemini/src/ui/components/AnsiOutput.test.tsx
+++ b/packages/ui-gemini/src/ui/components/AnsiOutput.test.tsx
@@ -4,99 +4,94 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { AnsiOutputText } from './AnsiOutput.js';
-import type { AnsiOutput, AnsiToken } from '@airiscode/gemini-cli-core';
+import type { AnsiOutput, AnsiToken } from "@airiscode/gemini-cli-core";
+import { render } from "../../test-utils/render.js";
+import { AnsiOutputText } from "./AnsiOutput.js";
 
 // Helper to create a valid AnsiToken with default values
 const createAnsiToken = (overrides: Partial<AnsiToken>): AnsiToken => ({
-  text: '',
+  text: "",
   bold: false,
   italic: false,
   underline: false,
   dim: false,
   inverse: false,
-  fg: '#ffffff',
-  bg: '#000000',
+  fg: "#ffffff",
+  bg: "#000000",
   ...overrides,
 });
 
-describe('<AnsiOutputText />', () => {
-  it('renders a simple AnsiOutput object correctly', () => {
+describe("<AnsiOutputText />", () => {
+  it("renders a simple AnsiOutput object correctly", () => {
     const data: AnsiOutput = [
-      [
-        createAnsiToken({ text: 'Hello, ' }),
-        createAnsiToken({ text: 'world!' }),
-      ],
+      [createAnsiToken({ text: "Hello, " }), createAnsiToken({ text: "world!" })],
     ];
     const { lastFrame } = render(<AnsiOutputText data={data} width={80} />);
-    expect(lastFrame()).toBe('Hello, world!');
+    expect(lastFrame()).toBe("Hello, world!");
   });
 
   // Note: ink-testing-library doesn't render styles, so we can only check the text.
   // We are testing that it renders without crashing.
   it.each([
-    { style: { bold: true }, text: 'Bold' },
-    { style: { italic: true }, text: 'Italic' },
-    { style: { underline: true }, text: 'Underline' },
-    { style: { dim: true }, text: 'Dim' },
-    { style: { inverse: true }, text: 'Inverse' },
-  ])('correctly applies style $text', ({ style, text }) => {
+    { style: { bold: true }, text: "Bold" },
+    { style: { italic: true }, text: "Italic" },
+    { style: { underline: true }, text: "Underline" },
+    { style: { dim: true }, text: "Dim" },
+    { style: { inverse: true }, text: "Inverse" },
+  ])("correctly applies style $text", ({ style, text }) => {
     const data: AnsiOutput = [[createAnsiToken({ text, ...style })]];
     const { lastFrame } = render(<AnsiOutputText data={data} width={80} />);
     expect(lastFrame()).toBe(text);
   });
 
   it.each([
-    { color: { fg: '#ff0000' }, text: 'Red FG' },
-    { color: { bg: '#0000ff' }, text: 'Blue BG' },
-    { color: { fg: '#00ff00', bg: '#ff00ff' }, text: 'Green FG Magenta BG' },
-  ])('correctly applies color $text', ({ color, text }) => {
+    { color: { fg: "#ff0000" }, text: "Red FG" },
+    { color: { bg: "#0000ff" }, text: "Blue BG" },
+    { color: { fg: "#00ff00", bg: "#ff00ff" }, text: "Green FG Magenta BG" },
+  ])("correctly applies color $text", ({ color, text }) => {
     const data: AnsiOutput = [[createAnsiToken({ text, ...color })]];
     const { lastFrame } = render(<AnsiOutputText data={data} width={80} />);
     expect(lastFrame()).toBe(text);
   });
 
-  it('handles empty lines and empty tokens', () => {
+  it("handles empty lines and empty tokens", () => {
     const data: AnsiOutput = [
-      [createAnsiToken({ text: 'First line' })],
+      [createAnsiToken({ text: "First line" })],
       [],
-      [createAnsiToken({ text: 'Third line' })],
-      [createAnsiToken({ text: '' })],
+      [createAnsiToken({ text: "Third line" })],
+      [createAnsiToken({ text: "" })],
     ];
     const { lastFrame } = render(<AnsiOutputText data={data} width={80} />);
     const output = lastFrame();
     expect(output).toBeDefined();
-    const lines = output!.split('\n');
-    expect(lines[0]).toBe('First line');
-    expect(lines[1]).toBe('Third line');
+    const lines = output!.split("\n");
+    expect(lines[0]).toBe("First line");
+    expect(lines[1]).toBe("Third line");
   });
 
-  it('respects the availableTerminalHeight prop and slices the lines correctly', () => {
+  it("respects the availableTerminalHeight prop and slices the lines correctly", () => {
     const data: AnsiOutput = [
-      [createAnsiToken({ text: 'Line 1' })],
-      [createAnsiToken({ text: 'Line 2' })],
-      [createAnsiToken({ text: 'Line 3' })],
-      [createAnsiToken({ text: 'Line 4' })],
+      [createAnsiToken({ text: "Line 1" })],
+      [createAnsiToken({ text: "Line 2" })],
+      [createAnsiToken({ text: "Line 3" })],
+      [createAnsiToken({ text: "Line 4" })],
     ];
     const { lastFrame } = render(
       <AnsiOutputText data={data} availableTerminalHeight={2} width={80} />,
     );
     const output = lastFrame();
-    expect(output).not.toContain('Line 1');
-    expect(output).not.toContain('Line 2');
-    expect(output).toContain('Line 3');
-    expect(output).toContain('Line 4');
+    expect(output).not.toContain("Line 1");
+    expect(output).not.toContain("Line 2");
+    expect(output).toContain("Line 3");
+    expect(output).toContain("Line 4");
   });
 
-  it('renders a large AnsiOutput object without crashing', () => {
+  it("renders a large AnsiOutput object without crashing", () => {
     const largeData: AnsiOutput = [];
     for (let i = 0; i < 1000; i++) {
       largeData.push([createAnsiToken({ text: `Line ${i}` })]);
     }
-    const { lastFrame } = render(
-      <AnsiOutputText data={largeData} width={80} />,
-    );
+    const { lastFrame } = render(<AnsiOutputText data={largeData} width={80} />);
     // We are just checking that it renders something without crashing.
     expect(lastFrame()).toBeDefined();
   });
diff --git a/packages/ui-gemini/src/ui/components/AnsiOutput.tsx b/packages/ui-gemini/src/ui/components/AnsiOutput.tsx
index aefa27858..3af182d07 100644
--- a/packages/ui-gemini/src/ui/components/AnsiOutput.tsx
+++ b/packages/ui-gemini/src/ui/components/AnsiOutput.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import type { AnsiLine, AnsiOutput, AnsiToken } from '@airiscode/gemini-cli-core';
+import type { AnsiLine, AnsiOutput, AnsiToken } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
 
 const DEFAULT_HEIGHT = 24;
 
diff --git a/packages/ui-gemini/src/ui/components/AppHeader.test.tsx b/packages/ui-gemini/src/ui/components/AppHeader.test.tsx
index c0912eee4..b91f2ad0f 100644
--- a/packages/ui-gemini/src/ui/components/AppHeader.test.tsx
+++ b/packages/ui-gemini/src/ui/components/AppHeader.test.tsx
@@ -4,156 +4,156 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import { AppHeader } from './AppHeader.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { makeFakeConfig } from '@airiscode/gemini-cli-core';
-import crypto from 'node:crypto';
+import crypto from "node:crypto";
+import { makeFakeConfig } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { AppHeader } from "./AppHeader.js";
 
 const persistentStateMock = vi.hoisted(() => ({
   get: vi.fn(),
   set: vi.fn(),
 }));
 
-vi.mock('../../utils/persistentState.js', () => ({
+vi.mock("../../utils/persistentState.js", () => ({
   persistentState: persistentStateMock,
 }));
 
-vi.mock('../utils/terminalSetup.js', () => ({
+vi.mock("../utils/terminalSetup.js", () => ({
   getTerminalProgram: () => null,
 }));
 
-describe('<AppHeader />', () => {
+describe("<AppHeader />", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     persistentStateMock.get.mockReturnValue({});
   });
 
-  it('should render the banner with default text', () => {
+  it("should render the banner with default text", () => {
     const mockConfig = makeFakeConfig();
     const uiState = {
       bannerData: {
-        defaultText: 'This is the default banner',
-        warningText: '',
+        defaultText: "This is the default banner",
+        warningText: "",
       },
       bannerVisible: true,
     };
 
-    const { lastFrame, unmount } = renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      { config: mockConfig, uiState },
-    );
+    const { lastFrame, unmount } = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+      uiState,
+    });
 
-    expect(lastFrame()).toContain('This is the default banner');
+    expect(lastFrame()).toContain("This is the default banner");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('should render the banner with warning text', () => {
+  it("should render the banner with warning text", () => {
     const mockConfig = makeFakeConfig();
     const uiState = {
       bannerData: {
-        defaultText: 'This is the default banner',
-        warningText: 'There are capacity issues',
+        defaultText: "This is the default banner",
+        warningText: "There are capacity issues",
       },
       bannerVisible: true,
     };
 
-    const { lastFrame, unmount } = renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      { config: mockConfig, uiState },
-    );
+    const { lastFrame, unmount } = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+      uiState,
+    });
 
-    expect(lastFrame()).toContain('There are capacity issues');
+    expect(lastFrame()).toContain("There are capacity issues");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('should not render the banner when no flags are set', () => {
+  it("should not render the banner when no flags are set", () => {
     const mockConfig = makeFakeConfig();
     const uiState = {
       bannerData: {
-        defaultText: '',
-        warningText: '',
+        defaultText: "",
+        warningText: "",
       },
     };
 
-    const { lastFrame, unmount } = renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      { config: mockConfig, uiState },
-    );
+    const { lastFrame, unmount } = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+      uiState,
+    });
 
-    expect(lastFrame()).not.toContain('Banner');
+    expect(lastFrame()).not.toContain("Banner");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('should render the banner when previewFeatures is disabled', () => {
+  it("should render the banner when previewFeatures is disabled", () => {
     const mockConfig = makeFakeConfig({ previewFeatures: false });
     const uiState = {
       bannerData: {
-        defaultText: 'This is the default banner',
-        warningText: '',
+        defaultText: "This is the default banner",
+        warningText: "",
       },
       bannerVisible: true,
     };
 
-    const { lastFrame, unmount } = renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      { config: mockConfig, uiState },
-    );
+    const { lastFrame, unmount } = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+      uiState,
+    });
 
-    expect(lastFrame()).toContain('This is the default banner');
+    expect(lastFrame()).toContain("This is the default banner");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('should not render the banner when previewFeatures is enabled', () => {
+  it("should not render the banner when previewFeatures is enabled", () => {
     const mockConfig = makeFakeConfig({ previewFeatures: true });
     const uiState = {
       bannerData: {
-        defaultText: 'This is the default banner',
-        warningText: '',
+        defaultText: "This is the default banner",
+        warningText: "",
       },
     };
 
-    const { lastFrame, unmount } = renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      { config: mockConfig, uiState },
-    );
+    const { lastFrame, unmount } = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+      uiState,
+    });
 
-    expect(lastFrame()).not.toContain('This is the default banner');
+    expect(lastFrame()).not.toContain("This is the default banner");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('should not render the default banner if shown count is 5 or more', () => {
+  it("should not render the default banner if shown count is 5 or more", () => {
     persistentStateMock.get.mockReturnValue(5);
     const mockConfig = makeFakeConfig();
     const uiState = {
       bannerData: {
-        defaultText: 'This is the default banner',
-        warningText: '',
+        defaultText: "This is the default banner",
+        warningText: "",
       },
     };
 
-    const { lastFrame, unmount } = renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      { config: mockConfig, uiState },
-    );
+    const { lastFrame, unmount } = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+      uiState,
+    });
 
-    expect(lastFrame()).not.toContain('This is the default banner');
+    expect(lastFrame()).not.toContain("This is the default banner");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('should increment the version count when default banner is displayed', () => {
+  it("should increment the version count when default banner is displayed", () => {
     persistentStateMock.get.mockReturnValue({});
     const mockConfig = makeFakeConfig();
     const uiState = {
       bannerData: {
-        defaultText: 'This is the default banner',
-        warningText: '',
+        defaultText: "This is the default banner",
+        warningText: "",
       },
     };
 
@@ -162,34 +162,28 @@ describe('<AppHeader />', () => {
       uiState,
     });
 
-    expect(persistentStateMock.set).toHaveBeenCalledWith(
-      'defaultBannerShownCount',
-      {
-        [crypto
-          .createHash('sha256')
-          .update(uiState.bannerData.defaultText)
-          .digest('hex')]: 1,
-      },
-    );
+    expect(persistentStateMock.set).toHaveBeenCalledWith("defaultBannerShownCount", {
+      [crypto.createHash("sha256").update(uiState.bannerData.defaultText).digest("hex")]: 1,
+    });
     unmount();
   });
 
-  it('should render banner text with unescaped newlines', () => {
+  it("should render banner text with unescaped newlines", () => {
     const mockConfig = makeFakeConfig();
     const uiState = {
       bannerData: {
-        defaultText: 'First line\\nSecond line',
-        warningText: '',
+        defaultText: "First line\\nSecond line",
+        warningText: "",
       },
       bannerVisible: true,
     };
 
-    const { lastFrame, unmount } = renderWithProviders(
-      <AppHeader version="1.0.0" />,
-      { config: mockConfig, uiState },
-    );
+    const { lastFrame, unmount } = renderWithProviders(<AppHeader version="1.0.0" />, {
+      config: mockConfig,
+      uiState,
+    });
 
-    expect(lastFrame()).not.toContain('First line\\nSecond line');
+    expect(lastFrame()).not.toContain("First line\\nSecond line");
     unmount();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/AppHeader.tsx b/packages/ui-gemini/src/ui/components/AppHeader.tsx
index c404c0e9f..ec99a65e1 100644
--- a/packages/ui-gemini/src/ui/components/AppHeader.tsx
+++ b/packages/ui-gemini/src/ui/components/AppHeader.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { Header } from './Header.js';
-import { Tips } from './Tips.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { Banner } from './Banner.js';
-import { useBanner } from '../hooks/useBanner.js';
+import { Box } from "ink";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useBanner } from "../hooks/useBanner.js";
+import { Banner } from "./Banner.js";
+import { Header } from "./Header.js";
+import { Tips } from "./Tips.js";
 
 interface AppHeaderProps {
   version: string;
@@ -33,14 +33,12 @@ export const AppHeader = ({ version }: AppHeaderProps) => {
             <Banner
               width={mainAreaWidth}
               bannerText={bannerText}
-              isWarning={bannerData.warningText !== ''}
+              isWarning={bannerData.warningText !== ""}
             />
           )}
         </>
       )}
-      {!(settings.merged.ui?.hideTips || config.getScreenReader()) && (
-        <Tips config={config} />
-      )}
+      {!(settings.merged.ui?.hideTips || config.getScreenReader()) && <Tips config={config} />}
     </Box>
   );
 };
diff --git a/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.test.tsx b/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.test.tsx
index 861413626..f7dbd7e37 100644
--- a/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.test.tsx
+++ b/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.test.tsx
@@ -4,36 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
-import { describe, it, expect } from 'vitest';
-import { ApprovalMode } from '@airiscode/gemini-cli-core';
+import { ApprovalMode } from "@airiscode/gemini-cli-core";
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { AutoAcceptIndicator } from "./AutoAcceptIndicator.js";
 
-describe('AutoAcceptIndicator', () => {
-  it('renders correctly for AUTO_EDIT mode', () => {
-    const { lastFrame } = render(
-      <AutoAcceptIndicator approvalMode={ApprovalMode.AUTO_EDIT} />,
-    );
+describe("AutoAcceptIndicator", () => {
+  it("renders correctly for AUTO_EDIT mode", () => {
+    const { lastFrame } = render(<AutoAcceptIndicator approvalMode={ApprovalMode.AUTO_EDIT} />);
     const output = lastFrame();
-    expect(output).toContain('accepting edits');
-    expect(output).toContain('(shift + tab to toggle)');
+    expect(output).toContain("accepting edits");
+    expect(output).toContain("(shift + tab to toggle)");
   });
 
-  it('renders correctly for YOLO mode', () => {
-    const { lastFrame } = render(
-      <AutoAcceptIndicator approvalMode={ApprovalMode.YOLO} />,
-    );
+  it("renders correctly for YOLO mode", () => {
+    const { lastFrame } = render(<AutoAcceptIndicator approvalMode={ApprovalMode.YOLO} />);
     const output = lastFrame();
-    expect(output).toContain('YOLO mode');
-    expect(output).toContain('(ctrl + y to toggle)');
+    expect(output).toContain("YOLO mode");
+    expect(output).toContain("(ctrl + y to toggle)");
   });
 
-  it('renders nothing for DEFAULT mode', () => {
-    const { lastFrame } = render(
-      <AutoAcceptIndicator approvalMode={ApprovalMode.DEFAULT} />,
-    );
+  it("renders nothing for DEFAULT mode", () => {
+    const { lastFrame } = render(<AutoAcceptIndicator approvalMode={ApprovalMode.DEFAULT} />);
     const output = lastFrame();
-    expect(output).not.toContain('accepting edits');
-    expect(output).not.toContain('YOLO mode');
+    expect(output).not.toContain("accepting edits");
+    expect(output).not.toContain("YOLO mode");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.tsx b/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.tsx
index 3023ac1a7..6871114fb 100644
--- a/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.tsx
+++ b/packages/ui-gemini/src/ui/components/AutoAcceptIndicator.tsx
@@ -4,32 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { ApprovalMode } from '@airiscode/gemini-cli-core';
+import { ApprovalMode } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 interface AutoAcceptIndicatorProps {
   approvalMode: ApprovalMode;
 }
 
-export const AutoAcceptIndicator: React.FC<AutoAcceptIndicatorProps> = ({
-  approvalMode,
-}) => {
-  let textColor = '';
-  let textContent = '';
-  let subText = '';
+export const AutoAcceptIndicator: React.FC<AutoAcceptIndicatorProps> = ({ approvalMode }) => {
+  let textColor = "";
+  let textContent = "";
+  let subText = "";
 
   switch (approvalMode) {
     case ApprovalMode.AUTO_EDIT:
       textColor = theme.status.warning;
-      textContent = 'accepting edits';
-      subText = ' (shift + tab to toggle)';
+      textContent = "accepting edits";
+      subText = " (shift + tab to toggle)";
       break;
     case ApprovalMode.YOLO:
       textColor = theme.status.error;
-      textContent = 'YOLO mode';
-      subText = ' (ctrl + y to toggle)';
+      textContent = "YOLO mode";
+      subText = " (ctrl + y to toggle)";
       break;
     case ApprovalMode.DEFAULT:
     default:
diff --git a/packages/ui-gemini/src/ui/components/Banner.test.tsx b/packages/ui-gemini/src/ui/components/Banner.test.tsx
index ec50b2551..9279bb849 100644
--- a/packages/ui-gemini/src/ui/components/Banner.test.tsx
+++ b/packages/ui-gemini/src/ui/components/Banner.test.tsx
@@ -4,26 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { Banner } from './Banner.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { Banner } from "./Banner.js";
 
-describe('Banner', () => {
+describe("Banner", () => {
   it.each([
-    ['warning mode', true, 'Warning Message'],
-    ['info mode', false, 'Info Message'],
-  ])('renders in %s', (_, isWarning, text) => {
-    const { lastFrame } = render(
-      <Banner bannerText={text} isWarning={isWarning} width={80} />,
-    );
+    ["warning mode", true, "Warning Message"],
+    ["info mode", false, "Info Message"],
+  ])("renders in %s", (_, isWarning, text) => {
+    const { lastFrame } = render(<Banner bannerText={text} isWarning={isWarning} width={80} />);
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('handles newlines in text', () => {
-    const text = 'Line 1\\nLine 2';
-    const { lastFrame } = render(
-      <Banner bannerText={text} isWarning={false} width={80} />,
-    );
+  it("handles newlines in text", () => {
+    const text = "Line 1\\nLine 2";
+    const { lastFrame } = render(<Banner bannerText={text} isWarning={false} width={80} />);
     expect(lastFrame()).toMatchSnapshot();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/Banner.tsx b/packages/ui-gemini/src/ui/components/Banner.tsx
index 99f573a68..bf77bc5cf 100644
--- a/packages/ui-gemini/src/ui/components/Banner.tsx
+++ b/packages/ui-gemini/src/ui/components/Banner.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { ThemedGradient } from './ThemedGradient.js';
-import { theme } from '../semantic-colors.js';
-import type { ReactNode } from 'react';
+import { Box, Text } from "ink";
+import type { ReactNode } from "react";
+import { theme } from "../semantic-colors.js";
+import { ThemedGradient } from "./ThemedGradient.js";
 
 export function getFormattedBannerContent(
   rawText: string,
@@ -15,13 +15,11 @@ export function getFormattedBannerContent(
   subsequentLineColor: string,
 ): ReactNode {
   if (isWarning) {
-    return (
-      <Text color={theme.status.warning}>{rawText.replace(/\\n/g, '\n')}</Text>
-    );
+    return <Text color={theme.status.warning}>{rawText.replace(/\\n/g, "\n")}</Text>;
   }
 
-  const text = rawText.replace(/\\n/g, '\n');
-  const lines = text.split('\n');
+  const text = rawText.replace(/\\n/g, "\n");
+  const lines = text.split("\n");
 
   return lines.map((line, index) => {
     if (index === 0) {
diff --git a/packages/ui-gemini/src/ui/components/CliSpinner.test.tsx b/packages/ui-gemini/src/ui/components/CliSpinner.test.tsx
index bbea23ab5..c7573aa05 100644
--- a/packages/ui-gemini/src/ui/components/CliSpinner.test.tsx
+++ b/packages/ui-gemini/src/ui/components/CliSpinner.test.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { CliSpinner } from './CliSpinner.js';
-import { debugState } from '../debug.js';
-import { describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { debugState } from "../debug.js";
+import { CliSpinner } from "./CliSpinner.js";
 
-describe('<CliSpinner />', () => {
+describe("<CliSpinner />", () => {
   beforeEach(() => {
     debugState.debugNumAnimatedComponents = 0;
   });
 
-  it('should increment debugNumAnimatedComponents on mount and decrement on unmount', () => {
+  it("should increment debugNumAnimatedComponents on mount and decrement on unmount", () => {
     expect(debugState.debugNumAnimatedComponents).toBe(0);
     const { unmount } = render(<CliSpinner />);
     expect(debugState.debugNumAnimatedComponents).toBe(1);
diff --git a/packages/ui-gemini/src/ui/components/CliSpinner.tsx b/packages/ui-gemini/src/ui/components/CliSpinner.tsx
index 6795bf267..8854cecad 100644
--- a/packages/ui-gemini/src/ui/components/CliSpinner.tsx
+++ b/packages/ui-gemini/src/ui/components/CliSpinner.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import Spinner from 'ink-spinner';
-import { type ComponentProps, useEffect } from 'react';
-import { debugState } from '../debug.js';
+import Spinner from "ink-spinner";
+import { type ComponentProps, useEffect } from "react";
+import { debugState } from "../debug.js";
 
 export type SpinnerProps = ComponentProps<typeof Spinner>;
 
diff --git a/packages/ui-gemini/src/ui/components/Composer.test.tsx b/packages/ui-gemini/src/ui/components/Composer.test.tsx
index 0afad595d..72e928665 100644
--- a/packages/ui-gemini/src/ui/components/Composer.test.tsx
+++ b/packages/ui-gemini/src/ui/components/Composer.test.tsx
@@ -4,51 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { render } from '../../test-utils/render.js';
-import { Text } from 'ink';
-import { Composer } from './Composer.js';
-import { UIStateContext, type UIState } from '../contexts/UIStateContext.js';
-import {
-  UIActionsContext,
-  type UIActions,
-} from '../contexts/UIActionsContext.js';
-import { ConfigContext } from '../contexts/ConfigContext.js';
-import { SettingsContext } from '../contexts/SettingsContext.js';
+import { Text } from "ink";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ConfigContext } from "../contexts/ConfigContext.js";
+import { SettingsContext } from "../contexts/SettingsContext.js";
+import { type UIActions, UIActionsContext } from "../contexts/UIActionsContext.js";
+import { type UIState, UIStateContext } from "../contexts/UIStateContext.js";
+import { Composer } from "./Composer.js";
+
 // Mock VimModeContext hook
-vi.mock('../contexts/VimModeContext.js', () => ({
+vi.mock("../contexts/VimModeContext.js", () => ({
   useVimMode: vi.fn(() => ({
     vimEnabled: false,
-    vimMode: 'NORMAL',
+    vimMode: "NORMAL",
   })),
 }));
-import { ApprovalMode } from '@airiscode/gemini-cli-core';
-import { StreamingState } from '../types.js';
+
+import { ApprovalMode } from "@airiscode/gemini-cli-core";
+import { StreamingState } from "../types.js";
 
 // Mock child components
-vi.mock('./LoadingIndicator.js', () => ({
+vi.mock("./LoadingIndicator.js", () => ({
   LoadingIndicator: ({ thought }: { thought?: string }) => (
-    <Text>LoadingIndicator{thought ? `: ${thought}` : ''}</Text>
+    <Text>LoadingIndicator{thought ? `: ${thought}` : ""}</Text>
   ),
 }));
 
-vi.mock('./ContextSummaryDisplay.js', () => ({
+vi.mock("./ContextSummaryDisplay.js", () => ({
   ContextSummaryDisplay: () => <Text>ContextSummaryDisplay</Text>,
 }));
 
-vi.mock('./AutoAcceptIndicator.js', () => ({
+vi.mock("./AutoAcceptIndicator.js", () => ({
   AutoAcceptIndicator: () => <Text>AutoAcceptIndicator</Text>,
 }));
 
-vi.mock('./ShellModeIndicator.js', () => ({
+vi.mock("./ShellModeIndicator.js", () => ({
   ShellModeIndicator: () => <Text>ShellModeIndicator</Text>,
 }));
 
-vi.mock('./DetailedMessagesDisplay.js', () => ({
+vi.mock("./DetailedMessagesDisplay.js", () => ({
   DetailedMessagesDisplay: () => <Text>DetailedMessagesDisplay</Text>,
 }));
 
-vi.mock('./InputPrompt.js', () => ({
+vi.mock("./InputPrompt.js", () => ({
   InputPrompt: () => <Text>InputPrompt</Text>,
   calculatePromptWidths: vi.fn(() => ({
     inputWidth: 80,
@@ -57,15 +56,15 @@ vi.mock('./InputPrompt.js', () => ({
   })),
 }));
 
-vi.mock('./Footer.js', () => ({
+vi.mock("./Footer.js", () => ({
   Footer: () => <Text>Footer</Text>,
 }));
 
-vi.mock('./ShowMoreLines.js', () => ({
+vi.mock("./ShowMoreLines.js", () => ({
   ShowMoreLines: () => <Text>ShowMoreLines</Text>,
 }));
 
-vi.mock('./QueuedMessageDisplay.js', () => ({
+vi.mock("./QueuedMessageDisplay.js", () => ({
   QueuedMessageDisplay: ({ messageQueue }: { messageQueue: string[] }) => {
     if (messageQueue.length === 0) {
       return null;
@@ -81,7 +80,7 @@ vi.mock('./QueuedMessageDisplay.js', () => ({
 }));
 
 // Mock contexts
-vi.mock('../contexts/OverflowContext.js', () => ({
+vi.mock("../contexts/OverflowContext.js", () => ({
   OverflowProvider: ({ children }: { children: React.ReactNode }) => children,
 }));
 
@@ -95,7 +94,7 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
     showErrorDetails: false,
     constrainHeight: false,
     isInputActive: true,
-    buffer: '',
+    buffer: "",
     inputWidth: 80,
     suggestionsWidth: 40,
     userMessages: [],
@@ -103,8 +102,8 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
     commandContext: null,
     shellModeActive: false,
     isFocused: true,
-    thought: '',
-    currentLoadingPhrase: '',
+    thought: "",
+    currentLoadingPhrase: "",
     elapsedTime: 0,
     ctrlCPressedOnce: false,
     ctrlDPressedOnce: false,
@@ -119,8 +118,8 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
       sessionTokenCount: 0,
       totalPrompts: 0,
     },
-    branchName: 'main',
-    debugMessage: '',
+    branchName: "main",
+    debugMessage: "",
     corgiMode: false,
     errorCount: 0,
     nightly: false,
@@ -139,8 +138,8 @@ const createMockUIActions = (): UIActions =>
   }) as any;
 
 const createMockConfig = (overrides = {}) => ({
-  getModel: vi.fn(() => 'gemini-1.5-pro'),
-  getTargetDir: vi.fn(() => '/test/dir'),
+  getModel: vi.fn(() => "gemini-1.5-pro"),
+  getTargetDir: vi.fn(() => "/test/dir"),
   getDebugMode: vi.fn(() => false),
   getAccessibility: vi.fn(() => ({})),
   getMcpServers: vi.fn(() => ({})),
@@ -179,35 +178,35 @@ const renderComposer = (
   );
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
-describe('Composer', () => {
-  describe('Footer Display Settings', () => {
-    it('renders Footer by default when hideFooter is false', () => {
+describe("Composer", () => {
+  describe("Footer Display Settings", () => {
+    it("renders Footer by default when hideFooter is false", () => {
       const uiState = createMockUIState();
       const settings = createMockSettings({ hideFooter: false });
 
       const { lastFrame } = renderComposer(uiState, settings);
 
-      expect(lastFrame()).toContain('Footer');
+      expect(lastFrame()).toContain("Footer");
     });
 
-    it('does NOT render Footer when hideFooter is true', () => {
+    it("does NOT render Footer when hideFooter is true", () => {
       const uiState = createMockUIState();
       const settings = createMockSettings({ hideFooter: true });
 
       const { lastFrame } = renderComposer(uiState, settings);
 
       // Check for content that only appears IN the Footer component itself
-      expect(lastFrame()).not.toContain('[NORMAL]'); // Vim mode indicator
-      expect(lastFrame()).not.toContain('(main'); // Branch name with parentheses
+      expect(lastFrame()).not.toContain("[NORMAL]"); // Vim mode indicator
+      expect(lastFrame()).not.toContain("(main"); // Branch name with parentheses
     });
 
-    it('passes correct props to Footer including vim mode when enabled', async () => {
+    it("passes correct props to Footer including vim mode when enabled", async () => {
       const uiState = createMockUIState({
-        branchName: 'feature-branch',
+        branchName: "feature-branch",
         corgiMode: true,
         errorCount: 2,
         sessionStats: {
-          sessionId: 'test-session',
+          sessionId: "test-session",
           sessionStartTime: new Date(),
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           metrics: {} as any,
@@ -216,8 +215,8 @@ describe('Composer', () => {
         },
       });
       const config = createMockConfig({
-        getModel: vi.fn(() => 'gemini-1.5-flash'),
-        getTargetDir: vi.fn(() => '/project/path'),
+        getModel: vi.fn(() => "gemini-1.5-flash"),
+        getTargetDir: vi.fn(() => "/project/path"),
         getDebugMode: vi.fn(() => true),
       });
       const settings = createMockSettings({
@@ -225,42 +224,42 @@ describe('Composer', () => {
         showMemoryUsage: true,
       });
       // Mock vim mode for this test
-      const { useVimMode } = await import('../contexts/VimModeContext.js');
+      const { useVimMode } = await import("../contexts/VimModeContext.js");
       vi.mocked(useVimMode).mockReturnValueOnce({
         vimEnabled: true,
-        vimMode: 'INSERT',
+        vimMode: "INSERT",
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any);
 
       const { lastFrame } = renderComposer(uiState, settings, config);
 
-      expect(lastFrame()).toContain('Footer');
+      expect(lastFrame()).toContain("Footer");
       // Footer should be rendered with all the state passed through
     });
   });
 
-  describe('Loading Indicator', () => {
-    it('renders LoadingIndicator with thought when streaming', () => {
+  describe("Loading Indicator", () => {
+    it("renders LoadingIndicator with thought when streaming", () => {
       const uiState = createMockUIState({
         streamingState: StreamingState.Responding,
         thought: {
-          subject: 'Processing',
-          description: 'Processing your request...',
+          subject: "Processing",
+          description: "Processing your request...",
         },
-        currentLoadingPhrase: 'Analyzing',
+        currentLoadingPhrase: "Analyzing",
         elapsedTime: 1500,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
       const output = lastFrame();
-      expect(output).toContain('LoadingIndicator');
+      expect(output).toContain("LoadingIndicator");
     });
 
-    it('renders LoadingIndicator without thought when accessibility disables loading phrases', () => {
+    it("renders LoadingIndicator without thought when accessibility disables loading phrases", () => {
       const uiState = createMockUIState({
         streamingState: StreamingState.Responding,
-        thought: { subject: 'Hidden', description: 'Should not show' },
+        thought: { subject: "Hidden", description: "Should not show" },
       });
       const config = createMockConfig({
         getAccessibility: vi.fn(() => ({ disableLoadingPhrases: true })),
@@ -269,46 +268,42 @@ describe('Composer', () => {
       const { lastFrame } = renderComposer(uiState, undefined, config);
 
       const output = lastFrame();
-      expect(output).toContain('LoadingIndicator');
-      expect(output).not.toContain('Should not show');
+      expect(output).toContain("LoadingIndicator");
+      expect(output).not.toContain("Should not show");
     });
 
-    it('suppresses thought when waiting for confirmation', () => {
+    it("suppresses thought when waiting for confirmation", () => {
       const uiState = createMockUIState({
         streamingState: StreamingState.WaitingForConfirmation,
         thought: {
-          subject: 'Confirmation',
-          description: 'Should not show during confirmation',
+          subject: "Confirmation",
+          description: "Should not show during confirmation",
         },
       });
 
       const { lastFrame } = renderComposer(uiState);
 
       const output = lastFrame();
-      expect(output).toContain('LoadingIndicator');
-      expect(output).not.toContain('Should not show during confirmation');
+      expect(output).toContain("LoadingIndicator");
+      expect(output).not.toContain("Should not show during confirmation");
     });
   });
 
-  describe('Message Queue Display', () => {
-    it('displays queued messages when present', () => {
+  describe("Message Queue Display", () => {
+    it("displays queued messages when present", () => {
       const uiState = createMockUIState({
-        messageQueue: [
-          'First queued message',
-          'Second queued message',
-          'Third queued message',
-        ],
+        messageQueue: ["First queued message", "Second queued message", "Third queued message"],
       });
 
       const { lastFrame } = renderComposer(uiState);
 
       const output = lastFrame();
-      expect(output).toContain('First queued message');
-      expect(output).toContain('Second queued message');
-      expect(output).toContain('Third queued message');
+      expect(output).toContain("First queued message");
+      expect(output).toContain("Second queued message");
+      expect(output).toContain("Third queued message");
     });
 
-    it('renders QueuedMessageDisplay with empty message queue', () => {
+    it("renders QueuedMessageDisplay with empty message queue", () => {
       const uiState = createMockUIState({
         messageQueue: [],
       });
@@ -318,12 +313,12 @@ describe('Composer', () => {
       // The component should render but return null for empty queue
       // This test verifies that the component receives the correct prop
       const output = lastFrame();
-      expect(output).toContain('InputPrompt'); // Verify basic Composer rendering
+      expect(output).toContain("InputPrompt"); // Verify basic Composer rendering
     });
   });
 
-  describe('Context and Status Display', () => {
-    it('shows ContextSummaryDisplay in normal state', () => {
+  describe("Context and Status Display", () => {
+    it("shows ContextSummaryDisplay in normal state", () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: false,
         ctrlDPressedOnce: false,
@@ -332,62 +327,62 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('ContextSummaryDisplay');
+      expect(lastFrame()).toContain("ContextSummaryDisplay");
     });
 
-    it('shows Ctrl+C exit prompt when ctrlCPressedOnce is true', () => {
+    it("shows Ctrl+C exit prompt when ctrlCPressedOnce is true", () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Ctrl+C again to exit');
+      expect(lastFrame()).toContain("Press Ctrl+C again to exit");
     });
 
-    it('shows Ctrl+D exit prompt when ctrlDPressedOnce is true', () => {
+    it("shows Ctrl+D exit prompt when ctrlDPressedOnce is true", () => {
       const uiState = createMockUIState({
         ctrlDPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Ctrl+D again to exit');
+      expect(lastFrame()).toContain("Press Ctrl+D again to exit");
     });
 
-    it('shows escape prompt when showEscapePrompt is true', () => {
+    it("shows escape prompt when showEscapePrompt is true", () => {
       const uiState = createMockUIState({
         showEscapePrompt: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Esc again to clear');
+      expect(lastFrame()).toContain("Press Esc again to clear");
     });
   });
 
-  describe('Input and Indicators', () => {
-    it('renders InputPrompt when input is active', () => {
+  describe("Input and Indicators", () => {
+    it("renders InputPrompt when input is active", () => {
       const uiState = createMockUIState({
         isInputActive: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('InputPrompt');
+      expect(lastFrame()).toContain("InputPrompt");
     });
 
-    it('does not render InputPrompt when input is inactive', () => {
+    it("does not render InputPrompt when input is inactive", () => {
       const uiState = createMockUIState({
         isInputActive: false,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).not.toContain('InputPrompt');
+      expect(lastFrame()).not.toContain("InputPrompt");
     });
 
-    it('shows AutoAcceptIndicator when approval mode is not default and shell mode is inactive', () => {
+    it("shows AutoAcceptIndicator when approval mode is not default and shell mode is inactive", () => {
       const uiState = createMockUIState({
         showAutoAcceptIndicator: ApprovalMode.YOLO,
         shellModeActive: false,
@@ -395,64 +390,64 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('AutoAcceptIndicator');
+      expect(lastFrame()).toContain("AutoAcceptIndicator");
     });
 
-    it('shows ShellModeIndicator when shell mode is active', () => {
+    it("shows ShellModeIndicator when shell mode is active", () => {
       const uiState = createMockUIState({
         shellModeActive: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('ShellModeIndicator');
+      expect(lastFrame()).toContain("ShellModeIndicator");
     });
 
-    it('shows RawMarkdownIndicator when renderMarkdown is false', () => {
+    it("shows RawMarkdownIndicator when renderMarkdown is false", () => {
       const uiState = createMockUIState({
         renderMarkdown: false,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('raw markdown mode');
+      expect(lastFrame()).toContain("raw markdown mode");
     });
 
-    it('does not show RawMarkdownIndicator when renderMarkdown is true', () => {
+    it("does not show RawMarkdownIndicator when renderMarkdown is true", () => {
       const uiState = createMockUIState({
         renderMarkdown: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).not.toContain('raw markdown mode');
+      expect(lastFrame()).not.toContain("raw markdown mode");
     });
   });
 
-  describe('Error Details Display', () => {
-    it('shows DetailedMessagesDisplay when showErrorDetails is true', () => {
+  describe("Error Details Display", () => {
+    it("shows DetailedMessagesDisplay when showErrorDetails is true", () => {
       const uiState = createMockUIState({
         showErrorDetails: true,
         filteredConsoleMessages: [
-          { level: 'error', message: 'Test error', timestamp: new Date() },
+          { level: "error", message: "Test error", timestamp: new Date() },
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
         ] as any,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('DetailedMessagesDisplay');
-      expect(lastFrame()).toContain('ShowMoreLines');
+      expect(lastFrame()).toContain("DetailedMessagesDisplay");
+      expect(lastFrame()).toContain("ShowMoreLines");
     });
 
-    it('does not show error details when showErrorDetails is false', () => {
+    it("does not show error details when showErrorDetails is false", () => {
       const uiState = createMockUIState({
         showErrorDetails: false,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).not.toContain('DetailedMessagesDisplay');
+      expect(lastFrame()).not.toContain("DetailedMessagesDisplay");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/Composer.tsx b/packages/ui-gemini/src/ui/components/Composer.tsx
index 1fc478577..137f67a7f 100644
--- a/packages/ui-gemini/src/ui/components/Composer.tsx
+++ b/packages/ui-gemini/src/ui/components/Composer.tsx
@@ -4,31 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState } from 'react';
-import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import { LoadingIndicator } from './LoadingIndicator.js';
-import { ContextSummaryDisplay } from './ContextSummaryDisplay.js';
-import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
-import { ShellModeIndicator } from './ShellModeIndicator.js';
-import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
-import { RawMarkdownIndicator } from './RawMarkdownIndicator.js';
-import { InputPrompt } from './InputPrompt.js';
-import { Footer } from './Footer.js';
-import { ShowMoreLines } from './ShowMoreLines.js';
-import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
-import { OverflowProvider } from '../contexts/OverflowContext.js';
-import { theme } from '../semantic-colors.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
-import { ApprovalMode } from '@airiscode/gemini-cli-core';
-import { StreamingState } from '../types.js';
-import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js';
-import { TodoTray } from './messages/Todo.js';
+import { ApprovalMode } from "@airiscode/gemini-cli-core";
+import { Box, Text, useIsScreenReaderEnabled } from "ink";
+import { useState } from "react";
+import { ConfigInitDisplay } from "../components/ConfigInitDisplay.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { OverflowProvider } from "../contexts/OverflowContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
+import { useAlternateBuffer } from "../hooks/useAlternateBuffer.js";
+import { theme } from "../semantic-colors.js";
+import { StreamingState } from "../types.js";
+import { isNarrowWidth } from "../utils/isNarrowWidth.js";
+import { AutoAcceptIndicator } from "./AutoAcceptIndicator.js";
+import { ContextSummaryDisplay } from "./ContextSummaryDisplay.js";
+import { DetailedMessagesDisplay } from "./DetailedMessagesDisplay.js";
+import { Footer } from "./Footer.js";
+import { InputPrompt } from "./InputPrompt.js";
+import { LoadingIndicator } from "./LoadingIndicator.js";
+import { TodoTray } from "./messages/Todo.js";
+import { QueuedMessageDisplay } from "./QueuedMessageDisplay.js";
+import { RawMarkdownIndicator } from "./RawMarkdownIndicator.js";
+import { ShellModeIndicator } from "./ShellModeIndicator.js";
+import { ShowMoreLines } from "./ShowMoreLines.js";
 
 export const Composer = () => {
   const config = useConfig();
@@ -44,17 +44,11 @@ export const Composer = () => {
 
   const isAlternateBuffer = useAlternateBuffer();
   const { contextFileNames, showAutoAcceptIndicator } = uiState;
-  const suggestionsPosition = isAlternateBuffer ? 'above' : 'below';
-  const hideContextSummary =
-    suggestionsVisible && suggestionsPosition === 'above';
+  const suggestionsPosition = isAlternateBuffer ? "above" : "below";
+  const hideContextSummary = suggestionsVisible && suggestionsPosition === "above";
 
   return (
-    <Box
-      flexDirection="column"
-      width={uiState.mainAreaWidth}
-      flexGrow={0}
-      flexShrink={0}
-    >
+    <Box flexDirection="column" width={uiState.mainAreaWidth} flexGrow={0} flexShrink={0}>
       {!uiState.embeddedShellFocused && (
         <LoadingIndicator
           thought={
@@ -72,9 +66,7 @@ export const Composer = () => {
         />
       )}
 
-      {(!uiState.slashCommands || !uiState.isConfigInitialized) && (
-        <ConfigInitDisplay />
-      )}
+      {(!uiState.slashCommands || !uiState.isConfigInitialized) && <ConfigInitDisplay />}
 
       <QueuedMessageDisplay messageQueue={uiState.messageQueue} />
 
@@ -82,29 +74,19 @@ export const Composer = () => {
 
       <Box
         marginTop={1}
-        justifyContent={
-          settings.merged.ui?.hideContextSummary
-            ? 'flex-start'
-            : 'space-between'
-        }
+        justifyContent={settings.merged.ui?.hideContextSummary ? "flex-start" : "space-between"}
         width="100%"
-        flexDirection={isNarrow ? 'column' : 'row'}
-        alignItems={isNarrow ? 'flex-start' : 'center'}
+        flexDirection={isNarrow ? "column" : "row"}
+        alignItems={isNarrow ? "flex-start" : "center"}
       >
         <Box marginRight={1}>
-          {process.env['GEMINI_SYSTEM_MD'] && (
-            <Text color={theme.status.error}>|⌐■_■| </Text>
-          )}
+          {process.env["GEMINI_SYSTEM_MD"] && <Text color={theme.status.error}>|⌐■_■| </Text>}
           {uiState.ctrlCPressedOnce ? (
-            <Text color={theme.status.warning}>
-              Press Ctrl+C again to exit.
-            </Text>
+            <Text color={theme.status.warning}>Press Ctrl+C again to exit.</Text>
           ) : uiState.warningMessage ? (
             <Text color={theme.status.warning}>{uiState.warningMessage}</Text>
           ) : uiState.ctrlDPressedOnce ? (
-            <Text color={theme.status.warning}>
-              Press Ctrl+D again to exit.
-            </Text>
+            <Text color={theme.status.warning}>Press Ctrl+D again to exit.</Text>
           ) : uiState.showEscapePrompt ? (
             <Text color={theme.text.secondary}>Press Esc again to clear.</Text>
           ) : uiState.queueErrorMessage ? (
@@ -117,18 +99,15 @@ export const Composer = () => {
                 geminiMdFileCount={uiState.geminiMdFileCount}
                 contextFileNames={contextFileNames}
                 mcpServers={config.getMcpClientManager()?.getMcpServers() ?? {}}
-                blockedMcpServers={
-                  config.getMcpClientManager()?.getBlockedMcpServers() ?? []
-                }
+                blockedMcpServers={config.getMcpClientManager()?.getBlockedMcpServers() ?? []}
               />
             )
           )}
         </Box>
         <Box paddingTop={isNarrow ? 1 : 0}>
-          {showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
-            !uiState.shellModeActive && (
-              <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
-            )}
+          {showAutoAcceptIndicator !== ApprovalMode.DEFAULT && !uiState.shellModeActive && (
+            <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
+          )}
           {uiState.shellModeActive && <ShellModeIndicator />}
           {!uiState.renderMarkdown && <RawMarkdownIndicator />}
         </Box>
@@ -139,9 +118,7 @@ export const Composer = () => {
           <Box flexDirection="column">
             <DetailedMessagesDisplay
               messages={uiState.filteredConsoleMessages}
-              maxHeight={
-                uiState.constrainHeight ? debugConsoleMaxHeight : undefined
-              }
+              maxHeight={uiState.constrainHeight ? debugConsoleMaxHeight : undefined}
               width={uiState.mainAreaWidth}
               hasFocus={uiState.showErrorDetails}
             />
@@ -173,7 +150,7 @@ export const Composer = () => {
           placeholder={
             vimEnabled
               ? "  Press 'i' for INSERT mode and 'Esc' for NORMAL mode."
-              : '  Type your message or @path/to/file'
+              : "  Type your message or @path/to/file"
           }
           setQueueErrorMessage={uiActions.setQueueErrorMessage}
           streamingState={uiState.streamingState}
diff --git a/packages/ui-gemini/src/ui/components/ConfigInitDisplay.test.tsx b/packages/ui-gemini/src/ui/components/ConfigInitDisplay.test.tsx
index 3cadfa75c..3fbdf0e5d 100644
--- a/packages/ui-gemini/src/ui/components/ConfigInitDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ConfigInitDisplay.test.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { ConfigInitDisplay } from './ConfigInitDisplay.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { AppEvent } from '../../utils/events.js';
-import { MCPServerStatus, type McpClient } from '@airiscode/gemini-cli-core';
-import { Text } from 'ink';
+import { MCPServerStatus, type McpClient } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import { AppEvent } from "../../utils/events.js";
+import { ConfigInitDisplay } from "./ConfigInitDisplay.js";
 
 // Mock GeminiSpinner
-vi.mock('./GeminiRespondingSpinner.js', () => ({
+vi.mock("./GeminiRespondingSpinner.js", () => ({
   GeminiSpinner: () => <Text>Spinner</Text>,
 }));
 
@@ -25,8 +25,8 @@ const { mockOn, mockOff, mockEmit } = vi.hoisted(() => ({
   mockEmit: vi.fn(),
 }));
 
-vi.mock('../../utils/events.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../../utils/events.js')>();
+vi.mock("../../utils/events.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../../utils/events.js")>();
   return {
     ...actual,
     appEvents: {
@@ -37,7 +37,7 @@ vi.mock('../../utils/events.js', async (importOriginal) => {
   };
 });
 
-describe('ConfigInitDisplay', () => {
+describe("ConfigInitDisplay", () => {
   beforeEach(() => {
     mockOn.mockClear();
     mockOff.mockClear();
@@ -48,12 +48,12 @@ describe('ConfigInitDisplay', () => {
     vi.restoreAllMocks();
   });
 
-  it('renders initial state', () => {
+  it("renders initial state", () => {
     const { lastFrame } = render(<ConfigInitDisplay />);
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('updates message on McpClientUpdate event', async () => {
+  it("updates message on McpClientUpdate event", async () => {
     let listener: ((clients?: Map<string, McpClient>) => void) | undefined;
     mockOn.mockImplementation((event, fn) => {
       if (event === AppEvent.McpClientUpdate) {
@@ -65,7 +65,7 @@ describe('ConfigInitDisplay', () => {
 
     // Wait for listener to be registered
     await waitFor(() => {
-      if (!listener) throw new Error('Listener not registered yet');
+      if (!listener) throw new Error("Listener not registered yet");
     });
 
     const mockClient1 = {
@@ -75,8 +75,8 @@ describe('ConfigInitDisplay', () => {
       getStatus: () => MCPServerStatus.CONNECTING,
     } as McpClient;
     const clients = new Map<string, McpClient>([
-      ['server1', mockClient1],
-      ['server2', mockClient2],
+      ["server1", mockClient1],
+      ["server2", mockClient2],
     ]);
 
     // Trigger the listener manually since we mocked the event emitter
@@ -90,7 +90,7 @@ describe('ConfigInitDisplay', () => {
     });
   });
 
-  it('truncates list of waiting servers if too many', async () => {
+  it("truncates list of waiting servers if too many", async () => {
     let listener: ((clients?: Map<string, McpClient>) => void) | undefined;
     mockOn.mockImplementation((event, fn) => {
       if (event === AppEvent.McpClientUpdate) {
@@ -101,7 +101,7 @@ describe('ConfigInitDisplay', () => {
     const { lastFrame } = render(<ConfigInitDisplay />);
 
     await waitFor(() => {
-      if (!listener) throw new Error('Listener not registered yet');
+      if (!listener) throw new Error("Listener not registered yet");
     });
 
     const mockClientConnecting = {
@@ -109,11 +109,11 @@ describe('ConfigInitDisplay', () => {
     } as McpClient;
 
     const clients = new Map<string, McpClient>([
-      ['s1', mockClientConnecting],
-      ['s2', mockClientConnecting],
-      ['s3', mockClientConnecting],
-      ['s4', mockClientConnecting],
-      ['s5', mockClientConnecting],
+      ["s1", mockClientConnecting],
+      ["s2", mockClientConnecting],
+      ["s3", mockClientConnecting],
+      ["s4", mockClientConnecting],
+      ["s5", mockClientConnecting],
     ]);
 
     act(() => {
@@ -125,7 +125,7 @@ describe('ConfigInitDisplay', () => {
     });
   });
 
-  it('handles empty clients map', async () => {
+  it("handles empty clients map", async () => {
     let listener: ((clients?: Map<string, McpClient>) => void) | undefined;
     mockOn.mockImplementation((event, fn) => {
       if (event === AppEvent.McpClientUpdate) {
@@ -136,7 +136,7 @@ describe('ConfigInitDisplay', () => {
     const { lastFrame } = render(<ConfigInitDisplay />);
 
     await waitFor(() => {
-      if (!listener) throw new Error('Listener not registered yet');
+      if (!listener) throw new Error("Listener not registered yet");
     });
 
     if (listener) {
diff --git a/packages/ui-gemini/src/ui/components/ConfigInitDisplay.tsx b/packages/ui-gemini/src/ui/components/ConfigInitDisplay.tsx
index 7aae4753b..d85b12a4d 100644
--- a/packages/ui-gemini/src/ui/components/ConfigInitDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/ConfigInitDisplay.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useState } from 'react';
-import { AppEvent, appEvents } from './../../utils/events.js';
-import { Box, Text } from 'ink';
-import { type McpClient, MCPServerStatus } from '@airiscode/gemini-cli-core';
-import { GeminiSpinner } from './GeminiRespondingSpinner.js';
-import { theme } from '../semantic-colors.js';
+import { MCPServerStatus, type McpClient } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import { useEffect, useState } from "react";
+import { AppEvent, appEvents } from "./../../utils/events.js";
+import { theme } from "../semantic-colors.js";
+import { GeminiSpinner } from "./GeminiRespondingSpinner.js";
 
 export const ConfigInitDisplay = () => {
-  const [message, setMessage] = useState('Initializing...');
+  const [message, setMessage] = useState("Initializing...");
 
   useEffect(() => {
     const onChange = (clients?: Map<string, McpClient>) => {
@@ -32,16 +32,14 @@ export const ConfigInitDisplay = () => {
 
       if (connecting.length > 0) {
         const maxDisplay = 3;
-        const displayedServers = connecting.slice(0, maxDisplay).join(', ');
+        const displayedServers = connecting.slice(0, maxDisplay).join(", ");
         const remaining = connecting.length - maxDisplay;
-        const suffix = remaining > 0 ? `, +${remaining} more` : '';
+        const suffix = remaining > 0 ? `, +${remaining} more` : "";
         setMessage(
           `Connecting to MCP servers... (${connected}/${clients.size}) - Waiting for: ${displayedServers}${suffix}`,
         );
       } else {
-        setMessage(
-          `Connecting to MCP servers... (${connected}/${clients.size})`,
-        );
+        setMessage(`Connecting to MCP servers... (${connected}/${clients.size})`);
       }
     };
 
diff --git a/packages/ui-gemini/src/ui/components/ConsentPrompt.test.tsx b/packages/ui-gemini/src/ui/components/ConsentPrompt.test.tsx
index b40fed9a9..790d6e5eb 100644
--- a/packages/ui-gemini/src/ui/components/ConsentPrompt.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ConsentPrompt.test.tsx
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Text } from 'ink';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { render } from '../../test-utils/render.js';
-import { act } from 'react';
-import { ConsentPrompt } from './ConsentPrompt.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { MarkdownDisplay } from '../utils/MarkdownDisplay.js';
-
-vi.mock('./shared/RadioButtonSelect.js', () => ({
+import { Text } from "ink";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { MarkdownDisplay } from "../utils/MarkdownDisplay.js";
+import { ConsentPrompt } from "./ConsentPrompt.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
+
+vi.mock("./shared/RadioButtonSelect.js", () => ({
   RadioButtonSelect: vi.fn(() => null),
 }));
 
-vi.mock('../utils/MarkdownDisplay.js', () => ({
+vi.mock("../utils/MarkdownDisplay.js", () => ({
   MarkdownDisplay: vi.fn(() => null),
 }));
 
 const MockedRadioButtonSelect = vi.mocked(RadioButtonSelect);
 const MockedMarkdownDisplay = vi.mocked(MarkdownDisplay);
 
-describe('ConsentPrompt', () => {
+describe("ConsentPrompt", () => {
   const onConfirm = vi.fn();
   const terminalWidth = 80;
 
@@ -31,14 +31,10 @@ describe('ConsentPrompt', () => {
     vi.clearAllMocks();
   });
 
-  it('renders a string prompt with MarkdownDisplay', () => {
-    const prompt = 'Are you sure?';
+  it("renders a string prompt with MarkdownDisplay", () => {
+    const prompt = "Are you sure?";
     const { unmount } = render(
-      <ConsentPrompt
-        prompt={prompt}
-        onConfirm={onConfirm}
-        terminalWidth={terminalWidth}
-      />,
+      <ConsentPrompt prompt={prompt} onConfirm={onConfirm} terminalWidth={terminalWidth} />,
     );
 
     expect(MockedMarkdownDisplay).toHaveBeenCalledWith(
@@ -52,29 +48,21 @@ describe('ConsentPrompt', () => {
     unmount();
   });
 
-  it('renders a ReactNode prompt directly', () => {
+  it("renders a ReactNode prompt directly", () => {
     const prompt = <Text>Are you sure?</Text>;
     const { lastFrame, unmount } = render(
-      <ConsentPrompt
-        prompt={prompt}
-        onConfirm={onConfirm}
-        terminalWidth={terminalWidth}
-      />,
+      <ConsentPrompt prompt={prompt} onConfirm={onConfirm} terminalWidth={terminalWidth} />,
     );
 
     expect(MockedMarkdownDisplay).not.toHaveBeenCalled();
-    expect(lastFrame()).toContain('Are you sure?');
+    expect(lastFrame()).toContain("Are you sure?");
     unmount();
   });
 
   it('calls onConfirm with true when "Yes" is selected', () => {
-    const prompt = 'Are you sure?';
+    const prompt = "Are you sure?";
     const { unmount } = render(
-      <ConsentPrompt
-        prompt={prompt}
-        onConfirm={onConfirm}
-        terminalWidth={terminalWidth}
-      />,
+      <ConsentPrompt prompt={prompt} onConfirm={onConfirm} terminalWidth={terminalWidth} />,
     );
 
     const onSelect = MockedRadioButtonSelect.mock.calls[0][0].onSelect;
@@ -87,13 +75,9 @@ describe('ConsentPrompt', () => {
   });
 
   it('calls onConfirm with false when "No" is selected', () => {
-    const prompt = 'Are you sure?';
+    const prompt = "Are you sure?";
     const { unmount } = render(
-      <ConsentPrompt
-        prompt={prompt}
-        onConfirm={onConfirm}
-        terminalWidth={terminalWidth}
-      />,
+      <ConsentPrompt prompt={prompt} onConfirm={onConfirm} terminalWidth={terminalWidth} />,
     );
 
     const onSelect = MockedRadioButtonSelect.mock.calls[0][0].onSelect;
@@ -105,21 +89,17 @@ describe('ConsentPrompt', () => {
     unmount();
   });
 
-  it('passes correct items to RadioButtonSelect', () => {
-    const prompt = 'Are you sure?';
+  it("passes correct items to RadioButtonSelect", () => {
+    const prompt = "Are you sure?";
     const { unmount } = render(
-      <ConsentPrompt
-        prompt={prompt}
-        onConfirm={onConfirm}
-        terminalWidth={terminalWidth}
-      />,
+      <ConsentPrompt prompt={prompt} onConfirm={onConfirm} terminalWidth={terminalWidth} />,
     );
 
     expect(MockedRadioButtonSelect).toHaveBeenCalledWith(
       expect.objectContaining({
         items: [
-          { label: 'Yes', value: true, key: 'Yes' },
-          { label: 'No', value: false, key: 'No' },
+          { label: "Yes", value: true, key: "Yes" },
+          { label: "No", value: false, key: "No" },
         ],
       }),
       undefined,
diff --git a/packages/ui-gemini/src/ui/components/ConsentPrompt.tsx b/packages/ui-gemini/src/ui/components/ConsentPrompt.tsx
index efa6b136a..b26a3af68 100644
--- a/packages/ui-gemini/src/ui/components/ConsentPrompt.tsx
+++ b/packages/ui-gemini/src/ui/components/ConsentPrompt.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { type ReactNode } from 'react';
-import { theme } from '../semantic-colors.js';
-import { MarkdownDisplay } from '../utils/MarkdownDisplay.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { Box } from "ink";
+import { type ReactNode } from "react";
+import { theme } from "../semantic-colors.js";
+import { MarkdownDisplay } from "../utils/MarkdownDisplay.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 type ConsentPromptProps = {
   // If a simple string is given, it will render using markdown by default.
@@ -28,20 +28,16 @@ export const ConsentPrompt = (props: ConsentPromptProps) => {
       paddingY={1}
       paddingX={2}
     >
-      {typeof prompt === 'string' ? (
-        <MarkdownDisplay
-          isPending={true}
-          text={prompt}
-          terminalWidth={terminalWidth}
-        />
+      {typeof prompt === "string" ? (
+        <MarkdownDisplay isPending={true} text={prompt} terminalWidth={terminalWidth} />
       ) : (
         prompt
       )}
       <Box marginTop={1}>
         <RadioButtonSelect
           items={[
-            { label: 'Yes', value: true, key: 'Yes' },
-            { label: 'No', value: false, key: 'No' },
+            { label: "Yes", value: true, key: "Yes" },
+            { label: "No", value: false, key: "No" },
           ]}
           onSelect={onConfirm}
         />
diff --git a/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.test.tsx b/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.test.tsx
index aacb90e1e..62b08ff44 100644
--- a/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.test.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ConsoleSummaryDisplay } from "./ConsoleSummaryDisplay.js";
 
-describe('ConsoleSummaryDisplay', () => {
-  it('renders nothing when errorCount is 0', () => {
+describe("ConsoleSummaryDisplay", () => {
+  it("renders nothing when errorCount is 0", () => {
     const { lastFrame } = render(<ConsoleSummaryDisplay errorCount={0} />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
   it.each([
-    [1, '1 error'],
-    [5, '5 errors'],
-  ])('renders correct message for %i errors', (count, expectedText) => {
+    [1, "1 error"],
+    [5, "5 errors"],
+  ])("renders correct message for %i errors", (count, expectedText) => {
     const { lastFrame } = render(<ConsoleSummaryDisplay errorCount={count} />);
     const output = lastFrame();
     expect(output).toContain(expectedText);
-    expect(output).toContain('✖');
-    expect(output).toContain('(F12 for details)');
+    expect(output).toContain("✖");
+    expect(output).toContain("(F12 for details)");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.tsx b/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.tsx
index 9d19683e2..c0ac306f4 100644
--- a/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/ConsoleSummaryDisplay.tsx
@@ -4,29 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 interface ConsoleSummaryDisplayProps {
   errorCount: number;
   // logCount is not currently in the plan to be displayed in summary
 }
 
-export const ConsoleSummaryDisplay: React.FC<ConsoleSummaryDisplayProps> = ({
-  errorCount,
-}) => {
+export const ConsoleSummaryDisplay: React.FC<ConsoleSummaryDisplayProps> = ({ errorCount }) => {
   if (errorCount === 0) {
     return null;
   }
 
-  const errorIcon = '\u2716'; // Heavy multiplication x (✖)
+  const errorIcon = "\u2716"; // Heavy multiplication x (✖)
 
   return (
     <Box>
       {errorCount > 0 && (
         <Text color={theme.status.error}>
-          {errorIcon} {errorCount} error{errorCount > 1 ? 's' : ''}{' '}
+          {errorIcon} {errorCount} error{errorCount > 1 ? "s" : ""}{" "}
           <Text color={theme.text.secondary}>(F12 for details)</Text>
         </Text>
       )}
diff --git a/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.test.tsx b/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.test.tsx
index a61f57aa9..fd4da2671 100644
--- a/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.test.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { ContextSummaryDisplay } from './ContextSummaryDisplay.js';
-import * as useTerminalSize from '../hooks/useTerminalSize.js';
+import type React from "react";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import * as useTerminalSize from "../hooks/useTerminalSize.js";
+import { ContextSummaryDisplay } from "./ContextSummaryDisplay.js";
 
-vi.mock('../hooks/useTerminalSize.js', () => ({
+vi.mock("../hooks/useTerminalSize.js", () => ({
   useTerminalSize: vi.fn(),
 }));
 
@@ -24,63 +24,57 @@ const renderWithWidth = (
   return render(<ContextSummaryDisplay {...props} />);
 };
 
-describe('<ContextSummaryDisplay />', () => {
+describe("<ContextSummaryDisplay />", () => {
   const baseProps = {
     geminiMdFileCount: 1,
-    contextFileNames: ['GEMINI.md'],
-    mcpServers: { 'test-server': { command: 'test' } },
+    contextFileNames: ["GEMINI.md"],
+    mcpServers: { "test-server": { command: "test" } },
     ideContext: {
       workspaceState: {
-        openFiles: [{ path: '/a/b/c', timestamp: Date.now() }],
+        openFiles: [{ path: "/a/b/c", timestamp: Date.now() }],
       },
     },
   };
 
-  it('should render on a single line on a wide screen', () => {
+  it("should render on a single line on a wide screen", () => {
     const { lastFrame, unmount } = renderWithWidth(120, baseProps);
     const output = lastFrame()!;
     expect(output).toContain(
-      'Using: 1 open file (ctrl+g to view) | 1 GEMINI.md file | 1 MCP server',
+      "Using: 1 open file (ctrl+g to view) | 1 GEMINI.md file | 1 MCP server",
     );
     // Check for absence of newlines
-    expect(output.includes('\n')).toBe(false);
+    expect(output.includes("\n")).toBe(false);
     unmount();
   });
 
-  it('should render on multiple lines on a narrow screen', () => {
+  it("should render on multiple lines on a narrow screen", () => {
     const { lastFrame, unmount } = renderWithWidth(60, baseProps);
     const output = lastFrame()!;
     const expectedLines = [
-      ' Using:',
-      '   - 1 open file (ctrl+g to view)',
-      '   - 1 GEMINI.md file',
-      '   - 1 MCP server',
+      " Using:",
+      "   - 1 open file (ctrl+g to view)",
+      "   - 1 GEMINI.md file",
+      "   - 1 MCP server",
     ];
-    const actualLines = output.split('\n');
+    const actualLines = output.split("\n");
     expect(actualLines).toEqual(expectedLines);
     unmount();
   });
 
-  it('should switch layout at the 80-column breakpoint', () => {
+  it("should switch layout at the 80-column breakpoint", () => {
     // At 80 columns, should be on one line
-    const { lastFrame: wideFrame, unmount: unmountWide } = renderWithWidth(
-      80,
-      baseProps,
-    );
-    expect(wideFrame()!.includes('\n')).toBe(false);
+    const { lastFrame: wideFrame, unmount: unmountWide } = renderWithWidth(80, baseProps);
+    expect(wideFrame()!.includes("\n")).toBe(false);
     unmountWide();
 
     // At 79 columns, should be on multiple lines
-    const { lastFrame: narrowFrame, unmount: unmountNarrow } = renderWithWidth(
-      79,
-      baseProps,
-    );
-    expect(narrowFrame()!.includes('\n')).toBe(true);
-    expect(narrowFrame()!.split('\n').length).toBe(4);
+    const { lastFrame: narrowFrame, unmount: unmountNarrow } = renderWithWidth(79, baseProps);
+    expect(narrowFrame()!.includes("\n")).toBe(true);
+    expect(narrowFrame()!.split("\n").length).toBe(4);
     unmountNarrow();
   });
 
-  it('should not render empty parts', () => {
+  it("should not render empty parts", () => {
     const props = {
       ...baseProps,
       geminiMdFileCount: 0,
@@ -88,8 +82,8 @@ describe('<ContextSummaryDisplay />', () => {
       mcpServers: {},
     };
     const { lastFrame, unmount } = renderWithWidth(60, props);
-    const expectedLines = [' Using:', '   - 1 open file (ctrl+g to view)'];
-    const actualLines = lastFrame()!.split('\n');
+    const expectedLines = [" Using:", "   - 1 open file (ctrl+g to view)"];
+    const actualLines = lastFrame()!.split("\n");
     expect(actualLines).toEqual(expectedLines);
     unmount();
   });
diff --git a/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.tsx b/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.tsx
index b3d8a4142..4852326d7 100644
--- a/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/ContextSummaryDisplay.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { type IdeContext, type MCPServerConfig } from '@airiscode/gemini-cli-core';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
+import { type IdeContext, type MCPServerConfig } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
+import { isNarrowWidth } from "../utils/isNarrowWidth.js";
 
 interface ContextSummaryDisplayProps {
   geminiMdFileCount: number;
@@ -43,44 +43,38 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
 
   const openFilesText = (() => {
     if (openFileCount === 0) {
-      return '';
+      return "";
     }
-    return `${openFileCount} open file${
-      openFileCount > 1 ? 's' : ''
-    } (ctrl+g to view)`;
+    return `${openFileCount} open file${openFileCount > 1 ? "s" : ""} (ctrl+g to view)`;
   })();
 
   const geminiMdText = (() => {
     if (geminiMdFileCount === 0) {
-      return '';
+      return "";
     }
     const allNamesTheSame = new Set(contextFileNames).size < 2;
-    const name = allNamesTheSame ? contextFileNames[0] : 'context';
-    return `${geminiMdFileCount} ${name} file${
-      geminiMdFileCount > 1 ? 's' : ''
-    }`;
+    const name = allNamesTheSame ? contextFileNames[0] : "context";
+    return `${geminiMdFileCount} ${name} file${geminiMdFileCount > 1 ? "s" : ""}`;
   })();
 
   const mcpText = (() => {
     if (mcpServerCount === 0 && blockedMcpServerCount === 0) {
-      return '';
+      return "";
     }
 
     const parts = [];
     if (mcpServerCount > 0) {
-      parts.push(
-        `${mcpServerCount} MCP server${mcpServerCount > 1 ? 's' : ''}`,
-      );
+      parts.push(`${mcpServerCount} MCP server${mcpServerCount > 1 ? "s" : ""}`);
     }
 
     if (blockedMcpServerCount > 0) {
       let blockedText = `${blockedMcpServerCount} Blocked`;
       if (mcpServerCount === 0) {
-        blockedText += ` MCP server${blockedMcpServerCount > 1 ? 's' : ''}`;
+        blockedText += ` MCP server${blockedMcpServerCount > 1 ? "s" : ""}`;
       }
       parts.push(blockedText);
     }
-    return parts.join(', ');
+    return parts.join(", ");
   })();
 
   const summaryParts = [openFilesText, geminiMdText, mcpText].filter(Boolean);
@@ -91,7 +85,7 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
         <Text color={theme.text.secondary}>Using:</Text>
         {summaryParts.map((part, index) => (
           <Text key={index} color={theme.text.secondary}>
-            {'  '}- {part}
+            {"  "}- {part}
           </Text>
         ))}
       </Box>
@@ -100,9 +94,7 @@ export const ContextSummaryDisplay: React.FC<ContextSummaryDisplayProps> = ({
 
   return (
     <Box paddingX={1}>
-      <Text color={theme.text.secondary}>
-        Using: {summaryParts.join(' | ')}
-      </Text>
+      <Text color={theme.text.secondary}>Using: {summaryParts.join(" | ")}</Text>
     </Box>
   );
 };
diff --git a/packages/ui-gemini/src/ui/components/ContextUsageDisplay.test.tsx b/packages/ui-gemini/src/ui/components/ContextUsageDisplay.test.tsx
index c99b1e548..466929dbe 100644
--- a/packages/ui-gemini/src/ui/components/ContextUsageDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ContextUsageDisplay.test.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { ContextUsageDisplay } from './ContextUsageDisplay.js';
-import { describe, it, expect, vi } from 'vitest';
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ContextUsageDisplay } from "./ContextUsageDisplay.js";
 
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("@airiscode/gemini-cli-core", () => ({
   tokenLimit: () => 10000,
 }));
 
-vi.mock('../../config/settings.js', () => ({
+vi.mock("../../config/settings.js", () => ({
   DEFAULT_MODEL_CONFIGS: {},
   LoadedSettings: class {
     constructor() {
@@ -21,41 +21,29 @@ vi.mock('../../config/settings.js', () => ({
   },
 }));
 
-describe('ContextUsageDisplay', () => {
-  it('renders correct percentage left', () => {
+describe("ContextUsageDisplay", () => {
+  it("renders correct percentage left", () => {
     const { lastFrame } = render(
-      <ContextUsageDisplay
-        promptTokenCount={5000}
-        model="gemini-pro"
-        terminalWidth={120}
-      />,
+      <ContextUsageDisplay promptTokenCount={5000} model="gemini-pro" terminalWidth={120} />,
     );
     const output = lastFrame();
-    expect(output).toContain('50% context left');
+    expect(output).toContain("50% context left");
   });
 
-  it('renders short label when terminal width is small', () => {
+  it("renders short label when terminal width is small", () => {
     const { lastFrame } = render(
-      <ContextUsageDisplay
-        promptTokenCount={2000}
-        model="gemini-pro"
-        terminalWidth={80}
-      />,
+      <ContextUsageDisplay promptTokenCount={2000} model="gemini-pro" terminalWidth={80} />,
     );
     const output = lastFrame();
-    expect(output).toContain('80%');
-    expect(output).not.toContain('context left');
+    expect(output).toContain("80%");
+    expect(output).not.toContain("context left");
   });
 
-  it('renders 0% when full', () => {
+  it("renders 0% when full", () => {
     const { lastFrame } = render(
-      <ContextUsageDisplay
-        promptTokenCount={10000}
-        model="gemini-pro"
-        terminalWidth={120}
-      />,
+      <ContextUsageDisplay promptTokenCount={10000} model="gemini-pro" terminalWidth={120} />,
     );
     const output = lastFrame();
-    expect(output).toContain('0% context left');
+    expect(output).toContain("0% context left");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/ContextUsageDisplay.tsx b/packages/ui-gemini/src/ui/components/ContextUsageDisplay.tsx
index 5eac6aa29..65c5dda20 100644
--- a/packages/ui-gemini/src/ui/components/ContextUsageDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/ContextUsageDisplay.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { tokenLimit } from '@airiscode/gemini-cli-core';
+import { tokenLimit } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import { theme } from "../semantic-colors.js";
 
 export const ContextUsageDisplay = ({
   promptTokenCount,
@@ -20,7 +20,7 @@ export const ContextUsageDisplay = ({
   const percentage = promptTokenCount / tokenLimit(model);
   const percentageLeft = ((1 - percentage) * 100).toFixed(0);
 
-  const label = terminalWidth < 100 ? '%' : '% context left';
+  const label = terminalWidth < 100 ? "%" : "% context left";
 
   return (
     <Text color={theme.text.secondary}>
diff --git a/packages/ui-gemini/src/ui/components/CopyModeWarning.test.tsx b/packages/ui-gemini/src/ui/components/CopyModeWarning.test.tsx
index 63ca84369..f8e572665 100644
--- a/packages/ui-gemini/src/ui/components/CopyModeWarning.test.tsx
+++ b/packages/ui-gemini/src/ui/components/CopyModeWarning.test.tsx
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { CopyModeWarning } from './CopyModeWarning.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { useUIState, type UIState } from '../contexts/UIStateContext.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { type UIState, useUIState } from "../contexts/UIStateContext.js";
+import { CopyModeWarning } from "./CopyModeWarning.js";
 
-vi.mock('../contexts/UIStateContext.js');
+vi.mock("../contexts/UIStateContext.js");
 
-describe('CopyModeWarning', () => {
+describe("CopyModeWarning", () => {
   const mockUseUIState = vi.mocked(useUIState);
 
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('renders nothing when copy mode is disabled', () => {
+  it("renders nothing when copy mode is disabled", () => {
     mockUseUIState.mockReturnValue({
       copyModeEnabled: false,
     } as unknown as UIState);
     const { lastFrame } = render(<CopyModeWarning />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('renders warning when copy mode is enabled', () => {
+  it("renders warning when copy mode is enabled", () => {
     mockUseUIState.mockReturnValue({
       copyModeEnabled: true,
     } as unknown as UIState);
     const { lastFrame } = render(<CopyModeWarning />);
-    expect(lastFrame()).toContain('In Copy Mode');
-    expect(lastFrame()).toContain('Press any key to exit');
+    expect(lastFrame()).toContain("In Copy Mode");
+    expect(lastFrame()).toContain("Press any key to exit");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/CopyModeWarning.tsx b/packages/ui-gemini/src/ui/components/CopyModeWarning.tsx
index 8d5423bb8..0f76b6ecd 100644
--- a/packages/ui-gemini/src/ui/components/CopyModeWarning.tsx
+++ b/packages/ui-gemini/src/ui/components/CopyModeWarning.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { theme } from "../semantic-colors.js";
 
 export const CopyModeWarning: React.FC = () => {
   const { copyModeEnabled } = useUIState();
@@ -18,9 +18,7 @@ export const CopyModeWarning: React.FC = () => {
 
   return (
     <Box>
-      <Text color={theme.status.warning}>
-        In Copy Mode. Press any key to exit.
-      </Text>
+      <Text color={theme.status.warning}>In Copy Mode. Press any key to exit.</Text>
     </Box>
   );
 };
diff --git a/packages/ui-gemini/src/ui/components/DebugProfiler.test.tsx b/packages/ui-gemini/src/ui/components/DebugProfiler.test.tsx
index b60419be8..47a30a44e 100644
--- a/packages/ui-gemini/src/ui/components/DebugProfiler.test.tsx
+++ b/packages/ui-gemini/src/ui/components/DebugProfiler.test.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { appEvents, AppEvent } from '../../utils/events.js';
+import { FixedDeque } from "mnemonist";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { type UIState, useUIState } from "../contexts/UIStateContext.js";
+import { debugState } from "../debug.js";
 import {
-  profiler,
-  DebugProfiler,
   ACTION_TIMESTAMP_CAPACITY,
+  DebugProfiler,
   FRAME_TIMESTAMP_CAPACITY,
-} from './DebugProfiler.js';
-import { render } from '../../test-utils/render.js';
-import { useUIState, type UIState } from '../contexts/UIStateContext.js';
-import { FixedDeque } from 'mnemonist';
-import { debugState } from '../debug.js';
+  profiler,
+} from "./DebugProfiler.js";
 
-vi.mock('../contexts/UIStateContext.js', () => ({
+vi.mock("../contexts/UIStateContext.js", () => ({
   useUIState: vi.fn(),
 }));
 
-describe('DebugProfiler', () => {
+describe("DebugProfiler", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     profiler.profilersActive = 1;
@@ -30,14 +30,8 @@ describe('DebugProfiler', () => {
     profiler.lastFrameStartTime = 0;
     profiler.openedDebugConsole = false;
     profiler.lastActionTimestamp = 0;
-    profiler.possiblyIdleFrameTimestamps = new FixedDeque<number>(
-      Array,
-      FRAME_TIMESTAMP_CAPACITY,
-    );
-    profiler.actionTimestamps = new FixedDeque<number>(
-      Array,
-      ACTION_TIMESTAMP_CAPACITY,
-    );
+    profiler.possiblyIdleFrameTimestamps = new FixedDeque<number>(Array, FRAME_TIMESTAMP_CAPACITY);
+    profiler.actionTimestamps = new FixedDeque<number>(Array, ACTION_TIMESTAMP_CAPACITY);
     debugState.debugNumAnimatedComponents = 0;
   });
 
@@ -48,7 +42,7 @@ describe('DebugProfiler', () => {
     debugState.debugNumAnimatedComponents = 0;
   });
 
-  it('should not exceed action timestamp capacity', () => {
+  it("should not exceed action timestamp capacity", () => {
     for (let i = 0; i < ACTION_TIMESTAMP_CAPACITY + 10; i++) {
       profiler.reportAction();
       // To ensure we don't trigger the debounce
@@ -57,18 +51,16 @@ describe('DebugProfiler', () => {
     expect(profiler.actionTimestamps.size).toBe(ACTION_TIMESTAMP_CAPACITY);
   });
 
-  it('should not exceed frame timestamp capacity', () => {
+  it("should not exceed frame timestamp capacity", () => {
     for (let i = 0; i < FRAME_TIMESTAMP_CAPACITY + 10; i++) {
       profiler.reportFrameRendered();
       // To ensure we don't trigger the debounce
       profiler.lastFrameStartTime = 0;
     }
-    expect(profiler.possiblyIdleFrameTimestamps.size).toBe(
-      FRAME_TIMESTAMP_CAPACITY,
-    );
+    expect(profiler.possiblyIdleFrameTimestamps.size).toBe(FRAME_TIMESTAMP_CAPACITY);
   });
 
-  it('should drop oldest action timestamps when capacity is reached', () => {
+  it("should drop oldest action timestamps when capacity is reached", () => {
     for (let i = 0; i < ACTION_TIMESTAMP_CAPACITY; i++) {
       profiler.actionTimestamps.push(i);
     }
@@ -79,20 +71,18 @@ describe('DebugProfiler', () => {
     expect(profiler.actionTimestamps.peekFirst()).toBe(1);
   });
 
-  it('should drop oldest frame timestamps when capacity is reached', () => {
+  it("should drop oldest frame timestamps when capacity is reached", () => {
     for (let i = 0; i < FRAME_TIMESTAMP_CAPACITY; i++) {
       profiler.possiblyIdleFrameTimestamps.push(i);
     }
     profiler.lastFrameStartTime = 0;
     profiler.reportFrameRendered();
 
-    expect(profiler.possiblyIdleFrameTimestamps.size).toBe(
-      FRAME_TIMESTAMP_CAPACITY,
-    );
+    expect(profiler.possiblyIdleFrameTimestamps.size).toBe(FRAME_TIMESTAMP_CAPACITY);
     expect(profiler.possiblyIdleFrameTimestamps.peekFirst()).toBe(1);
   });
 
-  it('should not report frames as idle if an action happens shortly after', async () => {
+  it("should not report frames as idle if an action happens shortly after", async () => {
     const startTime = Date.now();
     vi.setSystemTime(startTime);
 
@@ -110,7 +100,7 @@ describe('DebugProfiler', () => {
     expect(profiler.totalIdleFrames).toBe(0);
   });
 
-  it('should report frames as idle if no action happens nearby', async () => {
+  it("should report frames as idle if no action happens nearby", async () => {
     const startTime = Date.now();
     vi.setSystemTime(startTime);
 
@@ -125,7 +115,7 @@ describe('DebugProfiler', () => {
     expect(profiler.totalIdleFrames).toBe(5);
   });
 
-  it('should not report frames as idle if an action happens shortly before', async () => {
+  it("should not report frames as idle if an action happens shortly before", async () => {
     const startTime = Date.now();
     vi.setSystemTime(startTime);
 
@@ -144,7 +134,7 @@ describe('DebugProfiler', () => {
     expect(profiler.totalIdleFrames).toBe(0);
   });
 
-  it('should correctly identify mixed idle and non-idle frames', async () => {
+  it("should correctly identify mixed idle and non-idle frames", async () => {
     const startTime = Date.now();
     vi.setSystemTime(startTime);
 
@@ -169,8 +159,8 @@ describe('DebugProfiler', () => {
     expect(profiler.totalIdleFrames).toBe(3);
   });
 
-  it('should report flicker frames', () => {
-    const reportActionSpy = vi.spyOn(profiler, 'reportAction');
+  it("should report flicker frames", () => {
+    const reportActionSpy = vi.spyOn(profiler, "reportAction");
     const cleanup = profiler.registerFlickerHandler(true);
 
     appEvents.emit(AppEvent.Flicker);
@@ -181,7 +171,7 @@ describe('DebugProfiler', () => {
     cleanup();
   });
 
-  it('should not report idle frames when actions are interleaved', async () => {
+  it("should not report idle frames when actions are interleaved", async () => {
     const startTime = Date.now();
     vi.setSystemTime(startTime);
 
@@ -205,7 +195,7 @@ describe('DebugProfiler', () => {
     expect(profiler.totalIdleFrames).toBe(0);
   });
 
-  it('should not report frames as idle if debugNumAnimatedComponents > 0', async () => {
+  it("should not report frames as idle if debugNumAnimatedComponents > 0", async () => {
     const startTime = Date.now();
     vi.setSystemTime(startTime);
     debugState.debugNumAnimatedComponents = 1;
@@ -222,7 +212,7 @@ describe('DebugProfiler', () => {
   });
 });
 
-describe('DebugProfiler Component', () => {
+describe("DebugProfiler Component", () => {
   beforeEach(() => {
     // Reset the mock implementation before each test
     vi.mocked(useUIState).mockReturnValue({
@@ -241,16 +231,16 @@ describe('DebugProfiler Component', () => {
     vi.restoreAllMocks();
   });
 
-  it('should return null when showDebugProfiler is false', () => {
+  it("should return null when showDebugProfiler is false", () => {
     vi.mocked(useUIState).mockReturnValue({
       showDebugProfiler: false,
       constrainHeight: false,
     } as unknown as UIState);
     const { lastFrame } = render(<DebugProfiler />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('should render stats when showDebugProfiler is true', () => {
+  it("should render stats when showDebugProfiler is true", () => {
     vi.mocked(useUIState).mockReturnValue({
       showDebugProfiler: true,
       constrainHeight: false,
@@ -262,8 +252,8 @@ describe('DebugProfiler Component', () => {
     const { lastFrame } = render(<DebugProfiler />);
     const output = lastFrame();
 
-    expect(output).toContain('Renders: 10 (total)');
-    expect(output).toContain('5 (idle)');
-    expect(output).toContain('2 (flicker)');
+    expect(output).toContain("Renders: 10 (total)");
+    expect(output).toContain("5 (idle)");
+    expect(output).toContain("2 (flicker)");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/DebugProfiler.tsx b/packages/ui-gemini/src/ui/components/DebugProfiler.tsx
index 5c0770445..9848a8e85 100644
--- a/packages/ui-gemini/src/ui/components/DebugProfiler.tsx
+++ b/packages/ui-gemini/src/ui/components/DebugProfiler.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Text } from 'ink';
-import { useEffect, useState } from 'react';
-import { FixedDeque } from 'mnemonist';
-import { theme } from '../semantic-colors.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { debugState } from '../debug.js';
-import { appEvents, AppEvent } from '../../utils/events.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import { FixedDeque } from "mnemonist";
+import { useEffect, useState } from "react";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { debugState } from "../debug.js";
+import { theme } from "../semantic-colors.js";
 
 // Frames that render at least this far before or after an action are considered
 // idle frames.
@@ -31,10 +31,7 @@ export const profiler = {
   openedDebugConsole: false,
   lastActionTimestamp: 0,
 
-  possiblyIdleFrameTimestamps: new FixedDeque<number>(
-    Array,
-    FRAME_TIMESTAMP_CAPACITY,
-  ),
+  possiblyIdleFrameTimestamps: new FixedDeque<number>(Array, FRAME_TIMESTAMP_CAPACITY),
   actionTimestamps: new FixedDeque<number>(Array, ACTION_TIMESTAMP_CAPACITY),
 
   reportAction() {
@@ -86,16 +83,11 @@ export const profiler = {
       const start = frameTime - MIN_TIME_FROM_ACTION_TO_BE_IDLE;
       const end = frameTime + MIN_TIME_FROM_ACTION_TO_BE_IDLE;
 
-      while (
-        this.actionTimestamps.size > 0 &&
-        this.actionTimestamps.peekFirst()! < start
-      ) {
+      while (this.actionTimestamps.size > 0 && this.actionTimestamps.peekFirst()! < start) {
         this.actionTimestamps.shift();
       }
 
-      const hasAction =
-        this.actionTimestamps.size > 0 &&
-        this.actionTimestamps.peekFirst()! <= end;
+      const hasAction = this.actionTimestamps.size > 0 && this.actionTimestamps.peekFirst()! <= end;
 
       if (!hasAction) {
         if (frameTime >= oneSecondIntervalFromJudgementCutoff) {
@@ -132,7 +124,7 @@ export const profiler = {
       if (!this.hasLoggedFirstFlicker) {
         this.hasLoggedFirstFlicker = true;
         debugLogger.error(
-          'A flicker frame was detected. This will cause UI instability. Type `/profile` for more info.',
+          "A flicker frame was detected. This will cause UI instability. Type `/profile` for more info.",
         );
       }
     };
@@ -157,12 +149,12 @@ export const DebugProfiler = () => {
       profiler.reportAction();
     };
 
-    stdin.on('data', handler);
-    stdout.on('resize', handler);
+    stdin.on("data", handler);
+    stdout.on("resize", handler);
 
     return () => {
-      stdin.off('data', handler);
-      stdout.off('resize', handler);
+      stdin.off("data", handler);
+      stdout.off("resize", handler);
       profiler.profilersActive--;
     };
   }, []);
@@ -174,10 +166,7 @@ export const DebugProfiler = () => {
     return () => clearInterval(updateInterval);
   }, []);
 
-  useEffect(
-    () => profiler.registerFlickerHandler(constrainHeight),
-    [constrainHeight],
-  );
+  useEffect(() => profiler.registerFlickerHandler(constrainHeight), [constrainHeight]);
 
   // Effect for updating stats
   useEffect(() => {
@@ -199,11 +188,9 @@ export const DebugProfiler = () => {
 
   return (
     <Text color={theme.status.warning} key={forceRefresh}>
-      Renders: {profiler.numFrames} (total),{' '}
-      <Text color={theme.status.error}>{profiler.totalIdleFrames} (idle)</Text>,{' '}
-      <Text color={theme.status.error}>
-        {profiler.totalFlickerFrames} (flicker)
-      </Text>
+      Renders: {profiler.numFrames} (total),{" "}
+      <Text color={theme.status.error}>{profiler.totalIdleFrames} (idle)</Text>,{" "}
+      <Text color={theme.status.error}>{profiler.totalFlickerFrames} (flicker)</Text>
     </Text>
   );
 };
diff --git a/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.test.tsx b/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.test.tsx
index e605d7109..15d369926 100644
--- a/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.test.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
-import { describe, it, expect, vi } from 'vitest';
-import type { ConsoleMessageItem } from '../types.js';
-import { Box } from 'ink';
-import type React from 'react';
+import { Box } from "ink";
+import type React from "react";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { ConsoleMessageItem } from "../types.js";
+import { DetailedMessagesDisplay } from "./DetailedMessagesDisplay.js";
 
-vi.mock('./shared/ScrollableList.js', () => ({
+vi.mock("./shared/ScrollableList.js", () => ({
   ScrollableList: ({
     data,
     renderItem,
@@ -27,52 +27,35 @@ vi.mock('./shared/ScrollableList.js', () => ({
   ),
 }));
 
-describe('DetailedMessagesDisplay', () => {
-  it('renders nothing when messages are empty', () => {
+describe("DetailedMessagesDisplay", () => {
+  it("renders nothing when messages are empty", () => {
     const { lastFrame } = render(
-      <DetailedMessagesDisplay
-        messages={[]}
-        maxHeight={10}
-        width={80}
-        hasFocus={false}
-      />,
+      <DetailedMessagesDisplay messages={[]} maxHeight={10} width={80} hasFocus={false} />,
     );
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('renders messages correctly', () => {
+  it("renders messages correctly", () => {
     const messages: ConsoleMessageItem[] = [
-      { type: 'log', content: 'Log message', count: 1 },
-      { type: 'warn', content: 'Warning message', count: 1 },
-      { type: 'error', content: 'Error message', count: 1 },
-      { type: 'debug', content: 'Debug message', count: 1 },
+      { type: "log", content: "Log message", count: 1 },
+      { type: "warn", content: "Warning message", count: 1 },
+      { type: "error", content: "Error message", count: 1 },
+      { type: "debug", content: "Debug message", count: 1 },
     ];
 
     const { lastFrame } = render(
-      <DetailedMessagesDisplay
-        messages={messages}
-        maxHeight={20}
-        width={80}
-        hasFocus={true}
-      />,
+      <DetailedMessagesDisplay messages={messages} maxHeight={20} width={80} hasFocus={true} />,
     );
     const output = lastFrame();
 
     expect(output).toMatchSnapshot();
   });
 
-  it('renders message counts', () => {
-    const messages: ConsoleMessageItem[] = [
-      { type: 'log', content: 'Repeated message', count: 5 },
-    ];
+  it("renders message counts", () => {
+    const messages: ConsoleMessageItem[] = [{ type: "log", content: "Repeated message", count: 5 }];
 
     const { lastFrame } = render(
-      <DetailedMessagesDisplay
-        messages={messages}
-        maxHeight={10}
-        width={80}
-        hasFocus={false}
-      />,
+      <DetailedMessagesDisplay messages={messages} maxHeight={10} width={80} hasFocus={false} />,
     );
     const output = lastFrame();
 
diff --git a/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.tsx b/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.tsx
index ff88afa88..f1357b9a0 100644
--- a/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/DetailedMessagesDisplay.tsx
@@ -4,15 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useRef, useCallback } from 'react';
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import type { ConsoleMessageItem } from '../types.js';
-import {
-  ScrollableList,
-  type ScrollableListRef,
-} from './shared/ScrollableList.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useRef } from "react";
+import { theme } from "../semantic-colors.js";
+import type { ConsoleMessageItem } from "../types.js";
+import { ScrollableList, type ScrollableListRef } from "./shared/ScrollableList.js";
 
 interface DetailedMessagesDisplayProps {
   messages: ConsoleMessageItem[];
@@ -23,9 +20,12 @@ interface DetailedMessagesDisplayProps {
 
 const iconBoxWidth = 3;
 
-export const DetailedMessagesDisplay: React.FC<
-  DetailedMessagesDisplayProps
-> = ({ messages, maxHeight, width, hasFocus }) => {
+export const DetailedMessagesDisplay: React.FC<DetailedMessagesDisplayProps> = ({
+  messages,
+  maxHeight,
+  width,
+  hasFocus,
+}) => {
   const scrollableListRef = useRef<ScrollableListRef<ConsoleMessageItem>>(null);
 
   const borderAndPadding = 3;
@@ -74,22 +74,22 @@ export const DetailedMessagesDisplay: React.FC<
           data={messages}
           renderItem={({ item: msg }: { item: ConsoleMessageItem }) => {
             let textColor = theme.text.primary;
-            let icon = 'ℹ'; // Information source (ℹ)
+            let icon = "ℹ"; // Information source (ℹ)
 
             switch (msg.type) {
-              case 'warn':
+              case "warn":
                 textColor = theme.status.warning;
-                icon = '⚠'; // Warning sign (⚠)
+                icon = "⚠"; // Warning sign (⚠)
                 break;
-              case 'error':
+              case "error":
                 textColor = theme.status.error;
-                icon = '✖'; // Heavy multiplication x (✖)
+                icon = "✖"; // Heavy multiplication x (✖)
                 break;
-              case 'debug':
+              case "debug":
                 textColor = theme.text.secondary; // Or theme.text.secondary
-                icon = '🔍'; // Left-pointing magnifying glass (🔍)
+                icon = "🔍"; // Left-pointing magnifying glass (🔍)
                 break;
-              case 'log':
+              case "log":
               default:
                 // Default textColor and icon are already set
                 break;
diff --git a/packages/ui-gemini/src/ui/components/DialogManager.test.tsx b/packages/ui-gemini/src/ui/components/DialogManager.test.tsx
index 2f1a45082..6df36c807 100644
--- a/packages/ui-gemini/src/ui/components/DialogManager.test.tsx
+++ b/packages/ui-gemini/src/ui/components/DialogManager.test.tsx
@@ -4,66 +4,66 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import { DialogManager } from './DialogManager.js';
-import { describe, it, expect, vi } from 'vitest';
-import { Text } from 'ink';
-import { type UIState } from '../contexts/UIStateContext.js';
-import { type RestartReason } from '../hooks/useIdeTrustListener.js';
-import { type IdeInfo } from '@airiscode/gemini-cli-core';
-import { type ShellConfirmationRequest } from '../types.js';
+import { type IdeInfo } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { type UIState } from "../contexts/UIStateContext.js";
+import { type RestartReason } from "../hooks/useIdeTrustListener.js";
+import { type ShellConfirmationRequest } from "../types.js";
+import { DialogManager } from "./DialogManager.js";
 
 // Mock child components
-vi.mock('../IdeIntegrationNudge.js', () => ({
+vi.mock("../IdeIntegrationNudge.js", () => ({
   IdeIntegrationNudge: () => <Text>IdeIntegrationNudge</Text>,
 }));
-vi.mock('./LoopDetectionConfirmation.js', () => ({
+vi.mock("./LoopDetectionConfirmation.js", () => ({
   LoopDetectionConfirmation: () => <Text>LoopDetectionConfirmation</Text>,
 }));
-vi.mock('./FolderTrustDialog.js', () => ({
+vi.mock("./FolderTrustDialog.js", () => ({
   FolderTrustDialog: () => <Text>FolderTrustDialog</Text>,
 }));
-vi.mock('./ShellConfirmationDialog.js', () => ({
+vi.mock("./ShellConfirmationDialog.js", () => ({
   ShellConfirmationDialog: () => <Text>ShellConfirmationDialog</Text>,
 }));
-vi.mock('./ConsentPrompt.js', () => ({
+vi.mock("./ConsentPrompt.js", () => ({
   ConsentPrompt: () => <Text>ConsentPrompt</Text>,
 }));
-vi.mock('./ThemeDialog.js', () => ({
+vi.mock("./ThemeDialog.js", () => ({
   ThemeDialog: () => <Text>ThemeDialog</Text>,
 }));
-vi.mock('./SettingsDialog.js', () => ({
+vi.mock("./SettingsDialog.js", () => ({
   SettingsDialog: () => <Text>SettingsDialog</Text>,
 }));
-vi.mock('../auth/AuthInProgress.js', () => ({
+vi.mock("../auth/AuthInProgress.js", () => ({
   AuthInProgress: () => <Text>AuthInProgress</Text>,
 }));
-vi.mock('../auth/AuthDialog.js', () => ({
+vi.mock("../auth/AuthDialog.js", () => ({
   AuthDialog: () => <Text>AuthDialog</Text>,
 }));
-vi.mock('../auth/ApiAuthDialog.js', () => ({
+vi.mock("../auth/ApiAuthDialog.js", () => ({
   ApiAuthDialog: () => <Text>ApiAuthDialog</Text>,
 }));
-vi.mock('./EditorSettingsDialog.js', () => ({
+vi.mock("./EditorSettingsDialog.js", () => ({
   EditorSettingsDialog: () => <Text>EditorSettingsDialog</Text>,
 }));
-vi.mock('../privacy/PrivacyNotice.js', () => ({
+vi.mock("../privacy/PrivacyNotice.js", () => ({
   PrivacyNotice: () => <Text>PrivacyNotice</Text>,
 }));
-vi.mock('./ProQuotaDialog.js', () => ({
+vi.mock("./ProQuotaDialog.js", () => ({
   ProQuotaDialog: () => <Text>ProQuotaDialog</Text>,
 }));
-vi.mock('./PermissionsModifyTrustDialog.js', () => ({
+vi.mock("./PermissionsModifyTrustDialog.js", () => ({
   PermissionsModifyTrustDialog: () => <Text>PermissionsModifyTrustDialog</Text>,
 }));
-vi.mock('./ModelDialog.js', () => ({
+vi.mock("./ModelDialog.js", () => ({
   ModelDialog: () => <Text>ModelDialog</Text>,
 }));
-vi.mock('./IdeTrustChangeDialog.js', () => ({
+vi.mock("./IdeTrustChangeDialog.js", () => ({
   IdeTrustChangeDialog: () => <Text>IdeTrustChangeDialog</Text>,
 }));
 
-describe('DialogManager', () => {
+describe("DialogManager", () => {
   const defaultProps = {
     addItem: vi.fn(),
     terminalWidth: 100,
@@ -93,43 +93,43 @@ describe('DialogManager', () => {
     isPermissionsDialogOpen: false,
   };
 
-  it('renders nothing by default', () => {
+  it("renders nothing by default", () => {
     const { lastFrame } = renderWithProviders(
       <DialogManager {...defaultProps} />,
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       { uiState: baseUiState as any },
     );
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
   const testCases: Array<[Partial<UIState>, string]> = [
     [
       {
         showIdeRestartPrompt: true,
-        ideTrustRestartReason: 'update' as RestartReason,
+        ideTrustRestartReason: "update" as RestartReason,
       },
-      'IdeTrustChangeDialog',
+      "IdeTrustChangeDialog",
     ],
     [
       {
         proQuotaRequest: {
-          failedModel: 'a',
-          fallbackModel: 'b',
-          message: 'c',
+          failedModel: "a",
+          fallbackModel: "b",
+          message: "c",
           isTerminalQuotaError: false,
           resolve: vi.fn(),
         },
       },
-      'ProQuotaDialog',
+      "ProQuotaDialog",
     ],
     [
       {
         shouldShowIdePrompt: true,
-        currentIDE: { name: 'vscode', version: '1.0' } as unknown as IdeInfo,
+        currentIDE: { name: "vscode", version: "1.0" } as unknown as IdeInfo,
       },
-      'IdeIntegrationNudge',
+      "IdeIntegrationNudge",
     ],
-    [{ isFolderTrustDialogOpen: true }, 'FolderTrustDialog'],
+    [{ isFolderTrustDialogOpen: true }, "FolderTrustDialog"],
     [
       {
         shellConfirmationRequest: {
@@ -137,44 +137,32 @@ describe('DialogManager', () => {
           onConfirm: vi.fn(),
         } as unknown as ShellConfirmationRequest,
       },
-      'ShellConfirmationDialog',
-    ],
-    [
-      { loopDetectionConfirmationRequest: { onComplete: vi.fn() } },
-      'LoopDetectionConfirmation',
-    ],
-    [
-      { confirmationRequest: { prompt: 'foo', onConfirm: vi.fn() } },
-      'ConsentPrompt',
+      "ShellConfirmationDialog",
     ],
+    [{ loopDetectionConfirmationRequest: { onComplete: vi.fn() } }, "LoopDetectionConfirmation"],
+    [{ confirmationRequest: { prompt: "foo", onConfirm: vi.fn() } }, "ConsentPrompt"],
     [
       {
-        confirmUpdateExtensionRequests: [{ prompt: 'foo', onConfirm: vi.fn() }],
+        confirmUpdateExtensionRequests: [{ prompt: "foo", onConfirm: vi.fn() }],
       },
-      'ConsentPrompt',
+      "ConsentPrompt",
     ],
-    [{ isThemeDialogOpen: true }, 'ThemeDialog'],
-    [{ isSettingsDialogOpen: true }, 'SettingsDialog'],
-    [{ isModelDialogOpen: true }, 'ModelDialog'],
-    [{ isAuthenticating: true }, 'AuthInProgress'],
-    [{ isAwaitingApiKeyInput: true }, 'ApiAuthDialog'],
-    [{ isAuthDialogOpen: true }, 'AuthDialog'],
-    [{ isEditorDialogOpen: true }, 'EditorSettingsDialog'],
-    [{ showPrivacyNotice: true }, 'PrivacyNotice'],
-    [{ isPermissionsDialogOpen: true }, 'PermissionsModifyTrustDialog'],
+    [{ isThemeDialogOpen: true }, "ThemeDialog"],
+    [{ isSettingsDialogOpen: true }, "SettingsDialog"],
+    [{ isModelDialogOpen: true }, "ModelDialog"],
+    [{ isAuthenticating: true }, "AuthInProgress"],
+    [{ isAwaitingApiKeyInput: true }, "ApiAuthDialog"],
+    [{ isAuthDialogOpen: true }, "AuthDialog"],
+    [{ isEditorDialogOpen: true }, "EditorSettingsDialog"],
+    [{ showPrivacyNotice: true }, "PrivacyNotice"],
+    [{ isPermissionsDialogOpen: true }, "PermissionsModifyTrustDialog"],
   ];
 
-  it.each(testCases)(
-    'renders %s when state is %o',
-    (uiStateOverride, expectedComponent) => {
-      const { lastFrame } = renderWithProviders(
-        <DialogManager {...defaultProps} />,
-        {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          uiState: { ...baseUiState, ...uiStateOverride } as any,
-        },
-      );
-      expect(lastFrame()).toContain(expectedComponent);
-    },
-  );
+  it.each(testCases)("renders %s when state is %o", (uiStateOverride, expectedComponent) => {
+    const { lastFrame } = renderWithProviders(<DialogManager {...defaultProps} />, {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      uiState: { ...baseUiState, ...uiStateOverride } as any,
+    });
+    expect(lastFrame()).toContain(expectedComponent);
+  });
 });
diff --git a/packages/ui-gemini/src/ui/components/DialogManager.tsx b/packages/ui-gemini/src/ui/components/DialogManager.tsx
index 2d04e533d..7d3e904a5 100644
--- a/packages/ui-gemini/src/ui/components/DialogManager.tsx
+++ b/packages/ui-gemini/src/ui/components/DialogManager.tsx
@@ -4,51 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { IdeIntegrationNudge } from '../IdeIntegrationNudge.js';
-import { LoopDetectionConfirmation } from './LoopDetectionConfirmation.js';
-import { FolderTrustDialog } from './FolderTrustDialog.js';
-import { ShellConfirmationDialog } from './ShellConfirmationDialog.js';
-import { ConsentPrompt } from './ConsentPrompt.js';
-import { ThemeDialog } from './ThemeDialog.js';
-import { SettingsDialog } from './SettingsDialog.js';
-import { AuthInProgress } from '../auth/AuthInProgress.js';
-import { AuthDialog } from '../auth/AuthDialog.js';
-import { ApiAuthDialog } from '../auth/ApiAuthDialog.js';
-import { EditorSettingsDialog } from './EditorSettingsDialog.js';
-import { PrivacyNotice } from '../privacy/PrivacyNotice.js';
-import { ProQuotaDialog } from './ProQuotaDialog.js';
-import { runExitCleanup } from '../../utils/cleanup.js';
-import { RELAUNCH_EXIT_CODE } from '../../utils/processUtils.js';
-import { SessionBrowser } from './SessionBrowser.js';
-import { PermissionsModifyTrustDialog } from './PermissionsModifyTrustDialog.js';
-import { ModelDialog } from './ModelDialog.js';
-import { theme } from '../semantic-colors.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import process from 'node:process';
-import { type UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
-import { IdeTrustChangeDialog } from './IdeTrustChangeDialog.js';
+import process from "node:process";
+import { Box, Text } from "ink";
+import { runExitCleanup } from "../../utils/cleanup.js";
+import { RELAUNCH_EXIT_CODE } from "../../utils/processUtils.js";
+import { ApiAuthDialog } from "../auth/ApiAuthDialog.js";
+import { AuthDialog } from "../auth/AuthDialog.js";
+import { AuthInProgress } from "../auth/AuthInProgress.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { type UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import { IdeIntegrationNudge } from "../IdeIntegrationNudge.js";
+import { PrivacyNotice } from "../privacy/PrivacyNotice.js";
+import { theme } from "../semantic-colors.js";
+import { ConsentPrompt } from "./ConsentPrompt.js";
+import { EditorSettingsDialog } from "./EditorSettingsDialog.js";
+import { FolderTrustDialog } from "./FolderTrustDialog.js";
+import { IdeTrustChangeDialog } from "./IdeTrustChangeDialog.js";
+import { LoopDetectionConfirmation } from "./LoopDetectionConfirmation.js";
+import { ModelDialog } from "./ModelDialog.js";
+import { PermissionsModifyTrustDialog } from "./PermissionsModifyTrustDialog.js";
+import { ProQuotaDialog } from "./ProQuotaDialog.js";
+import { SessionBrowser } from "./SessionBrowser.js";
+import { SettingsDialog } from "./SettingsDialog.js";
+import { ShellConfirmationDialog } from "./ShellConfirmationDialog.js";
+import { ThemeDialog } from "./ThemeDialog.js";
 
 interface DialogManagerProps {
-  addItem: UseHistoryManagerReturn['addItem'];
+  addItem: UseHistoryManagerReturn["addItem"];
   terminalWidth: number;
 }
 
 // Props for DialogManager
-export const DialogManager = ({
-  addItem,
-  terminalWidth,
-}: DialogManagerProps) => {
+export const DialogManager = ({ addItem, terminalWidth }: DialogManagerProps) => {
   const config = useConfig();
   const settings = useSettings();
 
   const uiState = useUIState();
   const uiActions = useUIActions();
-  const { constrainHeight, terminalHeight, staticExtraHeight, mainAreaWidth } =
-    uiState;
+  const { constrainHeight, terminalHeight, staticExtraHeight, mainAreaWidth } = uiState;
 
   if (uiState.showIdeRestartPrompt) {
     return <IdeTrustChangeDialog reason={uiState.ideTrustRestartReason} />;
@@ -83,15 +79,11 @@ export const DialogManager = ({
     );
   }
   if (uiState.shellConfirmationRequest) {
-    return (
-      <ShellConfirmationDialog request={uiState.shellConfirmationRequest} />
-    );
+    return <ShellConfirmationDialog request={uiState.shellConfirmationRequest} />;
   }
   if (uiState.loopDetectionConfirmationRequest) {
     return (
-      <LoopDetectionConfirmation
-        onComplete={uiState.loopDetectionConfirmationRequest.onComplete}
-      />
+      <LoopDetectionConfirmation onComplete={uiState.loopDetectionConfirmationRequest.onComplete} />
     );
   }
   if (uiState.confirmationRequest) {
@@ -126,9 +118,7 @@ export const DialogManager = ({
           onCancel={uiActions.closeThemeDialog}
           onHighlight={uiActions.handleThemeHighlight}
           settings={settings}
-          availableTerminalHeight={
-            constrainHeight ? terminalHeight - staticExtraHeight : undefined
-          }
+          availableTerminalHeight={constrainHeight ? terminalHeight - staticExtraHeight : undefined}
           terminalWidth={mainAreaWidth}
         />
       </Box>
@@ -157,7 +147,7 @@ export const DialogManager = ({
     return (
       <AuthInProgress
         onTimeout={() => {
-          uiActions.onAuthError('Authentication cancelled.');
+          uiActions.onAuthError("Authentication cancelled.");
         }}
       />
     );
@@ -204,12 +194,7 @@ export const DialogManager = ({
     );
   }
   if (uiState.showPrivacyNotice) {
-    return (
-      <PrivacyNotice
-        onExit={() => uiActions.exitPrivacyNotice()}
-        config={config}
-      />
-    );
+    return <PrivacyNotice onExit={() => uiActions.exitPrivacyNotice()} config={config} />;
   }
   if (uiState.isSessionBrowserOpen) {
     return (
diff --git a/packages/ui-gemini/src/ui/components/EditorSettingsDialog.test.tsx b/packages/ui-gemini/src/ui/components/EditorSettingsDialog.test.tsx
index 3a5b74ed0..1204eff3f 100644
--- a/packages/ui-gemini/src/ui/components/EditorSettingsDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/EditorSettingsDialog.test.tsx
@@ -4,18 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { EditorSettingsDialog } from './EditorSettingsDialog.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { SettingScope } from '../../config/settings.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { KeypressProvider } from '../contexts/KeypressContext.js';
-import { act } from 'react';
-import { waitFor } from '../../test-utils/async.js';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import { KeypressProvider } from "../contexts/KeypressContext.js";
+import { EditorSettingsDialog } from "./EditorSettingsDialog.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     isEditorAvailable: () => true, // Mock to behave predictably in CI
@@ -23,27 +22,27 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
 });
 
 // Mock editorSettingsManager
-vi.mock('../editors/editorSettingsManager.js', () => ({
+vi.mock("../editors/editorSettingsManager.js", () => ({
   editorSettingsManager: {
     getAvailableEditorDisplays: () => [
-      { name: 'VS Code', type: 'vscode', disabled: false },
-      { name: 'Vim', type: 'vim', disabled: false },
+      { name: "VS Code", type: "vscode", disabled: false },
+      { name: "Vim", type: "vim", disabled: false },
     ],
   },
 }));
 
-describe('EditorSettingsDialog', () => {
+describe("EditorSettingsDialog", () => {
   const mockSettings = {
     forScope: (scope: string) => ({
       settings: {
         general: {
-          preferredEditor: scope === SettingScope.User ? 'vscode' : undefined,
+          preferredEditor: scope === SettingScope.User ? "vscode" : undefined,
         },
       },
     }),
     merged: {
       general: {
-        preferredEditor: 'vscode',
+        preferredEditor: "vscode",
       },
     },
   } as unknown as LoadedSettings;
@@ -55,84 +54,65 @@ describe('EditorSettingsDialog', () => {
   const renderWithProvider = (ui: React.ReactNode) =>
     render(<KeypressProvider>{ui}</KeypressProvider>);
 
-  it('renders correctly', () => {
+  it("renders correctly", () => {
     const { lastFrame } = renderWithProvider(
-      <EditorSettingsDialog
-        onSelect={vi.fn()}
-        settings={mockSettings}
-        onExit={vi.fn()}
-      />,
+      <EditorSettingsDialog onSelect={vi.fn()} settings={mockSettings} onExit={vi.fn()} />,
     );
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('calls onSelect when an editor is selected', () => {
+  it("calls onSelect when an editor is selected", () => {
     const onSelect = vi.fn();
     const { lastFrame } = renderWithProvider(
-      <EditorSettingsDialog
-        onSelect={onSelect}
-        settings={mockSettings}
-        onExit={vi.fn()}
-      />,
+      <EditorSettingsDialog onSelect={onSelect} settings={mockSettings} onExit={vi.fn()} />,
     );
 
-    expect(lastFrame()).toContain('VS Code');
+    expect(lastFrame()).toContain("VS Code");
   });
 
-  it('switches focus between editor and scope sections on Tab', async () => {
+  it("switches focus between editor and scope sections on Tab", async () => {
     const { lastFrame, stdin } = renderWithProvider(
-      <EditorSettingsDialog
-        onSelect={vi.fn()}
-        settings={mockSettings}
-        onExit={vi.fn()}
-      />,
+      <EditorSettingsDialog onSelect={vi.fn()} settings={mockSettings} onExit={vi.fn()} />,
     );
 
     // Initial focus on editor
-    expect(lastFrame()).toContain('> Select Editor');
-    expect(lastFrame()).not.toContain('> Apply To');
+    expect(lastFrame()).toContain("> Select Editor");
+    expect(lastFrame()).not.toContain("> Apply To");
 
     // Press Tab
     await act(async () => {
-      stdin.write('\t');
+      stdin.write("\t");
     });
 
     // Focus should be on scope
     await waitFor(() => {
-      const frame = lastFrame() || '';
-      if (!frame.includes('> Apply To')) {
-        console.log(
-          'Waiting for scope focus. Current frame:',
-          JSON.stringify(frame),
-        );
+      const frame = lastFrame() || "";
+      if (!frame.includes("> Apply To")) {
+        console.log("Waiting for scope focus. Current frame:", JSON.stringify(frame));
       }
-      expect(frame).toContain('> Apply To');
+      expect(frame).toContain("> Apply To");
     });
-    expect(lastFrame()).toContain('  Select Editor');
+    expect(lastFrame()).toContain("  Select Editor");
 
     // Press Tab again
     await act(async () => {
-      stdin.write('\t');
+      stdin.write("\t");
     });
 
     // Focus should be back on editor
     await waitFor(() => {
-      expect(lastFrame()).toContain('> Select Editor');
+      expect(lastFrame()).toContain("> Select Editor");
     });
   });
 
-  it('calls onExit when Escape is pressed', async () => {
+  it("calls onExit when Escape is pressed", async () => {
     const onExit = vi.fn();
     const { stdin } = renderWithProvider(
-      <EditorSettingsDialog
-        onSelect={vi.fn()}
-        settings={mockSettings}
-        onExit={onExit}
-      />,
+      <EditorSettingsDialog onSelect={vi.fn()} settings={mockSettings} onExit={onExit} />,
     );
 
     await act(async () => {
-      stdin.write('\u001B'); // Escape
+      stdin.write("\u001B"); // Escape
     });
 
     await waitFor(() => {
@@ -140,18 +120,18 @@ describe('EditorSettingsDialog', () => {
     });
   });
 
-  it('shows modified message when setting exists in other scope', () => {
+  it("shows modified message when setting exists in other scope", () => {
     const settingsWithOtherScope = {
       forScope: (_scope: string) => ({
         settings: {
           general: {
-            preferredEditor: 'vscode', // Both scopes have it set
+            preferredEditor: "vscode", // Both scopes have it set
           },
         },
       }),
       merged: {
         general: {
-          preferredEditor: 'vscode',
+          preferredEditor: "vscode",
         },
       },
     } as unknown as LoadedSettings;
@@ -164,13 +144,10 @@ describe('EditorSettingsDialog', () => {
       />,
     );
 
-    const frame = lastFrame() || '';
-    if (!frame.includes('(Also modified')) {
-      console.log(
-        'Modified message test failure. Frame:',
-        JSON.stringify(frame),
-      );
+    const frame = lastFrame() || "";
+    if (!frame.includes("(Also modified")) {
+      console.log("Modified message test failure. Frame:", JSON.stringify(frame));
     }
-    expect(frame).toContain('(Also modified');
+    expect(frame).toContain("(Also modified");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/EditorSettingsDialog.tsx b/packages/ui-gemini/src/ui/components/EditorSettingsDialog.tsx
index 794b0bf3b..3d96cb2ea 100644
--- a/packages/ui-gemini/src/ui/components/EditorSettingsDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/EditorSettingsDialog.tsx
@@ -4,32 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import {
-  editorSettingsManager,
-  type EditorDisplay,
-} from '../editors/editorSettingsManager.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-} from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
 import {
+  EDITOR_DISPLAY_NAMES,
   type EditorType,
   isEditorAvailable,
-  EDITOR_DISPLAY_NAMES,
-} from '@airiscode/gemini-cli-core';
-import { useKeypress } from '../hooks/useKeypress.js';
+} from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useState } from "react";
+import type { LoadableSettingScope, LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { type EditorDisplay, editorSettingsManager } from "../editors/editorSettingsManager.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 interface EditorDialogProps {
-  onSelect: (
-    editorType: EditorType | undefined,
-    scope: LoadableSettingScope,
-  ) => void;
+  onSelect: (editorType: EditorType | undefined, scope: LoadableSettingScope) => void;
   settings: LoadedSettings;
   onExit: () => void;
 }
@@ -39,33 +30,25 @@ export function EditorSettingsDialog({
   settings,
   onExit,
 }: EditorDialogProps): React.JSX.Element {
-  const [selectedScope, setSelectedScope] = useState<LoadableSettingScope>(
-    SettingScope.User,
-  );
-  const [focusedSection, setFocusedSection] = useState<'editor' | 'scope'>(
-    'editor',
-  );
+  const [selectedScope, setSelectedScope] = useState<LoadableSettingScope>(SettingScope.User);
+  const [focusedSection, setFocusedSection] = useState<"editor" | "scope">("editor");
   useKeypress(
     (key) => {
-      if (key.name === 'tab') {
-        setFocusedSection((prev) => (prev === 'editor' ? 'scope' : 'editor'));
+      if (key.name === "tab") {
+        setFocusedSection((prev) => (prev === "editor" ? "scope" : "editor"));
       }
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onExit();
       }
     },
     { isActive: true },
   );
 
-  const editorItems: EditorDisplay[] =
-    editorSettingsManager.getAvailableEditorDisplays();
+  const editorItems: EditorDisplay[] = editorSettingsManager.getAvailableEditorDisplays();
 
-  const currentPreference =
-    settings.forScope(selectedScope).settings.general?.preferredEditor;
+  const currentPreference = settings.forScope(selectedScope).settings.general?.preferredEditor;
   let editorIndex = currentPreference
-    ? editorItems.findIndex(
-        (item: EditorDisplay) => item.type === currentPreference,
-      )
+    ? editorItems.findIndex((item: EditorDisplay) => item.type === currentPreference)
     : 0;
   if (editorIndex === -1) {
     console.error(`Editor is not supported: ${currentPreference}`);
@@ -78,19 +61,19 @@ export function EditorSettingsDialog({
     key: string;
   }> = [
     {
-      label: 'User Settings',
+      label: "User Settings",
       value: SettingScope.User,
       key: SettingScope.User,
     },
     {
-      label: 'Workspace Settings',
+      label: "Workspace Settings",
       value: SettingScope.Workspace,
       key: SettingScope.Workspace,
     },
   ];
 
-  const handleEditorSelect = (editorType: EditorType | 'not_set') => {
-    if (editorType === 'not_set') {
+  const handleEditorSelect = (editorType: EditorType | "not_set") => {
+    if (editorType === "not_set") {
       onSelect(undefined, selectedScope);
       return;
     }
@@ -99,34 +82,25 @@ export function EditorSettingsDialog({
 
   const handleScopeSelect = (scope: LoadableSettingScope) => {
     setSelectedScope(scope);
-    setFocusedSection('editor');
+    setFocusedSection("editor");
   };
 
-  let otherScopeModifiedMessage = '';
+  let otherScopeModifiedMessage = "";
   const otherScope =
-    selectedScope === SettingScope.User
-      ? SettingScope.Workspace
-      : SettingScope.User;
-  if (
-    settings.forScope(otherScope).settings.general?.preferredEditor !==
-    undefined
-  ) {
+    selectedScope === SettingScope.User ? SettingScope.Workspace : SettingScope.User;
+  if (settings.forScope(otherScope).settings.general?.preferredEditor !== undefined) {
     otherScopeModifiedMessage =
-      settings.forScope(selectedScope).settings.general?.preferredEditor !==
-      undefined
+      settings.forScope(selectedScope).settings.general?.preferredEditor !== undefined
         ? `(Also modified in ${otherScope})`
         : `(Modified in ${otherScope})`;
   }
 
-  let mergedEditorName = 'None';
+  let mergedEditorName = "None";
   if (
     settings.merged.general?.preferredEditor &&
     isEditorAvailable(settings.merged.general?.preferredEditor)
   ) {
-    mergedEditorName =
-      EDITOR_DISPLAY_NAMES[
-        settings.merged.general?.preferredEditor as EditorType
-      ];
+    mergedEditorName = EDITOR_DISPLAY_NAMES[settings.merged.general?.preferredEditor as EditorType];
   }
 
   return (
@@ -138,8 +112,8 @@ export function EditorSettingsDialog({
       width="100%"
     >
       <Box flexDirection="column" width="45%" paddingRight={2}>
-        <Text bold={focusedSection === 'editor'}>
-          {focusedSection === 'editor' ? '> ' : '  '}Select Editor{' '}
+        <Text bold={focusedSection === "editor"}>
+          {focusedSection === "editor" ? "> " : "  "}Select Editor{" "}
           <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
         </Text>
         <RadioButtonSelect
@@ -151,19 +125,19 @@ export function EditorSettingsDialog({
           }))}
           initialIndex={editorIndex}
           onSelect={handleEditorSelect}
-          isFocused={focusedSection === 'editor'}
+          isFocused={focusedSection === "editor"}
           key={selectedScope}
         />
 
         <Box marginTop={1} flexDirection="column">
-          <Text bold={focusedSection === 'scope'}>
-            {focusedSection === 'scope' ? '> ' : '  '}Apply To
+          <Text bold={focusedSection === "scope"}>
+            {focusedSection === "scope" ? "> " : "  "}Apply To
           </Text>
           <RadioButtonSelect
             items={scopeItems}
             initialIndex={0}
             onSelect={handleScopeSelect}
-            isFocused={focusedSection === 'scope'}
+            isFocused={focusedSection === "scope"}
           />
         </Box>
 
@@ -180,19 +154,12 @@ export function EditorSettingsDialog({
         </Text>
         <Box flexDirection="column" gap={1} marginTop={1}>
           <Text color={theme.text.secondary}>
-            These editors are currently supported. Please note that some editors
-            cannot be used in sandbox mode.
+            These editors are currently supported. Please note that some editors cannot be used in
+            sandbox mode.
           </Text>
           <Text color={theme.text.secondary}>
-            Your preferred editor is:{' '}
-            <Text
-              color={
-                mergedEditorName === 'None'
-                  ? theme.status.error
-                  : theme.text.link
-              }
-              bold
-            >
+            Your preferred editor is:{" "}
+            <Text color={mergedEditorName === "None" ? theme.status.error : theme.text.link} bold>
               {mergedEditorName}
             </Text>
             .
diff --git a/packages/ui-gemini/src/ui/components/ExitWarning.test.tsx b/packages/ui-gemini/src/ui/components/ExitWarning.test.tsx
index df91560cf..fa88b5fbd 100644
--- a/packages/ui-gemini/src/ui/components/ExitWarning.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ExitWarning.test.tsx
@@ -4,57 +4,57 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { ExitWarning } from './ExitWarning.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { useUIState, type UIState } from '../contexts/UIStateContext.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { type UIState, useUIState } from "../contexts/UIStateContext.js";
+import { ExitWarning } from "./ExitWarning.js";
 
-vi.mock('../contexts/UIStateContext.js');
+vi.mock("../contexts/UIStateContext.js");
 
-describe('ExitWarning', () => {
+describe("ExitWarning", () => {
   const mockUseUIState = vi.mocked(useUIState);
 
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('renders nothing by default', () => {
+  it("renders nothing by default", () => {
     mockUseUIState.mockReturnValue({
       dialogsVisible: false,
       ctrlCPressedOnce: false,
       ctrlDPressedOnce: false,
     } as unknown as UIState);
     const { lastFrame } = render(<ExitWarning />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('renders Ctrl+C warning when pressed once and dialogs visible', () => {
+  it("renders Ctrl+C warning when pressed once and dialogs visible", () => {
     mockUseUIState.mockReturnValue({
       dialogsVisible: true,
       ctrlCPressedOnce: true,
       ctrlDPressedOnce: false,
     } as unknown as UIState);
     const { lastFrame } = render(<ExitWarning />);
-    expect(lastFrame()).toContain('Press Ctrl+C again to exit');
+    expect(lastFrame()).toContain("Press Ctrl+C again to exit");
   });
 
-  it('renders Ctrl+D warning when pressed once and dialogs visible', () => {
+  it("renders Ctrl+D warning when pressed once and dialogs visible", () => {
     mockUseUIState.mockReturnValue({
       dialogsVisible: true,
       ctrlCPressedOnce: false,
       ctrlDPressedOnce: true,
     } as unknown as UIState);
     const { lastFrame } = render(<ExitWarning />);
-    expect(lastFrame()).toContain('Press Ctrl+D again to exit');
+    expect(lastFrame()).toContain("Press Ctrl+D again to exit");
   });
 
-  it('renders nothing if dialogs are not visible', () => {
+  it("renders nothing if dialogs are not visible", () => {
     mockUseUIState.mockReturnValue({
       dialogsVisible: false,
       ctrlCPressedOnce: true,
       ctrlDPressedOnce: true,
     } as unknown as UIState);
     const { lastFrame } = render(<ExitWarning />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/ExitWarning.tsx b/packages/ui-gemini/src/ui/components/ExitWarning.tsx
index 598ff2fab..0c9b8485d 100644
--- a/packages/ui-gemini/src/ui/components/ExitWarning.tsx
+++ b/packages/ui-gemini/src/ui/components/ExitWarning.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { theme } from "../semantic-colors.js";
 
 export const ExitWarning: React.FC = () => {
   const uiState = useUIState();
diff --git a/packages/ui-gemini/src/ui/components/FolderTrustDialog.test.tsx b/packages/ui-gemini/src/ui/components/FolderTrustDialog.test.tsx
index 0423739a6..f945ef1ae 100644
--- a/packages/ui-gemini/src/ui/components/FolderTrustDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/FolderTrustDialog.test.tsx
@@ -4,24 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { act } from 'react';
-import { vi } from 'vitest';
-import { FolderTrustDialog } from './FolderTrustDialog.js';
-import { ExitCodes } from '@airiscode/gemini-cli-core';
-import * as processUtils from '../../utils/processUtils.js';
-
-vi.mock('../../utils/processUtils.js', () => ({
+import { ExitCodes } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import * as processUtils from "../../utils/processUtils.js";
+import { FolderTrustDialog } from "./FolderTrustDialog.js";
+
+vi.mock("../../utils/processUtils.js", () => ({
   relaunchApp: vi.fn(),
 }));
 
 const mockedExit = vi.hoisted(() => vi.fn());
 const mockedCwd = vi.hoisted(() => vi.fn());
 
-vi.mock('node:process', async () => {
-  const actual =
-    await vi.importActual<typeof import('node:process')>('node:process');
+vi.mock("node:process", async () => {
+  const actual = await vi.importActual<typeof import("node:process")>("node:process");
   return {
     ...actual,
     exit: mockedExit,
@@ -29,60 +28,54 @@ vi.mock('node:process', async () => {
   };
 });
 
-describe('FolderTrustDialog', () => {
+describe("FolderTrustDialog", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    mockedCwd.mockReturnValue('/home/user/project');
+    mockedCwd.mockReturnValue("/home/user/project");
   });
 
-  it('should render the dialog with title and description', () => {
-    const { lastFrame } = renderWithProviders(
-      <FolderTrustDialog onSelect={vi.fn()} />,
-    );
+  it("should render the dialog with title and description", () => {
+    const { lastFrame } = renderWithProviders(<FolderTrustDialog onSelect={vi.fn()} />);
 
-    expect(lastFrame()).toContain('Do you trust this folder?');
+    expect(lastFrame()).toContain("Do you trust this folder?");
     expect(lastFrame()).toContain(
-      'Trusting a folder allows Gemini to execute commands it suggests.',
+      "Trusting a folder allows Gemini to execute commands it suggests.",
     );
   });
 
-  it('should display exit message and call process.exit and not call onSelect when escape is pressed', async () => {
+  it("should display exit message and call process.exit and not call onSelect when escape is pressed", async () => {
     const onSelect = vi.fn();
     const { lastFrame, stdin } = renderWithProviders(
       <FolderTrustDialog onSelect={onSelect} isRestarting={false} />,
     );
 
     act(() => {
-      stdin.write('\u001b[27u'); // Press kitty escape key
+      stdin.write("\u001b[27u"); // Press kitty escape key
     });
 
     await waitFor(() => {
       expect(lastFrame()).toContain(
-        'A folder trust level must be selected to continue. Exiting since escape was pressed.',
+        "A folder trust level must be selected to continue. Exiting since escape was pressed.",
       );
     });
     await waitFor(() => {
-      expect(mockedExit).toHaveBeenCalledWith(
-        ExitCodes.FATAL_CANCELLATION_ERROR,
-      );
+      expect(mockedExit).toHaveBeenCalledWith(ExitCodes.FATAL_CANCELLATION_ERROR);
     });
     expect(onSelect).not.toHaveBeenCalled();
   });
 
-  it('should display restart message when isRestarting is true', () => {
+  it("should display restart message when isRestarting is true", () => {
     const { lastFrame } = renderWithProviders(
       <FolderTrustDialog onSelect={vi.fn()} isRestarting={true} />,
     );
 
-    expect(lastFrame()).toContain(' Gemini CLI is restarting');
+    expect(lastFrame()).toContain(" Gemini CLI is restarting");
   });
 
-  it('should call relaunchApp when isRestarting is true', async () => {
+  it("should call relaunchApp when isRestarting is true", async () => {
     vi.useFakeTimers();
-    const relaunchApp = vi.spyOn(processUtils, 'relaunchApp');
-    renderWithProviders(
-      <FolderTrustDialog onSelect={vi.fn()} isRestarting={true} />,
-    );
+    const relaunchApp = vi.spyOn(processUtils, "relaunchApp");
+    renderWithProviders(<FolderTrustDialog onSelect={vi.fn()} isRestarting={true} />);
     await vi.advanceTimersByTimeAsync(250);
     expect(relaunchApp).toHaveBeenCalled();
     vi.useRealTimers();
@@ -94,7 +87,7 @@ describe('FolderTrustDialog', () => {
     );
 
     act(() => {
-      stdin.write('r');
+      stdin.write("r");
     });
 
     await waitFor(() => {
@@ -102,29 +95,23 @@ describe('FolderTrustDialog', () => {
     });
   });
 
-  describe('directory display', () => {
-    it('should correctly display the folder name for a nested directory', () => {
-      mockedCwd.mockReturnValue('/home/user/project');
-      const { lastFrame } = renderWithProviders(
-        <FolderTrustDialog onSelect={vi.fn()} />,
-      );
-      expect(lastFrame()).toContain('Trust folder (project)');
+  describe("directory display", () => {
+    it("should correctly display the folder name for a nested directory", () => {
+      mockedCwd.mockReturnValue("/home/user/project");
+      const { lastFrame } = renderWithProviders(<FolderTrustDialog onSelect={vi.fn()} />);
+      expect(lastFrame()).toContain("Trust folder (project)");
     });
 
-    it('should correctly display the parent folder name for a nested directory', () => {
-      mockedCwd.mockReturnValue('/home/user/project');
-      const { lastFrame } = renderWithProviders(
-        <FolderTrustDialog onSelect={vi.fn()} />,
-      );
-      expect(lastFrame()).toContain('Trust parent folder (user)');
+    it("should correctly display the parent folder name for a nested directory", () => {
+      mockedCwd.mockReturnValue("/home/user/project");
+      const { lastFrame } = renderWithProviders(<FolderTrustDialog onSelect={vi.fn()} />);
+      expect(lastFrame()).toContain("Trust parent folder (user)");
     });
 
-    it('should correctly display an empty parent folder name for a directory directly under root', () => {
-      mockedCwd.mockReturnValue('/project');
-      const { lastFrame } = renderWithProviders(
-        <FolderTrustDialog onSelect={vi.fn()} />,
-      );
-      expect(lastFrame()).toContain('Trust parent folder ()');
+    it("should correctly display an empty parent folder name for a directory directly under root", () => {
+      mockedCwd.mockReturnValue("/project");
+      const { lastFrame } = renderWithProviders(<FolderTrustDialog onSelect={vi.fn()} />);
+      expect(lastFrame()).toContain("Trust parent folder ()");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/FolderTrustDialog.tsx b/packages/ui-gemini/src/ui/components/FolderTrustDialog.tsx
index 34dca6dd8..3dfee955c 100644
--- a/packages/ui-gemini/src/ui/components/FolderTrustDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/FolderTrustDialog.tsx
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { useEffect, useState } from 'react';
-import { theme } from '../semantic-colors.js';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import { relaunchApp } from '../../utils/processUtils.js';
-import { runExitCleanup } from '../../utils/cleanup.js';
-import { ExitCodes } from '@airiscode/gemini-cli-core';
+import * as path from "node:path";
+import * as process from "node:process";
+import { ExitCodes } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import { runExitCleanup } from "../../utils/cleanup.js";
+import { relaunchApp } from "../../utils/processUtils.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import type { RadioSelectItem } from "./shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export enum FolderTrustChoice {
-  TRUST_FOLDER = 'trust_folder',
-  TRUST_PARENT = 'trust_parent',
-  DO_NOT_TRUST = 'do_not_trust',
+  TRUST_FOLDER = "trust_folder",
+  TRUST_PARENT = "trust_parent",
+  DO_NOT_TRUST = "do_not_trust",
 }
 
 interface FolderTrustDialogProps {
@@ -28,10 +28,7 @@ interface FolderTrustDialogProps {
   isRestarting?: boolean;
 }
 
-export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
-  onSelect,
-  isRestarting,
-}) => {
+export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({ onSelect, isRestarting }) => {
   const [exiting, setExiting] = useState(false);
   useEffect(() => {
     const doRelaunch = async () => {
@@ -47,7 +44,7 @@ export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         setExiting(true);
         setTimeout(async () => {
           await runExitCleanup();
@@ -94,17 +91,12 @@ export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
             Do you trust this folder?
           </Text>
           <Text color={theme.text.primary}>
-            Trusting a folder allows Gemini to execute commands it suggests.
-            This is a security feature to prevent accidental execution in
-            untrusted directories.
+            Trusting a folder allows Gemini to execute commands it suggests. This is a security
+            feature to prevent accidental execution in untrusted directories.
           </Text>
         </Box>
 
-        <RadioButtonSelect
-          items={options}
-          onSelect={onSelect}
-          isFocused={!isRestarting}
-        />
+        <RadioButtonSelect items={options} onSelect={onSelect} isFocused={!isRestarting} />
       </Box>
       {isRestarting && (
         <Box marginLeft={1} marginTop={1}>
@@ -116,8 +108,7 @@ export const FolderTrustDialog: React.FC<FolderTrustDialogProps> = ({
       {exiting && (
         <Box marginLeft={1} marginTop={1}>
           <Text color={theme.status.warning}>
-            A folder trust level must be selected to continue. Exiting since
-            escape was pressed.
+            A folder trust level must be selected to continue. Exiting since escape was pressed.
           </Text>
         </Box>
       )}
diff --git a/packages/ui-gemini/src/ui/components/Footer.test.tsx b/packages/ui-gemini/src/ui/components/Footer.test.tsx
index 124f0a5e0..b5ca80464 100644
--- a/packages/ui-gemini/src/ui/components/Footer.test.tsx
+++ b/packages/ui-gemini/src/ui/components/Footer.test.tsx
@@ -4,23 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import {
-  renderWithProviders,
-  createMockSettings,
-} from '../../test-utils/render.js';
-import { Footer } from './Footer.js';
-import { tildeifyPath, ToolCallDecision } from '@airiscode/gemini-cli-core';
-import type { SessionStatsState } from '../contexts/SessionContext.js';
+import { ToolCallDecision, tildeifyPath } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { createMockSettings, renderWithProviders } from "../../test-utils/render.js";
+import type { SessionStatsState } from "../contexts/SessionContext.js";
+import { Footer } from "./Footer.js";
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...original,
     shortenPath: (p: string, len: number) => {
       if (p.length > len) {
-        return '...' + p.slice(p.length - len + 3);
+        return "..." + p.slice(p.length - len + 3);
       }
       return p;
     },
@@ -28,14 +24,13 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
 });
 
 const defaultProps = {
-  model: 'gemini-pro',
-  targetDir:
-    '/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long',
-  branchName: 'main',
+  model: "gemini-pro",
+  targetDir: "/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long",
+  branchName: "main",
 };
 
 const mockSessionStats: SessionStatsState = {
-  sessionId: 'test-session',
+  sessionId: "test-session",
   sessionStartTime: new Date(),
   lastPromptTokenCount: 0,
   promptCount: 0,
@@ -61,8 +56,8 @@ const mockSessionStats: SessionStatsState = {
   },
 };
 
-describe('<Footer />', () => {
-  it('renders the component', () => {
+describe("<Footer />", () => {
+  it("renders the component", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 120,
       uiState: {
@@ -73,32 +68,30 @@ describe('<Footer />', () => {
     expect(lastFrame()).toBeDefined();
   });
 
-  describe('path display', () => {
-    it('should display a shortened path on a narrow terminal', () => {
+  describe("path display", () => {
+    it("should display a shortened path on a narrow terminal", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 79,
         uiState: { sessionStats: mockSessionStats },
       });
       const tildePath = tildeifyPath(defaultProps.targetDir);
       const pathLength = Math.max(20, Math.floor(79 * 0.25));
-      const expectedPath =
-        '...' + tildePath.slice(tildePath.length - pathLength + 3);
+      const expectedPath = "..." + tildePath.slice(tildePath.length - pathLength + 3);
       expect(lastFrame()).toContain(expectedPath);
     });
 
-    it('should use wide layout at 80 columns', () => {
+    it("should use wide layout at 80 columns", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 80,
         uiState: { sessionStats: mockSessionStats },
       });
       const tildePath = tildeifyPath(defaultProps.targetDir);
-      const expectedPath =
-        '...' + tildePath.slice(tildePath.length - 80 * 0.25 + 3);
+      const expectedPath = "..." + tildePath.slice(tildePath.length - 80 * 0.25 + 3);
       expect(lastFrame()).toContain(expectedPath);
     });
   });
 
-  it('displays the branch name when provided', () => {
+  it("displays the branch name when provided", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 120,
       uiState: {
@@ -109,7 +102,7 @@ describe('<Footer />', () => {
     expect(lastFrame()).toContain(`(${defaultProps.branchName}*)`);
   });
 
-  it('does not display the branch name when not provided', () => {
+  it("does not display the branch name when not provided", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 120,
       uiState: { branchName: undefined, sessionStats: mockSessionStats },
@@ -117,7 +110,7 @@ describe('<Footer />', () => {
     expect(lastFrame()).not.toContain(`(${defaultProps.branchName}*)`);
   });
 
-  it('displays the model name and context percentage', () => {
+  it("displays the model name and context percentage", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 120,
       uiState: { sessionStats: mockSessionStats },
@@ -133,7 +126,7 @@ describe('<Footer />', () => {
     expect(lastFrame()).toMatch(/\(\d+% context left\)/);
   });
 
-  it('displays the model name and abbreviated context percentage', () => {
+  it("displays the model name and abbreviated context percentage", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 99,
       uiState: { sessionStats: mockSessionStats },
@@ -149,28 +142,28 @@ describe('<Footer />', () => {
     expect(lastFrame()).toMatch(/\(\d+%\)/);
   });
 
-  describe('sandbox and trust info', () => {
-    it('should display untrusted when isTrustedFolder is false', () => {
+  describe("sandbox and trust info", () => {
+    it("should display untrusted when isTrustedFolder is false", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { isTrustedFolder: false, sessionStats: mockSessionStats },
       });
-      expect(lastFrame()).toContain('untrusted');
+      expect(lastFrame()).toContain("untrusted");
     });
 
-    it('should display custom sandbox info when SANDBOX env is set', () => {
-      vi.stubEnv('SANDBOX', 'gemini-cli-test-sandbox');
+    it("should display custom sandbox info when SANDBOX env is set", () => {
+      vi.stubEnv("SANDBOX", "gemini-cli-test-sandbox");
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { isTrustedFolder: undefined, sessionStats: mockSessionStats },
       });
-      expect(lastFrame()).toContain('test');
+      expect(lastFrame()).toContain("test");
       vi.unstubAllEnvs();
     });
 
-    it('should display macOS Seatbelt info when SANDBOX is sandbox-exec', () => {
-      vi.stubEnv('SANDBOX', 'sandbox-exec');
-      vi.stubEnv('SEATBELT_PROFILE', 'test-profile');
+    it("should display macOS Seatbelt info when SANDBOX is sandbox-exec", () => {
+      vi.stubEnv("SANDBOX", "sandbox-exec");
+      vi.stubEnv("SEATBELT_PROFILE", "test-profile");
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { isTrustedFolder: true, sessionStats: mockSessionStats },
@@ -181,29 +174,29 @@ describe('<Footer />', () => {
 
     it('should display "no sandbox" when SANDBOX is not set and folder is trusted', () => {
       // Clear any SANDBOX env var that might be set.
-      vi.stubEnv('SANDBOX', '');
+      vi.stubEnv("SANDBOX", "");
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { isTrustedFolder: true, sessionStats: mockSessionStats },
       });
-      expect(lastFrame()).toContain('no sandbox');
+      expect(lastFrame()).toContain("no sandbox");
       vi.unstubAllEnvs();
     });
 
-    it('should prioritize untrusted message over sandbox info', () => {
-      vi.stubEnv('SANDBOX', 'gemini-cli-test-sandbox');
+    it("should prioritize untrusted message over sandbox info", () => {
+      vi.stubEnv("SANDBOX", "gemini-cli-test-sandbox");
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { isTrustedFolder: false, sessionStats: mockSessionStats },
       });
-      expect(lastFrame()).toContain('untrusted');
+      expect(lastFrame()).toContain("untrusted");
       expect(lastFrame()).not.toMatch(/test-sandbox/s);
       vi.unstubAllEnvs();
     });
   });
 
-  describe('footer configuration filtering (golden snapshots)', () => {
-    it('renders complete footer with all sections visible (baseline)', () => {
+  describe("footer configuration filtering (golden snapshots)", () => {
+    it("renders complete footer with all sections visible (baseline)", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { sessionStats: mockSessionStats },
@@ -215,10 +208,10 @@ describe('<Footer />', () => {
           },
         }),
       });
-      expect(lastFrame()).toMatchSnapshot('complete-footer-wide');
+      expect(lastFrame()).toMatchSnapshot("complete-footer-wide");
     });
 
-    it('renders footer with all optional sections hidden (minimal footer)', () => {
+    it("renders footer with all optional sections hidden (minimal footer)", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { sessionStats: mockSessionStats },
@@ -232,10 +225,10 @@ describe('<Footer />', () => {
           },
         }),
       });
-      expect(lastFrame()).toMatchSnapshot('footer-minimal');
+      expect(lastFrame()).toMatchSnapshot("footer-minimal");
     });
 
-    it('renders footer with only model info hidden (partial filtering)', () => {
+    it("renders footer with only model info hidden (partial filtering)", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { sessionStats: mockSessionStats },
@@ -249,10 +242,10 @@ describe('<Footer />', () => {
           },
         }),
       });
-      expect(lastFrame()).toMatchSnapshot('footer-no-model');
+      expect(lastFrame()).toMatchSnapshot("footer-no-model");
     });
 
-    it('renders footer with CWD and model info hidden to test alignment (only sandbox visible)', () => {
+    it("renders footer with CWD and model info hidden to test alignment (only sandbox visible)", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { sessionStats: mockSessionStats },
@@ -266,10 +259,10 @@ describe('<Footer />', () => {
           },
         }),
       });
-      expect(lastFrame()).toMatchSnapshot('footer-only-sandbox');
+      expect(lastFrame()).toMatchSnapshot("footer-only-sandbox");
     });
 
-    it('hides the context percentage when hideContextPercentage is true', () => {
+    it("hides the context percentage when hideContextPercentage is true", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { sessionStats: mockSessionStats },
@@ -285,7 +278,7 @@ describe('<Footer />', () => {
       expect(lastFrame()).not.toMatch(/\(\d+% context left\)/);
     });
 
-    it('shows the context percentage when hideContextPercentage is false', () => {
+    it("shows the context percentage when hideContextPercentage is false", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 120,
         uiState: { sessionStats: mockSessionStats },
@@ -301,7 +294,7 @@ describe('<Footer />', () => {
       expect(lastFrame()).toMatch(/\(\d+% context left\)/);
     });
 
-    it('renders complete footer in narrow terminal (baseline narrow)', () => {
+    it("renders complete footer in narrow terminal (baseline narrow)", () => {
       const { lastFrame } = renderWithProviders(<Footer />, {
         width: 79,
         uiState: { sessionStats: mockSessionStats },
@@ -313,35 +306,35 @@ describe('<Footer />', () => {
           },
         }),
       });
-      expect(lastFrame()).toMatchSnapshot('complete-footer-narrow');
+      expect(lastFrame()).toMatchSnapshot("complete-footer-narrow");
     });
   });
 });
 
-describe('fallback mode display', () => {
-  it('should display Flash model when in fallback mode, not the configured Pro model', () => {
+describe("fallback mode display", () => {
+  it("should display Flash model when in fallback mode, not the configured Pro model", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 120,
       uiState: {
         sessionStats: mockSessionStats,
-        currentModel: 'gemini-2.5-flash', // Fallback active, showing Flash
+        currentModel: "gemini-2.5-flash", // Fallback active, showing Flash
       },
     });
 
     // Footer should show the effective model (Flash), not the config model (Pro)
-    expect(lastFrame()).toContain('gemini-2.5-flash');
-    expect(lastFrame()).not.toContain('gemini-2.5-pro');
+    expect(lastFrame()).toContain("gemini-2.5-flash");
+    expect(lastFrame()).not.toContain("gemini-2.5-pro");
   });
 
-  it('should display Pro model when NOT in fallback mode', () => {
+  it("should display Pro model when NOT in fallback mode", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 120,
       uiState: {
         sessionStats: mockSessionStats,
-        currentModel: 'gemini-2.5-pro', // Normal mode, showing Pro
+        currentModel: "gemini-2.5-pro", // Normal mode, showing Pro
       },
     });
 
-    expect(lastFrame()).toContain('gemini-2.5-pro');
+    expect(lastFrame()).toContain("gemini-2.5-pro");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/Footer.tsx b/packages/ui-gemini/src/ui/components/Footer.tsx
index 220a43b80..e08901335 100644
--- a/packages/ui-gemini/src/ui/components/Footer.tsx
+++ b/packages/ui-gemini/src/ui/components/Footer.tsx
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { shortenPath, tildeifyPath } from '@airiscode/gemini-cli-core';
-import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
-import process from 'node:process';
-import { ThemedGradient } from './ThemedGradient.js';
-import { MemoryUsageDisplay } from './MemoryUsageDisplay.js';
-import { ContextUsageDisplay } from './ContextUsageDisplay.js';
-import { DebugProfiler } from './DebugProfiler.js';
-import { isDevelopment } from '../../utils/installationInfo.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
+import process from "node:process";
+import { shortenPath, tildeifyPath } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { isDevelopment } from "../../utils/installationInfo.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
+import { theme } from "../semantic-colors.js";
+import { ConsoleSummaryDisplay } from "./ConsoleSummaryDisplay.js";
+import { ContextUsageDisplay } from "./ContextUsageDisplay.js";
+import { DebugProfiler } from "./DebugProfiler.js";
+import { MemoryUsageDisplay } from "./MemoryUsageDisplay.js";
+import { ThemedGradient } from "./ThemedGradient.js";
 
 export const Footer: React.FC = () => {
   const uiState = useUIState();
@@ -54,19 +54,16 @@ export const Footer: React.FC = () => {
     mainAreaWidth: uiState.mainAreaWidth,
   };
 
-  const showMemoryUsage =
-    config.getDebugMode() || settings.merged.ui?.showMemoryUsage || false;
+  const showMemoryUsage = config.getDebugMode() || settings.merged.ui?.showMemoryUsage || false;
   const hideCWD = settings.merged.ui?.footer?.hideCWD || false;
-  const hideSandboxStatus =
-    settings.merged.ui?.footer?.hideSandboxStatus || false;
+  const hideSandboxStatus = settings.merged.ui?.footer?.hideSandboxStatus || false;
   const hideModelInfo = settings.merged.ui?.footer?.hideModelInfo || false;
-  const hideContextPercentage =
-    settings.merged.ui?.footer?.hideContextPercentage ?? true;
+  const hideContextPercentage = settings.merged.ui?.footer?.hideContextPercentage ?? true;
 
   const pathLength = Math.max(20, Math.floor(mainAreaWidth * 0.25));
   const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
 
-  const justifyContent = hideCWD && hideModelInfo ? 'center' : 'space-between';
+  const justifyContent = hideCWD && hideModelInfo ? "center" : "space-between";
   const displayVimMode = vimEnabled ? vimMode : undefined;
 
   const showDebugProfiler = debugMode || isDevelopment;
@@ -82,9 +79,7 @@ export const Footer: React.FC = () => {
       {(showDebugProfiler || displayVimMode || !hideCWD) && (
         <Box>
           {showDebugProfiler && <DebugProfiler />}
-          {displayVimMode && (
-            <Text color={theme.text.secondary}>[{displayVimMode}] </Text>
-          )}
+          {displayVimMode && <Text color={theme.text.secondary}>[{displayVimMode}] </Text>}
           {!hideCWD &&
             (nightly ? (
               <ThemedGradient>
@@ -94,47 +89,29 @@ export const Footer: React.FC = () => {
             ) : (
               <Text color={theme.text.link}>
                 {displayPath}
-                {branchName && (
-                  <Text color={theme.text.secondary}> ({branchName}*)</Text>
-                )}
+                {branchName && <Text color={theme.text.secondary}> ({branchName}*)</Text>}
               </Text>
             ))}
-          {debugMode && (
-            <Text color={theme.status.error}>
-              {' ' + (debugMessage || '--debug')}
-            </Text>
-          )}
+          {debugMode && <Text color={theme.status.error}>{" " + (debugMessage || "--debug")}</Text>}
         </Box>
       )}
 
       {/* Middle Section: Centered Trust/Sandbox Info */}
       {!hideSandboxStatus && (
-        <Box
-          flexGrow={1}
-          alignItems="center"
-          justifyContent="center"
-          display="flex"
-        >
+        <Box flexGrow={1} alignItems="center" justifyContent="center" display="flex">
           {isTrustedFolder === false ? (
             <Text color={theme.status.warning}>untrusted</Text>
-          ) : process.env['SANDBOX'] &&
-            process.env['SANDBOX'] !== 'sandbox-exec' ? (
-            <Text color="green">
-              {process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '')}
-            </Text>
-          ) : process.env['SANDBOX'] === 'sandbox-exec' ? (
+          ) : process.env["SANDBOX"] && process.env["SANDBOX"] !== "sandbox-exec" ? (
+            <Text color="green">{process.env["SANDBOX"].replace(/^gemini-(?:cli-)?/, "")}</Text>
+          ) : process.env["SANDBOX"] === "sandbox-exec" ? (
             <Text color={theme.status.warning}>
-              macOS Seatbelt{' '}
-              <Text color={theme.text.secondary}>
-                ({process.env['SEATBELT_PROFILE']})
-              </Text>
+              macOS Seatbelt{" "}
+              <Text color={theme.text.secondary}>({process.env["SEATBELT_PROFILE"]})</Text>
             </Text>
           ) : (
             <Text color={theme.status.error}>
               no sandbox
-              {mainAreaWidth >= 100 && (
-                <Text color={theme.text.secondary}> (see /docs)</Text>
-              )}
+              {mainAreaWidth >= 100 && <Text color={theme.text.secondary}> (see /docs)</Text>}
             </Text>
           )}
         </Box>
@@ -148,7 +125,7 @@ export const Footer: React.FC = () => {
               {model}
               {!hideContextPercentage && (
                 <>
-                  {' '}
+                  {" "}
                   <ContextUsageDisplay
                     promptTokenCount={promptTokenCount}
                     model={model}
diff --git a/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.test.tsx b/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.test.tsx
index 891ccaf39..79ca7e6eb 100644
--- a/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.test.tsx
+++ b/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.test.tsx
@@ -4,31 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { GeminiRespondingSpinner } from './GeminiRespondingSpinner.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { useIsScreenReaderEnabled } from 'ink';
-import { StreamingState } from '../types.js';
-import {
-  SCREEN_READER_LOADING,
-  SCREEN_READER_RESPONDING,
-} from '../textConstants.js';
+import { useIsScreenReaderEnabled } from "ink";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { SCREEN_READER_LOADING, SCREEN_READER_RESPONDING } from "../textConstants.js";
+import { StreamingState } from "../types.js";
+import { GeminiRespondingSpinner } from "./GeminiRespondingSpinner.js";
 
-vi.mock('../contexts/StreamingContext.js');
-vi.mock('ink', async () => {
-  const actual = await vi.importActual('ink');
+vi.mock("../contexts/StreamingContext.js");
+vi.mock("ink", async () => {
+  const actual = await vi.importActual("ink");
   return {
     ...actual,
     useIsScreenReaderEnabled: vi.fn(),
   };
 });
 
-vi.mock('./CliSpinner.js', () => ({
-  CliSpinner: () => 'Spinner',
+vi.mock("./CliSpinner.js", () => ({
+  CliSpinner: () => "Spinner",
 }));
 
-describe('GeminiRespondingSpinner', () => {
+describe("GeminiRespondingSpinner", () => {
   const mockUseStreamingContext = vi.mocked(useStreamingContext);
   const mockUseIsScreenReaderEnabled = vi.mocked(useIsScreenReaderEnabled);
 
@@ -37,40 +34,36 @@ describe('GeminiRespondingSpinner', () => {
     mockUseIsScreenReaderEnabled.mockReturnValue(false);
   });
 
-  it('renders spinner when responding', () => {
+  it("renders spinner when responding", () => {
     mockUseStreamingContext.mockReturnValue(StreamingState.Responding);
     const { lastFrame } = render(<GeminiRespondingSpinner />);
     // Spinner output varies, but it shouldn't be empty
-    expect(lastFrame()).not.toBe('');
+    expect(lastFrame()).not.toBe("");
   });
 
-  it('renders screen reader text when responding and screen reader enabled', () => {
+  it("renders screen reader text when responding and screen reader enabled", () => {
     mockUseStreamingContext.mockReturnValue(StreamingState.Responding);
     mockUseIsScreenReaderEnabled.mockReturnValue(true);
     const { lastFrame } = render(<GeminiRespondingSpinner />);
     expect(lastFrame()).toContain(SCREEN_READER_RESPONDING);
   });
 
-  it('renders nothing when not responding and no non-responding display', () => {
+  it("renders nothing when not responding and no non-responding display", () => {
     mockUseStreamingContext.mockReturnValue(StreamingState.Idle);
     const { lastFrame } = render(<GeminiRespondingSpinner />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('renders non-responding display when provided', () => {
+  it("renders non-responding display when provided", () => {
     mockUseStreamingContext.mockReturnValue(StreamingState.Idle);
-    const { lastFrame } = render(
-      <GeminiRespondingSpinner nonRespondingDisplay="Waiting..." />,
-    );
-    expect(lastFrame()).toContain('Waiting...');
+    const { lastFrame } = render(<GeminiRespondingSpinner nonRespondingDisplay="Waiting..." />);
+    expect(lastFrame()).toContain("Waiting...");
   });
 
-  it('renders screen reader loading text when non-responding display provided and screen reader enabled', () => {
+  it("renders screen reader loading text when non-responding display provided and screen reader enabled", () => {
     mockUseStreamingContext.mockReturnValue(StreamingState.Idle);
     mockUseIsScreenReaderEnabled.mockReturnValue(true);
-    const { lastFrame } = render(
-      <GeminiRespondingSpinner nonRespondingDisplay="Waiting..." />,
-    );
+    const { lastFrame } = render(<GeminiRespondingSpinner nonRespondingDisplay="Waiting..." />);
     expect(lastFrame()).toContain(SCREEN_READER_LOADING);
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.tsx b/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.tsx
index 8565ae5d3..e55647cee 100644
--- a/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.tsx
+++ b/packages/ui-gemini/src/ui/components/GeminiRespondingSpinner.tsx
@@ -4,17 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, useIsScreenReaderEnabled } from 'ink';
-import { CliSpinner } from './CliSpinner.js';
-import type { SpinnerName } from 'cli-spinners';
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
-import {
-  SCREEN_READER_LOADING,
-  SCREEN_READER_RESPONDING,
-} from '../textConstants.js';
-import { theme } from '../semantic-colors.js';
+import type { SpinnerName } from "cli-spinners";
+import { Text, useIsScreenReaderEnabled } from "ink";
+import type React from "react";
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { theme } from "../semantic-colors.js";
+import { SCREEN_READER_LOADING, SCREEN_READER_RESPONDING } from "../textConstants.js";
+import { StreamingState } from "../types.js";
+import { CliSpinner } from "./CliSpinner.js";
 
 interface GeminiRespondingSpinnerProps {
   /**
@@ -25,18 +22,14 @@ interface GeminiRespondingSpinnerProps {
   spinnerType?: SpinnerName;
 }
 
-export const GeminiRespondingSpinner: React.FC<
-  GeminiRespondingSpinnerProps
-> = ({ nonRespondingDisplay, spinnerType = 'dots' }) => {
+export const GeminiRespondingSpinner: React.FC<GeminiRespondingSpinnerProps> = ({
+  nonRespondingDisplay,
+  spinnerType = "dots",
+}) => {
   const streamingState = useStreamingContext();
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
   if (streamingState === StreamingState.Responding) {
-    return (
-      <GeminiSpinner
-        spinnerType={spinnerType}
-        altText={SCREEN_READER_RESPONDING}
-      />
-    );
+    return <GeminiSpinner spinnerType={spinnerType} altText={SCREEN_READER_RESPONDING} />;
   } else if (nonRespondingDisplay) {
     return isScreenReaderEnabled ? (
       <Text>{SCREEN_READER_LOADING}</Text>
@@ -52,10 +45,7 @@ interface GeminiSpinnerProps {
   altText?: string;
 }
 
-export const GeminiSpinner: React.FC<GeminiSpinnerProps> = ({
-  spinnerType = 'dots',
-  altText,
-}) => {
+export const GeminiSpinner: React.FC<GeminiSpinnerProps> = ({ spinnerType = "dots", altText }) => {
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
   return isScreenReaderEnabled ? (
     <Text>{altText}</Text>
diff --git a/packages/ui-gemini/src/ui/components/GradientRegression.test.tsx b/packages/ui-gemini/src/ui/components/GradientRegression.test.tsx
index ab0990b37..576c8837f 100644
--- a/packages/ui-gemini/src/ui/components/GradientRegression.test.tsx
+++ b/packages/ui-gemini/src/ui/components/GradientRegression.test.tsx
@@ -4,20 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { renderWithProviders } from '../../test-utils/render.js';
-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 { Header } from './Header.js';
-import { ModelDialog } from './ModelDialog.js';
-import { StatsDisplay } from './StatsDisplay.js';
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import type { SessionStatsState } from "../contexts/SessionContext.js";
+import * as SessionContext from "../contexts/SessionContext.js";
+import { Banner } from "./Banner.js";
+import { Footer } from "./Footer.js";
+import { Header } from "./Header.js";
+import { ModelDialog } from "./ModelDialog.js";
+import { StatsDisplay } from "./StatsDisplay.js";
 
 // Mock the theme module
-vi.mock('../semantic-colors.js', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('../semantic-colors.js')>();
+vi.mock("../semantic-colors.js", async (importOriginal) => {
+  const original = await importOriginal<typeof import("../semantic-colors.js")>();
   return {
     ...original,
     theme: {
@@ -31,7 +30,7 @@ vi.mock('../semantic-colors.js', async (importOriginal) => {
 });
 
 // Mock the context to provide controlled data for testing
-vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
+vi.mock("../contexts/SessionContext.js", async (importOriginal) => {
   const actual = await importOriginal<typeof SessionContext>();
   return {
     ...actual,
@@ -40,7 +39,7 @@ vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
 });
 
 const mockSessionStats: SessionStatsState = {
-  sessionId: 'test-session',
+  sessionId: "test-session",
   sessionStartTime: new Date(),
   lastPromptTokenCount: 0,
   promptCount: 0,
@@ -65,28 +64,22 @@ useSessionStatsMock.mockReturnValue({
   startNewPrompt: vi.fn(),
 });
 
-describe('Gradient Crash Regression Tests', () => {
-  it('<Header /> should not crash when theme.ui.gradient is empty', () => {
-    const { lastFrame } = renderWithProviders(
-      <Header version="1.0.0" nightly={false} />,
-      {
-        width: 120,
-      },
-    );
+describe("Gradient Crash Regression Tests", () => {
+  it("<Header /> should not crash when theme.ui.gradient is empty", () => {
+    const { lastFrame } = renderWithProviders(<Header version="1.0.0" nightly={false} />, {
+      width: 120,
+    });
     expect(lastFrame()).toBeDefined();
   });
 
-  it('<ModelDialog /> should not crash when theme.ui.gradient is empty', () => {
-    const { lastFrame } = renderWithProviders(
-      <ModelDialog onClose={() => {}} />,
-      {
-        width: 120,
-      },
-    );
+  it("<ModelDialog /> should not crash when theme.ui.gradient is empty", () => {
+    const { lastFrame } = renderWithProviders(<ModelDialog onClose={() => {}} />, {
+      width: 120,
+    });
     expect(lastFrame()).toBeDefined();
   });
 
-  it('<Banner /> should not crash when theme.ui.gradient is empty', () => {
+  it("<Banner /> should not crash when theme.ui.gradient is empty", () => {
     const { lastFrame } = renderWithProviders(
       <Banner bannerText="Test Banner" isWarning={false} width={80} />,
       {
@@ -96,7 +89,7 @@ describe('Gradient Crash Regression Tests', () => {
     expect(lastFrame()).toBeDefined();
   });
 
-  it('<Footer /> should not crash when theme.ui.gradient has only one color (or empty) and nightly is true', () => {
+  it("<Footer /> should not crash when theme.ui.gradient has only one color (or empty) and nightly is true", () => {
     const { lastFrame } = renderWithProviders(<Footer />, {
       width: 120,
       uiState: {
@@ -107,21 +100,18 @@ describe('Gradient Crash Regression Tests', () => {
     // If it crashes, this line won't be reached or lastFrame() will throw
     expect(lastFrame()).toBeDefined();
     // It should fall back to rendering text without gradient
-    expect(lastFrame()).not.toContain('Gradient');
+    expect(lastFrame()).not.toContain("Gradient");
   });
 
-  it('<StatsDisplay /> should not crash when theme.ui.gradient is empty', () => {
-    const { lastFrame } = renderWithProviders(
-      <StatsDisplay duration="1s" title="My Stats" />,
-      {
-        width: 120,
-        uiState: {
-          sessionStats: mockSessionStats,
-        },
+  it("<StatsDisplay /> should not crash when theme.ui.gradient is empty", () => {
+    const { lastFrame } = renderWithProviders(<StatsDisplay duration="1s" title="My Stats" />, {
+      width: 120,
+      uiState: {
+        sessionStats: mockSessionStats,
       },
-    );
+    });
     expect(lastFrame()).toBeDefined();
     // Ensure title is rendered
-    expect(lastFrame()).toContain('My Stats');
+    expect(lastFrame()).toContain("My Stats");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/Header.test.tsx b/packages/ui-gemini/src/ui/components/Header.test.tsx
index ecf1adf8b..4c04abaf5 100644
--- a/packages/ui-gemini/src/ui/components/Header.test.tsx
+++ b/packages/ui-gemini/src/ui/components/Header.test.tsx
@@ -4,45 +4,43 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { Header } from './Header.js';
-import * as useTerminalSize from '../hooks/useTerminalSize.js';
-import { longAsciiLogo, longAsciiLogoIde } from './AsciiArt.js';
-import * as semanticColors from '../semantic-colors.js';
-import * as terminalSetup from '../utils/terminalSetup.js';
-import { Text } from 'ink';
-import type React from 'react';
+import { Text } from "ink";
+import type React from "react";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import * as useTerminalSize from "../hooks/useTerminalSize.js";
+import * as semanticColors from "../semantic-colors.js";
+import * as terminalSetup from "../utils/terminalSetup.js";
+import { longAsciiLogo, longAsciiLogoIde } from "./AsciiArt.js";
+import { Header } from "./Header.js";
 
-vi.mock('../hooks/useTerminalSize.js');
-vi.mock('../utils/terminalSetup.js', () => ({
+vi.mock("../hooks/useTerminalSize.js");
+vi.mock("../utils/terminalSetup.js", () => ({
   getTerminalProgram: vi.fn(),
 }));
-vi.mock('ink-gradient', () => {
-  const MockGradient = ({ children }: { children: React.ReactNode }) => (
-    <>{children}</>
-  );
+vi.mock("ink-gradient", () => {
+  const MockGradient = ({ children }: { children: React.ReactNode }) => <>{children}</>;
   return {
     default: vi.fn(MockGradient),
   };
 });
-vi.mock('../semantic-colors.js');
-vi.mock('ink', async () => {
-  const originalInk = await vi.importActual<typeof import('ink')>('ink');
+vi.mock("../semantic-colors.js");
+vi.mock("ink", async () => {
+  const originalInk = await vi.importActual<typeof import("ink")>("ink");
   return {
     ...originalInk,
     Text: vi.fn(originalInk.Text),
   };
 });
 
-describe('<Header />', () => {
+describe("<Header />", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue(null);
   });
 
-  it('renders the long logo on a wide terminal', () => {
-    vi.spyOn(useTerminalSize, 'useTerminalSize').mockReturnValue({
+  it("renders the long logo on a wide terminal", () => {
+    vi.spyOn(useTerminalSize, "useTerminalSize").mockReturnValue({
       columns: 120,
       rows: 20,
     });
@@ -55,12 +53,12 @@ describe('<Header />', () => {
     );
   });
 
-  it('uses the IDE logo when running in an IDE', () => {
-    vi.spyOn(useTerminalSize, 'useTerminalSize').mockReturnValue({
+  it("uses the IDE logo when running in an IDE", () => {
+    vi.spyOn(useTerminalSize, "useTerminalSize").mockReturnValue({
       columns: 120,
       rows: 20,
     });
-    vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue('vscode');
+    vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue("vscode");
 
     render(<Header version="1.0.0" nightly={false} />);
     expect(Text).toHaveBeenCalledWith(
@@ -71,11 +69,9 @@ describe('<Header />', () => {
     );
   });
 
-  it('renders custom ASCII art when provided', () => {
-    const customArt = 'CUSTOM ART';
-    render(
-      <Header version="1.0.0" nightly={false} customAsciiArt={customArt} />,
-    );
+  it("renders custom ASCII art when provided", () => {
+    const customArt = "CUSTOM ART";
+    render(<Header version="1.0.0" nightly={false} customAsciiArt={customArt} />);
     expect(Text).toHaveBeenCalledWith(
       expect.objectContaining({
         children: customArt,
@@ -84,12 +80,10 @@ describe('<Header />', () => {
     );
   });
 
-  it('renders custom ASCII art as is when running in an IDE', () => {
-    const customArt = 'CUSTOM ART';
-    vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue('vscode');
-    render(
-      <Header version="1.0.0" nightly={false} customAsciiArt={customArt} />,
-    );
+  it("renders custom ASCII art as is when running in an IDE", () => {
+    const customArt = "CUSTOM ART";
+    vi.mocked(terminalSetup.getTerminalProgram).mockReturnValue("vscode");
+    render(<Header version="1.0.0" nightly={false} customAsciiArt={customArt} />);
     expect(Text).toHaveBeenCalledWith(
       expect.objectContaining({
         children: customArt,
@@ -98,78 +92,78 @@ describe('<Header />', () => {
     );
   });
 
-  it('displays the version number when nightly is true', () => {
+  it("displays the version number when nightly is true", () => {
     render(<Header version="1.0.0" nightly={true} />);
     const textCalls = (Text as Mock).mock.calls;
-    expect(textCalls[1][0].children.join('')).toBe('v1.0.0');
+    expect(textCalls[1][0].children.join("")).toBe("v1.0.0");
   });
 
-  it('does not display the version number when nightly is false', () => {
+  it("does not display the version number when nightly is false", () => {
     render(<Header version="1.0.0" nightly={false} />);
     expect(Text).not.toHaveBeenCalledWith(
       expect.objectContaining({
-        children: 'v1.0.0',
+        children: "v1.0.0",
       }),
       undefined,
     );
   });
 
-  it('renders with no gradient when theme.ui.gradient is undefined', async () => {
-    vi.spyOn(semanticColors, 'theme', 'get').mockReturnValue({
+  it("renders with no gradient when theme.ui.gradient is undefined", async () => {
+    vi.spyOn(semanticColors, "theme", "get").mockReturnValue({
       text: {
-        primary: '',
-        secondary: '',
-        link: '',
-        accent: '#123456',
-        response: '',
+        primary: "",
+        secondary: "",
+        link: "",
+        accent: "#123456",
+        response: "",
       },
       background: {
-        primary: '',
-        diff: { added: '', removed: '' },
+        primary: "",
+        diff: { added: "", removed: "" },
       },
       border: {
-        default: '',
-        focused: '',
+        default: "",
+        focused: "",
       },
       ui: {
-        comment: '',
-        symbol: '',
-        dark: '',
+        comment: "",
+        symbol: "",
+        dark: "",
         gradient: undefined,
       },
       status: {
-        error: '',
-        success: '',
-        warning: '',
+        error: "",
+        success: "",
+        warning: "",
       },
     });
-    const Gradient = await import('ink-gradient');
+    const Gradient = await import("ink-gradient");
     render(<Header version="1.0.0" nightly={false} />);
     expect(Gradient.default).not.toHaveBeenCalled();
     const textCalls = (Text as Mock).mock.calls;
-    expect(textCalls[0][0]).toHaveProperty('color', '#123456');
+    expect(textCalls[0][0]).toHaveProperty("color", "#123456");
   });
 
-  it('renders with a single color when theme.ui.gradient has one color', async () => {
-    const singleColor = '#FF0000';
-    vi.spyOn(semanticColors, 'theme', 'get').mockReturnValue({
+  it("renders with a single color when theme.ui.gradient has one color", async () => {
+    const singleColor = "#FF0000";
+    vi.spyOn(semanticColors, "theme", "get").mockReturnValue({
       ui: { gradient: [singleColor] },
     } as typeof semanticColors.theme);
-    const Gradient = await import('ink-gradient');
+    const Gradient = await import("ink-gradient");
     render(<Header version="1.0.0" nightly={false} />);
     expect(Gradient.default).not.toHaveBeenCalled();
     const textCalls = (Text as Mock).mock.calls;
     console.log(JSON.stringify(textCalls, null, 2));
     expect(textCalls.length).toBe(1);
-    expect(textCalls[0][0]).toHaveProperty('color', singleColor);
+    expect(textCalls[0][0]).toHaveProperty("color", singleColor);
   });
 
-  it('renders with a gradient when theme.ui.gradient has two or more colors', async () => {
-    const gradientColors = ['#FF0000', '#00FF00'];
-    vi.spyOn(semanticColors, 'theme', 'get').mockReturnValue({
+  it("renders with a gradient when theme.ui.gradient has two or more colors", async () => {
+    const gradientColors = ["#FF0000", "#00FF00"];
+    vi.spyOn(semanticColors, "theme", "get").mockReturnValue({
       ui: { gradient: gradientColors },
     } as typeof semanticColors.theme);
-    const Gradient = await import('ink-gradient');
+    const Gradient = await import("ink-gradient");
     render(<Header version="1.0.0" nightly={false} />);
     expect(Gradient.default).toHaveBeenCalledWith(
       expect.objectContaining({
diff --git a/packages/ui-gemini/src/ui/components/Header.tsx b/packages/ui-gemini/src/ui/components/Header.tsx
index 8fd773be4..75d77b1bb 100644
--- a/packages/ui-gemini/src/ui/components/Header.tsx
+++ b/packages/ui-gemini/src/ui/components/Header.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box } from 'ink';
-import { ThemedGradient } from './ThemedGradient.js';
+import { Box } from "ink";
+import type React from "react";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { getTerminalProgram } from "../utils/terminalSetup.js";
+import { getAsciiArtWidth } from "../utils/textUtils.js";
 import {
-  shortAsciiLogo,
   longAsciiLogo,
-  tinyAsciiLogo,
-  shortAsciiLogoIde,
   longAsciiLogoIde,
+  shortAsciiLogo,
+  shortAsciiLogoIde,
+  tinyAsciiLogo,
   tinyAsciiLogoIde,
-} from './AsciiArt.js';
-import { getAsciiArtWidth } from '../utils/textUtils.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { getTerminalProgram } from '../utils/terminalSetup.js';
+} from "./AsciiArt.js";
+import { ThemedGradient } from "./ThemedGradient.js";
 
 interface HeaderProps {
   customAsciiArt?: string; // For user-defined ASCII art
@@ -25,11 +25,7 @@ interface HeaderProps {
   nightly: boolean;
 }
 
-export const Header: React.FC<HeaderProps> = ({
-  customAsciiArt,
-  version,
-  nightly,
-}) => {
+export const Header: React.FC<HeaderProps> = ({ customAsciiArt, version, nightly }) => {
   const { columns: terminalWidth } = useTerminalSize();
   const isIde = getTerminalProgram();
   let displayTitle;
@@ -49,12 +45,7 @@ export const Header: React.FC<HeaderProps> = ({
   const artWidth = getAsciiArtWidth(displayTitle);
 
   return (
-    <Box
-      alignItems="flex-start"
-      width={artWidth}
-      flexShrink={0}
-      flexDirection="column"
-    >
+    <Box alignItems="flex-start" width={artWidth} flexShrink={0} flexDirection="column">
       <ThemedGradient>{displayTitle}</ThemedGradient>
       {nightly && (
         <Box width="100%" flexDirection="row" justifyContent="flex-end">
diff --git a/packages/ui-gemini/src/ui/components/Help.test.tsx b/packages/ui-gemini/src/ui/components/Help.test.tsx
index 6a2907350..5535ec535 100644
--- a/packages/ui-gemini/src/ui/components/Help.test.tsx
+++ b/packages/ui-gemini/src/ui/components/Help.test.tsx
@@ -4,37 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect } from 'vitest';
-import { Help } from './Help.js';
-import type { SlashCommand } from '../commands/types.js';
-import { CommandKind } from '../commands/types.js';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { SlashCommand } from "../commands/types.js";
+import { CommandKind } from "../commands/types.js";
+import { Help } from "./Help.js";
 
 const mockCommands: readonly SlashCommand[] = [
   {
-    name: 'test',
-    description: 'A test command',
+    name: "test",
+    description: "A test command",
     kind: CommandKind.BUILT_IN,
   },
   {
-    name: 'hidden',
-    description: 'A hidden command',
+    name: "hidden",
+    description: "A hidden command",
     hidden: true,
     kind: CommandKind.BUILT_IN,
   },
   {
-    name: 'parent',
-    description: 'A parent command',
+    name: "parent",
+    description: "A parent command",
     kind: CommandKind.BUILT_IN,
     subCommands: [
       {
-        name: 'visible-child',
-        description: 'A visible child command',
+        name: "visible-child",
+        description: "A visible child command",
         kind: CommandKind.BUILT_IN,
       },
       {
-        name: 'hidden-child',
-        description: 'A hidden child command',
+        name: "hidden-child",
+        description: "A hidden child command",
         hidden: true,
         kind: CommandKind.BUILT_IN,
       },
@@ -42,33 +42,33 @@ const mockCommands: readonly SlashCommand[] = [
   },
 ];
 
-describe('Help Component', () => {
-  it('should not render hidden commands', () => {
+describe("Help Component", () => {
+  it("should not render hidden commands", () => {
     const { lastFrame, unmount } = render(<Help commands={mockCommands} />);
     const output = lastFrame();
 
-    expect(output).toContain('/test');
-    expect(output).not.toContain('/hidden');
+    expect(output).toContain("/test");
+    expect(output).not.toContain("/hidden");
     unmount();
   });
 
-  it('should not render hidden subcommands', () => {
+  it("should not render hidden subcommands", () => {
     const { lastFrame, unmount } = render(<Help commands={mockCommands} />);
     const output = lastFrame();
 
-    expect(output).toContain('visible-child');
-    expect(output).not.toContain('hidden-child');
+    expect(output).toContain("visible-child");
+    expect(output).not.toContain("hidden-child");
     unmount();
   });
 
-  it('should render keyboard shortcuts', () => {
+  it("should render keyboard shortcuts", () => {
     const { lastFrame, unmount } = render(<Help commands={mockCommands} />);
     const output = lastFrame();
 
-    expect(output).toContain('Keyboard Shortcuts:');
-    expect(output).toContain('Ctrl+C');
-    expect(output).toContain('Ctrl+S');
-    expect(output).toContain('Page Up/Down');
+    expect(output).toContain("Keyboard Shortcuts:");
+    expect(output).toContain("Ctrl+C");
+    expect(output).toContain("Ctrl+S");
+    expect(output).toContain("Page Up/Down");
     unmount();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/Help.tsx b/packages/ui-gemini/src/ui/components/Help.tsx
index 385f7edfa..8edfdfb8b 100644
--- a/packages/ui-gemini/src/ui/components/Help.tsx
+++ b/packages/ui-gemini/src/ui/components/Help.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { type SlashCommand, CommandKind } from '../commands/types.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { CommandKind, type SlashCommand } from "../commands/types.js";
+import { theme } from "../semantic-colors.js";
 
 interface Help {
   commands: readonly SlashCommand[];
@@ -29,11 +29,11 @@ export const Help: React.FC<Help> = ({ commands }) => (
       <Text bold color={theme.text.accent}>
         Add context
       </Text>
-      : Use{' '}
+      : Use{" "}
       <Text bold color={theme.text.accent}>
         @
-      </Text>{' '}
-      to specify files for context (e.g.,{' '}
+      </Text>{" "}
+      to specify files for context (e.g.,{" "}
       <Text bold color={theme.text.accent}>
         @src/myFile.ts
       </Text>
@@ -43,15 +43,15 @@ export const Help: React.FC<Help> = ({ commands }) => (
       <Text bold color={theme.text.accent}>
         Shell mode
       </Text>
-      : Execute shell commands via{' '}
+      : Execute shell commands via{" "}
       <Text bold color={theme.text.accent}>
         !
-      </Text>{' '}
-      (e.g.,{' '}
+      </Text>{" "}
+      (e.g.,{" "}
       <Text bold color={theme.text.accent}>
         !npm run start
       </Text>
-      ) or use natural language (e.g.{' '}
+      ) or use natural language (e.g.{" "}
       <Text bold color={theme.text.accent}>
         start server
       </Text>
@@ -70,13 +70,13 @@ export const Help: React.FC<Help> = ({ commands }) => (
         <Box key={command.name} flexDirection="column">
           <Text color={theme.text.primary}>
             <Text bold color={theme.text.accent}>
-              {' '}
+              {" "}
               /{command.name}
             </Text>
             {command.kind === CommandKind.MCP_PROMPT && (
               <Text color={theme.text.secondary}> [MCP]</Text>
             )}
-            {command.description && ' - ' + command.description}
+            {command.description && " - " + command.description}
           </Text>
           {command.subCommands &&
             command.subCommands
@@ -84,24 +84,24 @@ export const Help: React.FC<Help> = ({ commands }) => (
               .map((subCommand) => (
                 <Text key={subCommand.name} color={theme.text.primary}>
                   <Text bold color={theme.text.accent}>
-                    {'   '}
+                    {"   "}
                     {subCommand.name}
                   </Text>
-                  {subCommand.description && ' - ' + subCommand.description}
+                  {subCommand.description && " - " + subCommand.description}
                 </Text>
               ))}
         </Box>
       ))}
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {' '}
-        !{' '}
+        {" "}
+        !{" "}
       </Text>
       - shell command
     </Text>
     <Text color={theme.text.primary}>
-      <Text color={theme.text.secondary}>[MCP]</Text> - Model Context Protocol
-      command (from external servers)
+      <Text color={theme.text.secondary}>[MCP]</Text> - Model Context Protocol command (from
+      external servers)
     </Text>
 
     <Box height={1} />
@@ -113,80 +113,80 @@ export const Help: React.FC<Help> = ({ commands }) => (
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Alt+Left/Right
-      </Text>{' '}
+      </Text>{" "}
       - Jump through words in the input
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Ctrl+C
-      </Text>{' '}
+      </Text>{" "}
       - Quit application
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {process.platform === 'win32' ? 'Ctrl+Enter' : 'Ctrl+J'}
-      </Text>{' '}
-      {process.platform === 'linux'
-        ? '- New line (Alt+Enter works for certain linux distros)'
-        : '- New line'}
+        {process.platform === "win32" ? "Ctrl+Enter" : "Ctrl+J"}
+      </Text>{" "}
+      {process.platform === "linux"
+        ? "- New line (Alt+Enter works for certain linux distros)"
+        : "- New line"}
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Ctrl+L
-      </Text>{' '}
+      </Text>{" "}
       - Clear the screen
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Ctrl+S
-      </Text>{' '}
+      </Text>{" "}
       - Enter selection mode to copy text
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
-        {process.platform === 'darwin' ? 'Ctrl+X / Meta+Enter' : 'Ctrl+X'}
-      </Text>{' '}
+        {process.platform === "darwin" ? "Ctrl+X / Meta+Enter" : "Ctrl+X"}
+      </Text>{" "}
       - Open input in external editor
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Ctrl+Y
-      </Text>{' '}
+      </Text>{" "}
       - Toggle YOLO mode
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Enter
-      </Text>{' '}
+      </Text>{" "}
       - Send message
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Esc
-      </Text>{' '}
+      </Text>{" "}
       - Cancel operation / Clear input (double press)
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Page Up/Down
-      </Text>{' '}
+      </Text>{" "}
       - Scroll page up/down
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Shift+Tab
-      </Text>{' '}
+      </Text>{" "}
       - Toggle auto-accepting edits
     </Text>
     <Text color={theme.text.primary}>
       <Text bold color={theme.text.accent}>
         Up/Down
-      </Text>{' '}
+      </Text>{" "}
       - Cycle through your prompt history
     </Text>
     <Box height={1} />
     <Text color={theme.text.primary}>
-      For a full list of shortcuts, see{' '}
+      For a full list of shortcuts, see{" "}
       <Text bold color={theme.text.accent}>
         docs/cli/keyboard-shortcuts.md
       </Text>
diff --git a/packages/ui-gemini/src/ui/components/HistoryItemDisplay.test.tsx b/packages/ui-gemini/src/ui/components/HistoryItemDisplay.test.tsx
index 2b524cd29..b0ffc11e2 100644
--- a/packages/ui-gemini/src/ui/components/HistoryItemDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/HistoryItemDisplay.test.tsx
@@ -4,24 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { HistoryItemDisplay } from './HistoryItemDisplay.js';
-import { type HistoryItem, ToolCallStatus } from '../types.js';
-import { MessageType } from '../types.js';
-import { SessionStatsProvider } from '../contexts/SessionContext.js';
-import type {
-  Config,
-  ToolExecuteConfirmationDetails,
-} from '@airiscode/gemini-cli-core';
-import { ToolGroupMessage } from './messages/ToolGroupMessage.js';
-import { renderWithProviders } from '../../test-utils/render.js';
+import type { Config, ToolExecuteConfirmationDetails } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { SessionStatsProvider } from "../contexts/SessionContext.js";
+import { type HistoryItem, MessageType, ToolCallStatus } from "../types.js";
+import { HistoryItemDisplay } from "./HistoryItemDisplay.js";
+import { ToolGroupMessage } from "./messages/ToolGroupMessage.js";
 
 // Mock child components
-vi.mock('./messages/ToolGroupMessage.js', () => ({
+vi.mock("./messages/ToolGroupMessage.js", () => ({
   ToolGroupMessage: vi.fn(() => <div />),
 }));
 
-describe('<HistoryItemDisplay />', () => {
+describe("<HistoryItemDisplay />", () => {
   const mockConfig = {} as unknown as Config;
   const baseItem = {
     id: 1,
@@ -35,155 +31,140 @@ describe('<HistoryItemDisplay />', () => {
     const item: HistoryItem = {
       ...baseItem,
       type: MessageType.USER,
-      text: 'Hello',
+      text: "Hello",
     };
-    const { lastFrame } = renderWithProviders(
-      <HistoryItemDisplay {...baseItem} item={item} />,
-    );
-    expect(lastFrame()).toContain('Hello');
+    const { lastFrame } = renderWithProviders(<HistoryItemDisplay {...baseItem} item={item} />);
+    expect(lastFrame()).toContain("Hello");
   });
 
   it('renders UserMessage for "user" type with slash command', () => {
     const item: HistoryItem = {
       ...baseItem,
       type: MessageType.USER,
-      text: '/theme',
+      text: "/theme",
     };
-    const { lastFrame } = renderWithProviders(
-      <HistoryItemDisplay {...baseItem} item={item} />,
-    );
-    expect(lastFrame()).toContain('/theme');
+    const { lastFrame } = renderWithProviders(<HistoryItemDisplay {...baseItem} item={item} />);
+    expect(lastFrame()).toContain("/theme");
   });
 
-  it.each([true, false])(
-    'renders InfoMessage for "info" type with multi-line text (alternateBuffer=%s)',
-    (useAlternateBuffer) => {
-      const item: HistoryItem = {
-        ...baseItem,
-        type: MessageType.INFO,
-        text: '⚡ Line 1\n⚡ Line 2\n⚡ Line 3',
-      };
-      const { lastFrame } = renderWithProviders(
-        <HistoryItemDisplay {...baseItem} item={item} />,
-        { useAlternateBuffer },
-      );
-      expect(lastFrame()).toMatchSnapshot();
-    },
-  );
+  it.each([
+    true,
+    false,
+  ])('renders InfoMessage for "info" type with multi-line text (alternateBuffer=%s)', (useAlternateBuffer) => {
+    const item: HistoryItem = {
+      ...baseItem,
+      type: MessageType.INFO,
+      text: "⚡ Line 1\n⚡ Line 2\n⚡ Line 3",
+    };
+    const { lastFrame } = renderWithProviders(<HistoryItemDisplay {...baseItem} item={item} />, {
+      useAlternateBuffer,
+    });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
   it('renders StatsDisplay for "stats" type', () => {
     const item: HistoryItem = {
       ...baseItem,
       type: MessageType.STATS,
-      duration: '1s',
+      duration: "1s",
     };
     const { lastFrame } = renderWithProviders(
       <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );
-    expect(lastFrame()).toContain('Stats');
+    expect(lastFrame()).toContain("Stats");
   });
 
   it('renders AboutBox for "about" type', () => {
     const item: HistoryItem = {
       ...baseItem,
       type: MessageType.ABOUT,
-      cliVersion: '1.0.0',
-      osVersion: 'test-os',
-      sandboxEnv: 'test-env',
-      modelVersion: 'test-model',
-      selectedAuthType: 'test-auth',
-      gcpProject: 'test-project',
-      ideClient: 'test-ide',
+      cliVersion: "1.0.0",
+      osVersion: "test-os",
+      sandboxEnv: "test-env",
+      modelVersion: "test-model",
+      selectedAuthType: "test-auth",
+      gcpProject: "test-project",
+      ideClient: "test-ide",
     };
-    const { lastFrame } = renderWithProviders(
-      <HistoryItemDisplay {...baseItem} item={item} />,
-    );
-    expect(lastFrame()).toContain('About Gemini CLI');
+    const { lastFrame } = renderWithProviders(<HistoryItemDisplay {...baseItem} item={item} />);
+    expect(lastFrame()).toContain("About Gemini CLI");
   });
 
   it('renders ModelStatsDisplay for "model_stats" type', () => {
     const item: HistoryItem = {
       ...baseItem,
-      type: 'model_stats',
+      type: "model_stats",
     };
     const { lastFrame } = renderWithProviders(
       <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );
-    expect(lastFrame()).toContain(
-      'No API calls have been made in this session.',
-    );
+    expect(lastFrame()).toContain("No API calls have been made in this session.");
   });
 
   it('renders ToolStatsDisplay for "tool_stats" type', () => {
     const item: HistoryItem = {
       ...baseItem,
-      type: 'tool_stats',
+      type: "tool_stats",
     };
     const { lastFrame } = renderWithProviders(
       <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );
-    expect(lastFrame()).toContain(
-      'No tool calls have been made in this session.',
-    );
+    expect(lastFrame()).toContain("No tool calls have been made in this session.");
   });
 
   it('renders SessionSummaryDisplay for "quit" type', () => {
     const item: HistoryItem = {
       ...baseItem,
-      type: 'quit',
-      duration: '1s',
+      type: "quit",
+      duration: "1s",
     };
     const { lastFrame } = renderWithProviders(
       <SessionStatsProvider>
         <HistoryItemDisplay {...baseItem} item={item} />
       </SessionStatsProvider>,
     );
-    expect(lastFrame()).toContain('Agent powering down. Goodbye!');
+    expect(lastFrame()).toContain("Agent powering down. Goodbye!");
   });
 
-  it('should escape ANSI codes in text content', () => {
+  it("should escape ANSI codes in text content", () => {
     const historyItem: HistoryItem = {
       id: 1,
-      type: 'user',
-      text: 'Hello, \u001b[31mred\u001b[0m world!',
+      type: "user",
+      text: "Hello, \u001b[31mred\u001b[0m world!",
     };
 
     const { lastFrame } = renderWithProviders(
-      <HistoryItemDisplay
-        item={historyItem}
-        terminalWidth={80}
-        isPending={false}
-      />,
+      <HistoryItemDisplay item={historyItem} terminalWidth={80} isPending={false} />,
     );
 
     // The ANSI codes should be escaped for display.
-    expect(lastFrame()).toContain('Hello, \\u001b[31mred\\u001b[0m world!');
+    expect(lastFrame()).toContain("Hello, \\u001b[31mred\\u001b[0m world!");
     // The raw ANSI codes should not be present.
-    expect(lastFrame()).not.toContain('Hello, \u001b[31mred\u001b[0m world!');
+    expect(lastFrame()).not.toContain("Hello, \u001b[31mred\u001b[0m world!");
   });
 
-  it('should escape ANSI codes in tool confirmation details', () => {
+  it("should escape ANSI codes in tool confirmation details", () => {
     const historyItem: HistoryItem = {
       id: 1,
-      type: 'tool_group',
+      type: "tool_group",
       tools: [
         {
-          callId: '123',
-          name: 'run_shell_command',
-          description: 'Run a shell command',
-          resultDisplay: 'blank',
+          callId: "123",
+          name: "run_shell_command",
+          description: "Run a shell command",
+          resultDisplay: "blank",
           status: ToolCallStatus.Confirming,
           confirmationDetails: {
-            type: 'exec',
-            title: 'Run Shell Command',
+            type: "exec",
+            title: "Run Shell Command",
             command: 'echo "\u001b[31mhello\u001b[0m"',
-            rootCommand: 'echo',
+            rootCommand: "echo",
             onConfirm: async () => {},
           },
         },
@@ -191,108 +172,99 @@ describe('<HistoryItemDisplay />', () => {
     };
 
     renderWithProviders(
-      <HistoryItemDisplay
-        item={historyItem}
-        terminalWidth={80}
-        isPending={false}
-      />,
+      <HistoryItemDisplay item={historyItem} terminalWidth={80} isPending={false} />,
     );
 
     const passedProps = vi.mocked(ToolGroupMessage).mock.calls[0][0];
     const confirmationDetails = passedProps.toolCalls[0]
       .confirmationDetails as ToolExecuteConfirmationDetails;
 
-    expect(confirmationDetails.command).toBe(
-      'echo "\\u001b[31mhello\\u001b[0m"',
-    );
+    expect(confirmationDetails.command).toBe('echo "\\u001b[31mhello\\u001b[0m"');
   });
 
-  describe.each([true, false])(
-    'gemini items (alternateBuffer=%s)',
-    (useAlternateBuffer) => {
-      const longCode =
-        '# Example code block:\n' +
-        '```python\n' +
-        Array.from({ length: 50 }, (_, i) => `Line ${i + 1}`).join('\n') +
-        '\n```';
+  describe.each([true, false])("gemini items (alternateBuffer=%s)", (useAlternateBuffer) => {
+    const longCode =
+      "# Example code block:\n" +
+      "```python\n" +
+      Array.from({ length: 50 }, (_, i) => `Line ${i + 1}`).join("\n") +
+      "\n```";
 
-      it('should render a truncated gemini item', () => {
-        const item: HistoryItem = {
-          id: 1,
-          type: 'gemini',
-          text: longCode,
-        };
-        const { lastFrame } = renderWithProviders(
-          <HistoryItemDisplay
-            item={item}
-            isPending={false}
-            terminalWidth={80}
-            availableTerminalHeight={10}
-          />,
-          { useAlternateBuffer },
-        );
+    it("should render a truncated gemini item", () => {
+      const item: HistoryItem = {
+        id: 1,
+        type: "gemini",
+        text: longCode,
+      };
+      const { lastFrame } = renderWithProviders(
+        <HistoryItemDisplay
+          item={item}
+          isPending={false}
+          terminalWidth={80}
+          availableTerminalHeight={10}
+        />,
+        { useAlternateBuffer },
+      );
 
-        expect(lastFrame()).toMatchSnapshot();
-      });
+      expect(lastFrame()).toMatchSnapshot();
+    });
 
-      it('should render a full gemini item when using availableTerminalHeightGemini', () => {
-        const item: HistoryItem = {
-          id: 1,
-          type: 'gemini',
-          text: longCode,
-        };
-        const { lastFrame } = renderWithProviders(
-          <HistoryItemDisplay
-            item={item}
-            isPending={false}
-            terminalWidth={80}
-            availableTerminalHeight={10}
-            availableTerminalHeightGemini={Number.MAX_SAFE_INTEGER}
-          />,
-          { useAlternateBuffer },
-        );
+    it("should render a full gemini item when using availableTerminalHeightGemini", () => {
+      const item: HistoryItem = {
+        id: 1,
+        type: "gemini",
+        text: longCode,
+      };
+      const { lastFrame } = renderWithProviders(
+        <HistoryItemDisplay
+          item={item}
+          isPending={false}
+          terminalWidth={80}
+          availableTerminalHeight={10}
+          availableTerminalHeightGemini={Number.MAX_SAFE_INTEGER}
+        />,
+        { useAlternateBuffer },
+      );
 
-        expect(lastFrame()).toMatchSnapshot();
-      });
+      expect(lastFrame()).toMatchSnapshot();
+    });
 
-      it('should render a truncated gemini_content item', () => {
-        const item: HistoryItem = {
-          id: 1,
-          type: 'gemini_content',
-          text: longCode,
-        };
-        const { lastFrame } = renderWithProviders(
-          <HistoryItemDisplay
-            item={item}
-            isPending={false}
-            terminalWidth={80}
-            availableTerminalHeight={10}
-          />,
-          { useAlternateBuffer },
-        );
+    it("should render a truncated gemini_content item", () => {
+      const item: HistoryItem = {
+        id: 1,
+        type: "gemini_content",
+        text: longCode,
+      };
+      const { lastFrame } = renderWithProviders(
+        <HistoryItemDisplay
+          item={item}
+          isPending={false}
+          terminalWidth={80}
+          availableTerminalHeight={10}
+        />,
+        { useAlternateBuffer },
+      );
 
-        expect(lastFrame()).toMatchSnapshot();
-      });
+      expect(lastFrame()).toMatchSnapshot();
+    });
 
-      it('should render a full gemini_content item when using availableTerminalHeightGemini', () => {
-        const item: HistoryItem = {
-          id: 1,
-          type: 'gemini_content',
-          text: longCode,
-        };
-        const { lastFrame } = renderWithProviders(
-          <HistoryItemDisplay
-            item={item}
-            isPending={false}
-            terminalWidth={80}
-            availableTerminalHeight={10}
-            availableTerminalHeightGemini={Number.MAX_SAFE_INTEGER}
-          />,
-          { useAlternateBuffer },
-        );
+    it("should render a full gemini_content item when using availableTerminalHeightGemini", () => {
+      const item: HistoryItem = {
+        id: 1,
+        type: "gemini_content",
+        text: longCode,
+      };
+      const { lastFrame } = renderWithProviders(
+        <HistoryItemDisplay
+          item={item}
+          isPending={false}
+          terminalWidth={80}
+          availableTerminalHeight={10}
+          availableTerminalHeightGemini={Number.MAX_SAFE_INTEGER}
+        />,
+        { useAlternateBuffer },
+      );
 
-        expect(lastFrame()).toMatchSnapshot();
-      });
-    },
-  );
+      expect(lastFrame()).toMatchSnapshot();
+    });
+  });
 });
diff --git a/packages/ui-gemini/src/ui/components/HistoryItemDisplay.tsx b/packages/ui-gemini/src/ui/components/HistoryItemDisplay.tsx
index 7f20dfafe..889e96379 100644
--- a/packages/ui-gemini/src/ui/components/HistoryItemDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/HistoryItemDisplay.tsx
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useMemo } from 'react';
-import { escapeAnsiCtrlCodes } from '../utils/textUtils.js';
-import type { HistoryItem } from '../types.js';
-import { UserMessage } from './messages/UserMessage.js';
-import { UserShellMessage } from './messages/UserShellMessage.js';
-import { GeminiMessage } from './messages/GeminiMessage.js';
-import { InfoMessage } from './messages/InfoMessage.js';
-import { ErrorMessage } from './messages/ErrorMessage.js';
-import { ToolGroupMessage } from './messages/ToolGroupMessage.js';
-import { GeminiMessageContent } from './messages/GeminiMessageContent.js';
-import { CompressionMessage } from './messages/CompressionMessage.js';
-import { WarningMessage } from './messages/WarningMessage.js';
-import { Box } from 'ink';
-import { AboutBox } from './AboutBox.js';
-import { StatsDisplay } from './StatsDisplay.js';
-import { ModelStatsDisplay } from './ModelStatsDisplay.js';
-import { ToolStatsDisplay } from './ToolStatsDisplay.js';
-import { SessionSummaryDisplay } from './SessionSummaryDisplay.js';
-import { Help } from './Help.js';
-import type { SlashCommand } from '../commands/types.js';
-import { ExtensionsList } from './views/ExtensionsList.js';
-import { getMCPServerStatus } from '@airiscode/gemini-cli-core';
-import { ToolsList } from './views/ToolsList.js';
-import { McpStatus } from './views/McpStatus.js';
-import { ChatList } from './views/ChatList.js';
-import { HooksList } from './views/HooksList.js';
-import { ModelMessage } from './messages/ModelMessage.js';
+import { getMCPServerStatus } from "@airiscode/gemini-cli-core";
+import { Box } from "ink";
+import type React from "react";
+import { useMemo } from "react";
+import type { SlashCommand } from "../commands/types.js";
+import type { HistoryItem } from "../types.js";
+import { escapeAnsiCtrlCodes } from "../utils/textUtils.js";
+import { AboutBox } from "./AboutBox.js";
+import { Help } from "./Help.js";
+import { ModelStatsDisplay } from "./ModelStatsDisplay.js";
+import { CompressionMessage } from "./messages/CompressionMessage.js";
+import { ErrorMessage } from "./messages/ErrorMessage.js";
+import { GeminiMessage } from "./messages/GeminiMessage.js";
+import { GeminiMessageContent } from "./messages/GeminiMessageContent.js";
+import { InfoMessage } from "./messages/InfoMessage.js";
+import { ModelMessage } from "./messages/ModelMessage.js";
+import { ToolGroupMessage } from "./messages/ToolGroupMessage.js";
+import { UserMessage } from "./messages/UserMessage.js";
+import { UserShellMessage } from "./messages/UserShellMessage.js";
+import { WarningMessage } from "./messages/WarningMessage.js";
+import { SessionSummaryDisplay } from "./SessionSummaryDisplay.js";
+import { StatsDisplay } from "./StatsDisplay.js";
+import { ToolStatsDisplay } from "./ToolStatsDisplay.js";
+import { ChatList } from "./views/ChatList.js";
+import { ExtensionsList } from "./views/ExtensionsList.js";
+import { HooksList } from "./views/HooksList.js";
+import { McpStatus } from "./views/McpStatus.js";
+import { ToolsList } from "./views/ToolsList.js";
 
 interface HistoryItemDisplayProps {
   item: HistoryItem;
@@ -61,46 +61,36 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
   return (
     <Box flexDirection="column" key={itemForDisplay.id} width={terminalWidth}>
       {/* Render standard message types */}
-      {itemForDisplay.type === 'user' && (
+      {itemForDisplay.type === "user" && (
         <UserMessage text={itemForDisplay.text} width={terminalWidth} />
       )}
-      {itemForDisplay.type === 'user_shell' && (
-        <UserShellMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'gemini' && (
+      {itemForDisplay.type === "user_shell" && <UserShellMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "gemini" && (
         <GeminiMessage
           text={itemForDisplay.text}
           isPending={isPending}
-          availableTerminalHeight={
-            availableTerminalHeightGemini ?? availableTerminalHeight
-          }
+          availableTerminalHeight={availableTerminalHeightGemini ?? availableTerminalHeight}
           terminalWidth={terminalWidth}
         />
       )}
-      {itemForDisplay.type === 'gemini_content' && (
+      {itemForDisplay.type === "gemini_content" && (
         <GeminiMessageContent
           text={itemForDisplay.text}
           isPending={isPending}
-          availableTerminalHeight={
-            availableTerminalHeightGemini ?? availableTerminalHeight
-          }
+          availableTerminalHeight={availableTerminalHeightGemini ?? availableTerminalHeight}
           terminalWidth={terminalWidth}
         />
       )}
-      {itemForDisplay.type === 'info' && (
+      {itemForDisplay.type === "info" && (
         <InfoMessage
           text={itemForDisplay.text}
           icon={itemForDisplay.icon}
           color={itemForDisplay.color}
         />
       )}
-      {itemForDisplay.type === 'warning' && (
-        <WarningMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'error' && (
-        <ErrorMessage text={itemForDisplay.text} />
-      )}
-      {itemForDisplay.type === 'about' && (
+      {itemForDisplay.type === "warning" && <WarningMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "error" && <ErrorMessage text={itemForDisplay.text} />}
+      {itemForDisplay.type === "about" && (
         <AboutBox
           cliVersion={itemForDisplay.cliVersion}
           osVersion={itemForDisplay.osVersion}
@@ -112,24 +102,17 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
           userEmail={itemForDisplay.userEmail}
         />
       )}
-      {itemForDisplay.type === 'help' && commands && (
-        <Help commands={commands} />
-      )}
-      {itemForDisplay.type === 'stats' && (
-        <StatsDisplay
-          duration={itemForDisplay.duration}
-          quotas={itemForDisplay.quotas}
-        />
-      )}
-      {itemForDisplay.type === 'model_stats' && <ModelStatsDisplay />}
-      {itemForDisplay.type === 'tool_stats' && <ToolStatsDisplay />}
-      {itemForDisplay.type === 'model' && (
-        <ModelMessage model={itemForDisplay.model} />
+      {itemForDisplay.type === "help" && commands && <Help commands={commands} />}
+      {itemForDisplay.type === "stats" && (
+        <StatsDisplay duration={itemForDisplay.duration} quotas={itemForDisplay.quotas} />
       )}
-      {itemForDisplay.type === 'quit' && (
+      {itemForDisplay.type === "model_stats" && <ModelStatsDisplay />}
+      {itemForDisplay.type === "tool_stats" && <ToolStatsDisplay />}
+      {itemForDisplay.type === "model" && <ModelMessage model={itemForDisplay.model} />}
+      {itemForDisplay.type === "quit" && (
         <SessionSummaryDisplay duration={itemForDisplay.duration} />
       )}
-      {itemForDisplay.type === 'tool_group' && (
+      {itemForDisplay.type === "tool_group" && (
         <ToolGroupMessage
           toolCalls={itemForDisplay.tools}
           groupId={itemForDisplay.id}
@@ -140,28 +123,24 @@ export const HistoryItemDisplay: React.FC<HistoryItemDisplayProps> = ({
           embeddedShellFocused={embeddedShellFocused}
         />
       )}
-      {itemForDisplay.type === 'compression' && (
+      {itemForDisplay.type === "compression" && (
         <CompressionMessage compression={itemForDisplay.compression} />
       )}
-      {itemForDisplay.type === 'extensions_list' && (
+      {itemForDisplay.type === "extensions_list" && (
         <ExtensionsList extensions={itemForDisplay.extensions} />
       )}
-      {itemForDisplay.type === 'tools_list' && (
+      {itemForDisplay.type === "tools_list" && (
         <ToolsList
           terminalWidth={terminalWidth}
           tools={itemForDisplay.tools}
           showDescriptions={itemForDisplay.showDescriptions}
         />
       )}
-      {itemForDisplay.type === 'mcp_status' && (
+      {itemForDisplay.type === "mcp_status" && (
         <McpStatus {...itemForDisplay} serverStatus={getMCPServerStatus} />
       )}
-      {itemForDisplay.type === 'chat_list' && (
-        <ChatList chats={itemForDisplay.chats} />
-      )}
-      {itemForDisplay.type === 'hooks_list' && (
-        <HooksList hooks={itemForDisplay.hooks} />
-      )}
+      {itemForDisplay.type === "chat_list" && <ChatList chats={itemForDisplay.chats} />}
+      {itemForDisplay.type === "hooks_list" && <HooksList hooks={itemForDisplay.hooks} />}
     </Box>
   );
 };
diff --git a/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.test.tsx b/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.test.tsx
index 4f6309551..fbe3aeca4 100644
--- a/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.test.tsx
@@ -4,84 +4,68 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import * as processUtils from '../../utils/processUtils.js';
-import { renderWithProviders } from '../../test-utils/render.js';
-import { IdeTrustChangeDialog } from './IdeTrustChangeDialog.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import * as processUtils from "../../utils/processUtils.js";
+import { IdeTrustChangeDialog } from "./IdeTrustChangeDialog.js";
 
-describe('IdeTrustChangeDialog', () => {
+describe("IdeTrustChangeDialog", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('renders the correct message for CONNECTION_CHANGE', () => {
-    const { lastFrame } = renderWithProviders(
-      <IdeTrustChangeDialog reason="CONNECTION_CHANGE" />,
-    );
+  it("renders the correct message for CONNECTION_CHANGE", () => {
+    const { lastFrame } = renderWithProviders(<IdeTrustChangeDialog reason="CONNECTION_CHANGE" />);
 
     const frameText = lastFrame();
     expect(frameText).toContain(
-      'Workspace trust has changed due to a change in the IDE connection.',
+      "Workspace trust has changed due to a change in the IDE connection.",
     );
     expect(frameText).toContain("Press 'r' to restart Gemini");
   });
 
-  it('renders the correct message for TRUST_CHANGE', () => {
-    const { lastFrame } = renderWithProviders(
-      <IdeTrustChangeDialog reason="TRUST_CHANGE" />,
-    );
+  it("renders the correct message for TRUST_CHANGE", () => {
+    const { lastFrame } = renderWithProviders(<IdeTrustChangeDialog reason="TRUST_CHANGE" />);
 
     const frameText = lastFrame();
-    expect(frameText).toContain(
-      'Workspace trust has changed due to a change in the IDE trust.',
-    );
+    expect(frameText).toContain("Workspace trust has changed due to a change in the IDE trust.");
     expect(frameText).toContain("Press 'r' to restart Gemini");
   });
 
-  it('renders a generic message and logs an error for NONE reason', () => {
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
-    const { lastFrame } = renderWithProviders(
-      <IdeTrustChangeDialog reason="NONE" />,
-    );
+  it("renders a generic message and logs an error for NONE reason", () => {
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    const { lastFrame } = renderWithProviders(<IdeTrustChangeDialog reason="NONE" />);
 
     const frameText = lastFrame();
-    expect(frameText).toContain('Workspace trust has changed.');
+    expect(frameText).toContain("Workspace trust has changed.");
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       'IdeTrustChangeDialog rendered with unexpected reason "NONE"',
     );
   });
 
   it('calls relaunchApp when "r" is pressed', () => {
-    const relaunchAppSpy = vi.spyOn(processUtils, 'relaunchApp');
-    const { stdin } = renderWithProviders(
-      <IdeTrustChangeDialog reason="NONE" />,
-    );
+    const relaunchAppSpy = vi.spyOn(processUtils, "relaunchApp");
+    const { stdin } = renderWithProviders(<IdeTrustChangeDialog reason="NONE" />);
 
-    stdin.write('r');
+    stdin.write("r");
 
     expect(relaunchAppSpy).toHaveBeenCalledTimes(1);
   });
 
   it('calls relaunchApp when "R" is pressed', () => {
-    const relaunchAppSpy = vi.spyOn(processUtils, 'relaunchApp');
-    const { stdin } = renderWithProviders(
-      <IdeTrustChangeDialog reason="CONNECTION_CHANGE" />,
-    );
+    const relaunchAppSpy = vi.spyOn(processUtils, "relaunchApp");
+    const { stdin } = renderWithProviders(<IdeTrustChangeDialog reason="CONNECTION_CHANGE" />);
 
-    stdin.write('R');
+    stdin.write("R");
 
     expect(relaunchAppSpy).toHaveBeenCalledTimes(1);
   });
 
-  it('does not call relaunchApp when another key is pressed', async () => {
-    const relaunchAppSpy = vi.spyOn(processUtils, 'relaunchApp');
-    const { stdin } = renderWithProviders(
-      <IdeTrustChangeDialog reason="CONNECTION_CHANGE" />,
-    );
+  it("does not call relaunchApp when another key is pressed", async () => {
+    const relaunchAppSpy = vi.spyOn(processUtils, "relaunchApp");
+    const { stdin } = renderWithProviders(<IdeTrustChangeDialog reason="CONNECTION_CHANGE" />);
 
-    stdin.write('a');
+    stdin.write("a");
 
     // Give it a moment to ensure no async actions are triggered
     await new Promise((resolve) => setTimeout(resolve, 50));
diff --git a/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.tsx b/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.tsx
index 2412840ec..1e956e7e6 100644
--- a/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/IdeTrustChangeDialog.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { relaunchApp } from '../../utils/processUtils.js';
-import { type RestartReason } from '../hooks/useIdeTrustListener.js';
+import { Box, Text } from "ink";
+import { relaunchApp } from "../../utils/processUtils.js";
+import { type RestartReason } from "../hooks/useIdeTrustListener.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 interface IdeTrustChangeDialogProps {
   reason: RestartReason;
@@ -17,7 +17,7 @@ interface IdeTrustChangeDialogProps {
 export const IdeTrustChangeDialog = ({ reason }: IdeTrustChangeDialogProps) => {
   useKeypress(
     (key) => {
-      if (key.name === 'r' || key.name === 'R') {
+      if (key.name === "r" || key.name === "R") {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         relaunchApp();
       }
@@ -25,17 +25,14 @@ export const IdeTrustChangeDialog = ({ reason }: IdeTrustChangeDialogProps) => {
     { isActive: true },
   );
 
-  let message = 'Workspace trust has changed.';
-  if (reason === 'NONE') {
+  let message = "Workspace trust has changed.";
+  if (reason === "NONE") {
     // This should not happen, but provides a fallback and a debug log.
-    console.error(
-      'IdeTrustChangeDialog rendered with unexpected reason "NONE"',
-    );
-  } else if (reason === 'CONNECTION_CHANGE') {
-    message =
-      'Workspace trust has changed due to a change in the IDE connection.';
-  } else if (reason === 'TRUST_CHANGE') {
-    message = 'Workspace trust has changed due to a change in the IDE trust.';
+    console.error('IdeTrustChangeDialog rendered with unexpected reason "NONE"');
+  } else if (reason === "CONNECTION_CHANGE") {
+    message = "Workspace trust has changed due to a change in the IDE connection.";
+  } else if (reason === "TRUST_CHANGE") {
+    message = "Workspace trust has changed due to a change in the IDE trust.";
   }
 
   return (
diff --git a/packages/ui-gemini/src/ui/components/InputPrompt.test.tsx b/packages/ui-gemini/src/ui/components/InputPrompt.test.tsx
index 71b1c1fef..c2da02a0b 100644
--- a/packages/ui-gemini/src/ui/components/InputPrompt.test.tsx
+++ b/packages/ui-gemini/src/ui/components/InputPrompt.test.tsx
@@ -4,97 +4,97 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { act } from 'react';
-import type { InputPromptProps } from './InputPrompt.js';
-import { InputPrompt } from './InputPrompt.js';
-import type { TextBuffer } from './shared/text-buffer.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { ApprovalMode } from '@airiscode/gemini-cli-core';
-import * as path from 'node:path';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import { CommandKind } from '../commands/types.js';
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import type { UseShellHistoryReturn } from '../hooks/useShellHistory.js';
-import { useShellHistory } from '../hooks/useShellHistory.js';
-import type { UseCommandCompletionReturn } from '../hooks/useCommandCompletion.js';
-import { useCommandCompletion } from '../hooks/useCommandCompletion.js';
-import type { UseInputHistoryReturn } from '../hooks/useInputHistory.js';
-import { useInputHistory } from '../hooks/useInputHistory.js';
-import type { UseReverseSearchCompletionReturn } from '../hooks/useReverseSearchCompletion.js';
-import { useReverseSearchCompletion } from '../hooks/useReverseSearchCompletion.js';
-import clipboardy from 'clipboardy';
-import * as clipboardUtils from '../utils/clipboardUtils.js';
-import { useKittyKeyboardProtocol } from '../hooks/useKittyKeyboardProtocol.js';
-import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
-import stripAnsi from 'strip-ansi';
-import chalk from 'chalk';
-import { StreamingState } from '../types.js';
-
-vi.mock('../hooks/useShellHistory.js');
-vi.mock('../hooks/useCommandCompletion.js');
-vi.mock('../hooks/useInputHistory.js');
-vi.mock('../hooks/useReverseSearchCompletion.js');
-vi.mock('clipboardy');
-vi.mock('../utils/clipboardUtils.js');
-vi.mock('../hooks/useKittyKeyboardProtocol.js');
+import * as path from "node:path";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { ApprovalMode } from "@airiscode/gemini-cli-core";
+import chalk from "chalk";
+import clipboardy from "clipboardy";
+import { act } from "react";
+import stripAnsi from "strip-ansi";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { createMockCommandContext } from "../../test-utils/mockCommandContext.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import { CommandKind } from "../commands/types.js";
+import type { UseCommandCompletionReturn } from "../hooks/useCommandCompletion.js";
+import { useCommandCompletion } from "../hooks/useCommandCompletion.js";
+import type { UseInputHistoryReturn } from "../hooks/useInputHistory.js";
+import { useInputHistory } from "../hooks/useInputHistory.js";
+import { useKittyKeyboardProtocol } from "../hooks/useKittyKeyboardProtocol.js";
+import type { UseReverseSearchCompletionReturn } from "../hooks/useReverseSearchCompletion.js";
+import { useReverseSearchCompletion } from "../hooks/useReverseSearchCompletion.js";
+import type { UseShellHistoryReturn } from "../hooks/useShellHistory.js";
+import { useShellHistory } from "../hooks/useShellHistory.js";
+import { StreamingState } from "../types.js";
+import * as clipboardUtils from "../utils/clipboardUtils.js";
+import type { InputPromptProps } from "./InputPrompt.js";
+import { InputPrompt } from "./InputPrompt.js";
+import type { TextBuffer } from "./shared/text-buffer.js";
+
+vi.mock("../hooks/useShellHistory.js");
+vi.mock("../hooks/useCommandCompletion.js");
+vi.mock("../hooks/useInputHistory.js");
+vi.mock("../hooks/useReverseSearchCompletion.js");
+vi.mock("clipboardy");
+vi.mock("../utils/clipboardUtils.js");
+vi.mock("../hooks/useKittyKeyboardProtocol.js");
 
 const mockSlashCommands: SlashCommand[] = [
   {
-    name: 'clear',
+    name: "clear",
     kind: CommandKind.BUILT_IN,
-    description: 'Clear screen',
+    description: "Clear screen",
     action: vi.fn(),
   },
   {
-    name: 'memory',
+    name: "memory",
     kind: CommandKind.BUILT_IN,
-    description: 'Manage memory',
+    description: "Manage memory",
     subCommands: [
       {
-        name: 'show',
+        name: "show",
         kind: CommandKind.BUILT_IN,
-        description: 'Show memory',
+        description: "Show memory",
         action: vi.fn(),
       },
       {
-        name: 'add',
+        name: "add",
         kind: CommandKind.BUILT_IN,
-        description: 'Add to memory',
+        description: "Add to memory",
         action: vi.fn(),
       },
       {
-        name: 'refresh',
+        name: "refresh",
         kind: CommandKind.BUILT_IN,
-        description: 'Refresh memory',
+        description: "Refresh memory",
         action: vi.fn(),
       },
     ],
   },
   {
-    name: 'chat',
-    description: 'Manage chats',
+    name: "chat",
+    description: "Manage chats",
     kind: CommandKind.BUILT_IN,
     subCommands: [
       {
-        name: 'resume',
-        description: 'Resume a chat',
+        name: "resume",
+        description: "Resume a chat",
         kind: CommandKind.BUILT_IN,
         action: vi.fn(),
-        completion: async () => ['fix-foo', 'fix-bar'],
+        completion: async () => ["fix-foo", "fix-bar"],
       },
     ],
   },
   {
-    name: 'resume',
-    description: 'Browse and resume sessions',
+    name: "resume",
+    description: "Browse and resume sessions",
     kind: CommandKind.BUILT_IN,
     action: vi.fn(),
   },
 ];
 
-describe('InputPrompt', () => {
+describe("InputPrompt", () => {
   let props: InputPromptProps;
   let mockShellHistory: UseShellHistoryReturn;
   let mockCommandCompletion: UseCommandCompletionReturn;
@@ -106,9 +106,7 @@ describe('InputPrompt', () => {
   const mockedUseShellHistory = vi.mocked(useShellHistory);
   const mockedUseCommandCompletion = vi.mocked(useCommandCompletion);
   const mockedUseInputHistory = vi.mocked(useInputHistory);
-  const mockedUseReverseSearchCompletion = vi.mocked(
-    useReverseSearchCompletion,
-  );
+  const mockedUseReverseSearchCompletion = vi.mocked(useReverseSearchCompletion);
   const mockedUseKittyKeyboardProtocol = vi.mocked(useKittyKeyboardProtocol);
   const mockSetEmbeddedShellFocused = vi.fn();
   const uiActions = {
@@ -121,9 +119,9 @@ describe('InputPrompt', () => {
     mockCommandContext = createMockCommandContext();
 
     mockBuffer = {
-      text: '',
+      text: "",
       cursor: [0, 0],
-      lines: [''],
+      lines: [""],
       setText: vi.fn((newText: string) => {
         mockBuffer.text = newText;
         mockBuffer.lines = [newText];
@@ -133,8 +131,8 @@ describe('InputPrompt', () => {
         mockBuffer.visualToLogicalMap = [[0, 0]];
       }),
       replaceRangeByOffset: vi.fn(),
-      viewportVisualLines: [''],
-      allVisualLines: [''],
+      viewportVisualLines: [""],
+      allVisualLines: [""],
       visualCursor: [0, 0],
       visualScrollRow: 0,
       handleInput: vi.fn(),
@@ -184,7 +182,7 @@ describe('InputPrompt', () => {
       setShowSuggestions: vi.fn(),
       handleAutocomplete: vi.fn(),
       promptCompletion: {
-        text: '',
+        text: "",
         accept: vi.fn(),
         clear: vi.fn(),
         isLoading: false,
@@ -221,9 +219,7 @@ describe('InputPrompt', () => {
       handleAutocomplete: vi.fn(),
       resetCompletionState: vi.fn(),
     };
-    mockedUseReverseSearchCompletion.mockReturnValue(
-      mockReverseSearchCompletion,
-    );
+    mockedUseReverseSearchCompletion.mockReturnValue(mockReverseSearchCompletion);
 
     mockedUseKittyKeyboardProtocol.mockReturnValue({
       enabled: false,
@@ -236,11 +232,11 @@ describe('InputPrompt', () => {
       userMessages: [],
       onClearScreen: vi.fn(),
       config: {
-        getProjectRoot: () => path.join('test', 'project'),
-        getTargetDir: () => path.join('test', 'project', 'src'),
+        getProjectRoot: () => path.join("test", "project"),
+        getTargetDir: () => path.join("test", "project", "src"),
         getVimMode: () => false,
         getWorkspaceContext: () => ({
-          getDirectories: () => ['/test/project/src'],
+          getDirectories: () => ["/test/project/src"],
         }),
       } as unknown as Config,
       slashCommands: mockSlashCommands,
@@ -257,98 +253,86 @@ describe('InputPrompt', () => {
     };
   });
 
-  it('should call shellHistory.getPreviousCommand on up arrow in shell mode', async () => {
+  it("should call shellHistory.getPreviousCommand on up arrow in shell mode", async () => {
     props.shellModeActive = true;
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\u001B[A');
+      stdin.write("\u001B[A");
     });
-    await waitFor(() =>
-      expect(mockShellHistory.getPreviousCommand).toHaveBeenCalled(),
-    );
+    await waitFor(() => expect(mockShellHistory.getPreviousCommand).toHaveBeenCalled());
     unmount();
   });
 
-  it('should call shellHistory.getNextCommand on down arrow in shell mode', async () => {
+  it("should call shellHistory.getNextCommand on down arrow in shell mode", async () => {
     props.shellModeActive = true;
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\u001B[B');
-      await waitFor(() =>
-        expect(mockShellHistory.getNextCommand).toHaveBeenCalled(),
-      );
+      stdin.write("\u001B[B");
+      await waitFor(() => expect(mockShellHistory.getNextCommand).toHaveBeenCalled());
     });
     unmount();
   });
 
-  it('should set the buffer text when a shell history command is retrieved', async () => {
+  it("should set the buffer text when a shell history command is retrieved", async () => {
     props.shellModeActive = true;
-    vi.mocked(mockShellHistory.getPreviousCommand).mockReturnValue(
-      'previous command',
-    );
+    vi.mocked(mockShellHistory.getPreviousCommand).mockReturnValue("previous command");
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\u001B[A');
+      stdin.write("\u001B[A");
     });
     await waitFor(() => {
       expect(mockShellHistory.getPreviousCommand).toHaveBeenCalled();
-      expect(props.buffer.setText).toHaveBeenCalledWith('previous command');
+      expect(props.buffer.setText).toHaveBeenCalledWith("previous command");
     });
     unmount();
   });
 
-  it('should call shellHistory.addCommandToHistory on submit in shell mode', async () => {
+  it("should call shellHistory.addCommandToHistory on submit in shell mode", async () => {
     props.shellModeActive = true;
-    props.buffer.setText('ls -l');
+    props.buffer.setText("ls -l");
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
     });
     await waitFor(() => {
-      expect(mockShellHistory.addCommandToHistory).toHaveBeenCalledWith(
-        'ls -l',
-      );
-      expect(props.onSubmit).toHaveBeenCalledWith('ls -l');
+      expect(mockShellHistory.addCommandToHistory).toHaveBeenCalledWith("ls -l");
+      expect(props.onSubmit).toHaveBeenCalledWith("ls -l");
     });
     unmount();
   });
 
-  it('should NOT call shell history methods when not in shell mode', async () => {
-    props.buffer.setText('some text');
+  it("should NOT call shell history methods when not in shell mode", async () => {
+    props.buffer.setText("some text");
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\u001B[A'); // Up arrow
+      stdin.write("\u001B[A"); // Up arrow
     });
     await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
 
     await act(async () => {
-      stdin.write('\u001B[B'); // Down arrow
+      stdin.write("\u001B[B"); // Down arrow
     });
-    await waitFor(() =>
-      expect(mockInputHistory.navigateDown).toHaveBeenCalled(),
-    );
+    await waitFor(() => expect(mockInputHistory.navigateDown).toHaveBeenCalled());
 
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
     });
-    await waitFor(() =>
-      expect(props.onSubmit).toHaveBeenCalledWith('some text'),
-    );
+    await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith("some text"));
 
     expect(mockShellHistory.getPreviousCommand).not.toHaveBeenCalled();
     expect(mockShellHistory.getNextCommand).not.toHaveBeenCalled();
@@ -356,17 +340,17 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should call completion.navigateUp for both up arrow and Ctrl+P when suggestions are showing', async () => {
+  it("should call completion.navigateUp for both up arrow and Ctrl+P when suggestions are showing", async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
       suggestions: [
-        { label: 'memory', value: 'memory' },
-        { label: 'memcache', value: 'memcache' },
+        { label: "memory", value: "memory" },
+        { label: "memcache", value: "memcache" },
       ],
     });
 
-    props.buffer.setText('/mem');
+    props.buffer.setText("/mem");
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
@@ -374,33 +358,29 @@ describe('InputPrompt', () => {
 
     // Test up arrow
     await act(async () => {
-      stdin.write('\u001B[A'); // Up arrow
+      stdin.write("\u001B[A"); // Up arrow
     });
-    await waitFor(() =>
-      expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(1),
-    );
+    await waitFor(() => expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(1));
 
     await act(async () => {
-      stdin.write('\u0010'); // Ctrl+P
+      stdin.write("\u0010"); // Ctrl+P
     });
-    await waitFor(() =>
-      expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(2),
-    );
+    await waitFor(() => expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(2));
     expect(mockCommandCompletion.navigateDown).not.toHaveBeenCalled();
 
     unmount();
   });
 
-  it('should call completion.navigateDown for both down arrow and Ctrl+N when suggestions are showing', async () => {
+  it("should call completion.navigateDown for both down arrow and Ctrl+N when suggestions are showing", async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
       suggestions: [
-        { label: 'memory', value: 'memory' },
-        { label: 'memcache', value: 'memcache' },
+        { label: "memory", value: "memory" },
+        { label: "memcache", value: "memcache" },
       ],
     });
-    props.buffer.setText('/mem');
+    props.buffer.setText("/mem");
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
@@ -408,48 +388,42 @@ describe('InputPrompt', () => {
 
     // Test down arrow
     await act(async () => {
-      stdin.write('\u001B[B'); // Down arrow
+      stdin.write("\u001B[B"); // Down arrow
     });
-    await waitFor(() =>
-      expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(1),
-    );
+    await waitFor(() => expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(1));
 
     await act(async () => {
-      stdin.write('\u000E'); // Ctrl+N
+      stdin.write("\u000E"); // Ctrl+N
     });
-    await waitFor(() =>
-      expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(2),
-    );
+    await waitFor(() => expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(2));
     expect(mockCommandCompletion.navigateUp).not.toHaveBeenCalled();
 
     unmount();
   });
 
-  it('should NOT call completion navigation when suggestions are not showing', async () => {
+  it("should NOT call completion navigation when suggestions are not showing", async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: false,
     });
-    props.buffer.setText('some text');
+    props.buffer.setText("some text");
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\u001B[A'); // Up arrow
+      stdin.write("\u001B[A"); // Up arrow
     });
     await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
     await act(async () => {
-      stdin.write('\u001B[B'); // Down arrow
+      stdin.write("\u001B[B"); // Down arrow
     });
-    await waitFor(() =>
-      expect(mockInputHistory.navigateDown).toHaveBeenCalled(),
-    );
+    await waitFor(() => expect(mockInputHistory.navigateDown).toHaveBeenCalled());
     await act(async () => {
-      stdin.write('\u0010'); // Ctrl+P
+      stdin.write("\u0010"); // Ctrl+P
     });
     await act(async () => {
-      stdin.write('\u000E'); // Ctrl+N
+      stdin.write("\u000E"); // Ctrl+N
     });
 
     await waitFor(() => {
@@ -459,34 +433,28 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  describe('clipboard image paste', () => {
+  describe("clipboard image paste", () => {
     beforeEach(() => {
       vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(false);
       vi.mocked(clipboardUtils.saveClipboardImage).mockResolvedValue(null);
-      vi.mocked(clipboardUtils.cleanupOldClipboardImages).mockResolvedValue(
-        undefined,
-      );
+      vi.mocked(clipboardUtils.cleanupOldClipboardImages).mockResolvedValue(undefined);
     });
 
-    it('should handle Ctrl+V when clipboard has an image', async () => {
+    it("should handle Ctrl+V when clipboard has an image", async () => {
       vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(true);
       vi.mocked(clipboardUtils.saveClipboardImage).mockResolvedValue(
-        '/test/.gemini-clipboard/clipboard-123.png',
+        "/test/.gemini-clipboard/clipboard-123.png",
       );
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       // Send Ctrl+V
       await act(async () => {
-        stdin.write('\x16'); // Ctrl+V
+        stdin.write("\x16"); // Ctrl+V
       });
       await waitFor(() => {
         expect(clipboardUtils.clipboardHasImage).toHaveBeenCalled();
-        expect(clipboardUtils.saveClipboardImage).toHaveBeenCalledWith(
-          props.config.getTargetDir(),
-        );
+        expect(clipboardUtils.saveClipboardImage).toHaveBeenCalledWith(props.config.getTargetDir());
         expect(clipboardUtils.cleanupOldClipboardImages).toHaveBeenCalledWith(
           props.config.getTargetDir(),
         );
@@ -495,15 +463,13 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should not insert anything when clipboard has no image', async () => {
+    it("should not insert anything when clipboard has no image", async () => {
       vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(false);
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x16'); // Ctrl+V
+        stdin.write("\x16"); // Ctrl+V
       });
       await waitFor(() => {
         expect(clipboardUtils.clipboardHasImage).toHaveBeenCalled();
@@ -513,16 +479,14 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should handle image save failure gracefully', async () => {
+    it("should handle image save failure gracefully", async () => {
       vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(true);
       vi.mocked(clipboardUtils.saveClipboardImage).mockResolvedValue(null);
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x16'); // Ctrl+V
+        stdin.write("\x16"); // Ctrl+V
       });
       await waitFor(() => {
         expect(clipboardUtils.saveClipboardImage).toHaveBeenCalled();
@@ -531,28 +495,22 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should insert image path at cursor position with proper spacing', async () => {
-      const imagePath = path.join(
-        'test',
-        '.gemini-clipboard',
-        'clipboard-456.png',
-      );
+    it("should insert image path at cursor position with proper spacing", async () => {
+      const imagePath = path.join("test", ".gemini-clipboard", "clipboard-456.png");
       vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(true);
       vi.mocked(clipboardUtils.saveClipboardImage).mockResolvedValue(imagePath);
 
       // Set initial text and cursor position
-      mockBuffer.text = 'Hello world';
+      mockBuffer.text = "Hello world";
       mockBuffer.cursor = [0, 5]; // Cursor after "Hello"
       vi.mocked(mockBuffer.getOffset).mockReturnValue(5);
-      mockBuffer.lines = ['Hello world'];
+      mockBuffer.lines = ["Hello world"];
       mockBuffer.replaceRangeByOffset = vi.fn();
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x16'); // Ctrl+V
+        stdin.write("\x16"); // Ctrl+V
       });
       await waitFor(() => {
         // Should insert at cursor position with spaces
@@ -560,34 +518,27 @@ describe('InputPrompt', () => {
       });
 
       // Get the actual call to see what path was used
-      const actualCall = vi.mocked(mockBuffer.replaceRangeByOffset).mock
-        .calls[0];
+      const actualCall = vi.mocked(mockBuffer.replaceRangeByOffset).mock.calls[0];
       expect(actualCall[0]).toBe(5); // start offset
       expect(actualCall[1]).toBe(5); // end offset
       expect(actualCall[2]).toBe(
-        ' @' + path.relative(path.join('test', 'project', 'src'), imagePath),
+        " @" + path.relative(path.join("test", "project", "src"), imagePath),
       );
       unmount();
     });
 
-    it('should handle errors during clipboard operations', async () => {
-      const consoleErrorSpy = vi
-        .spyOn(console, 'error')
-        .mockImplementation(() => {});
-      vi.mocked(clipboardUtils.clipboardHasImage).mockRejectedValue(
-        new Error('Clipboard error'),
-      );
+    it("should handle errors during clipboard operations", async () => {
+      const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+      vi.mocked(clipboardUtils.clipboardHasImage).mockRejectedValue(new Error("Clipboard error"));
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x16'); // Ctrl+V
+        stdin.write("\x16"); // Ctrl+V
       });
       await waitFor(() => {
         expect(consoleErrorSpy).toHaveBeenCalledWith(
-          'Error handling clipboard image:',
+          "Error handling clipboard image:",
           expect.any(Error),
         );
       });
@@ -598,18 +549,16 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('clipboard text paste', () => {
-    it('should insert text from clipboard on Ctrl+V', async () => {
+  describe("clipboard text paste", () => {
+    it("should insert text from clipboard on Ctrl+V", async () => {
       vi.mocked(clipboardUtils.clipboardHasImage).mockResolvedValue(false);
-      vi.mocked(clipboardy.read).mockResolvedValue('pasted text');
+      vi.mocked(clipboardy.read).mockResolvedValue("pasted text");
       vi.mocked(mockBuffer.replaceRangeByOffset).mockClear();
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x16'); // Ctrl+V
+        stdin.write("\x16"); // Ctrl+V
       });
 
       await waitFor(() => {
@@ -617,7 +566,7 @@ describe('InputPrompt', () => {
         expect(mockBuffer.replaceRangeByOffset).toHaveBeenCalledWith(
           expect.any(Number),
           expect.any(Number),
-          'pasted text',
+          "pasted text",
         );
       });
       unmount();
@@ -626,36 +575,36 @@ describe('InputPrompt', () => {
 
   it.each([
     {
-      name: 'should complete a partial parent command',
-      bufferText: '/mem',
-      suggestions: [{ label: 'memory', value: 'memory', description: '...' }],
+      name: "should complete a partial parent command",
+      bufferText: "/mem",
+      suggestions: [{ label: "memory", value: "memory", description: "..." }],
       activeIndex: 0,
     },
     {
-      name: 'should append a sub-command when parent command is complete',
-      bufferText: '/memory ',
+      name: "should append a sub-command when parent command is complete",
+      bufferText: "/memory ",
       suggestions: [
-        { label: 'show', value: 'show' },
-        { label: 'add', value: 'add' },
+        { label: "show", value: "show" },
+        { label: "add", value: "add" },
       ],
       activeIndex: 1,
     },
     {
-      name: 'should handle the backspace edge case correctly',
-      bufferText: '/memory',
+      name: "should handle the backspace edge case correctly",
+      bufferText: "/memory",
       suggestions: [
-        { label: 'show', value: 'show' },
-        { label: 'add', value: 'add' },
+        { label: "show", value: "show" },
+        { label: "add", value: "add" },
       ],
       activeIndex: 0,
     },
     {
-      name: 'should complete a partial argument for a command',
-      bufferText: '/chat resume fi-',
-      suggestions: [{ label: 'fix-foo', value: 'fix-foo' }],
+      name: "should complete a partial argument for a command",
+      bufferText: "/chat resume fi-",
+      suggestions: [{ label: "fix-foo", value: "fix-foo" }],
       activeIndex: 0,
     },
-  ])('$name', async ({ bufferText, suggestions, activeIndex }) => {
+  ])("$name", async ({ bufferText, suggestions, activeIndex }) => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
@@ -667,30 +616,28 @@ describe('InputPrompt', () => {
       uiActions,
     });
 
-    await act(async () => stdin.write('\t'));
+    await act(async () => stdin.write("\t"));
     await waitFor(() =>
-      expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(
-        activeIndex,
-      ),
+      expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(activeIndex),
     );
     unmount();
   });
 
-  it('should autocomplete on Enter when suggestions are active, without submitting', async () => {
+  it("should autocomplete on Enter when suggestions are active, without submitting", async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
-      suggestions: [{ label: 'memory', value: 'memory' }],
+      suggestions: [{ label: "memory", value: "memory" }],
       activeSuggestionIndex: 0,
     });
-    props.buffer.setText('/mem');
+    props.buffer.setText("/mem");
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
     });
     await waitFor(() => {
       // The app should autocomplete the text, NOT submit.
@@ -701,46 +648,44 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should complete a command based on its altNames', async () => {
+  it("should complete a command based on its altNames", async () => {
     props.slashCommands = [
       {
-        name: 'help',
-        altNames: ['?'],
+        name: "help",
+        altNames: ["?"],
         kind: CommandKind.BUILT_IN,
-        description: '...',
+        description: "...",
       },
     ];
 
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
-      suggestions: [{ label: 'help', value: 'help' }],
+      suggestions: [{ label: "help", value: "help" }],
       activeSuggestionIndex: 0,
     });
-    props.buffer.setText('/?');
+    props.buffer.setText("/?");
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\t'); // Press Tab for autocomplete
+      stdin.write("\t"); // Press Tab for autocomplete
     });
-    await waitFor(() =>
-      expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0),
-    );
+    await waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
     unmount();
   });
 
-  it('should not submit on Enter when the buffer is empty or only contains whitespace', async () => {
-    props.buffer.setText('   '); // Set buffer to whitespace
+  it("should not submit on Enter when the buffer is empty or only contains whitespace", async () => {
+    props.buffer.setText("   "); // Set buffer to whitespace
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\r'); // Press Enter
+      stdin.write("\r"); // Press Enter
     });
 
     await waitFor(() => {
@@ -749,54 +694,54 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should submit directly on Enter when isPerfectMatch is true', async () => {
+  it("should submit directly on Enter when isPerfectMatch is true", async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: false,
       isPerfectMatch: true,
     });
-    props.buffer.setText('/clear');
+    props.buffer.setText("/clear");
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
     });
-    await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('/clear'));
+    await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith("/clear"));
     unmount();
   });
 
-  it('should submit directly on Enter when a complete leaf command is typed', async () => {
+  it("should submit directly on Enter when a complete leaf command is typed", async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: false,
       isPerfectMatch: false, // Added explicit isPerfectMatch false
     });
-    props.buffer.setText('/clear');
+    props.buffer.setText("/clear");
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
     });
-    await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('/clear'));
+    await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith("/clear"));
     unmount();
   });
 
-  it('should auto-execute commands with autoExecute: true on Enter', async () => {
+  it("should auto-execute commands with autoExecute: true on Enter", async () => {
     const aboutCommand: SlashCommand = {
-      name: 'about',
+      name: "about",
       kind: CommandKind.BUILT_IN,
-      description: 'About command',
+      description: "About command",
       action: vi.fn(),
       autoExecute: true,
     };
 
-    const suggestion = { label: 'about', value: 'about' };
+    const suggestion = { label: "about", value: "about" };
 
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
@@ -804,7 +749,7 @@ describe('InputPrompt', () => {
       suggestions: [suggestion],
       activeSuggestionIndex: 0,
       getCommandFromSuggestion: vi.fn().mockReturnValue(aboutCommand),
-      getCompletedText: vi.fn().mockReturnValue('/about'),
+      getCompletedText: vi.fn().mockReturnValue("/about"),
       slashCompletionRange: {
         completionStart: 1,
         completionEnd: 3, // "/ab" -> start at 1, end at 3
@@ -815,8 +760,8 @@ describe('InputPrompt', () => {
     });
 
     // User typed partial command
-    props.buffer.setText('/ab');
-    props.buffer.lines = ['/ab'];
+    props.buffer.setText("/ab");
+    props.buffer.lines = ["/ab"];
     props.buffer.cursor = [0, 3];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -824,28 +769,28 @@ describe('InputPrompt', () => {
     });
 
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
     });
 
     await waitFor(() => {
       // Should submit the full command constructed from buffer + suggestion
-      expect(props.onSubmit).toHaveBeenCalledWith('/about');
+      expect(props.onSubmit).toHaveBeenCalledWith("/about");
       // Should NOT handle autocomplete (which just fills text)
       expect(mockCommandCompletion.handleAutocomplete).not.toHaveBeenCalled();
     });
     unmount();
   });
 
-  it('should autocomplete commands with autoExecute: false on Enter', async () => {
+  it("should autocomplete commands with autoExecute: false on Enter", async () => {
     const shareCommand: SlashCommand = {
-      name: 'share',
+      name: "share",
       kind: CommandKind.BUILT_IN,
-      description: 'Share conversation to file',
+      description: "Share conversation to file",
       action: vi.fn(),
       autoExecute: false, // Explicitly set to false
     };
 
-    const suggestion = { label: 'share', value: 'share' };
+    const suggestion = { label: "share", value: "share" };
 
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
@@ -853,11 +798,11 @@ describe('InputPrompt', () => {
       suggestions: [suggestion],
       activeSuggestionIndex: 0,
       getCommandFromSuggestion: vi.fn().mockReturnValue(shareCommand),
-      getCompletedText: vi.fn().mockReturnValue('/share'),
+      getCompletedText: vi.fn().mockReturnValue("/share"),
     });
 
-    props.buffer.setText('/sh');
-    props.buffer.lines = ['/sh'];
+    props.buffer.setText("/sh");
+    props.buffer.lines = ["/sh"];
     props.buffer.cursor = [0, 3];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -865,7 +810,7 @@ describe('InputPrompt', () => {
     });
 
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
     });
 
     await waitFor(() => {
@@ -876,16 +821,16 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should autocomplete on Tab, even for executable commands', async () => {
+  it("should autocomplete on Tab, even for executable commands", async () => {
     const executableCommand: SlashCommand = {
-      name: 'about',
+      name: "about",
       kind: CommandKind.BUILT_IN,
-      description: 'About info',
+      description: "About info",
       action: vi.fn(),
       autoExecute: true,
     };
 
-    const suggestion = { label: 'about', value: 'about' };
+    const suggestion = { label: "about", value: "about" };
 
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
@@ -893,11 +838,11 @@ describe('InputPrompt', () => {
       suggestions: [suggestion],
       activeSuggestionIndex: 0,
       getCommandFromSuggestion: vi.fn().mockReturnValue(executableCommand),
-      getCompletedText: vi.fn().mockReturnValue('/about'),
+      getCompletedText: vi.fn().mockReturnValue("/about"),
     });
 
-    props.buffer.setText('/ab');
-    props.buffer.lines = ['/ab'];
+    props.buffer.setText("/ab");
+    props.buffer.lines = ["/ab"];
     props.buffer.cursor = [0, 3];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -905,7 +850,7 @@ describe('InputPrompt', () => {
     });
 
     await act(async () => {
-      stdin.write('\t'); // Tab
+      stdin.write("\t"); // Tab
     });
 
     await waitFor(() => {
@@ -916,16 +861,16 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should autocomplete custom commands from .toml files on Enter', async () => {
+  it("should autocomplete custom commands from .toml files on Enter", async () => {
     const customCommand: SlashCommand = {
-      name: 'find-capital',
+      name: "find-capital",
       kind: CommandKind.FILE,
-      description: 'Find capital of a country',
+      description: "Find capital of a country",
       action: vi.fn(),
       // No autoExecute flag - custom commands default to undefined
     };
 
-    const suggestion = { label: 'find-capital', value: 'find-capital' };
+    const suggestion = { label: "find-capital", value: "find-capital" };
 
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
@@ -933,11 +878,11 @@ describe('InputPrompt', () => {
       suggestions: [suggestion],
       activeSuggestionIndex: 0,
       getCommandFromSuggestion: vi.fn().mockReturnValue(customCommand),
-      getCompletedText: vi.fn().mockReturnValue('/find-capital'),
+      getCompletedText: vi.fn().mockReturnValue("/find-capital"),
     });
 
-    props.buffer.setText('/find');
-    props.buffer.lines = ['/find'];
+    props.buffer.setText("/find");
+    props.buffer.lines = ["/find"];
     props.buffer.cursor = [0, 5];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -945,7 +890,7 @@ describe('InputPrompt', () => {
     });
 
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
     });
 
     await waitFor(() => {
@@ -956,18 +901,18 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should auto-execute argument completion when command has autoExecute: true', async () => {
+  it("should auto-execute argument completion when command has autoExecute: true", async () => {
     // Simulates: /mcp auth <server> where user selects a server from completions
     const authCommand: SlashCommand = {
-      name: 'auth',
+      name: "auth",
       kind: CommandKind.BUILT_IN,
-      description: 'Authenticate with MCP server',
+      description: "Authenticate with MCP server",
       action: vi.fn(),
       autoExecute: true,
-      completion: vi.fn().mockResolvedValue(['server1', 'server2']),
+      completion: vi.fn().mockResolvedValue(["server1", "server2"]),
     };
 
-    const suggestion = { label: 'server1', value: 'server1' };
+    const suggestion = { label: "server1", value: "server1" };
 
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
@@ -975,7 +920,7 @@ describe('InputPrompt', () => {
       suggestions: [suggestion],
       activeSuggestionIndex: 0,
       getCommandFromSuggestion: vi.fn().mockReturnValue(authCommand),
-      getCompletedText: vi.fn().mockReturnValue('/mcp auth server1'),
+      getCompletedText: vi.fn().mockReturnValue("/mcp auth server1"),
       slashCompletionRange: {
         completionStart: 10,
         completionEnd: 10,
@@ -985,8 +930,8 @@ describe('InputPrompt', () => {
       },
     });
 
-    props.buffer.setText('/mcp auth ');
-    props.buffer.lines = ['/mcp auth '];
+    props.buffer.setText("/mcp auth ");
+    props.buffer.lines = ["/mcp auth "];
     props.buffer.cursor = [0, 10];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -994,31 +939,31 @@ describe('InputPrompt', () => {
     });
 
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
     });
 
     await waitFor(() => {
       // Should auto-execute with the completed command
-      expect(props.onSubmit).toHaveBeenCalledWith('/mcp auth server1');
+      expect(props.onSubmit).toHaveBeenCalledWith("/mcp auth server1");
       expect(mockCommandCompletion.handleAutocomplete).not.toHaveBeenCalled();
     });
     unmount();
   });
 
-  it('should autocomplete argument completion when command has autoExecute: false', async () => {
+  it("should autocomplete argument completion when command has autoExecute: false", async () => {
     // Simulates: /extensions enable <ext> where multi-arg completions should NOT auto-execute
     const enableCommand: SlashCommand = {
-      name: 'enable',
+      name: "enable",
       kind: CommandKind.BUILT_IN,
-      description: 'Enable an extension',
+      description: "Enable an extension",
       action: vi.fn(),
       autoExecute: false,
-      completion: vi.fn().mockResolvedValue(['ext1 --scope user']),
+      completion: vi.fn().mockResolvedValue(["ext1 --scope user"]),
     };
 
     const suggestion = {
-      label: 'ext1 --scope user',
-      value: 'ext1 --scope user',
+      label: "ext1 --scope user",
+      value: "ext1 --scope user",
     };
 
     mockedUseCommandCompletion.mockReturnValue({
@@ -1027,9 +972,7 @@ describe('InputPrompt', () => {
       suggestions: [suggestion],
       activeSuggestionIndex: 0,
       getCommandFromSuggestion: vi.fn().mockReturnValue(enableCommand),
-      getCompletedText: vi
-        .fn()
-        .mockReturnValue('/extensions enable ext1 --scope user'),
+      getCompletedText: vi.fn().mockReturnValue("/extensions enable ext1 --scope user"),
       slashCompletionRange: {
         completionStart: 19,
         completionEnd: 19,
@@ -1039,8 +982,8 @@ describe('InputPrompt', () => {
       },
     });
 
-    props.buffer.setText('/extensions enable ');
-    props.buffer.lines = ['/extensions enable '];
+    props.buffer.setText("/extensions enable ");
+    props.buffer.lines = ["/extensions enable "];
     props.buffer.cursor = [0, 19];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -1048,7 +991,7 @@ describe('InputPrompt', () => {
     });
 
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
     });
 
     await waitFor(() => {
@@ -1059,18 +1002,18 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should autocomplete command name even with autoExecute: true if command has completion function', async () => {
+  it("should autocomplete command name even with autoExecute: true if command has completion function", async () => {
     // Simulates: /chat resu -> should NOT auto-execute, should autocomplete to show arg completions
     const resumeCommand: SlashCommand = {
-      name: 'resume',
+      name: "resume",
       kind: CommandKind.BUILT_IN,
-      description: 'Resume a conversation',
+      description: "Resume a conversation",
       action: vi.fn(),
       autoExecute: true,
-      completion: vi.fn().mockResolvedValue(['chat1', 'chat2']),
+      completion: vi.fn().mockResolvedValue(["chat1", "chat2"]),
     };
 
-    const suggestion = { label: 'resume', value: 'resume' };
+    const suggestion = { label: "resume", value: "resume" };
 
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
@@ -1078,7 +1021,7 @@ describe('InputPrompt', () => {
       suggestions: [suggestion],
       activeSuggestionIndex: 0,
       getCommandFromSuggestion: vi.fn().mockReturnValue(resumeCommand),
-      getCompletedText: vi.fn().mockReturnValue('/chat resume'),
+      getCompletedText: vi.fn().mockReturnValue("/chat resume"),
       slashCompletionRange: {
         completionStart: 6,
         completionEnd: 10,
@@ -1088,8 +1031,8 @@ describe('InputPrompt', () => {
       },
     });
 
-    props.buffer.setText('/chat resu');
-    props.buffer.lines = ['/chat resu'];
+    props.buffer.setText("/chat resu");
+    props.buffer.lines = ["/chat resu"];
     props.buffer.cursor = [0, 10];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -1097,7 +1040,7 @@ describe('InputPrompt', () => {
     });
 
     await act(async () => {
-      stdin.write('\r'); // Enter
+      stdin.write("\r"); // Enter
     });
 
     await waitFor(() => {
@@ -1108,41 +1051,39 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should autocomplete an @-path on Enter without submitting', async () => {
+  it("should autocomplete an @-path on Enter without submitting", async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
-      suggestions: [{ label: 'index.ts', value: 'index.ts' }],
+      suggestions: [{ label: "index.ts", value: "index.ts" }],
       activeSuggestionIndex: 0,
     });
-    props.buffer.setText('@src/components/');
+    props.buffer.setText("@src/components/");
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
     });
-    await waitFor(() =>
-      expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0),
-    );
+    await waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
     expect(props.onSubmit).not.toHaveBeenCalled();
     unmount();
   });
 
-  it('should add a newline on enter when the line ends with a backslash', async () => {
+  it("should add a newline on enter when the line ends with a backslash", async () => {
     // This test simulates multi-line input, not submission
-    mockBuffer.text = 'first line\\';
+    mockBuffer.text = "first line\\";
     mockBuffer.cursor = [0, 11];
-    mockBuffer.lines = ['first line\\'];
+    mockBuffer.lines = ["first line\\"];
 
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\r');
+      stdin.write("\r");
     });
     await waitFor(() => {
       expect(props.buffer.backspace).toHaveBeenCalled();
@@ -1153,33 +1094,33 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should clear the buffer on Ctrl+C if it has text', async () => {
+  it("should clear the buffer on Ctrl+C if it has text", async () => {
     await act(async () => {
-      props.buffer.setText('some text to clear');
+      props.buffer.setText("some text to clear");
     });
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\x03'); // Ctrl+C character
+      stdin.write("\x03"); // Ctrl+C character
     });
     await waitFor(() => {
-      expect(props.buffer.setText).toHaveBeenCalledWith('');
+      expect(props.buffer.setText).toHaveBeenCalledWith("");
       expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
     });
     expect(props.onSubmit).not.toHaveBeenCalled();
     unmount();
   });
 
-  it('should NOT clear the buffer on Ctrl+C if it is empty', async () => {
-    props.buffer.text = '';
+  it("should NOT clear the buffer on Ctrl+C if it is empty", async () => {
+    props.buffer.text = "";
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\x03'); // Ctrl+C character
+      stdin.write("\x03"); // Ctrl+C character
     });
 
     await waitFor(() => {
@@ -1188,13 +1129,13 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should call setBannerVisible(false) when clear screen key is pressed', async () => {
+  it("should call setBannerVisible(false) when clear screen key is pressed", async () => {
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       uiActions,
     });
 
     await act(async () => {
-      stdin.write('\x0C'); // Ctrl+L
+      stdin.write("\x0C"); // Ctrl+L
     });
 
     await waitFor(() => {
@@ -1203,97 +1144,95 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  describe('cursor-based completion trigger', () => {
+  describe("cursor-based completion trigger", () => {
     it.each([
       {
-        name: 'should trigger completion when cursor is after @ without spaces',
-        text: '@src/components',
+        name: "should trigger completion when cursor is after @ without spaces",
+        text: "@src/components",
         cursor: [0, 15],
         showSuggestions: true,
       },
       {
-        name: 'should trigger completion when cursor is after / without spaces',
-        text: '/memory',
+        name: "should trigger completion when cursor is after / without spaces",
+        text: "/memory",
         cursor: [0, 7],
         showSuggestions: true,
       },
       {
-        name: 'should NOT trigger completion when cursor is after space following @',
-        text: '@src/file.ts hello',
+        name: "should NOT trigger completion when cursor is after space following @",
+        text: "@src/file.ts hello",
         cursor: [0, 18],
         showSuggestions: false,
       },
       {
-        name: 'should NOT trigger completion when cursor is after space following /',
-        text: '/memory add',
+        name: "should NOT trigger completion when cursor is after space following /",
+        text: "/memory add",
         cursor: [0, 11],
         showSuggestions: false,
       },
       {
-        name: 'should NOT trigger completion when cursor is not after @ or /',
-        text: 'hello world',
+        name: "should NOT trigger completion when cursor is not after @ or /",
+        text: "hello world",
         cursor: [0, 5],
         showSuggestions: false,
       },
       {
-        name: 'should handle multiline text correctly',
-        text: 'first line\n/memory',
+        name: "should handle multiline text correctly",
+        text: "first line\n/memory",
         cursor: [1, 7],
         showSuggestions: false,
       },
       {
-        name: 'should handle Unicode characters (emojis) correctly in paths',
-        text: '@src/file👍.txt',
+        name: "should handle Unicode characters (emojis) correctly in paths",
+        text: "@src/file👍.txt",
         cursor: [0, 14],
         showSuggestions: true,
       },
       {
-        name: 'should handle Unicode characters with spaces after them',
-        text: '@src/file👍.txt hello',
+        name: "should handle Unicode characters with spaces after them",
+        text: "@src/file👍.txt hello",
         cursor: [0, 20],
         showSuggestions: false,
       },
       {
-        name: 'should handle escaped spaces in paths correctly',
-        text: '@src/my\\ file.txt',
+        name: "should handle escaped spaces in paths correctly",
+        text: "@src/my\\ file.txt",
         cursor: [0, 16],
         showSuggestions: true,
       },
       {
-        name: 'should NOT trigger completion after unescaped space following escaped space',
-        text: '@path/my\\ file.txt hello',
+        name: "should NOT trigger completion after unescaped space following escaped space",
+        text: "@path/my\\ file.txt hello",
         cursor: [0, 24],
         showSuggestions: false,
       },
       {
-        name: 'should handle multiple escaped spaces in paths',
-        text: '@docs/my\\ long\\ file\\ name.md',
+        name: "should handle multiple escaped spaces in paths",
+        text: "@docs/my\\ long\\ file\\ name.md",
         cursor: [0, 29],
         showSuggestions: true,
       },
       {
-        name: 'should handle escaped spaces in slash commands',
-        text: '/memory\\ test',
+        name: "should handle escaped spaces in slash commands",
+        text: "/memory\\ test",
         cursor: [0, 13],
         showSuggestions: true,
       },
       {
-        name: 'should handle Unicode characters with escaped spaces',
-        text: `@${path.join('files', 'emoji\\ 👍\\ test.txt')}`,
+        name: "should handle Unicode characters with escaped spaces",
+        text: `@${path.join("files", "emoji\\ 👍\\ test.txt")}`,
         cursor: [0, 25],
         showSuggestions: true,
       },
-    ])('$name', async ({ text, cursor, showSuggestions }) => {
+    ])("$name", async ({ text, cursor, showSuggestions }) => {
       mockBuffer.text = text;
-      mockBuffer.lines = text.split('\n');
+      mockBuffer.lines = text.split("\n");
       mockBuffer.cursor = cursor as [number, number];
 
       mockedUseCommandCompletion.mockReturnValue({
         ...mockCommandCompletion,
         showSuggestions,
-        suggestions: showSuggestions
-          ? [{ label: 'suggestion', value: 'suggestion' }]
-          : [],
+        suggestions: showSuggestions ? [{ label: "suggestion", value: "suggestion" }] : [],
       });
 
       const { unmount } = renderWithProviders(<InputPrompt {...props} />, {
@@ -1303,7 +1242,7 @@ describe('InputPrompt', () => {
       await waitFor(() => {
         expect(mockedUseCommandCompletion).toHaveBeenCalledWith(
           mockBuffer,
-          path.join('test', 'project', 'src'),
+          path.join("test", "project", "src"),
           mockSlashCommands,
           mockCommandContext,
           false,
@@ -1316,30 +1255,28 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('vim mode', () => {
+  describe("vim mode", () => {
     it.each([
       {
-        name: 'should not call buffer.handleInput when vim handles input',
+        name: "should not call buffer.handleInput when vim handles input",
         vimHandled: true,
         expectBufferHandleInput: false,
       },
       {
-        name: 'should call buffer.handleInput when vim does not handle input',
+        name: "should call buffer.handleInput when vim does not handle input",
         vimHandled: false,
         expectBufferHandleInput: true,
       },
       {
-        name: 'should call handleInput when vim mode is disabled',
+        name: "should call handleInput when vim mode is disabled",
         vimHandled: false,
         expectBufferHandleInput: true,
       },
-    ])('$name', async ({ vimHandled, expectBufferHandleInput }) => {
+    ])("$name", async ({ vimHandled, expectBufferHandleInput }) => {
       props.vimHandleInput = vi.fn().mockReturnValue(vimHandled);
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
-      await act(async () => stdin.write('i'));
+      await act(async () => stdin.write("i"));
       await waitFor(() => {
         expect(props.vimHandleInput).toHaveBeenCalled();
         if (expectBufferHandleInput) {
@@ -1352,35 +1289,31 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('unfocused paste', () => {
-    it('should handle bracketed paste when not focused', async () => {
+  describe("unfocused paste", () => {
+    it("should handle bracketed paste when not focused", async () => {
       props.focus = false;
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x1B[200~pasted text\x1B[201~');
+        stdin.write("\x1B[200~pasted text\x1B[201~");
       });
       await waitFor(() => {
         expect(mockBuffer.handleInput).toHaveBeenCalledWith(
           expect.objectContaining({
             paste: true,
-            sequence: 'pasted text',
+            sequence: "pasted text",
           }),
         );
       });
       unmount();
     });
 
-    it('should ignore regular keypresses when not focused', async () => {
+    it("should ignore regular keypresses when not focused", async () => {
       props.focus = false;
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('a');
+        stdin.write("a");
       });
       await waitFor(() => {});
 
@@ -1389,139 +1322,132 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('Highlighting and Cursor Display', () => {
-    describe('single-line scenarios', () => {
+  describe("Highlighting and Cursor Display", () => {
+    describe("single-line scenarios", () => {
       it.each([
         {
-          name: 'mid-word',
-          text: 'hello world',
+          name: "mid-word",
+          text: "hello world",
           visualCursor: [0, 3],
-          expected: `hel${chalk.inverse('l')}o world`,
+          expected: `hel${chalk.inverse("l")}o world`,
         },
         {
-          name: 'at the beginning of the line',
-          text: 'hello',
+          name: "at the beginning of the line",
+          text: "hello",
           visualCursor: [0, 0],
-          expected: `${chalk.inverse('h')}ello`,
+          expected: `${chalk.inverse("h")}ello`,
         },
         {
-          name: 'at the end of the line',
-          text: 'hello',
+          name: "at the end of the line",
+          text: "hello",
           visualCursor: [0, 5],
-          expected: `hello${chalk.inverse(' ')}`,
+          expected: `hello${chalk.inverse(" ")}`,
         },
         {
-          name: 'on a highlighted token',
-          text: 'run @path/to/file',
+          name: "on a highlighted token",
+          text: "run @path/to/file",
           visualCursor: [0, 9],
-          expected: `@path/${chalk.inverse('t')}o/file`,
+          expected: `@path/${chalk.inverse("t")}o/file`,
         },
         {
-          name: 'for multi-byte unicode characters',
-          text: 'hello 👍 world',
+          name: "for multi-byte unicode characters",
+          text: "hello 👍 world",
           visualCursor: [0, 6],
-          expected: `hello ${chalk.inverse('👍')} world`,
+          expected: `hello ${chalk.inverse("👍")} world`,
         },
         {
-          name: 'at the end of a line with unicode characters',
-          text: 'hello 👍',
+          name: "at the end of a line with unicode characters",
+          text: "hello 👍",
           visualCursor: [0, 8],
-          expected: `hello 👍${chalk.inverse(' ')}`,
+          expected: `hello 👍${chalk.inverse(" ")}`,
         },
         {
-          name: 'on an empty line',
-          text: '',
+          name: "on an empty line",
+          text: "",
           visualCursor: [0, 0],
-          expected: chalk.inverse(' '),
+          expected: chalk.inverse(" "),
         },
         {
-          name: 'on a space between words',
-          text: 'hello world',
+          name: "on a space between words",
+          text: "hello world",
           visualCursor: [0, 5],
-          expected: `hello${chalk.inverse(' ')}world`,
-        },
-      ])(
-        'should display cursor correctly $name',
-        async ({ text, visualCursor, expected }) => {
-          mockBuffer.text = text;
-          mockBuffer.lines = [text];
-          mockBuffer.viewportVisualLines = [text];
-          mockBuffer.visualCursor = visualCursor as [number, number];
-
-          const { stdout, unmount } = renderWithProviders(
-            <InputPrompt {...props} />,
-          );
-
-          await waitFor(() => {
-            const frame = stdout.lastFrame();
-            expect(frame).toContain(expected);
-          });
-          unmount();
+          expected: `hello${chalk.inverse(" ")}world`,
         },
-      );
+      ])("should display cursor correctly $name", async ({ text, visualCursor, expected }) => {
+        mockBuffer.text = text;
+        mockBuffer.lines = [text];
+        mockBuffer.viewportVisualLines = [text];
+        mockBuffer.visualCursor = visualCursor as [number, number];
+
+        const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
+
+        await waitFor(() => {
+          const frame = stdout.lastFrame();
+          expect(frame).toContain(expected);
+        });
+        unmount();
+      });
     });
 
-    describe('multi-line scenarios', () => {
+    describe("multi-line scenarios", () => {
       it.each([
         {
-          name: 'in the middle of a line',
-          text: 'first line\nsecond line\nthird line',
+          name: "in the middle of a line",
+          text: "first line\nsecond line\nthird line",
           visualCursor: [1, 3],
           visualToLogicalMap: [
             [0, 0],
             [1, 0],
             [2, 0],
           ],
-          expected: `sec${chalk.inverse('o')}nd line`,
+          expected: `sec${chalk.inverse("o")}nd line`,
         },
         {
-          name: 'at the beginning of a line',
-          text: 'first line\nsecond line',
+          name: "at the beginning of a line",
+          text: "first line\nsecond line",
           visualCursor: [1, 0],
           visualToLogicalMap: [
             [0, 0],
             [1, 0],
           ],
-          expected: `${chalk.inverse('s')}econd line`,
+          expected: `${chalk.inverse("s")}econd line`,
         },
         {
-          name: 'at the end of a line',
-          text: 'first line\nsecond line',
+          name: "at the end of a line",
+          text: "first line\nsecond line",
           visualCursor: [0, 10],
           visualToLogicalMap: [
             [0, 0],
             [1, 0],
           ],
-          expected: `first line${chalk.inverse(' ')}`,
-        },
-      ])(
-        'should display cursor correctly $name in a multiline block',
-        async ({ text, visualCursor, expected, visualToLogicalMap }) => {
-          mockBuffer.text = text;
-          mockBuffer.lines = text.split('\n');
-          mockBuffer.viewportVisualLines = text.split('\n');
-          mockBuffer.visualCursor = visualCursor as [number, number];
-          mockBuffer.visualToLogicalMap = visualToLogicalMap as Array<
-            [number, number]
-          >;
-
-          const { stdout, unmount } = renderWithProviders(
-            <InputPrompt {...props} />,
-          );
-
-          await waitFor(() => {
-            const frame = stdout.lastFrame();
-            expect(frame).toContain(expected);
-          });
-          unmount();
+          expected: `first line${chalk.inverse(" ")}`,
         },
-      );
+      ])("should display cursor correctly $name in a multiline block", async ({
+        text,
+        visualCursor,
+        expected,
+        visualToLogicalMap,
+      }) => {
+        mockBuffer.text = text;
+        mockBuffer.lines = text.split("\n");
+        mockBuffer.viewportVisualLines = text.split("\n");
+        mockBuffer.visualCursor = visualCursor as [number, number];
+        mockBuffer.visualToLogicalMap = visualToLogicalMap as Array<[number, number]>;
 
-      it('should display cursor on a blank line in a multiline block', async () => {
-        const text = 'first line\n\nthird line';
+        const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
+
+        await waitFor(() => {
+          const frame = stdout.lastFrame();
+          expect(frame).toContain(expected);
+        });
+        unmount();
+      });
+
+      it("should display cursor on a blank line in a multiline block", async () => {
+        const text = "first line\n\nthird line";
         mockBuffer.text = text;
-        mockBuffer.lines = text.split('\n');
-        mockBuffer.viewportVisualLines = text.split('\n');
+        mockBuffer.lines = text.split("\n");
+        mockBuffer.viewportVisualLines = text.split("\n");
         mockBuffer.visualCursor = [1, 0]; // cursor on the blank line
         mockBuffer.visualToLogicalMap = [
           [0, 0],
@@ -1529,30 +1455,26 @@ describe('InputPrompt', () => {
           [2, 0],
         ];
 
-        const { stdout, unmount } = renderWithProviders(
-          <InputPrompt {...props} />,
-        );
+        const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
         await waitFor(() => {
           const frame = stdout.lastFrame();
-          const lines = frame!.split('\n');
+          const lines = frame!.split("\n");
           // The line with the cursor should just be an inverted space inside the box border
-          expect(
-            lines.find((l) => l.includes(chalk.inverse(' '))),
-          ).not.toBeUndefined();
+          expect(lines.find((l) => l.includes(chalk.inverse(" ")))).not.toBeUndefined();
         });
         unmount();
       });
     });
   });
 
-  describe('multiline rendering', () => {
-    it('should correctly render multiline input including blank lines', async () => {
-      const text = 'hello\n\nworld';
+  describe("multiline rendering", () => {
+    it("should correctly render multiline input including blank lines", async () => {
+      const text = "hello\n\nworld";
       mockBuffer.text = text;
-      mockBuffer.lines = text.split('\n');
-      mockBuffer.viewportVisualLines = text.split('\n');
-      mockBuffer.allVisualLines = text.split('\n');
+      mockBuffer.lines = text.split("\n");
+      mockBuffer.viewportVisualLines = text.split("\n");
+      mockBuffer.allVisualLines = text.split("\n");
       mockBuffer.visualCursor = [2, 5]; // cursor at the end of "world"
       // Provide a visual-to-logical mapping for each visual line
       mockBuffer.visualToLogicalMap = [
@@ -1561,18 +1483,16 @@ describe('InputPrompt', () => {
         [2, 0], // 'world' is logical line 2, col 0
       ];
 
-      const { stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await waitFor(() => {
         const frame = stdout.lastFrame();
         // Check that all lines, including the empty one, are rendered.
         // This implicitly tests that the Box wrapper provides height for the empty line.
-        expect(frame).toContain('hello');
-        expect(frame).toContain(`world${chalk.inverse(' ')}`);
+        expect(frame).toContain("hello");
+        expect(frame).toContain(`world${chalk.inverse(" ")}`);
 
-        const outputLines = frame!.split('\n');
+        const outputLines = frame!.split("\n");
         // The number of lines should be 2 for the border plus 3 for the content.
         expect(outputLines.length).toBe(5);
       });
@@ -1580,24 +1500,22 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('multiline paste', () => {
+  describe("multiline paste", () => {
     it.each([
       {
-        description: 'with \n newlines',
-        pastedText: 'This \n is \n a \n multiline \n paste.',
+        description: "with \n newlines",
+        pastedText: "This \n is \n a \n multiline \n paste.",
       },
       {
-        description: 'with extra slashes before \n newlines',
-        pastedText: 'This \\\n is \\\n a \\\n multiline \\\n paste.',
+        description: "with extra slashes before \n newlines",
+        pastedText: "This \\\n is \\\n a \\\n multiline \\\n paste.",
       },
       {
-        description: 'with \r\n newlines',
-        pastedText: 'This\r\nis\r\na\r\nmultiline\r\npaste.',
+        description: "with \r\n newlines",
+        pastedText: "This\r\nis\r\na\r\nmultiline\r\npaste.",
       },
-    ])('should handle multiline paste $description', async ({ pastedText }) => {
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+    ])("should handle multiline paste $description", async ({ pastedText }) => {
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       // Simulate a bracketed paste event from the terminal
       await act(async () => {
@@ -1618,7 +1536,7 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('paste auto-submission protection', () => {
+  describe("paste auto-submission protection", () => {
     beforeEach(() => {
       vi.useFakeTimers();
       mockedUseKittyKeyboardProtocol.mockReturnValue({
@@ -1631,13 +1549,11 @@ describe('InputPrompt', () => {
       vi.useRealTimers();
     });
 
-    it('should prevent auto-submission immediately after an unsafe paste', async () => {
+    it("should prevent auto-submission immediately after an unsafe paste", async () => {
       // isTerminalPasteTrusted will be false due to beforeEach setup.
-      props.buffer.text = 'some command';
+      props.buffer.text = "some command";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await act(async () => {
         await vi.runAllTimersAsync();
       });
@@ -1649,7 +1565,7 @@ describe('InputPrompt', () => {
 
       // Simulate an Enter key press immediately after paste
       await act(async () => {
-        stdin.write('\r');
+        stdin.write("\r");
       });
       await act(async () => {
         await vi.runAllTimersAsync();
@@ -1662,20 +1578,18 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should allow submission after unsafe paste protection timeout', async () => {
+    it("should allow submission after unsafe paste protection timeout", async () => {
       // isTerminalPasteTrusted will be false due to beforeEach setup.
-      props.buffer.text = 'pasted text';
+      props.buffer.text = "pasted text";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await act(async () => {
         await vi.runAllTimersAsync();
       });
 
       // Simulate a paste operation (this sets the protection)
       await act(async () => {
-        stdin.write('\x1b[200~pasted text\x1b[201~');
+        stdin.write("\x1b[200~pasted text\x1b[201~");
       });
       await act(async () => {
         await vi.runAllTimersAsync();
@@ -1688,13 +1602,13 @@ describe('InputPrompt', () => {
 
       // Now Enter should work normally
       await act(async () => {
-        stdin.write('\r');
+        stdin.write("\r");
       });
       await act(async () => {
         await vi.runAllTimersAsync();
       });
 
-      expect(props.onSubmit).toHaveBeenCalledWith('pasted text');
+      expect(props.onSubmit).toHaveBeenCalledWith("pasted text");
       expect(props.buffer.newline).not.toHaveBeenCalled();
 
       unmount();
@@ -1702,141 +1616,128 @@ describe('InputPrompt', () => {
 
     it.each([
       {
-        name: 'kitty',
+        name: "kitty",
         setup: () =>
           mockedUseKittyKeyboardProtocol.mockReturnValue({
             enabled: true,
             checking: false,
           }),
       },
-    ])(
-      'should allow immediate submission for a trusted paste ($name)',
-      async ({ setup }) => {
-        setup();
-        props.buffer.text = 'pasted command';
-
-        const { stdin, unmount } = renderWithProviders(
-          <InputPrompt {...props} />,
-        );
-        await act(async () => {
-          await vi.runAllTimersAsync();
-        });
+    ])("should allow immediate submission for a trusted paste ($name)", async ({ setup }) => {
+      setup();
+      props.buffer.text = "pasted command";
 
-        // Simulate a paste operation
-        await act(async () => {
-          stdin.write('\x1b[200~some pasted stuff\x1b[201~');
-        });
-        await act(async () => {
-          await vi.runAllTimersAsync();
-        });
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
+      await act(async () => {
+        await vi.runAllTimersAsync();
+      });
 
-        // Simulate an Enter key press immediately after paste
-        await act(async () => {
-          stdin.write('\r');
-        });
-        await act(async () => {
-          await vi.runAllTimersAsync();
-        });
+      // Simulate a paste operation
+      await act(async () => {
+        stdin.write("\x1b[200~some pasted stuff\x1b[201~");
+      });
+      await act(async () => {
+        await vi.runAllTimersAsync();
+      });
 
-        // Verify that onSubmit was called
-        expect(props.onSubmit).toHaveBeenCalledWith('pasted command');
-        unmount();
-      },
-    );
+      // Simulate an Enter key press immediately after paste
+      await act(async () => {
+        stdin.write("\r");
+      });
+      await act(async () => {
+        await vi.runAllTimersAsync();
+      });
 
-    it('should not interfere with normal Enter key submission when no recent paste', async () => {
+      // Verify that onSubmit was called
+      expect(props.onSubmit).toHaveBeenCalledWith("pasted command");
+      unmount();
+    });
+
+    it("should not interfere with normal Enter key submission when no recent paste", async () => {
       // Set up buffer with text before rendering to ensure submission works
-      props.buffer.text = 'normal command';
+      props.buffer.text = "normal command";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await act(async () => {
         await vi.runAllTimersAsync();
       });
 
       // Press Enter without any recent paste
       await act(async () => {
-        stdin.write('\r');
+        stdin.write("\r");
       });
       await act(async () => {
         await vi.runAllTimersAsync();
       });
 
       // Verify that onSubmit was called normally
-      expect(props.onSubmit).toHaveBeenCalledWith('normal command');
+      expect(props.onSubmit).toHaveBeenCalledWith("normal command");
 
       unmount();
     });
   });
 
-  describe('enhanced input UX - double ESC clear functionality', () => {
+  describe("enhanced input UX - double ESC clear functionality", () => {
     beforeEach(() => vi.useFakeTimers());
     afterEach(() => vi.useRealTimers());
 
-    it('should clear buffer on second ESC press', async () => {
+    it("should clear buffer on second ESC press", async () => {
       const onEscapePromptChange = vi.fn();
       props.onEscapePromptChange = onEscapePromptChange;
-      props.buffer.setText('text to clear');
+      props.buffer.setText("text to clear");
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x1B');
+        stdin.write("\x1B");
         vi.advanceTimersByTime(100);
 
         expect(onEscapePromptChange).toHaveBeenCalledWith(false);
       });
 
       await act(async () => {
-        stdin.write('\x1B');
+        stdin.write("\x1B");
         vi.advanceTimersByTime(100);
 
-        expect(props.buffer.setText).toHaveBeenCalledWith('');
+        expect(props.buffer.setText).toHaveBeenCalledWith("");
         expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
       });
       unmount();
     });
 
-    it('should clear buffer on double ESC', async () => {
+    it("should clear buffer on double ESC", async () => {
       const onEscapePromptChange = vi.fn();
       props.onEscapePromptChange = onEscapePromptChange;
-      props.buffer.setText('text to clear');
+      props.buffer.setText("text to clear");
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x1B\x1B');
+        stdin.write("\x1B\x1B");
         vi.advanceTimersByTime(100);
 
-        expect(props.buffer.setText).toHaveBeenCalledWith('');
+        expect(props.buffer.setText).toHaveBeenCalledWith("");
         expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
       });
       unmount();
     });
 
-    it('should reset escape state on any non-ESC key', async () => {
+    it("should reset escape state on any non-ESC key", async () => {
       const onEscapePromptChange = vi.fn();
       props.onEscapePromptChange = onEscapePromptChange;
-      props.buffer.setText('some text');
+      props.buffer.setText("some text");
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x1B');
+        stdin.write("\x1B");
         await waitFor(() => {
           expect(onEscapePromptChange).toHaveBeenCalledWith(false);
         });
       });
 
       await act(async () => {
-        stdin.write('a');
+        stdin.write("a");
         await waitFor(() => {
           expect(onEscapePromptChange).toHaveBeenCalledWith(false);
         });
@@ -1844,15 +1745,13 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should handle ESC in shell mode by disabling shell mode', async () => {
+    it("should handle ESC in shell mode by disabling shell mode", async () => {
       props.shellModeActive = true;
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x1B');
+        stdin.write("\x1B");
         vi.advanceTimersByTime(100);
 
         expect(props.setShellModeActive).toHaveBeenCalledWith(false);
@@ -1860,19 +1759,17 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should handle ESC when completion suggestions are showing', async () => {
+    it("should handle ESC when completion suggestions are showing", async () => {
       mockedUseCommandCompletion.mockReturnValue({
         ...mockCommandCompletion,
         showSuggestions: true,
-        suggestions: [{ label: 'suggestion', value: 'suggestion' }],
+        suggestions: [{ label: "suggestion", value: "suggestion" }],
       });
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x1B');
+        stdin.write("\x1B");
 
         vi.advanceTimersByTime(100);
         expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
@@ -1880,19 +1777,17 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should not call onEscapePromptChange when not provided', async () => {
+    it("should not call onEscapePromptChange when not provided", async () => {
       props.onEscapePromptChange = undefined;
-      props.buffer.setText('some text');
+      props.buffer.setText("some text");
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await act(async () => {
         await vi.runAllTimersAsync();
       });
 
       await act(async () => {
-        stdin.write('\x1B');
+        stdin.write("\x1B");
       });
       await act(async () => {
         await vi.runAllTimersAsync();
@@ -1901,32 +1796,28 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should not interfere with existing keyboard shortcuts', async () => {
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+    it("should not interfere with existing keyboard shortcuts", async () => {
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x0C');
+        stdin.write("\x0C");
       });
       await waitFor(() => expect(props.onClearScreen).toHaveBeenCalled());
 
       await act(async () => {
-        stdin.write('\x01');
+        stdin.write("\x01");
       });
-      await waitFor(() =>
-        expect(props.buffer.move).toHaveBeenCalledWith('home'),
-      );
+      await waitFor(() => expect(props.buffer.move).toHaveBeenCalledWith("home"));
       unmount();
     });
   });
 
-  describe('reverse search', () => {
+  describe("reverse search", () => {
     beforeEach(async () => {
       props.shellModeActive = true;
 
       vi.mocked(useShellHistory).mockReturnValue({
-        history: ['echo hello', 'echo world', 'ls'],
+        history: ["echo hello", "echo world", "ls"],
         getPreviousCommand: vi.fn(),
         getNextCommand: vi.fn(),
         addCommandToHistory: vi.fn(),
@@ -1934,75 +1825,68 @@ describe('InputPrompt', () => {
       });
     });
 
-    it('invokes reverse search on Ctrl+R', async () => {
+    it("invokes reverse search on Ctrl+R", async () => {
       // Mock the reverse search completion to return suggestions
       mockedUseReverseSearchCompletion.mockReturnValue({
         ...mockReverseSearchCompletion,
         suggestions: [
-          { label: 'echo hello', value: 'echo hello' },
-          { label: 'echo world', value: 'echo world' },
-          { label: 'ls', value: 'ls' },
+          { label: "echo hello", value: "echo hello" },
+          { label: "echo world", value: "echo world" },
+          { label: "ls", value: "ls" },
         ],
         showSuggestions: true,
         activeSuggestionIndex: 0,
       });
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       // Trigger reverse search with Ctrl+R
       await act(async () => {
-        stdin.write('\x12');
+        stdin.write("\x12");
       });
 
       await waitFor(() => {
         const frame = stdout.lastFrame();
-        expect(frame).toContain('(r:)');
-        expect(frame).toContain('echo hello');
-        expect(frame).toContain('echo world');
-        expect(frame).toContain('ls');
+        expect(frame).toContain("(r:)");
+        expect(frame).toContain("echo hello");
+        expect(frame).toContain("echo world");
+        expect(frame).toContain("ls");
       });
 
       unmount();
     });
 
     it.each([
-      { name: 'standard', escapeSequence: '\x1B' },
-      { name: 'kitty', escapeSequence: '\u001b[27u' },
-    ])(
-      'resets reverse search state on Escape ($name)',
-      async ({ escapeSequence }) => {
-        const { stdin, stdout, unmount } = renderWithProviders(
-          <InputPrompt {...props} />,
-        );
+      { name: "standard", escapeSequence: "\x1B" },
+      { name: "kitty", escapeSequence: "\u001b[27u" },
+    ])("resets reverse search state on Escape ($name)", async ({ escapeSequence }) => {
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
-        await act(async () => {
-          stdin.write('\x12');
-        });
+      await act(async () => {
+        stdin.write("\x12");
+      });
 
-        // Wait for reverse search to be active
-        await waitFor(() => {
-          expect(stdout.lastFrame()).toContain('(r:)');
-        });
+      // Wait for reverse search to be active
+      await waitFor(() => {
+        expect(stdout.lastFrame()).toContain("(r:)");
+      });
 
-        await act(async () => {
-          stdin.write(escapeSequence);
-        });
+      await act(async () => {
+        stdin.write(escapeSequence);
+      });
 
-        await waitFor(() => {
-          expect(stdout.lastFrame()).not.toContain('(r:)');
-          expect(stdout.lastFrame()).not.toContain('echo hello');
-        });
+      await waitFor(() => {
+        expect(stdout.lastFrame()).not.toContain("(r:)");
+        expect(stdout.lastFrame()).not.toContain("echo hello");
+      });
 
-        unmount();
-      },
-    );
+      unmount();
+    });
 
-    it('completes the highlighted entry on Tab and exits reverse-search', async () => {
+    it("completes the highlighted entry on Tab and exits reverse-search", async () => {
       // Mock the reverse search completion
       const mockHandleAutocomplete = vi.fn(() => {
-        props.buffer.setText('echo hello');
+        props.buffer.setText("echo hello");
       });
 
       mockedUseReverseSearchCompletion.mockImplementation(
@@ -2010,9 +1894,9 @@ describe('InputPrompt', () => {
           ...mockReverseSearchCompletion,
           suggestions: reverseSearchActive
             ? [
-                { label: 'echo hello', value: 'echo hello' },
-                { label: 'echo world', value: 'echo world' },
-                { label: 'ls', value: 'ls' },
+                { label: "echo hello", value: "echo hello" },
+                { label: "echo world", value: "echo world" },
+                { label: "ls", value: "ls" },
               ]
             : [],
           showSuggestions: reverseSearchActive,
@@ -2021,70 +1905,66 @@ describe('InputPrompt', () => {
         }),
       );
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       // Enter reverse search mode with Ctrl+R
       await act(async () => {
-        stdin.write('\x12');
+        stdin.write("\x12");
       });
 
       // Verify reverse search is active
       await waitFor(() => {
-        expect(stdout.lastFrame()).toContain('(r:)');
+        expect(stdout.lastFrame()).toContain("(r:)");
       });
 
       // Press Tab to complete the highlighted entry
       await act(async () => {
-        stdin.write('\t');
+        stdin.write("\t");
       });
       await waitFor(() => {
         expect(mockHandleAutocomplete).toHaveBeenCalledWith(0);
-        expect(props.buffer.setText).toHaveBeenCalledWith('echo hello');
+        expect(props.buffer.setText).toHaveBeenCalledWith("echo hello");
       });
       unmount();
     }, 15000);
 
-    it('submits the highlighted entry on Enter and exits reverse-search', async () => {
+    it("submits the highlighted entry on Enter and exits reverse-search", async () => {
       // Mock the reverse search completion to return suggestions
       mockedUseReverseSearchCompletion.mockReturnValue({
         ...mockReverseSearchCompletion,
         suggestions: [
-          { label: 'echo hello', value: 'echo hello' },
-          { label: 'echo world', value: 'echo world' },
-          { label: 'ls', value: 'ls' },
+          { label: "echo hello", value: "echo hello" },
+          { label: "echo world", value: "echo world" },
+          { label: "ls", value: "ls" },
         ],
         showSuggestions: true,
         activeSuggestionIndex: 0,
       });
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x12');
+        stdin.write("\x12");
       });
 
       await waitFor(() => {
-        expect(stdout.lastFrame()).toContain('(r:)');
+        expect(stdout.lastFrame()).toContain("(r:)");
       });
 
       await act(async () => {
-        stdin.write('\r');
+        stdin.write("\r");
       });
 
       await waitFor(() => {
-        expect(stdout.lastFrame()).not.toContain('(r:)');
+        expect(stdout.lastFrame()).not.toContain("(r:)");
       });
 
-      expect(props.onSubmit).toHaveBeenCalledWith('echo hello');
+      expect(props.onSubmit).toHaveBeenCalledWith("echo hello");
       unmount();
     });
 
     it('should restore text and cursor position after reverse search"', async () => {
-      const initialText = 'initial text';
+      const initialText = "initial text";
       const initialCursor: [number, number] = [0, 3];
 
       props.buffer.setText(initialText);
@@ -2095,32 +1975,30 @@ describe('InputPrompt', () => {
         (buffer, shellHistory, reverseSearchActiveFromInputPrompt) => ({
           ...mockReverseSearchCompletion,
           suggestions: reverseSearchActiveFromInputPrompt
-            ? [{ label: 'history item', value: 'history item' }]
+            ? [{ label: "history item", value: "history item" }]
             : [],
           showSuggestions: reverseSearchActiveFromInputPrompt,
         }),
       );
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       // reverse search with Ctrl+R
       await act(async () => {
-        stdin.write('\x12');
+        stdin.write("\x12");
       });
 
       await waitFor(() => {
-        expect(stdout.lastFrame()).toContain('(r:)');
+        expect(stdout.lastFrame()).toContain("(r:)");
       });
 
       // Press kitty escape key
       await act(async () => {
-        stdin.write('\u001b[27u');
+        stdin.write("\u001b[27u");
       });
 
       await waitFor(() => {
-        expect(stdout.lastFrame()).not.toContain('(r:)');
+        expect(stdout.lastFrame()).not.toContain("(r:)");
         expect(props.buffer.text).toBe(initialText);
         expect(props.buffer.cursor).toEqual(initialCursor);
       });
@@ -2129,84 +2007,76 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('Ctrl+E keyboard shortcut', () => {
-    it('should move cursor to end of current line in multiline input', async () => {
-      props.buffer.text = 'line 1\nline 2\nline 3';
+  describe("Ctrl+E keyboard shortcut", () => {
+    it("should move cursor to end of current line in multiline input", async () => {
+      props.buffer.text = "line 1\nline 2\nline 3";
       props.buffer.cursor = [1, 2];
-      props.buffer.lines = ['line 1', 'line 2', 'line 3'];
+      props.buffer.lines = ["line 1", "line 2", "line 3"];
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x05'); // Ctrl+E
+        stdin.write("\x05"); // Ctrl+E
       });
       await waitFor(() => {
-        expect(props.buffer.move).toHaveBeenCalledWith('end');
+        expect(props.buffer.move).toHaveBeenCalledWith("end");
       });
       expect(props.buffer.moveToOffset).not.toHaveBeenCalled();
       unmount();
     });
 
-    it('should move cursor to end of current line for single line input', async () => {
-      props.buffer.text = 'single line text';
+    it("should move cursor to end of current line for single line input", async () => {
+      props.buffer.text = "single line text";
       props.buffer.cursor = [0, 5];
-      props.buffer.lines = ['single line text'];
+      props.buffer.lines = ["single line text"];
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x05'); // Ctrl+E
+        stdin.write("\x05"); // Ctrl+E
       });
       await waitFor(() => {
-        expect(props.buffer.move).toHaveBeenCalledWith('end');
+        expect(props.buffer.move).toHaveBeenCalledWith("end");
       });
       expect(props.buffer.moveToOffset).not.toHaveBeenCalled();
       unmount();
     });
   });
 
-  describe('command search (Ctrl+R when not in shell)', () => {
-    it('enters command search on Ctrl+R and shows suggestions', async () => {
+  describe("command search (Ctrl+R when not in shell)", () => {
+    it("enters command search on Ctrl+R and shows suggestions", async () => {
       props.shellModeActive = false;
 
-      vi.mocked(useReverseSearchCompletion).mockImplementation(
-        (buffer, data, isActive) => ({
-          ...mockReverseSearchCompletion,
-          suggestions: isActive
-            ? [
-                { label: 'git commit -m "msg"', value: 'git commit -m "msg"' },
-                { label: 'git push', value: 'git push' },
-              ]
-            : [],
-          showSuggestions: !!isActive,
-          activeSuggestionIndex: isActive ? 0 : -1,
-        }),
-      );
+      vi.mocked(useReverseSearchCompletion).mockImplementation((buffer, data, isActive) => ({
+        ...mockReverseSearchCompletion,
+        suggestions: isActive
+          ? [
+              { label: 'git commit -m "msg"', value: 'git commit -m "msg"' },
+              { label: "git push", value: "git push" },
+            ]
+          : [],
+        showSuggestions: !!isActive,
+        activeSuggestionIndex: isActive ? 0 : -1,
+      }));
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x12'); // Ctrl+R
+        stdin.write("\x12"); // Ctrl+R
       });
 
       await waitFor(() => {
-        const frame = stdout.lastFrame() ?? '';
-        expect(frame).toContain('(r:)');
-        expect(frame).toContain('git commit');
-        expect(frame).toContain('git push');
+        const frame = stdout.lastFrame() ?? "";
+        expect(frame).toContain("(r:)");
+        expect(frame).toContain("git commit");
+        expect(frame).toContain("git push");
       });
       unmount();
     });
 
-    it('expands and collapses long suggestion via Right/Left arrows', async () => {
+    it("expands and collapses long suggestion via Right/Left arrows", async () => {
       props.shellModeActive = false;
-      const longValue = 'l'.repeat(200);
+      const longValue = "l".repeat(200);
 
       vi.mocked(useReverseSearchCompletion).mockReturnValue({
         ...mockReverseSearchCompletion,
@@ -2217,45 +2087,39 @@ describe('InputPrompt', () => {
         isLoadingSuggestions: false,
       });
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x12');
+        stdin.write("\x12");
       });
       await waitFor(() => {
-        expect(clean(stdout.lastFrame())).toContain('→');
+        expect(clean(stdout.lastFrame())).toContain("→");
       });
 
       await act(async () => {
-        stdin.write('\u001B[C');
+        stdin.write("\u001B[C");
       });
       await waitFor(() => {
-        expect(clean(stdout.lastFrame())).toContain('←');
+        expect(clean(stdout.lastFrame())).toContain("←");
       });
-      expect(stdout.lastFrame()).toMatchSnapshot(
-        'command-search-render-expanded-match',
-      );
+      expect(stdout.lastFrame()).toMatchSnapshot("command-search-render-expanded-match");
 
       await act(async () => {
-        stdin.write('\u001B[D');
+        stdin.write("\u001B[D");
       });
       await waitFor(() => {
-        expect(clean(stdout.lastFrame())).toContain('→');
+        expect(clean(stdout.lastFrame())).toContain("→");
       });
-      expect(stdout.lastFrame()).toMatchSnapshot(
-        'command-search-render-collapsed-match',
-      );
+      expect(stdout.lastFrame()).toMatchSnapshot("command-search-render-collapsed-match");
       unmount();
     });
 
-    it('renders match window and expanded view (snapshots)', async () => {
+    it("renders match window and expanded view (snapshots)", async () => {
       props.shellModeActive = false;
-      props.buffer.setText('commit');
+      props.buffer.setText("commit");
 
       const label = 'git commit -m "feat: add search" in src/app';
-      const matchedIndex = label.indexOf('commit');
+      const matchedIndex = label.indexOf("commit");
 
       vi.mocked(useReverseSearchCompletion).mockReturnValue({
         ...mockReverseSearchCompletion,
@@ -2266,34 +2130,28 @@ describe('InputPrompt', () => {
         isLoadingSuggestions: false,
       });
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x12');
+        stdin.write("\x12");
       });
       await waitFor(() => {
-        expect(stdout.lastFrame()).toMatchSnapshot(
-          'command-search-render-collapsed-match',
-        );
+        expect(stdout.lastFrame()).toMatchSnapshot("command-search-render-collapsed-match");
       });
 
       await act(async () => {
-        stdin.write('\u001B[C');
+        stdin.write("\u001B[C");
       });
       await waitFor(() => {
-        expect(stdout.lastFrame()).toMatchSnapshot(
-          'command-search-render-expanded-match',
-        );
+        expect(stdout.lastFrame()).toMatchSnapshot("command-search-render-expanded-match");
       });
 
       unmount();
     });
 
-    it('does not show expand/collapse indicator for short suggestions', async () => {
+    it("does not show expand/collapse indicator for short suggestions", async () => {
       props.shellModeActive = false;
-      const shortValue = 'echo hello';
+      const shortValue = "echo hello";
 
       vi.mocked(useReverseSearchCompletion).mockReturnValue({
         ...mockReverseSearchCompletion,
@@ -2304,107 +2162,99 @@ describe('InputPrompt', () => {
         isLoadingSuggestions: false,
       });
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\x12');
+        stdin.write("\x12");
       });
       await waitFor(() => {
         const frame = clean(stdout.lastFrame());
         // Ensure it rendered the search mode
-        expect(frame).toContain('(r:)');
-        expect(frame).not.toContain('→');
-        expect(frame).not.toContain('←');
+        expect(frame).toContain("(r:)");
+        expect(frame).not.toContain("→");
+        expect(frame).not.toContain("←");
       });
       unmount();
     });
   });
 
-  describe('mouse interaction', () => {
+  describe("mouse interaction", () => {
     it.each([
       {
-        name: 'first line, first char',
+        name: "first line, first char",
         relX: 0,
         relY: 0,
         mouseCol: 5,
         mouseRow: 2,
       },
       {
-        name: 'first line, middle char',
+        name: "first line, middle char",
         relX: 6,
         relY: 0,
         mouseCol: 11,
         mouseRow: 2,
       },
       {
-        name: 'second line, first char',
+        name: "second line, first char",
         relX: 0,
         relY: 1,
         mouseCol: 5,
         mouseRow: 3,
       },
       {
-        name: 'second line, end char',
+        name: "second line, end char",
         relX: 5,
         relY: 1,
         mouseCol: 10,
         mouseRow: 3,
       },
-    ])(
-      'should move cursor on mouse click - $name',
-      async ({ relX, relY, mouseCol, mouseRow }) => {
-        props.buffer.text = 'hello world\nsecond line';
-        props.buffer.lines = ['hello world', 'second line'];
-        props.buffer.viewportVisualLines = ['hello world', 'second line'];
-        props.buffer.visualToLogicalMap = [
-          [0, 0],
-          [1, 0],
-        ];
-        props.buffer.visualCursor = [0, 11];
-        props.buffer.visualScrollRow = 0;
+    ])("should move cursor on mouse click - $name", async ({ relX, relY, mouseCol, mouseRow }) => {
+      props.buffer.text = "hello world\nsecond line";
+      props.buffer.lines = ["hello world", "second line"];
+      props.buffer.viewportVisualLines = ["hello world", "second line"];
+      props.buffer.visualToLogicalMap = [
+        [0, 0],
+        [1, 0],
+      ];
+      props.buffer.visualCursor = [0, 11];
+      props.buffer.visualScrollRow = 0;
 
-        const { stdin, stdout, unmount } = renderWithProviders(
-          <InputPrompt {...props} />,
-          { mouseEventsEnabled: true, uiActions },
-        );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />, {
+        mouseEventsEnabled: true,
+        uiActions,
+      });
 
-        // Wait for initial render
-        await waitFor(() => {
-          expect(stdout.lastFrame()).toContain('hello world');
-        });
+      // Wait for initial render
+      await waitFor(() => {
+        expect(stdout.lastFrame()).toContain("hello world");
+      });
 
-        // Simulate left mouse press at calculated coordinates.
-        // Assumes inner box is at x=4, y=1 based on border(1)+padding(1)+prompt(2) and border-top(1).
-        await act(async () => {
-          stdin.write(`\x1b[<0;${mouseCol};${mouseRow}M`);
-        });
+      // Simulate left mouse press at calculated coordinates.
+      // Assumes inner box is at x=4, y=1 based on border(1)+padding(1)+prompt(2) and border-top(1).
+      await act(async () => {
+        stdin.write(`\x1b[<0;${mouseCol};${mouseRow}M`);
+      });
 
-        await waitFor(() => {
-          expect(props.buffer.moveToVisualPosition).toHaveBeenCalledWith(
-            relY,
-            relX,
-          );
-        });
+      await waitFor(() => {
+        expect(props.buffer.moveToVisualPosition).toHaveBeenCalledWith(relY, relX);
+      });
 
-        unmount();
-      },
-    );
+      unmount();
+    });
 
-    it('should unfocus embedded shell on click', async () => {
-      props.buffer.text = 'hello';
-      props.buffer.lines = ['hello'];
-      props.buffer.viewportVisualLines = ['hello'];
+    it("should unfocus embedded shell on click", async () => {
+      props.buffer.text = "hello";
+      props.buffer.lines = ["hello"];
+      props.buffer.viewportVisualLines = ["hello"];
       props.buffer.visualToLogicalMap = [[0, 0]];
       props.isEmbeddedShellFocused = true;
 
-      const { stdin, stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-        { mouseEventsEnabled: true, uiActions },
-      );
+      const { stdin, stdout, unmount } = renderWithProviders(<InputPrompt {...props} />, {
+        mouseEventsEnabled: true,
+        uiActions,
+      });
       await waitFor(() => {
-        expect(stdout.lastFrame()).toContain('hello');
+        expect(stdout.lastFrame()).toContain("hello");
       });
 
       await act(async () => {
@@ -2420,59 +2270,49 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('queued message editing', () => {
-    it('should load all queued messages when up arrow is pressed with empty input', async () => {
+  describe("queued message editing", () => {
+    it("should load all queued messages when up arrow is pressed with empty input", async () => {
       const mockPopAllMessages = vi.fn();
-      mockPopAllMessages.mockReturnValue('Message 1\n\nMessage 2\n\nMessage 3');
+      mockPopAllMessages.mockReturnValue("Message 1\n\nMessage 2\n\nMessage 3");
       props.popAllMessages = mockPopAllMessages;
-      props.buffer.text = '';
+      props.buffer.text = "";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
       await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
 
-      expect(props.buffer.setText).toHaveBeenCalledWith(
-        'Message 1\n\nMessage 2\n\nMessage 3',
-      );
+      expect(props.buffer.setText).toHaveBeenCalledWith("Message 1\n\nMessage 2\n\nMessage 3");
       unmount();
     });
 
-    it('should not load queued messages when input is not empty', async () => {
+    it("should not load queued messages when input is not empty", async () => {
       const mockPopAllMessages = vi.fn();
       props.popAllMessages = mockPopAllMessages;
-      props.buffer.text = 'some text';
+      props.buffer.text = "some text";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
-      await waitFor(() =>
-        expect(mockInputHistory.navigateUp).toHaveBeenCalled(),
-      );
+      await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
       expect(mockPopAllMessages).not.toHaveBeenCalled();
       unmount();
     });
 
-    it('should handle undefined messages from popAllMessages', async () => {
+    it("should handle undefined messages from popAllMessages", async () => {
       const mockPopAllMessages = vi.fn();
       mockPopAllMessages.mockReturnValue(undefined);
       props.popAllMessages = mockPopAllMessages;
-      props.buffer.text = '';
+      props.buffer.text = "";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
       await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
 
@@ -2481,89 +2321,77 @@ describe('InputPrompt', () => {
       unmount();
     });
 
-    it('should work with NAVIGATION_UP key as well', async () => {
+    it("should work with NAVIGATION_UP key as well", async () => {
       const mockPopAllMessages = vi.fn();
       props.popAllMessages = mockPopAllMessages;
-      props.buffer.text = '';
-      props.buffer.allVisualLines = [''];
+      props.buffer.text = "";
+      props.buffer.allVisualLines = [""];
       props.buffer.visualCursor = [0, 0];
       props.buffer.visualScrollRow = 0;
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
       await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
       unmount();
     });
 
-    it('should handle single queued message', async () => {
+    it("should handle single queued message", async () => {
       const mockPopAllMessages = vi.fn();
-      mockPopAllMessages.mockReturnValue('Single message');
+      mockPopAllMessages.mockReturnValue("Single message");
       props.popAllMessages = mockPopAllMessages;
-      props.buffer.text = '';
+      props.buffer.text = "";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
       await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
 
-      expect(props.buffer.setText).toHaveBeenCalledWith('Single message');
+      expect(props.buffer.setText).toHaveBeenCalledWith("Single message");
       unmount();
     });
 
-    it('should only check for queued messages when buffer text is trimmed empty', async () => {
+    it("should only check for queued messages when buffer text is trimmed empty", async () => {
       const mockPopAllMessages = vi.fn();
       props.popAllMessages = mockPopAllMessages;
-      props.buffer.text = '   '; // Whitespace only
+      props.buffer.text = "   "; // Whitespace only
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
       await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
       unmount();
     });
 
-    it('should not call popAllMessages if it is not provided', async () => {
+    it("should not call popAllMessages if it is not provided", async () => {
       props.popAllMessages = undefined;
-      props.buffer.text = '';
+      props.buffer.text = "";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
-      await waitFor(() =>
-        expect(mockInputHistory.navigateUp).toHaveBeenCalled(),
-      );
+      await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
       unmount();
     });
 
-    it('should navigate input history on fresh start when no queued messages exist', async () => {
+    it("should navigate input history on fresh start when no queued messages exist", async () => {
       const mockPopAllMessages = vi.fn();
       mockPopAllMessages.mockReturnValue(undefined);
       props.popAllMessages = mockPopAllMessages;
-      props.buffer.text = '';
+      props.buffer.text = "";
 
-      const { stdin, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
 
       await act(async () => {
-        stdin.write('\u001B[A');
+        stdin.write("\u001B[A");
       });
       await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
 
@@ -2574,40 +2402,32 @@ describe('InputPrompt', () => {
     });
   });
 
-  describe('snapshots', () => {
-    it('should render correctly in shell mode', async () => {
+  describe("snapshots", () => {
+    it("should render correctly in shell mode", async () => {
       props.shellModeActive = true;
-      const { stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
       unmount();
     });
 
-    it('should render correctly when accepting edits', async () => {
+    it("should render correctly when accepting edits", async () => {
       props.approvalMode = ApprovalMode.AUTO_EDIT;
-      const { stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
       unmount();
     });
 
-    it('should render correctly in yolo mode', async () => {
+    it("should render correctly in yolo mode", async () => {
       props.approvalMode = ApprovalMode.YOLO;
-      const { stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
       unmount();
     });
 
-    it('should not show inverted cursor when shell is focused', async () => {
+    it("should not show inverted cursor when shell is focused", async () => {
       props.isEmbeddedShellFocused = true;
       props.focus = false;
-      const { stdout, unmount } = renderWithProviders(
-        <InputPrompt {...props} />,
-      );
+      const { stdout, unmount } = renderWithProviders(<InputPrompt {...props} />);
       await waitFor(() => {
         expect(stdout.lastFrame()).not.toContain(`{chalk.inverse(' ')}`);
         expect(stdout.lastFrame()).toMatchSnapshot();
@@ -2616,18 +2436,18 @@ describe('InputPrompt', () => {
     });
   });
 
-  it('should still allow input when shell is not focused', async () => {
+  it("should still allow input when shell is not focused", async () => {
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />, {
       shellFocus: false,
     });
 
     await act(async () => {
-      stdin.write('a');
+      stdin.write("a");
     });
     await waitFor(() => expect(mockBuffer.handleInput).toHaveBeenCalled());
     unmount();
   });
-  describe('command queuing while streaming', () => {
+  describe("command queuing while streaming", () => {
     beforeEach(() => {
       props.streamingState = StreamingState.Responding;
       props.setQueueErrorMessage = vi.fn();
@@ -2636,57 +2456,50 @@ describe('InputPrompt', () => {
 
     it.each([
       {
-        name: 'should prevent slash commands',
-        bufferText: '/help',
+        name: "should prevent slash commands",
+        bufferText: "/help",
         shellMode: false,
         shouldSubmit: false,
-        errorMessage: 'Slash commands cannot be queued',
+        errorMessage: "Slash commands cannot be queued",
       },
       {
-        name: 'should prevent shell commands',
-        bufferText: 'ls',
+        name: "should prevent shell commands",
+        bufferText: "ls",
         shellMode: true,
         shouldSubmit: false,
-        errorMessage: 'Shell commands cannot be queued',
+        errorMessage: "Shell commands cannot be queued",
       },
       {
-        name: 'should allow regular messages',
-        bufferText: 'regular message',
+        name: "should allow regular messages",
+        bufferText: "regular message",
         shellMode: false,
         shouldSubmit: true,
         errorMessage: null,
       },
-    ])(
-      '$name',
-      async ({ bufferText, shellMode, shouldSubmit, errorMessage }) => {
-        props.buffer.text = bufferText;
-        props.shellModeActive = shellMode;
-
-        const { stdin, unmount } = renderWithProviders(
-          <InputPrompt {...props} />,
-        );
-        await act(async () => {
-          stdin.write('\r');
-        });
-        await waitFor(() => {
-          if (shouldSubmit) {
-            expect(props.onSubmit).toHaveBeenCalledWith(bufferText);
-            expect(props.setQueueErrorMessage).not.toHaveBeenCalled();
-          } else {
-            expect(props.onSubmit).not.toHaveBeenCalled();
-            expect(props.setQueueErrorMessage).toHaveBeenCalledWith(
-              errorMessage,
-            );
-          }
-        });
-        unmount();
-      },
-    );
+    ])("$name", async ({ bufferText, shellMode, shouldSubmit, errorMessage }) => {
+      props.buffer.text = bufferText;
+      props.shellModeActive = shellMode;
+
+      const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
+      await act(async () => {
+        stdin.write("\r");
+      });
+      await waitFor(() => {
+        if (shouldSubmit) {
+          expect(props.onSubmit).toHaveBeenCalledWith(bufferText);
+          expect(props.setQueueErrorMessage).not.toHaveBeenCalled();
+        } else {
+          expect(props.onSubmit).not.toHaveBeenCalled();
+          expect(props.setQueueErrorMessage).toHaveBeenCalledWith(errorMessage);
+        }
+      });
+      unmount();
+    });
   });
 });
 
 function clean(str: string | undefined): string {
-  if (!str) return '';
+  if (!str) return "";
   // Remove ANSI escape codes and trim whitespace
   return stripAnsi(str).trim();
 }
diff --git a/packages/ui-gemini/src/ui/components/InputPrompt.tsx b/packages/ui-gemini/src/ui/components/InputPrompt.tsx
index 84cfe4c9d..48e3cc798 100644
--- a/packages/ui-gemini/src/ui/components/InputPrompt.tsx
+++ b/packages/ui-gemini/src/ui/components/InputPrompt.tsx
@@ -4,58 +4,50 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import clipboardy from 'clipboardy';
-import { useCallback, useEffect, useState, useRef } from 'react';
-import { Box, Text, type DOMElement } from 'ink';
-import { SuggestionsDisplay, MAX_WIDTH } from './SuggestionsDisplay.js';
-import { theme } from '../semantic-colors.js';
-import { useInputHistory } from '../hooks/useInputHistory.js';
-import type { TextBuffer } from './shared/text-buffer.js';
-import { logicalPosToOffset } from './shared/text-buffer.js';
-import { cpSlice, cpLen, toCodePoints } from '../utils/textUtils.js';
-import chalk from 'chalk';
-import stringWidth from 'string-width';
-import { useShellHistory } from '../hooks/useShellHistory.js';
-import { useReverseSearchCompletion } from '../hooks/useReverseSearchCompletion.js';
-import { useCommandCompletion } from '../hooks/useCommandCompletion.js';
-import type { Key } from '../hooks/useKeypress.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { keyMatchers, Command } from '../keyMatchers.js';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { ApprovalMode } from '@airiscode/gemini-cli-core';
-import {
-  parseInputForHighlighting,
-  buildSegmentsForVisualSlice,
-} from '../utils/highlight.js';
-import { useKittyKeyboardProtocol } from '../hooks/useKittyKeyboardProtocol.js';
+import * as path from "node:path";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { ApprovalMode } from "@airiscode/gemini-cli-core";
+import chalk from "chalk";
+import clipboardy from "clipboardy";
+import { Box, type DOMElement, Text } from "ink";
+import type React from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
+import stringWidth from "string-width";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import { type MouseEvent, useMouse } from "../contexts/MouseContext.js";
+import { useShellFocusState } from "../contexts/ShellFocusContext.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useCommandCompletion } from "../hooks/useCommandCompletion.js";
+import { useInputHistory } from "../hooks/useInputHistory.js";
+import type { Key } from "../hooks/useKeypress.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { useKittyKeyboardProtocol } from "../hooks/useKittyKeyboardProtocol.js";
+import { useMouseClick } from "../hooks/useMouseClick.js";
+import { useReverseSearchCompletion } from "../hooks/useReverseSearchCompletion.js";
+import { useShellHistory } from "../hooks/useShellHistory.js";
+import { Command, keyMatchers } from "../keyMatchers.js";
+import { theme } from "../semantic-colors.js";
+import { SCREEN_READER_USER_PREFIX } from "../textConstants.js";
+import { StreamingState } from "../types.js";
 import {
+  cleanupOldClipboardImages,
   clipboardHasImage,
   saveClipboardImage,
-  cleanupOldClipboardImages,
-} from '../utils/clipboardUtils.js';
-import {
-  isAutoExecutableCommand,
-  isSlashCommand,
-} from '../utils/commandUtils.js';
-import * as path from 'node:path';
-import { SCREEN_READER_USER_PREFIX } from '../textConstants.js';
-import { useShellFocusState } from '../contexts/ShellFocusContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { StreamingState } from '../types.js';
-import { useMouseClick } from '../hooks/useMouseClick.js';
-import { useMouse, type MouseEvent } from '../contexts/MouseContext.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
+} from "../utils/clipboardUtils.js";
+import { isAutoExecutableCommand, isSlashCommand } from "../utils/commandUtils.js";
+import { buildSegmentsForVisualSlice, parseInputForHighlighting } from "../utils/highlight.js";
+import { cpLen, cpSlice, toCodePoints } from "../utils/textUtils.js";
+import { MAX_WIDTH, SuggestionsDisplay } from "./SuggestionsDisplay.js";
+import type { TextBuffer } from "./shared/text-buffer.js";
+import { logicalPosToOffset } from "./shared/text-buffer.js";
 
 /**
  * Returns if the terminal can be trusted to handle paste events atomically
  * rather than potentially sending multiple paste events separated by line
  * breaks which could trigger unintended command execution.
  */
-export function isTerminalPasteTrusted(
-  kittyProtocolSupported: boolean,
-): boolean {
+export function isTerminalPasteTrusted(kittyProtocolSupported: boolean): boolean {
   // Ideally we could trust all VSCode family terminals as well but it appears
   // we cannot as Cursor users on windows reported being impacted by this
   // issue (https://github.com/google-gemini/gemini-cli/issues/3763).
@@ -84,7 +76,7 @@ export interface InputPromptProps {
   setQueueErrorMessage: (message: string | null) => void;
   streamingState: StreamingState;
   popAllMessages?: () => string | undefined;
-  suggestionsPosition?: 'above' | 'below';
+  suggestionsPosition?: "above" | "below";
   setBannerVisible: (visible: boolean) => void;
 }
 
@@ -112,7 +104,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   config,
   slashCommands,
   commandContext,
-  placeholder = '  Type your message or @path/to/file',
+  placeholder = "  Type your message or @path/to/file",
   focus = true,
   inputWidth,
   suggestionsWidth,
@@ -126,7 +118,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   setQueueErrorMessage,
   streamingState,
   popAllMessages,
-  suggestionsPosition = 'below',
+  suggestionsPosition = "below",
   setBannerVisible,
 }) => {
   const kittyProtocol = useKittyKeyboardProtocol();
@@ -137,20 +129,15 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   const escPressCount = useRef(0);
   const [showEscapePrompt, setShowEscapePrompt] = useState(false);
   const escapeTimerRef = useRef<NodeJS.Timeout | null>(null);
-  const [recentUnsafePasteTime, setRecentUnsafePasteTime] = useState<
-    number | null
-  >(null);
+  const [recentUnsafePasteTime, setRecentUnsafePasteTime] = useState<number | null>(null);
   const pasteTimeoutRef = useRef<NodeJS.Timeout | null>(null);
   const innerBoxRef = useRef<DOMElement>(null);
 
   const [reverseSearchActive, setReverseSearchActive] = useState(false);
   const [commandSearchActive, setCommandSearchActive] = useState(false);
-  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = useState('');
-  const [cursorPosition, setCursorPosition] = useState<[number, number]>([
-    0, 0,
-  ]);
-  const [expandedSuggestionIndex, setExpandedSuggestionIndex] =
-    useState<number>(-1);
+  const [textBeforeReverseSearch, setTextBeforeReverseSearch] = useState("");
+  const [cursorPosition, setCursorPosition] = useState<[number, number]>([0, 0]);
+  const [expandedSuggestionIndex, setExpandedSuggestionIndex] = useState<number>(-1);
   const shellHistory = useShellHistory(config.getProjectRoot());
   const shellHistoryData = shellHistory.history;
 
@@ -177,10 +164,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   );
 
   const resetCompletionState = completion.resetCompletionState;
-  const resetReverseSearchCompletionState =
-    reverseSearchCompletion.resetCompletionState;
-  const resetCommandSearchCompletionState =
-    commandSearchCompletion.resetCompletionState;
+  const resetReverseSearchCompletionState = reverseSearchCompletion.resetCompletionState;
+  const resetCommandSearchCompletionState = commandSearchCompletion.resetCompletionState;
 
   const showCursor = focus && isShellFocused && !isEmbeddedShellFocused;
 
@@ -220,7 +205,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       }
       // Clear the buffer *before* calling onSubmit to prevent potential re-submission
       // if onSubmit triggers a re-render while the buffer still holds the old value.
-      buffer.setText('');
+      buffer.setText("");
       onSubmit(submittedValue);
       resetCompletionState();
       resetReverseSearchCompletionState();
@@ -241,23 +226,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       const isSlash = isSlashCommand(trimmedMessage);
 
       const isShell = shellModeActive;
-      if (
-        (isSlash || isShell) &&
-        streamingState === StreamingState.Responding
-      ) {
-        setQueueErrorMessage(
-          `${isShell ? 'Shell' : 'Slash'} commands cannot be queued`,
-        );
+      if ((isSlash || isShell) && streamingState === StreamingState.Responding) {
+        setQueueErrorMessage(`${isShell ? "Shell" : "Slash"} commands cannot be queued`);
         return;
       }
       handleSubmitAndClear(trimmedMessage);
     },
-    [
-      handleSubmitAndClear,
-      shellModeActive,
-      streamingState,
-      setQueueErrorMessage,
-    ],
+    [handleSubmitAndClear, shellModeActive, streamingState, setQueueErrorMessage],
   );
 
   const customSetTextAndResetCompletionSignal = useCallback(
@@ -272,8 +247,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     userMessages,
     onSubmit: handleSubmitAndClear,
     isActive:
-      (!completion.showSuggestions || completion.suggestions.length === 1) &&
-      !shellModeActive,
+      (!completion.showSuggestions || completion.suggestions.length === 1) && !shellModeActive,
     currentQuery: buffer.text,
     onChange: customSetTextAndResetCompletionSignal,
   });
@@ -299,7 +273,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   // Helper function to handle loading queued messages into input
   // Returns true if we should continue with input history navigation
   const tryLoadQueuedMessages = useCallback(() => {
-    if (buffer.text.trim() === '' && popAllMessages) {
+    if (buffer.text.trim() === "" && popAllMessages) {
       const allMessages = popAllMessages();
       if (allMessages) {
         buffer.setText(allMessages);
@@ -333,15 +307,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
           // Add spaces around the path if needed
           let textToInsert = insertText;
-          const charBefore = offset > 0 ? currentText[offset - 1] : '';
-          const charAfter =
-            offset < currentText.length ? currentText[offset] : '';
+          const charBefore = offset > 0 ? currentText[offset - 1] : "";
+          const charAfter = offset < currentText.length ? currentText[offset] : "";
 
-          if (charBefore && charBefore !== ' ' && charBefore !== '\n') {
-            textToInsert = ' ' + textToInsert;
+          if (charBefore && charBefore !== " " && charBefore !== "\n") {
+            textToInsert = " " + textToInsert;
           }
-          if (!charAfter || (charAfter !== ' ' && charAfter !== '\n')) {
-            textToInsert = textToInsert + ' ';
+          if (!charAfter || (charAfter !== " " && charAfter !== "\n")) {
+            textToInsert = textToInsert + " ";
           }
 
           // Insert at cursor position
@@ -354,7 +327,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       const offset = buffer.getOffset();
       buffer.replaceRangeByOffset(offset, offset, textToInsert);
     } catch (error) {
-      console.error('Error handling clipboard image:', error);
+      console.error("Error handling clipboard image:", error);
     }
   }, [buffer, config]);
 
@@ -372,7 +345,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
   useMouse(
     (event: MouseEvent) => {
-      if (event.name === 'right-release') {
+      if (event.name === "right-release") {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         handleClipboardPaste();
       }
@@ -424,19 +397,15 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       }
 
       // Reset ESC count and hide prompt on any non-ESC key
-      if (key.name !== 'escape') {
+      if (key.name !== "escape") {
         if (escPressCount.current > 0 || showEscapePrompt) {
           resetEscapeState();
         }
       }
 
-      if (
-        key.sequence === '!' &&
-        buffer.text === '' &&
-        !completion.showSuggestions
-      ) {
+      if (key.sequence === "!" && buffer.text === "" && !completion.showSuggestions) {
         setShellModeActive(!shellModeActive);
-        buffer.setText(''); // Clear the '!' from input
+        buffer.setText(""); // Clear the '!' from input
         return;
       }
 
@@ -448,27 +417,17 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           setActive(false);
           resetCompletion();
           buffer.setText(textBeforeReverseSearch);
-          const offset = logicalPosToOffset(
-            buffer.lines,
-            cursorPosition[0],
-            cursorPosition[1],
-          );
+          const offset = logicalPosToOffset(buffer.lines, cursorPosition[0], cursorPosition[1]);
           buffer.moveToOffset(offset);
           setExpandedSuggestionIndex(-1);
         };
 
         if (reverseSearchActive) {
-          cancelSearch(
-            setReverseSearchActive,
-            reverseSearchCompletion.resetCompletionState,
-          );
+          cancelSearch(setReverseSearchActive, reverseSearchCompletion.resetCompletionState);
           return;
         }
         if (commandSearchActive) {
-          cancelSearch(
-            setCommandSearchActive,
-            commandSearchCompletion.resetCompletionState,
-          );
+          cancelSearch(setCommandSearchActive, commandSearchCompletion.resetCompletionState);
           return;
         }
 
@@ -487,7 +446,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
         // Handle double ESC for clearing input
         if (escPressCount.current === 0) {
-          if (buffer.text === '') {
+          if (buffer.text === "") {
             return;
           }
           escPressCount.current = 1;
@@ -500,7 +459,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           }, 500);
         } else {
           // clear input and immediately reset state
-          buffer.setText('');
+          buffer.setText("");
           resetCompletionState();
           resetEscapeState();
         }
@@ -523,20 +482,11 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       if (reverseSearchActive || commandSearchActive) {
         const isCommandSearch = commandSearchActive;
 
-        const sc = isCommandSearch
-          ? commandSearchCompletion
-          : reverseSearchCompletion;
-
-        const {
-          activeSuggestionIndex,
-          navigateUp,
-          navigateDown,
-          showSuggestions,
-          suggestions,
-        } = sc;
-        const setActive = isCommandSearch
-          ? setCommandSearchActive
-          : setReverseSearchActive;
+        const sc = isCommandSearch ? commandSearchCompletion : reverseSearchCompletion;
+
+        const { activeSuggestionIndex, navigateUp, navigateDown, showSuggestions, suggestions } =
+          sc;
+        const setActive = isCommandSearch ? setCommandSearchActive : setReverseSearchActive;
         const resetState = sc.resetCompletionState;
 
         if (showSuggestions) {
@@ -580,10 +530,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         }
 
         // Prevent up/down from falling through to regular history navigation
-        if (
-          keyMatchers[Command.NAVIGATION_UP](key) ||
-          keyMatchers[Command.NAVIGATION_DOWN](key)
-        ) {
+        if (keyMatchers[Command.NAVIGATION_UP](key) || keyMatchers[Command.NAVIGATION_DOWN](key)) {
           return;
         }
       }
@@ -618,16 +565,12 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
             if (targetIndex < completion.suggestions.length) {
               const suggestion = completion.suggestions[targetIndex];
 
-              const isEnterKey = key.name === 'return' && !key.ctrl;
+              const isEnterKey = key.name === "return" && !key.ctrl;
 
-              if (isEnterKey && buffer.text.startsWith('/')) {
-                const { isArgumentCompletion, leafCommand } =
-                  completion.slashCompletionRange;
+              if (isEnterKey && buffer.text.startsWith("/")) {
+                const { isArgumentCompletion, leafCommand } = completion.slashCompletionRange;
 
-                if (
-                  isArgumentCompletion &&
-                  isAutoExecutableCommand(leafCommand)
-                ) {
+                if (isArgumentCompletion && isAutoExecutableCommand(leafCommand)) {
                   // isArgumentCompletion guarantees leafCommand exists
                   const completedText = completion.getCompletedText(suggestion);
                   if (completedText) {
@@ -637,18 +580,12 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
                   }
                 } else if (!isArgumentCompletion) {
                   // Existing logic for command name completion
-                  const command =
-                    completion.getCommandFromSuggestion(suggestion);
+                  const command = completion.getCommandFromSuggestion(suggestion);
 
                   // Only auto-execute if the command has no completion function
                   // (i.e., it doesn't require an argument to be selected)
-                  if (
-                    command &&
-                    isAutoExecutableCommand(command) &&
-                    !command.completion
-                  ) {
-                    const completedText =
-                      completion.getCompletedText(suggestion);
+                  if (command && isAutoExecutableCommand(command) && !command.completion) {
+                    const completedText = completion.getCompletedText(suggestion);
 
                     if (completedText) {
                       setExpandedSuggestionIndex(-1);
@@ -669,11 +606,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       }
 
       // Handle Tab key for ghost text acceptance
-      if (
-        key.name === 'tab' &&
-        !completion.showSuggestions &&
-        completion.promptCompletion.text
-      ) {
+      if (key.name === "tab" && !completion.showSuggestions && completion.promptCompletion.text) {
         completion.promptCompletion.accept();
         return;
       }
@@ -753,8 +686,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
           const [row, col] = buffer.cursor;
           const line = buffer.lines[row];
-          const charBefore = col > 0 ? cpSlice(line, col - 1, col) : '';
-          if (charBefore === '\\') {
+          const charBefore = col > 0 ? cpSlice(line, col - 1, col) : "";
+          if (charBefore === "\\") {
             buffer.backspace();
             buffer.newline();
           } else {
@@ -772,17 +705,17 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
       // Ctrl+A (Home) / Ctrl+E (End)
       if (keyMatchers[Command.HOME](key)) {
-        buffer.move('home');
+        buffer.move("home");
         return;
       }
       if (keyMatchers[Command.END](key)) {
-        buffer.move('end');
+        buffer.move("end");
         return;
       }
       // Ctrl+C (Clear input)
       if (keyMatchers[Command.CLEAR_INPUT](key)) {
         if (buffer.text.length > 0) {
-          buffer.setText('');
+          buffer.setText("");
           resetCompletionState();
         }
         return;
@@ -864,8 +797,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   useKeypress(handleInput, { isActive: !isEmbeddedShellFocused });
 
   const linesToRender = buffer.viewportVisualLines;
-  const [cursorVisualRowAbsolute, cursorVisualColAbsolute] =
-    buffer.visualCursor;
+  const [cursorVisualRowAbsolute, cursorVisualColAbsolute] = buffer.visualCursor;
   const scrollVisualRow = buffer.visualScrollRow;
 
   const getGhostTextLines = useCallback(() => {
@@ -874,34 +806,32 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       !buffer.text ||
       !completion.promptCompletion.text.startsWith(buffer.text)
     ) {
-      return { inlineGhost: '', additionalLines: [] };
+      return { inlineGhost: "", additionalLines: [] };
     }
 
-    const ghostSuffix = completion.promptCompletion.text.slice(
-      buffer.text.length,
-    );
+    const ghostSuffix = completion.promptCompletion.text.slice(buffer.text.length);
     if (!ghostSuffix) {
-      return { inlineGhost: '', additionalLines: [] };
+      return { inlineGhost: "", additionalLines: [] };
     }
 
-    const currentLogicalLine = buffer.lines[buffer.cursor[0]] || '';
+    const currentLogicalLine = buffer.lines[buffer.cursor[0]] || "";
     const cursorCol = buffer.cursor[1];
 
     const textBeforeCursor = cpSlice(currentLogicalLine, 0, cursorCol);
     const usedWidth = stringWidth(textBeforeCursor);
     const remainingWidth = Math.max(0, inputWidth - usedWidth);
 
-    const ghostTextLinesRaw = ghostSuffix.split('\n');
-    const firstLineRaw = ghostTextLinesRaw.shift() || '';
+    const ghostTextLinesRaw = ghostSuffix.split("\n");
+    const firstLineRaw = ghostTextLinesRaw.shift() || "";
 
-    let inlineGhost = '';
-    let remainingFirstLine = '';
+    let inlineGhost = "";
+    let remainingFirstLine = "";
 
     if (stringWidth(firstLineRaw) <= remainingWidth) {
       inlineGhost = firstLineRaw;
     } else {
-      const words = firstLineRaw.split(' ');
-      let currentLine = '';
+      const words = firstLineRaw.split(" ");
+      let currentLine = "";
       let wordIdx = 0;
       for (const word of words) {
         const prospectiveLine = currentLine ? `${currentLine} ${word}` : word;
@@ -913,7 +843,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       }
       inlineGhost = currentLine;
       if (words.length > wordIdx) {
-        remainingFirstLine = words.slice(wordIdx).join(' ');
+        remainingFirstLine = words.slice(wordIdx).join(" ");
       }
     }
 
@@ -922,14 +852,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       linesToWrap.push(remainingFirstLine);
     }
     linesToWrap.push(...ghostTextLinesRaw);
-    const remainingGhostText = linesToWrap.join('\n');
+    const remainingGhostText = linesToWrap.join("\n");
 
     const additionalLines: string[] = [];
     if (remainingGhostText) {
-      const textLines = remainingGhostText.split('\n');
+      const textLines = remainingGhostText.split("\n");
       for (const textLine of textLines) {
-        const words = textLine.split(' ');
-        let currentLine = '';
+        const words = textLine.split(" ");
+        let currentLine = "";
 
         for (const word of words) {
           const prospectiveLine = currentLine ? `${currentLine} ${word}` : word;
@@ -942,7 +872,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
             let wordToProcess = word;
             while (stringWidth(wordToProcess) > inputWidth) {
-              let part = '';
+              let part = "";
               const wordCP = toCodePoints(wordToProcess);
               let partWidth = 0;
               let splitIndex = 0;
@@ -971,13 +901,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     }
 
     return { inlineGhost, additionalLines };
-  }, [
-    completion.promptCompletion.text,
-    buffer.text,
-    buffer.lines,
-    buffer.cursor,
-    inputWidth,
-  ]);
+  }, [completion.promptCompletion.text, buffer.text, buffer.lines, buffer.cursor, inputWidth]);
 
   const { inlineGhost, additionalLines } = getGhostTextLines();
   const getActiveCompletion = () => {
@@ -995,22 +919,20 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     }
   }, [shouldShowSuggestions, onSuggestionsVisibilityChange]);
 
-  const showAutoAcceptStyling =
-    !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
-  const showYoloStyling =
-    !shellModeActive && approvalMode === ApprovalMode.YOLO;
+  const showAutoAcceptStyling = !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
+  const showYoloStyling = !shellModeActive && approvalMode === ApprovalMode.YOLO;
 
   let statusColor: string | undefined;
-  let statusText = '';
+  let statusText = "";
   if (shellModeActive) {
     statusColor = theme.ui.symbol;
-    statusText = 'Shell mode';
+    statusText = "Shell mode";
   } else if (showYoloStyling) {
     statusColor = theme.status.error;
-    statusText = 'YOLO mode';
+    statusText = "YOLO mode";
   } else if (showAutoAcceptStyling) {
     statusColor = theme.status.warning;
-    statusText = 'Accepting edits';
+    statusText = "Accepting edits";
   }
 
   const suggestionsNode = shouldShowSuggestions ? (
@@ -1023,11 +945,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         scrollOffset={activeCompletion.visibleStartIndex}
         userInput={buffer.text}
         mode={
-          buffer.text.startsWith('/') &&
-          !reverseSearchActive &&
-          !commandSearchActive
-            ? 'slash'
-            : 'reverse'
+          buffer.text.startsWith("/") && !reverseSearchActive && !commandSearchActive
+            ? "slash"
+            : "reverse"
         }
         expandedIndex={expandedSuggestionIndex}
       />
@@ -1036,7 +956,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
 
   return (
     <>
-      {suggestionsPosition === 'above' && suggestionsNode}
+      {suggestionsPosition === "above" && suggestionsNode}
       <Box
         borderStyle="round"
         borderColor={
@@ -1050,28 +970,22 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         alignItems="flex-start"
         minHeight={3}
       >
-        <Text
-          color={statusColor ?? theme.text.accent}
-          aria-label={statusText || undefined}
-        >
+        <Text color={statusColor ?? theme.text.accent} aria-label={statusText || undefined}>
           {shellModeActive ? (
             reverseSearchActive ? (
-              <Text
-                color={theme.text.link}
-                aria-label={SCREEN_READER_USER_PREFIX}
-              >
-                (r:){' '}
+              <Text color={theme.text.link} aria-label={SCREEN_READER_USER_PREFIX}>
+                (r:){" "}
               </Text>
             ) : (
-              '!'
+              "!"
             )
           ) : commandSearchActive ? (
             <Text color={theme.text.accent}>(r:) </Text>
           ) : showYoloStyling ? (
-            '*'
+            "*"
           ) : (
-            '>'
-          )}{' '}
+            ">"
+          )}{" "}
         </Text>
         <Box flexGrow={1} flexDirection="column" ref={innerBoxRef}>
           {buffer.text.length === 0 && placeholder ? (
@@ -1086,30 +1000,20 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           ) : (
             linesToRender
               .map((lineText, visualIdxInRenderedSet) => {
-                const absoluteVisualIdx =
-                  scrollVisualRow + visualIdxInRenderedSet;
+                const absoluteVisualIdx = scrollVisualRow + visualIdxInRenderedSet;
                 const mapEntry = buffer.visualToLogicalMap[absoluteVisualIdx];
-                const cursorVisualRow =
-                  cursorVisualRowAbsolute - scrollVisualRow;
-                const isOnCursorLine =
-                  focus && visualIdxInRenderedSet === cursorVisualRow;
+                const cursorVisualRow = cursorVisualRowAbsolute - scrollVisualRow;
+                const isOnCursorLine = focus && visualIdxInRenderedSet === cursorVisualRow;
 
                 const renderedLine: React.ReactNode[] = [];
 
                 const [logicalLineIdx, logicalStartCol] = mapEntry;
-                const logicalLine = buffer.lines[logicalLineIdx] || '';
-                const tokens = parseInputForHighlighting(
-                  logicalLine,
-                  logicalLineIdx,
-                );
+                const logicalLine = buffer.lines[logicalLineIdx] || "";
+                const tokens = parseInputForHighlighting(logicalLine, logicalLineIdx);
 
                 const visualStart = logicalStartCol;
                 const visualEnd = logicalStartCol + cpLen(lineText);
-                const segments = buildSegmentsForVisualSlice(
-                  tokens,
-                  visualStart,
-                  visualEnd,
-                );
+                const segments = buildSegmentsForVisualSlice(tokens, visualStart, visualEnd);
 
                 let charCount = 0;
                 segments.forEach((seg, segIdx) => {
@@ -1117,8 +1021,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
                   let display = seg.text;
 
                   if (isOnCursorLine) {
-                    const relativeVisualColForHighlight =
-                      cursorVisualColAbsolute;
+                    const relativeVisualColForHighlight = cursorVisualColAbsolute;
                     const segStart = charCount;
                     const segEnd = segStart + segLen;
                     if (
@@ -1134,22 +1037,15 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
                         ? chalk.inverse(charToHighlight)
                         : charToHighlight;
                       display =
-                        cpSlice(
-                          seg.text,
-                          0,
-                          relativeVisualColForHighlight - segStart,
-                        ) +
+                        cpSlice(seg.text, 0, relativeVisualColForHighlight - segStart) +
                         highlighted +
-                        cpSlice(
-                          seg.text,
-                          relativeVisualColForHighlight - segStart + 1,
-                        );
+                        cpSlice(seg.text, relativeVisualColForHighlight - segStart + 1);
                     }
                     charCount = segEnd;
                   }
 
                   const color =
-                    seg.type === 'command' || seg.type === 'file'
+                    seg.type === "command" || seg.type === "file"
                       ? theme.text.accent
                       : theme.text.primary;
 
@@ -1160,15 +1056,12 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
                   );
                 });
 
-                const currentLineGhost = isOnCursorLine ? inlineGhost : '';
-                if (
-                  isOnCursorLine &&
-                  cursorVisualColAbsolute === cpLen(lineText)
-                ) {
+                const currentLineGhost = isOnCursorLine ? inlineGhost : "";
+                if (isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText)) {
                   if (!currentLineGhost) {
                     renderedLine.push(
                       <Text key={`cursor-end-${cursorVisualColAbsolute}`}>
-                        {showCursor ? chalk.inverse(' ') : ' '}
+                        {showCursor ? chalk.inverse(" ") : " "}
                       </Text>,
                     );
                   }
@@ -1184,12 +1077,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
                   <Box key={`line-${visualIdxInRenderedSet}`} height={1}>
                     <Text>
                       {renderedLine}
-                      {showCursorBeforeGhost &&
-                        (showCursor ? chalk.inverse(' ') : ' ')}
+                      {showCursorBeforeGhost && (showCursor ? chalk.inverse(" ") : " ")}
                       {currentLineGhost && (
-                        <Text color={theme.text.secondary}>
-                          {currentLineGhost}
-                        </Text>
+                        <Text color={theme.text.secondary}>{currentLineGhost}</Text>
                       )}
                     </Text>
                   </Box>
@@ -1197,17 +1087,11 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
               })
               .concat(
                 additionalLines.map((ghostLine, index) => {
-                  const padding = Math.max(
-                    0,
-                    inputWidth - stringWidth(ghostLine),
-                  );
+                  const padding = Math.max(0, inputWidth - stringWidth(ghostLine));
                   return (
-                    <Text
-                      key={`ghost-line-${index}`}
-                      color={theme.text.secondary}
-                    >
+                    <Text key={`ghost-line-${index}`} color={theme.text.secondary}>
                       {ghostLine}
-                      {' '.repeat(padding)}
+                      {" ".repeat(padding)}
                     </Text>
                   );
                 }),
@@ -1215,7 +1099,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           )}
         </Box>
       </Box>
-      {suggestionsPosition === 'below' && suggestionsNode}
+      {suggestionsPosition === "below" && suggestionsNode}
     </>
   );
 };
diff --git a/packages/ui-gemini/src/ui/components/LoadingIndicator.test.tsx b/packages/ui-gemini/src/ui/components/LoadingIndicator.test.tsx
index f56fe8003..d591e63d5 100644
--- a/packages/ui-gemini/src/ui/components/LoadingIndicator.test.tsx
+++ b/packages/ui-gemini/src/ui/components/LoadingIndicator.test.tsx
@@ -4,22 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { render } from '../../test-utils/render.js';
-import { Text } from 'ink';
-import { LoadingIndicator } from './LoadingIndicator.js';
-import { StreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
-import { vi } from 'vitest';
-import * as useTerminalSize from '../hooks/useTerminalSize.js';
+import { Text } from "ink";
+import React from "react";
+import { vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { StreamingContext } from "../contexts/StreamingContext.js";
+import * as useTerminalSize from "../hooks/useTerminalSize.js";
+import { StreamingState } from "../types.js";
+import { LoadingIndicator } from "./LoadingIndicator.js";
 
 // Mock GeminiRespondingSpinner
-vi.mock('./GeminiRespondingSpinner.js', () => ({
-  GeminiRespondingSpinner: ({
-    nonRespondingDisplay,
-  }: {
-    nonRespondingDisplay?: string;
-  }) => {
+vi.mock("./GeminiRespondingSpinner.js", () => ({
+  GeminiRespondingSpinner: ({ nonRespondingDisplay }: { nonRespondingDisplay?: string }) => {
     const streamingState = React.useContext(StreamingContext)!;
     if (streamingState === StreamingState.Responding) {
       return <Text>MockRespondingSpinner</Text>;
@@ -30,7 +26,7 @@ vi.mock('./GeminiRespondingSpinner.js', () => ({
   },
 }));
 
-vi.mock('../hooks/useTerminalSize.js', () => ({
+vi.mock("../hooks/useTerminalSize.js", () => ({
   useTerminalSize: vi.fn(),
 }));
 
@@ -44,41 +40,39 @@ const renderWithContext = (
   useTerminalSizeMock.mockReturnValue({ columns: width, rows: 24 });
   const contextValue: StreamingState = streamingStateValue;
   return render(
-    <StreamingContext.Provider value={contextValue}>
-      {ui}
-    </StreamingContext.Provider>,
+    <StreamingContext.Provider value={contextValue}>{ui}</StreamingContext.Provider>,
     width,
   );
 };
 
-describe('<LoadingIndicator />', () => {
+describe("<LoadingIndicator />", () => {
   const defaultProps = {
-    currentLoadingPhrase: 'Loading...',
+    currentLoadingPhrase: "Loading...",
     elapsedTime: 5,
   };
 
-  it('should not render when streamingState is Idle', () => {
+  it("should not render when streamingState is Idle", () => {
     const { lastFrame } = renderWithContext(
       <LoadingIndicator {...defaultProps} />,
       StreamingState.Idle,
     );
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('should render spinner, phrase, and time when streamingState is Responding', () => {
+  it("should render spinner, phrase, and time when streamingState is Responding", () => {
     const { lastFrame } = renderWithContext(
       <LoadingIndicator {...defaultProps} />,
       StreamingState.Responding,
     );
     const output = lastFrame();
-    expect(output).toContain('MockRespondingSpinner');
-    expect(output).toContain('Loading...');
-    expect(output).toContain('(esc to cancel, 5s)');
+    expect(output).toContain("MockRespondingSpinner");
+    expect(output).toContain("Loading...");
+    expect(output).toContain("(esc to cancel, 5s)");
   });
 
-  it('should render spinner (static), phrase but no time/cancel when streamingState is WaitingForConfirmation', () => {
+  it("should render spinner (static), phrase but no time/cancel when streamingState is WaitingForConfirmation", () => {
     const props = {
-      currentLoadingPhrase: 'Confirm action',
+      currentLoadingPhrase: "Confirm action",
       elapsedTime: 10,
     };
     const { lastFrame } = renderWithContext(
@@ -86,96 +80,90 @@ describe('<LoadingIndicator />', () => {
       StreamingState.WaitingForConfirmation,
     );
     const output = lastFrame();
-    expect(output).toContain('⠏'); // Static char for WaitingForConfirmation
-    expect(output).toContain('Confirm action');
-    expect(output).not.toContain('(esc to cancel)');
-    expect(output).not.toContain(', 10s');
+    expect(output).toContain("⠏"); // Static char for WaitingForConfirmation
+    expect(output).toContain("Confirm action");
+    expect(output).not.toContain("(esc to cancel)");
+    expect(output).not.toContain(", 10s");
   });
 
-  it('should display the currentLoadingPhrase correctly', () => {
+  it("should display the currentLoadingPhrase correctly", () => {
     const props = {
-      currentLoadingPhrase: 'Processing data...',
+      currentLoadingPhrase: "Processing data...",
       elapsedTime: 3,
     };
     const { lastFrame, unmount } = renderWithContext(
       <LoadingIndicator {...props} />,
       StreamingState.Responding,
     );
-    expect(lastFrame()).toContain('Processing data...');
+    expect(lastFrame()).toContain("Processing data...");
     unmount();
   });
 
-  it('should display the elapsedTime correctly when Responding', () => {
+  it("should display the elapsedTime correctly when Responding", () => {
     const props = {
-      currentLoadingPhrase: 'Working...',
+      currentLoadingPhrase: "Working...",
       elapsedTime: 60,
     };
     const { lastFrame, unmount } = renderWithContext(
       <LoadingIndicator {...props} />,
       StreamingState.Responding,
     );
-    expect(lastFrame()).toContain('(esc to cancel, 1m)');
+    expect(lastFrame()).toContain("(esc to cancel, 1m)");
     unmount();
   });
 
-  it('should display the elapsedTime correctly in human-readable format', () => {
+  it("should display the elapsedTime correctly in human-readable format", () => {
     const props = {
-      currentLoadingPhrase: 'Working...',
+      currentLoadingPhrase: "Working...",
       elapsedTime: 125,
     };
     const { lastFrame, unmount } = renderWithContext(
       <LoadingIndicator {...props} />,
       StreamingState.Responding,
     );
-    expect(lastFrame()).toContain('(esc to cancel, 2m 5s)');
+    expect(lastFrame()).toContain("(esc to cancel, 2m 5s)");
     unmount();
   });
 
-  it('should render rightContent when provided', () => {
+  it("should render rightContent when provided", () => {
     const rightContent = <Text>Extra Info</Text>;
     const { lastFrame, unmount } = renderWithContext(
       <LoadingIndicator {...defaultProps} rightContent={rightContent} />,
       StreamingState.Responding,
     );
-    expect(lastFrame()).toContain('Extra Info');
+    expect(lastFrame()).toContain("Extra Info");
     unmount();
   });
 
-  it('should transition correctly between states using rerender', () => {
+  it("should transition correctly between states using rerender", () => {
     const { lastFrame, rerender, unmount } = renderWithContext(
       <LoadingIndicator {...defaultProps} />,
       StreamingState.Idle,
     );
-    expect(lastFrame()).toBe(''); // Initial: Idle
+    expect(lastFrame()).toBe(""); // Initial: Idle
 
     // Transition to Responding
     rerender(
       <StreamingContext.Provider value={StreamingState.Responding}>
-        <LoadingIndicator
-          currentLoadingPhrase="Now Responding"
-          elapsedTime={2}
-        />
+        <LoadingIndicator currentLoadingPhrase="Now Responding" elapsedTime={2} />
       </StreamingContext.Provider>,
     );
     let output = lastFrame();
-    expect(output).toContain('MockRespondingSpinner');
-    expect(output).toContain('Now Responding');
-    expect(output).toContain('(esc to cancel, 2s)');
+    expect(output).toContain("MockRespondingSpinner");
+    expect(output).toContain("Now Responding");
+    expect(output).toContain("(esc to cancel, 2s)");
 
     // Transition to WaitingForConfirmation
     rerender(
       <StreamingContext.Provider value={StreamingState.WaitingForConfirmation}>
-        <LoadingIndicator
-          currentLoadingPhrase="Please Confirm"
-          elapsedTime={15}
-        />
+        <LoadingIndicator currentLoadingPhrase="Please Confirm" elapsedTime={15} />
       </StreamingContext.Provider>,
     );
     output = lastFrame();
-    expect(output).toContain('⠏');
-    expect(output).toContain('Please Confirm');
-    expect(output).not.toContain('(esc to cancel)');
-    expect(output).not.toContain(', 15s');
+    expect(output).toContain("⠏");
+    expect(output).toContain("Please Confirm");
+    expect(output).not.toContain("(esc to cancel)");
+    expect(output).not.toContain(", 15s");
 
     // Transition back to Idle
     rerender(
@@ -183,14 +171,14 @@ describe('<LoadingIndicator />', () => {
         <LoadingIndicator {...defaultProps} />
       </StreamingContext.Provider>,
     );
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
     unmount();
   });
 
-  it('should display fallback phrase if thought is empty', () => {
+  it("should display fallback phrase if thought is empty", () => {
     const props = {
       thought: null,
-      currentLoadingPhrase: 'Loading...',
+      currentLoadingPhrase: "Loading...",
       elapsedTime: 5,
     };
     const { lastFrame, unmount } = renderWithContext(
@@ -198,15 +186,15 @@ describe('<LoadingIndicator />', () => {
       StreamingState.Responding,
     );
     const output = lastFrame();
-    expect(output).toContain('Loading...');
+    expect(output).toContain("Loading...");
     unmount();
   });
 
-  it('should display the subject of a thought', () => {
+  it("should display the subject of a thought", () => {
     const props = {
       thought: {
-        subject: 'Thinking about something...',
-        description: 'and other stuff.',
+        subject: "Thinking about something...",
+        description: "and other stuff.",
       },
       elapsedTime: 5,
     };
@@ -217,19 +205,19 @@ describe('<LoadingIndicator />', () => {
     const output = lastFrame();
     expect(output).toBeDefined();
     if (output) {
-      expect(output).toContain('Thinking about something...');
-      expect(output).not.toContain('and other stuff.');
+      expect(output).toContain("Thinking about something...");
+      expect(output).not.toContain("and other stuff.");
     }
     unmount();
   });
 
-  it('should prioritize thought.subject over currentLoadingPhrase', () => {
+  it("should prioritize thought.subject over currentLoadingPhrase", () => {
     const props = {
       thought: {
-        subject: 'This should be displayed',
-        description: 'A description',
+        subject: "This should be displayed",
+        description: "A description",
       },
-      currentLoadingPhrase: 'This should not be displayed',
+      currentLoadingPhrase: "This should not be displayed",
       elapsedTime: 5,
     };
     const { lastFrame, unmount } = renderWithContext(
@@ -237,17 +225,17 @@ describe('<LoadingIndicator />', () => {
       StreamingState.Responding,
     );
     const output = lastFrame();
-    expect(output).toContain('This should be displayed');
-    expect(output).not.toContain('This should not be displayed');
+    expect(output).toContain("This should be displayed");
+    expect(output).not.toContain("This should not be displayed");
     unmount();
   });
 
-  it('should truncate long primary text instead of wrapping', () => {
+  it("should truncate long primary text instead of wrapping", () => {
     const { lastFrame, unmount } = renderWithContext(
       <LoadingIndicator
         {...defaultProps}
         currentLoadingPhrase={
-          'This is an extremely long loading phrase that should be truncated in the UI to keep the primary line concise.'
+          "This is an extremely long loading phrase that should be truncated in the UI to keep the primary line concise."
         }
       />,
       StreamingState.Responding,
@@ -258,67 +246,61 @@ describe('<LoadingIndicator />', () => {
     unmount();
   });
 
-  describe('responsive layout', () => {
-    it('should render on a single line on a wide terminal', () => {
+  describe("responsive layout", () => {
+    it("should render on a single line on a wide terminal", () => {
       const { lastFrame, unmount } = renderWithContext(
-        <LoadingIndicator
-          {...defaultProps}
-          rightContent={<Text>Right</Text>}
-        />,
+        <LoadingIndicator {...defaultProps} rightContent={<Text>Right</Text>} />,
         StreamingState.Responding,
         120,
       );
       const output = lastFrame();
       // Check for single line output
-      expect(output?.includes('\n')).toBe(false);
-      expect(output).toContain('Loading...');
-      expect(output).toContain('(esc to cancel, 5s)');
-      expect(output).toContain('Right');
+      expect(output?.includes("\n")).toBe(false);
+      expect(output).toContain("Loading...");
+      expect(output).toContain("(esc to cancel, 5s)");
+      expect(output).toContain("Right");
       unmount();
     });
 
-    it('should render on multiple lines on a narrow terminal', () => {
+    it("should render on multiple lines on a narrow terminal", () => {
       const { lastFrame, unmount } = renderWithContext(
-        <LoadingIndicator
-          {...defaultProps}
-          rightContent={<Text>Right</Text>}
-        />,
+        <LoadingIndicator {...defaultProps} rightContent={<Text>Right</Text>} />,
         StreamingState.Responding,
         79,
       );
       const output = lastFrame();
-      const lines = output?.split('\n');
+      const lines = output?.split("\n");
       // Expecting 3 lines:
       // 1. Spinner + Primary Text
       // 2. Cancel + Timer
       // 3. Right Content
       expect(lines).toHaveLength(3);
       if (lines) {
-        expect(lines[0]).toContain('Loading...');
-        expect(lines[0]).not.toContain('(esc to cancel, 5s)');
-        expect(lines[1]).toContain('(esc to cancel, 5s)');
-        expect(lines[2]).toContain('Right');
+        expect(lines[0]).toContain("Loading...");
+        expect(lines[0]).not.toContain("(esc to cancel, 5s)");
+        expect(lines[1]).toContain("(esc to cancel, 5s)");
+        expect(lines[2]).toContain("Right");
       }
       unmount();
     });
 
-    it('should use wide layout at 80 columns', () => {
+    it("should use wide layout at 80 columns", () => {
       const { lastFrame, unmount } = renderWithContext(
         <LoadingIndicator {...defaultProps} />,
         StreamingState.Responding,
         80,
       );
-      expect(lastFrame()?.includes('\n')).toBe(false);
+      expect(lastFrame()?.includes("\n")).toBe(false);
       unmount();
     });
 
-    it('should use narrow layout at 79 columns', () => {
+    it("should use narrow layout at 79 columns", () => {
       const { lastFrame, unmount } = renderWithContext(
         <LoadingIndicator {...defaultProps} />,
         StreamingState.Responding,
         79,
       );
-      expect(lastFrame()?.includes('\n')).toBe(true);
+      expect(lastFrame()?.includes("\n")).toBe(true);
       unmount();
     });
   });
diff --git a/packages/ui-gemini/src/ui/components/LoadingIndicator.tsx b/packages/ui-gemini/src/ui/components/LoadingIndicator.tsx
index bc0a36236..6283216e2 100644
--- a/packages/ui-gemini/src/ui/components/LoadingIndicator.tsx
+++ b/packages/ui-gemini/src/ui/components/LoadingIndicator.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ThoughtSummary } from '@airiscode/gemini-cli-core';
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
-import { GeminiRespondingSpinner } from './GeminiRespondingSpinner.js';
-import { formatDuration } from '../utils/formatters.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
-import { INTERACTIVE_SHELL_WAITING_PHRASE } from '../hooks/usePhraseCycler.js';
+import type { ThoughtSummary } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { INTERACTIVE_SHELL_WAITING_PHRASE } from "../hooks/usePhraseCycler.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { theme } from "../semantic-colors.js";
+import { StreamingState } from "../types.js";
+import { formatDuration } from "../utils/formatters.js";
+import { isNarrowWidth } from "../utils/isNarrowWidth.js";
+import { GeminiRespondingSpinner } from "./GeminiRespondingSpinner.js";
 
 interface LoadingIndicatorProps {
   currentLoadingPhrase?: string;
@@ -54,16 +54,14 @@ export const LoadingIndicator: React.FC<LoadingIndicatorProps> = ({
       {/* Main loading line */}
       <Box
         width="100%"
-        flexDirection={isNarrow ? 'column' : 'row'}
-        alignItems={isNarrow ? 'flex-start' : 'center'}
+        flexDirection={isNarrow ? "column" : "row"}
+        alignItems={isNarrow ? "flex-start" : "center"}
       >
         <Box>
           <Box marginRight={1}>
             <GeminiRespondingSpinner
               nonRespondingDisplay={
-                streamingState === StreamingState.WaitingForConfirmation
-                  ? '⠏'
-                  : ''
+                streamingState === StreamingState.WaitingForConfirmation ? "⠏" : ""
               }
             />
           </Box>
diff --git a/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.test.tsx b/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.test.tsx
index 1e7d579a0..81304dc5b 100644
--- a/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.test.tsx
+++ b/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.test.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { LoopDetectionConfirmation } from './LoopDetectionConfirmation.js';
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { LoopDetectionConfirmation } from "./LoopDetectionConfirmation.js";
 
-describe('LoopDetectionConfirmation', () => {
+describe("LoopDetectionConfirmation", () => {
   const onComplete = vi.fn();
 
-  it('renders correctly', () => {
+  it("renders correctly", () => {
     const { lastFrame } = renderWithProviders(
       <LoopDetectionConfirmation onComplete={onComplete} />,
       { width: 101 },
@@ -19,18 +19,18 @@ describe('LoopDetectionConfirmation', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('contains the expected options', () => {
+  it("contains the expected options", () => {
     const { lastFrame } = renderWithProviders(
       <LoopDetectionConfirmation onComplete={onComplete} />,
       { width: 100 },
     );
     const output = lastFrame()!.toString();
 
-    expect(output).toContain('A potential loop was detected');
-    expect(output).toContain('Keep loop detection enabled (esc)');
-    expect(output).toContain('Disable loop detection for this session');
+    expect(output).toContain("A potential loop was detected");
+    expect(output).toContain("Keep loop detection enabled (esc)");
+    expect(output).toContain("Disable loop detection for this session");
     expect(output).toContain(
-      'This can happen due to repetitive tool calls or other model behavior',
+      "This can happen due to repetitive tool calls or other model behavior",
     );
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.tsx b/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.tsx
index d1393e7be..a824d56f9 100644
--- a/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.tsx
+++ b/packages/ui-gemini/src/ui/components/LoopDetectionConfirmation.tsx
@@ -4,28 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import type { RadioSelectItem } from "./shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export type LoopDetectionConfirmationResult = {
-  userSelection: 'disable' | 'keep';
+  userSelection: "disable" | "keep";
 };
 
 interface LoopDetectionConfirmationProps {
   onComplete: (result: LoopDetectionConfirmationResult) => void;
 }
 
-export function LoopDetectionConfirmation({
-  onComplete,
-}: LoopDetectionConfirmationProps) {
+export function LoopDetectionConfirmation({ onComplete }: LoopDetectionConfirmationProps) {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onComplete({
-          userSelection: 'keep',
+          userSelection: "keep",
         });
       }
     },
@@ -34,18 +32,18 @@ export function LoopDetectionConfirmation({
 
   const OPTIONS: Array<RadioSelectItem<LoopDetectionConfirmationResult>> = [
     {
-      label: 'Keep loop detection enabled (esc)',
+      label: "Keep loop detection enabled (esc)",
       value: {
-        userSelection: 'keep',
+        userSelection: "keep",
       },
-      key: 'Keep loop detection enabled (esc)',
+      key: "Keep loop detection enabled (esc)",
     },
     {
-      label: 'Disable loop detection for this session',
+      label: "Disable loop detection for this session",
       value: {
-        userSelection: 'disable',
+        userSelection: "disable",
       },
-      key: 'Disable loop detection for this session',
+      key: "Disable loop detection for this session",
     },
   ];
 
@@ -69,16 +67,15 @@ export function LoopDetectionConfirmation({
               <Text wrap="truncate-end">
                 <Text color={theme.text.primary} bold>
                   A potential loop was detected
-                </Text>{' '}
+                </Text>{" "}
               </Text>
             </Box>
           </Box>
           <Box marginTop={1}>
             <Box flexDirection="column">
               <Text color={theme.text.secondary}>
-                This can happen due to repetitive tool calls or other model
-                behavior. Do you want to keep loop detection enabled or disable
-                it for this session?
+                This can happen due to repetitive tool calls or other model behavior. Do you want to
+                keep loop detection enabled or disable it for this session?
               </Text>
               <Box marginTop={1}>
                 <RadioButtonSelect items={OPTIONS} onSelect={onComplete} />
diff --git a/packages/ui-gemini/src/ui/components/MainContent.test.tsx b/packages/ui-gemini/src/ui/components/MainContent.test.tsx
index 4bd823503..1e3e71100 100644
--- a/packages/ui-gemini/src/ui/components/MainContent.test.tsx
+++ b/packages/ui-gemini/src/ui/components/MainContent.test.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { MainContent } from './MainContent.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { Box, Text } from 'ink';
-import type React from 'react';
+import { Box, Text } from "ink";
+import type React from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { MainContent } from "./MainContent.js";
 
 // Mock dependencies
-vi.mock('../contexts/AppContext.js', () => ({
+vi.mock("../contexts/AppContext.js", () => ({
   useAppContext: () => ({
-    version: '1.0.0',
+    version: "1.0.0",
   }),
 }));
 
-vi.mock('../contexts/UIStateContext.js', () => ({
+vi.mock("../contexts/UIStateContext.js", () => ({
   useUIState: () => ({
     history: [
-      { id: 1, role: 'user', content: 'Hello' },
-      { id: 2, role: 'model', content: 'Hi there' },
+      { id: 1, role: "user", content: "Hello" },
+      { id: 2, role: "model", content: "Hi there" },
     ],
     pendingHistoryItems: [],
     mainAreaWidth: 80,
@@ -36,11 +36,11 @@ vi.mock('../contexts/UIStateContext.js', () => ({
   }),
 }));
 
-vi.mock('../hooks/useAlternateBuffer.js', () => ({
+vi.mock("../hooks/useAlternateBuffer.js", () => ({
   useAlternateBuffer: vi.fn(),
 }));
 
-vi.mock('./HistoryItemDisplay.js', () => ({
+vi.mock("./HistoryItemDisplay.js", () => ({
   HistoryItemDisplay: ({ item }: { item: { content: string } }) => (
     <Box>
       <Text>HistoryItem: {item.content}</Text>
@@ -48,15 +48,15 @@ vi.mock('./HistoryItemDisplay.js', () => ({
   ),
 }));
 
-vi.mock('./AppHeader.js', () => ({
+vi.mock("./AppHeader.js", () => ({
   AppHeader: () => <Text>AppHeader</Text>,
 }));
 
-vi.mock('./ShowMoreLines.js', () => ({
+vi.mock("./ShowMoreLines.js", () => ({
   ShowMoreLines: () => <Text>ShowMoreLines</Text>,
 }));
 
-vi.mock('./shared/ScrollableList.js', () => ({
+vi.mock("./shared/ScrollableList.js", () => ({
   ScrollableList: ({
     data,
     renderItem,
@@ -74,30 +74,30 @@ vi.mock('./shared/ScrollableList.js', () => ({
   SCROLL_TO_ITEM_END: 0,
 }));
 
-import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
+import { useAlternateBuffer } from "../hooks/useAlternateBuffer.js";
 
-describe('MainContent', () => {
+describe("MainContent", () => {
   beforeEach(() => {
     vi.mocked(useAlternateBuffer).mockReturnValue(false);
   });
 
-  it('renders in normal buffer mode', () => {
+  it("renders in normal buffer mode", () => {
     const { lastFrame } = render(<MainContent />);
     const output = lastFrame();
 
-    expect(output).toContain('AppHeader');
-    expect(output).toContain('HistoryItem: Hello');
-    expect(output).toContain('HistoryItem: Hi there');
+    expect(output).toContain("AppHeader");
+    expect(output).toContain("HistoryItem: Hello");
+    expect(output).toContain("HistoryItem: Hi there");
   });
 
-  it('renders in alternate buffer mode', () => {
+  it("renders in alternate buffer mode", () => {
     vi.mocked(useAlternateBuffer).mockReturnValue(true);
     const { lastFrame } = render(<MainContent />);
     const output = lastFrame();
 
-    expect(output).toContain('ScrollableList');
-    expect(output).toContain('AppHeader');
-    expect(output).toContain('HistoryItem: Hello');
-    expect(output).toContain('HistoryItem: Hi there');
+    expect(output).toContain("ScrollableList");
+    expect(output).toContain("AppHeader");
+    expect(output).toContain("HistoryItem: Hello");
+    expect(output).toContain("HistoryItem: Hi there");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/MainContent.tsx b/packages/ui-gemini/src/ui/components/MainContent.tsx
index a60f782d8..ecf6050f5 100644
--- a/packages/ui-gemini/src/ui/components/MainContent.tsx
+++ b/packages/ui-gemini/src/ui/components/MainContent.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Static } from 'ink';
-import { HistoryItemDisplay } from './HistoryItemDisplay.js';
-import { ShowMoreLines } from './ShowMoreLines.js';
-import { OverflowProvider } from '../contexts/OverflowContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useAppContext } from '../contexts/AppContext.js';
-import { AppHeader } from './AppHeader.js';
-import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
-import { SCROLL_TO_ITEM_END } from './shared/VirtualizedList.js';
-import { ScrollableList } from './shared/ScrollableList.js';
-import { useMemo, memo, useCallback } from 'react';
-import { MAX_GEMINI_MESSAGE_LINES } from '../constants.js';
+import { Box, Static } from "ink";
+import { memo, useCallback, useMemo } from "react";
+import { MAX_GEMINI_MESSAGE_LINES } from "../constants.js";
+import { useAppContext } from "../contexts/AppContext.js";
+import { OverflowProvider } from "../contexts/OverflowContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useAlternateBuffer } from "../hooks/useAlternateBuffer.js";
+import { AppHeader } from "./AppHeader.js";
+import { HistoryItemDisplay } from "./HistoryItemDisplay.js";
+import { ShowMoreLines } from "./ShowMoreLines.js";
+import { ScrollableList } from "./shared/ScrollableList.js";
+import { SCROLL_TO_ITEM_END } from "./shared/VirtualizedList.js";
 
 const MemoizedHistoryItemDisplay = memo(HistoryItemDisplay);
 const MemoizedAppHeader = memo(AppHeader);
@@ -29,12 +29,8 @@ export const MainContent = () => {
   const uiState = useUIState();
   const isAlternateBuffer = useAlternateBuffer();
 
-  const {
-    pendingHistoryItems,
-    mainAreaWidth,
-    staticAreaMaxItemHeight,
-    availableTerminalHeight,
-  } = uiState;
+  const { pendingHistoryItems, mainAreaWidth, staticAreaMaxItemHeight, availableTerminalHeight } =
+    uiState;
 
   const historyItems = uiState.history.map((h) => (
     <HistoryItemDisplay
@@ -83,18 +79,18 @@ export const MainContent = () => {
 
   const virtualizedData = useMemo(
     () => [
-      { type: 'header' as const },
-      ...uiState.history.map((item) => ({ type: 'history' as const, item })),
-      { type: 'pending' as const },
+      { type: "header" as const },
+      ...uiState.history.map((item) => ({ type: "history" as const, item })),
+      { type: "pending" as const },
     ],
     [uiState.history],
   );
 
   const renderItem = useCallback(
     ({ item }: { item: (typeof virtualizedData)[number] }) => {
-      if (item.type === 'header') {
+      if (item.type === "header") {
         return <MemoizedAppHeader key="app-header" version={version} />;
-      } else if (item.type === 'history') {
+      } else if (item.type === "history") {
         return (
           <MemoizedHistoryItemDisplay
             terminalWidth={mainAreaWidth}
@@ -110,13 +106,7 @@ export const MainContent = () => {
         return pendingItems;
       }
     },
-    [
-      version,
-      mainAreaWidth,
-      staticAreaMaxItemHeight,
-      uiState.slashCommands,
-      pendingItems,
-    ],
+    [version, mainAreaWidth, staticAreaMaxItemHeight, uiState.slashCommands, pendingItems],
   );
 
   if (isAlternateBuffer) {
@@ -127,9 +117,9 @@ export const MainContent = () => {
         renderItem={renderItem}
         estimatedItemHeight={() => 100}
         keyExtractor={(item, _index) => {
-          if (item.type === 'header') return 'header';
-          if (item.type === 'history') return item.item.id.toString();
-          return 'pending';
+          if (item.type === "header") return "header";
+          if (item.type === "history") return item.item.id.toString();
+          return "pending";
         }}
         initialScrollIndex={SCROLL_TO_ITEM_END}
         initialScrollOffsetInIndex={SCROLL_TO_ITEM_END}
@@ -141,10 +131,7 @@ export const MainContent = () => {
     <>
       <Static
         key={uiState.historyRemountKey}
-        items={[
-          <AppHeader key="app-header" version={version} />,
-          ...historyItems,
-        ]}
+        items={[<AppHeader key="app-header" version={version} />, ...historyItems]}
       >
         {(item) => item}
       </Static>
diff --git a/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.test.tsx b/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.test.tsx
index de61fe22f..3bdafa1cf 100644
--- a/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.test.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { MemoryUsageDisplay } from './MemoryUsageDisplay.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import process from 'node:process';
-import { act } from 'react';
+import process from "node:process";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { MemoryUsageDisplay } from "./MemoryUsageDisplay.js";
 
-describe('MemoryUsageDisplay', () => {
+describe("MemoryUsageDisplay", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     vi.clearAllMocks();
     // Mock process.memoryUsage
-    vi.spyOn(process, 'memoryUsage').mockReturnValue({
+    vi.spyOn(process, "memoryUsage").mockReturnValue({
       rss: 1024 * 1024 * 50, // 50MB
       heapTotal: 0,
       heapUsed: 0,
@@ -29,14 +29,14 @@ describe('MemoryUsageDisplay', () => {
     vi.restoreAllMocks();
   });
 
-  it('renders memory usage', () => {
+  it("renders memory usage", () => {
     const { lastFrame } = render(<MemoryUsageDisplay />);
-    expect(lastFrame()).toContain('50.0 MB');
+    expect(lastFrame()).toContain("50.0 MB");
   });
 
-  it('updates memory usage over time', async () => {
+  it("updates memory usage over time", async () => {
     const { lastFrame } = render(<MemoryUsageDisplay />);
-    expect(lastFrame()).toContain('50.0 MB');
+    expect(lastFrame()).toContain("50.0 MB");
 
     vi.mocked(process.memoryUsage).mockReturnValue({
       rss: 1024 * 1024 * 100, // 100MB
@@ -50,6 +50,6 @@ describe('MemoryUsageDisplay', () => {
       vi.advanceTimersByTime(2000);
     });
 
-    expect(lastFrame()).toContain('100.0 MB');
+    expect(lastFrame()).toContain("100.0 MB");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.tsx b/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.tsx
index 1ea3c1069..32af31e87 100644
--- a/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/MemoryUsageDisplay.tsx
@@ -4,27 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import process from 'node:process';
-import { formatMemoryUsage } from '../utils/formatters.js';
+import process from "node:process";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import { theme } from "../semantic-colors.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
 
 export const MemoryUsageDisplay: React.FC = () => {
-  const [memoryUsage, setMemoryUsage] = useState<string>('');
-  const [memoryUsageColor, setMemoryUsageColor] = useState<string>(
-    theme.text.secondary,
-  );
+  const [memoryUsage, setMemoryUsage] = useState<string>("");
+  const [memoryUsageColor, setMemoryUsageColor] = useState<string>(theme.text.secondary);
 
   useEffect(() => {
     const updateMemory = () => {
       const usage = process.memoryUsage().rss;
       setMemoryUsage(formatMemoryUsage(usage));
       setMemoryUsageColor(
-        usage >= 2 * 1024 * 1024 * 1024
-          ? theme.status.error
-          : theme.text.secondary,
+        usage >= 2 * 1024 * 1024 * 1024 ? theme.status.error : theme.text.secondary,
       );
     };
     const intervalId = setInterval(updateMemory, 2000);
diff --git a/packages/ui-gemini/src/ui/components/ModelDialog.test.tsx b/packages/ui-gemini/src/ui/components/ModelDialog.test.tsx
index 6ec23fdb1..a126a0263 100644
--- a/packages/ui-gemini/src/ui/components/ModelDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ModelDialog.test.tsx
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { cleanup } from 'ink-testing-library';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import type { Config } from "@airiscode/gemini-cli-core";
 import {
-  GEMINI_MODEL_ALIAS_FLASH_LITE,
+  DEFAULT_GEMINI_MODEL_AUTO,
   GEMINI_MODEL_ALIAS_FLASH,
+  GEMINI_MODEL_ALIAS_FLASH_LITE,
   GEMINI_MODEL_ALIAS_PRO,
-  DEFAULT_GEMINI_MODEL_AUTO,
-} from '@airiscode/gemini-cli-core';
-import { ModelDialog } from './ModelDialog.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { DescriptiveRadioButtonSelect } from './shared/DescriptiveRadioButtonSelect.js';
-import { ConfigContext } from '../contexts/ConfigContext.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-
-vi.mock('../hooks/useKeypress.js', () => ({
+} from "@airiscode/gemini-cli-core";
+import { cleanup } from "ink-testing-library";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ConfigContext } from "../contexts/ConfigContext.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { ModelDialog } from "./ModelDialog.js";
+import { DescriptiveRadioButtonSelect } from "./shared/DescriptiveRadioButtonSelect.js";
+
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 const mockedUseKeypress = vi.mocked(useKeypress);
 
-vi.mock('./shared/DescriptiveRadioButtonSelect.js', () => ({
+vi.mock("./shared/DescriptiveRadioButtonSelect.js", () => ({
   DescriptiveRadioButtonSelect: vi.fn(() => null),
 }));
 const mockedSelect = vi.mocked(DescriptiveRadioButtonSelect);
@@ -47,9 +47,9 @@ const renderComponent = (
 
         // --- Functions used by ClearcutLogger ---
         getUsageStatisticsEnabled: vi.fn(() => true),
-        getSessionId: vi.fn(() => 'mock-session-id'),
+        getSessionId: vi.fn(() => "mock-session-id"),
         getDebugMode: vi.fn(() => false),
-        getContentGeneratorConfig: vi.fn(() => ({ authType: 'mock' })),
+        getContentGeneratorConfig: vi.fn(() => ({ authType: "mock" })),
         getUseSmartEdit: vi.fn(() => false),
         getProxy: vi.fn(() => undefined),
         isInteractive: vi.fn(() => false),
@@ -73,7 +73,7 @@ const renderComponent = (
   };
 };
 
-describe('<ModelDialog />', () => {
+describe("<ModelDialog />", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
@@ -82,17 +82,17 @@ describe('<ModelDialog />', () => {
     cleanup();
   });
 
-  it('renders the title and help text', () => {
+  it("renders the title and help text", () => {
     const { lastFrame, unmount } = renderComponent();
-    expect(lastFrame()).toContain('Select Model');
-    expect(lastFrame()).toContain('(Press Esc to close)');
+    expect(lastFrame()).toContain("Select Model");
+    expect(lastFrame()).toContain("(Press Esc to close)");
     expect(lastFrame()).toContain(
-      'To use a specific Gemini model on startup, use the --model flag.',
+      "To use a specific Gemini model on startup, use the --model flag.",
     );
     unmount();
   });
 
-  it('passes all model options to DescriptiveRadioButtonSelect', () => {
+  it("passes all model options to DescriptiveRadioButtonSelect", () => {
     const { unmount } = renderComponent();
     expect(mockedSelect).toHaveBeenCalledTimes(1);
 
@@ -106,7 +106,7 @@ describe('<ModelDialog />', () => {
     unmount();
   });
 
-  it('initializes with the model from ConfigContext', () => {
+  it("initializes with the model from ConfigContext", () => {
     const mockGetModel = vi.fn(() => GEMINI_MODEL_ALIAS_FLASH);
     const { unmount } = renderComponent({}, { getModel: mockGetModel });
 
@@ -152,7 +152,7 @@ describe('<ModelDialog />', () => {
     unmount();
   });
 
-  it('calls config.setModel and onClose when DescriptiveRadioButtonSelect.onSelect is triggered', () => {
+  it("calls config.setModel and onClose when DescriptiveRadioButtonSelect.onSelect is triggered", () => {
     const { props, mockConfig, unmount } = renderComponent({}, {}); // Pass empty object for contextValue
 
     const childOnSelect = mockedSelect.mock.calls[0][0].onSelect;
@@ -166,7 +166,7 @@ describe('<ModelDialog />', () => {
     unmount();
   });
 
-  it('does not pass onHighlight to DescriptiveRadioButtonSelect', () => {
+  it("does not pass onHighlight to DescriptiveRadioButtonSelect", () => {
     const { unmount } = renderComponent();
 
     const childOnHighlight = mockedSelect.mock.calls[0][0].onHighlight;
@@ -185,30 +185,30 @@ describe('<ModelDialog />', () => {
     expect(options).toEqual({ isActive: true });
 
     keyPressHandler({
-      name: 'escape',
+      name: "escape",
       ctrl: false,
       meta: false,
       shift: false,
       paste: false,
       insertable: false,
-      sequence: '',
+      sequence: "",
     });
     expect(props.onClose).toHaveBeenCalledTimes(1);
 
     keyPressHandler({
-      name: 'a',
+      name: "a",
       ctrl: false,
       meta: false,
       shift: false,
       paste: false,
       insertable: true,
-      sequence: '',
+      sequence: "",
     });
     expect(props.onClose).toHaveBeenCalledTimes(1);
     unmount();
   });
 
-  it('updates initialIndex when config context changes', () => {
+  it("updates initialIndex when config context changes", () => {
     const mockGetModel = vi.fn(() => DEFAULT_GEMINI_MODEL_AUTO);
     const oldMockConfig = {
       getModel: mockGetModel,
diff --git a/packages/ui-gemini/src/ui/components/ModelDialog.tsx b/packages/ui-gemini/src/ui/components/ModelDialog.tsx
index 1691b7dea..27058cc5a 100644
--- a/packages/ui-gemini/src/ui/components/ModelDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/ModelDialog.tsx
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useContext, useMemo } from 'react';
-import { Box, Text } from 'ink';
 import {
-  PREVIEW_GEMINI_MODEL,
-  DEFAULT_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
+  DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_MODEL,
   DEFAULT_GEMINI_MODEL_AUTO,
   GEMINI_MODEL_ALIAS_FLASH,
   GEMINI_MODEL_ALIAS_FLASH_LITE,
   GEMINI_MODEL_ALIAS_PRO,
-  ModelSlashCommandEvent,
   logModelSlashCommand,
-} from '@airiscode/gemini-cli-core';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { theme } from '../semantic-colors.js';
-import { DescriptiveRadioButtonSelect } from './shared/DescriptiveRadioButtonSelect.js';
-import { ConfigContext } from '../contexts/ConfigContext.js';
-import { ThemedGradient } from './ThemedGradient.js';
+  ModelSlashCommandEvent,
+  PREVIEW_GEMINI_MODEL,
+} from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useContext, useMemo } from "react";
+import { ConfigContext } from "../contexts/ConfigContext.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { DescriptiveRadioButtonSelect } from "./shared/DescriptiveRadioButtonSelect.js";
+import { ThemedGradient } from "./ThemedGradient.js";
 
 interface ModelDialogProps {
   onClose: () => void;
@@ -37,7 +37,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onClose();
       }
     },
@@ -48,8 +48,8 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
     () => [
       {
         value: DEFAULT_GEMINI_MODEL_AUTO,
-        title: 'Auto',
-        description: 'Let the system choose the best model for your task.',
+        title: "Auto",
+        description: "Let the system choose the best model for your task.",
         key: DEFAULT_GEMINI_MODEL_AUTO,
       },
       {
@@ -57,20 +57,19 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
         title: config?.getPreviewFeatures()
           ? `Pro (${PREVIEW_GEMINI_MODEL}, ${DEFAULT_GEMINI_MODEL})`
           : `Pro (${DEFAULT_GEMINI_MODEL})`,
-        description:
-          'For complex tasks that require deep reasoning and creativity',
+        description: "For complex tasks that require deep reasoning and creativity",
         key: GEMINI_MODEL_ALIAS_PRO,
       },
       {
         value: GEMINI_MODEL_ALIAS_FLASH,
         title: `Flash (${DEFAULT_GEMINI_FLASH_MODEL})`,
-        description: 'For tasks that need a balance of speed and reasoning',
+        description: "For tasks that need a balance of speed and reasoning",
         key: GEMINI_MODEL_ALIAS_FLASH,
       },
       {
         value: GEMINI_MODEL_ALIAS_FLASH_LITE,
         title: `Flash-Lite (${DEFAULT_GEMINI_FLASH_LITE_MODEL})`,
-        description: 'For simple tasks that need to be done quickly',
+        description: "For simple tasks that need to be done quickly",
         key: GEMINI_MODEL_ALIAS_FLASH_LITE,
       },
     ],
@@ -97,8 +96,8 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
   );
 
   const header = config?.getPreviewFeatures()
-    ? 'Gemini 3 is now enabled.'
-    : 'Gemini 3 is now available.';
+    ? "Gemini 3 is now enabled."
+    : "Gemini 3 is now available.";
 
   const subheader = config?.getPreviewFeatures()
     ? `To disable Gemini 3, disable "Preview features" in /settings.\nLearn more at https://goo.gle/enable-preview-features\n\nWhen you select Auto or Pro, Gemini CLI will attempt to use ${PREVIEW_GEMINI_MODEL} first, before falling back to ${DEFAULT_GEMINI_MODEL}.`
@@ -131,7 +130,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
       </Box>
       <Box marginTop={1} flexDirection="column">
         <Text color={theme.text.secondary}>
-          {'To use a specific Gemini model on startup, use the --model flag.'}
+          {"To use a specific Gemini model on startup, use the --model flag."}
         </Text>
       </Box>
       <Box marginTop={1} flexDirection="column">
diff --git a/packages/ui-gemini/src/ui/components/ModelStatsDisplay.test.tsx b/packages/ui-gemini/src/ui/components/ModelStatsDisplay.test.tsx
index 2b4acde4f..7ab0eef44 100644
--- a/packages/ui-gemini/src/ui/components/ModelStatsDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ModelStatsDisplay.test.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeAll, afterAll } from 'vitest';
-import { ModelStatsDisplay } from './ModelStatsDisplay.js';
-import * as SessionContext from '../contexts/SessionContext.js';
-import type { SessionMetrics } from '../contexts/SessionContext.js';
-import { ToolCallDecision } from '@airiscode/gemini-cli-core';
+import { ToolCallDecision } from "@airiscode/gemini-cli-core";
+import { afterAll, beforeAll, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { SessionMetrics } from "../contexts/SessionContext.js";
+import * as SessionContext from "../contexts/SessionContext.js";
+import { ModelStatsDisplay } from "./ModelStatsDisplay.js";
 
 // Mock the context to provide controlled data for testing
-vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
+vi.mock("../contexts/SessionContext.js", async (importOriginal) => {
   const actual = await importOriginal<typeof SessionContext>();
   return {
     ...actual,
@@ -25,7 +25,7 @@ const useSessionStatsMock = vi.mocked(SessionContext.useSessionStats);
 const renderWithMockedStats = (metrics: SessionMetrics) => {
   useSessionStatsMock.mockReturnValue({
     stats: {
-      sessionId: 'test-session',
+      sessionId: "test-session",
       sessionStartTime: new Date(),
       metrics,
       lastPromptTokenCount: 0,
@@ -39,13 +39,11 @@ const renderWithMockedStats = (metrics: SessionMetrics) => {
   return render(<ModelStatsDisplay />);
 };
 
-describe('<ModelStatsDisplay />', () => {
+describe("<ModelStatsDisplay />", () => {
   beforeAll(() => {
-    vi.spyOn(Number.prototype, 'toLocaleString').mockImplementation(function (
-      this: number,
-    ) {
+    vi.spyOn(Number.prototype, "toLocaleString").mockImplementation(function (this: number) {
       // Use a stable 'en-US' format for test consistency.
-      return new Intl.NumberFormat('en-US').format(this);
+      return new Intl.NumberFormat("en-US").format(this);
     });
   });
 
@@ -75,16 +73,14 @@ describe('<ModelStatsDisplay />', () => {
       },
     });
 
-    expect(lastFrame()).toContain(
-      'No API calls have been made in this session.',
-    );
+    expect(lastFrame()).toContain("No API calls have been made in this session.");
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should not display conditional rows if no model has data for them', () => {
+  it("should not display conditional rows if no model has data for them", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 100 },
           tokens: {
             prompt: 10,
@@ -116,16 +112,16 @@ describe('<ModelStatsDisplay />', () => {
     });
 
     const output = lastFrame();
-    expect(output).not.toContain('Cache Reads');
-    expect(output).not.toContain('Thoughts');
-    expect(output).not.toContain('Tool');
+    expect(output).not.toContain("Cache Reads");
+    expect(output).not.toContain("Thoughts");
+    expect(output).not.toContain("Tool");
     expect(output).toMatchSnapshot();
   });
 
-  it('should display conditional rows if at least one model has data', () => {
+  it("should display conditional rows if at least one model has data", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 100 },
           tokens: {
             prompt: 10,
@@ -136,7 +132,7 @@ describe('<ModelStatsDisplay />', () => {
             tool: 0,
           },
         },
-        'gemini-2.5-flash': {
+        "gemini-2.5-flash": {
           api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 50 },
           tokens: {
             prompt: 5,
@@ -168,16 +164,16 @@ describe('<ModelStatsDisplay />', () => {
     });
 
     const output = lastFrame();
-    expect(output).toContain('Cache Reads');
-    expect(output).toContain('Thoughts');
-    expect(output).toContain('Tool');
+    expect(output).toContain("Cache Reads");
+    expect(output).toContain("Thoughts");
+    expect(output).toContain("Tool");
     expect(output).toMatchSnapshot();
   });
 
-  it('should display stats for multiple models correctly', () => {
+  it("should display stats for multiple models correctly", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: { totalRequests: 10, totalErrors: 1, totalLatencyMs: 1000 },
           tokens: {
             prompt: 100,
@@ -188,7 +184,7 @@ describe('<ModelStatsDisplay />', () => {
             tool: 5,
           },
         },
-        'gemini-2.5-flash': {
+        "gemini-2.5-flash": {
           api: { totalRequests: 20, totalErrors: 2, totalLatencyMs: 500 },
           tokens: {
             prompt: 200,
@@ -220,15 +216,15 @@ describe('<ModelStatsDisplay />', () => {
     });
 
     const output = lastFrame();
-    expect(output).toContain('gemini-2.5-pro');
-    expect(output).toContain('gemini-2.5-flash');
+    expect(output).toContain("gemini-2.5-pro");
+    expect(output).toContain("gemini-2.5-flash");
     expect(output).toMatchSnapshot();
   });
 
-  it('should handle large values without wrapping or overlapping', () => {
+  it("should handle large values without wrapping or overlapping", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: {
             totalRequests: 999999999,
             totalErrors: 123456789,
@@ -266,10 +262,10 @@ describe('<ModelStatsDisplay />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should display a single model correctly', () => {
+  it("should display a single model correctly", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 100 },
           tokens: {
             prompt: 10,
@@ -301,8 +297,8 @@ describe('<ModelStatsDisplay />', () => {
     });
 
     const output = lastFrame();
-    expect(output).toContain('gemini-2.5-pro');
-    expect(output).not.toContain('gemini-2.5-flash');
+    expect(output).toContain("gemini-2.5-pro");
+    expect(output).not.toContain("gemini-2.5-flash");
     expect(output).toMatchSnapshot();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/ModelStatsDisplay.tsx b/packages/ui-gemini/src/ui/components/ModelStatsDisplay.tsx
index f3a2e98fc..7687f0e48 100644
--- a/packages/ui-gemini/src/ui/components/ModelStatsDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/ModelStatsDisplay.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { formatDuration } from '../utils/formatters.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import type { ModelMetrics } from "../contexts/SessionContext.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { theme } from "../semantic-colors.js";
 import {
   calculateAverageLatency,
   calculateCacheHitRate,
   calculateErrorRate,
-} from '../utils/computeStats.js';
-import type { ModelMetrics } from '../contexts/SessionContext.js';
-import { useSessionStats } from '../contexts/SessionContext.js';
+} from "../utils/computeStats.js";
+import { formatDuration } from "../utils/formatters.js";
 
 const METRIC_COL_WIDTH = 28;
 const MODEL_COL_WIDTH = 22;
@@ -34,10 +34,7 @@ const StatRow: React.FC<StatRowProps> = ({
 }) => (
   <Box>
     <Box width={METRIC_COL_WIDTH}>
-      <Text
-        bold={isSection}
-        color={isSection ? theme.text.primary : theme.text.link}
-      >
+      <Text bold={isSection} color={isSection ? theme.text.primary : theme.text.link}>
         {isSubtle ? `  ↳ ${title}` : title}
       </Text>
     </Box>
@@ -58,32 +55,20 @@ export const ModelStatsDisplay: React.FC = () => {
 
   if (activeModels.length === 0) {
     return (
-      <Box
-        borderStyle="round"
-        borderColor={theme.border.default}
-        paddingY={1}
-        paddingX={2}
-      >
-        <Text color={theme.text.primary}>
-          No API calls have been made in this session.
-        </Text>
+      <Box borderStyle="round" borderColor={theme.border.default} paddingY={1} paddingX={2}>
+        <Text color={theme.text.primary}>No API calls have been made in this session.</Text>
       </Box>
     );
   }
 
   const modelNames = activeModels.map(([name]) => name);
 
-  const getModelValues = (
-    getter: (metrics: ModelMetrics) => string | React.ReactElement,
-  ) => activeModels.map(([, metrics]) => getter(metrics));
+  const getModelValues = (getter: (metrics: ModelMetrics) => string | React.ReactElement) =>
+    activeModels.map(([, metrics]) => getter(metrics));
 
-  const hasThoughts = activeModels.some(
-    ([, metrics]) => metrics.tokens.thoughts > 0,
-  );
+  const hasThoughts = activeModels.some(([, metrics]) => metrics.tokens.thoughts > 0);
   const hasTool = activeModels.some(([, metrics]) => metrics.tokens.tool > 0);
-  const hasCached = activeModels.some(
-    ([, metrics]) => metrics.tokens.cached > 0,
-  );
+  const hasCached = activeModels.some(([, metrics]) => metrics.tokens.cached > 0);
 
   return (
     <Box
@@ -135,11 +120,7 @@ export const ModelStatsDisplay: React.FC = () => {
         values={getModelValues((m) => {
           const errorRate = calculateErrorRate(m);
           return (
-            <Text
-              color={
-                m.api.totalErrors > 0 ? theme.status.error : theme.text.primary
-              }
-            >
+            <Text color={m.api.totalErrors > 0 ? theme.status.error : theme.text.primary}>
               {m.api.totalErrors.toLocaleString()} ({errorRate.toFixed(1)}%)
             </Text>
           );
@@ -160,9 +141,7 @@ export const ModelStatsDisplay: React.FC = () => {
       <StatRow
         title="Total"
         values={getModelValues((m) => (
-          <Text color={theme.text.secondary}>
-            {m.tokens.total.toLocaleString()}
-          </Text>
+          <Text color={theme.text.secondary}>{m.tokens.total.toLocaleString()}</Text>
         ))}
       />
       <StatRow
@@ -193,9 +172,7 @@ export const ModelStatsDisplay: React.FC = () => {
           title="Thoughts"
           isSubtle
           values={getModelValues((m) => (
-            <Text color={theme.text.primary}>
-              {m.tokens.thoughts.toLocaleString()}
-            </Text>
+            <Text color={theme.text.primary}>{m.tokens.thoughts.toLocaleString()}</Text>
           ))}
         />
       )}
@@ -204,9 +181,7 @@ export const ModelStatsDisplay: React.FC = () => {
           title="Tool"
           isSubtle
           values={getModelValues((m) => (
-            <Text color={theme.text.primary}>
-              {m.tokens.tool.toLocaleString()}
-            </Text>
+            <Text color={theme.text.primary}>{m.tokens.tool.toLocaleString()}</Text>
           ))}
         />
       )}
@@ -214,9 +189,7 @@ export const ModelStatsDisplay: React.FC = () => {
         title="Output"
         isSubtle
         values={getModelValues((m) => (
-          <Text color={theme.text.primary}>
-            {m.tokens.candidates.toLocaleString()}
-          </Text>
+          <Text color={theme.text.primary}>{m.tokens.candidates.toLocaleString()}</Text>
         ))}
       />
     </Box>
diff --git a/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.test.tsx b/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.test.tsx
index bcabb04e9..93a4265ce 100644
--- a/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.test.tsx
@@ -4,30 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { act } from 'react-dom/test-utils';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { act } from "react-dom/test-utils";
+import { vi } from "vitest";
+import * as trustedFolders from "../../config/trustedFolders.js";
+import { type LoadedTrustedFolders, TrustLevel } from "../../config/trustedFolders.js";
+import { render } from "../../test-utils/render.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { MessageType } from "../types.js";
+import * as directoryUtils from "../utils/directoryUtils.js";
 import {
-  MultiFolderTrustDialog,
   MultiFolderTrustChoice,
+  MultiFolderTrustDialog,
   type MultiFolderTrustDialogProps,
-} from './MultiFolderTrustDialog.js';
-import { vi } from 'vitest';
-import {
-  TrustLevel,
-  type LoadedTrustedFolders,
-} from '../../config/trustedFolders.js';
-import * as trustedFolders from '../../config/trustedFolders.js';
-import * as directoryUtils from '../utils/directoryUtils.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { MessageType } from '../types.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+} from "./MultiFolderTrustDialog.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 // Mocks
-vi.mock('../hooks/useKeypress.js');
-vi.mock('../../config/trustedFolders.js');
-vi.mock('../utils/directoryUtils.js');
-vi.mock('./shared/RadioButtonSelect.js');
+vi.mock("../hooks/useKeypress.js");
+vi.mock("../../config/trustedFolders.js");
+vi.mock("../utils/directoryUtils.js");
+vi.mock("./shared/RadioButtonSelect.js");
 
 const mockedUseKeypress = vi.mocked(useKeypress);
 const mockedRadioButtonSelect = vi.mocked(RadioButtonSelect);
@@ -58,44 +55,40 @@ const defaultProps: MultiFolderTrustDialogProps = {
   addItem: mockAddItem,
 };
 
-describe('MultiFolderTrustDialog', () => {
+describe("MultiFolderTrustDialog", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.mocked(trustedFolders.loadTrustedFolders).mockReturnValue(
-      mockTrustedFolders,
-    );
+    vi.mocked(trustedFolders.loadTrustedFolders).mockReturnValue(mockTrustedFolders);
     vi.mocked(directoryUtils.expandHomeDir).mockImplementation((path) => path);
     mockedRadioButtonSelect.mockImplementation((props) => (
       <div data-testid="RadioButtonSelect" {...props} />
     ));
   });
 
-  it('renders the dialog with the list of folders', () => {
-    const folders = ['/path/to/folder1', '/path/to/folder2'];
-    const { lastFrame } = render(
-      <MultiFolderTrustDialog {...defaultProps} folders={folders} />,
-    );
+  it("renders the dialog with the list of folders", () => {
+    const folders = ["/path/to/folder1", "/path/to/folder2"];
+    const { lastFrame } = render(<MultiFolderTrustDialog {...defaultProps} folders={folders} />);
 
     expect(lastFrame()).toContain(
-      'Do you trust the following folders being added to this workspace?',
+      "Do you trust the following folders being added to this workspace?",
     );
-    expect(lastFrame()).toContain('- /path/to/folder1');
-    expect(lastFrame()).toContain('- /path/to/folder2');
+    expect(lastFrame()).toContain("- /path/to/folder1");
+    expect(lastFrame()).toContain("- /path/to/folder2");
   });
 
-  it('calls onComplete and finishAddingDirectories with an error on escape', async () => {
-    const folders = ['/path/to/folder1'];
+  it("calls onComplete and finishAddingDirectories with an error on escape", async () => {
+    const folders = ["/path/to/folder1"];
     render(<MultiFolderTrustDialog {...defaultProps} folders={folders} />);
 
     const keypressCallback = mockedUseKeypress.mock.calls[0][0];
     await act(async () => {
       await keypressCallback({
-        name: 'escape',
+        name: "escape",
         ctrl: false,
         meta: false,
         shift: false,
         paste: false,
-        sequence: '',
+        sequence: "",
         insertable: false,
       });
     });
@@ -104,15 +97,13 @@ describe('MultiFolderTrustDialog', () => {
       mockConfig,
       mockAddItem,
       [],
-      [
-        'Operation cancelled. The following directories were not added:\n- /path/to/folder1',
-      ],
+      ["Operation cancelled. The following directories were not added:\n- /path/to/folder1"],
     );
     expect(mockOnComplete).toHaveBeenCalled();
   });
 
   it('calls finishAddingDirectories with an error and does not add directories when "No" is chosen', async () => {
-    const folders = ['/path/to/folder1'];
+    const folders = ["/path/to/folder1"];
     render(<MultiFolderTrustDialog {...defaultProps} folders={folders} />);
 
     const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
@@ -125,7 +116,7 @@ describe('MultiFolderTrustDialog', () => {
       mockAddItem,
       [],
       [
-        'The following directories were not added because they were not trusted:\n- /path/to/folder1',
+        "The following directories were not added because they were not trusted:\n- /path/to/folder1",
       ],
     );
     expect(mockOnComplete).toHaveBeenCalled();
@@ -134,12 +125,12 @@ describe('MultiFolderTrustDialog', () => {
   });
 
   it('adds directories to workspace context when "Yes" is chosen', async () => {
-    const folders = ['/path/to/folder1', '/path/to/folder2'];
+    const folders = ["/path/to/folder1", "/path/to/folder2"];
     render(
       <MultiFolderTrustDialog
         {...defaultProps}
         folders={folders}
-        trustedDirs={['/already/trusted']}
+        trustedDirs={["/already/trusted"]}
       />,
     );
 
@@ -148,20 +139,20 @@ describe('MultiFolderTrustDialog', () => {
       await onSelect(MultiFolderTrustChoice.YES);
     });
 
-    expect(mockAddDirectory).toHaveBeenCalledWith('/path/to/folder1');
-    expect(mockAddDirectory).toHaveBeenCalledWith('/path/to/folder2');
+    expect(mockAddDirectory).toHaveBeenCalledWith("/path/to/folder1");
+    expect(mockAddDirectory).toHaveBeenCalledWith("/path/to/folder2");
     expect(mockSetValue).not.toHaveBeenCalled();
     expect(mockFinishAddingDirectories).toHaveBeenCalledWith(
       mockConfig,
       mockAddItem,
-      ['/already/trusted', '/path/to/folder1', '/path/to/folder2'],
+      ["/already/trusted", "/path/to/folder1", "/path/to/folder2"],
       [],
     );
     expect(mockOnComplete).toHaveBeenCalled();
   });
 
   it('adds directories to workspace context and remembers them as trusted when "Yes, and remember" is chosen', async () => {
-    const folders = ['/path/to/folder1'];
+    const folders = ["/path/to/folder1"];
     render(<MultiFolderTrustDialog {...defaultProps} folders={folders} />);
 
     const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
@@ -169,25 +160,20 @@ describe('MultiFolderTrustDialog', () => {
       await onSelect(MultiFolderTrustChoice.YES_AND_REMEMBER);
     });
 
-    expect(mockAddDirectory).toHaveBeenCalledWith('/path/to/folder1');
-    expect(mockSetValue).toHaveBeenCalledWith(
-      '/path/to/folder1',
-      TrustLevel.TRUST_FOLDER,
-    );
+    expect(mockAddDirectory).toHaveBeenCalledWith("/path/to/folder1");
+    expect(mockSetValue).toHaveBeenCalledWith("/path/to/folder1", TrustLevel.TRUST_FOLDER);
     expect(mockFinishAddingDirectories).toHaveBeenCalledWith(
       mockConfig,
       mockAddItem,
-      ['/path/to/folder1'],
+      ["/path/to/folder1"],
       [],
     );
     expect(mockOnComplete).toHaveBeenCalled();
   });
 
-  it('shows submitting message after a choice is made', async () => {
-    const folders = ['/path/to/folder1'];
-    const { lastFrame } = render(
-      <MultiFolderTrustDialog {...defaultProps} folders={folders} />,
-    );
+  it("shows submitting message after a choice is made", async () => {
+    const folders = ["/path/to/folder1"];
+    const { lastFrame } = render(<MultiFolderTrustDialog {...defaultProps} folders={folders} />);
 
     const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
 
@@ -195,11 +181,11 @@ describe('MultiFolderTrustDialog', () => {
       await onSelect(MultiFolderTrustChoice.NO);
     });
 
-    expect(lastFrame()).toContain('Applying trust settings...');
+    expect(lastFrame()).toContain("Applying trust settings...");
   });
 
-  it('shows an error message and completes when config is missing', async () => {
-    const folders = ['/path/to/folder1'];
+  it("shows an error message and completes when config is missing", async () => {
+    const folders = ["/path/to/folder1"];
     render(
       <MultiFolderTrustDialog
         {...defaultProps}
@@ -216,7 +202,7 @@ describe('MultiFolderTrustDialog', () => {
     expect(mockAddItem).toHaveBeenCalledWith(
       {
         type: MessageType.ERROR,
-        text: 'Configuration is not available.',
+        text: "Configuration is not available.",
       },
       expect.any(Number),
     );
@@ -224,21 +210,17 @@ describe('MultiFolderTrustDialog', () => {
     expect(mockFinishAddingDirectories).not.toHaveBeenCalled();
   });
 
-  it('collects and reports errors when some directories fail to be added', async () => {
+  it("collects and reports errors when some directories fail to be added", async () => {
     vi.mocked(directoryUtils.expandHomeDir).mockImplementation((path) => {
-      if (path === '/path/to/error') {
-        throw new Error('Test error');
+      if (path === "/path/to/error") {
+        throw new Error("Test error");
       }
       return path;
     });
 
-    const folders = ['/path/to/good', '/path/to/error'];
+    const folders = ["/path/to/good", "/path/to/error"];
     render(
-      <MultiFolderTrustDialog
-        {...defaultProps}
-        folders={folders}
-        errors={['initial error']}
-      />,
+      <MultiFolderTrustDialog {...defaultProps} folders={folders} errors={["initial error"]} />,
     );
 
     const { onSelect } = mockedRadioButtonSelect.mock.calls[0][0];
@@ -246,13 +228,13 @@ describe('MultiFolderTrustDialog', () => {
       await onSelect(MultiFolderTrustChoice.YES);
     });
 
-    expect(mockAddDirectory).toHaveBeenCalledWith('/path/to/good');
-    expect(mockAddDirectory).not.toHaveBeenCalledWith('/path/to/error');
+    expect(mockAddDirectory).toHaveBeenCalledWith("/path/to/good");
+    expect(mockAddDirectory).not.toHaveBeenCalledWith("/path/to/error");
     expect(mockFinishAddingDirectories).toHaveBeenCalledWith(
       mockConfig,
       mockAddItem,
-      ['/path/to/good'],
-      ['initial error', "Error adding '/path/to/error': Test error"],
+      ["/path/to/good"],
+      ["initial error", "Error adding '/path/to/error': Test error"],
     );
     expect(mockOnComplete).toHaveBeenCalled();
   });
diff --git a/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.tsx b/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.tsx
index 788e302a4..aa065e2f4 100644
--- a/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/MultiFolderTrustDialog.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { useState } from 'react';
-import { theme } from '../semantic-colors.js';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { loadTrustedFolders, TrustLevel } from '../../config/trustedFolders.js';
-import { expandHomeDir } from '../utils/directoryUtils.js';
-import { MessageType, type HistoryItem } from '../types.js';
-import type { Config } from '@airiscode/gemini-cli-core';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useState } from "react";
+import { loadTrustedFolders, TrustLevel } from "../../config/trustedFolders.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { type HistoryItem, MessageType } from "../types.js";
+import { expandHomeDir } from "../utils/directoryUtils.js";
+import type { RadioSelectItem } from "./shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export enum MultiFolderTrustChoice {
   YES,
@@ -29,15 +29,12 @@ export interface MultiFolderTrustDialogProps {
   errors: string[];
   finishAddingDirectories: (
     config: Config,
-    addItem: (
-      itemData: Omit<HistoryItem, 'id'>,
-      baseTimestamp: number,
-    ) => number,
+    addItem: (itemData: Omit<HistoryItem, "id">, baseTimestamp: number) => number,
     added: string[],
     errors: string[],
   ) => Promise<void>;
   config: Config;
-  addItem: (itemData: Omit<HistoryItem, 'id'>, baseTimestamp: number) => number;
+  addItem: (itemData: Omit<HistoryItem, "id">, baseTimestamp: number) => number;
 }
 
 export const MultiFolderTrustDialog: React.FC<MultiFolderTrustDialogProps> = ({
@@ -55,9 +52,7 @@ export const MultiFolderTrustDialog: React.FC<MultiFolderTrustDialogProps> = ({
     setSubmitted(true);
     const errors = [...initialErrors];
     errors.push(
-      `Operation cancelled. The following directories were not added:\n- ${folders.join(
-        '\n- ',
-      )}`,
+      `Operation cancelled. The following directories were not added:\n- ${folders.join("\n- ")}`,
     );
     await finishAddingDirectories(config, addItem, trustedDirs, errors);
     onComplete();
@@ -65,7 +60,7 @@ export const MultiFolderTrustDialog: React.FC<MultiFolderTrustDialogProps> = ({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         handleCancel();
       }
@@ -75,19 +70,19 @@ export const MultiFolderTrustDialog: React.FC<MultiFolderTrustDialogProps> = ({
 
   const options: Array<RadioSelectItem<MultiFolderTrustChoice>> = [
     {
-      label: 'Yes',
+      label: "Yes",
       value: MultiFolderTrustChoice.YES,
-      key: 'yes',
+      key: "yes",
     },
     {
-      label: 'Yes, and remember the directories as trusted',
+      label: "Yes, and remember the directories as trusted",
       value: MultiFolderTrustChoice.YES_AND_REMEMBER,
-      key: 'yes-and-remember',
+      key: "yes-and-remember",
     },
     {
-      label: 'No',
+      label: "No",
       value: MultiFolderTrustChoice.NO,
-      key: 'no',
+      key: "no",
     },
   ];
 
@@ -98,7 +93,7 @@ export const MultiFolderTrustDialog: React.FC<MultiFolderTrustDialogProps> = ({
       addItem(
         {
           type: MessageType.ERROR,
-          text: 'Configuration is not available.',
+          text: "Configuration is not available.",
         },
         Date.now(),
       );
@@ -114,7 +109,7 @@ export const MultiFolderTrustDialog: React.FC<MultiFolderTrustDialogProps> = ({
     if (choice === MultiFolderTrustChoice.NO) {
       errors.push(
         `The following directories were not added because they were not trusted:\n- ${folders.join(
-          '\n- ',
+          "\n- ",
         )}`,
       );
     } else {
@@ -151,21 +146,15 @@ export const MultiFolderTrustDialog: React.FC<MultiFolderTrustDialogProps> = ({
           <Text bold color={theme.text.primary}>
             Do you trust the following folders being added to this workspace?
           </Text>
-          <Text color={theme.text.secondary}>
-            {folders.map((f) => `- ${f}`).join('\n')}
-          </Text>
+          <Text color={theme.text.secondary}>{folders.map((f) => `- ${f}`).join("\n")}</Text>
           <Text color={theme.text.primary}>
-            Trusting a folder allows Gemini to read and perform auto-edits when
-            in auto-approval mode. This is a security feature to prevent
-            accidental execution in untrusted directories.
+            Trusting a folder allows Gemini to read and perform auto-edits when in auto-approval
+            mode. This is a security feature to prevent accidental execution in untrusted
+            directories.
           </Text>
         </Box>
 
-        <RadioButtonSelect
-          items={options}
-          onSelect={handleSelect}
-          isFocused={!submitted}
-        />
+        <RadioButtonSelect items={options} onSelect={handleSelect} isFocused={!submitted} />
       </Box>
       {submitted && (
         <Box marginLeft={1} marginTop={1}>
diff --git a/packages/ui-gemini/src/ui/components/Notifications.test.tsx b/packages/ui-gemini/src/ui/components/Notifications.test.tsx
index e2df4b72a..853378ec7 100644
--- a/packages/ui-gemini/src/ui/components/Notifications.test.tsx
+++ b/packages/ui-gemini/src/ui/components/Notifications.test.tsx
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { Notifications } from './Notifications.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { useAppContext, type AppState } from '../contexts/AppContext.js';
-import { useUIState, type UIState } from '../contexts/UIStateContext.js';
-import { useIsScreenReaderEnabled } from 'ink';
-import * as fs from 'node:fs/promises';
-import { act } from 'react';
+import * as fs from "node:fs/promises";
+import { useIsScreenReaderEnabled } from "ink";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { type AppState, useAppContext } from "../contexts/AppContext.js";
+import { type UIState, useUIState } from "../contexts/UIStateContext.js";
+import { Notifications } from "./Notifications.js";
 
 // Mock dependencies
-vi.mock('../contexts/AppContext.js');
-vi.mock('../contexts/UIStateContext.js');
-vi.mock('ink', async () => {
-  const actual = await vi.importActual('ink');
+vi.mock("../contexts/AppContext.js");
+vi.mock("../contexts/UIStateContext.js");
+vi.mock("ink", async () => {
+  const actual = await vi.importActual("ink");
   return {
     ...actual,
     useIsScreenReaderEnabled: vi.fn(),
   };
 });
-vi.mock('node:fs/promises', async () => {
-  const actual = await vi.importActual('node:fs/promises');
+vi.mock("node:fs/promises", async () => {
+  const actual = await vi.importActual("node:fs/promises");
   return {
     ...actual,
     access: vi.fn(),
@@ -32,28 +32,28 @@ vi.mock('node:fs/promises', async () => {
     mkdir: vi.fn().mockResolvedValue(undefined),
   };
 });
-vi.mock('node:os', () => ({
+vi.mock("node:os", () => ({
   default: {
-    homedir: () => '/mock/home',
+    homedir: () => "/mock/home",
   },
 }));
 
-vi.mock('node:path', async () => {
-  const actual = await vi.importActual<typeof import('node:path')>('node:path');
+vi.mock("node:path", async () => {
+  const actual = await vi.importActual<typeof import("node:path")>("node:path");
   return {
     ...actual,
     default: actual.posix,
   };
 });
 
-vi.mock('@airiscode/gemini-cli-core', () => ({
-  GEMINI_DIR: '.gemini',
+vi.mock("@airiscode/gemini-cli-core", () => ({
+  GEMINI_DIR: ".gemini",
   Storage: {
-    getGlobalTempDir: () => '/mock/temp',
+    getGlobalTempDir: () => "/mock/temp",
   },
 }));
 
-vi.mock('../../config/settings.js', () => ({
+vi.mock("../../config/settings.js", () => ({
   DEFAULT_MODEL_CONFIGS: {},
   LoadedSettings: class {
     constructor() {
@@ -62,7 +62,7 @@ vi.mock('../../config/settings.js', () => ({
   },
 }));
 
-describe('Notifications', () => {
+describe("Notifications", () => {
   const mockUseAppContext = vi.mocked(useAppContext);
   const mockUseUIState = vi.mocked(useUIState);
   const mockUseIsScreenReaderEnabled = vi.mocked(useIsScreenReaderEnabled);
@@ -73,67 +73,67 @@ describe('Notifications', () => {
     vi.clearAllMocks();
     mockUseAppContext.mockReturnValue({
       startupWarnings: [],
-      version: '1.0.0',
+      version: "1.0.0",
     } as AppState);
     mockUseUIState.mockReturnValue({
       initError: null,
-      streamingState: 'idle',
+      streamingState: "idle",
       updateInfo: null,
     } as unknown as UIState);
     mockUseIsScreenReaderEnabled.mockReturnValue(false);
   });
 
-  it('renders nothing when no notifications', () => {
+  it("renders nothing when no notifications", () => {
     const { lastFrame } = render(<Notifications />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it.each([[['Warning 1']], [['Warning 1', 'Warning 2']]])(
-    'renders startup warnings: %s',
-    (warnings) => {
-      mockUseAppContext.mockReturnValue({
-        startupWarnings: warnings,
-        version: '1.0.0',
-      } as AppState);
-      const { lastFrame } = render(<Notifications />);
-      const output = lastFrame();
-      warnings.forEach((warning) => {
-        expect(output).toContain(warning);
-      });
-    },
-  );
-
-  it('renders init error', () => {
+  it.each([
+    [["Warning 1"]],
+    [["Warning 1", "Warning 2"]],
+  ])("renders startup warnings: %s", (warnings) => {
+    mockUseAppContext.mockReturnValue({
+      startupWarnings: warnings,
+      version: "1.0.0",
+    } as AppState);
+    const { lastFrame } = render(<Notifications />);
+    const output = lastFrame();
+    warnings.forEach((warning) => {
+      expect(output).toContain(warning);
+    });
+  });
+
+  it("renders init error", () => {
     mockUseUIState.mockReturnValue({
-      initError: 'Something went wrong',
-      streamingState: 'idle',
+      initError: "Something went wrong",
+      streamingState: "idle",
       updateInfo: null,
     } as unknown as UIState);
     const { lastFrame } = render(<Notifications />);
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('does not render init error when streaming', () => {
+  it("does not render init error when streaming", () => {
     mockUseUIState.mockReturnValue({
-      initError: 'Something went wrong',
-      streamingState: 'responding',
+      initError: "Something went wrong",
+      streamingState: "responding",
       updateInfo: null,
     } as unknown as UIState);
     const { lastFrame } = render(<Notifications />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('renders update notification', () => {
+  it("renders update notification", () => {
     mockUseUIState.mockReturnValue({
       initError: null,
-      streamingState: 'idle',
-      updateInfo: { message: 'Update available' },
+      streamingState: "idle",
+      updateInfo: { message: "Update available" },
     } as unknown as UIState);
     const { lastFrame } = render(<Notifications />);
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders screen reader nudge when enabled and not seen', async () => {
+  it("renders screen reader nudge when enabled and not seen", async () => {
     mockUseIsScreenReaderEnabled.mockReturnValue(true);
 
     let rejectAccess: (err: Error) => void;
@@ -148,7 +148,7 @@ describe('Notifications', () => {
 
     // Trigger rejection inside act
     await act(async () => {
-      rejectAccess(new Error('File not found'));
+      rejectAccess(new Error("File not found"));
     });
 
     // Wait for effect to propagate
@@ -159,7 +159,7 @@ describe('Notifications', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('does not render screen reader nudge when already seen', async () => {
+  it("does not render screen reader nudge when already seen", async () => {
     mockUseIsScreenReaderEnabled.mockReturnValue(true);
 
     let resolveAccess: (val: undefined) => void;
@@ -177,7 +177,7 @@ describe('Notifications', () => {
       resolveAccess(undefined);
     });
 
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
     expect(mockFsWriteFile).not.toHaveBeenCalled();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/Notifications.tsx b/packages/ui-gemini/src/ui/components/Notifications.tsx
index 4471e9cbb..d3635d0e2 100644
--- a/packages/ui-gemini/src/ui/components/Notifications.tsx
+++ b/packages/ui-gemini/src/ui/components/Notifications.tsx
@@ -4,25 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import { useEffect, useState } from 'react';
-import { useAppContext } from '../contexts/AppContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { theme } from '../semantic-colors.js';
-import { StreamingState } from '../types.js';
-import { UpdateNotification } from './UpdateNotification.js';
+import * as fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+import { GEMINI_DIR, Storage } from "@airiscode/gemini-cli-core";
+import { Box, Text, useIsScreenReaderEnabled } from "ink";
+import { useEffect, useState } from "react";
+import { useAppContext } from "../contexts/AppContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { theme } from "../semantic-colors.js";
+import { StreamingState } from "../types.js";
+import { UpdateNotification } from "./UpdateNotification.js";
 
-import { GEMINI_DIR, Storage } from '@airiscode/gemini-cli-core';
-
-import * as fs from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-
-const settingsPath = path.join(os.homedir(), GEMINI_DIR, 'settings.json');
+const settingsPath = path.join(os.homedir(), GEMINI_DIR, "settings.json");
 
 const screenReaderNudgeFilePath = path.join(
   Storage.getGlobalTempDir(),
-  'seen_screen_reader_nudge.json',
+  "seen_screen_reader_nudge.json",
 );
 
 export const Notifications = () => {
@@ -31,12 +29,11 @@ export const Notifications = () => {
 
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
   const showStartupWarnings = startupWarnings.length > 0;
-  const showInitError =
-    initError && streamingState !== StreamingState.Responding;
+  const showInitError = initError && streamingState !== StreamingState.Responding;
 
-  const [hasSeenScreenReaderNudge, setHasSeenScreenReaderNudge] = useState<
-    boolean | undefined
-  >(undefined);
+  const [hasSeenScreenReaderNudge, setHasSeenScreenReaderNudge] = useState<boolean | undefined>(
+    undefined,
+  );
 
   useEffect(() => {
     const checkScreenReader = async () => {
@@ -54,8 +51,7 @@ export const Notifications = () => {
     }
   }, [isScreenReaderEnabled]);
 
-  const showScreenReaderNudge =
-    isScreenReaderEnabled && hasSeenScreenReaderNudge === false;
+  const showScreenReaderNudge = isScreenReaderEnabled && hasSeenScreenReaderNudge === false;
 
   useEffect(() => {
     const writeScreenReaderNudgeFile = async () => {
@@ -64,9 +60,9 @@ export const Notifications = () => {
           await fs.mkdir(path.dirname(screenReaderNudgeFilePath), {
             recursive: true,
           });
-          await fs.writeFile(screenReaderNudgeFilePath, 'true');
+          await fs.writeFile(screenReaderNudgeFilePath, "true");
         } catch (error) {
-          console.error('Error storing screen reader nudge', error);
+          console.error("Error storing screen reader nudge", error);
         }
       }
     };
@@ -74,12 +70,7 @@ export const Notifications = () => {
     writeScreenReaderNudgeFile();
   }, [showScreenReaderNudge]);
 
-  if (
-    !showStartupWarnings &&
-    !showInitError &&
-    !updateInfo &&
-    !showScreenReaderNudge
-  ) {
+  if (!showStartupWarnings && !showInitError && !updateInfo && !showScreenReaderNudge) {
     return null;
   }
 
@@ -87,9 +78,8 @@ export const Notifications = () => {
     <>
       {showScreenReaderNudge && (
         <Text>
-          You are currently in screen reader-friendly view. To switch out, open{' '}
-          {settingsPath} and remove the entry for {'"screenReader"'}. This will
-          disappear on next run.
+          You are currently in screen reader-friendly view. To switch out, open {settingsPath} and
+          remove the entry for {'"screenReader"'}. This will disappear on next run.
         </Text>
       )}
       {updateInfo && <UpdateNotification message={updateInfo.message} />}
@@ -109,19 +99,9 @@ export const Notifications = () => {
         </Box>
       )}
       {showInitError && (
-        <Box
-          borderStyle="round"
-          borderColor={theme.status.error}
-          paddingX={1}
-          marginBottom={1}
-        >
-          <Text color={theme.status.error}>
-            Initialization Error: {initError}
-          </Text>
-          <Text color={theme.status.error}>
-            {' '}
-            Please check API key and configuration.
-          </Text>
+        <Box borderStyle="round" borderColor={theme.status.error} paddingX={1} marginBottom={1}>
+          <Text color={theme.status.error}>Initialization Error: {initError}</Text>
+          <Text color={theme.status.error}> Please check API key and configuration.</Text>
         </Box>
       )}
     </>
diff --git a/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.test.tsx b/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.test.tsx
index 00247cedf..be3109ba3 100644
--- a/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.test.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Mock } from 'vitest';
-import { renderWithProviders } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { PermissionsModifyTrustDialog } from './PermissionsModifyTrustDialog.js';
-import { TrustLevel } from '../../config/trustedFolders.js';
-import { act } from 'react';
-import * as processUtils from '../../utils/processUtils.js';
-import { usePermissionsModifyTrust } from '../hooks/usePermissionsModifyTrust.js';
+import { act } from "react";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { TrustLevel } from "../../config/trustedFolders.js";
+import { waitFor } from "../../test-utils/async.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import * as processUtils from "../../utils/processUtils.js";
+import { usePermissionsModifyTrust } from "../hooks/usePermissionsModifyTrust.js";
+import { PermissionsModifyTrustDialog } from "./PermissionsModifyTrustDialog.js";
 
 // Hoist mocks for dependencies of the usePermissionsModifyTrust hook
 const mockedCwd = vi.hoisted(() => vi.fn());
@@ -20,36 +20,36 @@ const mockedLoadTrustedFolders = vi.hoisted(() => vi.fn());
 const mockedIsWorkspaceTrusted = vi.hoisted(() => vi.fn());
 
 // Mock the modules themselves
-vi.mock('node:process', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:process')>();
+vi.mock("node:process", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:process")>();
   return {
     ...actual,
     cwd: mockedCwd,
   };
 });
 
-vi.mock('../../config/trustedFolders.js', () => ({
+vi.mock("../../config/trustedFolders.js", () => ({
   loadTrustedFolders: mockedLoadTrustedFolders,
   isWorkspaceTrusted: mockedIsWorkspaceTrusted,
   TrustLevel: {
-    TRUST_FOLDER: 'TRUST_FOLDER',
-    TRUST_PARENT: 'TRUST_PARENT',
-    DO_NOT_TRUST: 'DO_NOT_TRUST',
+    TRUST_FOLDER: "TRUST_FOLDER",
+    TRUST_PARENT: "TRUST_PARENT",
+    DO_NOT_TRUST: "DO_NOT_TRUST",
   },
 }));
 
-vi.mock('../hooks/usePermissionsModifyTrust.js');
+vi.mock("../hooks/usePermissionsModifyTrust.js");
 
-describe('PermissionsModifyTrustDialog', () => {
+describe("PermissionsModifyTrustDialog", () => {
   let mockUpdateTrustLevel: Mock;
   let mockCommitTrustLevelChange: Mock;
 
   beforeEach(() => {
-    mockedCwd.mockReturnValue('/test/dir');
+    mockedCwd.mockReturnValue("/test/dir");
     mockUpdateTrustLevel = vi.fn();
     mockCommitTrustLevelChange = vi.fn();
     vi.mocked(usePermissionsModifyTrust).mockReturnValue({
-      cwd: '/test/dir',
+      cwd: "/test/dir",
       currentTrustLevel: TrustLevel.DO_NOT_TRUST,
       isInheritedTrustFromParent: false,
       isInheritedTrustFromIde: false,
@@ -64,21 +64,21 @@ describe('PermissionsModifyTrustDialog', () => {
     vi.resetAllMocks();
   });
 
-  it('should render the main dialog with current trust level', async () => {
+  it("should render the main dialog with current trust level", async () => {
     const { lastFrame } = renderWithProviders(
       <PermissionsModifyTrustDialog onExit={vi.fn()} addItem={vi.fn()} />,
     );
 
     await waitFor(() => {
-      expect(lastFrame()).toContain('Modify Trust Level');
-      expect(lastFrame()).toContain('Folder: /test/dir');
-      expect(lastFrame()).toContain('Current Level: DO_NOT_TRUST');
+      expect(lastFrame()).toContain("Modify Trust Level");
+      expect(lastFrame()).toContain("Folder: /test/dir");
+      expect(lastFrame()).toContain("Current Level: DO_NOT_TRUST");
     });
   });
 
-  it('should display the inherited trust note from parent', async () => {
+  it("should display the inherited trust note from parent", async () => {
     vi.mocked(usePermissionsModifyTrust).mockReturnValue({
-      cwd: '/test/dir',
+      cwd: "/test/dir",
       currentTrustLevel: TrustLevel.DO_NOT_TRUST,
       isInheritedTrustFromParent: true,
       isInheritedTrustFromIde: false,
@@ -93,14 +93,14 @@ describe('PermissionsModifyTrustDialog', () => {
 
     await waitFor(() => {
       expect(lastFrame()).toContain(
-        'Note: This folder behaves as a trusted folder because one of the parent folders is trusted.',
+        "Note: This folder behaves as a trusted folder because one of the parent folders is trusted.",
       );
     });
   });
 
-  it('should display the inherited trust note from IDE', async () => {
+  it("should display the inherited trust note from IDE", async () => {
     vi.mocked(usePermissionsModifyTrust).mockReturnValue({
-      cwd: '/test/dir',
+      cwd: "/test/dir",
       currentTrustLevel: TrustLevel.DO_NOT_TRUST,
       isInheritedTrustFromParent: false,
       isInheritedTrustFromIde: true,
@@ -115,32 +115,32 @@ describe('PermissionsModifyTrustDialog', () => {
 
     await waitFor(() => {
       expect(lastFrame()).toContain(
-        'Note: This folder behaves as a trusted folder because the connected IDE workspace is trusted.',
+        "Note: This folder behaves as a trusted folder because the connected IDE workspace is trusted.",
       );
     });
   });
 
-  it('should render the labels with folder names', async () => {
+  it("should render the labels with folder names", async () => {
     const { lastFrame } = renderWithProviders(
       <PermissionsModifyTrustDialog onExit={vi.fn()} addItem={vi.fn()} />,
     );
 
     await waitFor(() => {
-      expect(lastFrame()).toContain('Trust this folder (dir)');
-      expect(lastFrame()).toContain('Trust parent folder (test)');
+      expect(lastFrame()).toContain("Trust this folder (dir)");
+      expect(lastFrame()).toContain("Trust parent folder (test)");
     });
   });
 
-  it('should call onExit when escape is pressed', async () => {
+  it("should call onExit when escape is pressed", async () => {
     const onExit = vi.fn();
     const { stdin, lastFrame } = renderWithProviders(
       <PermissionsModifyTrustDialog onExit={onExit} addItem={vi.fn()} />,
     );
 
-    await waitFor(() => expect(lastFrame()).not.toContain('Loading...'));
+    await waitFor(() => expect(lastFrame()).not.toContain("Loading..."));
 
     act(() => {
-      stdin.write('\u001b[27u'); // Kitty escape key
+      stdin.write("\u001b[27u"); // Kitty escape key
     });
 
     await waitFor(() => {
@@ -148,13 +148,11 @@ describe('PermissionsModifyTrustDialog', () => {
     });
   });
 
-  it('should commit and restart `r` keypress', async () => {
-    const mockRelaunchApp = vi
-      .spyOn(processUtils, 'relaunchApp')
-      .mockResolvedValue(undefined);
+  it("should commit and restart `r` keypress", async () => {
+    const mockRelaunchApp = vi.spyOn(processUtils, "relaunchApp").mockResolvedValue(undefined);
     mockCommitTrustLevelChange.mockReturnValue(true);
     vi.mocked(usePermissionsModifyTrust).mockReturnValue({
-      cwd: '/test/dir',
+      cwd: "/test/dir",
       currentTrustLevel: TrustLevel.DO_NOT_TRUST,
       isInheritedTrustFromParent: false,
       isInheritedTrustFromIde: false,
@@ -169,9 +167,9 @@ describe('PermissionsModifyTrustDialog', () => {
       <PermissionsModifyTrustDialog onExit={onExit} addItem={vi.fn()} />,
     );
 
-    await waitFor(() => expect(lastFrame()).not.toContain('Loading...'));
+    await waitFor(() => expect(lastFrame()).not.toContain("Loading..."));
 
-    act(() => stdin.write('r')); // Press 'r' to restart
+    act(() => stdin.write("r")); // Press 'r' to restart
 
     await waitFor(() => {
       expect(mockCommitTrustLevelChange).toHaveBeenCalled();
@@ -181,9 +179,9 @@ describe('PermissionsModifyTrustDialog', () => {
     mockRelaunchApp.mockRestore();
   });
 
-  it('should not commit when escape is pressed during restart prompt', async () => {
+  it("should not commit when escape is pressed during restart prompt", async () => {
     vi.mocked(usePermissionsModifyTrust).mockReturnValue({
-      cwd: '/test/dir',
+      cwd: "/test/dir",
       currentTrustLevel: TrustLevel.DO_NOT_TRUST,
       isInheritedTrustFromParent: false,
       isInheritedTrustFromIde: false,
@@ -198,9 +196,9 @@ describe('PermissionsModifyTrustDialog', () => {
       <PermissionsModifyTrustDialog onExit={onExit} addItem={vi.fn()} />,
     );
 
-    await waitFor(() => expect(lastFrame()).not.toContain('Loading...'));
+    await waitFor(() => expect(lastFrame()).not.toContain("Loading..."));
 
-    act(() => stdin.write('\u001b[27u')); // Press kitty escape key
+    act(() => stdin.write("\u001b[27u")); // Press kitty escape key
 
     await waitFor(() => {
       expect(mockCommitTrustLevelChange).not.toHaveBeenCalled();
diff --git a/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.tsx b/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.tsx
index 1b29826ed..8eeffd54d 100644
--- a/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/PermissionsModifyTrustDialog.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type React from 'react';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import { TrustLevel } from '../../config/trustedFolders.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { usePermissionsModifyTrust } from '../hooks/usePermissionsModifyTrust.js';
-import { theme } from '../semantic-colors.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { relaunchApp } from '../../utils/processUtils.js';
-import { type UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
+import * as path from "node:path";
+import * as process from "node:process";
+import { Box, Text } from "ink";
+import type React from "react";
+import { TrustLevel } from "../../config/trustedFolders.js";
+import { relaunchApp } from "../../utils/processUtils.js";
+import { type UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { usePermissionsModifyTrust } from "../hooks/usePermissionsModifyTrust.js";
+import { theme } from "../semantic-colors.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export interface PermissionsDialogProps {
   targetDirectory?: string;
@@ -22,7 +22,7 @@ export interface PermissionsDialogProps {
 
 interface PermissionsModifyTrustDialogProps extends PermissionsDialogProps {
   onExit: () => void;
-  addItem: UseHistoryManagerReturn['addItem'];
+  addItem: UseHistoryManagerReturn["addItem"];
 }
 
 export function PermissionsModifyTrustDialog({
@@ -64,10 +64,10 @@ export function PermissionsModifyTrustDialog({
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onExit();
       }
-      if (needsRestart && key.name === 'r') {
+      if (needsRestart && key.name === "r") {
         const success = commitTrustLevelChange();
         if (success) {
           // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -80,9 +80,7 @@ export function PermissionsModifyTrustDialog({
     { isActive: true },
   );
 
-  const index = TRUST_LEVEL_ITEMS.findIndex(
-    (item) => item.value === currentTrustLevel,
-  );
+  const index = TRUST_LEVEL_ITEMS.findIndex((item) => item.value === currentTrustLevel);
   const initialIndex = index === -1 ? 0 : index;
 
   return (
@@ -94,25 +92,23 @@ export function PermissionsModifyTrustDialog({
         padding={1}
       >
         <Box flexDirection="column" paddingBottom={1}>
-          <Text bold>{'> '}Modify Trust Level</Text>
+          <Text bold>{"> "}Modify Trust Level</Text>
           <Box marginTop={1} />
           <Text>Folder: {cwd}</Text>
           <Text>
-            Current Level: <Text bold>{currentTrustLevel || 'Not Set'}</Text>
+            Current Level: <Text bold>{currentTrustLevel || "Not Set"}</Text>
           </Text>
           {isInheritedTrustFromParent && (
             <Text color={theme.text.secondary}>
-              Note: This folder behaves as a trusted folder because one of the
-              parent folders is trusted. It will remain trusted even if you set
-              a different trust level here. To change this, you need to modify
-              the trust setting in the parent folder.
+              Note: This folder behaves as a trusted folder because one of the parent folders is
+              trusted. It will remain trusted even if you set a different trust level here. To
+              change this, you need to modify the trust setting in the parent folder.
             </Text>
           )}
           {isInheritedTrustFromIde && (
             <Text color={theme.text.secondary}>
-              Note: This folder behaves as a trusted folder because the
-              connected IDE workspace is trusted. It will remain trusted even if
-              you set a different trust level here.
+              Note: This folder behaves as a trusted folder because the connected IDE workspace is
+              trusted. It will remain trusted even if you set a different trust level here.
             </Text>
           )}
         </Box>
@@ -124,16 +120,14 @@ export function PermissionsModifyTrustDialog({
           initialIndex={initialIndex}
         />
         <Box marginTop={1}>
-          <Text color={theme.text.secondary}>
-            (Use Enter to select, Esc to close)
-          </Text>
+          <Text color={theme.text.secondary}>(Use Enter to select, Esc to close)</Text>
         </Box>
       </Box>
       {needsRestart && (
         <Box marginLeft={1} marginTop={1}>
           <Text color={theme.status.warning}>
-            To apply the trust changes, Gemini CLI must be restarted. Press
-            &apos;r&apos; to restart CLI now.
+            To apply the trust changes, Gemini CLI must be restarted. Press &apos;r&apos; to restart
+            CLI now.
           </Text>
         </Box>
       )}
diff --git a/packages/ui-gemini/src/ui/components/PrepareLabel.test.tsx b/packages/ui-gemini/src/ui/components/PrepareLabel.test.tsx
index 5c0681783..c48cc640d 100644
--- a/packages/ui-gemini/src/ui/components/PrepareLabel.test.tsx
+++ b/packages/ui-gemini/src/ui/components/PrepareLabel.test.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { render } from '../../test-utils/render.js';
-import { PrepareLabel, MAX_WIDTH } from './PrepareLabel.js';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { MAX_WIDTH, PrepareLabel } from "./PrepareLabel.js";
 
-describe('PrepareLabel', () => {
-  const color = 'white';
-  const flat = (s: string | undefined) => (s ?? '').replace(/\n/g, '');
+describe("PrepareLabel", () => {
+  const color = "white";
+  const flat = (s: string | undefined) => (s ?? "").replace(/\n/g, "");
 
-  it('renders plain label when no match (short label)', () => {
+  it("renders plain label when no match (short label)", () => {
     const { lastFrame, unmount } = render(
       <PrepareLabel
         label="simple command"
@@ -26,33 +26,23 @@ describe('PrepareLabel', () => {
     unmount();
   });
 
-  it('truncates long label when collapsed and no match', () => {
-    const long = 'x'.repeat(MAX_WIDTH + 25);
+  it("truncates long label when collapsed and no match", () => {
+    const long = "x".repeat(MAX_WIDTH + 25);
     const { lastFrame, unmount } = render(
-      <PrepareLabel
-        label={long}
-        userInput=""
-        textColor={color}
-        isExpanded={false}
-      />,
+      <PrepareLabel label={long} userInput="" textColor={color} isExpanded={false} />,
     );
     const out = lastFrame();
     const f = flat(out);
-    expect(f.endsWith('...')).toBe(true);
+    expect(f.endsWith("...")).toBe(true);
     expect(f.length).toBe(MAX_WIDTH + 3);
     expect(out).toMatchSnapshot();
     unmount();
   });
 
-  it('shows full long label when expanded and no match', () => {
-    const long = 'y'.repeat(MAX_WIDTH + 25);
+  it("shows full long label when expanded and no match", () => {
+    const long = "y".repeat(MAX_WIDTH + 25);
     const { lastFrame, unmount } = render(
-      <PrepareLabel
-        label={long}
-        userInput=""
-        textColor={color}
-        isExpanded={true}
-      />,
+      <PrepareLabel label={long} userInput="" textColor={color} isExpanded={true} />,
     );
     const out = lastFrame();
     const f = flat(out);
@@ -61,9 +51,9 @@ describe('PrepareLabel', () => {
     unmount();
   });
 
-  it('highlights matched substring when expanded (text only visible)', () => {
+  it("highlights matched substring when expanded (text only visible)", () => {
     const label = 'run: git commit -m "feat: add search"';
-    const userInput = 'commit';
+    const userInput = "commit";
     const matchedIndex = label.indexOf(userInput);
     const { lastFrame, unmount } = render(
       <PrepareLabel
@@ -79,10 +69,10 @@ describe('PrepareLabel', () => {
     unmount();
   });
 
-  it('creates centered window around match when collapsed', () => {
-    const prefix = 'cd_/very/long/path/that/keeps/going/'.repeat(3);
-    const core = 'search-here';
-    const suffix = '/and/then/some/more/components/'.repeat(3);
+  it("creates centered window around match when collapsed", () => {
+    const prefix = "cd_/very/long/path/that/keeps/going/".repeat(3);
+    const core = "search-here";
+    const suffix = "/and/then/some/more/components/".repeat(3);
     const label = prefix + core + suffix;
     const matchedIndex = prefix.length;
     const { lastFrame, unmount } = render(
@@ -98,16 +88,16 @@ describe('PrepareLabel', () => {
     const out = lastFrame();
     const f = flat(out);
     expect(f.includes(core)).toBe(true);
-    expect(f.startsWith('...')).toBe(true);
-    expect(f.endsWith('...')).toBe(true);
+    expect(f.startsWith("...")).toBe(true);
+    expect(f.endsWith("...")).toBe(true);
     expect(out).toMatchSnapshot();
     unmount();
   });
 
-  it('truncates match itself when match is very long', () => {
-    const prefix = 'find ';
-    const core = 'x'.repeat(MAX_WIDTH + 25);
-    const suffix = ' in this text';
+  it("truncates match itself when match is very long", () => {
+    const prefix = "find ";
+    const core = "x".repeat(MAX_WIDTH + 25);
+    const suffix = " in this text";
     const label = prefix + core + suffix;
     const matchedIndex = prefix.length;
     const { lastFrame, unmount } = render(
@@ -121,9 +111,9 @@ describe('PrepareLabel', () => {
     );
     const out = lastFrame();
     const f = flat(out);
-    expect(f.includes('...')).toBe(true);
-    expect(f.startsWith('...')).toBe(false);
-    expect(f.endsWith('...')).toBe(true);
+    expect(f.includes("...")).toBe(true);
+    expect(f.startsWith("...")).toBe(false);
+    expect(f.endsWith("...")).toBe(true);
     expect(f.length).toBe(MAX_WIDTH + 2);
     expect(out).toMatchSnapshot();
     unmount();
diff --git a/packages/ui-gemini/src/ui/components/PrepareLabel.tsx b/packages/ui-gemini/src/ui/components/PrepareLabel.tsx
index 759e84b10..a7419bcd1 100644
--- a/packages/ui-gemini/src/ui/components/PrepareLabel.tsx
+++ b/packages/ui-gemini/src/ui/components/PrepareLabel.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Text } from "ink";
+import React from "react";
+import { theme } from "../semantic-colors.js";
 
 export const MAX_WIDTH = 150; // Maximum width for the text that is shown
 
@@ -36,7 +36,7 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
     const display = isExpanded
       ? label
       : label.length > MAX_WIDTH
-        ? label.slice(0, MAX_WIDTH) + '...'
+        ? label.slice(0, MAX_WIDTH) + "..."
         : label;
     return (
       <Text wrap="wrap" color={textColor}>
@@ -46,9 +46,9 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
   }
 
   const matchLength = userInput.length;
-  let before = '';
-  let match = '';
-  let after = '';
+  let before = "";
+  let match = "";
+  let after = "";
 
   // Case 1: Show the full string if it's expanded or already fits
   if (isExpanded || label.length <= MAX_WIDTH) {
@@ -58,7 +58,7 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
   }
   // Case 2: The match itself is too long, so we only show a truncated portion of the match
   else if (matchLength >= MAX_WIDTH) {
-    match = label.slice(matchedIndex, matchedIndex + MAX_WIDTH - 1) + '...';
+    match = label.slice(matchedIndex, matchedIndex + MAX_WIDTH - 1) + "...";
   }
   // Case 3: Truncate the string to create a window around the match
   else {
@@ -87,10 +87,10 @@ const _PrepareLabel: React.FC<PrepareLabelProps> = ({
     after = slicedLabel.slice(finalMatchIndex + matchLength);
 
     if (start > 0) {
-      before = before.length >= 3 ? '...' + before.slice(3) : '...';
+      before = before.length >= 3 ? "..." + before.slice(3) : "...";
     }
     if (end < label.length) {
-      after = after.length >= 3 ? after.slice(0, -3) + '...' : '...';
+      after = after.length >= 3 ? after.slice(0, -3) + "..." : "...";
     }
   }
 
diff --git a/packages/ui-gemini/src/ui/components/ProQuotaDialog.test.tsx b/packages/ui-gemini/src/ui/components/ProQuotaDialog.test.tsx
index 60e83cbb1..3e8f25ffa 100644
--- a/packages/ui-gemini/src/ui/components/ProQuotaDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ProQuotaDialog.test.tsx
@@ -4,31 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { act } from 'react';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { ProQuotaDialog } from './ProQuotaDialog.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-
 import {
+  DEFAULT_GEMINI_FLASH_MODEL,
   PREVIEW_GEMINI_MODEL,
   UserTierId,
-  DEFAULT_GEMINI_FLASH_MODEL,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ProQuotaDialog } from "./ProQuotaDialog.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 // Mock the child component to make it easier to test the parent
-vi.mock('./shared/RadioButtonSelect.js', () => ({
+vi.mock("./shared/RadioButtonSelect.js", () => ({
   RadioButtonSelect: vi.fn(),
 }));
 
-describe('ProQuotaDialog', () => {
+describe("ProQuotaDialog", () => {
   const mockOnChoice = vi.fn();
 
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  describe('for flash model failures', () => {
+  describe("for flash model failures", () => {
     it('should render "Keep trying" and "Stop" options', () => {
       const { unmount } = render(
         <ProQuotaDialog
@@ -45,14 +44,14 @@ describe('ProQuotaDialog', () => {
         expect.objectContaining({
           items: [
             {
-              label: 'Keep trying',
-              value: 'retry_once',
-              key: 'retry_once',
+              label: "Keep trying",
+              value: "retry_once",
+              key: "retry_once",
             },
             {
-              label: 'Stop',
-              value: 'retry_later',
-              key: 'retry_later',
+              label: "Stop",
+              value: "retry_later",
+              key: "retry_later",
             },
           ],
         }),
@@ -62,9 +61,9 @@ describe('ProQuotaDialog', () => {
     });
   });
 
-  describe('for non-flash model failures', () => {
-    describe('when it is a terminal quota error', () => {
-      it('should render switch and stop options for paid tiers', () => {
+  describe("for non-flash model failures", () => {
+    describe("when it is a terminal quota error", () => {
+      it("should render switch and stop options for paid tiers", () => {
         const { unmount } = render(
           <ProQuotaDialog
             failedModel="gemini-2.5-pro"
@@ -81,14 +80,14 @@ describe('ProQuotaDialog', () => {
           expect.objectContaining({
             items: [
               {
-                label: 'Switch to gemini-2.5-flash',
-                value: 'retry_always',
-                key: 'retry_always',
+                label: "Switch to gemini-2.5-flash",
+                value: "retry_always",
+                key: "retry_always",
               },
               {
-                label: 'Stop',
-                value: 'retry_later',
-                key: 'retry_later',
+                label: "Stop",
+                value: "retry_later",
+                key: "retry_later",
               },
             ],
           }),
@@ -97,7 +96,7 @@ describe('ProQuotaDialog', () => {
         unmount();
       });
 
-      it('should render switch, upgrade, and stop options for free tier', () => {
+      it("should render switch, upgrade, and stop options for free tier", () => {
         const { unmount } = render(
           <ProQuotaDialog
             failedModel="gemini-2.5-pro"
@@ -114,19 +113,19 @@ describe('ProQuotaDialog', () => {
           expect.objectContaining({
             items: [
               {
-                label: 'Switch to gemini-2.5-flash',
-                value: 'retry_always',
-                key: 'retry_always',
+                label: "Switch to gemini-2.5-flash",
+                value: "retry_always",
+                key: "retry_always",
               },
               {
-                label: 'Upgrade for higher limits',
-                value: 'upgrade',
-                key: 'upgrade',
+                label: "Upgrade for higher limits",
+                value: "upgrade",
+                key: "upgrade",
               },
               {
-                label: 'Stop',
-                value: 'retry_later',
-                key: 'retry_later',
+                label: "Stop",
+                value: "retry_later",
+                key: "retry_later",
               },
             ],
           }),
@@ -136,8 +135,8 @@ describe('ProQuotaDialog', () => {
       });
     });
 
-    describe('when it is a capacity error', () => {
-      it('should render keep trying, switch, and stop options', () => {
+    describe("when it is a capacity error", () => {
+      it("should render keep trying, switch, and stop options", () => {
         const { unmount } = render(
           <ProQuotaDialog
             failedModel="gemini-2.5-pro"
@@ -154,16 +153,16 @@ describe('ProQuotaDialog', () => {
           expect.objectContaining({
             items: [
               {
-                label: 'Keep trying',
-                value: 'retry_once',
-                key: 'retry_once',
+                label: "Keep trying",
+                value: "retry_once",
+                key: "retry_once",
               },
               {
-                label: 'Switch to gemini-2.5-flash',
-                value: 'retry_always',
-                key: 'retry_always',
+                label: "Switch to gemini-2.5-flash",
+                value: "retry_always",
+                key: "retry_always",
               },
-              { label: 'Stop', value: 'retry_later', key: 'retry_later' },
+              { label: "Stop", value: "retry_later", key: "retry_later" },
             ],
           }),
           undefined,
@@ -172,8 +171,8 @@ describe('ProQuotaDialog', () => {
       });
     });
 
-    describe('when it is a model not found error', () => {
-      it('should render switch and stop options regardless of tier', () => {
+    describe("when it is a model not found error", () => {
+      it("should render switch and stop options regardless of tier", () => {
         const { unmount } = render(
           <ProQuotaDialog
             failedModel="gemini-3-pro-preview"
@@ -190,14 +189,14 @@ describe('ProQuotaDialog', () => {
           expect.objectContaining({
             items: [
               {
-                label: 'Switch to gemini-2.5-pro',
-                value: 'retry_always',
-                key: 'retry_always',
+                label: "Switch to gemini-2.5-pro",
+                value: "retry_always",
+                key: "retry_always",
               },
               {
-                label: 'Stop',
-                value: 'retry_later',
-                key: 'retry_later',
+                label: "Stop",
+                value: "retry_later",
+                key: "retry_later",
               },
             ],
           }),
@@ -206,7 +205,7 @@ describe('ProQuotaDialog', () => {
         unmount();
       });
 
-      it('should render switch and stop options for paid tier as well', () => {
+      it("should render switch and stop options for paid tier as well", () => {
         const { unmount } = render(
           <ProQuotaDialog
             failedModel="gemini-3-pro-preview"
@@ -223,14 +222,14 @@ describe('ProQuotaDialog', () => {
           expect.objectContaining({
             items: [
               {
-                label: 'Switch to gemini-2.5-pro',
-                value: 'retry_always',
-                key: 'retry_always',
+                label: "Switch to gemini-2.5-pro",
+                value: "retry_always",
+                key: "retry_always",
               },
               {
-                label: 'Stop',
-                value: 'retry_later',
-                key: 'retry_later',
+                label: "Stop",
+                value: "retry_later",
+                key: "retry_later",
               },
             ],
           }),
@@ -241,8 +240,8 @@ describe('ProQuotaDialog', () => {
     });
   });
 
-  describe('onChoice handling', () => {
-    it('should call onChoice with the selected value', () => {
+  describe("onChoice handling", () => {
+    it("should call onChoice with the selected value", () => {
       const { unmount } = render(
         <ProQuotaDialog
           failedModel="gemini-2.5-pro"
@@ -256,16 +255,16 @@ describe('ProQuotaDialog', () => {
 
       const onSelect = (RadioButtonSelect as Mock).mock.calls[0][0].onSelect;
       act(() => {
-        onSelect('retry_always');
+        onSelect("retry_always");
       });
 
-      expect(mockOnChoice).toHaveBeenCalledWith('retry_always');
+      expect(mockOnChoice).toHaveBeenCalledWith("retry_always");
       unmount();
     });
   });
 
-  describe('footer note', () => {
-    it('should show a special note for PREVIEW_GEMINI_MODEL', () => {
+  describe("footer note", () => {
+    it("should show a special note for PREVIEW_GEMINI_MODEL", () => {
       const { lastFrame, unmount } = render(
         <ProQuotaDialog
           failedModel={PREVIEW_GEMINI_MODEL}
@@ -279,12 +278,12 @@ describe('ProQuotaDialog', () => {
 
       const output = lastFrame();
       expect(output).toContain(
-        'Note: We will periodically retry Preview Model to see if congestion has cleared.',
+        "Note: We will periodically retry Preview Model to see if congestion has cleared.",
       );
       unmount();
     });
 
-    it('should show the default note for other models', () => {
+    it("should show the default note for other models", () => {
       const { lastFrame, unmount } = render(
         <ProQuotaDialog
           failedModel="gemini-2.5-pro"
@@ -297,9 +296,7 @@ describe('ProQuotaDialog', () => {
       );
 
       const output = lastFrame();
-      expect(output).toContain(
-        'Note: You can always use /model to select a different option.',
-      );
+      expect(output).toContain("Note: You can always use /model to select a different option.");
       unmount();
     });
   });
diff --git a/packages/ui-gemini/src/ui/components/ProQuotaDialog.tsx b/packages/ui-gemini/src/ui/components/ProQuotaDialog.tsx
index d1ba7339b..5ae6b404e 100644
--- a/packages/ui-gemini/src/ui/components/ProQuotaDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/ProQuotaDialog.tsx
@@ -4,17 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { theme } from '../semantic-colors.js';
-
 import {
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   UserTierId,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 interface ProQuotaDialogProps {
   failedModel: string;
@@ -22,9 +21,7 @@ interface ProQuotaDialogProps {
   message: string;
   isTerminalQuotaError: boolean;
   isModelNotFoundError?: boolean;
-  onChoice: (
-    choice: 'retry_later' | 'retry_once' | 'retry_always' | 'upgrade',
-  ) => void;
+  onChoice: (choice: "retry_later" | "retry_once" | "retry_always" | "upgrade") => void;
   userTier: UserTierId | undefined;
 }
 
@@ -38,8 +35,7 @@ export function ProQuotaDialog({
   userTier,
 }: ProQuotaDialogProps): React.JSX.Element {
   // Use actual user tier if available; otherwise, default to FREE tier behavior (safe default)
-  const isPaidTier =
-    userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
+  const isPaidTier = userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
   let items;
   // flash and flash lite don't have options to switch or upgrade.
   if (
@@ -48,14 +44,14 @@ export function ProQuotaDialog({
   ) {
     items = [
       {
-        label: 'Keep trying',
-        value: 'retry_once' as const,
-        key: 'retry_once',
+        label: "Keep trying",
+        value: "retry_once" as const,
+        key: "retry_once",
       },
       {
-        label: 'Stop',
-        value: 'retry_later' as const,
-        key: 'retry_later',
+        label: "Stop",
+        value: "retry_later" as const,
+        key: "retry_later",
       },
     ];
   } else if (isModelNotFoundError || (isTerminalQuotaError && isPaidTier)) {
@@ -63,13 +59,13 @@ export function ProQuotaDialog({
     items = [
       {
         label: `Switch to ${fallbackModel}`,
-        value: 'retry_always' as const,
-        key: 'retry_always',
+        value: "retry_always" as const,
+        key: "retry_always",
       },
       {
         label: `Stop`,
-        value: 'retry_later' as const,
-        key: 'retry_later',
+        value: "retry_later" as const,
+        key: "retry_later",
       },
     ];
   } else if (isTerminalQuotaError && !isPaidTier) {
@@ -77,44 +73,42 @@ export function ProQuotaDialog({
     items = [
       {
         label: `Switch to ${fallbackModel}`,
-        value: 'retry_always' as const,
-        key: 'retry_always',
+        value: "retry_always" as const,
+        key: "retry_always",
       },
       {
-        label: 'Upgrade for higher limits',
-        value: 'upgrade' as const,
-        key: 'upgrade',
+        label: "Upgrade for higher limits",
+        value: "upgrade" as const,
+        key: "upgrade",
       },
       {
         label: `Stop`,
-        value: 'retry_later' as const,
-        key: 'retry_later',
+        value: "retry_later" as const,
+        key: "retry_later",
       },
     ];
   } else {
     // capacity error
     items = [
       {
-        label: 'Keep trying',
-        value: 'retry_once' as const,
-        key: 'retry_once',
+        label: "Keep trying",
+        value: "retry_once" as const,
+        key: "retry_once",
       },
       {
         label: `Switch to ${fallbackModel}`,
-        value: 'retry_always' as const,
-        key: 'retry_always',
+        value: "retry_always" as const,
+        key: "retry_always",
       },
       {
-        label: 'Stop',
-        value: 'retry_later' as const,
-        key: 'retry_later',
+        label: "Stop",
+        value: "retry_later" as const,
+        key: "retry_later",
       },
     ];
   }
 
-  const handleSelect = (
-    choice: 'retry_later' | 'retry_once' | 'retry_always' | 'upgrade',
-  ) => {
+  const handleSelect = (choice: "retry_later" | "retry_once" | "retry_always" | "upgrade") => {
     onChoice(choice);
   };
 
@@ -128,8 +122,8 @@ export function ProQuotaDialog({
       </Box>
       <Text color={theme.text.primary}>
         {fallbackModel === DEFAULT_GEMINI_MODEL && !isModelNotFoundError
-          ? 'Note: We will periodically retry Preview Model to see if congestion has cleared.'
-          : 'Note: You can always use /model to select a different option.'}
+          ? "Note: We will periodically retry Preview Model to see if congestion has cleared."
+          : "Note: You can always use /model to select a different option."}
       </Text>
     </Box>
   );
diff --git a/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.test.tsx b/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.test.tsx
index 7829858b9..b54e1d96a 100644
--- a/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.test.tsx
@@ -4,84 +4,66 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { render } from '../../test-utils/render.js';
-import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { QueuedMessageDisplay } from "./QueuedMessageDisplay.js";
 
-describe('QueuedMessageDisplay', () => {
-  it('renders nothing when message queue is empty', () => {
-    const { lastFrame, unmount } = render(
-      <QueuedMessageDisplay messageQueue={[]} />,
-    );
+describe("QueuedMessageDisplay", () => {
+  it("renders nothing when message queue is empty", () => {
+    const { lastFrame, unmount } = render(<QueuedMessageDisplay messageQueue={[]} />);
 
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
     unmount();
   });
 
-  it('displays single queued message', () => {
+  it("displays single queued message", () => {
     const { lastFrame, unmount } = render(
-      <QueuedMessageDisplay messageQueue={['First message']} />,
+      <QueuedMessageDisplay messageQueue={["First message"]} />,
     );
 
     const output = lastFrame();
-    expect(output).toContain('Queued (press ↑ to edit):');
-    expect(output).toContain('First message');
+    expect(output).toContain("Queued (press ↑ to edit):");
+    expect(output).toContain("First message");
     unmount();
   });
 
-  it('displays multiple queued messages', () => {
-    const messageQueue = [
-      'First queued message',
-      'Second queued message',
-      'Third queued message',
-    ];
+  it("displays multiple queued messages", () => {
+    const messageQueue = ["First queued message", "Second queued message", "Third queued message"];
 
-    const { lastFrame, unmount } = render(
-      <QueuedMessageDisplay messageQueue={messageQueue} />,
-    );
+    const { lastFrame, unmount } = render(<QueuedMessageDisplay messageQueue={messageQueue} />);
 
     const output = lastFrame();
-    expect(output).toContain('Queued (press ↑ to edit):');
-    expect(output).toContain('First queued message');
-    expect(output).toContain('Second queued message');
-    expect(output).toContain('Third queued message');
+    expect(output).toContain("Queued (press ↑ to edit):");
+    expect(output).toContain("First queued message");
+    expect(output).toContain("Second queued message");
+    expect(output).toContain("Third queued message");
     unmount();
   });
 
-  it('shows overflow indicator when more than 3 messages are queued', () => {
-    const messageQueue = [
-      'Message 1',
-      'Message 2',
-      'Message 3',
-      'Message 4',
-      'Message 5',
-    ];
+  it("shows overflow indicator when more than 3 messages are queued", () => {
+    const messageQueue = ["Message 1", "Message 2", "Message 3", "Message 4", "Message 5"];
 
-    const { lastFrame, unmount } = render(
-      <QueuedMessageDisplay messageQueue={messageQueue} />,
-    );
+    const { lastFrame, unmount } = render(<QueuedMessageDisplay messageQueue={messageQueue} />);
 
     const output = lastFrame();
-    expect(output).toContain('Queued (press ↑ to edit):');
-    expect(output).toContain('Message 1');
-    expect(output).toContain('Message 2');
-    expect(output).toContain('Message 3');
-    expect(output).toContain('... (+2 more)');
-    expect(output).not.toContain('Message 4');
-    expect(output).not.toContain('Message 5');
+    expect(output).toContain("Queued (press ↑ to edit):");
+    expect(output).toContain("Message 1");
+    expect(output).toContain("Message 2");
+    expect(output).toContain("Message 3");
+    expect(output).toContain("... (+2 more)");
+    expect(output).not.toContain("Message 4");
+    expect(output).not.toContain("Message 5");
     unmount();
   });
 
-  it('normalizes whitespace in messages', () => {
-    const messageQueue = ['Message   with\tmultiple\n  whitespace'];
+  it("normalizes whitespace in messages", () => {
+    const messageQueue = ["Message   with\tmultiple\n  whitespace"];
 
-    const { lastFrame, unmount } = render(
-      <QueuedMessageDisplay messageQueue={messageQueue} />,
-    );
+    const { lastFrame, unmount } = render(<QueuedMessageDisplay messageQueue={messageQueue} />);
 
     const output = lastFrame();
-    expect(output).toContain('Queued (press ↑ to edit):');
-    expect(output).toContain('Message with multiple whitespace');
+    expect(output).toContain("Queued (press ↑ to edit):");
+    expect(output).toContain("Message with multiple whitespace");
     unmount();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.tsx b/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.tsx
index edf10b559..c1f18c690 100644
--- a/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/QueuedMessageDisplay.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
+import { Box, Text } from "ink";
 
 const MAX_DISPLAYED_QUEUED_MESSAGES = 3;
 
@@ -12,9 +12,7 @@ export interface QueuedMessageDisplayProps {
   messageQueue: string[];
 }
 
-export const QueuedMessageDisplay = ({
-  messageQueue,
-}: QueuedMessageDisplayProps) => {
+export const QueuedMessageDisplay = ({ messageQueue }: QueuedMessageDisplayProps) => {
   if (messageQueue.length === 0) {
     return null;
   }
@@ -24,19 +22,17 @@ export const QueuedMessageDisplay = ({
       <Box paddingLeft={2}>
         <Text dimColor>Queued (press ↑ to edit):</Text>
       </Box>
-      {messageQueue
-        .slice(0, MAX_DISPLAYED_QUEUED_MESSAGES)
-        .map((message, index) => {
-          const preview = message.replace(/\s+/g, ' ');
+      {messageQueue.slice(0, MAX_DISPLAYED_QUEUED_MESSAGES).map((message, index) => {
+        const preview = message.replace(/\s+/g, " ");
 
-          return (
-            <Box key={index} paddingLeft={4} width="100%">
-              <Text dimColor wrap="truncate">
-                {preview}
-              </Text>
-            </Box>
-          );
-        })}
+        return (
+          <Box key={index} paddingLeft={4} width="100%">
+            <Text dimColor wrap="truncate">
+              {preview}
+            </Text>
+          </Box>
+        );
+      })}
       {messageQueue.length > MAX_DISPLAYED_QUEUED_MESSAGES && (
         <Box paddingLeft={4}>
           <Text dimColor>
diff --git a/packages/ui-gemini/src/ui/components/QuittingDisplay.test.tsx b/packages/ui-gemini/src/ui/components/QuittingDisplay.test.tsx
index 177d469d8..ebbc109be 100644
--- a/packages/ui-gemini/src/ui/components/QuittingDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/QuittingDisplay.test.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { QuittingDisplay } from './QuittingDisplay.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import React from 'react';
-import { useUIState, type UIState } from '../contexts/UIStateContext.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import React from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { type UIState, useUIState } from "../contexts/UIStateContext.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { QuittingDisplay } from "./QuittingDisplay.js";
 
-vi.mock('../contexts/UIStateContext.js');
-vi.mock('../hooks/useTerminalSize.js');
-vi.mock('./HistoryItemDisplay.js', async () => {
-  const { Text } = await vi.importActual('ink');
+vi.mock("../contexts/UIStateContext.js");
+vi.mock("../hooks/useTerminalSize.js");
+vi.mock("./HistoryItemDisplay.js", async () => {
+  const { Text } = await vi.importActual("ink");
   return {
     HistoryItemDisplay: ({ item }: { item: { content: string } }) =>
       React.createElement(Text as unknown as React.FC, null, item.content),
   };
 });
 
-describe('QuittingDisplay', () => {
+describe("QuittingDisplay", () => {
   const mockUseUIState = vi.mocked(useUIState);
   const mockUseTerminalSize = vi.mocked(useTerminalSize);
 
@@ -30,25 +30,25 @@ describe('QuittingDisplay', () => {
     mockUseTerminalSize.mockReturnValue({ rows: 20, columns: 80 });
   });
 
-  it('renders nothing when no quitting messages', () => {
+  it("renders nothing when no quitting messages", () => {
     mockUseUIState.mockReturnValue({
       quittingMessages: null,
     } as unknown as UIState);
     const { lastFrame } = render(<QuittingDisplay />);
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('renders quitting messages', () => {
+  it("renders quitting messages", () => {
     const mockMessages = [
-      { id: '1', type: 'user', content: 'Goodbye' },
-      { id: '2', type: 'model', content: 'See you later' },
+      { id: "1", type: "user", content: "Goodbye" },
+      { id: "2", type: "model", content: "See you later" },
     ];
     mockUseUIState.mockReturnValue({
       quittingMessages: mockMessages,
       constrainHeight: false,
     } as unknown as UIState);
     const { lastFrame } = render(<QuittingDisplay />);
-    expect(lastFrame()).toContain('Goodbye');
-    expect(lastFrame()).toContain('See you later');
+    expect(lastFrame()).toContain("Goodbye");
+    expect(lastFrame()).toContain("See you later");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/QuittingDisplay.tsx b/packages/ui-gemini/src/ui/components/QuittingDisplay.tsx
index ee81f9201..74ad76378 100644
--- a/packages/ui-gemini/src/ui/components/QuittingDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/QuittingDisplay.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { HistoryItemDisplay } from './HistoryItemDisplay.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box } from "ink";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
+import { HistoryItemDisplay } from "./HistoryItemDisplay.js";
 
 export const QuittingDisplay = () => {
   const uiState = useUIState();
@@ -24,9 +24,7 @@ export const QuittingDisplay = () => {
       {uiState.quittingMessages.map((item) => (
         <HistoryItemDisplay
           key={item.id}
-          availableTerminalHeight={
-            uiState.constrainHeight ? availableTerminalHeight : undefined
-          }
+          availableTerminalHeight={uiState.constrainHeight ? availableTerminalHeight : undefined}
           terminalWidth={terminalWidth}
           item={item}
           isPending={false}
diff --git a/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.test.tsx b/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.test.tsx
index 30eaf90c2..289ced7a2 100644
--- a/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.test.tsx
+++ b/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.test.tsx
@@ -4,34 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { RawMarkdownIndicator } from './RawMarkdownIndicator.js';
-import { describe, it, expect, afterEach } from 'vitest';
+import { afterEach, describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { RawMarkdownIndicator } from "./RawMarkdownIndicator.js";
 
-describe('RawMarkdownIndicator', () => {
+describe("RawMarkdownIndicator", () => {
   const originalPlatform = process.platform;
 
   afterEach(() => {
-    Object.defineProperty(process, 'platform', {
+    Object.defineProperty(process, "platform", {
       value: originalPlatform,
     });
   });
 
-  it('renders correct key binding for darwin', () => {
-    Object.defineProperty(process, 'platform', {
-      value: 'darwin',
+  it("renders correct key binding for darwin", () => {
+    Object.defineProperty(process, "platform", {
+      value: "darwin",
     });
     const { lastFrame } = render(<RawMarkdownIndicator />);
-    expect(lastFrame()).toContain('raw markdown mode');
-    expect(lastFrame()).toContain('option+m to toggle');
+    expect(lastFrame()).toContain("raw markdown mode");
+    expect(lastFrame()).toContain("option+m to toggle");
   });
 
-  it('renders correct key binding for other platforms', () => {
-    Object.defineProperty(process, 'platform', {
-      value: 'linux',
+  it("renders correct key binding for other platforms", () => {
+    Object.defineProperty(process, "platform", {
+      value: "linux",
     });
     const { lastFrame } = render(<RawMarkdownIndicator />);
-    expect(lastFrame()).toContain('raw markdown mode');
-    expect(lastFrame()).toContain('alt+m to toggle');
+    expect(lastFrame()).toContain("raw markdown mode");
+    expect(lastFrame()).toContain("alt+m to toggle");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.tsx b/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.tsx
index c47b35f24..25fdcf25b 100644
--- a/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.tsx
+++ b/packages/ui-gemini/src/ui/components/RawMarkdownIndicator.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 export const RawMarkdownIndicator: React.FC = () => {
-  const modKey = process.platform === 'darwin' ? 'option+m' : 'alt+m';
+  const modKey = process.platform === "darwin" ? "option+m" : "alt+m";
   return (
     <Box>
       <Text>
diff --git a/packages/ui-gemini/src/ui/components/SessionBrowser.test.tsx b/packages/ui-gemini/src/ui/components/SessionBrowser.test.tsx
index aa852aaa4..6517419d2 100644
--- a/packages/ui-gemini/src/ui/components/SessionBrowser.test.tsx
+++ b/packages/ui-gemini/src/ui/components/SessionBrowser.test.tsx
@@ -4,30 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { SessionBrowser } from './SessionBrowser.js';
-import type { SessionBrowserProps } from './SessionBrowser.js';
-import type { SessionInfo } from '../../utils/sessionUtils.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import type { SessionInfo } from "../../utils/sessionUtils.js";
+import type { SessionBrowserProps } from "./SessionBrowser.js";
+import { SessionBrowser } from "./SessionBrowser.js";
 
 // Collect key handlers registered via useKeypress so tests can
 // simulate input without going through the full stdin pipeline.
 const keypressHandlers: Array<(key: unknown) => void> = [];
 
-vi.mock('../hooks/useTerminalSize.js', () => ({
+vi.mock("../hooks/useTerminalSize.js", () => ({
   useTerminalSize: () => ({ columns: 80, rows: 24 }),
 }));
 
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   // The real hook subscribes to the KeypressContext. Here we just
   // capture the handler so tests can call it directly.
-  useKeypress: (
-    handler: (key: unknown) => void,
-    options: { isActive: boolean },
-  ) => {
+  useKeypress: (handler: (key: unknown) => void, options: { isActive: boolean }) => {
     if (options?.isActive) {
       keypressHandlers.push(handler);
     }
@@ -35,9 +32,9 @@ vi.mock('../hooks/useKeypress.js', () => ({
 }));
 
 // Mock the component itself to bypass async loading
-vi.mock('./SessionBrowser.js', async (importOriginal) => {
-  const original = await importOriginal<typeof import('./SessionBrowser.js')>();
-  const React = await import('react');
+vi.mock("./SessionBrowser.js", async (importOriginal) => {
+  const original = await importOriginal<typeof import("./SessionBrowser.js")>();
+  const React = await import("react");
 
   const TestSessionBrowser = (
     props: SessionBrowserProps & {
@@ -84,9 +81,9 @@ const TestSessionBrowser = SessionBrowser as unknown as React.FC<
 const createMockConfig = (overrides: Partial<Config> = {}): Config =>
   ({
     storage: {
-      getProjectTempDir: () => '/tmp/test',
+      getProjectTempDir: () => "/tmp/test",
     },
-    getSessionId: () => 'default-session-id',
+    getSessionId: () => "default-session-id",
     ...overrides,
   }) as Config;
 
@@ -103,17 +100,17 @@ const triggerKey = (
 ) => {
   const handler = keypressHandlers[keypressHandlers.length - 1];
   if (!handler) {
-    throw new Error('No keypress handler registered');
+    throw new Error("No keypress handler registered");
   }
 
   const key = {
-    name: '',
+    name: "",
     ctrl: false,
     meta: false,
     shift: false,
     paste: false,
     insertable: false,
-    sequence: '',
+    sequence: "",
     ...partialKey,
   };
 
@@ -123,23 +120,23 @@ const triggerKey = (
 };
 
 const createSession = (overrides: Partial<SessionInfo>): SessionInfo => ({
-  id: 'session-id',
-  file: 'session-id',
-  fileName: 'session-id.json',
+  id: "session-id",
+  file: "session-id",
+  fileName: "session-id.json",
   startTime: new Date().toISOString(),
   lastUpdated: new Date().toISOString(),
   messageCount: 1,
-  displayName: 'Test Session',
-  firstUserMessage: 'Test Session',
+  displayName: "Test Session",
+  firstUserMessage: "Test Session",
   isCurrentSession: false,
   index: 0,
   ...overrides,
 });
 
-describe('SessionBrowser component', () => {
+describe("SessionBrowser component", () => {
   beforeEach(() => {
     vi.useFakeTimers();
-    vi.setSystemTime(new Date('2025-11-01T12:00:00Z'));
+    vi.setSystemTime(new Date("2025-11-01T12:00:00Z"));
     keypressHandlers.length = 0;
     vi.clearAllMocks();
   });
@@ -149,7 +146,7 @@ describe('SessionBrowser component', () => {
     vi.restoreAllMocks();
   });
 
-  it('shows empty state when no sessions exist', () => {
+  it("shows empty state when no sessions exist", () => {
     const config = createMockConfig();
     const onResumeSession = vi.fn();
     const onDeleteSession = vi.fn().mockResolvedValue(undefined);
@@ -168,20 +165,20 @@ describe('SessionBrowser component', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders a list of sessions and marks current session as disabled', () => {
+  it("renders a list of sessions and marks current session as disabled", () => {
     const session1 = createSession({
-      id: 'abc123',
-      file: 'abc123',
-      displayName: 'First conversation about cats',
-      lastUpdated: '2025-01-01T10:05:00Z',
+      id: "abc123",
+      file: "abc123",
+      displayName: "First conversation about cats",
+      lastUpdated: "2025-01-01T10:05:00Z",
       messageCount: 2,
       index: 0,
     });
     const session2 = createSession({
-      id: 'def456',
-      file: 'def456',
-      displayName: 'Second conversation about dogs',
-      lastUpdated: '2025-01-01T11:30:00Z',
+      id: "def456",
+      file: "def456",
+      displayName: "Second conversation about dogs",
+      lastUpdated: "2025-01-01T11:30:00Z",
       messageCount: 5,
       isCurrentSession: true,
       index: 1,
@@ -205,37 +202,37 @@ describe('SessionBrowser component', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('enters search mode, filters sessions, and renders match snippets', async () => {
+  it("enters search mode, filters sessions, and renders match snippets", async () => {
     const searchSession = createSession({
-      id: 'search1',
-      file: 'search1',
-      displayName: 'Query is here and another query.',
-      firstUserMessage: 'Query is here and another query.',
-      fullContent: 'Query is here and another query.',
+      id: "search1",
+      file: "search1",
+      displayName: "Query is here and another query.",
+      firstUserMessage: "Query is here and another query.",
+      fullContent: "Query is here and another query.",
       messages: [
         {
-          role: 'user',
-          content: 'Query is here and another query.',
+          role: "user",
+          content: "Query is here and another query.",
         },
       ],
       index: 0,
-      lastUpdated: '2025-01-01T12:00:00Z',
+      lastUpdated: "2025-01-01T12:00:00Z",
     });
 
     const otherSession = createSession({
-      id: 'other',
-      file: 'other',
-      displayName: 'Nothing interesting here.',
-      firstUserMessage: 'Nothing interesting here.',
-      fullContent: 'Nothing interesting here.',
+      id: "other",
+      file: "other",
+      displayName: "Nothing interesting here.",
+      firstUserMessage: "Nothing interesting here.",
+      fullContent: "Nothing interesting here.",
       messages: [
         {
-          role: 'user',
-          content: 'Nothing interesting here.',
+          role: "user",
+          content: "Nothing interesting here.",
         },
       ],
       index: 1,
-      lastUpdated: '2025-01-01T10:00:00Z',
+      lastUpdated: "2025-01-01T10:00:00Z",
     });
 
     const config = createMockConfig();
@@ -253,40 +250,40 @@ describe('SessionBrowser component', () => {
       />,
     );
 
-    expect(lastFrame()).toContain('Chat Sessions (2 total');
+    expect(lastFrame()).toContain("Chat Sessions (2 total");
 
     // Enter search mode.
-    triggerKey({ sequence: '/', name: '/' });
+    triggerKey({ sequence: "/", name: "/" });
 
     await waitFor(() => {
-      expect(lastFrame()).toContain('Search:');
+      expect(lastFrame()).toContain("Search:");
     });
 
     // Type the query "query".
-    for (const ch of ['q', 'u', 'e', 'r', 'y']) {
+    for (const ch of ["q", "u", "e", "r", "y"]) {
       triggerKey({ sequence: ch, name: ch, ctrl: false, meta: false });
     }
 
     await waitFor(() => {
-      expect(lastFrame()).toContain('Chat Sessions (1 total, filtered');
+      expect(lastFrame()).toContain("Chat Sessions (1 total, filtered");
     });
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('handles keyboard navigation and resumes the selected session', () => {
+  it("handles keyboard navigation and resumes the selected session", () => {
     const session1 = createSession({
-      id: 'one',
-      file: 'one',
-      displayName: 'First session',
+      id: "one",
+      file: "one",
+      displayName: "First session",
       index: 0,
-      lastUpdated: '2025-01-02T12:00:00Z',
+      lastUpdated: "2025-01-02T12:00:00Z",
     });
     const session2 = createSession({
-      id: 'two',
-      file: 'two',
-      displayName: 'Second session',
+      id: "two",
+      file: "two",
+      displayName: "Second session",
       index: 1,
-      lastUpdated: '2025-01-01T12:00:00Z',
+      lastUpdated: "2025-01-01T12:00:00Z",
     });
 
     const config = createMockConfig();
@@ -304,35 +301,35 @@ describe('SessionBrowser component', () => {
       />,
     );
 
-    expect(lastFrame()).toContain('Chat Sessions (2 total');
+    expect(lastFrame()).toContain("Chat Sessions (2 total");
 
     // Move selection down.
-    triggerKey({ name: 'down', sequence: '[B' });
+    triggerKey({ name: "down", sequence: "[B" });
 
     // Press Enter.
-    triggerKey({ name: 'return', sequence: '\r' });
+    triggerKey({ name: "return", sequence: "\r" });
 
     expect(onResumeSession).toHaveBeenCalledTimes(1);
     const [resumedSession] = onResumeSession.mock.calls[0];
     expect(resumedSession).toEqual(session2);
   });
 
-  it('does not allow resuming or deleting the current session', () => {
+  it("does not allow resuming or deleting the current session", () => {
     const currentSession = createSession({
-      id: 'current',
-      file: 'current',
-      displayName: 'Current session',
+      id: "current",
+      file: "current",
+      displayName: "Current session",
       isCurrentSession: true,
       index: 0,
-      lastUpdated: '2025-01-02T12:00:00Z',
+      lastUpdated: "2025-01-02T12:00:00Z",
     });
     const otherSession = createSession({
-      id: 'other',
-      file: 'other',
-      displayName: 'Other session',
+      id: "other",
+      file: "other",
+      displayName: "Other session",
       isCurrentSession: false,
       index: 1,
-      lastUpdated: '2025-01-01T12:00:00Z',
+      lastUpdated: "2025-01-01T12:00:00Z",
     });
 
     const config = createMockConfig();
@@ -351,15 +348,15 @@ describe('SessionBrowser component', () => {
     );
 
     // Active selection is at 0 (current session).
-    triggerKey({ name: 'return', sequence: '\r' });
+    triggerKey({ name: "return", sequence: "\r" });
     expect(onResumeSession).not.toHaveBeenCalled();
 
     // Attempt delete.
-    triggerKey({ sequence: 'x', name: 'x' });
+    triggerKey({ sequence: "x", name: "x" });
     expect(onDeleteSession).not.toHaveBeenCalled();
   });
 
-  it('shows an error state when loading sessions fails', () => {
+  it("shows an error state when loading sessions fails", () => {
     const config = createMockConfig();
     const onResumeSession = vi.fn();
     const onDeleteSession = vi.fn().mockResolvedValue(undefined);
diff --git a/packages/ui-gemini/src/ui/components/SessionBrowser.tsx b/packages/ui-gemini/src/ui/components/SessionBrowser.tsx
index daf36b9bf..daf095202 100644
--- a/packages/ui-gemini/src/ui/components/SessionBrowser.tsx
+++ b/packages/ui-gemini/src/ui/components/SessionBrowser.tsx
@@ -4,20 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState, useCallback, useMemo, useEffect, useRef } from 'react';
-import { Box, Text } from 'ink';
-import { Colors } from '../colors.js';
-import { useTerminalSize } from '../hooks/useTerminalSize.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import path from 'node:path';
-import type { Config } from '@airiscode/gemini-cli-core';
-import type { SessionInfo, TextMatch } from '../../utils/sessionUtils.js';
-import {
-  cleanMessage,
-  formatRelativeTime,
-  getSessionFiles,
-} from '../../utils/sessionUtils.js';
+import path from "node:path";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { SessionInfo, TextMatch } from "../../utils/sessionUtils.js";
+import { cleanMessage, formatRelativeTime, getSessionFiles } from "../../utils/sessionUtils.js";
+import { Colors } from "../colors.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { useTerminalSize } from "../hooks/useTerminalSize.js";
 
 /**
  * Props for the main SessionBrowser component.
@@ -66,7 +62,7 @@ export interface SessionBrowserState {
 
   // Sort state
   /** Current sort criteria */
-  sortOrder: 'date' | 'messages' | 'name';
+  sortOrder: "date" | "messages" | "name";
   /** Whether sort order is reversed */
   sortReverse: boolean;
 
@@ -96,9 +92,7 @@ export interface SessionBrowserState {
   /** Update search mode state */
   setIsSearchMode: React.Dispatch<React.SetStateAction<boolean>>;
   /** Update sort order */
-  setSortOrder: React.Dispatch<
-    React.SetStateAction<'date' | 'messages' | 'name'>
-  >;
+  setSortOrder: React.Dispatch<React.SetStateAction<"date" | "messages" | "name">>;
   /** Update sort reverse flag */
   setSortReverse: React.Dispatch<React.SetStateAction<boolean>>;
   setHasLoadedFullContent: React.Dispatch<React.SetStateAction<boolean>>;
@@ -128,11 +122,7 @@ const SessionBrowserLoading = (): React.JSX.Element => (
 /**
  * Error state component displayed when session loading fails.
  */
-const SessionBrowserError = ({
-  state,
-}: {
-  state: SessionBrowserState;
-}): React.JSX.Element => (
+const SessionBrowserError = ({ state }: { state: SessionBrowserState }): React.JSX.Element => (
   <Box flexDirection="column" paddingX={1}>
     <Text color={Colors.AccentRed}>Error: {state.error}</Text>
     <Text color={Colors.Gray}>Press q to exit</Text>
@@ -158,18 +148,16 @@ const SessionBrowserEmpty = (): React.JSX.Element => (
  */
 const sortSessions = (
   sessions: SessionInfo[],
-  sortBy: 'date' | 'messages' | 'name',
+  sortBy: "date" | "messages" | "name",
   reverse: boolean,
 ): SessionInfo[] => {
   const sorted = [...sessions].sort((a, b) => {
     switch (sortBy) {
-      case 'date':
-        return (
-          new Date(b.lastUpdated).getTime() - new Date(a.lastUpdated).getTime()
-        );
-      case 'messages':
+      case "date":
+        return new Date(b.lastUpdated).getTime() - new Date(a.lastUpdated).getTime();
+      case "messages":
         return b.messageCount - a.messageCount;
-      case 'name':
+      case "name":
         return a.displayName.localeCompare(b.displayName);
       default:
         return 0;
@@ -187,7 +175,7 @@ const sortSessions = (
  * @returns Array of TextMatch objects containing match context and metadata
  */
 const findTextMatches = (
-  messages: Array<{ role: 'user' | 'assistant'; content: string }>,
+  messages: Array<{ role: "user" | "assistant"; content: string }>,
   query: string,
 ): TextMatch[] => {
   if (!query.trim()) return [];
@@ -215,8 +203,8 @@ const findTextMatches = (
       const match = snippet.slice(relativeMatchStart, relativeMatchEnd);
       let after = snippet.slice(relativeMatchEnd);
 
-      if (contextStart > 0) before = '…' + before;
-      if (contextEnd < m.length) after = after + '…';
+      if (contextStart > 0) before = "…" + before;
+      if (contextEnd < m.length) after = after + "…";
 
       matches.push({ before, match, after, role: message.role });
       startIndex = matchIndex + 1;
@@ -233,10 +221,7 @@ const findTextMatches = (
  * @param query - Search query string (case-insensitive)
  * @returns Filtered array of sessions that match the query
  */
-const filterSessions = (
-  sessions: SessionInfo[],
-  query: string,
-): SessionInfo[] => {
+const filterSessions = (sessions: SessionInfo[], query: string): SessionInfo[] => {
   if (!query.trim()) {
     return sessions.map((session) => ({
       ...session,
@@ -252,9 +237,7 @@ const filterSessions = (
       session.id.toLowerCase().includes(lowerQuery) ||
       session.firstUserMessage.toLowerCase().includes(lowerQuery);
 
-    const contentMatch = session.fullContent
-      ?.toLowerCase()
-      .includes(lowerQuery);
+    const contentMatch = session.fullContent?.toLowerCase().includes(lowerQuery);
 
     if (titleMatch || contentMatch) {
       if (session.messages) {
@@ -271,11 +254,7 @@ const filterSessions = (
 /**
  * Search input display component.
  */
-const SearchModeDisplay = ({
-  state,
-}: {
-  state: SessionBrowserState;
-}): React.JSX.Element => (
+const SearchModeDisplay = ({ state }: { state: SessionBrowserState }): React.JSX.Element => (
   <Box marginTop={1}>
     <Text color={Colors.Gray}>Search: </Text>
     <Text color={Colors.AccentPurple}>{state.searchQuery}</Text>
@@ -286,18 +265,14 @@ const SearchModeDisplay = ({
 /**
  * Header component showing session count and sort information.
  */
-const SessionListHeader = ({
-  state,
-}: {
-  state: SessionBrowserState;
-}): React.JSX.Element => (
+const SessionListHeader = ({ state }: { state: SessionBrowserState }): React.JSX.Element => (
   <Box flexDirection="row" justifyContent="space-between">
     <Text color={Colors.AccentPurple}>
       Chat Sessions ({state.totalSessions} total
-      {state.searchQuery ? `, filtered` : ''})
+      {state.searchQuery ? `, filtered` : ""})
     </Text>
     <Text color={Colors.Gray}>
-      sorted by {state.sortOrder} {state.sortReverse ? 'asc' : 'desc'}
+      sorted by {state.sortOrder} {state.sortReverse ? "asc" : "desc"}
     </Text>
   </Box>
 );
@@ -309,20 +284,20 @@ const NavigationHelp = (): React.JSX.Element => (
   <Box flexDirection="column">
     <Text color={Colors.Gray}>
       <Kbd name="Navigate" shortcut="↑/↓" />
-      {'   '}
+      {"   "}
       <Kbd name="Resume" shortcut="Enter" />
-      {'   '}
+      {"   "}
       <Kbd name="Search" shortcut="/" />
-      {'   '}
+      {"   "}
       <Kbd name="Delete" shortcut="x" />
-      {'   '}
+      {"   "}
       <Kbd name="Quit" shortcut="q" />
     </Text>
     <Text color={Colors.Gray}>
       <Kbd name="Sort" shortcut="s" />
-      {'         '}
+      {"         "}
       <Kbd name="Reverse" shortcut="r" />
-      {'      '}
+      {"      "}
       <Kbd name="First/Last" shortcut="g/G" />
     </Text>
   </Box>
@@ -331,13 +306,9 @@ const NavigationHelp = (): React.JSX.Element => (
 /**
  * Table header component with column labels and scroll indicators.
  */
-const SessionTableHeader = ({
-  state,
-}: {
-  state: SessionBrowserState;
-}): React.JSX.Element => (
+const SessionTableHeader = ({ state }: { state: SessionBrowserState }): React.JSX.Element => (
   <Box flexDirection="row" marginTop={1}>
-    <Text>{state.scrollOffset > 0 ? <Text>▲ </Text> : '  '}</Text>
+    <Text>{state.scrollOffset > 0 ? <Text>▲ </Text> : "  "}</Text>
 
     <Box width={5} flexShrink={0}>
       <Text color={Colors.Gray} bold>
@@ -359,7 +330,7 @@ const SessionTableHeader = ({
     <Text color={Colors.Gray}> │ </Text>
     <Box flexShrink={0}>
       <Text color={Colors.Gray} bold>
-        {state.searchQuery ? 'Match' : 'Name'}
+        {state.searchQuery ? "Match" : "Name"}
       </Text>
     </Box>
   </Box>
@@ -368,11 +339,7 @@ const SessionTableHeader = ({
 /**
  * No results display component for empty search results.
  */
-const NoResultsDisplay = ({
-  state,
-}: {
-  state: SessionBrowserState;
-}): React.JSX.Element => (
+const NoResultsDisplay = ({ state }: { state: SessionBrowserState }): React.JSX.Element => (
   <Box marginTop={1}>
     <Text color={Colors.Gray} dimColor>
       No sessions found matching &apos;{state.searchQuery}&apos;.
@@ -395,15 +362,13 @@ const MatchSnippetDisplay = ({
   }
 
   const firstMatch = session.matchSnippets[0];
-  const rolePrefix = firstMatch.role === 'user' ? 'You:   ' : 'Gemini:';
-  const roleColor = textColor(
-    firstMatch.role === 'user' ? Colors.AccentGreen : Colors.AccentBlue,
-  );
+  const rolePrefix = firstMatch.role === "user" ? "You:   " : "Gemini:";
+  const roleColor = textColor(firstMatch.role === "user" ? Colors.AccentGreen : Colors.AccentBlue);
 
   return (
     <>
       <Text color={roleColor} bold>
-        {rolePrefix}{' '}
+        {rolePrefix}{" "}
       </Text>
       {firstMatch.before}
       <Text color={textColor(Colors.AccentRed)} bold>
@@ -426,10 +391,9 @@ const SessionItem = ({
   session: SessionInfo;
   state: SessionBrowserState;
   terminalWidth: number;
-  formatRelativeTime: (dateString: string, style: 'short' | 'long') => string;
+  formatRelativeTime: (dateString: string, style: "short" | "long") => string;
 }): React.JSX.Element => {
-  const originalIndex =
-    state.startIndex + state.visibleSessions.indexOf(session);
+  const originalIndex = state.startIndex + state.visibleSessions.indexOf(session);
   const isActive = originalIndex === state.activeIndex;
   const isDisabled = session.isCurrentSession;
   const textColor = (c: string = Colors.Foreground) => {
@@ -439,24 +403,18 @@ const SessionItem = ({
     return isActive ? Colors.AccentPurple : c;
   };
 
-  const prefix = isActive ? '❯ ' : '  ';
-  let additionalInfo = '';
+  const prefix = isActive ? "❯ " : "  ";
+  let additionalInfo = "";
   let matchDisplay = null;
 
   // Add "(current)" label for the current session
   if (session.isCurrentSession) {
-    additionalInfo = ' (current)';
+    additionalInfo = " (current)";
   }
 
   // Show match snippets if searching and matches exist
-  if (
-    state.searchQuery &&
-    session.matchSnippets &&
-    session.matchSnippets.length > 0
-  ) {
-    matchDisplay = (
-      <MatchSnippetDisplay session={session} textColor={textColor} />
-    );
+  if (state.searchQuery && session.matchSnippets && session.matchSnippets.length > 0) {
+    matchDisplay = <MatchSnippetDisplay session={session} textColor={textColor} />;
 
     if (session.matchCount && session.matchCount > 1) {
       additionalInfo += ` (+${session.matchCount - 1} more)`;
@@ -477,7 +435,7 @@ const SessionItem = ({
         (No messages)
       </Text>
     ) : session.displayName.length > availableMessageWidth ? (
-      session.displayName.slice(0, availableMessageWidth - 1) + '…'
+      session.displayName.slice(0, availableMessageWidth - 1) + "…"
     ) : (
       session.displayName
     ));
@@ -493,8 +451,8 @@ const SessionItem = ({
         </Text>
       </Box>
       <Text color={textColor(Colors.Gray)} dimColor={isDisabled}>
-        {' '}
-        │{' '}
+        {" "}
+        │{" "}
       </Text>
       <Box width={4}>
         <Text color={textColor()} dimColor={isDisabled}>
@@ -502,17 +460,17 @@ const SessionItem = ({
         </Text>
       </Box>
       <Text color={textColor(Colors.Gray)} dimColor={isDisabled}>
-        {' '}
-        │{' '}
+        {" "}
+        │{" "}
       </Text>
       <Box width={4}>
         <Text color={textColor()} dimColor={isDisabled}>
-          {formatRelativeTime(session.lastUpdated, 'short')}
+          {formatRelativeTime(session.lastUpdated, "short")}
         </Text>
       </Box>
       <Text color={textColor(Colors.Gray)} dimColor={isDisabled}>
-        {' '}
-        │{' '}
+        {" "}
+        │{" "}
       </Text>
       <Box flexGrow={1}>
         <Text color={textColor(Colors.Comment)} dimColor={isDisabled}>
@@ -536,7 +494,7 @@ const SessionList = ({
   formatRelativeTime,
 }: {
   state: SessionBrowserState;
-  formatRelativeTime: (dateString: string, style: 'short' | 'long') => string;
+  formatRelativeTime: (dateString: string, style: "short" | "long") => string;
 }): React.JSX.Element => (
   <Box flexDirection="column">
     {/* Table Header */}
@@ -575,11 +533,9 @@ export const useSessionBrowserState = (
   const [error, setError] = useState<string | null>(initialError);
   const [activeIndex, setActiveIndex] = useState(0);
   const [scrollOffset, setScrollOffset] = useState(0);
-  const [sortOrder, setSortOrder] = useState<'date' | 'messages' | 'name'>(
-    'date',
-  );
+  const [sortOrder, setSortOrder] = useState<"date" | "messages" | "name">("date");
   const [sortReverse, setSortReverse] = useState(false);
-  const [searchQuery, setSearchQuery] = useState('');
+  const [searchQuery, setSearchQuery] = useState("");
   const [isSearchMode, setIsSearchMode] = useState(false);
   const [hasLoadedFullContent, setHasLoadedFullContent] = useState(false);
   const loadingFullContentRef = useRef(false);
@@ -650,17 +606,12 @@ const useLoadSessions = (config: Config, state: SessionBrowserState) => {
   useEffect(() => {
     const loadSessions = async () => {
       try {
-        const chatsDir = path.join(config.storage.getProjectTempDir(), 'chats');
-        const sessionData = await getSessionFiles(
-          chatsDir,
-          config.getSessionId(),
-        );
+        const chatsDir = path.join(config.storage.getProjectTempDir(), "chats");
+        const sessionData = await getSessionFiles(chatsDir, config.getSessionId());
         setSessions(sessionData);
         setLoading(false);
       } catch (err) {
-        setError(
-          err instanceof Error ? err.message : 'Failed to load sessions',
-        );
+        setError(err instanceof Error ? err.message : "Failed to load sessions");
         setLoading(false);
       }
     };
@@ -673,57 +624,32 @@ const useLoadSessions = (config: Config, state: SessionBrowserState) => {
     const loadFullContent = async () => {
       if (isSearchMode && !hasLoadedFullContent) {
         try {
-          const chatsDir = path.join(
-            config.storage.getProjectTempDir(),
-            'chats',
-          );
-          const sessionData = await getSessionFiles(
-            chatsDir,
-            config.getSessionId(),
-            { includeFullContent: true },
-          );
+          const chatsDir = path.join(config.storage.getProjectTempDir(), "chats");
+          const sessionData = await getSessionFiles(chatsDir, config.getSessionId(), {
+            includeFullContent: true,
+          });
           setSessions(sessionData);
           setHasLoadedFullContent(true);
         } catch (err) {
-          setError(
-            err instanceof Error
-              ? err.message
-              : 'Failed to load full session content',
-          );
+          setError(err instanceof Error ? err.message : "Failed to load full session content");
         }
       }
     };
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     loadFullContent();
-  }, [
-    isSearchMode,
-    hasLoadedFullContent,
-    config,
-    setSessions,
-    setHasLoadedFullContent,
-    setError,
-  ]);
+  }, [isSearchMode, hasLoadedFullContent, config, setSessions, setHasLoadedFullContent, setError]);
 };
 
 /**
  * Hook to handle selection movement.
  */
 export const useMoveSelection = (state: SessionBrowserState) => {
-  const {
-    totalSessions,
-    activeIndex,
-    scrollOffset,
-    setActiveIndex,
-    setScrollOffset,
-  } = state;
+  const { totalSessions, activeIndex, scrollOffset, setActiveIndex, setScrollOffset } = state;
 
   return useCallback(
     (delta: number) => {
-      const newIndex = Math.max(
-        0,
-        Math.min(totalSessions - 1, activeIndex + delta),
-      );
+      const newIndex = Math.max(0, Math.min(totalSessions - 1, activeIndex + delta));
       setActiveIndex(newIndex);
 
       // Adjust scroll offset if needed
@@ -744,11 +670,7 @@ export const useCycleSortOrder = (state: SessionBrowserState) => {
   const { sortOrder, setSortOrder } = state;
 
   return useCallback(() => {
-    const orders: Array<'date' | 'messages' | 'name'> = [
-      'date',
-      'messages',
-      'name',
-    ];
+    const orders: Array<"date" | "messages" | "name"> = ["date", "messages", "name"];
     const currentIndex = orders.indexOf(sortOrder);
     const nextIndex = (currentIndex + 1) % orders.length;
     setSortOrder(orders[nextIndex]);
@@ -770,21 +692,16 @@ export const useSessionBrowserInput = (
     (key) => {
       if (state.isSearchMode) {
         // Search-specific input handling.  Only control/symbols here.
-        if (key.name === 'escape') {
+        if (key.name === "escape") {
           state.setIsSearchMode(false);
-          state.setSearchQuery('');
+          state.setSearchQuery("");
           state.setActiveIndex(0);
           state.setScrollOffset(0);
-        } else if (key.name === 'backspace') {
+        } else if (key.name === "backspace") {
           state.setSearchQuery((prev) => prev.slice(0, -1));
           state.setActiveIndex(0);
           state.setScrollOffset(0);
-        } else if (
-          key.sequence &&
-          !key.ctrl &&
-          !key.meta &&
-          key.sequence.length === 1
-        ) {
+        } else if (key.sequence && !key.ctrl && !key.meta && key.sequence.length === 1) {
           state.setSearchQuery((prev) => prev + key.sequence);
           state.setActiveIndex(0);
           state.setScrollOffset(0);
@@ -792,86 +709,68 @@ export const useSessionBrowserInput = (
       } else {
         // Navigation mode input handling.  We're keeping the letter-based controls for non-search
         // mode only, because the letters need to act as input for the search.
-        if (key.sequence === 'g') {
+        if (key.sequence === "g") {
           state.setActiveIndex(0);
           state.setScrollOffset(0);
-        } else if (key.sequence === 'G') {
+        } else if (key.sequence === "G") {
           state.setActiveIndex(state.totalSessions - 1);
-          state.setScrollOffset(
-            Math.max(0, state.totalSessions - SESSIONS_PER_PAGE),
-          );
+          state.setScrollOffset(Math.max(0, state.totalSessions - SESSIONS_PER_PAGE));
         }
         // Sorting controls.
-        else if (key.sequence === 's') {
+        else if (key.sequence === "s") {
           cycleSortOrder();
-        } else if (key.sequence === 'r') {
+        } else if (key.sequence === "r") {
           state.setSortReverse(!state.sortReverse);
         }
         // Searching and exit controls.
-        else if (key.sequence === '/') {
+        else if (key.sequence === "/") {
           state.setIsSearchMode(true);
-        } else if (
-          key.sequence === 'q' ||
-          key.sequence === 'Q' ||
-          key.name === 'escape'
-        ) {
+        } else if (key.sequence === "q" || key.sequence === "Q" || key.name === "escape") {
           onExit();
         }
         // Delete session control.
-        else if (key.sequence === 'x' || key.sequence === 'X') {
-          const selectedSession =
-            state.filteredAndSortedSessions[state.activeIndex];
+        else if (key.sequence === "x" || key.sequence === "X") {
+          const selectedSession = state.filteredAndSortedSessions[state.activeIndex];
           if (selectedSession && !selectedSession.isCurrentSession) {
             onDeleteSession(selectedSession)
               .then(() => {
                 // Remove the session from the state
-                state.setSessions(
-                  state.sessions.filter((s) => s.id !== selectedSession.id),
-                );
+                state.setSessions(state.sessions.filter((s) => s.id !== selectedSession.id));
 
                 // Adjust active index if needed
-                if (
-                  state.activeIndex >=
-                  state.filteredAndSortedSessions.length - 1
-                ) {
-                  state.setActiveIndex(
-                    Math.max(0, state.filteredAndSortedSessions.length - 2),
-                  );
+                if (state.activeIndex >= state.filteredAndSortedSessions.length - 1) {
+                  state.setActiveIndex(Math.max(0, state.filteredAndSortedSessions.length - 2));
                 }
               })
               .catch((error) => {
                 state.setError(
-                  `Failed to delete session: ${error instanceof Error ? error.message : 'Unknown error'}`,
+                  `Failed to delete session: ${error instanceof Error ? error.message : "Unknown error"}`,
                 );
               });
           }
         }
         // less-like u/d controls.
-        else if (key.sequence === 'u') {
+        else if (key.sequence === "u") {
           moveSelection(-Math.round(SESSIONS_PER_PAGE / 2));
-        } else if (key.sequence === 'd') {
+        } else if (key.sequence === "d") {
           moveSelection(Math.round(SESSIONS_PER_PAGE / 2));
         }
       }
 
       // Handling regardless of search mode.
-      if (
-        key.name === 'return' &&
-        state.filteredAndSortedSessions[state.activeIndex]
-      ) {
-        const selectedSession =
-          state.filteredAndSortedSessions[state.activeIndex];
+      if (key.name === "return" && state.filteredAndSortedSessions[state.activeIndex]) {
+        const selectedSession = state.filteredAndSortedSessions[state.activeIndex];
         // Don't allow resuming the current session
         if (!selectedSession.isCurrentSession) {
           onResumeSession(selectedSession);
         }
-      } else if (key.name === 'up') {
+      } else if (key.name === "up") {
         moveSelection(-1);
-      } else if (key.name === 'down') {
+      } else if (key.name === "down") {
         moveSelection(1);
-      } else if (key.name === 'pageup') {
+      } else if (key.name === "pageup") {
         moveSelection(-SESSIONS_PER_PAGE);
-      } else if (key.name === 'pagedown') {
+      } else if (key.name === "pagedown") {
         moveSelection(SESSIONS_PER_PAGE);
       }
     },
@@ -879,11 +778,7 @@ export const useSessionBrowserInput = (
   );
 };
 
-export function SessionBrowserView({
-  state,
-}: {
-  state: SessionBrowserState;
-}): React.JSX.Element {
+export function SessionBrowserView({ state }: { state: SessionBrowserState }): React.JSX.Element {
   if (state.loading) {
     return <SessionBrowserLoading />;
   }
diff --git a/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.test.tsx b/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.test.tsx
index a15b7599a..0ff0936c4 100644
--- a/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.test.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { SessionSummaryDisplay } from './SessionSummaryDisplay.js';
-import * as SessionContext from '../contexts/SessionContext.js';
-import type { SessionMetrics } from '../contexts/SessionContext.js';
-import { ToolCallDecision } from '@airiscode/gemini-cli-core';
+import { ToolCallDecision } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { SessionMetrics } from "../contexts/SessionContext.js";
+import * as SessionContext from "../contexts/SessionContext.js";
+import { SessionSummaryDisplay } from "./SessionSummaryDisplay.js";
 
-vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
+vi.mock("../contexts/SessionContext.js", async (importOriginal) => {
   const actual = await importOriginal<typeof SessionContext>();
   return {
     ...actual,
@@ -24,7 +24,7 @@ const useSessionStatsMock = vi.mocked(SessionContext.useSessionStats);
 const renderWithMockedStats = (metrics: SessionMetrics) => {
   useSessionStatsMock.mockReturnValue({
     stats: {
-      sessionId: 'test-session',
+      sessionId: "test-session",
       sessionStartTime: new Date(),
       metrics,
       lastPromptTokenCount: 0,
@@ -38,11 +38,11 @@ const renderWithMockedStats = (metrics: SessionMetrics) => {
   return render(<SessionSummaryDisplay duration="1h 23m 45s" />);
 };
 
-describe('<SessionSummaryDisplay />', () => {
-  it('renders the summary display with a title', () => {
+describe("<SessionSummaryDisplay />", () => {
+  it("renders the summary display with a title", () => {
     const metrics: SessionMetrics = {
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: { totalRequests: 10, totalErrors: 1, totalLatencyMs: 50234 },
           tokens: {
             prompt: 1000,
@@ -76,7 +76,7 @@ describe('<SessionSummaryDisplay />', () => {
     const { lastFrame } = renderWithMockedStats(metrics);
     const output = lastFrame();
 
-    expect(output).toContain('Agent powering down. Goodbye!');
+    expect(output).toContain("Agent powering down. Goodbye!");
     expect(output).toMatchSnapshot();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.tsx b/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.tsx
index d4a0a11d6..4a88f170d 100644
--- a/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/SessionSummaryDisplay.tsx
@@ -4,15 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { StatsDisplay } from './StatsDisplay.js';
+import type React from "react";
+import { StatsDisplay } from "./StatsDisplay.js";
 
 interface SessionSummaryDisplayProps {
   duration: string;
 }
 
-export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
-  duration,
-}) => (
+export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({ duration }) => (
   <StatsDisplay title="Agent powering down. Goodbye!" duration={duration} />
 );
diff --git a/packages/ui-gemini/src/ui/components/SettingsDialog.test.tsx b/packages/ui-gemini/src/ui/components/SettingsDialog.test.tsx
index 8d4a255eb..26bee0a61 100644
--- a/packages/ui-gemini/src/ui/components/SettingsDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/SettingsDialog.test.tsx
@@ -21,47 +21,43 @@
  *
  */
 
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { SettingsDialog } from './SettingsDialog.js';
-import { LoadedSettings, SettingScope } from '../../config/settings.js';
-import { VimModeProvider } from '../contexts/VimModeContext.js';
-import { KeypressProvider } from '../contexts/KeypressContext.js';
-import { act } from 'react';
-import { saveModifiedSettings, TEST_ONLY } from '../../utils/settingsUtils.js';
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { LoadedSettings, SettingScope } from "../../config/settings.js";
 import {
   getSettingsSchema,
   type SettingDefinition,
   type SettingsSchemaType,
-} from '../../config/settingsSchema.js';
+} from "../../config/settingsSchema.js";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import { saveModifiedSettings, TEST_ONLY } from "../../utils/settingsUtils.js";
+import { KeypressProvider } from "../contexts/KeypressContext.js";
+import { VimModeProvider } from "../contexts/VimModeContext.js";
+import { SettingsDialog } from "./SettingsDialog.js";
 
 // Mock the VimModeContext
 const mockToggleVimEnabled = vi.fn();
 const mockSetVimMode = vi.fn();
 
-vi.mock('../contexts/UIStateContext.js', () => ({
+vi.mock("../contexts/UIStateContext.js", () => ({
   useUIState: () => ({
     mainAreaWidth: 100, // Fixed width for consistent snapshots
   }),
 }));
 
 enum TerminalKeys {
-  ENTER = '\u000D',
-  TAB = '\t',
-  UP_ARROW = '\u001B[A',
-  DOWN_ARROW = '\u001B[B',
-  LEFT_ARROW = '\u001B[D',
-  RIGHT_ARROW = '\u001B[C',
-  ESCAPE = '\u001B',
-  BACKSPACE = '\u0008',
+  ENTER = "\u000D",
+  TAB = "\t",
+  UP_ARROW = "\u001B[A",
+  DOWN_ARROW = "\u001B[B",
+  LEFT_ARROW = "\u001B[D",
+  RIGHT_ARROW = "\u001B[C",
+  ESCAPE = "\u001B",
+  BACKSPACE = "\u0008",
 }
 
-const createMockSettings = (
-  userSettings = {},
-  systemSettings = {},
-  workspaceSettings = {},
-) =>
+const createMockSettings = (userSettings = {}, systemSettings = {}, workspaceSettings = {}) =>
   new LoadedSettings(
     {
       settings: { ui: { customThemes: {} }, mcpServers: {}, ...systemSettings },
@@ -70,12 +66,12 @@ const createMockSettings = (
         mcpServers: {},
         ...systemSettings,
       },
-      path: '/system/settings.json',
+      path: "/system/settings.json",
     },
     {
       settings: {},
       originalSettings: {},
-      path: '/system/system-defaults.json',
+      path: "/system/system-defaults.json",
     },
     {
       settings: {
@@ -88,7 +84,7 @@ const createMockSettings = (
         mcpServers: {},
         ...userSettings,
       },
-      path: '/user/settings.json',
+      path: "/user/settings.json",
     },
     {
       settings: {
@@ -101,36 +97,35 @@ const createMockSettings = (
         mcpServers: {},
         ...workspaceSettings,
       },
-      path: '/workspace/settings.json',
+      path: "/workspace/settings.json",
     },
     true,
     new Set(),
   );
 
-vi.mock('../../config/settingsSchema.js', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('../../config/settingsSchema.js')>();
+vi.mock("../../config/settingsSchema.js", async (importOriginal) => {
+  const original = await importOriginal<typeof import("../../config/settingsSchema.js")>();
   return {
     ...original,
     getSettingsSchema: vi.fn(original.getSettingsSchema),
   };
 });
 
-vi.mock('../contexts/VimModeContext.js', async () => {
-  const actual = await vi.importActual('../contexts/VimModeContext.js');
+vi.mock("../contexts/VimModeContext.js", async () => {
+  const actual = await vi.importActual("../contexts/VimModeContext.js");
   return {
     ...actual,
     useVimMode: () => ({
       vimEnabled: false,
-      vimMode: 'INSERT' as const,
+      vimMode: "INSERT" as const,
       toggleVimEnabled: mockToggleVimEnabled,
       setVimMode: mockSetVimMode,
     }),
   };
 });
 
-vi.mock('../../utils/settingsUtils.js', async () => {
-  const actual = await vi.importActual('../../utils/settingsUtils.js');
+vi.mock("../../utils/settingsUtils.js", async () => {
+  const actual = await vi.importActual("../../utils/settingsUtils.js");
   return {
     ...actual,
     saveModifiedSettings: vi.fn(),
@@ -139,32 +134,32 @@ vi.mock('../../utils/settingsUtils.js', async () => {
 
 // Shared test schemas
 enum StringEnum {
-  FOO = 'foo',
-  BAR = 'bar',
-  BAZ = 'baz',
+  FOO = "foo",
+  BAR = "bar",
+  BAZ = "baz",
 }
 
 const ENUM_SETTING: SettingDefinition = {
-  type: 'enum',
-  label: 'Theme',
+  type: "enum",
+  label: "Theme",
   options: [
     {
-      label: 'Foo',
+      label: "Foo",
       value: StringEnum.FOO,
     },
     {
-      label: 'Bar',
+      label: "Bar",
       value: StringEnum.BAR,
     },
     {
-      label: 'Baz',
+      label: "Baz",
       value: StringEnum.BAZ,
     },
   ],
-  category: 'UI',
+  category: "UI",
   requiresRestart: false,
   default: StringEnum.BAR,
-  description: 'The color theme for the UI.',
+  description: "The color theme for the UI.",
   showInDialog: true,
 };
 
@@ -181,48 +176,48 @@ const ENUM_FAKE_SCHEMA: SettingsSchemaType = {
 
 const TOOLS_SHELL_FAKE_SCHEMA: SettingsSchemaType = {
   tools: {
-    type: 'object',
-    label: 'Tools',
-    category: 'Tools',
+    type: "object",
+    label: "Tools",
+    category: "Tools",
     requiresRestart: false,
     default: {},
-    description: 'Tool settings.',
+    description: "Tool settings.",
     showInDialog: false,
     properties: {
       shell: {
-        type: 'object',
-        label: 'Shell',
-        category: 'Tools',
+        type: "object",
+        label: "Shell",
+        category: "Tools",
         requiresRestart: false,
         default: {},
-        description: 'Shell tool settings.',
+        description: "Shell tool settings.",
         showInDialog: false,
         properties: {
           showColor: {
-            type: 'boolean',
-            label: 'Show Color',
-            category: 'Tools',
+            type: "boolean",
+            label: "Show Color",
+            category: "Tools",
             requiresRestart: false,
             default: false,
-            description: 'Show color in shell output.',
+            description: "Show color in shell output.",
             showInDialog: true,
           },
           enableInteractiveShell: {
-            type: 'boolean',
-            label: 'Enable Interactive Shell',
-            category: 'Tools',
+            type: "boolean",
+            label: "Enable Interactive Shell",
+            category: "Tools",
             requiresRestart: true,
             default: true,
-            description: 'Enable interactive shell mode.',
+            description: "Enable interactive shell mode.",
             showInDialog: true,
           },
           pager: {
-            type: 'string',
-            label: 'Pager',
-            category: 'Tools',
+            type: "string",
+            label: "Pager",
+            category: "Tools",
             requiresRestart: false,
-            default: 'cat',
-            description: 'The pager command to use for shell output.',
+            default: "cat",
+            description: "The pager command to use for shell output.",
             showInDialog: true,
           },
         },
@@ -251,7 +246,7 @@ const renderDialog = (
     </KeypressProvider>,
   );
 
-describe('SettingsDialog', () => {
+describe("SettingsDialog", () => {
   beforeEach(() => {
     mockToggleVimEnabled.mockResolvedValue(true);
   });
@@ -262,21 +257,21 @@ describe('SettingsDialog', () => {
     vi.resetAllMocks();
   });
 
-  describe('Initial Rendering', () => {
-    it('should render the settings dialog with default state', () => {
+  describe("Initial Rendering", () => {
+    it("should render the settings dialog with default state", () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
       const { lastFrame } = renderDialog(settings, onSelect);
 
       const output = lastFrame();
-      expect(output).toContain('Settings');
-      expect(output).toContain('Apply To');
+      expect(output).toContain("Settings");
+      expect(output).toContain("Apply To");
       // Use regex for more flexible help text matching
       expect(output).toMatch(/Enter.*select.*Esc.*close/);
     });
 
-    it('should accept availableTerminalHeight prop without errors', () => {
+    it("should accept availableTerminalHeight prop without errors", () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -286,12 +281,12 @@ describe('SettingsDialog', () => {
 
       const output = lastFrame();
       // Should still render properly with the height prop
-      expect(output).toContain('Settings');
+      expect(output).toContain("Settings");
       // Use regex for more flexible help text matching
       expect(output).toMatch(/Enter.*select.*Esc.*close/);
     });
 
-    it('should render settings list with visual indicators', () => {
+    it("should render settings list with visual indicators", () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -303,26 +298,26 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Settings Navigation', () => {
+  describe("Settings Navigation", () => {
     it.each([
       {
-        name: 'arrow keys',
+        name: "arrow keys",
         down: TerminalKeys.DOWN_ARROW,
         up: TerminalKeys.UP_ARROW,
       },
       {
-        name: 'vim keys (j/k)',
-        down: 'j',
-        up: 'k',
+        name: "vim keys (j/k)",
+        down: "j",
+        up: "k",
       },
-    ])('should navigate with $name', async ({ down, up }) => {
+    ])("should navigate with $name", async ({ down, up }) => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
       const { stdin, unmount, lastFrame } = renderDialog(settings, onSelect);
 
       const initialFrame = lastFrame();
-      expect(initialFrame).toContain('Vim Mode');
+      expect(initialFrame).toContain("Vim Mode");
 
       // Navigate down
       act(() => {
@@ -330,7 +325,7 @@ describe('SettingsDialog', () => {
       });
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('Disable Auto Update');
+        expect(lastFrame()).toContain("Disable Auto Update");
       });
 
       // Navigate up
@@ -339,13 +334,13 @@ describe('SettingsDialog', () => {
       });
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain("Vim Mode");
       });
 
       unmount();
     });
 
-    it('wraps around when at the top of the list', async () => {
+    it("wraps around when at the top of the list", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -358,15 +353,15 @@ describe('SettingsDialog', () => {
 
       await waitFor(() => {
         // Should wrap to last setting (without relying on exact bullet character)
-        expect(lastFrame()).toContain('Codebase Investigator Max Num Turns');
+        expect(lastFrame()).toContain("Codebase Investigator Max Num Turns");
       });
 
       unmount();
     });
   });
 
-  describe('Settings Toggling', () => {
-    it('should toggle setting with Enter key', async () => {
+  describe("Settings Toggling", () => {
+    it("should toggle setting with Enter key", async () => {
       vi.mocked(saveModifiedSettings).mockClear();
 
       const settings = createMockSettings();
@@ -376,7 +371,7 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render and verify we're on Preview Features (first setting)
       await waitFor(() => {
-        expect(lastFrame()).toContain('Preview Features (e.g., models)');
+        expect(lastFrame()).toContain("Preview Features (e.g., models)");
       });
 
       // Navigate to Vim Mode setting and verify we're there
@@ -384,7 +379,7 @@ describe('SettingsDialog', () => {
         stdin.write(TerminalKeys.DOWN_ARROW as string);
       });
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain("Vim Mode");
       });
 
       // Toggle the setting
@@ -393,9 +388,7 @@ describe('SettingsDialog', () => {
       });
       // Wait for the setting change to be processed
       await waitFor(() => {
-        expect(
-          vi.mocked(saveModifiedSettings).mock.calls.length,
-        ).toBeGreaterThan(0);
+        expect(vi.mocked(saveModifiedSettings).mock.calls.length).toBeGreaterThan(0);
       });
 
       // Wait for the mock to be called
@@ -404,7 +397,7 @@ describe('SettingsDialog', () => {
       });
 
       expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalledWith(
-        new Set<string>(['general.vimMode']),
+        new Set<string>(["general.vimMode"]),
         expect.objectContaining({
           general: expect.objectContaining({
             vimMode: true,
@@ -417,25 +410,25 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    describe('enum values', () => {
+    describe("enum values", () => {
       it.each([
         {
-          name: 'toggles to next value',
+          name: "toggles to next value",
           initialValue: undefined,
           expectedValue: StringEnum.BAZ,
         },
         {
-          name: 'loops back to first value when at end',
+          name: "loops back to first value when at end",
           initialValue: StringEnum.BAZ,
           expectedValue: StringEnum.FOO,
         },
-      ])('$name', async ({ initialValue, expectedValue }) => {
+      ])("$name", async ({ initialValue, expectedValue }) => {
         vi.mocked(saveModifiedSettings).mockClear();
         vi.mocked(getSettingsSchema).mockReturnValue(ENUM_FAKE_SCHEMA);
 
         const settings = createMockSettings();
         if (initialValue !== undefined) {
-          settings.setValue(SettingScope.User, 'ui.theme', initialValue);
+          settings.setValue(SettingScope.User, "ui.theme", initialValue);
         }
 
         const onSelect = vi.fn();
@@ -452,7 +445,7 @@ describe('SettingsDialog', () => {
         });
 
         expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalledWith(
-          new Set<string>(['ui.theme']),
+          new Set<string>(["ui.theme"]),
           expect.objectContaining({
             ui: expect.objectContaining({
               theme: expectedValue,
@@ -466,7 +459,7 @@ describe('SettingsDialog', () => {
       });
     });
 
-    it('should handle vim mode setting specially', async () => {
+    it("should handle vim mode setting specially", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -483,8 +476,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Scope Selection', () => {
-    it('should switch between scopes', async () => {
+  describe("Scope Selection", () => {
+    it("should switch between scopes", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -494,13 +487,13 @@ describe('SettingsDialog', () => {
       act(() => {
         stdin.write(TerminalKeys.TAB); // Tab key
         // Select different scope (numbers 1-3 typically available)
-        stdin.write('2'); // Select second scope option
+        stdin.write("2"); // Select second scope option
       });
 
       unmount();
     });
 
-    it('should reset to settings focus when scope is selected', async () => {
+    it("should reset to settings focus when scope is selected", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -508,12 +501,12 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain("Vim Mode");
       });
 
       // The UI should show the settings section is active and scope section is inactive
-      expect(lastFrame()).toContain('Vim Mode'); // Settings section active
-      expect(lastFrame()).toContain('Apply To'); // Scope section (don't rely on exact spacing)
+      expect(lastFrame()).toContain("Vim Mode"); // Settings section active
+      expect(lastFrame()).toContain("Apply To"); // Scope section (don't rely on exact spacing)
 
       // This test validates the initial state - scope selection behavior
       // is complex due to keypress handling, so we focus on state validation
@@ -522,8 +515,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Restart Prompt', () => {
-    it('should show restart prompt for restart-required settings', async () => {
+  describe("Restart Prompt", () => {
+    it("should show restart prompt for restart-required settings", async () => {
       const settings = createMockSettings();
       const onRestartRequest = vi.fn();
 
@@ -537,7 +530,7 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should handle restart request when r is pressed', async () => {
+    it("should handle restart request when r is pressed", async () => {
       const settings = createMockSettings();
       const onRestartRequest = vi.fn();
 
@@ -547,7 +540,7 @@ describe('SettingsDialog', () => {
 
       // Press 'r' key (this would only work if restart prompt is showing)
       act(() => {
-        stdin.write('r');
+        stdin.write("r");
       });
 
       // If restart prompt was showing, onRestartRequest should be called
@@ -555,8 +548,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Escape Key Behavior', () => {
-    it('should call onSelect with undefined when Escape is pressed', async () => {
+  describe("Escape Key Behavior", () => {
+    it("should call onSelect with undefined when Escape is pressed", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -564,12 +557,12 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain("Vim Mode");
       });
 
       // Verify the dialog is rendered properly
-      expect(lastFrame()).toContain('Settings');
-      expect(lastFrame()).toContain('Apply To');
+      expect(lastFrame()).toContain("Settings");
+      expect(lastFrame()).toContain("Apply To");
 
       // This test validates rendering - escape key behavior depends on complex
       // keypress handling that's difficult to test reliably in this environment
@@ -578,8 +571,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Settings Persistence', () => {
-    it('should persist settings across scope changes', async () => {
+  describe("Settings Persistence", () => {
+    it("should persist settings across scope changes", async () => {
       const settings = createMockSettings({ vimMode: true });
       const onSelect = vi.fn();
 
@@ -588,14 +581,14 @@ describe('SettingsDialog', () => {
       // Switch to scope selector and change scope
       act(() => {
         stdin.write(TerminalKeys.TAB as string); // Tab
-        stdin.write('2'); // Select workspace scope
+        stdin.write("2"); // Select workspace scope
       });
 
       // Settings should be reloaded for new scope
       unmount();
     });
 
-    it('should show different values for different scopes', () => {
+    it("should show different values for different scopes", () => {
       const settings = createMockSettings(
         { vimMode: true }, // User settings
         { vimMode: false }, // System settings
@@ -607,13 +600,13 @@ describe('SettingsDialog', () => {
 
       // Should show user scope values initially
       const output = lastFrame();
-      expect(output).toContain('Settings');
+      expect(output).toContain("Settings");
     });
   });
 
-  describe('Error Handling', () => {
-    it('should handle vim mode toggle errors gracefully', async () => {
-      mockToggleVimEnabled.mockRejectedValue(new Error('Toggle failed'));
+  describe("Error Handling", () => {
+    it("should handle vim mode toggle errors gracefully", async () => {
+      mockToggleVimEnabled.mockRejectedValue(new Error("Toggle failed"));
 
       const settings = createMockSettings();
       const onSelect = vi.fn();
@@ -630,8 +623,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Complex State Management', () => {
-    it('should track modified settings correctly', async () => {
+  describe("Complex State Management", () => {
+    it("should track modified settings correctly", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -648,7 +641,7 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should handle scrolling when there are many settings', async () => {
+    it("should handle scrolling when there are many settings", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -665,8 +658,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('VimMode Integration', () => {
-    it('should sync with VimModeContext when vim mode is toggled', async () => {
+  describe("VimMode Integration", () => {
+    it("should sync with VimModeContext when vim mode is toggled", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -688,8 +681,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Specific Settings Behavior', () => {
-    it('should show correct display values for settings with different states', () => {
+  describe("Specific Settings Behavior", () => {
+    it("should show correct display values for settings with different states", () => {
       const settings = createMockSettings(
         { vimMode: true, hideTips: false }, // User settings
         { hideWindowTitle: true }, // System settings
@@ -701,10 +694,10 @@ describe('SettingsDialog', () => {
 
       const output = lastFrame();
       // Should contain settings labels
-      expect(output).toContain('Settings');
+      expect(output).toContain("Settings");
     });
 
-    it('should handle immediate settings save for non-restart-required settings', async () => {
+    it("should handle immediate settings save for non-restart-required settings", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -719,7 +712,7 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should show restart prompt for restart-required settings', async () => {
+    it("should show restart prompt for restart-required settings", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -730,15 +723,13 @@ describe('SettingsDialog', () => {
 
       // Should not show restart prompt initially
       await waitFor(() => {
-        expect(lastFrame()).not.toContain(
-          'To see changes, Gemini CLI must be restarted',
-        );
+        expect(lastFrame()).not.toContain("To see changes, Gemini CLI must be restarted");
       });
 
       unmount();
     });
 
-    it('should clear restart prompt when switching scopes', async () => {
+    it("should clear restart prompt when switching scopes", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -749,8 +740,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Settings Display Values', () => {
-    it('should show correct values for inherited settings', () => {
+  describe("Settings Display Values", () => {
+    it("should show correct values for inherited settings", () => {
       const settings = createMockSettings(
         {},
         { vimMode: true, hideWindowTitle: false }, // System settings
@@ -762,10 +753,10 @@ describe('SettingsDialog', () => {
 
       const output = lastFrame();
       // Settings should show inherited values
-      expect(output).toContain('Settings');
+      expect(output).toContain("Settings");
     });
 
-    it('should show override indicator for overridden settings', () => {
+    it("should show override indicator for overridden settings", () => {
       const settings = createMockSettings(
         { vimMode: false }, // User overrides
         { vimMode: true }, // System default
@@ -777,14 +768,14 @@ describe('SettingsDialog', () => {
 
       const output = lastFrame();
       // Should show settings with override indicators
-      expect(output).toContain('Settings');
+      expect(output).toContain("Settings");
     });
   });
 
-  describe('Race Condition Regression Tests', () => {
+  describe("Race Condition Regression Tests", () => {
     it.each([
       {
-        name: 'not reset sibling settings when toggling a nested setting multiple times',
+        name: "not reset sibling settings when toggling a nested setting multiple times",
         toggleCount: 5,
         shellSettings: {
           showColor: false,
@@ -795,74 +786,67 @@ describe('SettingsDialog', () => {
         },
       },
       {
-        name: 'preserve multiple sibling settings in nested objects during rapid toggles',
+        name: "preserve multiple sibling settings in nested objects during rapid toggles",
         toggleCount: 3,
         shellSettings: {
           showColor: false,
           enableInteractiveShell: true,
-          pager: 'less',
+          pager: "less",
         },
         expectedSiblings: {
           enableInteractiveShell: true,
-          pager: 'less',
+          pager: "less",
         },
       },
-    ])(
-      'should $name',
-      async ({ toggleCount, shellSettings, expectedSiblings }) => {
-        vi.mocked(saveModifiedSettings).mockClear();
-
-        vi.mocked(getSettingsSchema).mockReturnValue(TOOLS_SHELL_FAKE_SCHEMA);
+    ])("should $name", async ({ toggleCount, shellSettings, expectedSiblings }) => {
+      vi.mocked(saveModifiedSettings).mockClear();
 
-        const settings = createMockSettings({
-          tools: {
-            shell: shellSettings,
-          },
-        });
+      vi.mocked(getSettingsSchema).mockReturnValue(TOOLS_SHELL_FAKE_SCHEMA);
 
-        const onSelect = vi.fn();
+      const settings = createMockSettings({
+        tools: {
+          shell: shellSettings,
+        },
+      });
 
-        const { stdin, unmount } = renderDialog(settings, onSelect);
+      const onSelect = vi.fn();
 
-        for (let i = 0; i < toggleCount; i++) {
-          act(() => {
-            stdin.write(TerminalKeys.ENTER as string);
-          });
-        }
+      const { stdin, unmount } = renderDialog(settings, onSelect);
 
-        await waitFor(() => {
-          expect(
-            vi.mocked(saveModifiedSettings).mock.calls.length,
-          ).toBeGreaterThan(0);
+      for (let i = 0; i < toggleCount; i++) {
+        act(() => {
+          stdin.write(TerminalKeys.ENTER as string);
         });
+      }
 
-        const calls = vi.mocked(saveModifiedSettings).mock.calls;
-        calls.forEach((call) => {
-          const [modifiedKeys, pendingSettings] = call;
+      await waitFor(() => {
+        expect(vi.mocked(saveModifiedSettings).mock.calls.length).toBeGreaterThan(0);
+      });
 
-          if (modifiedKeys.has('tools.shell.showColor')) {
-            const shellSettings = pendingSettings.tools?.shell as
-              | Record<string, unknown>
-              | undefined;
+      const calls = vi.mocked(saveModifiedSettings).mock.calls;
+      calls.forEach((call) => {
+        const [modifiedKeys, pendingSettings] = call;
 
-            Object.entries(expectedSiblings).forEach(([key, value]) => {
-              expect(shellSettings?.[key]).toBe(value);
-              expect(modifiedKeys.has(`tools.shell.${key}`)).toBe(false);
-            });
+        if (modifiedKeys.has("tools.shell.showColor")) {
+          const shellSettings = pendingSettings.tools?.shell as Record<string, unknown> | undefined;
 
-            expect(modifiedKeys.size).toBe(1);
-          }
-        });
+          Object.entries(expectedSiblings).forEach(([key, value]) => {
+            expect(shellSettings?.[key]).toBe(value);
+            expect(modifiedKeys.has(`tools.shell.${key}`)).toBe(false);
+          });
 
-        expect(calls.length).toBeGreaterThan(0);
+          expect(modifiedKeys.size).toBe(1);
+        }
+      });
 
-        unmount();
-      },
-    );
+      expect(calls.length).toBeGreaterThan(0);
+
+      unmount();
+    });
   });
 
-  describe('Keyboard Shortcuts Edge Cases', () => {
-    it('should handle rapid key presses gracefully', async () => {
+  describe("Keyboard Shortcuts Edge Cases", () => {
+    it("should handle rapid key presses gracefully", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -881,26 +865,23 @@ describe('SettingsDialog', () => {
     });
 
     it.each([
-      { key: 'Ctrl+C', code: '\u0003' },
-      { key: 'Ctrl+L', code: '\u000C' },
-    ])(
-      'should handle $key to reset current setting to default',
-      async ({ code }) => {
-        const settings = createMockSettings({ vimMode: true });
-        const onSelect = vi.fn();
+      { key: "Ctrl+C", code: "\u0003" },
+      { key: "Ctrl+L", code: "\u000C" },
+    ])("should handle $key to reset current setting to default", async ({ code }) => {
+      const settings = createMockSettings({ vimMode: true });
+      const onSelect = vi.fn();
 
-        const { stdin, unmount } = renderDialog(settings, onSelect);
+      const { stdin, unmount } = renderDialog(settings, onSelect);
 
-        act(() => {
-          stdin.write(code);
-        });
+      act(() => {
+        stdin.write(code);
+      });
 
-        // Should reset the current setting to its default value
-        unmount();
-      },
-    );
+      // Should reset the current setting to its default value
+      unmount();
+    });
 
-    it('should handle navigation when only one setting exists', async () => {
+    it("should handle navigation when only one setting exists", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -915,7 +896,7 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should properly handle Tab navigation between sections', async () => {
+    it("should properly handle Tab navigation between sections", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -923,12 +904,12 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain("Vim Mode");
       });
 
       // Verify initial state: settings section active, scope section inactive
-      expect(lastFrame()).toContain('Vim Mode'); // Settings section active
-      expect(lastFrame()).toContain('Apply To'); // Scope section (don't rely on exact spacing)
+      expect(lastFrame()).toContain("Vim Mode"); // Settings section active
+      expect(lastFrame()).toContain("Apply To"); // Scope section (don't rely on exact spacing)
 
       // This test validates the rendered UI structure for tab navigation
       // Actual tab behavior testing is complex due to keypress handling
@@ -937,8 +918,8 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('Error Recovery', () => {
-    it('should handle malformed settings gracefully', () => {
+  describe("Error Recovery", () => {
+    it("should handle malformed settings gracefully", () => {
       // Create settings with potentially problematic values
       const settings = createMockSettings(
         { vimMode: null as unknown as boolean }, // Invalid value
@@ -950,22 +931,22 @@ describe('SettingsDialog', () => {
       const { lastFrame } = renderDialog(settings, onSelect);
 
       // Should still render without crashing
-      expect(lastFrame()).toContain('Settings');
+      expect(lastFrame()).toContain("Settings");
     });
 
-    it('should handle missing setting definitions gracefully', () => {
+    it("should handle missing setting definitions gracefully", () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
       // Should not crash even if some settings are missing definitions
       const { lastFrame } = renderDialog(settings, onSelect);
 
-      expect(lastFrame()).toContain('Settings');
+      expect(lastFrame()).toContain("Settings");
     });
   });
 
-  describe('Complex User Interactions', () => {
-    it('should handle complete user workflow: navigate, toggle, change scope, exit', async () => {
+  describe("Complex User Interactions", () => {
+    it("should handle complete user workflow: navigate, toggle, change scope, exit", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -973,14 +954,14 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain("Vim Mode");
       });
 
       // Verify the complete UI is rendered with all necessary sections
-      expect(lastFrame()).toContain('Settings'); // Title
-      expect(lastFrame()).toContain('Vim Mode'); // Active setting
-      expect(lastFrame()).toContain('Apply To'); // Scope section
-      expect(lastFrame()).toContain('User Settings'); // Scope options (no numbers when settings focused)
+      expect(lastFrame()).toContain("Settings"); // Title
+      expect(lastFrame()).toContain("Vim Mode"); // Active setting
+      expect(lastFrame()).toContain("Apply To"); // Scope section
+      expect(lastFrame()).toContain("User Settings"); // Scope options (no numbers when settings focused)
       // Use regex for more flexible help text matching
       expect(lastFrame()).toMatch(/Enter.*select.*Tab.*focus.*Esc.*close/);
 
@@ -990,7 +971,7 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should allow changing multiple settings without losing pending changes', async () => {
+    it("should allow changing multiple settings without losing pending changes", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -1010,7 +991,7 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should maintain state consistency during complex interactions', async () => {
+    it("should maintain state consistency during complex interactions", async () => {
       const settings = createMockSettings({ vimMode: true });
       const onSelect = vi.fn();
 
@@ -1019,17 +1000,17 @@ describe('SettingsDialog', () => {
       // Multiple scope changes
       act(() => {
         stdin.write(TerminalKeys.TAB as string); // Tab to scope
-        stdin.write('2'); // Workspace
+        stdin.write("2"); // Workspace
         stdin.write(TerminalKeys.TAB as string); // Tab to settings
         stdin.write(TerminalKeys.TAB as string); // Tab to scope
-        stdin.write('1'); // User
+        stdin.write("1"); // User
       });
 
       // Should maintain consistent state
       unmount();
     });
 
-    it('should handle restart workflow correctly', async () => {
+    it("should handle restart workflow correctly", async () => {
       const settings = createMockSettings();
       const onRestartRequest = vi.fn();
 
@@ -1039,7 +1020,7 @@ describe('SettingsDialog', () => {
 
       // This would test the restart workflow if we could trigger it
       act(() => {
-        stdin.write('r'); // Try restart key
+        stdin.write("r"); // Try restart key
       });
 
       // Without restart prompt showing, this should have no effect
@@ -1049,9 +1030,9 @@ describe('SettingsDialog', () => {
     });
   });
 
-  describe('String Settings Editing', () => {
-    it('should allow editing and committing a string setting', async () => {
-      let settings = createMockSettings({ 'a.string.setting': 'initial' });
+  describe("String Settings Editing", () => {
+    it("should allow editing and committing a string setting", async () => {
+      let settings = createMockSettings({ "a.string.setting": "initial" });
       const onSelect = vi.fn();
 
       const { stdin, unmount, rerender } = render(
@@ -1063,22 +1044,18 @@ describe('SettingsDialog', () => {
       // Navigate to the last setting
       act(() => {
         for (let i = 0; i < 20; i++) {
-          stdin.write('j'); // Down
+          stdin.write("j"); // Down
         }
       });
 
       // Press Enter to start editing, type new value, and commit
       act(() => {
-        stdin.write('\r'); // Start editing
-        stdin.write('new value');
-        stdin.write('\r'); // Commit
+        stdin.write("\r"); // Start editing
+        stdin.write("new value");
+        stdin.write("\r"); // Commit
       });
 
-      settings = createMockSettings(
-        { 'a.string.setting': 'new value' },
-        {},
-        {},
-      );
+      settings = createMockSettings({ "a.string.setting": "new value" }, {}, {});
       rerender(
         <KeypressProvider>
           <SettingsDialog settings={settings} onSelect={onSelect} />
@@ -1087,19 +1064,19 @@ describe('SettingsDialog', () => {
 
       // Press Escape to exit
       act(() => {
-        stdin.write('\u001B');
+        stdin.write("\u001B");
       });
 
       await waitFor(() => {
-        expect(onSelect).toHaveBeenCalledWith(undefined, 'User');
+        expect(onSelect).toHaveBeenCalledWith(undefined, "User");
       });
 
       unmount();
     });
   });
 
-  describe('Search Functionality', () => {
-    it('should display text entered in search', async () => {
+  describe("Search Functionality", () => {
+    it("should display text entered in search", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -1107,52 +1084,52 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render and verify that search is not active
       await waitFor(() => {
-        expect(lastFrame()).not.toContain('> Search:');
+        expect(lastFrame()).not.toContain("> Search:");
       });
-      expect(lastFrame()).toContain('Search to filter');
+      expect(lastFrame()).toContain("Search to filter");
 
       // Press '/' to enter search mode
       act(() => {
-        stdin.write('/');
+        stdin.write("/");
       });
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('/');
-        expect(lastFrame()).not.toContain('Search to filter');
+        expect(lastFrame()).toContain("/");
+        expect(lastFrame()).not.toContain("Search to filter");
       });
 
       unmount();
     });
 
-    it('should show search query and filter settings as user types', async () => {
+    it("should show search query and filter settings as user types", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
       const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
 
       act(() => {
-        stdin.write('yolo');
+        stdin.write("yolo");
       });
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('yolo');
-        expect(lastFrame()).toContain('Disable YOLO Mode');
+        expect(lastFrame()).toContain("yolo");
+        expect(lastFrame()).toContain("Disable YOLO Mode");
       });
 
       unmount();
     });
 
-    it('should exit search settings when Escape is pressed', async () => {
+    it("should exit search settings when Escape is pressed", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
       const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
 
       act(() => {
-        stdin.write('vim');
+        stdin.write("vim");
       });
       await waitFor(() => {
-        expect(lastFrame()).toContain('vim');
+        expect(lastFrame()).toContain("vim");
       });
 
       // Press Escape
@@ -1169,17 +1146,17 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should handle backspace to modify search query', async () => {
+    it("should handle backspace to modify search query", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
       const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
 
       act(() => {
-        stdin.write('vimm');
+        stdin.write("vimm");
       });
       await waitFor(() => {
-        expect(lastFrame()).toContain('vimm');
+        expect(lastFrame()).toContain("vimm");
       });
 
       // Press backspace
@@ -1188,17 +1165,15 @@ describe('SettingsDialog', () => {
       });
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('vim');
-        expect(lastFrame()).toContain('Vim Mode');
-        expect(lastFrame()).not.toContain(
-          'Codebase Investigator Max Num Turns',
-        );
+        expect(lastFrame()).toContain("vim");
+        expect(lastFrame()).toContain("Vim Mode");
+        expect(lastFrame()).not.toContain("Codebase Investigator Max Num Turns");
       });
 
       unmount();
     });
 
-    it('should display nothing when search yields no results', async () => {
+    it("should display nothing when search yields no results", async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
@@ -1206,21 +1181,21 @@ describe('SettingsDialog', () => {
 
       // Type a search query that won't match any settings
       act(() => {
-        stdin.write('nonexistentsetting');
+        stdin.write("nonexistentsetting");
       });
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('nonexistentsetting');
-        expect(lastFrame()).toContain('');
-        expect(lastFrame()).not.toContain('Vim Mode'); // Should not contain any settings
-        expect(lastFrame()).not.toContain('Disable Auto Update'); // Should not contain any settings
+        expect(lastFrame()).toContain("nonexistentsetting");
+        expect(lastFrame()).toContain("");
+        expect(lastFrame()).not.toContain("Vim Mode"); // Should not contain any settings
+        expect(lastFrame()).not.toContain("Disable Auto Update"); // Should not contain any settings
       });
 
       unmount();
     });
   });
 
-  describe('Snapshot Tests', () => {
+  describe("Snapshot Tests", () => {
     /**
      * Snapshot tests for SettingsDialog component using ink-testing-library.
      * These tests capture the visual output of the component in various states.
@@ -1229,14 +1204,14 @@ describe('SettingsDialog', () => {
 
     it.each([
       {
-        name: 'default state',
+        name: "default state",
         userSettings: {},
         systemSettings: {},
         workspaceSettings: {},
         stdinActions: undefined,
       },
       {
-        name: 'various boolean settings enabled',
+        name: "various boolean settings enabled",
         userSettings: {
           general: {
             vimMode: true,
@@ -1283,7 +1258,7 @@ describe('SettingsDialog', () => {
         stdinActions: undefined,
       },
       {
-        name: 'mixed boolean and number settings',
+        name: "mixed boolean and number settings",
         userSettings: {
           general: {
             vimMode: false,
@@ -1310,18 +1285,18 @@ describe('SettingsDialog', () => {
         stdinActions: undefined,
       },
       {
-        name: 'focused on scope selector',
+        name: "focused on scope selector",
         userSettings: {},
         systemSettings: {},
         workspaceSettings: {},
         stdinActions: (stdin: { write: (data: string) => void }) => {
           act(() => {
-            stdin.write('\t');
+            stdin.write("\t");
           });
         },
       },
       {
-        name: 'accessibility settings enabled',
+        name: "accessibility settings enabled",
         userSettings: {
           ui: {
             accessibility: {
@@ -1340,7 +1315,7 @@ describe('SettingsDialog', () => {
         stdinActions: undefined,
       },
       {
-        name: 'file filtering settings configured',
+        name: "file filtering settings configured",
         userSettings: {
           context: {
             fileFiltering: {
@@ -1358,7 +1333,7 @@ describe('SettingsDialog', () => {
         stdinActions: undefined,
       },
       {
-        name: 'tools and security settings',
+        name: "tools and security settings",
         userSettings: {
           tools: {
             enableInteractiveShell: true,
@@ -1382,7 +1357,7 @@ describe('SettingsDialog', () => {
         stdinActions: undefined,
       },
       {
-        name: 'all boolean settings disabled',
+        name: "all boolean settings disabled",
         userSettings: {
           general: {
             vimMode: false,
@@ -1428,24 +1403,22 @@ describe('SettingsDialog', () => {
         workspaceSettings: {},
         stdinActions: undefined,
       },
-    ])(
-      'should render $name correctly',
-      ({ userSettings, systemSettings, workspaceSettings, stdinActions }) => {
-        const settings = createMockSettings(
-          userSettings,
-          systemSettings,
-          workspaceSettings,
-        );
-        const onSelect = vi.fn();
+    ])("should render $name correctly", ({
+      userSettings,
+      systemSettings,
+      workspaceSettings,
+      stdinActions,
+    }) => {
+      const settings = createMockSettings(userSettings, systemSettings, workspaceSettings);
+      const onSelect = vi.fn();
 
-        const { lastFrame, stdin } = renderDialog(settings, onSelect);
+      const { lastFrame, stdin } = renderDialog(settings, onSelect);
 
-        if (stdinActions) {
-          stdinActions(stdin);
-        }
+      if (stdinActions) {
+        stdinActions(stdin);
+      }
 
-        expect(lastFrame()).toMatchSnapshot();
-      },
-    );
+      expect(lastFrame()).toMatchSnapshot();
+    });
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/SettingsDialog.tsx b/packages/ui-gemini/src/ui/components/SettingsDialog.tsx
index b0040182c..215bf4313 100644
--- a/packages/ui-gemini/src/ui/components/SettingsDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/SettingsDialog.tsx
@@ -4,50 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useState, useEffect, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { AsyncFzf } from 'fzf';
-import { theme } from '../semantic-colors.js';
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-  Settings,
-} from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import {
-  getScopeItems,
-  getScopeMessageForSetting,
-} from '../../utils/dialogScopeUtils.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import chalk from "chalk";
+import { AsyncFzf } from "fzf";
+import { Box, Text } from "ink";
+import React, { useEffect, useMemo, useState } from "react";
+import type { LoadableSettingScope, LoadedSettings, Settings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { type SettingsValue, TOGGLE_TYPES } from "../../config/settingsSchema.js";
+import { getScopeItems, getScopeMessageForSetting } from "../../utils/dialogScopeUtils.js";
 import {
+  getDefaultValue,
   getDialogSettingKeys,
-  setPendingSettingValue,
   getDisplayValue,
-  hasRestartRequiredSettings,
-  saveModifiedSettings,
+  getEffectiveValue,
+  getNestedValue,
+  getRestartRequiredFromModified,
   getSettingDefinition,
+  hasRestartRequiredSettings,
   isDefaultValue,
   requiresRestart,
-  getRestartRequiredFromModified,
-  getDefaultValue,
+  saveModifiedSettings,
+  setPendingSettingValue,
   setPendingSettingValueAny,
-  getNestedValue,
-  getEffectiveValue,
-} from '../../utils/settingsUtils.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import chalk from 'chalk';
-import { cpSlice, cpLen, stripUnsafeCharacters } from '../utils/textUtils.js';
-import {
-  type SettingsValue,
-  TOGGLE_TYPES,
-} from '../../config/settingsSchema.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { keyMatchers, Command } from '../keyMatchers.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useTextBuffer } from './shared/text-buffer.js';
-import { TextInput } from './shared/TextInput.js';
+} from "../../utils/settingsUtils.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { Command, keyMatchers } from "../keyMatchers.js";
+import { theme } from "../semantic-colors.js";
+import { cpLen, cpSlice, stripUnsafeCharacters } from "../utils/textUtils.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
+import { TextInput } from "./shared/TextInput.js";
+import { useTextBuffer } from "./shared/text-buffer.js";
 
 interface FzfResult {
   item: string;
@@ -78,13 +68,9 @@ export function SettingsDialog({
   const { vimEnabled, toggleVimEnabled } = useVimMode();
 
   // Focus state: 'settings' or 'scope'
-  const [focusSection, setFocusSection] = useState<'settings' | 'scope'>(
-    'settings',
-  );
+  const [focusSection, setFocusSection] = useState<"settings" | "scope">("settings");
   // Scope selector state (User by default)
-  const [selectedScope, setSelectedScope] = useState<LoadableSettingScope>(
-    SettingScope.User,
-  );
+  const [selectedScope, setSelectedScope] = useState<LoadableSettingScope>(SettingScope.User);
   // Active indices
   const [activeSettingIndex, setActiveSettingIndex] = useState(0);
   // Scroll offset for settings
@@ -92,10 +78,8 @@ export function SettingsDialog({
   const [showRestartPrompt, setShowRestartPrompt] = useState(false);
 
   // Search state
-  const [searchQuery, setSearchQuery] = useState('');
-  const [filteredKeys, setFilteredKeys] = useState<string[]>(() =>
-    getDialogSettingKeys(),
-  );
+  const [searchQuery, setSearchQuery] = useState("");
+  const [filteredKeys, setFilteredKeys] = useState<string[]>(() => getDialogSettingKeys());
   const { fzfInstance, searchMap } = useMemo(() => {
     const keys = getDialogSettingKeys();
     const map = new Map<string, string>();
@@ -110,8 +94,8 @@ export function SettingsDialog({
     });
 
     const fzf = new AsyncFzf(searchItems, {
-      fuzzy: 'v2',
-      casing: 'case-insensitive',
+      fuzzy: "v2",
+      casing: "case-insensitive",
     });
     return { fzfInstance: fzf, searchMap: map };
   }, []);
@@ -154,20 +138,16 @@ export function SettingsDialog({
   );
 
   // Track which settings have been modified by the user
-  const [modifiedSettings, setModifiedSettings] = useState<Set<string>>(
-    new Set(),
-  );
+  const [modifiedSettings, setModifiedSettings] = useState<Set<string>>(new Set());
 
   // Preserve pending changes across scope switches
   type PendingValue = boolean | number | string;
-  const [globalPendingChanges, setGlobalPendingChanges] = useState<
-    Map<string, PendingValue>
-  >(new Map());
+  const [globalPendingChanges, setGlobalPendingChanges] = useState<Map<string, PendingValue>>(
+    new Map(),
+  );
 
   // Track restart-required settings across scope changes
-  const [_restartRequiredSettings, setRestartRequiredSettings] = useState<
-    Set<string>
-  >(new Set());
+  const [_restartRequiredSettings, setRestartRequiredSettings] = useState<Set<string>>(new Set());
 
   useEffect(() => {
     // Base settings for selected scope
@@ -177,11 +157,11 @@ export function SettingsDialog({
     const newRestartRequired = new Set<string>();
     for (const [key, value] of globalPendingChanges.entries()) {
       const def = getSettingDefinition(key);
-      if (def?.type === 'boolean' && typeof value === 'boolean') {
+      if (def?.type === "boolean" && typeof value === "boolean") {
         updated = setPendingSettingValue(key, value, updated);
       } else if (
-        (def?.type === 'number' && typeof value === 'number') ||
-        (def?.type === 'string' && typeof value === 'string')
+        (def?.type === "number" && typeof value === "number") ||
+        (def?.type === "string" && typeof value === "string")
       ) {
         updated = setPendingSettingValueAny(key, value, updated);
       }
@@ -210,30 +190,23 @@ export function SettingsDialog({
           }
           const currentValue = getEffectiveValue(key, pendingSettings, {});
           let newValue: SettingsValue;
-          if (definition?.type === 'boolean') {
+          if (definition?.type === "boolean") {
             newValue = !(currentValue as boolean);
-            setPendingSettings((prev) =>
-              setPendingSettingValue(key, newValue as boolean, prev),
-            );
-          } else if (definition?.type === 'enum' && definition.options) {
+            setPendingSettings((prev) => setPendingSettingValue(key, newValue as boolean, prev));
+          } else if (definition?.type === "enum" && definition.options) {
             const options = definition.options;
-            const currentIndex = options?.findIndex(
-              (opt) => opt.value === currentValue,
-            );
+            const currentIndex = options?.findIndex((opt) => opt.value === currentValue);
             if (currentIndex !== -1 && currentIndex < options.length - 1) {
               newValue = options[currentIndex + 1].value;
             } else {
               newValue = options[0].value; // loop back to start.
             }
-            setPendingSettings((prev) =>
-              setPendingSettingValueAny(key, newValue, prev),
-            );
+            setPendingSettings((prev) => setPendingSettingValueAny(key, newValue, prev));
           }
 
           if (!requiresRestart(key)) {
             const immediateSettings = new Set([key]);
-            const currentScopeSettings =
-              settings.forScope(selectedScope).settings;
+            const currentScopeSettings = settings.forScope(selectedScope).settings;
             const immediateSettingsObject = setPendingSettingValueAny(
               key,
               newValue,
@@ -251,10 +224,10 @@ export function SettingsDialog({
             );
 
             // Special handling for vim mode to sync with VimModeContext
-            if (key === 'general.vimMode' && newValue !== vimEnabled) {
+            if (key === "general.vimMode" && newValue !== vimEnabled) {
               // Call toggleVimEnabled to sync the VimModeContext local state
               toggleVimEnabled().catch((error) => {
-                console.error('Failed to toggle vim mode:', error);
+                console.error("Failed to toggle vim mode:", error);
               });
             }
 
@@ -280,7 +253,7 @@ export function SettingsDialog({
               return next;
             });
 
-            if (key === 'general.previewFeatures') {
+            if (key === "general.previewFeatures") {
               config?.setPreviewFeatures(newValue as boolean);
             }
           } else {
@@ -291,14 +264,12 @@ export function SettingsDialog({
               debugLogger.log(
                 `[DEBUG SettingsDialog] Modified settings:`,
                 Array.from(updated),
-                'Needs restart:',
+                "Needs restart:",
                 needsRestart,
               );
               if (needsRestart) {
                 setShowRestartPrompt(true);
-                setRestartRequiredSettings((prevRestart) =>
-                  new Set(prevRestart).add(key),
-                );
+                setRestartRequiredSettings((prevRestart) => new Set(prevRestart).add(key));
               }
               return updated;
             });
@@ -319,7 +290,7 @@ export function SettingsDialog({
 
   // Generic edit state
   const [editingKey, setEditingKey] = useState<string | null>(null);
-  const [editBuffer, setEditBuffer] = useState<string>('');
+  const [editBuffer, setEditBuffer] = useState<string>("");
   const [editCursorPos, setEditCursorPos] = useState<number>(0); // Cursor position within edit buffer
   const [cursorVisible, setCursorVisible] = useState<boolean>(true);
 
@@ -334,7 +305,7 @@ export function SettingsDialog({
 
   const startEditing = (key: string, initial?: string) => {
     setEditingKey(key);
-    const initialValue = initial ?? '';
+    const initialValue = initial ?? "";
     setEditBuffer(initialValue);
     setEditCursorPos(cpLen(initialValue)); // Position cursor at end of initial value
   };
@@ -343,21 +314,21 @@ export function SettingsDialog({
     const definition = getSettingDefinition(key);
     const type = definition?.type;
 
-    if (editBuffer.trim() === '' && type === 'number') {
+    if (editBuffer.trim() === "" && type === "number") {
       // Nothing entered for a number; cancel edit
       setEditingKey(null);
-      setEditBuffer('');
+      setEditBuffer("");
       setEditCursorPos(0);
       return;
     }
 
     let parsed: string | number;
-    if (type === 'number') {
+    if (type === "number") {
       const numParsed = Number(editBuffer.trim());
       if (Number.isNaN(numParsed)) {
         // Invalid number; cancel edit
         setEditingKey(null);
-        setEditBuffer('');
+        setEditBuffer("");
         setEditCursorPos(0);
         return;
       }
@@ -373,17 +344,8 @@ export function SettingsDialog({
     if (!requiresRestart(key)) {
       const immediateSettings = new Set([key]);
       const currentScopeSettings = settings.forScope(selectedScope).settings;
-      const immediateSettingsObject = setPendingSettingValueAny(
-        key,
-        parsed,
-        currentScopeSettings,
-      );
-      saveModifiedSettings(
-        immediateSettings,
-        immediateSettingsObject,
-        settings,
-        selectedScope,
-      );
+      const immediateSettingsObject = setPendingSettingValueAny(key, parsed, currentScopeSettings);
+      saveModifiedSettings(immediateSettings, immediateSettingsObject, settings, selectedScope);
 
       // Remove from modified sets if present
       setModifiedSettings((prev) => {
@@ -411,9 +373,7 @@ export function SettingsDialog({
         const needsRestart = hasRestartRequiredSettings(updated);
         if (needsRestart) {
           setShowRestartPrompt(true);
-          setRestartRequiredSettings((prevRestart) =>
-            new Set(prevRestart).add(key),
-          );
+          setRestartRequiredSettings((prevRestart) => new Set(prevRestart).add(key));
         }
         return updated;
       });
@@ -427,7 +387,7 @@ export function SettingsDialog({
     }
 
     setEditingKey(null);
-    setEditBuffer('');
+    setEditBuffer("");
     setEditCursorPos(0);
   };
 
@@ -443,7 +403,7 @@ export function SettingsDialog({
 
   const handleScopeSelect = (scope: LoadableSettingScope) => {
     handleScopeHighlight(scope);
-    setFocusSection('settings');
+    setFocusSection("settings");
   };
 
   // Height constraint calculations similar to ThemeDialog
@@ -455,8 +415,7 @@ export function SettingsDialog({
   const BOTTOM_HELP_TEXT_HEIGHT = 1; // Help text
   const RESTART_PROMPT_HEIGHT = showRestartPrompt ? 1 : 0;
 
-  let currentAvailableTerminalHeight =
-    availableTerminalHeight ?? Number.MAX_SAFE_INTEGER;
+  let currentAvailableTerminalHeight = availableTerminalHeight ?? Number.MAX_SAFE_INTEGER;
   currentAvailableTerminalHeight -= 2; // Top and bottom borders
 
   // Start with basic fixed height (without scope selection)
@@ -469,10 +428,7 @@ export function SettingsDialog({
     RESTART_PROMPT_HEIGHT;
 
   // Calculate how much space we have for settings
-  let availableHeightForSettings = Math.max(
-    1,
-    currentAvailableTerminalHeight - totalFixedHeight,
-  );
+  let availableHeightForSettings = Math.max(1, currentAvailableTerminalHeight - totalFixedHeight);
 
   // Each setting item takes 2 lines (the setting row + spacing)
   let maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
@@ -484,10 +440,7 @@ export function SettingsDialog({
   if (availableTerminalHeight && availableTerminalHeight < 25) {
     // For very limited height, hide scope selection to show more settings
     const totalWithScope = totalFixedHeight + SCOPE_SELECTION_HEIGHT;
-    const availableWithScope = Math.max(
-      1,
-      currentAvailableTerminalHeight - totalWithScope,
-    );
+    const availableWithScope = Math.max(1, currentAvailableTerminalHeight - totalWithScope);
     const maxItemsWithScope = Math.max(1, Math.floor(availableWithScope / 2));
 
     // If hiding scope selection allows us to show significantly more settings, do it
@@ -496,19 +449,13 @@ export function SettingsDialog({
     } else {
       // Otherwise include scope selection and recalculate
       totalFixedHeight += SCOPE_SELECTION_HEIGHT;
-      availableHeightForSettings = Math.max(
-        1,
-        currentAvailableTerminalHeight - totalFixedHeight,
-      );
+      availableHeightForSettings = Math.max(1, currentAvailableTerminalHeight - totalFixedHeight);
       maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
     }
   } else {
     // For normal height, include scope selection
     totalFixedHeight += SCOPE_SELECTION_HEIGHT;
-    availableHeightForSettings = Math.max(
-      1,
-      currentAvailableTerminalHeight - totalFixedHeight,
-    );
+    availableHeightForSettings = Math.max(1, currentAvailableTerminalHeight - totalFixedHeight);
     maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
   }
 
@@ -519,32 +466,23 @@ export function SettingsDialog({
 
   // Ensure focus stays on settings when scope selection is hidden
   React.useEffect(() => {
-    if (!showScopeSelection && focusSection === 'scope') {
-      setFocusSection('settings');
+    if (!showScopeSelection && focusSection === "scope") {
+      setFocusSection("settings");
     }
   }, [showScopeSelection, focusSection]);
 
   // Scroll logic for settings
-  const visibleItems = items.slice(
-    scrollOffset,
-    scrollOffset + effectiveMaxItemsToShow,
-  );
+  const visibleItems = items.slice(scrollOffset, scrollOffset + effectiveMaxItemsToShow);
   // Show arrows if there are more items than can be displayed
   const showScrollUp = items.length > effectiveMaxItemsToShow;
   const showScrollDown = items.length > effectiveMaxItemsToShow;
 
   const saveRestartRequiredSettings = () => {
-    const restartRequiredSettings =
-      getRestartRequiredFromModified(modifiedSettings);
+    const restartRequiredSettings = getRestartRequiredFromModified(modifiedSettings);
     const restartRequiredSet = new Set(restartRequiredSettings);
 
     if (restartRequiredSet.size > 0) {
-      saveModifiedSettings(
-        restartRequiredSet,
-        pendingSettings,
-        settings,
-        selectedScope,
-      );
+      saveModifiedSettings(restartRequiredSet, pendingSettings, settings, selectedScope);
 
       // Remove saved keys from global pending changes
       setGlobalPendingChanges((prev) => {
@@ -562,10 +500,10 @@ export function SettingsDialog({
     (key) => {
       const { name } = key;
 
-      if (name === 'tab' && showScopeSelection) {
-        setFocusSection((prev) => (prev === 'settings' ? 'scope' : 'settings'));
+      if (name === "tab" && showScopeSelection) {
+        setFocusSection((prev) => (prev === "settings" ? "scope" : "settings"));
       }
-      if (focusSection === 'settings') {
+      if (focusSection === "settings") {
         // If editing, capture input and control keys
         if (editingKey) {
           const definition = getSettingDefinition(editingKey);
@@ -573,8 +511,8 @@ export function SettingsDialog({
 
           if (key.paste && key.sequence) {
             let pasted = key.sequence;
-            if (type === 'number') {
-              pasted = key.sequence.replace(/[^0-9\-+.]/g, '');
+            if (type === "number") {
+              pasted = key.sequence.replace(/[^0-9\-+.]/g, "");
             }
             if (pasted) {
               setEditBuffer((b) => {
@@ -586,15 +524,15 @@ export function SettingsDialog({
             }
             return;
           }
-          if (name === 'backspace' || name === 'delete') {
-            if (name === 'backspace' && editCursorPos > 0) {
+          if (name === "backspace" || name === "delete") {
+            if (name === "backspace" && editCursorPos > 0) {
               setEditBuffer((b) => {
                 const before = cpSlice(b, 0, editCursorPos - 1);
                 const after = cpSlice(b, editCursorPos);
                 return before + after;
               });
               setEditCursorPos((pos) => pos - 1);
-            } else if (name === 'delete' && editCursorPos < cpLen(editBuffer)) {
+            } else if (name === "delete" && editCursorPos < cpLen(editBuffer)) {
               setEditBuffer((b) => {
                 const before = cpSlice(b, 0, editCursorPos);
                 const after = cpSlice(b, editCursorPos + 1);
@@ -615,7 +553,7 @@ export function SettingsDialog({
 
           let ch = key.sequence;
           let isValidChar = false;
-          if (type === 'number') {
+          if (type === "number") {
             // Allow digits, minus, plus, and dot.
             isValidChar = /[0-9\-+.]/.test(ch);
           } else {
@@ -636,11 +574,11 @@ export function SettingsDialog({
           }
 
           // Arrow key navigation
-          if (name === 'left') {
+          if (name === "left") {
             setEditCursorPos((pos) => Math.max(0, pos - 1));
             return;
           }
-          if (name === 'right') {
+          if (name === "right") {
             setEditCursorPos((pos) => Math.min(cpLen(editBuffer), pos + 1));
             return;
           }
@@ -661,14 +599,11 @@ export function SettingsDialog({
           if (editingKey) {
             commitEdit(editingKey);
           }
-          const newIndex =
-            activeSettingIndex > 0 ? activeSettingIndex - 1 : items.length - 1;
+          const newIndex = activeSettingIndex > 0 ? activeSettingIndex - 1 : items.length - 1;
           setActiveSettingIndex(newIndex);
           // Adjust scroll offset for wrap-around
           if (newIndex === items.length - 1) {
-            setScrollOffset(
-              Math.max(0, items.length - effectiveMaxItemsToShow),
-            );
+            setScrollOffset(Math.max(0, items.length - effectiveMaxItemsToShow));
           } else if (newIndex < scrollOffset) {
             setScrollOffset(newIndex);
           }
@@ -677,8 +612,7 @@ export function SettingsDialog({
           if (editingKey) {
             commitEdit(editingKey);
           }
-          const newIndex =
-            activeSettingIndex < items.length - 1 ? activeSettingIndex + 1 : 0;
+          const newIndex = activeSettingIndex < items.length - 1 ? activeSettingIndex + 1 : 0;
           setActiveSettingIndex(newIndex);
           // Adjust scroll offset for wrap-around
           if (newIndex === 0) {
@@ -688,17 +622,14 @@ export function SettingsDialog({
           }
         } else if (keyMatchers[Command.RETURN](key)) {
           const currentItem = items[activeSettingIndex];
-          if (
-            currentItem?.type === 'number' ||
-            currentItem?.type === 'string'
-          ) {
+          if (currentItem?.type === "number" || currentItem?.type === "string") {
             startEditing(currentItem.value);
           } else {
             currentItem?.toggle();
           }
-        } else if (/^[0-9]$/.test(key.sequence || '') && !editingKey) {
+        } else if (/^[0-9]$/.test(key.sequence || "") && !editingKey) {
           const currentItem = items[activeSettingIndex];
-          if (currentItem?.type === 'number') {
+          if (currentItem?.type === "number") {
             startEditing(currentItem.value, key.sequence);
           }
         } else if (
@@ -710,27 +641,15 @@ export function SettingsDialog({
           if (currentSetting) {
             const defaultValue = getDefaultValue(currentSetting.value);
             const defType = currentSetting.type;
-            if (defType === 'boolean') {
-              const booleanDefaultValue =
-                typeof defaultValue === 'boolean' ? defaultValue : false;
+            if (defType === "boolean") {
+              const booleanDefaultValue = typeof defaultValue === "boolean" ? defaultValue : false;
               setPendingSettings((prev) =>
-                setPendingSettingValue(
-                  currentSetting.value,
-                  booleanDefaultValue,
-                  prev,
-                ),
+                setPendingSettingValue(currentSetting.value, booleanDefaultValue, prev),
               );
-            } else if (defType === 'number' || defType === 'string') {
-              if (
-                typeof defaultValue === 'number' ||
-                typeof defaultValue === 'string'
-              ) {
+            } else if (defType === "number" || defType === "string") {
+              if (typeof defaultValue === "number" || typeof defaultValue === "string") {
                 setPendingSettings((prev) =>
-                  setPendingSettingValueAny(
-                    currentSetting.value,
-                    defaultValue,
-                    prev,
-                  ),
+                  setPendingSettingValueAny(currentSetting.value, defaultValue, prev),
                 );
               }
             }
@@ -753,16 +672,14 @@ export function SettingsDialog({
             if (!requiresRestart(currentSetting.value)) {
               const immediateSettings = new Set([currentSetting.value]);
               const toSaveValue =
-                currentSetting.type === 'boolean'
-                  ? typeof defaultValue === 'boolean'
+                currentSetting.type === "boolean"
+                  ? typeof defaultValue === "boolean"
                     ? defaultValue
                     : false
-                  : typeof defaultValue === 'number' ||
-                      typeof defaultValue === 'string'
+                  : typeof defaultValue === "number" || typeof defaultValue === "string"
                     ? defaultValue
                     : undefined;
-              const currentScopeSettings =
-                settings.forScope(selectedScope).settings;
+              const currentScopeSettings = settings.forScope(selectedScope).settings;
               const immediateSettingsObject =
                 toSaveValue !== undefined
                   ? setPendingSettingValueAny(
@@ -789,12 +706,9 @@ export function SettingsDialog({
             } else {
               // Track default reset as a pending change if restart required
               if (
-                (currentSetting.type === 'boolean' &&
-                  typeof defaultValue === 'boolean') ||
-                (currentSetting.type === 'number' &&
-                  typeof defaultValue === 'number') ||
-                (currentSetting.type === 'string' &&
-                  typeof defaultValue === 'string')
+                (currentSetting.type === "boolean" && typeof defaultValue === "boolean") ||
+                (currentSetting.type === "number" && typeof defaultValue === "number") ||
+                (currentSetting.type === "string" && typeof defaultValue === "string")
               ) {
                 setGlobalPendingChanges((prev) => {
                   const next = new Map(prev);
@@ -806,7 +720,7 @@ export function SettingsDialog({
           }
         }
       }
-      if (showRestartPrompt && name === 'r') {
+      if (showRestartPrompt && name === "r") {
         // Only save settings that require restart (non-restart settings were already saved immediately)
         saveRestartRequiredSettings();
 
@@ -831,7 +745,7 @@ export function SettingsDialog({
   const viewportWidth = mainAreaWidth - 8;
 
   const buffer = useTextBuffer({
-    initialText: '',
+    initialText: "",
     initialCursorOffset: 0,
     viewport: {
       width: viewportWidth,
@@ -853,11 +767,8 @@ export function SettingsDialog({
     >
       <Box flexDirection="column" flexGrow={1}>
         <Box marginX={1}>
-          <Text
-            bold={focusSection === 'settings' && !editingKey}
-            wrap="truncate"
-          >
-            {focusSection === 'settings' ? '> ' : '  '}Settings{' '}
+          <Text bold={focusSection === "settings" && !editingKey} wrap="truncate">
+            {focusSection === "settings" ? "> " : "  "}Settings{" "}
           </Text>
         </Box>
         <Box
@@ -865,7 +776,7 @@ export function SettingsDialog({
           borderColor={
             editingKey
               ? theme.border.default
-              : focusSection === 'settings'
+              : focusSection === "settings"
                 ? theme.border.focused
                 : theme.border.default
           }
@@ -874,7 +785,7 @@ export function SettingsDialog({
           marginTop={1}
         >
           <TextInput
-            focus={focusSection === 'settings' && !editingKey}
+            focus={focusSection === "settings" && !editingKey}
             buffer={buffer}
             placeholder="Search to filter"
           />
@@ -893,8 +804,7 @@ export function SettingsDialog({
             )}
             {visibleItems.map((item, idx) => {
               const isActive =
-                focusSection === 'settings' &&
-                activeSettingIndex === idx + scrollOffset;
+                focusSection === "settings" && activeSettingIndex === idx + scrollOffset;
 
               const scopeSettings = settings.forScope(selectedScope).settings;
               const mergedSettings = settings.merged;
@@ -905,27 +815,19 @@ export function SettingsDialog({
                 if (cursorVisible && editCursorPos < cpLen(editBuffer)) {
                   // Cursor is in the middle or at start of text
                   const beforeCursor = cpSlice(editBuffer, 0, editCursorPos);
-                  const atCursor = cpSlice(
-                    editBuffer,
-                    editCursorPos,
-                    editCursorPos + 1,
-                  );
+                  const atCursor = cpSlice(editBuffer, editCursorPos, editCursorPos + 1);
                   const afterCursor = cpSlice(editBuffer, editCursorPos + 1);
-                  displayValue =
-                    beforeCursor + chalk.inverse(atCursor) + afterCursor;
-                } else if (
-                  cursorVisible &&
-                  editCursorPos >= cpLen(editBuffer)
-                ) {
+                  displayValue = beforeCursor + chalk.inverse(atCursor) + afterCursor;
+                } else if (cursorVisible && editCursorPos >= cpLen(editBuffer)) {
                   // Cursor is at the end - show inverted space
-                  displayValue = editBuffer + chalk.inverse(' ');
+                  displayValue = editBuffer + chalk.inverse(" ");
                 } else {
                   // Cursor not visible
                   displayValue = editBuffer;
                 }
-              } else if (item.type === 'number' || item.type === 'string') {
+              } else if (item.type === "number" || item.type === "string") {
                 // For numbers/strings, get the actual current value from pending settings
-                const path = item.value.split('.');
+                const path = item.value.split(".");
                 const currentValue = getNestedValue(pendingSettings, path);
 
                 const defaultValue = getDefaultValue(item.value);
@@ -934,22 +836,17 @@ export function SettingsDialog({
                   displayValue = String(currentValue);
                 } else {
                   displayValue =
-                    defaultValue !== undefined && defaultValue !== null
-                      ? String(defaultValue)
-                      : '';
+                    defaultValue !== undefined && defaultValue !== null ? String(defaultValue) : "";
                 }
 
                 // Add * if value differs from default OR if currently being modified
                 const isModified = modifiedSettings.has(item.value);
                 const effectiveCurrentValue =
-                  currentValue !== undefined && currentValue !== null
-                    ? currentValue
-                    : defaultValue;
-                const isDifferentFromDefault =
-                  effectiveCurrentValue !== defaultValue;
+                  currentValue !== undefined && currentValue !== null ? currentValue : defaultValue;
+                const isDifferentFromDefault = effectiveCurrentValue !== defaultValue;
 
                 if (isDifferentFromDefault || isModified) {
-                  displayValue += '*';
+                  displayValue += "*";
                 }
               } else {
                 // For booleans and other types, use existing logic
@@ -961,43 +858,23 @@ export function SettingsDialog({
                   pendingSettings,
                 );
               }
-              const shouldBeGreyedOut = isDefaultValue(
-                item.value,
-                scopeSettings,
-              );
+              const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
 
               // Generate scope message for this setting
-              const scopeMessage = getScopeMessageForSetting(
-                item.value,
-                selectedScope,
-                settings,
-              );
+              const scopeMessage = getScopeMessageForSetting(item.value, selectedScope, settings);
 
               return (
                 <React.Fragment key={item.value}>
                   <Box marginX={1} flexDirection="row" alignItems="center">
                     <Box minWidth={2} flexShrink={0}>
-                      <Text
-                        color={
-                          isActive ? theme.status.success : theme.text.secondary
-                        }
-                      >
-                        {isActive ? '●' : ''}
+                      <Text color={isActive ? theme.status.success : theme.text.secondary}>
+                        {isActive ? "●" : ""}
                       </Text>
                     </Box>
                     <Box minWidth={50}>
-                      <Text
-                        color={
-                          isActive ? theme.status.success : theme.text.primary
-                        }
-                      >
+                      <Text color={isActive ? theme.status.success : theme.text.primary}>
                         {item.label}
-                        {scopeMessage && (
-                          <Text color={theme.text.secondary}>
-                            {' '}
-                            {scopeMessage}
-                          </Text>
-                        )}
+                        {scopeMessage && <Text color={theme.text.secondary}> {scopeMessage}</Text>}
                       </Text>
                     </Box>
                     <Box minWidth={3} />
@@ -1030,18 +907,16 @@ export function SettingsDialog({
         {/* Scope Selection - conditionally visible based on height constraints */}
         {showScopeSelection && (
           <Box marginX={1} flexDirection="column">
-            <Text bold={focusSection === 'scope'} wrap="truncate">
-              {focusSection === 'scope' ? '> ' : '  '}Apply To
+            <Text bold={focusSection === "scope"} wrap="truncate">
+              {focusSection === "scope" ? "> " : "  "}Apply To
             </Text>
             <RadioButtonSelect
               items={scopeItems}
-              initialIndex={scopeItems.findIndex(
-                (item) => item.value === selectedScope,
-              )}
+              initialIndex={scopeItems.findIndex((item) => item.value === selectedScope)}
               onSelect={handleScopeSelect}
               onHighlight={handleScopeHighlight}
-              isFocused={focusSection === 'scope'}
-              showNumbers={focusSection === 'scope'}
+              isFocused={focusSection === "scope"}
+              showNumbers={focusSection === "scope"}
             />
           </Box>
         )}
@@ -1050,14 +925,13 @@ export function SettingsDialog({
         <Box marginX={1}>
           <Text color={theme.text.secondary}>
             (Use Enter to select
-            {showScopeSelection ? ', Tab to change focus' : ''}, Esc to close)
+            {showScopeSelection ? ", Tab to change focus" : ""}, Esc to close)
           </Text>
         </Box>
         {showRestartPrompt && (
           <Box marginX={1}>
             <Text color={theme.status.warning}>
-              To see changes, Gemini CLI must be restarted. Press r to exit and
-              apply changes now.
+              To see changes, Gemini CLI must be restarted. Press r to exit and apply changes now.
             </Text>
           </Box>
         )}
diff --git a/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.test.tsx b/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.test.tsx
index fb656b613..a96b76e9a 100644
--- a/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.test.tsx
@@ -4,52 +4,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { ShellConfirmationDialog } from './ShellConfirmationDialog.js';
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { ShellConfirmationDialog } from "./ShellConfirmationDialog.js";
 
-describe('ShellConfirmationDialog', () => {
+describe("ShellConfirmationDialog", () => {
   const onConfirm = vi.fn();
 
   const request = {
-    commands: ['ls -la', 'echo "hello"'],
+    commands: ["ls -la", 'echo "hello"'],
     onConfirm,
   };
 
-  it('renders correctly', () => {
-    const { lastFrame } = renderWithProviders(
-      <ShellConfirmationDialog request={request} />,
-      { width: 101 },
-    );
+  it("renders correctly", () => {
+    const { lastFrame } = renderWithProviders(<ShellConfirmationDialog request={request} />, {
+      width: 101,
+    });
     expect(lastFrame()).toMatchSnapshot();
   });
 
   it('calls onConfirm with ProceedOnce when "Yes, allow once" is selected', () => {
-    const { lastFrame } = renderWithProviders(
-      <ShellConfirmationDialog request={request} />,
-    );
+    const { lastFrame } = renderWithProviders(<ShellConfirmationDialog request={request} />);
     const select = lastFrame()!.toString();
     // Simulate selecting the first option
     // This is a simplified way to test the selection
-    expect(select).toContain('Yes, allow once');
+    expect(select).toContain("Yes, allow once");
   });
 
   it('calls onConfirm with ProceedAlways when "Yes, allow always for this session" is selected', () => {
-    const { lastFrame } = renderWithProviders(
-      <ShellConfirmationDialog request={request} />,
-    );
+    const { lastFrame } = renderWithProviders(<ShellConfirmationDialog request={request} />);
     const select = lastFrame()!.toString();
     // Simulate selecting the second option
-    expect(select).toContain('Yes, allow always for this session');
+    expect(select).toContain("Yes, allow always for this session");
   });
 
   it('calls onConfirm with Cancel when "No (esc)" is selected', () => {
-    const { lastFrame } = renderWithProviders(
-      <ShellConfirmationDialog request={request} />,
-      { width: 100 },
-    );
+    const { lastFrame } = renderWithProviders(<ShellConfirmationDialog request={request} />, {
+      width: 100,
+    });
     const select = lastFrame()!.toString();
     // Simulate selecting the third option
-    expect(select).toContain('No (esc)');
+    expect(select).toContain("No (esc)");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.tsx b/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.tsx
index 590c01a1f..6f4b0f772 100644
--- a/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/ShellConfirmationDialog.tsx
@@ -4,35 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { ToolConfirmationOutcome } from '@airiscode/gemini-cli-core';
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { theme } from '../semantic-colors.js';
-import { RenderInline } from '../utils/InlineMarkdownRenderer.js';
-import type { RadioSelectItem } from './shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import { ToolConfirmationOutcome } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { RenderInline } from "../utils/InlineMarkdownRenderer.js";
+import type { RadioSelectItem } from "./shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
 
 export interface ShellConfirmationRequest {
   commands: string[];
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    approvedCommands?: string[],
-  ) => void;
+  onConfirm: (outcome: ToolConfirmationOutcome, approvedCommands?: string[]) => void;
 }
 
 export interface ShellConfirmationDialogProps {
   request: ShellConfirmationRequest;
 }
 
-export const ShellConfirmationDialog: React.FC<
-  ShellConfirmationDialogProps
-> = ({ request }) => {
+export const ShellConfirmationDialog: React.FC<ShellConfirmationDialogProps> = ({ request }) => {
   const { commands, onConfirm } = request;
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onConfirm(ToolConfirmationOutcome.Cancel);
       }
     },
@@ -51,19 +46,19 @@ export const ShellConfirmationDialog: React.FC<
 
   const options: Array<RadioSelectItem<ToolConfirmationOutcome>> = [
     {
-      label: 'Yes, allow once',
+      label: "Yes, allow once",
       value: ToolConfirmationOutcome.ProceedOnce,
-      key: 'Yes, allow once',
+      key: "Yes, allow once",
     },
     {
-      label: 'Yes, allow always for this session',
+      label: "Yes, allow always for this session",
       value: ToolConfirmationOutcome.ProceedAlways,
-      key: 'Yes, allow always for this session',
+      key: "Yes, allow always for this session",
     },
     {
-      label: 'No (esc)',
+      label: "No (esc)",
       value: ToolConfirmationOutcome.Cancel,
-      key: 'No (esc)',
+      key: "No (esc)",
     },
   ];
 
diff --git a/packages/ui-gemini/src/ui/components/ShellInputPrompt.test.tsx b/packages/ui-gemini/src/ui/components/ShellInputPrompt.test.tsx
index d796d86a0..f377b0a58 100644
--- a/packages/ui-gemini/src/ui/components/ShellInputPrompt.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ShellInputPrompt.test.tsx
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { ShellInputPrompt } from './ShellInputPrompt.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { ShellExecutionService } from '@airiscode/gemini-cli-core';
+import { ShellExecutionService } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ShellInputPrompt } from "./ShellInputPrompt.js";
 
 // Mock useKeypress
 const mockUseKeypress = vi.fn();
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: (handler: (input: unknown) => void, options?: unknown) =>
     mockUseKeypress(handler, options),
 }));
 
 // Mock ShellExecutionService
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actual = await vi.importActual('@airiscode/gemini-cli-core');
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actual = await vi.importActual("@airiscode/gemini-cli-core");
   return {
     ...actual,
     ShellExecutionService: {
@@ -28,7 +28,7 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
   };
 });
 
-describe('ShellInputPrompt', () => {
+describe("ShellInputPrompt", () => {
   const mockWriteToPty = vi.mocked(ShellExecutionService.writeToPty);
   const mockScrollPty = vi.mocked(ShellExecutionService.scrollPty);
 
@@ -36,17 +36,15 @@ describe('ShellInputPrompt', () => {
     vi.clearAllMocks();
   });
 
-  it('renders nothing', () => {
-    const { lastFrame } = render(
-      <ShellInputPrompt activeShellPtyId={1} focus={true} />,
-    );
-    expect(lastFrame()).toBe('');
+  it("renders nothing", () => {
+    const { lastFrame } = render(<ShellInputPrompt activeShellPtyId={1} focus={true} />);
+    expect(lastFrame()).toBe("");
   });
 
   it.each([
-    ['a', 'a'],
-    ['b', 'b'],
-  ])('handles keypress input: %s', (name, sequence) => {
+    ["a", "a"],
+    ["b", "b"],
+  ])("handles keypress input: %s", (name, sequence) => {
     render(<ShellInputPrompt activeShellPtyId={1} focus={true} />);
 
     // Get the registered handler
@@ -59,9 +57,9 @@ describe('ShellInputPrompt', () => {
   });
 
   it.each([
-    ['up', -1],
-    ['down', 1],
-  ])('handles scroll %s (Ctrl+Shift+%s)', (key, direction) => {
+    ["up", -1],
+    ["down", 1],
+  ])("handles scroll %s (Ctrl+Shift+%s)", (key, direction) => {
     render(<ShellInputPrompt activeShellPtyId={1} focus={true} />);
 
     const handler = mockUseKeypress.mock.calls[0][0];
@@ -71,14 +69,14 @@ describe('ShellInputPrompt', () => {
     expect(mockScrollPty).toHaveBeenCalledWith(1, direction);
   });
 
-  it('does not handle input when not focused', () => {
+  it("does not handle input when not focused", () => {
     render(<ShellInputPrompt activeShellPtyId={1} focus={false} />);
 
     const handler = mockUseKeypress.mock.calls[0][0];
 
     handler({
-      name: 'a',
-      sequence: 'a',
+      name: "a",
+      sequence: "a",
       ctrl: false,
       shift: false,
       meta: false,
@@ -87,14 +85,14 @@ describe('ShellInputPrompt', () => {
     expect(mockWriteToPty).not.toHaveBeenCalled();
   });
 
-  it('does not handle input when no active shell', () => {
+  it("does not handle input when no active shell", () => {
     render(<ShellInputPrompt activeShellPtyId={null} focus={true} />);
 
     const handler = mockUseKeypress.mock.calls[0][0];
 
     handler({
-      name: 'a',
-      sequence: 'a',
+      name: "a",
+      sequence: "a",
       ctrl: false,
       shift: false,
       meta: false,
diff --git a/packages/ui-gemini/src/ui/components/ShellInputPrompt.tsx b/packages/ui-gemini/src/ui/components/ShellInputPrompt.tsx
index 66aa4e2e9..8026cd0d9 100644
--- a/packages/ui-gemini/src/ui/components/ShellInputPrompt.tsx
+++ b/packages/ui-gemini/src/ui/components/ShellInputPrompt.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback } from 'react';
-import type React from 'react';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { ShellExecutionService } from '@airiscode/gemini-cli-core';
-import { keyToAnsi, type Key } from '../hooks/keyToAnsi.js';
+import { ShellExecutionService } from "@airiscode/gemini-cli-core";
+import type React from "react";
+import { useCallback } from "react";
+import { type Key, keyToAnsi } from "../hooks/keyToAnsi.js";
+import { useKeypress } from "../hooks/useKeypress.js";
 
 export interface ShellInputPromptProps {
   activeShellPtyId: number | null;
@@ -33,12 +33,12 @@ export const ShellInputPrompt: React.FC<ShellInputPromptProps> = ({
       if (!focus || !activeShellPtyId) {
         return;
       }
-      if (key.ctrl && key.shift && key.name === 'up') {
+      if (key.ctrl && key.shift && key.name === "up") {
         ShellExecutionService.scrollPty(activeShellPtyId, -1);
         return;
       }
 
-      if (key.ctrl && key.shift && key.name === 'down') {
+      if (key.ctrl && key.shift && key.name === "down") {
         ShellExecutionService.scrollPty(activeShellPtyId, 1);
         return;
       }
diff --git a/packages/ui-gemini/src/ui/components/ShellModeIndicator.test.tsx b/packages/ui-gemini/src/ui/components/ShellModeIndicator.test.tsx
index 73c2b5d03..852091f6f 100644
--- a/packages/ui-gemini/src/ui/components/ShellModeIndicator.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ShellModeIndicator.test.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { ShellModeIndicator } from './ShellModeIndicator.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ShellModeIndicator } from "./ShellModeIndicator.js";
 
-describe('ShellModeIndicator', () => {
-  it('renders correctly', () => {
+describe("ShellModeIndicator", () => {
+  it("renders correctly", () => {
     const { lastFrame } = render(<ShellModeIndicator />);
-    expect(lastFrame()).toContain('shell mode enabled');
-    expect(lastFrame()).toContain('esc to disable');
+    expect(lastFrame()).toContain("shell mode enabled");
+    expect(lastFrame()).toContain("esc to disable");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/ShellModeIndicator.tsx b/packages/ui-gemini/src/ui/components/ShellModeIndicator.tsx
index 10370d2e5..d213cd8ea 100644
--- a/packages/ui-gemini/src/ui/components/ShellModeIndicator.tsx
+++ b/packages/ui-gemini/src/ui/components/ShellModeIndicator.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 export const ShellModeIndicator: React.FC = () => (
   <Box>
diff --git a/packages/ui-gemini/src/ui/components/ShowMoreLines.test.tsx b/packages/ui-gemini/src/ui/components/ShowMoreLines.test.tsx
index beec038bb..08a674dd2 100644
--- a/packages/ui-gemini/src/ui/components/ShowMoreLines.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ShowMoreLines.test.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { ShowMoreLines } from './ShowMoreLines.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { useOverflowState } from '../contexts/OverflowContext.js';
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { useOverflowState } from "../contexts/OverflowContext.js";
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { StreamingState } from "../types.js";
+import { ShowMoreLines } from "./ShowMoreLines.js";
 
-vi.mock('../contexts/OverflowContext.js');
-vi.mock('../contexts/StreamingContext.js');
+vi.mock("../contexts/OverflowContext.js");
+vi.mock("../contexts/StreamingContext.js");
 
-describe('ShowMoreLines', () => {
+describe("ShowMoreLines", () => {
   const mockUseOverflowState = vi.mocked(useOverflowState);
   const mockUseStreamingContext = vi.mocked(useStreamingContext);
 
@@ -24,31 +24,26 @@ describe('ShowMoreLines', () => {
 
   it.each([
     [new Set(), StreamingState.Idle, true], // No overflow
-    [new Set(['1']), StreamingState.Idle, false], // Not constraining height
-    [new Set(['1']), StreamingState.Responding, true], // Streaming
-  ])(
-    'renders nothing when: overflow=%s, streaming=%s, constrain=%s',
-    (overflowingIds, streamingState, constrainHeight) => {
-      mockUseOverflowState.mockReturnValue({ overflowingIds } as NonNullable<
-        ReturnType<typeof useOverflowState>
-      >);
-      mockUseStreamingContext.mockReturnValue(streamingState);
-      const { lastFrame } = render(
-        <ShowMoreLines constrainHeight={constrainHeight} />,
-      );
-      expect(lastFrame()).toBe('');
-    },
-  );
+    [new Set(["1"]), StreamingState.Idle, false], // Not constraining height
+    [new Set(["1"]), StreamingState.Responding, true], // Streaming
+  ])("renders nothing when: overflow=%s, streaming=%s, constrain=%s", (overflowingIds, streamingState, constrainHeight) => {
+    mockUseOverflowState.mockReturnValue({ overflowingIds } as NonNullable<
+      ReturnType<typeof useOverflowState>
+    >);
+    mockUseStreamingContext.mockReturnValue(streamingState);
+    const { lastFrame } = render(<ShowMoreLines constrainHeight={constrainHeight} />);
+    expect(lastFrame()).toBe("");
+  });
 
-  it.each([[StreamingState.Idle], [StreamingState.WaitingForConfirmation]])(
-    'renders message when overflowing and state is %s',
-    (streamingState) => {
-      mockUseOverflowState.mockReturnValue({
-        overflowingIds: new Set(['1']),
-      } as NonNullable<ReturnType<typeof useOverflowState>>);
-      mockUseStreamingContext.mockReturnValue(streamingState);
-      const { lastFrame } = render(<ShowMoreLines constrainHeight={true} />);
-      expect(lastFrame()).toContain('Press ctrl-s to show more lines');
-    },
-  );
+  it.each([
+    [StreamingState.Idle],
+    [StreamingState.WaitingForConfirmation],
+  ])("renders message when overflowing and state is %s", (streamingState) => {
+    mockUseOverflowState.mockReturnValue({
+      overflowingIds: new Set(["1"]),
+    } as NonNullable<ReturnType<typeof useOverflowState>>);
+    mockUseStreamingContext.mockReturnValue(streamingState);
+    const { lastFrame } = render(<ShowMoreLines constrainHeight={true} />);
+    expect(lastFrame()).toContain("Press ctrl-s to show more lines");
+  });
 });
diff --git a/packages/ui-gemini/src/ui/components/ShowMoreLines.tsx b/packages/ui-gemini/src/ui/components/ShowMoreLines.tsx
index 8823eee62..802f8352d 100644
--- a/packages/ui-gemini/src/ui/components/ShowMoreLines.tsx
+++ b/packages/ui-gemini/src/ui/components/ShowMoreLines.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { useOverflowState } from '../contexts/OverflowContext.js';
-import { useStreamingContext } from '../contexts/StreamingContext.js';
-import { StreamingState } from '../types.js';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import { useOverflowState } from "../contexts/OverflowContext.js";
+import { useStreamingContext } from "../contexts/StreamingContext.js";
+import { theme } from "../semantic-colors.js";
+import { StreamingState } from "../types.js";
 
 interface ShowMoreLinesProps {
   constrainHeight: boolean;
diff --git a/packages/ui-gemini/src/ui/components/StatsDisplay.test.tsx b/packages/ui-gemini/src/ui/components/StatsDisplay.test.tsx
index 1380108af..1666b2477 100644
--- a/packages/ui-gemini/src/ui/components/StatsDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/StatsDisplay.test.tsx
@@ -4,18 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { StatsDisplay } from './StatsDisplay.js';
-import * as SessionContext from '../contexts/SessionContext.js';
-import type { SessionMetrics } from '../contexts/SessionContext.js';
-import {
-  ToolCallDecision,
-  type RetrieveUserQuotaResponse,
-} from '@airiscode/gemini-cli-core';
+import { type RetrieveUserQuotaResponse, ToolCallDecision } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { SessionMetrics } from "../contexts/SessionContext.js";
+import * as SessionContext from "../contexts/SessionContext.js";
+import { StatsDisplay } from "./StatsDisplay.js";
 
 // Mock the context to provide controlled data for testing
-vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
+vi.mock("../contexts/SessionContext.js", async (importOriginal) => {
   const actual = await importOriginal<typeof SessionContext>();
   return {
     ...actual,
@@ -28,7 +25,7 @@ const useSessionStatsMock = vi.mocked(SessionContext.useSessionStats);
 const renderWithMockedStats = (metrics: SessionMetrics) => {
   useSessionStatsMock.mockReturnValue({
     stats: {
-      sessionId: 'test-session-id',
+      sessionId: "test-session-id",
       sessionStartTime: new Date(),
       metrics,
       lastPromptTokenCount: 0,
@@ -43,9 +40,7 @@ const renderWithMockedStats = (metrics: SessionMetrics) => {
 };
 
 // Helper to create metrics with default zero values
-const createTestMetrics = (
-  overrides: Partial<SessionMetrics> = {},
-): SessionMetrics => ({
+const createTestMetrics = (overrides: Partial<SessionMetrics> = {}): SessionMetrics => ({
   models: {},
   tools: {
     totalCalls: 0,
@@ -67,22 +62,22 @@ const createTestMetrics = (
   ...overrides,
 });
 
-describe('<StatsDisplay />', () => {
-  it('renders only the Performance section in its zero state', () => {
+describe("<StatsDisplay />", () => {
+  it("renders only the Performance section in its zero state", () => {
     const zeroMetrics = createTestMetrics();
 
     const { lastFrame } = renderWithMockedStats(zeroMetrics);
     const output = lastFrame();
 
-    expect(output).toContain('Performance');
-    expect(output).toContain('Interaction Summary');
+    expect(output).toContain("Performance");
+    expect(output).toContain("Interaction Summary");
     expect(output).toMatchSnapshot();
   });
 
-  it('renders a table with two models correctly', () => {
+  it("renders a table with two models correctly", () => {
     const metrics = createTestMetrics({
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: { totalRequests: 3, totalErrors: 0, totalLatencyMs: 15000 },
           tokens: {
             prompt: 1000,
@@ -93,7 +88,7 @@ describe('<StatsDisplay />', () => {
             tool: 50,
           },
         },
-        'gemini-2.5-flash': {
+        "gemini-2.5-flash": {
           api: { totalRequests: 5, totalErrors: 1, totalLatencyMs: 4500 },
           tokens: {
             prompt: 25000,
@@ -110,17 +105,17 @@ describe('<StatsDisplay />', () => {
     const { lastFrame } = renderWithMockedStats(metrics);
     const output = lastFrame();
 
-    expect(output).toContain('gemini-2.5-pro');
-    expect(output).toContain('gemini-2.5-flash');
-    expect(output).toContain('15,000');
-    expect(output).toContain('10,000');
+    expect(output).toContain("gemini-2.5-pro");
+    expect(output).toContain("gemini-2.5-flash");
+    expect(output).toContain("15,000");
+    expect(output).toContain("10,000");
     expect(output).toMatchSnapshot();
   });
 
-  it('renders all sections when all data is present', () => {
+  it("renders all sections when all data is present", () => {
     const metrics = createTestMetrics({
       models: {
-        'gemini-2.5-pro': {
+        "gemini-2.5-pro": {
           api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 100 },
           tokens: {
             prompt: 100,
@@ -144,7 +139,7 @@ describe('<StatsDisplay />', () => {
           [ToolCallDecision.AUTO_ACCEPT]: 0,
         },
         byName: {
-          'test-tool': {
+          "test-tool": {
             count: 2,
             success: 1,
             fail: 1,
@@ -163,15 +158,15 @@ describe('<StatsDisplay />', () => {
     const { lastFrame } = renderWithMockedStats(metrics);
     const output = lastFrame();
 
-    expect(output).toContain('Performance');
-    expect(output).toContain('Interaction Summary');
-    expect(output).toContain('User Agreement');
-    expect(output).toContain('gemini-2.5-pro');
+    expect(output).toContain("Performance");
+    expect(output).toContain("Interaction Summary");
+    expect(output).toContain("User Agreement");
+    expect(output).toContain("gemini-2.5-pro");
     expect(output).toMatchSnapshot();
   });
 
-  describe('Conditional Rendering Tests', () => {
-    it('hides User Agreement when no decisions are made', () => {
+  describe("Conditional Rendering Tests", () => {
+    it("hides User Agreement when no decisions are made", () => {
       const metrics = createTestMetrics({
         tools: {
           totalCalls: 2,
@@ -185,7 +180,7 @@ describe('<StatsDisplay />', () => {
             [ToolCallDecision.AUTO_ACCEPT]: 0,
           }, // No decisions
           byName: {
-            'test-tool': {
+            "test-tool": {
               count: 2,
               success: 1,
               fail: 1,
@@ -204,16 +199,16 @@ describe('<StatsDisplay />', () => {
       const { lastFrame } = renderWithMockedStats(metrics);
       const output = lastFrame();
 
-      expect(output).toContain('Interaction Summary');
-      expect(output).toContain('Success Rate');
-      expect(output).not.toContain('User Agreement');
+      expect(output).toContain("Interaction Summary");
+      expect(output).toContain("Success Rate");
+      expect(output).not.toContain("User Agreement");
       expect(output).toMatchSnapshot();
     });
 
-    it('hides Efficiency section when cache is not used', () => {
+    it("hides Efficiency section when cache is not used", () => {
       const metrics = createTestMetrics({
         models: {
-          'gemini-2.5-pro': {
+          "gemini-2.5-pro": {
             api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 100 },
             tokens: {
               prompt: 100,
@@ -234,8 +229,8 @@ describe('<StatsDisplay />', () => {
     });
   });
 
-  describe('Conditional Color Tests', () => {
-    it('renders success rate in green for high values', () => {
+  describe("Conditional Color Tests", () => {
+    it("renders success rate in green for high values", () => {
       const metrics = createTestMetrics({
         tools: {
           totalCalls: 10,
@@ -255,7 +250,7 @@ describe('<StatsDisplay />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders success rate in yellow for medium values', () => {
+    it("renders success rate in yellow for medium values", () => {
       const metrics = createTestMetrics({
         tools: {
           totalCalls: 10,
@@ -275,7 +270,7 @@ describe('<StatsDisplay />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders success rate in red for low values', () => {
+    it("renders success rate in red for low values", () => {
       const metrics = createTestMetrics({
         tools: {
           totalCalls: 10,
@@ -296,8 +291,8 @@ describe('<StatsDisplay />', () => {
     });
   });
 
-  describe('Code Changes Display', () => {
-    it('displays Code Changes when line counts are present', () => {
+  describe("Code Changes Display", () => {
+    it("displays Code Changes when line counts are present", () => {
       const metrics = createTestMetrics({
         tools: {
           totalCalls: 1,
@@ -321,13 +316,13 @@ describe('<StatsDisplay />', () => {
       const { lastFrame } = renderWithMockedStats(metrics);
       const output = lastFrame();
 
-      expect(output).toContain('Code Changes:');
-      expect(output).toContain('+42');
-      expect(output).toContain('-18');
+      expect(output).toContain("Code Changes:");
+      expect(output).toContain("+42");
+      expect(output).toContain("-18");
       expect(output).toMatchSnapshot();
     });
 
-    it('hides Code Changes when no lines are added or removed', () => {
+    it("hides Code Changes when no lines are added or removed", () => {
       const metrics = createTestMetrics({
         tools: {
           totalCalls: 1,
@@ -347,26 +342,26 @@ describe('<StatsDisplay />', () => {
       const { lastFrame } = renderWithMockedStats(metrics);
       const output = lastFrame();
 
-      expect(output).not.toContain('Code Changes:');
+      expect(output).not.toContain("Code Changes:");
       expect(output).toMatchSnapshot();
     });
   });
 
-  describe('Title Rendering', () => {
+  describe("Title Rendering", () => {
     const zeroMetrics = createTestMetrics();
 
-    it('renders the default title when no title prop is provided', () => {
+    it("renders the default title when no title prop is provided", () => {
       const { lastFrame } = renderWithMockedStats(zeroMetrics);
       const output = lastFrame();
-      expect(output).toContain('Session Stats');
-      expect(output).not.toContain('Agent powering down');
+      expect(output).toContain("Session Stats");
+      expect(output).not.toContain("Agent powering down");
       expect(output).toMatchSnapshot();
     });
 
-    it('renders the custom title when a title prop is provided', () => {
+    it("renders the custom title when a title prop is provided", () => {
       useSessionStatsMock.mockReturnValue({
         stats: {
-          sessionId: 'test-session-id',
+          sessionId: "test-session-id",
           sessionStartTime: new Date(),
           metrics: zeroMetrics,
           lastPromptTokenCount: 0,
@@ -381,21 +376,21 @@ describe('<StatsDisplay />', () => {
         <StatsDisplay duration="1s" title="Agent powering down. Goodbye!" />,
       );
       const output = lastFrame();
-      expect(output).toContain('Agent powering down. Goodbye!');
-      expect(output).not.toContain('Session Stats');
+      expect(output).toContain("Agent powering down. Goodbye!");
+      expect(output).not.toContain("Session Stats");
       expect(output).toMatchSnapshot();
     });
   });
 
-  describe('Quota Display', () => {
-    it('renders quota information when quotas are provided', () => {
-      const now = new Date('2025-01-01T12:00:00Z');
+  describe("Quota Display", () => {
+    it("renders quota information when quotas are provided", () => {
+      const now = new Date("2025-01-01T12:00:00Z");
       vi.useFakeTimers();
       vi.setSystemTime(now);
 
       const metrics = createTestMetrics({
         models: {
-          'gemini-2.5-pro': {
+          "gemini-2.5-pro": {
             api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 100 },
             tokens: {
               prompt: 100,
@@ -414,7 +409,7 @@ describe('<StatsDisplay />', () => {
       const quotas: RetrieveUserQuotaResponse = {
         buckets: [
           {
-            modelId: 'gemini-2.5-pro',
+            modelId: "gemini-2.5-pro",
             remainingFraction: 0.75,
             resetTime,
           },
@@ -423,7 +418,7 @@ describe('<StatsDisplay />', () => {
 
       useSessionStatsMock.mockReturnValue({
         stats: {
-          sessionId: 'test-session-id',
+          sessionId: "test-session-id",
           sessionStartTime: new Date(),
           metrics,
           lastPromptTokenCount: 0,
@@ -434,21 +429,19 @@ describe('<StatsDisplay />', () => {
         startNewPrompt: vi.fn(),
       });
 
-      const { lastFrame } = render(
-        <StatsDisplay duration="1s" quotas={quotas} />,
-      );
+      const { lastFrame } = render(<StatsDisplay duration="1s" quotas={quotas} />);
       const output = lastFrame();
 
-      expect(output).toContain('Usage left');
-      expect(output).toContain('75.0%');
-      expect(output).toContain('(Resets in 1h 30m)');
+      expect(output).toContain("Usage left");
+      expect(output).toContain("75.0%");
+      expect(output).toContain("(Resets in 1h 30m)");
       expect(output).toMatchSnapshot();
 
       vi.useRealTimers();
     });
 
-    it('renders quota information for unused models', () => {
-      const now = new Date('2025-01-01T12:00:00Z');
+    it("renders quota information for unused models", () => {
+      const now = new Date("2025-01-01T12:00:00Z");
       vi.useFakeTimers();
       vi.setSystemTime(now);
 
@@ -460,7 +453,7 @@ describe('<StatsDisplay />', () => {
       const quotas: RetrieveUserQuotaResponse = {
         buckets: [
           {
-            modelId: 'gemini-2.5-flash',
+            modelId: "gemini-2.5-flash",
             remainingFraction: 0.5,
             resetTime,
           },
@@ -469,7 +462,7 @@ describe('<StatsDisplay />', () => {
 
       useSessionStatsMock.mockReturnValue({
         stats: {
-          sessionId: 'test-session-id',
+          sessionId: "test-session-id",
           sessionStartTime: new Date(),
           metrics,
           lastPromptTokenCount: 0,
@@ -479,15 +472,13 @@ describe('<StatsDisplay />', () => {
         startNewPrompt: vi.fn(),
       });
 
-      const { lastFrame } = render(
-        <StatsDisplay duration="1s" quotas={quotas} />,
-      );
+      const { lastFrame } = render(<StatsDisplay duration="1s" quotas={quotas} />);
       const output = lastFrame();
 
-      expect(output).toContain('gemini-2.5-flash');
-      expect(output).toContain('-'); // for requests
-      expect(output).toContain('50.0%');
-      expect(output).toContain('(Resets in 2h)');
+      expect(output).toContain("gemini-2.5-flash");
+      expect(output).toContain("-"); // for requests
+      expect(output).toContain("50.0%");
+      expect(output).toContain("(Resets in 2h)");
       expect(output).toMatchSnapshot();
 
       vi.useRealTimers();
diff --git a/packages/ui-gemini/src/ui/components/StatsDisplay.tsx b/packages/ui-gemini/src/ui/components/StatsDisplay.tsx
index dc0f675c9..5be82b0be 100644
--- a/packages/ui-gemini/src/ui/components/StatsDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/StatsDisplay.tsx
@@ -4,27 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { ThemedGradient } from './ThemedGradient.js';
-import { theme } from '../semantic-colors.js';
-import { formatDuration } from '../utils/formatters.js';
-import type { ModelMetrics } from '../contexts/SessionContext.js';
-import { useSessionStats } from '../contexts/SessionContext.js';
+import { type RetrieveUserQuotaResponse, VALID_GEMINI_MODELS } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import type { ModelMetrics } from "../contexts/SessionContext.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { theme } from "../semantic-colors.js";
+import { computeSessionStats } from "../utils/computeStats.js";
 import {
+  CACHE_EFFICIENCY_HIGH,
+  CACHE_EFFICIENCY_MEDIUM,
   getStatusColor,
   TOOL_SUCCESS_RATE_HIGH,
   TOOL_SUCCESS_RATE_MEDIUM,
   USER_AGREEMENT_RATE_HIGH,
   USER_AGREEMENT_RATE_MEDIUM,
-  CACHE_EFFICIENCY_HIGH,
-  CACHE_EFFICIENCY_MEDIUM,
-} from '../utils/displayUtils.js';
-import { computeSessionStats } from '../utils/computeStats.js';
-import {
-  type RetrieveUserQuotaResponse,
-  VALID_GEMINI_MODELS,
-} from '@airiscode/gemini-cli-core';
+} from "../utils/displayUtils.js";
+import { formatDuration } from "../utils/formatters.js";
+import { ThemedGradient } from "./ThemedGradient.js";
 
 // A more flexible and powerful StatRow component
 interface StatRowProps {
@@ -78,7 +75,7 @@ const buildModelRows = (
   models: Record<string, ModelMetrics>,
   quotas?: RetrieveUserQuotaResponse,
 ) => {
-  const getBaseModelName = (name: string) => name.replace('-001', '');
+  const getBaseModelName = (name: string) => name.replace("-001", "");
   const usedModelNames = new Set(Object.keys(models).map(getBaseModelName));
 
   // 1. Models with active usage
@@ -104,19 +101,16 @@ const buildModelRows = (
   const quotaRows =
     quotas?.buckets
       ?.filter(
-        (b) =>
-          b.modelId &&
-          VALID_GEMINI_MODELS.has(b.modelId) &&
-          !usedModelNames.has(b.modelId),
+        (b) => b.modelId && VALID_GEMINI_MODELS.has(b.modelId) && !usedModelNames.has(b.modelId),
       )
       .map((bucket) => ({
         key: bucket.modelId!,
         modelName: bucket.modelId!,
-        requests: '-',
-        cachedTokens: '-',
-        uncachedTokens: '-',
-        totalInputTokens: '-',
-        outputTokens: '-',
+        requests: "-",
+        cachedTokens: "-",
+        uncachedTokens: "-",
+        totalInputTokens: "-",
+        outputTokens: "-",
         bucket,
         isActive: false,
       })) || [];
@@ -126,26 +120,26 @@ const buildModelRows = (
 
 const formatResetTime = (resetTime: string): string => {
   const diff = new Date(resetTime).getTime() - Date.now();
-  if (diff <= 0) return '';
+  if (diff <= 0) return "";
 
   const totalMinutes = Math.ceil(diff / (1000 * 60));
   const hours = Math.floor(totalMinutes / 60);
   const minutes = totalMinutes % 60;
 
-  const fmt = (val: number, unit: 'hour' | 'minute') =>
-    new Intl.NumberFormat('en', {
-      style: 'unit',
+  const fmt = (val: number, unit: "hour" | "minute") =>
+    new Intl.NumberFormat("en", {
+      style: "unit",
       unit,
-      unitDisplay: 'narrow',
+      unitDisplay: "narrow",
     }).format(val);
 
   if (hours > 0 && minutes > 0) {
-    return `(Resets in ${fmt(hours, 'hour')} ${fmt(minutes, 'minute')})`;
+    return `(Resets in ${fmt(hours, "hour")} ${fmt(minutes, "minute")})`;
   } else if (hours > 0) {
-    return `(Resets in ${fmt(hours, 'hour')})`;
+    return `(Resets in ${fmt(hours, "hour")})`;
   }
 
-  return `(Resets in ${fmt(minutes, 'minute')})`;
+  return `(Resets in ${fmt(minutes, "minute")})`;
 };
 
 const ModelUsageTable: React.FC<{
@@ -183,34 +177,19 @@ const ModelUsageTable: React.FC<{
             Model Usage
           </Text>
         </Box>
-        <Box
-          width={requestsWidth}
-          flexDirection="column"
-          alignItems="flex-end"
-          flexShrink={0}
-        >
+        <Box width={requestsWidth} flexDirection="column" alignItems="flex-end" flexShrink={0}>
           <Text bold color={theme.text.primary}>
             Reqs
           </Text>
         </Box>
         {!showQuotaColumn && (
           <>
-            <Box
-              width={uncachedWidth}
-              flexDirection="column"
-              alignItems="flex-end"
-              flexShrink={0}
-            >
+            <Box width={uncachedWidth} flexDirection="column" alignItems="flex-end" flexShrink={0}>
               <Text bold color={theme.text.primary}>
                 Input Tokens
               </Text>
             </Box>
-            <Box
-              width={cachedWidth}
-              flexDirection="column"
-              alignItems="flex-end"
-              flexShrink={0}
-            >
+            <Box width={cachedWidth} flexDirection="column" alignItems="flex-end" flexShrink={0}>
               <Text bold color={theme.text.primary}>
                 Cache Reads
               </Text>
@@ -228,11 +207,7 @@ const ModelUsageTable: React.FC<{
           </>
         )}
         {showQuotaColumn && (
-          <Box
-            width={usageLimitWidth}
-            flexDirection="column"
-            alignItems="flex-end"
-          >
+          <Box width={usageLimitWidth} flexDirection="column" alignItems="flex-end">
             <Text bold color={theme.text.primary}>
               Usage left
             </Text>
@@ -258,15 +233,8 @@ const ModelUsageTable: React.FC<{
               {row.modelName}
             </Text>
           </Box>
-          <Box
-            width={requestsWidth}
-            flexDirection="column"
-            alignItems="flex-end"
-            flexShrink={0}
-          >
-            <Text
-              color={row.isActive ? theme.text.primary : theme.text.secondary}
-            >
+          <Box width={requestsWidth} flexDirection="column" alignItems="flex-end" flexShrink={0}>
+            <Text color={row.isActive ? theme.text.primary : theme.text.secondary}>
               {row.requests}
             </Text>
           </Box>
@@ -278,20 +246,11 @@ const ModelUsageTable: React.FC<{
                 alignItems="flex-end"
                 flexShrink={0}
               >
-                <Text
-                  color={
-                    row.isActive ? theme.text.primary : theme.text.secondary
-                  }
-                >
+                <Text color={row.isActive ? theme.text.primary : theme.text.secondary}>
                   {row.uncachedTokens}
                 </Text>
               </Box>
-              <Box
-                width={cachedWidth}
-                flexDirection="column"
-                alignItems="flex-end"
-                flexShrink={0}
-              >
+              <Box width={cachedWidth} flexDirection="column" alignItems="flex-end" flexShrink={0}>
                 <Text color={theme.text.secondary}>{row.cachedTokens}</Text>
               </Box>
               <Box
@@ -300,29 +259,19 @@ const ModelUsageTable: React.FC<{
                 alignItems="flex-end"
                 flexShrink={0}
               >
-                <Text
-                  color={
-                    row.isActive ? theme.text.primary : theme.text.secondary
-                  }
-                >
+                <Text color={row.isActive ? theme.text.primary : theme.text.secondary}>
                   {row.outputTokens}
                 </Text>
               </Box>
             </>
           )}
-          <Box
-            width={usageLimitWidth}
-            flexDirection="column"
-            alignItems="flex-end"
-          >
-            {row.bucket &&
-              row.bucket.remainingFraction != null &&
-              row.bucket.resetTime && (
-                <Text color={theme.text.secondary} wrap="truncate-end">
-                  {(row.bucket.remainingFraction * 100).toFixed(1)}%{' '}
-                  {formatResetTime(row.bucket.resetTime)}
-                </Text>
-              )}
+          <Box width={usageLimitWidth} flexDirection="column" alignItems="flex-end">
+            {row.bucket && row.bucket.remainingFraction != null && row.bucket.resetTime && (
+              <Text color={theme.text.secondary} wrap="truncate-end">
+                {(row.bucket.remainingFraction * 100).toFixed(1)}%{" "}
+                {formatResetTime(row.bucket.resetTime)}
+              </Text>
+            )}
           </Box>
         </Box>
       ))}
@@ -330,12 +279,10 @@ const ModelUsageTable: React.FC<{
       {cacheEfficiency > 0 && !showQuotaColumn && (
         <Box flexDirection="column" marginTop={1}>
           <Text color={theme.text.primary}>
-            <Text color={theme.status.success}>Savings Highlight:</Text>{' '}
+            <Text color={theme.status.success}>Savings Highlight:</Text>{" "}
             {totalCachedTokens.toLocaleString()} (
-            <Text color={cacheEfficiencyColor}>
-              {cacheEfficiency.toFixed(1)}%
-            </Text>
-            ) of input tokens were served from the cache, reducing costs.
+            <Text color={cacheEfficiencyColor}>{cacheEfficiency.toFixed(1)}%</Text>) of input tokens
+            were served from the cache, reducing costs.
           </Text>
         </Box>
       )}
@@ -362,11 +309,7 @@ interface StatsDisplayProps {
   quotas?: RetrieveUserQuotaResponse;
 }
 
-export const StatsDisplay: React.FC<StatsDisplayProps> = ({
-  duration,
-  title,
-  quotas,
-}) => {
+export const StatsDisplay: React.FC<StatsDisplayProps> = ({ duration, title, quotas }) => {
   const { stats } = useSessionStats();
   const { metrics } = stats;
   const { models, tools, files } = metrics;
@@ -381,10 +324,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
     yellow: USER_AGREEMENT_RATE_MEDIUM,
   };
   const successColor = getStatusColor(computed.successRate, successThresholds);
-  const agreementColor = getStatusColor(
-    computed.agreementRate,
-    agreementThresholds,
-  );
+  const agreementColor = getStatusColor(computed.agreementRate, agreementThresholds);
 
   const renderTitle = () => {
     if (title) {
@@ -415,8 +355,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
         </StatRow>
         <StatRow title="Tool Calls:">
           <Text color={theme.text.primary}>
-            {tools.totalCalls} ({' '}
-            <Text color={theme.status.success}>✓ {tools.totalSuccess}</Text>{' '}
+            {tools.totalCalls} ( <Text color={theme.status.success}>✓ {tools.totalSuccess}</Text>{" "}
             <Text color={theme.status.error}>x {tools.totalFail}</Text> )
           </Text>
         </StatRow>
@@ -426,26 +365,19 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
         {computed.totalDecisions > 0 && (
           <StatRow title="User Agreement:">
             <Text color={agreementColor}>
-              {computed.agreementRate.toFixed(1)}%{' '}
-              <Text color={theme.text.secondary}>
-                ({computed.totalDecisions} reviewed)
-              </Text>
+              {computed.agreementRate.toFixed(1)}%{" "}
+              <Text color={theme.text.secondary}>({computed.totalDecisions} reviewed)</Text>
+            </Text>
+          </StatRow>
+        )}
+        {files && (files.totalLinesAdded > 0 || files.totalLinesRemoved > 0) && (
+          <StatRow title="Code Changes:">
+            <Text color={theme.text.primary}>
+              <Text color={theme.status.success}>+{files.totalLinesAdded}</Text>{" "}
+              <Text color={theme.status.error}>-{files.totalLinesRemoved}</Text>
             </Text>
           </StatRow>
         )}
-        {files &&
-          (files.totalLinesAdded > 0 || files.totalLinesRemoved > 0) && (
-            <StatRow title="Code Changes:">
-              <Text color={theme.text.primary}>
-                <Text color={theme.status.success}>
-                  +{files.totalLinesAdded}
-                </Text>{' '}
-                <Text color={theme.status.error}>
-                  -{files.totalLinesRemoved}
-                </Text>
-              </Text>
-            </StatRow>
-          )}
       </Section>
 
       <Section title="Performance">
@@ -453,24 +385,18 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
           <Text color={theme.text.primary}>{duration}</Text>
         </StatRow>
         <StatRow title="Agent Active:">
-          <Text color={theme.text.primary}>
-            {formatDuration(computed.agentActiveTime)}
-          </Text>
+          <Text color={theme.text.primary}>{formatDuration(computed.agentActiveTime)}</Text>
         </StatRow>
         <SubStatRow title="API Time:">
           <Text color={theme.text.primary}>
-            {formatDuration(computed.totalApiTime)}{' '}
-            <Text color={theme.text.secondary}>
-              ({computed.apiTimePercent.toFixed(1)}%)
-            </Text>
+            {formatDuration(computed.totalApiTime)}{" "}
+            <Text color={theme.text.secondary}>({computed.apiTimePercent.toFixed(1)}%)</Text>
           </Text>
         </SubStatRow>
         <SubStatRow title="Tool Time:">
           <Text color={theme.text.primary}>
-            {formatDuration(computed.totalToolTime)}{' '}
-            <Text color={theme.text.secondary}>
-              ({computed.toolTimePercent.toFixed(1)}%)
-            </Text>
+            {formatDuration(computed.totalToolTime)}{" "}
+            <Text color={theme.text.secondary}>({computed.toolTimePercent.toFixed(1)}%)</Text>
           </Text>
         </SubStatRow>
       </Section>
diff --git a/packages/ui-gemini/src/ui/components/StickyHeader.test.tsx b/packages/ui-gemini/src/ui/components/StickyHeader.test.tsx
index f217c00ba..582ebb168 100644
--- a/packages/ui-gemini/src/ui/components/StickyHeader.test.tsx
+++ b/packages/ui-gemini/src/ui/components/StickyHeader.test.tsx
@@ -4,23 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Text } from 'ink';
-import { describe, it, expect } from 'vitest';
-import { StickyHeader } from './StickyHeader.js';
-import { renderWithProviders } from '../../test-utils/render.js';
+import { Text } from "ink";
+import { describe, expect, it } from "vitest";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { StickyHeader } from "./StickyHeader.js";
 
-describe('StickyHeader', () => {
-  it.each([true, false])('renders children with isFirst=%s', (isFirst) => {
+describe("StickyHeader", () => {
+  it.each([true, false])("renders children with isFirst=%s", (isFirst) => {
     const { lastFrame } = renderWithProviders(
-      <StickyHeader
-        isFirst={isFirst}
-        width={80}
-        borderColor="green"
-        borderDimColor={false}
-      >
+      <StickyHeader isFirst={isFirst} width={80} borderColor="green" borderDimColor={false}>
         <Text>Hello Sticky</Text>
       </StickyHeader>,
     );
-    expect(lastFrame()).toContain('Hello Sticky');
+    expect(lastFrame()).toContain("Hello Sticky");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/StickyHeader.tsx b/packages/ui-gemini/src/ui/components/StickyHeader.tsx
index 58608ce1c..9da73631f 100644
--- a/packages/ui-gemini/src/ui/components/StickyHeader.tsx
+++ b/packages/ui-gemini/src/ui/components/StickyHeader.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Box } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 export interface StickyHeaderProps {
   children: React.ReactNode;
diff --git a/packages/ui-gemini/src/ui/components/SuggestionsDisplay.test.tsx b/packages/ui-gemini/src/ui/components/SuggestionsDisplay.test.tsx
index 6931268a3..c2ac22d09 100644
--- a/packages/ui-gemini/src/ui/components/SuggestionsDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/SuggestionsDisplay.test.tsx
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { SuggestionsDisplay } from './SuggestionsDisplay.js';
-import { describe, it, expect } from 'vitest';
-import { CommandKind } from '../commands/types.js';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { CommandKind } from "../commands/types.js";
+import { SuggestionsDisplay } from "./SuggestionsDisplay.js";
 
-describe('SuggestionsDisplay', () => {
+describe("SuggestionsDisplay", () => {
   const mockSuggestions = [
-    { label: 'Command 1', value: 'command1', description: 'Description 1' },
-    { label: 'Command 2', value: 'command2', description: 'Description 2' },
-    { label: 'Command 3', value: 'command3', description: 'Description 3' },
+    { label: "Command 1", value: "command1", description: "Description 1" },
+    { label: "Command 2", value: "command2", description: "Description 2" },
+    { label: "Command 3", value: "command3", description: "Description 3" },
   ];
 
-  it('renders loading state', () => {
+  it("renders loading state", () => {
     const { lastFrame } = render(
       <SuggestionsDisplay
         suggestions={[]}
@@ -31,7 +31,7 @@ describe('SuggestionsDisplay', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders nothing when empty and not loading', () => {
+  it("renders nothing when empty and not loading", () => {
     const { lastFrame } = render(
       <SuggestionsDisplay
         suggestions={[]}
@@ -43,10 +43,10 @@ describe('SuggestionsDisplay', () => {
         mode="reverse"
       />,
     );
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('renders suggestions list', () => {
+  it("renders suggestions list", () => {
     const { lastFrame } = render(
       <SuggestionsDisplay
         suggestions={mockSuggestions}
@@ -61,7 +61,7 @@ describe('SuggestionsDisplay', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('highlights active item', () => {
+  it("highlights active item", () => {
     // This test relies on visual inspection or implementation details (colors)
     // For now, we just ensure it renders without error and contains the item
     const { lastFrame } = render(
@@ -78,7 +78,7 @@ describe('SuggestionsDisplay', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('handles scrolling', () => {
+  it("handles scrolling", () => {
     const manySuggestions = Array.from({ length: 20 }, (_, i) => ({
       label: `Cmd ${i}`,
       value: `Cmd ${i}`,
@@ -99,11 +99,11 @@ describe('SuggestionsDisplay', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders MCP tag for MCP prompts', () => {
+  it("renders MCP tag for MCP prompts", () => {
     const mcpSuggestions = [
       {
-        label: 'MCP Tool',
-        value: 'mcp-tool',
+        label: "MCP Tool",
+        value: "mcp-tool",
         commandKind: CommandKind.MCP_PROMPT,
       },
     ];
diff --git a/packages/ui-gemini/src/ui/components/SuggestionsDisplay.tsx b/packages/ui-gemini/src/ui/components/SuggestionsDisplay.tsx
index 1a8c7cab8..40d3923ef 100644
--- a/packages/ui-gemini/src/ui/components/SuggestionsDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/SuggestionsDisplay.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { PrepareLabel, MAX_WIDTH } from './PrepareLabel.js';
-import { CommandKind } from '../commands/types.js';
-import { Colors } from '../colors.js';
+import { Box, Text } from "ink";
+import { Colors } from "../colors.js";
+import { CommandKind } from "../commands/types.js";
+import { theme } from "../semantic-colors.js";
+import { MAX_WIDTH, PrepareLabel } from "./PrepareLabel.js";
 export interface Suggestion {
   label: string;
   value: string;
@@ -23,7 +23,7 @@ interface SuggestionsDisplayProps {
   width: number;
   scrollOffset: number;
   userInput: string;
-  mode: 'reverse' | 'slash';
+  mode: "reverse" | "slash";
   expandedIndex?: number;
 }
 
@@ -54,20 +54,15 @@ export function SuggestionsDisplay({
 
   // Calculate the visible slice based on scrollOffset
   const startIndex = scrollOffset;
-  const endIndex = Math.min(
-    scrollOffset + MAX_SUGGESTIONS_TO_SHOW,
-    suggestions.length,
-  );
+  const endIndex = Math.min(scrollOffset + MAX_SUGGESTIONS_TO_SHOW, suggestions.length);
   const visibleSuggestions = suggestions.slice(startIndex, endIndex);
 
   const getFullLabel = (s: Suggestion) =>
-    s.label + (s.commandKind === CommandKind.MCP_PROMPT ? ' [MCP]' : '');
+    s.label + (s.commandKind === CommandKind.MCP_PROMPT ? " [MCP]" : "");
 
-  const maxLabelLength = Math.max(
-    ...suggestions.map((s) => getFullLabel(s).length),
-  );
+  const maxLabelLength = Math.max(...suggestions.map((s) => getFullLabel(s).length));
   const commandColumnWidth =
-    mode === 'slash' ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
+    mode === "slash" ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
 
   return (
     <Box flexDirection="column" paddingX={1} width={width}>
@@ -92,7 +87,7 @@ export function SuggestionsDisplay({
         return (
           <Box key={`${suggestion.value}-${originalIndex}`} flexDirection="row">
             <Box
-              {...(mode === 'slash'
+              {...(mode === "slash"
                 ? { width: commandColumnWidth, flexShrink: 0 as const }
                 : { flexShrink: 1 as const })}
             >
@@ -113,7 +108,7 @@ export function SuggestionsDisplay({
             )}
             {isActive && isLong && (
               <Box width={3} flexShrink={0}>
-                <Text color={Colors.Gray}>{isExpanded ? ' ← ' : ' → '}</Text>
+                <Text color={Colors.Gray}>{isExpanded ? " ← " : " → "}</Text>
               </Box>
             )}
           </Box>
diff --git a/packages/ui-gemini/src/ui/components/ThemeDialog.test.tsx b/packages/ui-gemini/src/ui/components/ThemeDialog.test.tsx
index 46b514c05..ab6a1c150 100644
--- a/packages/ui-gemini/src/ui/components/ThemeDialog.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ThemeDialog.test.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { ThemeDialog } from './ThemeDialog.js';
-import { LoadedSettings } from '../../config/settings.js';
-import { DEFAULT_THEME, themeManager } from '../themes/theme-manager.js';
-import { act } from 'react';
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { LoadedSettings } from "../../config/settings.js";
+import { waitFor } from "../../test-utils/async.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { DEFAULT_THEME, themeManager } from "../themes/theme-manager.js";
+import { ThemeDialog } from "./ThemeDialog.js";
 
 const createMockSettings = (
   userSettings = {},
@@ -21,12 +21,12 @@ const createMockSettings = (
     {
       settings: { ui: { customThemes: {} }, ...systemSettings },
       originalSettings: { ui: { customThemes: {} }, ...systemSettings },
-      path: '/system/settings.json',
+      path: "/system/settings.json",
     },
     {
       settings: {},
       originalSettings: {},
-      path: '/system/system-defaults.json',
+      path: "/system/system-defaults.json",
     },
     {
       settings: {
@@ -37,7 +37,7 @@ const createMockSettings = (
         ui: { customThemes: {} },
         ...userSettings,
       },
-      path: '/user/settings.json',
+      path: "/user/settings.json",
     },
     {
       settings: {
@@ -48,13 +48,13 @@ const createMockSettings = (
         ui: { customThemes: {} },
         ...workspaceSettings,
       },
-      path: '/workspace/settings.json',
+      path: "/workspace/settings.json",
     },
     true,
     new Set(),
   );
 
-describe('ThemeDialog Snapshots', () => {
+describe("ThemeDialog Snapshots", () => {
   const baseProps = {
     onSelect: vi.fn(),
     onCancel: vi.fn(),
@@ -72,17 +72,16 @@ describe('ThemeDialog Snapshots', () => {
     vi.restoreAllMocks();
   });
 
-  it('should render correctly in theme selection mode', () => {
+  it("should render correctly in theme selection mode", () => {
     const settings = createMockSettings();
-    const { lastFrame } = renderWithProviders(
-      <ThemeDialog {...baseProps} settings={settings} />,
-      { settings },
-    );
+    const { lastFrame } = renderWithProviders(<ThemeDialog {...baseProps} settings={settings} />, {
+      settings,
+    });
 
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should render correctly in scope selector mode', async () => {
+  it("should render correctly in scope selector mode", async () => {
     const settings = createMockSettings();
     const { lastFrame, stdin } = renderWithProviders(
       <ThemeDialog {...baseProps} settings={settings} />,
@@ -91,7 +90,7 @@ describe('ThemeDialog Snapshots', () => {
 
     // Press Tab to switch to scope selector mode
     act(() => {
-      stdin.write('\t');
+      stdin.write("\t");
     });
 
     // Need to wait for the state update to propagate
@@ -100,20 +99,16 @@ describe('ThemeDialog Snapshots', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should call onCancel when ESC is pressed', async () => {
+  it("should call onCancel when ESC is pressed", async () => {
     const mockOnCancel = vi.fn();
     const settings = createMockSettings();
     const { stdin } = renderWithProviders(
-      <ThemeDialog
-        {...baseProps}
-        onCancel={mockOnCancel}
-        settings={settings}
-      />,
+      <ThemeDialog {...baseProps} onCancel={mockOnCancel} settings={settings} />,
       { settings },
     );
 
     act(() => {
-      stdin.write('\x1b');
+      stdin.write("\x1b");
     });
 
     await waitFor(() => {
@@ -121,20 +116,17 @@ describe('ThemeDialog Snapshots', () => {
     });
   });
 
-  it('should call refreshStatic when a theme is selected', async () => {
+  it("should call refreshStatic when a theme is selected", async () => {
     const mockRefreshStatic = vi.fn();
     const settings = createMockSettings();
-    const { stdin } = renderWithProviders(
-      <ThemeDialog {...baseProps} settings={settings} />,
-      {
-        settings,
-        uiActions: { refreshStatic: mockRefreshStatic },
-      },
-    );
+    const { stdin } = renderWithProviders(<ThemeDialog {...baseProps} settings={settings} />, {
+      settings,
+      uiActions: { refreshStatic: mockRefreshStatic },
+    });
 
     // Press Enter to select the theme
     act(() => {
-      stdin.write('\r');
+      stdin.write("\r");
     });
 
     await waitFor(() => {
diff --git a/packages/ui-gemini/src/ui/components/ThemeDialog.tsx b/packages/ui-gemini/src/ui/components/ThemeDialog.tsx
index 514873f64..6c7740587 100644
--- a/packages/ui-gemini/src/ui/components/ThemeDialog.tsx
+++ b/packages/ui-gemini/src/ui/components/ThemeDialog.tsx
@@ -4,24 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback, useState } from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { themeManager, DEFAULT_THEME } from '../themes/theme-manager.js';
-import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
-import { DiffRenderer } from './messages/DiffRenderer.js';
-import { colorizeCode } from '../utils/CodeColorizer.js';
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-} from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import { getScopeMessageForSetting } from '../../utils/dialogScopeUtils.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
-import { ScopeSelector } from './shared/ScopeSelector.js';
-import { useUIActions } from '../contexts/UIActionsContext.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback, useState } from "react";
+import type { LoadableSettingScope, LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { getScopeMessageForSetting } from "../../utils/dialogScopeUtils.js";
+import { useUIActions } from "../contexts/UIActionsContext.js";
+import { useAlternateBuffer } from "../hooks/useAlternateBuffer.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
+import { DEFAULT_THEME, themeManager } from "../themes/theme-manager.js";
+import { colorizeCode } from "../utils/CodeColorizer.js";
+import { DiffRenderer } from "./messages/DiffRenderer.js";
+import { RadioButtonSelect } from "./shared/RadioButtonSelect.js";
+import { ScopeSelector } from "./shared/ScopeSelector.js";
 
 interface ThemeDialogProps {
   /** Callback function when a theme is selected */
@@ -48,9 +45,7 @@ export function ThemeDialog({
 }: ThemeDialogProps): React.JSX.Element {
   const isAlternateBuffer = useAlternateBuffer();
   const { refreshStatic } = useUIActions();
-  const [selectedScope, setSelectedScope] = useState<LoadableSettingScope>(
-    SettingScope.User,
-  );
+  const [selectedScope, setSelectedScope] = useState<LoadableSettingScope>(SettingScope.User);
 
   // Track the currently highlighted theme name
   const [highlightedThemeName, setHighlightedThemeName] = useState<string>(
@@ -64,7 +59,7 @@ export function ThemeDialog({
       : settings.merged.ui?.customThemes || {};
   const builtInThemes = themeManager
     .getAvailableThemes()
-    .filter((theme) => theme.type !== 'custom');
+    .filter((theme) => theme.type !== "custom");
   const customThemeNames = Object.keys(customThemes);
   const capitalize = (s: string) => s.charAt(0).toUpperCase() + s.slice(1);
   // Generate theme items
@@ -80,15 +75,13 @@ export function ThemeDialog({
       label: name,
       value: name,
       themeNameDisplay: name,
-      themeTypeDisplay: 'Custom',
+      themeTypeDisplay: "Custom",
       key: name,
     })),
   ];
 
   // Find the index of the selected theme, but only if it exists in the list
-  const initialThemeIndex = themeItems.findIndex(
-    (item) => item.value === highlightedThemeName,
-  );
+  const initialThemeIndex = themeItems.findIndex((item) => item.value === highlightedThemeName);
   // If not found, fall back to the first theme
   const safeInitialThemeIndex = initialThemeIndex >= 0 ? initialThemeIndex : 0;
 
@@ -117,14 +110,14 @@ export function ThemeDialog({
     [onSelect, highlightedThemeName, refreshStatic],
   );
 
-  const [mode, setMode] = useState<'theme' | 'scope'>('theme');
+  const [mode, setMode] = useState<"theme" | "scope">("theme");
 
   useKeypress(
     (key) => {
-      if (key.name === 'tab') {
-        setMode((prev) => (prev === 'theme' ? 'scope' : 'theme'));
+      if (key.name === "tab") {
+        setMode((prev) => (prev === "theme" ? "scope" : "theme"));
       }
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onCancel();
       }
     },
@@ -132,11 +125,7 @@ export function ThemeDialog({
   );
 
   // Generate scope message for theme setting
-  const otherScopeModifiedMessage = getScopeMessageForSetting(
-    'ui.theme',
-    selectedScope,
-    settings,
-  );
+  const otherScopeModifiedMessage = getScopeMessageForSetting("ui.theme", selectedScope, settings);
 
   // Constants for calculating preview pane layout.
   // These values are based on the JSX structure below.
@@ -177,20 +166,12 @@ export function ThemeDialog({
   const PREVIEW_PANE_FIXED_VERTICAL_SPACE = 8;
 
   // The right column doesn't need to ever be shorter than the left column.
-  availableTerminalHeight = Math.max(
-    availableTerminalHeight,
-    totalLeftHandSideHeight,
-  );
+  availableTerminalHeight = Math.max(availableTerminalHeight, totalLeftHandSideHeight);
   const availableTerminalHeightCodeBlock =
-    availableTerminalHeight -
-    PREVIEW_PANE_FIXED_VERTICAL_SPACE -
-    (includePadding ? 2 : 0) * 2;
+    availableTerminalHeight - PREVIEW_PANE_FIXED_VERTICAL_SPACE - (includePadding ? 2 : 0) * 2;
 
   // Subtract margin between code blocks from available height.
-  const availableHeightForPanes = Math.max(
-    0,
-    availableTerminalHeightCodeBlock - 1,
-  );
+  const availableHeightForPanes = Math.max(0, availableTerminalHeightCodeBlock - 1);
 
   // The code block is slightly longer than the diff, so give it more space.
   const codeBlockHeight = Math.ceil(availableHeightForPanes * 0.6);
@@ -206,25 +187,23 @@ export function ThemeDialog({
       paddingRight={1}
       width="100%"
     >
-      {mode === 'theme' ? (
+      {mode === "theme" ? (
         <Box flexDirection="row">
           {/* Left Column: Selection */}
           <Box flexDirection="column" width="45%" paddingRight={2}>
-            <Text bold={mode === 'theme'} wrap="truncate">
-              {mode === 'theme' ? '> ' : '  '}Select Theme{' '}
-              <Text color={theme.text.secondary}>
-                {otherScopeModifiedMessage}
-              </Text>
+            <Text bold={mode === "theme"} wrap="truncate">
+              {mode === "theme" ? "> " : "  "}Select Theme{" "}
+              <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
             </Text>
             <RadioButtonSelect
               items={themeItems}
               initialIndex={safeInitialThemeIndex}
               onSelect={handleThemeSelect}
               onHighlight={handleThemeHighlight}
-              isFocused={mode === 'theme'}
+              isFocused={mode === "theme"}
               maxItemsToShow={12}
               showScrollArrows={true}
-              showNumbers={mode === 'theme'}
+              showNumbers={mode === "theme"}
             />
           </Box>
 
@@ -236,9 +215,7 @@ export function ThemeDialog({
             {/* Get the Theme object for the highlighted theme, fall back to default if not found */}
             {(() => {
               const previewTheme =
-                themeManager.getTheme(
-                  highlightedThemeName || DEFAULT_THEME.name,
-                ) || DEFAULT_THEME;
+                themeManager.getTheme(highlightedThemeName || DEFAULT_THEME.name) || DEFAULT_THEME;
               return (
                 <Box
                   borderStyle="single"
@@ -256,9 +233,8 @@ def fibonacci(n):
     for _ in range(n):
         a, b = b, a + b
     return a`,
-                    language: 'python',
-                    availableHeight:
-                      isAlternateBuffer === false ? codeBlockHeight : undefined,
+                    language: "python",
+                    availableHeight: isAlternateBuffer === false ? codeBlockHeight : undefined,
                     maxWidth: colorizeCodeWidth,
                     settings,
                   })}
@@ -270,9 +246,7 @@ def fibonacci(n):
 - print("Hello, " + name)
 + print(f"Hello, {name}!")
 `}
-                    availableTerminalHeight={
-                      isAlternateBuffer === false ? diffHeight : undefined
-                    }
+                    availableTerminalHeight={isAlternateBuffer === false ? diffHeight : undefined}
                     terminalWidth={colorizeCodeWidth}
                     theme={previewTheme}
                   />
@@ -285,14 +259,14 @@ def fibonacci(n):
         <ScopeSelector
           onSelect={handleScopeSelect}
           onHighlight={handleScopeHighlight}
-          isFocused={mode === 'scope'}
+          isFocused={mode === "scope"}
           initialScope={selectedScope}
         />
       )}
       <Box marginTop={1}>
         <Text color={theme.text.secondary} wrap="truncate">
-          (Use Enter to {mode === 'theme' ? 'select' : 'apply scope'}, Tab to{' '}
-          {mode === 'theme' ? 'configure scope' : 'select theme'}, Esc to close)
+          (Use Enter to {mode === "theme" ? "select" : "apply scope"}, Tab to{" "}
+          {mode === "theme" ? "configure scope" : "select theme"}, Esc to close)
         </Text>
       </Box>
     </Box>
diff --git a/packages/ui-gemini/src/ui/components/ThemedGradient.test.tsx b/packages/ui-gemini/src/ui/components/ThemedGradient.test.tsx
index 9ea194c9f..32604cd79 100644
--- a/packages/ui-gemini/src/ui/components/ThemedGradient.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ThemedGradient.test.tsx
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { ThemedGradient } from './ThemedGradient.js';
-import { describe, it, expect, vi } from 'vitest';
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { ThemedGradient } from "./ThemedGradient.js";
 
 // Mock theme to control gradient
-vi.mock('../semantic-colors.js', () => ({
+vi.mock("../semantic-colors.js", () => ({
   theme: {
     ui: {
-      gradient: ['red', 'blue'],
+      gradient: ["red", "blue"],
     },
     text: {
-      accent: 'cyan',
+      accent: "cyan",
     },
   },
 }));
 
-describe('ThemedGradient', () => {
-  it('renders children', () => {
+describe("ThemedGradient", () => {
+  it("renders children", () => {
     const { lastFrame } = render(<ThemedGradient>Hello</ThemedGradient>);
-    expect(lastFrame()).toContain('Hello');
+    expect(lastFrame()).toContain("Hello");
   });
 
   // Note: Testing actual gradient application is hard with ink-testing-library
diff --git a/packages/ui-gemini/src/ui/components/ThemedGradient.tsx b/packages/ui-gemini/src/ui/components/ThemedGradient.tsx
index 1a5b14ee3..fda036edb 100644
--- a/packages/ui-gemini/src/ui/components/ThemedGradient.tsx
+++ b/packages/ui-gemini/src/ui/components/ThemedGradient.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, type TextProps } from 'ink';
-import Gradient from 'ink-gradient';
-import { theme } from '../semantic-colors.js';
+import { Text, type TextProps } from "ink";
+import Gradient from "ink-gradient";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 export const ThemedGradient: React.FC<TextProps> = ({ children, ...props }) => {
   const gradient = theme.ui.gradient;
diff --git a/packages/ui-gemini/src/ui/components/Tips.test.tsx b/packages/ui-gemini/src/ui/components/Tips.test.tsx
index a009c40f2..c13ba2489 100644
--- a/packages/ui-gemini/src/ui/components/Tips.test.tsx
+++ b/packages/ui-gemini/src/ui/components/Tips.test.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { Tips } from './Tips.js';
-import { describe, it, expect, vi } from 'vitest';
-import type { Config } from '@airiscode/gemini-cli-core';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { Tips } from "./Tips.js";
 
-describe('Tips', () => {
+describe("Tips", () => {
   it.each([
-    [0, '3. Create GEMINI.md files'],
-    [5, '3. /help for more information'],
-  ])('renders correct tips when file count is %i', (count, expectedText) => {
+    [0, "3. Create GEMINI.md files"],
+    [5, "3. /help for more information"],
+  ])("renders correct tips when file count is %i", (count, expectedText) => {
     const config = {
       getGeminiMdFileCount: vi.fn().mockReturnValue(count),
     } as unknown as Config;
diff --git a/packages/ui-gemini/src/ui/components/Tips.tsx b/packages/ui-gemini/src/ui/components/Tips.tsx
index a90260061..05e3af16c 100644
--- a/packages/ui-gemini/src/ui/components/Tips.tsx
+++ b/packages/ui-gemini/src/ui/components/Tips.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { type Config } from '@airiscode/gemini-cli-core';
+import { type Config } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../semantic-colors.js";
 
 interface TipsProps {
   config: Config;
@@ -18,26 +18,22 @@ export const Tips: React.FC<TipsProps> = ({ config }) => {
   return (
     <Box flexDirection="column">
       <Text color={theme.text.primary}>Tips for getting started:</Text>
-      <Text color={theme.text.primary}>
-        1. Ask questions, edit files, or run commands.
-      </Text>
-      <Text color={theme.text.primary}>
-        2. Be specific for the best results.
-      </Text>
+      <Text color={theme.text.primary}>1. Ask questions, edit files, or run commands.</Text>
+      <Text color={theme.text.primary}>2. Be specific for the best results.</Text>
       {geminiMdFileCount === 0 && (
         <Text color={theme.text.primary}>
-          3. Create{' '}
+          3. Create{" "}
           <Text bold color={theme.text.accent}>
             GEMINI.md
-          </Text>{' '}
+          </Text>{" "}
           files to customize your interactions with Gemini.
         </Text>
       )}
       <Text color={theme.text.primary}>
-        {geminiMdFileCount === 0 ? '4.' : '3.'}{' '}
+        {geminiMdFileCount === 0 ? "4." : "3."}{" "}
         <Text bold color={theme.text.accent}>
           /help
-        </Text>{' '}
+        </Text>{" "}
         for more information.
       </Text>
     </Box>
diff --git a/packages/ui-gemini/src/ui/components/ToolStatsDisplay.test.tsx b/packages/ui-gemini/src/ui/components/ToolStatsDisplay.test.tsx
index a4244abce..c9cbc03b7 100644
--- a/packages/ui-gemini/src/ui/components/ToolStatsDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/ToolStatsDisplay.test.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { ToolStatsDisplay } from './ToolStatsDisplay.js';
-import * as SessionContext from '../contexts/SessionContext.js';
-import type { SessionMetrics } from '../contexts/SessionContext.js';
-import { ToolCallDecision } from '@airiscode/gemini-cli-core';
+import { ToolCallDecision } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { SessionMetrics } from "../contexts/SessionContext.js";
+import * as SessionContext from "../contexts/SessionContext.js";
+import { ToolStatsDisplay } from "./ToolStatsDisplay.js";
 
 // Mock the context to provide controlled data for testing
-vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
+vi.mock("../contexts/SessionContext.js", async (importOriginal) => {
   const actual = await importOriginal<typeof SessionContext>();
   return {
     ...actual,
@@ -25,7 +25,7 @@ const useSessionStatsMock = vi.mocked(SessionContext.useSessionStats);
 const renderWithMockedStats = (metrics: SessionMetrics) => {
   useSessionStatsMock.mockReturnValue({
     stats: {
-      sessionId: 'test-session-id',
+      sessionId: "test-session-id",
       sessionStartTime: new Date(),
       metrics,
       lastPromptTokenCount: 0,
@@ -39,7 +39,7 @@ const renderWithMockedStats = (metrics: SessionMetrics) => {
   return render(<ToolStatsDisplay />);
 };
 
-describe('<ToolStatsDisplay />', () => {
+describe("<ToolStatsDisplay />", () => {
   it('should render "no tool calls" message when there are no active tools', () => {
     const { lastFrame } = renderWithMockedStats({
       models: {},
@@ -62,13 +62,11 @@ describe('<ToolStatsDisplay />', () => {
       },
     });
 
-    expect(lastFrame()).toContain(
-      'No tool calls have been made in this session.',
-    );
+    expect(lastFrame()).toContain("No tool calls have been made in this session.");
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should display stats for a single tool correctly', () => {
+  it("should display stats for a single tool correctly", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {},
       tools: {
@@ -83,7 +81,7 @@ describe('<ToolStatsDisplay />', () => {
           [ToolCallDecision.AUTO_ACCEPT]: 0,
         },
         byName: {
-          'test-tool': {
+          "test-tool": {
             count: 1,
             success: 1,
             fail: 0,
@@ -104,11 +102,11 @@ describe('<ToolStatsDisplay />', () => {
     });
 
     const output = lastFrame();
-    expect(output).toContain('test-tool');
+    expect(output).toContain("test-tool");
     expect(output).toMatchSnapshot();
   });
 
-  it('should display stats for multiple tools correctly', () => {
+  it("should display stats for multiple tools correctly", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {},
       tools: {
@@ -123,7 +121,7 @@ describe('<ToolStatsDisplay />', () => {
           [ToolCallDecision.AUTO_ACCEPT]: 0,
         },
         byName: {
-          'tool-a': {
+          "tool-a": {
             count: 2,
             success: 1,
             fail: 1,
@@ -135,7 +133,7 @@ describe('<ToolStatsDisplay />', () => {
               [ToolCallDecision.AUTO_ACCEPT]: 0,
             },
           },
-          'tool-b': {
+          "tool-b": {
             count: 1,
             success: 1,
             fail: 0,
@@ -156,12 +154,12 @@ describe('<ToolStatsDisplay />', () => {
     });
 
     const output = lastFrame();
-    expect(output).toContain('tool-a');
-    expect(output).toContain('tool-b');
+    expect(output).toContain("tool-a");
+    expect(output).toContain("tool-b");
     expect(output).toMatchSnapshot();
   });
 
-  it('should handle large values without wrapping or overlapping', () => {
+  it("should handle large values without wrapping or overlapping", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {},
       tools: {
@@ -176,7 +174,7 @@ describe('<ToolStatsDisplay />', () => {
           [ToolCallDecision.AUTO_ACCEPT]: 0,
         },
         byName: {
-          'long-named-tool-for-testing-wrapping-and-such': {
+          "long-named-tool-for-testing-wrapping-and-such": {
             count: 999999999,
             success: 888888888,
             fail: 111111111,
@@ -199,7 +197,7 @@ describe('<ToolStatsDisplay />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should handle zero decisions gracefully', () => {
+  it("should handle zero decisions gracefully", () => {
     const { lastFrame } = renderWithMockedStats({
       models: {},
       tools: {
@@ -214,7 +212,7 @@ describe('<ToolStatsDisplay />', () => {
           [ToolCallDecision.AUTO_ACCEPT]: 0,
         },
         byName: {
-          'test-tool': {
+          "test-tool": {
             count: 1,
             success: 1,
             fail: 0,
@@ -235,10 +233,10 @@ describe('<ToolStatsDisplay />', () => {
     });
 
     const output = lastFrame();
-    expect(output).toContain('Total Reviewed Suggestions:');
-    expect(output).toContain('0');
-    expect(output).toContain('Overall Agreement Rate:');
-    expect(output).toContain('--');
+    expect(output).toContain("Total Reviewed Suggestions:");
+    expect(output).toContain("0");
+    expect(output).toContain("Overall Agreement Rate:");
+    expect(output).toContain("--");
     expect(output).toMatchSnapshot();
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/ToolStatsDisplay.tsx b/packages/ui-gemini/src/ui/components/ToolStatsDisplay.tsx
index d2287e96e..f188e4ae9 100644
--- a/packages/ui-gemini/src/ui/components/ToolStatsDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/ToolStatsDisplay.tsx
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { formatDuration } from '../utils/formatters.js';
+import type { ToolCallStats } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { theme } from "../semantic-colors.js";
 import {
   getStatusColor,
   TOOL_SUCCESS_RATE_HIGH,
   TOOL_SUCCESS_RATE_MEDIUM,
   USER_AGREEMENT_RATE_HIGH,
   USER_AGREEMENT_RATE_MEDIUM,
-} from '../utils/displayUtils.js';
-import { useSessionStats } from '../contexts/SessionContext.js';
-import type { ToolCallStats } from '@airiscode/gemini-cli-core';
+} from "../utils/displayUtils.js";
+import { formatDuration } from "../utils/formatters.js";
 
 const TOOL_NAME_COL_WIDTH = 25;
 const CALLS_COL_WIDTH = 8;
@@ -55,21 +55,12 @@ const StatRow: React.FC<{
 export const ToolStatsDisplay: React.FC = () => {
   const { stats } = useSessionStats();
   const { tools } = stats.metrics;
-  const activeTools = Object.entries(tools.byName).filter(
-    ([, metrics]) => metrics.count > 0,
-  );
+  const activeTools = Object.entries(tools.byName).filter(([, metrics]) => metrics.count > 0);
 
   if (activeTools.length === 0) {
     return (
-      <Box
-        borderStyle="round"
-        borderColor={theme.border.default}
-        paddingY={1}
-        paddingX={2}
-      >
-        <Text color={theme.text.primary}>
-          No tool calls have been made in this session.
-        </Text>
+      <Box borderStyle="round" borderColor={theme.border.default} paddingY={1} paddingX={2}>
+        <Text color={theme.text.primary}>No tool calls have been made in this session.</Text>
       </Box>
     );
   }
@@ -84,10 +75,8 @@ export const ToolStatsDisplay: React.FC = () => {
     { accept: 0, reject: 0, modify: 0 },
   );
 
-  const totalReviewed =
-    totalDecisions.accept + totalDecisions.reject + totalDecisions.modify;
-  const agreementRate =
-    totalReviewed > 0 ? (totalDecisions.accept / totalReviewed) * 100 : 0;
+  const totalReviewed = totalDecisions.accept + totalDecisions.reject + totalDecisions.modify;
+  const agreementRate = totalReviewed > 0 ? (totalDecisions.accept / totalReviewed) * 100 : 0;
   const agreementColor = getStatusColor(agreementRate, {
     green: USER_AGREEMENT_RATE_HIGH,
     yellow: USER_AGREEMENT_RATE_MEDIUM,
@@ -154,9 +143,7 @@ export const ToolStatsDisplay: React.FC = () => {
         User Decision Summary
       </Text>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
           <Text color={theme.text.link}>Total Reviewed Suggestions:</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
@@ -164,9 +151,7 @@ export const ToolStatsDisplay: React.FC = () => {
         </Box>
       </Box>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
           <Text color={theme.text.primary}> » Accepted:</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
@@ -174,9 +159,7 @@ export const ToolStatsDisplay: React.FC = () => {
         </Box>
       </Box>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
           <Text color={theme.text.primary}> » Rejected:</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
@@ -184,9 +167,7 @@ export const ToolStatsDisplay: React.FC = () => {
         </Box>
       </Box>
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
           <Text color={theme.text.primary}> » Modified:</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
@@ -206,14 +187,12 @@ export const ToolStatsDisplay: React.FC = () => {
       />
 
       <Box>
-        <Box
-          width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}
-        >
+        <Box width={TOOL_NAME_COL_WIDTH + CALLS_COL_WIDTH + SUCCESS_RATE_COL_WIDTH}>
           <Text color={theme.text.primary}> Overall Agreement Rate:</Text>
         </Box>
         <Box width={AVG_DURATION_COL_WIDTH} justifyContent="flex-end">
           <Text bold color={totalReviewed > 0 ? agreementColor : undefined}>
-            {totalReviewed > 0 ? `${agreementRate.toFixed(1)}%` : '--'}
+            {totalReviewed > 0 ? `${agreementRate.toFixed(1)}%` : "--"}
           </Text>
         </Box>
       </Box>
diff --git a/packages/ui-gemini/src/ui/components/UpdateNotification.test.tsx b/packages/ui-gemini/src/ui/components/UpdateNotification.test.tsx
index fa1632d50..a09b8f63e 100644
--- a/packages/ui-gemini/src/ui/components/UpdateNotification.test.tsx
+++ b/packages/ui-gemini/src/ui/components/UpdateNotification.test.tsx
@@ -4,15 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { UpdateNotification } from './UpdateNotification.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { UpdateNotification } from "./UpdateNotification.js";
 
-describe('UpdateNotification', () => {
-  it('renders message', () => {
-    const { lastFrame } = render(
-      <UpdateNotification message="Update available!" />,
-    );
-    expect(lastFrame()).toContain('Update available!');
+describe("UpdateNotification", () => {
+  it("renders message", () => {
+    const { lastFrame } = render(<UpdateNotification message="Update available!" />);
+    expect(lastFrame()).toContain("Update available!");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/UpdateNotification.tsx b/packages/ui-gemini/src/ui/components/UpdateNotification.tsx
index 8142a2018..afdc955a7 100644
--- a/packages/ui-gemini/src/ui/components/UpdateNotification.tsx
+++ b/packages/ui-gemini/src/ui/components/UpdateNotification.tsx
@@ -4,20 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
+import { Box, Text } from "ink";
+import { theme } from "../semantic-colors.js";
 
 interface UpdateNotificationProps {
   message: string;
 }
 
 export const UpdateNotification = ({ message }: UpdateNotificationProps) => (
-  <Box
-    borderStyle="round"
-    borderColor={theme.status.warning}
-    paddingX={1}
-    marginY={1}
-  >
+  <Box borderStyle="round" borderColor={theme.status.warning} paddingX={1} marginY={1}>
     <Text color={theme.status.warning}>{message}</Text>
   </Box>
 );
diff --git a/packages/ui-gemini/src/ui/components/messages/CompressionMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/CompressionMessage.test.tsx
index 3ebea89f1..4f9332516 100644
--- a/packages/ui-gemini/src/ui/components/messages/CompressionMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/CompressionMessage.test.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import type { CompressionDisplayProps } from './CompressionMessage.js';
-import { CompressionMessage } from './CompressionMessage.js';
-import { CompressionStatus } from '@airiscode/gemini-cli-core';
-import type { CompressionProps } from '../../types.js';
-import { describe, it, expect } from 'vitest';
-
-describe('<CompressionMessage />', () => {
+import { CompressionStatus } from "@airiscode/gemini-cli-core";
+import { describe, expect, it } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import type { CompressionProps } from "../../types.js";
+import type { CompressionDisplayProps } from "./CompressionMessage.js";
+import { CompressionMessage } from "./CompressionMessage.js";
+
+describe("<CompressionMessage />", () => {
   const createCompressionProps = (
     overrides: Partial<CompressionProps> = {},
   ): CompressionDisplayProps => ({
@@ -24,19 +24,19 @@ describe('<CompressionMessage />', () => {
     },
   });
 
-  describe('pending state', () => {
-    it('renders pending message when compression is in progress', () => {
+  describe("pending state", () => {
+    it("renders pending message when compression is in progress", () => {
       const props = createCompressionProps({ isPending: true });
       const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
       const output = lastFrame();
 
-      expect(output).toContain('Compressing chat history');
+      expect(output).toContain("Compressing chat history");
       unmount();
     });
   });
 
-  describe('normal compression (successful token reduction)', () => {
-    it('renders success message when tokens are reduced', () => {
+  describe("normal compression (successful token reduction)", () => {
+    it("renders success message when tokens are reduced", () => {
       const props = createCompressionProps({
         isPending: false,
         originalTokenCount: 100,
@@ -46,14 +46,12 @@ describe('<CompressionMessage />', () => {
       const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
       const output = lastFrame();
 
-      expect(output).toContain('✦');
-      expect(output).toContain(
-        'Chat history compressed from 100 to 50 tokens.',
-      );
+      expect(output).toContain("✦");
+      expect(output).toContain("Chat history compressed from 100 to 50 tokens.");
       unmount();
     });
 
-    it('renders success message for large successful compressions', () => {
+    it("renders success message for large successful compressions", () => {
       const testCases = [
         { original: 50000, new: 25000 }, // Large compression
         { original: 700000, new: 350000 }, // Very large compression
@@ -66,76 +64,66 @@ describe('<CompressionMessage />', () => {
           newTokenCount: newTokens,
           compressionStatus: CompressionStatus.COMPRESSED,
         });
-        const { lastFrame, unmount } = render(
-          <CompressionMessage {...props} />,
-        );
+        const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
         const output = lastFrame();
 
-        expect(output).toContain('✦');
-        expect(output).toContain(
-          `compressed from ${original} to ${newTokens} tokens`,
-        );
-        expect(output).not.toContain('Skipping compression');
-        expect(output).not.toContain('did not reduce size');
+        expect(output).toContain("✦");
+        expect(output).toContain(`compressed from ${original} to ${newTokens} tokens`);
+        expect(output).not.toContain("Skipping compression");
+        expect(output).not.toContain("did not reduce size");
         unmount();
       }
     });
   });
 
-  describe('skipped compression (tokens increased or same)', () => {
-    it('renders skip message when compression would increase token count', () => {
+  describe("skipped compression (tokens increased or same)", () => {
+    it("renders skip message when compression would increase token count", () => {
       const props = createCompressionProps({
         isPending: false,
         originalTokenCount: 50,
         newTokenCount: 75,
-        compressionStatus:
-          CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+        compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
       });
       const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
       const output = lastFrame();
 
-      expect(output).toContain('✦');
-      expect(output).toContain(
-        'Compression was not beneficial for this history size.',
-      );
+      expect(output).toContain("✦");
+      expect(output).toContain("Compression was not beneficial for this history size.");
       unmount();
     });
 
-    it('renders skip message when token counts are equal', () => {
+    it("renders skip message when token counts are equal", () => {
       const props = createCompressionProps({
         isPending: false,
         originalTokenCount: 50,
         newTokenCount: 50,
-        compressionStatus:
-          CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+        compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
       });
       const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
       const output = lastFrame();
 
-      expect(output).toContain(
-        'Compression was not beneficial for this history size.',
-      );
+      expect(output).toContain("Compression was not beneficial for this history size.");
       unmount();
     });
   });
 
-  describe('message content validation', () => {
-    it('displays correct compression statistics', () => {
+  describe("message content validation", () => {
+    it("displays correct compression statistics", () => {
       const testCases = [
         {
           original: 200,
           new: 80,
-          expected: 'compressed from 200 to 80 tokens',
+          expected: "compressed from 200 to 80 tokens",
         },
         {
           original: 500,
           new: 150,
-          expected: 'compressed from 500 to 150 tokens',
+          expected: "compressed from 500 to 150 tokens",
         },
         {
           original: 1500,
           new: 400,
-          expected: 'compressed from 1500 to 400 tokens',
+          expected: "compressed from 1500 to 400 tokens",
         },
       ];
 
@@ -146,9 +134,7 @@ describe('<CompressionMessage />', () => {
           newTokenCount: newTokens,
           compressionStatus: CompressionStatus.COMPRESSED,
         });
-        const { lastFrame, unmount } = render(
-          <CompressionMessage {...props} />,
-        );
+        const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
         const output = lastFrame();
 
         expect(output).toContain(expected);
@@ -156,7 +142,7 @@ describe('<CompressionMessage />', () => {
       }
     });
 
-    it('shows skip message for small histories when new tokens >= original tokens', () => {
+    it("shows skip message for small histories when new tokens >= original tokens", () => {
       const testCases = [
         { original: 50, new: 60 }, // Increased
         { original: 100, new: 100 }, // Same
@@ -168,23 +154,18 @@ describe('<CompressionMessage />', () => {
           isPending: false,
           originalTokenCount: original,
           newTokenCount: newTokens,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
-        const { lastFrame, unmount } = render(
-          <CompressionMessage {...props} />,
-        );
+        const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
         const output = lastFrame();
 
-        expect(output).toContain(
-          'Compression was not beneficial for this history size.',
-        );
-        expect(output).not.toContain('compressed from');
+        expect(output).toContain("Compression was not beneficial for this history size.");
+        expect(output).not.toContain("compressed from");
         unmount();
       }
     });
 
-    it('shows compression failure message for large histories when new tokens >= original tokens', () => {
+    it("shows compression failure message for large histories when new tokens >= original tokens", () => {
       const testCases = [
         { original: 50000, new: 50100 }, // At 50k threshold
         { original: 700000, new: 710000 }, // Large history case
@@ -196,17 +177,14 @@ describe('<CompressionMessage />', () => {
           isPending: false,
           originalTokenCount: original,
           newTokenCount: newTokens,
-          compressionStatus:
-            CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
+          compressionStatus: CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT,
         });
-        const { lastFrame, unmount } = render(
-          <CompressionMessage {...props} />,
-        );
+        const { lastFrame, unmount } = render(<CompressionMessage {...props} />);
         const output = lastFrame();
 
-        expect(output).toContain('compression did not reduce size');
-        expect(output).not.toContain('compressed from');
-        expect(output).not.toContain('Compression was not beneficial');
+        expect(output).toContain("compression did not reduce size");
+        expect(output).not.toContain("compressed from");
+        expect(output).not.toContain("Compression was not beneficial");
         unmount();
       }
     });
diff --git a/packages/ui-gemini/src/ui/components/messages/CompressionMessage.tsx b/packages/ui-gemini/src/ui/components/messages/CompressionMessage.tsx
index dabf66e14..873b24ac5 100644
--- a/packages/ui-gemini/src/ui/components/messages/CompressionMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/CompressionMessage.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text } from 'ink';
-import type { CompressionProps } from '../../types.js';
-import { CliSpinner } from '../CliSpinner.js';
-import { theme } from '../../semantic-colors.js';
-import { SCREEN_READER_MODEL_PREFIX } from '../../textConstants.js';
-import { CompressionStatus } from '@airiscode/gemini-cli-core';
+import { CompressionStatus } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import { theme } from "../../semantic-colors.js";
+import { SCREEN_READER_MODEL_PREFIX } from "../../textConstants.js";
+import type { CompressionProps } from "../../types.js";
+import { CliSpinner } from "../CliSpinner.js";
 
 export interface CompressionDisplayProps {
   compression: CompressionProps;
@@ -19,18 +19,15 @@ export interface CompressionDisplayProps {
  * Compression messages appear when the /compress command is run, and show a loading spinner
  * while compression is in progress, followed up by some compression stats.
  */
-export function CompressionMessage({
-  compression,
-}: CompressionDisplayProps): React.JSX.Element {
-  const { isPending, originalTokenCount, newTokenCount, compressionStatus } =
-    compression;
+export function CompressionMessage({ compression }: CompressionDisplayProps): React.JSX.Element {
+  const { isPending, originalTokenCount, newTokenCount, compressionStatus } = compression;
 
   const originalTokens = originalTokenCount ?? 0;
   const newTokens = newTokenCount ?? 0;
 
   const getCompressionText = () => {
     if (isPending) {
-      return 'Compressing chat history';
+      return "Compressing chat history";
     }
 
     switch (compressionStatus) {
@@ -39,17 +36,17 @@ export function CompressionMessage({
       case CompressionStatus.COMPRESSION_FAILED_INFLATED_TOKEN_COUNT:
         // For smaller histories (< 50k tokens), compression overhead likely exceeds benefits
         if (originalTokens < 50000) {
-          return 'Compression was not beneficial for this history size.';
+          return "Compression was not beneficial for this history size.";
         }
         // For larger histories where compression should work but didn't,
         // this suggests an issue with the compression process itself
-        return 'Chat history compression did not reduce size. This may indicate issues with the compression prompt.';
+        return "Chat history compression did not reduce size. This may indicate issues with the compression prompt.";
       case CompressionStatus.COMPRESSION_FAILED_TOKEN_COUNT_ERROR:
-        return 'Could not compress chat history due to a token counting error.';
+        return "Could not compress chat history due to a token counting error.";
       case CompressionStatus.NOOP:
-        return 'Nothing to compress.';
+        return "Nothing to compress.";
       default:
-        return '';
+        return "";
     }
   };
 
@@ -58,17 +55,11 @@ export function CompressionMessage({
   return (
     <Box flexDirection="row">
       <Box marginRight={1}>
-        {isPending ? (
-          <CliSpinner type="dots" />
-        ) : (
-          <Text color={theme.text.accent}>✦</Text>
-        )}
+        {isPending ? <CliSpinner type="dots" /> : <Text color={theme.text.accent}>✦</Text>}
       </Box>
       <Box>
         <Text
-          color={
-            compression.isPending ? theme.text.accent : theme.status.success
-          }
+          color={compression.isPending ? theme.text.accent : theme.status.success}
           aria-label={SCREEN_READER_MODEL_PREFIX}
         >
           {text}
diff --git a/packages/ui-gemini/src/ui/components/messages/DiffRenderer.test.tsx b/packages/ui-gemini/src/ui/components/messages/DiffRenderer.test.tsx
index 9b1b93f25..0bdd3427f 100644
--- a/packages/ui-gemini/src/ui/components/messages/DiffRenderer.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/DiffRenderer.test.tsx
@@ -4,27 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { OverflowProvider } from '../../contexts/OverflowContext.js';
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { DiffRenderer } from './DiffRenderer.js';
-import * as CodeColorizer from '../../utils/CodeColorizer.js';
-import { vi } from 'vitest';
+import { vi } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { OverflowProvider } from "../../contexts/OverflowContext.js";
+import * as CodeColorizer from "../../utils/CodeColorizer.js";
+import { DiffRenderer } from "./DiffRenderer.js";
 
-describe('<OverflowProvider><DiffRenderer /></OverflowProvider>', () => {
-  const mockColorizeCode = vi.spyOn(CodeColorizer, 'colorizeCode');
+describe("<OverflowProvider><DiffRenderer /></OverflowProvider>", () => {
+  const mockColorizeCode = vi.spyOn(CodeColorizer, "colorizeCode");
 
   beforeEach(() => {
     mockColorizeCode.mockClear();
   });
 
   const sanitizeOutput = (output: string | undefined, terminalWidth: number) =>
-    output?.replace(/GAP_INDICATOR/g, '═'.repeat(terminalWidth));
+    output?.replace(/GAP_INDICATOR/g, "═".repeat(terminalWidth));
 
-  describe.each([true, false])(
-    'with useAlternateBuffer = %s',
-    (useAlternateBuffer) => {
-      it('should call colorizeCode with correct language for new file with known extension', () => {
-        const newFileDiffContent = `
+  describe.each([true, false])("with useAlternateBuffer = %s", (useAlternateBuffer) => {
+    it("should call colorizeCode with correct language for new file with known extension", () => {
+      const newFileDiffContent = `
 diff --git a/test.py b/test.py
 new file mode 100644
 index 0000000..e69de29
@@ -33,28 +31,24 @@ index 0000000..e69de29
 @@ -0,0 +1 @@
 +print("hello world")
 `;
-        renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={newFileDiffContent}
-              filename="test.py"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(mockColorizeCode).toHaveBeenCalledWith({
-          code: 'print("hello world")',
-          language: 'python',
-          availableHeight: undefined,
-          maxWidth: 80,
-          theme: undefined,
-          settings: expect.anything(),
-        });
+      renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent={newFileDiffContent} filename="test.py" terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(mockColorizeCode).toHaveBeenCalledWith({
+        code: 'print("hello world")',
+        language: "python",
+        availableHeight: undefined,
+        maxWidth: 80,
+        theme: undefined,
+        settings: expect.anything(),
       });
+    });
 
-      it('should call colorizeCode with null language for new file with unknown extension', () => {
-        const newFileDiffContent = `
+    it("should call colorizeCode with null language for new file with unknown extension", () => {
+      const newFileDiffContent = `
 diff --git a/test.unknown b/test.unknown
 new file mode 100644
 index 0000000..e69de29
@@ -63,28 +57,28 @@ index 0000000..e69de29
 @@ -0,0 +1 @@
 +some content
 `;
-        renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={newFileDiffContent}
-              filename="test.unknown"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(mockColorizeCode).toHaveBeenCalledWith({
-          code: 'some content',
-          language: null,
-          availableHeight: undefined,
-          maxWidth: 80,
-          theme: undefined,
-          settings: expect.anything(),
-        });
+      renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer
+            diffContent={newFileDiffContent}
+            filename="test.unknown"
+            terminalWidth={80}
+          />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(mockColorizeCode).toHaveBeenCalledWith({
+        code: "some content",
+        language: null,
+        availableHeight: undefined,
+        maxWidth: 80,
+        theme: undefined,
+        settings: expect.anything(),
       });
+    });
 
-      it('should call colorizeCode with null language for new file if no filename is provided', () => {
-        const newFileDiffContent = `
+    it("should call colorizeCode with null language for new file if no filename is provided", () => {
+      const newFileDiffContent = `
 diff --git a/test.txt b/test.txt
 new file mode 100644
 index 0000000..e69de29
@@ -93,24 +87,24 @@ index 0000000..e69de29
 @@ -0,0 +1 @@
 +some text content
 `;
-        renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer diffContent={newFileDiffContent} terminalWidth={80} />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(mockColorizeCode).toHaveBeenCalledWith({
-          code: 'some text content',
-          language: null,
-          availableHeight: undefined,
-          maxWidth: 80,
-          theme: undefined,
-          settings: expect.anything(),
-        });
+      renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent={newFileDiffContent} terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(mockColorizeCode).toHaveBeenCalledWith({
+        code: "some text content",
+        language: null,
+        availableHeight: undefined,
+        maxWidth: 80,
+        theme: undefined,
+        settings: expect.anything(),
       });
+    });
 
-      it('should render diff content for existing file (not calling colorizeCode directly for the whole block)', () => {
-        const existingFileDiffContent = `
+    it("should render diff content for existing file (not calling colorizeCode directly for the whole block)", () => {
+      const existingFileDiffContent = `
 
 diff --git a/test.txt b/test.txt
 index 0000001..0000002 100644
@@ -120,63 +114,59 @@ index 0000001..0000002 100644
 -old line
 +new line
 `;
-        const { lastFrame } = renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={existingFileDiffContent}
-              filename="test.txt"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        // colorizeCode is used internally by the line-by-line rendering, not for the whole block
-        expect(mockColorizeCode).not.toHaveBeenCalledWith(
-          expect.objectContaining({
-            code: expect.stringContaining('old line'),
-          }),
-        );
-        expect(mockColorizeCode).not.toHaveBeenCalledWith(
-          expect.objectContaining({
-            code: expect.stringContaining('new line'),
-          }),
-        );
-        expect(lastFrame()).toMatchSnapshot();
-      });
+      const { lastFrame } = renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer
+            diffContent={existingFileDiffContent}
+            filename="test.txt"
+            terminalWidth={80}
+          />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      // colorizeCode is used internally by the line-by-line rendering, not for the whole block
+      expect(mockColorizeCode).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: expect.stringContaining("old line"),
+        }),
+      );
+      expect(mockColorizeCode).not.toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: expect.stringContaining("new line"),
+        }),
+      );
+      expect(lastFrame()).toMatchSnapshot();
+    });
 
-      it('should handle diff with only header and no changes', () => {
-        const noChangeDiff = `diff --git a/file.txt b/file.txt
+    it("should handle diff with only header and no changes", () => {
+      const noChangeDiff = `diff --git a/file.txt b/file.txt
 index 1234567..1234567 100644
 --- a/file.txt
 +++ b/file.txt
 `;
-        const { lastFrame } = renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={noChangeDiff}
-              filename="file.txt"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(lastFrame()).toMatchSnapshot();
-        expect(mockColorizeCode).not.toHaveBeenCalled();
-      });
+      const { lastFrame } = renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent={noChangeDiff} filename="file.txt" terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(lastFrame()).toMatchSnapshot();
+      expect(mockColorizeCode).not.toHaveBeenCalled();
+    });
 
-      it('should handle empty diff content', () => {
-        const { lastFrame } = renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer diffContent="" terminalWidth={80} />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(lastFrame()).toMatchSnapshot();
-        expect(mockColorizeCode).not.toHaveBeenCalled();
-      });
+    it("should handle empty diff content", () => {
+      const { lastFrame } = renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent="" terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(lastFrame()).toMatchSnapshot();
+      expect(mockColorizeCode).not.toHaveBeenCalled();
+    });
 
-      it('should render a gap indicator for skipped lines', () => {
-        const diffWithGap = `
+    it("should render a gap indicator for skipped lines", () => {
+      const diffWithGap = `
 
 diff --git a/file.txt b/file.txt
 index 123..456 100644
@@ -190,21 +180,17 @@ index 123..456 100644
  context line 10
  context line 11
 `;
-        const { lastFrame } = renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={diffWithGap}
-              filename="file.txt"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(lastFrame()).toMatchSnapshot();
-      });
+      const { lastFrame } = renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent={diffWithGap} filename="file.txt" terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(lastFrame()).toMatchSnapshot();
+    });
 
-      it('should not render a gap indicator for small gaps (<= MAX_CONTEXT_LINES_WITHOUT_GAP)', () => {
-        const diffWithSmallGap = `
+    it("should not render a gap indicator for small gaps (<= MAX_CONTEXT_LINES_WITHOUT_GAP)", () => {
+      const diffWithSmallGap = `
 
 diff --git a/file.txt b/file.txt
 index abc..def 100644
@@ -223,21 +209,17 @@ index abc..def 100644
  context line 14
  context line 15
 `;
-        const { lastFrame } = renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={diffWithSmallGap}
-              filename="file.txt"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(lastFrame()).toMatchSnapshot();
-      });
+      const { lastFrame } = renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent={diffWithSmallGap} filename="file.txt" terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(lastFrame()).toMatchSnapshot();
+    });
 
-      describe('should correctly render a diff with multiple hunks and a gap indicator', () => {
-        const diffWithMultipleHunks = `
+    describe("should correctly render a diff with multiple hunks and a gap indicator", () => {
+      const diffWithMultipleHunks = `
 
 diff --git a/multi.js b/multi.js
 index 123..789 100644
@@ -255,41 +237,38 @@ index 123..789 100644
  console.log('end of second hunk');
 `;
 
-        it.each([
-          {
-            terminalWidth: 80,
-            height: undefined,
-          },
-          {
-            terminalWidth: 80,
-            height: 6,
-          },
-          {
-            terminalWidth: 30,
-            height: 6,
-          },
-        ])(
-          'with terminalWidth $terminalWidth and height $height',
-          ({ terminalWidth, height }) => {
-            const { lastFrame } = renderWithProviders(
-              <OverflowProvider>
-                <DiffRenderer
-                  diffContent={diffWithMultipleHunks}
-                  filename="multi.js"
-                  terminalWidth={terminalWidth}
-                  availableTerminalHeight={height}
-                />
-              </OverflowProvider>,
-              { useAlternateBuffer },
-            );
-            const output = lastFrame();
-            expect(sanitizeOutput(output, terminalWidth)).toMatchSnapshot();
-          },
+      it.each([
+        {
+          terminalWidth: 80,
+          height: undefined,
+        },
+        {
+          terminalWidth: 80,
+          height: 6,
+        },
+        {
+          terminalWidth: 30,
+          height: 6,
+        },
+      ])("with terminalWidth $terminalWidth and height $height", ({ terminalWidth, height }) => {
+        const { lastFrame } = renderWithProviders(
+          <OverflowProvider>
+            <DiffRenderer
+              diffContent={diffWithMultipleHunks}
+              filename="multi.js"
+              terminalWidth={terminalWidth}
+              availableTerminalHeight={height}
+            />
+          </OverflowProvider>,
+          { useAlternateBuffer },
         );
+        const output = lastFrame();
+        expect(sanitizeOutput(output, terminalWidth)).toMatchSnapshot();
       });
+    });
 
-      it('should correctly render a diff with a SVN diff format', () => {
-        const newFileDiff = `
+    it("should correctly render a diff with a SVN diff format", () => {
+      const newFileDiff = `
 
 fileDiff Index: file.txt
 ===================================================================
@@ -305,21 +284,17 @@ fileDiff Index: file.txt
 +const anotherNew = 'test';
 \\ No newline at end of file  
 `;
-        const { lastFrame } = renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={newFileDiff}
-              filename="TEST"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(lastFrame()).toMatchSnapshot();
-      });
+      const { lastFrame } = renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent={newFileDiff} filename="TEST" terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(lastFrame()).toMatchSnapshot();
+    });
 
-      it('should correctly render a new file with no file extension correctly', () => {
-        const newFileDiff = `
+    it("should correctly render a new file with no file extension correctly", () => {
+      const newFileDiff = `
 
 fileDiff Index: Dockerfile
 ===================================================================
@@ -331,18 +306,13 @@ fileDiff Index: Dockerfile
 +RUN npm run build
 \\ No newline at end of file  
 `;
-        const { lastFrame } = renderWithProviders(
-          <OverflowProvider>
-            <DiffRenderer
-              diffContent={newFileDiff}
-              filename="Dockerfile"
-              terminalWidth={80}
-            />
-          </OverflowProvider>,
-          { useAlternateBuffer },
-        );
-        expect(lastFrame()).toMatchSnapshot();
-      });
-    },
-  );
+      const { lastFrame } = renderWithProviders(
+        <OverflowProvider>
+          <DiffRenderer diffContent={newFileDiff} filename="Dockerfile" terminalWidth={80} />
+        </OverflowProvider>,
+        { useAlternateBuffer },
+      );
+      expect(lastFrame()).toMatchSnapshot();
+    });
+  });
 });
diff --git a/packages/ui-gemini/src/ui/components/messages/DiffRenderer.tsx b/packages/ui-gemini/src/ui/components/messages/DiffRenderer.tsx
index fdf1d26c9..bdd6dbf8e 100644
--- a/packages/ui-gemini/src/ui/components/messages/DiffRenderer.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/DiffRenderer.tsx
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useMemo } from 'react';
-import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import crypto from 'node:crypto';
-import { colorizeCode, colorizeLine } from '../../utils/CodeColorizer.js';
-import { MaxSizedBox } from '../shared/MaxSizedBox.js';
-import { theme as semanticTheme } from '../../semantic-colors.js';
-import type { Theme } from '../../themes/theme.js';
-import { useSettings } from '../../contexts/SettingsContext.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
+import crypto from "node:crypto";
+import { Box, Text, useIsScreenReaderEnabled } from "ink";
+import type React from "react";
+import { useMemo } from "react";
+import { useSettings } from "../../contexts/SettingsContext.js";
+import { useAlternateBuffer } from "../../hooks/useAlternateBuffer.js";
+import { theme as semanticTheme } from "../../semantic-colors.js";
+import type { Theme } from "../../themes/theme.js";
+import { colorizeCode, colorizeLine } from "../../utils/CodeColorizer.js";
+import { MaxSizedBox } from "../shared/MaxSizedBox.js";
 
 interface DiffLine {
-  type: 'add' | 'del' | 'context' | 'hunk' | 'other';
+  type: "add" | "del" | "context" | "hunk" | "other";
   oldLine?: number;
   newLine?: number;
   content: string;
 }
 
 function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
-  const lines = diffContent.split('\n');
+  const lines = diffContent.split("\n");
   const result: DiffLine[] = [];
   let currentOldLine = 0;
   let currentNewLine = 0;
@@ -36,7 +36,7 @@ function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
       currentOldLine = parseInt(hunkMatch[1], 10);
       currentNewLine = parseInt(hunkMatch[2], 10);
       inHunk = true;
-      result.push({ type: 'hunk', content: line });
+      result.push({ type: "hunk", content: line });
       // We need to adjust the starting point because the first line number applies to the *first* actual line change/context,
       // but we increment *before* pushing that line. So decrement here.
       currentOldLine--;
@@ -45,38 +45,38 @@ function parseDiffWithLineNumbers(diffContent: string): DiffLine[] {
     }
     if (!inHunk) {
       // Skip standard Git header lines more robustly
-      if (line.startsWith('--- ')) {
+      if (line.startsWith("--- ")) {
         continue;
       }
       // If it's not a hunk or header, skip (or handle as 'other' if needed)
       continue;
     }
-    if (line.startsWith('+')) {
+    if (line.startsWith("+")) {
       currentNewLine++; // Increment before pushing
       result.push({
-        type: 'add',
+        type: "add",
         newLine: currentNewLine,
         content: line.substring(1),
       });
-    } else if (line.startsWith('-')) {
+    } else if (line.startsWith("-")) {
       currentOldLine++; // Increment before pushing
       result.push({
-        type: 'del',
+        type: "del",
         oldLine: currentOldLine,
         content: line.substring(1),
       });
-    } else if (line.startsWith(' ')) {
+    } else if (line.startsWith(" ")) {
       currentOldLine++; // Increment before pushing
       currentNewLine++;
       result.push({
-        type: 'context',
+        type: "context",
         oldLine: currentOldLine,
         newLine: currentNewLine,
         content: line.substring(1),
       });
-    } else if (line.startsWith('\\')) {
+    } else if (line.startsWith("\\")) {
       // Handle "\ No newline at end of file"
-      result.push({ type: 'other', content: line });
+      result.push({ type: "other", content: line });
     }
   }
   return result;
@@ -107,7 +107,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
   const screenReaderEnabled = useIsScreenReaderEnabled();
 
   const parsedLines = useMemo(() => {
-    if (!diffContent || typeof diffContent !== 'string') {
+    if (!diffContent || typeof diffContent !== "string") {
       return [];
     }
     return parseDiffWithLineNumbers(diffContent);
@@ -117,26 +117,22 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
     if (parsedLines.length === 0) return false;
     return parsedLines.every(
       (line) =>
-        line.type === 'add' ||
-        line.type === 'hunk' ||
-        line.type === 'other' ||
-        line.content.startsWith('diff --git') ||
-        line.content.startsWith('new file mode'),
+        line.type === "add" ||
+        line.type === "hunk" ||
+        line.type === "other" ||
+        line.content.startsWith("diff --git") ||
+        line.content.startsWith("new file mode"),
     );
   }, [parsedLines]);
 
   const renderedOutput = useMemo(() => {
-    if (!diffContent || typeof diffContent !== 'string') {
+    if (!diffContent || typeof diffContent !== "string") {
       return <Text color={semanticTheme.status.warning}>No diff content.</Text>;
     }
 
     if (parsedLines.length === 0) {
       return (
-        <Box
-          borderStyle="round"
-          borderColor={semanticTheme.border.default}
-          padding={1}
-        >
+        <Box borderStyle="round" borderColor={semanticTheme.border.default} padding={1}>
           <Text dimColor>No changes detected.</Text>
         </Box>
       );
@@ -156,14 +152,12 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
     if (isNewFile) {
       // Extract only the added lines' content
       const addedContent = parsedLines
-        .filter((line) => line.type === 'add')
+        .filter((line) => line.type === "add")
         .map((line) => line.content)
-        .join('\n');
+        .join("\n");
       // Attempt to infer language from filename, default to plain text if no filename
-      const fileExtension = filename?.split('.').pop() || null;
-      const language = fileExtension
-        ? getLanguageFromExtension(fileExtension)
-        : null;
+      const fileExtension = filename?.split(".").pop() || null;
+      const language = fileExtension ? getLanguageFromExtension(fileExtension) : null;
       return colorizeCode({
         code: addedContent,
         language,
@@ -210,21 +204,15 @@ const renderDiffContent = (
   // 1. Normalize whitespace (replace tabs with spaces) *before* further processing
   const normalizedLines = parsedLines.map((line) => ({
     ...line,
-    content: line.content.replace(/\t/g, ' '.repeat(tabWidth)),
+    content: line.content.replace(/\t/g, " ".repeat(tabWidth)),
   }));
 
   // Filter out non-displayable lines (hunks, potentially 'other') using the normalized list
-  const displayableLines = normalizedLines.filter(
-    (l) => l.type !== 'hunk' && l.type !== 'other',
-  );
+  const displayableLines = normalizedLines.filter((l) => l.type !== "hunk" && l.type !== "other");
 
   if (displayableLines.length === 0) {
     return (
-      <Box
-        borderStyle="round"
-        borderColor={semanticTheme.border.default}
-        padding={1}
-      >
+      <Box borderStyle="round" borderColor={semanticTheme.border.default} padding={1}>
         <Text dimColor>No changes detected.</Text>
       </Box>
     );
@@ -237,16 +225,14 @@ const renderDiffContent = (
   );
   const gutterWidth = Math.max(1, maxLineNumber.toString().length);
 
-  const fileExtension = filename?.split('.').pop() || null;
-  const language = fileExtension
-    ? getLanguageFromExtension(fileExtension)
-    : null;
+  const fileExtension = filename?.split(".").pop() || null;
+  const language = fileExtension ? getLanguageFromExtension(fileExtension) : null;
 
   // Calculate the minimum indentation across all displayable lines
   let baseIndentation = Infinity; // Start high to find the minimum
   for (const line of displayableLines) {
     // Only consider lines with actual content for indentation calculation
-    if (line.content.trim() === '') continue;
+    if (line.content.trim() === "") continue;
 
     const firstCharIndex = line.content.search(/\S/); // Find index of first non-whitespace char
     const currentIndent = firstCharIndex === -1 ? 0 : firstCharIndex; // Indent is 0 if no non-whitespace found
@@ -259,147 +245,134 @@ const renderDiffContent = (
 
   const key = filename
     ? `diff-box-${filename}`
-    : `diff-box-${crypto.createHash('sha1').update(JSON.stringify(parsedLines)).digest('hex')}`;
+    : `diff-box-${crypto.createHash("sha1").update(JSON.stringify(parsedLines)).digest("hex")}`;
 
   let lastLineNumber: number | null = null;
   const MAX_CONTEXT_LINES_WITHOUT_GAP = 5;
 
-  const content = displayableLines.reduce<React.ReactNode[]>(
-    (acc, line, index) => {
-      // Determine the relevant line number for gap calculation based on type
-      let relevantLineNumberForGapCalc: number | null = null;
-      if (line.type === 'add' || line.type === 'context') {
-        relevantLineNumberForGapCalc = line.newLine ?? null;
-      } else if (line.type === 'del') {
-        // For deletions, the gap is typically in relation to the original file's line numbering
-        relevantLineNumberForGapCalc = line.oldLine ?? null;
-      }
-
-      if (
-        lastLineNumber !== null &&
-        relevantLineNumberForGapCalc !== null &&
-        relevantLineNumberForGapCalc >
-          lastLineNumber + MAX_CONTEXT_LINES_WITHOUT_GAP + 1
-      ) {
-        acc.push(
-          <Box key={`gap-${index}`}>
-            {useMaxSizedBox ? (
-              <Text wrap="truncate" color={semanticTheme.text.secondary}>
-                {'═'.repeat(terminalWidth)}
-              </Text>
-            ) : (
-              // We can use a proper separator when not using max sized box.
-              <Box
-                borderStyle="double"
-                borderLeft={false}
-                borderRight={false}
-                borderBottom={false}
-                width={terminalWidth}
-                borderColor={semanticTheme.text.secondary}
-                marginRight={1}
-              ></Box>
-            )}
-          </Box>,
-        );
-      }
-
-      const lineKey = `diff-line-${index}`;
-      let gutterNumStr = '';
-      let prefixSymbol = ' ';
-
-      switch (line.type) {
-        case 'add':
-          gutterNumStr = (line.newLine ?? '').toString();
-          prefixSymbol = '+';
-          lastLineNumber = line.newLine ?? null;
-          break;
-        case 'del':
-          gutterNumStr = (line.oldLine ?? '').toString();
-          prefixSymbol = '-';
-          // For deletions, update lastLineNumber based on oldLine if it's advancing.
-          // This helps manage gaps correctly if there are multiple consecutive deletions
-          // or if a deletion is followed by a context line far away in the original file.
-          if (line.oldLine !== undefined) {
-            lastLineNumber = line.oldLine;
-          }
-          break;
-        case 'context':
-          gutterNumStr = (line.newLine ?? '').toString();
-          prefixSymbol = ' ';
-          lastLineNumber = line.newLine ?? null;
-          break;
-        default:
-          return acc;
-      }
-
-      const displayContent = line.content.substring(baseIndentation);
+  const content = displayableLines.reduce<React.ReactNode[]>((acc, line, index) => {
+    // Determine the relevant line number for gap calculation based on type
+    let relevantLineNumberForGapCalc: number | null = null;
+    if (line.type === "add" || line.type === "context") {
+      relevantLineNumberForGapCalc = line.newLine ?? null;
+    } else if (line.type === "del") {
+      // For deletions, the gap is typically in relation to the original file's line numbering
+      relevantLineNumberForGapCalc = line.oldLine ?? null;
+    }
 
-      const backgroundColor =
-        line.type === 'add'
-          ? semanticTheme.background.diff.added
-          : line.type === 'del'
-            ? semanticTheme.background.diff.removed
-            : undefined;
+    if (
+      lastLineNumber !== null &&
+      relevantLineNumberForGapCalc !== null &&
+      relevantLineNumberForGapCalc > lastLineNumber + MAX_CONTEXT_LINES_WITHOUT_GAP + 1
+    ) {
       acc.push(
-        <Box key={lineKey} flexDirection="row">
+        <Box key={`gap-${index}`}>
           {useMaxSizedBox ? (
-            <Text
-              color={semanticTheme.text.secondary}
-              backgroundColor={backgroundColor}
-            >
-              {gutterNumStr.padStart(gutterWidth)}{' '}
+            <Text wrap="truncate" color={semanticTheme.text.secondary}>
+              {"═".repeat(terminalWidth)}
             </Text>
           ) : (
+            // We can use a proper separator when not using max sized box.
             <Box
-              width={gutterWidth + 1}
-              paddingRight={1}
-              flexShrink={0}
-              backgroundColor={backgroundColor}
-              justifyContent="flex-end"
-            >
-              <Text color={semanticTheme.text.secondary}>{gutterNumStr}</Text>
-            </Box>
+              borderStyle="double"
+              borderLeft={false}
+              borderRight={false}
+              borderBottom={false}
+              width={terminalWidth}
+              borderColor={semanticTheme.text.secondary}
+              marginRight={1}
+            ></Box>
           )}
-          {line.type === 'context' ? (
-            <>
-              <Text>{prefixSymbol} </Text>
-              <Text wrap="wrap">{colorizeLine(displayContent, language)}</Text>
-            </>
-          ) : (
+        </Box>,
+      );
+    }
+
+    const lineKey = `diff-line-${index}`;
+    let gutterNumStr = "";
+    let prefixSymbol = " ";
+
+    switch (line.type) {
+      case "add":
+        gutterNumStr = (line.newLine ?? "").toString();
+        prefixSymbol = "+";
+        lastLineNumber = line.newLine ?? null;
+        break;
+      case "del":
+        gutterNumStr = (line.oldLine ?? "").toString();
+        prefixSymbol = "-";
+        // For deletions, update lastLineNumber based on oldLine if it's advancing.
+        // This helps manage gaps correctly if there are multiple consecutive deletions
+        // or if a deletion is followed by a context line far away in the original file.
+        if (line.oldLine !== undefined) {
+          lastLineNumber = line.oldLine;
+        }
+        break;
+      case "context":
+        gutterNumStr = (line.newLine ?? "").toString();
+        prefixSymbol = " ";
+        lastLineNumber = line.newLine ?? null;
+        break;
+      default:
+        return acc;
+    }
+
+    const displayContent = line.content.substring(baseIndentation);
+
+    const backgroundColor =
+      line.type === "add"
+        ? semanticTheme.background.diff.added
+        : line.type === "del"
+          ? semanticTheme.background.diff.removed
+          : undefined;
+    acc.push(
+      <Box key={lineKey} flexDirection="row">
+        {useMaxSizedBox ? (
+          <Text color={semanticTheme.text.secondary} backgroundColor={backgroundColor}>
+            {gutterNumStr.padStart(gutterWidth)}{" "}
+          </Text>
+        ) : (
+          <Box
+            width={gutterWidth + 1}
+            paddingRight={1}
+            flexShrink={0}
+            backgroundColor={backgroundColor}
+            justifyContent="flex-end"
+          >
+            <Text color={semanticTheme.text.secondary}>{gutterNumStr}</Text>
+          </Box>
+        )}
+        {line.type === "context" ? (
+          <>
+            <Text>{prefixSymbol} </Text>
+            <Text wrap="wrap">{colorizeLine(displayContent, language)}</Text>
+          </>
+        ) : (
+          <Text
+            backgroundColor={
+              line.type === "add"
+                ? semanticTheme.background.diff.added
+                : semanticTheme.background.diff.removed
+            }
+            wrap="wrap"
+          >
             <Text
-              backgroundColor={
-                line.type === 'add'
-                  ? semanticTheme.background.diff.added
-                  : semanticTheme.background.diff.removed
+              color={
+                line.type === "add" ? semanticTheme.status.success : semanticTheme.status.error
               }
-              wrap="wrap"
             >
-              <Text
-                color={
-                  line.type === 'add'
-                    ? semanticTheme.status.success
-                    : semanticTheme.status.error
-                }
-              >
-                {prefixSymbol}
-              </Text>{' '}
-              {colorizeLine(displayContent, language)}
-            </Text>
-          )}
-        </Box>,
-      );
-      return acc;
-    },
-    [],
-  );
+              {prefixSymbol}
+            </Text>{" "}
+            {colorizeLine(displayContent, language)}
+          </Text>
+        )}
+      </Box>,
+    );
+    return acc;
+  }, []);
 
   if (useMaxSizedBox) {
     return (
-      <MaxSizedBox
-        maxHeight={availableTerminalHeight}
-        maxWidth={terminalWidth}
-        key={key}
-      >
+      <MaxSizedBox maxHeight={availableTerminalHeight} maxWidth={terminalWidth} key={key}>
         {content}
       </MaxSizedBox>
     );
@@ -414,21 +387,21 @@ const renderDiffContent = (
 
 const getLanguageFromExtension = (extension: string): string | null => {
   const languageMap: { [key: string]: string } = {
-    js: 'javascript',
-    ts: 'typescript',
-    py: 'python',
-    json: 'json',
-    css: 'css',
-    html: 'html',
-    sh: 'bash',
-    md: 'markdown',
-    yaml: 'yaml',
-    yml: 'yaml',
-    txt: 'plaintext',
-    java: 'java',
-    c: 'c',
-    cpp: 'cpp',
-    rb: 'ruby',
+    js: "javascript",
+    ts: "typescript",
+    py: "python",
+    json: "json",
+    css: "css",
+    html: "html",
+    sh: "bash",
+    md: "markdown",
+    yaml: "yaml",
+    yml: "yaml",
+    txt: "plaintext",
+    java: "java",
+    c: "c",
+    cpp: "cpp",
+    rb: "ruby",
   };
   return languageMap[extension] || null; // Return null if extension not found
 };
diff --git a/packages/ui-gemini/src/ui/components/messages/ErrorMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/ErrorMessage.test.tsx
index 1c605e012..7ecc7abab 100644
--- a/packages/ui-gemini/src/ui/components/messages/ErrorMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ErrorMessage.test.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { ErrorMessage } from './ErrorMessage.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { ErrorMessage } from "./ErrorMessage.js";
 
-describe('ErrorMessage', () => {
-  it('renders with the correct prefix and text', () => {
+describe("ErrorMessage", () => {
+  it("renders with the correct prefix and text", () => {
     const { lastFrame } = render(<ErrorMessage text="Something went wrong" />);
     const output = lastFrame();
 
     expect(output).toMatchSnapshot();
   });
 
-  it('renders multiline error messages', () => {
-    const message = 'Error line 1\nError line 2';
+  it("renders multiline error messages", () => {
+    const message = "Error line 1\nError line 2";
     const { lastFrame } = render(<ErrorMessage text={message} />);
     const output = lastFrame();
 
diff --git a/packages/ui-gemini/src/ui/components/messages/ErrorMessage.tsx b/packages/ui-gemini/src/ui/components/messages/ErrorMessage.tsx
index 71794ee41..452cd1b1e 100644
--- a/packages/ui-gemini/src/ui/components/messages/ErrorMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ErrorMessage.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
 
 interface ErrorMessageProps {
   text: string;
 }
 
 export const ErrorMessage: React.FC<ErrorMessageProps> = ({ text }) => {
-  const prefix = '✕ ';
+  const prefix = "✕ ";
   const prefixWidth = prefix.length;
 
   return (
diff --git a/packages/ui-gemini/src/ui/components/messages/GeminiMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/GeminiMessage.test.tsx
index 06a551554..fe2d47937 100644
--- a/packages/ui-gemini/src/ui/components/messages/GeminiMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/GeminiMessage.test.tsx
@@ -4,46 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { GeminiMessage } from './GeminiMessage.js';
-import { StreamingState } from '../../types.js';
-import { renderWithProviders } from '../../../test-utils/render.js';
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { StreamingState } from "../../types.js";
+import { GeminiMessage } from "./GeminiMessage.js";
 
-describe('<GeminiMessage /> - Raw Markdown Display Snapshots', () => {
+describe("<GeminiMessage /> - Raw Markdown Display Snapshots", () => {
   const baseProps = {
-    text: 'Test **bold** and `code` markdown\n\n```javascript\nconst x = 1;\n```',
+    text: "Test **bold** and `code` markdown\n\n```javascript\nconst x = 1;\n```",
     isPending: false,
     terminalWidth: 80,
   };
 
   it.each([
-    { renderMarkdown: true, description: '(default)' },
+    { renderMarkdown: true, description: "(default)" },
     {
       renderMarkdown: false,
-      description: '(raw markdown with syntax highlighting, no line numbers)',
+      description: "(raw markdown with syntax highlighting, no line numbers)",
     },
-  ])(
-    'renders with renderMarkdown=$renderMarkdown $description',
-    ({ renderMarkdown }) => {
-      const { lastFrame } = renderWithProviders(
-        <GeminiMessage {...baseProps} />,
-        {
-          uiState: { renderMarkdown, streamingState: StreamingState.Idle },
-        },
-      );
-      expect(lastFrame()).toMatchSnapshot();
-    },
-  );
+  ])("renders with renderMarkdown=$renderMarkdown $description", ({ renderMarkdown }) => {
+    const { lastFrame } = renderWithProviders(<GeminiMessage {...baseProps} />, {
+      uiState: { renderMarkdown, streamingState: StreamingState.Idle },
+    });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
-  it.each([{ renderMarkdown: true }, { renderMarkdown: false }])(
-    'renders pending state with renderMarkdown=$renderMarkdown',
-    ({ renderMarkdown }) => {
-      const { lastFrame } = renderWithProviders(
-        <GeminiMessage {...baseProps} isPending={true} />,
-        {
-          uiState: { renderMarkdown, streamingState: StreamingState.Idle },
-        },
-      );
-      expect(lastFrame()).toMatchSnapshot();
-    },
-  );
+  it.each([
+    { renderMarkdown: true },
+    { renderMarkdown: false },
+  ])("renders pending state with renderMarkdown=$renderMarkdown", ({ renderMarkdown }) => {
+    const { lastFrame } = renderWithProviders(<GeminiMessage {...baseProps} isPending={true} />, {
+      uiState: { renderMarkdown, streamingState: StreamingState.Idle },
+    });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 });
diff --git a/packages/ui-gemini/src/ui/components/messages/GeminiMessage.tsx b/packages/ui-gemini/src/ui/components/messages/GeminiMessage.tsx
index 87a2b1b62..a40e2c5ce 100644
--- a/packages/ui-gemini/src/ui/components/messages/GeminiMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/GeminiMessage.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, Box } from 'ink';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import { theme } from '../../semantic-colors.js';
-import { SCREEN_READER_MODEL_PREFIX } from '../../textConstants.js';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { useAlternateBuffer } from "../../hooks/useAlternateBuffer.js";
+import { theme } from "../../semantic-colors.js";
+import { SCREEN_READER_MODEL_PREFIX } from "../../textConstants.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
 
 interface GeminiMessageProps {
   text: string;
@@ -26,7 +26,7 @@ export const GeminiMessage: React.FC<GeminiMessageProps> = ({
   terminalWidth,
 }) => {
   const { renderMarkdown } = useUIState();
-  const prefix = '✦ ';
+  const prefix = "✦ ";
   const prefixWidth = prefix.length;
 
   const isAlternateBuffer = useAlternateBuffer();
@@ -41,9 +41,7 @@ export const GeminiMessage: React.FC<GeminiMessageProps> = ({
         <MarkdownDisplay
           text={text}
           isPending={isPending}
-          availableTerminalHeight={
-            isAlternateBuffer ? undefined : availableTerminalHeight
-          }
+          availableTerminalHeight={isAlternateBuffer ? undefined : availableTerminalHeight}
           terminalWidth={terminalWidth}
           renderMarkdown={renderMarkdown}
         />
diff --git a/packages/ui-gemini/src/ui/components/messages/GeminiMessageContent.tsx b/packages/ui-gemini/src/ui/components/messages/GeminiMessageContent.tsx
index 965a0bcb0..1d2c96906 100644
--- a/packages/ui-gemini/src/ui/components/messages/GeminiMessageContent.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/GeminiMessageContent.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box } from 'ink';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
+import { Box } from "ink";
+import type React from "react";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { useAlternateBuffer } from "../../hooks/useAlternateBuffer.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
 
 interface GeminiMessageContentProps {
   text: string;
@@ -31,7 +31,7 @@ export const GeminiMessageContent: React.FC<GeminiMessageContentProps> = ({
 }) => {
   const { renderMarkdown } = useUIState();
   const isAlternateBuffer = useAlternateBuffer();
-  const originalPrefix = '✦ ';
+  const originalPrefix = "✦ ";
   const prefixWidth = originalPrefix.length;
 
   return (
@@ -39,9 +39,7 @@ export const GeminiMessageContent: React.FC<GeminiMessageContentProps> = ({
       <MarkdownDisplay
         text={text}
         isPending={isPending}
-        availableTerminalHeight={
-          isAlternateBuffer ? undefined : availableTerminalHeight
-        }
+        availableTerminalHeight={isAlternateBuffer ? undefined : availableTerminalHeight}
         terminalWidth={terminalWidth}
         renderMarkdown={renderMarkdown}
       />
diff --git a/packages/ui-gemini/src/ui/components/messages/InfoMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/InfoMessage.test.tsx
index d5c3c78de..751cefc01 100644
--- a/packages/ui-gemini/src/ui/components/messages/InfoMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/InfoMessage.test.tsx
@@ -4,29 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { InfoMessage } from './InfoMessage.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { InfoMessage } from "./InfoMessage.js";
 
-describe('InfoMessage', () => {
-  it('renders with the correct default prefix and text', () => {
+describe("InfoMessage", () => {
+  it("renders with the correct default prefix and text", () => {
     const { lastFrame } = render(<InfoMessage text="Just so you know" />);
     const output = lastFrame();
 
     expect(output).toMatchSnapshot();
   });
 
-  it('renders with a custom icon', () => {
-    const { lastFrame } = render(
-      <InfoMessage text="Custom icon test" icon="★" />,
-    );
+  it("renders with a custom icon", () => {
+    const { lastFrame } = render(<InfoMessage text="Custom icon test" icon="★" />);
     const output = lastFrame();
 
     expect(output).toMatchSnapshot();
   });
 
-  it('renders multiline info messages', () => {
-    const message = 'Info line 1\nInfo line 2';
+  it("renders multiline info messages", () => {
+    const message = "Info line 1\nInfo line 2";
     const { lastFrame } = render(<InfoMessage text={message} />);
     const output = lastFrame();
 
diff --git a/packages/ui-gemini/src/ui/components/messages/InfoMessage.tsx b/packages/ui-gemini/src/ui/components/messages/InfoMessage.tsx
index d092e292b..132bd5594 100644
--- a/packages/ui-gemini/src/ui/components/messages/InfoMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/InfoMessage.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import { RenderInline } from "../../utils/InlineMarkdownRenderer.js";
 
 interface InfoMessageProps {
   text: string;
@@ -15,13 +15,9 @@ interface InfoMessageProps {
   color?: string;
 }
 
-export const InfoMessage: React.FC<InfoMessageProps> = ({
-  text,
-  icon,
-  color,
-}) => {
+export const InfoMessage: React.FC<InfoMessageProps> = ({ text, icon, color }) => {
   color ??= theme.status.warning;
-  const prefix = icon ?? 'ℹ ';
+  const prefix = icon ?? "ℹ ";
   const prefixWidth = prefix.length;
 
   return (
@@ -30,7 +26,7 @@ export const InfoMessage: React.FC<InfoMessageProps> = ({
         <Text color={color}>{prefix}</Text>
       </Box>
       <Box flexGrow={1} flexDirection="column">
-        {text.split('\n').map((line, index) => (
+        {text.split("\n").map((line, index) => (
           <Text wrap="wrap" key={index}>
             <RenderInline text={line} defaultColor={color} />
           </Text>
diff --git a/packages/ui-gemini/src/ui/components/messages/ModelMessage.tsx b/packages/ui-gemini/src/ui/components/messages/ModelMessage.tsx
index bddbae8e8..d597e4b15 100644
--- a/packages/ui-gemini/src/ui/components/messages/ModelMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ModelMessage.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
 
 interface ModelMessageProps {
   model: string;
diff --git a/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.test.tsx
index 8dc43ca63..812105761 100644
--- a/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.test.tsx
@@ -4,22 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { act } from 'react';
-import {
-  ShellToolMessage,
-  type ShellToolMessageProps,
-} from './ShellToolMessage.js';
-import { StreamingState, ToolCallStatus } from '../../types.js';
-import { Text } from 'ink';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { waitFor } from '../../../test-utils/async.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { SHELL_TOOL_NAME } from '@airiscode/gemini-cli-core';
-import { SHELL_COMMAND_NAME } from '../../constants.js';
-import { StreamingContext } from '../../contexts/StreamingContext.js';
-
-vi.mock('../TerminalOutput.js', () => ({
+import type { Config } from "@airiscode/gemini-cli-core";
+import { SHELL_TOOL_NAME } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import React, { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../../test-utils/async.js";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { SHELL_COMMAND_NAME } from "../../constants.js";
+import { StreamingContext } from "../../contexts/StreamingContext.js";
+import { StreamingState, ToolCallStatus } from "../../types.js";
+import { ShellToolMessage, type ShellToolMessageProps } from "./ShellToolMessage.js";
+
+vi.mock("../TerminalOutput.js", () => ({
   TerminalOutput: function MockTerminalOutput({
     cursor,
   }: {
@@ -34,12 +31,8 @@ vi.mock('../TerminalOutput.js', () => ({
 }));
 
 // Mock child components or utilities if they are complex or have side effects
-vi.mock('../GeminiRespondingSpinner.js', () => ({
-  GeminiRespondingSpinner: ({
-    nonRespondingDisplay,
-  }: {
-    nonRespondingDisplay?: string;
-  }) => {
+vi.mock("../GeminiRespondingSpinner.js", () => ({
+  GeminiRespondingSpinner: ({ nonRespondingDisplay }: { nonRespondingDisplay?: string }) => {
     const streamingState = React.useContext(StreamingContext)!;
     if (streamingState === StreamingState.Responding) {
       return <Text>MockRespondingSpinner</Text>;
@@ -48,24 +41,24 @@ vi.mock('../GeminiRespondingSpinner.js', () => ({
   },
 }));
 
-vi.mock('../../utils/MarkdownDisplay.js', () => ({
+vi.mock("../../utils/MarkdownDisplay.js", () => ({
   MarkdownDisplay: function MockMarkdownDisplay({ text }: { text: string }) {
     return <Text>MockMarkdown:{text}</Text>;
   },
 }));
 
-describe('<ShellToolMessage />', () => {
+describe("<ShellToolMessage />", () => {
   const baseProps: ShellToolMessageProps = {
-    callId: 'tool-123',
+    callId: "tool-123",
     name: SHELL_COMMAND_NAME,
-    description: 'A shell command',
-    resultDisplay: 'Test result',
+    description: "A shell command",
+    resultDisplay: "Test result",
     status: ToolCallStatus.Executing,
     terminalWidth: 80,
     confirmationDetails: undefined,
-    emphasis: 'medium',
+    emphasis: "medium",
     isFirst: true,
-    borderColor: 'green',
+    borderColor: "green",
     borderDimColor: false,
     config: {
       getEnableInteractiveShell: () => true,
@@ -78,10 +71,7 @@ describe('<ShellToolMessage />', () => {
   };
 
   // Helper to render with context
-  const renderWithContext = (
-    ui: React.ReactElement,
-    streamingState: StreamingState,
-  ) =>
+  const renderWithContext = (ui: React.ReactElement, streamingState: StreamingState) =>
     renderWithProviders(ui, {
       uiActions,
       uiState: { streamingState },
@@ -91,12 +81,12 @@ describe('<ShellToolMessage />', () => {
     vi.clearAllMocks();
   });
 
-  describe('interactive shell focus', () => {
+  describe("interactive shell focus", () => {
     const shellProps: ShellToolMessageProps = {
       ...baseProps,
     };
 
-    it('clicks inside the shell area sets focus to true', async () => {
+    it("clicks inside the shell area sets focus to true", async () => {
       const { stdin, lastFrame, simulateClick } = renderWithProviders(
         <ShellToolMessage {...shellProps} />,
         {
@@ -106,7 +96,7 @@ describe('<ShellToolMessage />', () => {
       );
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('A shell command'); // Wait for render
+        expect(lastFrame()).toContain("A shell command"); // Wait for render
       });
 
       await simulateClick(stdin, 2, 2); // Click at column 2, row 2 (1-based)
@@ -116,7 +106,7 @@ describe('<ShellToolMessage />', () => {
       });
     });
 
-    it('handles focus for SHELL_TOOL_NAME (core shell tool)', async () => {
+    it("handles focus for SHELL_TOOL_NAME (core shell tool)", async () => {
       const coreShellProps: ShellToolMessageProps = {
         ...shellProps,
         name: SHELL_TOOL_NAME,
@@ -131,7 +121,7 @@ describe('<ShellToolMessage />', () => {
       );
 
       await waitFor(() => {
-        expect(lastFrame()).toContain('A shell command');
+        expect(lastFrame()).toContain("A shell command");
       });
 
       await simulateClick(stdin, 2, 2);
@@ -141,7 +131,7 @@ describe('<ShellToolMessage />', () => {
       });
     });
 
-    it('resets focus when shell finishes', async () => {
+    it("resets focus when shell finishes", async () => {
       let updateStatus: (s: ToolCallStatus) => void = () => {};
 
       const Wrapper = () => {
@@ -162,7 +152,7 @@ describe('<ShellToolMessage />', () => {
 
       // Verify it is initially focused
       await waitFor(() => {
-        expect(lastFrame()).toContain('(Focused)');
+        expect(lastFrame()).toContain("(Focused)");
       });
 
       // Now update status to Success
diff --git a/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.tsx b/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.tsx
index 5b41bb1a2..59e26cd82 100644
--- a/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ShellToolMessage.tsx
@@ -4,29 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Box, Text, type DOMElement } from 'ink';
-import { ToolCallStatus } from '../../types.js';
-import { ShellInputPrompt } from '../ShellInputPrompt.js';
-import { StickyHeader } from '../StickyHeader.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { SHELL_TOOL_NAME } from "@airiscode/gemini-cli-core";
+import { Box, type DOMElement, Text } from "ink";
+import React from "react";
+import { SHELL_COMMAND_NAME, SHELL_FOCUS_HINT_DELAY_MS, SHELL_NAME } from "../../constants.js";
+import { useUIActions } from "../../contexts/UIActionsContext.js";
+import { useMouseClick } from "../../hooks/useMouseClick.js";
+import { theme } from "../../semantic-colors.js";
+import { ToolCallStatus } from "../../types.js";
+import { ShellInputPrompt } from "../ShellInputPrompt.js";
+import { StickyHeader } from "../StickyHeader.js";
+import type { ToolMessageProps } from "./ToolMessage.js";
+import { ToolResultDisplay } from "./ToolResultDisplay.js";
 import {
-  SHELL_COMMAND_NAME,
-  SHELL_NAME,
-  SHELL_FOCUS_HINT_DELAY_MS,
-} from '../../constants.js';
-import { theme } from '../../semantic-colors.js';
-import { SHELL_TOOL_NAME } from '@airiscode/gemini-cli-core';
-import { useUIActions } from '../../contexts/UIActionsContext.js';
-import { useMouseClick } from '../../hooks/useMouseClick.js';
-import { ToolResultDisplay } from './ToolResultDisplay.js';
-import {
-  ToolStatusIndicator,
+  STATUS_INDICATOR_WIDTH,
   ToolInfo,
+  ToolStatusIndicator,
   TrailingIndicator,
-  STATUS_INDICATOR_WIDTH,
-} from './ToolShared.js';
-import type { ToolMessageProps } from './ToolMessage.js';
-import type { Config } from '@airiscode/gemini-cli-core';
+} from "./ToolShared.js";
 
 export interface ShellToolMessageProps extends ToolMessageProps {
   activeShellPtyId?: number | null;
@@ -41,7 +37,7 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
   status,
   availableTerminalHeight,
   terminalWidth,
-  emphasis = 'medium',
+  emphasis = "medium",
   renderOutputAsMarkdown = true,
   activeShellPtyId,
   embeddedShellFocused,
@@ -52,9 +48,7 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
   borderDimColor,
 }) => {
   const isThisShellFocused =
-    (name === SHELL_COMMAND_NAME ||
-      name === SHELL_NAME ||
-      name === SHELL_TOOL_NAME) &&
+    (name === SHELL_COMMAND_NAME || name === SHELL_NAME || name === SHELL_TOOL_NAME) &&
     status === ToolCallStatus.Executing &&
     ptyId === activeShellPtyId &&
     embeddedShellFocused;
@@ -63,9 +57,7 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
   const containerRef = React.useRef<DOMElement>(null);
   // The shell is focusable if it's the shell command, it's executing, and the interactive shell is enabled.
   const isThisShellFocusable =
-    (name === SHELL_COMMAND_NAME ||
-      name === SHELL_NAME ||
-      name === SHELL_TOOL_NAME) &&
+    (name === SHELL_COMMAND_NAME || name === SHELL_NAME || name === SHELL_TOOL_NAME) &&
     status === ToolCallStatus.Executing &&
     config?.getEnableInteractiveShell();
 
@@ -119,8 +111,7 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
     }
   }, [isThisShellFocused]);
 
-  const shouldShowFocusHint =
-    isThisShellFocusable && (showFocusHint || userHasFocused);
+  const shouldShowFocusHint = isThisShellFocusable && (showFocusHint || userHasFocused);
 
   return (
     <Box ref={containerRef} flexDirection="column" width={terminalWidth}>
@@ -131,20 +122,15 @@ export const ShellToolMessage: React.FC<ShellToolMessageProps> = ({
         borderDimColor={borderDimColor}
       >
         <ToolStatusIndicator status={status} name={name} />
-        <ToolInfo
-          name={name}
-          status={status}
-          description={description}
-          emphasis={emphasis}
-        />
+        <ToolInfo name={name} status={status} description={description} emphasis={emphasis} />
         {shouldShowFocusHint && (
           <Box marginLeft={1} flexShrink={0}>
             <Text color={theme.text.accent}>
-              {isThisShellFocused ? '(Focused)' : '(ctrl+f to focus)'}
+              {isThisShellFocused ? "(Focused)" : "(ctrl+f to focus)"}
             </Text>
           </Box>
         )}
-        {emphasis === 'high' && <TrailingIndicator />}
+        {emphasis === "high" && <TrailingIndicator />}
       </StickyHeader>
       <Box
         width={terminalWidth}
diff --git a/packages/ui-gemini/src/ui/components/messages/Todo.test.tsx b/packages/ui-gemini/src/ui/components/messages/Todo.test.tsx
index 5d2b96ca4..a7c8f483f 100644
--- a/packages/ui-gemini/src/ui/components/messages/Todo.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/Todo.test.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { describe, it, expect } from 'vitest';
-import { Box } from 'ink';
-import { TodoTray } from './Todo.js';
-import type { Todo } from '@airiscode/gemini-cli-core';
-import type { UIState } from '../../contexts/UIStateContext.js';
-import { UIStateContext } from '../../contexts/UIStateContext.js';
-import type { HistoryItem } from '../../types.js';
-import { ToolCallStatus } from '../../types.js';
+import type { Todo } from "@airiscode/gemini-cli-core";
+import { Box } from "ink";
+import { describe, expect, it } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import type { UIState } from "../../contexts/UIStateContext.js";
+import { UIStateContext } from "../../contexts/UIStateContext.js";
+import type { HistoryItem } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
+import { TodoTray } from "./Todo.js";
 
 const createTodoHistoryItem = (todos: Todo[]): HistoryItem =>
   ({
-    type: 'tool_group',
-    id: '1',
+    type: "tool_group",
+    id: "1",
     tools: [
       {
-        name: 'write_todos',
-        callId: 'tool-1',
+        name: "write_todos",
+        callId: "tool-1",
         status: ToolCallStatus.Success,
         resultDisplay: {
           todos,
@@ -30,117 +30,114 @@ const createTodoHistoryItem = (todos: Todo[]): HistoryItem =>
     ],
   }) as unknown as HistoryItem;
 
-describe.each([true, false])(
-  '<TodoTray /> (showFullTodos: %s)',
-  (showFullTodos: boolean) => {
-    const renderWithUiState = (uiState: Partial<UIState>) =>
-      render(
-        <UIStateContext.Provider value={uiState as UIState}>
-          <TodoTray />
-        </UIStateContext.Provider>,
-      );
+describe.each([true, false])("<TodoTray /> (showFullTodos: %s)", (showFullTodos: boolean) => {
+  const renderWithUiState = (uiState: Partial<UIState>) =>
+    render(
+      <UIStateContext.Provider value={uiState as UIState}>
+        <TodoTray />
+      </UIStateContext.Provider>,
+    );
 
-    it('renders null when no todos are in the history', () => {
-      const { lastFrame } = renderWithUiState({ history: [], showFullTodos });
-      expect(lastFrame()).toMatchSnapshot();
-    });
+  it("renders null when no todos are in the history", () => {
+    const { lastFrame } = renderWithUiState({ history: [], showFullTodos });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
-    it('renders null when todo list is empty', () => {
-      const { lastFrame } = renderWithUiState({
-        history: [createTodoHistoryItem([])],
-        showFullTodos,
-      });
-      expect(lastFrame()).toMatchSnapshot();
+  it("renders null when todo list is empty", () => {
+    const { lastFrame } = renderWithUiState({
+      history: [createTodoHistoryItem([])],
+      showFullTodos,
     });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
-    it('renders when todos exist but none are in progress', () => {
-      const { lastFrame } = renderWithUiState({
-        history: [
-          createTodoHistoryItem([
-            { description: 'Pending Task', status: 'pending' },
-            { description: 'In Progress Task', status: 'cancelled' },
-            { description: 'Completed Task', status: 'completed' },
-          ]),
-        ],
-        showFullTodos,
-      });
-      expect(lastFrame()).toMatchSnapshot();
+  it("renders when todos exist but none are in progress", () => {
+    const { lastFrame } = renderWithUiState({
+      history: [
+        createTodoHistoryItem([
+          { description: "Pending Task", status: "pending" },
+          { description: "In Progress Task", status: "cancelled" },
+          { description: "Completed Task", status: "completed" },
+        ]),
+      ],
+      showFullTodos,
     });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
-    it('renders when todos exist and one is in progress', () => {
-      const { lastFrame } = renderWithUiState({
-        history: [
-          createTodoHistoryItem([
-            { description: 'Pending Task', status: 'pending' },
-            { description: 'Task 2', status: 'in_progress' },
-            { description: 'In Progress Task', status: 'cancelled' },
-            { description: 'Completed Task', status: 'completed' },
-          ]),
-        ],
-        showFullTodos,
-      });
-      expect(lastFrame()).toMatchSnapshot();
+  it("renders when todos exist and one is in progress", () => {
+    const { lastFrame } = renderWithUiState({
+      history: [
+        createTodoHistoryItem([
+          { description: "Pending Task", status: "pending" },
+          { description: "Task 2", status: "in_progress" },
+          { description: "In Progress Task", status: "cancelled" },
+          { description: "Completed Task", status: "completed" },
+        ]),
+      ],
+      showFullTodos,
     });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
-    it('renders a todo list with long descriptions that wrap when full view is on', () => {
-      const { lastFrame } = render(
-        <Box width="50">
-          <UIStateContext.Provider
-            value={
-              {
-                history: [
-                  createTodoHistoryItem([
-                    {
-                      description:
-                        'This is a very long description for a pending task that should wrap around multiple lines when the terminal width is constrained.',
-                      status: 'in_progress',
-                    },
-                    {
-                      description:
-                        'Another completed task with an equally verbose description to test wrapping behavior.',
-                      status: 'completed',
-                    },
-                  ]),
-                ],
-                showFullTodos,
-              } as UIState
-            }
-          >
-            <TodoTray />
-          </UIStateContext.Provider>
-        </Box>,
-      );
-      expect(lastFrame()).toMatchSnapshot();
-    });
+  it("renders a todo list with long descriptions that wrap when full view is on", () => {
+    const { lastFrame } = render(
+      <Box width="50">
+        <UIStateContext.Provider
+          value={
+            {
+              history: [
+                createTodoHistoryItem([
+                  {
+                    description:
+                      "This is a very long description for a pending task that should wrap around multiple lines when the terminal width is constrained.",
+                    status: "in_progress",
+                  },
+                  {
+                    description:
+                      "Another completed task with an equally verbose description to test wrapping behavior.",
+                    status: "completed",
+                  },
+                ]),
+              ],
+              showFullTodos,
+            } as UIState
+          }
+        >
+          <TodoTray />
+        </UIStateContext.Provider>
+      </Box>,
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
-    it('renders the most recent todo list when multiple write_todos calls are in history', () => {
-      const { lastFrame } = renderWithUiState({
-        history: [
-          createTodoHistoryItem([
-            { description: 'Older Task 1', status: 'completed' },
-            { description: 'Older Task 2', status: 'pending' },
-          ]),
-          createTodoHistoryItem([
-            { description: 'Newer Task 1', status: 'pending' },
-            { description: 'Newer Task 2', status: 'in_progress' },
-          ]),
-        ],
-        showFullTodos,
-      });
-      expect(lastFrame()).toMatchSnapshot();
+  it("renders the most recent todo list when multiple write_todos calls are in history", () => {
+    const { lastFrame } = renderWithUiState({
+      history: [
+        createTodoHistoryItem([
+          { description: "Older Task 1", status: "completed" },
+          { description: "Older Task 2", status: "pending" },
+        ]),
+        createTodoHistoryItem([
+          { description: "Newer Task 1", status: "pending" },
+          { description: "Newer Task 2", status: "in_progress" },
+        ]),
+      ],
+      showFullTodos,
     });
+    expect(lastFrame()).toMatchSnapshot();
+  });
 
-    it('renders full list when all todos are inactive', () => {
-      const { lastFrame } = renderWithUiState({
-        history: [
-          createTodoHistoryItem([
-            { description: 'Task 1', status: 'completed' },
-            { description: 'Task 2', status: 'cancelled' },
-          ]),
-        ],
-        showFullTodos,
-      });
-      expect(lastFrame()).toMatchSnapshot();
+  it("renders full list when all todos are inactive", () => {
+    const { lastFrame } = renderWithUiState({
+      history: [
+        createTodoHistoryItem([
+          { description: "Task 1", status: "completed" },
+          { description: "Task 2", status: "cancelled" },
+        ]),
+      ],
+      showFullTodos,
     });
-  },
-);
+    expect(lastFrame()).toMatchSnapshot();
+  });
+});
diff --git a/packages/ui-gemini/src/ui/components/messages/Todo.tsx b/packages/ui-gemini/src/ui/components/messages/Todo.tsx
index 0c166db8f..4597efad1 100644
--- a/packages/ui-gemini/src/ui/components/messages/Todo.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/Todo.tsx
@@ -4,26 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import {
-  type Todo,
-  type TodoList,
-  type TodoStatus,
-} from '@airiscode/gemini-cli-core';
-import { theme } from '../../semantic-colors.js';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { useMemo } from 'react';
-import type { HistoryItemToolGroup } from '../../types.js';
+import { type Todo, type TodoList, type TodoStatus } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useMemo } from "react";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { theme } from "../../semantic-colors.js";
+import type { HistoryItemToolGroup } from "../../types.js";
 
 const TodoTitleDisplay: React.FC<{ todos: TodoList }> = ({ todos }) => {
   const score = useMemo(() => {
     let total = 0;
     let completed = 0;
     for (const todo of todos.todos) {
-      if (todo.status !== 'cancelled') {
+      if (todo.status !== "cancelled") {
         total += 1;
-        if (todo.status === 'completed') {
+        if (todo.status === "completed") {
           completed += 1;
         }
       }
@@ -43,25 +39,25 @@ const TodoTitleDisplay: React.FC<{ todos: TodoList }> = ({ todos }) => {
 
 const TodoStatusDisplay: React.FC<{ status: TodoStatus }> = ({ status }) => {
   switch (status) {
-    case 'completed':
+    case "completed":
       return (
         <Text color={theme.status.success} aria-label="Completed">
           ✓
         </Text>
       );
-    case 'in_progress':
+    case "in_progress":
       return (
         <Text color={theme.text.accent} aria-label="In Progress">
           »
         </Text>
       );
-    case 'pending':
+    case "pending":
       return (
         <Text color={theme.text.secondary} aria-label="Pending">
           ☐
         </Text>
       );
-    case 'cancelled':
+    case "cancelled":
     default:
       return (
         <Text color={theme.status.error} aria-label="Cancelled">
@@ -73,21 +69,21 @@ const TodoStatusDisplay: React.FC<{ status: TodoStatus }> = ({ status }) => {
 
 const TodoItemDisplay: React.FC<{
   todo: Todo;
-  wrap?: 'truncate';
-  role?: 'listitem';
+  wrap?: "truncate";
+  role?: "listitem";
 }> = ({ todo, wrap, role: ariaRole }) => {
   const textColor = (() => {
     switch (todo.status) {
-      case 'in_progress':
+      case "in_progress":
         return theme.text.accent;
-      case 'completed':
-      case 'cancelled':
+      case "completed":
+      case "cancelled":
         return theme.text.secondary;
       default:
         return theme.text.primary;
     }
   })();
-  const strikethrough = todo.status === 'cancelled';
+  const strikethrough = todo.status === "cancelled";
 
   return (
     <Box flexDirection="row" columnGap={1} aria-role={ariaRole}>
@@ -108,15 +104,12 @@ export const TodoTray: React.FC = () => {
     // Find the most recent todo list written by the WriteTodosTool
     for (let i = uiState.history.length - 1; i >= 0; i--) {
       const entry = uiState.history[i];
-      if (entry.type !== 'tool_group') {
+      if (entry.type !== "tool_group") {
         continue;
       }
       const toolGroup = entry as HistoryItemToolGroup;
       for (const tool of toolGroup.tools) {
-        if (
-          typeof tool.resultDisplay !== 'object' ||
-          !('todos' in tool.resultDisplay)
-        ) {
+        if (typeof tool.resultDisplay !== "object" || !("todos" in tool.resultDisplay)) {
           continue;
         }
         return tool.resultDisplay as TodoList;
@@ -129,14 +122,12 @@ export const TodoTray: React.FC = () => {
     if (todos === null) {
       return null;
     }
-    return todos.todos.find((todo) => todo.status === 'in_progress') || null;
+    return todos.todos.find((todo) => todo.status === "in_progress") || null;
   }, [todos]);
 
   const hasActiveTodos = useMemo(() => {
     if (!todos || !todos.todos) return false;
-    return todos.todos.some(
-      (todo) => todo.status === 'pending' || todo.status === 'in_progress',
-    );
+    return todos.todos.some((todo) => todo.status === "pending" || todo.status === "in_progress");
   }, [todos]);
 
   if (
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.test.tsx
index e305bbb30..ac7a01f44 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.test.tsx
@@ -4,26 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
-import type {
-  ToolCallConfirmationDetails,
-  Config,
-} from '@airiscode/gemini-cli-core';
-import { renderWithProviders } from '../../../test-utils/render.js';
-
-describe('ToolConfirmationMessage', () => {
+import type { Config, ToolCallConfirmationDetails } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { ToolConfirmationMessage } from "./ToolConfirmationMessage.js";
+
+describe("ToolConfirmationMessage", () => {
   const mockConfig = {
     isTrustedFolder: () => true,
     getIdeMode: () => false,
   } as unknown as Config;
 
-  it('should not display urls if prompt and url are the same', () => {
+  it("should not display urls if prompt and url are the same", () => {
     const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
-      title: 'Confirm Web Fetch',
-      prompt: 'https://example.com',
-      urls: ['https://example.com'],
+      type: "info",
+      title: "Confirm Web Fetch",
+      prompt: "https://example.com",
+      urls: ["https://example.com"],
       onConfirm: vi.fn(),
     };
 
@@ -39,15 +36,12 @@ describe('ToolConfirmationMessage', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should display urls if prompt and url are different', () => {
+  it("should display urls if prompt and url are different", () => {
     const confirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
-      title: 'Confirm Web Fetch',
-      prompt:
-        'fetch https://github.com/google/gemini-react/blob/main/README.md',
-      urls: [
-        'https://raw.githubusercontent.com/google/gemini-react/main/README.md',
-      ],
+      type: "info",
+      title: "Confirm Web Fetch",
+      prompt: "fetch https://github.com/google/gemini-react/blob/main/README.md",
+      urls: ["https://raw.githubusercontent.com/google/gemini-react/main/README.md"],
       onConfirm: vi.fn(),
     };
 
@@ -63,65 +57,65 @@ describe('ToolConfirmationMessage', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  describe('with folder trust', () => {
+  describe("with folder trust", () => {
     const editConfirmationDetails: ToolCallConfirmationDetails = {
-      type: 'edit',
-      title: 'Confirm Edit',
-      fileName: 'test.txt',
-      filePath: '/test.txt',
-      fileDiff: '...diff...',
-      originalContent: 'a',
-      newContent: 'b',
+      type: "edit",
+      title: "Confirm Edit",
+      fileName: "test.txt",
+      filePath: "/test.txt",
+      fileDiff: "...diff...",
+      originalContent: "a",
+      newContent: "b",
       onConfirm: vi.fn(),
     };
 
     const execConfirmationDetails: ToolCallConfirmationDetails = {
-      type: 'exec',
-      title: 'Confirm Execution',
+      type: "exec",
+      title: "Confirm Execution",
       command: 'echo "hello"',
-      rootCommand: 'echo',
+      rootCommand: "echo",
       onConfirm: vi.fn(),
     };
 
     const infoConfirmationDetails: ToolCallConfirmationDetails = {
-      type: 'info',
-      title: 'Confirm Web Fetch',
-      prompt: 'https://example.com',
-      urls: ['https://example.com'],
+      type: "info",
+      title: "Confirm Web Fetch",
+      prompt: "https://example.com",
+      urls: ["https://example.com"],
       onConfirm: vi.fn(),
     };
 
     const mcpConfirmationDetails: ToolCallConfirmationDetails = {
-      type: 'mcp',
-      title: 'Confirm MCP Tool',
-      serverName: 'test-server',
-      toolName: 'test-tool',
-      toolDisplayName: 'Test Tool',
+      type: "mcp",
+      title: "Confirm MCP Tool",
+      serverName: "test-server",
+      toolName: "test-tool",
+      toolDisplayName: "Test Tool",
       onConfirm: vi.fn(),
     };
 
     describe.each([
       {
-        description: 'for edit confirmations',
+        description: "for edit confirmations",
         details: editConfirmationDetails,
-        alwaysAllowText: 'Yes, allow always',
+        alwaysAllowText: "Yes, allow always",
       },
       {
-        description: 'for exec confirmations',
+        description: "for exec confirmations",
         details: execConfirmationDetails,
-        alwaysAllowText: 'Yes, allow always',
+        alwaysAllowText: "Yes, allow always",
       },
       {
-        description: 'for info confirmations',
+        description: "for info confirmations",
         details: infoConfirmationDetails,
-        alwaysAllowText: 'Yes, allow always',
+        alwaysAllowText: "Yes, allow always",
       },
       {
-        description: 'for mcp confirmations',
+        description: "for mcp confirmations",
         details: mcpConfirmationDetails,
-        alwaysAllowText: 'always allow',
+        alwaysAllowText: "always allow",
       },
-    ])('$description', ({ details }) => {
+    ])("$description", ({ details }) => {
       it('should show "allow always" when folder is trusted', () => {
         const mockConfig = {
           isTrustedFolder: () => true,
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.tsx
index 06af0f6bf..9f0325b3e 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolConfirmationMessage.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useState, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { DiffRenderer } from './DiffRenderer.js';
-import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
 import type {
+  Config,
   ToolCallConfirmationDetails,
   ToolExecuteConfirmationDetails,
   ToolMcpConfirmationDetails,
-  Config,
-} from '@airiscode/gemini-cli-core';
-import { IdeClient, ToolConfirmationOutcome } from '@airiscode/gemini-cli-core';
-import type { RadioSelectItem } from '../shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from '../shared/RadioButtonSelect.js';
-import { MaxSizedBox } from '../shared/MaxSizedBox.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { theme } from '../../semantic-colors.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
+} from "@airiscode/gemini-cli-core";
+import { IdeClient, ToolConfirmationOutcome } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useMemo, useState } from "react";
+import { useAlternateBuffer } from "../../hooks/useAlternateBuffer.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { RenderInline } from "../../utils/InlineMarkdownRenderer.js";
+import { MaxSizedBox } from "../shared/MaxSizedBox.js";
+import type { RadioSelectItem } from "../shared/RadioButtonSelect.js";
+import { RadioButtonSelect } from "../shared/RadioButtonSelect.js";
+import { DiffRenderer } from "./DiffRenderer.js";
 
 export interface ToolConfirmationMessageProps {
   confirmationDetails: ToolCallConfirmationDetails;
@@ -31,9 +31,7 @@ export interface ToolConfirmationMessageProps {
   terminalWidth: number;
 }
 
-export const ToolConfirmationMessage: React.FC<
-  ToolConfirmationMessageProps
-> = ({
+export const ToolConfirmationMessage: React.FC<ToolConfirmationMessageProps> = ({
   confirmationDetails,
   config,
   isFocused = true,
@@ -66,14 +64,10 @@ export const ToolConfirmationMessage: React.FC<
   }, [config]);
 
   const handleConfirm = async (outcome: ToolConfirmationOutcome) => {
-    if (confirmationDetails.type === 'edit') {
+    if (confirmationDetails.type === "edit") {
       if (config.getIdeMode() && isDiffingEnabled) {
-        const cliOutcome =
-          outcome === ToolConfirmationOutcome.Cancel ? 'rejected' : 'accepted';
-        await ideClient?.resolveDiffFromCli(
-          confirmationDetails.filePath,
-          cliOutcome,
-        );
+        const cliOutcome = outcome === ToolConfirmationOutcome.Cancel ? "rejected" : "accepted";
+        await ideClient?.resolveDiffFromCli(confirmationDetails.filePath, cliOutcome);
       }
     }
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -85,7 +79,7 @@ export const ToolConfirmationMessage: React.FC<
   useKeypress(
     (key) => {
       if (!isFocused) return;
-      if (key.name === 'escape' || (key.ctrl && key.name === 'c')) {
+      if (key.name === "escape" || (key.ctrl && key.name === "c")) {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         handleConfirm(ToolConfirmationOutcome.Cancel);
       }
@@ -97,47 +91,46 @@ export const ToolConfirmationMessage: React.FC<
 
   const { question, bodyContent, options } = useMemo(() => {
     let bodyContent: React.ReactNode | null = null;
-    let question = '';
+    let question = "";
     const options: Array<RadioSelectItem<ToolConfirmationOutcome>> = [];
 
-    if (confirmationDetails.type === 'edit') {
+    if (confirmationDetails.type === "edit") {
       if (!confirmationDetails.isModifying) {
         question = `Apply this change?`;
         options.push({
-          label: 'Yes, allow once',
+          label: "Yes, allow once",
           value: ToolConfirmationOutcome.ProceedOnce,
-          key: 'Yes, allow once',
+          key: "Yes, allow once",
         });
         if (isTrustedFolder) {
           options.push({
-            label: 'Yes, allow always',
+            label: "Yes, allow always",
             value: ToolConfirmationOutcome.ProceedAlways,
-            key: 'Yes, allow always',
+            key: "Yes, allow always",
           });
         }
         if (!config.getIdeMode() || !isDiffingEnabled) {
           options.push({
-            label: 'Modify with external editor',
+            label: "Modify with external editor",
             value: ToolConfirmationOutcome.ModifyWithEditor,
-            key: 'Modify with external editor',
+            key: "Modify with external editor",
           });
         }
 
         options.push({
-          label: 'No, suggest changes (esc)',
+          label: "No, suggest changes (esc)",
           value: ToolConfirmationOutcome.Cancel,
-          key: 'No, suggest changes (esc)',
+          key: "No, suggest changes (esc)",
         });
       }
-    } else if (confirmationDetails.type === 'exec') {
-      const executionProps =
-        confirmationDetails as ToolExecuteConfirmationDetails;
+    } else if (confirmationDetails.type === "exec") {
+      const executionProps = confirmationDetails as ToolExecuteConfirmationDetails;
 
       question = `Allow execution of: '${executionProps.rootCommand}'?`;
       options.push({
-        label: 'Yes, allow once',
+        label: "Yes, allow once",
         value: ToolConfirmationOutcome.ProceedOnce,
-        key: 'Yes, allow once',
+        key: "Yes, allow once",
       });
       if (isTrustedFolder) {
         options.push({
@@ -147,37 +140,37 @@ export const ToolConfirmationMessage: React.FC<
         });
       }
       options.push({
-        label: 'No, suggest changes (esc)',
+        label: "No, suggest changes (esc)",
         value: ToolConfirmationOutcome.Cancel,
-        key: 'No, suggest changes (esc)',
+        key: "No, suggest changes (esc)",
       });
-    } else if (confirmationDetails.type === 'info') {
+    } else if (confirmationDetails.type === "info") {
       question = `Do you want to proceed?`;
       options.push({
-        label: 'Yes, allow once',
+        label: "Yes, allow once",
         value: ToolConfirmationOutcome.ProceedOnce,
-        key: 'Yes, allow once',
+        key: "Yes, allow once",
       });
       if (isTrustedFolder) {
         options.push({
-          label: 'Yes, allow always',
+          label: "Yes, allow always",
           value: ToolConfirmationOutcome.ProceedAlways,
-          key: 'Yes, allow always',
+          key: "Yes, allow always",
         });
       }
       options.push({
-        label: 'No, suggest changes (esc)',
+        label: "No, suggest changes (esc)",
         value: ToolConfirmationOutcome.Cancel,
-        key: 'No, suggest changes (esc)',
+        key: "No, suggest changes (esc)",
       });
     } else {
       // mcp tool confirmation
       const mcpProps = confirmationDetails as ToolMcpConfirmationDetails;
       question = `Allow execution of MCP tool "${mcpProps.toolName}" from server "${mcpProps.serverName}"?`;
       options.push({
-        label: 'Yes, allow once',
+        label: "Yes, allow once",
         value: ToolConfirmationOutcome.ProceedOnce,
-        key: 'Yes, allow once',
+        key: "Yes, allow once",
       });
       if (isTrustedFolder) {
         options.push({
@@ -192,9 +185,9 @@ export const ToolConfirmationMessage: React.FC<
         });
       }
       options.push({
-        label: 'No, suggest changes (esc)',
+        label: "No, suggest changes (esc)",
         value: ToolConfirmationOutcome.Cancel,
-        key: 'No, suggest changes (esc)',
+        key: "No, suggest changes (esc)",
       });
     }
 
@@ -226,7 +219,7 @@ export const ToolConfirmationMessage: React.FC<
       return Math.max(availableTerminalHeight - surroundingElementsHeight, 1);
     }
 
-    if (confirmationDetails.type === 'edit') {
+    if (confirmationDetails.type === "edit") {
       if (!confirmationDetails.isModifying) {
         bodyContent = (
           <DiffRenderer
@@ -237,9 +230,8 @@ export const ToolConfirmationMessage: React.FC<
           />
         );
       }
-    } else if (confirmationDetails.type === 'exec') {
-      const executionProps =
-        confirmationDetails as ToolExecuteConfirmationDetails;
+    } else if (confirmationDetails.type === "exec") {
+      const executionProps = confirmationDetails as ToolExecuteConfirmationDetails;
       let bodyContentHeight = availableBodyContentHeight();
       if (bodyContentHeight !== undefined) {
         bodyContentHeight -= 2; // Account for padding;
@@ -254,35 +246,26 @@ export const ToolConfirmationMessage: React.FC<
       bodyContent = isAlternateBuffer ? (
         commandBox
       ) : (
-        <MaxSizedBox
-          maxHeight={bodyContentHeight}
-          maxWidth={Math.max(terminalWidth, 1)}
-        >
+        <MaxSizedBox maxHeight={bodyContentHeight} maxWidth={Math.max(terminalWidth, 1)}>
           {commandBox}
         </MaxSizedBox>
       );
-    } else if (confirmationDetails.type === 'info') {
+    } else if (confirmationDetails.type === "info") {
       const infoProps = confirmationDetails;
       const displayUrls =
-        infoProps.urls &&
-        !(
-          infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt
-        );
+        infoProps.urls && !(infoProps.urls.length === 1 && infoProps.urls[0] === infoProps.prompt);
 
       bodyContent = (
         <Box flexDirection="column">
           <Text color={theme.text.link}>
-            <RenderInline
-              text={infoProps.prompt}
-              defaultColor={theme.text.link}
-            />
+            <RenderInline text={infoProps.prompt} defaultColor={theme.text.link} />
           </Text>
           {displayUrls && infoProps.urls && infoProps.urls.length > 0 && (
             <Box flexDirection="column" marginTop={1}>
               <Text color={theme.text.primary}>URLs to fetch:</Text>
               {infoProps.urls.map((url) => (
                 <Text key={url}>
-                  {' '}
+                  {" "}
                   - <RenderInline text={url} />
                 </Text>
               ))}
@@ -313,7 +296,7 @@ export const ToolConfirmationMessage: React.FC<
     isAlternateBuffer,
   ]);
 
-  if (confirmationDetails.type === 'edit') {
+  if (confirmationDetails.type === "edit") {
     if (confirmationDetails.isModifying) {
       return (
         <Box
@@ -326,9 +309,7 @@ export const ToolConfirmationMessage: React.FC<
           overflow="hidden"
         >
           <Text color={theme.text.primary}>Modify in progress: </Text>
-          <Text color={theme.status.success}>
-            Save and close external editor to continue
-          </Text>
+          <Text color={theme.status.success}>Save and close external editor to continue</Text>
         </Box>
       );
     }
@@ -349,11 +330,7 @@ export const ToolConfirmationMessage: React.FC<
 
       {/* Select Input for Options */}
       <Box flexShrink={0}>
-        <RadioButtonSelect
-          items={options}
-          onSelect={handleSelect}
-          isFocused={isFocused}
-        />
+        <RadioButtonSelect items={options} onSelect={handleSelect} isFocused={isFocused} />
       </Box>
     </Box>
   );
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.test.tsx
index ee1e15763..89c0b7569 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.test.tsx
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { ToolGroupMessage } from './ToolGroupMessage.js';
-import type { IndividualToolCallDisplay } from '../../types.js';
-import { ToolCallStatus } from '../../types.js';
-import { Scrollable } from '../shared/Scrollable.js';
+import { describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import type { IndividualToolCallDisplay } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
+import { Scrollable } from "../shared/Scrollable.js";
+import { ToolGroupMessage } from "./ToolGroupMessage.js";
 
-describe('<ToolGroupMessage />', () => {
+describe("<ToolGroupMessage />", () => {
   const createToolCall = (
     overrides: Partial<IndividualToolCallDisplay> = {},
   ): IndividualToolCallDisplay => ({
-    callId: 'tool-123',
-    name: 'test-tool',
-    description: 'A tool for testing',
-    resultDisplay: 'Test result',
+    callId: "tool-123",
+    name: "test-tool",
+    description: "A tool for testing",
+    resultDisplay: "Test result",
     status: ToolCallStatus.Success,
     confirmationDetails: undefined,
     renderOutputAsMarkdown: false,
@@ -31,8 +31,8 @@ describe('<ToolGroupMessage />', () => {
     isFocused: true,
   };
 
-  describe('Golden Snapshots', () => {
-    it('renders single successful tool call', () => {
+  describe("Golden Snapshots", () => {
+    it("renders single successful tool call", () => {
       const toolCalls = [createToolCall()];
       const { lastFrame, unmount } = renderWithProviders(
         <ToolGroupMessage {...baseProps} toolCalls={toolCalls} />,
@@ -41,24 +41,24 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders multiple tool calls with different statuses', () => {
+    it("renders multiple tool calls with different statuses", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'tool-1',
-          name: 'successful-tool',
-          description: 'This tool succeeded',
+          callId: "tool-1",
+          name: "successful-tool",
+          description: "This tool succeeded",
           status: ToolCallStatus.Success,
         }),
         createToolCall({
-          callId: 'tool-2',
-          name: 'pending-tool',
-          description: 'This tool is pending',
+          callId: "tool-2",
+          name: "pending-tool",
+          description: "This tool is pending",
           status: ToolCallStatus.Pending,
         }),
         createToolCall({
-          callId: 'tool-3',
-          name: 'error-tool',
-          description: 'This tool failed',
+          callId: "tool-3",
+          name: "error-tool",
+          description: "This tool failed",
           status: ToolCallStatus.Error,
         }),
       ];
@@ -69,17 +69,17 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders tool call awaiting confirmation', () => {
+    it("renders tool call awaiting confirmation", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'tool-confirm',
-          name: 'confirmation-tool',
-          description: 'This tool needs confirmation',
+          callId: "tool-confirm",
+          name: "confirmation-tool",
+          description: "This tool needs confirmation",
           status: ToolCallStatus.Confirming,
           confirmationDetails: {
-            type: 'info',
-            title: 'Confirm Tool Execution',
-            prompt: 'Are you sure you want to proceed?',
+            type: "info",
+            title: "Confirm Tool Execution",
+            prompt: "Are you sure you want to proceed?",
             onConfirm: vi.fn(),
           },
         }),
@@ -91,12 +91,12 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders shell command with yellow border', () => {
+    it("renders shell command with yellow border", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'shell-1',
-          name: 'run_shell_command',
-          description: 'Execute shell command',
+          callId: "shell-1",
+          name: "run_shell_command",
+          description: "Execute shell command",
           status: ToolCallStatus.Success,
         }),
       ];
@@ -107,24 +107,24 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders mixed tool calls including shell command', () => {
+    it("renders mixed tool calls including shell command", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'tool-1',
-          name: 'read_file',
-          description: 'Read a file',
+          callId: "tool-1",
+          name: "read_file",
+          description: "Read a file",
           status: ToolCallStatus.Success,
         }),
         createToolCall({
-          callId: 'tool-2',
-          name: 'run_shell_command',
-          description: 'Run command',
+          callId: "tool-2",
+          name: "run_shell_command",
+          description: "Run command",
           status: ToolCallStatus.Executing,
         }),
         createToolCall({
-          callId: 'tool-3',
-          name: 'write_file',
-          description: 'Write to file',
+          callId: "tool-3",
+          name: "write_file",
+          description: "Write to file",
           status: ToolCallStatus.Pending,
         }),
       ];
@@ -135,66 +135,52 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders with limited terminal height', () => {
+    it("renders with limited terminal height", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'tool-1',
-          name: 'tool-with-result',
-          description: 'Tool with output',
-          resultDisplay:
-            'This is a long result that might need height constraints',
+          callId: "tool-1",
+          name: "tool-with-result",
+          description: "Tool with output",
+          resultDisplay: "This is a long result that might need height constraints",
         }),
         createToolCall({
-          callId: 'tool-2',
-          name: 'another-tool',
-          description: 'Another tool',
-          resultDisplay: 'More output here',
+          callId: "tool-2",
+          name: "another-tool",
+          description: "Another tool",
+          resultDisplay: "More output here",
         }),
       ];
       const { lastFrame, unmount } = renderWithProviders(
-        <ToolGroupMessage
-          {...baseProps}
-          toolCalls={toolCalls}
-          availableTerminalHeight={10}
-        />,
+        <ToolGroupMessage {...baseProps} toolCalls={toolCalls} availableTerminalHeight={10} />,
       );
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
 
-    it('renders when not focused', () => {
+    it("renders when not focused", () => {
       const toolCalls = [createToolCall()];
       const { lastFrame, unmount } = renderWithProviders(
-        <ToolGroupMessage
-          {...baseProps}
-          toolCalls={toolCalls}
-          isFocused={false}
-        />,
+        <ToolGroupMessage {...baseProps} toolCalls={toolCalls} isFocused={false} />,
       );
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
 
-    it('renders with narrow terminal width', () => {
+    it("renders with narrow terminal width", () => {
       const toolCalls = [
         createToolCall({
-          name: 'very-long-tool-name-that-might-wrap',
-          description:
-            'This is a very long description that might cause wrapping issues',
+          name: "very-long-tool-name-that-might-wrap",
+          description: "This is a very long description that might cause wrapping issues",
         }),
       ];
       const { lastFrame, unmount } = renderWithProviders(
-        <ToolGroupMessage
-          {...baseProps}
-          toolCalls={toolCalls}
-          terminalWidth={40}
-        />,
+        <ToolGroupMessage {...baseProps} toolCalls={toolCalls} terminalWidth={40} />,
       );
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
 
-    it('renders empty tool calls array', () => {
+    it("renders empty tool calls array", () => {
       const { lastFrame, unmount } = renderWithProviders(
         <ToolGroupMessage {...baseProps} toolCalls={[]} />,
       );
@@ -202,20 +188,20 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders header when scrolled', () => {
+    it("renders header when scrolled", () => {
       const toolCalls = [
         createToolCall({
-          callId: '1',
-          name: 'tool-1',
+          callId: "1",
+          name: "tool-1",
           description:
-            'Description 1. This is a long description that will need to be truncated if the terminal width is small.',
-          resultDisplay: 'line1\nline2\nline3\nline4\nline5',
+            "Description 1. This is a long description that will need to be truncated if the terminal width is small.",
+          resultDisplay: "line1\nline2\nline3\nline4\nline5",
         }),
         createToolCall({
-          callId: '2',
-          name: 'tool-2',
-          description: 'Description 2',
-          resultDisplay: 'line1\nline2',
+          callId: "2",
+          name: "tool-2",
+          description: "Description 2",
+          resultDisplay: "line1\nline2",
         }),
       ];
       const { lastFrame, unmount } = renderWithProviders(
@@ -227,14 +213,14 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders tool call with outputFile', () => {
+    it("renders tool call with outputFile", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'tool-output-file',
-          name: 'tool-with-file',
-          description: 'Tool that saved output to file',
+          callId: "tool-output-file",
+          name: "tool-with-file",
+          description: "Tool that saved output to file",
           status: ToolCallStatus.Success,
-          outputFile: '/path/to/output.txt',
+          outputFile: "/path/to/output.txt",
         }),
       ];
       const { lastFrame, unmount } = renderWithProviders(
@@ -244,21 +230,21 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('renders two tool groups where only the last line of the previous group is visible', () => {
+    it("renders two tool groups where only the last line of the previous group is visible", () => {
       const toolCalls1 = [
         createToolCall({
-          callId: '1',
-          name: 'tool-1',
-          description: 'Description 1',
-          resultDisplay: 'line1\nline2\nline3\nline4\nline5',
+          callId: "1",
+          name: "tool-1",
+          description: "Description 1",
+          resultDisplay: "line1\nline2\nline3\nline4\nline5",
         }),
       ];
       const toolCalls2 = [
         createToolCall({
-          callId: '2',
-          name: 'tool-2',
-          description: 'Description 2',
-          resultDisplay: 'line1',
+          callId: "2",
+          name: "tool-2",
+          description: "Description 2",
+          resultDisplay: "line1",
         }),
       ];
 
@@ -273,8 +259,8 @@ describe('<ToolGroupMessage />', () => {
     });
   });
 
-  describe('Border Color Logic', () => {
-    it('uses yellow border when tools are pending', () => {
+  describe("Border Color Logic", () => {
+    it("uses yellow border when tools are pending", () => {
       const toolCalls = [createToolCall({ status: ToolCallStatus.Pending })];
       const { lastFrame, unmount } = renderWithProviders(
         <ToolGroupMessage {...baseProps} toolCalls={toolCalls} />,
@@ -284,10 +270,10 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('uses yellow border for shell commands even when successful', () => {
+    it("uses yellow border for shell commands even when successful", () => {
       const toolCalls = [
         createToolCall({
-          name: 'run_shell_command',
+          name: "run_shell_command",
           status: ToolCallStatus.Success,
         }),
       ];
@@ -298,12 +284,12 @@ describe('<ToolGroupMessage />', () => {
       unmount();
     });
 
-    it('uses gray border when all tools are successful and no shell commands', () => {
+    it("uses gray border when all tools are successful and no shell commands", () => {
       const toolCalls = [
         createToolCall({ status: ToolCallStatus.Success }),
         createToolCall({
-          callId: 'tool-2',
-          name: 'another-tool',
+          callId: "tool-2",
+          name: "another-tool",
           status: ToolCallStatus.Success,
         }),
       ];
@@ -315,56 +301,52 @@ describe('<ToolGroupMessage />', () => {
     });
   });
 
-  describe('Height Calculation', () => {
-    it('calculates available height correctly with multiple tools with results', () => {
+  describe("Height Calculation", () => {
+    it("calculates available height correctly with multiple tools with results", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'tool-1',
-          resultDisplay: 'Result 1',
+          callId: "tool-1",
+          resultDisplay: "Result 1",
         }),
         createToolCall({
-          callId: 'tool-2',
-          resultDisplay: 'Result 2',
+          callId: "tool-2",
+          resultDisplay: "Result 2",
         }),
         createToolCall({
-          callId: 'tool-3',
-          resultDisplay: '', // No result
+          callId: "tool-3",
+          resultDisplay: "", // No result
         }),
       ];
       const { lastFrame, unmount } = renderWithProviders(
-        <ToolGroupMessage
-          {...baseProps}
-          toolCalls={toolCalls}
-          availableTerminalHeight={20}
-        />,
+        <ToolGroupMessage {...baseProps} toolCalls={toolCalls} availableTerminalHeight={20} />,
       );
       expect(lastFrame()).toMatchSnapshot();
       unmount();
     });
   });
 
-  describe('Confirmation Handling', () => {
-    it('shows confirmation dialog for first confirming tool only', () => {
+  describe("Confirmation Handling", () => {
+    it("shows confirmation dialog for first confirming tool only", () => {
       const toolCalls = [
         createToolCall({
-          callId: 'tool-1',
-          name: 'first-confirm',
+          callId: "tool-1",
+          name: "first-confirm",
           status: ToolCallStatus.Confirming,
           confirmationDetails: {
-            type: 'info',
-            title: 'Confirm First Tool',
-            prompt: 'Confirm first tool',
+            type: "info",
+            title: "Confirm First Tool",
+            prompt: "Confirm first tool",
             onConfirm: vi.fn(),
           },
         }),
         createToolCall({
-          callId: 'tool-2',
-          name: 'second-confirm',
+          callId: "tool-2",
+          name: "second-confirm",
           status: ToolCallStatus.Confirming,
           confirmationDetails: {
-            type: 'info',
-            title: 'Confirm Second Tool',
-            prompt: 'Confirm second tool',
+            type: "info",
+            title: "Confirm Second Tool",
+            prompt: "Confirm second tool",
             onConfirm: vi.fn(),
           },
         }),
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.tsx b/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.tsx
index bf384bc09..974e1c44d 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolGroupMessage.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useMemo } from 'react';
-import { Box, Text } from 'ink';
-import type { IndividualToolCallDisplay } from '../../types.js';
-import { ToolCallStatus } from '../../types.js';
-import { ToolMessage } from './ToolMessage.js';
-import { ShellToolMessage } from './ShellToolMessage.js';
-import { ToolConfirmationMessage } from './ToolConfirmationMessage.js';
-import { theme } from '../../semantic-colors.js';
-import { SHELL_COMMAND_NAME, SHELL_NAME } from '../../constants.js';
-import { SHELL_TOOL_NAME } from '@airiscode/gemini-cli-core';
-import { useConfig } from '../../contexts/ConfigContext.js';
+import { SHELL_TOOL_NAME } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useMemo } from "react";
+import { SHELL_COMMAND_NAME, SHELL_NAME } from "../../constants.js";
+import { useConfig } from "../../contexts/ConfigContext.js";
+import { theme } from "../../semantic-colors.js";
+import type { IndividualToolCallDisplay } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
+import { ShellToolMessage } from "./ShellToolMessage.js";
+import { ToolConfirmationMessage } from "./ToolConfirmationMessage.js";
+import { ToolMessage } from "./ToolMessage.js";
 
 interface ToolGroupMessageProps {
   groupId: number;
@@ -39,14 +39,9 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
 }) => {
   const isEmbeddedShellFocused =
     embeddedShellFocused &&
-    toolCalls.some(
-      (t) =>
-        t.ptyId === activeShellPtyId && t.status === ToolCallStatus.Executing,
-    );
+    toolCalls.some((t) => t.ptyId === activeShellPtyId && t.status === ToolCallStatus.Executing);
 
-  const hasPending = !toolCalls.every(
-    (t) => t.status === ToolCallStatus.Success,
-  );
+  const hasPending = !toolCalls.every((t) => t.status === ToolCallStatus.Success);
 
   const config = useConfig();
   const isShellCommand = toolCalls.some(
@@ -59,8 +54,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
         ? theme.status.warning
         : theme.border.default;
 
-  const borderDimColor =
-    hasPending && (!isShellCommand || !isEmbeddedShellFocused);
+  const borderDimColor = hasPending && (!isShellCommand || !isEmbeddedShellFocused);
 
   const staticHeight = /* border */ 2 + /* marginBottom */ 1;
 
@@ -73,7 +67,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
 
   let countToolCallsWithResults = 0;
   for (const tool of toolCalls) {
-    if (tool.resultDisplay !== undefined && tool.resultDisplay !== '') {
+    if (tool.resultDisplay !== undefined && tool.resultDisplay !== "") {
       countToolCallsWithResults++;
     }
   }
@@ -115,22 +109,17 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
           availableTerminalHeight: availableTerminalHeightPerToolMessage,
           terminalWidth,
           emphasis: isConfirming
-            ? ('high' as const)
+            ? ("high" as const)
             : toolAwaitingApproval
-              ? ('low' as const)
-              : ('medium' as const),
+              ? ("low" as const)
+              : ("medium" as const),
           isFirst,
           borderColor,
           borderDimColor,
         };
 
         return (
-          <Box
-            key={tool.callId}
-            flexDirection="column"
-            minHeight={1}
-            width={terminalWidth}
-          >
+          <Box key={tool.callId} flexDirection="column" minHeight={1} width={terminalWidth}>
             {isShellTool ? (
               <ShellToolMessage
                 {...commonProps}
@@ -160,9 +149,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                     confirmationDetails={tool.confirmationDetails}
                     config={config}
                     isFocused={isFocused}
-                    availableTerminalHeight={
-                      availableTerminalHeightPerToolMessage
-                    }
+                    availableTerminalHeight={availableTerminalHeightPerToolMessage}
                     terminalWidth={terminalWidth - 4}
                   />
                 )}
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/ToolMessage.test.tsx
index bf1f6c71f..b1911af1e 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolMessage.test.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import type { ToolMessageProps } from './ToolMessage.js';
-import { ToolMessage } from './ToolMessage.js';
-import { StreamingState, ToolCallStatus } from '../../types.js';
-import { Text } from 'ink';
-import { StreamingContext } from '../../contexts/StreamingContext.js';
-import type { AnsiOutput } from '@airiscode/gemini-cli-core';
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-vi.mock('../TerminalOutput.js', () => ({
+import type { AnsiOutput } from "@airiscode/gemini-cli-core";
+import { Text } from "ink";
+import React from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { StreamingContext } from "../../contexts/StreamingContext.js";
+import { StreamingState, ToolCallStatus } from "../../types.js";
+import type { ToolMessageProps } from "./ToolMessage.js";
+import { ToolMessage } from "./ToolMessage.js";
+
+vi.mock("../TerminalOutput.js", () => ({
   TerminalOutput: function MockTerminalOutput({
     cursor,
   }: {
@@ -28,23 +28,19 @@ vi.mock('../TerminalOutput.js', () => ({
   },
 }));
 
-vi.mock('../AnsiOutput.js', () => ({
+vi.mock("../AnsiOutput.js", () => ({
   AnsiOutputText: function MockAnsiOutputText({ data }: { data: AnsiOutput }) {
     // Simple serialization for snapshot stability
     const serialized = data
-      .map((line) => line.map((token) => token.text || '').join(''))
-      .join('\n');
+      .map((line) => line.map((token) => token.text || "").join(""))
+      .join("\n");
     return <Text>MockAnsiOutput:{serialized}</Text>;
   },
 }));
 
 // Mock child components or utilities if they are complex or have side effects
-vi.mock('../GeminiRespondingSpinner.js', () => ({
-  GeminiRespondingSpinner: ({
-    nonRespondingDisplay,
-  }: {
-    nonRespondingDisplay?: string;
-  }) => {
+vi.mock("../GeminiRespondingSpinner.js", () => ({
+  GeminiRespondingSpinner: ({ nonRespondingDisplay }: { nonRespondingDisplay?: string }) => {
     const streamingState = React.useContext(StreamingContext)!;
     if (streamingState === StreamingState.Responding) {
       return <Text>MockRespondingSpinner</Text>;
@@ -52,33 +48,29 @@ vi.mock('../GeminiRespondingSpinner.js', () => ({
     return nonRespondingDisplay ? <Text>{nonRespondingDisplay}</Text> : null;
   },
 }));
-vi.mock('./DiffRenderer.js', () => ({
-  DiffRenderer: function MockDiffRenderer({
-    diffContent,
-  }: {
-    diffContent: string;
-  }) {
+vi.mock("./DiffRenderer.js", () => ({
+  DiffRenderer: function MockDiffRenderer({ diffContent }: { diffContent: string }) {
     return <Text>MockDiff:{diffContent}</Text>;
   },
 }));
-vi.mock('../../utils/MarkdownDisplay.js', () => ({
+vi.mock("../../utils/MarkdownDisplay.js", () => ({
   MarkdownDisplay: function MockMarkdownDisplay({ text }: { text: string }) {
     return <Text>MockMarkdown:{text}</Text>;
   },
 }));
 
-describe('<ToolMessage />', () => {
+describe("<ToolMessage />", () => {
   const baseProps: ToolMessageProps = {
-    callId: 'tool-123',
-    name: 'test-tool',
-    description: 'A tool for testing',
-    resultDisplay: 'Test result',
+    callId: "tool-123",
+    name: "test-tool",
+    description: "A tool for testing",
+    resultDisplay: "Test result",
     status: ToolCallStatus.Success,
     terminalWidth: 80,
     confirmationDetails: undefined,
-    emphasis: 'medium',
+    emphasis: "medium",
     isFirst: true,
-    borderColor: 'green',
+    borderColor: "green",
     borderDimColor: false,
   };
 
@@ -88,10 +80,7 @@ describe('<ToolMessage />', () => {
   };
 
   // Helper to render with context
-  const renderWithContext = (
-    ui: React.ReactElement,
-    streamingState: StreamingState,
-  ) =>
+  const renderWithContext = (ui: React.ReactElement, streamingState: StreamingState) =>
     renderWithProviders(ui, {
       uiActions,
       uiState: { streamingState },
@@ -101,17 +90,14 @@ describe('<ToolMessage />', () => {
     vi.clearAllMocks();
   });
 
-  it('renders basic tool information', () => {
-    const { lastFrame } = renderWithContext(
-      <ToolMessage {...baseProps} />,
-      StreamingState.Idle,
-    );
+  it("renders basic tool information", () => {
+    const { lastFrame } = renderWithContext(<ToolMessage {...baseProps} />, StreamingState.Idle);
     const output = lastFrame();
     expect(output).toMatchSnapshot();
   });
 
-  describe('ToolStatusIndicator rendering', () => {
-    it('shows ✓ for Success status', () => {
+  describe("ToolStatusIndicator rendering", () => {
+    it("shows ✓ for Success status", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Success} />,
         StreamingState.Idle,
@@ -119,7 +105,7 @@ describe('<ToolMessage />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('shows o for Pending status', () => {
+    it("shows o for Pending status", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Pending} />,
         StreamingState.Idle,
@@ -127,7 +113,7 @@ describe('<ToolMessage />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('shows ? for Confirming status', () => {
+    it("shows ? for Confirming status", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Confirming} />,
         StreamingState.Idle,
@@ -135,7 +121,7 @@ describe('<ToolMessage />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('shows - for Canceled status', () => {
+    it("shows - for Canceled status", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Canceled} />,
         StreamingState.Idle,
@@ -143,7 +129,7 @@ describe('<ToolMessage />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('shows x for Error status', () => {
+    it("shows x for Error status", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Error} />,
         StreamingState.Idle,
@@ -151,7 +137,7 @@ describe('<ToolMessage />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('shows paused spinner for Executing status when streamingState is Idle', () => {
+    it("shows paused spinner for Executing status when streamingState is Idle", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Executing} />,
         StreamingState.Idle,
@@ -159,7 +145,7 @@ describe('<ToolMessage />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('shows paused spinner for Executing status when streamingState is WaitingForConfirmation', () => {
+    it("shows paused spinner for Executing status when streamingState is WaitingForConfirmation", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Executing} />,
         StreamingState.WaitingForConfirmation,
@@ -167,7 +153,7 @@ describe('<ToolMessage />', () => {
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('shows MockRespondingSpinner for Executing status when streamingState is Responding', () => {
+    it("shows MockRespondingSpinner for Executing status when streamingState is Responding", () => {
       const { lastFrame } = renderWithContext(
         <ToolMessage {...baseProps} status={ToolCallStatus.Executing} />,
         StreamingState.Responding, // Simulate app still responding
@@ -176,12 +162,12 @@ describe('<ToolMessage />', () => {
     });
   });
 
-  it('renders DiffRenderer for diff results', () => {
+  it("renders DiffRenderer for diff results", () => {
     const diffResult = {
-      fileDiff: '--- a/file.txt\n+++ b/file.txt\n@@ -1 +1 @@\n-old\n+new',
-      fileName: 'file.txt',
-      originalContent: 'old',
-      newContent: 'new',
+      fileDiff: "--- a/file.txt\n+++ b/file.txt\n@@ -1 +1 @@\n-old\n+new",
+      fileName: "file.txt",
+      originalContent: "old",
+      newContent: "new",
     };
     const { lastFrame } = renderWithContext(
       <ToolMessage {...baseProps} resultDisplay={diffResult} />,
@@ -191,7 +177,7 @@ describe('<ToolMessage />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders emphasis correctly', () => {
+  it("renders emphasis correctly", () => {
     const { lastFrame: highEmphasisFrame } = renderWithContext(
       <ToolMessage {...baseProps} emphasis="high" />,
       StreamingState.Idle,
@@ -209,13 +195,13 @@ describe('<ToolMessage />', () => {
     expect(lowEmphasisFrame()).toMatchSnapshot();
   });
 
-  it('renders AnsiOutputText for AnsiOutput results', () => {
+  it("renders AnsiOutputText for AnsiOutput results", () => {
     const ansiResult: AnsiOutput = [
       [
         {
-          text: 'hello',
-          fg: '#ffffff',
-          bg: '#000000',
+          text: "hello",
+          fg: "#ffffff",
+          bg: "#000000",
           bold: false,
           italic: false,
           underline: false,
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolMessage.tsx b/packages/ui-gemini/src/ui/components/messages/ToolMessage.tsx
index 73c180494..171088045 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolMessage.tsx
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import type { IndividualToolCallDisplay } from '../../types.js';
-import { StickyHeader } from '../StickyHeader.js';
-import { ToolResultDisplay } from './ToolResultDisplay.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import { SHELL_COMMAND_NAME, SHELL_FOCUS_HINT_DELAY_MS } from "../../constants.js";
+import { useInactivityTimer } from "../../hooks/useInactivityTimer.js";
+import { theme } from "../../semantic-colors.js";
+import type { IndividualToolCallDisplay } from "../../types.js";
+import { ToolCallStatus } from "../../types.js";
+import { ShellInputPrompt } from "../ShellInputPrompt.js";
+import { StickyHeader } from "../StickyHeader.js";
+import { ToolResultDisplay } from "./ToolResultDisplay.js";
 import {
-  ToolStatusIndicator,
+  STATUS_INDICATOR_WIDTH,
+  type TextEmphasis,
   ToolInfo,
+  ToolStatusIndicator,
   TrailingIndicator,
-  type TextEmphasis,
-  STATUS_INDICATOR_WIDTH,
-} from './ToolShared.js';
-import {
-  SHELL_COMMAND_NAME,
-  SHELL_FOCUS_HINT_DELAY_MS,
-} from '../../constants.js';
-import { theme } from '../../semantic-colors.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { useInactivityTimer } from '../../hooks/useInactivityTimer.js';
-import { ToolCallStatus } from '../../types.js';
-import { ShellInputPrompt } from '../ShellInputPrompt.js';
+} from "./ToolShared.js";
 
 export type { TextEmphasis };
 
@@ -50,7 +47,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   status,
   availableTerminalHeight,
   terminalWidth,
-  emphasis = 'medium',
+  emphasis = "medium",
   renderOutputAsMarkdown = true,
   isFirst,
   borderColor,
@@ -61,7 +58,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   config,
 }) => {
   const isThisShellFocused =
-    (name === SHELL_COMMAND_NAME || name === 'Shell') &&
+    (name === SHELL_COMMAND_NAME || name === "Shell") &&
     status === ToolCallStatus.Executing &&
     ptyId === activeShellPtyId &&
     embeddedShellFocused;
@@ -87,12 +84,11 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   }, [isThisShellFocused]);
 
   const isThisShellFocusable =
-    (name === SHELL_COMMAND_NAME || name === 'Shell') &&
+    (name === SHELL_COMMAND_NAME || name === "Shell") &&
     status === ToolCallStatus.Executing &&
     config?.getEnableInteractiveShell();
 
-  const shouldShowFocusHint =
-    isThisShellFocusable && (showFocusHint || userHasFocused);
+  const shouldShowFocusHint = isThisShellFocusable && (showFocusHint || userHasFocused);
 
   return (
     <Box flexDirection="column" width={terminalWidth}>
@@ -103,20 +99,15 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
         borderDimColor={borderDimColor}
       >
         <ToolStatusIndicator status={status} name={name} />
-        <ToolInfo
-          name={name}
-          status={status}
-          description={description}
-          emphasis={emphasis}
-        />
+        <ToolInfo name={name} status={status} description={description} emphasis={emphasis} />
         {shouldShowFocusHint && (
           <Box marginLeft={1} flexShrink={0}>
             <Text color={theme.text.accent}>
-              {isThisShellFocused ? '(Focused)' : '(ctrl+f to focus)'}
+              {isThisShellFocused ? "(Focused)" : "(ctrl+f to focus)"}
             </Text>
           </Box>
         )}
-        {emphasis === 'high' && <TrailingIndicator />}
+        {emphasis === "high" && <TrailingIndicator />}
       </StickyHeader>
       <Box
         width={terminalWidth}
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolMessageRawMarkdown.test.tsx b/packages/ui-gemini/src/ui/components/messages/ToolMessageRawMarkdown.test.tsx
index b7c14f36b..baa4d65a1 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolMessageRawMarkdown.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolMessageRawMarkdown.test.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ToolMessageProps } from './ToolMessage.js';
-import { ToolMessage } from './ToolMessage.js';
-import { StreamingState, ToolCallStatus } from '../../types.js';
-import { StreamingContext } from '../../contexts/StreamingContext.js';
-import { renderWithProviders } from '../../../test-utils/render.js';
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { StreamingContext } from "../../contexts/StreamingContext.js";
+import { StreamingState, ToolCallStatus } from "../../types.js";
+import type { ToolMessageProps } from "./ToolMessage.js";
+import { ToolMessage } from "./ToolMessage.js";
 
-describe('<ToolMessage /> - Raw Markdown Display Snapshots', () => {
+describe("<ToolMessage /> - Raw Markdown Display Snapshots", () => {
   const baseProps: ToolMessageProps = {
-    callId: 'tool-123',
-    name: 'test-tool',
-    description: 'A tool for testing',
-    resultDisplay: 'Test **bold** and `code` markdown',
+    callId: "tool-123",
+    name: "test-tool",
+    description: "A tool for testing",
+    resultDisplay: "Test **bold** and `code` markdown",
     status: ToolCallStatus.Success,
     terminalWidth: 80,
     confirmationDetails: undefined,
-    emphasis: 'medium',
+    emphasis: "medium",
     isFirst: true,
-    borderColor: 'green',
+    borderColor: "green",
     borderDimColor: false,
   };
 
@@ -29,52 +29,50 @@ describe('<ToolMessage /> - Raw Markdown Display Snapshots', () => {
     {
       renderMarkdown: true,
       useAlternateBuffer: false,
-      description: '(default, regular buffer)',
+      description: "(default, regular buffer)",
     },
     {
       renderMarkdown: true,
       useAlternateBuffer: true,
-      description: '(default, alternate buffer)',
+      description: "(default, alternate buffer)",
     },
     {
       renderMarkdown: false,
       useAlternateBuffer: false,
-      description: '(raw markdown, regular buffer)',
+      description: "(raw markdown, regular buffer)",
     },
     {
       renderMarkdown: false,
       useAlternateBuffer: true,
-      description: '(raw markdown, alternate buffer)',
+      description: "(raw markdown, alternate buffer)",
     },
     // Test cases where height constraint affects rendering in regular buffer but not alternate
     {
       renderMarkdown: true,
       useAlternateBuffer: false,
       availableTerminalHeight: 10,
-      description: '(constrained height, regular buffer -> forces raw)',
+      description: "(constrained height, regular buffer -> forces raw)",
     },
     {
       renderMarkdown: true,
       useAlternateBuffer: true,
       availableTerminalHeight: 10,
-      description: '(constrained height, alternate buffer -> keeps markdown)',
+      description: "(constrained height, alternate buffer -> keeps markdown)",
     },
-  ])(
-    'renders with renderMarkdown=$renderMarkdown, useAlternateBuffer=$useAlternateBuffer $description',
-    ({ renderMarkdown, useAlternateBuffer, availableTerminalHeight }) => {
-      const { lastFrame } = renderWithProviders(
-        <StreamingContext.Provider value={StreamingState.Idle}>
-          <ToolMessage
-            {...baseProps}
-            availableTerminalHeight={availableTerminalHeight}
-          />
-        </StreamingContext.Provider>,
-        {
-          uiState: { renderMarkdown, streamingState: StreamingState.Idle },
-          useAlternateBuffer,
-        },
-      );
-      expect(lastFrame()).toMatchSnapshot();
-    },
-  );
+  ])("renders with renderMarkdown=$renderMarkdown, useAlternateBuffer=$useAlternateBuffer $description", ({
+    renderMarkdown,
+    useAlternateBuffer,
+    availableTerminalHeight,
+  }) => {
+    const { lastFrame } = renderWithProviders(
+      <StreamingContext.Provider value={StreamingState.Idle}>
+        <ToolMessage {...baseProps} availableTerminalHeight={availableTerminalHeight} />
+      </StreamingContext.Provider>,
+      {
+        uiState: { renderMarkdown, streamingState: StreamingState.Idle },
+        useAlternateBuffer,
+      },
+    );
+    expect(lastFrame()).toMatchSnapshot();
+  });
 });
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.test.tsx b/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.test.tsx
index b679aa08b..4d13627e9 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.test.tsx
@@ -4,21 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { ToolResultDisplay } from './ToolResultDisplay.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { Box, Text } from 'ink';
-import type { AnsiOutput } from '@airiscode/gemini-cli-core';
+import type { AnsiOutput } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { ToolResultDisplay } from "./ToolResultDisplay.js";
 
 // Mock child components to simplify testing
-vi.mock('./DiffRenderer.js', () => ({
-  DiffRenderer: ({
-    diffContent,
-    filename,
-  }: {
-    diffContent: string;
-    filename: string;
-  }) => (
+vi.mock("./DiffRenderer.js", () => ({
+  DiffRenderer: ({ diffContent, filename }: { diffContent: string; filename: string }) => (
     <Box>
       <Text>
         DiffRenderer: {filename} - {diffContent}
@@ -27,7 +21,7 @@ vi.mock('./DiffRenderer.js', () => ({
   ),
 }));
 
-vi.mock('../../utils/MarkdownDisplay.js', () => ({
+vi.mock("../../utils/MarkdownDisplay.js", () => ({
   MarkdownDisplay: ({ text }: { text: string }) => (
     <Box>
       <Text>MarkdownDisplay: {text}</Text>
@@ -35,7 +29,7 @@ vi.mock('../../utils/MarkdownDisplay.js', () => ({
   ),
 }));
 
-vi.mock('../AnsiOutput.js', () => ({
+vi.mock("../AnsiOutput.js", () => ({
   AnsiOutputText: ({ data }: { data: unknown }) => (
     <Box>
       <Text>AnsiOutputText: {JSON.stringify(data)}</Text>
@@ -43,7 +37,7 @@ vi.mock('../AnsiOutput.js', () => ({
   ),
 }));
 
-vi.mock('../shared/MaxSizedBox.js', () => ({
+vi.mock("../shared/MaxSizedBox.js", () => ({
   MaxSizedBox: ({ children }: { children: React.ReactNode }) => (
     <Box>
       <Text>MaxSizedBox:</Text>
@@ -54,24 +48,24 @@ vi.mock('../shared/MaxSizedBox.js', () => ({
 
 // Mock UIStateContext
 const mockUseUIState = vi.fn();
-vi.mock('../../contexts/UIStateContext.js', () => ({
+vi.mock("../../contexts/UIStateContext.js", () => ({
   useUIState: () => mockUseUIState(),
 }));
 
 // Mock useAlternateBuffer
 const mockUseAlternateBuffer = vi.fn();
-vi.mock('../../hooks/useAlternateBuffer.js', () => ({
+vi.mock("../../hooks/useAlternateBuffer.js", () => ({
   useAlternateBuffer: () => mockUseAlternateBuffer(),
 }));
 
-describe('ToolResultDisplay', () => {
+describe("ToolResultDisplay", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockUseUIState.mockReturnValue({ renderMarkdown: true });
     mockUseAlternateBuffer.mockReturnValue(false);
   });
 
-  it('renders string result as markdown by default', () => {
+  it("renders string result as markdown by default", () => {
     const { lastFrame } = render(
       <ToolResultDisplay resultDisplay="Some result" terminalWidth={80} />,
     );
@@ -80,7 +74,7 @@ describe('ToolResultDisplay', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('renders string result as plain text when renderOutputAsMarkdown is false', () => {
+  it("renders string result as plain text when renderOutputAsMarkdown is false", () => {
     const { lastFrame } = render(
       <ToolResultDisplay
         resultDisplay="Some result"
@@ -94,8 +88,8 @@ describe('ToolResultDisplay', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('truncates very long string results', { timeout: 20000 }, () => {
-    const longString = 'a'.repeat(1000005);
+  it("truncates very long string results", { timeout: 20000 }, () => {
+    const longString = "a".repeat(1000005);
     const { lastFrame } = render(
       <ToolResultDisplay
         resultDisplay={longString}
@@ -108,10 +102,10 @@ describe('ToolResultDisplay', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('renders file diff result', () => {
+  it("renders file diff result", () => {
     const diffResult = {
-      fileDiff: 'diff content',
-      fileName: 'test.ts',
+      fileDiff: "diff content",
+      fileName: "test.ts",
     };
     const { lastFrame } = render(
       <ToolResultDisplay
@@ -125,9 +119,9 @@ describe('ToolResultDisplay', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('renders ANSI output result', () => {
+  it("renders ANSI output result", () => {
     const ansiResult = {
-      text: 'ansi content',
+      text: "ansi content",
     };
     const { lastFrame } = render(
       <ToolResultDisplay
@@ -141,7 +135,7 @@ describe('ToolResultDisplay', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('renders nothing for todos result', () => {
+  it("renders nothing for todos result", () => {
     const todoResult = {
       todos: [],
     };
@@ -157,7 +151,7 @@ describe('ToolResultDisplay', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('falls back to plain text if availableHeight is set and not in alternate buffer', () => {
+  it("falls back to plain text if availableHeight is set and not in alternate buffer", () => {
     mockUseAlternateBuffer.mockReturnValue(false);
     // availableHeight calculation: 20 - 1 - 5 = 14 > 3
     const { lastFrame } = render(
@@ -174,7 +168,7 @@ describe('ToolResultDisplay', () => {
     expect(output).toMatchSnapshot();
   });
 
-  it('keeps markdown if in alternate buffer even with availableHeight', () => {
+  it("keeps markdown if in alternate buffer even with availableHeight", () => {
     mockUseAlternateBuffer.mockReturnValue(true);
     const { lastFrame } = render(
       <ToolResultDisplay
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.tsx b/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.tsx
index 56e44296a..459149451 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolResultDisplay.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Box, Text } from 'ink';
-import { DiffRenderer } from './DiffRenderer.js';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
-import { AnsiOutputText } from '../AnsiOutput.js';
-import { MaxSizedBox } from '../shared/MaxSizedBox.js';
-import { theme } from '../../semantic-colors.js';
-import type { AnsiOutput } from '@airiscode/gemini-cli-core';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { useAlternateBuffer } from '../../hooks/useAlternateBuffer.js';
+import type { AnsiOutput } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import React from "react";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { useAlternateBuffer } from "../../hooks/useAlternateBuffer.js";
+import { theme } from "../../semantic-colors.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
+import { AnsiOutputText } from "../AnsiOutput.js";
+import { MaxSizedBox } from "../shared/MaxSizedBox.js";
+import { DiffRenderer } from "./DiffRenderer.js";
 
 const STATIC_HEIGHT = 1;
 const RESERVED_LINE_COUNT = 5; // for tool name, status, padding etc.
@@ -62,9 +62,9 @@ export const ToolResultDisplay: React.FC<ToolResultDisplayProps> = ({
   const childWidth = terminalWidth - combinedPaddingAndBorderWidth;
 
   const truncatedResultDisplay = React.useMemo(() => {
-    if (typeof resultDisplay === 'string') {
+    if (typeof resultDisplay === "string") {
       if (resultDisplay.length > MAXIMUM_RESULT_DISPLAY_CHARACTERS) {
-        return '...' + resultDisplay.slice(-MAXIMUM_RESULT_DISPLAY_CHARACTERS);
+        return "..." + resultDisplay.slice(-MAXIMUM_RESULT_DISPLAY_CHARACTERS);
       }
     }
     return resultDisplay;
@@ -75,8 +75,7 @@ export const ToolResultDisplay: React.FC<ToolResultDisplayProps> = ({
   return (
     <Box width={childWidth} flexDirection="column">
       <Box flexDirection="column">
-        {typeof truncatedResultDisplay === 'string' &&
-        renderOutputAsMarkdown ? (
+        {typeof truncatedResultDisplay === "string" && renderOutputAsMarkdown ? (
           <Box flexDirection="column">
             <MarkdownDisplay
               text={truncatedResultDisplay}
@@ -85,8 +84,7 @@ export const ToolResultDisplay: React.FC<ToolResultDisplayProps> = ({
               isPending={false}
             />
           </Box>
-        ) : typeof truncatedResultDisplay === 'string' &&
-          !renderOutputAsMarkdown ? (
+        ) : typeof truncatedResultDisplay === "string" && !renderOutputAsMarkdown ? (
           isAlternateBuffer ? (
             <Box flexDirection="column" width={childWidth}>
               <Text wrap="wrap" color={theme.text.primary}>
@@ -102,16 +100,14 @@ export const ToolResultDisplay: React.FC<ToolResultDisplayProps> = ({
               </Box>
             </MaxSizedBox>
           )
-        ) : typeof truncatedResultDisplay === 'object' &&
-          'fileDiff' in truncatedResultDisplay ? (
+        ) : typeof truncatedResultDisplay === "object" && "fileDiff" in truncatedResultDisplay ? (
           <DiffRenderer
             diffContent={(truncatedResultDisplay as FileDiffResult).fileDiff}
             filename={(truncatedResultDisplay as FileDiffResult).fileName}
             availableTerminalHeight={availableHeight}
             terminalWidth={childWidth}
           />
-        ) : typeof truncatedResultDisplay === 'object' &&
-          'todos' in truncatedResultDisplay ? (
+        ) : typeof truncatedResultDisplay === "object" && "todos" in truncatedResultDisplay ? (
           // display nothing, as the TodoTray will handle rendering todos
           <></>
         ) : (
diff --git a/packages/ui-gemini/src/ui/components/messages/ToolShared.tsx b/packages/ui-gemini/src/ui/components/messages/ToolShared.tsx
index 8404c0642..926d9a8fc 100644
--- a/packages/ui-gemini/src/ui/components/messages/ToolShared.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/ToolShared.tsx
@@ -4,35 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Box, Text } from 'ink';
-import { ToolCallStatus } from '../../types.js';
-import { GeminiRespondingSpinner } from '../GeminiRespondingSpinner.js';
-import {
-  SHELL_COMMAND_NAME,
-  SHELL_NAME,
-  TOOL_STATUS,
-} from '../../constants.js';
-import { theme } from '../../semantic-colors.js';
-import { SHELL_TOOL_NAME } from '@airiscode/gemini-cli-core';
+import { SHELL_TOOL_NAME } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import React from "react";
+import { SHELL_COMMAND_NAME, SHELL_NAME, TOOL_STATUS } from "../../constants.js";
+import { theme } from "../../semantic-colors.js";
+import { ToolCallStatus } from "../../types.js";
+import { GeminiRespondingSpinner } from "../GeminiRespondingSpinner.js";
 
 export const STATUS_INDICATOR_WIDTH = 3;
 
-export type TextEmphasis = 'high' | 'medium' | 'low';
+export type TextEmphasis = "high" | "medium" | "low";
 
 type ToolStatusIndicatorProps = {
   status: ToolCallStatus;
   name: string;
 };
 
-export const ToolStatusIndicator: React.FC<ToolStatusIndicatorProps> = ({
-  status,
-  name,
-}) => {
-  const isShell =
-    name === SHELL_COMMAND_NAME ||
-    name === SHELL_NAME ||
-    name === SHELL_TOOL_NAME;
+export const ToolStatusIndicator: React.FC<ToolStatusIndicatorProps> = ({ status, name }) => {
+  const isShell = name === SHELL_COMMAND_NAME || name === SHELL_NAME || name === SHELL_TOOL_NAME;
   const statusColor = isShell ? theme.ui.symbol : theme.status.warning;
 
   return (
@@ -47,22 +37,22 @@ export const ToolStatusIndicator: React.FC<ToolStatusIndicatorProps> = ({
         />
       )}
       {status === ToolCallStatus.Success && (
-        <Text color={theme.status.success} aria-label={'Success:'}>
+        <Text color={theme.status.success} aria-label={"Success:"}>
           {TOOL_STATUS.SUCCESS}
         </Text>
       )}
       {status === ToolCallStatus.Confirming && (
-        <Text color={statusColor} aria-label={'Confirming:'}>
+        <Text color={statusColor} aria-label={"Confirming:"}>
           {TOOL_STATUS.CONFIRMING}
         </Text>
       )}
       {status === ToolCallStatus.Canceled && (
-        <Text color={statusColor} aria-label={'Canceled:'} bold>
+        <Text color={statusColor} aria-label={"Canceled:"} bold>
           {TOOL_STATUS.CANCELED}
         </Text>
       )}
       {status === ToolCallStatus.Error && (
-        <Text color={theme.status.error} aria-label={'Error:'} bold>
+        <Text color={theme.status.error} aria-label={"Error:"} bold>
           {TOOL_STATUS.ERROR}
         </Text>
       )}
@@ -77,19 +67,14 @@ type ToolInfoProps = {
   emphasis: TextEmphasis;
 };
 
-export const ToolInfo: React.FC<ToolInfoProps> = ({
-  name,
-  description,
-  status,
-  emphasis,
-}) => {
+export const ToolInfo: React.FC<ToolInfoProps> = ({ name, description, status, emphasis }) => {
   const nameColor = React.useMemo<string>(() => {
     switch (emphasis) {
-      case 'high':
+      case "high":
         return theme.text.primary;
-      case 'medium':
+      case "medium":
         return theme.text.primary;
-      case 'low':
+      case "low":
         return theme.text.secondary;
       default: {
         const exhaustiveCheck: never = emphasis;
@@ -102,7 +87,7 @@ export const ToolInfo: React.FC<ToolInfoProps> = ({
       <Text strikethrough={status === ToolCallStatus.Canceled} wrap="truncate">
         <Text color={nameColor} bold>
           {name}
-        </Text>{' '}
+        </Text>{" "}
         <Text color={theme.text.secondary}>{description}</Text>
       </Text>
     </Box>
@@ -111,7 +96,7 @@ export const ToolInfo: React.FC<ToolInfoProps> = ({
 
 export const TrailingIndicator: React.FC = () => (
   <Text color={theme.text.primary} wrap="truncate">
-    {' '}
+    {" "}
     ←
   </Text>
 );
diff --git a/packages/ui-gemini/src/ui/components/messages/UserMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/UserMessage.test.tsx
index 2f130c546..be37b9c26 100644
--- a/packages/ui-gemini/src/ui/components/messages/UserMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/UserMessage.test.tsx
@@ -4,34 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { UserMessage } from './UserMessage.js';
-import { describe, it, expect, vi } from 'vitest';
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { UserMessage } from "./UserMessage.js";
 
 // Mock the commandUtils to control isSlashCommand behavior
-vi.mock('../../utils/commandUtils.js', () => ({
-  isSlashCommand: vi.fn((text: string) => text.startsWith('/')),
+vi.mock("../../utils/commandUtils.js", () => ({
+  isSlashCommand: vi.fn((text: string) => text.startsWith("/")),
 }));
 
-describe('UserMessage', () => {
-  it('renders normal user message with correct prefix', () => {
-    const { lastFrame } = render(
-      <UserMessage text="Hello Gemini" width={80} />,
-    );
+describe("UserMessage", () => {
+  it("renders normal user message with correct prefix", () => {
+    const { lastFrame } = render(<UserMessage text="Hello Gemini" width={80} />);
     const output = lastFrame();
 
     expect(output).toMatchSnapshot();
   });
 
-  it('renders slash command message', () => {
+  it("renders slash command message", () => {
     const { lastFrame } = render(<UserMessage text="/help" width={80} />);
     const output = lastFrame();
 
     expect(output).toMatchSnapshot();
   });
 
-  it('renders multiline user message', () => {
-    const message = 'Line 1\nLine 2';
+  it("renders multiline user message", () => {
+    const message = "Line 1\nLine 2";
     const { lastFrame } = render(<UserMessage text={message} width={80} />);
     const output = lastFrame();
 
diff --git a/packages/ui-gemini/src/ui/components/messages/UserMessage.tsx b/packages/ui-gemini/src/ui/components/messages/UserMessage.tsx
index 51f94a060..091c97528 100644
--- a/packages/ui-gemini/src/ui/components/messages/UserMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/UserMessage.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { SCREEN_READER_USER_PREFIX } from '../../textConstants.js';
-import { isSlashCommand as checkIsSlashCommand } from '../../utils/commandUtils.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import { SCREEN_READER_USER_PREFIX } from "../../textConstants.js";
+import { isSlashCommand as checkIsSlashCommand } from "../../utils/commandUtils.js";
 
 interface UserMessageProps {
   text: string;
@@ -16,20 +16,14 @@ interface UserMessageProps {
 }
 
 export const UserMessage: React.FC<UserMessageProps> = ({ text, width }) => {
-  const prefix = '> ';
+  const prefix = "> ";
   const prefixWidth = prefix.length;
   const isSlashCommand = checkIsSlashCommand(text);
 
   const textColor = isSlashCommand ? theme.text.accent : theme.text.secondary;
 
   return (
-    <Box
-      flexDirection="row"
-      paddingY={0}
-      marginY={1}
-      alignSelf="flex-start"
-      width={width}
-    >
+    <Box flexDirection="row" paddingY={0} marginY={1} alignSelf="flex-start" width={width}>
       <Box width={prefixWidth} flexShrink={0}>
         <Text color={theme.text.accent} aria-label={SCREEN_READER_USER_PREFIX}>
           {prefix}
diff --git a/packages/ui-gemini/src/ui/components/messages/UserShellMessage.tsx b/packages/ui-gemini/src/ui/components/messages/UserShellMessage.tsx
index 98baa3259..86336d2ff 100644
--- a/packages/ui-gemini/src/ui/components/messages/UserShellMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/UserShellMessage.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
 
 interface UserShellMessageProps {
   text: string;
@@ -14,7 +14,7 @@ interface UserShellMessageProps {
 
 export const UserShellMessage: React.FC<UserShellMessageProps> = ({ text }) => {
   // Remove leading '!' if present, as App.tsx adds it for the processor.
-  const commandToDisplay = text.startsWith('!') ? text.substring(1) : text;
+  const commandToDisplay = text.startsWith("!") ? text.substring(1) : text;
 
   return (
     <Box>
diff --git a/packages/ui-gemini/src/ui/components/messages/WarningMessage.test.tsx b/packages/ui-gemini/src/ui/components/messages/WarningMessage.test.tsx
index fcb635d62..d7c2b8c1f 100644
--- a/packages/ui-gemini/src/ui/components/messages/WarningMessage.test.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/WarningMessage.test.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { WarningMessage } from './WarningMessage.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { WarningMessage } from "./WarningMessage.js";
 
-describe('WarningMessage', () => {
-  it('renders with the correct prefix and text', () => {
+describe("WarningMessage", () => {
+  it("renders with the correct prefix and text", () => {
     const { lastFrame } = render(<WarningMessage text="Watch out!" />);
     const output = lastFrame();
 
     expect(output).toMatchSnapshot();
   });
 
-  it('renders multiline warning messages', () => {
-    const message = 'Warning line 1\nWarning line 2';
+  it("renders multiline warning messages", () => {
+    const message = "Warning line 1\nWarning line 2";
     const { lastFrame } = render(<WarningMessage text={message} />);
     const output = lastFrame();
 
diff --git a/packages/ui-gemini/src/ui/components/messages/WarningMessage.tsx b/packages/ui-gemini/src/ui/components/messages/WarningMessage.tsx
index c255bc1a4..2b8b4e56f 100644
--- a/packages/ui-gemini/src/ui/components/messages/WarningMessage.tsx
+++ b/packages/ui-gemini/src/ui/components/messages/WarningMessage.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { RenderInline } from '../../utils/InlineMarkdownRenderer.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import { RenderInline } from "../../utils/InlineMarkdownRenderer.js";
 
 interface WarningMessageProps {
   text: string;
 }
 
 export const WarningMessage: React.FC<WarningMessageProps> = ({ text }) => {
-  const prefix = '⚠ ';
+  const prefix = "⚠ ";
   const prefixWidth = 3;
 
   return (
diff --git a/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.test.tsx b/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.test.tsx
index 708de9f10..0493eb713 100644
--- a/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.test.tsx
@@ -4,41 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { waitFor } from '../../../test-utils/async.js';
+import { Text } from "ink";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../../test-utils/async.js";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { useSelectionList } from "../../hooks/useSelectionList.js";
+import type { theme } from "../../semantic-colors.js";
 import {
   BaseSelectionList,
   type BaseSelectionListProps,
   type RenderItemContext,
-} from './BaseSelectionList.js';
-import { useSelectionList } from '../../hooks/useSelectionList.js';
-import { Text } from 'ink';
-import type { theme } from '../../semantic-colors.js';
+} from "./BaseSelectionList.js";
 
-vi.mock('../../hooks/useSelectionList.js');
+vi.mock("../../hooks/useSelectionList.js");
 
 const mockTheme = {
-  text: { primary: 'COLOR_PRIMARY', secondary: 'COLOR_SECONDARY' },
-  status: { success: 'COLOR_SUCCESS' },
+  text: { primary: "COLOR_PRIMARY", secondary: "COLOR_SECONDARY" },
+  status: { success: "COLOR_SUCCESS" },
 } as typeof theme;
 
-vi.mock('../../semantic-colors.js', () => ({
+vi.mock("../../semantic-colors.js", () => ({
   theme: {
-    text: { primary: 'COLOR_PRIMARY', secondary: 'COLOR_SECONDARY' },
-    status: { success: 'COLOR_SUCCESS' },
+    text: { primary: "COLOR_PRIMARY", secondary: "COLOR_SECONDARY" },
+    status: { success: "COLOR_SUCCESS" },
   },
 }));
 
-describe('BaseSelectionList', () => {
+describe("BaseSelectionList", () => {
   const mockOnSelect = vi.fn();
   const mockOnHighlight = vi.fn();
   const mockRenderItem = vi.fn();
 
   const items = [
-    { value: 'A', label: 'Item A', key: 'A' },
-    { value: 'B', label: 'Item B', disabled: true, key: 'B' },
-    { value: 'C', label: 'Item C', key: 'C' },
+    { value: "A", label: "Item A", key: "A" },
+    { value: "B", label: "Item B", disabled: true, key: "B" },
+    { value: "C", label: "Item C", key: "C" },
   ];
 
   // Helper to render the component with default props
@@ -81,19 +81,19 @@ describe('BaseSelectionList', () => {
     vi.clearAllMocks();
   });
 
-  describe('Rendering and Structure', () => {
-    it('should render all items using the renderItem prop', () => {
+  describe("Rendering and Structure", () => {
+    it("should render all items using the renderItem prop", () => {
       const { lastFrame } = renderComponent();
 
-      expect(lastFrame()).toContain('Item A');
-      expect(lastFrame()).toContain('Item B');
-      expect(lastFrame()).toContain('Item C');
+      expect(lastFrame()).toContain("Item A");
+      expect(lastFrame()).toContain("Item B");
+      expect(lastFrame()).toContain("Item C");
 
       expect(mockRenderItem).toHaveBeenCalledTimes(3);
       expect(mockRenderItem).toHaveBeenCalledWith(items[0], expect.any(Object));
     });
 
-    it('should render the selection indicator (● or space) and layout', () => {
+    it("should render the selection indicator (● or space) and layout", () => {
       const { lastFrame } = renderComponent({}, 0);
       const output = lastFrame();
 
@@ -103,15 +103,15 @@ describe('BaseSelectionList', () => {
       expect(output).toMatch(/\s+3\.\s+Item C/);
     });
 
-    it('should handle an empty list gracefully', () => {
+    it("should handle an empty list gracefully", () => {
       const { lastFrame } = renderComponent({ items: [] });
       expect(mockRenderItem).not.toHaveBeenCalled();
-      expect(lastFrame()).toBe('');
+      expect(lastFrame()).toBe("");
     });
   });
 
-  describe('useSelectionList Integration', () => {
-    it('should pass props correctly to useSelectionList', () => {
+  describe("useSelectionList Integration", () => {
+    it("should pass props correctly to useSelectionList", () => {
       const initialIndex = 1;
       const isFocused = false;
       const showNumbers = false;
@@ -128,7 +128,7 @@ describe('BaseSelectionList', () => {
       });
     });
 
-    it('should use the activeIndex returned by the hook', () => {
+    it("should use the activeIndex returned by the hook", () => {
       renderComponent({}, 2); // Active index is C
 
       expect(mockRenderItem).toHaveBeenCalledWith(
@@ -142,8 +142,8 @@ describe('BaseSelectionList', () => {
     });
   });
 
-  describe('Styling and Colors', () => {
-    it('should apply success color to the selected item', () => {
+  describe("Styling and Colors", () => {
+    it("should apply success color to the selected item", () => {
       renderComponent({}, 0); // Item A selected
 
       // Check renderItem context colors against the mocked theme
@@ -157,7 +157,7 @@ describe('BaseSelectionList', () => {
       );
     });
 
-    it('should apply primary color to unselected, enabled items', () => {
+    it("should apply primary color to unselected, enabled items", () => {
       renderComponent({}, 0); // Item A selected, Item C unselected/enabled
 
       // Check renderItem context colors for Item C
@@ -171,7 +171,7 @@ describe('BaseSelectionList', () => {
       );
     });
 
-    it('should apply secondary color to disabled items (when not selected)', () => {
+    it("should apply secondary color to disabled items (when not selected)", () => {
       renderComponent({}, 0); // Item A selected, Item B disabled
 
       // Check renderItem context colors for Item B
@@ -185,7 +185,7 @@ describe('BaseSelectionList', () => {
       );
     });
 
-    it('should apply success color to disabled items if they are selected', () => {
+    it("should apply success color to disabled items if they are selected", () => {
       // The component should visually reflect the selection even if the item is disabled.
       renderComponent({}, 1); // Item B (disabled) selected
 
@@ -201,26 +201,26 @@ describe('BaseSelectionList', () => {
     });
   });
 
-  describe('Numbering (showNumbers)', () => {
-    it('should show numbers by default with correct formatting', () => {
+  describe("Numbering (showNumbers)", () => {
+    it("should show numbers by default with correct formatting", () => {
       const { lastFrame } = renderComponent();
       const output = lastFrame();
 
-      expect(output).toContain('1.');
-      expect(output).toContain('2.');
-      expect(output).toContain('3.');
+      expect(output).toContain("1.");
+      expect(output).toContain("2.");
+      expect(output).toContain("3.");
     });
 
-    it('should hide numbers when showNumbers is false', () => {
+    it("should hide numbers when showNumbers is false", () => {
       const { lastFrame } = renderComponent({ showNumbers: false });
       const output = lastFrame();
 
-      expect(output).not.toContain('1.');
-      expect(output).not.toContain('2.');
-      expect(output).not.toContain('3.');
+      expect(output).not.toContain("1.");
+      expect(output).not.toContain("2.");
+      expect(output).not.toContain("3.");
     });
 
-    it('should apply correct padding for alignment in long lists', () => {
+    it("should apply correct padding for alignment in long lists", () => {
       const longList = Array.from({ length: 15 }, (_, i) => ({
         value: `Item ${i + 1}`,
         label: `Item ${i + 1}`,
@@ -236,11 +236,11 @@ describe('BaseSelectionList', () => {
 
       // Check formatting for single and double digits.
       // The implementation uses padStart, resulting in " 1." and "10.".
-      expect(output).toContain(' 1.');
-      expect(output).toContain('10.');
+      expect(output).toContain(" 1.");
+      expect(output).toContain("10.");
     });
 
-    it('should apply secondary color to numbers if showNumbers is false (internal logic check)', () => {
+    it("should apply secondary color to numbers if showNumbers is false (internal logic check)", () => {
       renderComponent({ showNumbers: false }, 0);
 
       expect(mockRenderItem).toHaveBeenCalledWith(
@@ -254,7 +254,7 @@ describe('BaseSelectionList', () => {
     });
   });
 
-  describe('Scrolling and Pagination (maxItemsToShow)', () => {
+  describe("Scrolling and Pagination (maxItemsToShow)", () => {
     const longList = Array.from({ length: 10 }, (_, i) => ({
       value: `Item ${i + 1}`,
       label: `Item ${i + 1}`,
@@ -307,16 +307,16 @@ describe('BaseSelectionList', () => {
       return { updateActiveIndex, lastFrame };
     };
 
-    it('should only show maxItemsToShow items initially', () => {
+    it("should only show maxItemsToShow items initially", () => {
       const { lastFrame } = renderScrollableList(0);
       const output = lastFrame();
 
-      expect(output).toContain('Item 1');
-      expect(output).toContain('Item 3');
-      expect(output).not.toContain('Item 4');
+      expect(output).toContain("Item 1");
+      expect(output).toContain("Item 3");
+      expect(output).not.toContain("Item 4");
     });
 
-    it('should scroll down when activeIndex moves beyond the visible window', async () => {
+    it("should scroll down when activeIndex moves beyond the visible window", async () => {
       const { updateActiveIndex, lastFrame } = renderScrollableList(0);
 
       // Move to index 3 (Item 4). Should trigger scroll.
@@ -325,23 +325,23 @@ describe('BaseSelectionList', () => {
 
       await waitFor(() => {
         const output = lastFrame();
-        expect(output).not.toContain('Item 1');
-        expect(output).toContain('Item 2');
-        expect(output).toContain('Item 4');
-        expect(output).not.toContain('Item 5');
+        expect(output).not.toContain("Item 1");
+        expect(output).toContain("Item 2");
+        expect(output).toContain("Item 4");
+        expect(output).not.toContain("Item 5");
       });
     });
 
-    it('should scroll up when activeIndex moves before the visible window', async () => {
+    it("should scroll up when activeIndex moves before the visible window", async () => {
       const { updateActiveIndex, lastFrame } = renderScrollableList(0);
 
       await updateActiveIndex(4);
 
       await waitFor(() => {
         const output = lastFrame();
-        expect(output).toContain('Item 3'); // Should see items 3, 4, 5
-        expect(output).toContain('Item 5');
-        expect(output).not.toContain('Item 2');
+        expect(output).toContain("Item 3"); // Should see items 3, 4, 5
+        expect(output).toContain("Item 5");
+        expect(output).not.toContain("Item 2");
       });
 
       // Now test scrolling up: move to index 1 (Item 2)
@@ -350,13 +350,13 @@ describe('BaseSelectionList', () => {
 
       await waitFor(() => {
         const output = lastFrame();
-        expect(output).toContain('Item 2');
-        expect(output).toContain('Item 4');
-        expect(output).not.toContain('Item 5'); // Item 5 should no longer be visible
+        expect(output).toContain("Item 2");
+        expect(output).toContain("Item 4");
+        expect(output).not.toContain("Item 5"); // Item 5 should no longer be visible
       });
     });
 
-    it('should pin the scroll offset to the end if selection starts near the end', async () => {
+    it("should pin the scroll offset to the end if selection starts near the end", async () => {
       // List length 10. Max items 3. Active index 9 (last item).
       // Scroll offset should be 10 - 3 = 7.
       // Visible items: 8, 9, 10.
@@ -364,87 +364,84 @@ describe('BaseSelectionList', () => {
 
       await waitFor(() => {
         const output = lastFrame();
-        expect(output).toContain('Item 10');
-        expect(output).toContain('Item 8');
-        expect(output).not.toContain('Item 7');
+        expect(output).toContain("Item 10");
+        expect(output).toContain("Item 8");
+        expect(output).not.toContain("Item 7");
       });
     });
 
-    it('should handle dynamic scrolling through multiple activeIndex changes', async () => {
+    it("should handle dynamic scrolling through multiple activeIndex changes", async () => {
       const { updateActiveIndex, lastFrame } = renderScrollableList(0);
 
-      expect(lastFrame()).toContain('Item 1');
-      expect(lastFrame()).toContain('Item 3');
+      expect(lastFrame()).toContain("Item 1");
+      expect(lastFrame()).toContain("Item 3");
 
       // Scroll down gradually
       await updateActiveIndex(2); // Still within window
-      expect(lastFrame()).toContain('Item 1');
+      expect(lastFrame()).toContain("Item 1");
 
       await updateActiveIndex(3); // Should trigger scroll
       await waitFor(() => {
         const output = lastFrame();
-        expect(output).toContain('Item 2');
-        expect(output).toContain('Item 4');
-        expect(output).not.toContain('Item 1');
+        expect(output).toContain("Item 2");
+        expect(output).toContain("Item 4");
+        expect(output).not.toContain("Item 1");
       });
       await updateActiveIndex(5); // Scroll further
       await waitFor(() => {
         const output = lastFrame();
-        expect(output).toContain('Item 4');
-        expect(output).toContain('Item 6');
-        expect(output).not.toContain('Item 3');
+        expect(output).toContain("Item 4");
+        expect(output).toContain("Item 6");
+        expect(output).not.toContain("Item 3");
       });
     });
 
-    it('should correctly identify the selected item within the visible window', () => {
+    it("should correctly identify the selected item within the visible window", () => {
       renderScrollableList(1); // activeIndex 1 = Item 2
 
       expect(mockRenderItem).toHaveBeenCalledTimes(MAX_ITEMS);
 
       expect(mockRenderItem).toHaveBeenCalledWith(
-        expect.objectContaining({ value: 'Item 1' }),
+        expect.objectContaining({ value: "Item 1" }),
         expect.objectContaining({ isSelected: false }),
       );
 
       expect(mockRenderItem).toHaveBeenCalledWith(
-        expect.objectContaining({ value: 'Item 2' }),
+        expect.objectContaining({ value: "Item 2" }),
         expect.objectContaining({ isSelected: true }),
       );
     });
 
-    it('should correctly identify the selected item when scrolled (high index)', async () => {
+    it("should correctly identify the selected item when scrolled (high index)", async () => {
       renderScrollableList(5);
 
       await waitFor(() => {
         // Item 6 (index 5) should be selected
         expect(mockRenderItem).toHaveBeenCalledWith(
-          expect.objectContaining({ value: 'Item 6' }),
+          expect.objectContaining({ value: "Item 6" }),
           expect.objectContaining({ isSelected: true }),
         );
 
         // Item 4 (index 3) should not be selected
         expect(mockRenderItem).toHaveBeenCalledWith(
-          expect.objectContaining({ value: 'Item 4' }),
+          expect.objectContaining({ value: "Item 4" }),
           expect.objectContaining({ isSelected: false }),
         );
       });
     });
 
-    it('should handle maxItemsToShow larger than the list length', () => {
-      const { lastFrame } = renderComponent(
-        { items: longList, maxItemsToShow: 15 },
-        0,
-      );
+    it("should handle maxItemsToShow larger than the list length", () => {
+      const { lastFrame } = renderComponent({ items: longList, maxItemsToShow: 15 }, 0);
       const output = lastFrame();
 
       // Should show all available items (10 items)
-      expect(output).toContain('Item 1');
-      expect(output).toContain('Item 10');
+      expect(output).toContain("Item 1");
+      expect(output).toContain("Item 10");
       expect(mockRenderItem).toHaveBeenCalledTimes(10);
     });
   });
 
-  describe('Scroll Arrows (showScrollArrows)', () => {
+  describe("Scroll Arrows (showScrollArrows)", () => {
     const longList = Array.from({ length: 10 }, (_, i) => ({
       value: `Item ${i + 1}`,
       label: `Item ${i + 1}`,
@@ -452,18 +449,18 @@ describe('BaseSelectionList', () => {
     }));
     const MAX_ITEMS = 3;
 
-    it('should not show arrows by default', () => {
+    it("should not show arrows by default", () => {
       const { lastFrame } = renderComponent({
         items: longList,
         maxItemsToShow: MAX_ITEMS,
       });
       const output = lastFrame();
 
-      expect(output).not.toContain('▲');
-      expect(output).not.toContain('▼');
+      expect(output).not.toContain("▲");
+      expect(output).not.toContain("▼");
     });
 
-    it('should show arrows with correct colors when enabled (at the top)', async () => {
+    it("should show arrows with correct colors when enabled (at the top)", async () => {
       const { lastFrame } = renderComponent(
         {
           items: longList,
@@ -476,16 +473,16 @@ describe('BaseSelectionList', () => {
       await waitFor(() => {
         const output = lastFrame();
         // At the top, should show first 3 items
-        expect(output).toContain('Item 1');
-        expect(output).toContain('Item 3');
-        expect(output).not.toContain('Item 4');
+        expect(output).toContain("Item 1");
+        expect(output).toContain("Item 3");
+        expect(output).not.toContain("Item 4");
         // Both arrows should be visible
-        expect(output).toContain('▲');
-        expect(output).toContain('▼');
+        expect(output).toContain("▲");
+        expect(output).toContain("▼");
       });
     });
 
-    it('should show arrows and correct items when scrolled to the middle', async () => {
+    it("should show arrows and correct items when scrolled to the middle", async () => {
       const { lastFrame } = renderComponent(
         { items: longList, maxItemsToShow: MAX_ITEMS, showScrollArrows: true },
         5,
@@ -494,17 +491,17 @@ describe('BaseSelectionList', () => {
       await waitFor(() => {
         const output = lastFrame();
         // After scrolling to middle, should see items around index 5
-        expect(output).toContain('Item 4');
-        expect(output).toContain('Item 6');
-        expect(output).not.toContain('Item 3');
-        expect(output).not.toContain('Item 7');
+        expect(output).toContain("Item 4");
+        expect(output).toContain("Item 6");
+        expect(output).not.toContain("Item 3");
+        expect(output).not.toContain("Item 7");
         // Both scroll arrows should be visible
-        expect(output).toContain('▲');
-        expect(output).toContain('▼');
+        expect(output).toContain("▲");
+        expect(output).toContain("▼");
       });
     });
 
-    it('should show arrows and correct items when scrolled to the end', async () => {
+    it("should show arrows and correct items when scrolled to the end", async () => {
       const { lastFrame } = renderComponent(
         { items: longList, maxItemsToShow: MAX_ITEMS, showScrollArrows: true },
         9,
@@ -513,16 +510,16 @@ describe('BaseSelectionList', () => {
       await waitFor(() => {
         const output = lastFrame();
         // At the end, should show last 3 items
-        expect(output).toContain('Item 8');
-        expect(output).toContain('Item 10');
-        expect(output).not.toContain('Item 7');
+        expect(output).toContain("Item 8");
+        expect(output).toContain("Item 10");
+        expect(output).not.toContain("Item 7");
         // Both arrows should be visible
-        expect(output).toContain('▲');
-        expect(output).toContain('▼');
+        expect(output).toContain("▲");
+        expect(output).toContain("▼");
       });
     });
 
-    it('should show both arrows dimmed when list fits entirely', () => {
+    it("should show both arrows dimmed when list fits entirely", () => {
       const { lastFrame } = renderComponent({
         items,
         maxItemsToShow: 5,
@@ -531,12 +528,12 @@ describe('BaseSelectionList', () => {
 
       const output = lastFrame();
       // Should show all items since maxItemsToShow > items.length
-      expect(output).toContain('Item A');
-      expect(output).toContain('Item B');
-      expect(output).toContain('Item C');
+      expect(output).toContain("Item A");
+      expect(output).toContain("Item B");
+      expect(output).toContain("Item C");
       // Both arrows should be visible but dimmed (this test doesn't need waitFor since no scrolling occurs)
-      expect(output).toContain('▲');
-      expect(output).toContain('▼');
+      expect(output).toContain("▲");
+      expect(output).toContain("▼");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.tsx b/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.tsx
index 8071582f7..63a3a748f 100644
--- a/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/BaseSelectionList.tsx
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useEffect, useState } from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { useSelectionList } from '../../hooks/useSelectionList.js';
-
-import type { SelectionListItem } from '../../hooks/useSelectionList.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import type { SelectionListItem } from "../../hooks/useSelectionList.js";
+import { useSelectionList } from "../../hooks/useSelectionList.js";
+import { theme } from "../../semantic-colors.js";
 
 export interface RenderItemContext {
   isSelected: boolean;
@@ -47,10 +46,7 @@ export interface BaseSelectionListProps<
  * Specific components should use this as a base and provide
  * their own renderItem implementation for custom content.
  */
-export function BaseSelectionList<
-  T,
-  TItem extends SelectionListItem<T> = SelectionListItem<T>,
->({
+export function BaseSelectionList<T, TItem extends SelectionListItem<T> = SelectionListItem<T>>({
   items,
   initialIndex = 0,
   onSelect,
@@ -92,11 +88,7 @@ export function BaseSelectionList<
     <Box flexDirection="column">
       {/* Use conditional coloring instead of conditional rendering */}
       {showScrollArrows && (
-        <Text
-          color={scrollOffset > 0 ? theme.text.primary : theme.text.secondary}
-        >
-          ▲
-        </Text>
+        <Text color={scrollOffset > 0 ? theme.text.primary : theme.text.secondary}>▲</Text>
       )}
 
       {visibleItems.map((item, index) => {
@@ -123,19 +115,14 @@ export function BaseSelectionList<
           numberColor = theme.text.secondary;
         }
 
-        const itemNumberText = `${String(itemIndex + 1).padStart(
-          numberColumnWidth,
-        )}.`;
+        const itemNumberText = `${String(itemIndex + 1).padStart(numberColumnWidth)}.`;
 
         return (
           <Box key={item.key} alignItems="flex-start">
             {/* Radio button indicator */}
             <Box minWidth={2} flexShrink={0}>
-              <Text
-                color={isSelected ? theme.status.success : theme.text.primary}
-                aria-hidden
-              >
-                {isSelected ? '●' : ' '}
+              <Text color={isSelected ? theme.status.success : theme.text.primary} aria-hidden>
+                {isSelected ? "●" : " "}
               </Text>
             </Box>
 
@@ -166,9 +153,7 @@ export function BaseSelectionList<
       {showScrollArrows && (
         <Text
           color={
-            scrollOffset + maxItemsToShow < items.length
-              ? theme.text.primary
-              : theme.text.secondary
+            scrollOffset + maxItemsToShow < items.length ? theme.text.primary : theme.text.secondary
           }
         >
           ▼
diff --git a/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.test.tsx b/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.test.tsx
index 8ca34c174..680e21ca9 100644
--- a/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.test.tsx
@@ -4,17 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { renderWithProviders } from '../../../test-utils/render.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
 import {
   DescriptiveRadioButtonSelect,
-  type DescriptiveRadioSelectItem,
   type DescriptiveRadioButtonSelectProps,
-} from './DescriptiveRadioButtonSelect.js';
+  type DescriptiveRadioSelectItem,
+} from "./DescriptiveRadioButtonSelect.js";
 
-vi.mock('./BaseSelectionList.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('./BaseSelectionList.js')>();
+vi.mock("./BaseSelectionList.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("./BaseSelectionList.js")>();
   return {
     ...actual,
     BaseSelectionList: vi.fn(({ children, ...props }) => (
@@ -23,67 +22,63 @@ vi.mock('./BaseSelectionList.js', async (importOriginal) => {
   };
 });
 
-vi.mock('../../semantic-colors.js', () => ({
+vi.mock("../../semantic-colors.js", () => ({
   theme: {
     text: {
-      primary: 'COLOR_PRIMARY',
-      secondary: 'COLOR_SECONDARY',
+      primary: "COLOR_PRIMARY",
+      secondary: "COLOR_SECONDARY",
     },
     status: {
-      success: 'COLOR_SUCCESS',
+      success: "COLOR_SUCCESS",
     },
   },
 }));
 
-describe('DescriptiveRadioButtonSelect', () => {
+describe("DescriptiveRadioButtonSelect", () => {
   const mockOnSelect = vi.fn();
   const mockOnHighlight = vi.fn();
 
   const ITEMS: Array<DescriptiveRadioSelectItem<string>> = [
     {
-      title: 'Foo Title',
-      description: 'This is Foo.',
-      value: 'foo',
-      key: 'foo',
+      title: "Foo Title",
+      description: "This is Foo.",
+      value: "foo",
+      key: "foo",
     },
     {
-      title: 'Bar Title',
-      description: 'This is Bar.',
-      value: 'bar',
-      key: 'bar',
+      title: "Bar Title",
+      description: "This is Bar.",
+      value: "bar",
+      key: "bar",
     },
     {
-      title: 'Baz Title',
-      description: 'This is Baz.',
-      value: 'baz',
+      title: "Baz Title",
+      description: "This is Baz.",
+      value: "baz",
       disabled: true,
-      key: 'baz',
+      key: "baz",
     },
   ];
 
-  const renderComponent = (
-    props: Partial<DescriptiveRadioButtonSelectProps<string>> = {},
-  ) => {
+  const renderComponent = (props: Partial<DescriptiveRadioButtonSelectProps<string>> = {}) => {
     const defaultProps: DescriptiveRadioButtonSelectProps<string> = {
       items: ITEMS,
       onSelect: mockOnSelect,
       ...props,
     };
-    return renderWithProviders(
-      <DescriptiveRadioButtonSelect {...defaultProps} />,
-    );
+    return renderWithProviders(<DescriptiveRadioButtonSelect {...defaultProps} />);
   };
 
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should render correctly with default props', () => {
+  it("should render correctly with default props", () => {
     const { lastFrame } = renderComponent();
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('should render correctly with custom props', () => {
+  it("should render correctly with custom props", () => {
     const { lastFrame } = renderComponent({
       initialIndex: 1,
       isFocused: false,
diff --git a/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx b/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx
index 3cc563283..23ec7d1f6 100644
--- a/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/DescriptiveRadioButtonSelect.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { BaseSelectionList } from './BaseSelectionList.js';
-import type { SelectionListItem } from '../../hooks/useSelectionList.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import type { SelectionListItem } from "../../hooks/useSelectionList.js";
+import { theme } from "../../semantic-colors.js";
+import { BaseSelectionList } from "./BaseSelectionList.js";
 
 export interface DescriptiveRadioSelectItem<T> extends SelectionListItem<T> {
   title: string;
diff --git a/packages/ui-gemini/src/ui/components/shared/EnumSelector.test.tsx b/packages/ui-gemini/src/ui/components/shared/EnumSelector.test.tsx
index be2df513f..5de0c8a90 100644
--- a/packages/ui-gemini/src/ui/components/shared/EnumSelector.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/EnumSelector.test.tsx
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { EnumSelector } from './EnumSelector.js';
-import type { SettingEnumOption } from '../../../config/settingsSchema.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import type { SettingEnumOption } from "../../../config/settingsSchema.js";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { EnumSelector } from "./EnumSelector.js";
 
 const LANGUAGE_OPTIONS: readonly SettingEnumOption[] = [
-  { label: 'English', value: 'en' },
-  { label: '中文 (简体)', value: 'zh' },
-  { label: 'Español', value: 'es' },
-  { label: 'Français', value: 'fr' },
+  { label: "English", value: "en" },
+  { label: "中文 (简体)", value: "zh" },
+  { label: "Español", value: "es" },
+  { label: "Français", value: "fr" },
 ];
 
 const NUMERIC_OPTIONS: readonly SettingEnumOption[] = [
-  { label: 'Low', value: 1 },
-  { label: 'Medium', value: 2 },
-  { label: 'High', value: 3 },
+  { label: "Low", value: 1 },
+  { label: "Medium", value: 2 },
+  { label: "High", value: 3 },
 ];
 
-describe('<EnumSelector />', () => {
-  it('renders with string options and matches snapshot', () => {
+describe("<EnumSelector />", () => {
+  it("renders with string options and matches snapshot", () => {
     const { lastFrame } = renderWithProviders(
       <EnumSelector
         options={LANGUAGE_OPTIONS}
@@ -35,7 +35,7 @@ describe('<EnumSelector />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders with numeric options and matches snapshot', () => {
+  it("renders with numeric options and matches snapshot", () => {
     const { lastFrame } = renderWithProviders(
       <EnumSelector
         options={NUMERIC_OPTIONS}
@@ -47,7 +47,7 @@ describe('<EnumSelector />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders inactive state and matches snapshot', () => {
+  it("renders inactive state and matches snapshot", () => {
     const { lastFrame } = renderWithProviders(
       <EnumSelector
         options={LANGUAGE_OPTIONS}
@@ -59,10 +59,8 @@ describe('<EnumSelector />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders with single option and matches snapshot', () => {
-    const singleOption: readonly SettingEnumOption[] = [
-      { label: 'Only Option', value: 'only' },
-    ];
+  it("renders with single option and matches snapshot", () => {
+    const singleOption: readonly SettingEnumOption[] = [{ label: "Only Option", value: "only" }];
     const { lastFrame } = renderWithProviders(
       <EnumSelector
         options={singleOption}
@@ -74,19 +72,14 @@ describe('<EnumSelector />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders nothing when no options are provided', () => {
+  it("renders nothing when no options are provided", () => {
     const { lastFrame } = renderWithProviders(
-      <EnumSelector
-        options={[]}
-        currentValue=""
-        isActive={true}
-        onValueChange={() => {}}
-      />,
+      <EnumSelector options={[]} currentValue="" isActive={true} onValueChange={() => {}} />,
     );
-    expect(lastFrame()).toBe('');
+    expect(lastFrame()).toBe("");
   });
 
-  it('handles currentValue not found in options', () => {
+  it("handles currentValue not found in options", () => {
     const { lastFrame } = renderWithProviders(
       <EnumSelector
         options={LANGUAGE_OPTIONS}
@@ -96,10 +89,10 @@ describe('<EnumSelector />', () => {
       />,
     );
     // Should default to first option
-    expect(lastFrame()).toContain('English');
+    expect(lastFrame()).toContain("English");
   });
 
-  it('updates when currentValue changes externally', () => {
+  it("updates when currentValue changes externally", () => {
     const { rerender, lastFrame } = renderWithProviders(
       <EnumSelector
         options={LANGUAGE_OPTIONS}
@@ -108,7 +101,7 @@ describe('<EnumSelector />', () => {
         onValueChange={() => {}}
       />,
     );
-    expect(lastFrame()).toContain('English');
+    expect(lastFrame()).toContain("English");
 
     rerender(
       <EnumSelector
@@ -118,10 +111,10 @@ describe('<EnumSelector />', () => {
         onValueChange={() => {}}
       />,
     );
-    expect(lastFrame()).toContain('中文 (简体)');
+    expect(lastFrame()).toContain("中文 (简体)");
   });
 
-  it('shows navigation arrows when multiple options available', () => {
+  it("shows navigation arrows when multiple options available", () => {
     const { lastFrame } = renderWithProviders(
       <EnumSelector
         options={LANGUAGE_OPTIONS}
@@ -130,14 +123,12 @@ describe('<EnumSelector />', () => {
         onValueChange={() => {}}
       />,
     );
-    expect(lastFrame()).toContain('←');
-    expect(lastFrame()).toContain('→');
+    expect(lastFrame()).toContain("←");
+    expect(lastFrame()).toContain("→");
   });
 
-  it('hides navigation arrows when single option available', () => {
-    const singleOption: readonly SettingEnumOption[] = [
-      { label: 'Only Option', value: 'only' },
-    ];
+  it("hides navigation arrows when single option available", () => {
+    const singleOption: readonly SettingEnumOption[] = [{ label: "Only Option", value: "only" }];
     const { lastFrame } = renderWithProviders(
       <EnumSelector
         options={singleOption}
@@ -146,7 +137,7 @@ describe('<EnumSelector />', () => {
         onValueChange={() => {}}
       />,
     );
-    expect(lastFrame()).not.toContain('←');
-    expect(lastFrame()).not.toContain('→');
+    expect(lastFrame()).not.toContain("←");
+    expect(lastFrame()).not.toContain("→");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/shared/EnumSelector.tsx b/packages/ui-gemini/src/ui/components/shared/EnumSelector.tsx
index a86efd8ff..08d3177ce 100644
--- a/packages/ui-gemini/src/ui/components/shared/EnumSelector.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/EnumSelector.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { Colors } from '../../colors.js';
-import type { SettingEnumOption } from '../../../config/settingsSchema.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { useEffect, useState } from "react";
+import type { SettingEnumOption } from "../../../config/settingsSchema.js";
+import { Colors } from "../../colors.js";
 
 interface EnumSelectorProps {
   options: readonly SettingEnumOption[];
@@ -61,23 +61,16 @@ export function EnumSelector({
 
   return (
     <Box flexDirection="row" alignItems="center">
-      <Text
-        color={isActive && canScrollLeft ? Colors.AccentGreen : Colors.Gray}
-      >
-        {canScrollLeft ? '←' : ' '}
+      <Text color={isActive && canScrollLeft ? Colors.AccentGreen : Colors.Gray}>
+        {canScrollLeft ? "←" : " "}
       </Text>
       <Text> </Text>
-      <Text
-        color={isActive ? Colors.AccentGreen : Colors.Foreground}
-        bold={isActive}
-      >
+      <Text color={isActive ? Colors.AccentGreen : Colors.Foreground} bold={isActive}>
         {currentOption.label}
       </Text>
       <Text> </Text>
-      <Text
-        color={isActive && canScrollRight ? Colors.AccentGreen : Colors.Gray}
-      >
-        {canScrollRight ? '→' : ' '}
+      <Text color={isActive && canScrollRight ? Colors.AccentGreen : Colors.Gray}>
+        {canScrollRight ? "→" : " "}
       </Text>
     </Box>
   );
diff --git a/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.test.tsx b/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.test.tsx
index 6312e4816..de3221cbc 100644
--- a/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.test.tsx
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { OverflowProvider } from '../../contexts/OverflowContext.js';
-import { MaxSizedBox, setMaxSizedBoxDebugging } from './MaxSizedBox.js';
-import { Box, Text } from 'ink';
-import { describe, it, expect } from 'vitest';
+import { Box, Text } from "ink";
+import { describe, expect, it } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { OverflowProvider } from "../../contexts/OverflowContext.js";
+import { MaxSizedBox, setMaxSizedBoxDebugging } from "./MaxSizedBox.js";
 
-describe('<MaxSizedBox />', () => {
+describe("<MaxSizedBox />", () => {
   // Make sure MaxSizedBox logs errors on invalid configurations.
   // This is useful for debugging issues with the component.
   // It should be set to false in production for performance and to avoid
   // cluttering the console if there are ignorable issues.
   setMaxSizedBoxDebugging(true);
 
-  it('renders children without truncation when they fit', () => {
+  it("renders children without truncation when they fit", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={80} maxHeight={10}>
@@ -27,11 +27,11 @@ describe('<MaxSizedBox />', () => {
         </MaxSizedBox>
       </OverflowProvider>,
     );
-    expect(lastFrame()).equals('Hello, World!');
+    expect(lastFrame()).equals("Hello, World!");
     unmount();
   });
 
-  it('hides lines when content exceeds maxHeight', () => {
+  it("hides lines when content exceeds maxHeight", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={80} maxHeight={2}>
@@ -52,7 +52,7 @@ Line 3`);
     unmount();
   });
 
-  it('hides lines at the end when content exceeds maxHeight and overflowDirection is bottom', () => {
+  it("hides lines at the end when content exceeds maxHeight and overflowDirection is bottom", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={80} maxHeight={2} overflowDirection="bottom">
@@ -73,7 +73,7 @@ Line 3`);
     unmount();
   });
 
-  it('wraps text that exceeds maxWidth', () => {
+  it("wraps text that exceeds maxWidth", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={10} maxHeight={5}>
@@ -90,7 +90,7 @@ of text`);
     unmount();
   });
 
-  it('handles mixed wrapping and non-wrapping segments', () => {
+  it("handles mixed wrapping and non-wrapping segments", () => {
     const multilineText = `This part will wrap around.
 And has a line break.
   Leading spaces preserved.`;
@@ -132,7 +132,7 @@ Longer No Wrap: This
     unmount();
   });
 
-  it('handles words longer than maxWidth by splitting them', () => {
+  it("handles words longer than maxWidth by splitting them", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={5} maxHeight={5}>
@@ -151,7 +151,7 @@ ious`);
     unmount();
   });
 
-  it('does not truncate when maxHeight is undefined', () => {
+  it("does not truncate when maxHeight is undefined", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={80} maxHeight={undefined}>
@@ -211,7 +211,7 @@ Line 3`);
     unmount();
   });
 
-  it('renders an empty box for empty children', () => {
+  it("renders an empty box for empty children", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={80} maxHeight={10}></MaxSizedBox>
@@ -219,11 +219,11 @@ Line 3`);
     );
     // Expect an empty string or a box with nothing in it.
     // Ink renders an empty box as an empty string.
-    expect(lastFrame()).equals('');
+    expect(lastFrame()).equals("");
     unmount();
   });
 
-  it('wraps text with multi-byte unicode characters correctly', () => {
+  it("wraps text with multi-byte unicode characters correctly", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={5} maxHeight={5}>
@@ -241,7 +241,7 @@ Line 3`);
     unmount();
   });
 
-  it('wraps text with multi-byte emoji characters correctly', () => {
+  it("wraps text with multi-byte emoji characters correctly", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={5} maxHeight={5}>
@@ -260,7 +260,7 @@ Line 3`);
     unmount();
   });
 
-  it('falls back to an ellipsis when width is extremely small', () => {
+  it("falls back to an ellipsis when width is extremely small", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={2} maxHeight={2}>
@@ -272,11 +272,11 @@ Line 3`);
       </OverflowProvider>,
     );
 
-    expect(lastFrame()).equals('N…');
+    expect(lastFrame()).equals("N…");
     unmount();
   });
 
-  it('truncates long non-wrapping text with ellipsis', () => {
+  it("truncates long non-wrapping text with ellipsis", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={3} maxHeight={2}>
@@ -288,16 +288,16 @@ Line 3`);
       </OverflowProvider>,
     );
 
-    expect(lastFrame()).equals('AB…');
+    expect(lastFrame()).equals("AB…");
     unmount();
   });
 
-  it('truncates non-wrapping text containing line breaks', () => {
+  it("truncates non-wrapping text containing line breaks", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={3} maxHeight={2}>
           <Box>
-            <Text>{'A\nBCDE'}</Text>
+            <Text>{"A\nBCDE"}</Text>
             <Text wrap="wrap">wrap</Text>
           </Box>
         </MaxSizedBox>
@@ -308,7 +308,7 @@ Line 3`);
     unmount();
   });
 
-  it('truncates emoji characters correctly with ellipsis', () => {
+  it("truncates emoji characters correctly with ellipsis", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={3} maxHeight={2}>
@@ -324,7 +324,7 @@ Line 3`);
     unmount();
   });
 
-  it('shows ellipsis for multiple rows with long non-wrapping text', () => {
+  it("shows ellipsis for multiple rows with long non-wrapping text", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={3} maxHeight={3}>
@@ -348,7 +348,7 @@ Line 3`);
     unmount();
   });
 
-  it('accounts for additionalHiddenLinesCount', () => {
+  it("accounts for additionalHiddenLinesCount", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={80} maxHeight={2} additionalHiddenLinesCount={5}>
@@ -370,7 +370,7 @@ Line 3`);
     unmount();
   });
 
-  it('handles React.Fragment as a child', () => {
+  it("handles React.Fragment as a child", () => {
     const { lastFrame, unmount } = render(
       <OverflowProvider>
         <MaxSizedBox maxWidth={80} maxHeight={10}>
@@ -394,11 +394,8 @@ Line 3 direct child`);
     unmount();
   });
 
-  it('clips a long single text child from the top', () => {
-    const THIRTY_LINES = Array.from(
-      { length: 30 },
-      (_, i) => `Line ${i + 1}`,
-    ).join('\n');
+  it("clips a long single text child from the top", () => {
+    const THIRTY_LINES = Array.from({ length: 30 }, (_, i) => `Line ${i + 1}`).join("\n");
 
     const { lastFrame, unmount } = render(
       <OverflowProvider>
@@ -411,19 +408,16 @@ Line 3 direct child`);
     );
 
     const expected = [
-      '... first 21 lines hidden ...',
+      "... first 21 lines hidden ...",
       ...Array.from({ length: 9 }, (_, i) => `Line ${22 + i}`),
-    ].join('\n');
+    ].join("\n");
 
     expect(lastFrame()).equals(expected);
     unmount();
   });
 
-  it('clips a long single text child from the bottom', () => {
-    const THIRTY_LINES = Array.from(
-      { length: 30 },
-      (_, i) => `Line ${i + 1}`,
-    ).join('\n');
+  it("clips a long single text child from the bottom", () => {
+    const THIRTY_LINES = Array.from({ length: 30 }, (_, i) => `Line ${i + 1}`).join("\n");
 
     const { lastFrame, unmount } = render(
       <OverflowProvider>
@@ -437,8 +431,8 @@ Line 3 direct child`);
 
     const expected = [
       ...Array.from({ length: 9 }, (_, i) => `Line ${i + 1}`),
-      '... last 21 lines hidden ...',
-    ].join('\n');
+      "... last 21 lines hidden ...",
+    ].join("\n");
 
     expect(lastFrame()).equals(expected);
     unmount();
diff --git a/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.tsx b/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.tsx
index 86b36cd28..20eacd756 100644
--- a/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/MaxSizedBox.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { Fragment, useEffect, useId } from 'react';
-import { Box, Text } from 'ink';
-import stringWidth from 'string-width';
-import { theme } from '../../semantic-colors.js';
-import { toCodePoints } from '../../utils/textUtils.js';
-import { useOverflowActions } from '../../contexts/OverflowContext.js';
+import { Box, Text } from "ink";
+import React, { Fragment, useEffect, useId } from "react";
+import stringWidth from "string-width";
+import { useOverflowActions } from "../../contexts/OverflowContext.js";
+import { theme } from "../../semantic-colors.js";
+import { toCodePoints } from "../../utils/textUtils.js";
 
 let enableDebugLog = false;
 
@@ -28,23 +28,20 @@ function debugReportError(message: string, element: React.ReactNode) {
   if (!enableDebugLog) return;
 
   if (!React.isValidElement(element)) {
-    console.error(
-      message,
-      `Invalid element: '${String(element)}' typeof=${typeof element}`,
-    );
+    console.error(message, `Invalid element: '${String(element)}' typeof=${typeof element}`);
     return;
   }
 
-  let sourceMessage = '<Unknown file>';
+  let sourceMessage = "<Unknown file>";
   try {
     const elementWithSource = element as {
       _source?: { fileName?: string; lineNumber?: number };
     };
     const fileName = elementWithSource._source?.fileName;
     const lineNumber = elementWithSource._source?.lineNumber;
-    sourceMessage = fileName ? `${fileName}:${lineNumber}` : '<Unknown file>';
+    sourceMessage = fileName ? `${fileName}:${lineNumber}` : "<Unknown file>";
   } catch (error) {
-    console.error('Error while trying to get file name:', error);
+    console.error("Error while trying to get file name:", error);
   }
 
   console.error(message, `${String(element.type)}. Source: ${sourceMessage}`);
@@ -53,7 +50,7 @@ interface MaxSizedBoxProps {
   children?: React.ReactNode;
   maxWidth?: number;
   maxHeight: number | undefined;
-  overflowDirection?: 'top' | 'bottom';
+  overflowDirection?: "top" | "bottom";
   additionalHiddenLinesCount?: number;
 }
 
@@ -100,7 +97,7 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
   children,
   maxWidth,
   maxHeight,
-  overflowDirection = 'top',
+  overflowDirection = "top",
   additionalHiddenLinesCount = 0,
 }) => {
   const id = useId();
@@ -113,7 +110,7 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
   );
 
   if (maxWidth === undefined) {
-    throw new Error('maxWidth must be defined when maxHeight is set.');
+    throw new Error("maxWidth must be defined when maxHeight is set.");
   }
   function visitRows(element: React.ReactNode) {
     if (!React.isValidElement<{ children?: React.ReactNode }>(element)) {
@@ -130,19 +127,16 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
       return;
     }
 
-    debugReportError('MaxSizedBox children must be <Box> elements', element);
+    debugReportError("MaxSizedBox children must be <Box> elements", element);
   }
 
   React.Children.forEach(children, visitRows);
 
   const contentWillOverflow =
-    (targetMaxHeight !== undefined &&
-      laidOutStyledText.length > targetMaxHeight) ||
+    (targetMaxHeight !== undefined && laidOutStyledText.length > targetMaxHeight) ||
     additionalHiddenLinesCount > 0;
   const visibleContentHeight =
-    contentWillOverflow && targetMaxHeight !== undefined
-      ? targetMaxHeight - 1
-      : targetMaxHeight;
+    contentWillOverflow && targetMaxHeight !== undefined ? targetMaxHeight - 1 : targetMaxHeight;
 
   const hiddenLinesCount =
     visibleContentHeight !== undefined
@@ -164,7 +158,7 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
 
   const visibleStyledText =
     hiddenLinesCount > 0
-      ? overflowDirection === 'top'
+      ? overflowDirection === "top"
         ? laidOutStyledText.slice(hiddenLinesCount, laidOutStyledText.length)
         : laidOutStyledText.slice(0, visibleContentHeight)
       : laidOutStyledText;
@@ -185,17 +179,15 @@ export const MaxSizedBox: React.FC<MaxSizedBoxProps> = ({
 
   return (
     <Box flexDirection="column" width={maxWidth} flexShrink={0}>
-      {totalHiddenLines > 0 && overflowDirection === 'top' && (
+      {totalHiddenLines > 0 && overflowDirection === "top" && (
         <Text color={theme.text.secondary} wrap="truncate">
-          ... first {totalHiddenLines} line{totalHiddenLines === 1 ? '' : 's'}{' '}
-          hidden ...
+          ... first {totalHiddenLines} line{totalHiddenLines === 1 ? "" : "s"} hidden ...
         </Text>
       )}
       {visibleLines}
-      {totalHiddenLines > 0 && overflowDirection === 'bottom' && (
+      {totalHiddenLines > 0 && overflowDirection === "bottom" && (
         <Text color={theme.text.secondary} wrap="truncate">
-          ... last {totalHiddenLines} line{totalHiddenLines === 1 ? '' : 's'}{' '}
-          hidden ...
+          ... last {totalHiddenLines} line{totalHiddenLines === 1 ? "" : "s"} hidden ...
         </Text>
       )}
     </Box>
@@ -248,16 +240,10 @@ interface Row {
  * @returns An array of `Row` objects.
  */
 function visitBoxRow(element: React.ReactNode): Row {
-  if (
-    !React.isValidElement<{ children?: React.ReactNode }>(element) ||
-    element.type !== Box
-  ) {
-    debugReportError(
-      `All children of MaxSizedBox must be <Box> elements`,
-      element,
-    );
+  if (!React.isValidElement<{ children?: React.ReactNode }>(element) || element.type !== Box) {
+    debugReportError(`All children of MaxSizedBox must be <Box> elements`, element);
     return {
-      noWrapSegments: [{ text: '<ERROR>', props: {} }],
+      noWrapSegments: [{ text: "<ERROR>", props: {} }],
       segments: [],
     };
   }
@@ -265,11 +251,7 @@ function visitBoxRow(element: React.ReactNode): Row {
   if (enableDebugLog) {
     const boxProps = element.props as {
       children?: React.ReactNode;
-      readonly flexDirection?:
-        | 'row'
-        | 'column'
-        | 'row-reverse'
-        | 'column-reverse';
+      readonly flexDirection?: "row" | "column" | "row-reverse" | "column-reverse";
     };
     // Ensure the Box has no props other than the default ones and key.
     let maxExpectedProps = 4;
@@ -277,20 +259,14 @@ function visitBoxRow(element: React.ReactNode): Row {
       // Allow the key prop, which is automatically added by React.
       maxExpectedProps += 1;
     }
-    if (
-      boxProps.flexDirection !== undefined &&
-      boxProps.flexDirection !== 'row'
-    ) {
-      debugReportError(
-        'MaxSizedBox children must have flexDirection="row".',
-        element,
-      );
+    if (boxProps.flexDirection !== undefined && boxProps.flexDirection !== "row") {
+      debugReportError('MaxSizedBox children must have flexDirection="row".', element);
     }
     if (Object.keys(boxProps).length > maxExpectedProps) {
       debugReportError(
-        `Boxes inside MaxSizedBox must not have additional props. ${Object.keys(
-          boxProps,
-        ).join(', ')}`,
+        `Boxes inside MaxSizedBox must not have additional props. ${Object.keys(boxProps).join(
+          ", ",
+        )}`,
         element,
       );
     }
@@ -310,7 +286,7 @@ function visitBoxRow(element: React.ReactNode): Row {
     if (element === null) {
       return;
     }
-    if (typeof element === 'string' || typeof element === 'number') {
+    if (typeof element === "string" || typeof element === "number") {
       const text = String(element);
       // Ignore empty strings as they don't need to be rendered.
       if (!text) {
@@ -320,7 +296,7 @@ function visitBoxRow(element: React.ReactNode): Row {
       const segment: StyledText = { text, props: parentProps ?? {} };
 
       // Check the 'wrap' property from the merged props to decide the segment type.
-      if (parentProps === undefined || parentProps['wrap'] === 'wrap') {
+      if (parentProps === undefined || parentProps["wrap"] === "wrap") {
         hasSeenWrapped = true;
         row.segments.push(segment);
       } else {
@@ -330,7 +306,7 @@ function visitBoxRow(element: React.ReactNode): Row {
           // put in the wrapped segment as the row is already stuck in wrapped mode.
           row.segments.push(segment);
           debugReportError(
-            'Text elements without wrapping cannot appear after elements with wrapping in the same row.',
+            "Text elements without wrapping cannot appear after elements with wrapping in the same row.",
             element,
           );
         }
@@ -339,39 +315,28 @@ function visitBoxRow(element: React.ReactNode): Row {
     }
 
     if (!React.isValidElement<{ children?: React.ReactNode }>(element)) {
-      debugReportError('Invalid element.', element);
+      debugReportError("Invalid element.", element);
       return;
     }
 
     if (element.type === Fragment) {
-      React.Children.forEach(element.props.children, (child) =>
-        visitRowChild(child, parentProps),
-      );
+      React.Children.forEach(element.props.children, (child) => visitRowChild(child, parentProps));
       return;
     }
 
     if (element.type !== Text) {
-      debugReportError(
-        'Children of a row Box must be <Text> elements.',
-        element,
-      );
+      debugReportError("Children of a row Box must be <Text> elements.", element);
       return;
     }
 
     // Merge props from parent <Text> elements. Child props take precedence.
     const { children, ...currentProps } = element.props;
     const mergedProps =
-      parentProps === undefined
-        ? currentProps
-        : { ...parentProps, ...currentProps };
-    React.Children.forEach(children, (child) =>
-      visitRowChild(child, mergedProps),
-    );
+      parentProps === undefined ? currentProps : { ...parentProps, ...currentProps };
+    React.Children.forEach(children, (child) => visitRowChild(child, mergedProps));
   }
 
-  React.Children.forEach(element.props.children, (child) =>
-    visitRowChild(child, undefined),
-  );
+  React.Children.forEach(element.props.children, (child) => visitRowChild(child, undefined));
 
   return row;
 }
@@ -404,7 +369,7 @@ function layoutInkElementAsStyledText(
     const lines: StyledText[][] = [];
     let currentLine: StyledText[] = [];
     nonWrappingContent.forEach((segment) => {
-      const textLines = segment.text.split('\n');
+      const textLines = segment.text.split("\n");
       textLines.forEach((text, index) => {
         if (index > 0) {
           lines.push(currentLine);
@@ -418,7 +383,7 @@ function layoutInkElementAsStyledText(
     if (
       currentLine.length > 0 ||
       (nonWrappingContent.length > 0 &&
-        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith('\n'))
+        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith("\n"))
     ) {
       lines.push(currentLine);
     }
@@ -440,7 +405,7 @@ function layoutInkElementAsStyledText(
     let currentLineWidth = 0;
 
     for (const segment of nonWrappingContent) {
-      const textLines = segment.text.split('\n');
+      const textLines = segment.text.split("\n");
       textLines.forEach((text, index) => {
         if (index > 0) {
           // New line encountered, finish current line and start new one
@@ -456,11 +421,11 @@ function layoutInkElementAsStyledText(
           // For lines after the first line break, show only ellipsis if the text would be truncated
           if (index > 0 && textWidth > 0) {
             // This is content after a line break - just show ellipsis to indicate truncation
-            currentLine.push({ text: '…', props: {} });
-            currentLineWidth = stringWidth('…');
+            currentLine.push({ text: "…", props: {} });
+            currentLineWidth = stringWidth("…");
           } else {
             // This is the first line or a continuation, try to fit what we can
-            const maxContentWidth = Math.max(0, maxWidth - stringWidth('…'));
+            const maxContentWidth = Math.max(0, maxWidth - stringWidth("…"));
 
             if (textWidth <= maxContentWidth && currentLineWidth === 0) {
               // Text fits completely on this line
@@ -481,12 +446,12 @@ function layoutInkElementAsStyledText(
                 sliceEndIndex++;
               }
 
-              const slice = codePoints.slice(0, sliceEndIndex).join('');
+              const slice = codePoints.slice(0, sliceEndIndex).join("");
               if (slice) {
                 currentLine.push({ text: slice, props: segment.props });
               }
-              currentLine.push({ text: '…', props: {} });
-              currentLineWidth = truncatedWidth + stringWidth('…');
+              currentLine.push({ text: "…", props: {} });
+              currentLineWidth = truncatedWidth + stringWidth("…");
             }
           }
         }
@@ -497,14 +462,14 @@ function layoutInkElementAsStyledText(
     if (
       currentLine.length > 0 ||
       (nonWrappingContent.length > 0 &&
-        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith('\n'))
+        nonWrappingContent[nonWrappingContent.length - 1].text.endsWith("\n"))
     ) {
       lines.push(currentLine);
     }
 
     // If we don't have any lines yet, add an ellipsis line
     if (lines.length === 0) {
-      lines.push([{ text: '…', props: {} }]);
+      lines.push([{ text: "…", props: {} }]);
     }
 
     for (const line of lines) {
@@ -522,10 +487,7 @@ function layoutInkElementAsStyledText(
       lines.push([...nonWrappingContent, ...wrappingPart]);
     } else {
       if (noWrappingWidth > 0) {
-        lines.push([
-          ...[{ text: ' '.repeat(noWrappingWidth), props: {} }],
-          ...wrappingPart,
-        ]);
+        lines.push([...[{ text: " ".repeat(noWrappingWidth), props: {} }], ...wrappingPart]);
       } else {
         lines.push(wrappingPart);
       }
@@ -535,10 +497,7 @@ function layoutInkElementAsStyledText(
   }
 
   function addToWrappingPart(text: string, props: Record<string, unknown>) {
-    if (
-      wrappingPart.length > 0 &&
-      wrappingPart[wrappingPart.length - 1].props === props
-    ) {
+    if (wrappingPart.length > 0 && wrappingPart[wrappingPart.length - 1].props === props) {
       wrappingPart[wrappingPart.length - 1].text += text;
     } else {
       wrappingPart.push({ text, props });
@@ -546,7 +505,7 @@ function layoutInkElementAsStyledText(
   }
 
   row.segments.forEach((segment) => {
-    const linesFromSegment = segment.text.split('\n');
+    const linesFromSegment = segment.text.split("\n");
 
     linesFromSegment.forEach((lineText, lineIndex) => {
       if (lineIndex > 0) {
@@ -559,10 +518,7 @@ function layoutInkElementAsStyledText(
         if (!word) return;
         const wordWidth = stringWidth(word);
 
-        if (
-          wrappingPartWidth + wordWidth > availableWidth &&
-          wrappingPartWidth > 0
-        ) {
+        if (wrappingPartWidth + wordWidth > availableWidth && wrappingPartWidth > 0) {
           addWrappingPartToLines();
           if (/^\s+$/.test(word)) {
             return;
@@ -578,10 +534,7 @@ function layoutInkElementAsStyledText(
             let currentSplitWidth = 0;
             for (const char of remainingWordAsCodePoints) {
               const charWidth = stringWidth(char);
-              if (
-                wrappingPartWidth + currentSplitWidth + charWidth >
-                availableWidth
-              ) {
+              if (wrappingPartWidth + currentSplitWidth + charWidth > availableWidth) {
                 break;
               }
               currentSplitWidth += charWidth;
@@ -589,13 +542,10 @@ function layoutInkElementAsStyledText(
             }
 
             if (splitIndex > 0) {
-              const part = remainingWordAsCodePoints
-                .slice(0, splitIndex)
-                .join('');
+              const part = remainingWordAsCodePoints.slice(0, splitIndex).join("");
               addToWrappingPart(part, segment.props);
               wrappingPartWidth += stringWidth(part);
-              remainingWordAsCodePoints =
-                remainingWordAsCodePoints.slice(splitIndex);
+              remainingWordAsCodePoints = remainingWordAsCodePoints.slice(splitIndex);
             }
 
             if (remainingWordAsCodePoints.length > 0) {
@@ -609,7 +559,7 @@ function layoutInkElementAsStyledText(
       });
     });
     // Split omits a trailing newline, so we need to handle it here
-    if (segment.text.endsWith('\n')) {
+    if (segment.text.endsWith("\n")) {
       addWrappingPartToLines();
     }
   });
diff --git a/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.test.tsx b/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.test.tsx
index 1b15bc6f9..da223c3fa 100644
--- a/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.test.tsx
@@ -4,33 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { renderWithProviders } from '../../../test-utils/render.js';
-import type React from 'react';
-import {
-  RadioButtonSelect,
-  type RadioSelectItem,
-  type RadioButtonSelectProps,
-} from './RadioButtonSelect.js';
+import type React from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
 import {
   BaseSelectionList,
   type BaseSelectionListProps,
   type RenderItemContext,
-} from './BaseSelectionList.js';
+} from "./BaseSelectionList.js";
+import {
+  RadioButtonSelect,
+  type RadioButtonSelectProps,
+  type RadioSelectItem,
+} from "./RadioButtonSelect.js";
 
-vi.mock('./BaseSelectionList.js', () => ({
+vi.mock("./BaseSelectionList.js", () => ({
   BaseSelectionList: vi.fn(() => null),
 }));
 
-vi.mock('../../semantic-colors.js', () => ({
+vi.mock("../../semantic-colors.js", () => ({
   theme: {
-    text: { secondary: 'COLOR_SECONDARY' },
+    text: { secondary: "COLOR_SECONDARY" },
   },
 }));
 
-const MockedBaseSelectionList = vi.mocked(
-  BaseSelectionList,
-) as unknown as ReturnType<typeof vi.fn>;
+const MockedBaseSelectionList = vi.mocked(BaseSelectionList) as unknown as ReturnType<typeof vi.fn>;
 
 type RadioRenderItemFn = (
   item: RadioSelectItem<string>,
@@ -41,35 +39,30 @@ const extractRenderItem = (): RadioRenderItemFn => {
 
   if (mockCalls.length === 0) {
     throw new Error(
-      'BaseSelectionList was not called. Ensure RadioButtonSelect is rendered before calling extractRenderItem.',
+      "BaseSelectionList was not called. Ensure RadioButtonSelect is rendered before calling extractRenderItem.",
     );
   }
 
-  const props = mockCalls[0][0] as BaseSelectionListProps<
-    string,
-    RadioSelectItem<string>
-  >;
+  const props = mockCalls[0][0] as BaseSelectionListProps<string, RadioSelectItem<string>>;
 
-  if (typeof props.renderItem !== 'function') {
-    throw new Error('renderItem prop was not found on BaseSelectionList call.');
+  if (typeof props.renderItem !== "function") {
+    throw new Error("renderItem prop was not found on BaseSelectionList call.");
   }
 
   return props.renderItem as RadioRenderItemFn;
 };
 
-describe('RadioButtonSelect', () => {
+describe("RadioButtonSelect", () => {
   const mockOnSelect = vi.fn();
   const mockOnHighlight = vi.fn();
 
   const ITEMS: Array<RadioSelectItem<string>> = [
-    { label: 'Option 1', value: 'one', key: 'one' },
-    { label: 'Option 2', value: 'two', key: 'two' },
-    { label: 'Option 3', value: 'three', disabled: true, key: 'three' },
+    { label: "Option 1", value: "one", key: "one" },
+    { label: "Option 2", value: "two", key: "two" },
+    { label: "Option 3", value: "three", disabled: true, key: "three" },
   ];
 
-  const renderComponent = (
-    props: Partial<RadioButtonSelectProps<string>> = {},
-  ) => {
+  const renderComponent = (props: Partial<RadioButtonSelectProps<string>> = {}) => {
     const defaultProps: RadioButtonSelectProps<string> = {
       items: ITEMS,
       onSelect: mockOnSelect,
@@ -82,8 +75,8 @@ describe('RadioButtonSelect', () => {
     vi.clearAllMocks();
   });
 
-  describe('Prop forwarding to BaseSelectionList', () => {
-    it('should forward all props correctly when provided', () => {
+  describe("Prop forwarding to BaseSelectionList", () => {
+    it("should forward all props correctly when provided", () => {
       const props = {
         items: ITEMS,
         initialIndex: 1,
@@ -107,7 +100,7 @@ describe('RadioButtonSelect', () => {
       );
     });
 
-    it('should use default props if not provided', () => {
+    it("should use default props if not provided", () => {
       renderComponent({
         items: ITEMS,
         onSelect: mockOnSelect,
@@ -126,12 +119,12 @@ describe('RadioButtonSelect', () => {
     });
   });
 
-  describe('renderItem implementation', () => {
+  describe("renderItem implementation", () => {
     let renderItem: RadioRenderItemFn;
     const mockContext: RenderItemContext = {
       isSelected: false,
-      titleColor: 'MOCK_TITLE_COLOR',
-      numberColor: 'MOCK_NUMBER_COLOR',
+      titleColor: "MOCK_TITLE_COLOR",
+      numberColor: "MOCK_NUMBER_COLOR",
     };
 
     beforeEach(() => {
@@ -139,60 +132,60 @@ describe('RadioButtonSelect', () => {
       renderItem = extractRenderItem();
     });
 
-    it('should render the standard label display with correct color and truncation', () => {
+    it("should render the standard label display with correct color and truncation", () => {
       const item = ITEMS[0];
 
       const result = renderItem(item, mockContext);
 
       expect(result?.props?.color).toBe(mockContext.titleColor);
-      expect(result?.props?.children).toBe('Option 1');
-      expect(result?.props?.wrap).toBe('truncate');
+      expect(result?.props?.children).toBe("Option 1");
+      expect(result?.props?.wrap).toBe("truncate");
     });
 
-    it('should render the special theme display when theme props are present', () => {
+    it("should render the special theme display when theme props are present", () => {
       const themeItem: RadioSelectItem<string> = {
-        label: 'Theme A (Light)',
-        value: 'a-light',
-        themeNameDisplay: 'Theme A',
-        themeTypeDisplay: '(Light)',
-        key: 'a-light',
+        label: "Theme A (Light)",
+        value: "a-light",
+        themeNameDisplay: "Theme A",
+        themeTypeDisplay: "(Light)",
+        key: "a-light",
       };
 
       const result = renderItem(themeItem, mockContext);
 
       expect(result?.props?.color).toBe(mockContext.titleColor);
-      expect(result?.props?.wrap).toBe('truncate');
+      expect(result?.props?.wrap).toBe("truncate");
 
       const children = result?.props?.children;
 
       if (!Array.isArray(children) || children.length < 3) {
         throw new Error(
-          'Expected children to be an array with at least 3 elements for theme display',
+          "Expected children to be an array with at least 3 elements for theme display",
         );
       }
 
-      expect(children[0]).toBe('Theme A');
-      expect(children[1]).toBe(' ');
+      expect(children[0]).toBe("Theme A");
+      expect(children[1]).toBe(" ");
 
       const nestedTextElement = children[2] as React.ReactElement<{
         color?: string;
         children?: React.ReactNode;
       }>;
-      expect(nestedTextElement?.props?.color).toBe('COLOR_SECONDARY');
-      expect(nestedTextElement?.props?.children).toBe('(Light)');
+      expect(nestedTextElement?.props?.color).toBe("COLOR_SECONDARY");
+      expect(nestedTextElement?.props?.children).toBe("(Light)");
     });
 
-    it('should fall back to standard display if only one theme prop is present', () => {
+    it("should fall back to standard display if only one theme prop is present", () => {
       const partialThemeItem: RadioSelectItem<string> = {
-        label: 'Incomplete Theme',
-        value: 'incomplete',
-        themeNameDisplay: 'Only Name',
-        key: 'incomplete',
+        label: "Incomplete Theme",
+        value: "incomplete",
+        themeNameDisplay: "Only Name",
+        key: "incomplete",
       };
 
       const result = renderItem(partialThemeItem, mockContext);
 
-      expect(result?.props?.children).toBe('Incomplete Theme');
+      expect(result?.props?.children).toBe("Incomplete Theme");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.tsx b/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.tsx
index 02fc85228..10dc53e05 100644
--- a/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/RadioButtonSelect.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { BaseSelectionList } from './BaseSelectionList.js';
-import type { SelectionListItem } from '../../hooks/useSelectionList.js';
+import { Text } from "ink";
+import type React from "react";
+import type { SelectionListItem } from "../../hooks/useSelectionList.js";
+import { theme } from "../../semantic-colors.js";
+import { BaseSelectionList } from "./BaseSelectionList.js";
 
 /**
  * Represents a single option for the RadioButtonSelect.
@@ -74,7 +74,7 @@ export function RadioButtonSelect<T>({
         if (item.themeNameDisplay && item.themeTypeDisplay) {
           return (
             <Text color={titleColor} wrap="truncate" key={item.key}>
-              {item.themeNameDisplay}{' '}
+              {item.themeNameDisplay}{" "}
               <Text color={theme.text.secondary}>{item.themeTypeDisplay}</Text>
             </Text>
           );
diff --git a/packages/ui-gemini/src/ui/components/shared/ScopeSelector.tsx b/packages/ui-gemini/src/ui/components/shared/ScopeSelector.tsx
index 6ba19ddf6..8030433fa 100644
--- a/packages/ui-gemini/src/ui/components/shared/ScopeSelector.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/ScopeSelector.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import type { LoadableSettingScope } from '../../../config/settings.js';
-import { getScopeItems } from '../../../utils/dialogScopeUtils.js';
-import { RadioButtonSelect } from './RadioButtonSelect.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import type { LoadableSettingScope } from "../../../config/settings.js";
+import { getScopeItems } from "../../../utils/dialogScopeUtils.js";
+import { RadioButtonSelect } from "./RadioButtonSelect.js";
 
 interface ScopeSelectorProps {
   /** Callback function when a scope is selected */
@@ -32,15 +32,13 @@ export function ScopeSelector({
     key: item.value,
   }));
 
-  const initialIndex = scopeItems.findIndex(
-    (item) => item.value === initialScope,
-  );
+  const initialIndex = scopeItems.findIndex((item) => item.value === initialScope);
   const safeInitialIndex = initialIndex >= 0 ? initialIndex : 0;
 
   return (
     <Box flexDirection="column">
       <Text bold={isFocused} wrap="truncate">
-        {isFocused ? '> ' : '  '}Apply To
+        {isFocused ? "> " : "  "}Apply To
       </Text>
       <RadioButtonSelect
         items={scopeItems}
diff --git a/packages/ui-gemini/src/ui/components/shared/Scrollable.test.tsx b/packages/ui-gemini/src/ui/components/shared/Scrollable.test.tsx
index 22c2055f4..e76b9bbfb 100644
--- a/packages/ui-gemini/src/ui/components/shared/Scrollable.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/Scrollable.test.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderWithProviders } from '../../../test-utils/render.js';
-import { Scrollable } from './Scrollable.js';
-import { Text } from 'ink';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import * as ScrollProviderModule from '../../contexts/ScrollProvider.js';
-import { act } from 'react';
+import { Text } from "ink";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import * as ScrollProviderModule from "../../contexts/ScrollProvider.js";
+import { Scrollable } from "./Scrollable.js";
 
-vi.mock('ink', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("ink")>();
   return {
     ...actual,
     getInnerHeight: vi.fn(() => 5),
@@ -21,32 +21,29 @@ vi.mock('ink', async (importOriginal) => {
   };
 });
 
-vi.mock('../../hooks/useAnimatedScrollbar.js', () => ({
-  useAnimatedScrollbar: (
-    hasFocus: boolean,
-    scrollBy: (delta: number) => void,
-  ) => ({
-    scrollbarColor: 'white',
+vi.mock("../../hooks/useAnimatedScrollbar.js", () => ({
+  useAnimatedScrollbar: (hasFocus: boolean, scrollBy: (delta: number) => void) => ({
+    scrollbarColor: "white",
     flashScrollbar: vi.fn(),
     scrollByWithAnimation: scrollBy,
   }),
 }));
 
-describe('<Scrollable />', () => {
+describe("<Scrollable />", () => {
   beforeEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('renders children', () => {
+  it("renders children", () => {
     const { lastFrame } = renderWithProviders(
       <Scrollable hasFocus={false} height={5}>
         <Text>Hello World</Text>
       </Scrollable>,
     );
-    expect(lastFrame()).toContain('Hello World');
+    expect(lastFrame()).toContain("Hello World");
   });
 
-  it('renders multiple children', () => {
+  it("renders multiple children", () => {
     const { lastFrame } = renderWithProviders(
       <Scrollable hasFocus={false} height={5}>
         <Text>Line 1</Text>
@@ -54,12 +51,12 @@ describe('<Scrollable />', () => {
         <Text>Line 3</Text>
       </Scrollable>,
     );
-    expect(lastFrame()).toContain('Line 1');
-    expect(lastFrame()).toContain('Line 2');
-    expect(lastFrame()).toContain('Line 3');
+    expect(lastFrame()).toContain("Line 1");
+    expect(lastFrame()).toContain("Line 2");
+    expect(lastFrame()).toContain("Line 3");
   });
 
-  it('matches snapshot', () => {
+  it("matches snapshot", () => {
     const { lastFrame } = renderWithProviders(
       <Scrollable hasFocus={false} height={5}>
         <Text>Line 1</Text>
@@ -70,15 +67,13 @@ describe('<Scrollable />', () => {
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('updates scroll position correctly when scrollBy is called multiple times in the same tick', () => {
+  it("updates scroll position correctly when scrollBy is called multiple times in the same tick", () => {
     let capturedEntry: ScrollProviderModule.ScrollableEntry | undefined;
-    vi.spyOn(ScrollProviderModule, 'useScrollable').mockImplementation(
-      (entry, isActive) => {
-        if (isActive) {
-          capturedEntry = entry as ScrollProviderModule.ScrollableEntry;
-        }
-      },
-    );
+    vi.spyOn(ScrollProviderModule, "useScrollable").mockImplementation((entry, isActive) => {
+      if (isActive) {
+        capturedEntry = entry as ScrollProviderModule.ScrollableEntry;
+      }
+    });
 
     renderWithProviders(
       <Scrollable hasFocus={true} height={5}>
@@ -98,7 +93,7 @@ describe('<Scrollable />', () => {
     expect(capturedEntry).toBeDefined();
 
     if (!capturedEntry) {
-      throw new Error('capturedEntry is undefined');
+      throw new Error("capturedEntry is undefined");
     }
 
     // Initial state (starts at bottom because of auto-scroll logic)
diff --git a/packages/ui-gemini/src/ui/components/shared/Scrollable.tsx b/packages/ui-gemini/src/ui/components/shared/Scrollable.tsx
index 16436be7c..ee961db9f 100644
--- a/packages/ui-gemini/src/ui/components/shared/Scrollable.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/Scrollable.tsx
@@ -4,19 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, {
-  useState,
-  useEffect,
-  useRef,
-  useLayoutEffect,
-  useCallback,
-  useMemo,
-} from 'react';
-import { Box, getInnerHeight, getScrollHeight, type DOMElement } from 'ink';
-import { useKeypress, type Key } from '../../hooks/useKeypress.js';
-import { useScrollable } from '../../contexts/ScrollProvider.js';
-import { useAnimatedScrollbar } from '../../hooks/useAnimatedScrollbar.js';
-import { useBatchedScroll } from '../../hooks/useBatchedScroll.js';
+import { Box, type DOMElement, getInnerHeight, getScrollHeight } from "ink";
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { useScrollable } from "../../contexts/ScrollProvider.js";
+import { useAnimatedScrollbar } from "../../hooks/useAnimatedScrollbar.js";
+import { useBatchedScroll } from "../../hooks/useBatchedScroll.js";
+import { type Key, useKeypress } from "../../hooks/useKeypress.js";
 
 interface ScrollableProps {
   children?: React.ReactNode;
@@ -65,10 +58,7 @@ export const Scrollable: React.FC<ScrollableProps> = ({
 
     const isAtBottom = scrollTop >= size.scrollHeight - size.innerHeight - 1;
 
-    if (
-      size.innerHeight !== innerHeight ||
-      size.scrollHeight !== scrollHeight
-    ) {
+    if (size.innerHeight !== innerHeight || size.scrollHeight !== scrollHeight) {
       setSize({ innerHeight, scrollHeight });
       if (isAtBottom) {
         setScrollTop(Math.max(0, scrollHeight - innerHeight));
@@ -88,26 +78,25 @@ export const Scrollable: React.FC<ScrollableProps> = ({
     (delta: number) => {
       const { scrollHeight, innerHeight } = sizeRef.current;
       const current = getScrollTop();
-      const next = Math.min(
-        Math.max(0, current + delta),
-        Math.max(0, scrollHeight - innerHeight),
-      );
+      const next = Math.min(Math.max(0, current + delta), Math.max(0, scrollHeight - innerHeight));
       setPendingScrollTop(next);
       setScrollTop(next);
     },
     [sizeRef, getScrollTop, setPendingScrollTop],
   );
 
-  const { scrollbarColor, flashScrollbar, scrollByWithAnimation } =
-    useAnimatedScrollbar(hasFocus, scrollBy);
+  const { scrollbarColor, flashScrollbar, scrollByWithAnimation } = useAnimatedScrollbar(
+    hasFocus,
+    scrollBy,
+  );
 
   useKeypress(
     (key: Key) => {
       if (key.shift) {
-        if (key.name === 'up') {
+        if (key.name === "up") {
           scrollByWithAnimation(-1);
         }
-        if (key.name === 'down') {
+        if (key.name === "down") {
           scrollByWithAnimation(1);
         }
       }
diff --git a/packages/ui-gemini/src/ui/components/shared/ScrollableList.test.tsx b/packages/ui-gemini/src/ui/components/shared/ScrollableList.test.tsx
index 3b0f9fab5..4e0c45214 100644
--- a/packages/ui-gemini/src/ui/components/shared/ScrollableList.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/ScrollableList.test.tsx
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef, act } from 'react';
-import { render } from 'ink-testing-library';
-import { Box, Text } from 'ink';
-import { ScrollableList, type ScrollableListRef } from './ScrollableList.js';
-import { ScrollProvider } from '../../contexts/ScrollProvider.js';
-import { KeypressProvider } from '../../contexts/KeypressContext.js';
-import { MouseProvider } from '../../contexts/MouseContext.js';
-import { describe, it, expect, vi } from 'vitest';
-import { waitFor } from '../../../test-utils/async.js';
+import { Box, Text } from "ink";
+import { render } from "ink-testing-library";
+import { act, useEffect, useRef, useState } from "react";
+import { describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../../test-utils/async.js";
+import { KeypressProvider } from "../../contexts/KeypressContext.js";
+import { MouseProvider } from "../../contexts/MouseContext.js";
+import { ScrollProvider } from "../../contexts/ScrollProvider.js";
+import { ScrollableList, type ScrollableListRef } from "./ScrollableList.js";
 
 // Mock useStdout to provide a fixed size for testing
-vi.mock('ink', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("ink")>();
   return {
     ...actual,
     useStdout: () => ({
@@ -39,8 +39,8 @@ interface Item {
 const getLorem = (index: number) =>
   Array(10)
     .fill(null)
-    .map(() => 'lorem ipsum '.repeat((index % 3) + 1).trim())
-    .join('\n');
+    .map(() => "lorem ipsum ".repeat((index % 3) + 1).trim())
+    .join("\n");
 
 const TestComponent = ({
   initialItems = 1000,
@@ -126,8 +126,8 @@ const TestComponent = ({
     </MouseProvider>
   );
 };
-describe('ScrollableList Demo Behavior', () => {
-  it('should scroll to bottom when new items are added and stop when scrolled up', async () => {
+describe("ScrollableList Demo Behavior", () => {
+  it("should scroll to bottom when new items are added and stop when scrolled up", async () => {
     let addItem: (() => void) | undefined;
     let listRef: ScrollableListRef<Item> | null = null;
     let lastFrame: () => string | undefined;
@@ -147,28 +147,28 @@ describe('ScrollableList Demo Behavior', () => {
     });
 
     // Initial render should show Item 1000
-    expect(lastFrame!()).toContain('Item 1000');
-    expect(lastFrame!()).toContain('Count: 1000');
+    expect(lastFrame!()).toContain("Item 1000");
+    expect(lastFrame!()).toContain("Count: 1000");
 
     // Add item 1001
     await act(async () => {
       addItem?.();
     });
     await waitFor(() => {
-      expect(lastFrame!()).toContain('Count: 1001');
+      expect(lastFrame!()).toContain("Count: 1001");
     });
-    expect(lastFrame!()).toContain('Item 1001');
-    expect(lastFrame!()).not.toContain('Item 990'); // Should have scrolled past it
+    expect(lastFrame!()).toContain("Item 1001");
+    expect(lastFrame!()).not.toContain("Item 990"); // Should have scrolled past it
 
     // Add item 1002
     await act(async () => {
       addItem?.();
     });
     await waitFor(() => {
-      expect(lastFrame!()).toContain('Count: 1002');
+      expect(lastFrame!()).toContain("Count: 1002");
     });
-    expect(lastFrame!()).toContain('Item 1002');
-    expect(lastFrame!()).not.toContain('Item 991');
+    expect(lastFrame!()).toContain("Item 1002");
+    expect(lastFrame!()).not.toContain("Item 991");
 
     // Scroll up directly via ref
     await act(async () => {
@@ -183,12 +183,12 @@ describe('ScrollableList Demo Behavior', () => {
       addItem?.();
     });
     await waitFor(() => {
-      expect(lastFrame!()).toContain('Count: 1003');
+      expect(lastFrame!()).toContain("Count: 1003");
     });
-    expect(lastFrame!()).not.toContain('Item 1003');
+    expect(lastFrame!()).not.toContain("Item 1003");
   });
 
-  it('should display sticky header when scrolled past the item', async () => {
+  it("should display sticky header when scrolled past the item", async () => {
     let listRef: ScrollableListRef<Item> | null = null;
     const StickyTestComponent = () => {
       const items = Array.from({ length: 100 }, (_, i) => ({
@@ -212,10 +212,7 @@ describe('ScrollableList Demo Behavior', () => {
                   renderItem={({ item, index }) => (
                     <Box flexDirection="column" height={3}>
                       {index === 0 ? (
-                        <Box
-                          sticky
-                          stickyChildren={<Text>[STICKY] {item.title}</Text>}
-                        >
+                        <Box sticky stickyChildren={<Text>[STICKY] {item.title}</Text>}>
                           <Text>[Normal] {item.title}</Text>
                         </Box>
                       ) : (
@@ -244,9 +241,9 @@ describe('ScrollableList Demo Behavior', () => {
 
     // Initially at top, should see Normal Item 1
     await waitFor(() => {
-      expect(lastFrame!()).toContain('[Normal] Item 1');
+      expect(lastFrame!()).toContain("[Normal] Item 1");
     });
-    expect(lastFrame!()).not.toContain('[STICKY] Item 1');
+    expect(lastFrame!()).not.toContain("[STICKY] Item 1");
 
     // Scroll down slightly. Item 1 (height 3) is now partially off-screen (-2), so it should stick.
     await act(async () => {
@@ -255,9 +252,9 @@ describe('ScrollableList Demo Behavior', () => {
 
     // Now Item 1 should be stuck
     await waitFor(() => {
-      expect(lastFrame!()).toContain('[STICKY] Item 1');
+      expect(lastFrame!()).toContain("[STICKY] Item 1");
     });
-    expect(lastFrame!()).not.toContain('[Normal] Item 1');
+    expect(lastFrame!()).not.toContain("[Normal] Item 1");
 
     // Scroll further down to unmount Item 1.
     // Viewport height 10, item height 3. Scroll to 10.
@@ -267,7 +264,7 @@ describe('ScrollableList Demo Behavior', () => {
     });
 
     await waitFor(() => {
-      expect(lastFrame!()).not.toContain('[STICKY] Item 1');
+      expect(lastFrame!()).not.toContain("[STICKY] Item 1");
     });
 
     // Scroll back to top
@@ -277,13 +274,13 @@ describe('ScrollableList Demo Behavior', () => {
 
     // Should be normal again
     await waitFor(() => {
-      expect(lastFrame!()).toContain('[Normal] Item 1');
+      expect(lastFrame!()).toContain("[Normal] Item 1");
     });
-    expect(lastFrame!()).not.toContain('[STICKY] Item 1');
+    expect(lastFrame!()).not.toContain("[STICKY] Item 1");
   });
 
-  describe('Keyboard Navigation', () => {
-    it('should handle scroll keys correctly', async () => {
+  describe("Keyboard Navigation", () => {
+    it("should handle scroll keys correctly", async () => {
       let listRef: ScrollableListRef<Item> | null = null;
       let lastFrame: () => string | undefined;
       let stdin: { write: (data: string) => void };
@@ -319,13 +316,13 @@ describe('ScrollableList Demo Behavior', () => {
       });
 
       // Initial state
-      expect(lastFrame!()).toContain('Item 0');
+      expect(lastFrame!()).toContain("Item 0");
       expect(listRef).toBeDefined();
       expect(listRef!.getScrollState()?.scrollTop).toBe(0);
 
       // Scroll Down (Shift+Down) -> \x1b[b
       await act(async () => {
-        stdin.write('\x1b[b');
+        stdin.write("\x1b[b");
       });
       await waitFor(() => {
         expect(listRef?.getScrollState()?.scrollTop).toBeGreaterThan(0);
@@ -333,7 +330,7 @@ describe('ScrollableList Demo Behavior', () => {
 
       // Scroll Up (Shift+Up) -> \x1b[a
       await act(async () => {
-        stdin.write('\x1b[a');
+        stdin.write("\x1b[a");
       });
       await waitFor(() => {
         expect(listRef?.getScrollState()?.scrollTop).toBe(0);
@@ -341,7 +338,7 @@ describe('ScrollableList Demo Behavior', () => {
 
       // Page Down -> \x1b[6~
       await act(async () => {
-        stdin.write('\x1b[6~');
+        stdin.write("\x1b[6~");
       });
       await waitFor(() => {
         // Height is 10, so should scroll ~10 units
@@ -350,7 +347,7 @@ describe('ScrollableList Demo Behavior', () => {
 
       // Page Up -> \x1b[5~
       await act(async () => {
-        stdin.write('\x1b[5~');
+        stdin.write("\x1b[5~");
       });
       await waitFor(() => {
         expect(listRef?.getScrollState()?.scrollTop).toBeLessThan(2);
@@ -358,7 +355,7 @@ describe('ScrollableList Demo Behavior', () => {
 
       // End -> \x1b[F
       await act(async () => {
-        stdin.write('\x1b[F');
+        stdin.write("\x1b[F");
       });
       await waitFor(() => {
         // Total 50 items, height 10. Max scroll ~40.
@@ -367,7 +364,7 @@ describe('ScrollableList Demo Behavior', () => {
 
       // Home -> \x1b[H
       await act(async () => {
-        stdin.write('\x1b[H');
+        stdin.write("\x1b[H");
       });
       await waitFor(() => {
         expect(listRef?.getScrollState()?.scrollTop).toBe(0);
diff --git a/packages/ui-gemini/src/ui/components/shared/ScrollableList.tsx b/packages/ui-gemini/src/ui/components/shared/ScrollableList.tsx
index cfd314fb5..389badbd9 100644
--- a/packages/ui-gemini/src/ui/components/shared/ScrollableList.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/ScrollableList.tsx
@@ -4,25 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  useRef,
-  forwardRef,
-  useImperativeHandle,
-  useCallback,
-  useMemo,
-  useEffect,
-} from 'react';
-import type React from 'react';
-import {
-  VirtualizedList,
-  type VirtualizedListRef,
-  SCROLL_TO_ITEM_END,
-} from './VirtualizedList.js';
-import { useScrollable } from '../../contexts/ScrollProvider.js';
-import { Box, type DOMElement } from 'ink';
-import { useAnimatedScrollbar } from '../../hooks/useAnimatedScrollbar.js';
-import { useKeypress, type Key } from '../../hooks/useKeypress.js';
-import { keyMatchers, Command } from '../../keyMatchers.js';
+import { Box, type DOMElement } from "ink";
+import type React from "react";
+import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from "react";
+import { useScrollable } from "../../contexts/ScrollProvider.js";
+import { useAnimatedScrollbar } from "../../hooks/useAnimatedScrollbar.js";
+import { type Key, useKeypress } from "../../hooks/useKeypress.js";
+import { Command, keyMatchers } from "../../keyMatchers.js";
+import { SCROLL_TO_ITEM_END, VirtualizedList, type VirtualizedListRef } from "./VirtualizedList.js";
 
 const ANIMATION_FRAME_DURATION_MS = 33;
 
@@ -41,10 +30,7 @@ interface ScrollableListProps<T> extends VirtualizedListProps<T> {
 
 export type ScrollableListRef<T> = VirtualizedListRef<T>;
 
-function ScrollableList<T>(
-  props: ScrollableListProps<T>,
-  ref: React.Ref<ScrollableListRef<T>>,
-) {
+function ScrollableList<T>(props: ScrollableListProps<T>, ref: React.Ref<ScrollableListRef<T>>) {
   const { hasFocus } = props;
   const virtualizedListRef = useRef<VirtualizedListRef<T>>(null);
   const containerRef = useRef<DOMElement>(null);
@@ -55,10 +41,8 @@ function ScrollableList<T>(
       scrollBy: (delta) => virtualizedListRef.current?.scrollBy(delta),
       scrollTo: (offset) => virtualizedListRef.current?.scrollTo(offset),
       scrollToEnd: () => virtualizedListRef.current?.scrollToEnd(),
-      scrollToIndex: (params) =>
-        virtualizedListRef.current?.scrollToIndex(params),
-      scrollToItem: (params) =>
-        virtualizedListRef.current?.scrollToItem(params),
+      scrollToIndex: (params) => virtualizedListRef.current?.scrollToIndex(params),
+      scrollToItem: (params) => virtualizedListRef.current?.scrollToItem(params),
       getScrollIndex: () => virtualizedListRef.current?.getScrollIndex() ?? 0,
       getScrollState: () =>
         virtualizedListRef.current?.getScrollState() ?? {
@@ -84,8 +68,10 @@ function ScrollableList<T>(
     virtualizedListRef.current?.scrollBy(delta);
   }, []);
 
-  const { scrollbarColor, flashScrollbar, scrollByWithAnimation } =
-    useAnimatedScrollbar(hasFocus, scrollBy);
+  const { scrollbarColor, flashScrollbar, scrollByWithAnimation } = useAnimatedScrollbar(
+    hasFocus,
+    scrollBy,
+  );
 
   const smoothScrollState = useRef<{
     active: boolean;
@@ -115,11 +101,7 @@ function ScrollableList<T>(
         scrollHeight: 0,
         innerHeight: 0,
       };
-      const {
-        scrollTop: startScrollTop,
-        scrollHeight,
-        innerHeight,
-      } = scrollState;
+      const { scrollTop: startScrollTop, scrollHeight, innerHeight } = scrollState;
 
       const maxScrollTop = Math.max(0, scrollHeight - innerHeight);
 
@@ -128,10 +110,7 @@ function ScrollableList<T>(
         effectiveTarget = maxScrollTop;
       }
 
-      const clampedTarget = Math.max(
-        0,
-        Math.min(maxScrollTop, effectiveTarget),
-      );
+      const clampedTarget = Math.max(0, Math.min(maxScrollTop, effectiveTarget));
 
       if (duration === 0) {
         if (targetScrollTop === SCROLL_TO_ITEM_END) {
@@ -160,8 +139,7 @@ function ScrollableList<T>(
 
           const current =
             smoothScrollState.current.from +
-            (smoothScrollState.current.to - smoothScrollState.current.from) *
-              ease;
+            (smoothScrollState.current.to - smoothScrollState.current.from) * ease;
 
           if (progress >= 1) {
             if (targetScrollTop === SCROLL_TO_ITEM_END) {
@@ -188,10 +166,7 @@ function ScrollableList<T>(
       } else if (keyMatchers[Command.SCROLL_DOWN](key)) {
         stopSmoothScroll();
         scrollByWithAnimation(1);
-      } else if (
-        keyMatchers[Command.PAGE_UP](key) ||
-        keyMatchers[Command.PAGE_DOWN](key)
-      ) {
+      } else if (keyMatchers[Command.PAGE_UP](key) || keyMatchers[Command.PAGE_DOWN](key)) {
         const direction = keyMatchers[Command.PAGE_UP](key) ? -1 : 1;
         const scrollState = getScrollState();
         const current = smoothScrollState.current.active
@@ -219,29 +194,14 @@ function ScrollableList<T>(
       hasFocus: hasFocusCallback,
       flashScrollbar,
     }),
-    [
-      getScrollState,
-      hasFocusCallback,
-      flashScrollbar,
-      scrollByWithAnimation,
-      smoothScrollTo,
-    ],
+    [getScrollState, hasFocusCallback, flashScrollbar, scrollByWithAnimation, smoothScrollTo],
   );
 
   useScrollable(scrollableEntry, hasFocus);
 
   return (
-    <Box
-      ref={containerRef}
-      flexGrow={1}
-      flexDirection="column"
-      overflow="hidden"
-    >
-      <VirtualizedList
-        ref={virtualizedListRef}
-        {...props}
-        scrollbarThumbColor={scrollbarColor}
-      />
+    <Box ref={containerRef} flexGrow={1} flexDirection="column" overflow="hidden">
+      <VirtualizedList ref={virtualizedListRef} {...props} scrollbarThumbColor={scrollbarColor} />
     </Box>
   );
 }
diff --git a/packages/ui-gemini/src/ui/components/shared/TextInput.test.tsx b/packages/ui-gemini/src/ui/components/shared/TextInput.test.tsx
index 7af09fe7a..71df86d48 100644
--- a/packages/ui-gemini/src/ui/components/shared/TextInput.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/TextInput.test.tsx
@@ -4,40 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { TextInput } from './TextInput.js';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import { useTextBuffer, type TextBuffer } from './text-buffer.js';
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { TextInput } from "./TextInput.js";
+import { type TextBuffer, useTextBuffer } from "./text-buffer.js";
 
 // Mocks
-vi.mock('../../hooks/useKeypress.js', () => ({
+vi.mock("../../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
-vi.mock('./text-buffer.js', () => {
+vi.mock("./text-buffer.js", () => {
   const mockTextBuffer = {
-    text: '',
-    lines: [''],
+    text: "",
+    lines: [""],
     cursor: [0, 0],
     visualCursor: [0, 0],
-    viewportVisualLines: [''],
+    viewportVisualLines: [""],
     handleInput: vi.fn((key) => {
       // Simulate basic input for testing
       if (key.sequence) {
         mockTextBuffer.text += key.sequence;
         mockTextBuffer.viewportVisualLines = [mockTextBuffer.text];
         mockTextBuffer.visualCursor[1] = mockTextBuffer.text.length;
-      } else if (key.name === 'backspace') {
+      } else if (key.name === "backspace") {
         mockTextBuffer.text = mockTextBuffer.text.slice(0, -1);
         mockTextBuffer.viewportVisualLines = [mockTextBuffer.text];
         mockTextBuffer.visualCursor[1] = mockTextBuffer.text.length;
-      } else if (key.name === 'left') {
-        mockTextBuffer.visualCursor[1] = Math.max(
-          0,
-          mockTextBuffer.visualCursor[1] - 1,
-        );
-      } else if (key.name === 'right') {
+      } else if (key.name === "left") {
+        mockTextBuffer.visualCursor[1] = Math.max(0, mockTextBuffer.visualCursor[1] - 1);
+      } else if (key.name === "right") {
         mockTextBuffer.visualCursor[1] = Math.min(
           mockTextBuffer.text.length,
           mockTextBuffer.visualCursor[1] + 1,
@@ -60,7 +57,7 @@ vi.mock('./text-buffer.js', () => {
 const mockedUseKeypress = useKeypress as Mock;
 const mockedUseTextBuffer = useTextBuffer as Mock;
 
-describe('TextInput', () => {
+describe("TextInput", () => {
   const onCancel = vi.fn();
   const onSubmit = vi.fn();
   let mockBuffer: TextBuffer;
@@ -69,27 +66,24 @@ describe('TextInput', () => {
     vi.resetAllMocks();
     // Reset the internal state of the mock buffer for each test
     const buffer = {
-      text: '',
-      lines: [''],
+      text: "",
+      lines: [""],
       cursor: [0, 0],
       visualCursor: [0, 0],
-      viewportVisualLines: [''],
+      viewportVisualLines: [""],
       handleInput: vi.fn((key) => {
         if (key.sequence) {
           buffer.text += key.sequence;
           buffer.viewportVisualLines = [buffer.text];
           buffer.visualCursor[1] = buffer.text.length;
-        } else if (key.name === 'backspace') {
+        } else if (key.name === "backspace") {
           buffer.text = buffer.text.slice(0, -1);
           buffer.viewportVisualLines = [buffer.text];
           buffer.visualCursor[1] = buffer.text.length;
-        } else if (key.name === 'left') {
+        } else if (key.name === "left") {
           buffer.visualCursor[1] = Math.max(0, buffer.visualCursor[1] - 1);
-        } else if (key.name === 'right') {
-          buffer.visualCursor[1] = Math.min(
-            buffer.text.length,
-            buffer.visualCursor[1] + 1,
-          );
+        } else if (key.name === "right") {
+          buffer.visualCursor[1] = Math.min(buffer.text.length, buffer.visualCursor[1] + 1);
         }
       }),
       setText: vi.fn((newText) => {
@@ -102,13 +96,13 @@ describe('TextInput', () => {
     mockedUseTextBuffer.mockReturnValue(mockBuffer);
   });
 
-  it('renders with an initial value', () => {
+  it("renders with an initial value", () => {
     const buffer = {
-      text: 'test',
-      lines: ['test'],
+      text: "test",
+      lines: ["test"],
       cursor: [0, 4],
       visualCursor: [0, 4],
-      viewportVisualLines: ['test'],
+      viewportVisualLines: ["test"],
       handleInput: vi.fn(),
       setText: vi.fn(),
     };
@@ -119,16 +113,16 @@ describe('TextInput', () => {
         onCancel={onCancel}
       />,
     );
-    expect(lastFrame()).toContain('test');
+    expect(lastFrame()).toContain("test");
   });
 
-  it('renders a placeholder', () => {
+  it("renders a placeholder", () => {
     const buffer = {
-      text: '',
-      lines: [''],
+      text: "",
+      lines: [""],
       cursor: [0, 0],
       visualCursor: [0, 0],
-      viewportVisualLines: [''],
+      viewportVisualLines: [""],
       handleInput: vi.fn(),
       setText: vi.fn(),
     };
@@ -140,18 +134,16 @@ describe('TextInput', () => {
         onCancel={onCancel}
       />,
     );
-    expect(lastFrame()).toContain('testing');
+    expect(lastFrame()).toContain("testing");
   });
 
-  it('handles character input', () => {
-    render(
-      <TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />,
-    );
+  it("handles character input", () => {
+    render(<TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />);
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
     keypressHandler({
-      name: 'a',
-      sequence: 'a',
+      name: "a",
+      sequence: "a",
       ctrl: false,
       meta: false,
       shift: false,
@@ -159,26 +151,24 @@ describe('TextInput', () => {
     });
 
     expect(mockBuffer.handleInput).toHaveBeenCalledWith({
-      name: 'a',
-      sequence: 'a',
+      name: "a",
+      sequence: "a",
       ctrl: false,
       meta: false,
       shift: false,
       paste: false,
     });
-    expect(mockBuffer.text).toBe('a');
+    expect(mockBuffer.text).toBe("a");
   });
 
-  it('handles backspace', () => {
-    mockBuffer.setText('test');
-    render(
-      <TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />,
-    );
+  it("handles backspace", () => {
+    mockBuffer.setText("test");
+    render(<TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />);
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
     keypressHandler({
-      name: 'backspace',
-      sequence: '',
+      name: "backspace",
+      sequence: "",
       ctrl: false,
       meta: false,
       shift: false,
@@ -186,26 +176,24 @@ describe('TextInput', () => {
     });
 
     expect(mockBuffer.handleInput).toHaveBeenCalledWith({
-      name: 'backspace',
-      sequence: '',
+      name: "backspace",
+      sequence: "",
       ctrl: false,
       meta: false,
       shift: false,
       paste: false,
     });
-    expect(mockBuffer.text).toBe('tes');
+    expect(mockBuffer.text).toBe("tes");
   });
 
-  it('handles left arrow', () => {
-    mockBuffer.setText('test');
-    render(
-      <TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />,
-    );
+  it("handles left arrow", () => {
+    mockBuffer.setText("test");
+    render(<TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />);
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
     keypressHandler({
-      name: 'left',
-      sequence: '',
+      name: "left",
+      sequence: "",
       ctrl: false,
       meta: false,
       shift: false,
@@ -216,17 +204,15 @@ describe('TextInput', () => {
     expect(mockBuffer.visualCursor[1]).toBe(3);
   });
 
-  it('handles right arrow', () => {
-    mockBuffer.setText('test');
+  it("handles right arrow", () => {
+    mockBuffer.setText("test");
     mockBuffer.visualCursor[1] = 2; // Set initial cursor for right arrow test
-    render(
-      <TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />,
-    );
+    render(<TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />);
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
     keypressHandler({
-      name: 'right',
-      sequence: '',
+      name: "right",
+      sequence: "",
       ctrl: false,
       meta: false,
       shift: false,
@@ -236,35 +222,31 @@ describe('TextInput', () => {
     expect(mockBuffer.visualCursor[1]).toBe(3);
   });
 
-  it('calls onSubmit on return', () => {
-    mockBuffer.setText('test');
-    render(
-      <TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />,
-    );
+  it("calls onSubmit on return", () => {
+    mockBuffer.setText("test");
+    render(<TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />);
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
     keypressHandler({
-      name: 'return',
-      sequence: '',
+      name: "return",
+      sequence: "",
       ctrl: false,
       meta: false,
       shift: false,
       paste: false,
     });
 
-    expect(onSubmit).toHaveBeenCalledWith('test');
+    expect(onSubmit).toHaveBeenCalledWith("test");
   });
 
-  it('calls onCancel on escape', async () => {
+  it("calls onCancel on escape", async () => {
     vi.useFakeTimers();
-    render(
-      <TextInput buffer={mockBuffer} onCancel={onCancel} onSubmit={onSubmit} />,
-    );
+    render(<TextInput buffer={mockBuffer} onCancel={onCancel} onSubmit={onSubmit} />);
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
 
     keypressHandler({
-      name: 'escape',
-      sequence: '',
+      name: "escape",
+      sequence: "",
       ctrl: false,
       meta: false,
       shift: false,
@@ -276,36 +258,31 @@ describe('TextInput', () => {
     vi.useRealTimers();
   });
 
-  it('renders the input value', () => {
-    mockBuffer.setText('secret');
+  it("renders the input value", () => {
+    mockBuffer.setText("secret");
     const { lastFrame } = render(
       <TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />,
     );
-    expect(lastFrame()).toContain('secret');
+    expect(lastFrame()).toContain("secret");
   });
 
-  it('does not show cursor when not focused', () => {
-    mockBuffer.setText('test');
+  it("does not show cursor when not focused", () => {
+    mockBuffer.setText("test");
     const { lastFrame } = render(
-      <TextInput
-        buffer={mockBuffer}
-        focus={false}
-        onSubmit={onSubmit}
-        onCancel={onCancel}
-      />,
+      <TextInput buffer={mockBuffer} focus={false} onSubmit={onSubmit} onCancel={onCancel} />,
     );
-    expect(lastFrame()).not.toContain('\u001b[7m'); // Inverse video chalk
+    expect(lastFrame()).not.toContain("\u001b[7m"); // Inverse video chalk
   });
 
-  it('renders multiple lines when text wraps', () => {
-    mockBuffer.text = 'line1\nline2';
-    mockBuffer.viewportVisualLines = ['line1', 'line2'];
+  it("renders multiple lines when text wraps", () => {
+    mockBuffer.text = "line1\nline2";
+    mockBuffer.viewportVisualLines = ["line1", "line2"];
 
     const { lastFrame } = render(
       <TextInput buffer={mockBuffer} onSubmit={onSubmit} onCancel={onCancel} />,
     );
 
-    expect(lastFrame()).toContain('line1');
-    expect(lastFrame()).toContain('line2');
+    expect(lastFrame()).toContain("line1");
+    expect(lastFrame()).toContain("line2");
   });
 });
diff --git a/packages/ui-gemini/src/ui/components/shared/TextInput.tsx b/packages/ui-gemini/src/ui/components/shared/TextInput.tsx
index e6c867f96..02ebb2bcd 100644
--- a/packages/ui-gemini/src/ui/components/shared/TextInput.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/TextInput.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useCallback } from 'react';
-import type { Key } from '../../hooks/useKeypress.js';
-import { Text, Box } from 'ink';
-import { useKeypress } from '../../hooks/useKeypress.js';
-import chalk from 'chalk';
-import { theme } from '../../semantic-colors.js';
-import type { TextBuffer } from './text-buffer.js';
-import { cpSlice } from '../../utils/textUtils.js';
+import chalk from "chalk";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useCallback } from "react";
+import type { Key } from "../../hooks/useKeypress.js";
+import { useKeypress } from "../../hooks/useKeypress.js";
+import { theme } from "../../semantic-colors.js";
+import { cpSlice } from "../../utils/textUtils.js";
+import type { TextBuffer } from "./text-buffer.js";
 
 export interface TextInputProps {
   buffer: TextBuffer;
@@ -24,28 +24,22 @@ export interface TextInputProps {
 
 export function TextInput({
   buffer,
-  placeholder = '',
+  placeholder = "",
   onSubmit,
   onCancel,
   focus = true,
 }: TextInputProps): React.JSX.Element {
-  const {
-    text,
-    handleInput,
-    visualCursor,
-    viewportVisualLines,
-    visualScrollRow,
-  } = buffer;
+  const { text, handleInput, visualCursor, viewportVisualLines, visualScrollRow } = buffer;
   const [cursorVisualRowAbsolute, cursorVisualColAbsolute] = visualCursor;
 
   const handleKeyPress = useCallback(
     (key: Key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onCancel?.();
         return;
       }
 
-      if (key.name === 'return') {
+      if (key.name === "return") {
         onSubmit?.(text);
         return;
       }
@@ -64,7 +58,7 @@ export function TextInput({
       <Box>
         {focus ? (
           <Text>
-            {chalk.inverse(placeholder[0] || ' ')}
+            {chalk.inverse(placeholder[0] || " ")}
             <Text color={theme.text.secondary}>{placeholder.slice(1)}</Text>
           </Text>
         ) : (
@@ -78,17 +72,12 @@ export function TextInput({
     <Box flexDirection="column">
       {viewportVisualLines.map((lineText, idx) => {
         const currentVisualRow = visualScrollRow + idx;
-        const isCursorLine =
-          focus && currentVisualRow === cursorVisualRowAbsolute;
+        const isCursorLine = focus && currentVisualRow === cursorVisualRowAbsolute;
 
         const lineDisplay = isCursorLine
           ? cpSlice(lineText, 0, cursorVisualColAbsolute) +
             chalk.inverse(
-              cpSlice(
-                lineText,
-                cursorVisualColAbsolute,
-                cursorVisualColAbsolute + 1,
-              ) || ' ',
+              cpSlice(lineText, cursorVisualColAbsolute, cursorVisualColAbsolute + 1) || " ",
             ) +
             cpSlice(lineText, cursorVisualColAbsolute + 1)
           : lineText;
diff --git a/packages/ui-gemini/src/ui/components/shared/VirtualizedList.test.tsx b/packages/ui-gemini/src/ui/components/shared/VirtualizedList.test.tsx
index 88fba88bf..5dbbca559 100644
--- a/packages/ui-gemini/src/ui/components/shared/VirtualizedList.test.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/VirtualizedList.test.tsx
@@ -4,29 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { VirtualizedList, type VirtualizedListRef } from './VirtualizedList.js';
-import { Text, Box } from 'ink';
-import {
-  createRef,
-  act,
-  useEffect,
-  createContext,
-  useContext,
-  useState,
-} from 'react';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { Box, Text } from "ink";
+import { act, createContext, createRef, useContext, useEffect, useState } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { VirtualizedList, type VirtualizedListRef } from "./VirtualizedList.js";
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
-describe('<VirtualizedList />', () => {
+describe("<VirtualizedList />", () => {
   const keyExtractor = (item: string) => item;
 
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  describe('with 10px height and 100 items', () => {
+  describe("with 10px height and 100 items", () => {
     const longData = Array.from({ length: 100 }, (_, i) => `Item ${i}`);
     // We use 1px for items. Container is 10px.
     // Viewport shows 10 items. Overscan adds 10 items.
@@ -39,47 +32,48 @@ describe('<VirtualizedList />', () => {
 
     it.each([
       {
-        name: 'top',
+        name: "top",
         initialScrollIndex: undefined,
-        visible: ['Item 0', 'Item 7'],
-        notVisible: ['Item 8', 'Item 15', 'Item 50', 'Item 99'],
+        visible: ["Item 0", "Item 7"],
+        notVisible: ["Item 8", "Item 15", "Item 50", "Item 99"],
       },
       {
-        name: 'scrolled to bottom',
+        name: "scrolled to bottom",
         initialScrollIndex: 99,
-        visible: ['Item 99', 'Item 92'],
-        notVisible: ['Item 91', 'Item 85', 'Item 50', 'Item 0'],
+        visible: ["Item 99", "Item 92"],
+        notVisible: ["Item 91", "Item 85", "Item 50", "Item 0"],
       },
-    ])(
-      'renders only visible items ($name)',
-      async ({ initialScrollIndex, visible, notVisible }) => {
-        const { lastFrame } = render(
-          <Box height={10} width={100} borderStyle="round">
-            <VirtualizedList
-              data={longData}
-              renderItem={renderItem1px}
-              keyExtractor={keyExtractor}
-              estimatedItemHeight={() => itemHeight}
-              initialScrollIndex={initialScrollIndex}
-            />
-          </Box>,
-        );
-        await act(async () => {
-          await delay(0);
-        });
-
-        const frame = lastFrame();
-        visible.forEach((item) => {
-          expect(frame).toContain(item);
-        });
-        notVisible.forEach((item) => {
-          expect(frame).not.toContain(item);
-        });
-        expect(frame).toMatchSnapshot();
-      },
-    );
+    ])("renders only visible items ($name)", async ({
+      initialScrollIndex,
+      visible,
+      notVisible,
+    }) => {
+      const { lastFrame } = render(
+        <Box height={10} width={100} borderStyle="round">
+          <VirtualizedList
+            data={longData}
+            renderItem={renderItem1px}
+            keyExtractor={keyExtractor}
+            estimatedItemHeight={() => itemHeight}
+            initialScrollIndex={initialScrollIndex}
+          />
+        </Box>,
+      );
+      await act(async () => {
+        await delay(0);
+      });
+
+      const frame = lastFrame();
+      visible.forEach((item) => {
+        expect(frame).toContain(item);
+      });
+      notVisible.forEach((item) => {
+        expect(frame).not.toContain(item);
+      });
+      expect(frame).toMatchSnapshot();
+    });
 
-    it('sticks to bottom when new items added', async () => {
+    it("sticks to bottom when new items added", async () => {
       const { lastFrame, rerender } = render(
         <Box height={10} width={100} borderStyle="round">
           <VirtualizedList
@@ -95,10 +89,10 @@ describe('<VirtualizedList />', () => {
         await delay(0);
       });
 
-      expect(lastFrame()).toContain('Item 99');
+      expect(lastFrame()).toContain("Item 99");
 
       // Add items
-      const newData = [...longData, 'Item 100', 'Item 101'];
+      const newData = [...longData, "Item 100", "Item 101"];
       rerender(
         <Box height={10} width={100} borderStyle="round">
           <VirtualizedList
@@ -116,11 +110,11 @@ describe('<VirtualizedList />', () => {
       });
 
       const frame = lastFrame();
-      expect(frame).toContain('Item 101');
-      expect(frame).not.toContain('Item 0');
+      expect(frame).toContain("Item 101");
+      expect(frame).not.toContain("Item 0");
     });
 
-    it('scrolls down to show new items when requested via ref', async () => {
+    it("scrolls down to show new items when requested via ref", async () => {
       const ref = createRef<VirtualizedListRef<string>>();
       const { lastFrame } = render(
         <Box height={10} width={100} borderStyle="round">
@@ -137,7 +131,7 @@ describe('<VirtualizedList />', () => {
         await delay(0);
       });
 
-      expect(lastFrame()).toContain('Item 0');
+      expect(lastFrame()).toContain("Item 0");
 
       // Scroll to bottom via ref
       await act(async () => {
@@ -146,62 +140,57 @@ describe('<VirtualizedList />', () => {
       });
 
       const frame = lastFrame();
-      expect(frame).toContain('Item 99');
+      expect(frame).toContain("Item 99");
     });
 
     it.each([
       { initialScrollIndex: 0, expectedMountedCount: 5 },
       { initialScrollIndex: 500, expectedMountedCount: 6 },
       { initialScrollIndex: 999, expectedMountedCount: 5 },
-    ])(
-      'mounts only visible items with 1000 items and 10px height (scroll: $initialScrollIndex)',
-      async ({ initialScrollIndex, expectedMountedCount }) => {
-        let mountedCount = 0;
-        const tallItemHeight = 5;
-        const ItemWithEffect = ({ item }: { item: string }) => {
-          useEffect(() => {
-            mountedCount++;
-            return () => {
-              mountedCount--;
-            };
-          }, []);
-          return (
-            <Box height={tallItemHeight}>
-              <Text>{item}</Text>
-            </Box>
-          );
-        };
-
-        const veryLongData = Array.from(
-          { length: 1000 },
-          (_, i) => `Item ${i}`,
+    ])("mounts only visible items with 1000 items and 10px height (scroll: $initialScrollIndex)", async ({
+      initialScrollIndex,
+      expectedMountedCount,
+    }) => {
+      let mountedCount = 0;
+      const tallItemHeight = 5;
+      const ItemWithEffect = ({ item }: { item: string }) => {
+        useEffect(() => {
+          mountedCount++;
+          return () => {
+            mountedCount--;
+          };
+        }, []);
+        return (
+          <Box height={tallItemHeight}>
+            <Text>{item}</Text>
+          </Box>
         );
+      };
 
-        const { lastFrame } = render(
-          <Box height={20} width={100} borderStyle="round">
-            <VirtualizedList
-              data={veryLongData}
-              renderItem={({ item }) => (
-                <ItemWithEffect key={item} item={item} />
-              )}
-              keyExtractor={keyExtractor}
-              estimatedItemHeight={() => tallItemHeight}
-              initialScrollIndex={initialScrollIndex}
-            />
-          </Box>,
-        );
-        await act(async () => {
-          await delay(0);
-        });
+      const veryLongData = Array.from({ length: 1000 }, (_, i) => `Item ${i}`);
 
-        const frame = lastFrame();
-        expect(mountedCount).toBe(expectedMountedCount);
-        expect(frame).toMatchSnapshot();
-      },
-    );
+      const { lastFrame } = render(
+        <Box height={20} width={100} borderStyle="round">
+          <VirtualizedList
+            data={veryLongData}
+            renderItem={({ item }) => <ItemWithEffect key={item} item={item} />}
+            keyExtractor={keyExtractor}
+            estimatedItemHeight={() => tallItemHeight}
+            initialScrollIndex={initialScrollIndex}
+          />
+        </Box>,
+      );
+      await act(async () => {
+        await delay(0);
+      });
+
+      const frame = lastFrame();
+      expect(mountedCount).toBe(expectedMountedCount);
+      expect(frame).toMatchSnapshot();
+    });
   });
 
-  it('renders more items when a visible item shrinks via context update', async () => {
+  it("renders more items when a visible item shrinks via context update", async () => {
     const SizeContext = createContext<{
       firstItemHeight: number;
       setFirstItemHeight: (h: number) => void;
@@ -214,13 +203,7 @@ describe('<VirtualizedList />', () => {
       id: `Item ${i}`,
     }));
 
-    const ItemWithContext = ({
-      item,
-      index,
-    }: {
-      item: { id: string };
-      index: number;
-    }) => {
+    const ItemWithContext = ({ item, index }: { item: { id: string }; index: number }) => {
       const { firstItemHeight } = useContext(SizeContext);
       const height = index === 0 ? firstItemHeight : 1;
       return (
@@ -237,9 +220,7 @@ describe('<VirtualizedList />', () => {
           <Box height={10} width={100}>
             <VirtualizedList
               data={items}
-              renderItem={({ item, index }) => (
-                <ItemWithContext item={item} index={index} />
-              )}
+              renderItem={({ item, index }) => <ItemWithContext item={item} index={index} />}
               keyExtractor={(item) => item.id}
               estimatedItemHeight={() => 1}
             />
@@ -251,11 +232,7 @@ describe('<VirtualizedList />', () => {
     };
 
     let setHeightFn: (h: number) => void = () => {};
-    const TestControl = ({
-      setFirstItemHeight,
-    }: {
-      setFirstItemHeight: (h: number) => void;
-    }) => {
+    const TestControl = ({ setFirstItemHeight }: { setFirstItemHeight: (h: number) => void }) => {
       setHeightFn = setFirstItemHeight;
       return null;
     };
@@ -266,8 +243,8 @@ describe('<VirtualizedList />', () => {
     });
 
     // Initially, only Item 0 (height 10) fills the 10px viewport
-    expect(lastFrame()).toContain('Item 0');
-    expect(lastFrame()).not.toContain('Item 1');
+    expect(lastFrame()).toContain("Item 0");
+    expect(lastFrame()).not.toContain("Item 1");
 
     // Shrink Item 0 to 1px via context
     await act(async () => {
@@ -276,12 +253,12 @@ describe('<VirtualizedList />', () => {
     });
 
     // Now Item 0 is 1px, so Items 1-9 should also be visible to fill 10px
-    expect(lastFrame()).toContain('Item 0');
-    expect(lastFrame()).toContain('Item 1');
-    expect(lastFrame()).toContain('Item 9');
+    expect(lastFrame()).toContain("Item 0");
+    expect(lastFrame()).toContain("Item 1");
+    expect(lastFrame()).toContain("Item 9");
   });
 
-  it('updates scroll position correctly when scrollBy is called multiple times in the same tick', async () => {
+  it("updates scroll position correctly when scrollBy is called multiple times in the same tick", async () => {
     const ref = createRef<VirtualizedListRef<string>>();
     const longData = Array.from({ length: 100 }, (_, i) => `Item ${i}`);
     const itemHeight = 1;
diff --git a/packages/ui-gemini/src/ui/components/shared/VirtualizedList.tsx b/packages/ui-gemini/src/ui/components/shared/VirtualizedList.tsx
index fd7902d33..d016a5725 100644
--- a/packages/ui-gemini/src/ui/components/shared/VirtualizedList.tsx
+++ b/packages/ui-gemini/src/ui/components/shared/VirtualizedList.tsx
@@ -4,21 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { Box, type DOMElement, measureElement } from "ink";
+import type React from "react";
 import {
-  useState,
-  useRef,
-  useLayoutEffect,
   forwardRef,
-  useImperativeHandle,
+  useCallback,
   useEffect,
+  useImperativeHandle,
+  useLayoutEffect,
   useMemo,
-  useCallback,
-} from 'react';
-import type React from 'react';
-import { theme } from '../../semantic-colors.js';
-import { useBatchedScroll } from '../../hooks/useBatchedScroll.js';
-
-import { type DOMElement, measureElement, Box } from 'ink';
+  useRef,
+  useState,
+} from "react";
+import { useBatchedScroll } from "../../hooks/useBatchedScroll.js";
+import { theme } from "../../semantic-colors.js";
 
 export const SCROLL_TO_ITEM_END = Number.MAX_SAFE_INTEGER;
 
@@ -36,16 +35,8 @@ export type VirtualizedListRef<T> = {
   scrollBy: (delta: number) => void;
   scrollTo: (offset: number) => void;
   scrollToEnd: () => void;
-  scrollToIndex: (params: {
-    index: number;
-    viewOffset?: number;
-    viewPosition?: number;
-  }) => void;
-  scrollToItem: (params: {
-    item: T;
-    viewOffset?: number;
-    viewPosition?: number;
-  }) => void;
+  scrollToIndex: (params: { index: number; viewOffset?: number; viewPosition?: number }) => void;
+  scrollToItem: (params: { item: T; viewOffset?: number; viewPosition?: number }) => void;
   getScrollIndex: () => number;
   getScrollState: () => {
     scrollTop: number;
@@ -66,10 +57,7 @@ function findLastIndex<T>(
   return -1;
 }
 
-function VirtualizedList<T>(
-  props: VirtualizedListProps<T>,
-  ref: React.Ref<VirtualizedListRef<T>>,
-) {
+function VirtualizedList<T>(props: VirtualizedListProps<T>, ref: React.Ref<VirtualizedListRef<T>>) {
   const {
     data,
     renderItem,
@@ -86,7 +74,7 @@ function VirtualizedList<T>(
   const [scrollAnchor, setScrollAnchor] = useState(() => {
     const scrollToEnd =
       initialScrollIndex === SCROLL_TO_ITEM_END ||
-      (typeof initialScrollIndex === 'number' &&
+      (typeof initialScrollIndex === "number" &&
         initialScrollIndex >= data.length - 1 &&
         initialScrollOffsetInIndex === SCROLL_TO_ITEM_END);
 
@@ -97,7 +85,7 @@ function VirtualizedList<T>(
       };
     }
 
-    if (typeof initialScrollIndex === 'number') {
+    if (typeof initialScrollIndex === "number") {
       return {
         index: Math.max(0, Math.min(data.length - 1, initialScrollIndex)),
         offset: initialScrollOffsetInIndex ?? 0,
@@ -109,7 +97,7 @@ function VirtualizedList<T>(
   const [isStickingToBottom, setIsStickingToBottom] = useState(() => {
     const scrollToEnd =
       initialScrollIndex === SCROLL_TO_ITEM_END ||
-      (typeof initialScrollIndex === 'number' &&
+      (typeof initialScrollIndex === "number" &&
         initialScrollIndex >= data.length - 1 &&
         initialScrollOffsetInIndex === SCROLL_TO_ITEM_END);
     return scrollToEnd;
@@ -183,10 +171,7 @@ function VirtualizedList<T>(
     : containerHeight;
 
   const getAnchorForScrollTop = useCallback(
-    (
-      scrollTop: number,
-      offsets: number[],
-    ): { index: number; offset: number } => {
+    (scrollTop: number, offsets: number[]): { index: number; offset: number } => {
       const index = findLastIndex(offsets, (offset) => offset <= scrollTop);
       if (index === -1) {
         return { index: 0, offset: 0 };
@@ -199,7 +184,7 @@ function VirtualizedList<T>(
 
   const scrollTop = useMemo(() => {
     const offset = offsets[scrollAnchor.index];
-    if (typeof offset !== 'number') {
+    if (typeof offset !== "number") {
       return 0;
     }
 
@@ -217,11 +202,9 @@ function VirtualizedList<T>(
   const prevContainerHeight = useRef(scrollableContainerHeight);
 
   useLayoutEffect(() => {
-    const contentPreviouslyFit =
-      prevTotalHeight.current <= prevContainerHeight.current;
+    const contentPreviouslyFit = prevTotalHeight.current <= prevContainerHeight.current;
     const wasScrolledToBottomPixels =
-      prevScrollTop.current >=
-      prevTotalHeight.current - prevContainerHeight.current - 1;
+      prevScrollTop.current >= prevTotalHeight.current - prevContainerHeight.current - 1;
     const wasAtBottom = contentPreviouslyFit || wasScrolledToBottomPixels;
 
     // If the user was at the bottom, they are now sticking. This handles
@@ -231,8 +214,7 @@ function VirtualizedList<T>(
     }
 
     const listGrew = data.length > prevDataLength.current;
-    const containerChanged =
-      prevContainerHeight.current !== scrollableContainerHeight;
+    const containerChanged = prevContainerHeight.current !== scrollableContainerHeight;
 
     // We scroll to the end if:
     // 1. The list grew AND we were already at the bottom (or sticking).
@@ -253,8 +235,7 @@ function VirtualizedList<T>(
     // Scenario 2: The list has changed (shrunk) in a way that our
     // current scroll position or anchor is invalid. We should adjust to the bottom.
     else if (
-      (scrollAnchor.index >= data.length ||
-        scrollTop > totalHeight - scrollableContainerHeight) &&
+      (scrollAnchor.index >= data.length || scrollTop > totalHeight - scrollableContainerHeight) &&
       data.length > 0
     ) {
       const newScrollTop = Math.max(0, totalHeight - scrollableContainerHeight);
@@ -290,7 +271,7 @@ function VirtualizedList<T>(
       return;
     }
 
-    if (typeof initialScrollIndex === 'number') {
+    if (typeof initialScrollIndex === "number") {
       const scrollToEnd =
         initialScrollIndex === SCROLL_TO_ITEM_END ||
         (initialScrollIndex >= data.length - 1 &&
@@ -330,21 +311,15 @@ function VirtualizedList<T>(
     scrollableContainerHeight,
   ]);
 
-  const startIndex = Math.max(
-    0,
-    findLastIndex(offsets, (offset) => offset <= scrollTop) - 1,
-  );
+  const startIndex = Math.max(0, findLastIndex(offsets, (offset) => offset <= scrollTop) - 1);
   const endIndexOffset = offsets.findIndex(
     (offset) => offset > scrollTop + scrollableContainerHeight,
   );
   const endIndex =
-    endIndexOffset === -1
-      ? data.length - 1
-      : Math.min(data.length - 1, endIndexOffset);
+    endIndexOffset === -1 ? data.length - 1 : Math.min(data.length - 1, endIndexOffset);
 
   const topSpacerHeight = offsets[startIndex] ?? 0;
-  const bottomSpacerHeight =
-    totalHeight - (offsets[endIndex + 1] ?? totalHeight);
+  const bottomSpacerHeight = totalHeight - (offsets[endIndex + 1] ?? totalHeight);
 
   const renderedItems = [];
   for (let i = startIndex; i <= endIndex; i++) {
@@ -376,20 +351,14 @@ function VirtualizedList<T>(
         const currentScrollTop = getScrollTop();
         const newScrollTop = Math.max(
           0,
-          Math.min(
-            totalHeight - scrollableContainerHeight,
-            currentScrollTop + delta,
-          ),
+          Math.min(totalHeight - scrollableContainerHeight, currentScrollTop + delta),
         );
         setPendingScrollTop(newScrollTop);
         setScrollAnchor(getAnchorForScrollTop(newScrollTop, offsets));
       },
       scrollTo: (offset: number) => {
         setIsStickingToBottom(false);
-        const newScrollTop = Math.max(
-          0,
-          Math.min(totalHeight - scrollableContainerHeight, offset),
-        );
+        const newScrollTop = Math.max(0, Math.min(totalHeight - scrollableContainerHeight, offset));
         setPendingScrollTop(newScrollTop);
         setScrollAnchor(getAnchorForScrollTop(newScrollTop, offsets));
       },
@@ -498,4 +467,4 @@ const VirtualizedListWithForwardRef = forwardRef(VirtualizedList) as <T>(
 
 export { VirtualizedListWithForwardRef as VirtualizedList };
 
-VirtualizedList.displayName = 'VirtualizedList';
+VirtualizedList.displayName = "VirtualizedList";
diff --git a/packages/ui-gemini/src/ui/components/shared/text-buffer.test.ts b/packages/ui-gemini/src/ui/components/shared/text-buffer.test.ts
index 72bb567ff..63596f32b 100644
--- a/packages/ui-gemini/src/ui/components/shared/text-buffer.test.ts
+++ b/packages/ui-gemini/src/ui/components/shared/text-buffer.test.ts
@@ -4,37 +4,37 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach } from 'vitest';
-import stripAnsi from 'strip-ansi';
-import { act } from 'react';
-import { renderHook } from '../../../test-utils/render.js';
+import { act } from "react";
+import stripAnsi from "strip-ansi";
+import { beforeEach, describe, expect, it } from "vitest";
+import { renderHook } from "../../../test-utils/render.js";
+import { cpLen } from "../../utils/textUtils.js";
 import type {
-  Viewport,
   TextBuffer,
-  TextBufferState,
   TextBufferAction,
-  VisualLayout,
   TextBufferOptions,
-} from './text-buffer.js';
+  TextBufferState,
+  Viewport,
+  VisualLayout,
+} from "./text-buffer.js";
 import {
-  useTextBuffer,
-  offsetToLogicalPos,
-  logicalPosToOffset,
-  textBufferReducer,
-  findWordEndInLine,
   findNextWordStartInLine,
+  findWordEndInLine,
   isWordCharStrict,
-} from './text-buffer.js';
-import { cpLen } from '../../utils/textUtils.js';
+  logicalPosToOffset,
+  offsetToLogicalPos,
+  textBufferReducer,
+  useTextBuffer,
+} from "./text-buffer.js";
 
 const defaultVisualLayout: VisualLayout = {
-  visualLines: [''],
+  visualLines: [""],
   logicalToVisualMap: [[[0, 0]]],
   visualToLogicalMap: [[0, 0]],
 };
 
 const initialState: TextBufferState = {
-  lines: [''],
+  lines: [""],
   cursorRow: 0,
   cursorCol: 0,
   preferredCol: null,
@@ -47,186 +47,183 @@ const initialState: TextBufferState = {
   visualLayout: defaultVisualLayout,
 };
 
-describe('textBufferReducer', () => {
-  it('should return the initial state if state is undefined', () => {
-    const action = { type: 'unknown_action' } as unknown as TextBufferAction;
+describe("textBufferReducer", () => {
+  it("should return the initial state if state is undefined", () => {
+    const action = { type: "unknown_action" } as unknown as TextBufferAction;
     const state = textBufferReducer(initialState, action);
     expect(state).toHaveOnlyValidCharacters();
     expect(state).toEqual(initialState);
   });
 
-  describe('set_text action', () => {
-    it('should set new text and move cursor to the end', () => {
+  describe("set_text action", () => {
+    it("should set new text and move cursor to the end", () => {
       const action: TextBufferAction = {
-        type: 'set_text',
-        payload: 'hello\nworld',
+        type: "set_text",
+        payload: "hello\nworld",
       };
       const state = textBufferReducer(initialState, action);
       expect(state).toHaveOnlyValidCharacters();
-      expect(state.lines).toEqual(['hello', 'world']);
+      expect(state.lines).toEqual(["hello", "world"]);
       expect(state.cursorRow).toBe(1);
       expect(state.cursorCol).toBe(5);
       expect(state.undoStack.length).toBe(1);
     });
 
-    it('should not create an undo snapshot if pushToUndo is false', () => {
+    it("should not create an undo snapshot if pushToUndo is false", () => {
       const action: TextBufferAction = {
-        type: 'set_text',
-        payload: 'no undo',
+        type: "set_text",
+        payload: "no undo",
         pushToUndo: false,
       };
       const state = textBufferReducer(initialState, action);
       expect(state).toHaveOnlyValidCharacters();
-      expect(state.lines).toEqual(['no undo']);
+      expect(state.lines).toEqual(["no undo"]);
       expect(state.undoStack.length).toBe(0);
     });
   });
 
-  describe('insert action', () => {
-    it('should insert a character', () => {
-      const action: TextBufferAction = { type: 'insert', payload: 'a' };
+  describe("insert action", () => {
+    it("should insert a character", () => {
+      const action: TextBufferAction = { type: "insert", payload: "a" };
       const state = textBufferReducer(initialState, action);
       expect(state).toHaveOnlyValidCharacters();
-      expect(state.lines).toEqual(['a']);
+      expect(state.lines).toEqual(["a"]);
       expect(state.cursorCol).toBe(1);
     });
 
-    it('should insert a newline', () => {
-      const stateWithText = { ...initialState, lines: ['hello'] };
-      const action: TextBufferAction = { type: 'insert', payload: '\n' };
+    it("should insert a newline", () => {
+      const stateWithText = { ...initialState, lines: ["hello"] };
+      const action: TextBufferAction = { type: "insert", payload: "\n" };
       const state = textBufferReducer(stateWithText, action);
       expect(state).toHaveOnlyValidCharacters();
-      expect(state.lines).toEqual(['', 'hello']);
+      expect(state.lines).toEqual(["", "hello"]);
       expect(state.cursorRow).toBe(1);
       expect(state.cursorCol).toBe(0);
     });
   });
 
-  describe('insert action with options', () => {
-    it('should filter input using inputFilter option', () => {
-      const action: TextBufferAction = { type: 'insert', payload: 'a1b2c3' };
+  describe("insert action with options", () => {
+    it("should filter input using inputFilter option", () => {
+      const action: TextBufferAction = { type: "insert", payload: "a1b2c3" };
       const options: TextBufferOptions = {
-        inputFilter: (text) => text.replace(/[0-9]/g, ''),
+        inputFilter: (text) => text.replace(/[0-9]/g, ""),
       };
       const state = textBufferReducer(initialState, action, options);
-      expect(state.lines).toEqual(['abc']);
+      expect(state.lines).toEqual(["abc"]);
       expect(state.cursorCol).toBe(3);
     });
 
-    it('should strip newlines when singleLine option is true', () => {
+    it("should strip newlines when singleLine option is true", () => {
       const action: TextBufferAction = {
-        type: 'insert',
-        payload: 'hello\nworld',
+        type: "insert",
+        payload: "hello\nworld",
       };
       const options: TextBufferOptions = { singleLine: true };
       const state = textBufferReducer(initialState, action, options);
-      expect(state.lines).toEqual(['helloworld']);
+      expect(state.lines).toEqual(["helloworld"]);
       expect(state.cursorCol).toBe(10);
     });
 
-    it('should apply both inputFilter and singleLine options', () => {
+    it("should apply both inputFilter and singleLine options", () => {
       const action: TextBufferAction = {
-        type: 'insert',
-        payload: 'h\ne\nl\nl\no\n1\n2\n3',
+        type: "insert",
+        payload: "h\ne\nl\nl\no\n1\n2\n3",
       };
       const options: TextBufferOptions = {
         singleLine: true,
-        inputFilter: (text) => text.replace(/[0-9]/g, ''),
+        inputFilter: (text) => text.replace(/[0-9]/g, ""),
       };
       const state = textBufferReducer(initialState, action, options);
-      expect(state.lines).toEqual(['hello']);
+      expect(state.lines).toEqual(["hello"]);
       expect(state.cursorCol).toBe(5);
     });
   });
 
-  describe('backspace action', () => {
-    it('should remove a character', () => {
+  describe("backspace action", () => {
+    it("should remove a character", () => {
       const stateWithText: TextBufferState = {
         ...initialState,
-        lines: ['a'],
+        lines: ["a"],
         cursorRow: 0,
         cursorCol: 1,
       };
-      const action: TextBufferAction = { type: 'backspace' };
+      const action: TextBufferAction = { type: "backspace" };
       const state = textBufferReducer(stateWithText, action);
       expect(state).toHaveOnlyValidCharacters();
-      expect(state.lines).toEqual(['']);
+      expect(state.lines).toEqual([""]);
       expect(state.cursorCol).toBe(0);
     });
 
-    it('should join lines if at the beginning of a line', () => {
+    it("should join lines if at the beginning of a line", () => {
       const stateWithText: TextBufferState = {
         ...initialState,
-        lines: ['hello', 'world'],
+        lines: ["hello", "world"],
         cursorRow: 1,
         cursorCol: 0,
       };
-      const action: TextBufferAction = { type: 'backspace' };
+      const action: TextBufferAction = { type: "backspace" };
       const state = textBufferReducer(stateWithText, action);
       expect(state).toHaveOnlyValidCharacters();
-      expect(state.lines).toEqual(['helloworld']);
+      expect(state.lines).toEqual(["helloworld"]);
       expect(state.cursorRow).toBe(0);
       expect(state.cursorCol).toBe(5);
     });
   });
 
-  describe('undo/redo actions', () => {
-    it('should undo and redo a change', () => {
+  describe("undo/redo actions", () => {
+    it("should undo and redo a change", () => {
       // 1. Insert text
       const insertAction: TextBufferAction = {
-        type: 'insert',
-        payload: 'test',
+        type: "insert",
+        payload: "test",
       };
       const stateAfterInsert = textBufferReducer(initialState, insertAction);
       expect(stateAfterInsert).toHaveOnlyValidCharacters();
-      expect(stateAfterInsert.lines).toEqual(['test']);
+      expect(stateAfterInsert.lines).toEqual(["test"]);
       expect(stateAfterInsert.undoStack.length).toBe(1);
 
       // 2. Undo
-      const undoAction: TextBufferAction = { type: 'undo' };
+      const undoAction: TextBufferAction = { type: "undo" };
       const stateAfterUndo = textBufferReducer(stateAfterInsert, undoAction);
       expect(stateAfterUndo).toHaveOnlyValidCharacters();
-      expect(stateAfterUndo.lines).toEqual(['']);
+      expect(stateAfterUndo.lines).toEqual([""]);
       expect(stateAfterUndo.undoStack.length).toBe(0);
       expect(stateAfterUndo.redoStack.length).toBe(1);
 
       // 3. Redo
-      const redoAction: TextBufferAction = { type: 'redo' };
+      const redoAction: TextBufferAction = { type: "redo" };
       const stateAfterRedo = textBufferReducer(stateAfterUndo, redoAction);
       expect(stateAfterRedo).toHaveOnlyValidCharacters();
-      expect(stateAfterRedo.lines).toEqual(['test']);
+      expect(stateAfterRedo.lines).toEqual(["test"]);
       expect(stateAfterRedo.undoStack.length).toBe(1);
       expect(stateAfterRedo.redoStack.length).toBe(0);
     });
   });
 
-  describe('create_undo_snapshot action', () => {
-    it('should create a snapshot without changing state', () => {
+  describe("create_undo_snapshot action", () => {
+    it("should create a snapshot without changing state", () => {
       const stateWithText: TextBufferState = {
         ...initialState,
-        lines: ['hello'],
+        lines: ["hello"],
         cursorRow: 0,
         cursorCol: 5,
       };
-      const action: TextBufferAction = { type: 'create_undo_snapshot' };
+      const action: TextBufferAction = { type: "create_undo_snapshot" };
       const state = textBufferReducer(stateWithText, action);
       expect(state).toHaveOnlyValidCharacters();
 
-      expect(state.lines).toEqual(['hello']);
+      expect(state.lines).toEqual(["hello"]);
       expect(state.cursorRow).toBe(0);
       expect(state.cursorCol).toBe(5);
       expect(state.undoStack.length).toBe(1);
-      expect(state.undoStack[0].lines).toEqual(['hello']);
+      expect(state.undoStack[0].lines).toEqual(["hello"]);
       expect(state.undoStack[0].cursorRow).toBe(0);
       expect(state.undoStack[0].cursorCol).toBe(5);
     });
   });
 
-  describe('delete_word_left action', () => {
-    const createSingleLineState = (
-      text: string,
-      col: number,
-    ): TextBufferState => ({
+  describe("delete_word_left action", () => {
+    const createSingleLineState = (text: string, col: number): TextBufferState => ({
       ...initialState,
       lines: [text],
       cursorRow: 0,
@@ -235,59 +232,52 @@ describe('textBufferReducer', () => {
 
     it.each([
       {
-        input: 'hello world',
+        input: "hello world",
         cursorCol: 11,
-        expectedLines: ['hello '],
+        expectedLines: ["hello "],
         expectedCol: 6,
-        desc: 'simple word',
+        desc: "simple word",
       },
       {
-        input: 'path/to/file',
+        input: "path/to/file",
         cursorCol: 12,
-        expectedLines: ['path/to/'],
+        expectedLines: ["path/to/"],
         expectedCol: 8,
-        desc: 'path segment',
+        desc: "path segment",
       },
       {
-        input: 'variable_name',
+        input: "variable_name",
         cursorCol: 13,
-        expectedLines: ['variable_'],
+        expectedLines: ["variable_"],
         expectedCol: 9,
-        desc: 'variable_name parts',
+        desc: "variable_name parts",
       },
-    ])(
-      'should delete $desc',
-      ({ input, cursorCol, expectedLines, expectedCol }) => {
-        const state = textBufferReducer(
-          createSingleLineState(input, cursorCol),
-          { type: 'delete_word_left' },
-        );
-        expect(state.lines).toEqual(expectedLines);
-        expect(state.cursorCol).toBe(expectedCol);
-      },
-    );
+    ])("should delete $desc", ({ input, cursorCol, expectedLines, expectedCol }) => {
+      const state = textBufferReducer(createSingleLineState(input, cursorCol), {
+        type: "delete_word_left",
+      });
+      expect(state.lines).toEqual(expectedLines);
+      expect(state.cursorCol).toBe(expectedCol);
+    });
 
-    it('should act like backspace at the beginning of a line', () => {
+    it("should act like backspace at the beginning of a line", () => {
       const stateWithText: TextBufferState = {
         ...initialState,
-        lines: ['hello', 'world'],
+        lines: ["hello", "world"],
         cursorRow: 1,
         cursorCol: 0,
       };
       const state = textBufferReducer(stateWithText, {
-        type: 'delete_word_left',
+        type: "delete_word_left",
       });
-      expect(state.lines).toEqual(['helloworld']);
+      expect(state.lines).toEqual(["helloworld"]);
       expect(state.cursorRow).toBe(0);
       expect(state.cursorCol).toBe(5);
     });
   });
 
-  describe('delete_word_right action', () => {
-    const createSingleLineState = (
-      text: string,
-      col: number,
-    ): TextBufferState => ({
+  describe("delete_word_right action", () => {
+    const createSingleLineState = (text: string, col: number): TextBufferState => ({
       ...initialState,
       lines: [text],
       cursorRow: 0,
@@ -296,57 +286,53 @@ describe('textBufferReducer', () => {
 
     it.each([
       {
-        input: 'hello world',
+        input: "hello world",
         cursorCol: 0,
-        expectedLines: ['world'],
+        expectedLines: ["world"],
         expectedCol: 0,
-        desc: 'simple word',
+        desc: "simple word",
       },
       {
-        input: 'variable_name',
+        input: "variable_name",
         cursorCol: 0,
-        expectedLines: ['_name'],
+        expectedLines: ["_name"],
         expectedCol: 0,
-        desc: 'variable_name parts',
-      },
-    ])(
-      'should delete $desc',
-      ({ input, cursorCol, expectedLines, expectedCol }) => {
-        const state = textBufferReducer(
-          createSingleLineState(input, cursorCol),
-          { type: 'delete_word_right' },
-        );
-        expect(state.lines).toEqual(expectedLines);
-        expect(state.cursorCol).toBe(expectedCol);
+        desc: "variable_name parts",
       },
-    );
+    ])("should delete $desc", ({ input, cursorCol, expectedLines, expectedCol }) => {
+      const state = textBufferReducer(createSingleLineState(input, cursorCol), {
+        type: "delete_word_right",
+      });
+      expect(state.lines).toEqual(expectedLines);
+      expect(state.cursorCol).toBe(expectedCol);
+    });
 
-    it('should delete path segments progressively', () => {
+    it("should delete path segments progressively", () => {
       const stateWithText: TextBufferState = {
         ...initialState,
-        lines: ['path/to/file'],
+        lines: ["path/to/file"],
         cursorRow: 0,
         cursorCol: 0,
       };
       let state = textBufferReducer(stateWithText, {
-        type: 'delete_word_right',
+        type: "delete_word_right",
       });
-      expect(state.lines).toEqual(['/to/file']);
-      state = textBufferReducer(state, { type: 'delete_word_right' });
-      expect(state.lines).toEqual(['to/file']);
+      expect(state.lines).toEqual(["/to/file"]);
+      state = textBufferReducer(state, { type: "delete_word_right" });
+      expect(state.lines).toEqual(["to/file"]);
     });
 
-    it('should act like delete at the end of a line', () => {
+    it("should act like delete at the end of a line", () => {
       const stateWithText: TextBufferState = {
         ...initialState,
-        lines: ['hello', 'world'],
+        lines: ["hello", "world"],
         cursorRow: 0,
         cursorCol: 5,
       };
       const state = textBufferReducer(stateWithText, {
-        type: 'delete_word_right',
+        type: "delete_word_right",
       });
-      expect(state.lines).toEqual(['helloworld']);
+      expect(state.lines).toEqual(["helloworld"]);
       expect(state.cursorRow).toBe(0);
       expect(state.cursorCol).toBe(5);
     });
@@ -367,68 +353,66 @@ const getBufferState = (result: { current: TextBuffer }) => {
   };
 };
 
-describe('useTextBuffer', () => {
+describe("useTextBuffer", () => {
   let viewport: Viewport;
 
   beforeEach(() => {
     viewport = { width: 10, height: 3 }; // Default viewport for tests
   });
 
-  describe('Initialization', () => {
-    it('should initialize with empty text and cursor at (0,0) by default', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+  describe("Initialization", () => {
+    it("should initialize with empty text and cursor at (0,0) by default", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       const state = getBufferState(result);
-      expect(state.text).toBe('');
-      expect(state.lines).toEqual(['']);
+      expect(state.text).toBe("");
+      expect(state.lines).toEqual([""]);
       expect(state.cursor).toEqual([0, 0]);
-      expect(state.allVisualLines).toEqual(['']);
-      expect(state.viewportVisualLines).toEqual(['']);
+      expect(state.allVisualLines).toEqual([""]);
+      expect(state.viewportVisualLines).toEqual([""]);
       expect(state.visualCursor).toEqual([0, 0]);
       expect(state.visualScrollRow).toBe(0);
     });
 
-    it('should initialize with provided initialText', () => {
+    it("should initialize with provided initialText", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'hello',
+          initialText: "hello",
           viewport,
           isValidPath: () => false,
         }),
       );
       const state = getBufferState(result);
-      expect(state.text).toBe('hello');
-      expect(state.lines).toEqual(['hello']);
+      expect(state.text).toBe("hello");
+      expect(state.lines).toEqual(["hello"]);
       expect(state.cursor).toEqual([0, 0]); // Default cursor if offset not given
-      expect(state.allVisualLines).toEqual(['hello']);
-      expect(state.viewportVisualLines).toEqual(['hello']);
+      expect(state.allVisualLines).toEqual(["hello"]);
+      expect(state.viewportVisualLines).toEqual(["hello"]);
       expect(state.visualCursor).toEqual([0, 0]);
     });
 
-    it('should initialize with initialText and initialCursorOffset', () => {
+    it("should initialize with initialText and initialCursorOffset", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'hello\nworld',
+          initialText: "hello\nworld",
           initialCursorOffset: 7, // Should be at 'o' in 'world'
           viewport,
           isValidPath: () => false,
         }),
       );
       const state = getBufferState(result);
-      expect(state.text).toBe('hello\nworld');
-      expect(state.lines).toEqual(['hello', 'world']);
+      expect(state.text).toBe("hello\nworld");
+      expect(state.lines).toEqual(["hello", "world"]);
       expect(state.cursor).toEqual([1, 1]); // Logical cursor at 'o' in "world"
-      expect(state.allVisualLines).toEqual(['hello', 'world']);
-      expect(state.viewportVisualLines).toEqual(['hello', 'world']);
+      expect(state.allVisualLines).toEqual(["hello", "world"]);
+      expect(state.viewportVisualLines).toEqual(["hello", "world"]);
       expect(state.visualCursor[0]).toBe(1); // On the second visual line
       expect(state.visualCursor[1]).toBe(1); // At 'o' in "world"
     });
 
-    it('should wrap visual lines', () => {
+    it("should wrap visual lines", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'The quick brown fox jumps over the lazy dog.',
+          initialText: "The quick brown fox jumps over the lazy dog.",
           initialCursorOffset: 2, // After '好'
           viewport: { width: 15, height: 4 },
           isValidPath: () => false,
@@ -436,17 +420,17 @@ describe('useTextBuffer', () => {
       );
       const state = getBufferState(result);
       expect(state.allVisualLines).toEqual([
-        'The quick',
-        'brown fox',
-        'jumps over the',
-        'lazy dog.',
+        "The quick",
+        "brown fox",
+        "jumps over the",
+        "lazy dog.",
       ]);
     });
 
-    it('should wrap visual lines with multiple spaces', () => {
+    it("should wrap visual lines with multiple spaces", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'The  quick  brown fox    jumps over the lazy dog.',
+          initialText: "The  quick  brown fox    jumps over the lazy dog.",
           viewport: { width: 15, height: 4 },
           isValidPath: () => false,
         }),
@@ -456,17 +440,17 @@ describe('useTextBuffer', () => {
       // consistent with Google docs behavior and makes it intuitive to edit
       // the spaces as needed.
       expect(state.allVisualLines).toEqual([
-        'The  quick ',
-        'brown fox   ',
-        'jumps over the',
-        'lazy dog.',
+        "The  quick ",
+        "brown fox   ",
+        "jumps over the",
+        "lazy dog.",
       ]);
     });
 
-    it('should wrap visual lines even without spaces', () => {
+    it("should wrap visual lines even without spaces", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: '123456789012345ABCDEFG', // 4 chars, 12 bytes
+          initialText: "123456789012345ABCDEFG", // 4 chars, 12 bytes
           viewport: { width: 15, height: 2 },
           isValidPath: () => false,
         }),
@@ -475,112 +459,110 @@ describe('useTextBuffer', () => {
       // Including multiple spaces at the end of the lines like this is
       // consistent with Google docs behavior and makes it intuitive to edit
       // the spaces as needed.
-      expect(state.allVisualLines).toEqual(['123456789012345', 'ABCDEFG']);
+      expect(state.allVisualLines).toEqual(["123456789012345", "ABCDEFG"]);
     });
 
-    it('should initialize with multi-byte unicode characters and correct cursor offset', () => {
+    it("should initialize with multi-byte unicode characters and correct cursor offset", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: '你好世界', // 4 chars, 12 bytes
+          initialText: "你好世界", // 4 chars, 12 bytes
           initialCursorOffset: 2, // After '好'
           viewport: { width: 5, height: 2 },
           isValidPath: () => false,
         }),
       );
       const state = getBufferState(result);
-      expect(state.text).toBe('你好世界');
-      expect(state.lines).toEqual(['你好世界']);
+      expect(state.text).toBe("你好世界");
+      expect(state.lines).toEqual(["你好世界"]);
       expect(state.cursor).toEqual([0, 2]);
       // Visual: "你好" (width 4), "世"界" (width 4) with viewport width 5
-      expect(state.allVisualLines).toEqual(['你好', '世界']);
+      expect(state.allVisualLines).toEqual(["你好", "世界"]);
       expect(state.visualCursor).toEqual([1, 0]);
     });
   });
 
-  describe('Basic Editing', () => {
-    it('insert: should insert a character and update cursor', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      act(() => result.current.insert('a'));
+  describe("Basic Editing", () => {
+    it("insert: should insert a character and update cursor", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      act(() => result.current.insert("a"));
       let state = getBufferState(result);
-      expect(state.text).toBe('a');
+      expect(state.text).toBe("a");
       expect(state.cursor).toEqual([0, 1]);
       expect(state.visualCursor).toEqual([0, 1]);
 
-      act(() => result.current.insert('b'));
+      act(() => result.current.insert("b"));
       state = getBufferState(result);
-      expect(state.text).toBe('ab');
+      expect(state.text).toBe("ab");
       expect(state.cursor).toEqual([0, 2]);
       expect(state.visualCursor).toEqual([0, 2]);
     });
 
-    it('insert: should insert text in the middle of a line', () => {
+    it("insert: should insert text in the middle of a line", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'abc',
+          initialText: "abc",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('right'));
-      act(() => result.current.insert('-NEW-'));
+      act(() => result.current.move("right"));
+      act(() => result.current.insert("-NEW-"));
       const state = getBufferState(result);
-      expect(state.text).toBe('a-NEW-bc');
+      expect(state.text).toBe("a-NEW-bc");
       expect(state.cursor).toEqual([0, 6]);
     });
 
-    it('newline: should create a new line and move cursor', () => {
+    it("newline: should create a new line and move cursor", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'ab',
+          initialText: "ab",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end')); // cursor at [0,2]
+      act(() => result.current.move("end")); // cursor at [0,2]
       act(() => result.current.newline());
       const state = getBufferState(result);
-      expect(state.text).toBe('ab\n');
-      expect(state.lines).toEqual(['ab', '']);
+      expect(state.text).toBe("ab\n");
+      expect(state.lines).toEqual(["ab", ""]);
       expect(state.cursor).toEqual([1, 0]);
-      expect(state.allVisualLines).toEqual(['ab', '']);
-      expect(state.viewportVisualLines).toEqual(['ab', '']); // viewport height 3
+      expect(state.allVisualLines).toEqual(["ab", ""]);
+      expect(state.viewportVisualLines).toEqual(["ab", ""]); // viewport height 3
       expect(state.visualCursor).toEqual([1, 0]); // On the new visual line
     });
 
-    it('backspace: should delete char to the left or merge lines', () => {
+    it("backspace: should delete char to the left or merge lines", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'a\nb',
+          initialText: "a\nb",
           viewport,
           isValidPath: () => false,
         }),
       );
       act(() => {
-        result.current.move('down');
+        result.current.move("down");
       });
       act(() => {
-        result.current.move('end'); // cursor to [1,1] (end of 'b')
+        result.current.move("end"); // cursor to [1,1] (end of 'b')
       });
       act(() => result.current.backspace()); // delete 'b'
       let state = getBufferState(result);
-      expect(state.text).toBe('a\n');
+      expect(state.text).toBe("a\n");
       expect(state.cursor).toEqual([1, 0]);
 
       act(() => result.current.backspace()); // merge lines
       state = getBufferState(result);
-      expect(state.text).toBe('a');
+      expect(state.text).toBe("a");
       expect(state.cursor).toEqual([0, 1]); // cursor after 'a'
-      expect(state.allVisualLines).toEqual(['a']);
-      expect(state.viewportVisualLines).toEqual(['a']);
+      expect(state.allVisualLines).toEqual(["a"]);
+      expect(state.viewportVisualLines).toEqual(["a"]);
       expect(state.visualCursor).toEqual([0, 1]);
     });
 
-    it('del: should delete char to the right or merge lines', () => {
+    it("del: should delete char to the right or merge lines", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'a\nb',
+          initialText: "a\nb",
           viewport,
           isValidPath: () => false,
         }),
@@ -588,59 +570,51 @@ describe('useTextBuffer', () => {
       // cursor at [0,0]
       act(() => result.current.del()); // delete 'a'
       let state = getBufferState(result);
-      expect(state.text).toBe('\nb');
+      expect(state.text).toBe("\nb");
       expect(state.cursor).toEqual([0, 0]);
 
       act(() => result.current.del()); // merge lines (deletes newline)
       state = getBufferState(result);
-      expect(state.text).toBe('b');
+      expect(state.text).toBe("b");
       expect(state.cursor).toEqual([0, 0]);
-      expect(state.allVisualLines).toEqual(['b']);
-      expect(state.viewportVisualLines).toEqual(['b']);
+      expect(state.allVisualLines).toEqual(["b"]);
+      expect(state.viewportVisualLines).toEqual(["b"]);
       expect(state.visualCursor).toEqual([0, 0]);
     });
   });
 
-  describe('Drag and Drop File Paths', () => {
-    it('should prepend @ to a valid file path on insert', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => true }),
-      );
-      const filePath = '/path/to/a/valid/file.txt';
+  describe("Drag and Drop File Paths", () => {
+    it("should prepend @ to a valid file path on insert", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => true }));
+      const filePath = "/path/to/a/valid/file.txt";
       act(() => result.current.insert(filePath, { paste: true }));
       expect(getBufferState(result).text).toBe(`@${filePath} `);
     });
 
-    it('should not prepend @ to an invalid file path on insert', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      const notAPath = 'this is just some long text';
+    it("should not prepend @ to an invalid file path on insert", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      const notAPath = "this is just some long text";
       act(() => result.current.insert(notAPath, { paste: true }));
       expect(getBufferState(result).text).toBe(notAPath);
     });
 
-    it('should handle quoted paths', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => true }),
-      );
+    it("should handle quoted paths", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => true }));
       const filePath = "'/path/to/a/valid/file.txt'";
       act(() => result.current.insert(filePath, { paste: true }));
       expect(getBufferState(result).text).toBe(`@/path/to/a/valid/file.txt `);
     });
 
-    it('should not prepend @ to short text that is not a path', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => true }),
-      );
-      const shortText = 'ab';
+    it("should not prepend @ to short text that is not a path", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => true }));
+      const shortText = "ab";
       act(() => result.current.insert(shortText, { paste: true }));
       expect(getBufferState(result).text).toBe(shortText);
     });
   });
 
-  describe('Shell Mode Behavior', () => {
-    it('should not prepend @ to valid file paths when shellModeActive is true', () => {
+  describe("Shell Mode Behavior", () => {
+    it("should not prepend @ to valid file paths when shellModeActive is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -648,12 +622,12 @@ describe('useTextBuffer', () => {
           shellModeActive: true,
         }),
       );
-      const filePath = '/path/to/a/valid/file.txt';
+      const filePath = "/path/to/a/valid/file.txt";
       act(() => result.current.insert(filePath, { paste: true }));
       expect(getBufferState(result).text).toBe(filePath); // No @ prefix
     });
 
-    it('should not prepend @ to quoted paths when shellModeActive is true', () => {
+    it("should not prepend @ to quoted paths when shellModeActive is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -666,7 +640,7 @@ describe('useTextBuffer', () => {
       expect(getBufferState(result).text).toBe(quotedFilePath); // No @ prefix, keeps quotes
     });
 
-    it('should behave normally with invalid paths when shellModeActive is true', () => {
+    it("should behave normally with invalid paths when shellModeActive is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -674,12 +648,12 @@ describe('useTextBuffer', () => {
           shellModeActive: true,
         }),
       );
-      const notAPath = 'this is just some text';
+      const notAPath = "this is just some text";
       act(() => result.current.insert(notAPath, { paste: true }));
       expect(getBufferState(result).text).toBe(notAPath);
     });
 
-    it('should behave normally with short text when shellModeActive is true', () => {
+    it("should behave normally with short text when shellModeActive is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -687,14 +661,14 @@ describe('useTextBuffer', () => {
           shellModeActive: true,
         }),
       );
-      const shortText = 'ls';
+      const shortText = "ls";
       act(() => result.current.insert(shortText, { paste: true }));
       expect(getBufferState(result).text).toBe(shortText); // No @ prefix for short text
     });
   });
 
-  describe('Cursor Movement', () => {
-    it('move: left/right should work within and across visual lines (due to wrapping)', () => {
+  describe("Cursor Movement", () => {
+    it("move: left/right should work within and across visual lines (due to wrapping)", () => {
       // Text: "long line1next line2" (20 chars)
       // Viewport width 5. Word wrapping should produce:
       // "long " (5)
@@ -703,31 +677,31 @@ describe('useTextBuffer', () => {
       // "line2" (5)
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'long line1next line2', // Corrected: was 'long line1next line2'
+          initialText: "long line1next line2", // Corrected: was 'long line1next line2'
           viewport: { width: 5, height: 4 },
           isValidPath: () => false,
         }),
       );
       // Initial cursor [0,0] logical, visual [0,0] ("l" of "long ")
 
-      act(() => result.current.move('right')); // visual [0,1] ("o")
+      act(() => result.current.move("right")); // visual [0,1] ("o")
       expect(getBufferState(result).visualCursor).toEqual([0, 1]);
-      act(() => result.current.move('right')); // visual [0,2] ("n")
-      act(() => result.current.move('right')); // visual [0,3] ("g")
-      act(() => result.current.move('right')); // visual [0,4] (" ")
+      act(() => result.current.move("right")); // visual [0,2] ("n")
+      act(() => result.current.move("right")); // visual [0,3] ("g")
+      act(() => result.current.move("right")); // visual [0,4] (" ")
       expect(getBufferState(result).visualCursor).toEqual([0, 4]);
 
-      act(() => result.current.move('right')); // visual [1,0] ("l" of "line1")
+      act(() => result.current.move("right")); // visual [1,0] ("l" of "line1")
       expect(getBufferState(result).visualCursor).toEqual([1, 0]);
       expect(getBufferState(result).cursor).toEqual([0, 5]); // logical cursor
 
-      act(() => result.current.move('left')); // visual [0,4] (" " of "long ")
+      act(() => result.current.move("left")); // visual [0,4] (" " of "long ")
       expect(getBufferState(result).visualCursor).toEqual([0, 4]);
       expect(getBufferState(result).cursor).toEqual([0, 4]); // logical cursor
     });
 
-    it('move: up/down should preserve preferred visual column', () => {
-      const text = 'abcde\nxy\n12345';
+    it("move: up/down should preserve preferred visual column", () => {
+      const text = "abcde\nxy\n12345";
       const { result } = renderHook(() =>
         useTextBuffer({
           initialText: text,
@@ -735,14 +709,14 @@ describe('useTextBuffer', () => {
           isValidPath: () => false,
         }),
       );
-      expect(result.current.allVisualLines).toEqual(['abcde', 'xy', '12345']);
+      expect(result.current.allVisualLines).toEqual(["abcde", "xy", "12345"]);
       // Place cursor at the end of "abcde" -> logical [0,5]
       act(() => {
-        result.current.move('home'); // to [0,0]
+        result.current.move("home"); // to [0,0]
       });
       for (let i = 0; i < 5; i++) {
         act(() => {
-          result.current.move('right'); // to [0,5]
+          result.current.move("right"); // to [0,5]
         });
       }
       expect(getBufferState(result).cursor).toEqual([0, 5]);
@@ -750,26 +724,26 @@ describe('useTextBuffer', () => {
 
       // Set preferredCol by moving up then down to the same spot, then test.
       act(() => {
-        result.current.move('down'); // to xy, logical [1,2], visual [1,2], preferredCol should be 5
+        result.current.move("down"); // to xy, logical [1,2], visual [1,2], preferredCol should be 5
       });
       let state = getBufferState(result);
       expect(state.cursor).toEqual([1, 2]); // Logical cursor at end of 'xy'
       expect(state.visualCursor).toEqual([1, 2]); // Visual cursor at end of 'xy'
       expect(state.preferredCol).toBe(5);
 
-      act(() => result.current.move('down')); // to '12345', preferredCol=5.
+      act(() => result.current.move("down")); // to '12345', preferredCol=5.
       state = getBufferState(result);
       expect(state.cursor).toEqual([2, 5]); // Logical cursor at end of '12345'
       expect(state.visualCursor).toEqual([2, 5]); // Visual cursor at end of '12345'
       expect(state.preferredCol).toBe(5); // Preferred col is maintained
 
-      act(() => result.current.move('left')); // preferredCol should reset
+      act(() => result.current.move("left")); // preferredCol should reset
       state = getBufferState(result);
       expect(state.preferredCol).toBe(null);
     });
 
-    it('move: home/end should go to visual line start/end', () => {
-      const initialText = 'line one\nsecond line';
+    it("move: home/end should go to visual line start/end", () => {
+      const initialText = "line one\nsecond line";
       const { result } = renderHook(() =>
         useTextBuffer({
           initialText,
@@ -777,31 +751,25 @@ describe('useTextBuffer', () => {
           isValidPath: () => false,
         }),
       );
-      expect(result.current.allVisualLines).toEqual([
-        'line',
-        'one',
-        'secon',
-        'd',
-        'line',
-      ]);
+      expect(result.current.allVisualLines).toEqual(["line", "one", "secon", "d", "line"]);
       // Initial cursor [0,0] (start of "line")
-      act(() => result.current.move('down')); // visual cursor from [0,0] to [1,0] ("o" of "one")
-      act(() => result.current.move('right')); // visual cursor to [1,1] ("n" of "one")
+      act(() => result.current.move("down")); // visual cursor from [0,0] to [1,0] ("o" of "one")
+      act(() => result.current.move("right")); // visual cursor to [1,1] ("n" of "one")
       expect(getBufferState(result).visualCursor).toEqual([1, 1]);
 
-      act(() => result.current.move('home')); // visual cursor to [1,0] (start of "one")
+      act(() => result.current.move("home")); // visual cursor to [1,0] (start of "one")
       expect(getBufferState(result).visualCursor).toEqual([1, 0]);
 
-      act(() => result.current.move('end')); // visual cursor to [1,3] (end of "one")
+      act(() => result.current.move("end")); // visual cursor to [1,3] (end of "one")
       expect(getBufferState(result).visualCursor).toEqual([1, 3]); // "one" is 3 chars
     });
   });
 
-  describe('Visual Layout & Viewport', () => {
-    it('should wrap long lines correctly into visualLines', () => {
+  describe("Visual Layout & Viewport", () => {
+    it("should wrap long lines correctly into visualLines", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'This is a very long line of text.', // 33 chars
+          initialText: "This is a very long line of text.", // 33 chars
           viewport: { width: 10, height: 5 },
           isValidPath: () => false,
         }),
@@ -813,161 +781,147 @@ describe('useTextBuffer', () => {
       // "line of"
       // "text."
       expect(state.allVisualLines.length).toBe(4);
-      expect(state.allVisualLines[0]).toBe('This is a');
-      expect(state.allVisualLines[1]).toBe('very long');
-      expect(state.allVisualLines[2]).toBe('line of');
-      expect(state.allVisualLines[3]).toBe('text.');
+      expect(state.allVisualLines[0]).toBe("This is a");
+      expect(state.allVisualLines[1]).toBe("very long");
+      expect(state.allVisualLines[2]).toBe("line of");
+      expect(state.allVisualLines[3]).toBe("text.");
     });
 
-    it('should update visualScrollRow when visualCursor moves out of viewport', () => {
+    it("should update visualScrollRow when visualCursor moves out of viewport", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'l1\nl2\nl3\nl4\nl5',
+          initialText: "l1\nl2\nl3\nl4\nl5",
           viewport: { width: 5, height: 3 }, // Can show 3 visual lines
           isValidPath: () => false,
         }),
       );
       // Initial: l1, l2, l3 visible. visualScrollRow = 0. visualCursor = [0,0]
       expect(getBufferState(result).visualScrollRow).toBe(0);
-      expect(getBufferState(result).allVisualLines).toEqual([
-        'l1',
-        'l2',
-        'l3',
-        'l4',
-        'l5',
-      ]);
-      expect(getBufferState(result).viewportVisualLines).toEqual([
-        'l1',
-        'l2',
-        'l3',
-      ]);
+      expect(getBufferState(result).allVisualLines).toEqual(["l1", "l2", "l3", "l4", "l5"]);
+      expect(getBufferState(result).viewportVisualLines).toEqual(["l1", "l2", "l3"]);
 
-      act(() => result.current.move('down')); // vc=[1,0]
-      act(() => result.current.move('down')); // vc=[2,0] (l3)
+      act(() => result.current.move("down")); // vc=[1,0]
+      act(() => result.current.move("down")); // vc=[2,0] (l3)
       expect(getBufferState(result).visualScrollRow).toBe(0);
 
-      act(() => result.current.move('down')); // vc=[3,0] (l4) - scroll should happen
+      act(() => result.current.move("down")); // vc=[3,0] (l4) - scroll should happen
       // Now: l2, l3, l4 visible. visualScrollRow = 1.
       let state = getBufferState(result);
       expect(state.visualScrollRow).toBe(1);
-      expect(state.allVisualLines).toEqual(['l1', 'l2', 'l3', 'l4', 'l5']);
-      expect(state.viewportVisualLines).toEqual(['l2', 'l3', 'l4']);
+      expect(state.allVisualLines).toEqual(["l1", "l2", "l3", "l4", "l5"]);
+      expect(state.viewportVisualLines).toEqual(["l2", "l3", "l4"]);
       expect(state.visualCursor).toEqual([3, 0]);
 
-      act(() => result.current.move('up')); // vc=[2,0] (l3)
-      act(() => result.current.move('up')); // vc=[1,0] (l2)
+      act(() => result.current.move("up")); // vc=[2,0] (l3)
+      act(() => result.current.move("up")); // vc=[1,0] (l2)
       expect(getBufferState(result).visualScrollRow).toBe(1);
 
-      act(() => result.current.move('up')); // vc=[0,0] (l1) - scroll up
+      act(() => result.current.move("up")); // vc=[0,0] (l1) - scroll up
       // Now: l1, l2, l3 visible. visualScrollRow = 0
       state = getBufferState(result); // Assign to the existing `state` variable
       expect(state.visualScrollRow).toBe(0);
-      expect(state.allVisualLines).toEqual(['l1', 'l2', 'l3', 'l4', 'l5']);
-      expect(state.viewportVisualLines).toEqual(['l1', 'l2', 'l3']);
+      expect(state.allVisualLines).toEqual(["l1", "l2", "l3", "l4", "l5"]);
+      expect(state.viewportVisualLines).toEqual(["l1", "l2", "l3"]);
       expect(state.visualCursor).toEqual([0, 0]);
     });
   });
 
-  describe('Undo/Redo', () => {
-    it('should undo and redo an insert operation', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      act(() => result.current.insert('a'));
-      expect(getBufferState(result).text).toBe('a');
+  describe("Undo/Redo", () => {
+    it("should undo and redo an insert operation", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      act(() => result.current.insert("a"));
+      expect(getBufferState(result).text).toBe("a");
 
       act(() => result.current.undo());
-      expect(getBufferState(result).text).toBe('');
+      expect(getBufferState(result).text).toBe("");
       expect(getBufferState(result).cursor).toEqual([0, 0]);
 
       act(() => result.current.redo());
-      expect(getBufferState(result).text).toBe('a');
+      expect(getBufferState(result).text).toBe("a");
       expect(getBufferState(result).cursor).toEqual([0, 1]);
     });
 
-    it('should undo and redo a newline operation', () => {
+    it("should undo and redo a newline operation", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'test',
+          initialText: "test",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end'));
+      act(() => result.current.move("end"));
       act(() => result.current.newline());
-      expect(getBufferState(result).text).toBe('test\n');
+      expect(getBufferState(result).text).toBe("test\n");
 
       act(() => result.current.undo());
-      expect(getBufferState(result).text).toBe('test');
+      expect(getBufferState(result).text).toBe("test");
       expect(getBufferState(result).cursor).toEqual([0, 4]);
 
       act(() => result.current.redo());
-      expect(getBufferState(result).text).toBe('test\n');
+      expect(getBufferState(result).text).toBe("test\n");
       expect(getBufferState(result).cursor).toEqual([1, 0]);
     });
   });
 
-  describe('Unicode Handling', () => {
-    it('insert: should correctly handle multi-byte unicode characters', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      act(() => result.current.insert('你好'));
+  describe("Unicode Handling", () => {
+    it("insert: should correctly handle multi-byte unicode characters", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      act(() => result.current.insert("你好"));
       const state = getBufferState(result);
-      expect(state.text).toBe('你好');
+      expect(state.text).toBe("你好");
       expect(state.cursor).toEqual([0, 2]); // Cursor is 2 (char count)
       expect(state.visualCursor).toEqual([0, 2]);
     });
 
-    it('backspace: should correctly delete multi-byte unicode characters', () => {
+    it("backspace: should correctly delete multi-byte unicode characters", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: '你好',
+          initialText: "你好",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end')); // cursor at [0,2]
+      act(() => result.current.move("end")); // cursor at [0,2]
       act(() => result.current.backspace()); // delete '好'
       let state = getBufferState(result);
-      expect(state.text).toBe('你');
+      expect(state.text).toBe("你");
       expect(state.cursor).toEqual([0, 1]);
 
       act(() => result.current.backspace()); // delete '你'
       state = getBufferState(result);
-      expect(state.text).toBe('');
+      expect(state.text).toBe("");
       expect(state.cursor).toEqual([0, 0]);
     });
 
-    it('move: left/right should treat multi-byte chars as single units for visual cursor', () => {
+    it("move: left/right should treat multi-byte chars as single units for visual cursor", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: '🐶🐱',
+          initialText: "🐶🐱",
           viewport: { width: 5, height: 1 },
           isValidPath: () => false,
         }),
       );
       // Initial: visualCursor [0,0]
-      act(() => result.current.move('right')); // visualCursor [0,1] (after 🐶)
+      act(() => result.current.move("right")); // visualCursor [0,1] (after 🐶)
       let state = getBufferState(result);
       expect(state.cursor).toEqual([0, 1]);
       expect(state.visualCursor).toEqual([0, 1]);
 
-      act(() => result.current.move('right')); // visualCursor [0,2] (after 🐱)
+      act(() => result.current.move("right")); // visualCursor [0,2] (after 🐱)
       state = getBufferState(result);
       expect(state.cursor).toEqual([0, 2]);
       expect(state.visualCursor).toEqual([0, 2]);
 
-      act(() => result.current.move('left')); // visualCursor [0,1] (before 🐱 / after 🐶)
+      act(() => result.current.move("left")); // visualCursor [0,1] (before 🐱 / after 🐶)
       state = getBufferState(result);
       expect(state.cursor).toEqual([0, 1]);
       expect(state.visualCursor).toEqual([0, 1]);
     });
 
-    it('moveToVisualPosition: should correctly handle wide characters (Chinese)', () => {
+    it("moveToVisualPosition: should correctly handle wide characters (Chinese)", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: '你好', // 2 chars, width 4
+          initialText: "你好", // 2 chars, width 4
           viewport: { width: 10, height: 1 },
           isValidPath: () => false,
         }),
@@ -993,237 +947,227 @@ describe('useTextBuffer', () => {
     });
   });
 
-  describe('handleInput', () => {
-    it('should insert printable characters', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+  describe("handleInput", () => {
+    it("should insert printable characters", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       act(() =>
         result.current.handleInput({
-          name: 'h',
+          name: "h",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: true,
-          sequence: 'h',
+          sequence: "h",
         }),
       );
       act(() =>
         result.current.handleInput({
-          name: 'i',
+          name: "i",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: true,
-          sequence: 'i',
+          sequence: "i",
         }),
       );
-      expect(getBufferState(result).text).toBe('hi');
+      expect(getBufferState(result).text).toBe("hi");
     });
 
     it('should handle "Enter" key as newline', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       act(() =>
         result.current.handleInput({
-          name: 'return',
+          name: "return",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: true,
-          sequence: '\r',
+          sequence: "\r",
         }),
       );
-      expect(getBufferState(result).lines).toEqual(['', '']);
+      expect(getBufferState(result).lines).toEqual(["", ""]);
     });
 
-    it('should do nothing for a tab key press', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+    it("should do nothing for a tab key press", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       act(() =>
         result.current.handleInput({
-          name: 'tab',
+          name: "tab",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\t',
+          sequence: "\t",
         }),
       );
-      expect(getBufferState(result).text).toBe('');
+      expect(getBufferState(result).text).toBe("");
     });
 
-    it('should do nothing for a shift tab key press', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+    it("should do nothing for a shift tab key press", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       act(() =>
         result.current.handleInput({
-          name: 'tab',
+          name: "tab",
           ctrl: false,
           meta: false,
           shift: true,
           paste: false,
           insertable: false,
-          sequence: '\u001b[9;2u',
+          sequence: "\u001b[9;2u",
         }),
       );
-      expect(getBufferState(result).text).toBe('');
+      expect(getBufferState(result).text).toBe("");
     });
 
     it('should handle "Backspace" key', () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'a',
+          initialText: "a",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end'));
+      act(() => result.current.move("end"));
       act(() =>
         result.current.handleInput({
-          name: 'backspace',
+          name: "backspace",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\x7f',
+          sequence: "\x7f",
         }),
       );
-      expect(getBufferState(result).text).toBe('');
+      expect(getBufferState(result).text).toBe("");
     });
 
-    it('should handle multiple delete characters in one input', () => {
+    it("should handle multiple delete characters in one input", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'abcde',
+          initialText: "abcde",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end')); // cursor at the end
+      act(() => result.current.move("end")); // cursor at the end
       expect(getBufferState(result).cursor).toEqual([0, 5]);
 
       act(() => {
         result.current.handleInput({
-          name: 'backspace',
+          name: "backspace",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\x7f',
+          sequence: "\x7f",
         });
         result.current.handleInput({
-          name: 'backspace',
+          name: "backspace",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\x7f',
+          sequence: "\x7f",
         });
         result.current.handleInput({
-          name: 'backspace',
+          name: "backspace",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\x7f',
+          sequence: "\x7f",
         });
       });
-      expect(getBufferState(result).text).toBe('ab');
+      expect(getBufferState(result).text).toBe("ab");
       expect(getBufferState(result).cursor).toEqual([0, 2]);
     });
 
-    it('should handle inserts that contain delete characters', () => {
+    it("should handle inserts that contain delete characters", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'abcde',
+          initialText: "abcde",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end')); // cursor at the end
+      act(() => result.current.move("end")); // cursor at the end
       expect(getBufferState(result).cursor).toEqual([0, 5]);
 
       act(() => {
-        result.current.insert('\x7f\x7f\x7f');
+        result.current.insert("\x7f\x7f\x7f");
       });
-      expect(getBufferState(result).text).toBe('ab');
+      expect(getBufferState(result).text).toBe("ab");
       expect(getBufferState(result).cursor).toEqual([0, 2]);
     });
 
-    it('should handle inserts with a mix of regular and delete characters', () => {
+    it("should handle inserts with a mix of regular and delete characters", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'abcde',
+          initialText: "abcde",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end')); // cursor at the end
+      act(() => result.current.move("end")); // cursor at the end
       expect(getBufferState(result).cursor).toEqual([0, 5]);
 
       act(() => {
-        result.current.insert('\x7fI\x7f\x7fNEW');
+        result.current.insert("\x7fI\x7f\x7fNEW");
       });
-      expect(getBufferState(result).text).toBe('abcNEW');
+      expect(getBufferState(result).text).toBe("abcNEW");
       expect(getBufferState(result).cursor).toEqual([0, 6]);
     });
 
-    it('should handle arrow keys for movement', () => {
+    it("should handle arrow keys for movement", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'ab',
+          initialText: "ab",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.move('end')); // cursor [0,2]
+      act(() => result.current.move("end")); // cursor [0,2]
       act(() =>
         result.current.handleInput({
-          name: 'left',
+          name: "left",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\x1b[D',
+          sequence: "\x1b[D",
         }),
       ); // cursor [0,1]
       expect(getBufferState(result).cursor).toEqual([0, 1]);
       act(() =>
         result.current.handleInput({
-          name: 'right',
+          name: "right",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\x1b[C',
+          sequence: "\x1b[C",
         }),
       ); // cursor [0,2]
       expect(getBufferState(result).cursor).toEqual([0, 2]);
     });
 
-    it('should strip ANSI escape codes when pasting text', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      const textWithAnsi = '\x1B[31mHello\x1B[0m \x1B[32mWorld\x1B[0m';
+    it("should strip ANSI escape codes when pasting text", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      const textWithAnsi = "\x1B[31mHello\x1B[0m \x1B[32mWorld\x1B[0m";
       // Simulate pasting by calling handleInput with a string longer than 1 char
       act(() =>
         result.current.handleInput({
-          name: '',
+          name: "",
           ctrl: false,
           meta: false,
           shift: false,
@@ -1232,28 +1176,26 @@ describe('useTextBuffer', () => {
           sequence: textWithAnsi,
         }),
       );
-      expect(getBufferState(result).text).toBe('Hello World');
+      expect(getBufferState(result).text).toBe("Hello World");
     });
 
-    it('should handle VSCode terminal Shift+Enter as newline', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+    it("should handle VSCode terminal Shift+Enter as newline", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       act(() =>
         result.current.handleInput({
-          name: 'return',
+          name: "return",
           ctrl: false,
           meta: false,
           shift: true,
           paste: false,
           insertable: true,
-          sequence: '\r',
+          sequence: "\r",
         }),
       ); // Simulates Shift+Enter in VSCode terminal
-      expect(getBufferState(result).lines).toEqual(['', '']);
+      expect(getBufferState(result).lines).toEqual(["", ""]);
     });
 
-    it('should correctly handle repeated pasting of long text', () => {
+    it("should correctly handle repeated pasting of long text", () => {
       const longText = `not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
 
 Why do we use it?
@@ -1262,9 +1204,7 @@ It is a long established fact that a reader will be distracted by the readable c
 Where does it come from?
 Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lore
 `;
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
 
       // Simulate pasting the long text multiple times
       act(() => {
@@ -1275,13 +1215,8 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
 
       const state = getBufferState(result);
       // Check that the text is the result of three concatenations.
-      expect(state.lines).toStrictEqual(
-        (longText + longText + longText).split('\n'),
-      );
-      const expectedCursorPos = offsetToLogicalPos(
-        state.text,
-        state.text.length,
-      );
+      expect(state.lines).toStrictEqual((longText + longText + longText).split("\n"));
+      const expectedCursorPos = offsetToLogicalPos(state.text, state.text.length);
       expect(state.cursor).toEqual(expectedCursorPos);
     });
   });
@@ -1294,159 +1229,159 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
   // - openInExternalEditor (heavy mocking of fs, child_process, os)
   // - All edge cases for visual scrolling and wrapping with different viewport sizes and text content.
 
-  describe('replaceRange', () => {
-    it('should replace a single-line range with single-line text', () => {
+  describe("replaceRange", () => {
+    it("should replace a single-line range with single-line text", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: '@pac',
+          initialText: "@pac",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 1, 0, 4, 'packages'));
+      act(() => result.current.replaceRange(0, 1, 0, 4, "packages"));
       const state = getBufferState(result);
-      expect(state.text).toBe('@packages');
+      expect(state.text).toBe("@packages");
       expect(state.cursor).toEqual([0, 9]); // cursor after 'typescript'
     });
 
-    it('should replace a multi-line range with single-line text', () => {
+    it("should replace a multi-line range with single-line text", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'hello\nworld\nagain',
+          initialText: "hello\nworld\nagain",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 2, 1, 3, ' new ')); // replace 'llo\nwor' with ' new '
+      act(() => result.current.replaceRange(0, 2, 1, 3, " new ")); // replace 'llo\nwor' with ' new '
       const state = getBufferState(result);
-      expect(state.text).toBe('he new ld\nagain');
+      expect(state.text).toBe("he new ld\nagain");
       expect(state.cursor).toEqual([0, 7]); // cursor after ' new '
     });
 
-    it('should delete a range when replacing with an empty string', () => {
+    it("should delete a range when replacing with an empty string", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'hello world',
+          initialText: "hello world",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 5, 0, 11, '')); // delete ' world'
+      act(() => result.current.replaceRange(0, 5, 0, 11, "")); // delete ' world'
       const state = getBufferState(result);
-      expect(state.text).toBe('hello');
+      expect(state.text).toBe("hello");
       expect(state.cursor).toEqual([0, 5]);
     });
 
-    it('should handle replacing at the beginning of the text', () => {
+    it("should handle replacing at the beginning of the text", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'world',
+          initialText: "world",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 0, 0, 0, 'hello '));
+      act(() => result.current.replaceRange(0, 0, 0, 0, "hello "));
       const state = getBufferState(result);
-      expect(state.text).toBe('hello world');
+      expect(state.text).toBe("hello world");
       expect(state.cursor).toEqual([0, 6]);
     });
 
-    it('should handle replacing at the end of the text', () => {
+    it("should handle replacing at the end of the text", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'hello',
+          initialText: "hello",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 5, 0, 5, ' world'));
+      act(() => result.current.replaceRange(0, 5, 0, 5, " world"));
       const state = getBufferState(result);
-      expect(state.text).toBe('hello world');
+      expect(state.text).toBe("hello world");
       expect(state.cursor).toEqual([0, 11]);
     });
 
-    it('should handle replacing the entire buffer content', () => {
+    it("should handle replacing the entire buffer content", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'old text',
+          initialText: "old text",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 0, 0, 8, 'new text'));
+      act(() => result.current.replaceRange(0, 0, 0, 8, "new text"));
       const state = getBufferState(result);
-      expect(state.text).toBe('new text');
+      expect(state.text).toBe("new text");
       expect(state.cursor).toEqual([0, 8]);
     });
 
-    it('should correctly replace with unicode characters', () => {
+    it("should correctly replace with unicode characters", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'hello *** world',
+          initialText: "hello *** world",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 6, 0, 9, '你好'));
+      act(() => result.current.replaceRange(0, 6, 0, 9, "你好"));
       const state = getBufferState(result);
-      expect(state.text).toBe('hello 你好 world');
+      expect(state.text).toBe("hello 你好 world");
       expect(state.cursor).toEqual([0, 8]); // after '你好'
     });
 
-    it('should handle invalid range by returning false and not changing text', () => {
+    it("should handle invalid range by returning false and not changing text", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'test',
+          initialText: "test",
           viewport,
           isValidPath: () => false,
         }),
       );
       act(() => {
-        result.current.replaceRange(0, 5, 0, 3, 'fail'); // startCol > endCol in same line
+        result.current.replaceRange(0, 5, 0, 3, "fail"); // startCol > endCol in same line
       });
 
-      expect(getBufferState(result).text).toBe('test');
+      expect(getBufferState(result).text).toBe("test");
 
       act(() => {
-        result.current.replaceRange(1, 0, 0, 0, 'fail'); // startRow > endRow
+        result.current.replaceRange(1, 0, 0, 0, "fail"); // startRow > endRow
       });
-      expect(getBufferState(result).text).toBe('test');
+      expect(getBufferState(result).text).toBe("test");
     });
 
-    it('replaceRange: multiple lines with a single character', () => {
+    it("replaceRange: multiple lines with a single character", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'first\nsecond\nthird',
+          initialText: "first\nsecond\nthird",
           viewport,
           isValidPath: () => false,
         }),
       );
-      act(() => result.current.replaceRange(0, 2, 2, 3, 'X')); // Replace 'rst\nsecond\nthi'
+      act(() => result.current.replaceRange(0, 2, 2, 3, "X")); // Replace 'rst\nsecond\nthi'
       const state = getBufferState(result);
-      expect(state.text).toBe('fiXrd');
+      expect(state.text).toBe("fiXrd");
       expect(state.cursor).toEqual([0, 3]); // After 'X'
     });
 
-    it('should replace a single-line range with multi-line text', () => {
+    it("should replace a single-line range with multi-line text", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'one two three',
+          initialText: "one two three",
           viewport,
           isValidPath: () => false,
         }),
       );
       // Replace "two" with "new\nline"
-      act(() => result.current.replaceRange(0, 4, 0, 7, 'new\nline'));
+      act(() => result.current.replaceRange(0, 4, 0, 7, "new\nline"));
       const state = getBufferState(result);
-      expect(state.lines).toEqual(['one new', 'line three']);
-      expect(state.text).toBe('one new\nline three');
+      expect(state.lines).toEqual(["one new", "line three"]);
+      expect(state.text).toBe("one new\nline three");
       expect(state.cursor).toEqual([1, 4]); // cursor after 'line'
     });
   });
 
-  describe('Input Sanitization', () => {
+  describe("Input Sanitization", () => {
     const createInput = (sequence: string) => ({
-      name: '',
+      name: "",
       ctrl: false,
       meta: false,
       shift: false,
@@ -1457,55 +1392,48 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
 
     it.each([
       {
-        input: '\x1B[31mHello\x1B[0m \x1B[32mWorld\x1B[0m',
-        expected: 'Hello World',
-        desc: 'ANSI escape codes',
+        input: "\x1B[31mHello\x1B[0m \x1B[32mWorld\x1B[0m",
+        expected: "Hello World",
+        desc: "ANSI escape codes",
       },
       {
-        input: 'H\x07e\x08l\x0Bl\x0Co',
-        expected: 'Hello',
-        desc: 'control characters',
+        input: "H\x07e\x08l\x0Bl\x0Co",
+        expected: "Hello",
+        desc: "control characters",
       },
       {
-        input: '\u001B[4mH\u001B[0mello',
-        expected: 'Hello',
-        desc: 'mixed ANSI and control characters',
+        input: "\u001B[4mH\u001B[0mello",
+        expected: "Hello",
+        desc: "mixed ANSI and control characters",
       },
       {
-        input: '\u001B[4mPasted\u001B[4m Text',
-        expected: 'Pasted Text',
-        desc: 'pasted text with ANSI',
+        input: "\u001B[4mPasted\u001B[4m Text",
+        expected: "Pasted Text",
+        desc: "pasted text with ANSI",
       },
-    ])('should strip $desc from input', ({ input, expected }) => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+    ])("should strip $desc from input", ({ input, expected }) => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       act(() => result.current.handleInput(createInput(input)));
       expect(getBufferState(result).text).toBe(expected);
     });
 
-    it('should not strip standard characters or newlines', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      const validText = 'Hello World\nThis is a test.';
+    it("should not strip standard characters or newlines", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      const validText = "Hello World\nThis is a test.";
       act(() => result.current.handleInput(createInput(validText)));
       expect(getBufferState(result).text).toBe(validText);
     });
 
-    it('should sanitize large text (>5000 chars) and strip unsafe characters', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      const unsafeChars = '\x07\x08\x0B\x0C';
-      const largeTextWithUnsafe =
-        'safe text'.repeat(600) + unsafeChars + 'more safe text';
+    it("should sanitize large text (>5000 chars) and strip unsafe characters", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      const unsafeChars = "\x07\x08\x0B\x0C";
+      const largeTextWithUnsafe = "safe text".repeat(600) + unsafeChars + "more safe text";
 
       expect(largeTextWithUnsafe.length).toBeGreaterThan(5000);
 
       act(() =>
         result.current.handleInput({
-          name: '',
+          name: "",
           ctrl: false,
           meta: false,
           shift: false,
@@ -1516,31 +1444,29 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
       );
 
       const resultText = getBufferState(result).text;
-      expect(resultText).not.toContain('\x07');
-      expect(resultText).not.toContain('\x08');
-      expect(resultText).not.toContain('\x0B');
-      expect(resultText).not.toContain('\x0C');
-      expect(resultText).toContain('safe text');
-      expect(resultText).toContain('more safe text');
+      expect(resultText).not.toContain("\x07");
+      expect(resultText).not.toContain("\x08");
+      expect(resultText).not.toContain("\x0B");
+      expect(resultText).not.toContain("\x0C");
+      expect(resultText).toContain("safe text");
+      expect(resultText).toContain("more safe text");
     });
 
-    it('should sanitize large ANSI text (>5000 chars) and strip escape codes', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
+    it("should sanitize large ANSI text (>5000 chars) and strip escape codes", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
       const largeTextWithAnsi =
-        '\x1B[31m' +
-        'red text'.repeat(800) +
-        '\x1B[0m' +
-        '\x1B[32m' +
-        'green text'.repeat(200) +
-        '\x1B[0m';
+        "\x1B[31m" +
+        "red text".repeat(800) +
+        "\x1B[0m" +
+        "\x1B[32m" +
+        "green text".repeat(200) +
+        "\x1B[0m";
 
       expect(largeTextWithAnsi.length).toBeGreaterThan(5000);
 
       act(() =>
         result.current.handleInput({
-          name: '',
+          name: "",
           ctrl: false,
           meta: false,
           shift: false,
@@ -1551,21 +1477,19 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
       );
 
       const resultText = getBufferState(result).text;
-      expect(resultText).not.toContain('\x1B[31m');
-      expect(resultText).not.toContain('\x1B[32m');
-      expect(resultText).not.toContain('\x1B[0m');
-      expect(resultText).toContain('red text');
-      expect(resultText).toContain('green text');
+      expect(resultText).not.toContain("\x1B[31m");
+      expect(resultText).not.toContain("\x1B[32m");
+      expect(resultText).not.toContain("\x1B[0m");
+      expect(resultText).toContain("red text");
+      expect(resultText).toContain("green text");
     });
 
-    it('should not strip popular emojis', () => {
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath: () => false }),
-      );
-      const emojis = '🐍🐳🦀🦄';
+    it("should not strip popular emojis", () => {
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath: () => false }));
+      const emojis = "🐍🐳🦀🦄";
       act(() =>
         result.current.handleInput({
-          name: '',
+          name: "",
           ctrl: false,
           meta: false,
           shift: false,
@@ -1578,34 +1502,34 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
     });
   });
 
-  describe('inputFilter', () => {
-    it('should filter input based on the provided filter function', () => {
+  describe("inputFilter", () => {
+    it("should filter input based on the provided filter function", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
           isValidPath: () => false,
-          inputFilter: (text) => text.replace(/[^0-9]/g, ''),
+          inputFilter: (text) => text.replace(/[^0-9]/g, ""),
         }),
       );
 
-      act(() => result.current.insert('a1b2c3'));
-      expect(getBufferState(result).text).toBe('123');
+      act(() => result.current.insert("a1b2c3"));
+      expect(getBufferState(result).text).toBe("123");
     });
 
-    it('should handle empty result from filter', () => {
+    it("should handle empty result from filter", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
           isValidPath: () => false,
-          inputFilter: (text) => text.replace(/[^0-9]/g, ''),
+          inputFilter: (text) => text.replace(/[^0-9]/g, ""),
         }),
       );
 
-      act(() => result.current.insert('abc'));
-      expect(getBufferState(result).text).toBe('');
+      act(() => result.current.insert("abc"));
+      expect(getBufferState(result).text).toBe("");
     });
 
-    it('should filter pasted text', () => {
+    it("should filter pasted text", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -1614,11 +1538,11 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
         }),
       );
 
-      act(() => result.current.insert('hello', { paste: true }));
-      expect(getBufferState(result).text).toBe('HELLO');
+      act(() => result.current.insert("hello", { paste: true }));
+      expect(getBufferState(result).text).toBe("HELLO");
     });
 
-    it('should not filter newlines if they are allowed by the filter', () => {
+    it("should not filter newlines if they are allowed by the filter", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -1627,55 +1551,53 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
         }),
       );
 
-      act(() => result.current.insert('a\nb'));
+      act(() => result.current.insert("a\nb"));
       // The insert function splits by newline and inserts separately if it detects them.
       // If the filter allows them, they should be handled correctly by the subsequent logic in insert.
-      expect(getBufferState(result).text).toBe('a\nb');
+      expect(getBufferState(result).text).toBe("a\nb");
     });
 
-    it('should filter before newline check in insert', () => {
+    it("should filter before newline check in insert", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
           isValidPath: () => false,
-          inputFilter: (text) => text.replace(/\n/g, ''), // Filter out newlines
+          inputFilter: (text) => text.replace(/\n/g, ""), // Filter out newlines
         }),
       );
 
-      act(() => result.current.insert('a\nb'));
-      expect(getBufferState(result).text).toBe('ab');
+      act(() => result.current.insert("a\nb"));
+      expect(getBufferState(result).text).toBe("ab");
     });
   });
 
-  describe('stripAnsi', () => {
-    it('should correctly strip ANSI escape codes', () => {
-      const textWithAnsi = '\x1B[31mHello\x1B[0m World';
-      expect(stripAnsi(textWithAnsi)).toBe('Hello World');
+  describe("stripAnsi", () => {
+    it("should correctly strip ANSI escape codes", () => {
+      const textWithAnsi = "\x1B[31mHello\x1B[0m World";
+      expect(stripAnsi(textWithAnsi)).toBe("Hello World");
     });
 
-    it('should handle multiple ANSI codes', () => {
-      const textWithMultipleAnsi = '\x1B[1m\x1B[34mBold Blue\x1B[0m Text';
-      expect(stripAnsi(textWithMultipleAnsi)).toBe('Bold Blue Text');
+    it("should handle multiple ANSI codes", () => {
+      const textWithMultipleAnsi = "\x1B[1m\x1B[34mBold Blue\x1B[0m Text";
+      expect(stripAnsi(textWithMultipleAnsi)).toBe("Bold Blue Text");
     });
 
-    it('should not modify text without ANSI codes', () => {
-      const plainText = 'Plain text';
-      expect(stripAnsi(plainText)).toBe('Plain text');
+    it("should not modify text without ANSI codes", () => {
+      const plainText = "Plain text";
+      expect(stripAnsi(plainText)).toBe("Plain text");
     });
 
-    it('should handle empty string', () => {
-      expect(stripAnsi('')).toBe('');
+    it("should handle empty string", () => {
+      expect(stripAnsi("")).toBe("");
     });
   });
 
-  describe('Memoization', () => {
-    it('should keep action references stable across re-renders', () => {
+  describe("Memoization", () => {
+    it("should keep action references stable across re-renders", () => {
       // We pass a stable `isValidPath` so that callbacks that depend on it
       // are not recreated on every render.
       const isValidPath = () => false;
-      const { result, rerender } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath }),
-      );
+      const { result, rerender } = renderHook(() => useTextBuffer({ viewport, isValidPath }));
 
       const initialInsert = result.current.insert;
       const initialBackspace = result.current.backspace;
@@ -1690,33 +1612,31 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
       expect(result.current.handleInput).toBe(initialHandleInput);
     });
 
-    it('should have memoized actions that operate on the latest state', () => {
+    it("should have memoized actions that operate on the latest state", () => {
       const isValidPath = () => false;
-      const { result } = renderHook(() =>
-        useTextBuffer({ viewport, isValidPath }),
-      );
+      const { result } = renderHook(() => useTextBuffer({ viewport, isValidPath }));
 
       // Store a reference to the memoized insert function.
       const memoizedInsert = result.current.insert;
 
       // Update the buffer state.
       act(() => {
-        result.current.insert('hello');
+        result.current.insert("hello");
       });
-      expect(getBufferState(result).text).toBe('hello');
+      expect(getBufferState(result).text).toBe("hello");
 
       // Now, call the original memoized function reference.
       act(() => {
-        memoizedInsert(' world');
+        memoizedInsert(" world");
       });
 
       // It should have operated on the updated state.
-      expect(getBufferState(result).text).toBe('hello world');
+      expect(getBufferState(result).text).toBe("hello world");
     });
   });
 
-  describe('singleLine mode', () => {
-    it('should not insert a newline character when singleLine is true', () => {
+  describe("singleLine mode", () => {
+    it("should not insert a newline character when singleLine is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -1724,26 +1644,26 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
           singleLine: true,
         }),
       );
-      act(() => result.current.insert('\n'));
+      act(() => result.current.insert("\n"));
       const state = getBufferState(result);
-      expect(state.text).toBe('');
-      expect(state.lines).toEqual(['']);
+      expect(state.text).toBe("");
+      expect(state.lines).toEqual([""]);
     });
 
-    it('should not create a new line when newline() is called and singleLine is true', () => {
+    it("should not create a new line when newline() is called and singleLine is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'ab',
+          initialText: "ab",
           viewport,
           isValidPath: () => false,
           singleLine: true,
         }),
       );
-      act(() => result.current.move('end')); // cursor at [0,2]
+      act(() => result.current.move("end")); // cursor at [0,2]
       act(() => result.current.newline());
       const state = getBufferState(result);
-      expect(state.text).toBe('ab');
-      expect(state.lines).toEqual(['ab']);
+      expect(state.text).toBe("ab");
+      expect(state.lines).toEqual(["ab"]);
       expect(state.cursor).toEqual([0, 2]);
     });
 
@@ -1757,19 +1677,19 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
       );
       act(() =>
         result.current.handleInput({
-          name: 'return',
+          name: "return",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: true,
-          sequence: '\r',
+          sequence: "\r",
         }),
       );
-      expect(getBufferState(result).lines).toEqual(['']);
+      expect(getBufferState(result).lines).toEqual([""]);
     });
 
-    it('should not print anything for function keys when singleLine is true', () => {
+    it("should not print anything for function keys when singleLine is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -1779,19 +1699,19 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
       );
       act(() =>
         result.current.handleInput({
-          name: 'f1',
+          name: "f1",
           ctrl: false,
           meta: false,
           shift: false,
           paste: false,
           insertable: false,
-          sequence: '\u001bOP',
+          sequence: "\u001bOP",
         }),
       );
-      expect(getBufferState(result).lines).toEqual(['']);
+      expect(getBufferState(result).lines).toEqual([""]);
     });
 
-    it('should strip newlines from pasted text when singleLine is true', () => {
+    it("should strip newlines from pasted text when singleLine is true", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
           viewport,
@@ -1799,176 +1719,173 @@ Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots
           singleLine: true,
         }),
       );
-      act(() => result.current.insert('hello\nworld', { paste: true }));
+      act(() => result.current.insert("hello\nworld", { paste: true }));
       const state = getBufferState(result);
-      expect(state.text).toBe('helloworld');
-      expect(state.lines).toEqual(['helloworld']);
+      expect(state.text).toBe("helloworld");
+      expect(state.lines).toEqual(["helloworld"]);
     });
   });
 });
 
-describe('offsetToLogicalPos', () => {
+describe("offsetToLogicalPos", () => {
   it.each([
-    { text: 'any text', offset: 0, expected: [0, 0], desc: 'offset 0' },
-    { text: 'hello', offset: 0, expected: [0, 0], desc: 'single line start' },
-    { text: 'hello', offset: 2, expected: [0, 2], desc: 'single line middle' },
-    { text: 'hello', offset: 5, expected: [0, 5], desc: 'single line end' },
-    { text: 'hello', offset: 10, expected: [0, 5], desc: 'beyond end clamps' },
+    { text: "any text", offset: 0, expected: [0, 0], desc: "offset 0" },
+    { text: "hello", offset: 0, expected: [0, 0], desc: "single line start" },
+    { text: "hello", offset: 2, expected: [0, 2], desc: "single line middle" },
+    { text: "hello", offset: 5, expected: [0, 5], desc: "single line end" },
+    { text: "hello", offset: 10, expected: [0, 5], desc: "beyond end clamps" },
     {
-      text: 'a\n\nc',
+      text: "a\n\nc",
       offset: 0,
       expected: [0, 0],
-      desc: 'empty lines - first char',
+      desc: "empty lines - first char",
     },
     {
-      text: 'a\n\nc',
+      text: "a\n\nc",
       offset: 1,
       expected: [0, 1],
-      desc: 'empty lines - end of first',
+      desc: "empty lines - end of first",
     },
     {
-      text: 'a\n\nc',
+      text: "a\n\nc",
       offset: 2,
       expected: [1, 0],
-      desc: 'empty lines - empty line',
+      desc: "empty lines - empty line",
     },
     {
-      text: 'a\n\nc',
+      text: "a\n\nc",
       offset: 3,
       expected: [2, 0],
-      desc: 'empty lines - last line start',
+      desc: "empty lines - last line start",
     },
     {
-      text: 'a\n\nc',
+      text: "a\n\nc",
       offset: 4,
       expected: [2, 1],
-      desc: 'empty lines - last line end',
+      desc: "empty lines - last line end",
     },
     {
-      text: 'hello\n',
+      text: "hello\n",
       offset: 5,
       expected: [0, 5],
-      desc: 'newline end - before newline',
+      desc: "newline end - before newline",
     },
     {
-      text: 'hello\n',
+      text: "hello\n",
       offset: 6,
       expected: [1, 0],
-      desc: 'newline end - after newline',
+      desc: "newline end - after newline",
     },
     {
-      text: 'hello\n',
+      text: "hello\n",
       offset: 7,
       expected: [1, 0],
-      desc: 'newline end - beyond',
+      desc: "newline end - beyond",
     },
     {
-      text: '\nhello',
+      text: "\nhello",
       offset: 0,
       expected: [0, 0],
-      desc: 'newline start - first line',
+      desc: "newline start - first line",
     },
     {
-      text: '\nhello',
+      text: "\nhello",
       offset: 1,
       expected: [1, 0],
-      desc: 'newline start - second line',
+      desc: "newline start - second line",
     },
     {
-      text: '\nhello',
+      text: "\nhello",
       offset: 3,
       expected: [1, 2],
-      desc: 'newline start - middle of second',
+      desc: "newline start - middle of second",
     },
-    { text: '', offset: 0, expected: [0, 0], desc: 'empty string at 0' },
-    { text: '', offset: 5, expected: [0, 0], desc: 'empty string beyond' },
+    { text: "", offset: 0, expected: [0, 0], desc: "empty string at 0" },
+    { text: "", offset: 5, expected: [0, 0], desc: "empty string beyond" },
     {
-      text: '你好\n世界',
+      text: "你好\n世界",
       offset: 0,
       expected: [0, 0],
-      desc: 'unicode - start',
+      desc: "unicode - start",
     },
     {
-      text: '你好\n世界',
+      text: "你好\n世界",
       offset: 1,
       expected: [0, 1],
-      desc: 'unicode - after first char',
+      desc: "unicode - after first char",
     },
     {
-      text: '你好\n世界',
+      text: "你好\n世界",
       offset: 2,
       expected: [0, 2],
-      desc: 'unicode - end first line',
+      desc: "unicode - end first line",
     },
     {
-      text: '你好\n世界',
+      text: "你好\n世界",
       offset: 3,
       expected: [1, 0],
-      desc: 'unicode - second line start',
+      desc: "unicode - second line start",
     },
     {
-      text: '你好\n世界',
+      text: "你好\n世界",
       offset: 4,
       expected: [1, 1],
-      desc: 'unicode - second line middle',
+      desc: "unicode - second line middle",
     },
     {
-      text: '你好\n世界',
+      text: "你好\n世界",
       offset: 5,
       expected: [1, 2],
-      desc: 'unicode - second line end',
+      desc: "unicode - second line end",
     },
     {
-      text: '你好\n世界',
+      text: "你好\n世界",
       offset: 6,
       expected: [1, 2],
-      desc: 'unicode - beyond',
+      desc: "unicode - beyond",
     },
     {
-      text: 'abc\ndef',
+      text: "abc\ndef",
       offset: 3,
       expected: [0, 3],
-      desc: 'at newline - end of line',
+      desc: "at newline - end of line",
     },
     {
-      text: 'abc\ndef',
+      text: "abc\ndef",
       offset: 4,
       expected: [1, 0],
-      desc: 'at newline - after newline',
+      desc: "at newline - after newline",
     },
-    { text: '🐶🐱', offset: 0, expected: [0, 0], desc: 'emoji - start' },
-    { text: '🐶🐱', offset: 1, expected: [0, 1], desc: 'emoji - middle' },
-    { text: '🐶🐱', offset: 2, expected: [0, 2], desc: 'emoji - end' },
-  ])('should handle $desc', ({ text, offset, expected }) => {
+    { text: "🐶🐱", offset: 0, expected: [0, 0], desc: "emoji - start" },
+    { text: "🐶🐱", offset: 1, expected: [0, 1], desc: "emoji - middle" },
+    { text: "🐶🐱", offset: 2, expected: [0, 2], desc: "emoji - end" },
+  ])("should handle $desc", ({ text, offset, expected }) => {
     expect(offsetToLogicalPos(text, offset)).toEqual(expected);
   });
 
-  describe('multi-line text', () => {
-    const text = 'hello\nworld\n123';
+  describe("multi-line text", () => {
+    const text = "hello\nworld\n123";
 
     it.each([
-      { offset: 0, expected: [0, 0], desc: 'start of first line' },
-      { offset: 3, expected: [0, 3], desc: 'middle of first line' },
-      { offset: 5, expected: [0, 5], desc: 'end of first line' },
-      { offset: 6, expected: [1, 0], desc: 'start of second line' },
-      { offset: 8, expected: [1, 2], desc: 'middle of second line' },
-      { offset: 11, expected: [1, 5], desc: 'end of second line' },
-      { offset: 12, expected: [2, 0], desc: 'start of third line' },
-      { offset: 13, expected: [2, 1], desc: 'middle of third line' },
-      { offset: 15, expected: [2, 3], desc: 'end of third line' },
-      { offset: 20, expected: [2, 3], desc: 'beyond end' },
-    ])(
-      'should return $expected for $desc (offset $offset)',
-      ({ offset, expected }) => {
-        expect(offsetToLogicalPos(text, offset)).toEqual(expected);
-      },
-    );
+      { offset: 0, expected: [0, 0], desc: "start of first line" },
+      { offset: 3, expected: [0, 3], desc: "middle of first line" },
+      { offset: 5, expected: [0, 5], desc: "end of first line" },
+      { offset: 6, expected: [1, 0], desc: "start of second line" },
+      { offset: 8, expected: [1, 2], desc: "middle of second line" },
+      { offset: 11, expected: [1, 5], desc: "end of second line" },
+      { offset: 12, expected: [2, 0], desc: "start of third line" },
+      { offset: 13, expected: [2, 1], desc: "middle of third line" },
+      { offset: 15, expected: [2, 3], desc: "end of third line" },
+      { offset: 20, expected: [2, 3], desc: "beyond end" },
+    ])("should return $expected for $desc (offset $offset)", ({ offset, expected }) => {
+      expect(offsetToLogicalPos(text, offset)).toEqual(expected);
+    });
   });
 });
 
-describe('logicalPosToOffset', () => {
-  it('should convert row/col position to offset correctly', () => {
-    const lines = ['hello', 'world', '123'];
+describe("logicalPosToOffset", () => {
+  it("should convert row/col position to offset correctly", () => {
+    const lines = ["hello", "world", "123"];
 
     // Line 0: "hello" (5 chars)
     expect(logicalPosToOffset(lines, 0, 0)).toBe(0); // Start of 'hello'
@@ -1986,8 +1903,8 @@ describe('logicalPosToOffset', () => {
     expect(logicalPosToOffset(lines, 2, 3)).toBe(15); // End of '123'
   });
 
-  it('should handle empty lines', () => {
-    const lines = ['a', '', 'c'];
+  it("should handle empty lines", () => {
+    const lines = ["a", "", "c"];
 
     expect(logicalPosToOffset(lines, 0, 0)).toBe(0); // 'a'
     expect(logicalPosToOffset(lines, 0, 1)).toBe(1); // End of 'a'
@@ -1996,15 +1913,15 @@ describe('logicalPosToOffset', () => {
     expect(logicalPosToOffset(lines, 2, 1)).toBe(4); // End of 'c'
   });
 
-  it('should handle single empty line', () => {
-    const lines = [''];
+  it("should handle single empty line", () => {
+    const lines = [""];
 
     expect(logicalPosToOffset(lines, 0, 0)).toBe(0);
   });
 
-  it('should be inverse of offsetToLogicalPos', () => {
-    const lines = ['hello', 'world', '123'];
-    const text = lines.join('\n');
+  it("should be inverse of offsetToLogicalPos", () => {
+    const lines = ["hello", "world", "123"];
+    const text = lines.join("\n");
 
     // Test round-trip conversion
     for (let offset = 0; offset <= text.length; offset++) {
@@ -2014,8 +1931,8 @@ describe('logicalPosToOffset', () => {
     }
   });
 
-  it('should handle out-of-bounds positions', () => {
-    const lines = ['hello'];
+  it("should handle out-of-bounds positions", () => {
+    const lines = ["hello"];
 
     // Beyond end of line
     expect(logicalPosToOffset(lines, 0, 10)).toBe(5); // Clamps to end of line
@@ -2032,29 +1949,29 @@ const createTestState = (
   cursorCol: number,
   viewportWidth = 80,
 ): TextBufferState => {
-  const text = lines.join('\n');
+  const text = lines.join("\n");
   let state = textBufferReducer(initialState, {
-    type: 'set_text',
+    type: "set_text",
     payload: text,
   });
   state = textBufferReducer(state, {
-    type: 'set_cursor',
+    type: "set_cursor",
     payload: { cursorRow, cursorCol, preferredCol: null },
   });
   state = textBufferReducer(state, {
-    type: 'set_viewport',
+    type: "set_viewport",
     payload: { width: viewportWidth, height: 24 },
   });
   return state;
 };
 
-describe('textBufferReducer vim operations', () => {
-  describe('vim_delete_line', () => {
-    it('should delete a single line including newline in multi-line text', () => {
-      const state = createTestState(['line1', 'line2', 'line3'], 1, 2);
+describe("textBufferReducer vim operations", () => {
+  describe("vim_delete_line", () => {
+    it("should delete a single line including newline in multi-line text", () => {
+      const state = createTestState(["line1", "line2", "line3"], 1, 2);
 
       const action: TextBufferAction = {
-        type: 'vim_delete_line',
+        type: "vim_delete_line",
         payload: { count: 1 },
       };
 
@@ -2062,16 +1979,16 @@ describe('textBufferReducer vim operations', () => {
       expect(result).toHaveOnlyValidCharacters();
 
       // After deleting line2, we should have line1 and line3, with cursor on line3 (now at index 1)
-      expect(result.lines).toEqual(['line1', 'line3']);
+      expect(result.lines).toEqual(["line1", "line3"]);
       expect(result.cursorRow).toBe(1);
       expect(result.cursorCol).toBe(0);
     });
 
-    it('should delete multiple lines when count > 1', () => {
-      const state = createTestState(['line1', 'line2', 'line3', 'line4'], 1, 0);
+    it("should delete multiple lines when count > 1", () => {
+      const state = createTestState(["line1", "line2", "line3", "line4"], 1, 0);
 
       const action: TextBufferAction = {
-        type: 'vim_delete_line',
+        type: "vim_delete_line",
         payload: { count: 2 },
       };
 
@@ -2079,16 +1996,16 @@ describe('textBufferReducer vim operations', () => {
       expect(result).toHaveOnlyValidCharacters();
 
       // Should delete line2 and line3, leaving line1 and line4
-      expect(result.lines).toEqual(['line1', 'line4']);
+      expect(result.lines).toEqual(["line1", "line4"]);
       expect(result.cursorRow).toBe(1);
       expect(result.cursorCol).toBe(0);
     });
 
-    it('should clear single line content when only one line exists', () => {
-      const state = createTestState(['only line'], 0, 5);
+    it("should clear single line content when only one line exists", () => {
+      const state = createTestState(["only line"], 0, 5);
 
       const action: TextBufferAction = {
-        type: 'vim_delete_line',
+        type: "vim_delete_line",
         payload: { count: 1 },
       };
 
@@ -2096,16 +2013,16 @@ describe('textBufferReducer vim operations', () => {
       expect(result).toHaveOnlyValidCharacters();
 
       // Should clear the line content but keep the line
-      expect(result.lines).toEqual(['']);
+      expect(result.lines).toEqual([""]);
       expect(result.cursorRow).toBe(0);
       expect(result.cursorCol).toBe(0);
     });
 
-    it('should handle deleting the last line properly', () => {
-      const state = createTestState(['line1', 'line2'], 1, 0);
+    it("should handle deleting the last line properly", () => {
+      const state = createTestState(["line1", "line2"], 1, 0);
 
       const action: TextBufferAction = {
-        type: 'vim_delete_line',
+        type: "vim_delete_line",
         payload: { count: 1 },
       };
 
@@ -2113,17 +2030,17 @@ describe('textBufferReducer vim operations', () => {
       expect(result).toHaveOnlyValidCharacters();
 
       // Should delete the last line completely, not leave empty line
-      expect(result.lines).toEqual(['line1']);
+      expect(result.lines).toEqual(["line1"]);
       expect(result.cursorRow).toBe(0);
       expect(result.cursorCol).toBe(0);
     });
 
-    it('should handle deleting all lines and maintain valid state for subsequent paste', () => {
-      const state = createTestState(['line1', 'line2', 'line3', 'line4'], 0, 0);
+    it("should handle deleting all lines and maintain valid state for subsequent paste", () => {
+      const state = createTestState(["line1", "line2", "line3", "line4"], 0, 0);
 
       // Delete all 4 lines with 4dd
       const deleteAction: TextBufferAction = {
-        type: 'vim_delete_line',
+        type: "vim_delete_line",
         payload: { count: 4 },
       };
 
@@ -2131,124 +2048,124 @@ describe('textBufferReducer vim operations', () => {
       expect(afterDelete).toHaveOnlyValidCharacters();
 
       // After deleting all lines, should have one empty line
-      expect(afterDelete.lines).toEqual(['']);
+      expect(afterDelete.lines).toEqual([""]);
       expect(afterDelete.cursorRow).toBe(0);
       expect(afterDelete.cursorCol).toBe(0);
 
       // Now paste multiline content - this should work correctly
       const pasteAction: TextBufferAction = {
-        type: 'insert',
-        payload: 'new1\nnew2\nnew3\nnew4',
+        type: "insert",
+        payload: "new1\nnew2\nnew3\nnew4",
       };
 
       const afterPaste = textBufferReducer(afterDelete, pasteAction);
       expect(afterPaste).toHaveOnlyValidCharacters();
 
       // All lines including the first one should be present
-      expect(afterPaste.lines).toEqual(['new1', 'new2', 'new3', 'new4']);
+      expect(afterPaste.lines).toEqual(["new1", "new2", "new3", "new4"]);
       expect(afterPaste.cursorRow).toBe(3);
       expect(afterPaste.cursorCol).toBe(4);
     });
   });
 });
 
-describe('Unicode helper functions', () => {
-  describe('findWordEndInLine with Unicode', () => {
-    it('should handle combining characters', () => {
+describe("Unicode helper functions", () => {
+  describe("findWordEndInLine with Unicode", () => {
+    it("should handle combining characters", () => {
       // café with combining accent
-      const cafeWithCombining = 'cafe\u0301';
-      const result = findWordEndInLine(cafeWithCombining + ' test', 0);
+      const cafeWithCombining = "cafe\u0301";
+      const result = findWordEndInLine(cafeWithCombining + " test", 0);
       expect(result).toBe(3); // End of 'café' at base character 'e', not combining accent
     });
 
-    it('should handle precomposed characters with diacritics', () => {
+    it("should handle precomposed characters with diacritics", () => {
       // café with precomposed é (U+00E9)
-      const cafePrecomposed = 'café';
-      const result = findWordEndInLine(cafePrecomposed + ' test', 0);
+      const cafePrecomposed = "café";
+      const result = findWordEndInLine(cafePrecomposed + " test", 0);
       expect(result).toBe(3); // End of 'café' at precomposed character 'é'
     });
 
-    it('should return null when no word end found', () => {
-      const result = findWordEndInLine('   ', 0);
+    it("should return null when no word end found", () => {
+      const result = findWordEndInLine("   ", 0);
       expect(result).toBeNull(); // No word end found in whitespace-only string string
     });
   });
 
-  describe('findNextWordStartInLine with Unicode', () => {
-    it('should handle right-to-left text', () => {
-      const result = findNextWordStartInLine('hello مرحبا world', 0);
+  describe("findNextWordStartInLine with Unicode", () => {
+    it("should handle right-to-left text", () => {
+      const result = findNextWordStartInLine("hello مرحبا world", 0);
       expect(result).toBe(6); // Start of Arabic word
     });
 
-    it('should handle Chinese characters', () => {
-      const result = findNextWordStartInLine('hello 你好 world', 0);
+    it("should handle Chinese characters", () => {
+      const result = findNextWordStartInLine("hello 你好 world", 0);
       expect(result).toBe(6); // Start of Chinese word
     });
 
-    it('should return null at end of line', () => {
-      const result = findNextWordStartInLine('hello', 10);
+    it("should return null at end of line", () => {
+      const result = findNextWordStartInLine("hello", 10);
       expect(result).toBeNull();
     });
 
-    it('should handle combining characters', () => {
+    it("should handle combining characters", () => {
       // café with combining accent + next word
-      const textWithCombining = 'cafe\u0301 test';
+      const textWithCombining = "cafe\u0301 test";
       const result = findNextWordStartInLine(textWithCombining, 0);
       expect(result).toBe(6); // Start of 'test' after 'café ' (combining char makes string longer)
     });
 
-    it('should handle precomposed characters with diacritics', () => {
+    it("should handle precomposed characters with diacritics", () => {
       // café with precomposed é + next word
-      const textPrecomposed = 'café test';
+      const textPrecomposed = "café test";
       const result = findNextWordStartInLine(textPrecomposed, 0);
       expect(result).toBe(5); // Start of 'test' after 'café '
     });
   });
 
-  describe('isWordCharStrict with Unicode', () => {
-    it('should return true for ASCII word characters', () => {
-      expect(isWordCharStrict('a')).toBe(true);
-      expect(isWordCharStrict('Z')).toBe(true);
-      expect(isWordCharStrict('0')).toBe(true);
-      expect(isWordCharStrict('_')).toBe(true);
+  describe("isWordCharStrict with Unicode", () => {
+    it("should return true for ASCII word characters", () => {
+      expect(isWordCharStrict("a")).toBe(true);
+      expect(isWordCharStrict("Z")).toBe(true);
+      expect(isWordCharStrict("0")).toBe(true);
+      expect(isWordCharStrict("_")).toBe(true);
     });
 
-    it('should return false for punctuation', () => {
-      expect(isWordCharStrict('.')).toBe(false);
-      expect(isWordCharStrict(',')).toBe(false);
-      expect(isWordCharStrict('!')).toBe(false);
+    it("should return false for punctuation", () => {
+      expect(isWordCharStrict(".")).toBe(false);
+      expect(isWordCharStrict(",")).toBe(false);
+      expect(isWordCharStrict("!")).toBe(false);
     });
 
-    it('should return true for non-Latin scripts', () => {
-      expect(isWordCharStrict('你')).toBe(true); // Chinese character
-      expect(isWordCharStrict('م')).toBe(true); // Arabic character
+    it("should return true for non-Latin scripts", () => {
+      expect(isWordCharStrict("你")).toBe(true); // Chinese character
+      expect(isWordCharStrict("م")).toBe(true); // Arabic character
     });
 
-    it('should return false for whitespace', () => {
-      expect(isWordCharStrict(' ')).toBe(false);
-      expect(isWordCharStrict('\t')).toBe(false);
+    it("should return false for whitespace", () => {
+      expect(isWordCharStrict(" ")).toBe(false);
+      expect(isWordCharStrict("\t")).toBe(false);
     });
   });
 
-  describe('cpLen with Unicode', () => {
-    it('should handle combining characters', () => {
-      expect(cpLen('é')).toBe(1); // Precomposed
-      expect(cpLen('e\u0301')).toBe(2); // e + combining acute
+  describe("cpLen with Unicode", () => {
+    it("should handle combining characters", () => {
+      expect(cpLen("é")).toBe(1); // Precomposed
+      expect(cpLen("e\u0301")).toBe(2); // e + combining acute
     });
 
-    it('should handle Chinese and Arabic text', () => {
-      expect(cpLen('hello 你好 world')).toBe(14); // 5 + 1 + 2 + 1 + 5 = 14
-      expect(cpLen('hello مرحبا world')).toBe(17);
+    it("should handle Chinese and Arabic text", () => {
+      expect(cpLen("hello 你好 world")).toBe(14); // 5 + 1 + 2 + 1 + 5 = 14
+      expect(cpLen("hello مرحبا world")).toBe(17);
     });
   });
 
-  describe('useTextBuffer CJK Navigation', () => {
+  describe("useTextBuffer CJK Navigation", () => {
     const viewport = { width: 80, height: 24 };
 
-    it('should navigate by word in Chinese', () => {
+    it("should navigate by word in Chinese", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: '你好世界',
+          initialText: "你好世界",
           initialCursorOffset: 4, // End of string
           viewport,
           isValidPath: () => false,
@@ -2260,7 +2177,7 @@ describe('Unicode helper functions', () => {
 
       // Move word left
       act(() => {
-        result.current.move('wordLeft');
+        result.current.move("wordLeft");
       });
 
       // Should be at start of "世界" (index 2)
@@ -2269,7 +2186,7 @@ describe('Unicode helper functions', () => {
 
       // Move word left again
       act(() => {
-        result.current.move('wordLeft');
+        result.current.move("wordLeft");
       });
 
       // Should be at start of "你好" (index 0)
@@ -2277,13 +2194,13 @@ describe('Unicode helper functions', () => {
 
       // Move word left again (should stay at 0)
       act(() => {
-        result.current.move('wordLeft');
+        result.current.move("wordLeft");
       });
       expect(result.current.cursor[1]).toBe(0);
 
       // Move word right
       act(() => {
-        result.current.move('wordRight');
+        result.current.move("wordRight");
       });
 
       // Should be at end of "你好" (index 2)
@@ -2291,7 +2208,7 @@ describe('Unicode helper functions', () => {
 
       // Move word right again
       act(() => {
-        result.current.move('wordRight');
+        result.current.move("wordRight");
       });
 
       // Should be at end of "世界" (index 4)
@@ -2299,15 +2216,15 @@ describe('Unicode helper functions', () => {
 
       // Move word right again (should stay at end)
       act(() => {
-        result.current.move('wordRight');
+        result.current.move("wordRight");
       });
       expect(result.current.cursor[1]).toBe(4);
     });
 
-    it('should navigate mixed English and Chinese', () => {
+    it("should navigate mixed English and Chinese", () => {
       const { result } = renderHook(() =>
         useTextBuffer({
-          initialText: 'Hello你好World',
+          initialText: "Hello你好World",
           initialCursorOffset: 10, // End
           viewport,
           isValidPath: () => false,
@@ -2319,24 +2236,24 @@ describe('Unicode helper functions', () => {
       // Let's set it to end.
 
       act(() => {
-        result.current.move('end');
+        result.current.move("end");
       });
       expect(result.current.cursor[1]).toBe(12);
 
       // wordLeft -> start of "World" (index 7)
-      act(() => result.current.move('wordLeft'));
+      act(() => result.current.move("wordLeft"));
       expect(result.current.cursor[1]).toBe(7);
 
       // wordLeft -> start of "你好" (index 5)
-      act(() => result.current.move('wordLeft'));
+      act(() => result.current.move("wordLeft"));
       expect(result.current.cursor[1]).toBe(5);
 
       // wordLeft -> start of "Hello" (index 0)
-      act(() => result.current.move('wordLeft'));
+      act(() => result.current.move("wordLeft"));
       expect(result.current.cursor[1]).toBe(0);
 
       // wordLeft -> start of line (should stay at 0)
-      act(() => result.current.move('wordLeft'));
+      act(() => result.current.move("wordLeft"));
       expect(result.current.cursor[1]).toBe(0);
     });
   });
diff --git a/packages/ui-gemini/src/ui/components/shared/text-buffer.ts b/packages/ui-gemini/src/ui/components/shared/text-buffer.ts
index 750ba915a..95ab3803e 100644
--- a/packages/ui-gemini/src/ui/components/shared/text-buffer.ts
+++ b/packages/ui-gemini/src/ui/components/shared/text-buffer.ts
@@ -4,37 +4,36 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawnSync } from 'node:child_process';
-import fs from 'node:fs';
-import os from 'node:os';
-import pathMod from 'node:path';
-import { useState, useCallback, useEffect, useMemo, useReducer } from 'react';
-import { unescapePath, coreEvents, CoreEvent } from '@airiscode/gemini-cli-core';
+import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import pathMod from "node:path";
+import { CoreEvent, coreEvents, unescapePath } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useMemo, useReducer, useState } from "react";
+import type { Key } from "../../contexts/KeypressContext.js";
+import { enableSupportedProtocol } from "../../utils/kittyProtocolDetector.js";
 import {
-  toCodePoints,
   cpLen,
   cpSlice,
-  stripUnsafeCharacters,
   getCachedStringWidth,
-} from '../../utils/textUtils.js';
-import type { Key } from '../../contexts/KeypressContext.js';
-import type { VimAction } from './vim-buffer-actions.js';
-import { handleVimAction } from './vim-buffer-actions.js';
-import { enableSupportedProtocol } from '../../utils/kittyProtocolDetector.js';
+  stripUnsafeCharacters,
+  toCodePoints,
+} from "../../utils/textUtils.js";
+import type { VimAction } from "./vim-buffer-actions.js";
+import { handleVimAction } from "./vim-buffer-actions.js";
 
 export type Direction =
-  | 'left'
-  | 'right'
-  | 'up'
-  | 'down'
-  | 'wordLeft'
-  | 'wordRight'
-  | 'home'
-  | 'end';
+  | "left"
+  | "right"
+  | "up"
+  | "down"
+  | "wordLeft"
+  | "wordRight"
+  | "home"
+  | "end";
 
 // Helper functions for line-based word navigation
-export const isWordCharStrict = (char: string): boolean =>
-  /[\w\p{L}\p{N}]/u.test(char); // Matches a single character that is any Unicode letter, any Unicode number, or an underscore
+export const isWordCharStrict = (char: string): boolean => /[\w\p{L}\p{N}]/u.test(char); // Matches a single character that is any Unicode letter, any Unicode number, or an underscore
 
 export const isWhitespace = (char: string): boolean => /\s/.test(char);
 
@@ -47,13 +46,13 @@ export const isWordCharWithCombining = (char: string): boolean =>
 
 // Get the script of a character (simplified for common scripts)
 export const getCharScript = (char: string): string => {
-  if (/[\p{Script=Latin}]/u.test(char)) return 'latin'; // All Latin script chars including diacritics
-  if (/[\p{Script=Han}]/u.test(char)) return 'han'; // Chinese
-  if (/[\p{Script=Arabic}]/u.test(char)) return 'arabic';
-  if (/[\p{Script=Hiragana}]/u.test(char)) return 'hiragana';
-  if (/[\p{Script=Katakana}]/u.test(char)) return 'katakana';
-  if (/[\p{Script=Cyrillic}]/u.test(char)) return 'cyrillic';
-  return 'other';
+  if (/[\p{Script=Latin}]/u.test(char)) return "latin"; // All Latin script chars including diacritics
+  if (/[\p{Script=Han}]/u.test(char)) return "han"; // Chinese
+  if (/[\p{Script=Arabic}]/u.test(char)) return "arabic";
+  if (/[\p{Script=Hiragana}]/u.test(char)) return "hiragana";
+  if (/[\p{Script=Katakana}]/u.test(char)) return "katakana";
+  if (/[\p{Script=Cyrillic}]/u.test(char)) return "cyrillic";
+  return "other";
 };
 
 // Check if two characters are from different scripts (indicating word boundary)
@@ -63,10 +62,7 @@ export const isDifferentScript = (char1: string, char2: string): boolean => {
 };
 
 // Find next word start within a line, starting from col
-export const findNextWordStartInLine = (
-  line: string,
-  col: number,
-): number | null => {
+export const findNextWordStartInLine = (line: string, col: number): number | null => {
   const chars = toCodePoints(line);
   let i = col;
 
@@ -89,11 +85,7 @@ export const findNextWordStartInLine = (
       i++;
     }
   } else if (!isWhitespace(currentChar)) {
-    while (
-      i < chars.length &&
-      !isWordCharStrict(chars[i]) &&
-      !isWhitespace(chars[i])
-    ) {
+    while (i < chars.length && !isWordCharStrict(chars[i]) && !isWhitespace(chars[i])) {
       i++;
     }
   }
@@ -107,10 +99,7 @@ export const findNextWordStartInLine = (
 };
 
 // Find previous word start within a line
-export const findPrevWordStartInLine = (
-  line: string,
-  col: number,
-): number | null => {
+export const findPrevWordStartInLine = (line: string, col: number): number | null => {
   const chars = toCodePoints(line);
   let i = col;
 
@@ -169,9 +158,7 @@ export const findWordEndInLine = (line: string, col: number): number | null => {
     i < chars.length &&
     !isWordCharWithCombining(chars[i]) &&
     !isWhitespace(chars[i]) &&
-    (i + 1 >= chars.length ||
-      isWhitespace(chars[i + 1]) ||
-      isWordCharWithCombining(chars[i + 1]));
+    (i + 1 >= chars.length || isWhitespace(chars[i + 1]) || isWordCharWithCombining(chars[i + 1]));
 
   if (atEndOfWordChar || atEndOfPunctuation) {
     // We're at the end of a word or punctuation sequence, move forward to find next word
@@ -221,11 +208,7 @@ export const findWordEndInLine = (line: string, col: number): number | null => {
     }
   } else if (i < chars.length && !isWhitespace(chars[i])) {
     // Handle punctuation sequences (like ████)
-    while (
-      i < chars.length &&
-      !isWordCharStrict(chars[i]) &&
-      !isWhitespace(chars[i])
-    ) {
+    while (i < chars.length && !isWordCharStrict(chars[i]) && !isWhitespace(chars[i])) {
       foundWord = true;
       lastBaseCharPos = i;
       i++;
@@ -242,12 +225,12 @@ export const findWordEndInLine = (line: string, col: number): number | null => {
 };
 
 // Initialize segmenter for word boundary detection
-const segmenter = new Intl.Segmenter(undefined, { granularity: 'word' });
+const segmenter = new Intl.Segmenter(undefined, { granularity: "word" });
 
 function findPrevWordBoundary(line: string, cursorCol: number): number {
   const codePoints = toCodePoints(line);
   // Convert cursorCol (CP index) to string index
-  const prefix = codePoints.slice(0, cursorCol).join('');
+  const prefix = codePoints.slice(0, cursorCol).join("");
   const cursorIdx = prefix.length;
 
   let targetIdx = 0;
@@ -267,7 +250,7 @@ function findPrevWordBoundary(line: string, cursorCol: number): number {
 
 function findNextWordBoundary(line: string, cursorCol: number): number {
   const codePoints = toCodePoints(line);
-  const prefix = codePoints.slice(0, cursorCol).join('');
+  const prefix = codePoints.slice(0, cursorCol).join("");
   const cursorIdx = prefix.length;
 
   let targetIdx = line.length;
@@ -294,7 +277,7 @@ export const findNextWordAcrossLines = (
   searchForWordStart: boolean,
 ): { row: number; col: number } | null => {
   // First try current line
-  const currentLine = lines[cursorRow] || '';
+  const currentLine = lines[cursorRow] || "";
   const colInCurrentLine = searchForWordStart
     ? findNextWordStartInLine(currentLine, cursorCol)
     : findWordEndInLine(currentLine, cursorCol);
@@ -305,7 +288,7 @@ export const findNextWordAcrossLines = (
 
   // Search subsequent lines
   for (let row = cursorRow + 1; row < lines.length; row++) {
-    const line = lines[row] || '';
+    const line = lines[row] || "";
     const chars = toCodePoints(line);
 
     // For empty lines, if we haven't found any words yet, return the empty line
@@ -313,7 +296,7 @@ export const findNextWordAcrossLines = (
       // Check if there are any words in remaining lines
       let hasWordsInLaterLines = false;
       for (let laterRow = row + 1; laterRow < lines.length; laterRow++) {
-        const laterLine = lines[laterRow] || '';
+        const laterLine = lines[laterRow] || "";
         const laterChars = toCodePoints(laterLine);
         let firstNonWhitespace = 0;
         while (
@@ -337,10 +320,7 @@ export const findNextWordAcrossLines = (
 
     // Find first non-whitespace
     let firstNonWhitespace = 0;
-    while (
-      firstNonWhitespace < chars.length &&
-      isWhitespace(chars[firstNonWhitespace])
-    ) {
+    while (firstNonWhitespace < chars.length && isWhitespace(chars[firstNonWhitespace])) {
       firstNonWhitespace++;
     }
 
@@ -367,7 +347,7 @@ export const findPrevWordAcrossLines = (
   cursorCol: number,
 ): { row: number; col: number } | null => {
   // First try current line
-  const currentLine = lines[cursorRow] || '';
+  const currentLine = lines[cursorRow] || "";
   const colInCurrentLine = findPrevWordStartInLine(currentLine, cursorCol);
 
   if (colInCurrentLine !== null) {
@@ -376,7 +356,7 @@ export const findPrevWordAcrossLines = (
 
   // Search previous lines
   for (let row = cursorRow - 1; row >= 0; row--) {
-    const line = lines[row] || '';
+    const line = lines[row] || "";
     const chars = toCodePoints(line);
 
     if (chars.length === 0) continue;
@@ -400,11 +380,7 @@ export const findPrevWordAcrossLines = (
 };
 
 // Helper functions for vim line operations
-export const getPositionFromOffsets = (
-  startOffset: number,
-  endOffset: number,
-  lines: string[],
-) => {
+export const getPositionFromOffsets = (startOffset: number, endOffset: number, lines: string[]) => {
   let offset = 0;
   let startRow = 0;
   let startCol = 0;
@@ -437,11 +413,7 @@ export const getPositionFromOffsets = (
   return { startRow, startCol, endRow, endCol };
 };
 
-export const getLineRangeOffsets = (
-  startRow: number,
-  lineCount: number,
-  lines: string[],
-) => {
+export const getLineRangeOffsets = (startRow: number, lineCount: number, lines: string[]) => {
   let startOffset = 0;
 
   // Calculate start offset
@@ -472,10 +444,9 @@ export const replaceRangeInternal = (
   endCol: number,
   text: string,
 ): TextBufferState => {
-  const currentLine = (row: number) => state.lines[row] || '';
+  const currentLine = (row: number) => state.lines[row] || "";
   const currentLineLen = (row: number) => cpLen(currentLine(row));
-  const clamp = (value: number, min: number, max: number) =>
-    Math.min(Math.max(value, min), max);
+  const clamp = (value: number, min: number, max: number) => Math.min(Math.max(value, min), max);
 
   if (
     startRow > endRow ||
@@ -496,10 +467,8 @@ export const replaceRangeInternal = (
   const prefix = cpSlice(currentLine(startRow), 0, sCol);
   const suffix = cpSlice(currentLine(endRow), eCol);
 
-  const normalisedReplacement = text
-    .replace(/\r\n/g, '\n')
-    .replace(/\r/g, '\n');
-  const replacementParts = normalisedReplacement.split('\n');
+  const normalisedReplacement = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  const replacementParts = normalisedReplacement.split("\n");
 
   // The combined first line of the new text
   const firstLine = prefix + replacementParts[0];
@@ -511,28 +480,18 @@ export const replaceRangeInternal = (
     // Newlines in replacement: create new lines.
     const lastLine = replacementParts[replacementParts.length - 1] + suffix;
     const middleLines = replacementParts.slice(1, -1);
-    newLines.splice(
-      startRow,
-      endRow - startRow + 1,
-      firstLine,
-      ...middleLines,
-      lastLine,
-    );
+    newLines.splice(startRow, endRow - startRow + 1, firstLine, ...middleLines, lastLine);
   }
 
   const finalCursorRow = startRow + replacementParts.length - 1;
   const finalCursorCol =
-    (replacementParts.length > 1 ? 0 : sCol) +
-    cpLen(replacementParts[replacementParts.length - 1]);
+    (replacementParts.length > 1 ? 0 : sCol) + cpLen(replacementParts[replacementParts.length - 1]);
 
   return {
     ...state,
     lines: newLines,
     cursorRow: Math.min(Math.max(finalCursorRow, 0), newLines.length - 1),
-    cursorCol: Math.max(
-      0,
-      Math.min(finalCursorCol, cpLen(newLines[finalCursorRow] || '')),
-    ),
+    cursorCol: Math.max(0, Math.min(finalCursorCol, cpLen(newLines[finalCursorRow] || ""))),
     preferredCol: null,
   };
 };
@@ -567,17 +526,13 @@ interface UndoHistoryEntry {
   cursorCol: number;
 }
 
-function calculateInitialCursorPosition(
-  initialLines: string[],
-  offset: number,
-): [number, number] {
+function calculateInitialCursorPosition(initialLines: string[], offset: number): [number, number] {
   let remainingChars = offset;
   let row = 0;
   while (row < initialLines.length) {
     const lineLength = cpLen(initialLines[row]);
     // Add 1 for the newline character (except for the last line)
-    const totalCharsInLineAndNewline =
-      lineLength + (row < initialLines.length - 1 ? 1 : 0);
+    const totalCharsInLineAndNewline = lineLength + (row < initialLines.length - 1 ? 1 : 0);
 
     if (remainingChars <= lineLength) {
       // Cursor is on this line
@@ -594,17 +549,14 @@ function calculateInitialCursorPosition(
   return [0, 0]; // Default for empty text
 }
 
-export function offsetToLogicalPos(
-  text: string,
-  offset: number,
-): [number, number] {
+export function offsetToLogicalPos(text: string, offset: number): [number, number] {
   let row = 0;
   let col = 0;
   let currentOffset = 0;
 
   if (offset === 0) return [0, 0];
 
-  const lines = text.split('\n');
+  const lines = text.split("\n");
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i];
     const lineLength = cpLen(line);
@@ -620,10 +572,7 @@ export function offsetToLogicalPos(
       row = i;
       col = lineLength; // Position cursor at the end of the current line content
       // If the offset IS the newline, and it's not the last line, advance to next line, col 0
-      if (
-        offset === currentOffset + lineLengthWithNewline &&
-        i < lines.length - 1
-      ) {
+      if (offset === currentOffset + lineLengthWithNewline && i < lines.length - 1) {
         return [i + 1, 0];
       }
       return [row, col]; // Otherwise, it's at the end of the current line content
@@ -647,11 +596,7 @@ export function offsetToLogicalPos(
  * Converts logical row/col position to absolute text offset
  * Inverse operation of offsetToLogicalPos
  */
-export function logicalPosToOffset(
-  lines: string[],
-  row: number,
-  col: number,
-): number {
+export function logicalPosToOffset(lines: string[], row: number, col: number): number {
   let offset = 0;
 
   // Clamp row to valid range
@@ -680,10 +625,7 @@ export interface VisualLayout {
 
 // Calculates the visual wrapping of lines and the mapping between logical and visual coordinates.
 // This is an expensive operation and should be memoized.
-function calculateLayout(
-  logicalLines: string[],
-  viewportWidth: number,
-): VisualLayout {
+function calculateLayout(logicalLines: string[], viewportWidth: number): VisualLayout {
   const visualLines: string[] = [];
   const logicalToVisualMap: Array<Array<[number, number]>> = [];
   const visualToLogicalMap: Array<[number, number]> = [];
@@ -694,14 +636,14 @@ function calculateLayout(
       // Handle empty logical line
       logicalToVisualMap[logIndex].push([visualLines.length, 0]);
       visualToLogicalMap.push([logIndex, 0]);
-      visualLines.push('');
+      visualLines.push("");
     } else {
       // Non-empty logical line
       let currentPosInLogLine = 0; // Tracks position within the current logical line (code point index)
       const codePointsInLogLine = toCodePoints(logLine);
 
       while (currentPosInLogLine < codePointsInLogLine.length) {
-        let currentChunk = '';
+        let currentChunk = "";
         let currentChunkVisualWidth = 0;
         let numCodePointsInChunk = 0;
         let lastWordBreakPoint = -1; // Index in codePointsInLogLine for word break
@@ -721,26 +663,17 @@ function calculateLayout(
             ) {
               // We have a valid word break point to use, and it's not the start of the current segment
               currentChunk = codePointsInLogLine
-                .slice(
-                  currentPosInLogLine,
-                  currentPosInLogLine + numCodePointsAtLastWordBreak,
-                )
-                .join('');
+                .slice(currentPosInLogLine, currentPosInLogLine + numCodePointsAtLastWordBreak)
+                .join("");
               numCodePointsInChunk = numCodePointsAtLastWordBreak;
             } else {
               // No word break, or word break is at the start of this potential chunk, or word break leads to empty chunk.
               // Hard break: take characters up to viewportWidth, or just the current char if it alone is too wide.
-              if (
-                numCodePointsInChunk === 0 &&
-                charVisualWidth > viewportWidth
-              ) {
+              if (numCodePointsInChunk === 0 && charVisualWidth > viewportWidth) {
                 // Single character is wider than viewport, take it anyway
                 currentChunk = char;
                 numCodePointsInChunk = 1;
-              } else if (
-                numCodePointsInChunk === 0 &&
-                charVisualWidth <= viewportWidth
-              ) {
+              } else if (numCodePointsInChunk === 0 && charVisualWidth <= viewportWidth) {
                 // This case should ideally be caught by the next iteration if the char fits.
                 // If it doesn't fit (because currentChunkVisualWidth was already > 0 from a previous char that filled the line),
                 // then numCodePointsInChunk would not be 0.
@@ -756,7 +689,7 @@ function calculateLayout(
           numCodePointsInChunk++;
 
           // Check for word break opportunity (space)
-          if (char === ' ') {
+          if (char === " ") {
             lastWordBreakPoint = i; // Store code point index of the space
             // Store the state *before* adding the space, if we decide to break here.
             numCodePointsAtLastWordBreak = numCodePointsInChunk - 1; // Chars *before* the space
@@ -765,10 +698,7 @@ function calculateLayout(
 
         // If the inner loop completed without breaking (i.e., remaining text fits)
         // or if the loop broke but numCodePointsInChunk is still 0 (e.g. first char too wide for empty line)
-        if (
-          numCodePointsInChunk === 0 &&
-          currentPosInLogLine < codePointsInLogLine.length
-        ) {
+        if (numCodePointsInChunk === 0 && currentPosInLogLine < codePointsInLogLine.length) {
           // This can happen if the very first character considered for a new visual line is wider than the viewport.
           // In this case, we take that single character.
           const firstChar = codePointsInLogLine[currentPosInLogLine];
@@ -778,19 +708,13 @@ function calculateLayout(
 
         // If after everything, numCodePointsInChunk is still 0 but we haven't processed the whole logical line,
         // it implies an issue, like viewportWidth being 0 or less. Avoid infinite loop.
-        if (
-          numCodePointsInChunk === 0 &&
-          currentPosInLogLine < codePointsInLogLine.length
-        ) {
+        if (numCodePointsInChunk === 0 && currentPosInLogLine < codePointsInLogLine.length) {
           // Force advance by one character to prevent infinite loop if something went wrong
           currentChunk = codePointsInLogLine[currentPosInLogLine];
           numCodePointsInChunk = 1;
         }
 
-        logicalToVisualMap[logIndex].push([
-          visualLines.length,
-          currentPosInLogLine,
-        ]);
+        logicalToVisualMap[logIndex].push([visualLines.length, currentPosInLogLine]);
         visualToLogicalMap.push([logIndex, currentPosInLogLine]);
         visualLines.push(currentChunk);
 
@@ -801,10 +725,9 @@ function calculateLayout(
         // and the character immediately following the chunk is a space,
         // advance past this space as it acted as a delimiter for word wrapping.
         if (
-          logicalStartOfThisChunk + numCodePointsInChunk <
-            codePointsInLogLine.length &&
+          logicalStartOfThisChunk + numCodePointsInChunk < codePointsInLogLine.length &&
           currentPosInLogLine < codePointsInLogLine.length && // Redundant if previous is true, but safe
-          codePointsInLogLine[currentPosInLogLine] === ' '
+          codePointsInLogLine[currentPosInLogLine] === " "
         ) {
           currentPosInLogLine++;
         }
@@ -813,12 +736,9 @@ function calculateLayout(
   });
 
   // If the entire logical text was empty, ensure there's one empty visual line.
-  if (
-    logicalLines.length === 0 ||
-    (logicalLines.length === 1 && logicalLines[0] === '')
-  ) {
+  if (logicalLines.length === 0 || (logicalLines.length === 1 && logicalLines[0] === "")) {
     if (visualLines.length === 0) {
-      visualLines.push('');
+      visualLines.push("");
       if (!logicalToVisualMap[0]) logicalToVisualMap[0] = [];
       logicalToVisualMap[0].push([0, 0]);
       visualToLogicalMap.push([0, 0]);
@@ -850,17 +770,11 @@ function calculateVisualCursorFromLayout(
 
   // Find the segment where the logical column fits.
   // The segments are sorted by startColInLogical.
-  let targetSegmentIndex = segmentsForLogicalLine.findIndex(
-    ([, startColInLogical], index) => {
-      const nextStartColInLogical =
-        index + 1 < segmentsForLogicalLine.length
-          ? segmentsForLogicalLine[index + 1][1]
-          : Infinity;
-      return (
-        logicalCol >= startColInLogical && logicalCol < nextStartColInLogical
-      );
-    },
-  );
+  let targetSegmentIndex = segmentsForLogicalLine.findIndex(([, startColInLogical], index) => {
+    const nextStartColInLogical =
+      index + 1 < segmentsForLogicalLine.length ? segmentsForLogicalLine[index + 1][1] : Infinity;
+    return logicalCol >= startColInLogical && logicalCol < nextStartColInLogical;
+  });
 
   // If not found, it means the cursor is at the end of the logical line.
   if (targetSegmentIndex === -1) {
@@ -871,15 +785,11 @@ function calculateVisualCursorFromLayout(
     }
   }
 
-  const [visualRow, startColInLogical] =
-    segmentsForLogicalLine[targetSegmentIndex];
+  const [visualRow, startColInLogical] = segmentsForLogicalLine[targetSegmentIndex];
   const visualCol = logicalCol - startColInLogical;
 
   // The visual column should not exceed the length of the visual line.
-  const clampedVisualCol = Math.min(
-    visualCol,
-    cpLen(visualLines[visualRow] ?? ''),
-  );
+  const clampedVisualCol = Math.min(visualCol, cpLen(visualLines[visualRow] ?? ""));
 
   return [visualRow, clampedVisualCol];
 }
@@ -916,32 +826,32 @@ export const pushUndo = (currentState: TextBufferState): TextBufferState => {
 };
 
 export type TextBufferAction =
-  | { type: 'set_text'; payload: string; pushToUndo?: boolean }
-  | { type: 'insert'; payload: string }
-  | { type: 'backspace' }
+  | { type: "set_text"; payload: string; pushToUndo?: boolean }
+  | { type: "insert"; payload: string }
+  | { type: "backspace" }
   | {
-      type: 'move';
+      type: "move";
       payload: {
         dir: Direction;
       };
     }
   | {
-      type: 'set_cursor';
+      type: "set_cursor";
       payload: {
         cursorRow: number;
         cursorCol: number;
         preferredCol: number | null;
       };
     }
-  | { type: 'delete' }
-  | { type: 'delete_word_left' }
-  | { type: 'delete_word_right' }
-  | { type: 'kill_line_right' }
-  | { type: 'kill_line_left' }
-  | { type: 'undo' }
-  | { type: 'redo' }
+  | { type: "delete" }
+  | { type: "delete_word_left" }
+  | { type: "delete_word_right" }
+  | { type: "kill_line_right" }
+  | { type: "kill_line_left" }
+  | { type: "undo" }
+  | { type: "redo" }
   | {
-      type: 'replace_range';
+      type: "replace_range";
       payload: {
         startRow: number;
         startCol: number;
@@ -950,45 +860,45 @@ export type TextBufferAction =
         text: string;
       };
     }
-  | { type: 'move_to_offset'; payload: { offset: number } }
-  | { type: 'create_undo_snapshot' }
-  | { type: 'set_viewport'; payload: { width: number; height: number } }
-  | { type: 'vim_delete_word_forward'; payload: { count: number } }
-  | { type: 'vim_delete_word_backward'; payload: { count: number } }
-  | { type: 'vim_delete_word_end'; payload: { count: number } }
-  | { type: 'vim_change_word_forward'; payload: { count: number } }
-  | { type: 'vim_change_word_backward'; payload: { count: number } }
-  | { type: 'vim_change_word_end'; payload: { count: number } }
-  | { type: 'vim_delete_line'; payload: { count: number } }
-  | { type: 'vim_change_line'; payload: { count: number } }
-  | { type: 'vim_delete_to_end_of_line' }
-  | { type: 'vim_change_to_end_of_line' }
+  | { type: "move_to_offset"; payload: { offset: number } }
+  | { type: "create_undo_snapshot" }
+  | { type: "set_viewport"; payload: { width: number; height: number } }
+  | { type: "vim_delete_word_forward"; payload: { count: number } }
+  | { type: "vim_delete_word_backward"; payload: { count: number } }
+  | { type: "vim_delete_word_end"; payload: { count: number } }
+  | { type: "vim_change_word_forward"; payload: { count: number } }
+  | { type: "vim_change_word_backward"; payload: { count: number } }
+  | { type: "vim_change_word_end"; payload: { count: number } }
+  | { type: "vim_delete_line"; payload: { count: number } }
+  | { type: "vim_change_line"; payload: { count: number } }
+  | { type: "vim_delete_to_end_of_line" }
+  | { type: "vim_change_to_end_of_line" }
   | {
-      type: 'vim_change_movement';
-      payload: { movement: 'h' | 'j' | 'k' | 'l'; count: number };
+      type: "vim_change_movement";
+      payload: { movement: "h" | "j" | "k" | "l"; count: number };
     }
   // New vim actions for stateless command handling
-  | { type: 'vim_move_left'; payload: { count: number } }
-  | { type: 'vim_move_right'; payload: { count: number } }
-  | { type: 'vim_move_up'; payload: { count: number } }
-  | { type: 'vim_move_down'; payload: { count: number } }
-  | { type: 'vim_move_word_forward'; payload: { count: number } }
-  | { type: 'vim_move_word_backward'; payload: { count: number } }
-  | { type: 'vim_move_word_end'; payload: { count: number } }
-  | { type: 'vim_delete_char'; payload: { count: number } }
-  | { type: 'vim_insert_at_cursor' }
-  | { type: 'vim_append_at_cursor' }
-  | { type: 'vim_open_line_below' }
-  | { type: 'vim_open_line_above' }
-  | { type: 'vim_append_at_line_end' }
-  | { type: 'vim_insert_at_line_start' }
-  | { type: 'vim_move_to_line_start' }
-  | { type: 'vim_move_to_line_end' }
-  | { type: 'vim_move_to_first_nonwhitespace' }
-  | { type: 'vim_move_to_first_line' }
-  | { type: 'vim_move_to_last_line' }
-  | { type: 'vim_move_to_line'; payload: { lineNumber: number } }
-  | { type: 'vim_escape_insert_mode' };
+  | { type: "vim_move_left"; payload: { count: number } }
+  | { type: "vim_move_right"; payload: { count: number } }
+  | { type: "vim_move_up"; payload: { count: number } }
+  | { type: "vim_move_down"; payload: { count: number } }
+  | { type: "vim_move_word_forward"; payload: { count: number } }
+  | { type: "vim_move_word_backward"; payload: { count: number } }
+  | { type: "vim_move_word_end"; payload: { count: number } }
+  | { type: "vim_delete_char"; payload: { count: number } }
+  | { type: "vim_insert_at_cursor" }
+  | { type: "vim_append_at_cursor" }
+  | { type: "vim_open_line_below" }
+  | { type: "vim_open_line_above" }
+  | { type: "vim_append_at_line_end" }
+  | { type: "vim_insert_at_line_start" }
+  | { type: "vim_move_to_line_start" }
+  | { type: "vim_move_to_line_end" }
+  | { type: "vim_move_to_first_nonwhitespace" }
+  | { type: "vim_move_to_first_line" }
+  | { type: "vim_move_to_last_line" }
+  | { type: "vim_move_to_line"; payload: { lineNumber: number } }
+  | { type: "vim_escape_insert_mode" };
 
 export interface TextBufferOptions {
   inputFilter?: (text: string) => string;
@@ -1002,40 +912,38 @@ function textBufferReducerLogic(
 ): TextBufferState {
   const pushUndoLocal = pushUndo;
 
-  const currentLine = (r: number): string => state.lines[r] ?? '';
+  const currentLine = (r: number): string => state.lines[r] ?? "";
   const currentLineLen = (r: number): number => cpLen(currentLine(r));
 
   switch (action.type) {
-    case 'set_text': {
+    case "set_text": {
       let nextState = state;
       if (action.pushToUndo !== false) {
         nextState = pushUndoLocal(state);
       }
-      const newContentLines = action.payload
-        .replace(/\r\n?/g, '\n')
-        .split('\n');
-      const lines = newContentLines.length === 0 ? [''] : newContentLines;
+      const newContentLines = action.payload.replace(/\r\n?/g, "\n").split("\n");
+      const lines = newContentLines.length === 0 ? [""] : newContentLines;
       const lastNewLineIndex = lines.length - 1;
       return {
         ...nextState,
         lines,
         cursorRow: lastNewLineIndex,
-        cursorCol: cpLen(lines[lastNewLineIndex] ?? ''),
+        cursorCol: cpLen(lines[lastNewLineIndex] ?? ""),
         preferredCol: null,
       };
     }
 
-    case 'insert': {
+    case "insert": {
       const nextState = pushUndoLocal(state);
       const newLines = [...nextState.lines];
       let newCursorRow = nextState.cursorRow;
       let newCursorCol = nextState.cursorCol;
 
-      const currentLine = (r: number) => newLines[r] ?? '';
+      const currentLine = (r: number) => newLines[r] ?? "";
 
       let payload = action.payload;
       if (options.singleLine) {
-        payload = payload.replace(/[\r\n]/g, '');
+        payload = payload.replace(/[\r\n]/g, "");
       }
       if (options.inputFilter) {
         payload = options.inputFilter(payload);
@@ -1045,10 +953,8 @@ function textBufferReducerLogic(
         return state;
       }
 
-      const str = stripUnsafeCharacters(
-        payload.replace(/\r\n/g, '\n').replace(/\r/g, '\n'),
-      );
-      const parts = str.split('\n');
+      const str = stripUnsafeCharacters(payload.replace(/\r\n/g, "\n").replace(/\r/g, "\n"));
+      const parts = str.split("\n");
       const lineContent = currentLine(newCursorRow);
       const before = cpSlice(lineContent, 0, newCursorCol);
       const after = cpSlice(lineContent, newCursorCol);
@@ -1056,13 +962,9 @@ function textBufferReducerLogic(
       if (parts.length > 1) {
         newLines[newCursorRow] = before + parts[0];
         const remainingParts = parts.slice(1);
-        const lastPartOriginal = remainingParts.pop() ?? '';
+        const lastPartOriginal = remainingParts.pop() ?? "";
         newLines.splice(newCursorRow + 1, 0, ...remainingParts);
-        newLines.splice(
-          newCursorRow + parts.length - 1,
-          0,
-          lastPartOriginal + after,
-        );
+        newLines.splice(newCursorRow + parts.length - 1, 0, lastPartOriginal + after);
         newCursorRow = newCursorRow + parts.length - 1;
         newCursorCol = cpLen(lastPartOriginal);
       } else {
@@ -1079,21 +981,20 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'backspace': {
+    case "backspace": {
       const nextState = pushUndoLocal(state);
       const newLines = [...nextState.lines];
       let newCursorRow = nextState.cursorRow;
       let newCursorCol = nextState.cursorCol;
 
-      const currentLine = (r: number) => newLines[r] ?? '';
+      const currentLine = (r: number) => newLines[r] ?? "";
 
       if (newCursorCol === 0 && newCursorRow === 0) return state;
 
       if (newCursorCol > 0) {
         const lineContent = currentLine(newCursorRow);
         newLines[newCursorRow] =
-          cpSlice(lineContent, 0, newCursorCol - 1) +
-          cpSlice(lineContent, newCursorCol);
+          cpSlice(lineContent, 0, newCursorCol - 1) + cpSlice(lineContent, newCursorCol);
         newCursorCol--;
       } else if (newCursorRow > 0) {
         const prevLineContent = currentLine(newCursorRow - 1);
@@ -1114,7 +1015,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'set_viewport': {
+    case "set_viewport": {
       const { width, height } = action.payload;
       if (width === state.viewportWidth && height === state.viewportHeight) {
         return state;
@@ -1126,42 +1027,39 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'move': {
+    case "move": {
       const { dir } = action.payload;
       const { cursorRow, cursorCol, lines, visualLayout, preferredCol } = state;
 
       // Visual movements
       if (
-        dir === 'left' ||
-        dir === 'right' ||
-        dir === 'up' ||
-        dir === 'down' ||
-        dir === 'home' ||
-        dir === 'end'
+        dir === "left" ||
+        dir === "right" ||
+        dir === "up" ||
+        dir === "down" ||
+        dir === "home" ||
+        dir === "end"
       ) {
-        const visualCursor = calculateVisualCursorFromLayout(visualLayout, [
-          cursorRow,
-          cursorCol,
-        ]);
+        const visualCursor = calculateVisualCursorFromLayout(visualLayout, [cursorRow, cursorCol]);
         const { visualLines, visualToLogicalMap } = visualLayout;
 
         let newVisualRow = visualCursor[0];
         let newVisualCol = visualCursor[1];
         let newPreferredCol = preferredCol;
 
-        const currentVisLineLen = cpLen(visualLines[newVisualRow] ?? '');
+        const currentVisLineLen = cpLen(visualLines[newVisualRow] ?? "");
 
         switch (dir) {
-          case 'left':
+          case "left":
             newPreferredCol = null;
             if (newVisualCol > 0) {
               newVisualCol--;
             } else if (newVisualRow > 0) {
               newVisualRow--;
-              newVisualCol = cpLen(visualLines[newVisualRow] ?? '');
+              newVisualCol = cpLen(visualLines[newVisualRow] ?? "");
             }
             break;
-          case 'right':
+          case "right":
             newPreferredCol = null;
             if (newVisualCol < currentVisLineLen) {
               newVisualCol++;
@@ -1170,41 +1068,31 @@ function textBufferReducerLogic(
               newVisualCol = 0;
             }
             break;
-          case 'up':
+          case "up":
             if (newVisualRow > 0) {
               if (newPreferredCol === null) newPreferredCol = newVisualCol;
               newVisualRow--;
-              newVisualCol = clamp(
-                newPreferredCol,
-                0,
-                cpLen(visualLines[newVisualRow] ?? ''),
-              );
+              newVisualCol = clamp(newPreferredCol, 0, cpLen(visualLines[newVisualRow] ?? ""));
             }
             break;
-          case 'down':
+          case "down":
             if (newVisualRow < visualLines.length - 1) {
               if (newPreferredCol === null) newPreferredCol = newVisualCol;
               newVisualRow++;
-              newVisualCol = clamp(
-                newPreferredCol,
-                0,
-                cpLen(visualLines[newVisualRow] ?? ''),
-              );
+              newVisualCol = clamp(newPreferredCol, 0, cpLen(visualLines[newVisualRow] ?? ""));
             }
             break;
-          case 'home':
+          case "home":
             newPreferredCol = null;
             newVisualCol = 0;
             break;
-          case 'end':
+          case "end":
             newPreferredCol = null;
             newVisualCol = currentVisLineLen;
             break;
           default: {
             const exhaustiveCheck: never = dir;
-            console.error(
-              `Unknown visual movement direction: ${exhaustiveCheck}`,
-            );
+            console.error(`Unknown visual movement direction: ${exhaustiveCheck}`);
             return state;
           }
         }
@@ -1214,11 +1102,7 @@ function textBufferReducerLogic(
           return {
             ...state,
             cursorRow: logRow,
-            cursorCol: clamp(
-              logStartCol + newVisualCol,
-              0,
-              cpLen(lines[logRow] ?? ''),
-            ),
+            cursorCol: clamp(logStartCol + newVisualCol, 0, cpLen(lines[logRow] ?? "")),
             preferredCol: newPreferredCol,
           };
         }
@@ -1227,7 +1111,7 @@ function textBufferReducerLogic(
 
       // Logical movements
       switch (dir) {
-        case 'wordLeft': {
+        case "wordLeft": {
           if (cursorCol === 0 && cursorRow === 0) return state;
 
           let newCursorRow = cursorRow;
@@ -1235,7 +1119,7 @@ function textBufferReducerLogic(
 
           if (cursorCol === 0) {
             newCursorRow--;
-            newCursorCol = cpLen(lines[newCursorRow] ?? '');
+            newCursorCol = cpLen(lines[newCursorRow] ?? "");
           } else {
             const lineContent = lines[cursorRow];
             newCursorCol = findPrevWordBoundary(lineContent, cursorCol);
@@ -1247,12 +1131,9 @@ function textBufferReducerLogic(
             preferredCol: null,
           };
         }
-        case 'wordRight': {
-          const lineContent = lines[cursorRow] ?? '';
-          if (
-            cursorRow === lines.length - 1 &&
-            cursorCol === cpLen(lineContent)
-          ) {
+        case "wordRight": {
+          const lineContent = lines[cursorRow] ?? "";
+          if (cursorRow === lines.length - 1 && cursorCol === cpLen(lineContent)) {
             return state;
           }
 
@@ -1278,22 +1159,21 @@ function textBufferReducerLogic(
       }
     }
 
-    case 'set_cursor': {
+    case "set_cursor": {
       return {
         ...state,
         ...action.payload,
       };
     }
 
-    case 'delete': {
+    case "delete": {
       const { cursorRow, cursorCol, lines } = state;
       const lineContent = currentLine(cursorRow);
       if (cursorCol < currentLineLen(cursorRow)) {
         const nextState = pushUndoLocal(state);
         const newLines = [...nextState.lines];
         newLines[cursorRow] =
-          cpSlice(lineContent, 0, cursorCol) +
-          cpSlice(lineContent, cursorCol + 1);
+          cpSlice(lineContent, 0, cursorCol) + cpSlice(lineContent, cursorCol + 1);
         return {
           ...nextState,
           lines: newLines,
@@ -1314,7 +1194,7 @@ function textBufferReducerLogic(
       return state;
     }
 
-    case 'delete_word_left': {
+    case "delete_word_left": {
       const { cursorRow, cursorCol } = state;
       if (cursorCol === 0 && cursorRow === 0) return state;
 
@@ -1325,10 +1205,7 @@ function textBufferReducerLogic(
 
       if (newCursorCol > 0) {
         const lineContent = currentLine(newCursorRow);
-        const prevWordStart = findPrevWordStartInLine(
-          lineContent,
-          newCursorCol,
-        );
+        const prevWordStart = findPrevWordStartInLine(lineContent, newCursorCol);
         const start = prevWordStart === null ? 0 : prevWordStart;
         newLines[newCursorRow] =
           cpSlice(lineContent, 0, start) + cpSlice(lineContent, newCursorCol);
@@ -1353,7 +1230,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'delete_word_right': {
+    case "delete_word_right": {
       const { cursorRow, cursorCol, lines } = state;
       const lineContent = currentLine(cursorRow);
       const lineLen = cpLen(lineContent);
@@ -1373,8 +1250,7 @@ function textBufferReducerLogic(
       } else {
         const nextWordStart = findNextWordStartInLine(lineContent, cursorCol);
         const end = nextWordStart === null ? lineLen : nextWordStart;
-        newLines[cursorRow] =
-          cpSlice(lineContent, 0, cursorCol) + cpSlice(lineContent, end);
+        newLines[cursorRow] = cpSlice(lineContent, 0, cursorCol) + cpSlice(lineContent, end);
       }
 
       return {
@@ -1384,7 +1260,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'kill_line_right': {
+    case "kill_line_right": {
       const { cursorRow, cursorCol, lines } = state;
       const lineContent = currentLine(cursorRow);
       if (cursorCol < currentLineLen(cursorRow)) {
@@ -1411,7 +1287,7 @@ function textBufferReducerLogic(
       return state;
     }
 
-    case 'kill_line_left': {
+    case "kill_line_left": {
       const { cursorRow, cursorCol } = state;
       if (cursorCol > 0) {
         const nextState = pushUndoLocal(state);
@@ -1428,7 +1304,7 @@ function textBufferReducerLogic(
       return state;
     }
 
-    case 'undo': {
+    case "undo": {
       const stateToRestore = state.undoStack[state.undoStack.length - 1];
       if (!stateToRestore) return state;
 
@@ -1445,7 +1321,7 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'redo': {
+    case "redo": {
       const stateToRestore = state.redoStack[state.redoStack.length - 1];
       if (!stateToRestore) return state;
 
@@ -1462,25 +1338,15 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'replace_range': {
+    case "replace_range": {
       const { startRow, startCol, endRow, endCol, text } = action.payload;
       const nextState = pushUndoLocal(state);
-      return replaceRangeInternal(
-        nextState,
-        startRow,
-        startCol,
-        endRow,
-        endCol,
-        text,
-      );
+      return replaceRangeInternal(nextState, startRow, startCol, endRow, endCol, text);
     }
 
-    case 'move_to_offset': {
+    case "move_to_offset": {
       const { offset } = action.payload;
-      const [newRow, newCol] = offsetToLogicalPos(
-        state.lines.join('\n'),
-        offset,
-      );
+      const [newRow, newCol] = offsetToLogicalPos(state.lines.join("\n"), offset);
       return {
         ...state,
         cursorRow: newRow,
@@ -1489,43 +1355,43 @@ function textBufferReducerLogic(
       };
     }
 
-    case 'create_undo_snapshot': {
+    case "create_undo_snapshot": {
       return pushUndoLocal(state);
     }
 
     // Vim-specific operations
-    case 'vim_delete_word_forward':
-    case 'vim_delete_word_backward':
-    case 'vim_delete_word_end':
-    case 'vim_change_word_forward':
-    case 'vim_change_word_backward':
-    case 'vim_change_word_end':
-    case 'vim_delete_line':
-    case 'vim_change_line':
-    case 'vim_delete_to_end_of_line':
-    case 'vim_change_to_end_of_line':
-    case 'vim_change_movement':
-    case 'vim_move_left':
-    case 'vim_move_right':
-    case 'vim_move_up':
-    case 'vim_move_down':
-    case 'vim_move_word_forward':
-    case 'vim_move_word_backward':
-    case 'vim_move_word_end':
-    case 'vim_delete_char':
-    case 'vim_insert_at_cursor':
-    case 'vim_append_at_cursor':
-    case 'vim_open_line_below':
-    case 'vim_open_line_above':
-    case 'vim_append_at_line_end':
-    case 'vim_insert_at_line_start':
-    case 'vim_move_to_line_start':
-    case 'vim_move_to_line_end':
-    case 'vim_move_to_first_nonwhitespace':
-    case 'vim_move_to_first_line':
-    case 'vim_move_to_last_line':
-    case 'vim_move_to_line':
-    case 'vim_escape_insert_mode':
+    case "vim_delete_word_forward":
+    case "vim_delete_word_backward":
+    case "vim_delete_word_end":
+    case "vim_change_word_forward":
+    case "vim_change_word_backward":
+    case "vim_change_word_end":
+    case "vim_delete_line":
+    case "vim_change_line":
+    case "vim_delete_to_end_of_line":
+    case "vim_change_to_end_of_line":
+    case "vim_change_movement":
+    case "vim_move_left":
+    case "vim_move_right":
+    case "vim_move_up":
+    case "vim_move_down":
+    case "vim_move_word_forward":
+    case "vim_move_word_backward":
+    case "vim_move_word_end":
+    case "vim_delete_char":
+    case "vim_insert_at_cursor":
+    case "vim_append_at_cursor":
+    case "vim_open_line_below":
+    case "vim_open_line_above":
+    case "vim_append_at_line_end":
+    case "vim_insert_at_line_start":
+    case "vim_move_to_line_start":
+    case "vim_move_to_line_end":
+    case "vim_move_to_first_nonwhitespace":
+    case "vim_move_to_first_line":
+    case "vim_move_to_last_line":
+    case "vim_move_to_line":
+    case "vim_escape_insert_mode":
       return handleVimAction(state, action as VimAction);
 
     default: {
@@ -1543,10 +1409,7 @@ export function textBufferReducer(
 ): TextBufferState {
   const newState = textBufferReducerLogic(state, action, options);
 
-  if (
-    newState.lines !== state.lines ||
-    newState.viewportWidth !== state.viewportWidth
-  ) {
+  if (newState.lines !== state.lines || newState.viewportWidth !== state.viewportWidth) {
     return {
       ...newState,
       visualLayout: calculateLayout(newState.lines, newState.viewportWidth),
@@ -1559,7 +1422,7 @@ export function textBufferReducer(
 // --- End of reducer logic ---
 
 export function useTextBuffer({
-  initialText = '',
+  initialText = "",
   initialCursorOffset = 0,
   viewport,
   stdin,
@@ -1571,17 +1434,14 @@ export function useTextBuffer({
   singleLine = false,
 }: UseTextBufferProps): TextBuffer {
   const initialState = useMemo((): TextBufferState => {
-    const lines = initialText.split('\n');
+    const lines = initialText.split("\n");
     const [initialCursorRow, initialCursorCol] = calculateInitialCursorPosition(
-      lines.length === 0 ? [''] : lines,
+      lines.length === 0 ? [""] : lines,
       initialCursorOffset,
     );
-    const visualLayout = calculateLayout(
-      lines.length === 0 ? [''] : lines,
-      viewport.width,
-    );
+    const visualLayout = calculateLayout(lines.length === 0 ? [""] : lines, viewport.width);
     return {
-      lines: lines.length === 0 ? [''] : lines,
+      lines: lines.length === 0 ? [""] : lines,
       cursorRow: initialCursorRow,
       cursorCol: initialCursorCol,
       preferredCol: null,
@@ -1600,16 +1460,9 @@ export function useTextBuffer({
       textBufferReducer(s, a, { inputFilter, singleLine }),
     initialState,
   );
-  const {
-    lines,
-    cursorRow,
-    cursorCol,
-    preferredCol,
-    selectionAnchor,
-    visualLayout,
-  } = state;
+  const { lines, cursorRow, cursorCol, preferredCol, selectionAnchor, visualLayout } = state;
 
-  const text = useMemo(() => lines.join('\n'), [lines]);
+  const text = useMemo(() => lines.join("\n"), [lines]);
 
   const visualCursor = useMemo(
     () => calculateVisualCursorFromLayout(visualLayout, [cursorRow, cursorCol]),
@@ -1628,7 +1481,7 @@ export function useTextBuffer({
 
   useEffect(() => {
     dispatch({
-      type: 'set_viewport',
+      type: "set_viewport",
       payload: { width: viewport.width, height: viewport.height },
     });
   }, [viewport.width, viewport.height]);
@@ -1658,16 +1511,12 @@ export function useTextBuffer({
   const insert = useCallback(
     (ch: string, { paste = false }: { paste?: boolean } = {}): void => {
       if (!singleLine && /[\n\r]/.test(ch)) {
-        dispatch({ type: 'insert', payload: ch });
+        dispatch({ type: "insert", payload: ch });
         return;
       }
 
       const minLengthToInferAsDragDrop = 3;
-      if (
-        ch.length >= minLengthToInferAsDragDrop &&
-        !shellModeActive &&
-        paste
-      ) {
+      if (ch.length >= minLengthToInferAsDragDrop && !shellModeActive && paste) {
         let potentialPath = ch.trim();
         const quoteMatch = potentialPath.match(/^'(.*)'$/);
         if (quoteMatch) {
@@ -1680,20 +1529,20 @@ export function useTextBuffer({
         }
       }
 
-      let currentText = '';
+      let currentText = "";
       for (const char of toCodePoints(ch)) {
         if (char.codePointAt(0) === 127) {
           if (currentText.length > 0) {
-            dispatch({ type: 'insert', payload: currentText });
-            currentText = '';
+            dispatch({ type: "insert", payload: currentText });
+            currentText = "";
           }
-          dispatch({ type: 'backspace' });
+          dispatch({ type: "backspace" });
         } else {
           currentText += char;
         }
       }
       if (currentText.length > 0) {
-        dispatch({ type: 'insert', payload: currentText });
+        dispatch({ type: "insert", payload: currentText });
       }
     },
     [isValidPath, shellModeActive, singleLine],
@@ -1703,213 +1552,210 @@ export function useTextBuffer({
     if (singleLine) {
       return;
     }
-    dispatch({ type: 'insert', payload: '\n' });
+    dispatch({ type: "insert", payload: "\n" });
   }, [singleLine]);
 
   const backspace = useCallback((): void => {
-    dispatch({ type: 'backspace' });
+    dispatch({ type: "backspace" });
   }, []);
 
   const del = useCallback((): void => {
-    dispatch({ type: 'delete' });
+    dispatch({ type: "delete" });
   }, []);
 
   const move = useCallback(
     (dir: Direction): void => {
-      dispatch({ type: 'move', payload: { dir } });
+      dispatch({ type: "move", payload: { dir } });
     },
     [dispatch],
   );
 
   const undo = useCallback((): void => {
-    dispatch({ type: 'undo' });
+    dispatch({ type: "undo" });
   }, []);
 
   const redo = useCallback((): void => {
-    dispatch({ type: 'redo' });
+    dispatch({ type: "redo" });
   }, []);
 
   const setText = useCallback((newText: string): void => {
-    dispatch({ type: 'set_text', payload: newText });
+    dispatch({ type: "set_text", payload: newText });
   }, []);
 
   const deleteWordLeft = useCallback((): void => {
-    dispatch({ type: 'delete_word_left' });
+    dispatch({ type: "delete_word_left" });
   }, []);
 
   const deleteWordRight = useCallback((): void => {
-    dispatch({ type: 'delete_word_right' });
+    dispatch({ type: "delete_word_right" });
   }, []);
 
   const killLineRight = useCallback((): void => {
-    dispatch({ type: 'kill_line_right' });
+    dispatch({ type: "kill_line_right" });
   }, []);
 
   const killLineLeft = useCallback((): void => {
-    dispatch({ type: 'kill_line_left' });
+    dispatch({ type: "kill_line_left" });
   }, []);
 
   // Vim-specific operations
   const vimDeleteWordForward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_word_forward', payload: { count } });
+    dispatch({ type: "vim_delete_word_forward", payload: { count } });
   }, []);
 
   const vimDeleteWordBackward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_word_backward', payload: { count } });
+    dispatch({ type: "vim_delete_word_backward", payload: { count } });
   }, []);
 
   const vimDeleteWordEnd = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_word_end', payload: { count } });
+    dispatch({ type: "vim_delete_word_end", payload: { count } });
   }, []);
 
   const vimChangeWordForward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_word_forward', payload: { count } });
+    dispatch({ type: "vim_change_word_forward", payload: { count } });
   }, []);
 
   const vimChangeWordBackward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_word_backward', payload: { count } });
+    dispatch({ type: "vim_change_word_backward", payload: { count } });
   }, []);
 
   const vimChangeWordEnd = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_word_end', payload: { count } });
+    dispatch({ type: "vim_change_word_end", payload: { count } });
   }, []);
 
   const vimDeleteLine = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_line', payload: { count } });
+    dispatch({ type: "vim_delete_line", payload: { count } });
   }, []);
 
   const vimChangeLine = useCallback((count: number): void => {
-    dispatch({ type: 'vim_change_line', payload: { count } });
+    dispatch({ type: "vim_change_line", payload: { count } });
   }, []);
 
   const vimDeleteToEndOfLine = useCallback((): void => {
-    dispatch({ type: 'vim_delete_to_end_of_line' });
+    dispatch({ type: "vim_delete_to_end_of_line" });
   }, []);
 
   const vimChangeToEndOfLine = useCallback((): void => {
-    dispatch({ type: 'vim_change_to_end_of_line' });
+    dispatch({ type: "vim_change_to_end_of_line" });
   }, []);
 
-  const vimChangeMovement = useCallback(
-    (movement: 'h' | 'j' | 'k' | 'l', count: number): void => {
-      dispatch({ type: 'vim_change_movement', payload: { movement, count } });
-    },
-    [],
-  );
+  const vimChangeMovement = useCallback((movement: "h" | "j" | "k" | "l", count: number): void => {
+    dispatch({ type: "vim_change_movement", payload: { movement, count } });
+  }, []);
 
   // New vim navigation and operation methods
   const vimMoveLeft = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_left', payload: { count } });
+    dispatch({ type: "vim_move_left", payload: { count } });
   }, []);
 
   const vimMoveRight = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_right', payload: { count } });
+    dispatch({ type: "vim_move_right", payload: { count } });
   }, []);
 
   const vimMoveUp = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_up', payload: { count } });
+    dispatch({ type: "vim_move_up", payload: { count } });
   }, []);
 
   const vimMoveDown = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_down', payload: { count } });
+    dispatch({ type: "vim_move_down", payload: { count } });
   }, []);
 
   const vimMoveWordForward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_word_forward', payload: { count } });
+    dispatch({ type: "vim_move_word_forward", payload: { count } });
   }, []);
 
   const vimMoveWordBackward = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_word_backward', payload: { count } });
+    dispatch({ type: "vim_move_word_backward", payload: { count } });
   }, []);
 
   const vimMoveWordEnd = useCallback((count: number): void => {
-    dispatch({ type: 'vim_move_word_end', payload: { count } });
+    dispatch({ type: "vim_move_word_end", payload: { count } });
   }, []);
 
   const vimDeleteChar = useCallback((count: number): void => {
-    dispatch({ type: 'vim_delete_char', payload: { count } });
+    dispatch({ type: "vim_delete_char", payload: { count } });
   }, []);
 
   const vimInsertAtCursor = useCallback((): void => {
-    dispatch({ type: 'vim_insert_at_cursor' });
+    dispatch({ type: "vim_insert_at_cursor" });
   }, []);
 
   const vimAppendAtCursor = useCallback((): void => {
-    dispatch({ type: 'vim_append_at_cursor' });
+    dispatch({ type: "vim_append_at_cursor" });
   }, []);
 
   const vimOpenLineBelow = useCallback((): void => {
-    dispatch({ type: 'vim_open_line_below' });
+    dispatch({ type: "vim_open_line_below" });
   }, []);
 
   const vimOpenLineAbove = useCallback((): void => {
-    dispatch({ type: 'vim_open_line_above' });
+    dispatch({ type: "vim_open_line_above" });
   }, []);
 
   const vimAppendAtLineEnd = useCallback((): void => {
-    dispatch({ type: 'vim_append_at_line_end' });
+    dispatch({ type: "vim_append_at_line_end" });
   }, []);
 
   const vimInsertAtLineStart = useCallback((): void => {
-    dispatch({ type: 'vim_insert_at_line_start' });
+    dispatch({ type: "vim_insert_at_line_start" });
   }, []);
 
   const vimMoveToLineStart = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_line_start' });
+    dispatch({ type: "vim_move_to_line_start" });
   }, []);
 
   const vimMoveToLineEnd = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_line_end' });
+    dispatch({ type: "vim_move_to_line_end" });
   }, []);
 
   const vimMoveToFirstNonWhitespace = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_first_nonwhitespace' });
+    dispatch({ type: "vim_move_to_first_nonwhitespace" });
   }, []);
 
   const vimMoveToFirstLine = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_first_line' });
+    dispatch({ type: "vim_move_to_first_line" });
   }, []);
 
   const vimMoveToLastLine = useCallback((): void => {
-    dispatch({ type: 'vim_move_to_last_line' });
+    dispatch({ type: "vim_move_to_last_line" });
   }, []);
 
   const vimMoveToLine = useCallback((lineNumber: number): void => {
-    dispatch({ type: 'vim_move_to_line', payload: { lineNumber } });
+    dispatch({ type: "vim_move_to_line", payload: { lineNumber } });
   }, []);
 
   const vimEscapeInsertMode = useCallback((): void => {
-    dispatch({ type: 'vim_escape_insert_mode' });
+    dispatch({ type: "vim_escape_insert_mode" });
   }, []);
 
   const openInExternalEditor = useCallback(
     async (opts: { editor?: string } = {}): Promise<void> => {
       const editor =
         opts.editor ??
-        process.env['VISUAL'] ??
-        process.env['EDITOR'] ??
-        (process.platform === 'win32' ? 'notepad' : 'vi');
-      const tmpDir = fs.mkdtempSync(pathMod.join(os.tmpdir(), 'gemini-edit-'));
-      const filePath = pathMod.join(tmpDir, 'buffer.txt');
-      fs.writeFileSync(filePath, text, 'utf8');
+        process.env["VISUAL"] ??
+        process.env["EDITOR"] ??
+        (process.platform === "win32" ? "notepad" : "vi");
+      const tmpDir = fs.mkdtempSync(pathMod.join(os.tmpdir(), "gemini-edit-"));
+      const filePath = pathMod.join(tmpDir, "buffer.txt");
+      fs.writeFileSync(filePath, text, "utf8");
 
-      dispatch({ type: 'create_undo_snapshot' });
+      dispatch({ type: "create_undo_snapshot" });
 
       const wasRaw = stdin?.isRaw ?? false;
       try {
         setRawMode?.(false);
         const { status, error } = spawnSync(editor, [filePath], {
-          stdio: 'inherit',
+          stdio: "inherit",
         });
         if (error) throw error;
-        if (typeof status === 'number' && status !== 0)
+        if (typeof status === "number" && status !== 0)
           throw new Error(`External editor exited with status ${status}`);
 
-        let newText = fs.readFileSync(filePath, 'utf8');
-        newText = newText.replace(/\r\n?/g, '\n');
-        dispatch({ type: 'set_text', payload: newText, pushToUndo: false });
+        let newText = fs.readFileSync(filePath, "utf8");
+        newText = newText.replace(/\r\n?/g, "\n");
+        dispatch({ type: "set_text", payload: newText, pushToUndo: false });
       } catch (err) {
-        console.error('[useTextBuffer] external editor error', err);
+        console.error("[useTextBuffer] external editor error", err);
       } finally {
         enableSupportedProtocol();
         coreEvents.emit(CoreEvent.ExternalEditorClosed);
@@ -1942,44 +1788,32 @@ export function useTextBuffer({
 
       if (
         !singleLine &&
-        (key.name === 'return' ||
-          input === '\r' ||
-          input === '\n' ||
-          input === '\\r') // VSCode terminal represents shift + enter this way
+        (key.name === "return" || input === "\r" || input === "\n" || input === "\\r") // VSCode terminal represents shift + enter this way
       )
         newline();
-      else if (key.name === 'left' && !key.meta && !key.ctrl) move('left');
-      else if (key.ctrl && key.name === 'b') move('left');
-      else if (key.name === 'right' && !key.meta && !key.ctrl) move('right');
-      else if (key.ctrl && key.name === 'f') move('right');
-      else if (key.name === 'up') move('up');
-      else if (key.name === 'down') move('down');
-      else if ((key.ctrl || key.meta) && key.name === 'left') move('wordLeft');
-      else if (key.meta && key.name === 'b') move('wordLeft');
-      else if ((key.ctrl || key.meta) && key.name === 'right')
-        move('wordRight');
-      else if (key.meta && key.name === 'f') move('wordRight');
-      else if (key.name === 'home') move('home');
-      else if (key.ctrl && key.name === 'a') move('home');
-      else if (key.name === 'end') move('end');
-      else if (key.ctrl && key.name === 'e') move('end');
-      else if (key.ctrl && key.name === 'w') deleteWordLeft();
-      else if (
-        (key.meta || key.ctrl) &&
-        (key.name === 'backspace' || input === '\x7f')
-      )
+      else if (key.name === "left" && !key.meta && !key.ctrl) move("left");
+      else if (key.ctrl && key.name === "b") move("left");
+      else if (key.name === "right" && !key.meta && !key.ctrl) move("right");
+      else if (key.ctrl && key.name === "f") move("right");
+      else if (key.name === "up") move("up");
+      else if (key.name === "down") move("down");
+      else if ((key.ctrl || key.meta) && key.name === "left") move("wordLeft");
+      else if (key.meta && key.name === "b") move("wordLeft");
+      else if ((key.ctrl || key.meta) && key.name === "right") move("wordRight");
+      else if (key.meta && key.name === "f") move("wordRight");
+      else if (key.name === "home") move("home");
+      else if (key.ctrl && key.name === "a") move("home");
+      else if (key.name === "end") move("end");
+      else if (key.ctrl && key.name === "e") move("end");
+      else if (key.ctrl && key.name === "w") deleteWordLeft();
+      else if ((key.meta || key.ctrl) && (key.name === "backspace" || input === "\x7f"))
         deleteWordLeft();
-      else if ((key.meta || key.ctrl) && key.name === 'delete')
-        deleteWordRight();
-      else if (
-        key.name === 'backspace' ||
-        input === '\x7f' ||
-        (key.ctrl && key.name === 'h')
-      )
+      else if ((key.meta || key.ctrl) && key.name === "delete") deleteWordRight();
+      else if (key.name === "backspace" || input === "\x7f" || (key.ctrl && key.name === "h"))
         backspace();
-      else if (key.name === 'delete' || (key.ctrl && key.name === 'd')) del();
-      else if (key.ctrl && !key.shift && key.name === 'z') undo();
-      else if (key.ctrl && key.shift && key.name === 'z') redo();
+      else if (key.name === "delete" || (key.ctrl && key.name === "d")) del();
+      else if (key.ctrl && !key.shift && key.name === "z") undo();
+      else if (key.ctrl && key.shift && key.name === "z") redo();
       else if (key.insertable) {
         insert(input, { paste: key.paste });
       }
@@ -2004,15 +1838,9 @@ export function useTextBuffer({
   );
 
   const replaceRange = useCallback(
-    (
-      startRow: number,
-      startCol: number,
-      endRow: number,
-      endCol: number,
-      text: string,
-    ): void => {
+    (startRow: number, startCol: number, endRow: number, endCol: number, text: string): void => {
       dispatch({
-        type: 'replace_range',
+        type: "replace_range",
         payload: { startRow, startCol, endRow, endCol, text },
       });
     },
@@ -2029,18 +1857,15 @@ export function useTextBuffer({
   );
 
   const moveToOffset = useCallback((offset: number): void => {
-    dispatch({ type: 'move_to_offset', payload: { offset } });
+    dispatch({ type: "move_to_offset", payload: { offset } });
   }, []);
 
   const moveToVisualPosition = useCallback(
     (visRow: number, visCol: number): void => {
       const { visualLines, visualToLogicalMap } = visualLayout;
       // Clamp visRow to valid range
-      const clampedVisRow = Math.max(
-        0,
-        Math.min(visRow, visualLines.length - 1),
-      );
-      const visualLine = visualLines[clampedVisRow] || '';
+      const clampedVisRow = Math.max(0, Math.min(visRow, visualLines.length - 1));
+      const visualLine = visualLines[clampedVisRow] || "";
 
       if (visualToLogicalMap[clampedVisRow]) {
         const [logRow, logStartCol] = visualToLogicalMap[clampedVisRow];
@@ -2070,7 +1895,7 @@ export function useTextBuffer({
         const newCursorCol = logStartCol + charOffset;
 
         dispatch({
-          type: 'set_cursor',
+          type: "set_cursor",
           payload: {
             cursorRow: newCursorRow,
             cursorCol: newCursorCol,
@@ -2327,11 +2152,7 @@ export interface TextBuffer {
    */
   openInExternalEditor: (opts?: { editor?: string }) => Promise<void>;
 
-  replaceRangeByOffset: (
-    startOffset: number,
-    endOffset: number,
-    replacementText: string,
-  ) => void;
+  replaceRangeByOffset: (startOffset: number, endOffset: number, replacementText: string) => void;
   getOffset: () => number;
   moveToOffset(offset: number): void;
   moveToVisualPosition(visualRow: number, visualCol: number): void;
@@ -2380,7 +2201,7 @@ export interface TextBuffer {
   /**
    * Change movement operations (vim 'ch', 'cj', 'ck', 'cl' commands)
    */
-  vimChangeMovement: (movement: 'h' | 'j' | 'k' | 'l', count: number) => void;
+  vimChangeMovement: (movement: "h" | "j" | "k" | "l", count: number) => void;
   /**
    * Move cursor left N times (vim 'h' command)
    */
diff --git a/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.test.ts b/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.test.ts
index 9d163b079..1b38eaf94 100644
--- a/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.test.ts
+++ b/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.test.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { handleVimAction } from './vim-buffer-actions.js';
-import type { TextBufferState, VisualLayout } from './text-buffer.js';
+import { describe, expect, it } from "vitest";
+import type { TextBufferState, VisualLayout } from "./text-buffer.js";
+import { handleVimAction } from "./vim-buffer-actions.js";
 
 const defaultVisualLayout: VisualLayout = {
-  visualLines: [''],
+  visualLines: [""],
   logicalToVisualMap: [[[0, 0]]],
   visualToLogicalMap: [[0, 0]],
 };
 
 // Helper to create test state
 const createTestState = (
-  lines: string[] = ['hello world'],
+  lines: string[] = ["hello world"],
   cursorRow = 0,
   cursorCol = 0,
 ): TextBufferState => ({
@@ -33,13 +33,13 @@ const createTestState = (
   visualLayout: defaultVisualLayout,
 });
 
-describe('vim-buffer-actions', () => {
-  describe('Movement commands', () => {
-    describe('vim_move_left', () => {
-      it('should move cursor left by count', () => {
-        const state = createTestState(['hello world'], 0, 5);
+describe("vim-buffer-actions", () => {
+  describe("Movement commands", () => {
+    describe("vim_move_left", () => {
+      it("should move cursor left by count", () => {
+        const state = createTestState(["hello world"], 0, 5);
         const action = {
-          type: 'vim_move_left' as const,
+          type: "vim_move_left" as const,
           payload: { count: 3 },
         };
 
@@ -49,10 +49,10 @@ describe('vim-buffer-actions', () => {
         expect(result.preferredCol).toBeNull();
       });
 
-      it('should not move past beginning of line', () => {
-        const state = createTestState(['hello'], 0, 2);
+      it("should not move past beginning of line", () => {
+        const state = createTestState(["hello"], 0, 2);
         const action = {
-          type: 'vim_move_left' as const,
+          type: "vim_move_left" as const,
           payload: { count: 5 },
         };
 
@@ -61,10 +61,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(0);
       });
 
-      it('should wrap to previous line when at beginning', () => {
-        const state = createTestState(['line1', 'line2'], 1, 0);
+      it("should wrap to previous line when at beginning", () => {
+        const state = createTestState(["line1", "line2"], 1, 0);
         const action = {
-          type: 'vim_move_left' as const,
+          type: "vim_move_left" as const,
           payload: { count: 1 },
         };
 
@@ -74,10 +74,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(4); // On last character '1' of 'line1'
       });
 
-      it('should handle multiple line wrapping', () => {
-        const state = createTestState(['abc', 'def', 'ghi'], 2, 0);
+      it("should handle multiple line wrapping", () => {
+        const state = createTestState(["abc", "def", "ghi"], 2, 0);
         const action = {
-          type: 'vim_move_left' as const,
+          type: "vim_move_left" as const,
           payload: { count: 5 },
         };
 
@@ -87,13 +87,13 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(1); // On 'b' after 5 left movements
       });
 
-      it('should correctly handle h/l movement between lines', () => {
+      it("should correctly handle h/l movement between lines", () => {
         // Start at end of first line at 'd' (position 10)
-        let state = createTestState(['hello world', 'foo bar'], 0, 10);
+        let state = createTestState(["hello world", "foo bar"], 0, 10);
 
         // Move right - should go to beginning of next line
         state = handleVimAction(state, {
-          type: 'vim_move_right' as const,
+          type: "vim_move_right" as const,
           payload: { count: 1 },
         });
         expect(state).toHaveOnlyValidCharacters();
@@ -102,7 +102,7 @@ describe('vim-buffer-actions', () => {
 
         // Move left - should go back to end of previous line on 'd'
         state = handleVimAction(state, {
-          type: 'vim_move_left' as const,
+          type: "vim_move_left" as const,
           payload: { count: 1 },
         });
         expect(state).toHaveOnlyValidCharacters();
@@ -111,11 +111,11 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_move_right', () => {
-      it('should move cursor right by count', () => {
-        const state = createTestState(['hello world'], 0, 2);
+    describe("vim_move_right", () => {
+      it("should move cursor right by count", () => {
+        const state = createTestState(["hello world"], 0, 2);
         const action = {
-          type: 'vim_move_right' as const,
+          type: "vim_move_right" as const,
           payload: { count: 3 },
         };
 
@@ -124,10 +124,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(5);
       });
 
-      it('should not move past last character of line', () => {
-        const state = createTestState(['hello'], 0, 3);
+      it("should not move past last character of line", () => {
+        const state = createTestState(["hello"], 0, 3);
         const action = {
-          type: 'vim_move_right' as const,
+          type: "vim_move_right" as const,
           payload: { count: 5 },
         };
 
@@ -136,10 +136,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(4); // Last character of 'hello'
       });
 
-      it('should wrap to next line when at end', () => {
-        const state = createTestState(['line1', 'line2'], 0, 4); // At end of 'line1'
+      it("should wrap to next line when at end", () => {
+        const state = createTestState(["line1", "line2"], 0, 4); // At end of 'line1'
         const action = {
-          type: 'vim_move_right' as const,
+          type: "vim_move_right" as const,
           payload: { count: 1 },
         };
 
@@ -149,12 +149,12 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(0);
       });
 
-      it('should skip over combining marks to avoid cursor disappearing', () => {
+      it("should skip over combining marks to avoid cursor disappearing", () => {
         // Test case for combining character cursor disappearing bug
         // "café test" where é is represented as e + combining acute accent
-        const state = createTestState(['cafe\u0301 test'], 0, 2); // Start at 'f'
+        const state = createTestState(["cafe\u0301 test"], 0, 2); // Start at 'f'
         const action = {
-          type: 'vim_move_right' as const,
+          type: "vim_move_right" as const,
           payload: { count: 1 },
         };
 
@@ -169,10 +169,10 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_move_up', () => {
-      it('should move cursor up by count', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 2, 3);
-        const action = { type: 'vim_move_up' as const, payload: { count: 2 } };
+    describe("vim_move_up", () => {
+      it("should move cursor up by count", () => {
+        const state = createTestState(["line1", "line2", "line3"], 2, 3);
+        const action = { type: "vim_move_up" as const, payload: { count: 2 } };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -180,18 +180,18 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(3);
       });
 
-      it('should not move past first line', () => {
-        const state = createTestState(['line1', 'line2'], 1, 3);
-        const action = { type: 'vim_move_up' as const, payload: { count: 5 } };
+      it("should not move past first line", () => {
+        const state = createTestState(["line1", "line2"], 1, 3);
+        const action = { type: "vim_move_up" as const, payload: { count: 5 } };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorRow).toBe(0);
       });
 
-      it('should adjust column for shorter lines', () => {
-        const state = createTestState(['short', 'very long line'], 1, 10);
-        const action = { type: 'vim_move_up' as const, payload: { count: 1 } };
+      it("should adjust column for shorter lines", () => {
+        const state = createTestState(["short", "very long line"], 1, 10);
+        const action = { type: "vim_move_up" as const, payload: { count: 1 } };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -200,11 +200,11 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_move_down', () => {
-      it('should move cursor down by count', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 0, 2);
+    describe("vim_move_down", () => {
+      it("should move cursor down by count", () => {
+        const state = createTestState(["line1", "line2", "line3"], 0, 2);
         const action = {
-          type: 'vim_move_down' as const,
+          type: "vim_move_down" as const,
           payload: { count: 2 },
         };
 
@@ -214,10 +214,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(2);
       });
 
-      it('should not move past last line', () => {
-        const state = createTestState(['line1', 'line2'], 0, 2);
+      it("should not move past last line", () => {
+        const state = createTestState(["line1", "line2"], 0, 2);
         const action = {
-          type: 'vim_move_down' as const,
+          type: "vim_move_down" as const,
           payload: { count: 5 },
         };
 
@@ -227,11 +227,11 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_move_word_forward', () => {
-      it('should move to start of next word', () => {
-        const state = createTestState(['hello world test'], 0, 0);
+    describe("vim_move_word_forward", () => {
+      it("should move to start of next word", () => {
+        const state = createTestState(["hello world test"], 0, 0);
         const action = {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         };
 
@@ -240,10 +240,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(6); // Start of 'world'
       });
 
-      it('should handle multiple words', () => {
-        const state = createTestState(['hello world test'], 0, 0);
+      it("should handle multiple words", () => {
+        const state = createTestState(["hello world test"], 0, 0);
         const action = {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 2 },
         };
 
@@ -252,10 +252,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(12); // Start of 'test'
       });
 
-      it('should handle punctuation correctly', () => {
-        const state = createTestState(['hello, world!'], 0, 0);
+      it("should handle punctuation correctly", () => {
+        const state = createTestState(["hello, world!"], 0, 0);
         const action = {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         };
 
@@ -264,11 +264,11 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(5); // Start of ','
       });
 
-      it('should move across empty lines when starting from within a word', () => {
+      it("should move across empty lines when starting from within a word", () => {
         // Testing the exact scenario: cursor on 'w' of 'hello world', w should move to next line
-        const state = createTestState(['hello world', ''], 0, 6); // At 'w' of 'world'
+        const state = createTestState(["hello world", ""], 0, 6); // At 'w' of 'world'
         const action = {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         };
 
@@ -279,11 +279,11 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_move_word_backward', () => {
-      it('should move to start of previous word', () => {
-        const state = createTestState(['hello world test'], 0, 12);
+    describe("vim_move_word_backward", () => {
+      it("should move to start of previous word", () => {
+        const state = createTestState(["hello world test"], 0, 12);
         const action = {
-          type: 'vim_move_word_backward' as const,
+          type: "vim_move_word_backward" as const,
           payload: { count: 1 },
         };
 
@@ -292,10 +292,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(6); // Start of 'world'
       });
 
-      it('should handle multiple words', () => {
-        const state = createTestState(['hello world test'], 0, 12);
+      it("should handle multiple words", () => {
+        const state = createTestState(["hello world test"], 0, 12);
         const action = {
-          type: 'vim_move_word_backward' as const,
+          type: "vim_move_word_backward" as const,
           payload: { count: 2 },
         };
 
@@ -305,11 +305,11 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_move_word_end', () => {
-      it('should move to end of current word', () => {
-        const state = createTestState(['hello world'], 0, 0);
+    describe("vim_move_word_end", () => {
+      it("should move to end of current word", () => {
+        const state = createTestState(["hello world"], 0, 0);
         const action = {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         };
 
@@ -318,10 +318,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(4); // End of 'hello'
       });
 
-      it('should move to end of next word if already at word end', () => {
-        const state = createTestState(['hello world'], 0, 4);
+      it("should move to end of next word if already at word end", () => {
+        const state = createTestState(["hello world"], 0, 4);
         const action = {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         };
 
@@ -330,10 +330,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(10); // End of 'world'
       });
 
-      it('should move across empty lines when at word end', () => {
-        const state = createTestState(['hello world', '', 'test'], 0, 10); // At 'd' of 'world'
+      it("should move across empty lines when at word end", () => {
+        const state = createTestState(["hello world", "", "test"], 0, 10); // At 'd' of 'world'
         const action = {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         };
 
@@ -343,13 +343,13 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(3); // Should be at 't' (end of 'test')
       });
 
-      it('should handle consecutive word-end movements across empty lines', () => {
+      it("should handle consecutive word-end movements across empty lines", () => {
         // Testing the exact scenario: cursor on 'w' of world, press 'e' twice
-        const state = createTestState(['hello world', ''], 0, 6); // At 'w' of 'world'
+        const state = createTestState(["hello world", ""], 0, 6); // At 'w' of 'world'
 
         // First 'e' should move to 'd' of 'world'
         let result = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -358,7 +358,7 @@ describe('vim-buffer-actions', () => {
 
         // Second 'e' should move to the empty line (end of file in this case)
         result = handleVimAction(result, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -366,14 +366,14 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(0); // Empty line has col 0
       });
 
-      it('should handle combining characters - advance from end of base character', () => {
+      it("should handle combining characters - advance from end of base character", () => {
         // Test case for combining character word end bug
         // "café test" where é is represented as e + combining acute accent
-        const state = createTestState(['cafe\u0301 test'], 0, 0); // Start at 'c'
+        const state = createTestState(["cafe\u0301 test"], 0, 0); // Start at 'c'
 
         // First 'e' command should move to the 'e' (position 3)
         let result = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -381,20 +381,20 @@ describe('vim-buffer-actions', () => {
 
         // Second 'e' command should advance to end of "test" (position 9), not stay stuck
         result = handleVimAction(result, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(9); // At 't' of "test"
       });
 
-      it('should handle precomposed characters with diacritics', () => {
+      it("should handle precomposed characters with diacritics", () => {
         // Test case with precomposed é for comparison
-        const state = createTestState(['café test'], 0, 0);
+        const state = createTestState(["café test"], 0, 0);
 
         // First 'e' command should move to the 'é' (position 3)
         let result = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -402,7 +402,7 @@ describe('vim-buffer-actions', () => {
 
         // Second 'e' command should advance to end of "test" (position 8)
         result = handleVimAction(result, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -410,37 +410,37 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('Position commands', () => {
-      it('vim_move_to_line_start should move to column 0', () => {
-        const state = createTestState(['hello world'], 0, 5);
-        const action = { type: 'vim_move_to_line_start' as const };
+    describe("Position commands", () => {
+      it("vim_move_to_line_start should move to column 0", () => {
+        const state = createTestState(["hello world"], 0, 5);
+        const action = { type: "vim_move_to_line_start" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(0);
       });
 
-      it('vim_move_to_line_end should move to last character', () => {
-        const state = createTestState(['hello world'], 0, 0);
-        const action = { type: 'vim_move_to_line_end' as const };
+      it("vim_move_to_line_end should move to last character", () => {
+        const state = createTestState(["hello world"], 0, 0);
+        const action = { type: "vim_move_to_line_end" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(10); // Last character of 'hello world'
       });
 
-      it('vim_move_to_first_nonwhitespace should skip leading whitespace', () => {
-        const state = createTestState(['   hello world'], 0, 0);
-        const action = { type: 'vim_move_to_first_nonwhitespace' as const };
+      it("vim_move_to_first_nonwhitespace should skip leading whitespace", () => {
+        const state = createTestState(["   hello world"], 0, 0);
+        const action = { type: "vim_move_to_first_nonwhitespace" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(3); // Position of 'h'
       });
 
-      it('vim_move_to_first_line should move to row 0', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 2, 5);
-        const action = { type: 'vim_move_to_first_line' as const };
+      it("vim_move_to_first_line should move to row 0", () => {
+        const state = createTestState(["line1", "line2", "line3"], 2, 5);
+        const action = { type: "vim_move_to_first_line" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -448,9 +448,9 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(0);
       });
 
-      it('vim_move_to_last_line should move to last row', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 0, 5);
-        const action = { type: 'vim_move_to_last_line' as const };
+      it("vim_move_to_last_line should move to last row", () => {
+        const state = createTestState(["line1", "line2", "line3"], 0, 5);
+        const action = { type: "vim_move_to_last_line" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -458,10 +458,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(0);
       });
 
-      it('vim_move_to_line should move to specific line', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 0, 5);
+      it("vim_move_to_line should move to specific line", () => {
+        const state = createTestState(["line1", "line2", "line3"], 0, 5);
         const action = {
-          type: 'vim_move_to_line' as const,
+          type: "vim_move_to_line" as const,
           payload: { lineNumber: 2 },
         };
 
@@ -471,10 +471,10 @@ describe('vim-buffer-actions', () => {
         expect(result.cursorCol).toBe(0);
       });
 
-      it('vim_move_to_line should clamp to valid range', () => {
-        const state = createTestState(['line1', 'line2'], 0, 0);
+      it("vim_move_to_line should clamp to valid range", () => {
+        const state = createTestState(["line1", "line2"], 0, 0);
         const action = {
-          type: 'vim_move_to_line' as const,
+          type: "vim_move_to_line" as const,
           payload: { lineNumber: 10 },
         };
 
@@ -485,201 +485,201 @@ describe('vim-buffer-actions', () => {
     });
   });
 
-  describe('Edit commands', () => {
-    describe('vim_delete_char', () => {
-      it('should delete single character', () => {
-        const state = createTestState(['hello'], 0, 1);
+  describe("Edit commands", () => {
+    describe("vim_delete_char", () => {
+      it("should delete single character", () => {
+        const state = createTestState(["hello"], 0, 1);
         const action = {
-          type: 'vim_delete_char' as const,
+          type: "vim_delete_char" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hllo');
+        expect(result.lines[0]).toBe("hllo");
         expect(result.cursorCol).toBe(1);
       });
 
-      it('should delete multiple characters', () => {
-        const state = createTestState(['hello'], 0, 1);
+      it("should delete multiple characters", () => {
+        const state = createTestState(["hello"], 0, 1);
         const action = {
-          type: 'vim_delete_char' as const,
+          type: "vim_delete_char" as const,
           payload: { count: 3 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('ho');
+        expect(result.lines[0]).toBe("ho");
         expect(result.cursorCol).toBe(1);
       });
 
-      it('should not delete past end of line', () => {
-        const state = createTestState(['hello'], 0, 3);
+      it("should not delete past end of line", () => {
+        const state = createTestState(["hello"], 0, 3);
         const action = {
-          type: 'vim_delete_char' as const,
+          type: "vim_delete_char" as const,
           payload: { count: 5 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hel');
+        expect(result.lines[0]).toBe("hel");
         expect(result.cursorCol).toBe(3);
       });
 
-      it('should do nothing at end of line', () => {
-        const state = createTestState(['hello'], 0, 5);
+      it("should do nothing at end of line", () => {
+        const state = createTestState(["hello"], 0, 5);
         const action = {
-          type: 'vim_delete_char' as const,
+          type: "vim_delete_char" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hello');
+        expect(result.lines[0]).toBe("hello");
         expect(result.cursorCol).toBe(5);
       });
     });
 
-    describe('vim_delete_word_forward', () => {
-      it('should delete from cursor to next word start', () => {
-        const state = createTestState(['hello world test'], 0, 0);
+    describe("vim_delete_word_forward", () => {
+      it("should delete from cursor to next word start", () => {
+        const state = createTestState(["hello world test"], 0, 0);
         const action = {
-          type: 'vim_delete_word_forward' as const,
+          type: "vim_delete_word_forward" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('world test');
+        expect(result.lines[0]).toBe("world test");
         expect(result.cursorCol).toBe(0);
       });
 
-      it('should delete multiple words', () => {
-        const state = createTestState(['hello world test'], 0, 0);
+      it("should delete multiple words", () => {
+        const state = createTestState(["hello world test"], 0, 0);
         const action = {
-          type: 'vim_delete_word_forward' as const,
+          type: "vim_delete_word_forward" as const,
           payload: { count: 2 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('test');
+        expect(result.lines[0]).toBe("test");
         expect(result.cursorCol).toBe(0);
       });
 
-      it('should delete to end if no more words', () => {
-        const state = createTestState(['hello world'], 0, 6);
+      it("should delete to end if no more words", () => {
+        const state = createTestState(["hello world"], 0, 6);
         const action = {
-          type: 'vim_delete_word_forward' as const,
+          type: "vim_delete_word_forward" as const,
           payload: { count: 2 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hello ');
+        expect(result.lines[0]).toBe("hello ");
         expect(result.cursorCol).toBe(6);
       });
     });
 
-    describe('vim_delete_word_backward', () => {
-      it('should delete from cursor to previous word start', () => {
-        const state = createTestState(['hello world test'], 0, 12);
+    describe("vim_delete_word_backward", () => {
+      it("should delete from cursor to previous word start", () => {
+        const state = createTestState(["hello world test"], 0, 12);
         const action = {
-          type: 'vim_delete_word_backward' as const,
+          type: "vim_delete_word_backward" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hello test');
+        expect(result.lines[0]).toBe("hello test");
         expect(result.cursorCol).toBe(6);
       });
 
-      it('should delete multiple words backward', () => {
-        const state = createTestState(['hello world test'], 0, 12);
+      it("should delete multiple words backward", () => {
+        const state = createTestState(["hello world test"], 0, 12);
         const action = {
-          type: 'vim_delete_word_backward' as const,
+          type: "vim_delete_word_backward" as const,
           payload: { count: 2 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('test');
+        expect(result.lines[0]).toBe("test");
         expect(result.cursorCol).toBe(0);
       });
     });
 
-    describe('vim_delete_line', () => {
-      it('should delete current line', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 1, 2);
+    describe("vim_delete_line", () => {
+      it("should delete current line", () => {
+        const state = createTestState(["line1", "line2", "line3"], 1, 2);
         const action = {
-          type: 'vim_delete_line' as const,
+          type: "vim_delete_line" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines).toEqual(['line1', 'line3']);
+        expect(result.lines).toEqual(["line1", "line3"]);
         expect(result.cursorRow).toBe(1);
         expect(result.cursorCol).toBe(0);
       });
 
-      it('should delete multiple lines', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 0, 2);
+      it("should delete multiple lines", () => {
+        const state = createTestState(["line1", "line2", "line3"], 0, 2);
         const action = {
-          type: 'vim_delete_line' as const,
+          type: "vim_delete_line" as const,
           payload: { count: 2 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines).toEqual(['line3']);
+        expect(result.lines).toEqual(["line3"]);
         expect(result.cursorRow).toBe(0);
         expect(result.cursorCol).toBe(0);
       });
 
-      it('should leave empty line when deleting all lines', () => {
-        const state = createTestState(['only line'], 0, 0);
+      it("should leave empty line when deleting all lines", () => {
+        const state = createTestState(["only line"], 0, 0);
         const action = {
-          type: 'vim_delete_line' as const,
+          type: "vim_delete_line" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines).toEqual(['']);
+        expect(result.lines).toEqual([""]);
         expect(result.cursorRow).toBe(0);
         expect(result.cursorCol).toBe(0);
       });
     });
 
-    describe('vim_delete_to_end_of_line', () => {
-      it('should delete from cursor to end of line', () => {
-        const state = createTestState(['hello world'], 0, 5);
-        const action = { type: 'vim_delete_to_end_of_line' as const };
+    describe("vim_delete_to_end_of_line", () => {
+      it("should delete from cursor to end of line", () => {
+        const state = createTestState(["hello world"], 0, 5);
+        const action = { type: "vim_delete_to_end_of_line" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hello');
+        expect(result.lines[0]).toBe("hello");
         expect(result.cursorCol).toBe(5);
       });
 
-      it('should do nothing at end of line', () => {
-        const state = createTestState(['hello'], 0, 5);
-        const action = { type: 'vim_delete_to_end_of_line' as const };
+      it("should do nothing at end of line", () => {
+        const state = createTestState(["hello"], 0, 5);
+        const action = { type: "vim_delete_to_end_of_line" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hello');
+        expect(result.lines[0]).toBe("hello");
       });
     });
   });
 
-  describe('Insert mode commands', () => {
-    describe('vim_insert_at_cursor', () => {
-      it('should not change cursor position', () => {
-        const state = createTestState(['hello'], 0, 2);
-        const action = { type: 'vim_insert_at_cursor' as const };
+  describe("Insert mode commands", () => {
+    describe("vim_insert_at_cursor", () => {
+      it("should not change cursor position", () => {
+        const state = createTestState(["hello"], 0, 2);
+        const action = { type: "vim_insert_at_cursor" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -688,19 +688,19 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_append_at_cursor', () => {
-      it('should move cursor right by one', () => {
-        const state = createTestState(['hello'], 0, 2);
-        const action = { type: 'vim_append_at_cursor' as const };
+    describe("vim_append_at_cursor", () => {
+      it("should move cursor right by one", () => {
+        const state = createTestState(["hello"], 0, 2);
+        const action = { type: "vim_append_at_cursor" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(3);
       });
 
-      it('should not move past end of line', () => {
-        const state = createTestState(['hello'], 0, 5);
-        const action = { type: 'vim_append_at_cursor' as const };
+      it("should not move past end of line", () => {
+        const state = createTestState(["hello"], 0, 5);
+        const action = { type: "vim_append_at_cursor" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -708,10 +708,10 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_append_at_line_end', () => {
-      it('should move cursor to end of line', () => {
-        const state = createTestState(['hello world'], 0, 3);
-        const action = { type: 'vim_append_at_line_end' as const };
+    describe("vim_append_at_line_end", () => {
+      it("should move cursor to end of line", () => {
+        const state = createTestState(["hello world"], 0, 3);
+        const action = { type: "vim_append_at_line_end" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -719,19 +719,19 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_insert_at_line_start', () => {
-      it('should move to first non-whitespace character', () => {
-        const state = createTestState(['  hello world'], 0, 5);
-        const action = { type: 'vim_insert_at_line_start' as const };
+    describe("vim_insert_at_line_start", () => {
+      it("should move to first non-whitespace character", () => {
+        const state = createTestState(["  hello world"], 0, 5);
+        const action = { type: "vim_insert_at_line_start" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(2);
       });
 
-      it('should move to column 0 for line with only whitespace', () => {
-        const state = createTestState(['   '], 0, 1);
-        const action = { type: 'vim_insert_at_line_start' as const };
+      it("should move to column 0 for line with only whitespace", () => {
+        const state = createTestState(["   "], 0, 1);
+        const action = { type: "vim_insert_at_line_start" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -739,45 +739,45 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('vim_open_line_below', () => {
-      it('should insert a new line below the current one', () => {
-        const state = createTestState(['hello world'], 0, 5);
-        const action = { type: 'vim_open_line_below' as const };
+    describe("vim_open_line_below", () => {
+      it("should insert a new line below the current one", () => {
+        const state = createTestState(["hello world"], 0, 5);
+        const action = { type: "vim_open_line_below" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines).toEqual(['hello world', '']);
+        expect(result.lines).toEqual(["hello world", ""]);
         expect(result.cursorRow).toBe(1);
         expect(result.cursorCol).toBe(0);
       });
     });
 
-    describe('vim_open_line_above', () => {
-      it('should insert a new line above the current one', () => {
-        const state = createTestState(['hello', 'world'], 1, 2);
-        const action = { type: 'vim_open_line_above' as const };
+    describe("vim_open_line_above", () => {
+      it("should insert a new line above the current one", () => {
+        const state = createTestState(["hello", "world"], 1, 2);
+        const action = { type: "vim_open_line_above" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines).toEqual(['hello', '', 'world']);
+        expect(result.lines).toEqual(["hello", "", "world"]);
         expect(result.cursorRow).toBe(1);
         expect(result.cursorCol).toBe(0);
       });
     });
 
-    describe('vim_escape_insert_mode', () => {
-      it('should move cursor left', () => {
-        const state = createTestState(['hello'], 0, 3);
-        const action = { type: 'vim_escape_insert_mode' as const };
+    describe("vim_escape_insert_mode", () => {
+      it("should move cursor left", () => {
+        const state = createTestState(["hello"], 0, 3);
+        const action = { type: "vim_escape_insert_mode" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(2);
       });
 
-      it('should not move past beginning of line', () => {
-        const state = createTestState(['hello'], 0, 0);
-        const action = { type: 'vim_escape_insert_mode' as const };
+      it("should not move past beginning of line", () => {
+        const state = createTestState(["hello"], 0, 0);
+        const action = { type: "vim_escape_insert_mode" as const };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
@@ -786,87 +786,87 @@ describe('vim-buffer-actions', () => {
     });
   });
 
-  describe('Change commands', () => {
-    describe('vim_change_word_forward', () => {
-      it('should delete from cursor to next word start', () => {
-        const state = createTestState(['hello world test'], 0, 0);
+  describe("Change commands", () => {
+    describe("vim_change_word_forward", () => {
+      it("should delete from cursor to next word start", () => {
+        const state = createTestState(["hello world test"], 0, 0);
         const action = {
-          type: 'vim_change_word_forward' as const,
+          type: "vim_change_word_forward" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('world test');
+        expect(result.lines[0]).toBe("world test");
         expect(result.cursorCol).toBe(0);
       });
     });
 
-    describe('vim_change_line', () => {
-      it('should delete entire line content', () => {
-        const state = createTestState(['hello world'], 0, 5);
+    describe("vim_change_line", () => {
+      it("should delete entire line content", () => {
+        const state = createTestState(["hello world"], 0, 5);
         const action = {
-          type: 'vim_change_line' as const,
+          type: "vim_change_line" as const,
           payload: { count: 1 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('');
+        expect(result.lines[0]).toBe("");
         expect(result.cursorCol).toBe(0);
       });
     });
 
-    describe('vim_change_movement', () => {
-      it('should change characters to the left', () => {
-        const state = createTestState(['hello world'], 0, 5);
+    describe("vim_change_movement", () => {
+      it("should change characters to the left", () => {
+        const state = createTestState(["hello world"], 0, 5);
         const action = {
-          type: 'vim_change_movement' as const,
-          payload: { movement: 'h' as const, count: 2 },
+          type: "vim_change_movement" as const,
+          payload: { movement: "h" as const, count: 2 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hel world');
+        expect(result.lines[0]).toBe("hel world");
         expect(result.cursorCol).toBe(3);
       });
 
-      it('should change characters to the right', () => {
-        const state = createTestState(['hello world'], 0, 5);
+      it("should change characters to the right", () => {
+        const state = createTestState(["hello world"], 0, 5);
         const action = {
-          type: 'vim_change_movement' as const,
-          payload: { movement: 'l' as const, count: 3 },
+          type: "vim_change_movement" as const,
+          payload: { movement: "l" as const, count: 3 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
-        expect(result.lines[0]).toBe('hellorld'); // Deletes ' wo' (3 chars to the right)
+        expect(result.lines[0]).toBe("hellorld"); // Deletes ' wo' (3 chars to the right)
         expect(result.cursorCol).toBe(5);
       });
 
-      it('should change multiple lines down', () => {
-        const state = createTestState(['line1', 'line2', 'line3'], 0, 2);
+      it("should change multiple lines down", () => {
+        const state = createTestState(["line1", "line2", "line3"], 0, 2);
         const action = {
-          type: 'vim_change_movement' as const,
-          payload: { movement: 'j' as const, count: 2 },
+          type: "vim_change_movement" as const,
+          payload: { movement: "j" as const, count: 2 },
         };
 
         const result = handleVimAction(state, action);
         expect(result).toHaveOnlyValidCharacters();
         // The movement 'j' with count 2 changes 2 lines starting from cursor row
         // Since we're at cursor position 2, it changes lines starting from current row
-        expect(result.lines).toEqual(['line1', 'line2', 'line3']); // No change because count > available lines
+        expect(result.lines).toEqual(["line1", "line2", "line3"]); // No change because count > available lines
         expect(result.cursorRow).toBe(0);
         expect(result.cursorCol).toBe(2);
       });
     });
   });
 
-  describe('Edge cases', () => {
-    it('should handle empty text', () => {
-      const state = createTestState([''], 0, 0);
+  describe("Edge cases", () => {
+    it("should handle empty text", () => {
+      const state = createTestState([""], 0, 0);
       const action = {
-        type: 'vim_move_word_forward' as const,
+        type: "vim_move_word_forward" as const,
         payload: { count: 1 },
       };
 
@@ -876,19 +876,19 @@ describe('vim-buffer-actions', () => {
       expect(result.cursorCol).toBe(0);
     });
 
-    it('should handle single character line', () => {
-      const state = createTestState(['a'], 0, 0);
-      const action = { type: 'vim_move_to_line_end' as const };
+    it("should handle single character line", () => {
+      const state = createTestState(["a"], 0, 0);
+      const action = { type: "vim_move_to_line_end" as const };
 
       const result = handleVimAction(state, action);
       expect(result).toHaveOnlyValidCharacters();
       expect(result.cursorCol).toBe(0); // Should be last character position
     });
 
-    it('should handle empty lines in multi-line text', () => {
-      const state = createTestState(['line1', '', 'line3'], 1, 0);
+    it("should handle empty lines in multi-line text", () => {
+      const state = createTestState(["line1", "", "line3"], 1, 0);
       const action = {
-        type: 'vim_move_word_forward' as const,
+        type: "vim_move_word_forward" as const,
         payload: { count: 1 },
       };
 
@@ -899,12 +899,12 @@ describe('vim-buffer-actions', () => {
       expect(result.cursorCol).toBe(0);
     });
 
-    it('should preserve undo stack in operations', () => {
-      const state = createTestState(['hello'], 0, 0);
-      state.undoStack = [{ lines: ['previous'], cursorRow: 0, cursorCol: 0 }];
+    it("should preserve undo stack in operations", () => {
+      const state = createTestState(["hello"], 0, 0);
+      state.undoStack = [{ lines: ["previous"], cursorRow: 0, cursorCol: 0 }];
 
       const action = {
-        type: 'vim_delete_char' as const,
+        type: "vim_delete_char" as const,
         payload: { count: 1 },
       };
 
@@ -914,14 +914,14 @@ describe('vim-buffer-actions', () => {
     });
   });
 
-  describe('UTF-32 character handling in word/line operations', () => {
-    describe('Right-to-left text handling', () => {
-      it('should handle Arabic text in word movements', () => {
-        const state = createTestState(['hello مرحبا world'], 0, 0);
+  describe("UTF-32 character handling in word/line operations", () => {
+    describe("Right-to-left text handling", () => {
+      it("should handle Arabic text in word movements", () => {
+        const state = createTestState(["hello مرحبا world"], 0, 0);
 
         // Move to end of 'hello'
         let result = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -929,7 +929,7 @@ describe('vim-buffer-actions', () => {
 
         // Move to end of Arabic word
         result = handleVimAction(result, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -937,13 +937,13 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('Chinese character handling', () => {
-      it('should handle Chinese characters in word movements', () => {
-        const state = createTestState(['hello 你好 world'], 0, 0);
+    describe("Chinese character handling", () => {
+      it("should handle Chinese characters in word movements", () => {
+        const state = createTestState(["hello 你好 world"], 0, 0);
 
         // Move to end of 'hello'
         let result = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -951,7 +951,7 @@ describe('vim-buffer-actions', () => {
 
         // Move forward to start of 'world'
         result = handleVimAction(result, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -959,12 +959,12 @@ describe('vim-buffer-actions', () => {
       });
     });
 
-    describe('Mixed script handling', () => {
-      it('should handle mixed Latin and non-Latin scripts with word end commands', () => {
-        const state = createTestState(['test中文test'], 0, 0);
+    describe("Mixed script handling", () => {
+      it("should handle mixed Latin and non-Latin scripts with word end commands", () => {
+        const state = createTestState(["test中文test"], 0, 0);
 
         let result = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -972,18 +972,18 @@ describe('vim-buffer-actions', () => {
 
         // Second word end command should move to end of '中文'
         result = handleVimAction(result, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(5); // End of '中文'
       });
 
-      it('should handle mixed Latin and non-Latin scripts with word forward commands', () => {
-        const state = createTestState(['test中文test'], 0, 0);
+      it("should handle mixed Latin and non-Latin scripts with word forward commands", () => {
+        const state = createTestState(["test中文test"], 0, 0);
 
         let result = handleVimAction(state, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -991,18 +991,18 @@ describe('vim-buffer-actions', () => {
 
         // Second word forward command should move to start of final 'test'
         result = handleVimAction(result, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(6); // Start of final 'test'
       });
 
-      it('should handle mixed Latin and non-Latin scripts with word backward commands', () => {
-        const state = createTestState(['test中文test'], 0, 9); // Start at end of final 'test'
+      it("should handle mixed Latin and non-Latin scripts with word backward commands", () => {
+        const state = createTestState(["test中文test"], 0, 9); // Start at end of final 'test'
 
         let result = handleVimAction(state, {
-          type: 'vim_move_word_backward' as const,
+          type: "vim_move_word_backward" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
@@ -1010,26 +1010,26 @@ describe('vim-buffer-actions', () => {
 
         // Second word backward command should move to start of '中文'
         result = handleVimAction(result, {
-          type: 'vim_move_word_backward' as const,
+          type: "vim_move_word_backward" as const,
           payload: { count: 1 },
         });
         expect(result).toHaveOnlyValidCharacters();
         expect(result.cursorCol).toBe(4); // Start of '中'
       });
 
-      it('should handle Unicode block characters consistently with w and e commands', () => {
-        const state = createTestState(['██ █████ ██'], 0, 0);
+      it("should handle Unicode block characters consistently with w and e commands", () => {
+        const state = createTestState(["██ █████ ██"], 0, 0);
 
         // Test w command progression
         let wResult = handleVimAction(state, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(wResult).toHaveOnlyValidCharacters();
         expect(wResult.cursorCol).toBe(3); // Start of second block sequence
 
         wResult = handleVimAction(wResult, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(wResult).toHaveOnlyValidCharacters();
@@ -1037,87 +1037,87 @@ describe('vim-buffer-actions', () => {
 
         // Test e command progression from beginning
         let eResult = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(eResult).toHaveOnlyValidCharacters();
         expect(eResult.cursorCol).toBe(1); // End of first block sequence
 
         eResult = handleVimAction(eResult, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(eResult).toHaveOnlyValidCharacters();
         expect(eResult.cursorCol).toBe(7); // End of second block sequence
 
         eResult = handleVimAction(eResult, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(eResult).toHaveOnlyValidCharacters();
         expect(eResult.cursorCol).toBe(10); // End of third block sequence
       });
 
-      it('should handle strings starting with Chinese characters', () => {
-        const state = createTestState(['中文test英文word'], 0, 0);
+      it("should handle strings starting with Chinese characters", () => {
+        const state = createTestState(["中文test英文word"], 0, 0);
 
         // Test 'w' command - when at start of non-Latin word, w moves to next word
         let wResult = handleVimAction(state, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(wResult).toHaveOnlyValidCharacters();
         expect(wResult.cursorCol).toBe(2); // Start of 'test'
 
         wResult = handleVimAction(wResult, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(wResult.cursorCol).toBe(6); // Start of '英文'
 
         // Test 'e' command
         let eResult = handleVimAction(state, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(eResult).toHaveOnlyValidCharacters();
         expect(eResult.cursorCol).toBe(1); // End of 中文
 
         eResult = handleVimAction(eResult, {
-          type: 'vim_move_word_end' as const,
+          type: "vim_move_word_end" as const,
           payload: { count: 1 },
         });
         expect(eResult.cursorCol).toBe(5); // End of test
       });
 
-      it('should handle strings starting with Arabic characters', () => {
-        const state = createTestState(['مرحباhelloسلام'], 0, 0);
+      it("should handle strings starting with Arabic characters", () => {
+        const state = createTestState(["مرحباhelloسلام"], 0, 0);
 
         // Test 'w' command - when at start of non-Latin word, w moves to next word
         let wResult = handleVimAction(state, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(wResult).toHaveOnlyValidCharacters();
         expect(wResult.cursorCol).toBe(5); // Start of 'hello'
 
         wResult = handleVimAction(wResult, {
-          type: 'vim_move_word_forward' as const,
+          type: "vim_move_word_forward" as const,
           payload: { count: 1 },
         });
         expect(wResult.cursorCol).toBe(10); // Start of 'سلام'
 
         // Test 'b' command from end
-        const bState = createTestState(['مرحباhelloسلام'], 0, 13);
+        const bState = createTestState(["مرحباhelloسلام"], 0, 13);
         let bResult = handleVimAction(bState, {
-          type: 'vim_move_word_backward' as const,
+          type: "vim_move_word_backward" as const,
           payload: { count: 1 },
         });
         expect(bResult).toHaveOnlyValidCharacters();
         expect(bResult.cursorCol).toBe(10); // Start of سلام
 
         bResult = handleVimAction(bResult, {
-          type: 'vim_move_word_backward' as const,
+          type: "vim_move_word_backward" as const,
           payload: { count: 1 },
         });
         expect(bResult.cursorCol).toBe(5); // Start of hello
diff --git a/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.ts b/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.ts
index 8243aeabd..3f4d23b39 100644
--- a/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.ts
+++ b/packages/ui-gemini/src/ui/components/shared/vim-buffer-actions.ts
@@ -4,21 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TextBufferState, TextBufferAction } from './text-buffer.js';
+import { assumeExhaustive } from "../../../utils/checks.js";
+import { cpLen, toCodePoints } from "../../utils/textUtils.js";
+import type { TextBufferAction, TextBufferState } from "./text-buffer.js";
 import {
+  findNextWordAcrossLines,
+  findPrevWordAcrossLines,
+  findWordEndInLine,
   getLineRangeOffsets,
   getPositionFromOffsets,
-  replaceRangeInternal,
-  pushUndo,
+  isCombiningMark,
   isWordCharStrict,
   isWordCharWithCombining,
-  isCombiningMark,
-  findNextWordAcrossLines,
-  findPrevWordAcrossLines,
-  findWordEndInLine,
-} from './text-buffer.js';
-import { cpLen, toCodePoints } from '../../utils/textUtils.js';
-import { assumeExhaustive } from '../../../utils/checks.js';
+  pushUndo,
+  replaceRangeInternal,
+} from "./text-buffer.js";
 
 // Check if we're at the end of a base word (on the last base character)
 // Returns true if current position has a base character followed only by combining marks until non-word
@@ -39,49 +39,46 @@ function isAtEndOfBaseWord(lineCodePoints: string[], col: number): boolean {
 
 export type VimAction = Extract<
   TextBufferAction,
-  | { type: 'vim_delete_word_forward' }
-  | { type: 'vim_delete_word_backward' }
-  | { type: 'vim_delete_word_end' }
-  | { type: 'vim_change_word_forward' }
-  | { type: 'vim_change_word_backward' }
-  | { type: 'vim_change_word_end' }
-  | { type: 'vim_delete_line' }
-  | { type: 'vim_change_line' }
-  | { type: 'vim_delete_to_end_of_line' }
-  | { type: 'vim_change_to_end_of_line' }
-  | { type: 'vim_change_movement' }
-  | { type: 'vim_move_left' }
-  | { type: 'vim_move_right' }
-  | { type: 'vim_move_up' }
-  | { type: 'vim_move_down' }
-  | { type: 'vim_move_word_forward' }
-  | { type: 'vim_move_word_backward' }
-  | { type: 'vim_move_word_end' }
-  | { type: 'vim_delete_char' }
-  | { type: 'vim_insert_at_cursor' }
-  | { type: 'vim_append_at_cursor' }
-  | { type: 'vim_open_line_below' }
-  | { type: 'vim_open_line_above' }
-  | { type: 'vim_append_at_line_end' }
-  | { type: 'vim_insert_at_line_start' }
-  | { type: 'vim_move_to_line_start' }
-  | { type: 'vim_move_to_line_end' }
-  | { type: 'vim_move_to_first_nonwhitespace' }
-  | { type: 'vim_move_to_first_line' }
-  | { type: 'vim_move_to_last_line' }
-  | { type: 'vim_move_to_line' }
-  | { type: 'vim_escape_insert_mode' }
+  | { type: "vim_delete_word_forward" }
+  | { type: "vim_delete_word_backward" }
+  | { type: "vim_delete_word_end" }
+  | { type: "vim_change_word_forward" }
+  | { type: "vim_change_word_backward" }
+  | { type: "vim_change_word_end" }
+  | { type: "vim_delete_line" }
+  | { type: "vim_change_line" }
+  | { type: "vim_delete_to_end_of_line" }
+  | { type: "vim_change_to_end_of_line" }
+  | { type: "vim_change_movement" }
+  | { type: "vim_move_left" }
+  | { type: "vim_move_right" }
+  | { type: "vim_move_up" }
+  | { type: "vim_move_down" }
+  | { type: "vim_move_word_forward" }
+  | { type: "vim_move_word_backward" }
+  | { type: "vim_move_word_end" }
+  | { type: "vim_delete_char" }
+  | { type: "vim_insert_at_cursor" }
+  | { type: "vim_append_at_cursor" }
+  | { type: "vim_open_line_below" }
+  | { type: "vim_open_line_above" }
+  | { type: "vim_append_at_line_end" }
+  | { type: "vim_insert_at_line_start" }
+  | { type: "vim_move_to_line_start" }
+  | { type: "vim_move_to_line_end" }
+  | { type: "vim_move_to_first_nonwhitespace" }
+  | { type: "vim_move_to_first_line" }
+  | { type: "vim_move_to_last_line" }
+  | { type: "vim_move_to_line" }
+  | { type: "vim_escape_insert_mode" }
 >;
 
-export function handleVimAction(
-  state: TextBufferState,
-  action: VimAction,
-): TextBufferState {
+export function handleVimAction(state: TextBufferState, action: VimAction): TextBufferState {
   const { lines, cursorRow, cursorCol } = state;
 
   switch (action.type) {
-    case 'vim_delete_word_forward':
-    case 'vim_change_word_forward': {
+    case "vim_delete_word_forward":
+    case "vim_change_word_forward": {
       const { count } = action.payload;
       let endRow = cursorRow;
       let endCol = cursorCol;
@@ -93,7 +90,7 @@ export function handleVimAction(
           endCol = nextWord.col;
         } else {
           // No more words, delete/change to end of current word or line
-          const currentLine = lines[endRow] || '';
+          const currentLine = lines[endRow] || "";
           const wordEnd = findWordEndInLine(currentLine, endCol);
           if (wordEnd !== null) {
             endCol = wordEnd + 1; // Include the character at word end
@@ -106,20 +103,13 @@ export function handleVimAction(
 
       if (endRow !== cursorRow || endCol !== cursorCol) {
         const nextState = pushUndo(state);
-        return replaceRangeInternal(
-          nextState,
-          cursorRow,
-          cursorCol,
-          endRow,
-          endCol,
-          '',
-        );
+        return replaceRangeInternal(nextState, cursorRow, cursorCol, endRow, endCol, "");
       }
       return state;
     }
 
-    case 'vim_delete_word_backward':
-    case 'vim_change_word_backward': {
+    case "vim_delete_word_backward":
+    case "vim_change_word_backward": {
       const { count } = action.payload;
       let startRow = cursorRow;
       let startCol = cursorCol;
@@ -136,20 +126,13 @@ export function handleVimAction(
 
       if (startRow !== cursorRow || startCol !== cursorCol) {
         const nextState = pushUndo(state);
-        return replaceRangeInternal(
-          nextState,
-          startRow,
-          startCol,
-          cursorRow,
-          cursorCol,
-          '',
-        );
+        return replaceRangeInternal(nextState, startRow, startCol, cursorRow, cursorCol, "");
       }
       return state;
     }
 
-    case 'vim_delete_word_end':
-    case 'vim_change_word_end': {
+    case "vim_delete_word_end":
+    case "vim_change_word_end": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -163,12 +146,7 @@ export function handleVimAction(
           endCol = wordEnd.col + 1; // Include the character at word end
           // For next iteration, move to start of next word
           if (i < count - 1) {
-            const nextWord = findNextWordAcrossLines(
-              lines,
-              wordEnd.row,
-              wordEnd.col + 1,
-              true,
-            );
+            const nextWord = findNextWordAcrossLines(lines, wordEnd.row, wordEnd.col + 1, true);
             if (nextWord) {
               row = nextWord.row;
               col = nextWord.col;
@@ -183,25 +161,18 @@ export function handleVimAction(
 
       // Ensure we don't go past the end of the last line
       if (endRow < lines.length) {
-        const lineLen = cpLen(lines[endRow] || '');
+        const lineLen = cpLen(lines[endRow] || "");
         endCol = Math.min(endCol, lineLen);
       }
 
       if (endRow !== cursorRow || endCol !== cursorCol) {
         const nextState = pushUndo(state);
-        return replaceRangeInternal(
-          nextState,
-          cursorRow,
-          cursorCol,
-          endRow,
-          endCol,
-          '',
-        );
+        return replaceRangeInternal(nextState, cursorRow, cursorCol, endRow, endCol, "");
       }
       return state;
     }
 
-    case 'vim_delete_line': {
+    case "vim_delete_line": {
       const { count } = action.payload;
       if (lines.length === 0) return state;
 
@@ -214,7 +185,7 @@ export function handleVimAction(
         const nextState = pushUndo(state);
         return {
           ...nextState,
-          lines: [''],
+          lines: [""],
           cursorRow: 0,
           cursorCol: 0,
           preferredCol: null,
@@ -238,7 +209,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_change_line': {
+    case "vim_change_line": {
       const { count } = action.payload;
       if (lines.length === 0) return state;
 
@@ -255,19 +226,12 @@ export function handleVimAction(
         endOffset,
         nextState.lines,
       );
-      return replaceRangeInternal(
-        nextState,
-        startRow,
-        startCol,
-        endRow,
-        endCol,
-        '',
-      );
+      return replaceRangeInternal(nextState, startRow, startCol, endRow, endCol, "");
     }
 
-    case 'vim_delete_to_end_of_line':
-    case 'vim_change_to_end_of_line': {
-      const currentLine = lines[cursorRow] || '';
+    case "vim_delete_to_end_of_line":
+    case "vim_change_to_end_of_line": {
+      const currentLine = lines[cursorRow] || "";
       if (cursorCol < cpLen(currentLine)) {
         const nextState = pushUndo(state);
         return replaceRangeInternal(
@@ -276,18 +240,18 @@ export function handleVimAction(
           cursorCol,
           cursorRow,
           cpLen(currentLine),
-          '',
+          "",
         );
       }
       return state;
     }
 
-    case 'vim_change_movement': {
+    case "vim_change_movement": {
       const { movement, count } = action.payload;
       const totalLines = lines.length;
 
       switch (movement) {
-        case 'h': {
+        case "h": {
           // Left
           // Change N characters to the left
           const startCol = Math.max(0, cursorCol - count);
@@ -297,24 +261,17 @@ export function handleVimAction(
             startCol,
             cursorRow,
             cursorCol,
-            '',
+            "",
           );
         }
 
-        case 'j': {
+        case "j": {
           // Down
           const linesToChange = Math.min(count, totalLines - cursorRow);
           if (linesToChange > 0) {
             if (totalLines === 1) {
-              const currentLine = state.lines[0] || '';
-              return replaceRangeInternal(
-                pushUndo(state),
-                0,
-                0,
-                0,
-                cpLen(currentLine),
-                '',
-              );
+              const currentLine = state.lines[0] || "";
+              return replaceRangeInternal(pushUndo(state), 0, 0, 0, cpLen(currentLine), "");
             } else {
               const nextState = pushUndo(state);
               const { startOffset, endOffset } = getLineRangeOffsets(
@@ -322,35 +279,24 @@ export function handleVimAction(
                 linesToChange,
                 nextState.lines,
               );
-              const { startRow, startCol, endRow, endCol } =
-                getPositionFromOffsets(startOffset, endOffset, nextState.lines);
-              return replaceRangeInternal(
-                nextState,
-                startRow,
-                startCol,
-                endRow,
-                endCol,
-                '',
+              const { startRow, startCol, endRow, endCol } = getPositionFromOffsets(
+                startOffset,
+                endOffset,
+                nextState.lines,
               );
+              return replaceRangeInternal(nextState, startRow, startCol, endRow, endCol, "");
             }
           }
           return state;
         }
 
-        case 'k': {
+        case "k": {
           // Up
           const upLines = Math.min(count, cursorRow + 1);
           if (upLines > 0) {
             if (state.lines.length === 1) {
-              const currentLine = state.lines[0] || '';
-              return replaceRangeInternal(
-                pushUndo(state),
-                0,
-                0,
-                0,
-                cpLen(currentLine),
-                '',
-              );
+              const currentLine = state.lines[0] || "";
+              return replaceRangeInternal(pushUndo(state), 0, 0, 0, cpLen(currentLine), "");
             } else {
               const startRow = Math.max(0, cursorRow - count + 1);
               const linesToChange = cursorRow - startRow + 1;
@@ -365,18 +311,14 @@ export function handleVimAction(
                 startCol,
                 endRow,
                 endCol,
-              } = getPositionFromOffsets(
-                startOffset,
-                endOffset,
-                nextState.lines,
-              );
+              } = getPositionFromOffsets(startOffset, endOffset, nextState.lines);
               const resultState = replaceRangeInternal(
                 nextState,
                 newStartRow,
                 startCol,
                 endRow,
                 endCol,
-                '',
+                "",
               );
               return {
                 ...resultState,
@@ -388,7 +330,7 @@ export function handleVimAction(
           return state;
         }
 
-        case 'l': {
+        case "l": {
           // Right
           // Change N characters to the right
           return replaceRangeInternal(
@@ -396,8 +338,8 @@ export function handleVimAction(
             cursorRow,
             cursorCol,
             cursorRow,
-            Math.min(cpLen(lines[cursorRow] || ''), cursorCol + count),
-            '',
+            Math.min(cpLen(lines[cursorRow] || ""), cursorCol + count),
+            "",
           );
         }
 
@@ -406,7 +348,7 @@ export function handleVimAction(
       }
     }
 
-    case 'vim_move_left': {
+    case "vim_move_left": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       let newRow = cursorRow;
@@ -418,7 +360,7 @@ export function handleVimAction(
         } else if (newRow > 0) {
           // Move to end of previous line
           newRow--;
-          const prevLine = lines[newRow] || '';
+          const prevLine = lines[newRow] || "";
           const prevLineLength = cpLen(prevLine);
           // Position on last character, or column 0 for empty lines
           newCol = prevLineLength === 0 ? 0 : prevLineLength - 1;
@@ -433,14 +375,14 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_right': {
+    case "vim_move_right": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       let newRow = cursorRow;
       let newCol = cursorCol;
 
       for (let i = 0; i < count; i++) {
-        const currentLine = lines[newRow] || '';
+        const currentLine = lines[newRow] || "";
         const lineLength = cpLen(currentLine);
         // Don't move past the last character of the line
         // For empty lines, stay at column 0; for non-empty lines, don't go past last character
@@ -477,16 +419,13 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_up': {
+    case "vim_move_up": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       const newRow = Math.max(0, cursorRow - count);
-      const targetLine = lines[newRow] || '';
+      const targetLine = lines[newRow] || "";
       const targetLineLength = cpLen(targetLine);
-      const newCol = Math.min(
-        cursorCol,
-        targetLineLength > 0 ? targetLineLength - 1 : 0,
-      );
+      const newCol = Math.min(cursorCol, targetLineLength > 0 ? targetLineLength - 1 : 0);
 
       return {
         ...state,
@@ -496,16 +435,13 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_down': {
+    case "vim_move_down": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
       const newRow = Math.min(lines.length - 1, cursorRow + count);
-      const targetLine = lines[newRow] || '';
+      const targetLine = lines[newRow] || "";
       const targetLineLength = cpLen(targetLine);
-      const newCol = Math.min(
-        cursorCol,
-        targetLineLength > 0 ? targetLineLength - 1 : 0,
-      );
+      const newCol = Math.min(cursorCol, targetLineLength > 0 ? targetLineLength - 1 : 0);
 
       return {
         ...state,
@@ -515,7 +451,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_word_forward': {
+    case "vim_move_word_forward": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -539,7 +475,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_word_backward': {
+    case "vim_move_word_backward": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -562,7 +498,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_word_end': {
+    case "vim_move_word_end": {
       const { count } = action.payload;
       let row = cursorRow;
       let col = cursorCol;
@@ -570,7 +506,7 @@ export function handleVimAction(
       for (let i = 0; i < count; i++) {
         // Special handling for the first iteration when we're at end of word
         if (i === 0) {
-          const currentLine = lines[row] || '';
+          const currentLine = lines[row] || "";
           const lineCodePoints = toCodePoints(currentLine);
 
           // Check if we're at the end of a word (on the last base character)
@@ -580,17 +516,11 @@ export function handleVimAction(
             (col + 1 >= lineCodePoints.length ||
               !isWordCharWithCombining(lineCodePoints[col + 1]) ||
               // Or if we're on a base char followed only by combining marks until non-word
-              (isWordCharStrict(lineCodePoints[col]) &&
-                isAtEndOfBaseWord(lineCodePoints, col)));
+              (isWordCharStrict(lineCodePoints[col]) && isAtEndOfBaseWord(lineCodePoints, col)));
 
           if (atEndOfWord) {
             // We're already at end of word, find next word end
-            const nextWord = findNextWordAcrossLines(
-              lines,
-              row,
-              col + 1,
-              false,
-            );
+            const nextWord = findNextWordAcrossLines(lines, row, col + 1, false);
             if (nextWord) {
               row = nextWord.row;
               col = nextWord.col;
@@ -616,10 +546,10 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_delete_char': {
+    case "vim_delete_char": {
       const { count } = action.payload;
       const { cursorRow, cursorCol, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       const lineLength = cpLen(currentLine);
 
       if (cursorCol < lineLength) {
@@ -631,20 +561,20 @@ export function handleVimAction(
           cursorCol,
           cursorRow,
           cursorCol + deleteCount,
-          '',
+          "",
         );
       }
       return state;
     }
 
-    case 'vim_insert_at_cursor': {
+    case "vim_insert_at_cursor": {
       // Just return state - mode change is handled elsewhere
       return state;
     }
 
-    case 'vim_append_at_cursor': {
+    case "vim_append_at_cursor": {
       const { cursorRow, cursorCol, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       const newCol = cursorCol < cpLen(currentLine) ? cursorCol + 1 : cursorCol;
 
       return {
@@ -654,35 +584,21 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_open_line_below': {
+    case "vim_open_line_below": {
       const { cursorRow, lines } = state;
       const nextState = pushUndo(state);
 
       // Insert newline at end of current line
-      const endOfLine = cpLen(lines[cursorRow] || '');
-      return replaceRangeInternal(
-        nextState,
-        cursorRow,
-        endOfLine,
-        cursorRow,
-        endOfLine,
-        '\n',
-      );
+      const endOfLine = cpLen(lines[cursorRow] || "");
+      return replaceRangeInternal(nextState, cursorRow, endOfLine, cursorRow, endOfLine, "\n");
     }
 
-    case 'vim_open_line_above': {
+    case "vim_open_line_above": {
       const { cursorRow } = state;
       const nextState = pushUndo(state);
 
       // Insert newline at beginning of current line
-      const resultState = replaceRangeInternal(
-        nextState,
-        cursorRow,
-        0,
-        cursorRow,
-        0,
-        '\n',
-      );
+      const resultState = replaceRangeInternal(nextState, cursorRow, 0, cursorRow, 0, "\n");
 
       // Move cursor to the new line above
       return {
@@ -692,9 +608,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_append_at_line_end': {
+    case "vim_append_at_line_end": {
       const { cursorRow, lines } = state;
-      const lineLength = cpLen(lines[cursorRow] || '');
+      const lineLength = cpLen(lines[cursorRow] || "");
 
       return {
         ...state,
@@ -703,9 +619,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_insert_at_line_start': {
+    case "vim_insert_at_line_start": {
       const { cursorRow, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       let col = 0;
 
       // Find first non-whitespace character using proper Unicode handling
@@ -721,7 +637,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_line_start': {
+    case "vim_move_to_line_start": {
       return {
         ...state,
         cursorCol: 0,
@@ -729,9 +645,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_line_end': {
+    case "vim_move_to_line_end": {
       const { cursorRow, lines } = state;
-      const lineLength = cpLen(lines[cursorRow] || '');
+      const lineLength = cpLen(lines[cursorRow] || "");
 
       return {
         ...state,
@@ -740,9 +656,9 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_first_nonwhitespace': {
+    case "vim_move_to_first_nonwhitespace": {
       const { cursorRow, lines } = state;
-      const currentLine = lines[cursorRow] || '';
+      const currentLine = lines[cursorRow] || "";
       let col = 0;
 
       // Find first non-whitespace character using proper Unicode handling
@@ -758,7 +674,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_first_line': {
+    case "vim_move_to_first_line": {
       return {
         ...state,
         cursorRow: 0,
@@ -767,7 +683,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_last_line': {
+    case "vim_move_to_last_line": {
       const { lines } = state;
       const lastRow = lines.length - 1;
 
@@ -779,7 +695,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_move_to_line': {
+    case "vim_move_to_line": {
       const { lineNumber } = action.payload;
       const { lines } = state;
       const targetRow = Math.min(Math.max(0, lineNumber - 1), lines.length - 1);
@@ -792,7 +708,7 @@ export function handleVimAction(
       };
     }
 
-    case 'vim_escape_insert_mode': {
+    case "vim_escape_insert_mode": {
       // Move cursor left if not at beginning of line (vim behavior when exiting insert mode)
       const { cursorCol } = state;
       const newCol = cursorCol > 0 ? cursorCol - 1 : 0;
diff --git a/packages/ui-gemini/src/ui/components/views/ChatList.test.tsx b/packages/ui-gemini/src/ui/components/views/ChatList.test.tsx
index 9d42da7de..2d7a25c41 100644
--- a/packages/ui-gemini/src/ui/components/views/ChatList.test.tsx
+++ b/packages/ui-gemini/src/ui/components/views/ChatList.test.tsx
@@ -4,47 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { describe, it, expect } from 'vitest';
-import { ChatList } from './ChatList.js';
-import type { ChatDetail } from '../../types.js';
+import { describe, expect, it } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import type { ChatDetail } from "../../types.js";
+import { ChatList } from "./ChatList.js";
 
 const mockChats: ChatDetail[] = [
   {
-    name: 'chat-1',
-    mtime: '2025-10-02T10:00:00.000Z',
+    name: "chat-1",
+    mtime: "2025-10-02T10:00:00.000Z",
   },
   {
-    name: 'another-chat',
-    mtime: '2025-10-01T12:30:00.000Z',
+    name: "another-chat",
+    mtime: "2025-10-01T12:30:00.000Z",
   },
 ];
 
-describe('<ChatList />', () => {
-  it('renders correctly with a list of chats', () => {
+describe("<ChatList />", () => {
+  it("renders correctly with a list of chats", () => {
     const { lastFrame, unmount } = render(<ChatList chats={mockChats} />);
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with no chats', () => {
+  it("renders correctly with no chats", () => {
     const { lastFrame, unmount } = render(<ChatList chats={[]} />);
-    expect(lastFrame()).toContain('No saved conversation checkpoints found.');
+    expect(lastFrame()).toContain("No saved conversation checkpoints found.");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('handles invalid date formats gracefully', () => {
+  it("handles invalid date formats gracefully", () => {
     const mockChatsWithInvalidDate: ChatDetail[] = [
       {
-        name: 'bad-date-chat',
-        mtime: 'an-invalid-date-string',
+        name: "bad-date-chat",
+        mtime: "an-invalid-date-string",
       },
     ];
-    const { lastFrame, unmount } = render(
-      <ChatList chats={mockChatsWithInvalidDate} />,
-    );
-    expect(lastFrame()).toContain('(Invalid Date)');
+    const { lastFrame, unmount } = render(<ChatList chats={mockChatsWithInvalidDate} />);
+    expect(lastFrame()).toContain("(Invalid Date)");
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
diff --git a/packages/ui-gemini/src/ui/components/views/ChatList.tsx b/packages/ui-gemini/src/ui/components/views/ChatList.tsx
index 9e6e36b3a..bdbb349bc 100644
--- a/packages/ui-gemini/src/ui/components/views/ChatList.tsx
+++ b/packages/ui-gemini/src/ui/components/views/ChatList.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import type { ChatDetail } from '../../types.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import type { ChatDetail } from "../../types.js";
 
 interface ChatListProps {
   chats: readonly ChatDetail[];
@@ -24,16 +24,12 @@ export const ChatList: React.FC<ChatListProps> = ({ chats }) => {
       <Box height={1} />
       {chats.map((chat) => {
         const isoString = chat.mtime;
-        const match = isoString.match(
-          /(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})/,
-        );
-        const formattedDate = match
-          ? `${match[1]} ${match[2]}`
-          : 'Invalid Date';
+        const match = isoString.match(/(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})/);
+        const formattedDate = match ? `${match[1]} ${match[2]}` : "Invalid Date";
         return (
           <Box key={chat.name} flexDirection="row">
             <Text>
-              {'  '}- <Text color={theme.text.accent}>{chat.name}</Text>{' '}
+              {"  "}- <Text color={theme.text.accent}>{chat.name}</Text>{" "}
               <Text color={theme.text.secondary}>({formattedDate})</Text>
             </Text>
           </Box>
diff --git a/packages/ui-gemini/src/ui/components/views/ExtensionsList.test.tsx b/packages/ui-gemini/src/ui/components/views/ExtensionsList.test.tsx
index 8c841991c..1647227f0 100644
--- a/packages/ui-gemini/src/ui/components/views/ExtensionsList.test.tsx
+++ b/packages/ui-gemini/src/ui/components/views/ExtensionsList.test.tsx
@@ -4,51 +4,49 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { vi, describe, beforeEach, it, expect } from 'vitest';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { ExtensionUpdateState } from '../../state/extensions.js';
-import { ExtensionsList } from './ExtensionsList.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { ExtensionUpdateState } from "../../state/extensions.js";
+import { ExtensionsList } from "./ExtensionsList.js";
 
-vi.mock('../../contexts/UIStateContext.js');
+vi.mock("../../contexts/UIStateContext.js");
 
 const mockUseUIState = vi.mocked(useUIState);
 
 const mockExtensions = [
   {
-    name: 'ext-one',
-    version: '1.0.0',
+    name: "ext-one",
+    version: "1.0.0",
     isActive: true,
-    path: '/path/to/ext-one',
+    path: "/path/to/ext-one",
     contextFiles: [],
-    id: '',
+    id: "",
   },
   {
-    name: 'ext-two',
-    version: '2.1.0',
+    name: "ext-two",
+    version: "2.1.0",
     isActive: true,
-    path: '/path/to/ext-two',
+    path: "/path/to/ext-two",
     contextFiles: [],
-    id: '',
+    id: "",
   },
   {
-    name: 'ext-disabled',
-    version: '3.0.0',
+    name: "ext-disabled",
+    version: "3.0.0",
     isActive: false,
-    path: '/path/to/ext-disabled',
+    path: "/path/to/ext-disabled",
     contextFiles: [],
-    id: '',
+    id: "",
   },
 ];
 
-describe('<ExtensionsList />', () => {
+describe("<ExtensionsList />", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  const mockUIState = (
-    extensionsUpdateState: Map<string, ExtensionUpdateState>,
-  ) => {
+  const mockUIState = (extensionsUpdateState: Map<string, ExtensionUpdateState>) => {
     mockUseUIState.mockReturnValue({
       extensionsUpdateState,
       // Add other required properties from UIState if needed by the component
@@ -58,59 +56,55 @@ describe('<ExtensionsList />', () => {
   it('should render "No extensions installed." if there are no extensions', () => {
     mockUIState(new Map());
     const { lastFrame, unmount } = render(<ExtensionsList extensions={[]} />);
-    expect(lastFrame()).toContain('No extensions installed.');
+    expect(lastFrame()).toContain("No extensions installed.");
     unmount();
   });
 
-  it('should render a list of extensions with their version and status', () => {
+  it("should render a list of extensions with their version and status", () => {
     mockUIState(new Map());
-    const { lastFrame, unmount } = render(
-      <ExtensionsList extensions={mockExtensions} />,
-    );
+    const { lastFrame, unmount } = render(<ExtensionsList extensions={mockExtensions} />);
     const output = lastFrame();
-    expect(output).toContain('ext-one (v1.0.0) - active');
-    expect(output).toContain('ext-two (v2.1.0) - active');
-    expect(output).toContain('ext-disabled (v3.0.0) - disabled');
+    expect(output).toContain("ext-one (v1.0.0) - active");
+    expect(output).toContain("ext-two (v2.1.0) - active");
+    expect(output).toContain("ext-disabled (v3.0.0) - disabled");
     unmount();
   });
 
   it('should display "unknown state" if an extension has no update state', () => {
     mockUIState(new Map());
-    const { lastFrame, unmount } = render(
-      <ExtensionsList extensions={[mockExtensions[0]]} />,
-    );
-    expect(lastFrame()).toContain('(unknown state)');
+    const { lastFrame, unmount } = render(<ExtensionsList extensions={[mockExtensions[0]]} />);
+    expect(lastFrame()).toContain("(unknown state)");
     unmount();
   });
 
   const stateTestCases = [
     {
       state: ExtensionUpdateState.CHECKING_FOR_UPDATES,
-      expectedText: '(checking for updates)',
+      expectedText: "(checking for updates)",
     },
     {
       state: ExtensionUpdateState.UPDATING,
-      expectedText: '(updating)',
+      expectedText: "(updating)",
     },
     {
       state: ExtensionUpdateState.UPDATE_AVAILABLE,
-      expectedText: '(update available)',
+      expectedText: "(update available)",
     },
     {
       state: ExtensionUpdateState.UPDATED_NEEDS_RESTART,
-      expectedText: '(updated, needs restart)',
+      expectedText: "(updated, needs restart)",
     },
     {
       state: ExtensionUpdateState.UPDATED,
-      expectedText: '(updated)',
+      expectedText: "(updated)",
     },
     {
       state: ExtensionUpdateState.ERROR,
-      expectedText: '(error)',
+      expectedText: "(error)",
     },
     {
       state: ExtensionUpdateState.UP_TO_DATE,
-      expectedText: '(up to date)',
+      expectedText: "(up to date)",
     },
   ];
 
@@ -118,9 +112,7 @@ describe('<ExtensionsList />', () => {
     it(`should correctly display the state: ${state}`, () => {
       const updateState = new Map([[mockExtensions[0].name, state]]);
       mockUIState(updateState);
-      const { lastFrame, unmount } = render(
-        <ExtensionsList extensions={[mockExtensions[0]]} />,
-      );
+      const { lastFrame, unmount } = render(<ExtensionsList extensions={[mockExtensions[0]]} />);
       expect(lastFrame()).toContain(expectedText);
       unmount();
     });
diff --git a/packages/ui-gemini/src/ui/components/views/ExtensionsList.tsx b/packages/ui-gemini/src/ui/components/views/ExtensionsList.tsx
index 024b097a6..e32bda42b 100644
--- a/packages/ui-gemini/src/ui/components/views/ExtensionsList.tsx
+++ b/packages/ui-gemini/src/ui/components/views/ExtensionsList.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { useUIState } from '../../contexts/UIStateContext.js';
-import { ExtensionUpdateState } from '../../state/extensions.js';
-import { debugLogger, type GeminiCLIExtension } from '@airiscode/gemini-cli-core';
+import { debugLogger, type GeminiCLIExtension } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { useUIState } from "../../contexts/UIStateContext.js";
+import { ExtensionUpdateState } from "../../state/extensions.js";
 
 interface ExtensionsList {
   extensions: readonly GeminiCLIExtension[];
@@ -28,28 +28,28 @@ export const ExtensionsList: React.FC<ExtensionsList> = ({ extensions }) => {
         {extensions.map((ext) => {
           const state = extensionsUpdateState.get(ext.name);
           const isActive = ext.isActive;
-          const activeString = isActive ? 'active' : 'disabled';
-          const activeColor = isActive ? 'green' : 'grey';
+          const activeString = isActive ? "active" : "disabled";
+          const activeColor = isActive ? "green" : "grey";
 
-          let stateColor = 'gray';
-          const stateText = state || 'unknown state';
+          let stateColor = "gray";
+          const stateText = state || "unknown state";
 
           switch (state) {
             case ExtensionUpdateState.CHECKING_FOR_UPDATES:
             case ExtensionUpdateState.UPDATING:
-              stateColor = 'cyan';
+              stateColor = "cyan";
               break;
             case ExtensionUpdateState.UPDATE_AVAILABLE:
             case ExtensionUpdateState.UPDATED_NEEDS_RESTART:
-              stateColor = 'yellow';
+              stateColor = "yellow";
               break;
             case ExtensionUpdateState.ERROR:
-              stateColor = 'red';
+              stateColor = "red";
               break;
             case ExtensionUpdateState.UP_TO_DATE:
             case ExtensionUpdateState.NOT_UPDATABLE:
             case ExtensionUpdateState.UPDATED:
-              stateColor = 'green';
+              stateColor = "green";
               break;
             case undefined:
               break;
diff --git a/packages/ui-gemini/src/ui/components/views/HooksList.tsx b/packages/ui-gemini/src/ui/components/views/HooksList.tsx
index b73338155..c36e12450 100644
--- a/packages/ui-gemini/src/ui/components/views/HooksList.tsx
+++ b/packages/ui-gemini/src/ui/components/views/HooksList.tsx
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
+import { Box, Text } from "ink";
+import type React from "react";
 
 interface HooksListProps {
   hooks: ReadonlyArray<{
@@ -50,9 +50,9 @@ export const HooksList: React.FC<HooksListProps> = ({ hooks }) => {
             </Text>
             <Box flexDirection="column" paddingLeft={2}>
               {eventHooks.map((hook, index) => {
-                const hookName = hook.config.command || 'unknown';
-                const statusColor = hook.enabled ? 'green' : 'gray';
-                const statusText = hook.enabled ? 'enabled' : 'disabled';
+                const hookName = hook.config.command || "unknown";
+                const statusColor = hook.enabled ? "green" : "gray";
+                const statusText = hook.enabled ? "enabled" : "disabled";
 
                 return (
                   <Box key={`${eventName}-${index}`} flexDirection="column">
@@ -67,8 +67,7 @@ export const HooksList: React.FC<HooksListProps> = ({ hooks }) => {
                         Source: {hook.source}
                         {hook.matcher && ` | Matcher: ${hook.matcher}`}
                         {hook.sequential && ` | Sequential`}
-                        {hook.config.timeout &&
-                          ` | Timeout: ${hook.config.timeout}s`}
+                        {hook.config.timeout && ` | Timeout: ${hook.config.timeout}s`}
                       </Text>
                     </Box>
                   </Box>
@@ -80,8 +79,8 @@ export const HooksList: React.FC<HooksListProps> = ({ hooks }) => {
       </Box>
       <Box marginTop={1}>
         <Text dimColor>
-          Tip: Use `/hooks enable {'<hook-name>'}` or `/hooks disable{' '}
-          {'<hook-name>'}` to toggle hooks
+          Tip: Use `/hooks enable {"<hook-name>"}` or `/hooks disable {"<hook-name>"}` to toggle
+          hooks
         </Text>
       </Box>
     </Box>
diff --git a/packages/ui-gemini/src/ui/components/views/McpStatus.test.tsx b/packages/ui-gemini/src/ui/components/views/McpStatus.test.tsx
index ff1f2f62a..06abbbd12 100644
--- a/packages/ui-gemini/src/ui/components/views/McpStatus.test.tsx
+++ b/packages/ui-gemini/src/ui/components/views/McpStatus.test.tsx
@@ -4,32 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../../test-utils/render.js';
-import { describe, it, expect, vi } from 'vitest';
-import { McpStatus } from './McpStatus.js';
-import { MCPServerStatus } from '@airiscode/gemini-cli-core';
-import { MessageType } from '../../types.js';
+import { MCPServerStatus } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../../test-utils/render.js";
+import { MessageType } from "../../types.js";
+import { McpStatus } from "./McpStatus.js";
 
-describe('McpStatus', () => {
+describe("McpStatus", () => {
   const baseProps = {
     type: MessageType.MCP_STATUS,
     servers: {
-      'server-1': {
-        url: 'http://localhost:8080',
-        name: 'server-1',
-        description: 'A test server',
+      "server-1": {
+        url: "http://localhost:8080",
+        name: "server-1",
+        description: "A test server",
       },
     },
     tools: [
       {
-        serverName: 'server-1',
-        name: 'tool-1',
-        description: 'A test tool',
+        serverName: "server-1",
+        name: "tool-1",
+        description: "A test tool",
         schema: {
           parameters: {
-            type: 'object',
+            type: "object",
             properties: {
-              param1: { type: 'string' },
+              param1: { type: "string" },
             },
           },
         },
@@ -46,79 +46,71 @@ describe('McpStatus', () => {
     showSchema: false,
   };
 
-  it('renders correctly with a connected server', () => {
+  it("renders correctly with a connected server", () => {
     const { lastFrame, unmount } = render(<McpStatus {...baseProps} />);
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with authenticated OAuth status', () => {
+  it("renders correctly with authenticated OAuth status", () => {
     const { lastFrame, unmount } = render(
-      <McpStatus {...baseProps} authStatus={{ 'server-1': 'authenticated' }} />,
+      <McpStatus {...baseProps} authStatus={{ "server-1": "authenticated" }} />,
     );
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with expired OAuth status', () => {
+  it("renders correctly with expired OAuth status", () => {
     const { lastFrame, unmount } = render(
-      <McpStatus {...baseProps} authStatus={{ 'server-1': 'expired' }} />,
+      <McpStatus {...baseProps} authStatus={{ "server-1": "expired" }} />,
     );
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with unauthenticated OAuth status', () => {
+  it("renders correctly with unauthenticated OAuth status", () => {
     const { lastFrame, unmount } = render(
-      <McpStatus
-        {...baseProps}
-        authStatus={{ 'server-1': 'unauthenticated' }}
-      />,
+      <McpStatus {...baseProps} authStatus={{ "server-1": "unauthenticated" }} />,
     );
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with a disconnected server', async () => {
-    vi.spyOn(
-      await import('@airiscode/gemini-cli-core'),
-      'getMCPServerStatus',
-    ).mockReturnValue(MCPServerStatus.DISCONNECTED);
+  it("renders correctly with a disconnected server", async () => {
+    vi.spyOn(await import("@airiscode/gemini-cli-core"), "getMCPServerStatus").mockReturnValue(
+      MCPServerStatus.DISCONNECTED,
+    );
     const { lastFrame, unmount } = render(<McpStatus {...baseProps} />);
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly when discovery is in progress', () => {
-    const { lastFrame, unmount } = render(
-      <McpStatus {...baseProps} discoveryInProgress={true} />,
-    );
+  it("renders correctly when discovery is in progress", () => {
+    const { lastFrame, unmount } = render(<McpStatus {...baseProps} discoveryInProgress={true} />);
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with schema enabled', () => {
-    const { lastFrame, unmount } = render(
-      <McpStatus {...baseProps} showSchema={true} />,
-    );
+  it("renders correctly with schema enabled", () => {
+    const { lastFrame, unmount } = render(<McpStatus {...baseProps} showSchema={true} />);
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with parametersJsonSchema', () => {
+  it("renders correctly with parametersJsonSchema", () => {
     const { lastFrame, unmount } = render(
       <McpStatus
         {...baseProps}
         tools={[
           {
-            serverName: 'server-1',
-            name: 'tool-1',
-            description: 'A test tool',
+            serverName: "server-1",
+            name: "tool-1",
+            description: "A test tool",
             schema: {
               parametersJsonSchema: {
-                type: 'object',
+                type: "object",
                 properties: {
-                  param1: { type: 'string' },
+                  param1: { type: "string" },
                 },
               },
             },
@@ -131,15 +123,15 @@ describe('McpStatus', () => {
     unmount();
   });
 
-  it('renders correctly with prompts', () => {
+  it("renders correctly with prompts", () => {
     const { lastFrame, unmount } = render(
       <McpStatus
         {...baseProps}
         prompts={[
           {
-            serverName: 'server-1',
-            name: 'prompt-1',
-            description: 'A test prompt',
+            serverName: "server-1",
+            name: "prompt-1",
+            description: "A test prompt",
           },
         ]}
       />,
@@ -148,16 +140,16 @@ describe('McpStatus', () => {
     unmount();
   });
 
-  it('renders correctly with resources', () => {
+  it("renders correctly with resources", () => {
     const { lastFrame, unmount } = render(
       <McpStatus
         {...baseProps}
         resources={[
           {
-            serverName: 'server-1',
-            name: 'resource-1',
-            uri: 'file:///tmp/resource-1.txt',
-            description: 'A test resource',
+            serverName: "server-1",
+            name: "resource-1",
+            uri: "file:///tmp/resource-1.txt",
+            description: "A test resource",
           },
         ]}
       />,
@@ -166,20 +158,20 @@ describe('McpStatus', () => {
     unmount();
   });
 
-  it('renders correctly with a blocked server', () => {
+  it("renders correctly with a blocked server", () => {
     const { lastFrame, unmount } = render(
       <McpStatus
         {...baseProps}
-        blockedServers={[{ name: 'server-1', extensionName: 'test-extension' }]}
+        blockedServers={[{ name: "server-1", extensionName: "test-extension" }]}
       />,
     );
     expect(lastFrame()).toMatchSnapshot();
     unmount();
   });
 
-  it('renders correctly with a connecting server', () => {
+  it("renders correctly with a connecting server", () => {
     const { lastFrame, unmount } = render(
-      <McpStatus {...baseProps} connectingServers={['server-1']} />,
+      <McpStatus {...baseProps} connectingServers={["server-1"]} />,
     );
     expect(lastFrame()).toMatchSnapshot();
     unmount();
diff --git a/packages/ui-gemini/src/ui/components/views/McpStatus.tsx b/packages/ui-gemini/src/ui/components/views/McpStatus.tsx
index 376e87f05..c220ccb6c 100644
--- a/packages/ui-gemini/src/ui/components/views/McpStatus.tsx
+++ b/packages/ui-gemini/src/ui/components/views/McpStatus.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MCPServerConfig } from '@airiscode/gemini-cli-core';
-import { MCPServerStatus } from '@airiscode/gemini-cli-core';
-import { Box, Text } from 'ink';
-import type React from 'react';
-import { theme } from '../../semantic-colors.js';
+import type { MCPServerConfig } from "@airiscode/gemini-cli-core";
+import { MCPServerStatus } from "@airiscode/gemini-cli-core";
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
 import type {
   HistoryItemMcpStatus,
   JsonMcpPrompt,
   JsonMcpResource,
   JsonMcpTool,
-} from '../../types.js';
+} from "../../types.js";
 
 interface McpStatusProps {
   servers: Record<string, MCPServerConfig>;
@@ -23,7 +23,7 @@ interface McpStatusProps {
   resources: JsonMcpResource[];
   blockedServers: Array<{ name: string; extensionName: string }>;
   serverStatus: (serverName: string) => MCPServerStatus;
-  authStatus: HistoryItemMcpStatus['authStatus'];
+  authStatus: HistoryItemMcpStatus["authStatus"];
   discoveryInProgress: boolean;
   connectingServers: string[];
   showDescriptions: boolean;
@@ -50,11 +50,9 @@ export const McpStatus: React.FC<McpStatusProps> = ({
       <Box flexDirection="column">
         <Text>No MCP servers configured.</Text>
         <Text>
-          Please view MCP documentation in your browser:{' '}
-          <Text color={theme.text.link}>
-            https://goo.gle/gemini-cli-docs-mcp
-          </Text>{' '}
-          or use the cli /docs command
+          Please view MCP documentation in your browser:{" "}
+          <Text color={theme.text.link}>https://goo.gle/gemini-cli-docs-mcp</Text> or use the cli
+          /docs command
         </Text>
       </Box>
     );
@@ -65,12 +63,10 @@ export const McpStatus: React.FC<McpStatusProps> = ({
       {discoveryInProgress && (
         <Box flexDirection="column" marginBottom={1}>
           <Text color={theme.status.warning}>
-            ⏳ MCP servers are starting up ({connectingServers.length}{' '}
-            initializing)...
+            ⏳ MCP servers are starting up ({connectingServers.length} initializing)...
           </Text>
           <Text color={theme.text.primary}>
-            Note: First startup may take longer. Tool availability will update
-            automatically.
+            Note: First startup may take longer. Tool availability will update automatically.
           </Text>
         </Box>
       )}
@@ -80,44 +76,36 @@ export const McpStatus: React.FC<McpStatusProps> = ({
 
       {serverNames.map((serverName) => {
         const server = servers[serverName];
-        const serverTools = tools.filter(
-          (tool) => tool.serverName === serverName,
-        );
-        const serverPrompts = prompts.filter(
-          (prompt) => prompt.serverName === serverName,
-        );
-        const serverResources = resources.filter(
-          (resource) => resource.serverName === serverName,
-        );
+        const serverTools = tools.filter((tool) => tool.serverName === serverName);
+        const serverPrompts = prompts.filter((prompt) => prompt.serverName === serverName);
+        const serverResources = resources.filter((resource) => resource.serverName === serverName);
         const originalStatus = serverStatus(serverName);
         const hasCachedItems =
-          serverTools.length > 0 ||
-          serverPrompts.length > 0 ||
-          serverResources.length > 0;
+          serverTools.length > 0 || serverPrompts.length > 0 || serverResources.length > 0;
         const status =
           originalStatus === MCPServerStatus.DISCONNECTED && hasCachedItems
             ? MCPServerStatus.CONNECTED
             : originalStatus;
 
-        let statusIndicator = '';
-        let statusText = '';
+        let statusIndicator = "";
+        let statusText = "";
         let statusColor = theme.text.primary;
 
         switch (status) {
           case MCPServerStatus.CONNECTED:
-            statusIndicator = '🟢';
-            statusText = 'Ready';
+            statusIndicator = "🟢";
+            statusText = "Ready";
             statusColor = theme.status.success;
             break;
           case MCPServerStatus.CONNECTING:
-            statusIndicator = '🔄';
-            statusText = 'Starting... (first startup may take longer)';
+            statusIndicator = "🔄";
+            statusText = "Starting... (first startup may take longer)";
             statusColor = theme.status.warning;
             break;
           case MCPServerStatus.DISCONNECTED:
           default:
-            statusIndicator = '🔴';
-            statusText = 'Disconnected';
+            statusIndicator = "🔴";
+            statusText = "Disconnected";
             statusColor = theme.status.error;
             break;
         }
@@ -132,31 +120,23 @@ export const McpStatus: React.FC<McpStatusProps> = ({
         const resourceCount = serverResources.length;
         const parts = [];
         if (toolCount > 0) {
-          parts.push(`${toolCount} ${toolCount === 1 ? 'tool' : 'tools'}`);
+          parts.push(`${toolCount} ${toolCount === 1 ? "tool" : "tools"}`);
         }
         if (promptCount > 0) {
-          parts.push(
-            `${promptCount} ${promptCount === 1 ? 'prompt' : 'prompts'}`,
-          );
+          parts.push(`${promptCount} ${promptCount === 1 ? "prompt" : "prompts"}`);
         }
         if (resourceCount > 0) {
-          parts.push(
-            `${resourceCount} ${resourceCount === 1 ? 'resource' : 'resources'}`,
-          );
+          parts.push(`${resourceCount} ${resourceCount === 1 ? "resource" : "resources"}`);
         }
 
         const serverAuthStatus = authStatus[serverName];
         let authStatusNode: React.ReactNode = null;
-        if (serverAuthStatus === 'authenticated') {
+        if (serverAuthStatus === "authenticated") {
           authStatusNode = <Text> (OAuth)</Text>;
-        } else if (serverAuthStatus === 'expired') {
-          authStatusNode = (
-            <Text color={theme.status.error}> (OAuth expired)</Text>
-          );
-        } else if (serverAuthStatus === 'unauthenticated') {
-          authStatusNode = (
-            <Text color={theme.status.warning}> (OAuth not authenticated)</Text>
-          );
+        } else if (serverAuthStatus === "expired") {
+          authStatusNode = <Text color={theme.status.error}> (OAuth expired)</Text>;
+        } else if (serverAuthStatus === "unauthenticated") {
+          authStatusNode = <Text color={theme.status.warning}> (OAuth not authenticated)</Text>;
         }
 
         return (
@@ -165,11 +145,11 @@ export const McpStatus: React.FC<McpStatusProps> = ({
               <Text color={statusColor}>{statusIndicator} </Text>
               <Text bold>{serverDisplayName}</Text>
               <Text>
-                {' - '}
+                {" - "}
                 {statusText}
                 {status === MCPServerStatus.CONNECTED &&
                   parts.length > 0 &&
-                  ` (${parts.join(', ')})`}
+                  ` (${parts.join(", ")})`}
               </Text>
               {authStatusNode}
             </Box>
@@ -181,9 +161,7 @@ export const McpStatus: React.FC<McpStatusProps> = ({
             )}
 
             {showDescriptions && server?.description && (
-              <Text color={theme.text.secondary}>
-                {server.description.trim()}
-              </Text>
+              <Text color={theme.text.secondary}>{server.description.trim()}</Text>
             )}
 
             {serverTools.length > 0 && (
@@ -195,8 +173,7 @@ export const McpStatus: React.FC<McpStatusProps> = ({
                     tool.schema &&
                     (tool.schema.parametersJsonSchema || tool.schema.parameters)
                       ? JSON.stringify(
-                          tool.schema.parametersJsonSchema ??
-                            tool.schema.parameters,
+                          tool.schema.parametersJsonSchema ?? tool.schema.parameters,
                           null,
                           2,
                         )
@@ -209,17 +186,13 @@ export const McpStatus: React.FC<McpStatusProps> = ({
                       </Text>
                       {showDescriptions && tool.description && (
                         <Box marginLeft={2}>
-                          <Text color={theme.text.secondary}>
-                            {tool.description.trim()}
-                          </Text>
+                          <Text color={theme.text.secondary}>{tool.description.trim()}</Text>
                         </Box>
                       )}
                       {schemaContent && (
                         <Box flexDirection="column" marginLeft={4}>
                           <Text color={theme.text.secondary}>Parameters:</Text>
-                          <Text color={theme.text.secondary}>
-                            {schemaContent}
-                          </Text>
+                          <Text color={theme.text.secondary}>{schemaContent}</Text>
                         </Box>
                       )}
                     </Box>
@@ -238,9 +211,7 @@ export const McpStatus: React.FC<McpStatusProps> = ({
                     </Text>
                     {showDescriptions && prompt.description && (
                       <Box marginLeft={2}>
-                        <Text color={theme.text.primary}>
-                          {prompt.description.trim()}
-                        </Text>
+                        <Text color={theme.text.primary}>{prompt.description.trim()}</Text>
                       </Box>
                     )}
                   </Box>
@@ -252,22 +223,17 @@ export const McpStatus: React.FC<McpStatusProps> = ({
               <Box flexDirection="column" marginLeft={2}>
                 <Text color={theme.text.primary}>Resources:</Text>
                 {serverResources.map((resource, index) => {
-                  const label = resource.name || resource.uri || 'resource';
+                  const label = resource.name || resource.uri || "resource";
                   return (
-                    <Box
-                      key={`${resource.serverName}-resource-${index}`}
-                      flexDirection="column"
-                    >
+                    <Box key={`${resource.serverName}-resource-${index}`} flexDirection="column">
                       <Text>
                         - <Text color={theme.text.primary}>{label}</Text>
-                        {resource.uri ? ` (${resource.uri})` : ''}
-                        {resource.mimeType ? ` [${resource.mimeType}]` : ''}
+                        {resource.uri ? ` (${resource.uri})` : ""}
+                        {resource.mimeType ? ` [${resource.mimeType}]` : ""}
                       </Text>
                       {showDescriptions && resource.description && (
                         <Box marginLeft={2}>
-                          <Text color={theme.text.secondary}>
-                            {resource.description.trim()}
-                          </Text>
+                          <Text color={theme.text.secondary}>{resource.description.trim()}</Text>
                         </Box>
                       )}
                     </Box>
@@ -284,7 +250,7 @@ export const McpStatus: React.FC<McpStatusProps> = ({
           <Text color={theme.status.error}>🔴 </Text>
           <Text bold>
             {server.name}
-            {server.extensionName ? ` (from ${server.extensionName})` : ''}
+            {server.extensionName ? ` (from ${server.extensionName})` : ""}
           </Text>
           <Text> - Blocked</Text>
         </Box>
diff --git a/packages/ui-gemini/src/ui/components/views/ToolsList.test.tsx b/packages/ui-gemini/src/ui/components/views/ToolsList.test.tsx
index 62fad640f..6251c6d23 100644
--- a/packages/ui-gemini/src/ui/components/views/ToolsList.test.tsx
+++ b/packages/ui-gemini/src/ui/components/views/ToolsList.test.tsx
@@ -4,56 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { ToolsList } from './ToolsList.js';
-import { type ToolDefinition } from '../../types.js';
-import { renderWithProviders } from '../../../test-utils/render.js';
+import { describe, expect, it } from "vitest";
+import { renderWithProviders } from "../../../test-utils/render.js";
+import { type ToolDefinition } from "../../types.js";
+import { ToolsList } from "./ToolsList.js";
 
 const mockTools: ToolDefinition[] = [
   {
-    name: 'test-tool-one',
-    displayName: 'Test Tool One',
-    description: 'This is the first test tool.',
+    name: "test-tool-one",
+    displayName: "Test Tool One",
+    description: "This is the first test tool.",
   },
   {
-    name: 'test-tool-two',
-    displayName: 'Test Tool Two',
+    name: "test-tool-two",
+    displayName: "Test Tool Two",
     description: `This is the second test tool.
   1. Tool descriptions support markdown formatting.
   2. **note** use this tool wisely and be sure to consider how this tool interacts with word wrap.
   3. **important** this tool is awesome.`,
   },
   {
-    name: 'test-tool-three',
-    displayName: 'Test Tool Three',
-    description: 'This is the third test tool.',
+    name: "test-tool-three",
+    displayName: "Test Tool Three",
+    description: "This is the third test tool.",
   },
 ];
 
-describe('<ToolsList />', () => {
-  it('renders correctly with descriptions', () => {
+describe("<ToolsList />", () => {
+  it("renders correctly with descriptions", () => {
     const { lastFrame } = renderWithProviders(
-      <ToolsList
-        tools={mockTools}
-        showDescriptions={true}
-        terminalWidth={40}
-      />,
+      <ToolsList tools={mockTools} showDescriptions={true} terminalWidth={40} />,
     );
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders correctly without descriptions', () => {
+  it("renders correctly without descriptions", () => {
     const { lastFrame } = renderWithProviders(
-      <ToolsList
-        tools={mockTools}
-        showDescriptions={false}
-        terminalWidth={40}
-      />,
+      <ToolsList tools={mockTools} showDescriptions={false} terminalWidth={40} />,
     );
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders correctly with no tools', () => {
+  it("renders correctly with no tools", () => {
     const { lastFrame } = renderWithProviders(
       <ToolsList tools={[]} showDescriptions={true} terminalWidth={40} />,
     );
diff --git a/packages/ui-gemini/src/ui/components/views/ToolsList.tsx b/packages/ui-gemini/src/ui/components/views/ToolsList.tsx
index d3e196095..aae43530e 100644
--- a/packages/ui-gemini/src/ui/components/views/ToolsList.tsx
+++ b/packages/ui-gemini/src/ui/components/views/ToolsList.tsx
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box, Text } from 'ink';
-import { theme } from '../../semantic-colors.js';
-import { type ToolDefinition } from '../../types.js';
-import { MarkdownDisplay } from '../../utils/MarkdownDisplay.js';
+import { Box, Text } from "ink";
+import type React from "react";
+import { theme } from "../../semantic-colors.js";
+import { type ToolDefinition } from "../../types.js";
+import { MarkdownDisplay } from "../../utils/MarkdownDisplay.js";
 
 interface ToolsListProps {
   tools: readonly ToolDefinition[];
@@ -16,11 +16,7 @@ interface ToolsListProps {
   terminalWidth: number;
 }
 
-export const ToolsList: React.FC<ToolsListProps> = ({
-  tools,
-  showDescriptions,
-  terminalWidth,
-}) => (
+export const ToolsList: React.FC<ToolsListProps> = ({ tools, showDescriptions, terminalWidth }) => (
   <Box flexDirection="column" marginBottom={1}>
     <Text bold color={theme.text.primary}>
       Available Gemini CLI tools:
@@ -29,7 +25,7 @@ export const ToolsList: React.FC<ToolsListProps> = ({
     {tools.length > 0 ? (
       tools.map((tool) => (
         <Box key={tool.name} flexDirection="row">
-          <Text color={theme.text.primary}>{'  '}- </Text>
+          <Text color={theme.text.primary}>{"  "}- </Text>
           <Box flexDirection="column">
             <Text bold color={theme.text.accent}>
               {tool.displayName} ({tool.name})
diff --git a/packages/ui-gemini/src/ui/constants.ts b/packages/ui-gemini/src/ui/constants.ts
index 8dd58846c..0ccae0edb 100644
--- a/packages/ui-gemini/src/ui/constants.ts
+++ b/packages/ui-gemini/src/ui/constants.ts
@@ -9,14 +9,13 @@ const BoxBorderWidth = 1;
 export const BOX_PADDING_X = 1;
 
 // Calculate width based on art, padding, and border
-export const UI_WIDTH =
-  EstimatedArtWidth + BOX_PADDING_X * 2 + BoxBorderWidth * 2; // ~63
+export const UI_WIDTH = EstimatedArtWidth + BOX_PADDING_X * 2 + BoxBorderWidth * 2; // ~63
 
 export const STREAM_DEBOUNCE_MS = 100;
 
-export const SHELL_COMMAND_NAME = 'Shell Command';
+export const SHELL_COMMAND_NAME = "Shell Command";
 
-export const SHELL_NAME = 'Shell';
+export const SHELL_NAME = "Shell";
 
 // Limit Gemini messages to a very high number of lines to mitigate performance
 // issues in the worst case if we somehow get an enormous response from Gemini.
@@ -28,10 +27,10 @@ export const SHELL_FOCUS_HINT_DELAY_MS = 5000;
 
 // Tool status symbols used in ToolMessage component
 export const TOOL_STATUS = {
-  SUCCESS: '✓',
-  PENDING: 'o',
-  EXECUTING: '⊷',
-  CONFIRMING: '?',
-  CANCELED: '-',
-  ERROR: 'x',
+  SUCCESS: "✓",
+  PENDING: "o",
+  EXECUTING: "⊷",
+  CONFIRMING: "?",
+  CANCELED: "-",
+  ERROR: "x",
 } as const;
diff --git a/packages/ui-gemini/src/ui/constants/tips.ts b/packages/ui-gemini/src/ui/constants/tips.ts
index 8f81f209c..4ca0c343d 100644
--- a/packages/ui-gemini/src/ui/constants/tips.ts
+++ b/packages/ui-gemini/src/ui/constants/tips.ts
@@ -6,163 +6,163 @@
 
 export const INFORMATIVE_TIPS = [
   //Settings tips start here
-  'Set your preferred editor for opening files (/settings)...',
-  'Toggle Vim mode for a modal editing experience (/settings)...',
-  'Disable automatic updates if you prefer manual control (/settings)...',
-  'Turn off nagging update notifications (settings.json)...',
-  'Enable checkpointing to recover your session after a crash (settings.json)...',
-  'Change CLI output format to JSON for scripting (/settings)...',
-  'Personalize your CLI with a new color theme (/settings)...',
-  'Create and use your own custom themes (settings.json)...',
-  'Hide window title for a more minimal UI (/settings)...',
+  "Set your preferred editor for opening files (/settings)...",
+  "Toggle Vim mode for a modal editing experience (/settings)...",
+  "Disable automatic updates if you prefer manual control (/settings)...",
+  "Turn off nagging update notifications (settings.json)...",
+  "Enable checkpointing to recover your session after a crash (settings.json)...",
+  "Change CLI output format to JSON for scripting (/settings)...",
+  "Personalize your CLI with a new color theme (/settings)...",
+  "Create and use your own custom themes (settings.json)...",
+  "Hide window title for a more minimal UI (/settings)...",
   "Don't like these tips? You can hide them (/settings)...",
-  'Hide the startup banner for a cleaner launch (/settings)...',
-  'Hide the context summary above the input (/settings)...',
-  'Reclaim vertical space by hiding the footer (/settings)...',
-  'Hide individual footer elements like CWD or sandbox status (/settings)...',
-  'Hide the context window percentage in the footer (/settings)...',
-  'Show memory usage for performance monitoring (/settings)...',
-  'Show line numbers in the chat for easier reference (/settings)...',
-  'Show citations to see where the model gets information (/settings)...',
-  'Disable loading phrases for a quieter experience (/settings)...',
-  'Add custom witty phrases to the loading screen (settings.json)...',
-  'Use alternate screen buffer to preserve shell history (/settings)...',
-  'Choose a specific Gemini model for conversations (/settings)...',
-  'Limit the number of turns in your session history (/settings)...',
-  'Automatically summarize large tool outputs to save tokens (settings.json)...',
-  'Control when chat history gets compressed based on token usage (settings.json)...',
-  'Define custom context file names, like CONTEXT.md (settings.json)...',
-  'Set max directories to scan for context files (/settings)...',
-  'Expand your workspace with additional directories (/directory)...',
-  'Control how /memory refresh loads context files (/settings)...',
-  'Toggle respect for .gitignore files in context (/settings)...',
-  'Toggle respect for .geminiignore files in context (/settings)...',
-  'Enable recursive file search for @-file completions (/settings)...',
-  'Disable fuzzy search when searching for files (/settings)...',
-  'Run tools in a secure sandbox environment (settings.json)...',
-  'Use an interactive terminal for shell commands (/settings)...',
-  'Show color in shell command output (/settings)...',
-  'Automatically accept safe read-only tool calls (/settings)...',
-  'Restrict available built-in tools (settings.json)...',
-  'Exclude specific tools from being used (settings.json)...',
-  'Bypass confirmation for trusted tools (settings.json)...',
-  'Use a custom command for tool discovery (settings.json)...',
-  'Define a custom command for calling discovered tools (settings.json)...',
-  'Define and manage connections to MCP servers (settings.json)...',
-  'Enable folder trust to enhance security (/settings)...',
-  'Disable YOLO mode to enforce confirmations (settings.json)...',
-  'Block Git extensions for enhanced security (settings.json)...',
-  'Change your authentication method (/settings)...',
-  'Enforce auth type for enterprise use (settings.json)...',
-  'Let Node.js auto-configure memory (settings.json)...',
-  'Retry on fetch failed errors automatically (settings.json)...',
-  'Customize the DNS resolution order (settings.json)...',
-  'Exclude env vars from the context (settings.json)...',
-  'Configure a custom command for filing bug reports (settings.json)...',
-  'Enable or disable telemetry collection (/settings)...',
-  'Send telemetry data to a local file or GCP (settings.json)...',
-  'Configure the OTLP endpoint for telemetry (settings.json)...',
-  'Choose whether to log prompt content (settings.json)...',
-  'Enable AI-powered prompt completion while typing (/settings)...',
-  'Enable debug logging of keystrokes to the console (/settings)...',
-  'Enable automatic session cleanup of old conversations (/settings)...',
-  'Show Gemini CLI status in the terminal window title (/settings)...',
-  'Use the entire width of the terminal for output (/settings)...',
-  'Enable screen reader mode for better accessibility (/settings)...',
-  'Skip the next speaker check for faster responses (/settings)...',
-  'Use ripgrep for faster file content search (/settings)...',
-  'Enable truncation of large tool outputs to save tokens (/settings)...',
-  'Set the character threshold for truncating tool outputs (/settings)...',
-  'Set the number of lines to keep when truncating outputs (/settings)...',
-  'Enable policy-based tool confirmation via message bus (/settings)...',
-  'Enable smart-edit tool for more precise editing (/settings)...',
-  'Enable write_todos_list tool to generate task lists (/settings)...',
-  'Enable model routing based on complexity (/settings)...',
-  'Enable experimental subagents for task delegation (/settings)...',
-  'Enable extension management features (settings.json)...',
-  'Enable extension reloading within the CLI session (settings.json)...',
+  "Hide the startup banner for a cleaner launch (/settings)...",
+  "Hide the context summary above the input (/settings)...",
+  "Reclaim vertical space by hiding the footer (/settings)...",
+  "Hide individual footer elements like CWD or sandbox status (/settings)...",
+  "Hide the context window percentage in the footer (/settings)...",
+  "Show memory usage for performance monitoring (/settings)...",
+  "Show line numbers in the chat for easier reference (/settings)...",
+  "Show citations to see where the model gets information (/settings)...",
+  "Disable loading phrases for a quieter experience (/settings)...",
+  "Add custom witty phrases to the loading screen (settings.json)...",
+  "Use alternate screen buffer to preserve shell history (/settings)...",
+  "Choose a specific Gemini model for conversations (/settings)...",
+  "Limit the number of turns in your session history (/settings)...",
+  "Automatically summarize large tool outputs to save tokens (settings.json)...",
+  "Control when chat history gets compressed based on token usage (settings.json)...",
+  "Define custom context file names, like CONTEXT.md (settings.json)...",
+  "Set max directories to scan for context files (/settings)...",
+  "Expand your workspace with additional directories (/directory)...",
+  "Control how /memory refresh loads context files (/settings)...",
+  "Toggle respect for .gitignore files in context (/settings)...",
+  "Toggle respect for .geminiignore files in context (/settings)...",
+  "Enable recursive file search for @-file completions (/settings)...",
+  "Disable fuzzy search when searching for files (/settings)...",
+  "Run tools in a secure sandbox environment (settings.json)...",
+  "Use an interactive terminal for shell commands (/settings)...",
+  "Show color in shell command output (/settings)...",
+  "Automatically accept safe read-only tool calls (/settings)...",
+  "Restrict available built-in tools (settings.json)...",
+  "Exclude specific tools from being used (settings.json)...",
+  "Bypass confirmation for trusted tools (settings.json)...",
+  "Use a custom command for tool discovery (settings.json)...",
+  "Define a custom command for calling discovered tools (settings.json)...",
+  "Define and manage connections to MCP servers (settings.json)...",
+  "Enable folder trust to enhance security (/settings)...",
+  "Disable YOLO mode to enforce confirmations (settings.json)...",
+  "Block Git extensions for enhanced security (settings.json)...",
+  "Change your authentication method (/settings)...",
+  "Enforce auth type for enterprise use (settings.json)...",
+  "Let Node.js auto-configure memory (settings.json)...",
+  "Retry on fetch failed errors automatically (settings.json)...",
+  "Customize the DNS resolution order (settings.json)...",
+  "Exclude env vars from the context (settings.json)...",
+  "Configure a custom command for filing bug reports (settings.json)...",
+  "Enable or disable telemetry collection (/settings)...",
+  "Send telemetry data to a local file or GCP (settings.json)...",
+  "Configure the OTLP endpoint for telemetry (settings.json)...",
+  "Choose whether to log prompt content (settings.json)...",
+  "Enable AI-powered prompt completion while typing (/settings)...",
+  "Enable debug logging of keystrokes to the console (/settings)...",
+  "Enable automatic session cleanup of old conversations (/settings)...",
+  "Show Gemini CLI status in the terminal window title (/settings)...",
+  "Use the entire width of the terminal for output (/settings)...",
+  "Enable screen reader mode for better accessibility (/settings)...",
+  "Skip the next speaker check for faster responses (/settings)...",
+  "Use ripgrep for faster file content search (/settings)...",
+  "Enable truncation of large tool outputs to save tokens (/settings)...",
+  "Set the character threshold for truncating tool outputs (/settings)...",
+  "Set the number of lines to keep when truncating outputs (/settings)...",
+  "Enable policy-based tool confirmation via message bus (/settings)...",
+  "Enable smart-edit tool for more precise editing (/settings)...",
+  "Enable write_todos_list tool to generate task lists (/settings)...",
+  "Enable model routing based on complexity (/settings)...",
+  "Enable experimental subagents for task delegation (/settings)...",
+  "Enable extension management features (settings.json)...",
+  "Enable extension reloading within the CLI session (settings.json)...",
   //Settings tips end here
   // Keyboard shortcut tips start here
-  'Close dialogs and suggestions with Esc...',
-  'Cancel a request with Ctrl+C, or press twice to exit...',
-  'Exit the app with Ctrl+D on an empty line...',
-  'Clear your screen at any time with Ctrl+L...',
-  'Toggle the debug console display with F12...',
-  'Toggle the todo list display with Ctrl+T...',
-  'See full, untruncated responses with Ctrl+S...',
-  'Toggle auto-approval (YOLO mode) for all tools with Ctrl+Y...',
-  'Toggle auto-accepting edits approval mode with Shift+Tab...',
-  'Toggle Markdown rendering (raw markdown mode) with Option+M...',
-  'Toggle shell mode by typing ! in an empty prompt...',
-  'Insert a newline with a backslash (\\) followed by Enter...',
-  'Navigate your prompt history with the Up and Down arrows...',
-  'You can also use Ctrl+P (up) and Ctrl+N (down) for history...',
-  'Search through command history with Ctrl+R...',
-  'Submit your prompt to Gemini with Enter...',
-  'Accept an autocomplete suggestion with Tab or Enter...',
-  'Move to the start of the line with Ctrl+A or Home...',
-  'Move to the end of the line with Ctrl+E or End...',
-  'Move one character left or right with Ctrl+B/F or the arrow keys...',
-  'Move one word left or right with Ctrl+Left/Right Arrow...',
-  'Delete the character to the left with Ctrl+H or Backspace...',
-  'Delete the character to the right with Ctrl+D or Delete...',
-  'Delete the word to the left of the cursor with Ctrl+W...',
-  'Delete the word to the right of the cursor with Ctrl+Delete...',
-  'Delete from the cursor to the start of the line with Ctrl+U...',
-  'Delete from the cursor to the end of the line with Ctrl+K...',
-  'Clear the entire input prompt with a double-press of Esc...',
-  'Paste from your clipboard with Ctrl+V...',
-  'Undo text edits in the input with Ctrl+Z...',
-  'Redo undone text edits with Ctrl+Shift+Z...',
-  'Open the current prompt in an external editor with Ctrl+X or Meta+Enter...',
-  'In menus, move up/down with k/j or the arrow keys...',
-  'In menus, select an item by typing its number...',
+  "Close dialogs and suggestions with Esc...",
+  "Cancel a request with Ctrl+C, or press twice to exit...",
+  "Exit the app with Ctrl+D on an empty line...",
+  "Clear your screen at any time with Ctrl+L...",
+  "Toggle the debug console display with F12...",
+  "Toggle the todo list display with Ctrl+T...",
+  "See full, untruncated responses with Ctrl+S...",
+  "Toggle auto-approval (YOLO mode) for all tools with Ctrl+Y...",
+  "Toggle auto-accepting edits approval mode with Shift+Tab...",
+  "Toggle Markdown rendering (raw markdown mode) with Option+M...",
+  "Toggle shell mode by typing ! in an empty prompt...",
+  "Insert a newline with a backslash (\\) followed by Enter...",
+  "Navigate your prompt history with the Up and Down arrows...",
+  "You can also use Ctrl+P (up) and Ctrl+N (down) for history...",
+  "Search through command history with Ctrl+R...",
+  "Submit your prompt to Gemini with Enter...",
+  "Accept an autocomplete suggestion with Tab or Enter...",
+  "Move to the start of the line with Ctrl+A or Home...",
+  "Move to the end of the line with Ctrl+E or End...",
+  "Move one character left or right with Ctrl+B/F or the arrow keys...",
+  "Move one word left or right with Ctrl+Left/Right Arrow...",
+  "Delete the character to the left with Ctrl+H or Backspace...",
+  "Delete the character to the right with Ctrl+D or Delete...",
+  "Delete the word to the left of the cursor with Ctrl+W...",
+  "Delete the word to the right of the cursor with Ctrl+Delete...",
+  "Delete from the cursor to the start of the line with Ctrl+U...",
+  "Delete from the cursor to the end of the line with Ctrl+K...",
+  "Clear the entire input prompt with a double-press of Esc...",
+  "Paste from your clipboard with Ctrl+V...",
+  "Undo text edits in the input with Ctrl+Z...",
+  "Redo undone text edits with Ctrl+Shift+Z...",
+  "Open the current prompt in an external editor with Ctrl+X or Meta+Enter...",
+  "In menus, move up/down with k/j or the arrow keys...",
+  "In menus, select an item by typing its number...",
   "If you're using an IDE, see the context with Ctrl+G...",
   // Keyboard shortcut tips end here
   // Command tips start here
-  'Show version info with /about...',
-  'Change your authentication method with /auth...',
-  'File a bug report directly with /bug...',
-  'List your saved chat checkpoints with /chat list...',
-  'Save your current conversation with /chat save <tag>...',
-  'Resume a saved conversation with /chat resume <tag>...',
-  'Delete a conversation checkpoint with /chat delete <tag>...',
-  'Share your conversation to a file with /chat share <file>...',
-  'Clear the screen and history with /clear...',
-  'Save tokens by summarizing the context with /compress...',
-  'Copy the last response to your clipboard with /copy...',
-  'Open the full documentation in your browser with /docs...',
-  'Add directories to your workspace with /directory add <path>...',
-  'Show all directories in your workspace with /directory show...',
-  'Use /dir as a shortcut for /directory...',
-  'Set your preferred external editor with /editor...',
-  'List all active extensions with /extensions list...',
-  'Update all or specific extensions with /extensions update...',
-  'Get help on commands with /help...',
-  'Manage IDE integration with /ide...',
-  'Create a project-specific GEMINI.md file with /init...',
-  'List configured MCP servers and tools with /mcp list...',
-  'Authenticate with an OAuth-enabled MCP server with /mcp auth...',
-  'Restart MCP servers with /mcp refresh...',
-  'See the current instructional context with /memory show...',
-  'Add content to the instructional memory with /memory add...',
-  'Reload instructional context from GEMINI.md files with /memory refresh...',
-  'List the paths of the GEMINI.md files in use with /memory list...',
-  'Choose your Gemini model with /model...',
-  'Display the privacy notice with /privacy...',
-  'Restore project files to a previous state with /restore...',
-  'Exit the CLI with /quit or /exit...',
-  'Check model-specific usage stats with /stats model...',
-  'Check tool-specific usage stats with /stats tools...',
+  "Show version info with /about...",
+  "Change your authentication method with /auth...",
+  "File a bug report directly with /bug...",
+  "List your saved chat checkpoints with /chat list...",
+  "Save your current conversation with /chat save <tag>...",
+  "Resume a saved conversation with /chat resume <tag>...",
+  "Delete a conversation checkpoint with /chat delete <tag>...",
+  "Share your conversation to a file with /chat share <file>...",
+  "Clear the screen and history with /clear...",
+  "Save tokens by summarizing the context with /compress...",
+  "Copy the last response to your clipboard with /copy...",
+  "Open the full documentation in your browser with /docs...",
+  "Add directories to your workspace with /directory add <path>...",
+  "Show all directories in your workspace with /directory show...",
+  "Use /dir as a shortcut for /directory...",
+  "Set your preferred external editor with /editor...",
+  "List all active extensions with /extensions list...",
+  "Update all or specific extensions with /extensions update...",
+  "Get help on commands with /help...",
+  "Manage IDE integration with /ide...",
+  "Create a project-specific GEMINI.md file with /init...",
+  "List configured MCP servers and tools with /mcp list...",
+  "Authenticate with an OAuth-enabled MCP server with /mcp auth...",
+  "Restart MCP servers with /mcp refresh...",
+  "See the current instructional context with /memory show...",
+  "Add content to the instructional memory with /memory add...",
+  "Reload instructional context from GEMINI.md files with /memory refresh...",
+  "List the paths of the GEMINI.md files in use with /memory list...",
+  "Choose your Gemini model with /model...",
+  "Display the privacy notice with /privacy...",
+  "Restore project files to a previous state with /restore...",
+  "Exit the CLI with /quit or /exit...",
+  "Check model-specific usage stats with /stats model...",
+  "Check tool-specific usage stats with /stats tools...",
   "Change the CLI's color theme with /theme...",
-  'List all available tools with /tools...',
-  'View and edit settings with the /settings editor...',
-  'Toggle Vim keybindings on and off with /vim...',
-  'Set up GitHub Actions with /setup-github...',
-  'Configure terminal keybindings for multiline input with /terminal-setup...',
-  'Find relevant documentation with /find-docs...',
-  'Review a pull request with /oncall:pr-review...',
-  'Go back to main and clean up the branch with /github:cleanup-back-to-main...',
-  'Execute any shell command with !<command>...',
+  "List all available tools with /tools...",
+  "View and edit settings with the /settings editor...",
+  "Toggle Vim keybindings on and off with /vim...",
+  "Set up GitHub Actions with /setup-github...",
+  "Configure terminal keybindings for multiline input with /terminal-setup...",
+  "Find relevant documentation with /find-docs...",
+  "Review a pull request with /oncall:pr-review...",
+  "Go back to main and clean up the branch with /github:cleanup-back-to-main...",
+  "Execute any shell command with !<command>...",
   // Command tips end here
 ];
diff --git a/packages/ui-gemini/src/ui/constants/wittyPhrases.ts b/packages/ui-gemini/src/ui/constants/wittyPhrases.ts
index 87473b52b..06edffd18 100644
--- a/packages/ui-gemini/src/ui/constants/wittyPhrases.ts
+++ b/packages/ui-gemini/src/ui/constants/wittyPhrases.ts
@@ -6,132 +6,132 @@
 
 export const WITTY_LOADING_PHRASES = [
   "I'm Feeling Lucky",
-  'Shipping awesomeness... ',
-  'Painting the serifs back on...',
-  'Navigating the slime mold...',
-  'Consulting the digital spirits...',
-  'Reticulating splines...',
-  'Warming up the AI hamsters...',
-  'Asking the magic conch shell...',
-  'Generating witty retort...',
-  'Polishing the algorithms...',
+  "Shipping awesomeness... ",
+  "Painting the serifs back on...",
+  "Navigating the slime mold...",
+  "Consulting the digital spirits...",
+  "Reticulating splines...",
+  "Warming up the AI hamsters...",
+  "Asking the magic conch shell...",
+  "Generating witty retort...",
+  "Polishing the algorithms...",
   "Don't rush perfection (or my code)...",
-  'Brewing fresh bytes...',
-  'Counting electrons...',
-  'Engaging cognitive processors...',
-  'Checking for syntax errors in the universe...',
-  'One moment, optimizing humor...',
-  'Shuffling punchlines...',
-  'Untangling neural nets...',
-  'Compiling brilliance...',
-  'Loading wit.exe...',
-  'Summoning the cloud of wisdom...',
-  'Preparing a witty response...',
+  "Brewing fresh bytes...",
+  "Counting electrons...",
+  "Engaging cognitive processors...",
+  "Checking for syntax errors in the universe...",
+  "One moment, optimizing humor...",
+  "Shuffling punchlines...",
+  "Untangling neural nets...",
+  "Compiling brilliance...",
+  "Loading wit.exe...",
+  "Summoning the cloud of wisdom...",
+  "Preparing a witty response...",
   "Just a sec, I'm debugging reality...",
-  'Confuzzling the options...',
-  'Tuning the cosmic frequencies...',
-  'Crafting a response worthy of your patience...',
-  'Compiling the 1s and 0s...',
-  'Resolving dependencies... and existential crises...',
-  'Defragmenting memories... both RAM and personal...',
-  'Rebooting the humor module...',
-  'Caching the essentials (mostly cat memes)...',
-  'Optimizing for ludicrous speed',
+  "Confuzzling the options...",
+  "Tuning the cosmic frequencies...",
+  "Crafting a response worthy of your patience...",
+  "Compiling the 1s and 0s...",
+  "Resolving dependencies... and existential crises...",
+  "Defragmenting memories... both RAM and personal...",
+  "Rebooting the humor module...",
+  "Caching the essentials (mostly cat memes)...",
+  "Optimizing for ludicrous speed",
   "Swapping bits... don't tell the bytes...",
-  'Garbage collecting... be right back...',
-  'Assembling the interwebs...',
-  'Converting coffee into code...',
-  'Updating the syntax for reality...',
-  'Rewiring the synapses...',
-  'Looking for a misplaced semicolon...',
+  "Garbage collecting... be right back...",
+  "Assembling the interwebs...",
+  "Converting coffee into code...",
+  "Updating the syntax for reality...",
+  "Rewiring the synapses...",
+  "Looking for a misplaced semicolon...",
   "Greasin' the cogs of the machine...",
-  'Pre-heating the servers...',
-  'Calibrating the flux capacitor...',
-  'Engaging the improbability drive...',
-  'Channeling the Force...',
-  'Aligning the stars for optimal response...',
-  'So say we all...',
-  'Loading the next great idea...',
+  "Pre-heating the servers...",
+  "Calibrating the flux capacitor...",
+  "Engaging the improbability drive...",
+  "Channeling the Force...",
+  "Aligning the stars for optimal response...",
+  "So say we all...",
+  "Loading the next great idea...",
   "Just a moment, I'm in the zone...",
-  'Preparing to dazzle you with brilliance...',
+  "Preparing to dazzle you with brilliance...",
   "Just a tick, I'm polishing my wit...",
   "Hold tight, I'm crafting a masterpiece...",
   "Just a jiffy, I'm debugging the universe...",
   "Just a moment, I'm aligning the pixels...",
   "Just a sec, I'm optimizing the humor...",
   "Just a moment, I'm tuning the algorithms...",
-  'Warp speed engaged...',
-  'Mining for more Dilithium crystals...',
+  "Warp speed engaged...",
+  "Mining for more Dilithium crystals...",
   "Don't panic...",
-  'Following the white rabbit...',
-  'The truth is in here... somewhere...',
-  'Blowing on the cartridge...',
-  'Loading... Do a barrel roll!',
-  'Waiting for the respawn...',
-  'Finishing the Kessel Run in less than 12 parsecs...',
+  "Following the white rabbit...",
+  "The truth is in here... somewhere...",
+  "Blowing on the cartridge...",
+  "Loading... Do a barrel roll!",
+  "Waiting for the respawn...",
+  "Finishing the Kessel Run in less than 12 parsecs...",
   "The cake is not a lie, it's just still loading...",
-  'Fiddling with the character creation screen...',
+  "Fiddling with the character creation screen...",
   "Just a moment, I'm finding the right meme...",
   "Pressing 'A' to continue...",
-  'Herding digital cats...',
-  'Polishing the pixels...',
-  'Finding a suitable loading screen pun...',
-  'Distracting you with this witty phrase...',
-  'Almost there... probably...',
-  'Our hamsters are working as fast as they can...',
-  'Giving Cloudy a pat on the head...',
-  'Petting the cat...',
-  'Rickrolling my boss...',
-  'Slapping the bass...',
-  'Tasting the snozberries...',
+  "Herding digital cats...",
+  "Polishing the pixels...",
+  "Finding a suitable loading screen pun...",
+  "Distracting you with this witty phrase...",
+  "Almost there... probably...",
+  "Our hamsters are working as fast as they can...",
+  "Giving Cloudy a pat on the head...",
+  "Petting the cat...",
+  "Rickrolling my boss...",
+  "Slapping the bass...",
+  "Tasting the snozberries...",
   "I'm going the distance, I'm going for speed...",
-  'Is this the real life? Is this just fantasy?...',
+  "Is this the real life? Is this just fantasy?...",
   "I've got a good feeling about this...",
-  'Poking the bear...',
-  'Doing research on the latest memes...',
-  'Figuring out how to make this more witty...',
-  'Hmmm... let me think...',
-  'What do you call a fish with no eyes? A fsh...',
-  'Why did the computer go to therapy? It had too many bytes...',
+  "Poking the bear...",
+  "Doing research on the latest memes...",
+  "Figuring out how to make this more witty...",
+  "Hmmm... let me think...",
+  "What do you call a fish with no eyes? A fsh...",
+  "Why did the computer go to therapy? It had too many bytes...",
   "Why don't programmers like nature? It has too many bugs...",
-  'Why do programmers prefer dark mode? Because light attracts bugs...',
-  'Why did the developer go broke? Because they used up all their cache...',
+  "Why do programmers prefer dark mode? Because light attracts bugs...",
+  "Why did the developer go broke? Because they used up all their cache...",
   "What can you do with a broken pencil? Nothing, it's pointless...",
-  'Applying percussive maintenance...',
-  'Searching for the correct USB orientation...',
-  'Ensuring the magic smoke stays inside the wires...',
-  'Rewriting in Rust for no particular reason...',
-  'Trying to exit Vim...',
-  'Spinning up the hamster wheel...',
+  "Applying percussive maintenance...",
+  "Searching for the correct USB orientation...",
+  "Ensuring the magic smoke stays inside the wires...",
+  "Rewriting in Rust for no particular reason...",
+  "Trying to exit Vim...",
+  "Spinning up the hamster wheel...",
   "That's not a bug, it's an undocumented feature...",
-  'Engage.',
+  "Engage.",
   "I'll be back... with an answer.",
-  'My other process is a TARDIS...',
-  'Communing with the machine spirit...',
-  'Letting the thoughts marinate...',
-  'Just remembered where I put my keys...',
-  'Pondering the orb...',
+  "My other process is a TARDIS...",
+  "Communing with the machine spirit...",
+  "Letting the thoughts marinate...",
+  "Just remembered where I put my keys...",
+  "Pondering the orb...",
   "I've seen things you people wouldn't believe... like a user who reads loading messages.",
-  'Initiating thoughtful gaze...',
+  "Initiating thoughtful gaze...",
   "What's a computer's favorite snack? Microchips.",
   "Why do Java developers wear glasses? Because they don't C#.",
-  'Charging the laser... pew pew!',
-  'Dividing by zero... just kidding!',
-  'Looking for an adult superviso... I mean, processing.',
-  'Making it go beep boop.',
-  'Buffering... because even AIs need a moment.',
-  'Entangling quantum particles for a faster response...',
-  'Polishing the chrome... on the algorithms.',
-  'Are you not entertained? (Working on it!)',
-  'Summoning the code gremlins... to help, of course.',
-  'Just waiting for the dial-up tone to finish...',
-  'Recalibrating the humor-o-meter.',
-  'My other loading screen is even funnier.',
+  "Charging the laser... pew pew!",
+  "Dividing by zero... just kidding!",
+  "Looking for an adult superviso... I mean, processing.",
+  "Making it go beep boop.",
+  "Buffering... because even AIs need a moment.",
+  "Entangling quantum particles for a faster response...",
+  "Polishing the chrome... on the algorithms.",
+  "Are you not entertained? (Working on it!)",
+  "Summoning the code gremlins... to help, of course.",
+  "Just waiting for the dial-up tone to finish...",
+  "Recalibrating the humor-o-meter.",
+  "My other loading screen is even funnier.",
   "Pretty sure there's a cat walking on the keyboard somewhere...",
-  'Enhancing... Enhancing... Still loading.',
+  "Enhancing... Enhancing... Still loading.",
   "It's not a bug, it's a feature... of this loading screen.",
-  'Have you tried turning it off and on again? (The loading screen, not me.)',
-  'Constructing additional pylons...',
-  'New line? That’s Ctrl+J.',
-  'Releasing the HypnoDrones...',
+  "Have you tried turning it off and on again? (The loading screen, not me.)",
+  "Constructing additional pylons...",
+  "New line? That’s Ctrl+J.",
+  "Releasing the HypnoDrones...",
 ];
diff --git a/packages/ui-gemini/src/ui/contexts/AppContext.tsx b/packages/ui-gemini/src/ui/contexts/AppContext.tsx
index 791c8a73a..79b2a05ef 100644
--- a/packages/ui-gemini/src/ui/contexts/AppContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/AppContext.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
+import { createContext, useContext } from "react";
 
 export interface AppState {
   version: string;
@@ -16,7 +16,7 @@ export const AppContext = createContext<AppState | null>(null);
 export const useAppContext = () => {
   const context = useContext(AppContext);
   if (!context) {
-    throw new Error('useAppContext must be used within an AppProvider');
+    throw new Error("useAppContext must be used within an AppProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/contexts/ConfigContext.tsx b/packages/ui-gemini/src/ui/contexts/ConfigContext.tsx
index f3e34b890..30fd82c1b 100644
--- a/packages/ui-gemini/src/ui/contexts/ConfigContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/ConfigContext.tsx
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useContext } from 'react';
-import { type Config } from '@airiscode/gemini-cli-core';
+import { type Config } from "@airiscode/gemini-cli-core";
+import React, { useContext } from "react";
 
 export const ConfigContext = React.createContext<Config | undefined>(undefined);
 
 export const useConfig = () => {
   const context = useContext(ConfigContext);
   if (context === undefined) {
-    throw new Error('useConfig must be used within a ConfigProvider');
+    throw new Error("useConfig must be used within a ConfigProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/contexts/KeypressContext.test.tsx b/packages/ui-gemini/src/ui/contexts/KeypressContext.test.tsx
index 198c2e8f4..6b3aa580b 100644
--- a/packages/ui-gemini/src/ui/contexts/KeypressContext.test.tsx
+++ b/packages/ui-gemini/src/ui/contexts/KeypressContext.test.tsx
@@ -4,36 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import type React from 'react';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import type { Mock } from 'vitest';
-import { vi, afterAll, beforeAll } from 'vitest';
-import type { Key } from './KeypressContext.js';
-import {
-  KeypressProvider,
-  useKeypressContext,
-  ESC_TIMEOUT,
-} from './KeypressContext.js';
-import { useStdin } from 'ink';
-import { EventEmitter } from 'node:events';
+import { EventEmitter } from "node:events";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { useStdin } from "ink";
+import type React from "react";
+import { act } from "react";
+import type { Mock } from "vitest";
+import { afterAll, beforeAll, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import type { Key } from "./KeypressContext.js";
+import { ESC_TIMEOUT, KeypressProvider, useKeypressContext } from "./KeypressContext.js";
 
 // Mock the 'ink' module to control stdin
-vi.mock('ink', async (importOriginal) => {
-  const original = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const original = await importOriginal<typeof import("ink")>();
   return {
     ...original,
     useStdin: vi.fn(),
   };
 });
 
-const PASTE_START = '\x1B[200~';
-const PASTE_END = '\x1B[201~';
+const PASTE_START = "\x1B[200~";
+const PASTE_END = "\x1B[201~";
 // readline will not emit most incomplete kitty sequences but it will give
 // up on sequences like this where the modifier (135) has more than two digits.
-const INCOMPLETE_KITTY_SEQUENCE = '\x1b[97;135';
+const INCOMPLETE_KITTY_SEQUENCE = "\x1b[97;135";
 
 class MockStdin extends EventEmitter {
   isTTY = true;
@@ -44,7 +40,7 @@ class MockStdin extends EventEmitter {
   pause = vi.fn();
 
   write(text: string) {
-    this.emit('data', text);
+    this.emit("data", text);
   }
 }
 
@@ -61,7 +57,7 @@ const setupKeypressTest = () => {
   return { result, keyHandler };
 };
 
-describe('KeypressContext', () => {
+describe("KeypressContext", () => {
   let stdin: MockStdin;
   const mockSetRawMode = vi.fn();
 
@@ -81,24 +77,24 @@ describe('KeypressContext', () => {
     });
   });
 
-  describe('Enter key handling', () => {
+  describe("Enter key handling", () => {
     it.each([
       {
-        name: 'regular enter key (keycode 13)',
-        sequence: '\x1b[13u',
+        name: "regular enter key (keycode 13)",
+        sequence: "\x1b[13u",
       },
       {
-        name: 'numpad enter key (keycode 57414)',
-        sequence: '\x1b[57414u',
+        name: "numpad enter key (keycode 57414)",
+        sequence: "\x1b[57414u",
       },
-    ])('should recognize $name in kitty protocol', async ({ sequence }) => {
+    ])("should recognize $name in kitty protocol", async ({ sequence }) => {
       const { keyHandler } = setupKeypressTest();
 
       act(() => stdin.write(sequence));
 
       expect(keyHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          name: 'return',
+          name: "return",
           ctrl: false,
           meta: false,
           shift: false,
@@ -106,14 +102,14 @@ describe('KeypressContext', () => {
       );
     });
 
-    it('should handle backslash return', async () => {
+    it("should handle backslash return", async () => {
       const { keyHandler } = setupKeypressTest();
 
-      act(() => stdin.write('\\\r'));
+      act(() => stdin.write("\\\r"));
 
       expect(keyHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          name: 'return',
+          name: "return",
           ctrl: false,
           meta: false,
           shift: true,
@@ -123,54 +119,51 @@ describe('KeypressContext', () => {
 
     it.each([
       {
-        modifier: 'Shift',
-        sequence: '\x1b[57414;2u',
+        modifier: "Shift",
+        sequence: "\x1b[57414;2u",
         expected: { ctrl: false, meta: false, shift: true },
       },
       {
-        modifier: 'Ctrl',
-        sequence: '\x1b[57414;5u',
+        modifier: "Ctrl",
+        sequence: "\x1b[57414;5u",
         expected: { ctrl: true, meta: false, shift: false },
       },
       {
-        modifier: 'Alt',
-        sequence: '\x1b[57414;3u',
+        modifier: "Alt",
+        sequence: "\x1b[57414;3u",
         expected: { ctrl: false, meta: true, shift: false },
       },
-    ])(
-      'should handle numpad enter with $modifier modifier',
-      async ({ sequence, expected }) => {
-        const { keyHandler } = setupKeypressTest();
+    ])("should handle numpad enter with $modifier modifier", async ({ sequence, expected }) => {
+      const { keyHandler } = setupKeypressTest();
 
-        act(() => stdin.write(sequence));
+      act(() => stdin.write(sequence));
 
-        expect(keyHandler).toHaveBeenCalledWith(
-          expect.objectContaining({
-            name: 'return',
-            ...expected,
-          }),
-        );
-      },
-    );
+      expect(keyHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: "return",
+          ...expected,
+        }),
+      );
+    });
   });
 
-  describe('Escape key handling', () => {
-    it('should recognize escape key (keycode 27) in kitty protocol', async () => {
+  describe("Escape key handling", () => {
+    it("should recognize escape key (keycode 27) in kitty protocol", async () => {
       const { keyHandler } = setupKeypressTest();
 
       // Send kitty protocol sequence for escape: ESC[27u
       act(() => {
-        stdin.write('\x1b[27u');
+        stdin.write("\x1b[27u");
       });
 
       expect(keyHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          name: 'escape',
+          name: "escape",
         }),
       );
     });
 
-    it('should handle double Escape', async () => {
+    it("should handle double Escape", async () => {
       const keyHandler = vi.fn();
       const wrapper = ({ children }: { children: React.ReactNode }) => (
         <KeypressProvider>{children}</KeypressProvider>
@@ -179,24 +172,24 @@ describe('KeypressContext', () => {
       act(() => result.current.subscribe(keyHandler));
 
       act(() => {
-        stdin.write('\x1b');
+        stdin.write("\x1b");
         vi.advanceTimersByTime(10);
-        stdin.write('\x1b');
+        stdin.write("\x1b");
         expect(keyHandler).not.toHaveBeenCalled();
         vi.advanceTimersByTime(ESC_TIMEOUT);
 
         expect(keyHandler).toHaveBeenNthCalledWith(
           1,
-          expect.objectContaining({ name: 'escape', meta: true }),
+          expect.objectContaining({ name: "escape", meta: true }),
         );
         expect(keyHandler).toHaveBeenNthCalledWith(
           2,
-          expect.objectContaining({ name: 'escape', meta: true }),
+          expect.objectContaining({ name: "escape", meta: true }),
         );
       });
     });
 
-    it('should handle lone Escape key (keycode 27) with timeout when kitty protocol is enabled', async () => {
+    it("should handle lone Escape key (keycode 27) with timeout when kitty protocol is enabled", async () => {
       // Use real timers for this test to avoid issues with stream/buffer timing
       const keyHandler = vi.fn();
       const wrapper = ({ children }: { children: React.ReactNode }) => (
@@ -207,7 +200,7 @@ describe('KeypressContext', () => {
 
       // Send just ESC
       act(() => {
-        stdin.write('\x1b');
+        stdin.write("\x1b");
 
         // Should be buffered initially
         expect(keyHandler).not.toHaveBeenCalled();
@@ -216,7 +209,7 @@ describe('KeypressContext', () => {
 
         expect(keyHandler).toHaveBeenCalledWith(
           expect.objectContaining({
-            name: 'escape',
+            name: "escape",
             meta: true,
           }),
         );
@@ -224,56 +217,53 @@ describe('KeypressContext', () => {
     });
   });
 
-  describe('Tab and Backspace handling', () => {
+  describe("Tab and Backspace handling", () => {
     it.each([
       {
-        name: 'Tab key',
-        sequence: '\x1b[9u',
-        expected: { name: 'tab', shift: false },
+        name: "Tab key",
+        sequence: "\x1b[9u",
+        expected: { name: "tab", shift: false },
       },
       {
-        name: 'Shift+Tab',
-        sequence: '\x1b[9;2u',
-        expected: { name: 'tab', shift: true },
+        name: "Shift+Tab",
+        sequence: "\x1b[9;2u",
+        expected: { name: "tab", shift: true },
       },
       {
-        name: 'Backspace',
-        sequence: '\x1b[127u',
-        expected: { name: 'backspace', meta: false },
+        name: "Backspace",
+        sequence: "\x1b[127u",
+        expected: { name: "backspace", meta: false },
       },
       {
-        name: 'Option+Backspace',
-        sequence: '\x1b[127;3u',
-        expected: { name: 'backspace', meta: true },
+        name: "Option+Backspace",
+        sequence: "\x1b[127;3u",
+        expected: { name: "backspace", meta: true },
       },
       {
-        name: 'Ctrl+Backspace',
-        sequence: '\x1b[127;5u',
-        expected: { name: 'backspace', ctrl: true },
+        name: "Ctrl+Backspace",
+        sequence: "\x1b[127;5u",
+        expected: { name: "backspace", ctrl: true },
       },
-    ])(
-      'should recognize $name in kitty protocol',
-      async ({ sequence, expected }) => {
-        const { keyHandler } = setupKeypressTest();
+    ])("should recognize $name in kitty protocol", async ({ sequence, expected }) => {
+      const { keyHandler } = setupKeypressTest();
 
-        act(() => {
-          stdin.write(sequence);
-        });
+      act(() => {
+        stdin.write(sequence);
+      });
 
-        expect(keyHandler).toHaveBeenCalledWith(
-          expect.objectContaining({
-            ...expected,
-          }),
-        );
-      },
-    );
+      expect(keyHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          ...expected,
+        }),
+      );
+    });
   });
 
-  describe('paste mode', () => {
+  describe("paste mode", () => {
     it.each([
       {
-        name: 'handle multiline paste as a single event',
-        pastedText: 'This \n is \n a \n multiline \n paste.',
+        name: "handle multiline paste as a single event",
+        pastedText: "This \n is \n a \n multiline \n paste.",
         writeSequence: (text: string) => {
           stdin.write(PASTE_START);
           stdin.write(text);
@@ -281,8 +271,8 @@ describe('KeypressContext', () => {
         },
       },
       {
-        name: 'handle paste start code split over multiple writes',
-        pastedText: 'pasted content',
+        name: "handle paste start code split over multiple writes",
+        pastedText: "pasted content",
         writeSequence: (text: string) => {
           stdin.write(PASTE_START.slice(0, 3));
           stdin.write(PASTE_START.slice(3));
@@ -291,8 +281,8 @@ describe('KeypressContext', () => {
         },
       },
       {
-        name: 'handle paste end code split over multiple writes',
-        pastedText: 'pasted content',
+        name: "handle paste end code split over multiple writes",
+        pastedText: "pasted content",
         writeSequence: (text: string) => {
           stdin.write(PASTE_START);
           stdin.write(text);
@@ -300,7 +290,7 @@ describe('KeypressContext', () => {
           stdin.write(PASTE_END.slice(3));
         },
       },
-    ])('should $name', async ({ pastedText, writeSequence }) => {
+    ])("should $name", async ({ pastedText, writeSequence }) => {
       const keyHandler = vi.fn();
 
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
@@ -322,26 +312,22 @@ describe('KeypressContext', () => {
     });
   });
 
-  describe('debug keystroke logging', () => {
+  describe("debug keystroke logging", () => {
     let debugLoggerSpy: ReturnType<typeof vi.spyOn>;
 
     beforeEach(() => {
-      debugLoggerSpy = vi
-        .spyOn(debugLogger, 'log')
-        .mockImplementation(() => {});
+      debugLoggerSpy = vi.spyOn(debugLogger, "log").mockImplementation(() => {});
     });
 
     afterEach(() => {
       debugLoggerSpy.mockRestore();
     });
 
-    it('should not log keystrokes when debugKeystrokeLogging is false', async () => {
+    it("should not log keystrokes when debugKeystrokeLogging is false", async () => {
       const keyHandler = vi.fn();
 
       const wrapper = ({ children }: { children: React.ReactNode }) => (
-        <KeypressProvider debugKeystrokeLogging={false}>
-          {children}
-        </KeypressProvider>
+        <KeypressProvider debugKeystrokeLogging={false}>{children}</KeypressProvider>
       );
 
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
@@ -350,22 +336,18 @@ describe('KeypressContext', () => {
 
       // Send a kitty sequence
       act(() => {
-        stdin.write('\x1b[27u');
+        stdin.write("\x1b[27u");
       });
 
       expect(keyHandler).toHaveBeenCalled();
-      expect(debugLoggerSpy).not.toHaveBeenCalledWith(
-        expect.stringContaining('[DEBUG] Kitty'),
-      );
+      expect(debugLoggerSpy).not.toHaveBeenCalledWith(expect.stringContaining("[DEBUG] Kitty"));
     });
 
-    it('should log kitty buffer accumulation when debugKeystrokeLogging is true', async () => {
+    it("should log kitty buffer accumulation when debugKeystrokeLogging is true", async () => {
       const keyHandler = vi.fn();
 
       const wrapper = ({ children }: { children: React.ReactNode }) => (
-        <KeypressProvider debugKeystrokeLogging={true}>
-          {children}
-        </KeypressProvider>
+        <KeypressProvider debugKeystrokeLogging={true}>{children}</KeypressProvider>
       );
 
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
@@ -373,20 +355,18 @@ describe('KeypressContext', () => {
       act(() => result.current.subscribe(keyHandler));
 
       // Send a complete kitty sequence for escape
-      act(() => stdin.write('\x1b[27u'));
+      act(() => stdin.write("\x1b[27u"));
 
       expect(debugLoggerSpy).toHaveBeenCalledWith(
-        `[DEBUG] Raw StdIn: ${JSON.stringify('\x1b[27u')}`,
+        `[DEBUG] Raw StdIn: ${JSON.stringify("\x1b[27u")}`,
       );
     });
 
-    it('should show char codes when debugKeystrokeLogging is true even without debug mode', async () => {
+    it("should show char codes when debugKeystrokeLogging is true even without debug mode", async () => {
       const keyHandler = vi.fn();
 
       const wrapper = ({ children }: { children: React.ReactNode }) => (
-        <KeypressProvider debugKeystrokeLogging={true}>
-          {children}
-        </KeypressProvider>
+        <KeypressProvider debugKeystrokeLogging={true}>{children}</KeypressProvider>
       );
 
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
@@ -403,146 +383,131 @@ describe('KeypressContext', () => {
     });
   });
 
-  describe('Parameterized functional keys', () => {
+  describe("Parameterized functional keys", () => {
     it.each([
       // ModifyOtherKeys
-      { sequence: `\x1b[27;2;13~`, expected: { name: 'return', shift: true } },
-      { sequence: `\x1b[27;5;13~`, expected: { name: 'return', ctrl: true } },
-      { sequence: `\x1b[27;5;9~`, expected: { name: 'tab', ctrl: true } },
+      { sequence: `\x1b[27;2;13~`, expected: { name: "return", shift: true } },
+      { sequence: `\x1b[27;5;13~`, expected: { name: "return", ctrl: true } },
+      { sequence: `\x1b[27;5;9~`, expected: { name: "tab", ctrl: true } },
       {
         sequence: `\x1b[27;6;9~`,
-        expected: { name: 'tab', ctrl: true, shift: true },
+        expected: { name: "tab", ctrl: true, shift: true },
       },
       // XTerm Function Key
-      { sequence: `\x1b[1;129A`, expected: { name: 'up' } },
-      { sequence: `\x1b[1;2H`, expected: { name: 'home', shift: true } },
-      { sequence: `\x1b[1;5F`, expected: { name: 'end', ctrl: true } },
-      { sequence: `\x1b[1;1P`, expected: { name: 'f1' } },
-      { sequence: `\x1b[1;3Q`, expected: { name: 'f2', meta: true } },
+      { sequence: `\x1b[1;129A`, expected: { name: "up" } },
+      { sequence: `\x1b[1;2H`, expected: { name: "home", shift: true } },
+      { sequence: `\x1b[1;5F`, expected: { name: "end", ctrl: true } },
+      { sequence: `\x1b[1;1P`, expected: { name: "f1" } },
+      { sequence: `\x1b[1;3Q`, expected: { name: "f2", meta: true } },
       // Tilde Function Keys
-      { sequence: `\x1b[3~`, expected: { name: 'delete' } },
-      { sequence: `\x1b[5~`, expected: { name: 'pageup' } },
-      { sequence: `\x1b[6~`, expected: { name: 'pagedown' } },
-      { sequence: `\x1b[1~`, expected: { name: 'home' } },
-      { sequence: `\x1b[4~`, expected: { name: 'end' } },
-      { sequence: `\x1b[2~`, expected: { name: 'insert' } },
-      { sequence: `\x1b[11~`, expected: { name: 'f1' } },
-      { sequence: `\x1b[17~`, expected: { name: 'f6' } },
-      { sequence: `\x1b[23~`, expected: { name: 'f11' } },
-      { sequence: `\x1b[24~`, expected: { name: 'f12' } },
+      { sequence: `\x1b[3~`, expected: { name: "delete" } },
+      { sequence: `\x1b[5~`, expected: { name: "pageup" } },
+      { sequence: `\x1b[6~`, expected: { name: "pagedown" } },
+      { sequence: `\x1b[1~`, expected: { name: "home" } },
+      { sequence: `\x1b[4~`, expected: { name: "end" } },
+      { sequence: `\x1b[2~`, expected: { name: "insert" } },
+      { sequence: `\x1b[11~`, expected: { name: "f1" } },
+      { sequence: `\x1b[17~`, expected: { name: "f6" } },
+      { sequence: `\x1b[23~`, expected: { name: "f11" } },
+      { sequence: `\x1b[24~`, expected: { name: "f12" } },
       // Reverse tabs
-      { sequence: `\x1b[Z`, expected: { name: 'tab', shift: true } },
-      { sequence: `\x1b[1;2Z`, expected: { name: 'tab', shift: true } },
+      { sequence: `\x1b[Z`, expected: { name: "tab", shift: true } },
+      { sequence: `\x1b[1;2Z`, expected: { name: "tab", shift: true } },
       // Legacy Arrows
       {
         sequence: `\x1b[A`,
-        expected: { name: 'up', ctrl: false, meta: false, shift: false },
+        expected: { name: "up", ctrl: false, meta: false, shift: false },
       },
       {
         sequence: `\x1b[B`,
-        expected: { name: 'down', ctrl: false, meta: false, shift: false },
+        expected: { name: "down", ctrl: false, meta: false, shift: false },
       },
       {
         sequence: `\x1b[C`,
-        expected: { name: 'right', ctrl: false, meta: false, shift: false },
+        expected: { name: "right", ctrl: false, meta: false, shift: false },
       },
       {
         sequence: `\x1b[D`,
-        expected: { name: 'left', ctrl: false, meta: false, shift: false },
+        expected: { name: "left", ctrl: false, meta: false, shift: false },
       },
 
       // Legacy Home/End
       {
         sequence: `\x1b[H`,
-        expected: { name: 'home', ctrl: false, meta: false, shift: false },
+        expected: { name: "home", ctrl: false, meta: false, shift: false },
       },
       {
         sequence: `\x1b[F`,
-        expected: { name: 'end', ctrl: false, meta: false, shift: false },
+        expected: { name: "end", ctrl: false, meta: false, shift: false },
       },
       {
         sequence: `\x1b[5H`,
-        expected: { name: 'home', ctrl: true, meta: false, shift: false },
+        expected: { name: "home", ctrl: true, meta: false, shift: false },
       },
-    ])(
-      'should recognize sequence "$sequence" as $expected.name',
-      ({ sequence, expected }) => {
-        const keyHandler = vi.fn();
-        const { result } = renderHook(() => useKeypressContext(), { wrapper });
-        act(() => result.current.subscribe(keyHandler));
+    ])('should recognize sequence "$sequence" as $expected.name', ({ sequence, expected }) => {
+      const keyHandler = vi.fn();
+      const { result } = renderHook(() => useKeypressContext(), { wrapper });
+      act(() => result.current.subscribe(keyHandler));
 
-        act(() => stdin.write(sequence));
+      act(() => stdin.write(sequence));
 
-        expect(keyHandler).toHaveBeenCalledWith(
-          expect.objectContaining(expected),
-        );
-      },
-    );
+      expect(keyHandler).toHaveBeenCalledWith(expect.objectContaining(expected));
+    });
   });
 
-  describe('Double-tap and batching', () => {
-    it('should emit two delete events for double-tap CSI[3~', async () => {
+  describe("Double-tap and batching", () => {
+    it("should emit two delete events for double-tap CSI[3~", async () => {
       const { keyHandler } = setupKeypressTest();
 
       act(() => stdin.write(`\x1b[3~`));
       act(() => stdin.write(`\x1b[3~`));
 
-      expect(keyHandler).toHaveBeenNthCalledWith(
-        1,
-        expect.objectContaining({ name: 'delete' }),
-      );
-      expect(keyHandler).toHaveBeenNthCalledWith(
-        2,
-        expect.objectContaining({ name: 'delete' }),
-      );
+      expect(keyHandler).toHaveBeenNthCalledWith(1, expect.objectContaining({ name: "delete" }));
+      expect(keyHandler).toHaveBeenNthCalledWith(2, expect.objectContaining({ name: "delete" }));
     });
 
-    it('should parse two concatenated tilde-coded sequences in one chunk', async () => {
+    it("should parse two concatenated tilde-coded sequences in one chunk", async () => {
       const { keyHandler } = setupKeypressTest();
 
       act(() => stdin.write(`\x1b[3~\x1b[5~`));
 
-      expect(keyHandler).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'delete' }),
-      );
-      expect(keyHandler).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'pageup' }),
-      );
+      expect(keyHandler).toHaveBeenCalledWith(expect.objectContaining({ name: "delete" }));
+      expect(keyHandler).toHaveBeenCalledWith(expect.objectContaining({ name: "pageup" }));
     });
   });
 
-  describe('Cross-terminal Alt key handling (simulating macOS)', () => {
+  describe("Cross-terminal Alt key handling (simulating macOS)", () => {
     let originalPlatform: NodeJS.Platform;
 
     beforeEach(() => {
       originalPlatform = process.platform;
-      Object.defineProperty(process, 'platform', {
-        value: 'darwin',
+      Object.defineProperty(process, "platform", {
+        value: "darwin",
         configurable: true,
       });
     });
 
     afterEach(() => {
-      Object.defineProperty(process, 'platform', {
+      Object.defineProperty(process, "platform", {
         value: originalPlatform,
         configurable: true,
       });
     });
 
     // Terminals to test
-    const terminals = ['iTerm2', 'Ghostty', 'MacTerminal', 'VSCodeTerminal'];
+    const terminals = ["iTerm2", "Ghostty", "MacTerminal", "VSCodeTerminal"];
 
     // Key mappings: letter -> [keycode, accented character]
     const keys: Record<string, [number, string]> = {
-      b: [98, '\u222B'],
-      f: [102, '\u0192'],
-      m: [109, '\u00B5'],
+      b: [98, "\u222B"],
+      f: [102, "\u0192"],
+      m: [109, "\u00B5"],
     };
 
     it.each(
       terminals.flatMap((terminal) =>
         Object.entries(keys).map(([key, [keycode, accentedChar]]) => {
-          if (terminal === 'Ghostty') {
+          if (terminal === "Ghostty") {
             // Ghostty uses kitty protocol sequences
             return {
               terminal,
@@ -556,7 +521,7 @@ describe('KeypressContext', () => {
                 paste: false,
               },
             };
-          } else if (terminal === 'MacTerminal') {
+          } else if (terminal === "MacTerminal") {
             // Mac Terminal sends ESC + letter
             return {
               terminal,
@@ -592,32 +557,33 @@ describe('KeypressContext', () => {
           }
         }),
       ),
-    )(
-      'should handle Alt+$key in $terminal',
-      ({ chunk, expected }: { chunk: string; expected: Partial<Key> }) => {
-        const keyHandler = vi.fn();
-        const testWrapper = ({ children }: { children: React.ReactNode }) => (
-          <KeypressProvider>{children}</KeypressProvider>
-        );
-        const { result } = renderHook(() => useKeypressContext(), {
-          wrapper: testWrapper,
-        });
-        act(() => result.current.subscribe(keyHandler));
+    )("should handle Alt+$key in $terminal", ({
+      chunk,
+      expected,
+    }: {
+      chunk: string;
+      expected: Partial<Key>;
+    }) => {
+      const keyHandler = vi.fn();
+      const testWrapper = ({ children }: { children: React.ReactNode }) => (
+        <KeypressProvider>{children}</KeypressProvider>
+      );
+      const { result } = renderHook(() => useKeypressContext(), {
+        wrapper: testWrapper,
+      });
+      act(() => result.current.subscribe(keyHandler));
 
-        act(() => stdin.write(chunk));
+      act(() => stdin.write(chunk));
 
-        expect(keyHandler).toHaveBeenCalledWith(
-          expect.objectContaining(expected),
-        );
-      },
-    );
+      expect(keyHandler).toHaveBeenCalledWith(expect.objectContaining(expected));
+    });
   });
 
-  describe('Backslash key handling', () => {
-    it('should treat backslash as a regular keystroke', () => {
+  describe("Backslash key handling", () => {
+    it("should treat backslash as a regular keystroke", () => {
       const { keyHandler } = setupKeypressTest();
 
-      act(() => stdin.write('\\'));
+      act(() => stdin.write("\\"));
 
       // Advance timers to trigger the backslash timeout
       act(() => {
@@ -626,14 +592,14 @@ describe('KeypressContext', () => {
 
       expect(keyHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          sequence: '\\',
+          sequence: "\\",
           meta: false,
         }),
       );
     });
   });
 
-  it('should timeout and flush incomplete kitty sequences after 50ms', async () => {
+  it("should timeout and flush incomplete kitty sequences after 50ms", async () => {
     const keyHandler = vi.fn();
     const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
@@ -658,14 +624,14 @@ describe('KeypressContext', () => {
     // Should now broadcast the incomplete sequence as regular input
     expect(keyHandler).toHaveBeenCalledWith(
       expect.objectContaining({
-        name: 'undefined',
+        name: "undefined",
         sequence: INCOMPLETE_KITTY_SEQUENCE,
         paste: false,
       }),
     );
   });
 
-  it('should immediately flush non-kitty CSI sequences', async () => {
+  it("should immediately flush non-kitty CSI sequences", async () => {
     const keyHandler = vi.fn();
     const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
@@ -673,63 +639,63 @@ describe('KeypressContext', () => {
 
     // Send a CSI sequence that doesn't match kitty patterns
     // ESC[m is SGR reset, not a kitty sequence
-    act(() => stdin.write('\x1b[m'));
+    act(() => stdin.write("\x1b[m"));
 
     // Should broadcast immediately as it's not a valid kitty pattern
     expect(keyHandler).toHaveBeenCalledWith(
       expect.objectContaining({
-        sequence: '\x1b[m',
+        sequence: "\x1b[m",
         paste: false,
       }),
     );
   });
 
-  it('should parse valid kitty sequences immediately when complete', async () => {
+  it("should parse valid kitty sequences immediately when complete", async () => {
     const keyHandler = vi.fn();
     const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
     act(() => result.current.subscribe(keyHandler));
 
     // Send complete kitty sequence for Ctrl+A
-    act(() => stdin.write('\x1b[97;5u'));
+    act(() => stdin.write("\x1b[97;5u"));
 
     // Should parse and broadcast immediately
     expect(keyHandler).toHaveBeenCalledWith(
       expect.objectContaining({
-        name: 'a',
+        name: "a",
         ctrl: true,
       }),
     );
   });
 
-  it('should handle batched kitty sequences correctly', async () => {
+  it("should handle batched kitty sequences correctly", async () => {
     const keyHandler = vi.fn();
     const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
     act(() => result.current.subscribe(keyHandler));
 
     // Send Ctrl+a followed by Ctrl+b
-    act(() => stdin.write('\x1b[97;5u\x1b[98;5u'));
+    act(() => stdin.write("\x1b[97;5u\x1b[98;5u"));
 
     // Should parse both sequences
     expect(keyHandler).toHaveBeenCalledTimes(2);
     expect(keyHandler).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        name: 'a',
+        name: "a",
         ctrl: true,
       }),
     );
     expect(keyHandler).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        name: 'b',
+        name: "b",
         ctrl: true,
       }),
     );
   });
 
-  it('should handle mixed valid and invalid sequences', async () => {
+  it("should handle mixed valid and invalid sequences", async () => {
     const keyHandler = vi.fn();
     const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
@@ -737,65 +703,65 @@ describe('KeypressContext', () => {
 
     // Send valid kitty sequence followed by invalid CSI
     // Valid enter, then invalid sequence
-    act(() => stdin.write('\x1b[13u\x1b[!'));
+    act(() => stdin.write("\x1b[13u\x1b[!"));
 
     // Should parse valid sequence and flush invalid immediately
     expect(keyHandler).toHaveBeenCalledTimes(2);
     expect(keyHandler).toHaveBeenNthCalledWith(
       1,
       expect.objectContaining({
-        name: 'return',
+        name: "return",
       }),
     );
     expect(keyHandler).toHaveBeenNthCalledWith(
       2,
       expect.objectContaining({
-        sequence: '\x1b[!',
+        sequence: "\x1b[!",
       }),
     );
   });
 
-  it.each([1, ESC_TIMEOUT - 1])(
-    'should handle sequences arriving character by character with %s ms delay',
-    async (delay) => {
-      const keyHandler = vi.fn();
-      const { result } = renderHook(() => useKeypressContext(), { wrapper });
+  it.each([
+    1,
+    ESC_TIMEOUT - 1,
+  ])("should handle sequences arriving character by character with %s ms delay", async (delay) => {
+    const keyHandler = vi.fn();
+    const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
-      act(() => result.current.subscribe(keyHandler));
+    act(() => result.current.subscribe(keyHandler));
 
-      // Send kitty sequence character by character
-      for (const char of '\x1b[27u') {
-        act(() => stdin.write(char));
-        // Advance time but not enough to timeout
-        vi.advanceTimersByTime(delay);
-      }
+    // Send kitty sequence character by character
+    for (const char of "\x1b[27u") {
+      act(() => stdin.write(char));
+      // Advance time but not enough to timeout
+      vi.advanceTimersByTime(delay);
+    }
 
-      // Should parse once complete
-      await waitFor(() => {
-        expect(keyHandler).toHaveBeenCalledWith(
-          expect.objectContaining({
-            name: 'escape',
-          }),
-        );
-      });
-    },
-  );
+    // Should parse once complete
+    await waitFor(() => {
+      expect(keyHandler).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: "escape",
+        }),
+      );
+    });
+  });
 
-  it('should reset timeout when new input arrives', async () => {
+  it("should reset timeout when new input arrives", async () => {
     const keyHandler = vi.fn();
     const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
     act(() => result.current.subscribe(keyHandler));
 
     // Start incomplete sequence
-    act(() => stdin.write('\x1b[97;13'));
+    act(() => stdin.write("\x1b[97;13"));
 
     // Advance time partway
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     act(() => vi.advanceTimersByTime(30));
 
     // Add more to sequence
-    act(() => stdin.write('5'));
+    act(() => stdin.write("5"));
 
     // Advance time from the first timeout point
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -805,18 +771,18 @@ describe('KeypressContext', () => {
     expect(keyHandler).not.toHaveBeenCalled();
 
     // Complete the sequence
-    act(() => stdin.write('u'));
+    act(() => stdin.write("u"));
 
     // Should now parse as complete enter key
     expect(keyHandler).toHaveBeenCalledWith(
       expect.objectContaining({
-        name: 'a',
+        name: "a",
       }),
     );
   });
 
-  describe('SGR Mouse Handling', () => {
-    it('should ignore SGR mouse sequences', async () => {
+  describe("SGR Mouse Handling", () => {
+    it("should ignore SGR mouse sequences", async () => {
       const keyHandler = vi.fn();
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
@@ -824,17 +790,17 @@ describe('KeypressContext', () => {
 
       // Send various SGR mouse sequences
       act(() => {
-        stdin.write('\x1b[<0;10;20M'); // Mouse press
-        stdin.write('\x1b[<0;10;20m'); // Mouse release
-        stdin.write('\x1b[<32;30;40M'); // Mouse drag
-        stdin.write('\x1b[<64;5;5M'); // Scroll up
+        stdin.write("\x1b[<0;10;20M"); // Mouse press
+        stdin.write("\x1b[<0;10;20m"); // Mouse release
+        stdin.write("\x1b[<32;30;40M"); // Mouse drag
+        stdin.write("\x1b[<64;5;5M"); // Scroll up
       });
 
       // Should not broadcast any of these as keystrokes
       expect(keyHandler).not.toHaveBeenCalled();
     });
 
-    it('should handle mixed SGR mouse and key sequences', async () => {
+    it("should handle mixed SGR mouse and key sequences", async () => {
       const keyHandler = vi.fn();
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
@@ -842,21 +808,21 @@ describe('KeypressContext', () => {
 
       // Send mouse event then a key press
       act(() => {
-        stdin.write('\x1b[<0;10;20M');
-        stdin.write('a');
+        stdin.write("\x1b[<0;10;20M");
+        stdin.write("a");
       });
 
       // Should only broadcast 'a'
       expect(keyHandler).toHaveBeenCalledTimes(1);
       expect(keyHandler).toHaveBeenCalledWith(
         expect.objectContaining({
-          name: 'a',
-          sequence: 'a',
+          name: "a",
+          sequence: "a",
         }),
       );
     });
 
-    it('should ignore X11 mouse sequences', async () => {
+    it("should ignore X11 mouse sequences", async () => {
       const keyHandler = vi.fn();
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
@@ -864,7 +830,7 @@ describe('KeypressContext', () => {
 
       // Send X11 mouse sequence: ESC [ M followed by 3 bytes
       // Space is 32. 32+0=32 (button 0), 32+33=65 ('A', col 33), 32+34=66 ('B', row 34)
-      const x11Seq = '\x1b[M AB';
+      const x11Seq = "\x1b[M AB";
 
       act(() => stdin.write(x11Seq));
 
@@ -872,58 +838,58 @@ describe('KeypressContext', () => {
       expect(keyHandler).not.toHaveBeenCalled();
     });
 
-    it('should not flush slow SGR mouse sequences as garbage', async () => {
+    it("should not flush slow SGR mouse sequences as garbage", async () => {
       const keyHandler = vi.fn();
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
       act(() => result.current.subscribe(keyHandler));
 
       // Send start of SGR sequence
-      act(() => stdin.write('\x1b[<'));
+      act(() => stdin.write("\x1b[<"));
 
       // Advance time past the normal kitty timeout (50ms)
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       act(() => vi.advanceTimersByTime(ESC_TIMEOUT + 10));
 
       // Send the rest
-      act(() => stdin.write('0;37;25M'));
+      act(() => stdin.write("0;37;25M"));
 
       // Should NOT have flushed the prefix as garbage, and should have consumed the whole thing
       expect(keyHandler).not.toHaveBeenCalled();
     });
 
-    it('should ignore specific SGR mouse sequence sandwiched between keystrokes', async () => {
+    it("should ignore specific SGR mouse sequence sandwiched between keystrokes", async () => {
       const keyHandler = vi.fn();
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
 
       act(() => result.current.subscribe(keyHandler));
 
       act(() => {
-        stdin.write('H');
-        stdin.write('\x1b[<64;96;8M');
-        stdin.write('I');
+        stdin.write("H");
+        stdin.write("\x1b[<64;96;8M");
+        stdin.write("I");
       });
 
       expect(keyHandler).toHaveBeenCalledTimes(2);
       expect(keyHandler).toHaveBeenNthCalledWith(
         1,
-        expect.objectContaining({ name: 'h', sequence: 'H', shift: true }),
+        expect.objectContaining({ name: "h", sequence: "H", shift: true }),
       );
       expect(keyHandler).toHaveBeenNthCalledWith(
         2,
-        expect.objectContaining({ name: 'i', sequence: 'I', shift: true }),
+        expect.objectContaining({ name: "i", sequence: "I", shift: true }),
       );
     });
   });
 
-  describe('Ignored Sequences', () => {
+  describe("Ignored Sequences", () => {
     it.each([
-      { name: 'Focus In', sequence: '\x1b[I' },
-      { name: 'Focus Out', sequence: '\x1b[O' },
-      { name: 'SGR Mouse Release', sequence: '\u001b[<0;44;18m' },
-      { name: 'something mouse', sequence: '\u001b[<0;53;19M' },
-      { name: 'another mouse', sequence: '\u001b[<0;29;19m' },
-    ])('should ignore $name sequence', async ({ sequence }) => {
+      { name: "Focus In", sequence: "\x1b[I" },
+      { name: "Focus Out", sequence: "\x1b[O" },
+      { name: "SGR Mouse Release", sequence: "\u001b[<0;44;18m" },
+      { name: "something mouse", sequence: "\u001b[<0;53;19M" },
+      { name: "another mouse", sequence: "\u001b[<0;29;19m" },
+    ])("should ignore $name sequence", async ({ sequence }) => {
       const keyHandler = vi.fn();
       const wrapper = ({ children }: { children: React.ReactNode }) => (
         <KeypressProvider>{children}</KeypressProvider>
@@ -940,20 +906,20 @@ describe('KeypressContext', () => {
         act(() => vi.advanceTimersByTime(0));
       }
 
-      act(() => stdin.write('HI'));
+      act(() => stdin.write("HI"));
 
       expect(keyHandler).toHaveBeenCalledTimes(2);
       expect(keyHandler).toHaveBeenNthCalledWith(
         1,
-        expect.objectContaining({ name: 'h', sequence: 'H', shift: true }),
+        expect.objectContaining({ name: "h", sequence: "H", shift: true }),
       );
       expect(keyHandler).toHaveBeenNthCalledWith(
         2,
-        expect.objectContaining({ name: 'i', sequence: 'I', shift: true }),
+        expect.objectContaining({ name: "i", sequence: "I", shift: true }),
       );
     });
 
-    it('should handle F12', async () => {
+    it("should handle F12", async () => {
       const keyHandler = vi.fn();
       const wrapper = ({ children }: { children: React.ReactNode }) => (
         <KeypressProvider>{children}</KeypressProvider>
@@ -962,22 +928,22 @@ describe('KeypressContext', () => {
       act(() => result.current.subscribe(keyHandler));
 
       act(() => {
-        stdin.write('\u001b[24~');
+        stdin.write("\u001b[24~");
       });
 
       expect(keyHandler).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'f12', sequence: '\u001b[24~' }),
+        expect.objectContaining({ name: "f12", sequence: "\u001b[24~" }),
       );
     });
   });
 
-  describe('Individual Character Input', () => {
+  describe("Individual Character Input", () => {
     it.each([
-      'abc', // ASCII character
-      '你好', // Chinese characters
-      'こんにちは', // Japanese characters
-      '안녕하세요', // Korean characters
-      'A你B好C', // Mixed characters
+      "abc", // ASCII character
+      "你好", // Chinese characters
+      "こんにちは", // Japanese characters
+      "안녕하세요", // Korean characters
+      "A你B好C", // Mixed characters
     ])('should correctly handle string "%s"', async (inputString) => {
       const keyHandler = vi.fn();
       const { result } = renderHook(() => useKeypressContext(), { wrapper });
@@ -987,9 +953,7 @@ describe('KeypressContext', () => {
 
       expect(keyHandler).toHaveBeenCalledTimes(inputString.length);
       for (const char of inputString) {
-        expect(keyHandler).toHaveBeenCalledWith(
-          expect.objectContaining({ sequence: char }),
-        );
+        expect(keyHandler).toHaveBeenCalledWith(expect.objectContaining({ sequence: char }));
       }
     });
   });
diff --git a/packages/ui-gemini/src/ui/contexts/KeypressContext.tsx b/packages/ui-gemini/src/ui/contexts/KeypressContext.tsx
index 876caeb06..9a5f6b8bb 100644
--- a/packages/ui-gemini/src/ui/contexts/KeypressContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/KeypressContext.tsx
@@ -4,110 +4,100 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger, type Config } from '@airiscode/gemini-cli-core';
-import { useStdin } from 'ink';
-import type React from 'react';
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-} from 'react';
-
-import { ESC } from '../utils/input.js';
-import { parseMouseEvent } from '../utils/mouse.js';
-import { FOCUS_IN, FOCUS_OUT } from '../hooks/useFocus.js';
-import { appEvents, AppEvent } from '../../utils/events.js';
+import { type Config, debugLogger } from "@airiscode/gemini-cli-core";
+import { useStdin } from "ink";
+import type React from "react";
+import { createContext, useCallback, useContext, useEffect, useRef } from "react";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { FOCUS_IN, FOCUS_OUT } from "../hooks/useFocus.js";
+import { ESC } from "../utils/input.js";
+import { parseMouseEvent } from "../utils/mouse.js";
 
 export const BACKSLASH_ENTER_TIMEOUT = 5;
 export const ESC_TIMEOUT = 50;
 export const PASTE_TIMEOUT = 30_000;
 
 // Parse the key itself
-const KEY_INFO_MAP: Record<
-  string,
-  { name: string; shift?: boolean; ctrl?: boolean }
-> = {
-  '[200~': { name: 'paste-start' },
-  '[201~': { name: 'paste-end' },
-  '[[A': { name: 'f1' },
-  '[[B': { name: 'f2' },
-  '[[C': { name: 'f3' },
-  '[[D': { name: 'f4' },
-  '[[E': { name: 'f5' },
-  '[1~': { name: 'home' },
-  '[2~': { name: 'insert' },
-  '[3~': { name: 'delete' },
-  '[4~': { name: 'end' },
-  '[5~': { name: 'pageup' },
-  '[6~': { name: 'pagedown' },
-  '[7~': { name: 'home' },
-  '[8~': { name: 'end' },
-  '[11~': { name: 'f1' },
-  '[12~': { name: 'f2' },
-  '[13~': { name: 'f3' },
-  '[14~': { name: 'f4' },
-  '[15~': { name: 'f5' },
-  '[17~': { name: 'f6' },
-  '[18~': { name: 'f7' },
-  '[19~': { name: 'f8' },
-  '[20~': { name: 'f9' },
-  '[21~': { name: 'f10' },
-  '[23~': { name: 'f11' },
-  '[24~': { name: 'f12' },
-  '[A': { name: 'up' },
-  '[B': { name: 'down' },
-  '[C': { name: 'right' },
-  '[D': { name: 'left' },
-  '[E': { name: 'clear' },
-  '[F': { name: 'end' },
-  '[H': { name: 'home' },
-  '[P': { name: 'f1' },
-  '[Q': { name: 'f2' },
-  '[R': { name: 'f3' },
-  '[S': { name: 'f4' },
-  OA: { name: 'up' },
-  OB: { name: 'down' },
-  OC: { name: 'right' },
-  OD: { name: 'left' },
-  OE: { name: 'clear' },
-  OF: { name: 'end' },
-  OH: { name: 'home' },
-  OP: { name: 'f1' },
-  OQ: { name: 'f2' },
-  OR: { name: 'f3' },
-  OS: { name: 'f4' },
-  '[[5~': { name: 'pageup' },
-  '[[6~': { name: 'pagedown' },
-  '[9u': { name: 'tab' },
-  '[13u': { name: 'return' },
-  '[27u': { name: 'escape' },
-  '[127u': { name: 'backspace' },
-  '[57414u': { name: 'return' }, // Numpad Enter
-  '[a': { name: 'up', shift: true },
-  '[b': { name: 'down', shift: true },
-  '[c': { name: 'right', shift: true },
-  '[d': { name: 'left', shift: true },
-  '[e': { name: 'clear', shift: true },
-  '[2$': { name: 'insert', shift: true },
-  '[3$': { name: 'delete', shift: true },
-  '[5$': { name: 'pageup', shift: true },
-  '[6$': { name: 'pagedown', shift: true },
-  '[7$': { name: 'home', shift: true },
-  '[8$': { name: 'end', shift: true },
-  '[Z': { name: 'tab', shift: true },
-  Oa: { name: 'up', ctrl: true },
-  Ob: { name: 'down', ctrl: true },
-  Oc: { name: 'right', ctrl: true },
-  Od: { name: 'left', ctrl: true },
-  Oe: { name: 'clear', ctrl: true },
-  '[2^': { name: 'insert', ctrl: true },
-  '[3^': { name: 'delete', ctrl: true },
-  '[5^': { name: 'pageup', ctrl: true },
-  '[6^': { name: 'pagedown', ctrl: true },
-  '[7^': { name: 'home', ctrl: true },
-  '[8^': { name: 'end', ctrl: true },
+const KEY_INFO_MAP: Record<string, { name: string; shift?: boolean; ctrl?: boolean }> = {
+  "[200~": { name: "paste-start" },
+  "[201~": { name: "paste-end" },
+  "[[A": { name: "f1" },
+  "[[B": { name: "f2" },
+  "[[C": { name: "f3" },
+  "[[D": { name: "f4" },
+  "[[E": { name: "f5" },
+  "[1~": { name: "home" },
+  "[2~": { name: "insert" },
+  "[3~": { name: "delete" },
+  "[4~": { name: "end" },
+  "[5~": { name: "pageup" },
+  "[6~": { name: "pagedown" },
+  "[7~": { name: "home" },
+  "[8~": { name: "end" },
+  "[11~": { name: "f1" },
+  "[12~": { name: "f2" },
+  "[13~": { name: "f3" },
+  "[14~": { name: "f4" },
+  "[15~": { name: "f5" },
+  "[17~": { name: "f6" },
+  "[18~": { name: "f7" },
+  "[19~": { name: "f8" },
+  "[20~": { name: "f9" },
+  "[21~": { name: "f10" },
+  "[23~": { name: "f11" },
+  "[24~": { name: "f12" },
+  "[A": { name: "up" },
+  "[B": { name: "down" },
+  "[C": { name: "right" },
+  "[D": { name: "left" },
+  "[E": { name: "clear" },
+  "[F": { name: "end" },
+  "[H": { name: "home" },
+  "[P": { name: "f1" },
+  "[Q": { name: "f2" },
+  "[R": { name: "f3" },
+  "[S": { name: "f4" },
+  OA: { name: "up" },
+  OB: { name: "down" },
+  OC: { name: "right" },
+  OD: { name: "left" },
+  OE: { name: "clear" },
+  OF: { name: "end" },
+  OH: { name: "home" },
+  OP: { name: "f1" },
+  OQ: { name: "f2" },
+  OR: { name: "f3" },
+  OS: { name: "f4" },
+  "[[5~": { name: "pageup" },
+  "[[6~": { name: "pagedown" },
+  "[9u": { name: "tab" },
+  "[13u": { name: "return" },
+  "[27u": { name: "escape" },
+  "[127u": { name: "backspace" },
+  "[57414u": { name: "return" }, // Numpad Enter
+  "[a": { name: "up", shift: true },
+  "[b": { name: "down", shift: true },
+  "[c": { name: "right", shift: true },
+  "[d": { name: "left", shift: true },
+  "[e": { name: "clear", shift: true },
+  "[2$": { name: "insert", shift: true },
+  "[3$": { name: "delete", shift: true },
+  "[5$": { name: "pageup", shift: true },
+  "[6$": { name: "pagedown", shift: true },
+  "[7$": { name: "home", shift: true },
+  "[8$": { name: "end", shift: true },
+  "[Z": { name: "tab", shift: true },
+  Oa: { name: "up", ctrl: true },
+  Ob: { name: "down", ctrl: true },
+  Oc: { name: "right", ctrl: true },
+  Od: { name: "left", ctrl: true },
+  Oe: { name: "clear", ctrl: true },
+  "[2^": { name: "insert", ctrl: true },
+  "[3^": { name: "delete", ctrl: true },
+  "[5^": { name: "pageup", ctrl: true },
+  "[6^": { name: "pagedown", ctrl: true },
+  "[7^": { name: "home", ctrl: true },
+  "[8^": { name: "end", ctrl: true },
 };
 
 const kUTF16SurrogateThreshold = 0x10000; // 2 ** 16
@@ -122,20 +112,14 @@ function charLengthAt(str: string, i: number): number {
 }
 
 const MAC_ALT_KEY_CHARACTER_MAP: Record<string, string> = {
-  '\u222B': 'b', // "∫" back one word
-  '\u0192': 'f', // "ƒ" forward one word
-  '\u00B5': 'm', // "µ" toggle markup view
+  "\u222B": "b", // "∫" back one word
+  "\u0192": "f", // "ƒ" forward one word
+  "\u00B5": "m", // "µ" toggle markup view
 };
 
-function nonKeyboardEventFilter(
-  keypressHandler: KeypressHandler,
-): KeypressHandler {
+function nonKeyboardEventFilter(keypressHandler: KeypressHandler): KeypressHandler {
   return (key: Key) => {
-    if (
-      !parseMouseEvent(key.sequence) &&
-      key.sequence !== FOCUS_IN &&
-      key.sequence !== FOCUS_OUT
-    ) {
+    if (!parseMouseEvent(key.sequence) && key.sequence !== FOCUS_IN && key.sequence !== FOCUS_OUT) {
       keypressHandler(key);
     }
   };
@@ -146,34 +130,29 @@ function nonKeyboardEventFilter(
  * Will flush the buffer if no data is received for DRAG_COMPLETION_TIMEOUT_MS
  * or when a null key is received.
  */
-function bufferBackslashEnter(
-  keypressHandler: KeypressHandler,
-): (key: Key | null) => void {
+function bufferBackslashEnter(keypressHandler: KeypressHandler): (key: Key | null) => void {
   const bufferer = (function* (): Generator<void, void, Key | null> {
     while (true) {
       const key = yield;
 
       if (key == null) {
         continue;
-      } else if (key.sequence !== '\\') {
+      } else if (key.sequence !== "\\") {
         keypressHandler(key);
         continue;
       }
 
-      const timeoutId = setTimeout(
-        () => bufferer.next(null),
-        BACKSLASH_ENTER_TIMEOUT,
-      );
+      const timeoutId = setTimeout(() => bufferer.next(null), BACKSLASH_ENTER_TIMEOUT);
       const nextKey = yield;
       clearTimeout(timeoutId);
 
       if (nextKey === null) {
         keypressHandler(key);
-      } else if (nextKey.name === 'return') {
+      } else if (nextKey.name === "return") {
         keypressHandler({
           ...nextKey,
           shift: true,
-          sequence: '\r', // Corrected escaping for newline
+          sequence: "\r", // Corrected escaping for newline
         });
       } else {
         keypressHandler(key);
@@ -192,21 +171,19 @@ function bufferBackslashEnter(
  * Will flush the buffer if no data is received for PASTE_TIMEOUT ms or
  * when a null key is received.
  */
-function bufferPaste(
-  keypressHandler: KeypressHandler,
-): (key: Key | null) => void {
+function bufferPaste(keypressHandler: KeypressHandler): (key: Key | null) => void {
   const bufferer = (function* (): Generator<void, void, Key | null> {
     while (true) {
       let key = yield;
 
       if (key === null) {
         continue;
-      } else if (key.name !== 'paste-start') {
+      } else if (key.name !== "paste-start") {
         keypressHandler(key);
         continue;
       }
 
-      let buffer = '';
+      let buffer = "";
       while (true) {
         const timeoutId = setTimeout(() => bufferer.next(null), PASTE_TIMEOUT);
         key = yield;
@@ -217,7 +194,7 @@ function bufferPaste(
           break;
         }
 
-        if (key.name === 'paste-end') {
+        if (key.name === "paste-end") {
           break;
         }
         buffer += key.sequence;
@@ -225,7 +202,7 @@ function bufferPaste(
 
       if (buffer.length > 0) {
         keypressHandler({
-          name: '',
+          name: "",
           ctrl: false,
           meta: false,
           shift: false,
@@ -257,7 +234,7 @@ function createDataListener(keypressHandler: KeypressHandler) {
       parser.next(char);
     }
     if (data.length !== 0) {
-      timeoutId = setTimeout(() => parser.next(''), ESC_TIMEOUT);
+      timeoutId = setTimeout(() => parser.next(""), ESC_TIMEOUT);
     }
   };
 }
@@ -267,9 +244,7 @@ function createDataListener(keypressHandler: KeypressHandler) {
  * Buffers escape sequences until a full sequence is received or
  * until an empty string is sent to indicate a timeout.
  */
-function* emitKeys(
-  keypressHandler: KeypressHandler,
-): Generator<void, void, string> {
+function* emitKeys(keypressHandler: KeypressHandler): Generator<void, void, string> {
   while (true) {
     let ch = yield;
     let sequence = ch;
@@ -293,25 +268,25 @@ function* emitKeys(
       }
     }
 
-    if (escaped && (ch === 'O' || ch === '[')) {
+    if (escaped && (ch === "O" || ch === "[")) {
       // ANSI escape sequence
       code = ch;
       let modifier = 0;
 
-      if (ch === 'O') {
+      if (ch === "O") {
         // ESC O letter
         // ESC O modifier letter
         ch = yield;
         sequence += ch;
 
-        if (ch >= '0' && ch <= '9') {
+        if (ch >= "0" && ch <= "9") {
           modifier = parseInt(ch, 10) - 1;
           ch = yield;
           sequence += ch;
         }
 
         code += ch;
-      } else if (ch === '[') {
+      } else if (ch === "[") {
         // ESC [ letter
         // ESC [ modifier letter
         // ESC [ [ modifier letter
@@ -319,7 +294,7 @@ function* emitKeys(
         ch = yield;
         sequence += ch;
 
-        if (ch === '[') {
+        if (ch === "[") {
           // \x1b[[A
           //      ^--- escape codes might have a second bracket
           code += ch;
@@ -359,33 +334,33 @@ function* emitKeys(
         const cmdStart = sequence.length - 1;
 
         // collect as many digits as possible
-        while (ch >= '0' && ch <= '9') {
+        while (ch >= "0" && ch <= "9") {
           ch = yield;
           sequence += ch;
         }
 
         // skip modifier
-        if (ch === ';') {
-          while (ch === ';') {
+        if (ch === ";") {
+          while (ch === ";") {
             ch = yield;
             sequence += ch;
 
             // collect as many digits as possible
-            while (ch >= '0' && ch <= '9') {
+            while (ch >= "0" && ch <= "9") {
               ch = yield;
               sequence += ch;
             }
           }
-        } else if (ch === '<') {
+        } else if (ch === "<") {
           // SGR mouse mode
           ch = yield;
           sequence += ch;
           // Don't skip on empty string here to avoid timeouts on slow events.
-          while (ch === '' || ch === ';' || (ch >= '0' && ch <= '9')) {
+          while (ch === "" || ch === ";" || (ch >= "0" && ch <= "9")) {
             ch = yield;
             sequence += ch;
           }
-        } else if (ch === 'M') {
+        } else if (ch === "M") {
           // X11 mouse mode
           // three characters after 'M'
           ch = yield;
@@ -404,19 +379,19 @@ function* emitKeys(
         let match;
 
         if ((match = /^(\d+)(?:;(\d+))?(?:;(\d+))?([~^$u])$/.exec(cmd))) {
-          if (match[1] === '27' && match[3] && match[4] === '~') {
+          if (match[1] === "27" && match[3] && match[4] === "~") {
             // modifyOtherKeys format: CSI 27 ; modifier ; key ~
             // Treat as CSI u: key + 'u'
-            code += match[3] + 'u';
-            modifier = parseInt(match[2] ?? '1', 10) - 1;
+            code += match[3] + "u";
+            modifier = parseInt(match[2] ?? "1", 10) - 1;
           } else {
             code += match[1] + match[4];
             // Defaults to '1' if no modifier exists, resulting in a 0 modifier value
-            modifier = parseInt(match[2] ?? '1', 10) - 1;
+            modifier = parseInt(match[2] ?? "1", 10) - 1;
           }
         } else if ((match = /^(\d+)?(?:;(\d+))?([A-Za-z])$/.exec(cmd))) {
           code += match[3];
-          modifier = parseInt(match[2] ?? match[1] ?? '1', 10) - 1;
+          modifier = parseInt(match[2] ?? match[1] ?? "1", 10) - 1;
         } else {
           code += cmd;
         }
@@ -437,45 +412,42 @@ function* emitKeys(
           ctrl = true;
         }
       } else {
-        name = 'undefined';
-        if ((ctrl || meta) && (code.endsWith('u') || code.endsWith('~'))) {
+        name = "undefined";
+        if ((ctrl || meta) && (code.endsWith("u") || code.endsWith("~"))) {
           // CSI-u or tilde-coded functional keys: ESC [ <code> ; <mods> (u|~)
           const codeNumber = parseInt(code.slice(1, -1), 10);
-          if (
-            codeNumber >= 'a'.charCodeAt(0) &&
-            codeNumber <= 'z'.charCodeAt(0)
-          ) {
+          if (codeNumber >= "a".charCodeAt(0) && codeNumber <= "z".charCodeAt(0)) {
             name = String.fromCharCode(codeNumber);
           }
         }
       }
-    } else if (ch === '\r') {
+    } else if (ch === "\r") {
       // carriage return
-      name = 'return';
+      name = "return";
       meta = escaped;
-    } else if (ch === '\n') {
+    } else if (ch === "\n") {
       // Enter, should have been called linefeed
-      name = 'enter';
+      name = "enter";
       meta = escaped;
-    } else if (ch === '\t') {
+    } else if (ch === "\t") {
       // tab
-      name = 'tab';
+      name = "tab";
       meta = escaped;
-    } else if (ch === '\b' || ch === '\x7f') {
+    } else if (ch === "\b" || ch === "\x7f") {
       // backspace or ctrl+h
-      name = 'backspace';
+      name = "backspace";
       meta = escaped;
     } else if (ch === ESC) {
       // escape key
-      name = 'escape';
+      name = "escape";
       meta = escaped;
-    } else if (ch === ' ') {
-      name = 'space';
+    } else if (ch === " ") {
+      name = "space";
       meta = escaped;
       insertable = true;
-    } else if (!escaped && ch <= '\x1a') {
+    } else if (!escaped && ch <= "\x1a") {
       // ctrl+letter
-      name = String.fromCharCode(ch.charCodeAt(0) + 'a'.charCodeAt(0) - 1);
+      name = String.fromCharCode(ch.charCodeAt(0) + "a".charCodeAt(0) - 1);
       ctrl = true;
     } else if (/^[0-9A-Za-z]$/.exec(ch) !== null) {
       // Letter, number, shift+letter
@@ -483,17 +455,17 @@ function* emitKeys(
       shift = /^[A-Z]$/.exec(ch) !== null;
       meta = escaped;
       insertable = true;
-    } else if (MAC_ALT_KEY_CHARACTER_MAP[ch] && process.platform === 'darwin') {
+    } else if (MAC_ALT_KEY_CHARACTER_MAP[ch] && process.platform === "darwin") {
       name = MAC_ALT_KEY_CHARACTER_MAP[ch];
       meta = true;
     } else if (sequence === `${ESC}${ESC}`) {
       // Double escape
-      name = 'escape';
+      name = "escape";
       meta = true;
 
       // Emit first escape key here, then continue processing
       keypressHandler({
-        name: 'escape',
+        name: "escape",
         ctrl,
         meta,
         shift,
@@ -503,7 +475,7 @@ function* emitKeys(
       });
     } else if (escaped) {
       // Escape sequence timeout
-      name = ch.length ? undefined : 'escape';
+      name = ch.length ? undefined : "escape";
       meta = true;
     } else {
       // Any other character is considered printable.
@@ -515,7 +487,7 @@ function* emitKeys(
       charLengthAt(sequence, 0) === sequence.length
     ) {
       keypressHandler({
-        name: name || '',
+        name: name || "",
         ctrl,
         meta,
         shift,
@@ -545,16 +517,12 @@ interface KeypressContextValue {
   unsubscribe: (handler: KeypressHandler) => void;
 }
 
-const KeypressContext = createContext<KeypressContextValue | undefined>(
-  undefined,
-);
+const KeypressContext = createContext<KeypressContextValue | undefined>(undefined);
 
 export function useKeypressContext() {
   const context = useContext(KeypressContext);
   if (!context) {
-    throw new Error(
-      'useKeypressContext must be used within a KeypressProvider',
-    );
+    throw new Error("useKeypressContext must be used within a KeypressProvider");
   }
   return context;
 }
@@ -590,7 +558,7 @@ export function KeypressProvider({
       setRawMode(true);
     }
 
-    process.stdin.setEncoding('utf8'); // Make data events emit strings
+    process.stdin.setEncoding("utf8"); // Make data events emit strings
 
     const mouseFilterer = nonKeyboardEventFilter(broadcast);
     const backslashBufferer = bufferBackslashEnter(mouseFilterer);
@@ -607,9 +575,9 @@ export function KeypressProvider({
       };
     }
 
-    stdin.on('data', dataListener);
+    stdin.on("data", dataListener);
     return () => {
-      stdin.removeListener('data', dataListener);
+      stdin.removeListener("data", dataListener);
       if (wasRaw === false) {
         setRawMode(false);
       }
diff --git a/packages/ui-gemini/src/ui/contexts/MouseContext.test.tsx b/packages/ui-gemini/src/ui/contexts/MouseContext.test.tsx
index 022472156..32022363b 100644
--- a/packages/ui-gemini/src/ui/contexts/MouseContext.test.tsx
+++ b/packages/ui-gemini/src/ui/contexts/MouseContext.test.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderHook } from '../../test-utils/render.js';
-import { act } from 'react';
-import { MouseProvider, useMouseContext, useMouse } from './MouseContext.js';
-import { vi, type Mock } from 'vitest';
-import type React from 'react';
-import { useStdin } from 'ink';
-import { EventEmitter } from 'node:events';
-import { appEvents, AppEvent } from '../../utils/events.js';
+import { EventEmitter } from "node:events";
+import { useStdin } from "ink";
+import type React from "react";
+import { act } from "react";
+import { type Mock, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { MouseProvider, useMouse, useMouseContext } from "./MouseContext.js";
 
 // Mock the 'ink' module to control stdin
-vi.mock('ink', async (importOriginal) => {
-  const original = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const original = await importOriginal<typeof import("ink")>();
   return {
     ...original,
     useStdin: vi.fn(),
@@ -23,14 +23,14 @@ vi.mock('ink', async (importOriginal) => {
 });
 
 // Mock appEvents
-vi.mock('../../utils/events.js', () => ({
+vi.mock("../../utils/events.js", () => ({
   appEvents: {
     emit: vi.fn(),
     on: vi.fn(),
     off: vi.fn(),
   },
   AppEvent: {
-    SelectionWarning: 'selection-warning',
+    SelectionWarning: "selection-warning",
   },
 }));
 
@@ -43,11 +43,11 @@ class MockStdin extends EventEmitter {
   pause = vi.fn();
 
   write(text: string) {
-    this.emit('data', text);
+    this.emit("data", text);
   }
 }
 
-describe('MouseContext', () => {
+describe("MouseContext", () => {
   let stdin: MockStdin;
   let wrapper: React.FC<{ children: React.ReactNode }>;
 
@@ -67,7 +67,7 @@ describe('MouseContext', () => {
     vi.restoreAllMocks();
   });
 
-  it('should subscribe and unsubscribe a handler', () => {
+  it("should subscribe and unsubscribe a handler", () => {
     const handler = vi.fn();
     const { result } = renderHook(() => useMouseContext(), { wrapper });
 
@@ -76,7 +76,7 @@ describe('MouseContext', () => {
     });
 
     act(() => {
-      stdin.write('\x1b[<0;10;20M');
+      stdin.write("\x1b[<0;10;20M");
     });
 
     expect(handler).toHaveBeenCalledTimes(1);
@@ -86,37 +86,37 @@ describe('MouseContext', () => {
     });
 
     act(() => {
-      stdin.write('\x1b[<0;10;20M');
+      stdin.write("\x1b[<0;10;20M");
     });
 
     expect(handler).toHaveBeenCalledTimes(1);
   });
 
-  it('should not call handler if not active', () => {
+  it("should not call handler if not active", () => {
     const handler = vi.fn();
     renderHook(() => useMouse(handler, { isActive: false }), {
       wrapper,
     });
 
     act(() => {
-      stdin.write('\x1b[<0;10;20M');
+      stdin.write("\x1b[<0;10;20M");
     });
 
     expect(handler).not.toHaveBeenCalled();
   });
 
-  it('should emit SelectionWarning when move event is unhandled and has coordinates', () => {
+  it("should emit SelectionWarning when move event is unhandled and has coordinates", () => {
     renderHook(() => useMouseContext(), { wrapper });
 
     act(() => {
       // Move event (32) at 10, 20
-      stdin.write('\x1b[<32;10;20M');
+      stdin.write("\x1b[<32;10;20M");
     });
 
     expect(appEvents.emit).toHaveBeenCalledWith(AppEvent.SelectionWarning);
   });
 
-  it('should not emit SelectionWarning when move event is handled', () => {
+  it("should not emit SelectionWarning when move event is handled", () => {
     const handler = vi.fn().mockReturnValue(true);
     const { result } = renderHook(() => useMouseContext(), { wrapper });
 
@@ -126,107 +126,102 @@ describe('MouseContext', () => {
 
     act(() => {
       // Move event (32) at 10, 20
-      stdin.write('\x1b[<32;10;20M');
+      stdin.write("\x1b[<32;10;20M");
     });
 
     expect(handler).toHaveBeenCalled();
     expect(appEvents.emit).not.toHaveBeenCalled();
   });
 
-  describe('SGR Mouse Events', () => {
+  describe("SGR Mouse Events", () => {
     it.each([
       {
-        sequence: '\x1b[<0;10;20M',
+        sequence: "\x1b[<0;10;20M",
         expected: {
-          name: 'left-press',
+          name: "left-press",
           ctrl: false,
           meta: false,
           shift: false,
         },
       },
       {
-        sequence: '\x1b[<0;10;20m',
+        sequence: "\x1b[<0;10;20m",
         expected: {
-          name: 'left-release',
+          name: "left-release",
           ctrl: false,
           meta: false,
           shift: false,
         },
       },
       {
-        sequence: '\x1b[<2;10;20M',
+        sequence: "\x1b[<2;10;20M",
         expected: {
-          name: 'right-press',
+          name: "right-press",
           ctrl: false,
           meta: false,
           shift: false,
         },
       },
       {
-        sequence: '\x1b[<1;10;20M',
+        sequence: "\x1b[<1;10;20M",
         expected: {
-          name: 'middle-press',
+          name: "middle-press",
           ctrl: false,
           meta: false,
           shift: false,
         },
       },
       {
-        sequence: '\x1b[<64;10;20M',
+        sequence: "\x1b[<64;10;20M",
         expected: {
-          name: 'scroll-up',
+          name: "scroll-up",
           ctrl: false,
           meta: false,
           shift: false,
         },
       },
       {
-        sequence: '\x1b[<65;10;20M',
+        sequence: "\x1b[<65;10;20M",
         expected: {
-          name: 'scroll-down',
+          name: "scroll-down",
           ctrl: false,
           meta: false,
           shift: false,
         },
       },
       {
-        sequence: '\x1b[<32;10;20M',
+        sequence: "\x1b[<32;10;20M",
         expected: {
-          name: 'move',
+          name: "move",
           ctrl: false,
           meta: false,
           shift: false,
         },
       },
       {
-        sequence: '\x1b[<4;10;20M',
-        expected: { name: 'left-press', shift: true },
+        sequence: "\x1b[<4;10;20M",
+        expected: { name: "left-press", shift: true },
       }, // Shift + left press
       {
-        sequence: '\x1b[<8;10;20M',
-        expected: { name: 'left-press', meta: true },
+        sequence: "\x1b[<8;10;20M",
+        expected: { name: "left-press", meta: true },
       }, // Alt + left press
       {
-        sequence: '\x1b[<20;10;20M',
-        expected: { name: 'left-press', ctrl: true, shift: true },
+        sequence: "\x1b[<20;10;20M",
+        expected: { name: "left-press", ctrl: true, shift: true },
       }, // Ctrl + Shift + left press
       {
-        sequence: '\x1b[<68;10;20M',
-        expected: { name: 'scroll-up', shift: true },
+        sequence: "\x1b[<68;10;20M",
+        expected: { name: "scroll-up", shift: true },
       }, // Shift + scroll up
-    ])(
-      'should recognize sequence "$sequence" as $expected.name',
-      ({ sequence, expected }) => {
-        const mouseHandler = vi.fn();
-        const { result } = renderHook(() => useMouseContext(), { wrapper });
-        act(() => result.current.subscribe(mouseHandler));
-
-        act(() => stdin.write(sequence));
-
-        expect(mouseHandler).toHaveBeenCalledWith(
-          expect.objectContaining({ ...expected }),
-        );
-      },
-    );
+    ])('should recognize sequence "$sequence" as $expected.name', ({ sequence, expected }) => {
+      const mouseHandler = vi.fn();
+      const { result } = renderHook(() => useMouseContext(), { wrapper });
+      act(() => result.current.subscribe(mouseHandler));
+
+      act(() => stdin.write(sequence));
+
+      expect(mouseHandler).toHaveBeenCalledWith(expect.objectContaining({ ...expected }));
+    });
   });
 });
diff --git a/packages/ui-gemini/src/ui/contexts/MouseContext.tsx b/packages/ui-gemini/src/ui/contexts/MouseContext.tsx
index 6ef172fb5..aff92d5a8 100644
--- a/packages/ui-gemini/src/ui/contexts/MouseContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/MouseContext.tsx
@@ -4,25 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useStdin } from 'ink';
-import type React from 'react';
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-} from 'react';
-import { ESC } from '../utils/input.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { appEvents, AppEvent } from '../../utils/events.js';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { useStdin } from "ink";
+import type React from "react";
+import { createContext, useCallback, useContext, useEffect, useRef } from "react";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { ESC } from "../utils/input.js";
 import {
   isIncompleteMouseSequence,
-  parseMouseEvent,
   type MouseEvent,
   type MouseEventName,
   type MouseHandler,
-} from '../utils/mouse.js';
+  parseMouseEvent,
+} from "../utils/mouse.js";
 
 export type { MouseEvent, MouseEventName, MouseHandler };
 
@@ -38,7 +32,7 @@ const MouseContext = createContext<MouseContextValue | undefined>(undefined);
 export function useMouseContext() {
   const context = useContext(MouseContext);
   if (!context) {
-    throw new Error('useMouseContext must be used within a MouseProvider');
+    throw new Error("useMouseContext must be used within a MouseProvider");
   }
   return context;
 }
@@ -87,7 +81,7 @@ export function MouseProvider({
       return;
     }
 
-    let mouseBuffer = '';
+    let mouseBuffer = "";
 
     const broadcast = (event: MouseEvent) => {
       let handled = false;
@@ -98,10 +92,10 @@ export function MouseProvider({
       }
       if (
         !handled &&
-        event.name === 'move' &&
+        event.name === "move" &&
         event.col >= 0 &&
         event.row >= 0 &&
-        event.button === 'left'
+        event.button === "left"
       ) {
         // Terminal apps only receive mouse move events when the mouse is down
         // so this always indicates a mouse drag that the user was expecting
@@ -112,7 +106,7 @@ export function MouseProvider({
     };
 
     const handleData = (data: Buffer | string) => {
-      mouseBuffer += typeof data === 'string' ? data : data.toString('utf-8');
+      mouseBuffer += typeof data === "string" ? data : data.toString("utf-8");
 
       // Safety cap to prevent infinite buffer growth on garbage
       if (mouseBuffer.length > MAX_MOUSE_BUFFER_SIZE) {
@@ -124,10 +118,7 @@ export function MouseProvider({
 
         if (parsed) {
           if (debugKeystrokeLogging) {
-            debugLogger.log(
-              '[DEBUG] Mouse event parsed:',
-              JSON.stringify(parsed.event),
-            );
+            debugLogger.log("[DEBUG] Mouse event parsed:", JSON.stringify(parsed.event));
           }
           broadcast(parsed.event);
           mouseBuffer = mouseBuffer.slice(parsed.length);
@@ -145,22 +136,20 @@ export function MouseProvider({
           mouseBuffer = mouseBuffer.slice(nextEsc);
           // Loop continues to try parsing at new location
         } else {
-          mouseBuffer = '';
+          mouseBuffer = "";
           break;
         }
       }
     };
 
-    stdin.on('data', handleData);
+    stdin.on("data", handleData);
 
     return () => {
-      stdin.removeListener('data', handleData);
+      stdin.removeListener("data", handleData);
     };
   }, [stdin, mouseEventsEnabled, subscribers, debugKeystrokeLogging]);
 
   return (
-    <MouseContext.Provider value={{ subscribe, unsubscribe }}>
-      {children}
-    </MouseContext.Provider>
+    <MouseContext.Provider value={{ subscribe, unsubscribe }}>{children}</MouseContext.Provider>
   );
 }
diff --git a/packages/ui-gemini/src/ui/contexts/OverflowContext.tsx b/packages/ui-gemini/src/ui/contexts/OverflowContext.tsx
index 9d8b78d4c..ddd92ab0d 100644
--- a/packages/ui-gemini/src/ui/contexts/OverflowContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/OverflowContext.tsx
@@ -4,14 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import {
-  createContext,
-  useContext,
-  useState,
-  useCallback,
-  useMemo,
-} from 'react';
+import type React from "react";
+import { createContext, useCallback, useContext, useMemo, useState } from "react";
 
 interface OverflowState {
   overflowingIds: ReadonlySet<string>;
@@ -22,23 +16,16 @@ interface OverflowActions {
   removeOverflowingId: (id: string) => void;
 }
 
-const OverflowStateContext = createContext<OverflowState | undefined>(
-  undefined,
-);
+const OverflowStateContext = createContext<OverflowState | undefined>(undefined);
 
-const OverflowActionsContext = createContext<OverflowActions | undefined>(
-  undefined,
-);
+const OverflowActionsContext = createContext<OverflowActions | undefined>(undefined);
 
-export const useOverflowState = (): OverflowState | undefined =>
-  useContext(OverflowStateContext);
+export const useOverflowState = (): OverflowState | undefined => useContext(OverflowStateContext);
 
 export const useOverflowActions = (): OverflowActions | undefined =>
   useContext(OverflowActionsContext);
 
-export const OverflowProvider: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
+export const OverflowProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
   const [overflowingIds, setOverflowingIds] = useState(new Set<string>());
 
   const addOverflowingId = useCallback((id: string) => {
diff --git a/packages/ui-gemini/src/ui/contexts/ScrollProvider.drag.test.tsx b/packages/ui-gemini/src/ui/contexts/ScrollProvider.drag.test.tsx
index 2ef66df10..b8afee6cc 100644
--- a/packages/ui-gemini/src/ui/contexts/ScrollProvider.drag.test.tsx
+++ b/packages/ui-gemini/src/ui/contexts/ScrollProvider.drag.test.tsx
@@ -4,22 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import {
-  ScrollProvider,
-  useScrollable,
-  type ScrollState,
-} from './ScrollProvider.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { useRef, useImperativeHandle, forwardRef, type RefObject } from 'react';
-import { Box, type DOMElement } from 'ink';
-import type { MouseEvent } from '../hooks/useMouse.js';
+import { Box, type DOMElement } from "ink";
+import { forwardRef, type RefObject, useImperativeHandle, useRef } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { MouseEvent } from "../hooks/useMouse.js";
+import { ScrollProvider, type ScrollState, useScrollable } from "./ScrollProvider.js";
 
 // Mock useMouse hook
 const mockUseMouseCallbacks = new Set<(event: MouseEvent) => void>();
-vi.mock('../hooks/useMouse.js', async () => {
+vi.mock("../hooks/useMouse.js", async () => {
   // We need to import React dynamically because this factory runs before top-level imports
-  const React = await import('react');
+  const React = await import("react");
   return {
     useMouse: (callback: (event: MouseEvent) => void) => {
       React.useEffect(() => {
@@ -33,8 +29,8 @@ vi.mock('../hooks/useMouse.js', async () => {
 });
 
 // Mock ink's getBoundingBox
-vi.mock('ink', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("ink")>();
   return {
     ...actual,
     getBoundingBox: vi.fn(() => ({ x: 0, y: 0, width: 10, height: 10 })),
@@ -67,9 +63,9 @@ const TestScrollable = forwardRef(
     return <Box ref={elementRef} />;
   },
 );
-TestScrollable.displayName = 'TestScrollable';
+TestScrollable.displayName = "TestScrollable";
 
-describe('ScrollProvider Drag', () => {
+describe("ScrollProvider Drag", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     mockUseMouseCallbacks.clear();
@@ -79,7 +75,7 @@ describe('ScrollProvider Drag', () => {
     vi.useRealTimers();
   });
 
-  it('drags the scrollbar thumb', async () => {
+  it("drags the scrollbar thumb", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 0,
@@ -89,11 +85,7 @@ describe('ScrollProvider Drag', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
@@ -107,26 +99,26 @@ describe('ScrollProvider Drag', () => {
     // 1. Click on thumb (row 0)
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 0,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
     // 2. Move mouse to row 1
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'move',
+        name: "move",
         col: 10, // col doesn't matter for move if dragging
         row: 1,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -138,13 +130,13 @@ describe('ScrollProvider Drag', () => {
     scrollBy.mockClear();
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'move',
+        name: "move",
         col: 10,
         row: 2,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -156,13 +148,13 @@ describe('ScrollProvider Drag', () => {
     // 4. Release
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-release',
+        name: "left-release",
         col: 10,
         row: 2,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -170,19 +162,19 @@ describe('ScrollProvider Drag', () => {
     scrollBy.mockClear();
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'move',
+        name: "move",
         col: 10,
         row: 3,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'none',
+        button: "none",
       });
     }
     expect(scrollBy).not.toHaveBeenCalled();
   });
 
-  it('jumps to position and starts drag when clicking track below thumb', async () => {
+  it("jumps to position and starts drag when clicking track below thumb", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 0,
@@ -192,11 +184,7 @@ describe('ScrollProvider Drag', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
@@ -208,13 +196,13 @@ describe('ScrollProvider Drag', () => {
     // 1. Click on track below thumb
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -231,20 +219,20 @@ describe('ScrollProvider Drag', () => {
 
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'move',
+        name: "move",
         col: 10,
         row: 6,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
     expect(scrollBy).toHaveBeenCalledWith(60);
   });
 
-  it('jumps to position when clicking track above thumb', async () => {
+  it("jumps to position when clicking track above thumb", async () => {
     const scrollBy = vi.fn();
     // Start scrolled down
     const getScrollState = vi.fn(() => ({
@@ -255,11 +243,7 @@ describe('ScrollProvider Drag', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
@@ -269,13 +253,13 @@ describe('ScrollProvider Drag', () => {
 
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 2,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -283,7 +267,7 @@ describe('ScrollProvider Drag', () => {
     expect(scrollBy).toHaveBeenCalledWith(-30);
   });
 
-  it('jumps to top when clicking very top of track', async () => {
+  it("jumps to top when clicking very top of track", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 50,
@@ -293,11 +277,7 @@ describe('ScrollProvider Drag', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
@@ -307,13 +287,13 @@ describe('ScrollProvider Drag', () => {
 
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 0,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -321,7 +301,7 @@ describe('ScrollProvider Drag', () => {
     expect(scrollBy).toHaveBeenCalledWith(-50);
   });
 
-  it('jumps to bottom when clicking very bottom of track', async () => {
+  it("jumps to bottom when clicking very bottom of track", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 0,
@@ -331,11 +311,7 @@ describe('ScrollProvider Drag', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
@@ -345,13 +321,13 @@ describe('ScrollProvider Drag', () => {
 
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 9,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -359,7 +335,7 @@ describe('ScrollProvider Drag', () => {
     expect(scrollBy).toHaveBeenCalledWith(90);
   });
 
-  it('uses scrollTo with 0 duration if provided', async () => {
+  it("uses scrollTo with 0 duration if provided", async () => {
     const scrollBy = vi.fn();
     const scrollTo = vi.fn();
     const getScrollState = vi.fn(() => ({
@@ -395,7 +371,7 @@ describe('ScrollProvider Drag', () => {
         return <Box ref={elementRef} />;
       },
     );
-    TestScrollableWithScrollTo.displayName = 'TestScrollableWithScrollTo';
+    TestScrollableWithScrollTo.displayName = "TestScrollableWithScrollTo";
 
     render(
       <ScrollProvider>
@@ -411,13 +387,13 @@ describe('ScrollProvider Drag', () => {
     // Click on track (jump)
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -429,13 +405,13 @@ describe('ScrollProvider Drag', () => {
     // Move mouse (drag)
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'move',
+        name: "move",
         col: 10,
         row: 6,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
     // Expect scrollTo to be called with target and duration 0
diff --git a/packages/ui-gemini/src/ui/contexts/ScrollProvider.test.tsx b/packages/ui-gemini/src/ui/contexts/ScrollProvider.test.tsx
index 021e10e28..6efba43d3 100644
--- a/packages/ui-gemini/src/ui/contexts/ScrollProvider.test.tsx
+++ b/packages/ui-gemini/src/ui/contexts/ScrollProvider.test.tsx
@@ -4,22 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import {
-  ScrollProvider,
-  useScrollable,
-  type ScrollState,
-} from './ScrollProvider.js';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { useRef, useImperativeHandle, forwardRef, type RefObject } from 'react';
-import { Box, type DOMElement } from 'ink';
-import type { MouseEvent } from '../hooks/useMouse.js';
+import { Box, type DOMElement } from "ink";
+import { forwardRef, type RefObject, useImperativeHandle, useRef } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { MouseEvent } from "../hooks/useMouse.js";
+import { ScrollProvider, type ScrollState, useScrollable } from "./ScrollProvider.js";
 
 // Mock useMouse hook
 const mockUseMouseCallbacks = new Set<(event: MouseEvent) => void | boolean>();
-vi.mock('../hooks/useMouse.js', async () => {
+vi.mock("../hooks/useMouse.js", async () => {
   // We need to import React dynamically because this factory runs before top-level imports
-  const React = await import('react');
+  const React = await import("react");
   return {
     useMouse: (callback: (event: MouseEvent) => void | boolean) => {
       React.useEffect(() => {
@@ -33,8 +29,8 @@ vi.mock('../hooks/useMouse.js', async () => {
 });
 
 // Mock ink's getBoundingBox
-vi.mock('ink', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("ink")>();
   return {
     ...actual,
     getBoundingBox: vi.fn(() => ({ x: 0, y: 0, width: 10, height: 10 })),
@@ -69,9 +65,9 @@ const TestScrollable = forwardRef(
     return <Box ref={elementRef} />;
   },
 );
-TestScrollable.displayName = 'TestScrollable';
+TestScrollable.displayName = "TestScrollable";
 
-describe('ScrollProvider', () => {
+describe("ScrollProvider", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     mockUseMouseCallbacks.clear();
@@ -81,8 +77,8 @@ describe('ScrollProvider', () => {
     vi.useRealTimers();
   });
 
-  describe('Event Handling Status', () => {
-    it('returns true when scroll event is handled', () => {
+  describe("Event Handling Status", () => {
+    it("returns true when scroll event is handled", () => {
       const scrollBy = vi.fn();
       const getScrollState = vi.fn(() => ({
         scrollTop: 0,
@@ -104,13 +100,13 @@ describe('ScrollProvider', () => {
       for (const callback of mockUseMouseCallbacks) {
         if (
           callback({
-            name: 'scroll-down',
+            name: "scroll-down",
             col: 5,
             row: 5,
             shift: false,
             ctrl: false,
             meta: false,
-            button: 'none',
+            button: "none",
           }) === true
         ) {
           handled = true;
@@ -119,7 +115,7 @@ describe('ScrollProvider', () => {
       expect(handled).toBe(true);
     });
 
-    it('returns false when scroll event is ignored (cannot scroll further)', () => {
+    it("returns false when scroll event is ignored (cannot scroll further)", () => {
       const scrollBy = vi.fn();
       // Already at bottom
       const getScrollState = vi.fn(() => ({
@@ -142,13 +138,13 @@ describe('ScrollProvider', () => {
       for (const callback of mockUseMouseCallbacks) {
         if (
           callback({
-            name: 'scroll-down',
+            name: "scroll-down",
             col: 5,
             row: 5,
             shift: false,
             ctrl: false,
             meta: false,
-            button: 'none',
+            button: "none",
           }) === true
         ) {
           handled = true;
@@ -158,7 +154,7 @@ describe('ScrollProvider', () => {
     });
   });
 
-  it('calls scrollTo when clicking scrollbar track if available', async () => {
+  it("calls scrollTo when clicking scrollbar track if available", async () => {
     const scrollBy = vi.fn();
     const scrollTo = vi.fn();
     const getScrollState = vi.fn(() => ({
@@ -189,13 +185,13 @@ describe('ScrollProvider', () => {
 
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -203,7 +199,7 @@ describe('ScrollProvider', () => {
     expect(scrollBy).not.toHaveBeenCalled();
   });
 
-  it('calls scrollBy when clicking scrollbar track if scrollTo is not available', async () => {
+  it("calls scrollBy when clicking scrollbar track if scrollTo is not available", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 0,
@@ -213,30 +209,26 @@ describe('ScrollProvider', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
     expect(scrollBy).toHaveBeenCalled();
   });
 
-  it('batches multiple scroll events into a single update', async () => {
+  it("batches multiple scroll events into a single update", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 0,
@@ -246,23 +238,19 @@ describe('ScrollProvider', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
     // Simulate multiple scroll events
     const mouseEvent: MouseEvent = {
-      name: 'scroll-down',
+      name: "scroll-down",
       col: 5,
       row: 5,
       shift: false,
       ctrl: false,
       meta: false,
-      button: 'none',
+      button: "none",
     };
     for (const callback of mockUseMouseCallbacks) {
       callback(mouseEvent);
@@ -281,7 +269,7 @@ describe('ScrollProvider', () => {
     expect(scrollBy).toHaveBeenCalledWith(3);
   });
 
-  it('handles mixed direction scroll events in batch', async () => {
+  it("handles mixed direction scroll events in batch", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 10,
@@ -291,42 +279,38 @@ describe('ScrollProvider', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
     // Simulate mixed scroll events: down (1), down (1), up (-1)
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'scroll-down',
+        name: "scroll-down",
         col: 5,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'none',
+        button: "none",
       });
       callback({
-        name: 'scroll-down',
+        name: "scroll-down",
         col: 5,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'none',
+        button: "none",
       });
       callback({
-        name: 'scroll-up',
+        name: "scroll-up",
         col: 5,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'none',
+        button: "none",
       });
     }
 
@@ -338,7 +322,7 @@ describe('ScrollProvider', () => {
     expect(scrollBy).toHaveBeenCalledWith(1); // 1 + 1 - 1 = 1
   });
 
-  it('respects scroll limits during batching', async () => {
+  it("respects scroll limits during batching", async () => {
     const scrollBy = vi.fn();
     // Start near bottom
     const getScrollState = vi.fn(() => ({
@@ -349,42 +333,38 @@ describe('ScrollProvider', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
     // Try to scroll down 3 times, but only 1 is allowed before hitting bottom
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'scroll-down',
+        name: "scroll-down",
         col: 5,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'none',
+        button: "none",
       });
       callback({
-        name: 'scroll-down',
+        name: "scroll-down",
         col: 5,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'none',
+        button: "none",
       });
       callback({
-        name: 'scroll-down',
+        name: "scroll-down",
         col: 5,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'none',
+        button: "none",
       });
     }
 
@@ -399,7 +379,7 @@ describe('ScrollProvider', () => {
     expect(scrollBy).toHaveBeenCalledWith(1);
   });
 
-  it('calls scrollTo when dragging scrollbar thumb if available', async () => {
+  it("calls scrollTo when dragging scrollbar thumb if available", async () => {
     const scrollBy = vi.fn();
     const scrollTo = vi.fn();
     const getScrollState = vi.fn(() => ({
@@ -422,39 +402,39 @@ describe('ScrollProvider', () => {
     // Start drag on thumb
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 0,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
     // Move mouse down
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'move',
+        name: "move",
         col: 10,
         row: 5, // Move down 5 units
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
     // Release
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-release',
+        name: "left-release",
         col: 10,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
@@ -462,7 +442,7 @@ describe('ScrollProvider', () => {
     expect(scrollBy).not.toHaveBeenCalled();
   });
 
-  it('calls scrollBy when dragging scrollbar thumb if scrollTo is not available', async () => {
+  it("calls scrollBy when dragging scrollbar thumb if scrollTo is not available", async () => {
     const scrollBy = vi.fn();
     const getScrollState = vi.fn(() => ({
       scrollTop: 0,
@@ -472,49 +452,45 @@ describe('ScrollProvider', () => {
 
     render(
       <ScrollProvider>
-        <TestScrollable
-          id="test-scrollable"
-          scrollBy={scrollBy}
-          getScrollState={getScrollState}
-        />
+        <TestScrollable id="test-scrollable" scrollBy={scrollBy} getScrollState={getScrollState} />
       </ScrollProvider>,
     );
 
     // Start drag on thumb
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 0,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
     // Move mouse down
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'move',
+        name: "move",
         col: 10,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
     for (const callback of mockUseMouseCallbacks) {
       callback({
-        name: 'left-release',
+        name: "left-release",
         col: 10,
         row: 5,
         shift: false,
         ctrl: false,
         meta: false,
-        button: 'left',
+        button: "left",
       });
     }
 
diff --git a/packages/ui-gemini/src/ui/contexts/ScrollProvider.tsx b/packages/ui-gemini/src/ui/contexts/ScrollProvider.tsx
index b461622fb..8e03d2fd8 100644
--- a/packages/ui-gemini/src/ui/contexts/ScrollProvider.tsx
+++ b/packages/ui-gemini/src/ui/contexts/ScrollProvider.tsx
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
+import { type DOMElement, getBoundingBox } from "ink";
+import type React from "react";
 import {
   createContext,
   useCallback,
@@ -13,9 +14,8 @@ import {
   useMemo,
   useRef,
   useState,
-} from 'react';
-import { getBoundingBox, type DOMElement } from 'ink';
-import { useMouse, type MouseEvent } from '../hooks/useMouse.js';
+} from "react";
+import { type MouseEvent, useMouse } from "../hooks/useMouse.js";
 
 export interface ScrollState {
   scrollTop: number;
@@ -72,12 +72,8 @@ const findScrollableCandidates = (
   return candidates;
 };
 
-export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
-  const [scrollables, setScrollables] = useState(
-    new Map<string, ScrollableEntry>(),
-  );
+export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  const [scrollables, setScrollables] = useState(new Map<string, ScrollableEntry>());
 
   const register = useCallback((entry: ScrollableEntry) => {
     setScrollables((prev) => new Map(prev).set(entry.id, entry));
@@ -125,31 +121,26 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
     }
   }, []);
 
-  const handleScroll = (direction: 'up' | 'down', mouseEvent: MouseEvent) => {
-    const delta = direction === 'up' ? -1 : 1;
-    const candidates = findScrollableCandidates(
-      mouseEvent,
-      scrollablesRef.current,
-    );
+  const handleScroll = (direction: "up" | "down", mouseEvent: MouseEvent) => {
+    const delta = direction === "up" ? -1 : 1;
+    const candidates = findScrollableCandidates(mouseEvent, scrollablesRef.current);
 
     for (const candidate of candidates) {
-      const { scrollTop, scrollHeight, innerHeight } =
-        candidate.getScrollState();
+      const { scrollTop, scrollHeight, innerHeight } = candidate.getScrollState();
       const pendingDelta = pendingScrollsRef.current.get(candidate.id) || 0;
       const effectiveScrollTop = scrollTop + pendingDelta;
 
       // Epsilon to handle floating point inaccuracies.
       const canScrollUp = effectiveScrollTop > 0.001;
-      const canScrollDown =
-        effectiveScrollTop < scrollHeight - innerHeight - 0.001;
+      const canScrollDown = effectiveScrollTop < scrollHeight - innerHeight - 0.001;
 
-      if (direction === 'up' && canScrollUp) {
+      if (direction === "up" && canScrollUp) {
         pendingScrollsRef.current.set(candidate.id, pendingDelta + delta);
         scheduleFlush();
         return true;
       }
 
-      if (direction === 'down' && canScrollDown) {
+      if (direction === "down" && canScrollDown) {
         pendingScrollsRef.current.set(candidate.id, pendingDelta + delta);
         scheduleFlush();
         return true;
@@ -172,27 +163,18 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
 
       // Check if click is on the scrollbar column (x + width)
       // The findScrollableCandidates logic implies scrollbar is at x + width.
-      if (
-        mouseEvent.col === x + width &&
-        mouseEvent.row >= y &&
-        mouseEvent.row < y + height
-      ) {
+      if (mouseEvent.col === x + width && mouseEvent.row >= y && mouseEvent.row < y + height) {
         const { scrollTop, scrollHeight, innerHeight } = entry.getScrollState();
 
         if (scrollHeight <= innerHeight) continue;
 
-        const thumbHeight = Math.max(
-          1,
-          Math.floor((innerHeight / scrollHeight) * innerHeight),
-        );
+        const thumbHeight = Math.max(1, Math.floor((innerHeight / scrollHeight) * innerHeight));
         const maxScrollTop = scrollHeight - innerHeight;
         const maxThumbY = innerHeight - thumbHeight;
 
         if (maxThumbY <= 0) continue;
 
-        const currentThumbY = Math.round(
-          (scrollTop / maxScrollTop) * maxThumbY,
-        );
+        const currentThumbY = Math.round((scrollTop / maxScrollTop) * maxThumbY);
 
         const absoluteThumbTop = y + currentThumbY;
         const absoluteThumbBottom = absoluteThumbTop + thumbHeight;
@@ -201,12 +183,9 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
         const isBottom = mouseEvent.row === y + height - 1;
 
         const hitTop = isTop ? absoluteThumbTop : absoluteThumbTop - 1;
-        const hitBottom = isBottom
-          ? absoluteThumbBottom
-          : absoluteThumbBottom + 1;
+        const hitBottom = isBottom ? absoluteThumbBottom : absoluteThumbBottom + 1;
 
-        const isThumbClick =
-          mouseEvent.row >= hitTop && mouseEvent.row < hitBottom;
+        const isThumbClick = mouseEvent.row >= hitTop && mouseEvent.row < hitBottom;
 
         let offset = 0;
         const relativeMouseY = mouseEvent.row - y;
@@ -221,9 +200,7 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
             Math.min(maxThumbY, relativeMouseY - Math.floor(thumbHeight / 2)),
           );
 
-          const newScrollTop = Math.round(
-            (targetThumbY / maxThumbY) * maxScrollTop,
-          );
+          const newScrollTop = Math.round((targetThumbY / maxThumbY) * maxScrollTop);
           if (entry.scrollTo) {
             entry.scrollTo(newScrollTop);
           } else {
@@ -243,10 +220,7 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
       }
     }
 
-    const candidates = findScrollableCandidates(
-      mouseEvent,
-      scrollablesRef.current,
-    );
+    const candidates = findScrollableCandidates(mouseEvent, scrollablesRef.current);
 
     if (candidates.length > 0) {
       // The first candidate is the innermost one.
@@ -276,10 +250,7 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
     const { y } = boundingBox;
     const { scrollTop, scrollHeight, innerHeight } = entry.getScrollState();
 
-    const thumbHeight = Math.max(
-      1,
-      Math.floor((innerHeight / scrollHeight) * innerHeight),
-    );
+    const thumbHeight = Math.max(1, Math.floor((innerHeight / scrollHeight) * innerHeight));
     const maxScrollTop = scrollHeight - innerHeight;
     const maxThumbY = innerHeight - thumbHeight;
 
@@ -288,14 +259,9 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
     const relativeMouseY = mouseEvent.row - y;
     // Calculate the target thumb position based on the mouse position and the offset.
     // We clamp it to the valid range [0, maxThumbY].
-    const targetThumbY = Math.max(
-      0,
-      Math.min(maxThumbY, relativeMouseY - state.offset),
-    );
+    const targetThumbY = Math.max(0, Math.min(maxThumbY, relativeMouseY - state.offset));
 
-    const targetScrollTop = Math.round(
-      (targetThumbY / maxThumbY) * maxScrollTop,
-    );
+    const targetScrollTop = Math.round((targetThumbY / maxThumbY) * maxScrollTop);
 
     if (entry.scrollTo) {
       entry.scrollTo(targetScrollTop, 0);
@@ -319,15 +285,15 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
 
   useMouse(
     (event: MouseEvent) => {
-      if (event.name === 'scroll-up') {
-        return handleScroll('up', event);
-      } else if (event.name === 'scroll-down') {
-        return handleScroll('down', event);
-      } else if (event.name === 'left-press') {
+      if (event.name === "scroll-up") {
+        return handleScroll("up", event);
+      } else if (event.name === "scroll-down") {
+        return handleScroll("down", event);
+      } else if (event.name === "left-press") {
         return handleLeftPress(event);
-      } else if (event.name === 'move') {
+      } else if (event.name === "move") {
         return handleMove(event);
-      } else if (event.name === 'left-release') {
+      } else if (event.name === "left-release") {
         return handleLeftRelease();
       }
       return false;
@@ -335,27 +301,17 @@ export const ScrollProvider: React.FC<{ children: React.ReactNode }> = ({
     { isActive: true },
   );
 
-  const contextValue = useMemo(
-    () => ({ register, unregister }),
-    [register, unregister],
-  );
+  const contextValue = useMemo(() => ({ register, unregister }), [register, unregister]);
 
-  return (
-    <ScrollContext.Provider value={contextValue}>
-      {children}
-    </ScrollContext.Provider>
-  );
+  return <ScrollContext.Provider value={contextValue}>{children}</ScrollContext.Provider>;
 };
 
 let nextId = 0;
 
-export const useScrollable = (
-  entry: Omit<ScrollableEntry, 'id'>,
-  isActive: boolean,
-) => {
+export const useScrollable = (entry: Omit<ScrollableEntry, "id">, isActive: boolean) => {
   const context = useContext(ScrollContext);
   if (!context) {
-    throw new Error('useScrollable must be used within a ScrollProvider');
+    throw new Error("useScrollable must be used within a ScrollProvider");
   }
 
   const [id] = useState(() => `scrollable-${nextId++}`);
diff --git a/packages/ui-gemini/src/ui/contexts/SessionContext.test.tsx b/packages/ui-gemini/src/ui/contexts/SessionContext.test.tsx
index b4778546f..12af08f6b 100644
--- a/packages/ui-gemini/src/ui/contexts/SessionContext.test.tsx
+++ b/packages/ui-gemini/src/ui/contexts/SessionContext.test.tsx
@@ -4,14 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type MutableRefObject, Component, type ReactNode } from 'react';
-import { render } from '../../test-utils/render.js';
-
-import { act } from 'react';
-import type { SessionMetrics } from './SessionContext.js';
-import { SessionStatsProvider, useSessionStats } from './SessionContext.js';
-import { describe, it, expect, vi } from 'vitest';
-import { uiTelemetryService } from '@airiscode/gemini-cli-core';
+import { uiTelemetryService } from "@airiscode/gemini-cli-core";
+import { act, Component, type MutableRefObject, type ReactNode } from "react";
+import { describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import type { SessionMetrics } from "./SessionContext.js";
+import { SessionStatsProvider, useSessionStats } from "./SessionContext.js";
 
 class ErrorBoundary extends Component<
   { children: ReactNode; onError: (error: Error) => void },
@@ -52,11 +50,11 @@ const TestHarness = ({
   return null;
 };
 
-describe('SessionStatsContext', () => {
-  it('should provide the correct initial state', () => {
-    const contextRef: MutableRefObject<
-      ReturnType<typeof useSessionStats> | undefined
-    > = { current: undefined };
+describe("SessionStatsContext", () => {
+  it("should provide the correct initial state", () => {
+    const contextRef: MutableRefObject<ReturnType<typeof useSessionStats> | undefined> = {
+      current: undefined,
+    };
 
     const { unmount } = render(
       <SessionStatsProvider>
@@ -72,10 +70,10 @@ describe('SessionStatsContext', () => {
     unmount();
   });
 
-  it('should update metrics when the uiTelemetryService emits an update', () => {
-    const contextRef: MutableRefObject<
-      ReturnType<typeof useSessionStats> | undefined
-    > = { current: undefined };
+  it("should update metrics when the uiTelemetryService emits an update", () => {
+    const contextRef: MutableRefObject<ReturnType<typeof useSessionStats> | undefined> = {
+      current: undefined,
+    };
 
     const { unmount } = render(
       <SessionStatsProvider>
@@ -85,7 +83,7 @@ describe('SessionStatsContext', () => {
 
     const newMetrics: SessionMetrics = {
       models: {
-        'gemini-pro': {
+        "gemini-pro": {
           api: {
             totalRequests: 1,
             totalErrors: 0,
@@ -113,7 +111,7 @@ describe('SessionStatsContext', () => {
           auto_accept: 0,
         },
         byName: {
-          'test-tool': {
+          "test-tool": {
             count: 1,
             success: 1,
             fail: 0,
@@ -134,7 +132,7 @@ describe('SessionStatsContext', () => {
     };
 
     act(() => {
-      uiTelemetryService.emit('update', {
+      uiTelemetryService.emit("update", {
         metrics: newMetrics,
         lastPromptTokenCount: 100,
       });
@@ -146,10 +144,10 @@ describe('SessionStatsContext', () => {
     unmount();
   });
 
-  it('should not update metrics if the data is the same', () => {
-    const contextRef: MutableRefObject<
-      ReturnType<typeof useSessionStats> | undefined
-    > = { current: undefined };
+  it("should not update metrics if the data is the same", () => {
+    const contextRef: MutableRefObject<ReturnType<typeof useSessionStats> | undefined> = {
+      current: undefined,
+    };
 
     let renderCount = 0;
     const CountingTestHarness = () => {
@@ -168,7 +166,7 @@ describe('SessionStatsContext', () => {
 
     const metrics: SessionMetrics = {
       models: {
-        'gemini-pro': {
+        "gemini-pro": {
           api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 100 },
           tokens: {
             prompt: 10,
@@ -195,13 +193,13 @@ describe('SessionStatsContext', () => {
     };
 
     act(() => {
-      uiTelemetryService.emit('update', { metrics, lastPromptTokenCount: 10 });
+      uiTelemetryService.emit("update", { metrics, lastPromptTokenCount: 10 });
     });
 
     expect(renderCount).toBe(2);
 
     act(() => {
-      uiTelemetryService.emit('update', { metrics, lastPromptTokenCount: 10 });
+      uiTelemetryService.emit("update", { metrics, lastPromptTokenCount: 10 });
     });
 
     expect(renderCount).toBe(2);
@@ -209,7 +207,7 @@ describe('SessionStatsContext', () => {
     const newMetrics = {
       ...metrics,
       models: {
-        'gemini-pro': {
+        "gemini-pro": {
           api: { totalRequests: 2, totalErrors: 0, totalLatencyMs: 200 },
           tokens: {
             prompt: 20,
@@ -223,7 +221,7 @@ describe('SessionStatsContext', () => {
       },
     };
     act(() => {
-      uiTelemetryService.emit('update', {
+      uiTelemetryService.emit("update", {
         metrics: newMetrics,
         lastPromptTokenCount: 20,
       });
@@ -233,10 +231,10 @@ describe('SessionStatsContext', () => {
     unmount();
   });
 
-  it('should throw an error when useSessionStats is used outside of a provider', () => {
+  it("should throw an error when useSessionStats is used outside of a provider", () => {
     const onError = vi.fn();
     // Suppress console.error from React for this test
-    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     const { unmount } = render(
       <ErrorBoundary onError={onError}>
@@ -246,7 +244,7 @@ describe('SessionStatsContext', () => {
 
     expect(onError).toHaveBeenCalledWith(
       expect.objectContaining({
-        message: 'useSessionStats must be used within a SessionStatsProvider',
+        message: "useSessionStats must be used within a SessionStatsProvider",
       }),
     );
 
diff --git a/packages/ui-gemini/src/ui/contexts/SessionContext.tsx b/packages/ui-gemini/src/ui/contexts/SessionContext.tsx
index a54a6057c..77e43c6a2 100644
--- a/packages/ui-gemini/src/ui/contexts/SessionContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/SessionContext.tsx
@@ -4,28 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useState,
-  useMemo,
-  useEffect,
-} from 'react';
-
-import type {
-  SessionMetrics,
-  ModelMetrics,
-  ToolCallStats,
-} from '@airiscode/gemini-cli-core';
-import { uiTelemetryService, sessionId } from '@airiscode/gemini-cli-core';
+import type { ModelMetrics, SessionMetrics, ToolCallStats } from "@airiscode/gemini-cli-core";
+import { sessionId, uiTelemetryService } from "@airiscode/gemini-cli-core";
+import type React from "react";
+import { createContext, useCallback, useContext, useEffect, useMemo, useState } from "react";
 
 export enum ToolCallDecision {
-  ACCEPT = 'accept',
-  REJECT = 'reject',
-  MODIFY = 'modify',
-  AUTO_ACCEPT = 'auto_accept',
+  ACCEPT = "accept",
+  REJECT = "reject",
+  MODIFY = "modify",
+  AUTO_ACCEPT = "auto_accept",
 }
 
 function areModelMetricsEqual(a: ModelMetrics, b: ModelMetrics): boolean {
@@ -59,14 +47,10 @@ function areToolCallStatsEqual(a: ToolCallStats, b: ToolCallStats): boolean {
     return false;
   }
   if (
-    a.decisions[ToolCallDecision.ACCEPT] !==
-      b.decisions[ToolCallDecision.ACCEPT] ||
-    a.decisions[ToolCallDecision.REJECT] !==
-      b.decisions[ToolCallDecision.REJECT] ||
-    a.decisions[ToolCallDecision.MODIFY] !==
-      b.decisions[ToolCallDecision.MODIFY] ||
-    a.decisions[ToolCallDecision.AUTO_ACCEPT] !==
-      b.decisions[ToolCallDecision.AUTO_ACCEPT]
+    a.decisions[ToolCallDecision.ACCEPT] !== b.decisions[ToolCallDecision.ACCEPT] ||
+    a.decisions[ToolCallDecision.REJECT] !== b.decisions[ToolCallDecision.REJECT] ||
+    a.decisions[ToolCallDecision.MODIFY] !== b.decisions[ToolCallDecision.MODIFY] ||
+    a.decisions[ToolCallDecision.AUTO_ACCEPT] !== b.decisions[ToolCallDecision.AUTO_ACCEPT]
   ) {
     return false;
   }
@@ -138,7 +122,7 @@ function areMetricsEqual(a: SessionMetrics, b: SessionMetrics): boolean {
   return true;
 }
 
-export type { SessionMetrics, ModelMetrics };
+export type { ModelMetrics, SessionMetrics };
 
 export interface SessionStatsState {
   sessionId: string;
@@ -174,15 +158,11 @@ interface SessionStatsContextValue {
 
 // --- Context Definition ---
 
-const SessionStatsContext = createContext<SessionStatsContextValue | undefined>(
-  undefined,
-);
+const SessionStatsContext = createContext<SessionStatsContextValue | undefined>(undefined);
 
 // --- Provider Component ---
 
-export const SessionStatsProvider: React.FC<{ children: React.ReactNode }> = ({
-  children,
-}) => {
+export const SessionStatsProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
   const [stats, setStats] = useState<SessionStatsState>({
     sessionId,
     sessionStartTime: new Date(),
@@ -214,7 +194,7 @@ export const SessionStatsProvider: React.FC<{ children: React.ReactNode }> = ({
       });
     };
 
-    uiTelemetryService.on('update', handleUpdate);
+    uiTelemetryService.on("update", handleUpdate);
     // Set initial state
     handleUpdate({
       metrics: uiTelemetryService.getMetrics(),
@@ -222,7 +202,7 @@ export const SessionStatsProvider: React.FC<{ children: React.ReactNode }> = ({
     });
 
     return () => {
-      uiTelemetryService.off('update', handleUpdate);
+      uiTelemetryService.off("update", handleUpdate);
     };
   }, []);
 
@@ -233,10 +213,7 @@ export const SessionStatsProvider: React.FC<{ children: React.ReactNode }> = ({
     }));
   }, []);
 
-  const getPromptCount = useCallback(
-    () => stats.promptCount,
-    [stats.promptCount],
-  );
+  const getPromptCount = useCallback(() => stats.promptCount, [stats.promptCount]);
 
   const value = useMemo(
     () => ({
@@ -247,11 +224,7 @@ export const SessionStatsProvider: React.FC<{ children: React.ReactNode }> = ({
     [stats, startNewPrompt, getPromptCount],
   );
 
-  return (
-    <SessionStatsContext.Provider value={value}>
-      {children}
-    </SessionStatsContext.Provider>
-  );
+  return <SessionStatsContext.Provider value={value}>{children}</SessionStatsContext.Provider>;
 };
 
 // --- Consumer Hook ---
@@ -259,9 +232,7 @@ export const SessionStatsProvider: React.FC<{ children: React.ReactNode }> = ({
 export const useSessionStats = () => {
   const context = useContext(SessionStatsContext);
   if (context === undefined) {
-    throw new Error(
-      'useSessionStats must be used within a SessionStatsProvider',
-    );
+    throw new Error("useSessionStats must be used within a SessionStatsProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/contexts/SettingsContext.tsx b/packages/ui-gemini/src/ui/contexts/SettingsContext.tsx
index 144e1a285..549c9f707 100644
--- a/packages/ui-gemini/src/ui/contexts/SettingsContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/SettingsContext.tsx
@@ -4,17 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useContext } from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
+import React, { useContext } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
 
-export const SettingsContext = React.createContext<LoadedSettings | undefined>(
-  undefined,
-);
+export const SettingsContext = React.createContext<LoadedSettings | undefined>(undefined);
 
 export const useSettings = () => {
   const context = useContext(SettingsContext);
   if (context === undefined) {
-    throw new Error('useSettings must be used within a SettingsProvider');
+    throw new Error("useSettings must be used within a SettingsProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/contexts/ShellFocusContext.tsx b/packages/ui-gemini/src/ui/contexts/ShellFocusContext.tsx
index aaed98c9d..19bf8649b 100644
--- a/packages/ui-gemini/src/ui/contexts/ShellFocusContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/ShellFocusContext.tsx
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
+import { createContext, useContext } from "react";
 
 export const ShellFocusContext = createContext<boolean>(true);
 
diff --git a/packages/ui-gemini/src/ui/contexts/StreamingContext.tsx b/packages/ui-gemini/src/ui/contexts/StreamingContext.tsx
index 7195e21d4..54e92e63f 100644
--- a/packages/ui-gemini/src/ui/contexts/StreamingContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/StreamingContext.tsx
@@ -4,19 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { createContext } from 'react';
-import type { StreamingState } from '../types.js';
+import React, { createContext } from "react";
+import type { StreamingState } from "../types.js";
 
-export const StreamingContext = createContext<StreamingState | undefined>(
-  undefined,
-);
+export const StreamingContext = createContext<StreamingState | undefined>(undefined);
 
 export const useStreamingContext = (): StreamingState => {
   const context = React.useContext(StreamingContext);
   if (context === undefined) {
-    throw new Error(
-      'useStreamingContext must be used within a StreamingContextProvider',
-    );
+    throw new Error("useStreamingContext must be used within a StreamingContextProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/contexts/UIActionsContext.tsx b/packages/ui-gemini/src/ui/contexts/UIActionsContext.tsx
index 2345e4983..1c4a258e0 100644
--- a/packages/ui-gemini/src/ui/contexts/UIActionsContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/UIActionsContext.tsx
@@ -4,30 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
-import { type Key } from '../hooks/useKeypress.js';
-import { type IdeIntegrationNudgeResult } from '../IdeIntegrationNudge.js';
-import { type FolderTrustChoice } from '../components/FolderTrustDialog.js';
-import { type AuthType, type EditorType } from '@airiscode/gemini-cli-core';
-import { type LoadableSettingScope } from '../../config/settings.js';
-import type { AuthState } from '../types.js';
-import { type PermissionsDialogProps } from '../components/PermissionsModifyTrustDialog.js';
-import type { SessionInfo } from '../../utils/sessionUtils.js';
+import { type AuthType, type EditorType } from "@airiscode/gemini-cli-core";
+import { createContext, useContext } from "react";
+import { type LoadableSettingScope } from "../../config/settings.js";
+import type { SessionInfo } from "../../utils/sessionUtils.js";
+import { type FolderTrustChoice } from "../components/FolderTrustDialog.js";
+import { type PermissionsDialogProps } from "../components/PermissionsModifyTrustDialog.js";
+import { type Key } from "../hooks/useKeypress.js";
+import { type IdeIntegrationNudgeResult } from "../IdeIntegrationNudge.js";
+import type { AuthState } from "../types.js";
 
 export interface UIActions {
   handleThemeSelect: (themeName: string, scope: LoadableSettingScope) => void;
   closeThemeDialog: () => void;
   handleThemeHighlight: (themeName: string | undefined) => void;
-  handleAuthSelect: (
-    authType: AuthType | undefined,
-    scope: LoadableSettingScope,
-  ) => void;
+  handleAuthSelect: (authType: AuthType | undefined, scope: LoadableSettingScope) => void;
   setAuthState: (state: AuthState) => void;
   onAuthError: (error: string | null) => void;
-  handleEditorSelect: (
-    editorType: EditorType | undefined,
-    scope: LoadableSettingScope,
-  ) => void;
+  handleEditorSelect: (editorType: EditorType | undefined, scope: LoadableSettingScope) => void;
   exitEditorDialog: () => void;
   exitPrivacyNotice: () => void;
   closeSettingsDialog: () => void;
@@ -43,9 +37,7 @@ export interface UIActions {
   refreshStatic: () => void;
   handleFinalSubmit: (value: string) => void;
   handleClearScreen: () => void;
-  handleProQuotaChoice: (
-    choice: 'retry_later' | 'retry_once' | 'retry_always' | 'upgrade',
-  ) => void;
+  handleProQuotaChoice: (choice: "retry_later" | "retry_once" | "retry_always" | "upgrade") => void;
   openSessionBrowser: () => void;
   closeSessionBrowser: () => void;
   handleResumeSession: (session: SessionInfo) => Promise<void>;
@@ -63,7 +55,7 @@ export const UIActionsContext = createContext<UIActions | null>(null);
 export const useUIActions = () => {
   const context = useContext(UIActionsContext);
   if (!context) {
-    throw new Error('useUIActions must be used within a UIActionsProvider');
+    throw new Error("useUIActions must be used within a UIActionsProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/contexts/UIStateContext.tsx b/packages/ui-gemini/src/ui/contexts/UIStateContext.tsx
index 274d5673d..dcaa8bb16 100644
--- a/packages/ui-gemini/src/ui/contexts/UIStateContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/UIStateContext.tsx
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { createContext, useContext } from 'react';
 import type {
-  HistoryItem,
-  ThoughtSummary,
-  ConsoleMessageItem,
-  ShellConfirmationRequest,
+  ApprovalMode,
+  FallbackIntent,
+  IdeContext,
+  IdeInfo,
+  UserTierId,
+} from "@airiscode/gemini-cli-core";
+import type { DOMElement } from "ink";
+import { createContext, useContext } from "react";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import type { SessionStatsState } from "../contexts/SessionContext.js";
+import type { ExtensionUpdateState } from "../state/extensions.js";
+import type {
   ConfirmationRequest,
-  LoopDetectionConfirmationRequest,
+  ConsoleMessageItem,
+  HistoryItem,
   HistoryItemWithoutId,
+  LoopDetectionConfirmationRequest,
+  ShellConfirmationRequest,
   StreamingState,
-} from '../types.js';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import type {
-  IdeContext,
-  ApprovalMode,
-  UserTierId,
-  IdeInfo,
-  FallbackIntent,
-} from '@airiscode/gemini-cli-core';
-import type { DOMElement } from 'ink';
-import type { SessionStatsState } from '../contexts/SessionContext.js';
-import type { ExtensionUpdateState } from '../state/extensions.js';
-import type { UpdateObject } from '../utils/updateCheck.js';
+  ThoughtSummary,
+} from "../types.js";
+import type { UpdateObject } from "../utils/updateCheck.js";
 
 export interface ProQuotaDialogRequest {
   failedModel: string;
@@ -38,8 +38,8 @@ export interface ProQuotaDialogRequest {
   resolve: (intent: FallbackIntent) => void;
 }
 
-import { type UseHistoryManagerReturn } from '../hooks/useHistoryManager.js';
-import { type RestartReason } from '../hooks/useIdeTrustListener.js';
+import { type UseHistoryManagerReturn } from "../hooks/useHistoryManager.js";
+import { type RestartReason } from "../hooks/useIdeTrustListener.js";
 
 export interface UIState {
   history: HistoryItem[];
@@ -143,7 +143,7 @@ export const UIStateContext = createContext<UIState | null>(null);
 export const useUIState = () => {
   const context = useContext(UIStateContext);
   if (!context) {
-    throw new Error('useUIState must be used within a UIStateProvider');
+    throw new Error("useUIState must be used within a UIStateProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/contexts/VimModeContext.tsx b/packages/ui-gemini/src/ui/contexts/VimModeContext.tsx
index 7f7cb7bf7..c4878da24 100644
--- a/packages/ui-gemini/src/ui/contexts/VimModeContext.tsx
+++ b/packages/ui-gemini/src/ui/contexts/VimModeContext.tsx
@@ -4,17 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useState,
-} from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
+import { createContext, useCallback, useContext, useEffect, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
 
-export type VimMode = 'NORMAL' | 'INSERT';
+export type VimMode = "NORMAL" | "INSERT";
 
 interface VimModeContextType {
   vimEnabled: boolean;
@@ -34,9 +28,7 @@ export const VimModeProvider = ({
 }) => {
   const initialVimEnabled = settings.merged.general?.vimMode ?? false;
   const [vimEnabled, setVimEnabled] = useState(initialVimEnabled);
-  const [vimMode, setVimMode] = useState<VimMode>(
-    initialVimEnabled ? 'NORMAL' : 'INSERT',
-  );
+  const [vimMode, setVimMode] = useState<VimMode>(initialVimEnabled ? "NORMAL" : "INSERT");
 
   useEffect(() => {
     // Initialize vimEnabled from settings on mount
@@ -44,7 +36,7 @@ export const VimModeProvider = ({
     setVimEnabled(enabled);
     // When vim mode is enabled, always start in NORMAL mode
     if (enabled) {
-      setVimMode('NORMAL');
+      setVimMode("NORMAL");
     }
   }, [settings.merged.general?.vimMode]);
 
@@ -53,9 +45,9 @@ export const VimModeProvider = ({
     setVimEnabled(newValue);
     // When enabling vim mode, start in NORMAL mode
     if (newValue) {
-      setVimMode('NORMAL');
+      setVimMode("NORMAL");
     }
-    await settings.setValue(SettingScope.User, 'general.vimMode', newValue);
+    await settings.setValue(SettingScope.User, "general.vimMode", newValue);
     return newValue;
   }, [vimEnabled, settings]);
 
@@ -66,15 +58,13 @@ export const VimModeProvider = ({
     setVimMode,
   };
 
-  return (
-    <VimModeContext.Provider value={value}>{children}</VimModeContext.Provider>
-  );
+  return <VimModeContext.Provider value={value}>{children}</VimModeContext.Provider>;
 };
 
 export const useVimMode = () => {
   const context = useContext(VimModeContext);
   if (context === undefined) {
-    throw new Error('useVimMode must be used within a VimModeProvider');
+    throw new Error("useVimMode must be used within a VimModeProvider");
   }
   return context;
 };
diff --git a/packages/ui-gemini/src/ui/editors/editorSettingsManager.ts b/packages/ui-gemini/src/ui/editors/editorSettingsManager.ts
index 061cd8dee..bd44c8233 100644
--- a/packages/ui-gemini/src/ui/editors/editorSettingsManager.ts
+++ b/packages/ui-gemini/src/ui/editors/editorSettingsManager.ts
@@ -7,13 +7,13 @@
 import {
   allowEditorTypeInSandbox,
   checkHasEditorType,
-  type EditorType,
   EDITOR_DISPLAY_NAMES,
-} from '@airiscode/gemini-cli-core';
+  type EditorType,
+} from "@airiscode/gemini-cli-core";
 
 export interface EditorDisplay {
   name: string;
-  type: EditorType | 'not_set';
+  type: EditorType | "not_set";
   disabled: boolean;
 }
 
@@ -21,23 +21,19 @@ class EditorSettingsManager {
   private readonly availableEditors: EditorDisplay[];
 
   constructor() {
-    const editorTypes = Object.keys(
-      EDITOR_DISPLAY_NAMES,
-    ).sort() as EditorType[];
+    const editorTypes = Object.keys(EDITOR_DISPLAY_NAMES).sort() as EditorType[];
     this.availableEditors = [
       {
-        name: 'None',
-        type: 'not_set',
+        name: "None",
+        type: "not_set",
         disabled: false,
       },
       ...editorTypes.map((type) => {
         const hasEditor = checkHasEditorType(type);
         const isAllowedInSandbox = allowEditorTypeInSandbox(type);
 
-        let labelSuffix = !isAllowedInSandbox
-          ? ' (Not available in sandbox)'
-          : '';
-        labelSuffix = !hasEditor ? ' (Not installed)' : labelSuffix;
+        let labelSuffix = !isAllowedInSandbox ? " (Not available in sandbox)" : "";
+        labelSuffix = !hasEditor ? " (Not installed)" : labelSuffix;
 
         return {
           name: EDITOR_DISPLAY_NAMES[type] + labelSuffix,
diff --git a/packages/ui-gemini/src/ui/hooks/atCommandProcessor.test.ts b/packages/ui-gemini/src/ui/hooks/atCommandProcessor.test.ts
index 5ca26994a..ddb305b92 100644
--- a/packages/ui-gemini/src/ui/hooks/atCommandProcessor.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/atCommandProcessor.test.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { handleAtCommand } from './atCommandProcessor.js';
-import type { Config, DiscoveredMCPResource } from '@airiscode/gemini-cli-core';
+import * as fsPromises from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+import type { Config, DiscoveredMCPResource } from "@airiscode/gemini-cli-core";
 import {
+  COMMON_IGNORE_PATTERNS,
   FileDiscoveryService,
   GlobTool,
   ReadManyFilesTool,
   StandardFileSystemService,
   ToolRegistry,
-  COMMON_IGNORE_PATTERNS,
   // DEFAULT_FILE_EXCLUDES,
-} from '@airiscode/gemini-cli-core';
-import * as os from 'node:os';
-import { ToolCallStatus } from '../types.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import * as fsPromises from 'node:fs/promises';
-import * as path from 'node:path';
-
-describe('handleAtCommand', () => {
+} from "@airiscode/gemini-cli-core";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { ToolCallStatus } from "../types.js";
+import { handleAtCommand } from "./atCommandProcessor.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+
+describe("handleAtCommand", () => {
   let testRootDir: string;
   let mockConfig: Config;
 
-  const mockAddItem: Mock<UseHistoryManagerReturn['addItem']> = vi.fn();
+  const mockAddItem: Mock<UseHistoryManagerReturn["addItem"]> = vi.fn();
   const mockOnDebugMessage: Mock<(message: string) => void> = vi.fn();
 
   let abortController: AbortController;
@@ -45,9 +45,7 @@ describe('handleAtCommand', () => {
   beforeEach(async () => {
     vi.resetAllMocks();
 
-    testRootDir = await fsPromises.mkdtemp(
-      path.join(os.tmpdir(), 'folder-structure-test-'),
-    );
+    testRootDir = await fsPromises.mkdtemp(path.join(os.tmpdir(), "folder-structure-test-"));
 
     abortController = new AbortController();
 
@@ -106,8 +104,8 @@ describe('handleAtCommand', () => {
     await fsPromises.rm(testRootDir, { recursive: true, force: true });
   });
 
-  it('should pass through query if no @ command is present', async () => {
-    const query = 'regular user query';
+  it("should pass through query if no @ command is present", async () => {
+    const query = "regular user query";
 
     const result = await handleAtCommand({
       query,
@@ -124,8 +122,8 @@ describe('handleAtCommand', () => {
     });
   });
 
-  it('should pass through original query if only a lone @ symbol is present', async () => {
-    const queryWithSpaces = '  @  ';
+  it("should pass through original query if only a lone @ symbol is present", async () => {
+    const queryWithSpaces = "  @  ";
 
     const result = await handleAtCommand({
       query: queryWithSpaces,
@@ -141,14 +139,14 @@ describe('handleAtCommand', () => {
       shouldProceed: true,
     });
     expect(mockOnDebugMessage).toHaveBeenCalledWith(
-      'Lone @ detected, will be treated as text in the modified query.',
+      "Lone @ detected, will be treated as text in the modified query.",
     );
   });
 
-  it('should process a valid text file path', async () => {
-    const fileContent = 'This is the file content.';
+  it("should process a valid text file path", async () => {
+    const fileContent = "This is the file content.";
     const filePath = await createTestFile(
-      path.join(testRootDir, 'path', 'to', 'file.txt'),
+      path.join(testRootDir, "path", "to", "file.txt"),
       fileContent,
     );
     const relativePath = getRelativePath(filePath);
@@ -166,33 +164,33 @@ describe('handleAtCommand', () => {
     expect(result).toEqual({
       processedQuery: [
         { text: `@${relativePath}` },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${relativePath}:\n` },
         { text: fileContent },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
     expect(mockAddItem).toHaveBeenCalledWith(
       expect.objectContaining({
-        type: 'tool_group',
+        type: "tool_group",
         tools: [expect.objectContaining({ status: ToolCallStatus.Success })],
       }),
       125,
     );
   });
 
-  it('should process a valid directory path and convert to glob', async () => {
-    const fileContent = 'This is the file content.';
+  it("should process a valid directory path and convert to glob", async () => {
+    const fileContent = "This is the file content.";
     const filePath = await createTestFile(
-      path.join(testRootDir, 'path', 'to', 'file.txt'),
+      path.join(testRootDir, "path", "to", "file.txt"),
       fileContent,
     );
     const dirPath = path.dirname(filePath);
     const relativeDirPath = getRelativePath(dirPath);
     const relativeFilePath = getRelativePath(filePath);
     const query = `@${dirPath}`;
-    const resolvedGlob = path.join(relativeDirPath, '**');
+    const resolvedGlob = path.join(relativeDirPath, "**");
 
     const result = await handleAtCommand({
       query,
@@ -206,10 +204,10 @@ describe('handleAtCommand', () => {
     expect(result).toEqual({
       processedQuery: [
         { text: `@${resolvedGlob}` },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${relativeFilePath}:\n` },
         { text: fileContent },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
@@ -218,15 +216,12 @@ describe('handleAtCommand', () => {
     );
   });
 
-  it('should handle query with text before and after @command', async () => {
-    const fileContent = 'Markdown content.';
-    const filePath = await createTestFile(
-      path.join(testRootDir, 'doc.md'),
-      fileContent,
-    );
+  it("should handle query with text before and after @command", async () => {
+    const fileContent = "Markdown content.";
+    const filePath = await createTestFile(path.join(testRootDir, "doc.md"), fileContent);
     const relativePath = getRelativePath(filePath);
-    const textBefore = 'Explain this: ';
-    const textAfter = ' in detail.';
+    const textBefore = "Explain this: ";
+    const textAfter = " in detail.";
     const query = `${textBefore}@${filePath}${textAfter}`;
 
     const result = await handleAtCommand({
@@ -241,22 +236,22 @@ describe('handleAtCommand', () => {
     expect(result).toEqual({
       processedQuery: [
         { text: `${textBefore}@${relativePath}${textAfter}` },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${relativePath}:\n` },
         { text: fileContent },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
   });
 
-  it('should correctly unescape paths with escaped spaces', async () => {
-    const fileContent = 'This is the file content.';
+  it("should correctly unescape paths with escaped spaces", async () => {
+    const fileContent = "This is the file content.";
     const filePath = await createTestFile(
-      path.join(testRootDir, 'path', 'to', 'my file.txt'),
+      path.join(testRootDir, "path", "to", "my file.txt"),
       fileContent,
     );
-    const escapedpath = path.join(testRootDir, 'path', 'to', 'my\\ file.txt');
+    const escapedpath = path.join(testRootDir, "path", "to", "my\\ file.txt");
     const query = `@${escapedpath}`;
 
     const result = await handleAtCommand({
@@ -271,33 +266,27 @@ describe('handleAtCommand', () => {
     expect(result).toEqual({
       processedQuery: [
         { text: `@${getRelativePath(filePath)}` },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${getRelativePath(filePath)}:\n` },
         { text: fileContent },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
     expect(mockAddItem).toHaveBeenCalledWith(
       expect.objectContaining({
-        type: 'tool_group',
+        type: "tool_group",
         tools: [expect.objectContaining({ status: ToolCallStatus.Success })],
       }),
       125,
     );
   }, 10000);
 
-  it('should handle multiple @file references', async () => {
-    const content1 = 'Content file1';
-    const file1Path = await createTestFile(
-      path.join(testRootDir, 'file1.txt'),
-      content1,
-    );
-    const content2 = 'Content file2';
-    const file2Path = await createTestFile(
-      path.join(testRootDir, 'file2.md'),
-      content2,
-    );
+  it("should handle multiple @file references", async () => {
+    const content1 = "Content file1";
+    const file1Path = await createTestFile(path.join(testRootDir, "file1.txt"), content1);
+    const content2 = "Content file2";
+    const file2Path = await createTestFile(path.join(testRootDir, "file2.md"), content2);
     const query = `@${file1Path} @${file2Path}`;
 
     const result = await handleAtCommand({
@@ -314,31 +303,25 @@ describe('handleAtCommand', () => {
         {
           text: `@${getRelativePath(file1Path)} @${getRelativePath(file2Path)}`,
         },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${getRelativePath(file1Path)}:\n` },
         { text: content1 },
         { text: `\nContent from @${getRelativePath(file2Path)}:\n` },
         { text: content2 },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
   });
 
-  it('should handle multiple @file references with interleaved text', async () => {
-    const text1 = 'Check ';
-    const content1 = 'C1';
-    const file1Path = await createTestFile(
-      path.join(testRootDir, 'f1.txt'),
-      content1,
-    );
-    const text2 = ' and ';
-    const content2 = 'C2';
-    const file2Path = await createTestFile(
-      path.join(testRootDir, 'f2.md'),
-      content2,
-    );
-    const text3 = ' please.';
+  it("should handle multiple @file references with interleaved text", async () => {
+    const text1 = "Check ";
+    const content1 = "C1";
+    const file1Path = await createTestFile(path.join(testRootDir, "f1.txt"), content1);
+    const text2 = " and ";
+    const content2 = "C2";
+    const file2Path = await createTestFile(path.join(testRootDir, "f2.md"), content2);
+    const text3 = " please.";
     const query = `${text1}@${file1Path}${text2}@${file2Path}${text3}`;
 
     const result = await handleAtCommand({
@@ -355,27 +338,24 @@ describe('handleAtCommand', () => {
         {
           text: `${text1}@${getRelativePath(file1Path)}${text2}@${getRelativePath(file2Path)}${text3}`,
         },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${getRelativePath(file1Path)}:\n` },
         { text: content1 },
         { text: `\nContent from @${getRelativePath(file2Path)}:\n` },
         { text: content2 },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
   });
 
-  it('should handle a mix of valid, invalid, and lone @ references', async () => {
-    const content1 = 'Valid content 1';
-    const file1Path = await createTestFile(
-      path.join(testRootDir, 'valid1.txt'),
-      content1,
-    );
-    const invalidFile = 'nonexistent.txt';
-    const content2 = 'Globbed content';
+  it("should handle a mix of valid, invalid, and lone @ references", async () => {
+    const content1 = "Valid content 1";
+    const file1Path = await createTestFile(path.join(testRootDir, "valid1.txt"), content1);
+    const invalidFile = "nonexistent.txt";
+    const content2 = "Globbed content";
     const file2Path = await createTestFile(
-      path.join(testRootDir, 'resolved', 'valid2.actual'),
+      path.join(testRootDir, "resolved", "valid2.actual"),
       content2,
     );
     const query = `Look at @${file1Path} then @${invalidFile} and also just @ symbol, then @${file2Path}`;
@@ -394,12 +374,12 @@ describe('handleAtCommand', () => {
         {
           text: `Look at @${getRelativePath(file1Path)} then @${invalidFile} and also just @ symbol, then @${getRelativePath(file2Path)}`,
         },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${getRelativePath(file2Path)}:\n` },
         { text: content2 },
         { text: `\nContent from @${getRelativePath(file1Path)}:\n` },
         { text: content1 },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
@@ -410,12 +390,12 @@ describe('handleAtCommand', () => {
       `Glob search for '**/*${invalidFile}*' found no files or an error. Path ${invalidFile} will be skipped.`,
     );
     expect(mockOnDebugMessage).toHaveBeenCalledWith(
-      'Lone @ detected, will be treated as text in the modified query.',
+      "Lone @ detected, will be treated as text in the modified query.",
     );
   });
 
-  it('should return original query if all @paths are invalid or lone @', async () => {
-    const query = 'Check @nonexistent.txt and @ also';
+  it("should return original query if all @paths are invalid or lone @", async () => {
+    const query = "Check @nonexistent.txt and @ also";
 
     const result = await handleAtCommand({
       query,
@@ -427,26 +407,23 @@ describe('handleAtCommand', () => {
     });
 
     expect(result).toEqual({
-      processedQuery: [{ text: 'Check @nonexistent.txt and @ also' }],
+      processedQuery: [{ text: "Check @nonexistent.txt and @ also" }],
       shouldProceed: true,
     });
   });
 
-  describe('git-aware filtering', () => {
+  describe("git-aware filtering", () => {
     beforeEach(async () => {
-      await fsPromises.mkdir(path.join(testRootDir, '.git'), {
+      await fsPromises.mkdir(path.join(testRootDir, ".git"), {
         recursive: true,
       });
     });
 
-    it('should skip git-ignored files in @ commands', async () => {
-      await createTestFile(
-        path.join(testRootDir, '.gitignore'),
-        'node_modules/package.json',
-      );
+    it("should skip git-ignored files in @ commands", async () => {
+      await createTestFile(path.join(testRootDir, ".gitignore"), "node_modules/package.json");
       const gitIgnoredFile = await createTestFile(
-        path.join(testRootDir, 'node_modules', 'package.json'),
-        'the file contents',
+        path.join(testRootDir, "node_modules", "package.json"),
+        "the file contents",
       );
 
       const query = `@${gitIgnoredFile}`;
@@ -472,14 +449,11 @@ describe('handleAtCommand', () => {
       );
     });
 
-    it('should process non-git-ignored files normally', async () => {
-      await createTestFile(
-        path.join(testRootDir, '.gitignore'),
-        'node_modules/package.json',
-      );
+    it("should process non-git-ignored files normally", async () => {
+      await createTestFile(path.join(testRootDir, ".gitignore"), "node_modules/package.json");
 
       const validFile = await createTestFile(
-        path.join(testRootDir, 'src', 'index.ts'),
+        path.join(testRootDir, "src", "index.ts"),
         'console.log("Hello world");',
       );
       const query = `@${validFile}`;
@@ -496,25 +470,22 @@ describe('handleAtCommand', () => {
       expect(result).toEqual({
         processedQuery: [
           { text: `@${getRelativePath(validFile)}` },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(validFile)}:\n` },
           { text: 'console.log("Hello world");' },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should handle mixed git-ignored and valid files', async () => {
-      await createTestFile(path.join(testRootDir, '.gitignore'), '.env');
+    it("should handle mixed git-ignored and valid files", async () => {
+      await createTestFile(path.join(testRootDir, ".gitignore"), ".env");
       const validFile = await createTestFile(
-        path.join(testRootDir, 'README.md'),
-        '# Project README',
-      );
-      const gitIgnoredFile = await createTestFile(
-        path.join(testRootDir, '.env'),
-        'SECRET=123',
+        path.join(testRootDir, "README.md"),
+        "# Project README",
       );
+      const gitIgnoredFile = await createTestFile(path.join(testRootDir, ".env"), "SECRET=123");
       const query = `@${validFile} @${gitIgnoredFile}`;
 
       const result = await handleAtCommand({
@@ -529,10 +500,10 @@ describe('handleAtCommand', () => {
       expect(result).toEqual({
         processedQuery: [
           { text: `@${getRelativePath(validFile)} @${gitIgnoredFile}` },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(validFile)}:\n` },
-          { text: '# Project README' },
-          { text: '\n--- End of content ---' },
+          { text: "# Project README" },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
@@ -544,10 +515,10 @@ describe('handleAtCommand', () => {
       );
     });
 
-    it('should always ignore .git directory files', async () => {
+    it("should always ignore .git directory files", async () => {
       const gitFile = await createTestFile(
-        path.join(testRootDir, '.git', 'config'),
-        '[core]\n\trepositoryformatversion = 0\n',
+        path.join(testRootDir, ".git", "config"),
+        "[core]\n\trepositoryformatversion = 0\n",
       );
       const query = `@${gitFile}`;
 
@@ -567,19 +538,17 @@ describe('handleAtCommand', () => {
       expect(mockOnDebugMessage).toHaveBeenCalledWith(
         `Path ${gitFile} is git-ignored and will be skipped.`,
       );
-      expect(mockOnDebugMessage).toHaveBeenCalledWith(
-        `Ignored 1 files:\nGit-ignored: ${gitFile}`,
-      );
+      expect(mockOnDebugMessage).toHaveBeenCalledWith(`Ignored 1 files:\nGit-ignored: ${gitFile}`);
     });
   });
 
-  describe('when recursive file search is disabled', () => {
+  describe("when recursive file search is disabled", () => {
     beforeEach(() => {
       vi.mocked(mockConfig.getEnableRecursiveFileSearch).mockReturnValue(false);
     });
 
-    it('should not use glob search for a nonexistent file', async () => {
-      const invalidFile = 'nonexistent.txt';
+    it("should not use glob search for a nonexistent file", async () => {
+      const invalidFile = "nonexistent.txt";
       const query = `@${invalidFile}`;
 
       const result = await handleAtCommand({
@@ -599,14 +568,11 @@ describe('handleAtCommand', () => {
     });
   });
 
-  describe('gemini-ignore filtering', () => {
-    it('should skip gemini-ignored files in @ commands', async () => {
-      await createTestFile(
-        path.join(testRootDir, '.geminiignore'),
-        'build/output.js',
-      );
+  describe("gemini-ignore filtering", () => {
+    it("should skip gemini-ignored files in @ commands", async () => {
+      await createTestFile(path.join(testRootDir, ".geminiignore"), "build/output.js");
       const geminiIgnoredFile = await createTestFile(
-        path.join(testRootDir, 'build', 'output.js'),
+        path.join(testRootDir, "build", "output.js"),
         'console.log("Hello");',
       );
       const query = `@${geminiIgnoredFile}`;
@@ -632,13 +598,10 @@ describe('handleAtCommand', () => {
       );
     });
   });
-  it('should process non-ignored files when .geminiignore is present', async () => {
-    await createTestFile(
-      path.join(testRootDir, '.geminiignore'),
-      'build/output.js',
-    );
+  it("should process non-ignored files when .geminiignore is present", async () => {
+    await createTestFile(path.join(testRootDir, ".geminiignore"), "build/output.js");
     const validFile = await createTestFile(
-      path.join(testRootDir, 'src', 'index.ts'),
+      path.join(testRootDir, "src", "index.ts"),
       'console.log("Hello world");',
     );
     const query = `@${validFile}`;
@@ -655,26 +618,23 @@ describe('handleAtCommand', () => {
     expect(result).toEqual({
       processedQuery: [
         { text: `@${getRelativePath(validFile)}` },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${getRelativePath(validFile)}:\n` },
         { text: 'console.log("Hello world");' },
-        { text: '\n--- End of content ---' },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
   });
 
-  it('should handle mixed gemini-ignored and valid files', async () => {
-    await createTestFile(
-      path.join(testRootDir, '.geminiignore'),
-      'dist/bundle.js',
-    );
+  it("should handle mixed gemini-ignored and valid files", async () => {
+    await createTestFile(path.join(testRootDir, ".geminiignore"), "dist/bundle.js");
     const validFile = await createTestFile(
-      path.join(testRootDir, 'src', 'main.ts'),
-      '// Main application entry',
+      path.join(testRootDir, "src", "main.ts"),
+      "// Main application entry",
     );
     const geminiIgnoredFile = await createTestFile(
-      path.join(testRootDir, 'dist', 'bundle.js'),
+      path.join(testRootDir, "dist", "bundle.js"),
       'console.log("bundle");',
     );
     const query = `@${validFile} @${geminiIgnoredFile}`;
@@ -691,10 +651,10 @@ describe('handleAtCommand', () => {
     expect(result).toEqual({
       processedQuery: [
         { text: `@${getRelativePath(validFile)} @${geminiIgnoredFile}` },
-        { text: '\n--- Content from referenced files ---' },
+        { text: "\n--- Content from referenced files ---" },
         { text: `\nContent from @${getRelativePath(validFile)}:\n` },
-        { text: '// Main application entry' },
-        { text: '\n--- End of content ---' },
+        { text: "// Main application entry" },
+        { text: "\n--- End of content ---" },
       ],
       shouldProceed: true,
     });
@@ -706,140 +666,132 @@ describe('handleAtCommand', () => {
     );
   });
 
-  describe('punctuation termination in @ commands', () => {
+  describe("punctuation termination in @ commands", () => {
     const punctuationTestCases = [
       {
-        name: 'comma',
-        fileName: 'test.txt',
-        fileContent: 'File content here',
+        name: "comma",
+        fileName: "test.txt",
+        fileContent: "File content here",
         queryTemplate: (filePath: string) =>
           `Look at @${getRelativePath(filePath)}, then explain it.`,
         messageId: 400,
       },
       {
-        name: 'period',
-        fileName: 'readme.md',
-        fileContent: 'File content here',
+        name: "period",
+        fileName: "readme.md",
+        fileContent: "File content here",
         queryTemplate: (filePath: string) =>
           `Check @${getRelativePath(filePath)}. What does it say?`,
         messageId: 401,
       },
       {
-        name: 'semicolon',
-        fileName: 'example.js',
-        fileContent: 'Code example',
+        name: "semicolon",
+        fileName: "example.js",
+        fileContent: "Code example",
         queryTemplate: (filePath: string) =>
           `Review @${getRelativePath(filePath)}; check for bugs.`,
         messageId: 402,
       },
       {
-        name: 'exclamation mark',
-        fileName: 'important.txt',
-        fileContent: 'Important content',
+        name: "exclamation mark",
+        fileName: "important.txt",
+        fileContent: "Important content",
         queryTemplate: (filePath: string) =>
           `Look at @${getRelativePath(filePath)}! This is critical.`,
         messageId: 403,
       },
       {
-        name: 'question mark',
-        fileName: 'config.json',
-        fileContent: 'Config settings',
+        name: "question mark",
+        fileName: "config.json",
+        fileContent: "Config settings",
         queryTemplate: (filePath: string) =>
           `What is in @${getRelativePath(filePath)}? Please explain.`,
         messageId: 404,
       },
       {
-        name: 'opening parenthesis',
-        fileName: 'func.ts',
-        fileContent: 'Function definition',
+        name: "opening parenthesis",
+        fileName: "func.ts",
+        fileContent: "Function definition",
         queryTemplate: (filePath: string) =>
           `Analyze @${getRelativePath(filePath)}(the main function).`,
         messageId: 405,
       },
       {
-        name: 'closing parenthesis',
-        fileName: 'data.json',
-        fileContent: 'Test data',
+        name: "closing parenthesis",
+        fileName: "data.json",
+        fileContent: "Test data",
         queryTemplate: (filePath: string) =>
           `Use data from @${getRelativePath(filePath)}) for testing.`,
         messageId: 406,
       },
       {
-        name: 'opening square bracket',
-        fileName: 'array.js',
-        fileContent: 'Array data',
+        name: "opening square bracket",
+        fileName: "array.js",
+        fileContent: "Array data",
         queryTemplate: (filePath: string) =>
           `Check @${getRelativePath(filePath)}[0] for the first element.`,
         messageId: 407,
       },
       {
-        name: 'closing square bracket',
-        fileName: 'list.md',
-        fileContent: 'List content',
+        name: "closing square bracket",
+        fileName: "list.md",
+        fileContent: "List content",
         queryTemplate: (filePath: string) =>
           `Review item @${getRelativePath(filePath)}] from the list.`,
         messageId: 408,
       },
       {
-        name: 'opening curly brace',
-        fileName: 'object.ts',
-        fileContent: 'Object definition',
-        queryTemplate: (filePath: string) =>
-          `Parse @${getRelativePath(filePath)}{prop1: value1}.`,
+        name: "opening curly brace",
+        fileName: "object.ts",
+        fileContent: "Object definition",
+        queryTemplate: (filePath: string) => `Parse @${getRelativePath(filePath)}{prop1: value1}.`,
         messageId: 409,
       },
       {
-        name: 'closing curly brace',
-        fileName: 'config.yaml',
-        fileContent: 'Configuration',
+        name: "closing curly brace",
+        fileName: "config.yaml",
+        fileContent: "Configuration",
         queryTemplate: (filePath: string) =>
           `Use settings from @${getRelativePath(filePath)}} for deployment.`,
         messageId: 410,
       },
     ];
 
-    it.each(punctuationTestCases)(
-      'should terminate @path at $name',
-      async ({ fileName, fileContent, queryTemplate, messageId }) => {
-        const filePath = await createTestFile(
-          path.join(testRootDir, fileName),
-          fileContent,
-        );
-        const query = queryTemplate(filePath);
-
-        const result = await handleAtCommand({
-          query,
-          config: mockConfig,
-          addItem: mockAddItem,
-          onDebugMessage: mockOnDebugMessage,
-          messageId,
-          signal: abortController.signal,
-        });
-
-        expect(result).toEqual({
-          processedQuery: [
-            { text: query },
-            { text: '\n--- Content from referenced files ---' },
-            { text: `\nContent from @${getRelativePath(filePath)}:\n` },
-            { text: fileContent },
-            { text: '\n--- End of content ---' },
-          ],
-          shouldProceed: true,
-        });
-      },
-    );
+    it.each(punctuationTestCases)("should terminate @path at $name", async ({
+      fileName,
+      fileContent,
+      queryTemplate,
+      messageId,
+    }) => {
+      const filePath = await createTestFile(path.join(testRootDir, fileName), fileContent);
+      const query = queryTemplate(filePath);
 
-    it('should handle multiple @paths terminated by different punctuation', async () => {
-      const content1 = 'First file';
-      const file1Path = await createTestFile(
-        path.join(testRootDir, 'first.txt'),
-        content1,
-      );
-      const content2 = 'Second file';
-      const file2Path = await createTestFile(
-        path.join(testRootDir, 'second.txt'),
-        content2,
-      );
+      const result = await handleAtCommand({
+        query,
+        config: mockConfig,
+        addItem: mockAddItem,
+        onDebugMessage: mockOnDebugMessage,
+        messageId,
+        signal: abortController.signal,
+      });
+
+      expect(result).toEqual({
+        processedQuery: [
+          { text: query },
+          { text: "\n--- Content from referenced files ---" },
+          { text: `\nContent from @${getRelativePath(filePath)}:\n` },
+          { text: fileContent },
+          { text: "\n--- End of content ---" },
+        ],
+        shouldProceed: true,
+      });
+    });
+
+    it("should handle multiple @paths terminated by different punctuation", async () => {
+      const content1 = "First file";
+      const file1Path = await createTestFile(path.join(testRootDir, "first.txt"), content1);
+      const content2 = "Second file";
+      const file2Path = await createTestFile(path.join(testRootDir, "second.txt"), content2);
       const query = `Compare @${file1Path}, @${file2Path}; what's different?`;
 
       const result = await handleAtCommand({
@@ -856,24 +808,21 @@ describe('handleAtCommand', () => {
           {
             text: `Compare @${getRelativePath(file1Path)}, @${getRelativePath(file2Path)}; what's different?`,
           },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(file1Path)}:\n` },
           { text: content1 },
           { text: `\nContent from @${getRelativePath(file2Path)}:\n` },
           { text: content2 },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should still handle escaped spaces in paths before punctuation', async () => {
-      const fileContent = 'Spaced file content';
-      const filePath = await createTestFile(
-        path.join(testRootDir, 'spaced file.txt'),
-        fileContent,
-      );
-      const escapedPath = path.join(testRootDir, 'spaced\\ file.txt');
+    it("should still handle escaped spaces in paths before punctuation", async () => {
+      const fileContent = "Spaced file content";
+      const filePath = await createTestFile(path.join(testRootDir, "spaced file.txt"), fileContent);
+      const escapedPath = path.join(testRootDir, "spaced\\ file.txt");
       const query = `Check @${escapedPath}, it has spaces.`;
 
       const result = await handleAtCommand({
@@ -888,21 +837,18 @@ describe('handleAtCommand', () => {
       expect(result).toEqual({
         processedQuery: [
           { text: `Check @${getRelativePath(filePath)}, it has spaces.` },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should not break file paths with periods in extensions', async () => {
-      const fileContent = 'TypeScript content';
-      const filePath = await createTestFile(
-        path.join(testRootDir, 'example.d.ts'),
-        fileContent,
-      );
+    it("should not break file paths with periods in extensions", async () => {
+      const fileContent = "TypeScript content";
+      const filePath = await createTestFile(path.join(testRootDir, "example.d.ts"), fileContent);
       const query = `Analyze @${getRelativePath(filePath)} for type definitions.`;
 
       const result = await handleAtCommand({
@@ -919,21 +865,18 @@ describe('handleAtCommand', () => {
           {
             text: `Analyze @${getRelativePath(filePath)} for type definitions.`,
           },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should handle file paths ending with period followed by space', async () => {
-      const fileContent = 'Config content';
-      const filePath = await createTestFile(
-        path.join(testRootDir, 'config.json'),
-        fileContent,
-      );
+    it("should handle file paths ending with period followed by space", async () => {
+      const fileContent = "Config content";
+      const filePath = await createTestFile(path.join(testRootDir, "config.json"), fileContent);
       const query = `Check @${getRelativePath(filePath)}. This file contains settings.`;
 
       const result = await handleAtCommand({
@@ -950,21 +893,18 @@ describe('handleAtCommand', () => {
           {
             text: `Check @${getRelativePath(filePath)}. This file contains settings.`,
           },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should handle comma termination with complex file paths', async () => {
-      const fileContent = 'Package info';
-      const filePath = await createTestFile(
-        path.join(testRootDir, 'package.json'),
-        fileContent,
-      );
+    it("should handle comma termination with complex file paths", async () => {
+      const fileContent = "Package info";
+      const filePath = await createTestFile(path.join(testRootDir, "package.json"), fileContent);
       const query = `Review @${getRelativePath(filePath)}, then check dependencies.`;
 
       const result = await handleAtCommand({
@@ -981,19 +921,19 @@ describe('handleAtCommand', () => {
           {
             text: `Review @${getRelativePath(filePath)}, then check dependencies.`,
           },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should not terminate at period within file name', async () => {
-      const fileContent = 'Version info';
+    it("should not terminate at period within file name", async () => {
+      const fileContent = "Version info";
       const filePath = await createTestFile(
-        path.join(testRootDir, 'version.1.2.3.txt'),
+        path.join(testRootDir, "version.1.2.3.txt"),
         fileContent,
       );
       const query = `Check @${getRelativePath(filePath)} contains version information.`;
@@ -1012,21 +952,18 @@ describe('handleAtCommand', () => {
           {
             text: `Check @${getRelativePath(filePath)} contains version information.`,
           },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should handle end of string termination for period and comma', async () => {
-      const fileContent = 'End file content';
-      const filePath = await createTestFile(
-        path.join(testRootDir, 'end.txt'),
-        fileContent,
-      );
+    it("should handle end of string termination for period and comma", async () => {
+      const fileContent = "End file content";
+      const filePath = await createTestFile(path.join(testRootDir, "end.txt"), fileContent);
       const query = `Show me @${getRelativePath(filePath)}.`;
 
       const result = await handleAtCommand({
@@ -1041,19 +978,19 @@ describe('handleAtCommand', () => {
       expect(result).toEqual({
         processedQuery: [
           { text: `Show me @${getRelativePath(filePath)}.` },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should handle files with special characters in names', async () => {
-      const fileContent = 'File with special chars content';
+    it("should handle files with special characters in names", async () => {
+      const fileContent = "File with special chars content";
       const filePath = await createTestFile(
-        path.join(testRootDir, 'file$with&special#chars.txt'),
+        path.join(testRootDir, "file$with&special#chars.txt"),
         fileContent,
       );
       const query = `Check @${getRelativePath(filePath)} for content.`;
@@ -1070,21 +1007,18 @@ describe('handleAtCommand', () => {
       expect(result).toEqual({
         processedQuery: [
           { text: `Check @${getRelativePath(filePath)} for content.` },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
 
-    it('should handle basic file names without special characters', async () => {
-      const fileContent = 'Basic file content';
-      const filePath = await createTestFile(
-        path.join(testRootDir, 'basicfile.txt'),
-        fileContent,
-      );
+    it("should handle basic file names without special characters", async () => {
+      const fileContent = "Basic file content";
+      const filePath = await createTestFile(path.join(testRootDir, "basicfile.txt"), fileContent);
       const query = `Check @${getRelativePath(filePath)} please.`;
 
       const result = await handleAtCommand({
@@ -1099,24 +1033,21 @@ describe('handleAtCommand', () => {
       expect(result).toEqual({
         processedQuery: [
           { text: `Check @${getRelativePath(filePath)} please.` },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${getRelativePath(filePath)}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
     });
   });
 
-  describe('absolute path handling', () => {
-    it('should handle absolute file paths correctly', async () => {
+  describe("absolute path handling", () => {
+    it("should handle absolute file paths correctly", async () => {
       const fileContent = 'console.log("This is an absolute path test");';
-      const relativePath = path.join('src', 'absolute-test.ts');
-      const absolutePath = await createTestFile(
-        path.join(testRootDir, relativePath),
-        fileContent,
-      );
+      const relativePath = path.join("src", "absolute-test.ts");
+      const absolutePath = await createTestFile(path.join(testRootDir, relativePath), fileContent);
       const query = `Check @${absolutePath} please.`;
 
       const result = await handleAtCommand({
@@ -1131,10 +1062,10 @@ describe('handleAtCommand', () => {
       expect(result).toEqual({
         processedQuery: [
           { text: `Check @${relativePath} please.` },
-          { text: '\n--- Content from referenced files ---' },
+          { text: "\n--- Content from referenced files ---" },
           { text: `\nContent from @${relativePath}:\n` },
           { text: fileContent },
-          { text: '\n--- End of content ---' },
+          { text: "\n--- End of content ---" },
         ],
         shouldProceed: true,
       });
@@ -1144,15 +1075,11 @@ describe('handleAtCommand', () => {
       );
     });
 
-    it('should handle absolute directory paths correctly', async () => {
-      const fileContent =
-        'export default function test() { return "absolute dir test"; }';
-      const subDirPath = path.join('src', 'utils');
-      const fileName = 'helper.ts';
-      await createTestFile(
-        path.join(testRootDir, subDirPath, fileName),
-        fileContent,
-      );
+    it("should handle absolute directory paths correctly", async () => {
+      const fileContent = 'export default function test() { return "absolute dir test"; }';
+      const subDirPath = path.join("src", "utils");
+      const fileName = "helper.ts";
+      await createTestFile(path.join(testRootDir, subDirPath, fileName), fileContent);
       const absoluteDirPath = path.join(testRootDir, subDirPath);
       const query = `Check @${absoluteDirPath} please.`;
 
@@ -1168,26 +1095,24 @@ describe('handleAtCommand', () => {
       expect(result.shouldProceed).toBe(true);
       expect(result.processedQuery).toEqual(
         expect.arrayContaining([
-          { text: `Check @${path.join(subDirPath, '**')} please.` },
+          { text: `Check @${path.join(subDirPath, "**")} please.` },
           expect.objectContaining({
-            text: '\n--- Content from referenced files ---',
+            text: "\n--- Content from referenced files ---",
           }),
         ]),
       );
 
       expect(mockOnDebugMessage).toHaveBeenCalledWith(
-        expect.stringContaining(`using glob: ${path.join(subDirPath, '**')}`),
+        expect.stringContaining(`using glob: ${path.join(subDirPath, "**")}`),
       );
     });
 
-    it('should skip absolute paths outside workspace', async () => {
-      const outsidePath = '/tmp/outside-workspace.txt';
+    it("should skip absolute paths outside workspace", async () => {
+      const outsidePath = "/tmp/outside-workspace.txt";
       const query = `Check @${outsidePath} please.`;
 
       const mockWorkspaceContext = {
-        isPathWithinWorkspace: vi.fn((path: string) =>
-          path.startsWith(testRootDir),
-        ),
+        isPathWithinWorkspace: vi.fn((path: string) => path.startsWith(testRootDir)),
         getDirectories: () => [testRootDir],
         addDirectory: vi.fn(),
         getInitialDirectories: () => [testRootDir],
@@ -1218,9 +1143,9 @@ describe('handleAtCommand', () => {
 
   it("should not add the user's turn to history, as that is the caller's responsibility", async () => {
     // Arrange
-    const fileContent = 'This is the file content.';
+    const fileContent = "This is the file content.";
     const filePath = await createTestFile(
-      path.join(testRootDir, 'path', 'to', 'another-file.txt'),
+      path.join(testRootDir, "path", "to", "another-file.txt"),
       fileContent,
     );
     const query = `A query with @${getRelativePath(filePath)}`;
@@ -1237,40 +1162,35 @@ describe('handleAtCommand', () => {
 
     // Assert
     // It SHOULD be called for the tool_group
-    expect(mockAddItem).toHaveBeenCalledWith(
-      expect.objectContaining({ type: 'tool_group' }),
-      999,
-    );
+    expect(mockAddItem).toHaveBeenCalledWith(expect.objectContaining({ type: "tool_group" }), 999);
 
     // It should NOT have been called for the user turn
-    const userTurnCalls = mockAddItem.mock.calls.filter(
-      (call) => call[0].type === 'user',
-    );
+    const userTurnCalls = mockAddItem.mock.calls.filter((call) => call[0].type === "user");
     expect(userTurnCalls).toHaveLength(0);
   });
 
-  describe('MCP resource attachments', () => {
-    it('attaches MCP resource content when @serverName:uri matches registry', async () => {
-      const serverName = 'server-1';
-      const resourceUri = 'resource://server-1/logs';
+  describe("MCP resource attachments", () => {
+    it("attaches MCP resource content when @serverName:uri matches registry", async () => {
+      const serverName = "server-1";
+      const resourceUri = "resource://server-1/logs";
       const prefixedUri = `${serverName}:${resourceUri}`;
       const resource = {
         serverName,
         uri: resourceUri,
-        name: 'logs',
+        name: "logs",
         discoveredAt: Date.now(),
       } as DiscoveredMCPResource;
 
-      vi.spyOn(mockConfig, 'getResourceRegistry').mockReturnValue({
+      vi.spyOn(mockConfig, "getResourceRegistry").mockReturnValue({
         findResourceByUri: (identifier: string) =>
           identifier === prefixedUri ? resource : undefined,
         getAllResources: () => [],
       } as never);
 
       const readResource = vi.fn().mockResolvedValue({
-        contents: [{ text: 'mcp resource body' }],
+        contents: [{ text: "mcp resource body" }],
       });
-      vi.spyOn(mockConfig, 'getMcpClientManager').mockReturnValue({
+      vi.spyOn(mockConfig, "getMcpClientManager").mockReturnValue({
         getClient: () => ({ readResource }),
       } as never);
 
@@ -1284,25 +1204,23 @@ describe('handleAtCommand', () => {
       });
 
       expect(readResource).toHaveBeenCalledWith(resourceUri);
-      const processedParts = Array.isArray(result.processedQuery)
-        ? result.processedQuery
-        : [];
+      const processedParts = Array.isArray(result.processedQuery) ? result.processedQuery : [];
       const containsResourceText = processedParts.some((part) => {
-        const text = typeof part === 'string' ? part : part?.text;
-        return typeof text === 'string' && text.includes('mcp resource body');
+        const text = typeof part === "string" ? part : part?.text;
+        return typeof text === "string" && text.includes("mcp resource body");
       });
       expect(containsResourceText).toBe(true);
       expect(mockAddItem).toHaveBeenCalledWith(
-        expect.objectContaining({ type: 'tool_group' }),
+        expect.objectContaining({ type: "tool_group" }),
         expect.any(Number),
       );
     });
 
-    it('returns an error if MCP client is unavailable', async () => {
-      const serverName = 'server-1';
-      const resourceUri = 'resource://server-1/logs';
+    it("returns an error if MCP client is unavailable", async () => {
+      const serverName = "server-1";
+      const resourceUri = "resource://server-1/logs";
       const prefixedUri = `${serverName}:${resourceUri}`;
-      vi.spyOn(mockConfig, 'getResourceRegistry').mockReturnValue({
+      vi.spyOn(mockConfig, "getResourceRegistry").mockReturnValue({
         findResourceByUri: (identifier: string) =>
           identifier === prefixedUri
             ? ({
@@ -1313,7 +1231,7 @@ describe('handleAtCommand', () => {
             : undefined,
         getAllResources: () => [],
       } as never);
-      vi.spyOn(mockConfig, 'getMcpClientManager').mockReturnValue({
+      vi.spyOn(mockConfig, "getMcpClientManager").mockReturnValue({
         getClient: () => undefined,
       } as never);
 
@@ -1329,7 +1247,7 @@ describe('handleAtCommand', () => {
       expect(result.shouldProceed).toBe(false);
       expect(mockAddItem).toHaveBeenCalledWith(
         expect.objectContaining({
-          type: 'tool_group',
+          type: "tool_group",
           tools: expect.arrayContaining([
             expect.objectContaining({
               resultDisplay: expect.stringContaining(
diff --git a/packages/ui-gemini/src/ui/hooks/atCommandProcessor.ts b/packages/ui-gemini/src/ui/hooks/atCommandProcessor.ts
index 65e85a793..0c1692c76 100644
--- a/packages/ui-gemini/src/ui/hooks/atCommandProcessor.ts
+++ b/packages/ui-gemini/src/ui/hooks/atCommandProcessor.ts
@@ -4,30 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import type { PartListUnion, PartUnion } from '@google/genai';
-import type {
-  AnyToolInvocation,
-  Config,
-  DiscoveredMCPResource,
-} from '@airiscode/gemini-cli-core';
+import { Buffer } from "node:buffer";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import type { AnyToolInvocation, Config, DiscoveredMCPResource } from "@airiscode/gemini-cli-core";
 import {
   debugLogger,
   getErrorMessage,
   isNodeError,
-  unescapePath,
   ReadManyFilesTool,
-} from '@airiscode/gemini-cli-core';
-import { Buffer } from 'node:buffer';
-import type { HistoryItem, IndividualToolCallDisplay } from '../types.js';
-import { ToolCallStatus } from '../types.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+  unescapePath,
+} from "@airiscode/gemini-cli-core";
+import type { PartListUnion, PartUnion } from "@google/genai";
+import type { HistoryItem, IndividualToolCallDisplay } from "../types.js";
+import { ToolCallStatus } from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 interface HandleAtCommandParams {
   query: string;
   config: Config;
-  addItem: UseHistoryManagerReturn['addItem'];
+  addItem: UseHistoryManagerReturn["addItem"];
   onDebugMessage: (message: string) => void;
   messageId: number;
   signal: AbortSignal;
@@ -39,7 +35,7 @@ interface HandleAtCommandResult {
 }
 
 interface AtCommandPart {
-  type: 'text' | 'atPath';
+  type: "text" | "atPath";
   content: string;
 }
 
@@ -57,8 +53,8 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     // Find next unescaped '@'
     while (nextSearchIndex < query.length) {
       if (
-        query[nextSearchIndex] === '@' &&
-        (nextSearchIndex === 0 || query[nextSearchIndex - 1] !== '\\')
+        query[nextSearchIndex] === "@" &&
+        (nextSearchIndex === 0 || query[nextSearchIndex - 1] !== "\\")
       ) {
         atIndex = nextSearchIndex;
         break;
@@ -69,7 +65,7 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     if (atIndex === -1) {
       // No more @
       if (currentIndex < query.length) {
-        parts.push({ type: 'text', content: query.substring(currentIndex) });
+        parts.push({ type: "text", content: query.substring(currentIndex) });
       }
       break;
     }
@@ -77,7 +73,7 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     // Add text before @
     if (atIndex > currentIndex) {
       parts.push({
-        type: 'text',
+        type: "text",
         content: query.substring(currentIndex, atIndex),
       });
     }
@@ -89,17 +85,16 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
       const char = query[pathEndIndex];
       if (inEscape) {
         inEscape = false;
-      } else if (char === '\\') {
+      } else if (char === "\\") {
         inEscape = true;
       } else if (/[,\s;!?()[\]{}]/.test(char)) {
         // Path ends at first whitespace or punctuation not escaped
         break;
-      } else if (char === '.') {
+      } else if (char === ".") {
         // For . we need to be more careful - only terminate if followed by whitespace or end of string
         // This allows file extensions like .txt, .js but terminates at sentence endings like "file.txt. Next sentence"
-        const nextChar =
-          pathEndIndex + 1 < query.length ? query[pathEndIndex + 1] : '';
-        if (nextChar === '' || /\s/.test(nextChar)) {
+        const nextChar = pathEndIndex + 1 < query.length ? query[pathEndIndex + 1] : "";
+        if (nextChar === "" || /\s/.test(nextChar)) {
           break;
         }
       }
@@ -108,13 +103,11 @@ function parseAllAtCommands(query: string): AtCommandPart[] {
     const rawAtPath = query.substring(atIndex, pathEndIndex);
     // unescapePath expects the @ symbol to be present, and will handle it.
     const atPath = unescapePath(rawAtPath);
-    parts.push({ type: 'atPath', content: atPath });
+    parts.push({ type: "atPath", content: atPath });
     currentIndex = pathEndIndex;
   }
   // Filter out empty text parts that might result from consecutive @paths or leading/trailing spaces
-  return parts.filter(
-    (part) => !(part.type === 'text' && part.content.trim() === ''),
-  );
+  return parts.filter((part) => !(part.type === "text" && part.content.trim() === ""));
 }
 
 /**
@@ -139,9 +132,7 @@ export async function handleAtCommand({
   const mcpClientManager = config.getMcpClientManager();
 
   const commandParts = parseAllAtCommands(query);
-  const atPathCommandParts = commandParts.filter(
-    (part) => part.type === 'atPath',
-  );
+  const atPathCommandParts = commandParts.filter((part) => part.type === "atPath");
 
   if (atPathCommandParts.length === 0) {
     return { processedQuery: [{ text: query }], shouldProceed: true };
@@ -165,11 +156,11 @@ export async function handleAtCommand({
 
   const toolRegistry = config.getToolRegistry();
   const readManyFilesTool = new ReadManyFilesTool(config);
-  const globTool = toolRegistry.getTool('glob');
+  const globTool = toolRegistry.getTool("glob");
 
   if (!readManyFilesTool) {
     addItem(
-      { type: 'error', text: 'Error: read_many_files tool not found.' },
+      { type: "error", text: "Error: read_many_files tool not found." },
       userMessageTimestamp,
     );
     return { processedQuery: null, shouldProceed: false };
@@ -178,10 +169,8 @@ export async function handleAtCommand({
   for (const atPathPart of atPathCommandParts) {
     const originalAtPath = atPathPart.content; // e.g., "@file.txt" or "@"
 
-    if (originalAtPath === '@') {
-      onDebugMessage(
-        'Lone @ detected, will be treated as text in the modified query.',
-      );
+    if (originalAtPath === "@") {
+      onDebugMessage("Lone @ detected, will be treated as text in the modified query.");
       continue;
     }
 
@@ -191,7 +180,7 @@ export async function handleAtCommand({
       // but as a safeguard:
       addItem(
         {
-          type: 'error',
+          type: "error",
           text: `Error: Invalid @ command '${originalAtPath}'. No path specified.`,
         },
         userMessageTimestamp,
@@ -211,9 +200,7 @@ export async function handleAtCommand({
 
     const workspaceContext = config.getWorkspaceContext();
     if (!workspaceContext.isPathWithinWorkspace(pathName)) {
-      onDebugMessage(
-        `Path ${pathName} is not in the workspace and will be skipped.`,
-      );
+      onDebugMessage(`Path ${pathName} is not in the workspace and will be skipped.`);
       continue;
     }
 
@@ -231,15 +218,14 @@ export async function handleAtCommand({
       });
 
     if (gitIgnored || geminiIgnored) {
-      const reason =
-        gitIgnored && geminiIgnored ? 'both' : gitIgnored ? 'git' : 'gemini';
+      const reason = gitIgnored && geminiIgnored ? "both" : gitIgnored ? "git" : "gemini";
       ignoredByReason[reason].push(pathName);
       const reasonText =
-        reason === 'both'
-          ? 'ignored by both git and gemini'
-          : reason === 'git'
-            ? 'git-ignored'
-            : 'gemini-ignored';
+        reason === "both"
+          ? "ignored by both git and gemini"
+          : reason === "git"
+            ? "git-ignored"
+            : "gemini-ignored";
       onDebugMessage(`Path ${pathName} is ${reasonText} and will be skipped.`);
       continue;
     }
@@ -249,21 +235,15 @@ export async function handleAtCommand({
       let resolvedSuccessfully = false;
       let relativePath = pathName;
       try {
-        const absolutePath = path.isAbsolute(pathName)
-          ? pathName
-          : path.resolve(dir, pathName);
+        const absolutePath = path.isAbsolute(pathName) ? pathName : path.resolve(dir, pathName);
         const stats = await fs.stat(absolutePath);
 
         // Convert absolute path to relative path
-        relativePath = path.isAbsolute(pathName)
-          ? path.relative(dir, absolutePath)
-          : pathName;
+        relativePath = path.isAbsolute(pathName) ? path.relative(dir, absolutePath) : pathName;
 
         if (stats.isDirectory()) {
-          currentPathSpec = path.join(relativePath, '**');
-          onDebugMessage(
-            `Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`,
-          );
+          currentPathSpec = path.join(relativePath, "**");
+          onDebugMessage(`Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`);
         } else {
           currentPathSpec = relativePath;
           absoluteToRelativePathMap.set(absolutePath, relativePath);
@@ -273,11 +253,9 @@ export async function handleAtCommand({
         }
         resolvedSuccessfully = true;
       } catch (error) {
-        if (isNodeError(error) && error.code === 'ENOENT') {
+        if (isNodeError(error) && error.code === "ENOENT") {
           if (config.getEnableRecursiveFileSearch() && globTool) {
-            onDebugMessage(
-              `Path ${pathName} not found directly, attempting glob search.`,
-            );
+            onDebugMessage(`Path ${pathName} not found directly, attempting glob search.`);
             try {
               const globResult = await globTool.buildAndExecute(
                 {
@@ -288,18 +266,15 @@ export async function handleAtCommand({
               );
               if (
                 globResult.llmContent &&
-                typeof globResult.llmContent === 'string' &&
-                !globResult.llmContent.startsWith('No files found') &&
-                !globResult.llmContent.startsWith('Error:')
+                typeof globResult.llmContent === "string" &&
+                !globResult.llmContent.startsWith("No files found") &&
+                !globResult.llmContent.startsWith("Error:")
               ) {
-                const lines = globResult.llmContent.split('\n');
+                const lines = globResult.llmContent.split("\n");
                 if (lines.length > 1 && lines[1]) {
                   const firstMatchAbsolute = lines[1].trim();
                   currentPathSpec = path.relative(dir, firstMatchAbsolute);
-                  absoluteToRelativePathMap.set(
-                    firstMatchAbsolute,
-                    currentPathSpec,
-                  );
+                  absoluteToRelativePathMap.set(firstMatchAbsolute, currentPathSpec);
                   onDebugMessage(
                     `Glob search for ${pathName} found ${firstMatchAbsolute}, using relative path: ${currentPathSpec}`,
                   );
@@ -323,17 +298,11 @@ export async function handleAtCommand({
               );
             }
           } else {
-            onDebugMessage(
-              `Glob tool not found. Path ${pathName} will be skipped.`,
-            );
+            onDebugMessage(`Glob tool not found. Path ${pathName} will be skipped.`);
           }
         } else {
-          debugLogger.warn(
-            `Error stating path ${pathName}: ${getErrorMessage(error)}`,
-          );
-          onDebugMessage(
-            `Error stating path ${pathName}. Path ${pathName} will be skipped.`,
-          );
+          debugLogger.warn(`Error stating path ${pathName}: ${getErrorMessage(error)}`);
+          onDebugMessage(`Error stating path ${pathName}. Path ${pathName} will be skipped.`);
         }
       }
       if (resolvedSuccessfully) {
@@ -347,27 +316,22 @@ export async function handleAtCommand({
   }
 
   // Construct the initial part of the query for the LLM
-  let initialQueryText = '';
+  let initialQueryText = "";
   for (let i = 0; i < commandParts.length; i++) {
     const part = commandParts[i];
-    if (part.type === 'text') {
+    if (part.type === "text") {
       initialQueryText += part.content;
     } else {
       // type === 'atPath'
       const resolvedSpec = atPathToResolvedSpecMap.get(part.content);
-      if (
-        i > 0 &&
-        initialQueryText.length > 0 &&
-        !initialQueryText.endsWith(' ')
-      ) {
+      if (i > 0 && initialQueryText.length > 0 && !initialQueryText.endsWith(" ")) {
         // Add space if previous part was text and didn't end with space, or if previous was @path
         const prevPart = commandParts[i - 1];
         if (
-          prevPart.type === 'text' ||
-          (prevPart.type === 'atPath' &&
-            atPathToResolvedSpecMap.has(prevPart.content))
+          prevPart.type === "text" ||
+          (prevPart.type === "atPath" && atPathToResolvedSpecMap.has(prevPart.content))
         ) {
-          initialQueryText += ' ';
+          initialQueryText += " ";
         }
       }
       if (resolvedSpec) {
@@ -378,10 +342,10 @@ export async function handleAtCommand({
         if (
           i > 0 &&
           initialQueryText.length > 0 &&
-          !initialQueryText.endsWith(' ') &&
-          !part.content.startsWith(' ')
+          !initialQueryText.endsWith(" ") &&
+          !part.content.startsWith(" ")
         ) {
-          initialQueryText += ' ';
+          initialQueryText += " ";
         }
         initialQueryText += part.content;
       }
@@ -391,31 +355,31 @@ export async function handleAtCommand({
 
   // Inform user about ignored paths
   const totalIgnored =
-    ignoredByReason['git'].length +
-    ignoredByReason['gemini'].length +
-    ignoredByReason['both'].length;
+    ignoredByReason["git"].length +
+    ignoredByReason["gemini"].length +
+    ignoredByReason["both"].length;
 
   if (totalIgnored > 0) {
     const messages = [];
-    if (ignoredByReason['git'].length) {
-      messages.push(`Git-ignored: ${ignoredByReason['git'].join(', ')}`);
+    if (ignoredByReason["git"].length) {
+      messages.push(`Git-ignored: ${ignoredByReason["git"].join(", ")}`);
     }
-    if (ignoredByReason['gemini'].length) {
-      messages.push(`Gemini-ignored: ${ignoredByReason['gemini'].join(', ')}`);
+    if (ignoredByReason["gemini"].length) {
+      messages.push(`Gemini-ignored: ${ignoredByReason["gemini"].join(", ")}`);
     }
-    if (ignoredByReason['both'].length) {
-      messages.push(`Ignored by both: ${ignoredByReason['both'].join(', ')}`);
+    if (ignoredByReason["both"].length) {
+      messages.push(`Ignored by both: ${ignoredByReason["both"].join(", ")}`);
     }
 
-    const message = `Ignored ${totalIgnored} files:\n${messages.join('\n')}`;
+    const message = `Ignored ${totalIgnored} files:\n${messages.join("\n")}`;
     debugLogger.log(message);
     onDebugMessage(message);
   }
 
   // Fallback for lone "@" or completely invalid @-commands resulting in empty initialQueryText
   if (pathSpecsToRead.length === 0 && resourceAttachments.length === 0) {
-    onDebugMessage('No valid file paths found in @ commands to read.');
-    if (initialQueryText === '@' && query.trim() === '@') {
+    onDebugMessage("No valid file paths found in @ commands to read.");
+    if (initialQueryText === "@" && query.trim() === "@") {
       // If the only thing was a lone @, pass original query (which might have spaces)
       return { processedQuery: [{ text: query }], shouldProceed: true };
     } else if (!initialQueryText && query) {
@@ -488,10 +452,7 @@ export async function handleAtCommand({
 
   if (resourceErrorOccurred) {
     addItem(
-      { type: 'tool_group', tools: resourceReadDisplays } as Omit<
-        HistoryItem,
-        'id'
-      >,
+      { type: "tool_group", tools: resourceReadDisplays } as Omit<HistoryItem, "id">,
       userMessageTimestamp,
     );
     return { processedQuery: null, shouldProceed: false };
@@ -500,10 +461,7 @@ export async function handleAtCommand({
   if (pathSpecsToRead.length === 0) {
     if (resourceReadDisplays.length > 0) {
       addItem(
-        { type: 'tool_group', tools: resourceReadDisplays } as Omit<
-          HistoryItem,
-          'id'
-        >,
+        { type: "tool_group", tools: resourceReadDisplays } as Omit<HistoryItem, "id">,
         userMessageTimestamp,
       );
     }
@@ -530,26 +488,23 @@ export async function handleAtCommand({
       description: invocation.getDescription(),
       status: ToolCallStatus.Success,
       resultDisplay:
-        result.returnDisplay ||
-        `Successfully read: ${fileLabelsForDisplay.join(', ')}`,
+        result.returnDisplay || `Successfully read: ${fileLabelsForDisplay.join(", ")}`,
       confirmationDetails: undefined,
     };
 
     if (Array.isArray(result.llmContent)) {
       const fileContentRegex = /^--- (.*?) ---\n\n([\s\S]*?)\n\n$/;
       processedQueryParts.push({
-        text: '\n--- Content from referenced files ---',
+        text: "\n--- Content from referenced files ---",
       });
       for (const part of result.llmContent) {
-        if (typeof part === 'string') {
+        if (typeof part === "string") {
           const match = fileContentRegex.exec(part);
           if (match) {
             const filePathSpecInContent = match[1];
             const fileActualContent = match[2].trim();
 
-            let displayPath = absoluteToRelativePathMap.get(
-              filePathSpecInContent,
-            );
+            let displayPath = absoluteToRelativePathMap.get(filePathSpecInContent);
 
             // Fallback: if no mapping found, try to convert absolute path to relative
             if (!displayPath) {
@@ -576,20 +531,15 @@ export async function handleAtCommand({
         }
       }
     } else {
-      onDebugMessage(
-        'read_many_files tool returned no content or empty content.',
-      );
+      onDebugMessage("read_many_files tool returned no content or empty content.");
     }
 
     if (resourceReadDisplays.length > 0 || readManyFilesDisplay) {
       addItem(
         {
-          type: 'tool_group',
-          tools: [
-            ...resourceReadDisplays,
-            ...(readManyFilesDisplay ? [readManyFilesDisplay] : []),
-          ],
-        } as Omit<HistoryItem, 'id'>,
+          type: "tool_group",
+          tools: [...resourceReadDisplays, ...(readManyFilesDisplay ? [readManyFilesDisplay] : [])],
+        } as Omit<HistoryItem, "id">,
         userMessageTimestamp,
       );
     }
@@ -598,18 +548,16 @@ export async function handleAtCommand({
     readManyFilesDisplay = {
       callId: `client-read-${userMessageTimestamp}`,
       name: readManyFilesTool.displayName,
-      description:
-        invocation?.getDescription() ??
-        'Error attempting to execute tool to read files',
+      description: invocation?.getDescription() ?? "Error attempting to execute tool to read files",
       status: ToolCallStatus.Error,
-      resultDisplay: `Error reading files (${fileLabelsForDisplay.join(', ')}): ${getErrorMessage(error)}`,
+      resultDisplay: `Error reading files (${fileLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
       confirmationDetails: undefined,
     };
     addItem(
       {
-        type: 'tool_group',
+        type: "tool_group",
         tools: [...resourceReadDisplays, readManyFilesDisplay],
-      } as Omit<HistoryItem, 'id'>,
+      } as Omit<HistoryItem, "id">,
       userMessageTimestamp,
     );
     return { processedQuery: null, shouldProceed: false };
@@ -636,8 +584,8 @@ function convertResourceContentsToParts(response: {
       continue;
     }
     if (candidate.blob) {
-      const sizeBytes = Buffer.from(candidate.blob, 'base64').length;
-      const mimeType = candidate.mimeType ?? 'application/octet-stream';
+      const sizeBytes = Buffer.from(candidate.blob, "base64").length;
+      const mimeType = candidate.mimeType ?? "application/octet-stream";
       parts.push({
         text: `[Binary resource content ${mimeType}, ${sizeBytes} bytes]`,
       });
diff --git a/packages/ui-gemini/src/ui/hooks/keyToAnsi.ts b/packages/ui-gemini/src/ui/hooks/keyToAnsi.ts
index 1d5549ab0..d3bb4eb68 100644
--- a/packages/ui-gemini/src/ui/hooks/keyToAnsi.ts
+++ b/packages/ui-gemini/src/ui/hooks/keyToAnsi.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Key } from '../contexts/KeypressContext.js';
+import type { Key } from "../contexts/KeypressContext.js";
 
 export type { Key };
 
@@ -18,15 +18,13 @@ export type { Key };
 export function keyToAnsi(key: Key): string | null {
   if (key.ctrl) {
     // Ctrl + letter
-    if (key.name >= 'a' && key.name <= 'z') {
-      return String.fromCharCode(
-        key.name.charCodeAt(0) - 'a'.charCodeAt(0) + 1,
-      );
+    if (key.name >= "a" && key.name <= "z") {
+      return String.fromCharCode(key.name.charCodeAt(0) - "a".charCodeAt(0) + 1);
     }
     // Other Ctrl combinations might need specific handling
     switch (key.name) {
-      case 'c':
-        return '\x03'; // ETX (End of Text), commonly used for interrupt
+      case "c":
+        return "\x03"; // ETX (End of Text), commonly used for interrupt
       // Add other special ctrl cases if needed
       default:
         break;
@@ -35,37 +33,37 @@ export function keyToAnsi(key: Key): string | null {
 
   // Arrow keys and other special keys
   switch (key.name) {
-    case 'up':
-      return '\x1b[A';
-    case 'down':
-      return '\x1b[B';
-    case 'right':
-      return '\x1b[C';
-    case 'left':
-      return '\x1b[D';
-    case 'escape':
-      return '\x1b';
-    case 'tab':
-      return '\t';
-    case 'backspace':
-      return '\x7f';
-    case 'delete':
-      return '\x1b[3~';
-    case 'home':
-      return '\x1b[H';
-    case 'end':
-      return '\x1b[F';
-    case 'pageup':
-      return '\x1b[5~';
-    case 'pagedown':
-      return '\x1b[6~';
+    case "up":
+      return "\x1b[A";
+    case "down":
+      return "\x1b[B";
+    case "right":
+      return "\x1b[C";
+    case "left":
+      return "\x1b[D";
+    case "escape":
+      return "\x1b";
+    case "tab":
+      return "\t";
+    case "backspace":
+      return "\x7f";
+    case "delete":
+      return "\x1b[3~";
+    case "home":
+      return "\x1b[H";
+    case "end":
+      return "\x1b[F";
+    case "pageup":
+      return "\x1b[5~";
+    case "pagedown":
+      return "\x1b[6~";
     default:
       break;
   }
 
   // Enter/Return
-  if (key.name === 'return') {
-    return '\r';
+  if (key.name === "return") {
+    return "\r";
   }
 
   // If it's a simple character, return it.
diff --git a/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.test.tsx b/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.test.tsx
index 8990767d0..0e8c7c2d5 100644
--- a/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.test.tsx
@@ -4,64 +4,52 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
 
 const mockIsBinary = vi.hoisted(() => vi.fn());
 const mockShellExecutionService = vi.hoisted(() => vi.fn());
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     ShellExecutionService: { execute: mockShellExecutionService },
     isBinary: mockIsBinary,
   };
 });
-vi.mock('node:fs');
-vi.mock('node:os', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:os')>();
+vi.mock("node:fs");
+vi.mock("node:os", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:os")>();
   const mocked = {
     ...actual,
-    homedir: vi.fn(() => '/home/user'),
-    platform: vi.fn(() => 'linux'),
-    tmpdir: vi.fn(() => '/tmp'),
+    homedir: vi.fn(() => "/home/user"),
+    platform: vi.fn(() => "linux"),
+    tmpdir: vi.fn(() => "/tmp"),
   };
   return {
     ...mocked,
     default: mocked,
   };
 });
-vi.mock('node:crypto');
-vi.mock('../utils/textUtils.js');
+vi.mock("node:crypto");
+vi.mock("../utils/textUtils.js");
 
-import {
-  useShellCommandProcessor,
-  OUTPUT_UPDATE_INTERVAL_MS,
-} from './shellCommandProcessor.js';
+import * as crypto from "node:crypto";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
 import {
   type Config,
   type GeminiClient,
   type ShellExecutionResult,
   type ShellOutputEvent,
-} from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import { ToolCallStatus } from '../types.js';
-
-describe('useShellCommandProcessor', () => {
+} from "@airiscode/gemini-cli-core";
+import { ToolCallStatus } from "../types.js";
+import { OUTPUT_UPDATE_INTERVAL_MS, useShellCommandProcessor } from "./shellCommandProcessor.js";
+
+describe("useShellCommandProcessor", () => {
   let addItemToHistoryMock: Mock;
   let setPendingHistoryItemMock: Mock;
   let onExecMock: Mock;
@@ -83,7 +71,7 @@ describe('useShellCommandProcessor', () => {
     onDebugMessageMock = vi.fn();
     setShellInputFocusedMock = vi.fn();
     mockConfig = {
-      getTargetDir: () => '/test/dir',
+      getTargetDir: () => "/test/dir",
       getEnableInteractiveShell: () => false,
       getShellExecutionConfig: () => ({
         terminalHeight: 20,
@@ -92,11 +80,9 @@ describe('useShellCommandProcessor', () => {
     } as Config;
     mockGeminiClient = { addHistory: vi.fn() } as unknown as GeminiClient;
 
-    vi.mocked(os.platform).mockReturnValue('linux');
-    vi.mocked(os.tmpdir).mockReturnValue('/tmp');
-    (vi.mocked(crypto.randomBytes) as Mock).mockReturnValue(
-      Buffer.from('abcdef', 'hex'),
-    );
+    vi.mocked(os.platform).mockReturnValue("linux");
+    vi.mocked(os.tmpdir).mockReturnValue("/tmp");
+    (vi.mocked(crypto.randomBytes) as Mock).mockReturnValue(Buffer.from("abcdef", "hex"));
     mockIsBinary.mockReturnValue(false);
     vi.mocked(fs.existsSync).mockReturnValue(false);
 
@@ -138,42 +124,42 @@ describe('useShellCommandProcessor', () => {
   const createMockServiceResult = (
     overrides: Partial<ShellExecutionResult> = {},
   ): ShellExecutionResult => ({
-    rawOutput: Buffer.from(overrides.output || ''),
-    output: 'Success',
+    rawOutput: Buffer.from(overrides.output || ""),
+    output: "Success",
     exitCode: 0,
     signal: null,
     error: null,
     aborted: false,
     pid: 12345,
-    executionMethod: 'child_process',
+    executionMethod: "child_process",
     ...overrides,
   });
 
-  it('should initiate command execution and set pending state', async () => {
+  it("should initiate command execution and set pending state", async () => {
     const { result } = renderProcessorHook();
 
     await act(async () => {
-      result.current.handleShellCommand('ls -l', new AbortController().signal);
+      result.current.handleShellCommand("ls -l", new AbortController().signal);
     });
 
     expect(addItemToHistoryMock).toHaveBeenCalledWith(
-      { type: 'user_shell', text: 'ls -l' },
+      { type: "user_shell", text: "ls -l" },
       expect.any(Number),
     );
     expect(setPendingHistoryItemMock).toHaveBeenCalledWith({
-      type: 'tool_group',
+      type: "tool_group",
       tools: [
         expect.objectContaining({
-          name: 'Shell Command',
+          name: "Shell Command",
           status: ToolCallStatus.Executing,
         }),
       ],
     });
-    const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
+    const tmpFile = path.join(os.tmpdir(), "shell_pwd_abcdef.tmp");
     const wrappedCommand = `{ ls -l; }; __code=$?; pwd > "${tmpFile}"; exit $__code`;
     expect(mockShellExecutionService).toHaveBeenCalledWith(
       wrappedCommand,
-      '/test/dir',
+      "/test/dir",
       expect.any(Function),
       expect.any(Object),
       false,
@@ -182,19 +168,16 @@ describe('useShellCommandProcessor', () => {
     expect(onExecMock).toHaveBeenCalledWith(expect.any(Promise));
   });
 
-  it('should handle successful execution and update history correctly', async () => {
+  it("should handle successful execution and update history correctly", async () => {
     const { result } = renderProcessorHook();
 
     act(() => {
-      result.current.handleShellCommand(
-        'echo "ok"',
-        new AbortController().signal,
-      );
+      result.current.handleShellCommand('echo "ok"', new AbortController().signal);
     });
     const execPromise = onExecMock.mock.calls[0][0];
 
     act(() => {
-      resolveExecutionPromise(createMockServiceResult({ output: 'ok' }));
+      resolveExecutionPromise(createMockServiceResult({ output: "ok" }));
     });
     await act(async () => await execPromise);
 
@@ -205,7 +188,7 @@ describe('useShellCommandProcessor', () => {
         tools: [
           expect.objectContaining({
             status: ToolCallStatus.Success,
-            resultDisplay: 'ok',
+            resultDisplay: "ok",
           }),
         ],
       }),
@@ -214,58 +197,48 @@ describe('useShellCommandProcessor', () => {
     expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
   });
 
-  it('should handle command failure and display error status', async () => {
+  it("should handle command failure and display error status", async () => {
     const { result } = renderProcessorHook();
 
     act(() => {
-      result.current.handleShellCommand(
-        'bad-cmd',
-        new AbortController().signal,
-      );
+      result.current.handleShellCommand("bad-cmd", new AbortController().signal);
     });
     const execPromise = onExecMock.mock.calls[0][0];
 
     act(() => {
-      resolveExecutionPromise(
-        createMockServiceResult({ exitCode: 127, output: 'not found' }),
-      );
+      resolveExecutionPromise(createMockServiceResult({ exitCode: 127, output: "not found" }));
     });
     await act(async () => await execPromise);
 
     const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
     expect(finalHistoryItem.tools[0].status).toBe(ToolCallStatus.Error);
-    expect(finalHistoryItem.tools[0].resultDisplay).toContain(
-      'Command exited with code 127',
-    );
-    expect(finalHistoryItem.tools[0].resultDisplay).toContain('not found');
+    expect(finalHistoryItem.tools[0].resultDisplay).toContain("Command exited with code 127");
+    expect(finalHistoryItem.tools[0].resultDisplay).toContain("not found");
     expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
   });
 
-  describe('UI Streaming and Throttling', () => {
+  describe("UI Streaming and Throttling", () => {
     beforeEach(() => {
-      vi.useFakeTimers({ toFake: ['Date'] });
+      vi.useFakeTimers({ toFake: ["Date"] });
     });
     afterEach(() => {
       vi.useRealTimers();
     });
 
-    it('should update UI for text streams (non-interactive)', async () => {
+    it("should update UI for text streams (non-interactive)", async () => {
       const { result } = renderProcessorHook();
       await act(async () => {
-        result.current.handleShellCommand(
-          'stream',
-          new AbortController().signal,
-        );
+        result.current.handleShellCommand("stream", new AbortController().signal);
       });
 
       // Verify it's using the non-pty shell
       const wrappedCommand = `{ stream; }; __code=$?; pwd > "${path.join(
         os.tmpdir(),
-        'shell_pwd_abcdef.tmp',
+        "shell_pwd_abcdef.tmp",
       )}"; exit $__code`;
       expect(mockShellExecutionService).toHaveBeenCalledWith(
         wrappedCommand,
-        '/test/dir',
+        "/test/dir",
         expect.any(Function),
         expect.any(Object),
         false, // enableInteractiveShell
@@ -286,8 +259,8 @@ describe('useShellCommandProcessor', () => {
       // Simulate first output chunk
       act(() => {
         mockShellOutputCallback({
-          type: 'data',
-          chunk: 'hello',
+          type: "data",
+          chunk: "hello",
         });
       });
       // A UI update should have occurred.
@@ -295,13 +268,13 @@ describe('useShellCommandProcessor', () => {
 
       const streamUpdateFn1 = setPendingHistoryItemMock.mock.calls[2][0];
       const stateAfterStream1 = streamUpdateFn1(stateAfterPid);
-      expect(stateAfterStream1.tools[0].resultDisplay).toBe('hello');
+      expect(stateAfterStream1.tools[0].resultDisplay).toBe("hello");
 
       // Simulate second output chunk
       act(() => {
         mockShellOutputCallback({
-          type: 'data',
-          chunk: ' world',
+          type: "data",
+          chunk: " world",
         });
       });
       // Another UI update should have occurred.
@@ -309,34 +282,31 @@ describe('useShellCommandProcessor', () => {
 
       const streamUpdateFn2 = setPendingHistoryItemMock.mock.calls[3][0];
       const stateAfterStream2 = streamUpdateFn2(stateAfterStream1);
-      expect(stateAfterStream2.tools[0].resultDisplay).toBe('hello world');
+      expect(stateAfterStream2.tools[0].resultDisplay).toBe("hello world");
     });
 
-    it('should show binary progress messages correctly', async () => {
+    it("should show binary progress messages correctly", async () => {
       const { result } = renderProcessorHook();
       act(() => {
-        result.current.handleShellCommand(
-          'cat img',
-          new AbortController().signal,
-        );
+        result.current.handleShellCommand("cat img", new AbortController().signal);
       });
 
       // Should immediately show the detection message
       act(() => {
-        mockShellOutputCallback({ type: 'binary_detected' });
+        mockShellOutputCallback({ type: "binary_detected" });
       });
       await act(async () => {
         await vi.advanceTimersByTimeAsync(OUTPUT_UPDATE_INTERVAL_MS + 1);
       });
       // Send another event to trigger the update
       act(() => {
-        mockShellOutputCallback({ type: 'binary_progress', bytesReceived: 0 });
+        mockShellOutputCallback({ type: "binary_progress", bytesReceived: 0 });
       });
 
       // The state update is functional, so we test it by executing it.
       const updaterFn1 = setPendingHistoryItemMock.mock.lastCall?.[0];
       if (!updaterFn1) {
-        throw new Error('setPendingHistoryItem was not called');
+        throw new Error("setPendingHistoryItem was not called");
       }
       const initialState = setPendingHistoryItemMock.mock.calls[0][0];
       const stateAfterBinaryDetected = updaterFn1(initialState);
@@ -345,7 +315,7 @@ describe('useShellCommandProcessor', () => {
         expect.objectContaining({
           tools: [
             expect.objectContaining({
-              resultDisplay: '[Binary output detected. Halting stream...]',
+              resultDisplay: "[Binary output detected. Halting stream...]",
             }),
           ],
         }),
@@ -357,21 +327,21 @@ describe('useShellCommandProcessor', () => {
       });
       act(() => {
         mockShellOutputCallback({
-          type: 'binary_progress',
+          type: "binary_progress",
           bytesReceived: 2048,
         });
       });
 
       const updaterFn2 = setPendingHistoryItemMock.mock.lastCall?.[0];
       if (!updaterFn2) {
-        throw new Error('setPendingHistoryItem was not called');
+        throw new Error("setPendingHistoryItem was not called");
       }
       const stateAfterProgress = updaterFn2(stateAfterBinaryDetected);
       expect(stateAfterProgress).toEqual(
         expect.objectContaining({
           tools: [
             expect.objectContaining({
-              resultDisplay: '[Receiving binary output... 2.0 KB received]',
+              resultDisplay: "[Receiving binary output... 2.0 KB received]",
             }),
           ],
         }),
@@ -379,17 +349,17 @@ describe('useShellCommandProcessor', () => {
     });
   });
 
-  it('should not wrap the command on Windows', async () => {
-    vi.mocked(os.platform).mockReturnValue('win32');
+  it("should not wrap the command on Windows", async () => {
+    vi.mocked(os.platform).mockReturnValue("win32");
     const { result } = renderProcessorHook();
 
     await act(async () => {
-      result.current.handleShellCommand('dir', new AbortController().signal);
+      result.current.handleShellCommand("dir", new AbortController().signal);
     });
 
     expect(mockShellExecutionService).toHaveBeenCalledWith(
-      'dir',
-      '/test/dir',
+      "dir",
+      "/test/dir",
       expect.any(Function),
       expect.any(Object),
       false,
@@ -402,20 +372,18 @@ describe('useShellCommandProcessor', () => {
     await act(async () => await onExecMock.mock.calls[0][0]);
   });
 
-  it('should handle command abort and display cancelled status', async () => {
+  it("should handle command abort and display cancelled status", async () => {
     const { result } = renderProcessorHook();
     const abortController = new AbortController();
 
     act(() => {
-      result.current.handleShellCommand('sleep 5', abortController.signal);
+      result.current.handleShellCommand("sleep 5", abortController.signal);
     });
     const execPromise = onExecMock.mock.calls[0][0];
 
     act(() => {
       abortController.abort();
-      resolveExecutionPromise(
-        createMockServiceResult({ aborted: true, output: 'Canceled' }),
-      );
+      resolveExecutionPromise(createMockServiceResult({ aborted: true, output: "Canceled" }));
     });
     await act(async () => await execPromise);
 
@@ -426,46 +394,38 @@ describe('useShellCommandProcessor', () => {
     expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
   });
 
-  it('should handle binary output result correctly', async () => {
+  it("should handle binary output result correctly", async () => {
     const { result } = renderProcessorHook();
     const binaryBuffer = Buffer.from([0x89, 0x50, 0x4e, 0x47]);
     mockIsBinary.mockReturnValue(true);
 
     act(() => {
-      result.current.handleShellCommand(
-        'cat image.png',
-        new AbortController().signal,
-      );
+      result.current.handleShellCommand("cat image.png", new AbortController().signal);
     });
     const execPromise = onExecMock.mock.calls[0][0];
 
     act(() => {
-      resolveExecutionPromise(
-        createMockServiceResult({ rawOutput: binaryBuffer }),
-      );
+      resolveExecutionPromise(createMockServiceResult({ rawOutput: binaryBuffer }));
     });
     await act(async () => await execPromise);
 
     const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
     expect(finalHistoryItem.tools[0].status).toBe(ToolCallStatus.Success);
     expect(finalHistoryItem.tools[0].resultDisplay).toBe(
-      '[Command produced binary output, which is not shown.]',
+      "[Command produced binary output, which is not shown.]",
     );
   });
 
-  it('should handle promise rejection and show an error', async () => {
+  it("should handle promise rejection and show an error", async () => {
     const { result } = renderProcessorHook();
-    const testError = new Error('Unexpected failure');
+    const testError = new Error("Unexpected failure");
     mockShellExecutionService.mockImplementation(() => ({
       pid: 12345,
       result: Promise.reject(testError),
     }));
 
     act(() => {
-      result.current.handleShellCommand(
-        'a-command',
-        new AbortController().signal,
-      );
+      result.current.handleShellCommand("a-command", new AbortController().signal);
     });
     const execPromise = onExecMock.mock.calls[0][0];
 
@@ -474,14 +434,14 @@ describe('useShellCommandProcessor', () => {
     expect(setPendingHistoryItemMock).toHaveBeenCalledWith(null);
     expect(addItemToHistoryMock).toHaveBeenCalledTimes(2);
     expect(addItemToHistoryMock.mock.calls[1][0]).toEqual({
-      type: 'error',
-      text: 'An unexpected error occurred: Unexpected failure',
+      type: "error",
+      text: "An unexpected error occurred: Unexpected failure",
     });
     expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
   });
 
-  it('should handle synchronous errors during execution and clean up resources', async () => {
-    const testError = new Error('Synchronous spawn error');
+  it("should handle synchronous errors during execution and clean up resources", async () => {
+    const testError = new Error("Synchronous spawn error");
     mockShellExecutionService.mockImplementation(() => {
       throw testError;
     });
@@ -491,10 +451,7 @@ describe('useShellCommandProcessor', () => {
     const { result } = renderProcessorHook();
 
     act(() => {
-      result.current.handleShellCommand(
-        'a-command',
-        new AbortController().signal,
-      );
+      result.current.handleShellCommand("a-command", new AbortController().signal);
     });
     const execPromise = onExecMock.mock.calls[0][0];
 
@@ -503,27 +460,24 @@ describe('useShellCommandProcessor', () => {
     expect(setPendingHistoryItemMock).toHaveBeenCalledWith(null);
     expect(addItemToHistoryMock).toHaveBeenCalledTimes(2);
     expect(addItemToHistoryMock.mock.calls[1][0]).toEqual({
-      type: 'error',
-      text: 'An unexpected error occurred: Synchronous spawn error',
+      type: "error",
+      text: "An unexpected error occurred: Synchronous spawn error",
     });
-    const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
+    const tmpFile = path.join(os.tmpdir(), "shell_pwd_abcdef.tmp");
     // Verify that the temporary file was cleaned up
     expect(vi.mocked(fs.unlinkSync)).toHaveBeenCalledWith(tmpFile);
     expect(setShellInputFocusedMock).toHaveBeenCalledWith(false);
   });
 
-  describe('Directory Change Warning', () => {
-    it('should show a warning if the working directory changes', async () => {
-      const tmpFile = path.join(os.tmpdir(), 'shell_pwd_abcdef.tmp');
+  describe("Directory Change Warning", () => {
+    it("should show a warning if the working directory changes", async () => {
+      const tmpFile = path.join(os.tmpdir(), "shell_pwd_abcdef.tmp");
       vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue('/test/dir/new'); // A different directory
+      vi.mocked(fs.readFileSync).mockReturnValue("/test/dir/new"); // A different directory
 
       const { result } = renderProcessorHook();
       act(() => {
-        result.current.handleShellCommand(
-          'cd new',
-          new AbortController().signal,
-        );
+        result.current.handleShellCommand("cd new", new AbortController().signal);
       });
       const execPromise = onExecMock.mock.calls[0][0];
 
@@ -539,13 +493,13 @@ describe('useShellCommandProcessor', () => {
       expect(vi.mocked(fs.unlinkSync)).toHaveBeenCalledWith(tmpFile);
     });
 
-    it('should NOT show a warning if the directory does not change', async () => {
+    it("should NOT show a warning if the directory does not change", async () => {
       vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue('/test/dir'); // The same directory
+      vi.mocked(fs.readFileSync).mockReturnValue("/test/dir"); // The same directory
 
       const { result } = renderProcessorHook();
       act(() => {
-        result.current.handleShellCommand('ls', new AbortController().signal);
+        result.current.handleShellCommand("ls", new AbortController().signal);
       });
       const execPromise = onExecMock.mock.calls[0][0];
 
@@ -555,11 +509,11 @@ describe('useShellCommandProcessor', () => {
       await act(async () => await execPromise);
 
       const finalHistoryItem = addItemToHistoryMock.mock.calls[1][0];
-      expect(finalHistoryItem.tools[0].resultDisplay).not.toContain('WARNING');
+      expect(finalHistoryItem.tools[0].resultDisplay).not.toContain("WARNING");
     });
   });
 
-  describe('ActiveShellPtyId management', () => {
+  describe("ActiveShellPtyId management", () => {
     beforeEach(() => {
       // The real service returns a promise that resolves with the pid and result promise
       mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
@@ -573,26 +527,26 @@ describe('useShellCommandProcessor', () => {
       });
     });
 
-    it('should have activeShellPtyId as null initially', () => {
+    it("should have activeShellPtyId as null initially", () => {
       const { result } = renderProcessorHook();
       expect(result.current.activeShellPtyId).toBeNull();
     });
 
-    it('should set activeShellPtyId when a command with a PID starts', async () => {
+    it("should set activeShellPtyId when a command with a PID starts", async () => {
       const { result } = renderProcessorHook();
 
       await act(async () => {
-        result.current.handleShellCommand('ls', new AbortController().signal);
+        result.current.handleShellCommand("ls", new AbortController().signal);
       });
 
       expect(result.current.activeShellPtyId).toBe(12345);
     });
 
-    it('should update the pending history item with the ptyId', async () => {
+    it("should update the pending history item with the ptyId", async () => {
       const { result } = renderProcessorHook();
 
       await act(async () => {
-        result.current.handleShellCommand('ls', new AbortController().signal);
+        result.current.handleShellCommand("ls", new AbortController().signal);
       });
 
       await waitFor(() => {
@@ -602,7 +556,7 @@ describe('useShellCommandProcessor', () => {
 
       // The state update is functional, so we test it by executing it.
       const updaterFn = setPendingHistoryItemMock.mock.lastCall?.[0];
-      expect(typeof updaterFn).toBe('function');
+      expect(typeof updaterFn).toBe("function");
 
       // The initial state is the first call to setPendingHistoryItem
       const initialState = setPendingHistoryItemMock.mock.calls[0][0];
@@ -611,11 +565,11 @@ describe('useShellCommandProcessor', () => {
       expect(stateAfterPid.tools[0].ptyId).toBe(12345);
     });
 
-    it('should reset activeShellPtyId to null after successful execution', async () => {
+    it("should reset activeShellPtyId to null after successful execution", async () => {
       const { result } = renderProcessorHook();
 
       await act(async () => {
-        result.current.handleShellCommand('ls', new AbortController().signal);
+        result.current.handleShellCommand("ls", new AbortController().signal);
       });
       const execPromise = onExecMock.mock.calls[0][0];
 
@@ -629,14 +583,11 @@ describe('useShellCommandProcessor', () => {
       expect(result.current.activeShellPtyId).toBeNull();
     });
 
-    it('should reset activeShellPtyId to null after failed execution', async () => {
+    it("should reset activeShellPtyId to null after failed execution", async () => {
       const { result } = renderProcessorHook();
 
       await act(async () => {
-        result.current.handleShellCommand(
-          'bad-cmd',
-          new AbortController().signal,
-        );
+        result.current.handleShellCommand("bad-cmd", new AbortController().signal);
       });
       const execPromise = onExecMock.mock.calls[0][0];
 
@@ -650,7 +601,7 @@ describe('useShellCommandProcessor', () => {
       expect(result.current.activeShellPtyId).toBeNull();
     });
 
-    it('should reset activeShellPtyId to null if execution promise rejects', async () => {
+    it("should reset activeShellPtyId to null if execution promise rejects", async () => {
       let rejectResultPromise: (reason?: unknown) => void;
       mockShellExecutionService.mockImplementation(() =>
         Promise.resolve({
@@ -663,14 +614,14 @@ describe('useShellCommandProcessor', () => {
       const { result } = renderProcessorHook();
 
       await act(async () => {
-        result.current.handleShellCommand('cmd', new AbortController().signal);
+        result.current.handleShellCommand("cmd", new AbortController().signal);
       });
       const execPromise = onExecMock.mock.calls[0][0];
 
       expect(result.current.activeShellPtyId).toBe(12345);
 
       await act(async () => {
-        rejectResultPromise(new Error('Failure'));
+        rejectResultPromise(new Error("Failure"));
       });
 
       await act(async () => await execPromise);
@@ -678,16 +629,16 @@ describe('useShellCommandProcessor', () => {
       expect(result.current.activeShellPtyId).toBeNull();
     });
 
-    it('should not set activeShellPtyId on synchronous execution error and should remain null', async () => {
+    it("should not set activeShellPtyId on synchronous execution error and should remain null", async () => {
       mockShellExecutionService.mockImplementation(() => {
-        throw new Error('Sync Error');
+        throw new Error("Sync Error");
       });
       const { result } = renderProcessorHook();
 
       expect(result.current.activeShellPtyId).toBeNull(); // Pre-condition
 
       act(() => {
-        result.current.handleShellCommand('cmd', new AbortController().signal);
+        result.current.handleShellCommand("cmd", new AbortController().signal);
       });
       const execPromise = onExecMock.mock.calls[0][0];
 
@@ -700,7 +651,7 @@ describe('useShellCommandProcessor', () => {
       expect(result.current.activeShellPtyId).toBeNull();
     });
 
-    it('should not set activeShellPtyId if service does not return a PID', async () => {
+    it("should not set activeShellPtyId if service does not return a PID", async () => {
       mockShellExecutionService.mockImplementation((_cmd, _cwd, callback) => {
         mockShellOutputCallback = callback;
         return Promise.resolve({
@@ -714,7 +665,7 @@ describe('useShellCommandProcessor', () => {
       const { result } = renderProcessorHook();
 
       act(() => {
-        result.current.handleShellCommand('ls', new AbortController().signal);
+        result.current.handleShellCommand("ls", new AbortController().signal);
       });
 
       // Let microtasks run
diff --git a/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.ts b/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.ts
index 8c2390b89..fd3c4b897 100644
--- a/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.ts
+++ b/packages/ui-gemini/src/ui/hooks/shellCommandProcessor.ts
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  HistoryItemWithoutId,
-  IndividualToolCallDisplay,
-} from '../types.js';
-import { ToolCallStatus } from '../types.js';
-import { useCallback, useState } from 'react';
+import crypto from "node:crypto";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import type {
   AnsiOutput,
   Config,
   GeminiClient,
   ShellExecutionResult,
-} from '@airiscode/gemini-cli-core';
-import { isBinary, ShellExecutionService } from '@airiscode/gemini-cli-core';
-import { type PartListUnion } from '@google/genai';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { SHELL_COMMAND_NAME } from '../constants.js';
-import { formatMemoryUsage } from '../utils/formatters.js';
-import crypto from 'node:crypto';
-import path from 'node:path';
-import os from 'node:os';
-import fs from 'node:fs';
-import { themeManager } from '../../ui/themes/theme-manager.js';
+} from "@airiscode/gemini-cli-core";
+import { isBinary, ShellExecutionService } from "@airiscode/gemini-cli-core";
+import { type PartListUnion } from "@google/genai";
+import { useCallback, useState } from "react";
+import { themeManager } from "../../ui/themes/theme-manager.js";
+import { SHELL_COMMAND_NAME } from "../constants.js";
+import type { HistoryItemWithoutId, IndividualToolCallDisplay } from "../types.js";
+import { ToolCallStatus } from "../types.js";
+import { formatMemoryUsage } from "../utils/formatters.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 export const OUTPUT_UPDATE_INTERVAL_MS = 1000;
 const MAX_OUTPUT_LENGTH = 10000;
@@ -37,12 +34,12 @@ function addShellCommandToGeminiHistory(
 ) {
   const modelContent =
     resultText.length > MAX_OUTPUT_LENGTH
-      ? resultText.substring(0, MAX_OUTPUT_LENGTH) + '\n... (truncated)'
+      ? resultText.substring(0, MAX_OUTPUT_LENGTH) + "\n... (truncated)"
       : resultText;
 
   // eslint-disable-next-line @typescript-eslint/no-floating-promises
   geminiClient.addHistory({
-    role: 'user',
+    role: "user",
     parts: [
       {
         text: `I ran the following shell command:
@@ -64,10 +61,8 @@ ${modelContent}
  * Orchestrates command execution and updates history and agent context.
  */
 export const useShellCommandProcessor = (
-  addItemToHistory: UseHistoryManagerReturn['addItem'],
-  setPendingHistoryItem: React.Dispatch<
-    React.SetStateAction<HistoryItemWithoutId | null>
-  >,
+  addItemToHistory: UseHistoryManagerReturn["addItem"],
+  setPendingHistoryItem: React.Dispatch<React.SetStateAction<HistoryItemWithoutId | null>>,
   onExec: (command: Promise<void>) => void,
   onDebugMessage: (message: string) => void,
   config: Config,
@@ -81,18 +76,15 @@ export const useShellCommandProcessor = (
 
   const handleShellCommand = useCallback(
     (rawQuery: PartListUnion, abortSignal: AbortSignal): boolean => {
-      if (typeof rawQuery !== 'string' || rawQuery.trim() === '') {
+      if (typeof rawQuery !== "string" || rawQuery.trim() === "") {
         return false;
       }
 
       const userMessageTimestamp = Date.now();
       const callId = `shell-${userMessageTimestamp}`;
-      addItemToHistory(
-        { type: 'user_shell', text: rawQuery },
-        userMessageTimestamp,
-      );
+      addItemToHistory({ type: "user_shell", text: rawQuery }, userMessageTimestamp);
 
-      const isWindows = os.platform() === 'win32';
+      const isWindows = os.platform() === "win32";
       const targetDir = config.getTargetDir();
       let commandToExecute = rawQuery;
       let pwdFilePath: string | undefined;
@@ -100,19 +92,17 @@ export const useShellCommandProcessor = (
       // On non-windows, wrap the command to capture the final working directory.
       if (!isWindows) {
         let command = rawQuery.trim();
-        const pwdFileName = `shell_pwd_${crypto.randomBytes(6).toString('hex')}.tmp`;
+        const pwdFileName = `shell_pwd_${crypto.randomBytes(6).toString("hex")}.tmp`;
         pwdFilePath = path.join(os.tmpdir(), pwdFileName);
         // Ensure command ends with a separator before adding our own.
-        if (!command.endsWith(';') && !command.endsWith('&')) {
-          command += ';';
+        if (!command.endsWith(";") && !command.endsWith("&")) {
+          command += ";";
         }
         commandToExecute = `{ ${command} }; __code=$?; pwd > "${pwdFilePath}"; exit $__code`;
       }
 
-      const executeCommand = async (
-        resolve: (value: void | PromiseLike<void>) => void,
-      ) => {
-        let cumulativeStdout: string | AnsiOutput = '';
+      const executeCommand = async (resolve: (value: void | PromiseLike<void>) => void) => {
+        let cumulativeStdout: string | AnsiOutput = "";
         let isBinaryStream = false;
         let binaryBytesReceived = 0;
 
@@ -121,23 +111,21 @@ export const useShellCommandProcessor = (
           name: SHELL_COMMAND_NAME,
           description: rawQuery,
           status: ToolCallStatus.Executing,
-          resultDisplay: '',
+          resultDisplay: "",
           confirmationDetails: undefined,
         };
 
         setPendingHistoryItem({
-          type: 'tool_group',
+          type: "tool_group",
           tools: [initialToolDisplay],
         });
 
         let executionPid: number | undefined;
 
         const abortHandler = () => {
-          onDebugMessage(
-            `Aborting shell command (PID: ${executionPid ?? 'unknown'})`,
-          );
+          onDebugMessage(`Aborting shell command (PID: ${executionPid ?? "unknown"})`);
         };
-        abortSignal.addEventListener('abort', abortHandler, { once: true });
+        abortSignal.addEventListener("abort", abortHandler, { once: true });
 
         onDebugMessage(`Executing in ${targetDir}: ${commandToExecute}`);
 
@@ -157,7 +145,7 @@ export const useShellCommandProcessor = (
             (event) => {
               let shouldUpdate = false;
               switch (event.type) {
-                case 'data':
+                case "data":
                   // Do not process text data if we've already switched to binary mode.
                   if (isBinaryStream) break;
                   // PTY provides the full screen state, so we just replace.
@@ -166,25 +154,25 @@ export const useShellCommandProcessor = (
                     cumulativeStdout = event.chunk;
                     shouldUpdate = true;
                   } else if (
-                    typeof event.chunk === 'string' &&
-                    typeof cumulativeStdout === 'string'
+                    typeof event.chunk === "string" &&
+                    typeof cumulativeStdout === "string"
                   ) {
                     cumulativeStdout += event.chunk;
                     shouldUpdate = true;
                   }
                   break;
-                case 'binary_detected':
+                case "binary_detected":
                   isBinaryStream = true;
                   // Force an immediate UI update to show the binary detection message.
                   shouldUpdate = true;
                   break;
-                case 'binary_progress':
+                case "binary_progress":
                   isBinaryStream = true;
                   binaryBytesReceived = event.bytesReceived;
                   shouldUpdate = true;
                   break;
                 default: {
-                  throw new Error('An unhandled ShellOutputEvent was found.');
+                  throw new Error("An unhandled ShellOutputEvent was found.");
                 }
               }
 
@@ -196,8 +184,7 @@ export const useShellCommandProcessor = (
                     binaryBytesReceived,
                   )} received]`;
                 } else {
-                  currentDisplayOutput =
-                    '[Binary output detected. Halting stream...]';
+                  currentDisplayOutput = "[Binary output detected. Halting stream...]";
                 }
               } else {
                 currentDisplayOutput = cumulativeStdout;
@@ -207,7 +194,7 @@ export const useShellCommandProcessor = (
               if (shouldUpdate) {
                 setLastShellOutputTime(Date.now());
                 setPendingHistoryItem((prevItem) => {
-                  if (prevItem?.type === 'tool_group') {
+                  if (prevItem?.type === "tool_group") {
                     return {
                       ...prevItem,
                       tools: prevItem.tools.map((tool) =>
@@ -230,7 +217,7 @@ export const useShellCommandProcessor = (
           if (pid) {
             setActiveShellPtyId(pid);
             setPendingHistoryItem((prevItem) => {
-              if (prevItem?.type === 'tool_group') {
+              if (prevItem?.type === "tool_group") {
                 return {
                   ...prevItem,
                   tools: prevItem.tools.map((tool) =>
@@ -249,11 +236,9 @@ export const useShellCommandProcessor = (
               let mainContent: string;
 
               if (isBinary(result.rawOutput)) {
-                mainContent =
-                  '[Command produced binary output, which is not shown.]';
+                mainContent = "[Command produced binary output, which is not shown.]";
               } else {
-                mainContent =
-                  result.output.trim() || '(Command produced no output)';
+                mainContent = result.output.trim() || "(Command produced no output)";
               }
 
               let finalOutput = mainContent;
@@ -274,7 +259,7 @@ export const useShellCommandProcessor = (
               }
 
               if (pwdFilePath && fs.existsSync(pwdFilePath)) {
-                const finalPwd = fs.readFileSync(pwdFilePath, 'utf8').trim();
+                const finalPwd = fs.readFileSync(pwdFilePath, "utf8").trim();
                 if (finalPwd && finalPwd !== targetDir) {
                   const warning = `WARNING: shell mode is stateless; the directory change to '${finalPwd}' will not persist.`;
                   finalOutput = `${warning}\n\n${finalOutput}`;
@@ -293,7 +278,7 @@ export const useShellCommandProcessor = (
               if (finalStatus !== ToolCallStatus.Canceled) {
                 addItemToHistory(
                   {
-                    type: 'tool_group',
+                    type: "tool_group",
                     tools: [finalToolDisplay],
                   } as HistoryItemWithoutId,
                   userMessageTimestamp,
@@ -301,26 +286,21 @@ export const useShellCommandProcessor = (
               }
 
               // Add the same complete, contextual result to the LLM's history.
-              addShellCommandToGeminiHistory(
-                geminiClient,
-                rawQuery,
-                finalOutput,
-              );
+              addShellCommandToGeminiHistory(geminiClient, rawQuery, finalOutput);
             })
             .catch((err) => {
               setPendingHistoryItem(null);
-              const errorMessage =
-                err instanceof Error ? err.message : String(err);
+              const errorMessage = err instanceof Error ? err.message : String(err);
               addItemToHistory(
                 {
-                  type: 'error',
+                  type: "error",
                   text: `An unexpected error occurred: ${errorMessage}`,
                 },
                 userMessageTimestamp,
               );
             })
             .finally(() => {
-              abortSignal.removeEventListener('abort', abortHandler);
+              abortSignal.removeEventListener("abort", abortHandler);
               if (pwdFilePath && fs.existsSync(pwdFilePath)) {
                 fs.unlinkSync(pwdFilePath);
               }
@@ -334,7 +314,7 @@ export const useShellCommandProcessor = (
           const errorMessage = err instanceof Error ? err.message : String(err);
           addItemToHistory(
             {
-              type: 'error',
+              type: "error",
               text: `An unexpected error occurred: ${errorMessage}`,
             },
             userMessageTimestamp,
diff --git a/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.test.tsx b/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.test.tsx
index bcc9b4625..d1b725c36 100644
--- a/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.test.tsx
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useSlashCommandProcessor } from './slashCommandProcessor.js';
-import type {
-  CommandContext,
-  ConfirmShellCommandsActionReturn,
-  SlashCommand,
-} from '../commands/types.js';
-import { CommandKind } from '../commands/types.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { MessageType, type SlashCommandProcessorResult } from '../types.js';
-import { BuiltinCommandLoader } from '../../services/BuiltinCommandLoader.js';
-import { FileCommandLoader } from '../../services/FileCommandLoader.js';
-import { McpPromptLoader } from '../../services/McpPromptLoader.js';
 import {
   type GeminiClient,
+  makeFakeConfig,
   SlashCommandStatus,
   ToolConfirmationOutcome,
-  makeFakeConfig,
-} from '@airiscode/gemini-cli-core';
-import { appEvents } from '../../utils/events.js';
+} from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import { BuiltinCommandLoader } from "../../services/BuiltinCommandLoader.js";
+import { FileCommandLoader } from "../../services/FileCommandLoader.js";
+import { McpPromptLoader } from "../../services/McpPromptLoader.js";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import { appEvents } from "../../utils/events.js";
+import type {
+  CommandContext,
+  ConfirmShellCommandsActionReturn,
+  SlashCommand,
+} from "../commands/types.js";
+import { CommandKind } from "../commands/types.js";
+import { MessageType, type SlashCommandProcessorResult } from "../types.js";
+import { useSlashCommandProcessor } from "./slashCommandProcessor.js";
 
 const {
   logSlashCommand,
@@ -47,13 +47,12 @@ const {
   mockUseAlternateBuffer: vi.fn().mockReturnValue(false),
 }));
 
-vi.mock('./useAlternateBuffer.js', () => ({
+vi.mock("./useAlternateBuffer.js", () => ({
   useAlternateBuffer: mockUseAlternateBuffer,
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
 
   return {
     ...original,
@@ -69,11 +68,11 @@ const { mockProcessExit } = vi.hoisted(() => ({
   mockProcessExit: vi.fn((_code?: number): never => undefined as never),
 }));
 
-vi.mock('node:process', () => {
+vi.mock("node:process", () => {
   const mockProcess: Partial<NodeJS.Process> = {
     exit: mockProcessExit,
-    platform: 'sunos',
-    cwd: () => '/fake/dir',
+    platform: "sunos",
+    cwd: () => "/fake/dir",
   } as unknown as NodeJS.Process;
   return {
     ...mockProcess,
@@ -81,25 +80,25 @@ vi.mock('node:process', () => {
   };
 });
 
-vi.mock('../../services/BuiltinCommandLoader.js', () => ({
+vi.mock("../../services/BuiltinCommandLoader.js", () => ({
   BuiltinCommandLoader: vi.fn(() => ({
     loadCommands: mockBuiltinLoadCommands,
   })),
 }));
 
-vi.mock('../../services/FileCommandLoader.js', () => ({
+vi.mock("../../services/FileCommandLoader.js", () => ({
   FileCommandLoader: vi.fn(() => ({
     loadCommands: mockFileLoadCommands,
   })),
 }));
 
-vi.mock('../../services/McpPromptLoader.js', () => ({
+vi.mock("../../services/McpPromptLoader.js", () => ({
   McpPromptLoader: vi.fn(() => ({
     loadCommands: mockMcpLoadCommands,
   })),
 }));
 
-vi.mock('../contexts/SessionContext.js', () => ({
+vi.mock("../contexts/SessionContext.js", () => ({
   useSessionStats: vi.fn(() => ({ stats: {} })),
 }));
 
@@ -107,7 +106,7 @@ const { mockRunExitCleanup } = vi.hoisted(() => ({
   mockRunExitCleanup: vi.fn(),
 }));
 
-vi.mock('../../utils/cleanup.js', () => ({
+vi.mock("../../utils/cleanup.js", () => ({
   runExitCleanup: mockRunExitCleanup,
 }));
 
@@ -116,14 +115,14 @@ function createTestCommand(
   kind: CommandKind = CommandKind.BUILT_IN,
 ): SlashCommand {
   return {
-    name: 'test',
-    description: 'a test command',
+    name: "test",
+    description: "a test command",
     kind,
     ...overrides,
   };
 }
 
-describe('useSlashCommandProcessor', () => {
+describe("useSlashCommandProcessor", () => {
   const mockAddItem = vi.fn();
   const mockClearItems = vi.fn();
   const mockLoadHistory = vi.fn();
@@ -148,7 +147,7 @@ describe('useSlashCommandProcessor', () => {
       addStatusChangeListener: vi.fn(),
       removeStatusChangeListener: vi.fn(),
     });
-    vi.spyOn(console, 'clear').mockImplementation(() => {});
+    vi.spyOn(console, "clear").mockImplementation(() => {});
   });
 
   afterEach(async () => {
@@ -228,11 +227,11 @@ describe('useSlashCommandProcessor', () => {
     };
   };
 
-  describe('Console Clear Safety', () => {
-    it('should not call console.clear if alternate buffer is active', async () => {
+  describe("Console Clear Safety", () => {
+    it("should not call console.clear if alternate buffer is active", async () => {
       mockUseAlternateBuffer.mockReturnValue(true);
       const clearCommand = createTestCommand({
-        name: 'clear',
+        name: "clear",
         action: async (context) => {
           context.ui.clear();
         },
@@ -240,17 +239,17 @@ describe('useSlashCommandProcessor', () => {
       const result = await setupProcessorHook([clearCommand]);
 
       await act(async () => {
-        await result.current.handleSlashCommand('/clear');
+        await result.current.handleSlashCommand("/clear");
       });
 
       expect(mockClearItems).toHaveBeenCalled();
       expect(console.clear).not.toHaveBeenCalled();
     });
 
-    it('should call console.clear if alternate buffer is not active', async () => {
+    it("should call console.clear if alternate buffer is not active", async () => {
       mockUseAlternateBuffer.mockReturnValue(false);
       const clearCommand = createTestCommand({
-        name: 'clear',
+        name: "clear",
         action: async (context) => {
           context.ui.clear();
         },
@@ -258,7 +257,7 @@ describe('useSlashCommandProcessor', () => {
       const result = await setupProcessorHook([clearCommand]);
 
       await act(async () => {
-        await result.current.handleSlashCommand('/clear');
+        await result.current.handleSlashCommand("/clear");
       });
 
       expect(mockClearItems).toHaveBeenCalled();
@@ -266,30 +265,30 @@ describe('useSlashCommandProcessor', () => {
     });
   });
 
-  describe('Initialization and Command Loading', () => {
-    it('should initialize CommandService with all required loaders', async () => {
+  describe("Initialization and Command Loading", () => {
+    it("should initialize CommandService with all required loaders", async () => {
       await setupProcessorHook();
       expect(BuiltinCommandLoader).toHaveBeenCalledWith(mockConfig);
       expect(FileCommandLoader).toHaveBeenCalledWith(mockConfig);
       expect(McpPromptLoader).toHaveBeenCalledWith(mockConfig);
     });
 
-    it('should call loadCommands and populate state after mounting', async () => {
-      const testCommand = createTestCommand({ name: 'test' });
+    it("should call loadCommands and populate state after mounting", async () => {
+      const testCommand = createTestCommand({ name: "test" });
       const result = await setupProcessorHook([testCommand]);
 
       await waitFor(() => {
         expect(result.current.slashCommands).toHaveLength(1);
       });
 
-      expect(result.current.slashCommands?.[0]?.name).toBe('test');
+      expect(result.current.slashCommands?.[0]?.name).toBe("test");
       expect(mockBuiltinLoadCommands).toHaveBeenCalledTimes(1);
       expect(mockFileLoadCommands).toHaveBeenCalledTimes(1);
       expect(mockMcpLoadCommands).toHaveBeenCalledTimes(1);
     });
 
-    it('should provide an immutable array of commands to consumers', async () => {
-      const testCommand = createTestCommand({ name: 'test' });
+    it("should provide an immutable array of commands to consumers", async () => {
+      const testCommand = createTestCommand({ name: "test" });
       const result = await setupProcessorHook([testCommand]);
 
       await waitFor(() => {
@@ -300,21 +299,21 @@ describe('useSlashCommandProcessor', () => {
 
       expect(() => {
         // @ts-expect-error - We are intentionally testing a violation of the readonly type.
-        commands.push(createTestCommand({ name: 'rogue' }));
+        commands.push(createTestCommand({ name: "rogue" }));
       }).toThrow(TypeError);
     });
 
-    it('should override built-in commands with file-based commands of the same name', async () => {
+    it("should override built-in commands with file-based commands of the same name", async () => {
       const builtinAction = vi.fn();
       const fileAction = vi.fn();
 
       const builtinCommand = createTestCommand({
-        name: 'override',
-        description: 'builtin',
+        name: "override",
+        description: "builtin",
         action: builtinAction,
       });
       const fileCommand = createTestCommand(
-        { name: 'override', description: 'file', action: fileAction },
+        { name: "override", description: "file", action: fileAction },
         CommandKind.FILE,
       );
 
@@ -326,7 +325,7 @@ describe('useSlashCommandProcessor', () => {
       });
 
       await act(async () => {
-        await result.current.handleSlashCommand('/override');
+        await result.current.handleSlashCommand("/override");
       });
 
       // Only the file-based command's action should be called.
@@ -335,13 +334,13 @@ describe('useSlashCommandProcessor', () => {
     });
   });
 
-  describe('Command Execution Logic', () => {
-    it('should display an error for an unknown command', async () => {
+  describe("Command Execution Logic", () => {
+    it("should display an error for an unknown command", async () => {
       const result = await setupProcessorHook();
       await waitFor(() => expect(result.current.slashCommands).toBeDefined());
 
       await act(async () => {
-        await result.current.handleSlashCommand('/nonexistent');
+        await result.current.handleSlashCommand("/nonexistent");
       });
 
       // Expect 2 calls: one for the user's input, one for the error message.
@@ -349,21 +348,21 @@ describe('useSlashCommandProcessor', () => {
       expect(mockAddItem).toHaveBeenLastCalledWith(
         {
           type: MessageType.ERROR,
-          text: 'Unknown command: /nonexistent',
+          text: "Unknown command: /nonexistent",
         },
         expect.any(Number),
       );
     });
 
-    it('should display help for a parent command invoked without a subcommand', async () => {
+    it("should display help for a parent command invoked without a subcommand", async () => {
       const parentCommand: SlashCommand = {
-        name: 'parent',
-        description: 'a parent command',
+        name: "parent",
+        description: "a parent command",
         kind: CommandKind.BUILT_IN,
         subCommands: [
           {
-            name: 'child1',
-            description: 'First child.',
+            name: "child1",
+            description: "First child.",
             kind: CommandKind.BUILT_IN,
           },
         ],
@@ -372,31 +371,29 @@ describe('useSlashCommandProcessor', () => {
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        await result.current.handleSlashCommand('/parent');
+        await result.current.handleSlashCommand("/parent");
       });
 
       expect(mockAddItem).toHaveBeenCalledTimes(2);
       expect(mockAddItem).toHaveBeenLastCalledWith(
         {
           type: MessageType.INFO,
-          text: expect.stringContaining(
-            "Command '/parent' requires a subcommand.",
-          ),
+          text: expect.stringContaining("Command '/parent' requires a subcommand."),
         },
         expect.any(Number),
       );
     });
 
-    it('should correctly find and execute a nested subcommand', async () => {
+    it("should correctly find and execute a nested subcommand", async () => {
       const childAction = vi.fn();
       const parentCommand: SlashCommand = {
-        name: 'parent',
-        description: 'a parent command',
+        name: "parent",
+        description: "a parent command",
         kind: CommandKind.BUILT_IN,
         subCommands: [
           {
-            name: 'child',
-            description: 'a child command',
+            name: "child",
+            description: "a child command",
             kind: CommandKind.BUILT_IN,
             action: childAction,
           },
@@ -406,7 +403,7 @@ describe('useSlashCommandProcessor', () => {
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        await result.current.handleSlashCommand('/parent child with args');
+        await result.current.handleSlashCommand("/parent child with args");
       });
 
       expect(childAction).toHaveBeenCalledTimes(1);
@@ -420,62 +417,52 @@ describe('useSlashCommandProcessor', () => {
             addItem: mockAddItem,
           }),
         }),
-        'with args',
+        "with args",
       );
     });
 
-    it('sets isProcessing to false if the the input is not a command', async () => {
+    it("sets isProcessing to false if the the input is not a command", async () => {
       const setMockIsProcessing = vi.fn();
       const result = await setupProcessorHook([], [], [], setMockIsProcessing);
 
       await act(async () => {
-        await result.current.handleSlashCommand('imnotacommand');
+        await result.current.handleSlashCommand("imnotacommand");
       });
 
       expect(setMockIsProcessing).not.toHaveBeenCalled();
     });
 
-    it('sets isProcessing to false if the command has an error', async () => {
+    it("sets isProcessing to false if the command has an error", async () => {
       const setMockIsProcessing = vi.fn();
       const failCommand = createTestCommand({
-        name: 'fail',
-        action: vi.fn().mockRejectedValue(new Error('oh no!')),
+        name: "fail",
+        action: vi.fn().mockRejectedValue(new Error("oh no!")),
       });
 
-      const result = await setupProcessorHook(
-        [failCommand],
-        [],
-        [],
-        setMockIsProcessing,
-      );
+      const result = await setupProcessorHook([failCommand], [], [], setMockIsProcessing);
 
       await waitFor(() => expect(result.current.slashCommands).toBeDefined());
 
       await act(async () => {
-        await result.current.handleSlashCommand('/fail');
+        await result.current.handleSlashCommand("/fail");
       });
 
       expect(setMockIsProcessing).toHaveBeenNthCalledWith(1, true);
       expect(setMockIsProcessing).toHaveBeenNthCalledWith(2, false);
     });
 
-    it('should set isProcessing to true during execution and false afterwards', async () => {
+    it("should set isProcessing to true during execution and false afterwards", async () => {
       const mockSetIsProcessing = vi.fn();
       const command = createTestCommand({
-        name: 'long-running',
+        name: "long-running",
         action: () => new Promise((resolve) => setTimeout(resolve, 50)),
       });
 
-      const result = await setupProcessorHook(
-        [command],
-        [],
-        [],
-        mockSetIsProcessing,
-      );
+      const result = await setupProcessorHook([command], [], [], mockSetIsProcessing);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       const executionPromise = act(async () => {
-        await result.current.handleSlashCommand('/long-running');
+        await result.current.handleSlashCommand("/long-running");
       });
 
       // It should be true immediately after starting
@@ -491,40 +478,37 @@ describe('useSlashCommandProcessor', () => {
     });
   });
 
-  describe('Action Result Handling', () => {
-    describe('Dialog actions', () => {
+  describe("Action Result Handling", () => {
+    describe("Dialog actions", () => {
       it.each([
         {
-          dialogType: 'theme',
-          commandName: 'themecmd',
+          dialogType: "theme",
+          commandName: "themecmd",
           mockFn: mockOpenThemeDialog,
         },
         {
-          dialogType: 'model',
-          commandName: 'modelcmd',
+          dialogType: "model",
+          commandName: "modelcmd",
           mockFn: mockOpenModelDialog,
         },
-      ])(
-        'should handle "dialog: $dialogType" action',
-        async ({ dialogType, commandName, mockFn }) => {
-          const command = createTestCommand({
-            name: commandName,
-            action: vi
-              .fn()
-              .mockResolvedValue({ type: 'dialog', dialog: dialogType }),
-          });
-          const result = await setupProcessorHook([command]);
-          await waitFor(() =>
-            expect(result.current.slashCommands).toHaveLength(1),
-          );
-
-          await act(async () => {
-            await result.current.handleSlashCommand(`/${commandName}`);
-          });
-
-          expect(mockFn).toHaveBeenCalled();
-        },
-      );
+      ])('should handle "dialog: $dialogType" action', async ({
+        dialogType,
+        commandName,
+        mockFn,
+      }) => {
+        const command = createTestCommand({
+          name: commandName,
+          action: vi.fn().mockResolvedValue({ type: "dialog", dialog: dialogType }),
+        });
+        const result = await setupProcessorHook([command]);
+        await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
+
+        await act(async () => {
+          await result.current.handleSlashCommand(`/${commandName}`);
+        });
+
+        expect(mockFn).toHaveBeenCalled();
+      });
     });
 
     it('should handle "load_history" action', async () => {
@@ -532,36 +516,34 @@ describe('useSlashCommandProcessor', () => {
         setHistory: vi.fn(),
         stripThoughtsFromHistory: vi.fn(),
       } as unknown as GeminiClient;
-      vi.spyOn(mockConfig, 'getGeminiClient').mockReturnValue(mockClient);
+      vi.spyOn(mockConfig, "getGeminiClient").mockReturnValue(mockClient);
 
       const command = createTestCommand({
-        name: 'load',
+        name: "load",
         action: vi.fn().mockResolvedValue({
-          type: 'load_history',
-          history: [{ type: MessageType.USER, text: 'old prompt' }],
-          clientHistory: [{ role: 'user', parts: [{ text: 'old prompt' }] }],
+          type: "load_history",
+          history: [{ type: MessageType.USER, text: "old prompt" }],
+          clientHistory: [{ role: "user", parts: [{ text: "old prompt" }] }],
         }),
       });
       const result = await setupProcessorHook([command]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        await result.current.handleSlashCommand('/load');
+        await result.current.handleSlashCommand("/load");
       });
 
       expect(mockClearItems).toHaveBeenCalledTimes(1);
       expect(mockAddItem).toHaveBeenCalledWith(
-        { type: 'user', text: 'old prompt' },
+        { type: "user", text: "old prompt" },
         expect.any(Number),
       );
     });
 
     it('should handle a "quit" action', async () => {
-      const quitAction = vi
-        .fn()
-        .mockResolvedValue({ type: 'quit', messages: ['bye'] });
+      const quitAction = vi.fn().mockResolvedValue({ type: "quit", messages: ["bye"] });
       const command = createTestCommand({
-        name: 'exit',
+        name: "exit",
         action: quitAction,
       });
       const result = await setupProcessorHook([command]);
@@ -569,19 +551,19 @@ describe('useSlashCommandProcessor', () => {
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        await result.current.handleSlashCommand('/exit');
+        await result.current.handleSlashCommand("/exit");
       });
 
-      expect(mockSetQuittingMessages).toHaveBeenCalledWith(['bye']);
+      expect(mockSetQuittingMessages).toHaveBeenCalledWith(["bye"]);
     });
     it('should handle "submit_prompt" action returned from a file-based command', async () => {
       const fileCommand = createTestCommand(
         {
-          name: 'filecmd',
-          description: 'A command from a file',
+          name: "filecmd",
+          description: "A command from a file",
           action: async () => ({
-            type: 'submit_prompt',
-            content: [{ text: 'The actual prompt from the TOML file.' }],
+            type: "submit_prompt",
+            content: [{ text: "The actual prompt from the TOML file." }],
           }),
         },
         CommandKind.FILE,
@@ -592,16 +574,16 @@ describe('useSlashCommandProcessor', () => {
 
       let actionResult;
       await act(async () => {
-        actionResult = await result.current.handleSlashCommand('/filecmd');
+        actionResult = await result.current.handleSlashCommand("/filecmd");
       });
 
       expect(actionResult).toEqual({
-        type: 'submit_prompt',
-        content: [{ text: 'The actual prompt from the TOML file.' }],
+        type: "submit_prompt",
+        content: [{ text: "The actual prompt from the TOML file." }],
       });
 
       expect(mockAddItem).toHaveBeenCalledWith(
-        { type: MessageType.USER, text: '/filecmd' },
+        { type: MessageType.USER, text: "/filecmd" },
         expect.any(Number),
       );
     });
@@ -609,11 +591,11 @@ describe('useSlashCommandProcessor', () => {
     it('should handle "submit_prompt" action returned from a mcp-based command', async () => {
       const mcpCommand = createTestCommand(
         {
-          name: 'mcpcmd',
-          description: 'A command from mcp',
+          name: "mcpcmd",
+          description: "A command from mcp",
           action: async () => ({
-            type: 'submit_prompt',
-            content: [{ text: 'The actual prompt from the mcp command.' }],
+            type: "submit_prompt",
+            content: [{ text: "The actual prompt from the mcp command." }],
           }),
         },
         CommandKind.MCP_PROMPT,
@@ -624,27 +606,27 @@ describe('useSlashCommandProcessor', () => {
 
       let actionResult;
       await act(async () => {
-        actionResult = await result.current.handleSlashCommand('/mcpcmd');
+        actionResult = await result.current.handleSlashCommand("/mcpcmd");
       });
 
       expect(actionResult).toEqual({
-        type: 'submit_prompt',
-        content: [{ text: 'The actual prompt from the mcp command.' }],
+        type: "submit_prompt",
+        content: [{ text: "The actual prompt from the mcp command." }],
       });
 
       expect(mockAddItem).toHaveBeenCalledWith(
-        { type: MessageType.USER, text: '/mcpcmd' },
+        { type: MessageType.USER, text: "/mcpcmd" },
         expect.any(Number),
       );
     });
   });
 
-  describe('Shell Command Confirmation Flow', () => {
+  describe("Shell Command Confirmation Flow", () => {
     // Use a generic vi.fn() for the action. We will change its behavior in each test.
     const mockCommandAction = vi.fn();
 
     const shellCommand = createTestCommand({
-      name: 'shellcmd',
+      name: "shellcmd",
       action: mockCommandAction,
     });
 
@@ -654,19 +636,19 @@ describe('useSlashCommandProcessor', () => {
 
       // Default behavior: request confirmation
       mockCommandAction.mockResolvedValue({
-        type: 'confirm_shell_commands',
-        commandsToConfirm: ['rm -rf /'],
-        originalInvocation: { raw: '/shellcmd' },
+        type: "confirm_shell_commands",
+        commandsToConfirm: ["rm -rf /"],
+        originalInvocation: { raw: "/shellcmd" },
       } as ConfirmShellCommandsActionReturn);
     });
 
-    it('should set confirmation request when action returns confirm_shell_commands', async () => {
+    it("should set confirmation request when action returns confirm_shell_commands", async () => {
       const result = await setupProcessorHook([shellCommand]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       // Trigger command, don't await it yet as it suspends for confirmation
       await act(async () => {
-        void result.current.handleSlashCommand('/shellcmd');
+        void result.current.handleSlashCommand("/shellcmd");
       });
 
       // We now wait for the state to be updated with the request.
@@ -676,17 +658,15 @@ describe('useSlashCommandProcessor', () => {
         });
       });
 
-      expect(result.current.shellConfirmationRequest?.commands).toEqual([
-        'rm -rf /',
-      ]);
+      expect(result.current.shellConfirmationRequest?.commands).toEqual(["rm -rf /"]);
     });
 
-    it('should do nothing if user cancels confirmation', async () => {
+    it("should do nothing if user cancels confirmation", async () => {
       const result = await setupProcessorHook([shellCommand]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        void result.current.handleSlashCommand('/shellcmd');
+        void result.current.handleSlashCommand("/shellcmd");
       });
 
       // Wait for the confirmation dialog to be set
@@ -702,9 +682,9 @@ describe('useSlashCommandProcessor', () => {
       // Change the mock action's behavior for a potential second run.
       // If the test is flawed, this will be called, and we can detect it.
       mockCommandAction.mockResolvedValue({
-        type: 'message',
-        messageType: 'info',
-        content: 'This should not be called',
+        type: "message",
+        messageType: "info",
+        content: "This should not be called",
       });
 
       await act(async () => {
@@ -720,11 +700,9 @@ describe('useSlashCommandProcessor', () => {
       const result = await setupProcessorHook([shellCommand]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
-      let commandPromise:
-        | Promise<false | SlashCommandProcessorResult>
-        | undefined;
+      let commandPromise: Promise<false | SlashCommandProcessorResult> | undefined;
       await act(async () => {
-        commandPromise = result.current.handleSlashCommand('/shellcmd');
+        commandPromise = result.current.handleSlashCommand("/shellcmd");
       });
       await act(async () => {
         await waitFor(() => {
@@ -737,13 +715,13 @@ describe('useSlashCommandProcessor', () => {
       // **Change the mock's behavior for the SECOND run.**
       // This is the key to testing the outcome.
       mockCommandAction.mockResolvedValue({
-        type: 'message',
-        messageType: 'info',
-        content: 'Success!',
+        type: "message",
+        messageType: "info",
+        content: "Success!",
       });
 
       await act(async () => {
-        onConfirm!(ToolConfirmationOutcome.ProceedOnce, ['rm -rf /']);
+        onConfirm!(ToolConfirmationOutcome.ProceedOnce, ["rm -rf /"]);
       });
 
       await act(async () => {
@@ -758,22 +736,19 @@ describe('useSlashCommandProcessor', () => {
       });
 
       // We can inspect the context of the second call to ensure the one-time list was used.
-      const secondCallContext = mockCommandAction.mock
-        .calls[1][0] as CommandContext;
-      expect(
-        secondCallContext.session.sessionShellAllowlist.has('rm -rf /'),
-      ).toBe(true);
+      const secondCallContext = mockCommandAction.mock.calls[1][0] as CommandContext;
+      expect(secondCallContext.session.sessionShellAllowlist.has("rm -rf /")).toBe(true);
 
       // Verify the final success message was added.
       expect(mockAddItem).toHaveBeenCalledWith(
-        { type: MessageType.INFO, text: 'Success!' },
+        { type: MessageType.INFO, text: "Success!" },
         expect.any(Number),
       );
 
       // Verify the session-wide allowlist was NOT permanently updated.
       // Re-render the hook by calling a no-op command to get the latest context.
       await act(async () => {
-        await result.current.handleSlashCommand('/no-op');
+        await result.current.handleSlashCommand("/no-op");
       });
       const finalContext = result.current.commandContext;
       expect(finalContext.session.sessionShellAllowlist.size).toBe(0);
@@ -783,11 +758,9 @@ describe('useSlashCommandProcessor', () => {
       const result = await setupProcessorHook([shellCommand]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
-      let commandPromise:
-        | Promise<false | SlashCommandProcessorResult>
-        | undefined;
+      let commandPromise: Promise<false | SlashCommandProcessorResult> | undefined;
       await act(async () => {
-        commandPromise = result.current.handleSlashCommand('/shellcmd');
+        commandPromise = result.current.handleSlashCommand("/shellcmd");
       });
       await act(async () => {
         await waitFor(() => {
@@ -797,13 +770,13 @@ describe('useSlashCommandProcessor', () => {
 
       const onConfirm = result.current.shellConfirmationRequest?.onConfirm;
       mockCommandAction.mockResolvedValue({
-        type: 'message',
-        messageType: 'info',
-        content: 'Success!',
+        type: "message",
+        messageType: "info",
+        content: "Success!",
       });
 
       await act(async () => {
-        onConfirm!(ToolConfirmationOutcome.ProceedAlways, ['rm -rf /']);
+        onConfirm!(ToolConfirmationOutcome.ProceedAlways, ["rm -rf /"]);
       });
 
       await act(async () => {
@@ -816,54 +789,52 @@ describe('useSlashCommandProcessor', () => {
       });
 
       expect(mockAddItem).toHaveBeenCalledWith(
-        { type: MessageType.INFO, text: 'Success!' },
+        { type: MessageType.INFO, text: "Success!" },
         expect.any(Number),
       );
 
       // Check that the session-wide allowlist WAS updated.
       await waitFor(() => {
         const finalContext = result.current.commandContext;
-        expect(finalContext.session.sessionShellAllowlist.has('rm -rf /')).toBe(
-          true,
-        );
+        expect(finalContext.session.sessionShellAllowlist.has("rm -rf /")).toBe(true);
       });
     });
   });
 
-  describe('Command Parsing and Matching', () => {
-    it('should be case-sensitive', async () => {
-      const command = createTestCommand({ name: 'test' });
+  describe("Command Parsing and Matching", () => {
+    it("should be case-sensitive", async () => {
+      const command = createTestCommand({ name: "test" });
       const result = await setupProcessorHook([command]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
         // Use uppercase when command is lowercase
-        await result.current.handleSlashCommand('/Test');
+        await result.current.handleSlashCommand("/Test");
       });
 
       // It should fail and call addItem with an error
       expect(mockAddItem).toHaveBeenCalledWith(
         {
           type: MessageType.ERROR,
-          text: 'Unknown command: /Test',
+          text: "Unknown command: /Test",
         },
         expect.any(Number),
       );
     });
 
-    it('should correctly match an altName', async () => {
+    it("should correctly match an altName", async () => {
       const action = vi.fn();
       const command = createTestCommand({
-        name: 'main',
-        altNames: ['alias'],
-        description: 'a command with an alias',
+        name: "main",
+        altNames: ["alias"],
+        description: "a command with an alias",
         action,
       });
       const result = await setupProcessorHook([command]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        await result.current.handleSlashCommand('/alias');
+        await result.current.handleSlashCommand("/alias");
       });
 
       expect(action).toHaveBeenCalledTimes(1);
@@ -872,48 +843,48 @@ describe('useSlashCommandProcessor', () => {
       );
     });
 
-    it('should handle extra whitespace around the command', async () => {
+    it("should handle extra whitespace around the command", async () => {
       const action = vi.fn();
-      const command = createTestCommand({ name: 'test', action });
+      const command = createTestCommand({ name: "test", action });
       const result = await setupProcessorHook([command]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        await result.current.handleSlashCommand('  /test  with-args  ');
+        await result.current.handleSlashCommand("  /test  with-args  ");
       });
 
-      expect(action).toHaveBeenCalledWith(expect.anything(), 'with-args');
+      expect(action).toHaveBeenCalledWith(expect.anything(), "with-args");
     });
 
-    it('should handle `?` as a command prefix', async () => {
+    it("should handle `?` as a command prefix", async () => {
       const action = vi.fn();
-      const command = createTestCommand({ name: 'help', action });
+      const command = createTestCommand({ name: "help", action });
       const result = await setupProcessorHook([command]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(1));
 
       await act(async () => {
-        await result.current.handleSlashCommand('?help');
+        await result.current.handleSlashCommand("?help");
       });
 
       expect(action).toHaveBeenCalledTimes(1);
     });
   });
 
-  describe('Command Precedence', () => {
-    it('should override mcp-based commands with file-based commands of the same name', async () => {
+  describe("Command Precedence", () => {
+    it("should override mcp-based commands with file-based commands of the same name", async () => {
       const mcpAction = vi.fn();
       const fileAction = vi.fn();
 
       const mcpCommand = createTestCommand(
         {
-          name: 'override',
-          description: 'mcp',
+          name: "override",
+          description: "mcp",
           action: mcpAction,
         },
         CommandKind.MCP_PROMPT,
       );
       const fileCommand = createTestCommand(
-        { name: 'override', description: 'file', action: fileAction },
+        { name: "override", description: "file", action: fileAction },
         CommandKind.FILE,
       );
 
@@ -925,7 +896,7 @@ describe('useSlashCommandProcessor', () => {
       });
 
       await act(async () => {
-        await result.current.handleSlashCommand('/override');
+        await result.current.handleSlashCommand("/override");
       });
 
       // Only the file-based command's action should be called.
@@ -933,19 +904,19 @@ describe('useSlashCommandProcessor', () => {
       expect(mcpAction).not.toHaveBeenCalled();
     });
 
-    it('should prioritize a command with a primary name over a command with a matching alias', async () => {
+    it("should prioritize a command with a primary name over a command with a matching alias", async () => {
       const quitAction = vi.fn();
       const exitAction = vi.fn();
 
       const quitCommand = createTestCommand({
-        name: 'quit',
-        altNames: ['exit'],
+        name: "quit",
+        altNames: ["exit"],
         action: quitAction,
       });
 
       const exitCommand = createTestCommand(
         {
-          name: 'exit',
+          name: "exit",
           action: exitAction,
         },
         CommandKind.FILE,
@@ -960,7 +931,7 @@ describe('useSlashCommandProcessor', () => {
       });
 
       await act(async () => {
-        await result.current.handleSlashCommand('/exit');
+        await result.current.handleSlashCommand("/exit");
       });
 
       // The action for the command whose primary name is 'exit' should be called.
@@ -969,35 +940,32 @@ describe('useSlashCommandProcessor', () => {
       expect(quitAction).not.toHaveBeenCalled();
     });
 
-    it('should add an overridden command to the history', async () => {
+    it("should add an overridden command to the history", async () => {
       const quitCommand = createTestCommand({
-        name: 'quit',
-        altNames: ['exit'],
+        name: "quit",
+        altNames: ["exit"],
         action: vi.fn(),
       });
-      const exitCommand = createTestCommand(
-        { name: 'exit', action: vi.fn() },
-        CommandKind.FILE,
-      );
+      const exitCommand = createTestCommand({ name: "exit", action: vi.fn() }, CommandKind.FILE);
 
       const result = await setupProcessorHook([quitCommand], [exitCommand]);
       await waitFor(() => expect(result.current.slashCommands).toHaveLength(2));
 
       await act(async () => {
-        await result.current.handleSlashCommand('/exit');
+        await result.current.handleSlashCommand("/exit");
       });
 
       // It should be added to the history.
       expect(mockAddItem).toHaveBeenCalledWith(
-        { type: MessageType.USER, text: '/exit' },
+        { type: MessageType.USER, text: "/exit" },
         expect.any(Number),
       );
     });
   });
 
-  describe('Lifecycle', () => {
-    it('should abort command loading when the hook unmounts', async () => {
-      const abortSpy = vi.spyOn(AbortController.prototype, 'abort');
+  describe("Lifecycle", () => {
+    it("should abort command loading when the hook unmounts", async () => {
+      const abortSpy = vi.spyOn(AbortController.prototype, "abort");
       const { unmount } = await setupProcessorHook();
 
       unmount();
@@ -1006,8 +974,8 @@ describe('useSlashCommandProcessor', () => {
     });
   });
 
-  describe('Slash Command Logging', () => {
-    const mockCommandAction = vi.fn().mockResolvedValue({ type: 'handled' });
+  describe("Slash Command Logging", () => {
+    const mockCommandAction = vi.fn().mockResolvedValue({ type: "handled" });
     let loggingTestCommands: SlashCommand[];
 
     beforeEach(() => {
@@ -1015,27 +983,25 @@ describe('useSlashCommandProcessor', () => {
       vi.mocked(logSlashCommand).mockClear();
       loggingTestCommands = [
         createTestCommand({
-          name: 'logtest',
-          action: vi
-            .fn()
-            .mockResolvedValue({ type: 'message', content: 'hello world' }),
+          name: "logtest",
+          action: vi.fn().mockResolvedValue({ type: "message", content: "hello world" }),
         }),
         createTestCommand({
-          name: 'logwithsub',
+          name: "logwithsub",
           subCommands: [
             createTestCommand({
-              name: 'sub',
+              name: "sub",
               action: mockCommandAction,
             }),
           ],
         }),
         createTestCommand({
-          name: 'fail',
-          action: vi.fn().mockRejectedValue(new Error('oh no!')),
+          name: "fail",
+          action: vi.fn().mockRejectedValue(new Error("oh no!")),
         }),
         createTestCommand({
-          name: 'logalias',
-          altNames: ['la'],
+          name: "logalias",
+          altNames: ["la"],
           action: mockCommandAction,
         }),
       ];
@@ -1043,39 +1009,39 @@ describe('useSlashCommandProcessor', () => {
 
     it.each([
       {
-        command: '/logtest',
+        command: "/logtest",
         expectedLog: {
-          command: 'logtest',
+          command: "logtest",
           subcommand: undefined,
           status: SlashCommandStatus.SUCCESS,
         },
-        desc: 'simple slash command',
+        desc: "simple slash command",
       },
       {
-        command: '/fail',
+        command: "/fail",
         expectedLog: {
-          command: 'fail',
-          status: 'error',
+          command: "fail",
+          status: "error",
           subcommand: undefined,
         },
-        desc: 'failure event for failed command',
+        desc: "failure event for failed command",
       },
       {
-        command: '/logwithsub sub',
+        command: "/logwithsub sub",
         expectedLog: {
-          command: 'logwithsub',
-          subcommand: 'sub',
+          command: "logwithsub",
+          subcommand: "sub",
         },
-        desc: 'slash command with subcommand',
+        desc: "slash command with subcommand",
       },
       {
-        command: '/la',
+        command: "/la",
         expectedLog: {
-          command: 'logalias',
+          command: "logalias",
         },
-        desc: 'command path when alias is used',
+        desc: "command path when alias is used",
       },
-    ])('should log $desc', async ({ command, expectedLog }) => {
+    ])("should log $desc", async ({ command, expectedLog }) => {
       const result = await setupProcessorHook(loggingTestCommands);
       await waitFor(() => expect(result.current.slashCommands).toBeDefined());
 
@@ -1092,9 +1058,9 @@ describe('useSlashCommandProcessor', () => {
     });
 
     it.each([
-      { command: '/bogusbogusbogus', desc: 'bogus command' },
-      { command: '/unknown', desc: 'unknown command' },
-    ])('should not log for $desc', async ({ command }) => {
+      { command: "/bogusbogusbogus", desc: "bogus command" },
+      { command: "/unknown", desc: "unknown command" },
+    ])("should not log for $desc", async ({ command }) => {
       const result = await setupProcessorHook(loggingTestCommands);
       await waitFor(() => expect(result.current.slashCommands).toBeDefined());
 
@@ -1106,14 +1072,14 @@ describe('useSlashCommandProcessor', () => {
     });
   });
 
-  it('should reload commands on extension events', async () => {
+  it("should reload commands on extension events", async () => {
     const result = await setupProcessorHook();
     await waitFor(() => expect(result.current.slashCommands).toEqual([]));
 
     // Create a new command and make that the result of the fileLoadCommands
     // (which is where extension commands come from)
     const newCommand = createTestCommand({
-      name: 'someNewCommand',
+      name: "someNewCommand",
       action: vi.fn(),
     });
     mockFileLoadCommands.mockResolvedValue([newCommand]);
@@ -1121,10 +1087,8 @@ describe('useSlashCommandProcessor', () => {
     // We should not see a change until we fire an event.
     await waitFor(() => expect(result.current.slashCommands).toEqual([]));
     await act(() => {
-      appEvents.emit('extensionsStarting');
+      appEvents.emit("extensionsStarting");
     });
-    await waitFor(() =>
-      expect(result.current.slashCommands).toEqual([newCommand]),
-    );
+    await waitFor(() => expect(result.current.slashCommands).toEqual([newCommand]));
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.ts b/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.ts
index 2e699e5a8..1e25b3da4 100644
--- a/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/ui-gemini/src/ui/hooks/slashCommandProcessor.ts
@@ -4,47 +4,44 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useMemo, useEffect, useState } from 'react';
-import { type PartListUnion } from '@google/genai';
-import process from 'node:process';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+import process from "node:process";
 import type {
   Config,
   ExtensionsStartingEvent,
   ExtensionsStoppingEvent,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
 import {
   GitService,
+  IdeClient,
   Logger,
   logSlashCommand,
   makeSlashCommandEvent,
   SlashCommandStatus,
-  ToolConfirmationOutcome,
   Storage,
-  IdeClient,
-} from '@airiscode/gemini-cli-core';
-import { useSessionStats } from '../contexts/SessionContext.js';
+  ToolConfirmationOutcome,
+} from "@airiscode/gemini-cli-core";
+import { type PartListUnion } from "@google/genai";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { BuiltinCommandLoader } from "../../services/BuiltinCommandLoader.js";
+import { CommandService } from "../../services/CommandService.js";
+import { FileCommandLoader } from "../../services/FileCommandLoader.js";
+import { McpPromptLoader } from "../../services/McpPromptLoader.js";
+import { parseSlashCommand } from "../../utils/commands.js";
+import { appEvents } from "../../utils/events.js";
+import { type CommandContext, type SlashCommand } from "../commands/types.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
+import { type ExtensionUpdateAction, type ExtensionUpdateStatus } from "../state/extensions.js";
 import type {
-  Message,
+  ConfirmationRequest,
+  HistoryItem,
   HistoryItemWithoutId,
+  Message,
   SlashCommandProcessorResult,
-  HistoryItem,
-  ConfirmationRequest,
-} from '../types.js';
-import { MessageType } from '../types.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { type CommandContext, type SlashCommand } from '../commands/types.js';
-import { CommandService } from '../../services/CommandService.js';
-import { BuiltinCommandLoader } from '../../services/BuiltinCommandLoader.js';
-import { FileCommandLoader } from '../../services/FileCommandLoader.js';
-import { McpPromptLoader } from '../../services/McpPromptLoader.js';
-import { parseSlashCommand } from '../../utils/commands.js';
-import {
-  type ExtensionUpdateAction,
-  type ExtensionUpdateStatus,
-} from '../state/extensions.js';
-import { appEvents } from '../../utils/events.js';
-import { useAlternateBuffer } from './useAlternateBuffer.js';
+} from "../types.js";
+import { MessageType } from "../types.js";
+import { useAlternateBuffer } from "./useAlternateBuffer.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 interface SlashCommandProcessorActions {
   openAuthDialog: () => void;
@@ -69,9 +66,9 @@ interface SlashCommandProcessorActions {
 export const useSlashCommandProcessor = (
   config: Config | null,
   settings: LoadedSettings,
-  addItem: UseHistoryManagerReturn['addItem'],
-  clearItems: UseHistoryManagerReturn['clearItems'],
-  loadHistory: UseHistoryManagerReturn['loadHistory'],
+  addItem: UseHistoryManagerReturn["addItem"],
+  clearItems: UseHistoryManagerReturn["clearItems"],
+  loadHistory: UseHistoryManagerReturn["loadHistory"],
   refreshStatic: () => void,
   toggleVimEnabled: () => Promise<boolean>,
   setIsProcessing: (isProcessing: boolean) => void,
@@ -82,31 +79,23 @@ export const useSlashCommandProcessor = (
   setCustomDialog: (dialog: React.ReactNode | null) => void,
 ) => {
   const session = useSessionStats();
-  const [commands, setCommands] = useState<readonly SlashCommand[] | undefined>(
-    undefined,
-  );
+  const [commands, setCommands] = useState<readonly SlashCommand[] | undefined>(undefined);
   const alternateBuffer = useAlternateBuffer();
   const [reloadTrigger, setReloadTrigger] = useState(0);
 
   const reloadCommands = useCallback(() => {
     setReloadTrigger((v) => v + 1);
   }, []);
-  const [shellConfirmationRequest, setShellConfirmationRequest] =
-    useState<null | {
-      commands: string[];
-      onConfirm: (
-        outcome: ToolConfirmationOutcome,
-        approvedCommands?: string[],
-      ) => void;
-    }>(null);
+  const [shellConfirmationRequest, setShellConfirmationRequest] = useState<null | {
+    commands: string[];
+    onConfirm: (outcome: ToolConfirmationOutcome, approvedCommands?: string[]) => void;
+  }>(null);
   const [confirmationRequest, setConfirmationRequest] = useState<null | {
     prompt: React.ReactNode;
     onConfirm: (confirmed: boolean) => void;
   }>(null);
 
-  const [sessionShellAllowlist, setSessionShellAllowlist] = useState(
-    new Set<string>(),
-  );
+  const [sessionShellAllowlist, setSessionShellAllowlist] = useState(new Set<string>());
   const gitService = useMemo(() => {
     if (!config?.getProjectRoot()) {
       return;
@@ -116,7 +105,7 @@ export const useSlashCommandProcessor = (
 
   const logger = useMemo(() => {
     const l = new Logger(
-      config?.getSessionId() || '',
+      config?.getSessionId() || "",
       config?.storage ?? new Storage(process.cwd()),
     );
     // The logger's initialize is async, but we can create the instance
@@ -124,9 +113,7 @@ export const useSlashCommandProcessor = (
     return l;
   }, [config]);
 
-  const [pendingItem, setPendingItem] = useState<HistoryItemWithoutId | null>(
-    null,
-  );
+  const [pendingItem, setPendingItem] = useState<HistoryItemWithoutId | null>(null);
 
   const pendingHistoryItems = useMemo(() => {
     const items: HistoryItemWithoutId[] = [];
@@ -142,7 +129,7 @@ export const useSlashCommandProcessor = (
       let historyItemContent: HistoryItemWithoutId;
       if (message.type === MessageType.ABOUT) {
         historyItemContent = {
-          type: 'about',
+          type: "about",
           cliVersion: message.cliVersion,
           osVersion: message.osVersion,
           sandboxEnv: message.sandboxEnv,
@@ -153,30 +140,30 @@ export const useSlashCommandProcessor = (
         };
       } else if (message.type === MessageType.HELP) {
         historyItemContent = {
-          type: 'help',
+          type: "help",
           timestamp: message.timestamp,
         };
       } else if (message.type === MessageType.STATS) {
         historyItemContent = {
-          type: 'stats',
+          type: "stats",
           duration: message.duration,
         };
       } else if (message.type === MessageType.MODEL_STATS) {
         historyItemContent = {
-          type: 'model_stats',
+          type: "model_stats",
         };
       } else if (message.type === MessageType.TOOL_STATS) {
         historyItemContent = {
-          type: 'tool_stats',
+          type: "tool_stats",
         };
       } else if (message.type === MessageType.QUIT) {
         historyItemContent = {
-          type: 'quit',
+          type: "quit",
           duration: message.duration,
         };
       } else if (message.type === MessageType.COMPRESSION) {
         historyItemContent = {
-          type: 'compression',
+          type: "compression",
           compression: message.compression,
         };
       } else {
@@ -217,8 +204,7 @@ export const useSlashCommandProcessor = (
         reloadCommands,
         extensionsUpdateState,
         dispatchExtensionStateUpdate: actions.dispatchExtensionStateUpdate,
-        addConfirmUpdateExtensionRequest:
-          actions.addConfirmUpdateExtensionRequest,
+        addConfirmUpdateExtensionRequest: actions.addConfirmUpdateExtensionRequest,
         removeComponent: () => setCustomDialog(null),
       },
       session: {
@@ -268,15 +254,13 @@ export const useSlashCommandProcessor = (
     // but the CommandService today is not conducive to that since it isn't a
     // long lived service but instead gets fully re-created based on reload
     // events within this hook.
-    const extensionEventListener = (
-      _event: ExtensionsStartingEvent | ExtensionsStoppingEvent,
-    ) => {
+    const extensionEventListener = (_event: ExtensionsStartingEvent | ExtensionsStoppingEvent) => {
       // We only care once at least one extension has completed
       // starting/stopping
       reloadCommands();
     };
-    appEvents.on('extensionsStarting', extensionEventListener);
-    appEvents.on('extensionsStopping', extensionEventListener);
+    appEvents.on("extensionsStarting", extensionEventListener);
+    appEvents.on("extensionsStopping", extensionEventListener);
 
     return () => {
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -284,8 +268,8 @@ export const useSlashCommandProcessor = (
         const ideClient = await IdeClient.getInstance();
         ideClient.removeStatusChangeListener(listener);
       })();
-      appEvents.off('extensionsStarting', extensionEventListener);
-      appEvents.off('extensionsStopping', extensionEventListener);
+      appEvents.off("extensionsStarting", extensionEventListener);
+      appEvents.off("extensionsStopping", extensionEventListener);
     };
   }, [config, reloadCommands]);
 
@@ -320,12 +304,12 @@ export const useSlashCommandProcessor = (
       if (!commands) {
         return false;
       }
-      if (typeof rawQuery !== 'string') {
+      if (typeof rawQuery !== "string") {
         return false;
       }
 
       const trimmed = rawQuery.trim();
-      if (!trimmed.startsWith('/') && !trimmed.startsWith('?')) {
+      if (!trimmed.startsWith("/") && !trimmed.startsWith("?")) {
         return false;
       }
 
@@ -333,10 +317,7 @@ export const useSlashCommandProcessor = (
 
       if (addToHistory) {
         const userMessageTimestamp = Date.now();
-        addItem(
-          { type: MessageType.USER, text: trimmed },
-          userMessageTimestamp,
-        );
+        addItem({ type: MessageType.USER, text: trimmed }, userMessageTimestamp);
       }
 
       let hasError = false;
@@ -347,9 +328,7 @@ export const useSlashCommandProcessor = (
       } = parseSlashCommand(trimmed, commands);
 
       const subcommand =
-        resolvedCommandPath.length > 1
-          ? resolvedCommandPath.slice(1).join(' ')
-          : undefined;
+        resolvedCommandPath.length > 1 ? resolvedCommandPath.slice(1).join(" ") : undefined;
 
       try {
         if (commandToExecute) {
@@ -375,96 +354,83 @@ export const useSlashCommandProcessor = (
                 ]),
               };
             }
-            const result = await commandToExecute.action(
-              fullCommandContext,
-              args,
-            );
+            const result = await commandToExecute.action(fullCommandContext, args);
 
             if (result) {
               switch (result.type) {
-                case 'tool':
+                case "tool":
                   return {
-                    type: 'schedule_tool',
+                    type: "schedule_tool",
                     toolName: result.toolName,
                     toolArgs: result.toolArgs,
                   };
-                case 'message':
+                case "message":
                   addItem(
                     {
-                      type:
-                        result.messageType === 'error'
-                          ? MessageType.ERROR
-                          : MessageType.INFO,
+                      type: result.messageType === "error" ? MessageType.ERROR : MessageType.INFO,
                       text: result.content,
                     },
                     Date.now(),
                   );
-                  return { type: 'handled' };
-                case 'dialog':
+                  return { type: "handled" };
+                case "dialog":
                   switch (result.dialog) {
-                    case 'auth':
+                    case "auth":
                       actions.openAuthDialog();
-                      return { type: 'handled' };
-                    case 'theme':
+                      return { type: "handled" };
+                    case "theme":
                       actions.openThemeDialog();
-                      return { type: 'handled' };
-                    case 'editor':
+                      return { type: "handled" };
+                    case "editor":
                       actions.openEditorDialog();
-                      return { type: 'handled' };
-                    case 'privacy':
+                      return { type: "handled" };
+                    case "privacy":
                       actions.openPrivacyNotice();
-                      return { type: 'handled' };
-                    case 'sessionBrowser':
+                      return { type: "handled" };
+                    case "sessionBrowser":
                       actions.openSessionBrowser();
-                      return { type: 'handled' };
-                    case 'settings':
+                      return { type: "handled" };
+                    case "settings":
                       actions.openSettingsDialog();
-                      return { type: 'handled' };
-                    case 'model':
+                      return { type: "handled" };
+                    case "model":
                       actions.openModelDialog();
-                      return { type: 'handled' };
-                    case 'permissions':
-                      actions.openPermissionsDialog(
-                        result.props as { targetDirectory?: string },
-                      );
-                      return { type: 'handled' };
-                    case 'help':
-                      return { type: 'handled' };
+                      return { type: "handled" };
+                    case "permissions":
+                      actions.openPermissionsDialog(result.props as { targetDirectory?: string });
+                      return { type: "handled" };
+                    case "help":
+                      return { type: "handled" };
                     default: {
                       const unhandled: never = result.dialog;
-                      throw new Error(
-                        `Unhandled slash command result: ${unhandled}`,
-                      );
+                      throw new Error(`Unhandled slash command result: ${unhandled}`);
                     }
                   }
-                case 'load_history': {
+                case "load_history": {
                   config?.getGeminiClient()?.setHistory(result.clientHistory);
                   fullCommandContext.ui.clear();
                   result.history.forEach((item, index) => {
                     fullCommandContext.ui.addItem(item, index);
                   });
-                  return { type: 'handled' };
+                  return { type: "handled" };
                 }
-                case 'quit':
+                case "quit":
                   actions.quit(result.messages);
-                  return { type: 'handled' };
+                  return { type: "handled" };
 
-                case 'submit_prompt':
+                case "submit_prompt":
                   return {
-                    type: 'submit_prompt',
+                    type: "submit_prompt",
                     content: result.content,
                   };
-                case 'confirm_shell_commands': {
+                case "confirm_shell_commands": {
                   const { outcome, approvedCommands } = await new Promise<{
                     outcome: ToolConfirmationOutcome;
                     approvedCommands?: string[];
                   }>((resolve) => {
                     setShellConfirmationRequest({
                       commands: result.commandsToConfirm,
-                      onConfirm: (
-                        resolvedOutcome,
-                        resolvedApprovedCommands,
-                      ) => {
+                      onConfirm: (resolvedOutcome, resolvedApprovedCommands) => {
                         setShellConfirmationRequest(null); // Close the dialog
                         resolve({
                           outcome: resolvedOutcome,
@@ -479,13 +445,11 @@ export const useSlashCommandProcessor = (
                     !approvedCommands ||
                     approvedCommands.length === 0
                   ) {
-                    return { type: 'handled' };
+                    return { type: "handled" };
                   }
 
                   if (outcome === ToolConfirmationOutcome.ProceedAlways) {
-                    setSessionShellAllowlist(
-                      (prev) => new Set([...prev, ...approvedCommands]),
-                    );
+                    setSessionShellAllowlist((prev) => new Set([...prev, ...approvedCommands]));
                   }
 
                   return await handleSlashCommand(
@@ -494,7 +458,7 @@ export const useSlashCommandProcessor = (
                     new Set(approvedCommands),
                   );
                 }
-                case 'confirm_action': {
+                case "confirm_action": {
                   const { confirmed } = await new Promise<{
                     confirmed: boolean;
                   }>((resolve) => {
@@ -511,43 +475,37 @@ export const useSlashCommandProcessor = (
                     addItem(
                       {
                         type: MessageType.INFO,
-                        text: 'Operation cancelled.',
+                        text: "Operation cancelled.",
                       },
                       Date.now(),
                     );
-                    return { type: 'handled' };
+                    return { type: "handled" };
                   }
 
-                  return await handleSlashCommand(
-                    result.originalInvocation.raw,
-                    undefined,
-                    true,
-                  );
+                  return await handleSlashCommand(result.originalInvocation.raw, undefined, true);
                 }
-                case 'custom_dialog': {
+                case "custom_dialog": {
                   setCustomDialog(result.component);
-                  return { type: 'handled' };
+                  return { type: "handled" };
                 }
                 default: {
                   const unhandled: never = result;
-                  throw new Error(
-                    `Unhandled slash command result: ${unhandled}`,
-                  );
+                  throw new Error(`Unhandled slash command result: ${unhandled}`);
                 }
               }
             }
 
-            return { type: 'handled' };
+            return { type: "handled" };
           } else if (commandToExecute.subCommands) {
             const helpText = `Command '/${commandToExecute.name}' requires a subcommand. Available:\n${commandToExecute.subCommands
-              .map((sc) => `  - ${sc.name}: ${sc.description || ''}`)
-              .join('\n')}`;
+              .map((sc) => `  - ${sc.name}: ${sc.description || ""}`)
+              .join("\n")}`;
             addMessage({
               type: MessageType.INFO,
               content: helpText,
               timestamp: new Date(),
             });
-            return { type: 'handled' };
+            return { type: "handled" };
           }
         }
 
@@ -557,7 +515,7 @@ export const useSlashCommandProcessor = (
           timestamp: new Date(),
         });
 
-        return { type: 'handled' };
+        return { type: "handled" };
       } catch (e: unknown) {
         hasError = true;
         if (config) {
@@ -576,7 +534,7 @@ export const useSlashCommandProcessor = (
           },
           Date.now(),
         );
-        return { type: 'handled' };
+        return { type: "handled" };
       } finally {
         if (config && resolvedCommandPath[0] && !hasError) {
           const event = makeSlashCommandEvent({
diff --git a/packages/ui-gemini/src/ui/hooks/useAlternateBuffer.ts b/packages/ui-gemini/src/ui/hooks/useAlternateBuffer.ts
index ba5dd460e..ea62404b8 100644
--- a/packages/ui-gemini/src/ui/hooks/useAlternateBuffer.ts
+++ b/packages/ui-gemini/src/ui/hooks/useAlternateBuffer.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useSettings } from '../contexts/SettingsContext.js';
-import type { LoadedSettings } from '../../config/settings.js';
+import type { LoadedSettings } from "../../config/settings.js";
+import { useSettings } from "../contexts/SettingsContext.js";
 
 export const isAlternateBufferEnabled = (settings: LoadedSettings): boolean =>
   settings.merged.ui?.useAlternateBuffer === true;
diff --git a/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.test.tsx b/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.test.tsx
index 32f4c0ced..4672c08cb 100644
--- a/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.test.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { useAnimatedScrollbar } from './useAnimatedScrollbar.js';
-import { debugState } from '../debug.js';
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { debugState } from "../debug.js";
+import { useAnimatedScrollbar } from "./useAnimatedScrollbar.js";
 
 const TestComponent = ({ isFocused = false }: { isFocused?: boolean }) => {
   useAnimatedScrollbar(isFocused, () => {});
   return null;
 };
 
-describe('useAnimatedScrollbar', () => {
+describe("useAnimatedScrollbar", () => {
   beforeEach(() => {
     debugState.debugNumAnimatedComponents = 0;
     vi.useFakeTimers();
@@ -25,24 +25,24 @@ describe('useAnimatedScrollbar', () => {
     vi.useRealTimers();
   });
 
-  it('should not increment debugNumAnimatedComponents when not focused', () => {
+  it("should not increment debugNumAnimatedComponents when not focused", () => {
     render(<TestComponent isFocused={false} />);
     expect(debugState.debugNumAnimatedComponents).toBe(0);
   });
 
-  it('should not increment debugNumAnimatedComponents on initial mount even if focused', () => {
+  it("should not increment debugNumAnimatedComponents on initial mount even if focused", () => {
     render(<TestComponent isFocused={true} />);
     expect(debugState.debugNumAnimatedComponents).toBe(0);
   });
 
-  it('should increment debugNumAnimatedComponents when becoming focused', () => {
+  it("should increment debugNumAnimatedComponents when becoming focused", () => {
     const { rerender } = render(<TestComponent isFocused={false} />);
     expect(debugState.debugNumAnimatedComponents).toBe(0);
     rerender(<TestComponent isFocused={true} />);
     expect(debugState.debugNumAnimatedComponents).toBe(1);
   });
 
-  it('should decrement debugNumAnimatedComponents when becoming unfocused', () => {
+  it("should decrement debugNumAnimatedComponents when becoming unfocused", () => {
     const { rerender } = render(<TestComponent isFocused={false} />);
     rerender(<TestComponent isFocused={true} />);
     expect(debugState.debugNumAnimatedComponents).toBe(1);
@@ -50,7 +50,7 @@ describe('useAnimatedScrollbar', () => {
     expect(debugState.debugNumAnimatedComponents).toBe(0);
   });
 
-  it('should decrement debugNumAnimatedComponents on unmount', () => {
+  it("should decrement debugNumAnimatedComponents on unmount", () => {
     const { rerender, unmount } = render(<TestComponent isFocused={false} />);
     rerender(<TestComponent isFocused={true} />);
     expect(debugState.debugNumAnimatedComponents).toBe(1);
@@ -58,7 +58,7 @@ describe('useAnimatedScrollbar', () => {
     expect(debugState.debugNumAnimatedComponents).toBe(0);
   });
 
-  it('should decrement debugNumAnimatedComponents after animation finishes', async () => {
+  it("should decrement debugNumAnimatedComponents after animation finishes", async () => {
     const { rerender } = render(<TestComponent isFocused={false} />);
     rerender(<TestComponent isFocused={true} />);
     expect(debugState.debugNumAnimatedComponents).toBe(1);
@@ -71,12 +71,12 @@ describe('useAnimatedScrollbar', () => {
     expect(debugState.debugNumAnimatedComponents).toBe(0);
   });
 
-  it('should not crash if Date.now() goes backwards (regression test)', async () => {
+  it("should not crash if Date.now() goes backwards (regression test)", async () => {
     // Only fake timers, keep Date real so we can mock it manually
     vi.useFakeTimers({
-      toFake: ['setInterval', 'clearInterval', 'setTimeout', 'clearTimeout'],
+      toFake: ["setInterval", "clearInterval", "setTimeout", "clearTimeout"],
     });
-    const dateSpy = vi.spyOn(Date, 'now');
+    const dateSpy = vi.spyOn(Date, "now");
     let currentTime = 1000;
     dateSpy.mockImplementation(() => currentTime);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.ts b/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.ts
index 7ee3fb8ec..a19523744 100644
--- a/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.ts
+++ b/packages/ui-gemini/src/ui/hooks/useAnimatedScrollbar.ts
@@ -4,15 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef, useCallback } from 'react';
-import { theme } from '../semantic-colors.js';
-import { interpolateColor } from '../themes/color-utils.js';
-import { debugState } from '../debug.js';
-
-export function useAnimatedScrollbar(
-  isFocused: boolean,
-  scrollBy: (delta: number) => void,
-) {
+import { useCallback, useEffect, useRef, useState } from "react";
+import { debugState } from "../debug.js";
+import { theme } from "../semantic-colors.js";
+import { interpolateColor } from "../themes/color-utils.js";
+
+export function useAnimatedScrollbar(isFocused: boolean, scrollBy: (delta: number) => void) {
   const [scrollbarColor, setScrollbarColor] = useState(theme.ui.dark);
   const colorRef = useRef(scrollbarColor);
   colorRef.current = scrollbarColor;
@@ -73,13 +70,8 @@ export function useAnimatedScrollbar(
           start = Date.now();
           const animateFadeOut = () => {
             const elapsed = Date.now() - start;
-            const progress = Math.max(
-              0,
-              Math.min(elapsed / fadeOutDuration, 1),
-            );
-            setScrollbarColor(
-              interpolateColor(focusedColor, unfocusedColor, progress),
-            );
+            const progress = Math.max(0, Math.min(elapsed / fadeOutDuration, 1));
+            setScrollbarColor(interpolateColor(focusedColor, unfocusedColor, progress));
 
             if (progress === 1) {
               cleanup();
diff --git a/packages/ui-gemini/src/ui/hooks/useAtCompletion.test.ts b/packages/ui-gemini/src/ui/hooks/useAtCompletion.test.ts
index 05ff3fd9d..e141f5314 100644
--- a/packages/ui-gemini/src/ui/hooks/useAtCompletion.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useAtCompletion.test.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { act, useState } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useAtCompletion } from './useAtCompletion.js';
-import type { Config, FileSearch } from '@airiscode/gemini-cli-core';
-import { FileSearchFactory } from '@airiscode/gemini-cli-core';
-import type { FileSystemStructure } from '@airiscode/ui-gemini-test-utils';
-import { createTmpDir, cleanupTmpDir } from '@airiscode/ui-gemini-test-utils';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import type { Config, FileSearch } from "@airiscode/gemini-cli-core";
+import { FileSearchFactory } from "@airiscode/gemini-cli-core";
+import type { FileSystemStructure } from "@airiscode/ui-gemini-test-utils";
+import { cleanupTmpDir, createTmpDir } from "@airiscode/ui-gemini-test-utils";
+import { act, useState } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import { useAtCompletion } from "./useAtCompletion.js";
 
 // Test harness to capture the state from the hook's callbacks.
 function useTestHarnessForAtCompletion(
@@ -37,7 +37,7 @@ function useTestHarnessForAtCompletion(
   return { suggestions, isLoadingSuggestions };
 }
 
-describe('useAtCompletion', () => {
+describe("useAtCompletion", () => {
   let testRootDir: string;
   let mockConfig: Config;
 
@@ -63,19 +63,19 @@ describe('useAtCompletion', () => {
     vi.restoreAllMocks();
   });
 
-  describe('File Search Logic', () => {
-    it('should perform a recursive search for an empty pattern', async () => {
+  describe("File Search Logic", () => {
+    it("should perform a recursive search for an empty pattern", async () => {
       const structure: FileSystemStructure = {
-        'file.txt': '',
+        "file.txt": "",
         src: {
-          'index.js': '',
-          components: ['Button.tsx', 'Button with spaces.tsx'],
+          "index.js": "",
+          components: ["Button.tsx", "Button with spaces.tsx"],
         },
       };
       testRootDir = await createTmpDir(structure);
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
+        useTestHarnessForAtCompletion(true, "", mockConfig, testRootDir),
       );
 
       await waitFor(() => {
@@ -84,29 +84,29 @@ describe('useAtCompletion', () => {
 
       expect(result.current.suggestions.length).toBeGreaterThan(0);
       expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'src/',
-        'src/components/',
-        'file.txt',
-        'src/components/Button\\ with\\ spaces.tsx',
-        'src/components/Button.tsx',
-        'src/index.js',
+        "src/",
+        "src/components/",
+        "file.txt",
+        "src/components/Button\\ with\\ spaces.tsx",
+        "src/components/Button.tsx",
+        "src/index.js",
       ]);
     });
 
-    it('should correctly filter the recursive list based on a pattern', async () => {
+    it("should correctly filter the recursive list based on a pattern", async () => {
       const structure: FileSystemStructure = {
-        'file.txt': '',
+        "file.txt": "",
         src: {
-          'index.js': '',
+          "index.js": "",
           components: {
-            'Button.tsx': '',
+            "Button.tsx": "",
           },
         },
       };
       testRootDir = await createTmpDir(structure);
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, 'src/', mockConfig, testRootDir),
+        useTestHarnessForAtCompletion(true, "src/", mockConfig, testRootDir),
       );
 
       await waitFor(() => {
@@ -114,36 +114,33 @@ describe('useAtCompletion', () => {
       });
 
       expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'src/',
-        'src/components/',
-        'src/index.js',
-        'src/components/Button.tsx',
+        "src/",
+        "src/components/",
+        "src/index.js",
+        "src/components/Button.tsx",
       ]);
     });
 
-    it('should append a trailing slash to directory paths in suggestions', async () => {
+    it("should append a trailing slash to directory paths in suggestions", async () => {
       const structure: FileSystemStructure = {
-        'file.txt': '',
+        "file.txt": "",
         dir: {},
       };
       testRootDir = await createTmpDir(structure);
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
+        useTestHarnessForAtCompletion(true, "", mockConfig, testRootDir),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBeGreaterThan(0);
       });
 
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'dir/',
-        'file.txt',
-      ]);
+      expect(result.current.suggestions.map((s) => s.value)).toEqual(["dir/", "file.txt"]);
     });
 
-    it('should perform a case-insensitive search by lowercasing the pattern', async () => {
-      testRootDir = await createTmpDir({ 'cRaZycAsE.txt': '' });
+    it("should perform a case-insensitive search by lowercasing the pattern", async () => {
+      testRootDir = await createTmpDir({ "cRaZycAsE.txt": "" });
 
       const fileSearch = FileSearchFactory.create({
         projectRoot: testRootDir,
@@ -157,56 +154,48 @@ describe('useAtCompletion', () => {
       });
       await fileSearch.initialize();
 
-      vi.spyOn(FileSearchFactory, 'create').mockReturnValue(fileSearch);
+      vi.spyOn(FileSearchFactory, "create").mockReturnValue(fileSearch);
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(
-          true,
-          'CrAzYCaSe',
-          mockConfig,
-          testRootDir,
-        ),
+        useTestHarnessForAtCompletion(true, "CrAzYCaSe", mockConfig, testRootDir),
       );
 
       // The hook should find 'cRaZycAsE.txt' even though the pattern is 'CrAzYCaSe'.
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'cRaZycAsE.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["cRaZycAsE.txt"]);
       });
     });
   });
 
-  describe('MCP resource suggestions', () => {
-    it('should include MCP resources in the suggestion list using fuzzy matching', async () => {
+  describe("MCP resource suggestions", () => {
+    it("should include MCP resources in the suggestion list using fuzzy matching", async () => {
       mockConfig.getResourceRegistry = vi.fn().mockReturnValue({
         getAllResources: () => [
           {
-            serverName: 'server-1',
-            uri: 'file:///tmp/server-1/logs.txt',
-            name: 'logs',
+            serverName: "server-1",
+            uri: "file:///tmp/server-1/logs.txt",
+            name: "logs",
             discoveredAt: Date.now(),
           },
         ],
       });
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, 'logs', mockConfig, '/tmp'),
+        useTestHarnessForAtCompletion(true, "logs", mockConfig, "/tmp"),
       );
 
       await waitFor(() => {
         expect(
           result.current.suggestions.some(
-            (suggestion) =>
-              suggestion.value === 'server-1:file:///tmp/server-1/logs.txt',
+            (suggestion) => suggestion.value === "server-1:file:///tmp/server-1/logs.txt",
           ),
         ).toBe(true);
       });
     });
   });
 
-  describe('UI State and Loading Behavior', () => {
-    it('should be in a loading state during initial file system crawl', async () => {
+  describe("UI State and Loading Behavior", () => {
+    it("should be in a loading state during initial file system crawl", async () => {
       testRootDir = await createTmpDir({});
 
       // Mock FileSearch to be slow to catch the loading state
@@ -216,12 +205,12 @@ describe('useAtCompletion', () => {
         }),
         search: vi.fn().mockResolvedValue([]),
       };
-      vi.spyOn(FileSearchFactory, 'create').mockReturnValue(
+      vi.spyOn(FileSearchFactory, "create").mockReturnValue(
         mockFileSearch as unknown as FileSearch,
       );
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
+        useTestHarnessForAtCompletion(true, "", mockConfig, testRootDir),
       );
 
       // It's initially true because the effect runs synchronously.
@@ -235,37 +224,32 @@ describe('useAtCompletion', () => {
       });
     });
 
-    it('should NOT show a loading indicator for subsequent searches that complete under 200ms', async () => {
-      const structure: FileSystemStructure = { 'a.txt': '', 'b.txt': '' };
+    it("should NOT show a loading indicator for subsequent searches that complete under 200ms", async () => {
+      const structure: FileSystemStructure = { "a.txt": "", "b.txt": "" };
       testRootDir = await createTmpDir(structure);
 
       const { result, rerender } = renderHook(
-        ({ pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
-        { initialProps: { pattern: 'a' } },
+        ({ pattern }) => useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
+        { initialProps: { pattern: "a" } },
       );
 
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'a.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["a.txt"]);
       });
       expect(result.current.isLoadingSuggestions).toBe(false);
 
-      rerender({ pattern: 'b' });
+      rerender({ pattern: "b" });
 
       // Wait for the final result
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'b.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["b.txt"]);
       });
 
       expect(result.current.isLoadingSuggestions).toBe(false);
     });
 
-    it('should show a loading indicator and clear old suggestions for subsequent searches that take longer than 200ms', async () => {
-      const structure: FileSystemStructure = { 'a.txt': '', 'b.txt': '' };
+    it("should show a loading indicator and clear old suggestions for subsequent searches that take longer than 200ms", async () => {
+      const structure: FileSystemStructure = { "a.txt": "", "b.txt": "" };
       testRootDir = await createTmpDir(structure);
 
       const realFileSearch = FileSearchFactory.create({
@@ -285,23 +269,18 @@ describe('useAtCompletion', () => {
         initialize: vi.fn().mockResolvedValue(undefined),
         search: vi
           .fn()
-          .mockImplementation(async (pattern, options) =>
-            realFileSearch.search(pattern, options),
-          ),
+          .mockImplementation(async (pattern, options) => realFileSearch.search(pattern, options)),
       };
-      vi.spyOn(FileSearchFactory, 'create').mockReturnValue(mockFileSearch);
+      vi.spyOn(FileSearchFactory, "create").mockReturnValue(mockFileSearch);
 
       const { result, rerender } = renderHook(
-        ({ pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
-        { initialProps: { pattern: 'a' } },
+        ({ pattern }) => useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
+        { initialProps: { pattern: "a" } },
       );
 
       // Wait for the initial search to complete (using real timers)
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'a.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["a.txt"]);
       });
 
       // Now switch to fake timers for precise control of the loading behavior
@@ -309,7 +288,7 @@ describe('useAtCompletion', () => {
 
       // Trigger the second search
       act(() => {
-        rerender({ pattern: 'b' });
+        rerender({ pattern: "b" });
       });
 
       // Initially, loading should be false (before 200ms timer)
@@ -329,46 +308,40 @@ describe('useAtCompletion', () => {
 
       // Wait for the search results to be processed
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'b.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["b.txt"]);
       });
 
       expect(result.current.isLoadingSuggestions).toBe(false);
     });
 
-    it('should abort the previous search when a new one starts', async () => {
-      const structure: FileSystemStructure = { 'a.txt': '', 'b.txt': '' };
+    it("should abort the previous search when a new one starts", async () => {
+      const structure: FileSystemStructure = { "a.txt": "", "b.txt": "" };
       testRootDir = await createTmpDir(structure);
 
-      const abortSpy = vi.spyOn(AbortController.prototype, 'abort');
+      const abortSpy = vi.spyOn(AbortController.prototype, "abort");
       const mockFileSearch: FileSearch = {
         initialize: vi.fn().mockResolvedValue(undefined),
         search: vi.fn().mockImplementation(async (pattern: string) => {
-          const delay = pattern === 'a' ? 500 : 50;
+          const delay = pattern === "a" ? 500 : 50;
           await new Promise((resolve) => setTimeout(resolve, delay));
           return [pattern];
         }),
       };
-      vi.spyOn(FileSearchFactory, 'create').mockReturnValue(mockFileSearch);
+      vi.spyOn(FileSearchFactory, "create").mockReturnValue(mockFileSearch);
 
       const { result, rerender } = renderHook(
-        ({ pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
-        { initialProps: { pattern: 'a' } },
+        ({ pattern }) => useTestHarnessForAtCompletion(true, pattern, mockConfig, testRootDir),
+        { initialProps: { pattern: "a" } },
       );
 
       // Wait for the hook to be ready (initialization is complete)
       await waitFor(() => {
-        expect(mockFileSearch.search).toHaveBeenCalledWith(
-          'a',
-          expect.any(Object),
-        );
+        expect(mockFileSearch.search).toHaveBeenCalledWith("a", expect.any(Object));
       });
 
       // Now that the first search is in-flight, trigger the second one.
       act(() => {
-        rerender({ pattern: 'b' });
+        rerender({ pattern: "b" });
       });
 
       // The abort should have been called for the first search.
@@ -377,35 +350,29 @@ describe('useAtCompletion', () => {
       // Wait for the final result, which should be from the second, faster search.
       await waitFor(
         () => {
-          expect(result.current.suggestions.map((s) => s.value)).toEqual(['b']);
+          expect(result.current.suggestions.map((s) => s.value)).toEqual(["b"]);
         },
         { timeout: 1000 },
       );
 
       // The search spy should have been called for both patterns.
-      expect(mockFileSearch.search).toHaveBeenCalledWith(
-        'b',
-        expect.any(Object),
-      );
+      expect(mockFileSearch.search).toHaveBeenCalledWith("b", expect.any(Object));
     });
   });
 
-  describe('State Management', () => {
-    it('should reset the state when disabled after being in a READY state', async () => {
-      const structure: FileSystemStructure = { 'a.txt': '' };
+  describe("State Management", () => {
+    it("should reset the state when disabled after being in a READY state", async () => {
+      const structure: FileSystemStructure = { "a.txt": "" };
       testRootDir = await createTmpDir(structure);
 
       const { result, rerender } = renderHook(
-        ({ enabled }) =>
-          useTestHarnessForAtCompletion(enabled, 'a', mockConfig, testRootDir),
+        ({ enabled }) => useTestHarnessForAtCompletion(enabled, "a", mockConfig, testRootDir),
         { initialProps: { enabled: true } },
       );
 
       // Wait for the hook to be ready and have suggestions
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'a.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["a.txt"]);
       });
 
       // Now, disable the hook
@@ -415,21 +382,18 @@ describe('useAtCompletion', () => {
       expect(result.current.suggestions).toEqual([]);
     });
 
-    it('should reset the state when disabled after being in an ERROR state', async () => {
+    it("should reset the state when disabled after being in an ERROR state", async () => {
       testRootDir = await createTmpDir({});
 
       // Force an error during initialization
       const mockFileSearch: FileSearch = {
-        initialize: vi
-          .fn()
-          .mockRejectedValue(new Error('Initialization failed')),
+        initialize: vi.fn().mockRejectedValue(new Error("Initialization failed")),
         search: vi.fn(),
       };
-      vi.spyOn(FileSearchFactory, 'create').mockReturnValue(mockFileSearch);
+      vi.spyOn(FileSearchFactory, "create").mockReturnValue(mockFileSearch);
 
       const { result, rerender } = renderHook(
-        ({ enabled }) =>
-          useTestHarnessForAtCompletion(enabled, '', mockConfig, testRootDir),
+        ({ enabled }) => useTestHarnessForAtCompletion(enabled, "", mockConfig, testRootDir),
         { initialProps: { enabled: true } },
       );
 
@@ -449,33 +413,30 @@ describe('useAtCompletion', () => {
     });
   });
 
-  describe('Filtering and Configuration', () => {
-    it('should respect .gitignore files', async () => {
-      const gitignoreContent = ['dist/', '*.log'].join('\n');
+  describe("Filtering and Configuration", () => {
+    it("should respect .gitignore files", async () => {
+      const gitignoreContent = ["dist/", "*.log"].join("\n");
       const structure: FileSystemStructure = {
-        '.git': {},
-        '.gitignore': gitignoreContent,
+        ".git": {},
+        ".gitignore": gitignoreContent,
         dist: {},
-        'test.log': '',
+        "test.log": "",
         src: {},
       };
       testRootDir = await createTmpDir(structure);
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', mockConfig, testRootDir),
+        useTestHarnessForAtCompletion(true, "", mockConfig, testRootDir),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBeGreaterThan(0);
       });
 
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'src/',
-        '.gitignore',
-      ]);
+      expect(result.current.suggestions.map((s) => s.value)).toEqual(["src/", ".gitignore"]);
     });
 
-    it('should work correctly when config is undefined', async () => {
+    it("should work correctly when config is undefined", async () => {
       const structure: FileSystemStructure = {
         node_modules: {},
         src: {},
@@ -483,46 +444,40 @@ describe('useAtCompletion', () => {
       testRootDir = await createTmpDir(structure);
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(true, '', undefined, testRootDir),
+        useTestHarnessForAtCompletion(true, "", undefined, testRootDir),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBeGreaterThan(0);
       });
 
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'node_modules/',
-        'src/',
-      ]);
+      expect(result.current.suggestions.map((s) => s.value)).toEqual(["node_modules/", "src/"]);
     });
 
-    it('should reset and re-initialize when the cwd changes', async () => {
-      const structure1: FileSystemStructure = { 'file1.txt': '' };
+    it("should reset and re-initialize when the cwd changes", async () => {
+      const structure1: FileSystemStructure = { "file1.txt": "" };
       const rootDir1 = await createTmpDir(structure1);
-      const structure2: FileSystemStructure = { 'file2.txt': '' };
+      const structure2: FileSystemStructure = { "file2.txt": "" };
       const rootDir2 = await createTmpDir(structure2);
 
       const { result, rerender } = renderHook(
-        ({ cwd, pattern }) =>
-          useTestHarnessForAtCompletion(true, pattern, mockConfig, cwd),
+        ({ cwd, pattern }) => useTestHarnessForAtCompletion(true, pattern, mockConfig, cwd),
         {
           initialProps: {
             cwd: rootDir1,
-            pattern: 'file',
+            pattern: "file",
           },
         },
       );
 
       // Wait for initial suggestions from the first directory
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'file1.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["file1.txt"]);
       });
 
       // Change the CWD
       act(() => {
-        rerender({ cwd: rootDir2, pattern: 'file' });
+        rerender({ cwd: rootDir2, pattern: "file" });
       });
 
       // After CWD changes, suggestions should be cleared and it should load again.
@@ -533,9 +488,7 @@ describe('useAtCompletion', () => {
 
       // Wait for the new suggestions from the second directory
       await waitFor(() => {
-        expect(result.current.suggestions.map((s) => s.value)).toEqual([
-          'file2.txt',
-        ]);
+        expect(result.current.suggestions.map((s) => s.value)).toEqual(["file2.txt"]);
       });
       expect(result.current.isLoadingSuggestions).toBe(false);
 
@@ -543,11 +496,11 @@ describe('useAtCompletion', () => {
       await cleanupTmpDir(rootDir2);
     });
 
-    it('should perform a non-recursive search when enableRecursiveFileSearch is false', async () => {
+    it("should perform a non-recursive search when enableRecursiveFileSearch is false", async () => {
       const structure: FileSystemStructure = {
-        'file.txt': '',
+        "file.txt": "",
         src: {
-          'index.js': '',
+          "index.js": "",
         },
       };
       testRootDir = await createTmpDir(structure);
@@ -562,12 +515,7 @@ describe('useAtCompletion', () => {
       } as unknown as Config;
 
       const { result } = renderHook(() =>
-        useTestHarnessForAtCompletion(
-          true,
-          '',
-          nonRecursiveConfig,
-          testRootDir,
-        ),
+        useTestHarnessForAtCompletion(true, "", nonRecursiveConfig, testRootDir),
       );
 
       await waitFor(() => {
@@ -575,10 +523,7 @@ describe('useAtCompletion', () => {
       });
 
       // Should only contain top-level items
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'src/',
-        'file.txt',
-      ]);
+      expect(result.current.suggestions.map((s) => s.value)).toEqual(["src/", "file.txt"]);
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/useAtCompletion.ts b/packages/ui-gemini/src/ui/hooks/useAtCompletion.ts
index 11f1127af..9484203ef 100644
--- a/packages/ui-gemini/src/ui/hooks/useAtCompletion.ts
+++ b/packages/ui-gemini/src/ui/hooks/useAtCompletion.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useReducer, useRef } from 'react';
-import type { Config, FileSearch } from '@airiscode/gemini-cli-core';
-import { FileSearchFactory, escapePath } from '@airiscode/gemini-cli-core';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import { MAX_SUGGESTIONS_TO_SHOW } from '../components/SuggestionsDisplay.js';
-import { AsyncFzf } from 'fzf';
+import type { Config, FileSearch } from "@airiscode/gemini-cli-core";
+import { escapePath, FileSearchFactory } from "@airiscode/gemini-cli-core";
+import { AsyncFzf } from "fzf";
+import { useEffect, useReducer, useRef } from "react";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import { MAX_SUGGESTIONS_TO_SHOW } from "../components/SuggestionsDisplay.js";
 
 export enum AtCompletionStatus {
-  IDLE = 'idle',
-  INITIALIZING = 'initializing',
-  READY = 'ready',
-  SEARCHING = 'searching',
-  ERROR = 'error',
+  IDLE = "idle",
+  INITIALIZING = "initializing",
+  READY = "ready",
+  SEARCHING = "searching",
+  ERROR = "error",
 }
 
 interface AtCompletionState {
@@ -27,13 +27,13 @@ interface AtCompletionState {
 }
 
 type AtCompletionAction =
-  | { type: 'INITIALIZE' }
-  | { type: 'INITIALIZE_SUCCESS' }
-  | { type: 'SEARCH'; payload: string }
-  | { type: 'SEARCH_SUCCESS'; payload: Suggestion[] }
-  | { type: 'SET_LOADING'; payload: boolean }
-  | { type: 'ERROR' }
-  | { type: 'RESET' };
+  | { type: "INITIALIZE" }
+  | { type: "INITIALIZE_SUCCESS" }
+  | { type: "SEARCH"; payload: string }
+  | { type: "SEARCH_SUCCESS"; payload: Suggestion[] }
+  | { type: "SET_LOADING"; payload: boolean }
+  | { type: "ERROR" }
+  | { type: "RESET" };
 
 const initialState: AtCompletionState = {
   status: AtCompletionStatus.IDLE,
@@ -47,42 +47,42 @@ function atCompletionReducer(
   action: AtCompletionAction,
 ): AtCompletionState {
   switch (action.type) {
-    case 'INITIALIZE':
+    case "INITIALIZE":
       return {
         ...state,
         status: AtCompletionStatus.INITIALIZING,
         isLoading: true,
       };
-    case 'INITIALIZE_SUCCESS':
+    case "INITIALIZE_SUCCESS":
       return { ...state, status: AtCompletionStatus.READY, isLoading: false };
-    case 'SEARCH':
+    case "SEARCH":
       // Keep old suggestions, don't set loading immediately
       return {
         ...state,
         status: AtCompletionStatus.SEARCHING,
         pattern: action.payload,
       };
-    case 'SEARCH_SUCCESS':
+    case "SEARCH_SUCCESS":
       return {
         ...state,
         status: AtCompletionStatus.READY,
         suggestions: action.payload,
         isLoading: false,
       };
-    case 'SET_LOADING':
+    case "SET_LOADING":
       // Only show loading if we are still in a searching state
       if (state.status === AtCompletionStatus.SEARCHING) {
         return { ...state, isLoading: action.payload, suggestions: [] };
       }
       return state;
-    case 'ERROR':
+    case "ERROR":
       return {
         ...state,
         status: AtCompletionStatus.ERROR,
         isLoading: false,
         suggestions: [],
       };
-    case 'RESET':
+    case "RESET":
       return initialState;
     default:
       return state;
@@ -103,9 +103,7 @@ interface ResourceSuggestionCandidate {
   suggestion: Suggestion;
 }
 
-function buildResourceCandidates(
-  config?: Config,
-): ResourceSuggestionCandidate[] {
+function buildResourceCandidates(config?: Config): ResourceSuggestionCandidate[] {
   const registry = config?.getResourceRegistry?.();
   if (!registry) {
     return [];
@@ -116,7 +114,7 @@ function buildResourceCandidates(
     const prefixedUri = `${resource.serverName}:${resource.uri}`;
     return {
       // Include prefixedUri in searchKey so users can search by the displayed format
-      searchKey: `${prefixedUri} ${resource.name ?? ''}`.toLowerCase(),
+      searchKey: `${prefixedUri} ${resource.name ?? ""}`.toLowerCase(),
       suggestion: {
         label: prefixedUri,
         value: prefixedUri,
@@ -137,9 +135,7 @@ async function searchResourceCandidates(
 
   const normalizedPattern = pattern.toLowerCase();
   if (!normalizedPattern) {
-    return candidates
-      .slice(0, MAX_SUGGESTIONS_TO_SHOW)
-      .map((candidate) => candidate.suggestion);
+    return candidates.slice(0, MAX_SUGGESTIONS_TO_SHOW).map((candidate) => candidate.suggestion);
   }
 
   const fzf = new AsyncFzf(candidates, {
@@ -148,20 +144,11 @@ async function searchResourceCandidates(
   const results = await fzf.find(normalizedPattern, {
     limit: MAX_SUGGESTIONS_TO_SHOW * 3,
   });
-  return results.map(
-    (result: { item: ResourceSuggestionCandidate }) => result.item.suggestion,
-  );
+  return results.map((result: { item: ResourceSuggestionCandidate }) => result.item.suggestion);
 }
 
 export function useAtCompletion(props: UseAtCompletionProps): void {
-  const {
-    enabled,
-    pattern,
-    config,
-    cwd,
-    setSuggestions,
-    setIsLoadingSuggestions,
-  } = props;
+  const { enabled, pattern, config, cwd, setSuggestions, setIsLoadingSuggestions } = props;
   const [state, dispatch] = useReducer(atCompletionReducer, initialState);
   const fileSearch = useRef<FileSearch | null>(null);
   const searchAbortController = useRef<AbortController | null>(null);
@@ -176,34 +163,31 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
   }, [state.isLoading, setIsLoadingSuggestions]);
 
   useEffect(() => {
-    dispatch({ type: 'RESET' });
+    dispatch({ type: "RESET" });
   }, [cwd, config]);
 
   // Reacts to user input (`pattern`) ONLY.
   useEffect(() => {
     if (!enabled) {
       // reset when first getting out of completion suggestions
-      if (
-        state.status === AtCompletionStatus.READY ||
-        state.status === AtCompletionStatus.ERROR
-      ) {
-        dispatch({ type: 'RESET' });
+      if (state.status === AtCompletionStatus.READY || state.status === AtCompletionStatus.ERROR) {
+        dispatch({ type: "RESET" });
       }
       return;
     }
     if (pattern === null) {
-      dispatch({ type: 'RESET' });
+      dispatch({ type: "RESET" });
       return;
     }
 
     if (state.status === AtCompletionStatus.IDLE) {
-      dispatch({ type: 'INITIALIZE' });
+      dispatch({ type: "INITIALIZE" });
     } else if (
       (state.status === AtCompletionStatus.READY ||
         state.status === AtCompletionStatus.SEARCHING) &&
       pattern.toLowerCase() !== state.pattern // Only search if the pattern has changed
     ) {
-      dispatch({ type: 'SEARCH', payload: pattern.toLowerCase() });
+      dispatch({ type: "SEARCH", payload: pattern.toLowerCase() });
     }
   }, [enabled, pattern, state.status, state.pattern]);
 
@@ -214,25 +198,21 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
         const searcher = FileSearchFactory.create({
           projectRoot: cwd,
           ignoreDirs: [],
-          useGitignore:
-            config?.getFileFilteringOptions()?.respectGitIgnore ?? true,
-          useGeminiignore:
-            config?.getFileFilteringOptions()?.respectGeminiIgnore ?? true,
+          useGitignore: config?.getFileFilteringOptions()?.respectGitIgnore ?? true,
+          useGeminiignore: config?.getFileFilteringOptions()?.respectGeminiIgnore ?? true,
           cache: true,
           cacheTtl: 30, // 30 seconds
-          enableRecursiveFileSearch:
-            config?.getEnableRecursiveFileSearch() ?? true,
-          disableFuzzySearch:
-            config?.getFileFilteringDisableFuzzySearch() ?? false,
+          enableRecursiveFileSearch: config?.getEnableRecursiveFileSearch() ?? true,
+          disableFuzzySearch: config?.getFileFilteringDisableFuzzySearch() ?? false,
         });
         await searcher.initialize();
         fileSearch.current = searcher;
-        dispatch({ type: 'INITIALIZE_SUCCESS' });
+        dispatch({ type: "INITIALIZE_SUCCESS" });
         if (state.pattern !== null) {
-          dispatch({ type: 'SEARCH', payload: state.pattern });
+          dispatch({ type: "SEARCH", payload: state.pattern });
         }
       } catch (_) {
-        dispatch({ type: 'ERROR' });
+        dispatch({ type: "ERROR" });
       }
     };
 
@@ -249,7 +229,7 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
       searchAbortController.current = controller;
 
       slowSearchTimer.current = setTimeout(() => {
-        dispatch({ type: 'SET_LOADING', payload: true });
+        dispatch({ type: "SET_LOADING", payload: true });
       }, 200);
 
       try {
@@ -273,24 +253,18 @@ export function useAtCompletion(props: UseAtCompletionProps): void {
 
         const resourceCandidates = buildResourceCandidates(config);
         const resourceSuggestions = (
-          await searchResourceCandidates(
-            state.pattern ?? '',
-            resourceCandidates,
-          )
+          await searchResourceCandidates(state.pattern ?? "", resourceCandidates)
         ).map((suggestion) => ({
           ...suggestion,
-          label: suggestion.label.replace(/^@/, ''),
-          value: suggestion.value.replace(/^@/, ''),
+          label: suggestion.label.replace(/^@/, ""),
+          value: suggestion.value.replace(/^@/, ""),
         }));
 
-        const combinedSuggestions = [
-          ...fileSuggestions,
-          ...resourceSuggestions,
-        ];
-        dispatch({ type: 'SEARCH_SUCCESS', payload: combinedSuggestions });
+        const combinedSuggestions = [...fileSuggestions, ...resourceSuggestions];
+        dispatch({ type: "SEARCH_SUCCESS", payload: combinedSuggestions });
       } catch (error) {
-        if (!(error instanceof Error && error.name === 'AbortError')) {
-          dispatch({ type: 'ERROR' });
+        if (!(error instanceof Error && error.name === "AbortError")) {
+          dispatch({ type: "ERROR" });
         }
       }
     };
diff --git a/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.test.ts b/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.test.ts
index 2b8340432..7cc6fbdb4 100644
--- a/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.test.ts
@@ -4,31 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type MockedFunction,
-  type Mock,
-} from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { useAutoAcceptIndicator } from './useAutoAcceptIndicator.js';
-
-import { Config, ApprovalMode } from '@airiscode/gemini-cli-core';
-import type { Config as ActualConfigType } from '@airiscode/gemini-cli-core';
-import type { Key } from './useKeypress.js';
-import { useKeypress } from './useKeypress.js';
-import { MessageType } from '../types.js';
-
-vi.mock('./useKeypress.js');
-
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actualServerModule = (await vi.importActual(
-    '@airiscode/gemini-cli-core',
-  )) as Record<string, unknown>;
+import type { Config as ActualConfigType } from "@airiscode/gemini-cli-core";
+import { ApprovalMode, Config } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { beforeEach, describe, expect, it, type Mock, type MockedFunction, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { MessageType } from "../types.js";
+import { useAutoAcceptIndicator } from "./useAutoAcceptIndicator.js";
+import type { Key } from "./useKeypress.js";
+import { useKeypress } from "./useKeypress.js";
+
+vi.mock("./useKeypress.js");
+
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actualServerModule = (await vi.importActual("@airiscode/gemini-cli-core")) as Record<
+    string,
+    unknown
+  >;
   return {
     ...actualServerModule,
     Config: vi.fn(),
@@ -57,7 +49,7 @@ interface MockConfigInstanceShape {
 
 type UseKeypressHandler = (key: Key) => void;
 
-describe('useAutoAcceptIndicator', () => {
+describe("useAutoAcceptIndicator", () => {
   let mockConfigInstance: MockConfigInstanceShape;
   let capturedUseKeypressHandler: UseKeypressHandler;
   let mockedUseKeypress: MockedFunction<typeof useKeypress>;
@@ -65,46 +57,30 @@ describe('useAutoAcceptIndicator', () => {
   beforeEach(() => {
     vi.resetAllMocks();
 
-    (
-      Config as unknown as MockedFunction<() => MockConfigInstanceShape>
-    ).mockImplementation(() => {
+    (Config as unknown as MockedFunction<() => MockConfigInstanceShape>).mockImplementation(() => {
       const instanceGetApprovalModeMock = vi.fn();
       const instanceSetApprovalModeMock = vi.fn();
 
       const instance: MockConfigInstanceShape = {
-        getApprovalMode: instanceGetApprovalModeMock as Mock<
-          () => ApprovalMode
-        >,
-        setApprovalMode: instanceSetApprovalModeMock as Mock<
-          (value: ApprovalMode) => void
-        >,
+        getApprovalMode: instanceGetApprovalModeMock as Mock<() => ApprovalMode>,
+        setApprovalMode: instanceSetApprovalModeMock as Mock<(value: ApprovalMode) => void>,
         isYoloModeDisabled: vi.fn().mockReturnValue(false),
         isTrustedFolder: vi.fn().mockReturnValue(true) as Mock<() => boolean>,
         getCoreTools: vi.fn().mockReturnValue([]) as Mock<() => string[]>,
         getToolDiscoveryCommand: vi.fn().mockReturnValue(undefined) as Mock<
           () => string | undefined
         >,
-        getTargetDir: vi.fn().mockReturnValue('.') as Mock<() => string>,
-        getApiKey: vi.fn().mockReturnValue('test-api-key') as Mock<
-          () => string
-        >,
-        getModel: vi.fn().mockReturnValue('test-model') as Mock<() => string>,
-        getSandbox: vi.fn().mockReturnValue(false) as Mock<
-          () => boolean | string
-        >,
+        getTargetDir: vi.fn().mockReturnValue(".") as Mock<() => string>,
+        getApiKey: vi.fn().mockReturnValue("test-api-key") as Mock<() => string>,
+        getModel: vi.fn().mockReturnValue("test-model") as Mock<() => string>,
+        getSandbox: vi.fn().mockReturnValue(false) as Mock<() => boolean | string>,
         getDebugMode: vi.fn().mockReturnValue(false) as Mock<() => boolean>,
-        getQuestion: vi.fn().mockReturnValue(undefined) as Mock<
-          () => string | undefined
-        >,
+        getQuestion: vi.fn().mockReturnValue(undefined) as Mock<() => string | undefined>,
 
-        getUserAgent: vi.fn().mockReturnValue('test-user-agent') as Mock<
-          () => string
-        >,
-        getUserMemory: vi.fn().mockReturnValue('') as Mock<() => string>,
+        getUserAgent: vi.fn().mockReturnValue("test-user-agent") as Mock<() => string>,
+        getUserMemory: vi.fn().mockReturnValue("") as Mock<() => string>,
         getGeminiMdFileCount: vi.fn().mockReturnValue(0) as Mock<() => number>,
-        getToolRegistry: vi
-          .fn()
-          .mockReturnValue({ discoverTools: vi.fn() }) as Mock<
+        getToolRegistry: vi.fn().mockReturnValue({ discoverTools: vi.fn() }) as Mock<
           () => { discoverTools: Mock<() => void> }
         >,
       };
@@ -115,17 +91,15 @@ describe('useAutoAcceptIndicator', () => {
     });
 
     mockedUseKeypress = useKeypress as MockedFunction<typeof useKeypress>;
-    mockedUseKeypress.mockImplementation(
-      (handler: UseKeypressHandler, _options) => {
-        capturedUseKeypressHandler = handler;
-      },
-    );
+    mockedUseKeypress.mockImplementation((handler: UseKeypressHandler, _options) => {
+      capturedUseKeypressHandler = handler;
+    });
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     mockConfigInstance = new (Config as any)() as MockConfigInstanceShape;
   });
 
-  it('should initialize with ApprovalMode.AUTO_EDIT if config.getApprovalMode returns ApprovalMode.AUTO_EDIT', () => {
+  it("should initialize with ApprovalMode.AUTO_EDIT if config.getApprovalMode returns ApprovalMode.AUTO_EDIT", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.AUTO_EDIT);
     const { result } = renderHook(() =>
       useAutoAcceptIndicator({
@@ -137,7 +111,7 @@ describe('useAutoAcceptIndicator', () => {
     expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(1);
   });
 
-  it('should initialize with ApprovalMode.DEFAULT if config.getApprovalMode returns ApprovalMode.DEFAULT', () => {
+  it("should initialize with ApprovalMode.DEFAULT if config.getApprovalMode returns ApprovalMode.DEFAULT", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
     const { result } = renderHook(() =>
       useAutoAcceptIndicator({
@@ -149,7 +123,7 @@ describe('useAutoAcceptIndicator', () => {
     expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(1);
   });
 
-  it('should initialize with ApprovalMode.YOLO if config.getApprovalMode returns ApprovalMode.YOLO', () => {
+  it("should initialize with ApprovalMode.YOLO if config.getApprovalMode returns ApprovalMode.YOLO", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.YOLO);
     const { result } = renderHook(() =>
       useAutoAcceptIndicator({
@@ -161,7 +135,7 @@ describe('useAutoAcceptIndicator', () => {
     expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(1);
   });
 
-  it('should toggle the indicator and update config when Shift+Tab or Ctrl+Y is pressed', () => {
+  it("should toggle the indicator and update config when Shift+Tab or Ctrl+Y is pressed", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
     const { result } = renderHook(() =>
       useAutoAcceptIndicator({
@@ -173,63 +147,51 @@ describe('useAutoAcceptIndicator', () => {
 
     act(() => {
       capturedUseKeypressHandler({
-        name: 'tab',
+        name: "tab",
         shift: true,
       } as Key);
     });
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.AUTO_EDIT,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
     expect(result.current).toBe(ApprovalMode.AUTO_EDIT);
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+      capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
     });
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.YOLO,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.YOLO);
     expect(result.current).toBe(ApprovalMode.YOLO);
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+      capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
     });
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.DEFAULT,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
     expect(result.current).toBe(ApprovalMode.DEFAULT);
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+      capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
     });
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.YOLO,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.YOLO);
     expect(result.current).toBe(ApprovalMode.YOLO);
 
     act(() => {
       capturedUseKeypressHandler({
-        name: 'tab',
+        name: "tab",
         shift: true,
       } as Key);
     });
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.AUTO_EDIT,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
     expect(result.current).toBe(ApprovalMode.AUTO_EDIT);
 
     act(() => {
       capturedUseKeypressHandler({
-        name: 'tab',
+        name: "tab",
         shift: true,
       } as Key);
     });
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.DEFAULT,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
     expect(result.current).toBe(ApprovalMode.DEFAULT);
   });
 
-  it('should not toggle if only one key or other keys combinations are pressed', () => {
+  it("should not toggle if only one key or other keys combinations are pressed", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
     renderHook(() =>
       useAutoAcceptIndicator({
@@ -240,7 +202,7 @@ describe('useAutoAcceptIndicator', () => {
 
     act(() => {
       capturedUseKeypressHandler({
-        name: 'tab',
+        name: "tab",
         shift: false,
       } as Key);
     });
@@ -248,7 +210,7 @@ describe('useAutoAcceptIndicator', () => {
 
     act(() => {
       capturedUseKeypressHandler({
-        name: 'unknown',
+        name: "unknown",
         shift: true,
       } as Key);
     });
@@ -256,7 +218,7 @@ describe('useAutoAcceptIndicator', () => {
 
     act(() => {
       capturedUseKeypressHandler({
-        name: 'a',
+        name: "a",
         shift: false,
         ctrl: false,
       } as Key);
@@ -264,23 +226,23 @@ describe('useAutoAcceptIndicator', () => {
     expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: false } as Key);
+      capturedUseKeypressHandler({ name: "y", ctrl: false } as Key);
     });
     expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'a', ctrl: true } as Key);
+      capturedUseKeypressHandler({ name: "a", ctrl: true } as Key);
     });
     expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', shift: true } as Key);
+      capturedUseKeypressHandler({ name: "y", shift: true } as Key);
     });
     expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
 
     act(() => {
       capturedUseKeypressHandler({
-        name: 'a',
+        name: "a",
         ctrl: true,
         shift: true,
       } as Key);
@@ -288,11 +250,10 @@ describe('useAutoAcceptIndicator', () => {
     expect(mockConfigInstance.setApprovalMode).not.toHaveBeenCalled();
   });
 
-  it('should update indicator when config value changes externally (useEffect dependency)', () => {
+  it("should update indicator when config value changes externally (useEffect dependency)", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
     const { result, rerender } = renderHook(
-      (props: { config: ActualConfigType; addItem: () => void }) =>
-        useAutoAcceptIndicator(props),
+      (props: { config: ActualConfigType; addItem: () => void }) => useAutoAcceptIndicator(props),
       {
         initialProps: {
           config: mockConfigInstance as unknown as ActualConfigType,
@@ -312,17 +273,15 @@ describe('useAutoAcceptIndicator', () => {
     expect(mockConfigInstance.getApprovalMode).toHaveBeenCalledTimes(3);
   });
 
-  describe('in untrusted folders', () => {
+  describe("in untrusted folders", () => {
     beforeEach(() => {
       mockConfigInstance.isTrustedFolder.mockReturnValue(false);
     });
 
-    it('should not enable YOLO mode when Ctrl+Y is pressed', () => {
+    it("should not enable YOLO mode when Ctrl+Y is pressed", () => {
       mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
       mockConfigInstance.setApprovalMode.mockImplementation(() => {
-        throw new Error(
-          'Cannot enable privileged approval modes in an untrusted folder.',
-        );
+        throw new Error("Cannot enable privileged approval modes in an untrusted folder.");
       });
       const mockAddItem = vi.fn();
       const { result } = renderHook(() =>
@@ -335,24 +294,20 @@ describe('useAutoAcceptIndicator', () => {
       expect(result.current).toBe(ApprovalMode.DEFAULT);
 
       act(() => {
-        capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+        capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
       });
 
       // We expect setApprovalMode to be called, and the error to be caught.
-      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-        ApprovalMode.YOLO,
-      );
+      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.YOLO);
       expect(mockAddItem).toHaveBeenCalled();
       // Verify the underlying config value was not changed
       expect(mockConfigInstance.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
     });
 
-    it('should not enable AUTO_EDIT mode when Shift+Tab is pressed', () => {
+    it("should not enable AUTO_EDIT mode when Shift+Tab is pressed", () => {
       mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
       mockConfigInstance.setApprovalMode.mockImplementation(() => {
-        throw new Error(
-          'Cannot enable privileged approval modes in an untrusted folder.',
-        );
+        throw new Error("Cannot enable privileged approval modes in an untrusted folder.");
       });
       const mockAddItem = vi.fn();
       const { result } = renderHook(() =>
@@ -366,21 +321,19 @@ describe('useAutoAcceptIndicator', () => {
 
       act(() => {
         capturedUseKeypressHandler({
-          name: 'tab',
+          name: "tab",
           shift: true,
         } as Key);
       });
 
       // We expect setApprovalMode to be called, and the error to be caught.
-      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-        ApprovalMode.AUTO_EDIT,
-      );
+      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
       expect(mockAddItem).toHaveBeenCalled();
       // Verify the underlying config value was not changed
       expect(mockConfigInstance.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
     });
 
-    it('should disable YOLO mode when Ctrl+Y is pressed', () => {
+    it("should disable YOLO mode when Ctrl+Y is pressed", () => {
       mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.YOLO);
       const mockAddItem = vi.fn();
       renderHook(() =>
@@ -391,19 +344,15 @@ describe('useAutoAcceptIndicator', () => {
       );
 
       act(() => {
-        capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+        capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
       });
 
-      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-        ApprovalMode.DEFAULT,
-      );
+      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
       expect(mockConfigInstance.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
     });
 
-    it('should disable AUTO_EDIT mode when Shift+Tab is pressed', () => {
-      mockConfigInstance.getApprovalMode.mockReturnValue(
-        ApprovalMode.AUTO_EDIT,
-      );
+    it("should disable AUTO_EDIT mode when Shift+Tab is pressed", () => {
+      mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.AUTO_EDIT);
       const mockAddItem = vi.fn();
       renderHook(() =>
         useAutoAcceptIndicator({
@@ -414,21 +363,18 @@ describe('useAutoAcceptIndicator', () => {
 
       act(() => {
         capturedUseKeypressHandler({
-          name: 'tab',
+          name: "tab",
           shift: true,
         } as Key);
       });
 
-      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-        ApprovalMode.DEFAULT,
-      );
+      expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
       expect(mockConfigInstance.getApprovalMode()).toBe(ApprovalMode.DEFAULT);
     });
 
-    it('should show a warning when trying to enable privileged modes', () => {
+    it("should show a warning when trying to enable privileged modes", () => {
       // Mock the error thrown by setApprovalMode
-      const errorMessage =
-        'Cannot enable privileged approval modes in an untrusted folder.';
+      const errorMessage = "Cannot enable privileged approval modes in an untrusted folder.";
       mockConfigInstance.setApprovalMode.mockImplementation(() => {
         throw new Error(errorMessage);
       });
@@ -443,7 +389,7 @@ describe('useAutoAcceptIndicator', () => {
 
       // Try to enable YOLO mode
       act(() => {
-        capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+        capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
       });
 
       expect(mockAddItem).toHaveBeenCalledWith(
@@ -457,7 +403,7 @@ describe('useAutoAcceptIndicator', () => {
       // Try to enable AUTO_EDIT mode
       act(() => {
         capturedUseKeypressHandler({
-          name: 'tab',
+          name: "tab",
           shift: true,
         } as Key);
       });
@@ -474,7 +420,7 @@ describe('useAutoAcceptIndicator', () => {
     });
   });
 
-  describe('when YOLO mode is disabled by settings', () => {
+  describe("when YOLO mode is disabled by settings", () => {
     beforeEach(() => {
       // Ensure isYoloModeDisabled returns true for these tests
       if (mockConfigInstance && mockConfigInstance.isYoloModeDisabled) {
@@ -482,7 +428,7 @@ describe('useAutoAcceptIndicator', () => {
       }
     });
 
-    it('should not enable YOLO mode when Ctrl+Y is pressed and add an info message', () => {
+    it("should not enable YOLO mode when Ctrl+Y is pressed and add an info message", () => {
       mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
       const mockAddItem = vi.fn();
       const { result } = renderHook(() =>
@@ -495,7 +441,7 @@ describe('useAutoAcceptIndicator', () => {
       expect(result.current).toBe(ApprovalMode.DEFAULT);
 
       act(() => {
-        capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+        capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
       });
 
       // setApprovalMode should not be called because the check should return early
@@ -504,7 +450,7 @@ describe('useAutoAcceptIndicator', () => {
       expect(mockAddItem).toHaveBeenCalledWith(
         {
           type: MessageType.WARNING,
-          text: 'You cannot enter YOLO mode since it is disabled in your settings.',
+          text: "You cannot enter YOLO mode since it is disabled in your settings.",
         },
         expect.any(Number),
       );
@@ -513,7 +459,7 @@ describe('useAutoAcceptIndicator', () => {
     });
   });
 
-  it('should call onApprovalModeChange when switching to YOLO mode', () => {
+  it("should call onApprovalModeChange when switching to YOLO mode", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
 
     const mockOnApprovalModeChange = vi.fn();
@@ -526,16 +472,14 @@ describe('useAutoAcceptIndicator', () => {
     );
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+      capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
     });
 
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.YOLO,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.YOLO);
     expect(mockOnApprovalModeChange).toHaveBeenCalledWith(ApprovalMode.YOLO);
   });
 
-  it('should call onApprovalModeChange when switching to AUTO_EDIT mode', () => {
+  it("should call onApprovalModeChange when switching to AUTO_EDIT mode", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
 
     const mockOnApprovalModeChange = vi.fn();
@@ -548,18 +492,14 @@ describe('useAutoAcceptIndicator', () => {
     );
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'tab', shift: true } as Key);
+      capturedUseKeypressHandler({ name: "tab", shift: true } as Key);
     });
 
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.AUTO_EDIT,
-    );
-    expect(mockOnApprovalModeChange).toHaveBeenCalledWith(
-      ApprovalMode.AUTO_EDIT,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
+    expect(mockOnApprovalModeChange).toHaveBeenCalledWith(ApprovalMode.AUTO_EDIT);
   });
 
-  it('should call onApprovalModeChange when switching to DEFAULT mode', () => {
+  it("should call onApprovalModeChange when switching to DEFAULT mode", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.YOLO);
 
     const mockOnApprovalModeChange = vi.fn();
@@ -572,16 +512,14 @@ describe('useAutoAcceptIndicator', () => {
     );
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key); // This should toggle from YOLO to DEFAULT
+      capturedUseKeypressHandler({ name: "y", ctrl: true } as Key); // This should toggle from YOLO to DEFAULT
     });
 
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.DEFAULT,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
     expect(mockOnApprovalModeChange).toHaveBeenCalledWith(ApprovalMode.DEFAULT);
   });
 
-  it('should not call onApprovalModeChange when callback is not provided', () => {
+  it("should not call onApprovalModeChange when callback is not provided", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
 
     renderHook(() =>
@@ -591,16 +529,14 @@ describe('useAutoAcceptIndicator', () => {
     );
 
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+      capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
     });
 
-    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(
-      ApprovalMode.YOLO,
-    );
+    expect(mockConfigInstance.setApprovalMode).toHaveBeenCalledWith(ApprovalMode.YOLO);
     // Should not throw an error when callback is not provided
   });
 
-  it('should handle multiple mode changes correctly', () => {
+  it("should handle multiple mode changes correctly", () => {
     mockConfigInstance.getApprovalMode.mockReturnValue(ApprovalMode.DEFAULT);
 
     const mockOnApprovalModeChange = vi.fn();
@@ -614,22 +550,16 @@ describe('useAutoAcceptIndicator', () => {
 
     // Switch to YOLO
     act(() => {
-      capturedUseKeypressHandler({ name: 'y', ctrl: true } as Key);
+      capturedUseKeypressHandler({ name: "y", ctrl: true } as Key);
     });
 
     // Switch to AUTO_EDIT
     act(() => {
-      capturedUseKeypressHandler({ name: 'tab', shift: true } as Key);
+      capturedUseKeypressHandler({ name: "tab", shift: true } as Key);
     });
 
     expect(mockOnApprovalModeChange).toHaveBeenCalledTimes(2);
-    expect(mockOnApprovalModeChange).toHaveBeenNthCalledWith(
-      1,
-      ApprovalMode.YOLO,
-    );
-    expect(mockOnApprovalModeChange).toHaveBeenNthCalledWith(
-      2,
-      ApprovalMode.AUTO_EDIT,
-    );
+    expect(mockOnApprovalModeChange).toHaveBeenNthCalledWith(1, ApprovalMode.YOLO);
+    expect(mockOnApprovalModeChange).toHaveBeenNthCalledWith(2, ApprovalMode.AUTO_EDIT);
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.ts b/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.ts
index 31bf4644e..05dd1defa 100644
--- a/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.ts
+++ b/packages/ui-gemini/src/ui/hooks/useAutoAcceptIndicator.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
-import { ApprovalMode, type Config } from '@airiscode/gemini-cli-core';
-import { useKeypress } from './useKeypress.js';
-import type { HistoryItemWithoutId } from '../types.js';
-import { MessageType } from '../types.js';
+import { ApprovalMode, type Config } from "@airiscode/gemini-cli-core";
+import { useEffect, useState } from "react";
+import type { HistoryItemWithoutId } from "../types.js";
+import { MessageType } from "../types.js";
+import { useKeypress } from "./useKeypress.js";
 
 export interface UseAutoAcceptIndicatorArgs {
   config: Config;
@@ -22,8 +22,7 @@ export function useAutoAcceptIndicator({
   onApprovalModeChange,
 }: UseAutoAcceptIndicatorArgs): ApprovalMode {
   const currentConfigValue = config.getApprovalMode();
-  const [showAutoAcceptIndicator, setShowAutoAcceptIndicator] =
-    useState(currentConfigValue);
+  const [showAutoAcceptIndicator, setShowAutoAcceptIndicator] = useState(currentConfigValue);
 
   useEffect(() => {
     setShowAutoAcceptIndicator(currentConfigValue);
@@ -33,16 +32,13 @@ export function useAutoAcceptIndicator({
     (key) => {
       let nextApprovalMode: ApprovalMode | undefined;
 
-      if (key.ctrl && key.name === 'y') {
-        if (
-          config.isYoloModeDisabled() &&
-          config.getApprovalMode() !== ApprovalMode.YOLO
-        ) {
+      if (key.ctrl && key.name === "y") {
+        if (config.isYoloModeDisabled() && config.getApprovalMode() !== ApprovalMode.YOLO) {
           if (addItem) {
             addItem(
               {
                 type: MessageType.WARNING,
-                text: 'You cannot enter YOLO mode since it is disabled in your settings.',
+                text: "You cannot enter YOLO mode since it is disabled in your settings.",
               },
               Date.now(),
             );
@@ -50,10 +46,8 @@ export function useAutoAcceptIndicator({
           return;
         }
         nextApprovalMode =
-          config.getApprovalMode() === ApprovalMode.YOLO
-            ? ApprovalMode.DEFAULT
-            : ApprovalMode.YOLO;
-      } else if (key.shift && key.name === 'tab') {
+          config.getApprovalMode() === ApprovalMode.YOLO ? ApprovalMode.DEFAULT : ApprovalMode.YOLO;
+      } else if (key.shift && key.name === "tab") {
         nextApprovalMode =
           config.getApprovalMode() === ApprovalMode.AUTO_EDIT
             ? ApprovalMode.DEFAULT
diff --git a/packages/ui-gemini/src/ui/hooks/useBanner.test.ts b/packages/ui-gemini/src/ui/hooks/useBanner.test.ts
index a35e93b98..7a76caa09 100644
--- a/packages/ui-gemini/src/ui/hooks/useBanner.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useBanner.test.ts
@@ -4,38 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type MockedFunction,
-} from 'vitest';
-import { renderHook } from '../../test-utils/render.js';
-import { useBanner } from './useBanner.js';
-import { persistentState } from '../../utils/persistentState.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import crypto from 'node:crypto';
-
-vi.mock('../../utils/persistentState.js', () => ({
+import crypto from "node:crypto";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, type MockedFunction, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { persistentState } from "../../utils/persistentState.js";
+import { useBanner } from "./useBanner.js";
+
+vi.mock("../../utils/persistentState.js", () => ({
   persistentState: {
     get: vi.fn(),
     set: vi.fn(),
   },
 }));
 
-vi.mock('../semantic-colors.js', () => ({
+vi.mock("../semantic-colors.js", () => ({
   theme: {
     status: {
-      warning: 'mock-warning-color',
+      warning: "mock-warning-color",
     },
   },
 }));
 
-vi.mock('../colors.js', () => ({
+vi.mock("../colors.js", () => ({
   Colors: {
-    AccentBlue: 'mock-accent-blue',
+    AccentBlue: "mock-accent-blue",
   },
 }));
 
@@ -44,7 +37,7 @@ interface MockConfigShape {
   getPreviewFeatures: MockedFunction<() => boolean>;
 }
 
-describe('useBanner', () => {
+describe("useBanner", () => {
   let mockConfig: MockConfigShape;
   const mockedPersistentStateGet = persistentState.get as MockedFunction<
     typeof persistentState.get
@@ -54,8 +47,8 @@ describe('useBanner', () => {
   >;
 
   const defaultBannerData = {
-    defaultText: 'Standard Banner',
-    warningText: '',
+    defaultText: "Standard Banner",
+    warningText: "",
   };
 
   beforeEach(() => {
@@ -70,17 +63,15 @@ describe('useBanner', () => {
     mockedPersistentStateGet.mockReturnValue({});
   });
 
-  it('should return warning text and warning color if warningText is present', () => {
-    const data = { defaultText: 'Standard', warningText: 'Critical Error' };
+  it("should return warning text and warning color if warningText is present", () => {
+    const data = { defaultText: "Standard", warningText: "Critical Error" };
 
-    const { result } = renderHook(() =>
-      useBanner(data, mockConfig as unknown as Config),
-    );
+    const { result } = renderHook(() => useBanner(data, mockConfig as unknown as Config));
 
-    expect(result.current.bannerText).toBe('Critical Error');
+    expect(result.current.bannerText).toBe("Critical Error");
   });
 
-  it('should NOT show default banner if preview features are enabled in config', () => {
+  it("should NOT show default banner if preview features are enabled in config", () => {
     // Simulate Preview Features Enabled
     mockConfig.getPreviewFeatures.mockReturnValue(true);
 
@@ -89,45 +80,39 @@ describe('useBanner', () => {
     );
 
     // Should fall back to warningText (which is empty)
-    expect(result.current.bannerText).toBe('');
+    expect(result.current.bannerText).toBe("");
   });
 
-  it('should hide banner if show count exceeds max limit (Legacy format)', () => {
+  it("should hide banner if show count exceeds max limit (Legacy format)", () => {
     mockedPersistentStateGet.mockReturnValue({
-      [crypto
-        .createHash('sha256')
-        .update(defaultBannerData.defaultText)
-        .digest('hex')]: 5,
+      [crypto.createHash("sha256").update(defaultBannerData.defaultText).digest("hex")]: 5,
     });
 
     const { result } = renderHook(() =>
       useBanner(defaultBannerData, mockConfig as unknown as Config),
     );
 
-    expect(result.current.bannerText).toBe('');
+    expect(result.current.bannerText).toBe("");
   });
 
-  it('should increment the persistent count when banner is shown', () => {
-    const data = { defaultText: 'Tracker', warningText: '' };
+  it("should increment the persistent count when banner is shown", () => {
+    const data = { defaultText: "Tracker", warningText: "" };
 
     // Current count is 1
     mockedPersistentStateGet.mockReturnValue({
-      [crypto.createHash('sha256').update(data.defaultText).digest('hex')]: 1,
+      [crypto.createHash("sha256").update(data.defaultText).digest("hex")]: 1,
     });
 
     renderHook(() => useBanner(data, mockConfig as unknown as Config));
 
     // Expect set to be called with incremented count
-    expect(mockedPersistentStateSet).toHaveBeenCalledWith(
-      'defaultBannerShownCount',
-      {
-        [crypto.createHash('sha256').update(data.defaultText).digest('hex')]: 2,
-      },
-    );
+    expect(mockedPersistentStateSet).toHaveBeenCalledWith("defaultBannerShownCount", {
+      [crypto.createHash("sha256").update(data.defaultText).digest("hex")]: 2,
+    });
   });
 
-  it('should NOT increment count if warning text is shown instead', () => {
-    const data = { defaultText: 'Standard', warningText: 'Warning' };
+  it("should NOT increment count if warning text is shown instead", () => {
+    const data = { defaultText: "Standard", warningText: "Warning" };
 
     renderHook(() => useBanner(data, mockConfig as unknown as Config));
 
@@ -135,13 +120,11 @@ describe('useBanner', () => {
     expect(mockedPersistentStateSet).not.toHaveBeenCalled();
   });
 
-  it('should handle newline replacements', () => {
-    const data = { defaultText: 'Line1\\nLine2', warningText: '' };
+  it("should handle newline replacements", () => {
+    const data = { defaultText: "Line1\\nLine2", warningText: "" };
 
-    const { result } = renderHook(() =>
-      useBanner(data, mockConfig as unknown as Config),
-    );
+    const { result } = renderHook(() => useBanner(data, mockConfig as unknown as Config));
 
-    expect(result.current.bannerText).toBe('Line1\nLine2');
+    expect(result.current.bannerText).toBe("Line1\nLine2");
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/useBanner.ts b/packages/ui-gemini/src/ui/hooks/useBanner.ts
index 8526a41d1..cc61f2e51 100644
--- a/packages/ui-gemini/src/ui/hooks/useBanner.ts
+++ b/packages/ui-gemini/src/ui/hooks/useBanner.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef } from 'react';
-import { persistentState } from '../../utils/persistentState.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import crypto from 'node:crypto';
+import crypto from "node:crypto";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { useEffect, useRef, useState } from "react";
+import { persistentState } from "../../utils/persistentState.js";
 
 const DEFAULT_MAX_BANNER_SHOWN_COUNT = 5;
 
@@ -19,9 +19,7 @@ interface BannerData {
 export function useBanner(bannerData: BannerData, config: Config) {
   const { defaultText, warningText } = bannerData;
 
-  const [previewEnabled, setPreviewEnabled] = useState(
-    config.getPreviewFeatures(),
-  );
+  const [previewEnabled, setPreviewEnabled] = useState(config.getPreviewFeatures());
 
   useEffect(() => {
     const isEnabled = config.getPreviewFeatures();
@@ -30,24 +28,17 @@ export function useBanner(bannerData: BannerData, config: Config) {
     }
   }, [config, previewEnabled]);
 
-  const [bannerCounts] = useState(
-    () => persistentState.get('defaultBannerShownCount') || {},
-  );
+  const [bannerCounts] = useState(() => persistentState.get("defaultBannerShownCount") || {});
 
-  const hashedText = crypto
-    .createHash('sha256')
-    .update(defaultText)
-    .digest('hex');
+  const hashedText = crypto.createHash("sha256").update(defaultText).digest("hex");
 
   const currentBannerCount = bannerCounts[hashedText] || 0;
 
   const showDefaultBanner =
-    warningText === '' &&
-    !previewEnabled &&
-    currentBannerCount < DEFAULT_MAX_BANNER_SHOWN_COUNT;
+    warningText === "" && !previewEnabled && currentBannerCount < DEFAULT_MAX_BANNER_SHOWN_COUNT;
 
   const rawBannerText = showDefaultBanner ? defaultText : warningText;
-  const bannerText = rawBannerText.replace(/\\n/g, '\n');
+  const bannerText = rawBannerText.replace(/\\n/g, "\n");
 
   const lastIncrementedKey = useRef<string | null>(null);
 
@@ -56,10 +47,10 @@ export function useBanner(bannerData: BannerData, config: Config) {
       if (lastIncrementedKey.current !== defaultText) {
         lastIncrementedKey.current = defaultText;
 
-        const allCounts = persistentState.get('defaultBannerShownCount') || {};
+        const allCounts = persistentState.get("defaultBannerShownCount") || {};
         const current = allCounts[hashedText] || 0;
 
-        persistentState.set('defaultBannerShownCount', {
+        persistentState.set("defaultBannerShownCount", {
           ...allCounts,
           [hashedText]: current + 1,
         });
diff --git a/packages/ui-gemini/src/ui/hooks/useBatchedScroll.test.ts b/packages/ui-gemini/src/ui/hooks/useBatchedScroll.test.ts
index 268c5b6bf..6cccb4744 100644
--- a/packages/ui-gemini/src/ui/hooks/useBatchedScroll.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useBatchedScroll.test.ts
@@ -4,21 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { renderHook } from '../../test-utils/render.js';
-import { useBatchedScroll } from './useBatchedScroll.js';
+import { describe, expect, it } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { useBatchedScroll } from "./useBatchedScroll.js";
 
-describe('useBatchedScroll', () => {
-  it('returns initial scrollTop', () => {
+describe("useBatchedScroll", () => {
+  it("returns initial scrollTop", () => {
     const { result } = renderHook(() => useBatchedScroll(10));
     expect(result.current.getScrollTop()).toBe(10);
   });
 
-  it('returns updated scrollTop from props', () => {
+  it("returns updated scrollTop from props", () => {
     let currentScrollTop = 10;
-    const { result, rerender } = renderHook(() =>
-      useBatchedScroll(currentScrollTop),
-    );
+    const { result, rerender } = renderHook(() => useBatchedScroll(currentScrollTop));
 
     expect(result.current.getScrollTop()).toBe(10);
 
@@ -28,14 +26,14 @@ describe('useBatchedScroll', () => {
     expect(result.current.getScrollTop()).toBe(100);
   });
 
-  it('returns pending scrollTop when set', () => {
+  it("returns pending scrollTop when set", () => {
     const { result } = renderHook(() => useBatchedScroll(10));
 
     result.current.setPendingScrollTop(50);
     expect(result.current.getScrollTop()).toBe(50);
   });
 
-  it('overwrites pending scrollTop with subsequent sets before render', () => {
+  it("overwrites pending scrollTop with subsequent sets before render", () => {
     const { result } = renderHook(() => useBatchedScroll(10));
 
     result.current.setPendingScrollTop(50);
@@ -43,11 +41,9 @@ describe('useBatchedScroll', () => {
     expect(result.current.getScrollTop()).toBe(75);
   });
 
-  it('resets pending scrollTop after rerender', () => {
+  it("resets pending scrollTop after rerender", () => {
     let currentScrollTop = 10;
-    const { result, rerender } = renderHook(() =>
-      useBatchedScroll(currentScrollTop),
-    );
+    const { result, rerender } = renderHook(() => useBatchedScroll(currentScrollTop));
 
     result.current.setPendingScrollTop(50);
     expect(result.current.getScrollTop()).toBe(50);
@@ -60,7 +56,7 @@ describe('useBatchedScroll', () => {
     expect(result.current.getScrollTop()).toBe(100);
   });
 
-  it('resets pending scrollTop after rerender even if prop is same', () => {
+  it("resets pending scrollTop after rerender even if prop is same", () => {
     const { result, rerender } = renderHook(() => useBatchedScroll(10));
 
     result.current.setPendingScrollTop(50);
@@ -73,7 +69,7 @@ describe('useBatchedScroll', () => {
     expect(result.current.getScrollTop()).toBe(10);
   });
 
-  it('maintains stable function references', () => {
+  it("maintains stable function references", () => {
     const { result, rerender } = renderHook(() => useBatchedScroll(10));
     const initialGetScrollTop = result.current.getScrollTop;
     const initialSetPendingScrollTop = result.current.setPendingScrollTop;
diff --git a/packages/ui-gemini/src/ui/hooks/useBatchedScroll.ts b/packages/ui-gemini/src/ui/hooks/useBatchedScroll.ts
index 05b73a906..9591438cf 100644
--- a/packages/ui-gemini/src/ui/hooks/useBatchedScroll.ts
+++ b/packages/ui-gemini/src/ui/hooks/useBatchedScroll.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useRef, useEffect, useCallback } from 'react';
+import { useCallback, useEffect, useRef } from "react";
 
 /**
  * A hook to manage batched scroll state updates.
diff --git a/packages/ui-gemini/src/ui/hooks/useBracketedPaste.ts b/packages/ui-gemini/src/ui/hooks/useBracketedPaste.ts
index 1e9cbbebc..8de0aaebf 100644
--- a/packages/ui-gemini/src/ui/hooks/useBracketedPaste.ts
+++ b/packages/ui-gemini/src/ui/hooks/useBracketedPaste.ts
@@ -4,11 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
-import {
-  disableBracketedPaste,
-  enableBracketedPaste,
-} from '../utils/bracketedPaste.js';
+import { useEffect } from "react";
+import { disableBracketedPaste, enableBracketedPaste } from "../utils/bracketedPaste.js";
 
 /**
  * Enables and disables bracketed paste mode in the terminal.
@@ -24,15 +21,15 @@ export const useBracketedPaste = () => {
   useEffect(() => {
     enableBracketedPaste();
 
-    process.on('exit', cleanup);
-    process.on('SIGINT', cleanup);
-    process.on('SIGTERM', cleanup);
+    process.on("exit", cleanup);
+    process.on("SIGINT", cleanup);
+    process.on("SIGTERM", cleanup);
 
     return () => {
       cleanup();
-      process.removeListener('exit', cleanup);
-      process.removeListener('SIGINT', cleanup);
-      process.removeListener('SIGTERM', cleanup);
+      process.removeListener("exit", cleanup);
+      process.removeListener("SIGINT", cleanup);
+      process.removeListener("SIGTERM", cleanup);
     };
   }, []);
 };
diff --git a/packages/ui-gemini/src/ui/hooks/useCommandCompletion.test.tsx b/packages/ui-gemini/src/ui/hooks/useCommandCompletion.test.tsx
index 75f2f6042..dd8e60043 100644
--- a/packages/ui-gemini/src/ui/hooks/useCommandCompletion.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useCommandCompletion.test.tsx
@@ -4,33 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  vi,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { act, useEffect } from 'react';
-import { renderWithProviders } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useCommandCompletion } from './useCommandCompletion.js';
-import type { CommandContext } from '../commands/types.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { useTextBuffer } from '../components/shared/text-buffer.js';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import type { UseAtCompletionProps } from './useAtCompletion.js';
-import { useAtCompletion } from './useAtCompletion.js';
-import type { UseSlashCompletionProps } from './useSlashCompletion.js';
-import { useSlashCompletion } from './useSlashCompletion.js';
-
-vi.mock('./useAtCompletion', () => ({
+import type { Config } from "@airiscode/gemini-cli-core";
+import { act, useEffect } from "react";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import type { CommandContext } from "../commands/types.js";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import { useTextBuffer } from "../components/shared/text-buffer.js";
+import type { UseAtCompletionProps } from "./useAtCompletion.js";
+import { useAtCompletion } from "./useAtCompletion.js";
+import { useCommandCompletion } from "./useCommandCompletion.js";
+import type { UseSlashCompletionProps } from "./useSlashCompletion.js";
+import { useSlashCompletion } from "./useSlashCompletion.js";
+
+vi.mock("./useAtCompletion", () => ({
   useAtCompletion: vi.fn(),
 }));
 
-vi.mock('./useSlashCompletion', () => ({
+vi.mock("./useSlashCompletion", () => ({
   useSlashCompletion: vi.fn(() => ({
     completionStart: 0,
     completionEnd: 0,
@@ -53,11 +45,7 @@ const setupMocks = ({
 }) => {
   // Mock for @-completions
   (useAtCompletion as Mock).mockImplementation(
-    ({
-      enabled,
-      setSuggestions,
-      setIsLoadingSuggestions,
-    }: UseAtCompletionProps) => {
+    ({ enabled, setSuggestions, setIsLoadingSuggestions }: UseAtCompletionProps) => {
       useEffect(() => {
         if (enabled) {
           setIsLoadingSuggestions(isLoading);
@@ -88,13 +76,13 @@ const setupMocks = ({
   );
 };
 
-describe('useCommandCompletion', () => {
+describe("useCommandCompletion", () => {
   const mockCommandContext = {} as CommandContext;
   const mockConfig = {
     getEnablePromptCompletion: () => false,
     getGeminiClient: vi.fn(),
   } as unknown as Config;
-  const testRootDir = '/';
+  const testRootDir = "/";
 
   // Helper to create real TextBuffer objects within renderHook
   function useTextBufferForTest(text: string, cursorOffset?: number) {
@@ -150,10 +138,10 @@ describe('useCommandCompletion', () => {
     vi.restoreAllMocks();
   });
 
-  describe('Core Hook Behavior', () => {
-    describe('State Management', () => {
-      it('should initialize with default state', () => {
-        const { result } = renderCommandCompletionHook('');
+  describe("Core Hook Behavior", () => {
+    describe("State Management", () => {
+      it("should initialize with default state", () => {
+        const { result } = renderCommandCompletionHook("");
 
         expect(result.current.suggestions).toEqual([]);
         expect(result.current.activeSuggestionIndex).toBe(-1);
@@ -162,12 +150,12 @@ describe('useCommandCompletion', () => {
         expect(result.current.isLoadingSuggestions).toBe(false);
       });
 
-      it('should reset state when completion mode becomes IDLE', async () => {
+      it("should reset state when completion mode becomes IDLE", async () => {
         setupMocks({
-          atSuggestions: [{ label: 'src/file.txt', value: 'src/file.txt' }],
+          atSuggestions: [{ label: "src/file.txt", value: "src/file.txt" }],
         });
 
-        const { result } = renderCommandCompletionHook('@file');
+        const { result } = renderCommandCompletionHook("@file");
 
         await waitFor(() => {
           expect(result.current.suggestions).toHaveLength(1);
@@ -176,11 +164,7 @@ describe('useCommandCompletion', () => {
         expect(result.current.showSuggestions).toBe(true);
 
         act(() => {
-          result.current.textBuffer.replaceRangeByOffset(
-            0,
-            5,
-            'just some text',
-          );
+          result.current.textBuffer.replaceRangeByOffset(0, 5, "just some text");
         });
 
         await waitFor(() => {
@@ -188,8 +172,8 @@ describe('useCommandCompletion', () => {
         });
       });
 
-      it('should reset all state to default values', () => {
-        const { result } = renderCommandCompletionHook('@files');
+      it("should reset all state to default values", () => {
+        const { result } = renderCommandCompletionHook("@files");
 
         act(() => {
           result.current.setActiveSuggestionIndex(5);
@@ -205,22 +189,22 @@ describe('useCommandCompletion', () => {
         expect(result.current.showSuggestions).toBe(false);
       });
 
-      it('should call useAtCompletion with the correct query for an escaped space', async () => {
-        const text = '@src/a\\ file.txt';
+      it("should call useAtCompletion with the correct query for an escaped space", async () => {
+        const text = "@src/a\\ file.txt";
         renderCommandCompletionHook(text);
 
         await waitFor(() => {
           expect(useAtCompletion).toHaveBeenLastCalledWith(
             expect.objectContaining({
               enabled: true,
-              pattern: 'src/a\\ file.txt',
+              pattern: "src/a\\ file.txt",
             }),
           );
         });
       });
 
-      it('should correctly identify the completion context with multiple @ symbols', async () => {
-        const text = '@file1 @file2';
+      it("should correctly identify the completion context with multiple @ symbols", async () => {
+        const text = "@file1 @file2";
         const cursorOffset = 3; // @fi|le1 @file2
 
         renderCommandCompletionHook(text, cursorOffset);
@@ -229,7 +213,7 @@ describe('useCommandCompletion', () => {
           expect(useAtCompletion).toHaveBeenLastCalledWith(
             expect.objectContaining({
               enabled: true,
-              pattern: 'file1',
+              pattern: "file1",
             }),
           );
         });
@@ -240,60 +224,49 @@ describe('useCommandCompletion', () => {
           shellModeActive: false,
           expectedSuggestions: 1,
           expectedShowSuggestions: true,
-          description:
-            'should show slash command suggestions when shellModeActive is false',
+          description: "should show slash command suggestions when shellModeActive is false",
         },
         {
           shellModeActive: true,
           expectedSuggestions: 0,
           expectedShowSuggestions: false,
-          description:
-            'should not show slash command suggestions when shellModeActive is true',
+          description: "should not show slash command suggestions when shellModeActive is true",
         },
-      ])(
-        '$description',
-        async ({
-          shellModeActive,
-          expectedSuggestions,
-          expectedShowSuggestions,
-        }) => {
-          setupMocks({
-            slashSuggestions: [{ label: 'clear', value: 'clear' }],
-          });
-
-          const { result } = renderCommandCompletionHook(
-            '/',
-            undefined,
-            shellModeActive,
-          );
+      ])("$description", async ({
+        shellModeActive,
+        expectedSuggestions,
+        expectedShowSuggestions,
+      }) => {
+        setupMocks({
+          slashSuggestions: [{ label: "clear", value: "clear" }],
+        });
 
-          await waitFor(() => {
-            expect(result.current.suggestions.length).toBe(expectedSuggestions);
-            expect(result.current.showSuggestions).toBe(
-              expectedShowSuggestions,
-            );
-          });
-        },
-      );
+        const { result } = renderCommandCompletionHook("/", undefined, shellModeActive);
+
+        await waitFor(() => {
+          expect(result.current.suggestions.length).toBe(expectedSuggestions);
+          expect(result.current.showSuggestions).toBe(expectedShowSuggestions);
+        });
+      });
     });
 
-    describe('Navigation', () => {
+    describe("Navigation", () => {
       const mockSuggestions = [
-        { label: 'cmd1', value: 'cmd1' },
-        { label: 'cmd2', value: 'cmd2' },
-        { label: 'cmd3', value: 'cmd3' },
-        { label: 'cmd4', value: 'cmd4' },
-        { label: 'cmd5', value: 'cmd5' },
+        { label: "cmd1", value: "cmd1" },
+        { label: "cmd2", value: "cmd2" },
+        { label: "cmd3", value: "cmd3" },
+        { label: "cmd4", value: "cmd4" },
+        { label: "cmd5", value: "cmd5" },
       ];
 
       beforeEach(() => {
         setupMocks({ slashSuggestions: mockSuggestions });
       });
 
-      it('should handle navigateUp with no suggestions', () => {
+      it("should handle navigateUp with no suggestions", () => {
         setupMocks({ slashSuggestions: [] });
 
-        const { result } = renderCommandCompletionHook('/');
+        const { result } = renderCommandCompletionHook("/");
 
         act(() => {
           result.current.navigateUp();
@@ -302,9 +275,9 @@ describe('useCommandCompletion', () => {
         expect(result.current.activeSuggestionIndex).toBe(-1);
       });
 
-      it('should handle navigateDown with no suggestions', () => {
+      it("should handle navigateDown with no suggestions", () => {
         setupMocks({ slashSuggestions: [] });
-        const { result } = renderCommandCompletionHook('/');
+        const { result } = renderCommandCompletionHook("/");
 
         act(() => {
           result.current.navigateDown();
@@ -313,8 +286,8 @@ describe('useCommandCompletion', () => {
         expect(result.current.activeSuggestionIndex).toBe(-1);
       });
 
-      it('should navigate up through suggestions with wrap-around', async () => {
-        const { result } = renderCommandCompletionHook('/');
+      it("should navigate up through suggestions with wrap-around", async () => {
+        const { result } = renderCommandCompletionHook("/");
 
         await waitFor(() => {
           expect(result.current.suggestions.length).toBe(5);
@@ -329,8 +302,8 @@ describe('useCommandCompletion', () => {
         expect(result.current.activeSuggestionIndex).toBe(4);
       });
 
-      it('should navigate down through suggestions with wrap-around', async () => {
-        const { result } = renderCommandCompletionHook('/');
+      it("should navigate down through suggestions with wrap-around", async () => {
+        const { result } = renderCommandCompletionHook("/");
 
         await waitFor(() => {
           expect(result.current.suggestions.length).toBe(5);
@@ -348,8 +321,8 @@ describe('useCommandCompletion', () => {
         expect(result.current.activeSuggestionIndex).toBe(0);
       });
 
-      it('should handle navigation with multiple suggestions', async () => {
-        const { result } = renderCommandCompletionHook('/');
+      it("should handle navigation with multiple suggestions", async () => {
+        const { result } = renderCommandCompletionHook("/");
 
         await waitFor(() => {
           expect(result.current.suggestions.length).toBe(5);
@@ -373,29 +346,27 @@ describe('useCommandCompletion', () => {
         expect(result.current.activeSuggestionIndex).toBe(4);
       });
 
-      it('should automatically select the first item when suggestions are available', async () => {
+      it("should automatically select the first item when suggestions are available", async () => {
         setupMocks({ slashSuggestions: mockSuggestions });
 
-        const { result } = renderCommandCompletionHook('/');
+        const { result } = renderCommandCompletionHook("/");
 
         await waitFor(() => {
-          expect(result.current.suggestions.length).toBe(
-            mockSuggestions.length,
-          );
+          expect(result.current.suggestions.length).toBe(mockSuggestions.length);
           expect(result.current.activeSuggestionIndex).toBe(0);
         });
       });
     });
   });
 
-  describe('handleAutocomplete', () => {
-    it('should complete a partial command', async () => {
+  describe("handleAutocomplete", () => {
+    it("should complete a partial command", async () => {
       setupMocks({
-        slashSuggestions: [{ label: 'memory', value: 'memory' }],
+        slashSuggestions: [{ label: "memory", value: "memory" }],
         slashCompletionRange: { completionStart: 1, completionEnd: 4 },
       });
 
-      const { result } = renderCommandCompletionHook('/mem');
+      const { result } = renderCommandCompletionHook("/mem");
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBe(1);
@@ -405,15 +376,15 @@ describe('useCommandCompletion', () => {
         result.current.handleAutocomplete(0);
       });
 
-      expect(result.current.textBuffer.text).toBe('/memory ');
+      expect(result.current.textBuffer.text).toBe("/memory ");
     });
 
-    it('should complete a file path', async () => {
+    it("should complete a file path", async () => {
       setupMocks({
-        atSuggestions: [{ label: 'src/file1.txt', value: 'src/file1.txt' }],
+        atSuggestions: [{ label: "src/file1.txt", value: "src/file1.txt" }],
       });
 
-      const { result } = renderCommandCompletionHook('@src/fi');
+      const { result } = renderCommandCompletionHook("@src/fi");
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBe(1);
@@ -423,15 +394,15 @@ describe('useCommandCompletion', () => {
         result.current.handleAutocomplete(0);
       });
 
-      expect(result.current.textBuffer.text).toBe('@src/file1.txt ');
+      expect(result.current.textBuffer.text).toBe("@src/file1.txt ");
     });
 
-    it('should complete a file path when cursor is not at the end of the line', async () => {
-      const text = '@src/fi is a good file';
+    it("should complete a file path when cursor is not at the end of the line", async () => {
+      const text = "@src/fi is a good file";
       const cursorOffset = 7; // after "i"
 
       setupMocks({
-        atSuggestions: [{ label: 'src/file1.txt', value: 'src/file1.txt' }],
+        atSuggestions: [{ label: "src/file1.txt", value: "src/file1.txt" }],
       });
 
       const { result } = renderCommandCompletionHook(text, cursorOffset);
@@ -444,17 +415,15 @@ describe('useCommandCompletion', () => {
         result.current.handleAutocomplete(0);
       });
 
-      expect(result.current.textBuffer.text).toBe(
-        '@src/file1.txt is a good file',
-      );
+      expect(result.current.textBuffer.text).toBe("@src/file1.txt is a good file");
     });
 
-    it('should complete a directory path ending with / without a trailing space', async () => {
+    it("should complete a directory path ending with / without a trailing space", async () => {
       setupMocks({
-        atSuggestions: [{ label: 'src/components/', value: 'src/components/' }],
+        atSuggestions: [{ label: "src/components/", value: "src/components/" }],
       });
 
-      const { result } = renderCommandCompletionHook('@src/comp');
+      const { result } = renderCommandCompletionHook("@src/comp");
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBe(1);
@@ -464,17 +433,15 @@ describe('useCommandCompletion', () => {
         result.current.handleAutocomplete(0);
       });
 
-      expect(result.current.textBuffer.text).toBe('@src/components/');
+      expect(result.current.textBuffer.text).toBe("@src/components/");
     });
 
-    it('should complete a directory path ending with \\ without a trailing space', async () => {
+    it("should complete a directory path ending with \\ without a trailing space", async () => {
       setupMocks({
-        atSuggestions: [
-          { label: 'src\\components\\', value: 'src\\components\\' },
-        ],
+        atSuggestions: [{ label: "src\\components\\", value: "src\\components\\" }],
       });
 
-      const { result } = renderCommandCompletionHook('@src\\comp');
+      const { result } = renderCommandCompletionHook("@src\\comp");
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBe(1);
@@ -484,12 +451,12 @@ describe('useCommandCompletion', () => {
         result.current.handleAutocomplete(0);
       });
 
-      expect(result.current.textBuffer.text).toBe('@src\\components\\');
+      expect(result.current.textBuffer.text).toBe("@src\\components\\");
     });
   });
 
-  describe('prompt completion filtering', () => {
-    it('should not trigger prompt completion for line comments', async () => {
+  describe("prompt completion filtering", () => {
+    it("should not trigger prompt completion for line comments", async () => {
       const mockConfig = {
         getEnablePromptCompletion: () => true,
         getGeminiClient: vi.fn(),
@@ -500,7 +467,7 @@ describe('useCommandCompletion', () => {
       };
 
       function TestComponent() {
-        const textBuffer = useTextBufferForTest('// This is a line comment');
+        const textBuffer = useTextBufferForTest("// This is a line comment");
         const completion = useCommandCompletion(
           textBuffer,
           testRootDir,
@@ -519,7 +486,7 @@ describe('useCommandCompletion', () => {
       expect(hookResult!.suggestions.length).toBe(0);
     });
 
-    it('should not trigger prompt completion for block comments', async () => {
+    it("should not trigger prompt completion for block comments", async () => {
       const mockConfig = {
         getEnablePromptCompletion: () => true,
         getGeminiClient: vi.fn(),
@@ -530,9 +497,7 @@ describe('useCommandCompletion', () => {
       };
 
       function TestComponent() {
-        const textBuffer = useTextBufferForTest(
-          '/* This is a block comment */',
-        );
+        const textBuffer = useTextBufferForTest("/* This is a block comment */");
         const completion = useCommandCompletion(
           textBuffer,
           testRootDir,
@@ -551,7 +516,7 @@ describe('useCommandCompletion', () => {
       expect(hookResult!.suggestions.length).toBe(0);
     });
 
-    it('should trigger prompt completion for regular text when enabled', async () => {
+    it("should trigger prompt completion for regular text when enabled", async () => {
       const mockConfig = {
         getEnablePromptCompletion: () => true,
         getGeminiClient: vi.fn(),
@@ -563,7 +528,7 @@ describe('useCommandCompletion', () => {
 
       function TestComponent() {
         const textBuffer = useTextBufferForTest(
-          'This is regular text that should trigger completion',
+          "This is regular text that should trigger completion",
         );
         const completion = useCommandCompletion(
           textBuffer,
@@ -581,7 +546,7 @@ describe('useCommandCompletion', () => {
 
       // This test verifies that comments are filtered out while regular text is not
       expect(hookResult!.textBuffer.text).toBe(
-        'This is regular text that should trigger completion',
+        "This is regular text that should trigger completion",
       );
     });
   });
diff --git a/packages/ui-gemini/src/ui/hooks/useCommandCompletion.tsx b/packages/ui-gemini/src/ui/hooks/useCommandCompletion.tsx
index f735dac3c..49ced80db 100644
--- a/packages/ui-gemini/src/ui/hooks/useCommandCompletion.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useCommandCompletion.tsx
@@ -4,28 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useMemo, useEffect } from 'react';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import { logicalPosToOffset } from '../components/shared/text-buffer.js';
-import { isSlashCommand } from '../utils/commandUtils.js';
-import { toCodePoints } from '../utils/textUtils.js';
-import { useAtCompletion } from './useAtCompletion.js';
-import { useSlashCompletion } from './useSlashCompletion.js';
-import type { PromptCompletion } from './usePromptCompletion.js';
-import {
-  usePromptCompletion,
-  PROMPT_COMPLETION_MIN_LENGTH,
-} from './usePromptCompletion.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { useCompletion } from './useCompletion.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useMemo } from "react";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import { logicalPosToOffset } from "../components/shared/text-buffer.js";
+import { isSlashCommand } from "../utils/commandUtils.js";
+import { toCodePoints } from "../utils/textUtils.js";
+import { useAtCompletion } from "./useAtCompletion.js";
+import { useCompletion } from "./useCompletion.js";
+import type { PromptCompletion } from "./usePromptCompletion.js";
+import { PROMPT_COMPLETION_MIN_LENGTH, usePromptCompletion } from "./usePromptCompletion.js";
+import { useSlashCompletion } from "./useSlashCompletion.js";
 
 export enum CompletionMode {
-  IDLE = 'IDLE',
-  AT = 'AT',
-  SLASH = 'SLASH',
-  PROMPT = 'PROMPT',
+  IDLE = "IDLE",
+  AT = "AT",
+  SLASH = "SLASH",
+  PROMPT = "PROMPT",
 }
 
 export interface UseCommandCompletionReturn {
@@ -42,15 +39,11 @@ export interface UseCommandCompletionReturn {
   navigateDown: () => void;
   handleAutocomplete: (indexToUse: number) => void;
   promptCompletion: PromptCompletion;
-  getCommandFromSuggestion: (
-    suggestion: Suggestion,
-  ) => SlashCommand | undefined;
+  getCommandFromSuggestion: (suggestion: Suggestion) => SlashCommand | undefined;
   slashCompletionRange: {
     completionStart: number;
     completionEnd: number;
-    getCommandFromSuggestion: (
-      suggestion: Suggestion,
-    ) => SlashCommand | undefined;
+    getCommandFromSuggestion: (suggestion: Suggestion) => SlashCommand | undefined;
     isArgumentCompletion: boolean;
     leafCommand: SlashCommand | null;
   };
@@ -89,86 +82,84 @@ export function useCommandCompletion(
   const cursorRow = buffer.cursor[0];
   const cursorCol = buffer.cursor[1];
 
-  const { completionMode, query, completionStart, completionEnd } =
-    useMemo(() => {
-      const currentLine = buffer.lines[cursorRow] || '';
-      if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
-        return {
-          completionMode: CompletionMode.SLASH,
-          query: currentLine,
-          completionStart: 0,
-          completionEnd: currentLine.length,
-        };
-      }
+  const { completionMode, query, completionStart, completionEnd } = useMemo(() => {
+    const currentLine = buffer.lines[cursorRow] || "";
+    if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
+      return {
+        completionMode: CompletionMode.SLASH,
+        query: currentLine,
+        completionStart: 0,
+        completionEnd: currentLine.length,
+      };
+    }
 
-      const codePoints = toCodePoints(currentLine);
-      for (let i = cursorCol - 1; i >= 0; i--) {
-        const char = codePoints[i];
+    const codePoints = toCodePoints(currentLine);
+    for (let i = cursorCol - 1; i >= 0; i--) {
+      const char = codePoints[i];
 
-        if (char === ' ') {
-          let backslashCount = 0;
-          for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-            backslashCount++;
-          }
-          if (backslashCount % 2 === 0) {
-            break;
-          }
-        } else if (char === '@') {
-          let end = codePoints.length;
-          for (let i = cursorCol; i < codePoints.length; i++) {
-            if (codePoints[i] === ' ') {
-              let backslashCount = 0;
-              for (let j = i - 1; j >= 0 && codePoints[j] === '\\'; j--) {
-                backslashCount++;
-              }
+      if (char === " ") {
+        let backslashCount = 0;
+        for (let j = i - 1; j >= 0 && codePoints[j] === "\\"; j--) {
+          backslashCount++;
+        }
+        if (backslashCount % 2 === 0) {
+          break;
+        }
+      } else if (char === "@") {
+        let end = codePoints.length;
+        for (let i = cursorCol; i < codePoints.length; i++) {
+          if (codePoints[i] === " ") {
+            let backslashCount = 0;
+            for (let j = i - 1; j >= 0 && codePoints[j] === "\\"; j--) {
+              backslashCount++;
+            }
 
-              if (backslashCount % 2 === 0) {
-                end = i;
-                break;
-              }
+            if (backslashCount % 2 === 0) {
+              end = i;
+              break;
             }
           }
-          const pathStart = i + 1;
-          const partialPath = currentLine.substring(pathStart, end);
-          return {
-            completionMode: CompletionMode.AT,
-            query: partialPath,
-            completionStart: pathStart,
-            completionEnd: end,
-          };
         }
-      }
-
-      // Check for prompt completion - only if enabled
-      const trimmedText = buffer.text.trim();
-      const isPromptCompletionEnabled =
-        config?.getEnablePromptCompletion() ?? false;
-
-      if (
-        isPromptCompletionEnabled &&
-        trimmedText.length >= PROMPT_COMPLETION_MIN_LENGTH &&
-        !isSlashCommand(trimmedText) &&
-        !trimmedText.includes('@')
-      ) {
+        const pathStart = i + 1;
+        const partialPath = currentLine.substring(pathStart, end);
         return {
-          completionMode: CompletionMode.PROMPT,
-          query: trimmedText,
-          completionStart: 0,
-          completionEnd: trimmedText.length,
+          completionMode: CompletionMode.AT,
+          query: partialPath,
+          completionStart: pathStart,
+          completionEnd: end,
         };
       }
+    }
+
+    // Check for prompt completion - only if enabled
+    const trimmedText = buffer.text.trim();
+    const isPromptCompletionEnabled = config?.getEnablePromptCompletion() ?? false;
 
+    if (
+      isPromptCompletionEnabled &&
+      trimmedText.length >= PROMPT_COMPLETION_MIN_LENGTH &&
+      !isSlashCommand(trimmedText) &&
+      !trimmedText.includes("@")
+    ) {
       return {
-        completionMode: CompletionMode.IDLE,
-        query: null,
-        completionStart: -1,
-        completionEnd: -1,
+        completionMode: CompletionMode.PROMPT,
+        query: trimmedText,
+        completionStart: 0,
+        completionEnd: trimmedText.length,
       };
-    }, [cursorRow, cursorCol, buffer.lines, buffer.text, config]);
+    }
+
+    return {
+      completionMode: CompletionMode.IDLE,
+      query: null,
+      completionStart: -1,
+      completionEnd: -1,
+    };
+  }, [cursorRow, cursorCol, buffer.lines, buffer.text, config]);
 
   useAtCompletion({
     enabled: completionMode === CompletionMode.AT,
-    pattern: query || '',
+    pattern: query || "",
     config,
     cwd,
     setSuggestions,
@@ -221,7 +212,7 @@ export function useCommandCompletion(
    */
   const getCompletedText = useCallback(
     (suggestion: Suggestion): string | null => {
-      const currentLine = buffer.lines[cursorRow] || '';
+      const currentLine = buffer.lines[cursorRow] || "";
 
       let start = completionStart;
       let end = completionEnd;
@@ -238,26 +229,15 @@ export function useCommandCompletion(
       let suggestionText = suggestion.value;
       if (completionMode === CompletionMode.SLASH) {
         // Add leading space if completing a subcommand (cursor is after parent command with no space)
-        if (start === end && start > 1 && currentLine[start - 1] !== ' ') {
-          suggestionText = ' ' + suggestionText;
+        if (start === end && start > 1 && currentLine[start - 1] !== " ") {
+          suggestionText = " " + suggestionText;
         }
       }
 
       // Build the completed text with proper spacing
-      return (
-        currentLine.substring(0, start) +
-        suggestionText +
-        currentLine.substring(end)
-      );
+      return currentLine.substring(0, start) + suggestionText + currentLine.substring(end);
     },
-    [
-      cursorRow,
-      buffer.lines,
-      completionMode,
-      completionStart,
-      completionEnd,
-      slashCompletionRange,
-    ],
+    [cursorRow, buffer.lines, completionMode, completionStart, completionEnd, slashCompletionRange],
   );
 
   const handleAutocomplete = useCallback(
@@ -282,23 +262,19 @@ export function useCommandCompletion(
       // Add space padding for Tab completion (auto-execute gets padding from getCompletedText)
       let suggestionText = suggestion.value;
       if (completionMode === CompletionMode.SLASH) {
-        if (
-          start === end &&
-          start > 1 &&
-          (buffer.lines[cursorRow] || '')[start - 1] !== ' '
-        ) {
-          suggestionText = ' ' + suggestionText;
+        if (start === end && start > 1 && (buffer.lines[cursorRow] || "")[start - 1] !== " ") {
+          suggestionText = " " + suggestionText;
         }
       }
 
-      const lineCodePoints = toCodePoints(buffer.lines[cursorRow] || '');
+      const lineCodePoints = toCodePoints(buffer.lines[cursorRow] || "");
       const charAfterCompletion = lineCodePoints[end];
       if (
-        charAfterCompletion !== ' ' &&
-        !suggestionText.endsWith('/') &&
-        !suggestionText.endsWith('\\')
+        charAfterCompletion !== " " &&
+        !suggestionText.endsWith("/") &&
+        !suggestionText.endsWith("\\")
       ) {
-        suggestionText += ' ';
+        suggestionText += " ";
       }
 
       buffer.replaceRangeByOffset(
diff --git a/packages/ui-gemini/src/ui/hooks/useCompletion.ts b/packages/ui-gemini/src/ui/hooks/useCompletion.ts
index 8d3d4c2f3..8a5f3bf69 100644
--- a/packages/ui-gemini/src/ui/hooks/useCompletion.ts
+++ b/packages/ui-gemini/src/ui/hooks/useCompletion.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import { MAX_SUGGESTIONS_TO_SHOW } from '../components/SuggestionsDisplay.js';
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import { MAX_SUGGESTIONS_TO_SHOW } from "../components/SuggestionsDisplay.js";
 
 export interface UseCompletionReturn {
   suggestions: Suggestion[];
@@ -29,12 +29,10 @@ export interface UseCompletionReturn {
 
 export function useCompletion(): UseCompletionReturn {
   const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
-  const [activeSuggestionIndex, setActiveSuggestionIndex] =
-    useState<number>(-1);
+  const [activeSuggestionIndex, setActiveSuggestionIndex] = useState<number>(-1);
   const [visibleStartIndex, setVisibleStartIndex] = useState<number>(0);
   const [showSuggestions, setShowSuggestions] = useState<boolean>(false);
-  const [isLoadingSuggestions, setIsLoadingSuggestions] =
-    useState<boolean>(false);
+  const [isLoadingSuggestions, setIsLoadingSuggestions] = useState<boolean>(false);
   const [isPerfectMatch, setIsPerfectMatch] = useState<boolean>(false);
 
   const resetCompletionState = useCallback(() => {
@@ -51,8 +49,7 @@ export function useCompletion(): UseCompletionReturn {
 
     setActiveSuggestionIndex((prevActiveIndex) => {
       // Calculate new active index, handling wrap-around
-      const newActiveIndex =
-        prevActiveIndex <= 0 ? suggestions.length - 1 : prevActiveIndex - 1;
+      const newActiveIndex = prevActiveIndex <= 0 ? suggestions.length - 1 : prevActiveIndex - 1;
 
       // Adjust scroll position based on the new active index
       setVisibleStartIndex((prevVisibleStart) => {
@@ -80,16 +77,12 @@ export function useCompletion(): UseCompletionReturn {
 
     setActiveSuggestionIndex((prevActiveIndex) => {
       // Calculate new active index, handling wrap-around
-      const newActiveIndex =
-        prevActiveIndex >= suggestions.length - 1 ? 0 : prevActiveIndex + 1;
+      const newActiveIndex = prevActiveIndex >= suggestions.length - 1 ? 0 : prevActiveIndex + 1;
 
       // Adjust scroll position based on the new active index
       setVisibleStartIndex((prevVisibleStart) => {
         // Case 1: Wrapped around to the first item
-        if (
-          newActiveIndex === 0 &&
-          suggestions.length > MAX_SUGGESTIONS_TO_SHOW
-        ) {
+        if (newActiveIndex === 0 && suggestions.length > MAX_SUGGESTIONS_TO_SHOW) {
           return 0;
         }
         // Case 2: Scrolled below the current visible window
diff --git a/packages/ui-gemini/src/ui/hooks/useConsoleMessages.test.tsx b/packages/ui-gemini/src/ui/hooks/useConsoleMessages.test.tsx
index 886ffbea7..32ee2ce8f 100644
--- a/packages/ui-gemini/src/ui/hooks/useConsoleMessages.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useConsoleMessages.test.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act, useCallback } from 'react';
-import { vi } from 'vitest';
-import { render } from '../../test-utils/render.js';
-import { useConsoleMessages } from './useConsoleMessages.js';
-import { CoreEvent, type ConsoleLogPayload } from '@airiscode/gemini-cli-core';
+import { type ConsoleLogPayload, CoreEvent } from "@airiscode/gemini-cli-core";
+import { act, useCallback } from "react";
+import { vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { useConsoleMessages } from "./useConsoleMessages.js";
 
 // Mock coreEvents
 let consoleLogHandler: ((payload: ConsoleLogPayload) => void) | undefined;
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const actual = (await importOriginal()) as any;
   return {
@@ -34,7 +34,7 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-describe('useConsoleMessages', () => {
+describe("useConsoleMessages", () => {
   beforeEach(() => {
     vi.useFakeTimers();
     consoleLogHandler = undefined;
@@ -50,12 +50,12 @@ describe('useConsoleMessages', () => {
     const { ...rest } = useConsoleMessages();
     const log = useCallback((content: string) => {
       if (consoleLogHandler) {
-        consoleLogHandler({ type: 'log', content });
+        consoleLogHandler({ type: "log", content });
       }
     }, []);
     const error = useCallback((content: string) => {
       if (consoleLogHandler) {
-        consoleLogHandler({ type: 'error', content });
+        consoleLogHandler({ type: "error", content });
       }
     }, []);
     return {
@@ -83,16 +83,16 @@ describe('useConsoleMessages', () => {
     };
   };
 
-  it('should initialize with an empty array of console messages', () => {
+  it("should initialize with an empty array of console messages", () => {
     const { result } = renderConsoleMessagesHook();
     expect(result.current.consoleMessages).toEqual([]);
   });
 
-  it('should add a new message when log is called', async () => {
+  it("should add a new message when log is called", async () => {
     const { result } = renderConsoleMessagesHook();
 
     act(() => {
-      result.current.log('Test message');
+      result.current.log("Test message");
     });
 
     await act(async () => {
@@ -100,17 +100,17 @@ describe('useConsoleMessages', () => {
     });
 
     expect(result.current.consoleMessages).toEqual([
-      { type: 'log', content: 'Test message', count: 1 },
+      { type: "log", content: "Test message", count: 1 },
     ]);
   });
 
-  it('should batch and count identical consecutive messages', async () => {
+  it("should batch and count identical consecutive messages", async () => {
     const { result } = renderConsoleMessagesHook();
 
     act(() => {
-      result.current.log('Test message');
-      result.current.log('Test message');
-      result.current.log('Test message');
+      result.current.log("Test message");
+      result.current.log("Test message");
+      result.current.log("Test message");
     });
 
     await act(async () => {
@@ -118,16 +118,16 @@ describe('useConsoleMessages', () => {
     });
 
     expect(result.current.consoleMessages).toEqual([
-      { type: 'log', content: 'Test message', count: 3 },
+      { type: "log", content: "Test message", count: 3 },
     ]);
   });
 
-  it('should not batch different messages', async () => {
+  it("should not batch different messages", async () => {
     const { result } = renderConsoleMessagesHook();
 
     act(() => {
-      result.current.log('First message');
-      result.current.error('Second message');
+      result.current.log("First message");
+      result.current.error("Second message");
     });
 
     await act(async () => {
@@ -135,16 +135,16 @@ describe('useConsoleMessages', () => {
     });
 
     expect(result.current.consoleMessages).toEqual([
-      { type: 'log', content: 'First message', count: 1 },
-      { type: 'error', content: 'Second message', count: 1 },
+      { type: "log", content: "First message", count: 1 },
+      { type: "error", content: "Second message", count: 1 },
     ]);
   });
 
-  it('should clear all messages when clearConsoleMessages is called', async () => {
+  it("should clear all messages when clearConsoleMessages is called", async () => {
     const { result } = renderConsoleMessagesHook();
 
     act(() => {
-      result.current.log('A message');
+      result.current.log("A message");
     });
 
     await act(async () => {
@@ -160,12 +160,12 @@ describe('useConsoleMessages', () => {
     expect(result.current.consoleMessages).toHaveLength(0);
   });
 
-  it('should clear the pending timeout when clearConsoleMessages is called', () => {
+  it("should clear the pending timeout when clearConsoleMessages is called", () => {
     const { result } = renderConsoleMessagesHook();
-    const clearTimeoutSpy = vi.spyOn(global, 'clearTimeout');
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
 
     act(() => {
-      result.current.log('A message');
+      result.current.log("A message");
     });
 
     act(() => {
@@ -176,12 +176,12 @@ describe('useConsoleMessages', () => {
     // clearTimeoutSpy.mockRestore() is handled by afterEach restoreAllMocks
   });
 
-  it('should clean up the timeout on unmount', () => {
+  it("should clean up the timeout on unmount", () => {
     const { result, unmount } = renderConsoleMessagesHook();
-    const clearTimeoutSpy = vi.spyOn(global, 'clearTimeout');
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
 
     act(() => {
-      result.current.log('A message');
+      result.current.log("A message");
     });
 
     unmount();
diff --git a/packages/ui-gemini/src/ui/hooks/useConsoleMessages.ts b/packages/ui-gemini/src/ui/hooks/useConsoleMessages.ts
index 769d7cdf9..da03baa2f 100644
--- a/packages/ui-gemini/src/ui/hooks/useConsoleMessages.ts
+++ b/packages/ui-gemini/src/ui/hooks/useConsoleMessages.ts
@@ -4,35 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  useCallback,
-  useEffect,
-  useReducer,
-  useRef,
-  useTransition,
-} from 'react';
-import type { ConsoleMessageItem } from '../types.js';
-import {
-  coreEvents,
-  CoreEvent,
-  type ConsoleLogPayload,
-} from '@airiscode/gemini-cli-core';
+import { type ConsoleLogPayload, CoreEvent, coreEvents } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useReducer, useRef, useTransition } from "react";
+import type { ConsoleMessageItem } from "../types.js";
 
 export interface UseConsoleMessagesReturn {
   consoleMessages: ConsoleMessageItem[];
   clearConsoleMessages: () => void;
 }
 
-type Action =
-  | { type: 'ADD_MESSAGES'; payload: ConsoleMessageItem[] }
-  | { type: 'CLEAR' };
+type Action = { type: "ADD_MESSAGES"; payload: ConsoleMessageItem[] } | { type: "CLEAR" };
 
-function consoleMessagesReducer(
-  state: ConsoleMessageItem[],
-  action: Action,
-): ConsoleMessageItem[] {
+function consoleMessagesReducer(state: ConsoleMessageItem[], action: Action): ConsoleMessageItem[] {
   switch (action.type) {
-    case 'ADD_MESSAGES': {
+    case "ADD_MESSAGES": {
       const newMessages = [...state];
       for (const queuedMessage of action.payload) {
         const lastMessage = newMessages[newMessages.length - 1];
@@ -53,7 +38,7 @@ function consoleMessagesReducer(
       }
       return newMessages;
     }
-    case 'CLEAR':
+    case "CLEAR":
       return [];
     default:
       return state;
@@ -71,7 +56,7 @@ export function useConsoleMessages(): UseConsoleMessagesReturn {
       const messagesToProcess = messageQueueRef.current;
       messageQueueRef.current = [];
       startTransition(() => {
-        dispatch({ type: 'ADD_MESSAGES', payload: messagesToProcess });
+        dispatch({ type: "ADD_MESSAGES", payload: messagesToProcess });
       });
     }
     timeoutRef.current = null;
@@ -98,18 +83,13 @@ export function useConsoleMessages(): UseConsoleMessagesReturn {
       });
     };
 
-    const handleOutput = (payload: {
-      isStderr: boolean;
-      chunk: Uint8Array | string;
-    }) => {
+    const handleOutput = (payload: { isStderr: boolean; chunk: Uint8Array | string }) => {
       const content =
-        typeof payload.chunk === 'string'
-          ? payload.chunk
-          : new TextDecoder().decode(payload.chunk);
+        typeof payload.chunk === "string" ? payload.chunk : new TextDecoder().decode(payload.chunk);
       // It would be nice if we could show stderr as 'warn' but unfortunately
       // we log non warning info to stderr before the app starts so that would
       // be misleading.
-      handleNewMessage({ type: 'log', content, count: 1 });
+      handleNewMessage({ type: "log", content, count: 1 });
     };
 
     coreEvents.on(CoreEvent.ConsoleLog, handleConsoleLog);
@@ -127,7 +107,7 @@ export function useConsoleMessages(): UseConsoleMessagesReturn {
     }
     messageQueueRef.current = [];
     startTransition(() => {
-      dispatch({ type: 'CLEAR' });
+      dispatch({ type: "CLEAR" });
     });
   }, []);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useEditorSettings.test.tsx b/packages/ui-gemini/src/ui/hooks/useEditorSettings.test.tsx
index 00fee20c2..29373ed35 100644
--- a/packages/ui-gemini/src/ui/hooks/useEditorSettings.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useEditorSettings.test.tsx
@@ -5,34 +5,22 @@
  */
 
 import {
-  afterEach,
-  beforeEach,
-  describe,
-  expect,
-  it,
-  vi,
-  type MockedFunction,
-} from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { useEditorSettings } from './useEditorSettings.js';
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-} from '../../config/settings.js';
-import { SettingScope } from '../../config/settings.js';
-import { MessageType } from '../types.js';
-import {
-  type EditorType,
-  checkHasEditorType,
   allowEditorTypeInSandbox,
-} from '@airiscode/gemini-cli-core';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-
-import { SettingPaths } from '../../config/settingPaths.js';
-
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actual = await vi.importActual('@airiscode/gemini-cli-core');
+  checkHasEditorType,
+  type EditorType,
+} from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, type MockedFunction, vi } from "vitest";
+import { SettingPaths } from "../../config/settingPaths.js";
+import type { LoadableSettingScope, LoadedSettings } from "../../config/settings.js";
+import { SettingScope } from "../../config/settings.js";
+import { render } from "../../test-utils/render.js";
+import { MessageType } from "../types.js";
+import { useEditorSettings } from "./useEditorSettings.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actual = await vi.importActual("@airiscode/gemini-cli-core");
   return {
     ...actual,
     checkHasEditorType: vi.fn(() => true),
@@ -43,18 +31,14 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
 const mockCheckHasEditorType = vi.mocked(checkHasEditorType);
 const mockAllowEditorTypeInSandbox = vi.mocked(allowEditorTypeInSandbox);
 
-describe('useEditorSettings', () => {
+describe("useEditorSettings", () => {
   let mockLoadedSettings: LoadedSettings;
   let mockSetEditorError: MockedFunction<(error: string | null) => void>;
-  let mockAddItem: MockedFunction<UseHistoryManagerReturn['addItem']>;
+  let mockAddItem: MockedFunction<UseHistoryManagerReturn["addItem"]>;
   let result: ReturnType<typeof useEditorSettings>;
 
   function TestComponent() {
-    result = useEditorSettings(
-      mockLoadedSettings,
-      mockSetEditorError,
-      mockAddItem,
-    );
+    result = useEditorSettings(mockLoadedSettings, mockSetEditorError, mockAddItem);
     return null;
   }
 
@@ -77,13 +61,13 @@ describe('useEditorSettings', () => {
     vi.restoreAllMocks();
   });
 
-  it('should initialize with dialog closed', () => {
+  it("should initialize with dialog closed", () => {
     render(<TestComponent />);
 
     expect(result.isEditorDialogOpen).toBe(false);
   });
 
-  it('should open editor dialog when openEditorDialog is called', () => {
+  it("should open editor dialog when openEditorDialog is called", () => {
     render(<TestComponent />);
 
     act(() => {
@@ -93,7 +77,7 @@ describe('useEditorSettings', () => {
     expect(result.isEditorDialogOpen).toBe(true);
   });
 
-  it('should close editor dialog when exitEditorDialog is called', () => {
+  it("should close editor dialog when exitEditorDialog is called", () => {
     render(<TestComponent />);
     act(() => {
       result.openEditorDialog();
@@ -102,10 +86,10 @@ describe('useEditorSettings', () => {
     expect(result.isEditorDialogOpen).toBe(false);
   });
 
-  it('should handle editor selection successfully', () => {
+  it("should handle editor selection successfully", () => {
     render(<TestComponent />);
 
-    const editorType: EditorType = 'vscode';
+    const editorType: EditorType = "vscode";
     const scope = SettingScope.User;
 
     act(() => {
@@ -131,7 +115,7 @@ describe('useEditorSettings', () => {
     expect(result.isEditorDialogOpen).toBe(false);
   });
 
-  it('should handle clearing editor preference (undefined editor)', () => {
+  it("should handle clearing editor preference (undefined editor)", () => {
     render(<TestComponent />);
 
     const scope = SettingScope.Workspace;
@@ -150,7 +134,7 @@ describe('useEditorSettings', () => {
     expect(mockAddItem).toHaveBeenCalledWith(
       {
         type: MessageType.INFO,
-        text: 'Editor preference cleared in Workspace settings.',
+        text: "Editor preference cleared in Workspace settings.",
       },
       expect.any(Number),
     );
@@ -159,14 +143,14 @@ describe('useEditorSettings', () => {
     expect(result.isEditorDialogOpen).toBe(false);
   });
 
-  it('should handle different editor types', () => {
+  it("should handle different editor types", () => {
     render(<TestComponent />);
 
-    const editorTypes: EditorType[] = ['cursor', 'windsurf', 'vim'];
+    const editorTypes: EditorType[] = ["cursor", "windsurf", "vim"];
     const displayNames: Record<string, string> = {
-      cursor: 'Cursor',
-      windsurf: 'Windsurf',
-      vim: 'Vim',
+      cursor: "Cursor",
+      windsurf: "Windsurf",
+      vim: "Vim",
     };
     const scope = SettingScope.User;
 
@@ -191,14 +175,11 @@ describe('useEditorSettings', () => {
     });
   });
 
-  it('should handle different setting scopes', () => {
+  it("should handle different setting scopes", () => {
     render(<TestComponent />);
 
-    const editorType: EditorType = 'vscode';
-    const scopes: LoadableSettingScope[] = [
-      SettingScope.User,
-      SettingScope.Workspace,
-    ];
+    const editorType: EditorType = "vscode";
+    const scopes: LoadableSettingScope[] = [SettingScope.User, SettingScope.Workspace];
 
     scopes.forEach((scope) => {
       act(() => {
@@ -221,12 +202,12 @@ describe('useEditorSettings', () => {
     });
   });
 
-  it('should not set preference for unavailable editors', () => {
+  it("should not set preference for unavailable editors", () => {
     render(<TestComponent />);
 
     mockCheckHasEditorType.mockReturnValue(false);
 
-    const editorType: EditorType = 'vscode';
+    const editorType: EditorType = "vscode";
     const scope = SettingScope.User;
 
     act(() => {
@@ -239,12 +220,12 @@ describe('useEditorSettings', () => {
     expect(result.isEditorDialogOpen).toBe(true);
   });
 
-  it('should not set preference for editors not allowed in sandbox', () => {
+  it("should not set preference for editors not allowed in sandbox", () => {
     render(<TestComponent />);
 
     mockAllowEditorTypeInSandbox.mockReturnValue(false);
 
-    const editorType: EditorType = 'vscode';
+    const editorType: EditorType = "vscode";
     const scope = SettingScope.User;
 
     act(() => {
@@ -257,19 +238,17 @@ describe('useEditorSettings', () => {
     expect(result.isEditorDialogOpen).toBe(true);
   });
 
-  it('should handle errors during editor selection', () => {
+  it("should handle errors during editor selection", () => {
     render(<TestComponent />);
 
-    const errorMessage = 'Failed to save settings';
+    const errorMessage = "Failed to save settings";
     (
-      mockLoadedSettings.setValue as MockedFunction<
-        typeof mockLoadedSettings.setValue
-      >
+      mockLoadedSettings.setValue as MockedFunction<typeof mockLoadedSettings.setValue>
     ).mockImplementation(() => {
       throw new Error(errorMessage);
     });
 
-    const editorType: EditorType = 'vscode';
+    const editorType: EditorType = "vscode";
     const scope = SettingScope.User;
 
     act(() => {
diff --git a/packages/ui-gemini/src/ui/hooks/useEditorSettings.ts b/packages/ui-gemini/src/ui/hooks/useEditorSettings.ts
index 898cbc741..d851b5ba4 100644
--- a/packages/ui-gemini/src/ui/hooks/useEditorSettings.ts
+++ b/packages/ui-gemini/src/ui/hooks/useEditorSettings.ts
@@ -4,36 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-} from '../../config/settings.js';
-import { MessageType } from '../types.js';
-import type { EditorType } from '@airiscode/gemini-cli-core';
+import type { EditorType } from "@airiscode/gemini-cli-core";
 import {
   allowEditorTypeInSandbox,
   checkHasEditorType,
   getEditorDisplayName,
-} from '@airiscode/gemini-cli-core';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-
-import { SettingPaths } from '../../config/settingPaths.js';
+} from "@airiscode/gemini-cli-core";
+import { useCallback, useState } from "react";
+import { SettingPaths } from "../../config/settingPaths.js";
+import type { LoadableSettingScope, LoadedSettings } from "../../config/settings.js";
+import { MessageType } from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 interface UseEditorSettingsReturn {
   isEditorDialogOpen: boolean;
   openEditorDialog: () => void;
-  handleEditorSelect: (
-    editorType: EditorType | undefined,
-    scope: LoadableSettingScope,
-  ) => void;
+  handleEditorSelect: (editorType: EditorType | undefined, scope: LoadableSettingScope) => void;
   exitEditorDialog: () => void;
 }
 
 export const useEditorSettings = (
   loadedSettings: LoadedSettings,
   setEditorError: (error: string | null) => void,
-  addItem: UseHistoryManagerReturn['addItem'],
+  addItem: UseHistoryManagerReturn["addItem"],
 ): UseEditorSettingsReturn => {
   const [isEditorDialogOpen, setIsEditorDialogOpen] = useState(false);
 
@@ -45,22 +38,17 @@ export const useEditorSettings = (
     (editorType: EditorType | undefined, scope: LoadableSettingScope) => {
       if (
         editorType &&
-        (!checkHasEditorType(editorType) ||
-          !allowEditorTypeInSandbox(editorType))
+        (!checkHasEditorType(editorType) || !allowEditorTypeInSandbox(editorType))
       ) {
         return;
       }
 
       try {
-        loadedSettings.setValue(
-          scope,
-          SettingPaths.General.PreferredEditor,
-          editorType,
-        );
+        loadedSettings.setValue(scope, SettingPaths.General.PreferredEditor, editorType);
         addItem(
           {
             type: MessageType.INFO,
-            text: `Editor preference ${editorType ? `set to "${getEditorDisplayName(editorType)}"` : 'cleared'} in ${scope} settings.`,
+            text: `Editor preference ${editorType ? `set to "${getEditorDisplayName(editorType)}"` : "cleared"} in ${scope} settings.`,
           },
           Date.now(),
         );
diff --git a/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.test.tsx b/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.test.tsx
index d51befb78..090b1532b 100644
--- a/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.test.tsx
@@ -4,53 +4,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { createExtension } from '../../test-utils/createExtension.js';
-import { useExtensionUpdates } from './useExtensionUpdates.js';
-import { GEMINI_DIR } from '@airiscode/gemini-cli-core';
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { MessageType } from '../types.js';
-import {
-  checkForAllExtensionUpdates,
-  updateExtension,
-} from '../../config/extensions/update.js';
-import { ExtensionUpdateState } from '../state/extensions.js';
-import { ExtensionManager } from '../../config/extension-manager.js';
-import { loadSettings } from '../../config/settings.js';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { GEMINI_DIR } from "@airiscode/gemini-cli-core";
+import { vi } from "vitest";
+import { ExtensionManager } from "../../config/extension-manager.js";
+import { checkForAllExtensionUpdates, updateExtension } from "../../config/extensions/update.js";
+import { loadSettings } from "../../config/settings.js";
+import { waitFor } from "../../test-utils/async.js";
+import { createExtension } from "../../test-utils/createExtension.js";
+import { render } from "../../test-utils/render.js";
+import { ExtensionUpdateState } from "../state/extensions.js";
+import { MessageType } from "../types.js";
+import { useExtensionUpdates } from "./useExtensionUpdates.js";
 
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const mockedOs = await importOriginal<typeof os>();
   return {
     ...mockedOs,
-    homedir: vi.fn().mockReturnValue('/tmp/mock-home'),
+    homedir: vi.fn().mockReturnValue("/tmp/mock-home"),
   };
 });
 
-vi.mock('../../config/extensions/update.js', () => ({
+vi.mock("../../config/extensions/update.js", () => ({
   checkForAllExtensionUpdates: vi.fn(),
   updateExtension: vi.fn(),
 }));
 
-describe('useExtensionUpdates', () => {
+describe("useExtensionUpdates", () => {
   let tempHomeDir: string;
   let tempWorkspaceDir: string;
   let userExtensionsDir: string;
   let extensionManager: ExtensionManager;
 
   beforeEach(() => {
-    tempHomeDir = fs.mkdtempSync(
-      path.join(os.tmpdir(), 'gemini-cli-test-home-'),
-    );
+    tempHomeDir = fs.mkdtempSync(path.join(os.tmpdir(), "gemini-cli-test-home-"));
     vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
-    tempWorkspaceDir = fs.mkdtempSync(
-      path.join(tempHomeDir, 'gemini-cli-test-workspace-'),
-    );
-    vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
-    userExtensionsDir = path.join(tempHomeDir, GEMINI_DIR, 'extensions');
+    tempWorkspaceDir = fs.mkdtempSync(path.join(tempHomeDir, "gemini-cli-test-workspace-"));
+    vi.spyOn(process, "cwd").mockReturnValue(tempWorkspaceDir);
+    userExtensionsDir = path.join(tempHomeDir, GEMINI_DIR, "extensions");
     fs.mkdirSync(userExtensionsDir, { recursive: true });
     vi.mocked(checkForAllExtensionUpdates).mockReset();
     vi.mocked(updateExtension).mockReset();
@@ -66,17 +59,17 @@ describe('useExtensionUpdates', () => {
     fs.rmSync(tempHomeDir, { recursive: true, force: true });
   });
 
-  it('should check for updates and log a message if an update is available', async () => {
-    vi.spyOn(extensionManager, 'getExtensions').mockReturnValue([
+  it("should check for updates and log a message if an update is available", async () => {
+    vi.spyOn(extensionManager, "getExtensions").mockReturnValue([
       {
-        name: 'test-extension',
-        id: 'test-extension-id',
-        version: '1.0.0',
-        path: '/some/path',
+        name: "test-extension",
+        id: "test-extension-id",
+        version: "1.0.0",
+        path: "/some/path",
         isActive: true,
         installMetadata: {
-          type: 'git',
-          source: 'https://some/repo',
+          type: "git",
+          source: "https://some/repo",
           autoUpdate: false,
         },
         contextFiles: [],
@@ -87,9 +80,9 @@ describe('useExtensionUpdates', () => {
     vi.mocked(checkForAllExtensionUpdates).mockImplementation(
       async (_extensions, _extensionManager, dispatch) => {
         dispatch({
-          type: 'SET_STATE',
+          type: "SET_STATE",
           payload: {
-            name: 'test-extension',
+            name: "test-extension",
             state: ExtensionUpdateState.UPDATE_AVAILABLE,
           },
         });
@@ -114,14 +107,14 @@ describe('useExtensionUpdates', () => {
     });
   });
 
-  it('should check for updates and automatically update if autoUpdate is true', async () => {
+  it("should check for updates and automatically update if autoUpdate is true", async () => {
     createExtension({
       extensionsDir: userExtensionsDir,
-      name: 'test-extension',
-      version: '1.0.0',
+      name: "test-extension",
+      version: "1.0.0",
       installMetadata: {
-        source: 'https://some.git/repo',
-        type: 'git',
+        source: "https://some.git/repo",
+        type: "git",
         autoUpdate: true,
       },
     });
@@ -131,9 +124,9 @@ describe('useExtensionUpdates', () => {
     vi.mocked(checkForAllExtensionUpdates).mockImplementation(
       async (_extensions, _extensionManager, dispatch) => {
         dispatch({
-          type: 'SET_STATE',
+          type: "SET_STATE",
           payload: {
-            name: 'test-extension',
+            name: "test-extension",
             state: ExtensionUpdateState.UPDATE_AVAILABLE,
           },
         });
@@ -141,9 +134,9 @@ describe('useExtensionUpdates', () => {
     );
 
     vi.mocked(updateExtension).mockResolvedValue({
-      originalVersion: '1.0.0',
-      updatedVersion: '1.1.0',
-      name: '',
+      originalVersion: "1.0.0",
+      updatedVersion: "1.1.0",
+      name: "",
     });
 
     function TestComponent() {
@@ -167,24 +160,24 @@ describe('useExtensionUpdates', () => {
     );
   });
 
-  it('should batch update notifications for multiple extensions', async () => {
+  it("should batch update notifications for multiple extensions", async () => {
     createExtension({
       extensionsDir: userExtensionsDir,
-      name: 'test-extension-1',
-      version: '1.0.0',
+      name: "test-extension-1",
+      version: "1.0.0",
       installMetadata: {
-        source: 'https://some.git/repo1',
-        type: 'git',
+        source: "https://some.git/repo1",
+        type: "git",
         autoUpdate: true,
       },
     });
     createExtension({
       extensionsDir: userExtensionsDir,
-      name: 'test-extension-2',
-      version: '2.0.0',
+      name: "test-extension-2",
+      version: "2.0.0",
       installMetadata: {
-        source: 'https://some.git/repo2',
-        type: 'git',
+        source: "https://some.git/repo2",
+        type: "git",
         autoUpdate: true,
       },
     });
@@ -196,16 +189,16 @@ describe('useExtensionUpdates', () => {
     vi.mocked(checkForAllExtensionUpdates).mockImplementation(
       async (_extensions, _extensionManager, dispatch) => {
         dispatch({
-          type: 'SET_STATE',
+          type: "SET_STATE",
           payload: {
-            name: 'test-extension-1',
+            name: "test-extension-1",
             state: ExtensionUpdateState.UPDATE_AVAILABLE,
           },
         });
         dispatch({
-          type: 'SET_STATE',
+          type: "SET_STATE",
           payload: {
-            name: 'test-extension-2',
+            name: "test-extension-2",
             state: ExtensionUpdateState.UPDATE_AVAILABLE,
           },
         });
@@ -214,14 +207,14 @@ describe('useExtensionUpdates', () => {
 
     vi.mocked(updateExtension)
       .mockResolvedValueOnce({
-        originalVersion: '1.0.0',
-        updatedVersion: '1.1.0',
-        name: '',
+        originalVersion: "1.0.0",
+        updatedVersion: "1.1.0",
+        name: "",
       })
       .mockResolvedValueOnce({
-        originalVersion: '2.0.0',
-        updatedVersion: '2.1.0',
-        name: '',
+        originalVersion: "2.0.0",
+        updatedVersion: "2.1.0",
+        name: "",
       });
 
     function TestComponent() {
@@ -253,31 +246,31 @@ describe('useExtensionUpdates', () => {
     );
   });
 
-  it('should batch update notifications for multiple extensions with autoUpdate: false', async () => {
-    vi.spyOn(extensionManager, 'getExtensions').mockReturnValue([
+  it("should batch update notifications for multiple extensions with autoUpdate: false", async () => {
+    vi.spyOn(extensionManager, "getExtensions").mockReturnValue([
       {
-        name: 'test-extension-1',
-        id: 'test-extension-1-id',
-        version: '1.0.0',
-        path: '/some/path1',
+        name: "test-extension-1",
+        id: "test-extension-1-id",
+        version: "1.0.0",
+        path: "/some/path1",
         isActive: true,
         installMetadata: {
-          type: 'git',
-          source: 'https://some/repo1',
+          type: "git",
+          source: "https://some/repo1",
           autoUpdate: false,
         },
         contextFiles: [],
       },
       {
-        name: 'test-extension-2',
-        id: 'test-extension-2-id',
+        name: "test-extension-2",
+        id: "test-extension-2-id",
 
-        version: '2.0.0',
-        path: '/some/path2',
+        version: "2.0.0",
+        path: "/some/path2",
         isActive: true,
         installMetadata: {
-          type: 'git',
-          source: 'https://some/repo2',
+          type: "git",
+          source: "https://some/repo2",
           autoUpdate: false,
         },
         contextFiles: [],
@@ -287,23 +280,23 @@ describe('useExtensionUpdates', () => {
 
     vi.mocked(checkForAllExtensionUpdates).mockImplementation(
       async (_extensions, _extensionManager, dispatch) => {
-        dispatch({ type: 'BATCH_CHECK_START' });
+        dispatch({ type: "BATCH_CHECK_START" });
         dispatch({
-          type: 'SET_STATE',
+          type: "SET_STATE",
           payload: {
-            name: 'test-extension-1',
+            name: "test-extension-1",
             state: ExtensionUpdateState.UPDATE_AVAILABLE,
           },
         });
         await new Promise((r) => setTimeout(r, 50));
         dispatch({
-          type: 'SET_STATE',
+          type: "SET_STATE",
           payload: {
-            name: 'test-extension-2',
+            name: "test-extension-2",
             state: ExtensionUpdateState.UPDATE_AVAILABLE,
           },
         });
-        dispatch({ type: 'BATCH_CHECK_END' });
+        dispatch({ type: "BATCH_CHECK_END" });
       },
     );
 
diff --git a/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.ts b/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.ts
index a9a9f7785..4e53c7079 100644
--- a/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.ts
+++ b/packages/ui-gemini/src/ui/hooks/useExtensionUpdates.ts
@@ -4,23 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger, type GeminiCLIExtension } from '@airiscode/gemini-cli-core';
-import { getErrorMessage } from '../../utils/errors.js';
+import { debugLogger, type GeminiCLIExtension } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useMemo, useReducer } from "react";
+import { type ExtensionUpdateInfo } from "../../config/extension.js";
+import type { ExtensionManager } from "../../config/extension-manager.js";
+import { checkForAllExtensionUpdates, updateExtension } from "../../config/extensions/update.js";
+import { checkExhaustive } from "../../utils/checks.js";
+import { getErrorMessage } from "../../utils/errors.js";
 import {
   ExtensionUpdateState,
   extensionUpdatesReducer,
   initialExtensionUpdatesState,
-} from '../state/extensions.js';
-import { useCallback, useEffect, useMemo, useReducer } from 'react';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { MessageType, type ConfirmationRequest } from '../types.js';
-import {
-  checkForAllExtensionUpdates,
-  updateExtension,
-} from '../../config/extensions/update.js';
-import { type ExtensionUpdateInfo } from '../../config/extension.js';
-import { checkExhaustive } from '../../utils/checks.js';
-import type { ExtensionManager } from '../../config/extension-manager.js';
+} from "../state/extensions.js";
+import { type ConfirmationRequest, MessageType } from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 type ConfirmationRequestWrapper = {
   prompt: React.ReactNode;
@@ -28,17 +25,17 @@ type ConfirmationRequestWrapper = {
 };
 
 type ConfirmationRequestAction =
-  | { type: 'add'; request: ConfirmationRequestWrapper }
-  | { type: 'remove'; request: ConfirmationRequestWrapper };
+  | { type: "add"; request: ConfirmationRequestWrapper }
+  | { type: "remove"; request: ConfirmationRequestWrapper };
 
 function confirmationRequestsReducer(
   state: ConfirmationRequestWrapper[],
   action: ConfirmationRequestAction,
 ): ConfirmationRequestWrapper[] {
   switch (action.type) {
-    case 'add':
+    case "add":
       return [...state, action.request];
-    case 'remove':
+    case "remove":
       return state.filter((r) => r !== action.request);
     default:
       checkExhaustive(action);
@@ -46,10 +43,10 @@ function confirmationRequestsReducer(
 }
 
 export const useConfirmUpdateRequests = () => {
-  const [
-    confirmUpdateExtensionRequests,
-    dispatchConfirmUpdateExtensionRequests,
-  ] = useReducer(confirmationRequestsReducer, []);
+  const [confirmUpdateExtensionRequests, dispatchConfirmUpdateExtensionRequests] = useReducer(
+    confirmationRequestsReducer,
+    [],
+  );
   const addConfirmUpdateExtensionRequest = useCallback(
     (original: ConfirmationRequest) => {
       const wrappedRequest = {
@@ -57,14 +54,14 @@ export const useConfirmUpdateRequests = () => {
         onConfirm: (confirmed: boolean) => {
           // Remove it from the outstanding list of requests by identity.
           dispatchConfirmUpdateExtensionRequests({
-            type: 'remove',
+            type: "remove",
             request: wrappedRequest,
           });
           original.onConfirm(confirmed);
         },
       };
       dispatchConfirmUpdateExtensionRequests({
-        type: 'add',
+        type: "add",
         request: wrappedRequest,
       });
     },
@@ -79,7 +76,7 @@ export const useConfirmUpdateRequests = () => {
 
 export const useExtensionUpdates = (
   extensionManager: ExtensionManager,
-  addItem: UseHistoryManagerReturn['addItem'],
+  addItem: UseHistoryManagerReturn["addItem"],
   enableExtensionReloading: boolean,
 ) => {
   const [extensionsUpdateState, dispatchExtensionStateUpdate] = useReducer(
@@ -90,20 +87,14 @@ export const useExtensionUpdates = (
 
   useEffect(() => {
     const extensionsToCheck = extensions.filter((extension) => {
-      const currentStatus = extensionsUpdateState.extensionStatuses.get(
-        extension.name,
-      );
+      const currentStatus = extensionsUpdateState.extensionStatuses.get(extension.name);
       if (!currentStatus) return true;
       const currentState = currentStatus.status;
       return !currentState || currentState === ExtensionUpdateState.UNKNOWN;
     });
     if (extensionsToCheck.length === 0) return;
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    checkForAllExtensionUpdates(
-      extensionsToCheck,
-      extensionManager,
-      dispatchExtensionStateUpdate,
-    );
+    checkForAllExtensionUpdates(extensionsToCheck, extensionManager, dispatchExtensionStateUpdate);
   }, [
     extensions,
     extensionManager,
@@ -118,7 +109,7 @@ export const useExtensionUpdates = (
     const scheduledUpdate = extensionsUpdateState.scheduledUpdate;
     if (scheduledUpdate) {
       dispatchExtensionStateUpdate({
-        type: 'CLEAR_SCHEDULED_UPDATE',
+        type: "CLEAR_SCHEDULED_UPDATE",
       });
     }
 
@@ -139,13 +130,8 @@ export const useExtensionUpdates = (
     let shouldNotifyOfUpdates = false;
     const updatePromises: Array<Promise<ExtensionUpdateInfo | undefined>> = [];
     for (const extension of extensions) {
-      const currentState = extensionsUpdateState.extensionStatuses.get(
-        extension.name,
-      );
-      if (
-        !currentState ||
-        currentState.status !== ExtensionUpdateState.UPDATE_AVAILABLE
-      ) {
+      const currentState = extensionsUpdateState.extensionStatuses.get(extension.name);
+      if (!currentState || currentState.status !== ExtensionUpdateState.UPDATE_AVAILABLE) {
         continue;
       }
       const shouldUpdate = shouldDoUpdate(extension);
@@ -154,7 +140,7 @@ export const useExtensionUpdates = (
         if (!currentState.notified) {
           // Mark as processed immediately to avoid re-triggering.
           dispatchExtensionStateUpdate({
-            type: 'SET_NOTIFIED',
+            type: "SET_NOTIFIED",
             payload: { name: extension.name, notified: true },
           });
           shouldNotifyOfUpdates = true;
@@ -191,7 +177,7 @@ export const useExtensionUpdates = (
       }
     }
     if (shouldNotifyOfUpdates) {
-      const s = extensionsWithUpdatesCount > 1 ? 's' : '';
+      const s = extensionsWithUpdatesCount > 1 ? "s" : "";
       addItem(
         {
           type: MessageType.INFO,
@@ -213,20 +199,11 @@ export const useExtensionUpdates = (
         });
       });
     }
-  }, [
-    extensions,
-    extensionManager,
-    extensionsUpdateState,
-    addItem,
-    enableExtensionReloading,
-  ]);
+  }, [extensions, extensionManager, extensionsUpdateState, addItem, enableExtensionReloading]);
 
   const extensionsUpdateStateComputed = useMemo(() => {
     const result = new Map<string, ExtensionUpdateState>();
-    for (const [
-      key,
-      value,
-    ] of extensionsUpdateState.extensionStatuses.entries()) {
+    for (const [key, value] of extensionsUpdateState.extensionStatuses.entries()) {
       result.set(key, value.status);
     }
     return result;
diff --git a/packages/ui-gemini/src/ui/hooks/useFlickerDetector.test.ts b/packages/ui-gemini/src/ui/hooks/useFlickerDetector.test.ts
index a853284d1..42259f2fa 100644
--- a/packages/ui-gemini/src/ui/hooks/useFlickerDetector.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useFlickerDetector.test.ts
@@ -4,41 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { renderHook } from '../../test-utils/render.js';
-import { vi, type Mock } from 'vitest';
-import { useFlickerDetector } from './useFlickerDetector.js';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { recordFlickerFrame } from '@airiscode/gemini-cli-core';
-import { type Config } from '@airiscode/gemini-cli-core';
-import { type DOMElement, measureElement } from 'ink';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { appEvents, AppEvent } from '../../utils/events.js';
+import { type Config, recordFlickerFrame } from "@airiscode/gemini-cli-core";
+import { type DOMElement, measureElement } from "ink";
+import { type Mock, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useFlickerDetector } from "./useFlickerDetector.js";
 
 // Mock dependencies
-vi.mock('../contexts/ConfigContext.js');
-vi.mock('../contexts/UIStateContext.js');
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("../contexts/ConfigContext.js");
+vi.mock("../contexts/UIStateContext.js");
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     recordFlickerFrame: vi.fn(),
-    GEMINI_DIR: '.gemini',
+    GEMINI_DIR: ".gemini",
   };
 });
-vi.mock('ink', async (importOriginal) => {
-  const original = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const original = await importOriginal<typeof import("ink")>();
   return {
     ...original,
     measureElement: vi.fn(),
   };
 });
-vi.mock('../../utils/events.js', () => ({
+vi.mock("../../utils/events.js", () => ({
   appEvents: {
     emit: vi.fn(),
   },
   AppEvent: {
-    Flicker: 'flicker',
+    Flicker: "flicker",
   },
 }));
 
@@ -48,7 +46,7 @@ const mockRecordFlickerFrame = recordFlickerFrame as Mock;
 const mockMeasureElement = measureElement as Mock;
 const mockAppEventsEmit = appEvents.emit as Mock;
 
-describe('useFlickerDetector', () => {
+describe("useFlickerDetector", () => {
   const mockConfig = {} as Config;
   let mockRef: React.RefObject<DOMElement | null>;
 
@@ -63,21 +61,21 @@ describe('useFlickerDetector', () => {
     vi.clearAllMocks();
   });
 
-  it('should not record a flicker when height is less than terminal height', () => {
+  it("should not record a flicker when height is less than terminal height", () => {
     mockMeasureElement.mockReturnValue({ width: 80, height: 20 });
     renderHook(() => useFlickerDetector(mockRef, 25));
     expect(mockRecordFlickerFrame).not.toHaveBeenCalled();
     expect(mockAppEventsEmit).not.toHaveBeenCalled();
   });
 
-  it('should not record a flicker when height is equal to terminal height', () => {
+  it("should not record a flicker when height is equal to terminal height", () => {
     mockMeasureElement.mockReturnValue({ width: 80, height: 25 });
     renderHook(() => useFlickerDetector(mockRef, 25));
     expect(mockRecordFlickerFrame).not.toHaveBeenCalled();
     expect(mockAppEventsEmit).not.toHaveBeenCalled();
   });
 
-  it('should record a flicker when height is greater than terminal height and height is constrained', () => {
+  it("should record a flicker when height is greater than terminal height and height is constrained", () => {
     mockMeasureElement.mockReturnValue({ width: 80, height: 30 });
     renderHook(() => useFlickerDetector(mockRef, 25));
     expect(mockRecordFlickerFrame).toHaveBeenCalledTimes(1);
@@ -86,7 +84,7 @@ describe('useFlickerDetector', () => {
     expect(mockAppEventsEmit).toHaveBeenCalledWith(AppEvent.Flicker);
   });
 
-  it('should NOT record a flicker when height is greater than terminal height but height is NOT constrained', () => {
+  it("should NOT record a flicker when height is greater than terminal height but height is NOT constrained", () => {
     // Override default UI state for this test
     mockUseUIState.mockReturnValue({ constrainHeight: false });
     mockMeasureElement.mockReturnValue({ width: 80, height: 30 });
@@ -95,7 +93,7 @@ describe('useFlickerDetector', () => {
     expect(mockAppEventsEmit).not.toHaveBeenCalled();
   });
 
-  it('should not check for flicker if the ref is not set', () => {
+  it("should not check for flicker if the ref is not set", () => {
     mockRef.current = null;
     mockMeasureElement.mockReturnValue({ width: 80, height: 30 });
     renderHook(() => useFlickerDetector(mockRef, 25));
@@ -104,7 +102,7 @@ describe('useFlickerDetector', () => {
     expect(mockAppEventsEmit).not.toHaveBeenCalled();
   });
 
-  it('should re-evaluate on re-render', () => {
+  it("should re-evaluate on re-render", () => {
     // Start with a valid height
     mockMeasureElement.mockReturnValue({ width: 80, height: 20 });
     const { rerender } = renderHook(() => useFlickerDetector(mockRef, 25));
diff --git a/packages/ui-gemini/src/ui/hooks/useFlickerDetector.ts b/packages/ui-gemini/src/ui/hooks/useFlickerDetector.ts
index 52c84bc35..2ea9e1822 100644
--- a/packages/ui-gemini/src/ui/hooks/useFlickerDetector.ts
+++ b/packages/ui-gemini/src/ui/hooks/useFlickerDetector.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type DOMElement, measureElement } from 'ink';
-import { useEffect } from 'react';
-import { useConfig } from '../contexts/ConfigContext.js';
-import { recordFlickerFrame } from '@airiscode/gemini-cli-core';
-import { appEvents, AppEvent } from '../../utils/events.js';
-import { useUIState } from '../contexts/UIStateContext.js';
+import { recordFlickerFrame } from "@airiscode/gemini-cli-core";
+import { type DOMElement, measureElement } from "ink";
+import { useEffect } from "react";
+import { AppEvent, appEvents } from "../../utils/events.js";
+import { useConfig } from "../contexts/ConfigContext.js";
+import { useUIState } from "../contexts/UIStateContext.js";
 
 /**
  * A hook that detects when the UI flickers (renders taller than the terminal).
diff --git a/packages/ui-gemini/src/ui/hooks/useFocus.test.tsx b/packages/ui-gemini/src/ui/hooks/useFocus.test.tsx
index 070156b18..341e26ade 100644
--- a/packages/ui-gemini/src/ui/hooks/useFocus.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useFocus.test.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { EventEmitter } from 'node:events';
-import { useFocus } from './useFocus.js';
-import { vi, type Mock } from 'vitest';
-import { useStdin, useStdout } from 'ink';
-import { KeypressProvider } from '../contexts/KeypressContext.js';
-import { act } from 'react';
+import { EventEmitter } from "node:events";
+import { useStdin, useStdout } from "ink";
+import { act } from "react";
+import { type Mock, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { KeypressProvider } from "../contexts/KeypressContext.js";
+import { useFocus } from "./useFocus.js";
 
 // Mock the ink hooks
-vi.mock('ink', async (importOriginal) => {
-  const original = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const original = await importOriginal<typeof import("ink")>();
   return {
     ...original,
     useStdin: vi.fn(),
@@ -25,7 +25,7 @@ vi.mock('ink', async (importOriginal) => {
 const mockedUseStdin = vi.mocked(useStdin);
 const mockedUseStdout = vi.mocked(useStdout);
 
-describe('useFocus', () => {
+describe("useFocus", () => {
   let stdin: EventEmitter & { resume: Mock; pause: Mock };
   let stdout: { write: Mock };
 
@@ -35,12 +35,8 @@ describe('useFocus', () => {
       pause: vi.fn(),
     });
     stdout = { write: vi.fn() };
-    mockedUseStdin.mockReturnValue({ stdin } as unknown as ReturnType<
-      typeof useStdin
-    >);
-    mockedUseStdout.mockReturnValue({ stdout } as unknown as ReturnType<
-      typeof useStdout
-    >);
+    mockedUseStdin.mockReturnValue({ stdin } as unknown as ReturnType<typeof useStdin>);
+    mockedUseStdout.mockReturnValue({ stdout } as unknown as ReturnType<typeof useStdout>);
   });
 
   afterEach(() => {
@@ -69,14 +65,14 @@ describe('useFocus', () => {
     };
   };
 
-  it('should initialize with focus and enable focus reporting', () => {
+  it("should initialize with focus and enable focus reporting", () => {
     const { result } = renderFocusHook();
 
     expect(result.current).toBe(true);
-    expect(stdout.write).toHaveBeenCalledWith('\x1b[?1004h');
+    expect(stdout.write).toHaveBeenCalledWith("\x1b[?1004h");
   });
 
-  it('should set isFocused to false when a focus-out event is received', () => {
+  it("should set isFocused to false when a focus-out event is received", () => {
     const { result } = renderFocusHook();
 
     // Initial state is focused
@@ -84,82 +80,82 @@ describe('useFocus', () => {
 
     // Simulate focus-out event
     act(() => {
-      stdin.emit('data', '\x1b[O');
+      stdin.emit("data", "\x1b[O");
     });
 
     // State should now be unfocused
     expect(result.current).toBe(false);
   });
 
-  it('should set isFocused to true when a focus-in event is received', () => {
+  it("should set isFocused to true when a focus-in event is received", () => {
     const { result } = renderFocusHook();
 
     // Simulate focus-out to set initial state to false
     act(() => {
-      stdin.emit('data', '\x1b[O');
+      stdin.emit("data", "\x1b[O");
     });
     expect(result.current).toBe(false);
 
     // Simulate focus-in event
     act(() => {
-      stdin.emit('data', '\x1b[I');
+      stdin.emit("data", "\x1b[I");
     });
 
     // State should now be focused
     expect(result.current).toBe(true);
   });
 
-  it('should clean up and disable focus reporting on unmount', () => {
+  it("should clean up and disable focus reporting on unmount", () => {
     const { unmount } = renderFocusHook();
 
     // At this point we should have listeners from both KeypressProvider and useFocus
-    const listenerCountAfterMount = stdin.listenerCount('data');
+    const listenerCountAfterMount = stdin.listenerCount("data");
     expect(listenerCountAfterMount).toBeGreaterThanOrEqual(1);
 
     unmount();
 
     // Assert that the cleanup function was called
-    expect(stdout.write).toHaveBeenCalledWith('\x1b[?1004l');
+    expect(stdout.write).toHaveBeenCalledWith("\x1b[?1004l");
     // Ensure useFocus listener was removed (but KeypressProvider listeners may remain)
-    expect(stdin.listenerCount('data')).toBeLessThan(listenerCountAfterMount);
+    expect(stdin.listenerCount("data")).toBeLessThan(listenerCountAfterMount);
   });
 
-  it('should handle multiple focus events correctly', () => {
+  it("should handle multiple focus events correctly", () => {
     const { result } = renderFocusHook();
 
     act(() => {
-      stdin.emit('data', '\x1b[O');
+      stdin.emit("data", "\x1b[O");
     });
     expect(result.current).toBe(false);
 
     act(() => {
-      stdin.emit('data', '\x1b[O');
+      stdin.emit("data", "\x1b[O");
     });
     expect(result.current).toBe(false);
 
     act(() => {
-      stdin.emit('data', '\x1b[I');
+      stdin.emit("data", "\x1b[I");
     });
     expect(result.current).toBe(true);
 
     act(() => {
-      stdin.emit('data', '\x1b[I');
+      stdin.emit("data", "\x1b[I");
     });
     expect(result.current).toBe(true);
   });
 
-  it('restores focus on keypress after focus is lost', () => {
+  it("restores focus on keypress after focus is lost", () => {
     const { result } = renderFocusHook();
 
     // Simulate focus-out event
     act(() => {
-      stdin.emit('data', '\x1b[O');
+      stdin.emit("data", "\x1b[O");
     });
     expect(result.current).toBe(false);
 
     // Simulate a keypress
     act(() => {
-      stdin.emit('data', 'a');
+      stdin.emit("data", "a");
     });
     expect(result.current).toBe(true);
   });
diff --git a/packages/ui-gemini/src/ui/hooks/useFocus.ts b/packages/ui-gemini/src/ui/hooks/useFocus.ts
index 65288cb0d..3c0ec03a2 100644
--- a/packages/ui-gemini/src/ui/hooks/useFocus.ts
+++ b/packages/ui-gemini/src/ui/hooks/useFocus.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useStdin, useStdout } from 'ink';
-import { useEffect, useState } from 'react';
-import { useKeypress } from './useKeypress.js';
+import { useStdin, useStdout } from "ink";
+import { useEffect, useState } from "react";
+import { useKeypress } from "./useKeypress.js";
 
 // ANSI escape codes to enable/disable terminal focus reporting
-export const ENABLE_FOCUS_REPORTING = '\x1b[?1004h';
-export const DISABLE_FOCUS_REPORTING = '\x1b[?1004l';
+export const ENABLE_FOCUS_REPORTING = "\x1b[?1004h";
+export const DISABLE_FOCUS_REPORTING = "\x1b[?1004l";
 
 // ANSI escape codes for focus events
-export const FOCUS_IN = '\x1b[I';
-export const FOCUS_OUT = '\x1b[O';
+export const FOCUS_IN = "\x1b[I";
+export const FOCUS_OUT = "\x1b[O";
 
 export const useFocus = () => {
   const { stdin } = useStdin();
@@ -36,12 +36,12 @@ export const useFocus = () => {
 
     // Enable focus reporting
     stdout?.write(ENABLE_FOCUS_REPORTING);
-    stdin?.on('data', handleData);
+    stdin?.on("data", handleData);
 
     return () => {
       // Disable focus reporting on cleanup
       stdout?.write(DISABLE_FOCUS_REPORTING);
-      stdin?.removeListener('data', handleData);
+      stdin?.removeListener("data", handleData);
     };
   }, [stdin, stdout]);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useFolderTrust.test.ts b/packages/ui-gemini/src/ui/hooks/useFolderTrust.test.ts
index 6812858f0..c9b41940f 100644
--- a/packages/ui-gemini/src/ui/hooks/useFolderTrust.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useFolderTrust.test.ts
@@ -4,33 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, type Mock, type MockInstance } from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useFolderTrust } from './useFolderTrust.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
-import type { LoadedTrustedFolders } from '../../config/trustedFolders.js';
-import { TrustLevel } from '../../config/trustedFolders.js';
-import * as trustedFolders from '../../config/trustedFolders.js';
-import { coreEvents, ExitCodes } from '@airiscode/gemini-cli-core';
+import { coreEvents, ExitCodes } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { type Mock, type MockInstance, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import type { LoadedTrustedFolders } from "../../config/trustedFolders.js";
+import * as trustedFolders from "../../config/trustedFolders.js";
+import { TrustLevel } from "../../config/trustedFolders.js";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import { FolderTrustChoice } from "../components/FolderTrustDialog.js";
+import { useFolderTrust } from "./useFolderTrust.js";
 
 const mockedCwd = vi.hoisted(() => vi.fn());
 const mockedExit = vi.hoisted(() => vi.fn());
 
-vi.mock('node:process', async () => {
-  const actual =
-    await vi.importActual<typeof import('node:process')>('node:process');
+vi.mock("node:process", async () => {
+  const actual = await vi.importActual<typeof import("node:process")>("node:process");
   return {
     ...actual,
     cwd: mockedCwd,
     exit: mockedExit,
-    platform: 'linux',
+    platform: "linux",
   };
 });
 
-describe('useFolderTrust', () => {
+describe("useFolderTrust", () => {
   let mockSettings: LoadedSettings;
   let mockTrustedFolders: LoadedTrustedFolders;
   let isWorkspaceTrustedSpy: MockInstance;
@@ -54,11 +53,9 @@ describe('useFolderTrust', () => {
       setValue: vi.fn(),
     } as unknown as LoadedTrustedFolders;
 
-    vi.spyOn(trustedFolders, 'loadTrustedFolders').mockReturnValue(
-      mockTrustedFolders,
-    );
-    isWorkspaceTrustedSpy = vi.spyOn(trustedFolders, 'isWorkspaceTrusted');
-    mockedCwd.mockReturnValue('/test/path');
+    vi.spyOn(trustedFolders, "loadTrustedFolders").mockReturnValue(mockTrustedFolders);
+    isWorkspaceTrustedSpy = vi.spyOn(trustedFolders, "isWorkspaceTrusted");
+    mockedCwd.mockReturnValue("/test/path");
     onTrustChange = vi.fn();
     addItem = vi.fn();
   });
@@ -68,57 +65,51 @@ describe('useFolderTrust', () => {
     vi.clearAllMocks();
   });
 
-  it('should not open dialog when folder is already trusted', () => {
-    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: true, source: 'file' });
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+  it("should not open dialog when folder is already trusted", () => {
+    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: true, source: "file" });
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
     expect(result.current.isFolderTrustDialogOpen).toBe(false);
     expect(onTrustChange).toHaveBeenCalledWith(true);
   });
 
-  it('should not open dialog when folder is already untrusted', () => {
-    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: 'file' });
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+  it("should not open dialog when folder is already untrusted", () => {
+    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: "file" });
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
     expect(result.current.isFolderTrustDialogOpen).toBe(false);
     expect(onTrustChange).toHaveBeenCalledWith(false);
   });
 
-  it('should open dialog when folder trust is undefined', async () => {
+  it("should open dialog when folder trust is undefined", async () => {
     isWorkspaceTrustedSpy.mockReturnValue({
       isTrusted: undefined,
       source: undefined,
     });
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
     await waitFor(() => {
       expect(result.current.isFolderTrustDialogOpen).toBe(true);
     });
     expect(onTrustChange).toHaveBeenCalledWith(undefined);
   });
 
-  it('should send a message if the folder is untrusted', () => {
-    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: 'file' });
+  it("should send a message if the folder is untrusted", () => {
+    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: "file" });
     renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
     expect(addItem).toHaveBeenCalledWith(
       {
-        text: 'This folder is not trusted. Some features may be disabled. Use the `/permissions` command to change the trust level.',
-        type: 'info',
+        text: "This folder is not trusted. Some features may be disabled. Use the `/permissions` command to change the trust level.",
+        type: "info",
       },
       expect.any(Number),
     );
   });
 
-  it('should not send a message if the folder is trusted', () => {
-    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: true, source: 'file' });
+  it("should not send a message if the folder is trusted", () => {
+    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: true, source: "file" });
     renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
     expect(addItem).not.toHaveBeenCalled();
   });
 
-  it('should handle TRUST_FOLDER choice', async () => {
+  it("should handle TRUST_FOLDER choice", async () => {
     isWorkspaceTrustedSpy.mockReturnValue({
       isTrusted: undefined,
       source: undefined,
@@ -127,27 +118,23 @@ describe('useFolderTrust', () => {
     (mockTrustedFolders.setValue as Mock).mockImplementation(() => {
       isWorkspaceTrustedSpy.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
     });
 
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
 
     await waitFor(() => {
       expect(result.current.isTrusted).toBeUndefined();
     });
 
     await act(async () => {
-      await result.current.handleFolderTrustSelect(
-        FolderTrustChoice.TRUST_FOLDER,
-      );
+      await result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
     });
 
     await waitFor(() => {
       expect(mockTrustedFolders.setValue).toHaveBeenCalledWith(
-        '/test/path',
+        "/test/path",
         TrustLevel.TRUST_FOLDER,
       );
       expect(result.current.isFolderTrustDialogOpen).toBe(false);
@@ -155,62 +142,48 @@ describe('useFolderTrust', () => {
     });
   });
 
-  it('should handle TRUST_PARENT choice', () => {
+  it("should handle TRUST_PARENT choice", () => {
     isWorkspaceTrustedSpy.mockReturnValue({
       isTrusted: undefined,
       source: undefined,
     });
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
 
     act(() => {
       result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_PARENT);
     });
 
-    expect(mockTrustedFolders.setValue).toHaveBeenCalledWith(
-      '/test/path',
-      TrustLevel.TRUST_PARENT,
-    );
+    expect(mockTrustedFolders.setValue).toHaveBeenCalledWith("/test/path", TrustLevel.TRUST_PARENT);
     expect(result.current.isFolderTrustDialogOpen).toBe(false);
     expect(onTrustChange).toHaveBeenLastCalledWith(true);
   });
 
-  it('should handle DO_NOT_TRUST choice and trigger restart', () => {
+  it("should handle DO_NOT_TRUST choice and trigger restart", () => {
     isWorkspaceTrustedSpy.mockReturnValue({
       isTrusted: undefined,
       source: undefined,
     });
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
 
     act(() => {
       result.current.handleFolderTrustSelect(FolderTrustChoice.DO_NOT_TRUST);
     });
 
-    expect(mockTrustedFolders.setValue).toHaveBeenCalledWith(
-      '/test/path',
-      TrustLevel.DO_NOT_TRUST,
-    );
+    expect(mockTrustedFolders.setValue).toHaveBeenCalledWith("/test/path", TrustLevel.DO_NOT_TRUST);
     expect(onTrustChange).toHaveBeenLastCalledWith(false);
     expect(result.current.isRestarting).toBe(true);
     expect(result.current.isFolderTrustDialogOpen).toBe(true);
   });
 
-  it('should do nothing for default choice', async () => {
+  it("should do nothing for default choice", async () => {
     isWorkspaceTrustedSpy.mockReturnValue({
       isTrusted: undefined,
       source: undefined,
     });
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
 
     act(() => {
-      result.current.handleFolderTrustSelect(
-        'invalid_choice' as FolderTrustChoice,
-      );
+      result.current.handleFolderTrustSelect("invalid_choice" as FolderTrustChoice);
     });
 
     await waitFor(() => {
@@ -221,19 +194,17 @@ describe('useFolderTrust', () => {
     });
   });
 
-  it('should set isRestarting to true when trust status changes from false to true', async () => {
-    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: 'file' }); // Initially untrusted
+  it("should set isRestarting to true when trust status changes from false to true", async () => {
+    isWorkspaceTrustedSpy.mockReturnValue({ isTrusted: false, source: "file" }); // Initially untrusted
 
     (mockTrustedFolders.setValue as Mock).mockImplementation(() => {
       isWorkspaceTrustedSpy.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
     });
 
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
 
     await waitFor(() => {
       expect(result.current.isTrusted).toBe(false);
@@ -249,14 +220,12 @@ describe('useFolderTrust', () => {
     });
   });
 
-  it('should not set isRestarting to true when trust status does not change', () => {
+  it("should not set isRestarting to true when trust status does not change", () => {
     isWorkspaceTrustedSpy.mockReturnValue({
       isTrusted: undefined,
       source: undefined,
     });
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
 
     act(() => {
       result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
@@ -266,18 +235,16 @@ describe('useFolderTrust', () => {
     expect(result.current.isFolderTrustDialogOpen).toBe(false); // Dialog should close
   });
 
-  it('should emit feedback on failure to set value', async () => {
+  it("should emit feedback on failure to set value", async () => {
     isWorkspaceTrustedSpy.mockReturnValue({
       isTrusted: undefined,
       source: undefined,
     });
     (mockTrustedFolders.setValue as Mock).mockImplementation(() => {
-      throw new Error('test error');
+      throw new Error("test error");
     });
-    const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
-    const { result } = renderHook(() =>
-      useFolderTrust(mockSettings, onTrustChange, addItem),
-    );
+    const emitFeedbackSpy = vi.spyOn(coreEvents, "emitFeedback");
+    const { result } = renderHook(() => useFolderTrust(mockSettings, onTrustChange, addItem));
 
     act(() => {
       result.current.handleFolderTrustSelect(FolderTrustChoice.TRUST_FOLDER);
@@ -286,8 +253,8 @@ describe('useFolderTrust', () => {
     await vi.runAllTimersAsync();
 
     expect(emitFeedbackSpy).toHaveBeenCalledWith(
-      'error',
-      'Failed to save trust settings. Exiting Gemini CLI.',
+      "error",
+      "Failed to save trust settings. Exiting Gemini CLI.",
     );
     expect(mockedExit).toHaveBeenCalledWith(ExitCodes.FATAL_CONFIG_ERROR);
   });
diff --git a/packages/ui-gemini/src/ui/hooks/useFolderTrust.ts b/packages/ui-gemini/src/ui/hooks/useFolderTrust.ts
index 7b61216a1..033943475 100644
--- a/packages/ui-gemini/src/ui/hooks/useFolderTrust.ts
+++ b/packages/ui-gemini/src/ui/hooks/useFolderTrust.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useEffect, useRef } from 'react';
-import type { LoadedSettings } from '../../config/settings.js';
-import { FolderTrustChoice } from '../components/FolderTrustDialog.js';
-import {
-  loadTrustedFolders,
-  TrustLevel,
-  isWorkspaceTrusted,
-} from '../../config/trustedFolders.js';
-import * as process from 'node:process';
-import { type HistoryItemWithoutId, MessageType } from '../types.js';
-import { coreEvents, ExitCodes } from '@airiscode/gemini-cli-core';
-import { runExitCleanup } from '../../utils/cleanup.js';
+import * as process from "node:process";
+import { coreEvents, ExitCodes } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useRef, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted, loadTrustedFolders, TrustLevel } from "../../config/trustedFolders.js";
+import { runExitCleanup } from "../../utils/cleanup.js";
+import { FolderTrustChoice } from "../components/FolderTrustDialog.js";
+import { type HistoryItemWithoutId, MessageType } from "../types.js";
 
 export const useFolderTrust = (
   settings: LoadedSettings,
@@ -39,7 +35,7 @@ export const useFolderTrust = (
       addItem(
         {
           type: MessageType.INFO,
-          text: 'This folder is not trusted. Some features may be disabled. Use the `/permissions` command to change the trust level.',
+          text: "This folder is not trusted. Some features may be disabled. Use the `/permissions` command to change the trust level.",
         },
         Date.now(),
       );
@@ -72,10 +68,7 @@ export const useFolderTrust = (
       try {
         trustedFolders.setValue(cwd, trustLevel);
       } catch (_e) {
-        coreEvents.emitFeedback(
-          'error',
-          'Failed to save trust settings. Exiting Gemini CLI.',
-        );
+        coreEvents.emitFeedback("error", "Failed to save trust settings. Exiting Gemini CLI.");
         setTimeout(async () => {
           await runExitCleanup();
           process.exit(ExitCodes.FATAL_CONFIG_ERROR);
@@ -84,8 +77,7 @@ export const useFolderTrust = (
       }
 
       const currentIsTrusted =
-        trustLevel === TrustLevel.TRUST_FOLDER ||
-        trustLevel === TrustLevel.TRUST_PARENT;
+        trustLevel === TrustLevel.TRUST_FOLDER || trustLevel === TrustLevel.TRUST_PARENT;
       setIsTrusted(currentIsTrusted);
       onTrustChange(currentIsTrusted);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useGeminiStream.test.tsx b/packages/ui-gemini/src/ui/hooks/useGeminiStream.test.tsx
index 22c8ad280..00fe08db9 100644
--- a/packages/ui-gemini/src/ui/hooks/useGeminiStream.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useGeminiStream.test.tsx
@@ -4,48 +4,46 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mock, MockInstance } from 'vitest';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useGeminiStream } from './useGeminiStream.js';
-import { useKeypress } from './useKeypress.js';
-import * as atCommandProcessor from './atCommandProcessor.js';
-import type {
-  TrackedToolCall,
-  TrackedCompletedToolCall,
-  TrackedExecutingToolCall,
-  TrackedCancelledToolCall,
-  TrackedWaitingToolCall,
-} from './useReactToolScheduler.js';
-import { useReactToolScheduler } from './useReactToolScheduler.js';
 import type {
+  AnyToolInvocation,
   Config,
   EditorType,
   GeminiClient,
-  AnyToolInvocation,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
 import {
   ApprovalMode,
   AuthType,
+  debugLogger,
   GeminiEventType as ServerGeminiEventType,
-  ToolErrorType,
   ToolConfirmationOutcome,
+  ToolErrorType,
   tokenLimit,
-  debugLogger,
-} from '@airiscode/gemini-cli-core';
-import type { Part, PartListUnion } from '@google/genai';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import type { SlashCommandProcessorResult } from '../types.js';
-import { MessageType, StreamingState } from '../types.js';
-import type { LoadedSettings } from '../../config/settings.js';
+} from "@airiscode/gemini-cli-core";
+import type { Part, PartListUnion } from "@google/genai";
+import { act } from "react";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Mock, MockInstance } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import type { SlashCommandProcessorResult } from "../types.js";
+import { MessageType, StreamingState } from "../types.js";
+import * as atCommandProcessor from "./atCommandProcessor.js";
+import { useGeminiStream } from "./useGeminiStream.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { useKeypress } from "./useKeypress.js";
+import type {
+  TrackedCancelledToolCall,
+  TrackedCompletedToolCall,
+  TrackedExecutingToolCall,
+  TrackedToolCall,
+  TrackedWaitingToolCall,
+} from "./useReactToolScheduler.js";
+import { useReactToolScheduler } from "./useReactToolScheduler.js";
 
 // --- MOCKS ---
-const mockSendMessageStream = vi
-  .fn()
-  .mockReturnValue((async function* () {})());
+const mockSendMessageStream = vi.fn().mockReturnValue((async function* () {})());
 const mockStartChat = vi.fn();
 
 const MockedGeminiClientClass = vi.hoisted(() =>
@@ -68,12 +66,10 @@ const MockedGeminiClientClass = vi.hoisted(() =>
   }),
 );
 
-const MockedUserPromptEvent = vi.hoisted(() =>
-  vi.fn().mockImplementation(() => {}),
-);
+const MockedUserPromptEvent = vi.hoisted(() => vi.fn().mockImplementation(() => {}));
 const mockParseAndFormatApiError = vi.hoisted(() => vi.fn());
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
   const actualCoreModule = (await importOriginal()) as any;
   return {
     ...actualCoreModule,
@@ -86,7 +82,7 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
 });
 
 const mockUseReactToolScheduler = useReactToolScheduler as Mock;
-vi.mock('./useReactToolScheduler.js', async (importOriginal) => {
+vi.mock("./useReactToolScheduler.js", async (importOriginal) => {
   const actualSchedulerModule = (await importOriginal()) as any;
   return {
     ...(actualSchedulerModule || {}),
@@ -94,28 +90,28 @@ vi.mock('./useReactToolScheduler.js', async (importOriginal) => {
   };
 });
 
-vi.mock('./useKeypress.js', () => ({
+vi.mock("./useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
-vi.mock('./shellCommandProcessor.js', () => ({
+vi.mock("./shellCommandProcessor.js", () => ({
   useShellCommandProcessor: vi.fn().mockReturnValue({
     handleShellCommand: vi.fn(),
   }),
 }));
 
-vi.mock('./atCommandProcessor.js');
+vi.mock("./atCommandProcessor.js");
 
-vi.mock('../utils/markdownUtilities.js', () => ({
+vi.mock("../utils/markdownUtilities.js", () => ({
   findLastSafeSplitPoint: vi.fn((s: string) => s.length),
 }));
 
-vi.mock('./useStateAndRef.js', () => ({
+vi.mock("./useStateAndRef.js", () => ({
   useStateAndRef: vi.fn((initial) => {
     let val = initial;
     const ref = { current: val };
     const setVal = vi.fn((updater) => {
-      if (typeof updater === 'function') {
+      if (typeof updater === "function") {
         val = updater(val);
       } else {
         val = updater;
@@ -126,7 +122,7 @@ vi.mock('./useStateAndRef.js', () => ({
   }),
 }));
 
-vi.mock('./useLogger.js', () => ({
+vi.mock("./useLogger.js", () => ({
   useLogger: vi.fn().mockReturnValue({
     logMessage: vi.fn().mockResolvedValue(undefined),
   }),
@@ -134,7 +130,7 @@ vi.mock('./useLogger.js', () => ({
 
 const mockStartNewPrompt = vi.fn();
 const mockAddUsage = vi.fn();
-vi.mock('../contexts/SessionContext.js', () => ({
+vi.mock("../contexts/SessionContext.js", () => ({
   useSessionStats: vi.fn(() => ({
     startNewPrompt: mockStartNewPrompt,
     addUsage: mockAddUsage,
@@ -142,18 +138,18 @@ vi.mock('../contexts/SessionContext.js', () => ({
   })),
 }));
 
-vi.mock('./slashCommandProcessor.js', () => ({
+vi.mock("./slashCommandProcessor.js", () => ({
   handleSlashCommand: vi.fn().mockReturnValue(false),
 }));
 
-vi.mock('./useAlternateBuffer.js', () => ({
+vi.mock("./useAlternateBuffer.js", () => ({
   useAlternateBuffer: vi.fn(() => false),
 }));
 
 // --- END MOCKS ---
 
 // --- Tests for useGeminiStream Hook ---
-describe('useGeminiStream', () => {
+describe("useGeminiStream", () => {
   let mockAddItem: Mock;
   let mockConfig: Config;
   let mockOnDebugMessage: Mock;
@@ -176,17 +172,17 @@ describe('useGeminiStream', () => {
     });
 
     const contentGeneratorConfig = {
-      model: 'test-model',
-      apiKey: 'test-key',
+      model: "test-model",
+      apiKey: "test-key",
       vertexai: false,
       authType: AuthType.USE_GEMINI,
     };
 
     mockConfig = {
-      apiKey: 'test-api-key',
-      model: 'gemini-pro',
+      apiKey: "test-api-key",
+      model: "gemini-pro",
       sandbox: false,
-      targetDir: '/test/dir',
+      targetDir: "/test/dir",
       debugMode: false,
       question: undefined,
 
@@ -195,17 +191,15 @@ describe('useGeminiStream', () => {
       toolCallCommand: undefined,
       mcpServerCommand: undefined,
       mcpServers: undefined,
-      userAgent: 'test-agent',
-      userMemory: '',
+      userAgent: "test-agent",
+      userMemory: "",
       geminiMdFileCount: 0,
       alwaysSkipModificationConfirmation: false,
       vertexai: false,
       showMemoryUsage: false,
       contextFileName: undefined,
-      getToolRegistry: vi.fn(
-        () => ({ getToolSchemaList: vi.fn(() => []) }) as any,
-      ),
-      getProjectRoot: vi.fn(() => '/test/dir'),
+      getToolRegistry: vi.fn(() => ({ getToolSchemaList: vi.fn(() => []) }) as any),
+      getProjectRoot: vi.fn(() => "/test/dir"),
       getCheckpointingEnabled: vi.fn(() => false),
       getGeminiClient: mockGetGeminiClient,
       getApprovalMode: () => ApprovalMode.DEFAULT,
@@ -213,14 +207,12 @@ describe('useGeminiStream', () => {
       getDebugMode: () => false,
       addHistory: vi.fn(),
       getSessionId() {
-        return 'test-session-id';
+        return "test-session-id";
       },
       setQuotaErrorOccurred: vi.fn(),
       getQuotaErrorOccurred: vi.fn(() => false),
-      getModel: vi.fn(() => 'gemini-2.5-pro'),
-      getContentGeneratorConfig: vi
-        .fn()
-        .mockReturnValue(contentGeneratorConfig),
+      getModel: vi.fn(() => "gemini-2.5-pro"),
+      getContentGeneratorConfig: vi.fn().mockReturnValue(contentGeneratorConfig),
       getUseSmartEdit: () => false,
       isInteractive: () => false,
       getExperiments: () => {},
@@ -247,31 +239,26 @@ describe('useGeminiStream', () => {
     mockStartChat.mockClear().mockResolvedValue({
       sendMessageStream: mockSendMessageStream,
     } as unknown as any); // GeminiChat -> any
-    mockSendMessageStream
-      .mockClear()
-      .mockReturnValue((async function* () {})());
-    handleAtCommandSpy = vi.spyOn(atCommandProcessor, 'handleAtCommand');
+    mockSendMessageStream.mockClear().mockReturnValue((async function* () {})());
+    handleAtCommandSpy = vi.spyOn(atCommandProcessor, "handleAtCommand");
   });
 
   const mockLoadedSettings: LoadedSettings = {
-    merged: { preferredEditor: 'vscode' },
-    user: { path: '/user/settings.json', settings: {} },
-    workspace: { path: '/workspace/.gemini/settings.json', settings: {} },
+    merged: { preferredEditor: "vscode" },
+    user: { path: "/user/settings.json", settings: {} },
+    workspace: { path: "/workspace/.gemini/settings.json", settings: {} },
     errors: [],
     forScope: vi.fn(),
     setValue: vi.fn(),
   } as unknown as LoadedSettings;
 
-  const renderTestHook = (
-    initialToolCalls: TrackedToolCall[] = [],
-    geminiClient?: any,
-  ) => {
+  const renderTestHook = (initialToolCalls: TrackedToolCall[] = [], geminiClient?: any) => {
     const client = geminiClient || mockConfig.getGeminiClient();
 
     const initialProps = {
       client,
       history: [],
-      addItem: mockAddItem as unknown as UseHistoryManagerReturn['addItem'],
+      addItem: mockAddItem as unknown as UseHistoryManagerReturn["addItem"],
       config: mockConfig,
       onDebugMessage: mockOnDebugMessage,
       handleSlashCommand: mockHandleSlashCommand as unknown as (
@@ -287,8 +274,7 @@ describe('useGeminiStream', () => {
         // This mock needs to be stateful. When setToolCallsForDisplay is called,
         // it should trigger a rerender with the new state.
         const mockSetToolCallsForDisplay = vi.fn((updater) => {
-          const newToolCalls =
-            typeof updater === 'function' ? updater(props.toolCalls) : updater;
+          const newToolCalls = typeof updater === "function" ? updater(props.toolCalls) : updater;
           rerender({ ...props, toolCalls: newToolCalls });
         });
 
@@ -300,20 +286,20 @@ describe('useGeminiStream', () => {
           const newToolCalls = props.toolCalls.map((tc) => {
             // Only cancel tools that are in a cancellable state.
             if (
-              tc.status === 'awaiting_approval' ||
-              tc.status === 'executing' ||
-              tc.status === 'scheduled' ||
-              tc.status === 'validating'
+              tc.status === "awaiting_approval" ||
+              tc.status === "executing" ||
+              tc.status === "scheduled" ||
+              tc.status === "validating"
             ) {
               // A real cancelled tool call has a response object.
               // We need to simulate this to avoid type errors downstream.
               return {
                 ...tc,
-                status: 'cancelled',
+                status: "cancelled",
                 response: {
                   callId: tc.request.callId,
                   responseParts: [],
-                  resultDisplay: 'Request cancelled.',
+                  resultDisplay: "Request cancelled.",
                 },
                 responseSubmittedToGemini: true, // Mark as "processed"
               } as any as TrackedCancelledToolCall;
@@ -340,7 +326,7 @@ describe('useGeminiStream', () => {
           props.onDebugMessage,
           props.handleSlashCommand,
           props.shellModeActive,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -368,33 +354,33 @@ describe('useGeminiStream', () => {
   const createMockToolCall = (
     toolName: string,
     callId: string,
-    confirmationType: 'edit' | 'info',
+    confirmationType: "edit" | "info",
     mockOnConfirm: Mock,
-    status: TrackedToolCall['status'] = 'awaiting_approval',
+    status: TrackedToolCall["status"] = "awaiting_approval",
   ): TrackedWaitingToolCall => ({
     request: {
       callId,
       name: toolName,
       args: {},
       isClientInitiated: false,
-      prompt_id: 'prompt-id-1',
+      prompt_id: "prompt-id-1",
     },
-    status: status as 'awaiting_approval',
+    status: status as "awaiting_approval",
     responseSubmittedToGemini: false,
     confirmationDetails:
-      confirmationType === 'edit'
+      confirmationType === "edit"
         ? {
-            type: 'edit',
-            title: 'Confirm Edit',
+            type: "edit",
+            title: "Confirm Edit",
             onConfirm: mockOnConfirm,
-            fileName: 'file.txt',
-            filePath: '/test/file.txt',
-            fileDiff: 'fake diff',
-            originalContent: 'old',
-            newContent: 'new',
+            fileName: "file.txt",
+            filePath: "/test/file.txt",
+            fileDiff: "fake diff",
+            originalContent: "old",
+            newContent: "new",
           }
         : {
-            type: 'info',
+            type: "info",
             title: `${toolName} confirmation`,
             onConfirm: mockOnConfirm,
             prompt: `Execute ${toolName}?`,
@@ -406,7 +392,7 @@ describe('useGeminiStream', () => {
       build: vi.fn(),
     } as any,
     invocation: {
-      getDescription: () => 'Mock description',
+      getDescription: () => "Mock description",
     } as unknown as AnyToolInvocation,
   });
 
@@ -442,7 +428,7 @@ describe('useGeminiStream', () => {
         mockOnDebugMessage,
         mockHandleSlashCommand,
         shellModeActive,
-        () => 'vscode' as EditorType,
+        () => "vscode" as EditorType,
         onAuthError,
         performMemoryRefresh,
         modelSwitched,
@@ -455,29 +441,29 @@ describe('useGeminiStream', () => {
     );
   };
 
-  it('should not submit tool responses if not all tool calls are completed', () => {
+  it("should not submit tool responses if not all tool calls are completed", () => {
     const toolCalls: TrackedToolCall[] = [
       {
         request: {
-          callId: 'call1',
-          name: 'tool1',
+          callId: "call1",
+          name: "tool1",
           args: {},
           isClientInitiated: false,
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
         },
-        status: 'success',
+        status: "success",
         responseSubmittedToGemini: false,
         response: {
-          callId: 'call1',
-          responseParts: [{ text: 'tool 1 response' }],
+          callId: "call1",
+          responseParts: [{ text: "tool 1 response" }],
           error: undefined,
           errorType: undefined, // FIX: Added missing property
-          resultDisplay: 'Tool 1 success display',
+          resultDisplay: "Tool 1 success display",
         },
         tool: {
-          name: 'tool1',
-          displayName: 'tool1',
-          description: 'desc1',
+          name: "tool1",
+          displayName: "tool1",
+          description: "desc1",
           build: vi.fn(),
         } as any,
         invocation: {
@@ -488,29 +474,28 @@ describe('useGeminiStream', () => {
       } as TrackedCompletedToolCall,
       {
         request: {
-          callId: 'call2',
-          name: 'tool2',
+          callId: "call2",
+          name: "tool2",
           args: {},
-          prompt_id: 'prompt-id-1',
+          prompt_id: "prompt-id-1",
         },
-        status: 'executing',
+        status: "executing",
         responseSubmittedToGemini: false,
         tool: {
-          name: 'tool2',
-          displayName: 'tool2',
-          description: 'desc2',
+          name: "tool2",
+          displayName: "tool2",
+          description: "desc2",
           build: vi.fn(),
         } as any,
         invocation: {
           getDescription: () => `Mock description`,
         } as unknown as AnyToolInvocation,
         startTime: Date.now(),
-        liveOutput: '...',
+        liveOutput: "...",
       } as TrackedExecutingToolCall,
     ];
 
-    const { mockMarkToolsAsSubmitted, mockSendMessageStream } =
-      renderTestHook(toolCalls);
+    const { mockMarkToolsAsSubmitted, mockSendMessageStream } = renderTestHook(toolCalls);
 
     // Effect for submitting tool responses depends on toolCalls and isResponding
     // isResponding is initially false, so the effect should run.
@@ -519,27 +504,27 @@ describe('useGeminiStream', () => {
     expect(mockSendMessageStream).not.toHaveBeenCalled(); // submitQuery uses this
   });
 
-  it('should submit tool responses when all tool calls are completed and ready', async () => {
-    const toolCall1ResponseParts: Part[] = [{ text: 'tool 1 final response' }];
-    const toolCall2ResponseParts: Part[] = [{ text: 'tool 2 final response' }];
+  it("should submit tool responses when all tool calls are completed and ready", async () => {
+    const toolCall1ResponseParts: Part[] = [{ text: "tool 1 final response" }];
+    const toolCall2ResponseParts: Part[] = [{ text: "tool 2 final response" }];
     const completedToolCalls: TrackedToolCall[] = [
       {
         request: {
-          callId: 'call1',
-          name: 'tool1',
+          callId: "call1",
+          name: "tool1",
           args: {},
           isClientInitiated: false,
-          prompt_id: 'prompt-id-2',
+          prompt_id: "prompt-id-2",
         },
-        status: 'success',
+        status: "success",
         responseSubmittedToGemini: false,
         response: {
-          callId: 'call1',
+          callId: "call1",
           responseParts: toolCall1ResponseParts,
           errorType: undefined, // FIX: Added missing property
         },
         tool: {
-          displayName: 'MockTool',
+          displayName: "MockTool",
         },
         invocation: {
           getDescription: () => `Mock description`,
@@ -547,16 +532,16 @@ describe('useGeminiStream', () => {
       } as TrackedCompletedToolCall,
       {
         request: {
-          callId: 'call2',
-          name: 'tool2',
+          callId: "call2",
+          name: "tool2",
           args: {},
           isClientInitiated: false,
-          prompt_id: 'prompt-id-2',
+          prompt_id: "prompt-id-2",
         },
-        status: 'error',
+        status: "error",
         responseSubmittedToGemini: false,
         response: {
-          callId: 'call2',
+          callId: "call2",
           responseParts: toolCall2ResponseParts,
           errorType: ToolErrorType.UNHANDLED_EXCEPTION, // FIX: Added missing property
         },
@@ -564,9 +549,7 @@ describe('useGeminiStream', () => {
     ];
 
     // Capture the onComplete callback
-    let capturedOnComplete:
-      | ((completedTools: TrackedToolCall[]) => Promise<void>)
-      | null = null;
+    let capturedOnComplete: ((completedTools: TrackedToolCall[]) => Promise<void>) | null = null;
 
     mockUseReactToolScheduler.mockImplementation((onComplete) => {
       capturedOnComplete = onComplete;
@@ -583,7 +566,7 @@ describe('useGeminiStream', () => {
         mockOnDebugMessage,
         mockHandleSlashCommand,
         false,
-        () => 'vscode' as EditorType,
+        () => "vscode" as EditorType,
         () => {},
         () => Promise.resolve(),
         false,
@@ -607,36 +590,33 @@ describe('useGeminiStream', () => {
       expect(mockSendMessageStream).toHaveBeenCalledTimes(1);
     });
 
-    const expectedMergedResponse = [
-      ...toolCall1ResponseParts,
-      ...toolCall2ResponseParts,
-    ];
+    const expectedMergedResponse = [...toolCall1ResponseParts, ...toolCall2ResponseParts];
     expect(mockSendMessageStream).toHaveBeenCalledWith(
       expectedMergedResponse,
       expect.any(AbortSignal),
-      'prompt-id-2',
+      "prompt-id-2",
     );
   });
 
-  it('should handle all tool calls being cancelled', async () => {
+  it("should handle all tool calls being cancelled", async () => {
     const cancelledToolCalls: TrackedToolCall[] = [
       {
         request: {
-          callId: '1',
-          name: 'testTool',
+          callId: "1",
+          name: "testTool",
           args: {},
           isClientInitiated: false,
-          prompt_id: 'prompt-id-3',
+          prompt_id: "prompt-id-3",
         },
-        status: 'cancelled',
+        status: "cancelled",
         response: {
-          callId: '1',
-          responseParts: [{ text: 'cancelled' }],
+          callId: "1",
+          responseParts: [{ text: "cancelled" }],
           errorType: undefined, // FIX: Added missing property
         },
         responseSubmittedToGemini: false,
         tool: {
-          displayName: 'mock tool',
+          displayName: "mock tool",
         },
         invocation: {
           getDescription: () => `Mock description`,
@@ -646,9 +626,7 @@ describe('useGeminiStream', () => {
     const client = new MockedGeminiClientClass(mockConfig);
 
     // Capture the onComplete callback
-    let capturedOnComplete:
-      | ((completedTools: TrackedToolCall[]) => Promise<void>)
-      | null = null;
+    let capturedOnComplete: ((completedTools: TrackedToolCall[]) => Promise<void>) | null = null;
 
     mockUseReactToolScheduler.mockImplementation((onComplete) => {
       capturedOnComplete = onComplete;
@@ -665,7 +643,7 @@ describe('useGeminiStream', () => {
         mockOnDebugMessage,
         mockHandleSlashCommand,
         false,
-        () => 'vscode' as EditorType,
+        () => "vscode" as EditorType,
         () => {},
         () => Promise.resolve(),
         false,
@@ -685,40 +663,38 @@ describe('useGeminiStream', () => {
     });
 
     await waitFor(() => {
-      expect(mockMarkToolsAsSubmitted).toHaveBeenCalledWith(['1']);
+      expect(mockMarkToolsAsSubmitted).toHaveBeenCalledWith(["1"]);
       expect(client.addHistory).toHaveBeenCalledWith({
-        role: 'user',
-        parts: [{ text: 'cancelled' }],
+        role: "user",
+        parts: [{ text: "cancelled" }],
       });
       // Ensure we do NOT call back to the API
       expect(mockSendMessageStream).not.toHaveBeenCalled();
     });
   });
 
-  it('should group multiple cancelled tool call responses into a single history entry', async () => {
+  it("should group multiple cancelled tool call responses into a single history entry", async () => {
     const cancelledToolCall1: TrackedCancelledToolCall = {
       request: {
-        callId: 'cancel-1',
-        name: 'toolA',
+        callId: "cancel-1",
+        name: "toolA",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-7',
+        prompt_id: "prompt-id-7",
       },
       tool: {
-        name: 'toolA',
-        displayName: 'toolA',
-        description: 'descA',
+        name: "toolA",
+        displayName: "toolA",
+        description: "descA",
         build: vi.fn(),
       } as any,
       invocation: {
         getDescription: () => `Mock description`,
       } as unknown as AnyToolInvocation,
-      status: 'cancelled',
+      status: "cancelled",
       response: {
-        callId: 'cancel-1',
-        responseParts: [
-          { functionResponse: { name: 'toolA', id: 'cancel-1' } },
-        ],
+        callId: "cancel-1",
+        responseParts: [{ functionResponse: { name: "toolA", id: "cancel-1" } }],
         resultDisplay: undefined,
         error: undefined,
         errorType: undefined, // FIX: Added missing property
@@ -727,27 +703,25 @@ describe('useGeminiStream', () => {
     };
     const cancelledToolCall2: TrackedCancelledToolCall = {
       request: {
-        callId: 'cancel-2',
-        name: 'toolB',
+        callId: "cancel-2",
+        name: "toolB",
         args: {},
         isClientInitiated: false,
-        prompt_id: 'prompt-id-8',
+        prompt_id: "prompt-id-8",
       },
       tool: {
-        name: 'toolB',
-        displayName: 'toolB',
-        description: 'descB',
+        name: "toolB",
+        displayName: "toolB",
+        description: "descB",
         build: vi.fn(),
       } as any,
       invocation: {
         getDescription: () => `Mock description`,
       } as unknown as AnyToolInvocation,
-      status: 'cancelled',
+      status: "cancelled",
       response: {
-        callId: 'cancel-2',
-        responseParts: [
-          { functionResponse: { name: 'toolB', id: 'cancel-2' } },
-        ],
+        callId: "cancel-2",
+        responseParts: [{ functionResponse: { name: "toolB", id: "cancel-2" } }],
         resultDisplay: undefined,
         error: undefined,
         errorType: undefined, // FIX: Added missing property
@@ -757,9 +731,7 @@ describe('useGeminiStream', () => {
     const allCancelledTools = [cancelledToolCall1, cancelledToolCall2];
     const client = new MockedGeminiClientClass(mockConfig);
 
-    let capturedOnComplete:
-      | ((completedTools: TrackedToolCall[]) => Promise<void>)
-      | null = null;
+    let capturedOnComplete: ((completedTools: TrackedToolCall[]) => Promise<void>) | null = null;
 
     mockUseReactToolScheduler.mockImplementation((onComplete) => {
       capturedOnComplete = onComplete;
@@ -776,7 +748,7 @@ describe('useGeminiStream', () => {
         mockOnDebugMessage,
         mockHandleSlashCommand,
         false,
-        () => 'vscode' as EditorType,
+        () => "vscode" as EditorType,
         () => {},
         () => Promise.resolve(),
         false,
@@ -797,17 +769,14 @@ describe('useGeminiStream', () => {
 
     await waitFor(() => {
       // The tools should be marked as submitted locally
-      expect(mockMarkToolsAsSubmitted).toHaveBeenCalledWith([
-        'cancel-1',
-        'cancel-2',
-      ]);
+      expect(mockMarkToolsAsSubmitted).toHaveBeenCalledWith(["cancel-1", "cancel-2"]);
 
       // Crucially, addHistory should be called only ONCE
       expect(client.addHistory).toHaveBeenCalledTimes(1);
 
       // And that single call should contain BOTH function responses
       expect(client.addHistory).toHaveBeenCalledWith({
-        role: 'user',
+        role: "user",
         parts: [
           ...(cancelledToolCall1.response.responseParts as Part[]),
           ...(cancelledToolCall2.response.responseParts as Part[]),
@@ -819,26 +788,24 @@ describe('useGeminiStream', () => {
     });
   });
 
-  it('should not flicker streaming state to Idle between tool completion and submission', async () => {
-    const toolCallResponseParts: PartListUnion = [
-      { text: 'tool 1 final response' },
-    ];
+  it("should not flicker streaming state to Idle between tool completion and submission", async () => {
+    const toolCallResponseParts: PartListUnion = [{ text: "tool 1 final response" }];
 
     const initialToolCalls: TrackedToolCall[] = [
       {
         request: {
-          callId: 'call1',
-          name: 'tool1',
+          callId: "call1",
+          name: "tool1",
           args: {},
           isClientInitiated: false,
-          prompt_id: 'prompt-id-4',
+          prompt_id: "prompt-id-4",
         },
-        status: 'executing',
+        status: "executing",
         responseSubmittedToGemini: false,
         tool: {
-          name: 'tool1',
-          displayName: 'tool1',
-          description: 'desc',
+          name: "tool1",
+          displayName: "tool1",
+          description: "desc",
           build: vi.fn(),
         } as any,
         invocation: {
@@ -851,22 +818,20 @@ describe('useGeminiStream', () => {
     const completedToolCalls: TrackedToolCall[] = [
       {
         ...(initialToolCalls[0] as TrackedExecutingToolCall),
-        status: 'success',
+        status: "success",
         response: {
-          callId: 'call1',
+          callId: "call1",
           responseParts: toolCallResponseParts,
           error: undefined,
           errorType: undefined, // FIX: Added missing property
-          resultDisplay: 'Tool 1 success display',
+          resultDisplay: "Tool 1 success display",
         },
         endTime: Date.now(),
       } as TrackedCompletedToolCall,
     ];
 
     // Capture the onComplete callback
-    let capturedOnComplete:
-      | ((completedTools: TrackedToolCall[]) => Promise<void>)
-      | null = null;
+    let capturedOnComplete: ((completedTools: TrackedToolCall[]) => Promise<void>) | null = null;
     let currentToolCalls = initialToolCalls;
 
     mockUseReactToolScheduler.mockImplementation((onComplete) => {
@@ -889,7 +854,7 @@ describe('useGeminiStream', () => {
         mockOnDebugMessage,
         mockHandleSlashCommand,
         false,
-        () => 'vscode' as EditorType,
+        () => "vscode" as EditorType,
         () => {},
         () => Promise.resolve(),
         false,
@@ -936,7 +901,7 @@ describe('useGeminiStream', () => {
       expect(mockSendMessageStream).toHaveBeenCalledWith(
         toolCallResponseParts,
         expect.any(AbortSignal),
-        'prompt-id-4',
+        "prompt-id-4",
       );
     });
 
@@ -944,7 +909,7 @@ describe('useGeminiStream', () => {
     expect(result.current.streamingState).toBe(StreamingState.Responding);
   });
 
-  describe('User Cancellation', () => {
+  describe("User Cancellation", () => {
     let keypressCallback: (key: any) => void;
     const mockUseKeypress = useKeypress as Mock;
 
@@ -961,13 +926,13 @@ describe('useGeminiStream', () => {
 
     const simulateEscapeKeyPress = () => {
       act(() => {
-        keypressCallback({ name: 'escape' });
+        keypressCallback({ name: "escape" });
       });
     };
 
-    it('should cancel an in-progress stream when escape is pressed', async () => {
+    it("should cancel an in-progress stream when escape is pressed", async () => {
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Part 1' };
+        yield { type: "content", value: "Part 1" };
         // Keep the stream open
         await new Promise(() => {});
       })();
@@ -978,7 +943,7 @@ describe('useGeminiStream', () => {
       // Start a query
       await act(async () => {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        result.current.submitQuery('test query');
+        result.current.submitQuery("test query");
       });
 
       // Wait for the first part of the response
@@ -994,7 +959,7 @@ describe('useGeminiStream', () => {
         expect(mockAddItem).toHaveBeenCalledWith(
           {
             type: MessageType.INFO,
-            text: 'Request cancelled.',
+            text: "Request cancelled.",
           },
           expect.any(Number),
         );
@@ -1004,10 +969,10 @@ describe('useGeminiStream', () => {
       expect(result.current.streamingState).toBe(StreamingState.Idle);
     });
 
-    it('should call onCancelSubmit handler when escape is pressed', async () => {
+    it("should call onCancelSubmit handler when escape is pressed", async () => {
       const cancelSubmitSpy = vi.fn();
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Part 1' };
+        yield { type: "content", value: "Part 1" };
         // Keep the stream open
         await new Promise(() => {});
       })();
@@ -1023,7 +988,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -1038,7 +1003,7 @@ describe('useGeminiStream', () => {
       // Start a query
       await act(async () => {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        result.current.submitQuery('test query');
+        result.current.submitQuery("test query");
       });
 
       simulateEscapeKeyPress();
@@ -1046,10 +1011,10 @@ describe('useGeminiStream', () => {
       expect(cancelSubmitSpy).toHaveBeenCalledWith(false);
     });
 
-    it('should call setShellInputFocused(false) when escape is pressed', async () => {
+    it("should call setShellInputFocused(false) when escape is pressed", async () => {
       const setShellInputFocusedSpy = vi.fn();
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Part 1' };
+        yield { type: "content", value: "Part 1" };
         await new Promise(() => {}); // Keep stream open
       })();
       mockSendMessageStream.mockReturnValue(mockStream);
@@ -1064,7 +1029,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -1079,7 +1044,7 @@ describe('useGeminiStream', () => {
       // Start a query
       await act(async () => {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        result.current.submitQuery('test query');
+        result.current.submitQuery("test query");
       });
 
       simulateEscapeKeyPress();
@@ -1087,7 +1052,7 @@ describe('useGeminiStream', () => {
       expect(setShellInputFocusedSpy).toHaveBeenCalledWith(false);
     });
 
-    it('should not do anything if escape is pressed when not responding', () => {
+    it("should not do anything if escape is pressed when not responding", () => {
       const { result } = renderTestHook();
 
       expect(result.current.streamingState).toBe(StreamingState.Idle);
@@ -1098,22 +1063,22 @@ describe('useGeminiStream', () => {
       // No change should happen, no cancellation message
       expect(mockAddItem).not.toHaveBeenCalledWith(
         expect.objectContaining({
-          text: 'Request cancelled.',
+          text: "Request cancelled.",
         }),
         expect.any(Number),
       );
     });
 
-    it('should prevent further processing after cancellation', async () => {
+    it("should prevent further processing after cancellation", async () => {
       let continueStream: () => void;
       const streamPromise = new Promise<void>((resolve) => {
         continueStream = resolve;
       });
 
       const mockStream = (async function* () {
-        yield { type: 'content', value: 'Initial' };
+        yield { type: "content", value: "Initial" };
         await streamPromise; // Wait until we manually continue
-        yield { type: 'content', value: ' Canceled' };
+        yield { type: "content", value: " Canceled" };
       })();
       mockSendMessageStream.mockReturnValue(mockStream);
 
@@ -1121,7 +1086,7 @@ describe('useGeminiStream', () => {
 
       await act(async () => {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        result.current.submitQuery('long running query');
+        result.current.submitQuery("long running query");
       });
 
       await waitFor(() => {
@@ -1139,24 +1104,22 @@ describe('useGeminiStream', () => {
       });
 
       // The text should not have been updated with " Canceled"
-      const lastCall = mockAddItem.mock.calls.find(
-        (call) => call[0].type === 'gemini',
-      );
-      expect(lastCall?.[0].text).toBe('Initial');
+      const lastCall = mockAddItem.mock.calls.find((call) => call[0].type === "gemini");
+      expect(lastCall?.[0].text).toBe("Initial");
 
       // The final state should be idle after cancellation
       expect(result.current.streamingState).toBe(StreamingState.Idle);
     });
 
-    it('should cancel if a tool call is in progress', async () => {
+    it("should cancel if a tool call is in progress", async () => {
       const toolCalls: TrackedToolCall[] = [
         {
-          request: { callId: 'call1', name: 'tool1', args: {} },
-          status: 'executing',
+          request: { callId: "call1", name: "tool1", args: {} },
+          status: "executing",
           responseSubmittedToGemini: false,
           tool: {
-            name: 'tool1',
-            description: 'desc1',
+            name: "tool1",
+            description: "desc1",
             build: vi.fn().mockImplementation((_) => ({
               getDescription: () => `Mock description`,
             })),
@@ -1165,7 +1128,7 @@ describe('useGeminiStream', () => {
             getDescription: () => `Mock description`,
           },
           startTime: Date.now(),
-          liveOutput: '...',
+          liveOutput: "...",
         } as TrackedExecutingToolCall,
       ];
 
@@ -1181,22 +1144,22 @@ describe('useGeminiStream', () => {
       expect(mockCancelAllToolCalls).toHaveBeenCalled();
     });
 
-    it('should cancel a request when a tool is awaiting confirmation', async () => {
+    it("should cancel a request when a tool is awaiting confirmation", async () => {
       const mockOnConfirm = vi.fn().mockResolvedValue(undefined);
       const toolCalls: TrackedToolCall[] = [
         {
           request: {
-            callId: 'confirm-call',
-            name: 'some_tool',
+            callId: "confirm-call",
+            name: "some_tool",
             args: {},
             isClientInitiated: false,
-            prompt_id: 'prompt-id-1',
+            prompt_id: "prompt-id-1",
           },
-          status: 'awaiting_approval',
+          status: "awaiting_approval",
           responseSubmittedToGemini: false,
           tool: {
-            name: 'some_tool',
-            description: 'a tool',
+            name: "some_tool",
+            description: "a tool",
             build: vi.fn().mockImplementation((_) => ({
               getDescription: () => `Mock description`,
             })),
@@ -1205,14 +1168,14 @@ describe('useGeminiStream', () => {
             getDescription: () => `Mock description`,
           } as unknown as AnyToolInvocation,
           confirmationDetails: {
-            type: 'edit',
-            title: 'Confirm Edit',
+            type: "edit",
+            title: "Confirm Edit",
             onConfirm: mockOnConfirm,
-            fileName: 'file.txt',
-            filePath: '/test/file.txt',
-            fileDiff: 'fake diff',
-            originalContent: 'old',
-            newContent: 'new',
+            fileName: "file.txt",
+            filePath: "/test/file.txt",
+            fileDiff: "fake diff",
+            originalContent: "old",
+            newContent: "new",
           },
         } as TrackedWaitingToolCall,
       ];
@@ -1220,9 +1183,7 @@ describe('useGeminiStream', () => {
       const { result } = renderTestHook(toolCalls);
 
       // State is `WaitingForConfirmation` because a tool is awaiting approval
-      expect(result.current.streamingState).toBe(
-        StreamingState.WaitingForConfirmation,
-      );
+      expect(result.current.streamingState).toBe(StreamingState.WaitingForConfirmation);
 
       // Try to cancel
       simulateEscapeKeyPress();
@@ -1234,7 +1195,7 @@ describe('useGeminiStream', () => {
       await waitFor(() => {
         expect(mockAddItem).toHaveBeenCalledWith(
           expect.objectContaining({
-            text: 'Request cancelled.',
+            text: "Request cancelled.",
           }),
           expect.any(Number),
         );
@@ -1245,12 +1206,12 @@ describe('useGeminiStream', () => {
     });
   });
 
-  describe('Slash Command Handling', () => {
-    it('should schedule a tool call when the command processor returns a schedule_tool action', async () => {
+  describe("Slash Command Handling", () => {
+    it("should schedule a tool call when the command processor returns a schedule_tool action", async () => {
       const clientToolRequest: SlashCommandProcessorResult = {
-        type: 'schedule_tool',
-        toolName: 'save_memory',
-        toolArgs: { fact: 'test fact' },
+        type: "schedule_tool",
+        toolName: "save_memory",
+        toolArgs: { fact: "test fact" },
       };
       mockHandleSlashCommand.mockResolvedValue(clientToolRequest);
 
@@ -1264,8 +1225,8 @@ describe('useGeminiStream', () => {
         expect(mockScheduleToolCalls).toHaveBeenCalledWith(
           [
             expect.objectContaining({
-              name: 'save_memory',
-              args: { fact: 'test fact' },
+              name: "save_memory",
+              args: { fact: "test fact" },
               isClientInitiated: true,
             }),
           ],
@@ -1275,52 +1236,49 @@ describe('useGeminiStream', () => {
       });
     });
 
-    it('should stop processing and not call Gemini when a command is handled without a tool call', async () => {
+    it("should stop processing and not call Gemini when a command is handled without a tool call", async () => {
       const uiOnlyCommandResult: SlashCommandProcessorResult = {
-        type: 'handled',
+        type: "handled",
       };
       mockHandleSlashCommand.mockResolvedValue(uiOnlyCommandResult);
 
       const { result } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('/help');
+        await result.current.submitQuery("/help");
       });
 
       await waitFor(() => {
-        expect(mockHandleSlashCommand).toHaveBeenCalledWith('/help');
+        expect(mockHandleSlashCommand).toHaveBeenCalledWith("/help");
         expect(mockScheduleToolCalls).not.toHaveBeenCalled();
         expect(mockSendMessageStream).not.toHaveBeenCalled(); // No LLM call made
       });
     });
 
-    it('should call Gemini with prompt content when slash command returns a `submit_prompt` action', async () => {
+    it("should call Gemini with prompt content when slash command returns a `submit_prompt` action", async () => {
       const customCommandResult: SlashCommandProcessorResult = {
-        type: 'submit_prompt',
-        content: 'This is the actual prompt from the command file.',
+        type: "submit_prompt",
+        content: "This is the actual prompt from the command file.",
       };
       mockHandleSlashCommand.mockResolvedValue(customCommandResult);
 
-      const { result, mockSendMessageStream: localMockSendMessageStream } =
-        renderTestHook();
+      const { result, mockSendMessageStream: localMockSendMessageStream } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('/my-custom-command');
+        await result.current.submitQuery("/my-custom-command");
       });
 
       await waitFor(() => {
-        expect(mockHandleSlashCommand).toHaveBeenCalledWith(
-          '/my-custom-command',
-        );
+        expect(mockHandleSlashCommand).toHaveBeenCalledWith("/my-custom-command");
 
         expect(localMockSendMessageStream).not.toHaveBeenCalledWith(
-          '/my-custom-command',
+          "/my-custom-command",
           expect.anything(),
           expect.anything(),
         );
 
         expect(localMockSendMessageStream).toHaveBeenCalledWith(
-          'This is the actual prompt from the command file.',
+          "This is the actual prompt from the command file.",
           expect.any(AbortSignal),
           expect.any(String),
         );
@@ -1329,67 +1287,64 @@ describe('useGeminiStream', () => {
       });
     });
 
-    it('should correctly handle a submit_prompt action with empty content', async () => {
+    it("should correctly handle a submit_prompt action with empty content", async () => {
       const emptyPromptResult: SlashCommandProcessorResult = {
-        type: 'submit_prompt',
-        content: '',
+        type: "submit_prompt",
+        content: "",
       };
       mockHandleSlashCommand.mockResolvedValue(emptyPromptResult);
 
-      const { result, mockSendMessageStream: localMockSendMessageStream } =
-        renderTestHook();
+      const { result, mockSendMessageStream: localMockSendMessageStream } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('/emptycmd');
+        await result.current.submitQuery("/emptycmd");
       });
 
       await waitFor(() => {
-        expect(mockHandleSlashCommand).toHaveBeenCalledWith('/emptycmd');
+        expect(mockHandleSlashCommand).toHaveBeenCalledWith("/emptycmd");
         expect(localMockSendMessageStream).toHaveBeenCalledWith(
-          '',
+          "",
           expect.any(AbortSignal),
           expect.any(String),
         );
       });
     });
 
-    it('should not call handleSlashCommand for line comments', async () => {
-      const { result, mockSendMessageStream: localMockSendMessageStream } =
-        renderTestHook();
+    it("should not call handleSlashCommand for line comments", async () => {
+      const { result, mockSendMessageStream: localMockSendMessageStream } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('// This is a line comment');
+        await result.current.submitQuery("// This is a line comment");
       });
 
       await waitFor(() => {
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         expect(localMockSendMessageStream).toHaveBeenCalledWith(
-          '// This is a line comment',
+          "// This is a line comment",
           expect.any(AbortSignal),
           expect.any(String),
         );
       });
     });
 
-    it('should not call handleSlashCommand for block comments', async () => {
-      const { result, mockSendMessageStream: localMockSendMessageStream } =
-        renderTestHook();
+    it("should not call handleSlashCommand for block comments", async () => {
+      const { result, mockSendMessageStream: localMockSendMessageStream } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('/* This is a block comment */');
+        await result.current.submitQuery("/* This is a block comment */");
       });
 
       await waitFor(() => {
         expect(mockHandleSlashCommand).not.toHaveBeenCalled();
         expect(localMockSendMessageStream).toHaveBeenCalledWith(
-          '/* This is a block comment */',
+          "/* This is a block comment */",
           expect.any(AbortSignal),
           expect.any(String),
         );
       });
     });
 
-    it('should not call handleSlashCommand is shell mode is active', async () => {
+    it("should not call handleSlashCommand is shell mode is active", async () => {
       const { result } = renderHook(() =>
         useGeminiStream(
           new MockedGeminiClientClass(mockConfig),
@@ -1400,7 +1355,7 @@ describe('useGeminiStream', () => {
           () => {},
           mockHandleSlashCommand,
           true,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -1413,7 +1368,7 @@ describe('useGeminiStream', () => {
       );
 
       await act(async () => {
-        await result.current.submitQuery('/about');
+        await result.current.submitQuery("/about");
       });
 
       await waitFor(() => {
@@ -1422,30 +1377,30 @@ describe('useGeminiStream', () => {
     });
   });
 
-  describe('Memory Refresh on save_memory', () => {
-    it('should call performMemoryRefresh when a save_memory tool call completes successfully', async () => {
+  describe("Memory Refresh on save_memory", () => {
+    it("should call performMemoryRefresh when a save_memory tool call completes successfully", async () => {
       const mockPerformMemoryRefresh = vi.fn();
       const completedToolCall: TrackedCompletedToolCall = {
         request: {
-          callId: 'save-mem-call-1',
-          name: 'save_memory',
-          args: { fact: 'test' },
+          callId: "save-mem-call-1",
+          name: "save_memory",
+          args: { fact: "test" },
           isClientInitiated: true,
-          prompt_id: 'prompt-id-6',
+          prompt_id: "prompt-id-6",
         },
-        status: 'success',
+        status: "success",
         responseSubmittedToGemini: false,
         response: {
-          callId: 'save-mem-call-1',
-          responseParts: [{ text: 'Memory saved' }],
-          resultDisplay: 'Success: Memory saved',
+          callId: "save-mem-call-1",
+          responseParts: [{ text: "Memory saved" }],
+          resultDisplay: "Success: Memory saved",
           error: undefined,
           errorType: undefined, // FIX: Added missing property
         },
         tool: {
-          name: 'save_memory',
-          displayName: 'save_memory',
-          description: 'Saves memory',
+          name: "save_memory",
+          displayName: "save_memory",
+          description: "Saves memory",
           build: vi.fn(),
         } as any,
         invocation: {
@@ -1454,9 +1409,7 @@ describe('useGeminiStream', () => {
       };
 
       // Capture the onComplete callback
-      let capturedOnComplete:
-        | ((completedTools: TrackedToolCall[]) => Promise<void>)
-        | null = null;
+      let capturedOnComplete: ((completedTools: TrackedToolCall[]) => Promise<void>) | null = null;
 
       mockUseReactToolScheduler.mockImplementation((onComplete) => {
         capturedOnComplete = onComplete;
@@ -1473,7 +1426,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           mockPerformMemoryRefresh,
           false,
@@ -1498,15 +1451,15 @@ describe('useGeminiStream', () => {
     });
   });
 
-  describe('Error Handling', () => {
-    it('should call parseAndFormatApiError with the correct authType on stream initialization failure', async () => {
+  describe("Error Handling", () => {
+    it("should call parseAndFormatApiError with the correct authType on stream initialization failure", async () => {
       // 1. Setup
-      const mockError = new Error('Rate limit exceeded');
+      const mockError = new Error("Rate limit exceeded");
       const mockAuthType = AuthType.LOGIN_WITH_GOOGLE;
       mockParseAndFormatApiError.mockClear();
       mockSendMessageStream.mockReturnValue(
         (async function* () {
-          yield { type: 'content', value: '' };
+          yield { type: "content", value: "" };
           throw mockError;
         })(),
       );
@@ -1516,7 +1469,7 @@ describe('useGeminiStream', () => {
         getContentGeneratorConfig: vi.fn(() => ({
           authType: mockAuthType,
         })),
-        getModel: vi.fn(() => 'gemini-2.5-pro'),
+        getModel: vi.fn(() => "gemini-2.5-pro"),
       } as unknown as Config;
 
       const { result } = renderHook(() =>
@@ -1529,7 +1482,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -1543,28 +1496,28 @@ describe('useGeminiStream', () => {
 
       // 2. Action
       await act(async () => {
-        await result.current.submitQuery('test query');
+        await result.current.submitQuery("test query");
       });
 
       // 3. Assertion
       await waitFor(() => {
         expect(mockParseAndFormatApiError).toHaveBeenCalledWith(
-          'Rate limit exceeded',
+          "Rate limit exceeded",
           mockAuthType,
           undefined,
-          'gemini-2.5-pro',
-          'gemini-2.5-flash',
+          "gemini-2.5-pro",
+          "gemini-2.5-flash",
         );
       });
     });
   });
 
-  describe('handleApprovalModeChange', () => {
-    it('should auto-approve all pending tool calls when switching to YOLO mode', async () => {
+  describe("handleApprovalModeChange", () => {
+    it("should auto-approve all pending tool calls when switching to YOLO mode", async () => {
       const mockOnConfirm = vi.fn().mockResolvedValue(undefined);
       const awaitingApprovalToolCalls: TrackedToolCall[] = [
-        createMockToolCall('replace', 'call1', 'edit', mockOnConfirm),
-        createMockToolCall('read_file', 'call2', 'info', mockOnConfirm),
+        createMockToolCall("replace", "call1", "edit", mockOnConfirm),
+        createMockToolCall("read_file", "call2", "info", mockOnConfirm),
       ];
 
       const { result } = renderTestHook(awaitingApprovalToolCalls);
@@ -1575,20 +1528,18 @@ describe('useGeminiStream', () => {
 
       // Both tool calls should be auto-approved
       expect(mockOnConfirm).toHaveBeenCalledTimes(2);
-      expect(mockOnConfirm).toHaveBeenCalledWith(
-        ToolConfirmationOutcome.ProceedOnce,
-      );
+      expect(mockOnConfirm).toHaveBeenCalledWith(ToolConfirmationOutcome.ProceedOnce);
     });
 
-    it('should only auto-approve edit tools when switching to AUTO_EDIT mode', async () => {
+    it("should only auto-approve edit tools when switching to AUTO_EDIT mode", async () => {
       const mockOnConfirmReplace = vi.fn().mockResolvedValue(undefined);
       const mockOnConfirmWrite = vi.fn().mockResolvedValue(undefined);
       const mockOnConfirmRead = vi.fn().mockResolvedValue(undefined);
 
       const awaitingApprovalToolCalls: TrackedToolCall[] = [
-        createMockToolCall('replace', 'call1', 'edit', mockOnConfirmReplace),
-        createMockToolCall('write_file', 'call2', 'edit', mockOnConfirmWrite),
-        createMockToolCall('read_file', 'call3', 'info', mockOnConfirmRead),
+        createMockToolCall("replace", "call1", "edit", mockOnConfirmReplace),
+        createMockToolCall("write_file", "call2", "edit", mockOnConfirmWrite),
+        createMockToolCall("read_file", "call3", "info", mockOnConfirmRead),
       ];
 
       const { result } = renderTestHook(awaitingApprovalToolCalls);
@@ -1598,21 +1549,17 @@ describe('useGeminiStream', () => {
       });
 
       // Only replace and write_file should be auto-approved
-      expect(mockOnConfirmReplace).toHaveBeenCalledWith(
-        ToolConfirmationOutcome.ProceedOnce,
-      );
-      expect(mockOnConfirmWrite).toHaveBeenCalledWith(
-        ToolConfirmationOutcome.ProceedOnce,
-      );
+      expect(mockOnConfirmReplace).toHaveBeenCalledWith(ToolConfirmationOutcome.ProceedOnce);
+      expect(mockOnConfirmWrite).toHaveBeenCalledWith(ToolConfirmationOutcome.ProceedOnce);
 
       // read_file should not be auto-approved
       expect(mockOnConfirmRead).not.toHaveBeenCalled();
     });
 
-    it('should not auto-approve any tools when switching to REQUIRE_CONFIRMATION mode', async () => {
+    it("should not auto-approve any tools when switching to REQUIRE_CONFIRMATION mode", async () => {
       const mockOnConfirm = vi.fn().mockResolvedValue(undefined);
       const awaitingApprovalToolCalls: TrackedToolCall[] = [
-        createMockToolCall('replace', 'call1', 'edit', mockOnConfirm),
+        createMockToolCall("replace", "call1", "edit", mockOnConfirm),
       ];
 
       const { result } = renderTestHook(awaitingApprovalToolCalls);
@@ -1625,18 +1572,14 @@ describe('useGeminiStream', () => {
       expect(mockOnConfirm).not.toHaveBeenCalled();
     });
 
-    it('should handle errors gracefully when auto-approving tool calls', async () => {
-      const debuggerSpy = vi
-        .spyOn(debugLogger, 'warn')
-        .mockImplementation(() => {});
+    it("should handle errors gracefully when auto-approving tool calls", async () => {
+      const debuggerSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
       const mockOnConfirmSuccess = vi.fn().mockResolvedValue(undefined);
-      const mockOnConfirmError = vi
-        .fn()
-        .mockRejectedValue(new Error('Approval failed'));
+      const mockOnConfirmError = vi.fn().mockRejectedValue(new Error("Approval failed"));
 
       const awaitingApprovalToolCalls: TrackedToolCall[] = [
-        createMockToolCall('replace', 'call1', 'edit', mockOnConfirmSuccess),
-        createMockToolCall('write_file', 'call2', 'edit', mockOnConfirmError),
+        createMockToolCall("replace", "call1", "edit", mockOnConfirmSuccess),
+        createMockToolCall("write_file", "call2", "edit", mockOnConfirmError),
       ];
 
       const { result } = renderTestHook(awaitingApprovalToolCalls);
@@ -1651,34 +1594,34 @@ describe('useGeminiStream', () => {
 
       // Error should be logged
       expect(debuggerSpy).toHaveBeenCalledWith(
-        'Failed to auto-approve tool call call2:',
+        "Failed to auto-approve tool call call2:",
         expect.any(Error),
       );
 
       debuggerSpy.mockRestore();
     });
 
-    it('should skip tool calls without confirmationDetails', async () => {
+    it("should skip tool calls without confirmationDetails", async () => {
       const awaitingApprovalToolCalls: TrackedToolCall[] = [
         {
           request: {
-            callId: 'call1',
-            name: 'replace',
-            args: { old_string: 'old', new_string: 'new' },
+            callId: "call1",
+            name: "replace",
+            args: { old_string: "old", new_string: "new" },
             isClientInitiated: false,
-            prompt_id: 'prompt-id-1',
+            prompt_id: "prompt-id-1",
           },
-          status: 'awaiting_approval',
+          status: "awaiting_approval",
           responseSubmittedToGemini: false,
           // No confirmationDetails
           tool: {
-            name: 'replace',
-            displayName: 'replace',
-            description: 'Replace text',
+            name: "replace",
+            displayName: "replace",
+            description: "Replace text",
             build: vi.fn(),
           } as any,
           invocation: {
-            getDescription: () => 'Mock description',
+            getDescription: () => "Mock description",
           } as unknown as AnyToolInvocation,
         } as unknown as TrackedWaitingToolCall,
       ];
@@ -1691,36 +1634,36 @@ describe('useGeminiStream', () => {
       });
     });
 
-    it('should skip tool calls without onConfirm method in confirmationDetails', async () => {
+    it("should skip tool calls without onConfirm method in confirmationDetails", async () => {
       const awaitingApprovalToolCalls: TrackedToolCall[] = [
         {
           request: {
-            callId: 'call1',
-            name: 'replace',
-            args: { old_string: 'old', new_string: 'new' },
+            callId: "call1",
+            name: "replace",
+            args: { old_string: "old", new_string: "new" },
             isClientInitiated: false,
-            prompt_id: 'prompt-id-1',
+            prompt_id: "prompt-id-1",
           },
-          status: 'awaiting_approval',
+          status: "awaiting_approval",
           responseSubmittedToGemini: false,
           confirmationDetails: {
-            type: 'edit',
-            title: 'Confirm Edit',
+            type: "edit",
+            title: "Confirm Edit",
             // No onConfirm method
-            fileName: 'file.txt',
-            filePath: '/test/file.txt',
-            fileDiff: 'fake diff',
-            originalContent: 'old',
-            newContent: 'new',
+            fileName: "file.txt",
+            filePath: "/test/file.txt",
+            fileDiff: "fake diff",
+            originalContent: "old",
+            newContent: "new",
           } as any,
           tool: {
-            name: 'replace',
-            displayName: 'replace',
-            description: 'Replace text',
+            name: "replace",
+            displayName: "replace",
+            description: "Replace text",
             build: vi.fn(),
           } as any,
           invocation: {
-            getDescription: () => 'Mock description',
+            getDescription: () => "Mock description",
           } as unknown as AnyToolInvocation,
         } as TrackedWaitingToolCall,
       ];
@@ -1733,62 +1676,62 @@ describe('useGeminiStream', () => {
       });
     });
 
-    it('should only process tool calls with awaiting_approval status', async () => {
+    it("should only process tool calls with awaiting_approval status", async () => {
       const mockOnConfirmAwaiting = vi.fn().mockResolvedValue(undefined);
       const mockOnConfirmExecuting = vi.fn().mockResolvedValue(undefined);
 
       const mixedStatusToolCalls: TrackedToolCall[] = [
         {
           request: {
-            callId: 'call1',
-            name: 'replace',
-            args: { old_string: 'old', new_string: 'new' },
+            callId: "call1",
+            name: "replace",
+            args: { old_string: "old", new_string: "new" },
             isClientInitiated: false,
-            prompt_id: 'prompt-id-1',
+            prompt_id: "prompt-id-1",
           },
-          status: 'awaiting_approval',
+          status: "awaiting_approval",
           responseSubmittedToGemini: false,
           confirmationDetails: {
-            type: 'edit',
-            title: 'Confirm Edit',
+            type: "edit",
+            title: "Confirm Edit",
             onConfirm: mockOnConfirmAwaiting,
-            fileName: 'file.txt',
-            filePath: '/test/file.txt',
-            fileDiff: 'fake diff',
-            originalContent: 'old',
-            newContent: 'new',
+            fileName: "file.txt",
+            filePath: "/test/file.txt",
+            fileDiff: "fake diff",
+            originalContent: "old",
+            newContent: "new",
           },
           tool: {
-            name: 'replace',
-            displayName: 'replace',
-            description: 'Replace text',
+            name: "replace",
+            displayName: "replace",
+            description: "Replace text",
             build: vi.fn(),
           } as any,
           invocation: {
-            getDescription: () => 'Mock description',
+            getDescription: () => "Mock description",
           } as unknown as AnyToolInvocation,
         } as TrackedWaitingToolCall,
         {
           request: {
-            callId: 'call2',
-            name: 'write_file',
-            args: { path: '/test/file.txt', content: 'content' },
+            callId: "call2",
+            name: "write_file",
+            args: { path: "/test/file.txt", content: "content" },
             isClientInitiated: false,
-            prompt_id: 'prompt-id-1',
+            prompt_id: "prompt-id-1",
           },
-          status: 'executing',
+          status: "executing",
           responseSubmittedToGemini: false,
           tool: {
-            name: 'write_file',
-            displayName: 'write_file',
-            description: 'Write file',
+            name: "write_file",
+            displayName: "write_file",
+            description: "Write file",
             build: vi.fn(),
           } as any,
           invocation: {
-            getDescription: () => 'Mock description',
+            getDescription: () => "Mock description",
           } as unknown as AnyToolInvocation,
           startTime: Date.now(),
-          liveOutput: 'Writing...',
+          liveOutput: "Writing...",
         } as TrackedExecutingToolCall,
       ];
 
@@ -1804,18 +1747,18 @@ describe('useGeminiStream', () => {
     });
   });
 
-  describe('handleFinishedEvent', () => {
-    it('should add info message for MAX_TOKENS finish reason', async () => {
+  describe("handleFinishedEvent", () => {
+    it("should add info message for MAX_TOKENS finish reason", async () => {
       // Setup mock to return a stream with MAX_TOKENS finish reason
       mockSendMessageStream.mockReturnValue(
         (async function* () {
           yield {
             type: ServerGeminiEventType.Content,
-            value: 'This is a truncated response...',
+            value: "This is a truncated response...",
           };
           yield {
             type: ServerGeminiEventType.Finished,
-            value: { reason: 'MAX_TOKENS', usageMetadata: undefined },
+            value: { reason: "MAX_TOKENS", usageMetadata: undefined },
           };
         })(),
       );
@@ -1830,7 +1773,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -1844,76 +1787,77 @@ describe('useGeminiStream', () => {
 
       // Submit a query
       await act(async () => {
-        await result.current.submitQuery('Generate long text');
+        await result.current.submitQuery("Generate long text");
       });
 
       // Check that the info message was added
       await waitFor(() => {
         expect(mockAddItem).toHaveBeenCalledWith(
           {
-            type: 'info',
-            text: '⚠️  Response truncated due to token limits.',
+            type: "info",
+            text: "⚠️  Response truncated due to token limits.",
           },
           expect.any(Number),
         );
       });
     });
 
-    describe('ContextWindowWillOverflow event', () => {
+    describe("ContextWindowWillOverflow event", () => {
       beforeEach(() => {
         vi.mocked(tokenLimit).mockReturnValue(100);
       });
 
       it.each([
         {
-          name: 'without suggestion when remaining tokens are > 75% of limit',
+          name: "without suggestion when remaining tokens are > 75% of limit",
           requestTokens: 20,
           remainingTokens: 80,
           expectedMessage:
-            'Sending this message (20 tokens) might exceed the remaining context window limit (80 tokens).',
+            "Sending this message (20 tokens) might exceed the remaining context window limit (80 tokens).",
         },
         {
-          name: 'with suggestion when remaining tokens are < 75% of limit',
+          name: "with suggestion when remaining tokens are < 75% of limit",
           requestTokens: 30,
           remainingTokens: 70,
           expectedMessage:
-            'Sending this message (30 tokens) might exceed the remaining context window limit (70 tokens). Please try reducing the size of your message or use the `/compress` command to compress the chat history.',
+            "Sending this message (30 tokens) might exceed the remaining context window limit (70 tokens). Please try reducing the size of your message or use the `/compress` command to compress the chat history.",
         },
-      ])(
-        'should add message $name',
-        async ({ requestTokens, remainingTokens, expectedMessage }) => {
-          mockSendMessageStream.mockReturnValue(
-            (async function* () {
-              yield {
-                type: ServerGeminiEventType.ContextWindowWillOverflow,
-                value: {
-                  estimatedRequestTokenCount: requestTokens,
-                  remainingTokenCount: remainingTokens,
-                },
-              };
-            })(),
-          );
+      ])("should add message $name", async ({
+        requestTokens,
+        remainingTokens,
+        expectedMessage,
+      }) => {
+        mockSendMessageStream.mockReturnValue(
+          (async function* () {
+            yield {
+              type: ServerGeminiEventType.ContextWindowWillOverflow,
+              value: {
+                estimatedRequestTokenCount: requestTokens,
+                remainingTokenCount: remainingTokens,
+              },
+            };
+          })(),
+        );
 
-          const { result } = renderHookWithDefaults();
+        const { result } = renderHookWithDefaults();
 
-          await act(async () => {
-            await result.current.submitQuery('Test overflow');
-          });
+        await act(async () => {
+          await result.current.submitQuery("Test overflow");
+        });
 
-          await waitFor(() => {
-            expect(mockAddItem).toHaveBeenCalledWith(
-              {
-                type: 'info',
-                text: expectedMessage,
-              },
-              expect.any(Number),
-            );
-          });
-        },
-      );
+        await waitFor(() => {
+          expect(mockAddItem).toHaveBeenCalledWith(
+            {
+              type: "info",
+              text: expectedMessage,
+            },
+            expect.any(Number),
+          );
+        });
+      });
     });
 
-    it('should call onCancelSubmit when ContextWindowWillOverflow event is received', async () => {
+    it("should call onCancelSubmit when ContextWindowWillOverflow event is received", async () => {
       const onCancelSubmitSpy = vi.fn();
       // Setup mock to return a stream with ContextWindowWillOverflow event
       mockSendMessageStream.mockReturnValue(
@@ -1938,7 +1882,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -1952,7 +1896,7 @@ describe('useGeminiStream', () => {
 
       // Submit a query
       await act(async () => {
-        await result.current.submitQuery('Test overflow');
+        await result.current.submitQuery("Test overflow");
       });
 
       // Check that onCancelSubmit was called
@@ -1963,109 +1907,107 @@ describe('useGeminiStream', () => {
 
     it.each([
       {
-        reason: 'STOP',
+        reason: "STOP",
         shouldAddMessage: false,
       },
       {
-        reason: 'FINISH_REASON_UNSPECIFIED',
+        reason: "FINISH_REASON_UNSPECIFIED",
         shouldAddMessage: false,
       },
       {
-        reason: 'SAFETY',
-        message: '⚠️  Response stopped due to safety reasons.',
+        reason: "SAFETY",
+        message: "⚠️  Response stopped due to safety reasons.",
       },
       {
-        reason: 'RECITATION',
-        message: '⚠️  Response stopped due to recitation policy.',
+        reason: "RECITATION",
+        message: "⚠️  Response stopped due to recitation policy.",
       },
       {
-        reason: 'LANGUAGE',
-        message: '⚠️  Response stopped due to unsupported language.',
+        reason: "LANGUAGE",
+        message: "⚠️  Response stopped due to unsupported language.",
       },
       {
-        reason: 'BLOCKLIST',
-        message: '⚠️  Response stopped due to forbidden terms.',
+        reason: "BLOCKLIST",
+        message: "⚠️  Response stopped due to forbidden terms.",
       },
       {
-        reason: 'PROHIBITED_CONTENT',
-        message: '⚠️  Response stopped due to prohibited content.',
+        reason: "PROHIBITED_CONTENT",
+        message: "⚠️  Response stopped due to prohibited content.",
       },
       {
-        reason: 'SPII',
-        message:
-          '⚠️  Response stopped due to sensitive personally identifiable information.',
+        reason: "SPII",
+        message: "⚠️  Response stopped due to sensitive personally identifiable information.",
       },
       {
-        reason: 'OTHER',
-        message: '⚠️  Response stopped for other reasons.',
+        reason: "OTHER",
+        message: "⚠️  Response stopped for other reasons.",
       },
       {
-        reason: 'MALFORMED_FUNCTION_CALL',
-        message: '⚠️  Response stopped due to malformed function call.',
+        reason: "MALFORMED_FUNCTION_CALL",
+        message: "⚠️  Response stopped due to malformed function call.",
       },
       {
-        reason: 'IMAGE_SAFETY',
-        message: '⚠️  Response stopped due to image safety violations.',
+        reason: "IMAGE_SAFETY",
+        message: "⚠️  Response stopped due to image safety violations.",
       },
       {
-        reason: 'UNEXPECTED_TOOL_CALL',
-        message: '⚠️  Response stopped due to unexpected tool call.',
+        reason: "UNEXPECTED_TOOL_CALL",
+        message: "⚠️  Response stopped due to unexpected tool call.",
       },
-    ])(
-      'should handle $reason finish reason correctly',
-      async ({ reason, shouldAddMessage = true, message }) => {
-        mockSendMessageStream.mockReturnValue(
-          (async function* () {
-            yield {
-              type: ServerGeminiEventType.Content,
-              value: `Response for ${reason}`,
-            };
-            yield {
-              type: ServerGeminiEventType.Finished,
-              value: { reason, usageMetadata: undefined },
-            };
-          })(),
-        );
-
-        const { result } = renderHookWithDefaults();
+    ])("should handle $reason finish reason correctly", async ({
+      reason,
+      shouldAddMessage = true,
+      message,
+    }) => {
+      mockSendMessageStream.mockReturnValue(
+        (async function* () {
+          yield {
+            type: ServerGeminiEventType.Content,
+            value: `Response for ${reason}`,
+          };
+          yield {
+            type: ServerGeminiEventType.Finished,
+            value: { reason, usageMetadata: undefined },
+          };
+        })(),
+      );
 
-        await act(async () => {
-          await result.current.submitQuery(`Test ${reason}`);
-        });
+      const { result } = renderHookWithDefaults();
 
-        if (shouldAddMessage) {
-          await waitFor(() => {
-            expect(mockAddItem).toHaveBeenCalledWith(
-              {
-                type: 'info',
-                text: message,
-              },
-              expect.any(Number),
-            );
-          });
-        } else {
-          // Verify state returns to idle without any info messages
-          await waitFor(() => {
-            expect(result.current.streamingState).toBe(StreamingState.Idle);
-          });
+      await act(async () => {
+        await result.current.submitQuery(`Test ${reason}`);
+      });
 
-          const infoMessages = mockAddItem.mock.calls.filter(
-            (call) => call[0].type === 'info',
+      if (shouldAddMessage) {
+        await waitFor(() => {
+          expect(mockAddItem).toHaveBeenCalledWith(
+            {
+              type: "info",
+              text: message,
+            },
+            expect.any(Number),
           );
-          expect(infoMessages).toHaveLength(0);
-        }
-      },
-    );
+        });
+      } else {
+        // Verify state returns to idle without any info messages
+        await waitFor(() => {
+          expect(result.current.streamingState).toBe(StreamingState.Idle);
+        });
+
+        const infoMessages = mockAddItem.mock.calls.filter((call) => call[0].type === "info");
+        expect(infoMessages).toHaveLength(0);
+      }
+    });
   });
 
-  it('should process @include commands, adding user turn after processing to prevent race conditions', async () => {
-    const rawQuery = '@include file.txt Summarize this.';
+  it("should process @include commands, adding user turn after processing to prevent race conditions", async () => {
+    const rawQuery = "@include file.txt Summarize this.";
     const processedQueryParts = [
-      { text: 'Summarize this with content from @file.txt' },
-      { text: 'File content...' },
+      { text: "Summarize this with content from @file.txt" },
+      { text: "File content..." },
     ];
     const userMessageTimestamp = Date.now();
-    vi.spyOn(Date, 'now').mockReturnValue(userMessageTimestamp);
+    vi.spyOn(Date, "now").mockReturnValue(userMessageTimestamp);
 
     handleAtCommandSpy.mockResolvedValue({
       processedQuery: processedQueryParts,
@@ -2119,25 +2061,25 @@ describe('useGeminiStream', () => {
       expect.any(String), // Argument 3: The prompt_id string
     );
   });
-  describe('Thought Reset', () => {
-    it('should reset thought to null when starting a new prompt', async () => {
+  describe("Thought Reset", () => {
+    it("should reset thought to null when starting a new prompt", async () => {
       // First, simulate a response with a thought
       mockSendMessageStream.mockReturnValue(
         (async function* () {
           yield {
             type: ServerGeminiEventType.Thought,
             value: {
-              subject: 'Previous thought',
-              description: 'Old description',
+              subject: "Previous thought",
+              description: "Old description",
             },
           };
           yield {
             type: ServerGeminiEventType.Content,
-            value: 'Some response content',
+            value: "Some response content",
           };
           yield {
             type: ServerGeminiEventType.Finished,
-            value: { reason: 'STOP', usageMetadata: undefined },
+            value: { reason: "STOP", usageMetadata: undefined },
           };
         })(),
       );
@@ -2152,7 +2094,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -2166,15 +2108,15 @@ describe('useGeminiStream', () => {
 
       // Submit first query to set a thought
       await act(async () => {
-        await result.current.submitQuery('First query');
+        await result.current.submitQuery("First query");
       });
 
       // Wait for the first response to complete
       await waitFor(() => {
         expect(mockAddItem).toHaveBeenCalledWith(
           expect.objectContaining({
-            type: 'gemini',
-            text: 'Some response content',
+            type: "gemini",
+            text: "Some response content",
           }),
           expect.any(Number),
         );
@@ -2185,18 +2127,18 @@ describe('useGeminiStream', () => {
         (async function* () {
           yield {
             type: ServerGeminiEventType.Content,
-            value: 'New response content',
+            value: "New response content",
           };
           yield {
             type: ServerGeminiEventType.Finished,
-            value: { reason: 'STOP', usageMetadata: undefined },
+            value: { reason: "STOP", usageMetadata: undefined },
           };
         })(),
       );
 
       // Submit second query - thought should be reset
       await act(async () => {
-        await result.current.submitQuery('Second query');
+        await result.current.submitQuery("Second query");
       });
 
       // The thought should be reset to null when starting the new prompt
@@ -2206,15 +2148,15 @@ describe('useGeminiStream', () => {
       await waitFor(() => {
         expect(mockAddItem).toHaveBeenCalledWith(
           expect.objectContaining({
-            type: 'gemini',
-            text: 'New response content',
+            type: "gemini",
+            text: "New response content",
           }),
           expect.any(Number),
         );
       });
     });
 
-    it('should memoize pendingHistoryItems', () => {
+    it("should memoize pendingHistoryItems", () => {
       mockUseReactToolScheduler.mockReturnValue([
         [],
         mockScheduleToolCalls,
@@ -2232,7 +2174,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -2252,16 +2194,16 @@ describe('useGeminiStream', () => {
 
       const newToolCalls: TrackedToolCall[] = [
         {
-          request: { callId: 'call1', name: 'tool1', args: {} },
-          status: 'executing',
+          request: { callId: "call1", name: "tool1", args: {} },
+          status: "executing",
           tool: {
-            name: 'tool1',
-            displayName: 'tool1',
-            description: 'desc1',
+            name: "tool1",
+            displayName: "tool1",
+            description: "desc1",
             build: vi.fn(),
           },
           invocation: {
-            getDescription: () => 'Mock description',
+            getDescription: () => "Mock description",
           },
         } as unknown as TrackedExecutingToolCall,
       ];
@@ -2279,13 +2221,13 @@ describe('useGeminiStream', () => {
       expect(thirdResult).not.toStrictEqual(secondResult);
     });
 
-    it('should reset thought to null when user cancels', async () => {
+    it("should reset thought to null when user cancels", async () => {
       // Mock a stream that yields a thought then gets cancelled
       mockSendMessageStream.mockReturnValue(
         (async function* () {
           yield {
             type: ServerGeminiEventType.Thought,
-            value: { subject: 'Some thought', description: 'Description' },
+            value: { subject: "Some thought", description: "Description" },
           };
           yield { type: ServerGeminiEventType.UserCancelled };
         })(),
@@ -2301,7 +2243,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -2315,15 +2257,15 @@ describe('useGeminiStream', () => {
 
       // Submit query
       await act(async () => {
-        await result.current.submitQuery('Test query');
+        await result.current.submitQuery("Test query");
       });
 
       // Verify cancellation message was added
       await waitFor(() => {
         expect(mockAddItem).toHaveBeenCalledWith(
           expect.objectContaining({
-            type: 'info',
-            text: 'User cancelled the request.',
+            type: "info",
+            text: "User cancelled the request.",
           }),
           expect.any(Number),
         );
@@ -2333,17 +2275,17 @@ describe('useGeminiStream', () => {
       expect(result.current.streamingState).toBe(StreamingState.Idle);
     });
 
-    it('should reset thought to null when there is an error', async () => {
+    it("should reset thought to null when there is an error", async () => {
       // Mock a stream that yields a thought then encounters an error
       mockSendMessageStream.mockReturnValue(
         (async function* () {
           yield {
             type: ServerGeminiEventType.Thought,
-            value: { subject: 'Some thought', description: 'Description' },
+            value: { subject: "Some thought", description: "Description" },
           };
           yield {
             type: ServerGeminiEventType.Error,
-            value: { error: { message: 'Test error' } },
+            value: { error: { message: "Test error" } },
           };
         })(),
       );
@@ -2358,7 +2300,7 @@ describe('useGeminiStream', () => {
           mockOnDebugMessage,
           mockHandleSlashCommand,
           false,
-          () => 'vscode' as EditorType,
+          () => "vscode" as EditorType,
           () => {},
           () => Promise.resolve(),
           false,
@@ -2372,14 +2314,14 @@ describe('useGeminiStream', () => {
 
       // Submit query
       await act(async () => {
-        await result.current.submitQuery('Test query');
+        await result.current.submitQuery("Test query");
       });
 
       // Verify error message was added
       await waitFor(() => {
         expect(mockAddItem).toHaveBeenCalledWith(
           expect.objectContaining({
-            type: 'error',
+            type: "error",
           }),
           expect.any(Number),
         );
@@ -2387,16 +2329,16 @@ describe('useGeminiStream', () => {
 
       // Verify parseAndFormatApiError was called
       expect(mockParseAndFormatApiError).toHaveBeenCalledWith(
-        { message: 'Test error' },
+        { message: "Test error" },
         expect.any(String),
         undefined,
-        'gemini-2.5-pro',
-        'gemini-2.5-flash',
+        "gemini-2.5-pro",
+        "gemini-2.5-flash",
       );
     });
   });
 
-  describe('Loop Detection Confirmation', () => {
+  describe("Loop Detection Confirmation", () => {
     beforeEach(() => {
       // Add mock for getLoopDetectionService to the config
       const mockLoopDetectionService = {
@@ -2408,12 +2350,12 @@ describe('useGeminiStream', () => {
       });
     });
 
-    it('should set loopDetectionConfirmationRequest when LoopDetected event is received', async () => {
+    it("should set loopDetectionConfirmationRequest when LoopDetected event is received", async () => {
       mockSendMessageStream.mockReturnValue(
         (async function* () {
           yield {
             type: ServerGeminiEventType.Content,
-            value: 'Some content',
+            value: "Some content",
           };
           yield {
             type: ServerGeminiEventType.LoopDetected,
@@ -2424,14 +2366,12 @@ describe('useGeminiStream', () => {
       const { result } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('test query');
+        await result.current.submitQuery("test query");
       });
 
       await waitFor(() => {
         expect(result.current.loopDetectionConfirmationRequest).not.toBeNull();
-        expect(
-          typeof result.current.loopDetectionConfirmationRequest?.onComplete,
-        ).toBe('function');
+        expect(typeof result.current.loopDetectionConfirmationRequest?.onComplete).toBe("function");
       });
     });
 
@@ -2459,11 +2399,11 @@ describe('useGeminiStream', () => {
         (async function* () {
           yield {
             type: ServerGeminiEventType.Content,
-            value: 'Retry successful',
+            value: "Retry successful",
           };
           yield {
             type: ServerGeminiEventType.Finished,
-            value: { reason: 'STOP' },
+            value: { reason: "STOP" },
           };
         })(),
       );
@@ -2471,7 +2411,7 @@ describe('useGeminiStream', () => {
       const { result } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('test query');
+        await result.current.submitQuery("test query");
       });
 
       // Wait for confirmation request to be set
@@ -2482,14 +2422,12 @@ describe('useGeminiStream', () => {
       // Simulate user selecting "disable"
       await act(async () => {
         result.current.loopDetectionConfirmationRequest?.onComplete({
-          userSelection: 'disable',
+          userSelection: "disable",
         });
       });
 
       // Verify loop detection was disabled
-      expect(mockLoopDetectionService.disableForSession).toHaveBeenCalledTimes(
-        1,
-      );
+      expect(mockLoopDetectionService.disableForSession).toHaveBeenCalledTimes(1);
 
       // Verify confirmation request was cleared
       expect(result.current.loopDetectionConfirmationRequest).toBeNull();
@@ -2497,8 +2435,8 @@ describe('useGeminiStream', () => {
       // Verify appropriate message was added
       expect(mockAddItem).toHaveBeenCalledWith(
         {
-          type: 'info',
-          text: 'Loop detection has been disabled for this session. Retrying request...',
+          type: "info",
+          text: "Loop detection has been disabled for this session. Retrying request...",
         },
         expect.any(Number),
       );
@@ -2508,7 +2446,7 @@ describe('useGeminiStream', () => {
         expect(mockSendMessageStream).toHaveBeenCalledTimes(2);
         expect(mockSendMessageStream).toHaveBeenNthCalledWith(
           2,
-          'test query',
+          "test query",
           expect.any(AbortSignal),
           expect.any(String),
         );
@@ -2536,7 +2474,7 @@ describe('useGeminiStream', () => {
       const { result } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('test query');
+        await result.current.submitQuery("test query");
       });
 
       // Wait for confirmation request to be set
@@ -2547,7 +2485,7 @@ describe('useGeminiStream', () => {
       // Simulate user selecting "keep"
       await act(async () => {
         result.current.loopDetectionConfirmationRequest?.onComplete({
-          userSelection: 'keep',
+          userSelection: "keep",
         });
       });
 
@@ -2560,8 +2498,8 @@ describe('useGeminiStream', () => {
       // Verify appropriate message was added
       expect(mockAddItem).toHaveBeenCalledWith(
         {
-          type: 'info',
-          text: 'A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.',
+          type: "info",
+          text: "A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.",
         },
         expect.any(Number),
       );
@@ -2570,7 +2508,7 @@ describe('useGeminiStream', () => {
       expect(mockSendMessageStream).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle multiple loop detection events properly', async () => {
+    it("should handle multiple loop detection events properly", async () => {
       const { result } = renderTestHook();
 
       // First loop detection - set up fresh mock for first call
@@ -2584,7 +2522,7 @@ describe('useGeminiStream', () => {
 
       // First loop detection
       await act(async () => {
-        await result.current.submitQuery('first query');
+        await result.current.submitQuery("first query");
       });
 
       await waitFor(() => {
@@ -2594,7 +2532,7 @@ describe('useGeminiStream', () => {
       // Simulate user selecting "keep" for first request
       await act(async () => {
         result.current.loopDetectionConfirmationRequest?.onComplete({
-          userSelection: 'keep',
+          userSelection: "keep",
         });
       });
 
@@ -2603,8 +2541,8 @@ describe('useGeminiStream', () => {
       // Verify first message was added
       expect(mockAddItem).toHaveBeenCalledWith(
         {
-          type: 'info',
-          text: 'A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.',
+          type: "info",
+          text: "A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.",
         },
         expect.any(Number),
       );
@@ -2623,18 +2561,18 @@ describe('useGeminiStream', () => {
         (async function* () {
           yield {
             type: ServerGeminiEventType.Content,
-            value: 'Retry successful',
+            value: "Retry successful",
           };
           yield {
             type: ServerGeminiEventType.Finished,
-            value: { reason: 'STOP' },
+            value: { reason: "STOP" },
           };
         })(),
       );
 
       // Second loop detection
       await act(async () => {
-        await result.current.submitQuery('second query');
+        await result.current.submitQuery("second query");
       });
 
       await waitFor(() => {
@@ -2644,7 +2582,7 @@ describe('useGeminiStream', () => {
       // Simulate user selecting "disable" for second request
       await act(async () => {
         result.current.loopDetectionConfirmationRequest?.onComplete({
-          userSelection: 'disable',
+          userSelection: "disable",
         });
       });
 
@@ -2653,8 +2591,8 @@ describe('useGeminiStream', () => {
       // Verify second message was added
       expect(mockAddItem).toHaveBeenCalledWith(
         {
-          type: 'info',
-          text: 'Loop detection has been disabled for this session. Retrying request...',
+          type: "info",
+          text: "Loop detection has been disabled for this session. Retrying request...",
         },
         expect.any(Number),
       );
@@ -2664,19 +2602,19 @@ describe('useGeminiStream', () => {
         expect(mockSendMessageStream).toHaveBeenCalledTimes(3); // 1st query, 2nd query, retry of 2nd query
         expect(mockSendMessageStream).toHaveBeenNthCalledWith(
           3,
-          'second query',
+          "second query",
           expect.any(AbortSignal),
           expect.any(String),
         );
       });
     });
 
-    it('should process LoopDetected event after moving pending history to history', async () => {
+    it("should process LoopDetected event after moving pending history to history", async () => {
       mockSendMessageStream.mockReturnValue(
         (async function* () {
           yield {
             type: ServerGeminiEventType.Content,
-            value: 'Some response content',
+            value: "Some response content",
           };
           yield {
             type: ServerGeminiEventType.LoopDetected,
@@ -2687,15 +2625,15 @@ describe('useGeminiStream', () => {
       const { result } = renderTestHook();
 
       await act(async () => {
-        await result.current.submitQuery('test query');
+        await result.current.submitQuery("test query");
       });
 
       // Verify that the content was added to history before the loop detection dialog
       await waitFor(() => {
         expect(mockAddItem).toHaveBeenCalledWith(
           expect.objectContaining({
-            type: 'gemini',
-            text: 'Some response content',
+            type: "gemini",
+            text: "Some response content",
           }),
           expect.any(Number),
         );
diff --git a/packages/ui-gemini/src/ui/hooks/useGeminiStream.ts b/packages/ui-gemini/src/ui/hooks/useGeminiStream.ts
index 3c28974ce..45a967962 100644
--- a/packages/ui-gemini/src/ui/hooks/useGeminiStream.ts
+++ b/packages/ui-gemini/src/ui/hooks/useGeminiStream.ts
@@ -4,71 +4,71 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
+import { promises as fs } from "node:fs";
+import path from "node:path";
 import type {
   Config,
+  ServerGeminiContentEvent as ContentEvent,
   EditorType,
   GeminiClient,
+  GeminiErrorEventValue,
+  ServerGeminiStreamEvent as GeminiEvent,
   ServerGeminiChatCompressedEvent,
-  ServerGeminiContentEvent as ContentEvent,
   ServerGeminiFinishedEvent,
-  ServerGeminiStreamEvent as GeminiEvent,
   ThoughtSummary,
   ToolCallRequestInfo,
-  GeminiErrorEventValue,
-} from '@airiscode/gemini-cli-core';
+} from "@airiscode/gemini-cli-core";
 import {
-  GeminiEventType as ServerGeminiEventType,
+  ApprovalMode,
+  ConversationFinishedEvent,
+  DEFAULT_GEMINI_FLASH_MODEL,
+  debugLogger,
+  EDIT_TOOL_NAMES,
+  GitService,
   getErrorMessage,
   isNodeError,
-  MessageSenderType,
-  logUserPrompt,
-  GitService,
-  UnauthorizedError,
-  UserPromptEvent,
-  DEFAULT_GEMINI_FLASH_MODEL,
   logConversationFinishedEvent,
-  ConversationFinishedEvent,
-  ApprovalMode,
+  logUserPrompt,
+  MessageSenderType,
   parseAndFormatApiError,
-  ToolConfirmationOutcome,
+  processRestorableToolCalls,
   promptIdContext,
-  tokenLimit,
-  debugLogger,
   runInDevTraceSpan,
-  EDIT_TOOL_NAMES,
-  processRestorableToolCalls,
-} from '@airiscode/gemini-cli-core';
-import { type Part, type PartListUnion, FinishReason } from '@google/genai';
+  GeminiEventType as ServerGeminiEventType,
+  ToolConfirmationOutcome,
+  tokenLimit,
+  UnauthorizedError,
+  UserPromptEvent,
+} from "@airiscode/gemini-cli-core";
+import { FinishReason, type Part, type PartListUnion } from "@google/genai";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { SHELL_COMMAND_NAME } from "../constants.js";
+import { useSessionStats } from "../contexts/SessionContext.js";
 import type {
   HistoryItem,
-  HistoryItemWithoutId,
+  HistoryItemModel,
   HistoryItemToolGroup,
+  HistoryItemWithoutId,
   SlashCommandProcessorResult,
-  HistoryItemModel,
-} from '../types.js';
-import { StreamingState, MessageType, ToolCallStatus } from '../types.js';
-import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js';
-import { useShellCommandProcessor } from './shellCommandProcessor.js';
-import { handleAtCommand } from './atCommandProcessor.js';
-import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
-import { useStateAndRef } from './useStateAndRef.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { useLogger } from './useLogger.js';
-import { SHELL_COMMAND_NAME } from '../constants.js';
+} from "../types.js";
+import { MessageType, StreamingState, ToolCallStatus } from "../types.js";
+import { isAtCommand, isSlashCommand } from "../utils/commandUtils.js";
+import { findLastSafeSplitPoint } from "../utils/markdownUtilities.js";
+import { handleAtCommand } from "./atCommandProcessor.js";
+import { useShellCommandProcessor } from "./shellCommandProcessor.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { useKeypress } from "./useKeypress.js";
+import { useLogger } from "./useLogger.js";
 import {
-  useReactToolScheduler,
   mapToDisplay as mapTrackedToolCallsToDisplay,
-  type TrackedToolCall,
-  type TrackedCompletedToolCall,
   type TrackedCancelledToolCall,
+  type TrackedCompletedToolCall,
+  type TrackedToolCall,
   type TrackedWaitingToolCall,
-} from './useReactToolScheduler.js';
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { useSessionStats } from '../contexts/SessionContext.js';
-import { useKeypress } from './useKeypress.js';
-import type { LoadedSettings } from '../../config/settings.js';
+  useReactToolScheduler,
+} from "./useReactToolScheduler.js";
+import { useStateAndRef } from "./useStateAndRef.js";
 
 enum StreamProcessingStatus {
   Completed,
@@ -91,13 +91,11 @@ function showCitations(settings: LoadedSettings): boolean {
 export const useGeminiStream = (
   geminiClient: GeminiClient,
   history: HistoryItem[],
-  addItem: UseHistoryManagerReturn['addItem'],
+  addItem: UseHistoryManagerReturn["addItem"],
   config: Config,
   settings: LoadedSettings,
   onDebugMessage: (message: string) => void,
-  handleSlashCommand: (
-    cmd: PartListUnion,
-  ) => Promise<SlashCommandProcessorResult | false>,
+  handleSlashCommand: (cmd: PartListUnion) => Promise<SlashCommandProcessorResult | false>,
   shellModeActive: boolean,
   getPreferredEditor: () => EditorType | undefined,
   onAuthError: (error: string) => void,
@@ -142,9 +140,7 @@ export const useGeminiStream = (
       if (completedToolCallsFromScheduler.length > 0) {
         // Add the final state of these tools to the history for display.
         addItem(
-          mapTrackedToolCallsToDisplay(
-            completedToolCallsFromScheduler as TrackedToolCall[],
-          ),
+          mapTrackedToolCallsToDisplay(completedToolCallsFromScheduler as TrackedToolCall[]),
           Date.now(),
         );
 
@@ -154,25 +150,17 @@ export const useGeminiStream = (
         // Record tool calls with full metadata before sending responses.
         try {
           const currentModel =
-            config.getGeminiClient().getCurrentSequenceModel() ??
-            config.getModel();
+            config.getGeminiClient().getCurrentSequenceModel() ?? config.getModel();
           config
             .getGeminiClient()
             .getChat()
-            .recordCompletedToolCalls(
-              currentModel,
-              completedToolCallsFromScheduler,
-            );
+            .recordCompletedToolCalls(currentModel, completedToolCallsFromScheduler);
         } catch (error) {
-          debugLogger.warn(
-            `Error recording completed tool call information: ${error}`,
-          );
+          debugLogger.warn(`Error recording completed tool call information: ${error}`);
         }
 
         // Handle tool response submission immediately when tools complete
-        await handleCompletedTools(
-          completedToolCallsFromScheduler as TrackedToolCall[],
-        );
+        await handleCompletedTools(completedToolCallsFromScheduler as TrackedToolCall[]);
       }
     },
     config,
@@ -180,15 +168,13 @@ export const useGeminiStream = (
   );
 
   const pendingToolCallGroupDisplay = useMemo(
-    () =>
-      toolCalls.length ? mapTrackedToolCallsToDisplay(toolCalls) : undefined,
+    () => (toolCalls.length ? mapTrackedToolCallsToDisplay(toolCalls) : undefined),
     [toolCalls],
   );
 
   const activeToolPtyId = useMemo(() => {
     const executingShellTool = toolCalls?.find(
-      (tc) =>
-        tc.status === 'executing' && tc.request.name === 'run_shell_command',
+      (tc) => tc.status === "executing" && tc.request.name === "run_shell_command",
     );
     if (executingShellTool) {
       return (executingShellTool as { pid?: number }).pid;
@@ -199,11 +185,8 @@ export const useGeminiStream = (
   const lastQueryRef = useRef<PartListUnion | null>(null);
   const lastPromptIdRef = useRef<string | null>(null);
   const loopDetectedRef = useRef(false);
-  const [
-    loopDetectionConfirmationRequest,
-    setLoopDetectionConfirmationRequest,
-  ] = useState<{
-    onComplete: (result: { userSelection: 'disable' | 'keep' }) => void;
+  const [loopDetectionConfirmationRequest, setLoopDetectionConfirmationRequest] = useState<{
+    onComplete: (result: { userSelection: "disable" | "keep" }) => void;
   } | null>(null);
 
   const onExec = useCallback(async (done: Promise<void>) => {
@@ -211,18 +194,17 @@ export const useGeminiStream = (
     await done;
     setIsResponding(false);
   }, []);
-  const { handleShellCommand, activeShellPtyId, lastShellOutputTime } =
-    useShellCommandProcessor(
-      addItem,
-      setPendingHistoryItem,
-      onExec,
-      onDebugMessage,
-      config,
-      geminiClient,
-      setShellInputFocused,
-      terminalWidth,
-      terminalHeight,
-    );
+  const { handleShellCommand, activeShellPtyId, lastShellOutputTime } = useShellCommandProcessor(
+    addItem,
+    setPendingHistoryItem,
+    onExec,
+    onDebugMessage,
+    config,
+    geminiClient,
+    setShellInputFocused,
+    terminalWidth,
+    terminalHeight,
+  );
 
   const activePtyId = activeShellPtyId || activeToolPtyId;
 
@@ -239,31 +221,25 @@ export const useGeminiStream = (
       prevActiveShellPtyIdRef.current !== null &&
       activeShellPtyId === null
     ) {
-      addItem(
-        { type: MessageType.INFO, text: 'Request cancelled.' },
-        Date.now(),
-      );
+      addItem({ type: MessageType.INFO, text: "Request cancelled." }, Date.now());
       setIsResponding(false);
     }
     prevActiveShellPtyIdRef.current = activeShellPtyId;
   }, [activeShellPtyId, addItem]);
 
   const streamingState = useMemo(() => {
-    if (toolCalls.some((tc) => tc.status === 'awaiting_approval')) {
+    if (toolCalls.some((tc) => tc.status === "awaiting_approval")) {
       return StreamingState.WaitingForConfirmation;
     }
     if (
       isResponding ||
       toolCalls.some(
         (tc) =>
-          tc.status === 'executing' ||
-          tc.status === 'scheduled' ||
-          tc.status === 'validating' ||
-          ((tc.status === 'success' ||
-            tc.status === 'error' ||
-            tc.status === 'cancelled') &&
-            !(tc as TrackedCompletedToolCall | TrackedCancelledToolCall)
-              .responseSubmittedToGemini),
+          tc.status === "executing" ||
+          tc.status === "scheduled" ||
+          tc.status === "validating" ||
+          ((tc.status === "success" || tc.status === "error" || tc.status === "cancelled") &&
+            !(tc as TrackedCompletedToolCall | TrackedCancelledToolCall).responseSubmittedToGemini),
       )
     ) {
       return StreamingState.Responding;
@@ -272,16 +248,12 @@ export const useGeminiStream = (
   }, [isResponding, toolCalls]);
 
   useEffect(() => {
-    if (
-      config.getApprovalMode() === ApprovalMode.YOLO &&
-      streamingState === StreamingState.Idle
-    ) {
+    if (config.getApprovalMode() === ApprovalMode.YOLO && streamingState === StreamingState.Idle) {
       const lastUserMessageIndex = history.findLastIndex(
         (item: HistoryItem) => item.type === MessageType.USER,
       );
 
-      const turnCount =
-        lastUserMessageIndex === -1 ? 0 : history.length - lastUserMessageIndex;
+      const turnCount = lastUserMessageIndex === -1 ? 0 : history.length - lastUserMessageIndex;
 
       if (turnCount > 0) {
         logConversationFinishedEvent(
@@ -307,7 +279,7 @@ export const useGeminiStream = (
     // A full cancellation means no tools have produced a final result yet.
     // This determines if we show a generic "Request cancelled" message.
     const isFullCancellation = !toolCalls.some(
-      (tc) => tc.status === 'success' || tc.status === 'error',
+      (tc) => tc.status === "success" || tc.status === "error",
     );
 
     // Ensure we have an abort controller, creating one if it doesn't exist.
@@ -323,10 +295,8 @@ export const useGeminiStream = (
 
     if (pendingHistoryItemRef.current) {
       const isShellCommand =
-        pendingHistoryItemRef.current.type === 'tool_group' &&
-        pendingHistoryItemRef.current.tools.some(
-          (t) => t.name === SHELL_COMMAND_NAME,
-        );
+        pendingHistoryItemRef.current.type === "tool_group" &&
+        pendingHistoryItemRef.current.tools.some((t) => t.name === SHELL_COMMAND_NAME);
 
       // If it is a shell command, we update the status to Canceled and clear the output
       // to avoid artifacts, then add it to history immediately.
@@ -342,10 +312,7 @@ export const useGeminiStream = (
           }
           return tool;
         });
-        addItem(
-          { ...toolGroup, tools: updatedTools } as HistoryItemWithoutId,
-          Date.now(),
-        );
+        addItem({ ...toolGroup, tools: updatedTools } as HistoryItemWithoutId, Date.now());
       } else {
         addItem(pendingHistoryItemRef.current, Date.now());
       }
@@ -362,7 +329,7 @@ export const useGeminiStream = (
         addItem(
           {
             type: MessageType.INFO,
-            text: 'Request cancelled.',
+            text: "Request cancelled.",
           },
           Date.now(),
         );
@@ -386,7 +353,7 @@ export const useGeminiStream = (
 
   useKeypress(
     (key) => {
-      if (key.name === 'escape' && !isShellFocused) {
+      if (key.name === "escape" && !isShellFocused) {
         cancelOngoingRequest();
       }
     },
@@ -410,13 +377,13 @@ export const useGeminiStream = (
       if (turnCancelledRef.current) {
         return { queryToSend: null, shouldProceed: false };
       }
-      if (typeof query === 'string' && query.trim().length === 0) {
+      if (typeof query === "string" && query.trim().length === 0) {
         return { queryToSend: null, shouldProceed: false };
       }
 
       let localQueryToSendToGemini: PartListUnion | null = null;
 
-      if (typeof query === 'string') {
+      if (typeof query === "string") {
         const trimmedQuery = query.trim();
         onDebugMessage(`User query: '${trimmedQuery}'`);
         await logger?.logMessage(MessageSenderType.USER, trimmedQuery);
@@ -429,7 +396,7 @@ export const useGeminiStream = (
 
           if (slashCommandResult) {
             switch (slashCommandResult.type) {
-              case 'schedule_tool': {
+              case "schedule_tool": {
                 const { toolName, toolArgs } = slashCommandResult;
                 const toolCallRequest: ToolCallRequestInfo = {
                   callId: `${toolName}-${Date.now()}-${Math.random().toString(16).slice(2)}`,
@@ -441,7 +408,7 @@ export const useGeminiStream = (
                 scheduleToolCalls([toolCallRequest], abortSignal);
                 return { queryToSend: null, shouldProceed: false };
               }
-              case 'submit_prompt': {
+              case "submit_prompt": {
                 localQueryToSendToGemini = slashCommandResult.content;
 
                 return {
@@ -449,14 +416,12 @@ export const useGeminiStream = (
                   shouldProceed: true,
                 };
               }
-              case 'handled': {
+              case "handled": {
                 return { queryToSend: null, shouldProceed: false };
               }
               default: {
                 const unreachable: never = slashCommandResult;
-                throw new Error(
-                  `Unhandled slash command result type: ${unreachable}`,
-                );
+                throw new Error(`Unhandled slash command result type: ${unreachable}`);
               }
             }
           }
@@ -478,10 +443,7 @@ export const useGeminiStream = (
           });
 
           // Add user's turn after @ command processing is done.
-          addItem(
-            { type: MessageType.USER, text: trimmedQuery },
-            userMessageTimestamp,
-          );
+          addItem({ type: MessageType.USER, text: trimmedQuery }, userMessageTimestamp);
 
           if (!atCommandResult.shouldProceed) {
             return { queryToSend: null, shouldProceed: false };
@@ -489,10 +451,7 @@ export const useGeminiStream = (
           localQueryToSendToGemini = atCommandResult.processedQuery;
         } else {
           // Normal query for Gemini
-          addItem(
-            { type: MessageType.USER, text: trimmedQuery },
-            userMessageTimestamp,
-          );
+          addItem({ type: MessageType.USER, text: trimmedQuery }, userMessageTimestamp);
           localQueryToSendToGemini = trimmedQuery;
         }
       } else {
@@ -501,9 +460,7 @@ export const useGeminiStream = (
       }
 
       if (localQueryToSendToGemini === null) {
-        onDebugMessage(
-          'Query processing resulted in null, not sending to Gemini.',
-        );
+        onDebugMessage("Query processing resulted in null, not sending to Gemini.");
         return { queryToSend: null, shouldProceed: false };
       }
       return { queryToSend: localQueryToSendToGemini, shouldProceed: true };
@@ -524,23 +481,23 @@ export const useGeminiStream = (
 
   const handleContentEvent = useCallback(
     (
-      eventValue: ContentEvent['value'],
+      eventValue: ContentEvent["value"],
       currentGeminiMessageBuffer: string,
       userMessageTimestamp: number,
     ): string => {
       if (turnCancelledRef.current) {
         // Prevents additional output after a user initiated cancel.
-        return '';
+        return "";
       }
       let newGeminiMessageBuffer = currentGeminiMessageBuffer + eventValue;
       if (
-        pendingHistoryItemRef.current?.type !== 'gemini' &&
-        pendingHistoryItemRef.current?.type !== 'gemini_content'
+        pendingHistoryItemRef.current?.type !== "gemini" &&
+        pendingHistoryItemRef.current?.type !== "gemini_content"
       ) {
         if (pendingHistoryItemRef.current) {
           addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         }
-        setPendingHistoryItem({ type: 'gemini', text: '' });
+        setPendingHistoryItem({ type: "gemini", text: "" });
         newGeminiMessageBuffer = eventValue;
       }
       // Split large messages for better rendering performance. Ideally,
@@ -549,7 +506,7 @@ export const useGeminiStream = (
       if (splitPoint === newGeminiMessageBuffer.length) {
         // Update the existing message with accumulated content
         setPendingHistoryItem((item) => ({
-          type: item?.type as 'gemini' | 'gemini_content',
+          type: item?.type as "gemini" | "gemini_content",
           text: newGeminiMessageBuffer,
         }));
       } else {
@@ -565,14 +522,12 @@ export const useGeminiStream = (
         const afterText = newGeminiMessageBuffer.substring(splitPoint);
         addItem(
           {
-            type: pendingHistoryItemRef.current?.type as
-              | 'gemini'
-              | 'gemini_content',
+            type: pendingHistoryItemRef.current?.type as "gemini" | "gemini_content",
             text: beforeText,
           },
           userMessageTimestamp,
         );
-        setPendingHistoryItem({ type: 'gemini_content', text: afterText });
+        setPendingHistoryItem({ type: "gemini_content", text: afterText });
         newGeminiMessageBuffer = afterText;
       }
       return newGeminiMessageBuffer;
@@ -586,14 +541,13 @@ export const useGeminiStream = (
         return;
       }
       if (pendingHistoryItemRef.current) {
-        if (pendingHistoryItemRef.current.type === 'tool_group') {
-          const updatedTools = pendingHistoryItemRef.current.tools.map(
-            (tool) =>
-              tool.status === ToolCallStatus.Pending ||
-              tool.status === ToolCallStatus.Confirming ||
-              tool.status === ToolCallStatus.Executing
-                ? { ...tool, status: ToolCallStatus.Canceled }
-                : tool,
+        if (pendingHistoryItemRef.current.type === "tool_group") {
+          const updatedTools = pendingHistoryItemRef.current.tools.map((tool) =>
+            tool.status === ToolCallStatus.Pending ||
+            tool.status === ToolCallStatus.Confirming ||
+            tool.status === ToolCallStatus.Executing
+              ? { ...tool, status: ToolCallStatus.Canceled }
+              : tool,
           );
           const pendingItem: HistoryItemToolGroup = {
             ...pendingHistoryItemRef.current,
@@ -606,7 +560,7 @@ export const useGeminiStream = (
         setPendingHistoryItem(null);
       }
       addItem(
-        { type: MessageType.INFO, text: 'User cancelled the request.' },
+        { type: MessageType.INFO, text: "User cancelled the request." },
         userMessageTimestamp,
       );
       setIsResponding(false);
@@ -664,34 +618,28 @@ export const useGeminiStream = (
       const finishReasonMessages: Record<FinishReason, string | undefined> = {
         [FinishReason.FINISH_REASON_UNSPECIFIED]: undefined,
         [FinishReason.STOP]: undefined,
-        [FinishReason.MAX_TOKENS]: 'Response truncated due to token limits.',
-        [FinishReason.SAFETY]: 'Response stopped due to safety reasons.',
-        [FinishReason.RECITATION]: 'Response stopped due to recitation policy.',
-        [FinishReason.LANGUAGE]:
-          'Response stopped due to unsupported language.',
-        [FinishReason.BLOCKLIST]: 'Response stopped due to forbidden terms.',
-        [FinishReason.PROHIBITED_CONTENT]:
-          'Response stopped due to prohibited content.',
+        [FinishReason.MAX_TOKENS]: "Response truncated due to token limits.",
+        [FinishReason.SAFETY]: "Response stopped due to safety reasons.",
+        [FinishReason.RECITATION]: "Response stopped due to recitation policy.",
+        [FinishReason.LANGUAGE]: "Response stopped due to unsupported language.",
+        [FinishReason.BLOCKLIST]: "Response stopped due to forbidden terms.",
+        [FinishReason.PROHIBITED_CONTENT]: "Response stopped due to prohibited content.",
         [FinishReason.SPII]:
-          'Response stopped due to sensitive personally identifiable information.',
-        [FinishReason.OTHER]: 'Response stopped for other reasons.',
-        [FinishReason.MALFORMED_FUNCTION_CALL]:
-          'Response stopped due to malformed function call.',
-        [FinishReason.IMAGE_SAFETY]:
-          'Response stopped due to image safety violations.',
-        [FinishReason.UNEXPECTED_TOOL_CALL]:
-          'Response stopped due to unexpected tool call.',
+          "Response stopped due to sensitive personally identifiable information.",
+        [FinishReason.OTHER]: "Response stopped for other reasons.",
+        [FinishReason.MALFORMED_FUNCTION_CALL]: "Response stopped due to malformed function call.",
+        [FinishReason.IMAGE_SAFETY]: "Response stopped due to image safety violations.",
+        [FinishReason.UNEXPECTED_TOOL_CALL]: "Response stopped due to unexpected tool call.",
         [FinishReason.IMAGE_PROHIBITED_CONTENT]:
-          'Response stopped due to prohibited image content.',
-        [FinishReason.NO_IMAGE]:
-          'Response stopped because no image was generated.',
+          "Response stopped due to prohibited image content.",
+        [FinishReason.NO_IMAGE]: "Response stopped because no image was generated.",
       };
 
       const message = finishReasonMessages[finishReason];
       if (message) {
         addItem(
           {
-            type: 'info',
+            type: "info",
             text: `⚠️  ${message}`,
           },
           userMessageTimestamp,
@@ -702,22 +650,19 @@ export const useGeminiStream = (
   );
 
   const handleChatCompressionEvent = useCallback(
-    (
-      eventValue: ServerGeminiChatCompressedEvent['value'],
-      userMessageTimestamp: number,
-    ) => {
+    (eventValue: ServerGeminiChatCompressedEvent["value"], userMessageTimestamp: number) => {
       if (pendingHistoryItemRef.current) {
         addItem(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       return addItem(
         {
-          type: 'info',
+          type: "info",
           text:
             `IMPORTANT: This conversation exceeded the compress threshold. ` +
             `A compressed context will be sent for future messages (compressed from: ` +
-            `${eventValue?.originalTokenCount ?? 'unknown'} to ` +
-            `${eventValue?.newTokenCount ?? 'unknown'} tokens).`,
+            `${eventValue?.originalTokenCount ?? "unknown"} to ` +
+            `${eventValue?.newTokenCount ?? "unknown"} tokens).`,
         },
         Date.now(),
       );
@@ -729,7 +674,7 @@ export const useGeminiStream = (
     () =>
       addItem(
         {
-          type: 'info',
+          type: "info",
           text:
             `The session has reached the maximum number of turns: ${config.getMaxSessionTurns()}. ` +
             `Please update this limit in your setting.json file.`,
@@ -745,19 +690,18 @@ export const useGeminiStream = (
 
       const limit = tokenLimit(config.getModel());
 
-      const isLessThan75Percent =
-        limit > 0 && remainingTokenCount < limit * 0.75;
+      const isLessThan75Percent = limit > 0 && remainingTokenCount < limit * 0.75;
 
       let text = `Sending this message (${estimatedRequestTokenCount} tokens) might exceed the remaining context window limit (${remainingTokenCount} tokens).`;
 
       if (isLessThan75Percent) {
         text +=
-          ' Please try reducing the size of your message or use the `/compress` command to compress the chat history.';
+          " Please try reducing the size of your message or use the `/compress` command to compress the chat history.";
       }
 
       addItem(
         {
-          type: 'info',
+          type: "info",
           text,
         },
         Date.now(),
@@ -777,7 +721,7 @@ export const useGeminiStream = (
       }
       addItem(
         {
-          type: 'model',
+          type: "model",
           model: eventValue,
         } as HistoryItemModel,
         userMessageTimestamp,
@@ -792,7 +736,7 @@ export const useGeminiStream = (
       userMessageTimestamp: number,
       signal: AbortSignal,
     ): Promise<StreamProcessingStatus> => {
-      let geminiMessageBuffer = '';
+      let geminiMessageBuffer = "";
       const toolCallRequests: ToolCallRequestInfo[] = [];
       for await (const event of stream) {
         switch (event.type) {
@@ -832,10 +776,7 @@ export const useGeminiStream = (
             );
             break;
           case ServerGeminiEventType.Finished:
-            handleFinishedEvent(
-              event as ServerGeminiFinishedEvent,
-              userMessageTimestamp,
-            );
+            handleFinishedEvent(event as ServerGeminiFinishedEvent, userMessageTimestamp);
             break;
           case ServerGeminiEventType.Citation:
             handleCitationEvent(event.value, userMessageTimestamp);
@@ -878,165 +819,149 @@ export const useGeminiStream = (
     ],
   );
   const submitQuery = useCallback(
-    async (
-      query: PartListUnion,
-      options?: { isContinuation: boolean },
-      prompt_id?: string,
-    ) =>
-      runInDevTraceSpan(
-        { name: 'submitQuery' },
-        async ({ metadata: spanMetadata }) => {
-          spanMetadata.input = query;
-          const queryId = `${Date.now()}-${Math.random()}`;
-          activeQueryIdRef.current = queryId;
-          if (
-            (streamingState === StreamingState.Responding ||
-              streamingState === StreamingState.WaitingForConfirmation) &&
-            !options?.isContinuation
-          )
-            return;
+    async (query: PartListUnion, options?: { isContinuation: boolean }, prompt_id?: string) =>
+      runInDevTraceSpan({ name: "submitQuery" }, async ({ metadata: spanMetadata }) => {
+        spanMetadata.input = query;
+        const queryId = `${Date.now()}-${Math.random()}`;
+        activeQueryIdRef.current = queryId;
+        if (
+          (streamingState === StreamingState.Responding ||
+            streamingState === StreamingState.WaitingForConfirmation) &&
+          !options?.isContinuation
+        )
+          return;
 
-          const userMessageTimestamp = Date.now();
+        const userMessageTimestamp = Date.now();
+
+        // Reset quota error flag when starting a new query (not a continuation)
+        if (!options?.isContinuation) {
+          setModelSwitchedFromQuotaError(false);
+          config.setQuotaErrorOccurred(false);
+        }
+
+        abortControllerRef.current = new AbortController();
+        const abortSignal = abortControllerRef.current.signal;
+        turnCancelledRef.current = false;
+
+        if (!prompt_id) {
+          prompt_id = config.getSessionId() + "########" + getPromptCount();
+        }
+        return promptIdContext.run(prompt_id, async () => {
+          const { queryToSend, shouldProceed } = await prepareQueryForGemini(
+            query,
+            userMessageTimestamp,
+            abortSignal,
+            prompt_id!,
+          );
+
+          if (!shouldProceed || queryToSend === null) {
+            return;
+          }
 
-          // Reset quota error flag when starting a new query (not a continuation)
           if (!options?.isContinuation) {
-            setModelSwitchedFromQuotaError(false);
-            config.setQuotaErrorOccurred(false);
+            if (typeof queryToSend === "string") {
+              // logging the text prompts only for now
+              const promptText = queryToSend;
+              logUserPrompt(
+                config,
+                new UserPromptEvent(
+                  promptText.length,
+                  prompt_id!,
+                  config.getContentGeneratorConfig()?.authType,
+                  promptText,
+                ),
+              );
+            }
+            startNewPrompt();
+            setThought(null); // Reset thought when starting a new prompt
           }
 
-          abortControllerRef.current = new AbortController();
-          const abortSignal = abortControllerRef.current.signal;
-          turnCancelledRef.current = false;
+          setIsResponding(true);
+          setInitError(null);
 
-          if (!prompt_id) {
-            prompt_id = config.getSessionId() + '########' + getPromptCount();
-          }
-          return promptIdContext.run(prompt_id, async () => {
-            const { queryToSend, shouldProceed } = await prepareQueryForGemini(
-              query,
+          // Store query and prompt_id for potential retry on loop detection
+          lastQueryRef.current = queryToSend;
+          lastPromptIdRef.current = prompt_id!;
+
+          try {
+            const stream = geminiClient.sendMessageStream(queryToSend, abortSignal, prompt_id!);
+            const processingStatus = await processGeminiStreamEvents(
+              stream,
               userMessageTimestamp,
               abortSignal,
-              prompt_id!,
             );
 
-            if (!shouldProceed || queryToSend === null) {
+            if (processingStatus === StreamProcessingStatus.UserCancelled) {
               return;
             }
 
-            if (!options?.isContinuation) {
-              if (typeof queryToSend === 'string') {
-                // logging the text prompts only for now
-                const promptText = queryToSend;
-                logUserPrompt(
-                  config,
-                  new UserPromptEvent(
-                    promptText.length,
-                    prompt_id!,
+            if (pendingHistoryItemRef.current) {
+              addItem(pendingHistoryItemRef.current, userMessageTimestamp);
+              setPendingHistoryItem(null);
+            }
+            if (loopDetectedRef.current) {
+              loopDetectedRef.current = false;
+              // Show the confirmation dialog to choose whether to disable loop detection
+              setLoopDetectionConfirmationRequest({
+                onComplete: (result: { userSelection: "disable" | "keep" }) => {
+                  setLoopDetectionConfirmationRequest(null);
+
+                  if (result.userSelection === "disable") {
+                    config.getGeminiClient().getLoopDetectionService().disableForSession();
+                    addItem(
+                      {
+                        type: "info",
+                        text: `Loop detection has been disabled for this session. Retrying request...`,
+                      },
+                      Date.now(),
+                    );
+
+                    if (lastQueryRef.current && lastPromptIdRef.current) {
+                      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                      submitQuery(
+                        lastQueryRef.current,
+                        { isContinuation: true },
+                        lastPromptIdRef.current,
+                      );
+                    }
+                  } else {
+                    addItem(
+                      {
+                        type: "info",
+                        text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
+                      },
+                      Date.now(),
+                    );
+                  }
+                },
+              });
+            }
+          } catch (error: unknown) {
+            spanMetadata.error = error;
+            if (error instanceof UnauthorizedError) {
+              onAuthError("Session expired or is unauthorized.");
+            } else if (!isNodeError(error) || error.name !== "AbortError") {
+              addItem(
+                {
+                  type: MessageType.ERROR,
+                  text: parseAndFormatApiError(
+                    getErrorMessage(error) || "Unknown error",
                     config.getContentGeneratorConfig()?.authType,
-                    promptText,
+                    undefined,
+                    config.getModel(),
+                    DEFAULT_GEMINI_FLASH_MODEL,
                   ),
-                );
-              }
-              startNewPrompt();
-              setThought(null); // Reset thought when starting a new prompt
-            }
-
-            setIsResponding(true);
-            setInitError(null);
-
-            // Store query and prompt_id for potential retry on loop detection
-            lastQueryRef.current = queryToSend;
-            lastPromptIdRef.current = prompt_id!;
-
-            try {
-              const stream = geminiClient.sendMessageStream(
-                queryToSend,
-                abortSignal,
-                prompt_id!,
-              );
-              const processingStatus = await processGeminiStreamEvents(
-                stream,
+                },
                 userMessageTimestamp,
-                abortSignal,
               );
-
-              if (processingStatus === StreamProcessingStatus.UserCancelled) {
-                return;
-              }
-
-              if (pendingHistoryItemRef.current) {
-                addItem(pendingHistoryItemRef.current, userMessageTimestamp);
-                setPendingHistoryItem(null);
-              }
-              if (loopDetectedRef.current) {
-                loopDetectedRef.current = false;
-                // Show the confirmation dialog to choose whether to disable loop detection
-                setLoopDetectionConfirmationRequest({
-                  onComplete: (result: {
-                    userSelection: 'disable' | 'keep';
-                  }) => {
-                    setLoopDetectionConfirmationRequest(null);
-
-                    if (result.userSelection === 'disable') {
-                      config
-                        .getGeminiClient()
-                        .getLoopDetectionService()
-                        .disableForSession();
-                      addItem(
-                        {
-                          type: 'info',
-                          text: `Loop detection has been disabled for this session. Retrying request...`,
-                        },
-                        Date.now(),
-                      );
-
-                      if (lastQueryRef.current && lastPromptIdRef.current) {
-                        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-                        submitQuery(
-                          lastQueryRef.current,
-                          { isContinuation: true },
-                          lastPromptIdRef.current,
-                        );
-                      }
-                    } else {
-                      addItem(
-                        {
-                          type: 'info',
-                          text: `A potential loop was detected. This can happen due to repetitive tool calls or other model behavior. The request has been halted.`,
-                        },
-                        Date.now(),
-                      );
-                    }
-                  },
-                });
-              }
-            } catch (error: unknown) {
-              spanMetadata.error = error;
-              if (error instanceof UnauthorizedError) {
-                onAuthError('Session expired or is unauthorized.');
-              } else if (!isNodeError(error) || error.name !== 'AbortError') {
-                addItem(
-                  {
-                    type: MessageType.ERROR,
-                    text: parseAndFormatApiError(
-                      getErrorMessage(error) || 'Unknown error',
-                      config.getContentGeneratorConfig()?.authType,
-                      undefined,
-                      config.getModel(),
-                      DEFAULT_GEMINI_FLASH_MODEL,
-                    ),
-                  },
-                  userMessageTimestamp,
-                );
-              }
-            } finally {
-              if (activeQueryIdRef.current === queryId) {
-                setIsResponding(false);
-              }
             }
-          });
-        },
-      ),
+          } finally {
+            if (activeQueryIdRef.current === queryId) {
+              setIsResponding(false);
+            }
+          }
+        });
+      }),
     [
       streamingState,
       setModelSwitchedFromQuotaError,
@@ -1057,13 +982,9 @@ export const useGeminiStream = (
   const handleApprovalModeChange = useCallback(
     async (newApprovalMode: ApprovalMode) => {
       // Auto-approve pending tool calls when switching to auto-approval modes
-      if (
-        newApprovalMode === ApprovalMode.YOLO ||
-        newApprovalMode === ApprovalMode.AUTO_EDIT
-      ) {
+      if (newApprovalMode === ApprovalMode.YOLO || newApprovalMode === ApprovalMode.AUTO_EDIT) {
         let awaitingApprovalCalls = toolCalls.filter(
-          (call): call is TrackedWaitingToolCall =>
-            call.status === 'awaiting_approval',
+          (call): call is TrackedWaitingToolCall => call.status === "awaiting_approval",
         );
 
         // For AUTO_EDIT mode, only approve edit tools (replace, write_file)
@@ -1077,14 +998,9 @@ export const useGeminiStream = (
         for (const call of awaitingApprovalCalls) {
           if (call.confirmationDetails?.onConfirm) {
             try {
-              await call.confirmationDetails.onConfirm(
-                ToolConfirmationOutcome.ProceedOnce,
-              );
+              await call.confirmationDetails.onConfirm(ToolConfirmationOutcome.ProceedOnce);
             } catch (error) {
-              debugLogger.warn(
-                `Failed to auto-approve tool call ${call.request.callId}:`,
-                error,
-              );
+              debugLogger.warn(`Failed to auto-approve tool call ${call.request.callId}:`, error);
             }
           }
         }
@@ -1095,32 +1011,23 @@ export const useGeminiStream = (
 
   const handleCompletedTools = useCallback(
     async (completedToolCallsFromScheduler: TrackedToolCall[]) => {
-      const completedAndReadyToSubmitTools =
-        completedToolCallsFromScheduler.filter(
-          (
-            tc: TrackedToolCall,
-          ): tc is TrackedCompletedToolCall | TrackedCancelledToolCall => {
-            const isTerminalState =
-              tc.status === 'success' ||
-              tc.status === 'error' ||
-              tc.status === 'cancelled';
-
-            if (isTerminalState) {
-              const completedOrCancelledCall = tc as
-                | TrackedCompletedToolCall
-                | TrackedCancelledToolCall;
-              return (
-                completedOrCancelledCall.response?.responseParts !== undefined
-              );
-            }
-            return false;
-          },
-        );
+      const completedAndReadyToSubmitTools = completedToolCallsFromScheduler.filter(
+        (tc: TrackedToolCall): tc is TrackedCompletedToolCall | TrackedCancelledToolCall => {
+          const isTerminalState =
+            tc.status === "success" || tc.status === "error" || tc.status === "cancelled";
+
+          if (isTerminalState) {
+            const completedOrCancelledCall = tc as
+              | TrackedCompletedToolCall
+              | TrackedCancelledToolCall;
+            return completedOrCancelledCall.response?.responseParts !== undefined;
+          }
+          return false;
+        },
+      );
 
       // Finalize any client-initiated tools as soon as they are done.
-      const clientTools = completedAndReadyToSubmitTools.filter(
-        (t) => t.request.isClientInitiated,
-      );
+      const clientTools = completedAndReadyToSubmitTools.filter((t) => t.request.isClientInitiated);
       if (clientTools.length > 0) {
         markToolsAsSubmitted(clientTools.map((t) => t.request.callId));
       }
@@ -1128,8 +1035,8 @@ export const useGeminiStream = (
       // Identify new, successful save_memory calls that we haven't processed yet.
       const newSuccessfulMemorySaves = completedAndReadyToSubmitTools.filter(
         (t) =>
-          t.request.name === 'save_memory' &&
-          t.status === 'success' &&
+          t.request.name === "save_memory" &&
+          t.status === "success" &&
           !processedMemoryToolsRef.current.has(t.request.callId),
       );
 
@@ -1151,9 +1058,7 @@ export const useGeminiStream = (
       }
 
       // If all the tools were cancelled, don't submit a response to Gemini.
-      const allToolsCancelled = geminiTools.every(
-        (tc) => tc.status === 'cancelled',
-      );
+      const allToolsCancelled = geminiTools.every((tc) => tc.status === "cancelled");
 
       if (allToolsCancelled) {
         // If the turn was cancelled via the imperative escape key flow,
@@ -1162,7 +1067,7 @@ export const useGeminiStream = (
           addItem(
             {
               type: MessageType.INFO,
-              text: 'Request cancelled.',
+              text: "Request cancelled.",
             },
             Date.now(),
           );
@@ -1172,19 +1077,15 @@ export const useGeminiStream = (
         if (geminiClient) {
           // We need to manually add the function responses to the history
           // so the model knows the tools were cancelled.
-          const combinedParts = geminiTools.flatMap(
-            (toolCall) => toolCall.response.responseParts,
-          );
+          const combinedParts = geminiTools.flatMap((toolCall) => toolCall.response.responseParts);
           // eslint-disable-next-line @typescript-eslint/no-floating-promises
           geminiClient.addHistory({
-            role: 'user',
+            role: "user",
             parts: combinedParts,
           });
         }
 
-        const callIdsToMarkAsSubmitted = geminiTools.map(
-          (toolCall) => toolCall.request.callId,
-        );
+        const callIdsToMarkAsSubmitted = geminiTools.map((toolCall) => toolCall.request.callId);
         markToolsAsSubmitted(callIdsToMarkAsSubmitted);
         return;
       }
@@ -1192,13 +1093,9 @@ export const useGeminiStream = (
       const responsesToSend: Part[] = geminiTools.flatMap(
         (toolCall) => toolCall.response.responseParts,
       );
-      const callIdsToMarkAsSubmitted = geminiTools.map(
-        (toolCall) => toolCall.request.callId,
-      );
+      const callIdsToMarkAsSubmitted = geminiTools.map((toolCall) => toolCall.request.callId);
 
-      const prompt_ids = geminiTools.map(
-        (toolCall) => toolCall.request.prompt_id,
-      );
+      const prompt_ids = geminiTools.map((toolCall) => toolCall.request.prompt_id);
 
       markToolsAsSubmitted(callIdsToMarkAsSubmitted);
 
@@ -1241,21 +1138,18 @@ export const useGeminiStream = (
       }
       const restorableToolCalls = toolCalls.filter(
         (toolCall) =>
-          EDIT_TOOL_NAMES.has(toolCall.request.name) &&
-          toolCall.status === 'awaiting_approval',
+          EDIT_TOOL_NAMES.has(toolCall.request.name) && toolCall.status === "awaiting_approval",
       );
 
       if (restorableToolCalls.length > 0) {
         if (!gitService) {
           onDebugMessage(
-            'Checkpointing is enabled but Git service is not available. Failed to create snapshot. Ensure Git is installed and working properly.',
+            "Checkpointing is enabled but Git service is not available. Failed to create snapshot. Ensure Git is installed and working properly.",
           );
           return;
         }
 
-        const { checkpointsToWrite, errors } = await processRestorableToolCalls<
-          HistoryItem[]
-        >(
+        const { checkpointsToWrite, errors } = await processRestorableToolCalls<HistoryItem[]>(
           restorableToolCalls.map((call) => call.request),
           gitService,
           geminiClient,
@@ -1275,24 +1169,14 @@ export const useGeminiStream = (
               await fs.writeFile(filePath, content);
             }
           } catch (error) {
-            onDebugMessage(
-              `Failed to write checkpoint file: ${getErrorMessage(error)}`,
-            );
+            onDebugMessage(`Failed to write checkpoint file: ${getErrorMessage(error)}`);
           }
         }
       }
     };
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     saveRestorableToolCalls();
-  }, [
-    toolCalls,
-    config,
-    onDebugMessage,
-    gitService,
-    history,
-    geminiClient,
-    storage,
-  ]);
+  }, [toolCalls, config, onDebugMessage, gitService, history, geminiClient, storage]);
 
   const lastOutputTime = Math.max(lastToolOutputTime, lastShellOutputTime);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useGitBranchName.test.tsx b/packages/ui-gemini/src/ui/hooks/useGitBranchName.test.tsx
index cd5d2a5b8..88e654586 100644
--- a/packages/ui-gemini/src/ui/hooks/useGitBranchName.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useGitBranchName.test.tsx
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { MockedFunction } from 'vitest';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useGitBranchName } from './useGitBranchName.js';
-import { fs, vol } from 'memfs';
-import * as fsPromises from 'node:fs/promises';
-import path from 'node:path'; // For mocking fs
-import { spawnAsync as mockSpawnAsync } from '@airiscode/gemini-cli-core';
+import * as fsPromises from "node:fs/promises";
+import path from "node:path"; // For mocking fs
+import { spawnAsync as mockSpawnAsync } from "@airiscode/gemini-cli-core";
+import { fs, vol } from "memfs";
+import { act } from "react";
+import type { MockedFunction } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import { useGitBranchName } from "./useGitBranchName.js";
 
 // Mock @airiscode/gemini-cli-core
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const original = await vi.importActual<
-    typeof import('@airiscode/gemini-cli-core')
-  >('@airiscode/gemini-cli-core');
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const original = await vi.importActual<typeof import("@airiscode/gemini-cli-core")>(
+    "@airiscode/gemini-cli-core",
+  );
   return {
     ...original,
     spawnAsync: vi.fn(),
@@ -27,27 +27,27 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
 });
 
 // Mock fs and fs/promises
-vi.mock('node:fs', async () => {
-  const memfs = await vi.importActual<typeof import('memfs')>('memfs');
+vi.mock("node:fs", async () => {
+  const memfs = await vi.importActual<typeof import("memfs")>("memfs");
   return {
     ...memfs.fs,
     default: memfs.fs,
   };
 });
 
-vi.mock('node:fs/promises', async () => {
-  const memfs = await vi.importActual<typeof import('memfs')>('memfs');
+vi.mock("node:fs/promises", async () => {
+  const memfs = await vi.importActual<typeof import("memfs")>("memfs");
   return { ...memfs.fs.promises, default: memfs.fs.promises };
 });
 
-const CWD = '/test/project';
-const GIT_LOGS_HEAD_PATH = path.join(CWD, '.git', 'logs', 'HEAD');
+const CWD = "/test/project";
+const GIT_LOGS_HEAD_PATH = path.join(CWD, ".git", "logs", "HEAD");
 
-describe('useGitBranchName', () => {
+describe("useGitBranchName", () => {
   beforeEach(() => {
     vol.reset(); // Reset in-memory filesystem
     vol.fromJSON({
-      [GIT_LOGS_HEAD_PATH]: 'ref: refs/heads/main',
+      [GIT_LOGS_HEAD_PATH]: "ref: refs/heads/main",
     });
   });
 
@@ -73,24 +73,22 @@ describe('useGitBranchName', () => {
     };
   };
 
-  it('should return branch name', async () => {
-    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValue(
-      {
-        stdout: 'main\n',
-      } as { stdout: string; stderr: string },
-    );
+  it("should return branch name", async () => {
+    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValue({
+      stdout: "main\n",
+    } as { stdout: string; stderr: string });
     const { result, rerender } = renderGitBranchNameHook(CWD);
 
     await act(async () => {
       rerender(); // Rerender to get the updated state
     });
 
-    expect(result.current).toBe('main');
+    expect(result.current).toBe("main");
   });
 
-  it('should return undefined if git command fails', async () => {
+  it("should return undefined if git command fails", async () => {
     (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockRejectedValue(
-      new Error('Git error'),
+      new Error("Git error"),
     );
 
     const { result, rerender } = renderGitBranchNameHook(CWD);
@@ -102,36 +100,36 @@ describe('useGitBranchName', () => {
     expect(result.current).toBeUndefined();
   });
 
-  it('should return short commit hash if branch is HEAD (detached state)', async () => {
-    (
-      mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>
-    ).mockImplementation(async (command: string, args: string[]) => {
-      if (args.includes('--abbrev-ref')) {
-        return { stdout: 'HEAD\n' } as { stdout: string; stderr: string };
-      } else if (args.includes('--short')) {
-        return { stdout: 'a1b2c3d\n' } as { stdout: string; stderr: string };
-      }
-      return { stdout: '' } as { stdout: string; stderr: string };
-    });
+  it("should return short commit hash if branch is HEAD (detached state)", async () => {
+    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockImplementation(
+      async (command: string, args: string[]) => {
+        if (args.includes("--abbrev-ref")) {
+          return { stdout: "HEAD\n" } as { stdout: string; stderr: string };
+        } else if (args.includes("--short")) {
+          return { stdout: "a1b2c3d\n" } as { stdout: string; stderr: string };
+        }
+        return { stdout: "" } as { stdout: string; stderr: string };
+      },
+    );
 
     const { result, rerender } = renderGitBranchNameHook(CWD);
     await act(async () => {
       rerender();
     });
-    expect(result.current).toBe('a1b2c3d');
+    expect(result.current).toBe("a1b2c3d");
   });
 
-  it('should return undefined if branch is HEAD and getting commit hash fails', async () => {
-    (
-      mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>
-    ).mockImplementation(async (command: string, args: string[]) => {
-      if (args.includes('--abbrev-ref')) {
-        return { stdout: 'HEAD\n' } as { stdout: string; stderr: string };
-      } else if (args.includes('--short')) {
-        throw new Error('Git error');
-      }
-      return { stdout: '' } as { stdout: string; stderr: string };
-    });
+  it("should return undefined if branch is HEAD and getting commit hash fails", async () => {
+    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockImplementation(
+      async (command: string, args: string[]) => {
+        if (args.includes("--abbrev-ref")) {
+          return { stdout: "HEAD\n" } as { stdout: string; stderr: string };
+        } else if (args.includes("--short")) {
+          throw new Error("Git error");
+        }
+        return { stdout: "" } as { stdout: string; stderr: string };
+      },
+    );
 
     const { result, rerender } = renderGitBranchNameHook(CWD);
     await act(async () => {
@@ -140,16 +138,16 @@ describe('useGitBranchName', () => {
     expect(result.current).toBeUndefined();
   });
 
-  it('should update branch name when .git/HEAD changes', async () => {
-    vi.spyOn(fsPromises, 'access').mockResolvedValue(undefined);
-    const watchSpy = vi.spyOn(fs, 'watch');
+  it("should update branch name when .git/HEAD changes", async () => {
+    vi.spyOn(fsPromises, "access").mockResolvedValue(undefined);
+    const watchSpy = vi.spyOn(fs, "watch");
 
     (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>)
-      .mockResolvedValueOnce({ stdout: 'main\n' } as {
+      .mockResolvedValueOnce({ stdout: "main\n" } as {
         stdout: string;
         stderr: string;
       })
-      .mockResolvedValue({ stdout: 'develop\n' } as {
+      .mockResolvedValue({ stdout: "develop\n" } as {
         stdout: string;
         stderr: string;
       });
@@ -159,7 +157,7 @@ describe('useGitBranchName', () => {
     await act(async () => {
       rerender();
     });
-    expect(result.current).toBe('main');
+    expect(result.current).toBe("main");
 
     // Wait for watcher to be set up
     await waitFor(() => {
@@ -168,24 +166,22 @@ describe('useGitBranchName', () => {
 
     // Simulate file change event
     await act(async () => {
-      fs.writeFileSync(GIT_LOGS_HEAD_PATH, 'ref: refs/heads/develop'); // Trigger watcher
+      fs.writeFileSync(GIT_LOGS_HEAD_PATH, "ref: refs/heads/develop"); // Trigger watcher
       rerender();
     });
 
     await waitFor(() => {
-      expect(result.current).toBe('develop');
+      expect(result.current).toBe("develop");
     });
   });
 
-  it('should handle watcher setup error silently', async () => {
+  it("should handle watcher setup error silently", async () => {
     // Remove .git/logs/HEAD to cause an error in fs.watch setup
     vol.unlinkSync(GIT_LOGS_HEAD_PATH);
 
-    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValue(
-      {
-        stdout: 'main\n',
-      } as { stdout: string; stderr: string },
-    );
+    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValue({
+      stdout: "main\n",
+    } as { stdout: string; stderr: string });
 
     const { result, rerender } = renderGitBranchNameHook(CWD);
 
@@ -193,42 +189,38 @@ describe('useGitBranchName', () => {
       rerender();
     });
 
-    expect(result.current).toBe('main'); // Branch name should still be fetched initially
+    expect(result.current).toBe("main"); // Branch name should still be fetched initially
 
-    (
-      mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>
-    ).mockResolvedValueOnce({
-      stdout: 'develop\n',
+    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValueOnce({
+      stdout: "develop\n",
     } as { stdout: string; stderr: string });
 
     // This write would trigger the watcher if it was set up
     // but since it failed, the branch name should not update
     // We need to create the file again for writeFileSync to not throw
     vol.fromJSON({
-      [GIT_LOGS_HEAD_PATH]: 'ref: refs/heads/develop',
+      [GIT_LOGS_HEAD_PATH]: "ref: refs/heads/develop",
     });
 
     await act(async () => {
-      fs.writeFileSync(GIT_LOGS_HEAD_PATH, 'ref: refs/heads/develop');
+      fs.writeFileSync(GIT_LOGS_HEAD_PATH, "ref: refs/heads/develop");
       rerender();
     });
 
     // Branch name should not change because watcher setup failed
-    expect(result.current).toBe('main');
+    expect(result.current).toBe("main");
   });
 
-  it('should cleanup watcher on unmount', async () => {
-    vi.spyOn(fsPromises, 'access').mockResolvedValue(undefined);
+  it("should cleanup watcher on unmount", async () => {
+    vi.spyOn(fsPromises, "access").mockResolvedValue(undefined);
     const closeMock = vi.fn();
-    const watchMock = vi.spyOn(fs, 'watch').mockReturnValue({
+    const watchMock = vi.spyOn(fs, "watch").mockReturnValue({
       close: closeMock,
     } as unknown as ReturnType<typeof fs.watch>);
 
-    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValue(
-      {
-        stdout: 'main\n',
-      } as { stdout: string; stderr: string },
-    );
+    (mockSpawnAsync as MockedFunction<typeof mockSpawnAsync>).mockResolvedValue({
+      stdout: "main\n",
+    } as { stdout: string; stderr: string });
 
     const { unmount, rerender } = renderGitBranchNameHook(CWD);
 
@@ -238,10 +230,7 @@ describe('useGitBranchName', () => {
 
     // Wait for watcher to be set up BEFORE unmounting
     await waitFor(() => {
-      expect(watchMock).toHaveBeenCalledWith(
-        GIT_LOGS_HEAD_PATH,
-        expect.any(Function),
-      );
+      expect(watchMock).toHaveBeenCalledWith(GIT_LOGS_HEAD_PATH, expect.any(Function));
     });
 
     unmount();
diff --git a/packages/ui-gemini/src/ui/hooks/useGitBranchName.ts b/packages/ui-gemini/src/ui/hooks/useGitBranchName.ts
index 2e5a5744d..cda1a2923 100644
--- a/packages/ui-gemini/src/ui/hooks/useGitBranchName.ts
+++ b/packages/ui-gemini/src/ui/hooks/useGitBranchName.ts
@@ -4,31 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useCallback } from 'react';
-import { spawnAsync } from '@airiscode/gemini-cli-core';
-import fs from 'node:fs';
-import fsPromises from 'node:fs/promises';
-import path from 'node:path';
+import fs from "node:fs";
+import fsPromises from "node:fs/promises";
+import path from "node:path";
+import { spawnAsync } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useState } from "react";
 
 export function useGitBranchName(cwd: string): string | undefined {
   const [branchName, setBranchName] = useState<string | undefined>(undefined);
 
   const fetchBranchName = useCallback(async () => {
     try {
-      const { stdout } = await spawnAsync(
-        'git',
-        ['rev-parse', '--abbrev-ref', 'HEAD'],
-        { cwd },
-      );
+      const { stdout } = await spawnAsync("git", ["rev-parse", "--abbrev-ref", "HEAD"], { cwd });
       const branch = stdout.toString().trim();
-      if (branch && branch !== 'HEAD') {
+      if (branch && branch !== "HEAD") {
         setBranchName(branch);
       } else {
-        const { stdout: hashStdout } = await spawnAsync(
-          'git',
-          ['rev-parse', '--short', 'HEAD'],
-          { cwd },
-        );
+        const { stdout: hashStdout } = await spawnAsync("git", ["rev-parse", "--short", "HEAD"], {
+          cwd,
+        });
         setBranchName(hashStdout.toString().trim());
       }
     } catch (_error) {
@@ -40,7 +34,7 @@ export function useGitBranchName(cwd: string): string | undefined {
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     fetchBranchName(); // Initial fetch
 
-    const gitLogsHeadPath = path.join(cwd, '.git', 'logs', 'HEAD');
+    const gitLogsHeadPath = path.join(cwd, ".git", "logs", "HEAD");
     let watcher: fs.FSWatcher | undefined;
     let cancelled = false;
 
@@ -51,7 +45,7 @@ export function useGitBranchName(cwd: string): string | undefined {
         if (cancelled) return;
         watcher = fs.watch(gitLogsHeadPath, (eventType: string) => {
           // Changes to .git/logs/HEAD (appends) indicate HEAD has likely changed
-          if (eventType === 'change' || eventType === 'rename') {
+          if (eventType === "change" || eventType === "rename") {
             // Handle rename just in case
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             fetchBranchName();
diff --git a/packages/ui-gemini/src/ui/hooks/useHistoryManager.test.ts b/packages/ui-gemini/src/ui/hooks/useHistoryManager.test.ts
index cff7ef69b..446509ab2 100644
--- a/packages/ui-gemini/src/ui/hooks/useHistoryManager.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useHistoryManager.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { useHistory } from './useHistoryManager.js';
-import type { HistoryItem } from '../types.js';
-
-describe('useHistoryManager', () => {
-  it('should initialize with an empty history', () => {
+import { act } from "react";
+import { describe, expect, it } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import type { HistoryItem } from "../types.js";
+import { useHistory } from "./useHistoryManager.js";
+
+describe("useHistoryManager", () => {
+  it("should initialize with an empty history", () => {
     const { result } = renderHook(() => useHistory());
     expect(result.current.history).toEqual([]);
   });
 
-  it('should add an item to history with a unique ID', () => {
+  it("should add an item to history with a unique ID", () => {
     const { result } = renderHook(() => useHistory());
     const timestamp = Date.now();
-    const itemData: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'Hello',
+    const itemData: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "Hello",
     };
 
     act(() => {
@@ -39,16 +39,16 @@ describe('useHistoryManager', () => {
     expect(result.current.history[0].id).toBeGreaterThanOrEqual(timestamp);
   });
 
-  it('should generate unique IDs for items added with the same base timestamp', () => {
+  it("should generate unique IDs for items added with the same base timestamp", () => {
     const { result } = renderHook(() => useHistory());
     const timestamp = Date.now();
-    const itemData1: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'First',
+    const itemData1: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "First",
     };
-    const itemData2: Omit<HistoryItem, 'id'> = {
-      type: 'gemini', // Replaced HistoryItemType.Gemini
-      text: 'Second',
+    const itemData2: Omit<HistoryItem, "id"> = {
+      type: "gemini", // Replaced HistoryItemType.Gemini
+      text: "Second",
     };
 
     let id1!: number;
@@ -67,12 +67,12 @@ describe('useHistoryManager', () => {
     expect(id2).toBeGreaterThan(id1);
   });
 
-  it('should update an existing history item', () => {
+  it("should update an existing history item", () => {
     const { result } = renderHook(() => useHistory());
     const timestamp = Date.now();
-    const initialItem: Omit<HistoryItem, 'id'> = {
-      type: 'gemini', // Replaced HistoryItemType.Gemini
-      text: 'Initial content',
+    const initialItem: Omit<HistoryItem, "id"> = {
+      type: "gemini", // Replaced HistoryItemType.Gemini
+      text: "Initial content",
     };
     let itemId!: number;
 
@@ -80,7 +80,7 @@ describe('useHistoryManager', () => {
       itemId = result.current.addItem(initialItem, timestamp);
     });
 
-    const updatedText = 'Updated content';
+    const updatedText = "Updated content";
     act(() => {
       result.current.updateItem(itemId, { text: updatedText });
     });
@@ -93,12 +93,12 @@ describe('useHistoryManager', () => {
     });
   });
 
-  it('should not change history if updateHistoryItem is called with a nonexistent ID', () => {
+  it("should not change history if updateHistoryItem is called with a nonexistent ID", () => {
     const { result } = renderHook(() => useHistory());
     const timestamp = Date.now();
-    const itemData: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'Hello',
+    const itemData: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "Hello",
     };
 
     act(() => {
@@ -108,22 +108,22 @@ describe('useHistoryManager', () => {
     const originalHistory = [...result.current.history]; // Clone before update attempt
 
     act(() => {
-      result.current.updateItem(99999, { text: 'Should not apply' }); // Nonexistent ID
+      result.current.updateItem(99999, { text: "Should not apply" }); // Nonexistent ID
     });
 
     expect(result.current.history).toEqual(originalHistory);
   });
 
-  it('should clear the history', () => {
+  it("should clear the history", () => {
     const { result } = renderHook(() => useHistory());
     const timestamp = Date.now();
-    const itemData1: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'First',
+    const itemData1: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "First",
     };
-    const itemData2: Omit<HistoryItem, 'id'> = {
-      type: 'gemini', // Replaced HistoryItemType.Gemini
-      text: 'Second',
+    const itemData2: Omit<HistoryItem, "id"> = {
+      type: "gemini", // Replaced HistoryItemType.Gemini
+      text: "Second",
     };
 
     act(() => {
@@ -140,24 +140,24 @@ describe('useHistoryManager', () => {
     expect(result.current.history).toEqual([]);
   });
 
-  it('should not add consecutive duplicate user messages', () => {
+  it("should not add consecutive duplicate user messages", () => {
     const { result } = renderHook(() => useHistory());
     const timestamp = Date.now();
-    const itemData1: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'Duplicate message',
+    const itemData1: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "Duplicate message",
     };
-    const itemData2: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'Duplicate message',
+    const itemData2: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "Duplicate message",
     };
-    const itemData3: Omit<HistoryItem, 'id'> = {
-      type: 'gemini', // Replaced HistoryItemType.Gemini
-      text: 'Gemini response',
+    const itemData3: Omit<HistoryItem, "id"> = {
+      type: "gemini", // Replaced HistoryItemType.Gemini
+      text: "Gemini response",
     };
-    const itemData4: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'Another user message',
+    const itemData4: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "Another user message",
     };
 
     act(() => {
@@ -168,25 +168,25 @@ describe('useHistoryManager', () => {
     });
 
     expect(result.current.history).toHaveLength(3);
-    expect(result.current.history[0].text).toBe('Duplicate message');
-    expect(result.current.history[1].text).toBe('Gemini response');
-    expect(result.current.history[2].text).toBe('Another user message');
+    expect(result.current.history[0].text).toBe("Duplicate message");
+    expect(result.current.history[1].text).toBe("Gemini response");
+    expect(result.current.history[2].text).toBe("Another user message");
   });
 
-  it('should add duplicate user messages if they are not consecutive', () => {
+  it("should add duplicate user messages if they are not consecutive", () => {
     const { result } = renderHook(() => useHistory());
     const timestamp = Date.now();
-    const itemData1: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'Message 1',
+    const itemData1: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "Message 1",
     };
-    const itemData2: Omit<HistoryItem, 'id'> = {
-      type: 'gemini', // Replaced HistoryItemType.Gemini
-      text: 'Gemini response',
+    const itemData2: Omit<HistoryItem, "id"> = {
+      type: "gemini", // Replaced HistoryItemType.Gemini
+      text: "Gemini response",
     };
-    const itemData3: Omit<HistoryItem, 'id'> = {
-      type: 'user', // Replaced HistoryItemType.User
-      text: 'Message 1', // Duplicate text, but not consecutive
+    const itemData3: Omit<HistoryItem, "id"> = {
+      type: "user", // Replaced HistoryItemType.User
+      text: "Message 1", // Duplicate text, but not consecutive
     };
 
     act(() => {
@@ -196,8 +196,8 @@ describe('useHistoryManager', () => {
     });
 
     expect(result.current.history).toHaveLength(3);
-    expect(result.current.history[0].text).toBe('Message 1');
-    expect(result.current.history[1].text).toBe('Gemini response');
-    expect(result.current.history[2].text).toBe('Message 1');
+    expect(result.current.history[0].text).toBe("Message 1");
+    expect(result.current.history[1].text).toBe("Gemini response");
+    expect(result.current.history[2].text).toBe("Message 1");
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/useHistoryManager.ts b/packages/ui-gemini/src/ui/hooks/useHistoryManager.ts
index 32ca86e20..3825416ce 100644
--- a/packages/ui-gemini/src/ui/hooks/useHistoryManager.ts
+++ b/packages/ui-gemini/src/ui/hooks/useHistoryManager.ts
@@ -4,26 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useRef, useCallback, useMemo } from 'react';
-import type { HistoryItem } from '../types.js';
-import type { ChatRecordingService } from '@airiscode/gemini-cli-core';
+import type { ChatRecordingService } from "@airiscode/gemini-cli-core";
+import { useCallback, useMemo, useRef, useState } from "react";
+import type { HistoryItem } from "../types.js";
 
 // Type for the updater function passed to updateHistoryItem
-type HistoryItemUpdater = (
-  prevItem: HistoryItem,
-) => Partial<Omit<HistoryItem, 'id'>>;
+type HistoryItemUpdater = (prevItem: HistoryItem) => Partial<Omit<HistoryItem, "id">>;
 
 export interface UseHistoryManagerReturn {
   history: HistoryItem[];
   addItem: (
-    itemData: Omit<HistoryItem, 'id'>,
+    itemData: Omit<HistoryItem, "id">,
     baseTimestamp: number,
     isResuming?: boolean,
   ) => number; // Returns the generated ID
-  updateItem: (
-    id: number,
-    updates: Partial<Omit<HistoryItem, 'id'>> | HistoryItemUpdater,
-  ) => void;
+  updateItem: (id: number, updates: Partial<Omit<HistoryItem, "id">> | HistoryItemUpdater) => void;
   clearItems: () => void;
   loadHistory: (newHistory: HistoryItem[]) => void;
 }
@@ -55,7 +50,7 @@ export function useHistory({
   // Adds a new item to the history state with a unique ID.
   const addItem = useCallback(
     (
-      itemData: Omit<HistoryItem, 'id'>,
+      itemData: Omit<HistoryItem, "id">,
       baseTimestamp: number,
       isResuming: boolean = false,
     ): number => {
@@ -67,8 +62,8 @@ export function useHistory({
           const lastItem = prevHistory[prevHistory.length - 1];
           // Prevent adding duplicate consecutive user messages
           if (
-            lastItem.type === 'user' &&
-            newItem.type === 'user' &&
+            lastItem.type === "user" &&
+            newItem.type === "user" &&
             lastItem.text === newItem.text
           ) {
             return prevHistory; // Don't add the duplicate
@@ -81,31 +76,31 @@ export function useHistory({
       // an existing session.
       if (!isResuming && chatRecordingService) {
         switch (itemData.type) {
-          case 'compression':
-          case 'info':
+          case "compression":
+          case "info":
             chatRecordingService?.recordMessage({
               model: undefined,
-              type: 'info',
-              content: itemData.text ?? '',
+              type: "info",
+              content: itemData.text ?? "",
             });
             break;
-          case 'warning':
+          case "warning":
             chatRecordingService?.recordMessage({
               model: undefined,
-              type: 'warning',
-              content: itemData.text ?? '',
+              type: "warning",
+              content: itemData.text ?? "",
             });
             break;
-          case 'error':
+          case "error":
             chatRecordingService?.recordMessage({
               model: undefined,
-              type: 'error',
-              content: itemData.text ?? '',
+              type: "error",
+              content: itemData.text ?? "",
             });
             break;
-          case 'user':
-          case 'gemini':
-          case 'gemini_content':
+          case "user":
+          case "gemini":
+          case "gemini_content":
             // Core conversation recording handled by GeminiChat.
             break;
           default:
@@ -127,16 +122,12 @@ export function useHistory({
    */
   //
   const updateItem = useCallback(
-    (
-      id: number,
-      updates: Partial<Omit<HistoryItem, 'id'>> | HistoryItemUpdater,
-    ) => {
+    (id: number, updates: Partial<Omit<HistoryItem, "id">> | HistoryItemUpdater) => {
       setHistory((prevHistory) =>
         prevHistory.map((item) => {
           if (item.id === id) {
             // Apply updates based on whether it's an object or a function
-            const newUpdates =
-              typeof updates === 'function' ? updates(item) : updates;
+            const newUpdates = typeof updates === "function" ? updates(item) : updates;
             return { ...item, ...newUpdates } as HistoryItem;
           }
           return item;
diff --git a/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.test.tsx b/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.test.tsx
index 3a7588e9c..46c99fcd7 100644
--- a/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.test.tsx
@@ -4,24 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { act } from 'react';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
 import {
-  IdeClient,
+  type IDEConnectionState,
   IDEConnectionStatus,
+  IdeClient,
   ideContextStore,
-  type IDEConnectionState,
-} from '@airiscode/gemini-cli-core';
-import { useIdeTrustListener } from './useIdeTrustListener.js';
-import * as trustedFolders from '../../config/trustedFolders.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import type { LoadedSettings } from '../../config/settings.js';
+} from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import * as trustedFolders from "../../config/trustedFolders.js";
+import { render } from "../../test-utils/render.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useIdeTrustListener } from "./useIdeTrustListener.js";
 
 // Mock dependencies
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   const ideClientInstance = {
     addTrustChangeListener: vi.fn(),
     removeTrustChangeListener: vi.fn(),
@@ -43,10 +42,10 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-vi.mock('../../config/trustedFolders.js');
-vi.mock('../contexts/SettingsContext.js');
+vi.mock("../../config/trustedFolders.js");
+vi.mock("../contexts/SettingsContext.js");
 
-describe('useIdeTrustListener', () => {
+describe("useIdeTrustListener", () => {
   let mockSettings: LoadedSettings;
   let mockIdeClient: Awaited<ReturnType<typeof IdeClient.getInstance>>;
   let trustChangeCallback: (isTrusted: boolean) => void;
@@ -71,11 +70,9 @@ describe('useIdeTrustListener', () => {
     vi.mocked(mockIdeClient.addTrustChangeListener).mockImplementation((cb) => {
       trustChangeCallback = cb;
     });
-    vi.mocked(mockIdeClient.addStatusChangeListener).mockImplementation(
-      (cb) => {
-        statusChangeCallback = cb;
-      },
-    );
+    vi.mocked(mockIdeClient.addStatusChangeListener).mockImplementation((cb) => {
+      statusChangeCallback = cb;
+    });
   });
 
   const renderTrustListenerHook = async () => {
@@ -106,7 +103,7 @@ describe('useIdeTrustListener', () => {
     };
   };
 
-  it('should initialize correctly with no trust information', async () => {
+  it("should initialize correctly with no trust information", async () => {
     vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
       isTrusted: undefined,
       source: undefined,
@@ -116,17 +113,17 @@ describe('useIdeTrustListener', () => {
 
     expect(result.current.isIdeTrusted).toBe(undefined);
     expect(result.current.needsRestart).toBe(false);
-    expect(result.current.restartReason).toBe('NONE');
+    expect(result.current.restartReason).toBe("NONE");
     await unmount();
   });
 
-  it('should NOT set needsRestart when connecting for the first time', async () => {
+  it("should NOT set needsRestart when connecting for the first time", async () => {
     vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
       status: IDEConnectionStatus.Disconnected,
     });
     vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
-      source: 'ide',
+      source: "ide",
     });
     const { result, unmount } = await renderTrustListenerHook();
 
@@ -147,11 +144,11 @@ describe('useIdeTrustListener', () => {
 
     expect(result.current.isIdeTrusted).toBe(true);
     expect(result.current.needsRestart).toBe(false);
-    expect(result.current.restartReason).toBe('CONNECTION_CHANGE');
+    expect(result.current.restartReason).toBe("CONNECTION_CHANGE");
     await unmount();
   });
 
-  it('should set needsRestart when IDE trust changes', async () => {
+  it("should set needsRestart when IDE trust changes", async () => {
     vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
       status: IDEConnectionStatus.Connected,
     });
@@ -160,7 +157,7 @@ describe('useIdeTrustListener', () => {
     });
     vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
-      source: 'ide',
+      source: "ide",
     });
 
     const { result, unmount } = await renderTrustListenerHook();
@@ -176,7 +173,7 @@ describe('useIdeTrustListener', () => {
     await act(async () => {
       vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
         isTrusted: false,
-        source: 'ide',
+        source: "ide",
       });
       vi.mocked(ideContextStore.get).mockReturnValue({
         workspaceState: { isTrusted: false },
@@ -186,11 +183,11 @@ describe('useIdeTrustListener', () => {
 
     expect(result.current.isIdeTrusted).toBe(false);
     expect(result.current.needsRestart).toBe(true);
-    expect(result.current.restartReason).toBe('TRUST_CHANGE');
+    expect(result.current.restartReason).toBe("TRUST_CHANGE");
     await unmount();
   });
 
-  it('should set needsRestart when IDE disconnects', async () => {
+  it("should set needsRestart when IDE disconnects", async () => {
     vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
       status: IDEConnectionStatus.Connected,
     });
@@ -199,7 +196,7 @@ describe('useIdeTrustListener', () => {
     });
     vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
-      source: 'ide',
+      source: "ide",
     });
 
     const { result, unmount } = await renderTrustListenerHook();
@@ -223,11 +220,11 @@ describe('useIdeTrustListener', () => {
 
     expect(result.current.isIdeTrusted).toBe(undefined);
     expect(result.current.needsRestart).toBe(true);
-    expect(result.current.restartReason).toBe('CONNECTION_CHANGE');
+    expect(result.current.restartReason).toBe("CONNECTION_CHANGE");
     await unmount();
   });
 
-  it('should NOT set needsRestart if trust value does not change', async () => {
+  it("should NOT set needsRestart if trust value does not change", async () => {
     vi.mocked(mockIdeClient.getConnectionStatus).mockReturnValue({
       status: IDEConnectionStatus.Connected,
     });
@@ -236,7 +233,7 @@ describe('useIdeTrustListener', () => {
     });
     vi.mocked(trustedFolders.isWorkspaceTrusted).mockReturnValue({
       isTrusted: true,
-      source: 'ide',
+      source: "ide",
     });
 
     const { result, rerender, unmount } = await renderTrustListenerHook();
diff --git a/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.ts b/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.ts
index 961010e56..f7f13aaa9 100644
--- a/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.ts
+++ b/packages/ui-gemini/src/ui/hooks/useIdeTrustListener.ts
@@ -5,22 +5,16 @@
  */
 
 import {
-  useCallback,
-  useEffect,
-  useState,
-  useSyncExternalStore,
-  useRef,
-} from 'react';
-import {
-  IdeClient,
+  type IDEConnectionState,
   IDEConnectionStatus,
+  IdeClient,
   ideContextStore,
-  type IDEConnectionState,
-} from '@airiscode/gemini-cli-core';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
+} from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from "react";
+import { isWorkspaceTrusted } from "../../config/trustedFolders.js";
+import { useSettings } from "../contexts/SettingsContext.js";
 
-export type RestartReason = 'NONE' | 'CONNECTION_CHANGE' | 'TRUST_CHANGE';
+export type RestartReason = "NONE" | "CONNECTION_CHANGE" | "TRUST_CHANGE";
 
 /**
  * This hook listens for trust status updates from the IDE companion extension.
@@ -33,19 +27,19 @@ export function useIdeTrustListener() {
     IDEConnectionStatus.Disconnected,
   );
   const previousTrust = useRef<boolean | undefined>(undefined);
-  const [restartReason, setRestartReason] = useState<RestartReason>('NONE');
+  const [restartReason, setRestartReason] = useState<RestartReason>("NONE");
   const [needsRestart, setNeedsRestart] = useState(false);
 
   const subscribe = useCallback((onStoreChange: () => void) => {
     const handleStatusChange = (state: IDEConnectionState) => {
       setConnectionStatus(state.status);
-      setRestartReason('CONNECTION_CHANGE');
+      setRestartReason("CONNECTION_CHANGE");
       // Also notify useSyncExternalStore that the data has changed
       onStoreChange();
     };
 
     const handleTrustChange = () => {
-      setRestartReason('TRUST_CHANGE');
+      setRestartReason("TRUST_CHANGE");
       onStoreChange();
     };
 
@@ -79,10 +73,7 @@ export function useIdeTrustListener() {
     const currentTrust = isWorkspaceTrusted(settings.merged).isTrusted;
     // Trigger a restart if the overall trust status for the CLI has changed,
     // but not on the initial trust value.
-    if (
-      previousTrust.current !== undefined &&
-      previousTrust.current !== currentTrust
-    ) {
+    if (previousTrust.current !== undefined && previousTrust.current !== currentTrust) {
       setNeedsRestart(true);
     }
     previousTrust.current = currentTrust;
diff --git a/packages/ui-gemini/src/ui/hooks/useInactivityTimer.ts b/packages/ui-gemini/src/ui/hooks/useInactivityTimer.ts
index b4e667a35..10329dbec 100644
--- a/packages/ui-gemini/src/ui/hooks/useInactivityTimer.ts
+++ b/packages/ui-gemini/src/ui/hooks/useInactivityTimer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from "react";
 
 /**
  * Returns true after a specified delay of inactivity.
diff --git a/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.test.tsx b/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.test.tsx
index de1b3ba33..c9f411269 100644
--- a/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.test.tsx
@@ -4,30 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import type { Mock } from 'vitest';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useIncludeDirsTrust } from './useIncludeDirsTrust.js';
-import * as trustedFolders from '../../config/trustedFolders.js';
-import type { Config, WorkspaceContext } from '@airiscode/gemini-cli-core';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import type { LoadedTrustedFolders } from '../../config/trustedFolders.js';
-
-import type { MultiFolderTrustDialogProps } from '../components/MultiFolderTrustDialog.js';
-
-vi.mock('../utils/directoryUtils.js', () => ({
+import type { Config, WorkspaceContext } from "@airiscode/gemini-cli-core";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedTrustedFolders } from "../../config/trustedFolders.js";
+import * as trustedFolders from "../../config/trustedFolders.js";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import type { MultiFolderTrustDialogProps } from "../components/MultiFolderTrustDialog.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { useIncludeDirsTrust } from "./useIncludeDirsTrust.js";
+
+vi.mock("../utils/directoryUtils.js", () => ({
   expandHomeDir: (p: string) => p, // Simple pass-through for testing
   loadMemoryFromDirectories: vi.fn().mockResolvedValue({ fileCount: 1 }),
 }));
 
-vi.mock('../components/MultiFolderTrustDialog.js', () => ({
+vi.mock("../components/MultiFolderTrustDialog.js", () => ({
   MultiFolderTrustDialog: (props: MultiFolderTrustDialogProps) => (
     <div data-testid="mock-dialog">{JSON.stringify(props.folders)}</div>
   ),
 }));
 
-describe('useIncludeDirsTrust', () => {
+describe("useIncludeDirsTrust", () => {
   let mockConfig: Config;
   let mockHistoryManager: UseHistoryManagerReturn;
   let mockSetCustomDialog: Mock;
@@ -56,9 +55,7 @@ describe('useIncludeDirsTrust', () => {
       clearPendingIncludeDirectories: vi.fn(),
       getFolderTrust: vi.fn().mockReturnValue(true),
       getWorkspaceContext: () => mockWorkspaceContext,
-      getGeminiClient: vi
-        .fn()
-        .mockReturnValue({ addDirectoryContext: vi.fn() }),
+      getGeminiClient: vi.fn().mockReturnValue({ addDirectoryContext: vi.fn() }),
     } as unknown as Config;
 
     mockHistoryManager = {
@@ -73,102 +70,77 @@ describe('useIncludeDirsTrust', () => {
 
   const renderTestHook = (isTrustedFolder: boolean | undefined) => {
     renderHook(() =>
-      useIncludeDirsTrust(
-        mockConfig,
-        isTrustedFolder,
-        mockHistoryManager,
-        mockSetCustomDialog,
-      ),
+      useIncludeDirsTrust(mockConfig, isTrustedFolder, mockHistoryManager, mockSetCustomDialog),
     );
   };
 
-  it('should do nothing if isTrustedFolder is undefined', () => {
-    vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue([
-      '/foo',
-    ]);
+  it("should do nothing if isTrustedFolder is undefined", () => {
+    vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(["/foo"]);
     renderTestHook(undefined);
     expect(mockConfig.clearPendingIncludeDirectories).not.toHaveBeenCalled();
   });
 
-  it('should do nothing if there are no pending directories', () => {
+  it("should do nothing if there are no pending directories", () => {
     renderTestHook(true);
     expect(mockConfig.clearPendingIncludeDirectories).not.toHaveBeenCalled();
   });
 
-  describe('when folder trust is disabled or workspace is untrusted', () => {
+  describe("when folder trust is disabled or workspace is untrusted", () => {
     it.each([
-      { trustEnabled: false, isTrusted: true, scenario: 'trust is disabled' },
+      { trustEnabled: false, isTrusted: true, scenario: "trust is disabled" },
       {
         trustEnabled: true,
         isTrusted: false,
-        scenario: 'workspace is untrusted',
+        scenario: "workspace is untrusted",
       },
-    ])(
-      'should add directories directly when $scenario',
-      async ({ trustEnabled, isTrusted }) => {
-        vi.mocked(mockConfig.getFolderTrust).mockReturnValue(trustEnabled);
-        vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue([
-          '/dir1',
-          '/dir2',
-        ]);
-        vi.mocked(mockWorkspaceContext.addDirectory).mockImplementation(
-          (path) => {
-            if (path === '/dir2') {
-              throw new Error('Test error');
-            }
-          },
-        );
+    ])("should add directories directly when $scenario", async ({ trustEnabled, isTrusted }) => {
+      vi.mocked(mockConfig.getFolderTrust).mockReturnValue(trustEnabled);
+      vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(["/dir1", "/dir2"]);
+      vi.mocked(mockWorkspaceContext.addDirectory).mockImplementation((path) => {
+        if (path === "/dir2") {
+          throw new Error("Test error");
+        }
+      });
 
-        renderTestHook(isTrusted);
-
-        await waitFor(() => {
-          expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(
-            '/dir1',
-          );
-          expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(
-            '/dir2',
-          );
-          expect(mockHistoryManager.addItem).toHaveBeenCalledWith(
-            expect.objectContaining({
-              text: expect.stringContaining("Error adding '/dir2': Test error"),
-            }),
-            expect.any(Number),
-          );
-          expect(
-            mockConfig.clearPendingIncludeDirectories,
-          ).toHaveBeenCalledTimes(1);
-        });
-      },
-    );
+      renderTestHook(isTrusted);
+
+      await waitFor(() => {
+        expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith("/dir1");
+        expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith("/dir2");
+        expect(mockHistoryManager.addItem).toHaveBeenCalledWith(
+          expect.objectContaining({
+            text: expect.stringContaining("Error adding '/dir2': Test error"),
+          }),
+          expect.any(Number),
+        );
+        expect(mockConfig.clearPendingIncludeDirectories).toHaveBeenCalledTimes(1);
+      });
+    });
   });
 
-  describe('when folder trust is enabled and workspace is trusted', () => {
+  describe("when folder trust is enabled and workspace is trusted", () => {
     let mockIsPathTrusted: Mock;
 
     beforeEach(() => {
-      vi.spyOn(mockConfig, 'getFolderTrust').mockReturnValue(true);
+      vi.spyOn(mockConfig, "getFolderTrust").mockReturnValue(true);
       mockIsPathTrusted = vi.fn();
       const mockLoadedFolders = {
         isPathTrusted: mockIsPathTrusted,
       } as unknown as LoadedTrustedFolders;
-      vi.spyOn(trustedFolders, 'loadTrustedFolders').mockReturnValue(
-        mockLoadedFolders,
-      );
+      vi.spyOn(trustedFolders, "loadTrustedFolders").mockReturnValue(mockLoadedFolders);
     });
 
     afterEach(() => {
       vi.restoreAllMocks();
     });
 
-    it('should add trusted dirs, collect untrusted errors, and open dialog for undefined', async () => {
-      const pendingDirs = ['/trusted', '/untrusted', '/undefined'];
-      vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(
-        pendingDirs,
-      );
+    it("should add trusted dirs, collect untrusted errors, and open dialog for undefined", async () => {
+      const pendingDirs = ["/trusted", "/untrusted", "/undefined"];
+      vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(pendingDirs);
 
       mockIsPathTrusted.mockImplementation((path: string) => {
-        if (path === '/trusted') return true;
-        if (path === '/untrusted') return false;
+        if (path === "/trusted") return true;
+        if (path === "/untrusted") return false;
         return undefined;
       });
 
@@ -178,36 +150,27 @@ describe('useIncludeDirsTrust', () => {
       expect(mockSetCustomDialog).toHaveBeenCalledTimes(1);
       const customDialogAction = mockSetCustomDialog.mock.calls[0][0];
       expect(customDialogAction).toBeDefined();
-      const dialogProps = (
-        customDialogAction as React.ReactElement<MultiFolderTrustDialogProps>
-      ).props;
-      expect(dialogProps.folders).toEqual(['/undefined']);
-      expect(dialogProps.trustedDirs).toEqual(['/trusted']);
+      const dialogProps = (customDialogAction as React.ReactElement<MultiFolderTrustDialogProps>)
+        .props;
+      expect(dialogProps.folders).toEqual(["/undefined"]);
+      expect(dialogProps.trustedDirs).toEqual(["/trusted"]);
       expect(dialogProps.errors as string[]).toEqual([
         `The following directories are explicitly untrusted and cannot be added to a trusted workspace:\n- /untrusted\nPlease use the permissions command to modify their trust level.`,
       ]);
     });
 
-    it('should only add directories and clear pending if no dialog is needed', async () => {
-      const pendingDirs = ['/trusted1', '/trusted2'];
-      vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(
-        pendingDirs,
-      );
+    it("should only add directories and clear pending if no dialog is needed", async () => {
+      const pendingDirs = ["/trusted1", "/trusted2"];
+      vi.mocked(mockConfig.getPendingIncludeDirectories).mockReturnValue(pendingDirs);
       mockIsPathTrusted.mockReturnValue(true);
 
       renderTestHook(true);
 
       await waitFor(() => {
-        expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(
-          '/trusted1',
-        );
-        expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith(
-          '/trusted2',
-        );
+        expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith("/trusted1");
+        expect(mockWorkspaceContext.addDirectory).toHaveBeenCalledWith("/trusted2");
         expect(mockSetCustomDialog).not.toHaveBeenCalled();
-        expect(mockConfig.clearPendingIncludeDirectories).toHaveBeenCalledTimes(
-          1,
-        );
+        expect(mockConfig.clearPendingIncludeDirectories).toHaveBeenCalledTimes(1);
       });
     });
   });
diff --git a/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.tsx b/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.tsx
index 468ed08b1..7db883634 100644
--- a/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useIncludeDirsTrust.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { loadTrustedFolders } from '../../config/trustedFolders.js';
-import { expandHomeDir } from '../utils/directoryUtils.js';
-import { refreshServerHierarchicalMemory } from '@airiscode/gemini-cli-core';
-import { MultiFolderTrustDialog } from '../components/MultiFolderTrustDialog.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { MessageType, type HistoryItem } from '../types.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { refreshServerHierarchicalMemory } from "@airiscode/gemini-cli-core";
+import { useEffect } from "react";
+import { loadTrustedFolders } from "../../config/trustedFolders.js";
+import { MultiFolderTrustDialog } from "../components/MultiFolderTrustDialog.js";
+import { type HistoryItem, MessageType } from "../types.js";
+import { expandHomeDir } from "../utils/directoryUtils.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 async function finishAddingDirectories(
   config: Config,
-  addItem: (itemData: Omit<HistoryItem, 'id'>, baseTimestamp: number) => number,
+  addItem: (itemData: Omit<HistoryItem, "id">, baseTimestamp: number) => number,
   added: string[],
   errors: string[],
 ) {
@@ -23,7 +23,7 @@ async function finishAddingDirectories(
     addItem(
       {
         type: MessageType.ERROR,
-        text: 'Configuration is not available.',
+        text: "Configuration is not available.",
       },
       Date.now(),
     );
@@ -46,7 +46,7 @@ async function finishAddingDirectories(
   }
 
   if (errors.length > 0) {
-    addItem({ type: MessageType.ERROR, text: errors.join('\n') }, Date.now());
+    addItem({ type: MessageType.ERROR, text: errors.join("\n") }, Date.now());
   }
 }
 
@@ -116,7 +116,7 @@ export function useIncludeDirsTrust(
     if (untrustedDirs.length > 0) {
       errors.push(
         `The following directories are explicitly untrusted and cannot be added to a trusted workspace:\n- ${untrustedDirs.join(
-          '\n- ',
+          "\n- ",
         )}\nPlease use the permissions command to modify their trust level.`,
       );
     }
@@ -133,10 +133,7 @@ export function useIncludeDirsTrust(
     }
 
     if (undefinedTrustDirs.length > 0) {
-      console.log(
-        'Creating custom dialog with undecidedDirs:',
-        undefinedTrustDirs,
-      );
+      console.log("Creating custom dialog with undecidedDirs:", undefinedTrustDirs);
       setCustomDialog(
         <MultiFolderTrustDialog
           folders={undefinedTrustDirs}
diff --git a/packages/ui-gemini/src/ui/hooks/useInputHistory.test.ts b/packages/ui-gemini/src/ui/hooks/useInputHistory.test.ts
index 6d0d7fad2..32be3d588 100644
--- a/packages/ui-gemini/src/ui/hooks/useInputHistory.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useInputHistory.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { useInputHistory } from './useInputHistory.js';
+import { act } from "react";
+import { renderHook } from "../../test-utils/render.js";
+import { useInputHistory } from "./useInputHistory.js";
 
-describe('useInputHistory', () => {
+describe("useInputHistory", () => {
   const mockOnSubmit = vi.fn();
   const mockOnChange = vi.fn();
 
@@ -16,15 +16,15 @@ describe('useInputHistory', () => {
     vi.clearAllMocks();
   });
 
-  const userMessages = ['message 1', 'message 2', 'message 3'];
+  const userMessages = ["message 1", "message 2", "message 3"];
 
-  it('should initialize with historyIndex -1 and empty originalQueryBeforeNav', () => {
+  it("should initialize with historyIndex -1 and empty originalQueryBeforeNav", () => {
     const { result } = renderHook(() =>
       useInputHistory({
         userMessages: [],
         onSubmit: mockOnSubmit,
         isActive: true,
-        currentQuery: '',
+        currentQuery: "",
         onChange: mockOnChange,
       }),
     );
@@ -37,23 +37,23 @@ describe('useInputHistory', () => {
     expect(mockOnChange).not.toHaveBeenCalled();
   });
 
-  describe('handleSubmit', () => {
-    it('should call onSubmit with trimmed value and reset history', () => {
+  describe("handleSubmit", () => {
+    it("should call onSubmit with trimmed value and reset history", () => {
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
           onSubmit: mockOnSubmit,
           isActive: true,
-          currentQuery: '  test query  ',
+          currentQuery: "  test query  ",
           onChange: mockOnChange,
         }),
       );
 
       act(() => {
-        result.current.handleSubmit('  submit value  ');
+        result.current.handleSubmit("  submit value  ");
       });
 
-      expect(mockOnSubmit).toHaveBeenCalledWith('submit value');
+      expect(mockOnSubmit).toHaveBeenCalledWith("submit value");
       // Check if history is reset (e.g., by trying to navigate down)
       act(() => {
         result.current.navigateDown();
@@ -61,33 +61,33 @@ describe('useInputHistory', () => {
       expect(mockOnChange).not.toHaveBeenCalled();
     });
 
-    it('should not call onSubmit if value is empty after trimming', () => {
+    it("should not call onSubmit if value is empty after trimming", () => {
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
           onSubmit: mockOnSubmit,
           isActive: true,
-          currentQuery: '',
+          currentQuery: "",
           onChange: mockOnChange,
         }),
       );
 
       act(() => {
-        result.current.handleSubmit('   ');
+        result.current.handleSubmit("   ");
       });
 
       expect(mockOnSubmit).not.toHaveBeenCalled();
     });
   });
 
-  describe('navigateUp', () => {
-    it('should not navigate if isActive is false', () => {
+  describe("navigateUp", () => {
+    it("should not navigate if isActive is false", () => {
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
           onSubmit: mockOnSubmit,
           isActive: false,
-          currentQuery: 'current',
+          currentQuery: "current",
           onChange: mockOnChange,
         }),
       );
@@ -98,13 +98,13 @@ describe('useInputHistory', () => {
       expect(mockOnChange).not.toHaveBeenCalled();
     });
 
-    it('should not navigate if userMessages is empty', () => {
+    it("should not navigate if userMessages is empty", () => {
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages: [],
           onSubmit: mockOnSubmit,
           isActive: true,
-          currentQuery: 'current',
+          currentQuery: "current",
           onChange: mockOnChange,
         }),
       );
@@ -115,8 +115,8 @@ describe('useInputHistory', () => {
       expect(mockOnChange).not.toHaveBeenCalled();
     });
 
-    it('should call onChange with the last message when navigating up from initial state', () => {
-      const currentQuery = 'current query';
+    it("should call onChange with the last message when navigating up from initial state", () => {
+      const currentQuery = "current query";
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
@@ -134,8 +134,8 @@ describe('useInputHistory', () => {
       expect(mockOnChange).toHaveBeenCalledWith(userMessages[2]); // Last message
     });
 
-    it('should store currentQuery as originalQueryBeforeNav on first navigateUp', () => {
-      const currentQuery = 'original user input';
+    it("should store currentQuery as originalQueryBeforeNav on first navigateUp", () => {
+      const currentQuery = "original user input";
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
@@ -158,13 +158,13 @@ describe('useInputHistory', () => {
       expect(mockOnChange).toHaveBeenCalledWith(currentQuery);
     });
 
-    it('should navigate through history messages on subsequent navigateUp calls', () => {
+    it("should navigate through history messages on subsequent navigateUp calls", () => {
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
           onSubmit: mockOnSubmit,
           isActive: true,
-          currentQuery: '',
+          currentQuery: "",
           onChange: mockOnChange,
         }),
       );
@@ -186,21 +186,18 @@ describe('useInputHistory', () => {
     });
   });
 
-  describe('navigateDown', () => {
-    it('should not navigate if isActive is false', () => {
+  describe("navigateDown", () => {
+    it("should not navigate if isActive is false", () => {
       const initialProps = {
         userMessages,
         onSubmit: mockOnSubmit,
         isActive: true, // Start active to allow setup navigation
-        currentQuery: 'current',
+        currentQuery: "current",
         onChange: mockOnChange,
       };
-      const { result, rerender } = renderHook(
-        (props) => useInputHistory(props),
-        {
-          initialProps,
-        },
-      );
+      const { result, rerender } = renderHook((props) => useInputHistory(props), {
+        initialProps,
+      });
 
       // First navigate up to have something in history
       act(() => {
@@ -218,13 +215,13 @@ describe('useInputHistory', () => {
       expect(mockOnChange).not.toHaveBeenCalled();
     });
 
-    it('should not navigate if historyIndex is -1 (not in history navigation)', () => {
+    it("should not navigate if historyIndex is -1 (not in history navigation)", () => {
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
           onSubmit: mockOnSubmit,
           isActive: true,
-          currentQuery: 'current',
+          currentQuery: "current",
           onChange: mockOnChange,
         }),
       );
@@ -235,8 +232,8 @@ describe('useInputHistory', () => {
       expect(mockOnChange).not.toHaveBeenCalled();
     });
 
-    it('should restore originalQueryBeforeNav when navigating down to initial state', () => {
-      const originalQuery = 'my original input';
+    it("should restore originalQueryBeforeNav when navigating down to initial state", () => {
+      const originalQuery = "my original input";
       const { result } = renderHook(() =>
         useInputHistory({
           userMessages,
diff --git a/packages/ui-gemini/src/ui/hooks/useInputHistory.ts b/packages/ui-gemini/src/ui/hooks/useInputHistory.ts
index 58fc9d4a6..8e0122c8d 100644
--- a/packages/ui-gemini/src/ui/hooks/useInputHistory.ts
+++ b/packages/ui-gemini/src/ui/hooks/useInputHistory.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 interface UseInputHistoryProps {
   userMessages: readonly string[];
@@ -28,12 +28,11 @@ export function useInputHistory({
   onChange,
 }: UseInputHistoryProps): UseInputHistoryReturn {
   const [historyIndex, setHistoryIndex] = useState<number>(-1);
-  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] =
-    useState<string>('');
+  const [originalQueryBeforeNav, setOriginalQueryBeforeNav] = useState<string>("");
 
   const resetHistoryNav = useCallback(() => {
     setHistoryIndex(-1);
-    setOriginalQueryBeforeNav('');
+    setOriginalQueryBeforeNav("");
   }, []);
 
   const handleSubmit = useCallback(
@@ -94,14 +93,7 @@ export function useInputHistory({
       onChange(newValue);
     }
     return true;
-  }, [
-    historyIndex,
-    setHistoryIndex,
-    originalQueryBeforeNav,
-    onChange,
-    userMessages,
-    isActive,
-  ]);
+  }, [historyIndex, setHistoryIndex, originalQueryBeforeNav, onChange, userMessages, isActive]);
 
   return {
     handleSubmit,
diff --git a/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.test.ts b/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.test.ts
index fbf207bbd..1c6ae4dda 100644
--- a/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.test.ts
@@ -4,91 +4,86 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { useInputHistoryStore } from './useInputHistoryStore.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { useInputHistoryStore } from "./useInputHistoryStore.js";
 
-describe('useInputHistoryStore', () => {
+describe("useInputHistoryStore", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should initialize with empty input history', () => {
+  it("should initialize with empty input history", () => {
     const { result } = renderHook(() => useInputHistoryStore());
 
     expect(result.current.inputHistory).toEqual([]);
   });
 
-  it('should add input to history', () => {
+  it("should add input to history", () => {
     const { result } = renderHook(() => useInputHistoryStore());
 
     act(() => {
-      result.current.addInput('test message 1');
+      result.current.addInput("test message 1");
     });
 
-    expect(result.current.inputHistory).toEqual(['test message 1']);
+    expect(result.current.inputHistory).toEqual(["test message 1"]);
 
     act(() => {
-      result.current.addInput('test message 2');
+      result.current.addInput("test message 2");
     });
 
-    expect(result.current.inputHistory).toEqual([
-      'test message 1',
-      'test message 2',
-    ]);
+    expect(result.current.inputHistory).toEqual(["test message 1", "test message 2"]);
   });
 
-  it('should not add empty or whitespace-only inputs', () => {
+  it("should not add empty or whitespace-only inputs", () => {
     const { result } = renderHook(() => useInputHistoryStore());
 
     act(() => {
-      result.current.addInput('');
+      result.current.addInput("");
     });
 
     expect(result.current.inputHistory).toEqual([]);
 
     act(() => {
-      result.current.addInput('   ');
+      result.current.addInput("   ");
     });
 
     expect(result.current.inputHistory).toEqual([]);
   });
 
-  it('should deduplicate consecutive identical messages', () => {
+  it("should deduplicate consecutive identical messages", () => {
     const { result } = renderHook(() => useInputHistoryStore());
 
     act(() => {
-      result.current.addInput('test message');
+      result.current.addInput("test message");
     });
 
     act(() => {
-      result.current.addInput('test message'); // Same as previous
+      result.current.addInput("test message"); // Same as previous
     });
 
-    expect(result.current.inputHistory).toEqual(['test message']);
+    expect(result.current.inputHistory).toEqual(["test message"]);
 
     act(() => {
-      result.current.addInput('different message');
+      result.current.addInput("different message");
     });
 
     act(() => {
-      result.current.addInput('test message'); // Same as first, but not consecutive
+      result.current.addInput("test message"); // Same as first, but not consecutive
     });
 
     expect(result.current.inputHistory).toEqual([
-      'test message',
-      'different message',
-      'test message',
+      "test message",
+      "different message",
+      "test message",
     ]);
   });
 
-  it('should initialize from logger successfully', async () => {
+  it("should initialize from logger successfully", async () => {
     const mockLogger = {
-      getPreviousUserMessages: vi
-        .fn()
-        .mockResolvedValue(['newest', 'middle', 'oldest']),
+      getPreviousUserMessages: vi.fn().mockResolvedValue(["newest", "middle", "oldest"]),
     };
 
     const { result } = renderHook(() => useInputHistoryStore());
@@ -98,20 +93,16 @@ describe('useInputHistoryStore', () => {
     });
 
     // Should reverse the order to oldest first
-    expect(result.current.inputHistory).toEqual(['oldest', 'middle', 'newest']);
+    expect(result.current.inputHistory).toEqual(["oldest", "middle", "newest"]);
     expect(mockLogger.getPreviousUserMessages).toHaveBeenCalledTimes(1);
   });
 
-  it('should handle logger initialization failure gracefully', async () => {
+  it("should handle logger initialization failure gracefully", async () => {
     const mockLogger = {
-      getPreviousUserMessages: vi
-        .fn()
-        .mockRejectedValue(new Error('Logger error')),
+      getPreviousUserMessages: vi.fn().mockRejectedValue(new Error("Logger error")),
     };
 
-    const consoleSpy = vi
-      .spyOn(debugLogger, 'warn')
-      .mockImplementation(() => {});
+    const consoleSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
     const { result } = renderHook(() => useInputHistoryStore());
 
@@ -121,18 +112,16 @@ describe('useInputHistoryStore', () => {
 
     expect(result.current.inputHistory).toEqual([]);
     expect(consoleSpy).toHaveBeenCalledWith(
-      'Failed to initialize input history from logger:',
+      "Failed to initialize input history from logger:",
       expect.any(Error),
     );
 
     consoleSpy.mockRestore();
   });
 
-  it('should initialize only once', async () => {
+  it("should initialize only once", async () => {
     const mockLogger = {
-      getPreviousUserMessages: vi
-        .fn()
-        .mockResolvedValue(['message1', 'message2']),
+      getPreviousUserMessages: vi.fn().mockResolvedValue(["message1", "message2"]),
     };
 
     const { result } = renderHook(() => useInputHistoryStore());
@@ -148,10 +137,10 @@ describe('useInputHistoryStore', () => {
 
     // Should be called only once
     expect(mockLogger.getPreviousUserMessages).toHaveBeenCalledTimes(1);
-    expect(result.current.inputHistory).toEqual(['message2', 'message1']);
+    expect(result.current.inputHistory).toEqual(["message2", "message1"]);
   });
 
-  it('should handle null logger gracefully', async () => {
+  it("should handle null logger gracefully", async () => {
     const { result } = renderHook(() => useInputHistoryStore());
 
     await act(async () => {
@@ -161,28 +150,22 @@ describe('useInputHistoryStore', () => {
     expect(result.current.inputHistory).toEqual([]);
   });
 
-  it('should trim input before adding to history', () => {
+  it("should trim input before adding to history", () => {
     const { result } = renderHook(() => useInputHistoryStore());
 
     act(() => {
-      result.current.addInput('  test message  ');
+      result.current.addInput("  test message  ");
     });
 
-    expect(result.current.inputHistory).toEqual(['test message']);
+    expect(result.current.inputHistory).toEqual(["test message"]);
   });
 
-  describe('deduplication logic from previous implementation', () => {
-    it('should deduplicate consecutive messages from past sessions during initialization', async () => {
+  describe("deduplication logic from previous implementation", () => {
+    it("should deduplicate consecutive messages from past sessions during initialization", async () => {
       const mockLogger = {
         getPreviousUserMessages: vi
           .fn()
-          .mockResolvedValue([
-            'message1',
-            'message1',
-            'message2',
-            'message2',
-            'message3',
-          ]), // newest first with duplicates
+          .mockResolvedValue(["message1", "message1", "message2", "message2", "message3"]), // newest first with duplicates
       };
 
       const { result } = renderHook(() => useInputHistoryStore());
@@ -192,16 +175,12 @@ describe('useInputHistoryStore', () => {
       });
 
       // Should deduplicate consecutive messages and reverse to oldest first
-      expect(result.current.inputHistory).toEqual([
-        'message3',
-        'message2',
-        'message1',
-      ]);
+      expect(result.current.inputHistory).toEqual(["message3", "message2", "message1"]);
     });
 
-    it('should deduplicate across session boundaries', async () => {
+    it("should deduplicate across session boundaries", async () => {
       const mockLogger = {
-        getPreviousUserMessages: vi.fn().mockResolvedValue(['old2', 'old1']), // newest first
+        getPreviousUserMessages: vi.fn().mockResolvedValue(["old2", "old1"]), // newest first
       };
 
       const { result } = renderHook(() => useInputHistoryStore());
@@ -213,24 +192,22 @@ describe('useInputHistoryStore', () => {
 
       // Add current session inputs
       act(() => {
-        result.current.addInput('old2'); // Same as last past session message
+        result.current.addInput("old2"); // Same as last past session message
       });
 
       // Should deduplicate across session boundary
-      expect(result.current.inputHistory).toEqual(['old1', 'old2']);
+      expect(result.current.inputHistory).toEqual(["old1", "old2"]);
 
       act(() => {
-        result.current.addInput('new1');
+        result.current.addInput("new1");
       });
 
-      expect(result.current.inputHistory).toEqual(['old1', 'old2', 'new1']);
+      expect(result.current.inputHistory).toEqual(["old1", "old2", "new1"]);
     });
 
-    it('should preserve non-consecutive duplicates', async () => {
+    it("should preserve non-consecutive duplicates", async () => {
       const mockLogger = {
-        getPreviousUserMessages: vi
-          .fn()
-          .mockResolvedValue(['message2', 'message1', 'message2']), // newest first with non-consecutive duplicate
+        getPreviousUserMessages: vi.fn().mockResolvedValue(["message2", "message1", "message2"]), // newest first with non-consecutive duplicate
       };
 
       const { result } = renderHook(() => useInputHistoryStore());
@@ -240,42 +217,36 @@ describe('useInputHistoryStore', () => {
       });
 
       // Non-consecutive duplicates should be preserved
-      expect(result.current.inputHistory).toEqual([
-        'message2',
-        'message1',
-        'message2',
-      ]);
+      expect(result.current.inputHistory).toEqual(["message2", "message1", "message2"]);
     });
 
-    it('should handle complex deduplication with current session', () => {
+    it("should handle complex deduplication with current session", () => {
       const { result } = renderHook(() => useInputHistoryStore());
 
       // Add multiple messages with duplicates
       act(() => {
-        result.current.addInput('hello');
+        result.current.addInput("hello");
       });
       act(() => {
-        result.current.addInput('hello'); // consecutive duplicate
+        result.current.addInput("hello"); // consecutive duplicate
       });
       act(() => {
-        result.current.addInput('world');
+        result.current.addInput("world");
       });
       act(() => {
-        result.current.addInput('world'); // consecutive duplicate
+        result.current.addInput("world"); // consecutive duplicate
       });
       act(() => {
-        result.current.addInput('hello'); // non-consecutive duplicate
+        result.current.addInput("hello"); // non-consecutive duplicate
       });
 
       // Should have deduplicated consecutive ones
-      expect(result.current.inputHistory).toEqual(['hello', 'world', 'hello']);
+      expect(result.current.inputHistory).toEqual(["hello", "world", "hello"]);
     });
 
-    it('should maintain oldest-first order in final output', async () => {
+    it("should maintain oldest-first order in final output", async () => {
       const mockLogger = {
-        getPreviousUserMessages: vi
-          .fn()
-          .mockResolvedValue(['newest', 'middle', 'oldest']), // newest first
+        getPreviousUserMessages: vi.fn().mockResolvedValue(["newest", "middle", "oldest"]), // newest first
       };
 
       const { result } = renderHook(() => useInputHistoryStore());
@@ -286,19 +257,19 @@ describe('useInputHistoryStore', () => {
 
       // Add current session messages
       act(() => {
-        result.current.addInput('current1');
+        result.current.addInput("current1");
       });
       act(() => {
-        result.current.addInput('current2');
+        result.current.addInput("current2");
       });
 
       // Should maintain oldest-first order
       expect(result.current.inputHistory).toEqual([
-        'oldest',
-        'middle',
-        'newest',
-        'current1',
-        'current2',
+        "oldest",
+        "middle",
+        "newest",
+        "current1",
+        "current2",
       ]);
     });
   });
diff --git a/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.ts b/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.ts
index d030d1ec1..207675260 100644
--- a/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.ts
+++ b/packages/ui-gemini/src/ui/hooks/useInputHistoryStore.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { useState, useCallback } from 'react';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { useCallback, useState } from "react";
 
 interface Logger {
   getPreviousUserMessages(): Promise<string[]>;
@@ -24,36 +24,31 @@ export interface UseInputHistoryStoreReturn {
 export function useInputHistoryStore(): UseInputHistoryStoreReturn {
   const [inputHistory, setInputHistory] = useState<string[]>([]);
   const [_pastSessionMessages, setPastSessionMessages] = useState<string[]>([]);
-  const [_currentSessionMessages, setCurrentSessionMessages] = useState<
-    string[]
-  >([]);
+  const [_currentSessionMessages, setCurrentSessionMessages] = useState<string[]>([]);
   const [isInitialized, setIsInitialized] = useState(false);
 
   /**
    * Recalculate the complete input history from past and current sessions.
    * Applies the same deduplication logic as the previous implementation.
    */
-  const recalculateHistory = useCallback(
-    (currentSession: string[], pastSession: string[]) => {
-      // Combine current session (newest first) + past session (newest first)
-      const combinedMessages = [...currentSession, ...pastSession];
+  const recalculateHistory = useCallback((currentSession: string[], pastSession: string[]) => {
+    // Combine current session (newest first) + past session (newest first)
+    const combinedMessages = [...currentSession, ...pastSession];
 
-      // Deduplicate consecutive identical messages (same algorithm as before)
-      const deduplicatedMessages: string[] = [];
-      if (combinedMessages.length > 0) {
-        deduplicatedMessages.push(combinedMessages[0]); // Add the newest one unconditionally
-        for (let i = 1; i < combinedMessages.length; i++) {
-          if (combinedMessages[i] !== combinedMessages[i - 1]) {
-            deduplicatedMessages.push(combinedMessages[i]);
-          }
+    // Deduplicate consecutive identical messages (same algorithm as before)
+    const deduplicatedMessages: string[] = [];
+    if (combinedMessages.length > 0) {
+      deduplicatedMessages.push(combinedMessages[0]); // Add the newest one unconditionally
+      for (let i = 1; i < combinedMessages.length; i++) {
+        if (combinedMessages[i] !== combinedMessages[i - 1]) {
+          deduplicatedMessages.push(combinedMessages[i]);
         }
       }
+    }
 
-      // Reverse to oldest first for useInputHistory
-      setInputHistory(deduplicatedMessages.reverse());
-    },
-    [],
-  );
+    // Reverse to oldest first for useInputHistory
+    setInputHistory(deduplicatedMessages.reverse());
+  }, []);
 
   /**
    * Initialize input history from logger with past session data.
@@ -70,10 +65,7 @@ export function useInputHistoryStore(): UseInputHistoryStoreReturn {
         setIsInitialized(true);
       } catch (error) {
         // Start with empty history even if logger initialization fails
-        debugLogger.warn(
-          'Failed to initialize input history from logger:',
-          error,
-        );
+        debugLogger.warn("Failed to initialize input history from logger:", error);
         setPastSessionMessages([]);
         recalculateHistory([], []);
         setIsInitialized(true);
diff --git a/packages/ui-gemini/src/ui/hooks/useKeypress.test.tsx b/packages/ui-gemini/src/ui/hooks/useKeypress.test.tsx
index ebbc5eef8..615135fd6 100644
--- a/packages/ui-gemini/src/ui/hooks/useKeypress.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useKeypress.test.tsx
@@ -4,25 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { useKeypress } from './useKeypress.js';
-import { KeypressProvider } from '../contexts/KeypressContext.js';
-import { useStdin } from 'ink';
-import { EventEmitter } from 'node:events';
-import type { Mock } from 'vitest';
+import { EventEmitter } from "node:events";
+import { useStdin } from "ink";
+import { act } from "react";
+import type { Mock } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { KeypressProvider } from "../contexts/KeypressContext.js";
+import { useKeypress } from "./useKeypress.js";
 
 // Mock the 'ink' module to control stdin
-vi.mock('ink', async (importOriginal) => {
-  const original = await importOriginal<typeof import('ink')>();
+vi.mock("ink", async (importOriginal) => {
+  const original = await importOriginal<typeof import("ink")>();
   return {
     ...original,
     useStdin: vi.fn(),
   };
 });
 
-const PASTE_START = '\x1B[200~';
-const PASTE_END = '\x1B[201~';
+const PASTE_START = "\x1B[200~";
+const PASTE_END = "\x1B[201~";
 
 class MockStdin extends EventEmitter {
   isTTY = true;
@@ -34,7 +34,7 @@ class MockStdin extends EventEmitter {
   pause = vi.fn();
 
   write(text: string) {
-    this.emit('data', text);
+    this.emit("data", text);
   }
 }
 
@@ -70,48 +70,48 @@ describe(`useKeypress`, () => {
   });
 
   afterEach(() => {
-    Object.defineProperty(process.versions, 'node', {
+    Object.defineProperty(process.versions, "node", {
       value: originalNodeVersion,
       configurable: true,
     });
   });
 
-  it('should not listen if isActive is false', () => {
+  it("should not listen if isActive is false", () => {
     renderKeypressHook(false);
-    act(() => stdin.write('a'));
+    act(() => stdin.write("a"));
     expect(onKeypress).not.toHaveBeenCalled();
   });
 
   it.each([
-    { key: { name: 'a', sequence: 'a' } },
-    { key: { name: 'left', sequence: '\x1b[D' } },
-    { key: { name: 'right', sequence: '\x1b[C' } },
-    { key: { name: 'up', sequence: '\x1b[A' } },
-    { key: { name: 'down', sequence: '\x1b[B' } },
-    { key: { name: 'tab', sequence: '\x1b[Z', shift: true } },
-  ])('should listen for keypress when active for key $key.name', ({ key }) => {
+    { key: { name: "a", sequence: "a" } },
+    { key: { name: "left", sequence: "\x1b[D" } },
+    { key: { name: "right", sequence: "\x1b[C" } },
+    { key: { name: "up", sequence: "\x1b[A" } },
+    { key: { name: "down", sequence: "\x1b[B" } },
+    { key: { name: "tab", sequence: "\x1b[Z", shift: true } },
+  ])("should listen for keypress when active for key $key.name", ({ key }) => {
     renderKeypressHook(true);
     act(() => stdin.write(key.sequence));
     expect(onKeypress).toHaveBeenCalledWith(expect.objectContaining(key));
   });
 
-  it('should set and release raw mode', () => {
+  it("should set and release raw mode", () => {
     const { unmount } = renderKeypressHook(true);
     expect(mockSetRawMode).toHaveBeenCalledWith(true);
     unmount();
     expect(mockSetRawMode).toHaveBeenCalledWith(false);
   });
 
-  it('should stop listening after being unmounted', () => {
+  it("should stop listening after being unmounted", () => {
     const { unmount } = renderKeypressHook(true);
     unmount();
-    act(() => stdin.write('a'));
+    act(() => stdin.write("a"));
     expect(onKeypress).not.toHaveBeenCalled();
   });
 
-  it('should correctly identify alt+enter (meta key)', () => {
+  it("should correctly identify alt+enter (meta key)", () => {
     renderKeypressHook(true);
-    const key = { name: 'return', sequence: '\x1B\r' };
+    const key = { name: "return", sequence: "\x1B\r" };
     act(() => stdin.write(key.sequence));
     expect(onKeypress).toHaveBeenCalledWith(
       expect.objectContaining({ ...key, meta: true, paste: false }),
@@ -120,26 +120,26 @@ describe(`useKeypress`, () => {
 
   describe.each([
     {
-      description: 'PASTE_WORKAROUND true',
-      setup: () => vi.stubEnv('PASTE_WORKAROUND', 'true'),
+      description: "PASTE_WORKAROUND true",
+      setup: () => vi.stubEnv("PASTE_WORKAROUND", "true"),
     },
     {
-      description: 'PASTE_WORKAROUND false',
-      setup: () => vi.stubEnv('PASTE_WORKAROUND', 'false'),
+      description: "PASTE_WORKAROUND false",
+      setup: () => vi.stubEnv("PASTE_WORKAROUND", "false"),
     },
-  ])('in $description', ({ setup }) => {
+  ])("in $description", ({ setup }) => {
     beforeEach(() => {
       setup();
     });
 
-    it('should process a paste as a single event', () => {
+    it("should process a paste as a single event", () => {
       renderKeypressHook(true);
-      const pasteText = 'hello world';
+      const pasteText = "hello world";
       act(() => stdin.write(PASTE_START + pasteText + PASTE_END));
 
       expect(onKeypress).toHaveBeenCalledTimes(1);
       expect(onKeypress).toHaveBeenCalledWith({
-        name: '',
+        name: "",
         ctrl: false,
         meta: false,
         shift: false,
@@ -149,34 +149,30 @@ describe(`useKeypress`, () => {
       });
     });
 
-    it('should handle keypress interspersed with pastes', () => {
+    it("should handle keypress interspersed with pastes", () => {
       renderKeypressHook(true);
 
-      const keyA = { name: 'a', sequence: 'a' };
-      act(() => stdin.write('a'));
-      expect(onKeypress).toHaveBeenCalledWith(
-        expect.objectContaining({ ...keyA, paste: false }),
-      );
+      const keyA = { name: "a", sequence: "a" };
+      act(() => stdin.write("a"));
+      expect(onKeypress).toHaveBeenCalledWith(expect.objectContaining({ ...keyA, paste: false }));
 
-      const pasteText = 'pasted';
+      const pasteText = "pasted";
       act(() => stdin.write(PASTE_START + pasteText + PASTE_END));
       expect(onKeypress).toHaveBeenCalledWith(
         expect.objectContaining({ paste: true, sequence: pasteText }),
       );
 
-      const keyB = { name: 'b', sequence: 'b' };
-      act(() => stdin.write('b'));
-      expect(onKeypress).toHaveBeenCalledWith(
-        expect.objectContaining({ ...keyB, paste: false }),
-      );
+      const keyB = { name: "b", sequence: "b" };
+      act(() => stdin.write("b"));
+      expect(onKeypress).toHaveBeenCalledWith(expect.objectContaining({ ...keyB, paste: false }));
 
       expect(onKeypress).toHaveBeenCalledTimes(3);
     });
 
-    it('should handle lone pastes', () => {
+    it("should handle lone pastes", () => {
       renderKeypressHook(true);
 
-      const pasteText = 'pasted';
+      const pasteText = "pasted";
       act(() => {
         stdin.write(PASTE_START);
         stdin.write(pasteText);
@@ -189,37 +185,26 @@ describe(`useKeypress`, () => {
       expect(onKeypress).toHaveBeenCalledTimes(1);
     });
 
-    it('should handle paste false alarm', async () => {
+    it("should handle paste false alarm", async () => {
       renderKeypressHook(true);
 
       act(() => {
         stdin.write(PASTE_START.slice(0, 5));
-        stdin.write('do');
+        stdin.write("do");
       });
 
-      expect(onKeypress).toHaveBeenCalledWith(
-        expect.objectContaining({ sequence: '\x1B[200d' }),
-      );
-      expect(onKeypress).toHaveBeenCalledWith(
-        expect.objectContaining({ sequence: 'o' }),
-      );
+      expect(onKeypress).toHaveBeenCalledWith(expect.objectContaining({ sequence: "\x1B[200d" }));
+      expect(onKeypress).toHaveBeenCalledWith(expect.objectContaining({ sequence: "o" }));
       expect(onKeypress).toHaveBeenCalledTimes(2);
     });
 
-    it('should handle back to back pastes', () => {
+    it("should handle back to back pastes", () => {
       renderKeypressHook(true);
 
-      const pasteText1 = 'herp';
-      const pasteText2 = 'derp';
+      const pasteText1 = "herp";
+      const pasteText2 = "derp";
       act(() => {
-        stdin.write(
-          PASTE_START +
-            pasteText1 +
-            PASTE_END +
-            PASTE_START +
-            pasteText2 +
-            PASTE_END,
-        );
+        stdin.write(PASTE_START + pasteText1 + PASTE_END + PASTE_START + pasteText2 + PASTE_END);
       });
       expect(onKeypress).toHaveBeenCalledWith(
         expect.objectContaining({ paste: true, sequence: pasteText1 }),
@@ -231,16 +216,14 @@ describe(`useKeypress`, () => {
       expect(onKeypress).toHaveBeenCalledTimes(2);
     });
 
-    it('should handle pastes split across writes', async () => {
+    it("should handle pastes split across writes", async () => {
       renderKeypressHook(true);
 
-      const keyA = { name: 'a', sequence: 'a' };
-      act(() => stdin.write('a'));
-      expect(onKeypress).toHaveBeenCalledWith(
-        expect.objectContaining({ ...keyA, paste: false }),
-      );
+      const keyA = { name: "a", sequence: "a" };
+      act(() => stdin.write("a"));
+      expect(onKeypress).toHaveBeenCalledWith(expect.objectContaining({ ...keyA, paste: false }));
 
-      const pasteText = 'pasted';
+      const pasteText = "pasted";
       await act(async () => {
         stdin.write(PASTE_START.slice(0, 3));
         vi.advanceTimersByTime(40);
@@ -254,11 +237,9 @@ describe(`useKeypress`, () => {
         expect.objectContaining({ paste: true, sequence: pasteText }),
       );
 
-      const keyB = { name: 'b', sequence: 'b' };
-      act(() => stdin.write('b'));
-      expect(onKeypress).toHaveBeenCalledWith(
-        expect.objectContaining({ ...keyB, paste: false }),
-      );
+      const keyB = { name: "b", sequence: "b" };
+      act(() => stdin.write("b"));
+      expect(onKeypress).toHaveBeenCalledWith(expect.objectContaining({ ...keyB, paste: false }));
 
       expect(onKeypress).toHaveBeenCalledTimes(3);
     });
diff --git a/packages/ui-gemini/src/ui/hooks/useKeypress.ts b/packages/ui-gemini/src/ui/hooks/useKeypress.ts
index 1ff3ae277..e8e203816 100644
--- a/packages/ui-gemini/src/ui/hooks/useKeypress.ts
+++ b/packages/ui-gemini/src/ui/hooks/useKeypress.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
-import type { KeypressHandler, Key } from '../contexts/KeypressContext.js';
-import { useKeypressContext } from '../contexts/KeypressContext.js';
+import { useEffect } from "react";
+import type { Key, KeypressHandler } from "../contexts/KeypressContext.js";
+import { useKeypressContext } from "../contexts/KeypressContext.js";
 
 export type { Key };
 
@@ -17,10 +17,7 @@ export type { Key };
  * @param options - Options to control the hook's behavior.
  * @param options.isActive - Whether the hook should be actively listening for input.
  */
-export function useKeypress(
-  onKeypress: KeypressHandler,
-  { isActive }: { isActive: boolean },
-) {
+export function useKeypress(onKeypress: KeypressHandler, { isActive }: { isActive: boolean }) {
   const { subscribe, unsubscribe } = useKeypressContext();
 
   useEffect(() => {
diff --git a/packages/ui-gemini/src/ui/hooks/useKittyKeyboardProtocol.ts b/packages/ui-gemini/src/ui/hooks/useKittyKeyboardProtocol.ts
index 4a89b165b..0ecf58cd5 100644
--- a/packages/ui-gemini/src/ui/hooks/useKittyKeyboardProtocol.ts
+++ b/packages/ui-gemini/src/ui/hooks/useKittyKeyboardProtocol.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState } from 'react';
-import { isKittyProtocolEnabled } from '../utils/kittyProtocolDetector.js';
+import { useState } from "react";
+import { isKittyProtocolEnabled } from "../utils/kittyProtocolDetector.js";
 
 export interface KittyProtocolStatus {
   enabled: boolean;
diff --git a/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.test.tsx b/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.test.tsx
index 14270019a..a2239ef1d 100644
--- a/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.test.tsx
@@ -4,19 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { useLoadingIndicator } from './useLoadingIndicator.js';
-import { StreamingState } from '../types.js';
-import {
-  PHRASE_CHANGE_INTERVAL_MS,
-  INTERACTIVE_SHELL_WAITING_PHRASE,
-} from './usePhraseCycler.js';
-import { WITTY_LOADING_PHRASES } from '../constants/wittyPhrases.js';
-import { INFORMATIVE_TIPS } from '../constants/tips.js';
-
-describe('useLoadingIndicator', () => {
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { INFORMATIVE_TIPS } from "../constants/tips.js";
+import { WITTY_LOADING_PHRASES } from "../constants/wittyPhrases.js";
+import { StreamingState } from "../types.js";
+import { useLoadingIndicator } from "./useLoadingIndicator.js";
+import { INTERACTIVE_SHELL_WAITING_PHRASE, PHRASE_CHANGE_INTERVAL_MS } from "./usePhraseCycler.js";
+
+describe("useLoadingIndicator", () => {
   beforeEach(() => {
     vi.useFakeTimers();
   });
@@ -72,22 +69,16 @@ describe('useLoadingIndicator', () => {
     };
   };
 
-  it('should initialize with default values when Idle', () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
+  it("should initialize with default values when Idle", () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty
     const { result } = renderLoadingIndicatorHook(StreamingState.Idle);
     expect(result.current.elapsedTime).toBe(0);
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(WITTY_LOADING_PHRASES).toContain(result.current.currentLoadingPhrase);
   });
 
-  it('should show interactive shell waiting phrase when isInteractiveShellWaiting is true after 5s', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
-    const { result } = renderLoadingIndicatorHook(
-      StreamingState.Responding,
-      true,
-      1,
-    );
+  it("should show interactive shell waiting phrase when isInteractiveShellWaiting is true after 5s", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty
+    const { result } = renderLoadingIndicatorHook(StreamingState.Responding, true, 1);
 
     // Initially should be witty phrase or tip
     expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(
@@ -98,13 +89,11 @@ describe('useLoadingIndicator', () => {
       await vi.advanceTimersByTimeAsync(5000);
     });
 
-    expect(result.current.currentLoadingPhrase).toBe(
-      INTERACTIVE_SHELL_WAITING_PHRASE,
-    );
+    expect(result.current.currentLoadingPhrase).toBe(INTERACTIVE_SHELL_WAITING_PHRASE);
   });
 
-  it('should reflect values when Responding', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty for subsequent phrases
+  it("should reflect values when Responding", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty for subsequent phrases
     const { result } = renderLoadingIndicatorHook(StreamingState.Responding);
 
     // Initial phrase on first activation will be a tip, not necessarily from witty phrases
@@ -116,15 +105,11 @@ describe('useLoadingIndicator', () => {
     });
 
     // Phrase should cycle if PHRASE_CHANGE_INTERVAL_MS has passed, now it should be witty since first activation already happened
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(WITTY_LOADING_PHRASES).toContain(result.current.currentLoadingPhrase);
   });
 
-  it('should show waiting phrase and retain elapsedTime when WaitingForConfirmation', async () => {
-    const { result, rerender } = renderLoadingIndicatorHook(
-      StreamingState.Responding,
-    );
+  it("should show waiting phrase and retain elapsedTime when WaitingForConfirmation", async () => {
+    const { result, rerender } = renderLoadingIndicatorHook(StreamingState.Responding);
 
     await act(async () => {
       await vi.advanceTimersByTimeAsync(60000);
@@ -135,9 +120,7 @@ describe('useLoadingIndicator', () => {
       rerender({ streamingState: StreamingState.WaitingForConfirmation });
     });
 
-    expect(result.current.currentLoadingPhrase).toBe(
-      'Waiting for user confirmation...',
-    );
+    expect(result.current.currentLoadingPhrase).toBe("Waiting for user confirmation...");
     expect(result.current.elapsedTime).toBe(60); // Elapsed time should be retained
 
     // Timer should not advance further
@@ -147,11 +130,9 @@ describe('useLoadingIndicator', () => {
     expect(result.current.elapsedTime).toBe(60);
   });
 
-  it('should reset elapsedTime and use a witty phrase when transitioning from WaitingForConfirmation to Responding', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
-    const { result, rerender } = renderLoadingIndicatorHook(
-      StreamingState.Responding,
-    );
+  it("should reset elapsedTime and use a witty phrase when transitioning from WaitingForConfirmation to Responding", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty
+    const { result, rerender } = renderLoadingIndicatorHook(StreamingState.Responding);
 
     await act(async () => {
       await vi.advanceTimersByTimeAsync(5000); // 5s
@@ -162,17 +143,13 @@ describe('useLoadingIndicator', () => {
       rerender({ streamingState: StreamingState.WaitingForConfirmation });
     });
     expect(result.current.elapsedTime).toBe(5);
-    expect(result.current.currentLoadingPhrase).toBe(
-      'Waiting for user confirmation...',
-    );
+    expect(result.current.currentLoadingPhrase).toBe("Waiting for user confirmation...");
 
     act(() => {
       rerender({ streamingState: StreamingState.Responding });
     });
     expect(result.current.elapsedTime).toBe(0); // Should reset
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(WITTY_LOADING_PHRASES).toContain(result.current.currentLoadingPhrase);
 
     await act(async () => {
       await vi.advanceTimersByTimeAsync(1000);
@@ -180,11 +157,9 @@ describe('useLoadingIndicator', () => {
     expect(result.current.elapsedTime).toBe(1);
   });
 
-  it('should reset timer and phrase when streamingState changes from Responding to Idle', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
-    const { result, rerender } = renderLoadingIndicatorHook(
-      StreamingState.Responding,
-    );
+  it("should reset timer and phrase when streamingState changes from Responding to Idle", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty
+    const { result, rerender } = renderLoadingIndicatorHook(StreamingState.Responding);
 
     await act(async () => {
       await vi.advanceTimersByTimeAsync(10000); // 10s
@@ -196,9 +171,7 @@ describe('useLoadingIndicator', () => {
     });
 
     expect(result.current.elapsedTime).toBe(0);
-    expect(WITTY_LOADING_PHRASES).toContain(
-      result.current.currentLoadingPhrase,
-    );
+    expect(WITTY_LOADING_PHRASES).toContain(result.current.currentLoadingPhrase);
 
     // Timer should not advance
     await act(async () => {
diff --git a/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.ts b/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.ts
index a39b0c0e2..8b2a4dab6 100644
--- a/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.ts
+++ b/packages/ui-gemini/src/ui/hooks/useLoadingIndicator.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { StreamingState } from '../types.js';
-import { useTimer } from './useTimer.js';
-import { usePhraseCycler } from './usePhraseCycler.js';
-import { useState, useEffect, useRef } from 'react'; // Added useRef
+import { useEffect, useRef, useState } from "react"; // Added useRef
+import { StreamingState } from "../types.js";
+import { usePhraseCycler } from "./usePhraseCycler.js";
+import { useTimer } from "./useTimer.js";
 
 export const useLoadingIndicator = (
   streamingState: StreamingState,
diff --git a/packages/ui-gemini/src/ui/hooks/useLogger.ts b/packages/ui-gemini/src/ui/hooks/useLogger.ts
index 0091a13d8..c2e526c4b 100644
--- a/packages/ui-gemini/src/ui/hooks/useLogger.ts
+++ b/packages/ui-gemini/src/ui/hooks/useLogger.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect } from 'react';
-import type { Storage } from '@airiscode/gemini-cli-core';
-import { sessionId, Logger } from '@airiscode/gemini-cli-core';
+import type { Storage } from "@airiscode/gemini-cli-core";
+import { Logger, sessionId } from "@airiscode/gemini-cli-core";
+import { useEffect, useState } from "react";
 
 /**
  * Hook to manage the logger instance.
diff --git a/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.test.tsx b/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.test.tsx
index c421270d8..1f682d86b 100644
--- a/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.test.tsx
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { vi } from 'vitest';
+import process from "node:process";
+import { vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { MessageType } from "../types.js";
 import {
-  useMemoryMonitor,
   MEMORY_CHECK_INTERVAL,
   MEMORY_WARNING_THRESHOLD,
-} from './useMemoryMonitor.js';
-import process from 'node:process';
-import { MessageType } from '../types.js';
+  useMemoryMonitor,
+} from "./useMemoryMonitor.js";
 
-describe('useMemoryMonitor', () => {
-  const memoryUsageSpy = vi.spyOn(process, 'memoryUsage');
+describe("useMemoryMonitor", () => {
+  const memoryUsageSpy = vi.spyOn(process, "memoryUsage");
   const addItem = vi.fn();
 
   beforeEach(() => {
@@ -32,7 +32,7 @@ describe('useMemoryMonitor', () => {
     return null;
   }
 
-  it('should not warn when memory usage is below threshold', () => {
+  it("should not warn when memory usage is below threshold", () => {
     memoryUsageSpy.mockReturnValue({
       rss: MEMORY_WARNING_THRESHOLD / 2,
     } as NodeJS.MemoryUsage);
@@ -41,7 +41,7 @@ describe('useMemoryMonitor', () => {
     expect(addItem).not.toHaveBeenCalled();
   });
 
-  it('should warn when memory usage is above threshold', () => {
+  it("should warn when memory usage is above threshold", () => {
     memoryUsageSpy.mockReturnValue({
       rss: MEMORY_WARNING_THRESHOLD * 1.5,
     } as NodeJS.MemoryUsage);
@@ -51,13 +51,13 @@ describe('useMemoryMonitor', () => {
     expect(addItem).toHaveBeenCalledWith(
       {
         type: MessageType.WARNING,
-        text: 'High memory usage detected: 10.50 GB. If you experience a crash, please file a bug report by running `/bug`',
+        text: "High memory usage detected: 10.50 GB. If you experience a crash, please file a bug report by running `/bug`",
       },
       expect.any(Number),
     );
   });
 
-  it('should only warn once', () => {
+  it("should only warn once", () => {
     memoryUsageSpy.mockReturnValue({
       rss: MEMORY_WARNING_THRESHOLD * 1.5,
     } as NodeJS.MemoryUsage);
diff --git a/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.ts b/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.ts
index 7573eb0c2..9489cacf1 100644
--- a/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.ts
+++ b/packages/ui-gemini/src/ui/hooks/useMemoryMonitor.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
-import process from 'node:process';
-import { type HistoryItemWithoutId, MessageType } from '../types.js';
+import process from "node:process";
+import { useEffect } from "react";
+import { type HistoryItemWithoutId, MessageType } from "../types.js";
 
 export const MEMORY_WARNING_THRESHOLD = 7 * 1024 * 1024 * 1024; // 7GB in bytes
 export const MEMORY_CHECK_INTERVAL = 60 * 1000; // one minute
@@ -24,11 +24,8 @@ export const useMemoryMonitor = ({ addItem }: MemoryMonitorOptions) => {
           {
             type: MessageType.WARNING,
             text:
-              `High memory usage detected: ${(
-                usage /
-                (1024 * 1024 * 1024)
-              ).toFixed(2)} GB. ` +
-              'If you experience a crash, please file a bug report by running `/bug`',
+              `High memory usage detected: ${(usage / (1024 * 1024 * 1024)).toFixed(2)} GB. ` +
+              "If you experience a crash, please file a bug report by running `/bug`",
           },
           Date.now(),
         );
diff --git a/packages/ui-gemini/src/ui/hooks/useMessageQueue.test.tsx b/packages/ui-gemini/src/ui/hooks/useMessageQueue.test.tsx
index b3464af63..45f920c79 100644
--- a/packages/ui-gemini/src/ui/hooks/useMessageQueue.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useMessageQueue.test.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useMessageQueue } from './useMessageQueue.js';
-import { StreamingState } from '../types.js';
-
-describe('useMessageQueue', () => {
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import { StreamingState } from "../types.js";
+import { useMessageQueue } from "./useMessageQueue.js";
+
+describe("useMessageQueue", () => {
   let mockSubmitQuery: ReturnType<typeof vi.fn>;
 
   beforeEach(() => {
@@ -46,7 +46,7 @@ describe('useMessageQueue', () => {
     };
   };
 
-  it('should initialize with empty queue', () => {
+  it("should initialize with empty queue", () => {
     const { result } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Idle,
@@ -54,10 +54,10 @@ describe('useMessageQueue', () => {
     });
 
     expect(result.current.messageQueue).toEqual([]);
-    expect(result.current.getQueuedMessagesText()).toBe('');
+    expect(result.current.getQueuedMessagesText()).toBe("");
   });
 
-  it('should add messages to queue', () => {
+  it("should add messages to queue", () => {
     const { result } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Responding,
@@ -65,17 +65,14 @@ describe('useMessageQueue', () => {
     });
 
     act(() => {
-      result.current.addMessage('Test message 1');
-      result.current.addMessage('Test message 2');
+      result.current.addMessage("Test message 1");
+      result.current.addMessage("Test message 2");
     });
 
-    expect(result.current.messageQueue).toEqual([
-      'Test message 1',
-      'Test message 2',
-    ]);
+    expect(result.current.messageQueue).toEqual(["Test message 1", "Test message 2"]);
   });
 
-  it('should filter out empty messages', () => {
+  it("should filter out empty messages", () => {
     const { result } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Responding,
@@ -83,19 +80,16 @@ describe('useMessageQueue', () => {
     });
 
     act(() => {
-      result.current.addMessage('Valid message');
-      result.current.addMessage('   '); // Only whitespace
-      result.current.addMessage(''); // Empty
-      result.current.addMessage('Another valid message');
+      result.current.addMessage("Valid message");
+      result.current.addMessage("   "); // Only whitespace
+      result.current.addMessage(""); // Empty
+      result.current.addMessage("Another valid message");
     });
 
-    expect(result.current.messageQueue).toEqual([
-      'Valid message',
-      'Another valid message',
-    ]);
+    expect(result.current.messageQueue).toEqual(["Valid message", "Another valid message"]);
   });
 
-  it('should clear queue', () => {
+  it("should clear queue", () => {
     const { result } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Responding,
@@ -103,10 +97,10 @@ describe('useMessageQueue', () => {
     });
 
     act(() => {
-      result.current.addMessage('Test message');
+      result.current.addMessage("Test message");
     });
 
-    expect(result.current.messageQueue).toEqual(['Test message']);
+    expect(result.current.messageQueue).toEqual(["Test message"]);
 
     act(() => {
       result.current.clearQueue();
@@ -115,7 +109,7 @@ describe('useMessageQueue', () => {
     expect(result.current.messageQueue).toEqual([]);
   });
 
-  it('should return queued messages as text with double newlines', () => {
+  it("should return queued messages as text with double newlines", () => {
     const { result } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Responding,
@@ -123,17 +117,15 @@ describe('useMessageQueue', () => {
     });
 
     act(() => {
-      result.current.addMessage('Message 1');
-      result.current.addMessage('Message 2');
-      result.current.addMessage('Message 3');
+      result.current.addMessage("Message 1");
+      result.current.addMessage("Message 2");
+      result.current.addMessage("Message 3");
     });
 
-    expect(result.current.getQueuedMessagesText()).toBe(
-      'Message 1\n\nMessage 2\n\nMessage 3',
-    );
+    expect(result.current.getQueuedMessagesText()).toBe("Message 1\n\nMessage 2\n\nMessage 3");
   });
 
-  it('should auto-submit queued messages when transitioning to Idle', async () => {
+  it("should auto-submit queued messages when transitioning to Idle", async () => {
     const { result, rerender } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Responding,
@@ -142,22 +134,22 @@ describe('useMessageQueue', () => {
 
     // Add some messages
     act(() => {
-      result.current.addMessage('Message 1');
-      result.current.addMessage('Message 2');
+      result.current.addMessage("Message 1");
+      result.current.addMessage("Message 2");
     });
 
-    expect(result.current.messageQueue).toEqual(['Message 1', 'Message 2']);
+    expect(result.current.messageQueue).toEqual(["Message 1", "Message 2"]);
 
     // Transition to Idle
     rerender({ streamingState: StreamingState.Idle });
 
     await waitFor(() => {
-      expect(mockSubmitQuery).toHaveBeenCalledWith('Message 1\n\nMessage 2');
+      expect(mockSubmitQuery).toHaveBeenCalledWith("Message 1\n\nMessage 2");
       expect(result.current.messageQueue).toEqual([]);
     });
   });
 
-  it('should not auto-submit when queue is empty', () => {
+  it("should not auto-submit when queue is empty", () => {
     const { rerender } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Responding,
@@ -170,7 +162,7 @@ describe('useMessageQueue', () => {
     expect(mockSubmitQuery).not.toHaveBeenCalled();
   });
 
-  it('should not auto-submit when not transitioning to Idle', () => {
+  it("should not auto-submit when not transitioning to Idle", () => {
     const { result, rerender } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Responding,
@@ -179,17 +171,17 @@ describe('useMessageQueue', () => {
 
     // Add messages
     act(() => {
-      result.current.addMessage('Message 1');
+      result.current.addMessage("Message 1");
     });
 
     // Transition to WaitingForConfirmation (not Idle)
     rerender({ streamingState: StreamingState.WaitingForConfirmation });
 
     expect(mockSubmitQuery).not.toHaveBeenCalled();
-    expect(result.current.messageQueue).toEqual(['Message 1']);
+    expect(result.current.messageQueue).toEqual(["Message 1"]);
   });
 
-  it('should handle multiple state transitions correctly', async () => {
+  it("should handle multiple state transitions correctly", async () => {
     const { result, rerender } = renderMessageQueueHook({
       isConfigInitialized: true,
       streamingState: StreamingState.Idle,
@@ -201,14 +193,14 @@ describe('useMessageQueue', () => {
 
     // Add messages while responding
     act(() => {
-      result.current.addMessage('First batch');
+      result.current.addMessage("First batch");
     });
 
     // Go back to idle - should submit
     rerender({ streamingState: StreamingState.Idle });
 
     await waitFor(() => {
-      expect(mockSubmitQuery).toHaveBeenCalledWith('First batch');
+      expect(mockSubmitQuery).toHaveBeenCalledWith("First batch");
       expect(result.current.messageQueue).toEqual([]);
     });
 
@@ -217,20 +209,20 @@ describe('useMessageQueue', () => {
 
     // Add more messages
     act(() => {
-      result.current.addMessage('Second batch');
+      result.current.addMessage("Second batch");
     });
 
     // Go back to idle - should submit again
     rerender({ streamingState: StreamingState.Idle });
 
     await waitFor(() => {
-      expect(mockSubmitQuery).toHaveBeenCalledWith('Second batch');
+      expect(mockSubmitQuery).toHaveBeenCalledWith("Second batch");
       expect(mockSubmitQuery).toHaveBeenCalledTimes(2);
     });
   });
 
-  describe('popAllMessages', () => {
-    it('should pop all messages and return them joined with double newlines', () => {
+  describe("popAllMessages", () => {
+    it("should pop all messages and return them joined with double newlines", () => {
       const { result } = renderMessageQueueHook({
         isConfigInitialized: true,
         streamingState: StreamingState.Responding,
@@ -239,16 +231,12 @@ describe('useMessageQueue', () => {
 
       // Add multiple messages
       act(() => {
-        result.current.addMessage('Message 1');
-        result.current.addMessage('Message 2');
-        result.current.addMessage('Message 3');
+        result.current.addMessage("Message 1");
+        result.current.addMessage("Message 2");
+        result.current.addMessage("Message 3");
       });
 
-      expect(result.current.messageQueue).toEqual([
-        'Message 1',
-        'Message 2',
-        'Message 3',
-      ]);
+      expect(result.current.messageQueue).toEqual(["Message 1", "Message 2", "Message 3"]);
 
       // Pop all messages
       let poppedMessages: string | undefined;
@@ -256,18 +244,18 @@ describe('useMessageQueue', () => {
         poppedMessages = result.current.popAllMessages();
       });
 
-      expect(poppedMessages).toBe('Message 1\n\nMessage 2\n\nMessage 3');
+      expect(poppedMessages).toBe("Message 1\n\nMessage 2\n\nMessage 3");
       expect(result.current.messageQueue).toEqual([]);
     });
 
-    it('should return undefined when queue is empty', () => {
+    it("should return undefined when queue is empty", () => {
       const { result } = renderMessageQueueHook({
         isConfigInitialized: true,
         streamingState: StreamingState.Responding,
         submitQuery: mockSubmitQuery,
       });
 
-      let poppedMessages: string | undefined = 'not-undefined';
+      let poppedMessages: string | undefined = "not-undefined";
       act(() => {
         poppedMessages = result.current.popAllMessages();
       });
@@ -276,7 +264,7 @@ describe('useMessageQueue', () => {
       expect(result.current.messageQueue).toEqual([]);
     });
 
-    it('should handle single message correctly', () => {
+    it("should handle single message correctly", () => {
       const { result } = renderMessageQueueHook({
         isConfigInitialized: true,
         streamingState: StreamingState.Responding,
@@ -284,7 +272,7 @@ describe('useMessageQueue', () => {
       });
 
       act(() => {
-        result.current.addMessage('Single message');
+        result.current.addMessage("Single message");
       });
 
       let poppedMessages: string | undefined;
@@ -292,11 +280,11 @@ describe('useMessageQueue', () => {
         poppedMessages = result.current.popAllMessages();
       });
 
-      expect(poppedMessages).toBe('Single message');
+      expect(poppedMessages).toBe("Single message");
       expect(result.current.messageQueue).toEqual([]);
     });
 
-    it('should clear the entire queue after popping', () => {
+    it("should clear the entire queue after popping", () => {
       const { result } = renderMessageQueueHook({
         isConfigInitialized: true,
         streamingState: StreamingState.Responding,
@@ -304,8 +292,8 @@ describe('useMessageQueue', () => {
       });
 
       act(() => {
-        result.current.addMessage('Message 1');
-        result.current.addMessage('Message 2');
+        result.current.addMessage("Message 1");
+        result.current.addMessage("Message 2");
       });
 
       act(() => {
@@ -314,10 +302,10 @@ describe('useMessageQueue', () => {
 
       // Queue should be empty
       expect(result.current.messageQueue).toEqual([]);
-      expect(result.current.getQueuedMessagesText()).toBe('');
+      expect(result.current.getQueuedMessagesText()).toBe("");
 
       // Popping again should return undefined
-      let secondPop: string | undefined = 'not-undefined';
+      let secondPop: string | undefined = "not-undefined";
       act(() => {
         secondPop = result.current.popAllMessages();
       });
@@ -325,7 +313,7 @@ describe('useMessageQueue', () => {
       expect(secondPop).toBeUndefined();
     });
 
-    it('should work correctly with state updates', () => {
+    it("should work correctly with state updates", () => {
       const { result } = renderMessageQueueHook({
         isConfigInitialized: true,
         streamingState: StreamingState.Responding,
@@ -334,8 +322,8 @@ describe('useMessageQueue', () => {
 
       // Add messages
       act(() => {
-        result.current.addMessage('First');
-        result.current.addMessage('Second');
+        result.current.addMessage("First");
+        result.current.addMessage("Second");
       });
 
       // Pop all messages
@@ -344,12 +332,12 @@ describe('useMessageQueue', () => {
         firstPop = result.current.popAllMessages();
       });
 
-      expect(firstPop).toBe('First\n\nSecond');
+      expect(firstPop).toBe("First\n\nSecond");
 
       // Add new messages after popping
       act(() => {
-        result.current.addMessage('Third');
-        result.current.addMessage('Fourth');
+        result.current.addMessage("Third");
+        result.current.addMessage("Fourth");
       });
 
       // Pop again
@@ -358,7 +346,7 @@ describe('useMessageQueue', () => {
         secondPop = result.current.popAllMessages();
       });
 
-      expect(secondPop).toBe('Third\n\nFourth');
+      expect(secondPop).toBe("Third\n\nFourth");
       expect(result.current.messageQueue).toEqual([]);
     });
   });
diff --git a/packages/ui-gemini/src/ui/hooks/useMessageQueue.ts b/packages/ui-gemini/src/ui/hooks/useMessageQueue.ts
index 58a1e890f..b84979b41 100644
--- a/packages/ui-gemini/src/ui/hooks/useMessageQueue.ts
+++ b/packages/ui-gemini/src/ui/hooks/useMessageQueue.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useEffect, useState } from 'react';
-import { StreamingState } from '../types.js';
+import { useCallback, useEffect, useState } from "react";
+import { StreamingState } from "../types.js";
 
 export interface UseMessageQueueOptions {
   isConfigInitialized: boolean;
@@ -48,8 +48,8 @@ export function useMessageQueue({
 
   // Get all queued messages as a single text string
   const getQueuedMessagesText = useCallback(() => {
-    if (messageQueue.length === 0) return '';
-    return messageQueue.join('\n\n');
+    if (messageQueue.length === 0) return "";
+    return messageQueue.join("\n\n");
   }, [messageQueue]);
 
   // Pop all messages from the queue and return them as a single string
@@ -57,20 +57,16 @@ export function useMessageQueue({
     if (messageQueue.length === 0) {
       return undefined;
     }
-    const allMessages = messageQueue.join('\n\n');
+    const allMessages = messageQueue.join("\n\n");
     setMessageQueue([]);
     return allMessages;
   }, [messageQueue]);
 
   // Process queued messages when streaming becomes idle
   useEffect(() => {
-    if (
-      isConfigInitialized &&
-      streamingState === StreamingState.Idle &&
-      messageQueue.length > 0
-    ) {
+    if (isConfigInitialized && streamingState === StreamingState.Idle && messageQueue.length > 0) {
       // Combine all messages with double newlines for clarity
-      const combinedMessage = messageQueue.join('\n\n');
+      const combinedMessage = messageQueue.join("\n\n");
       // Clear the queue and submit
       setMessageQueue([]);
       submitQuery(combinedMessage);
diff --git a/packages/ui-gemini/src/ui/hooks/useModelCommand.test.tsx b/packages/ui-gemini/src/ui/hooks/useModelCommand.test.tsx
index 7232308cc..b48f1f1d0 100644
--- a/packages/ui-gemini/src/ui/hooks/useModelCommand.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useModelCommand.test.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { useModelCommand } from './useModelCommand.js';
+import { act } from "react";
+import { describe, expect, it } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { useModelCommand } from "./useModelCommand.js";
 
-describe('useModelCommand', () => {
+describe("useModelCommand", () => {
   let result: ReturnType<typeof useModelCommand>;
 
   function TestComponent() {
@@ -17,13 +17,13 @@ describe('useModelCommand', () => {
     return null;
   }
 
-  it('should initialize with the model dialog closed', () => {
+  it("should initialize with the model dialog closed", () => {
     const { unmount } = render(<TestComponent />);
     expect(result.isModelDialogOpen).toBe(false);
     unmount();
   });
 
-  it('should open the model dialog when openModelDialog is called', () => {
+  it("should open the model dialog when openModelDialog is called", () => {
     const { unmount } = render(<TestComponent />);
 
     act(() => {
@@ -34,7 +34,7 @@ describe('useModelCommand', () => {
     unmount();
   });
 
-  it('should close the model dialog when closeModelDialog is called', () => {
+  it("should close the model dialog when closeModelDialog is called", () => {
     const { unmount } = render(<TestComponent />);
 
     // Open it first
diff --git a/packages/ui-gemini/src/ui/hooks/useModelCommand.ts b/packages/ui-gemini/src/ui/hooks/useModelCommand.ts
index c26dcf95a..dfd7d53a6 100644
--- a/packages/ui-gemini/src/ui/hooks/useModelCommand.ts
+++ b/packages/ui-gemini/src/ui/hooks/useModelCommand.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 interface UseModelCommandReturn {
   isModelDialogOpen: boolean;
diff --git a/packages/ui-gemini/src/ui/hooks/useMouse.test.ts b/packages/ui-gemini/src/ui/hooks/useMouse.test.ts
index 2dea0ee16..8d3a9529c 100644
--- a/packages/ui-gemini/src/ui/hooks/useMouse.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useMouse.test.ts
@@ -4,14 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import { renderHook } from '../../test-utils/render.js';
-import { useMouse } from './useMouse.js';
-import { MouseProvider, useMouseContext } from '../contexts/MouseContext.js';
+import { vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { MouseProvider, useMouseContext } from "../contexts/MouseContext.js";
+import { useMouse } from "./useMouse.js";
 
-vi.mock('../contexts/MouseContext.js', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('../contexts/MouseContext.js')>();
+vi.mock("../contexts/MouseContext.js", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("../contexts/MouseContext.js")>();
   const subscribe = vi.fn();
   const unsubscribe = vi.fn();
   return {
@@ -23,14 +22,14 @@ vi.mock('../contexts/MouseContext.js', async (importOriginal) => {
   };
 });
 
-describe('useMouse', () => {
+describe("useMouse", () => {
   const mockOnMouseEvent = vi.fn();
 
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should not subscribe when isActive is false', () => {
+  it("should not subscribe when isActive is false", () => {
     renderHook(() => useMouse(mockOnMouseEvent, { isActive: false }), {
       wrapper: MouseProvider,
     });
@@ -39,7 +38,7 @@ describe('useMouse', () => {
     expect(subscribe).not.toHaveBeenCalled();
   });
 
-  it('should subscribe when isActive is true', () => {
+  it("should subscribe when isActive is true", () => {
     renderHook(() => useMouse(mockOnMouseEvent, { isActive: true }), {
       wrapper: MouseProvider,
     });
@@ -48,21 +47,19 @@ describe('useMouse', () => {
     expect(subscribe).toHaveBeenCalledWith(mockOnMouseEvent);
   });
 
-  it('should unsubscribe on unmount', () => {
-    const { unmount } = renderHook(
-      () => useMouse(mockOnMouseEvent, { isActive: true }),
-      { wrapper: MouseProvider },
-    );
+  it("should unsubscribe on unmount", () => {
+    const { unmount } = renderHook(() => useMouse(mockOnMouseEvent, { isActive: true }), {
+      wrapper: MouseProvider,
+    });
 
     const { unsubscribe } = useMouseContext();
     unmount();
     expect(unsubscribe).toHaveBeenCalledWith(mockOnMouseEvent);
   });
 
-  it('should unsubscribe when isActive becomes false', () => {
+  it("should unsubscribe when isActive becomes false", () => {
     const { rerender } = renderHook(
-      ({ isActive }: { isActive: boolean }) =>
-        useMouse(mockOnMouseEvent, { isActive }),
+      ({ isActive }: { isActive: boolean }) => useMouse(mockOnMouseEvent, { isActive }),
       {
         initialProps: { isActive: true },
         wrapper: MouseProvider,
diff --git a/packages/ui-gemini/src/ui/hooks/useMouse.ts b/packages/ui-gemini/src/ui/hooks/useMouse.ts
index 9db863208..49063e9ca 100644
--- a/packages/ui-gemini/src/ui/hooks/useMouse.ts
+++ b/packages/ui-gemini/src/ui/hooks/useMouse.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect } from 'react';
-import type { MouseHandler, MouseEvent } from '../contexts/MouseContext.js';
-import { useMouseContext } from '../contexts/MouseContext.js';
+import { useEffect } from "react";
+import type { MouseEvent, MouseHandler } from "../contexts/MouseContext.js";
+import { useMouseContext } from "../contexts/MouseContext.js";
 
 export type { MouseEvent };
 
@@ -17,10 +17,7 @@ export type { MouseEvent };
  * @param options - Options to control the hook's behavior.
  * @param options.isActive - Whether the hook should be actively listening for input.
  */
-export function useMouse(
-  onMouseEvent: MouseHandler,
-  { isActive }: { isActive: boolean },
-) {
+export function useMouse(onMouseEvent: MouseHandler, { isActive }: { isActive: boolean }) {
   const { subscribe, unsubscribe } = useMouseContext();
 
   useEffect(() => {
diff --git a/packages/ui-gemini/src/ui/hooks/useMouseClick.test.ts b/packages/ui-gemini/src/ui/hooks/useMouseClick.test.ts
index 5808ed580..bfa439d1d 100644
--- a/packages/ui-gemini/src/ui/hooks/useMouseClick.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useMouseClick.test.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
-import { renderHook } from '../../test-utils/render.js';
-import { useMouseClick } from './useMouseClick.js';
-import { getBoundingBox, type DOMElement } from 'ink';
-import type React from 'react';
+import { type DOMElement, getBoundingBox } from "ink";
+import type React from "react";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { useMouseClick } from "./useMouseClick.js";
 
 // Mock ink
-vi.mock('ink', async () => ({
+vi.mock("ink", async () => ({
   getBoundingBox: vi.fn(),
 }));
 
 // Mock MouseContext
 const mockUseMouse = vi.fn();
-vi.mock('../contexts/MouseContext.js', async () => ({
+vi.mock("../contexts/MouseContext.js", async () => ({
   useMouse: (cb: unknown, opts: unknown) => mockUseMouse(cb, opts),
 }));
 
-describe('useMouseClick', () => {
+describe("useMouseClick", () => {
   let handler: Mock;
   let containerRef: React.RefObject<DOMElement | null>;
 
@@ -31,7 +31,7 @@ describe('useMouseClick', () => {
     containerRef = { current: {} as DOMElement };
   });
 
-  it('should call handler with relative coordinates when click is inside bounds', () => {
+  it("should call handler with relative coordinates when click is inside bounds", () => {
     vi.mocked(getBoundingBox).mockReturnValue({
       x: 10,
       y: 5,
@@ -49,16 +49,12 @@ describe('useMouseClick', () => {
     // Terminal events are 1-based. col 16 -> mouseX 15. row 8 -> mouseY 7.
     // relativeX = 15 - 10 = 5
     // relativeY = 7 - 5 = 2
-    callback({ name: 'left-press', col: 16, row: 8 });
+    callback({ name: "left-press", col: 16, row: 8 });
 
-    expect(handler).toHaveBeenCalledWith(
-      expect.objectContaining({ name: 'left-press' }),
-      5,
-      2,
-    );
+    expect(handler).toHaveBeenCalledWith(expect.objectContaining({ name: "left-press" }), 5, 2);
   });
 
-  it('should not call handler when click is outside bounds', () => {
+  it("should not call handler when click is outside bounds", () => {
     vi.mocked(getBoundingBox).mockReturnValue({
       x: 10,
       y: 5,
@@ -70,7 +66,7 @@ describe('useMouseClick', () => {
     const callback = mockUseMouse.mock.calls[0][0];
 
     // Click outside: x=5 (col 6), y=7 (row 8) -> left of box
-    callback({ name: 'left-press', col: 6, row: 8 });
+    callback({ name: "left-press", col: 6, row: 8 });
     expect(handler).not.toHaveBeenCalled();
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/useMouseClick.ts b/packages/ui-gemini/src/ui/hooks/useMouseClick.ts
index 18ff9ad6f..7b32ee8fb 100644
--- a/packages/ui-gemini/src/ui/hooks/useMouseClick.ts
+++ b/packages/ui-gemini/src/ui/hooks/useMouseClick.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getBoundingBox, type DOMElement } from 'ink';
-import type React from 'react';
-import { useMouse, type MouseEvent } from '../contexts/MouseContext.js';
+import { type DOMElement, getBoundingBox } from "ink";
+import type React from "react";
+import { type MouseEvent, useMouse } from "../contexts/MouseContext.js";
 
 export const useMouseClick = (
   containerRef: React.RefObject<DOMElement | null>,
   handler: (event: MouseEvent, relativeX: number, relativeY: number) => void,
-  options: { isActive?: boolean; button?: 'left' | 'right' } = {},
+  options: { isActive?: boolean; button?: "left" | "right" } = {},
 ) => {
-  const { isActive = true, button = 'left' } = options;
+  const { isActive = true, button = "left" } = options;
 
   useMouse(
     (event: MouseEvent) => {
-      const eventName = button === 'left' ? 'left-press' : 'right-release';
+      const eventName = button === "left" ? "left-press" : "right-release";
       if (event.name === eventName && containerRef.current) {
         const { x, y, width, height } = getBoundingBox(containerRef.current);
         // Terminal mouse events are 1-based, Ink layout is 0-based.
@@ -27,12 +27,7 @@ export const useMouseClick = (
         const relativeX = mouseX - x;
         const relativeY = mouseY - y;
 
-        if (
-          relativeX >= 0 &&
-          relativeX < width &&
-          relativeY >= 0 &&
-          relativeY < height
-        ) {
+        if (relativeX >= 0 && relativeX < width && relativeY >= 0 && relativeY < height) {
           handler(event, relativeX, relativeY);
         }
       }
diff --git a/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.test.ts b/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.test.ts
index f75cdf93b..cb13fa6c4 100644
--- a/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.test.ts
@@ -4,22 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { usePermissionsModifyTrust } from './usePermissionsModifyTrust.js';
-import { TrustLevel } from '../../config/trustedFolders.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import type { LoadedTrustedFolders } from '../../config/trustedFolders.js';
-import { coreEvents } from '@airiscode/gemini-cli-core';
+import { coreEvents } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import type { LoadedTrustedFolders } from "../../config/trustedFolders.js";
+import { TrustLevel } from "../../config/trustedFolders.js";
+import { renderHook } from "../../test-utils/render.js";
+import { usePermissionsModifyTrust } from "./usePermissionsModifyTrust.js";
 
 // Hoist mocks
 const mockedCwd = vi.hoisted(() => vi.fn());
@@ -28,34 +20,34 @@ const mockedIsWorkspaceTrusted = vi.hoisted(() => vi.fn());
 const mockedUseSettings = vi.hoisted(() => vi.fn());
 
 // Mock modules
-vi.mock('node:process', () => ({
+vi.mock("node:process", () => ({
   cwd: mockedCwd,
 }));
 
-vi.mock('node:path', async (importOriginal) => {
+vi.mock("node:path", async (importOriginal) => {
   const actual = await importOriginal();
   return {
-    ...(actual && typeof actual === 'object' ? actual : {}),
+    ...(actual && typeof actual === "object" ? actual : {}),
     resolve: vi.fn((p) => p),
-    join: vi.fn((...args) => args.join('/')),
+    join: vi.fn((...args) => args.join("/")),
   };
 });
 
-vi.mock('../../config/trustedFolders.js', () => ({
+vi.mock("../../config/trustedFolders.js", () => ({
   loadTrustedFolders: mockedLoadTrustedFolders,
   isWorkspaceTrusted: mockedIsWorkspaceTrusted,
   TrustLevel: {
-    TRUST_FOLDER: 'TRUST_FOLDER',
-    TRUST_PARENT: 'TRUST_PARENT',
-    DO_NOT_TRUST: 'DO_NOT_TRUST',
+    TRUST_FOLDER: "TRUST_FOLDER",
+    TRUST_PARENT: "TRUST_PARENT",
+    DO_NOT_TRUST: "DO_NOT_TRUST",
   },
 }));
 
-vi.mock('../contexts/SettingsContext.js', () => ({
+vi.mock("../contexts/SettingsContext.js", () => ({
   useSettings: mockedUseSettings,
 }));
 
-describe('usePermissionsModifyTrust', () => {
+describe("usePermissionsModifyTrust", () => {
   let mockOnExit: Mock;
   let mockAddItem: Mock;
 
@@ -63,7 +55,7 @@ describe('usePermissionsModifyTrust', () => {
     mockAddItem = vi.fn();
     mockOnExit = vi.fn();
 
-    mockedCwd.mockReturnValue('/test/dir');
+    mockedCwd.mockReturnValue("/test/dir");
     mockedUseSettings.mockReturnValue({
       merged: {
         security: {
@@ -83,14 +75,14 @@ describe('usePermissionsModifyTrust', () => {
     vi.resetAllMocks();
   });
 
-  describe('when targetDirectory is the current workspace', () => {
-    it('should initialize with the correct trust level', () => {
+  describe("when targetDirectory is the current workspace", () => {
+    it("should initialize with the correct trust level", () => {
       mockedLoadTrustedFolders.mockReturnValue({
-        user: { config: { '/test/dir': TrustLevel.TRUST_FOLDER } },
+        user: { config: { "/test/dir": TrustLevel.TRUST_FOLDER } },
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
 
       const { result } = renderHook(() =>
@@ -100,14 +92,14 @@ describe('usePermissionsModifyTrust', () => {
       expect(result.current.currentTrustLevel).toBe(TrustLevel.TRUST_FOLDER);
     });
 
-    it('should detect inherited trust from parent', () => {
+    it("should detect inherited trust from parent", () => {
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
         setValue: vi.fn(),
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
 
       const { result } = renderHook(() =>
@@ -118,13 +110,13 @@ describe('usePermissionsModifyTrust', () => {
       expect(result.current.isInheritedTrustFromIde).toBe(false);
     });
 
-    it('should detect inherited trust from IDE', () => {
+    it("should detect inherited trust from IDE", () => {
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} }, // No explicit trust
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'ide',
+        source: "ide",
       });
 
       const { result } = renderHook(() =>
@@ -135,7 +127,7 @@ describe('usePermissionsModifyTrust', () => {
       expect(result.current.isInheritedTrustFromParent).toBe(false);
     });
 
-    it('should set needsRestart but not save when trust changes', () => {
+    it("should set needsRestart but not save when trust changes", () => {
       const mockSetValue = vi.fn();
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
@@ -143,8 +135,8 @@ describe('usePermissionsModifyTrust', () => {
       } as unknown as LoadedTrustedFolders);
 
       mockedIsWorkspaceTrusted
-        .mockReturnValueOnce({ isTrusted: false, source: 'file' })
-        .mockReturnValueOnce({ isTrusted: true, source: 'file' });
+        .mockReturnValueOnce({ isTrusted: false, source: "file" })
+        .mockReturnValueOnce({ isTrusted: true, source: "file" });
 
       const { result } = renderHook(() =>
         usePermissionsModifyTrust(mockOnExit, mockAddItem, mockedCwd()),
@@ -158,7 +150,7 @@ describe('usePermissionsModifyTrust', () => {
       expect(mockSetValue).not.toHaveBeenCalled();
     });
 
-    it('should save immediately if trust does not change', () => {
+    it("should save immediately if trust does not change", () => {
       const mockSetValue = vi.fn();
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
@@ -167,7 +159,7 @@ describe('usePermissionsModifyTrust', () => {
 
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
 
       const { result } = renderHook(() =>
@@ -179,14 +171,11 @@ describe('usePermissionsModifyTrust', () => {
       });
 
       expect(result.current.needsRestart).toBe(false);
-      expect(mockSetValue).toHaveBeenCalledWith(
-        '/test/dir',
-        TrustLevel.TRUST_PARENT,
-      );
+      expect(mockSetValue).toHaveBeenCalledWith("/test/dir", TrustLevel.TRUST_PARENT);
       expect(mockOnExit).toHaveBeenCalled();
     });
 
-    it('should commit the pending trust level change', () => {
+    it("should commit the pending trust level change", () => {
       const mockSetValue = vi.fn();
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
@@ -194,8 +183,8 @@ describe('usePermissionsModifyTrust', () => {
       } as unknown as LoadedTrustedFolders);
 
       mockedIsWorkspaceTrusted
-        .mockReturnValueOnce({ isTrusted: false, source: 'file' })
-        .mockReturnValueOnce({ isTrusted: true, source: 'file' });
+        .mockReturnValueOnce({ isTrusted: false, source: "file" })
+        .mockReturnValueOnce({ isTrusted: true, source: "file" });
 
       const { result } = renderHook(() =>
         usePermissionsModifyTrust(mockOnExit, mockAddItem, mockedCwd()),
@@ -211,20 +200,17 @@ describe('usePermissionsModifyTrust', () => {
         result.current.commitTrustLevelChange();
       });
 
-      expect(mockSetValue).toHaveBeenCalledWith(
-        '/test/dir',
-        TrustLevel.TRUST_FOLDER,
-      );
+      expect(mockSetValue).toHaveBeenCalledWith("/test/dir", TrustLevel.TRUST_FOLDER);
     });
 
-    it('should add warning when setting DO_NOT_TRUST but still trusted by parent', () => {
+    it("should add warning when setting DO_NOT_TRUST but still trusted by parent", () => {
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
         setValue: vi.fn(),
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
 
       const { result } = renderHook(() =>
@@ -237,21 +223,21 @@ describe('usePermissionsModifyTrust', () => {
 
       expect(mockAddItem).toHaveBeenCalledWith(
         {
-          type: 'warning',
-          text: 'Note: This folder is still trusted because a parent folder is trusted.',
+          type: "warning",
+          text: "Note: This folder is still trusted because a parent folder is trusted.",
         },
         expect.any(Number),
       );
     });
 
-    it('should add warning when setting DO_NOT_TRUST but still trusted by IDE', () => {
+    it("should add warning when setting DO_NOT_TRUST but still trusted by IDE", () => {
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
         setValue: vi.fn(),
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'ide',
+        source: "ide",
       });
 
       const { result } = renderHook(() =>
@@ -264,24 +250,24 @@ describe('usePermissionsModifyTrust', () => {
 
       expect(mockAddItem).toHaveBeenCalledWith(
         {
-          type: 'warning',
-          text: 'Note: This folder is still trusted because the connected IDE workspace is trusted.',
+          type: "warning",
+          text: "Note: This folder is still trusted because the connected IDE workspace is trusted.",
         },
         expect.any(Number),
       );
     });
   });
 
-  describe('when targetDirectory is not the current workspace', () => {
-    const otherDirectory = '/other/dir';
+  describe("when targetDirectory is not the current workspace", () => {
+    const otherDirectory = "/other/dir";
 
-    it('should not detect inherited trust', () => {
+    it("should not detect inherited trust", () => {
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
 
       const { result } = renderHook(() =>
@@ -292,7 +278,7 @@ describe('usePermissionsModifyTrust', () => {
       expect(result.current.isInheritedTrustFromIde).toBe(false);
     });
 
-    it('should save immediately without needing a restart', () => {
+    it("should save immediately without needing a restart", () => {
       const mockSetValue = vi.fn();
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
@@ -300,7 +286,7 @@ describe('usePermissionsModifyTrust', () => {
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: false,
-        source: 'file',
+        source: "file",
       });
 
       const { result } = renderHook(() =>
@@ -312,21 +298,18 @@ describe('usePermissionsModifyTrust', () => {
       });
 
       expect(result.current.needsRestart).toBe(false);
-      expect(mockSetValue).toHaveBeenCalledWith(
-        otherDirectory,
-        TrustLevel.TRUST_FOLDER,
-      );
+      expect(mockSetValue).toHaveBeenCalledWith(otherDirectory, TrustLevel.TRUST_FOLDER);
       expect(mockOnExit).toHaveBeenCalled();
     });
 
-    it('should not add a warning when setting DO_NOT_TRUST', () => {
+    it("should not add a warning when setting DO_NOT_TRUST", () => {
       mockedLoadTrustedFolders.mockReturnValue({
         user: { config: {} },
         setValue: vi.fn(),
       } as unknown as LoadedTrustedFolders);
       mockedIsWorkspaceTrusted.mockReturnValue({
         isTrusted: true,
-        source: 'file',
+        source: "file",
       });
 
       const { result } = renderHook(() =>
@@ -341,9 +324,9 @@ describe('usePermissionsModifyTrust', () => {
     });
   });
 
-  it('should emit feedback when setValue throws in updateTrustLevel', () => {
+  it("should emit feedback when setValue throws in updateTrustLevel", () => {
     const mockSetValue = vi.fn().mockImplementation(() => {
-      throw new Error('test error');
+      throw new Error("test error");
     });
     mockedLoadTrustedFolders.mockReturnValue({
       user: { config: {} },
@@ -352,10 +335,10 @@ describe('usePermissionsModifyTrust', () => {
 
     mockedIsWorkspaceTrusted.mockReturnValue({
       isTrusted: true,
-      source: 'file',
+      source: "file",
     });
 
-    const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
+    const emitFeedbackSpy = vi.spyOn(coreEvents, "emitFeedback");
 
     const { result } = renderHook(() =>
       usePermissionsModifyTrust(mockOnExit, mockAddItem, mockedCwd()),
@@ -366,15 +349,15 @@ describe('usePermissionsModifyTrust', () => {
     });
 
     expect(emitFeedbackSpy).toHaveBeenCalledWith(
-      'error',
-      'Failed to save trust settings. Your changes may not persist.',
+      "error",
+      "Failed to save trust settings. Your changes may not persist.",
     );
     expect(mockOnExit).toHaveBeenCalled();
   });
 
-  it('should emit feedback when setValue throws in commitTrustLevelChange', () => {
+  it("should emit feedback when setValue throws in commitTrustLevelChange", () => {
     const mockSetValue = vi.fn().mockImplementation(() => {
-      throw new Error('test error');
+      throw new Error("test error");
     });
     mockedLoadTrustedFolders.mockReturnValue({
       user: { config: {} },
@@ -382,10 +365,10 @@ describe('usePermissionsModifyTrust', () => {
     } as unknown as LoadedTrustedFolders);
 
     mockedIsWorkspaceTrusted
-      .mockReturnValueOnce({ isTrusted: false, source: 'file' })
-      .mockReturnValueOnce({ isTrusted: true, source: 'file' });
+      .mockReturnValueOnce({ isTrusted: false, source: "file" })
+      .mockReturnValueOnce({ isTrusted: true, source: "file" });
 
-    const emitFeedbackSpy = vi.spyOn(coreEvents, 'emitFeedback');
+    const emitFeedbackSpy = vi.spyOn(coreEvents, "emitFeedback");
 
     const { result } = renderHook(() =>
       usePermissionsModifyTrust(mockOnExit, mockAddItem, mockedCwd()),
@@ -401,8 +384,8 @@ describe('usePermissionsModifyTrust', () => {
     });
 
     expect(emitFeedbackSpy).toHaveBeenCalledWith(
-      'error',
-      'Failed to save trust settings. Your changes may not persist.',
+      "error",
+      "Failed to save trust settings. Your changes may not persist.",
     );
     expect(result.current.needsRestart).toBe(false);
   });
diff --git a/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.ts b/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.ts
index 791d7b4c3..95685c315 100644
--- a/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.ts
+++ b/packages/ui-gemini/src/ui/hooks/usePermissionsModifyTrust.ts
@@ -4,20 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import * as process from 'node:process';
-import * as path from 'node:path';
-import {
-  loadTrustedFolders,
-  TrustLevel,
-  isWorkspaceTrusted,
-} from '../../config/trustedFolders.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-
-import { MessageType } from '../types.js';
-import { type UseHistoryManagerReturn } from './useHistoryManager.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { coreEvents } from '@airiscode/gemini-cli-core';
+import * as path from "node:path";
+import * as process from "node:process";
+import { coreEvents } from "@airiscode/gemini-cli-core";
+import { useCallback, useState } from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { isWorkspaceTrusted, loadTrustedFolders, TrustLevel } from "../../config/trustedFolders.js";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { MessageType } from "../types.js";
+import { type UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 interface TrustState {
   currentTrustLevel: TrustLevel | undefined;
@@ -44,19 +39,18 @@ function getInitialTrustState(
   const { isTrusted, source } = isWorkspaceTrusted(settings.merged);
 
   const isInheritedTrust =
-    isTrusted &&
-    (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
+    isTrusted && (!explicitTrustLevel || explicitTrustLevel === TrustLevel.DO_NOT_TRUST);
 
   return {
     currentTrustLevel: explicitTrustLevel,
-    isInheritedTrustFromParent: !!(source === 'file' && isInheritedTrust),
-    isInheritedTrustFromIde: !!(source === 'ide' && isInheritedTrust),
+    isInheritedTrustFromParent: !!(source === "file" && isInheritedTrust),
+    isInheritedTrustFromIde: !!(source === "ide" && isInheritedTrust),
   };
 }
 
 export const usePermissionsModifyTrust = (
   onExit: () => void,
-  addItem: UseHistoryManagerReturn['addItem'],
+  addItem: UseHistoryManagerReturn["addItem"],
   targetDirectory: string,
 ) => {
   const settings = useSettings();
@@ -64,25 +58,14 @@ export const usePermissionsModifyTrust = (
   // Normalize paths for case-insensitive file systems (macOS/Windows) to ensure
   // accurate comparison between targetDirectory and process.cwd().
   const isCurrentWorkspace =
-    path.resolve(targetDirectory).toLowerCase() ===
-    path.resolve(process.cwd()).toLowerCase();
+    path.resolve(targetDirectory).toLowerCase() === path.resolve(process.cwd()).toLowerCase();
 
-  const [initialState] = useState(() =>
-    getInitialTrustState(settings, cwd, isCurrentWorkspace),
-  );
+  const [initialState] = useState(() => getInitialTrustState(settings, cwd, isCurrentWorkspace));
 
-  const [currentTrustLevel] = useState<TrustLevel | undefined>(
-    initialState.currentTrustLevel,
-  );
-  const [pendingTrustLevel, setPendingTrustLevel] = useState<
-    TrustLevel | undefined
-  >();
-  const [isInheritedTrustFromParent] = useState(
-    initialState.isInheritedTrustFromParent,
-  );
-  const [isInheritedTrustFromIde] = useState(
-    initialState.isInheritedTrustFromIde,
-  );
+  const [currentTrustLevel] = useState<TrustLevel | undefined>(initialState.currentTrustLevel);
+  const [pendingTrustLevel, setPendingTrustLevel] = useState<TrustLevel | undefined>();
+  const [isInheritedTrustFromParent] = useState(initialState.isInheritedTrustFromParent);
+  const [isInheritedTrustFromIde] = useState(initialState.isInheritedTrustFromIde);
   const [needsRestart, setNeedsRestart] = useState(false);
 
   const isFolderTrustEnabled = !!settings.merged.security?.folderTrust?.enabled;
@@ -105,17 +88,13 @@ export const usePermissionsModifyTrust = (
       const currentConfig = loadTrustedFolders().user.config;
       const newConfig = { ...currentConfig, [cwd]: trustLevel };
 
-      const { isTrusted, source } = isWorkspaceTrusted(
-        settings.merged,
-        newConfig,
-      );
+      const { isTrusted, source } = isWorkspaceTrusted(settings.merged, newConfig);
 
       if (trustLevel === TrustLevel.DO_NOT_TRUST && isTrusted) {
         let message =
-          'Note: This folder is still trusted because the connected IDE workspace is trusted.';
-        if (source === 'file') {
-          message =
-            'Note: This folder is still trusted because a parent folder is trusted.';
+          "Note: This folder is still trusted because the connected IDE workspace is trusted.";
+        if (source === "file") {
+          message = "Note: This folder is still trusted because a parent folder is trusted.";
         }
         addItem(
           {
@@ -135,8 +114,8 @@ export const usePermissionsModifyTrust = (
           folders.setValue(cwd, trustLevel);
         } catch (_e) {
           coreEvents.emitFeedback(
-            'error',
-            'Failed to save trust settings. Your changes may not persist.',
+            "error",
+            "Failed to save trust settings. Your changes may not persist.",
           );
         }
         onExit();
@@ -153,8 +132,8 @@ export const usePermissionsModifyTrust = (
         return true;
       } catch (_e) {
         coreEvents.emitFeedback(
-          'error',
-          'Failed to save trust settings. Your changes may not persist.',
+          "error",
+          "Failed to save trust settings. Your changes may not persist.",
         );
         setNeedsRestart(false);
         setPendingTrustLevel(undefined);
diff --git a/packages/ui-gemini/src/ui/hooks/usePhraseCycler.test.tsx b/packages/ui-gemini/src/ui/hooks/usePhraseCycler.test.tsx
index cefa800af..7bd9c490b 100644
--- a/packages/ui-gemini/src/ui/hooks/usePhraseCycler.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/usePhraseCycler.test.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { Text } from 'ink';
+import { Text } from "ink";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { INFORMATIVE_TIPS } from "../constants/tips.js";
+import { WITTY_LOADING_PHRASES } from "../constants/wittyPhrases.js";
 import {
-  usePhraseCycler,
-  PHRASE_CHANGE_INTERVAL_MS,
   INTERACTIVE_SHELL_WAITING_PHRASE,
-} from './usePhraseCycler.js';
-import { INFORMATIVE_TIPS } from '../constants/tips.js';
-import { WITTY_LOADING_PHRASES } from '../constants/wittyPhrases.js';
+  PHRASE_CHANGE_INTERVAL_MS,
+  usePhraseCycler,
+} from "./usePhraseCycler.js";
 
 // Test component to consume the hook
 const TestComponent = ({
@@ -40,7 +40,7 @@ const TestComponent = ({
   return <Text>{phrase}</Text>;
 };
 
-describe('usePhraseCycler', () => {
+describe("usePhraseCycler", () => {
   beforeEach(() => {
     vi.useFakeTimers();
   });
@@ -49,30 +49,24 @@ describe('usePhraseCycler', () => {
     vi.restoreAllMocks();
   });
 
-  it('should initialize with a witty phrase when not active and not waiting', () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
-    const { lastFrame } = render(
-      <TestComponent isActive={false} isWaiting={false} />,
-    );
+  it("should initialize with a witty phrase when not active and not waiting", () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty
+    const { lastFrame } = render(<TestComponent isActive={false} isWaiting={false} />);
     expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
   });
 
   it('should show "Waiting for user confirmation..." when isWaiting is true', async () => {
-    const { lastFrame, rerender } = render(
-      <TestComponent isActive={true} isWaiting={false} />,
-    );
+    const { lastFrame, rerender } = render(<TestComponent isActive={true} isWaiting={false} />);
     rerender(<TestComponent isActive={true} isWaiting={true} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(0);
     });
-    expect(lastFrame()).toBe('Waiting for user confirmation...');
+    expect(lastFrame()).toBe("Waiting for user confirmation...");
   });
 
-  it('should show interactive shell waiting message when isInteractiveShellWaiting is true after 5s', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
-    const { lastFrame, rerender } = render(
-      <TestComponent isActive={true} isWaiting={false} />,
-    );
+  it("should show interactive shell waiting message when isInteractiveShellWaiting is true after 5s", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty
+    const { lastFrame, rerender } = render(<TestComponent isActive={true} isWaiting={false} />);
     rerender(
       <TestComponent
         isActive={true}
@@ -85,9 +79,7 @@ describe('usePhraseCycler', () => {
       await vi.advanceTimersByTimeAsync(0);
     });
     // Should still be showing a witty phrase or tip initially
-    expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(
-      lastFrame(),
-    );
+    expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(lastFrame());
 
     await act(async () => {
       await vi.advanceTimersByTimeAsync(5000);
@@ -95,8 +87,8 @@ describe('usePhraseCycler', () => {
     expect(lastFrame()).toBe(INTERACTIVE_SHELL_WAITING_PHRASE);
   });
 
-  it('should reset interactive shell waiting timer when lastOutputTime changes', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
+  it("should reset interactive shell waiting timer when lastOutputTime changes", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty
     const { lastFrame, rerender } = render(
       <TestComponent
         isActive={true}
@@ -111,9 +103,7 @@ describe('usePhraseCycler', () => {
       await vi.advanceTimersByTimeAsync(3000);
     });
     // Should still be witty phrase or tip
-    expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(
-      lastFrame(),
-    );
+    expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(lastFrame());
 
     // Update lastOutputTime
     rerender(
@@ -130,9 +120,7 @@ describe('usePhraseCycler', () => {
       await vi.advanceTimersByTimeAsync(3000);
     });
     // Should STILL be witty phrase or tip because timer reset
-    expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(
-      lastFrame(),
-    );
+    expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(lastFrame());
 
     // Advance another 2 seconds (total 5s from last output)
     await act(async () => {
@@ -141,14 +129,12 @@ describe('usePhraseCycler', () => {
     expect(lastFrame()).toBe(INTERACTIVE_SHELL_WAITING_PHRASE);
   });
 
-  it('should prioritize interactive shell waiting over normal waiting after 5s', async () => {
-    const { lastFrame, rerender } = render(
-      <TestComponent isActive={true} isWaiting={true} />,
-    );
+  it("should prioritize interactive shell waiting over normal waiting after 5s", async () => {
+    const { lastFrame, rerender } = render(<TestComponent isActive={true} isWaiting={true} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(0);
     });
-    expect(lastFrame()).toBe('Waiting for user confirmation...');
+    expect(lastFrame()).toBe("Waiting for user confirmation...");
 
     rerender(
       <TestComponent
@@ -164,10 +150,8 @@ describe('usePhraseCycler', () => {
     expect(lastFrame()).toBe(INTERACTIVE_SHELL_WAITING_PHRASE);
   });
 
-  it('should not cycle phrases if isActive is false and not waiting', async () => {
-    const { lastFrame } = render(
-      <TestComponent isActive={false} isWaiting={false} />,
-    );
+  it("should not cycle phrases if isActive is false and not waiting", async () => {
+    const { lastFrame } = render(<TestComponent isActive={false} isWaiting={false} />);
     const initialPhrase = lastFrame();
     await act(async () => {
       await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS * 2);
@@ -175,11 +159,9 @@ describe('usePhraseCycler', () => {
     expect(lastFrame()).toBe(initialPhrase);
   });
 
-  it('should show a tip on first activation, then a witty phrase', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.99); // Subsequent phrases are witty
-    const { lastFrame } = render(
-      <TestComponent isActive={true} isWaiting={false} />,
-    );
+  it("should show a tip on first activation, then a witty phrase", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.99); // Subsequent phrases are witty
+    const { lastFrame } = render(<TestComponent isActive={true} isWaiting={false} />);
 
     // Initial phrase on first activation should be a tip
     await act(async () => {
@@ -194,11 +176,9 @@ describe('usePhraseCycler', () => {
     expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
   });
 
-  it('should cycle through phrases when isActive is true and not waiting', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty for subsequent phrases
-    const { lastFrame } = render(
-      <TestComponent isActive={true} isWaiting={false} />,
-    );
+  it("should cycle through phrases when isActive is true and not waiting", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty for subsequent phrases
+    const { lastFrame } = render(<TestComponent isActive={true} isWaiting={false} />);
     // Initial phrase on first activation will be a tip, not necessarily from witty phrases
     await act(async () => {
       await vi.advanceTimersByTimeAsync(0);
@@ -217,10 +197,10 @@ describe('usePhraseCycler', () => {
     expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
   });
 
-  it('should reset to a phrase when isActive becomes true after being false', async () => {
-    const customPhrases = ['Phrase A', 'Phrase B'];
+  it("should reset to a phrase when isActive becomes true after being false", async () => {
+    const customPhrases = ["Phrase A", "Phrase B"];
     let callCount = 0;
-    vi.spyOn(Math, 'random').mockImplementation(() => {
+    vi.spyOn(Math, "random").mockImplementation(() => {
       // For custom phrases, only 1 Math.random call is made per update.
       // 0 -> index 0 ('Phrase A')
       // 0.99 -> index 1 ('Phrase B')
@@ -230,21 +210,11 @@ describe('usePhraseCycler', () => {
     });
 
     const { lastFrame, rerender } = render(
-      <TestComponent
-        isActive={false}
-        isWaiting={false}
-        customPhrases={customPhrases}
-      />,
+      <TestComponent isActive={false} isWaiting={false} customPhrases={customPhrases} />,
     );
 
     // Activate -> On first activation will show tip on initial call, then first interval will use first mock value for 'Phrase A'
-    rerender(
-      <TestComponent
-        isActive={true}
-        isWaiting={false}
-        customPhrases={customPhrases}
-      />,
-    );
+    rerender(<TestComponent isActive={true} isWaiting={false} customPhrases={customPhrases} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // First interval after initial state -> callCount 0 -> 'Phrase A'
     });
@@ -257,13 +227,7 @@ describe('usePhraseCycler', () => {
     expect(customPhrases).toContain(lastFrame()); // Should be one of the custom phrases
 
     // Deactivate -> resets to first phrase in sequence
-    rerender(
-      <TestComponent
-        isActive={false}
-        isWaiting={false}
-        customPhrases={customPhrases}
-      />,
-    );
+    rerender(<TestComponent isActive={false} isWaiting={false} customPhrases={customPhrases} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(0);
     });
@@ -271,38 +235,26 @@ describe('usePhraseCycler', () => {
     expect(customPhrases).toContain(lastFrame());
 
     // Activate again -> this will show a tip on first activation, then cycle from where mock is
-    rerender(
-      <TestComponent
-        isActive={true}
-        isWaiting={false}
-        customPhrases={customPhrases}
-      />,
-    );
+    rerender(<TestComponent isActive={true} isWaiting={false} customPhrases={customPhrases} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // First interval after re-activation -> should contain phrase
     });
     expect(customPhrases).toContain(lastFrame()); // Should be one of the custom phrases
   });
 
-  it('should clear phrase interval on unmount when active', () => {
-    const { unmount } = render(
-      <TestComponent isActive={true} isWaiting={false} />,
-    );
-    const clearIntervalSpy = vi.spyOn(global, 'clearInterval');
+  it("should clear phrase interval on unmount when active", () => {
+    const { unmount } = render(<TestComponent isActive={true} isWaiting={false} />);
+    const clearIntervalSpy = vi.spyOn(global, "clearInterval");
     unmount();
     expect(clearIntervalSpy).toHaveBeenCalledOnce();
   });
 
-  it('should use custom phrases when provided', async () => {
-    const customPhrases = ['Custom Phrase 1', 'Custom Phrase 2'];
-    const randomMock = vi.spyOn(Math, 'random');
+  it("should use custom phrases when provided", async () => {
+    const customPhrases = ["Custom Phrase 1", "Custom Phrase 2"];
+    const randomMock = vi.spyOn(Math, "random");
 
     const { lastFrame, rerender } = render(
-      <TestComponent
-        isActive={true}
-        isWaiting={false}
-        customPhrases={customPhrases}
-      />,
+      <TestComponent isActive={true} isWaiting={false} customPhrases={customPhrases} />,
     );
 
     // After first interval, it should use custom phrases
@@ -311,13 +263,7 @@ describe('usePhraseCycler', () => {
     });
 
     randomMock.mockReturnValue(0);
-    rerender(
-      <TestComponent
-        isActive={true}
-        isWaiting={false}
-        customPhrases={customPhrases}
-      />,
-    );
+    rerender(<TestComponent isActive={true} isWaiting={false} customPhrases={customPhrases} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 100);
     });
@@ -331,11 +277,9 @@ describe('usePhraseCycler', () => {
 
     // Test fallback to default phrases.
     randomMock.mockRestore();
-    vi.spyOn(Math, 'random').mockReturnValue(0.5); // Always witty
+    vi.spyOn(Math, "random").mockReturnValue(0.5); // Always witty
 
-    rerender(
-      <TestComponent isActive={true} isWaiting={false} customPhrases={[]} />,
-    );
+    rerender(<TestComponent isActive={true} isWaiting={false} customPhrases={[]} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // Wait for first cycle
     });
@@ -343,8 +287,8 @@ describe('usePhraseCycler', () => {
     expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
   });
 
-  it('should fall back to witty phrases if custom phrases are an empty array', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty for subsequent phrases
+  it("should fall back to witty phrases if custom phrases are an empty array", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty for subsequent phrases
     const { lastFrame } = render(
       <TestComponent isActive={true} isWaiting={false} customPhrases={[]} />,
     );
@@ -359,11 +303,9 @@ describe('usePhraseCycler', () => {
     expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
   });
 
-  it('should reset phrase when transitioning from waiting to active', async () => {
-    vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty for subsequent phrases
-    const { lastFrame, rerender } = render(
-      <TestComponent isActive={true} isWaiting={false} />,
-    );
+  it("should reset phrase when transitioning from waiting to active", async () => {
+    vi.spyOn(Math, "random").mockImplementation(() => 0.5); // Always witty for subsequent phrases
+    const { lastFrame, rerender } = render(<TestComponent isActive={true} isWaiting={false} />);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(0); // First activation will be a tip
     });
@@ -380,7 +322,7 @@ describe('usePhraseCycler', () => {
     await act(async () => {
       await vi.advanceTimersByTimeAsync(0);
     });
-    expect(lastFrame()).toBe('Waiting for user confirmation...');
+    expect(lastFrame()).toBe("Waiting for user confirmation...");
 
     // Go back to active cycling - should pick a phrase based on the logic (witty due to mock)
     rerender(<TestComponent isActive={true} isWaiting={false} />);
diff --git a/packages/ui-gemini/src/ui/hooks/usePhraseCycler.ts b/packages/ui-gemini/src/ui/hooks/usePhraseCycler.ts
index 969fe4713..0f3ef1267 100644
--- a/packages/ui-gemini/src/ui/hooks/usePhraseCycler.ts
+++ b/packages/ui-gemini/src/ui/hooks/usePhraseCycler.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef } from 'react';
-import { SHELL_FOCUS_HINT_DELAY_MS } from '../constants.js';
-import { INFORMATIVE_TIPS } from '../constants/tips.js';
-import { WITTY_LOADING_PHRASES } from '../constants/wittyPhrases.js';
-import { useInactivityTimer } from './useInactivityTimer.js';
+import { useEffect, useRef, useState } from "react";
+import { INFORMATIVE_TIPS } from "../constants/tips.js";
+import { WITTY_LOADING_PHRASES } from "../constants/wittyPhrases.js";
+import { SHELL_FOCUS_HINT_DELAY_MS } from "../constants.js";
+import { useInactivityTimer } from "./useInactivityTimer.js";
 
 export const PHRASE_CHANGE_INTERVAL_MS = 15000;
 export const INTERACTIVE_SHELL_WAITING_PHRASE =
-  'Interactive shell awaiting input... press Ctrl+f to focus shell';
+  "Interactive shell awaiting input... press Ctrl+f to focus shell";
 
 /**
  * Custom hook to manage cycling through loading phrases.
@@ -30,13 +30,9 @@ export const usePhraseCycler = (
   customPhrases?: string[],
 ) => {
   const loadingPhrases =
-    customPhrases && customPhrases.length > 0
-      ? customPhrases
-      : WITTY_LOADING_PHRASES;
+    customPhrases && customPhrases.length > 0 ? customPhrases : WITTY_LOADING_PHRASES;
 
-  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(
-    loadingPhrases[0],
-  );
+  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(loadingPhrases[0]);
   const showShellFocusHint = useInactivityTimer(
     isInteractiveShellWaiting && lastOutputTime > 0,
     lastOutputTime,
@@ -58,7 +54,7 @@ export const usePhraseCycler = (
     }
 
     if (isWaiting) {
-      setCurrentLoadingPhrase('Waiting for user confirmation...');
+      setCurrentLoadingPhrase("Waiting for user confirmation...");
       return;
     }
 
diff --git a/packages/ui-gemini/src/ui/hooks/usePrivacySettings.test.tsx b/packages/ui-gemini/src/ui/hooks/usePrivacySettings.test.tsx
index 242c243d9..60106ce6f 100644
--- a/packages/ui-gemini/src/ui/hooks/usePrivacySettings.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/usePrivacySettings.test.tsx
@@ -4,25 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import type { Config, CodeAssistServer } from '@airiscode/gemini-cli-core';
-import { UserTierId, getCodeAssistServer } from '@airiscode/gemini-cli-core';
-import { usePrivacySettings } from './usePrivacySettings.js';
-import { waitFor } from '../../test-utils/async.js';
+import type { CodeAssistServer, Config } from "@airiscode/gemini-cli-core";
+import { getCodeAssistServer, UserTierId } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import { usePrivacySettings } from "./usePrivacySettings.js";
 
 // Mock the dependencies
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     getCodeAssistServer: vi.fn(),
   };
 });
 
-describe('usePrivacySettings', () => {
+describe("usePrivacySettings", () => {
   const mockConfig = {} as unknown as Config;
 
   beforeEach(() => {
@@ -45,7 +44,7 @@ describe('usePrivacySettings', () => {
     };
   };
 
-  it('should throw error when content generator is not a CodeAssistServer', async () => {
+  it("should throw error when content generator is not a CodeAssistServer", async () => {
     vi.mocked(getCodeAssistServer).mockReturnValue(undefined);
 
     const { result } = renderPrivacySettingsHook();
@@ -54,13 +53,13 @@ describe('usePrivacySettings', () => {
       expect(result.current.privacyState.isLoading).toBe(false);
     });
 
-    expect(result.current.privacyState.error).toBe('Oauth not being used');
+    expect(result.current.privacyState.error).toBe("Oauth not being used");
   });
 
-  it('should handle paid tier users correctly', async () => {
+  it("should handle paid tier users correctly", async () => {
     // Mock paid tier response
     vi.mocked(getCodeAssistServer).mockReturnValue({
-      projectId: 'test-project-id',
+      projectId: "test-project-id",
       userTier: UserTierId.STANDARD,
     } as unknown as CodeAssistServer);
 
@@ -75,7 +74,7 @@ describe('usePrivacySettings', () => {
     expect(result.current.privacyState.dataCollectionOptIn).toBeUndefined();
   });
 
-  it('should throw error when CodeAssistServer has no projectId', async () => {
+  it("should throw error when CodeAssistServer has no projectId", async () => {
     vi.mocked(getCodeAssistServer).mockReturnValue({
       userTier: UserTierId.FREE,
     } as unknown as CodeAssistServer);
@@ -86,14 +85,12 @@ describe('usePrivacySettings', () => {
       expect(result.current.privacyState.isLoading).toBe(false);
     });
 
-    expect(result.current.privacyState.error).toBe(
-      'CodeAssist server is missing a project ID',
-    );
+    expect(result.current.privacyState.error).toBe("CodeAssist server is missing a project ID");
   });
 
-  it('should update data collection opt-in setting', async () => {
+  it("should update data collection opt-in setting", async () => {
     const mockCodeAssistServer = {
-      projectId: 'test-project-id',
+      projectId: "test-project-id",
       getCodeAssistGlobalUserSetting: vi.fn().mockResolvedValue({
         freeTierDataCollectionOptin: true,
       }),
@@ -121,10 +118,8 @@ describe('usePrivacySettings', () => {
       expect(result.current.privacyState.dataCollectionOptIn).toBe(false);
     });
 
-    expect(
-      mockCodeAssistServer.setCodeAssistGlobalUserSetting,
-    ).toHaveBeenCalledWith({
-      cloudaicompanionProject: 'test-project-id',
+    expect(mockCodeAssistServer.setCodeAssistGlobalUserSetting).toHaveBeenCalledWith({
+      cloudaicompanionProject: "test-project-id",
       freeTierDataCollectionOptin: false,
     });
   });
diff --git a/packages/ui-gemini/src/ui/hooks/usePrivacySettings.ts b/packages/ui-gemini/src/ui/hooks/usePrivacySettings.ts
index 0ce493f76..dc759476f 100644
--- a/packages/ui-gemini/src/ui/hooks/usePrivacySettings.ts
+++ b/packages/ui-gemini/src/ui/hooks/usePrivacySettings.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useCallback } from 'react';
 import {
-  type Config,
   type CodeAssistServer,
-  UserTierId,
+  type Config,
   getCodeAssistServer,
-} from '@airiscode/gemini-cli-core';
+  UserTierId,
+} from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useState } from "react";
 
 export interface PrivacyState {
   isLoading: boolean;
@@ -33,7 +33,7 @@ export const usePrivacySettings = (config: Config) => {
         const server = getCodeAssistServerOrFail(config);
         const tier = server.userTier;
         if (tier === undefined) {
-          throw new Error('Could not determine user tier.');
+          throw new Error("Could not determine user tier.");
         }
         if (tier !== UserTierId.FREE) {
           // We don't need to fetch opt-out info since non-free tier
@@ -91,21 +91,19 @@ export const usePrivacySettings = (config: Config) => {
 function getCodeAssistServerOrFail(config: Config): CodeAssistServer {
   const server = getCodeAssistServer(config);
   if (server === undefined) {
-    throw new Error('Oauth not being used');
+    throw new Error("Oauth not being used");
   } else if (server.projectId === undefined) {
-    throw new Error('CodeAssist server is missing a project ID');
+    throw new Error("CodeAssist server is missing a project ID");
   }
   return server;
 }
 
-async function getRemoteDataCollectionOptIn(
-  server: CodeAssistServer,
-): Promise<boolean> {
+async function getRemoteDataCollectionOptIn(server: CodeAssistServer): Promise<boolean> {
   try {
     const resp = await server.getCodeAssistGlobalUserSetting();
     return resp.freeTierDataCollectionOptin;
   } catch (error: unknown) {
-    if (error && typeof error === 'object' && 'response' in error) {
+    if (error && typeof error === "object" && "response" in error) {
       const gaxiosError = error as {
         response?: {
           status?: unknown;
diff --git a/packages/ui-gemini/src/ui/hooks/usePromptCompletion.ts b/packages/ui-gemini/src/ui/hooks/usePromptCompletion.ts
index 8a3610fdd..27a637641 100644
--- a/packages/ui-gemini/src/ui/hooks/usePromptCompletion.ts
+++ b/packages/ui-gemini/src/ui/hooks/usePromptCompletion.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback, useRef, useEffect, useMemo } from 'react';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { debugLogger, getResponseText } from '@airiscode/gemini-cli-core';
-import type { Content } from '@google/genai';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import { isSlashCommand } from '../utils/commandUtils.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { debugLogger, getResponseText } from "@airiscode/gemini-cli-core";
+import type { Content } from "@google/genai";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import { isSlashCommand } from "../utils/commandUtils.js";
 
 export const PROMPT_COMPLETION_MIN_LENGTH = 5;
 export const PROMPT_COMPLETION_DEBOUNCE_MS = 250;
@@ -34,26 +34,24 @@ export function usePromptCompletion({
   config,
   enabled,
 }: UsePromptCompletionOptions): PromptCompletion {
-  const [ghostText, setGhostText] = useState<string>('');
+  const [ghostText, setGhostText] = useState<string>("");
   const [isLoadingGhostText, setIsLoadingGhostText] = useState<boolean>(false);
   const abortControllerRef = useRef<AbortController | null>(null);
-  const [justSelectedSuggestion, setJustSelectedSuggestion] =
-    useState<boolean>(false);
-  const lastSelectedTextRef = useRef<string>('');
-  const lastRequestedTextRef = useRef<string>('');
+  const [justSelectedSuggestion, setJustSelectedSuggestion] = useState<boolean>(false);
+  const lastSelectedTextRef = useRef<string>("");
+  const lastRequestedTextRef = useRef<string>("");
 
-  const isPromptCompletionEnabled =
-    enabled && (config?.getEnablePromptCompletion() ?? false);
+  const isPromptCompletionEnabled = enabled && (config?.getEnablePromptCompletion() ?? false);
 
   const clearGhostText = useCallback(() => {
-    setGhostText('');
+    setGhostText("");
     setIsLoadingGhostText(false);
   }, []);
 
   const acceptGhostText = useCallback(() => {
     if (ghostText && ghostText.length > buffer.text.length) {
       buffer.setText(ghostText);
-      setGhostText('');
+      setGhostText("");
       setJustSelectedSuggestion(true);
       lastSelectedTextRef.current = ghostText;
     }
@@ -80,11 +78,11 @@ export function usePromptCompletion({
       trimmedText.length < PROMPT_COMPLETION_MIN_LENGTH ||
       !geminiClient ||
       isSlashCommand(trimmedText) ||
-      trimmedText.includes('@') ||
+      trimmedText.includes("@") ||
       !isPromptCompletionEnabled
     ) {
       clearGhostText();
-      lastRequestedTextRef.current = '';
+      lastRequestedTextRef.current = "";
       return;
     }
 
@@ -97,7 +95,7 @@ export function usePromptCompletion({
     try {
       const contents: Content[] = [
         {
-          role: 'user',
+          role: "user",
           parts: [
             {
               text: `You are a professional prompt engineering assistant. Complete the user's partial prompt with expert precision and clarity. User's input: "${trimmedText}" Continue this prompt by adding specific, actionable details that align with the user's intent. Focus on: clear, precise language; structured requirements; professional terminology; measurable outcomes. Length Guidelines: Keep suggestions concise (ideally 10-20 characters); prioritize brevity while maintaining clarity; use essential keywords only; avoid redundant phrases. Start your response with the exact user text ("${trimmedText}") followed by your completion. Provide practical, implementation-focused suggestions rather than creative interpretations. Format: Plain text only. Single completion. Match the user's language. Emphasize conciseness over elaboration.`,
@@ -107,7 +105,7 @@ export function usePromptCompletion({
       ];
 
       const response = await geminiClient.generateContent(
-        { model: 'prompt-completion' },
+        { model: "prompt-completion" },
         contents,
         signal,
       );
@@ -122,10 +120,7 @@ export function usePromptCompletion({
         if (responseText) {
           const suggestionText = responseText.trim();
 
-          if (
-            suggestionText.length > 0 &&
-            suggestionText.startsWith(trimmedText)
-          ) {
+          if (suggestionText.length > 0 && suggestionText.startsWith(trimmedText)) {
             setGhostText(suggestionText);
           } else {
             clearGhostText();
@@ -133,17 +128,12 @@ export function usePromptCompletion({
         }
       }
     } catch (error) {
-      if (
-        !(
-          signal.aborted ||
-          (error instanceof Error && error.name === 'AbortError')
-        )
-      ) {
+      if (!(signal.aborted || (error instanceof Error && error.name === "AbortError"))) {
         debugLogger.warn(
           `[WARN] prompt completion failed: : (${error instanceof Error ? error.message : String(error)})`,
         );
         // Clear the last requested text to allow retry only on real errors
-        lastRequestedTextRef.current = '';
+        lastRequestedTextRef.current = "";
       }
       clearGhostText();
     } finally {
@@ -160,7 +150,7 @@ export function usePromptCompletion({
       return false;
     }
 
-    const lastLine = buffer.lines[cursorRow] || '';
+    const lastLine = buffer.lines[cursorRow] || "";
     return cursorCol === lastLine.length;
   }, [buffer.cursor, buffer.lines]);
 
@@ -178,7 +168,7 @@ export function usePromptCompletion({
 
     if (trimmedText !== lastSelectedTextRef.current) {
       setJustSelectedSuggestion(false);
-      lastSelectedTextRef.current = '';
+      lastSelectedTextRef.current = "";
     }
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -193,10 +183,7 @@ export function usePromptCompletion({
 
   // Debounce prompt completion
   useEffect(() => {
-    const timeoutId = setTimeout(
-      handlePromptCompletion,
-      PROMPT_COMPLETION_DEBOUNCE_MS,
-    );
+    const timeoutId = setTimeout(handlePromptCompletion, PROMPT_COMPLETION_DEBOUNCE_MS);
     return () => clearTimeout(timeoutId);
   }, [buffer.text, buffer.cursor, handlePromptCompletion]);
 
@@ -209,11 +196,7 @@ export function usePromptCompletion({
       return;
     }
 
-    if (
-      ghostText &&
-      currentText.length > 0 &&
-      !ghostText.startsWith(currentText)
-    ) {
+    if (ghostText && currentText.length > 0 && !ghostText.startsWith(currentText)) {
       clearGhostText();
     }
   }, [buffer.text, buffer.cursor, ghostText, clearGhostText, isCursorAtEnd]);
@@ -230,7 +213,7 @@ export function usePromptCompletion({
     return (
       trimmedText.length >= PROMPT_COMPLETION_MIN_LENGTH &&
       !isSlashCommand(trimmedText) &&
-      !trimmedText.includes('@')
+      !trimmedText.includes("@")
     );
   }, [buffer.text, isPromptCompletionEnabled, isCursorAtEnd]);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.test.ts b/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.test.ts
index 0f75850f1..113cd402a 100644
--- a/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.test.ts
@@ -5,39 +5,31 @@
  */
 
 import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type Mock,
-} from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import {
+  AuthType,
   type Config,
-  type FallbackModelHandler,
+  DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_MODEL,
   type FallbackIntent,
-  UserTierId,
-  AuthType,
-  TerminalQuotaError,
-  makeFakeConfig,
+  type FallbackModelHandler,
   type GoogleApiError,
-  RetryableQuotaError,
-  PREVIEW_GEMINI_MODEL,
   ModelNotFoundError,
-  DEFAULT_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
-} from '@airiscode/gemini-cli-core';
-import { useQuotaAndFallback } from './useQuotaAndFallback.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { MessageType } from '../types.js';
+  makeFakeConfig,
+  PREVIEW_GEMINI_MODEL,
+  RetryableQuotaError,
+  TerminalQuotaError,
+  UserTierId,
+} from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { MessageType } from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { useQuotaAndFallback } from "./useQuotaAndFallback.js";
 
 // Use a type alias for SpyInstance as it's not directly exported
 type SpyInstance = ReturnType<typeof vi.spyOn>;
 
-describe('useQuotaAndFallback', () => {
+describe("useQuotaAndFallback", () => {
   let mockConfig: Config;
   let mockHistoryManager: UseHistoryManagerReturn;
   let mockSetModelSwitchedFromQuotaError: Mock;
@@ -48,13 +40,13 @@ describe('useQuotaAndFallback', () => {
     mockConfig = makeFakeConfig();
     mockGoogleApiError = {
       code: 429,
-      message: 'mock error',
+      message: "mock error",
       details: [],
     };
 
     // Spy on the method that requires the private field and mock its return.
     // This is cleaner than modifying the config class for tests.
-    vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
+    vi.spyOn(mockConfig, "getContentGeneratorConfig").mockReturnValue({
       authType: AuthType.LOGIN_WITH_GOOGLE,
     });
 
@@ -67,15 +59,15 @@ describe('useQuotaAndFallback', () => {
     };
     mockSetModelSwitchedFromQuotaError = vi.fn();
 
-    setFallbackHandlerSpy = vi.spyOn(mockConfig, 'setFallbackModelHandler');
-    vi.spyOn(mockConfig, 'setQuotaErrorOccurred');
+    setFallbackHandlerSpy = vi.spyOn(mockConfig, "setFallbackModelHandler");
+    vi.spyOn(mockConfig, "setQuotaErrorOccurred");
   });
 
   afterEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should register a fallback handler on initialization', () => {
+  it("should register a fallback handler on initialization", () => {
     renderHook(() =>
       useQuotaAndFallback({
         config: mockConfig,
@@ -89,7 +81,7 @@ describe('useQuotaAndFallback', () => {
     expect(setFallbackHandlerSpy.mock.calls[0][0]).toBeInstanceOf(Function);
   });
 
-  describe('Fallback Handler Logic', () => {
+  describe("Fallback Handler Logic", () => {
     // Helper function to render the hook and extract the registered handler
     const getRegisteredHandler = (): FallbackModelHandler => {
       renderHook(() =>
@@ -103,21 +95,21 @@ describe('useQuotaAndFallback', () => {
       return setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
     };
 
-    it('should return null and take no action if authType is not LOGIN_WITH_GOOGLE', async () => {
+    it("should return null and take no action if authType is not LOGIN_WITH_GOOGLE", async () => {
       // Override the default mock from beforeEach for this specific test
-      vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
+      vi.spyOn(mockConfig, "getContentGeneratorConfig").mockReturnValue({
         authType: AuthType.USE_GEMINI,
       });
 
       const handler = getRegisteredHandler();
-      const result = await handler('gemini-pro', 'gemini-flash', new Error());
+      const result = await handler("gemini-pro", "gemini-flash", new Error());
 
       expect(result).toBeNull();
       expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
     });
 
-    describe('Interactive Fallback', () => {
-      it('should set an interactive request for a terminal quota error', async () => {
+    describe("Interactive Fallback", () => {
+      it("should set an interactive request for a terminal quota error", async () => {
         const { result } = renderHook(() =>
           useQuotaAndFallback({
             config: mockConfig,
@@ -127,48 +119,43 @@ describe('useQuotaAndFallback', () => {
           }),
         );
 
-        const handler = setFallbackHandlerSpy.mock
-          .calls[0][0] as FallbackModelHandler;
+        const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
 
         let promise: Promise<FallbackIntent | null>;
-        const error = new TerminalQuotaError(
-          'pro quota',
-          mockGoogleApiError,
-          1000 * 60 * 5,
-        ); // 5 minutes
+        const error = new TerminalQuotaError("pro quota", mockGoogleApiError, 1000 * 60 * 5); // 5 minutes
         await act(() => {
-          promise = handler('gemini-pro', 'gemini-flash', error);
+          promise = handler("gemini-pro", "gemini-flash", error);
         });
 
         // The hook should now have a pending request for the UI to handle
         const request = result.current.proQuotaRequest;
         expect(request).not.toBeNull();
-        expect(request?.failedModel).toBe('gemini-pro');
+        expect(request?.failedModel).toBe("gemini-pro");
         expect(request?.isTerminalQuotaError).toBe(true);
 
         const message = request!.message;
-        expect(message).toContain('Usage limit reached for gemini-pro.');
-        expect(message).toContain('Access resets at'); // From getResetTimeMessage
-        expect(message).toContain('/stats for usage details');
-        expect(message).toContain('/auth to switch to API key.');
+        expect(message).toContain("Usage limit reached for gemini-pro.");
+        expect(message).toContain("Access resets at"); // From getResetTimeMessage
+        expect(message).toContain("/stats for usage details");
+        expect(message).toContain("/auth to switch to API key.");
 
         expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
 
         // Simulate the user choosing to continue with the fallback model
         await act(() => {
-          result.current.handleProQuotaChoice('retry_always');
+          result.current.handleProQuotaChoice("retry_always");
         });
 
         // The original promise from the handler should now resolve
         const intent = await promise!;
-        expect(intent).toBe('retry_always');
+        expect(intent).toBe("retry_always");
 
         // The pending request should be cleared from the state
         expect(result.current.proQuotaRequest).toBeNull();
         expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(1);
       });
 
-      it('should handle race conditions by stopping subsequent requests', async () => {
+      it("should handle race conditions by stopping subsequent requests", async () => {
         const { result } = renderHook(() =>
           useQuotaAndFallback({
             config: mockConfig,
@@ -178,15 +165,14 @@ describe('useQuotaAndFallback', () => {
           }),
         );
 
-        const handler = setFallbackHandlerSpy.mock
-          .calls[0][0] as FallbackModelHandler;
+        const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
 
         let promise1: Promise<FallbackIntent | null>;
         await act(() => {
           promise1 = handler(
-            'gemini-pro',
-            'gemini-flash',
-            new TerminalQuotaError('pro quota 1', mockGoogleApiError),
+            "gemini-pro",
+            "gemini-flash",
+            new TerminalQuotaError("pro quota 1", mockGoogleApiError),
           );
         });
 
@@ -196,38 +182,34 @@ describe('useQuotaAndFallback', () => {
         let result2: FallbackIntent | null;
         await act(async () => {
           result2 = await handler(
-            'gemini-pro',
-            'gemini-flash',
-            new TerminalQuotaError('pro quota 2', mockGoogleApiError),
+            "gemini-pro",
+            "gemini-flash",
+            new TerminalQuotaError("pro quota 2", mockGoogleApiError),
           );
         });
 
         // The lock should have stopped the second request
-        expect(result2!).toBe('stop');
+        expect(result2!).toBe("stop");
         expect(result.current.proQuotaRequest).toBe(firstRequest);
 
         await act(() => {
-          result.current.handleProQuotaChoice('retry_always');
+          result.current.handleProQuotaChoice("retry_always");
         });
 
         const intent1 = await promise1!;
-        expect(intent1).toBe('retry_always');
+        expect(intent1).toBe("retry_always");
         expect(result.current.proQuotaRequest).toBeNull();
       });
 
       // Non-TerminalQuotaError test cases
       const testCases = [
         {
-          description: 'generic error',
-          error: new Error('some error'),
+          description: "generic error",
+          error: new Error("some error"),
         },
         {
-          description: 'retryable quota error',
-          error: new RetryableQuotaError(
-            'retryable quota',
-            mockGoogleApiError,
-            5,
-          ),
+          description: "retryable quota error",
+          error: new RetryableQuotaError("retryable quota", mockGoogleApiError, 5),
         },
       ];
 
@@ -238,41 +220,39 @@ describe('useQuotaAndFallback', () => {
               config: mockConfig,
               historyManager: mockHistoryManager,
               userTier: UserTierId.FREE,
-              setModelSwitchedFromQuotaError:
-                mockSetModelSwitchedFromQuotaError,
+              setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
             }),
           );
 
-          const handler = setFallbackHandlerSpy.mock
-            .calls[0][0] as FallbackModelHandler;
+          const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
 
           let promise: Promise<FallbackIntent | null>;
           await act(() => {
-            promise = handler('model-A', 'model-B', error);
+            promise = handler("model-A", "model-B", error);
           });
 
           // The hook should now have a pending request for the UI to handle
           const request = result.current.proQuotaRequest;
           expect(request).not.toBeNull();
-          expect(request?.failedModel).toBe('model-A');
+          expect(request?.failedModel).toBe("model-A");
           expect(request?.isTerminalQuotaError).toBe(false);
 
           // Check that the correct initial message was generated
           expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
           const message = request!.message;
           expect(message).toContain(
-            'model-A is currently experiencing high demand. We apologize and appreciate your patience.',
+            "model-A is currently experiencing high demand. We apologize and appreciate your patience.",
           );
 
           // Simulate the user choosing to continue with the fallback model
           await act(() => {
-            result.current.handleProQuotaChoice('retry_always');
+            result.current.handleProQuotaChoice("retry_always");
           });
 
           expect(mockSetModelSwitchedFromQuotaError).toHaveBeenCalledWith(true);
           // The original promise from the handler should now resolve
           const intent = await promise!;
-          expect(intent).toBe('retry_always');
+          expect(intent).toBe("retry_always");
 
           // The pending request should be cleared from the state
           expect(result.current.proQuotaRequest).toBeNull();
@@ -280,14 +260,13 @@ describe('useQuotaAndFallback', () => {
 
           // Check for the "Switched to fallback model" message
           expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(1);
-          const lastCall = (mockHistoryManager.addItem as Mock).mock
-            .calls[0][0];
+          const lastCall = (mockHistoryManager.addItem as Mock).mock.calls[0][0];
           expect(lastCall.type).toBe(MessageType.INFO);
-          expect(lastCall.text).toContain('Switched to fallback model.');
+          expect(lastCall.text).toContain("Switched to fallback model.");
         });
       }
 
-      it('should handle ModelNotFoundError correctly', async () => {
+      it("should handle ModelNotFoundError correctly", async () => {
         const { result } = renderHook(() =>
           useQuotaAndFallback({
             config: mockConfig,
@@ -297,20 +276,19 @@ describe('useQuotaAndFallback', () => {
           }),
         );
 
-        const handler = setFallbackHandlerSpy.mock
-          .calls[0][0] as FallbackModelHandler;
+        const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
 
         let promise: Promise<FallbackIntent | null>;
-        const error = new ModelNotFoundError('model not found', 404);
+        const error = new ModelNotFoundError("model not found", 404);
 
         await act(() => {
-          promise = handler('gemini-3-pro-preview', 'gemini-2.5-pro', error);
+          promise = handler("gemini-3-pro-preview", "gemini-2.5-pro", error);
         });
 
         // The hook should now have a pending request for the UI to handle
         const request = result.current.proQuotaRequest;
         expect(request).not.toBeNull();
-        expect(request?.failedModel).toBe('gemini-3-pro-preview');
+        expect(request?.failedModel).toBe("gemini-3-pro-preview");
         expect(request?.isTerminalQuotaError).toBe(false);
         expect(request?.isModelNotFoundError).toBe(true);
 
@@ -323,18 +301,18 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
 
         // Simulate the user choosing to switch
         await act(() => {
-          result.current.handleProQuotaChoice('retry_always');
+          result.current.handleProQuotaChoice("retry_always");
         });
 
         const intent = await promise!;
-        expect(intent).toBe('retry_always');
+        expect(intent).toBe("retry_always");
         expect(result.current.proQuotaRequest).toBeNull();
       });
     });
   });
 
-  describe('handleProQuotaChoice', () => {
-    it('should do nothing if there is no pending pro quota request', () => {
+  describe("handleProQuotaChoice", () => {
+    it("should do nothing if there is no pending pro quota request", () => {
       const { result } = renderHook(() =>
         useQuotaAndFallback({
           config: mockConfig,
@@ -345,7 +323,7 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
       );
 
       act(() => {
-        result.current.handleProQuotaChoice('retry_later');
+        result.current.handleProQuotaChoice("retry_later");
       });
 
       expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
@@ -361,23 +339,22 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
         }),
       );
 
-      const handler = setFallbackHandlerSpy.mock
-        .calls[0][0] as FallbackModelHandler;
+      const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
       let promise: Promise<FallbackIntent | null>;
       await act(() => {
         promise = handler(
-          'gemini-pro',
-          'gemini-flash',
-          new TerminalQuotaError('pro quota', mockGoogleApiError),
+          "gemini-pro",
+          "gemini-flash",
+          new TerminalQuotaError("pro quota", mockGoogleApiError),
         );
       });
 
       await act(() => {
-        result.current.handleProQuotaChoice('retry_later');
+        result.current.handleProQuotaChoice("retry_later");
       });
 
       const intent = await promise!;
-      expect(intent).toBe('retry_later');
+      expect(intent).toBe("retry_later");
       expect(result.current.proQuotaRequest).toBeNull();
     });
 
@@ -391,34 +368,33 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
         }),
       );
 
-      const handler = setFallbackHandlerSpy.mock
-        .calls[0][0] as FallbackModelHandler;
+      const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
 
       let promise: Promise<FallbackIntent | null>;
       await act(() => {
         promise = handler(
-          'gemini-pro',
-          'gemini-flash',
-          new TerminalQuotaError('pro quota', mockGoogleApiError),
+          "gemini-pro",
+          "gemini-flash",
+          new TerminalQuotaError("pro quota", mockGoogleApiError),
         );
       });
 
       await act(() => {
-        result.current.handleProQuotaChoice('retry_always');
+        result.current.handleProQuotaChoice("retry_always");
       });
 
       const intent = await promise!;
-      expect(intent).toBe('retry_always');
+      expect(intent).toBe("retry_always");
       expect(result.current.proQuotaRequest).toBeNull();
 
       // Check for the "Switched to fallback model" message
       expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(1);
       const lastCall = (mockHistoryManager.addItem as Mock).mock.calls[0][0];
       expect(lastCall.type).toBe(MessageType.INFO);
-      expect(lastCall.text).toContain('Switched to fallback model.');
+      expect(lastCall.text).toContain("Switched to fallback model.");
     });
 
-    it('should show a special message when falling back from the preview model', async () => {
+    it("should show a special message when falling back from the preview model", async () => {
       const { result } = renderHook(() =>
         useQuotaAndFallback({
           config: mockConfig,
@@ -428,19 +404,18 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
         }),
       );
 
-      const handler = setFallbackHandlerSpy.mock
-        .calls[0][0] as FallbackModelHandler;
+      const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
       let promise: Promise<FallbackIntent | null>;
       await act(() => {
         promise = handler(
           PREVIEW_GEMINI_MODEL,
           DEFAULT_GEMINI_MODEL,
-          new Error('preview model failed'),
+          new Error("preview model failed"),
         );
       });
 
       await act(() => {
-        result.current.handleProQuotaChoice('retry_always');
+        result.current.handleProQuotaChoice("retry_always");
       });
 
       await promise!;
@@ -453,7 +428,7 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
       );
     });
 
-    it('should show a special message when falling back from the preview model, but do not show periodical check message for flash model fallback', async () => {
+    it("should show a special message when falling back from the preview model, but do not show periodical check message for flash model fallback", async () => {
       const { result } = renderHook(() =>
         useQuotaAndFallback({
           config: mockConfig,
@@ -463,19 +438,18 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
         }),
       );
 
-      const handler = setFallbackHandlerSpy.mock
-        .calls[0][0] as FallbackModelHandler;
+      const handler = setFallbackHandlerSpy.mock.calls[0][0] as FallbackModelHandler;
       let promise: Promise<FallbackIntent | null>;
       await act(() => {
         promise = handler(
           PREVIEW_GEMINI_MODEL,
           DEFAULT_GEMINI_FLASH_MODEL,
-          new Error('preview model failed'),
+          new Error("preview model failed"),
         );
       });
 
       await act(() => {
-        result.current.handleProQuotaChoice('retry_always');
+        result.current.handleProQuotaChoice("retry_always");
       });
 
       await promise!;
@@ -483,9 +457,7 @@ To disable Gemini 3, disable "Preview features" in /settings.`,
       expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(1);
       const lastCall = (mockHistoryManager.addItem as Mock).mock.calls[0][0];
       expect(lastCall.type).toBe(MessageType.INFO);
-      expect(lastCall.text).toContain(
-        `Switched to fallback model gemini-2.5-flash.`,
-      );
+      expect(lastCall.text).toContain(`Switched to fallback model gemini-2.5-flash.`);
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.ts b/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.ts
index ef667533a..b38477418 100644
--- a/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.ts
+++ b/packages/ui-gemini/src/ui/hooks/useQuotaAndFallback.ts
@@ -7,18 +7,18 @@
 import {
   AuthType,
   type Config,
-  type FallbackModelHandler,
+  DEFAULT_GEMINI_MODEL,
   type FallbackIntent,
-  TerminalQuotaError,
+  type FallbackModelHandler,
   ModelNotFoundError,
-  type UserTierId,
   PREVIEW_GEMINI_MODEL,
-  DEFAULT_GEMINI_MODEL,
-} from '@airiscode/gemini-cli-core';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { type UseHistoryManagerReturn } from './useHistoryManager.js';
-import { MessageType } from '../types.js';
-import { type ProQuotaDialogRequest } from '../contexts/UIStateContext.js';
+  TerminalQuotaError,
+  type UserTierId,
+} from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { type ProQuotaDialogRequest } from "../contexts/UIStateContext.js";
+import { MessageType } from "../types.js";
+import { type UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 interface UseQuotaAndFallbackArgs {
   config: Config;
@@ -33,8 +33,7 @@ export function useQuotaAndFallback({
   userTier,
   setModelSwitchedFromQuotaError,
 }: UseQuotaAndFallbackArgs) {
-  const [proQuotaRequest, setProQuotaRequest] =
-    useState<ProQuotaDialogRequest | null>(null);
+  const [proQuotaRequest, setProQuotaRequest] = useState<ProQuotaDialogRequest | null>(null);
   const isDialogPending = useRef(false);
 
   // Set up Flash fallback handler
@@ -57,9 +56,8 @@ export function useQuotaAndFallback({
       let isTerminalQuotaError = false;
       let isModelNotFoundError = false;
       const usageLimitReachedModel =
-        failedModel === DEFAULT_GEMINI_MODEL ||
-        failedModel === PREVIEW_GEMINI_MODEL
-          ? 'all Pro models'
+        failedModel === DEFAULT_GEMINI_MODEL || failedModel === PREVIEW_GEMINI_MODEL
+          ? "all Pro models"
           : failedModel;
       if (error instanceof TerminalQuotaError) {
         isTerminalQuotaError = true;
@@ -70,7 +68,7 @@ export function useQuotaAndFallback({
           `/stats for usage details`,
           `/auth to switch to API key.`,
         ].filter(Boolean);
-        message = messageLines.join('\n');
+        message = messageLines.join("\n");
       } else if (error instanceof ModelNotFoundError) {
         isModelNotFoundError = true;
         const messageLines = [
@@ -78,7 +76,7 @@ export function useQuotaAndFallback({
           `Learn more at https://goo.gle/enable-preview-features`,
           `To disable Gemini 3, disable "Preview features" in /settings.`,
         ];
-        message = messageLines.join('\n');
+        message = messageLines.join("\n");
       } else {
         message = `${failedModel} is currently experiencing high demand. We apologize and appreciate your patience.`;
       }
@@ -87,22 +85,20 @@ export function useQuotaAndFallback({
       config.setQuotaErrorOccurred(true);
 
       if (isDialogPending.current) {
-        return 'stop'; // A dialog is already active, so just stop this request.
+        return "stop"; // A dialog is already active, so just stop this request.
       }
       isDialogPending.current = true;
 
-      const intent: FallbackIntent = await new Promise<FallbackIntent>(
-        (resolve) => {
-          setProQuotaRequest({
-            failedModel,
-            fallbackModel,
-            resolve,
-            message,
-            isTerminalQuotaError,
-            isModelNotFoundError,
-          });
-        },
-      );
+      const intent: FallbackIntent = await new Promise<FallbackIntent>((resolve) => {
+        setProQuotaRequest({
+          failedModel,
+          fallbackModel,
+          resolve,
+          message,
+          isTerminalQuotaError,
+          isModelNotFoundError,
+        });
+      });
 
       return intent;
     };
@@ -119,7 +115,7 @@ export function useQuotaAndFallback({
       setProQuotaRequest(null);
       isDialogPending.current = false; // Reset the flag here
 
-      if (choice === 'retry_always') {
+      if (choice === "retry_always") {
         // If we were recovering from a Preview Model failure, show a specific message.
         if (proQuotaRequest.failedModel === PREVIEW_GEMINI_MODEL) {
           const showPeriodicalCheckMessage =
@@ -128,7 +124,7 @@ export function useQuotaAndFallback({
           historyManager.addItem(
             {
               type: MessageType.INFO,
-              text: `Switched to fallback model ${proQuotaRequest.fallbackModel}. ${showPeriodicalCheckMessage ? `We will periodically check if ${PREVIEW_GEMINI_MODEL} is available again.` : ''}`,
+              text: `Switched to fallback model ${proQuotaRequest.fallbackModel}. ${showPeriodicalCheckMessage ? `We will periodically check if ${PREVIEW_GEMINI_MODEL} is available again.` : ""}`,
             },
             Date.now(),
           );
@@ -136,7 +132,7 @@ export function useQuotaAndFallback({
           historyManager.addItem(
             {
               type: MessageType.INFO,
-              text: 'Switched to fallback model.',
+              text: "Switched to fallback model.",
             },
             Date.now(),
           );
@@ -155,10 +151,10 @@ export function useQuotaAndFallback({
 function getResetTimeMessage(delayMs: number): string {
   const resetDate = new Date(Date.now() + delayMs);
 
-  const timeFormatter = new Intl.DateTimeFormat('en-US', {
-    hour: 'numeric',
-    minute: '2-digit',
-    timeZoneName: 'short',
+  const timeFormatter = new Intl.DateTimeFormat("en-US", {
+    hour: "numeric",
+    minute: "2-digit",
+    timeZoneName: "short",
   });
 
   return `Access resets at ${timeFormatter.format(resetDate)}.`;
diff --git a/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.test.ts b/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.test.ts
index 84c0cf875..8cbc2a2fd 100644
--- a/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.test.ts
@@ -4,15 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { CoreToolScheduler } from '@airiscode/gemini-cli-core';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { renderHook } from '../../test-utils/render.js';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { useReactToolScheduler } from './useReactToolScheduler.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { CoreToolScheduler } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { useReactToolScheduler } from "./useReactToolScheduler.js";
 
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     CoreToolScheduler: vi.fn(),
@@ -21,23 +20,18 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
 
 const mockCoreToolScheduler = vi.mocked(CoreToolScheduler);
 
-describe('useReactToolScheduler', () => {
+describe("useReactToolScheduler", () => {
   beforeEach(() => {
     vi.clearAllMocks();
   });
 
-  it('only creates one instance of CoreToolScheduler even if props change', () => {
+  it("only creates one instance of CoreToolScheduler even if props change", () => {
     const onComplete = vi.fn();
     const getPreferredEditor = vi.fn();
     const config = {} as Config;
 
     const { rerender } = renderHook(
-      (props) =>
-        useReactToolScheduler(
-          props.onComplete,
-          props.config,
-          props.getPreferredEditor,
-        ),
+      (props) => useReactToolScheduler(props.onComplete, props.config, props.getPreferredEditor),
       {
         initialProps: {
           onComplete,
diff --git a/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.ts b/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.ts
index 24f4aad9f..5f14b3731 100644
--- a/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.ts
+++ b/packages/ui-gemini/src/ui/hooks/useReactToolScheduler.ts
@@ -5,28 +5,25 @@
  */
 
 import type {
+  AllToolCallsCompleteHandler,
+  CancelledToolCall,
+  CompletedToolCall,
   Config,
-  ToolCallRequestInfo,
+  Status as CoreStatus,
+  EditorType,
   ExecutingToolCall,
+  OutputUpdateHandler,
   ScheduledToolCall,
+  ToolCall,
+  ToolCallRequestInfo,
+  ToolCallsUpdateHandler,
   ValidatingToolCall,
   WaitingToolCall,
-  CompletedToolCall,
-  CancelledToolCall,
-  OutputUpdateHandler,
-  AllToolCallsCompleteHandler,
-  ToolCallsUpdateHandler,
-  ToolCall,
-  Status as CoreStatus,
-  EditorType,
-} from '@airiscode/gemini-cli-core';
-import { CoreToolScheduler, debugLogger } from '@airiscode/gemini-cli-core';
-import { useCallback, useState, useMemo, useEffect, useRef } from 'react';
-import type {
-  HistoryItemToolGroup,
-  IndividualToolCallDisplay,
-} from '../types.js';
-import { ToolCallStatus } from '../types.js';
+} from "@airiscode/gemini-cli-core";
+import { CoreToolScheduler, debugLogger } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { HistoryItemToolGroup, IndividualToolCallDisplay } from "../types.js";
+import { ToolCallStatus } from "../types.js";
 
 export type ScheduleFn = (
   request: ToolCallRequestInfo | ToolCallRequestInfo[],
@@ -76,9 +73,7 @@ export function useReactToolScheduler(
   CancelAllFn,
   number,
 ] {
-  const [toolCallsForDisplay, setToolCallsForDisplay] = useState<
-    TrackedToolCall[]
-  >([]);
+  const [toolCallsForDisplay, setToolCallsForDisplay] = useState<TrackedToolCall[]>([]);
   const [lastToolOutputTime, setLastToolOutputTime] = useState<number>(0);
 
   // Store callbacks in refs to keep them up-to-date without causing re-renders.
@@ -93,21 +88,18 @@ export function useReactToolScheduler(
     getPreferredEditorRef.current = getPreferredEditor;
   }, [getPreferredEditor]);
 
-  const outputUpdateHandler: OutputUpdateHandler = useCallback(
-    (toolCallId, outputChunk) => {
-      setLastToolOutputTime(Date.now());
-      setToolCallsForDisplay((prevCalls) =>
-        prevCalls.map((tc) => {
-          if (tc.request.callId === toolCallId && tc.status === 'executing') {
-            const executingTc = tc as TrackedExecutingToolCall;
-            return { ...executingTc, liveOutput: outputChunk };
-          }
-          return tc;
-        }),
-      );
-    },
-    [],
-  );
+  const outputUpdateHandler: OutputUpdateHandler = useCallback((toolCallId, outputChunk) => {
+    setLastToolOutputTime(Date.now());
+    setToolCallsForDisplay((prevCalls) =>
+      prevCalls.map((tc) => {
+        if (tc.request.callId === toolCallId && tc.status === "executing") {
+          const executingTc = tc as TrackedExecutingToolCall;
+          return { ...executingTc, liveOutput: outputChunk };
+        }
+        return tc;
+      }),
+    );
+  }, []);
 
   const allToolCallsCompleteHandler: AllToolCallsCompleteHandler = useCallback(
     async (completedToolCalls) => {
@@ -119,20 +111,16 @@ export function useReactToolScheduler(
   const toolCallsUpdateHandler: ToolCallsUpdateHandler = useCallback(
     (allCoreToolCalls: ToolCall[]) => {
       setToolCallsForDisplay((prevTrackedCalls) => {
-        const prevCallsMap = new Map(
-          prevTrackedCalls.map((c) => [c.request.callId, c]),
-        );
+        const prevCallsMap = new Map(prevTrackedCalls.map((c) => [c.request.callId, c]));
 
         return allCoreToolCalls.map((coreTc): TrackedToolCall => {
           const existingTrackedCall = prevCallsMap.get(coreTc.request.callId);
 
-          const responseSubmittedToGemini =
-            existingTrackedCall?.responseSubmittedToGemini ?? false;
+          const responseSubmittedToGemini = existingTrackedCall?.responseSubmittedToGemini ?? false;
 
-          if (coreTc.status === 'executing') {
+          if (coreTc.status === "executing") {
             // Preserve live output if it exists from a previous render.
-            const liveOutput = (existingTrackedCall as TrackedExecutingToolCall)
-              ?.liveOutput;
+            const liveOutput = (existingTrackedCall as TrackedExecutingToolCall)?.liveOutput;
             return {
               ...coreTc,
               responseSubmittedToGemini,
@@ -151,10 +139,7 @@ export function useReactToolScheduler(
     [setToolCallsForDisplay],
   );
 
-  const stableGetPreferredEditor = useCallback(
-    () => getPreferredEditorRef.current(),
-    [],
-  );
+  const stableGetPreferredEditor = useCallback(() => getPreferredEditorRef.current(), []);
 
   const scheduler = useMemo(
     () =>
@@ -175,28 +160,20 @@ export function useReactToolScheduler(
   );
 
   const schedule: ScheduleFn = useCallback(
-    (
-      request: ToolCallRequestInfo | ToolCallRequestInfo[],
-      signal: AbortSignal,
-    ) => {
+    (request: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal) => {
       setToolCallsForDisplay([]);
       void scheduler.schedule(request, signal);
     },
     [scheduler, setToolCallsForDisplay],
   );
 
-  const markToolsAsSubmitted: MarkToolsAsSubmittedFn = useCallback(
-    (callIdsToMark: string[]) => {
-      setToolCallsForDisplay((prevCalls) =>
-        prevCalls.map((tc) =>
-          callIdsToMark.includes(tc.request.callId)
-            ? { ...tc, responseSubmittedToGemini: true }
-            : tc,
-        ),
-      );
-    },
-    [],
-  );
+  const markToolsAsSubmitted: MarkToolsAsSubmittedFn = useCallback((callIdsToMark: string[]) => {
+    setToolCallsForDisplay((prevCalls) =>
+      prevCalls.map((tc) =>
+        callIdsToMark.includes(tc.request.callId) ? { ...tc, responseSubmittedToGemini: true } : tc,
+      ),
+    );
+  }, []);
 
   const cancelAllToolCalls = useCallback(
     (signal: AbortSignal) => {
@@ -220,19 +197,19 @@ export function useReactToolScheduler(
  */
 function mapCoreStatusToDisplayStatus(coreStatus: CoreStatus): ToolCallStatus {
   switch (coreStatus) {
-    case 'validating':
+    case "validating":
       return ToolCallStatus.Executing;
-    case 'awaiting_approval':
+    case "awaiting_approval":
       return ToolCallStatus.Confirming;
-    case 'executing':
+    case "executing":
       return ToolCallStatus.Executing;
-    case 'success':
+    case "success":
       return ToolCallStatus.Success;
-    case 'cancelled':
+    case "cancelled":
       return ToolCallStatus.Canceled;
-    case 'error':
+    case "error":
       return ToolCallStatus.Error;
-    case 'scheduled':
+    case "scheduled":
       return ToolCallStatus.Pending;
     default: {
       const exhaustiveCheck: never = coreStatus;
@@ -250,99 +227,94 @@ export function mapToDisplay(
 ): HistoryItemToolGroup {
   const toolCalls = Array.isArray(toolOrTools) ? toolOrTools : [toolOrTools];
 
-  const toolDisplays = toolCalls.map(
-    (trackedCall): IndividualToolCallDisplay => {
-      let displayName: string;
-      let description: string;
-      let renderOutputAsMarkdown = false;
+  const toolDisplays = toolCalls.map((trackedCall): IndividualToolCallDisplay => {
+    let displayName: string;
+    let description: string;
+    let renderOutputAsMarkdown = false;
 
-      if (trackedCall.status === 'error') {
-        displayName =
-          trackedCall.tool === undefined
-            ? trackedCall.request.name
-            : trackedCall.tool.displayName;
-        description = JSON.stringify(trackedCall.request.args);
-      } else {
-        displayName = trackedCall.tool.displayName;
-        description = trackedCall.invocation.getDescription();
-        renderOutputAsMarkdown = trackedCall.tool.isOutputMarkdown;
-      }
+    if (trackedCall.status === "error") {
+      displayName =
+        trackedCall.tool === undefined ? trackedCall.request.name : trackedCall.tool.displayName;
+      description = JSON.stringify(trackedCall.request.args);
+    } else {
+      displayName = trackedCall.tool.displayName;
+      description = trackedCall.invocation.getDescription();
+      renderOutputAsMarkdown = trackedCall.tool.isOutputMarkdown;
+    }
 
-      const baseDisplayProperties: Omit<
-        IndividualToolCallDisplay,
-        'status' | 'resultDisplay' | 'confirmationDetails'
-      > = {
-        callId: trackedCall.request.callId,
-        name: displayName,
-        description,
-        renderOutputAsMarkdown,
-      };
+    const baseDisplayProperties: Omit<
+      IndividualToolCallDisplay,
+      "status" | "resultDisplay" | "confirmationDetails"
+    > = {
+      callId: trackedCall.request.callId,
+      name: displayName,
+      description,
+      renderOutputAsMarkdown,
+    };
 
-      switch (trackedCall.status) {
-        case 'success':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: trackedCall.response.resultDisplay,
-            confirmationDetails: undefined,
-            outputFile: trackedCall.response.outputFile,
-          };
-        case 'error':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: trackedCall.response.resultDisplay,
-            confirmationDetails: undefined,
-          };
-        case 'cancelled':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: trackedCall.response.resultDisplay,
-            confirmationDetails: undefined,
-          };
-        case 'awaiting_approval':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: undefined,
-            confirmationDetails: trackedCall.confirmationDetails,
-          };
-        case 'executing':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay:
-              (trackedCall as TrackedExecutingToolCall).liveOutput ?? undefined,
-            confirmationDetails: undefined,
-            ptyId: (trackedCall as TrackedExecutingToolCall).pid,
-          };
-        case 'validating': // Fallthrough
-        case 'scheduled':
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: undefined,
-            confirmationDetails: undefined,
-          };
-        default: {
-          const exhaustiveCheck: never = trackedCall;
-          return {
-            callId: (exhaustiveCheck as TrackedToolCall).request.callId,
-            name: 'Unknown Tool',
-            description: 'Encountered an unknown tool call state.',
-            status: ToolCallStatus.Error,
-            resultDisplay: 'Unknown tool call state',
-            confirmationDetails: undefined,
-            renderOutputAsMarkdown: false,
-          };
-        }
+    switch (trackedCall.status) {
+      case "success":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: trackedCall.response.resultDisplay,
+          confirmationDetails: undefined,
+          outputFile: trackedCall.response.outputFile,
+        };
+      case "error":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: trackedCall.response.resultDisplay,
+          confirmationDetails: undefined,
+        };
+      case "cancelled":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: trackedCall.response.resultDisplay,
+          confirmationDetails: undefined,
+        };
+      case "awaiting_approval":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: undefined,
+          confirmationDetails: trackedCall.confirmationDetails,
+        };
+      case "executing":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: (trackedCall as TrackedExecutingToolCall).liveOutput ?? undefined,
+          confirmationDetails: undefined,
+          ptyId: (trackedCall as TrackedExecutingToolCall).pid,
+        };
+      case "validating": // Fallthrough
+      case "scheduled":
+        return {
+          ...baseDisplayProperties,
+          status: mapCoreStatusToDisplayStatus(trackedCall.status),
+          resultDisplay: undefined,
+          confirmationDetails: undefined,
+        };
+      default: {
+        const exhaustiveCheck: never = trackedCall;
+        return {
+          callId: (exhaustiveCheck as TrackedToolCall).request.callId,
+          name: "Unknown Tool",
+          description: "Encountered an unknown tool call state.",
+          status: ToolCallStatus.Error,
+          resultDisplay: "Unknown tool call state",
+          confirmationDetails: undefined,
+          renderOutputAsMarkdown: false,
+        };
       }
-    },
-  );
+    }
+  });
 
   return {
-    type: 'tool_group',
+    type: "tool_group",
     tools: toolDisplays,
   };
 }
diff --git a/packages/ui-gemini/src/ui/hooks/useRefreshMemoryCommand.ts b/packages/ui-gemini/src/ui/hooks/useRefreshMemoryCommand.ts
index 025eb9a05..f69c4ad01 100644
--- a/packages/ui-gemini/src/ui/hooks/useRefreshMemoryCommand.ts
+++ b/packages/ui-gemini/src/ui/hooks/useRefreshMemoryCommand.ts
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const REFRESH_MEMORY_COMMAND_NAME = '/refreshmemory';
+export const REFRESH_MEMORY_COMMAND_NAME = "/refreshmemory";
diff --git a/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.test.tsx b/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.test.tsx
index 741e2b04e..8f2de4d1f 100644
--- a/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.test.tsx
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { renderHookWithProviders } from '../../test-utils/render.js';
-import { useReverseSearchCompletion } from './useReverseSearchCompletion.js';
-import { useTextBuffer } from '../components/shared/text-buffer.js';
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { renderHookWithProviders } from "../../test-utils/render.js";
+import { useTextBuffer } from "../components/shared/text-buffer.js";
+import { useReverseSearchCompletion } from "./useReverseSearchCompletion.js";
 
-describe('useReverseSearchCompletion', () => {
+describe("useReverseSearchCompletion", () => {
   beforeEach(() => {
     vi.useFakeTimers();
   });
@@ -29,17 +29,13 @@ describe('useReverseSearchCompletion', () => {
     });
   }
 
-  describe('Core Hook Behavior', () => {
-    describe('State Management', () => {
-      it('should initialize with default state', () => {
-        const mockShellHistory = ['echo hello'];
+  describe("Core Hook Behavior", () => {
+    describe("State Management", () => {
+      it("should initialize with default state", () => {
+        const mockShellHistory = ["echo hello"];
 
         const { result } = renderHookWithProviders(() =>
-          useReverseSearchCompletion(
-            useTextBufferForTest(''),
-            mockShellHistory,
-            false,
-          ),
+          useReverseSearchCompletion(useTextBufferForTest(""), mockShellHistory, false),
         );
 
         expect(result.current.suggestions).toEqual([]);
@@ -49,22 +45,18 @@ describe('useReverseSearchCompletion', () => {
         expect(result.current.isLoadingSuggestions).toBe(false);
       });
 
-      it('should reset state when reverseSearchActive becomes false', () => {
-        const mockShellHistory = ['echo hello'];
+      it("should reset state when reverseSearchActive becomes false", () => {
+        const mockShellHistory = ["echo hello"];
         const { result, rerender } = renderHookWithProviders(
           ({ text, active }) => {
             const textBuffer = useTextBufferForTest(text);
-            return useReverseSearchCompletion(
-              textBuffer,
-              mockShellHistory,
-              active,
-            );
+            return useReverseSearchCompletion(textBuffer, mockShellHistory, active);
           },
-          { initialProps: { text: 'echo', active: true } },
+          { initialProps: { text: "echo", active: true } },
         );
 
         // Simulate reverseSearchActive becoming false
-        rerender({ text: 'echo', active: false });
+        rerender({ text: "echo", active: false });
 
         expect(result.current.suggestions).toEqual([]);
         expect(result.current.activeSuggestionIndex).toBe(-1);
@@ -72,16 +64,12 @@ describe('useReverseSearchCompletion', () => {
         expect(result.current.showSuggestions).toBe(false);
       });
 
-      describe('Navigation', () => {
-        it('should handle navigateUp with no suggestions', () => {
-          const mockShellHistory = ['echo hello'];
+      describe("Navigation", () => {
+        it("should handle navigateUp with no suggestions", () => {
+          const mockShellHistory = ["echo hello"];
 
           const { result } = renderHookWithProviders(() =>
-            useReverseSearchCompletion(
-              useTextBufferForTest('grep'),
-              mockShellHistory,
-              true,
-            ),
+            useReverseSearchCompletion(useTextBufferForTest("grep"), mockShellHistory, true),
           );
 
           act(() => {
@@ -91,14 +79,10 @@ describe('useReverseSearchCompletion', () => {
           expect(result.current.activeSuggestionIndex).toBe(-1);
         });
 
-        it('should handle navigateDown with no suggestions', () => {
-          const mockShellHistory = ['echo hello'];
+        it("should handle navigateDown with no suggestions", () => {
+          const mockShellHistory = ["echo hello"];
           const { result } = renderHookWithProviders(() =>
-            useReverseSearchCompletion(
-              useTextBufferForTest('grep'),
-              mockShellHistory,
-              true,
-            ),
+            useReverseSearchCompletion(useTextBufferForTest("grep"), mockShellHistory, true),
           );
 
           act(() => {
@@ -108,22 +92,18 @@ describe('useReverseSearchCompletion', () => {
           expect(result.current.activeSuggestionIndex).toBe(-1);
         });
 
-        it('should navigate up through suggestions with wrap-around', () => {
+        it("should navigate up through suggestions with wrap-around", () => {
           const mockShellHistory = [
-            'ls -l',
-            'ls -la',
-            'cd /some/path',
-            'git status',
+            "ls -l",
+            "ls -la",
+            "cd /some/path",
+            "git status",
             'echo "Hello, World!"',
-            'echo Hi',
+            "echo Hi",
           ];
 
           const { result } = renderHookWithProviders(() =>
-            useReverseSearchCompletion(
-              useTextBufferForTest('echo'),
-              mockShellHistory,
-              true,
-            ),
+            useReverseSearchCompletion(useTextBufferForTest("echo"), mockShellHistory, true),
           );
 
           expect(result.current.suggestions.length).toBe(2);
@@ -136,21 +116,17 @@ describe('useReverseSearchCompletion', () => {
           expect(result.current.activeSuggestionIndex).toBe(1);
         });
 
-        it('should navigate down through suggestions with wrap-around', () => {
+        it("should navigate down through suggestions with wrap-around", () => {
           const mockShellHistory = [
-            'ls -l',
-            'ls -la',
-            'cd /some/path',
-            'git status',
+            "ls -l",
+            "ls -la",
+            "cd /some/path",
+            "git status",
             'echo "Hello, World!"',
-            'echo Hi',
+            "echo Hi",
           ];
           const { result } = renderHookWithProviders(() =>
-            useReverseSearchCompletion(
-              useTextBufferForTest('ls'),
-              mockShellHistory,
-              true,
-            ),
+            useReverseSearchCompletion(useTextBufferForTest("ls"), mockShellHistory, true),
           );
 
           expect(result.current.suggestions.length).toBe(2);
@@ -163,22 +139,18 @@ describe('useReverseSearchCompletion', () => {
           expect(result.current.activeSuggestionIndex).toBe(1);
         });
 
-        it('should handle navigation with multiple suggestions', () => {
+        it("should handle navigation with multiple suggestions", () => {
           const mockShellHistory = [
-            'ls -l',
-            'ls -la',
-            'cd /some/path/l',
-            'git status',
+            "ls -l",
+            "ls -la",
+            "cd /some/path/l",
+            "git status",
             'echo "Hello, World!"',
             'echo "Hi all"',
           ];
 
           const { result } = renderHookWithProviders(() =>
-            useReverseSearchCompletion(
-              useTextBufferForTest('l'),
-              mockShellHistory,
-              true,
-            ),
+            useReverseSearchCompletion(useTextBufferForTest("l"), mockShellHistory, true),
           );
 
           expect(result.current.suggestions.length).toBe(5);
@@ -210,18 +182,11 @@ describe('useReverseSearchCompletion', () => {
           expect(result.current.activeSuggestionIndex).toBe(4);
         });
 
-        it('should handle navigation with large suggestion lists and scrolling', () => {
-          const largeMockCommands = Array.from(
-            { length: 15 },
-            (_, i) => `echo ${i}`,
-          );
+        it("should handle navigation with large suggestion lists and scrolling", () => {
+          const largeMockCommands = Array.from({ length: 15 }, (_, i) => `echo ${i}`);
 
           const { result } = renderHookWithProviders(() =>
-            useReverseSearchCompletion(
-              useTextBufferForTest('echo'),
-              largeMockCommands,
-              true,
-            ),
+            useReverseSearchCompletion(useTextBufferForTest("echo"), largeMockCommands, true),
           );
 
           expect(result.current.suggestions.length).toBe(15);
@@ -239,25 +204,22 @@ describe('useReverseSearchCompletion', () => {
     });
   });
 
-  describe('Filtering', () => {
-    it('filters history by buffer.text and sets showSuggestions', () => {
-      const history = ['foo', 'barfoo', 'baz'];
+  describe("Filtering", () => {
+    it("filters history by buffer.text and sets showSuggestions", () => {
+      const history = ["foo", "barfoo", "baz"];
       const { result } = renderHookWithProviders(() =>
-        useReverseSearchCompletion(useTextBufferForTest('foo'), history, true),
+        useReverseSearchCompletion(useTextBufferForTest("foo"), history, true),
       );
 
       // should only return the two entries containing "foo"
-      expect(result.current.suggestions.map((s) => s.value)).toEqual([
-        'foo',
-        'barfoo',
-      ]);
+      expect(result.current.suggestions.map((s) => s.value)).toEqual(["foo", "barfoo"]);
       expect(result.current.showSuggestions).toBe(true);
     });
 
-    it('hides suggestions when there are no matches', () => {
-      const history = ['alpha', 'beta'];
+    it("hides suggestions when there are no matches", () => {
+      const history = ["alpha", "beta"];
       const { result } = renderHookWithProviders(() =>
-        useReverseSearchCompletion(useTextBufferForTest('γ'), history, true),
+        useReverseSearchCompletion(useTextBufferForTest("γ"), history, true),
       );
 
       expect(result.current.suggestions).toEqual([]);
diff --git a/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.tsx b/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.tsx
index d90875c10..564c0c9a7 100644
--- a/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useReverseSearchCompletion.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useMemo, useCallback, useRef } from 'react';
-import { useCompletion } from './useCompletion.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import { useCompletion } from "./useCompletion.js";
 
 function useDebouncedValue<T>(value: T, delay = 200): T {
   const [debounced, setDebounced] = useState(value);
@@ -53,37 +53,34 @@ export function useReverseSearchCompletion(
   const debouncedQuery = useDebouncedValue(buffer.text, 100);
 
   // incremental search
-  const prevQueryRef = useRef<string>('');
+  const prevQueryRef = useRef<string>("");
   const prevMatchesRef = useRef<Suggestion[]>([]);
 
   // Clear incremental cache when activating reverse search
   useEffect(() => {
     if (reverseSearchActive) {
-      prevQueryRef.current = '';
+      prevQueryRef.current = "";
       prevMatchesRef.current = [];
     }
   }, [reverseSearchActive]);
 
   // Also clear cache when history changes so new items are considered
   useEffect(() => {
-    prevQueryRef.current = '';
+    prevQueryRef.current = "";
     prevMatchesRef.current = [];
   }, [history]);
 
-  const searchHistory = useCallback(
-    (query: string, items: readonly string[]) => {
-      const out: Suggestion[] = [];
-      for (let i = 0; i < items.length; i++) {
-        const cmd = items[i];
-        const idx = cmd.toLowerCase().indexOf(query);
-        if (idx !== -1) {
-          out.push({ label: cmd, value: cmd, matchedIndex: idx });
-        }
+  const searchHistory = useCallback((query: string, items: readonly string[]) => {
+    const out: Suggestion[] = [];
+    for (let i = 0; i < items.length; i++) {
+      const cmd = items[i];
+      const idx = cmd.toLowerCase().indexOf(query);
+      if (idx !== -1) {
+        out.push({ label: cmd, value: cmd, matchedIndex: idx });
       }
-      return out;
-    },
-    [],
-  );
+    }
+    return out;
+  }, []);
 
   const matches = useMemo<Suggestion[]>(() => {
     if (!reverseSearchActive) return [];
@@ -100,9 +97,7 @@ export function useReverseSearchCompletion(
       query.startsWith(prevQueryRef.current) &&
       prevMatchesRef.current.length > 0;
 
-    const source = canUseCache
-      ? prevMatchesRef.current.map((m) => m.value)
-      : history;
+    const source = canUseCache ? prevMatchesRef.current.map((m) => m.value) : history;
 
     return searchHistory(query, source);
   }, [debouncedQuery, history, reverseSearchActive, searchHistory]);
diff --git a/packages/ui-gemini/src/ui/hooks/useSelectionList.test.tsx b/packages/ui-gemini/src/ui/hooks/useSelectionList.test.tsx
index 38351710b..922212d7e 100644
--- a/packages/ui-gemini/src/ui/hooks/useSelectionList.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useSelectionList.test.tsx
@@ -4,33 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import {
-  useSelectionList,
-  type SelectionListItem,
-} from './useSelectionList.js';
-import { useKeypress } from './useKeypress.js';
-
-import type { KeypressHandler, Key } from '../contexts/KeypressContext.js';
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { render } from "../../test-utils/render.js";
+import type { Key, KeypressHandler } from "../contexts/KeypressContext.js";
+import { useKeypress } from "./useKeypress.js";
+import { type SelectionListItem, useSelectionList } from "./useSelectionList.js";
 
 type UseKeypressMockOptions = { isActive: boolean };
 
-vi.mock('./useKeypress.js');
+vi.mock("./useKeypress.js");
 
 let activeKeypressHandler: KeypressHandler | null = null;
 
-describe('useSelectionList', () => {
+describe("useSelectionList", () => {
   const mockOnSelect = vi.fn();
   const mockOnHighlight = vi.fn();
 
   const items: Array<SelectionListItem<string>> = [
-    { value: 'A', key: 'A' },
-    { value: 'B', disabled: true, key: 'B' },
-    { value: 'C', key: 'C' },
-    { value: 'D', key: 'D' },
+    { value: "A", key: "A" },
+    { value: "B", disabled: true, key: "B" },
+    { value: "C", key: "C" },
+    { value: "D", key: "D" },
   ];
 
   beforeEach(() => {
@@ -102,8 +98,8 @@ describe('useSelectionList', () => {
     };
   };
 
-  describe('Initialization', () => {
-    it('should initialize with the default index (0) if enabled', async () => {
+  describe("Initialization", () => {
+    it("should initialize with the default index (0) if enabled", async () => {
       const { result } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
@@ -111,7 +107,7 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(0);
     });
 
-    it('should initialize with the provided initialIndex if enabled', async () => {
+    it("should initialize with the provided initialIndex if enabled", async () => {
       const { result } = await renderSelectionListHook({
         items,
         initialIndex: 2,
@@ -120,7 +116,7 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(2);
     });
 
-    it('should handle an empty list gracefully', async () => {
+    it("should handle an empty list gracefully", async () => {
       const { result } = await renderSelectionListHook({
         items: [],
         onSelect: mockOnSelect,
@@ -128,7 +124,7 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(0);
     });
 
-    it('should find the next enabled item (downwards) if initialIndex is disabled', async () => {
+    it("should find the next enabled item (downwards) if initialIndex is disabled", async () => {
       const { result } = await renderSelectionListHook({
         items,
         initialIndex: 1,
@@ -137,11 +133,11 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(2);
     });
 
-    it('should wrap around to find the next enabled item if initialIndex is disabled', async () => {
+    it("should wrap around to find the next enabled item if initialIndex is disabled", async () => {
       const wrappingItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
-        { value: 'C', disabled: true, key: 'C' },
+        { value: "A", key: "A" },
+        { value: "B", disabled: true, key: "B" },
+        { value: "C", disabled: true, key: "C" },
       ];
       const { result } = await renderSelectionListHook({
         items: wrappingItems,
@@ -151,7 +147,7 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(0);
     });
 
-    it('should default to 0 if initialIndex is out of bounds', async () => {
+    it("should default to 0 if initialIndex is out of bounds", async () => {
       const { result } = await renderSelectionListHook({
         items,
         initialIndex: 10,
@@ -167,10 +163,10 @@ describe('useSelectionList', () => {
       expect(resultNeg.current.activeIndex).toBe(0);
     });
 
-    it('should stick to the initial index if all items are disabled', async () => {
+    it("should stick to the initial index if all items are disabled", async () => {
       const allDisabled = [
-        { value: 'A', disabled: true, key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
+        { value: "A", disabled: true, key: "A" },
+        { value: "B", disabled: true, key: "B" },
       ];
       const { result } = await renderSelectionListHook({
         items: allDisabled,
@@ -181,16 +177,16 @@ describe('useSelectionList', () => {
     });
   });
 
-  describe('Keyboard Navigation (Up/Down/J/K)', () => {
+  describe("Keyboard Navigation (Up/Down/J/K)", () => {
     it('should move down with "j" and "down" keys, skipping disabled items', async () => {
       const { result } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
       });
       expect(result.current.activeIndex).toBe(0);
-      pressKey('j');
+      pressKey("j");
       expect(result.current.activeIndex).toBe(2);
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(3);
     });
 
@@ -201,13 +197,13 @@ describe('useSelectionList', () => {
         onSelect: mockOnSelect,
       });
       expect(result.current.activeIndex).toBe(3);
-      pressKey('k');
+      pressKey("k");
       expect(result.current.activeIndex).toBe(2);
-      pressKey('up');
+      pressKey("up");
       expect(result.current.activeIndex).toBe(0);
     });
 
-    it('should ignore navigation keys when shift is pressed', async () => {
+    it("should ignore navigation keys when shift is pressed", async () => {
       const { result } = await renderSelectionListHook({
         items,
         initialIndex: 2, // Start at middle item 'C'
@@ -216,63 +212,63 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(2);
 
       // Shift+Down / Shift+J should not move down
-      pressKey('down', undefined, { shift: true });
+      pressKey("down", undefined, { shift: true });
       expect(result.current.activeIndex).toBe(2);
-      pressKey('j', undefined, { shift: true });
+      pressKey("j", undefined, { shift: true });
       expect(result.current.activeIndex).toBe(2);
 
       // Shift+Up / Shift+K should not move up
-      pressKey('up', undefined, { shift: true });
+      pressKey("up", undefined, { shift: true });
       expect(result.current.activeIndex).toBe(2);
-      pressKey('k', undefined, { shift: true });
+      pressKey("k", undefined, { shift: true });
       expect(result.current.activeIndex).toBe(2);
 
       // Verify normal navigation still works
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(3);
     });
 
-    it('should wrap navigation correctly', async () => {
+    it("should wrap navigation correctly", async () => {
       const { result } = await renderSelectionListHook({
         items,
         initialIndex: items.length - 1,
         onSelect: mockOnSelect,
       });
       expect(result.current.activeIndex).toBe(3);
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(0);
 
-      pressKey('up');
+      pressKey("up");
       expect(result.current.activeIndex).toBe(3);
     });
 
-    it('should call onHighlight when index changes', async () => {
+    it("should call onHighlight when index changes", async () => {
       await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
         onHighlight: mockOnHighlight,
       });
-      pressKey('down');
+      pressKey("down");
       expect(mockOnHighlight).toHaveBeenCalledTimes(1);
-      expect(mockOnHighlight).toHaveBeenCalledWith('C');
+      expect(mockOnHighlight).toHaveBeenCalledWith("C");
     });
 
-    it('should not move or call onHighlight if navigation results in the same index (e.g., single item)', async () => {
-      const singleItem = [{ value: 'A', key: 'A' }];
+    it("should not move or call onHighlight if navigation results in the same index (e.g., single item)", async () => {
+      const singleItem = [{ value: "A", key: "A" }];
       const { result } = await renderSelectionListHook({
         items: singleItem,
         onSelect: mockOnSelect,
         onHighlight: mockOnHighlight,
       });
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(0);
       expect(mockOnHighlight).not.toHaveBeenCalled();
     });
 
-    it('should not move or call onHighlight if all items are disabled', async () => {
+    it("should not move or call onHighlight if all items are disabled", async () => {
       const allDisabled = [
-        { value: 'A', disabled: true, key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
+        { value: "A", disabled: true, key: "A" },
+        { value: "B", disabled: true, key: "B" },
       ];
       const { result } = await renderSelectionListHook({
         items: allDisabled,
@@ -280,25 +276,25 @@ describe('useSelectionList', () => {
         onHighlight: mockOnHighlight,
       });
       const initialIndex = result.current.activeIndex;
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(initialIndex);
       expect(mockOnHighlight).not.toHaveBeenCalled();
     });
   });
 
-  describe('Selection (Enter)', () => {
+  describe("Selection (Enter)", () => {
     it('should call onSelect when "return" is pressed on enabled item', async () => {
       await renderSelectionListHook({
         items,
         initialIndex: 2,
         onSelect: mockOnSelect,
       });
-      pressKey('return');
+      pressKey("return");
       expect(mockOnSelect).toHaveBeenCalledTimes(1);
-      expect(mockOnSelect).toHaveBeenCalledWith('C');
+      expect(mockOnSelect).toHaveBeenCalledWith("C");
     });
 
-    it('should not call onSelect if the active item is disabled', async () => {
+    it("should not call onSelect if the active item is disabled", async () => {
       const { result } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
@@ -306,13 +302,13 @@ describe('useSelectionList', () => {
 
       act(() => result.current.setActiveIndex(1));
 
-      pressKey('return');
+      pressKey("return");
       expect(mockOnSelect).not.toHaveBeenCalled();
     });
   });
 
-  describe('Keyboard Navigation Robustness (Rapid Input)', () => {
-    it('should handle rapid navigation and selection robustly (avoiding stale state)', async () => {
+  describe("Keyboard Navigation Robustness (Rapid Input)", () => {
+    it("should handle rapid navigation and selection robustly (avoiding stale state)", async () => {
       const { result } = await renderSelectionListHook({
         items, // A, B(disabled), C, D. Initial index 0 (A).
         onSelect: mockOnSelect,
@@ -320,7 +316,7 @@ describe('useSelectionList', () => {
       });
 
       // Simulate rapid inputs with separate act blocks to allow effects to run
-      if (!activeKeypressHandler) throw new Error('Handler not active');
+      if (!activeKeypressHandler) throw new Error("Handler not active");
 
       const handler = activeKeypressHandler;
 
@@ -339,29 +335,29 @@ describe('useSelectionList', () => {
 
       // 1. Press Down. Should move 0 (A) -> 2 (C).
       act(() => {
-        press('down');
+        press("down");
       });
       // 2. Press Down again. Should move 2 (C) -> 3 (D).
       act(() => {
-        press('down');
+        press("down");
       });
       // 3. Press Enter. Should select D.
       act(() => {
-        press('return');
+        press("return");
       });
 
       expect(result.current.activeIndex).toBe(3);
 
       expect(mockOnHighlight).toHaveBeenCalledTimes(2);
-      expect(mockOnHighlight).toHaveBeenNthCalledWith(1, 'C');
-      expect(mockOnHighlight).toHaveBeenNthCalledWith(2, 'D');
+      expect(mockOnHighlight).toHaveBeenNthCalledWith(1, "C");
+      expect(mockOnHighlight).toHaveBeenNthCalledWith(2, "D");
 
       expect(mockOnSelect).toHaveBeenCalledTimes(1);
-      expect(mockOnSelect).toHaveBeenCalledWith('D');
-      expect(mockOnSelect).not.toHaveBeenCalledWith('A');
+      expect(mockOnSelect).toHaveBeenCalledWith("D");
+      expect(mockOnSelect).not.toHaveBeenCalledWith("A");
     });
 
-    it('should handle ultra-rapid input (multiple presses in single act) without stale state', async () => {
+    it("should handle ultra-rapid input (multiple presses in single act) without stale state", async () => {
       const { result } = await renderSelectionListHook({
         items, // A, B(disabled), C, D. Initial index 0 (A).
         onSelect: mockOnSelect,
@@ -370,7 +366,7 @@ describe('useSelectionList', () => {
 
       // Simulate ultra-rapid inputs where all keypresses happen faster than React can re-render
       act(() => {
-        if (!activeKeypressHandler) throw new Error('Handler not active');
+        if (!activeKeypressHandler) throw new Error("Handler not active");
 
         const handler = activeKeypressHandler;
 
@@ -388,51 +384,51 @@ describe('useSelectionList', () => {
         };
 
         // All presses happen in same render cycle - React batches the state updates
-        press('down'); // Should move 0 (A) -> 2 (C)
-        press('down'); // Should move 2 (C) -> 3 (D)
-        press('return'); // Should select D
+        press("down"); // Should move 0 (A) -> 2 (C)
+        press("down"); // Should move 2 (C) -> 3 (D)
+        press("return"); // Should select D
       });
 
       expect(result.current.activeIndex).toBe(3);
 
-      expect(mockOnHighlight).toHaveBeenCalledWith('D');
+      expect(mockOnHighlight).toHaveBeenCalledWith("D");
       expect(mockOnSelect).toHaveBeenCalledTimes(1);
-      expect(mockOnSelect).toHaveBeenCalledWith('D');
+      expect(mockOnSelect).toHaveBeenCalledWith("D");
     });
   });
 
-  describe('Focus Management (isFocused)', () => {
-    it('should activate the keypress handler when focused (default) and items exist', async () => {
+  describe("Focus Management (isFocused)", () => {
+    it("should activate the keypress handler when focused (default) and items exist", async () => {
       const { result } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
       });
       expect(activeKeypressHandler).not.toBeNull();
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(2);
     });
 
-    it('should not activate the keypress handler when isFocused is false', async () => {
+    it("should not activate the keypress handler when isFocused is false", async () => {
       await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
         isFocused: false,
       });
       expect(activeKeypressHandler).toBeNull();
-      expect(() => pressKey('down')).toThrow(/keypress handler is not active/);
+      expect(() => pressKey("down")).toThrow(/keypress handler is not active/);
     });
 
-    it('should not activate the keypress handler when items list is empty', async () => {
+    it("should not activate the keypress handler when items list is empty", async () => {
       await renderSelectionListHook({
         items: [],
         onSelect: mockOnSelect,
         isFocused: true,
       });
       expect(activeKeypressHandler).toBeNull();
-      expect(() => pressKey('down')).toThrow(/keypress handler is not active/);
+      expect(() => pressKey("down")).toThrow(/keypress handler is not active/);
     });
 
-    it('should activate/deactivate when isFocused prop changes', async () => {
+    it("should activate/deactivate when isFocused prop changes", async () => {
       const { result, rerender } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
@@ -443,16 +439,16 @@ describe('useSelectionList', () => {
 
       await rerender({ isFocused: true });
       expect(activeKeypressHandler).not.toBeNull();
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(2);
 
       await rerender({ isFocused: false });
       expect(activeKeypressHandler).toBeNull();
-      expect(() => pressKey('down')).toThrow(/keypress handler is not active/);
+      expect(() => pressKey("down")).toThrow(/keypress handler is not active/);
     });
   });
 
-  describe('Numeric Quick Selection (showNumbers=true)', () => {
+  describe("Numeric Quick Selection (showNumbers=true)", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
@@ -462,40 +458,40 @@ describe('useSelectionList', () => {
     });
 
     const shortList = items;
-    const longList: Array<SelectionListItem<string>> = Array.from(
-      { length: 15 },
-      (_, i) => ({ value: `Item ${i + 1}`, key: `Item ${i + 1}` }),
-    );
+    const longList: Array<SelectionListItem<string>> = Array.from({ length: 15 }, (_, i) => ({
+      value: `Item ${i + 1}`,
+      key: `Item ${i + 1}`,
+    }));
 
     const pressNumber = (num: string) => pressKey(num, num);
 
-    it('should not respond to numbers if showNumbers is false (default)', async () => {
+    it("should not respond to numbers if showNumbers is false (default)", async () => {
       const { result } = await renderSelectionListHook({
         items: shortList,
         onSelect: mockOnSelect,
       });
-      pressNumber('1');
+      pressNumber("1");
       expect(result.current.activeIndex).toBe(0);
       expect(mockOnSelect).not.toHaveBeenCalled();
     });
 
-    it('should select item immediately if the number cannot be extended (unambiguous)', async () => {
+    it("should select item immediately if the number cannot be extended (unambiguous)", async () => {
       const { result } = await renderSelectionListHook({
         items: shortList,
         onSelect: mockOnSelect,
         onHighlight: mockOnHighlight,
         showNumbers: true,
       });
-      pressNumber('3');
+      pressNumber("3");
 
       expect(result.current.activeIndex).toBe(2);
-      expect(mockOnHighlight).toHaveBeenCalledWith('C');
+      expect(mockOnHighlight).toHaveBeenCalledWith("C");
       expect(mockOnSelect).toHaveBeenCalledTimes(1);
-      expect(mockOnSelect).toHaveBeenCalledWith('C');
+      expect(mockOnSelect).toHaveBeenCalledWith("C");
       expect(vi.getTimerCount()).toBe(0);
     });
 
-    it('should highlight and wait for timeout if the number can be extended (ambiguous)', async () => {
+    it("should highlight and wait for timeout if the number can be extended (ambiguous)", async () => {
       const { result } = await renderSelectionListHook({
         items: longList,
         initialIndex: 1, // Start at index 1 so pressing "1" (index 0) causes a change
@@ -504,10 +500,10 @@ describe('useSelectionList', () => {
         showNumbers: true,
       });
 
-      pressNumber('1');
+      pressNumber("1");
 
       expect(result.current.activeIndex).toBe(0);
-      expect(mockOnHighlight).toHaveBeenCalledWith('Item 1');
+      expect(mockOnHighlight).toHaveBeenCalledWith("Item 1");
 
       expect(mockOnSelect).not.toHaveBeenCalled();
       expect(vi.getTimerCount()).toBe(1);
@@ -517,42 +513,42 @@ describe('useSelectionList', () => {
       });
 
       expect(mockOnSelect).toHaveBeenCalledTimes(1);
-      expect(mockOnSelect).toHaveBeenCalledWith('Item 1');
+      expect(mockOnSelect).toHaveBeenCalledWith("Item 1");
     });
 
-    it('should handle multi-digit input correctly', async () => {
+    it("should handle multi-digit input correctly", async () => {
       const { result } = await renderSelectionListHook({
         items: longList,
         onSelect: mockOnSelect,
         showNumbers: true,
       });
 
-      pressNumber('1');
+      pressNumber("1");
       expect(mockOnSelect).not.toHaveBeenCalled();
 
-      pressNumber('2');
+      pressNumber("2");
 
       expect(result.current.activeIndex).toBe(11);
 
       expect(mockOnSelect).toHaveBeenCalledTimes(1);
-      expect(mockOnSelect).toHaveBeenCalledWith('Item 12');
+      expect(mockOnSelect).toHaveBeenCalledWith("Item 12");
     });
 
-    it('should reset buffer if input becomes invalid (out of bounds)', async () => {
+    it("should reset buffer if input becomes invalid (out of bounds)", async () => {
       const { result } = await renderSelectionListHook({
         items: shortList,
         onSelect: mockOnSelect,
         showNumbers: true,
       });
 
-      pressNumber('5');
+      pressNumber("5");
 
       expect(result.current.activeIndex).toBe(0);
       expect(mockOnSelect).not.toHaveBeenCalled();
 
-      pressNumber('3');
+      pressNumber("3");
       expect(result.current.activeIndex).toBe(2);
-      expect(mockOnSelect).toHaveBeenCalledWith('C');
+      expect(mockOnSelect).toHaveBeenCalledWith("C");
     });
 
     it('should allow "0" as subsequent digit, but ignore as first digit', async () => {
@@ -562,18 +558,18 @@ describe('useSelectionList', () => {
         showNumbers: true,
       });
 
-      pressNumber('0');
+      pressNumber("0");
       expect(result.current.activeIndex).toBe(0);
       expect(mockOnSelect).not.toHaveBeenCalled();
       // Timer should be running to clear the '0' input buffer
       expect(vi.getTimerCount()).toBe(1);
 
       // Press '1', then '0' (Item 10, index 9)
-      pressNumber('1');
-      pressNumber('0');
+      pressNumber("1");
+      pressNumber("0");
 
       expect(result.current.activeIndex).toBe(9);
-      expect(mockOnSelect).toHaveBeenCalledWith('Item 10');
+      expect(mockOnSelect).toHaveBeenCalledWith("Item 10");
     });
 
     it('should clear the initial "0" input after timeout', async () => {
@@ -583,19 +579,19 @@ describe('useSelectionList', () => {
         showNumbers: true,
       });
 
-      pressNumber('0');
+      pressNumber("0");
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       act(() => vi.advanceTimersByTime(1000)); // Timeout the '0' input
 
-      pressNumber('1');
+      pressNumber("1");
       expect(mockOnSelect).not.toHaveBeenCalled(); // Should be waiting for second digit
 
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       act(() => vi.advanceTimersByTime(1000)); // Timeout '1'
-      expect(mockOnSelect).toHaveBeenCalledWith('Item 1');
+      expect(mockOnSelect).toHaveBeenCalledWith("Item 1");
     });
 
-    it('should highlight but not select a disabled item (immediate selection case)', async () => {
+    it("should highlight but not select a disabled item (immediate selection case)", async () => {
       const { result } = await renderSelectionListHook({
         items: shortList, // B (index 1, number 2) is disabled
         onSelect: mockOnSelect,
@@ -603,19 +599,19 @@ describe('useSelectionList', () => {
         showNumbers: true,
       });
 
-      pressNumber('2');
+      pressNumber("2");
 
       expect(result.current.activeIndex).toBe(1);
-      expect(mockOnHighlight).toHaveBeenCalledWith('B');
+      expect(mockOnHighlight).toHaveBeenCalledWith("B");
 
       // Should not select immediately, even though 20 > 4
       expect(mockOnSelect).not.toHaveBeenCalled();
     });
 
-    it('should highlight but not select a disabled item (timeout case)', async () => {
+    it("should highlight but not select a disabled item (timeout case)", async () => {
       // Create a list where the ambiguous prefix points to a disabled item
       const disabledAmbiguousList = [
-        { value: 'Item 1 Disabled', disabled: true, key: 'Item 1 Disabled' },
+        { value: "Item 1 Disabled", disabled: true, key: "Item 1 Disabled" },
         ...longList.slice(1),
       ];
 
@@ -625,7 +621,7 @@ describe('useSelectionList', () => {
         showNumbers: true,
       });
 
-      pressNumber('1');
+      pressNumber("1");
       expect(result.current.activeIndex).toBe(0);
       expect(vi.getTimerCount()).toBe(1);
 
@@ -637,22 +633,22 @@ describe('useSelectionList', () => {
       expect(mockOnSelect).not.toHaveBeenCalled();
     });
 
-    it('should clear the number buffer if a non-numeric key (e.g., navigation) is pressed', async () => {
+    it("should clear the number buffer if a non-numeric key (e.g., navigation) is pressed", async () => {
       const { result } = await renderSelectionListHook({
         items: longList,
         onSelect: mockOnSelect,
         showNumbers: true,
       });
 
-      pressNumber('1');
+      pressNumber("1");
       expect(vi.getTimerCount()).toBe(1);
 
-      pressKey('down');
+      pressKey("down");
 
       expect(result.current.activeIndex).toBe(1);
       expect(vi.getTimerCount()).toBe(0);
 
-      pressNumber('3');
+      pressNumber("3");
       // Should select '3', not '13'
       expect(result.current.activeIndex).toBe(2);
     });
@@ -664,9 +660,9 @@ describe('useSelectionList', () => {
         showNumbers: true,
       });
 
-      pressNumber('1');
+      pressNumber("1");
 
-      pressKey('return');
+      pressKey("return");
       expect(mockOnSelect).toHaveBeenCalledTimes(1);
 
       expect(vi.getTimerCount()).toBe(0);
@@ -678,8 +674,8 @@ describe('useSelectionList', () => {
     });
   });
 
-  describe('Reactivity (Dynamic Updates)', () => {
-    it('should update activeIndex when initialIndex prop changes', async () => {
+  describe("Reactivity (Dynamic Updates)", () => {
+    it("should update activeIndex when initialIndex prop changes", async () => {
       const { result, rerender } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
@@ -692,7 +688,7 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should respect a new initialIndex even after user interaction', async () => {
+    it("should respect a new initialIndex even after user interaction", async () => {
       const { result, rerender } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
@@ -700,7 +696,7 @@ describe('useSelectionList', () => {
       });
 
       // User navigates, changing the active index
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(2);
 
       // The component re-renders with a new initial index
@@ -712,7 +708,7 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should validate index when initialIndex prop changes to a disabled item', async () => {
+    it("should validate index when initialIndex prop changes to a disabled item", async () => {
       const { result, rerender } = await renderSelectionListHook({
         items,
         onSelect: mockOnSelect,
@@ -726,7 +722,7 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should adjust activeIndex if items change and the initialIndex is now out of bounds', async () => {
+    it("should adjust activeIndex if items change and the initialIndex is now out of bounds", async () => {
       const { result, rerender } = await renderSelectionListHook({
         onSelect: mockOnSelect,
         initialIndex: 3,
@@ -736,8 +732,8 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(3);
 
       const shorterItems = [
-        { value: 'X', key: 'X' },
-        { value: 'Y', key: 'Y' },
+        { value: "X", key: "X" },
+        { value: "Y", key: "Y" },
       ];
       await rerender({ items: shorterItems }); // Length 2
 
@@ -747,11 +743,11 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should adjust activeIndex if items change and the initialIndex becomes disabled', async () => {
+    it("should adjust activeIndex if items change and the initialIndex becomes disabled", async () => {
       const initialItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', key: 'B' },
-        { value: 'C', key: 'C' },
+        { value: "A", key: "A" },
+        { value: "B", key: "B" },
+        { value: "C", key: "C" },
       ];
       const { result, rerender } = await renderSelectionListHook({
         onSelect: mockOnSelect,
@@ -762,9 +758,9 @@ describe('useSelectionList', () => {
       expect(result.current.activeIndex).toBe(1);
 
       const newItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
-        { value: 'C', key: 'C' },
+        { value: "A", key: "A" },
+        { value: "B", disabled: true, key: "B" },
+        { value: "C", key: "C" },
       ];
       await rerender({ items: newItems });
 
@@ -773,7 +769,7 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should reset to 0 if items change to an empty list', async () => {
+    it("should reset to 0 if items change to an empty list", async () => {
       const { result, rerender } = await renderSelectionListHook({
         onSelect: mockOnSelect,
         initialIndex: 2,
@@ -786,12 +782,12 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should not reset activeIndex when items are deeply equal', async () => {
+    it("should not reset activeIndex when items are deeply equal", async () => {
       const initialItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
-        { value: 'C', key: 'C' },
-        { value: 'D', key: 'D' },
+        { value: "A", key: "A" },
+        { value: "B", disabled: true, key: "B" },
+        { value: "C", key: "C" },
+        { value: "D", key: "D" },
       ];
 
       const { result, rerender } = await renderSelectionListHook({
@@ -812,10 +808,10 @@ describe('useSelectionList', () => {
 
       // Create new array with same content (deeply equal but not identical)
       const newItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
-        { value: 'C', key: 'C' },
-        { value: 'D', key: 'D' },
+        { value: "A", key: "A" },
+        { value: "B", disabled: true, key: "B" },
+        { value: "C", key: "C" },
+        { value: "D", key: "D" },
       ];
 
       await rerender({ items: newItems });
@@ -828,12 +824,12 @@ describe('useSelectionList', () => {
       expect(mockOnHighlight).not.toHaveBeenCalled();
     });
 
-    it('should update activeIndex when items change structurally', async () => {
+    it("should update activeIndex when items change structurally", async () => {
       const initialItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
-        { value: 'C', key: 'C' },
-        { value: 'D', key: 'D' },
+        { value: "A", key: "A" },
+        { value: "B", disabled: true, key: "B" },
+        { value: "C", key: "C" },
+        { value: "D", key: "D" },
       ];
 
       const { result, rerender } = await renderSelectionListHook({
@@ -848,9 +844,9 @@ describe('useSelectionList', () => {
 
       // Change item values (not deeply equal)
       const newItems = [
-        { value: 'X', key: 'X' },
-        { value: 'Y', key: 'Y' },
-        { value: 'Z', key: 'Z' },
+        { value: "X", key: "X" },
+        { value: "Y", key: "Y" },
+        { value: "Z", key: "Z" },
       ];
 
       await rerender({ items: newItems });
@@ -861,11 +857,11 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should handle partial changes in items array', async () => {
+    it("should handle partial changes in items array", async () => {
       const initialItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', key: 'B' },
-        { value: 'C', key: 'C' },
+        { value: "A", key: "A" },
+        { value: "B", key: "B" },
+        { value: "C", key: "C" },
       ];
 
       const { result, rerender } = await renderSelectionListHook({
@@ -878,9 +874,9 @@ describe('useSelectionList', () => {
 
       // Change only one item's disabled status
       const newItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', disabled: true, key: 'B' },
-        { value: 'C', key: 'C' },
+        { value: "A", key: "A" },
+        { value: "B", disabled: true, key: "B" },
+        { value: "C", key: "C" },
       ];
 
       await rerender({ items: newItems });
@@ -891,11 +887,11 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should update selection when a new item is added to the start of the list', async () => {
+    it("should update selection when a new item is added to the start of the list", async () => {
       const initialItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', key: 'B' },
-        { value: 'C', key: 'C' },
+        { value: "A", key: "A" },
+        { value: "B", key: "B" },
+        { value: "C", key: "C" },
       ];
 
       const { result, rerender } = await renderSelectionListHook({
@@ -903,14 +899,14 @@ describe('useSelectionList', () => {
         items: initialItems,
       });
 
-      pressKey('down');
+      pressKey("down");
       expect(result.current.activeIndex).toBe(1);
 
       const newItems = [
-        { value: 'D', key: 'D' },
-        { value: 'A', key: 'A' },
-        { value: 'B', key: 'B' },
-        { value: 'C', key: 'C' },
+        { value: "D", key: "D" },
+        { value: "A", key: "A" },
+        { value: "B", key: "B" },
+        { value: "C", key: "C" },
       ];
 
       await rerender({ items: newItems });
@@ -920,10 +916,10 @@ describe('useSelectionList', () => {
       });
     });
 
-    it('should not re-initialize when items have identical keys but are different objects', async () => {
+    it("should not re-initialize when items have identical keys but are different objects", async () => {
       const initialItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', key: 'B' },
+        { value: "A", key: "A" },
+        { value: "B", key: "B" },
       ];
 
       let renderCount = 0;
@@ -955,8 +951,8 @@ describe('useSelectionList', () => {
 
       // Create new items with the same keys but different object references
       const newItems = [
-        { value: 'A', key: 'A' },
-        { value: 'B', key: 'B' },
+        { value: "A", key: "A" },
+        { value: "B", key: "B" },
       ];
 
       await rerender({ items: newItems });
@@ -964,7 +960,7 @@ describe('useSelectionList', () => {
     });
   });
 
-  describe('Cleanup', () => {
+  describe("Cleanup", () => {
     beforeEach(() => {
       vi.useFakeTimers();
     });
@@ -973,11 +969,11 @@ describe('useSelectionList', () => {
       vi.useRealTimers();
     });
 
-    it('should clear timeout on unmount when timer is active', async () => {
-      const longList: Array<SelectionListItem<string>> = Array.from(
-        { length: 15 },
-        (_, i) => ({ value: `Item ${i + 1}`, key: `Item ${i + 1}` }),
-      );
+    it("should clear timeout on unmount when timer is active", async () => {
+      const longList: Array<SelectionListItem<string>> = Array.from({ length: 15 }, (_, i) => ({
+        value: `Item ${i + 1}`,
+        key: `Item ${i + 1}`,
+      }));
 
       const { unmount } = await renderSelectionListHook({
         items: longList,
@@ -985,7 +981,7 @@ describe('useSelectionList', () => {
         showNumbers: true,
       });
 
-      pressKey('1', '1');
+      pressKey("1", "1");
 
       expect(vi.getTimerCount()).toBe(1);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useSelectionList.ts b/packages/ui-gemini/src/ui/hooks/useSelectionList.ts
index eca760760..29c571080 100644
--- a/packages/ui-gemini/src/ui/hooks/useSelectionList.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSelectionList.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useReducer, useRef, useEffect, useCallback } from 'react';
-import { useKeypress, type Key } from './useKeypress.js';
-import { keyMatchers, Command } from '../keyMatchers.js';
+import { useCallback, useEffect, useReducer, useRef } from "react";
+import { Command, keyMatchers } from "../keyMatchers.js";
+import { type Key, useKeypress } from "./useKeypress.js";
 
 export interface SelectionListItem<T> {
   key: string;
@@ -43,26 +43,26 @@ interface SelectionListState {
 
 type SelectionListAction =
   | {
-      type: 'SET_ACTIVE_INDEX';
+      type: "SET_ACTIVE_INDEX";
       payload: {
         index: number;
       };
     }
   | {
-      type: 'MOVE_UP';
+      type: "MOVE_UP";
     }
   | {
-      type: 'MOVE_DOWN';
+      type: "MOVE_DOWN";
     }
   | {
-      type: 'SELECT_CURRENT';
+      type: "SELECT_CURRENT";
     }
   | {
-      type: 'INITIALIZE';
+      type: "INITIALIZE";
       payload: { initialIndex: number; items: BaseSelectionItem[] };
     }
   | {
-      type: 'CLEAR_PENDING_FLAGS';
+      type: "CLEAR_PENDING_FLAGS";
     };
 
 const NUMBER_INPUT_TIMEOUT_MS = 1000;
@@ -72,14 +72,14 @@ const NUMBER_INPUT_TIMEOUT_MS = 1000;
  */
 const findNextValidIndex = (
   currentIndex: number,
-  direction: 'up' | 'down',
+  direction: "up" | "down",
   items: BaseSelectionItem[],
 ): number => {
   const len = items.length;
   if (len === 0) return currentIndex;
 
   let nextIndex = currentIndex;
-  const step = direction === 'down' ? 1 : -1;
+  const step = direction === "down" ? 1 : -1;
 
   for (let i = 0; i < len; i++) {
     // Calculate the next index, wrapping around if necessary.
@@ -119,7 +119,7 @@ const computeInitialIndex = (
   }
 
   if (items[targetIndex]?.disabled) {
-    const nextValid = findNextValidIndex(targetIndex, 'down', items);
+    const nextValid = findNextValidIndex(targetIndex, "down", items);
     targetIndex = nextValid;
   }
 
@@ -131,7 +131,7 @@ function selectionListReducer(
   action: SelectionListAction,
 ): SelectionListState {
   switch (action.type) {
-    case 'SET_ACTIVE_INDEX': {
+    case "SET_ACTIVE_INDEX": {
       const { index } = action.payload;
       const { items } = state;
 
@@ -146,33 +146,32 @@ function selectionListReducer(
       return state;
     }
 
-    case 'MOVE_UP': {
+    case "MOVE_UP": {
       const { items } = state;
-      const newIndex = findNextValidIndex(state.activeIndex, 'up', items);
+      const newIndex = findNextValidIndex(state.activeIndex, "up", items);
       if (newIndex !== state.activeIndex) {
         return { ...state, activeIndex: newIndex, pendingHighlight: true };
       }
       return state;
     }
 
-    case 'MOVE_DOWN': {
+    case "MOVE_DOWN": {
       const { items } = state;
-      const newIndex = findNextValidIndex(state.activeIndex, 'down', items);
+      const newIndex = findNextValidIndex(state.activeIndex, "down", items);
       if (newIndex !== state.activeIndex) {
         return { ...state, activeIndex: newIndex, pendingHighlight: true };
       }
       return state;
     }
 
-    case 'SELECT_CURRENT': {
+    case "SELECT_CURRENT": {
       return { ...state, pendingSelect: true };
     }
 
-    case 'INITIALIZE': {
+    case "INITIALIZE": {
       const { initialIndex, items } = action.payload;
       const activeKey =
-        initialIndex === state.initialIndex &&
-        state.activeIndex !== state.initialIndex
+        initialIndex === state.initialIndex && state.activeIndex !== state.initialIndex
           ? state.items[state.activeIndex]?.key
           : undefined;
 
@@ -188,7 +187,7 @@ function selectionListReducer(
       };
     }
 
-    case 'CLEAR_PENDING_FLAGS': {
+    case "CLEAR_PENDING_FLAGS": {
       return {
         ...state,
         pendingHighlight: false,
@@ -204,10 +203,7 @@ function selectionListReducer(
   }
 }
 
-function areBaseItemsEqual(
-  a: BaseSelectionItem[],
-  b: BaseSelectionItem[],
-): boolean {
+function areBaseItemsEqual(a: BaseSelectionItem[], b: BaseSelectionItem[]): boolean {
   if (a === b) return true;
   if (a.length !== b.length) return false;
 
@@ -220,9 +216,7 @@ function areBaseItemsEqual(
   return true;
 }
 
-function toBaseItems<T>(
-  items: Array<SelectionListItem<T>>,
-): BaseSelectionItem[] {
+function toBaseItems<T>(items: Array<SelectionListItem<T>>): BaseSelectionItem[] {
   return items.map(({ key, disabled }) => ({ key, disabled }));
 }
 
@@ -254,7 +248,7 @@ export function useSelectionList<T>({
     pendingSelect: false,
     items: baseItems,
   });
-  const numberInputRef = useRef('');
+  const numberInputRef = useRef("");
   const numberInputTimer = useRef<NodeJS.Timeout | null>(null);
 
   const prevBaseItemsRef = useRef(baseItems);
@@ -262,15 +256,12 @@ export function useSelectionList<T>({
 
   // Initialize/synchronize state when initialIndex or items change
   useEffect(() => {
-    const baseItemsChanged = !areBaseItemsEqual(
-      prevBaseItemsRef.current,
-      baseItems,
-    );
+    const baseItemsChanged = !areBaseItemsEqual(prevBaseItemsRef.current, baseItems);
     const initialIndexChanged = prevInitialIndexRef.current !== initialIndex;
 
     if (baseItemsChanged || initialIndexChanged) {
       dispatch({
-        type: 'INITIALIZE',
+        type: "INITIALIZE",
         payload: { initialIndex, items: baseItems },
       });
       prevBaseItemsRef.current = baseItems;
@@ -296,7 +287,7 @@ export function useSelectionList<T>({
     }
 
     if (needsClear) {
-      dispatch({ type: 'CLEAR_PENDING_FLAGS' });
+      dispatch({ type: "CLEAR_PENDING_FLAGS" });
     }
   }, [
     state.pendingHighlight,
@@ -325,21 +316,21 @@ export function useSelectionList<T>({
       // Clear number input buffer on non-numeric key press
       if (!isNumeric && numberInputTimer.current) {
         clearTimeout(numberInputTimer.current);
-        numberInputRef.current = '';
+        numberInputRef.current = "";
       }
 
       if (keyMatchers[Command.DIALOG_NAVIGATION_UP](key)) {
-        dispatch({ type: 'MOVE_UP' });
+        dispatch({ type: "MOVE_UP" });
         return;
       }
 
       if (keyMatchers[Command.DIALOG_NAVIGATION_DOWN](key)) {
-        dispatch({ type: 'MOVE_DOWN' });
+        dispatch({ type: "MOVE_DOWN" });
         return;
       }
 
       if (keyMatchers[Command.RETURN](key)) {
-        dispatch({ type: 'SELECT_CURRENT' });
+        dispatch({ type: "SELECT_CURRENT" });
         return;
       }
 
@@ -355,38 +346,38 @@ export function useSelectionList<T>({
         const targetIndex = Number.parseInt(newNumberInput, 10) - 1;
 
         // Single '0' is invalid (1-indexed)
-        if (newNumberInput === '0') {
+        if (newNumberInput === "0") {
           numberInputTimer.current = setTimeout(() => {
-            numberInputRef.current = '';
+            numberInputRef.current = "";
           }, NUMBER_INPUT_TIMEOUT_MS);
           return;
         }
 
         if (targetIndex >= 0 && targetIndex < itemsLength) {
           dispatch({
-            type: 'SET_ACTIVE_INDEX',
+            type: "SET_ACTIVE_INDEX",
             payload: { index: targetIndex },
           });
 
           // If the number can't be a prefix for another valid number, select immediately
-          const potentialNextNumber = Number.parseInt(newNumberInput + '0', 10);
+          const potentialNextNumber = Number.parseInt(newNumberInput + "0", 10);
           if (potentialNextNumber > itemsLength) {
             dispatch({
-              type: 'SELECT_CURRENT',
+              type: "SELECT_CURRENT",
             });
-            numberInputRef.current = '';
+            numberInputRef.current = "";
           } else {
             // Otherwise wait for more input or timeout
             numberInputTimer.current = setTimeout(() => {
               dispatch({
-                type: 'SELECT_CURRENT',
+                type: "SELECT_CURRENT",
               });
-              numberInputRef.current = '';
+              numberInputRef.current = "";
             }, NUMBER_INPUT_TIMEOUT_MS);
           }
         } else {
           // Number is out of bounds
-          numberInputRef.current = '';
+          numberInputRef.current = "";
         }
       }
     },
@@ -397,7 +388,7 @@ export function useSelectionList<T>({
 
   const setActiveIndex = (index: number) => {
     dispatch({
-      type: 'SET_ACTIVE_INDEX',
+      type: "SET_ACTIVE_INDEX",
       payload: { index },
     });
   };
diff --git a/packages/ui-gemini/src/ui/hooks/useSessionBrowser.test.ts b/packages/ui-gemini/src/ui/hooks/useSessionBrowser.test.ts
index cad344310..92022df48 100644
--- a/packages/ui-gemini/src/ui/hooks/useSessionBrowser.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSessionBrowser.test.ts
@@ -4,33 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { renderHook } from '../../test-utils/render.js';
-import { act } from 'react';
-import {
-  useSessionBrowser,
-  convertSessionToHistoryFormats,
-} from './useSessionBrowser.js';
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import { getSessionFiles, type SessionInfo } from '../../utils/sessionUtils.js';
-import type {
-  Config,
-  ConversationRecord,
-  MessageRecord,
-} from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs/promises";
+import path from "node:path";
+import type { Config, ConversationRecord, MessageRecord } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { getSessionFiles, type SessionInfo } from "../../utils/sessionUtils.js";
+import { convertSessionToHistoryFormats, useSessionBrowser } from "./useSessionBrowser.js";
 
 // Mock modules
-vi.mock('fs/promises');
-vi.mock('path');
-vi.mock('../../utils/sessionUtils.js');
+vi.mock("fs/promises");
+vi.mock("path");
+vi.mock("../../utils/sessionUtils.js");
 
-const MOCKED_PROJECT_TEMP_DIR = '/test/project/temp';
-const MOCKED_CHATS_DIR = '/test/project/temp/chats';
-const MOCKED_SESSION_ID = 'test-session-123';
-const MOCKED_CURRENT_SESSION_ID = 'current-session-id';
+const MOCKED_PROJECT_TEMP_DIR = "/test/project/temp";
+const MOCKED_CHATS_DIR = "/test/project/temp/chats";
+const MOCKED_SESSION_ID = "test-session-123";
+const MOCKED_CURRENT_SESSION_ID = "current-session-id";
 
-describe('useSessionBrowser', () => {
+describe("useSessionBrowser", () => {
   const mockedFs = vi.mocked(fs);
   const mockedPath = vi.mocked(path);
   const mockedGetSessionFiles = vi.mocked(getSessionFiles);
@@ -52,20 +45,16 @@ describe('useSessionBrowser', () => {
 
   beforeEach(() => {
     vi.resetAllMocks();
-    mockedPath.join.mockImplementation((...args) => args.join('/'));
-    vi.mocked(mockConfig.storage.getProjectTempDir).mockReturnValue(
-      MOCKED_PROJECT_TEMP_DIR,
-    );
-    vi.mocked(mockConfig.getSessionId).mockReturnValue(
-      MOCKED_CURRENT_SESSION_ID,
-    );
+    mockedPath.join.mockImplementation((...args) => args.join("/"));
+    vi.mocked(mockConfig.storage.getProjectTempDir).mockReturnValue(MOCKED_PROJECT_TEMP_DIR);
+    vi.mocked(mockConfig.getSessionId).mockReturnValue(MOCKED_CURRENT_SESSION_ID);
   });
 
-  it('should successfully resume a session', async () => {
-    const MOCKED_FILENAME = 'session-2025-01-01-test-session-123.json';
+  it("should successfully resume a session", async () => {
+    const MOCKED_FILENAME = "session-2025-01-01-test-session-123.json";
     const mockConversation: ConversationRecord = {
-      sessionId: 'existing-session-456',
-      messages: [{ type: 'user', content: 'Hello' } as MessageRecord],
+      sessionId: "existing-session-456",
+      messages: [{ type: "user", content: "Hello" } as MessageRecord],
     } as ConversationRecord;
 
     const mockSession = {
@@ -75,38 +64,30 @@ describe('useSessionBrowser', () => {
     mockedGetSessionFiles.mockResolvedValue([mockSession]);
     mockedFs.readFile.mockResolvedValue(JSON.stringify(mockConversation));
 
-    const { result } = renderHook(() =>
-      useSessionBrowser(mockConfig, mockOnLoadHistory),
-    );
+    const { result } = renderHook(() => useSessionBrowser(mockConfig, mockOnLoadHistory));
 
     await act(async () => {
       await result.current.handleResumeSession(mockSession);
     });
     expect(mockedFs.readFile).toHaveBeenCalledWith(
       `${MOCKED_CHATS_DIR}/${MOCKED_FILENAME}`,
-      'utf8',
-    );
-    expect(mockConfig.setSessionId).toHaveBeenCalledWith(
-      'existing-session-456',
+      "utf8",
     );
+    expect(mockConfig.setSessionId).toHaveBeenCalledWith("existing-session-456");
     expect(result.current.isSessionBrowserOpen).toBe(false);
     expect(mockOnLoadHistory).toHaveBeenCalled();
   });
 
-  it('should handle file read error', async () => {
-    const MOCKED_FILENAME = 'session-2025-01-01-test-session-123.json';
+  it("should handle file read error", async () => {
+    const MOCKED_FILENAME = "session-2025-01-01-test-session-123.json";
     const mockSession = {
       id: MOCKED_SESSION_ID,
       fileName: MOCKED_FILENAME,
     } as SessionInfo;
-    mockedFs.readFile.mockRejectedValue(new Error('File not found'));
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
+    mockedFs.readFile.mockRejectedValue(new Error("File not found"));
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
-    const { result } = renderHook(() =>
-      useSessionBrowser(mockConfig, mockOnLoadHistory),
-    );
+    const { result } = renderHook(() => useSessionBrowser(mockConfig, mockOnLoadHistory));
 
     await act(async () => {
       await result.current.handleResumeSession(mockSession);
@@ -117,20 +98,16 @@ describe('useSessionBrowser', () => {
     consoleErrorSpy.mockRestore();
   });
 
-  it('should handle JSON parse error', async () => {
-    const MOCKED_FILENAME = 'invalid.json';
+  it("should handle JSON parse error", async () => {
+    const MOCKED_FILENAME = "invalid.json";
     const mockSession = {
       id: MOCKED_SESSION_ID,
       fileName: MOCKED_FILENAME,
     } as SessionInfo;
-    mockedFs.readFile.mockResolvedValue('invalid json');
-    const consoleErrorSpy = vi
-      .spyOn(console, 'error')
-      .mockImplementation(() => {});
+    mockedFs.readFile.mockResolvedValue("invalid json");
+    const consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
-    const { result } = renderHook(() =>
-      useSessionBrowser(mockConfig, mockOnLoadHistory),
-    );
+    const { result } = renderHook(() => useSessionBrowser(mockConfig, mockOnLoadHistory));
 
     await act(async () => {
       await result.current.handleResumeSession(mockSession);
@@ -143,70 +120,70 @@ describe('useSessionBrowser', () => {
 });
 
 // The convertSessionToHistoryFormats tests are self-contained and do not need changes.
-describe('convertSessionToHistoryFormats', () => {
-  it('should convert empty messages array', () => {
+describe("convertSessionToHistoryFormats", () => {
+  it("should convert empty messages array", () => {
     const result = convertSessionToHistoryFormats([]);
     expect(result.uiHistory).toEqual([]);
     expect(result.clientHistory).toEqual([]);
   });
 
-  it('should convert basic user and model messages', () => {
+  it("should convert basic user and model messages", () => {
     const messages: MessageRecord[] = [
-      { type: 'user', content: 'Hello' } as MessageRecord,
-      { type: 'gemini', content: 'Hi there' } as MessageRecord,
+      { type: "user", content: "Hello" } as MessageRecord,
+      { type: "gemini", content: "Hi there" } as MessageRecord,
     ];
 
     const result = convertSessionToHistoryFormats(messages);
 
     expect(result.uiHistory).toHaveLength(2);
-    expect(result.uiHistory[0]).toMatchObject({ type: 'user', text: 'Hello' });
+    expect(result.uiHistory[0]).toMatchObject({ type: "user", text: "Hello" });
     expect(result.uiHistory[1]).toMatchObject({
-      type: 'gemini',
-      text: 'Hi there',
+      type: "gemini",
+      text: "Hi there",
     });
 
     expect(result.clientHistory).toHaveLength(2);
     expect(result.clientHistory[0]).toEqual({
-      role: 'user',
-      parts: [{ text: 'Hello' }],
+      role: "user",
+      parts: [{ text: "Hello" }],
     });
     expect(result.clientHistory[1]).toEqual({
-      role: 'model',
-      parts: [{ text: 'Hi there' }],
+      role: "model",
+      parts: [{ text: "Hi there" }],
     });
   });
 
-  it('should filter out slash commands from client history but keep in UI', () => {
+  it("should filter out slash commands from client history but keep in UI", () => {
     const messages: MessageRecord[] = [
-      { type: 'user', content: '/help' } as MessageRecord,
-      { type: 'info', content: 'Help text' } as MessageRecord,
+      { type: "user", content: "/help" } as MessageRecord,
+      { type: "info", content: "Help text" } as MessageRecord,
     ];
 
     const result = convertSessionToHistoryFormats(messages);
 
     expect(result.uiHistory).toHaveLength(2);
-    expect(result.uiHistory[0]).toMatchObject({ type: 'user', text: '/help' });
+    expect(result.uiHistory[0]).toMatchObject({ type: "user", text: "/help" });
     expect(result.uiHistory[1]).toMatchObject({
-      type: 'info',
-      text: 'Help text',
+      type: "info",
+      text: "Help text",
     });
 
     expect(result.clientHistory).toHaveLength(0);
   });
 
-  it('should handle tool calls and responses', () => {
+  it("should handle tool calls and responses", () => {
     const messages: MessageRecord[] = [
-      { type: 'user', content: 'What time is it?' } as MessageRecord,
+      { type: "user", content: "What time is it?" } as MessageRecord,
       {
-        type: 'gemini',
-        content: '',
+        type: "gemini",
+        content: "",
         toolCalls: [
           {
-            id: 'call_1',
-            name: 'get_time',
+            id: "call_1",
+            name: "get_time",
             args: {},
-            status: 'success',
-            result: '12:00',
+            status: "success",
+            result: "12:00",
           },
         ],
       } as unknown as MessageRecord,
@@ -216,45 +193,45 @@ describe('convertSessionToHistoryFormats', () => {
 
     expect(result.uiHistory).toHaveLength(2);
     expect(result.uiHistory[0]).toMatchObject({
-      type: 'user',
-      text: 'What time is it?',
+      type: "user",
+      text: "What time is it?",
     });
     expect(result.uiHistory[1]).toMatchObject({
-      type: 'tool_group',
+      type: "tool_group",
       tools: [
         expect.objectContaining({
-          callId: 'call_1',
-          name: 'get_time',
-          status: 'Success',
+          callId: "call_1",
+          name: "get_time",
+          status: "Success",
         }),
       ],
     });
 
     expect(result.clientHistory).toHaveLength(3); // User, Model (call), User (response)
     expect(result.clientHistory[0]).toEqual({
-      role: 'user',
-      parts: [{ text: 'What time is it?' }],
+      role: "user",
+      parts: [{ text: "What time is it?" }],
     });
     expect(result.clientHistory[1]).toEqual({
-      role: 'model',
+      role: "model",
       parts: [
         {
           functionCall: {
-            name: 'get_time',
+            name: "get_time",
             args: {},
-            id: 'call_1',
+            id: "call_1",
           },
         },
       ],
     });
     expect(result.clientHistory[2]).toEqual({
-      role: 'user',
+      role: "user",
       parts: [
         {
           functionResponse: {
-            id: 'call_1',
-            name: 'get_time',
-            response: { output: '12:00' },
+            id: "call_1",
+            name: "get_time",
+            response: { output: "12:00" },
           },
         },
       ],
diff --git a/packages/ui-gemini/src/ui/hooks/useSessionBrowser.ts b/packages/ui-gemini/src/ui/hooks/useSessionBrowser.ts
index 34fee0e32..fda8a8cbb 100644
--- a/packages/ui-gemini/src/ui/hooks/useSessionBrowser.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSessionBrowser.ts
@@ -4,25 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import type { HistoryItemWithoutId } from '../types.js';
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import type {
-  Config,
-  ConversationRecord,
-  ResumedSessionData,
-} from '@airiscode/gemini-cli-core';
-import type { Part } from '@google/genai';
-import { partListUnionToString } from '@airiscode/gemini-cli-core';
-import type { SessionInfo } from '../../utils/sessionUtils.js';
-import { MessageType, ToolCallStatus } from '../types.js';
+import * as fs from "node:fs/promises";
+import path from "node:path";
+import type { Config, ConversationRecord, ResumedSessionData } from "@airiscode/gemini-cli-core";
+import { partListUnionToString } from "@airiscode/gemini-cli-core";
+import type { Part } from "@google/genai";
+import { useCallback, useState } from "react";
+import type { SessionInfo } from "../../utils/sessionUtils.js";
+import type { HistoryItemWithoutId } from "../types.js";
+import { MessageType, ToolCallStatus } from "../types.js";
 
 export const useSessionBrowser = (
   config: Config,
   onLoadHistory: (
     uiHistory: HistoryItemWithoutId[],
-    clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }>,
+    clientHistory: Array<{ role: "user" | "model"; parts: Part[] }>,
     resumedSessionData: ResumedSessionData,
   ) => void,
 ) => {
@@ -45,10 +41,7 @@ export const useSessionBrowser = (
     handleResumeSession: useCallback(
       async (session: SessionInfo) => {
         try {
-          const chatsDir = path.join(
-            config.storage.getProjectTempDir(),
-            'chats',
-          );
+          const chatsDir = path.join(config.storage.getProjectTempDir(), "chats");
 
           const fileName = session.fileName;
 
@@ -56,7 +49,7 @@ export const useSessionBrowser = (
 
           // Load up the conversation.
           const conversation: ConversationRecord = JSON.parse(
-            await fs.readFile(originalFilePath, 'utf8'),
+            await fs.readFile(originalFilePath, "utf8"),
           );
 
           // Use the old session's ID to continue it.
@@ -70,16 +63,10 @@ export const useSessionBrowser = (
 
           // We've loaded it; tell the UI about it.
           setIsSessionBrowserOpen(false);
-          const historyData = convertSessionToHistoryFormats(
-            conversation.messages,
-          );
-          onLoadHistory(
-            historyData.uiHistory,
-            historyData.clientHistory,
-            resumedSessionData,
-          );
+          const historyData = convertSessionToHistoryFormats(conversation.messages);
+          onLoadHistory(historyData.uiHistory, historyData.clientHistory, resumedSessionData);
         } catch (error) {
-          console.error('Error resuming session:', error);
+          console.error("Error resuming session:", error);
           setIsSessionBrowserOpen(false);
         }
       },
@@ -96,14 +83,12 @@ export const useSessionBrowser = (
         // The ChatRecordingService.deleteSession API expects this file basename
         // (without the ".json" extension), not the full session UUID.
         try {
-          const chatRecordingService = config
-            .getGeminiClient()
-            ?.getChatRecordingService();
+          const chatRecordingService = config.getGeminiClient()?.getChatRecordingService();
           if (chatRecordingService) {
             chatRecordingService.deleteSession(session.file);
           }
         } catch (error) {
-          console.error('Error deleting session:', error);
+          console.error("Error deleting session:", error);
           throw error;
         }
       },
@@ -115,11 +100,9 @@ export const useSessionBrowser = (
 /**
  * Converts session/conversation data into UI history and Gemini client history formats.
  */
-export function convertSessionToHistoryFormats(
-  messages: ConversationRecord['messages'],
-): {
+export function convertSessionToHistoryFormats(messages: ConversationRecord["messages"]): {
   uiHistory: HistoryItemWithoutId[];
-  clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }>;
+  clientHistory: Array<{ role: "user" | "model"; parts: Part[] }>;
 } {
   const uiHistory: HistoryItemWithoutId[] = [];
 
@@ -129,16 +112,16 @@ export function convertSessionToHistoryFormats(
     if (msg.content && contentString.trim()) {
       let messageType: MessageType;
       switch (msg.type) {
-        case 'user':
+        case "user":
           messageType = MessageType.USER;
           break;
-        case 'info':
+        case "info":
           messageType = MessageType.INFO;
           break;
-        case 'error':
+        case "error":
           messageType = MessageType.ERROR;
           break;
-        case 'warning':
+        case "warning":
           messageType = MessageType.WARNING;
           break;
         default:
@@ -153,23 +136,15 @@ export function convertSessionToHistoryFormats(
     }
 
     // Add tool calls if present
-    if (
-      msg.type !== 'user' &&
-      'toolCalls' in msg &&
-      msg.toolCalls &&
-      msg.toolCalls.length > 0
-    ) {
+    if (msg.type !== "user" && "toolCalls" in msg && msg.toolCalls && msg.toolCalls.length > 0) {
       uiHistory.push({
-        type: 'tool_group',
+        type: "tool_group",
         tools: msg.toolCalls.map((tool) => ({
           callId: tool.id,
           name: tool.displayName || tool.name,
-          description: tool.description || '',
+          description: tool.description || "",
           renderOutputAsMarkdown: tool.renderOutputAsMarkdown ?? true,
-          status:
-            tool.status === 'success'
-              ? ToolCallStatus.Success
-              : ToolCallStatus.Error,
+          status: tool.status === "success" ? ToolCallStatus.Success : ToolCallStatus.Error,
           resultDisplay: tool.resultDisplay,
           confirmationDetails: undefined,
         })),
@@ -178,30 +153,27 @@ export function convertSessionToHistoryFormats(
   }
 
   // Convert to Gemini client history format
-  const clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }> = [];
+  const clientHistory: Array<{ role: "user" | "model"; parts: Part[] }> = [];
 
   for (const msg of messages) {
     // Skip system/error messages and user slash commands
-    if (msg.type === 'info' || msg.type === 'error' || msg.type === 'warning') {
+    if (msg.type === "info" || msg.type === "error" || msg.type === "warning") {
       continue;
     }
 
-    if (msg.type === 'user') {
+    if (msg.type === "user") {
       // Skip user slash commands
       const contentString = partListUnionToString(msg.content);
-      if (
-        contentString.trim().startsWith('/') ||
-        contentString.trim().startsWith('?')
-      ) {
+      if (contentString.trim().startsWith("/") || contentString.trim().startsWith("?")) {
         continue;
       }
 
       // Add regular user message
       clientHistory.push({
-        role: 'user',
+        role: "user",
         parts: [{ text: contentString }],
       });
-    } else if (msg.type === 'gemini') {
+    } else if (msg.type === "gemini") {
       // Handle Gemini messages with potential tool calls
       const hasToolCalls = msg.toolCalls && msg.toolCalls.length > 0;
 
@@ -227,7 +199,7 @@ export function convertSessionToHistoryFormats(
         }
 
         clientHistory.push({
-          role: 'model',
+          role: "model",
           parts: modelParts,
         });
 
@@ -238,7 +210,7 @@ export function convertSessionToHistoryFormats(
             // Convert PartListUnion result to function response format
             let responseData: Part;
 
-            if (typeof toolCall.result === 'string') {
+            if (typeof toolCall.result === "string") {
               responseData = {
                 functionResponse: {
                   id: toolCall.id,
@@ -265,7 +237,7 @@ export function convertSessionToHistoryFormats(
         // Only add user message if we have function responses
         if (functionResponseParts.length > 0) {
           clientHistory.push({
-            role: 'user',
+            role: "user",
             parts: functionResponseParts,
           });
         }
@@ -274,7 +246,7 @@ export function convertSessionToHistoryFormats(
         const contentString = partListUnionToString(msg.content);
         if (msg.content && contentString.trim()) {
           clientHistory.push({
-            role: 'model',
+            role: "model",
             parts: [{ text: contentString }],
           });
         }
diff --git a/packages/ui-gemini/src/ui/hooks/useSessionResume.test.ts b/packages/ui-gemini/src/ui/hooks/useSessionResume.test.ts
index 007bfdeaf..8d0b966d1 100644
--- a/packages/ui-gemini/src/ui/hooks/useSessionResume.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSessionResume.test.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useSessionResume } from './useSessionResume.js';
 import type {
   Config,
-  ResumedSessionData,
   ConversationRecord,
   MessageRecord,
-} from '@airiscode/gemini-cli-core';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import type { HistoryItemWithoutId } from '../types.js';
-
-describe('useSessionResume', () => {
+  ResumedSessionData,
+} from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import type { HistoryItemWithoutId } from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { useSessionResume } from "./useSessionResume.js";
+
+describe("useSessionResume", () => {
   // Mock dependencies
   const mockGeminiClient = {
     resumeChat: vi.fn(),
@@ -55,43 +55,39 @@ describe('useSessionResume', () => {
     mockHistoryManager = createMockHistoryManager();
   });
 
-  describe('loadHistoryForResume', () => {
-    it('should return a loadHistoryForResume callback', () => {
+  describe("loadHistoryForResume", () => {
+    it("should return a loadHistoryForResume callback", () => {
       const { result } = renderHook(() => useSessionResume(getDefaultProps()));
 
       expect(result.current.loadHistoryForResume).toBeInstanceOf(Function);
     });
 
-    it('should clear history and add items when loading history', () => {
+    it("should clear history and add items when loading history", () => {
       const { result } = renderHook(() => useSessionResume(getDefaultProps()));
 
       const uiHistory: HistoryItemWithoutId[] = [
-        { type: 'user', text: 'Hello' },
-        { type: 'gemini', text: 'Hi there!' },
+        { type: "user", text: "Hello" },
+        { type: "gemini", text: "Hi there!" },
       ];
 
       const clientHistory = [
-        { role: 'user' as const, parts: [{ text: 'Hello' }] },
-        { role: 'model' as const, parts: [{ text: 'Hi there!' }] },
+        { role: "user" as const, parts: [{ text: "Hello" }] },
+        { role: "model" as const, parts: [{ text: "Hi there!" }] },
       ];
 
       const resumedData: ResumedSessionData = {
         conversation: {
-          sessionId: 'test-123',
-          projectHash: 'project-123',
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T01:00:00Z',
+          sessionId: "test-123",
+          projectHash: "project-123",
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T01:00:00Z",
           messages: [] as MessageRecord[],
         },
-        filePath: '/path/to/session.json',
+        filePath: "/path/to/session.json",
       };
 
       act(() => {
-        result.current.loadHistoryForResume(
-          uiHistory,
-          clientHistory,
-          resumedData,
-        );
+        result.current.loadHistoryForResume(uiHistory, clientHistory, resumedData);
       });
 
       expect(mockSetQuittingMessages).toHaveBeenCalledWith(null);
@@ -99,24 +95,21 @@ describe('useSessionResume', () => {
       expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(2);
       expect(mockHistoryManager.addItem).toHaveBeenNthCalledWith(
         1,
-        { type: 'user', text: 'Hello' },
+        { type: "user", text: "Hello" },
         0,
         true,
       );
       expect(mockHistoryManager.addItem).toHaveBeenNthCalledWith(
         2,
-        { type: 'gemini', text: 'Hi there!' },
+        { type: "gemini", text: "Hi there!" },
         1,
         true,
       );
       expect(mockRefreshStatic).toHaveBeenCalled();
-      expect(mockGeminiClient.resumeChat).toHaveBeenCalledWith(
-        clientHistory,
-        resumedData,
-      );
+      expect(mockGeminiClient.resumeChat).toHaveBeenCalledWith(clientHistory, resumedData);
     });
 
-    it('should not load history if Gemini client is not initialized', () => {
+    it("should not load history if Gemini client is not initialized", () => {
       const { result } = renderHook(() =>
         useSessionResume({
           ...getDefaultProps(),
@@ -124,29 +117,21 @@ describe('useSessionResume', () => {
         }),
       );
 
-      const uiHistory: HistoryItemWithoutId[] = [
-        { type: 'user', text: 'Hello' },
-      ];
-      const clientHistory = [
-        { role: 'user' as const, parts: [{ text: 'Hello' }] },
-      ];
+      const uiHistory: HistoryItemWithoutId[] = [{ type: "user", text: "Hello" }];
+      const clientHistory = [{ role: "user" as const, parts: [{ text: "Hello" }] }];
       const resumedData: ResumedSessionData = {
         conversation: {
-          sessionId: 'test-123',
-          projectHash: 'project-123',
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T01:00:00Z',
+          sessionId: "test-123",
+          projectHash: "project-123",
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T01:00:00Z",
           messages: [] as MessageRecord[],
         },
-        filePath: '/path/to/session.json',
+        filePath: "/path/to/session.json",
       };
 
       act(() => {
-        result.current.loadHistoryForResume(
-          uiHistory,
-          clientHistory,
-          resumedData,
-        );
+        result.current.loadHistoryForResume(uiHistory, clientHistory, resumedData);
       });
 
       expect(mockHistoryManager.clearItems).not.toHaveBeenCalled();
@@ -154,18 +139,18 @@ describe('useSessionResume', () => {
       expect(mockGeminiClient.resumeChat).not.toHaveBeenCalled();
     });
 
-    it('should handle empty history arrays', () => {
+    it("should handle empty history arrays", () => {
       const { result } = renderHook(() => useSessionResume(getDefaultProps()));
 
       const resumedData: ResumedSessionData = {
         conversation: {
-          sessionId: 'test-123',
-          projectHash: 'project-123',
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T01:00:00Z',
+          sessionId: "test-123",
+          projectHash: "project-123",
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T01:00:00Z",
           messages: [] as MessageRecord[],
         },
-        filePath: '/path/to/session.json',
+        filePath: "/path/to/session.json",
       };
 
       act(() => {
@@ -179,11 +164,9 @@ describe('useSessionResume', () => {
     });
   });
 
-  describe('callback stability', () => {
-    it('should maintain stable loadHistoryForResume reference across renders', () => {
-      const { result, rerender } = renderHook(() =>
-        useSessionResume(getDefaultProps()),
-      );
+  describe("callback stability", () => {
+    it("should maintain stable loadHistoryForResume reference across renders", () => {
+      const { result, rerender } = renderHook(() => useSessionResume(getDefaultProps()));
 
       const initialCallback = result.current.loadHistoryForResume;
 
@@ -192,7 +175,7 @@ describe('useSessionResume', () => {
       expect(result.current.loadHistoryForResume).toBe(initialCallback);
     });
 
-    it('should update callback when config changes', () => {
+    it("should update callback when config changes", () => {
       const { result, rerender } = renderHook(
         ({ config }: { config: Config }) =>
           useSessionResume({
@@ -216,8 +199,8 @@ describe('useSessionResume', () => {
     });
   });
 
-  describe('automatic resume on mount', () => {
-    it('should not resume when resumedSessionData is not provided', () => {
+  describe("automatic resume on mount", () => {
+    it("should not resume when resumedSessionData is not provided", () => {
       renderHook(() => useSessionResume(getDefaultProps()));
 
       expect(mockHistoryManager.clearItems).not.toHaveBeenCalled();
@@ -225,18 +208,18 @@ describe('useSessionResume', () => {
       expect(mockGeminiClient.resumeChat).not.toHaveBeenCalled();
     });
 
-    it('should not resume when user is authenticating', () => {
+    it("should not resume when user is authenticating", () => {
       const conversation: ConversationRecord = {
-        sessionId: 'auto-resume-123',
-        projectHash: 'project-123',
-        startTime: '2025-01-01T00:00:00Z',
-        lastUpdated: '2025-01-01T01:00:00Z',
+        sessionId: "auto-resume-123",
+        projectHash: "project-123",
+        startTime: "2025-01-01T00:00:00Z",
+        lastUpdated: "2025-01-01T01:00:00Z",
         messages: [
           {
-            id: 'msg-1',
-            timestamp: '2025-01-01T00:01:00Z',
-            content: 'Test message',
-            type: 'user',
+            id: "msg-1",
+            timestamp: "2025-01-01T00:01:00Z",
+            content: "Test message",
+            type: "user",
           },
         ] as MessageRecord[],
       };
@@ -246,7 +229,7 @@ describe('useSessionResume', () => {
           ...getDefaultProps(),
           resumedSessionData: {
             conversation,
-            filePath: '/path/to/session.json',
+            filePath: "/path/to/session.json",
           },
           isAuthenticating: true,
         }),
@@ -257,18 +240,18 @@ describe('useSessionResume', () => {
       expect(mockGeminiClient.resumeChat).not.toHaveBeenCalled();
     });
 
-    it('should not resume when Gemini client is not initialized', () => {
+    it("should not resume when Gemini client is not initialized", () => {
       const conversation: ConversationRecord = {
-        sessionId: 'auto-resume-123',
-        projectHash: 'project-123',
-        startTime: '2025-01-01T00:00:00Z',
-        lastUpdated: '2025-01-01T01:00:00Z',
+        sessionId: "auto-resume-123",
+        projectHash: "project-123",
+        startTime: "2025-01-01T00:00:00Z",
+        lastUpdated: "2025-01-01T01:00:00Z",
         messages: [
           {
-            id: 'msg-1',
-            timestamp: '2025-01-01T00:01:00Z',
-            content: 'Test message',
-            type: 'user',
+            id: "msg-1",
+            timestamp: "2025-01-01T00:01:00Z",
+            content: "Test message",
+            type: "user",
           },
         ] as MessageRecord[],
       };
@@ -278,7 +261,7 @@ describe('useSessionResume', () => {
           ...getDefaultProps(),
           resumedSessionData: {
             conversation,
-            filePath: '/path/to/session.json',
+            filePath: "/path/to/session.json",
           },
           isGeminiClientInitialized: false,
         }),
@@ -289,24 +272,24 @@ describe('useSessionResume', () => {
       expect(mockGeminiClient.resumeChat).not.toHaveBeenCalled();
     });
 
-    it('should automatically resume session when resumedSessionData is provided', async () => {
+    it("should automatically resume session when resumedSessionData is provided", async () => {
       const conversation: ConversationRecord = {
-        sessionId: 'auto-resume-123',
-        projectHash: 'project-123',
-        startTime: '2025-01-01T00:00:00Z',
-        lastUpdated: '2025-01-01T01:00:00Z',
+        sessionId: "auto-resume-123",
+        projectHash: "project-123",
+        startTime: "2025-01-01T00:00:00Z",
+        lastUpdated: "2025-01-01T01:00:00Z",
         messages: [
           {
-            id: 'msg-1',
-            timestamp: '2025-01-01T00:01:00Z',
-            content: 'Hello from resumed session',
-            type: 'user',
+            id: "msg-1",
+            timestamp: "2025-01-01T00:01:00Z",
+            content: "Hello from resumed session",
+            type: "user",
           },
           {
-            id: 'msg-2',
-            timestamp: '2025-01-01T00:02:00Z',
-            content: 'Welcome back!',
-            type: 'gemini',
+            id: "msg-2",
+            timestamp: "2025-01-01T00:02:00Z",
+            content: "Welcome back!",
+            type: "gemini",
           },
         ] as MessageRecord[],
       };
@@ -316,7 +299,7 @@ describe('useSessionResume', () => {
           ...getDefaultProps(),
           resumedSessionData: {
             conversation,
-            filePath: '/path/to/session.json',
+            filePath: "/path/to/session.json",
           },
         }),
       );
@@ -328,31 +311,31 @@ describe('useSessionResume', () => {
       expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(2);
       expect(mockHistoryManager.addItem).toHaveBeenNthCalledWith(
         1,
-        { type: 'user', text: 'Hello from resumed session' },
+        { type: "user", text: "Hello from resumed session" },
         0,
         true,
       );
       expect(mockHistoryManager.addItem).toHaveBeenNthCalledWith(
         2,
-        { type: 'gemini', text: 'Welcome back!' },
+        { type: "gemini", text: "Welcome back!" },
         1,
         true,
       );
       expect(mockGeminiClient.resumeChat).toHaveBeenCalled();
     });
 
-    it('should only resume once even if props change', async () => {
+    it("should only resume once even if props change", async () => {
       const conversation: ConversationRecord = {
-        sessionId: 'auto-resume-123',
-        projectHash: 'project-123',
-        startTime: '2025-01-01T00:00:00Z',
-        lastUpdated: '2025-01-01T01:00:00Z',
+        sessionId: "auto-resume-123",
+        projectHash: "project-123",
+        startTime: "2025-01-01T00:00:00Z",
+        lastUpdated: "2025-01-01T01:00:00Z",
         messages: [
           {
-            id: 'msg-1',
-            timestamp: '2025-01-01T00:01:00Z',
-            content: 'Test message',
-            type: 'user',
+            id: "msg-1",
+            timestamp: "2025-01-01T00:01:00Z",
+            content: "Test message",
+            type: "user",
           },
         ] as MessageRecord[],
       };
@@ -364,7 +347,7 @@ describe('useSessionResume', () => {
             refreshStatic,
             resumedSessionData: {
               conversation,
-              filePath: '/path/to/session.json',
+              filePath: "/path/to/session.json",
             },
           }),
         {
@@ -376,38 +359,35 @@ describe('useSessionResume', () => {
         expect(mockHistoryManager.clearItems).toHaveBeenCalled();
       });
 
-      const clearItemsCallCount = (
-        mockHistoryManager.clearItems as ReturnType<typeof vi.fn>
-      ).mock.calls.length;
+      const clearItemsCallCount = (mockHistoryManager.clearItems as ReturnType<typeof vi.fn>).mock
+        .calls.length;
 
       // Rerender with different refreshStatic
       const newRefreshStatic = vi.fn();
       rerender({ refreshStatic: newRefreshStatic });
 
       // Should not resume again
-      expect(mockHistoryManager.clearItems).toHaveBeenCalledTimes(
-        clearItemsCallCount,
-      );
+      expect(mockHistoryManager.clearItems).toHaveBeenCalledTimes(clearItemsCallCount);
     });
 
-    it('should convert session messages correctly during auto-resume', async () => {
+    it("should convert session messages correctly during auto-resume", async () => {
       const conversation: ConversationRecord = {
-        sessionId: 'auto-resume-with-tools',
-        projectHash: 'project-123',
-        startTime: '2025-01-01T00:00:00Z',
-        lastUpdated: '2025-01-01T01:00:00Z',
+        sessionId: "auto-resume-with-tools",
+        projectHash: "project-123",
+        startTime: "2025-01-01T00:00:00Z",
+        lastUpdated: "2025-01-01T01:00:00Z",
         messages: [
           {
-            id: 'msg-1',
-            timestamp: '2025-01-01T00:01:00Z',
-            content: '/help',
-            type: 'user',
+            id: "msg-1",
+            timestamp: "2025-01-01T00:01:00Z",
+            content: "/help",
+            type: "user",
           },
           {
-            id: 'msg-2',
-            timestamp: '2025-01-01T00:02:00Z',
-            content: 'Regular message',
-            type: 'user',
+            id: "msg-2",
+            timestamp: "2025-01-01T00:02:00Z",
+            content: "Regular message",
+            type: "user",
           },
         ] as MessageRecord[],
       };
@@ -417,7 +397,7 @@ describe('useSessionResume', () => {
           ...getDefaultProps(),
           resumedSessionData: {
             conversation,
-            filePath: '/path/to/session.json',
+            filePath: "/path/to/session.json",
           },
         }),
       );
@@ -433,8 +413,8 @@ describe('useSessionResume', () => {
       // Should only have the non-slash-command message
       expect(clientHistory).toHaveLength(1);
       expect(clientHistory[0]).toEqual({
-        role: 'user',
-        parts: [{ text: 'Regular message' }],
+        role: "user",
+        parts: [{ text: "Regular message" }],
       });
 
       // But UI history should have both
diff --git a/packages/ui-gemini/src/ui/hooks/useSessionResume.ts b/packages/ui-gemini/src/ui/hooks/useSessionResume.ts
index 15ba97df0..5d46fa015 100644
--- a/packages/ui-gemini/src/ui/hooks/useSessionResume.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSessionResume.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useEffect, useRef } from 'react';
-import type { Config, ResumedSessionData } from '@airiscode/gemini-cli-core';
-import type { Part } from '@google/genai';
-import type { HistoryItemWithoutId } from '../types.js';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
-import { convertSessionToHistoryFormats } from './useSessionBrowser.js';
+import type { Config, ResumedSessionData } from "@airiscode/gemini-cli-core";
+import type { Part } from "@google/genai";
+import { useCallback, useEffect, useRef } from "react";
+import type { HistoryItemWithoutId } from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
+import { convertSessionToHistoryFormats } from "./useSessionBrowser.js";
 
 interface UseSessionResumeParams {
   config: Config;
@@ -47,7 +47,7 @@ export function useSessionResume({
   const loadHistoryForResume = useCallback(
     (
       uiHistory: HistoryItemWithoutId[],
-      clientHistory: Array<{ role: 'user' | 'model'; parts: Part[] }>,
+      clientHistory: Array<{ role: "user" | "model"; parts: Part[] }>,
       resumedData: ResumedSessionData,
     ) => {
       // Wait for the client.
@@ -81,21 +81,10 @@ export function useSessionResume({
       !hasLoadedResumedSession.current
     ) {
       hasLoadedResumedSession.current = true;
-      const historyData = convertSessionToHistoryFormats(
-        resumedSessionData.conversation.messages,
-      );
-      loadHistoryForResume(
-        historyData.uiHistory,
-        historyData.clientHistory,
-        resumedSessionData,
-      );
+      const historyData = convertSessionToHistoryFormats(resumedSessionData.conversation.messages);
+      loadHistoryForResume(historyData.uiHistory, historyData.clientHistory, resumedSessionData);
     }
-  }, [
-    resumedSessionData,
-    isAuthenticating,
-    isGeminiClientInitialized,
-    loadHistoryForResume,
-  ]);
+  }, [resumedSessionData, isAuthenticating, isGeminiClientInitialized, loadHistoryForResume]);
 
   return { loadHistoryForResume };
 }
diff --git a/packages/ui-gemini/src/ui/hooks/useSettingsCommand.ts b/packages/ui-gemini/src/ui/hooks/useSettingsCommand.ts
index 42f535dff..82a7b6117 100644
--- a/packages/ui-gemini/src/ui/hooks/useSettingsCommand.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSettingsCommand.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
+import { useCallback, useState } from "react";
 
 export function useSettingsCommand() {
   const [isSettingsDialogOpen, setIsSettingsDialogOpen] = useState(false);
diff --git a/packages/ui-gemini/src/ui/hooks/useShellHistory.test.ts b/packages/ui-gemini/src/ui/hooks/useShellHistory.test.ts
index 2d88bb7b4..e95d2e417 100644
--- a/packages/ui-gemini/src/ui/hooks/useShellHistory.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useShellHistory.test.ts
@@ -4,86 +4,74 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useShellHistory } from './useShellHistory.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import { GEMINI_DIR } from '@airiscode/gemini-cli-core';
-
-vi.mock('node:fs/promises', () => ({
+import * as crypto from "node:crypto";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { GEMINI_DIR } from "@airiscode/gemini-cli-core";
+import { act } from "react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import { useShellHistory } from "./useShellHistory.js";
+
+vi.mock("node:fs/promises", () => ({
   readFile: vi.fn(),
   writeFile: vi.fn(),
   mkdir: vi.fn(),
 }));
-const mockHomedir = vi.hoisted(() => vi.fn(() => '/tmp/mock-home'));
-vi.mock('node:os', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:os')>();
+const mockHomedir = vi.hoisted(() => vi.fn(() => "/tmp/mock-home"));
+vi.mock("node:os", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:os")>();
   return {
     ...actual,
     homedir: mockHomedir,
   };
 });
-vi.mock('node:crypto');
-vi.mock('node:fs', async (importOriginal) => {
-  const actualFs = await importOriginal<typeof import('node:fs')>();
+vi.mock("node:crypto");
+vi.mock("node:fs", async (importOriginal) => {
+  const actualFs = await importOriginal<typeof import("node:fs")>();
   return {
     ...actualFs,
     mkdirSync: vi.fn(),
   };
 });
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
-  const path = await import('node:path');
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
+  const path = await import("node:path");
   class Storage {
     static getGlobalSettingsPath(): string {
-      return '/test/home/.gemini/settings.json';
+      return "/test/home/.gemini/settings.json";
     }
     getProjectTempDir(): string {
-      return path.join('/test/home/', actual.GEMINI_DIR, 'tmp', 'mocked_hash');
+      return path.join("/test/home/", actual.GEMINI_DIR, "tmp", "mocked_hash");
     }
     getHistoryFilePath(): string {
-      return path.join(
-        '/test/home/',
-        actual.GEMINI_DIR,
-        'tmp',
-        'mocked_hash',
-        'shell_history',
-      );
+      return path.join("/test/home/", actual.GEMINI_DIR, "tmp", "mocked_hash", "shell_history");
     }
   }
   return {
     ...actual,
     isNodeError: (err: unknown): err is NodeJS.ErrnoException =>
-      typeof err === 'object' && err !== null && 'code' in err,
+      typeof err === "object" && err !== null && "code" in err,
     Storage,
   };
 });
 
-const MOCKED_PROJECT_ROOT = '/test/project';
-const MOCKED_HOME_DIR = '/test/home';
-const MOCKED_PROJECT_HASH = 'mocked_hash';
+const MOCKED_PROJECT_ROOT = "/test/project";
+const MOCKED_HOME_DIR = "/test/home";
+const MOCKED_PROJECT_HASH = "mocked_hash";
 
-const MOCKED_HISTORY_DIR = path.join(
-  MOCKED_HOME_DIR,
-  GEMINI_DIR,
-  'tmp',
-  MOCKED_PROJECT_HASH,
-);
-const MOCKED_HISTORY_FILE = path.join(MOCKED_HISTORY_DIR, 'shell_history');
+const MOCKED_HISTORY_DIR = path.join(MOCKED_HOME_DIR, GEMINI_DIR, "tmp", MOCKED_PROJECT_HASH);
+const MOCKED_HISTORY_FILE = path.join(MOCKED_HISTORY_DIR, "shell_history");
 
-describe('useShellHistory', () => {
+describe("useShellHistory", () => {
   const mockedFs = vi.mocked(fs);
   const mockedCrypto = vi.mocked(crypto);
 
   beforeEach(() => {
     vi.resetAllMocks();
 
-    mockedFs.readFile.mockResolvedValue('');
+    mockedFs.readFile.mockResolvedValue("");
     mockedFs.writeFile.mockResolvedValue(undefined);
     mockedFs.mkdir.mockResolvedValue(undefined);
     mockHomedir.mockReturnValue(MOCKED_HOME_DIR);
@@ -95,17 +83,12 @@ describe('useShellHistory', () => {
     mockedCrypto.createHash.mockReturnValue(hashMock as never);
   });
 
-  it('should initialize and read the history file from the correct path', async () => {
-    mockedFs.readFile.mockResolvedValue('cmd1\ncmd2');
-    const { result, unmount } = renderHook(() =>
-      useShellHistory(MOCKED_PROJECT_ROOT),
-    );
+  it("should initialize and read the history file from the correct path", async () => {
+    mockedFs.readFile.mockResolvedValue("cmd1\ncmd2");
+    const { result, unmount } = renderHook(() => useShellHistory(MOCKED_PROJECT_ROOT));
 
     await waitFor(() => {
-      expect(mockedFs.readFile).toHaveBeenCalledWith(
-        MOCKED_HISTORY_FILE,
-        'utf-8',
-      );
+      expect(mockedFs.readFile).toHaveBeenCalledWith(MOCKED_HISTORY_FILE, "utf-8");
     });
 
     let command: string | null = null;
@@ -114,19 +97,17 @@ describe('useShellHistory', () => {
     });
 
     // History is loaded newest-first: ['cmd2', 'cmd1']
-    expect(command).toBe('cmd2');
+    expect(command).toBe("cmd2");
 
     unmount();
   });
 
-  it('should handle a nonexistent history file gracefully', async () => {
-    const error = new Error('File not found') as NodeJS.ErrnoException;
-    error.code = 'ENOENT';
+  it("should handle a nonexistent history file gracefully", async () => {
+    const error = new Error("File not found") as NodeJS.ErrnoException;
+    error.code = "ENOENT";
     mockedFs.readFile.mockRejectedValue(error);
 
-    const { result, unmount } = renderHook(() =>
-      useShellHistory(MOCKED_PROJECT_ROOT),
-    );
+    const { result, unmount } = renderHook(() => useShellHistory(MOCKED_PROJECT_ROOT));
 
     await waitFor(() => {
       expect(mockedFs.readFile).toHaveBeenCalled();
@@ -142,17 +123,15 @@ describe('useShellHistory', () => {
     unmount();
   });
 
-  it('should add a command and write to the history file', async () => {
-    const { result, unmount } = renderHook(() =>
-      useShellHistory(MOCKED_PROJECT_ROOT),
-    );
+  it("should add a command and write to the history file", async () => {
+    const { result, unmount } = renderHook(() => useShellHistory(MOCKED_PROJECT_ROOT));
 
     await waitFor(() => {
       expect(mockedFs.readFile).toHaveBeenCalled();
     });
 
     act(() => {
-      result.current.addCommandToHistory('new_command');
+      result.current.addCommandToHistory("new_command");
     });
 
     await waitFor(() => {
@@ -161,7 +140,7 @@ describe('useShellHistory', () => {
       });
       expect(mockedFs.writeFile).toHaveBeenCalledWith(
         MOCKED_HISTORY_FILE,
-        'new_command', // Written to file oldest-first.
+        "new_command", // Written to file oldest-first.
       );
     });
 
@@ -169,16 +148,14 @@ describe('useShellHistory', () => {
     act(() => {
       command = result.current.getPreviousCommand();
     });
-    expect(command).toBe('new_command');
+    expect(command).toBe("new_command");
 
     unmount();
   });
 
-  it('should navigate history correctly with previous/next commands', async () => {
-    mockedFs.readFile.mockResolvedValue('cmd1\ncmd2\ncmd3');
-    const { result, unmount } = renderHook(() =>
-      useShellHistory(MOCKED_PROJECT_ROOT),
-    );
+  it("should navigate history correctly with previous/next commands", async () => {
+    mockedFs.readFile.mockResolvedValue("cmd1\ncmd2\ncmd3");
+    const { result, unmount } = renderHook(() => useShellHistory(MOCKED_PROJECT_ROOT));
 
     // Wait for history to be loaded: ['cmd3', 'cmd2', 'cmd1']
     await waitFor(() => {
@@ -190,54 +167,52 @@ describe('useShellHistory', () => {
     act(() => {
       command = result.current.getPreviousCommand();
     });
-    expect(command).toBe('cmd3');
+    expect(command).toBe("cmd3");
 
     act(() => {
       command = result.current.getPreviousCommand();
     });
-    expect(command).toBe('cmd2');
+    expect(command).toBe("cmd2");
 
     act(() => {
       command = result.current.getPreviousCommand();
     });
-    expect(command).toBe('cmd1');
+    expect(command).toBe("cmd1");
 
     // Should stay at the oldest command
     act(() => {
       command = result.current.getPreviousCommand();
     });
-    expect(command).toBe('cmd1');
+    expect(command).toBe("cmd1");
 
     act(() => {
       command = result.current.getNextCommand();
     });
-    expect(command).toBe('cmd2');
+    expect(command).toBe("cmd2");
 
     act(() => {
       command = result.current.getNextCommand();
     });
-    expect(command).toBe('cmd3');
+    expect(command).toBe("cmd3");
 
     // Should return to the "new command" line (represented as empty string)
     act(() => {
       command = result.current.getNextCommand();
     });
-    expect(command).toBe('');
+    expect(command).toBe("");
 
     unmount();
   });
 
-  it('should not add empty or whitespace-only commands to history', async () => {
-    const { result, unmount } = renderHook(() =>
-      useShellHistory(MOCKED_PROJECT_ROOT),
-    );
+  it("should not add empty or whitespace-only commands to history", async () => {
+    const { result, unmount } = renderHook(() => useShellHistory(MOCKED_PROJECT_ROOT));
 
     await waitFor(() => {
       expect(mockedFs.readFile).toHaveBeenCalled();
     });
 
     act(() => {
-      result.current.addCommandToHistory('   ');
+      result.current.addCommandToHistory("   ");
     });
 
     expect(mockedFs.writeFile).not.toHaveBeenCalled();
@@ -245,19 +220,17 @@ describe('useShellHistory', () => {
     unmount();
   });
 
-  it('should truncate history to MAX_HISTORY_LENGTH (100)', async () => {
+  it("should truncate history to MAX_HISTORY_LENGTH (100)", async () => {
     const oldCommands = Array.from({ length: 120 }, (_, i) => `old_cmd_${i}`);
-    mockedFs.readFile.mockResolvedValue(oldCommands.join('\n'));
+    mockedFs.readFile.mockResolvedValue(oldCommands.join("\n"));
 
-    const { result, unmount } = renderHook(() =>
-      useShellHistory(MOCKED_PROJECT_ROOT),
-    );
+    const { result, unmount } = renderHook(() => useShellHistory(MOCKED_PROJECT_ROOT));
     await waitFor(() => {
       expect(mockedFs.readFile).toHaveBeenCalled();
     });
 
     act(() => {
-      result.current.addCommandToHistory('new_cmd');
+      result.current.addCommandToHistory("new_cmd");
     });
 
     // Wait for the async write to happen and then inspect the arguments.
@@ -270,20 +243,18 @@ describe('useShellHistory', () => {
     // After adding 'new_cmd': ['new_cmd', 'old_cmd_119', ..., 'old_cmd_21'] (100 items)
     // Written to file (reversed): ['old_cmd_21', ..., 'old_cmd_119', 'new_cmd']
     const writtenContent = mockedFs.writeFile.mock.calls[0][1] as string;
-    const writtenLines = writtenContent.split('\n');
+    const writtenLines = writtenContent.split("\n");
 
     expect(writtenLines.length).toBe(100);
-    expect(writtenLines[0]).toBe('old_cmd_21'); // New oldest command
-    expect(writtenLines[99]).toBe('new_cmd'); // Newest command
+    expect(writtenLines[0]).toBe("old_cmd_21"); // New oldest command
+    expect(writtenLines[99]).toBe("new_cmd"); // Newest command
 
     unmount();
   });
 
-  it('should move an existing command to the top when re-added', async () => {
-    mockedFs.readFile.mockResolvedValue('cmd1\ncmd2\ncmd3');
-    const { result, unmount } = renderHook(() =>
-      useShellHistory(MOCKED_PROJECT_ROOT),
-    );
+  it("should move an existing command to the top when re-added", async () => {
+    mockedFs.readFile.mockResolvedValue("cmd1\ncmd2\ncmd3");
+    const { result, unmount } = renderHook(() => useShellHistory(MOCKED_PROJECT_ROOT));
 
     // Initial state: ['cmd3', 'cmd2', 'cmd1']
     await waitFor(() => {
@@ -291,7 +262,7 @@ describe('useShellHistory', () => {
     });
 
     act(() => {
-      result.current.addCommandToHistory('cmd1');
+      result.current.addCommandToHistory("cmd1");
     });
 
     // After re-adding 'cmd1': ['cmd1', 'cmd3', 'cmd2']
@@ -302,9 +273,9 @@ describe('useShellHistory', () => {
     });
 
     const writtenContent = mockedFs.writeFile.mock.calls[0][1] as string;
-    const writtenLines = writtenContent.split('\n');
+    const writtenLines = writtenContent.split("\n");
 
-    expect(writtenLines).toEqual(['cmd2', 'cmd3', 'cmd1']);
+    expect(writtenLines).toEqual(["cmd2", "cmd3", "cmd1"]);
 
     unmount();
   });
diff --git a/packages/ui-gemini/src/ui/hooks/useShellHistory.ts b/packages/ui-gemini/src/ui/hooks/useShellHistory.ts
index 29872ce82..df6164938 100644
--- a/packages/ui-gemini/src/ui/hooks/useShellHistory.ts
+++ b/packages/ui-gemini/src/ui/hooks/useShellHistory.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useCallback } from 'react';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { isNodeError, Storage } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { isNodeError, Storage } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useState } from "react";
 
 const MAX_HISTORY_LENGTH = 100;
 
@@ -19,10 +19,7 @@ export interface UseShellHistoryReturn {
   resetHistoryPosition: () => void;
 }
 
-async function getHistoryFilePath(
-  projectRoot: string,
-  configStorage?: Storage,
-): Promise<string> {
+async function getHistoryFilePath(projectRoot: string, configStorage?: Storage): Promise<string> {
   const storage = configStorage ?? new Storage(projectRoot);
   return storage.getHistoryFilePath();
 }
@@ -30,9 +27,9 @@ async function getHistoryFilePath(
 // Handle multiline commands
 async function readHistoryFile(filePath: string): Promise<string[]> {
   try {
-    const text = await fs.readFile(filePath, 'utf-8');
+    const text = await fs.readFile(filePath, "utf-8");
     const result: string[] = [];
-    let cur = '';
+    let cur = "";
 
     for (const raw of text.split(/\r?\n/)) {
       if (!raw.trim()) continue;
@@ -41,7 +38,7 @@ async function readHistoryFile(filePath: string): Promise<string[]> {
       const m = cur.match(/(\\+)$/);
       if (m && m[1].length % 2) {
         // odd number of trailing '\'
-        cur = cur.slice(0, -1) + ' ' + line;
+        cur = cur.slice(0, -1) + " " + line;
       } else {
         if (cur) result.push(cur);
         cur = line;
@@ -51,28 +48,22 @@ async function readHistoryFile(filePath: string): Promise<string[]> {
     if (cur) result.push(cur);
     return result;
   } catch (err) {
-    if (isNodeError(err) && err.code === 'ENOENT') return [];
-    console.error('Error reading history:', err);
+    if (isNodeError(err) && err.code === "ENOENT") return [];
+    console.error("Error reading history:", err);
     return [];
   }
 }
 
-async function writeHistoryFile(
-  filePath: string,
-  history: string[],
-): Promise<void> {
+async function writeHistoryFile(filePath: string, history: string[]): Promise<void> {
   try {
     await fs.mkdir(path.dirname(filePath), { recursive: true });
-    await fs.writeFile(filePath, history.join('\n'));
+    await fs.writeFile(filePath, history.join("\n"));
   } catch (error) {
-    console.error('Error writing shell history:', error);
+    console.error("Error writing shell history:", error);
   }
 }
 
-export function useShellHistory(
-  projectRoot: string,
-  storage?: Storage,
-): UseShellHistoryReturn {
+export function useShellHistory(projectRoot: string, storage?: Storage): UseShellHistoryReturn {
   const [history, setHistory] = useState<string[]>([]);
   const [historyIndex, setHistoryIndex] = useState(-1);
   const [historyFilePath, setHistoryFilePath] = useState<string | null>(null);
@@ -121,7 +112,7 @@ export function useShellHistory(
     const newIndex = historyIndex - 1;
     setHistoryIndex(newIndex);
     if (newIndex < 0) {
-      return '';
+      return "";
     }
     return history[newIndex] ?? null;
   }, [history, historyIndex]);
diff --git a/packages/ui-gemini/src/ui/hooks/useShowMemoryCommand.ts b/packages/ui-gemini/src/ui/hooks/useShowMemoryCommand.ts
index 568cbb96c..4cb32c789 100644
--- a/packages/ui-gemini/src/ui/hooks/useShowMemoryCommand.ts
+++ b/packages/ui-gemini/src/ui/hooks/useShowMemoryCommand.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Message } from '../types.js';
-import { MessageType } from '../types.js';
-import { debugLogger, type Config } from '@airiscode/gemini-cli-core';
-import type { LoadedSettings } from '../../config/settings.js';
+import { type Config, debugLogger } from "@airiscode/gemini-cli-core";
+import type { LoadedSettings } from "../../config/settings.js";
+import type { Message } from "../types.js";
+import { MessageType } from "../types.js";
 
 export function createShowMemoryAction(
   config: Config | null,
@@ -18,7 +18,7 @@ export function createShowMemoryAction(
     if (!config) {
       addMessage({
         type: MessageType.ERROR,
-        content: 'Configuration not available. Cannot show memory.',
+        content: "Configuration not available. Cannot show memory.",
         timestamp: new Date(),
       });
       return;
@@ -27,15 +27,13 @@ export function createShowMemoryAction(
     const debugMode = config.getDebugMode();
 
     if (debugMode) {
-      debugLogger.log('[DEBUG] Show Memory command invoked.');
+      debugLogger.log("[DEBUG] Show Memory command invoked.");
     }
 
     const currentMemory = config.getUserMemory();
     const fileCount = config.getGeminiMdFileCount();
     const contextFileName = settings.merged.context?.fileName;
-    const contextFileNames = Array.isArray(contextFileName)
-      ? contextFileName
-      : [contextFileName];
+    const contextFileNames = Array.isArray(contextFileName) ? contextFileName : [contextFileName];
 
     if (debugMode) {
       debugLogger.log(
@@ -46,12 +44,10 @@ export function createShowMemoryAction(
 
     if (fileCount > 0) {
       const allNamesTheSame = new Set(contextFileNames).size < 2;
-      const name = allNamesTheSame ? contextFileNames[0] : 'context';
+      const name = allNamesTheSame ? contextFileNames[0] : "context";
       addMessage({
         type: MessageType.INFO,
-        content: `Loaded memory from ${fileCount} ${name} file${
-          fileCount > 1 ? 's' : ''
-        }.`,
+        content: `Loaded memory from ${fileCount} ${name} file${fileCount > 1 ? "s" : ""}.`,
         timestamp: new Date(),
       });
     }
@@ -67,8 +63,8 @@ export function createShowMemoryAction(
         type: MessageType.INFO,
         content:
           fileCount > 0
-            ? 'Hierarchical memory (GEMINI.md or other context files) is loaded but content is empty.'
-            : 'No hierarchical memory (GEMINI.md or other context files) is currently loaded.',
+            ? "Hierarchical memory (GEMINI.md or other context files) is loaded but content is empty."
+            : "No hierarchical memory (GEMINI.md or other context files) is currently loaded.",
         timestamp: new Date(),
       });
     }
diff --git a/packages/ui-gemini/src/ui/hooks/useSlashCompletion.test.ts b/packages/ui-gemini/src/ui/hooks/useSlashCompletion.test.ts
index 68548a075..64ea25505 100644
--- a/packages/ui-gemini/src/ui/hooks/useSlashCompletion.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSlashCompletion.test.ts
@@ -4,18 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { act, useState } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useSlashCompletion } from './useSlashCompletion.js';
-import type { CommandContext, SlashCommand } from '../commands/types.js';
-import { CommandKind } from '../commands/types.js';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
+import { act, useState } from "react";
+import { describe, expect, it, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
+import type { CommandContext, SlashCommand } from "../commands/types.js";
+import { CommandKind } from "../commands/types.js";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
+import { useSlashCompletion } from "./useSlashCompletion.js";
 
 // Test utility type and helper function for creating test SlashCommands
-type TestSlashCommand = Omit<SlashCommand, 'kind'> &
-  Partial<Pick<SlashCommand, 'kind'>>;
+type TestSlashCommand = Omit<SlashCommand, "kind"> & Partial<Pick<SlashCommand, "kind">>;
 
 function createTestCommand(command: TestSlashCommand): SlashCommand {
   return {
@@ -69,11 +68,7 @@ function simulateFuzzyMatching(items: readonly string[], query: string) {
       // Fuzzy matching: check if query chars appear in order
       let queryIndex = 0;
       let score = 0;
-      for (
-        let i = 0;
-        i < lowerItem.length && queryIndex < lowerQuery.length;
-        i++
-      ) {
+      for (let i = 0; i < lowerItem.length && queryIndex < lowerQuery.length; i++) {
         if (lowerItem[i] === lowerQuery[queryIndex]) {
           queryIndex++;
           score += 10 - i; // Earlier matches get higher scores
@@ -99,18 +94,14 @@ function simulateFuzzyMatching(items: readonly string[], query: string) {
 }
 
 // Mock the fzf module to provide a working fuzzy search implementation for tests
-vi.mock('fzf', async () => {
-  const actual = await vi.importActual<typeof import('fzf')>('fzf');
+vi.mock("fzf", async () => {
+  const actual = await vi.importActual<typeof import("fzf")>("fzf");
   return {
     ...actual,
     AsyncFzf: vi.fn().mockImplementation((items, _options) => {
       asyncFzfConstructorCalls++;
       return {
-        find: vi
-          .fn()
-          .mockImplementation((query: string) =>
-            simulateFuzzyMatching(items, query),
-          ),
+        find: vi.fn().mockImplementation((query: string) => simulateFuzzyMatching(items, query)),
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any;
     }),
@@ -118,25 +109,16 @@ vi.mock('fzf', async () => {
 });
 
 // Default mock behavior helper - now uses centralized logic
-const createDefaultAsyncFzfMock =
-  () => (items: readonly string[], _options: unknown) => {
-    asyncFzfConstructorCalls++;
-    return {
-      find: vi
-        .fn()
-        .mockImplementation((query: string) =>
-          simulateFuzzyMatching(items, query),
-        ),
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } as any;
-  };
+const createDefaultAsyncFzfMock = () => (items: readonly string[], _options: unknown) => {
+  asyncFzfConstructorCalls++;
+  return {
+    find: vi.fn().mockImplementation((query: string) => simulateFuzzyMatching(items, query)),
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } as any;
+};
 
 // Export test utilities
-export {
-  resetConstructorCallCount,
-  getConstructorCallCount,
-  createDefaultAsyncFzfMock,
-};
+export { createDefaultAsyncFzfMock, getConstructorCallCount, resetConstructorCallCount };
 
 // Test harness to capture the state from the hook's callbacks.
 function useTestHarnessForSlashCompletion(
@@ -168,33 +150,30 @@ function useTestHarnessForSlashCompletion(
   };
 }
 
-describe('useSlashCompletion', () => {
+describe("useSlashCompletion", () => {
   // A minimal mock is sufficient for these tests.
   const mockCommandContext = {} as CommandContext;
 
-  describe('Top-Level Commands', () => {
-    it('should suggest all top-level commands for the root slash', async () => {
+  describe("Top-Level Commands", () => {
+    it("should suggest all top-level commands for the root slash", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'help',
-          altNames: ['?'],
-          description: 'Show help',
+          name: "help",
+          altNames: ["?"],
+          description: "Show help",
         }),
         createTestCommand({
-          name: 'stats',
-          altNames: ['usage'],
-          description:
-            'check session stats. Usage: /stats [session|model|tools]',
+          name: "stats",
+          altNames: ["usage"],
+          description: "check session stats. Usage: /stats [session|model|tools]",
         }),
-        createTestCommand({ name: 'clear', description: 'Clear the screen' }),
+        createTestCommand({ name: "clear", description: "Clear the screen" }),
         createTestCommand({
-          name: 'memory',
-          description: 'Manage memory',
-          subCommands: [
-            createTestCommand({ name: 'show', description: 'Show memory' }),
-          ],
+          name: "memory",
+          description: "Manage memory",
+          subCommands: [createTestCommand({ name: "show", description: "Show memory" })],
         }),
-        createTestCommand({ name: 'chat', description: 'Manage chat history' }),
+        createTestCommand({ name: "chat", description: "Manage chat history" }),
       ];
       let result: {
         current: ReturnType<typeof useTestHarnessForSlashCompletion>;
@@ -202,12 +181,7 @@ describe('useSlashCompletion', () => {
       let unmount: () => void;
       await act(async () => {
         const hook = renderHook(() =>
-          useTestHarnessForSlashCompletion(
-            true,
-            '/',
-            slashCommands,
-            mockCommandContext,
-          ),
+          useTestHarnessForSlashCompletion(true, "/", slashCommands, mockCommandContext),
         );
         result = hook.result;
         unmount = hook.unmount;
@@ -217,23 +191,15 @@ describe('useSlashCompletion', () => {
         await waitFor(() => {
           expect(result.current.suggestions.length).toBe(slashCommands.length);
           expect(result.current.suggestions.map((s) => s.label)).toEqual(
-            expect.arrayContaining([
-              'help',
-              'clear',
-              'memory',
-              'chat',
-              'stats',
-            ]),
+            expect.arrayContaining(["help", "clear", "memory", "chat", "stats"]),
           );
         });
       });
       unmount!();
     });
 
-    it('should filter commands based on partial input', async () => {
-      const slashCommands = [
-        createTestCommand({ name: 'memory', description: 'Manage memory' }),
-      ];
+    it("should filter commands based on partial input", async () => {
+      const slashCommands = [createTestCommand({ name: "memory", description: "Manage memory" })];
       const setSuggestions = vi.fn();
       const setIsLoadingSuggestions = vi.fn();
       const setIsPerfectMatch = vi.fn();
@@ -246,7 +212,7 @@ describe('useSlashCompletion', () => {
         const hook = renderHook(() =>
           useSlashCompletion({
             enabled: true,
-            query: '/mem',
+            query: "/mem",
             slashCommands,
             commandContext: mockCommandContext,
             setSuggestions,
@@ -262,9 +228,9 @@ describe('useSlashCompletion', () => {
         await waitFor(() => {
           expect(setSuggestions).toHaveBeenCalledWith([
             {
-              label: 'memory',
-              value: 'memory',
-              description: 'Manage memory',
+              label: "memory",
+              value: "memory",
+              description: "Manage memory",
               commandKind: CommandKind.BUILT_IN,
             },
           ]);
@@ -278,13 +244,12 @@ describe('useSlashCompletion', () => {
       unmount!();
     });
 
-    it('should suggest commands based on partial altNames', async () => {
+    it("should suggest commands based on partial altNames", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'stats',
-          altNames: ['usage'],
-          description:
-            'check session stats. Usage: /stats [session|model|tools]',
+          name: "stats",
+          altNames: ["usage"],
+          description: "check session stats. Usage: /stats [session|model|tools]",
         }),
       ];
       let result: {
@@ -293,12 +258,7 @@ describe('useSlashCompletion', () => {
       let unmount: () => void;
       await act(async () => {
         const hook = renderHook(() =>
-          useTestHarnessForSlashCompletion(
-            true,
-            '/usage',
-            slashCommands,
-            mockCommandContext,
-          ),
+          useTestHarnessForSlashCompletion(true, "/usage", slashCommands, mockCommandContext),
         );
         result = hook.result;
         unmount = hook.unmount;
@@ -307,10 +267,9 @@ describe('useSlashCompletion', () => {
       await waitFor(() => {
         expect(result.current.suggestions).toEqual([
           {
-            label: 'stats',
-            value: 'stats',
-            description:
-              'check session stats. Usage: /stats [session|model|tools]',
+            label: "stats",
+            value: "stats",
+            description: "check session stats. Usage: /stats [session|model|tools]",
             commandKind: CommandKind.BUILT_IN,
           },
         ]);
@@ -319,11 +278,11 @@ describe('useSlashCompletion', () => {
       unmount!();
     });
 
-    it('should NOT provide suggestions for a perfectly typed command that is a leaf node', async () => {
+    it("should NOT provide suggestions for a perfectly typed command that is a leaf node", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'clear',
-          description: 'Clear the screen',
+          name: "clear",
+          description: "Clear the screen",
           action: vi.fn(),
         }),
       ];
@@ -333,12 +292,7 @@ describe('useSlashCompletion', () => {
       let unmount: () => void;
       await act(async () => {
         const hook = renderHook(() =>
-          useTestHarnessForSlashCompletion(
-            true,
-            '/clear',
-            slashCommands,
-            mockCommandContext,
-          ),
+          useTestHarnessForSlashCompletion(true, "/clear", slashCommands, mockCommandContext),
         );
         result = hook.result;
         unmount = hook.unmount;
@@ -350,66 +304,53 @@ describe('useSlashCompletion', () => {
       unmount!();
     });
 
-    it.each([['/?'], ['/usage']])(
-      'should not suggest commands when altNames is fully typed',
-      async (query) => {
-        const mockSlashCommands = [
-          createTestCommand({
-            name: 'help',
-            altNames: ['?'],
-            description: 'Show help',
-            action: vi.fn(),
-          }),
-          createTestCommand({
-            name: 'stats',
-            altNames: ['usage'],
-            description:
-              'check session stats. Usage: /stats [session|model|tools]',
-            action: vi.fn(),
-          }),
-        ];
-
-        let result: {
-          current: ReturnType<typeof useTestHarnessForSlashCompletion>;
-        };
-        let unmount: () => void;
-        await act(async () => {
-          const hook = renderHook(() =>
-            useTestHarnessForSlashCompletion(
-              true,
-              query,
-              mockSlashCommands,
-              mockCommandContext,
-            ),
-          );
-          result = hook.result;
-          unmount = hook.unmount;
-        });
+    it.each([
+      ["/?"],
+      ["/usage"],
+    ])("should not suggest commands when altNames is fully typed", async (query) => {
+      const mockSlashCommands = [
+        createTestCommand({
+          name: "help",
+          altNames: ["?"],
+          description: "Show help",
+          action: vi.fn(),
+        }),
+        createTestCommand({
+          name: "stats",
+          altNames: ["usage"],
+          description: "check session stats. Usage: /stats [session|model|tools]",
+          action: vi.fn(),
+        }),
+      ];
 
-        await waitFor(() => {
-          expect(result.current.suggestions).toHaveLength(0);
-          expect(result.current.completionStart).toBe(1);
-        });
-        unmount!();
-      },
-    );
+      let result: {
+        current: ReturnType<typeof useTestHarnessForSlashCompletion>;
+      };
+      let unmount: () => void;
+      await act(async () => {
+        const hook = renderHook(() =>
+          useTestHarnessForSlashCompletion(true, query, mockSlashCommands, mockCommandContext),
+        );
+        result = hook.result;
+        unmount = hook.unmount;
+      });
 
-    it('should not provide suggestions for a fully typed command that has no sub-commands or argument completion', async () => {
-      const slashCommands = [
-        createTestCommand({ name: 'clear', description: 'Clear the screen' }),
-      ];
+      await waitFor(() => {
+        expect(result.current.suggestions).toHaveLength(0);
+        expect(result.current.completionStart).toBe(1);
+      });
+      unmount!();
+    });
+
+    it("should not provide suggestions for a fully typed command that has no sub-commands or argument completion", async () => {
+      const slashCommands = [createTestCommand({ name: "clear", description: "Clear the screen" })];
       let result: {
         current: ReturnType<typeof useTestHarnessForSlashCompletion>;
       };
       let unmount: () => void;
       await act(async () => {
         const hook = renderHook(() =>
-          useTestHarnessForSlashCompletion(
-            true,
-            '/clear ',
-            slashCommands,
-            mockCommandContext,
-          ),
+          useTestHarnessForSlashCompletion(true, "/clear ", slashCommands, mockCommandContext),
         );
         result = hook.result;
         unmount = hook.unmount;
@@ -421,10 +362,8 @@ describe('useSlashCompletion', () => {
       unmount!();
     });
 
-    it('should not provide suggestions for an unknown command', async () => {
-      const slashCommands = [
-        createTestCommand({ name: 'help', description: 'Show help' }),
-      ];
+    it("should not provide suggestions for an unknown command", async () => {
+      const slashCommands = [createTestCommand({ name: "help", description: "Show help" })];
       let result: {
         current: ReturnType<typeof useTestHarnessForSlashCompletion>;
       };
@@ -433,7 +372,7 @@ describe('useSlashCompletion', () => {
         const hook = renderHook(() =>
           useTestHarnessForSlashCompletion(
             true,
-            '/unknown-command',
+            "/unknown-command",
             slashCommands,
             mockCommandContext,
           ),
@@ -449,15 +388,15 @@ describe('useSlashCompletion', () => {
       unmount!();
     });
 
-    it('should not suggest hidden commands', async () => {
+    it("should not suggest hidden commands", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'visible',
-          description: 'A visible command',
+          name: "visible",
+          description: "A visible command",
         }),
         createTestCommand({
-          name: 'hidden',
-          description: 'A hidden command',
+          name: "hidden",
+          description: "A hidden command",
           hidden: true,
         }),
       ];
@@ -467,12 +406,7 @@ describe('useSlashCompletion', () => {
       let unmount: () => void;
       await act(async () => {
         const hook = renderHook(() =>
-          useTestHarnessForSlashCompletion(
-            true,
-            '/',
-            slashCommands,
-            mockCommandContext,
-          ),
+          useTestHarnessForSlashCompletion(true, "/", slashCommands, mockCommandContext),
         );
         result = hook.result;
         unmount = hook.unmount;
@@ -480,32 +414,27 @@ describe('useSlashCompletion', () => {
 
       await waitFor(() => {
         expect(result.current.suggestions.length).toBe(1);
-        expect(result.current.suggestions[0].label).toBe('visible');
+        expect(result.current.suggestions[0].label).toBe("visible");
       });
       unmount!();
     });
   });
 
-  describe('Sub-Commands', () => {
-    it('should suggest sub-commands for a parent command', async () => {
+  describe("Sub-Commands", () => {
+    it("should suggest sub-commands for a parent command", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'memory',
-          description: 'Manage memory',
+          name: "memory",
+          description: "Manage memory",
           subCommands: [
-            createTestCommand({ name: 'show', description: 'Show memory' }),
-            createTestCommand({ name: 'add', description: 'Add to memory' }),
+            createTestCommand({ name: "show", description: "Show memory" }),
+            createTestCommand({ name: "add", description: "Add to memory" }),
           ],
         }),
       ];
 
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory ',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/memory ", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
@@ -513,15 +442,15 @@ describe('useSlashCompletion', () => {
         expect(result.current.suggestions).toEqual(
           expect.arrayContaining([
             {
-              label: 'show',
-              value: 'show',
-              description: 'Show memory',
+              label: "show",
+              value: "show",
+              description: "Show memory",
               commandKind: CommandKind.BUILT_IN,
             },
             {
-              label: 'add',
-              value: 'add',
-              description: 'Add to memory',
+              label: "add",
+              value: "add",
+              description: "Add to memory",
               commandKind: CommandKind.BUILT_IN,
             },
           ]),
@@ -530,24 +459,19 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should suggest all sub-commands when the query ends with the parent command and a space', async () => {
+    it("should suggest all sub-commands when the query ends with the parent command and a space", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'memory',
-          description: 'Manage memory',
+          name: "memory",
+          description: "Manage memory",
           subCommands: [
-            createTestCommand({ name: 'show', description: 'Show memory' }),
-            createTestCommand({ name: 'add', description: 'Add to memory' }),
+            createTestCommand({ name: "show", description: "Show memory" }),
+            createTestCommand({ name: "add", description: "Add to memory" }),
           ],
         }),
       ];
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory ',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/memory ", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
@@ -555,15 +479,15 @@ describe('useSlashCompletion', () => {
         expect(result.current.suggestions).toEqual(
           expect.arrayContaining([
             {
-              label: 'show',
-              value: 'show',
-              description: 'Show memory',
+              label: "show",
+              value: "show",
+              description: "Show memory",
               commandKind: CommandKind.BUILT_IN,
             },
             {
-              label: 'add',
-              value: 'add',
-              description: 'Add to memory',
+              label: "add",
+              value: "add",
+              description: "Add to memory",
               commandKind: CommandKind.BUILT_IN,
             },
           ]),
@@ -572,32 +496,27 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should filter sub-commands by prefix', async () => {
+    it("should filter sub-commands by prefix", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'memory',
-          description: 'Manage memory',
+          name: "memory",
+          description: "Manage memory",
           subCommands: [
-            createTestCommand({ name: 'show', description: 'Show memory' }),
-            createTestCommand({ name: 'add', description: 'Add to memory' }),
+            createTestCommand({ name: "show", description: "Show memory" }),
+            createTestCommand({ name: "add", description: "Add to memory" }),
           ],
         }),
       ];
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory a',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/memory a", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions).toEqual([
           {
-            label: 'add',
-            value: 'add',
-            description: 'Add to memory',
+            label: "add",
+            value: "add",
+            description: "Add to memory",
             commandKind: CommandKind.BUILT_IN,
           },
         ]);
@@ -606,21 +525,21 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should provide no suggestions for an invalid sub-command', async () => {
+    it("should provide no suggestions for an invalid sub-command", async () => {
       const slashCommands = [
         createTestCommand({
-          name: 'memory',
-          description: 'Manage memory',
+          name: "memory",
+          description: "Manage memory",
           subCommands: [
-            createTestCommand({ name: 'show', description: 'Show memory' }),
-            createTestCommand({ name: 'add', description: 'Add to memory' }),
+            createTestCommand({ name: "show", description: "Show memory" }),
+            createTestCommand({ name: "add", description: "Add to memory" }),
           ],
         }),
       ];
       const { result, unmount } = renderHook(() =>
         useTestHarnessForSlashCompletion(
           true,
-          '/memory dothisnow',
+          "/memory dothisnow",
           slashCommands,
           mockCommandContext,
         ),
@@ -635,28 +554,23 @@ describe('useSlashCompletion', () => {
     });
   });
 
-  describe('Argument Completion', () => {
-    it('should call the command.completion function for argument suggestions', async () => {
-      const availableTags = [
-        'my-chat-tag-1',
-        'my-chat-tag-2',
-        'another-channel',
-      ];
+  describe("Argument Completion", () => {
+    it("should call the command.completion function for argument suggestions", async () => {
+      const availableTags = ["my-chat-tag-1", "my-chat-tag-2", "another-channel"];
       const mockCompletionFn = vi
         .fn()
-        .mockImplementation(
-          async (_context: CommandContext, partialArg: string) =>
-            availableTags.filter((tag) => tag.startsWith(partialArg)),
+        .mockImplementation(async (_context: CommandContext, partialArg: string) =>
+          availableTags.filter((tag) => tag.startsWith(partialArg)),
         );
 
       const slashCommands = [
         createTestCommand({
-          name: 'chat',
-          description: 'Manage chat history',
+          name: "chat",
+          description: "Manage chat history",
           subCommands: [
             createTestCommand({
-              name: 'resume',
-              description: 'Resume a saved chat',
+              name: "resume",
+              description: "Resume a saved chat",
               completion: mockCompletionFn,
             }),
           ],
@@ -666,7 +580,7 @@ describe('useSlashCompletion', () => {
       const { result, unmount } = renderHook(() =>
         useTestHarnessForSlashCompletion(
           true,
-          '/chat resume my-ch',
+          "/chat resume my-ch",
           slashCommands,
           mockCommandContext,
         ),
@@ -677,12 +591,12 @@ describe('useSlashCompletion', () => {
           expect(mockCompletionFn).toHaveBeenCalledWith(
             expect.objectContaining({
               invocation: {
-                raw: '/chat resume my-ch',
-                name: 'resume',
-                args: 'my-ch',
+                raw: "/chat resume my-ch",
+                name: "resume",
+                args: "my-ch",
               },
             }),
-            'my-ch',
+            "my-ch",
           );
         });
       });
@@ -690,8 +604,8 @@ describe('useSlashCompletion', () => {
       await act(async () => {
         await waitFor(() => {
           expect(result.current.suggestions).toEqual([
-            { label: 'my-chat-tag-1', value: 'my-chat-tag-1' },
-            { label: 'my-chat-tag-2', value: 'my-chat-tag-2' },
+            { label: "my-chat-tag-1", value: "my-chat-tag-1" },
+            { label: "my-chat-tag-2", value: "my-chat-tag-2" },
           ]);
           expect(result.current.completionStart).toBe(13);
           expect(result.current.isLoadingSuggestions).toBe(false);
@@ -700,19 +614,19 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should call command.completion with an empty string when args start with a space', async () => {
+    it("should call command.completion with an empty string when args start with a space", async () => {
       const mockCompletionFn = vi
         .fn()
-        .mockResolvedValue(['my-chat-tag-1', 'my-chat-tag-2', 'my-channel']);
+        .mockResolvedValue(["my-chat-tag-1", "my-chat-tag-2", "my-channel"]);
 
       const slashCommands = [
         createTestCommand({
-          name: 'chat',
-          description: 'Manage chat history',
+          name: "chat",
+          description: "Manage chat history",
           subCommands: [
             createTestCommand({
-              name: 'resume',
-              description: 'Resume a saved chat',
+              name: "resume",
+              description: "Resume a saved chat",
               completion: mockCompletionFn,
             }),
           ],
@@ -720,12 +634,7 @@ describe('useSlashCompletion', () => {
       ];
 
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/chat resume ',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/chat resume ", slashCommands, mockCommandContext),
       );
 
       await act(async () => {
@@ -733,12 +642,12 @@ describe('useSlashCompletion', () => {
           expect(mockCompletionFn).toHaveBeenCalledWith(
             expect.objectContaining({
               invocation: {
-                raw: '/chat resume ',
-                name: 'resume',
-                args: '',
+                raw: "/chat resume ",
+                name: "resume",
+                args: "",
               },
             }),
-            '',
+            "",
           );
         });
       });
@@ -752,24 +661,19 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should handle completion function that returns null', async () => {
+    it("should handle completion function that returns null", async () => {
       const mockCompletionFn = vi.fn().mockResolvedValue(null);
 
       const slashCommands = [
         createTestCommand({
-          name: 'test',
-          description: 'Test command',
+          name: "test",
+          description: "Test command",
           completion: mockCompletionFn,
         }),
       ];
 
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/test arg',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/test arg", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
@@ -780,45 +684,40 @@ describe('useSlashCompletion', () => {
     });
   });
 
-  describe('Command Kind Information', () => {
-    it('should include commandKind for MCP commands in suggestions', async () => {
+  describe("Command Kind Information", () => {
+    it("should include commandKind for MCP commands in suggestions", async () => {
       const slashCommands = [
         {
-          name: 'summarize',
-          description: 'Summarize content',
+          name: "summarize",
+          description: "Summarize content",
           kind: CommandKind.MCP_PROMPT,
           action: vi.fn(),
         },
         {
-          name: 'help',
-          description: 'Show help',
+          name: "help",
+          description: "Show help",
           kind: CommandKind.BUILT_IN,
           action: vi.fn(),
         },
       ] as SlashCommand[];
 
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions).toEqual(
           expect.arrayContaining([
             {
-              label: 'summarize',
-              value: 'summarize',
-              description: 'Summarize content',
+              label: "summarize",
+              value: "summarize",
+              description: "Summarize content",
               commandKind: CommandKind.MCP_PROMPT,
             },
             {
-              label: 'help',
-              value: 'help',
-              description: 'Show help',
+              label: "help",
+              value: "help",
+              description: "Show help",
               commandKind: CommandKind.BUILT_IN,
             },
           ]),
@@ -827,37 +726,32 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should include commandKind when filtering MCP commands by prefix', async () => {
+    it("should include commandKind when filtering MCP commands by prefix", async () => {
       const slashCommands = [
         {
-          name: 'summarize',
-          description: 'Summarize content',
+          name: "summarize",
+          description: "Summarize content",
           kind: CommandKind.MCP_PROMPT,
           action: vi.fn(),
         },
         {
-          name: 'settings',
-          description: 'Open settings',
+          name: "settings",
+          description: "Open settings",
           kind: CommandKind.BUILT_IN,
           action: vi.fn(),
         },
       ] as SlashCommand[];
 
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/summ',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/summ", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions).toEqual([
           {
-            label: 'summarize',
-            value: 'summarize',
-            description: 'Summarize content',
+            label: "summarize",
+            value: "summarize",
+            description: "Summarize content",
             commandKind: CommandKind.MCP_PROMPT,
           },
         ]);
@@ -866,22 +760,22 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should include commandKind for sub-commands', async () => {
+    it("should include commandKind for sub-commands", async () => {
       const slashCommands = [
         {
-          name: 'memory',
-          description: 'Manage memory',
+          name: "memory",
+          description: "Manage memory",
           kind: CommandKind.BUILT_IN,
           subCommands: [
             {
-              name: 'show',
-              description: 'Show memory',
+              name: "show",
+              description: "Show memory",
               kind: CommandKind.BUILT_IN,
               action: vi.fn(),
             },
             {
-              name: 'add',
-              description: 'Add to memory',
+              name: "add",
+              description: "Add to memory",
               kind: CommandKind.MCP_PROMPT,
               action: vi.fn(),
             },
@@ -890,27 +784,22 @@ describe('useSlashCompletion', () => {
       ] as SlashCommand[];
 
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/memory',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/memory", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions).toEqual(
           expect.arrayContaining([
             {
-              label: 'show',
-              value: 'show',
-              description: 'Show memory',
+              label: "show",
+              value: "show",
+              description: "Show memory",
               commandKind: CommandKind.BUILT_IN,
             },
             {
-              label: 'add',
-              value: 'add',
-              description: 'Add to memory',
+              label: "add",
+              value: "add",
+              description: "Add to memory",
               commandKind: CommandKind.MCP_PROMPT,
             },
           ]),
@@ -919,31 +808,26 @@ describe('useSlashCompletion', () => {
       unmount();
     });
 
-    it('should include commandKind for file commands', async () => {
+    it("should include commandKind for file commands", async () => {
       const slashCommands = [
         {
-          name: 'custom-script',
-          description: 'Run custom script',
+          name: "custom-script",
+          description: "Run custom script",
           kind: CommandKind.FILE,
           action: vi.fn(),
         },
       ] as SlashCommand[];
 
       const { result, unmount } = renderHook(() =>
-        useTestHarnessForSlashCompletion(
-          true,
-          '/custom',
-          slashCommands,
-          mockCommandContext,
-        ),
+        useTestHarnessForSlashCompletion(true, "/custom", slashCommands, mockCommandContext),
       );
 
       await waitFor(() => {
         expect(result.current.suggestions).toEqual([
           {
-            label: 'custom-script',
-            value: 'custom-script',
-            description: 'Run custom script',
+            label: "custom-script",
+            value: "custom-script",
+            description: "Run custom script",
             commandKind: CommandKind.FILE,
           },
         ]);
@@ -953,15 +837,15 @@ describe('useSlashCompletion', () => {
     });
   });
 
-  it('should not call shared callbacks when disabled', async () => {
+  it("should not call shared callbacks when disabled", async () => {
     const mockSetSuggestions = vi.fn();
     const mockSetIsLoadingSuggestions = vi.fn();
     const mockSetIsPerfectMatch = vi.fn();
 
     const slashCommands = [
       createTestCommand({
-        name: 'help',
-        description: 'Show help',
+        name: "help",
+        description: "Show help",
       }),
     ];
 
@@ -977,7 +861,7 @@ describe('useSlashCompletion', () => {
           setIsPerfectMatch: mockSetIsPerfectMatch,
         }),
       {
-        initialProps: { enabled: false, query: '@src/file' },
+        initialProps: { enabled: false, query: "@src/file" },
       },
     );
 
@@ -987,8 +871,8 @@ describe('useSlashCompletion', () => {
     mockSetIsPerfectMatch.mockClear();
 
     // Change query while disabled (simulating @ completion typing)
-    rerender({ enabled: false, query: '@src/file.ts' });
-    rerender({ enabled: false, query: '@src/file.tsx' });
+    rerender({ enabled: false, query: "@src/file.ts" });
+    rerender({ enabled: false, query: "@src/file.tsx" });
 
     // Wait for any internal async operations to settle to avoid act warnings
     await act(async () => {
diff --git a/packages/ui-gemini/src/ui/hooks/useSlashCompletion.ts b/packages/ui-gemini/src/ui/hooks/useSlashCompletion.ts
index f5f148874..8e2a2aa37 100644
--- a/packages/ui-gemini/src/ui/hooks/useSlashCompletion.ts
+++ b/packages/ui-gemini/src/ui/hooks/useSlashCompletion.ts
@@ -4,15 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useMemo } from 'react';
-import { AsyncFzf } from 'fzf';
-import type { Suggestion } from '../components/SuggestionsDisplay.js';
-import {
-  CommandKind,
-  type CommandContext,
-  type SlashCommand,
-} from '../commands/types.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { AsyncFzf } from "fzf";
+import { useEffect, useMemo, useState } from "react";
+import { type CommandContext, CommandKind, type SlashCommand } from "../commands/types.js";
+import type { Suggestion } from "../components/SuggestionsDisplay.js";
 
 // Type alias for improved type safety based on actual fzf result structure
 type FzfCommandResult = {
@@ -67,7 +63,7 @@ function useCommandParser(
       return {
         hasTrailingSpace: false,
         commandPathParts: [],
-        partial: '',
+        partial: "",
         currentLevel: slashCommands,
         leafCommand: null,
         exactMatchAsParent: undefined,
@@ -75,11 +71,11 @@ function useCommandParser(
       };
     }
 
-    const fullPath = query.substring(1) || '';
-    const hasTrailingSpace = !!query.endsWith(' ');
+    const fullPath = query.substring(1) || "";
+    const hasTrailingSpace = !!query.endsWith(" ");
     const rawParts = fullPath.split(/\s+/).filter((p) => p);
     let commandPathParts = rawParts;
-    let partial = '';
+    let partial = "";
 
     if (!hasTrailingSpace && rawParts.length > 0) {
       partial = rawParts[rawParts.length - 1];
@@ -95,9 +91,7 @@ function useCommandParser(
         currentLevel = [];
         break;
       }
-      const found: SlashCommand | undefined = currentLevel.find((cmd) =>
-        matchesCommand(cmd, part),
-      );
+      const found: SlashCommand | undefined = currentLevel.find((cmd) => matchesCommand(cmd, part));
 
       if (found) {
         leafCommand = found;
@@ -121,15 +115,14 @@ function useCommandParser(
       if (exactMatchAsParent) {
         leafCommand = exactMatchAsParent;
         currentLevel = exactMatchAsParent.subCommands;
-        partial = '';
+        partial = "";
       }
     }
 
     const depth = commandPathParts.length;
     const isArgumentCompletion = !!(
       leafCommand?.completion &&
-      (hasTrailingSpace ||
-        (rawParts.length > depth && depth > 0 && partial !== ''))
+      (hasTrailingSpace || (rawParts.length > depth && depth > 0 && partial !== ""))
     );
 
     return {
@@ -162,13 +155,8 @@ function useCommandSuggestions(
   query: string | null,
   parserResult: CommandParserResult,
   commandContext: CommandContext,
-  getFzfForCommands: (
-    commands: readonly SlashCommand[],
-  ) => FzfCommandCacheEntry | null,
-  getPrefixSuggestions: (
-    commands: readonly SlashCommand[],
-    partial: string,
-  ) => SlashCommand[],
+  getFzfForCommands: (commands: readonly SlashCommand[]) => FzfCommandCacheEntry | null,
+  getPrefixSuggestions: (commands: readonly SlashCommand[], partial: string) => SlashCommand[],
 ): SuggestionsResult {
   const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
   const [isLoading, setIsLoading] = useState(false);
@@ -177,13 +165,8 @@ function useCommandSuggestions(
     const abortController = new AbortController();
     const { signal } = abortController;
 
-    const {
-      isArgumentCompletion,
-      leafCommand,
-      commandPathParts,
-      partial,
-      currentLevel,
-    } = parserResult;
+    const { isArgumentCompletion, leafCommand, commandPathParts, partial, currentLevel } =
+      parserResult;
 
     if (isArgumentCompletion) {
       const fetchAndSetSuggestions = async () => {
@@ -191,9 +174,7 @@ function useCommandSuggestions(
 
         // Safety check: ensure leafCommand and completion exist
         if (!leafCommand?.completion) {
-          debugLogger.warn(
-            'Attempted argument completion without completion function',
-          );
+          debugLogger.warn("Attempted argument completion without completion function");
           return;
         }
 
@@ -202,13 +183,13 @@ function useCommandSuggestions(
           const rawParts = [...commandPathParts];
           if (partial) rawParts.push(partial);
           const depth = commandPathParts.length;
-          const argString = rawParts.slice(depth).join(' ');
+          const argString = rawParts.slice(depth).join(" ");
           const results =
             (await leafCommand.completion(
               {
                 ...commandContext,
                 invocation: {
-                  raw: query || `/${rawParts.join(' ')}`,
+                  raw: query || `/${rawParts.join(" ")}`,
                   name: leafCommand.name,
                   args: argString,
                 },
@@ -226,7 +207,7 @@ function useCommandSuggestions(
           }
         } catch (error) {
           if (!signal.aborted) {
-            logErrorSafely(error, 'Argument completion');
+            logErrorSafely(error, "Argument completion");
             setSuggestions([]);
             setIsLoading(false);
           }
@@ -243,11 +224,9 @@ function useCommandSuggestions(
         if (signal.aborted) return;
         let potentialSuggestions: SlashCommand[] = [];
 
-        if (partial === '') {
+        if (partial === "") {
           // If no partial query, show all available commands
-          potentialSuggestions = commandsToSearch.filter(
-            (cmd) => cmd.description && !cmd.hidden,
-          );
+          potentialSuggestions = commandsToSearch.filter((cmd) => cmd.description && !cmd.hidden);
         } else {
           // Use fuzzy search for non-empty partial queries with fallback
           const fzfInstance = getFzfForCommands(commandsToSearch);
@@ -264,22 +243,13 @@ function useCommandSuggestions(
               });
               potentialSuggestions = Array.from(uniqueCommands);
             } catch (error) {
-              logErrorSafely(
-                error,
-                'Fuzzy search - falling back to prefix matching',
-              );
+              logErrorSafely(error, "Fuzzy search - falling back to prefix matching");
               // Fallback to prefix-based filtering
-              potentialSuggestions = getPrefixSuggestions(
-                commandsToSearch,
-                partial,
-              );
+              potentialSuggestions = getPrefixSuggestions(commandsToSearch, partial);
             }
           } else {
             // Fallback to prefix-based filtering when fzf instance creation fails
-            potentialSuggestions = getPrefixSuggestions(
-              commandsToSearch,
-              partial,
-            );
+            potentialSuggestions = getPrefixSuggestions(commandsToSearch, partial);
           }
         }
 
@@ -296,7 +266,7 @@ function useCommandSuggestions(
       };
 
       performFuzzySearch().catch((error) => {
-        logErrorSafely(error, 'Unexpected fuzzy search error');
+        logErrorSafely(error, "Unexpected fuzzy search error");
         if (!signal.aborted) {
           // Ultimate fallback: show no suggestions rather than confusing the user
           // with all available commands when their query clearly doesn't match anything
@@ -308,13 +278,7 @@ function useCommandSuggestions(
 
     setSuggestions([]);
     return () => abortController.abort();
-  }, [
-    query,
-    parserResult,
-    commandContext,
-    getFzfForCommands,
-    getPrefixSuggestions,
-  ]);
+  }, [query, parserResult, commandContext, getFzfForCommands, getPrefixSuggestions]);
 
   return { suggestions, isLoading };
 }
@@ -335,10 +299,9 @@ function useCompletionPositions(
       return { start: query.length, end: query.length };
     } else if (partial) {
       if (parserResult.isArgumentCompletion) {
-        const commandSoFar = `/${parserResult.commandPathParts.join(' ')}`;
+        const commandSoFar = `/${parserResult.commandPathParts.join(" ")}`;
         const argStartIndex =
-          commandSoFar.length +
-          (parserResult.commandPathParts.length > 0 ? 1 : 0);
+          commandSoFar.length + (parserResult.commandPathParts.length > 0 ? 1 : 0);
         return { start: argStartIndex, end: query.length };
       } else {
         return { start: query.length - partial.length, end: query.length };
@@ -349,25 +312,20 @@ function useCompletionPositions(
   }, [query, parserResult]);
 }
 
-function usePerfectMatch(
-  parserResult: CommandParserResult,
-): PerfectMatchResult {
+function usePerfectMatch(parserResult: CommandParserResult): PerfectMatchResult {
   return useMemo(() => {
-    const { hasTrailingSpace, partial, leafCommand, currentLevel } =
-      parserResult;
+    const { hasTrailingSpace, partial, leafCommand, currentLevel } = parserResult;
 
     if (hasTrailingSpace) {
       return { isPerfectMatch: false };
     }
 
-    if (leafCommand && partial === '' && leafCommand.action) {
+    if (leafCommand && partial === "" && leafCommand.action) {
       return { isPerfectMatch: true };
     }
 
     if (currentLevel) {
-      const perfectMatch = currentLevel.find(
-        (cmd) => matchesCommand(cmd, partial) && cmd.action,
-      );
+      const perfectMatch = currentLevel.find((cmd) => matchesCommand(cmd, partial) && cmd.action);
       if (perfectMatch) {
         return { isPerfectMatch: true };
       }
@@ -396,9 +354,7 @@ function getCommandFromSuggestion(
 
   // suggestion.value is just the command name at the current level (e.g., "list")
   // Find it in the current level's commands
-  const command = currentLevel.find((cmd) =>
-    matchesCommand(cmd, suggestion.value),
-  );
+  const command = currentLevel.find((cmd) => matchesCommand(cmd, suggestion.value));
 
   return command;
 }
@@ -416,9 +372,7 @@ export interface UseSlashCompletionProps {
 export function useSlashCompletion(props: UseSlashCompletionProps): {
   completionStart: number;
   completionEnd: number;
-  getCommandFromSuggestion: (
-    suggestion: Suggestion,
-  ) => SlashCommand | undefined;
+  getCommandFromSuggestion: (suggestion: Suggestion) => SlashCommand | undefined;
   isArgumentCompletion: boolean;
   leafCommand: SlashCommand | null;
 } {
@@ -478,8 +432,8 @@ export function useSlashCompletion(props: UseSlashCompletionProps): {
       try {
         const instance: FzfCommandCacheEntry = {
           fzf: new AsyncFzf(commandItems, {
-            fuzzy: 'v2',
-            casing: 'case-insensitive', // Explicitly enforce case-insensitivity
+            fuzzy: "v2",
+            casing: "case-insensitive", // Explicitly enforce case-insensitivity
           }),
           commandMap,
         };
@@ -489,7 +443,7 @@ export function useSlashCompletion(props: UseSlashCompletionProps): {
 
         return instance;
       } catch (error) {
-        logErrorSafely(error, 'FZF instance creation');
+        logErrorSafely(error, "FZF instance creation");
         return null;
       }
     },
@@ -504,9 +458,7 @@ export function useSlashCompletion(props: UseSlashCompletionProps): {
           cmd.description &&
           !cmd.hidden &&
           (cmd.name.toLowerCase().startsWith(partial.toLowerCase()) ||
-            cmd.altNames?.some((alt) =>
-              alt.toLowerCase().startsWith(partial.toLowerCase()),
-            )),
+            cmd.altNames?.some((alt) => alt.toLowerCase().startsWith(partial.toLowerCase()))),
       ),
     [],
   );
diff --git a/packages/ui-gemini/src/ui/hooks/useStateAndRef.ts b/packages/ui-gemini/src/ui/hooks/useStateAndRef.ts
index 8a10bab4c..524b3a2b0 100644
--- a/packages/ui-gemini/src/ui/hooks/useStateAndRef.ts
+++ b/packages/ui-gemini/src/ui/hooks/useStateAndRef.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
+import React from "react";
 
 // Hook to return state, state setter, and ref to most up-to-date value of state.
 // We need this in order to setState and reference the updated state multiple
@@ -18,19 +18,16 @@ export const useStateAndRef = <
   const [state, setState] = React.useState<T>(initialValue);
   const ref = React.useRef<T>(initialValue);
 
-  const setStateInternal = React.useCallback<typeof setState>(
-    (newStateOrCallback) => {
-      let newValue: T;
-      if (typeof newStateOrCallback === 'function') {
-        newValue = newStateOrCallback(ref.current);
-      } else {
-        newValue = newStateOrCallback;
-      }
-      setState(newValue);
-      ref.current = newValue;
-    },
-    [],
-  );
+  const setStateInternal = React.useCallback<typeof setState>((newStateOrCallback) => {
+    let newValue: T;
+    if (typeof newStateOrCallback === "function") {
+      newValue = newStateOrCallback(ref.current);
+    } else {
+      newValue = newStateOrCallback;
+    }
+    setState(newValue);
+    ref.current = newValue;
+  }, []);
 
   return [state, ref, setStateInternal] as const;
 };
diff --git a/packages/ui-gemini/src/ui/hooks/useTerminalSize.ts b/packages/ui-gemini/src/ui/hooks/useTerminalSize.ts
index 85cee6117..50cea2680 100644
--- a/packages/ui-gemini/src/ui/hooks/useTerminalSize.ts
+++ b/packages/ui-gemini/src/ui/hooks/useTerminalSize.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useEffect, useState } from 'react';
+import { useEffect, useState } from "react";
 
 export function useTerminalSize(): { columns: number; rows: number } {
   const [size, setSize] = useState({
@@ -20,9 +20,9 @@ export function useTerminalSize(): { columns: number; rows: number } {
       });
     }
 
-    process.stdout.on('resize', updateSize);
+    process.stdout.on("resize", updateSize);
     return () => {
-      process.stdout.off('resize', updateSize);
+      process.stdout.off("resize", updateSize);
     };
   }, []);
 
diff --git a/packages/ui-gemini/src/ui/hooks/useThemeCommand.ts b/packages/ui-gemini/src/ui/hooks/useThemeCommand.ts
index 47252b9af..36507744f 100644
--- a/packages/ui-gemini/src/ui/hooks/useThemeCommand.ts
+++ b/packages/ui-gemini/src/ui/hooks/useThemeCommand.ts
@@ -4,15 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useCallback } from 'react';
-import { themeManager } from '../themes/theme-manager.js';
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-} from '../../config/settings.js'; // Import LoadedSettings, AppSettings, MergedSetting
-import { MessageType } from '../types.js';
-import process from 'node:process';
-import type { UseHistoryManagerReturn } from './useHistoryManager.js';
+import process from "node:process";
+import { useCallback, useState } from "react";
+import type { LoadableSettingScope, LoadedSettings } from "../../config/settings.js"; // Import LoadedSettings, AppSettings, MergedSetting
+import { themeManager } from "../themes/theme-manager.js";
+import { MessageType } from "../types.js";
+import type { UseHistoryManagerReturn } from "./useHistoryManager.js";
 
 interface UseThemeCommandReturn {
   isThemeDialogOpen: boolean;
@@ -25,18 +22,17 @@ interface UseThemeCommandReturn {
 export const useThemeCommand = (
   loadedSettings: LoadedSettings,
   setThemeError: (error: string | null) => void,
-  addItem: UseHistoryManagerReturn['addItem'],
+  addItem: UseHistoryManagerReturn["addItem"],
   initialThemeError: string | null,
 ): UseThemeCommandReturn => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] =
-    useState(!!initialThemeError);
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = useState(!!initialThemeError);
 
   const openThemeDialog = useCallback(() => {
-    if (process.env['NO_COLOR']) {
+    if (process.env["NO_COLOR"]) {
       addItem(
         {
           type: MessageType.INFO,
-          text: 'Theme configuration unavailable due to NO_COLOR env variable.',
+          text: "Theme configuration unavailable due to NO_COLOR env variable.",
         },
         Date.now(),
       );
@@ -87,7 +83,7 @@ export const useThemeCommand = (
           setIsThemeDialogOpen(true);
           return;
         }
-        loadedSettings.setValue(scope, 'ui.theme', themeName); // Update the merged settings
+        loadedSettings.setValue(scope, "ui.theme", themeName); // Update the merged settings
         if (loadedSettings.merged.ui?.customThemes) {
           themeManager.loadCustomThemes(loadedSettings.merged.ui?.customThemes);
         }
diff --git a/packages/ui-gemini/src/ui/hooks/useTimer.test.tsx b/packages/ui-gemini/src/ui/hooks/useTimer.test.tsx
index e8ebad7ae..9740f166f 100644
--- a/packages/ui-gemini/src/ui/hooks/useTimer.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/useTimer.test.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { render } from '../../test-utils/render.js';
-import { useTimer } from './useTimer.js';
+import { act } from "react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { useTimer } from "./useTimer.js";
 
-describe('useTimer', () => {
+describe("useTimer", () => {
   beforeEach(() => {
     vi.useFakeTimers();
   });
@@ -18,18 +18,9 @@ describe('useTimer', () => {
     vi.restoreAllMocks();
   });
 
-  const renderTimerHook = (
-    initialIsActive: boolean,
-    initialResetKey: number,
-  ) => {
+  const renderTimerHook = (initialIsActive: boolean, initialResetKey: number) => {
     let hookResult: ReturnType<typeof useTimer>;
-    function TestComponent({
-      isActive,
-      resetKey,
-    }: {
-      isActive: boolean;
-      resetKey: number;
-    }) {
+    function TestComponent({ isActive, resetKey }: { isActive: boolean; resetKey: number }) {
       hookResult = useTimer(isActive, resetKey);
       return null;
     }
@@ -48,12 +39,12 @@ describe('useTimer', () => {
     };
   };
 
-  it('should initialize with 0', () => {
+  it("should initialize with 0", () => {
     const { result } = renderTimerHook(false, 0);
     expect(result.current).toBe(0);
   });
 
-  it('should not increment time if isActive is false', () => {
+  it("should not increment time if isActive is false", () => {
     const { result } = renderTimerHook(false, 0);
     act(() => {
       vi.advanceTimersByTime(5000);
@@ -61,7 +52,7 @@ describe('useTimer', () => {
     expect(result.current).toBe(0);
   });
 
-  it('should increment time every second if isActive is true', () => {
+  it("should increment time every second if isActive is true", () => {
     const { result } = renderTimerHook(true, 0);
     act(() => {
       vi.advanceTimersByTime(1000);
@@ -73,7 +64,7 @@ describe('useTimer', () => {
     expect(result.current).toBe(3);
   });
 
-  it('should reset to 0 and start incrementing when isActive becomes true from false', () => {
+  it("should reset to 0 and start incrementing when isActive becomes true from false", () => {
     const { result, rerender } = renderTimerHook(false, 0);
     expect(result.current).toBe(0);
 
@@ -88,7 +79,7 @@ describe('useTimer', () => {
     expect(result.current).toBe(1);
   });
 
-  it('should reset to 0 when resetKey changes while active', () => {
+  it("should reset to 0 when resetKey changes while active", () => {
     const { result, rerender } = renderTimerHook(true, 0);
     act(() => {
       vi.advanceTimersByTime(3000); // 3s
@@ -106,7 +97,7 @@ describe('useTimer', () => {
     expect(result.current).toBe(1); // Starts incrementing from 0
   });
 
-  it('should be 0 if isActive is false, regardless of resetKey changes', () => {
+  it("should be 0 if isActive is false, regardless of resetKey changes", () => {
     const { result, rerender } = renderTimerHook(false, 0);
     expect(result.current).toBe(0);
 
@@ -116,14 +107,14 @@ describe('useTimer', () => {
     expect(result.current).toBe(0);
   });
 
-  it('should clear timer on unmount', () => {
+  it("should clear timer on unmount", () => {
     const { unmount } = renderTimerHook(true, 0);
-    const clearIntervalSpy = vi.spyOn(global, 'clearInterval');
+    const clearIntervalSpy = vi.spyOn(global, "clearInterval");
     unmount();
     expect(clearIntervalSpy).toHaveBeenCalledOnce();
   });
 
-  it('should preserve elapsedTime when isActive becomes false, and reset to 0 when it becomes active again', () => {
+  it("should preserve elapsedTime when isActive becomes false, and reset to 0 when it becomes active again", () => {
     const { result, rerender } = renderTimerHook(true, 0);
 
     act(() => {
diff --git a/packages/ui-gemini/src/ui/hooks/useTimer.ts b/packages/ui-gemini/src/ui/hooks/useTimer.ts
index 53c266dde..9a8c12edd 100644
--- a/packages/ui-gemini/src/ui/hooks/useTimer.ts
+++ b/packages/ui-gemini/src/ui/hooks/useTimer.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useState, useEffect, useRef } from 'react';
+import { useEffect, useRef, useState } from "react";
 
 /**
  * Custom hook to manage a timer that increments every second.
diff --git a/packages/ui-gemini/src/ui/hooks/useToolScheduler.test.ts b/packages/ui-gemini/src/ui/hooks/useToolScheduler.test.ts
index e357939d7..c2f9d619c 100644
--- a/packages/ui-gemini/src/ui/hooks/useToolScheduler.test.ts
+++ b/packages/ui-gemini/src/ui/hooks/useToolScheduler.test.ts
@@ -4,47 +4,41 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import {
-  useReactToolScheduler,
-  mapToDisplay,
-} from './useReactToolScheduler.js';
-import type { PartUnion, FunctionResponse } from '@google/genai';
 import type {
+  AnyDeclarativeTool,
+  AnyToolInvocation,
   Config,
-  ToolCallRequestInfo,
-  ToolRegistry,
-  ToolResult,
+  ToolCall, // Import from core
   ToolCallConfirmationDetails,
+  ToolCallRequestInfo,
   ToolCallResponseInfo,
-  ToolCall, // Import from core
   Status as ToolCallStatusType,
-  AnyDeclarativeTool,
-  AnyToolInvocation,
-} from '@airiscode/gemini-cli-core';
+  ToolRegistry,
+  ToolResult,
+} from "@airiscode/gemini-cli-core";
 import {
+  ApprovalMode,
+  createMockMessageBus,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
-  ToolConfirmationOutcome,
-  ApprovalMode,
-  MockTool,
   HookSystem,
-} from '@airiscode/gemini-cli-core';
-import { createMockMessageBus } from '@airiscode/gemini-cli-core';
-import { ToolCallStatus } from '../types.js';
+  MockTool,
+  ToolConfirmationOutcome,
+} from "@airiscode/gemini-cli-core";
+import type { FunctionResponse, PartUnion } from "@google/genai";
+import { act } from "react";
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { renderHook } from "../../test-utils/render.js";
+import { ToolCallStatus } from "../types.js";
+import { mapToDisplay, useReactToolScheduler } from "./useReactToolScheduler.js";
 
 // Mocks
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actual = await vi.importActual<any>('@airiscode/gemini-cli-core');
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actual = await vi.importActual<any>("@airiscode/gemini-cli-core");
   // Patch CoreToolScheduler to have cancelAll if it's missing in the test environment
-  if (
-    actual.CoreToolScheduler &&
-    !actual.CoreToolScheduler.prototype.cancelAll
-  ) {
+  if (actual.CoreToolScheduler && !actual.CoreToolScheduler.prototype.cancelAll) {
     actual.CoreToolScheduler.prototype.cancelAll = vi.fn();
   }
   return {
@@ -56,24 +50,24 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
 
 const mockToolRegistry = {
   getTool: vi.fn(),
-  getAllToolNames: vi.fn(() => ['mockTool', 'anotherTool']),
+  getAllToolNames: vi.fn(() => ["mockTool", "anotherTool"]),
 };
 
 const mockConfig = {
   getToolRegistry: vi.fn(() => mockToolRegistry as unknown as ToolRegistry),
   getApprovalMode: vi.fn(() => ApprovalMode.DEFAULT),
-  getSessionId: () => 'test-session-id',
+  getSessionId: () => "test-session-id",
   getUsageStatisticsEnabled: () => true,
   getDebugMode: () => false,
   storage: {
-    getProjectTempDir: () => '/tmp',
+    getProjectTempDir: () => "/tmp",
   },
   getTruncateToolOutputThreshold: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   getTruncateToolOutputLines: () => DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   getAllowedTools: vi.fn(() => []),
   getContentGeneratorConfig: () => ({
-    model: 'test-model',
-    authType: 'oauth-personal',
+    model: "test-model",
+    authType: "oauth-personal",
   }),
   getUseSmartEdit: () => false,
   getGeminiClient: () => null, // No client needed for these tests
@@ -89,15 +83,15 @@ mockConfig.getMessageBus = vi.fn().mockReturnValue(createMockMessageBus());
 mockConfig.getHookSystem = vi.fn().mockReturnValue(new HookSystem(mockConfig));
 
 const mockTool = new MockTool({
-  name: 'mockTool',
-  displayName: 'Mock Tool',
+  name: "mockTool",
+  displayName: "Mock Tool",
   execute: vi.fn(),
   shouldConfirmExecute: vi.fn(),
 });
 const mockToolWithLiveOutput = new MockTool({
-  name: 'mockToolWithLiveOutput',
-  displayName: 'Mock Tool With Live Output',
-  description: 'A mock tool for testing',
+  name: "mockToolWithLiveOutput",
+  displayName: "Mock Tool With Live Output",
+  description: "A mock tool for testing",
   params: {},
   isOutputMarkdown: true,
   canUpdateOutput: true,
@@ -106,13 +100,13 @@ const mockToolWithLiveOutput = new MockTool({
 });
 let mockOnUserConfirmForToolConfirmation: Mock;
 const mockToolRequiresConfirmation = new MockTool({
-  name: 'mockToolRequiresConfirmation',
-  displayName: 'Mock Tool Requires Confirmation',
+  name: "mockToolRequiresConfirmation",
+  displayName: "Mock Tool Requires Confirmation",
   execute: vi.fn(),
   shouldConfirmExecute: vi.fn(),
 });
 
-describe('useReactToolScheduler in YOLO Mode', () => {
+describe("useReactToolScheduler in YOLO Mode", () => {
   let onComplete: Mock;
 
   beforeEach(() => {
@@ -136,27 +130,23 @@ describe('useReactToolScheduler in YOLO Mode', () => {
 
   const renderSchedulerInYoloMode = () =>
     renderHook(() =>
-      useReactToolScheduler(
-        onComplete,
-        mockConfig as unknown as Config,
-        () => undefined,
-      ),
+      useReactToolScheduler(onComplete, mockConfig as unknown as Config, () => undefined),
     );
 
-  it('should skip confirmation and execute tool directly when yoloMode is true', async () => {
+  it("should skip confirmation and execute tool directly when yoloMode is true", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockToolRequiresConfirmation);
-    const expectedOutput = 'YOLO Confirmed output';
+    const expectedOutput = "YOLO Confirmed output";
     (mockToolRequiresConfirmation.execute as Mock).mockResolvedValue({
       llmContent: expectedOutput,
-      returnDisplay: 'YOLO Formatted tool output',
+      returnDisplay: "YOLO Formatted tool output",
     } as ToolResult);
 
     const { result } = renderSchedulerInYoloMode();
     const schedule = result.current[1];
     const request: ToolCallRequestInfo = {
-      callId: 'yoloCall',
-      name: 'mockToolRequiresConfirmation',
-      args: { data: 'any data' },
+      callId: "yoloCall",
+      name: "mockToolRequiresConfirmation",
+      args: { data: "any data" },
     } as any;
 
     act(() => {
@@ -174,22 +164,20 @@ describe('useReactToolScheduler in YOLO Mode', () => {
     });
 
     // Check that execute WAS called
-    expect(mockToolRequiresConfirmation.execute).toHaveBeenCalledWith(
-      request.args,
-    );
+    expect(mockToolRequiresConfirmation.execute).toHaveBeenCalledWith(request.args);
 
     // Check that onComplete was called with success
     expect(onComplete).toHaveBeenCalledWith([
       expect.objectContaining({
-        status: 'success',
+        status: "success",
         request,
         response: expect.objectContaining({
-          resultDisplay: 'YOLO Formatted tool output',
+          resultDisplay: "YOLO Formatted tool output",
           responseParts: [
             {
               functionResponse: {
-                id: 'yoloCall',
-                name: 'mockToolRequiresConfirmation',
+                id: "yoloCall",
+                name: "mockToolRequiresConfirmation",
                 response: { output: expectedOutput },
               },
             },
@@ -200,7 +188,7 @@ describe('useReactToolScheduler in YOLO Mode', () => {
   });
 });
 
-describe('useReactToolScheduler', () => {
+describe("useReactToolScheduler", () => {
   let onComplete: Mock;
   let capturedOnConfirmForTest:
     | ((outcome: ToolConfirmationOutcome) => void | Promise<void>)
@@ -213,10 +201,7 @@ describe('useReactToolScheduler', () => {
   };
 
   const scheduleAndWaitForExecution = async (
-    schedule: (
-      req: ToolCallRequestInfo | ToolCallRequestInfo[],
-      signal: AbortSignal,
-    ) => void,
+    schedule: (req: ToolCallRequestInfo | ToolCallRequestInfo[], signal: AbortSignal) => void,
     request: ToolCallRequestInfo | ToolCallRequestInfo[],
   ) => {
     act(() => {
@@ -241,16 +226,14 @@ describe('useReactToolScheduler', () => {
     (mockToolRequiresConfirmation.shouldConfirmExecute as Mock).mockClear();
 
     mockOnUserConfirmForToolConfirmation = vi.fn();
-    (
-      mockToolRequiresConfirmation.shouldConfirmExecute as Mock
-    ).mockImplementation(
+    (mockToolRequiresConfirmation.shouldConfirmExecute as Mock).mockImplementation(
       async (): Promise<ToolCallConfirmationDetails | null> =>
         ({
           onConfirm: mockOnUserConfirmForToolConfirmation,
-          fileName: 'mockToolRequiresConfirmation.ts',
-          fileDiff: 'Mock tool requires confirmation',
-          type: 'edit',
-          title: 'Mock Tool Requires Confirmation',
+          fileName: "mockToolRequiresConfirmation.ts",
+          fileDiff: "Mock tool requires confirmation",
+          type: "edit",
+          title: "Mock Tool Requires Confirmation",
         }) as any,
     );
 
@@ -264,31 +247,27 @@ describe('useReactToolScheduler', () => {
 
   const renderScheduler = () =>
     renderHook(() =>
-      useReactToolScheduler(
-        onComplete,
-        mockConfig as unknown as Config,
-        () => undefined,
-      ),
+      useReactToolScheduler(onComplete, mockConfig as unknown as Config, () => undefined),
     );
 
-  it('initial state should be empty', () => {
+  it("initial state should be empty", () => {
     const { result } = renderScheduler();
     expect(result.current[0]).toEqual([]);
   });
 
-  it('should schedule and execute a tool call successfully', async () => {
+  it("should schedule and execute a tool call successfully", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockTool);
     (mockTool.execute as Mock).mockResolvedValue({
-      llmContent: 'Tool output',
-      returnDisplay: 'Formatted tool output',
+      llmContent: "Tool output",
+      returnDisplay: "Formatted tool output",
     } as ToolResult);
     (mockTool.shouldConfirmExecute as Mock).mockResolvedValue(null);
 
     const { result } = renderScheduler();
     const request: ToolCallRequestInfo = {
-      callId: 'call1',
-      name: 'mockTool',
-      args: { param: 'value' },
+      callId: "call1",
+      name: "mockTool",
+      args: { param: "value" },
     } as any;
 
     let completedToolCalls: ToolCall[] = [];
@@ -300,22 +279,19 @@ describe('useReactToolScheduler', () => {
 
     expect(mockTool.execute).toHaveBeenCalledWith(request.args);
     expect(completedToolCalls).toHaveLength(1);
-    expect(completedToolCalls[0].status).toBe('success');
+    expect(completedToolCalls[0].status).toBe("success");
     expect(completedToolCalls[0].request).toBe(request);
 
-    if (
-      completedToolCalls[0].status === 'success' ||
-      completedToolCalls[0].status === 'error'
-    ) {
+    if (completedToolCalls[0].status === "success" || completedToolCalls[0].status === "error") {
       expect(completedToolCalls[0].response).toMatchSnapshot();
     }
   });
 
-  it('should clear previous tool calls when scheduling new ones', async () => {
+  it("should clear previous tool calls when scheduling new ones", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockTool);
     (mockTool.execute as Mock).mockResolvedValue({
-      llmContent: 'Tool output',
-      returnDisplay: 'Formatted tool output',
+      llmContent: "Tool output",
+      returnDisplay: "Formatted tool output",
     } as ToolResult);
 
     const { result } = renderScheduler();
@@ -324,8 +300,8 @@ describe('useReactToolScheduler', () => {
 
     // Manually set a tool call in the display.
     const oldToolCall = {
-      request: { callId: 'oldCall' },
-      status: 'success',
+      request: { callId: "oldCall" },
+      status: "success",
     } as any;
     act(() => {
       setToolCallsForDisplay([oldToolCall]);
@@ -333,8 +309,8 @@ describe('useReactToolScheduler', () => {
     expect(result.current[0]).toEqual([oldToolCall]);
 
     const newRequest: ToolCallRequestInfo = {
-      callId: 'newCall',
-      name: 'mockTool',
+      callId: "newCall",
+      name: "mockTool",
       args: {},
     } as any;
     act(() => {
@@ -344,8 +320,8 @@ describe('useReactToolScheduler', () => {
     // After scheduling, the old call should be gone,
     // and the new one should be in the display in its initial state.
     expect(result.current[0].length).toBe(1);
-    expect(result.current[0][0].request.callId).toBe('newCall');
-    expect(result.current[0][0].request.callId).not.toBe('oldCall');
+    expect(result.current[0][0].request.callId).toBe("newCall");
+    expect(result.current[0][0].request.callId).not.toBe("oldCall");
 
     // Let the new call finish.
     await act(async () => {
@@ -360,7 +336,7 @@ describe('useReactToolScheduler', () => {
     expect(onComplete).toHaveBeenCalled();
   });
 
-  it('should cancel all running tool calls', async () => {
+  it("should cancel all running tool calls", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockTool);
 
     let resolveExecute: (value: ToolResult) => void = () => {};
@@ -374,8 +350,8 @@ describe('useReactToolScheduler', () => {
     const schedule = result.current[1];
     const cancelAllToolCalls = result.current[4];
     const request: ToolCallRequestInfo = {
-      callId: 'cancelCall',
-      name: 'mockTool',
+      callId: "cancelCall",
+      name: "mockTool",
       args: {},
     } as any;
 
@@ -390,7 +366,7 @@ describe('useReactToolScheduler', () => {
     });
 
     // At this point, the tool is 'executing' and waiting on the promise.
-    expect(result.current[0][0].status).toBe('executing');
+    expect(result.current[0][0].status).toBe("executing");
 
     const cancelController = new AbortController();
     act(() => {
@@ -403,109 +379,102 @@ describe('useReactToolScheduler', () => {
 
     expect(onComplete).toHaveBeenCalledWith([
       expect.objectContaining({
-        status: 'cancelled',
+        status: "cancelled",
         request,
       }),
     ]);
 
     // Clean up the pending promise to avoid open handles.
     await act(async () => {
-      resolveExecute({ llmContent: 'output', returnDisplay: 'display' });
+      resolveExecute({ llmContent: "output", returnDisplay: "display" });
     });
   });
 
   it.each([
     {
-      desc: 'tool not found',
+      desc: "tool not found",
       setup: () => {
         mockToolRegistry.getTool.mockReturnValue(undefined);
       },
       request: {
-        callId: 'call1',
-        name: 'nonexistentTool',
+        callId: "call1",
+        name: "nonexistentTool",
         args: {},
       } as any,
       expectedErrorContains: [
         'Tool "nonexistentTool" not found in registry',
-        'Did you mean one of:',
+        "Did you mean one of:",
       ],
     },
     {
-      desc: 'error during shouldConfirmExecute',
+      desc: "error during shouldConfirmExecute",
       setup: () => {
         mockToolRegistry.getTool.mockReturnValue(mockTool);
-        const confirmError = new Error('Confirmation check failed');
+        const confirmError = new Error("Confirmation check failed");
         (mockTool.shouldConfirmExecute as Mock).mockRejectedValue(confirmError);
       },
       request: {
-        callId: 'call1',
-        name: 'mockTool',
+        callId: "call1",
+        name: "mockTool",
         args: {},
       } as any,
-      expectedError: new Error('Confirmation check failed'),
+      expectedError: new Error("Confirmation check failed"),
     },
     {
-      desc: 'error during execute',
+      desc: "error during execute",
       setup: () => {
         mockToolRegistry.getTool.mockReturnValue(mockTool);
         (mockTool.shouldConfirmExecute as Mock).mockResolvedValue(null);
-        const execError = new Error('Execution failed');
+        const execError = new Error("Execution failed");
         (mockTool.execute as Mock).mockRejectedValue(execError);
       },
       request: {
-        callId: 'call1',
-        name: 'mockTool',
+        callId: "call1",
+        name: "mockTool",
         args: {},
       } as any,
-      expectedError: new Error('Execution failed'),
+      expectedError: new Error("Execution failed"),
     },
-  ])(
-    'should handle $desc',
-    async ({ setup, request, expectedErrorContains, expectedError }) => {
-      setup();
-      const { result } = renderScheduler();
-
-      let completedToolCalls: ToolCall[] = [];
-      onComplete.mockImplementation((calls) => {
-        completedToolCalls = calls;
-      });
+  ])("should handle $desc", async ({ setup, request, expectedErrorContains, expectedError }) => {
+    setup();
+    const { result } = renderScheduler();
 
-      await scheduleAndWaitForExecution(result.current[1], request);
+    let completedToolCalls: ToolCall[] = [];
+    onComplete.mockImplementation((calls) => {
+      completedToolCalls = calls;
+    });
 
-      expect(completedToolCalls).toHaveLength(1);
-      expect(completedToolCalls[0].status).toBe('error');
-      expect(completedToolCalls[0].request).toBe(request);
+    await scheduleAndWaitForExecution(result.current[1], request);
 
-      if (expectedErrorContains) {
-        expectedErrorContains.forEach((errorText) => {
-          expect(
-            (completedToolCalls[0] as any).response.error.message,
-          ).toContain(errorText);
-        });
-      }
+    expect(completedToolCalls).toHaveLength(1);
+    expect(completedToolCalls[0].status).toBe("error");
+    expect(completedToolCalls[0].request).toBe(request);
 
-      if (expectedError) {
-        expect((completedToolCalls[0] as any).response.error.message).toBe(
-          expectedError.message,
-        );
-      }
-    },
-  );
+    if (expectedErrorContains) {
+      expectedErrorContains.forEach((errorText) => {
+        expect((completedToolCalls[0] as any).response.error.message).toContain(errorText);
+      });
+    }
 
-  it('should handle tool requiring confirmation - approved', async () => {
+    if (expectedError) {
+      expect((completedToolCalls[0] as any).response.error.message).toBe(expectedError.message);
+    }
+  });
+
+  it("should handle tool requiring confirmation - approved", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockToolRequiresConfirmation);
-    const expectedOutput = 'Confirmed output';
+    const expectedOutput = "Confirmed output";
     (mockToolRequiresConfirmation.execute as Mock).mockResolvedValue({
       llmContent: expectedOutput,
-      returnDisplay: 'Confirmed display',
+      returnDisplay: "Confirmed display",
     } as ToolResult);
 
     const { result } = renderScheduler();
     const schedule = result.current[1];
     const request: ToolCallRequestInfo = {
-      callId: 'callConfirm',
-      name: 'mockToolRequiresConfirmation',
-      args: { data: 'sensitive' },
+      callId: "callConfirm",
+      name: "mockToolRequiresConfirmation",
+      args: { data: "sensitive" },
     } as any;
 
     act(() => {
@@ -514,7 +483,7 @@ describe('useReactToolScheduler', () => {
     await advanceAndSettle();
 
     const waitingCall = result.current[0][0] as any;
-    expect(waitingCall.status).toBe('awaiting_approval');
+    expect(waitingCall.status).toBe("awaiting_approval");
     capturedOnConfirmForTest = waitingCall.confirmationDetails?.onConfirm;
     expect(capturedOnConfirmForTest).toBeDefined();
 
@@ -532,23 +501,20 @@ describe('useReactToolScheduler', () => {
     expect(mockToolRequiresConfirmation.execute).toHaveBeenCalled();
 
     const completedCalls = onComplete.mock.calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('success');
+    expect(completedCalls[0].status).toBe("success");
     expect(completedCalls[0].request).toBe(request);
-    if (
-      completedCalls[0].status === 'success' ||
-      completedCalls[0].status === 'error'
-    ) {
+    if (completedCalls[0].status === "success" || completedCalls[0].status === "error") {
       expect(completedCalls[0].response).toMatchSnapshot();
     }
   });
 
-  it('should handle tool requiring confirmation - cancelled by user', async () => {
+  it("should handle tool requiring confirmation - cancelled by user", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockToolRequiresConfirmation);
     const { result } = renderScheduler();
     const schedule = result.current[1];
     const request: ToolCallRequestInfo = {
-      callId: 'callConfirmCancel',
-      name: 'mockToolRequiresConfirmation',
+      callId: "callConfirmCancel",
+      name: "mockToolRequiresConfirmation",
       args: {},
     } as any;
 
@@ -558,7 +524,7 @@ describe('useReactToolScheduler', () => {
     await advanceAndSettle();
 
     const waitingCall = result.current[0][0] as any;
-    expect(waitingCall.status).toBe('awaiting_approval');
+    expect(waitingCall.status).toBe("awaiting_approval");
     capturedOnConfirmForTest = waitingCall.confirmationDetails?.onConfirm;
     expect(capturedOnConfirmForTest).toBeDefined();
 
@@ -573,18 +539,18 @@ describe('useReactToolScheduler', () => {
     );
 
     const completedCalls = onComplete.mock.calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('cancelled');
+    expect(completedCalls[0].status).toBe("cancelled");
     expect(completedCalls[0].request).toBe(request);
     if (
-      completedCalls[0].status === 'success' ||
-      completedCalls[0].status === 'error' ||
-      completedCalls[0].status === 'cancelled'
+      completedCalls[0].status === "success" ||
+      completedCalls[0].status === "error" ||
+      completedCalls[0].status === "cancelled"
     ) {
       expect(completedCalls[0].response).toMatchSnapshot();
     }
   });
 
-  it('should handle live output updates', async () => {
+  it("should handle live output updates", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockToolWithLiveOutput);
     let liveUpdateFn: ((output: string) => void) | undefined;
     let resolveExecutePromise: (value: ToolResult) => void;
@@ -602,14 +568,12 @@ describe('useReactToolScheduler', () => {
         return executePromise;
       },
     );
-    (mockToolWithLiveOutput.shouldConfirmExecute as Mock).mockResolvedValue(
-      null,
-    );
+    (mockToolWithLiveOutput.shouldConfirmExecute as Mock).mockResolvedValue(null);
 
     const { result } = renderScheduler();
     const request: ToolCallRequestInfo = {
-      callId: 'liveCall',
-      name: 'mockToolWithLiveOutput',
+      callId: "liveCall",
+      name: "mockToolWithLiveOutput",
       args: {},
     } as any;
 
@@ -619,69 +583,66 @@ describe('useReactToolScheduler', () => {
     await advanceAndSettle();
 
     expect(liveUpdateFn).toBeDefined();
-    expect(result.current[0][0].status).toBe('executing');
+    expect(result.current[0][0].status).toBe("executing");
 
     await act(async () => {
-      liveUpdateFn?.('Live output 1');
+      liveUpdateFn?.("Live output 1");
     });
     await advanceAndSettle();
 
     await act(async () => {
-      liveUpdateFn?.('Live output 2');
+      liveUpdateFn?.("Live output 2");
     });
     await advanceAndSettle();
 
     act(() => {
       resolveExecutePromise({
-        llmContent: 'Final output',
-        returnDisplay: 'Final display',
+        llmContent: "Final output",
+        returnDisplay: "Final display",
       } as ToolResult);
     });
     await advanceAndSettle();
     await advanceAndSettle();
 
     const completedCalls = onComplete.mock.calls[0][0] as ToolCall[];
-    expect(completedCalls[0].status).toBe('success');
+    expect(completedCalls[0].status).toBe("success");
     expect(completedCalls[0].request).toBe(request);
-    if (
-      completedCalls[0].status === 'success' ||
-      completedCalls[0].status === 'error'
-    ) {
+    if (completedCalls[0].status === "success" || completedCalls[0].status === "error") {
       expect(completedCalls[0].response).toMatchSnapshot();
     }
     expect(result.current[0]).toEqual([]);
   });
 
-  it('should schedule and execute multiple tool calls', async () => {
+  it("should schedule and execute multiple tool calls", async () => {
     const tool1 = new MockTool({
-      name: 'tool1',
-      displayName: 'Tool 1',
+      name: "tool1",
+      displayName: "Tool 1",
       execute: vi.fn().mockResolvedValue({
-        llmContent: 'Output 1',
-        returnDisplay: 'Display 1',
+        llmContent: "Output 1",
+        returnDisplay: "Display 1",
       } as ToolResult),
     });
 
     const tool2 = new MockTool({
-      name: 'tool2',
-      displayName: 'Tool 2',
+      name: "tool2",
+      displayName: "Tool 2",
       execute: vi.fn().mockResolvedValue({
-        llmContent: 'Output 2',
-        returnDisplay: 'Display 2',
+        llmContent: "Output 2",
+        returnDisplay: "Display 2",
       } as ToolResult),
     });
 
     mockToolRegistry.getTool.mockImplementation((name) => {
-      if (name === 'tool1') return tool1;
-      if (name === 'tool2') return tool2;
+      if (name === "tool1") return tool1;
+      if (name === "tool2") return tool2;
       return undefined;
     });
 
     const { result } = renderScheduler();
     const schedule = result.current[1];
     const requests: ToolCallRequestInfo[] = [
-      { callId: 'multi1', name: 'tool1', args: { p: 1 } } as any,
-      { callId: 'multi2', name: 'tool2', args: { p: 2 } } as any,
+      { callId: "multi1", name: "tool1", args: { p: 1 } } as any,
+      { callId: "multi2", name: "tool2", args: { p: 2 } } as any,
     ];
 
     act(() => {
@@ -704,40 +665,36 @@ describe('useReactToolScheduler', () => {
     const completedCalls = onComplete.mock.calls[0][0] as ToolCall[];
     expect(completedCalls.length).toBe(2);
 
-    const call1Result = completedCalls.find(
-      (c) => c.request.callId === 'multi1',
-    );
-    const call2Result = completedCalls.find(
-      (c) => c.request.callId === 'multi2',
-    );
+    const call1Result = completedCalls.find((c) => c.request.callId === "multi1");
+    const call2Result = completedCalls.find((c) => c.request.callId === "multi2");
 
     expect(call1Result).toMatchObject({
-      status: 'success',
+      status: "success",
       request: requests[0],
       response: expect.objectContaining({
-        resultDisplay: 'Display 1',
+        resultDisplay: "Display 1",
         responseParts: [
           {
             functionResponse: {
-              id: 'multi1',
-              name: 'tool1',
-              response: { output: 'Output 1' },
+              id: "multi1",
+              name: "tool1",
+              response: { output: "Output 1" },
             },
           },
         ],
       }),
     });
     expect(call2Result).toMatchObject({
-      status: 'success',
+      status: "success",
       request: requests[1],
       response: expect.objectContaining({
-        resultDisplay: 'Display 2',
+        resultDisplay: "Display 2",
         responseParts: [
           {
             functionResponse: {
-              id: 'multi2',
-              name: 'tool2',
-              response: { output: 'Output 2' },
+              id: "multi2",
+              name: "tool2",
+              response: { output: "Output 2" },
             },
           },
         ],
@@ -745,17 +702,17 @@ describe('useReactToolScheduler', () => {
     });
 
     expect(completedCalls).toHaveLength(2);
-    expect(completedCalls.every((t) => t.status === 'success')).toBe(true);
+    expect(completedCalls.every((t) => t.status === "success")).toBe(true);
   });
 
-  it('should queue if scheduling while already running', async () => {
+  it("should queue if scheduling while already running", async () => {
     mockToolRegistry.getTool.mockReturnValue(mockTool);
     const longExecutePromise = new Promise<ToolResult>((resolve) =>
       setTimeout(
         () =>
           resolve({
-            llmContent: 'done',
-            returnDisplay: 'done display',
+            llmContent: "done",
+            returnDisplay: "done display",
           }),
         50,
       ),
@@ -766,13 +723,13 @@ describe('useReactToolScheduler', () => {
     const { result } = renderScheduler();
     const schedule = result.current[1];
     const request1: ToolCallRequestInfo = {
-      callId: 'run1',
-      name: 'mockTool',
+      callId: "run1",
+      name: "mockTool",
       args: {},
     } as any;
     const request2: ToolCallRequestInfo = {
-      callId: 'run2',
-      name: 'mockTool',
+      callId: "run2",
+      name: "mockTool",
       args: {},
     } as any;
 
@@ -796,9 +753,9 @@ describe('useReactToolScheduler', () => {
     });
     expect(onComplete).toHaveBeenCalledWith([
       expect.objectContaining({
-        status: 'success',
+        status: "success",
         request: request1,
-        response: expect.objectContaining({ resultDisplay: 'done display' }),
+        response: expect.objectContaining({ resultDisplay: "done display" }),
       }),
     ]);
     await act(async () => {
@@ -810,9 +767,9 @@ describe('useReactToolScheduler', () => {
     });
     expect(onComplete).toHaveBeenCalledWith([
       expect.objectContaining({
-        status: 'success',
+        status: "success",
         request: request2,
-        response: expect.objectContaining({ resultDisplay: 'done display' }),
+        response: expect.objectContaining({ resultDisplay: "done display" }),
       }),
     ]);
     const toolCalls = result.current[0];
@@ -820,32 +777,32 @@ describe('useReactToolScheduler', () => {
   });
 });
 
-describe('mapToDisplay', () => {
+describe("mapToDisplay", () => {
   const baseRequest: ToolCallRequestInfo = {
-    callId: 'testCallId',
-    name: 'testTool',
-    args: { foo: 'bar' },
+    callId: "testCallId",
+    name: "testTool",
+    args: { foo: "bar" },
   } as any;
 
   const baseTool = new MockTool({
-    name: 'testTool',
-    displayName: 'Test Tool Display',
+    name: "testTool",
+    displayName: "Test Tool Display",
     execute: vi.fn(),
     shouldConfirmExecute: vi.fn(),
   });
 
   const baseResponse: ToolCallResponseInfo = {
-    callId: 'testCallId',
+    callId: "testCallId",
     responseParts: [
       {
         functionResponse: {
-          name: 'testTool',
-          id: 'testCallId',
-          response: { output: 'Test output' },
+          name: "testTool",
+          id: "testCallId",
+          response: { output: "Test output" },
         } as FunctionResponse,
       } as PartUnion,
     ],
-    resultDisplay: 'Test display output',
+    resultDisplay: "Test display output",
     error: undefined,
   } as any;
 
@@ -888,31 +845,31 @@ describe('mapToDisplay', () => {
     expectedDescription?: string;
   }> = [
     {
-      name: 'validating',
-      status: 'validating',
+      name: "validating",
+      status: "validating",
       extraProps: { tool: baseTool, invocation: baseInvocation },
       expectedStatus: ToolCallStatus.Executing,
       expectedName: baseTool.displayName,
       expectedDescription: baseInvocation.getDescription(),
     },
     {
-      name: 'awaiting_approval',
-      status: 'awaiting_approval',
+      name: "awaiting_approval",
+      status: "awaiting_approval",
       extraProps: {
         tool: baseTool,
         invocation: baseInvocation,
         confirmationDetails: {
           onConfirm: vi.fn(),
-          type: 'edit',
-          title: 'Test Tool Display',
-          serverName: 'testTool',
-          toolName: 'testTool',
-          toolDisplayName: 'Test Tool Display',
-          filePath: 'mock',
-          fileName: 'test.ts',
-          fileDiff: 'Test diff',
-          originalContent: 'Original content',
-          newContent: 'New content',
+          type: "edit",
+          title: "Test Tool Display",
+          serverName: "testTool",
+          toolName: "testTool",
+          toolDisplayName: "Test Tool Display",
+          filePath: "mock",
+          fileName: "test.ts",
+          fileDiff: "Test diff",
+          originalContent: "Original content",
+          newContent: "New content",
         } as ToolCallConfirmationDetails,
       },
       expectedStatus: ToolCallStatus.Confirming,
@@ -920,37 +877,37 @@ describe('mapToDisplay', () => {
       expectedDescription: baseInvocation.getDescription(),
     },
     {
-      name: 'scheduled',
-      status: 'scheduled',
+      name: "scheduled",
+      status: "scheduled",
       extraProps: { tool: baseTool, invocation: baseInvocation },
       expectedStatus: ToolCallStatus.Pending,
       expectedName: baseTool.displayName,
       expectedDescription: baseInvocation.getDescription(),
     },
     {
-      name: 'executing no live output',
-      status: 'executing',
+      name: "executing no live output",
+      status: "executing",
       extraProps: { tool: baseTool, invocation: baseInvocation },
       expectedStatus: ToolCallStatus.Executing,
       expectedName: baseTool.displayName,
       expectedDescription: baseInvocation.getDescription(),
     },
     {
-      name: 'executing with live output',
-      status: 'executing',
+      name: "executing with live output",
+      status: "executing",
       extraProps: {
         tool: baseTool,
         invocation: baseInvocation,
-        liveOutput: 'Live test output',
+        liveOutput: "Live test output",
       },
       expectedStatus: ToolCallStatus.Executing,
-      expectedResultDisplay: 'Live test output',
+      expectedResultDisplay: "Live test output",
       expectedName: baseTool.displayName,
       expectedDescription: baseInvocation.getDescription(),
     },
     {
-      name: 'success',
-      status: 'success',
+      name: "success",
+      status: "success",
       extraProps: {
         tool: baseTool,
         invocation: baseInvocation,
@@ -962,49 +919,49 @@ describe('mapToDisplay', () => {
       expectedDescription: baseInvocation.getDescription(),
     },
     {
-      name: 'error tool not found',
-      status: 'error',
+      name: "error tool not found",
+      status: "error",
       extraProps: {
         response: {
           ...baseResponse,
-          error: new Error('Test error tool not found'),
-          resultDisplay: 'Error display tool not found',
+          error: new Error("Test error tool not found"),
+          resultDisplay: "Error display tool not found",
         },
       },
       expectedStatus: ToolCallStatus.Error,
-      expectedResultDisplay: 'Error display tool not found',
+      expectedResultDisplay: "Error display tool not found",
       expectedName: baseRequest.name,
       expectedDescription: JSON.stringify(baseRequest.args),
     },
     {
-      name: 'error tool execution failed',
-      status: 'error',
+      name: "error tool execution failed",
+      status: "error",
       extraProps: {
         tool: baseTool,
         response: {
           ...baseResponse,
-          error: new Error('Tool execution failed'),
-          resultDisplay: 'Execution failed display',
+          error: new Error("Tool execution failed"),
+          resultDisplay: "Execution failed display",
         },
       },
       expectedStatus: ToolCallStatus.Error,
-      expectedResultDisplay: 'Execution failed display',
+      expectedResultDisplay: "Execution failed display",
       expectedName: baseTool.displayName, // Changed from baseTool.name
       expectedDescription: JSON.stringify(baseRequest.args),
     },
     {
-      name: 'cancelled',
-      status: 'cancelled',
+      name: "cancelled",
+      status: "cancelled",
       extraProps: {
         tool: baseTool,
         invocation: baseInvocation,
         response: {
           ...baseResponse,
-          resultDisplay: 'Cancelled display',
+          resultDisplay: "Cancelled display",
         },
       },
       expectedStatus: ToolCallStatus.Canceled,
-      expectedResultDisplay: 'Cancelled display',
+      expectedResultDisplay: "Cancelled display",
       expectedName: baseTool.displayName,
       expectedDescription: baseInvocation.getDescription(),
     },
@@ -1028,7 +985,7 @@ describe('mapToDisplay', () => {
         } as ToolCall;
 
         const display = mapToDisplay(toolCall);
-        expect(display.type).toBe('tool_group');
+        expect(display.type).toBe("tool_group");
         expect(display.tools.length).toBe(1);
         const toolDisplay = display.tools[0];
 
@@ -1042,10 +999,8 @@ describe('mapToDisplay', () => {
         expect(toolDisplay.renderOutputAsMarkdown).toBe(
           extraProps?.tool?.isOutputMarkdown ?? false,
         );
-        if (status === 'awaiting_approval') {
-          expect(toolDisplay.confirmationDetails).toBe(
-            extraProps!.confirmationDetails,
-          );
+        if (status === "awaiting_approval") {
+          expect(toolDisplay.confirmationDetails).toBe(extraProps!.confirmationDetails);
         } else {
           expect(toolDisplay.confirmationDetails).toBeUndefined();
         }
@@ -1053,13 +1008,13 @@ describe('mapToDisplay', () => {
     },
   );
 
-  it('should map an array of ToolCalls correctly', () => {
+  it("should map an array of ToolCalls correctly", () => {
     const toolCall1: ToolCall = {
-      request: { ...baseRequest, callId: 'call1' },
-      status: 'success',
+      request: { ...baseRequest, callId: "call1" },
+      status: "success",
       tool: baseTool,
       invocation: baseTool.build(baseRequest.args),
-      response: { ...baseResponse, callId: 'call1' },
+      response: { ...baseResponse, callId: "call1" },
     } as ToolCall;
     const toolForCall2 = new MockTool({
       name: baseTool.name,
@@ -1069,21 +1024,21 @@ describe('mapToDisplay', () => {
       shouldConfirmExecute: vi.fn(),
     });
     const toolCall2: ToolCall = {
-      request: { ...baseRequest, callId: 'call2' },
-      status: 'executing',
+      request: { ...baseRequest, callId: "call2" },
+      status: "executing",
       tool: toolForCall2,
       invocation: toolForCall2.build(baseRequest.args),
-      liveOutput: 'markdown output',
+      liveOutput: "markdown output",
     } as ToolCall;
 
     const display = mapToDisplay([toolCall1, toolCall2]);
     expect(display.tools.length).toBe(2);
-    expect(display.tools[0].callId).toBe('call1');
+    expect(display.tools[0].callId).toBe("call1");
     expect(display.tools[0].status).toBe(ToolCallStatus.Success);
     expect(display.tools[0].renderOutputAsMarkdown).toBe(false);
-    expect(display.tools[1].callId).toBe('call2');
+    expect(display.tools[1].callId).toBe("call2");
     expect(display.tools[1].status).toBe(ToolCallStatus.Executing);
-    expect(display.tools[1].resultDisplay).toBe('markdown output');
+    expect(display.tools[1].resultDisplay).toBe("markdown output");
     expect(display.tools[1].renderOutputAsMarkdown).toBe(true);
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/vim.test.tsx b/packages/ui-gemini/src/ui/hooks/vim.test.tsx
index 3f6ae1f90..66d1c175d 100644
--- a/packages/ui-gemini/src/ui/hooks/vim.test.tsx
+++ b/packages/ui-gemini/src/ui/hooks/vim.test.tsx
@@ -4,38 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import type React from 'react';
-import { act } from 'react';
-import { renderHook } from '../../test-utils/render.js';
-import { waitFor } from '../../test-utils/async.js';
-import { useVim } from './vim.js';
-import type { VimMode } from './vim.js';
-import type { Key } from './useKeypress.js';
+import type React from "react";
+import { act } from "react";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { waitFor } from "../../test-utils/async.js";
+import { renderHook } from "../../test-utils/render.js";
 import type {
   TextBuffer,
-  TextBufferState,
   TextBufferAction,
-} from '../components/shared/text-buffer.js';
-import { textBufferReducer } from '../components/shared/text-buffer.js';
+  TextBufferState,
+} from "../components/shared/text-buffer.js";
+import { textBufferReducer } from "../components/shared/text-buffer.js";
+import type { Key } from "./useKeypress.js";
+import type { VimMode } from "./vim.js";
+import { useVim } from "./vim.js";
 
 // Mock the VimModeContext
 const mockVimContext = {
   vimEnabled: true,
-  vimMode: 'NORMAL' as VimMode,
+  vimMode: "NORMAL" as VimMode,
   toggleVimEnabled: vi.fn(),
   setVimMode: vi.fn(),
 };
 
-vi.mock('../contexts/VimModeContext.js', () => ({
+vi.mock("../contexts/VimModeContext.js", () => ({
   useVimMode: () => mockVimContext,
   VimModeProvider: ({ children }: { children: React.ReactNode }) => children,
 }));
 
 // Helper to create a full Key object from partial data
 const createKey = (partial: Partial<Key>): Key => ({
-  name: partial.name || '',
-  sequence: partial.sequence || '',
+  name: partial.name || "",
+  sequence: partial.sequence || "",
   ctrl: partial.ctrl || false,
   meta: partial.meta || false,
   shift: partial.shift || false,
@@ -44,10 +44,8 @@ const createKey = (partial: Partial<Key>): Key => ({
   ...partial,
 });
 
-const createMockTextBufferState = (
-  partial: Partial<TextBufferState>,
-): TextBufferState => {
-  const lines = partial.lines || [''];
+const createMockTextBufferState = (partial: Partial<TextBufferState>): TextBufferState => {
+  const lines = partial.lines || [""];
   return {
     lines,
     cursorRow: 0,
@@ -70,34 +68,31 @@ const createMockTextBufferState = (
 
 // Test constants
 const TEST_SEQUENCES = {
-  ESCAPE: createKey({ sequence: '\u001b', name: 'escape' }),
-  LEFT: createKey({ sequence: 'h' }),
-  RIGHT: createKey({ sequence: 'l' }),
-  UP: createKey({ sequence: 'k' }),
-  DOWN: createKey({ sequence: 'j' }),
-  INSERT: createKey({ sequence: 'i' }),
-  APPEND: createKey({ sequence: 'a' }),
-  DELETE_CHAR: createKey({ sequence: 'x' }),
-  DELETE: createKey({ sequence: 'd' }),
-  CHANGE: createKey({ sequence: 'c' }),
-  WORD_FORWARD: createKey({ sequence: 'w' }),
-  WORD_BACKWARD: createKey({ sequence: 'b' }),
-  WORD_END: createKey({ sequence: 'e' }),
-  LINE_START: createKey({ sequence: '0' }),
-  LINE_END: createKey({ sequence: '$' }),
-  REPEAT: createKey({ sequence: '.' }),
+  ESCAPE: createKey({ sequence: "\u001b", name: "escape" }),
+  LEFT: createKey({ sequence: "h" }),
+  RIGHT: createKey({ sequence: "l" }),
+  UP: createKey({ sequence: "k" }),
+  DOWN: createKey({ sequence: "j" }),
+  INSERT: createKey({ sequence: "i" }),
+  APPEND: createKey({ sequence: "a" }),
+  DELETE_CHAR: createKey({ sequence: "x" }),
+  DELETE: createKey({ sequence: "d" }),
+  CHANGE: createKey({ sequence: "c" }),
+  WORD_FORWARD: createKey({ sequence: "w" }),
+  WORD_BACKWARD: createKey({ sequence: "b" }),
+  WORD_END: createKey({ sequence: "e" }),
+  LINE_START: createKey({ sequence: "0" }),
+  LINE_END: createKey({ sequence: "$" }),
+  REPEAT: createKey({ sequence: "." }),
 } as const;
 
-describe('useVim hook', () => {
+describe("useVim hook", () => {
   let mockBuffer: Partial<TextBuffer>;
   let mockHandleFinalSubmit: Mock;
 
-  const createMockBuffer = (
-    text = 'hello world',
-    cursor: [number, number] = [0, 5],
-  ) => {
+  const createMockBuffer = (text = "hello world", cursor: [number, number] = [0, 5]) => {
     const cursorState = { pos: cursor };
-    const lines = text.split('\n');
+    const lines = text.split("\n");
 
     return {
       lines,
@@ -110,14 +105,14 @@ describe('useVim hook', () => {
       text,
       move: vi.fn().mockImplementation((direction: string) => {
         let [row, col] = cursorState.pos;
-        const line = lines[row] || '';
-        if (direction === 'left') {
+        const line = lines[row] || "";
+        if (direction === "left") {
           col = Math.max(0, col - 1);
-        } else if (direction === 'right') {
+        } else if (direction === "right") {
           col = Math.min(line.length, col + 1);
-        } else if (direction === 'home') {
+        } else if (direction === "home") {
           col = 0;
-        } else if (direction === 'end') {
+        } else if (direction === "end") {
           col = line.length;
         }
         cursorState.pos = [row, col];
@@ -178,9 +173,7 @@ describe('useVim hook', () => {
   };
 
   const renderVimHook = (buffer?: Partial<TextBuffer>) =>
-    renderHook(() =>
-      useVim((buffer || mockBuffer) as TextBuffer, mockHandleFinalSubmit),
-    );
+    renderHook(() => useVim((buffer || mockBuffer) as TextBuffer, mockHandleFinalSubmit));
 
   const exitInsertMode = (result: {
     current: {
@@ -198,335 +191,328 @@ describe('useVim hook', () => {
     mockBuffer = createMockBuffer();
     // Reset mock context to default state
     mockVimContext.vimEnabled = true;
-    mockVimContext.vimMode = 'NORMAL';
+    mockVimContext.vimMode = "NORMAL";
     mockVimContext.toggleVimEnabled.mockClear();
     mockVimContext.setVimMode.mockClear();
   });
 
-  describe('Mode switching', () => {
-    it('should start in NORMAL mode', () => {
+  describe("Mode switching", () => {
+    it("should start in NORMAL mode", () => {
       const { result } = renderVimHook();
-      expect(result.current.mode).toBe('NORMAL');
+      expect(result.current.mode).toBe("NORMAL");
     });
 
-    it('should switch to INSERT mode with i command', () => {
+    it("should switch to INSERT mode with i command", () => {
       const { result } = renderVimHook();
 
       act(() => {
         result.current.handleInput(TEST_SEQUENCES.INSERT);
       });
 
-      expect(result.current.mode).toBe('INSERT');
-      expect(mockVimContext.setVimMode).toHaveBeenCalledWith('INSERT');
+      expect(result.current.mode).toBe("INSERT");
+      expect(mockVimContext.setVimMode).toHaveBeenCalledWith("INSERT");
     });
 
-    it('should switch back to NORMAL mode with Escape', () => {
+    it("should switch back to NORMAL mode with Escape", () => {
       const { result } = renderVimHook();
 
       act(() => {
         result.current.handleInput(TEST_SEQUENCES.INSERT);
       });
-      expect(result.current.mode).toBe('INSERT');
+      expect(result.current.mode).toBe("INSERT");
 
       exitInsertMode(result);
-      expect(result.current.mode).toBe('NORMAL');
+      expect(result.current.mode).toBe("NORMAL");
     });
 
-    it('should properly handle escape followed immediately by a command', () => {
-      const testBuffer = createMockBuffer('hello world test', [0, 6]);
+    it("should properly handle escape followed immediately by a command", () => {
+      const testBuffer = createMockBuffer("hello world test", [0, 6]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'i' }));
+        result.current.handleInput(createKey({ sequence: "i" }));
       });
-      expect(result.current.mode).toBe('INSERT');
+      expect(result.current.mode).toBe("INSERT");
 
       vi.clearAllMocks();
 
       exitInsertMode(result);
-      expect(result.current.mode).toBe('NORMAL');
+      expect(result.current.mode).toBe("NORMAL");
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'b' }));
+        result.current.handleInput(createKey({ sequence: "b" }));
       });
 
       expect(testBuffer.vimMoveWordBackward).toHaveBeenCalledWith(1);
     });
   });
 
-  describe('Navigation commands', () => {
-    it('should handle h (left movement)', () => {
+  describe("Navigation commands", () => {
+    it("should handle h (left movement)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'h' }));
+        result.current.handleInput(createKey({ sequence: "h" }));
       });
 
       expect(mockBuffer.vimMoveLeft).toHaveBeenCalledWith(1);
     });
 
-    it('should handle l (right movement)', () => {
+    it("should handle l (right movement)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'l' }));
+        result.current.handleInput(createKey({ sequence: "l" }));
       });
 
       expect(mockBuffer.vimMoveRight).toHaveBeenCalledWith(1);
     });
 
-    it('should handle j (down movement)', () => {
-      const testBuffer = createMockBuffer('first line\nsecond line');
+    it("should handle j (down movement)", () => {
+      const testBuffer = createMockBuffer("first line\nsecond line");
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'j' }));
+        result.current.handleInput(createKey({ sequence: "j" }));
       });
 
       expect(testBuffer.vimMoveDown).toHaveBeenCalledWith(1);
     });
 
-    it('should handle k (up movement)', () => {
-      const testBuffer = createMockBuffer('first line\nsecond line');
+    it("should handle k (up movement)", () => {
+      const testBuffer = createMockBuffer("first line\nsecond line");
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'k' }));
+        result.current.handleInput(createKey({ sequence: "k" }));
       });
 
       expect(testBuffer.vimMoveUp).toHaveBeenCalledWith(1);
     });
 
-    it('should handle 0 (move to start of line)', () => {
+    it("should handle 0 (move to start of line)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '0' }));
+        result.current.handleInput(createKey({ sequence: "0" }));
       });
 
       expect(mockBuffer.vimMoveToLineStart).toHaveBeenCalled();
     });
 
-    it('should handle $ (move to end of line)', () => {
+    it("should handle $ (move to end of line)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '$' }));
+        result.current.handleInput(createKey({ sequence: "$" }));
       });
 
       expect(mockBuffer.vimMoveToLineEnd).toHaveBeenCalled();
     });
   });
 
-  describe('Mode switching commands', () => {
-    it('should handle a (append after cursor)', () => {
+  describe("Mode switching commands", () => {
+    it("should handle a (append after cursor)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'a' }));
+        result.current.handleInput(createKey({ sequence: "a" }));
       });
 
       expect(mockBuffer.vimAppendAtCursor).toHaveBeenCalled();
-      expect(result.current.mode).toBe('INSERT');
+      expect(result.current.mode).toBe("INSERT");
     });
 
-    it('should handle A (append at end of line)', () => {
+    it("should handle A (append at end of line)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'A' }));
+        result.current.handleInput(createKey({ sequence: "A" }));
       });
 
       expect(mockBuffer.vimAppendAtLineEnd).toHaveBeenCalled();
-      expect(result.current.mode).toBe('INSERT');
+      expect(result.current.mode).toBe("INSERT");
     });
 
-    it('should handle o (open line below)', () => {
+    it("should handle o (open line below)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'o' }));
+        result.current.handleInput(createKey({ sequence: "o" }));
       });
 
       expect(mockBuffer.vimOpenLineBelow).toHaveBeenCalled();
-      expect(result.current.mode).toBe('INSERT');
+      expect(result.current.mode).toBe("INSERT");
     });
 
-    it('should handle O (open line above)', () => {
+    it("should handle O (open line above)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'O' }));
+        result.current.handleInput(createKey({ sequence: "O" }));
       });
 
       expect(mockBuffer.vimOpenLineAbove).toHaveBeenCalled();
-      expect(result.current.mode).toBe('INSERT');
+      expect(result.current.mode).toBe("INSERT");
     });
   });
 
-  describe('Edit commands', () => {
-    it('should handle x (delete character)', () => {
+  describe("Edit commands", () => {
+    it("should handle x (delete character)", () => {
       const { result } = renderVimHook();
       vi.clearAllMocks();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'x' }));
+        result.current.handleInput(createKey({ sequence: "x" }));
       });
 
       expect(mockBuffer.vimDeleteChar).toHaveBeenCalledWith(1);
     });
 
-    it('should move cursor left when deleting last character on line (vim behavior)', () => {
-      const testBuffer = createMockBuffer('hello', [0, 4]);
+    it("should move cursor left when deleting last character on line (vim behavior)", () => {
+      const testBuffer = createMockBuffer("hello", [0, 4]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'x' }));
+        result.current.handleInput(createKey({ sequence: "x" }));
       });
 
       expect(testBuffer.vimDeleteChar).toHaveBeenCalledWith(1);
     });
 
-    it('should handle first d key (sets pending state)', () => {
+    it("should handle first d key (sets pending state)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'd' }));
+        result.current.handleInput(createKey({ sequence: "d" }));
       });
 
       expect(mockBuffer.replaceRangeByOffset).not.toHaveBeenCalled();
     });
   });
 
-  describe('Count handling', () => {
-    it('should handle count input and return to count 0 after command', () => {
+  describe("Count handling", () => {
+    it("should handle count input and return to count 0 after command", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        const handled = result.current.handleInput(
-          createKey({ sequence: '3' }),
-        );
+        const handled = result.current.handleInput(createKey({ sequence: "3" }));
         expect(handled).toBe(true);
       });
 
       act(() => {
-        const handled = result.current.handleInput(
-          createKey({ sequence: 'h' }),
-        );
+        const handled = result.current.handleInput(createKey({ sequence: "h" }));
         expect(handled).toBe(true);
       });
 
       expect(mockBuffer.vimMoveLeft).toHaveBeenCalledWith(3);
     });
 
-    it('should only delete 1 character with x command when no count is specified', () => {
+    it("should only delete 1 character with x command when no count is specified", () => {
       const testBuffer = createMockBuffer();
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'x' }));
+        result.current.handleInput(createKey({ sequence: "x" }));
       });
 
       expect(testBuffer.vimDeleteChar).toHaveBeenCalledWith(1);
     });
   });
 
-  describe('Word movement', () => {
-    it('should properly initialize vim hook with word movement support', () => {
-      const testBuffer = createMockBuffer('cat elephant mouse', [0, 0]);
+  describe("Word movement", () => {
+    it("should properly initialize vim hook with word movement support", () => {
+      const testBuffer = createMockBuffer("cat elephant mouse", [0, 0]);
       const { result } = renderVimHook(testBuffer);
 
       expect(result.current.vimModeEnabled).toBe(true);
-      expect(result.current.mode).toBe('NORMAL');
+      expect(result.current.mode).toBe("NORMAL");
       expect(result.current.handleInput).toBeDefined();
     });
 
-    it('should support vim mode and basic operations across multiple lines', () => {
-      const testBuffer = createMockBuffer(
-        'first line word\nsecond line word',
-        [0, 11],
-      );
+    it("should support vim mode and basic operations across multiple lines", () => {
+      const testBuffer = createMockBuffer("first line word\nsecond line word", [0, 11]);
       const { result } = renderVimHook(testBuffer);
 
       expect(result.current.vimModeEnabled).toBe(true);
-      expect(result.current.mode).toBe('NORMAL');
+      expect(result.current.mode).toBe("NORMAL");
       expect(result.current.handleInput).toBeDefined();
       expect(testBuffer.replaceRangeByOffset).toBeDefined();
       expect(testBuffer.moveToOffset).toBeDefined();
     });
 
-    it('should handle w (next word)', () => {
-      const testBuffer = createMockBuffer('hello world test');
+    it("should handle w (next word)", () => {
+      const testBuffer = createMockBuffer("hello world test");
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'w' }));
+        result.current.handleInput(createKey({ sequence: "w" }));
       });
 
       expect(testBuffer.vimMoveWordForward).toHaveBeenCalledWith(1);
     });
 
-    it('should handle b (previous word)', () => {
-      const testBuffer = createMockBuffer('hello world test', [0, 6]);
+    it("should handle b (previous word)", () => {
+      const testBuffer = createMockBuffer("hello world test", [0, 6]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'b' }));
+        result.current.handleInput(createKey({ sequence: "b" }));
       });
 
       expect(testBuffer.vimMoveWordBackward).toHaveBeenCalledWith(1);
     });
 
-    it('should handle e (end of word)', () => {
-      const testBuffer = createMockBuffer('hello world test');
+    it("should handle e (end of word)", () => {
+      const testBuffer = createMockBuffer("hello world test");
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'e' }));
+        result.current.handleInput(createKey({ sequence: "e" }));
       });
 
       expect(testBuffer.vimMoveWordEnd).toHaveBeenCalledWith(1);
     });
 
-    it('should handle w when cursor is on the last word', () => {
-      const testBuffer = createMockBuffer('hello world', [0, 8]);
+    it("should handle w when cursor is on the last word", () => {
+      const testBuffer = createMockBuffer("hello world", [0, 8]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'w' }));
+        result.current.handleInput(createKey({ sequence: "w" }));
       });
 
       expect(testBuffer.vimMoveWordForward).toHaveBeenCalledWith(1);
     });
 
-    it('should handle first c key (sets pending change state)', () => {
+    it("should handle first c key (sets pending change state)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'c' }));
+        result.current.handleInput(createKey({ sequence: "c" }));
       });
 
-      expect(result.current.mode).toBe('NORMAL');
+      expect(result.current.mode).toBe("NORMAL");
       expect(mockBuffer.del).not.toHaveBeenCalled();
     });
 
-    it('should clear pending state on invalid command sequence (df)', () => {
+    it("should clear pending state on invalid command sequence (df)", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'd' }));
-        result.current.handleInput(createKey({ sequence: 'f' }));
+        result.current.handleInput(createKey({ sequence: "d" }));
+        result.current.handleInput(createKey({ sequence: "f" }));
       });
 
       expect(mockBuffer.replaceRangeByOffset).not.toHaveBeenCalled();
       expect(mockBuffer.del).not.toHaveBeenCalled();
     });
 
-    it('should clear pending state with Escape in NORMAL mode', () => {
+    it("should clear pending state with Escape in NORMAL mode", () => {
       const { result } = renderVimHook();
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'd' }));
+        result.current.handleInput(createKey({ sequence: "d" }));
       });
 
       exitInsertMode(result);
@@ -535,13 +521,13 @@ describe('useVim hook', () => {
     });
   });
 
-  describe('Disabled vim mode', () => {
-    it('should not respond to vim commands when disabled', () => {
+  describe("Disabled vim mode", () => {
+    it("should not respond to vim commands when disabled", () => {
       mockVimContext.vimEnabled = false;
       const { result } = renderVimHook(mockBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'h' }));
+        result.current.handleInput(createKey({ sequence: "h" }));
       });
 
       expect(mockBuffer.move).not.toHaveBeenCalled();
@@ -550,54 +536,54 @@ describe('useVim hook', () => {
 
   // These tests are no longer applicable at the hook level
 
-  describe('Command repeat system', () => {
-    it('should repeat x command from current cursor position', () => {
-      const testBuffer = createMockBuffer('abcd\nefgh\nijkl', [0, 1]);
+  describe("Command repeat system", () => {
+    it("should repeat x command from current cursor position", () => {
+      const testBuffer = createMockBuffer("abcd\nefgh\nijkl", [0, 1]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'x' }));
+        result.current.handleInput(createKey({ sequence: "x" }));
       });
       expect(testBuffer.vimDeleteChar).toHaveBeenCalledWith(1);
 
       testBuffer.cursor = [1, 2];
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
       expect(testBuffer.vimDeleteChar).toHaveBeenCalledWith(1);
     });
 
-    it('should repeat dd command from current position', () => {
-      const testBuffer = createMockBuffer('line1\nline2\nline3', [1, 0]);
+    it("should repeat dd command from current position", () => {
+      const testBuffer = createMockBuffer("line1\nline2\nline3", [1, 0]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'd' }));
+        result.current.handleInput(createKey({ sequence: "d" }));
       });
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'd' }));
+        result.current.handleInput(createKey({ sequence: "d" }));
       });
       expect(testBuffer.vimDeleteLine).toHaveBeenCalledTimes(1);
 
       testBuffer.cursor = [0, 0];
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
 
       expect(testBuffer.vimDeleteLine).toHaveBeenCalledTimes(2);
     });
 
-    it('should repeat ce command from current position', () => {
-      const testBuffer = createMockBuffer('word', [0, 0]);
+    it("should repeat ce command from current position", () => {
+      const testBuffer = createMockBuffer("word", [0, 0]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'c' }));
+        result.current.handleInput(createKey({ sequence: "c" }));
       });
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'e' }));
+        result.current.handleInput(createKey({ sequence: "e" }));
       });
       expect(testBuffer.vimChangeWordEnd).toHaveBeenCalledTimes(1);
 
@@ -607,21 +593,21 @@ describe('useVim hook', () => {
       testBuffer.cursor = [0, 2];
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
 
       expect(testBuffer.vimChangeWordEnd).toHaveBeenCalledTimes(2);
     });
 
-    it('should repeat cc command from current position', () => {
-      const testBuffer = createMockBuffer('line1\nline2\nline3', [1, 2]);
+    it("should repeat cc command from current position", () => {
+      const testBuffer = createMockBuffer("line1\nline2\nline3", [1, 2]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'c' }));
+        result.current.handleInput(createKey({ sequence: "c" }));
       });
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'c' }));
+        result.current.handleInput(createKey({ sequence: "c" }));
       });
       expect(testBuffer.vimChangeLine).toHaveBeenCalledTimes(1);
 
@@ -631,21 +617,21 @@ describe('useVim hook', () => {
       testBuffer.cursor = [0, 1];
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
 
       expect(testBuffer.vimChangeLine).toHaveBeenCalledTimes(2);
     });
 
-    it('should repeat cw command from current position', () => {
-      const testBuffer = createMockBuffer('hello world test', [0, 6]);
+    it("should repeat cw command from current position", () => {
+      const testBuffer = createMockBuffer("hello world test", [0, 6]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'c' }));
+        result.current.handleInput(createKey({ sequence: "c" }));
       });
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'w' }));
+        result.current.handleInput(createKey({ sequence: "w" }));
       });
       expect(testBuffer.vimChangeWordForward).toHaveBeenCalledTimes(1);
 
@@ -655,18 +641,18 @@ describe('useVim hook', () => {
       testBuffer.cursor = [0, 0];
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
 
       expect(testBuffer.vimChangeWordForward).toHaveBeenCalledTimes(2);
     });
 
-    it('should repeat D command from current position', () => {
-      const testBuffer = createMockBuffer('hello world test', [0, 6]);
+    it("should repeat D command from current position", () => {
+      const testBuffer = createMockBuffer("hello world test", [0, 6]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'D' }));
+        result.current.handleInput(createKey({ sequence: "D" }));
       });
       expect(testBuffer.vimDeleteToEndOfLine).toHaveBeenCalledTimes(1);
 
@@ -674,18 +660,18 @@ describe('useVim hook', () => {
       vi.clearAllMocks(); // Clear all mocks instead of just one method
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
 
       expect(testBuffer.vimDeleteToEndOfLine).toHaveBeenCalledTimes(1);
     });
 
-    it('should repeat C command from current position', () => {
-      const testBuffer = createMockBuffer('hello world test', [0, 6]);
+    it("should repeat C command from current position", () => {
+      const testBuffer = createMockBuffer("hello world test", [0, 6]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'C' }));
+        result.current.handleInput(createKey({ sequence: "C" }));
       });
       expect(testBuffer.vimChangeToEndOfLine).toHaveBeenCalledTimes(1);
 
@@ -695,91 +681,91 @@ describe('useVim hook', () => {
       testBuffer.cursor = [0, 2];
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
 
       expect(testBuffer.vimChangeToEndOfLine).toHaveBeenCalledTimes(2);
     });
 
-    it('should repeat command after cursor movement', () => {
-      const testBuffer = createMockBuffer('test text', [0, 0]);
+    it("should repeat command after cursor movement", () => {
+      const testBuffer = createMockBuffer("test text", [0, 0]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'x' }));
+        result.current.handleInput(createKey({ sequence: "x" }));
       });
       expect(testBuffer.vimDeleteChar).toHaveBeenCalledWith(1);
 
       testBuffer.cursor = [0, 2];
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '.' }));
+        result.current.handleInput(createKey({ sequence: "." }));
       });
       expect(testBuffer.vimDeleteChar).toHaveBeenCalledWith(1);
     });
 
     it('should move cursor to the correct position after exiting INSERT mode with "a"', () => {
-      const testBuffer = createMockBuffer('hello world', [0, 10]);
+      const testBuffer = createMockBuffer("hello world", [0, 10]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'a' }));
+        result.current.handleInput(createKey({ sequence: "a" }));
       });
-      expect(result.current.mode).toBe('INSERT');
+      expect(result.current.mode).toBe("INSERT");
       expect(testBuffer.cursor).toEqual([0, 11]);
 
       exitInsertMode(result);
-      expect(result.current.mode).toBe('NORMAL');
+      expect(result.current.mode).toBe("NORMAL");
       expect(testBuffer.cursor).toEqual([0, 10]);
     });
   });
 
-  describe('Special characters and edge cases', () => {
-    it('should handle ^ (move to first non-whitespace character)', () => {
-      const testBuffer = createMockBuffer('   hello world', [0, 5]);
+  describe("Special characters and edge cases", () => {
+    it("should handle ^ (move to first non-whitespace character)", () => {
+      const testBuffer = createMockBuffer("   hello world", [0, 5]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '^' }));
+        result.current.handleInput(createKey({ sequence: "^" }));
       });
 
       expect(testBuffer.vimMoveToFirstNonWhitespace).toHaveBeenCalled();
     });
 
-    it('should handle G without count (go to last line)', () => {
-      const testBuffer = createMockBuffer('line1\nline2\nline3', [0, 0]);
+    it("should handle G without count (go to last line)", () => {
+      const testBuffer = createMockBuffer("line1\nline2\nline3", [0, 0]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'G' }));
+        result.current.handleInput(createKey({ sequence: "G" }));
       });
 
       expect(testBuffer.vimMoveToLastLine).toHaveBeenCalled();
     });
 
-    it('should handle gg (go to first line)', () => {
-      const testBuffer = createMockBuffer('line1\nline2\nline3', [2, 0]);
+    it("should handle gg (go to first line)", () => {
+      const testBuffer = createMockBuffer("line1\nline2\nline3", [2, 0]);
       const { result } = renderVimHook(testBuffer);
 
       // First 'g' sets pending state
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'g' }));
+        result.current.handleInput(createKey({ sequence: "g" }));
       });
 
       // Second 'g' executes the command
       act(() => {
-        result.current.handleInput(createKey({ sequence: 'g' }));
+        result.current.handleInput(createKey({ sequence: "g" }));
       });
 
       expect(testBuffer.vimMoveToFirstLine).toHaveBeenCalled();
     });
 
-    it('should handle count with movement commands', () => {
-      const testBuffer = createMockBuffer('hello world test', [0, 0]);
+    it("should handle count with movement commands", () => {
+      const testBuffer = createMockBuffer("hello world test", [0, 0]);
       const { result } = renderVimHook(testBuffer);
 
       act(() => {
-        result.current.handleInput(createKey({ sequence: '3' }));
+        result.current.handleInput(createKey({ sequence: "3" }));
       });
 
       act(() => {
@@ -790,26 +776,26 @@ describe('useVim hook', () => {
     });
   });
 
-  describe('Vim word operations', () => {
-    describe('dw (delete word forward)', () => {
-      it('should delete from cursor to start of next word', () => {
-        const testBuffer = createMockBuffer('hello world test', [0, 0]);
+  describe("Vim word operations", () => {
+    describe("dw (delete word forward)", () => {
+      it("should delete from cursor to start of next word", () => {
+        const testBuffer = createMockBuffer("hello world test", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         expect(testBuffer.vimDeleteWordForward).toHaveBeenCalledWith(1);
       });
 
-      it('should actually delete the complete word including trailing space', () => {
+      it("should actually delete the complete word including trailing space", () => {
         // This test uses the real text-buffer reducer instead of mocks
         const initialState = createMockTextBufferState({
-          lines: ['hello world test'],
+          lines: ["hello world test"],
           cursorRow: 0,
           cursorCol: 0,
           preferredCol: null,
@@ -820,19 +806,19 @@ describe('useVim hook', () => {
         });
 
         const result = textBufferReducer(initialState, {
-          type: 'vim_delete_word_forward',
+          type: "vim_delete_word_forward",
           payload: { count: 1 },
         });
 
         // Should delete "hello " (word + space), leaving "world test"
-        expect(result.lines).toEqual(['world test']);
+        expect(result.lines).toEqual(["world test"]);
         expect(result.cursorRow).toBe(0);
         expect(result.cursorCol).toBe(0);
       });
 
-      it('should delete word from middle of word correctly', () => {
+      it("should delete word from middle of word correctly", () => {
         const initialState = createMockTextBufferState({
-          lines: ['hello world test'],
+          lines: ["hello world test"],
           cursorRow: 0,
           cursorCol: 2, // cursor on 'l' in "hello"
           preferredCol: null,
@@ -843,19 +829,19 @@ describe('useVim hook', () => {
         });
 
         const result = textBufferReducer(initialState, {
-          type: 'vim_delete_word_forward',
+          type: "vim_delete_word_forward",
           payload: { count: 1 },
         });
 
         // Should delete "llo " (rest of word + space), leaving "he world test"
-        expect(result.lines).toEqual(['heworld test']);
+        expect(result.lines).toEqual(["heworld test"]);
         expect(result.cursorRow).toBe(0);
         expect(result.cursorCol).toBe(2);
       });
 
-      it('should handle dw at end of line', () => {
+      it("should handle dw at end of line", () => {
         const initialState = createMockTextBufferState({
-          lines: ['hello world'],
+          lines: ["hello world"],
           cursorRow: 0,
           cursorCol: 6, // cursor on 'w' in "world"
           preferredCol: null,
@@ -866,134 +852,134 @@ describe('useVim hook', () => {
         });
 
         const result = textBufferReducer(initialState, {
-          type: 'vim_delete_word_forward',
+          type: "vim_delete_word_forward",
           payload: { count: 1 },
         });
 
         // Should delete "world" (no trailing space at end), leaving "hello "
-        expect(result.lines).toEqual(['hello ']);
+        expect(result.lines).toEqual(["hello "]);
         expect(result.cursorRow).toBe(0);
         expect(result.cursorCol).toBe(6);
       });
 
-      it('should delete multiple words with count', () => {
-        const testBuffer = createMockBuffer('one two three four', [0, 0]);
+      it("should delete multiple words with count", () => {
+        const testBuffer = createMockBuffer("one two three four", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: '2' }));
+          result.current.handleInput(createKey({ sequence: "2" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         expect(testBuffer.vimDeleteWordForward).toHaveBeenCalledWith(2);
       });
 
-      it('should record command for repeat with dot', () => {
-        const testBuffer = createMockBuffer('hello world test', [0, 0]);
+      it("should record command for repeat with dot", () => {
+        const testBuffer = createMockBuffer("hello world test", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         // Execute dw
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         vi.clearAllMocks();
 
         // Execute dot repeat
         act(() => {
-          result.current.handleInput(createKey({ sequence: '.' }));
+          result.current.handleInput(createKey({ sequence: "." }));
         });
 
         expect(testBuffer.vimDeleteWordForward).toHaveBeenCalledWith(1);
       });
     });
 
-    describe('de (delete word end)', () => {
-      it('should delete from cursor to end of current word', () => {
-        const testBuffer = createMockBuffer('hello world test', [0, 1]);
+    describe("de (delete word end)", () => {
+      it("should delete from cursor to end of current word", () => {
+        const testBuffer = createMockBuffer("hello world test", [0, 1]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'e' }));
+          result.current.handleInput(createKey({ sequence: "e" }));
         });
 
         expect(testBuffer.vimDeleteWordEnd).toHaveBeenCalledWith(1);
       });
 
-      it('should handle count with de', () => {
-        const testBuffer = createMockBuffer('one two three four', [0, 0]);
+      it("should handle count with de", () => {
+        const testBuffer = createMockBuffer("one two three four", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: '3' }));
+          result.current.handleInput(createKey({ sequence: "3" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'e' }));
+          result.current.handleInput(createKey({ sequence: "e" }));
         });
 
         expect(testBuffer.vimDeleteWordEnd).toHaveBeenCalledWith(3);
       });
     });
 
-    describe('cw (change word forward)', () => {
-      it('should change from cursor to start of next word and enter INSERT mode', () => {
-        const testBuffer = createMockBuffer('hello world test', [0, 0]);
+    describe("cw (change word forward)", () => {
+      it("should change from cursor to start of next word and enter INSERT mode", () => {
+        const testBuffer = createMockBuffer("hello world test", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         expect(testBuffer.vimChangeWordForward).toHaveBeenCalledWith(1);
-        expect(result.current.mode).toBe('INSERT');
-        expect(mockVimContext.setVimMode).toHaveBeenCalledWith('INSERT');
+        expect(result.current.mode).toBe("INSERT");
+        expect(mockVimContext.setVimMode).toHaveBeenCalledWith("INSERT");
       });
 
-      it('should handle count with cw', () => {
-        const testBuffer = createMockBuffer('one two three four', [0, 0]);
+      it("should handle count with cw", () => {
+        const testBuffer = createMockBuffer("one two three four", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: '2' }));
+          result.current.handleInput(createKey({ sequence: "2" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         expect(testBuffer.vimChangeWordForward).toHaveBeenCalledWith(2);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      it('should be repeatable with dot', () => {
-        const testBuffer = createMockBuffer('hello world test more', [0, 0]);
+      it("should be repeatable with dot", () => {
+        const testBuffer = createMockBuffer("hello world test more", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         // Execute cw
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         // Exit INSERT mode
@@ -1004,96 +990,93 @@ describe('useVim hook', () => {
 
         // Execute dot repeat
         act(() => {
-          result.current.handleInput(createKey({ sequence: '.' }));
+          result.current.handleInput(createKey({ sequence: "." }));
         });
 
         expect(testBuffer.vimChangeWordForward).toHaveBeenCalledWith(1);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
     });
 
-    describe('ce (change word end)', () => {
-      it('should change from cursor to end of word and enter INSERT mode', () => {
-        const testBuffer = createMockBuffer('hello world test', [0, 1]);
+    describe("ce (change word end)", () => {
+      it("should change from cursor to end of word and enter INSERT mode", () => {
+        const testBuffer = createMockBuffer("hello world test", [0, 1]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'e' }));
+          result.current.handleInput(createKey({ sequence: "e" }));
         });
 
         expect(testBuffer.vimChangeWordEnd).toHaveBeenCalledWith(1);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      it('should handle count with ce', () => {
-        const testBuffer = createMockBuffer('one two three four', [0, 0]);
+      it("should handle count with ce", () => {
+        const testBuffer = createMockBuffer("one two three four", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: '2' }));
+          result.current.handleInput(createKey({ sequence: "2" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'e' }));
+          result.current.handleInput(createKey({ sequence: "e" }));
         });
 
         expect(testBuffer.vimChangeWordEnd).toHaveBeenCalledWith(2);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
     });
 
-    describe('cc (change line)', () => {
-      it('should change entire line and enter INSERT mode', () => {
-        const testBuffer = createMockBuffer('hello world\nsecond line', [0, 5]);
+    describe("cc (change line)", () => {
+      it("should change entire line and enter INSERT mode", () => {
+        const testBuffer = createMockBuffer("hello world\nsecond line", [0, 5]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
 
         expect(testBuffer.vimChangeLine).toHaveBeenCalledWith(1);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      it('should change multiple lines with count', () => {
-        const testBuffer = createMockBuffer(
-          'line1\nline2\nline3\nline4',
-          [1, 0],
-        );
+      it("should change multiple lines with count", () => {
+        const testBuffer = createMockBuffer("line1\nline2\nline3\nline4", [1, 0]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: '3' }));
+          result.current.handleInput(createKey({ sequence: "3" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
 
         expect(testBuffer.vimChangeLine).toHaveBeenCalledWith(3);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      it('should be repeatable with dot', () => {
-        const testBuffer = createMockBuffer('line1\nline2\nline3', [0, 0]);
+      it("should be repeatable with dot", () => {
+        const testBuffer = createMockBuffer("line1\nline2\nline3", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         // Execute cc
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
 
         // Exit INSERT mode
@@ -1104,120 +1087,120 @@ describe('useVim hook', () => {
 
         // Execute dot repeat
         act(() => {
-          result.current.handleInput(createKey({ sequence: '.' }));
+          result.current.handleInput(createKey({ sequence: "." }));
         });
 
         expect(testBuffer.vimChangeLine).toHaveBeenCalledWith(1);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
     });
 
-    describe('db (delete word backward)', () => {
-      it('should delete from cursor to start of previous word', () => {
-        const testBuffer = createMockBuffer('hello world test', [0, 11]);
+    describe("db (delete word backward)", () => {
+      it("should delete from cursor to start of previous word", () => {
+        const testBuffer = createMockBuffer("hello world test", [0, 11]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'b' }));
+          result.current.handleInput(createKey({ sequence: "b" }));
         });
 
         expect(testBuffer.vimDeleteWordBackward).toHaveBeenCalledWith(1);
       });
 
-      it('should handle count with db', () => {
-        const testBuffer = createMockBuffer('one two three four', [0, 18]);
+      it("should handle count with db", () => {
+        const testBuffer = createMockBuffer("one two three four", [0, 18]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: '2' }));
+          result.current.handleInput(createKey({ sequence: "2" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'b' }));
+          result.current.handleInput(createKey({ sequence: "b" }));
         });
 
         expect(testBuffer.vimDeleteWordBackward).toHaveBeenCalledWith(2);
       });
     });
 
-    describe('cb (change word backward)', () => {
-      it('should change from cursor to start of previous word and enter INSERT mode', () => {
-        const testBuffer = createMockBuffer('hello world test', [0, 11]);
+    describe("cb (change word backward)", () => {
+      it("should change from cursor to start of previous word and enter INSERT mode", () => {
+        const testBuffer = createMockBuffer("hello world test", [0, 11]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'b' }));
+          result.current.handleInput(createKey({ sequence: "b" }));
         });
 
         expect(testBuffer.vimChangeWordBackward).toHaveBeenCalledWith(1);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      it('should handle count with cb', () => {
-        const testBuffer = createMockBuffer('one two three four', [0, 18]);
+      it("should handle count with cb", () => {
+        const testBuffer = createMockBuffer("one two three four", [0, 18]);
         const { result } = renderVimHook(testBuffer);
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: '3' }));
+          result.current.handleInput(createKey({ sequence: "3" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'b' }));
+          result.current.handleInput(createKey({ sequence: "b" }));
         });
 
         expect(testBuffer.vimChangeWordBackward).toHaveBeenCalledWith(3);
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
     });
 
-    describe('Pending state handling', () => {
-      it('should clear pending delete state after dw', () => {
-        const testBuffer = createMockBuffer('hello world', [0, 0]);
+    describe("Pending state handling", () => {
+      it("should clear pending delete state after dw", () => {
+        const testBuffer = createMockBuffer("hello world", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         // Press 'd' to enter pending delete state
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
 
         // Complete with 'w'
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         // Next 'd' should start a new pending state, not continue the previous one
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
 
         // This should trigger dd (delete line), not an error
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
 
         expect(testBuffer.vimDeleteLine).toHaveBeenCalledWith(1);
       });
 
-      it('should clear pending change state after cw', () => {
-        const testBuffer = createMockBuffer('hello world', [0, 0]);
+      it("should clear pending change state after cw", () => {
+        const testBuffer = createMockBuffer("hello world", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         // Execute cw
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         // Exit INSERT mode
@@ -1225,32 +1208,32 @@ describe('useVim hook', () => {
 
         // Next 'c' should start a new pending state
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'c' }));
+          result.current.handleInput(createKey({ sequence: "c" }));
         });
 
         expect(testBuffer.vimChangeLine).toHaveBeenCalledWith(1);
       });
 
-      it('should clear pending state with escape', () => {
-        const testBuffer = createMockBuffer('hello world', [0, 0]);
+      it("should clear pending state with escape", () => {
+        const testBuffer = createMockBuffer("hello world", [0, 0]);
         const { result } = renderVimHook(testBuffer);
 
         // Enter pending delete state
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
 
         // Press escape to clear pending state
         act(() => {
-          result.current.handleInput(createKey({ name: 'escape' }));
+          result.current.handleInput(createKey({ name: "escape" }));
         });
 
         // Now 'w' should just move cursor, not delete
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'w' }));
+          result.current.handleInput(createKey({ sequence: "w" }));
         });
 
         expect(testBuffer.vimDeleteWordForward).not.toHaveBeenCalled();
@@ -1259,29 +1242,27 @@ describe('useVim hook', () => {
       });
     });
 
-    describe('NORMAL mode escape behavior', () => {
-      it('should pass escape through when no pending operator is active', () => {
-        mockVimContext.vimMode = 'NORMAL';
+    describe("NORMAL mode escape behavior", () => {
+      it("should pass escape through when no pending operator is active", () => {
+        mockVimContext.vimMode = "NORMAL";
         const { result } = renderVimHook();
 
-        const handled = result.current.handleInput(
-          createKey({ name: 'escape' }),
-        );
+        const handled = result.current.handleInput(createKey({ name: "escape" }));
 
         expect(handled).toBe(false);
       });
 
-      it('should handle escape and clear pending operator', () => {
-        mockVimContext.vimMode = 'NORMAL';
+      it("should handle escape and clear pending operator", () => {
+        mockVimContext.vimMode = "NORMAL";
         const { result } = renderVimHook();
 
         act(() => {
-          result.current.handleInput(createKey({ sequence: 'd' }));
+          result.current.handleInput(createKey({ sequence: "d" }));
         });
 
         let handled: boolean | undefined;
         act(() => {
-          handled = result.current.handleInput(createKey({ name: 'escape' }));
+          handled = result.current.handleInput(createKey({ name: "escape" }));
         });
 
         expect(handled).toBe(true);
@@ -1289,70 +1270,66 @@ describe('useVim hook', () => {
     });
   });
 
-  describe('Shell command pass-through', () => {
-    it('should pass through ctrl+r in INSERT mode', async () => {
-      mockVimContext.vimMode = 'INSERT';
+  describe("Shell command pass-through", () => {
+    it("should pass through ctrl+r in INSERT mode", async () => {
+      mockVimContext.vimMode = "INSERT";
       const { result } = renderVimHook();
 
       await waitFor(() => {
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      const handled = result.current.handleInput(
-        createKey({ name: 'r', ctrl: true }),
-      );
+      const handled = result.current.handleInput(createKey({ name: "r", ctrl: true }));
 
       expect(handled).toBe(false);
     });
 
-    it('should pass through ! in INSERT mode when buffer is empty', async () => {
-      mockVimContext.vimMode = 'INSERT';
-      const emptyBuffer = createMockBuffer('');
+    it("should pass through ! in INSERT mode when buffer is empty", async () => {
+      mockVimContext.vimMode = "INSERT";
+      const emptyBuffer = createMockBuffer("");
       const { result } = renderVimHook(emptyBuffer);
 
       await waitFor(() => {
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      const handled = result.current.handleInput(createKey({ sequence: '!' }));
+      const handled = result.current.handleInput(createKey({ sequence: "!" }));
 
       expect(handled).toBe(false);
     });
 
-    it('should handle ! as input in INSERT mode when buffer is not empty', async () => {
-      mockVimContext.vimMode = 'INSERT';
-      const nonEmptyBuffer = createMockBuffer('not empty');
+    it("should handle ! as input in INSERT mode when buffer is not empty", async () => {
+      mockVimContext.vimMode = "INSERT";
+      const nonEmptyBuffer = createMockBuffer("not empty");
       const { result } = renderVimHook(nonEmptyBuffer);
 
       await waitFor(() => {
-        expect(result.current.mode).toBe('INSERT');
+        expect(result.current.mode).toBe("INSERT");
       });
 
-      const key = createKey({ sequence: '!', name: '!' });
+      const key = createKey({ sequence: "!", name: "!" });
 
       act(() => {
         result.current.handleInput(key);
       });
 
-      expect(nonEmptyBuffer.handleInput).toHaveBeenCalledWith(
-        expect.objectContaining(key),
-      );
+      expect(nonEmptyBuffer.handleInput).toHaveBeenCalledWith(expect.objectContaining(key));
     });
   });
 
   // Line operations (dd, cc) are tested in text-buffer.test.ts
 
-  describe('Reducer-based integration tests', () => {
+  describe("Reducer-based integration tests", () => {
     type VimActionType =
-      | 'vim_delete_word_end'
-      | 'vim_delete_word_backward'
-      | 'vim_change_word_forward'
-      | 'vim_change_word_end'
-      | 'vim_change_word_backward'
-      | 'vim_change_line'
-      | 'vim_delete_line'
-      | 'vim_delete_to_end_of_line'
-      | 'vim_change_to_end_of_line';
+      | "vim_delete_word_end"
+      | "vim_delete_word_backward"
+      | "vim_change_word_forward"
+      | "vim_change_word_end"
+      | "vim_change_word_backward"
+      | "vim_change_line"
+      | "vim_delete_line"
+      | "vim_delete_to_end_of_line"
+      | "vim_change_to_end_of_line";
 
     type VimReducerTestCase = {
       command: string;
@@ -1369,242 +1346,237 @@ describe('useVim hook', () => {
 
     const testCases: VimReducerTestCase[] = [
       {
-        command: 'de',
-        desc: 'delete from cursor to end of current word',
-        lines: ['hello world test'],
+        command: "de",
+        desc: "delete from cursor to end of current word",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 1,
-        actionType: 'vim_delete_word_end' as const,
+        actionType: "vim_delete_word_end" as const,
         count: 1,
-        expectedLines: ['h world test'],
+        expectedLines: ["h world test"],
         expectedCursorRow: 0,
         expectedCursorCol: 1,
       },
       {
-        command: 'de',
-        desc: 'delete multiple word ends with count',
-        lines: ['hello world test more'],
+        command: "de",
+        desc: "delete multiple word ends with count",
+        lines: ["hello world test more"],
         cursorRow: 0,
         cursorCol: 1,
-        actionType: 'vim_delete_word_end' as const,
+        actionType: "vim_delete_word_end" as const,
         count: 2,
-        expectedLines: ['h test more'],
+        expectedLines: ["h test more"],
         expectedCursorRow: 0,
         expectedCursorCol: 1,
       },
       {
-        command: 'db',
-        desc: 'delete from cursor to start of previous word',
-        lines: ['hello world test'],
+        command: "db",
+        desc: "delete from cursor to start of previous word",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 11,
-        actionType: 'vim_delete_word_backward' as const,
+        actionType: "vim_delete_word_backward" as const,
         count: 1,
-        expectedLines: ['hello  test'],
+        expectedLines: ["hello  test"],
         expectedCursorRow: 0,
         expectedCursorCol: 6,
       },
       {
-        command: 'db',
-        desc: 'delete multiple words backward with count',
-        lines: ['hello world test more'],
+        command: "db",
+        desc: "delete multiple words backward with count",
+        lines: ["hello world test more"],
         cursorRow: 0,
         cursorCol: 17,
-        actionType: 'vim_delete_word_backward' as const,
+        actionType: "vim_delete_word_backward" as const,
         count: 2,
-        expectedLines: ['hello more'],
+        expectedLines: ["hello more"],
         expectedCursorRow: 0,
         expectedCursorCol: 6,
       },
       {
-        command: 'cw',
-        desc: 'delete from cursor to start of next word',
-        lines: ['hello world test'],
+        command: "cw",
+        desc: "delete from cursor to start of next word",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 0,
-        actionType: 'vim_change_word_forward' as const,
+        actionType: "vim_change_word_forward" as const,
         count: 1,
-        expectedLines: ['world test'],
+        expectedLines: ["world test"],
         expectedCursorRow: 0,
         expectedCursorCol: 0,
       },
       {
-        command: 'cw',
-        desc: 'change multiple words with count',
-        lines: ['hello world test more'],
+        command: "cw",
+        desc: "change multiple words with count",
+        lines: ["hello world test more"],
         cursorRow: 0,
         cursorCol: 0,
-        actionType: 'vim_change_word_forward' as const,
+        actionType: "vim_change_word_forward" as const,
         count: 2,
-        expectedLines: ['test more'],
+        expectedLines: ["test more"],
         expectedCursorRow: 0,
         expectedCursorCol: 0,
       },
       {
-        command: 'ce',
-        desc: 'change from cursor to end of current word',
-        lines: ['hello world test'],
+        command: "ce",
+        desc: "change from cursor to end of current word",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 1,
-        actionType: 'vim_change_word_end' as const,
+        actionType: "vim_change_word_end" as const,
         count: 1,
-        expectedLines: ['h world test'],
+        expectedLines: ["h world test"],
         expectedCursorRow: 0,
         expectedCursorCol: 1,
       },
       {
-        command: 'ce',
-        desc: 'change multiple word ends with count',
-        lines: ['hello world test'],
+        command: "ce",
+        desc: "change multiple word ends with count",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 1,
-        actionType: 'vim_change_word_end' as const,
+        actionType: "vim_change_word_end" as const,
         count: 2,
-        expectedLines: ['h test'],
+        expectedLines: ["h test"],
         expectedCursorRow: 0,
         expectedCursorCol: 1,
       },
       {
-        command: 'cb',
-        desc: 'change from cursor to start of previous word',
-        lines: ['hello world test'],
+        command: "cb",
+        desc: "change from cursor to start of previous word",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 11,
-        actionType: 'vim_change_word_backward' as const,
+        actionType: "vim_change_word_backward" as const,
         count: 1,
-        expectedLines: ['hello  test'],
+        expectedLines: ["hello  test"],
         expectedCursorRow: 0,
         expectedCursorCol: 6,
       },
       {
-        command: 'cc',
-        desc: 'clear the line and place cursor at the start',
-        lines: ['  hello world'],
+        command: "cc",
+        desc: "clear the line and place cursor at the start",
+        lines: ["  hello world"],
         cursorRow: 0,
         cursorCol: 5,
-        actionType: 'vim_change_line' as const,
+        actionType: "vim_change_line" as const,
         count: 1,
-        expectedLines: [''],
+        expectedLines: [""],
         expectedCursorRow: 0,
         expectedCursorCol: 0,
       },
       {
-        command: 'dd',
-        desc: 'delete the current line',
-        lines: ['line1', 'line2', 'line3'],
+        command: "dd",
+        desc: "delete the current line",
+        lines: ["line1", "line2", "line3"],
         cursorRow: 1,
         cursorCol: 2,
-        actionType: 'vim_delete_line' as const,
+        actionType: "vim_delete_line" as const,
         count: 1,
-        expectedLines: ['line1', 'line3'],
+        expectedLines: ["line1", "line3"],
         expectedCursorRow: 1,
         expectedCursorCol: 0,
       },
       {
-        command: 'dd',
-        desc: 'delete multiple lines with count',
-        lines: ['line1', 'line2', 'line3', 'line4'],
+        command: "dd",
+        desc: "delete multiple lines with count",
+        lines: ["line1", "line2", "line3", "line4"],
         cursorRow: 1,
         cursorCol: 2,
-        actionType: 'vim_delete_line' as const,
+        actionType: "vim_delete_line" as const,
         count: 2,
-        expectedLines: ['line1', 'line4'],
+        expectedLines: ["line1", "line4"],
         expectedCursorRow: 1,
         expectedCursorCol: 0,
       },
       {
-        command: 'dd',
-        desc: 'handle deleting last line',
-        lines: ['only line'],
+        command: "dd",
+        desc: "handle deleting last line",
+        lines: ["only line"],
         cursorRow: 0,
         cursorCol: 3,
-        actionType: 'vim_delete_line' as const,
+        actionType: "vim_delete_line" as const,
         count: 1,
-        expectedLines: [''],
+        expectedLines: [""],
         expectedCursorRow: 0,
         expectedCursorCol: 0,
       },
       {
-        command: 'D',
-        desc: 'delete from cursor to end of line',
-        lines: ['hello world test'],
+        command: "D",
+        desc: "delete from cursor to end of line",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 6,
-        actionType: 'vim_delete_to_end_of_line' as const,
-        expectedLines: ['hello '],
+        actionType: "vim_delete_to_end_of_line" as const,
+        expectedLines: ["hello "],
         expectedCursorRow: 0,
         expectedCursorCol: 6,
       },
       {
-        command: 'D',
-        desc: 'handle D at end of line',
-        lines: ['hello world'],
+        command: "D",
+        desc: "handle D at end of line",
+        lines: ["hello world"],
         cursorRow: 0,
         cursorCol: 11,
-        actionType: 'vim_delete_to_end_of_line' as const,
-        expectedLines: ['hello world'],
+        actionType: "vim_delete_to_end_of_line" as const,
+        expectedLines: ["hello world"],
         expectedCursorRow: 0,
         expectedCursorCol: 11,
       },
       {
-        command: 'C',
-        desc: 'change from cursor to end of line',
-        lines: ['hello world test'],
+        command: "C",
+        desc: "change from cursor to end of line",
+        lines: ["hello world test"],
         cursorRow: 0,
         cursorCol: 6,
-        actionType: 'vim_change_to_end_of_line' as const,
-        expectedLines: ['hello '],
+        actionType: "vim_change_to_end_of_line" as const,
+        expectedLines: ["hello "],
         expectedCursorRow: 0,
         expectedCursorCol: 6,
       },
       {
-        command: 'C',
-        desc: 'handle C at beginning of line',
-        lines: ['hello world'],
+        command: "C",
+        desc: "handle C at beginning of line",
+        lines: ["hello world"],
         cursorRow: 0,
         cursorCol: 0,
-        actionType: 'vim_change_to_end_of_line' as const,
-        expectedLines: [''],
+        actionType: "vim_change_to_end_of_line" as const,
+        expectedLines: [""],
         expectedCursorRow: 0,
         expectedCursorCol: 0,
       },
     ];
 
-    it.each(testCases)(
-      '$command: should $desc',
-      ({
+    it.each(testCases)("$command: should $desc", ({
+      lines,
+      cursorRow,
+      cursorCol,
+      actionType,
+      count,
+      expectedLines,
+      expectedCursorRow,
+      expectedCursorCol,
+    }: VimReducerTestCase) => {
+      const initialState = createMockTextBufferState({
         lines,
         cursorRow,
         cursorCol,
-        actionType,
-        count,
-        expectedLines,
-        expectedCursorRow,
-        expectedCursorCol,
-      }: VimReducerTestCase) => {
-        const initialState = createMockTextBufferState({
-          lines,
-          cursorRow,
-          cursorCol,
-          preferredCol: null,
-          undoStack: [],
-          redoStack: [],
-          clipboard: null,
-          selectionAnchor: null,
-        });
+        preferredCol: null,
+        undoStack: [],
+        redoStack: [],
+        clipboard: null,
+        selectionAnchor: null,
+      });
 
-        const action = (
-          count
-            ? { type: actionType, payload: { count } }
-            : { type: actionType }
-        ) as TextBufferAction;
+      const action = (
+        count ? { type: actionType, payload: { count } } : { type: actionType }
+      ) as TextBufferAction;
 
-        const result = textBufferReducer(initialState, action);
+      const result = textBufferReducer(initialState, action);
 
-        expect(result.lines).toEqual(expectedLines);
-        expect(result.cursorRow).toBe(expectedCursorRow);
-        expect(result.cursorCol).toBe(expectedCursorCol);
-      },
-    );
+      expect(result.lines).toEqual(expectedLines);
+      expect(result.cursorRow).toBe(expectedCursorRow);
+      expect(result.cursorCol).toBe(expectedCursorCol);
+    });
   });
 });
diff --git a/packages/ui-gemini/src/ui/hooks/vim.ts b/packages/ui-gemini/src/ui/hooks/vim.ts
index e5d5c362e..e54e6f256 100644
--- a/packages/ui-gemini/src/ui/hooks/vim.ts
+++ b/packages/ui-gemini/src/ui/hooks/vim.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useCallback, useReducer, useEffect } from 'react';
-import type { Key } from './useKeypress.js';
-import type { TextBuffer } from '../components/shared/text-buffer.js';
-import { useVimMode } from '../contexts/VimModeContext.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { useCallback, useEffect, useReducer } from "react";
+import type { TextBuffer } from "../components/shared/text-buffer.js";
+import { useVimMode } from "../contexts/VimModeContext.js";
+import type { Key } from "./useKeypress.js";
 
-export type VimMode = 'NORMAL' | 'INSERT';
+export type VimMode = "NORMAL" | "INSERT";
 
 // Constants
 const DIGIT_MULTIPLIER = 10;
@@ -19,54 +19,54 @@ const DIGIT_1_TO_9 = /^[1-9]$/;
 
 // Command types
 const CMD_TYPES = {
-  DELETE_WORD_FORWARD: 'dw',
-  DELETE_WORD_BACKWARD: 'db',
-  DELETE_WORD_END: 'de',
-  CHANGE_WORD_FORWARD: 'cw',
-  CHANGE_WORD_BACKWARD: 'cb',
-  CHANGE_WORD_END: 'ce',
-  DELETE_CHAR: 'x',
-  DELETE_LINE: 'dd',
-  CHANGE_LINE: 'cc',
-  DELETE_TO_EOL: 'D',
-  CHANGE_TO_EOL: 'C',
+  DELETE_WORD_FORWARD: "dw",
+  DELETE_WORD_BACKWARD: "db",
+  DELETE_WORD_END: "de",
+  CHANGE_WORD_FORWARD: "cw",
+  CHANGE_WORD_BACKWARD: "cb",
+  CHANGE_WORD_END: "ce",
+  DELETE_CHAR: "x",
+  DELETE_LINE: "dd",
+  CHANGE_LINE: "cc",
+  DELETE_TO_EOL: "D",
+  CHANGE_TO_EOL: "C",
   CHANGE_MOVEMENT: {
-    LEFT: 'ch',
-    DOWN: 'cj',
-    UP: 'ck',
-    RIGHT: 'cl',
+    LEFT: "ch",
+    DOWN: "cj",
+    UP: "ck",
+    RIGHT: "cl",
   },
 } as const;
 
 // Helper function to clear pending state
 const createClearPendingState = () => ({
   count: 0,
-  pendingOperator: null as 'g' | 'd' | 'c' | null,
+  pendingOperator: null as "g" | "d" | "c" | null,
 });
 
 // State and action types for useReducer
 type VimState = {
   mode: VimMode;
   count: number;
-  pendingOperator: 'g' | 'd' | 'c' | null;
+  pendingOperator: "g" | "d" | "c" | null;
   lastCommand: { type: string; count: number } | null;
 };
 
 type VimAction =
-  | { type: 'SET_MODE'; mode: VimMode }
-  | { type: 'SET_COUNT'; count: number }
-  | { type: 'INCREMENT_COUNT'; digit: number }
-  | { type: 'CLEAR_COUNT' }
-  | { type: 'SET_PENDING_OPERATOR'; operator: 'g' | 'd' | 'c' | null }
+  | { type: "SET_MODE"; mode: VimMode }
+  | { type: "SET_COUNT"; count: number }
+  | { type: "INCREMENT_COUNT"; digit: number }
+  | { type: "CLEAR_COUNT" }
+  | { type: "SET_PENDING_OPERATOR"; operator: "g" | "d" | "c" | null }
   | {
-      type: 'SET_LAST_COMMAND';
+      type: "SET_LAST_COMMAND";
       command: { type: string; count: number } | null;
     }
-  | { type: 'CLEAR_PENDING_STATES' }
-  | { type: 'ESCAPE_TO_NORMAL' };
+  | { type: "CLEAR_PENDING_STATES" }
+  | { type: "ESCAPE_TO_NORMAL" };
 
 const initialVimState: VimState = {
-  mode: 'NORMAL',
+  mode: "NORMAL",
   count: 0,
   pendingOperator: null,
   lastCommand: null,
@@ -75,31 +75,31 @@ const initialVimState: VimState = {
 // Reducer function
 const vimReducer = (state: VimState, action: VimAction): VimState => {
   switch (action.type) {
-    case 'SET_MODE':
+    case "SET_MODE":
       return { ...state, mode: action.mode };
 
-    case 'SET_COUNT':
+    case "SET_COUNT":
       return { ...state, count: action.count };
 
-    case 'INCREMENT_COUNT':
+    case "INCREMENT_COUNT":
       return { ...state, count: state.count * DIGIT_MULTIPLIER + action.digit };
 
-    case 'CLEAR_COUNT':
+    case "CLEAR_COUNT":
       return { ...state, count: 0 };
 
-    case 'SET_PENDING_OPERATOR':
+    case "SET_PENDING_OPERATOR":
       return { ...state, pendingOperator: action.operator };
 
-    case 'SET_LAST_COMMAND':
+    case "SET_LAST_COMMAND":
       return { ...state, lastCommand: action.command };
 
-    case 'CLEAR_PENDING_STATES':
+    case "CLEAR_PENDING_STATES":
       return {
         ...state,
         ...createClearPendingState(),
       };
 
-    case 'ESCAPE_TO_NORMAL':
+    case "ESCAPE_TO_NORMAL":
       // Handle escape - clear all pending states (mode is updated via context)
       return {
         ...state,
@@ -132,23 +132,20 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
   // Sync vim mode from context to local state
   useEffect(() => {
-    dispatch({ type: 'SET_MODE', mode: vimMode });
+    dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
 
   // Helper to update mode in both reducer and context
   const updateMode = useCallback(
     (mode: VimMode) => {
       setVimMode(mode);
-      dispatch({ type: 'SET_MODE', mode });
+      dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode],
   );
 
   // Helper functions using the reducer state
-  const getCurrentCount = useCallback(
-    () => state.count || DEFAULT_COUNT,
-    [state.count],
-  );
+  const getCurrentCount = useCallback(() => state.count || DEFAULT_COUNT, [state.count]);
 
   /** Executes common commands to eliminate duplication in dot (.) repeat command */
   const executeCommand = useCallback(
@@ -171,19 +168,19 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
         case CMD_TYPES.CHANGE_WORD_FORWARD: {
           buffer.vimChangeWordForward(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
         case CMD_TYPES.CHANGE_WORD_BACKWARD: {
           buffer.vimChangeWordBackward(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
         case CMD_TYPES.CHANGE_WORD_END: {
           buffer.vimChangeWordEnd(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
@@ -199,7 +196,7 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
         case CMD_TYPES.CHANGE_LINE: {
           buffer.vimChangeLine(count);
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
@@ -207,16 +204,16 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         case CMD_TYPES.CHANGE_MOVEMENT.DOWN:
         case CMD_TYPES.CHANGE_MOVEMENT.UP:
         case CMD_TYPES.CHANGE_MOVEMENT.RIGHT: {
-          const movementMap: Record<string, 'h' | 'j' | 'k' | 'l'> = {
-            [CMD_TYPES.CHANGE_MOVEMENT.LEFT]: 'h',
-            [CMD_TYPES.CHANGE_MOVEMENT.DOWN]: 'j',
-            [CMD_TYPES.CHANGE_MOVEMENT.UP]: 'k',
-            [CMD_TYPES.CHANGE_MOVEMENT.RIGHT]: 'l',
+          const movementMap: Record<string, "h" | "j" | "k" | "l"> = {
+            [CMD_TYPES.CHANGE_MOVEMENT.LEFT]: "h",
+            [CMD_TYPES.CHANGE_MOVEMENT.DOWN]: "j",
+            [CMD_TYPES.CHANGE_MOVEMENT.UP]: "k",
+            [CMD_TYPES.CHANGE_MOVEMENT.RIGHT]: "l",
           };
           const movementType = movementMap[cmdType];
           if (movementType) {
             buffer.vimChangeMovement(movementType, count);
-            updateMode('INSERT');
+            updateMode("INSERT");
           }
           break;
         }
@@ -228,7 +225,7 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
 
         case CMD_TYPES.CHANGE_TO_EOL: {
           buffer.vimChangeToEndOfLine();
-          updateMode('INSERT');
+          updateMode("INSERT");
           break;
         }
 
@@ -248,45 +245,41 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
   const handleInsertModeInput = useCallback(
     (normalizedKey: Key): boolean => {
       // Handle escape key immediately - switch to NORMAL mode on any escape
-      if (normalizedKey.name === 'escape') {
+      if (normalizedKey.name === "escape") {
         // Vim behavior: move cursor left when exiting insert mode (unless at beginning of line)
         buffer.vimEscapeInsertMode();
-        dispatch({ type: 'ESCAPE_TO_NORMAL' });
-        updateMode('NORMAL');
+        dispatch({ type: "ESCAPE_TO_NORMAL" });
+        updateMode("NORMAL");
         return true;
       }
 
       // In INSERT mode, let InputPrompt handle completion keys and special commands
       if (
-        normalizedKey.name === 'tab' ||
-        (normalizedKey.name === 'return' && !normalizedKey.ctrl) ||
-        normalizedKey.name === 'up' ||
-        normalizedKey.name === 'down' ||
-        (normalizedKey.ctrl && normalizedKey.name === 'r')
+        normalizedKey.name === "tab" ||
+        (normalizedKey.name === "return" && !normalizedKey.ctrl) ||
+        normalizedKey.name === "up" ||
+        normalizedKey.name === "down" ||
+        (normalizedKey.ctrl && normalizedKey.name === "r")
       ) {
         return false; // Let InputPrompt handle completion
       }
 
       // Let InputPrompt handle Ctrl+V for clipboard image pasting
-      if (normalizedKey.ctrl && normalizedKey.name === 'v') {
+      if (normalizedKey.ctrl && normalizedKey.name === "v") {
         return false; // Let InputPrompt handle clipboard functionality
       }
 
       // Let InputPrompt handle shell commands
-      if (normalizedKey.sequence === '!' && buffer.text.length === 0) {
+      if (normalizedKey.sequence === "!" && buffer.text.length === 0) {
         return false;
       }
 
       // Special handling for Enter key to allow command submission (lower priority than completion)
-      if (
-        normalizedKey.name === 'return' &&
-        !normalizedKey.ctrl &&
-        !normalizedKey.meta
-      ) {
+      if (normalizedKey.name === "return" && !normalizedKey.ctrl && !normalizedKey.meta) {
         if (buffer.text.trim() && onSubmit) {
           // Handle command submission directly
           const submittedValue = buffer.text;
-          buffer.setText('');
+          buffer.setText("");
           onSubmit(submittedValue);
           return true;
         }
@@ -307,8 +300,8 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
    */
   const normalizeKey = useCallback(
     (key: Key): Key => ({
-      name: key.name || '',
-      sequence: key.sequence || '',
+      name: key.name || "",
+      sequence: key.sequence || "",
       ctrl: key.ctrl || false,
       meta: key.meta || false,
       shift: key.shift || false,
@@ -324,11 +317,11 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
    * @returns boolean indicating if command was handled
    */
   const handleChangeMovement = useCallback(
-    (movement: 'h' | 'j' | 'k' | 'l'): boolean => {
+    (movement: "h" | "j" | "k" | "l"): boolean => {
       const count = getCurrentCount();
-      dispatch({ type: 'CLEAR_COUNT' });
+      dispatch({ type: "CLEAR_COUNT" });
       buffer.vimChangeMovement(movement, count);
-      updateMode('INSERT');
+      updateMode("INSERT");
 
       const cmdTypeMap = {
         h: CMD_TYPES.CHANGE_MOVEMENT.LEFT,
@@ -338,10 +331,10 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
       };
 
       dispatch({
-        type: 'SET_LAST_COMMAND',
+        type: "SET_LAST_COMMAND",
         command: { type: cmdTypeMap[movement], count },
       });
-      dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+      dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
       return true;
     },
     [getCurrentCount, dispatch, buffer, updateMode],
@@ -354,7 +347,7 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
    * @returns boolean indicating if command was handled
    */
   const handleOperatorMotion = useCallback(
-    (operator: 'd' | 'c', motion: 'w' | 'b' | 'e'): boolean => {
+    (operator: "d" | "c", motion: "w" | "b" | "e"): boolean => {
       const count = getCurrentCount();
 
       const commandMap = {
@@ -374,11 +367,11 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
       executeCommand(cmdType, count);
 
       dispatch({
-        type: 'SET_LAST_COMMAND',
+        type: "SET_LAST_COMMAND",
         command: { type: cmdType, count },
       });
-      dispatch({ type: 'CLEAR_COUNT' });
-      dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+      dispatch({ type: "CLEAR_COUNT" });
+      dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
 
       return true;
     },
@@ -396,22 +389,22 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         normalizedKey = normalizeKey(key);
       } catch (error) {
         // Handle malformed key inputs gracefully
-        debugLogger.warn('Malformed key input in vim mode:', key, error);
+        debugLogger.warn("Malformed key input in vim mode:", key, error);
         return false;
       }
 
       // Handle INSERT mode
-      if (state.mode === 'INSERT') {
+      if (state.mode === "INSERT") {
         return handleInsertModeInput(normalizedKey);
       }
 
       // Handle NORMAL mode
-      if (state.mode === 'NORMAL') {
+      if (state.mode === "NORMAL") {
         // If in NORMAL mode, allow escape to pass through to other handlers
         // if there's no pending operation.
-        if (normalizedKey.name === 'escape') {
+        if (normalizedKey.name === "escape") {
           if (state.pendingOperator) {
-            dispatch({ type: 'CLEAR_PENDING_STATES' });
+            dispatch({ type: "CLEAR_PENDING_STATES" });
             return true; // Handled by vim
           }
           return false; // Pass through to other handlers
@@ -420,10 +413,10 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         // Handle count input (numbers 1-9, and 0 if count > 0)
         if (
           DIGIT_1_TO_9.test(normalizedKey.sequence) ||
-          (normalizedKey.sequence === '0' && state.count > 0)
+          (normalizedKey.sequence === "0" && state.count > 0)
         ) {
           dispatch({
-            type: 'INCREMENT_COUNT',
+            type: "INCREMENT_COUNT",
             digit: parseInt(normalizedKey.sequence, 10),
           });
           return true; // Handled by vim
@@ -432,177 +425,177 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
         const repeatCount = getCurrentCount();
 
         switch (normalizedKey.sequence) {
-          case 'h': {
+          case "h": {
             // Check if this is part of a change command (ch)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('h');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("h");
             }
 
             // Normal left movement
             buffer.vimMoveLeft(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'j': {
+          case "j": {
             // Check if this is part of a change command (cj)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('j');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("j");
             }
 
             // Normal down movement
             buffer.vimMoveDown(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'k': {
+          case "k": {
             // Check if this is part of a change command (ck)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('k');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("k");
             }
 
             // Normal up movement
             buffer.vimMoveUp(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'l': {
+          case "l": {
             // Check if this is part of a change command (cl)
-            if (state.pendingOperator === 'c') {
-              return handleChangeMovement('l');
+            if (state.pendingOperator === "c") {
+              return handleChangeMovement("l");
             }
 
             // Normal right movement
             buffer.vimMoveRight(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'w': {
+          case "w": {
             // Check if this is part of a delete or change command (dw/cw)
-            if (state.pendingOperator === 'd') {
-              return handleOperatorMotion('d', 'w');
+            if (state.pendingOperator === "d") {
+              return handleOperatorMotion("d", "w");
             }
-            if (state.pendingOperator === 'c') {
-              return handleOperatorMotion('c', 'w');
+            if (state.pendingOperator === "c") {
+              return handleOperatorMotion("c", "w");
             }
 
             // Normal word movement
             buffer.vimMoveWordForward(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'b': {
+          case "b": {
             // Check if this is part of a delete or change command (db/cb)
-            if (state.pendingOperator === 'd') {
-              return handleOperatorMotion('d', 'b');
+            if (state.pendingOperator === "d") {
+              return handleOperatorMotion("d", "b");
             }
-            if (state.pendingOperator === 'c') {
-              return handleOperatorMotion('c', 'b');
+            if (state.pendingOperator === "c") {
+              return handleOperatorMotion("c", "b");
             }
 
             // Normal backward word movement
             buffer.vimMoveWordBackward(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'e': {
+          case "e": {
             // Check if this is part of a delete or change command (de/ce)
-            if (state.pendingOperator === 'd') {
-              return handleOperatorMotion('d', 'e');
+            if (state.pendingOperator === "d") {
+              return handleOperatorMotion("d", "e");
             }
-            if (state.pendingOperator === 'c') {
-              return handleOperatorMotion('c', 'e');
+            if (state.pendingOperator === "c") {
+              return handleOperatorMotion("c", "e");
             }
 
             // Normal word end movement
             buffer.vimMoveWordEnd(repeatCount);
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'x': {
+          case "x": {
             // Delete character under cursor
             buffer.vimDeleteChar(repeatCount);
             dispatch({
-              type: 'SET_LAST_COMMAND',
+              type: "SET_LAST_COMMAND",
               command: { type: CMD_TYPES.DELETE_CHAR, count: repeatCount },
             });
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'i': {
+          case "i": {
             // Enter INSERT mode at current position
             buffer.vimInsertAtCursor();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'a': {
+          case "a": {
             // Enter INSERT mode after current position
             buffer.vimAppendAtCursor();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'o': {
+          case "o": {
             // Insert new line after current line and enter INSERT mode
             buffer.vimOpenLineBelow();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'O': {
+          case "O": {
             // Insert new line before current line and enter INSERT mode
             buffer.vimOpenLineAbove();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '0': {
+          case "0": {
             // Move to start of line
             buffer.vimMoveToLineStart();
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '$': {
+          case "$": {
             // Move to end of line
             buffer.vimMoveToLineEnd();
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '^': {
+          case "^": {
             // Move to first non-whitespace character
             buffer.vimMoveToFirstNonWhitespace();
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'g': {
-            if (state.pendingOperator === 'g') {
+          case "g": {
+            if (state.pendingOperator === "g") {
               // Second 'g' - go to first line (gg command)
               buffer.vimMoveToFirstLine();
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
             } else {
               // First 'g' - wait for second g
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'g' });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: "g" });
             }
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'G': {
+          case "G": {
             if (state.count > 0) {
               // Go to specific line number (1-based) when a count was provided
               buffer.vimMoveToLine(state.count);
@@ -610,85 +603,85 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
               // Go to last line when no count was provided
               buffer.vimMoveToLastLine();
             }
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'I': {
+          case "I": {
             // Enter INSERT mode at start of line (first non-whitespace)
             buffer.vimInsertAtLineStart();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'A': {
+          case "A": {
             // Enter INSERT mode at end of line
             buffer.vimAppendAtLineEnd();
-            updateMode('INSERT');
-            dispatch({ type: 'CLEAR_COUNT' });
+            updateMode("INSERT");
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'd': {
-            if (state.pendingOperator === 'd') {
+          case "d": {
+            if (state.pendingOperator === "d") {
               // Second 'd' - delete N lines (dd command)
               const repeatCount = getCurrentCount();
               executeCommand(CMD_TYPES.DELETE_LINE, repeatCount);
               dispatch({
-                type: 'SET_LAST_COMMAND',
+                type: "SET_LAST_COMMAND",
                 command: { type: CMD_TYPES.DELETE_LINE, count: repeatCount },
               });
-              dispatch({ type: 'CLEAR_COUNT' });
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+              dispatch({ type: "CLEAR_COUNT" });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
             } else {
               // First 'd' - wait for movement command
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'd' });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: "d" });
             }
             return true;
           }
 
-          case 'c': {
-            if (state.pendingOperator === 'c') {
+          case "c": {
+            if (state.pendingOperator === "c") {
               // Second 'c' - change N entire lines (cc command)
               const repeatCount = getCurrentCount();
               executeCommand(CMD_TYPES.CHANGE_LINE, repeatCount);
               dispatch({
-                type: 'SET_LAST_COMMAND',
+                type: "SET_LAST_COMMAND",
                 command: { type: CMD_TYPES.CHANGE_LINE, count: repeatCount },
               });
-              dispatch({ type: 'CLEAR_COUNT' });
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: null });
+              dispatch({ type: "CLEAR_COUNT" });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: null });
             } else {
               // First 'c' - wait for movement command
-              dispatch({ type: 'SET_PENDING_OPERATOR', operator: 'c' });
+              dispatch({ type: "SET_PENDING_OPERATOR", operator: "c" });
             }
             return true;
           }
 
-          case 'D': {
+          case "D": {
             // Delete from cursor to end of line (equivalent to d$)
             executeCommand(CMD_TYPES.DELETE_TO_EOL, 1);
             dispatch({
-              type: 'SET_LAST_COMMAND',
+              type: "SET_LAST_COMMAND",
               command: { type: CMD_TYPES.DELETE_TO_EOL, count: 1 },
             });
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case 'C': {
+          case "C": {
             // Change from cursor to end of line (equivalent to c$)
             executeCommand(CMD_TYPES.CHANGE_TO_EOL, 1);
             dispatch({
-              type: 'SET_LAST_COMMAND',
+              type: "SET_LAST_COMMAND",
               command: { type: CMD_TYPES.CHANGE_TO_EOL, count: 1 },
             });
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
-          case '.': {
+          case ".": {
             // Repeat last command
             if (state.lastCommand) {
               const cmdData = state.lastCommand;
@@ -697,62 +690,62 @@ export function useVim(buffer: TextBuffer, onSubmit?: (value: string) => void) {
               executeCommand(cmdData.type, cmdData.count);
             }
 
-            dispatch({ type: 'CLEAR_COUNT' });
+            dispatch({ type: "CLEAR_COUNT" });
             return true;
           }
 
           default: {
             // Check for arrow keys (they have different sequences but known names)
-            if (normalizedKey.name === 'left') {
+            if (normalizedKey.name === "left") {
               // Left arrow - same as 'h'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('h');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("h");
               }
 
               // Normal left movement (same as 'h')
               buffer.vimMoveLeft(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
-            if (normalizedKey.name === 'down') {
+            if (normalizedKey.name === "down") {
               // Down arrow - same as 'j'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('j');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("j");
               }
 
               // Normal down movement (same as 'j')
               buffer.vimMoveDown(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
-            if (normalizedKey.name === 'up') {
+            if (normalizedKey.name === "up") {
               // Up arrow - same as 'k'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('k');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("k");
               }
 
               // Normal up movement (same as 'k')
               buffer.vimMoveUp(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
-            if (normalizedKey.name === 'right') {
+            if (normalizedKey.name === "right") {
               // Right arrow - same as 'l'
-              if (state.pendingOperator === 'c') {
-                return handleChangeMovement('l');
+              if (state.pendingOperator === "c") {
+                return handleChangeMovement("l");
               }
 
               // Normal right movement (same as 'l')
               buffer.vimMoveRight(repeatCount);
-              dispatch({ type: 'CLEAR_COUNT' });
+              dispatch({ type: "CLEAR_COUNT" });
               return true;
             }
 
             // Unknown command, clear count and pending states
-            dispatch({ type: 'CLEAR_PENDING_STATES' });
+            dispatch({ type: "CLEAR_PENDING_STATES" });
             return true; // Still handled by vim to prevent other handlers
           }
         }
diff --git a/packages/ui-gemini/src/ui/keyMatchers.test.ts b/packages/ui-gemini/src/ui/keyMatchers.test.ts
index 0982e84b2..7ff5ecca3 100644
--- a/packages/ui-gemini/src/ui/keyMatchers.test.ts
+++ b/packages/ui-gemini/src/ui/keyMatchers.test.ts
@@ -4,13 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { keyMatchers, Command, createKeyMatchers } from './keyMatchers.js';
-import type { KeyBindingConfig } from '../config/keyBindings.js';
-import { defaultKeyBindings } from '../config/keyBindings.js';
-import type { Key } from './hooks/useKeypress.js';
+import { describe, expect, it } from "vitest";
+import type { KeyBindingConfig } from "../config/keyBindings.js";
+import { defaultKeyBindings } from "../config/keyBindings.js";
+import type { Key } from "./hooks/useKeypress.js";
+import { Command, createKeyMatchers, keyMatchers } from "./keyMatchers.js";
 
-describe('keyMatchers', () => {
+describe("keyMatchers", () => {
   const createKey = (name: string, mods: Partial<Key> = {}): Key => ({
     name,
     ctrl: false,
@@ -24,61 +24,53 @@ describe('keyMatchers', () => {
 
   // Original hard-coded logic (for comparison)
   const originalMatchers: Record<Command, (key: Key) => boolean> = {
-    [Command.RETURN]: (key: Key) => key.name === 'return',
-    [Command.HOME]: (key: Key) => key.ctrl && key.name === 'a',
-    [Command.END]: (key: Key) => key.ctrl && key.name === 'e',
-    [Command.KILL_LINE_RIGHT]: (key: Key) => key.ctrl && key.name === 'k',
-    [Command.KILL_LINE_LEFT]: (key: Key) => key.ctrl && key.name === 'u',
-    [Command.CLEAR_INPUT]: (key: Key) => key.ctrl && key.name === 'c',
+    [Command.RETURN]: (key: Key) => key.name === "return",
+    [Command.HOME]: (key: Key) => key.ctrl && key.name === "a",
+    [Command.END]: (key: Key) => key.ctrl && key.name === "e",
+    [Command.KILL_LINE_RIGHT]: (key: Key) => key.ctrl && key.name === "k",
+    [Command.KILL_LINE_LEFT]: (key: Key) => key.ctrl && key.name === "u",
+    [Command.CLEAR_INPUT]: (key: Key) => key.ctrl && key.name === "c",
     [Command.DELETE_WORD_BACKWARD]: (key: Key) =>
-      (key.ctrl || key.meta) && key.name === 'backspace',
-    [Command.CLEAR_SCREEN]: (key: Key) => key.ctrl && key.name === 'l',
-    [Command.SCROLL_UP]: (key: Key) => key.name === 'up' && !!key.shift,
-    [Command.SCROLL_DOWN]: (key: Key) => key.name === 'down' && !!key.shift,
-    [Command.SCROLL_HOME]: (key: Key) => key.name === 'home',
-    [Command.SCROLL_END]: (key: Key) => key.name === 'end',
-    [Command.PAGE_UP]: (key: Key) => key.name === 'pageup',
-    [Command.PAGE_DOWN]: (key: Key) => key.name === 'pagedown',
-    [Command.HISTORY_UP]: (key: Key) => key.ctrl && key.name === 'p',
-    [Command.HISTORY_DOWN]: (key: Key) => key.ctrl && key.name === 'n',
-    [Command.NAVIGATION_UP]: (key: Key) => key.name === 'up',
-    [Command.NAVIGATION_DOWN]: (key: Key) => key.name === 'down',
+      (key.ctrl || key.meta) && key.name === "backspace",
+    [Command.CLEAR_SCREEN]: (key: Key) => key.ctrl && key.name === "l",
+    [Command.SCROLL_UP]: (key: Key) => key.name === "up" && !!key.shift,
+    [Command.SCROLL_DOWN]: (key: Key) => key.name === "down" && !!key.shift,
+    [Command.SCROLL_HOME]: (key: Key) => key.name === "home",
+    [Command.SCROLL_END]: (key: Key) => key.name === "end",
+    [Command.PAGE_UP]: (key: Key) => key.name === "pageup",
+    [Command.PAGE_DOWN]: (key: Key) => key.name === "pagedown",
+    [Command.HISTORY_UP]: (key: Key) => key.ctrl && key.name === "p",
+    [Command.HISTORY_DOWN]: (key: Key) => key.ctrl && key.name === "n",
+    [Command.NAVIGATION_UP]: (key: Key) => key.name === "up",
+    [Command.NAVIGATION_DOWN]: (key: Key) => key.name === "down",
     [Command.DIALOG_NAVIGATION_UP]: (key: Key) =>
-      !key.shift && (key.name === 'up' || key.name === 'k'),
+      !key.shift && (key.name === "up" || key.name === "k"),
     [Command.DIALOG_NAVIGATION_DOWN]: (key: Key) =>
-      !key.shift && (key.name === 'down' || key.name === 'j'),
+      !key.shift && (key.name === "down" || key.name === "j"),
     [Command.ACCEPT_SUGGESTION]: (key: Key) =>
-      key.name === 'tab' || (key.name === 'return' && !key.ctrl),
-    [Command.COMPLETION_UP]: (key: Key) =>
-      key.name === 'up' || (key.ctrl && key.name === 'p'),
-    [Command.COMPLETION_DOWN]: (key: Key) =>
-      key.name === 'down' || (key.ctrl && key.name === 'n'),
-    [Command.ESCAPE]: (key: Key) => key.name === 'escape',
-    [Command.SUBMIT]: (key: Key) =>
-      key.name === 'return' && !key.ctrl && !key.meta && !key.paste,
-    [Command.NEWLINE]: (key: Key) =>
-      key.name === 'return' && (key.ctrl || key.meta || key.paste),
+      key.name === "tab" || (key.name === "return" && !key.ctrl),
+    [Command.COMPLETION_UP]: (key: Key) => key.name === "up" || (key.ctrl && key.name === "p"),
+    [Command.COMPLETION_DOWN]: (key: Key) => key.name === "down" || (key.ctrl && key.name === "n"),
+    [Command.ESCAPE]: (key: Key) => key.name === "escape",
+    [Command.SUBMIT]: (key: Key) => key.name === "return" && !key.ctrl && !key.meta && !key.paste,
+    [Command.NEWLINE]: (key: Key) => key.name === "return" && (key.ctrl || key.meta || key.paste),
     [Command.OPEN_EXTERNAL_EDITOR]: (key: Key) =>
-      key.ctrl && (key.name === 'x' || key.sequence === '\x18'),
-    [Command.PASTE_CLIPBOARD]: (key: Key) => key.ctrl && key.name === 'v',
-    [Command.SHOW_ERROR_DETAILS]: (key: Key) => key.name === 'f12',
-    [Command.SHOW_FULL_TODOS]: (key: Key) => key.ctrl && key.name === 't',
-    [Command.TOGGLE_IDE_CONTEXT_DETAIL]: (key: Key) =>
-      key.ctrl && key.name === 'g',
-    [Command.TOGGLE_MARKDOWN]: (key: Key) => key.meta && key.name === 'm',
-    [Command.TOGGLE_COPY_MODE]: (key: Key) => key.ctrl && key.name === 's',
-    [Command.QUIT]: (key: Key) => key.ctrl && key.name === 'c',
-    [Command.EXIT]: (key: Key) => key.ctrl && key.name === 'd',
-    [Command.SHOW_MORE_LINES]: (key: Key) => key.ctrl && key.name === 's',
-    [Command.REVERSE_SEARCH]: (key: Key) => key.ctrl && key.name === 'r',
-    [Command.SUBMIT_REVERSE_SEARCH]: (key: Key) =>
-      key.name === 'return' && !key.ctrl,
-    [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: (key: Key) =>
-      key.name === 'tab',
-    [Command.TOGGLE_SHELL_INPUT_FOCUS]: (key: Key) =>
-      key.ctrl && key.name === 'f',
-    [Command.EXPAND_SUGGESTION]: (key: Key) => key.name === 'right',
-    [Command.COLLAPSE_SUGGESTION]: (key: Key) => key.name === 'left',
+      key.ctrl && (key.name === "x" || key.sequence === "\x18"),
+    [Command.PASTE_CLIPBOARD]: (key: Key) => key.ctrl && key.name === "v",
+    [Command.SHOW_ERROR_DETAILS]: (key: Key) => key.name === "f12",
+    [Command.SHOW_FULL_TODOS]: (key: Key) => key.ctrl && key.name === "t",
+    [Command.TOGGLE_IDE_CONTEXT_DETAIL]: (key: Key) => key.ctrl && key.name === "g",
+    [Command.TOGGLE_MARKDOWN]: (key: Key) => key.meta && key.name === "m",
+    [Command.TOGGLE_COPY_MODE]: (key: Key) => key.ctrl && key.name === "s",
+    [Command.QUIT]: (key: Key) => key.ctrl && key.name === "c",
+    [Command.EXIT]: (key: Key) => key.ctrl && key.name === "d",
+    [Command.SHOW_MORE_LINES]: (key: Key) => key.ctrl && key.name === "s",
+    [Command.REVERSE_SEARCH]: (key: Key) => key.ctrl && key.name === "r",
+    [Command.SUBMIT_REVERSE_SEARCH]: (key: Key) => key.name === "return" && !key.ctrl,
+    [Command.ACCEPT_SUGGESTION_REVERSE_SEARCH]: (key: Key) => key.name === "tab",
+    [Command.TOGGLE_SHELL_INPUT_FOCUS]: (key: Key) => key.ctrl && key.name === "f",
+    [Command.EXPAND_SUGGESTION]: (key: Key) => key.name === "right",
+    [Command.COLLAPSE_SUGGESTION]: (key: Key) => key.name === "left",
   };
 
   // Test data for each command with positive and negative test cases
@@ -86,259 +78,244 @@ describe('keyMatchers', () => {
     // Basic bindings
     {
       command: Command.RETURN,
-      positive: [createKey('return')],
-      negative: [createKey('r')],
+      positive: [createKey("return")],
+      negative: [createKey("r")],
     },
     {
       command: Command.ESCAPE,
-      positive: [createKey('escape'), createKey('escape', { ctrl: true })],
-      negative: [createKey('e'), createKey('esc')],
+      positive: [createKey("escape"), createKey("escape", { ctrl: true })],
+      negative: [createKey("e"), createKey("esc")],
     },
 
     // Cursor movement
     {
       command: Command.HOME,
-      positive: [createKey('a', { ctrl: true })],
-      negative: [
-        createKey('a'),
-        createKey('a', { shift: true }),
-        createKey('b', { ctrl: true }),
-      ],
+      positive: [createKey("a", { ctrl: true })],
+      negative: [createKey("a"), createKey("a", { shift: true }), createKey("b", { ctrl: true })],
     },
     {
       command: Command.END,
-      positive: [createKey('e', { ctrl: true })],
-      negative: [
-        createKey('e'),
-        createKey('e', { shift: true }),
-        createKey('a', { ctrl: true }),
-      ],
+      positive: [createKey("e", { ctrl: true })],
+      negative: [createKey("e"), createKey("e", { shift: true }), createKey("a", { ctrl: true })],
     },
 
     // Text deletion
     {
       command: Command.KILL_LINE_RIGHT,
-      positive: [createKey('k', { ctrl: true })],
-      negative: [createKey('k'), createKey('l', { ctrl: true })],
+      positive: [createKey("k", { ctrl: true })],
+      negative: [createKey("k"), createKey("l", { ctrl: true })],
     },
     {
       command: Command.KILL_LINE_LEFT,
-      positive: [createKey('u', { ctrl: true })],
-      negative: [createKey('u'), createKey('k', { ctrl: true })],
+      positive: [createKey("u", { ctrl: true })],
+      negative: [createKey("u"), createKey("k", { ctrl: true })],
     },
     {
       command: Command.CLEAR_INPUT,
-      positive: [createKey('c', { ctrl: true })],
-      negative: [createKey('c'), createKey('k', { ctrl: true })],
+      positive: [createKey("c", { ctrl: true })],
+      negative: [createKey("c"), createKey("k", { ctrl: true })],
     },
     {
       command: Command.DELETE_WORD_BACKWARD,
-      positive: [
-        createKey('backspace', { ctrl: true }),
-        createKey('backspace', { meta: true }),
-      ],
-      negative: [createKey('backspace'), createKey('delete', { ctrl: true })],
+      positive: [createKey("backspace", { ctrl: true }), createKey("backspace", { meta: true })],
+      negative: [createKey("backspace"), createKey("delete", { ctrl: true })],
     },
 
     // Screen control
     {
       command: Command.CLEAR_SCREEN,
-      positive: [createKey('l', { ctrl: true })],
-      negative: [createKey('l'), createKey('k', { ctrl: true })],
+      positive: [createKey("l", { ctrl: true })],
+      negative: [createKey("l"), createKey("k", { ctrl: true })],
     },
 
     // Scrolling
     {
       command: Command.SCROLL_UP,
-      positive: [createKey('up', { shift: true })],
-      negative: [createKey('up'), createKey('up', { ctrl: true })],
+      positive: [createKey("up", { shift: true })],
+      negative: [createKey("up"), createKey("up", { ctrl: true })],
     },
     {
       command: Command.SCROLL_DOWN,
-      positive: [createKey('down', { shift: true })],
-      negative: [createKey('down'), createKey('down', { ctrl: true })],
+      positive: [createKey("down", { shift: true })],
+      negative: [createKey("down"), createKey("down", { ctrl: true })],
     },
     {
       command: Command.SCROLL_HOME,
-      positive: [createKey('home')],
-      negative: [createKey('end')],
+      positive: [createKey("home")],
+      negative: [createKey("end")],
     },
     {
       command: Command.SCROLL_END,
-      positive: [createKey('end')],
-      negative: [createKey('home')],
+      positive: [createKey("end")],
+      negative: [createKey("home")],
     },
     {
       command: Command.PAGE_UP,
-      positive: [createKey('pageup'), createKey('pageup', { shift: true })],
-      negative: [createKey('pagedown'), createKey('up')],
+      positive: [createKey("pageup"), createKey("pageup", { shift: true })],
+      negative: [createKey("pagedown"), createKey("up")],
     },
     {
       command: Command.PAGE_DOWN,
-      positive: [createKey('pagedown'), createKey('pagedown', { ctrl: true })],
-      negative: [createKey('pageup'), createKey('down')],
+      positive: [createKey("pagedown"), createKey("pagedown", { ctrl: true })],
+      negative: [createKey("pageup"), createKey("down")],
     },
 
     // History navigation
     {
       command: Command.HISTORY_UP,
-      positive: [createKey('p', { ctrl: true })],
-      negative: [createKey('p'), createKey('up')],
+      positive: [createKey("p", { ctrl: true })],
+      negative: [createKey("p"), createKey("up")],
     },
     {
       command: Command.HISTORY_DOWN,
-      positive: [createKey('n', { ctrl: true })],
-      negative: [createKey('n'), createKey('down')],
+      positive: [createKey("n", { ctrl: true })],
+      negative: [createKey("n"), createKey("down")],
     },
     {
       command: Command.NAVIGATION_UP,
-      positive: [createKey('up'), createKey('up', { ctrl: true })],
-      negative: [createKey('p'), createKey('u')],
+      positive: [createKey("up"), createKey("up", { ctrl: true })],
+      negative: [createKey("p"), createKey("u")],
     },
     {
       command: Command.NAVIGATION_DOWN,
-      positive: [createKey('down'), createKey('down', { ctrl: true })],
-      negative: [createKey('n'), createKey('d')],
+      positive: [createKey("down"), createKey("down", { ctrl: true })],
+      negative: [createKey("n"), createKey("d")],
     },
 
     // Dialog navigation
     {
       command: Command.DIALOG_NAVIGATION_UP,
-      positive: [createKey('up'), createKey('k')],
-      negative: [
-        createKey('up', { shift: true }),
-        createKey('k', { shift: true }),
-        createKey('p'),
-      ],
+      positive: [createKey("up"), createKey("k")],
+      negative: [createKey("up", { shift: true }), createKey("k", { shift: true }), createKey("p")],
     },
     {
       command: Command.DIALOG_NAVIGATION_DOWN,
-      positive: [createKey('down'), createKey('j')],
+      positive: [createKey("down"), createKey("j")],
       negative: [
-        createKey('down', { shift: true }),
-        createKey('j', { shift: true }),
-        createKey('n'),
+        createKey("down", { shift: true }),
+        createKey("j", { shift: true }),
+        createKey("n"),
       ],
     },
 
     // Auto-completion
     {
       command: Command.ACCEPT_SUGGESTION,
-      positive: [createKey('tab'), createKey('return')],
-      negative: [createKey('return', { ctrl: true }), createKey('space')],
+      positive: [createKey("tab"), createKey("return")],
+      negative: [createKey("return", { ctrl: true }), createKey("space")],
     },
     {
       command: Command.COMPLETION_UP,
-      positive: [createKey('up'), createKey('p', { ctrl: true })],
-      negative: [createKey('p'), createKey('down')],
+      positive: [createKey("up"), createKey("p", { ctrl: true })],
+      negative: [createKey("p"), createKey("down")],
     },
     {
       command: Command.COMPLETION_DOWN,
-      positive: [createKey('down'), createKey('n', { ctrl: true })],
-      negative: [createKey('n'), createKey('up')],
+      positive: [createKey("down"), createKey("n", { ctrl: true })],
+      negative: [createKey("n"), createKey("up")],
     },
 
     // Text input
     {
       command: Command.SUBMIT,
-      positive: [createKey('return')],
+      positive: [createKey("return")],
       negative: [
-        createKey('return', { ctrl: true }),
-        createKey('return', { meta: true }),
-        createKey('return', { paste: true }),
+        createKey("return", { ctrl: true }),
+        createKey("return", { meta: true }),
+        createKey("return", { paste: true }),
       ],
     },
     {
       command: Command.NEWLINE,
       positive: [
-        createKey('return', { ctrl: true }),
-        createKey('return', { meta: true }),
-        createKey('return', { paste: true }),
+        createKey("return", { ctrl: true }),
+        createKey("return", { meta: true }),
+        createKey("return", { paste: true }),
       ],
-      negative: [createKey('return'), createKey('n')],
+      negative: [createKey("return"), createKey("n")],
     },
 
     // External tools
     {
       command: Command.OPEN_EXTERNAL_EDITOR,
       positive: [
-        createKey('x', { ctrl: true }),
-        { ...createKey('\x18'), sequence: '\x18', ctrl: true },
+        createKey("x", { ctrl: true }),
+        { ...createKey("\x18"), sequence: "\x18", ctrl: true },
       ],
-      negative: [createKey('x'), createKey('c', { ctrl: true })],
+      negative: [createKey("x"), createKey("c", { ctrl: true })],
     },
     {
       command: Command.PASTE_CLIPBOARD,
-      positive: [createKey('v', { ctrl: true })],
-      negative: [createKey('v'), createKey('c', { ctrl: true })],
+      positive: [createKey("v", { ctrl: true })],
+      negative: [createKey("v"), createKey("c", { ctrl: true })],
     },
 
     // App level bindings
     {
       command: Command.SHOW_ERROR_DETAILS,
-      positive: [createKey('f12')],
-      negative: [createKey('o', { ctrl: true }), createKey('f11')],
+      positive: [createKey("f12")],
+      negative: [createKey("o", { ctrl: true }), createKey("f11")],
     },
     {
       command: Command.SHOW_FULL_TODOS,
-      positive: [createKey('t', { ctrl: true })],
-      negative: [createKey('t'), createKey('e', { ctrl: true })],
+      positive: [createKey("t", { ctrl: true })],
+      negative: [createKey("t"), createKey("e", { ctrl: true })],
     },
     {
       command: Command.TOGGLE_IDE_CONTEXT_DETAIL,
-      positive: [createKey('g', { ctrl: true })],
-      negative: [createKey('g'), createKey('t', { ctrl: true })],
+      positive: [createKey("g", { ctrl: true })],
+      negative: [createKey("g"), createKey("t", { ctrl: true })],
     },
     {
       command: Command.TOGGLE_MARKDOWN,
-      positive: [createKey('m', { meta: true })],
-      negative: [createKey('m'), createKey('m', { shift: true })],
+      positive: [createKey("m", { meta: true })],
+      negative: [createKey("m"), createKey("m", { shift: true })],
     },
     {
       command: Command.TOGGLE_COPY_MODE,
-      positive: [createKey('s', { ctrl: true })],
-      negative: [createKey('s'), createKey('s', { meta: true })],
+      positive: [createKey("s", { ctrl: true })],
+      negative: [createKey("s"), createKey("s", { meta: true })],
     },
     {
       command: Command.QUIT,
-      positive: [createKey('c', { ctrl: true })],
-      negative: [createKey('c'), createKey('d', { ctrl: true })],
+      positive: [createKey("c", { ctrl: true })],
+      negative: [createKey("c"), createKey("d", { ctrl: true })],
     },
     {
       command: Command.EXIT,
-      positive: [createKey('d', { ctrl: true })],
-      negative: [createKey('d'), createKey('c', { ctrl: true })],
+      positive: [createKey("d", { ctrl: true })],
+      negative: [createKey("d"), createKey("c", { ctrl: true })],
     },
     {
       command: Command.SHOW_MORE_LINES,
-      positive: [createKey('s', { ctrl: true })],
-      negative: [createKey('s'), createKey('l', { ctrl: true })],
+      positive: [createKey("s", { ctrl: true })],
+      negative: [createKey("s"), createKey("l", { ctrl: true })],
     },
 
     // Shell commands
     {
       command: Command.REVERSE_SEARCH,
-      positive: [createKey('r', { ctrl: true })],
-      negative: [createKey('r'), createKey('s', { ctrl: true })],
+      positive: [createKey("r", { ctrl: true })],
+      negative: [createKey("r"), createKey("s", { ctrl: true })],
     },
     {
       command: Command.SUBMIT_REVERSE_SEARCH,
-      positive: [createKey('return')],
-      negative: [createKey('return', { ctrl: true }), createKey('tab')],
+      positive: [createKey("return")],
+      negative: [createKey("return", { ctrl: true }), createKey("tab")],
     },
     {
       command: Command.ACCEPT_SUGGESTION_REVERSE_SEARCH,
-      positive: [createKey('tab'), createKey('tab', { ctrl: true })],
-      negative: [createKey('return'), createKey('space')],
+      positive: [createKey("tab"), createKey("tab", { ctrl: true })],
+      negative: [createKey("return"), createKey("space")],
     },
     {
       command: Command.TOGGLE_SHELL_INPUT_FOCUS,
-      positive: [createKey('f', { ctrl: true })],
-      negative: [createKey('f')],
+      positive: [createKey("f", { ctrl: true })],
+      negative: [createKey("f")],
     },
   ];
 
-  describe('Data-driven key binding matches original logic', () => {
+  describe("Data-driven key binding matches original logic", () => {
     testCases.forEach(({ command, positive, negative }) => {
       it(`should match ${command} correctly`, () => {
         positive.forEach((key) => {
@@ -365,67 +342,55 @@ describe('keyMatchers', () => {
       });
     });
 
-    it('should properly handle ACCEPT_SUGGESTION_REVERSE_SEARCH cases', () => {
+    it("should properly handle ACCEPT_SUGGESTION_REVERSE_SEARCH cases", () => {
       expect(
-        keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](
-          createKey('return', { ctrl: true }),
-        ),
+        keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](createKey("return", { ctrl: true })),
       ).toBe(false); // ctrl must be false
+      expect(keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](createKey("tab"))).toBe(true);
       expect(
-        keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](createKey('tab')),
-      ).toBe(true);
-      expect(
-        keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](
-          createKey('tab', { ctrl: true }),
-        ),
+        keyMatchers[Command.ACCEPT_SUGGESTION_REVERSE_SEARCH](createKey("tab", { ctrl: true })),
       ).toBe(true); // modifiers ignored
     });
   });
 
-  describe('Custom key bindings', () => {
-    it('should work with custom configuration', () => {
+  describe("Custom key bindings", () => {
+    it("should work with custom configuration", () => {
       const customConfig: KeyBindingConfig = {
         ...defaultKeyBindings,
-        [Command.HOME]: [{ key: 'h', ctrl: true }, { key: '0' }],
+        [Command.HOME]: [{ key: "h", ctrl: true }, { key: "0" }],
       };
 
       const customMatchers = createKeyMatchers(customConfig);
 
-      expect(customMatchers[Command.HOME](createKey('h', { ctrl: true }))).toBe(
-        true,
-      );
-      expect(customMatchers[Command.HOME](createKey('0'))).toBe(true);
-      expect(customMatchers[Command.HOME](createKey('a', { ctrl: true }))).toBe(
-        false,
-      );
+      expect(customMatchers[Command.HOME](createKey("h", { ctrl: true }))).toBe(true);
+      expect(customMatchers[Command.HOME](createKey("0"))).toBe(true);
+      expect(customMatchers[Command.HOME](createKey("a", { ctrl: true }))).toBe(false);
     });
 
-    it('should support multiple key bindings for same command', () => {
+    it("should support multiple key bindings for same command", () => {
       const config: KeyBindingConfig = {
         ...defaultKeyBindings,
         [Command.QUIT]: [
-          { key: 'q', ctrl: true },
-          { key: 'q', command: true },
+          { key: "q", ctrl: true },
+          { key: "q", command: true },
         ],
       };
 
       const matchers = createKeyMatchers(config);
-      expect(matchers[Command.QUIT](createKey('q', { ctrl: true }))).toBe(true);
-      expect(matchers[Command.QUIT](createKey('q', { meta: true }))).toBe(true);
+      expect(matchers[Command.QUIT](createKey("q", { ctrl: true }))).toBe(true);
+      expect(matchers[Command.QUIT](createKey("q", { meta: true }))).toBe(true);
     });
   });
 
-  describe('Edge Cases', () => {
-    it('should handle empty binding arrays', () => {
+  describe("Edge Cases", () => {
+    it("should handle empty binding arrays", () => {
       const config: KeyBindingConfig = {
         ...defaultKeyBindings,
         [Command.HOME]: [],
       };
 
       const matchers = createKeyMatchers(config);
-      expect(matchers[Command.HOME](createKey('a', { ctrl: true }))).toBe(
-        false,
-      );
+      expect(matchers[Command.HOME](createKey("a", { ctrl: true }))).toBe(false);
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/keyMatchers.ts b/packages/ui-gemini/src/ui/keyMatchers.ts
index 103c57100..1faf2ce5f 100644
--- a/packages/ui-gemini/src/ui/keyMatchers.ts
+++ b/packages/ui-gemini/src/ui/keyMatchers.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Key } from './hooks/useKeypress.js';
-import type { KeyBinding, KeyBindingConfig } from '../config/keyBindings.js';
-import { Command, defaultKeyBindings } from '../config/keyBindings.js';
+import type { KeyBinding, KeyBindingConfig } from "../config/keyBindings.js";
+import { Command, defaultKeyBindings } from "../config/keyBindings.js";
+import type { Key } from "./hooks/useKeypress.js";
 
 /**
  * Matches a KeyBinding against an actual Key press
@@ -80,9 +80,7 @@ export type KeyMatchers = {
 /**
  * Creates key matchers from a key binding configuration
  */
-export function createKeyMatchers(
-  config: KeyBindingConfig = defaultKeyBindings,
-): KeyMatchers {
+export function createKeyMatchers(config: KeyBindingConfig = defaultKeyBindings): KeyMatchers {
   const matchers = {} as { [C in Command]: KeyMatcher };
 
   for (const command of Object.values(Command)) {
diff --git a/packages/ui-gemini/src/ui/layouts/DefaultAppLayout.tsx b/packages/ui-gemini/src/ui/layouts/DefaultAppLayout.tsx
index bf68aee85..c3a9e6ff9 100644
--- a/packages/ui-gemini/src/ui/layouts/DefaultAppLayout.tsx
+++ b/packages/ui-gemini/src/ui/layouts/DefaultAppLayout.tsx
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box } from 'ink';
-import { Notifications } from '../components/Notifications.js';
-import { MainContent } from '../components/MainContent.js';
-import { DialogManager } from '../components/DialogManager.js';
-import { Composer } from '../components/Composer.js';
-import { ExitWarning } from '../components/ExitWarning.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useFlickerDetector } from '../hooks/useFlickerDetector.js';
-import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
-import { CopyModeWarning } from '../components/CopyModeWarning.js';
+import { Box } from "ink";
+import type React from "react";
+import { Composer } from "../components/Composer.js";
+import { CopyModeWarning } from "../components/CopyModeWarning.js";
+import { DialogManager } from "../components/DialogManager.js";
+import { ExitWarning } from "../components/ExitWarning.js";
+import { MainContent } from "../components/MainContent.js";
+import { Notifications } from "../components/Notifications.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useAlternateBuffer } from "../hooks/useAlternateBuffer.js";
+import { useFlickerDetector } from "../hooks/useFlickerDetector.js";
 
 export const DefaultAppLayout: React.FC = () => {
   const uiState = useUIState();
@@ -24,9 +24,7 @@ export const DefaultAppLayout: React.FC = () => {
   useFlickerDetector(rootUiRef, terminalHeight);
   // If in alternate buffer mode, need to leave room to draw the scrollbar on
   // the right side of the terminal.
-  const width = isAlternateBuffer
-    ? uiState.terminalWidth
-    : uiState.mainAreaWidth;
+  const width = isAlternateBuffer ? uiState.terminalWidth : uiState.mainAreaWidth;
   return (
     <Box
       flexDirection="column"
@@ -39,12 +37,7 @@ export const DefaultAppLayout: React.FC = () => {
     >
       <MainContent />
 
-      <Box
-        flexDirection="column"
-        ref={uiState.mainControlsRef}
-        flexShrink={0}
-        flexGrow={0}
-      >
+      <Box flexDirection="column" ref={uiState.mainControlsRef} flexShrink={0} flexGrow={0}>
         <Notifications />
         <CopyModeWarning />
 
diff --git a/packages/ui-gemini/src/ui/layouts/ScreenReaderAppLayout.tsx b/packages/ui-gemini/src/ui/layouts/ScreenReaderAppLayout.tsx
index d88f3f1fb..92c478c79 100644
--- a/packages/ui-gemini/src/ui/layouts/ScreenReaderAppLayout.tsx
+++ b/packages/ui-gemini/src/ui/layouts/ScreenReaderAppLayout.tsx
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { Box } from 'ink';
-import { Notifications } from '../components/Notifications.js';
-import { MainContent } from '../components/MainContent.js';
-import { DialogManager } from '../components/DialogManager.js';
-import { Composer } from '../components/Composer.js';
-import { Footer } from '../components/Footer.js';
-import { ExitWarning } from '../components/ExitWarning.js';
-import { useUIState } from '../contexts/UIStateContext.js';
-import { useFlickerDetector } from '../hooks/useFlickerDetector.js';
+import { Box } from "ink";
+import type React from "react";
+import { Composer } from "../components/Composer.js";
+import { DialogManager } from "../components/DialogManager.js";
+import { ExitWarning } from "../components/ExitWarning.js";
+import { Footer } from "../components/Footer.js";
+import { MainContent } from "../components/MainContent.js";
+import { Notifications } from "../components/Notifications.js";
+import { useUIState } from "../contexts/UIStateContext.js";
+import { useFlickerDetector } from "../hooks/useFlickerDetector.js";
 
 export const ScreenReaderAppLayout: React.FC = () => {
   const uiState = useUIState();
@@ -21,12 +21,7 @@ export const ScreenReaderAppLayout: React.FC = () => {
   useFlickerDetector(rootUiRef, terminalHeight);
 
   return (
-    <Box
-      flexDirection="column"
-      width="90%"
-      height="100%"
-      ref={uiState.rootUiRef}
-    >
+    <Box flexDirection="column" width="90%" height="100%" ref={uiState.rootUiRef}>
       <Notifications />
       <Footer />
       <Box flexGrow={1} overflow="hidden">
diff --git a/packages/ui-gemini/src/ui/noninteractive/nonInteractiveUi.ts b/packages/ui-gemini/src/ui/noninteractive/nonInteractiveUi.ts
index 542ed16bd..ceaa0c1a0 100644
--- a/packages/ui-gemini/src/ui/noninteractive/nonInteractiveUi.ts
+++ b/packages/ui-gemini/src/ui/noninteractive/nonInteractiveUi.ts
@@ -4,15 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CommandContext } from '../commands/types.js';
-import type { ExtensionUpdateAction } from '../state/extensions.js';
+import type { CommandContext } from "../commands/types.js";
+import type { ExtensionUpdateAction } from "../state/extensions.js";
 
 /**
  * Creates a UI context object with no-op functions.
  * Useful for non-interactive environments where UI operations
  * are not applicable.
  */
-export function createNonInteractiveUI(): CommandContext['ui'] {
+export function createNonInteractiveUI(): CommandContext["ui"] {
   return {
     addItem: (_item, _timestamp) => 0,
     clear: () => {},
diff --git a/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.test.tsx b/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.test.tsx
index 7d1a1fce8..268f31756 100644
--- a/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.test.tsx
+++ b/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.test.tsx
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { CloudFreePrivacyNotice } from './CloudFreePrivacyNotice.js';
-import { usePrivacySettings } from '../hooks/usePrivacySettings.js';
-import { useKeypress } from '../hooks/useKeypress.js';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { RadioButtonSelect } from "../components/shared/RadioButtonSelect.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { usePrivacySettings } from "../hooks/usePrivacySettings.js";
+import { CloudFreePrivacyNotice } from "./CloudFreePrivacyNotice.js";
 
 // Mocks
-vi.mock('../hooks/usePrivacySettings.js', () => ({
+vi.mock("../hooks/usePrivacySettings.js", () => ({
   usePrivacySettings: vi.fn(),
 }));
 
-vi.mock('../components/shared/RadioButtonSelect.js', () => ({
+vi.mock("../components/shared/RadioButtonSelect.js", () => ({
   RadioButtonSelect: vi.fn(),
 }));
 
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
@@ -29,7 +29,7 @@ const mockedUsePrivacySettings = usePrivacySettings as Mock;
 const mockedUseKeypress = useKeypress as Mock;
 const mockedRadioButtonSelect = RadioButtonSelect as Mock;
 
-describe('CloudFreePrivacyNotice', () => {
+describe("CloudFreePrivacyNotice", () => {
   const mockConfig = {} as Config;
   const onExit = vi.fn();
   const updateDataCollectionOptIn = vi.fn();
@@ -56,79 +56,74 @@ describe('CloudFreePrivacyNotice', () => {
 
   it.each([
     {
-      stateName: 'loading state',
+      stateName: "loading state",
       mockState: { isLoading: true },
-      expectedText: 'Loading...',
+      expectedText: "Loading...",
     },
     {
-      stateName: 'error state',
-      mockState: { error: 'Something went wrong' },
-      expectedText: 'Error loading Opt-in settings',
+      stateName: "error state",
+      mockState: { error: "Something went wrong" },
+      expectedText: "Error loading Opt-in settings",
     },
     {
-      stateName: 'non-free tier state',
+      stateName: "non-free tier state",
       mockState: { isFreeTier: false },
-      expectedText: 'Gemini Code Assist Privacy Notice',
+      expectedText: "Gemini Code Assist Privacy Notice",
     },
     {
-      stateName: 'free tier state',
+      stateName: "free tier state",
       mockState: { isFreeTier: true },
-      expectedText: 'Gemini Code Assist for Individuals Privacy Notice',
+      expectedText: "Gemini Code Assist for Individuals Privacy Notice",
     },
-  ])('renders correctly in $stateName', ({ mockState, expectedText }) => {
+  ])("renders correctly in $stateName", ({ mockState, expectedText }) => {
     mockedUsePrivacySettings.mockReturnValue({
       privacyState: { ...defaultState, ...mockState },
       updateDataCollectionOptIn,
     });
 
-    const { lastFrame } = render(
-      <CloudFreePrivacyNotice config={mockConfig} onExit={onExit} />,
-    );
+    const { lastFrame } = render(<CloudFreePrivacyNotice config={mockConfig} onExit={onExit} />);
 
     expect(lastFrame()).toContain(expectedText);
   });
 
   it.each([
     {
-      stateName: 'error state',
-      mockState: { error: 'Something went wrong' },
+      stateName: "error state",
+      mockState: { error: "Something went wrong" },
       shouldExit: true,
     },
     {
-      stateName: 'non-free tier state',
+      stateName: "non-free tier state",
       mockState: { isFreeTier: false },
       shouldExit: true,
     },
     {
-      stateName: 'free tier state (no selection)',
+      stateName: "free tier state (no selection)",
       mockState: { isFreeTier: true },
       shouldExit: false,
     },
-  ])(
-    'exits on Escape in $stateName: $shouldExit',
-    ({ mockState, shouldExit }) => {
-      mockedUsePrivacySettings.mockReturnValue({
-        privacyState: { ...defaultState, ...mockState },
-        updateDataCollectionOptIn,
-      });
+  ])("exits on Escape in $stateName: $shouldExit", ({ mockState, shouldExit }) => {
+    mockedUsePrivacySettings.mockReturnValue({
+      privacyState: { ...defaultState, ...mockState },
+      updateDataCollectionOptIn,
+    });
 
-      render(<CloudFreePrivacyNotice config={mockConfig} onExit={onExit} />);
+    render(<CloudFreePrivacyNotice config={mockConfig} onExit={onExit} />);
 
-      const keypressHandler = mockedUseKeypress.mock.calls[0][0];
-      keypressHandler({ name: 'escape' });
+    const keypressHandler = mockedUseKeypress.mock.calls[0][0];
+    keypressHandler({ name: "escape" });
 
-      if (shouldExit) {
-        expect(onExit).toHaveBeenCalled();
-      } else {
-        expect(onExit).not.toHaveBeenCalled();
-      }
-    },
-  );
+    if (shouldExit) {
+      expect(onExit).toHaveBeenCalled();
+    } else {
+      expect(onExit).not.toHaveBeenCalled();
+    }
+  });
 
-  describe('RadioButtonSelect interaction', () => {
+  describe("RadioButtonSelect interaction", () => {
     it.each([
-      { selection: true, label: 'Yes' },
-      { selection: false, label: 'No' },
+      { selection: true, label: "Yes" },
+      { selection: false, label: "No" },
     ])('calls correct functions on selecting "$label"', ({ selection }) => {
       render(<CloudFreePrivacyNotice config={mockConfig} onExit={onExit} />);
 
diff --git a/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.tsx b/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.tsx
index c4454e845..f65962c53 100644
--- a/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.tsx
+++ b/packages/ui-gemini/src/ui/privacy/CloudFreePrivacyNotice.tsx
@@ -4,32 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Newline, Text } from 'ink';
-import { RadioButtonSelect } from '../components/shared/RadioButtonSelect.js';
-import { usePrivacySettings } from '../hooks/usePrivacySettings.js';
-
-import type { Config } from '@airiscode/gemini-cli-core';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { Box, Newline, Text } from "ink";
+import { RadioButtonSelect } from "../components/shared/RadioButtonSelect.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { usePrivacySettings } from "../hooks/usePrivacySettings.js";
+import { theme } from "../semantic-colors.js";
 
 interface CloudFreePrivacyNoticeProps {
   config: Config;
   onExit: () => void;
 }
 
-export const CloudFreePrivacyNotice = ({
-  config,
-  onExit,
-}: CloudFreePrivacyNoticeProps) => {
-  const { privacyState, updateDataCollectionOptIn } =
-    usePrivacySettings(config);
+export const CloudFreePrivacyNotice = ({ config, onExit }: CloudFreePrivacyNoticeProps) => {
+  const { privacyState, updateDataCollectionOptIn } = usePrivacySettings(config);
 
   useKeypress(
     (key) => {
-      if (
-        (privacyState.error || privacyState.isFreeTier === false) &&
-        key.name === 'escape'
-      ) {
+      if ((privacyState.error || privacyState.isFreeTier === false) && key.name === "escape") {
         onExit();
       }
     },
@@ -43,9 +35,7 @@ export const CloudFreePrivacyNotice = ({
   if (privacyState.error) {
     return (
       <Box flexDirection="column" marginY={1}>
-        <Text color={theme.status.error}>
-          Error loading Opt-in settings: {privacyState.error}
-        </Text>
+        <Text color={theme.status.error}>Error loading Opt-in settings: {privacyState.error}</Text>
         <Text color={theme.text.secondary}>Press Esc to exit.</Text>
       </Box>
     );
@@ -58,9 +48,7 @@ export const CloudFreePrivacyNotice = ({
           Gemini Code Assist Privacy Notice
         </Text>
         <Newline />
-        <Text>
-          https://developers.google.com/gemini-code-assist/resources/privacy-notices
-        </Text>
+        <Text>https://developers.google.com/gemini-code-assist/resources/privacy-notices</Text>
         <Newline />
         <Text color={theme.text.secondary}>Press Esc to exit.</Text>
       </Box>
@@ -68,8 +56,8 @@ export const CloudFreePrivacyNotice = ({
   }
 
   const items = [
-    { label: 'Yes', value: true, key: 'true' },
-    { label: 'No', value: false, key: 'false' },
+    { label: "Yes", value: true, key: "true" },
+    { label: "No", value: false, key: "false" },
   ];
 
   return (
@@ -80,27 +68,24 @@ export const CloudFreePrivacyNotice = ({
       <Newline />
       <Text color={theme.text.primary}>
         This notice and our Privacy Policy
-        <Text color={theme.text.link}>[1]</Text> describe how Gemini Code Assist
-        handles your data. Please read them carefully.
+        <Text color={theme.text.link}>[1]</Text> describe how Gemini Code Assist handles your data.
+        Please read them carefully.
       </Text>
       <Newline />
       <Text color={theme.text.primary}>
-        When you use Gemini Code Assist for individuals with Gemini CLI, Google
-        collects your prompts, related code, generated output, code edits,
-        related feature usage information, and your feedback to provide,
-        improve, and develop Google products and services and machine learning
-        technologies.
+        When you use Gemini Code Assist for individuals with Gemini CLI, Google collects your
+        prompts, related code, generated output, code edits, related feature usage information, and
+        your feedback to provide, improve, and develop Google products and services and machine
+        learning technologies.
       </Text>
       <Newline />
       <Text color={theme.text.primary}>
-        To help with quality and improve our products (such as generative
-        machine-learning models), human reviewers may read, annotate, and
-        process the data collected above. We take steps to protect your privacy
-        as part of this process. This includes disconnecting the data from your
-        Google Account before reviewers see or annotate it, and storing those
-        disconnected copies for up to 18 months. Please don&apos;t submit
-        confidential information or any data you wouldn&apos;t want a reviewer
-        to see or Google to use to improve our products, services and
+        To help with quality and improve our products (such as generative machine-learning models),
+        human reviewers may read, annotate, and process the data collected above. We take steps to
+        protect your privacy as part of this process. This includes disconnecting the data from your
+        Google Account before reviewers see or annotate it, and storing those disconnected copies
+        for up to 18 months. Please don&apos;t submit confidential information or any data you
+        wouldn&apos;t want a reviewer to see or Google to use to improve our products, services and
         machine-learning technologies.
       </Text>
       <Newline />
@@ -123,13 +108,10 @@ export const CloudFreePrivacyNotice = ({
       </Box>
       <Newline />
       <Text>
-        <Text color={theme.text.link}>[1]</Text>{' '}
-        https://policies.google.com/privacy
+        <Text color={theme.text.link}>[1]</Text> https://policies.google.com/privacy
       </Text>
       <Newline />
-      <Text color={theme.text.secondary}>
-        Press Enter to choose an option and exit.
-      </Text>
+      <Text color={theme.text.secondary}>Press Enter to choose an option and exit.</Text>
     </Box>
   );
 };
diff --git a/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.test.tsx b/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.test.tsx
index 0aab0e18c..017bf2043 100644
--- a/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.test.tsx
+++ b/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.test.tsx
@@ -4,38 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { CloudPaidPrivacyNotice } from './CloudPaidPrivacyNotice.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { CloudPaidPrivacyNotice } from "./CloudPaidPrivacyNotice.js";
 
 // Mocks
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
 const mockedUseKeypress = useKeypress as Mock;
 
-describe('CloudPaidPrivacyNotice', () => {
+describe("CloudPaidPrivacyNotice", () => {
   const onExit = vi.fn();
 
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  it('renders correctly', () => {
+  it("renders correctly", () => {
     const { lastFrame } = render(<CloudPaidPrivacyNotice onExit={onExit} />);
 
-    expect(lastFrame()).toContain('Vertex AI Notice');
-    expect(lastFrame()).toContain('Service Specific Terms');
-    expect(lastFrame()).toContain('Press Esc to exit');
+    expect(lastFrame()).toContain("Vertex AI Notice");
+    expect(lastFrame()).toContain("Service Specific Terms");
+    expect(lastFrame()).toContain("Press Esc to exit");
   });
 
-  it('exits on Escape', () => {
+  it("exits on Escape", () => {
     render(<CloudPaidPrivacyNotice onExit={onExit} />);
 
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
-    keypressHandler({ name: 'escape' });
+    keypressHandler({ name: "escape" });
 
     expect(onExit).toHaveBeenCalled();
   });
diff --git a/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.tsx b/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.tsx
index ce640308e..cb646f85a 100644
--- a/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.tsx
+++ b/packages/ui-gemini/src/ui/privacy/CloudPaidPrivacyNotice.tsx
@@ -4,20 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Newline, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import { Box, Newline, Text } from "ink";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 interface CloudPaidPrivacyNoticeProps {
   onExit: () => void;
 }
 
-export const CloudPaidPrivacyNotice = ({
-  onExit,
-}: CloudPaidPrivacyNoticeProps) => {
+export const CloudPaidPrivacyNotice = ({ onExit }: CloudPaidPrivacyNoticeProps) => {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onExit();
       }
     },
@@ -31,26 +29,22 @@ export const CloudPaidPrivacyNotice = ({
       </Text>
       <Newline />
       <Text color={theme.text.primary}>
-        Service Specific Terms<Text color={theme.text.link}>[1]</Text> are
-        incorporated into the agreement under which Google has agreed to provide
-        Google Cloud Platform<Text color={theme.status.success}>[2]</Text> to
-        Customer (the “Agreement”). If the Agreement authorizes the resale or
-        supply of Google Cloud Platform under a Google Cloud partner or reseller
-        program, then except for in the section entitled “Partner-Specific
-        Terms”, all references to Customer in the Service Specific Terms mean
-        Partner or Reseller (as applicable), and all references to Customer Data
-        in the Service Specific Terms mean Partner Data. Capitalized terms used
-        but not defined in the Service Specific Terms have the meaning given to
-        them in the Agreement.
+        Service Specific Terms<Text color={theme.text.link}>[1]</Text> are incorporated into the
+        agreement under which Google has agreed to provide Google Cloud Platform
+        <Text color={theme.status.success}>[2]</Text> to Customer (the “Agreement”). If the
+        Agreement authorizes the resale or supply of Google Cloud Platform under a Google Cloud
+        partner or reseller program, then except for in the section entitled “Partner-Specific
+        Terms”, all references to Customer in the Service Specific Terms mean Partner or Reseller
+        (as applicable), and all references to Customer Data in the Service Specific Terms mean
+        Partner Data. Capitalized terms used but not defined in the Service Specific Terms have the
+        meaning given to them in the Agreement.
       </Text>
       <Newline />
       <Text color={theme.text.primary}>
-        <Text color={theme.text.link}>[1]</Text>{' '}
-        https://cloud.google.com/terms/service-terms
+        <Text color={theme.text.link}>[1]</Text> https://cloud.google.com/terms/service-terms
       </Text>
       <Text color={theme.text.primary}>
-        <Text color={theme.status.success}>[2]</Text>{' '}
-        https://cloud.google.com/terms/services
+        <Text color={theme.status.success}>[2]</Text> https://cloud.google.com/terms/services
       </Text>
       <Newline />
       <Text color={theme.text.secondary}>Press Esc to exit.</Text>
diff --git a/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.test.tsx b/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.test.tsx
index 3548aaa61..93c78129b 100644
--- a/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.test.tsx
+++ b/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.test.tsx
@@ -4,38 +4,38 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
-import { GeminiPrivacyNotice } from './GeminiPrivacyNotice.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { GeminiPrivacyNotice } from "./GeminiPrivacyNotice.js";
 
 // Mocks
-vi.mock('../hooks/useKeypress.js', () => ({
+vi.mock("../hooks/useKeypress.js", () => ({
   useKeypress: vi.fn(),
 }));
 
 const mockedUseKeypress = useKeypress as Mock;
 
-describe('GeminiPrivacyNotice', () => {
+describe("GeminiPrivacyNotice", () => {
   const onExit = vi.fn();
 
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  it('renders correctly', () => {
+  it("renders correctly", () => {
     const { lastFrame } = render(<GeminiPrivacyNotice onExit={onExit} />);
 
-    expect(lastFrame()).toContain('Gemini API Key Notice');
-    expect(lastFrame()).toContain('By using the Gemini API');
-    expect(lastFrame()).toContain('Press Esc to exit');
+    expect(lastFrame()).toContain("Gemini API Key Notice");
+    expect(lastFrame()).toContain("By using the Gemini API");
+    expect(lastFrame()).toContain("Press Esc to exit");
   });
 
-  it('exits on Escape', () => {
+  it("exits on Escape", () => {
     render(<GeminiPrivacyNotice onExit={onExit} />);
 
     const keypressHandler = mockedUseKeypress.mock.calls[0][0];
-    keypressHandler({ name: 'escape' });
+    keypressHandler({ name: "escape" });
 
     expect(onExit).toHaveBeenCalled();
   });
diff --git a/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.tsx b/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.tsx
index 1f4015b5c..06b0dfa51 100644
--- a/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.tsx
+++ b/packages/ui-gemini/src/ui/privacy/GeminiPrivacyNotice.tsx
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Newline, Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { useKeypress } from '../hooks/useKeypress.js';
+import { Box, Newline, Text } from "ink";
+import { useKeypress } from "../hooks/useKeypress.js";
+import { theme } from "../semantic-colors.js";
 
 interface GeminiPrivacyNoticeProps {
   onExit: () => void;
@@ -15,7 +15,7 @@ interface GeminiPrivacyNoticeProps {
 export const GeminiPrivacyNotice = ({ onExit }: GeminiPrivacyNoticeProps) => {
   useKeypress(
     (key) => {
-      if (key.name === 'escape') {
+      if (key.name === "escape") {
         onExit();
       }
     },
@@ -29,31 +29,26 @@ export const GeminiPrivacyNotice = ({ onExit }: GeminiPrivacyNoticeProps) => {
       </Text>
       <Newline />
       <Text color={theme.text.primary}>
-        By using the Gemini API<Text color={theme.text.link}>[1]</Text>, Google
-        AI Studio
-        <Text color={theme.status.error}>[2]</Text>, and the other Google
-        developer services that reference these terms (collectively, the
-        &quot;APIs&quot; or &quot;Services&quot;), you are agreeing to Google
-        APIs Terms of Service (the &quot;API Terms&quot;)
-        <Text color={theme.status.success}>[3]</Text>, and the Gemini API
-        Additional Terms of Service (the &quot;Additional Terms&quot;)
+        By using the Gemini API<Text color={theme.text.link}>[1]</Text>, Google AI Studio
+        <Text color={theme.status.error}>[2]</Text>, and the other Google developer services that
+        reference these terms (collectively, the &quot;APIs&quot; or &quot;Services&quot;), you are
+        agreeing to Google APIs Terms of Service (the &quot;API Terms&quot;)
+        <Text color={theme.status.success}>[3]</Text>, and the Gemini API Additional Terms of
+        Service (the &quot;Additional Terms&quot;)
         <Text color={theme.text.accent}>[4]</Text>.
       </Text>
       <Newline />
       <Text color={theme.text.primary}>
-        <Text color={theme.text.link}>[1]</Text>{' '}
-        https://ai.google.dev/docs/gemini_api_overview
+        <Text color={theme.text.link}>[1]</Text> https://ai.google.dev/docs/gemini_api_overview
       </Text>
       <Text color={theme.text.primary}>
         <Text color={theme.status.error}>[2]</Text> https://aistudio.google.com/
       </Text>
       <Text color={theme.text.primary}>
-        <Text color={theme.status.success}>[3]</Text>{' '}
-        https://developers.google.com/terms
+        <Text color={theme.status.success}>[3]</Text> https://developers.google.com/terms
       </Text>
       <Text color={theme.text.primary}>
-        <Text color={theme.text.accent}>[4]</Text>{' '}
-        https://ai.google.dev/gemini-api/terms
+        <Text color={theme.text.accent}>[4]</Text> https://ai.google.dev/gemini-api/terms
       </Text>
       <Newline />
       <Text color={theme.text.secondary}>Press Esc to exit.</Text>
diff --git a/packages/ui-gemini/src/ui/privacy/PrivacyNotice.test.tsx b/packages/ui-gemini/src/ui/privacy/PrivacyNotice.test.tsx
index d07726658..47a6d4da1 100644
--- a/packages/ui-gemini/src/ui/privacy/PrivacyNotice.test.tsx
+++ b/packages/ui-gemini/src/ui/privacy/PrivacyNotice.test.tsx
@@ -4,38 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { render } from '../../test-utils/render.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { PrivacyNotice } from './PrivacyNotice.js';
-import type {
-  AuthType,
-  Config,
-  ContentGeneratorConfig,
-} from '@airiscode/gemini-cli-core';
+import type { AuthType, Config, ContentGeneratorConfig } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { render } from "../../test-utils/render.js";
+import { PrivacyNotice } from "./PrivacyNotice.js";
 
 // Mock child components
-vi.mock('./GeminiPrivacyNotice.js', async () => {
-  const { Text } = await import('ink');
+vi.mock("./GeminiPrivacyNotice.js", async () => {
+  const { Text } = await import("ink");
   return {
     GeminiPrivacyNotice: () => <Text>GeminiPrivacyNotice</Text>,
   };
 });
 
-vi.mock('./CloudPaidPrivacyNotice.js', async () => {
-  const { Text } = await import('ink');
+vi.mock("./CloudPaidPrivacyNotice.js", async () => {
+  const { Text } = await import("ink");
   return {
     CloudPaidPrivacyNotice: () => <Text>CloudPaidPrivacyNotice</Text>,
   };
 });
 
-vi.mock('./CloudFreePrivacyNotice.js', async () => {
-  const { Text } = await import('ink');
+vi.mock("./CloudFreePrivacyNotice.js", async () => {
+  const { Text } = await import("ink");
   return {
     CloudFreePrivacyNotice: () => <Text>CloudFreePrivacyNotice</Text>,
   };
 });
 
-describe('PrivacyNotice', () => {
+describe("PrivacyNotice", () => {
   const onExit = vi.fn();
   const mockConfig = {
     getContentGeneratorConfig: vi.fn(),
@@ -47,33 +43,28 @@ describe('PrivacyNotice', () => {
 
   it.each([
     {
-      authType: 'gemini-api-key' as AuthType,
-      expectedComponent: 'GeminiPrivacyNotice',
+      authType: "gemini-api-key" as AuthType,
+      expectedComponent: "GeminiPrivacyNotice",
     },
     {
-      authType: 'vertex-ai' as AuthType,
-      expectedComponent: 'CloudPaidPrivacyNotice',
+      authType: "vertex-ai" as AuthType,
+      expectedComponent: "CloudPaidPrivacyNotice",
     },
     {
-      authType: 'oauth-personal' as AuthType,
-      expectedComponent: 'CloudFreePrivacyNotice',
+      authType: "oauth-personal" as AuthType,
+      expectedComponent: "CloudFreePrivacyNotice",
     },
     {
-      authType: 'UNKNOWN' as AuthType,
-      expectedComponent: 'CloudFreePrivacyNotice',
+      authType: "UNKNOWN" as AuthType,
+      expectedComponent: "CloudFreePrivacyNotice",
     },
-  ])(
-    'renders $expectedComponent when authType is $authType',
-    ({ authType, expectedComponent }) => {
-      vi.mocked(mockConfig.getContentGeneratorConfig).mockReturnValue({
-        authType,
-      } as unknown as ContentGeneratorConfig);
+  ])("renders $expectedComponent when authType is $authType", ({ authType, expectedComponent }) => {
+    vi.mocked(mockConfig.getContentGeneratorConfig).mockReturnValue({
+      authType,
+    } as unknown as ContentGeneratorConfig);
 
-      const { lastFrame } = render(
-        <PrivacyNotice config={mockConfig} onExit={onExit} />,
-      );
+    const { lastFrame } = render(<PrivacyNotice config={mockConfig} onExit={onExit} />);
 
-      expect(lastFrame()).toContain(expectedComponent);
-    },
-  );
+    expect(lastFrame()).toContain(expectedComponent);
+  });
 });
diff --git a/packages/ui-gemini/src/ui/privacy/PrivacyNotice.tsx b/packages/ui-gemini/src/ui/privacy/PrivacyNotice.tsx
index e6dd90a80..1dff5a594 100644
--- a/packages/ui-gemini/src/ui/privacy/PrivacyNotice.tsx
+++ b/packages/ui-gemini/src/ui/privacy/PrivacyNotice.tsx
@@ -4,24 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box } from 'ink';
-import { type Config, AuthType } from '@airiscode/gemini-cli-core';
-import { GeminiPrivacyNotice } from './GeminiPrivacyNotice.js';
-import { CloudPaidPrivacyNotice } from './CloudPaidPrivacyNotice.js';
-import { CloudFreePrivacyNotice } from './CloudFreePrivacyNotice.js';
+import { AuthType, type Config } from "@airiscode/gemini-cli-core";
+import { Box } from "ink";
+import { CloudFreePrivacyNotice } from "./CloudFreePrivacyNotice.js";
+import { CloudPaidPrivacyNotice } from "./CloudPaidPrivacyNotice.js";
+import { GeminiPrivacyNotice } from "./GeminiPrivacyNotice.js";
 
 interface PrivacyNoticeProps {
   onExit: () => void;
   config: Config;
 }
 
-const PrivacyNoticeText = ({
-  config,
-  onExit,
-}: {
-  config: Config;
-  onExit: () => void;
-}) => {
+const PrivacyNoticeText = ({ config, onExit }: { config: Config; onExit: () => void }) => {
   const authType = config.getContentGeneratorConfig()?.authType;
 
   switch (authType) {
diff --git a/packages/ui-gemini/src/ui/semantic-colors.ts b/packages/ui-gemini/src/ui/semantic-colors.ts
index 88e75833f..b16489df0 100644
--- a/packages/ui-gemini/src/ui/semantic-colors.ts
+++ b/packages/ui-gemini/src/ui/semantic-colors.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { themeManager } from './themes/theme-manager.js';
-import type { SemanticColors } from './themes/semantic-tokens.js';
+import type { SemanticColors } from "./themes/semantic-tokens.js";
+import { themeManager } from "./themes/theme-manager.js";
 
 export const theme: SemanticColors = {
   get text() {
diff --git a/packages/ui-gemini/src/ui/state/extensions.test.ts b/packages/ui-gemini/src/ui/state/extensions.test.ts
index 191995534..7c2ffd2bc 100644
--- a/packages/ui-gemini/src/ui/state/extensions.test.ts
+++ b/packages/ui-gemini/src/ui/state/extensions.test.ts
@@ -4,43 +4,40 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
-  extensionUpdatesReducer,
-  type ExtensionUpdatesState,
   ExtensionUpdateState,
+  type ExtensionUpdatesState,
+  extensionUpdatesReducer,
   initialExtensionUpdatesState,
-} from './extensions.js';
+} from "./extensions.js";
 
-describe('extensionUpdatesReducer', () => {
-  describe('SET_STATE', () => {
+describe("extensionUpdatesReducer", () => {
+  describe("SET_STATE", () => {
     it.each([
       ExtensionUpdateState.UPDATE_AVAILABLE,
       ExtensionUpdateState.UPDATED,
       ExtensionUpdateState.ERROR,
-    ])('should handle SET_STATE action for state: %s', (state) => {
+    ])("should handle SET_STATE action for state: %s", (state) => {
       const action = {
-        type: 'SET_STATE' as const,
-        payload: { name: 'ext1', state },
+        type: "SET_STATE" as const,
+        payload: { name: "ext1", state },
       };
 
-      const newState = extensionUpdatesReducer(
-        initialExtensionUpdatesState,
-        action,
-      );
+      const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
 
-      expect(newState.extensionStatuses.get('ext1')).toEqual({
+      expect(newState.extensionStatuses.get("ext1")).toEqual({
         status: state,
         notified: false,
       });
     });
 
-    it('should not update state if SET_STATE payload is identical to existing state', () => {
+    it("should not update state if SET_STATE payload is identical to existing state", () => {
       const initialState: ExtensionUpdatesState = {
         ...initialExtensionUpdatesState,
         extensionStatuses: new Map([
           [
-            'ext1',
+            "ext1",
             {
               status: ExtensionUpdateState.UPDATE_AVAILABLE,
               notified: false,
@@ -50,8 +47,8 @@ describe('extensionUpdatesReducer', () => {
       };
 
       const action = {
-        type: 'SET_STATE' as const,
-        payload: { name: 'ext1', state: ExtensionUpdateState.UPDATE_AVAILABLE },
+        type: "SET_STATE" as const,
+        payload: { name: "ext1", state: ExtensionUpdateState.UPDATE_AVAILABLE },
       };
 
       const newState = extensionUpdatesReducer(initialState, action);
@@ -60,43 +57,40 @@ describe('extensionUpdatesReducer', () => {
     });
   });
 
-  describe('SET_NOTIFIED', () => {
-    it.each([true, false])(
-      'should handle SET_NOTIFIED action with notified: %s',
-      (notified) => {
-        const initialState: ExtensionUpdatesState = {
-          ...initialExtensionUpdatesState,
-          extensionStatuses: new Map([
-            [
-              'ext1',
-              {
-                status: ExtensionUpdateState.UPDATE_AVAILABLE,
-                notified: !notified,
-              },
-            ],
-          ]),
-        };
-
-        const action = {
-          type: 'SET_NOTIFIED' as const,
-          payload: { name: 'ext1', notified },
-        };
-
-        const newState = extensionUpdatesReducer(initialState, action);
-
-        expect(newState.extensionStatuses.get('ext1')).toEqual({
-          status: ExtensionUpdateState.UPDATE_AVAILABLE,
-          notified,
-        });
-      },
-    );
-
-    it('should not update state if SET_NOTIFIED payload is identical to existing state', () => {
+  describe("SET_NOTIFIED", () => {
+    it.each([true, false])("should handle SET_NOTIFIED action with notified: %s", (notified) => {
+      const initialState: ExtensionUpdatesState = {
+        ...initialExtensionUpdatesState,
+        extensionStatuses: new Map([
+          [
+            "ext1",
+            {
+              status: ExtensionUpdateState.UPDATE_AVAILABLE,
+              notified: !notified,
+            },
+          ],
+        ]),
+      };
+
+      const action = {
+        type: "SET_NOTIFIED" as const,
+        payload: { name: "ext1", notified },
+      };
+
+      const newState = extensionUpdatesReducer(initialState, action);
+
+      expect(newState.extensionStatuses.get("ext1")).toEqual({
+        status: ExtensionUpdateState.UPDATE_AVAILABLE,
+        notified,
+      });
+    });
+
+    it("should not update state if SET_NOTIFIED payload is identical to existing state", () => {
       const initialState: ExtensionUpdatesState = {
         ...initialExtensionUpdatesState,
         extensionStatuses: new Map([
           [
-            'ext1',
+            "ext1",
             {
               status: ExtensionUpdateState.UPDATE_AVAILABLE,
               notified: true,
@@ -106,8 +100,8 @@ describe('extensionUpdatesReducer', () => {
       };
 
       const action = {
-        type: 'SET_NOTIFIED' as const,
-        payload: { name: 'ext1', notified: true },
+        type: "SET_NOTIFIED" as const,
+        payload: { name: "ext1", notified: true },
       };
 
       const newState = extensionUpdatesReducer(initialState, action);
@@ -115,82 +109,73 @@ describe('extensionUpdatesReducer', () => {
       expect(newState).toBe(initialState);
     });
 
-    it('should ignore SET_NOTIFIED if extension does not exist', () => {
+    it("should ignore SET_NOTIFIED if extension does not exist", () => {
       const action = {
-        type: 'SET_NOTIFIED' as const,
-        payload: { name: 'non-existent', notified: true },
+        type: "SET_NOTIFIED" as const,
+        payload: { name: "non-existent", notified: true },
       };
 
-      const newState = extensionUpdatesReducer(
-        initialExtensionUpdatesState,
-        action,
-      );
+      const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
 
       expect(newState).toBe(initialExtensionUpdatesState);
     });
   });
 
-  describe('Batch Checks', () => {
-    it('should handle BATCH_CHECK_START action', () => {
-      const action = { type: 'BATCH_CHECK_START' as const };
-      const newState = extensionUpdatesReducer(
-        initialExtensionUpdatesState,
-        action,
-      );
+  describe("Batch Checks", () => {
+    it("should handle BATCH_CHECK_START action", () => {
+      const action = { type: "BATCH_CHECK_START" as const };
+      const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
       expect(newState.batchChecksInProgress).toBe(1);
     });
 
-    it('should handle BATCH_CHECK_END action', () => {
+    it("should handle BATCH_CHECK_END action", () => {
       const initialState = {
         ...initialExtensionUpdatesState,
         batchChecksInProgress: 1,
       };
-      const action = { type: 'BATCH_CHECK_END' as const };
+      const action = { type: "BATCH_CHECK_END" as const };
       const newState = extensionUpdatesReducer(initialState, action);
       expect(newState.batchChecksInProgress).toBe(0);
     });
   });
 
-  describe('Scheduled Updates', () => {
-    it('should handle SCHEDULE_UPDATE action', () => {
+  describe("Scheduled Updates", () => {
+    it("should handle SCHEDULE_UPDATE action", () => {
       const callback = () => {};
       const action = {
-        type: 'SCHEDULE_UPDATE' as const,
+        type: "SCHEDULE_UPDATE" as const,
         payload: {
-          names: ['ext1'],
+          names: ["ext1"],
           all: false,
           onComplete: callback,
         },
       };
 
-      const newState = extensionUpdatesReducer(
-        initialExtensionUpdatesState,
-        action,
-      );
+      const newState = extensionUpdatesReducer(initialExtensionUpdatesState, action);
 
       expect(newState.scheduledUpdate).toEqual({
-        names: ['ext1'],
+        names: ["ext1"],
         all: false,
         onCompleteCallbacks: [callback],
       });
     });
 
-    it('should merge SCHEDULE_UPDATE with existing scheduled update', () => {
+    it("should merge SCHEDULE_UPDATE with existing scheduled update", () => {
       const callback1 = () => {};
       const callback2 = () => {};
       const initialState: ExtensionUpdatesState = {
         ...initialExtensionUpdatesState,
         scheduledUpdate: {
-          names: ['ext1'],
+          names: ["ext1"],
           all: false,
           onCompleteCallbacks: [callback1],
         },
       };
 
       const action = {
-        type: 'SCHEDULE_UPDATE' as const,
+        type: "SCHEDULE_UPDATE" as const,
         payload: {
-          names: ['ext2'],
+          names: ["ext2"],
           all: true,
           onComplete: callback2,
         },
@@ -199,36 +184,36 @@ describe('extensionUpdatesReducer', () => {
       const newState = extensionUpdatesReducer(initialState, action);
 
       expect(newState.scheduledUpdate).toEqual({
-        names: ['ext1', 'ext2'],
+        names: ["ext1", "ext2"],
         all: true, // Should be true if any update is all: true
         onCompleteCallbacks: [callback1, callback2],
       });
     });
 
-    it('should handle CLEAR_SCHEDULED_UPDATE action', () => {
+    it("should handle CLEAR_SCHEDULED_UPDATE action", () => {
       const initialState: ExtensionUpdatesState = {
         ...initialExtensionUpdatesState,
         scheduledUpdate: {
-          names: ['ext1'],
+          names: ["ext1"],
           all: false,
           onCompleteCallbacks: [],
         },
       };
 
-      const action = { type: 'CLEAR_SCHEDULED_UPDATE' as const };
+      const action = { type: "CLEAR_SCHEDULED_UPDATE" as const };
       const newState = extensionUpdatesReducer(initialState, action);
 
       expect(newState.scheduledUpdate).toBeNull();
     });
   });
 
-  describe('RESTARTED', () => {
-    it('should handle RESTARTED action', () => {
+  describe("RESTARTED", () => {
+    it("should handle RESTARTED action", () => {
       const initialState: ExtensionUpdatesState = {
         ...initialExtensionUpdatesState,
         extensionStatuses: new Map([
           [
-            'ext1',
+            "ext1",
             {
               status: ExtensionUpdateState.UPDATED_NEEDS_RESTART,
               notified: true,
@@ -238,24 +223,24 @@ describe('extensionUpdatesReducer', () => {
       };
 
       const action = {
-        type: 'RESTARTED' as const,
-        payload: { name: 'ext1' },
+        type: "RESTARTED" as const,
+        payload: { name: "ext1" },
       };
 
       const newState = extensionUpdatesReducer(initialState, action);
 
-      expect(newState.extensionStatuses.get('ext1')).toEqual({
+      expect(newState.extensionStatuses.get("ext1")).toEqual({
         status: ExtensionUpdateState.UPDATED,
         notified: true,
       });
     });
 
-    it('should not change state for RESTARTED action if status is not UPDATED_NEEDS_RESTART', () => {
+    it("should not change state for RESTARTED action if status is not UPDATED_NEEDS_RESTART", () => {
       const initialState: ExtensionUpdatesState = {
         ...initialExtensionUpdatesState,
         extensionStatuses: new Map([
           [
-            'ext1',
+            "ext1",
             {
               status: ExtensionUpdateState.UPDATED,
               notified: true,
@@ -265,8 +250,8 @@ describe('extensionUpdatesReducer', () => {
       };
 
       const action = {
-        type: 'RESTARTED' as const,
-        payload: { name: 'ext1' },
+        type: "RESTARTED" as const,
+        payload: { name: "ext1" },
       };
 
       const newState = extensionUpdatesReducer(initialState, action);
diff --git a/packages/ui-gemini/src/ui/state/extensions.ts b/packages/ui-gemini/src/ui/state/extensions.ts
index 7e7cc83c7..dd96995e7 100644
--- a/packages/ui-gemini/src/ui/state/extensions.ts
+++ b/packages/ui-gemini/src/ui/state/extensions.ts
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExtensionUpdateInfo } from '../../config/extension.js';
-import { checkExhaustive } from '../../utils/checks.js';
+import type { ExtensionUpdateInfo } from "../../config/extension.js";
+import { checkExhaustive } from "../../utils/checks.js";
 
 export enum ExtensionUpdateState {
-  CHECKING_FOR_UPDATES = 'checking for updates',
-  UPDATED_NEEDS_RESTART = 'updated, needs restart',
-  UPDATED = 'updated',
-  UPDATING = 'updating',
-  UPDATE_AVAILABLE = 'update available',
-  UP_TO_DATE = 'up to date',
-  ERROR = 'error',
-  NOT_UPDATABLE = 'not updatable',
-  UNKNOWN = 'unknown',
+  CHECKING_FOR_UPDATES = "checking for updates",
+  UPDATED_NEEDS_RESTART = "updated, needs restart",
+  UPDATED = "updated",
+  UPDATING = "updating",
+  UPDATE_AVAILABLE = "update available",
+  UP_TO_DATE = "up to date",
+  ERROR = "error",
+  NOT_UPDATABLE = "not updatable",
+  UNKNOWN = "unknown",
 }
 
 export interface ExtensionUpdateStatus {
@@ -53,25 +53,25 @@ export const initialExtensionUpdatesState: ExtensionUpdatesState = {
 
 export type ExtensionUpdateAction =
   | {
-      type: 'SET_STATE';
+      type: "SET_STATE";
       payload: { name: string; state: ExtensionUpdateState };
     }
   | {
-      type: 'SET_NOTIFIED';
+      type: "SET_NOTIFIED";
       payload: { name: string; notified: boolean };
     }
-  | { type: 'BATCH_CHECK_START' }
-  | { type: 'BATCH_CHECK_END' }
-  | { type: 'SCHEDULE_UPDATE'; payload: ScheduleUpdateArgs }
-  | { type: 'CLEAR_SCHEDULED_UPDATE' }
-  | { type: 'RESTARTED'; payload: { name: string } };
+  | { type: "BATCH_CHECK_START" }
+  | { type: "BATCH_CHECK_END" }
+  | { type: "SCHEDULE_UPDATE"; payload: ScheduleUpdateArgs }
+  | { type: "CLEAR_SCHEDULED_UPDATE" }
+  | { type: "RESTARTED"; payload: { name: string } };
 
 export function extensionUpdatesReducer(
   state: ExtensionUpdatesState,
   action: ExtensionUpdateAction,
 ): ExtensionUpdatesState {
   switch (action.type) {
-    case 'SET_STATE': {
+    case "SET_STATE": {
       const existing = state.extensionStatuses.get(action.payload.name);
       if (existing?.status === action.payload.state) {
         return state;
@@ -83,7 +83,7 @@ export function extensionUpdatesReducer(
       });
       return { ...state, extensionStatuses: newStatuses };
     }
-    case 'SET_NOTIFIED': {
+    case "SET_NOTIFIED": {
       const existing = state.extensionStatuses.get(action.payload.name);
       if (!existing || existing.notified === action.payload.notified) {
         return state;
@@ -95,38 +95,35 @@ export function extensionUpdatesReducer(
       });
       return { ...state, extensionStatuses: newStatuses };
     }
-    case 'BATCH_CHECK_START':
+    case "BATCH_CHECK_START":
       return {
         ...state,
         batchChecksInProgress: state.batchChecksInProgress + 1,
       };
-    case 'BATCH_CHECK_END':
+    case "BATCH_CHECK_END":
       return {
         ...state,
         batchChecksInProgress: state.batchChecksInProgress - 1,
       };
-    case 'SCHEDULE_UPDATE':
+    case "SCHEDULE_UPDATE":
       return {
         ...state,
         // If there is a pre-existing scheduled update, we merge them.
         scheduledUpdate: {
           all: state.scheduledUpdate?.all || action.payload.all,
-          names: [
-            ...(state.scheduledUpdate?.names ?? []),
-            ...(action.payload.names ?? []),
-          ],
+          names: [...(state.scheduledUpdate?.names ?? []), ...(action.payload.names ?? [])],
           onCompleteCallbacks: [
             ...(state.scheduledUpdate?.onCompleteCallbacks ?? []),
             action.payload.onComplete,
           ],
         },
       };
-    case 'CLEAR_SCHEDULED_UPDATE':
+    case "CLEAR_SCHEDULED_UPDATE":
       return {
         ...state,
         scheduledUpdate: null,
       };
-    case 'RESTARTED': {
+    case "RESTARTED": {
       const existing = state.extensionStatuses.get(action.payload.name);
       if (existing?.status !== ExtensionUpdateState.UPDATED_NEEDS_RESTART) {
         return state;
diff --git a/packages/ui-gemini/src/ui/textConstants.ts b/packages/ui-gemini/src/ui/textConstants.ts
index 53236cfed..c71f2cded 100644
--- a/packages/ui-gemini/src/ui/textConstants.ts
+++ b/packages/ui-gemini/src/ui/textConstants.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const SCREEN_READER_USER_PREFIX = 'User: ';
+export const SCREEN_READER_USER_PREFIX = "User: ";
 
-export const SCREEN_READER_MODEL_PREFIX = 'Model: ';
+export const SCREEN_READER_MODEL_PREFIX = "Model: ";
 
-export const SCREEN_READER_LOADING = 'loading';
+export const SCREEN_READER_LOADING = "loading";
 
-export const SCREEN_READER_RESPONDING = 'responding';
+export const SCREEN_READER_RESPONDING = "responding";
diff --git a/packages/ui-gemini/src/ui/themes/ansi-light.ts b/packages/ui-gemini/src/ui/themes/ansi-light.ts
index 95807064e..6e1580f93 100644
--- a/packages/ui-gemini/src/ui/themes/ansi-light.ts
+++ b/packages/ui-gemini/src/ui/themes/ansi-light.ts
@@ -4,146 +4,146 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { lightSemanticColors } from './semantic-tokens.js';
+import { lightSemanticColors } from "./semantic-tokens.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ansiLightColors: ColorsTheme = {
-  type: 'light',
-  Background: 'white',
-  Foreground: '#444',
-  LightBlue: 'blue',
-  AccentBlue: 'blue',
-  AccentPurple: 'purple',
-  AccentCyan: 'cyan',
-  AccentGreen: 'green',
-  AccentYellow: 'orange',
-  AccentRed: 'red',
-  DiffAdded: '#E5F2E5',
-  DiffRemoved: '#FFE5E5',
-  Comment: 'gray',
-  Gray: 'gray',
-  DarkGray: 'gray',
-  GradientColors: ['blue', 'green'],
+  type: "light",
+  Background: "white",
+  Foreground: "#444",
+  LightBlue: "blue",
+  AccentBlue: "blue",
+  AccentPurple: "purple",
+  AccentCyan: "cyan",
+  AccentGreen: "green",
+  AccentYellow: "orange",
+  AccentRed: "red",
+  DiffAdded: "#E5F2E5",
+  DiffRemoved: "#FFE5E5",
+  Comment: "gray",
+  Gray: "gray",
+  DarkGray: "gray",
+  GradientColors: ["blue", "green"],
 };
 
 export const ANSILight: Theme = new Theme(
-  'ANSI Light',
-  'light',
+  "ANSI Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
-      background: 'white',
-      color: 'black',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
+      background: "white",
+      color: "black",
     },
-    'hljs-keyword': {
-      color: 'blue',
+    "hljs-keyword": {
+      color: "blue",
     },
-    'hljs-literal': {
-      color: 'blue',
+    "hljs-literal": {
+      color: "blue",
     },
-    'hljs-symbol': {
-      color: 'blue',
+    "hljs-symbol": {
+      color: "blue",
     },
-    'hljs-name': {
-      color: 'blue',
+    "hljs-name": {
+      color: "blue",
     },
-    'hljs-link': {
-      color: 'blue',
+    "hljs-link": {
+      color: "blue",
     },
-    'hljs-built_in': {
-      color: 'cyan',
+    "hljs-built_in": {
+      color: "cyan",
     },
-    'hljs-type': {
-      color: 'cyan',
+    "hljs-type": {
+      color: "cyan",
     },
-    'hljs-number': {
-      color: 'green',
+    "hljs-number": {
+      color: "green",
     },
-    'hljs-class': {
-      color: 'green',
+    "hljs-class": {
+      color: "green",
     },
-    'hljs-string': {
-      color: 'red',
+    "hljs-string": {
+      color: "red",
     },
-    'hljs-meta-string': {
-      color: 'red',
+    "hljs-meta-string": {
+      color: "red",
     },
-    'hljs-regexp': {
-      color: 'magenta',
+    "hljs-regexp": {
+      color: "magenta",
     },
-    'hljs-template-tag': {
-      color: 'magenta',
+    "hljs-template-tag": {
+      color: "magenta",
     },
-    'hljs-subst': {
-      color: 'black',
+    "hljs-subst": {
+      color: "black",
     },
-    'hljs-function': {
-      color: 'black',
+    "hljs-function": {
+      color: "black",
     },
-    'hljs-title': {
-      color: 'black',
+    "hljs-title": {
+      color: "black",
     },
-    'hljs-params': {
-      color: 'black',
+    "hljs-params": {
+      color: "black",
     },
-    'hljs-formula': {
-      color: 'black',
+    "hljs-formula": {
+      color: "black",
     },
-    'hljs-comment': {
-      color: 'gray',
+    "hljs-comment": {
+      color: "gray",
     },
-    'hljs-quote': {
-      color: 'gray',
+    "hljs-quote": {
+      color: "gray",
     },
-    'hljs-doctag': {
-      color: 'gray',
+    "hljs-doctag": {
+      color: "gray",
     },
-    'hljs-meta': {
-      color: 'gray',
+    "hljs-meta": {
+      color: "gray",
     },
-    'hljs-meta-keyword': {
-      color: 'gray',
+    "hljs-meta-keyword": {
+      color: "gray",
     },
-    'hljs-tag': {
-      color: 'gray',
+    "hljs-tag": {
+      color: "gray",
     },
-    'hljs-variable': {
-      color: 'purple',
+    "hljs-variable": {
+      color: "purple",
     },
-    'hljs-template-variable': {
-      color: 'purple',
+    "hljs-template-variable": {
+      color: "purple",
     },
-    'hljs-attr': {
-      color: 'blue',
+    "hljs-attr": {
+      color: "blue",
     },
-    'hljs-attribute': {
-      color: 'blue',
+    "hljs-attribute": {
+      color: "blue",
     },
-    'hljs-builtin-name': {
-      color: 'blue',
+    "hljs-builtin-name": {
+      color: "blue",
     },
-    'hljs-section': {
-      color: 'orange',
+    "hljs-section": {
+      color: "orange",
     },
-    'hljs-bullet': {
-      color: 'orange',
+    "hljs-bullet": {
+      color: "orange",
     },
-    'hljs-selector-tag': {
-      color: 'orange',
+    "hljs-selector-tag": {
+      color: "orange",
     },
-    'hljs-selector-id': {
-      color: 'orange',
+    "hljs-selector-id": {
+      color: "orange",
     },
-    'hljs-selector-class': {
-      color: 'orange',
+    "hljs-selector-class": {
+      color: "orange",
     },
-    'hljs-selector-attr': {
-      color: 'orange',
+    "hljs-selector-attr": {
+      color: "orange",
     },
-    'hljs-selector-pseudo': {
-      color: 'orange',
+    "hljs-selector-pseudo": {
+      color: "orange",
     },
   },
   ansiLightColors,
diff --git a/packages/ui-gemini/src/ui/themes/ansi.ts b/packages/ui-gemini/src/ui/themes/ansi.ts
index 335c9abcf..f4fdcba67 100644
--- a/packages/ui-gemini/src/ui/themes/ansi.ts
+++ b/packages/ui-gemini/src/ui/themes/ansi.ts
@@ -4,155 +4,155 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { darkSemanticColors } from './semantic-tokens.js';
+import { darkSemanticColors } from "./semantic-tokens.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ansiColors: ColorsTheme = {
-  type: 'dark',
-  Background: 'black',
-  Foreground: 'white',
-  LightBlue: 'bluebright',
-  AccentBlue: 'blue',
-  AccentPurple: 'magenta',
-  AccentCyan: 'cyan',
-  AccentGreen: 'green',
-  AccentYellow: 'yellow',
-  AccentRed: 'red',
-  DiffAdded: '#003300',
-  DiffRemoved: '#4D0000',
-  Comment: 'gray',
-  Gray: 'gray',
-  DarkGray: 'gray',
-  GradientColors: ['cyan', 'green'],
+  type: "dark",
+  Background: "black",
+  Foreground: "white",
+  LightBlue: "bluebright",
+  AccentBlue: "blue",
+  AccentPurple: "magenta",
+  AccentCyan: "cyan",
+  AccentGreen: "green",
+  AccentYellow: "yellow",
+  AccentRed: "red",
+  DiffAdded: "#003300",
+  DiffRemoved: "#4D0000",
+  Comment: "gray",
+  Gray: "gray",
+  DarkGray: "gray",
+  GradientColors: ["cyan", "green"],
 };
 
 export const ANSI: Theme = new Theme(
-  'ANSI',
-  'dark', // Consistent with its color palette base
+  "ANSI",
+  "dark", // Consistent with its color palette base
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
-      background: 'black', // Mapped from #1E1E1E
-      color: 'white', // Mapped from #DCDCDC
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
+      background: "black", // Mapped from #1E1E1E
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-keyword': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-keyword": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-literal': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-literal": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-symbol': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-symbol": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-name': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-name": {
+      color: "blue", // Mapped from #569CD6
     },
-    'hljs-link': {
-      color: 'blue', // Mapped from #569CD6
+    "hljs-link": {
+      color: "blue", // Mapped from #569CD6
       // textDecoration is ignored by Theme class
     },
-    'hljs-built_in': {
-      color: 'cyan', // Mapped from #4EC9B0
+    "hljs-built_in": {
+      color: "cyan", // Mapped from #4EC9B0
     },
-    'hljs-type': {
-      color: 'cyan', // Mapped from #4EC9B0
+    "hljs-type": {
+      color: "cyan", // Mapped from #4EC9B0
     },
-    'hljs-number': {
-      color: 'green', // Mapped from #B8D7A3
+    "hljs-number": {
+      color: "green", // Mapped from #B8D7A3
     },
-    'hljs-class': {
-      color: 'green', // Mapped from #B8D7A3
+    "hljs-class": {
+      color: "green", // Mapped from #B8D7A3
     },
-    'hljs-string': {
-      color: 'yellow', // Mapped from #D69D85
+    "hljs-string": {
+      color: "yellow", // Mapped from #D69D85
     },
-    'hljs-meta-string': {
-      color: 'yellow', // Mapped from #D69D85
+    "hljs-meta-string": {
+      color: "yellow", // Mapped from #D69D85
     },
-    'hljs-regexp': {
-      color: 'red', // Mapped from #9A5334
+    "hljs-regexp": {
+      color: "red", // Mapped from #9A5334
     },
-    'hljs-template-tag': {
-      color: 'red', // Mapped from #9A5334
+    "hljs-template-tag": {
+      color: "red", // Mapped from #9A5334
     },
-    'hljs-subst': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-subst": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-function': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-function": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-title': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-title": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-params': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-params": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-formula': {
-      color: 'white', // Mapped from #DCDCDC
+    "hljs-formula": {
+      color: "white", // Mapped from #DCDCDC
     },
-    'hljs-comment': {
-      color: 'green', // Mapped from #57A64A
+    "hljs-comment": {
+      color: "green", // Mapped from #57A64A
       // fontStyle is ignored by Theme class
     },
-    'hljs-quote': {
-      color: 'green', // Mapped from #57A64A
+    "hljs-quote": {
+      color: "green", // Mapped from #57A64A
       // fontStyle is ignored by Theme class
     },
-    'hljs-doctag': {
-      color: 'green', // Mapped from #608B4E
+    "hljs-doctag": {
+      color: "green", // Mapped from #608B4E
     },
-    'hljs-meta': {
-      color: 'gray', // Mapped from #9B9B9B
+    "hljs-meta": {
+      color: "gray", // Mapped from #9B9B9B
     },
-    'hljs-meta-keyword': {
-      color: 'gray', // Mapped from #9B9B9B
+    "hljs-meta-keyword": {
+      color: "gray", // Mapped from #9B9B9B
     },
-    'hljs-tag': {
-      color: 'gray', // Mapped from #9B9B9B
+    "hljs-tag": {
+      color: "gray", // Mapped from #9B9B9B
     },
-    'hljs-variable': {
-      color: 'magenta', // Mapped from #BD63C5
+    "hljs-variable": {
+      color: "magenta", // Mapped from #BD63C5
     },
-    'hljs-template-variable': {
-      color: 'magenta', // Mapped from #BD63C5
+    "hljs-template-variable": {
+      color: "magenta", // Mapped from #BD63C5
     },
-    'hljs-attr': {
-      color: 'bluebright', // Mapped from #9CDCFE
+    "hljs-attr": {
+      color: "bluebright", // Mapped from #9CDCFE
     },
-    'hljs-attribute': {
-      color: 'bluebright', // Mapped from #9CDCFE
+    "hljs-attribute": {
+      color: "bluebright", // Mapped from #9CDCFE
     },
-    'hljs-builtin-name': {
-      color: 'bluebright', // Mapped from #9CDCFE
+    "hljs-builtin-name": {
+      color: "bluebright", // Mapped from #9CDCFE
     },
-    'hljs-section': {
-      color: 'yellow', // Mapped from gold
+    "hljs-section": {
+      color: "yellow", // Mapped from gold
     },
-    'hljs-emphasis': {
+    "hljs-emphasis": {
       // fontStyle is ignored by Theme class
     },
-    'hljs-strong': {
+    "hljs-strong": {
       // fontWeight is ignored by Theme class
     },
-    'hljs-bullet': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-bullet": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-tag': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-tag": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-id': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-id": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-class': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-class": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-attr': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-attr": {
+      color: "yellow", // Mapped from #D7BA7D
     },
-    'hljs-selector-pseudo': {
-      color: 'yellow', // Mapped from #D7BA7D
+    "hljs-selector-pseudo": {
+      color: "yellow", // Mapped from #D7BA7D
     },
   },
   ansiColors,
diff --git a/packages/ui-gemini/src/ui/themes/atom-one-dark.ts b/packages/ui-gemini/src/ui/themes/atom-one-dark.ts
index 5217a8bf3..50326a778 100644
--- a/packages/ui-gemini/src/ui/themes/atom-one-dark.ts
+++ b/packages/ui-gemini/src/ui/themes/atom-one-dark.ts
@@ -4,143 +4,143 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const atomOneDarkColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#282c34',
-  Foreground: '#abb2bf',
-  LightBlue: '#61aeee',
-  AccentBlue: '#61aeee',
-  AccentPurple: '#c678dd',
-  AccentCyan: '#56b6c2',
-  AccentGreen: '#98c379',
-  AccentYellow: '#e6c07b',
-  AccentRed: '#e06c75',
-  DiffAdded: '#39544E',
-  DiffRemoved: '#562B2F',
-  Comment: '#5c6370',
-  Gray: '#5c6370',
-  DarkGray: interpolateColor('#5c6370', '#282c34', 0.5),
-  GradientColors: ['#61aeee', '#98c379'],
+  type: "dark",
+  Background: "#282c34",
+  Foreground: "#abb2bf",
+  LightBlue: "#61aeee",
+  AccentBlue: "#61aeee",
+  AccentPurple: "#c678dd",
+  AccentCyan: "#56b6c2",
+  AccentGreen: "#98c379",
+  AccentYellow: "#e6c07b",
+  AccentRed: "#e06c75",
+  DiffAdded: "#39544E",
+  DiffRemoved: "#562B2F",
+  Comment: "#5c6370",
+  Gray: "#5c6370",
+  DarkGray: interpolateColor("#5c6370", "#282c34", 0.5),
+  GradientColors: ["#61aeee", "#98c379"],
 };
 
 export const AtomOneDark: Theme = new Theme(
-  'Atom One',
-  'dark',
+  "Atom One",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       color: atomOneDarkColors.Foreground,
       background: atomOneDarkColors.Background,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: atomOneDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: atomOneDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: atomOneDarkColors.AccentPurple,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: atomOneDarkColors.AccentPurple,
     },
-    'hljs-formula': {
+    "hljs-formula": {
       color: atomOneDarkColors.AccentPurple,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: atomOneDarkColors.AccentRed,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: atomOneDarkColors.AccentCyan,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: atomOneDarkColors.AccentGreen,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: atomOneDarkColors.AccentYellow,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: atomOneDarkColors.AccentBlue,
-      textDecoration: 'underline',
+      textDecoration: "underline",
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: atomOneDarkColors.AccentBlue,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   atomOneDarkColors,
diff --git a/packages/ui-gemini/src/ui/themes/ayu-light.ts b/packages/ui-gemini/src/ui/themes/ayu-light.ts
index 393ed44ba..d3c42e850 100644
--- a/packages/ui-gemini/src/ui/themes/ayu-light.ts
+++ b/packages/ui-gemini/src/ui/themes/ayu-light.ts
@@ -4,134 +4,134 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ayuLightColors: ColorsTheme = {
-  type: 'light',
-  Background: '#f8f9fa',
-  Foreground: '#5c6166',
-  LightBlue: '#55b4d4',
-  AccentBlue: '#399ee6',
-  AccentPurple: '#a37acc',
-  AccentCyan: '#4cbf99',
-  AccentGreen: '#86b300',
-  AccentYellow: '#f2ae49',
-  AccentRed: '#f07171',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FFCCCC',
-  Comment: '#ABADB1',
-  Gray: '#a6aaaf',
-  DarkGray: interpolateColor('#a6aaaf', '#f8f9fa', 0.5),
-  GradientColors: ['#399ee6', '#86b300'],
+  type: "light",
+  Background: "#f8f9fa",
+  Foreground: "#5c6166",
+  LightBlue: "#55b4d4",
+  AccentBlue: "#399ee6",
+  AccentPurple: "#a37acc",
+  AccentCyan: "#4cbf99",
+  AccentGreen: "#86b300",
+  AccentYellow: "#f2ae49",
+  AccentRed: "#f07171",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FFCCCC",
+  Comment: "#ABADB1",
+  Gray: "#a6aaaf",
+  DarkGray: interpolateColor("#a6aaaf", "#f8f9fa", 0.5),
+  GradientColors: ["#399ee6", "#86b300"],
 };
 
 export const AyuLight: Theme = new Theme(
-  'Ayu Light',
-  'light',
+  "Ayu Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: ayuLightColors.Background,
       color: ayuLightColors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: ayuLightColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: ayuLightColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-string': {
+    "hljs-string": {
       color: ayuLightColors.AccentGreen,
     },
-    'hljs-constant': {
+    "hljs-constant": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: ayuLightColors.AccentPurple,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: ayuLightColors.Foreground,
     },
-    'hljs-variable.language': {
+    "hljs-variable.language": {
       color: ayuLightColors.LightBlue,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-title': {
+    "hljs-title": {
       color: ayuLightColors.AccentBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: ayuLightColors.AccentGreen,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: ayuLightColors.LightBlue,
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: ayuLightColors.AccentBlue,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: ayuLightColors.LightBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: ayuLightColors.AccentBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: ayuLightColors.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: ayuLightColors.LightBlue,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: ayuLightColors.AccentGreen,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: ayuLightColors.AccentRed,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: ayuLightColors.AccentCyan,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: ayuLightColors.AccentRed,
     },
   },
diff --git a/packages/ui-gemini/src/ui/themes/ayu.ts b/packages/ui-gemini/src/ui/themes/ayu.ts
index 71798aacf..bfab3f1fd 100644
--- a/packages/ui-gemini/src/ui/themes/ayu.ts
+++ b/packages/ui-gemini/src/ui/themes/ayu.ts
@@ -4,109 +4,109 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const ayuDarkColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#0b0e14',
-  Foreground: '#aeaca6',
-  LightBlue: '#59C2FF',
-  AccentBlue: '#39BAE6',
-  AccentPurple: '#D2A6FF',
-  AccentCyan: '#95E6CB',
-  AccentGreen: '#AAD94C',
-  AccentYellow: '#FFB454',
-  AccentRed: '#F26D78',
-  DiffAdded: '#293022',
-  DiffRemoved: '#3D1215',
-  Comment: '#646A71',
-  Gray: '#3D4149',
-  DarkGray: interpolateColor('#3D4149', '#0b0e14', 0.5),
-  GradientColors: ['#FFB454', '#F26D78'],
+  type: "dark",
+  Background: "#0b0e14",
+  Foreground: "#aeaca6",
+  LightBlue: "#59C2FF",
+  AccentBlue: "#39BAE6",
+  AccentPurple: "#D2A6FF",
+  AccentCyan: "#95E6CB",
+  AccentGreen: "#AAD94C",
+  AccentYellow: "#FFB454",
+  AccentRed: "#F26D78",
+  DiffAdded: "#293022",
+  DiffRemoved: "#3D1215",
+  Comment: "#646A71",
+  Gray: "#3D4149",
+  DarkGray: interpolateColor("#3D4149", "#0b0e14", 0.5),
+  GradientColors: ["#FFB454", "#F26D78"],
 };
 
 export const AyuDark: Theme = new Theme(
-  'Ayu',
-  'dark',
+  "Ayu",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: ayuDarkColors.Background,
       color: ayuDarkColors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: ayuDarkColors.AccentPurple,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: ayuDarkColors.AccentCyan,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: ayuDarkColors.LightBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: ayuDarkColors.AccentBlue,
     },
-    'hljs-function .hljs-keyword': {
+    "hljs-function .hljs-keyword": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: ayuDarkColors.Foreground,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: ayuDarkColors.AccentGreen,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: ayuDarkColors.AccentBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: ayuDarkColors.AccentGreen,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: ayuDarkColors.Foreground,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: ayuDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: ayuDarkColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: ayuDarkColors.AccentRed,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: ayuDarkColors.AccentYellow,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   ayuDarkColors,
diff --git a/packages/ui-gemini/src/ui/themes/color-utils.test.ts b/packages/ui-gemini/src/ui/themes/color-utils.test.ts
index d35fcb183..1db479a91 100644
--- a/packages/ui-gemini/src/ui/themes/color-utils.test.ts
+++ b/packages/ui-gemini/src/ui/themes/color-utils.test.ts
@@ -4,199 +4,199 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
-  isValidColor,
-  resolveColor,
-  interpolateColor,
   CSS_NAME_TO_HEX_MAP,
   INK_SUPPORTED_NAMES,
-} from './color-utils.js';
-
-describe('Color Utils', () => {
-  describe('isValidColor', () => {
-    it('should validate hex colors', () => {
-      expect(isValidColor('#ff0000')).toBe(true);
-      expect(isValidColor('#00ff00')).toBe(true);
-      expect(isValidColor('#0000ff')).toBe(true);
-      expect(isValidColor('#fff')).toBe(true);
-      expect(isValidColor('#000')).toBe(true);
-      expect(isValidColor('#FF0000')).toBe(true); // Case insensitive
-    });
-
-    it('should validate Ink-supported color names', () => {
-      expect(isValidColor('black')).toBe(true);
-      expect(isValidColor('red')).toBe(true);
-      expect(isValidColor('green')).toBe(true);
-      expect(isValidColor('yellow')).toBe(true);
-      expect(isValidColor('blue')).toBe(true);
-      expect(isValidColor('cyan')).toBe(true);
-      expect(isValidColor('magenta')).toBe(true);
-      expect(isValidColor('white')).toBe(true);
-      expect(isValidColor('gray')).toBe(true);
-      expect(isValidColor('grey')).toBe(true);
-      expect(isValidColor('blackbright')).toBe(true);
-      expect(isValidColor('redbright')).toBe(true);
-      expect(isValidColor('greenbright')).toBe(true);
-      expect(isValidColor('yellowbright')).toBe(true);
-      expect(isValidColor('bluebright')).toBe(true);
-      expect(isValidColor('cyanbright')).toBe(true);
-      expect(isValidColor('magentabright')).toBe(true);
-      expect(isValidColor('whitebright')).toBe(true);
-    });
-
-    it('should validate Ink-supported color names case insensitive', () => {
-      expect(isValidColor('BLACK')).toBe(true);
-      expect(isValidColor('Red')).toBe(true);
-      expect(isValidColor('GREEN')).toBe(true);
-    });
-
-    it('should validate CSS color names', () => {
-      expect(isValidColor('darkkhaki')).toBe(true);
-      expect(isValidColor('coral')).toBe(true);
-      expect(isValidColor('teal')).toBe(true);
-      expect(isValidColor('tomato')).toBe(true);
-      expect(isValidColor('turquoise')).toBe(true);
-      expect(isValidColor('violet')).toBe(true);
-      expect(isValidColor('wheat')).toBe(true);
-      expect(isValidColor('whitesmoke')).toBe(true);
-      expect(isValidColor('yellowgreen')).toBe(true);
-    });
-
-    it('should validate CSS color names case insensitive', () => {
-      expect(isValidColor('DARKKHAKI')).toBe(true);
-      expect(isValidColor('Coral')).toBe(true);
-      expect(isValidColor('TEAL')).toBe(true);
-    });
-
-    it('should reject invalid color names', () => {
-      expect(isValidColor('invalidcolor')).toBe(false);
-      expect(isValidColor('notacolor')).toBe(false);
-      expect(isValidColor('')).toBe(false);
+  interpolateColor,
+  isValidColor,
+  resolveColor,
+} from "./color-utils.js";
+
+describe("Color Utils", () => {
+  describe("isValidColor", () => {
+    it("should validate hex colors", () => {
+      expect(isValidColor("#ff0000")).toBe(true);
+      expect(isValidColor("#00ff00")).toBe(true);
+      expect(isValidColor("#0000ff")).toBe(true);
+      expect(isValidColor("#fff")).toBe(true);
+      expect(isValidColor("#000")).toBe(true);
+      expect(isValidColor("#FF0000")).toBe(true); // Case insensitive
+    });
+
+    it("should validate Ink-supported color names", () => {
+      expect(isValidColor("black")).toBe(true);
+      expect(isValidColor("red")).toBe(true);
+      expect(isValidColor("green")).toBe(true);
+      expect(isValidColor("yellow")).toBe(true);
+      expect(isValidColor("blue")).toBe(true);
+      expect(isValidColor("cyan")).toBe(true);
+      expect(isValidColor("magenta")).toBe(true);
+      expect(isValidColor("white")).toBe(true);
+      expect(isValidColor("gray")).toBe(true);
+      expect(isValidColor("grey")).toBe(true);
+      expect(isValidColor("blackbright")).toBe(true);
+      expect(isValidColor("redbright")).toBe(true);
+      expect(isValidColor("greenbright")).toBe(true);
+      expect(isValidColor("yellowbright")).toBe(true);
+      expect(isValidColor("bluebright")).toBe(true);
+      expect(isValidColor("cyanbright")).toBe(true);
+      expect(isValidColor("magentabright")).toBe(true);
+      expect(isValidColor("whitebright")).toBe(true);
+    });
+
+    it("should validate Ink-supported color names case insensitive", () => {
+      expect(isValidColor("BLACK")).toBe(true);
+      expect(isValidColor("Red")).toBe(true);
+      expect(isValidColor("GREEN")).toBe(true);
+    });
+
+    it("should validate CSS color names", () => {
+      expect(isValidColor("darkkhaki")).toBe(true);
+      expect(isValidColor("coral")).toBe(true);
+      expect(isValidColor("teal")).toBe(true);
+      expect(isValidColor("tomato")).toBe(true);
+      expect(isValidColor("turquoise")).toBe(true);
+      expect(isValidColor("violet")).toBe(true);
+      expect(isValidColor("wheat")).toBe(true);
+      expect(isValidColor("whitesmoke")).toBe(true);
+      expect(isValidColor("yellowgreen")).toBe(true);
+    });
+
+    it("should validate CSS color names case insensitive", () => {
+      expect(isValidColor("DARKKHAKI")).toBe(true);
+      expect(isValidColor("Coral")).toBe(true);
+      expect(isValidColor("TEAL")).toBe(true);
+    });
+
+    it("should reject invalid color names", () => {
+      expect(isValidColor("invalidcolor")).toBe(false);
+      expect(isValidColor("notacolor")).toBe(false);
+      expect(isValidColor("")).toBe(false);
     });
   });
 
-  describe('resolveColor', () => {
-    it('should resolve hex colors', () => {
-      expect(resolveColor('#ff0000')).toBe('#ff0000');
-      expect(resolveColor('#00ff00')).toBe('#00ff00');
-      expect(resolveColor('#0000ff')).toBe('#0000ff');
-      expect(resolveColor('#fff')).toBe('#fff');
-      expect(resolveColor('#000')).toBe('#000');
-    });
-
-    it('should resolve Ink-supported color names', () => {
-      expect(resolveColor('black')).toBe('black');
-      expect(resolveColor('red')).toBe('red');
-      expect(resolveColor('green')).toBe('green');
-      expect(resolveColor('yellow')).toBe('yellow');
-      expect(resolveColor('blue')).toBe('blue');
-      expect(resolveColor('cyan')).toBe('cyan');
-      expect(resolveColor('magenta')).toBe('magenta');
-      expect(resolveColor('white')).toBe('white');
-      expect(resolveColor('gray')).toBe('gray');
-      expect(resolveColor('grey')).toBe('grey');
-    });
-
-    it('should resolve CSS color names to hex', () => {
-      expect(resolveColor('darkkhaki')).toBe('#bdb76b');
-      expect(resolveColor('coral')).toBe('#ff7f50');
-      expect(resolveColor('teal')).toBe('#008080');
-      expect(resolveColor('tomato')).toBe('#ff6347');
-      expect(resolveColor('turquoise')).toBe('#40e0d0');
-      expect(resolveColor('violet')).toBe('#ee82ee');
-      expect(resolveColor('wheat')).toBe('#f5deb3');
-      expect(resolveColor('whitesmoke')).toBe('#f5f5f5');
-      expect(resolveColor('yellowgreen')).toBe('#9acd32');
-    });
-
-    it('should handle case insensitive color names', () => {
-      expect(resolveColor('DARKKHAKI')).toBe('#bdb76b');
-      expect(resolveColor('Coral')).toBe('#ff7f50');
-      expect(resolveColor('TEAL')).toBe('#008080');
-    });
-
-    it('should return undefined for invalid colors', () => {
-      expect(resolveColor('invalidcolor')).toBeUndefined();
-      expect(resolveColor('notacolor')).toBeUndefined();
-      expect(resolveColor('')).toBeUndefined();
+  describe("resolveColor", () => {
+    it("should resolve hex colors", () => {
+      expect(resolveColor("#ff0000")).toBe("#ff0000");
+      expect(resolveColor("#00ff00")).toBe("#00ff00");
+      expect(resolveColor("#0000ff")).toBe("#0000ff");
+      expect(resolveColor("#fff")).toBe("#fff");
+      expect(resolveColor("#000")).toBe("#000");
+    });
+
+    it("should resolve Ink-supported color names", () => {
+      expect(resolveColor("black")).toBe("black");
+      expect(resolveColor("red")).toBe("red");
+      expect(resolveColor("green")).toBe("green");
+      expect(resolveColor("yellow")).toBe("yellow");
+      expect(resolveColor("blue")).toBe("blue");
+      expect(resolveColor("cyan")).toBe("cyan");
+      expect(resolveColor("magenta")).toBe("magenta");
+      expect(resolveColor("white")).toBe("white");
+      expect(resolveColor("gray")).toBe("gray");
+      expect(resolveColor("grey")).toBe("grey");
+    });
+
+    it("should resolve CSS color names to hex", () => {
+      expect(resolveColor("darkkhaki")).toBe("#bdb76b");
+      expect(resolveColor("coral")).toBe("#ff7f50");
+      expect(resolveColor("teal")).toBe("#008080");
+      expect(resolveColor("tomato")).toBe("#ff6347");
+      expect(resolveColor("turquoise")).toBe("#40e0d0");
+      expect(resolveColor("violet")).toBe("#ee82ee");
+      expect(resolveColor("wheat")).toBe("#f5deb3");
+      expect(resolveColor("whitesmoke")).toBe("#f5f5f5");
+      expect(resolveColor("yellowgreen")).toBe("#9acd32");
+    });
+
+    it("should handle case insensitive color names", () => {
+      expect(resolveColor("DARKKHAKI")).toBe("#bdb76b");
+      expect(resolveColor("Coral")).toBe("#ff7f50");
+      expect(resolveColor("TEAL")).toBe("#008080");
+    });
+
+    it("should return undefined for invalid colors", () => {
+      expect(resolveColor("invalidcolor")).toBeUndefined();
+      expect(resolveColor("notacolor")).toBeUndefined();
+      expect(resolveColor("")).toBeUndefined();
     });
   });
 
-  describe('CSS_NAME_TO_HEX_MAP', () => {
-    it('should contain expected CSS color mappings', () => {
-      expect(CSS_NAME_TO_HEX_MAP['darkkhaki']).toBe('#bdb76b');
-      expect(CSS_NAME_TO_HEX_MAP['coral']).toBe('#ff7f50');
-      expect(CSS_NAME_TO_HEX_MAP['teal']).toBe('#008080');
-      expect(CSS_NAME_TO_HEX_MAP['tomato']).toBe('#ff6347');
-      expect(CSS_NAME_TO_HEX_MAP['turquoise']).toBe('#40e0d0');
+  describe("CSS_NAME_TO_HEX_MAP", () => {
+    it("should contain expected CSS color mappings", () => {
+      expect(CSS_NAME_TO_HEX_MAP["darkkhaki"]).toBe("#bdb76b");
+      expect(CSS_NAME_TO_HEX_MAP["coral"]).toBe("#ff7f50");
+      expect(CSS_NAME_TO_HEX_MAP["teal"]).toBe("#008080");
+      expect(CSS_NAME_TO_HEX_MAP["tomato"]).toBe("#ff6347");
+      expect(CSS_NAME_TO_HEX_MAP["turquoise"]).toBe("#40e0d0");
     });
 
-    it('should not contain Ink-supported color names', () => {
-      expect(CSS_NAME_TO_HEX_MAP['black']).toBeUndefined();
-      expect(CSS_NAME_TO_HEX_MAP['red']).toBeUndefined();
-      expect(CSS_NAME_TO_HEX_MAP['green']).toBeUndefined();
-      expect(CSS_NAME_TO_HEX_MAP['blue']).toBeUndefined();
+    it("should not contain Ink-supported color names", () => {
+      expect(CSS_NAME_TO_HEX_MAP["black"]).toBeUndefined();
+      expect(CSS_NAME_TO_HEX_MAP["red"]).toBeUndefined();
+      expect(CSS_NAME_TO_HEX_MAP["green"]).toBeUndefined();
+      expect(CSS_NAME_TO_HEX_MAP["blue"]).toBeUndefined();
     });
   });
 
-  describe('INK_SUPPORTED_NAMES', () => {
-    it('should contain all Ink-supported color names', () => {
-      expect(INK_SUPPORTED_NAMES.has('black')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('red')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('green')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('yellow')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('blue')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('cyan')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('magenta')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('white')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('gray')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('grey')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('blackbright')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('redbright')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('greenbright')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('yellowbright')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('bluebright')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('cyanbright')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('magentabright')).toBe(true);
-      expect(INK_SUPPORTED_NAMES.has('whitebright')).toBe(true);
-    });
-
-    it('should not contain CSS color names', () => {
-      expect(INK_SUPPORTED_NAMES.has('darkkhaki')).toBe(false);
-      expect(INK_SUPPORTED_NAMES.has('coral')).toBe(false);
-      expect(INK_SUPPORTED_NAMES.has('teal')).toBe(false);
+  describe("INK_SUPPORTED_NAMES", () => {
+    it("should contain all Ink-supported color names", () => {
+      expect(INK_SUPPORTED_NAMES.has("black")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("red")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("green")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("yellow")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("blue")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("cyan")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("magenta")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("white")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("gray")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("grey")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("blackbright")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("redbright")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("greenbright")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("yellowbright")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("bluebright")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("cyanbright")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("magentabright")).toBe(true);
+      expect(INK_SUPPORTED_NAMES.has("whitebright")).toBe(true);
+    });
+
+    it("should not contain CSS color names", () => {
+      expect(INK_SUPPORTED_NAMES.has("darkkhaki")).toBe(false);
+      expect(INK_SUPPORTED_NAMES.has("coral")).toBe(false);
+      expect(INK_SUPPORTED_NAMES.has("teal")).toBe(false);
     });
   });
 
-  describe('Consistency between validation and resolution', () => {
-    it('should have consistent behavior between isValidColor and resolveColor', () => {
+  describe("Consistency between validation and resolution", () => {
+    it("should have consistent behavior between isValidColor and resolveColor", () => {
       // Test that any color that isValidColor returns true for can be resolved
       const testColors = [
-        '#ff0000',
-        '#00ff00',
-        '#0000ff',
-        '#fff',
-        '#000',
-        'black',
-        'red',
-        'green',
-        'yellow',
-        'blue',
-        'cyan',
-        'magenta',
-        'white',
-        'gray',
-        'grey',
-        'darkkhaki',
-        'coral',
-        'teal',
-        'tomato',
-        'turquoise',
-        'violet',
-        'wheat',
-        'whitesmoke',
-        'yellowgreen',
+        "#ff0000",
+        "#00ff00",
+        "#0000ff",
+        "#fff",
+        "#000",
+        "black",
+        "red",
+        "green",
+        "yellow",
+        "blue",
+        "cyan",
+        "magenta",
+        "white",
+        "gray",
+        "grey",
+        "darkkhaki",
+        "coral",
+        "teal",
+        "tomato",
+        "turquoise",
+        "violet",
+        "wheat",
+        "whitesmoke",
+        "yellowgreen",
       ];
 
       for (const color of testColors) {
@@ -205,13 +205,7 @@ describe('Color Utils', () => {
       }
 
       // Test that invalid colors are consistently rejected
-      const invalidColors = [
-        'invalidcolor',
-        'notacolor',
-        '',
-        '#gg0000',
-        '#ff00',
-      ];
+      const invalidColors = ["invalidcolor", "notacolor", "", "#gg0000", "#ff00"];
 
       for (const color of invalidColors) {
         expect(isValidColor(color)).toBe(false);
@@ -220,39 +214,39 @@ describe('Color Utils', () => {
     });
   });
 
-  describe('interpolateColor', () => {
-    it('should interpolate between two colors', () => {
+  describe("interpolateColor", () => {
+    it("should interpolate between two colors", () => {
       // Midpoint between black (#000000) and white (#ffffff) should be gray
-      expect(interpolateColor('#000000', '#ffffff', 0.5)).toBe('#7f7f7f');
+      expect(interpolateColor("#000000", "#ffffff", 0.5)).toBe("#7f7f7f");
     });
 
-    it('should return start color when factor is 0', () => {
-      expect(interpolateColor('#ff0000', '#0000ff', 0)).toBe('#ff0000');
+    it("should return start color when factor is 0", () => {
+      expect(interpolateColor("#ff0000", "#0000ff", 0)).toBe("#ff0000");
     });
 
-    it('should return end color when factor is 1', () => {
-      expect(interpolateColor('#ff0000', '#0000ff', 1)).toBe('#0000ff');
+    it("should return end color when factor is 1", () => {
+      expect(interpolateColor("#ff0000", "#0000ff", 1)).toBe("#0000ff");
     });
 
-    it('should return start color when factor is < 0', () => {
-      expect(interpolateColor('#ff0000', '#0000ff', -0.5)).toBe('#ff0000');
+    it("should return start color when factor is < 0", () => {
+      expect(interpolateColor("#ff0000", "#0000ff", -0.5)).toBe("#ff0000");
     });
 
-    it('should return end color when factor is > 1', () => {
-      expect(interpolateColor('#ff0000', '#0000ff', 1.5)).toBe('#0000ff');
+    it("should return end color when factor is > 1", () => {
+      expect(interpolateColor("#ff0000", "#0000ff", 1.5)).toBe("#0000ff");
     });
 
-    it('should return valid color if one is empty but factor selects the valid one', () => {
-      expect(interpolateColor('', '#ffffff', 1)).toBe('#ffffff');
-      expect(interpolateColor('#ffffff', '', 0)).toBe('#ffffff');
+    it("should return valid color if one is empty but factor selects the valid one", () => {
+      expect(interpolateColor("", "#ffffff", 1)).toBe("#ffffff");
+      expect(interpolateColor("#ffffff", "", 0)).toBe("#ffffff");
     });
 
-    it('should return empty string if either color is empty and factor does not select the valid one', () => {
-      expect(interpolateColor('', '#ffffff', 0.5)).toBe('');
-      expect(interpolateColor('#ffffff', '', 0.5)).toBe('');
-      expect(interpolateColor('', '', 0.5)).toBe('');
-      expect(interpolateColor('', '#ffffff', 0)).toBe('');
-      expect(interpolateColor('#ffffff', '', 1)).toBe('');
+    it("should return empty string if either color is empty and factor does not select the valid one", () => {
+      expect(interpolateColor("", "#ffffff", 0.5)).toBe("");
+      expect(interpolateColor("#ffffff", "", 0.5)).toBe("");
+      expect(interpolateColor("", "", 0.5)).toBe("");
+      expect(interpolateColor("", "#ffffff", 0)).toBe("");
+      expect(interpolateColor("#ffffff", "", 1)).toBe("");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/themes/color-utils.ts b/packages/ui-gemini/src/ui/themes/color-utils.ts
index 543952e03..c6087f19d 100644
--- a/packages/ui-gemini/src/ui/themes/color-utils.ts
+++ b/packages/ui-gemini/src/ui/themes/color-utils.ts
@@ -4,172 +4,172 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import tinygradient from 'tinygradient';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import tinygradient from "tinygradient";
 
 // Mapping from common CSS color names (lowercase) to hex codes (lowercase)
 // Excludes names directly supported by Ink
 export const CSS_NAME_TO_HEX_MAP: Readonly<Record<string, string>> = {
-  aliceblue: '#f0f8ff',
-  antiquewhite: '#faebd7',
-  aqua: '#00ffff',
-  aquamarine: '#7fffd4',
-  azure: '#f0ffff',
-  beige: '#f5f5dc',
-  bisque: '#ffe4c4',
-  blanchedalmond: '#ffebcd',
-  blueviolet: '#8a2be2',
-  brown: '#a52a2a',
-  burlywood: '#deb887',
-  cadetblue: '#5f9ea0',
-  chartreuse: '#7fff00',
-  chocolate: '#d2691e',
-  coral: '#ff7f50',
-  cornflowerblue: '#6495ed',
-  cornsilk: '#fff8dc',
-  crimson: '#dc143c',
-  darkblue: '#00008b',
-  darkcyan: '#008b8b',
-  darkgoldenrod: '#b8860b',
-  darkgray: '#a9a9a9',
-  darkgrey: '#a9a9a9',
-  darkgreen: '#006400',
-  darkkhaki: '#bdb76b',
-  darkmagenta: '#8b008b',
-  darkolivegreen: '#556b2f',
-  darkorange: '#ff8c00',
-  darkorchid: '#9932cc',
-  darkred: '#8b0000',
-  darksalmon: '#e9967a',
-  darkseagreen: '#8fbc8f',
-  darkslateblue: '#483d8b',
-  darkslategray: '#2f4f4f',
-  darkslategrey: '#2f4f4f',
-  darkturquoise: '#00ced1',
-  darkviolet: '#9400d3',
-  deeppink: '#ff1493',
-  deepskyblue: '#00bfff',
-  dimgray: '#696969',
-  dimgrey: '#696969',
-  dodgerblue: '#1e90ff',
-  firebrick: '#b22222',
-  floralwhite: '#fffaf0',
-  forestgreen: '#228b22',
-  fuchsia: '#ff00ff',
-  gainsboro: '#dcdcdc',
-  ghostwhite: '#f8f8ff',
-  gold: '#ffd700',
-  goldenrod: '#daa520',
-  greenyellow: '#adff2f',
-  honeydew: '#f0fff0',
-  hotpink: '#ff69b4',
-  indianred: '#cd5c5c',
-  indigo: '#4b0082',
-  ivory: '#fffff0',
-  khaki: '#f0e68c',
-  lavender: '#e6e6fa',
-  lavenderblush: '#fff0f5',
-  lawngreen: '#7cfc00',
-  lemonchiffon: '#fffacd',
-  lightblue: '#add8e6',
-  lightcoral: '#f08080',
-  lightcyan: '#e0ffff',
-  lightgoldenrodyellow: '#fafad2',
-  lightgray: '#d3d3d3',
-  lightgrey: '#d3d3d3',
-  lightgreen: '#90ee90',
-  lightpink: '#ffb6c1',
-  lightsalmon: '#ffa07a',
-  lightseagreen: '#20b2aa',
-  lightskyblue: '#87cefa',
-  lightslategray: '#778899',
-  lightslategrey: '#778899',
-  lightsteelblue: '#b0c4de',
-  lightyellow: '#ffffe0',
-  lime: '#00ff00',
-  limegreen: '#32cd32',
-  linen: '#faf0e6',
-  maroon: '#800000',
-  mediumaquamarine: '#66cdaa',
-  mediumblue: '#0000cd',
-  mediumorchid: '#ba55d3',
-  mediumpurple: '#9370db',
-  mediumseagreen: '#3cb371',
-  mediumslateblue: '#7b68ee',
-  mediumspringgreen: '#00fa9a',
-  mediumturquoise: '#48d1cc',
-  mediumvioletred: '#c71585',
-  midnightblue: '#191970',
-  mintcream: '#f5fffa',
-  mistyrose: '#ffe4e1',
-  moccasin: '#ffe4b5',
-  navajowhite: '#ffdead',
-  navy: '#000080',
-  oldlace: '#fdf5e6',
-  olive: '#808000',
-  olivedrab: '#6b8e23',
-  orange: '#ffa500',
-  orangered: '#ff4500',
-  orchid: '#da70d6',
-  palegoldenrod: '#eee8aa',
-  palegreen: '#98fb98',
-  paleturquoise: '#afeeee',
-  palevioletred: '#db7093',
-  papayawhip: '#ffefd5',
-  peachpuff: '#ffdab9',
-  peru: '#cd853f',
-  pink: '#ffc0cb',
-  plum: '#dda0dd',
-  powderblue: '#b0e0e6',
-  purple: '#800080',
-  rebeccapurple: '#663399',
-  rosybrown: '#bc8f8f',
-  royalblue: '#4169e1',
-  saddlebrown: '#8b4513',
-  salmon: '#fa8072',
-  sandybrown: '#f4a460',
-  seagreen: '#2e8b57',
-  seashell: '#fff5ee',
-  sienna: '#a0522d',
-  silver: '#c0c0c0',
-  skyblue: '#87ceeb',
-  slateblue: '#6a5acd',
-  slategray: '#708090',
-  slategrey: '#708090',
-  snow: '#fffafa',
-  springgreen: '#00ff7f',
-  steelblue: '#4682b4',
-  tan: '#d2b48c',
-  teal: '#008080',
-  thistle: '#d8bfd8',
-  tomato: '#ff6347',
-  turquoise: '#40e0d0',
-  violet: '#ee82ee',
-  wheat: '#f5deb3',
-  whitesmoke: '#f5f5f5',
-  yellowgreen: '#9acd32',
+  aliceblue: "#f0f8ff",
+  antiquewhite: "#faebd7",
+  aqua: "#00ffff",
+  aquamarine: "#7fffd4",
+  azure: "#f0ffff",
+  beige: "#f5f5dc",
+  bisque: "#ffe4c4",
+  blanchedalmond: "#ffebcd",
+  blueviolet: "#8a2be2",
+  brown: "#a52a2a",
+  burlywood: "#deb887",
+  cadetblue: "#5f9ea0",
+  chartreuse: "#7fff00",
+  chocolate: "#d2691e",
+  coral: "#ff7f50",
+  cornflowerblue: "#6495ed",
+  cornsilk: "#fff8dc",
+  crimson: "#dc143c",
+  darkblue: "#00008b",
+  darkcyan: "#008b8b",
+  darkgoldenrod: "#b8860b",
+  darkgray: "#a9a9a9",
+  darkgrey: "#a9a9a9",
+  darkgreen: "#006400",
+  darkkhaki: "#bdb76b",
+  darkmagenta: "#8b008b",
+  darkolivegreen: "#556b2f",
+  darkorange: "#ff8c00",
+  darkorchid: "#9932cc",
+  darkred: "#8b0000",
+  darksalmon: "#e9967a",
+  darkseagreen: "#8fbc8f",
+  darkslateblue: "#483d8b",
+  darkslategray: "#2f4f4f",
+  darkslategrey: "#2f4f4f",
+  darkturquoise: "#00ced1",
+  darkviolet: "#9400d3",
+  deeppink: "#ff1493",
+  deepskyblue: "#00bfff",
+  dimgray: "#696969",
+  dimgrey: "#696969",
+  dodgerblue: "#1e90ff",
+  firebrick: "#b22222",
+  floralwhite: "#fffaf0",
+  forestgreen: "#228b22",
+  fuchsia: "#ff00ff",
+  gainsboro: "#dcdcdc",
+  ghostwhite: "#f8f8ff",
+  gold: "#ffd700",
+  goldenrod: "#daa520",
+  greenyellow: "#adff2f",
+  honeydew: "#f0fff0",
+  hotpink: "#ff69b4",
+  indianred: "#cd5c5c",
+  indigo: "#4b0082",
+  ivory: "#fffff0",
+  khaki: "#f0e68c",
+  lavender: "#e6e6fa",
+  lavenderblush: "#fff0f5",
+  lawngreen: "#7cfc00",
+  lemonchiffon: "#fffacd",
+  lightblue: "#add8e6",
+  lightcoral: "#f08080",
+  lightcyan: "#e0ffff",
+  lightgoldenrodyellow: "#fafad2",
+  lightgray: "#d3d3d3",
+  lightgrey: "#d3d3d3",
+  lightgreen: "#90ee90",
+  lightpink: "#ffb6c1",
+  lightsalmon: "#ffa07a",
+  lightseagreen: "#20b2aa",
+  lightskyblue: "#87cefa",
+  lightslategray: "#778899",
+  lightslategrey: "#778899",
+  lightsteelblue: "#b0c4de",
+  lightyellow: "#ffffe0",
+  lime: "#00ff00",
+  limegreen: "#32cd32",
+  linen: "#faf0e6",
+  maroon: "#800000",
+  mediumaquamarine: "#66cdaa",
+  mediumblue: "#0000cd",
+  mediumorchid: "#ba55d3",
+  mediumpurple: "#9370db",
+  mediumseagreen: "#3cb371",
+  mediumslateblue: "#7b68ee",
+  mediumspringgreen: "#00fa9a",
+  mediumturquoise: "#48d1cc",
+  mediumvioletred: "#c71585",
+  midnightblue: "#191970",
+  mintcream: "#f5fffa",
+  mistyrose: "#ffe4e1",
+  moccasin: "#ffe4b5",
+  navajowhite: "#ffdead",
+  navy: "#000080",
+  oldlace: "#fdf5e6",
+  olive: "#808000",
+  olivedrab: "#6b8e23",
+  orange: "#ffa500",
+  orangered: "#ff4500",
+  orchid: "#da70d6",
+  palegoldenrod: "#eee8aa",
+  palegreen: "#98fb98",
+  paleturquoise: "#afeeee",
+  palevioletred: "#db7093",
+  papayawhip: "#ffefd5",
+  peachpuff: "#ffdab9",
+  peru: "#cd853f",
+  pink: "#ffc0cb",
+  plum: "#dda0dd",
+  powderblue: "#b0e0e6",
+  purple: "#800080",
+  rebeccapurple: "#663399",
+  rosybrown: "#bc8f8f",
+  royalblue: "#4169e1",
+  saddlebrown: "#8b4513",
+  salmon: "#fa8072",
+  sandybrown: "#f4a460",
+  seagreen: "#2e8b57",
+  seashell: "#fff5ee",
+  sienna: "#a0522d",
+  silver: "#c0c0c0",
+  skyblue: "#87ceeb",
+  slateblue: "#6a5acd",
+  slategray: "#708090",
+  slategrey: "#708090",
+  snow: "#fffafa",
+  springgreen: "#00ff7f",
+  steelblue: "#4682b4",
+  tan: "#d2b48c",
+  teal: "#008080",
+  thistle: "#d8bfd8",
+  tomato: "#ff6347",
+  turquoise: "#40e0d0",
+  violet: "#ee82ee",
+  wheat: "#f5deb3",
+  whitesmoke: "#f5f5f5",
+  yellowgreen: "#9acd32",
 };
 
 // Define the set of Ink's named colors for quick lookup
 export const INK_SUPPORTED_NAMES = new Set([
-  'black',
-  'red',
-  'green',
-  'yellow',
-  'blue',
-  'cyan',
-  'magenta',
-  'white',
-  'gray',
-  'grey',
-  'blackbright',
-  'redbright',
-  'greenbright',
-  'yellowbright',
-  'bluebright',
-  'cyanbright',
-  'magentabright',
-  'whitebright',
+  "black",
+  "red",
+  "green",
+  "yellow",
+  "blue",
+  "cyan",
+  "magenta",
+  "white",
+  "gray",
+  "grey",
+  "blackbright",
+  "redbright",
+  "greenbright",
+  "yellowbright",
+  "bluebright",
+  "cyanbright",
+  "magentabright",
+  "whitebright",
 ]);
 
 /**
@@ -183,7 +183,7 @@ export function isValidColor(color: string): boolean {
   const lowerColor = color.toLowerCase();
 
   // 1. Check if it's a hex code
-  if (lowerColor.startsWith('#')) {
+  if (lowerColor.startsWith("#")) {
     return /^#[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$/.test(color);
   }
 
@@ -210,7 +210,7 @@ export function resolveColor(colorValue: string): string | undefined {
   const lowerColor = colorValue.toLowerCase();
 
   // 1. Check if it's already a hex code and valid
-  if (lowerColor.startsWith('#')) {
+  if (lowerColor.startsWith("#")) {
     if (/^#[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$/.test(colorValue)) {
       return lowerColor;
     } else {
@@ -233,11 +233,7 @@ export function resolveColor(colorValue: string): string | undefined {
   return undefined;
 }
 
-export function interpolateColor(
-  color1: string,
-  color2: string,
-  factor: number,
-) {
+export function interpolateColor(color1: string, color2: string, factor: number) {
   if (factor <= 0 && color1) {
     return color1;
   }
@@ -245,7 +241,7 @@ export function interpolateColor(
     return color2;
   }
   if (!color1 || !color2) {
-    return '';
+    return "";
   }
   const gradient = tinygradient(color1, color2);
   const color = gradient.rgbAt(factor);
diff --git a/packages/ui-gemini/src/ui/themes/default-light.ts b/packages/ui-gemini/src/ui/themes/default-light.ts
index 1803e7fae..ff094b6be 100644
--- a/packages/ui-gemini/src/ui/themes/default-light.ts
+++ b/packages/ui-gemini/src/ui/themes/default-light.ts
@@ -4,102 +4,102 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lightTheme, Theme } from './theme.js';
+import { lightTheme, Theme } from "./theme.js";
 
 export const DefaultLight: Theme = new Theme(
-  'Default Light',
-  'light',
+  "Default Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: lightTheme.Background,
       color: lightTheme.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: lightTheme.Comment,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: lightTheme.Comment,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: lightTheme.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: lightTheme.AccentBlue,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: lightTheme.AccentRed,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: lightTheme.AccentRed,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: lightTheme.AccentRed,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: lightTheme.AccentRed,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: lightTheme.AccentRed,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: lightTheme.AccentRed,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: lightTheme.AccentRed,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: lightTheme.AccentRed,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: lightTheme.AccentGreen,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: lightTheme.AccentRed,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: lightTheme.Gray,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: lightTheme.AccentRed,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: lightTheme.AccentCyan,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   lightTheme,
diff --git a/packages/ui-gemini/src/ui/themes/default.ts b/packages/ui-gemini/src/ui/themes/default.ts
index e1d0247c0..c2aa6a251 100644
--- a/packages/ui-gemini/src/ui/themes/default.ts
+++ b/packages/ui-gemini/src/ui/themes/default.ts
@@ -4,145 +4,145 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { darkTheme, Theme } from './theme.js';
+import { darkTheme, Theme } from "./theme.js";
 
 export const DefaultDark: Theme = new Theme(
-  'Default',
-  'dark',
+  "Default",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: darkTheme.Background,
       color: darkTheme.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: darkTheme.AccentBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: darkTheme.AccentBlue,
-      textDecoration: 'underline',
+      textDecoration: "underline",
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: darkTheme.AccentCyan,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: darkTheme.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: darkTheme.AccentGreen,
     },
-    'hljs-class': {
+    "hljs-class": {
       color: darkTheme.AccentGreen,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: darkTheme.AccentRed,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: darkTheme.AccentRed,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: darkTheme.Foreground,
     },
-    'hljs-function': {
+    "hljs-function": {
       color: darkTheme.Foreground,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: darkTheme.Foreground,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: darkTheme.Foreground,
     },
-    'hljs-formula': {
+    "hljs-formula": {
       color: darkTheme.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: darkTheme.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: darkTheme.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: darkTheme.Comment,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: darkTheme.Gray,
     },
-    'hljs-meta-keyword': {
+    "hljs-meta-keyword": {
       color: darkTheme.Gray,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: darkTheme.Gray,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: darkTheme.AccentPurple,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: darkTheme.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: darkTheme.LightBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: darkTheme.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: darkTheme.LightBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: darkTheme.AccentYellow,
     },
-    'hljs-addition': {
-      backgroundColor: '#144212',
-      display: 'inline-block',
-      width: '100%',
+    "hljs-addition": {
+      backgroundColor: "#144212",
+      display: "inline-block",
+      width: "100%",
     },
-    'hljs-deletion': {
-      backgroundColor: '#600',
-      display: 'inline-block',
-      width: '100%',
+    "hljs-deletion": {
+      backgroundColor: "#600",
+      display: "inline-block",
+      width: "100%",
     },
   },
   darkTheme,
diff --git a/packages/ui-gemini/src/ui/themes/dracula.ts b/packages/ui-gemini/src/ui/themes/dracula.ts
index 2cd2802c4..8746cc803 100644
--- a/packages/ui-gemini/src/ui/themes/dracula.ts
+++ b/packages/ui-gemini/src/ui/themes/dracula.ts
@@ -4,120 +4,120 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const draculaColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#282a36',
-  Foreground: '#a3afb7',
-  LightBlue: '#8be9fd',
-  AccentBlue: '#8be9fd',
-  AccentPurple: '#ff79c6',
-  AccentCyan: '#8be9fd',
-  AccentGreen: '#50fa7b',
-  AccentYellow: '#fff783',
-  AccentRed: '#ff5555',
-  DiffAdded: '#11431d',
-  DiffRemoved: '#6e1818',
-  Comment: '#6272a4',
-  Gray: '#6272a4',
-  DarkGray: interpolateColor('#6272a4', '#282a36', 0.5),
-  GradientColors: ['#ff79c6', '#8be9fd'],
+  type: "dark",
+  Background: "#282a36",
+  Foreground: "#a3afb7",
+  LightBlue: "#8be9fd",
+  AccentBlue: "#8be9fd",
+  AccentPurple: "#ff79c6",
+  AccentCyan: "#8be9fd",
+  AccentGreen: "#50fa7b",
+  AccentYellow: "#fff783",
+  AccentRed: "#ff5555",
+  DiffAdded: "#11431d",
+  DiffRemoved: "#6e1818",
+  Comment: "#6272a4",
+  Gray: "#6272a4",
+  DarkGray: interpolateColor("#6272a4", "#282a36", 0.5),
+  GradientColors: ["#ff79c6", "#8be9fd"],
 };
 
 export const Dracula: Theme = new Theme(
-  'Dracula',
-  'dark',
+  "Dracula",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: draculaColors.Background,
       color: draculaColors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: draculaColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-link': {
+    "hljs-link": {
       color: draculaColors.AccentBlue,
     },
-    'hljs-function .hljs-keyword': {
+    "hljs-function .hljs-keyword": {
       color: draculaColors.AccentPurple,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: draculaColors.Foreground,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: draculaColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-name': {
+    "hljs-name": {
       color: draculaColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: draculaColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: draculaColors.AccentGreen,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: draculaColors.AccentYellow,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: draculaColors.Comment,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: draculaColors.Comment,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: draculaColors.AccentRed,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: draculaColors.Comment,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   draculaColors,
diff --git a/packages/ui-gemini/src/ui/themes/github-dark.ts b/packages/ui-gemini/src/ui/themes/github-dark.ts
index 28c14f598..f5ce284af 100644
--- a/packages/ui-gemini/src/ui/themes/github-dark.ts
+++ b/packages/ui-gemini/src/ui/themes/github-dark.ts
@@ -4,143 +4,143 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const githubDarkColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#24292e',
-  Foreground: '#c0c4c8',
-  LightBlue: '#79B8FF',
-  AccentBlue: '#79B8FF',
-  AccentPurple: '#B392F0',
-  AccentCyan: '#9ECBFF',
-  AccentGreen: '#85E89D',
-  AccentYellow: '#FFAB70',
-  AccentRed: '#F97583',
-  DiffAdded: '#3C4636',
-  DiffRemoved: '#502125',
-  Comment: '#6A737D',
-  Gray: '#6A737D',
-  DarkGray: interpolateColor('#6A737D', '#24292e', 0.5),
-  GradientColors: ['#79B8FF', '#85E89D'],
+  type: "dark",
+  Background: "#24292e",
+  Foreground: "#c0c4c8",
+  LightBlue: "#79B8FF",
+  AccentBlue: "#79B8FF",
+  AccentPurple: "#B392F0",
+  AccentCyan: "#9ECBFF",
+  AccentGreen: "#85E89D",
+  AccentYellow: "#FFAB70",
+  AccentRed: "#F97583",
+  DiffAdded: "#3C4636",
+  DiffRemoved: "#502125",
+  Comment: "#6A737D",
+  Gray: "#6A737D",
+  DarkGray: interpolateColor("#6A737D", "#24292e", 0.5),
+  GradientColors: ["#79B8FF", "#85E89D"],
 };
 
 export const GitHubDark: Theme = new Theme(
-  'GitHub',
-  'dark',
+  "GitHub",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       color: githubDarkColors.Foreground,
       background: githubDarkColors.Background,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: githubDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: githubDarkColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: githubDarkColors.AccentRed,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: githubDarkColors.AccentRed,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: githubDarkColors.Foreground,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: githubDarkColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: githubDarkColors.AccentYellow,
     },
-    'hljs-tag .hljs-attr': {
+    "hljs-tag .hljs-attr": {
       color: githubDarkColors.AccentYellow,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: githubDarkColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: githubDarkColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: githubDarkColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: githubDarkColors.AccentGreen,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: githubDarkColors.AccentGreen,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: githubDarkColors.AccentGreen,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: githubDarkColors.AccentGreen,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: githubDarkColors.AccentCyan,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: githubDarkColors.AccentPurple,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: githubDarkColors.AccentPurple,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: githubDarkColors.LightBlue,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: githubDarkColors.LightBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-deletion': {
-      background: '#86181D',
+    "hljs-deletion": {
+      background: "#86181D",
       color: githubDarkColors.AccentRed,
     },
-    'hljs-addition': {
-      background: '#144620',
+    "hljs-addition": {
+      background: "#144620",
       color: githubDarkColors.AccentGreen,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   githubDarkColors,
diff --git a/packages/ui-gemini/src/ui/themes/github-light.ts b/packages/ui-gemini/src/ui/themes/github-light.ts
index 264a9d7a8..141a2224d 100644
--- a/packages/ui-gemini/src/ui/themes/github-light.ts
+++ b/packages/ui-gemini/src/ui/themes/github-light.ts
@@ -4,145 +4,145 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const githubLightColors: ColorsTheme = {
-  type: 'light',
-  Background: '#f8f8f8',
-  Foreground: '#24292E',
-  LightBlue: '#0086b3',
-  AccentBlue: '#458',
-  AccentPurple: '#900',
-  AccentCyan: '#009926',
-  AccentGreen: '#008080',
-  AccentYellow: '#990073',
-  AccentRed: '#d14',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FFCCCC',
-  Comment: '#998',
-  Gray: '#999',
-  DarkGray: interpolateColor('#999', '#f8f8f8', 0.5),
-  GradientColors: ['#458', '#008080'],
+  type: "light",
+  Background: "#f8f8f8",
+  Foreground: "#24292E",
+  LightBlue: "#0086b3",
+  AccentBlue: "#458",
+  AccentPurple: "#900",
+  AccentCyan: "#009926",
+  AccentGreen: "#008080",
+  AccentYellow: "#990073",
+  AccentRed: "#d14",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FFCCCC",
+  Comment: "#998",
+  Gray: "#999",
+  DarkGray: interpolateColor("#999", "#f8f8f8", 0.5),
+  GradientColors: ["#458", "#008080"],
 };
 
 export const GitHubLight: Theme = new Theme(
-  'GitHub Light',
-  'light',
+  "GitHub Light",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       color: githubLightColors.Foreground,
       background: githubLightColors.Background,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: githubLightColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: githubLightColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: githubLightColors.Foreground,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: githubLightColors.Foreground,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: githubLightColors.Foreground,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-number': {
+    "hljs-number": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-tag .hljs-attr': {
+    "hljs-tag .hljs-attr": {
       color: githubLightColors.AccentGreen,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: githubLightColors.AccentRed,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: githubLightColors.AccentRed,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: githubLightColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: githubLightColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: githubLightColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-name': {
+    "hljs-name": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: githubLightColors.AccentBlue,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: githubLightColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: githubLightColors.AccentCyan,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: githubLightColors.AccentYellow,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: githubLightColors.AccentYellow,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: githubLightColors.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: githubLightColors.LightBlue,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: githubLightColors.Gray,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-deletion': {
-      background: '#fdd',
+    "hljs-deletion": {
+      background: "#fdd",
     },
-    'hljs-addition': {
-      background: '#dfd',
+    "hljs-addition": {
+      background: "#dfd",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
   },
   githubLightColors,
diff --git a/packages/ui-gemini/src/ui/themes/googlecode.ts b/packages/ui-gemini/src/ui/themes/googlecode.ts
index 1795451c9..b453641e4 100644
--- a/packages/ui-gemini/src/ui/themes/googlecode.ts
+++ b/packages/ui-gemini/src/ui/themes/googlecode.ts
@@ -4,142 +4,142 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme, lightTheme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, lightTheme, Theme } from "./theme.js";
 
 const googleCodeColors: ColorsTheme = {
-  type: 'light',
-  Background: 'white',
-  Foreground: '#444',
-  LightBlue: '#066',
-  AccentBlue: '#008',
-  AccentPurple: '#606',
-  AccentCyan: '#066',
-  AccentGreen: '#080',
-  AccentYellow: '#660',
-  AccentRed: '#800',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FEDEDE',
-  Comment: '#5f6368',
+  type: "light",
+  Background: "white",
+  Foreground: "#444",
+  LightBlue: "#066",
+  AccentBlue: "#008",
+  AccentPurple: "#606",
+  AccentCyan: "#066",
+  AccentGreen: "#080",
+  AccentYellow: "#660",
+  AccentRed: "#800",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FEDEDE",
+  Comment: "#5f6368",
   Gray: lightTheme.Gray,
-  DarkGray: interpolateColor(lightTheme.Gray, '#ffffff', 0.5),
-  GradientColors: ['#066', '#606'],
+  DarkGray: interpolateColor(lightTheme.Gray, "#ffffff", 0.5),
+  GradientColors: ["#066", "#606"],
 };
 
 export const GoogleCode: Theme = new Theme(
-  'Google Code',
-  'light',
+  "Google Code",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: googleCodeColors.Background,
       color: googleCodeColors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: googleCodeColors.AccentRed,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: googleCodeColors.AccentRed,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: googleCodeColors.AccentBlue,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: googleCodeColors.AccentGreen,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: googleCodeColors.AccentCyan,
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: googleCodeColors.AccentPurple,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
-    'hljs-type': {
+    "hljs-type": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: googleCodeColors.AccentPurple,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: googleCodeColors.Foreground,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: googleCodeColors.Foreground,
     },
-    'hljs-formula': {
-      backgroundColor: '#eee',
-      fontStyle: 'italic',
+    "hljs-formula": {
+      backgroundColor: "#eee",
+      fontStyle: "italic",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: googleCodeColors.AccentYellow,
     },
-    'hljs-addition': {
-      backgroundColor: '#baeeba',
+    "hljs-addition": {
+      backgroundColor: "#baeeba",
     },
-    'hljs-deletion': {
-      backgroundColor: '#ffc8bd',
+    "hljs-deletion": {
+      backgroundColor: "#ffc8bd",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   googleCodeColors,
diff --git a/packages/ui-gemini/src/ui/themes/holiday.ts b/packages/ui-gemini/src/ui/themes/holiday.ts
index b3e72b1cc..767267a78 100644
--- a/packages/ui-gemini/src/ui/themes/holiday.ts
+++ b/packages/ui-gemini/src/ui/themes/holiday.ts
@@ -4,165 +4,165 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const holidayColors: ColorsTheme = {
-  type: 'dark',
-  Background: '#00210e',
-  Foreground: '#F0F8FF',
-  LightBlue: '#B0E0E6',
-  AccentBlue: '#3CB371',
-  AccentPurple: '#FF9999',
-  AccentCyan: '#33F9FF',
-  AccentGreen: '#3CB371',
-  AccentYellow: '#FFEE8C',
-  AccentRed: '#FF6347',
-  DiffAdded: '#2E8B57',
-  DiffRemoved: '#CD5C5C',
-  Comment: '#8FBC8F',
-  Gray: '#D7F5D3',
-  DarkGray: interpolateColor('#D7F5D3', '#151B18', 0.5),
-  GradientColors: ['#FF0000', '#FFFFFF', '#008000'],
+  type: "dark",
+  Background: "#00210e",
+  Foreground: "#F0F8FF",
+  LightBlue: "#B0E0E6",
+  AccentBlue: "#3CB371",
+  AccentPurple: "#FF9999",
+  AccentCyan: "#33F9FF",
+  AccentGreen: "#3CB371",
+  AccentYellow: "#FFEE8C",
+  AccentRed: "#FF6347",
+  DiffAdded: "#2E8B57",
+  DiffRemoved: "#CD5C5C",
+  Comment: "#8FBC8F",
+  Gray: "#D7F5D3",
+  DarkGray: interpolateColor("#D7F5D3", "#151B18", 0.5),
+  GradientColors: ["#FF0000", "#FFFFFF", "#008000"],
 };
 
 export const Holiday: Theme = new Theme(
-  'Holiday',
-  'dark',
+  "Holiday",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: holidayColors.Background,
       color: holidayColors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: holidayColors.AccentBlue,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: holidayColors.AccentBlue,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: holidayColors.AccentBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: holidayColors.AccentBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: holidayColors.AccentBlue,
-      textDecoration: 'underline',
+      textDecoration: "underline",
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: holidayColors.AccentCyan,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: holidayColors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: holidayColors.AccentGreen,
     },
-    'hljs-class': {
+    "hljs-class": {
       color: holidayColors.AccentGreen,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: holidayColors.AccentRed,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: holidayColors.AccentRed,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: holidayColors.Foreground,
     },
-    'hljs-function': {
+    "hljs-function": {
       color: holidayColors.Foreground,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: holidayColors.Foreground,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: holidayColors.Foreground,
     },
-    'hljs-formula': {
+    "hljs-formula": {
       color: holidayColors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: holidayColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: holidayColors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: holidayColors.Comment,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: holidayColors.Gray,
     },
-    'hljs-meta-keyword': {
+    "hljs-meta-keyword": {
       color: holidayColors.Gray,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: holidayColors.Gray,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: holidayColors.AccentPurple,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: holidayColors.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: holidayColors.LightBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: holidayColors.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: holidayColors.LightBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: holidayColors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       backgroundColor: holidayColors.DiffAdded,
-      display: 'inline-block',
-      width: '100%',
+      display: "inline-block",
+      width: "100%",
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       backgroundColor: holidayColors.DiffRemoved,
-      display: 'inline-block',
-      width: '100%',
+      display: "inline-block",
+      width: "100%",
     },
   },
   holidayColors,
diff --git a/packages/ui-gemini/src/ui/themes/no-color.ts b/packages/ui-gemini/src/ui/themes/no-color.ts
index 7c22e68b9..2a57cdbd5 100644
--- a/packages/ui-gemini/src/ui/themes/no-color.ts
+++ b/packages/ui-gemini/src/ui/themes/no-color.ts
@@ -4,124 +4,124 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ColorsTheme } from './theme.js';
-import { Theme } from './theme.js';
-import type { SemanticColors } from './semantic-tokens.js';
+import type { SemanticColors } from "./semantic-tokens.js";
+import type { ColorsTheme } from "./theme.js";
+import { Theme } from "./theme.js";
 
 const noColorColorsTheme: ColorsTheme = {
-  type: 'ansi',
-  Background: '',
-  Foreground: '',
-  LightBlue: '',
-  AccentBlue: '',
-  AccentPurple: '',
-  AccentCyan: '',
-  AccentGreen: '',
-  AccentYellow: '',
-  AccentRed: '',
-  DiffAdded: '',
-  DiffRemoved: '',
-  Comment: '',
-  Gray: '',
-  DarkGray: '',
+  type: "ansi",
+  Background: "",
+  Foreground: "",
+  LightBlue: "",
+  AccentBlue: "",
+  AccentPurple: "",
+  AccentCyan: "",
+  AccentGreen: "",
+  AccentYellow: "",
+  AccentRed: "",
+  DiffAdded: "",
+  DiffRemoved: "",
+  Comment: "",
+  Gray: "",
+  DarkGray: "",
 };
 
 const noColorSemanticColors: SemanticColors = {
   text: {
-    primary: '',
-    secondary: '',
-    link: '',
-    accent: '',
-    response: '',
+    primary: "",
+    secondary: "",
+    link: "",
+    accent: "",
+    response: "",
   },
   background: {
-    primary: '',
+    primary: "",
     diff: {
-      added: '',
-      removed: '',
+      added: "",
+      removed: "",
     },
   },
   border: {
-    default: '',
-    focused: '',
+    default: "",
+    focused: "",
   },
   ui: {
-    comment: '',
-    symbol: '',
-    dark: '',
+    comment: "",
+    symbol: "",
+    dark: "",
     gradient: [],
   },
   status: {
-    error: '',
-    success: '',
-    warning: '',
+    error: "",
+    success: "",
+    warning: "",
   },
 };
 
 export const NoColorTheme: Theme = new Theme(
-  'NoColor',
-  'dark',
+  "NoColor",
+  "dark",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
     },
-    'hljs-keyword': {},
-    'hljs-literal': {},
-    'hljs-symbol': {},
-    'hljs-name': {},
-    'hljs-link': {
-      textDecoration: 'underline',
+    "hljs-keyword": {},
+    "hljs-literal": {},
+    "hljs-symbol": {},
+    "hljs-name": {},
+    "hljs-link": {
+      textDecoration: "underline",
     },
-    'hljs-built_in': {},
-    'hljs-type': {},
-    'hljs-number': {},
-    'hljs-class': {},
-    'hljs-string': {},
-    'hljs-meta-string': {},
-    'hljs-regexp': {},
-    'hljs-template-tag': {},
-    'hljs-subst': {},
-    'hljs-function': {},
-    'hljs-title': {},
-    'hljs-params': {},
-    'hljs-formula': {},
-    'hljs-comment': {
-      fontStyle: 'italic',
+    "hljs-built_in": {},
+    "hljs-type": {},
+    "hljs-number": {},
+    "hljs-class": {},
+    "hljs-string": {},
+    "hljs-meta-string": {},
+    "hljs-regexp": {},
+    "hljs-template-tag": {},
+    "hljs-subst": {},
+    "hljs-function": {},
+    "hljs-title": {},
+    "hljs-params": {},
+    "hljs-formula": {},
+    "hljs-comment": {
+      fontStyle: "italic",
     },
-    'hljs-quote': {
-      fontStyle: 'italic',
+    "hljs-quote": {
+      fontStyle: "italic",
     },
-    'hljs-doctag': {},
-    'hljs-meta': {},
-    'hljs-meta-keyword': {},
-    'hljs-tag': {},
-    'hljs-variable': {},
-    'hljs-template-variable': {},
-    'hljs-attr': {},
-    'hljs-attribute': {},
-    'hljs-builtin-name': {},
-    'hljs-section': {},
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-doctag": {},
+    "hljs-meta": {},
+    "hljs-meta-keyword": {},
+    "hljs-tag": {},
+    "hljs-variable": {},
+    "hljs-template-variable": {},
+    "hljs-attr": {},
+    "hljs-attribute": {},
+    "hljs-builtin-name": {},
+    "hljs-section": {},
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-bullet': {},
-    'hljs-selector-tag': {},
-    'hljs-selector-id': {},
-    'hljs-selector-class': {},
-    'hljs-selector-attr': {},
-    'hljs-selector-pseudo': {},
-    'hljs-addition': {
-      display: 'inline-block',
-      width: '100%',
+    "hljs-bullet": {},
+    "hljs-selector-tag": {},
+    "hljs-selector-id": {},
+    "hljs-selector-class": {},
+    "hljs-selector-attr": {},
+    "hljs-selector-pseudo": {},
+    "hljs-addition": {
+      display: "inline-block",
+      width: "100%",
     },
-    'hljs-deletion': {
-      display: 'inline-block',
-      width: '100%',
+    "hljs-deletion": {
+      display: "inline-block",
+      width: "100%",
     },
   },
   noColorColorsTheme,
diff --git a/packages/ui-gemini/src/ui/themes/semantic-tokens.ts b/packages/ui-gemini/src/ui/themes/semantic-tokens.ts
index 794ce745b..e4774d2d8 100644
--- a/packages/ui-gemini/src/ui/themes/semantic-tokens.ts
+++ b/packages/ui-gemini/src/ui/themes/semantic-tokens.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lightTheme, darkTheme, ansiTheme } from './theme.js';
+import { ansiTheme, darkTheme, lightTheme } from "./theme.js";
 
 export interface SemanticColors {
   text: {
diff --git a/packages/ui-gemini/src/ui/themes/shades-of-purple.ts b/packages/ui-gemini/src/ui/themes/shades-of-purple.ts
index 7fc513a61..a41ab07e3 100644
--- a/packages/ui-gemini/src/ui/themes/shades-of-purple.ts
+++ b/packages/ui-gemini/src/ui/themes/shades-of-purple.ts
@@ -4,348 +4,348 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { interpolateColor } from "./color-utils.js";
 /**
  * Shades of Purple Theme — for Highlight.js.
  * @author Ahmad Awais <https://twitter.com/mrahmadawais/>
  */
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const shadesOfPurpleColors: ColorsTheme = {
-  type: 'dark',
+  type: "dark",
   // Required colors for ColorsTheme interface
-  Background: '#2d2b57', // Main background
-  Foreground: '#e3dfff', // Default text color (hljs, hljs-subst)
-  LightBlue: '#847ace', // Light blue/purple accent
-  AccentBlue: '#a599e9', // Borders, secondary blue
-  AccentPurple: '#ac65ff', // Comments (main purple)
-  AccentCyan: '#a1feff', // Names
-  AccentGreen: '#A5FF90', // Strings and many others
-  AccentYellow: '#fad000', // Title, main yellow
-  AccentRed: '#ff628c', // Error/deletion accent
-  DiffAdded: '#383E45',
-  DiffRemoved: '#572244',
-  Comment: '#B362FF', // Comment color (same as AccentPurple)
-  Gray: '#726c86', // Gray color
-  DarkGray: interpolateColor('#726c86', '#2d2b57', 0.5),
-  GradientColors: ['#4d21fc', '#847ace', '#ff628c'],
+  Background: "#2d2b57", // Main background
+  Foreground: "#e3dfff", // Default text color (hljs, hljs-subst)
+  LightBlue: "#847ace", // Light blue/purple accent
+  AccentBlue: "#a599e9", // Borders, secondary blue
+  AccentPurple: "#ac65ff", // Comments (main purple)
+  AccentCyan: "#a1feff", // Names
+  AccentGreen: "#A5FF90", // Strings and many others
+  AccentYellow: "#fad000", // Title, main yellow
+  AccentRed: "#ff628c", // Error/deletion accent
+  DiffAdded: "#383E45",
+  DiffRemoved: "#572244",
+  Comment: "#B362FF", // Comment color (same as AccentPurple)
+  Gray: "#726c86", // Gray color
+  DarkGray: interpolateColor("#726c86", "#2d2b57", 0.5),
+  GradientColors: ["#4d21fc", "#847ace", "#ff628c"],
 };
 
 // Additional colors from CSS that don't fit in the ColorsTheme interface
 const additionalColors = {
-  AccentYellowAlt: '#f8d000', // Attr yellow (slightly different)
-  AccentOrange: '#fb9e00', // Keywords, built_in, meta
-  AccentPink: '#fa658d', // Numbers, literals
-  AccentLightPurple: '#c991ff', // For params and properties
-  AccentDarkPurple: '#6943ff', // For operators
-  AccentTeal: '#2ee2fa', // For special constructs
+  AccentYellowAlt: "#f8d000", // Attr yellow (slightly different)
+  AccentOrange: "#fb9e00", // Keywords, built_in, meta
+  AccentPink: "#fa658d", // Numbers, literals
+  AccentLightPurple: "#c991ff", // For params and properties
+  AccentDarkPurple: "#6943ff", // For operators
+  AccentTeal: "#2ee2fa", // For special constructs
 };
 
 export const ShadesOfPurple = new Theme(
-  'Shades Of Purple',
-  'dark',
+  "Shades Of Purple",
+  "dark",
   {
     // Base styles
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
+      display: "block",
+      overflowX: "auto",
       background: shadesOfPurpleColors.Background,
       color: shadesOfPurpleColors.Foreground,
     },
 
     // Title elements
-    'hljs-title': {
+    "hljs-title": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
 
     // Names
-    'hljs-name': {
+    "hljs-name": {
       color: shadesOfPurpleColors.AccentCyan,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
 
     // Tags
-    'hljs-tag': {
+    "hljs-tag": {
       color: shadesOfPurpleColors.Foreground,
     },
 
     // Attributes
-    'hljs-attr': {
+    "hljs-attr": {
       color: additionalColors.AccentYellowAlt,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
 
     // Built-ins, selector tags, sections
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: additionalColors.AccentOrange,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: additionalColors.AccentOrange,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-section': {
+    "hljs-section": {
       color: additionalColors.AccentOrange,
     },
 
     // Keywords
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: additionalColors.AccentOrange,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
 
     // Default text and substitutions
-    'hljs-subst': {
+    "hljs-subst": {
       color: shadesOfPurpleColors.Foreground,
     },
 
     // Strings and related elements (all green)
-    'hljs-string': {
+    "hljs-string": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-code': {
+    "hljs-code": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       color: shadesOfPurpleColors.AccentRed,
     },
 
     // Meta elements
-    'hljs-meta': {
+    "hljs-meta": {
       color: additionalColors.AccentOrange,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: additionalColors.AccentOrange,
     },
 
     // Comments
-    'hljs-comment': {
+    "hljs-comment": {
       color: shadesOfPurpleColors.AccentPurple,
     },
 
     // Literals and numbers
-    'hljs-literal': {
+    "hljs-literal": {
       color: additionalColors.AccentPink,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-number': {
+    "hljs-number": {
       color: additionalColors.AccentPink,
     },
 
     // Emphasis and strong
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
 
     // Diff-specific classes
-    'hljs-diff': {
+    "hljs-diff": {
       color: shadesOfPurpleColors.Foreground,
     },
-    'hljs-meta.hljs-diff': {
+    "hljs-meta.hljs-diff": {
       color: shadesOfPurpleColors.AccentBlue,
     },
-    'hljs-ln': {
+    "hljs-ln": {
       color: shadesOfPurpleColors.Gray,
     },
 
     // Additional elements that might be needed
-    'hljs-type': {
+    "hljs-type": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'normal',
+      fontWeight: "normal",
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: shadesOfPurpleColors.AccentYellow,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: shadesOfPurpleColors.AccentGreen,
     },
-    'hljs-function .hljs-keyword': {
+    "hljs-function .hljs-keyword": {
       color: additionalColors.AccentOrange,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: shadesOfPurpleColors.LightBlue,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
 
     // Function parameters
-    'hljs-params': {
+    "hljs-params": {
       color: additionalColors.AccentLightPurple,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
 
     // Class definitions
-    'hljs-class': {
+    "hljs-class": {
       color: shadesOfPurpleColors.AccentCyan,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Function definitions
-    'hljs-function': {
+    "hljs-function": {
       color: shadesOfPurpleColors.AccentCyan,
     },
 
     // Object properties
-    'hljs-property': {
+    "hljs-property": {
       color: shadesOfPurpleColors.AccentBlue,
     },
 
     // Operators
-    'hljs-operator': {
+    "hljs-operator": {
       color: additionalColors.AccentDarkPurple,
     },
 
     // Punctuation (if supported by the parser)
-    'hljs-punctuation': {
+    "hljs-punctuation": {
       color: shadesOfPurpleColors.Gray,
     },
 
     // CSS ID selectors
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Character literals
-    'hljs-char': {
+    "hljs-char": {
       color: shadesOfPurpleColors.AccentGreen,
     },
 
     // Escape sequences
-    'hljs-escape': {
+    "hljs-escape": {
       color: additionalColors.AccentPink,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Meta keywords
-    'hljs-meta-keyword': {
+    "hljs-meta-keyword": {
       color: additionalColors.AccentOrange,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Built-in names
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: additionalColors.AccentTeal,
     },
 
     // Modules
-    'hljs-module': {
+    "hljs-module": {
       color: shadesOfPurpleColors.AccentCyan,
     },
 
     // Namespaces
-    'hljs-namespace': {
+    "hljs-namespace": {
       color: shadesOfPurpleColors.LightBlue,
     },
 
     // Important annotations
-    'hljs-important': {
+    "hljs-important": {
       color: shadesOfPurpleColors.AccentRed,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Formulas (for LaTeX, etc.)
-    'hljs-formula': {
+    "hljs-formula": {
       color: shadesOfPurpleColors.AccentCyan,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
 
     // Language-specific additions
     // Python decorators
-    'hljs-decorator': {
+    "hljs-decorator": {
       color: additionalColors.AccentTeal,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // Ruby symbols
-    'hljs-symbol.ruby': {
+    "hljs-symbol.ruby": {
       color: additionalColors.AccentPink,
     },
 
     // SQL keywords
-    'hljs-keyword.sql': {
+    "hljs-keyword.sql": {
       color: additionalColors.AccentOrange,
-      textTransform: 'uppercase',
+      textTransform: "uppercase",
     },
 
     // Markdown specific
-    'hljs-section.markdown': {
+    "hljs-section.markdown": {
       color: shadesOfPurpleColors.AccentYellow,
-      fontWeight: 'bold',
+      fontWeight: "bold",
     },
 
     // JSON keys
-    'hljs-attr.json': {
+    "hljs-attr.json": {
       color: shadesOfPurpleColors.AccentCyan,
     },
 
     // XML/HTML specific
-    'hljs-tag .hljs-name': {
+    "hljs-tag .hljs-name": {
       color: shadesOfPurpleColors.AccentRed,
     },
-    'hljs-tag .hljs-attr': {
+    "hljs-tag .hljs-attr": {
       color: additionalColors.AccentYellowAlt,
     },
 
     // Line highlighting (if line numbers are enabled)
-    'hljs.hljs-line-numbers': {
+    "hljs.hljs-line-numbers": {
       borderRight: `1px solid ${shadesOfPurpleColors.Gray}`,
     },
-    'hljs.hljs-line-numbers .hljs-ln-numbers': {
+    "hljs.hljs-line-numbers .hljs-ln-numbers": {
       color: shadesOfPurpleColors.Gray,
-      paddingRight: '1em',
+      paddingRight: "1em",
     },
-    'hljs.hljs-line-numbers .hljs-ln-code': {
-      paddingLeft: '1em',
+    "hljs.hljs-line-numbers .hljs-ln-code": {
+      paddingLeft: "1em",
     },
 
     // Selection styling
-    'hljs::selection': {
-      background: shadesOfPurpleColors.AccentBlue + '40', // 40 = 25% opacity
+    "hljs::selection": {
+      background: shadesOfPurpleColors.AccentBlue + "40", // 40 = 25% opacity
     },
-    'hljs ::-moz-selection': {
-      background: shadesOfPurpleColors.AccentBlue + '40',
+    "hljs ::-moz-selection": {
+      background: shadesOfPurpleColors.AccentBlue + "40",
     },
 
     // Highlighted lines (for emphasis)
-    'hljs .hljs-highlight': {
-      background: shadesOfPurpleColors.AccentPurple + '20', // 20 = 12.5% opacity
-      display: 'block',
-      width: '100%',
+    "hljs .hljs-highlight": {
+      background: shadesOfPurpleColors.AccentPurple + "20", // 20 = 12.5% opacity
+      display: "block",
+      width: "100%",
     },
   },
   shadesOfPurpleColors,
diff --git a/packages/ui-gemini/src/ui/themes/theme-manager.test.ts b/packages/ui-gemini/src/ui/themes/theme-manager.test.ts
index 1974ed871..855bfec8f 100644
--- a/packages/ui-gemini/src/ui/themes/theme-manager.test.ts
+++ b/packages/ui-gemini/src/ui/themes/theme-manager.test.ts
@@ -5,47 +5,47 @@
  */
 
 // Patch: Unset NO_COLOR at the very top before any imports
-if (process.env['NO_COLOR'] !== undefined) {
-  delete process.env['NO_COLOR'];
+if (process.env["NO_COLOR"] !== undefined) {
+  delete process.env["NO_COLOR"];
 }
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import { themeManager, DEFAULT_THEME } from './theme-manager.js';
-import type { CustomTheme } from './theme.js';
-import * as fs from 'node:fs';
-import * as os from 'node:os';
-import type * as osActual from 'node:os';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import type * as osActual from "node:os";
+import * as os from "node:os";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { CustomTheme } from "./theme.js";
+import { DEFAULT_THEME, themeManager } from "./theme-manager.js";
 
-vi.mock('node:fs');
-vi.mock('node:os', async (importOriginal) => {
+vi.mock("node:fs");
+vi.mock("node:os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof osActual>();
   return {
     ...actualOs,
     homedir: vi.fn(),
-    platform: vi.fn(() => 'linux'),
+    platform: vi.fn(() => "linux"),
   };
 });
 
 const validCustomTheme: CustomTheme = {
-  type: 'custom',
-  name: 'MyCustomTheme',
-  Background: '#000000',
-  Foreground: '#ffffff',
-  LightBlue: '#89BDCD',
-  AccentBlue: '#3B82F6',
-  AccentPurple: '#8B5CF6',
-  AccentCyan: '#06B6D4',
-  AccentGreen: '#3CA84B',
-  AccentYellow: 'yellow',
-  AccentRed: 'red',
-  DiffAdded: 'green',
-  DiffRemoved: 'red',
-  Comment: 'gray',
-  Gray: 'gray',
+  type: "custom",
+  name: "MyCustomTheme",
+  Background: "#000000",
+  Foreground: "#ffffff",
+  LightBlue: "#89BDCD",
+  AccentBlue: "#3B82F6",
+  AccentPurple: "#8B5CF6",
+  AccentCyan: "#06B6D4",
+  AccentGreen: "#3CA84B",
+  AccentYellow: "yellow",
+  AccentRed: "red",
+  DiffAdded: "green",
+  DiffRemoved: "red",
+  Comment: "gray",
+  Gray: "gray",
 };
 
-describe('ThemeManager', () => {
+describe("ThemeManager", () => {
   beforeEach(() => {
     // Reset themeManager state
     themeManager.loadCustomThemes({});
@@ -56,94 +56,93 @@ describe('ThemeManager', () => {
     vi.restoreAllMocks();
   });
 
-  it('should load valid custom themes', () => {
+  it("should load valid custom themes", () => {
     themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
-    expect(themeManager.getCustomThemeNames()).toContain('MyCustomTheme');
-    expect(themeManager.isCustomTheme('MyCustomTheme')).toBe(true);
+    expect(themeManager.getCustomThemeNames()).toContain("MyCustomTheme");
+    expect(themeManager.isCustomTheme("MyCustomTheme")).toBe(true);
   });
 
-  it('should set and get the active theme', () => {
+  it("should set and get the active theme", () => {
     expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
-    themeManager.setActiveTheme('Ayu');
-    expect(themeManager.getActiveTheme().name).toBe('Ayu');
+    themeManager.setActiveTheme("Ayu");
+    expect(themeManager.getActiveTheme().name).toBe("Ayu");
   });
 
-  it('should set and get a custom active theme', () => {
+  it("should set and get a custom active theme", () => {
     themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
-    themeManager.setActiveTheme('MyCustomTheme');
-    expect(themeManager.getActiveTheme().name).toBe('MyCustomTheme');
+    themeManager.setActiveTheme("MyCustomTheme");
+    expect(themeManager.getActiveTheme().name).toBe("MyCustomTheme");
   });
 
-  it('should return false when setting a non-existent theme', () => {
-    expect(themeManager.setActiveTheme('NonExistentTheme')).toBe(false);
+  it("should return false when setting a non-existent theme", () => {
+    expect(themeManager.setActiveTheme("NonExistentTheme")).toBe(false);
     expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
   });
 
-  it('should list available themes including custom themes', () => {
+  it("should list available themes including custom themes", () => {
     themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
     const available = themeManager.getAvailableThemes();
     expect(
       available.some(
-        (t: { name: string; isCustom?: boolean }) =>
-          t.name === 'MyCustomTheme' && t.isCustom,
+        (t: { name: string; isCustom?: boolean }) => t.name === "MyCustomTheme" && t.isCustom,
       ),
     ).toBe(true);
   });
 
-  it('should get a theme by name', () => {
-    expect(themeManager.getTheme('Ayu')).toBeDefined();
+  it("should get a theme by name", () => {
+    expect(themeManager.getTheme("Ayu")).toBeDefined();
     themeManager.loadCustomThemes({ MyCustomTheme: validCustomTheme });
-    expect(themeManager.getTheme('MyCustomTheme')).toBeDefined();
+    expect(themeManager.getTheme("MyCustomTheme")).toBeDefined();
   });
 
-  it('should fall back to default theme if active theme is invalid', () => {
+  it("should fall back to default theme if active theme is invalid", () => {
     (themeManager as unknown as { activeTheme: unknown }).activeTheme = {
-      name: 'NonExistent',
-      type: 'custom',
+      name: "NonExistent",
+      type: "custom",
     };
     expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
   });
 
-  it('should return NoColorTheme if NO_COLOR is set', () => {
-    const original = process.env['NO_COLOR'];
-    process.env['NO_COLOR'] = '1';
-    expect(themeManager.getActiveTheme().name).toBe('NoColor');
+  it("should return NoColorTheme if NO_COLOR is set", () => {
+    const original = process.env["NO_COLOR"];
+    process.env["NO_COLOR"] = "1";
+    expect(themeManager.getActiveTheme().name).toBe("NoColor");
     if (original === undefined) {
-      delete process.env['NO_COLOR'];
+      delete process.env["NO_COLOR"];
     } else {
-      process.env['NO_COLOR'] = original;
+      process.env["NO_COLOR"] = original;
     }
   });
 
-  describe('when loading a theme from a file', () => {
-    const mockThemePath = './my-theme.json';
+  describe("when loading a theme from a file", () => {
+    const mockThemePath = "./my-theme.json";
     const mockTheme: CustomTheme = {
       ...validCustomTheme,
-      name: 'My File Theme',
+      name: "My File Theme",
     };
 
     beforeEach(() => {
-      vi.mocked(os.homedir).mockReturnValue('/home/user');
-      vi.spyOn(fs, 'realpathSync').mockImplementation((p) => p as string);
+      vi.mocked(os.homedir).mockReturnValue("/home/user");
+      vi.spyOn(fs, "realpathSync").mockImplementation((p) => p as string);
     });
 
-    it('should load a theme from a valid file path', () => {
-      vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(mockTheme));
+    it("should load a theme from a valid file path", () => {
+      vi.spyOn(fs, "existsSync").mockReturnValue(true);
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(mockTheme));
 
-      const result = themeManager.setActiveTheme('/home/user/my-theme.json');
+      const result = themeManager.setActiveTheme("/home/user/my-theme.json");
 
       expect(result).toBe(true);
       const activeTheme = themeManager.getActiveTheme();
-      expect(activeTheme.name).toBe('My File Theme');
+      expect(activeTheme.name).toBe("My File Theme");
       expect(fs.readFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('my-theme.json'),
-        'utf-8',
+        expect.stringContaining("my-theme.json"),
+        "utf-8",
       );
     });
 
-    it('should not load a theme if the file does not exist', () => {
-      vi.spyOn(fs, 'existsSync').mockReturnValue(false);
+    it("should not load a theme if the file does not exist", () => {
+      vi.spyOn(fs, "existsSync").mockReturnValue(false);
 
       const result = themeManager.setActiveTheme(mockThemePath);
 
@@ -151,9 +150,9 @@ describe('ThemeManager', () => {
       expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
     });
 
-    it('should not load a theme from a file with invalid JSON', () => {
-      vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-      vi.spyOn(fs, 'readFileSync').mockReturnValue('invalid json');
+    it("should not load a theme from a file with invalid JSON", () => {
+      vi.spyOn(fs, "existsSync").mockReturnValue(true);
+      vi.spyOn(fs, "readFileSync").mockReturnValue("invalid json");
 
       const result = themeManager.setActiveTheme(mockThemePath);
 
@@ -161,19 +160,17 @@ describe('ThemeManager', () => {
       expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
     });
 
-    it('should not load a theme from an untrusted file path and log a message', () => {
-      vi.spyOn(fs, 'existsSync').mockReturnValue(true);
-      vi.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify(mockTheme));
-      const consoleWarnSpy = vi
-        .spyOn(debugLogger, 'warn')
-        .mockImplementation(() => {});
+    it("should not load a theme from an untrusted file path and log a message", () => {
+      vi.spyOn(fs, "existsSync").mockReturnValue(true);
+      vi.spyOn(fs, "readFileSync").mockReturnValue(JSON.stringify(mockTheme));
+      const consoleWarnSpy = vi.spyOn(debugLogger, "warn").mockImplementation(() => {});
 
-      const result = themeManager.setActiveTheme('/untrusted/my-theme.json');
+      const result = themeManager.setActiveTheme("/untrusted/my-theme.json");
 
       expect(result).toBe(false);
       expect(themeManager.getActiveTheme().name).toBe(DEFAULT_THEME.name);
       expect(consoleWarnSpy).toHaveBeenCalledWith(
-        expect.stringContaining('is outside your home directory'),
+        expect.stringContaining("is outside your home directory"),
       );
 
       consoleWarnSpy.mockRestore();
diff --git a/packages/ui-gemini/src/ui/themes/theme-manager.ts b/packages/ui-gemini/src/ui/themes/theme-manager.ts
index 8ee65cd00..194059e22 100644
--- a/packages/ui-gemini/src/ui/themes/theme-manager.ts
+++ b/packages/ui-gemini/src/ui/themes/theme-manager.ts
@@ -4,29 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { AyuDark } from './ayu.js';
-import { AyuLight } from './ayu-light.js';
-import { AtomOneDark } from './atom-one-dark.js';
-import { Dracula } from './dracula.js';
-import { GitHubDark } from './github-dark.js';
-import { GitHubLight } from './github-light.js';
-import { GoogleCode } from './googlecode.js';
-import { Holiday } from './holiday.js';
-import { DefaultLight } from './default-light.js';
-import { DefaultDark } from './default.js';
-import { ShadesOfPurple } from './shades-of-purple.js';
-import { XCode } from './xcode.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import type { Theme, ThemeType, CustomTheme } from './theme.js';
-import { createCustomTheme, validateCustomTheme } from './theme.js';
-import type { SemanticColors } from './semantic-tokens.js';
-import { ANSI } from './ansi.js';
-import { ANSILight } from './ansi-light.js';
-import { NoColorTheme } from './no-color.js';
-import process from 'node:process';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import process from "node:process";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { ANSI } from "./ansi.js";
+import { ANSILight } from "./ansi-light.js";
+import { AtomOneDark } from "./atom-one-dark.js";
+import { AyuDark } from "./ayu.js";
+import { AyuLight } from "./ayu-light.js";
+import { DefaultDark } from "./default.js";
+import { DefaultLight } from "./default-light.js";
+import { Dracula } from "./dracula.js";
+import { GitHubDark } from "./github-dark.js";
+import { GitHubLight } from "./github-light.js";
+import { GoogleCode } from "./googlecode.js";
+import { Holiday } from "./holiday.js";
+import { NoColorTheme } from "./no-color.js";
+import type { SemanticColors } from "./semantic-tokens.js";
+import { ShadesOfPurple } from "./shades-of-purple.js";
+import type { CustomTheme, Theme, ThemeType } from "./theme.js";
+import { createCustomTheme, validateCustomTheme } from "./theme.js";
+import { XCode } from "./xcode.js";
 
 export interface ThemeDisplay {
   name: string;
@@ -72,9 +72,7 @@ class ThemeManager {
       return;
     }
 
-    for (const [name, customThemeConfig] of Object.entries(
-      customThemesSettings,
-    )) {
+    for (const [name, customThemeConfig] of Object.entries(customThemesSettings)) {
       const validation = validateCustomTheme(customThemeConfig);
       if (validation.isValid) {
         if (validation.warning) {
@@ -84,7 +82,7 @@ class ThemeManager {
           ...DEFAULT_THEME.colors,
           ...customThemeConfig,
           name: customThemeConfig.name || name,
-          type: 'custom',
+          type: "custom",
         };
 
         try {
@@ -100,7 +98,7 @@ class ThemeManager {
     // If the current active theme is a custom theme, keep it if still valid
     if (
       this.activeTheme &&
-      this.activeTheme.type === 'custom' &&
+      this.activeTheme.type === "custom" &&
       this.customThemes.has(this.activeTheme.name)
     ) {
       this.activeTheme = this.customThemes.get(this.activeTheme.name)!;
@@ -126,17 +124,13 @@ class ThemeManager {
    * @returns The active theme.
    */
   getActiveTheme(): Theme {
-    if (process.env['NO_COLOR']) {
+    if (process.env["NO_COLOR"]) {
       return NoColorTheme;
     }
 
     if (this.activeTheme) {
-      const isBuiltIn = this.availableThemes.some(
-        (t) => t.name === this.activeTheme.name,
-      );
-      const isCustom = [...this.customThemes.values()].includes(
-        this.activeTheme,
-      );
+      const isBuiltIn = this.availableThemes.some((t) => t.name === this.activeTheme.name);
+      const isCustom = [...this.customThemes.values()].includes(this.activeTheme);
 
       if (isBuiltIn || isCustom) {
         return this.activeTheme;
@@ -183,26 +177,24 @@ class ThemeManager {
       isCustom: false,
     }));
 
-    const customThemes = Array.from(this.customThemes.values()).map(
-      (theme) => ({
-        name: theme.name,
-        type: theme.type,
-        isCustom: true,
-      }),
-    );
+    const customThemes = Array.from(this.customThemes.values()).map((theme) => ({
+      name: theme.name,
+      type: theme.type,
+      isCustom: true,
+    }));
 
     const allThemes = [...builtInThemes, ...customThemes];
 
     const sortedThemes = allThemes.sort((a, b) => {
       const typeOrder = (type: ThemeType): number => {
         switch (type) {
-          case 'dark':
+          case "dark":
             return 1;
-          case 'light':
+          case "light":
             return 2;
-          case 'ansi':
+          case "ansi":
             return 3;
-          case 'custom':
+          case "custom":
             return 4; // Custom themes at the end
           default:
             return 5;
@@ -229,11 +221,7 @@ class ThemeManager {
   }
 
   private isPath(themeName: string): boolean {
-    return (
-      themeName.endsWith('.json') ||
-      themeName.startsWith('.') ||
-      path.isAbsolute(themeName)
-    );
+    return themeName.endsWith(".json") || themeName.startsWith(".") || path.isAbsolute(themeName);
   }
 
   private loadThemeFromFile(themePath: string): Theme | undefined {
@@ -257,14 +245,12 @@ class ThemeManager {
       }
 
       // 3. Read, parse, and validate the theme file.
-      const themeContent = fs.readFileSync(canonicalPath, 'utf-8');
+      const themeContent = fs.readFileSync(canonicalPath, "utf-8");
       const customThemeConfig = JSON.parse(themeContent) as CustomTheme;
 
       const validation = validateCustomTheme(customThemeConfig);
       if (!validation.isValid) {
-        debugLogger.warn(
-          `Invalid custom theme from file "${themePath}": ${validation.error}`,
-        );
+        debugLogger.warn(`Invalid custom theme from file "${themePath}": ${validation.error}`);
         return undefined;
       }
 
@@ -277,7 +263,7 @@ class ThemeManager {
         ...DEFAULT_THEME.colors,
         ...customThemeConfig,
         name: customThemeConfig.name || canonicalPath,
-        type: 'custom',
+        type: "custom",
       };
 
       const theme = createCustomTheme(themeWithDefaults);
@@ -286,13 +272,8 @@ class ThemeManager {
     } catch (error) {
       // Any error in the process (file not found, bad JSON, etc.) is caught here.
       // We can return undefined silently for file-not-found, and warn for others.
-      if (
-        !(error instanceof Error && 'code' in error && error.code === 'ENOENT')
-      ) {
-        debugLogger.warn(
-          `Could not load theme from file "${themePath}":`,
-          error,
-        );
+      if (!(error instanceof Error && "code" in error && error.code === "ENOENT")) {
+        debugLogger.warn(`Could not load theme from file "${themePath}":`, error);
       }
       return undefined;
     }
@@ -304,9 +285,7 @@ class ThemeManager {
     }
 
     // First check built-in themes
-    const builtInTheme = this.availableThemes.find(
-      (theme) => theme.name === themeName,
-    );
+    const builtInTheme = this.availableThemes.find((theme) => theme.name === themeName);
     if (builtInTheme) {
       return builtInTheme;
     }
diff --git a/packages/ui-gemini/src/ui/themes/theme.test.ts b/packages/ui-gemini/src/ui/themes/theme.test.ts
index 8a56dd9ba..cc8bb9505 100644
--- a/packages/ui-gemini/src/ui/themes/theme.test.ts
+++ b/packages/ui-gemini/src/ui/themes/theme.test.ts
@@ -4,117 +4,117 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import * as themeModule from './theme.js';
-import { themeManager } from './theme-manager.js';
+import { describe, expect, it } from "vitest";
+import * as themeModule from "./theme.js";
+import { themeManager } from "./theme-manager.js";
 
 const { validateCustomTheme, createCustomTheme } = themeModule;
 type CustomTheme = themeModule.CustomTheme;
 
-describe('createCustomTheme', () => {
+describe("createCustomTheme", () => {
   const baseTheme: CustomTheme = {
-    type: 'custom',
-    name: 'Test Theme',
-    Background: '#000000',
-    Foreground: '#ffffff',
-    LightBlue: '#ADD8E6',
-    AccentBlue: '#0000FF',
-    AccentPurple: '#800080',
-    AccentCyan: '#00FFFF',
-    AccentGreen: '#008000',
-    AccentYellow: '#FFFF00',
-    AccentRed: '#FF0000',
-    DiffAdded: '#00FF00',
-    DiffRemoved: '#FF0000',
-    Comment: '#808080',
-    Gray: '#cccccc',
+    type: "custom",
+    name: "Test Theme",
+    Background: "#000000",
+    Foreground: "#ffffff",
+    LightBlue: "#ADD8E6",
+    AccentBlue: "#0000FF",
+    AccentPurple: "#800080",
+    AccentCyan: "#00FFFF",
+    AccentGreen: "#008000",
+    AccentYellow: "#FFFF00",
+    AccentRed: "#FF0000",
+    DiffAdded: "#00FF00",
+    DiffRemoved: "#FF0000",
+    Comment: "#808080",
+    Gray: "#cccccc",
     // DarkGray intentionally omitted to test fallback
   };
 
-  it('should interpolate DarkGray when not provided', () => {
+  it("should interpolate DarkGray when not provided", () => {
     const theme = createCustomTheme(baseTheme);
     // Interpolate between Gray (#cccccc) and Background (#000000) at 0.5
     // #cccccc is RGB(204, 204, 204)
     // #000000 is RGB(0, 0, 0)
     // Midpoint is RGB(102, 102, 102) which is #666666
-    expect(theme.colors.DarkGray).toBe('#666666');
+    expect(theme.colors.DarkGray).toBe("#666666");
   });
 
-  it('should use provided DarkGray', () => {
+  it("should use provided DarkGray", () => {
     const theme = createCustomTheme({
       ...baseTheme,
-      DarkGray: '#123456',
+      DarkGray: "#123456",
     });
-    expect(theme.colors.DarkGray).toBe('#123456');
+    expect(theme.colors.DarkGray).toBe("#123456");
   });
 
-  it('should interpolate DarkGray when text.secondary is provided but DarkGray is not', () => {
+  it("should interpolate DarkGray when text.secondary is provided but DarkGray is not", () => {
     const customTheme: CustomTheme = {
-      type: 'custom',
-      name: 'Test',
+      type: "custom",
+      name: "Test",
       text: {
-        secondary: '#cccccc', // Gray source
+        secondary: "#cccccc", // Gray source
       },
       background: {
-        primary: '#000000', // Background source
+        primary: "#000000", // Background source
       },
     };
     const theme = createCustomTheme(customTheme);
     // Should be interpolated between #cccccc and #000000 at 0.5 -> #666666
-    expect(theme.colors.DarkGray).toBe('#666666');
+    expect(theme.colors.DarkGray).toBe("#666666");
   });
 
-  it('should prefer text.secondary over Gray for interpolation', () => {
+  it("should prefer text.secondary over Gray for interpolation", () => {
     const customTheme: CustomTheme = {
-      type: 'custom',
-      name: 'Test',
+      type: "custom",
+      name: "Test",
       text: {
-        secondary: '#cccccc', // Should be used
+        secondary: "#cccccc", // Should be used
       },
-      Gray: '#aaaaaa', // Should be ignored
+      Gray: "#aaaaaa", // Should be ignored
       background: {
-        primary: '#000000',
+        primary: "#000000",
       },
     };
     const theme = createCustomTheme(customTheme);
     // Interpolate between #cccccc and #000000 -> #666666
-    expect(theme.colors.DarkGray).toBe('#666666');
+    expect(theme.colors.DarkGray).toBe("#666666");
   });
 });
 
-describe('validateCustomTheme', () => {
+describe("validateCustomTheme", () => {
   const validTheme: CustomTheme = {
-    type: 'custom',
-    name: 'My Custom Theme',
-    Background: '#FFFFFF',
-    Foreground: '#000000',
-    LightBlue: '#ADD8E6',
-    AccentBlue: '#0000FF',
-    AccentPurple: '#800080',
-    AccentCyan: '#00FFFF',
-    AccentGreen: '#008000',
-    AccentYellow: '#FFFF00',
-    AccentRed: '#FF0000',
-    DiffAdded: '#00FF00',
-    DiffRemoved: '#FF0000',
-    Comment: '#808080',
-    Gray: '#808080',
+    type: "custom",
+    name: "My Custom Theme",
+    Background: "#FFFFFF",
+    Foreground: "#000000",
+    LightBlue: "#ADD8E6",
+    AccentBlue: "#0000FF",
+    AccentPurple: "#800080",
+    AccentCyan: "#00FFFF",
+    AccentGreen: "#008000",
+    AccentYellow: "#FFFF00",
+    AccentRed: "#FF0000",
+    DiffAdded: "#00FF00",
+    DiffRemoved: "#FF0000",
+    Comment: "#808080",
+    Gray: "#808080",
   };
 
-  it('should return isValid: true for a valid theme', () => {
+  it("should return isValid: true for a valid theme", () => {
     const result = validateCustomTheme(validTheme);
     expect(result.isValid).toBe(true);
     expect(result.error).toBeUndefined();
   });
 
-  it('should return isValid: false for a theme with an invalid name', () => {
-    const invalidTheme = { ...validTheme, name: ' ' };
+  it("should return isValid: false for a theme with an invalid name", () => {
+    const invalidTheme = { ...validTheme, name: " " };
     const result = validateCustomTheme(invalidTheme);
     expect(result.isValid).toBe(false);
-    expect(result.error).toBe('Invalid theme name:  ');
+    expect(result.error).toBe("Invalid theme name:  ");
   });
 
-  it('should return isValid: true for a theme missing optional DiffAdded and DiffRemoved colors', () => {
+  it("should return isValid: true for a theme missing optional DiffAdded and DiffRemoved colors", () => {
     const legacyTheme: Partial<CustomTheme> = { ...validTheme };
     delete legacyTheme.DiffAdded;
     delete legacyTheme.DiffRemoved;
@@ -123,44 +123,44 @@ describe('validateCustomTheme', () => {
     expect(result.error).toBeUndefined();
   });
 
-  it('should return isValid: false for a theme with a very long name', () => {
-    const invalidTheme = { ...validTheme, name: 'a'.repeat(51) };
+  it("should return isValid: false for a theme with a very long name", () => {
+    const invalidTheme = { ...validTheme, name: "a".repeat(51) };
     const result = validateCustomTheme(invalidTheme);
     expect(result.isValid).toBe(false);
-    expect(result.error).toBe(`Invalid theme name: ${'a'.repeat(51)}`);
+    expect(result.error).toBe(`Invalid theme name: ${"a".repeat(51)}`);
   });
 });
 
-describe('themeManager.loadCustomThemes', () => {
-  const baseTheme: Omit<CustomTheme, 'DiffAdded' | 'DiffRemoved'> & {
+describe("themeManager.loadCustomThemes", () => {
+  const baseTheme: Omit<CustomTheme, "DiffAdded" | "DiffRemoved"> & {
     DiffAdded?: string;
     DiffRemoved?: string;
   } = {
-    type: 'custom',
-    name: 'Test Theme',
-    Background: '#FFF',
-    Foreground: '#000',
-    LightBlue: '#ADD8E6',
-    AccentBlue: '#00F',
-    AccentPurple: '#808',
-    AccentCyan: '#0FF',
-    AccentGreen: '#080',
-    AccentYellow: '#FF0',
-    AccentRed: '#F00',
-    Comment: '#888',
-    Gray: '#888',
+    type: "custom",
+    name: "Test Theme",
+    Background: "#FFF",
+    Foreground: "#000",
+    LightBlue: "#ADD8E6",
+    AccentBlue: "#00F",
+    AccentPurple: "#808",
+    AccentCyan: "#0FF",
+    AccentGreen: "#080",
+    AccentYellow: "#FF0",
+    AccentRed: "#F00",
+    Comment: "#888",
+    Gray: "#888",
   };
 
-  it('should use values from DEFAULT_THEME when DiffAdded and DiffRemoved are not provided', () => {
+  it("should use values from DEFAULT_THEME when DiffAdded and DiffRemoved are not provided", () => {
     const { darkTheme } = themeModule;
     const legacyTheme: Partial<CustomTheme> = { ...baseTheme };
     delete legacyTheme.DiffAdded;
     delete legacyTheme.DiffRemoved;
 
     themeManager.loadCustomThemes({
-      'Legacy Custom Theme': legacyTheme as CustomTheme,
+      "Legacy Custom Theme": legacyTheme as CustomTheme,
     });
-    const result = themeManager.getTheme('Legacy Custom Theme')!;
+    const result = themeManager.getTheme("Legacy Custom Theme")!;
 
     expect(result.colors.DiffAdded).toBe(darkTheme.DiffAdded);
     expect(result.colors.DiffRemoved).toBe(darkTheme.DiffRemoved);
diff --git a/packages/ui-gemini/src/ui/themes/theme.ts b/packages/ui-gemini/src/ui/themes/theme.ts
index e2762773d..b663a54eb 100644
--- a/packages/ui-gemini/src/ui/themes/theme.ts
+++ b/packages/ui-gemini/src/ui/themes/theme.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CSSProperties } from 'react';
-import type { SemanticColors } from './semantic-tokens.js';
-import { resolveColor, interpolateColor } from './color-utils.js';
+import type { CSSProperties } from "react";
+import { interpolateColor, resolveColor } from "./color-utils.js";
+import type { SemanticColors } from "./semantic-tokens.js";
 
-export type ThemeType = 'light' | 'dark' | 'ansi' | 'custom';
+export type ThemeType = "light" | "dark" | "ansi" | "custom";
 
 export interface ColorsTheme {
   type: ThemeType;
@@ -30,7 +30,7 @@ export interface ColorsTheme {
 }
 
 export interface CustomTheme {
-  type: 'custom';
+  type: "custom";
   name: string;
 
   text?: {
@@ -81,59 +81,59 @@ export interface CustomTheme {
 }
 
 export const lightTheme: ColorsTheme = {
-  type: 'light',
-  Background: '#FAFAFA',
-  Foreground: '#383A42',
-  LightBlue: '#89BDCD',
-  AccentBlue: '#3B82F6',
-  AccentPurple: '#8B5CF6',
-  AccentCyan: '#06B6D4',
-  AccentGreen: '#3CA84B',
-  AccentYellow: '#D5A40A',
-  AccentRed: '#DD4C4C',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FFCCCC',
-  Comment: '#008000',
-  Gray: '#97a0b0',
-  DarkGray: interpolateColor('#97a0b0', '#FAFAFA', 0.5),
-  GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
+  type: "light",
+  Background: "#FAFAFA",
+  Foreground: "#383A42",
+  LightBlue: "#89BDCD",
+  AccentBlue: "#3B82F6",
+  AccentPurple: "#8B5CF6",
+  AccentCyan: "#06B6D4",
+  AccentGreen: "#3CA84B",
+  AccentYellow: "#D5A40A",
+  AccentRed: "#DD4C4C",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FFCCCC",
+  Comment: "#008000",
+  Gray: "#97a0b0",
+  DarkGray: interpolateColor("#97a0b0", "#FAFAFA", 0.5),
+  GradientColors: ["#4796E4", "#847ACE", "#C3677F"],
 };
 
 export const darkTheme: ColorsTheme = {
-  type: 'dark',
-  Background: '#1E1E2E',
-  Foreground: '#CDD6F4',
-  LightBlue: '#ADD8E6',
-  AccentBlue: '#89B4FA',
-  AccentPurple: '#CBA6F7',
-  AccentCyan: '#89DCEB',
-  AccentGreen: '#A6E3A1',
-  AccentYellow: '#F9E2AF',
-  AccentRed: '#F38BA8',
-  DiffAdded: '#28350B',
-  DiffRemoved: '#430000',
-  Comment: '#6C7086',
-  Gray: '#6C7086',
-  DarkGray: interpolateColor('#6C7086', '#1E1E2E', 0.5),
-  GradientColors: ['#4796E4', '#847ACE', '#C3677F'],
+  type: "dark",
+  Background: "#1E1E2E",
+  Foreground: "#CDD6F4",
+  LightBlue: "#ADD8E6",
+  AccentBlue: "#89B4FA",
+  AccentPurple: "#CBA6F7",
+  AccentCyan: "#89DCEB",
+  AccentGreen: "#A6E3A1",
+  AccentYellow: "#F9E2AF",
+  AccentRed: "#F38BA8",
+  DiffAdded: "#28350B",
+  DiffRemoved: "#430000",
+  Comment: "#6C7086",
+  Gray: "#6C7086",
+  DarkGray: interpolateColor("#6C7086", "#1E1E2E", 0.5),
+  GradientColors: ["#4796E4", "#847ACE", "#C3677F"],
 };
 
 export const ansiTheme: ColorsTheme = {
-  type: 'ansi',
-  Background: 'black',
-  Foreground: 'white',
-  LightBlue: 'blue',
-  AccentBlue: 'blue',
-  AccentPurple: 'magenta',
-  AccentCyan: 'cyan',
-  AccentGreen: 'green',
-  AccentYellow: 'yellow',
-  AccentRed: 'red',
-  DiffAdded: 'green',
-  DiffRemoved: 'red',
-  Comment: 'gray',
-  Gray: 'gray',
-  DarkGray: 'gray',
+  type: "ansi",
+  Background: "black",
+  Foreground: "white",
+  LightBlue: "blue",
+  AccentBlue: "blue",
+  AccentPurple: "magenta",
+  AccentCyan: "cyan",
+  AccentGreen: "green",
+  AccentYellow: "yellow",
+  AccentRed: "red",
+  DiffAdded: "green",
+  DiffRemoved: "red",
+  Comment: "gray",
+  Gray: "gray",
+  DarkGray: "gray",
 };
 
 export class Theme {
@@ -195,10 +195,8 @@ export class Theme {
     this._colorMap = Object.freeze(this._buildColorMap(rawMappings)); // Build and freeze the map
 
     // Determine the default foreground color
-    const rawDefaultColor = rawMappings['hljs']?.color;
-    this.defaultColor =
-      (rawDefaultColor ? Theme._resolveColor(rawDefaultColor) : undefined) ??
-      ''; // Default to empty string if not found or resolvable
+    const rawDefaultColor = rawMappings["hljs"]?.color;
+    this.defaultColor = (rawDefaultColor ? Theme._resolveColor(rawDefaultColor) : undefined) ?? ""; // Default to empty string if not found or resolvable
   }
 
   /**
@@ -225,13 +223,11 @@ export class Theme {
    * @param hljsTheme The raw CSSProperties mappings from a react-syntax-highlighter theme object.
    * @returns An Ink-compatible theme map (Record<string, string>).
    */
-  protected _buildColorMap(
-    hljsTheme: Record<string, CSSProperties>,
-  ): Record<string, string> {
+  protected _buildColorMap(hljsTheme: Record<string, CSSProperties>): Record<string, string> {
     const inkTheme: Record<string, string> = {};
     for (const key in hljsTheme) {
       // Ensure the key starts with 'hljs-' or is 'hljs' for the base style
-      if (!key.startsWith('hljs-') && key !== 'hljs') {
+      if (!key.startsWith("hljs-") && key !== "hljs") {
         continue; // Skip keys not related to highlighting classes
       }
 
@@ -259,27 +255,25 @@ export class Theme {
  */
 export function createCustomTheme(customTheme: CustomTheme): Theme {
   const colors: ColorsTheme = {
-    type: 'custom',
-    Background: customTheme.background?.primary ?? customTheme.Background ?? '',
-    Foreground: customTheme.text?.primary ?? customTheme.Foreground ?? '',
-    LightBlue: customTheme.text?.link ?? customTheme.LightBlue ?? '',
-    AccentBlue: customTheme.text?.link ?? customTheme.AccentBlue ?? '',
-    AccentPurple: customTheme.text?.accent ?? customTheme.AccentPurple ?? '',
-    AccentCyan: customTheme.text?.link ?? customTheme.AccentCyan ?? '',
-    AccentGreen: customTheme.status?.success ?? customTheme.AccentGreen ?? '',
-    AccentYellow: customTheme.status?.warning ?? customTheme.AccentYellow ?? '',
-    AccentRed: customTheme.status?.error ?? customTheme.AccentRed ?? '',
-    DiffAdded:
-      customTheme.background?.diff?.added ?? customTheme.DiffAdded ?? '',
-    DiffRemoved:
-      customTheme.background?.diff?.removed ?? customTheme.DiffRemoved ?? '',
-    Comment: customTheme.ui?.comment ?? customTheme.Comment ?? '',
-    Gray: customTheme.text?.secondary ?? customTheme.Gray ?? '',
+    type: "custom",
+    Background: customTheme.background?.primary ?? customTheme.Background ?? "",
+    Foreground: customTheme.text?.primary ?? customTheme.Foreground ?? "",
+    LightBlue: customTheme.text?.link ?? customTheme.LightBlue ?? "",
+    AccentBlue: customTheme.text?.link ?? customTheme.AccentBlue ?? "",
+    AccentPurple: customTheme.text?.accent ?? customTheme.AccentPurple ?? "",
+    AccentCyan: customTheme.text?.link ?? customTheme.AccentCyan ?? "",
+    AccentGreen: customTheme.status?.success ?? customTheme.AccentGreen ?? "",
+    AccentYellow: customTheme.status?.warning ?? customTheme.AccentYellow ?? "",
+    AccentRed: customTheme.status?.error ?? customTheme.AccentRed ?? "",
+    DiffAdded: customTheme.background?.diff?.added ?? customTheme.DiffAdded ?? "",
+    DiffRemoved: customTheme.background?.diff?.removed ?? customTheme.DiffRemoved ?? "",
+    Comment: customTheme.ui?.comment ?? customTheme.Comment ?? "",
+    Gray: customTheme.text?.secondary ?? customTheme.Gray ?? "",
     DarkGray:
       customTheme.DarkGray ??
       interpolateColor(
-        customTheme.text?.secondary ?? customTheme.Gray ?? '',
-        customTheme.background?.primary ?? customTheme.Background ?? '',
+        customTheme.text?.secondary ?? customTheme.Gray ?? "",
+        customTheme.background?.primary ?? customTheme.Background ?? "",
         0.5,
       ),
     GradientColors: customTheme.ui?.gradient ?? customTheme.GradientColors,
@@ -288,138 +282,138 @@ export function createCustomTheme(customTheme: CustomTheme): Theme {
   // Generate CSS properties mappings based on the custom theme colors
   const rawMappings: Record<string, CSSProperties> = {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: colors.Background,
       color: colors.Foreground,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: colors.AccentBlue,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: colors.AccentBlue,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: colors.AccentBlue,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: colors.AccentBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: colors.AccentBlue,
-      textDecoration: 'underline',
+      textDecoration: "underline",
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: colors.AccentCyan,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: colors.AccentCyan,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: colors.AccentGreen,
     },
-    'hljs-class': {
+    "hljs-class": {
       color: colors.AccentGreen,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: colors.AccentYellow,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: colors.AccentYellow,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: colors.AccentRed,
     },
-    'hljs-template-tag': {
+    "hljs-template-tag": {
       color: colors.AccentRed,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: colors.Foreground,
     },
-    'hljs-function': {
+    "hljs-function": {
       color: colors.Foreground,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: colors.Foreground,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: colors.Foreground,
     },
-    'hljs-formula': {
+    "hljs-formula": {
       color: colors.Foreground,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: colors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: colors.Comment,
-      fontStyle: 'italic',
+      fontStyle: "italic",
     },
-    'hljs-doctag': {
+    "hljs-doctag": {
       color: colors.Comment,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: colors.Gray,
     },
-    'hljs-meta-keyword': {
+    "hljs-meta-keyword": {
       color: colors.Gray,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: colors.Gray,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: colors.AccentPurple,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: colors.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: colors.LightBlue,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: colors.LightBlue,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: colors.LightBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: colors.AccentYellow,
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-attr': {
+    "hljs-selector-attr": {
       color: colors.AccentYellow,
     },
-    'hljs-selector-pseudo': {
+    "hljs-selector-pseudo": {
       color: colors.AccentYellow,
     },
-    'hljs-addition': {
+    "hljs-addition": {
       backgroundColor: colors.AccentGreen,
-      display: 'inline-block',
-      width: '100%',
+      display: "inline-block",
+      width: "100%",
     },
-    'hljs-deletion': {
+    "hljs-deletion": {
       backgroundColor: colors.AccentRed,
-      display: 'inline-block',
-      width: '100%',
+      display: "inline-block",
+      width: "100%",
     },
   };
 
@@ -429,10 +423,7 @@ export function createCustomTheme(customTheme: CustomTheme): Theme {
       secondary: customTheme.text?.secondary ?? colors.Gray,
       link: customTheme.text?.link ?? colors.AccentBlue,
       accent: customTheme.text?.accent ?? colors.AccentPurple,
-      response:
-        customTheme.text?.response ??
-        customTheme.text?.primary ??
-        colors.Foreground,
+      response: customTheme.text?.response ?? customTheme.text?.primary ?? colors.Foreground,
     },
     background: {
       primary: customTheme.background?.primary ?? colors.Background,
@@ -458,13 +449,7 @@ export function createCustomTheme(customTheme: CustomTheme): Theme {
     },
   };
 
-  return new Theme(
-    customTheme.name,
-    'custom',
-    rawMappings,
-    colors,
-    semanticColors,
-  );
+  return new Theme(customTheme.name, "custom", rawMappings, colors, semanticColors);
 }
 
 /**
diff --git a/packages/ui-gemini/src/ui/themes/xcode.ts b/packages/ui-gemini/src/ui/themes/xcode.ts
index 5d20f35c3..9834c96a0 100644
--- a/packages/ui-gemini/src/ui/themes/xcode.ts
+++ b/packages/ui-gemini/src/ui/themes/xcode.ts
@@ -4,150 +4,150 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type ColorsTheme, Theme } from './theme.js';
-import { interpolateColor } from './color-utils.js';
+import { interpolateColor } from "./color-utils.js";
+import { type ColorsTheme, Theme } from "./theme.js";
 
 const xcodeColors: ColorsTheme = {
-  type: 'light',
-  Background: '#fff',
-  Foreground: '#444',
-  LightBlue: '#0E0EFF',
-  AccentBlue: '#1c00cf',
-  AccentPurple: '#aa0d91',
-  AccentCyan: '#3F6E74',
-  AccentGreen: '#007400',
-  AccentYellow: '#836C28',
-  AccentRed: '#c41a16',
-  DiffAdded: '#C6EAD8',
-  DiffRemoved: '#FEDEDE',
-  Comment: '#007400',
-  Gray: '#c0c0c0',
-  DarkGray: interpolateColor('#c0c0c0', '#fff', 0.5),
-  GradientColors: ['#1c00cf', '#007400'],
+  type: "light",
+  Background: "#fff",
+  Foreground: "#444",
+  LightBlue: "#0E0EFF",
+  AccentBlue: "#1c00cf",
+  AccentPurple: "#aa0d91",
+  AccentCyan: "#3F6E74",
+  AccentGreen: "#007400",
+  AccentYellow: "#836C28",
+  AccentRed: "#c41a16",
+  DiffAdded: "#C6EAD8",
+  DiffRemoved: "#FEDEDE",
+  Comment: "#007400",
+  Gray: "#c0c0c0",
+  DarkGray: interpolateColor("#c0c0c0", "#fff", 0.5),
+  GradientColors: ["#1c00cf", "#007400"],
 };
 
 export const XCode: Theme = new Theme(
-  'Xcode',
-  'light',
+  "Xcode",
+  "light",
   {
     hljs: {
-      display: 'block',
-      overflowX: 'auto',
-      padding: '0.5em',
+      display: "block",
+      overflowX: "auto",
+      padding: "0.5em",
       background: xcodeColors.Background,
       color: xcodeColors.Foreground,
     },
-    'xml .hljs-meta': {
+    "xml .hljs-meta": {
       color: xcodeColors.Gray,
     },
-    'hljs-comment': {
+    "hljs-comment": {
       color: xcodeColors.Comment,
     },
-    'hljs-quote': {
+    "hljs-quote": {
       color: xcodeColors.Comment,
     },
-    'hljs-tag': {
+    "hljs-tag": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-attribute': {
+    "hljs-attribute": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-keyword': {
+    "hljs-keyword": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-selector-tag': {
+    "hljs-selector-tag": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-literal': {
+    "hljs-literal": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-name': {
+    "hljs-name": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-variable': {
+    "hljs-variable": {
       color: xcodeColors.AccentCyan,
     },
-    'hljs-template-variable': {
+    "hljs-template-variable": {
       color: xcodeColors.AccentCyan,
     },
-    'hljs-code': {
+    "hljs-code": {
       color: xcodeColors.AccentRed,
     },
-    'hljs-string': {
+    "hljs-string": {
       color: xcodeColors.AccentRed,
     },
-    'hljs-meta-string': {
+    "hljs-meta-string": {
       color: xcodeColors.AccentRed,
     },
-    'hljs-regexp': {
+    "hljs-regexp": {
       color: xcodeColors.LightBlue,
     },
-    'hljs-link': {
+    "hljs-link": {
       color: xcodeColors.LightBlue,
     },
-    'hljs-title': {
+    "hljs-title": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-symbol': {
+    "hljs-symbol": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-bullet': {
+    "hljs-bullet": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-number': {
+    "hljs-number": {
       color: xcodeColors.AccentBlue,
     },
-    'hljs-section': {
+    "hljs-section": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-meta': {
+    "hljs-meta": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-class .hljs-title': {
+    "hljs-class .hljs-title": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-type': {
+    "hljs-type": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-built_in': {
+    "hljs-built_in": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-builtin-name': {
+    "hljs-builtin-name": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-params': {
+    "hljs-params": {
       color: xcodeColors.AccentPurple,
     },
-    'hljs-attr': {
+    "hljs-attr": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-subst': {
+    "hljs-subst": {
       color: xcodeColors.Foreground,
     },
-    'hljs-formula': {
-      backgroundColor: '#eee',
-      fontStyle: 'italic',
+    "hljs-formula": {
+      backgroundColor: "#eee",
+      fontStyle: "italic",
     },
-    'hljs-addition': {
-      backgroundColor: '#baeeba',
+    "hljs-addition": {
+      backgroundColor: "#baeeba",
     },
-    'hljs-deletion': {
-      backgroundColor: '#ffc8bd',
+    "hljs-deletion": {
+      backgroundColor: "#ffc8bd",
     },
-    'hljs-selector-id': {
+    "hljs-selector-id": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-selector-class': {
+    "hljs-selector-class": {
       color: xcodeColors.AccentYellow,
     },
-    'hljs-doctag': {
-      fontWeight: 'bold',
+    "hljs-doctag": {
+      fontWeight: "bold",
     },
-    'hljs-strong': {
-      fontWeight: 'bold',
+    "hljs-strong": {
+      fontWeight: "bold",
     },
-    'hljs-emphasis': {
-      fontStyle: 'italic',
+    "hljs-emphasis": {
+      fontStyle: "italic",
     },
   },
   xcodeColors,
diff --git a/packages/ui-gemini/src/ui/types.ts b/packages/ui-gemini/src/ui/types.ts
index cbf3067e5..238173c25 100644
--- a/packages/ui-gemini/src/ui/types.ts
+++ b/packages/ui-gemini/src/ui/types.ts
@@ -8,53 +8,53 @@ import type {
   CompressionStatus,
   GeminiCLIExtension,
   MCPServerConfig,
+  RetrieveUserQuotaResponse,
   ThoughtSummary,
   ToolCallConfirmationDetails,
   ToolConfirmationOutcome,
   ToolResultDisplay,
-  RetrieveUserQuotaResponse,
-} from '@airiscode/gemini-cli-core';
-import type { PartListUnion } from '@google/genai';
-import { type ReactNode } from 'react';
+} from "@airiscode/gemini-cli-core";
+import type { PartListUnion } from "@google/genai";
+import { type ReactNode } from "react";
 
 export type { ThoughtSummary };
 
 export enum AuthState {
   // Attempting to authenticate or re-authenticate
-  Unauthenticated = 'unauthenticated',
+  Unauthenticated = "unauthenticated",
   // Auth dialog is open for user to select auth method
-  Updating = 'updating',
+  Updating = "updating",
   // Waiting for user to input API key
-  AwaitingApiKeyInput = 'awaiting_api_key_input',
+  AwaitingApiKeyInput = "awaiting_api_key_input",
   // Successfully authenticated
-  Authenticated = 'authenticated',
+  Authenticated = "authenticated",
 }
 
 // Only defining the state enum needed by the UI
 export enum StreamingState {
-  Idle = 'idle',
-  Responding = 'responding',
-  WaitingForConfirmation = 'waiting_for_confirmation',
+  Idle = "idle",
+  Responding = "responding",
+  WaitingForConfirmation = "waiting_for_confirmation",
 }
 
 // Copied from server/src/core/turn.ts for CLI usage
 export enum GeminiEventType {
-  Content = 'content',
-  ToolCallRequest = 'tool_call_request',
+  Content = "content",
+  ToolCallRequest = "tool_call_request",
   // Add other event types if the UI hook needs to handle them
 }
 
 export enum ToolCallStatus {
-  Pending = 'Pending',
-  Canceled = 'Canceled',
-  Confirming = 'Confirming',
-  Executing = 'Executing',
-  Success = 'Success',
-  Error = 'Error',
+  Pending = "Pending",
+  Canceled = "Canceled",
+  Confirming = "Confirming",
+  Executing = "Executing",
+  Success = "Success",
+  Error = "Error",
 }
 
 export interface ToolCallEvent {
-  type: 'tool_call';
+  type: "tool_call";
   status: ToolCallStatus;
   callId: string;
   name: string;
@@ -85,46 +85,46 @@ export interface CompressionProps {
 /**
  * For use when you want no icon.
  */
-export const emptyIcon = '  ';
+export const emptyIcon = "  ";
 
 export interface HistoryItemBase {
   text?: string; // Text content for user/gemini/info/error messages
 }
 
 export type HistoryItemUser = HistoryItemBase & {
-  type: 'user';
+  type: "user";
   text: string;
 };
 
 export type HistoryItemGemini = HistoryItemBase & {
-  type: 'gemini';
+  type: "gemini";
   text: string;
 };
 
 export type HistoryItemGeminiContent = HistoryItemBase & {
-  type: 'gemini_content';
+  type: "gemini_content";
   text: string;
 };
 
 export type HistoryItemInfo = HistoryItemBase & {
-  type: 'info';
+  type: "info";
   text: string;
   icon?: string;
   color?: string;
 };
 
 export type HistoryItemError = HistoryItemBase & {
-  type: 'error';
+  type: "error";
   text: string;
 };
 
 export type HistoryItemWarning = HistoryItemBase & {
-  type: 'warning';
+  type: "warning";
   text: string;
 };
 
 export type HistoryItemAbout = HistoryItemBase & {
-  type: 'about';
+  type: "about";
   cliVersion: string;
   osVersion: string;
   sandboxEnv: string;
@@ -136,51 +136,51 @@ export type HistoryItemAbout = HistoryItemBase & {
 };
 
 export type HistoryItemHelp = HistoryItemBase & {
-  type: 'help';
+  type: "help";
   timestamp: Date;
 };
 
 export type HistoryItemStats = HistoryItemBase & {
-  type: 'stats';
+  type: "stats";
   duration: string;
   quotas?: RetrieveUserQuotaResponse;
 };
 
 export type HistoryItemModelStats = HistoryItemBase & {
-  type: 'model_stats';
+  type: "model_stats";
 };
 
 export type HistoryItemToolStats = HistoryItemBase & {
-  type: 'tool_stats';
+  type: "tool_stats";
 };
 
 export type HistoryItemModel = HistoryItemBase & {
-  type: 'model';
+  type: "model";
   model: string;
 };
 
 export type HistoryItemQuit = HistoryItemBase & {
-  type: 'quit';
+  type: "quit";
   duration: string;
 };
 
 export type HistoryItemToolGroup = HistoryItemBase & {
-  type: 'tool_group';
+  type: "tool_group";
   tools: IndividualToolCallDisplay[];
 };
 
 export type HistoryItemUserShell = HistoryItemBase & {
-  type: 'user_shell';
+  type: "user_shell";
   text: string;
 };
 
 export type HistoryItemCompression = HistoryItemBase & {
-  type: 'compression';
+  type: "compression";
   compression: CompressionProps;
 };
 
 export type HistoryItemExtensionsList = HistoryItemBase & {
-  type: 'extensions_list';
+  type: "extensions_list";
   extensions: GeminiCLIExtension[];
 };
 
@@ -190,7 +190,7 @@ export interface ChatDetail {
 }
 
 export type HistoryItemChatList = HistoryItemBase & {
-  type: 'chat_list';
+  type: "chat_list";
   chats: ChatDetail[];
 };
 
@@ -201,7 +201,7 @@ export interface ToolDefinition {
 }
 
 export type HistoryItemToolsList = HistoryItemBase & {
-  type: 'tools_list';
+  type: "tools_list";
   tools: ToolDefinition[];
   showDescriptions: boolean;
 };
@@ -233,15 +233,12 @@ export interface JsonMcpResource {
 }
 
 export type HistoryItemMcpStatus = HistoryItemBase & {
-  type: 'mcp_status';
+  type: "mcp_status";
   servers: Record<string, MCPServerConfig>;
   tools: JsonMcpTool[];
   prompts: JsonMcpPrompt[];
   resources: JsonMcpResource[];
-  authStatus: Record<
-    string,
-    'authenticated' | 'expired' | 'unauthenticated' | 'not-configured'
-  >;
+  authStatus: Record<string, "authenticated" | "expired" | "unauthenticated" | "not-configured">;
   blockedServers: Array<{ name: string; extensionName: string }>;
   discoveryInProgress: boolean;
   connectingServers: string[];
@@ -250,7 +247,7 @@ export type HistoryItemMcpStatus = HistoryItemBase & {
 };
 
 export type HistoryItemHooksList = HistoryItemBase & {
-  type: 'hooks_list';
+  type: "hooks_list";
   hooks: Array<{
     config: { command?: string; type: string; timeout?: number };
     source: string;
@@ -292,23 +289,23 @@ export type HistoryItem = HistoryItemWithoutId & { id: number };
 
 // Message types used by internal command feedback (subset of HistoryItem types)
 export enum MessageType {
-  INFO = 'info',
-  ERROR = 'error',
-  WARNING = 'warning',
-  USER = 'user',
-  ABOUT = 'about',
-  HELP = 'help',
-  STATS = 'stats',
-  MODEL_STATS = 'model_stats',
-  TOOL_STATS = 'tool_stats',
-  QUIT = 'quit',
-  GEMINI = 'gemini',
-  COMPRESSION = 'compression',
-  EXTENSIONS_LIST = 'extensions_list',
-  TOOLS_LIST = 'tools_list',
-  MCP_STATUS = 'mcp_status',
-  CHAT_LIST = 'chat_list',
-  HOOKS_LIST = 'hooks_list',
+  INFO = "info",
+  ERROR = "error",
+  WARNING = "warning",
+  USER = "user",
+  ABOUT = "about",
+  HELP = "help",
+  STATS = "stats",
+  MODEL_STATS = "model_stats",
+  TOOL_STATS = "tool_stats",
+  QUIT = "quit",
+  GEMINI = "gemini",
+  COMPRESSION = "compression",
+  EXTENSIONS_LIST = "extensions_list",
+  TOOLS_LIST = "tools_list",
+  MCP_STATUS = "mcp_status",
+  CHAT_LIST = "chat_list",
+  HOOKS_LIST = "hooks_list",
 }
 
 // Simplified message structure for internal feedback
@@ -365,7 +362,7 @@ export type Message =
     };
 
 export interface ConsoleMessageItem {
-  type: 'log' | 'warn' | 'error' | 'debug' | 'info';
+  type: "log" | "warn" | "error" | "debug" | "info";
   content: string;
   count: number;
 }
@@ -375,7 +372,7 @@ export interface ConsoleMessageItem {
  * being submitted to the Gemini model.
  */
 export interface SubmitPromptResult {
-  type: 'submit_prompt';
+  type: "submit_prompt";
   content: PartListUnion;
 }
 
@@ -384,21 +381,18 @@ export interface SubmitPromptResult {
  */
 export type SlashCommandProcessorResult =
   | {
-      type: 'schedule_tool';
+      type: "schedule_tool";
       toolName: string;
       toolArgs: Record<string, unknown>;
     }
   | {
-      type: 'handled'; // Indicates the command was processed and no further action is needed.
+      type: "handled"; // Indicates the command was processed and no further action is needed.
     }
   | SubmitPromptResult;
 
 export interface ShellConfirmationRequest {
   commands: string[];
-  onConfirm: (
-    outcome: ToolConfirmationOutcome,
-    approvedCommands?: string[],
-  ) => void;
+  onConfirm: (outcome: ToolConfirmationOutcome, approvedCommands?: string[]) => void;
 }
 
 export interface ConfirmationRequest {
@@ -407,5 +401,5 @@ export interface ConfirmationRequest {
 }
 
 export interface LoopDetectionConfirmationRequest {
-  onComplete: (result: { userSelection: 'disable' | 'keep' }) => void;
+  onComplete: (result: { userSelection: "disable" | "keep" }) => void;
 }
diff --git a/packages/ui-gemini/src/ui/utils/CodeColorizer.test.tsx b/packages/ui-gemini/src/ui/utils/CodeColorizer.test.tsx
index 641567c00..e5c1447ac 100644
--- a/packages/ui-gemini/src/ui/utils/CodeColorizer.test.tsx
+++ b/packages/ui-gemini/src/ui/utils/CodeColorizer.test.tsx
@@ -4,32 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { colorizeCode } from './CodeColorizer.js';
-import { renderWithProviders } from '../../test-utils/render.js';
-import { LoadedSettings } from '../../config/settings.js';
+import { describe, expect, it } from "vitest";
+import { LoadedSettings } from "../../config/settings.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { colorizeCode } from "./CodeColorizer.js";
 
-describe('colorizeCode', () => {
-  it('renders empty lines correctly when useAlternateBuffer is true', () => {
-    const code = 'line 1\n\nline 3';
+describe("colorizeCode", () => {
+  it("renders empty lines correctly when useAlternateBuffer is true", () => {
+    const code = "line 1\n\nline 3";
     const settings = new LoadedSettings(
-      { path: '', settings: {}, originalSettings: {} },
-      { path: '', settings: {}, originalSettings: {} },
+      { path: "", settings: {}, originalSettings: {} },
+      { path: "", settings: {}, originalSettings: {} },
       {
-        path: '',
+        path: "",
         settings: { ui: { useAlternateBuffer: true, showLineNumbers: false } },
         originalSettings: {
           ui: { useAlternateBuffer: true, showLineNumbers: false },
         },
       },
-      { path: '', settings: {}, originalSettings: {} },
+      { path: "", settings: {}, originalSettings: {} },
       true,
       new Set(),
     );
 
     const result = colorizeCode({
       code,
-      language: 'javascript',
+      language: "javascript",
       maxWidth: 80,
       settings,
       hideLineNumbers: true,
diff --git a/packages/ui-gemini/src/ui/utils/CodeColorizer.tsx b/packages/ui-gemini/src/ui/utils/CodeColorizer.tsx
index 6267045bb..47cdbdaef 100644
--- a/packages/ui-gemini/src/ui/utils/CodeColorizer.tsx
+++ b/packages/ui-gemini/src/ui/utils/CodeColorizer.tsx
@@ -4,25 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text, Box } from 'ink';
-import { common, createLowlight } from 'lowlight';
-import type {
-  Root,
-  Element,
-  Text as HastText,
-  ElementContent,
-  RootContent,
-} from 'hast';
-import { themeManager } from '../themes/theme-manager.js';
-import type { Theme } from '../themes/theme.js';
-import {
-  MaxSizedBox,
-  MINIMUM_MAX_HEIGHT,
-} from '../components/shared/MaxSizedBox.js';
-import type { LoadedSettings } from '../../config/settings.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { isAlternateBufferEnabled } from '../hooks/useAlternateBuffer.js';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import type { Element, ElementContent, Text as HastText, Root, RootContent } from "hast";
+import { Box, Text } from "ink";
+import { common, createLowlight } from "lowlight";
+import React from "react";
+import type { LoadedSettings } from "../../config/settings.js";
+import { MaxSizedBox, MINIMUM_MAX_HEIGHT } from "../components/shared/MaxSizedBox.js";
+import { isAlternateBufferEnabled } from "../hooks/useAlternateBuffer.js";
+import type { Theme } from "../themes/theme.js";
+import { themeManager } from "../themes/theme-manager.js";
 
 // Configure theming and parsing utilities.
 const lowlight = createLowlight(common);
@@ -32,16 +23,15 @@ function renderHastNode(
   theme: Theme,
   inheritedColor: string | undefined,
 ): React.ReactNode {
-  if (node.type === 'text') {
+  if (node.type === "text") {
     // Use the color passed down from parent element, or the theme's default.
     const color = inheritedColor || theme.defaultColor;
     return <Text color={color}>{node.value}</Text>;
   }
 
   // Handle Element Nodes: Determine color and pass it down, don't wrap
-  if (node.type === 'element') {
-    const nodeClasses: string[] =
-      (node.properties?.['className'] as string[]) || [];
+  if (node.type === "element") {
+    const nodeClasses: string[] = (node.properties?.["className"] as string[]) || [];
     let elementColor: string | undefined = undefined;
 
     // Find color defined specifically for this element's class
@@ -59,13 +49,9 @@ function renderHastNode(
 
     // Recursively render children, passing the determined color down
     // Ensure child type matches expected HAST structure (ElementContent is common)
-    const children = node.children?.map(
-      (child: ElementContent, index: number) => (
-        <React.Fragment key={index}>
-          {renderHastNode(child, theme, colorToPassDown)}
-        </React.Fragment>
-      ),
-    );
+    const children = node.children?.map((child: ElementContent, index: number) => (
+      <React.Fragment key={index}>{renderHastNode(child, theme, colorToPassDown)}</React.Fragment>
+    ));
 
     // Element nodes now only group children; color is applied by Text nodes.
     // Use a React Fragment to avoid adding unnecessary elements.
@@ -73,7 +59,7 @@ function renderHastNode(
   }
 
   // Handle Root Node: Start recursion with initially inherited color
-  if (node.type === 'root') {
+  if (node.type === "root") {
     // Check if children array is empty - this happens when lowlight can't detect language – fall back to plain text
     if (!node.children || node.children.length === 0) {
       return null;
@@ -82,9 +68,7 @@ function renderHastNode(
     // Pass down the initial inheritedColor (likely undefined from the top call)
     // Ensure child type matches expected HAST structure (RootContent is common)
     return node.children?.map((child: RootContent, index: number) => (
-      <React.Fragment key={index}>
-        {renderHastNode(child, theme, inheritedColor)}
-      </React.Fragment>
+      <React.Fragment key={index}>{renderHastNode(child, theme, inheritedColor)}</React.Fragment>
     ));
   }
 
@@ -145,17 +129,15 @@ export function colorizeCode({
   settings,
   hideLineNumbers = false,
 }: ColorizeCodeOptions): React.ReactNode {
-  const codeToHighlight = code.replace(/\n$/, '');
+  const codeToHighlight = code.replace(/\n$/, "");
   const activeTheme = theme || themeManager.getActiveTheme();
-  const showLineNumbers = hideLineNumbers
-    ? false
-    : (settings?.merged.ui?.showLineNumbers ?? true);
+  const showLineNumbers = hideLineNumbers ? false : (settings?.merged.ui?.showLineNumbers ?? true);
 
   const useMaxSizedBox = !isAlternateBufferEnabled(settings);
   try {
     // Render the HAST tree using the adapted theme
     // Apply the theme's default foreground color to the top-level Text element
-    let lines = codeToHighlight.split('\n');
+    let lines = codeToHighlight.split("\n");
     const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
 
     let hiddenLinesCount = 0;
@@ -171,21 +153,14 @@ export function colorizeCode({
     }
 
     const renderedLines = lines.map((line, index) => {
-      const contentToRender = highlightAndRenderLine(
-        line,
-        language,
-        activeTheme,
-      );
+      const contentToRender = highlightAndRenderLine(line, language, activeTheme);
 
       return (
         <Box key={index} minHeight={useMaxSizedBox ? undefined : 1}>
           {/* We have to render line numbers differently depending on whether we are using MaxSizeBox or not */}
           {showLineNumbers && useMaxSizedBox && (
             <Text color={activeTheme.colors.Gray}>
-              {`${String(index + 1 + hiddenLinesCount).padStart(
-                padWidth,
-                ' ',
-              )} `}
+              {`${String(index + 1 + hiddenLinesCount).padStart(padWidth, " ")} `}
             </Text>
           )}
           {showLineNumbers && !useMaxSizedBox && (
@@ -196,9 +171,7 @@ export function colorizeCode({
               alignItems="flex-start"
               justifyContent="flex-end"
             >
-              <Text color={activeTheme.colors.Gray}>
-                {`${index + 1 + hiddenLinesCount}`}
-              </Text>
+              <Text color={activeTheme.colors.Gray}>{`${index + 1 + hiddenLinesCount}`}</Text>
             </Box>
           )}
           <Text color={activeTheme.defaultColor} wrap="wrap">
@@ -227,20 +200,17 @@ export function colorizeCode({
       </Box>
     );
   } catch (error) {
-    debugLogger.warn(
-      `[colorizeCode] Error highlighting code for language "${language}":`,
-      error,
-    );
+    debugLogger.warn(`[colorizeCode] Error highlighting code for language "${language}":`, error);
     // Fall back to plain text with default color on error
     // Also display line numbers in fallback
-    const lines = codeToHighlight.split('\n');
+    const lines = codeToHighlight.split("\n");
     const padWidth = String(lines.length).length; // Calculate padding width based on number of lines
     const fallbackLines = lines.map((line, index) => (
       <Box key={index} minHeight={useMaxSizedBox ? undefined : 1}>
         {/* We have to render line numbers differently depending on whether we are using MaxSizeBox or not */}
         {showLineNumbers && useMaxSizedBox && (
           <Text color={activeTheme.defaultColor}>
-            {`${String(index + 1).padStart(padWidth, ' ')} `}
+            {`${String(index + 1).padStart(padWidth, " ")} `}
           </Text>
         )}
         {showLineNumbers && !useMaxSizedBox && (
@@ -260,11 +230,7 @@ export function colorizeCode({
 
     if (useMaxSizedBox) {
       return (
-        <MaxSizedBox
-          maxHeight={availableHeight}
-          maxWidth={maxWidth}
-          overflowDirection="top"
-        >
+        <MaxSizedBox maxHeight={availableHeight} maxWidth={maxWidth} overflowDirection="top">
           {fallbackLines}
         </MaxSizedBox>
       );
diff --git a/packages/ui-gemini/src/ui/utils/ConsolePatcher.ts b/packages/ui-gemini/src/ui/utils/ConsolePatcher.ts
index 7b6a09875..09fdd1386 100644
--- a/packages/ui-gemini/src/ui/utils/ConsolePatcher.ts
+++ b/packages/ui-gemini/src/ui/utils/ConsolePatcher.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import util from 'node:util';
-import type { ConsoleMessageItem } from '../types.js';
+import util from "node:util";
+import type { ConsoleMessageItem } from "../types.js";
 
 interface ConsolePatcherParams {
-  onNewMessage?: (message: Omit<ConsoleMessageItem, 'id'>) => void;
+  onNewMessage?: (message: Omit<ConsoleMessageItem, "id">) => void;
   debugMode: boolean;
   stderr?: boolean;
 }
@@ -27,11 +27,11 @@ export class ConsolePatcher {
   }
 
   patch() {
-    console.log = this.patchConsoleMethod('log');
-    console.warn = this.patchConsoleMethod('warn');
-    console.error = this.patchConsoleMethod('error');
-    console.debug = this.patchConsoleMethod('debug');
-    console.info = this.patchConsoleMethod('info');
+    console.log = this.patchConsoleMethod("log");
+    console.warn = this.patchConsoleMethod("warn");
+    console.error = this.patchConsoleMethod("error");
+    console.debug = this.patchConsoleMethod("debug");
+    console.info = this.patchConsoleMethod("info");
   }
 
   cleanup = () => {
@@ -45,14 +45,14 @@ export class ConsolePatcher {
   private formatArgs = (args: unknown[]): string => util.format(...args);
 
   private patchConsoleMethod =
-    (type: 'log' | 'warn' | 'error' | 'debug' | 'info') =>
+    (type: "log" | "warn" | "error" | "debug" | "info") =>
     (...args: unknown[]) => {
       if (this.params.stderr) {
-        if (type !== 'debug' || this.params.debugMode) {
+        if (type !== "debug" || this.params.debugMode) {
           this.originalConsoleError(this.formatArgs(args));
         }
       } else {
-        if (type !== 'debug' || this.params.debugMode) {
+        if (type !== "debug" || this.params.debugMode) {
           this.params.onNewMessage?.({
             type,
             content: this.formatArgs(args),
diff --git a/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.test.ts b/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.test.ts
index 11fb6d56e..587c3aca8 100644
--- a/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.test.ts
+++ b/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.test.ts
@@ -4,22 +4,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { getPlainTextLength } from './InlineMarkdownRenderer.js';
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { getPlainTextLength } from "./InlineMarkdownRenderer.js";
 
-describe('getPlainTextLength', () => {
+describe("getPlainTextLength", () => {
   it.each([
-    ['**Primary Go', 12],
-    ['*Primary Go', 11],
-    ['**Primary Go**', 10],
-    ['*Primary Go*', 10],
-    ['**', 2],
-    ['*', 1],
-    ['compile-time**', 14],
-  ])(
-    'should measure markdown text length correctly for "%s"',
-    (input, expected) => {
-      expect(getPlainTextLength(input)).toBe(expected);
-    },
-  );
+    ["**Primary Go", 12],
+    ["*Primary Go", 11],
+    ["**Primary Go**", 10],
+    ["*Primary Go*", 10],
+    ["**", 2],
+    ["*", 1],
+    ["compile-time**", 14],
+  ])('should measure markdown text length correctly for "%s"', (input, expected) => {
+    expect(getPlainTextLength(input)).toBe(expected);
+  });
 });
diff --git a/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.tsx b/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.tsx
index 370b03d6f..fff61bdd8 100644
--- a/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.tsx
+++ b/packages/ui-gemini/src/ui/utils/InlineMarkdownRenderer.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text } from 'ink';
-import { theme } from '../semantic-colors.js';
-import stringWidth from 'string-width';
+import { Text } from "ink";
+import React from "react";
+import stringWidth from "string-width";
+import { theme } from "../semantic-colors.js";
 
 // Constants for Markdown parsing
 const BOLD_MARKER_LENGTH = 2; // For "**"
@@ -22,10 +22,7 @@ interface RenderInlineProps {
   defaultColor?: string;
 }
 
-const RenderInlineInternal: React.FC<RenderInlineProps> = ({
-  text,
-  defaultColor,
-}) => {
+const RenderInlineInternal: React.FC<RenderInlineProps> = ({ text, defaultColor }) => {
   const baseColor = defaultColor ?? theme.text.primary;
   // Early return for plain text without markdown or URLs
   if (!/[*_~`<[https?:]/.test(text)) {
@@ -53,8 +50,8 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
 
     try {
       if (
-        fullMatch.startsWith('**') &&
-        fullMatch.endsWith('**') &&
+        fullMatch.startsWith("**") &&
+        fullMatch.endsWith("**") &&
         fullMatch.length > BOLD_MARKER_LENGTH * 2
       ) {
         renderedNode = (
@@ -64,16 +61,12 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
         );
       } else if (
         fullMatch.length > ITALIC_MARKER_LENGTH * 2 &&
-        ((fullMatch.startsWith('*') && fullMatch.endsWith('*')) ||
-          (fullMatch.startsWith('_') && fullMatch.endsWith('_'))) &&
+        ((fullMatch.startsWith("*") && fullMatch.endsWith("*")) ||
+          (fullMatch.startsWith("_") && fullMatch.endsWith("_"))) &&
         !/\w/.test(text.substring(match.index - 1, match.index)) &&
-        !/\w/.test(
-          text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 1),
-        ) &&
+        !/\w/.test(text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 1)) &&
         !/\S[./\\]/.test(text.substring(match.index - 2, match.index)) &&
-        !/[./\\]\S/.test(
-          text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 2),
-        )
+        !/[./\\]\S/.test(text.substring(inlineRegex.lastIndex, inlineRegex.lastIndex + 2))
       ) {
         renderedNode = (
           <Text key={key} italic color={baseColor}>
@@ -81,21 +74,18 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
           </Text>
         );
       } else if (
-        fullMatch.startsWith('~~') &&
-        fullMatch.endsWith('~~') &&
+        fullMatch.startsWith("~~") &&
+        fullMatch.endsWith("~~") &&
         fullMatch.length > STRIKETHROUGH_MARKER_LENGTH * 2
       ) {
         renderedNode = (
           <Text key={key} strikethrough color={baseColor}>
-            {fullMatch.slice(
-              STRIKETHROUGH_MARKER_LENGTH,
-              -STRIKETHROUGH_MARKER_LENGTH,
-            )}
+            {fullMatch.slice(STRIKETHROUGH_MARKER_LENGTH, -STRIKETHROUGH_MARKER_LENGTH)}
           </Text>
         );
       } else if (
-        fullMatch.startsWith('`') &&
-        fullMatch.endsWith('`') &&
+        fullMatch.startsWith("`") &&
+        fullMatch.endsWith("`") &&
         fullMatch.length > INLINE_CODE_MARKER_LENGTH
       ) {
         const codeMatch = fullMatch.match(/^(`+)(.+?)\1$/s);
@@ -106,11 +96,7 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
             </Text>
           );
         }
-      } else if (
-        fullMatch.startsWith('[') &&
-        fullMatch.includes('](') &&
-        fullMatch.endsWith(')')
-      ) {
+      } else if (fullMatch.startsWith("[") && fullMatch.includes("](") && fullMatch.endsWith(")")) {
         const linkMatch = fullMatch.match(/\[(.*?)\]\((.*?)\)/);
         if (linkMatch) {
           const linkText = linkMatch[1];
@@ -123,17 +109,13 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
           );
         }
       } else if (
-        fullMatch.startsWith('<u>') &&
-        fullMatch.endsWith('</u>') &&
-        fullMatch.length >
-          UNDERLINE_TAG_START_LENGTH + UNDERLINE_TAG_END_LENGTH - 1 // -1 because length is compared to combined length of start and end tags
+        fullMatch.startsWith("<u>") &&
+        fullMatch.endsWith("</u>") &&
+        fullMatch.length > UNDERLINE_TAG_START_LENGTH + UNDERLINE_TAG_END_LENGTH - 1 // -1 because length is compared to combined length of start and end tags
       ) {
         renderedNode = (
           <Text key={key} underline color={baseColor}>
-            {fullMatch.slice(
-              UNDERLINE_TAG_START_LENGTH,
-              -UNDERLINE_TAG_END_LENGTH,
-            )}
+            {fullMatch.slice(UNDERLINE_TAG_START_LENGTH, -UNDERLINE_TAG_END_LENGTH)}
           </Text>
         );
       } else if (fullMatch.match(/^https?:\/\//)) {
@@ -144,7 +126,7 @@ const RenderInlineInternal: React.FC<RenderInlineProps> = ({
         );
       }
     } catch (e) {
-      console.error('Error parsing inline markdown part:', fullMatch, e);
+      console.error("Error parsing inline markdown part:", fullMatch, e);
       renderedNode = null;
     }
 
@@ -177,12 +159,12 @@ export const RenderInline = React.memo(RenderInlineInternal);
  */
 export const getPlainTextLength = (text: string): number => {
   const cleanText = text
-    .replace(/\*\*(.*?)\*\*/g, '$1')
-    .replace(/\*(.+?)\*/g, '$1')
-    .replace(/_(.*?)_/g, '$1')
-    .replace(/~~(.*?)~~/g, '$1')
-    .replace(/`(.*?)`/g, '$1')
-    .replace(/<u>(.*?)<\/u>/g, '$1')
-    .replace(/.*\[(.*?)\]\(.*\)/g, '$1');
+    .replace(/\*\*(.*?)\*\*/g, "$1")
+    .replace(/\*(.+?)\*/g, "$1")
+    .replace(/_(.*?)_/g, "$1")
+    .replace(/~~(.*?)~~/g, "$1")
+    .replace(/`(.*?)`/g, "$1")
+    .replace(/<u>(.*?)<\/u>/g, "$1")
+    .replace(/.*\[(.*?)\]\(.*\)/g, "$1");
   return stringWidth(cleanText);
 };
diff --git a/packages/ui-gemini/src/ui/utils/MarkdownDisplay.test.tsx b/packages/ui-gemini/src/ui/utils/MarkdownDisplay.test.tsx
index 927a69e15..45ab2a86c 100644
--- a/packages/ui-gemini/src/ui/utils/MarkdownDisplay.test.tsx
+++ b/packages/ui-gemini/src/ui/utils/MarkdownDisplay.test.tsx
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { MarkdownDisplay } from './MarkdownDisplay.js';
-import { LoadedSettings } from '../../config/settings.js';
-import { renderWithProviders } from '../../test-utils/render.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { LoadedSettings } from "../../config/settings.js";
+import { renderWithProviders } from "../../test-utils/render.js";
+import { MarkdownDisplay } from "./MarkdownDisplay.js";
 
-describe('<MarkdownDisplay />', () => {
+describe("<MarkdownDisplay />", () => {
   const baseProps = {
     isPending: false,
     terminalWidth: 80,
@@ -20,103 +20,84 @@ describe('<MarkdownDisplay />', () => {
     vi.clearAllMocks();
   });
 
-  it('renders nothing for empty text', () => {
-    const { lastFrame } = renderWithProviders(
-      <MarkdownDisplay {...baseProps} text="" />,
-    );
+  it("renders nothing for empty text", () => {
+    const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text="" />);
     expect(lastFrame()).toMatchSnapshot();
   });
 
-  it('renders a simple paragraph', () => {
-    const text = 'Hello, world.';
-    const { lastFrame } = renderWithProviders(
-      <MarkdownDisplay {...baseProps} text={text} />,
-    );
+  it("renders a simple paragraph", () => {
+    const text = "Hello, world.";
+    const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
     expect(lastFrame()).toMatchSnapshot();
   });
 
   const lineEndings = [
-    { name: 'Windows', eol: '\r\n' },
-    { name: 'Unix', eol: '\n' },
+    { name: "Windows", eol: "\r\n" },
+    { name: "Unix", eol: "\n" },
   ];
 
-  describe.each(lineEndings)('with $name line endings', ({ eol }) => {
-    it('renders headers with correct levels', () => {
+  describe.each(lineEndings)("with $name line endings", ({ eol }) => {
+    it("renders headers with correct levels", () => {
       const text = `
 # Header 1
 ## Header 2
 ### Header 3
 #### Header 4
 `.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders a fenced code block with a language', () => {
-      const text = '```javascript\nconst x = 1;\nconsole.log(x);\n```'.replace(
-        /\n/g,
-        eol,
-      );
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+    it("renders a fenced code block with a language", () => {
+      const text = "```javascript\nconst x = 1;\nconsole.log(x);\n```".replace(/\n/g, eol);
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders a fenced code block without a language', () => {
-      const text = '```\nplain text\n```'.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+    it("renders a fenced code block without a language", () => {
+      const text = "```\nplain text\n```".replace(/\n/g, eol);
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('handles unclosed (pending) code blocks', () => {
-      const text = '```typescript\nlet y = 2;'.replace(/\n/g, eol);
+    it("handles unclosed (pending) code blocks", () => {
+      const text = "```typescript\nlet y = 2;".replace(/\n/g, eol);
       const { lastFrame } = renderWithProviders(
         <MarkdownDisplay {...baseProps} text={text} isPending={true} />,
       );
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders unordered lists with different markers', () => {
+    it("renders unordered lists with different markers", () => {
       const text = `
 - item A
 * item B
 + item C
 `.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders nested unordered lists', () => {
+    it("renders nested unordered lists", () => {
       const text = `
 * Level 1
   * Level 2
     * Level 3
 `.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders ordered lists', () => {
+    it("renders ordered lists", () => {
       const text = `
 1. First item
 2. Second item
 `.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders horizontal rules', () => {
+    it("renders horizontal rules", () => {
       const text = `
 Hello
 ---
@@ -124,48 +105,40 @@ World
 ***
 Test
 `.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('renders tables correctly', () => {
+    it("renders tables correctly", () => {
       const text = `
 | Header 1 | Header 2 |
 |----------|:--------:|
 | Cell 1   | Cell 2   |
 | Cell 3   | Cell 4   |
 `.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('handles a table at the end of the input', () => {
+    it("handles a table at the end of the input", () => {
       const text = `
 Some text before.
 | A | B |
 |---|
 | 1 | 2 |`.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('inserts a single space between paragraphs', () => {
+    it("inserts a single space between paragraphs", () => {
       const text = `Paragraph 1.
 
 Paragraph 2.`.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('correctly parses a mix of markdown elements', () => {
+    it("correctly parses a mix of markdown elements", () => {
       const text = `
 # Main Title
 
@@ -180,42 +153,37 @@ some code
 
 Another paragraph.
 `.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
     });
 
-    it('hides line numbers in code blocks when showLineNumbers is false', () => {
-      const text = '```javascript\nconst x = 1;\n```'.replace(/\n/g, eol);
+    it("hides line numbers in code blocks when showLineNumbers is false", () => {
+      const text = "```javascript\nconst x = 1;\n```".replace(/\n/g, eol);
       const settings = new LoadedSettings(
-        { path: '', settings: {}, originalSettings: {} },
-        { path: '', settings: {}, originalSettings: {} },
+        { path: "", settings: {}, originalSettings: {} },
+        { path: "", settings: {}, originalSettings: {} },
         {
-          path: '',
+          path: "",
           settings: { ui: { showLineNumbers: false } },
           originalSettings: { ui: { showLineNumbers: false } },
         },
-        { path: '', settings: {}, originalSettings: {} },
+        { path: "", settings: {}, originalSettings: {} },
         true,
         new Set(),
       );
 
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-        { settings },
-      );
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />, {
+        settings,
+      });
       expect(lastFrame()).toMatchSnapshot();
-      expect(lastFrame()).not.toContain(' 1 ');
+      expect(lastFrame()).not.toContain(" 1 ");
     });
 
-    it('shows line numbers in code blocks by default', () => {
-      const text = '```javascript\nconst x = 1;\n```'.replace(/\n/g, eol);
-      const { lastFrame } = renderWithProviders(
-        <MarkdownDisplay {...baseProps} text={text} />,
-      );
+    it("shows line numbers in code blocks by default", () => {
+      const text = "```javascript\nconst x = 1;\n```".replace(/\n/g, eol);
+      const { lastFrame } = renderWithProviders(<MarkdownDisplay {...baseProps} text={text} />);
       expect(lastFrame()).toMatchSnapshot();
-      expect(lastFrame()).toContain(' 1 ');
+      expect(lastFrame()).toContain(" 1 ");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/utils/MarkdownDisplay.tsx b/packages/ui-gemini/src/ui/utils/MarkdownDisplay.tsx
index 60f15e959..762219a73 100644
--- a/packages/ui-gemini/src/ui/utils/MarkdownDisplay.tsx
+++ b/packages/ui-gemini/src/ui/utils/MarkdownDisplay.tsx
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { colorizeCode } from './CodeColorizer.js';
-import { TableRenderer } from './TableRenderer.js';
-import { RenderInline } from './InlineMarkdownRenderer.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { useAlternateBuffer } from '../hooks/useAlternateBuffer.js';
+import { Box, Text } from "ink";
+import React from "react";
+import { useSettings } from "../contexts/SettingsContext.js";
+import { useAlternateBuffer } from "../hooks/useAlternateBuffer.js";
+import { theme } from "../semantic-colors.js";
+import { colorizeCode } from "./CodeColorizer.js";
+import { RenderInline } from "./InlineMarkdownRenderer.js";
+import { TableRenderer } from "./TableRenderer.js";
 
 interface MarkdownDisplayProps {
   text: string;
@@ -46,7 +46,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
     // Hide line numbers in raw markdown mode as they are confusing due to chunked output
     const colorizedMarkdown = colorizeCode({
       code: text,
-      language: 'markdown',
+      language: "markdown",
       availableHeight: isAlternateBuffer ? undefined : availableTerminalHeight,
       maxWidth: terminalWidth - CODE_BLOCK_PREFIX_PADDING,
       settings,
@@ -73,7 +73,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
   let lastLineEmpty = true;
   let codeBlockContent: string[] = [];
   let codeBlockLang: string | null = null;
-  let codeBlockFence = '';
+  let codeBlockFence = "";
   let inTable = false;
   let tableRows: string[][] = [];
   let tableHeaders: string[] = [];
@@ -101,16 +101,14 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
             content={codeBlockContent}
             lang={codeBlockLang}
             isPending={isPending}
-            availableTerminalHeight={
-              isAlternateBuffer ? undefined : availableTerminalHeight
-            }
+            availableTerminalHeight={isAlternateBuffer ? undefined : availableTerminalHeight}
             terminalWidth={terminalWidth}
           />,
         );
         inCodeBlock = false;
         codeBlockContent = [];
         codeBlockLang = null;
-        codeBlockFence = '';
+        codeBlockFence = "";
       } else {
         codeBlockContent.push(line);
       }
@@ -131,12 +129,9 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
       codeBlockLang = codeFenceMatch[2] || null;
     } else if (tableRowMatch && !inTable) {
       // Potential table start - check if next line is separator
-      if (
-        index + 1 < lines.length &&
-        lines[index + 1].match(tableSeparatorRegex)
-      ) {
+      if (index + 1 < lines.length && lines[index + 1].match(tableSeparatorRegex)) {
         inTable = true;
-        tableHeaders = tableRowMatch[1].split('|').map((cell) => cell.trim());
+        tableHeaders = tableRowMatch[1].split("|").map((cell) => cell.trim());
         tableRows = [];
       } else {
         // Not a table, treat as regular text
@@ -152,10 +147,10 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
       // Skip separator line - already handled
     } else if (inTable && tableRowMatch) {
       // Add table row
-      const cells = tableRowMatch[1].split('|').map((cell) => cell.trim());
+      const cells = tableRowMatch[1].split("|").map((cell) => cell.trim());
       // Ensure row has same column count as headers
       while (cells.length < tableHeaders.length) {
-        cells.push('');
+        cells.push("");
       }
       if (cells.length > tableHeaders.length) {
         cells.length = tableHeaders.length;
@@ -222,10 +217,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
         case 4:
           headerNode = (
             <Text italic color={theme.text.secondary}>
-              <RenderInline
-                text={headerText}
-                defaultColor={theme.text.secondary}
-              />
+              <RenderInline text={headerText} defaultColor={theme.text.secondary} />
             </Text>
           );
           break;
@@ -267,9 +259,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
     } else {
       if (line.trim().length === 0 && !inCodeBlock) {
         if (!lastLineEmpty) {
-          contentBlocks.push(
-            <Box key={`spacer-${index}`} height={EMPTY_LINE_HEIGHT} />,
-          );
+          contentBlocks.push(<Box key={`spacer-${index}`} height={EMPTY_LINE_HEIGHT} />);
           lastLineEmpty = true;
         }
       } else {
@@ -291,9 +281,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
         content={codeBlockContent}
         lang={codeBlockLang}
         isPending={isPending}
-        availableTerminalHeight={
-          isAlternateBuffer ? undefined : availableTerminalHeight
-        }
+        availableTerminalHeight={isAlternateBuffer ? undefined : availableTerminalHeight}
         terminalWidth={terminalWidth}
       />,
     );
@@ -338,30 +326,21 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
 
   // When not in alternate buffer mode we need to be careful that we don't
   // trigger flicker when the pending code is to long to fit in the terminal
-  if (
-    !isAlternateBuffer &&
-    isPending &&
-    availableTerminalHeight !== undefined
-  ) {
-    const MAX_CODE_LINES_WHEN_PENDING = Math.max(
-      0,
-      availableTerminalHeight - RESERVED_LINES,
-    );
+  if (!isAlternateBuffer && isPending && availableTerminalHeight !== undefined) {
+    const MAX_CODE_LINES_WHEN_PENDING = Math.max(0, availableTerminalHeight - RESERVED_LINES);
 
     if (content.length > MAX_CODE_LINES_WHEN_PENDING) {
       if (MAX_CODE_LINES_WHEN_PENDING < MIN_LINES_FOR_MESSAGE) {
         // Not enough space to even show the message meaningfully
         return (
           <Box paddingLeft={CODE_BLOCK_PREFIX_PADDING}>
-            <Text color={theme.text.secondary}>
-              ... code is being written ...
-            </Text>
+            <Text color={theme.text.secondary}>... code is being written ...</Text>
           </Box>
         );
       }
       const truncatedContent = content.slice(0, MAX_CODE_LINES_WHEN_PENDING);
       const colorizedTruncatedCode = colorizeCode({
-        code: truncatedContent.join('\n'),
+        code: truncatedContent.join("\n"),
         language: lang,
         availableHeight: availableTerminalHeight,
         maxWidth: terminalWidth - CODE_BLOCK_PREFIX_PADDING,
@@ -376,7 +355,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
     }
   }
 
-  const fullContent = content.join('\n');
+  const fullContent = content.join("\n");
   const colorizedCode = colorizeCode({
     code: fullContent,
     language: lang,
@@ -401,7 +380,7 @@ const RenderCodeBlock = React.memo(RenderCodeBlockInternal);
 
 interface RenderListItemProps {
   itemText: string;
-  type: 'ul' | 'ol';
+  type: "ul" | "ol";
   marker: string;
   leadingWhitespace?: string;
 }
@@ -410,18 +389,15 @@ const RenderListItemInternal: React.FC<RenderListItemProps> = ({
   itemText,
   type,
   marker,
-  leadingWhitespace = '',
+  leadingWhitespace = "",
 }) => {
-  const prefix = type === 'ol' ? `${marker}. ` : `${marker} `;
+  const prefix = type === "ol" ? `${marker}. ` : `${marker} `;
   const prefixWidth = prefix.length;
   const indentation = leadingWhitespace.length;
   const listResponseColor = theme.text.response ?? theme.text.primary;
 
   return (
-    <Box
-      paddingLeft={indentation + LIST_ITEM_PREFIX_PADDING}
-      flexDirection="row"
-    >
+    <Box paddingLeft={indentation + LIST_ITEM_PREFIX_PADDING} flexDirection="row">
       <Box width={prefixWidth}>
         <Text color={listResponseColor}>{prefix}</Text>
       </Box>
@@ -442,11 +418,7 @@ interface RenderTableProps {
   terminalWidth: number;
 }
 
-const RenderTableInternal: React.FC<RenderTableProps> = ({
-  headers,
-  rows,
-  terminalWidth,
-}) => (
+const RenderTableInternal: React.FC<RenderTableProps> = ({ headers, rows, terminalWidth }) => (
   <TableRenderer headers={headers} rows={rows} terminalWidth={terminalWidth} />
 );
 
diff --git a/packages/ui-gemini/src/ui/utils/TableRenderer.tsx b/packages/ui-gemini/src/ui/utils/TableRenderer.tsx
index 3c1af3817..72e3b7d10 100644
--- a/packages/ui-gemini/src/ui/utils/TableRenderer.tsx
+++ b/packages/ui-gemini/src/ui/utils/TableRenderer.tsx
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React from 'react';
-import { Text, Box } from 'ink';
-import { theme } from '../semantic-colors.js';
-import { RenderInline, getPlainTextLength } from './InlineMarkdownRenderer.js';
+import { Box, Text } from "ink";
+import React from "react";
+import { theme } from "../semantic-colors.js";
+import { getPlainTextLength, RenderInline } from "./InlineMarkdownRenderer.js";
 
 interface TableRendererProps {
   headers: string[];
@@ -19,34 +19,21 @@ interface TableRendererProps {
  * Custom table renderer for markdown tables
  * We implement our own instead of using ink-table due to module compatibility issues
  */
-export const TableRenderer: React.FC<TableRendererProps> = ({
-  headers,
-  rows,
-  terminalWidth,
-}) => {
+export const TableRenderer: React.FC<TableRendererProps> = ({ headers, rows, terminalWidth }) => {
   // Calculate column widths using actual display width after markdown processing
   const columnWidths = headers.map((header, index) => {
     const headerWidth = getPlainTextLength(header);
-    const maxRowWidth = Math.max(
-      ...rows.map((row) => getPlainTextLength(row[index] || '')),
-    );
+    const maxRowWidth = Math.max(...rows.map((row) => getPlainTextLength(row[index] || "")));
     return Math.max(headerWidth, maxRowWidth) + 2; // Add padding
   });
 
   // Ensure table fits within terminal width
   const totalWidth = columnWidths.reduce((sum, width) => sum + width + 1, 1);
-  const scaleFactor =
-    totalWidth > terminalWidth ? terminalWidth / totalWidth : 1;
-  const adjustedWidths = columnWidths.map((width) =>
-    Math.floor(width * scaleFactor),
-  );
+  const scaleFactor = totalWidth > terminalWidth ? terminalWidth / totalWidth : 1;
+  const adjustedWidths = columnWidths.map((width) => Math.floor(width * scaleFactor));
 
   // Helper function to render a cell with proper width
-  const renderCell = (
-    content: string,
-    width: number,
-    isHeader = false,
-  ): React.ReactNode => {
+  const renderCell = (content: string, width: number, isHeader = false): React.ReactNode => {
     const contentWidth = Math.max(0, width - 2);
     const displayWidth = getPlainTextLength(content);
 
@@ -54,10 +41,7 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
     if (displayWidth > contentWidth) {
       if (contentWidth <= 3) {
         // Just truncate by character count
-        cellContent = content.substring(
-          0,
-          Math.min(content.length, contentWidth),
-        );
+        cellContent = content.substring(0, Math.min(content.length, contentWidth));
       } else {
         // Truncate preserving markdown formatting using binary search
         let left = 0;
@@ -78,7 +62,7 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
           }
         }
 
-        cellContent = bestTruncated + '...';
+        cellContent = bestTruncated + "...";
       }
     }
 
@@ -95,17 +79,17 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
         ) : (
           <RenderInline text={cellContent} />
         )}
-        {' '.repeat(paddingNeeded)}
+        {" ".repeat(paddingNeeded)}
       </Text>
     );
   };
 
   // Helper function to render border
-  const renderBorder = (type: 'top' | 'middle' | 'bottom'): React.ReactNode => {
+  const renderBorder = (type: "top" | "middle" | "bottom"): React.ReactNode => {
     const chars = {
-      top: { left: '┌', middle: '┬', right: '┐', horizontal: '─' },
-      middle: { left: '├', middle: '┼', right: '┤', horizontal: '─' },
-      bottom: { left: '└', middle: '┴', right: '┘', horizontal: '─' },
+      top: { left: "┌", middle: "┬", right: "┐", horizontal: "─" },
+      middle: { left: "├", middle: "┼", right: "┤", horizontal: "─" },
+      bottom: { left: "└", middle: "┴", right: "┘", horizontal: "─" },
     };
 
     const char = chars[type];
@@ -119,18 +103,18 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
   const renderRow = (cells: string[], isHeader = false): React.ReactNode => {
     const renderedCells = cells.map((cell, index) => {
       const width = adjustedWidths[index] || 0;
-      return renderCell(cell || '', width, isHeader);
+      return renderCell(cell || "", width, isHeader);
     });
 
     return (
       <Text color={theme.text.primary}>
-        │{' '}
+        │{" "}
         {renderedCells.map((cell, index) => (
           <React.Fragment key={index}>
             {cell}
-            {index < renderedCells.length - 1 ? ' │ ' : ''}
+            {index < renderedCells.length - 1 ? " │ " : ""}
           </React.Fragment>
-        ))}{' '}
+        ))}{" "}
         │
       </Text>
     );
@@ -139,13 +123,13 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
   return (
     <Box flexDirection="column" marginY={1}>
       {/* Top border */}
-      {renderBorder('top')}
+      {renderBorder("top")}
 
       {/* Header row */}
       {renderRow(headers, true)}
 
       {/* Middle border */}
-      {renderBorder('middle')}
+      {renderBorder("middle")}
 
       {/* Data rows */}
       {rows.map((row, index) => (
@@ -153,7 +137,7 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
       ))}
 
       {/* Bottom border */}
-      {renderBorder('bottom')}
+      {renderBorder("bottom")}
     </Box>
   );
 };
diff --git a/packages/ui-gemini/src/ui/utils/bracketedPaste.ts b/packages/ui-gemini/src/ui/utils/bracketedPaste.ts
index 749080ff4..28eaf7d8b 100644
--- a/packages/ui-gemini/src/ui/utils/bracketedPaste.ts
+++ b/packages/ui-gemini/src/ui/utils/bracketedPaste.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { writeToStdout } from '@airiscode/gemini-cli-core';
+import { writeToStdout } from "@airiscode/gemini-cli-core";
 
-const ENABLE_BRACKETED_PASTE = '\x1b[?2004h';
-const DISABLE_BRACKETED_PASTE = '\x1b[?2004l';
+const ENABLE_BRACKETED_PASTE = "\x1b[?2004h";
+const DISABLE_BRACKETED_PASTE = "\x1b[?2004l";
 
 export const enableBracketedPaste = () => {
   writeToStdout(ENABLE_BRACKETED_PASTE);
diff --git a/packages/ui-gemini/src/ui/utils/clipboardUtils.test.ts b/packages/ui-gemini/src/ui/utils/clipboardUtils.test.ts
index 30258889e..8ced74693 100644
--- a/packages/ui-gemini/src/ui/utils/clipboardUtils.test.ts
+++ b/packages/ui-gemini/src/ui/utils/clipboardUtils.test.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
+  cleanupOldClipboardImages,
   clipboardHasImage,
   saveClipboardImage,
-  cleanupOldClipboardImages,
-} from './clipboardUtils.js';
+} from "./clipboardUtils.js";
 
-describe('clipboardUtils', () => {
-  describe('clipboardHasImage', () => {
-    it('should return false on non-macOS platforms', async () => {
-      if (process.platform !== 'darwin') {
+describe("clipboardUtils", () => {
+  describe("clipboardHasImage", () => {
+    it("should return false on non-macOS platforms", async () => {
+      if (process.platform !== "darwin") {
         const result = await clipboardHasImage();
         expect(result).toBe(false);
       } else {
@@ -23,10 +23,10 @@ describe('clipboardUtils', () => {
       }
     });
 
-    it('should return boolean on macOS', async () => {
-      if (process.platform === 'darwin') {
+    it("should return boolean on macOS", async () => {
+      if (process.platform === "darwin") {
         const result = await clipboardHasImage();
-        expect(typeof result).toBe('boolean');
+        expect(typeof result).toBe("boolean");
       } else {
         // Skip on non-macOS
         expect(true).toBe(true);
@@ -34,9 +34,9 @@ describe('clipboardUtils', () => {
     });
   });
 
-  describe('saveClipboardImage', () => {
-    it('should return null on non-macOS platforms', async () => {
-      if (process.platform !== 'darwin') {
+  describe("saveClipboardImage", () => {
+    it("should return null on non-macOS platforms", async () => {
+      if (process.platform !== "darwin") {
         const result = await saveClipboardImage();
         expect(result).toBe(null);
       } else {
@@ -45,15 +45,13 @@ describe('clipboardUtils', () => {
       }
     });
 
-    it('should handle errors gracefully', async () => {
+    it("should handle errors gracefully", async () => {
       // Test with invalid directory (should not throw)
-      const result = await saveClipboardImage(
-        '/invalid/path/that/does/not/exist',
-      );
+      const result = await saveClipboardImage("/invalid/path/that/does/not/exist");
 
-      if (process.platform === 'darwin') {
+      if (process.platform === "darwin") {
         // On macOS, might return null due to various errors
-        expect(result === null || typeof result === 'string').toBe(true);
+        expect(result === null || typeof result === "string").toBe(true);
       } else {
         // On other platforms, should always return null
         expect(result).toBe(null);
@@ -61,16 +59,14 @@ describe('clipboardUtils', () => {
     });
   });
 
-  describe('cleanupOldClipboardImages', () => {
-    it('should not throw errors', async () => {
+  describe("cleanupOldClipboardImages", () => {
+    it("should not throw errors", async () => {
       // Should handle missing directories gracefully
-      await expect(
-        cleanupOldClipboardImages('/path/that/does/not/exist'),
-      ).resolves.not.toThrow();
+      await expect(cleanupOldClipboardImages("/path/that/does/not/exist")).resolves.not.toThrow();
     });
 
-    it('should complete without errors on valid directory', async () => {
-      await expect(cleanupOldClipboardImages('.')).resolves.not.toThrow();
+    it("should complete without errors on valid directory", async () => {
+      await expect(cleanupOldClipboardImages(".")).resolves.not.toThrow();
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/utils/clipboardUtils.ts b/packages/ui-gemini/src/ui/utils/clipboardUtils.ts
index 2bc06e38c..7701d0f6d 100644
--- a/packages/ui-gemini/src/ui/utils/clipboardUtils.ts
+++ b/packages/ui-gemini/src/ui/utils/clipboardUtils.ts
@@ -4,35 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { debugLogger, spawnAsync } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { debugLogger, spawnAsync } from "@airiscode/gemini-cli-core";
 
 /**
  * Supported image file extensions based on Gemini API.
  * See: https://ai.google.dev/gemini-api/docs/image-understanding
  */
-export const IMAGE_EXTENSIONS = [
-  '.png',
-  '.jpg',
-  '.jpeg',
-  '.webp',
-  '.heic',
-  '.heif',
-];
+export const IMAGE_EXTENSIONS = [".png", ".jpg", ".jpeg", ".webp", ".heic", ".heif"];
 
 /**
  * Checks if the system clipboard contains an image (macOS only for now)
  * @returns true if clipboard contains an image
  */
 export async function clipboardHasImage(): Promise<boolean> {
-  if (process.platform !== 'darwin') {
+  if (process.platform !== "darwin") {
     return false;
   }
 
   try {
     // Use osascript to check clipboard type
-    const { stdout } = await spawnAsync('osascript', ['-e', 'clipboard info']);
+    const { stdout } = await spawnAsync("osascript", ["-e", "clipboard info"]);
     const imageRegex =
       /«class PNGf»|TIFF picture|JPEG picture|GIF picture|«class JPEG»|«class TIFF»/;
     return imageRegex.test(stdout);
@@ -46,10 +39,8 @@ export async function clipboardHasImage(): Promise<boolean> {
  * @param targetDir The target directory to create temp files within
  * @returns The path to the saved image file, or null if no image or error
  */
-export async function saveClipboardImage(
-  targetDir?: string,
-): Promise<string | null> {
-  if (process.platform !== 'darwin') {
+export async function saveClipboardImage(targetDir?: string): Promise<string | null> {
+  if (process.platform !== "darwin") {
     return null;
   }
 
@@ -57,7 +48,7 @@ export async function saveClipboardImage(
     // Create a temporary directory for clipboard images within the target directory
     // This avoids security restrictions on paths outside the target directory
     const baseDir = targetDir || process.cwd();
-    const tempDir = path.join(baseDir, '.gemini-clipboard');
+    const tempDir = path.join(baseDir, ".gemini-clipboard");
     await fs.mkdir(tempDir, { recursive: true });
 
     // Generate a unique filename with timestamp
@@ -66,15 +57,12 @@ export async function saveClipboardImage(
     // AppleScript clipboard classes to try, in order of preference.
     // macOS converts clipboard images to these formats (WEBP/HEIC/HEIF not supported by osascript).
     const formats = [
-      { class: 'PNGf', extension: 'png' },
-      { class: 'JPEG', extension: 'jpg' },
+      { class: "PNGf", extension: "png" },
+      { class: "JPEG", extension: "jpg" },
     ];
 
     for (const format of formats) {
-      const tempFilePath = path.join(
-        tempDir,
-        `clipboard-${timestamp}.${format.extension}`,
-      );
+      const tempFilePath = path.join(tempDir, `clipboard-${timestamp}.${format.extension}`);
 
       // Try to save clipboard as this format
       const script = `
@@ -92,9 +80,9 @@ export async function saveClipboardImage(
         end try
       `;
 
-      const { stdout } = await spawnAsync('osascript', ['-e', script]);
+      const { stdout } = await spawnAsync("osascript", ["-e", script]);
 
-      if (stdout.trim() === 'success') {
+      if (stdout.trim() === "success") {
         // Verify the file was created and has content
         try {
           const stats = await fs.stat(tempFilePath);
@@ -117,7 +105,7 @@ export async function saveClipboardImage(
     // No format worked
     return null;
   } catch (error) {
-    debugLogger.warn('Error saving clipboard image:', error);
+    debugLogger.warn("Error saving clipboard image:", error);
     return null;
   }
 }
@@ -127,18 +115,16 @@ export async function saveClipboardImage(
  * Removes files older than 1 hour
  * @param targetDir The target directory where temp files are stored
  */
-export async function cleanupOldClipboardImages(
-  targetDir?: string,
-): Promise<void> {
+export async function cleanupOldClipboardImages(targetDir?: string): Promise<void> {
   try {
     const baseDir = targetDir || process.cwd();
-    const tempDir = path.join(baseDir, '.gemini-clipboard');
+    const tempDir = path.join(baseDir, ".gemini-clipboard");
     const files = await fs.readdir(tempDir);
     const oneHourAgo = Date.now() - 60 * 60 * 1000;
 
     for (const file of files) {
       const ext = path.extname(file).toLowerCase();
-      if (file.startsWith('clipboard-') && IMAGE_EXTENSIONS.includes(ext)) {
+      if (file.startsWith("clipboard-") && IMAGE_EXTENSIONS.includes(ext)) {
         const filePath = path.join(tempDir, file);
         const stats = await fs.stat(filePath);
         if (stats.mtimeMs < oneHourAgo) {
diff --git a/packages/ui-gemini/src/ui/utils/commandUtils.test.ts b/packages/ui-gemini/src/ui/utils/commandUtils.test.ts
index 6133b33a3..3af9a2df9 100644
--- a/packages/ui-gemini/src/ui/utils/commandUtils.test.ts
+++ b/packages/ui-gemini/src/ui/utils/commandUtils.test.ts
@@ -4,47 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { EventEmitter } from 'node:events';
-import clipboardy from 'clipboardy';
-import {
-  isAtCommand,
-  isSlashCommand,
-  copyToClipboard,
-  getUrlOpenCommand,
-} from './commandUtils.js';
+import { EventEmitter } from "node:events";
+import clipboardy from "clipboardy";
+import type { Mock } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { copyToClipboard, getUrlOpenCommand, isAtCommand, isSlashCommand } from "./commandUtils.js";
 
 // Constants used by OSC-52 tests
-const ESC = '\u001B';
-const BEL = '\u0007';
-const ST = '\u001B\\';
+const ESC = "\u001B";
+const BEL = "\u0007";
+const ST = "\u001B\\";
 
 // Mock clipboardy
-vi.mock('clipboardy', () => ({
+vi.mock("clipboardy", () => ({
   default: {
     write: vi.fn(),
   },
 }));
 
 // Mock child_process
-vi.mock('child_process');
+vi.mock("child_process");
 
 // fs (for /dev/tty)
 const mockFs = vi.hoisted(() => ({
   createWriteStream: vi.fn(),
 }));
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   default: mockFs,
 }));
 
 // Mock process.platform for platform-specific tests
 const mockProcess = vi.hoisted(() => ({
-  platform: 'darwin',
+  platform: "darwin",
 }));
 
 vi.stubGlobal(
-  'process',
+  "process",
   Object.create(process, {
     platform: {
       get: () => mockProcess.platform,
@@ -72,15 +67,15 @@ const makeWritable = (opts?: { isTTY?: boolean; writeReturn?: boolean }) => {
 };
 
 const resetEnv = () => {
-  delete process.env['TMUX'];
-  delete process.env['STY'];
-  delete process.env['SSH_TTY'];
-  delete process.env['SSH_CONNECTION'];
-  delete process.env['SSH_CLIENT'];
-  delete process.env['WSL_DISTRO_NAME'];
-  delete process.env['WSLENV'];
-  delete process.env['WSL_INTEROP'];
-  delete process.env['TERM'];
+  delete process.env["TMUX"];
+  delete process.env["STY"];
+  delete process.env["SSH_TTY"];
+  delete process.env["SSH_CONNECTION"];
+  delete process.env["SSH_CLIENT"];
+  delete process.env["WSL_DISTRO_NAME"];
+  delete process.env["WSLENV"];
+  delete process.env["WSL_INTEROP"];
+  delete process.env["TERM"];
 };
 
 interface MockChildProcess extends EventEmitter {
@@ -91,7 +86,7 @@ interface MockChildProcess extends EventEmitter {
   stderr: EventEmitter;
 }
 
-describe('commandUtils', () => {
+describe("commandUtils", () => {
   let mockSpawn: Mock;
   let mockChild: MockChildProcess;
   let mockClipboardyWrite: Mock;
@@ -99,7 +94,7 @@ describe('commandUtils', () => {
   beforeEach(async () => {
     vi.clearAllMocks();
     // Dynamically import and set up spawn mock
-    const { spawn } = await import('node:child_process');
+    const { spawn } = await import("node:child_process");
     mockSpawn = spawn as Mock;
 
     // Create mock child process with stdout/stderr emitters
@@ -124,15 +119,15 @@ describe('commandUtils', () => {
 
     // default: no /dev/tty available
     mockFs.createWriteStream.mockImplementation(() => {
-      throw new Error('ENOENT');
+      throw new Error("ENOENT");
     });
 
     // default: stdio are not TTY for tests unless explicitly set
-    Object.defineProperty(process, 'stderr', {
+    Object.defineProperty(process, "stderr", {
       value: makeWritable({ isTTY: false }),
       configurable: true,
     });
-    Object.defineProperty(process, 'stdout', {
+    Object.defineProperty(process, "stdout", {
       value: makeWritable({ isTTY: false }),
       configurable: true,
     });
@@ -140,75 +135,73 @@ describe('commandUtils', () => {
     resetEnv();
   });
 
-  describe('isAtCommand', () => {
-    it('should return true when query starts with @', () => {
-      expect(isAtCommand('@file')).toBe(true);
-      expect(isAtCommand('@path/to/file')).toBe(true);
-      expect(isAtCommand('@')).toBe(true);
+  describe("isAtCommand", () => {
+    it("should return true when query starts with @", () => {
+      expect(isAtCommand("@file")).toBe(true);
+      expect(isAtCommand("@path/to/file")).toBe(true);
+      expect(isAtCommand("@")).toBe(true);
     });
 
-    it('should return true when query contains @ preceded by whitespace', () => {
-      expect(isAtCommand('hello @file')).toBe(true);
-      expect(isAtCommand('some text @path/to/file')).toBe(true);
-      expect(isAtCommand('   @file')).toBe(true);
+    it("should return true when query contains @ preceded by whitespace", () => {
+      expect(isAtCommand("hello @file")).toBe(true);
+      expect(isAtCommand("some text @path/to/file")).toBe(true);
+      expect(isAtCommand("   @file")).toBe(true);
     });
 
-    it('should return false when query does not start with @ and has no spaced @', () => {
-      expect(isAtCommand('file')).toBe(false);
-      expect(isAtCommand('hello')).toBe(false);
-      expect(isAtCommand('')).toBe(false);
-      expect(isAtCommand('email@domain.com')).toBe(false);
-      expect(isAtCommand('user@host')).toBe(false);
+    it("should return false when query does not start with @ and has no spaced @", () => {
+      expect(isAtCommand("file")).toBe(false);
+      expect(isAtCommand("hello")).toBe(false);
+      expect(isAtCommand("")).toBe(false);
+      expect(isAtCommand("email@domain.com")).toBe(false);
+      expect(isAtCommand("user@host")).toBe(false);
     });
 
-    it('should return false when @ is not preceded by whitespace', () => {
-      expect(isAtCommand('hello@file')).toBe(false);
-      expect(isAtCommand('text@path')).toBe(false);
+    it("should return false when @ is not preceded by whitespace", () => {
+      expect(isAtCommand("hello@file")).toBe(false);
+      expect(isAtCommand("text@path")).toBe(false);
     });
   });
 
-  describe('isSlashCommand', () => {
-    it('should return true when query starts with /', () => {
-      expect(isSlashCommand('/help')).toBe(true);
-      expect(isSlashCommand('/memory show')).toBe(true);
-      expect(isSlashCommand('/clear')).toBe(true);
-      expect(isSlashCommand('/')).toBe(true);
+  describe("isSlashCommand", () => {
+    it("should return true when query starts with /", () => {
+      expect(isSlashCommand("/help")).toBe(true);
+      expect(isSlashCommand("/memory show")).toBe(true);
+      expect(isSlashCommand("/clear")).toBe(true);
+      expect(isSlashCommand("/")).toBe(true);
     });
 
-    it('should return false when query does not start with /', () => {
-      expect(isSlashCommand('help')).toBe(false);
-      expect(isSlashCommand('memory show')).toBe(false);
-      expect(isSlashCommand('')).toBe(false);
-      expect(isSlashCommand('path/to/file')).toBe(false);
-      expect(isSlashCommand(' /help')).toBe(false);
+    it("should return false when query does not start with /", () => {
+      expect(isSlashCommand("help")).toBe(false);
+      expect(isSlashCommand("memory show")).toBe(false);
+      expect(isSlashCommand("")).toBe(false);
+      expect(isSlashCommand("path/to/file")).toBe(false);
+      expect(isSlashCommand(" /help")).toBe(false);
     });
 
-    it('should return false for line comments starting with //', () => {
-      expect(isSlashCommand('// This is a comment')).toBe(false);
-      expect(isSlashCommand('// check if variants base info all filled.')).toBe(
-        false,
-      );
-      expect(isSlashCommand('//comment without space')).toBe(false);
+    it("should return false for line comments starting with //", () => {
+      expect(isSlashCommand("// This is a comment")).toBe(false);
+      expect(isSlashCommand("// check if variants base info all filled.")).toBe(false);
+      expect(isSlashCommand("//comment without space")).toBe(false);
     });
 
-    it('should return false for block comments starting with /*', () => {
-      expect(isSlashCommand('/* This is a block comment */')).toBe(false);
-      expect(isSlashCommand('/*\n * Multi-line comment\n */')).toBe(false);
-      expect(isSlashCommand('/*comment without space*/')).toBe(false);
+    it("should return false for block comments starting with /*", () => {
+      expect(isSlashCommand("/* This is a block comment */")).toBe(false);
+      expect(isSlashCommand("/*\n * Multi-line comment\n */")).toBe(false);
+      expect(isSlashCommand("/*comment without space*/")).toBe(false);
     });
   });
 
-  describe('copyToClipboard', () => {
-    it('uses clipboardy when not in SSH/tmux/screen/WSL (even if TTYs exist)', async () => {
-      const testText = 'Hello, world!';
+  describe("copyToClipboard", () => {
+    it("uses clipboardy when not in SSH/tmux/screen/WSL (even if TTYs exist)", async () => {
+      const testText = "Hello, world!";
       mockClipboardyWrite.mockResolvedValue(undefined);
 
       // even if stderr/stdout are TTY, without the env signals we fallback
-      Object.defineProperty(process, 'stderr', {
+      Object.defineProperty(process, "stderr", {
         value: makeWritable({ isTTY: true }),
         configurable: true,
       });
-      Object.defineProperty(process, 'stdout', {
+      Object.defineProperty(process, "stdout", {
         value: makeWritable({ isTTY: true }),
         configurable: true,
       });
@@ -218,16 +211,16 @@ describe('commandUtils', () => {
       expect(mockClipboardyWrite).toHaveBeenCalledWith(testText);
     });
 
-    it('writes OSC-52 to /dev/tty when in SSH', async () => {
-      const testText = 'abc';
+    it("writes OSC-52 to /dev/tty when in SSH", async () => {
+      const testText = "abc";
       const tty = makeWritable({ isTTY: true });
       mockFs.createWriteStream.mockReturnValue(tty);
 
-      process.env['SSH_CONNECTION'] = '1';
+      process.env["SSH_CONNECTION"] = "1";
 
       await copyToClipboard(testText);
 
-      const b64 = Buffer.from(testText, 'utf8').toString('base64');
+      const b64 = Buffer.from(testText, "utf8").toString("base64");
       const expected = `${ESC}]52;c;${b64}${BEL}`;
 
       expect(tty.write).toHaveBeenCalledTimes(1);
@@ -236,12 +229,12 @@ describe('commandUtils', () => {
       expect(mockClipboardyWrite).not.toHaveBeenCalled();
     });
 
-    it('wraps OSC-52 for tmux', async () => {
-      const testText = 'tmux-copy';
+    it("wraps OSC-52 for tmux", async () => {
+      const testText = "tmux-copy";
       const tty = makeWritable({ isTTY: true });
       mockFs.createWriteStream.mockReturnValue(tty);
 
-      process.env['TMUX'] = '1';
+      process.env["TMUX"] = "1";
 
       await copyToClipboard(testText);
 
@@ -254,86 +247,85 @@ describe('commandUtils', () => {
       expect(mockClipboardyWrite).not.toHaveBeenCalled();
     });
 
-    it('wraps OSC-52 for GNU screen with chunked DCS', async () => {
+    it("wraps OSC-52 for GNU screen with chunked DCS", async () => {
       // ensure payload > chunk size (240) so there are multiple chunks
-      const testText = 'x'.repeat(1200);
+      const testText = "x".repeat(1200);
       const tty = makeWritable({ isTTY: true });
       mockFs.createWriteStream.mockReturnValue(tty);
 
-      process.env['STY'] = 'screen-session';
+      process.env["STY"] = "screen-session";
 
       await copyToClipboard(testText);
 
       const written = (tty.write as Mock).mock.calls[0][0] as string;
-      const chunkStarts = (written.match(new RegExp(`${ESC}P`, 'g')) || [])
-        .length;
+      const chunkStarts = (written.match(new RegExp(`${ESC}P`, "g")) || []).length;
       const chunkEnds = written.split(ST).length - 1;
 
       expect(chunkStarts).toBeGreaterThan(1);
       expect(chunkStarts).toBe(chunkEnds);
-      expect(written).toContain(']52;c;'); // contains base OSC-52 marker
+      expect(written).toContain("]52;c;"); // contains base OSC-52 marker
       expect(mockClipboardyWrite).not.toHaveBeenCalled();
     });
 
-    it('falls back to stderr when /dev/tty unavailable and stderr is a TTY', async () => {
-      const testText = 'stderr-tty';
+    it("falls back to stderr when /dev/tty unavailable and stderr is a TTY", async () => {
+      const testText = "stderr-tty";
       const stderrStream = makeWritable({ isTTY: true });
-      Object.defineProperty(process, 'stderr', {
+      Object.defineProperty(process, "stderr", {
         value: stderrStream,
         configurable: true,
       });
 
-      process.env['SSH_TTY'] = '/dev/pts/1';
+      process.env["SSH_TTY"] = "/dev/pts/1";
 
       await copyToClipboard(testText);
 
-      const b64 = Buffer.from(testText, 'utf8').toString('base64');
+      const b64 = Buffer.from(testText, "utf8").toString("base64");
       const expected = `${ESC}]52;c;${b64}${BEL}`;
 
       expect(stderrStream.write).toHaveBeenCalledWith(expected);
       expect(mockClipboardyWrite).not.toHaveBeenCalled();
     });
 
-    it('falls back to clipboardy when no TTY is available', async () => {
-      const testText = 'no-tty';
+    it("falls back to clipboardy when no TTY is available", async () => {
+      const testText = "no-tty";
       mockClipboardyWrite.mockResolvedValue(undefined);
 
       // /dev/tty throws; stderr/stdout are non-TTY by default
-      process.env['SSH_CLIENT'] = 'client';
+      process.env["SSH_CLIENT"] = "client";
 
       await copyToClipboard(testText);
 
       expect(mockClipboardyWrite).toHaveBeenCalledWith(testText);
     });
 
-    it('resolves on drain when backpressure occurs', async () => {
+    it("resolves on drain when backpressure occurs", async () => {
       const tty = makeWritable({ isTTY: true, writeReturn: false });
       mockFs.createWriteStream.mockReturnValue(tty);
-      process.env['SSH_CONNECTION'] = '1';
+      process.env["SSH_CONNECTION"] = "1";
 
-      const p = copyToClipboard('drain-test');
+      const p = copyToClipboard("drain-test");
       setTimeout(() => {
-        tty.emit('drain');
+        tty.emit("drain");
       }, 0);
       await expect(p).resolves.toBeUndefined();
     });
 
-    it('propagates errors from OSC-52 write path', async () => {
+    it("propagates errors from OSC-52 write path", async () => {
       const tty = makeWritable({ isTTY: true, writeReturn: false });
       mockFs.createWriteStream.mockReturnValue(tty);
-      process.env['SSH_CONNECTION'] = '1';
+      process.env["SSH_CONNECTION"] = "1";
 
-      const p = copyToClipboard('err-test');
+      const p = copyToClipboard("err-test");
       setTimeout(() => {
-        tty.emit('error', new Error('tty error'));
+        tty.emit("error", new Error("tty error"));
       }, 0);
 
-      await expect(p).rejects.toThrow('tty error');
+      await expect(p).rejects.toThrow("tty error");
       expect(mockClipboardyWrite).not.toHaveBeenCalled();
     });
 
-    it('does nothing for empty string', async () => {
-      await copyToClipboard('');
+    it("does nothing for empty string", async () => {
+      await copyToClipboard("");
       expect(mockClipboardyWrite).not.toHaveBeenCalled();
       // ensure no accidental writes to stdio either
       const stderrStream = process.stderr as unknown as { write: Mock };
@@ -342,10 +334,10 @@ describe('commandUtils', () => {
       expect(stdoutStream.write).not.toHaveBeenCalled();
     });
 
-    it('uses clipboardy when not in eligible env even if /dev/tty exists', async () => {
+    it("uses clipboardy when not in eligible env even if /dev/tty exists", async () => {
       const tty = makeWritable({ isTTY: true });
       mockFs.createWriteStream.mockReturnValue(tty);
-      const text = 'local-terminal';
+      const text = "local-terminal";
       mockClipboardyWrite.mockResolvedValue(undefined);
 
       await copyToClipboard(text);
@@ -356,40 +348,40 @@ describe('commandUtils', () => {
     });
   });
 
-  describe('getUrlOpenCommand', () => {
-    describe('on macOS (darwin)', () => {
+  describe("getUrlOpenCommand", () => {
+    describe("on macOS (darwin)", () => {
       beforeEach(() => {
-        mockProcess.platform = 'darwin';
+        mockProcess.platform = "darwin";
       });
-      it('should return open', () => {
-        expect(getUrlOpenCommand()).toBe('open');
+      it("should return open", () => {
+        expect(getUrlOpenCommand()).toBe("open");
       });
     });
 
-    describe('on Windows (win32)', () => {
+    describe("on Windows (win32)", () => {
       beforeEach(() => {
-        mockProcess.platform = 'win32';
+        mockProcess.platform = "win32";
       });
-      it('should return start', () => {
-        expect(getUrlOpenCommand()).toBe('start');
+      it("should return start", () => {
+        expect(getUrlOpenCommand()).toBe("start");
       });
     });
 
-    describe('on Linux (linux)', () => {
+    describe("on Linux (linux)", () => {
       beforeEach(() => {
-        mockProcess.platform = 'linux';
+        mockProcess.platform = "linux";
       });
-      it('should return xdg-open', () => {
-        expect(getUrlOpenCommand()).toBe('xdg-open');
+      it("should return xdg-open", () => {
+        expect(getUrlOpenCommand()).toBe("xdg-open");
       });
     });
 
-    describe('on unmatched OS', () => {
+    describe("on unmatched OS", () => {
       beforeEach(() => {
-        mockProcess.platform = 'unmatched';
+        mockProcess.platform = "unmatched";
       });
-      it('should return xdg-open', () => {
-        expect(getUrlOpenCommand()).toBe('xdg-open');
+      it("should return xdg-open", () => {
+        expect(getUrlOpenCommand()).toBe("xdg-open");
       });
     });
   });
diff --git a/packages/ui-gemini/src/ui/utils/commandUtils.ts b/packages/ui-gemini/src/ui/utils/commandUtils.ts
index d7d854b9a..18b8340c1 100644
--- a/packages/ui-gemini/src/ui/utils/commandUtils.ts
+++ b/packages/ui-gemini/src/ui/utils/commandUtils.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import clipboardy from 'clipboardy';
-import type { SlashCommand } from '../commands/types.js';
-import fs from 'node:fs';
-import type { Writable } from 'node:stream';
+import fs from "node:fs";
+import type { Writable } from "node:stream";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import clipboardy from "clipboardy";
+import type { SlashCommand } from "../commands/types.js";
 
 /**
  * Checks if a query string potentially represents an '@' command.
@@ -20,7 +20,7 @@ import type { Writable } from 'node:stream';
  */
 export const isAtCommand = (query: string): boolean =>
   // Check if starts with @ OR has a space, then @
-  query.startsWith('@') || /\s@/.test(query);
+  query.startsWith("@") || /\s@/.test(query);
 
 /**
  * Checks if a query string potentially represents an '/' command.
@@ -30,34 +30,32 @@ export const isAtCommand = (query: string): boolean =>
  * @returns True if the query looks like an '/' command, false otherwise.
  */
 export const isSlashCommand = (query: string): boolean => {
-  if (!query.startsWith('/')) {
+  if (!query.startsWith("/")) {
     return false;
   }
 
   // Exclude line comments that start with '//'
-  if (query.startsWith('//')) {
+  if (query.startsWith("//")) {
     return false;
   }
 
   // Exclude block comments that start with '/*'
-  if (query.startsWith('/*')) {
+  if (query.startsWith("/*")) {
     return false;
   }
 
   return true;
 };
 
-const ESC = '\u001B';
-const BEL = '\u0007';
-const ST = '\u001B\\';
+const ESC = "\u001B";
+const BEL = "\u0007";
+const ST = "\u001B\\";
 
 const MAX_OSC52_SEQUENCE_BYTES = 100_000;
 const OSC52_HEADER = `${ESC}]52;c;`;
 const OSC52_FOOTER = BEL;
 const MAX_OSC52_BODY_B64_BYTES =
-  MAX_OSC52_SEQUENCE_BYTES -
-  Buffer.byteLength(OSC52_HEADER) -
-  Buffer.byteLength(OSC52_FOOTER);
+  MAX_OSC52_SEQUENCE_BYTES - Buffer.byteLength(OSC52_HEADER) - Buffer.byteLength(OSC52_FOOTER);
 const MAX_OSC52_DATA_BYTES = Math.floor(MAX_OSC52_BODY_B64_BYTES / 4) * 3;
 
 // Conservative chunk size for GNU screen DCS passthrough.
@@ -68,48 +66,32 @@ type TtyTarget = { stream: Writable; closeAfter: boolean } | null;
 const pickTty = (): TtyTarget => {
   // Prefer the controlling TTY to avoid interleaving escape sequences with piped stdout.
   try {
-    const devTty = fs.createWriteStream('/dev/tty');
+    const devTty = fs.createWriteStream("/dev/tty");
     return { stream: devTty, closeAfter: true };
   } catch {
     // fall through
   }
-  if (process.stderr?.isTTY)
-    return { stream: process.stderr, closeAfter: false };
-  if (process.stdout?.isTTY)
-    return { stream: process.stdout, closeAfter: false };
+  if (process.stderr?.isTTY) return { stream: process.stderr, closeAfter: false };
+  if (process.stdout?.isTTY) return { stream: process.stdout, closeAfter: false };
   return null;
 };
 
 const inTmux = (): boolean =>
-  Boolean(
-    process.env['TMUX'] || (process.env['TERM'] ?? '').startsWith('tmux'),
-  );
+  Boolean(process.env["TMUX"] || (process.env["TERM"] ?? "").startsWith("tmux"));
 
 const inScreen = (): boolean =>
-  Boolean(
-    process.env['STY'] || (process.env['TERM'] ?? '').startsWith('screen'),
-  );
+  Boolean(process.env["STY"] || (process.env["TERM"] ?? "").startsWith("screen"));
 
 const isSSH = (): boolean =>
-  Boolean(
-    process.env['SSH_TTY'] ||
-      process.env['SSH_CONNECTION'] ||
-      process.env['SSH_CLIENT'],
-  );
+  Boolean(process.env["SSH_TTY"] || process.env["SSH_CONNECTION"] || process.env["SSH_CLIENT"]);
 
 const isWSL = (): boolean =>
-  Boolean(
-    process.env['WSL_DISTRO_NAME'] ||
-      process.env['WSLENV'] ||
-      process.env['WSL_INTEROP'],
-  );
+  Boolean(process.env["WSL_DISTRO_NAME"] || process.env["WSLENV"] || process.env["WSL_INTEROP"]);
 
-const isDumbTerm = (): boolean => (process.env['TERM'] ?? '') === 'dumb';
+const isDumbTerm = (): boolean => (process.env["TERM"] ?? "") === "dumb";
 
 const shouldUseOsc52 = (tty: TtyTarget): boolean =>
-  Boolean(tty) &&
-  !isDumbTerm() &&
-  (isSSH() || inTmux() || inScreen() || isWSL());
+  Boolean(tty) && !isDumbTerm() && (isSSH() || inTmux() || inScreen() || isWSL());
 
 const safeUtf8Truncate = (buf: Buffer, maxBytes: number): Buffer => {
   if (buf.length <= maxBytes) return buf;
@@ -120,9 +102,9 @@ const safeUtf8Truncate = (buf: Buffer, maxBytes: number): Buffer => {
 };
 
 const buildOsc52 = (text: string): string => {
-  const raw = Buffer.from(text, 'utf8');
+  const raw = Buffer.from(text, "utf8");
   const safe = safeUtf8Truncate(raw, MAX_OSC52_DATA_BYTES);
-  const b64 = safe.toString('base64');
+  const b64 = safe.toString("base64");
   return `${OSC52_HEADER}${b64}${OSC52_FOOTER}`;
 };
 
@@ -133,7 +115,7 @@ const wrapForTmux = (seq: string): string => {
 };
 
 const wrapForScreen = (seq: string): string => {
-  let out = '';
+  let out = "";
   for (let i = 0; i < seq.length; i += SCREEN_DCS_CHUNK_SIZE) {
     out += `${ESC}P${seq.slice(i, i + SCREEN_DCS_CHUNK_SIZE)}${ST}`;
   }
@@ -151,16 +133,16 @@ const writeAll = (stream: Writable, data: string): Promise<void> =>
       resolve();
     };
     const cleanup = () => {
-      stream.off('error', onError);
-      stream.off('drain', onDrain);
+      stream.off("error", onError);
+      stream.off("drain", onDrain);
       // Writable.write() handlers may not emit 'drain' if the first write succeeded.
     };
-    stream.once('error', onError);
+    stream.once("error", onError);
     if (stream.write(data)) {
       cleanup();
       resolve();
     } else {
-      stream.once('drain', onDrain);
+      stream.once("drain", onDrain);
     }
   });
 
@@ -172,11 +154,7 @@ export const copyToClipboard = async (text: string): Promise<void> => {
 
   if (shouldUseOsc52(tty)) {
     const osc = buildOsc52(text);
-    const payload = inTmux()
-      ? wrapForTmux(osc)
-      : inScreen()
-        ? wrapForScreen(osc)
-        : osc;
+    const payload = inTmux() ? wrapForTmux(osc) : inScreen() ? wrapForScreen(osc) : osc;
 
     await writeAll(tty!.stream, payload);
 
@@ -194,18 +172,18 @@ export const getUrlOpenCommand = (): string => {
   // --- Determine the OS-specific command to open URLs ---
   let openCmd: string;
   switch (process.platform) {
-    case 'darwin':
-      openCmd = 'open';
+    case "darwin":
+      openCmd = "open";
       break;
-    case 'win32':
-      openCmd = 'start';
+    case "win32":
+      openCmd = "start";
       break;
-    case 'linux':
-      openCmd = 'xdg-open';
+    case "linux":
+      openCmd = "xdg-open";
       break;
     default:
       // Default to xdg-open, which appears to be supported for the less popular operating systems.
-      openCmd = 'xdg-open';
+      openCmd = "xdg-open";
       debugLogger.warn(
         `Unknown platform: ${process.platform}. Attempting to open URLs with: ${openCmd}.`,
       );
@@ -224,9 +202,7 @@ export const getUrlOpenCommand = (): string => {
  * @param command The slash command to check
  * @returns true if the command should auto-execute on Enter
  */
-export function isAutoExecutableCommand(
-  command: SlashCommand | undefined | null,
-): boolean {
+export function isAutoExecutableCommand(command: SlashCommand | undefined | null): boolean {
   if (!command) {
     return false;
   }
diff --git a/packages/ui-gemini/src/ui/utils/computeStats.test.ts b/packages/ui-gemini/src/ui/utils/computeStats.test.ts
index 54cd19613..760d4dfce 100644
--- a/packages/ui-gemini/src/ui/utils/computeStats.test.ts
+++ b/packages/ui-gemini/src/ui/utils/computeStats.test.ts
@@ -4,20 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import type { ModelMetrics, SessionMetrics } from "../contexts/SessionContext.js";
 import {
   calculateAverageLatency,
   calculateCacheHitRate,
   calculateErrorRate,
   computeSessionStats,
-} from './computeStats.js';
-import type {
-  ModelMetrics,
-  SessionMetrics,
-} from '../contexts/SessionContext.js';
+} from "./computeStats.js";
 
-describe('calculateErrorRate', () => {
-  it('should return 0 if totalRequests is 0', () => {
+describe("calculateErrorRate", () => {
+  it("should return 0 if totalRequests is 0", () => {
     const metrics: ModelMetrics = {
       api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 0 },
       tokens: {
@@ -32,7 +29,7 @@ describe('calculateErrorRate', () => {
     expect(calculateErrorRate(metrics)).toBe(0);
   });
 
-  it('should calculate the error rate correctly', () => {
+  it("should calculate the error rate correctly", () => {
     const metrics: ModelMetrics = {
       api: { totalRequests: 10, totalErrors: 2, totalLatencyMs: 0 },
       tokens: {
@@ -48,8 +45,8 @@ describe('calculateErrorRate', () => {
   });
 });
 
-describe('calculateAverageLatency', () => {
-  it('should return 0 if totalRequests is 0', () => {
+describe("calculateAverageLatency", () => {
+  it("should return 0 if totalRequests is 0", () => {
     const metrics: ModelMetrics = {
       api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 1000 },
       tokens: {
@@ -64,7 +61,7 @@ describe('calculateAverageLatency', () => {
     expect(calculateAverageLatency(metrics)).toBe(0);
   });
 
-  it('should calculate the average latency correctly', () => {
+  it("should calculate the average latency correctly", () => {
     const metrics: ModelMetrics = {
       api: { totalRequests: 10, totalErrors: 0, totalLatencyMs: 1500 },
       tokens: {
@@ -80,8 +77,8 @@ describe('calculateAverageLatency', () => {
   });
 });
 
-describe('calculateCacheHitRate', () => {
-  it('should return 0 if prompt tokens is 0', () => {
+describe("calculateCacheHitRate", () => {
+  it("should return 0 if prompt tokens is 0", () => {
     const metrics: ModelMetrics = {
       api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 0 },
       tokens: {
@@ -96,7 +93,7 @@ describe('calculateCacheHitRate', () => {
     expect(calculateCacheHitRate(metrics)).toBe(0);
   });
 
-  it('should calculate the cache hit rate correctly', () => {
+  it("should calculate the cache hit rate correctly", () => {
     const metrics: ModelMetrics = {
       api: { totalRequests: 0, totalErrors: 0, totalLatencyMs: 0 },
       tokens: {
@@ -112,8 +109,8 @@ describe('calculateCacheHitRate', () => {
   });
 });
 
-describe('computeSessionStats', () => {
-  it('should return all zeros for initial empty metrics', () => {
+describe("computeSessionStats", () => {
+  it("should return all zeros for initial empty metrics", () => {
     const metrics: SessionMetrics = {
       models: {},
       tools: {
@@ -149,10 +146,10 @@ describe('computeSessionStats', () => {
     });
   });
 
-  it('should correctly calculate API and tool time percentages', () => {
+  it("should correctly calculate API and tool time percentages", () => {
     const metrics: SessionMetrics = {
       models: {
-        'gemini-pro': {
+        "gemini-pro": {
           api: { totalRequests: 1, totalErrors: 0, totalLatencyMs: 750 },
           tokens: {
             prompt: 10,
@@ -187,10 +184,10 @@ describe('computeSessionStats', () => {
     expect(result.toolTimePercent).toBe(25);
   });
 
-  it('should correctly calculate cache efficiency', () => {
+  it("should correctly calculate cache efficiency", () => {
     const metrics: SessionMetrics = {
       models: {
-        'gemini-pro': {
+        "gemini-pro": {
           api: { totalRequests: 2, totalErrors: 0, totalLatencyMs: 1000 },
           tokens: {
             prompt: 150,
@@ -221,7 +218,7 @@ describe('computeSessionStats', () => {
     expect(result.cacheEfficiency).toBeCloseTo(33.33); // 50 / 150
   });
 
-  it('should correctly calculate success and agreement rates', () => {
+  it("should correctly calculate success and agreement rates", () => {
     const metrics: SessionMetrics = {
       models: {},
       tools: {
@@ -244,7 +241,7 @@ describe('computeSessionStats', () => {
     expect(result.agreementRate).toBe(60); // 6 / 10
   });
 
-  it('should handle division by zero gracefully', () => {
+  it("should handle division by zero gracefully", () => {
     const metrics: SessionMetrics = {
       models: {},
       tools: {
@@ -270,7 +267,7 @@ describe('computeSessionStats', () => {
     expect(result.agreementRate).toBe(0);
   });
 
-  it('should correctly include line counts', () => {
+  it("should correctly include line counts", () => {
     const metrics: SessionMetrics = {
       models: {},
       tools: {
diff --git a/packages/ui-gemini/src/ui/utils/computeStats.ts b/packages/ui-gemini/src/ui/utils/computeStats.ts
index f9d51794b..fcf99a841 100644
--- a/packages/ui-gemini/src/ui/utils/computeStats.ts
+++ b/packages/ui-gemini/src/ui/utils/computeStats.ts
@@ -5,10 +5,10 @@
  */
 
 import type {
-  SessionMetrics,
   ComputedSessionStats,
   ModelMetrics,
-} from '../contexts/SessionContext.js';
+  SessionMetrics,
+} from "../contexts/SessionContext.js";
 
 export function calculateErrorRate(metrics: ModelMetrics): number {
   if (metrics.api.totalRequests === 0) {
@@ -31,9 +31,7 @@ export function calculateCacheHitRate(metrics: ModelMetrics): number {
   return (metrics.tokens.cached / metrics.tokens.prompt) * 100;
 }
 
-export const computeSessionStats = (
-  metrics: SessionMetrics,
-): ComputedSessionStats => {
+export const computeSessionStats = (metrics: SessionMetrics): ComputedSessionStats => {
   const { models, tools, files } = metrics;
   const totalApiTime = Object.values(models).reduce(
     (acc, model) => acc + model.api.totalLatencyMs,
@@ -41,10 +39,8 @@ export const computeSessionStats = (
   );
   const totalToolTime = tools.totalDurationMs;
   const agentActiveTime = totalApiTime + totalToolTime;
-  const apiTimePercent =
-    agentActiveTime > 0 ? (totalApiTime / agentActiveTime) * 100 : 0;
-  const toolTimePercent =
-    agentActiveTime > 0 ? (totalToolTime / agentActiveTime) * 100 : 0;
+  const apiTimePercent = agentActiveTime > 0 ? (totalApiTime / agentActiveTime) * 100 : 0;
+  const toolTimePercent = agentActiveTime > 0 ? (totalToolTime / agentActiveTime) * 100 : 0;
 
   const totalCachedTokens = Object.values(models).reduce(
     (acc, model) => acc + model.tokens.cached,
@@ -54,21 +50,17 @@ export const computeSessionStats = (
     (acc, model) => acc + model.tokens.prompt,
     0,
   );
-  const cacheEfficiency =
-    totalPromptTokens > 0 ? (totalCachedTokens / totalPromptTokens) * 100 : 0;
+  const cacheEfficiency = totalPromptTokens > 0 ? (totalCachedTokens / totalPromptTokens) * 100 : 0;
 
   const totalDecisions =
     tools.totalDecisions.accept +
     tools.totalDecisions.reject +
     tools.totalDecisions.modify +
     tools.totalDecisions.auto_accept;
-  const successRate =
-    tools.totalCalls > 0 ? (tools.totalSuccess / tools.totalCalls) * 100 : 0;
+  const successRate = tools.totalCalls > 0 ? (tools.totalSuccess / tools.totalCalls) * 100 : 0;
   const agreementRate =
     totalDecisions > 0
-      ? ((tools.totalDecisions.accept + tools.totalDecisions.auto_accept) /
-          totalDecisions) *
-        100
+      ? ((tools.totalDecisions.accept + tools.totalDecisions.auto_accept) / totalDecisions) * 100
       : 0;
 
   return {
diff --git a/packages/ui-gemini/src/ui/utils/directoryUtils.test.ts b/packages/ui-gemini/src/ui/utils/directoryUtils.test.ts
index 09e4c4dae..ea5265a12 100644
--- a/packages/ui-gemini/src/ui/utils/directoryUtils.test.ts
+++ b/packages/ui-gemini/src/ui/utils/directoryUtils.test.ts
@@ -4,28 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect } from 'vitest';
-import { expandHomeDir } from './directoryUtils.js';
-import type * as osActual from 'node:os';
-import * as path from 'node:path';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+import type * as osActual from "node:os";
+import * as path from "node:path";
+import { describe, expect, it, vi } from "vitest";
+import { expandHomeDir } from "./directoryUtils.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...original,
     loadServerHierarchicalMemory: vi.fn().mockResolvedValue({
-      memoryContent: 'mock memory',
+      memoryContent: "mock memory",
       fileCount: 10,
-      filePaths: ['/a/b/c.md'],
+      filePaths: ["/a/b/c.md"],
     }),
   };
 });
 
-const mockHomeDir =
-  process.platform === 'win32' ? 'C:\\Users\\testuser' : '/home/testuser';
+const mockHomeDir = process.platform === "win32" ? "C:\\Users\\testuser" : "/home/testuser";
 
-vi.mock('node:os', async (importOriginal) => {
+vi.mock("node:os", async (importOriginal) => {
   const original = await importOriginal<typeof osActual>();
   return {
     ...original,
@@ -33,31 +31,31 @@ vi.mock('node:os', async (importOriginal) => {
   };
 });
 
-describe('directoryUtils', () => {
-  describe('expandHomeDir', () => {
-    it('should expand ~ to the home directory', () => {
-      expect(expandHomeDir('~')).toBe(mockHomeDir);
+describe("directoryUtils", () => {
+  describe("expandHomeDir", () => {
+    it("should expand ~ to the home directory", () => {
+      expect(expandHomeDir("~")).toBe(mockHomeDir);
     });
 
-    it('should expand ~/path to the home directory path', () => {
-      const expected = path.join(mockHomeDir, 'Documents');
-      expect(expandHomeDir('~/Documents')).toBe(expected);
+    it("should expand ~/path to the home directory path", () => {
+      const expected = path.join(mockHomeDir, "Documents");
+      expect(expandHomeDir("~/Documents")).toBe(expected);
     });
 
-    it('should expand %userprofile% on Windows', () => {
-      if (process.platform === 'win32') {
-        const expected = path.join(mockHomeDir, 'Desktop');
-        expect(expandHomeDir('%userprofile%\\Desktop')).toBe(expected);
+    it("should expand %userprofile% on Windows", () => {
+      if (process.platform === "win32") {
+        const expected = path.join(mockHomeDir, "Desktop");
+        expect(expandHomeDir("%userprofile%\\Desktop")).toBe(expected);
       }
     });
 
-    it('should not change a path that does not need expansion', () => {
-      const regularPath = path.join('usr', 'local', 'bin');
+    it("should not change a path that does not need expansion", () => {
+      const regularPath = path.join("usr", "local", "bin");
       expect(expandHomeDir(regularPath)).toBe(regularPath);
     });
 
-    it('should return an empty string if input is empty', () => {
-      expect(expandHomeDir('')).toBe('');
+    it("should return an empty string if input is empty", () => {
+      expect(expandHomeDir("")).toBe("");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/utils/directoryUtils.ts b/packages/ui-gemini/src/ui/utils/directoryUtils.ts
index e389042c7..913a60364 100644
--- a/packages/ui-gemini/src/ui/utils/directoryUtils.ts
+++ b/packages/ui-gemini/src/ui/utils/directoryUtils.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as os from "node:os";
+import * as path from "node:path";
 
 export function expandHomeDir(p: string): string {
   if (!p) {
-    return '';
+    return "";
   }
   let expandedPath = p;
-  if (p.toLowerCase().startsWith('%userprofile%')) {
-    expandedPath = os.homedir() + p.substring('%userprofile%'.length);
-  } else if (p === '~' || p.startsWith('~/')) {
+  if (p.toLowerCase().startsWith("%userprofile%")) {
+    expandedPath = os.homedir() + p.substring("%userprofile%".length);
+  } else if (p === "~" || p.startsWith("~/")) {
     expandedPath = os.homedir() + p.substring(1);
   }
   return path.normalize(expandedPath);
diff --git a/packages/ui-gemini/src/ui/utils/displayUtils.test.ts b/packages/ui-gemini/src/ui/utils/displayUtils.test.ts
index 962cb57c7..37ad23b44 100644
--- a/packages/ui-gemini/src/ui/utils/displayUtils.test.ts
+++ b/packages/ui-gemini/src/ui/utils/displayUtils.test.ts
@@ -4,74 +4,74 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { Colors } from "../colors.js";
 import {
+  CACHE_EFFICIENCY_HIGH,
+  CACHE_EFFICIENCY_MEDIUM,
   getStatusColor,
   TOOL_SUCCESS_RATE_HIGH,
   TOOL_SUCCESS_RATE_MEDIUM,
   USER_AGREEMENT_RATE_HIGH,
   USER_AGREEMENT_RATE_MEDIUM,
-  CACHE_EFFICIENCY_HIGH,
-  CACHE_EFFICIENCY_MEDIUM,
-} from './displayUtils.js';
-import { Colors } from '../colors.js';
+} from "./displayUtils.js";
 
-describe('displayUtils', () => {
-  describe('getStatusColor', () => {
-    describe('with red threshold', () => {
+describe("displayUtils", () => {
+  describe("getStatusColor", () => {
+    describe("with red threshold", () => {
       const thresholds = {
         green: 80,
         yellow: 50,
         red: 20,
       };
 
-      it('should return green for values >= green threshold', () => {
+      it("should return green for values >= green threshold", () => {
         expect(getStatusColor(90, thresholds)).toBe(Colors.AccentGreen);
         expect(getStatusColor(80, thresholds)).toBe(Colors.AccentGreen);
       });
 
-      it('should return yellow for values < green and >= yellow threshold', () => {
+      it("should return yellow for values < green and >= yellow threshold", () => {
         expect(getStatusColor(79, thresholds)).toBe(Colors.AccentYellow);
         expect(getStatusColor(50, thresholds)).toBe(Colors.AccentYellow);
       });
 
-      it('should return red for values < yellow and >= red threshold', () => {
+      it("should return red for values < yellow and >= red threshold", () => {
         expect(getStatusColor(49, thresholds)).toBe(Colors.AccentRed);
         expect(getStatusColor(20, thresholds)).toBe(Colors.AccentRed);
       });
 
-      it('should return error for values < red threshold', () => {
+      it("should return error for values < red threshold", () => {
         expect(getStatusColor(19, thresholds)).toBe(Colors.AccentRed);
         expect(getStatusColor(0, thresholds)).toBe(Colors.AccentRed);
       });
 
-      it('should return defaultColor for values < red threshold when provided', () => {
-        expect(
-          getStatusColor(19, thresholds, { defaultColor: Colors.Foreground }),
-        ).toBe(Colors.Foreground);
+      it("should return defaultColor for values < red threshold when provided", () => {
+        expect(getStatusColor(19, thresholds, { defaultColor: Colors.Foreground })).toBe(
+          Colors.Foreground,
+        );
       });
     });
 
-    describe('when red threshold is not provided', () => {
+    describe("when red threshold is not provided", () => {
       const thresholds = {
         green: 80,
         yellow: 50,
       };
 
-      it('should return error color for values < yellow threshold', () => {
+      it("should return error color for values < yellow threshold", () => {
         expect(getStatusColor(49, thresholds)).toBe(Colors.AccentRed);
       });
 
-      it('should return defaultColor for values < yellow threshold when provided', () => {
-        expect(
-          getStatusColor(49, thresholds, { defaultColor: Colors.Foreground }),
-        ).toBe(Colors.Foreground);
+      it("should return defaultColor for values < yellow threshold when provided", () => {
+        expect(getStatusColor(49, thresholds, { defaultColor: Colors.Foreground })).toBe(
+          Colors.Foreground,
+        );
       });
     });
   });
 
-  describe('Threshold Constants', () => {
-    it('should have the correct values', () => {
+  describe("Threshold Constants", () => {
+    it("should have the correct values", () => {
       expect(TOOL_SUCCESS_RATE_HIGH).toBe(95);
       expect(TOOL_SUCCESS_RATE_MEDIUM).toBe(85);
       expect(USER_AGREEMENT_RATE_HIGH).toBe(75);
diff --git a/packages/ui-gemini/src/ui/utils/displayUtils.ts b/packages/ui-gemini/src/ui/utils/displayUtils.ts
index b8f603170..b3cb73371 100644
--- a/packages/ui-gemini/src/ui/utils/displayUtils.ts
+++ b/packages/ui-gemini/src/ui/utils/displayUtils.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { theme } from '../semantic-colors.js';
+import { theme } from "../semantic-colors.js";
 
 // --- Thresholds ---
 export const TOOL_SUCCESS_RATE_HIGH = 95;
diff --git a/packages/ui-gemini/src/ui/utils/formatters.test.ts b/packages/ui-gemini/src/ui/utils/formatters.test.ts
index cb3d13242..0e0da1988 100644
--- a/packages/ui-gemini/src/ui/utils/formatters.test.ts
+++ b/packages/ui-gemini/src/ui/utils/formatters.test.ts
@@ -4,69 +4,67 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { formatDuration, formatMemoryUsage } from './formatters.js';
+import { describe, expect, it } from "vitest";
+import { formatDuration, formatMemoryUsage } from "./formatters.js";
 
-describe('formatters', () => {
-  describe('formatMemoryUsage', () => {
-    it('should format bytes into KB', () => {
-      expect(formatMemoryUsage(12345)).toBe('12.1 KB');
+describe("formatters", () => {
+  describe("formatMemoryUsage", () => {
+    it("should format bytes into KB", () => {
+      expect(formatMemoryUsage(12345)).toBe("12.1 KB");
     });
 
-    it('should format bytes into MB', () => {
-      expect(formatMemoryUsage(12345678)).toBe('11.8 MB');
+    it("should format bytes into MB", () => {
+      expect(formatMemoryUsage(12345678)).toBe("11.8 MB");
     });
 
-    it('should format bytes into GB', () => {
-      expect(formatMemoryUsage(12345678901)).toBe('11.50 GB');
+    it("should format bytes into GB", () => {
+      expect(formatMemoryUsage(12345678901)).toBe("11.50 GB");
     });
   });
 
-  describe('formatDuration', () => {
-    it('should format milliseconds less than a second', () => {
-      expect(formatDuration(500)).toBe('500ms');
+  describe("formatDuration", () => {
+    it("should format milliseconds less than a second", () => {
+      expect(formatDuration(500)).toBe("500ms");
     });
 
-    it('should format a duration of 0', () => {
-      expect(formatDuration(0)).toBe('0s');
+    it("should format a duration of 0", () => {
+      expect(formatDuration(0)).toBe("0s");
     });
 
-    it('should format an exact number of seconds', () => {
-      expect(formatDuration(5000)).toBe('5.0s');
+    it("should format an exact number of seconds", () => {
+      expect(formatDuration(5000)).toBe("5.0s");
     });
 
-    it('should format a duration in seconds with one decimal place', () => {
-      expect(formatDuration(12345)).toBe('12.3s');
+    it("should format a duration in seconds with one decimal place", () => {
+      expect(formatDuration(12345)).toBe("12.3s");
     });
 
-    it('should format an exact number of minutes', () => {
-      expect(formatDuration(120000)).toBe('2m');
+    it("should format an exact number of minutes", () => {
+      expect(formatDuration(120000)).toBe("2m");
     });
 
-    it('should format a duration in minutes and seconds', () => {
-      expect(formatDuration(123000)).toBe('2m 3s');
+    it("should format a duration in minutes and seconds", () => {
+      expect(formatDuration(123000)).toBe("2m 3s");
     });
 
-    it('should format an exact number of hours', () => {
-      expect(formatDuration(3600000)).toBe('1h');
+    it("should format an exact number of hours", () => {
+      expect(formatDuration(3600000)).toBe("1h");
     });
 
-    it('should format a duration in hours and seconds', () => {
-      expect(formatDuration(3605000)).toBe('1h 5s');
+    it("should format a duration in hours and seconds", () => {
+      expect(formatDuration(3605000)).toBe("1h 5s");
     });
 
-    it('should format a duration in hours, minutes, and seconds', () => {
-      expect(formatDuration(3723000)).toBe('1h 2m 3s');
+    it("should format a duration in hours, minutes, and seconds", () => {
+      expect(formatDuration(3723000)).toBe("1h 2m 3s");
     });
 
-    it('should handle large durations', () => {
-      expect(formatDuration(86400000 + 3600000 + 120000 + 1000)).toBe(
-        '25h 2m 1s',
-      );
+    it("should handle large durations", () => {
+      expect(formatDuration(86400000 + 3600000 + 120000 + 1000)).toBe("25h 2m 1s");
     });
 
-    it('should handle negative durations', () => {
-      expect(formatDuration(-100)).toBe('0s');
+    it("should handle negative durations", () => {
+      expect(formatDuration(-100)).toBe("0s");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/utils/formatters.ts b/packages/ui-gemini/src/ui/utils/formatters.ts
index 2b6af5459..294625b0f 100644
--- a/packages/ui-gemini/src/ui/utils/formatters.ts
+++ b/packages/ui-gemini/src/ui/utils/formatters.ts
@@ -23,7 +23,7 @@ export const formatMemoryUsage = (bytes: number): string => {
  */
 export const formatDuration = (milliseconds: number): string => {
   if (milliseconds <= 0) {
-    return '0s';
+    return "0s";
   }
 
   if (milliseconds < 1000) {
@@ -59,5 +59,5 @@ export const formatDuration = (milliseconds: number): string => {
     return `${seconds}s`;
   }
 
-  return parts.join(' ');
+  return parts.join(" ");
 };
diff --git a/packages/ui-gemini/src/ui/utils/highlight.test.ts b/packages/ui-gemini/src/ui/utils/highlight.test.ts
index 8d4c5ce62..652c582a2 100644
--- a/packages/ui-gemini/src/ui/utils/highlight.test.ts
+++ b/packages/ui-gemini/src/ui/utils/highlight.test.ts
@@ -4,133 +4,129 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseInputForHighlighting } from './highlight.js';
+import { describe, expect, it } from "vitest";
+import { parseInputForHighlighting } from "./highlight.js";
 
-describe('parseInputForHighlighting', () => {
-  it('should handle an empty string', () => {
-    expect(parseInputForHighlighting('', 0)).toEqual([
-      { text: '', type: 'default' },
-    ]);
+describe("parseInputForHighlighting", () => {
+  it("should handle an empty string", () => {
+    expect(parseInputForHighlighting("", 0)).toEqual([{ text: "", type: "default" }]);
   });
 
-  it('should handle text with no commands or files', () => {
-    const text = 'this is a normal sentence';
-    expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text, type: 'default' },
-    ]);
+  it("should handle text with no commands or files", () => {
+    const text = "this is a normal sentence";
+    expect(parseInputForHighlighting(text, 0)).toEqual([{ text, type: "default" }]);
   });
 
-  it('should highlight a single command at the beginning when index is 0', () => {
-    const text = '/help me';
+  it("should highlight a single command at the beginning when index is 0", () => {
+    const text = "/help me";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: '/help', type: 'command' },
-      { text: ' me', type: 'default' },
+      { text: "/help", type: "command" },
+      { text: " me", type: "default" },
     ]);
   });
 
-  it('should NOT highlight a command at the beginning when index is not 0', () => {
-    const text = '/help me';
+  it("should NOT highlight a command at the beginning when index is not 0", () => {
+    const text = "/help me";
     expect(parseInputForHighlighting(text, 1)).toEqual([
-      { text: '/help', type: 'default' },
-      { text: ' me', type: 'default' },
+      { text: "/help", type: "default" },
+      { text: " me", type: "default" },
     ]);
   });
 
-  it('should highlight a single file path at the beginning', () => {
-    const text = '@path/to/file.txt please';
+  it("should highlight a single file path at the beginning", () => {
+    const text = "@path/to/file.txt please";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: '@path/to/file.txt', type: 'file' },
-      { text: ' please', type: 'default' },
+      { text: "@path/to/file.txt", type: "file" },
+      { text: " please", type: "default" },
     ]);
   });
 
-  it('should not highlight a command in the middle', () => {
-    const text = 'I need /help with this';
+  it("should not highlight a command in the middle", () => {
+    const text = "I need /help with this";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: 'I need /help with this', type: 'default' },
+      { text: "I need /help with this", type: "default" },
     ]);
   });
 
-  it('should highlight a file path in the middle', () => {
-    const text = 'Please check @path/to/file.txt for details';
+  it("should highlight a file path in the middle", () => {
+    const text = "Please check @path/to/file.txt for details";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: 'Please check ', type: 'default' },
-      { text: '@path/to/file.txt', type: 'file' },
-      { text: ' for details', type: 'default' },
+      { text: "Please check ", type: "default" },
+      { text: "@path/to/file.txt", type: "file" },
+      { text: " for details", type: "default" },
     ]);
   });
 
-  it('should highlight files but not commands not at the start', () => {
-    const text = 'Use /run with @file.js and also /format @another/file.ts';
+  it("should highlight files but not commands not at the start", () => {
+    const text = "Use /run with @file.js and also /format @another/file.ts";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: 'Use /run with ', type: 'default' },
-      { text: '@file.js', type: 'file' },
-      { text: ' and also /format ', type: 'default' },
-      { text: '@another/file.ts', type: 'file' },
+      { text: "Use /run with ", type: "default" },
+      { text: "@file.js", type: "file" },
+      { text: " and also /format ", type: "default" },
+      { text: "@another/file.ts", type: "file" },
     ]);
   });
 
-  it('should handle adjacent highlights at start', () => {
-    const text = '/run@file.js';
+  it("should handle adjacent highlights at start", () => {
+    const text = "/run@file.js";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: '/run', type: 'command' },
-      { text: '@file.js', type: 'file' },
+      { text: "/run", type: "command" },
+      { text: "@file.js", type: "file" },
     ]);
   });
 
-  it('should not highlight command at the end of the string', () => {
-    const text = 'Get help with /help';
+  it("should not highlight command at the end of the string", () => {
+    const text = "Get help with /help";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: 'Get help with /help', type: 'default' },
+      { text: "Get help with /help", type: "default" },
     ]);
   });
 
-  it('should handle file paths with dots and dashes', () => {
-    const text = 'Check @./path-to/file-name.v2.txt';
+  it("should handle file paths with dots and dashes", () => {
+    const text = "Check @./path-to/file-name.v2.txt";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: 'Check ', type: 'default' },
-      { text: '@./path-to/file-name.v2.txt', type: 'file' },
+      { text: "Check ", type: "default" },
+      { text: "@./path-to/file-name.v2.txt", type: "file" },
     ]);
   });
 
-  it('should not highlight command with dashes and numbers not at start', () => {
-    const text = 'Run /command-123 now';
+  it("should not highlight command with dashes and numbers not at start", () => {
+    const text = "Run /command-123 now";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: 'Run /command-123 now', type: 'default' },
+      { text: "Run /command-123 now", type: "default" },
     ]);
   });
 
-  it('should highlight command with dashes and numbers at start', () => {
-    const text = '/command-123 now';
+  it("should highlight command with dashes and numbers at start", () => {
+    const text = "/command-123 now";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: '/command-123', type: 'command' },
-      { text: ' now', type: 'default' },
+      { text: "/command-123", type: "command" },
+      { text: " now", type: "default" },
     ]);
   });
 
-  it('should still highlight a file path on a non-zero line', () => {
-    const text = 'some text @path/to/file.txt';
+  it("should still highlight a file path on a non-zero line", () => {
+    const text = "some text @path/to/file.txt";
     expect(parseInputForHighlighting(text, 1)).toEqual([
-      { text: 'some text ', type: 'default' },
-      { text: '@path/to/file.txt', type: 'file' },
+      { text: "some text ", type: "default" },
+      { text: "@path/to/file.txt", type: "file" },
     ]);
   });
 
-  it('should not highlight command but highlight file on a non-zero line', () => {
-    const text = '/cmd @file.txt';
+  it("should not highlight command but highlight file on a non-zero line", () => {
+    const text = "/cmd @file.txt";
     expect(parseInputForHighlighting(text, 2)).toEqual([
-      { text: '/cmd', type: 'default' },
-      { text: ' ', type: 'default' },
-      { text: '@file.txt', type: 'file' },
+      { text: "/cmd", type: "default" },
+      { text: " ", type: "default" },
+      { text: "@file.txt", type: "file" },
     ]);
   });
 
-  it('should highlight a file path with escaped spaces', () => {
-    const text = 'cat @/my\\ path/file.txt';
+  it("should highlight a file path with escaped spaces", () => {
+    const text = "cat @/my\\ path/file.txt";
     expect(parseInputForHighlighting(text, 0)).toEqual([
-      { text: 'cat ', type: 'default' },
-      { text: '@/my\\ path/file.txt', type: 'file' },
+      { text: "cat ", type: "default" },
+      { text: "@/my\\ path/file.txt", type: "file" },
     ]);
   });
 });
diff --git a/packages/ui-gemini/src/ui/utils/highlight.ts b/packages/ui-gemini/src/ui/utils/highlight.ts
index 19866b330..5d8d4d07c 100644
--- a/packages/ui-gemini/src/ui/utils/highlight.ts
+++ b/packages/ui-gemini/src/ui/utils/highlight.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { cpLen, cpSlice } from './textUtils.js';
+import { cpLen, cpSlice } from "./textUtils.js";
 
 export type HighlightToken = {
   text: string;
-  type: 'default' | 'command' | 'file';
+  type: "default" | "command" | "file";
 };
 
 // Matches slash commands (e.g., /help) and @ references (files or MCP resource URIs).
@@ -17,12 +17,9 @@ export type HighlightToken = {
 // semicolon, common punctuation, and brackets.
 const HIGHLIGHT_REGEX = /(^\/[a-zA-Z0-9_-]+|@(?:\\ |[^,\s;!?()[\]{}])+)/g;
 
-export function parseInputForHighlighting(
-  text: string,
-  index: number,
-): readonly HighlightToken[] {
+export function parseInputForHighlighting(text: string, index: number): readonly HighlightToken[] {
   if (!text) {
-    return [{ text: '', type: 'default' }];
+    return [{ text: "", type: "default" }];
   }
 
   const tokens: HighlightToken[] = [];
@@ -37,17 +34,17 @@ export function parseInputForHighlighting(
     if (matchIndex > lastIndex) {
       tokens.push({
         text: text.slice(lastIndex, matchIndex),
-        type: 'default',
+        type: "default",
       });
     }
 
     // Add the matched token
-    const type = fullMatch.startsWith('/') ? 'command' : 'file';
+    const type = fullMatch.startsWith("/") ? "command" : "file";
     // Only highlight slash commands if the index is 0.
-    if (type === 'command' && index !== 0) {
+    if (type === "command" && index !== 0) {
       tokens.push({
         text: fullMatch,
-        type: 'default',
+        type: "default",
       });
     } else {
       tokens.push({
@@ -63,7 +60,7 @@ export function parseInputForHighlighting(
   if (lastIndex < text.length) {
     tokens.push({
       text: text.slice(lastIndex),
-      type: 'default',
+      type: "default",
     });
   }
 
diff --git a/packages/ui-gemini/src/ui/utils/input.test.ts b/packages/ui-gemini/src/ui/utils/input.test.ts
index 0b1549708..acbdd9c5c 100644
--- a/packages/ui-gemini/src/ui/utils/input.test.ts
+++ b/packages/ui-gemini/src/ui/utils/input.test.ts
@@ -4,45 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { couldBeSGRMouseSequence, SGR_MOUSE_REGEX, ESC } from './input.js';
+import { couldBeSGRMouseSequence, ESC, SGR_MOUSE_REGEX } from "./input.js";
 
-describe('input utils', () => {
-  describe('SGR_MOUSE_REGEX', () => {
-    it('should match valid SGR mouse sequences', () => {
+describe("input utils", () => {
+  describe("SGR_MOUSE_REGEX", () => {
+    it("should match valid SGR mouse sequences", () => {
       // Press left button at 10, 20
-      expect('\x1b[<0;10;20M').toMatch(SGR_MOUSE_REGEX);
+      expect("\x1b[<0;10;20M").toMatch(SGR_MOUSE_REGEX);
       // Release left button at 10, 20
-      expect('\x1b[<0;10;20m').toMatch(SGR_MOUSE_REGEX);
+      expect("\x1b[<0;10;20m").toMatch(SGR_MOUSE_REGEX);
       // Move with left button held at 30, 40
-      expect('\x1b[<32;30;40M').toMatch(SGR_MOUSE_REGEX);
+      expect("\x1b[<32;30;40M").toMatch(SGR_MOUSE_REGEX);
       // Scroll up at 5, 5
-      expect('\x1b[<64;5;5M').toMatch(SGR_MOUSE_REGEX);
+      expect("\x1b[<64;5;5M").toMatch(SGR_MOUSE_REGEX);
     });
 
-    it('should not match invalid sequences', () => {
-      expect('hello').not.toMatch(SGR_MOUSE_REGEX);
-      expect('\x1b[A').not.toMatch(SGR_MOUSE_REGEX); // Arrow up
-      expect('\x1b[<0;10;20').not.toMatch(SGR_MOUSE_REGEX); // Incomplete
+    it("should not match invalid sequences", () => {
+      expect("hello").not.toMatch(SGR_MOUSE_REGEX);
+      expect("\x1b[A").not.toMatch(SGR_MOUSE_REGEX); // Arrow up
+      expect("\x1b[<0;10;20").not.toMatch(SGR_MOUSE_REGEX); // Incomplete
     });
   });
 
-  describe('couldBeSGRMouseSequence', () => {
-    it('should return true for empty string', () => {
-      expect(couldBeSGRMouseSequence('')).toBe(true);
+  describe("couldBeSGRMouseSequence", () => {
+    it("should return true for empty string", () => {
+      expect(couldBeSGRMouseSequence("")).toBe(true);
     });
 
-    it('should return true for partial SGR prefixes', () => {
+    it("should return true for partial SGR prefixes", () => {
       expect(couldBeSGRMouseSequence(ESC)).toBe(true);
       expect(couldBeSGRMouseSequence(`${ESC}[`)).toBe(true);
       expect(couldBeSGRMouseSequence(`${ESC}[<`)).toBe(true);
     });
 
-    it('should return true for full SGR sequence start', () => {
+    it("should return true for full SGR sequence start", () => {
       expect(couldBeSGRMouseSequence(`${ESC}[<0;10;20M`)).toBe(true);
     });
 
-    it('should return false for non-SGR sequences', () => {
-      expect(couldBeSGRMouseSequence('a')).toBe(false);
+    it("should return false for non-SGR sequences", () => {
+      expect(couldBeSGRMouseSequence("a")).toBe(false);
       expect(couldBeSGRMouseSequence(`${ESC}a`)).toBe(false);
       expect(couldBeSGRMouseSequence(`${ESC}[A`)).toBe(false);
     });
diff --git a/packages/ui-gemini/src/ui/utils/input.ts b/packages/ui-gemini/src/ui/utils/input.ts
index 7ef0439af..ca35a5cef 100644
--- a/packages/ui-gemini/src/ui/utils/input.ts
+++ b/packages/ui-gemini/src/ui/utils/input.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-export const ESC = '\u001B';
+export const ESC = "\u001B";
 export const SGR_EVENT_PREFIX = `${ESC}[<`;
 export const X11_EVENT_PREFIX = `${ESC}[M`;
 
@@ -28,17 +28,9 @@ export function couldBeMouseSequence(buffer: string): boolean {
   if (buffer.length === 0) return true;
 
   // Check SGR prefix
-  if (
-    SGR_EVENT_PREFIX.startsWith(buffer) ||
-    buffer.startsWith(SGR_EVENT_PREFIX)
-  )
-    return true;
+  if (SGR_EVENT_PREFIX.startsWith(buffer) || buffer.startsWith(SGR_EVENT_PREFIX)) return true;
   // Check X11 prefix
-  if (
-    X11_EVENT_PREFIX.startsWith(buffer) ||
-    buffer.startsWith(X11_EVENT_PREFIX)
-  )
-    return true;
+  if (X11_EVENT_PREFIX.startsWith(buffer) || buffer.startsWith(X11_EVENT_PREFIX)) return true;
 
   return false;
 }
diff --git a/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.test.ts b/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.test.ts
index 751ae0865..b6d5af974 100644
--- a/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.test.ts
+++ b/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.test.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 // Mock dependencies
 const mocks = vi.hoisted(() => ({
@@ -13,31 +13,31 @@ const mocks = vi.hoisted(() => ({
   disableKittyKeyboardProtocol: vi.fn(),
 }));
 
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   writeSync: mocks.writeSync,
 }));
 
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("@airiscode/gemini-cli-core", () => ({
   enableKittyKeyboardProtocol: mocks.enableKittyKeyboardProtocol,
   disableKittyKeyboardProtocol: mocks.disableKittyKeyboardProtocol,
 }));
 
-describe('kittyProtocolDetector', () => {
+describe("kittyProtocolDetector", () => {
   let originalStdin: NodeJS.ReadStream & { fd?: number };
   let originalStdout: NodeJS.WriteStream & { fd?: number };
   let stdinListeners: Record<string, (data: Buffer) => void> = {};
 
   // Module functions
-  let detectAndEnableKittyProtocol: typeof import('./kittyProtocolDetector.js').detectAndEnableKittyProtocol;
-  let isKittyProtocolEnabled: typeof import('./kittyProtocolDetector.js').isKittyProtocolEnabled;
-  let enableSupportedProtocol: typeof import('./kittyProtocolDetector.js').enableSupportedProtocol;
+  let detectAndEnableKittyProtocol: typeof import("./kittyProtocolDetector.js").detectAndEnableKittyProtocol;
+  let isKittyProtocolEnabled: typeof import("./kittyProtocolDetector.js").isKittyProtocolEnabled;
+  let enableSupportedProtocol: typeof import("./kittyProtocolDetector.js").enableSupportedProtocol;
 
   beforeEach(async () => {
     vi.resetModules();
     vi.resetAllMocks();
     vi.useFakeTimers();
 
-    const mod = await import('./kittyProtocolDetector.js');
+    const mod = await import("./kittyProtocolDetector.js");
     detectAndEnableKittyProtocol = mod.detectAndEnableKittyProtocol;
     isKittyProtocolEnabled = mod.isKittyProtocolEnabled;
     enableSupportedProtocol = mod.enableSupportedProtocol;
@@ -48,7 +48,7 @@ describe('kittyProtocolDetector', () => {
 
     stdinListeners = {};
 
-    Object.defineProperty(process, 'stdin', {
+    Object.defineProperty(process, "stdin", {
       value: {
         isTTY: true,
         isRaw: false,
@@ -61,7 +61,7 @@ describe('kittyProtocolDetector', () => {
       configurable: true,
     });
 
-    Object.defineProperty(process, 'stdout', {
+    Object.defineProperty(process, "stdout", {
       value: {
         isTTY: true,
         fd: 1,
@@ -71,28 +71,28 @@ describe('kittyProtocolDetector', () => {
   });
 
   afterEach(() => {
-    Object.defineProperty(process, 'stdin', { value: originalStdin });
-    Object.defineProperty(process, 'stdout', { value: originalStdout });
+    Object.defineProperty(process, "stdin", { value: originalStdin });
+    Object.defineProperty(process, "stdout", { value: originalStdout });
     vi.useRealTimers();
   });
 
-  it('should resolve immediately if not TTY', async () => {
-    Object.defineProperty(process.stdin, 'isTTY', { value: false });
+  it("should resolve immediately if not TTY", async () => {
+    Object.defineProperty(process.stdin, "isTTY", { value: false });
     await detectAndEnableKittyProtocol();
     expect(mocks.writeSync).not.toHaveBeenCalled();
   });
 
-  it('should enable protocol if response indicates support', async () => {
+  it("should enable protocol if response indicates support", async () => {
     const promise = detectAndEnableKittyProtocol();
 
     // Simulate response
-    expect(stdinListeners['data']).toBeDefined();
+    expect(stdinListeners["data"]).toBeDefined();
 
     // Send progressive enhancement response
-    stdinListeners['data'](Buffer.from('\x1b[?u'));
+    stdinListeners["data"](Buffer.from("\x1b[?u"));
 
     // Send device attributes response
-    stdinListeners['data'](Buffer.from('\x1b[?c'));
+    stdinListeners["data"](Buffer.from("\x1b[?c"));
 
     await promise;
 
@@ -100,7 +100,7 @@ describe('kittyProtocolDetector', () => {
     expect(isKittyProtocolEnabled()).toBe(true);
   });
 
-  it('should not enable protocol if timeout occurs', async () => {
+  it("should not enable protocol if timeout occurs", async () => {
     const promise = detectAndEnableKittyProtocol();
 
     // Fast forward time past timeout
@@ -111,28 +111,28 @@ describe('kittyProtocolDetector', () => {
     expect(mocks.enableKittyKeyboardProtocol).not.toHaveBeenCalled();
   });
 
-  it('should wait longer if progressive enhancement received but not attributes', async () => {
+  it("should wait longer if progressive enhancement received but not attributes", async () => {
     const promise = detectAndEnableKittyProtocol();
 
     // Send progressive enhancement response
-    stdinListeners['data'](Buffer.from('\x1b[?u'));
+    stdinListeners["data"](Buffer.from("\x1b[?u"));
 
     // Should not resolve yet
     vi.advanceTimersByTime(300); // Original timeout passed
 
     // Send device attributes response late
-    stdinListeners['data'](Buffer.from('\x1b[?c'));
+    stdinListeners["data"](Buffer.from("\x1b[?c"));
 
     await promise;
 
     expect(mocks.enableKittyKeyboardProtocol).toHaveBeenCalled();
   });
 
-  it('should handle re-enabling protocol', async () => {
+  it("should handle re-enabling protocol", async () => {
     // First, simulate successful detection to set kittySupported = true
     const promise = detectAndEnableKittyProtocol();
-    stdinListeners['data'](Buffer.from('\x1b[?u'));
-    stdinListeners['data'](Buffer.from('\x1b[?c'));
+    stdinListeners["data"](Buffer.from("\x1b[?u"));
+    stdinListeners["data"](Buffer.from("\x1b[?c"));
     await promise;
 
     // Reset mocks to clear previous calls
diff --git a/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.ts b/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.ts
index c98b4ecd4..c766d65a5 100644
--- a/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.ts
+++ b/packages/ui-gemini/src/ui/utils/kittyProtocolDetector.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
+import * as fs from "node:fs";
 
 let detectionComplete = false;
 
@@ -34,7 +34,7 @@ export async function detectAndEnableKittyProtocol(): Promise<void> {
       process.stdin.setRawMode(true);
     }
 
-    let responseBuffer = '';
+    let responseBuffer = "";
     let progressiveEnhancementReceived = false;
     let timeoutId: NodeJS.Timeout | undefined;
 
@@ -43,15 +43,15 @@ export async function detectAndEnableKittyProtocol(): Promise<void> {
         clearTimeout(timeoutId);
         timeoutId = undefined;
       }
-      process.stdin.removeListener('data', handleData);
+      process.stdin.removeListener("data", handleData);
       if (!originalRawMode) {
         process.stdin.setRawMode(false);
       }
 
       if (kittySupported) {
         enableSupportedProtocol();
-        process.on('exit', disableAllProtocols);
-        process.on('SIGTERM', disableAllProtocols);
+        process.on("exit", disableAllProtocols);
+        process.on("SIGTERM", disableAllProtocols);
       }
 
       detectionComplete = true;
@@ -66,7 +66,7 @@ export async function detectAndEnableKittyProtocol(): Promise<void> {
       responseBuffer += data.toString();
 
       // Check for progressive enhancement response (CSI ? <flags> u)
-      if (responseBuffer.includes('\x1b[?') && responseBuffer.includes('u')) {
+      if (responseBuffer.includes("\x1b[?") && responseBuffer.includes("u")) {
         progressiveEnhancementReceived = true;
         // Give more time to get the full set of kitty responses if we have an
         // indication the terminal probably supports kitty and we just need to
@@ -76,7 +76,7 @@ export async function detectAndEnableKittyProtocol(): Promise<void> {
       }
 
       // Check for device attributes response (CSI ? <attrs> c)
-      if (responseBuffer.includes('\x1b[?') && responseBuffer.includes('c')) {
+      if (responseBuffer.includes("\x1b[?") && responseBuffer.includes("c")) {
         if (progressiveEnhancementReceived) {
           kittySupported = true;
         }
@@ -85,10 +85,10 @@ export async function detectAndEnableKittyProtocol(): Promise<void> {
       }
     };
 
-    process.stdin.on('data', handleData);
+    process.stdin.on("data", handleData);
 
     // Query progressive enhancement and device attributes
-    fs.writeSync(process.stdout.fd, '\x1b[?u\x1b[c');
+    fs.writeSync(process.stdout.fd, "\x1b[?u\x1b[c");
 
     // Timeout after 200ms
     // When a iterm2 terminal does not have focus this can take over 90s on a
@@ -98,9 +98,9 @@ export async function detectAndEnableKittyProtocol(): Promise<void> {
 }
 
 import {
-  enableKittyKeyboardProtocol,
   disableKittyKeyboardProtocol,
-} from '@airiscode/gemini-cli-core';
+  enableKittyKeyboardProtocol,
+} from "@airiscode/gemini-cli-core";
 
 export function isKittyProtocolEnabled(): boolean {
   return kittyEnabled;
diff --git a/packages/ui-gemini/src/ui/utils/markdownUtilities.test.ts b/packages/ui-gemini/src/ui/utils/markdownUtilities.test.ts
index 02bd2ea75..4c9fadc6f 100644
--- a/packages/ui-gemini/src/ui/utils/markdownUtilities.test.ts
+++ b/packages/ui-gemini/src/ui/utils/markdownUtilities.test.ts
@@ -4,46 +4,45 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { findLastSafeSplitPoint } from './markdownUtilities.js';
+import { describe, expect, it } from "vitest";
+import { findLastSafeSplitPoint } from "./markdownUtilities.js";
 
-describe('markdownUtilities', () => {
-  describe('findLastSafeSplitPoint', () => {
-    it('should split at the last double newline if not in a code block', () => {
-      const content = 'paragraph1\n\nparagraph2\n\nparagraph3';
+describe("markdownUtilities", () => {
+  describe("findLastSafeSplitPoint", () => {
+    it("should split at the last double newline if not in a code block", () => {
+      const content = "paragraph1\n\nparagraph2\n\nparagraph3";
       expect(findLastSafeSplitPoint(content)).toBe(24); // After the second \n\n
     });
 
-    it('should return content.length if no safe split point is found', () => {
-      const content = 'longstringwithoutanysafesplitpoint';
+    it("should return content.length if no safe split point is found", () => {
+      const content = "longstringwithoutanysafesplitpoint";
       expect(findLastSafeSplitPoint(content)).toBe(content.length);
     });
 
-    it('should prioritize splitting at \n\n over being at the very end of the string if the end is not in a code block', () => {
-      const content = 'Some text here.\n\nAnd more text here.';
+    it("should prioritize splitting at \n\n over being at the very end of the string if the end is not in a code block", () => {
+      const content = "Some text here.\n\nAnd more text here.";
       expect(findLastSafeSplitPoint(content)).toBe(17); // after the \n\n
     });
 
-    it('should return content.length if the only \n\n is inside a code block and the end of content is not', () => {
-      const content = '```\nignore this\n\nnewline\n```KeepThis';
+    it("should return content.length if the only \n\n is inside a code block and the end of content is not", () => {
+      const content = "```\nignore this\n\nnewline\n```KeepThis";
       expect(findLastSafeSplitPoint(content)).toBe(content.length);
     });
 
-    it('should correctly identify the last \n\n even if it is followed by text not in a code block', () => {
-      const content =
-        'First part.\n\nSecond part.\n\nThird part, then some more text.';
+    it("should correctly identify the last \n\n even if it is followed by text not in a code block", () => {
+      const content = "First part.\n\nSecond part.\n\nThird part, then some more text.";
       // Split should be after "Second part.\n\n"
       // "First part.\n\n" is 13 chars. "Second part.\n\n" is 14 chars. Total 27.
       expect(findLastSafeSplitPoint(content)).toBe(27);
     });
 
-    it('should return content.length if content is empty', () => {
-      const content = '';
+    it("should return content.length if content is empty", () => {
+      const content = "";
       expect(findLastSafeSplitPoint(content)).toBe(0);
     });
 
-    it('should return content.length if content has no newlines and no code blocks', () => {
-      const content = 'Single line of text';
+    it("should return content.length if content has no newlines and no code blocks", () => {
+      const content = "Single line of text";
       expect(findLastSafeSplitPoint(content)).toBe(content.length);
     });
   });
diff --git a/packages/ui-gemini/src/ui/utils/markdownUtilities.ts b/packages/ui-gemini/src/ui/utils/markdownUtilities.ts
index 6a34f1387..eabb475fa 100644
--- a/packages/ui-gemini/src/ui/utils/markdownUtilities.ts
+++ b/packages/ui-gemini/src/ui/utils/markdownUtilities.ts
@@ -41,14 +41,11 @@ This function aims to find an *intelligent* or "safe" index within the provided
  * @param indexToTest The character index to test.
  * @returns True if the index is inside a code block's content, false otherwise.
  */
-const isIndexInsideCodeBlock = (
-  content: string,
-  indexToTest: number,
-): boolean => {
+const isIndexInsideCodeBlock = (content: string, indexToTest: number): boolean => {
   let fenceCount = 0;
   let searchPos = 0;
   while (searchPos < content.length) {
-    const nextFence = content.indexOf('```', searchPos);
+    const nextFence = content.indexOf("```", searchPos);
     if (nextFence === -1 || nextFence >= indexToTest) {
       break;
     }
@@ -65,20 +62,17 @@ const isIndexInsideCodeBlock = (
  * @param index The index to check.
  * @returns Start index of the enclosing code block or -1.
  */
-const findEnclosingCodeBlockStart = (
-  content: string,
-  index: number,
-): number => {
+const findEnclosingCodeBlockStart = (content: string, index: number): number => {
   if (!isIndexInsideCodeBlock(content, index)) {
     return -1;
   }
   let currentSearchPos = 0;
   while (currentSearchPos < index) {
-    const blockStartIndex = content.indexOf('```', currentSearchPos);
+    const blockStartIndex = content.indexOf("```", currentSearchPos);
     if (blockStartIndex === -1 || blockStartIndex >= index) {
       break;
     }
-    const blockEndIndex = content.indexOf('```', blockStartIndex + 3);
+    const blockEndIndex = content.indexOf("```", blockStartIndex + 3);
     if (blockStartIndex < index) {
       if (blockEndIndex === -1 || index < blockEndIndex + 3) {
         return blockStartIndex;
@@ -91,10 +85,7 @@ const findEnclosingCodeBlockStart = (
 };
 
 export const findLastSafeSplitPoint = (content: string) => {
-  const enclosingBlockStart = findEnclosingCodeBlockStart(
-    content,
-    content.length,
-  );
+  const enclosingBlockStart = findEnclosingCodeBlockStart(content, content.length);
   if (enclosingBlockStart !== -1) {
     // The end of the content is contained in a code block. Split right before.
     return enclosingBlockStart;
@@ -103,7 +94,7 @@ export const findLastSafeSplitPoint = (content: string) => {
   // Search for the last double newline (\n\n) not in a code block.
   let searchStartIndex = content.length;
   while (searchStartIndex >= 0) {
-    const dnlIndex = content.lastIndexOf('\n\n', searchStartIndex);
+    const dnlIndex = content.lastIndexOf("\n\n", searchStartIndex);
     if (dnlIndex === -1) {
       // No more double newlines found.
       break;
diff --git a/packages/ui-gemini/src/ui/utils/mouse.test.ts b/packages/ui-gemini/src/ui/utils/mouse.test.ts
index faec8ff4d..1e58f3c60 100644
--- a/packages/ui-gemini/src/ui/utils/mouse.test.ts
+++ b/packages/ui-gemini/src/ui/utils/mouse.test.ts
@@ -4,93 +4,89 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
+import { ESC } from "./input.js";
 import {
-  parseSGRMouseEvent,
-  parseX11MouseEvent,
   isIncompleteMouseSequence,
   parseMouseEvent,
-} from './mouse.js';
-import { ESC } from './input.js';
+  parseSGRMouseEvent,
+  parseX11MouseEvent,
+} from "./mouse.js";
 
-describe('mouse utils', () => {
-  describe('parseSGRMouseEvent', () => {
-    it('parses a valid SGR mouse press', () => {
+describe("mouse utils", () => {
+  describe("parseSGRMouseEvent", () => {
+    it("parses a valid SGR mouse press", () => {
       // Button 0 (left), col 37, row 25, press (M)
       const input = `${ESC}[<0;37;25M`;
       const result = parseSGRMouseEvent(input);
       expect(result).not.toBeNull();
       expect(result!.event).toEqual({
-        name: 'left-press',
+        name: "left-press",
         col: 37,
         row: 25,
         shift: false,
         meta: false,
         ctrl: false,
-        button: 'left',
+        button: "left",
       });
       expect(result!.length).toBe(input.length);
     });
 
-    it('parses a valid SGR mouse release', () => {
+    it("parses a valid SGR mouse release", () => {
       // Button 0 (left), col 37, row 25, release (m)
       const input = `${ESC}[<0;37;25m`;
       const result = parseSGRMouseEvent(input);
       expect(result).not.toBeNull();
       expect(result!.event).toEqual({
-        name: 'left-release',
+        name: "left-release",
         col: 37,
         row: 25,
         shift: false,
         meta: false,
         ctrl: false,
-        button: 'left',
+        button: "left",
       });
     });
 
-    it('parses SGR with modifiers', () => {
+    it("parses SGR with modifiers", () => {
       // Button 0 + Shift(4) + Meta(8) + Ctrl(16) = 0 + 4 + 8 + 16 = 28
       const input = `${ESC}[<28;10;20M`;
       const result = parseSGRMouseEvent(input);
       expect(result).not.toBeNull();
       expect(result!.event).toEqual({
-        name: 'left-press',
+        name: "left-press",
         col: 10,
         row: 20,
         shift: true,
         meta: true,
         ctrl: true,
-        button: 'left',
+        button: "left",
       });
     });
 
-    it('parses SGR move event', () => {
+    it("parses SGR move event", () => {
       // Button 0 + Move(32) = 32
       const input = `${ESC}[<32;10;20M`;
       const result = parseSGRMouseEvent(input);
       expect(result).not.toBeNull();
-      expect(result!.event.name).toBe('move');
-      expect(result!.event.button).toBe('left');
+      expect(result!.event.name).toBe("move");
+      expect(result!.event.button).toBe("left");
     });
 
-    it('parses SGR scroll events', () => {
-      expect(parseSGRMouseEvent(`${ESC}[<64;1;1M`)!.event.name).toBe(
-        'scroll-up',
-      );
-      expect(parseSGRMouseEvent(`${ESC}[<65;1;1M`)!.event.name).toBe(
-        'scroll-down',
-      );
+    it("parses SGR scroll events", () => {
+      expect(parseSGRMouseEvent(`${ESC}[<64;1;1M`)!.event.name).toBe("scroll-up");
+      expect(parseSGRMouseEvent(`${ESC}[<65;1;1M`)!.event.name).toBe("scroll-down");
     });
 
-    it('returns null for invalid SGR', () => {
+    it("returns null for invalid SGR", () => {
       expect(parseSGRMouseEvent(`${ESC}[<;1;1M`)).toBeNull();
       expect(parseSGRMouseEvent(`${ESC}[<0;1;M`)).toBeNull();
       expect(parseSGRMouseEvent(`not sgr`)).toBeNull();
     });
   });
 
-  describe('parseX11MouseEvent', () => {
-    it('parses a valid X11 mouse press', () => {
+  describe("parseX11MouseEvent", () => {
+    it("parses a valid X11 mouse press", () => {
       // Button 0 (left) + 32 = ' ' (space)
       // Col 1 + 32 = '!'
       // Row 1 + 32 = '!'
@@ -98,63 +94,63 @@ describe('mouse utils', () => {
       const result = parseX11MouseEvent(input);
       expect(result).not.toBeNull();
       expect(result!.event).toEqual({
-        name: 'left-press',
+        name: "left-press",
         col: 1,
         row: 1,
         shift: false,
         meta: false,
         ctrl: false,
-        button: 'left',
+        button: "left",
       });
       expect(result!.length).toBe(6);
     });
 
-    it('returns null for incomplete X11', () => {
+    it("returns null for incomplete X11", () => {
       expect(parseX11MouseEvent(`${ESC}[M !`)).toBeNull();
     });
   });
 
-  describe('isIncompleteMouseSequence', () => {
-    it('returns true for prefixes', () => {
+  describe("isIncompleteMouseSequence", () => {
+    it("returns true for prefixes", () => {
       expect(isIncompleteMouseSequence(ESC)).toBe(true);
       expect(isIncompleteMouseSequence(`${ESC}[`)).toBe(true);
       expect(isIncompleteMouseSequence(`${ESC}[<`)).toBe(true);
       expect(isIncompleteMouseSequence(`${ESC}[M`)).toBe(true);
     });
 
-    it('returns true for partial SGR', () => {
+    it("returns true for partial SGR", () => {
       expect(isIncompleteMouseSequence(`${ESC}[<0;10;20`)).toBe(true);
     });
 
-    it('returns true for partial X11', () => {
+    it("returns true for partial X11", () => {
       expect(isIncompleteMouseSequence(`${ESC}[M `)).toBe(true);
       expect(isIncompleteMouseSequence(`${ESC}[M !`)).toBe(true);
     });
 
-    it('returns false for complete SGR', () => {
+    it("returns false for complete SGR", () => {
       expect(isIncompleteMouseSequence(`${ESC}[<0;10;20M`)).toBe(false);
     });
 
-    it('returns false for complete X11', () => {
+    it("returns false for complete X11", () => {
       expect(isIncompleteMouseSequence(`${ESC}[M !!!`)).toBe(false);
     });
 
-    it('returns false for non-mouse sequences', () => {
-      expect(isIncompleteMouseSequence('a')).toBe(false);
+    it("returns false for non-mouse sequences", () => {
+      expect(isIncompleteMouseSequence("a")).toBe(false);
       expect(isIncompleteMouseSequence(`${ESC}[A`)).toBe(false); // Arrow up
     });
 
-    it('returns false for garbage that started like a mouse sequence but got too long (SGR)', () => {
-      const longGarbage = `${ESC}[<` + '0'.repeat(100);
+    it("returns false for garbage that started like a mouse sequence but got too long (SGR)", () => {
+      const longGarbage = `${ESC}[<` + "0".repeat(100);
       expect(isIncompleteMouseSequence(longGarbage)).toBe(false);
     });
   });
 
-  describe('parseMouseEvent', () => {
-    it('parses SGR', () => {
+  describe("parseMouseEvent", () => {
+    it("parses SGR", () => {
       expect(parseMouseEvent(`${ESC}[<0;1;1M`)).not.toBeNull();
     });
-    it('parses X11', () => {
+    it("parses X11", () => {
       expect(parseMouseEvent(`${ESC}[M !!!`)).not.toBeNull();
     });
   });
diff --git a/packages/ui-gemini/src/ui/utils/mouse.ts b/packages/ui-gemini/src/ui/utils/mouse.ts
index eaf67c227..d4cea58b6 100644
--- a/packages/ui-gemini/src/ui/utils/mouse.ts
+++ b/packages/ui-gemini/src/ui/utils/mouse.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { enableMouseEvents, disableMouseEvents } from '@airiscode/gemini-cli-core';
+import { disableMouseEvents, enableMouseEvents } from "@airiscode/gemini-cli-core";
 import {
-  SGR_MOUSE_REGEX,
-  X11_MOUSE_REGEX,
+  couldBeMouseSequence as inputCouldBeMouseSequence,
   SGR_EVENT_PREFIX,
+  SGR_MOUSE_REGEX,
   X11_EVENT_PREFIX,
-  couldBeMouseSequence as inputCouldBeMouseSequence,
-} from './input.js';
+  X11_MOUSE_REGEX,
+} from "./input.js";
 
 export type MouseEventName =
-  | 'left-press'
-  | 'left-release'
-  | 'right-press'
-  | 'right-release'
-  | 'middle-press'
-  | 'middle-release'
-  | 'scroll-up'
-  | 'scroll-down'
-  | 'scroll-left'
-  | 'scroll-right'
-  | 'move';
+  | "left-press"
+  | "left-release"
+  | "right-press"
+  | "right-release"
+  | "middle-press"
+  | "middle-release"
+  | "scroll-up"
+  | "scroll-down"
+  | "scroll-left"
+  | "scroll-right"
+  | "move";
 
 export interface MouseEvent {
   name: MouseEventName;
@@ -33,32 +33,29 @@ export interface MouseEvent {
   shift: boolean;
   meta: boolean;
   ctrl: boolean;
-  button: 'left' | 'middle' | 'right' | 'none';
+  button: "left" | "middle" | "right" | "none";
 }
 
 export type MouseHandler = (event: MouseEvent) => void | boolean;
 
-export function getMouseEventName(
-  buttonCode: number,
-  isRelease: boolean,
-): MouseEventName | null {
+export function getMouseEventName(buttonCode: number, isRelease: boolean): MouseEventName | null {
   const isMove = (buttonCode & 32) !== 0;
 
   if (buttonCode === 66) {
-    return 'scroll-left';
+    return "scroll-left";
   } else if (buttonCode === 67) {
-    return 'scroll-right';
+    return "scroll-right";
   } else if ((buttonCode & 64) === 64) {
     if ((buttonCode & 1) === 0) {
-      return 'scroll-up';
+      return "scroll-up";
     } else {
-      return 'scroll-down';
+      return "scroll-down";
     }
   } else if (isMove) {
-    return 'move';
+    return "move";
   } else {
     const button = buttonCode & 3;
-    const type = isRelease ? 'release' : 'press';
+    const type = isRelease ? "release" : "press";
     switch (button) {
       case 0:
         return `left-${type}`;
@@ -72,23 +69,21 @@ export function getMouseEventName(
   }
 }
 
-function getButtonFromCode(code: number): MouseEvent['button'] {
+function getButtonFromCode(code: number): MouseEvent["button"] {
   const button = code & 3;
   switch (button) {
     case 0:
-      return 'left';
+      return "left";
     case 1:
-      return 'middle';
+      return "middle";
     case 2:
-      return 'right';
+      return "right";
     default:
-      return 'none';
+      return "none";
   }
 }
 
-export function parseSGRMouseEvent(
-  buffer: string,
-): { event: MouseEvent; length: number } | null {
+export function parseSGRMouseEvent(buffer: string): { event: MouseEvent; length: number } | null {
   const match = buffer.match(SGR_MOUSE_REGEX);
 
   if (match) {
@@ -96,7 +91,7 @@ export function parseSGRMouseEvent(
     const col = parseInt(match[2], 10);
     const row = parseInt(match[3], 10);
     const action = match[4];
-    const isRelease = action === 'm';
+    const isRelease = action === "m";
 
     const shift = (buttonCode & 4) !== 0;
     const meta = (buttonCode & 8) !== 0;
@@ -124,9 +119,7 @@ export function parseSGRMouseEvent(
   return null;
 }
 
-export function parseX11MouseEvent(
-  buffer: string,
-): { event: MouseEvent; length: number } | null {
+export function parseX11MouseEvent(buffer: string): { event: MouseEvent; length: number } | null {
   const match = buffer.match(X11_MOUSE_REGEX);
   if (!match) return null;
 
@@ -147,32 +140,32 @@ export function parseX11MouseEvent(
     const button = b & 3;
     switch (button) {
       case 0:
-        name = 'scroll-up';
+        name = "scroll-up";
         break;
       case 1:
-        name = 'scroll-down';
+        name = "scroll-down";
         break;
       default:
         break;
     }
   } else if (isMove) {
-    name = 'move';
+    name = "move";
   } else {
     const button = b & 3;
     if (button === 3) {
       // X11 reports 'release' (3) for all button releases without specifying which one.
       // We'll default to 'left-release' as a best-effort guess if we don't track state.
-      name = 'left-release';
+      name = "left-release";
     } else {
       switch (button) {
         case 0:
-          name = 'left-press';
+          name = "left-press";
           break;
         case 1:
-          name = 'middle-press';
+          name = "middle-press";
           break;
         case 2:
-          name = 'right-press';
+          name = "right-press";
           break;
         default:
           break;
@@ -182,8 +175,8 @@ export function parseX11MouseEvent(
 
   if (name) {
     let button = getButtonFromCode(b);
-    if (name === 'left-release' && button === 'none') {
-      button = 'left';
+    if (name === "left-release" && button === "none") {
+      button = "left";
     }
 
     return {
@@ -202,9 +195,7 @@ export function parseX11MouseEvent(
   return null;
 }
 
-export function parseMouseEvent(
-  buffer: string,
-): { event: MouseEvent; length: number } | null {
+export function parseMouseEvent(buffer: string): { event: MouseEvent; length: number } | null {
   return parseSGRMouseEvent(buffer) || parseX11MouseEvent(buffer);
 }
 
@@ -230,4 +221,4 @@ export function isIncompleteMouseSequence(buffer: string): boolean {
   return true;
 }
 
-export { enableMouseEvents, disableMouseEvents };
+export { disableMouseEvents, enableMouseEvents };
diff --git a/packages/ui-gemini/src/ui/utils/terminalSetup.test.ts b/packages/ui-gemini/src/ui/utils/terminalSetup.test.ts
index 5e15b9f6e..913d2dc11 100644
--- a/packages/ui-gemini/src/ui/utils/terminalSetup.test.ts
+++ b/packages/ui-gemini/src/ui/utils/terminalSetup.test.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { terminalSetup, VSCODE_SHIFT_ENTER_SEQUENCE } from './terminalSetup.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { terminalSetup, VSCODE_SHIFT_ENTER_SEQUENCE } from "./terminalSetup.js";
 
 // Mock dependencies
 const mocks = vi.hoisted(() => ({
@@ -22,12 +22,12 @@ const mocks = vi.hoisted(() => ({
   },
 }));
 
-vi.mock('node:child_process', () => ({
+vi.mock("node:child_process", () => ({
   exec: mocks.exec,
   execFile: vi.fn(),
 }));
 
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   createWriteStream: () => mocks.writeStream,
   promises: {
     mkdir: mocks.mkdir,
@@ -37,16 +37,16 @@ vi.mock('node:fs', () => ({
   },
 }));
 
-vi.mock('node:os', () => ({
+vi.mock("node:os", () => ({
   homedir: mocks.homedir,
   platform: mocks.platform,
 }));
 
-vi.mock('./kittyProtocolDetector.js', () => ({
+vi.mock("./kittyProtocolDetector.js", () => ({
   isKittyProtocolEnabled: vi.fn().mockReturnValue(false),
 }));
 
-describe('terminalSetup', () => {
+describe("terminalSetup", () => {
   const originalEnv = process.env;
 
   beforeEach(() => {
@@ -54,51 +54,51 @@ describe('terminalSetup', () => {
     process.env = { ...originalEnv };
 
     // Default mocks
-    mocks.homedir.mockReturnValue('/home/user');
-    mocks.platform.mockReturnValue('darwin');
+    mocks.homedir.mockReturnValue("/home/user");
+    mocks.platform.mockReturnValue("darwin");
     mocks.mkdir.mockResolvedValue(undefined);
     mocks.copyFile.mockResolvedValue(undefined);
-    mocks.exec.mockImplementation((cmd, cb) => cb(null, { stdout: '' }));
+    mocks.exec.mockImplementation((cmd, cb) => cb(null, { stdout: "" }));
   });
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  describe('detectTerminal', () => {
-    it('should detect VS Code from env var', async () => {
-      process.env['TERM_PROGRAM'] = 'vscode';
+  describe("detectTerminal", () => {
+    it("should detect VS Code from env var", async () => {
+      process.env["TERM_PROGRAM"] = "vscode";
       const result = await terminalSetup();
-      expect(result.message).toContain('VS Code');
+      expect(result.message).toContain("VS Code");
     });
 
-    it('should detect Cursor from env var', async () => {
-      process.env['CURSOR_TRACE_ID'] = 'some-id';
+    it("should detect Cursor from env var", async () => {
+      process.env["CURSOR_TRACE_ID"] = "some-id";
       const result = await terminalSetup();
-      expect(result.message).toContain('Cursor');
+      expect(result.message).toContain("Cursor");
     });
 
-    it('should detect Windsurf from env var', async () => {
-      process.env['VSCODE_GIT_ASKPASS_MAIN'] = '/path/to/windsurf/askpass';
+    it("should detect Windsurf from env var", async () => {
+      process.env["VSCODE_GIT_ASKPASS_MAIN"] = "/path/to/windsurf/askpass";
       const result = await terminalSetup();
-      expect(result.message).toContain('Windsurf');
+      expect(result.message).toContain("Windsurf");
     });
 
-    it('should detect from parent process', async () => {
-      mocks.platform.mockReturnValue('linux');
+    it("should detect from parent process", async () => {
+      mocks.platform.mockReturnValue("linux");
       mocks.exec.mockImplementation((cmd, cb) => {
-        cb(null, { stdout: 'code\n' });
+        cb(null, { stdout: "code\n" });
       });
 
       const result = await terminalSetup();
-      expect(result.message).toContain('VS Code');
+      expect(result.message).toContain("VS Code");
     });
   });
 
-  describe('configureVSCodeStyle', () => {
-    it('should create new keybindings file if none exists', async () => {
-      process.env['TERM_PROGRAM'] = 'vscode';
-      mocks.readFile.mockRejectedValue(new Error('ENOENT'));
+  describe("configureVSCodeStyle", () => {
+    it("should create new keybindings file if none exists", async () => {
+      process.env["TERM_PROGRAM"] = "vscode";
+      mocks.readFile.mockRejectedValue(new Error("ENOENT"));
 
       const result = await terminalSetup();
 
@@ -109,9 +109,9 @@ describe('terminalSetup', () => {
       expect(writtenContent).toMatchSnapshot();
     });
 
-    it('should append to existing keybindings', async () => {
-      process.env['TERM_PROGRAM'] = 'vscode';
-      mocks.readFile.mockResolvedValue('[]');
+    it("should append to existing keybindings", async () => {
+      process.env["TERM_PROGRAM"] = "vscode";
+      mocks.readFile.mockResolvedValue("[]");
 
       const result = await terminalSetup();
 
@@ -120,17 +120,17 @@ describe('terminalSetup', () => {
       expect(writtenContent).toHaveLength(2); // Shift+Enter and Ctrl+Enter
     });
 
-    it('should not modify if bindings already exist', async () => {
-      process.env['TERM_PROGRAM'] = 'vscode';
+    it("should not modify if bindings already exist", async () => {
+      process.env["TERM_PROGRAM"] = "vscode";
       const existingBindings = [
         {
-          key: 'shift+enter',
-          command: 'workbench.action.terminal.sendSequence',
+          key: "shift+enter",
+          command: "workbench.action.terminal.sendSequence",
           args: { text: VSCODE_SHIFT_ENTER_SEQUENCE },
         },
         {
-          key: 'ctrl+enter',
-          command: 'workbench.action.terminal.sendSequence',
+          key: "ctrl+enter",
+          command: "workbench.action.terminal.sendSequence",
           args: { text: VSCODE_SHIFT_ENTER_SEQUENCE },
         },
       ];
@@ -142,19 +142,19 @@ describe('terminalSetup', () => {
       expect(mocks.writeFile).not.toHaveBeenCalled();
     });
 
-    it('should fail gracefully if json is invalid', async () => {
-      process.env['TERM_PROGRAM'] = 'vscode';
-      mocks.readFile.mockResolvedValue('{ invalid json');
+    it("should fail gracefully if json is invalid", async () => {
+      process.env["TERM_PROGRAM"] = "vscode";
+      mocks.readFile.mockResolvedValue("{ invalid json");
 
       const result = await terminalSetup();
 
       expect(result.success).toBe(false);
-      expect(result.message).toContain('invalid JSON');
+      expect(result.message).toContain("invalid JSON");
     });
 
-    it('should handle comments in JSON', async () => {
-      process.env['TERM_PROGRAM'] = 'vscode';
-      const jsonWithComments = '// This is a comment\n[]';
+    it("should handle comments in JSON", async () => {
+      process.env["TERM_PROGRAM"] = "vscode";
+      const jsonWithComments = "// This is a comment\n[]";
       mocks.readFile.mockResolvedValue(jsonWithComments);
 
       const result = await terminalSetup();
diff --git a/packages/ui-gemini/src/ui/utils/terminalSetup.ts b/packages/ui-gemini/src/ui/utils/terminalSetup.ts
index 8c2efbf06..9b425188f 100644
--- a/packages/ui-gemini/src/ui/utils/terminalSetup.ts
+++ b/packages/ui-gemini/src/ui/utils/terminalSetup.ts
@@ -23,16 +23,15 @@
  * to avoid conflicts with user customizations.
  */
 
-import { promises as fs } from 'node:fs';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { exec } from 'node:child_process';
-import { promisify } from 'node:util';
-import { isKittyProtocolEnabled } from './kittyProtocolDetector.js';
+import { exec } from "node:child_process";
+import { promises as fs } from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { promisify } from "node:util";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { isKittyProtocolEnabled } from "./kittyProtocolDetector.js";
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-
-export const VSCODE_SHIFT_ENTER_SEQUENCE = '\\\r\n';
+export const VSCODE_SHIFT_ENTER_SEQUENCE = "\\\r\n";
 
 const execAsync = promisify(exec);
 
@@ -42,7 +41,7 @@ const execAsync = promisify(exec);
  */
 function stripJsonComments(content: string): string {
   // Remove single-line comments (// ...)
-  return content.replace(/^\s*\/\/.*$/gm, '');
+  return content.replace(/^\s*\/\/.*$/gm, "");
 }
 
 export interface TerminalSetupResult {
@@ -51,28 +50,26 @@ export interface TerminalSetupResult {
   requiresRestart?: boolean;
 }
 
-type SupportedTerminal = 'vscode' | 'cursor' | 'windsurf';
+type SupportedTerminal = "vscode" | "cursor" | "windsurf";
 
 export function getTerminalProgram(): SupportedTerminal | null {
-  const termProgram = process.env['TERM_PROGRAM'];
+  const termProgram = process.env["TERM_PROGRAM"];
 
   // Check VS Code and its forks - check forks first to avoid false positives
   // Check for Cursor-specific indicators
   if (
-    process.env['CURSOR_TRACE_ID'] ||
-    process.env['VSCODE_GIT_ASKPASS_MAIN']?.toLowerCase().includes('cursor')
+    process.env["CURSOR_TRACE_ID"] ||
+    process.env["VSCODE_GIT_ASKPASS_MAIN"]?.toLowerCase().includes("cursor")
   ) {
-    return 'cursor';
+    return "cursor";
   }
   // Check for Windsurf-specific indicators
-  if (
-    process.env['VSCODE_GIT_ASKPASS_MAIN']?.toLowerCase().includes('windsurf')
-  ) {
-    return 'windsurf';
+  if (process.env["VSCODE_GIT_ASKPASS_MAIN"]?.toLowerCase().includes("windsurf")) {
+    return "windsurf";
   }
   // Check VS Code last since forks may also set VSCODE env vars
-  if (termProgram === 'vscode' || process.env['VSCODE_GIT_IPC_HANDLE']) {
-    return 'vscode';
+  if (termProgram === "vscode" || process.env["VSCODE_GIT_IPC_HANDLE"]) {
+    return "vscode";
   }
   return null;
 }
@@ -85,21 +82,18 @@ async function detectTerminal(): Promise<SupportedTerminal | null> {
   }
 
   // Check parent process name
-  if (os.platform() !== 'win32') {
+  if (os.platform() !== "win32") {
     try {
-      const { stdout } = await execAsync('ps -o comm= -p $PPID');
+      const { stdout } = await execAsync("ps -o comm= -p $PPID");
       const parentName = stdout.trim();
 
       // Check forks before VS Code to avoid false positives
-      if (parentName.includes('windsurf') || parentName.includes('Windsurf'))
-        return 'windsurf';
-      if (parentName.includes('cursor') || parentName.includes('Cursor'))
-        return 'cursor';
-      if (parentName.includes('code') || parentName.includes('Code'))
-        return 'vscode';
+      if (parentName.includes("windsurf") || parentName.includes("Windsurf")) return "windsurf";
+      if (parentName.includes("cursor") || parentName.includes("Cursor")) return "cursor";
+      if (parentName.includes("code") || parentName.includes("Code")) return "vscode";
     } catch (error) {
       // Continue detection even if process check fails
-      debugLogger.debug('Parent process detection failed:', error);
+      debugLogger.debug("Parent process detection failed:", error);
     }
   }
 
@@ -109,7 +103,7 @@ async function detectTerminal(): Promise<SupportedTerminal | null> {
 // Backup file helper
 async function backupFile(filePath: string): Promise<void> {
   try {
-    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+    const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
     const backupPath = `${filePath}.backup.${timestamp}`;
     await fs.copyFile(filePath, backupPath);
   } catch (error) {
@@ -122,21 +116,15 @@ async function backupFile(filePath: string): Promise<void> {
 function getVSCodeStyleConfigDir(appName: string): string | null {
   const platform = os.platform();
 
-  if (platform === 'darwin') {
-    return path.join(
-      os.homedir(),
-      'Library',
-      'Application Support',
-      appName,
-      'User',
-    );
-  } else if (platform === 'win32') {
-    if (!process.env['APPDATA']) {
+  if (platform === "darwin") {
+    return path.join(os.homedir(), "Library", "Application Support", appName, "User");
+  } else if (platform === "win32") {
+    if (!process.env["APPDATA"]) {
       return null;
     }
-    return path.join(process.env['APPDATA'], appName, 'User');
+    return path.join(process.env["APPDATA"], appName, "User");
   } else {
-    return path.join(os.homedir(), '.config', appName, 'User');
+    return path.join(os.homedir(), ".config", appName, "User");
   }
 }
 
@@ -154,14 +142,14 @@ async function configureVSCodeStyle(
     };
   }
 
-  const keybindingsFile = path.join(configDir, 'keybindings.json');
+  const keybindingsFile = path.join(configDir, "keybindings.json");
 
   try {
     await fs.mkdir(configDir, { recursive: true });
 
     let keybindings: unknown[] = [];
     try {
-      const content = await fs.readFile(keybindingsFile, 'utf8');
+      const content = await fs.readFile(keybindingsFile, "utf8");
       await backupFile(keybindingsFile);
       try {
         const cleanContent = stripJsonComments(content);
@@ -191,16 +179,16 @@ async function configureVSCodeStyle(
     }
 
     const shiftEnterBinding = {
-      key: 'shift+enter',
-      command: 'workbench.action.terminal.sendSequence',
-      when: 'terminalFocus',
+      key: "shift+enter",
+      command: "workbench.action.terminal.sendSequence",
+      when: "terminalFocus",
       args: { text: VSCODE_SHIFT_ENTER_SEQUENCE },
     };
 
     const ctrlEnterBinding = {
-      key: 'ctrl+enter',
-      command: 'workbench.action.terminal.sendSequence',
-      when: 'terminalFocus',
+      key: "ctrl+enter",
+      command: "workbench.action.terminal.sendSequence",
+      when: "terminalFocus",
       args: { text: VSCODE_SHIFT_ENTER_SEQUENCE },
     };
 
@@ -212,9 +200,9 @@ async function configureVSCodeStyle(
         key?: string;
       };
       return (
-        binding.key === 'shift+enter' &&
-        binding.command === 'workbench.action.terminal.sendSequence' &&
-        binding.args?.text === '\\\r\n'
+        binding.key === "shift+enter" &&
+        binding.command === "workbench.action.terminal.sendSequence" &&
+        binding.args?.text === "\\\r\n"
       );
     });
 
@@ -225,9 +213,9 @@ async function configureVSCodeStyle(
         key?: string;
       };
       return (
-        binding.key === 'ctrl+enter' &&
-        binding.command === 'workbench.action.terminal.sendSequence' &&
-        binding.args?.text === '\\\r\n'
+        binding.key === "ctrl+enter" &&
+        binding.command === "workbench.action.terminal.sendSequence" &&
+        binding.args?.text === "\\\r\n"
       );
     });
 
@@ -241,12 +229,12 @@ async function configureVSCodeStyle(
     // Check if ANY shift+enter or ctrl+enter bindings already exist (that are NOT ours)
     const existingShiftEnter = keybindings.find((kb) => {
       const binding = kb as { key?: string };
-      return binding.key === 'shift+enter';
+      return binding.key === "shift+enter";
     });
 
     const existingCtrlEnter = keybindings.find((kb) => {
       const binding = kb as { key?: string };
-      return binding.key === 'ctrl+enter';
+      return binding.key === "ctrl+enter";
     });
 
     if (existingShiftEnter || existingCtrlEnter) {
@@ -264,8 +252,8 @@ async function configureVSCodeStyle(
           success: false,
           message:
             `Existing keybindings detected. Will not modify to avoid conflicts.\n` +
-            messages.join('\n') +
-            '\n' +
+            messages.join("\n") +
+            "\n" +
             `Please check and modify manually if needed: ${keybindingsFile}`,
         };
       }
@@ -291,15 +279,15 @@ async function configureVSCodeStyle(
 // Terminal-specific configuration functions
 
 async function configureVSCode(): Promise<TerminalSetupResult> {
-  return configureVSCodeStyle('VS Code', 'Code');
+  return configureVSCodeStyle("VS Code", "Code");
 }
 
 async function configureCursor(): Promise<TerminalSetupResult> {
-  return configureVSCodeStyle('Cursor', 'Cursor');
+  return configureVSCodeStyle("Cursor", "Cursor");
 }
 
 async function configureWindsurf(): Promise<TerminalSetupResult> {
-  return configureVSCodeStyle('Windsurf', 'Windsurf');
+  return configureVSCodeStyle("Windsurf", "Windsurf");
 }
 
 /**
@@ -327,7 +315,7 @@ export async function terminalSetup(): Promise<TerminalSetupResult> {
     return {
       success: true,
       message:
-        'Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).',
+        "Your terminal is already configured for an optimal experience with multiline input (Shift+Enter and Ctrl+Enter).",
     };
   }
 
@@ -337,16 +325,16 @@ export async function terminalSetup(): Promise<TerminalSetupResult> {
     return {
       success: false,
       message:
-        'Could not detect terminal type. Supported terminals: VS Code, Cursor, and Windsurf.',
+        "Could not detect terminal type. Supported terminals: VS Code, Cursor, and Windsurf.",
     };
   }
 
   switch (terminal) {
-    case 'vscode':
+    case "vscode":
       return configureVSCode();
-    case 'cursor':
+    case "cursor":
       return configureCursor();
-    case 'windsurf':
+    case "windsurf":
       return configureWindsurf();
     default:
       return {
diff --git a/packages/ui-gemini/src/ui/utils/textOutput.test.ts b/packages/ui-gemini/src/ui/utils/textOutput.test.ts
index b8a0882d6..64321e273 100644
--- a/packages/ui-gemini/src/ui/utils/textOutput.test.ts
+++ b/packages/ui-gemini/src/ui/utils/textOutput.test.ts
@@ -6,18 +6,16 @@
 
 /// <reference types="vitest/globals" />
 
-import type { MockInstance } from 'vitest';
-import { vi } from 'vitest';
-import { TextOutput } from './textOutput.js';
+import type { MockInstance } from "vitest";
+import { vi } from "vitest";
+import { TextOutput } from "./textOutput.js";
 
-describe('TextOutput', () => {
+describe("TextOutput", () => {
   let stdoutSpy: MockInstance<typeof process.stdout.write>;
   let textOutput: TextOutput;
 
   beforeEach(() => {
-    stdoutSpy = vi
-      .spyOn(process.stdout, 'write')
-      .mockImplementation(() => true);
+    stdoutSpy = vi.spyOn(process.stdout, "write").mockImplementation(() => true);
     textOutput = new TextOutput();
   });
 
@@ -25,75 +23,75 @@ describe('TextOutput', () => {
     stdoutSpy.mockRestore();
   });
 
-  const getWrittenOutput = () => stdoutSpy.mock.calls.map((c) => c[0]).join('');
+  const getWrittenOutput = () => stdoutSpy.mock.calls.map((c) => c[0]).join("");
 
-  it('write() should call process.stdout.write', () => {
-    textOutput.write('hello');
-    expect(stdoutSpy).toHaveBeenCalledWith('hello');
+  it("write() should call process.stdout.write", () => {
+    textOutput.write("hello");
+    expect(stdoutSpy).toHaveBeenCalledWith("hello");
   });
 
-  it('write() should not call process.stdout.write for empty strings', () => {
-    textOutput.write('');
+  it("write() should not call process.stdout.write for empty strings", () => {
+    textOutput.write("");
     expect(stdoutSpy).not.toHaveBeenCalled();
   });
 
-  it('writeOnNewLine() should not add a newline if the last char was a newline', () => {
+  it("writeOnNewLine() should not add a newline if the last char was a newline", () => {
     // Default state starts at the beginning of a line
-    textOutput.writeOnNewLine('hello');
-    expect(getWrittenOutput()).toBe('hello');
+    textOutput.writeOnNewLine("hello");
+    expect(getWrittenOutput()).toBe("hello");
   });
 
-  it('writeOnNewLine() should add a newline if the last char was not a newline', () => {
-    textOutput.write('previous');
-    textOutput.writeOnNewLine('hello');
-    expect(getWrittenOutput()).toBe('previous\nhello');
+  it("writeOnNewLine() should add a newline if the last char was not a newline", () => {
+    textOutput.write("previous");
+    textOutput.writeOnNewLine("hello");
+    expect(getWrittenOutput()).toBe("previous\nhello");
   });
 
-  it('ensureTrailingNewline() should add a newline if one is missing', () => {
-    textOutput.write('hello');
+  it("ensureTrailingNewline() should add a newline if one is missing", () => {
+    textOutput.write("hello");
     textOutput.ensureTrailingNewline();
-    expect(getWrittenOutput()).toBe('hello\n');
+    expect(getWrittenOutput()).toBe("hello\n");
   });
 
-  it('ensureTrailingNewline() should not add a newline if one already exists', () => {
-    textOutput.write('hello\n');
+  it("ensureTrailingNewline() should not add a newline if one already exists", () => {
+    textOutput.write("hello\n");
     textOutput.ensureTrailingNewline();
-    expect(getWrittenOutput()).toBe('hello\n');
+    expect(getWrittenOutput()).toBe("hello\n");
   });
 
-  it('should handle a sequence of calls correctly', () => {
-    textOutput.write('first');
-    textOutput.writeOnNewLine('second');
-    textOutput.write(' part');
+  it("should handle a sequence of calls correctly", () => {
+    textOutput.write("first");
+    textOutput.writeOnNewLine("second");
+    textOutput.write(" part");
     textOutput.ensureTrailingNewline();
     textOutput.ensureTrailingNewline(); // second call should do nothing
-    textOutput.write('third');
+    textOutput.write("third");
 
     expect(getWrittenOutput()).toMatchSnapshot();
   });
 
-  it('should correctly handle ANSI escape codes when determining line breaks', () => {
+  it("should correctly handle ANSI escape codes when determining line breaks", () => {
     const blue = (s: string) => `\u001b[34m${s}\u001b[39m`;
     const bold = (s: string) => `\u001b[1m${s}\u001b[22m`;
 
-    textOutput.write(blue('hello'));
-    textOutput.writeOnNewLine(bold('world'));
-    textOutput.write(blue('\n'));
-    textOutput.writeOnNewLine('next');
+    textOutput.write(blue("hello"));
+    textOutput.writeOnNewLine(bold("world"));
+    textOutput.write(blue("\n"));
+    textOutput.writeOnNewLine("next");
 
     expect(getWrittenOutput()).toMatchSnapshot();
   });
 
-  it('should handle empty strings with ANSI codes', () => {
-    textOutput.write('hello');
-    textOutput.write('\u001b[34m\u001b[39m'); // Empty blue string
-    textOutput.writeOnNewLine('world');
+  it("should handle empty strings with ANSI codes", () => {
+    textOutput.write("hello");
+    textOutput.write("\u001b[34m\u001b[39m"); // Empty blue string
+    textOutput.writeOnNewLine("world");
     expect(getWrittenOutput()).toMatchSnapshot();
   });
 
-  it('should handle ANSI codes that do not end with a newline', () => {
-    textOutput.write('hello\u001b[34m');
-    textOutput.writeOnNewLine('world');
+  it("should handle ANSI codes that do not end with a newline", () => {
+    textOutput.write("hello\u001b[34m");
+    textOutput.writeOnNewLine("world");
     expect(getWrittenOutput()).toMatchSnapshot();
   });
 });
diff --git a/packages/ui-gemini/src/ui/utils/textOutput.ts b/packages/ui-gemini/src/ui/utils/textOutput.ts
index 40a750257..95f1c8cc7 100644
--- a/packages/ui-gemini/src/ui/utils/textOutput.ts
+++ b/packages/ui-gemini/src/ui/utils/textOutput.ts
@@ -9,7 +9,7 @@
  * are handled consistently and robustly across the application.
  */
 
-import stripAnsi from 'strip-ansi';
+import stripAnsi from "strip-ansi";
 
 export class TextOutput {
   private atStartOfLine = true;
@@ -30,7 +30,7 @@ export class TextOutput {
     this.outputStream.write(str);
     const strippedStr = stripAnsi(str);
     if (strippedStr.length > 0) {
-      this.atStartOfLine = strippedStr.endsWith('\n');
+      this.atStartOfLine = strippedStr.endsWith("\n");
     }
   }
 
@@ -42,7 +42,7 @@ export class TextOutput {
    */
   writeOnNewLine(str: string): void {
     if (!this.atStartOfLine) {
-      this.write('\n');
+      this.write("\n");
     }
     this.write(str);
   }
@@ -53,7 +53,7 @@ export class TextOutput {
    */
   ensureTrailingNewline(): void {
     if (!this.atStartOfLine) {
-      this.write('\n');
+      this.write("\n");
     }
   }
 }
diff --git a/packages/ui-gemini/src/ui/utils/textUtils.test.ts b/packages/ui-gemini/src/ui/utils/textUtils.test.ts
index fed200240..2154d6f3e 100644
--- a/packages/ui-gemini/src/ui/utils/textUtils.test.ts
+++ b/packages/ui-gemini/src/ui/utils/textUtils.test.ts
@@ -4,25 +4,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
 import type {
   ToolCallConfirmationDetails,
   ToolEditConfirmationDetails,
-} from '@airiscode/gemini-cli-core';
-import { escapeAnsiCtrlCodes, stripUnsafeCharacters } from './textUtils.js';
-
-describe('textUtils', () => {
-  describe('stripUnsafeCharacters', () => {
-    it('should not strip tab characters', () => {
-      const input = 'hello	world';
-      expect(stripUnsafeCharacters(input)).toBe('hello	world');
+} from "@airiscode/gemini-cli-core";
+import { describe, expect, it } from "vitest";
+import { escapeAnsiCtrlCodes, stripUnsafeCharacters } from "./textUtils.js";
+
+describe("textUtils", () => {
+  describe("stripUnsafeCharacters", () => {
+    it("should not strip tab characters", () => {
+      const input = "hello	world";
+      expect(stripUnsafeCharacters(input)).toBe("hello	world");
     });
   });
-  describe('escapeAnsiCtrlCodes', () => {
-    describe('escapeAnsiCtrlCodes string case study', () => {
-      it('should replace ANSI escape codes with a visible representation', () => {
-        const text = '\u001b[31mHello\u001b[0m';
-        const expected = '\\u001b[31mHello\\u001b[0m';
+  describe("escapeAnsiCtrlCodes", () => {
+    describe("escapeAnsiCtrlCodes string case study", () => {
+      it("should replace ANSI escape codes with a visible representation", () => {
+        const text = "\u001b[31mHello\u001b[0m";
+        const expected = "\\u001b[31mHello\\u001b[0m";
         expect(escapeAnsiCtrlCodes(text)).toBe(expected);
 
         const text2 = "sh -e 'good && bad# \u001b[9D\u001b[K && good";
@@ -30,112 +30,102 @@ describe('textUtils', () => {
         expect(escapeAnsiCtrlCodes(text2)).toBe(expected2);
       });
 
-      it('should not change a string with no ANSI codes', () => {
-        const text = 'Hello, world!';
+      it("should not change a string with no ANSI codes", () => {
+        const text = "Hello, world!";
         expect(escapeAnsiCtrlCodes(text)).toBe(text);
       });
 
-      it('should handle an empty string', () => {
-        expect(escapeAnsiCtrlCodes('')).toBe('');
+      it("should handle an empty string", () => {
+        expect(escapeAnsiCtrlCodes("")).toBe("");
       });
 
-      describe('toolConfirmationDetails case study', () => {
-        it('should sanitize command and rootCommand for exec type', () => {
+      describe("toolConfirmationDetails case study", () => {
+        it("should sanitize command and rootCommand for exec type", () => {
           const details: ToolCallConfirmationDetails = {
-            title: '\u001b[34mfake-title\u001b[0m',
-            type: 'exec',
-            command: '\u001b[31mmls -l\u001b[0m',
-            rootCommand: '\u001b[32msudo apt-get update\u001b[0m',
+            title: "\u001b[34mfake-title\u001b[0m",
+            type: "exec",
+            command: "\u001b[31mmls -l\u001b[0m",
+            rootCommand: "\u001b[32msudo apt-get update\u001b[0m",
             onConfirm: async () => {},
           };
 
           const sanitized = escapeAnsiCtrlCodes(details);
 
-          if (sanitized.type === 'exec') {
-            expect(sanitized.title).toBe('\\u001b[34mfake-title\\u001b[0m');
-            expect(sanitized.command).toBe('\\u001b[31mmls -l\\u001b[0m');
-            expect(sanitized.rootCommand).toBe(
-              '\\u001b[32msudo apt-get update\\u001b[0m',
-            );
+          if (sanitized.type === "exec") {
+            expect(sanitized.title).toBe("\\u001b[34mfake-title\\u001b[0m");
+            expect(sanitized.command).toBe("\\u001b[31mmls -l\\u001b[0m");
+            expect(sanitized.rootCommand).toBe("\\u001b[32msudo apt-get update\\u001b[0m");
           }
         });
 
-        it('should sanitize properties for edit type', () => {
+        it("should sanitize properties for edit type", () => {
           const details: ToolCallConfirmationDetails = {
-            type: 'edit',
-            title: '\u001b[34mEdit File\u001b[0m',
-            fileName: '\u001b[31mfile.txt\u001b[0m',
-            filePath: '/path/to/\u001b[32mfile.txt\u001b[0m',
+            type: "edit",
+            title: "\u001b[34mEdit File\u001b[0m",
+            fileName: "\u001b[31mfile.txt\u001b[0m",
+            filePath: "/path/to/\u001b[32mfile.txt\u001b[0m",
             fileDiff:
-              'diff --git a/file.txt b/file.txt\n--- a/\u001b[33mfile.txt\u001b[0m\n+++ b/file.txt',
+              "diff --git a/file.txt b/file.txt\n--- a/\u001b[33mfile.txt\u001b[0m\n+++ b/file.txt",
             onConfirm: async () => {},
           } as unknown as ToolEditConfirmationDetails;
 
           const sanitized = escapeAnsiCtrlCodes(details);
 
-          if (sanitized.type === 'edit') {
-            expect(sanitized.title).toBe('\\u001b[34mEdit File\\u001b[0m');
-            expect(sanitized.fileName).toBe('\\u001b[31mfile.txt\\u001b[0m');
-            expect(sanitized.filePath).toBe(
-              '/path/to/\\u001b[32mfile.txt\\u001b[0m',
-            );
+          if (sanitized.type === "edit") {
+            expect(sanitized.title).toBe("\\u001b[34mEdit File\\u001b[0m");
+            expect(sanitized.fileName).toBe("\\u001b[31mfile.txt\\u001b[0m");
+            expect(sanitized.filePath).toBe("/path/to/\\u001b[32mfile.txt\\u001b[0m");
             expect(sanitized.fileDiff).toBe(
-              'diff --git a/file.txt b/file.txt\n--- a/\\u001b[33mfile.txt\\u001b[0m\n+++ b/file.txt',
+              "diff --git a/file.txt b/file.txt\n--- a/\\u001b[33mfile.txt\\u001b[0m\n+++ b/file.txt",
             );
           }
         });
 
-        it('should sanitize properties for mcp type', () => {
+        it("should sanitize properties for mcp type", () => {
           const details: ToolCallConfirmationDetails = {
-            type: 'mcp',
-            title: '\u001b[34mCloud Run\u001b[0m',
-            serverName: '\u001b[31mmy-server\u001b[0m',
-            toolName: '\u001b[32mdeploy\u001b[0m',
-            toolDisplayName: '\u001b[33mDeploy Service\u001b[0m',
+            type: "mcp",
+            title: "\u001b[34mCloud Run\u001b[0m",
+            serverName: "\u001b[31mmy-server\u001b[0m",
+            toolName: "\u001b[32mdeploy\u001b[0m",
+            toolDisplayName: "\u001b[33mDeploy Service\u001b[0m",
             onConfirm: async () => {},
           };
 
           const sanitized = escapeAnsiCtrlCodes(details);
 
-          if (sanitized.type === 'mcp') {
-            expect(sanitized.title).toBe('\\u001b[34mCloud Run\\u001b[0m');
-            expect(sanitized.serverName).toBe('\\u001b[31mmy-server\\u001b[0m');
-            expect(sanitized.toolName).toBe('\\u001b[32mdeploy\\u001b[0m');
-            expect(sanitized.toolDisplayName).toBe(
-              '\\u001b[33mDeploy Service\\u001b[0m',
-            );
+          if (sanitized.type === "mcp") {
+            expect(sanitized.title).toBe("\\u001b[34mCloud Run\\u001b[0m");
+            expect(sanitized.serverName).toBe("\\u001b[31mmy-server\\u001b[0m");
+            expect(sanitized.toolName).toBe("\\u001b[32mdeploy\\u001b[0m");
+            expect(sanitized.toolDisplayName).toBe("\\u001b[33mDeploy Service\\u001b[0m");
           }
         });
 
-        it('should sanitize properties for info type', () => {
+        it("should sanitize properties for info type", () => {
           const details: ToolCallConfirmationDetails = {
-            type: 'info',
-            title: '\u001b[34mWeb Search\u001b[0m',
-            prompt: '\u001b[31mSearch for cats\u001b[0m',
-            urls: ['https://\u001b[32mgoogle.com\u001b[0m'],
+            type: "info",
+            title: "\u001b[34mWeb Search\u001b[0m",
+            prompt: "\u001b[31mSearch for cats\u001b[0m",
+            urls: ["https://\u001b[32mgoogle.com\u001b[0m"],
             onConfirm: async () => {},
           };
 
           const sanitized = escapeAnsiCtrlCodes(details);
 
-          if (sanitized.type === 'info') {
-            expect(sanitized.title).toBe('\\u001b[34mWeb Search\\u001b[0m');
-            expect(sanitized.prompt).toBe(
-              '\\u001b[31mSearch for cats\\u001b[0m',
-            );
-            expect(sanitized.urls?.[0]).toBe(
-              'https://\\u001b[32mgoogle.com\\u001b[0m',
-            );
+          if (sanitized.type === "info") {
+            expect(sanitized.title).toBe("\\u001b[34mWeb Search\\u001b[0m");
+            expect(sanitized.prompt).toBe("\\u001b[31mSearch for cats\\u001b[0m");
+            expect(sanitized.urls?.[0]).toBe("https://\\u001b[32mgoogle.com\\u001b[0m");
           }
         });
       });
 
-      it('should not change the object if no sanitization is needed', () => {
+      it("should not change the object if no sanitization is needed", () => {
         const details: ToolCallConfirmationDetails = {
-          type: 'info',
-          title: 'Web Search',
-          prompt: 'Search for cats',
-          urls: ['https://google.com'],
+          type: "info",
+          title: "Web Search",
+          prompt: "Search for cats",
+          urls: ["https://google.com"],
           onConfirm: async () => {},
         };
 
@@ -143,33 +133,33 @@ describe('textUtils', () => {
         expect(sanitized).toBe(details);
       });
 
-      it('should handle nested objects and arrays', () => {
+      it("should handle nested objects and arrays", () => {
         const details = {
-          a: '\u001b[31mred\u001b[0m',
+          a: "\u001b[31mred\u001b[0m",
           b: {
-            c: '\u001b[32mgreen\u001b[0m',
-            d: ['\u001b[33myellow\u001b[0m', { e: '\u001b[34mblue\u001b[0m' }],
+            c: "\u001b[32mgreen\u001b[0m",
+            d: ["\u001b[33myellow\u001b[0m", { e: "\u001b[34mblue\u001b[0m" }],
           },
           f: 123,
           g: null,
-          h: () => '\u001b[35mpurple\u001b[0m',
+          h: () => "\u001b[35mpurple\u001b[0m",
         };
 
         const sanitized = escapeAnsiCtrlCodes(details);
 
-        expect(sanitized.a).toBe('\\u001b[31mred\\u001b[0m');
-        if (typeof sanitized.b === 'object' && sanitized.b !== null) {
+        expect(sanitized.a).toBe("\\u001b[31mred\\u001b[0m");
+        if (typeof sanitized.b === "object" && sanitized.b !== null) {
           const b = sanitized.b as { c: string; d: Array<string | object> };
-          expect(b.c).toBe('\\u001b[32mgreen\\u001b[0m');
-          expect(b.d[0]).toBe('\\u001b[33myellow\\u001b[0m');
-          if (typeof b.d[1] === 'object' && b.d[1] !== null) {
+          expect(b.c).toBe("\\u001b[32mgreen\\u001b[0m");
+          expect(b.d[0]).toBe("\\u001b[33myellow\\u001b[0m");
+          if (typeof b.d[1] === "object" && b.d[1] !== null) {
             const e = b.d[1] as { e: string };
-            expect(e.e).toBe('\\u001b[34mblue\\u001b[0m');
+            expect(e.e).toBe("\\u001b[34mblue\\u001b[0m");
           }
         }
         expect(sanitized.f).toBe(123);
         expect(sanitized.g).toBe(null);
-        expect(sanitized.h()).toBe('\u001b[35mpurple\u001b[0m');
+        expect(sanitized.h()).toBe("\u001b[35mpurple\u001b[0m");
       });
     });
   });
diff --git a/packages/ui-gemini/src/ui/utils/textUtils.ts b/packages/ui-gemini/src/ui/utils/textUtils.ts
index 5da186c42..2325b5024 100644
--- a/packages/ui-gemini/src/ui/utils/textUtils.ts
+++ b/packages/ui-gemini/src/ui/utils/textUtils.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import stripAnsi from 'strip-ansi';
-import ansiRegex from 'ansi-regex';
-import { stripVTControlCharacters } from 'node:util';
-import stringWidth from 'string-width';
+import { stripVTControlCharacters } from "node:util";
+import ansiRegex from "ansi-regex";
+import stringWidth from "string-width";
+import stripAnsi from "strip-ansi";
 
 /**
  * Calculates the maximum width of a multi-line ASCII art string.
@@ -18,7 +18,7 @@ export const getAsciiArtWidth = (asciiArt: string): number => {
   if (!asciiArt) {
     return 0;
   }
-  const lines = asciiArt.split('\n');
+  const lines = asciiArt.split("\n");
   return Math.max(...lines.map((line) => line.length));
 };
 
@@ -42,7 +42,7 @@ export function toCodePoints(str: string): string[] {
     }
   }
   if (isAscii) {
-    return str.split('');
+    return str.split("");
   }
 
   // Cache short strings
@@ -70,7 +70,7 @@ export function cpLen(str: string): number {
 export function cpSlice(str: string, start: number, end?: number): string {
   // Slice by code‑point indices and re‑join.
   const arr = toCodePoints(str).slice(start, end);
-  return arr.join('');
+  return arr.join("");
 }
 
 /**
@@ -116,7 +116,7 @@ export function stripUnsafeCharacters(str: string): string {
       // Preserve all other characters including Unicode/emojis
       return true;
     })
-    .join('');
+    .join("");
 }
 
 // String width caching for performance optimization
@@ -167,18 +167,16 @@ const regex = ansiRegex();
  * original `obj` reference if no changes were necessary.
  */
 export function escapeAnsiCtrlCodes<T>(obj: T): T {
-  if (typeof obj === 'string') {
+  if (typeof obj === "string") {
     if (obj.search(regex) === -1) {
       return obj; // No changes return original string
     }
 
     regex.lastIndex = 0; // needed for global regex
-    return obj.replace(regex, (match) =>
-      JSON.stringify(match).slice(1, -1),
-    ) as T;
+    return obj.replace(regex, (match) => JSON.stringify(match).slice(1, -1)) as T;
   }
 
-  if (obj === null || typeof obj !== 'object') {
+  if (obj === null || typeof obj !== "object") {
     return obj;
   }
 
diff --git a/packages/ui-gemini/src/ui/utils/ui-sizing.test.ts b/packages/ui-gemini/src/ui/utils/ui-sizing.test.ts
index 331c416b7..22a22d9f0 100644
--- a/packages/ui-gemini/src/ui/utils/ui-sizing.test.ts
+++ b/packages/ui-gemini/src/ui/utils/ui-sizing.test.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { calculateMainAreaWidth } from './ui-sizing.js';
-import { type LoadedSettings } from '../../config/settings.js';
+import { describe, expect, it, vi } from "vitest";
+import { type LoadedSettings } from "../../config/settings.js";
+import { calculateMainAreaWidth } from "./ui-sizing.js";
 
 // Mock dependencies
 const mocks = vi.hoisted(() => ({
   isAlternateBufferEnabled: vi.fn(),
 }));
 
-vi.mock('../hooks/useAlternateBuffer.js', () => ({
+vi.mock("../hooks/useAlternateBuffer.js", () => ({
   isAlternateBufferEnabled: mocks.isAlternateBufferEnabled,
 }));
 
-describe('ui-sizing', () => {
+describe("ui-sizing", () => {
   const createSettings = (useFullWidth?: boolean): LoadedSettings =>
     ({
       merged: {
@@ -27,7 +27,7 @@ describe('ui-sizing', () => {
       },
     }) as unknown as LoadedSettings;
 
-  describe('calculateMainAreaWidth', () => {
+  describe("calculateMainAreaWidth", () => {
     it.each([
       // width, useFullWidth, alternateBuffer, expected
       [80, true, false, 80],
@@ -45,17 +45,14 @@ describe('ui-sizing', () => {
 
       // Interpolation check
       [106, false, false, 100], // Approx middle
-    ])(
-      'should return %i when width=%i, useFullWidth=%s, altBuffer=%s',
-      (width, useFullWidth, altBuffer, expected) => {
-        mocks.isAlternateBufferEnabled.mockReturnValue(altBuffer);
-        const settings = createSettings(useFullWidth);
+    ])("should return %i when width=%i, useFullWidth=%s, altBuffer=%s", (width, useFullWidth, altBuffer, expected) => {
+      mocks.isAlternateBufferEnabled.mockReturnValue(altBuffer);
+      const settings = createSettings(useFullWidth);
 
-        expect(calculateMainAreaWidth(width, settings)).toBe(expected);
-      },
-    );
+      expect(calculateMainAreaWidth(width, settings)).toBe(expected);
+    });
 
-    it('should match snapshot for interpolation range', () => {
+    it("should match snapshot for interpolation range", () => {
       mocks.isAlternateBufferEnabled.mockReturnValue(false);
       const settings = createSettings(false);
 
diff --git a/packages/ui-gemini/src/ui/utils/ui-sizing.ts b/packages/ui-gemini/src/ui/utils/ui-sizing.ts
index be85fe88b..e1cf781ac 100644
--- a/packages/ui-gemini/src/ui/utils/ui-sizing.ts
+++ b/packages/ui-gemini/src/ui/utils/ui-sizing.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { lerp } from '../../utils/math.js';
-import { type LoadedSettings } from '../../config/settings.js';
-import { isAlternateBufferEnabled } from '../hooks/useAlternateBuffer.js';
+import { type LoadedSettings } from "../../config/settings.js";
+import { lerp } from "../../utils/math.js";
+import { isAlternateBufferEnabled } from "../hooks/useAlternateBuffer.js";
 
 const getMainAreaWidthInternal = (terminalWidth: number): number => {
   if (terminalWidth <= 80) {
@@ -23,10 +23,7 @@ const getMainAreaWidthInternal = (terminalWidth: number): number => {
   return Math.round(percentage * terminalWidth * 0.01);
 };
 
-export const calculateMainAreaWidth = (
-  terminalWidth: number,
-  settings: LoadedSettings,
-): number => {
+export const calculateMainAreaWidth = (terminalWidth: number, settings: LoadedSettings): number => {
   if (settings.merged.ui?.useFullWidth !== false) {
     if (isAlternateBufferEnabled(settings)) {
       return terminalWidth - 1;
diff --git a/packages/ui-gemini/src/ui/utils/updateCheck.test.ts b/packages/ui-gemini/src/ui/utils/updateCheck.test.ts
index 51f043112..2487df2d4 100644
--- a/packages/ui-gemini/src/ui/utils/updateCheck.test.ts
+++ b/packages/ui-gemini/src/ui/utils/updateCheck.test.ts
@@ -4,32 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { checkForUpdates } from './updateCheck.js';
-import type { LoadedSettings } from '../../config/settings.js';
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../../config/settings.js";
+import { checkForUpdates } from "./updateCheck.js";
 
 const getPackageJson = vi.hoisted(() => vi.fn());
 const debugLogger = vi.hoisted(() => ({
   warn: vi.fn(),
 }));
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("@airiscode/gemini-cli-core", () => ({
   getPackageJson,
   debugLogger,
 }));
 
 const latestVersion = vi.hoisted(() => vi.fn());
-vi.mock('latest-version', () => ({
+vi.mock("latest-version", () => ({
   default: latestVersion,
 }));
 
-describe('checkForUpdates', () => {
+describe("checkForUpdates", () => {
   let mockSettings: LoadedSettings;
 
   beforeEach(() => {
     vi.useFakeTimers();
     vi.resetAllMocks();
     // Clear DEV environment variable before each test
-    delete process.env['DEV'];
+    delete process.env["DEV"];
 
     mockSettings = {
       merged: {
@@ -45,7 +45,7 @@ describe('checkForUpdates', () => {
     vi.restoreAllMocks();
   });
 
-  it('should return null if disableUpdateNag is true', async () => {
+  it("should return null if disableUpdateNag is true", async () => {
     mockSettings.merged.general!.disableUpdateNag = true;
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
@@ -53,103 +53,103 @@ describe('checkForUpdates', () => {
     expect(latestVersion).not.toHaveBeenCalled();
   });
 
-  it('should return null when running from source (DEV=true)', async () => {
-    process.env['DEV'] = 'true';
+  it("should return null when running from source (DEV=true)", async () => {
+    process.env["DEV"] = "true";
     getPackageJson.mockResolvedValue({
-      name: 'test-package',
-      version: '1.0.0',
+      name: "test-package",
+      version: "1.0.0",
     });
-    latestVersion.mockResolvedValue('1.1.0');
+    latestVersion.mockResolvedValue("1.1.0");
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
     expect(getPackageJson).not.toHaveBeenCalled();
     expect(latestVersion).not.toHaveBeenCalled();
   });
 
-  it('should return null if package.json is missing', async () => {
+  it("should return null if package.json is missing", async () => {
     getPackageJson.mockResolvedValue(null);
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
   });
 
-  it('should return null if there is no update', async () => {
+  it("should return null if there is no update", async () => {
     getPackageJson.mockResolvedValue({
-      name: 'test-package',
-      version: '1.0.0',
+      name: "test-package",
+      version: "1.0.0",
     });
-    latestVersion.mockResolvedValue('1.0.0');
+    latestVersion.mockResolvedValue("1.0.0");
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
   });
 
-  it('should return a message if a newer version is available', async () => {
+  it("should return a message if a newer version is available", async () => {
     getPackageJson.mockResolvedValue({
-      name: 'test-package',
-      version: '1.0.0',
+      name: "test-package",
+      version: "1.0.0",
     });
-    latestVersion.mockResolvedValue('1.1.0');
+    latestVersion.mockResolvedValue("1.1.0");
 
     const result = await checkForUpdates(mockSettings);
-    expect(result?.message).toContain('1.0.0 → 1.1.0');
-    expect(result?.update.current).toEqual('1.0.0');
-    expect(result?.update.latest).toEqual('1.1.0');
-    expect(result?.update.name).toEqual('test-package');
+    expect(result?.message).toContain("1.0.0 → 1.1.0");
+    expect(result?.update.current).toEqual("1.0.0");
+    expect(result?.update.latest).toEqual("1.1.0");
+    expect(result?.update.name).toEqual("test-package");
   });
 
-  it('should return null if the latest version is the same as the current version', async () => {
+  it("should return null if the latest version is the same as the current version", async () => {
     getPackageJson.mockResolvedValue({
-      name: 'test-package',
-      version: '1.0.0',
+      name: "test-package",
+      version: "1.0.0",
     });
-    latestVersion.mockResolvedValue('1.0.0');
+    latestVersion.mockResolvedValue("1.0.0");
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
   });
 
-  it('should return null if the latest version is older than the current version', async () => {
+  it("should return null if the latest version is older than the current version", async () => {
     getPackageJson.mockResolvedValue({
-      name: 'test-package',
-      version: '1.1.0',
+      name: "test-package",
+      version: "1.1.0",
     });
-    latestVersion.mockResolvedValue('1.0.0');
+    latestVersion.mockResolvedValue("1.0.0");
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
   });
 
-  it('should return null if latestVersion rejects', async () => {
+  it("should return null if latestVersion rejects", async () => {
     getPackageJson.mockResolvedValue({
-      name: 'test-package',
-      version: '1.0.0',
+      name: "test-package",
+      version: "1.0.0",
     });
-    latestVersion.mockRejectedValue(new Error('Timeout'));
+    latestVersion.mockRejectedValue(new Error("Timeout"));
 
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
   });
 
-  it('should handle errors gracefully', async () => {
-    getPackageJson.mockRejectedValue(new Error('test error'));
+  it("should handle errors gracefully", async () => {
+    getPackageJson.mockRejectedValue(new Error("test error"));
     const result = await checkForUpdates(mockSettings);
     expect(result).toBeNull();
   });
 
-  describe('nightly updates', () => {
-    it('should notify for a newer nightly version when current is nightly', async () => {
+  describe("nightly updates", () => {
+    it("should notify for a newer nightly version when current is nightly", async () => {
       getPackageJson.mockResolvedValue({
-        name: 'test-package',
-        version: '1.2.3-nightly.1',
+        name: "test-package",
+        version: "1.2.3-nightly.1",
       });
 
       latestVersion.mockImplementation(async (name, options) => {
-        if (options?.version === 'nightly') {
-          return '1.2.3-nightly.2';
+        if (options?.version === "nightly") {
+          return "1.2.3-nightly.2";
         }
-        return '1.2.3';
+        return "1.2.3";
       });
 
       const result = await checkForUpdates(mockSettings);
-      expect(result?.message).toContain('1.2.3-nightly.1 → 1.2.3-nightly.2');
-      expect(result?.update.latest).toBe('1.2.3-nightly.2');
+      expect(result?.message).toContain("1.2.3-nightly.1 → 1.2.3-nightly.2");
+      expect(result?.update.latest).toBe("1.2.3-nightly.2");
     });
   });
 });
diff --git a/packages/ui-gemini/src/ui/utils/updateCheck.ts b/packages/ui-gemini/src/ui/utils/updateCheck.ts
index d31763979..5ded537e1 100644
--- a/packages/ui-gemini/src/ui/utils/updateCheck.ts
+++ b/packages/ui-gemini/src/ui/utils/updateCheck.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import latestVersion from 'latest-version';
-import semver from 'semver';
-import { getPackageJson, debugLogger } from '@airiscode/gemini-cli-core';
-import type { LoadedSettings } from '../../config/settings.js';
-import { fileURLToPath } from 'node:url';
-import path from 'node:path';
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { debugLogger, getPackageJson } from "@airiscode/gemini-cli-core";
+import latestVersion from "latest-version";
+import semver from "semver";
+import type { LoadedSettings } from "../../config/settings.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -33,10 +33,7 @@ export interface UpdateObject {
  * From a nightly and stable version, determines which is the "best" one to offer.
  * The rule is to always prefer nightly if the base versions are the same.
  */
-function getBestAvailableUpdate(
-  nightly?: string,
-  stable?: string,
-): string | null {
+function getBestAvailableUpdate(nightly?: string, stable?: string): string | null {
   if (!nightly) return stable || null;
   if (!stable) return nightly || null;
 
@@ -47,15 +44,13 @@ function getBestAvailableUpdate(
   return semver.gt(stable, nightly) ? stable : nightly;
 }
 
-export async function checkForUpdates(
-  settings: LoadedSettings,
-): Promise<UpdateObject | null> {
+export async function checkForUpdates(settings: LoadedSettings): Promise<UpdateObject | null> {
   try {
     if (settings.merged.general?.disableUpdateNag) {
       return null;
     }
     // Skip update check when running from source (development mode)
-    if (process.env['DEV'] === 'true') {
+    if (process.env["DEV"] === "true") {
       return null;
     }
     const packageJson = await getPackageJson(__dirname);
@@ -64,11 +59,11 @@ export async function checkForUpdates(
     }
 
     const { name, version: currentVersion } = packageJson;
-    const isNightly = currentVersion.includes('nightly');
+    const isNightly = currentVersion.includes("nightly");
 
     if (isNightly) {
       const [nightlyUpdate, latestUpdate] = await Promise.all([
-        latestVersion(name, { version: 'nightly' }),
+        latestVersion(name, { version: "nightly" }),
         latestVersion(name),
       ]);
 
@@ -107,7 +102,7 @@ export async function checkForUpdates(
 
     return null;
   } catch (e) {
-    debugLogger.warn('Failed to check for updates: ' + e);
+    debugLogger.warn("Failed to check for updates: " + e);
     return null;
   }
 }
diff --git a/packages/ui-gemini/src/utils/checks.test.ts b/packages/ui-gemini/src/utils/checks.test.ts
index 59d25e4ee..aaef6bbad 100644
--- a/packages/ui-gemini/src/utils/checks.test.ts
+++ b/packages/ui-gemini/src/utils/checks.test.ts
@@ -4,28 +4,28 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { checkExhaustive, assumeExhaustive } from './checks.js';
+import { describe, expect, it } from "vitest";
+import { assumeExhaustive, checkExhaustive } from "./checks.js";
 
-describe('checks', () => {
-  describe('checkExhaustive', () => {
-    it('should throw an error with default message', () => {
+describe("checks", () => {
+  describe("checkExhaustive", () => {
+    it("should throw an error with default message", () => {
       expect(() => {
-        checkExhaustive('unexpected' as never);
-      }).toThrow('unexpected value unexpected!');
+        checkExhaustive("unexpected" as never);
+      }).toThrow("unexpected value unexpected!");
     });
 
-    it('should throw an error with custom message', () => {
+    it("should throw an error with custom message", () => {
       expect(() => {
-        checkExhaustive('unexpected' as never, 'custom message');
-      }).toThrow('custom message');
+        checkExhaustive("unexpected" as never, "custom message");
+      }).toThrow("custom message");
     });
   });
 
-  describe('assumeExhaustive', () => {
-    it('should do nothing', () => {
+  describe("assumeExhaustive", () => {
+    it("should do nothing", () => {
       expect(() => {
-        assumeExhaustive('unexpected' as never);
+        assumeExhaustive("unexpected" as never);
       }).not.toThrow();
     });
   });
diff --git a/packages/ui-gemini/src/utils/checks.ts b/packages/ui-gemini/src/utils/checks.ts
index 0598835f4..2f699dddd 100644
--- a/packages/ui-gemini/src/utils/checks.ts
+++ b/packages/ui-gemini/src/utils/checks.ts
@@ -19,10 +19,7 @@ export function assumeExhaustive(_value: never): void {}
  *     checkExhaustive(enumValue);
  * }
  */
-export function checkExhaustive(
-  value: never,
-  msg = `unexpected value ${value}!`,
-): never {
+export function checkExhaustive(value: never, msg = `unexpected value ${value}!`): never {
   assumeExhaustive(value);
   throw new Error(msg);
 }
diff --git a/packages/ui-gemini/src/utils/cleanup.test.ts b/packages/ui-gemini/src/utils/cleanup.test.ts
index 924847290..e153b4243 100644
--- a/packages/ui-gemini/src/utils/cleanup.test.ts
+++ b/packages/ui-gemini/src/utils/cleanup.test.ts
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-import { promises as fs } from 'node:fs';
-import * as path from 'node:path';
+import { promises as fs } from "node:fs";
+import * as path from "node:path";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("@airiscode/gemini-cli-core", () => ({
   Storage: vi.fn().mockImplementation(() => ({
-    getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
+    getProjectTempDir: vi.fn().mockReturnValue("/tmp/project"),
   })),
 }));
 
-vi.mock('node:fs', () => ({
+vi.mock("node:fs", () => ({
   promises: {
     rm: vi.fn(),
   },
 }));
 
-describe('cleanup', () => {
+describe("cleanup", () => {
   beforeEach(async () => {
     vi.resetModules();
     vi.clearAllMocks();
@@ -31,8 +31,8 @@ describe('cleanup', () => {
     // So we DO need to re-import it to get fresh state.
   });
 
-  it('should run a registered synchronous function', async () => {
-    const cleanupModule = await import('./cleanup.js');
+  it("should run a registered synchronous function", async () => {
+    const cleanupModule = await import("./cleanup.js");
     const cleanupFn = vi.fn();
     cleanupModule.registerCleanup(cleanupFn);
 
@@ -41,8 +41,8 @@ describe('cleanup', () => {
     expect(cleanupFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should run a registered asynchronous function', async () => {
-    const cleanupModule = await import('./cleanup.js');
+  it("should run a registered asynchronous function", async () => {
+    const cleanupModule = await import("./cleanup.js");
     const cleanupFn = vi.fn().mockResolvedValue(undefined);
     cleanupModule.registerCleanup(cleanupFn);
 
@@ -51,8 +51,8 @@ describe('cleanup', () => {
     expect(cleanupFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should run multiple registered functions', async () => {
-    const cleanupModule = await import('./cleanup.js');
+  it("should run multiple registered functions", async () => {
+    const cleanupModule = await import("./cleanup.js");
     const syncFn = vi.fn();
     const asyncFn = vi.fn().mockResolvedValue(undefined);
 
@@ -65,10 +65,10 @@ describe('cleanup', () => {
     expect(asyncFn).toHaveBeenCalledTimes(1);
   });
 
-  it('should continue running cleanup functions even if one throws an error', async () => {
-    const cleanupModule = await import('./cleanup.js');
+  it("should continue running cleanup functions even if one throws an error", async () => {
+    const cleanupModule = await import("./cleanup.js");
     const errorFn = vi.fn().mockImplementation(() => {
-      throw new Error('test error');
+      throw new Error("test error");
     });
     const successFn = vi.fn();
     cleanupModule.registerCleanup(errorFn);
@@ -80,19 +80,19 @@ describe('cleanup', () => {
     expect(successFn).toHaveBeenCalledTimes(1);
   });
 
-  describe('sync cleanup', () => {
-    it('should run registered sync functions', async () => {
-      const cleanupModule = await import('./cleanup.js');
+  describe("sync cleanup", () => {
+    it("should run registered sync functions", async () => {
+      const cleanupModule = await import("./cleanup.js");
       const syncFn = vi.fn();
       cleanupModule.registerSyncCleanup(syncFn);
       cleanupModule.runSyncCleanup();
       expect(syncFn).toHaveBeenCalledTimes(1);
     });
 
-    it('should continue running sync cleanup functions even if one throws', async () => {
-      const cleanupModule = await import('./cleanup.js');
+    it("should continue running sync cleanup functions even if one throws", async () => {
+      const cleanupModule = await import("./cleanup.js");
       const errorFn = vi.fn().mockImplementation(() => {
-        throw new Error('test error');
+        throw new Error("test error");
       });
       const successFn = vi.fn();
       cleanupModule.registerSyncCleanup(errorFn);
@@ -104,22 +104,19 @@ describe('cleanup', () => {
     });
   });
 
-  describe('cleanupCheckpoints', () => {
-    it('should remove checkpoints directory', async () => {
-      const cleanupModule = await import('./cleanup.js');
+  describe("cleanupCheckpoints", () => {
+    it("should remove checkpoints directory", async () => {
+      const cleanupModule = await import("./cleanup.js");
       await cleanupModule.cleanupCheckpoints();
-      expect(fs.rm).toHaveBeenCalledWith(
-        path.join('/tmp/project', 'checkpoints'),
-        {
-          recursive: true,
-          force: true,
-        },
-      );
+      expect(fs.rm).toHaveBeenCalledWith(path.join("/tmp/project", "checkpoints"), {
+        recursive: true,
+        force: true,
+      });
     });
 
-    it('should ignore errors during checkpoint removal', async () => {
-      const cleanupModule = await import('./cleanup.js');
-      vi.mocked(fs.rm).mockRejectedValue(new Error('Failed to remove'));
+    it("should ignore errors during checkpoint removal", async () => {
+      const cleanupModule = await import("./cleanup.js");
+      vi.mocked(fs.rm).mockRejectedValue(new Error("Failed to remove"));
       await expect(cleanupModule.cleanupCheckpoints()).resolves.not.toThrow();
     });
   });
diff --git a/packages/ui-gemini/src/utils/cleanup.ts b/packages/ui-gemini/src/utils/cleanup.ts
index 42ad4852b..50b0c643d 100644
--- a/packages/ui-gemini/src/utils/cleanup.ts
+++ b/packages/ui-gemini/src/utils/cleanup.ts
@@ -4,14 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { promises as fs } from 'node:fs';
-import { join } from 'node:path';
-import {
-  Storage,
-  shutdownTelemetry,
-  isTelemetrySdkInitialized,
-} from '@airiscode/gemini-cli-core';
-import type { Config } from '@airiscode/gemini-cli-core';
+import { promises as fs } from "node:fs";
+import { join } from "node:path";
+import type { Config } from "@airiscode/gemini-cli-core";
+import { isTelemetrySdkInitialized, Storage, shutdownTelemetry } from "@airiscode/gemini-cli-core";
 
 const cleanupFunctions: Array<(() => void) | (() => Promise<void>)> = [];
 const syncCleanupFunctions: Array<() => void> = [];
@@ -69,7 +65,7 @@ export async function runExitCleanup() {
 export async function cleanupCheckpoints() {
   const storage = new Storage(process.cwd());
   const tempDir = storage.getProjectTempDir();
-  const checkpointsDir = join(tempDir, 'checkpoints');
+  const checkpointsDir = join(tempDir, "checkpoints");
   try {
     await fs.rm(checkpointsDir, { recursive: true, force: true });
   } catch {
diff --git a/packages/ui-gemini/src/utils/commands.test.ts b/packages/ui-gemini/src/utils/commands.test.ts
index 30040a035..fefb79446 100644
--- a/packages/ui-gemini/src/utils/commands.test.ts
+++ b/packages/ui-gemini/src/utils/commands.test.ts
@@ -4,39 +4,39 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { parseSlashCommand } from './commands.js';
-import { CommandKind, type SlashCommand } from '../ui/commands/types.js';
+import { describe, expect, it } from "vitest";
+import { CommandKind, type SlashCommand } from "../ui/commands/types.js";
+import { parseSlashCommand } from "./commands.js";
 
 // Mock command structure for testing
 const mockCommands: readonly SlashCommand[] = [
   {
-    name: 'help',
-    description: 'Show help',
+    name: "help",
+    description: "Show help",
     action: async () => {},
     kind: CommandKind.BUILT_IN,
   },
   {
-    name: 'commit',
-    description: 'Commit changes',
+    name: "commit",
+    description: "Commit changes",
     action: async () => {},
     kind: CommandKind.FILE,
   },
   {
-    name: 'memory',
-    description: 'Manage memory',
-    altNames: ['mem'],
+    name: "memory",
+    description: "Manage memory",
+    altNames: ["mem"],
     subCommands: [
       {
-        name: 'add',
-        description: 'Add to memory',
+        name: "add",
+        description: "Add to memory",
         action: async () => {},
         kind: CommandKind.BUILT_IN,
       },
       {
-        name: 'clear',
-        description: 'Clear memory',
-        altNames: ['c'],
+        name: "clear",
+        description: "Clear memory",
+        altNames: ["c"],
         action: async () => {},
         kind: CommandKind.BUILT_IN,
       },
@@ -45,96 +45,84 @@ const mockCommands: readonly SlashCommand[] = [
   },
 ];
 
-describe('parseSlashCommand', () => {
-  it('should parse a simple command without arguments', () => {
-    const result = parseSlashCommand('/help', mockCommands);
-    expect(result.commandToExecute?.name).toBe('help');
-    expect(result.args).toBe('');
-    expect(result.canonicalPath).toEqual(['help']);
+describe("parseSlashCommand", () => {
+  it("should parse a simple command without arguments", () => {
+    const result = parseSlashCommand("/help", mockCommands);
+    expect(result.commandToExecute?.name).toBe("help");
+    expect(result.args).toBe("");
+    expect(result.canonicalPath).toEqual(["help"]);
   });
 
-  it('should parse a simple command with arguments', () => {
-    const result = parseSlashCommand(
-      '/commit -m "Initial commit"',
-      mockCommands,
-    );
-    expect(result.commandToExecute?.name).toBe('commit');
+  it("should parse a simple command with arguments", () => {
+    const result = parseSlashCommand('/commit -m "Initial commit"', mockCommands);
+    expect(result.commandToExecute?.name).toBe("commit");
     expect(result.args).toBe('-m "Initial commit"');
-    expect(result.canonicalPath).toEqual(['commit']);
+    expect(result.canonicalPath).toEqual(["commit"]);
   });
 
-  it('should parse a subcommand', () => {
-    const result = parseSlashCommand('/memory add', mockCommands);
-    expect(result.commandToExecute?.name).toBe('add');
-    expect(result.args).toBe('');
-    expect(result.canonicalPath).toEqual(['memory', 'add']);
+  it("should parse a subcommand", () => {
+    const result = parseSlashCommand("/memory add", mockCommands);
+    expect(result.commandToExecute?.name).toBe("add");
+    expect(result.args).toBe("");
+    expect(result.canonicalPath).toEqual(["memory", "add"]);
   });
 
-  it('should parse a subcommand with arguments', () => {
-    const result = parseSlashCommand(
-      '/memory add some important data',
-      mockCommands,
-    );
-    expect(result.commandToExecute?.name).toBe('add');
-    expect(result.args).toBe('some important data');
-    expect(result.canonicalPath).toEqual(['memory', 'add']);
+  it("should parse a subcommand with arguments", () => {
+    const result = parseSlashCommand("/memory add some important data", mockCommands);
+    expect(result.commandToExecute?.name).toBe("add");
+    expect(result.args).toBe("some important data");
+    expect(result.canonicalPath).toEqual(["memory", "add"]);
   });
 
-  it('should handle a command alias', () => {
-    const result = parseSlashCommand('/mem add some data', mockCommands);
-    expect(result.commandToExecute?.name).toBe('add');
-    expect(result.args).toBe('some data');
-    expect(result.canonicalPath).toEqual(['memory', 'add']);
+  it("should handle a command alias", () => {
+    const result = parseSlashCommand("/mem add some data", mockCommands);
+    expect(result.commandToExecute?.name).toBe("add");
+    expect(result.args).toBe("some data");
+    expect(result.canonicalPath).toEqual(["memory", "add"]);
   });
 
-  it('should handle a subcommand alias', () => {
-    const result = parseSlashCommand('/memory c', mockCommands);
-    expect(result.commandToExecute?.name).toBe('clear');
-    expect(result.args).toBe('');
-    expect(result.canonicalPath).toEqual(['memory', 'clear']);
+  it("should handle a subcommand alias", () => {
+    const result = parseSlashCommand("/memory c", mockCommands);
+    expect(result.commandToExecute?.name).toBe("clear");
+    expect(result.args).toBe("");
+    expect(result.canonicalPath).toEqual(["memory", "clear"]);
   });
 
-  it('should return undefined for an unknown command', () => {
-    const result = parseSlashCommand('/unknown', mockCommands);
+  it("should return undefined for an unknown command", () => {
+    const result = parseSlashCommand("/unknown", mockCommands);
     expect(result.commandToExecute).toBeUndefined();
-    expect(result.args).toBe('unknown');
+    expect(result.args).toBe("unknown");
     expect(result.canonicalPath).toEqual([]);
   });
 
-  it('should return the parent command if subcommand is unknown', () => {
-    const result = parseSlashCommand(
-      '/memory unknownsub some args',
-      mockCommands,
-    );
-    expect(result.commandToExecute?.name).toBe('memory');
-    expect(result.args).toBe('unknownsub some args');
-    expect(result.canonicalPath).toEqual(['memory']);
+  it("should return the parent command if subcommand is unknown", () => {
+    const result = parseSlashCommand("/memory unknownsub some args", mockCommands);
+    expect(result.commandToExecute?.name).toBe("memory");
+    expect(result.args).toBe("unknownsub some args");
+    expect(result.canonicalPath).toEqual(["memory"]);
   });
 
-  it('should handle extra whitespace', () => {
-    const result = parseSlashCommand(
-      '  /memory   add  some data  ',
-      mockCommands,
-    );
-    expect(result.commandToExecute?.name).toBe('add');
-    expect(result.args).toBe('some data');
-    expect(result.canonicalPath).toEqual(['memory', 'add']);
+  it("should handle extra whitespace", () => {
+    const result = parseSlashCommand("  /memory   add  some data  ", mockCommands);
+    expect(result.commandToExecute?.name).toBe("add");
+    expect(result.args).toBe("some data");
+    expect(result.canonicalPath).toEqual(["memory", "add"]);
   });
 
-  it('should return undefined if query does not start with a slash', () => {
-    const result = parseSlashCommand('help', mockCommands);
+  it("should return undefined if query does not start with a slash", () => {
+    const result = parseSlashCommand("help", mockCommands);
     expect(result.commandToExecute).toBeUndefined();
   });
 
-  it('should handle an empty query', () => {
-    const result = parseSlashCommand('', mockCommands);
+  it("should handle an empty query", () => {
+    const result = parseSlashCommand("", mockCommands);
     expect(result.commandToExecute).toBeUndefined();
   });
 
-  it('should handle a query with only a slash', () => {
-    const result = parseSlashCommand('/', mockCommands);
+  it("should handle a query with only a slash", () => {
+    const result = parseSlashCommand("/", mockCommands);
     expect(result.commandToExecute).toBeUndefined();
-    expect(result.args).toBe('');
+    expect(result.args).toBe("");
     expect(result.canonicalPath).toEqual([]);
   });
 });
diff --git a/packages/ui-gemini/src/utils/commands.ts b/packages/ui-gemini/src/utils/commands.ts
index c96c8c6ef..a92c6cc7d 100644
--- a/packages/ui-gemini/src/utils/commands.ts
+++ b/packages/ui-gemini/src/utils/commands.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { type SlashCommand } from '../ui/commands/types.js';
+import { type SlashCommand } from "../ui/commands/types.js";
 
 export type ParsedSlashCommand = {
   commandToExecute: SlashCommand | undefined;
@@ -46,9 +46,7 @@ export const parseSlashCommand = (
 
     // Second pass: if no primary name matches, check for an alias.
     if (!foundCommand) {
-      foundCommand = currentCommands.find((cmd) =>
-        cmd.altNames?.includes(part),
-      );
+      foundCommand = currentCommands.find((cmd) => cmd.altNames?.includes(part));
     }
 
     if (foundCommand) {
@@ -65,7 +63,7 @@ export const parseSlashCommand = (
     }
   }
 
-  const args = parts.slice(pathIndex).join(' ');
+  const args = parts.slice(pathIndex).join(" ");
 
   return { commandToExecute, args, canonicalPath };
 };
diff --git a/packages/ui-gemini/src/utils/commentJson.test.ts b/packages/ui-gemini/src/utils/commentJson.test.ts
index d68bc18b0..8d7e19c96 100644
--- a/packages/ui-gemini/src/utils/commentJson.test.ts
+++ b/packages/ui-gemini/src/utils/commentJson.test.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { updateSettingsFilePreservingFormat } from './commentJson.js';
-import { coreEvents } from '@airiscode/gemini-cli-core';
-
-vi.mock('@airiscode/gemini-cli-core', () => ({
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { coreEvents } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { updateSettingsFilePreservingFormat } from "./commentJson.js";
+
+vi.mock("@airiscode/gemini-cli-core", () => ({
   coreEvents: {
     emitFeedback: vi.fn(),
   },
 }));
 
-describe('commentJson', () => {
+describe("commentJson", () => {
   let tempDir: string;
   let testFilePath: string;
 
   beforeEach(() => {
     // Create a temporary directory for test files
-    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'preserve-format-test-'));
-    testFilePath = path.join(tempDir, 'settings.json');
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "preserve-format-test-"));
+    testFilePath = path.join(tempDir, "settings.json");
   });
 
   afterEach(() => {
@@ -34,8 +34,8 @@ describe('commentJson', () => {
     }
   });
 
-  describe('updateSettingsFilePreservingFormat', () => {
-    it('should preserve comments when updating settings', () => {
+  describe("updateSettingsFilePreservingFormat", () => {
+    it("should preserve comments when updating settings", () => {
       const originalContent = `{
         // Model configuration
         "model": "gemini-2.5-pro",
@@ -45,24 +45,24 @@ describe('commentJson', () => {
         }
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
         ui: {
-          theme: 'dark',
+          theme: "dark",
         },
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
 
-      expect(updatedContent).toContain('// Model configuration');
-      expect(updatedContent).toContain('// Theme setting');
+      expect(updatedContent).toContain("// Model configuration");
+      expect(updatedContent).toContain("// Theme setting");
       expect(updatedContent).toContain('"model": "gemini-2.5-flash"');
       expect(updatedContent).toContain('"theme": "dark"');
     });
 
-    it('should handle nested object updates', () => {
+    it("should handle nested object updates", () => {
       const originalContent = `{
         "ui": {
           "theme": "dark",
@@ -70,49 +70,49 @@ describe('commentJson', () => {
         }
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
         ui: {
-          theme: 'light',
+          theme: "light",
           showLineNumbers: true,
         },
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
       expect(updatedContent).toContain('"theme": "light"');
       expect(updatedContent).toContain('"showLineNumbers": true');
     });
 
-    it('should add new fields while preserving existing structure', () => {
+    it("should add new fields while preserving existing structure", () => {
       const originalContent = `{
         // Existing config
         "model": "gemini-2.5-pro"
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
-        model: 'gemini-2.5-pro',
-        newField: 'newValue',
+        model: "gemini-2.5-pro",
+        newField: "newValue",
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
-      expect(updatedContent).toContain('// Existing config');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
+      expect(updatedContent).toContain("// Existing config");
       expect(updatedContent).toContain('"newField": "newValue"');
     });
 
-    it('should create file if it does not exist', () => {
+    it("should create file if it does not exist", () => {
       updateSettingsFilePreservingFormat(testFilePath, {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
       });
 
       expect(fs.existsSync(testFilePath)).toBe(true);
-      const content = fs.readFileSync(testFilePath, 'utf-8');
+      const content = fs.readFileSync(testFilePath, "utf-8");
       expect(content).toContain('"model": "gemini-2.5-pro"');
     });
 
-    it('should handle complex real-world scenario', () => {
+    it("should handle complex real-world scenario", () => {
       const complexContent = `{
         // Settings
         "model": "gemini-2.5-pro",
@@ -126,28 +126,28 @@ describe('commentJson', () => {
         }
       }`;
 
-      fs.writeFileSync(testFilePath, complexContent, 'utf-8');
+      fs.writeFileSync(testFilePath, complexContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
         mcpServers: {
           context7: {
             headers: {
-              API_KEY: 'new-test-key',
+              API_KEY: "new-test-key",
             },
           },
         },
         newSection: {
-          setting: 'value',
+          setting: "value",
         },
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
 
       // Verify comments preserved
-      expect(updatedContent).toContain('// Settings');
-      expect(updatedContent).toContain('// Active server');
-      expect(updatedContent).toContain('// API key');
+      expect(updatedContent).toContain("// Settings");
+      expect(updatedContent).toContain("// Active server");
+      expect(updatedContent).toContain("// API key");
 
       // Verify updates applied
       expect(updatedContent).toContain('"model": "gemini-2.5-flash"');
@@ -155,7 +155,7 @@ describe('commentJson', () => {
       expect(updatedContent).toContain('"API_KEY": "new-test-key"');
     });
 
-    it('should handle corrupted JSON files gracefully', () => {
+    it("should handle corrupted JSON files gracefully", () => {
       const corruptedContent = `{
         "model": "gemini-2.5-pro",
         "ui": {
@@ -163,25 +163,25 @@ describe('commentJson', () => {
         // Missing closing brace
       `;
 
-      fs.writeFileSync(testFilePath, corruptedContent, 'utf-8');
+      fs.writeFileSync(testFilePath, corruptedContent, "utf-8");
 
       expect(() => {
         updateSettingsFilePreservingFormat(testFilePath, {
-          model: 'gemini-2.5-flash',
+          model: "gemini-2.5-flash",
         });
       }).not.toThrow();
 
       expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        'Error parsing settings file. Please check the JSON syntax.',
+        "error",
+        "Error parsing settings file. Please check the JSON syntax.",
         expect.any(Error),
       );
 
-      const unchangedContent = fs.readFileSync(testFilePath, 'utf-8');
+      const unchangedContent = fs.readFileSync(testFilePath, "utf-8");
       expect(unchangedContent).toBe(corruptedContent);
     });
 
-    it('should handle array updates while preserving comments', () => {
+    it("should handle array updates while preserving comments", () => {
       const originalContent = `{
         // Server configurations
         "servers": [
@@ -191,20 +191,20 @@ describe('commentJson', () => {
         ]
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
-        servers: ['server1', 'server3'],
+        servers: ["server1", "server3"],
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
-      expect(updatedContent).toContain('// Server configurations');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
+      expect(updatedContent).toContain("// Server configurations");
       expect(updatedContent).toContain('"server1"');
       expect(updatedContent).toContain('"server3"');
       expect(updatedContent).not.toContain('"server2"');
     });
 
-    it('should sync nested objects, removing omitted fields', () => {
+    it("should sync nested objects, removing omitted fields", () => {
       const originalContent = `{
         // Configuration
         "model": "gemini-2.5-pro",
@@ -215,25 +215,25 @@ describe('commentJson', () => {
         "preservedField": "keep me"
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
-        model: 'gemini-2.5-flash',
+        model: "gemini-2.5-flash",
         ui: {
-          theme: 'light',
+          theme: "light",
         },
-        preservedField: 'keep me',
+        preservedField: "keep me",
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
-      expect(updatedContent).toContain('// Configuration');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
+      expect(updatedContent).toContain("// Configuration");
       expect(updatedContent).toContain('"model": "gemini-2.5-flash"');
       expect(updatedContent).toContain('"theme": "light"');
       expect(updatedContent).not.toContain('"existingSetting": "value"');
       expect(updatedContent).toContain('"preservedField": "keep me"');
     });
 
-    it('should handle mcpServers field deletion properly', () => {
+    it("should handle mcpServers field deletion properly", () => {
       const originalContent = `{
         "model": "gemini-2.5-pro",
         "mcpServers": {
@@ -250,27 +250,27 @@ describe('commentJson', () => {
         }
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
-        model: 'gemini-2.5-pro',
+        model: "gemini-2.5-pro",
         mcpServers: {
           context7: {
-            command: 'node',
-            args: ['server.js'],
+            command: "node",
+            args: ["server.js"],
           },
         },
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
-      expect(updatedContent).toContain('// Server to keep');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
+      expect(updatedContent).toContain("// Server to keep");
       expect(updatedContent).toContain('"context7"');
       expect(updatedContent).not.toContain('"oldServer"');
       // The comment for the removed server should still be preserved
-      expect(updatedContent).toContain('// Server to remove');
+      expect(updatedContent).toContain("// Server to remove");
     });
 
-    it('preserves sibling-level commented-out blocks when removing another key', () => {
+    it("preserves sibling-level commented-out blocks when removing another key", () => {
       const originalContent = `{
         "mcpServers": {
           // "sleep": {
@@ -291,38 +291,38 @@ describe('commentJson', () => {
         }
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
         mcpServers: {},
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
       expect(updatedContent).toContain('// "sleep": {');
       expect(updatedContent).toContain('"mcpServers"');
       expect(updatedContent).not.toContain('"playwright"');
     });
 
-    it('should handle type conversion from object to array', () => {
+    it("should handle type conversion from object to array", () => {
       const originalContent = `{
         "data": {
           "key": "value"
         }
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
-        data: ['item1', 'item2'],
+        data: ["item1", "item2"],
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
       expect(updatedContent).toContain('"data": [');
       expect(updatedContent).toContain('"item1"');
       expect(updatedContent).toContain('"item2"');
     });
 
-    it('should remove both nested and non-nested objects when omitted', () => {
+    it("should remove both nested and non-nested objects when omitted", () => {
       const originalContent = `{
         // Top-level config
         "topLevelObject": {
@@ -343,18 +343,18 @@ describe('commentJson', () => {
         }
       }`;
 
-      fs.writeFileSync(testFilePath, originalContent, 'utf-8');
+      fs.writeFileSync(testFilePath, originalContent, "utf-8");
 
       updateSettingsFilePreservingFormat(testFilePath, {
         parent: {
-          keepThis: 'value',
+          keepThis: "value",
         },
         preservedObject: {
-          data: 'keep',
+          data: "keep",
         },
       });
 
-      const updatedContent = fs.readFileSync(testFilePath, 'utf-8');
+      const updatedContent = fs.readFileSync(testFilePath, "utf-8");
 
       expect(updatedContent).not.toContain('"topLevelObject"');
 
@@ -364,7 +364,7 @@ describe('commentJson', () => {
       expect(updatedContent).toContain('"preservedObject"');
       expect(updatedContent).toContain('"data": "keep"');
 
-      expect(updatedContent).toContain('// This should be preserved');
+      expect(updatedContent).toContain("// This should be preserved");
     });
   });
 });
diff --git a/packages/ui-gemini/src/utils/commentJson.ts b/packages/ui-gemini/src/utils/commentJson.ts
index f8a38a078..2d15928dc 100644
--- a/packages/ui-gemini/src/utils/commentJson.ts
+++ b/packages/ui-gemini/src/utils/commentJson.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import { parse, stringify } from 'comment-json';
-import { coreEvents } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs";
+import { coreEvents } from "@airiscode/gemini-cli-core";
+import { parse, stringify } from "comment-json";
 
 /**
  * Type representing an object that may contain Symbol keys for comments.
@@ -21,19 +21,19 @@ export function updateSettingsFilePreservingFormat(
   updates: Record<string, unknown>,
 ): void {
   if (!fs.existsSync(filePath)) {
-    fs.writeFileSync(filePath, JSON.stringify(updates, null, 2), 'utf-8');
+    fs.writeFileSync(filePath, JSON.stringify(updates, null, 2), "utf-8");
     return;
   }
 
-  const originalContent = fs.readFileSync(filePath, 'utf-8');
+  const originalContent = fs.readFileSync(filePath, "utf-8");
 
   let parsed: Record<string, unknown>;
   try {
     parsed = parse(originalContent) as Record<string, unknown>;
   } catch (error) {
     coreEvents.emitFeedback(
-      'error',
-      'Error parsing settings file. Please check the JSON syntax.',
+      "error",
+      "Error parsing settings file. Please check the JSON syntax.",
       error,
     );
     return;
@@ -42,7 +42,7 @@ export function updateSettingsFilePreservingFormat(
   const updatedStructure = applyUpdates(parsed, updates);
   const updatedContent = stringify(updatedStructure, null, 2);
 
-  fs.writeFileSync(filePath, updatedContent, 'utf-8');
+  fs.writeFileSync(filePath, updatedContent, "utf-8");
 }
 
 /**
@@ -74,9 +74,7 @@ function preserveCommentsOnPropertyDeletion(
   function appendToSymbol(destSym: symbol, comments: unknown[]) {
     if (!comments || comments.length === 0) return;
     const existing = target[destSym];
-    target[destSym] = Array.isArray(existing)
-      ? existing.concat(comments)
-      : comments;
+    target[destSym] = Array.isArray(existing) ? existing.concat(comments) : comments;
   }
 
   if (beforeComments && beforeComments.length > 0) {
@@ -85,7 +83,7 @@ function preserveCommentsOnPropertyDeletion(
     } else if (prevKey) {
       appendToSymbol(Symbol.for(`after:${prevKey}`), beforeComments);
     } else {
-      appendToSymbol(Symbol.for('before'), beforeComments);
+      appendToSymbol(Symbol.for("before"), beforeComments);
     }
     delete target[beforeSym];
   }
@@ -96,7 +94,7 @@ function preserveCommentsOnPropertyDeletion(
     } else if (prevKey) {
       appendToSymbol(Symbol.for(`after:${prevKey}`), afterComments);
     } else {
-      appendToSymbol(Symbol.for('after'), afterComments);
+      appendToSymbol(Symbol.for("after"), afterComments);
     }
     delete target[afterSym];
   }
@@ -109,12 +107,9 @@ function preserveCommentsOnPropertyDeletion(
  * - Recursively applies to nested objects
  * - Preserves comments when deleting keys
  */
-function applyKeyDiff(
-  base: Record<string, unknown>,
-  desired: Record<string, unknown>,
-): void {
+function applyKeyDiff(base: Record<string, unknown>, desired: Record<string, unknown>): void {
   for (const existingKey of Object.getOwnPropertyNames(base)) {
-    if (!Object.prototype.hasOwnProperty.call(desired, existingKey)) {
+    if (!Object.hasOwn(desired, existingKey)) {
       preserveCommentsOnPropertyDeletion(base, existingKey);
       delete base[existingKey];
     }
@@ -124,22 +119,13 @@ function applyKeyDiff(
     const nextVal = desired[nextKey];
     const baseVal = base[nextKey];
 
-    const isObj =
-      typeof nextVal === 'object' &&
-      nextVal !== null &&
-      !Array.isArray(nextVal);
-    const isBaseObj =
-      typeof baseVal === 'object' &&
-      baseVal !== null &&
-      !Array.isArray(baseVal);
+    const isObj = typeof nextVal === "object" && nextVal !== null && !Array.isArray(nextVal);
+    const isBaseObj = typeof baseVal === "object" && baseVal !== null && !Array.isArray(baseVal);
     const isArr = Array.isArray(nextVal);
     const isBaseArr = Array.isArray(baseVal);
 
     if (isObj && isBaseObj) {
-      applyKeyDiff(
-        baseVal as Record<string, unknown>,
-        nextVal as Record<string, unknown>,
-      );
+      applyKeyDiff(baseVal as Record<string, unknown>, nextVal as Record<string, unknown>);
     } else if (isArr && isBaseArr) {
       // In-place mutate arrays to preserve array-level comments on CommentArray
       const baseArr = baseVal as unknown[];
diff --git a/packages/ui-gemini/src/utils/deepMerge.test.ts b/packages/ui-gemini/src/utils/deepMerge.test.ts
index bc2e77140..2f03b2e48 100644
--- a/packages/ui-gemini/src/utils/deepMerge.test.ts
+++ b/packages/ui-gemini/src/utils/deepMerge.test.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { customDeepMerge } from './deepMerge.js';
-import { MergeStrategy } from '../config/settingsSchema.js';
+import { describe, expect, it } from "vitest";
+import { MergeStrategy } from "../config/settingsSchema.js";
+import { customDeepMerge } from "./deepMerge.js";
 
-describe('customDeepMerge', () => {
-  it('should merge simple objects', () => {
+describe("customDeepMerge", () => {
+  it("should merge simple objects", () => {
     const target = { a: 1, b: 2 };
     const source = { b: 3, c: 4 };
     const getMergeStrategy = () => undefined;
@@ -17,7 +17,7 @@ describe('customDeepMerge', () => {
     expect(result).toEqual({ a: 1, b: 3, c: 4 });
   });
 
-  it('should merge nested objects', () => {
+  it("should merge nested objects", () => {
     const target = { a: { x: 1 }, b: 2 };
     const source = { a: { y: 2 }, c: 3 };
     const getMergeStrategy = () => undefined;
@@ -25,7 +25,7 @@ describe('customDeepMerge', () => {
     expect(result).toEqual({ a: { x: 1, y: 2 }, b: 2, c: 3 });
   });
 
-  it('should replace arrays by default', () => {
+  it("should replace arrays by default", () => {
     const target = { a: [1, 2] };
     const source = { a: [3, 4] };
     const getMergeStrategy = () => undefined;
@@ -33,35 +33,35 @@ describe('customDeepMerge', () => {
     expect(result).toEqual({ a: [3, 4] });
   });
 
-  it('should concatenate arrays with CONCAT strategy', () => {
+  it("should concatenate arrays with CONCAT strategy", () => {
     const target = { a: [1, 2] };
     const source = { a: [3, 4] };
     const getMergeStrategy = (path: string[]) =>
-      path.join('.') === 'a' ? MergeStrategy.CONCAT : undefined;
+      path.join(".") === "a" ? MergeStrategy.CONCAT : undefined;
     const result = customDeepMerge(getMergeStrategy, target, source);
     expect(result).toEqual({ a: [1, 2, 3, 4] });
   });
 
-  it('should union arrays with UNION strategy', () => {
+  it("should union arrays with UNION strategy", () => {
     const target = { a: [1, 2, 3] };
     const source = { a: [3, 4, 5] };
     const getMergeStrategy = (path: string[]) =>
-      path.join('.') === 'a' ? MergeStrategy.UNION : undefined;
+      path.join(".") === "a" ? MergeStrategy.UNION : undefined;
     const result = customDeepMerge(getMergeStrategy, target, source);
     expect(result).toEqual({ a: [1, 2, 3, 4, 5] });
   });
 
-  it('should shallow merge objects with SHALLOW_MERGE strategy', () => {
+  it("should shallow merge objects with SHALLOW_MERGE strategy", () => {
     const target = { a: { x: 1, y: 1 } };
     const source = { a: { y: 2, z: 2 } };
     const getMergeStrategy = (path: string[]) =>
-      path.join('.') === 'a' ? MergeStrategy.SHALLOW_MERGE : undefined;
+      path.join(".") === "a" ? MergeStrategy.SHALLOW_MERGE : undefined;
     const result = customDeepMerge(getMergeStrategy, target, source);
     // This is still a deep merge, but the properties of the object are merged.
     expect(result).toEqual({ a: { x: 1, y: 2, z: 2 } });
   });
 
-  it('should handle multiple source objects', () => {
+  it("should handle multiple source objects", () => {
     const target = { a: 1 };
     const source1 = { b: 2 };
     const source2 = { c: 3 };
@@ -70,13 +70,13 @@ describe('customDeepMerge', () => {
     expect(result).toEqual({ a: 1, b: 2, c: 3 });
   });
 
-  it('should return an empty object if no sources are provided', () => {
+  it("should return an empty object if no sources are provided", () => {
     const getMergeStrategy = () => undefined;
     const result = customDeepMerge(getMergeStrategy);
     expect(result).toEqual({});
   });
 
-  it('should return a deep copy of the first source if only one is provided', () => {
+  it("should return a deep copy of the first source if only one is provided", () => {
     const target = { a: { b: 1 } };
     const getMergeStrategy = () => undefined;
     const result = customDeepMerge(getMergeStrategy, target);
@@ -84,7 +84,7 @@ describe('customDeepMerge', () => {
     expect(result).not.toBe(target);
   });
 
-  it('should not mutate the original source objects', () => {
+  it("should not mutate the original source objects", () => {
     const target = { a: { x: 1 }, b: [1, 2] };
     const source = { a: { y: 2 }, b: [3, 4] };
     const originalTarget = JSON.parse(JSON.stringify(target));
@@ -97,9 +97,9 @@ describe('customDeepMerge', () => {
     expect(source).toEqual(originalSource);
   });
 
-  it('should not mutate sources when merging multiple levels deep', () => {
-    const s1 = { data: { common: { val: 'from s1' }, s1_only: true } };
-    const s2 = { data: { common: { val: 'from s2' }, s2_only: true } };
+  it("should not mutate sources when merging multiple levels deep", () => {
+    const s1 = { data: { common: { val: "from s1" }, s1_only: true } };
+    const s2 = { data: { common: { val: "from s2" }, s2_only: true } };
     const s1_original = JSON.parse(JSON.stringify(s1));
     const s2_original = JSON.parse(JSON.stringify(s2));
 
@@ -110,14 +110,14 @@ describe('customDeepMerge', () => {
     expect(s2).toEqual(s2_original);
     expect(result).toEqual({
       data: {
-        common: { val: 'from s2' },
+        common: { val: "from s2" },
         s1_only: true,
         s2_only: true,
       },
     });
   });
 
-  it('should handle complex nested strategies', () => {
+  it("should handle complex nested strategies", () => {
     const target = {
       level1: {
         arr1: [1, 2],
@@ -133,10 +133,10 @@ describe('customDeepMerge', () => {
       },
     };
     const getMergeStrategy = (path: string[]) => {
-      const p = path.join('.');
-      if (p === 'level1.arr1') return MergeStrategy.CONCAT;
-      if (p === 'level1.arr2') return MergeStrategy.UNION;
-      if (p === 'level1.obj1') return MergeStrategy.SHALLOW_MERGE;
+      const p = path.join(".");
+      if (p === "level1.arr1") return MergeStrategy.CONCAT;
+      if (p === "level1.arr2") return MergeStrategy.UNION;
+      if (p === "level1.obj1") return MergeStrategy.SHALLOW_MERGE;
       return undefined;
     };
 
@@ -151,7 +151,7 @@ describe('customDeepMerge', () => {
     });
   });
 
-  it('should not pollute the prototype', () => {
+  it("should not pollute the prototype", () => {
     const maliciousSource = JSON.parse('{"__proto__": {"polluted": "true"}}');
     const getMergeStrategy = () => undefined;
     const result = customDeepMerge(getMergeStrategy, {}, maliciousSource);
@@ -161,28 +161,28 @@ describe('customDeepMerge', () => {
     expect(({} as any).polluted).toBeUndefined();
   });
 
-  it('should use additionalProperties merge strategy for dynamic properties', () => {
+  it("should use additionalProperties merge strategy for dynamic properties", () => {
     // Simulates how hooks work: hooks.disabled uses UNION, but hooks.BeforeTool (dynamic) uses CONCAT
     const target = {
       hooks: {
-        BeforeTool: [{ command: 'user-hook-1' }, { command: 'user-hook-2' }],
-        disabled: ['hook-a'],
+        BeforeTool: [{ command: "user-hook-1" }, { command: "user-hook-2" }],
+        disabled: ["hook-a"],
       },
     };
     const source = {
       hooks: {
-        BeforeTool: [{ command: 'workspace-hook-1' }],
-        disabled: ['hook-b'],
+        BeforeTool: [{ command: "workspace-hook-1" }],
+        disabled: ["hook-b"],
       },
     };
 
     // Mock the getMergeStrategyForPath behavior for hooks
     const getMergeStrategy = (path: string[]) => {
-      const p = path.join('.');
+      const p = path.join(".");
       // hooks.disabled uses UNION strategy (explicitly defined in schema)
-      if (p === 'hooks.disabled') return MergeStrategy.UNION;
+      if (p === "hooks.disabled") return MergeStrategy.UNION;
       // hooks.BeforeTool uses CONCAT strategy (via additionalProperties)
-      if (p === 'hooks.BeforeTool') return MergeStrategy.CONCAT;
+      if (p === "hooks.BeforeTool") return MergeStrategy.CONCAT;
       return undefined;
     };
 
@@ -190,13 +190,13 @@ describe('customDeepMerge', () => {
 
     // BeforeTool should concatenate
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    expect((result as any)['hooks']['BeforeTool']).toEqual([
-      { command: 'user-hook-1' },
-      { command: 'user-hook-2' },
-      { command: 'workspace-hook-1' },
+    expect((result as any)["hooks"]["BeforeTool"]).toEqual([
+      { command: "user-hook-1" },
+      { command: "user-hook-2" },
+      { command: "workspace-hook-1" },
     ]);
     // disabled should union (deduplicate)
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    expect((result as any)['hooks']['disabled']).toEqual(['hook-a', 'hook-b']);
+    expect((result as any)["hooks"]["disabled"]).toEqual(["hook-a", "hook-b"]);
   });
 });
diff --git a/packages/ui-gemini/src/utils/deepMerge.ts b/packages/ui-gemini/src/utils/deepMerge.ts
index 85200ddba..b0867858a 100644
--- a/packages/ui-gemini/src/utils/deepMerge.ts
+++ b/packages/ui-gemini/src/utils/deepMerge.ts
@@ -4,21 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { MergeStrategy } from '../config/settingsSchema.js';
+import { MergeStrategy } from "../config/settingsSchema.js";
 
-export type Mergeable =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | object
-  | Mergeable[];
+export type Mergeable = string | number | boolean | null | undefined | object | Mergeable[];
 
 export type MergeableObject = Record<string, Mergeable>;
 
 function isPlainObject(item: unknown): item is MergeableObject {
-  return !!item && typeof item === 'object' && !Array.isArray(item);
+  return !!item && typeof item === "object" && !Array.isArray(item);
 }
 
 function mergeRecursively(
@@ -28,7 +21,7 @@ function mergeRecursively(
   path: string[] = [],
 ) {
   for (const key of Object.keys(source)) {
-    if (key === '__proto__' || key === 'constructor' || key === 'prototype') {
+    if (key === "__proto__" || key === "constructor" || key === "prototype") {
       continue;
     }
     const newPath = [...path, key];
@@ -37,10 +30,8 @@ function mergeRecursively(
     const mergeStrategy = getMergeStrategyForPath(newPath);
 
     if (mergeStrategy === MergeStrategy.SHALLOW_MERGE && objValue && srcValue) {
-      const obj1 =
-        typeof objValue === 'object' && objValue !== null ? objValue : {};
-      const obj2 =
-        typeof srcValue === 'object' && srcValue !== null ? srcValue : {};
+      const obj1 = typeof objValue === "object" && objValue !== null ? objValue : {};
+      const obj2 = typeof srcValue === "object" && srcValue !== null ? srcValue : {};
       target[key] = { ...obj1, ...obj2 };
       continue;
     }
@@ -61,12 +52,7 @@ function mergeRecursively(
       mergeRecursively(objValue, srcValue, getMergeStrategyForPath, newPath);
     } else if (isPlainObject(srcValue)) {
       target[key] = {};
-      mergeRecursively(
-        target[key] as MergeableObject,
-        srcValue,
-        getMergeStrategyForPath,
-        newPath,
-      );
+      mergeRecursively(target[key] as MergeableObject, srcValue, getMergeStrategyForPath, newPath);
     } else {
       target[key] = srcValue;
     }
diff --git a/packages/ui-gemini/src/utils/dialogScopeUtils.test.ts b/packages/ui-gemini/src/utils/dialogScopeUtils.test.ts
index a2032bda6..32611a630 100644
--- a/packages/ui-gemini/src/utils/dialogScopeUtils.test.ts
+++ b/packages/ui-gemini/src/utils/dialogScopeUtils.test.ts
@@ -4,46 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { SettingScope } from '../config/settings.js';
-import type { LoadedSettings } from '../config/settings.js';
-import {
-  getScopeItems,
-  getScopeMessageForSetting,
-} from './dialogScopeUtils.js';
-import { settingExistsInScope } from './settingsUtils.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../config/settings.js";
+import { SettingScope } from "../config/settings.js";
+import { getScopeItems, getScopeMessageForSetting } from "./dialogScopeUtils.js";
+import { settingExistsInScope } from "./settingsUtils.js";
 
-vi.mock('../config/settings', () => ({
+vi.mock("../config/settings", () => ({
   SettingScope: {
-    User: 'user',
-    Workspace: 'workspace',
-    System: 'system',
+    User: "user",
+    Workspace: "workspace",
+    System: "system",
   },
-  isLoadableSettingScope: (scope: string) =>
-    ['user', 'workspace', 'system'].includes(scope),
+  isLoadableSettingScope: (scope: string) => ["user", "workspace", "system"].includes(scope),
 }));
 
-vi.mock('./settingsUtils', () => ({
+vi.mock("./settingsUtils", () => ({
   settingExistsInScope: vi.fn(),
 }));
 
-describe('dialogScopeUtils', () => {
+describe("dialogScopeUtils", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  describe('getScopeItems', () => {
-    it('should return scope items with correct labels and values', () => {
+  describe("getScopeItems", () => {
+    it("should return scope items with correct labels and values", () => {
       const items = getScopeItems();
       expect(items).toEqual([
-        { label: 'User Settings', value: SettingScope.User },
-        { label: 'Workspace Settings', value: SettingScope.Workspace },
-        { label: 'System Settings', value: SettingScope.System },
+        { label: "User Settings", value: SettingScope.User },
+        { label: "Workspace Settings", value: SettingScope.Workspace },
+        { label: "System Settings", value: SettingScope.System },
       ]);
     });
   });
 
-  describe('getScopeMessageForSetting', () => {
+  describe("getScopeMessageForSetting", () => {
     let mockSettings: { forScope: ReturnType<typeof vi.fn> };
 
     beforeEach(() => {
@@ -52,21 +48,21 @@ describe('dialogScopeUtils', () => {
       };
     });
 
-    it('should return empty string if not modified in other scopes', () => {
+    it("should return empty string if not modified in other scopes", () => {
       vi.mocked(settingExistsInScope).mockReturnValue(false);
       const message = getScopeMessageForSetting(
-        'key',
+        "key",
         SettingScope.User,
         mockSettings as unknown as LoadedSettings,
       );
-      expect(message).toBe('');
+      expect(message).toBe("");
     });
 
-    it('should return message indicating modification in other scopes', () => {
+    it("should return message indicating modification in other scopes", () => {
       vi.mocked(settingExistsInScope).mockReturnValue(true);
 
       const message = getScopeMessageForSetting(
-        'key',
+        "key",
         SettingScope.User,
         mockSettings as unknown as LoadedSettings,
       );
@@ -75,34 +71,31 @@ describe('dialogScopeUtils', () => {
       expect(message).toMatch(/system/);
     });
 
-    it('should return message indicating modification in other scopes but not current', () => {
-      const workspaceSettings = { scope: 'workspace' };
-      const systemSettings = { scope: 'system' };
-      const userSettings = { scope: 'user' };
+    it("should return message indicating modification in other scopes but not current", () => {
+      const workspaceSettings = { scope: "workspace" };
+      const systemSettings = { scope: "system" };
+      const userSettings = { scope: "user" };
 
       mockSettings.forScope.mockImplementation((scope: string) => {
-        if (scope === SettingScope.Workspace)
-          return { settings: workspaceSettings };
+        if (scope === SettingScope.Workspace) return { settings: workspaceSettings };
         if (scope === SettingScope.System) return { settings: systemSettings };
         if (scope === SettingScope.User) return { settings: userSettings };
         return { settings: {} };
       });
 
-      vi.mocked(settingExistsInScope).mockImplementation(
-        (_key, settings: unknown) => {
-          if (settings === workspaceSettings) return true;
-          if (settings === systemSettings) return false;
-          if (settings === userSettings) return false;
-          return false;
-        },
-      );
+      vi.mocked(settingExistsInScope).mockImplementation((_key, settings: unknown) => {
+        if (settings === workspaceSettings) return true;
+        if (settings === systemSettings) return false;
+        if (settings === userSettings) return false;
+        return false;
+      });
 
       const message = getScopeMessageForSetting(
-        'key',
+        "key",
         SettingScope.User,
         mockSettings as unknown as LoadedSettings,
       );
-      expect(message).toBe('(Modified in workspace)');
+      expect(message).toBe("(Modified in workspace)");
     });
   });
 });
diff --git a/packages/ui-gemini/src/utils/dialogScopeUtils.ts b/packages/ui-gemini/src/utils/dialogScopeUtils.ts
index ccf93b6a6..db0ec931e 100644
--- a/packages/ui-gemini/src/utils/dialogScopeUtils.ts
+++ b/packages/ui-gemini/src/utils/dialogScopeUtils.ts
@@ -4,20 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  LoadableSettingScope,
-  LoadedSettings,
-} from '../config/settings.js';
-import { isLoadableSettingScope, SettingScope } from '../config/settings.js';
-import { settingExistsInScope } from './settingsUtils.js';
+import type { LoadableSettingScope, LoadedSettings } from "../config/settings.js";
+import { isLoadableSettingScope, SettingScope } from "../config/settings.js";
+import { settingExistsInScope } from "./settingsUtils.js";
 
 /**
  * Shared scope labels for dialog components that need to display setting scopes
  */
 export const SCOPE_LABELS = {
-  [SettingScope.User]: 'User Settings',
-  [SettingScope.Workspace]: 'Workspace Settings',
-  [SettingScope.System]: 'System Settings',
+  [SettingScope.User]: "User Settings",
+  [SettingScope.Workspace]: "Workspace Settings",
+  [SettingScope.System]: "System Settings",
 } as const;
 
 /**
@@ -55,15 +52,12 @@ export function getScopeMessageForSetting(
   });
 
   if (modifiedInOtherScopes.length === 0) {
-    return '';
+    return "";
   }
 
-  const modifiedScopesStr = modifiedInOtherScopes.join(', ');
+  const modifiedScopesStr = modifiedInOtherScopes.join(", ");
   const currentScopeSettings = settings.forScope(selectedScope).settings;
-  const existsInCurrentScope = settingExistsInScope(
-    settingKey,
-    currentScopeSettings,
-  );
+  const existsInCurrentScope = settingExistsInScope(settingKey, currentScopeSettings);
 
   return existsInCurrentScope
     ? `(Also modified in ${modifiedScopesStr})`
diff --git a/packages/ui-gemini/src/utils/envVarResolver.test.ts b/packages/ui-gemini/src/utils/envVarResolver.test.ts
index a45b65b1b..66c2ccae5 100644
--- a/packages/ui-gemini/src/utils/envVarResolver.test.ts
+++ b/packages/ui-gemini/src/utils/envVarResolver.test.ts
@@ -4,13 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import {
-  resolveEnvVarsInString,
-  resolveEnvVarsInObject,
-} from './envVarResolver.js';
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { resolveEnvVarsInObject, resolveEnvVarsInString } from "./envVarResolver.js";
 
-describe('resolveEnvVarsInString', () => {
+describe("resolveEnvVarsInString", () => {
   let originalEnv: NodeJS.ProcessEnv;
 
   beforeEach(() => {
@@ -21,65 +18,65 @@ describe('resolveEnvVarsInString', () => {
     process.env = originalEnv;
   });
 
-  it('should resolve $VAR_NAME format', () => {
-    process.env['TEST_VAR'] = 'test-value';
+  it("should resolve $VAR_NAME format", () => {
+    process.env["TEST_VAR"] = "test-value";
 
-    const result = resolveEnvVarsInString('Value is $TEST_VAR');
+    const result = resolveEnvVarsInString("Value is $TEST_VAR");
 
-    expect(result).toBe('Value is test-value');
+    expect(result).toBe("Value is test-value");
   });
 
-  it('should resolve ${VAR_NAME} format', () => {
-    process.env['TEST_VAR'] = 'test-value';
+  it("should resolve ${VAR_NAME} format", () => {
+    process.env["TEST_VAR"] = "test-value";
 
-    const result = resolveEnvVarsInString('Value is ${TEST_VAR}');
+    const result = resolveEnvVarsInString("Value is ${TEST_VAR}");
 
-    expect(result).toBe('Value is test-value');
+    expect(result).toBe("Value is test-value");
   });
 
-  it('should resolve multiple variables in the same string', () => {
-    process.env['HOST'] = 'localhost';
-    process.env['PORT'] = '3000';
+  it("should resolve multiple variables in the same string", () => {
+    process.env["HOST"] = "localhost";
+    process.env["PORT"] = "3000";
 
-    const result = resolveEnvVarsInString('URL: http://$HOST:${PORT}/api');
+    const result = resolveEnvVarsInString("URL: http://$HOST:${PORT}/api");
 
-    expect(result).toBe('URL: http://localhost:3000/api');
+    expect(result).toBe("URL: http://localhost:3000/api");
   });
 
-  it('should leave undefined variables unchanged', () => {
-    const result = resolveEnvVarsInString('Value is $UNDEFINED_VAR');
+  it("should leave undefined variables unchanged", () => {
+    const result = resolveEnvVarsInString("Value is $UNDEFINED_VAR");
 
-    expect(result).toBe('Value is $UNDEFINED_VAR');
+    expect(result).toBe("Value is $UNDEFINED_VAR");
   });
 
-  it('should leave undefined variables with braces unchanged', () => {
-    const result = resolveEnvVarsInString('Value is ${UNDEFINED_VAR}');
+  it("should leave undefined variables with braces unchanged", () => {
+    const result = resolveEnvVarsInString("Value is ${UNDEFINED_VAR}");
 
-    expect(result).toBe('Value is ${UNDEFINED_VAR}');
+    expect(result).toBe("Value is ${UNDEFINED_VAR}");
   });
 
-  it('should handle empty string', () => {
-    const result = resolveEnvVarsInString('');
+  it("should handle empty string", () => {
+    const result = resolveEnvVarsInString("");
 
-    expect(result).toBe('');
+    expect(result).toBe("");
   });
 
-  it('should handle string without variables', () => {
-    const result = resolveEnvVarsInString('No variables here');
+  it("should handle string without variables", () => {
+    const result = resolveEnvVarsInString("No variables here");
 
-    expect(result).toBe('No variables here');
+    expect(result).toBe("No variables here");
   });
 
-  it('should handle mixed defined and undefined variables', () => {
-    process.env['DEFINED'] = 'value';
+  it("should handle mixed defined and undefined variables", () => {
+    process.env["DEFINED"] = "value";
 
-    const result = resolveEnvVarsInString('$DEFINED and $UNDEFINED mixed');
+    const result = resolveEnvVarsInString("$DEFINED and $UNDEFINED mixed");
 
-    expect(result).toBe('value and $UNDEFINED mixed');
+    expect(result).toBe("value and $UNDEFINED mixed");
   });
 });
 
-describe('resolveEnvVarsInObject', () => {
+describe("resolveEnvVarsInObject", () => {
   let originalEnv: NodeJS.ProcessEnv;
 
   beforeEach(() => {
@@ -90,16 +87,16 @@ describe('resolveEnvVarsInObject', () => {
     process.env = originalEnv;
   });
 
-  it('should resolve variables in nested objects', () => {
-    process.env['API_KEY'] = 'secret-123';
-    process.env['DB_URL'] = 'postgresql://localhost/test';
+  it("should resolve variables in nested objects", () => {
+    process.env["API_KEY"] = "secret-123";
+    process.env["DB_URL"] = "postgresql://localhost/test";
 
     const config = {
       server: {
         auth: {
-          key: '$API_KEY',
+          key: "$API_KEY",
         },
-        database: '${DB_URL}',
+        database: "${DB_URL}",
       },
       port: 3000,
     };
@@ -109,42 +106,42 @@ describe('resolveEnvVarsInObject', () => {
     expect(result).toEqual({
       server: {
         auth: {
-          key: 'secret-123',
+          key: "secret-123",
         },
-        database: 'postgresql://localhost/test',
+        database: "postgresql://localhost/test",
       },
       port: 3000,
     });
   });
 
-  it('should resolve variables in arrays', () => {
-    process.env['ENV'] = 'production';
-    process.env['VERSION'] = '1.0.0';
+  it("should resolve variables in arrays", () => {
+    process.env["ENV"] = "production";
+    process.env["VERSION"] = "1.0.0";
 
     const config = {
-      tags: ['$ENV', 'app', '${VERSION}'],
+      tags: ["$ENV", "app", "${VERSION}"],
       metadata: {
-        env: '$ENV',
+        env: "$ENV",
       },
     };
 
     const result = resolveEnvVarsInObject(config);
 
     expect(result).toEqual({
-      tags: ['production', 'app', '1.0.0'],
+      tags: ["production", "app", "1.0.0"],
       metadata: {
-        env: 'production',
+        env: "production",
       },
     });
   });
 
-  it('should preserve non-string types', () => {
+  it("should preserve non-string types", () => {
     const config = {
       enabled: true,
       count: 42,
       value: null,
       data: undefined,
-      tags: ['item1', 'item2'],
+      tags: ["item1", "item2"],
     };
 
     const result = resolveEnvVarsInObject(config);
@@ -152,20 +149,20 @@ describe('resolveEnvVarsInObject', () => {
     expect(result).toEqual(config);
   });
 
-  it('should handle MCP server config structure', () => {
-    process.env['API_TOKEN'] = 'token-123';
-    process.env['SERVER_PORT'] = '8080';
+  it("should handle MCP server config structure", () => {
+    process.env["API_TOKEN"] = "token-123";
+    process.env["SERVER_PORT"] = "8080";
 
     const extensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
+      name: "test-extension",
+      version: "1.0.0",
       mcpServers: {
-        'test-server': {
-          command: 'node',
-          args: ['server.js', '--port', '${SERVER_PORT}'],
+        "test-server": {
+          command: "node",
+          args: ["server.js", "--port", "${SERVER_PORT}"],
           env: {
-            API_KEY: '$API_TOKEN',
-            STATIC_VALUE: 'unchanged',
+            API_KEY: "$API_TOKEN",
+            STATIC_VALUE: "unchanged",
           },
           timeout: 5000,
         },
@@ -175,15 +172,15 @@ describe('resolveEnvVarsInObject', () => {
     const result = resolveEnvVarsInObject(extensionConfig);
 
     expect(result).toEqual({
-      name: 'test-extension',
-      version: '1.0.0',
+      name: "test-extension",
+      version: "1.0.0",
       mcpServers: {
-        'test-server': {
-          command: 'node',
-          args: ['server.js', '--port', '8080'],
+        "test-server": {
+          command: "node",
+          args: ["server.js", "--port", "8080"],
           env: {
-            API_KEY: 'token-123',
-            STATIC_VALUE: 'unchanged',
+            API_KEY: "token-123",
+            STATIC_VALUE: "unchanged",
           },
           timeout: 5000,
         },
@@ -191,9 +188,9 @@ describe('resolveEnvVarsInObject', () => {
     });
   });
 
-  it('should handle empty and null values', () => {
+  it("should handle empty and null values", () => {
     const config = {
-      empty: '',
+      empty: "",
       nullValue: null,
       undefinedValue: undefined,
       zero: 0,
@@ -205,8 +202,8 @@ describe('resolveEnvVarsInObject', () => {
     expect(result).toEqual(config);
   });
 
-  it('should handle circular references in objects without infinite recursion', () => {
-    process.env['TEST_VAR'] = 'resolved-value';
+  it("should handle circular references in objects without infinite recursion", () => {
+    process.env["TEST_VAR"] = "resolved-value";
 
     type ConfigWithCircularRef = {
       name: string;
@@ -215,7 +212,7 @@ describe('resolveEnvVarsInObject', () => {
     };
 
     const config: ConfigWithCircularRef = {
-      name: '$TEST_VAR',
+      name: "$TEST_VAR",
       value: 42,
     };
     // Create circular reference
@@ -223,37 +220,37 @@ describe('resolveEnvVarsInObject', () => {
 
     const result = resolveEnvVarsInObject(config);
 
-    expect(result.name).toBe('resolved-value');
+    expect(result.name).toBe("resolved-value");
     expect(result.value).toBe(42);
     expect(result.self).toBeDefined();
-    expect(result.self?.name).toBe('$TEST_VAR'); // Circular reference should be shallow copied
+    expect(result.self?.name).toBe("$TEST_VAR"); // Circular reference should be shallow copied
     expect(result.self?.value).toBe(42);
     // Verify it doesn't create infinite recursion by checking it's not the same object
     expect(result.self).not.toBe(result);
   });
 
-  it('should handle circular references in arrays without infinite recursion', () => {
-    process.env['ARRAY_VAR'] = 'array-value';
+  it("should handle circular references in arrays without infinite recursion", () => {
+    process.env["ARRAY_VAR"] = "array-value";
 
     type ArrayWithCircularRef = Array<string | number | ArrayWithCircularRef>;
-    const arr: ArrayWithCircularRef = ['$ARRAY_VAR', 123];
+    const arr: ArrayWithCircularRef = ["$ARRAY_VAR", 123];
     // Create circular reference
     arr.push(arr);
 
     const result = resolveEnvVarsInObject(arr) as ArrayWithCircularRef;
 
-    expect(result[0]).toBe('array-value');
+    expect(result[0]).toBe("array-value");
     expect(result[1]).toBe(123);
     expect(Array.isArray(result[2])).toBe(true);
     const subArray = result[2] as ArrayWithCircularRef;
-    expect(subArray[0]).toBe('$ARRAY_VAR'); // Circular reference should be shallow copied
+    expect(subArray[0]).toBe("$ARRAY_VAR"); // Circular reference should be shallow copied
     expect(subArray[1]).toBe(123);
     // Verify it doesn't create infinite recursion
     expect(result[2]).not.toBe(result);
   });
 
-  it('should handle complex nested circular references', () => {
-    process.env['NESTED_VAR'] = 'nested-resolved';
+  it("should handle complex nested circular references", () => {
+    process.env["NESTED_VAR"] = "nested-resolved";
 
     type ObjWithRef = {
       name: string;
@@ -261,8 +258,8 @@ describe('resolveEnvVarsInObject', () => {
       ref?: ObjWithRef;
     };
 
-    const obj1: ObjWithRef = { name: '$NESTED_VAR', id: 1 };
-    const obj2: ObjWithRef = { name: 'static', id: 2 };
+    const obj1: ObjWithRef = { name: "$NESTED_VAR", id: 1 };
+    const obj2: ObjWithRef = { name: "static", id: 2 };
 
     // Create cross-references
     obj1.ref = obj2;
@@ -271,22 +268,22 @@ describe('resolveEnvVarsInObject', () => {
     const config = {
       primary: obj1,
       secondary: obj2,
-      value: '$NESTED_VAR',
+      value: "$NESTED_VAR",
     };
 
     const result = resolveEnvVarsInObject(config);
 
-    expect(result.value).toBe('nested-resolved');
-    expect(result.primary.name).toBe('nested-resolved');
+    expect(result.value).toBe("nested-resolved");
+    expect(result.primary.name).toBe("nested-resolved");
     expect(result.primary.id).toBe(1);
-    expect(result.secondary.name).toBe('static');
+    expect(result.secondary.name).toBe("static");
     expect(result.secondary.id).toBe(2);
 
     // Check that circular references are handled (shallow copied)
     expect(result.primary.ref).toBeDefined();
     expect(result.secondary.ref).toBeDefined();
-    expect(result.primary.ref?.name).toBe('static'); // Should be shallow copy
-    expect(result.secondary.ref?.name).toBe('nested-resolved'); // The shallow copy still gets processed
+    expect(result.primary.ref?.name).toBe("static"); // Should be shallow copy
+    expect(result.secondary.ref?.name).toBe("nested-resolved"); // The shallow copy still gets processed
 
     // Most importantly: verify no infinite recursion by checking objects are different
     expect(result.primary.ref).not.toBe(result.secondary);
diff --git a/packages/ui-gemini/src/utils/envVarResolver.ts b/packages/ui-gemini/src/utils/envVarResolver.ts
index 7374024e9..42310fdd1 100644
--- a/packages/ui-gemini/src/utils/envVarResolver.ts
+++ b/packages/ui-gemini/src/utils/envVarResolver.ts
@@ -17,17 +17,14 @@
  * resolveEnvVarsInString("URL: ${BASE_URL}/api") // Returns "URL: https://api.example.com/api"
  * resolveEnvVarsInString("Missing: $UNDEFINED_VAR") // Returns "Missing: $UNDEFINED_VAR"
  */
-export function resolveEnvVarsInString(
-  value: string,
-  customEnv?: Record<string, string>,
-): string {
+export function resolveEnvVarsInString(value: string, customEnv?: Record<string, string>): string {
   const envVarRegex = /\$(?:(\w+)|{([^}]+)})/g; // Find $VAR_NAME or ${VAR_NAME}
   return value.replace(envVarRegex, (match, varName1, varName2) => {
     const varName = varName1 || varName2;
-    if (customEnv && typeof customEnv[varName] === 'string') {
+    if (customEnv && typeof customEnv[varName] === "string") {
       return customEnv[varName]!;
     }
-    if (process && process.env && typeof process.env[varName] === 'string') {
+    if (process && process.env && typeof process.env[varName] === "string") {
       return process.env[varName]!;
     }
     return match;
@@ -53,10 +50,7 @@ export function resolveEnvVarsInString(
  * };
  * const resolved = resolveEnvVarsInObject(config);
  */
-export function resolveEnvVarsInObject<T>(
-  obj: T,
-  customEnv?: Record<string, string>,
-): T {
+export function resolveEnvVarsInObject<T>(obj: T, customEnv?: Record<string, string>): T {
   return resolveEnvVarsInObjectInternal(obj, new WeakSet(), customEnv);
 }
 
@@ -72,16 +66,11 @@ function resolveEnvVarsInObjectInternal<T>(
   visited: WeakSet<object>,
   customEnv?: Record<string, string>,
 ): T {
-  if (
-    obj === null ||
-    obj === undefined ||
-    typeof obj === 'boolean' ||
-    typeof obj === 'number'
-  ) {
+  if (obj === null || obj === undefined || typeof obj === "boolean" || typeof obj === "number") {
     return obj;
   }
 
-  if (typeof obj === 'string') {
+  if (typeof obj === "string") {
     return resolveEnvVarsInString(obj, customEnv) as unknown as T;
   }
 
@@ -100,7 +89,7 @@ function resolveEnvVarsInObjectInternal<T>(
     return result;
   }
 
-  if (typeof obj === 'object') {
+  if (typeof obj === "object") {
     // Check for circular reference
     if (visited.has(obj as object)) {
       // Return a shallow copy to break the cycle
@@ -110,12 +99,8 @@ function resolveEnvVarsInObjectInternal<T>(
     visited.add(obj as object);
     const newObj = { ...obj } as T;
     for (const key in newObj) {
-      if (Object.prototype.hasOwnProperty.call(newObj, key)) {
-        newObj[key] = resolveEnvVarsInObjectInternal(
-          newObj[key],
-          visited,
-          customEnv,
-        );
+      if (Object.hasOwn(newObj, key)) {
+        newObj[key] = resolveEnvVarsInObjectInternal(newObj[key], visited, customEnv);
       }
     }
     visited.delete(obj as object);
diff --git a/packages/ui-gemini/src/utils/errors.test.ts b/packages/ui-gemini/src/utils/errors.test.ts
index b851881b4..bd04a71f2 100644
--- a/packages/ui-gemini/src/utils/errors.test.ts
+++ b/packages/ui-gemini/src/utils/errors.test.ts
@@ -4,21 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, type MockInstance } from 'vitest';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { OutputFormat, FatalInputError } from '@airiscode/gemini-cli-core';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { FatalInputError, OutputFormat } from "@airiscode/gemini-cli-core";
+import { type MockInstance, vi } from "vitest";
 import {
   getErrorMessage,
-  handleError,
-  handleToolError,
   handleCancellationError,
+  handleError,
   handleMaxTurnsExceededError,
-} from './errors.js';
+  handleToolError,
+} from "./errors.js";
 
 // Mock the core modules
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const original = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
 
   return {
     ...original,
@@ -29,20 +28,19 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
       return `API Error: ${String(error)}`;
     }),
     JsonFormatter: vi.fn().mockImplementation(() => ({
-      formatError: vi.fn(
-        (error: Error, code?: string | number, sessionId?: string) =>
-          JSON.stringify(
-            {
-              ...(sessionId && { session_id: sessionId }),
-              error: {
-                type: error.constructor.name,
-                message: error.message,
-                ...(code && { code }),
-              },
+      formatError: vi.fn((error: Error, code?: string | number, sessionId?: string) =>
+        JSON.stringify(
+          {
+            ...(sessionId && { session_id: sessionId }),
+            error: {
+              type: error.constructor.name,
+              message: error.message,
+              ...(code && { code }),
             },
-            null,
-            2,
-          ),
+          },
+          null,
+          2,
+        ),
       ),
     })),
     StreamJsonFormatter: vi.fn().mockImplementation(() => ({
@@ -53,12 +51,12 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
       getMetrics: vi.fn().mockReturnValue({}),
     },
     JsonStreamEventType: {
-      RESULT: 'result',
+      RESULT: "result",
     },
     FatalToolExecutionError: class extends Error {
       constructor(message: string) {
         super(message);
-        this.name = 'FatalToolExecutionError';
+        this.name = "FatalToolExecutionError";
         this.exitCode = 54;
       }
       exitCode: number;
@@ -66,7 +64,7 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
     FatalCancellationError: class extends Error {
       constructor(message: string) {
         super(message);
-        this.name = 'FatalCancellationError';
+        this.name = "FatalCancellationError";
         this.exitCode = 130;
       }
       exitCode: number;
@@ -74,29 +72,29 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
   };
 });
 
-describe('errors', () => {
+describe("errors", () => {
   let mockConfig: Config;
   let processExitSpy: MockInstance;
   let consoleErrorSpy: MockInstance;
 
-  const TEST_SESSION_ID = 'test-session-123';
+  const TEST_SESSION_ID = "test-session-123";
 
   beforeEach(() => {
     // Reset mocks
     vi.clearAllMocks();
 
     // Mock console.error
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     // Mock process.exit to throw instead of actually exiting
-    processExitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
+    processExitSpy = vi.spyOn(process, "exit").mockImplementation((code) => {
       throw new Error(`process.exit called with code: ${code}`);
     });
 
     // Create mock config
     mockConfig = {
       getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
-      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'test' }),
+      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: "test" }),
       getSessionId: vi.fn().mockReturnValue(TEST_SESSION_ID),
     } as unknown as Config;
   });
@@ -106,75 +104,71 @@ describe('errors', () => {
     processExitSpy.mockRestore();
   });
 
-  describe('getErrorMessage', () => {
-    it('should return error message for Error instances', () => {
-      const error = new Error('Test error message');
-      expect(getErrorMessage(error)).toBe('Test error message');
+  describe("getErrorMessage", () => {
+    it("should return error message for Error instances", () => {
+      const error = new Error("Test error message");
+      expect(getErrorMessage(error)).toBe("Test error message");
     });
 
-    it('should convert non-Error values to strings', () => {
-      expect(getErrorMessage('string error')).toBe('string error');
-      expect(getErrorMessage(123)).toBe('123');
-      expect(getErrorMessage(null)).toBe('null');
-      expect(getErrorMessage(undefined)).toBe('undefined');
+    it("should convert non-Error values to strings", () => {
+      expect(getErrorMessage("string error")).toBe("string error");
+      expect(getErrorMessage(123)).toBe("123");
+      expect(getErrorMessage(null)).toBe("null");
+      expect(getErrorMessage(undefined)).toBe("undefined");
     });
 
-    it('should handle objects', () => {
-      const obj = { message: 'test' };
-      expect(getErrorMessage(obj)).toBe('[object Object]');
+    it("should handle objects", () => {
+      const obj = { message: "test" };
+      expect(getErrorMessage(obj)).toBe("[object Object]");
     });
   });
 
-  describe('handleError', () => {
-    describe('in text mode', () => {
+  describe("handleError", () => {
+    describe("in text mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.TEXT);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.TEXT);
       });
 
-      it('should log error message and re-throw', () => {
-        const testError = new Error('Test error');
+      it("should log error message and re-throw", () => {
+        const testError = new Error("Test error");
 
         expect(() => {
           handleError(testError, mockConfig);
         }).toThrow(testError);
 
-        expect(consoleErrorSpy).toHaveBeenCalledWith('API Error: Test error');
+        expect(consoleErrorSpy).toHaveBeenCalledWith("API Error: Test error");
       });
 
-      it('should handle non-Error objects', () => {
-        const testError = 'String error';
+      it("should handle non-Error objects", () => {
+        const testError = "String error";
 
         expect(() => {
           handleError(testError, mockConfig);
         }).toThrow(testError);
 
-        expect(consoleErrorSpy).toHaveBeenCalledWith('API Error: String error');
+        expect(consoleErrorSpy).toHaveBeenCalledWith("API Error: String error");
       });
     });
 
-    describe('in JSON mode', () => {
+    describe("in JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.JSON);
       });
 
-      it('should format error as JSON and exit with default code', () => {
-        const testError = new Error('Test error');
+      it("should format error as JSON and exit with default code", () => {
+        const testError = new Error("Test error");
 
         expect(() => {
           handleError(testError, mockConfig);
-        }).toThrow('process.exit called with code: 1');
+        }).toThrow("process.exit called with code: 1");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
           JSON.stringify(
             {
               session_id: TEST_SESSION_ID,
               error: {
-                type: 'Error',
-                message: 'Test error',
+                type: "Error",
+                message: "Test error",
                 code: 1,
               },
             },
@@ -184,20 +178,20 @@ describe('errors', () => {
         );
       });
 
-      it('should use custom error code when provided', () => {
-        const testError = new Error('Test error');
+      it("should use custom error code when provided", () => {
+        const testError = new Error("Test error");
 
         expect(() => {
           handleError(testError, mockConfig, 42);
-        }).toThrow('process.exit called with code: 42');
+        }).toThrow("process.exit called with code: 42");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
           JSON.stringify(
             {
               session_id: TEST_SESSION_ID,
               error: {
-                type: 'Error',
-                message: 'Test error',
+                type: "Error",
+                message: "Test error",
                 code: 42,
               },
             },
@@ -207,20 +201,20 @@ describe('errors', () => {
         );
       });
 
-      it('should extract exitCode from FatalError instances', () => {
-        const fatalError = new FatalInputError('Fatal error');
+      it("should extract exitCode from FatalError instances", () => {
+        const fatalError = new FatalInputError("Fatal error");
 
         expect(() => {
           handleError(fatalError, mockConfig);
-        }).toThrow('process.exit called with code: 42');
+        }).toThrow("process.exit called with code: 42");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
           JSON.stringify(
             {
               session_id: TEST_SESSION_ID,
               error: {
-                type: 'FatalInputError',
-                message: 'Fatal error',
+                type: "FatalInputError",
+                message: "Fatal error",
                 code: 42,
               },
             },
@@ -230,35 +224,35 @@ describe('errors', () => {
         );
       });
 
-      it('should handle error with code property', () => {
-        const errorWithCode = new Error('Error with code') as Error & {
+      it("should handle error with code property", () => {
+        const errorWithCode = new Error("Error with code") as Error & {
           code: number;
         };
         errorWithCode.code = 404;
 
         expect(() => {
           handleError(errorWithCode, mockConfig);
-        }).toThrow('process.exit called with code: 404');
+        }).toThrow("process.exit called with code: 404");
       });
 
-      it('should handle error with status property', () => {
-        const errorWithStatus = new Error('Error with status') as Error & {
+      it("should handle error with status property", () => {
+        const errorWithStatus = new Error("Error with status") as Error & {
           status: string;
         };
-        errorWithStatus.status = 'TIMEOUT';
+        errorWithStatus.status = "TIMEOUT";
 
         expect(() => {
           handleError(errorWithStatus, mockConfig);
-        }).toThrow('process.exit called with code: 1'); // string codes become 1
+        }).toThrow("process.exit called with code: 1"); // string codes become 1
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
           JSON.stringify(
             {
               session_id: TEST_SESSION_ID,
               error: {
-                type: 'Error',
-                message: 'Error with status',
-                code: 'TIMEOUT',
+                type: "Error",
+                message: "Error with status",
+                code: "TIMEOUT",
               },
             },
             null,
@@ -268,150 +262,128 @@ describe('errors', () => {
       });
     });
 
-    describe('in STREAM_JSON mode', () => {
+    describe("in STREAM_JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.STREAM_JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(
+          OutputFormat.STREAM_JSON,
+        );
       });
 
-      it('should emit result event and exit', () => {
-        const testError = new Error('Test error');
+      it("should emit result event and exit", () => {
+        const testError = new Error("Test error");
 
         expect(() => {
           handleError(testError, mockConfig);
-        }).toThrow('process.exit called with code: 1');
+        }).toThrow("process.exit called with code: 1");
       });
 
-      it('should extract exitCode from FatalError instances', () => {
-        const fatalError = new FatalInputError('Fatal error');
+      it("should extract exitCode from FatalError instances", () => {
+        const fatalError = new FatalInputError("Fatal error");
 
         expect(() => {
           handleError(fatalError, mockConfig);
-        }).toThrow('process.exit called with code: 42');
+        }).toThrow("process.exit called with code: 42");
       });
     });
   });
 
-  describe('handleToolError', () => {
-    const toolName = 'test-tool';
-    const toolError = new Error('Tool failed');
+  describe("handleToolError", () => {
+    const toolName = "test-tool";
+    const toolError = new Error("Tool failed");
 
-    describe('in text mode', () => {
+    describe("in text mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.TEXT);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.TEXT);
       });
 
-      it('should log error message to stderr', () => {
+      it("should log error message to stderr", () => {
         handleToolError(toolName, toolError, mockConfig);
 
-        expect(consoleErrorSpy).toHaveBeenCalledWith(
-          'Error executing tool test-tool: Tool failed',
-        );
+        expect(consoleErrorSpy).toHaveBeenCalledWith("Error executing tool test-tool: Tool failed");
       });
 
-      it('should use resultDisplay when provided', () => {
-        handleToolError(
-          toolName,
-          toolError,
-          mockConfig,
-          'CUSTOM_ERROR',
-          'Custom display message',
-        );
+      it("should use resultDisplay when provided", () => {
+        handleToolError(toolName, toolError, mockConfig, "CUSTOM_ERROR", "Custom display message");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
-          'Error executing tool test-tool: Custom display message',
+          "Error executing tool test-tool: Custom display message",
         );
       });
     });
 
-    describe('in JSON mode', () => {
+    describe("in JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.JSON);
       });
 
-      describe('non-fatal errors', () => {
-        it('should log error message to stderr without exiting for recoverable errors', () => {
-          handleToolError(
-            toolName,
-            toolError,
-            mockConfig,
-            'invalid_tool_params',
-          );
+      describe("non-fatal errors", () => {
+        it("should log error message to stderr without exiting for recoverable errors", () => {
+          handleToolError(toolName, toolError, mockConfig, "invalid_tool_params");
 
           expect(consoleErrorSpy).toHaveBeenCalledWith(
-            'Error executing tool test-tool: Tool failed',
+            "Error executing tool test-tool: Tool failed",
           );
           // Should not exit for non-fatal errors
           expect(processExitSpy).not.toHaveBeenCalled();
         });
 
-        it('should not exit for file not found errors', () => {
-          handleToolError(toolName, toolError, mockConfig, 'file_not_found');
+        it("should not exit for file not found errors", () => {
+          handleToolError(toolName, toolError, mockConfig, "file_not_found");
 
           expect(consoleErrorSpy).toHaveBeenCalledWith(
-            'Error executing tool test-tool: Tool failed',
+            "Error executing tool test-tool: Tool failed",
           );
           expect(processExitSpy).not.toHaveBeenCalled();
         });
 
-        it('should not exit for permission denied errors', () => {
-          handleToolError(toolName, toolError, mockConfig, 'permission_denied');
+        it("should not exit for permission denied errors", () => {
+          handleToolError(toolName, toolError, mockConfig, "permission_denied");
 
           expect(consoleErrorSpy).toHaveBeenCalledWith(
-            'Error executing tool test-tool: Tool failed',
+            "Error executing tool test-tool: Tool failed",
           );
           expect(processExitSpy).not.toHaveBeenCalled();
         });
 
-        it('should not exit for path not in workspace errors', () => {
-          handleToolError(
-            toolName,
-            toolError,
-            mockConfig,
-            'path_not_in_workspace',
-          );
+        it("should not exit for path not in workspace errors", () => {
+          handleToolError(toolName, toolError, mockConfig, "path_not_in_workspace");
 
           expect(consoleErrorSpy).toHaveBeenCalledWith(
-            'Error executing tool test-tool: Tool failed',
+            "Error executing tool test-tool: Tool failed",
           );
           expect(processExitSpy).not.toHaveBeenCalled();
         });
 
-        it('should prefer resultDisplay over error message', () => {
+        it("should prefer resultDisplay over error message", () => {
           handleToolError(
             toolName,
             toolError,
             mockConfig,
-            'invalid_tool_params',
-            'Display message',
+            "invalid_tool_params",
+            "Display message",
           );
 
           expect(consoleErrorSpy).toHaveBeenCalledWith(
-            'Error executing tool test-tool: Display message',
+            "Error executing tool test-tool: Display message",
           );
           expect(processExitSpy).not.toHaveBeenCalled();
         });
       });
 
-      describe('fatal errors', () => {
-        it('should exit immediately for NO_SPACE_LEFT errors', () => {
+      describe("fatal errors", () => {
+        it("should exit immediately for NO_SPACE_LEFT errors", () => {
           expect(() => {
-            handleToolError(toolName, toolError, mockConfig, 'no_space_left');
-          }).toThrow('process.exit called with code: 54');
+            handleToolError(toolName, toolError, mockConfig, "no_space_left");
+          }).toThrow("process.exit called with code: 54");
 
           expect(consoleErrorSpy).toHaveBeenCalledWith(
             JSON.stringify(
               {
                 session_id: TEST_SESSION_ID,
                 error: {
-                  type: 'FatalToolExecutionError',
-                  message: 'Error executing tool test-tool: Tool failed',
-                  code: 'no_space_left',
+                  type: "FatalToolExecutionError",
+                  message: "Error executing tool test-tool: Tool failed",
+                  code: "no_space_left",
                 },
               },
               null,
@@ -422,65 +394,59 @@ describe('errors', () => {
       });
     });
 
-    describe('in STREAM_JSON mode', () => {
+    describe("in STREAM_JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.STREAM_JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(
+          OutputFormat.STREAM_JSON,
+        );
       });
 
-      it('should emit result event and exit for fatal errors', () => {
+      it("should emit result event and exit for fatal errors", () => {
         expect(() => {
-          handleToolError(toolName, toolError, mockConfig, 'no_space_left');
-        }).toThrow('process.exit called with code: 54');
+          handleToolError(toolName, toolError, mockConfig, "no_space_left");
+        }).toThrow("process.exit called with code: 54");
       });
 
-      it('should log to stderr and not exit for non-fatal errors', () => {
-        handleToolError(toolName, toolError, mockConfig, 'invalid_tool_params');
-        expect(consoleErrorSpy).toHaveBeenCalledWith(
-          'Error executing tool test-tool: Tool failed',
-        );
+      it("should log to stderr and not exit for non-fatal errors", () => {
+        handleToolError(toolName, toolError, mockConfig, "invalid_tool_params");
+        expect(consoleErrorSpy).toHaveBeenCalledWith("Error executing tool test-tool: Tool failed");
         expect(processExitSpy).not.toHaveBeenCalled();
       });
     });
   });
 
-  describe('handleCancellationError', () => {
-    describe('in text mode', () => {
+  describe("handleCancellationError", () => {
+    describe("in text mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.TEXT);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.TEXT);
       });
 
-      it('should log cancellation message and exit with 130', () => {
+      it("should log cancellation message and exit with 130", () => {
         expect(() => {
           handleCancellationError(mockConfig);
-        }).toThrow('process.exit called with code: 130');
+        }).toThrow("process.exit called with code: 130");
 
-        expect(consoleErrorSpy).toHaveBeenCalledWith('Operation cancelled.');
+        expect(consoleErrorSpy).toHaveBeenCalledWith("Operation cancelled.");
       });
     });
 
-    describe('in JSON mode', () => {
+    describe("in JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.JSON);
       });
 
-      it('should format cancellation as JSON and exit with 130', () => {
+      it("should format cancellation as JSON and exit with 130", () => {
         expect(() => {
           handleCancellationError(mockConfig);
-        }).toThrow('process.exit called with code: 130');
+        }).toThrow("process.exit called with code: 130");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
           JSON.stringify(
             {
               session_id: TEST_SESSION_ID,
               error: {
-                type: 'FatalCancellationError',
-                message: 'Operation cancelled.',
+                type: "FatalCancellationError",
+                message: "Operation cancelled.",
                 code: 130,
               },
             },
@@ -491,60 +457,56 @@ describe('errors', () => {
       });
     });
 
-    describe('in STREAM_JSON mode', () => {
+    describe("in STREAM_JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.STREAM_JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(
+          OutputFormat.STREAM_JSON,
+        );
       });
 
-      it('should emit result event and exit with 130', () => {
+      it("should emit result event and exit with 130", () => {
         expect(() => {
           handleCancellationError(mockConfig);
-        }).toThrow('process.exit called with code: 130');
+        }).toThrow("process.exit called with code: 130");
       });
     });
   });
 
-  describe('handleMaxTurnsExceededError', () => {
-    describe('in text mode', () => {
+  describe("handleMaxTurnsExceededError", () => {
+    describe("in text mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.TEXT);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.TEXT);
       });
 
-      it('should log max turns message and exit with 53', () => {
+      it("should log max turns message and exit with 53", () => {
         expect(() => {
           handleMaxTurnsExceededError(mockConfig);
-        }).toThrow('process.exit called with code: 53');
+        }).toThrow("process.exit called with code: 53");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
-          'Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.',
+          "Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.",
         );
       });
     });
 
-    describe('in JSON mode', () => {
+    describe("in JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(OutputFormat.JSON);
       });
 
-      it('should format max turns error as JSON and exit with 53', () => {
+      it("should format max turns error as JSON and exit with 53", () => {
         expect(() => {
           handleMaxTurnsExceededError(mockConfig);
-        }).toThrow('process.exit called with code: 53');
+        }).toThrow("process.exit called with code: 53");
 
         expect(consoleErrorSpy).toHaveBeenCalledWith(
           JSON.stringify(
             {
               session_id: TEST_SESSION_ID,
               error: {
-                type: 'FatalTurnLimitedError',
+                type: "FatalTurnLimitedError",
                 message:
-                  'Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.',
+                  "Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.",
                 code: 53,
               },
             },
@@ -555,17 +517,17 @@ describe('errors', () => {
       });
     });
 
-    describe('in STREAM_JSON mode', () => {
+    describe("in STREAM_JSON mode", () => {
       beforeEach(() => {
-        (
-          mockConfig.getOutputFormat as ReturnType<typeof vi.fn>
-        ).mockReturnValue(OutputFormat.STREAM_JSON);
+        (mockConfig.getOutputFormat as ReturnType<typeof vi.fn>).mockReturnValue(
+          OutputFormat.STREAM_JSON,
+        );
       });
 
-      it('should emit result event and exit with 53', () => {
+      it("should emit result event and exit with 53", () => {
         expect(() => {
           handleMaxTurnsExceededError(mockConfig);
-        }).toThrow('process.exit called with code: 53');
+        }).toThrow("process.exit called with code: 53");
       });
     });
   });
diff --git a/packages/ui-gemini/src/utils/errors.ts b/packages/ui-gemini/src/utils/errors.ts
index 6cabb405f..6a2d23b53 100644
--- a/packages/ui-gemini/src/utils/errors.ts
+++ b/packages/ui-gemini/src/utils/errors.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/gemini-cli-core';
+import type { Config } from "@airiscode/gemini-cli-core";
 import {
-  OutputFormat,
-  JsonFormatter,
-  StreamJsonFormatter,
-  JsonStreamEventType,
-  uiTelemetryService,
-  parseAndFormatApiError,
-  FatalTurnLimitedError,
   FatalCancellationError,
   FatalToolExecutionError,
+  FatalTurnLimitedError,
   isFatalToolError,
-} from '@airiscode/gemini-cli-core';
-import { runSyncCleanup } from './cleanup.js';
+  JsonFormatter,
+  JsonStreamEventType,
+  OutputFormat,
+  parseAndFormatApiError,
+  StreamJsonFormatter,
+  uiTelemetryService,
+} from "@airiscode/gemini-cli-core";
+import { runSyncCleanup } from "./cleanup.js";
 
 export function getErrorMessage(error: unknown): string {
   if (error instanceof Error) {
@@ -39,7 +39,7 @@ function extractErrorCode(error: unknown): string | number {
   const errorWithCode = error as ErrorWithCode;
 
   // Prioritize exitCode for FatalError types, fall back to other codes
-  if (typeof errorWithCode.exitCode === 'number') {
+  if (typeof errorWithCode.exitCode === "number") {
     return errorWithCode.exitCode;
   }
   if (errorWithCode.code !== undefined) {
@@ -56,7 +56,7 @@ function extractErrorCode(error: unknown): string | number {
  * Converts an error code to a numeric exit code.
  */
 function getNumericExitCode(errorCode: string | number): number {
-  return typeof errorCode === 'number' ? errorCode : 1;
+  return typeof errorCode === "number" ? errorCode : 1;
 }
 
 /**
@@ -70,10 +70,7 @@ export function handleError(
   config: Config,
   customErrorCode?: string | number,
 ): never {
-  const errorMessage = parseAndFormatApiError(
-    error,
-    config.getContentGeneratorConfig()?.authType,
-  );
+  const errorMessage = parseAndFormatApiError(error, config.getContentGeneratorConfig()?.authType);
 
   if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
     const streamFormatter = new StreamJsonFormatter();
@@ -83,9 +80,9 @@ export function handleError(
     streamFormatter.emitEvent({
       type: JsonStreamEventType.RESULT,
       timestamp: new Date().toISOString(),
-      status: 'error',
+      status: "error",
       error: {
-        type: error instanceof Error ? error.constructor.name : 'Error',
+        type: error instanceof Error ? error.constructor.name : "Error",
         message: errorMessage,
       },
       stats: streamFormatter.convertToStreamStats(metrics, 0),
@@ -141,9 +138,9 @@ export function handleToolError(
       streamFormatter.emitEvent({
         type: JsonStreamEventType.RESULT,
         timestamp: new Date().toISOString(),
-        status: 'error',
+        status: "error",
         error: {
-          type: errorType ?? 'FatalToolExecutionError',
+          type: errorType ?? "FatalToolExecutionError",
           message: toolExecutionError.message,
         },
         stats: streamFormatter.convertToStreamStats(metrics, 0),
@@ -171,7 +168,7 @@ export function handleToolError(
  * Handles cancellation/abort signals consistently.
  */
 export function handleCancellationError(config: Config): never {
-  const cancellationError = new FatalCancellationError('Operation cancelled.');
+  const cancellationError = new FatalCancellationError("Operation cancelled.");
 
   if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
     const streamFormatter = new StreamJsonFormatter();
@@ -179,9 +176,9 @@ export function handleCancellationError(config: Config): never {
     streamFormatter.emitEvent({
       type: JsonStreamEventType.RESULT,
       timestamp: new Date().toISOString(),
-      status: 'error',
+      status: "error",
       error: {
-        type: 'FatalCancellationError',
+        type: "FatalCancellationError",
         message: cancellationError.message,
       },
       stats: streamFormatter.convertToStreamStats(metrics, 0),
@@ -211,7 +208,7 @@ export function handleCancellationError(config: Config): never {
  */
 export function handleMaxTurnsExceededError(config: Config): never {
   const maxTurnsError = new FatalTurnLimitedError(
-    'Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.',
+    "Reached max session turns for this session. Increase the number of turns by specifying maxSessionTurns in settings.json.",
   );
 
   if (config.getOutputFormat() === OutputFormat.STREAM_JSON) {
@@ -220,9 +217,9 @@ export function handleMaxTurnsExceededError(config: Config): never {
     streamFormatter.emitEvent({
       type: JsonStreamEventType.RESULT,
       timestamp: new Date().toISOString(),
-      status: 'error',
+      status: "error",
       error: {
-        type: 'FatalTurnLimitedError',
+        type: "FatalTurnLimitedError",
         message: maxTurnsError.message,
       },
       stats: streamFormatter.convertToStreamStats(metrics, 0),
diff --git a/packages/ui-gemini/src/utils/events.test.ts b/packages/ui-gemini/src/utils/events.test.ts
index b37215c50..050b34b8a 100644
--- a/packages/ui-gemini/src/utils/events.test.ts
+++ b/packages/ui-gemini/src/utils/events.test.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { appEvents, AppEvent } from './events.js';
+import { describe, expect, it, vi } from "vitest";
+import { AppEvent, appEvents } from "./events.js";
 
-describe('events', () => {
-  it('should allow registering and emitting events', () => {
+describe("events", () => {
+  it("should allow registering and emitting events", () => {
     const callback = vi.fn();
     appEvents.on(AppEvent.OauthDisplayMessage, callback);
 
-    appEvents.emit(AppEvent.OauthDisplayMessage, 'test message');
+    appEvents.emit(AppEvent.OauthDisplayMessage, "test message");
 
-    expect(callback).toHaveBeenCalledWith('test message');
+    expect(callback).toHaveBeenCalledWith("test message");
 
     appEvents.off(AppEvent.OauthDisplayMessage, callback);
   });
 
-  it('should work with events without data', () => {
+  it("should work with events without data", () => {
     const callback = vi.fn();
     appEvents.on(AppEvent.Flicker, callback);
 
diff --git a/packages/ui-gemini/src/utils/events.ts b/packages/ui-gemini/src/utils/events.ts
index b80ff5509..832f6945e 100644
--- a/packages/ui-gemini/src/utils/events.ts
+++ b/packages/ui-gemini/src/utils/events.ts
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ExtensionEvents, McpClient } from '@airiscode/gemini-cli-core';
-import { EventEmitter } from 'node:events';
+import { EventEmitter } from "node:events";
+import type { ExtensionEvents, McpClient } from "@airiscode/gemini-cli-core";
 
 export enum AppEvent {
-  OpenDebugConsole = 'open-debug-console',
-  OauthDisplayMessage = 'oauth-display-message',
-  Flicker = 'flicker',
-  McpClientUpdate = 'mcp-client-update',
-  SelectionWarning = 'selection-warning',
-  PasteTimeout = 'paste-timeout',
+  OpenDebugConsole = "open-debug-console",
+  OauthDisplayMessage = "oauth-display-message",
+  Flicker = "flicker",
+  McpClientUpdate = "mcp-client-update",
+  SelectionWarning = "selection-warning",
+  PasteTimeout = "paste-timeout",
 }
 
 export interface AppEvents extends ExtensionEvents {
diff --git a/packages/ui-gemini/src/utils/gitUtils.test.ts b/packages/ui-gemini/src/utils/gitUtils.test.ts
index 45b777fcb..f4038c097 100644
--- a/packages/ui-gemini/src/utils/gitUtils.test.ts
+++ b/packages/ui-gemini/src/utils/gitUtils.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, expect, it, afterEach, beforeEach } from 'vitest';
-import * as child_process from 'node:child_process';
+import * as child_process from "node:child_process";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
-  isGitHubRepository,
+  getGitHubRepoInfo,
   getGitRepoRoot,
   getLatestGitHubRelease,
-  getGitHubRepoInfo,
-} from './gitUtils.js';
+  isGitHubRepository,
+} from "./gitUtils.js";
 
-vi.mock('child_process');
+vi.mock("child_process");
 
-describe('isGitHubRepository', async () => {
+describe("isGitHubRepository", async () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
@@ -24,19 +24,19 @@ describe('isGitHubRepository', async () => {
     vi.restoreAllMocks();
   });
 
-  it('returns false if the git command fails', async () => {
+  it("returns false if the git command fails", async () => {
     vi.mocked(child_process.execSync).mockImplementation((): string => {
-      throw new Error('oops');
+      throw new Error("oops");
     });
     expect(isGitHubRepository()).toBe(false);
   });
 
-  it('returns false if the remote is not github.com', async () => {
-    vi.mocked(child_process.execSync).mockReturnValueOnce('https://gitlab.com');
+  it("returns false if the remote is not github.com", async () => {
+    vi.mocked(child_process.execSync).mockReturnValueOnce("https://gitlab.com");
     expect(isGitHubRepository()).toBe(false);
   });
 
-  it('returns true if the remote is github.com', async () => {
+  it("returns true if the remote is github.com", async () => {
     vi.mocked(child_process.execSync).mockReturnValueOnce(`
       origin  https://github.com/sethvargo/gemini-cli (fetch)
       origin  https://github.com/sethvargo/gemini-cli (push)
@@ -45,7 +45,7 @@ describe('isGitHubRepository', async () => {
   });
 });
 
-describe('getGitHubRepoInfo', async () => {
+describe("getGitHubRepoInfo", async () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
@@ -54,31 +54,29 @@ describe('getGitHubRepoInfo', async () => {
     vi.restoreAllMocks();
   });
 
-  it('throws an error if github repo info cannot be determined', async () => {
+  it("throws an error if github repo info cannot be determined", async () => {
     vi.mocked(child_process.execSync).mockImplementation((): string => {
-      throw new Error('oops');
+      throw new Error("oops");
     });
     expect(() => {
       getGitHubRepoInfo();
     }).toThrowError(/oops/);
   });
 
-  it('throws an error if owner/repo could not be determined', async () => {
-    vi.mocked(child_process.execSync).mockReturnValueOnce('');
+  it("throws an error if owner/repo could not be determined", async () => {
+    vi.mocked(child_process.execSync).mockReturnValueOnce("");
     expect(() => {
       getGitHubRepoInfo();
     }).toThrowError(/Owner & repo could not be extracted from remote URL/);
   });
 
-  it('returns the owner and repo', async () => {
-    vi.mocked(child_process.execSync).mockReturnValueOnce(
-      'https://github.com/owner/repo.git ',
-    );
-    expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
+  it("returns the owner and repo", async () => {
+    vi.mocked(child_process.execSync).mockReturnValueOnce("https://github.com/owner/repo.git ");
+    expect(getGitHubRepoInfo()).toEqual({ owner: "owner", repo: "repo" });
   });
 });
 
-describe('getGitRepoRoot', async () => {
+describe("getGitRepoRoot", async () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
@@ -87,29 +85,29 @@ describe('getGitRepoRoot', async () => {
     vi.restoreAllMocks();
   });
 
-  it('throws an error if git root cannot be determined', async () => {
+  it("throws an error if git root cannot be determined", async () => {
     vi.mocked(child_process.execSync).mockImplementation((): string => {
-      throw new Error('oops');
+      throw new Error("oops");
     });
     expect(() => {
       getGitRepoRoot();
     }).toThrowError(/oops/);
   });
 
-  it('throws an error if git root is empty', async () => {
-    vi.mocked(child_process.execSync).mockReturnValueOnce('');
+  it("throws an error if git root is empty", async () => {
+    vi.mocked(child_process.execSync).mockReturnValueOnce("");
     expect(() => {
       getGitRepoRoot();
     }).toThrowError(/Git repo returned empty value/);
   });
 
-  it('returns the root', async () => {
-    vi.mocked(child_process.execSync).mockReturnValueOnce('/path/to/git/repo');
-    expect(getGitRepoRoot()).toBe('/path/to/git/repo');
+  it("returns the root", async () => {
+    vi.mocked(child_process.execSync).mockReturnValueOnce("/path/to/git/repo");
+    expect(getGitRepoRoot()).toBe("/path/to/git/repo");
   });
 });
 
-describe('getLatestRelease', async () => {
+describe("getLatestRelease", async () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
@@ -118,32 +116,28 @@ describe('getLatestRelease', async () => {
     vi.restoreAllMocks();
   });
 
-  it('throws an error if the fetch fails', async () => {
-    global.fetch = vi.fn(() => Promise.reject('nope'));
-    await expect(getLatestGitHubRelease()).rejects.toThrowError(
-      /Unable to determine the latest/,
-    );
+  it("throws an error if the fetch fails", async () => {
+    global.fetch = vi.fn(() => Promise.reject("nope"));
+    await expect(getLatestGitHubRelease()).rejects.toThrowError(/Unable to determine the latest/);
   });
 
-  it('throws an error if the fetch does not return a json body', async () => {
+  it("throws an error if the fetch does not return a json body", async () => {
     global.fetch = vi.fn(() =>
       Promise.resolve({
         ok: true,
-        json: () => Promise.resolve({ foo: 'bar' }),
+        json: () => Promise.resolve({ foo: "bar" }),
       } as Response),
     );
-    await expect(getLatestGitHubRelease()).rejects.toThrowError(
-      /Unable to determine the latest/,
-    );
+    await expect(getLatestGitHubRelease()).rejects.toThrowError(/Unable to determine the latest/);
   });
 
-  it('returns the release version', async () => {
+  it("returns the release version", async () => {
     global.fetch = vi.fn(() =>
       Promise.resolve({
         ok: true,
-        json: () => Promise.resolve({ tag_name: 'v1.2.3' }),
+        json: () => Promise.resolve({ tag_name: "v1.2.3" }),
       } as Response),
     );
-    await expect(getLatestGitHubRelease()).resolves.toBe('v1.2.3');
+    await expect(getLatestGitHubRelease()).resolves.toBe("v1.2.3");
   });
 });
diff --git a/packages/ui-gemini/src/utils/gitUtils.ts b/packages/ui-gemini/src/utils/gitUtils.ts
index 81914d81c..982e07dc9 100644
--- a/packages/ui-gemini/src/utils/gitUtils.ts
+++ b/packages/ui-gemini/src/utils/gitUtils.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
-import { execSync } from 'node:child_process';
-import { ProxyAgent } from 'undici';
+import { execSync } from "node:child_process";
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { ProxyAgent } from "undici";
 
 /**
  * Checks if a directory is within a git repository hosted on GitHub.
@@ -15,9 +15,9 @@ import { ProxyAgent } from 'undici';
 export const isGitHubRepository = (): boolean => {
   try {
     const remotes = (
-      execSync('git remote -v', {
-        encoding: 'utf-8',
-      }) || ''
+      execSync("git remote -v", {
+        encoding: "utf-8",
+      }) || ""
     ).trim();
 
     const pattern = /github\.com/;
@@ -37,9 +37,9 @@ export const isGitHubRepository = (): boolean => {
  */
 export const getGitRepoRoot = (): string => {
   const gitRepoRoot = (
-    execSync('git rev-parse --show-toplevel', {
-      encoding: 'utf-8',
-    }) || ''
+    execSync("git rev-parse --show-toplevel", {
+      encoding: "utf-8",
+    }) || ""
   ).trim();
 
   if (!gitRepoRoot) {
@@ -53,29 +53,25 @@ export const getGitRepoRoot = (): string => {
  * getLatestGitHubRelease returns the release tag as a string.
  * @returns string of the release tag (e.g. "v1.2.3").
  */
-export const getLatestGitHubRelease = async (
-  proxy?: string,
-): Promise<string> => {
+export const getLatestGitHubRelease = async (proxy?: string): Promise<string> => {
   try {
     const controller = new AbortController();
 
     const endpoint = `https://api.github.com/repos/google-github-actions/run-gemini-cli/releases/latest`;
 
     const response = await fetch(endpoint, {
-      method: 'GET',
+      method: "GET",
       headers: {
-        Accept: 'application/vnd.github+json',
-        'Content-Type': 'application/json',
-        'X-GitHub-Api-Version': '2022-11-28',
+        Accept: "application/vnd.github+json",
+        "Content-Type": "application/json",
+        "X-GitHub-Api-Version": "2022-11-28",
       },
       dispatcher: proxy ? new ProxyAgent(proxy) : undefined,
       signal: AbortSignal.any([AbortSignal.timeout(30_000), controller.signal]),
     } as RequestInit);
 
     if (!response.ok) {
-      throw new Error(
-        `Invalid response code: ${response.status} - ${response.statusText}`,
-      );
+      throw new Error(`Invalid response code: ${response.status} - ${response.statusText}`);
     }
 
     const releaseTag = (await response.json()).tag_name;
@@ -84,13 +80,8 @@ export const getLatestGitHubRelease = async (
     }
     return releaseTag;
   } catch (_error) {
-    debugLogger.debug(
-      `Failed to determine latest run-gemini-cli release:`,
-      _error,
-    );
-    throw new Error(
-      `Unable to determine the latest run-gemini-cli release on GitHub.`,
-    );
+    debugLogger.debug(`Failed to determine latest run-gemini-cli release:`, _error);
+    throw new Error(`Unable to determine the latest run-gemini-cli release on GitHub.`);
   }
 };
 
@@ -100,8 +91,8 @@ export const getLatestGitHubRelease = async (
  * @throws error if the exec command fails.
  */
 export function getGitHubRepoInfo(): { owner: string; repo: string } {
-  const remoteUrl = execSync('git remote get-url origin', {
-    encoding: 'utf-8',
+  const remoteUrl = execSync("git remote get-url origin", {
+    encoding: "utf-8",
   }).trim();
 
   // Matches either https://github.com/owner/repo.git or git@github.com:owner/repo.git
@@ -111,9 +102,7 @@ export function getGitHubRepoInfo(): { owner: string; repo: string } {
 
   // If the regex fails match, throw an error.
   if (!match || !match[1] || !match[2]) {
-    throw new Error(
-      `Owner & repo could not be extracted from remote URL: ${remoteUrl}`,
-    );
+    throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
   }
 
   return { owner: match[1], repo: match[2] };
diff --git a/packages/ui-gemini/src/utils/handleAutoUpdate.test.ts b/packages/ui-gemini/src/utils/handleAutoUpdate.test.ts
index 08b64e8c2..b85021f9f 100644
--- a/packages/ui-gemini/src/utils/handleAutoUpdate.test.ts
+++ b/packages/ui-gemini/src/utils/handleAutoUpdate.test.ts
@@ -4,32 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Mock } from 'vitest';
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { getInstallationInfo, PackageManager } from './installationInfo.js';
-import { updateEventEmitter } from './updateEventEmitter.js';
-import type { UpdateObject } from '../ui/utils/updateCheck.js';
-import type { LoadedSettings } from '../config/settings.js';
-import EventEmitter from 'node:events';
-import type { ChildProcess } from 'node:child_process';
-import { handleAutoUpdate, setUpdateHandler } from './handleAutoUpdate.js';
-import { MessageType } from '../ui/types.js';
-
-vi.mock('./installationInfo.js', async () => {
-  const actual = await vi.importActual('./installationInfo.js');
+import type { ChildProcess } from "node:child_process";
+import EventEmitter from "node:events";
+import type { Mock } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { LoadedSettings } from "../config/settings.js";
+import { MessageType } from "../ui/types.js";
+import type { UpdateObject } from "../ui/utils/updateCheck.js";
+import { handleAutoUpdate, setUpdateHandler } from "./handleAutoUpdate.js";
+import { getInstallationInfo, PackageManager } from "./installationInfo.js";
+import { updateEventEmitter } from "./updateEventEmitter.js";
+
+vi.mock("./installationInfo.js", async () => {
+  const actual = await vi.importActual("./installationInfo.js");
   return {
     ...actual,
     getInstallationInfo: vi.fn(),
   };
 });
 
-vi.mock('./updateEventEmitter.js', async (importOriginal) =>
-  importOriginal<typeof import('./updateEventEmitter.js')>(),
+vi.mock("./updateEventEmitter.js", async (importOriginal) =>
+  importOriginal<typeof import("./updateEventEmitter.js")>(),
 );
 
 const mockGetInstallationInfo = vi.mocked(getInstallationInfo);
 
-describe('handleAutoUpdate', () => {
+describe("handleAutoUpdate", () => {
   let mockSpawn: Mock;
   let mockUpdateInfo: UpdateObject;
   let mockSettings: LoadedSettings;
@@ -38,15 +38,15 @@ describe('handleAutoUpdate', () => {
   beforeEach(() => {
     mockSpawn = vi.fn();
     vi.clearAllMocks();
-    vi.spyOn(updateEventEmitter, 'emit');
+    vi.spyOn(updateEventEmitter, "emit");
     mockUpdateInfo = {
       update: {
-        latest: '2.0.0',
-        current: '1.0.0',
-        type: 'major',
-        name: '@airiscode/ui-gemini',
+        latest: "2.0.0",
+        current: "1.0.0",
+        type: "major",
+        name: "@airiscode/ui-gemini",
       },
-      message: 'An update is available!',
+      message: "An update is available!",
     };
 
     mockSettings = {
@@ -65,25 +65,23 @@ describe('handleAutoUpdate', () => {
       unref: vi.fn(),
     }) as unknown as ChildProcess;
 
-    mockSpawn.mockReturnValue(
-      mockChildProcess as unknown as ReturnType<typeof mockSpawn>,
-    );
+    mockSpawn.mockReturnValue(mockChildProcess as unknown as ReturnType<typeof mockSpawn>);
   });
 
   afterEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should do nothing if update info is null', () => {
-    handleAutoUpdate(null, mockSettings, '/root', mockSpawn);
+  it("should do nothing if update info is null", () => {
+    handleAutoUpdate(null, mockSettings, "/root", mockSpawn);
     expect(mockGetInstallationInfo).not.toHaveBeenCalled();
     expect(updateEventEmitter.emit).not.toHaveBeenCalled();
     expect(mockSpawn).not.toHaveBeenCalled();
   });
 
-  it('should do nothing if update nag is disabled', () => {
+  it("should do nothing if update nag is disabled", () => {
     mockSettings.merged.general!.disableUpdateNag = true;
-    handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+    handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
     expect(mockGetInstallationInfo).not.toHaveBeenCalled();
     expect(updateEventEmitter.emit).not.toHaveBeenCalled();
     expect(mockSpawn).not.toHaveBeenCalled();
@@ -92,85 +90,86 @@ describe('handleAutoUpdate', () => {
   it('should emit "update-received" but not update if auto-updates are disabled', () => {
     mockSettings.merged.general!.disableAutoUpdate = true;
     mockGetInstallationInfo.mockReturnValue({
-      updateCommand: 'npm i -g @airiscode/ui-gemini@latest',
-      updateMessage: 'Please update manually.',
+      updateCommand: "npm i -g @airiscode/ui-gemini@latest",
+      updateMessage: "Please update manually.",
       isGlobal: true,
       packageManager: PackageManager.NPM,
     });
 
-    handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+    handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
 
     expect(updateEventEmitter.emit).toHaveBeenCalledTimes(1);
-    expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-received', {
-      message: 'An update is available!\nPlease update manually.',
+    expect(updateEventEmitter.emit).toHaveBeenCalledWith("update-received", {
+      message: "An update is available!\nPlease update manually.",
     });
     expect(mockSpawn).not.toHaveBeenCalled();
   });
 
-  it.each([PackageManager.NPX, PackageManager.PNPX, PackageManager.BUNX])(
-    'should suppress update notifications when running via %s',
-    (packageManager) => {
-      mockGetInstallationInfo.mockReturnValue({
-        updateCommand: undefined,
-        updateMessage: `Running via ${packageManager}, update not applicable.`,
-        isGlobal: false,
-        packageManager,
-      });
+  it.each([
+    PackageManager.NPX,
+    PackageManager.PNPX,
+    PackageManager.BUNX,
+  ])("should suppress update notifications when running via %s", (packageManager) => {
+    mockGetInstallationInfo.mockReturnValue({
+      updateCommand: undefined,
+      updateMessage: `Running via ${packageManager}, update not applicable.`,
+      isGlobal: false,
+      packageManager,
+    });
 
-      handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+    handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
 
-      expect(updateEventEmitter.emit).not.toHaveBeenCalled();
-      expect(mockSpawn).not.toHaveBeenCalled();
-    },
-  );
+    expect(updateEventEmitter.emit).not.toHaveBeenCalled();
+    expect(mockSpawn).not.toHaveBeenCalled();
+  });
 
   it('should emit "update-received" but not update if no update command is found', () => {
     mockGetInstallationInfo.mockReturnValue({
       updateCommand: undefined,
-      updateMessage: 'Cannot determine update command.',
+      updateMessage: "Cannot determine update command.",
       isGlobal: false,
       packageManager: PackageManager.NPM,
     });
 
-    handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+    handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
 
     expect(updateEventEmitter.emit).toHaveBeenCalledTimes(1);
-    expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-received', {
-      message: 'An update is available!\nCannot determine update command.',
+    expect(updateEventEmitter.emit).toHaveBeenCalledWith("update-received", {
+      message: "An update is available!\nCannot determine update command.",
     });
     expect(mockSpawn).not.toHaveBeenCalled();
   });
 
-  it('should combine update messages correctly', () => {
+  it("should combine update messages correctly", () => {
     mockGetInstallationInfo.mockReturnValue({
       updateCommand: undefined, // No command to prevent spawn
-      updateMessage: 'This is an additional message.',
+      updateMessage: "This is an additional message.",
       isGlobal: false,
       packageManager: PackageManager.NPM,
     });
 
-    handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+    handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
 
     expect(updateEventEmitter.emit).toHaveBeenCalledTimes(1);
-    expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-received', {
-      message: 'An update is available!\nThis is an additional message.',
+    expect(updateEventEmitter.emit).toHaveBeenCalledWith("update-received", {
+      message: "An update is available!\nThis is an additional message.",
     });
   });
 
-  it('should attempt to perform an update when conditions are met', async () => {
+  it("should attempt to perform an update when conditions are met", async () => {
     mockGetInstallationInfo.mockReturnValue({
-      updateCommand: 'npm i -g @airiscode/ui-gemini@latest',
-      updateMessage: 'This is an additional message.',
+      updateCommand: "npm i -g @airiscode/ui-gemini@latest",
+      updateMessage: "This is an additional message.",
       isGlobal: false,
       packageManager: PackageManager.NPM,
     });
 
     // Simulate successful execution
     setTimeout(() => {
-      mockChildProcess.emit('close', 0);
+      mockChildProcess.emit("close", 0);
     }, 0);
 
-    handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+    handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
 
     expect(mockSpawn).toHaveBeenCalledOnce();
   });
@@ -178,48 +177,47 @@ describe('handleAutoUpdate', () => {
   it('should emit "update-failed" when the update process fails', async () => {
     await new Promise<void>((resolve) => {
       mockGetInstallationInfo.mockReturnValue({
-        updateCommand: 'npm i -g @airiscode/ui-gemini@latest',
-        updateMessage: 'This is an additional message.',
+        updateCommand: "npm i -g @airiscode/ui-gemini@latest",
+        updateMessage: "This is an additional message.",
         isGlobal: false,
         packageManager: PackageManager.NPM,
       });
 
       // Simulate failed execution
       setTimeout(() => {
-        mockChildProcess.emit('close', 1);
+        mockChildProcess.emit("close", 1);
         resolve();
       }, 0);
 
-      handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+      handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
     });
 
-    expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-failed', {
+    expect(updateEventEmitter.emit).toHaveBeenCalledWith("update-failed", {
       message:
-        'Automatic update failed. Please try updating manually. (command: npm i -g @airiscode/ui-gemini@2.0.0)',
+        "Automatic update failed. Please try updating manually. (command: npm i -g @airiscode/ui-gemini@2.0.0)",
     });
   });
 
   it('should emit "update-failed" when the spawn function throws an error', async () => {
     await new Promise<void>((resolve) => {
       mockGetInstallationInfo.mockReturnValue({
-        updateCommand: 'npm i -g @airiscode/ui-gemini@latest',
-        updateMessage: 'This is an additional message.',
+        updateCommand: "npm i -g @airiscode/ui-gemini@latest",
+        updateMessage: "This is an additional message.",
         isGlobal: false,
         packageManager: PackageManager.NPM,
       });
 
       // Simulate an error event
       setTimeout(() => {
-        mockChildProcess.emit('error', new Error('Spawn error'));
+        mockChildProcess.emit("error", new Error("Spawn error"));
         resolve();
       }, 0);
 
-      handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+      handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
     });
 
-    expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-failed', {
-      message:
-        'Automatic update failed. Please try updating manually. (error: Spawn error)',
+    expect(updateEventEmitter.emit).toHaveBeenCalledWith("update-failed", {
+      message: "Automatic update failed. Please try updating manually. (error: Spawn error)",
     });
   });
 
@@ -228,54 +226,50 @@ describe('handleAutoUpdate', () => {
       ...mockUpdateInfo,
       update: {
         ...mockUpdateInfo.update,
-        latest: '2.0.0-nightly',
+        latest: "2.0.0-nightly",
       },
     };
     mockGetInstallationInfo.mockReturnValue({
-      updateCommand: 'npm i -g @airiscode/ui-gemini@latest',
-      updateMessage: 'This is an additional message.',
+      updateCommand: "npm i -g @airiscode/ui-gemini@latest",
+      updateMessage: "This is an additional message.",
       isGlobal: false,
       packageManager: PackageManager.NPM,
     });
 
-    handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+    handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
 
-    expect(mockSpawn).toHaveBeenCalledWith(
-      'npm i -g @airiscode/ui-gemini@nightly',
-      {
-        shell: true,
-        stdio: 'ignore',
-        detached: true,
-      },
-    );
+    expect(mockSpawn).toHaveBeenCalledWith("npm i -g @airiscode/ui-gemini@nightly", {
+      shell: true,
+      stdio: "ignore",
+      detached: true,
+    });
   });
 
   it('should emit "update-success" when the update process succeeds', async () => {
     await new Promise<void>((resolve) => {
       mockGetInstallationInfo.mockReturnValue({
-        updateCommand: 'npm i -g @airiscode/ui-gemini@latest',
-        updateMessage: 'This is an additional message.',
+        updateCommand: "npm i -g @airiscode/ui-gemini@latest",
+        updateMessage: "This is an additional message.",
         isGlobal: false,
         packageManager: PackageManager.NPM,
       });
 
       // Simulate successful execution
       setTimeout(() => {
-        mockChildProcess.emit('close', 0);
+        mockChildProcess.emit("close", 0);
         resolve();
       }, 0);
 
-      handleAutoUpdate(mockUpdateInfo, mockSettings, '/root', mockSpawn);
+      handleAutoUpdate(mockUpdateInfo, mockSettings, "/root", mockSpawn);
     });
 
-    expect(updateEventEmitter.emit).toHaveBeenCalledWith('update-success', {
-      message:
-        'Update successful! The new version will be used on your next run.',
+    expect(updateEventEmitter.emit).toHaveBeenCalledWith("update-success", {
+      message: "Update successful! The new version will be used on your next run.",
     });
   });
 });
 
-describe('setUpdateHandler', () => {
+describe("setUpdateHandler", () => {
   let addItem: ReturnType<typeof vi.fn>;
   let setUpdateInfo: ReturnType<typeof vi.fn>;
   let unregister: () => void;
@@ -293,25 +287,25 @@ describe('setUpdateHandler', () => {
     vi.clearAllMocks();
   });
 
-  it('should register event listeners', () => {
+  it("should register event listeners", () => {
     // We can't easily check if listeners are registered on the real EventEmitter
     // without mocking it more deeply, but we can check if they respond to events.
     expect(unregister).toBeInstanceOf(Function);
   });
 
-  it('should handle update-received event', () => {
+  it("should handle update-received event", () => {
     const updateInfo: UpdateObject = {
       update: {
-        latest: '2.0.0',
-        current: '1.0.0',
-        type: 'major',
-        name: '@airiscode/ui-gemini',
+        latest: "2.0.0",
+        current: "1.0.0",
+        type: "major",
+        name: "@airiscode/ui-gemini",
       },
-      message: 'Update available',
+      message: "Update available",
     };
 
     // Access the actual emitter to emit events
-    updateEventEmitter.emit('update-received', updateInfo);
+    updateEventEmitter.emit("update-received", updateInfo);
 
     expect(setUpdateInfo).toHaveBeenCalledWith(updateInfo);
 
@@ -321,52 +315,52 @@ describe('setUpdateHandler', () => {
     expect(addItem).toHaveBeenCalledWith(
       {
         type: MessageType.INFO,
-        text: 'Update available',
+        text: "Update available",
       },
       expect.any(Number),
     );
     expect(setUpdateInfo).toHaveBeenCalledWith(null);
   });
 
-  it('should handle update-failed event', () => {
-    updateEventEmitter.emit('update-failed', { message: 'Failed' });
+  it("should handle update-failed event", () => {
+    updateEventEmitter.emit("update-failed", { message: "Failed" });
 
     expect(setUpdateInfo).toHaveBeenCalledWith(null);
     expect(addItem).toHaveBeenCalledWith(
       {
         type: MessageType.ERROR,
-        text: 'Automatic update failed. Please try updating manually',
+        text: "Automatic update failed. Please try updating manually",
       },
       expect.any(Number),
     );
   });
 
-  it('should handle update-success event', () => {
-    updateEventEmitter.emit('update-success', { message: 'Success' });
+  it("should handle update-success event", () => {
+    updateEventEmitter.emit("update-success", { message: "Success" });
 
     expect(setUpdateInfo).toHaveBeenCalledWith(null);
     expect(addItem).toHaveBeenCalledWith(
       {
         type: MessageType.INFO,
-        text: 'Update successful! The new version will be used on your next run.',
+        text: "Update successful! The new version will be used on your next run.",
       },
       expect.any(Number),
     );
   });
 
-  it('should not show update-received message if update-success was called', () => {
+  it("should not show update-received message if update-success was called", () => {
     const updateInfo: UpdateObject = {
       update: {
-        latest: '2.0.0',
-        current: '1.0.0',
-        type: 'major',
-        name: '@airiscode/ui-gemini',
+        latest: "2.0.0",
+        current: "1.0.0",
+        type: "major",
+        name: "@airiscode/ui-gemini",
       },
-      message: 'Update available',
+      message: "Update available",
     };
 
-    updateEventEmitter.emit('update-received', updateInfo);
-    updateEventEmitter.emit('update-success', { message: 'Success' });
+    updateEventEmitter.emit("update-received", updateInfo);
+    updateEventEmitter.emit("update-success", { message: "Success" });
 
     // Advance timers
     vi.advanceTimersByTime(60000);
@@ -376,19 +370,19 @@ describe('setUpdateHandler', () => {
     expect(addItem).toHaveBeenCalledWith(
       {
         type: MessageType.INFO,
-        text: 'Update successful! The new version will be used on your next run.',
+        text: "Update successful! The new version will be used on your next run.",
       },
       expect.any(Number),
     );
   });
 
-  it('should handle update-info event', () => {
-    updateEventEmitter.emit('update-info', { message: 'Info message' });
+  it("should handle update-info event", () => {
+    updateEventEmitter.emit("update-info", { message: "Info message" });
 
     expect(addItem).toHaveBeenCalledWith(
       {
         type: MessageType.INFO,
-        text: 'Info message',
+        text: "Info message",
       },
       expect.any(Number),
     );
diff --git a/packages/ui-gemini/src/utils/handleAutoUpdate.ts b/packages/ui-gemini/src/utils/handleAutoUpdate.ts
index b1940c303..fd818ae1a 100644
--- a/packages/ui-gemini/src/utils/handleAutoUpdate.ts
+++ b/packages/ui-gemini/src/utils/handleAutoUpdate.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { UpdateObject } from '../ui/utils/updateCheck.js';
-import type { LoadedSettings } from '../config/settings.js';
-import { getInstallationInfo, PackageManager } from './installationInfo.js';
-import { updateEventEmitter } from './updateEventEmitter.js';
-import type { HistoryItem } from '../ui/types.js';
-import { MessageType } from '../ui/types.js';
-import { spawnWrapper } from './spawnWrapper.js';
-import type { spawn } from 'node:child_process';
+import type { spawn } from "node:child_process";
+import type { LoadedSettings } from "../config/settings.js";
+import type { HistoryItem } from "../ui/types.js";
+import { MessageType } from "../ui/types.js";
+import type { UpdateObject } from "../ui/utils/updateCheck.js";
+import { getInstallationInfo, PackageManager } from "./installationInfo.js";
+import { spawnWrapper } from "./spawnWrapper.js";
+import { updateEventEmitter } from "./updateEventEmitter.js";
 
 export function handleAutoUpdate(
   info: UpdateObject | null,
@@ -23,8 +23,8 @@ export function handleAutoUpdate(
     return;
   }
 
-  if (settings.merged.tools?.sandbox || process.env['GEMINI_SANDBOX']) {
-    updateEventEmitter.emit('update-info', {
+  if (settings.merged.tools?.sandbox || process.env["GEMINI_SANDBOX"]) {
+    updateEventEmitter.emit("update-info", {
       message: `${info.message}\nAutomatic update is not available in sandbox mode.`,
     });
     return;
@@ -52,45 +52,41 @@ export function handleAutoUpdate(
     combinedMessage += `\n${installationInfo.updateMessage}`;
   }
 
-  updateEventEmitter.emit('update-received', {
+  updateEventEmitter.emit("update-received", {
     message: combinedMessage,
   });
 
-  if (
-    !installationInfo.updateCommand ||
-    settings.merged.general?.disableAutoUpdate
-  ) {
+  if (!installationInfo.updateCommand || settings.merged.general?.disableAutoUpdate) {
     return;
   }
-  const isNightly = info.update.latest.includes('nightly');
+  const isNightly = info.update.latest.includes("nightly");
 
   const updateCommand = installationInfo.updateCommand.replace(
-    '@latest',
-    isNightly ? '@nightly' : `@${info.update.latest}`,
+    "@latest",
+    isNightly ? "@nightly" : `@${info.update.latest}`,
   );
   const updateProcess = spawnFn(updateCommand, {
-    stdio: 'ignore',
+    stdio: "ignore",
     shell: true,
     detached: true,
   });
   // Un-reference the child process to allow the parent to exit independently.
   updateProcess.unref();
 
-  updateProcess.on('close', (code) => {
+  updateProcess.on("close", (code) => {
     if (code === 0) {
-      updateEventEmitter.emit('update-success', {
-        message:
-          'Update successful! The new version will be used on your next run.',
+      updateEventEmitter.emit("update-success", {
+        message: "Update successful! The new version will be used on your next run.",
       });
     } else {
-      updateEventEmitter.emit('update-failed', {
+      updateEventEmitter.emit("update-failed", {
         message: `Automatic update failed. Please try updating manually. (command: ${updateCommand})`,
       });
     }
   });
 
-  updateProcess.on('error', (err) => {
-    updateEventEmitter.emit('update-failed', {
+  updateProcess.on("error", (err) => {
+    updateEventEmitter.emit("update-failed", {
       message: `Automatic update failed. Please try updating manually. (error: ${err.message})`,
     });
   });
@@ -98,7 +94,7 @@ export function handleAutoUpdate(
 }
 
 export function setUpdateHandler(
-  addItem: (item: Omit<HistoryItem, 'id'>, timestamp: number) => void,
+  addItem: (item: Omit<HistoryItem, "id">, timestamp: number) => void,
   setUpdateInfo: (info: UpdateObject | null) => void,
 ) {
   let successfullyInstalled = false;
@@ -152,15 +148,15 @@ export function setUpdateHandler(
     );
   };
 
-  updateEventEmitter.on('update-received', handleUpdateReceived);
-  updateEventEmitter.on('update-failed', handleUpdateFailed);
-  updateEventEmitter.on('update-success', handleUpdateSuccess);
-  updateEventEmitter.on('update-info', handleUpdateInfo);
+  updateEventEmitter.on("update-received", handleUpdateReceived);
+  updateEventEmitter.on("update-failed", handleUpdateFailed);
+  updateEventEmitter.on("update-success", handleUpdateSuccess);
+  updateEventEmitter.on("update-info", handleUpdateInfo);
 
   return () => {
-    updateEventEmitter.off('update-received', handleUpdateReceived);
-    updateEventEmitter.off('update-failed', handleUpdateFailed);
-    updateEventEmitter.off('update-success', handleUpdateSuccess);
-    updateEventEmitter.off('update-info', handleUpdateInfo);
+    updateEventEmitter.off("update-received", handleUpdateReceived);
+    updateEventEmitter.off("update-failed", handleUpdateFailed);
+    updateEventEmitter.off("update-success", handleUpdateSuccess);
+    updateEventEmitter.off("update-info", handleUpdateInfo);
   };
 }
diff --git a/packages/ui-gemini/src/utils/installationInfo.test.ts b/packages/ui-gemini/src/utils/installationInfo.test.ts
index dfcae2224..f6c4f1c2a 100644
--- a/packages/ui-gemini/src/utils/installationInfo.test.ts
+++ b/packages/ui-gemini/src/utils/installationInfo.test.ts
@@ -4,23 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { getInstallationInfo, PackageManager } from './installationInfo.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as childProcess from 'node:child_process';
-import { isGitRepository, debugLogger } from '@airiscode/gemini-cli-core';
-
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+import * as childProcess from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { debugLogger, isGitRepository } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { getInstallationInfo, PackageManager } from "./installationInfo.js";
+
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     isGitRepository: vi.fn(),
   };
 });
 
-vi.mock('fs', async (importOriginal) => {
+vi.mock("fs", async (importOriginal) => {
   const actualFs = await importOriginal<typeof fs>();
   return {
     ...actualFs,
@@ -29,8 +28,8 @@ vi.mock('fs', async (importOriginal) => {
   };
 });
 
-vi.mock('child_process', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('child_process')>();
+vi.mock("child_process", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("child_process")>();
   return {
     ...actual,
     execSync: vi.fn(),
@@ -42,31 +41,31 @@ const mockedRealPathSync = vi.mocked(fs.realpathSync);
 const mockedExistsSync = vi.mocked(fs.existsSync);
 const mockedExecSync = vi.mocked(childProcess.execSync);
 
-describe('getInstallationInfo', () => {
-  const projectRoot = '/path/to/project';
+describe("getInstallationInfo", () => {
+  const projectRoot = "/path/to/project";
   let originalArgv: string[];
 
   beforeEach(() => {
     vi.resetAllMocks();
     originalArgv = [...process.argv];
     // Mock process.cwd() for isGitRepository
-    vi.spyOn(process, 'cwd').mockReturnValue(projectRoot);
-    vi.spyOn(debugLogger, 'log').mockImplementation(() => {});
+    vi.spyOn(process, "cwd").mockReturnValue(projectRoot);
+    vi.spyOn(debugLogger, "log").mockImplementation(() => {});
   });
 
   afterEach(() => {
     process.argv = originalArgv;
   });
 
-  it('should return UNKNOWN when cliPath is not available', () => {
-    process.argv[1] = '';
+  it("should return UNKNOWN when cliPath is not available", () => {
+    process.argv[1] = "";
     const info = getInstallationInfo(projectRoot, false);
     expect(info.packageManager).toBe(PackageManager.UNKNOWN);
   });
 
-  it('should return UNKNOWN and log error if realpathSync fails', () => {
-    process.argv[1] = '/path/to/cli';
-    const error = new Error('realpath failed');
+  it("should return UNKNOWN and log error if realpathSync fails", () => {
+    process.argv[1] = "/path/to/cli";
+    const error = new Error("realpath failed");
     mockedRealPathSync.mockImplementation(() => {
       throw error;
     });
@@ -77,11 +76,9 @@ describe('getInstallationInfo', () => {
     expect(debugLogger.log).toHaveBeenCalledWith(error);
   });
 
-  it('should detect running from a local git clone', () => {
+  it("should detect running from a local git clone", () => {
     process.argv[1] = `${projectRoot}/packages/cli/dist/index.js`;
-    mockedRealPathSync.mockReturnValue(
-      `${projectRoot}/packages/cli/dist/index.js`,
-    );
+    mockedRealPathSync.mockReturnValue(`${projectRoot}/packages/cli/dist/index.js`);
     mockedIsGitRepository.mockReturnValue(true);
 
     const info = getInstallationInfo(projectRoot, false);
@@ -93,7 +90,7 @@ describe('getInstallationInfo', () => {
     );
   });
 
-  it('should detect running via npx', () => {
+  it("should detect running via npx", () => {
     const npxPath = `/Users/test/.npm/_npx/12345/bin/gemini`;
     process.argv[1] = npxPath;
     mockedRealPathSync.mockReturnValue(npxPath);
@@ -102,10 +99,10 @@ describe('getInstallationInfo', () => {
 
     expect(info.packageManager).toBe(PackageManager.NPX);
     expect(info.isGlobal).toBe(false);
-    expect(info.updateMessage).toBe('Running via npx, update not applicable.');
+    expect(info.updateMessage).toBe("Running via npx, update not applicable.");
   });
 
-  it('should detect running via pnpx', () => {
+  it("should detect running via pnpx", () => {
     const pnpxPath = `/Users/test/.pnpm/_pnpx/12345/bin/gemini`;
     process.argv[1] = pnpxPath;
     mockedRealPathSync.mockReturnValue(pnpxPath);
@@ -114,39 +111,38 @@ describe('getInstallationInfo', () => {
 
     expect(info.packageManager).toBe(PackageManager.PNPX);
     expect(info.isGlobal).toBe(false);
-    expect(info.updateMessage).toBe('Running via pnpx, update not applicable.');
+    expect(info.updateMessage).toBe("Running via pnpx, update not applicable.");
   });
 
-  it('should detect running via bunx', () => {
+  it("should detect running via bunx", () => {
     const bunxPath = `/Users/test/.bun/install/cache/12345/bin/gemini`;
     process.argv[1] = bunxPath;
     mockedRealPathSync.mockReturnValue(bunxPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
 
     const info = getInstallationInfo(projectRoot, false);
 
     expect(info.packageManager).toBe(PackageManager.BUNX);
     expect(info.isGlobal).toBe(false);
-    expect(info.updateMessage).toBe('Running via bunx, update not applicable.');
+    expect(info.updateMessage).toBe("Running via bunx, update not applicable.");
   });
 
-  it('should detect Homebrew installation via execSync', () => {
-    Object.defineProperty(process, 'platform', {
-      value: 'darwin',
+  it("should detect Homebrew installation via execSync", () => {
+    Object.defineProperty(process, "platform", {
+      value: "darwin",
     });
-    const cliPath = '/usr/local/bin/gemini';
+    const cliPath = "/usr/local/bin/gemini";
     process.argv[1] = cliPath;
     mockedRealPathSync.mockReturnValue(cliPath);
-    mockedExecSync.mockReturnValue(Buffer.from('gemini-cli')); // Simulate successful command
+    mockedExecSync.mockReturnValue(Buffer.from("gemini-cli")); // Simulate successful command
 
     const info = getInstallationInfo(projectRoot, false);
 
-    expect(mockedExecSync).toHaveBeenCalledWith(
-      'brew list -1 | grep -q "^gemini-cli$"',
-      { stdio: 'ignore' },
-    );
+    expect(mockedExecSync).toHaveBeenCalledWith('brew list -1 | grep -q "^gemini-cli$"', {
+      stdio: "ignore",
+    });
     expect(info.packageManager).toBe(PackageManager.HOMEBREW);
     expect(info.isGlobal).toBe(true);
     expect(info.updateMessage).toBe(
@@ -154,112 +150,105 @@ describe('getInstallationInfo', () => {
     );
   });
 
-  it('should fall through if brew command fails', () => {
-    Object.defineProperty(process, 'platform', {
-      value: 'darwin',
+  it("should fall through if brew command fails", () => {
+    Object.defineProperty(process, "platform", {
+      value: "darwin",
     });
-    const cliPath = '/usr/local/bin/gemini';
+    const cliPath = "/usr/local/bin/gemini";
     process.argv[1] = cliPath;
     mockedRealPathSync.mockReturnValue(cliPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
 
     const info = getInstallationInfo(projectRoot, false);
 
-    expect(mockedExecSync).toHaveBeenCalledWith(
-      'brew list -1 | grep -q "^gemini-cli$"',
-      { stdio: 'ignore' },
-    );
+    expect(mockedExecSync).toHaveBeenCalledWith('brew list -1 | grep -q "^gemini-cli$"', {
+      stdio: "ignore",
+    });
     // Should fall back to default global npm
     expect(info.packageManager).toBe(PackageManager.NPM);
     expect(info.isGlobal).toBe(true);
   });
 
-  it('should detect global pnpm installation', () => {
+  it("should detect global pnpm installation", () => {
     const pnpmPath = `/Users/test/.pnpm/global/5/node_modules/.pnpm/some-hash/node_modules/@airiscode/ui-gemini/dist/index.js`;
     process.argv[1] = pnpmPath;
     mockedRealPathSync.mockReturnValue(pnpmPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
 
     const info = getInstallationInfo(projectRoot, false);
     expect(info.packageManager).toBe(PackageManager.PNPM);
     expect(info.isGlobal).toBe(true);
-    expect(info.updateCommand).toBe('pnpm add -g @airiscode/ui-gemini@latest');
-    expect(info.updateMessage).toContain('Attempting to automatically update');
+    expect(info.updateCommand).toBe("pnpm add -g @airiscode/ui-gemini@latest");
+    expect(info.updateMessage).toContain("Attempting to automatically update");
 
     const infoDisabled = getInstallationInfo(projectRoot, true);
-    expect(infoDisabled.updateMessage).toContain('Please run pnpm add');
+    expect(infoDisabled.updateMessage).toContain("Please run pnpm add");
   });
 
-  it('should detect global yarn installation', () => {
+  it("should detect global yarn installation", () => {
     const yarnPath = `/Users/test/.yarn/global/node_modules/@airiscode/ui-gemini/dist/index.js`;
     process.argv[1] = yarnPath;
     mockedRealPathSync.mockReturnValue(yarnPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
 
     const info = getInstallationInfo(projectRoot, false);
     expect(info.packageManager).toBe(PackageManager.YARN);
     expect(info.isGlobal).toBe(true);
-    expect(info.updateCommand).toBe(
-      'yarn global add @airiscode/ui-gemini@latest',
-    );
-    expect(info.updateMessage).toContain('Attempting to automatically update');
+    expect(info.updateCommand).toBe("yarn global add @airiscode/ui-gemini@latest");
+    expect(info.updateMessage).toContain("Attempting to automatically update");
 
     const infoDisabled = getInstallationInfo(projectRoot, true);
-    expect(infoDisabled.updateMessage).toContain('Please run yarn global add');
+    expect(infoDisabled.updateMessage).toContain("Please run yarn global add");
   });
 
-  it('should detect global bun installation', () => {
+  it("should detect global bun installation", () => {
     const bunPath = `/Users/test/.bun/bin/gemini`;
     process.argv[1] = bunPath;
     mockedRealPathSync.mockReturnValue(bunPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
 
     const info = getInstallationInfo(projectRoot, false);
     expect(info.packageManager).toBe(PackageManager.BUN);
     expect(info.isGlobal).toBe(true);
-    expect(info.updateCommand).toBe('bun add -g @airiscode/ui-gemini@latest');
-    expect(info.updateMessage).toContain('Attempting to automatically update');
+    expect(info.updateCommand).toBe("bun add -g @airiscode/ui-gemini@latest");
+    expect(info.updateMessage).toContain("Attempting to automatically update");
 
     const infoDisabled = getInstallationInfo(projectRoot, true);
-    expect(infoDisabled.updateMessage).toContain('Please run bun add');
+    expect(infoDisabled.updateMessage).toContain("Please run bun add");
   });
 
-  it('should detect local installation and identify yarn from lockfile', () => {
+  it("should detect local installation and identify yarn from lockfile", () => {
     const localPath = `${projectRoot}/node_modules/.bin/gemini`;
     process.argv[1] = localPath;
     mockedRealPathSync.mockReturnValue(localPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
-    mockedExistsSync.mockImplementation(
-      (p) => p === path.join(projectRoot, 'yarn.lock'),
-    );
+    mockedExistsSync.mockImplementation((p) => p === path.join(projectRoot, "yarn.lock"));
 
     const info = getInstallationInfo(projectRoot, false);
 
     expect(info.packageManager).toBe(PackageManager.YARN);
     expect(info.isGlobal).toBe(false);
-    expect(info.updateMessage).toContain('Locally installed');
+    expect(info.updateMessage).toContain("Locally installed");
   });
 
-  it('should detect local installation and identify pnpm from lockfile', () => {
+  it("should detect local installation and identify pnpm from lockfile", () => {
     const localPath = `${projectRoot}/node_modules/.bin/gemini`;
     process.argv[1] = localPath;
     mockedRealPathSync.mockReturnValue(localPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
-    mockedExistsSync.mockImplementation(
-      (p) => p === path.join(projectRoot, 'pnpm-lock.yaml'),
-    );
+    mockedExistsSync.mockImplementation((p) => p === path.join(projectRoot, "pnpm-lock.yaml"));
 
     const info = getInstallationInfo(projectRoot, false);
 
@@ -267,16 +256,14 @@ describe('getInstallationInfo', () => {
     expect(info.isGlobal).toBe(false);
   });
 
-  it('should detect local installation and identify bun from lockfile', () => {
+  it("should detect local installation and identify bun from lockfile", () => {
     const localPath = `${projectRoot}/node_modules/.bin/gemini`;
     process.argv[1] = localPath;
     mockedRealPathSync.mockReturnValue(localPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
-    mockedExistsSync.mockImplementation(
-      (p) => p === path.join(projectRoot, 'bun.lockb'),
-    );
+    mockedExistsSync.mockImplementation((p) => p === path.join(projectRoot, "bun.lockb"));
 
     const info = getInstallationInfo(projectRoot, false);
 
@@ -284,12 +271,12 @@ describe('getInstallationInfo', () => {
     expect(info.isGlobal).toBe(false);
   });
 
-  it('should default to local npm installation if no lockfile is found', () => {
+  it("should default to local npm installation if no lockfile is found", () => {
     const localPath = `${projectRoot}/node_modules/.bin/gemini`;
     process.argv[1] = localPath;
     mockedRealPathSync.mockReturnValue(localPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
     mockedExistsSync.mockReturnValue(false); // No lockfiles
 
@@ -299,21 +286,21 @@ describe('getInstallationInfo', () => {
     expect(info.isGlobal).toBe(false);
   });
 
-  it('should default to global npm installation for unrecognized paths', () => {
+  it("should default to global npm installation for unrecognized paths", () => {
     const globalPath = `/usr/local/bin/gemini`;
     process.argv[1] = globalPath;
     mockedRealPathSync.mockReturnValue(globalPath);
     mockedExecSync.mockImplementation(() => {
-      throw new Error('Command failed');
+      throw new Error("Command failed");
     });
 
     const info = getInstallationInfo(projectRoot, false);
     expect(info.packageManager).toBe(PackageManager.NPM);
     expect(info.isGlobal).toBe(true);
-    expect(info.updateCommand).toBe('npm install -g @airiscode/ui-gemini@latest');
-    expect(info.updateMessage).toContain('Attempting to automatically update');
+    expect(info.updateCommand).toBe("npm install -g @airiscode/ui-gemini@latest");
+    expect(info.updateMessage).toContain("Attempting to automatically update");
 
     const infoDisabled = getInstallationInfo(projectRoot, true);
-    expect(infoDisabled.updateMessage).toContain('Please run npm install');
+    expect(infoDisabled.updateMessage).toContain("Please run npm install");
   });
 });
diff --git a/packages/ui-gemini/src/utils/installationInfo.ts b/packages/ui-gemini/src/utils/installationInfo.ts
index 37cb97a99..8291bab14 100644
--- a/packages/ui-gemini/src/utils/installationInfo.ts
+++ b/packages/ui-gemini/src/utils/installationInfo.ts
@@ -4,24 +4,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger, isGitRepository } from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as childProcess from 'node:child_process';
-import process from 'node:process';
+import * as childProcess from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import process from "node:process";
+import { debugLogger, isGitRepository } from "@airiscode/gemini-cli-core";
 
-export const isDevelopment = process.env['NODE_ENV'] === 'development';
+export const isDevelopment = process.env["NODE_ENV"] === "development";
 
 export enum PackageManager {
-  NPM = 'npm',
-  YARN = 'yarn',
-  PNPM = 'pnpm',
-  PNPX = 'pnpx',
-  BUN = 'bun',
-  BUNX = 'bunx',
-  HOMEBREW = 'homebrew',
-  NPX = 'npx',
-  UNKNOWN = 'unknown',
+  NPM = "npm",
+  YARN = "yarn",
+  PNPM = "pnpm",
+  PNPX = "pnpx",
+  BUN = "bun",
+  BUNX = "bunx",
+  HOMEBREW = "homebrew",
+  NPX = "npx",
+  UNKNOWN = "unknown",
 }
 
 export interface InstallationInfo {
@@ -42,8 +42,8 @@ export function getInstallationInfo(
 
   try {
     // Normalize path separators to forward slashes for consistent matching.
-    const realPath = fs.realpathSync(cliPath).replace(/\\/g, '/');
-    const normalizedProjectRoot = projectRoot?.replace(/\\/g, '/');
+    const realPath = fs.realpathSync(cliPath).replace(/\\/g, "/");
+    const normalizedProjectRoot = projectRoot?.replace(/\\/g, "/");
     const isGit = isGitRepository(process.cwd());
 
     // Check for local git clone first
@@ -51,44 +51,42 @@ export function getInstallationInfo(
       isGit &&
       normalizedProjectRoot &&
       realPath.startsWith(normalizedProjectRoot) &&
-      !realPath.includes('/node_modules/')
+      !realPath.includes("/node_modules/")
     ) {
       return {
         packageManager: PackageManager.UNKNOWN, // Not managed by a package manager in this sense
         isGlobal: false,
-        updateMessage:
-          'Running from a local git clone. Please update with "git pull".',
+        updateMessage: 'Running from a local git clone. Please update with "git pull".',
       };
     }
 
     // Check for npx/pnpx
-    if (realPath.includes('/.npm/_npx') || realPath.includes('/npm/_npx')) {
+    if (realPath.includes("/.npm/_npx") || realPath.includes("/npm/_npx")) {
       return {
         packageManager: PackageManager.NPX,
         isGlobal: false,
-        updateMessage: 'Running via npx, update not applicable.',
+        updateMessage: "Running via npx, update not applicable.",
       };
     }
-    if (realPath.includes('/.pnpm/_pnpx')) {
+    if (realPath.includes("/.pnpm/_pnpx")) {
       return {
         packageManager: PackageManager.PNPX,
         isGlobal: false,
-        updateMessage: 'Running via pnpx, update not applicable.',
+        updateMessage: "Running via pnpx, update not applicable.",
       };
     }
 
     // Check for Homebrew
-    if (process.platform === 'darwin') {
+    if (process.platform === "darwin") {
       try {
         // The package name in homebrew is gemini-cli
         childProcess.execSync('brew list -1 | grep -q "^gemini-cli$"', {
-          stdio: 'ignore',
+          stdio: "ignore",
         });
         return {
           packageManager: PackageManager.HOMEBREW,
           isGlobal: true,
-          updateMessage:
-            'Installed via Homebrew. Please update with "brew upgrade gemini-cli".',
+          updateMessage: 'Installed via Homebrew. Please update with "brew upgrade gemini-cli".',
         };
       } catch (_error) {
         // Brew is not installed or gemini-cli is not installed via brew.
@@ -97,81 +95,77 @@ export function getInstallationInfo(
     }
 
     // Check for pnpm
-    if (realPath.includes('/.pnpm/global')) {
-      const updateCommand = 'pnpm add -g @airiscode/ui-gemini@latest';
+    if (realPath.includes("/.pnpm/global")) {
+      const updateCommand = "pnpm add -g @airiscode/ui-gemini@latest";
       return {
         packageManager: PackageManager.PNPM,
         isGlobal: true,
         updateCommand,
         updateMessage: isAutoUpdateDisabled
           ? `Please run ${updateCommand} to update`
-          : 'Installed with pnpm. Attempting to automatically update now...',
+          : "Installed with pnpm. Attempting to automatically update now...",
       };
     }
 
     // Check for yarn
-    if (realPath.includes('/.yarn/global')) {
-      const updateCommand = 'yarn global add @airiscode/ui-gemini@latest';
+    if (realPath.includes("/.yarn/global")) {
+      const updateCommand = "yarn global add @airiscode/ui-gemini@latest";
       return {
         packageManager: PackageManager.YARN,
         isGlobal: true,
         updateCommand,
         updateMessage: isAutoUpdateDisabled
           ? `Please run ${updateCommand} to update`
-          : 'Installed with yarn. Attempting to automatically update now...',
+          : "Installed with yarn. Attempting to automatically update now...",
       };
     }
 
     // Check for bun
-    if (realPath.includes('/.bun/install/cache')) {
+    if (realPath.includes("/.bun/install/cache")) {
       return {
         packageManager: PackageManager.BUNX,
         isGlobal: false,
-        updateMessage: 'Running via bunx, update not applicable.',
+        updateMessage: "Running via bunx, update not applicable.",
       };
     }
-    if (realPath.includes('/.bun/bin')) {
-      const updateCommand = 'bun add -g @airiscode/ui-gemini@latest';
+    if (realPath.includes("/.bun/bin")) {
+      const updateCommand = "bun add -g @airiscode/ui-gemini@latest";
       return {
         packageManager: PackageManager.BUN,
         isGlobal: true,
         updateCommand,
         updateMessage: isAutoUpdateDisabled
           ? `Please run ${updateCommand} to update`
-          : 'Installed with bun. Attempting to automatically update now...',
+          : "Installed with bun. Attempting to automatically update now...",
       };
     }
 
     // Check for local install
-    if (
-      normalizedProjectRoot &&
-      realPath.startsWith(`${normalizedProjectRoot}/node_modules`)
-    ) {
+    if (normalizedProjectRoot && realPath.startsWith(`${normalizedProjectRoot}/node_modules`)) {
       let pm = PackageManager.NPM;
-      if (fs.existsSync(path.join(projectRoot, 'yarn.lock'))) {
+      if (fs.existsSync(path.join(projectRoot, "yarn.lock"))) {
         pm = PackageManager.YARN;
-      } else if (fs.existsSync(path.join(projectRoot, 'pnpm-lock.yaml'))) {
+      } else if (fs.existsSync(path.join(projectRoot, "pnpm-lock.yaml"))) {
         pm = PackageManager.PNPM;
-      } else if (fs.existsSync(path.join(projectRoot, 'bun.lockb'))) {
+      } else if (fs.existsSync(path.join(projectRoot, "bun.lockb"))) {
         pm = PackageManager.BUN;
       }
       return {
         packageManager: pm,
         isGlobal: false,
-        updateMessage:
-          "Locally installed. Please update via your project's package.json.",
+        updateMessage: "Locally installed. Please update via your project's package.json.",
       };
     }
 
     // Assume global npm
-    const updateCommand = 'npm install -g @airiscode/ui-gemini@latest';
+    const updateCommand = "npm install -g @airiscode/ui-gemini@latest";
     return {
       packageManager: PackageManager.NPM,
       isGlobal: true,
       updateCommand,
       updateMessage: isAutoUpdateDisabled
         ? `Please run ${updateCommand} to update`
-        : 'Installed with npm. Attempting to automatically update now...',
+        : "Installed with npm. Attempting to automatically update now...",
     };
   } catch (error) {
     debugLogger.log(error);
diff --git a/packages/ui-gemini/src/utils/math.test.ts b/packages/ui-gemini/src/utils/math.test.ts
index b94b2cf96..1f1277669 100644
--- a/packages/ui-gemini/src/utils/math.test.ts
+++ b/packages/ui-gemini/src/utils/math.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
-import { lerp } from './math.js';
+import { describe, expect, it } from "vitest";
+import { lerp } from "./math.js";
 
-describe('math', () => {
-  describe('lerp', () => {
+describe("math", () => {
+  describe("lerp", () => {
     it.each([
       [0, 10, 0, 0],
       [0, 10, 1, 10],
@@ -17,7 +17,7 @@ describe('math', () => {
       [-10, 10, 0.5, 0],
       [0, 10, 2, 20],
       [0, 10, -1, -10],
-    ])('lerp(%d, %d, %d) should return %d', (start, end, t, expected) => {
+    ])("lerp(%d, %d, %d) should return %d", (start, end, t, expected) => {
       expect(lerp(start, end, t)).toBe(expected);
     });
   });
diff --git a/packages/ui-gemini/src/utils/math.ts b/packages/ui-gemini/src/utils/math.ts
index f067a4ef9..e1297590f 100644
--- a/packages/ui-gemini/src/utils/math.ts
+++ b/packages/ui-gemini/src/utils/math.ts
@@ -11,5 +11,4 @@
  * @param end The end value.
  * @param t The interpolation amount (typically between 0 and 1).
  */
-export const lerp = (start: number, end: number, t: number): number =>
-  start + (end - start) * t;
+export const lerp = (start: number, end: number, t: number): number => start + (end - start) * t;
diff --git a/packages/ui-gemini/src/utils/persistentState.test.ts b/packages/ui-gemini/src/utils/persistentState.test.ts
index 7e94fd3f9..85fc53216 100644
--- a/packages/ui-gemini/src/utils/persistentState.test.ts
+++ b/packages/ui-gemini/src/utils/persistentState.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { Storage, debugLogger } from '@airiscode/gemini-cli-core';
-import { PersistentState } from './persistentState.js';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { debugLogger, Storage } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { PersistentState } from "./persistentState.js";
 
-vi.mock('node:fs');
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("node:fs");
+vi.mock("@airiscode/gemini-cli-core", () => ({
   Storage: {
     getGlobalGeminiDir: vi.fn(),
   },
@@ -20,10 +20,10 @@ vi.mock('@airiscode/gemini-cli-core', () => ({
   },
 }));
 
-describe('PersistentState', () => {
+describe("PersistentState", () => {
   let persistentState: PersistentState;
-  const mockDir = '/mock/dir';
-  const mockFilePath = path.join(mockDir, 'state.json');
+  const mockDir = "/mock/dir";
+  const mockFilePath = path.join(mockDir, "state.json");
 
   beforeEach(() => {
     vi.resetAllMocks();
@@ -31,25 +31,25 @@ describe('PersistentState', () => {
     persistentState = new PersistentState();
   });
 
-  it('should load state from file if it exists', () => {
+  it("should load state from file if it exists", () => {
     const mockData = { defaultBannerShownCount: { banner1: 1 } };
     vi.mocked(fs.existsSync).mockReturnValue(true);
     vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify(mockData));
 
-    const value = persistentState.get('defaultBannerShownCount');
+    const value = persistentState.get("defaultBannerShownCount");
     expect(value).toEqual(mockData.defaultBannerShownCount);
-    expect(fs.readFileSync).toHaveBeenCalledWith(mockFilePath, 'utf-8');
+    expect(fs.readFileSync).toHaveBeenCalledWith(mockFilePath, "utf-8");
   });
 
-  it('should return undefined if key does not exist', () => {
+  it("should return undefined if key does not exist", () => {
     vi.mocked(fs.existsSync).mockReturnValue(false);
-    const value = persistentState.get('defaultBannerShownCount');
+    const value = persistentState.get("defaultBannerShownCount");
     expect(value).toBeUndefined();
   });
 
-  it('should save state to file', () => {
+  it("should save state to file", () => {
     vi.mocked(fs.existsSync).mockReturnValue(false);
-    persistentState.set('defaultBannerShownCount', { banner1: 1 });
+    persistentState.set("defaultBannerShownCount", { banner1: 1 });
 
     expect(fs.mkdirSync).toHaveBeenCalledWith(path.normalize(mockDir), {
       recursive: true,
@@ -60,24 +60,24 @@ describe('PersistentState', () => {
     );
   });
 
-  it('should handle load errors and start fresh', () => {
+  it("should handle load errors and start fresh", () => {
     vi.mocked(fs.existsSync).mockReturnValue(true);
     vi.mocked(fs.readFileSync).mockImplementation(() => {
-      throw new Error('Read error');
+      throw new Error("Read error");
     });
 
-    const value = persistentState.get('defaultBannerShownCount');
+    const value = persistentState.get("defaultBannerShownCount");
     expect(value).toBeUndefined();
     expect(debugLogger.warn).toHaveBeenCalled();
   });
 
-  it('should handle save errors', () => {
+  it("should handle save errors", () => {
     vi.mocked(fs.existsSync).mockReturnValue(false);
     vi.mocked(fs.writeFileSync).mockImplementation(() => {
-      throw new Error('Write error');
+      throw new Error("Write error");
     });
 
-    persistentState.set('defaultBannerShownCount', { banner1: 1 });
+    persistentState.set("defaultBannerShownCount", { banner1: 1 });
     expect(debugLogger.warn).toHaveBeenCalled();
   });
 });
diff --git a/packages/ui-gemini/src/utils/persistentState.ts b/packages/ui-gemini/src/utils/persistentState.ts
index a08c1d721..705fdebd6 100644
--- a/packages/ui-gemini/src/utils/persistentState.ts
+++ b/packages/ui-gemini/src/utils/persistentState.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Storage, debugLogger } from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { debugLogger, Storage } from "@airiscode/gemini-cli-core";
 
-const STATE_FILENAME = 'state.json';
+const STATE_FILENAME = "state.json";
 
 interface PersistentStateData {
   defaultBannerShownCount?: Record<string, number>;
@@ -33,13 +33,13 @@ export class PersistentState {
     try {
       const filePath = this.getPath();
       if (fs.existsSync(filePath)) {
-        const content = fs.readFileSync(filePath, 'utf-8');
+        const content = fs.readFileSync(filePath, "utf-8");
         this.cache = JSON.parse(content);
       } else {
         this.cache = {};
       }
     } catch (error) {
-      debugLogger.warn('Failed to load persistent state:', error);
+      debugLogger.warn("Failed to load persistent state:", error);
       // If error reading (e.g. corrupt JSON), start fresh
       this.cache = {};
     }
@@ -56,20 +56,15 @@ export class PersistentState {
       }
       fs.writeFileSync(filePath, JSON.stringify(this.cache, null, 2));
     } catch (error) {
-      debugLogger.warn('Failed to save persistent state:', error);
+      debugLogger.warn("Failed to save persistent state:", error);
     }
   }
 
-  get<K extends keyof PersistentStateData>(
-    key: K,
-  ): PersistentStateData[K] | undefined {
+  get<K extends keyof PersistentStateData>(key: K): PersistentStateData[K] | undefined {
     return this.load()[key];
   }
 
-  set<K extends keyof PersistentStateData>(
-    key: K,
-    value: PersistentStateData[K],
-  ): void {
+  set<K extends keyof PersistentStateData>(key: K, value: PersistentStateData[K]): void {
     this.load(); // ensure loaded
     this.cache![key] = value;
     this.save();
diff --git a/packages/ui-gemini/src/utils/processUtils.test.ts b/packages/ui-gemini/src/utils/processUtils.test.ts
index be85a4dba..a9c711a05 100644
--- a/packages/ui-gemini/src/utils/processUtils.test.ts
+++ b/packages/ui-gemini/src/utils/processUtils.test.ts
@@ -4,17 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi } from 'vitest';
-import { RELAUNCH_EXIT_CODE, relaunchApp } from './processUtils.js';
-import * as cleanup from './cleanup.js';
+import { vi } from "vitest";
+import * as cleanup from "./cleanup.js";
+import { RELAUNCH_EXIT_CODE, relaunchApp } from "./processUtils.js";
 
-describe('processUtils', () => {
-  const processExit = vi
-    .spyOn(process, 'exit')
-    .mockReturnValue(undefined as never);
-  const runExitCleanup = vi.spyOn(cleanup, 'runExitCleanup');
+describe("processUtils", () => {
+  const processExit = vi.spyOn(process, "exit").mockReturnValue(undefined as never);
+  const runExitCleanup = vi.spyOn(cleanup, "runExitCleanup");
 
-  it('should run cleanup and exit with the relaunch code', async () => {
+  it("should run cleanup and exit with the relaunch code", async () => {
     await relaunchApp();
     expect(runExitCleanup).toHaveBeenCalledTimes(1);
     expect(processExit).toHaveBeenCalledWith(RELAUNCH_EXIT_CODE);
diff --git a/packages/ui-gemini/src/utils/processUtils.ts b/packages/ui-gemini/src/utils/processUtils.ts
index 7d3f1bcbf..e87731b3c 100644
--- a/packages/ui-gemini/src/utils/processUtils.ts
+++ b/packages/ui-gemini/src/utils/processUtils.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { runExitCleanup } from './cleanup.js';
+import { runExitCleanup } from "./cleanup.js";
 
 /**
  * Exit code used to signal that the CLI should be relaunched.
diff --git a/packages/ui-gemini/src/utils/readStdin.test.ts b/packages/ui-gemini/src/utils/readStdin.test.ts
index 9743ffe47..bd7eb01e7 100644
--- a/packages/ui-gemini/src/utils/readStdin.test.ts
+++ b/packages/ui-gemini/src/utils/readStdin.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
-import { readStdin } from './readStdin.js';
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { readStdin } from "./readStdin.js";
 
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("@airiscode/gemini-cli-core", () => ({
   debugLogger: {
     warn: vi.fn(),
   },
@@ -23,7 +23,7 @@ const mockStdin = {
   destroy: vi.fn(),
 };
 
-describe('readStdin', () => {
+describe("readStdin", () => {
   let originalStdin: typeof process.stdin;
   let onReadableHandler: () => void;
   let onEndHandler: () => void;
@@ -34,35 +34,33 @@ describe('readStdin', () => {
     originalStdin = process.stdin;
 
     // Replace process.stdin with our mock
-    Object.defineProperty(process, 'stdin', {
+    Object.defineProperty(process, "stdin", {
       value: mockStdin,
       writable: true,
       configurable: true,
     });
 
     // Capture event handlers
-    mockStdin.on.mockImplementation(
-      (event: string, handler: (...args: unknown[]) => void) => {
-        if (event === 'readable') onReadableHandler = handler as () => void;
-        if (event === 'end') onEndHandler = handler as () => void;
-        if (event === 'error') onErrorHandler = handler as (err: Error) => void;
-      },
-    );
+    mockStdin.on.mockImplementation((event: string, handler: (...args: unknown[]) => void) => {
+      if (event === "readable") onReadableHandler = handler as () => void;
+      if (event === "end") onEndHandler = handler as () => void;
+      if (event === "error") onErrorHandler = handler as (err: Error) => void;
+    });
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
-    Object.defineProperty(process, 'stdin', {
+    Object.defineProperty(process, "stdin", {
       value: originalStdin,
       writable: true,
       configurable: true,
     });
   });
 
-  it('should read and accumulate data from stdin', async () => {
+  it("should read and accumulate data from stdin", async () => {
     mockStdin.read
-      .mockReturnValueOnce('I love ')
-      .mockReturnValueOnce('Gemini!')
+      .mockReturnValueOnce("I love ")
+      .mockReturnValueOnce("Gemini!")
       .mockReturnValueOnce(null);
 
     const promise = readStdin();
@@ -73,10 +71,10 @@ describe('readStdin', () => {
     // Trigger end to resolve
     onEndHandler();
 
-    await expect(promise).resolves.toBe('I love Gemini!');
+    await expect(promise).resolves.toBe("I love Gemini!");
   });
 
-  it('should handle empty stdin input', async () => {
+  it("should handle empty stdin input", async () => {
     mockStdin.read.mockReturnValue(null);
 
     const promise = readStdin();
@@ -84,11 +82,11 @@ describe('readStdin', () => {
     // Trigger end immediately
     onEndHandler();
 
-    await expect(promise).resolves.toBe('');
+    await expect(promise).resolves.toBe("");
   });
 
   // Emulate terminals where stdin is not TTY (eg: git bash)
-  it('should timeout and resolve with empty string when no input is available', async () => {
+  it("should timeout and resolve with empty string when no input is available", async () => {
     vi.useFakeTimers();
 
     const promise = readStdin();
@@ -96,16 +94,16 @@ describe('readStdin', () => {
     // Fast-forward past the timeout (to run test faster)
     vi.advanceTimersByTime(500);
 
-    await expect(promise).resolves.toBe('');
+    await expect(promise).resolves.toBe("");
 
     vi.useRealTimers();
   });
 
-  it('should clear timeout once when data is received and resolve with data', async () => {
-    const clearTimeoutSpy = vi.spyOn(global, 'clearTimeout');
+  it("should clear timeout once when data is received and resolve with data", async () => {
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
     mockStdin.read
-      .mockReturnValueOnce('chunk1')
-      .mockReturnValueOnce('chunk2')
+      .mockReturnValueOnce("chunk1")
+      .mockReturnValueOnce("chunk2")
       .mockReturnValueOnce(null);
 
     const promise = readStdin();
@@ -118,28 +116,28 @@ describe('readStdin', () => {
     // Trigger end to resolve
     onEndHandler();
 
-    await expect(promise).resolves.toBe('chunk1chunk2');
+    await expect(promise).resolves.toBe("chunk1chunk2");
   });
 
-  it('should truncate input if it exceeds MAX_STDIN_SIZE', async () => {
+  it("should truncate input if it exceeds MAX_STDIN_SIZE", async () => {
     const MAX_STDIN_SIZE = 8 * 1024 * 1024;
-    const largeChunk = 'a'.repeat(MAX_STDIN_SIZE + 100);
+    const largeChunk = "a".repeat(MAX_STDIN_SIZE + 100);
     mockStdin.read.mockReturnValueOnce(largeChunk).mockReturnValueOnce(null);
 
     const promise = readStdin();
     onReadableHandler();
 
-    await expect(promise).resolves.toBe('a'.repeat(MAX_STDIN_SIZE));
+    await expect(promise).resolves.toBe("a".repeat(MAX_STDIN_SIZE));
     expect(debugLogger.warn).toHaveBeenCalledWith(
       `Warning: stdin input truncated to ${MAX_STDIN_SIZE} bytes.`,
     );
     expect(mockStdin.destroy).toHaveBeenCalled();
   });
 
-  it('should handle stdin error', async () => {
+  it("should handle stdin error", async () => {
     const promise = readStdin();
-    const error = new Error('stdin error');
+    const error = new Error("stdin error");
     onErrorHandler(error);
-    await expect(promise).rejects.toThrow('stdin error');
+    await expect(promise).rejects.toThrow("stdin error");
   });
 });
diff --git a/packages/ui-gemini/src/utils/readStdin.ts b/packages/ui-gemini/src/utils/readStdin.ts
index b05738f8e..f62681619 100644
--- a/packages/ui-gemini/src/utils/readStdin.ts
+++ b/packages/ui-gemini/src/utils/readStdin.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { debugLogger } from '@airiscode/gemini-cli-core';
+import { debugLogger } from "@airiscode/gemini-cli-core";
 
 export async function readStdin(): Promise<string> {
   const MAX_STDIN_SIZE = 8 * 1024 * 1024; // 8MB
   return new Promise((resolve, reject) => {
-    let data = '';
+    let data = "";
     let totalSize = 0;
-    process.stdin.setEncoding('utf8');
+    process.stdin.setEncoding("utf8");
 
     const pipedInputShouldBeAvailableInMs = 500;
     let pipedInputTimerId: null | NodeJS.Timeout = setTimeout(() => {
@@ -32,9 +32,7 @@ export async function readStdin(): Promise<string> {
         if (totalSize + chunk.length > MAX_STDIN_SIZE) {
           const remainingSize = MAX_STDIN_SIZE - totalSize;
           data += chunk.slice(0, remainingSize);
-          debugLogger.warn(
-            `Warning: stdin input truncated to ${MAX_STDIN_SIZE} bytes.`,
-          );
+          debugLogger.warn(`Warning: stdin input truncated to ${MAX_STDIN_SIZE} bytes.`);
           process.stdin.destroy(); // Stop reading further
           onEnd();
           break;
@@ -59,13 +57,13 @@ export async function readStdin(): Promise<string> {
         clearTimeout(pipedInputTimerId);
         pipedInputTimerId = null;
       }
-      process.stdin.removeListener('readable', onReadable);
-      process.stdin.removeListener('end', onEnd);
-      process.stdin.removeListener('error', onError);
+      process.stdin.removeListener("readable", onReadable);
+      process.stdin.removeListener("end", onEnd);
+      process.stdin.removeListener("error", onError);
     };
 
-    process.stdin.on('readable', onReadable);
-    process.stdin.on('end', onEnd);
-    process.stdin.on('error', onError);
+    process.stdin.on("readable", onReadable);
+    process.stdin.on("end", onEnd);
+    process.stdin.on("error", onError);
   });
 }
diff --git a/packages/ui-gemini/src/utils/relaunch.test.ts b/packages/ui-gemini/src/utils/relaunch.test.ts
index e627a07a4..bce01aa2a 100644
--- a/packages/ui-gemini/src/utils/relaunch.test.ts
+++ b/packages/ui-gemini/src/utils/relaunch.test.ts
@@ -4,22 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  vi,
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  type MockInstance,
-} from 'vitest';
-import { EventEmitter } from 'node:events';
-import { RELAUNCH_EXIT_CODE } from './processUtils.js';
-import type { ChildProcess } from 'node:child_process';
-import { spawn } from 'node:child_process';
-
-vi.mock('node:child_process', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:child_process')>();
+import type { ChildProcess } from "node:child_process";
+import { spawn } from "node:child_process";
+import { EventEmitter } from "node:events";
+import { afterEach, beforeEach, describe, expect, it, type MockInstance, vi } from "vitest";
+import { RELAUNCH_EXIT_CODE } from "./processUtils.js";
+
+vi.mock("node:child_process", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:child_process")>();
   return {
     ...actual,
     spawn: vi.fn(),
@@ -29,21 +21,19 @@ vi.mock('node:child_process', async (importOriginal) => {
 const mockedSpawn = vi.mocked(spawn);
 
 // Import the functions initially
-import { relaunchAppInChildProcess, relaunchOnExitCode } from './relaunch.js';
+import { relaunchAppInChildProcess, relaunchOnExitCode } from "./relaunch.js";
 
-describe('relaunchOnExitCode', () => {
+describe("relaunchOnExitCode", () => {
   let processExitSpy: MockInstance;
   let consoleErrorSpy: MockInstance;
   let stdinResumeSpy: MockInstance;
 
   beforeEach(() => {
-    processExitSpy = vi.spyOn(process, 'exit').mockImplementation(() => {
-      throw new Error('PROCESS_EXIT_CALLED');
+    processExitSpy = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("PROCESS_EXIT_CALLED");
     });
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    stdinResumeSpy = vi
-      .spyOn(process.stdin, 'resume')
-      .mockImplementation(() => process.stdin);
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    stdinResumeSpy = vi.spyOn(process.stdin, "resume").mockImplementation(() => process.stdin);
     vi.clearAllMocks();
   });
 
@@ -53,18 +43,16 @@ describe('relaunchOnExitCode', () => {
     stdinResumeSpy.mockRestore();
   });
 
-  it('should exit with non-RELAUNCH_EXIT_CODE', async () => {
+  it("should exit with non-RELAUNCH_EXIT_CODE", async () => {
     const runner = vi.fn().mockResolvedValue(0);
 
-    await expect(relaunchOnExitCode(runner)).rejects.toThrow(
-      'PROCESS_EXIT_CALLED',
-    );
+    await expect(relaunchOnExitCode(runner)).rejects.toThrow("PROCESS_EXIT_CALLED");
 
     expect(runner).toHaveBeenCalledTimes(1);
     expect(processExitSpy).toHaveBeenCalledWith(0);
   });
 
-  it('should continue running when RELAUNCH_EXIT_CODE is returned', async () => {
+  it("should continue running when RELAUNCH_EXIT_CODE is returned", async () => {
     let callCount = 0;
     const runner = vi.fn().mockImplementation(async () => {
       callCount++;
@@ -73,25 +61,21 @@ describe('relaunchOnExitCode', () => {
       return 0; // Exit on third call
     });
 
-    await expect(relaunchOnExitCode(runner)).rejects.toThrow(
-      'PROCESS_EXIT_CALLED',
-    );
+    await expect(relaunchOnExitCode(runner)).rejects.toThrow("PROCESS_EXIT_CALLED");
 
     expect(runner).toHaveBeenCalledTimes(3);
     expect(processExitSpy).toHaveBeenCalledWith(0);
   });
 
-  it('should handle runner errors', async () => {
-    const error = new Error('Runner failed');
+  it("should handle runner errors", async () => {
+    const error = new Error("Runner failed");
     const runner = vi.fn().mockRejectedValue(error);
 
-    await expect(relaunchOnExitCode(runner)).rejects.toThrow(
-      'PROCESS_EXIT_CALLED',
-    );
+    await expect(relaunchOnExitCode(runner)).rejects.toThrow("PROCESS_EXIT_CALLED");
 
     expect(runner).toHaveBeenCalledTimes(1);
     expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Fatal error: Failed to relaunch the CLI process.',
+      "Fatal error: Failed to relaunch the CLI process.",
       error,
     );
     expect(stdinResumeSpy).toHaveBeenCalled();
@@ -99,7 +83,7 @@ describe('relaunchOnExitCode', () => {
   });
 });
 
-describe('relaunchAppInChildProcess', () => {
+describe("relaunchAppInChildProcess", () => {
   let processExitSpy: MockInstance;
   let consoleErrorSpy: MockInstance;
   let stdinPauseSpy: MockInstance;
@@ -115,22 +99,18 @@ describe('relaunchAppInChildProcess', () => {
     vi.clearAllMocks();
 
     process.env = { ...originalEnv };
-    delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+    delete process.env["GEMINI_CLI_NO_RELAUNCH"];
 
     process.execArgv = [...originalExecArgv];
     process.argv = [...originalArgv];
-    process.execPath = '/usr/bin/node';
+    process.execPath = "/usr/bin/node";
 
-    processExitSpy = vi.spyOn(process, 'exit').mockImplementation(() => {
-      throw new Error('PROCESS_EXIT_CALLED');
+    processExitSpy = vi.spyOn(process, "exit").mockImplementation(() => {
+      throw new Error("PROCESS_EXIT_CALLED");
     });
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    stdinPauseSpy = vi
-      .spyOn(process.stdin, 'pause')
-      .mockImplementation(() => process.stdin);
-    stdinResumeSpy = vi
-      .spyOn(process.stdin, 'resume')
-      .mockImplementation(() => process.stdin);
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    stdinPauseSpy = vi.spyOn(process.stdin, "pause").mockImplementation(() => process.stdin);
+    stdinResumeSpy = vi.spyOn(process.stdin, "resume").mockImplementation(() => process.stdin);
   });
 
   afterEach(() => {
@@ -145,40 +125,31 @@ describe('relaunchAppInChildProcess', () => {
     stdinResumeSpy.mockRestore();
   });
 
-  describe('when GEMINI_CLI_NO_RELAUNCH is set', () => {
-    it('should return early without spawning a child process', async () => {
-      process.env['GEMINI_CLI_NO_RELAUNCH'] = 'true';
+  describe("when GEMINI_CLI_NO_RELAUNCH is set", () => {
+    it("should return early without spawning a child process", async () => {
+      process.env["GEMINI_CLI_NO_RELAUNCH"] = "true";
 
-      await relaunchAppInChildProcess(['--test'], ['--verbose']);
+      await relaunchAppInChildProcess(["--test"], ["--verbose"]);
 
       expect(mockedSpawn).not.toHaveBeenCalled();
       expect(processExitSpy).not.toHaveBeenCalled();
     });
   });
 
-  describe('when GEMINI_CLI_NO_RELAUNCH is not set', () => {
+  describe("when GEMINI_CLI_NO_RELAUNCH is not set", () => {
     beforeEach(() => {
-      delete process.env['GEMINI_CLI_NO_RELAUNCH'];
+      delete process.env["GEMINI_CLI_NO_RELAUNCH"];
     });
 
-    it('should construct correct node arguments from execArgv, additionalNodeArgs, script, additionalScriptArgs, and argv', () => {
+    it("should construct correct node arguments from execArgv, additionalNodeArgs, script, additionalScriptArgs, and argv", () => {
       // Test the argument construction logic directly by extracting it into a testable function
       // This tests the same logic that's used in relaunchAppInChildProcess
 
       // Setup test data to verify argument ordering
-      const mockExecArgv = ['--inspect=9229', '--trace-warnings'];
-      const mockArgv = [
-        '/usr/bin/node',
-        '/path/to/cli.js',
-        'command',
-        '--flag=value',
-        '--verbose',
-      ];
-      const additionalNodeArgs = [
-        '--max-old-space-size=4096',
-        '--experimental-modules',
-      ];
-      const additionalScriptArgs = ['--model', 'gemini-1.5-pro', '--debug'];
+      const mockExecArgv = ["--inspect=9229", "--trace-warnings"];
+      const mockArgv = ["/usr/bin/node", "/path/to/cli.js", "command", "--flag=value", "--verbose"];
+      const additionalNodeArgs = ["--max-old-space-size=4096", "--experimental-modules"];
+      const additionalScriptArgs = ["--model", "gemini-1.5-pro", "--debug"];
 
       // Extract the argument construction logic from relaunchAppInChildProcess
       const script = mockArgv[1];
@@ -196,30 +167,30 @@ describe('relaunchAppInChildProcess', () => {
       // [...process.execArgv, ...additionalNodeArgs, script, ...additionalScriptArgs, ...scriptArgs]
       const expectedArgs = [
         // Original node execution arguments
-        '--inspect=9229',
-        '--trace-warnings',
+        "--inspect=9229",
+        "--trace-warnings",
         // Additional node arguments passed to function
-        '--max-old-space-size=4096',
-        '--experimental-modules',
+        "--max-old-space-size=4096",
+        "--experimental-modules",
         // The script path
-        '/path/to/cli.js',
+        "/path/to/cli.js",
         // Additional script arguments passed to function
-        '--model',
-        'gemini-1.5-pro',
-        '--debug',
+        "--model",
+        "gemini-1.5-pro",
+        "--debug",
         // Original script arguments (everything after the script in process.argv)
-        'command',
-        '--flag=value',
-        '--verbose',
+        "command",
+        "--flag=value",
+        "--verbose",
       ];
 
       expect(nodeArgs).toEqual(expectedArgs);
     });
 
-    it('should handle empty additional arguments correctly', () => {
+    it("should handle empty additional arguments correctly", () => {
       // Test edge cases with empty arrays
-      const mockExecArgv = ['--trace-warnings'];
-      const mockArgv = ['/usr/bin/node', '/app/cli.js', 'start'];
+      const mockExecArgv = ["--trace-warnings"];
+      const mockArgv = ["/usr/bin/node", "/app/cli.js", "start"];
       const additionalNodeArgs: string[] = [];
       const additionalScriptArgs: string[] = [];
 
@@ -235,25 +206,25 @@ describe('relaunchAppInChildProcess', () => {
         ...scriptArgs,
       ];
 
-      const expectedArgs = ['--trace-warnings', '/app/cli.js', 'start'];
+      const expectedArgs = ["--trace-warnings", "/app/cli.js", "start"];
 
       expect(nodeArgs).toEqual(expectedArgs);
     });
 
-    it('should handle complex argument patterns', () => {
+    it("should handle complex argument patterns", () => {
       // Test with various argument types including flags with values, boolean flags, etc.
-      const mockExecArgv = ['--max-old-space-size=8192'];
+      const mockExecArgv = ["--max-old-space-size=8192"];
       const mockArgv = [
-        '/usr/bin/node',
-        '/cli.js',
-        '--config=/path/to/config.json',
-        '--verbose',
-        'subcommand',
-        '--output',
-        'file.txt',
+        "/usr/bin/node",
+        "/cli.js",
+        "--config=/path/to/config.json",
+        "--verbose",
+        "subcommand",
+        "--output",
+        "file.txt",
       ];
-      const additionalNodeArgs = ['--inspect-brk=9230'];
-      const additionalScriptArgs = ['--model=gpt-4', '--temperature=0.7'];
+      const additionalNodeArgs = ["--inspect-brk=9230"];
+      const additionalScriptArgs = ["--model=gpt-4", "--temperature=0.7"];
 
       const script = mockArgv[1];
       const scriptArgs = mockArgv.slice(2);
@@ -267,16 +238,16 @@ describe('relaunchAppInChildProcess', () => {
       ];
 
       const expectedArgs = [
-        '--max-old-space-size=8192',
-        '--inspect-brk=9230',
-        '/cli.js',
-        '--model=gpt-4',
-        '--temperature=0.7',
-        '--config=/path/to/config.json',
-        '--verbose',
-        'subcommand',
-        '--output',
-        'file.txt',
+        "--max-old-space-size=8192",
+        "--inspect-brk=9230",
+        "/cli.js",
+        "--model=gpt-4",
+        "--temperature=0.7",
+        "--config=/path/to/config.json",
+        "--verbose",
+        "subcommand",
+        "--output",
+        "file.txt",
       ];
 
       expect(nodeArgs).toEqual(expectedArgs);
@@ -285,14 +256,14 @@ describe('relaunchAppInChildProcess', () => {
     // Note: Additional integration tests for spawn behavior are complex due to module mocking
     // limitations with ES modules. The core logic is tested in relaunchOnExitCode tests.
 
-    it('should handle null exit code from child process', async () => {
-      process.argv = ['/usr/bin/node', '/app/cli.js'];
+    it("should handle null exit code from child process", async () => {
+      process.argv = ["/usr/bin/node", "/app/cli.js"];
 
       const mockChild = createMockChildProcess(0, false); // Don't auto-close
       mockedSpawn.mockImplementation(() => {
         // Emit close with null code immediately
         setImmediate(() => {
-          mockChild.emit('close', null);
+          mockChild.emit("close", null);
         });
         return mockChild;
       });
@@ -300,7 +271,7 @@ describe('relaunchAppInChildProcess', () => {
       // Start the relaunch process
       const promise = relaunchAppInChildProcess([], []);
 
-      await expect(promise).rejects.toThrow('PROCESS_EXIT_CALLED');
+      await expect(promise).rejects.toThrow("PROCESS_EXIT_CALLED");
 
       // Should default to exit code 1
       expect(processExitSpy).toHaveBeenCalledWith(1);
@@ -311,10 +282,7 @@ describe('relaunchAppInChildProcess', () => {
 /**
  * Creates a mock child process that emits events asynchronously
  */
-function createMockChildProcess(
-  exitCode: number = 0,
-  autoClose: boolean = false,
-): ChildProcess {
+function createMockChildProcess(exitCode: number = 0, autoClose: boolean = false): ChildProcess {
   const mockChild = new EventEmitter() as ChildProcess;
 
   Object.assign(mockChild, {
@@ -327,7 +295,7 @@ function createMockChildProcess(
     exitCode: null,
     signalCode: null,
     spawnargs: [],
-    spawnfile: '',
+    spawnfile: "",
     kill: vi.fn(),
     send: vi.fn(),
     disconnect: vi.fn(),
@@ -337,7 +305,7 @@ function createMockChildProcess(
 
   if (autoClose) {
     setImmediate(() => {
-      mockChild.emit('close', exitCode);
+      mockChild.emit("close", exitCode);
     });
   }
 
diff --git a/packages/ui-gemini/src/utils/relaunch.ts b/packages/ui-gemini/src/utils/relaunch.ts
index 1142efc71..213ddce9d 100644
--- a/packages/ui-gemini/src/utils/relaunch.ts
+++ b/packages/ui-gemini/src/utils/relaunch.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
-import { RELAUNCH_EXIT_CODE } from './processUtils.js';
+import { spawn } from "node:child_process";
+import { RELAUNCH_EXIT_CODE } from "./processUtils.js";
 
 export async function relaunchOnExitCode(runner: () => Promise<number>) {
   while (true) {
@@ -17,7 +17,7 @@ export async function relaunchOnExitCode(runner: () => Promise<number>) {
       }
     } catch (error) {
       process.stdin.resume();
-      console.error('Fatal error: Failed to relaunch the CLI process.', error);
+      console.error("Fatal error: Failed to relaunch the CLI process.", error);
       process.exit(1);
     }
   }
@@ -27,7 +27,7 @@ export async function relaunchAppInChildProcess(
   additionalNodeArgs: string[],
   additionalScriptArgs: string[],
 ) {
-  if (process.env['GEMINI_CLI_NO_RELAUNCH']) {
+  if (process.env["GEMINI_CLI_NO_RELAUNCH"]) {
     return;
   }
 
@@ -44,19 +44,19 @@ export async function relaunchAppInChildProcess(
       ...additionalScriptArgs,
       ...scriptArgs,
     ];
-    const newEnv = { ...process.env, GEMINI_CLI_NO_RELAUNCH: 'true' };
+    const newEnv = { ...process.env, GEMINI_CLI_NO_RELAUNCH: "true" };
 
     // The parent process should not be reading from stdin while the child is running.
     process.stdin.pause();
 
     const child = spawn(process.execPath, nodeArgs, {
-      stdio: 'inherit',
+      stdio: "inherit",
       env: newEnv,
     });
 
     return new Promise<number>((resolve, reject) => {
-      child.on('error', reject);
-      child.on('close', (code) => {
+      child.on("error", reject);
+      child.on("close", (code) => {
         // Resume stdin before the parent process exits.
         process.stdin.resume();
         resolve(code ?? 1);
diff --git a/packages/ui-gemini/src/utils/resolvePath.test.ts b/packages/ui-gemini/src/utils/resolvePath.test.ts
index 9f4b8d0b2..c674405d7 100644
--- a/packages/ui-gemini/src/utils/resolvePath.test.ts
+++ b/packages/ui-gemini/src/utils/resolvePath.test.ts
@@ -4,32 +4,32 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import * as os from 'node:os';
-import * as path from 'node:path';
-import { resolvePath } from './resolvePath.js';
+import * as os from "node:os";
+import * as path from "node:path";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { resolvePath } from "./resolvePath.js";
 
-vi.mock('node:os', () => ({
+vi.mock("node:os", () => ({
   homedir: vi.fn(),
 }));
 
-describe('resolvePath', () => {
+describe("resolvePath", () => {
   beforeEach(() => {
-    vi.mocked(os.homedir).mockReturnValue('/home/user');
+    vi.mocked(os.homedir).mockReturnValue("/home/user");
   });
 
   it.each([
-    ['', ''],
-    ['/foo/bar', path.normalize('/foo/bar')],
-    ['~/foo', path.join('/home/user', 'foo')],
-    ['~', path.normalize('/home/user')],
-    ['%userprofile%/foo', path.join('/home/user', 'foo')],
-    ['%USERPROFILE%/foo', path.join('/home/user', 'foo')],
-  ])('resolvePath(%s) should return %s', (input, expected) => {
+    ["", ""],
+    ["/foo/bar", path.normalize("/foo/bar")],
+    ["~/foo", path.join("/home/user", "foo")],
+    ["~", path.normalize("/home/user")],
+    ["%userprofile%/foo", path.join("/home/user", "foo")],
+    ["%USERPROFILE%/foo", path.join("/home/user", "foo")],
+  ])("resolvePath(%s) should return %s", (input, expected) => {
     expect(resolvePath(input)).toBe(expected);
   });
 
-  it('should handle path normalization', () => {
-    expect(resolvePath('/foo//bar/../baz')).toBe(path.normalize('/foo/baz'));
+  it("should handle path normalization", () => {
+    expect(resolvePath("/foo//bar/../baz")).toBe(path.normalize("/foo/baz"));
   });
 });
diff --git a/packages/ui-gemini/src/utils/resolvePath.ts b/packages/ui-gemini/src/utils/resolvePath.ts
index dea8be55a..ee52d993e 100644
--- a/packages/ui-gemini/src/utils/resolvePath.ts
+++ b/packages/ui-gemini/src/utils/resolvePath.ts
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as os from 'node:os';
-import * as path from 'node:path';
+import * as os from "node:os";
+import * as path from "node:path";
 
 export function resolvePath(p: string): string {
   if (!p) {
-    return '';
+    return "";
   }
   let expandedPath = p;
-  if (p.toLowerCase().startsWith('%userprofile%')) {
-    expandedPath = os.homedir() + p.substring('%userprofile%'.length);
-  } else if (p === '~' || p.startsWith('~/')) {
+  if (p.toLowerCase().startsWith("%userprofile%")) {
+    expandedPath = os.homedir() + p.substring("%userprofile%".length);
+  } else if (p === "~" || p.startsWith("~/")) {
     expandedPath = os.homedir() + p.substring(1);
   }
   return path.normalize(expandedPath);
diff --git a/packages/ui-gemini/src/utils/sandbox.test.ts b/packages/ui-gemini/src/utils/sandbox.test.ts
index a25b0c60b..2db20d6ff 100644
--- a/packages/ui-gemini/src/utils/sandbox.test.ts
+++ b/packages/ui-gemini/src/utils/sandbox.test.ts
@@ -4,49 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { spawn, exec, execSync } from 'node:child_process';
-import os from 'node:os';
-import fs from 'node:fs';
-import { start_sandbox } from './sandbox.js';
-import { FatalSandboxError, type SandboxConfig } from '@airiscode/gemini-cli-core';
-import { EventEmitter } from 'node:events';
-
-vi.mock('../config/settings.js', () => ({
-  USER_SETTINGS_DIR: '/home/user/.gemini',
+import { exec, execSync, spawn } from "node:child_process";
+import { EventEmitter } from "node:events";
+import fs from "node:fs";
+import os from "node:os";
+import { FatalSandboxError, type SandboxConfig } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { start_sandbox } from "./sandbox.js";
+
+vi.mock("../config/settings.js", () => ({
+  USER_SETTINGS_DIR: "/home/user/.gemini",
 }));
-vi.mock('node:child_process');
-vi.mock('node:os');
-vi.mock('node:fs');
-vi.mock('node:util', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:util')>();
+vi.mock("node:child_process");
+vi.mock("node:os");
+vi.mock("node:fs");
+vi.mock("node:util", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:util")>();
   return {
     ...actual,
     promisify: (fn: (...args: unknown[]) => unknown) => {
       if (fn === exec) {
         return async (cmd: string) => {
-          if (cmd === 'id -u' || cmd === 'id -g') {
-            return { stdout: '1000', stderr: '' };
+          if (cmd === "id -u" || cmd === "id -g") {
+            return { stdout: "1000", stderr: "" };
           }
-          if (cmd.includes('curl')) {
-            return { stdout: '', stderr: '' };
+          if (cmd.includes("curl")) {
+            return { stdout: "", stderr: "" };
           }
-          if (cmd.includes('getconf DARWIN_USER_CACHE_DIR')) {
-            return { stdout: '/tmp/cache', stderr: '' };
+          if (cmd.includes("getconf DARWIN_USER_CACHE_DIR")) {
+            return { stdout: "/tmp/cache", stderr: "" };
           }
-          if (cmd.includes('ps -a --format')) {
-            return { stdout: 'existing-container', stderr: '' };
+          if (cmd.includes("ps -a --format")) {
+            return { stdout: "existing-container", stderr: "" };
           }
-          return { stdout: '', stderr: '' };
+          return { stdout: "", stderr: "" };
         };
       }
       return actual.promisify(fn);
     },
   };
 });
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     debugLogger: {
@@ -60,15 +59,15 @@ vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
     FatalSandboxError: class extends Error {
       constructor(message: string) {
         super(message);
-        this.name = 'FatalSandboxError';
+        this.name = "FatalSandboxError";
       }
     },
-    GEMINI_DIR: '.gemini',
-    USER_SETTINGS_DIR: '/home/user/.gemini',
+    GEMINI_DIR: ".gemini",
+    USER_SETTINGS_DIR: "/home/user/.gemini",
   };
 });
 
-describe('sandbox', () => {
+describe("sandbox", () => {
   const originalEnv = process.env;
   const originalArgv = process.argv;
   let mockProcessIn: {
@@ -86,16 +85,16 @@ describe('sandbox', () => {
       resume: vi.fn(),
       isTTY: true,
     };
-    Object.defineProperty(process, 'stdin', {
+    Object.defineProperty(process, "stdin", {
       value: mockProcessIn,
       writable: true,
     });
-    vi.mocked(os.platform).mockReturnValue('linux');
-    vi.mocked(os.homedir).mockReturnValue('/home/user');
-    vi.mocked(os.tmpdir).mockReturnValue('/tmp');
+    vi.mocked(os.platform).mockReturnValue("linux");
+    vi.mocked(os.homedir).mockReturnValue("/home/user");
+    vi.mocked(os.tmpdir).mockReturnValue("/tmp");
     vi.mocked(fs.existsSync).mockReturnValue(true);
     vi.mocked(fs.realpathSync).mockImplementation((p) => p as string);
-    vi.mocked(execSync).mockReturnValue(Buffer.from(''));
+    vi.mocked(execSync).mockReturnValue(Buffer.from(""));
   });
 
   afterEach(() => {
@@ -103,12 +102,12 @@ describe('sandbox', () => {
     process.argv = originalArgv;
   });
 
-  describe('start_sandbox', () => {
-    it('should handle macOS seatbelt (sandbox-exec)', async () => {
-      vi.mocked(os.platform).mockReturnValue('darwin');
+  describe("start_sandbox", () => {
+    it("should handle macOS seatbelt (sandbox-exec)", async () => {
+      vi.mocked(os.platform).mockReturnValue("darwin");
       const config: SandboxConfig = {
-        command: 'sandbox-exec',
-        image: 'some-image',
+        command: "sandbox-exec",
+        image: "some-image",
       };
 
       interface MockProcess extends EventEmitter {
@@ -118,42 +117,37 @@ describe('sandbox', () => {
       const mockSpawnProcess = new EventEmitter() as MockProcess;
       mockSpawnProcess.stdout = new EventEmitter();
       mockSpawnProcess.stderr = new EventEmitter();
-      vi.mocked(spawn).mockReturnValue(
-        mockSpawnProcess as unknown as ReturnType<typeof spawn>,
-      );
+      vi.mocked(spawn).mockReturnValue(mockSpawnProcess as unknown as ReturnType<typeof spawn>);
 
-      const promise = start_sandbox(config, [], undefined, ['arg1']);
+      const promise = start_sandbox(config, [], undefined, ["arg1"]);
 
       setTimeout(() => {
-        mockSpawnProcess.emit('close', 0);
+        mockSpawnProcess.emit("close", 0);
       }, 10);
 
       await expect(promise).resolves.toBe(0);
       expect(spawn).toHaveBeenCalledWith(
-        'sandbox-exec',
-        expect.arrayContaining([
-          '-f',
-          expect.stringContaining('sandbox-macos-permissive-open.sb'),
-        ]),
-        expect.objectContaining({ stdio: 'inherit' }),
+        "sandbox-exec",
+        expect.arrayContaining(["-f", expect.stringContaining("sandbox-macos-permissive-open.sb")]),
+        expect.objectContaining({ stdio: "inherit" }),
       );
     });
 
-    it('should throw FatalSandboxError if seatbelt profile is missing', async () => {
-      vi.mocked(os.platform).mockReturnValue('darwin');
+    it("should throw FatalSandboxError if seatbelt profile is missing", async () => {
+      vi.mocked(os.platform).mockReturnValue("darwin");
       vi.mocked(fs.existsSync).mockReturnValue(false);
       const config: SandboxConfig = {
-        command: 'sandbox-exec',
-        image: 'some-image',
+        command: "sandbox-exec",
+        image: "some-image",
       };
 
       await expect(start_sandbox(config)).rejects.toThrow(FatalSandboxError);
     });
 
-    it('should handle Docker execution', async () => {
+    it("should handle Docker execution", async () => {
       const config: SandboxConfig = {
-        command: 'docker',
-        image: 'gemini-cli-sandbox',
+        command: "docker",
+        image: "gemini-cli-sandbox",
       };
 
       // Mock image check to return true (image exists)
@@ -163,58 +157,55 @@ describe('sandbox', () => {
       const mockImageCheckProcess = new EventEmitter() as MockProcessWithStdout;
       mockImageCheckProcess.stdout = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce((_cmd, args) => {
-        if (args && args[0] === 'images') {
+        if (args && args[0] === "images") {
           setTimeout(() => {
-            mockImageCheckProcess.stdout.emit('data', Buffer.from('image-id'));
-            mockImageCheckProcess.emit('close', 0);
+            mockImageCheckProcess.stdout.emit("data", Buffer.from("image-id"));
+            mockImageCheckProcess.emit("close", 0);
           }, 1);
           return mockImageCheckProcess as unknown as ReturnType<typeof spawn>;
         }
         return new EventEmitter() as unknown as ReturnType<typeof spawn>; // fallback
       });
 
-      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<
-        typeof spawn
-      >;
+      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<typeof spawn>;
       mockSpawnProcess.on = vi.fn().mockImplementation((event, cb) => {
-        if (event === 'close') {
+        if (event === "close") {
           setTimeout(() => cb(0), 10);
         }
         return mockSpawnProcess;
       });
       vi.mocked(spawn).mockImplementationOnce((cmd, args) => {
-        if (cmd === 'docker' && args && args[0] === 'run') {
+        if (cmd === "docker" && args && args[0] === "run") {
           return mockSpawnProcess;
         }
         return new EventEmitter() as unknown as ReturnType<typeof spawn>;
       });
 
-      const promise = start_sandbox(config, [], undefined, ['arg1']);
+      const promise = start_sandbox(config, [], undefined, ["arg1"]);
 
       await expect(promise).resolves.toBe(0);
       expect(spawn).toHaveBeenCalledWith(
-        'docker',
-        expect.arrayContaining(['run', '-i', '--rm', '--init']),
-        expect.objectContaining({ stdio: 'inherit' }),
+        "docker",
+        expect.arrayContaining(["run", "-i", "--rm", "--init"]),
+        expect.objectContaining({ stdio: "inherit" }),
       );
     });
 
-    it('should pull image if missing', async () => {
+    it("should pull image if missing", async () => {
       const config: SandboxConfig = {
-        command: 'docker',
-        image: 'missing-image',
+        command: "docker",
+        image: "missing-image",
       };
 
       // 1. Image check fails
       interface MockProcessWithStdout extends EventEmitter {
         stdout: EventEmitter;
       }
-      const mockImageCheckProcess1 =
-        new EventEmitter() as MockProcessWithStdout;
+      const mockImageCheckProcess1 = new EventEmitter() as MockProcessWithStdout;
       mockImageCheckProcess1.stdout = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce(() => {
         setTimeout(() => {
-          mockImageCheckProcess1.emit('close', 0);
+          mockImageCheckProcess1.emit("close", 0);
         }, 1);
         return mockImageCheckProcess1 as unknown as ReturnType<typeof spawn>;
       });
@@ -229,61 +220,57 @@ describe('sandbox', () => {
       mockPullProcess.stderr = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce(() => {
         setTimeout(() => {
-          mockPullProcess.emit('close', 0);
+          mockPullProcess.emit("close", 0);
         }, 1);
         return mockPullProcess as unknown as ReturnType<typeof spawn>;
       });
 
       // 3. Image check succeeds
-      const mockImageCheckProcess2 =
-        new EventEmitter() as MockProcessWithStdout;
+      const mockImageCheckProcess2 = new EventEmitter() as MockProcessWithStdout;
       mockImageCheckProcess2.stdout = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce(() => {
         setTimeout(() => {
-          mockImageCheckProcess2.stdout.emit('data', Buffer.from('image-id'));
-          mockImageCheckProcess2.emit('close', 0);
+          mockImageCheckProcess2.stdout.emit("data", Buffer.from("image-id"));
+          mockImageCheckProcess2.emit("close", 0);
         }, 1);
         return mockImageCheckProcess2 as unknown as ReturnType<typeof spawn>;
       });
 
       // 4. Docker run
-      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<
-        typeof spawn
-      >;
+      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<typeof spawn>;
       mockSpawnProcess.on = vi.fn().mockImplementation((event, cb) => {
-        if (event === 'close') {
+        if (event === "close") {
           setTimeout(() => cb(0), 10);
         }
         return mockSpawnProcess;
       });
       vi.mocked(spawn).mockImplementationOnce(() => mockSpawnProcess);
 
-      const promise = start_sandbox(config, [], undefined, ['arg1']);
+      const promise = start_sandbox(config, [], undefined, ["arg1"]);
 
       await expect(promise).resolves.toBe(0);
       expect(spawn).toHaveBeenCalledWith(
-        'docker',
-        expect.arrayContaining(['pull', 'missing-image']),
+        "docker",
+        expect.arrayContaining(["pull", "missing-image"]),
         expect.any(Object),
       );
     });
 
-    it('should throw if image pull fails', async () => {
+    it("should throw if image pull fails", async () => {
       const config: SandboxConfig = {
-        command: 'docker',
-        image: 'missing-image',
+        command: "docker",
+        image: "missing-image",
       };
 
       // 1. Image check fails
       interface MockProcessWithStdout extends EventEmitter {
         stdout: EventEmitter;
       }
-      const mockImageCheckProcess1 =
-        new EventEmitter() as MockProcessWithStdout;
+      const mockImageCheckProcess1 = new EventEmitter() as MockProcessWithStdout;
       mockImageCheckProcess1.stdout = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce(() => {
         setTimeout(() => {
-          mockImageCheckProcess1.emit('close', 0);
+          mockImageCheckProcess1.emit("close", 0);
         }, 1);
         return mockImageCheckProcess1 as unknown as ReturnType<typeof spawn>;
       });
@@ -298,7 +285,7 @@ describe('sandbox', () => {
       mockPullProcess.stderr = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce(() => {
         setTimeout(() => {
-          mockPullProcess.emit('close', 1);
+          mockPullProcess.emit("close", 1);
         }, 1);
         return mockPullProcess as unknown as ReturnType<typeof spawn>;
       });
@@ -306,12 +293,12 @@ describe('sandbox', () => {
       await expect(start_sandbox(config)).rejects.toThrow(FatalSandboxError);
     });
 
-    it('should mount volumes correctly', async () => {
+    it("should mount volumes correctly", async () => {
       const config: SandboxConfig = {
-        command: 'docker',
-        image: 'gemini-cli-sandbox',
+        command: "docker",
+        image: "gemini-cli-sandbox",
       };
-      process.env['SANDBOX_MOUNTS'] = '/host/path:/container/path:ro';
+      process.env["SANDBOX_MOUNTS"] = "/host/path:/container/path:ro";
       vi.mocked(fs.existsSync).mockReturnValue(true); // For mount path check
 
       // Mock image check to return true
@@ -322,17 +309,15 @@ describe('sandbox', () => {
       mockImageCheckProcess.stdout = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce(() => {
         setTimeout(() => {
-          mockImageCheckProcess.stdout.emit('data', Buffer.from('image-id'));
-          mockImageCheckProcess.emit('close', 0);
+          mockImageCheckProcess.stdout.emit("data", Buffer.from("image-id"));
+          mockImageCheckProcess.emit("close", 0);
         }, 1);
         return mockImageCheckProcess as unknown as ReturnType<typeof spawn>;
       });
 
-      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<
-        typeof spawn
-      >;
+      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<typeof spawn>;
       mockSpawnProcess.on = vi.fn().mockImplementation((event, cb) => {
-        if (event === 'close') {
+        if (event === "close") {
           setTimeout(() => cb(0), 10);
         }
         return mockSpawnProcess;
@@ -342,28 +327,28 @@ describe('sandbox', () => {
       await start_sandbox(config);
 
       expect(spawn).toHaveBeenCalledWith(
-        'docker',
+        "docker",
         expect.arrayContaining([
-          '--volume',
-          '/host/path:/container/path:ro',
-          '--volume',
-          expect.stringContaining('/home/user/.gemini'),
+          "--volume",
+          "/host/path:/container/path:ro",
+          "--volume",
+          expect.stringContaining("/home/user/.gemini"),
         ]),
         expect.any(Object),
       );
     });
 
-    it('should handle user creation on Linux if needed', async () => {
+    it("should handle user creation on Linux if needed", async () => {
       const config: SandboxConfig = {
-        command: 'docker',
-        image: 'gemini-cli-sandbox',
+        command: "docker",
+        image: "gemini-cli-sandbox",
       };
-      process.env['SANDBOX_SET_UID_GID'] = 'true';
-      vi.mocked(os.platform).mockReturnValue('linux');
+      process.env["SANDBOX_SET_UID_GID"] = "true";
+      vi.mocked(os.platform).mockReturnValue("linux");
       vi.mocked(execSync).mockImplementation((cmd) => {
-        if (cmd === 'id -u') return Buffer.from('1000');
-        if (cmd === 'id -g') return Buffer.from('1000');
-        return Buffer.from('');
+        if (cmd === "id -u") return Buffer.from("1000");
+        if (cmd === "id -g") return Buffer.from("1000");
+        return Buffer.from("");
       });
 
       // Mock image check to return true
@@ -374,17 +359,15 @@ describe('sandbox', () => {
       mockImageCheckProcess.stdout = new EventEmitter();
       vi.mocked(spawn).mockImplementationOnce(() => {
         setTimeout(() => {
-          mockImageCheckProcess.stdout.emit('data', Buffer.from('image-id'));
-          mockImageCheckProcess.emit('close', 0);
+          mockImageCheckProcess.stdout.emit("data", Buffer.from("image-id"));
+          mockImageCheckProcess.emit("close", 0);
         }, 1);
         return mockImageCheckProcess as unknown as ReturnType<typeof spawn>;
       });
 
-      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<
-        typeof spawn
-      >;
+      const mockSpawnProcess = new EventEmitter() as unknown as ReturnType<typeof spawn>;
       mockSpawnProcess.on = vi.fn().mockImplementation((event, cb) => {
-        if (event === 'close') {
+        if (event === "close") {
           setTimeout(() => cb(0), 10);
         }
         return mockSpawnProcess;
@@ -394,16 +377,16 @@ describe('sandbox', () => {
       await start_sandbox(config);
 
       expect(spawn).toHaveBeenCalledWith(
-        'docker',
-        expect.arrayContaining(['--user', 'root', '--env', 'HOME=/home/user']),
+        "docker",
+        expect.arrayContaining(["--user", "root", "--env", "HOME=/home/user"]),
         expect.any(Object),
       );
       // Check that the entrypoint command includes useradd/groupadd
       const args = vi.mocked(spawn).mock.calls[1][1] as string[];
       const entrypointCmd = args[args.length - 1];
-      expect(entrypointCmd).toContain('groupadd');
-      expect(entrypointCmd).toContain('useradd');
-      expect(entrypointCmd).toContain('su -p gemini');
+      expect(entrypointCmd).toContain("groupadd");
+      expect(entrypointCmd).toContain("useradd");
+      expect(entrypointCmd).toContain("su -p gemini");
     });
   });
 });
diff --git a/packages/ui-gemini/src/utils/sandbox.ts b/packages/ui-gemini/src/utils/sandbox.ts
index 6f15324eb..2f0759986 100644
--- a/packages/ui-gemini/src/utils/sandbox.ts
+++ b/packages/ui-gemini/src/utils/sandbox.ts
@@ -4,34 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { exec, execSync, spawn, type ChildProcess } from 'node:child_process';
-import os from 'node:os';
-import path from 'node:path';
-import fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { quote, parse } from 'shell-quote';
-import { USER_SETTINGS_DIR } from '../config/settings.js';
-import { promisify } from 'node:util';
-import type { Config, SandboxConfig } from '@airiscode/gemini-cli-core';
-import {
-  coreEvents,
-  debugLogger,
-  FatalSandboxError,
-  GEMINI_DIR,
-} from '@airiscode/gemini-cli-core';
-import { ConsolePatcher } from '../ui/utils/ConsolePatcher.js';
-import { randomBytes } from 'node:crypto';
+import { type ChildProcess, exec, execSync, spawn } from "node:child_process";
+import { randomBytes } from "node:crypto";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { promisify } from "node:util";
+import type { Config, SandboxConfig } from "@airiscode/gemini-cli-core";
+import { coreEvents, debugLogger, FatalSandboxError, GEMINI_DIR } from "@airiscode/gemini-cli-core";
+import { parse, quote } from "shell-quote";
+import { USER_SETTINGS_DIR } from "../config/settings.js";
+import { ConsolePatcher } from "../ui/utils/ConsolePatcher.js";
 import {
+  BUILTIN_SEATBELT_PROFILES,
+  entrypoint,
   getContainerPath,
-  shouldUseCurrentUserInSandbox,
+  LOCAL_DEV_SANDBOX_IMAGE_NAME,
   parseImageName,
   ports,
-  entrypoint,
-  LOCAL_DEV_SANDBOX_IMAGE_NAME,
   SANDBOX_NETWORK_NAME,
   SANDBOX_PROXY_NAME,
-  BUILTIN_SEATBELT_PROFILES,
-} from './sandboxUtils.js';
+  shouldUseCurrentUserInSandbox,
+} from "./sandboxUtils.js";
 
 const execAsync = promisify(exec);
 
@@ -42,55 +37,48 @@ export async function start_sandbox(
   cliArgs: string[] = [],
 ): Promise<number> {
   const patcher = new ConsolePatcher({
-    debugMode: cliConfig?.getDebugMode() || !!process.env['DEBUG'],
+    debugMode: cliConfig?.getDebugMode() || !!process.env["DEBUG"],
     stderr: true,
   });
   patcher.patch();
 
   try {
-    if (config.command === 'sandbox-exec') {
+    if (config.command === "sandbox-exec") {
       // disallow BUILD_SANDBOX
-      if (process.env['BUILD_SANDBOX']) {
-        throw new FatalSandboxError(
-          'Cannot BUILD_SANDBOX when using macOS Seatbelt',
-        );
+      if (process.env["BUILD_SANDBOX"]) {
+        throw new FatalSandboxError("Cannot BUILD_SANDBOX when using macOS Seatbelt");
       }
 
-      const profile = (process.env['SEATBELT_PROFILE'] ??= 'permissive-open');
-      let profileFile = fileURLToPath(
-        new URL(`sandbox-macos-${profile}.sb`, import.meta.url),
-      );
+      const profile = (process.env["SEATBELT_PROFILE"] ??= "permissive-open");
+      let profileFile = fileURLToPath(new URL(`sandbox-macos-${profile}.sb`, import.meta.url));
       // if profile name is not recognized, then look for file under project settings directory
       if (!BUILTIN_SEATBELT_PROFILES.includes(profile)) {
         profileFile = path.join(GEMINI_DIR, `sandbox-macos-${profile}.sb`);
       }
       if (!fs.existsSync(profileFile)) {
-        throw new FatalSandboxError(
-          `Missing macos seatbelt profile file '${profileFile}'`,
-        );
+        throw new FatalSandboxError(`Missing macos seatbelt profile file '${profileFile}'`);
       }
       debugLogger.log(`using macos seatbelt (profile: ${profile}) ...`);
       // if DEBUG is set, convert to --inspect-brk in NODE_OPTIONS
-      const nodeOptions = [
-        ...(process.env['DEBUG'] ? ['--inspect-brk'] : []),
-        ...nodeArgs,
-      ].join(' ');
+      const nodeOptions = [...(process.env["DEBUG"] ? ["--inspect-brk"] : []), ...nodeArgs].join(
+        " ",
+      );
 
       const args = [
-        '-D',
+        "-D",
         `TARGET_DIR=${fs.realpathSync(process.cwd())}`,
-        '-D',
+        "-D",
         `TMP_DIR=${fs.realpathSync(os.tmpdir())}`,
-        '-D',
+        "-D",
         `HOME_DIR=${fs.realpathSync(os.homedir())}`,
-        '-D',
-        `CACHE_DIR=${fs.realpathSync((await execAsync('getconf DARWIN_USER_CACHE_DIR')).stdout.trim())}`,
+        "-D",
+        `CACHE_DIR=${fs.realpathSync((await execAsync("getconf DARWIN_USER_CACHE_DIR")).stdout.trim())}`,
       ];
 
       // Add included directories from the workspace context
       // Always add 5 INCLUDE_DIR parameters to ensure .sb files can reference them
       const MAX_INCLUDE_DIRS = 5;
-      const targetDir = fs.realpathSync(cliConfig?.getTargetDir() || '');
+      const targetDir = fs.realpathSync(cliConfig?.getTargetDir() || "");
       const includedDirs: string[] = [];
 
       if (cliConfig) {
@@ -107,93 +95,91 @@ export async function start_sandbox(
       }
 
       for (let i = 0; i < MAX_INCLUDE_DIRS; i++) {
-        let dirPath = '/dev/null'; // Default to a safe path that won't cause issues
+        let dirPath = "/dev/null"; // Default to a safe path that won't cause issues
 
         if (i < includedDirs.length) {
           dirPath = includedDirs[i];
         }
 
-        args.push('-D', `INCLUDE_DIR_${i}=${dirPath}`);
+        args.push("-D", `INCLUDE_DIR_${i}=${dirPath}`);
       }
 
       const finalArgv = cliArgs;
 
       args.push(
-        '-f',
+        "-f",
         profileFile,
-        'sh',
-        '-c',
+        "sh",
+        "-c",
         [
           `SANDBOX=sandbox-exec`,
           `NODE_OPTIONS="${nodeOptions}"`,
           ...finalArgv.map((arg) => quote([arg])),
-        ].join(' '),
+        ].join(" "),
       );
       // start and set up proxy if GEMINI_SANDBOX_PROXY_COMMAND is set
-      const proxyCommand = process.env['GEMINI_SANDBOX_PROXY_COMMAND'];
+      const proxyCommand = process.env["GEMINI_SANDBOX_PROXY_COMMAND"];
       let proxyProcess: ChildProcess | undefined = undefined;
       let sandboxProcess: ChildProcess | undefined = undefined;
       const sandboxEnv = { ...process.env };
       if (proxyCommand) {
         const proxy =
-          process.env['HTTPS_PROXY'] ||
-          process.env['https_proxy'] ||
-          process.env['HTTP_PROXY'] ||
-          process.env['http_proxy'] ||
-          'http://localhost:8877';
-        sandboxEnv['HTTPS_PROXY'] = proxy;
-        sandboxEnv['https_proxy'] = proxy; // lower-case can be required, e.g. for curl
-        sandboxEnv['HTTP_PROXY'] = proxy;
-        sandboxEnv['http_proxy'] = proxy;
-        const noProxy = process.env['NO_PROXY'] || process.env['no_proxy'];
+          process.env["HTTPS_PROXY"] ||
+          process.env["https_proxy"] ||
+          process.env["HTTP_PROXY"] ||
+          process.env["http_proxy"] ||
+          "http://localhost:8877";
+        sandboxEnv["HTTPS_PROXY"] = proxy;
+        sandboxEnv["https_proxy"] = proxy; // lower-case can be required, e.g. for curl
+        sandboxEnv["HTTP_PROXY"] = proxy;
+        sandboxEnv["http_proxy"] = proxy;
+        const noProxy = process.env["NO_PROXY"] || process.env["no_proxy"];
         if (noProxy) {
-          sandboxEnv['NO_PROXY'] = noProxy;
-          sandboxEnv['no_proxy'] = noProxy;
+          sandboxEnv["NO_PROXY"] = noProxy;
+          sandboxEnv["no_proxy"] = noProxy;
         }
         proxyProcess = spawn(proxyCommand, {
-          stdio: ['ignore', 'pipe', 'pipe'],
+          stdio: ["ignore", "pipe", "pipe"],
           shell: true,
           detached: true,
         });
         // install handlers to stop proxy on exit/signal
         const stopProxy = () => {
-          debugLogger.log('stopping proxy ...');
+          debugLogger.log("stopping proxy ...");
           if (proxyProcess?.pid) {
-            process.kill(-proxyProcess.pid, 'SIGTERM');
+            process.kill(-proxyProcess.pid, "SIGTERM");
           }
         };
-        process.on('exit', stopProxy);
-        process.on('SIGINT', stopProxy);
-        process.on('SIGTERM', stopProxy);
+        process.on("exit", stopProxy);
+        process.on("SIGINT", stopProxy);
+        process.on("SIGTERM", stopProxy);
 
         // commented out as it disrupts ink rendering
         // proxyProcess.stdout?.on('data', (data) => {
         //   console.info(data.toString());
         // });
-        proxyProcess.stderr?.on('data', (data) => {
+        proxyProcess.stderr?.on("data", (data) => {
           debugLogger.debug(`[PROXY STDERR]: ${data.toString().trim()}`);
         });
-        proxyProcess.on('close', (code, signal) => {
+        proxyProcess.on("close", (code, signal) => {
           if (sandboxProcess?.pid) {
-            process.kill(-sandboxProcess.pid, 'SIGTERM');
+            process.kill(-sandboxProcess.pid, "SIGTERM");
           }
           throw new FatalSandboxError(
             `Proxy command '${proxyCommand}' exited with code ${code}, signal ${signal}`,
           );
         });
-        debugLogger.log('waiting for proxy to start ...');
-        await execAsync(
-          `until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`,
-        );
+        debugLogger.log("waiting for proxy to start ...");
+        await execAsync(`until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`);
       }
       // spawn child and let it inherit stdio
       process.stdin.pause();
       sandboxProcess = spawn(config.command, args, {
-        stdio: 'inherit',
+        stdio: "inherit",
       });
       return await new Promise((resolve, reject) => {
-        sandboxProcess?.on('error', reject);
-        sandboxProcess?.on('close', (code) => {
+        sandboxProcess?.on("error", reject);
+        sandboxProcess?.on("close", (code) => {
           process.stdin.resume();
           resolve(code ?? 1);
         });
@@ -203,12 +189,9 @@ export async function start_sandbox(
     debugLogger.log(`hopping into sandbox (command: ${config.command}) ...`);
 
     // determine full path for gemini-cli to distinguish linked vs installed setting
-    const gcPath = process.argv[1] ? fs.realpathSync(process.argv[1]) : '';
+    const gcPath = process.argv[1] ? fs.realpathSync(process.argv[1]) : "";
 
-    const projectSandboxDockerfile = path.join(
-      GEMINI_DIR,
-      'sandbox.Dockerfile',
-    );
+    const projectSandboxDockerfile = path.join(GEMINI_DIR, "sandbox.Dockerfile");
     const isCustomProjectSandbox = fs.existsSync(projectSandboxDockerfile);
 
     const image = config.image;
@@ -218,35 +201,29 @@ export async function start_sandbox(
     // if BUILD_SANDBOX is set, then call scripts/build_sandbox.js under gemini-cli repo
     //
     // note this can only be done with binary linked from gemini-cli repo
-    if (process.env['BUILD_SANDBOX']) {
-      if (!gcPath.includes('gemini-cli/packages/')) {
+    if (process.env["BUILD_SANDBOX"]) {
+      if (!gcPath.includes("gemini-cli/packages/")) {
         throw new FatalSandboxError(
-          'Cannot build sandbox using installed gemini binary; ' +
-            'run `npm link ./packages/cli` under gemini-cli repo to switch to linked binary.',
+          "Cannot build sandbox using installed gemini binary; " +
+            "run `npm link ./packages/cli` under gemini-cli repo to switch to linked binary.",
         );
       } else {
-        debugLogger.log('building sandbox ...');
-        const gcRoot = gcPath.split('/packages/')[0];
+        debugLogger.log("building sandbox ...");
+        const gcRoot = gcPath.split("/packages/")[0];
         // if project folder has sandbox.Dockerfile under project settings folder, use that
-        let buildArgs = '';
-        const projectSandboxDockerfile = path.join(
-          GEMINI_DIR,
-          'sandbox.Dockerfile',
-        );
+        let buildArgs = "";
+        const projectSandboxDockerfile = path.join(GEMINI_DIR, "sandbox.Dockerfile");
         if (isCustomProjectSandbox) {
           debugLogger.log(`using ${projectSandboxDockerfile} for sandbox`);
           buildArgs += `-f ${path.resolve(projectSandboxDockerfile)} -i ${image}`;
         }
-        execSync(
-          `cd ${gcRoot} && node scripts/build_sandbox.js -s ${buildArgs}`,
-          {
-            stdio: 'inherit',
-            env: {
-              ...process.env,
-              GEMINI_SANDBOX: config.command, // in case sandbox is enabled via flags (see config.ts under cli package)
-            },
+        execSync(`cd ${gcRoot} && node scripts/build_sandbox.js -s ${buildArgs}`, {
+          stdio: "inherit",
+          env: {
+            ...process.env,
+            GEMINI_SANDBOX: config.command, // in case sandbox is enabled via flags (see config.ts under cli package)
           },
-        );
+        });
       }
     }
 
@@ -254,8 +231,8 @@ export async function start_sandbox(
     if (!(await ensureSandboxImageIsPresent(config.command, image))) {
       const remedy =
         image === LOCAL_DEV_SANDBOX_IMAGE_NAME
-          ? 'Try running `npm run build:all` or `npm run build:sandbox` under the gemini-cli repo to build it locally, or check the image name and your network connection.'
-          : 'Please check the image name, your network connection, or notify gemini-cli-dev@google.com if the issue persists.';
+          ? "Try running `npm run build:all` or `npm run build:sandbox` under the gemini-cli repo to build it locally, or check the image name and your network connection."
+          : "Please check the image name, your network connection, or notify gemini-cli-dev@google.com if the issue persists.";
       throw new FatalSandboxError(
         `Sandbox image '${image}' is missing or could not be pulled. ${remedy}`,
       );
@@ -263,130 +240,112 @@ export async function start_sandbox(
 
     // use interactive mode and auto-remove container on exit
     // run init binary inside container to forward signals & reap zombies
-    const args = ['run', '-i', '--rm', '--init', '--workdir', containerWorkdir];
+    const args = ["run", "-i", "--rm", "--init", "--workdir", containerWorkdir];
 
     // add custom flags from SANDBOX_FLAGS
-    if (process.env['SANDBOX_FLAGS']) {
-      const flags = parse(process.env['SANDBOX_FLAGS'], process.env).filter(
-        (f): f is string => typeof f === 'string',
+    if (process.env["SANDBOX_FLAGS"]) {
+      const flags = parse(process.env["SANDBOX_FLAGS"], process.env).filter(
+        (f): f is string => typeof f === "string",
       );
       args.push(...flags);
     }
 
     // add TTY only if stdin is TTY as well, i.e. for piped input don't init TTY in container
     if (process.stdin.isTTY) {
-      args.push('-t');
+      args.push("-t");
     }
 
     // allow access to host.docker.internal
-    args.push('--add-host', 'host.docker.internal:host-gateway');
+    args.push("--add-host", "host.docker.internal:host-gateway");
 
     // mount current directory as working directory in sandbox (set via --workdir)
-    args.push('--volume', `${workdir}:${containerWorkdir}`);
+    args.push("--volume", `${workdir}:${containerWorkdir}`);
 
     // mount user settings directory inside container, after creating if missing
     // note user/home changes inside sandbox and we mount at BOTH paths for consistency
     const userSettingsDirOnHost = USER_SETTINGS_DIR;
-    const userSettingsDirInSandbox = getContainerPath(
-      `/home/node/${GEMINI_DIR}`,
-    );
+    const userSettingsDirInSandbox = getContainerPath(`/home/node/${GEMINI_DIR}`);
     if (!fs.existsSync(userSettingsDirOnHost)) {
       fs.mkdirSync(userSettingsDirOnHost);
     }
-    args.push(
-      '--volume',
-      `${userSettingsDirOnHost}:${userSettingsDirInSandbox}`,
-    );
+    args.push("--volume", `${userSettingsDirOnHost}:${userSettingsDirInSandbox}`);
     if (userSettingsDirInSandbox !== userSettingsDirOnHost) {
-      args.push(
-        '--volume',
-        `${userSettingsDirOnHost}:${getContainerPath(userSettingsDirOnHost)}`,
-      );
+      args.push("--volume", `${userSettingsDirOnHost}:${getContainerPath(userSettingsDirOnHost)}`);
     }
 
     // mount os.tmpdir() as os.tmpdir() inside container
-    args.push('--volume', `${os.tmpdir()}:${getContainerPath(os.tmpdir())}`);
+    args.push("--volume", `${os.tmpdir()}:${getContainerPath(os.tmpdir())}`);
 
     // mount gcloud config directory if it exists
-    const gcloudConfigDir = path.join(os.homedir(), '.config', 'gcloud');
+    const gcloudConfigDir = path.join(os.homedir(), ".config", "gcloud");
     if (fs.existsSync(gcloudConfigDir)) {
-      args.push(
-        '--volume',
-        `${gcloudConfigDir}:${getContainerPath(gcloudConfigDir)}:ro`,
-      );
+      args.push("--volume", `${gcloudConfigDir}:${getContainerPath(gcloudConfigDir)}:ro`);
     }
 
     // mount ADC file if GOOGLE_APPLICATION_CREDENTIALS is set
-    if (process.env['GOOGLE_APPLICATION_CREDENTIALS']) {
-      const adcFile = process.env['GOOGLE_APPLICATION_CREDENTIALS'];
+    if (process.env["GOOGLE_APPLICATION_CREDENTIALS"]) {
+      const adcFile = process.env["GOOGLE_APPLICATION_CREDENTIALS"];
       if (fs.existsSync(adcFile)) {
-        args.push('--volume', `${adcFile}:${getContainerPath(adcFile)}:ro`);
-        args.push(
-          '--env',
-          `GOOGLE_APPLICATION_CREDENTIALS=${getContainerPath(adcFile)}`,
-        );
+        args.push("--volume", `${adcFile}:${getContainerPath(adcFile)}:ro`);
+        args.push("--env", `GOOGLE_APPLICATION_CREDENTIALS=${getContainerPath(adcFile)}`);
       }
     }
 
     // mount paths listed in SANDBOX_MOUNTS
-    if (process.env['SANDBOX_MOUNTS']) {
-      for (let mount of process.env['SANDBOX_MOUNTS'].split(',')) {
+    if (process.env["SANDBOX_MOUNTS"]) {
+      for (let mount of process.env["SANDBOX_MOUNTS"].split(",")) {
         if (mount.trim()) {
           // parse mount as from:to:opts
-          let [from, to, opts] = mount.trim().split(':');
+          let [from, to, opts] = mount.trim().split(":");
           to = to || from; // default to mount at same path inside container
-          opts = opts || 'ro'; // default to read-only
+          opts = opts || "ro"; // default to read-only
           mount = `${from}:${to}:${opts}`;
           // check that from path is absolute
           if (!path.isAbsolute(from)) {
-            throw new FatalSandboxError(
-              `Path '${from}' listed in SANDBOX_MOUNTS must be absolute`,
-            );
+            throw new FatalSandboxError(`Path '${from}' listed in SANDBOX_MOUNTS must be absolute`);
           }
           // check that from path exists on host
           if (!fs.existsSync(from)) {
-            throw new FatalSandboxError(
-              `Missing mount path '${from}' listed in SANDBOX_MOUNTS`,
-            );
+            throw new FatalSandboxError(`Missing mount path '${from}' listed in SANDBOX_MOUNTS`);
           }
           debugLogger.log(`SANDBOX_MOUNTS: ${from} -> ${to} (${opts})`);
-          args.push('--volume', mount);
+          args.push("--volume", mount);
         }
       }
     }
 
     // expose env-specified ports on the sandbox
-    ports().forEach((p) => args.push('--publish', `${p}:${p}`));
+    ports().forEach((p) => args.push("--publish", `${p}:${p}`));
 
     // if DEBUG is set, expose debugging port
-    if (process.env['DEBUG']) {
-      const debugPort = process.env['DEBUG_PORT'] || '9229';
+    if (process.env["DEBUG"]) {
+      const debugPort = process.env["DEBUG_PORT"] || "9229";
       args.push(`--publish`, `${debugPort}:${debugPort}`);
     }
 
     // copy proxy environment variables, replacing localhost with SANDBOX_PROXY_NAME
     // copy as both upper-case and lower-case as is required by some utilities
     // GEMINI_SANDBOX_PROXY_COMMAND implies HTTPS_PROXY unless HTTP_PROXY is set
-    const proxyCommand = process.env['GEMINI_SANDBOX_PROXY_COMMAND'];
+    const proxyCommand = process.env["GEMINI_SANDBOX_PROXY_COMMAND"];
 
     if (proxyCommand) {
       let proxy =
-        process.env['HTTPS_PROXY'] ||
-        process.env['https_proxy'] ||
-        process.env['HTTP_PROXY'] ||
-        process.env['http_proxy'] ||
-        'http://localhost:8877';
-      proxy = proxy.replace('localhost', SANDBOX_PROXY_NAME);
+        process.env["HTTPS_PROXY"] ||
+        process.env["https_proxy"] ||
+        process.env["HTTP_PROXY"] ||
+        process.env["http_proxy"] ||
+        "http://localhost:8877";
+      proxy = proxy.replace("localhost", SANDBOX_PROXY_NAME);
       if (proxy) {
-        args.push('--env', `HTTPS_PROXY=${proxy}`);
-        args.push('--env', `https_proxy=${proxy}`); // lower-case can be required, e.g. for curl
-        args.push('--env', `HTTP_PROXY=${proxy}`);
-        args.push('--env', `http_proxy=${proxy}`);
+        args.push("--env", `HTTPS_PROXY=${proxy}`);
+        args.push("--env", `https_proxy=${proxy}`); // lower-case can be required, e.g. for curl
+        args.push("--env", `HTTP_PROXY=${proxy}`);
+        args.push("--env", `http_proxy=${proxy}`);
       }
-      const noProxy = process.env['NO_PROXY'] || process.env['no_proxy'];
+      const noProxy = process.env["NO_PROXY"] || process.env["no_proxy"];
       if (noProxy) {
-        args.push('--env', `NO_PROXY=${noProxy}`);
-        args.push('--env', `no_proxy=${noProxy}`);
+        args.push("--env", `NO_PROXY=${noProxy}`);
+        args.push("--env", `no_proxy=${noProxy}`);
       }
 
       // if using proxy, switch to internal networking through proxy
@@ -394,7 +353,7 @@ export async function start_sandbox(
         execSync(
           `${config.command} network inspect ${SANDBOX_NETWORK_NAME} || ${config.command} network create --internal ${SANDBOX_NETWORK_NAME}`,
         );
-        args.push('--network', SANDBOX_NETWORK_NAME);
+        args.push("--network", SANDBOX_NETWORK_NAME);
         // if proxy command is set, create a separate network w/ host access (i.e. non-internal)
         // we will run proxy in its own container connected to both host network and internal network
         // this allows proxy to work even on rootless podman on macos with host<->vm<->container isolation
@@ -408,13 +367,10 @@ export async function start_sandbox(
 
     // name container after image, plus random suffix to avoid conflicts
     const imageName = parseImageName(image);
-    const isIntegrationTest =
-      process.env['GEMINI_CLI_INTEGRATION_TEST'] === 'true';
+    const isIntegrationTest = process.env["GEMINI_CLI_INTEGRATION_TEST"] === "true";
     let containerName;
     if (isIntegrationTest) {
-      containerName = `gemini-cli-integration-test-${randomBytes(4).toString(
-        'hex',
-      )}`;
+      containerName = `gemini-cli-integration-test-${randomBytes(4).toString("hex")}`;
       debugLogger.log(`ContainerName: ${containerName}`);
     } else {
       let index = 0;
@@ -427,77 +383,62 @@ export async function start_sandbox(
       containerName = `${imageName}-${index}`;
       debugLogger.log(`ContainerName (regular): ${containerName}`);
     }
-    args.push('--name', containerName, '--hostname', containerName);
+    args.push("--name", containerName, "--hostname", containerName);
 
     // copy GEMINI_CLI_TEST_VAR for integration tests
-    if (process.env['GEMINI_CLI_TEST_VAR']) {
-      args.push(
-        '--env',
-        `GEMINI_CLI_TEST_VAR=${process.env['GEMINI_CLI_TEST_VAR']}`,
-      );
+    if (process.env["GEMINI_CLI_TEST_VAR"]) {
+      args.push("--env", `GEMINI_CLI_TEST_VAR=${process.env["GEMINI_CLI_TEST_VAR"]}`);
     }
 
     // copy GEMINI_API_KEY(s)
-    if (process.env['GEMINI_API_KEY']) {
-      args.push('--env', `GEMINI_API_KEY=${process.env['GEMINI_API_KEY']}`);
+    if (process.env["GEMINI_API_KEY"]) {
+      args.push("--env", `GEMINI_API_KEY=${process.env["GEMINI_API_KEY"]}`);
     }
-    if (process.env['GOOGLE_API_KEY']) {
-      args.push('--env', `GOOGLE_API_KEY=${process.env['GOOGLE_API_KEY']}`);
+    if (process.env["GOOGLE_API_KEY"]) {
+      args.push("--env", `GOOGLE_API_KEY=${process.env["GOOGLE_API_KEY"]}`);
     }
 
     // copy GOOGLE_GENAI_USE_VERTEXAI
-    if (process.env['GOOGLE_GENAI_USE_VERTEXAI']) {
-      args.push(
-        '--env',
-        `GOOGLE_GENAI_USE_VERTEXAI=${process.env['GOOGLE_GENAI_USE_VERTEXAI']}`,
-      );
+    if (process.env["GOOGLE_GENAI_USE_VERTEXAI"]) {
+      args.push("--env", `GOOGLE_GENAI_USE_VERTEXAI=${process.env["GOOGLE_GENAI_USE_VERTEXAI"]}`);
     }
 
     // copy GOOGLE_GENAI_USE_GCA
-    if (process.env['GOOGLE_GENAI_USE_GCA']) {
-      args.push(
-        '--env',
-        `GOOGLE_GENAI_USE_GCA=${process.env['GOOGLE_GENAI_USE_GCA']}`,
-      );
+    if (process.env["GOOGLE_GENAI_USE_GCA"]) {
+      args.push("--env", `GOOGLE_GENAI_USE_GCA=${process.env["GOOGLE_GENAI_USE_GCA"]}`);
     }
 
     // copy GOOGLE_CLOUD_PROJECT
-    if (process.env['GOOGLE_CLOUD_PROJECT']) {
-      args.push(
-        '--env',
-        `GOOGLE_CLOUD_PROJECT=${process.env['GOOGLE_CLOUD_PROJECT']}`,
-      );
+    if (process.env["GOOGLE_CLOUD_PROJECT"]) {
+      args.push("--env", `GOOGLE_CLOUD_PROJECT=${process.env["GOOGLE_CLOUD_PROJECT"]}`);
     }
 
     // copy GOOGLE_CLOUD_LOCATION
-    if (process.env['GOOGLE_CLOUD_LOCATION']) {
-      args.push(
-        '--env',
-        `GOOGLE_CLOUD_LOCATION=${process.env['GOOGLE_CLOUD_LOCATION']}`,
-      );
+    if (process.env["GOOGLE_CLOUD_LOCATION"]) {
+      args.push("--env", `GOOGLE_CLOUD_LOCATION=${process.env["GOOGLE_CLOUD_LOCATION"]}`);
     }
 
     // copy GEMINI_MODEL
-    if (process.env['GEMINI_MODEL']) {
-      args.push('--env', `GEMINI_MODEL=${process.env['GEMINI_MODEL']}`);
+    if (process.env["GEMINI_MODEL"]) {
+      args.push("--env", `GEMINI_MODEL=${process.env["GEMINI_MODEL"]}`);
     }
 
     // copy TERM and COLORTERM to try to maintain terminal setup
-    if (process.env['TERM']) {
-      args.push('--env', `TERM=${process.env['TERM']}`);
+    if (process.env["TERM"]) {
+      args.push("--env", `TERM=${process.env["TERM"]}`);
     }
-    if (process.env['COLORTERM']) {
-      args.push('--env', `COLORTERM=${process.env['COLORTERM']}`);
+    if (process.env["COLORTERM"]) {
+      args.push("--env", `COLORTERM=${process.env["COLORTERM"]}`);
     }
 
     // Pass through IDE mode environment variables
     for (const envVar of [
-      'GEMINI_CLI_IDE_SERVER_PORT',
-      'GEMINI_CLI_IDE_WORKSPACE_PATH',
-      'TERM_PROGRAM',
+      "GEMINI_CLI_IDE_SERVER_PORT",
+      "GEMINI_CLI_IDE_WORKSPACE_PATH",
+      "TERM_PROGRAM",
     ]) {
       if (process.env[envVar]) {
-        args.push('--env', `${envVar}=${process.env[envVar]}`);
+        args.push("--env", `${envVar}=${process.env[envVar]}`);
       }
     }
 
@@ -505,35 +446,25 @@ export async function start_sandbox(
     // also mount-replace VIRTUAL_ENV directory with <project_settings>/sandbox.venv
     // sandbox can then set up this new VIRTUAL_ENV directory using sandbox.bashrc (see below)
     // directory will be empty if not set up, which is still preferable to having host binaries
-    if (
-      process.env['VIRTUAL_ENV']
-        ?.toLowerCase()
-        .startsWith(workdir.toLowerCase())
-    ) {
-      const sandboxVenvPath = path.resolve(GEMINI_DIR, 'sandbox.venv');
+    if (process.env["VIRTUAL_ENV"]?.toLowerCase().startsWith(workdir.toLowerCase())) {
+      const sandboxVenvPath = path.resolve(GEMINI_DIR, "sandbox.venv");
       if (!fs.existsSync(sandboxVenvPath)) {
         fs.mkdirSync(sandboxVenvPath, { recursive: true });
       }
-      args.push(
-        '--volume',
-        `${sandboxVenvPath}:${getContainerPath(process.env['VIRTUAL_ENV'])}`,
-      );
-      args.push(
-        '--env',
-        `VIRTUAL_ENV=${getContainerPath(process.env['VIRTUAL_ENV'])}`,
-      );
+      args.push("--volume", `${sandboxVenvPath}:${getContainerPath(process.env["VIRTUAL_ENV"])}`);
+      args.push("--env", `VIRTUAL_ENV=${getContainerPath(process.env["VIRTUAL_ENV"])}`);
     }
 
     // copy additional environment variables from SANDBOX_ENV
-    if (process.env['SANDBOX_ENV']) {
-      for (let env of process.env['SANDBOX_ENV'].split(',')) {
+    if (process.env["SANDBOX_ENV"]) {
+      for (let env of process.env["SANDBOX_ENV"].split(",")) {
         if ((env = env.trim())) {
-          if (env.includes('=')) {
+          if (env.includes("=")) {
             debugLogger.log(`SANDBOX_ENV: ${env}`);
-            args.push('--env', env);
+            args.push("--env", env);
           } else {
             throw new FatalSandboxError(
-              'SANDBOX_ENV must be a comma-separated list of key=value pairs',
+              "SANDBOX_ENV must be a comma-separated list of key=value pairs",
             );
           }
         }
@@ -541,48 +472,48 @@ export async function start_sandbox(
     }
 
     // copy NODE_OPTIONS
-    const existingNodeOptions = process.env['NODE_OPTIONS'] || '';
+    const existingNodeOptions = process.env["NODE_OPTIONS"] || "";
     const allNodeOptions = [
       ...(existingNodeOptions ? [existingNodeOptions] : []),
       ...nodeArgs,
-    ].join(' ');
+    ].join(" ");
 
     if (allNodeOptions.length > 0) {
-      args.push('--env', `NODE_OPTIONS="${allNodeOptions}"`);
+      args.push("--env", `NODE_OPTIONS="${allNodeOptions}"`);
     }
 
     // set SANDBOX as container name
-    args.push('--env', `SANDBOX=${containerName}`);
+    args.push("--env", `SANDBOX=${containerName}`);
 
     // for podman only, use empty --authfile to skip unnecessary auth refresh overhead
-    if (config.command === 'podman') {
-      const emptyAuthFilePath = path.join(os.tmpdir(), 'empty_auth.json');
-      fs.writeFileSync(emptyAuthFilePath, '{}', 'utf-8');
-      args.push('--authfile', emptyAuthFilePath);
+    if (config.command === "podman") {
+      const emptyAuthFilePath = path.join(os.tmpdir(), "empty_auth.json");
+      fs.writeFileSync(emptyAuthFilePath, "{}", "utf-8");
+      args.push("--authfile", emptyAuthFilePath);
     }
 
     // Determine if the current user's UID/GID should be passed to the sandbox.
     // See shouldUseCurrentUserInSandbox for more details.
-    let userFlag = '';
+    let userFlag = "";
     const finalEntrypoint = entrypoint(workdir, cliArgs);
 
-    if (process.env['GEMINI_CLI_INTEGRATION_TEST'] === 'true') {
-      args.push('--user', 'root');
-      userFlag = '--user root';
+    if (process.env["GEMINI_CLI_INTEGRATION_TEST"] === "true") {
+      args.push("--user", "root");
+      userFlag = "--user root";
     } else if (await shouldUseCurrentUserInSandbox()) {
       // For the user-creation logic to work, the container must start as root.
       // The entrypoint script then handles dropping privileges to the correct user.
-      args.push('--user', 'root');
+      args.push("--user", "root");
 
-      const uid = (await execAsync('id -u')).stdout.trim();
-      const gid = (await execAsync('id -g')).stdout.trim();
+      const uid = (await execAsync("id -u")).stdout.trim();
+      const gid = (await execAsync("id -g")).stdout.trim();
 
       // Instead of passing --user to the main sandbox container, we let it
       // start as root, then create a user with the host's UID/GID, and
       // finally switch to that user to run the gemini process. This is
       // necessary on Linux to ensure the user exists within the
       // container's /etc/passwd file, which is required by os.userInfo().
-      const username = 'gemini';
+      const username = "gemini";
       const homeDir = getContainerPath(os.homedir());
 
       const setupUserCommands = [
@@ -590,7 +521,7 @@ export async function start_sandbox(
         `groupadd -f -g ${gid} ${username}`,
         // Create user only if it doesn't exist. Use -o for non-unique UID.
         `id -u ${username} &>/dev/null || useradd -o -u ${uid} -g ${gid} -d ${homeDir} -s /bin/bash ${username}`,
-      ].join(' && ');
+      ].join(" && ");
 
       const originalCommand = finalEntrypoint[2];
       const escapedOriginalCommand = originalCommand.replace(/'/g, "'\\''");
@@ -604,7 +535,7 @@ export async function start_sandbox(
       // We still need userFlag for the simpler proxy container, which does not have this issue.
       userFlag = `--user ${uid}:${gid}`;
       // When forcing a UID in the sandbox, $HOME can be reset to '/', so we copy $HOME as well.
-      args.push('--env', `HOME=${os.homedir()}`);
+      args.push("--env", `HOME=${os.homedir()}`);
     }
 
     // push container image name
@@ -621,38 +552,36 @@ export async function start_sandbox(
       // run proxyCommand in its own container
       const proxyContainerCommand = `${config.command} run --rm --init ${userFlag} --name ${SANDBOX_PROXY_NAME} --network ${SANDBOX_PROXY_NAME} -p 8877:8877 -v ${process.cwd()}:${workdir} --workdir ${workdir} ${image} ${proxyCommand}`;
       proxyProcess = spawn(proxyContainerCommand, {
-        stdio: ['ignore', 'pipe', 'pipe'],
+        stdio: ["ignore", "pipe", "pipe"],
         shell: true,
         detached: true,
       });
       // install handlers to stop proxy on exit/signal
       const stopProxy = () => {
-        debugLogger.log('stopping proxy container ...');
+        debugLogger.log("stopping proxy container ...");
         execSync(`${config.command} rm -f ${SANDBOX_PROXY_NAME}`);
       };
-      process.on('exit', stopProxy);
-      process.on('SIGINT', stopProxy);
-      process.on('SIGTERM', stopProxy);
+      process.on("exit", stopProxy);
+      process.on("SIGINT", stopProxy);
+      process.on("SIGTERM", stopProxy);
 
       // commented out as it disrupts ink rendering
       // proxyProcess.stdout?.on('data', (data) => {
       //   console.info(data.toString());
       // });
-      proxyProcess.stderr?.on('data', (data) => {
+      proxyProcess.stderr?.on("data", (data) => {
         debugLogger.debug(`[PROXY STDERR]: ${data.toString().trim()}`);
       });
-      proxyProcess.on('close', (code, signal) => {
+      proxyProcess.on("close", (code, signal) => {
         if (sandboxProcess?.pid) {
-          process.kill(-sandboxProcess.pid, 'SIGTERM');
+          process.kill(-sandboxProcess.pid, "SIGTERM");
         }
         throw new FatalSandboxError(
           `Proxy container command '${proxyContainerCommand}' exited with code ${code}, signal ${signal}`,
         );
       });
-      debugLogger.log('waiting for proxy to start ...');
-      await execAsync(
-        `until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`,
-      );
+      debugLogger.log("waiting for proxy to start ...");
+      await execAsync(`until timeout 0.25 curl -s http://localhost:8877; do sleep 0.25; done`);
       // connect proxy container to sandbox network
       // (workaround for older versions of docker that don't support multiple --network args)
       await execAsync(
@@ -663,21 +592,19 @@ export async function start_sandbox(
     // spawn child and let it inherit stdio
     process.stdin.pause();
     sandboxProcess = spawn(config.command, args, {
-      stdio: 'inherit',
+      stdio: "inherit",
     });
 
     return await new Promise<number>((resolve, reject) => {
-      sandboxProcess.on('error', (err) => {
-        coreEvents.emitFeedback('error', 'Sandbox process error', err);
+      sandboxProcess.on("error", (err) => {
+        coreEvents.emitFeedback("error", "Sandbox process error", err);
         reject(err);
       });
 
-      sandboxProcess?.on('close', (code, signal) => {
+      sandboxProcess?.on("close", (code, signal) => {
         process.stdin.resume();
         if (code !== 0 && code !== null) {
-          debugLogger.log(
-            `Sandbox process exited with code: ${code}, signal: ${signal}`,
-          );
+          debugLogger.log(`Sandbox process exited with code: ${code}, signal: ${signal}`);
         }
         resolve(code ?? 1);
       });
@@ -690,30 +617,28 @@ export async function start_sandbox(
 // Helper functions to ensure sandbox image is present
 async function imageExists(sandbox: string, image: string): Promise<boolean> {
   return new Promise((resolve) => {
-    const args = ['images', '-q', image];
+    const args = ["images", "-q", image];
     const checkProcess = spawn(sandbox, args);
 
-    let stdoutData = '';
+    let stdoutData = "";
     if (checkProcess.stdout) {
-      checkProcess.stdout.on('data', (data) => {
+      checkProcess.stdout.on("data", (data) => {
         stdoutData += data.toString();
       });
     }
 
-    checkProcess.on('error', (err) => {
-      debugLogger.warn(
-        `Failed to start '${sandbox}' command for image check: ${err.message}`,
-      );
+    checkProcess.on("error", (err) => {
+      debugLogger.warn(`Failed to start '${sandbox}' command for image check: ${err.message}`);
       resolve(false);
     });
 
-    checkProcess.on('close', (code) => {
+    checkProcess.on("close", (code) => {
       // Non-zero code might indicate docker daemon not running, etc.
       // The primary success indicator is non-empty stdoutData.
       if (code !== 0) {
         // console.warn(`'${sandbox} images -q ${image}' exited with code ${code}.`);
       }
-      resolve(stdoutData.trim() !== '');
+      resolve(stdoutData.trim() !== "");
     });
   });
 }
@@ -721,10 +646,10 @@ async function imageExists(sandbox: string, image: string): Promise<boolean> {
 async function pullImage(sandbox: string, image: string): Promise<boolean> {
   console.info(`Attempting to pull image ${image} using ${sandbox}...`);
   return new Promise((resolve) => {
-    const args = ['pull', image];
-    const pullProcess = spawn(sandbox, args, { stdio: 'pipe' });
+    const args = ["pull", image];
+    const pullProcess = spawn(sandbox, args, { stdio: "pipe" });
 
-    let stderrData = '';
+    let stderrData = "";
 
     const onStdoutData = (data: Buffer) => {
       console.info(data.toString().trim()); // Show pull progress
@@ -736,9 +661,7 @@ async function pullImage(sandbox: string, image: string): Promise<boolean> {
     };
 
     const onError = (err: Error) => {
-      debugLogger.warn(
-        `Failed to start '${sandbox} pull ${image}' command: ${err.message}`,
-      );
+      debugLogger.warn(`Failed to start '${sandbox} pull ${image}' command: ${err.message}`);
       cleanup();
       resolve(false);
     };
@@ -762,33 +685,30 @@ async function pullImage(sandbox: string, image: string): Promise<boolean> {
 
     const cleanup = () => {
       if (pullProcess.stdout) {
-        pullProcess.stdout.removeListener('data', onStdoutData);
+        pullProcess.stdout.removeListener("data", onStdoutData);
       }
       if (pullProcess.stderr) {
-        pullProcess.stderr.removeListener('data', onStderrData);
+        pullProcess.stderr.removeListener("data", onStderrData);
       }
-      pullProcess.removeListener('error', onError);
-      pullProcess.removeListener('close', onClose);
+      pullProcess.removeListener("error", onError);
+      pullProcess.removeListener("close", onClose);
       if (pullProcess.connected) {
         pullProcess.disconnect();
       }
     };
 
     if (pullProcess.stdout) {
-      pullProcess.stdout.on('data', onStdoutData);
+      pullProcess.stdout.on("data", onStdoutData);
     }
     if (pullProcess.stderr) {
-      pullProcess.stderr.on('data', onStderrData);
+      pullProcess.stderr.on("data", onStderrData);
     }
-    pullProcess.on('error', onError);
-    pullProcess.on('close', onClose);
+    pullProcess.on("error", onError);
+    pullProcess.on("close", onClose);
   });
 }
 
-async function ensureSandboxImageIsPresent(
-  sandbox: string,
-  image: string,
-): Promise<boolean> {
+async function ensureSandboxImageIsPresent(sandbox: string, image: string): Promise<boolean> {
   debugLogger.log(`Checking for sandbox image: ${image}`);
   if (await imageExists(sandbox, image)) {
     debugLogger.log(`Sandbox image ${image} found locally.`);
@@ -815,7 +735,7 @@ async function ensureSandboxImageIsPresent(
   }
 
   coreEvents.emitFeedback(
-    'error',
+    "error",
     `Failed to obtain sandbox image ${image} after check and pull attempt.`,
   );
   return false; // Pull command failed or image still not present
diff --git a/packages/ui-gemini/src/utils/sandboxUtils.test.ts b/packages/ui-gemini/src/utils/sandboxUtils.test.ts
index ba3a17d69..32aac90c7 100644
--- a/packages/ui-gemini/src/utils/sandboxUtils.test.ts
+++ b/packages/ui-gemini/src/utils/sandboxUtils.test.ts
@@ -4,148 +4,146 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import os from 'node:os';
-import fs from 'node:fs';
-import { readFile } from 'node:fs/promises';
+import fs from "node:fs";
+import { readFile } from "node:fs/promises";
+import os from "node:os";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import {
+  entrypoint,
   getContainerPath,
   parseImageName,
   ports,
-  entrypoint,
   shouldUseCurrentUserInSandbox,
-} from './sandboxUtils.js';
+} from "./sandboxUtils.js";
 
-vi.mock('node:os');
-vi.mock('node:fs');
-vi.mock('node:fs/promises');
-vi.mock('@airiscode/gemini-cli-core', () => ({
+vi.mock("node:os");
+vi.mock("node:fs");
+vi.mock("node:fs/promises");
+vi.mock("@airiscode/gemini-cli-core", () => ({
   debugLogger: {
     log: vi.fn(),
     warn: vi.fn(),
   },
-  GEMINI_DIR: '.gemini',
+  GEMINI_DIR: ".gemini",
 }));
 
-describe('sandboxUtils', () => {
+describe("sandboxUtils", () => {
   const originalEnv = process.env;
 
   beforeEach(() => {
     vi.clearAllMocks();
     process.env = { ...originalEnv };
     // Clean up these env vars that might affect tests
-    delete process.env['NODE_ENV'];
-    delete process.env['DEBUG'];
+    delete process.env["NODE_ENV"];
+    delete process.env["DEBUG"];
   });
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  describe('getContainerPath', () => {
-    it('should return same path on non-Windows', () => {
-      vi.mocked(os.platform).mockReturnValue('linux');
-      expect(getContainerPath('/home/user')).toBe('/home/user');
+  describe("getContainerPath", () => {
+    it("should return same path on non-Windows", () => {
+      vi.mocked(os.platform).mockReturnValue("linux");
+      expect(getContainerPath("/home/user")).toBe("/home/user");
     });
 
-    it('should convert Windows path to container path', () => {
-      vi.mocked(os.platform).mockReturnValue('win32');
-      expect(getContainerPath('C:\\Users\\user')).toBe('/c/Users/user');
+    it("should convert Windows path to container path", () => {
+      vi.mocked(os.platform).mockReturnValue("win32");
+      expect(getContainerPath("C:\\Users\\user")).toBe("/c/Users/user");
     });
 
-    it('should handle Windows path without drive letter', () => {
-      vi.mocked(os.platform).mockReturnValue('win32');
-      expect(getContainerPath('\\Users\\user')).toBe('/Users/user');
+    it("should handle Windows path without drive letter", () => {
+      vi.mocked(os.platform).mockReturnValue("win32");
+      expect(getContainerPath("\\Users\\user")).toBe("/Users/user");
     });
   });
 
-  describe('parseImageName', () => {
-    it('should parse image name with tag', () => {
-      expect(parseImageName('my-image:latest')).toBe('my-image-latest');
+  describe("parseImageName", () => {
+    it("should parse image name with tag", () => {
+      expect(parseImageName("my-image:latest")).toBe("my-image-latest");
     });
 
-    it('should parse image name without tag', () => {
-      expect(parseImageName('my-image')).toBe('my-image');
+    it("should parse image name without tag", () => {
+      expect(parseImageName("my-image")).toBe("my-image");
     });
 
-    it('should handle registry path', () => {
-      expect(parseImageName('gcr.io/my-project/my-image:v1')).toBe(
-        'my-image-v1',
-      );
+    it("should handle registry path", () => {
+      expect(parseImageName("gcr.io/my-project/my-image:v1")).toBe("my-image-v1");
     });
   });
 
-  describe('ports', () => {
-    it('should return empty array if SANDBOX_PORTS is not set', () => {
-      delete process.env['SANDBOX_PORTS'];
+  describe("ports", () => {
+    it("should return empty array if SANDBOX_PORTS is not set", () => {
+      delete process.env["SANDBOX_PORTS"];
       expect(ports()).toEqual([]);
     });
 
-    it('should parse comma-separated ports', () => {
-      process.env['SANDBOX_PORTS'] = '8080, 3000 , 9000';
-      expect(ports()).toEqual(['8080', '3000', '9000']);
+    it("should parse comma-separated ports", () => {
+      process.env["SANDBOX_PORTS"] = "8080, 3000 , 9000";
+      expect(ports()).toEqual(["8080", "3000", "9000"]);
     });
   });
 
-  describe('entrypoint', () => {
+  describe("entrypoint", () => {
     beforeEach(() => {
-      vi.mocked(os.platform).mockReturnValue('linux');
+      vi.mocked(os.platform).mockReturnValue("linux");
       vi.mocked(fs.existsSync).mockReturnValue(false);
     });
 
-    it('should generate default entrypoint', () => {
-      const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
-      expect(args).toEqual(['bash', '-c', 'gemini arg1']);
+    it("should generate default entrypoint", () => {
+      const args = entrypoint("/work", ["node", "gemini", "arg1"]);
+      expect(args).toEqual(["bash", "-c", "gemini arg1"]);
     });
 
-    it('should include PATH and PYTHONPATH if set', () => {
-      process.env['PATH'] = '/work/bin:/usr/bin';
-      process.env['PYTHONPATH'] = '/work/lib';
-      const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
+    it("should include PATH and PYTHONPATH if set", () => {
+      process.env["PATH"] = "/work/bin:/usr/bin";
+      process.env["PYTHONPATH"] = "/work/lib";
+      const args = entrypoint("/work", ["node", "gemini", "arg1"]);
       expect(args[2]).toContain('export PATH="$PATH:/work/bin"');
       expect(args[2]).toContain('export PYTHONPATH="$PYTHONPATH:/work/lib"');
     });
 
-    it('should source sandbox.bashrc if exists', () => {
+    it("should source sandbox.bashrc if exists", () => {
       vi.mocked(fs.existsSync).mockReturnValue(true);
-      const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
-      expect(args[2]).toContain('source .gemini/sandbox.bashrc');
+      const args = entrypoint("/work", ["node", "gemini", "arg1"]);
+      expect(args[2]).toContain("source .gemini/sandbox.bashrc");
     });
 
-    it('should include socat commands for ports', () => {
-      process.env['SANDBOX_PORTS'] = '8080';
-      const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
-      expect(args[2]).toContain('socat TCP4-LISTEN:8080');
+    it("should include socat commands for ports", () => {
+      process.env["SANDBOX_PORTS"] = "8080";
+      const args = entrypoint("/work", ["node", "gemini", "arg1"]);
+      expect(args[2]).toContain("socat TCP4-LISTEN:8080");
     });
 
-    it('should use development command if NODE_ENV is development', () => {
-      process.env['NODE_ENV'] = 'development';
-      const args = entrypoint('/work', ['node', 'gemini', 'arg1']);
-      expect(args[2]).toContain('npm rebuild && npm run start --');
+    it("should use development command if NODE_ENV is development", () => {
+      process.env["NODE_ENV"] = "development";
+      const args = entrypoint("/work", ["node", "gemini", "arg1"]);
+      expect(args[2]).toContain("npm rebuild && npm run start --");
     });
   });
 
-  describe('shouldUseCurrentUserInSandbox', () => {
-    it('should return true if SANDBOX_SET_UID_GID is 1', async () => {
-      process.env['SANDBOX_SET_UID_GID'] = '1';
+  describe("shouldUseCurrentUserInSandbox", () => {
+    it("should return true if SANDBOX_SET_UID_GID is 1", async () => {
+      process.env["SANDBOX_SET_UID_GID"] = "1";
       expect(await shouldUseCurrentUserInSandbox()).toBe(true);
     });
 
-    it('should return false if SANDBOX_SET_UID_GID is 0', async () => {
-      process.env['SANDBOX_SET_UID_GID'] = '0';
+    it("should return false if SANDBOX_SET_UID_GID is 0", async () => {
+      process.env["SANDBOX_SET_UID_GID"] = "0";
       expect(await shouldUseCurrentUserInSandbox()).toBe(false);
     });
 
-    it('should return true on Debian Linux', async () => {
-      delete process.env['SANDBOX_SET_UID_GID'];
-      vi.mocked(os.platform).mockReturnValue('linux');
-      vi.mocked(readFile).mockResolvedValue('ID=debian\n');
+    it("should return true on Debian Linux", async () => {
+      delete process.env["SANDBOX_SET_UID_GID"];
+      vi.mocked(os.platform).mockReturnValue("linux");
+      vi.mocked(readFile).mockResolvedValue("ID=debian\n");
       expect(await shouldUseCurrentUserInSandbox()).toBe(true);
     });
 
-    it('should return false on non-Linux', async () => {
-      delete process.env['SANDBOX_SET_UID_GID'];
-      vi.mocked(os.platform).mockReturnValue('darwin');
+    it("should return false on non-Linux", async () => {
+      delete process.env["SANDBOX_SET_UID_GID"];
+      vi.mocked(os.platform).mockReturnValue("darwin");
       expect(await shouldUseCurrentUserInSandbox()).toBe(false);
     });
   });
diff --git a/packages/ui-gemini/src/utils/sandboxUtils.ts b/packages/ui-gemini/src/utils/sandboxUtils.ts
index 8e98c1889..8d08e33ed 100644
--- a/packages/ui-gemini/src/utils/sandboxUtils.ts
+++ b/packages/ui-gemini/src/utils/sandboxUtils.ts
@@ -4,30 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import os from 'node:os';
-import fs from 'node:fs';
-import { readFile } from 'node:fs/promises';
-import { quote } from 'shell-quote';
-import { debugLogger, GEMINI_DIR } from '@airiscode/gemini-cli-core';
-
-export const LOCAL_DEV_SANDBOX_IMAGE_NAME = 'gemini-cli-sandbox';
-export const SANDBOX_NETWORK_NAME = 'gemini-cli-sandbox';
-export const SANDBOX_PROXY_NAME = 'gemini-cli-sandbox-proxy';
+import fs from "node:fs";
+import { readFile } from "node:fs/promises";
+import os from "node:os";
+import { debugLogger, GEMINI_DIR } from "@airiscode/gemini-cli-core";
+import { quote } from "shell-quote";
+
+export const LOCAL_DEV_SANDBOX_IMAGE_NAME = "gemini-cli-sandbox";
+export const SANDBOX_NETWORK_NAME = "gemini-cli-sandbox";
+export const SANDBOX_PROXY_NAME = "gemini-cli-sandbox-proxy";
 export const BUILTIN_SEATBELT_PROFILES = [
-  'permissive-open',
-  'permissive-closed',
-  'permissive-proxied',
-  'restrictive-open',
-  'restrictive-closed',
-  'restrictive-proxied',
+  "permissive-open",
+  "permissive-closed",
+  "permissive-proxied",
+  "restrictive-open",
+  "restrictive-closed",
+  "restrictive-proxied",
 ];
 
 export function getContainerPath(hostPath: string): string {
-  if (os.platform() !== 'win32') {
+  if (os.platform() !== "win32") {
     return hostPath;
   }
 
-  const withForwardSlashes = hostPath.replace(/\\/g, '/');
+  const withForwardSlashes = hostPath.replace(/\\/g, "/");
   const match = withForwardSlashes.match(/^([A-Z]):\/(.*)/i);
   if (match) {
     return `/${match[1].toLowerCase()}/${match[2]}`;
@@ -36,35 +36,33 @@ export function getContainerPath(hostPath: string): string {
 }
 
 export async function shouldUseCurrentUserInSandbox(): Promise<boolean> {
-  const envVar = process.env['SANDBOX_SET_UID_GID']?.toLowerCase().trim();
+  const envVar = process.env["SANDBOX_SET_UID_GID"]?.toLowerCase().trim();
 
-  if (envVar === '1' || envVar === 'true') {
+  if (envVar === "1" || envVar === "true") {
     return true;
   }
-  if (envVar === '0' || envVar === 'false') {
+  if (envVar === "0" || envVar === "false") {
     return false;
   }
 
   // If environment variable is not explicitly set, check for Debian/Ubuntu Linux
-  if (os.platform() === 'linux') {
+  if (os.platform() === "linux") {
     try {
-      const osReleaseContent = await readFile('/etc/os-release', 'utf8');
+      const osReleaseContent = await readFile("/etc/os-release", "utf8");
       if (
-        osReleaseContent.includes('ID=debian') ||
-        osReleaseContent.includes('ID=ubuntu') ||
+        osReleaseContent.includes("ID=debian") ||
+        osReleaseContent.includes("ID=ubuntu") ||
         osReleaseContent.match(/^ID_LIKE=.*debian.*/m) || // Covers derivatives
         osReleaseContent.match(/^ID_LIKE=.*ubuntu.*/m) // Covers derivatives
       ) {
-        debugLogger.log(
-          'Defaulting to use current user UID/GID for Debian/Ubuntu-based Linux.',
-        );
+        debugLogger.log("Defaulting to use current user UID/GID for Debian/Ubuntu-based Linux.");
         return true;
       }
     } catch (_err) {
       // Silently ignore if /etc/os-release is not found or unreadable.
       // The default (false) will be applied in this case.
       debugLogger.warn(
-        'Warning: Could not read /etc/os-release to auto-detect Debian/Ubuntu for UID/GID default.',
+        "Warning: Could not read /etc/os-release to auto-detect Debian/Ubuntu for UID/GID default.",
       );
     }
   }
@@ -72,32 +70,30 @@ export async function shouldUseCurrentUserInSandbox(): Promise<boolean> {
 }
 
 export function parseImageName(image: string): string {
-  const [fullName, tag] = image.split(':');
-  const name = fullName.split('/').at(-1) ?? 'unknown-image';
+  const [fullName, tag] = image.split(":");
+  const name = fullName.split("/").at(-1) ?? "unknown-image";
   return tag ? `${name}-${tag}` : name;
 }
 
 export function ports(): string[] {
-  return (process.env['SANDBOX_PORTS'] ?? '')
-    .split(',')
+  return (process.env["SANDBOX_PORTS"] ?? "")
+    .split(",")
     .filter((p) => p.trim())
     .map((p) => p.trim());
 }
 
 export function entrypoint(workdir: string, cliArgs: string[]): string[] {
-  const isWindows = os.platform() === 'win32';
+  const isWindows = os.platform() === "win32";
   const containerWorkdir = getContainerPath(workdir);
   const shellCmds = [];
-  const pathSeparator = isWindows ? ';' : ':';
+  const pathSeparator = isWindows ? ";" : ":";
 
-  let pathSuffix = '';
-  if (process.env['PATH']) {
-    const paths = process.env['PATH'].split(pathSeparator);
+  let pathSuffix = "";
+  if (process.env["PATH"]) {
+    const paths = process.env["PATH"].split(pathSeparator);
     for (const p of paths) {
       const containerPath = getContainerPath(p);
-      if (
-        containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())
-      ) {
+      if (containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())) {
         pathSuffix += `:${containerPath}`;
       }
     }
@@ -106,14 +102,12 @@ export function entrypoint(workdir: string, cliArgs: string[]): string[] {
     shellCmds.push(`export PATH="$PATH${pathSuffix}";`);
   }
 
-  let pythonPathSuffix = '';
-  if (process.env['PYTHONPATH']) {
-    const paths = process.env['PYTHONPATH'].split(pathSeparator);
+  let pythonPathSuffix = "";
+  if (process.env["PYTHONPATH"]) {
+    const paths = process.env["PYTHONPATH"].split(pathSeparator);
     for (const p of paths) {
       const containerPath = getContainerPath(p);
-      if (
-        containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())
-      ) {
+      if (containerPath.toLowerCase().startsWith(containerWorkdir.toLowerCase())) {
         pythonPathSuffix += `:${containerPath}`;
       }
     }
@@ -134,17 +128,16 @@ export function entrypoint(workdir: string, cliArgs: string[]): string[] {
   );
 
   const quotedCliArgs = cliArgs.slice(2).map((arg) => quote([arg]));
-  const isDebugMode =
-    process.env['DEBUG'] === 'true' || process.env['DEBUG'] === '1';
+  const isDebugMode = process.env["DEBUG"] === "true" || process.env["DEBUG"] === "1";
   const cliCmd =
-    process.env['NODE_ENV'] === 'development'
+    process.env["NODE_ENV"] === "development"
       ? isDebugMode
-        ? 'npm run debug --'
-        : 'npm rebuild && npm run start --'
+        ? "npm run debug --"
+        : "npm rebuild && npm run start --"
       : isDebugMode
-        ? `node --inspect-brk=0.0.0.0:${process.env['DEBUG_PORT'] || '9229'} $(which gemini)`
-        : 'gemini';
+        ? `node --inspect-brk=0.0.0.0:${process.env["DEBUG_PORT"] || "9229"} $(which gemini)`
+        : "gemini";
 
   const args = [...shellCmds, cliCmd, ...quotedCliArgs];
-  return ['bash', '-c', args.join(' ')];
+  return ["bash", "-c", args.join(" ")];
 }
diff --git a/packages/ui-gemini/src/utils/sessionCleanup.integration.test.ts b/packages/ui-gemini/src/utils/sessionCleanup.integration.test.ts
index 4ab7bd9ad..f1ffef46c 100644
--- a/packages/ui-gemini/src/utils/sessionCleanup.integration.test.ts
+++ b/packages/ui-gemini/src/utils/sessionCleanup.integration.test.ts
@@ -4,31 +4,31 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { cleanupExpiredSessions } from './sessionCleanup.js';
-import type { Settings } from '../config/settings.js';
-import { SESSION_FILE_PREFIX, type Config } from '@airiscode/gemini-cli-core';
+import { type Config, SESSION_FILE_PREFIX } from "@airiscode/gemini-cli-core";
+import { describe, expect, it, vi } from "vitest";
+import type { Settings } from "../config/settings.js";
+import { cleanupExpiredSessions } from "./sessionCleanup.js";
 
 // Create a mock config for integration testing
 function createTestConfig(): Config {
   return {
     storage: {
-      getProjectTempDir: () => '/tmp/nonexistent-test-dir',
+      getProjectTempDir: () => "/tmp/nonexistent-test-dir",
     },
-    getSessionId: () => 'test-session-id',
+    getSessionId: () => "test-session-id",
     getDebugMode: () => false,
     initialize: async () => undefined,
   } as unknown as Config;
 }
 
-describe('Session Cleanup Integration', () => {
-  it('should gracefully handle non-existent directories', async () => {
+describe("Session Cleanup Integration", () => {
+  it("should gracefully handle non-existent directories", async () => {
     const config = createTestConfig();
     const settings: Settings = {
       general: {
         sessionRetention: {
           enabled: true,
-          maxAge: '30d',
+          maxAge: "30d",
         },
       },
     };
@@ -43,7 +43,7 @@ describe('Session Cleanup Integration', () => {
     expect(result.failed).toBe(0);
   });
 
-  it('should not impact startup when disabled', async () => {
+  it("should not impact startup when disabled", async () => {
     const config = createTestConfig();
     const settings: Settings = {
       general: {
@@ -62,14 +62,14 @@ describe('Session Cleanup Integration', () => {
     expect(result.failed).toBe(0);
   });
 
-  it('should handle missing sessionRetention configuration', async () => {
+  it("should handle missing sessionRetention configuration", async () => {
     // Create test session files to verify they are NOT deleted when config is missing
-    const fs = await import('node:fs/promises');
-    const path = await import('node:path');
-    const os = await import('node:os');
+    const fs = await import("node:fs/promises");
+    const path = await import("node:path");
+    const os = await import("node:os");
 
-    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-test-'));
-    const chatsDir = path.join(tempDir, 'chats');
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "gemini-test-"));
+    const chatsDir = path.join(tempDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     // Create an old session file that would normally be deleted
@@ -81,7 +81,7 @@ describe('Session Cleanup Integration', () => {
     await fs.writeFile(
       sessionFile,
       JSON.stringify({
-        sessionId: 'test123',
+        sessionId: "test123",
         messages: [],
         startTime: oldDate.toISOString(),
         lastUpdated: oldDate.toISOString(),
@@ -103,23 +103,21 @@ describe('Session Cleanup Integration', () => {
 
     // Verify the session file still exists (was not deleted)
     const filesAfter = await fs.readdir(chatsDir);
-    expect(filesAfter).toContain(
-      `${SESSION_FILE_PREFIX}2024-01-01T10-00-00-test123.json`,
-    );
+    expect(filesAfter).toContain(`${SESSION_FILE_PREFIX}2024-01-01T10-00-00-test123.json`);
 
     // Cleanup
     await fs.rm(tempDir, { recursive: true });
   });
 
-  it('should validate configuration and fail gracefully', async () => {
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+  it("should validate configuration and fail gracefully", async () => {
+    const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
     const config = createTestConfig();
 
     const settings: Settings = {
       general: {
         sessionRetention: {
           enabled: true,
-          maxAge: 'invalid-format',
+          maxAge: "invalid-format",
         },
       },
     };
@@ -134,22 +132,20 @@ describe('Session Cleanup Integration', () => {
 
     // Verify error logging provides visibility into the validation failure
     expect(errorSpy).toHaveBeenCalledWith(
-      expect.stringContaining(
-        'Session cleanup disabled: Error: Invalid retention period format',
-      ),
+      expect.stringContaining("Session cleanup disabled: Error: Invalid retention period format"),
     );
 
     errorSpy.mockRestore();
   });
 
-  it('should clean up expired sessions when they exist', async () => {
+  it("should clean up expired sessions when they exist", async () => {
     // Create a temporary directory with test sessions
-    const fs = await import('node:fs/promises');
-    const path = await import('node:path');
-    const os = await import('node:os');
+    const fs = await import("node:fs/promises");
+    const path = await import("node:path");
+    const os = await import("node:os");
 
-    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-test-'));
-    const chatsDir = path.join(tempDir, 'chats');
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "gemini-test-"));
+    const chatsDir = path.join(tempDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     // Create test session files with different ages
@@ -165,8 +161,8 @@ describe('Session Cleanup Integration', () => {
     await fs.writeFile(
       oldSessionFile,
       JSON.stringify({
-        sessionId: 'old12345',
-        messages: [{ type: 'user', content: 'test message' }],
+        sessionId: "old12345",
+        messages: [{ type: "user", content: "test message" }],
         startTime: oldDate.toISOString(),
         lastUpdated: oldDate.toISOString(),
       }),
@@ -180,8 +176,8 @@ describe('Session Cleanup Integration', () => {
     await fs.writeFile(
       recentSessionFile,
       JSON.stringify({
-        sessionId: 'recent789',
-        messages: [{ type: 'user', content: 'test message' }],
+        sessionId: "recent789",
+        messages: [{ type: "user", content: "test message" }],
         startTime: recentDate.toISOString(),
         lastUpdated: recentDate.toISOString(),
       }),
@@ -195,8 +191,8 @@ describe('Session Cleanup Integration', () => {
     await fs.writeFile(
       currentSessionFile,
       JSON.stringify({
-        sessionId: 'current123',
-        messages: [{ type: 'user', content: 'test message' }],
+        sessionId: "current123",
+        messages: [{ type: "user", content: "test message" }],
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
       }),
@@ -207,7 +203,7 @@ describe('Session Cleanup Integration', () => {
       storage: {
         getProjectTempDir: () => tempDir,
       },
-      getSessionId: () => 'current123',
+      getSessionId: () => "current123",
       getDebugMode: () => false,
       initialize: async () => undefined,
     } as unknown as Config;
@@ -216,7 +212,7 @@ describe('Session Cleanup Integration', () => {
       general: {
         sessionRetention: {
           enabled: true,
-          maxAge: '30d', // Keep sessions for 30 days
+          maxAge: "30d", // Keep sessions for 30 days
         },
       },
     };
@@ -234,12 +230,8 @@ describe('Session Cleanup Integration', () => {
       // Verify files on disk
       const remainingFiles = await fs.readdir(chatsDir);
       expect(remainingFiles).toHaveLength(2); // Only 2 files should remain
-      expect(remainingFiles).toContain(
-        `${SESSION_FILE_PREFIX}2025-01-15T10-00-00-recent789.json`,
-      );
-      expect(remainingFiles).toContain(
-        `${SESSION_FILE_PREFIX}2025-01-20T10-00-00-current123.json`,
-      );
+      expect(remainingFiles).toContain(`${SESSION_FILE_PREFIX}2025-01-15T10-00-00-recent789.json`);
+      expect(remainingFiles).toContain(`${SESSION_FILE_PREFIX}2025-01-20T10-00-00-current123.json`);
       expect(remainingFiles).not.toContain(
         `${SESSION_FILE_PREFIX}2024-12-01T10-00-00-old12345.json`,
       );
diff --git a/packages/ui-gemini/src/utils/sessionCleanup.test.ts b/packages/ui-gemini/src/utils/sessionCleanup.test.ts
index d21a8daa4..a3b09d283 100644
--- a/packages/ui-gemini/src/utils/sessionCleanup.test.ts
+++ b/packages/ui-gemini/src/utils/sessionCleanup.test.ts
@@ -4,21 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import {
-  SESSION_FILE_PREFIX,
-  type Config,
-  debugLogger,
-} from '@airiscode/gemini-cli-core';
-import type { Settings } from '../config/settings.js';
-import { cleanupExpiredSessions } from './sessionCleanup.js';
-import { type SessionInfo, getAllSessionFiles } from './sessionUtils.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { type Config, debugLogger, SESSION_FILE_PREFIX } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import type { Settings } from "../config/settings.js";
+import { cleanupExpiredSessions } from "./sessionCleanup.js";
+import { getAllSessionFiles, type SessionInfo } from "./sessionUtils.js";
 
 // Mock the fs module
-vi.mock('fs/promises');
-vi.mock('./sessionUtils.js', () => ({
+vi.mock("fs/promises");
+vi.mock("./sessionUtils.js", () => ({
   getAllSessionFiles: vi.fn(),
 }));
 
@@ -29,9 +25,9 @@ const mockGetAllSessionFiles = vi.mocked(getAllSessionFiles);
 function createMockConfig(overrides: Partial<Config> = {}): Config {
   return {
     storage: {
-      getProjectTempDir: vi.fn().mockReturnValue('/tmp/test-project'),
+      getProjectTempDir: vi.fn().mockReturnValue("/tmp/test-project"),
     },
-    getSessionId: vi.fn().mockReturnValue('current123'),
+    getSessionId: vi.fn().mockReturnValue("current123"),
     getDebugMode: vi.fn().mockReturnValue(false),
     initialize: vi.fn().mockResolvedValue(undefined),
     ...overrides,
@@ -47,57 +43,57 @@ function createTestSessions(): SessionInfo[] {
 
   return [
     {
-      id: 'current123',
+      id: "current123",
       file: `${SESSION_FILE_PREFIX}2025-01-20T10-30-00-current12`,
       fileName: `${SESSION_FILE_PREFIX}2025-01-20T10-30-00-current12.json`,
       startTime: now.toISOString(),
       lastUpdated: now.toISOString(),
       messageCount: 5,
-      displayName: 'Current session',
-      firstUserMessage: 'Current session',
+      displayName: "Current session",
+      firstUserMessage: "Current session",
       isCurrentSession: true,
       index: 1,
     },
     {
-      id: 'recent456',
+      id: "recent456",
       file: `${SESSION_FILE_PREFIX}2025-01-18T15-45-00-recent45`,
       fileName: `${SESSION_FILE_PREFIX}2025-01-18T15-45-00-recent45.json`,
       startTime: oneWeekAgo.toISOString(),
       lastUpdated: oneWeekAgo.toISOString(),
       messageCount: 10,
-      displayName: 'Recent session',
-      firstUserMessage: 'Recent session',
+      displayName: "Recent session",
+      firstUserMessage: "Recent session",
       isCurrentSession: false,
       index: 2,
     },
     {
-      id: 'old789abc',
+      id: "old789abc",
       file: `${SESSION_FILE_PREFIX}2025-01-10T09-15-00-old789ab`,
       fileName: `${SESSION_FILE_PREFIX}2025-01-10T09-15-00-old789ab.json`,
       startTime: twoWeeksAgo.toISOString(),
       lastUpdated: twoWeeksAgo.toISOString(),
       messageCount: 3,
-      displayName: 'Old session',
-      firstUserMessage: 'Old session',
+      displayName: "Old session",
+      firstUserMessage: "Old session",
       isCurrentSession: false,
       index: 3,
     },
     {
-      id: 'ancient12',
+      id: "ancient12",
       file: `${SESSION_FILE_PREFIX}2024-12-25T12-00-00-ancient1`,
       fileName: `${SESSION_FILE_PREFIX}2024-12-25T12-00-00-ancient1.json`,
       startTime: oneMonthAgo.toISOString(),
       lastUpdated: oneMonthAgo.toISOString(),
       messageCount: 15,
-      displayName: 'Ancient session',
-      firstUserMessage: 'Ancient session',
+      displayName: "Ancient session",
+      firstUserMessage: "Ancient session",
       isCurrentSession: false,
       index: 4,
     },
   ];
 }
 
-describe('Session Cleanup', () => {
+describe("Session Cleanup", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     // By default, return all test sessions as valid
@@ -114,8 +110,8 @@ describe('Session Cleanup', () => {
     vi.restoreAllMocks();
   });
 
-  describe('cleanupExpiredSessions', () => {
-    it('should return early when cleanup is disabled', async () => {
+  describe("cleanupExpiredSessions", () => {
+    it("should return early when cleanup is disabled", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: { sessionRetention: { enabled: false } },
@@ -130,7 +126,7 @@ describe('Session Cleanup', () => {
       expect(result.failed).toBe(0);
     });
 
-    it('should return early when sessionRetention is not configured', async () => {
+    it("should return early when sessionRetention is not configured", async () => {
       const config = createMockConfig();
       const settings: Settings = {};
 
@@ -141,7 +137,7 @@ describe('Session Cleanup', () => {
       expect(result.deleted).toBe(0);
     });
 
-    it('should handle invalid maxAge configuration', async () => {
+    it("should handle invalid maxAge configuration", async () => {
       const config = createMockConfig({
         getDebugMode: vi.fn().mockReturnValue(true),
       });
@@ -149,12 +145,12 @@ describe('Session Cleanup', () => {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: 'invalid-format',
+            maxAge: "invalid-format",
           },
         },
       };
 
-      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       const result = await cleanupExpiredSessions(config, settings);
 
@@ -162,21 +158,19 @@ describe('Session Cleanup', () => {
       expect(result.scanned).toBe(0);
       expect(result.deleted).toBe(0);
       expect(errorSpy).toHaveBeenCalledWith(
-        expect.stringContaining(
-          'Session cleanup disabled: Error: Invalid retention period format',
-        ),
+        expect.stringContaining("Session cleanup disabled: Error: Invalid retention period format"),
       );
 
       errorSpy.mockRestore();
     });
 
-    it('should delete sessions older than maxAge', async () => {
+    it("should delete sessions older than maxAge", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '10d', // 10 days
+            maxAge: "10d", // 10 days
           },
         },
       };
@@ -185,10 +179,10 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
@@ -202,13 +196,13 @@ describe('Session Cleanup', () => {
       expect(result.failed).toBe(0);
     });
 
-    it('should never delete current session', async () => {
+    it("should never delete current session", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '1d', // Very short retention
+            maxAge: "1d", // Very short retention
           },
         },
       };
@@ -217,10 +211,10 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
@@ -234,16 +228,14 @@ describe('Session Cleanup', () => {
       // Verify that unlink was never called with the current session file
       const unlinkCalls = mockFs.unlink.mock.calls;
       const currentSessionPath = path.join(
-        '/tmp/test-project',
-        'chats',
+        "/tmp/test-project",
+        "chats",
         `${SESSION_FILE_PREFIX}2025-01-20T10-30-00-current12.json`,
       );
-      expect(
-        unlinkCalls.find((call) => call[0] === currentSessionPath),
-      ).toBeUndefined();
+      expect(unlinkCalls.find((call) => call[0] === currentSessionPath)).toBeUndefined();
     });
 
-    it('should handle count-based retention', async () => {
+    it("should handle count-based retention", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
@@ -258,10 +250,10 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
@@ -274,13 +266,13 @@ describe('Session Cleanup', () => {
       expect(result.skipped).toBe(2); // Current session + 1 recent session should be kept
     });
 
-    it('should handle file system errors gracefully', async () => {
+    it("should handle file system errors gracefully", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '1d',
+            maxAge: "1d",
           },
         },
       };
@@ -289,13 +281,13 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
-      mockFs.unlink.mockRejectedValue(new Error('Permission denied'));
+      mockFs.unlink.mockRejectedValue(new Error("Permission denied"));
 
       const result = await cleanupExpiredSessions(config, settings);
 
@@ -305,13 +297,13 @@ describe('Session Cleanup', () => {
       expect(result.failed).toBeGreaterThan(0);
     });
 
-    it('should handle empty sessions directory', async () => {
+    it("should handle empty sessions directory", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '30d',
+            maxAge: "30d",
           },
         },
       };
@@ -327,43 +319,39 @@ describe('Session Cleanup', () => {
       expect(result.failed).toBe(0);
     });
 
-    it('should handle global errors gracefully', async () => {
+    it("should handle global errors gracefully", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '30d',
+            maxAge: "30d",
           },
         },
       };
 
-      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       // Mock getSessionFiles to throw an error
-      mockGetAllSessionFiles.mockRejectedValue(
-        new Error('Directory access failed'),
-      );
+      mockGetAllSessionFiles.mockRejectedValue(new Error("Directory access failed"));
 
       const result = await cleanupExpiredSessions(config, settings);
 
       expect(result.disabled).toBe(false);
       expect(result.failed).toBe(1);
-      expect(errorSpy).toHaveBeenCalledWith(
-        'Session cleanup failed: Directory access failed',
-      );
+      expect(errorSpy).toHaveBeenCalledWith("Session cleanup failed: Directory access failed");
 
       errorSpy.mockRestore();
     });
 
-    it('should respect minRetention configuration', async () => {
+    it("should respect minRetention configuration", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '12h', // Less than 1 day minimum
-            minRetention: '1d',
+            maxAge: "12h", // Less than 1 day minimum
+            minRetention: "1d",
           },
         },
       };
@@ -376,7 +364,7 @@ describe('Session Cleanup', () => {
       expect(result.deleted).toBe(0);
     });
 
-    it('should log debug information when enabled', async () => {
+    it("should log debug information when enabled", async () => {
       const config = createMockConfig({
         getDebugMode: vi.fn().mockReturnValue(true),
       });
@@ -384,7 +372,7 @@ describe('Session Cleanup', () => {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '10d',
+            maxAge: "10d",
           },
         },
       };
@@ -393,39 +381,33 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
 
-      const debugSpy = vi
-        .spyOn(debugLogger, 'debug')
-        .mockImplementation(() => {});
+      const debugSpy = vi.spyOn(debugLogger, "debug").mockImplementation(() => {});
 
       await cleanupExpiredSessions(config, settings);
 
-      expect(debugSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Session cleanup: deleted'),
-      );
-      expect(debugSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Deleted expired session:'),
-      );
+      expect(debugSpy).toHaveBeenCalledWith(expect.stringContaining("Session cleanup: deleted"));
+      expect(debugSpy).toHaveBeenCalledWith(expect.stringContaining("Deleted expired session:"));
 
       debugSpy.mockRestore();
     });
   });
 
-  describe('Specific cleanup scenarios', () => {
-    it('should delete sessions that exceed the cutoff date', async () => {
+  describe("Specific cleanup scenarios", () => {
+    it("should delete sessions that exceed the cutoff date", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '7d', // Keep sessions for 7 days
+            maxAge: "7d", // Keep sessions for 7 days
           },
         },
       };
@@ -438,50 +420,50 @@ describe('Session Cleanup', () => {
 
       const testSessions: SessionInfo[] = [
         {
-          id: 'current',
+          id: "current",
           file: `${SESSION_FILE_PREFIX}current`,
           fileName: `${SESSION_FILE_PREFIX}current.json`,
           startTime: now.toISOString(),
           lastUpdated: now.toISOString(),
           messageCount: 1,
-          displayName: 'Current',
-          firstUserMessage: 'Current',
+          displayName: "Current",
+          firstUserMessage: "Current",
           isCurrentSession: true,
           index: 1,
         },
         {
-          id: 'session5d',
+          id: "session5d",
           file: `${SESSION_FILE_PREFIX}5d`,
           fileName: `${SESSION_FILE_PREFIX}5d.json`,
           startTime: fiveDaysAgo.toISOString(),
           lastUpdated: fiveDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '5 days old',
-          firstUserMessage: '5 days',
+          displayName: "5 days old",
+          firstUserMessage: "5 days",
           isCurrentSession: false,
           index: 2,
         },
         {
-          id: 'session8d',
+          id: "session8d",
           file: `${SESSION_FILE_PREFIX}8d`,
           fileName: `${SESSION_FILE_PREFIX}8d.json`,
           startTime: eightDaysAgo.toISOString(),
           lastUpdated: eightDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '8 days old',
-          firstUserMessage: '8 days',
+          displayName: "8 days old",
+          firstUserMessage: "8 days",
           isCurrentSession: false,
           index: 3,
         },
         {
-          id: 'session15d',
+          id: "session15d",
           file: `${SESSION_FILE_PREFIX}15d`,
           fileName: `${SESSION_FILE_PREFIX}15d.json`,
           startTime: fifteenDaysAgo.toISOString(),
           lastUpdated: fifteenDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '15 days old',
-          firstUserMessage: '15 days',
+          displayName: "15 days old",
+          firstUserMessage: "15 days",
           isCurrentSession: false,
           index: 4,
         },
@@ -498,10 +480,10 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
@@ -517,35 +499,23 @@ describe('Session Cleanup', () => {
       // Verify which files were deleted
       const unlinkCalls = mockFs.unlink.mock.calls.map((call) => call[0]);
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}8d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}8d.json`),
       );
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}15d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}15d.json`),
       );
       expect(unlinkCalls).not.toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}5d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}5d.json`),
       );
     });
 
-    it('should NOT delete sessions within the cutoff date', async () => {
+    it("should NOT delete sessions within the cutoff date", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '14d', // Keep sessions for 14 days
+            maxAge: "14d", // Keep sessions for 14 days
           },
         },
       };
@@ -554,56 +524,54 @@ describe('Session Cleanup', () => {
       const now = new Date();
       const oneDayAgo = new Date(now.getTime() - 1 * 24 * 60 * 60 * 1000);
       const sevenDaysAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000);
-      const thirteenDaysAgo = new Date(
-        now.getTime() - 13 * 24 * 60 * 60 * 1000,
-      );
+      const thirteenDaysAgo = new Date(now.getTime() - 13 * 24 * 60 * 60 * 1000);
 
       const testSessions: SessionInfo[] = [
         {
-          id: 'current',
+          id: "current",
           file: `${SESSION_FILE_PREFIX}current`,
           fileName: `${SESSION_FILE_PREFIX}current.json`,
           startTime: now.toISOString(),
           lastUpdated: now.toISOString(),
           messageCount: 1,
-          displayName: 'Current',
-          firstUserMessage: 'Current',
+          displayName: "Current",
+          firstUserMessage: "Current",
           isCurrentSession: true,
           index: 1,
         },
         {
-          id: 'session1d',
+          id: "session1d",
           file: `${SESSION_FILE_PREFIX}1d`,
           fileName: `${SESSION_FILE_PREFIX}1d.json`,
           startTime: oneDayAgo.toISOString(),
           lastUpdated: oneDayAgo.toISOString(),
           messageCount: 1,
-          displayName: '1 day old',
-          firstUserMessage: '1 day',
+          displayName: "1 day old",
+          firstUserMessage: "1 day",
           isCurrentSession: false,
           index: 2,
         },
         {
-          id: 'session7d',
+          id: "session7d",
           file: `${SESSION_FILE_PREFIX}7d`,
           fileName: `${SESSION_FILE_PREFIX}7d.json`,
           startTime: sevenDaysAgo.toISOString(),
           lastUpdated: sevenDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '7 days old',
-          firstUserMessage: '7 days',
+          displayName: "7 days old",
+          firstUserMessage: "7 days",
           isCurrentSession: false,
           index: 3,
         },
         {
-          id: 'session13d',
+          id: "session13d",
           file: `${SESSION_FILE_PREFIX}13d`,
           fileName: `${SESSION_FILE_PREFIX}13d.json`,
           startTime: thirteenDaysAgo.toISOString(),
           lastUpdated: thirteenDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '13 days old',
-          firstUserMessage: '13 days',
+          displayName: "13 days old",
+          firstUserMessage: "13 days",
           isCurrentSession: false,
           index: 4,
         },
@@ -620,10 +588,10 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
@@ -641,7 +609,7 @@ describe('Session Cleanup', () => {
       expect(mockFs.unlink).not.toHaveBeenCalled();
     });
 
-    it('should keep N most recent deletable sessions', async () => {
+    it("should keep N most recent deletable sessions", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
@@ -656,14 +624,14 @@ describe('Session Cleanup', () => {
       const now = new Date();
       const sessions: SessionInfo[] = [
         {
-          id: 'current',
+          id: "current",
           file: `${SESSION_FILE_PREFIX}current`,
           fileName: `${SESSION_FILE_PREFIX}current.json`,
           startTime: now.toISOString(),
           lastUpdated: now.toISOString(),
           messageCount: 1,
-          displayName: 'Current (newest)',
-          firstUserMessage: 'Current',
+          displayName: "Current (newest)",
+          firstUserMessage: "Current",
           isCurrentSession: true,
           index: 1,
         },
@@ -697,10 +665,10 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
@@ -716,58 +684,34 @@ describe('Session Cleanup', () => {
       // Verify which files were deleted (should be the 3 oldest)
       const unlinkCalls = mockFs.unlink.mock.calls.map((call) => call[0]);
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}3d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}3d.json`),
       );
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}4d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}4d.json`),
       );
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}5d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}5d.json`),
       );
 
       // Verify which files were NOT deleted
       expect(unlinkCalls).not.toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}current.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}current.json`),
       );
       expect(unlinkCalls).not.toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}1d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}1d.json`),
       );
       expect(unlinkCalls).not.toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}2d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}2d.json`),
       );
     });
 
-    it('should handle combined maxAge and maxCount retention (most restrictive wins)', async () => {
+    it("should handle combined maxAge and maxCount retention (most restrictive wins)", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '10d', // Keep sessions for 10 days
+            maxAge: "10d", // Keep sessions for 10 days
             maxCount: 2, // But also keep only 2 most recent
           },
         },
@@ -782,62 +726,62 @@ describe('Session Cleanup', () => {
 
       const testSessions: SessionInfo[] = [
         {
-          id: 'current',
+          id: "current",
           file: `${SESSION_FILE_PREFIX}current`,
           fileName: `${SESSION_FILE_PREFIX}current.json`,
           startTime: now.toISOString(),
           lastUpdated: now.toISOString(),
           messageCount: 1,
-          displayName: 'Current',
-          firstUserMessage: 'Current',
+          displayName: "Current",
+          firstUserMessage: "Current",
           isCurrentSession: true,
           index: 1,
         },
         {
-          id: 'session3d',
+          id: "session3d",
           file: `${SESSION_FILE_PREFIX}3d`,
           fileName: `${SESSION_FILE_PREFIX}3d.json`,
           startTime: threeDaysAgo.toISOString(),
           lastUpdated: threeDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '3 days old',
-          firstUserMessage: '3 days',
+          displayName: "3 days old",
+          firstUserMessage: "3 days",
           isCurrentSession: false,
           index: 2,
         },
         {
-          id: 'session5d',
+          id: "session5d",
           file: `${SESSION_FILE_PREFIX}5d`,
           fileName: `${SESSION_FILE_PREFIX}5d.json`,
           startTime: fiveDaysAgo.toISOString(),
           lastUpdated: fiveDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '5 days old',
-          firstUserMessage: '5 days',
+          displayName: "5 days old",
+          firstUserMessage: "5 days",
           isCurrentSession: false,
           index: 3,
         },
         {
-          id: 'session7d',
+          id: "session7d",
           file: `${SESSION_FILE_PREFIX}7d`,
           fileName: `${SESSION_FILE_PREFIX}7d.json`,
           startTime: sevenDaysAgo.toISOString(),
           lastUpdated: sevenDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '7 days old',
-          firstUserMessage: '7 days',
+          displayName: "7 days old",
+          firstUserMessage: "7 days",
           isCurrentSession: false,
           index: 4,
         },
         {
-          id: 'session12d',
+          id: "session12d",
           file: `${SESSION_FILE_PREFIX}12d`,
           fileName: `${SESSION_FILE_PREFIX}12d.json`,
           startTime: twelveDaysAgo.toISOString(),
           lastUpdated: twelveDaysAgo.toISOString(),
           messageCount: 1,
-          displayName: '12 days old',
-          firstUserMessage: '12 days',
+          displayName: "12 days old",
+          firstUserMessage: "12 days",
           isCurrentSession: false,
           index: 5,
         },
@@ -854,10 +798,10 @@ describe('Session Cleanup', () => {
       mockFs.access.mockResolvedValue(undefined);
       mockFs.readFile.mockResolvedValue(
         JSON.stringify({
-          sessionId: 'test',
+          sessionId: "test",
           messages: [],
-          startTime: '2025-01-01T00:00:00Z',
-          lastUpdated: '2025-01-01T00:00:00Z',
+          startTime: "2025-01-01T00:00:00Z",
+          lastUpdated: "2025-01-01T00:00:00Z",
         }),
       );
       mockFs.unlink.mockResolvedValue(undefined);
@@ -875,64 +819,44 @@ describe('Session Cleanup', () => {
       // Verify which files were deleted
       const unlinkCalls = mockFs.unlink.mock.calls.map((call) => call[0]);
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}5d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}5d.json`),
       );
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}7d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}7d.json`),
       );
       expect(unlinkCalls).toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}12d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}12d.json`),
       );
 
       // Verify which files were NOT deleted
       expect(unlinkCalls).not.toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}current.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}current.json`),
       );
       expect(unlinkCalls).not.toContain(
-        path.join(
-          '/tmp/test-project',
-          'chats',
-          `${SESSION_FILE_PREFIX}3d.json`,
-        ),
+        path.join("/tmp/test-project", "chats", `${SESSION_FILE_PREFIX}3d.json`),
       );
     });
   });
 
-  describe('parseRetentionPeriod format validation', () => {
+  describe("parseRetentionPeriod format validation", () => {
     // Test all supported formats
     it.each([
-      ['1h', 60 * 60 * 1000],
-      ['24h', 24 * 60 * 60 * 1000],
-      ['168h', 168 * 60 * 60 * 1000],
-      ['1d', 24 * 60 * 60 * 1000],
-      ['7d', 7 * 24 * 60 * 60 * 1000],
-      ['30d', 30 * 24 * 60 * 60 * 1000],
-      ['365d', 365 * 24 * 60 * 60 * 1000],
-      ['1w', 7 * 24 * 60 * 60 * 1000],
-      ['2w', 14 * 24 * 60 * 60 * 1000],
-      ['4w', 28 * 24 * 60 * 60 * 1000],
-      ['52w', 364 * 24 * 60 * 60 * 1000],
-      ['1m', 30 * 24 * 60 * 60 * 1000],
-      ['3m', 90 * 24 * 60 * 60 * 1000],
-      ['6m', 180 * 24 * 60 * 60 * 1000],
-      ['12m', 360 * 24 * 60 * 60 * 1000],
-    ])('should correctly parse valid format %s', async (input) => {
+      ["1h", 60 * 60 * 1000],
+      ["24h", 24 * 60 * 60 * 1000],
+      ["168h", 168 * 60 * 60 * 1000],
+      ["1d", 24 * 60 * 60 * 1000],
+      ["7d", 7 * 24 * 60 * 60 * 1000],
+      ["30d", 30 * 24 * 60 * 60 * 1000],
+      ["365d", 365 * 24 * 60 * 60 * 1000],
+      ["1w", 7 * 24 * 60 * 60 * 1000],
+      ["2w", 14 * 24 * 60 * 60 * 1000],
+      ["4w", 28 * 24 * 60 * 60 * 1000],
+      ["52w", 364 * 24 * 60 * 60 * 1000],
+      ["1m", 30 * 24 * 60 * 60 * 1000],
+      ["3m", 90 * 24 * 60 * 60 * 1000],
+      ["6m", 180 * 24 * 60 * 60 * 1000],
+      ["12m", 360 * 24 * 60 * 60 * 1000],
+    ])("should correctly parse valid format %s", async (input) => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
@@ -940,7 +864,7 @@ describe('Session Cleanup', () => {
             enabled: true,
             maxAge: input,
             // Set minRetention to 1h to allow testing of hour-based maxAge values
-            minRetention: '1h',
+            minRetention: "1h",
           },
         },
       };
@@ -955,18 +879,18 @@ describe('Session Cleanup', () => {
 
     // Test invalid formats
     it.each([
-      '30', // Missing unit
-      '30x', // Invalid unit
-      'd', // No number
-      '1.5d', // Decimal not supported
-      '-5d', // Negative number
-      '1 d', // Space in format
-      '1dd', // Double unit
-      'abc', // Non-numeric
-      '30s', // Unsupported unit (seconds)
-      '30y', // Unsupported unit (years)
-      '0d', // Zero value (technically valid regex but semantically invalid)
-    ])('should reject invalid format %s', async (input) => {
+      "30", // Missing unit
+      "30x", // Invalid unit
+      "d", // No number
+      "1.5d", // Decimal not supported
+      "-5d", // Negative number
+      "1 d", // Space in format
+      "1dd", // Double unit
+      "abc", // Non-numeric
+      "30s", // Unsupported unit (seconds)
+      "30y", // Unsupported unit (years)
+      "0d", // Zero value (technically valid regex but semantically invalid)
+    ])("should reject invalid format %s", async (input) => {
       const config = createMockConfig({
         getDebugMode: vi.fn().mockReturnValue(true),
       });
@@ -979,7 +903,7 @@ describe('Session Cleanup', () => {
         },
       };
 
-      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       const result = await cleanupExpiredSessions(config, settings);
 
@@ -987,8 +911,8 @@ describe('Session Cleanup', () => {
       expect(result.scanned).toBe(0);
       expect(errorSpy).toHaveBeenCalledWith(
         expect.stringContaining(
-          input === '0d'
-            ? 'Invalid retention period: 0d. Value must be greater than 0'
+          input === "0d"
+            ? "Invalid retention period: 0d. Value must be greater than 0"
             : `Invalid retention period format: ${input}`,
         ),
       );
@@ -997,7 +921,7 @@ describe('Session Cleanup', () => {
     });
 
     // Test special case - empty string
-    it('should reject empty string', async () => {
+    it("should reject empty string", async () => {
       const config = createMockConfig({
         getDebugMode: vi.fn().mockReturnValue(true),
       });
@@ -1005,12 +929,12 @@ describe('Session Cleanup', () => {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '',
+            maxAge: "",
           },
         },
       };
 
-      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       const result = await cleanupExpiredSessions(config, settings);
 
@@ -1018,20 +942,20 @@ describe('Session Cleanup', () => {
       expect(result.scanned).toBe(0);
       // Empty string means no valid retention method specified
       expect(errorSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Either maxAge or maxCount must be specified'),
+        expect.stringContaining("Either maxAge or maxCount must be specified"),
       );
 
       errorSpy.mockRestore();
     });
 
     // Test edge cases
-    it('should handle very large numbers', async () => {
+    it("should handle very large numbers", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '9999d', // Very large number
+            maxAge: "9999d", // Very large number
           },
         },
       };
@@ -1043,7 +967,7 @@ describe('Session Cleanup', () => {
       expect(result.failed).toBe(0);
     });
 
-    it('should validate minRetention format', async () => {
+    it("should validate minRetention format", async () => {
       const config = createMockConfig({
         getDebugMode: vi.fn().mockReturnValue(true),
       });
@@ -1051,8 +975,8 @@ describe('Session Cleanup', () => {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '5d',
-            minRetention: 'invalid-format', // Invalid minRetention
+            maxAge: "5d",
+            minRetention: "invalid-format", // Invalid minRetention
           },
         },
       };
@@ -1068,8 +992,8 @@ describe('Session Cleanup', () => {
     });
   });
 
-  describe('Configuration validation', () => {
-    it('should require either maxAge or maxCount', async () => {
+  describe("Configuration validation", () => {
+    it("should require either maxAge or maxCount", async () => {
       const config = createMockConfig({
         getDebugMode: vi.fn().mockReturnValue(true),
       });
@@ -1082,20 +1006,20 @@ describe('Session Cleanup', () => {
         },
       };
 
-      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       const result = await cleanupExpiredSessions(config, settings);
 
       expect(result.disabled).toBe(true);
       expect(result.scanned).toBe(0);
       expect(errorSpy).toHaveBeenCalledWith(
-        expect.stringContaining('Either maxAge or maxCount must be specified'),
+        expect.stringContaining("Either maxAge or maxCount must be specified"),
       );
 
       errorSpy.mockRestore();
     });
 
-    it('should validate maxCount range', async () => {
+    it("should validate maxCount range", async () => {
       const config = createMockConfig({
         getDebugMode: vi.fn().mockReturnValue(true),
       });
@@ -1108,21 +1032,19 @@ describe('Session Cleanup', () => {
         },
       };
 
-      const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
       const result = await cleanupExpiredSessions(config, settings);
 
       expect(result.disabled).toBe(true);
       expect(result.scanned).toBe(0);
-      expect(errorSpy).toHaveBeenCalledWith(
-        expect.stringContaining('maxCount must be at least 1'),
-      );
+      expect(errorSpy).toHaveBeenCalledWith(expect.stringContaining("maxCount must be at least 1"));
 
       errorSpy.mockRestore();
     });
 
-    describe('maxAge format validation', () => {
-      it('should reject invalid maxAge format - no unit', async () => {
+    describe("maxAge format validation", () => {
+      it("should reject invalid maxAge format - no unit", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1130,27 +1052,25 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '30', // Missing unit
+              maxAge: "30", // Missing unit
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('Invalid retention period format: 30'),
+          expect.stringContaining("Invalid retention period format: 30"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should reject invalid maxAge format - invalid unit', async () => {
+      it("should reject invalid maxAge format - invalid unit", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1158,27 +1078,25 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '30x', // Invalid unit 'x'
+              maxAge: "30x", // Invalid unit 'x'
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('Invalid retention period format: 30x'),
+          expect.stringContaining("Invalid retention period format: 30x"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should reject invalid maxAge format - no number', async () => {
+      it("should reject invalid maxAge format - no number", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1186,27 +1104,25 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: 'd', // No number
+              maxAge: "d", // No number
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('Invalid retention period format: d'),
+          expect.stringContaining("Invalid retention period format: d"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should reject invalid maxAge format - decimal number', async () => {
+      it("should reject invalid maxAge format - decimal number", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1214,27 +1130,25 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '1.5d', // Decimal not supported
+              maxAge: "1.5d", // Decimal not supported
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('Invalid retention period format: 1.5d'),
+          expect.stringContaining("Invalid retention period format: 1.5d"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should reject invalid maxAge format - negative number', async () => {
+      it("should reject invalid maxAge format - negative number", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1242,33 +1156,31 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '-5d', // Negative not allowed
+              maxAge: "-5d", // Negative not allowed
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('Invalid retention period format: -5d'),
+          expect.stringContaining("Invalid retention period format: -5d"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should accept valid maxAge format - hours', async () => {
+      it("should accept valid maxAge format - hours", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '48h', // Valid: 48 hours
+              maxAge: "48h", // Valid: 48 hours
               maxCount: 10, // Need at least one valid retention method
             },
           },
@@ -1284,13 +1196,13 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should accept valid maxAge format - days', async () => {
+      it("should accept valid maxAge format - days", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '7d', // Valid: 7 days
+              maxAge: "7d", // Valid: 7 days
             },
           },
         };
@@ -1305,13 +1217,13 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should accept valid maxAge format - weeks', async () => {
+      it("should accept valid maxAge format - weeks", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '2w', // Valid: 2 weeks
+              maxAge: "2w", // Valid: 2 weeks
             },
           },
         };
@@ -1326,13 +1238,13 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should accept valid maxAge format - months', async () => {
+      it("should accept valid maxAge format - months", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '3m', // Valid: 3 months
+              maxAge: "3m", // Valid: 3 months
             },
           },
         };
@@ -1348,8 +1260,8 @@ describe('Session Cleanup', () => {
       });
     });
 
-    describe('minRetention validation', () => {
-      it('should reject maxAge less than default minRetention (1d)', async () => {
+    describe("minRetention validation", () => {
+      it("should reject maxAge less than default minRetention (1d)", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1357,29 +1269,25 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '12h', // Less than default 1d minRetention
+              maxAge: "12h", // Less than default 1d minRetention
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining(
-            'maxAge cannot be less than minRetention (1d)',
-          ),
+          expect.stringContaining("maxAge cannot be less than minRetention (1d)"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should reject maxAge less than custom minRetention', async () => {
+      it("should reject maxAge less than custom minRetention", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1387,37 +1295,33 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '2d',
-              minRetention: '3d', // maxAge < minRetention
+              maxAge: "2d",
+              minRetention: "3d", // maxAge < minRetention
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining(
-            'maxAge cannot be less than minRetention (3d)',
-          ),
+          expect.stringContaining("maxAge cannot be less than minRetention (3d)"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should accept maxAge equal to minRetention', async () => {
+      it("should accept maxAge equal to minRetention", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '2d',
-              minRetention: '2d', // maxAge == minRetention (edge case)
+              maxAge: "2d",
+              minRetention: "2d", // maxAge == minRetention (edge case)
             },
           },
         };
@@ -1432,14 +1336,14 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should accept maxAge greater than minRetention', async () => {
+      it("should accept maxAge greater than minRetention", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '7d',
-              minRetention: '2d', // maxAge > minRetention
+              maxAge: "7d",
+              minRetention: "2d", // maxAge > minRetention
             },
           },
         };
@@ -1454,7 +1358,7 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should handle invalid minRetention format gracefully', async () => {
+      it("should handle invalid minRetention format gracefully", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1462,8 +1366,8 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '5d',
-              minRetention: 'invalid', // Invalid format
+              maxAge: "5d",
+              minRetention: "invalid", // Invalid format
             },
           },
         };
@@ -1481,8 +1385,8 @@ describe('Session Cleanup', () => {
       });
     });
 
-    describe('maxCount boundary validation', () => {
-      it('should accept maxCount = 1 (minimum valid)', async () => {
+    describe("maxCount boundary validation", () => {
+      it("should accept maxCount = 1 (minimum valid)", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
@@ -1503,7 +1407,7 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should accept maxCount = 1000 (maximum valid)', async () => {
+      it("should accept maxCount = 1000 (maximum valid)", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
@@ -1524,7 +1428,7 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should reject negative maxCount', async () => {
+      it("should reject negative maxCount", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1537,22 +1441,20 @@ describe('Session Cleanup', () => {
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('maxCount must be at least 1'),
+          expect.stringContaining("maxCount must be at least 1"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should accept valid maxCount in normal range', async () => {
+      it("should accept valid maxCount in normal range", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
@@ -1574,14 +1476,14 @@ describe('Session Cleanup', () => {
       });
     });
 
-    describe('combined configuration validation', () => {
-      it('should accept valid maxAge and maxCount together', async () => {
+    describe("combined configuration validation", () => {
+      it("should accept valid maxAge and maxCount together", async () => {
         const config = createMockConfig();
         const settings: Settings = {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: '30d',
+              maxAge: "30d",
               maxCount: 10,
             },
           },
@@ -1597,7 +1499,7 @@ describe('Session Cleanup', () => {
         expect(result.failed).toBe(0);
       });
 
-      it('should reject if both maxAge and maxCount are invalid', async () => {
+      it("should reject if both maxAge and maxCount are invalid", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1605,15 +1507,13 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: 'invalid',
+              maxAge: "invalid",
               maxCount: 0,
             },
           },
         };
 
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
@@ -1621,13 +1521,13 @@ describe('Session Cleanup', () => {
         expect(result.scanned).toBe(0);
         // Should fail on first validation error (maxAge format)
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('Invalid retention period format'),
+          expect.stringContaining("Invalid retention period format"),
         );
 
         errorSpy.mockRestore();
       });
 
-      it('should reject if maxAge is invalid even when maxCount is valid', async () => {
+      it("should reject if maxAge is invalid even when maxCount is valid", async () => {
         const config = createMockConfig({
           getDebugMode: vi.fn().mockReturnValue(true),
         });
@@ -1635,16 +1535,14 @@ describe('Session Cleanup', () => {
           general: {
             sessionRetention: {
               enabled: true,
-              maxAge: 'invalid', // Invalid format
+              maxAge: "invalid", // Invalid format
               maxCount: 5, // Valid count
             },
           },
         };
 
         // The validation logic rejects invalid maxAge format even if maxCount is valid
-        const errorSpy = vi
-          .spyOn(console, 'error')
-          .mockImplementation(() => {});
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
         const result = await cleanupExpiredSessions(config, settings);
 
@@ -1652,28 +1550,26 @@ describe('Session Cleanup', () => {
         expect(result.disabled).toBe(true);
         expect(result.scanned).toBe(0);
         expect(errorSpy).toHaveBeenCalledWith(
-          expect.stringContaining('Invalid retention period format'),
+          expect.stringContaining("Invalid retention period format"),
         );
 
         errorSpy.mockRestore();
       });
     });
 
-    it('should never throw an exception, always returning a result', async () => {
+    it("should never throw an exception, always returning a result", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '7d',
+            maxAge: "7d",
           },
         },
       };
 
       // Mock getSessionFiles to throw an error
-      mockGetAllSessionFiles.mockRejectedValue(
-        new Error('Failed to read directory'),
-      );
+      mockGetAllSessionFiles.mockRejectedValue(new Error("Failed to read directory"));
 
       // Should not throw, should return a result with errors
       const result = await cleanupExpiredSessions(config, settings);
@@ -1683,13 +1579,13 @@ describe('Session Cleanup', () => {
       expect(result.failed).toBe(1);
     });
 
-    it('should delete corrupted session files', async () => {
+    it("should delete corrupted session files", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '30d',
+            maxAge: "30d",
           },
         },
       };
@@ -1718,27 +1614,23 @@ describe('Session Cleanup', () => {
       expect(result.skipped).toBe(1); // The valid session is kept
 
       // Verify corrupted files were deleted
-      expect(mockFs.unlink).toHaveBeenCalledWith(
-        expect.stringContaining('corrupt1.json'),
-      );
-      expect(mockFs.unlink).toHaveBeenCalledWith(
-        expect.stringContaining('corrupt2.json'),
-      );
+      expect(mockFs.unlink).toHaveBeenCalledWith(expect.stringContaining("corrupt1.json"));
+      expect(mockFs.unlink).toHaveBeenCalledWith(expect.stringContaining("corrupt2.json"));
     });
 
-    it('should handle unexpected errors without throwing', async () => {
+    it("should handle unexpected errors without throwing", async () => {
       const config = createMockConfig();
       const settings: Settings = {
         general: {
           sessionRetention: {
             enabled: true,
-            maxAge: '7d',
+            maxAge: "7d",
           },
         },
       };
 
       // Mock getSessionFiles to throw a non-Error object
-      mockGetAllSessionFiles.mockRejectedValue('String error');
+      mockGetAllSessionFiles.mockRejectedValue("String error");
 
       // Should not throw, should return a result with errors
       const result = await cleanupExpiredSessions(config, settings);
diff --git a/packages/ui-gemini/src/utils/sessionCleanup.ts b/packages/ui-gemini/src/utils/sessionCleanup.ts
index 1dc416706..ab3e34542 100644
--- a/packages/ui-gemini/src/utils/sessionCleanup.ts
+++ b/packages/ui-gemini/src/utils/sessionCleanup.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { debugLogger, type Config } from '@airiscode/gemini-cli-core';
-import type { Settings, SessionRetentionSettings } from '../config/settings.js';
-import { getAllSessionFiles, type SessionFileEntry } from './sessionUtils.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { type Config, debugLogger } from "@airiscode/gemini-cli-core";
+import type { SessionRetentionSettings, Settings } from "../config/settings.js";
+import { getAllSessionFiles, type SessionFileEntry } from "./sessionUtils.js";
 
 // Constants
-export const DEFAULT_MIN_RETENTION = '1d' as string;
+export const DEFAULT_MIN_RETENTION = "1d" as string;
 const MIN_MAX_COUNT = 1;
 const MULTIPLIERS = {
   h: 60 * 60 * 1000, // hours to ms
@@ -53,13 +53,10 @@ export async function cleanupExpiredSessions(
     }
 
     const retentionConfig = settings.general.sessionRetention;
-    const chatsDir = path.join(config.storage.getProjectTempDir(), 'chats');
+    const chatsDir = path.join(config.storage.getProjectTempDir(), "chats");
 
     // Validate retention configuration
-    const validationErrorMessage = validateRetentionConfig(
-      config,
-      retentionConfig,
-    );
+    const validationErrorMessage = validateRetentionConfig(config, retentionConfig);
     if (validationErrorMessage) {
       // Log validation errors to console for visibility
       console.error(`Session cleanup disabled: ${validationErrorMessage}`);
@@ -75,10 +72,7 @@ export async function cleanupExpiredSessions(
     }
 
     // Determine which sessions to delete (corrupted and expired)
-    const sessionsToDelete = await identifySessionsToDelete(
-      allFiles,
-      retentionConfig,
-    );
+    const sessionsToDelete = await identifySessionsToDelete(allFiles, retentionConfig);
 
     // Delete all sessions that need to be deleted
     for (const sessionToDelete of sessionsToDelete) {
@@ -88,9 +82,7 @@ export async function cleanupExpiredSessions(
 
         if (config.getDebugMode()) {
           if (sessionToDelete.sessionInfo === null) {
-            debugLogger.debug(
-              `Deleted corrupted session file: ${sessionToDelete.fileName}`,
-            );
+            debugLogger.debug(`Deleted corrupted session file: ${sessionToDelete.fileName}`);
           } else {
             debugLogger.debug(
               `Deleted expired session: ${sessionToDelete.sessionInfo.id} (${sessionToDelete.sessionInfo.lastUpdated})`,
@@ -100,11 +92,7 @@ export async function cleanupExpiredSessions(
         result.deleted++;
       } catch (error) {
         // Ignore ENOENT errors (file already deleted)
-        if (
-          error instanceof Error &&
-          'code' in error &&
-          error.code === 'ENOENT'
-        ) {
+        if (error instanceof Error && "code" in error && error.code === "ENOENT") {
           // File already deleted, do nothing.
         } else {
           // Log error directly to console
@@ -112,11 +100,8 @@ export async function cleanupExpiredSessions(
             sessionToDelete.sessionInfo === null
               ? sessionToDelete.fileName
               : sessionToDelete.sessionInfo.id;
-          const errorMessage =
-            error instanceof Error ? error.message : 'Unknown error';
-          console.error(
-            `Failed to delete session ${sessionId}: ${errorMessage}`,
-          );
+          const errorMessage = error instanceof Error ? error.message : "Unknown error";
+          console.error(`Failed to delete session ${sessionId}: ${errorMessage}`);
           result.failed++;
         }
       }
@@ -131,8 +116,7 @@ export async function cleanupExpiredSessions(
     }
   } catch (error) {
     // Global error handler - don't let cleanup failures break startup
-    const errorMessage =
-      error instanceof Error ? error.message : 'Unknown error';
+    const errorMessage = error instanceof Error ? error.message : "Unknown error";
     console.error(`Session cleanup failed: ${errorMessage}`);
     result.failed++;
   }
@@ -150,9 +134,7 @@ async function identifySessionsToDelete(
   const sessionsToDelete: SessionFileEntry[] = [];
 
   // All corrupted files should be deleted
-  sessionsToDelete.push(
-    ...allFiles.filter((entry) => entry.sessionInfo === null),
-  );
+  sessionsToDelete.push(...allFiles.filter((entry) => entry.sessionInfo === null));
 
   // Now handle valid sessions based on retention policy
   const validSessions = allFiles.filter((entry) => entry.sessionInfo !== null);
@@ -188,9 +170,7 @@ async function identifySessionsToDelete(
   );
 
   // Calculate how many deletable sessions to keep (accounting for the active session)
-  const hasActiveSession = sortedValidSessions.some(
-    (e) => e.sessionInfo!.isCurrentSession,
-  );
+  const hasActiveSession = sortedValidSessions.some((e) => e.sessionInfo!.isCurrentSession);
   const maxDeletableSessions =
     retentionConfig.maxCount && hasActiveSession
       ? Math.max(0, retentionConfig.maxCount - 1)
@@ -237,9 +217,7 @@ function parseRetentionPeriod(period: string): number {
 
   // Reject zero values as they're semantically invalid
   if (value === 0) {
-    throw new Error(
-      `Invalid retention period: ${period}. Value must be greater than 0`,
-    );
+    throw new Error(`Invalid retention period: ${period}. Value must be greater than 0`);
   }
 
   return value * MULTIPLIERS[unit as keyof typeof MULTIPLIERS];
@@ -253,7 +231,7 @@ function validateRetentionConfig(
   retentionConfig: SessionRetentionSettings,
 ): string | null {
   if (!retentionConfig.enabled) {
-    return 'Retention not enabled';
+    return "Retention not enabled";
   }
 
   // Validate maxAge if provided
@@ -292,7 +270,7 @@ function validateRetentionConfig(
 
   // At least one retention method must be specified
   if (!retentionConfig.maxAge && retentionConfig.maxCount === undefined) {
-    return 'Either maxAge or maxCount must be specified';
+    return "Either maxAge or maxCount must be specified";
   }
 
   return null;
diff --git a/packages/ui-gemini/src/utils/sessionUtils.test.ts b/packages/ui-gemini/src/utils/sessionUtils.test.ts
index 3acd996c1..e9572a26f 100644
--- a/packages/ui-gemini/src/utils/sessionUtils.test.ts
+++ b/packages/ui-gemini/src/utils/sessionUtils.test.ts
@@ -4,26 +4,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs/promises";
+import path from "node:path";
+import type { Config, MessageRecord } from "@airiscode/gemini-cli-core";
+import { SESSION_FILE_PREFIX } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import {
-  SessionSelector,
   extractFirstUserMessage,
   formatRelativeTime,
   hasUserOrAssistantMessage,
-} from './sessionUtils.js';
-import type { Config, MessageRecord } from '@airiscode/gemini-cli-core';
-import { SESSION_FILE_PREFIX } from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import { randomUUID } from 'node:crypto';
-
-describe('SessionSelector', () => {
+  SessionSelector,
+} from "./sessionUtils.js";
+
+describe("SessionSelector", () => {
   let tmpDir: string;
   let config: Config;
 
   beforeEach(async () => {
     // Create a temporary directory for testing
-    tmpDir = path.join(process.cwd(), '.tmp-test-sessions');
+    tmpDir = path.join(process.cwd(), ".tmp-test-sessions");
     await fs.mkdir(tmpDir, { recursive: true });
 
     // Mock config
@@ -31,7 +31,7 @@ describe('SessionSelector', () => {
       storage: {
         getProjectTempDir: () => tmpDir,
       },
-      getSessionId: () => 'current-session-id',
+      getSessionId: () => "current-session-id",
     } as Partial<Config> as Config;
   });
 
@@ -44,57 +44,51 @@ describe('SessionSelector', () => {
     }
   });
 
-  it('should resolve session by UUID', async () => {
+  it("should resolve session by UUID", async () => {
     const sessionId1 = randomUUID();
     const sessionId2 = randomUUID();
 
     // Create test session files
-    const chatsDir = path.join(tmpDir, 'chats');
+    const chatsDir = path.join(tmpDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     const session1 = {
       sessionId: sessionId1,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T10:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T10:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'Test message 1',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "user",
+          content: "Test message 1",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
 
     const session2 = {
       sessionId: sessionId2,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T11:00:00.000Z',
-      lastUpdated: '2024-01-01T11:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T11:00:00.000Z",
+      lastUpdated: "2024-01-01T11:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'Test message 2',
-          id: 'msg2',
-          timestamp: '2024-01-01T11:00:00.000Z',
+          type: "user",
+          content: "Test message 2",
+          id: "msg2",
+          timestamp: "2024-01-01T11:00:00.000Z",
         },
       ],
     };
 
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`),
       JSON.stringify(session1, null, 2),
     );
 
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId2.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId2.slice(0, 8)}.json`),
       JSON.stringify(session2, null, 2),
     );
 
@@ -103,190 +97,172 @@ describe('SessionSelector', () => {
     // Test resolving by UUID
     const result1 = await sessionSelector.resolveSession(sessionId1);
     expect(result1.sessionData.sessionId).toBe(sessionId1);
-    expect(result1.sessionData.messages[0].content).toBe('Test message 1');
+    expect(result1.sessionData.messages[0].content).toBe("Test message 1");
 
     const result2 = await sessionSelector.resolveSession(sessionId2);
     expect(result2.sessionData.sessionId).toBe(sessionId2);
-    expect(result2.sessionData.messages[0].content).toBe('Test message 2');
+    expect(result2.sessionData.messages[0].content).toBe("Test message 2");
   });
 
-  it('should resolve session by index', async () => {
+  it("should resolve session by index", async () => {
     const sessionId1 = randomUUID();
     const sessionId2 = randomUUID();
 
     // Create test session files
-    const chatsDir = path.join(tmpDir, 'chats');
+    const chatsDir = path.join(tmpDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     const session1 = {
       sessionId: sessionId1,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T10:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T10:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'First session',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "user",
+          content: "First session",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
 
     const session2 = {
       sessionId: sessionId2,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T11:00:00.000Z',
-      lastUpdated: '2024-01-01T11:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T11:00:00.000Z",
+      lastUpdated: "2024-01-01T11:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'Second session',
-          id: 'msg2',
-          timestamp: '2024-01-01T11:00:00.000Z',
+          type: "user",
+          content: "Second session",
+          id: "msg2",
+          timestamp: "2024-01-01T11:00:00.000Z",
         },
       ],
     };
 
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`),
       JSON.stringify(session1, null, 2),
     );
 
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId2.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId2.slice(0, 8)}.json`),
       JSON.stringify(session2, null, 2),
     );
 
     const sessionSelector = new SessionSelector(config);
 
     // Test resolving by index (1-based)
-    const result1 = await sessionSelector.resolveSession('1');
-    expect(result1.sessionData.messages[0].content).toBe('First session');
+    const result1 = await sessionSelector.resolveSession("1");
+    expect(result1.sessionData.messages[0].content).toBe("First session");
 
-    const result2 = await sessionSelector.resolveSession('2');
-    expect(result2.sessionData.messages[0].content).toBe('Second session');
+    const result2 = await sessionSelector.resolveSession("2");
+    expect(result2.sessionData.messages[0].content).toBe("Second session");
   });
 
-  it('should resolve latest session', async () => {
+  it("should resolve latest session", async () => {
     const sessionId1 = randomUUID();
     const sessionId2 = randomUUID();
 
     // Create test session files
-    const chatsDir = path.join(tmpDir, 'chats');
+    const chatsDir = path.join(tmpDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     const session1 = {
       sessionId: sessionId1,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T10:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T10:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'First session',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "user",
+          content: "First session",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
 
     const session2 = {
       sessionId: sessionId2,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T11:00:00.000Z',
-      lastUpdated: '2024-01-01T11:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T11:00:00.000Z",
+      lastUpdated: "2024-01-01T11:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'Latest session',
-          id: 'msg2',
-          timestamp: '2024-01-01T11:00:00.000Z',
+          type: "user",
+          content: "Latest session",
+          id: "msg2",
+          timestamp: "2024-01-01T11:00:00.000Z",
         },
       ],
     };
 
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`),
       JSON.stringify(session1, null, 2),
     );
 
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId2.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId2.slice(0, 8)}.json`),
       JSON.stringify(session2, null, 2),
     );
 
     const sessionSelector = new SessionSelector(config);
 
     // Test resolving latest
-    const result = await sessionSelector.resolveSession('latest');
-    expect(result.sessionData.messages[0].content).toBe('Latest session');
+    const result = await sessionSelector.resolveSession("latest");
+    expect(result.sessionData.messages[0].content).toBe("Latest session");
   });
 
-  it('should deduplicate sessions by ID', async () => {
+  it("should deduplicate sessions by ID", async () => {
     const sessionId = randomUUID();
 
     // Create test session files
-    const chatsDir = path.join(tmpDir, 'chats');
+    const chatsDir = path.join(tmpDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     const sessionOriginal = {
       sessionId,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T10:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T10:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'Original',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "user",
+          content: "Original",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
 
     const sessionDuplicate = {
       sessionId,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T11:00:00.000Z', // Newer
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T11:00:00.000Z", // Newer
       messages: [
         {
-          type: 'user',
-          content: 'Newer Duplicate',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "user",
+          content: "Newer Duplicate",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
 
     // File 1
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId.slice(0, 8)}.json`),
       JSON.stringify(sessionOriginal, null, 2),
     );
 
     // File 2 (Simulate a copy or newer version with same ID)
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T11-00-${sessionId.slice(0, 8)}.json`),
       JSON.stringify(sessionDuplicate, null, 2),
     );
 
@@ -296,70 +272,67 @@ describe('SessionSelector', () => {
     expect(sessions.length).toBe(1);
     expect(sessions[0].id).toBe(sessionId);
     // Should keep the one with later lastUpdated
-    expect(sessions[0].lastUpdated).toBe('2024-01-01T11:00:00.000Z');
+    expect(sessions[0].lastUpdated).toBe("2024-01-01T11:00:00.000Z");
   });
 
-  it('should throw error for invalid session identifier', async () => {
+  it("should throw error for invalid session identifier", async () => {
     const sessionId1 = randomUUID();
 
     // Create test session files
-    const chatsDir = path.join(tmpDir, 'chats');
+    const chatsDir = path.join(tmpDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     const session1 = {
       sessionId: sessionId1,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T10:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T10:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'Test message 1',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "user",
+          content: "Test message 1",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
 
     await fs.writeFile(
-      path.join(
-        chatsDir,
-        `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`,
-      ),
+      path.join(chatsDir, `${SESSION_FILE_PREFIX}2024-01-01T10-00-${sessionId1.slice(0, 8)}.json`),
       JSON.stringify(session1, null, 2),
     );
 
     const sessionSelector = new SessionSelector(config);
 
-    await expect(
-      sessionSelector.resolveSession('invalid-uuid'),
-    ).rejects.toThrow('Invalid session identifier "invalid-uuid"');
+    await expect(sessionSelector.resolveSession("invalid-uuid")).rejects.toThrow(
+      'Invalid session identifier "invalid-uuid"',
+    );
 
-    await expect(sessionSelector.resolveSession('999')).rejects.toThrow(
+    await expect(sessionSelector.resolveSession("999")).rejects.toThrow(
       'Invalid session identifier "999"',
     );
   });
 
-  it('should not list sessions with only system messages', async () => {
+  it("should not list sessions with only system messages", async () => {
     const sessionIdWithUser = randomUUID();
     const sessionIdSystemOnly = randomUUID();
 
     // Create test session files
-    const chatsDir = path.join(tmpDir, 'chats');
+    const chatsDir = path.join(tmpDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     // Session with user message - should be listed
     const sessionWithUser = {
       sessionId: sessionIdWithUser,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T10:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T10:30:00.000Z",
       messages: [
         {
-          type: 'user',
-          content: 'Hello world',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "user",
+          content: "Hello world",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
@@ -367,21 +340,21 @@ describe('SessionSelector', () => {
     // Session with only system messages - should NOT be listed
     const sessionSystemOnly = {
       sessionId: sessionIdSystemOnly,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T11:00:00.000Z',
-      lastUpdated: '2024-01-01T11:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T11:00:00.000Z",
+      lastUpdated: "2024-01-01T11:30:00.000Z",
       messages: [
         {
-          type: 'info',
-          content: 'Session started',
-          id: 'msg1',
-          timestamp: '2024-01-01T11:00:00.000Z',
+          type: "info",
+          content: "Session started",
+          id: "msg1",
+          timestamp: "2024-01-01T11:00:00.000Z",
         },
         {
-          type: 'error',
-          content: 'An error occurred',
-          id: 'msg2',
-          timestamp: '2024-01-01T11:01:00.000Z',
+          type: "error",
+          content: "An error occurred",
+          id: "msg2",
+          timestamp: "2024-01-01T11:01:00.000Z",
         },
       ],
     };
@@ -410,25 +383,25 @@ describe('SessionSelector', () => {
     expect(sessions[0].id).toBe(sessionIdWithUser);
   });
 
-  it('should list session with gemini message even without user message', async () => {
+  it("should list session with gemini message even without user message", async () => {
     const sessionIdGeminiOnly = randomUUID();
 
     // Create test session files
-    const chatsDir = path.join(tmpDir, 'chats');
+    const chatsDir = path.join(tmpDir, "chats");
     await fs.mkdir(chatsDir, { recursive: true });
 
     // Session with only gemini message - should be listed
     const sessionGeminiOnly = {
       sessionId: sessionIdGeminiOnly,
-      projectHash: 'test-hash',
-      startTime: '2024-01-01T10:00:00.000Z',
-      lastUpdated: '2024-01-01T10:30:00.000Z',
+      projectHash: "test-hash",
+      startTime: "2024-01-01T10:00:00.000Z",
+      lastUpdated: "2024-01-01T10:30:00.000Z",
       messages: [
         {
-          type: 'gemini',
-          content: 'Hello, how can I help?',
-          id: 'msg1',
-          timestamp: '2024-01-01T10:00:00.000Z',
+          type: "gemini",
+          content: "Hello, how can I help?",
+          id: "msg1",
+          timestamp: "2024-01-01T10:00:00.000Z",
         },
       ],
     };
@@ -449,34 +422,34 @@ describe('SessionSelector', () => {
   });
 });
 
-describe('extractFirstUserMessage', () => {
-  it('should extract first non-resume user message', () => {
+describe("extractFirstUserMessage", () => {
+  it("should extract first non-resume user message", () => {
     const messages = [
       {
-        type: 'user',
-        content: '/resume',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "user",
+        content: "/resume",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
       {
-        type: 'user',
-        content: 'Hello world',
-        id: 'msg2',
-        timestamp: '2024-01-01T10:01:00.000Z',
+        type: "user",
+        content: "Hello world",
+        id: "msg2",
+        timestamp: "2024-01-01T10:01:00.000Z",
       },
     ] as MessageRecord[];
 
-    expect(extractFirstUserMessage(messages)).toBe('Hello world');
+    expect(extractFirstUserMessage(messages)).toBe("Hello world");
   });
 
-  it('should not truncate long messages', () => {
-    const longMessage = 'a'.repeat(150);
+  it("should not truncate long messages", () => {
+    const longMessage = "a".repeat(150);
     const messages = [
       {
-        type: 'user',
+        type: "user",
         content: longMessage,
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
     ] as MessageRecord[];
 
@@ -487,190 +460,188 @@ describe('extractFirstUserMessage', () => {
   it('should return "Empty conversation" for no user messages', () => {
     const messages = [
       {
-        type: 'gemini',
-        content: 'Hello',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "gemini",
+        content: "Hello",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
     ] as MessageRecord[];
 
-    expect(extractFirstUserMessage(messages)).toBe('Empty conversation');
+    expect(extractFirstUserMessage(messages)).toBe("Empty conversation");
   });
 });
 
-describe('hasUserOrAssistantMessage', () => {
-  it('should return true when session has user message', () => {
+describe("hasUserOrAssistantMessage", () => {
+  it("should return true when session has user message", () => {
     const messages = [
       {
-        type: 'user',
-        content: 'Hello',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "user",
+        content: "Hello",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(true);
   });
 
-  it('should return true when session has gemini message', () => {
+  it("should return true when session has gemini message", () => {
     const messages = [
       {
-        type: 'gemini',
-        content: 'Hello, how can I help?',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "gemini",
+        content: "Hello, how can I help?",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(true);
   });
 
-  it('should return true when session has both user and gemini messages', () => {
+  it("should return true when session has both user and gemini messages", () => {
     const messages = [
       {
-        type: 'user',
-        content: 'Hello',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "user",
+        content: "Hello",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
       {
-        type: 'gemini',
-        content: 'Hi there!',
-        id: 'msg2',
-        timestamp: '2024-01-01T10:01:00.000Z',
+        type: "gemini",
+        content: "Hi there!",
+        id: "msg2",
+        timestamp: "2024-01-01T10:01:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(true);
   });
 
-  it('should return false when session only has info messages', () => {
+  it("should return false when session only has info messages", () => {
     const messages = [
       {
-        type: 'info',
-        content: 'Session started',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "info",
+        content: "Session started",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(false);
   });
 
-  it('should return false when session only has error messages', () => {
+  it("should return false when session only has error messages", () => {
     const messages = [
       {
-        type: 'error',
-        content: 'An error occurred',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "error",
+        content: "An error occurred",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(false);
   });
 
-  it('should return false when session only has warning messages', () => {
+  it("should return false when session only has warning messages", () => {
     const messages = [
       {
-        type: 'warning',
-        content: 'Warning message',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "warning",
+        content: "Warning message",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(false);
   });
 
-  it('should return false when session only has system messages (mixed)', () => {
+  it("should return false when session only has system messages (mixed)", () => {
     const messages = [
       {
-        type: 'info',
-        content: 'Session started',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "info",
+        content: "Session started",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
       {
-        type: 'error',
-        content: 'An error occurred',
-        id: 'msg2',
-        timestamp: '2024-01-01T10:01:00.000Z',
+        type: "error",
+        content: "An error occurred",
+        id: "msg2",
+        timestamp: "2024-01-01T10:01:00.000Z",
       },
       {
-        type: 'warning',
-        content: 'Warning message',
-        id: 'msg3',
-        timestamp: '2024-01-01T10:02:00.000Z',
+        type: "warning",
+        content: "Warning message",
+        id: "msg3",
+        timestamp: "2024-01-01T10:02:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(false);
   });
 
-  it('should return true when session has user message among system messages', () => {
+  it("should return true when session has user message among system messages", () => {
     const messages = [
       {
-        type: 'info',
-        content: 'Session started',
-        id: 'msg1',
-        timestamp: '2024-01-01T10:00:00.000Z',
+        type: "info",
+        content: "Session started",
+        id: "msg1",
+        timestamp: "2024-01-01T10:00:00.000Z",
       },
       {
-        type: 'user',
-        content: 'Hello',
-        id: 'msg2',
-        timestamp: '2024-01-01T10:01:00.000Z',
+        type: "user",
+        content: "Hello",
+        id: "msg2",
+        timestamp: "2024-01-01T10:01:00.000Z",
       },
       {
-        type: 'error',
-        content: 'An error occurred',
-        id: 'msg3',
-        timestamp: '2024-01-01T10:02:00.000Z',
+        type: "error",
+        content: "An error occurred",
+        id: "msg3",
+        timestamp: "2024-01-01T10:02:00.000Z",
       },
     ] as MessageRecord[];
 
     expect(hasUserOrAssistantMessage(messages)).toBe(true);
   });
 
-  it('should return false for empty messages array', () => {
+  it("should return false for empty messages array", () => {
     const messages: MessageRecord[] = [];
     expect(hasUserOrAssistantMessage(messages)).toBe(false);
   });
 });
 
-describe('formatRelativeTime', () => {
-  it('should format time correctly', () => {
+describe("formatRelativeTime", () => {
+  it("should format time correctly", () => {
     const now = new Date();
 
     // 5 minutes ago
     const fiveMinutesAgo = new Date(now.getTime() - 5 * 60 * 1000);
-    expect(formatRelativeTime(fiveMinutesAgo.toISOString())).toBe(
-      '5 minutes ago',
-    );
+    expect(formatRelativeTime(fiveMinutesAgo.toISOString())).toBe("5 minutes ago");
 
     // 1 minute ago
     const oneMinuteAgo = new Date(now.getTime() - 1 * 60 * 1000);
-    expect(formatRelativeTime(oneMinuteAgo.toISOString())).toBe('1 minute ago');
+    expect(formatRelativeTime(oneMinuteAgo.toISOString())).toBe("1 minute ago");
 
     // 2 hours ago
     const twoHoursAgo = new Date(now.getTime() - 2 * 60 * 60 * 1000);
-    expect(formatRelativeTime(twoHoursAgo.toISOString())).toBe('2 hours ago');
+    expect(formatRelativeTime(twoHoursAgo.toISOString())).toBe("2 hours ago");
 
     // 1 hour ago
     const oneHourAgo = new Date(now.getTime() - 1 * 60 * 60 * 1000);
-    expect(formatRelativeTime(oneHourAgo.toISOString())).toBe('1 hour ago');
+    expect(formatRelativeTime(oneHourAgo.toISOString())).toBe("1 hour ago");
 
     // 3 days ago
     const threeDaysAgo = new Date(now.getTime() - 3 * 24 * 60 * 60 * 1000);
-    expect(formatRelativeTime(threeDaysAgo.toISOString())).toBe('3 days ago');
+    expect(formatRelativeTime(threeDaysAgo.toISOString())).toBe("3 days ago");
 
     // 1 day ago
     const oneDayAgo = new Date(now.getTime() - 1 * 24 * 60 * 60 * 1000);
-    expect(formatRelativeTime(oneDayAgo.toISOString())).toBe('1 day ago');
+    expect(formatRelativeTime(oneDayAgo.toISOString())).toBe("1 day ago");
 
     // Just now (within 60 seconds)
     const thirtySecondsAgo = new Date(now.getTime() - 30 * 1000);
-    expect(formatRelativeTime(thirtySecondsAgo.toISOString())).toBe('Just now');
+    expect(formatRelativeTime(thirtySecondsAgo.toISOString())).toBe("Just now");
   });
 });
diff --git a/packages/ui-gemini/src/utils/sessionUtils.ts b/packages/ui-gemini/src/utils/sessionUtils.ts
index 17a58f4c3..3eac0cc26 100644
--- a/packages/ui-gemini/src/utils/sessionUtils.ts
+++ b/packages/ui-gemini/src/utils/sessionUtils.ts
@@ -4,24 +4,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  Config,
-  ConversationRecord,
-  MessageRecord,
-} from '@airiscode/gemini-cli-core';
-import {
-  partListUnionToString,
-  SESSION_FILE_PREFIX,
-} from '@airiscode/gemini-cli-core';
-import * as fs from 'node:fs/promises';
-import path from 'node:path';
-import { stripUnsafeCharacters } from '../ui/utils/textUtils.js';
+import * as fs from "node:fs/promises";
+import path from "node:path";
+import type { Config, ConversationRecord, MessageRecord } from "@airiscode/gemini-cli-core";
+import { partListUnionToString, SESSION_FILE_PREFIX } from "@airiscode/gemini-cli-core";
+import { stripUnsafeCharacters } from "../ui/utils/textUtils.js";
 
 /**
  * Constant for the resume "latest" identifier.
  * Used when --resume is passed without a value to select the most recent session.
  */
-export const RESUME_LATEST = 'latest';
+export const RESUME_LATEST = "latest";
 
 /**
  * Represents a text match found during search with surrounding context.
@@ -34,7 +27,7 @@ export interface TextMatch {
   /** Text content after the match (with ellipsis if truncated) */
   after: string;
   /** Role of the message author where the match was found */
-  role: 'user' | 'assistant';
+  role: "user" | "assistant";
 }
 
 /**
@@ -66,7 +59,7 @@ export interface SessionInfo {
   /** Full concatenated content (only loaded when needed for search) */
   fullContent?: string;
   /** Processed messages with normalized roles (only loaded when needed) */
-  messages?: Array<{ role: 'user' | 'assistant'; content: string }>;
+  messages?: Array<{ role: "user" | "assistant"; content: string }>;
   /** Search result snippets when filtering */
   matchSnippets?: TextMatch[];
   /** Total number of matches found in this session */
@@ -99,7 +92,7 @@ export interface SessionSelectionResult {
  * @returns true if the session has meaningful content
  */
 export const hasUserOrAssistantMessage = (messages: MessageRecord[]): boolean =>
-  messages.some((msg) => msg.type === 'user' || msg.type === 'gemini');
+  messages.some((msg) => msg.type === "user" || msg.type === "gemini");
 
 /**
  * Cleans and sanitizes message content for display by:
@@ -112,9 +105,9 @@ export const hasUserOrAssistantMessage = (messages: MessageRecord[]): boolean =>
  */
 export const cleanMessage = (message: string): string =>
   message
-    .replace(/\n+/g, ' ')
-    .replace(/\s+/g, ' ')
-    .replace(/[^\x20-\x7E]+/g, '') // Non-printable.
+    .replace(/\n+/g, " ")
+    .replace(/\s+/g, " ")
+    .replace(/[^\x20-\x7E]+/g, "") // Non-printable.
     .trim();
 
 /**
@@ -125,20 +118,16 @@ export const extractFirstUserMessage = (messages: MessageRecord[]): string => {
     // First try filtering out slash commands.
     .filter((msg) => {
       const content = partListUnionToString(msg.content);
-      return (
-        !content.startsWith('/') &&
-        !content.startsWith('?') &&
-        content.trim().length > 0
-      );
+      return !content.startsWith("/") && !content.startsWith("?") && content.trim().length > 0;
     })
-    .find((msg) => msg.type === 'user');
+    .find((msg) => msg.type === "user");
 
   let content: string;
 
   if (!userMessage) {
     // Fallback to first user message even if it's a slash command
-    const firstMsg = messages.find((msg) => msg.type === 'user');
-    if (!firstMsg) return 'Empty conversation';
+    const firstMsg = messages.find((msg) => msg.type === "user");
+    if (!firstMsg) return "Empty conversation";
     content = cleanMessage(partListUnionToString(firstMsg.content));
   } else {
     content = cleanMessage(partListUnionToString(userMessage.content));
@@ -152,10 +141,7 @@ export const extractFirstUserMessage = (messages: MessageRecord[]): string => {
  * @param timestamp - The timestamp to format
  * @param style - 'long' (e.g. "2 hours ago") or 'short' (e.g. "2h")
  */
-export const formatRelativeTime = (
-  timestamp: string,
-  style: 'long' | 'short' = 'long',
-): string => {
+export const formatRelativeTime = (timestamp: string, style: "long" | "short" = "long"): string => {
   const now = new Date();
   const time = new Date(timestamp);
   const diffMs = now.getTime() - time.getTime();
@@ -164,25 +150,23 @@ export const formatRelativeTime = (
   const diffHours = Math.floor(diffMinutes / 60);
   const diffDays = Math.floor(diffHours / 24);
 
-  if (style === 'short') {
-    if (diffSeconds < 1) return 'now';
+  if (style === "short") {
+    if (diffSeconds < 1) return "now";
     if (diffSeconds < 60) return `${diffSeconds}s`;
     if (diffMinutes < 60) return `${diffMinutes}m`;
     if (diffHours < 24) return `${diffHours}h`;
     if (diffDays < 30) return `${diffDays}d`;
     const diffMonths = Math.floor(diffDays / 30);
-    return diffMonths < 12
-      ? `${diffMonths}mo`
-      : `${Math.floor(diffMonths / 12)}y`;
+    return diffMonths < 12 ? `${diffMonths}mo` : `${Math.floor(diffMonths / 12)}y`;
   } else {
     if (diffDays > 0) {
-      return `${diffDays} day${diffDays === 1 ? '' : 's'} ago`;
+      return `${diffDays} day${diffDays === 1 ? "" : "s"} ago`;
     } else if (diffHours > 0) {
-      return `${diffHours} hour${diffHours === 1 ? '' : 's'} ago`;
+      return `${diffHours} hour${diffHours === 1 ? "" : "s"} ago`;
     } else if (diffMinutes > 0) {
-      return `${diffMinutes} minute${diffMinutes === 1 ? '' : 's'} ago`;
+      return `${diffMinutes} minute${diffMinutes === 1 ? "" : "s"} ago`;
     } else {
-      return 'Just now';
+      return "Just now";
     }
   }
 };
@@ -204,87 +188,74 @@ export const getAllSessionFiles = async (
   try {
     const files = await fs.readdir(chatsDir);
     const sessionFiles = files
-      .filter((f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith('.json'))
+      .filter((f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith(".json"))
       .sort(); // Sort by filename, which includes timestamp
 
-    const sessionPromises = sessionFiles.map(
-      async (file): Promise<SessionFileEntry> => {
-        const filePath = path.join(chatsDir, file);
-        try {
-          const content: ConversationRecord = JSON.parse(
-            await fs.readFile(filePath, 'utf8'),
-          );
-
-          // Validate required fields
-          if (
-            !content.sessionId ||
-            !content.messages ||
-            !Array.isArray(content.messages) ||
-            !content.startTime ||
-            !content.lastUpdated
-          ) {
-            // Missing required fields - treat as corrupted
-            return { fileName: file, sessionInfo: null };
-          }
-
-          // Skip sessions that only contain system messages (info, error, warning)
-          if (!hasUserOrAssistantMessage(content.messages)) {
-            return { fileName: file, sessionInfo: null };
-          }
-
-          const firstUserMessage = extractFirstUserMessage(content.messages);
-          const isCurrentSession = currentSessionId
-            ? file.includes(currentSessionId.slice(0, 8))
-            : false;
-
-          let fullContent: string | undefined;
-          let messages:
-            | Array<{ role: 'user' | 'assistant'; content: string }>
-            | undefined;
-
-          if (options.includeFullContent) {
-            fullContent = content.messages
-              .map((msg) => partListUnionToString(msg.content))
-              .join(' ');
-            messages = content.messages.map((msg) => ({
-              role:
-                msg.type === 'user'
-                  ? ('user' as const)
-                  : ('assistant' as const),
-              content: partListUnionToString(msg.content),
-            }));
-          }
-
-          const sessionInfo: SessionInfo = {
-            id: content.sessionId,
-            file: file.replace('.json', ''),
-            fileName: file,
-            startTime: content.startTime,
-            lastUpdated: content.lastUpdated,
-            messageCount: content.messages.length,
-            displayName: content.summary
-              ? stripUnsafeCharacters(content.summary)
-              : firstUserMessage,
-            firstUserMessage,
-            isCurrentSession,
-            index: 0, // Will be set after sorting valid sessions
-            summary: content.summary,
-            fullContent,
-            messages,
-          };
-
-          return { fileName: file, sessionInfo };
-        } catch {
-          // File is corrupted (can't read or parse JSON)
+    const sessionPromises = sessionFiles.map(async (file): Promise<SessionFileEntry> => {
+      const filePath = path.join(chatsDir, file);
+      try {
+        const content: ConversationRecord = JSON.parse(await fs.readFile(filePath, "utf8"));
+
+        // Validate required fields
+        if (
+          !content.sessionId ||
+          !content.messages ||
+          !Array.isArray(content.messages) ||
+          !content.startTime ||
+          !content.lastUpdated
+        ) {
+          // Missing required fields - treat as corrupted
           return { fileName: file, sessionInfo: null };
         }
-      },
-    );
+
+        // Skip sessions that only contain system messages (info, error, warning)
+        if (!hasUserOrAssistantMessage(content.messages)) {
+          return { fileName: file, sessionInfo: null };
+        }
+
+        const firstUserMessage = extractFirstUserMessage(content.messages);
+        const isCurrentSession = currentSessionId
+          ? file.includes(currentSessionId.slice(0, 8))
+          : false;
+
+        let fullContent: string | undefined;
+        let messages: Array<{ role: "user" | "assistant"; content: string }> | undefined;
+
+        if (options.includeFullContent) {
+          fullContent = content.messages.map((msg) => partListUnionToString(msg.content)).join(" ");
+          messages = content.messages.map((msg) => ({
+            role: msg.type === "user" ? ("user" as const) : ("assistant" as const),
+            content: partListUnionToString(msg.content),
+          }));
+        }
+
+        const sessionInfo: SessionInfo = {
+          id: content.sessionId,
+          file: file.replace(".json", ""),
+          fileName: file,
+          startTime: content.startTime,
+          lastUpdated: content.lastUpdated,
+          messageCount: content.messages.length,
+          displayName: content.summary ? stripUnsafeCharacters(content.summary) : firstUserMessage,
+          firstUserMessage,
+          isCurrentSession,
+          index: 0, // Will be set after sorting valid sessions
+          summary: content.summary,
+          fullContent,
+          messages,
+        };
+
+        return { fileName: file, sessionInfo };
+      } catch {
+        // File is corrupted (can't read or parse JSON)
+        return { fileName: file, sessionInfo: null };
+      }
+    });
 
     return await Promise.all(sessionPromises);
   } catch (error) {
     // It's expected that the directory might not exist, which is not an error.
-    if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+    if (error instanceof Error && "code" in error && error.code === "ENOENT") {
       return [];
     }
     // For other errors (e.g., permissions), re-throw to be handled by the caller.
@@ -301,11 +272,7 @@ export const getSessionFiles = async (
   currentSessionId?: string,
   options: GetSessionOptions = {},
 ): Promise<SessionInfo[]> => {
-  const allFiles = await getAllSessionFiles(
-    chatsDir,
-    currentSessionId,
-    options,
-  );
+  const allFiles = await getAllSessionFiles(chatsDir, currentSessionId, options);
 
   // Filter out corrupted files and extract SessionInfo
   const validSessions = allFiles
@@ -330,9 +297,7 @@ export const getSessionFiles = async (
   const uniqueSessions = Array.from(uniqueSessionsMap.values());
 
   // Sort by startTime (oldest first) for stable session numbering
-  uniqueSessions.sort(
-    (a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime(),
-  );
+  uniqueSessions.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime());
 
   // Set the correct 1-based indexes after sorting
   uniqueSessions.forEach((session, index) => {
@@ -352,10 +317,7 @@ export class SessionSelector {
    * Lists all available sessions for the current project.
    */
   async listSessions(): Promise<SessionInfo[]> {
-    const chatsDir = path.join(
-      this.config.storage.getProjectTempDir(),
-      'chats',
-    );
+    const chatsDir = path.join(this.config.storage.getProjectTempDir(), "chats");
     return getSessionFiles(chatsDir, this.config.getSessionId());
   }
 
@@ -370,19 +332,16 @@ export class SessionSelector {
     const sessions = await this.listSessions();
 
     if (sessions.length === 0) {
-      throw new Error('No previous sessions found for this project.');
+      throw new Error("No previous sessions found for this project.");
     }
 
     // Sort by startTime (oldest first, so newest sessions get highest numbers)
     const sortedSessions = sessions.sort(
-      (a, b) =>
-        new Date(a.startTime).getTime() - new Date(b.startTime).getTime(),
+      (a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime(),
     );
 
     // Try to find by UUID first
-    const sessionByUuid = sortedSessions.find(
-      (session) => session.id === identifier,
-    );
+    const sessionByUuid = sortedSessions.find((session) => session.id === identifier);
     if (sessionByUuid) {
       return sessionByUuid;
     }
@@ -416,14 +375,11 @@ export class SessionSelector {
       const sessions = await this.listSessions();
 
       if (sessions.length === 0) {
-        throw new Error('No previous sessions found for this project.');
+        throw new Error("No previous sessions found for this project.");
       }
 
       // Sort by startTime (oldest first, so newest sessions get highest numbers)
-      sessions.sort(
-        (a, b) =>
-          new Date(a.startTime).getTime() - new Date(b.startTime).getTime(),
-      );
+      sessions.sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime());
 
       selectedSession = sessions[sessions.length - 1];
     } else {
@@ -443,19 +399,12 @@ export class SessionSelector {
   /**
    * Loads session data for a selected session.
    */
-  private async selectSession(
-    sessionInfo: SessionInfo,
-  ): Promise<SessionSelectionResult> {
-    const chatsDir = path.join(
-      this.config.storage.getProjectTempDir(),
-      'chats',
-    );
+  private async selectSession(sessionInfo: SessionInfo): Promise<SessionSelectionResult> {
+    const chatsDir = path.join(this.config.storage.getProjectTempDir(), "chats");
     const sessionPath = path.join(chatsDir, sessionInfo.fileName);
 
     try {
-      const sessionData: ConversationRecord = JSON.parse(
-        await fs.readFile(sessionPath, 'utf8'),
-      );
+      const sessionData: ConversationRecord = JSON.parse(await fs.readFile(sessionPath, "utf8"));
 
       const displayInfo = `Session ${sessionInfo.index}: ${sessionInfo.firstUserMessage} (${sessionInfo.messageCount} messages, ${formatRelativeTime(sessionInfo.lastUpdated)})`;
 
@@ -466,7 +415,7 @@ export class SessionSelector {
       };
     } catch (error) {
       throw new Error(
-        `Failed to load session ${sessionInfo.id}: ${error instanceof Error ? error.message : 'Unknown error'}`,
+        `Failed to load session ${sessionInfo.id}: ${error instanceof Error ? error.message : "Unknown error"}`,
       );
     }
   }
diff --git a/packages/ui-gemini/src/utils/sessions.test.ts b/packages/ui-gemini/src/utils/sessions.test.ts
index 4e96452e7..7093b42b2 100644
--- a/packages/ui-gemini/src/utils/sessions.test.ts
+++ b/packages/ui-gemini/src/utils/sessions.test.ts
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type { Config } from '@airiscode/gemini-cli-core';
-import { ChatRecordingService } from '@airiscode/gemini-cli-core';
-import { listSessions, deleteSession } from './sessions.js';
-import { SessionSelector, type SessionInfo } from './sessionUtils.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { ChatRecordingService } from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { deleteSession, listSessions } from "./sessions.js";
+import { type SessionInfo, SessionSelector } from "./sessionUtils.js";
 
 // Mock the SessionSelector and ChatRecordingService
-vi.mock('./sessionUtils.js', () => ({
+vi.mock("./sessionUtils.js", () => ({
   SessionSelector: vi.fn(),
-  formatRelativeTime: vi.fn(() => 'some time ago'),
+  formatRelativeTime: vi.fn(() => "some time ago"),
 }));
 
-vi.mock('@airiscode/gemini-cli-core', async () => {
-  const actual = await vi.importActual('@airiscode/gemini-cli-core');
+vi.mock("@airiscode/gemini-cli-core", async () => {
+  const actual = await vi.importActual("@airiscode/gemini-cli-core");
   return {
     ...actual,
     ChatRecordingService: vi.fn(),
@@ -25,7 +25,7 @@ vi.mock('@airiscode/gemini-cli-core', async () => {
   };
 });
 
-describe('listSessions', () => {
+describe("listSessions", () => {
   let mockConfig: Config;
   let mockListSessions: ReturnType<typeof vi.fn>;
   let consoleLogSpy: ReturnType<typeof vi.spyOn>;
@@ -34,9 +34,9 @@ describe('listSessions', () => {
     // Create mock config
     mockConfig = {
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/test-project'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/test-project"),
       },
-      getSessionId: vi.fn().mockReturnValue('current-session-id'),
+      getSessionId: vi.fn().mockReturnValue("current-session-id"),
     } as unknown as Config;
 
     // Create mock listSessions method
@@ -51,7 +51,7 @@ describe('listSessions', () => {
     );
 
     // Spy on console.log
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -59,7 +59,7 @@ describe('listSessions', () => {
     consoleLogSpy.mockRestore();
   });
 
-  it('should display message when no previous sessions were found', async () => {
+  it("should display message when no previous sessions were found", async () => {
     // Arrange: Return empty array from listSessions
     mockListSessions.mockResolvedValue([]);
 
@@ -68,51 +68,49 @@ describe('listSessions', () => {
 
     // Assert
     expect(mockListSessions).toHaveBeenCalledOnce();
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'No previous sessions found for this project.',
-    );
+    expect(consoleLogSpy).toHaveBeenCalledWith("No previous sessions found for this project.");
   });
 
-  it('should list sessions when sessions are found', async () => {
+  it("should list sessions when sessions are found", async () => {
     // Arrange: Create test sessions
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
     const twoDaysAgo = new Date(now.getTime() - 2 * 24 * 60 * 60 * 1000);
 
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-1',
-        file: 'session-2025-01-18T12-00-00-session-1',
-        fileName: 'session-2025-01-18T12-00-00-session-1.json',
+        id: "session-1",
+        file: "session-2025-01-18T12-00-00-session-1",
+        fileName: "session-2025-01-18T12-00-00-session-1.json",
         startTime: twoDaysAgo.toISOString(),
         lastUpdated: twoDaysAgo.toISOString(),
         messageCount: 5,
-        displayName: 'First user message',
-        firstUserMessage: 'First user message',
+        displayName: "First user message",
+        firstUserMessage: "First user message",
         isCurrentSession: false,
         index: 1,
       },
       {
-        id: 'session-2',
-        file: 'session-2025-01-20T11-00-00-session-2',
-        fileName: 'session-2025-01-20T11-00-00-session-2.json',
+        id: "session-2",
+        file: "session-2025-01-20T11-00-00-session-2",
+        fileName: "session-2025-01-20T11-00-00-session-2.json",
         startTime: oneHourAgo.toISOString(),
         lastUpdated: oneHourAgo.toISOString(),
         messageCount: 10,
-        displayName: 'Second user message',
-        firstUserMessage: 'Second user message',
+        displayName: "Second user message",
+        firstUserMessage: "Second user message",
         isCurrentSession: false,
         index: 2,
       },
       {
-        id: 'current-session-id',
-        file: 'session-2025-01-20T12-00-00-current-s',
-        fileName: 'session-2025-01-20T12-00-00-current-s.json',
+        id: "current-session-id",
+        file: "session-2025-01-20T12-00-00-current-s",
+        fileName: "session-2025-01-20T12-00-00-current-s.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 3,
-        displayName: 'Current session',
-        firstUserMessage: 'Current session',
+        displayName: "Current session",
+        firstUserMessage: "Current session",
         isCurrentSession: true,
         index: 3,
       },
@@ -127,76 +125,60 @@ describe('listSessions', () => {
     expect(mockListSessions).toHaveBeenCalledOnce();
 
     // Check that the header was displayed
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      '\nAvailable sessions for this project (3):\n',
-    );
+    expect(consoleLogSpy).toHaveBeenCalledWith("\nAvailable sessions for this project (3):\n");
 
     // Check that each session was logged
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('1. First user message'),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[session-1]'),
-    );
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("1. First user message"));
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("[session-1]"));
 
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('2. Second user message'),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[session-2]'),
-    );
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("2. Second user message"));
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("[session-2]"));
 
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('3. Current session'),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining(', current)'),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[current-session-id]'),
-    );
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("3. Current session"));
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(", current)"));
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("[current-session-id]"));
   });
 
-  it('should sort sessions by start time (oldest first)', async () => {
+  it("should sort sessions by start time (oldest first)", async () => {
     // Arrange: Create sessions in non-chronological order
-    const session1Time = new Date('2025-01-18T12:00:00.000Z');
-    const session2Time = new Date('2025-01-19T12:00:00.000Z');
-    const session3Time = new Date('2025-01-20T12:00:00.000Z');
+    const session1Time = new Date("2025-01-18T12:00:00.000Z");
+    const session2Time = new Date("2025-01-19T12:00:00.000Z");
+    const session3Time = new Date("2025-01-20T12:00:00.000Z");
 
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-2',
-        file: 'session-2',
-        fileName: 'session-2.json',
+        id: "session-2",
+        file: "session-2",
+        fileName: "session-2.json",
         startTime: session2Time.toISOString(), // Middle
         lastUpdated: session2Time.toISOString(),
         messageCount: 5,
-        displayName: 'Middle session',
-        firstUserMessage: 'Middle session',
+        displayName: "Middle session",
+        firstUserMessage: "Middle session",
         isCurrentSession: false,
         index: 2,
       },
       {
-        id: 'session-1',
-        file: 'session-1',
-        fileName: 'session-1.json',
+        id: "session-1",
+        file: "session-1",
+        fileName: "session-1.json",
         startTime: session1Time.toISOString(), // Oldest
         lastUpdated: session1Time.toISOString(),
         messageCount: 5,
-        displayName: 'Oldest session',
-        firstUserMessage: 'Oldest session',
+        displayName: "Oldest session",
+        firstUserMessage: "Oldest session",
         isCurrentSession: false,
         index: 1,
       },
       {
-        id: 'session-3',
-        file: 'session-3',
-        fileName: 'session-3.json',
+        id: "session-3",
+        file: "session-3",
+        fileName: "session-3.json",
         startTime: session3Time.toISOString(), // Newest
         lastUpdated: session3Time.toISOString(),
         messageCount: 5,
-        displayName: 'Newest session',
-        firstUserMessage: 'Newest session',
+        displayName: "Newest session",
+        firstUserMessage: "Newest session",
         isCurrentSession: false,
         index: 3,
       },
@@ -211,30 +193,30 @@ describe('listSessions', () => {
     // Get all the session log calls (skip the header)
     const sessionCalls = consoleLogSpy.mock.calls.filter(
       (call): call is [string] =>
-        typeof call[0] === 'string' &&
-        call[0].includes('[session-') &&
-        !call[0].includes('Available sessions'),
+        typeof call[0] === "string" &&
+        call[0].includes("[session-") &&
+        !call[0].includes("Available sessions"),
     );
 
     // Verify they are sorted by start time (oldest first)
-    expect(sessionCalls[0][0]).toContain('1. Oldest session');
-    expect(sessionCalls[1][0]).toContain('2. Middle session');
-    expect(sessionCalls[2][0]).toContain('3. Newest session');
+    expect(sessionCalls[0][0]).toContain("1. Oldest session");
+    expect(sessionCalls[1][0]).toContain("2. Middle session");
+    expect(sessionCalls[2][0]).toContain("3. Newest session");
   });
 
-  it('should format session output with relative time and session ID', async () => {
+  it("should format session output with relative time and session ID", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'abc123def456',
-        file: 'session-file',
-        fileName: 'session-file.json',
+        id: "abc123def456",
+        file: "session-file",
+        fileName: "session-file.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Test message',
-        firstUserMessage: 'Test message',
+        displayName: "Test message",
+        firstUserMessage: "Test message",
         isCurrentSession: false,
         index: 1,
       },
@@ -246,30 +228,24 @@ describe('listSessions', () => {
     await listSessions(mockConfig);
 
     // Assert
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('1. Test message'),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('some time ago'),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('[abc123def456]'),
-    );
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("1. Test message"));
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("some time ago"));
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("[abc123def456]"));
   });
 
-  it('should handle single session', async () => {
+  it("should handle single session", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'single-session',
-        file: 'session-file',
-        fileName: 'session-file.json',
+        id: "single-session",
+        file: "session-file",
+        fileName: "session-file.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Only session',
-        firstUserMessage: 'Only session',
+        displayName: "Only session",
+        firstUserMessage: "Only session",
         isCurrentSession: true,
         index: 1,
       },
@@ -281,34 +257,27 @@ describe('listSessions', () => {
     await listSessions(mockConfig);
 
     // Assert
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      '\nAvailable sessions for this project (1):\n',
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('1. Only session'),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining(', current)'),
-    );
+    expect(consoleLogSpy).toHaveBeenCalledWith("\nAvailable sessions for this project (1):\n");
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("1. Only session"));
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining(", current)"));
   });
 
-  it('should display summary as title when available instead of first user message', async () => {
+  it("should display summary as title when available instead of first user message", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-with-summary',
-        file: 'session-file',
-        fileName: 'session-file.json',
+        id: "session-with-summary",
+        file: "session-file",
+        fileName: "session-file.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 10,
-        displayName: 'Add dark mode to the app', // Summary
-        firstUserMessage:
-          'How do I add dark mode to my React application with CSS variables?',
+        displayName: "Add dark mode to the app", // Summary
+        firstUserMessage: "How do I add dark mode to my React application with CSS variables?",
         isCurrentSession: false,
         index: 1,
-        summary: 'Add dark mode to the app',
+        summary: "Add dark mode to the app",
       },
     ];
 
@@ -319,15 +288,15 @@ describe('listSessions', () => {
 
     // Assert: Should show the summary (displayName), not the first user message
     expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('1. Add dark mode to the app'),
+      expect.stringContaining("1. Add dark mode to the app"),
     );
     expect(consoleLogSpy).not.toHaveBeenCalledWith(
-      expect.stringContaining('How do I add dark mode to my React application'),
+      expect.stringContaining("How do I add dark mode to my React application"),
     );
   });
 });
 
-describe('deleteSession', () => {
+describe("deleteSession", () => {
   let mockConfig: Config;
   let mockListSessions: ReturnType<typeof vi.fn>;
   let mockDeleteSession: ReturnType<typeof vi.fn>;
@@ -338,9 +307,9 @@ describe('deleteSession', () => {
     // Create mock config
     mockConfig = {
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/test-project'),
+        getProjectTempDir: vi.fn().mockReturnValue("/tmp/test-project"),
       },
-      getSessionId: vi.fn().mockReturnValue('current-session-id'),
+      getSessionId: vi.fn().mockReturnValue("current-session-id"),
     } as unknown as Config;
 
     // Create mock methods
@@ -364,8 +333,8 @@ describe('deleteSession', () => {
     );
 
     // Spy on console methods
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    consoleLogSpy = vi.spyOn(console, "log").mockImplementation(() => {});
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
   });
 
   afterEach(() => {
@@ -374,34 +343,32 @@ describe('deleteSession', () => {
     consoleErrorSpy.mockRestore();
   });
 
-  it('should display error when no sessions are found', async () => {
+  it("should display error when no sessions are found", async () => {
     // Arrange
     mockListSessions.mockResolvedValue([]);
 
     // Act
-    await deleteSession(mockConfig, '1');
+    await deleteSession(mockConfig, "1");
 
     // Assert
     expect(mockListSessions).toHaveBeenCalledOnce();
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'No sessions found for this project.',
-    );
+    expect(consoleErrorSpy).toHaveBeenCalledWith("No sessions found for this project.");
     expect(mockDeleteSession).not.toHaveBeenCalled();
   });
 
-  it('should delete session by UUID', async () => {
+  it("should delete session by UUID", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-uuid-123',
-        file: 'session-file-123',
-        fileName: 'session-file-123.json',
+        id: "session-uuid-123",
+        file: "session-file-123",
+        fileName: "session-file-123.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Test session',
-        firstUserMessage: 'Test session',
+        displayName: "Test session",
+        firstUserMessage: "Test session",
         isCurrentSession: false,
         index: 1,
       },
@@ -411,44 +378,42 @@ describe('deleteSession', () => {
     mockDeleteSession.mockImplementation(() => {});
 
     // Act
-    await deleteSession(mockConfig, 'session-uuid-123');
+    await deleteSession(mockConfig, "session-uuid-123");
 
     // Assert
     expect(mockListSessions).toHaveBeenCalledOnce();
-    expect(mockDeleteSession).toHaveBeenCalledWith('session-file-123');
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Deleted session 1: Test session (some time ago)',
-    );
+    expect(mockDeleteSession).toHaveBeenCalledWith("session-file-123");
+    expect(consoleLogSpy).toHaveBeenCalledWith("Deleted session 1: Test session (some time ago)");
     expect(consoleErrorSpy).not.toHaveBeenCalled();
   });
 
-  it('should delete session by index', async () => {
+  it("should delete session by index", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000);
 
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-1',
-        file: 'session-file-1',
-        fileName: 'session-file-1.json',
+        id: "session-1",
+        file: "session-file-1",
+        fileName: "session-file-1.json",
         startTime: oneHourAgo.toISOString(),
         lastUpdated: oneHourAgo.toISOString(),
         messageCount: 5,
-        displayName: 'First session',
-        firstUserMessage: 'First session',
+        displayName: "First session",
+        firstUserMessage: "First session",
         isCurrentSession: false,
         index: 1,
       },
       {
-        id: 'session-2',
-        file: 'session-file-2',
-        fileName: 'session-file-2.json',
+        id: "session-2",
+        file: "session-file-2",
+        fileName: "session-file-2.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 10,
-        displayName: 'Second session',
-        firstUserMessage: 'Second session',
+        displayName: "Second session",
+        firstUserMessage: "Second session",
         isCurrentSession: false,
         index: 2,
       },
@@ -458,29 +423,27 @@ describe('deleteSession', () => {
     mockDeleteSession.mockImplementation(() => {});
 
     // Act
-    await deleteSession(mockConfig, '2');
+    await deleteSession(mockConfig, "2");
 
     // Assert
     expect(mockListSessions).toHaveBeenCalledOnce();
-    expect(mockDeleteSession).toHaveBeenCalledWith('session-file-2');
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Deleted session 2: Second session (some time ago)',
-    );
+    expect(mockDeleteSession).toHaveBeenCalledWith("session-file-2");
+    expect(consoleLogSpy).toHaveBeenCalledWith("Deleted session 2: Second session (some time ago)");
   });
 
-  it('should display error for invalid session identifier (non-numeric)', async () => {
+  it("should display error for invalid session identifier (non-numeric)", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-1',
-        file: 'session-file-1',
-        fileName: 'session-file-1.json',
+        id: "session-1",
+        file: "session-file-1",
+        fileName: "session-file-1.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Test session',
-        firstUserMessage: 'Test session',
+        displayName: "Test session",
+        firstUserMessage: "Test session",
         isCurrentSession: false,
         index: 1,
       },
@@ -489,7 +452,7 @@ describe('deleteSession', () => {
     mockListSessions.mockResolvedValue(mockSessions);
 
     // Act
-    await deleteSession(mockConfig, 'invalid-id');
+    await deleteSession(mockConfig, "invalid-id");
 
     // Assert
     expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -498,19 +461,19 @@ describe('deleteSession', () => {
     expect(mockDeleteSession).not.toHaveBeenCalled();
   });
 
-  it('should display error for invalid session identifier (out of range)', async () => {
+  it("should display error for invalid session identifier (out of range)", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-1',
-        file: 'session-file-1',
-        fileName: 'session-file-1.json',
+        id: "session-1",
+        file: "session-file-1",
+        fileName: "session-file-1.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Test session',
-        firstUserMessage: 'Test session',
+        displayName: "Test session",
+        firstUserMessage: "Test session",
         isCurrentSession: false,
         index: 1,
       },
@@ -519,7 +482,7 @@ describe('deleteSession', () => {
     mockListSessions.mockResolvedValue(mockSessions);
 
     // Act
-    await deleteSession(mockConfig, '999');
+    await deleteSession(mockConfig, "999");
 
     // Assert
     expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -528,19 +491,19 @@ describe('deleteSession', () => {
     expect(mockDeleteSession).not.toHaveBeenCalled();
   });
 
-  it('should display error for invalid session identifier (zero)', async () => {
+  it("should display error for invalid session identifier (zero)", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-1',
-        file: 'session-file-1',
-        fileName: 'session-file-1.json',
+        id: "session-1",
+        file: "session-file-1",
+        fileName: "session-file-1.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Test session',
-        firstUserMessage: 'Test session',
+        displayName: "Test session",
+        firstUserMessage: "Test session",
         isCurrentSession: false,
         index: 1,
       },
@@ -549,7 +512,7 @@ describe('deleteSession', () => {
     mockListSessions.mockResolvedValue(mockSessions);
 
     // Act
-    await deleteSession(mockConfig, '0');
+    await deleteSession(mockConfig, "0");
 
     // Assert
     expect(consoleErrorSpy).toHaveBeenCalledWith(
@@ -558,19 +521,19 @@ describe('deleteSession', () => {
     expect(mockDeleteSession).not.toHaveBeenCalled();
   });
 
-  it('should prevent deletion of current session', async () => {
+  it("should prevent deletion of current session", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'current-session-id',
-        file: 'current-session-file',
-        fileName: 'current-session-file.json',
+        id: "current-session-id",
+        file: "current-session-file",
+        fileName: "current-session-file.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Current session',
-        firstUserMessage: 'Current session',
+        displayName: "Current session",
+        firstUserMessage: "Current session",
         isCurrentSession: true,
         index: 1,
       },
@@ -579,28 +542,26 @@ describe('deleteSession', () => {
     mockListSessions.mockResolvedValue(mockSessions);
 
     // Act - try to delete by index
-    await deleteSession(mockConfig, '1');
+    await deleteSession(mockConfig, "1");
 
     // Assert
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Cannot delete the current active session.',
-    );
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Cannot delete the current active session.");
     expect(mockDeleteSession).not.toHaveBeenCalled();
   });
 
-  it('should prevent deletion of current session by UUID', async () => {
+  it("should prevent deletion of current session by UUID", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'current-session-id',
-        file: 'current-session-file',
-        fileName: 'current-session-file.json',
+        id: "current-session-id",
+        file: "current-session-file",
+        fileName: "current-session-file.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Current session',
-        firstUserMessage: 'Current session',
+        displayName: "Current session",
+        firstUserMessage: "Current session",
         isCurrentSession: true,
         index: 1,
       },
@@ -609,28 +570,26 @@ describe('deleteSession', () => {
     mockListSessions.mockResolvedValue(mockSessions);
 
     // Act - try to delete by UUID
-    await deleteSession(mockConfig, 'current-session-id');
+    await deleteSession(mockConfig, "current-session-id");
 
     // Assert
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Cannot delete the current active session.',
-    );
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Cannot delete the current active session.");
     expect(mockDeleteSession).not.toHaveBeenCalled();
   });
 
-  it('should handle deletion errors gracefully', async () => {
+  it("should handle deletion errors gracefully", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-1',
-        file: 'session-file-1',
-        fileName: 'session-file-1.json',
+        id: "session-1",
+        file: "session-file-1",
+        fileName: "session-file-1.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Test session',
-        firstUserMessage: 'Test session',
+        displayName: "Test session",
+        firstUserMessage: "Test session",
         isCurrentSession: false,
         index: 1,
       },
@@ -638,32 +597,30 @@ describe('deleteSession', () => {
 
     mockListSessions.mockResolvedValue(mockSessions);
     mockDeleteSession.mockImplementation(() => {
-      throw new Error('File deletion failed');
+      throw new Error("File deletion failed");
     });
 
     // Act
-    await deleteSession(mockConfig, '1');
+    await deleteSession(mockConfig, "1");
 
     // Assert
-    expect(mockDeleteSession).toHaveBeenCalledWith('session-file-1');
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Failed to delete session: File deletion failed',
-    );
+    expect(mockDeleteSession).toHaveBeenCalledWith("session-file-1");
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Failed to delete session: File deletion failed");
   });
 
-  it('should handle non-Error deletion failures', async () => {
+  it("should handle non-Error deletion failures", async () => {
     // Arrange
-    const now = new Date('2025-01-20T12:00:00.000Z');
+    const now = new Date("2025-01-20T12:00:00.000Z");
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-1',
-        file: 'session-file-1',
-        fileName: 'session-file-1.json',
+        id: "session-1",
+        file: "session-file-1",
+        fileName: "session-file-1.json",
         startTime: now.toISOString(),
         lastUpdated: now.toISOString(),
         messageCount: 5,
-        displayName: 'Test session',
-        firstUserMessage: 'Test session',
+        displayName: "Test session",
+        firstUserMessage: "Test session",
         isCurrentSession: false,
         index: 1,
       },
@@ -672,58 +629,56 @@ describe('deleteSession', () => {
     mockListSessions.mockResolvedValue(mockSessions);
     mockDeleteSession.mockImplementation(() => {
       // eslint-disable-next-line no-restricted-syntax
-      throw 'Unknown error type';
+      throw "Unknown error type";
     });
 
     // Act
-    await deleteSession(mockConfig, '1');
+    await deleteSession(mockConfig, "1");
 
     // Assert
-    expect(consoleErrorSpy).toHaveBeenCalledWith(
-      'Failed to delete session: Unknown error',
-    );
+    expect(consoleErrorSpy).toHaveBeenCalledWith("Failed to delete session: Unknown error");
   });
 
-  it('should sort sessions before finding by index', async () => {
+  it("should sort sessions before finding by index", async () => {
     // Arrange: Create sessions in non-chronological order
-    const session1Time = new Date('2025-01-18T12:00:00.000Z');
-    const session2Time = new Date('2025-01-19T12:00:00.000Z');
-    const session3Time = new Date('2025-01-20T12:00:00.000Z');
+    const session1Time = new Date("2025-01-18T12:00:00.000Z");
+    const session2Time = new Date("2025-01-19T12:00:00.000Z");
+    const session3Time = new Date("2025-01-20T12:00:00.000Z");
 
     const mockSessions: SessionInfo[] = [
       {
-        id: 'session-3',
-        file: 'session-file-3',
-        fileName: 'session-file-3.json',
+        id: "session-3",
+        file: "session-file-3",
+        fileName: "session-file-3.json",
         startTime: session3Time.toISOString(), // Newest
         lastUpdated: session3Time.toISOString(),
         messageCount: 5,
-        displayName: 'Newest session',
-        firstUserMessage: 'Newest session',
+        displayName: "Newest session",
+        firstUserMessage: "Newest session",
         isCurrentSession: false,
         index: 3,
       },
       {
-        id: 'session-1',
-        file: 'session-file-1',
-        fileName: 'session-file-1.json',
+        id: "session-1",
+        file: "session-file-1",
+        fileName: "session-file-1.json",
         startTime: session1Time.toISOString(), // Oldest
         lastUpdated: session1Time.toISOString(),
         messageCount: 5,
-        displayName: 'Oldest session',
-        firstUserMessage: 'Oldest session',
+        displayName: "Oldest session",
+        firstUserMessage: "Oldest session",
         isCurrentSession: false,
         index: 1,
       },
       {
-        id: 'session-2',
-        file: 'session-file-2',
-        fileName: 'session-file-2.json',
+        id: "session-2",
+        file: "session-file-2",
+        fileName: "session-file-2.json",
         startTime: session2Time.toISOString(), // Middle
         lastUpdated: session2Time.toISOString(),
         messageCount: 5,
-        displayName: 'Middle session',
-        firstUserMessage: 'Middle session',
+        displayName: "Middle session",
+        firstUserMessage: "Middle session",
         isCurrentSession: false,
         index: 2,
       },
@@ -733,12 +688,10 @@ describe('deleteSession', () => {
     mockDeleteSession.mockImplementation(() => {});
 
     // Act - delete index 1 (should be oldest session after sorting)
-    await deleteSession(mockConfig, '1');
+    await deleteSession(mockConfig, "1");
 
     // Assert
-    expect(mockDeleteSession).toHaveBeenCalledWith('session-file-1');
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Oldest session'),
-    );
+    expect(mockDeleteSession).toHaveBeenCalledWith("session-file-1");
+    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining("Oldest session"));
   });
 });
diff --git a/packages/ui-gemini/src/utils/sessions.ts b/packages/ui-gemini/src/utils/sessions.ts
index 7e08785b2..58889caa7 100644
--- a/packages/ui-gemini/src/utils/sessions.ts
+++ b/packages/ui-gemini/src/utils/sessions.ts
@@ -4,16 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  ChatRecordingService,
-  generateSummary,
-  type Config,
-} from '@airiscode/gemini-cli-core';
-import {
-  formatRelativeTime,
-  SessionSelector,
-  type SessionInfo,
-} from './sessionUtils.js';
+import { ChatRecordingService, type Config, generateSummary } from "@airiscode/gemini-cli-core";
+import { formatRelativeTime, type SessionInfo, SessionSelector } from "./sessionUtils.js";
 
 export async function listSessions(config: Config): Promise<void> {
   // Generate summary for most recent session if needed
@@ -23,39 +15,31 @@ export async function listSessions(config: Config): Promise<void> {
   const sessions = await sessionSelector.listSessions();
 
   if (sessions.length === 0) {
-    console.log('No previous sessions found for this project.');
+    console.log("No previous sessions found for this project.");
     return;
   }
 
   console.log(`\nAvailable sessions for this project (${sessions.length}):\n`);
 
   sessions
-    .sort(
-      (a, b) =>
-        new Date(a.startTime).getTime() - new Date(b.startTime).getTime(),
-    )
+    .sort((a, b) => new Date(a.startTime).getTime() - new Date(b.startTime).getTime())
     .forEach((session, index) => {
-      const current = session.isCurrentSession ? ', current' : '';
+      const current = session.isCurrentSession ? ", current" : "";
       const time = formatRelativeTime(session.lastUpdated);
       const title =
         session.displayName.length > 100
-          ? session.displayName.slice(0, 97) + '...'
+          ? session.displayName.slice(0, 97) + "..."
           : session.displayName;
-      console.log(
-        `  ${index + 1}. ${title} (${time}${current}) [${session.id}]`,
-      );
+      console.log(`  ${index + 1}. ${title} (${time}${current}) [${session.id}]`);
     });
 }
 
-export async function deleteSession(
-  config: Config,
-  sessionIndex: string,
-): Promise<void> {
+export async function deleteSession(config: Config, sessionIndex: string): Promise<void> {
   const sessionSelector = new SessionSelector(config);
   const sessions = await sessionSelector.listSessions();
 
   if (sessions.length === 0) {
-    console.error('No sessions found for this project.');
+    console.error("No sessions found for this project.");
     return;
   }
 
@@ -67,9 +51,7 @@ export async function deleteSession(
   let sessionToDelete: SessionInfo;
 
   // Try to find by UUID first
-  const sessionByUuid = sortedSessions.find(
-    (session) => session.id === sessionIndex,
-  );
+  const sessionByUuid = sortedSessions.find((session) => session.id === sessionIndex);
   if (sessionByUuid) {
     sessionToDelete = sessionByUuid;
   } else {
@@ -86,7 +68,7 @@ export async function deleteSession(
 
   // Prevent deleting the current session
   if (sessionToDelete.isCurrentSession) {
-    console.error('Cannot delete the current active session.');
+    console.error("Cannot delete the current active session.");
     return;
   }
 
@@ -101,7 +83,7 @@ export async function deleteSession(
     );
   } catch (error) {
     console.error(
-      `Failed to delete session: ${error instanceof Error ? error.message : 'Unknown error'}`,
+      `Failed to delete session: ${error instanceof Error ? error.message : "Unknown error"}`,
     );
   }
 }
diff --git a/packages/ui-gemini/src/utils/settingsUtils.test.ts b/packages/ui-gemini/src/utils/settingsUtils.test.ts
index ca1dc802c..02fd7f067 100644
--- a/packages/ui-gemini/src/utils/settingsUtils.test.ts
+++ b/packages/ui-gemini/src/utils/settingsUtils.test.ts
@@ -4,48 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from "vitest";
 import {
-  // Schema utilities
-  getSettingsByCategory,
-  getSettingDefinition,
-  requiresRestart,
+  getSettingsSchema,
+  type SettingDefinition,
+  type Settings,
+  type SettingsSchema,
+  type SettingsSchemaType,
+} from "../config/settingsSchema.js";
+import {
+  getAllSettingKeys,
   getDefaultValue,
-  getRestartRequiredSettings,
+  getDialogSettingKeys,
+  getDialogSettingsByCategory,
+  getDialogSettingsByType,
+  getDisplayValue,
+  getEffectiveDisplayValue,
   getEffectiveValue,
-  getAllSettingKeys,
+  getRestartRequiredFromModified,
+  getRestartRequiredSettings,
+  getSettingCategory,
+  getSettingDefinition,
+  // Schema utilities
+  getSettingsByCategory,
   getSettingsByType,
   getSettingsRequiringRestart,
-  isValidSettingKey,
-  getSettingCategory,
-  shouldShowInDialog,
-  getDialogSettingsByCategory,
-  getDialogSettingsByType,
-  getDialogSettingKeys,
   // Business logic utilities
   getSettingValue,
-  isSettingModified,
-  TEST_ONLY,
-  settingExistsInScope,
-  setPendingSettingValue,
   hasRestartRequiredSettings,
-  getRestartRequiredFromModified,
-  getDisplayValue,
   isDefaultValue,
+  isSettingModified,
+  isValidSettingKey,
   isValueInherited,
-  getEffectiveDisplayValue,
-} from './settingsUtils.js';
-import {
-  getSettingsSchema,
-  type SettingDefinition,
-  type Settings,
-  type SettingsSchema,
-  type SettingsSchemaType,
-} from '../config/settingsSchema.js';
+  requiresRestart,
+  setPendingSettingValue,
+  settingExistsInScope,
+  shouldShowInDialog,
+  TEST_ONLY,
+} from "./settingsUtils.js";
 
-vi.mock('../config/settingsSchema.js', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('../config/settingsSchema.js')>();
+vi.mock("../config/settingsSchema.js", async (importOriginal) => {
+  const original = await importOriginal<typeof import("../config/settingsSchema.js")>();
   return {
     ...original,
     getSettingsSchema: vi.fn(),
@@ -56,77 +55,77 @@ function makeMockSettings(settings: unknown): Settings {
   return settings as Settings;
 }
 
-describe('SettingsUtils', () => {
+describe("SettingsUtils", () => {
   beforeEach(() => {
     const SETTINGS_SCHEMA = {
       mcpServers: {
-        type: 'object',
-        label: 'MCP Servers',
-        category: 'Advanced',
+        type: "object",
+        label: "MCP Servers",
+        category: "Advanced",
         requiresRestart: true,
         default: {} as Record<string, string>,
-        description: 'Configuration for MCP servers.',
+        description: "Configuration for MCP servers.",
         showInDialog: false,
       },
       test: {
-        type: 'string',
-        label: 'Test',
-        category: 'Basic',
+        type: "string",
+        label: "Test",
+        category: "Basic",
         requiresRestart: false,
-        default: 'hello',
-        description: 'A test field',
+        default: "hello",
+        description: "A test field",
         showInDialog: true,
       },
       advanced: {
-        type: 'object',
-        label: 'Advanced',
-        category: 'Advanced',
+        type: "object",
+        label: "Advanced",
+        category: "Advanced",
         requiresRestart: true,
         default: {},
-        description: 'Advanced settings for power users.',
+        description: "Advanced settings for power users.",
         showInDialog: false,
       },
       ui: {
-        type: 'object',
-        label: 'UI',
-        category: 'UI',
+        type: "object",
+        label: "UI",
+        category: "UI",
         requiresRestart: false,
         default: {},
-        description: 'User interface settings.',
+        description: "User interface settings.",
         showInDialog: false,
         properties: {
           theme: {
-            type: 'string',
-            label: 'Theme',
-            category: 'UI',
+            type: "string",
+            label: "Theme",
+            category: "UI",
             requiresRestart: false,
             default: undefined as string | undefined,
-            description: 'The color theme for the UI.',
+            description: "The color theme for the UI.",
             showInDialog: false,
           },
           requiresRestart: {
-            type: 'boolean',
-            label: 'Requires Restart',
-            category: 'UI',
+            type: "boolean",
+            label: "Requires Restart",
+            category: "UI",
             default: false,
             requiresRestart: true,
           },
           accessibility: {
-            type: 'object',
-            label: 'Accessibility',
-            category: 'UI',
+            type: "object",
+            label: "Accessibility",
+            category: "UI",
             requiresRestart: true,
             default: {},
-            description: 'Accessibility settings.',
+            description: "Accessibility settings.",
             showInDialog: false,
             properties: {
               disableLoadingPhrases: {
-                type: 'boolean',
-                label: 'Disable Loading Phrases',
-                category: 'UI',
+                type: "boolean",
+                label: "Disable Loading Phrases",
+                category: "UI",
                 requiresRestart: true,
                 default: false,
-                description: 'Disable loading phrases for accessibility',
+                description: "Disable loading phrases for accessibility",
                 showInDialog: true,
               },
             },
@@ -134,30 +133,30 @@ describe('SettingsUtils', () => {
         },
       },
       tools: {
-        type: 'object',
-        label: 'Tools',
-        category: 'Tools',
+        type: "object",
+        label: "Tools",
+        category: "Tools",
         requiresRestart: false,
         default: {},
-        description: 'Tool settings.',
+        description: "Tool settings.",
         showInDialog: false,
         properties: {
           shell: {
-            type: 'object',
-            label: 'Shell',
-            category: 'Tools',
+            type: "object",
+            label: "Shell",
+            category: "Tools",
             requiresRestart: false,
             default: {},
-            description: 'Shell tool settings.',
+            description: "Shell tool settings.",
             showInDialog: false,
             properties: {
               pager: {
-                type: 'string',
-                label: 'Pager',
-                category: 'Tools',
+                type: "string",
+                label: "Pager",
+                category: "Tools",
                 requiresRestart: false,
-                default: 'less',
-                description: 'The pager to use for long output.',
+                default: "less",
+                description: "The pager to use for long output.",
                 showInDialog: true,
               },
             },
@@ -166,9 +165,7 @@ describe('SettingsUtils', () => {
       },
     } as const satisfies SettingsSchema;
 
-    vi.mocked(getSettingsSchema).mockReturnValue(
-      SETTINGS_SCHEMA as unknown as SettingsSchemaType,
-    );
+    vi.mocked(getSettingsSchema).mockReturnValue(SETTINGS_SCHEMA as unknown as SettingsSchemaType);
   });
   afterEach(() => {
     TEST_ONLY.clearFlattenedSchema();
@@ -176,15 +173,15 @@ describe('SettingsUtils', () => {
     vi.resetAllMocks();
   });
 
-  describe('Schema Utilities', () => {
-    describe('getSettingsByCategory', () => {
-      it('should group settings by category', () => {
+  describe("Schema Utilities", () => {
+    describe("getSettingsByCategory", () => {
+      it("should group settings by category", () => {
         const categories = getSettingsByCategory();
-        expect(categories).toHaveProperty('Advanced');
-        expect(categories).toHaveProperty('Basic');
+        expect(categories).toHaveProperty("Advanced");
+        expect(categories).toHaveProperty("Basic");
       });
 
-      it('should include key property in grouped settings', () => {
+      it("should include key property in grouped settings", () => {
         const categories = getSettingsByCategory();
 
         Object.entries(categories).forEach(([_category, settings]) => {
@@ -195,94 +192,82 @@ describe('SettingsUtils', () => {
       });
     });
 
-    describe('getSettingDefinition', () => {
-      it('should return definition for valid setting', () => {
-        const definition = getSettingDefinition('ui.theme');
+    describe("getSettingDefinition", () => {
+      it("should return definition for valid setting", () => {
+        const definition = getSettingDefinition("ui.theme");
         expect(definition).toBeDefined();
-        expect(definition?.label).toBe('Theme');
+        expect(definition?.label).toBe("Theme");
       });
 
-      it('should return undefined for invalid setting', () => {
-        const definition = getSettingDefinition('invalidSetting');
+      it("should return undefined for invalid setting", () => {
+        const definition = getSettingDefinition("invalidSetting");
         expect(definition).toBeUndefined();
       });
     });
 
-    describe('requiresRestart', () => {
-      it('should return true for settings that require restart', () => {
-        expect(requiresRestart('ui.requiresRestart')).toBe(true);
+    describe("requiresRestart", () => {
+      it("should return true for settings that require restart", () => {
+        expect(requiresRestart("ui.requiresRestart")).toBe(true);
       });
 
-      it('should return false for settings that do not require restart', () => {
-        expect(requiresRestart('ui.theme')).toBe(false);
+      it("should return false for settings that do not require restart", () => {
+        expect(requiresRestart("ui.theme")).toBe(false);
       });
 
-      it('should return false for invalid settings', () => {
-        expect(requiresRestart('invalidSetting')).toBe(false);
+      it("should return false for invalid settings", () => {
+        expect(requiresRestart("invalidSetting")).toBe(false);
       });
     });
 
-    describe('getDefaultValue', () => {
-      it('should return correct default values', () => {
-        expect(getDefaultValue('test')).toBe('hello');
-        expect(getDefaultValue('ui.requiresRestart')).toBe(false);
+    describe("getDefaultValue", () => {
+      it("should return correct default values", () => {
+        expect(getDefaultValue("test")).toBe("hello");
+        expect(getDefaultValue("ui.requiresRestart")).toBe(false);
       });
 
-      it('should return undefined for invalid settings', () => {
-        expect(getDefaultValue('invalidSetting')).toBeUndefined();
+      it("should return undefined for invalid settings", () => {
+        expect(getDefaultValue("invalidSetting")).toBeUndefined();
       });
     });
 
-    describe('getRestartRequiredSettings', () => {
-      it('should return all settings that require restart', () => {
+    describe("getRestartRequiredSettings", () => {
+      it("should return all settings that require restart", () => {
         const restartSettings = getRestartRequiredSettings();
-        expect(restartSettings).toContain('mcpServers');
-        expect(restartSettings).toContain('ui.requiresRestart');
+        expect(restartSettings).toContain("mcpServers");
+        expect(restartSettings).toContain("ui.requiresRestart");
       });
     });
 
-    describe('getEffectiveValue', () => {
-      it('should return value from settings when set', () => {
+    describe("getEffectiveValue", () => {
+      it("should return value from settings when set", () => {
         const settings = makeMockSettings({ ui: { requiresRestart: true } });
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: false },
         });
 
-        const value = getEffectiveValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const value = getEffectiveValue("ui.requiresRestart", settings, mergedSettings);
         expect(value).toBe(true);
       });
 
-      it('should return value from merged settings when not set in current scope', () => {
+      it("should return value from merged settings when not set in current scope", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: true },
         });
 
-        const value = getEffectiveValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const value = getEffectiveValue("ui.requiresRestart", settings, mergedSettings);
         expect(value).toBe(true);
       });
 
-      it('should return default value when not set anywhere', () => {
+      it("should return default value when not set anywhere", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({});
 
-        const value = getEffectiveValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const value = getEffectiveValue("ui.requiresRestart", settings, mergedSettings);
         expect(value).toBe(false); // default value
       });
 
-      it('should handle nested settings correctly', () => {
+      it("should handle nested settings correctly", () => {
         const settings = makeMockSettings({
           ui: { accessibility: { disableLoadingPhrases: true } },
         });
@@ -291,46 +276,42 @@ describe('SettingsUtils', () => {
         });
 
         const value = getEffectiveValue(
-          'ui.accessibility.disableLoadingPhrases',
+          "ui.accessibility.disableLoadingPhrases",
           settings,
           mergedSettings,
         );
         expect(value).toBe(true);
       });
 
-      it('should return undefined for invalid settings', () => {
+      it("should return undefined for invalid settings", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({});
 
-        const value = getEffectiveValue(
-          'invalidSetting',
-          settings,
-          mergedSettings,
-        );
+        const value = getEffectiveValue("invalidSetting", settings, mergedSettings);
         expect(value).toBeUndefined();
       });
     });
 
-    describe('getAllSettingKeys', () => {
-      it('should return all setting keys', () => {
+    describe("getAllSettingKeys", () => {
+      it("should return all setting keys", () => {
         const keys = getAllSettingKeys();
-        expect(keys).toContain('test');
-        expect(keys).toContain('ui.accessibility.disableLoadingPhrases');
+        expect(keys).toContain("test");
+        expect(keys).toContain("ui.accessibility.disableLoadingPhrases");
       });
     });
 
-    describe('getSettingsByType', () => {
-      it('should return only boolean settings', () => {
-        const booleanSettings = getSettingsByType('boolean');
+    describe("getSettingsByType", () => {
+      it("should return only boolean settings", () => {
+        const booleanSettings = getSettingsByType("boolean");
         expect(booleanSettings.length).toBeGreaterThan(0);
         booleanSettings.forEach((setting) => {
-          expect(setting.type).toBe('boolean');
+          expect(setting.type).toBe("boolean");
         });
       });
     });
 
-    describe('getSettingsRequiringRestart', () => {
-      it('should return only settings that require restart', () => {
+    describe("getSettingsRequiringRestart", () => {
+      it("should return only settings that require restart", () => {
         const restartSettings = getSettingsRequiringRestart();
         expect(restartSettings.length).toBeGreaterThan(0);
         restartSettings.forEach((setting) => {
@@ -339,128 +320,124 @@ describe('SettingsUtils', () => {
       });
     });
 
-    describe('isValidSettingKey', () => {
-      it('should return true for valid setting keys', () => {
-        expect(isValidSettingKey('ui.requiresRestart')).toBe(true);
-        expect(
-          isValidSettingKey('ui.accessibility.disableLoadingPhrases'),
-        ).toBe(true);
+    describe("isValidSettingKey", () => {
+      it("should return true for valid setting keys", () => {
+        expect(isValidSettingKey("ui.requiresRestart")).toBe(true);
+        expect(isValidSettingKey("ui.accessibility.disableLoadingPhrases")).toBe(true);
       });
 
-      it('should return false for invalid setting keys', () => {
-        expect(isValidSettingKey('invalidSetting')).toBe(false);
-        expect(isValidSettingKey('')).toBe(false);
+      it("should return false for invalid setting keys", () => {
+        expect(isValidSettingKey("invalidSetting")).toBe(false);
+        expect(isValidSettingKey("")).toBe(false);
       });
     });
 
-    describe('getSettingCategory', () => {
-      it('should return correct category for valid settings', () => {
-        expect(getSettingCategory('ui.requiresRestart')).toBe('UI');
-        expect(
-          getSettingCategory('ui.accessibility.disableLoadingPhrases'),
-        ).toBe('UI');
+    describe("getSettingCategory", () => {
+      it("should return correct category for valid settings", () => {
+        expect(getSettingCategory("ui.requiresRestart")).toBe("UI");
+        expect(getSettingCategory("ui.accessibility.disableLoadingPhrases")).toBe("UI");
       });
 
-      it('should return undefined for invalid settings', () => {
-        expect(getSettingCategory('invalidSetting')).toBeUndefined();
+      it("should return undefined for invalid settings", () => {
+        expect(getSettingCategory("invalidSetting")).toBeUndefined();
       });
     });
 
-    describe('shouldShowInDialog', () => {
-      it('should return true for settings marked to show in dialog', () => {
-        expect(shouldShowInDialog('ui.requiresRestart')).toBe(true);
-        expect(shouldShowInDialog('general.vimMode')).toBe(true);
-        expect(shouldShowInDialog('ui.hideWindowTitle')).toBe(true);
+    describe("shouldShowInDialog", () => {
+      it("should return true for settings marked to show in dialog", () => {
+        expect(shouldShowInDialog("ui.requiresRestart")).toBe(true);
+        expect(shouldShowInDialog("general.vimMode")).toBe(true);
+        expect(shouldShowInDialog("ui.hideWindowTitle")).toBe(true);
       });
 
-      it('should return false for settings marked to hide from dialog', () => {
-        expect(shouldShowInDialog('ui.theme')).toBe(false);
+      it("should return false for settings marked to hide from dialog", () => {
+        expect(shouldShowInDialog("ui.theme")).toBe(false);
       });
 
-      it('should return true for invalid settings (default behavior)', () => {
-        expect(shouldShowInDialog('invalidSetting')).toBe(true);
+      it("should return true for invalid settings (default behavior)", () => {
+        expect(shouldShowInDialog("invalidSetting")).toBe(true);
       });
     });
 
-    describe('getDialogSettingsByCategory', () => {
-      it('should only return settings marked for dialog display', async () => {
+    describe("getDialogSettingsByCategory", () => {
+      it("should only return settings marked for dialog display", async () => {
         const categories = getDialogSettingsByCategory();
 
         // Should include UI settings that are marked for dialog
-        expect(categories['UI']).toBeDefined();
-        const uiSettings = categories['UI'];
+        expect(categories["UI"]).toBeDefined();
+        const uiSettings = categories["UI"];
         const uiKeys = uiSettings.map((s) => s.key);
-        expect(uiKeys).toContain('ui.requiresRestart');
-        expect(uiKeys).toContain('ui.accessibility.disableLoadingPhrases');
-        expect(uiKeys).not.toContain('ui.theme'); // This is now marked false
+        expect(uiKeys).toContain("ui.requiresRestart");
+        expect(uiKeys).toContain("ui.accessibility.disableLoadingPhrases");
+        expect(uiKeys).not.toContain("ui.theme"); // This is now marked false
       });
 
-      it('should not include Advanced category settings', () => {
+      it("should not include Advanced category settings", () => {
         const categories = getDialogSettingsByCategory();
 
         // Advanced settings should be filtered out
-        expect(categories['Advanced']).toBeUndefined();
+        expect(categories["Advanced"]).toBeUndefined();
       });
 
-      it('should include settings with showInDialog=true', () => {
+      it("should include settings with showInDialog=true", () => {
         const categories = getDialogSettingsByCategory();
 
         const allSettings = Object.values(categories).flat();
         const allKeys = allSettings.map((s) => s.key);
 
-        expect(allKeys).toContain('test');
-        expect(allKeys).toContain('ui.requiresRestart');
-        expect(allKeys).not.toContain('ui.theme'); // Now hidden
-        expect(allKeys).not.toContain('general.preferredEditor'); // Now hidden
+        expect(allKeys).toContain("test");
+        expect(allKeys).toContain("ui.requiresRestart");
+        expect(allKeys).not.toContain("ui.theme"); // Now hidden
+        expect(allKeys).not.toContain("general.preferredEditor"); // Now hidden
       });
     });
 
-    describe('getDialogSettingsByType', () => {
-      it('should return only boolean dialog settings', () => {
-        const booleanSettings = getDialogSettingsByType('boolean');
+    describe("getDialogSettingsByType", () => {
+      it("should return only boolean dialog settings", () => {
+        const booleanSettings = getDialogSettingsByType("boolean");
 
         const keys = booleanSettings.map((s) => s.key);
-        expect(keys).toContain('ui.requiresRestart');
-        expect(keys).toContain('ui.accessibility.disableLoadingPhrases');
-        expect(keys).not.toContain('privacy.usageStatisticsEnabled');
-        expect(keys).not.toContain('security.auth.selectedType'); // Advanced setting
-        expect(keys).not.toContain('security.auth.useExternal'); // Advanced setting
+        expect(keys).toContain("ui.requiresRestart");
+        expect(keys).toContain("ui.accessibility.disableLoadingPhrases");
+        expect(keys).not.toContain("privacy.usageStatisticsEnabled");
+        expect(keys).not.toContain("security.auth.selectedType"); // Advanced setting
+        expect(keys).not.toContain("security.auth.useExternal"); // Advanced setting
       });
 
-      it('should return only string dialog settings', () => {
-        const stringSettings = getDialogSettingsByType('string');
+      it("should return only string dialog settings", () => {
+        const stringSettings = getDialogSettingsByType("string");
 
         const keys = stringSettings.map((s) => s.key);
         // Note: theme and preferredEditor are now hidden from dialog
-        expect(keys).not.toContain('ui.theme'); // Now marked false
-        expect(keys).not.toContain('general.preferredEditor'); // Now marked false
-        expect(keys).not.toContain('security.auth.selectedType'); // Advanced setting
+        expect(keys).not.toContain("ui.theme"); // Now marked false
+        expect(keys).not.toContain("general.preferredEditor"); // Now marked false
+        expect(keys).not.toContain("security.auth.selectedType"); // Advanced setting
 
         // Check that user-facing tool settings are included
-        expect(keys).toContain('tools.shell.pager');
+        expect(keys).toContain("tools.shell.pager");
 
         // Check that advanced/hidden tool settings are excluded
-        expect(keys).not.toContain('tools.discoveryCommand');
-        expect(keys).not.toContain('tools.callCommand');
-        expect(keys.every((key) => !key.startsWith('advanced.'))).toBe(true);
+        expect(keys).not.toContain("tools.discoveryCommand");
+        expect(keys).not.toContain("tools.callCommand");
+        expect(keys.every((key) => !key.startsWith("advanced."))).toBe(true);
       });
     });
 
-    describe('getDialogSettingKeys', () => {
-      it('should return only settings marked for dialog display', () => {
+    describe("getDialogSettingKeys", () => {
+      it("should return only settings marked for dialog display", () => {
         const dialogKeys = getDialogSettingKeys();
 
         // Should include settings marked for dialog
-        expect(dialogKeys).toContain('ui.requiresRestart');
+        expect(dialogKeys).toContain("ui.requiresRestart");
 
         // Should include nested settings marked for dialog
-        expect(dialogKeys).toContain('ui.accessibility.disableLoadingPhrases');
+        expect(dialogKeys).toContain("ui.accessibility.disableLoadingPhrases");
 
         // Should NOT include settings marked as hidden
-        expect(dialogKeys).not.toContain('ui.theme'); // Hidden
+        expect(dialogKeys).not.toContain("ui.theme"); // Hidden
       });
 
-      it('should return fewer keys than getAllSettingKeys', () => {
+      it("should return fewer keys than getAllSettingKeys", () => {
         const allKeys = getAllSettingKeys();
         const dialogKeys = getDialogSettingKeys();
 
@@ -468,33 +445,33 @@ describe('SettingsUtils', () => {
         expect(dialogKeys.length).toBeGreaterThan(0);
       });
 
-      it('should handle nested settings display correctly', () => {
+      it("should handle nested settings display correctly", () => {
         vi.mocked(getSettingsSchema).mockReturnValue({
           context: {
-            type: 'object',
-            label: 'Context',
-            category: 'Context',
+            type: "object",
+            label: "Context",
+            category: "Context",
             requiresRestart: false,
             default: {},
-            description: 'Settings for managing context provided to the model.',
+            description: "Settings for managing context provided to the model.",
             showInDialog: false,
             properties: {
               fileFiltering: {
-                type: 'object',
-                label: 'File Filtering',
-                category: 'Context',
+                type: "object",
+                label: "File Filtering",
+                category: "Context",
                 requiresRestart: true,
                 default: {},
-                description: 'Settings for git-aware file filtering.',
+                description: "Settings for git-aware file filtering.",
                 showInDialog: false,
                 properties: {
                   respectGitIgnore: {
-                    type: 'boolean',
-                    label: 'Respect .gitignore',
-                    category: 'Context',
+                    type: "boolean",
+                    label: "Respect .gitignore",
+                    category: "Context",
                     requiresRestart: true,
                     default: true,
-                    description: 'Respect .gitignore files when searching',
+                    description: "Respect .gitignore files when searching",
                     showInDialog: true,
                   },
                 },
@@ -504,30 +481,19 @@ describe('SettingsUtils', () => {
         } as unknown as SettingsSchemaType);
 
         // Test the specific issue with fileFiltering.respectGitIgnore
-        const key = 'context.fileFiltering.respectGitIgnore';
+        const key = "context.fileFiltering.respectGitIgnore";
         const initialSettings = makeMockSettings({});
         const pendingSettings = makeMockSettings({});
 
         // Set the nested setting to true
-        const updatedPendingSettings = setPendingSettingValue(
-          key,
-          true,
-          pendingSettings,
-        );
+        const updatedPendingSettings = setPendingSettingValue(key, true, pendingSettings);
 
         // Check if the setting exists in pending settings
-        const existsInPending = settingExistsInScope(
-          key,
-          updatedPendingSettings,
-        );
+        const existsInPending = settingExistsInScope(key, updatedPendingSettings);
         expect(existsInPending).toBe(true);
 
         // Get the value from pending settings
-        const valueFromPending = getSettingValue(
-          key,
-          updatedPendingSettings,
-          {},
-        );
+        const valueFromPending = getSettingValue(key, updatedPendingSettings, {});
         expect(valueFromPending).toBe(true);
 
         // Test getDisplayValue should show the pending change
@@ -538,7 +504,7 @@ describe('SettingsUtils', () => {
           new Set(),
           updatedPendingSettings,
         );
-        expect(displayValue).toBe('true'); // Should show true (no * since value matches default)
+        expect(displayValue).toBe("true"); // Should show true (no * since value matches default)
 
         // Test that modified settings also show the * indicator
         const modifiedSettings = new Set([key]);
@@ -549,132 +515,99 @@ describe('SettingsUtils', () => {
           modifiedSettings,
           {},
         );
-        expect(displayValueWithModified).toBe('true*'); // Should show true* because it's in modified settings and default is true
+        expect(displayValueWithModified).toBe("true*"); // Should show true* because it's in modified settings and default is true
       });
     });
   });
 
-  describe('Business Logic Utilities', () => {
-    describe('getSettingValue', () => {
-      it('should return value from settings when set', () => {
+  describe("Business Logic Utilities", () => {
+    describe("getSettingValue", () => {
+      it("should return value from settings when set", () => {
         const settings = makeMockSettings({ ui: { requiresRestart: true } });
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: false },
         });
 
-        const value = getSettingValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const value = getSettingValue("ui.requiresRestart", settings, mergedSettings);
         expect(value).toBe(true);
       });
 
-      it('should return value from merged settings when not set in current scope', () => {
+      it("should return value from merged settings when not set in current scope", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: true },
         });
 
-        const value = getSettingValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const value = getSettingValue("ui.requiresRestart", settings, mergedSettings);
         expect(value).toBe(true);
       });
 
-      it('should return default value for invalid setting', () => {
+      it("should return default value for invalid setting", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({});
 
-        const value = getSettingValue(
-          'invalidSetting',
-          settings,
-          mergedSettings,
-        );
+        const value = getSettingValue("invalidSetting", settings, mergedSettings);
         expect(value).toBe(false); // Default fallback
       });
     });
 
-    describe('isSettingModified', () => {
-      it('should return true when value differs from default', () => {
-        expect(isSettingModified('ui.requiresRestart', true)).toBe(true);
-        expect(
-          isSettingModified('ui.accessibility.disableLoadingPhrases', true),
-        ).toBe(true);
+    describe("isSettingModified", () => {
+      it("should return true when value differs from default", () => {
+        expect(isSettingModified("ui.requiresRestart", true)).toBe(true);
+        expect(isSettingModified("ui.accessibility.disableLoadingPhrases", true)).toBe(true);
       });
 
-      it('should return false when value matches default', () => {
-        expect(isSettingModified('ui.requiresRestart', false)).toBe(false);
-        expect(
-          isSettingModified('ui.accessibility.disableLoadingPhrases', false),
-        ).toBe(false);
+      it("should return false when value matches default", () => {
+        expect(isSettingModified("ui.requiresRestart", false)).toBe(false);
+        expect(isSettingModified("ui.accessibility.disableLoadingPhrases", false)).toBe(false);
       });
     });
 
-    describe('settingExistsInScope', () => {
-      it('should return true for top-level settings that exist', () => {
+    describe("settingExistsInScope", () => {
+      it("should return true for top-level settings that exist", () => {
         const settings = makeMockSettings({ ui: { requiresRestart: true } });
-        expect(settingExistsInScope('ui.requiresRestart', settings)).toBe(true);
+        expect(settingExistsInScope("ui.requiresRestart", settings)).toBe(true);
       });
 
-      it('should return false for top-level settings that do not exist', () => {
+      it("should return false for top-level settings that do not exist", () => {
         const settings = makeMockSettings({});
-        expect(settingExistsInScope('ui.requiresRestart', settings)).toBe(
-          false,
-        );
+        expect(settingExistsInScope("ui.requiresRestart", settings)).toBe(false);
       });
 
-      it('should return true for nested settings that exist', () => {
+      it("should return true for nested settings that exist", () => {
         const settings = makeMockSettings({
           ui: { accessibility: { disableLoadingPhrases: true } },
         });
-        expect(
-          settingExistsInScope(
-            'ui.accessibility.disableLoadingPhrases',
-            settings,
-          ),
-        ).toBe(true);
+        expect(settingExistsInScope("ui.accessibility.disableLoadingPhrases", settings)).toBe(true);
       });
 
-      it('should return false for nested settings that do not exist', () => {
+      it("should return false for nested settings that do not exist", () => {
         const settings = makeMockSettings({});
-        expect(
-          settingExistsInScope(
-            'ui.accessibility.disableLoadingPhrases',
-            settings,
-          ),
-        ).toBe(false);
+        expect(settingExistsInScope("ui.accessibility.disableLoadingPhrases", settings)).toBe(
+          false,
+        );
       });
 
-      it('should return false when parent exists but child does not', () => {
+      it("should return false when parent exists but child does not", () => {
         const settings = makeMockSettings({ ui: { accessibility: {} } });
-        expect(
-          settingExistsInScope(
-            'ui.accessibility.disableLoadingPhrases',
-            settings,
-          ),
-        ).toBe(false);
+        expect(settingExistsInScope("ui.accessibility.disableLoadingPhrases", settings)).toBe(
+          false,
+        );
       });
     });
 
-    describe('setPendingSettingValue', () => {
-      it('should set top-level setting value', () => {
+    describe("setPendingSettingValue", () => {
+      it("should set top-level setting value", () => {
         const pendingSettings = makeMockSettings({});
-        const result = setPendingSettingValue(
-          'ui.hideWindowTitle',
-          true,
-          pendingSettings,
-        );
+        const result = setPendingSettingValue("ui.hideWindowTitle", true, pendingSettings);
 
         expect(result.ui?.hideWindowTitle).toBe(true);
       });
 
-      it('should set nested setting value', () => {
+      it("should set nested setting value", () => {
         const pendingSettings = makeMockSettings({});
         const result = setPendingSettingValue(
-          'ui.accessibility.disableLoadingPhrases',
+          "ui.accessibility.disableLoadingPhrases",
           true,
           pendingSettings,
         );
@@ -682,12 +615,12 @@ describe('SettingsUtils', () => {
         expect(result.ui?.accessibility?.disableLoadingPhrases).toBe(true);
       });
 
-      it('should preserve existing nested settings', () => {
+      it("should preserve existing nested settings", () => {
         const pendingSettings = makeMockSettings({
           ui: { accessibility: { disableLoadingPhrases: false } },
         });
         const result = setPendingSettingValue(
-          'ui.accessibility.disableLoadingPhrases',
+          "ui.accessibility.disableLoadingPhrases",
           true,
           pendingSettings,
         );
@@ -695,63 +628,57 @@ describe('SettingsUtils', () => {
         expect(result.ui?.accessibility?.disableLoadingPhrases).toBe(true);
       });
 
-      it('should not mutate original settings', () => {
+      it("should not mutate original settings", () => {
         const pendingSettings = makeMockSettings({});
-        setPendingSettingValue('ui.requiresRestart', true, pendingSettings);
+        setPendingSettingValue("ui.requiresRestart", true, pendingSettings);
 
         expect(pendingSettings).toEqual({});
       });
     });
 
-    describe('hasRestartRequiredSettings', () => {
-      it('should return true when modified settings require restart', () => {
+    describe("hasRestartRequiredSettings", () => {
+      it("should return true when modified settings require restart", () => {
         const modifiedSettings = new Set<string>([
-          'advanced.autoConfigureMemory',
-          'ui.requiresRestart',
+          "advanced.autoConfigureMemory",
+          "ui.requiresRestart",
         ]);
         expect(hasRestartRequiredSettings(modifiedSettings)).toBe(true);
       });
 
-      it('should return false when no modified settings require restart', () => {
-        const modifiedSettings = new Set<string>(['test']);
+      it("should return false when no modified settings require restart", () => {
+        const modifiedSettings = new Set<string>(["test"]);
         expect(hasRestartRequiredSettings(modifiedSettings)).toBe(false);
       });
 
-      it('should return false for empty set', () => {
+      it("should return false for empty set", () => {
         const modifiedSettings = new Set<string>();
         expect(hasRestartRequiredSettings(modifiedSettings)).toBe(false);
       });
     });
 
-    describe('getRestartRequiredFromModified', () => {
-      it('should return only settings that require restart', () => {
-        const modifiedSettings = new Set<string>([
-          'ui.requiresRestart',
-          'test',
-        ]);
+    describe("getRestartRequiredFromModified", () => {
+      it("should return only settings that require restart", () => {
+        const modifiedSettings = new Set<string>(["ui.requiresRestart", "test"]);
         const result = getRestartRequiredFromModified(modifiedSettings);
 
-        expect(result).toContain('ui.requiresRestart');
-        expect(result).not.toContain('test');
+        expect(result).toContain("ui.requiresRestart");
+        expect(result).not.toContain("test");
       });
 
-      it('should return empty array when no settings require restart', () => {
-        const modifiedSettings = new Set<string>([
-          'requiresRestart',
-          'hideTips',
-        ]);
+      it("should return empty array when no settings require restart", () => {
+        const modifiedSettings = new Set<string>(["requiresRestart", "hideTips"]);
         const result = getRestartRequiredFromModified(modifiedSettings);
 
         expect(result).toEqual([]);
       });
     });
 
-    describe('getDisplayValue', () => {
-      describe('enum behavior', () => {
+    describe("getDisplayValue", () => {
+      describe("enum behavior", () => {
         enum StringEnum {
-          FOO = 'foo',
-          BAR = 'bar',
-          BAZ = 'baz',
+          FOO = "foo",
+          BAR = "bar",
+          BAZ = "baz",
         }
 
         enum NumberEnum {
@@ -761,30 +688,30 @@ describe('SettingsUtils', () => {
         }
 
         const SETTING: SettingDefinition = {
-          type: 'enum',
-          label: 'Theme',
+          type: "enum",
+          label: "Theme",
           options: [
             {
               value: StringEnum.FOO,
-              label: 'Foo',
+              label: "Foo",
             },
             {
               value: StringEnum.BAR,
-              label: 'Bar',
+              label: "Bar",
             },
             {
               value: StringEnum.BAZ,
-              label: 'Baz',
+              label: "Baz",
             },
           ],
-          category: 'UI',
+          category: "UI",
           requiresRestart: false,
           default: StringEnum.BAR,
-          description: 'The color theme for the UI.',
+          description: "The color theme for the UI.",
           showInDialog: false,
         };
 
-        it('handles display of number-based enums', () => {
+        it("handles display of number-based enums", () => {
           vi.mocked(getSettingsSchema).mockReturnValue({
             ui: {
               properties: {
@@ -793,15 +720,15 @@ describe('SettingsUtils', () => {
                   options: [
                     {
                       value: NumberEnum.ONE,
-                      label: 'One',
+                      label: "One",
                     },
                     {
                       value: NumberEnum.TWO,
-                      label: 'Two',
+                      label: "Two",
                     },
                     {
                       value: NumberEnum.THREE,
-                      label: 'Three',
+                      label: "Three",
                     },
                   ],
                 },
@@ -817,17 +744,12 @@ describe('SettingsUtils', () => {
           });
           const modifiedSettings = new Set<string>();
 
-          const result = getDisplayValue(
-            'ui.theme',
-            settings,
-            mergedSettings,
-            modifiedSettings,
-          );
+          const result = getDisplayValue("ui.theme", settings, mergedSettings, modifiedSettings);
 
-          expect(result).toBe('Three*');
+          expect(result).toBe("Three*");
         });
 
-        it('handles default values for number-based enums', () => {
+        it("handles default values for number-based enums", () => {
           vi.mocked(getSettingsSchema).mockReturnValue({
             ui: {
               properties: {
@@ -837,15 +759,15 @@ describe('SettingsUtils', () => {
                   options: [
                     {
                       value: NumberEnum.ONE,
-                      label: 'One',
+                      label: "One",
                     },
                     {
                       value: NumberEnum.TWO,
-                      label: 'Two',
+                      label: "Two",
                     },
                     {
                       value: NumberEnum.THREE,
-                      label: 'Three',
+                      label: "Three",
                     },
                   ],
                 },
@@ -855,15 +777,15 @@ describe('SettingsUtils', () => {
           const modifiedSettings = new Set<string>();
 
           const result = getDisplayValue(
-            'ui.theme',
+            "ui.theme",
             makeMockSettings({}),
             makeMockSettings({}),
             modifiedSettings,
           );
-          expect(result).toBe('Three');
+          expect(result).toBe("Three");
         });
 
-        it('shows the enum display value', () => {
+        it("shows the enum display value", () => {
           vi.mocked(getSettingsSchema).mockReturnValue({
             ui: { properties: { theme: { ...SETTING } } },
           } as unknown as SettingsSchemaType);
@@ -873,16 +795,11 @@ describe('SettingsUtils', () => {
           });
           const modifiedSettings = new Set<string>();
 
-          const result = getDisplayValue(
-            'ui.theme',
-            settings,
-            mergedSettings,
-            modifiedSettings,
-          );
-          expect(result).toBe('Bar*');
+          const result = getDisplayValue("ui.theme", settings, mergedSettings, modifiedSettings);
+          expect(result).toBe("Bar*");
         });
 
-        it('passes through unknown values verbatim', () => {
+        it("passes through unknown values verbatim", () => {
           vi.mocked(getSettingsSchema).mockReturnValue({
             ui: {
               properties: {
@@ -890,20 +807,15 @@ describe('SettingsUtils', () => {
               },
             },
           } as unknown as SettingsSchemaType);
-          const settings = makeMockSettings({ ui: { theme: 'xyz' } });
-          const mergedSettings = makeMockSettings({ ui: { theme: 'xyz' } });
+          const settings = makeMockSettings({ ui: { theme: "xyz" } });
+          const mergedSettings = makeMockSettings({ ui: { theme: "xyz" } });
           const modifiedSettings = new Set<string>();
 
-          const result = getDisplayValue(
-            'ui.theme',
-            settings,
-            mergedSettings,
-            modifiedSettings,
-          );
-          expect(result).toBe('xyz*');
+          const result = getDisplayValue("ui.theme", settings, mergedSettings, modifiedSettings);
+          expect(result).toBe("xyz*");
         });
 
-        it('shows the default value for string enums', () => {
+        it("shows the default value for string enums", () => {
           vi.mocked(getSettingsSchema).mockReturnValue({
             ui: {
               properties: {
@@ -914,16 +826,16 @@ describe('SettingsUtils', () => {
           const modifiedSettings = new Set<string>();
 
           const result = getDisplayValue(
-            'ui.theme',
+            "ui.theme",
             makeMockSettings({}),
             makeMockSettings({}),
             modifiedSettings,
           );
-          expect(result).toBe('Bar');
+          expect(result).toBe("Bar");
         });
       });
 
-      it('should show value without * when setting matches default', () => {
+      it("should show value without * when setting matches default", () => {
         const settings = makeMockSettings({
           ui: { requiresRestart: false },
         }); // false matches default, so no *
@@ -933,15 +845,15 @@ describe('SettingsUtils', () => {
         const modifiedSettings = new Set<string>();
 
         const result = getDisplayValue(
-          'ui.requiresRestart',
+          "ui.requiresRestart",
           settings,
           mergedSettings,
           modifiedSettings,
         );
-        expect(result).toBe('false*');
+        expect(result).toBe("false*");
       });
 
-      it('should show default value when setting is not in scope', () => {
+      it("should show default value when setting is not in scope", () => {
         const settings = makeMockSettings({}); // no setting in scope
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: false },
@@ -949,15 +861,15 @@ describe('SettingsUtils', () => {
         const modifiedSettings = new Set<string>();
 
         const result = getDisplayValue(
-          'ui.requiresRestart',
+          "ui.requiresRestart",
           settings,
           mergedSettings,
           modifiedSettings,
         );
-        expect(result).toBe('false'); // shows default value
+        expect(result).toBe("false"); // shows default value
       });
 
-      it('should show value with * when changed from default', () => {
+      it("should show value with * when changed from default", () => {
         const settings = makeMockSettings({ ui: { requiresRestart: true } }); // true is different from default (false)
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: true },
@@ -965,15 +877,15 @@ describe('SettingsUtils', () => {
         const modifiedSettings = new Set<string>();
 
         const result = getDisplayValue(
-          'ui.requiresRestart',
+          "ui.requiresRestart",
           settings,
           mergedSettings,
           modifiedSettings,
         );
-        expect(result).toBe('true*');
+        expect(result).toBe("true*");
       });
 
-      it('should show default value without * when setting does not exist in scope', () => {
+      it("should show default value without * when setting does not exist in scope", () => {
         const settings = makeMockSettings({}); // setting doesn't exist in scope, show default
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: false },
@@ -981,103 +893,89 @@ describe('SettingsUtils', () => {
         const modifiedSettings = new Set<string>();
 
         const result = getDisplayValue(
-          'ui.requiresRestart',
+          "ui.requiresRestart",
           settings,
           mergedSettings,
           modifiedSettings,
         );
-        expect(result).toBe('false'); // default value (false) without *
+        expect(result).toBe("false"); // default value (false) without *
       });
 
-      it('should show value with * when user changes from default', () => {
+      it("should show value with * when user changes from default", () => {
         const settings = makeMockSettings({}); // setting doesn't exist in scope originally
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: false },
         });
-        const modifiedSettings = new Set<string>(['ui.requiresRestart']);
+        const modifiedSettings = new Set<string>(["ui.requiresRestart"]);
         const pendingSettings = makeMockSettings({
           ui: { requiresRestart: true },
         }); // user changed to true
 
         const result = getDisplayValue(
-          'ui.requiresRestart',
+          "ui.requiresRestart",
           settings,
           mergedSettings,
           modifiedSettings,
           pendingSettings,
         );
-        expect(result).toBe('true*'); // changed from default (false) to true
+        expect(result).toBe("true*"); // changed from default (false) to true
       });
     });
 
-    describe('isDefaultValue', () => {
-      it('should return true when setting does not exist in scope', () => {
+    describe("isDefaultValue", () => {
+      it("should return true when setting does not exist in scope", () => {
         const settings = makeMockSettings({}); // setting doesn't exist
 
-        const result = isDefaultValue('ui.requiresRestart', settings);
+        const result = isDefaultValue("ui.requiresRestart", settings);
         expect(result).toBe(true);
       });
 
-      it('should return false when setting exists in scope', () => {
+      it("should return false when setting exists in scope", () => {
         const settings = makeMockSettings({ ui: { requiresRestart: true } }); // setting exists
 
-        const result = isDefaultValue('ui.requiresRestart', settings);
+        const result = isDefaultValue("ui.requiresRestart", settings);
         expect(result).toBe(false);
       });
 
-      it('should return true when nested setting does not exist in scope', () => {
+      it("should return true when nested setting does not exist in scope", () => {
         const settings = makeMockSettings({}); // nested setting doesn't exist
 
-        const result = isDefaultValue(
-          'ui.accessibility.disableLoadingPhrases',
-          settings,
-        );
+        const result = isDefaultValue("ui.accessibility.disableLoadingPhrases", settings);
         expect(result).toBe(true);
       });
 
-      it('should return false when nested setting exists in scope', () => {
+      it("should return false when nested setting exists in scope", () => {
         const settings = makeMockSettings({
           ui: { accessibility: { disableLoadingPhrases: true } },
         }); // nested setting exists
 
-        const result = isDefaultValue(
-          'ui.accessibility.disableLoadingPhrases',
-          settings,
-        );
+        const result = isDefaultValue("ui.accessibility.disableLoadingPhrases", settings);
         expect(result).toBe(false);
       });
     });
 
-    describe('isValueInherited', () => {
-      it('should return false for top-level settings that exist in scope', () => {
+    describe("isValueInherited", () => {
+      it("should return false for top-level settings that exist in scope", () => {
         const settings = makeMockSettings({ ui: { requiresRestart: true } });
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: true },
         });
 
-        const result = isValueInherited(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const result = isValueInherited("ui.requiresRestart", settings, mergedSettings);
         expect(result).toBe(false);
       });
 
-      it('should return true for top-level settings that do not exist in scope', () => {
+      it("should return true for top-level settings that do not exist in scope", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: true },
         });
 
-        const result = isValueInherited(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const result = isValueInherited("ui.requiresRestart", settings, mergedSettings);
         expect(result).toBe(true);
       });
 
-      it('should return false for nested settings that exist in scope', () => {
+      it("should return false for nested settings that exist in scope", () => {
         const settings = makeMockSettings({
           ui: { accessibility: { disableLoadingPhrases: true } },
         });
@@ -1086,21 +984,21 @@ describe('SettingsUtils', () => {
         });
 
         const result = isValueInherited(
-          'ui.accessibility.disableLoadingPhrases',
+          "ui.accessibility.disableLoadingPhrases",
           settings,
           mergedSettings,
         );
         expect(result).toBe(false);
       });
 
-      it('should return true for nested settings that do not exist in scope', () => {
+      it("should return true for nested settings that do not exist in scope", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({
           ui: { accessibility: { disableLoadingPhrases: true } },
         });
 
         const result = isValueInherited(
-          'ui.accessibility.disableLoadingPhrases',
+          "ui.accessibility.disableLoadingPhrases",
           settings,
           mergedSettings,
         );
@@ -1108,44 +1006,32 @@ describe('SettingsUtils', () => {
       });
     });
 
-    describe('getEffectiveDisplayValue', () => {
-      it('should return value from settings when available', () => {
+    describe("getEffectiveDisplayValue", () => {
+      it("should return value from settings when available", () => {
         const settings = makeMockSettings({ ui: { requiresRestart: true } });
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: false },
         });
 
-        const result = getEffectiveDisplayValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const result = getEffectiveDisplayValue("ui.requiresRestart", settings, mergedSettings);
         expect(result).toBe(true);
       });
 
-      it('should return value from merged settings when not in scope', () => {
+      it("should return value from merged settings when not in scope", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({
           ui: { requiresRestart: true },
         });
 
-        const result = getEffectiveDisplayValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const result = getEffectiveDisplayValue("ui.requiresRestart", settings, mergedSettings);
         expect(result).toBe(true);
       });
 
-      it('should return default value for undefined values', () => {
+      it("should return default value for undefined values", () => {
         const settings = makeMockSettings({});
         const mergedSettings = makeMockSettings({});
 
-        const result = getEffectiveDisplayValue(
-          'ui.requiresRestart',
-          settings,
-          mergedSettings,
-        );
+        const result = getEffectiveDisplayValue("ui.requiresRestart", settings, mergedSettings);
         expect(result).toBe(false); // Default value
       });
     });
diff --git a/packages/ui-gemini/src/utils/settingsUtils.ts b/packages/ui-gemini/src/utils/settingsUtils.ts
index 7ec5fd588..338d3f0c4 100644
--- a/packages/ui-gemini/src/utils/settingsUtils.ts
+++ b/packages/ui-gemini/src/utils/settingsUtils.ts
@@ -4,18 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  Settings,
-  LoadedSettings,
-  LoadableSettingScope,
-} from '../config/settings.js';
+import type { LoadableSettingScope, LoadedSettings, Settings } from "../config/settings.js";
 import type {
   SettingDefinition,
   SettingsSchema,
   SettingsType,
   SettingsValue,
-} from '../config/settingsSchema.js';
-import { getSettingsSchema } from '../config/settingsSchema.js';
+} from "../config/settingsSchema.js";
+import { getSettingsSchema } from "../config/settingsSchema.js";
 
 // The schema is now nested, but many parts of the UI and logic work better
 // with a flattened structure and dot-notation keys. This section flattens the
@@ -23,7 +19,7 @@ import { getSettingsSchema } from '../config/settingsSchema.js';
 
 type FlattenedSchema = Record<string, SettingDefinition & { key: string }>;
 
-function flattenSchema(schema: SettingsSchema, prefix = ''): FlattenedSchema {
+function flattenSchema(schema: SettingsSchema, prefix = ""): FlattenedSchema {
   let result: FlattenedSchema = {};
   for (const key in schema) {
     const newKey = prefix ? `${prefix}.${key}` : key;
@@ -40,10 +36,7 @@ let _FLATTENED_SCHEMA: FlattenedSchema | undefined;
 
 /** Returns a flattened schema, the first call is memoized for future requests. */
 export function getFlattenedSchema() {
-  return (
-    _FLATTENED_SCHEMA ??
-    (_FLATTENED_SCHEMA = flattenSchema(getSettingsSchema()))
-  );
+  return _FLATTENED_SCHEMA ?? (_FLATTENED_SCHEMA = flattenSchema(getSettingsSchema()));
 }
 
 function clearFlattenedSchema() {
@@ -57,10 +50,7 @@ export function getSettingsByCategory(): Record<
   string,
   Array<SettingDefinition & { key: string }>
 > {
-  const categories: Record<
-    string,
-    Array<SettingDefinition & { key: string }>
-  > = {};
+  const categories: Record<string, Array<SettingDefinition & { key: string }>> = {};
 
   Object.values(getFlattenedSchema()).forEach((definition) => {
     const category = definition.category;
@@ -108,10 +98,7 @@ export function getRestartRequiredSettings(): string[] {
 /**
  * Recursively gets a value from a nested object using a key path array.
  */
-export function getNestedValue(
-  obj: Record<string, unknown>,
-  path: string[],
-): unknown {
+export function getNestedValue(obj: Record<string, unknown>, path: string[]): unknown {
   const [first, ...rest] = path;
   if (!first || !(first in obj)) {
     return undefined;
@@ -120,7 +107,7 @@ export function getNestedValue(
   if (rest.length === 0) {
     return value;
   }
-  if (value && typeof value === 'object' && value !== null) {
+  if (value && typeof value === "object" && value !== null) {
     return getNestedValue(value as Record<string, unknown>, rest);
   }
   return undefined;
@@ -140,7 +127,7 @@ export function getEffectiveValue(
     return undefined;
   }
 
-  const path = key.split('.');
+  const path = key.split(".");
 
   // Check the current scope's settings first
   let value = getNestedValue(settings as Record<string, unknown>, path);
@@ -168,12 +155,8 @@ export function getAllSettingKeys(): string[] {
 /**
  * Get settings by type
  */
-export function getSettingsByType(
-  type: SettingsType,
-): Array<SettingDefinition & { key: string }> {
-  return Object.values(getFlattenedSchema()).filter(
-    (definition) => definition.type === type,
-  );
+export function getSettingsByType(type: SettingsType): Array<SettingDefinition & { key: string }> {
+  return Object.values(getFlattenedSchema()).filter((definition) => definition.type === type);
 }
 
 /**
@@ -184,9 +167,7 @@ export function getSettingsRequiringRestart(): Array<
     key: string;
   }
 > {
-  return Object.values(getFlattenedSchema()).filter(
-    (definition) => definition.requiresRestart,
-  );
+  return Object.values(getFlattenedSchema()).filter((definition) => definition.requiresRestart);
 }
 
 /**
@@ -217,10 +198,7 @@ export function getDialogSettingsByCategory(): Record<
   string,
   Array<SettingDefinition & { key: string }>
 > {
-  const categories: Record<
-    string,
-    Array<SettingDefinition & { key: string }>
-  > = {};
+  const categories: Record<string, Array<SettingDefinition & { key: string }>> = {};
 
   Object.values(getFlattenedSchema())
     .filter((definition) => definition.showInDialog !== false)
@@ -242,8 +220,7 @@ export function getDialogSettingsByType(
   type: SettingsType,
 ): Array<SettingDefinition & { key: string }> {
   return Object.values(getFlattenedSchema()).filter(
-    (definition) =>
-      definition.type === type && definition.showInDialog !== false,
+    (definition) => definition.type === type && definition.showInDialog !== false,
   );
 }
 
@@ -276,12 +253,12 @@ export function getSettingValue(
 
   const value = getEffectiveValue(key, settings, mergedSettings);
   // Ensure we return a boolean value, converting from the more general type
-  if (typeof value === 'boolean') {
+  if (typeof value === "boolean") {
     return value;
   }
   // Fall back to default value, ensuring it's a boolean
   const defaultValue = definition.default;
-  if (typeof defaultValue === 'boolean') {
+  if (typeof defaultValue === "boolean") {
     return defaultValue;
   }
   return false; // Final fallback
@@ -293,7 +270,7 @@ export function getSettingValue(
 export function isSettingModified(key: string, value: boolean): boolean {
   const defaultValue = getDefaultValue(key);
   // Handle type comparison properly
-  if (typeof defaultValue === 'boolean') {
+  if (typeof defaultValue === "boolean") {
     return value !== defaultValue;
   }
   // If default is not a boolean, consider it modified if value is true
@@ -303,11 +280,8 @@ export function isSettingModified(key: string, value: boolean): boolean {
 /**
  * Check if a setting exists in the original settings file for a scope
  */
-export function settingExistsInScope(
-  key: string,
-  scopeSettings: Settings,
-): boolean {
-  const path = key.split('.');
+export function settingExistsInScope(key: string, scopeSettings: Settings): boolean {
+  const path = key.split(".");
   const value = getNestedValue(scopeSettings as Record<string, unknown>, path);
   return value !== undefined;
 }
@@ -330,7 +304,7 @@ function setNestedValue(
     return obj;
   }
 
-  if (!obj[first] || typeof obj[first] !== 'object') {
+  if (!obj[first] || typeof obj[first] !== "object") {
     obj[first] = {};
   }
 
@@ -346,7 +320,7 @@ export function setPendingSettingValue(
   value: boolean,
   pendingSettings: Settings,
 ): Settings {
-  const path = key.split('.');
+  const path = key.split(".");
   const newSettings = JSON.parse(JSON.stringify(pendingSettings));
   setNestedValue(newSettings, path, value);
   return newSettings;
@@ -360,7 +334,7 @@ export function setPendingSettingValueAny(
   value: SettingsValue,
   pendingSettings: Settings,
 ): Settings {
-  const path = key.split('.');
+  const path = key.split(".");
   const newSettings = structuredClone(pendingSettings);
   setNestedValue(newSettings, path, value);
   return newSettings;
@@ -369,18 +343,14 @@ export function setPendingSettingValueAny(
 /**
  * Check if any modified settings require a restart
  */
-export function hasRestartRequiredSettings(
-  modifiedSettings: Set<string>,
-): boolean {
+export function hasRestartRequiredSettings(modifiedSettings: Set<string>): boolean {
   return Array.from(modifiedSettings).some((key) => requiresRestart(key));
 }
 
 /**
  * Get the restart required settings from a set of modified settings
  */
-export function getRestartRequiredFromModified(
-  modifiedSettings: Set<string>,
-): string[] {
+export function getRestartRequiredFromModified(modifiedSettings: Set<string>): string[] {
   return Array.from(modifiedSettings).filter((key) => requiresRestart(key));
 }
 
@@ -394,11 +364,8 @@ export function saveModifiedSettings(
   scope: LoadableSettingScope,
 ): void {
   modifiedSettings.forEach((settingKey) => {
-    const path = settingKey.split('.');
-    const value = getNestedValue(
-      pendingSettings as Record<string, unknown>,
-      path,
-    );
+    const path = settingKey.split(".");
+    const value = getNestedValue(pendingSettings as Record<string, unknown>, path);
 
     if (value === undefined) {
       return;
@@ -444,7 +411,7 @@ export function getDisplayValue(
 
   let valueString = String(value);
 
-  if (definition?.type === 'enum' && definition.options) {
+  if (definition?.type === "enum" && definition.options) {
     const option = definition.options?.find((option) => option.value === value);
     valueString = option?.label ?? `${value}`;
   }
diff --git a/packages/ui-gemini/src/utils/spawnWrapper.ts b/packages/ui-gemini/src/utils/spawnWrapper.ts
index 108f166dc..9985e6f57 100644
--- a/packages/ui-gemini/src/utils/spawnWrapper.ts
+++ b/packages/ui-gemini/src/utils/spawnWrapper.ts
@@ -4,6 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { spawn } from 'node:child_process';
+import { spawn } from "node:child_process";
 
 export const spawnWrapper = spawn;
diff --git a/packages/ui-gemini/src/utils/startupWarnings.test.ts b/packages/ui-gemini/src/utils/startupWarnings.test.ts
index d15f061cf..2c982f78c 100644
--- a/packages/ui-gemini/src/utils/startupWarnings.test.ts
+++ b/packages/ui-gemini/src/utils/startupWarnings.test.ts
@@ -4,28 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { getStartupWarnings } from './startupWarnings.js';
-import * as fs from 'node:fs/promises';
-import { getErrorMessage } from '@airiscode/gemini-cli-core';
+import * as fs from "node:fs/promises";
+import { getErrorMessage } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { getStartupWarnings } from "./startupWarnings.js";
 
-vi.mock('node:fs/promises', { spy: true });
-vi.mock('@airiscode/gemini-cli-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@airiscode/gemini-cli-core')>();
+vi.mock("node:fs/promises", { spy: true });
+vi.mock("@airiscode/gemini-cli-core", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@airiscode/gemini-cli-core")>();
   return {
     ...actual,
     getErrorMessage: vi.fn(),
   };
 });
 
-describe('startupWarnings', () => {
+describe("startupWarnings", () => {
   beforeEach(() => {
     vi.resetAllMocks();
   });
 
-  it('should return warnings from the file and delete it', async () => {
-    const mockWarnings = 'Warning 1\nWarning 2';
+  it("should return warnings from the file and delete it", async () => {
+    const mockWarnings = "Warning 1\nWarning 2";
     vi.mocked(fs.access).mockResolvedValue();
     vi.mocked(fs.readFile).mockResolvedValue(mockWarnings);
     vi.mocked(fs.unlink).mockResolvedValue();
@@ -35,12 +34,12 @@ describe('startupWarnings', () => {
     expect(fs.access).toHaveBeenCalled();
     expect(fs.readFile).toHaveBeenCalled();
     expect(fs.unlink).toHaveBeenCalled();
-    expect(warnings).toEqual(['Warning 1', 'Warning 2']);
+    expect(warnings).toEqual(["Warning 1", "Warning 2"]);
   });
 
-  it('should return an empty array if the file does not exist', async () => {
-    const error = new Error('File not found');
-    (error as Error & { code: string }).code = 'ENOENT';
+  it("should return an empty array if the file does not exist", async () => {
+    const error = new Error("File not found");
+    (error as Error & { code: string }).code = "ENOENT";
     vi.mocked(fs.access).mockRejectedValue(error);
 
     const warnings = await getStartupWarnings();
@@ -48,29 +47,24 @@ describe('startupWarnings', () => {
     expect(warnings).toEqual([]);
   });
 
-  it('should return an error message if reading the file fails', async () => {
-    const error = new Error('Permission denied');
+  it("should return an error message if reading the file fails", async () => {
+    const error = new Error("Permission denied");
     vi.mocked(fs.access).mockRejectedValue(error);
-    vi.mocked(getErrorMessage).mockReturnValue('Permission denied');
+    vi.mocked(getErrorMessage).mockReturnValue("Permission denied");
 
     const warnings = await getStartupWarnings();
 
-    expect(warnings).toEqual([
-      'Error checking/reading warnings file: Permission denied',
-    ]);
+    expect(warnings).toEqual(["Error checking/reading warnings file: Permission denied"]);
   });
 
-  it('should return a warning if deleting the file fails', async () => {
-    const mockWarnings = 'Warning 1';
+  it("should return a warning if deleting the file fails", async () => {
+    const mockWarnings = "Warning 1";
     vi.mocked(fs.access).mockResolvedValue();
     vi.mocked(fs.readFile).mockResolvedValue(mockWarnings);
-    vi.mocked(fs.unlink).mockRejectedValue(new Error('Permission denied'));
+    vi.mocked(fs.unlink).mockRejectedValue(new Error("Permission denied"));
 
     const warnings = await getStartupWarnings();
 
-    expect(warnings).toEqual([
-      'Warning 1',
-      'Warning: Could not delete temporary warnings file.',
-    ]);
+    expect(warnings).toEqual(["Warning 1", "Warning: Could not delete temporary warnings file."]);
   });
 });
diff --git a/packages/ui-gemini/src/utils/startupWarnings.ts b/packages/ui-gemini/src/utils/startupWarnings.ts
index 8f1851414..ea1f620b0 100644
--- a/packages/ui-gemini/src/utils/startupWarnings.ts
+++ b/packages/ui-gemini/src/utils/startupWarnings.ts
@@ -4,24 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import os from 'node:os';
-import { join as pathJoin } from 'node:path';
-import { getErrorMessage } from '@airiscode/gemini-cli-core';
+import fs from "node:fs/promises";
+import os from "node:os";
+import { join as pathJoin } from "node:path";
+import { getErrorMessage } from "@airiscode/gemini-cli-core";
 
-const warningsFilePath = pathJoin(os.tmpdir(), 'gemini-cli-warnings.txt');
+const warningsFilePath = pathJoin(os.tmpdir(), "gemini-cli-warnings.txt");
 
 export async function getStartupWarnings(): Promise<string[]> {
   try {
     await fs.access(warningsFilePath); // Check if file exists
-    const warningsContent = await fs.readFile(warningsFilePath, 'utf-8');
-    const warnings = warningsContent
-      .split('\n')
-      .filter((line) => line.trim() !== '');
+    const warningsContent = await fs.readFile(warningsFilePath, "utf-8");
+    const warnings = warningsContent.split("\n").filter((line) => line.trim() !== "");
     try {
       await fs.unlink(warningsFilePath);
     } catch {
-      warnings.push('Warning: Could not delete temporary warnings file.');
+      warnings.push("Warning: Could not delete temporary warnings file.");
     }
     return warnings;
   } catch (err: unknown) {
@@ -31,7 +29,7 @@ export async function getStartupWarnings(): Promise<string[]> {
     // However, the original logic returned an error message for any fs.existsSync failure.
     // To maintain closer parity while making it async, we'll check the error code.
     // ENOENT is "Error NO ENTry" (file not found).
-    if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
+    if (err instanceof Error && "code" in err && err.code === "ENOENT") {
       return []; // File not found, no warnings to return.
     }
     // For other errors (permissions, etc.), return the error message.
diff --git a/packages/ui-gemini/src/utils/updateEventEmitter.test.ts b/packages/ui-gemini/src/utils/updateEventEmitter.test.ts
index a91622a18..2d8d71ef9 100644
--- a/packages/ui-gemini/src/utils/updateEventEmitter.test.ts
+++ b/packages/ui-gemini/src/utils/updateEventEmitter.test.ts
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi } from 'vitest';
-import { updateEventEmitter } from './updateEventEmitter.js';
+import { describe, expect, it, vi } from "vitest";
+import { updateEventEmitter } from "./updateEventEmitter.js";
 
-describe('updateEventEmitter', () => {
-  it('should allow registering and emitting events', () => {
+describe("updateEventEmitter", () => {
+  it("should allow registering and emitting events", () => {
     const callback = vi.fn();
-    const eventName = 'test-event';
+    const eventName = "test-event";
 
     updateEventEmitter.on(eventName, callback);
-    updateEventEmitter.emit(eventName, 'test-data');
+    updateEventEmitter.emit(eventName, "test-data");
 
-    expect(callback).toHaveBeenCalledWith('test-data');
+    expect(callback).toHaveBeenCalledWith("test-data");
 
     updateEventEmitter.off(eventName, callback);
   });
diff --git a/packages/ui-gemini/src/utils/updateEventEmitter.ts b/packages/ui-gemini/src/utils/updateEventEmitter.ts
index 1c6927725..dcc432cd1 100644
--- a/packages/ui-gemini/src/utils/updateEventEmitter.ts
+++ b/packages/ui-gemini/src/utils/updateEventEmitter.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EventEmitter } from 'node:events';
+import { EventEmitter } from "node:events";
 
 /**
  * A shared event emitter for application-wide communication
diff --git a/packages/ui-gemini/src/utils/userStartupWarnings.test.ts b/packages/ui-gemini/src/utils/userStartupWarnings.test.ts
index 5f87f286c..2a81f0bf1 100644
--- a/packages/ui-gemini/src/utils/userStartupWarnings.test.ts
+++ b/packages/ui-gemini/src/utils/userStartupWarnings.test.ts
@@ -4,14 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { getUserStartupWarnings } from './userStartupWarnings.js';
-import * as os from 'node:os';
-import fs from 'node:fs/promises';
-import path from 'node:path';
+import fs from "node:fs/promises";
+import * as os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { getUserStartupWarnings } from "./userStartupWarnings.js";
 
 // Mock os.homedir to control the home directory in tests
-vi.mock('os', async (importOriginal) => {
+vi.mock("os", async (importOriginal) => {
   const actualOs = await importOriginal<typeof os>();
   return {
     ...actualOs,
@@ -19,13 +19,13 @@ vi.mock('os', async (importOriginal) => {
   };
 });
 
-describe('getUserStartupWarnings', () => {
+describe("getUserStartupWarnings", () => {
   let testRootDir: string;
   let homeDir: string;
 
   beforeEach(async () => {
-    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), 'warnings-test-'));
-    homeDir = path.join(testRootDir, 'home');
+    testRootDir = await fs.mkdtemp(path.join(os.tmpdir(), "warnings-test-"));
+    homeDir = path.join(testRootDir, "home");
     await fs.mkdir(homeDir, { recursive: true });
     vi.mocked(os.homedir).mockReturnValue(homeDir);
   });
@@ -35,52 +35,41 @@ describe('getUserStartupWarnings', () => {
     vi.clearAllMocks();
   });
 
-  describe('home directory check', () => {
-    it('should return a warning when running in home directory', async () => {
+  describe("home directory check", () => {
+    it("should return a warning when running in home directory", async () => {
       const warnings = await getUserStartupWarnings(homeDir);
-      expect(warnings).toContainEqual(
-        expect.stringContaining('home directory'),
-      );
+      expect(warnings).toContainEqual(expect.stringContaining("home directory"));
     });
 
-    it('should not return a warning when running in a project directory', async () => {
-      const projectDir = path.join(testRootDir, 'project');
+    it("should not return a warning when running in a project directory", async () => {
+      const projectDir = path.join(testRootDir, "project");
       await fs.mkdir(projectDir);
       const warnings = await getUserStartupWarnings(projectDir);
-      expect(warnings).not.toContainEqual(
-        expect.stringContaining('home directory'),
-      );
+      expect(warnings).not.toContainEqual(expect.stringContaining("home directory"));
     });
   });
 
-  describe('root directory check', () => {
-    it('should return a warning when running in a root directory', async () => {
+  describe("root directory check", () => {
+    it("should return a warning when running in a root directory", async () => {
       const rootDir = path.parse(testRootDir).root;
       const warnings = await getUserStartupWarnings(rootDir);
-      expect(warnings).toContainEqual(
-        expect.stringContaining('root directory'),
-      );
-      expect(warnings).toContainEqual(
-        expect.stringContaining('folder structure will be used'),
-      );
+      expect(warnings).toContainEqual(expect.stringContaining("root directory"));
+      expect(warnings).toContainEqual(expect.stringContaining("folder structure will be used"));
     });
 
-    it('should not return a warning when running in a non-root directory', async () => {
-      const projectDir = path.join(testRootDir, 'project');
+    it("should not return a warning when running in a non-root directory", async () => {
+      const projectDir = path.join(testRootDir, "project");
       await fs.mkdir(projectDir);
       const warnings = await getUserStartupWarnings(projectDir);
-      expect(warnings).not.toContainEqual(
-        expect.stringContaining('root directory'),
-      );
+      expect(warnings).not.toContainEqual(expect.stringContaining("root directory"));
     });
   });
 
-  describe('error handling', () => {
-    it('should handle errors when checking directory', async () => {
-      const nonExistentPath = path.join(testRootDir, 'non-existent');
+  describe("error handling", () => {
+    it("should handle errors when checking directory", async () => {
+      const nonExistentPath = path.join(testRootDir, "non-existent");
       const warnings = await getUserStartupWarnings(nonExistentPath);
-      const expectedWarning =
-        'Could not verify the current directory due to a file system error.';
+      const expectedWarning = "Could not verify the current directory due to a file system error.";
       expect(warnings).toEqual([expectedWarning, expectedWarning]);
     });
   });
diff --git a/packages/ui-gemini/src/utils/userStartupWarnings.ts b/packages/ui-gemini/src/utils/userStartupWarnings.ts
index d35529078..455060472 100644
--- a/packages/ui-gemini/src/utils/userStartupWarnings.ts
+++ b/packages/ui-gemini/src/utils/userStartupWarnings.ts
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import fs from 'node:fs/promises';
-import * as os from 'node:os';
-import path from 'node:path';
+import fs from "node:fs/promises";
+import * as os from "node:os";
+import path from "node:path";
 
 type WarningCheck = {
   id: string;
@@ -15,7 +15,7 @@ type WarningCheck = {
 
 // Individual warning checks
 const homeDirectoryCheck: WarningCheck = {
-  id: 'home-directory',
+  id: "home-directory",
   check: async (workspaceRoot: string) => {
     try {
       const [workspaceRealPath, homeRealPath] = await Promise.all([
@@ -24,22 +24,22 @@ const homeDirectoryCheck: WarningCheck = {
       ]);
 
       if (workspaceRealPath === homeRealPath) {
-        return 'You are running Gemini CLI in your home directory. It is recommended to run in a project-specific directory.';
+        return "You are running Gemini CLI in your home directory. It is recommended to run in a project-specific directory.";
       }
       return null;
     } catch (_err: unknown) {
-      return 'Could not verify the current directory due to a file system error.';
+      return "Could not verify the current directory due to a file system error.";
     }
   },
 };
 
 const rootDirectoryCheck: WarningCheck = {
-  id: 'root-directory',
+  id: "root-directory",
   check: async (workspaceRoot: string) => {
     try {
       const workspaceRealPath = await fs.realpath(workspaceRoot);
       const errorMessage =
-        'Warning: You are running Gemini CLI in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.';
+        "Warning: You are running Gemini CLI in the root directory. Your entire folder structure will be used for context. It is strongly recommended to run in a project-specific directory.";
 
       // Check for Unix root directory
       if (path.dirname(workspaceRealPath) === workspaceRealPath) {
@@ -48,22 +48,17 @@ const rootDirectoryCheck: WarningCheck = {
 
       return null;
     } catch (_err: unknown) {
-      return 'Could not verify the current directory due to a file system error.';
+      return "Could not verify the current directory due to a file system error.";
     }
   },
 };
 
 // All warning checks
-const WARNING_CHECKS: readonly WarningCheck[] = [
-  homeDirectoryCheck,
-  rootDirectoryCheck,
-];
+const WARNING_CHECKS: readonly WarningCheck[] = [homeDirectoryCheck, rootDirectoryCheck];
 
 export async function getUserStartupWarnings(
   workspaceRoot: string = process.cwd(),
 ): Promise<string[]> {
-  const results = await Promise.all(
-    WARNING_CHECKS.map((check) => check.check(workspaceRoot)),
-  );
+  const results = await Promise.all(WARNING_CHECKS.map((check) => check.check(workspaceRoot)));
   return results.filter((msg) => msg !== null);
 }
diff --git a/packages/ui-gemini/src/utils/windowTitle.test.ts b/packages/ui-gemini/src/utils/windowTitle.test.ts
index eed30f676..1b9db0992 100644
--- a/packages/ui-gemini/src/utils/windowTitle.test.ts
+++ b/packages/ui-gemini/src/utils/windowTitle.test.ts
@@ -4,56 +4,56 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { computeWindowTitle } from './windowTitle.js';
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { computeWindowTitle } from "./windowTitle.js";
 
-describe('computeWindowTitle', () => {
+describe("computeWindowTitle", () => {
   let originalEnv: NodeJS.ProcessEnv;
 
   beforeEach(() => {
     originalEnv = process.env;
-    vi.stubEnv('CLI_TITLE', undefined);
+    vi.stubEnv("CLI_TITLE", undefined);
   });
 
   afterEach(() => {
     process.env = originalEnv;
   });
 
-  it('should use default Gemini title when CLI_TITLE is not set', () => {
-    const result = computeWindowTitle('my-project');
-    expect(result).toBe('Gemini - my-project');
+  it("should use default Gemini title when CLI_TITLE is not set", () => {
+    const result = computeWindowTitle("my-project");
+    expect(result).toBe("Gemini - my-project");
   });
 
-  it('should use CLI_TITLE environment variable when set', () => {
-    vi.stubEnv('CLI_TITLE', 'Custom Title');
-    const result = computeWindowTitle('my-project');
-    expect(result).toBe('Custom Title');
+  it("should use CLI_TITLE environment variable when set", () => {
+    vi.stubEnv("CLI_TITLE", "Custom Title");
+    const result = computeWindowTitle("my-project");
+    expect(result).toBe("Custom Title");
   });
 
-  it('should remove control characters from title', () => {
-    vi.stubEnv('CLI_TITLE', 'Title\x1b[31m with \x07 control chars');
-    const result = computeWindowTitle('my-project');
+  it("should remove control characters from title", () => {
+    vi.stubEnv("CLI_TITLE", "Title\x1b[31m with \x07 control chars");
+    const result = computeWindowTitle("my-project");
     // The \x1b[31m (ANSI escape sequence) and \x07 (bell character) should be removed
-    expect(result).toBe('Title[31m with  control chars');
+    expect(result).toBe("Title[31m with  control chars");
   });
 
-  it('should handle folder names with control characters', () => {
-    const result = computeWindowTitle('project\x07name');
-    expect(result).toBe('Gemini - projectname');
+  it("should handle folder names with control characters", () => {
+    const result = computeWindowTitle("project\x07name");
+    expect(result).toBe("Gemini - projectname");
   });
 
-  it('should handle empty folder name', () => {
-    const result = computeWindowTitle('');
-    expect(result).toBe('Gemini - ');
+  it("should handle empty folder name", () => {
+    const result = computeWindowTitle("");
+    expect(result).toBe("Gemini - ");
   });
 
-  it('should handle folder names with spaces', () => {
-    const result = computeWindowTitle('my project');
-    expect(result).toBe('Gemini - my project');
+  it("should handle folder names with spaces", () => {
+    const result = computeWindowTitle("my project");
+    expect(result).toBe("Gemini - my project");
   });
 
-  it('should handle folder names with special characters', () => {
-    const result = computeWindowTitle('project-name_v1.0');
-    expect(result).toBe('Gemini - project-name_v1.0');
+  it("should handle folder names with special characters", () => {
+    const result = computeWindowTitle("project-name_v1.0");
+    expect(result).toBe("Gemini - project-name_v1.0");
   });
 });
diff --git a/packages/ui-gemini/src/utils/windowTitle.ts b/packages/ui-gemini/src/utils/windowTitle.ts
index 7ff462494..2cb0f0440 100644
--- a/packages/ui-gemini/src/utils/windowTitle.ts
+++ b/packages/ui-gemini/src/utils/windowTitle.ts
@@ -11,12 +11,12 @@
  * @returns The computed window title, either from CLI_TITLE environment variable or the default Gemini title
  */
 export function computeWindowTitle(folderName: string): string {
-  const title = process.env['CLI_TITLE'] || `Gemini - ${folderName}`;
+  const title = process.env["CLI_TITLE"] || `Gemini - ${folderName}`;
 
   // Remove control characters that could cause issues in terminal titles
   return title.replace(
     // eslint-disable-next-line no-control-regex
     /[\x00-\x1F\x7F]/g,
-    '',
+    "",
   );
 }
diff --git a/packages/ui-gemini/src/validateNonInterActiveAuth.test.ts b/packages/ui-gemini/src/validateNonInterActiveAuth.test.ts
index 89ce21d7d..51199fcb6 100644
--- a/packages/ui-gemini/src/validateNonInterActiveAuth.test.ts
+++ b/packages/ui-gemini/src/validateNonInterActiveAuth.test.ts
@@ -4,27 +4,27 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type MockInstance,
-  type Mock,
-} from 'vitest';
-import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
+import type { Config } from "@airiscode/gemini-cli-core";
 import {
   AuthType,
-  OutputFormat,
-  makeFakeConfig,
   debugLogger,
   ExitCodes,
-} from '@airiscode/gemini-cli-core';
-import type { Config } from '@airiscode/gemini-cli-core';
-import * as auth from './config/auth.js';
-import { type LoadedSettings } from './config/settings.js';
+  makeFakeConfig,
+  OutputFormat,
+} from "@airiscode/gemini-cli-core";
+import {
+  afterEach,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  type Mock,
+  type MockInstance,
+  vi,
+} from "vitest";
+import * as auth from "./config/auth.js";
+import { type LoadedSettings } from "./config/settings.js";
+import { validateNonInteractiveAuth } from "./validateNonInterActiveAuth.js";
 
 function createLocalMockConfig(overrides: Partial<Config> = {}): Config {
   const config = makeFakeConfig();
@@ -32,7 +32,7 @@ function createLocalMockConfig(overrides: Partial<Config> = {}): Config {
   return config;
 }
 
-describe('validateNonInterActiveAuth', () => {
+describe("validateNonInterActiveAuth", () => {
   let originalEnvGeminiApiKey: string | undefined;
   let originalEnvVertexAi: string | undefined;
   let originalEnvGcp: string | undefined;
@@ -43,28 +43,26 @@ describe('validateNonInterActiveAuth', () => {
   let mockSettings: LoadedSettings;
 
   beforeEach(() => {
-    originalEnvGeminiApiKey = process.env['GEMINI_API_KEY'];
-    originalEnvVertexAi = process.env['GOOGLE_GENAI_USE_VERTEXAI'];
-    originalEnvGcp = process.env['GOOGLE_GENAI_USE_GCA'];
-    delete process.env['GEMINI_API_KEY'];
-    delete process.env['GOOGLE_GENAI_USE_VERTEXAI'];
-    delete process.env['GOOGLE_GENAI_USE_GCA'];
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    debugLoggerErrorSpy = vi
-      .spyOn(debugLogger, 'error')
-      .mockImplementation(() => {});
+    originalEnvGeminiApiKey = process.env["GEMINI_API_KEY"];
+    originalEnvVertexAi = process.env["GOOGLE_GENAI_USE_VERTEXAI"];
+    originalEnvGcp = process.env["GOOGLE_GENAI_USE_GCA"];
+    delete process.env["GEMINI_API_KEY"];
+    delete process.env["GOOGLE_GENAI_USE_VERTEXAI"];
+    delete process.env["GOOGLE_GENAI_USE_GCA"];
+    consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+    debugLoggerErrorSpy = vi.spyOn(debugLogger, "error").mockImplementation(() => {});
     processExitSpy = vi
-      .spyOn(process, 'exit')
+      .spyOn(process, "exit")
       .mockImplementation((code?: string | number | null | undefined) => {
         throw new Error(`process.exit(${code}) called`);
       });
-    vi.spyOn(auth, 'validateAuthMethod').mockReturnValue(null);
-    refreshAuthMock = vi.fn().mockImplementation(async () => 'refreshed');
+    vi.spyOn(auth, "validateAuthMethod").mockReturnValue(null);
+    refreshAuthMock = vi.fn().mockImplementation(async () => "refreshed");
     mockSettings = {
-      system: { path: '', settings: {} },
-      systemDefaults: { path: '', settings: {} },
-      user: { path: '', settings: {} },
-      workspace: { path: '', settings: {} },
+      system: { path: "", settings: {} },
+      systemDefaults: { path: "", settings: {} },
+      user: { path: "", settings: {} },
+      workspace: { path: "", settings: {} },
       errors: [],
       setValue: vi.fn(),
       merged: {
@@ -83,165 +81,121 @@ describe('validateNonInterActiveAuth', () => {
 
   afterEach(() => {
     if (originalEnvGeminiApiKey !== undefined) {
-      process.env['GEMINI_API_KEY'] = originalEnvGeminiApiKey;
+      process.env["GEMINI_API_KEY"] = originalEnvGeminiApiKey;
     } else {
-      delete process.env['GEMINI_API_KEY'];
+      delete process.env["GEMINI_API_KEY"];
     }
     if (originalEnvVertexAi !== undefined) {
-      process.env['GOOGLE_GENAI_USE_VERTEXAI'] = originalEnvVertexAi;
+      process.env["GOOGLE_GENAI_USE_VERTEXAI"] = originalEnvVertexAi;
     } else {
-      delete process.env['GOOGLE_GENAI_USE_VERTEXAI'];
+      delete process.env["GOOGLE_GENAI_USE_VERTEXAI"];
     }
     if (originalEnvGcp !== undefined) {
-      process.env['GOOGLE_GENAI_USE_GCA'] = originalEnvGcp;
+      process.env["GOOGLE_GENAI_USE_GCA"] = originalEnvGcp;
     } else {
-      delete process.env['GOOGLE_GENAI_USE_GCA'];
+      delete process.env["GOOGLE_GENAI_USE_GCA"];
     }
     vi.restoreAllMocks();
   });
 
-  it('exits if no auth type is configured or env vars set', async () => {
+  it("exits if no auth type is configured or env vars set", async () => {
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
       getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
-      getContentGeneratorConfig: vi
-        .fn()
-        .mockReturnValue({ authType: undefined }),
+      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: undefined }),
     });
     try {
-      await validateNonInteractiveAuth(
-        undefined,
-        undefined,
-        nonInteractiveConfig,
-        mockSettings,
-      );
-      expect.fail('Should have exited');
+      await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
+      expect.fail("Should have exited");
     } catch (e) {
       expect((e as Error).message).toContain(
         `process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`,
       );
     }
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Please set an Auth method'),
-    );
-    expect(processExitSpy).toHaveBeenCalledWith(
-      ExitCodes.FATAL_AUTHENTICATION_ERROR,
+      expect.stringContaining("Please set an Auth method"),
     );
+    expect(processExitSpy).toHaveBeenCalledWith(ExitCodes.FATAL_AUTHENTICATION_ERROR);
   });
 
-  it('uses LOGIN_WITH_GOOGLE if GOOGLE_GENAI_USE_GCA is set', async () => {
-    process.env['GOOGLE_GENAI_USE_GCA'] = 'true';
+  it("uses LOGIN_WITH_GOOGLE if GOOGLE_GENAI_USE_GCA is set", async () => {
+    process.env["GOOGLE_GENAI_USE_GCA"] = "true";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE);
   });
 
-  it('uses USE_GEMINI if GEMINI_API_KEY is set', async () => {
-    process.env['GEMINI_API_KEY'] = 'fake-key';
+  it("uses USE_GEMINI if GEMINI_API_KEY is set", async () => {
+    process.env["GEMINI_API_KEY"] = "fake-key";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.USE_GEMINI);
   });
 
-  it('uses USE_VERTEX_AI if GOOGLE_GENAI_USE_VERTEXAI is true (with GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION)', async () => {
-    process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
-    process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
+  it("uses USE_VERTEX_AI if GOOGLE_GENAI_USE_VERTEXAI is true (with GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION)", async () => {
+    process.env["GOOGLE_GENAI_USE_VERTEXAI"] = "true";
+    process.env["GOOGLE_CLOUD_PROJECT"] = "test-project";
+    process.env["GOOGLE_CLOUD_LOCATION"] = "us-central1";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.USE_VERTEX_AI);
   });
 
-  it('uses USE_VERTEX_AI if GOOGLE_GENAI_USE_VERTEXAI is true and GOOGLE_API_KEY is set', async () => {
-    process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
-    process.env['GOOGLE_API_KEY'] = 'vertex-api-key';
+  it("uses USE_VERTEX_AI if GOOGLE_GENAI_USE_VERTEXAI is true and GOOGLE_API_KEY is set", async () => {
+    process.env["GOOGLE_GENAI_USE_VERTEXAI"] = "true";
+    process.env["GOOGLE_API_KEY"] = "vertex-api-key";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.USE_VERTEX_AI);
   });
 
-  it('uses LOGIN_WITH_GOOGLE if GOOGLE_GENAI_USE_GCA is set, even with other env vars', async () => {
-    process.env['GOOGLE_GENAI_USE_GCA'] = 'true';
-    process.env['GEMINI_API_KEY'] = 'fake-key';
-    process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
-    process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
+  it("uses LOGIN_WITH_GOOGLE if GOOGLE_GENAI_USE_GCA is set, even with other env vars", async () => {
+    process.env["GOOGLE_GENAI_USE_GCA"] = "true";
+    process.env["GEMINI_API_KEY"] = "fake-key";
+    process.env["GOOGLE_GENAI_USE_VERTEXAI"] = "true";
+    process.env["GOOGLE_CLOUD_PROJECT"] = "test-project";
+    process.env["GOOGLE_CLOUD_LOCATION"] = "us-central1";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE);
   });
 
-  it('uses USE_VERTEX_AI if both GEMINI_API_KEY and GOOGLE_GENAI_USE_VERTEXAI are set', async () => {
-    process.env['GEMINI_API_KEY'] = 'fake-key';
-    process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
-    process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
+  it("uses USE_VERTEX_AI if both GEMINI_API_KEY and GOOGLE_GENAI_USE_VERTEXAI are set", async () => {
+    process.env["GEMINI_API_KEY"] = "fake-key";
+    process.env["GOOGLE_GENAI_USE_VERTEXAI"] = "true";
+    process.env["GOOGLE_CLOUD_PROJECT"] = "test-project";
+    process.env["GOOGLE_CLOUD_LOCATION"] = "us-central1";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.USE_VERTEX_AI);
   });
 
-  it('uses USE_GEMINI if GOOGLE_GENAI_USE_VERTEXAI is false, GEMINI_API_KEY is set, and project/location are available', async () => {
-    process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'false';
-    process.env['GEMINI_API_KEY'] = 'fake-key';
-    process.env['GOOGLE_CLOUD_PROJECT'] = 'test-project';
-    process.env['GOOGLE_CLOUD_LOCATION'] = 'us-central1';
+  it("uses USE_GEMINI if GOOGLE_GENAI_USE_VERTEXAI is false, GEMINI_API_KEY is set, and project/location are available", async () => {
+    process.env["GOOGLE_GENAI_USE_VERTEXAI"] = "false";
+    process.env["GEMINI_API_KEY"] = "fake-key";
+    process.env["GOOGLE_CLOUD_PROJECT"] = "test-project";
+    process.env["GOOGLE_CLOUD_LOCATION"] = "us-central1";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.USE_GEMINI);
   });
 
-  it('uses configuredAuthType over environment variables', async () => {
-    process.env['GEMINI_API_KEY'] = 'fake-key';
+  it("uses configuredAuthType over environment variables", async () => {
+    process.env["GEMINI_API_KEY"] = "fake-key";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
@@ -254,15 +208,13 @@ describe('validateNonInterActiveAuth', () => {
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE);
   });
 
-  it('exits if validateAuthMethod returns error', async () => {
+  it("exits if validateAuthMethod returns error", async () => {
     // Mock validateAuthMethod to return error
-    vi.spyOn(auth, 'validateAuthMethod').mockReturnValue('Auth error!');
+    vi.spyOn(auth, "validateAuthMethod").mockReturnValue("Auth error!");
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
       getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
-      getContentGeneratorConfig: vi
-        .fn()
-        .mockReturnValue({ authType: undefined }),
+      getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: undefined }),
     });
     try {
       await validateNonInteractiveAuth(
@@ -271,30 +223,28 @@ describe('validateNonInterActiveAuth', () => {
         nonInteractiveConfig,
         mockSettings,
       );
-      expect.fail('Should have exited');
+      expect.fail("Should have exited");
     } catch (e) {
       expect((e as Error).message).toContain(
         `process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`,
       );
     }
-    expect(debugLoggerErrorSpy).toHaveBeenCalledWith('Auth error!');
-    expect(processExitSpy).toHaveBeenCalledWith(
-      ExitCodes.FATAL_AUTHENTICATION_ERROR,
-    );
+    expect(debugLoggerErrorSpy).toHaveBeenCalledWith("Auth error!");
+    expect(processExitSpy).toHaveBeenCalledWith(ExitCodes.FATAL_AUTHENTICATION_ERROR);
   });
 
-  it('skips validation if useExternalAuth is true', async () => {
+  it("skips validation if useExternalAuth is true", async () => {
     // Mock validateAuthMethod to return error to ensure it's not being called
     const validateAuthMethodSpy = vi
-      .spyOn(auth, 'validateAuthMethod')
-      .mockReturnValue('Auth error!');
+      .spyOn(auth, "validateAuthMethod")
+      .mockReturnValue("Auth error!");
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
     // Even with an invalid auth type, it should not exit
     // because validation is skipped.
     await validateNonInteractiveAuth(
-      'invalid-auth-type' as AuthType,
+      "invalid-auth-type" as AuthType,
       true, // useExternalAuth = true
       nonInteractiveConfig,
       mockSettings,
@@ -304,27 +254,21 @@ describe('validateNonInterActiveAuth', () => {
     expect(debugLoggerErrorSpy).not.toHaveBeenCalled();
     expect(processExitSpy).not.toHaveBeenCalled();
     // We still expect refreshAuth to be called with the (invalid) type
-    expect(refreshAuthMock).toHaveBeenCalledWith('invalid-auth-type');
+    expect(refreshAuthMock).toHaveBeenCalledWith("invalid-auth-type");
   });
 
-  it('succeeds if effectiveAuthType matches enforcedAuthType', async () => {
+  it("succeeds if effectiveAuthType matches enforcedAuthType", async () => {
     mockSettings.merged.security!.auth!.enforcedType = AuthType.USE_GEMINI;
-    process.env['GEMINI_API_KEY'] = 'fake-key';
+    process.env["GEMINI_API_KEY"] = "fake-key";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
     });
-    await validateNonInteractiveAuth(
-      undefined,
-      undefined,
-      nonInteractiveConfig,
-      mockSettings,
-    );
+    await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
     expect(refreshAuthMock).toHaveBeenCalledWith(AuthType.USE_GEMINI);
   });
 
-  it('exits if configuredAuthType does not match enforcedAuthType', async () => {
-    mockSettings.merged.security!.auth!.enforcedType =
-      AuthType.LOGIN_WITH_GOOGLE;
+  it("exits if configuredAuthType does not match enforcedAuthType", async () => {
+    mockSettings.merged.security!.auth!.enforcedType = AuthType.LOGIN_WITH_GOOGLE;
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
       getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
@@ -336,7 +280,7 @@ describe('validateNonInterActiveAuth', () => {
         nonInteractiveConfig,
         mockSettings,
       );
-      expect.fail('Should have exited');
+      expect.fail("Should have exited");
     } catch (e) {
       expect((e as Error).message).toContain(
         `process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`,
@@ -345,27 +289,19 @@ describe('validateNonInterActiveAuth', () => {
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
       "The enforced authentication type is 'oauth-personal', but the current type is 'gemini-api-key'. Please re-authenticate with the correct type.",
     );
-    expect(processExitSpy).toHaveBeenCalledWith(
-      ExitCodes.FATAL_AUTHENTICATION_ERROR,
-    );
+    expect(processExitSpy).toHaveBeenCalledWith(ExitCodes.FATAL_AUTHENTICATION_ERROR);
   });
 
-  it('exits if auth from env var does not match enforcedAuthType', async () => {
-    mockSettings.merged.security!.auth!.enforcedType =
-      AuthType.LOGIN_WITH_GOOGLE;
-    process.env['GEMINI_API_KEY'] = 'fake-key';
+  it("exits if auth from env var does not match enforcedAuthType", async () => {
+    mockSettings.merged.security!.auth!.enforcedType = AuthType.LOGIN_WITH_GOOGLE;
+    process.env["GEMINI_API_KEY"] = "fake-key";
     const nonInteractiveConfig = createLocalMockConfig({
       refreshAuth: refreshAuthMock,
       getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
     });
     try {
-      await validateNonInteractiveAuth(
-        undefined,
-        undefined,
-        nonInteractiveConfig,
-        mockSettings,
-      );
-      expect.fail('Should have exited');
+      await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
+      expect.fail("Should have exited");
     } catch (e) {
       expect((e as Error).message).toContain(
         `process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`,
@@ -374,43 +310,30 @@ describe('validateNonInterActiveAuth', () => {
     expect(debugLoggerErrorSpy).toHaveBeenCalledWith(
       "The enforced authentication type is 'oauth-personal', but the current type is 'gemini-api-key'. Please re-authenticate with the correct type.",
     );
-    expect(processExitSpy).toHaveBeenCalledWith(
-      ExitCodes.FATAL_AUTHENTICATION_ERROR,
-    );
+    expect(processExitSpy).toHaveBeenCalledWith(ExitCodes.FATAL_AUTHENTICATION_ERROR);
   });
 
-  describe('JSON output mode', () => {
+  describe("JSON output mode", () => {
     it(`prints JSON error when no auth is configured and exits with code ${ExitCodes.FATAL_AUTHENTICATION_ERROR}`, async () => {
       const nonInteractiveConfig = createLocalMockConfig({
         refreshAuth: refreshAuthMock,
         getOutputFormat: vi.fn().mockReturnValue(OutputFormat.JSON),
-        getContentGeneratorConfig: vi
-          .fn()
-          .mockReturnValue({ authType: undefined }),
+        getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: undefined }),
       });
 
       let thrown: Error | undefined;
       try {
-        await validateNonInteractiveAuth(
-          undefined,
-          undefined,
-          nonInteractiveConfig,
-          mockSettings,
-        );
+        await validateNonInteractiveAuth(undefined, undefined, nonInteractiveConfig, mockSettings);
       } catch (e) {
         thrown = e as Error;
       }
 
-      expect(thrown?.message).toBe(
-        `process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`,
-      );
+      expect(thrown?.message).toBe(`process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`);
       const errorArg = consoleErrorSpy.mock.calls[0]?.[0] as string;
       const payload = JSON.parse(errorArg);
-      expect(payload.error.type).toBe('Error');
+      expect(payload.error.type).toBe("Error");
       expect(payload.error.code).toBe(ExitCodes.FATAL_AUTHENTICATION_ERROR);
-      expect(payload.error.message).toContain(
-        'Please set an Auth method in your',
-      );
+      expect(payload.error.message).toContain("Please set an Auth method in your");
     });
 
     it(`prints JSON error when enforced auth mismatches current auth and exits with code ${ExitCodes.FATAL_AUTHENTICATION_ERROR}`, async () => {
@@ -418,9 +341,7 @@ describe('validateNonInterActiveAuth', () => {
       const nonInteractiveConfig = createLocalMockConfig({
         refreshAuth: refreshAuthMock,
         getOutputFormat: vi.fn().mockReturnValue(OutputFormat.JSON),
-        getContentGeneratorConfig: vi
-          .fn()
-          .mockReturnValue({ authType: undefined }),
+        getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: undefined }),
       });
 
       let thrown: Error | undefined;
@@ -435,13 +356,11 @@ describe('validateNonInterActiveAuth', () => {
         thrown = e as Error;
       }
 
-      expect(thrown?.message).toBe(
-        `process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`,
-      );
+      expect(thrown?.message).toBe(`process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`);
       {
         const errorArg = consoleErrorSpy.mock.calls[0]?.[0] as string;
         const payload = JSON.parse(errorArg);
-        expect(payload.error.type).toBe('Error');
+        expect(payload.error.type).toBe("Error");
         expect(payload.error.code).toBe(ExitCodes.FATAL_AUTHENTICATION_ERROR);
         expect(payload.error.message).toContain(
           "The enforced authentication type is 'gemini-api-key', but the current type is 'oauth-personal'. Please re-authenticate with the correct type.",
@@ -450,15 +369,13 @@ describe('validateNonInterActiveAuth', () => {
     });
 
     it(`prints JSON error when validateAuthMethod fails and exits with code ${ExitCodes.FATAL_AUTHENTICATION_ERROR}`, async () => {
-      vi.spyOn(auth, 'validateAuthMethod').mockReturnValue('Auth error!');
-      process.env['GEMINI_API_KEY'] = 'fake-key';
+      vi.spyOn(auth, "validateAuthMethod").mockReturnValue("Auth error!");
+      process.env["GEMINI_API_KEY"] = "fake-key";
 
       const nonInteractiveConfig = createLocalMockConfig({
         refreshAuth: refreshAuthMock,
         getOutputFormat: vi.fn().mockReturnValue(OutputFormat.JSON),
-        getContentGeneratorConfig: vi
-          .fn()
-          .mockReturnValue({ authType: undefined }),
+        getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: undefined }),
       });
 
       let thrown: Error | undefined;
@@ -473,15 +390,13 @@ describe('validateNonInterActiveAuth', () => {
         thrown = e as Error;
       }
 
-      expect(thrown?.message).toBe(
-        `process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`,
-      );
+      expect(thrown?.message).toBe(`process.exit(${ExitCodes.FATAL_AUTHENTICATION_ERROR}) called`);
       {
         const errorArg = consoleErrorSpy.mock.calls[0]?.[0] as string;
         const payload = JSON.parse(errorArg);
-        expect(payload.error.type).toBe('Error');
+        expect(payload.error.type).toBe("Error");
         expect(payload.error.code).toBe(ExitCodes.FATAL_AUTHENTICATION_ERROR);
-        expect(payload.error.message).toBe('Auth error!');
+        expect(payload.error.message).toBe("Auth error!");
       }
     });
   });
diff --git a/packages/ui-gemini/src/validateNonInterActiveAuth.ts b/packages/ui-gemini/src/validateNonInterActiveAuth.ts
index de62ece3d..935a39bce 100644
--- a/packages/ui-gemini/src/validateNonInterActiveAuth.ts
+++ b/packages/ui-gemini/src/validateNonInterActiveAuth.ts
@@ -4,27 +4,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@airiscode/gemini-cli-core';
-import {
-  AuthType,
-  debugLogger,
-  OutputFormat,
-  ExitCodes,
-} from '@airiscode/gemini-cli-core';
-import { USER_SETTINGS_PATH } from './config/settings.js';
-import { validateAuthMethod } from './config/auth.js';
-import { type LoadedSettings } from './config/settings.js';
-import { handleError } from './utils/errors.js';
-import { runExitCleanup } from './utils/cleanup.js';
+import type { Config } from "@airiscode/gemini-cli-core";
+import { AuthType, debugLogger, ExitCodes, OutputFormat } from "@airiscode/gemini-cli-core";
+import { validateAuthMethod } from "./config/auth.js";
+import { type LoadedSettings, USER_SETTINGS_PATH } from "./config/settings.js";
+import { runExitCleanup } from "./utils/cleanup.js";
+import { handleError } from "./utils/errors.js";
 
 function getAuthTypeFromEnv(): AuthType | undefined {
-  if (process.env['GOOGLE_GENAI_USE_GCA'] === 'true') {
+  if (process.env["GOOGLE_GENAI_USE_GCA"] === "true") {
     return AuthType.LOGIN_WITH_GOOGLE;
   }
-  if (process.env['GOOGLE_GENAI_USE_VERTEXAI'] === 'true') {
+  if (process.env["GOOGLE_GENAI_USE_VERTEXAI"] === "true") {
     return AuthType.USE_VERTEX_AI;
   }
-  if (process.env['GEMINI_API_KEY']) {
+  if (process.env["GEMINI_API_KEY"]) {
     return AuthType.USE_GEMINI;
   }
   return undefined;
diff --git a/packages/ui-gemini/src/zed-integration/acp.test.ts b/packages/ui-gemini/src/zed-integration/acp.test.ts
index 5554e2a65..e2aac21af 100644
--- a/packages/ui-gemini/src/zed-integration/acp.test.ts
+++ b/packages/ui-gemini/src/zed-integration/acp.test.ts
@@ -4,16 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
-import {
-  AgentSideConnection,
-  RequestError,
-  type Agent,
-  type Client,
-} from './acp.js';
-import { type ErrorResponse } from './schema.js';
-import { type MethodHandler } from './connection.js';
-import { ReadableStream, WritableStream } from 'node:stream/web';
+import { ReadableStream, WritableStream } from "node:stream/web";
+import { beforeEach, describe, expect, it, type Mock, vi } from "vitest";
+import { type Agent, AgentSideConnection, type Client, RequestError } from "./acp.js";
+import { type MethodHandler } from "./connection.js";
+import { type ErrorResponse } from "./schema.js";
 
 const mockConnectionConstructor = vi.hoisted(() =>
   vi.fn<
@@ -28,7 +23,7 @@ const mockConnectionConstructor = vi.hoisted(() =>
   })),
 );
 
-vi.mock('./connection.js', async (importOriginal) => {
+vi.mock("./connection.js", async (importOriginal) => {
   const actual = await importOriginal();
   return {
     ...(actual as object),
@@ -36,32 +31,32 @@ vi.mock('./connection.js', async (importOriginal) => {
   };
 });
 
-describe('acp', () => {
-  describe('RequestError', () => {
-    it('should create a parse error', () => {
-      const error = RequestError.parseError('details');
+describe("acp", () => {
+  describe("RequestError", () => {
+    it("should create a parse error", () => {
+      const error = RequestError.parseError("details");
       expect(error.code).toBe(-32700);
-      expect(error.message).toBe('Parse error');
-      expect(error.data?.details).toBe('details');
+      expect(error.message).toBe("Parse error");
+      expect(error.data?.details).toBe("details");
     });
 
-    it('should create a method not found error', () => {
-      const error = RequestError.methodNotFound('details');
+    it("should create a method not found error", () => {
+      const error = RequestError.methodNotFound("details");
       expect(error.code).toBe(-32601);
-      expect(error.message).toBe('Method not found');
-      expect(error.data?.details).toBe('details');
+      expect(error.message).toBe("Method not found");
+      expect(error.data?.details).toBe("details");
     });
 
-    it('should convert to a result', () => {
-      const error = RequestError.internalError('details');
+    it("should convert to a result", () => {
+      const error = RequestError.internalError("details");
       const result = error.toResult() as { error: ErrorResponse };
       expect(result.error.code).toBe(-32603);
-      expect(result.error.message).toBe('Internal error');
-      expect(result.error.data).toEqual({ details: 'details' });
+      expect(result.error.message).toBe("Internal error");
+      expect(result.error.data).toEqual({ details: "details" });
     });
   });
 
-  describe('AgentSideConnection', () => {
+  describe("AgentSideConnection", () => {
     let mockAgent: Agent;
 
     let toAgent: WritableStream<Uint8Array>;
@@ -77,8 +72,8 @@ describe('acp', () => {
         authMethods: [],
         protocolVersion: 1,
       };
-      const newSessionResponse = { sessionId: 'session-1' };
-      const loadSessionResponse = { sessionId: 'session-1' };
+      const newSessionResponse = { sessionId: "session-1" };
+      const loadSessionResponse = { sessionId: "session-1" };
 
       mockAgent = {
         initialize: vi.fn().mockResolvedValue(initializeResponse),
@@ -102,7 +97,7 @@ describe('acp', () => {
       connectionInstance = mockConnectionConstructor.mock.results[0].value;
     });
 
-    it('should initialize Connection with the correct handler and streams', () => {
+    it("should initialize Connection with the correct handler and streams", () => {
       expect(mockConnectionConstructor).toHaveBeenCalledTimes(1);
       expect(mockConnectionConstructor).toHaveBeenCalledWith(
         expect.any(Function),
@@ -111,7 +106,7 @@ describe('acp', () => {
       );
     });
 
-    it('should call agent.initialize when Connection handler receives initialize method', async () => {
+    it("should call agent.initialize when Connection handler receives initialize method", async () => {
       const initializeParams = {
         clientCapabilities: { fs: { readTextFile: true, writeTextFile: true } },
         protocolVersion: 1,
@@ -121,170 +116,156 @@ describe('acp', () => {
         authMethods: [],
         protocolVersion: 1,
       };
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      const result = await handler('initialize', initializeParams);
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      const result = await handler("initialize", initializeParams);
 
       expect(mockAgent.initialize).toHaveBeenCalledWith(initializeParams);
       expect(result).toEqual(initializeResponse);
     });
 
-    it('should call agent.newSession when Connection handler receives session_new method', async () => {
-      const newSessionParams = { cwd: '/tmp', mcpServers: [] };
-      const newSessionResponse = { sessionId: 'session-1' };
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      const result = await handler('session/new', newSessionParams);
+    it("should call agent.newSession when Connection handler receives session_new method", async () => {
+      const newSessionParams = { cwd: "/tmp", mcpServers: [] };
+      const newSessionResponse = { sessionId: "session-1" };
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      const result = await handler("session/new", newSessionParams);
 
       expect(mockAgent.newSession).toHaveBeenCalledWith(newSessionParams);
       expect(result).toEqual(newSessionResponse);
     });
 
-    it('should call agent.loadSession when Connection handler receives session_load method', async () => {
+    it("should call agent.loadSession when Connection handler receives session_load method", async () => {
       const loadSessionParams = {
-        cwd: '/tmp',
+        cwd: "/tmp",
         mcpServers: [],
-        sessionId: 'session-1',
+        sessionId: "session-1",
       };
-      const loadSessionResponse = { sessionId: 'session-1' };
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      const result = await handler('session/load', loadSessionParams);
+      const loadSessionResponse = { sessionId: "session-1" };
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      const result = await handler("session/load", loadSessionParams);
 
       expect(mockAgent.loadSession).toHaveBeenCalledWith(loadSessionParams);
       expect(result).toEqual(loadSessionResponse);
     });
 
-    it('should throw methodNotFound if agent.loadSession is not implemented', async () => {
+    it("should throw methodNotFound if agent.loadSession is not implemented", async () => {
       mockAgent.loadSession = undefined; // Simulate not implemented
       const loadSessionParams = {
-        cwd: '/tmp',
+        cwd: "/tmp",
         mcpServers: [],
-        sessionId: 'session-1',
+        sessionId: "session-1",
       };
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      await expect(handler('session/load', loadSessionParams)).rejects.toThrow(
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      await expect(handler("session/load", loadSessionParams)).rejects.toThrow(
         RequestError.methodNotFound().message,
       );
     });
 
-    it('should call agent.authenticate when Connection handler receives authenticate method', async () => {
+    it("should call agent.authenticate when Connection handler receives authenticate method", async () => {
       const authenticateParams = {
-        methodId: 'test-auth-method',
+        methodId: "test-auth-method",
       };
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      const result = await handler('authenticate', authenticateParams);
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      const result = await handler("authenticate", authenticateParams);
 
       expect(mockAgent.authenticate).toHaveBeenCalledWith(authenticateParams);
       expect(result).toBeUndefined();
     });
 
-    it('should call agent.prompt when Connection handler receives session_prompt method', async () => {
+    it("should call agent.prompt when Connection handler receives session_prompt method", async () => {
       const promptParams = {
-        prompt: [{ type: 'text', text: 'hi' }],
-        sessionId: 'session-1',
+        prompt: [{ type: "text", text: "hi" }],
+        sessionId: "session-1",
       };
       const promptResponse = {
-        response: [{ type: 'text', text: 'hello' }],
-        traceId: 'trace-1',
+        response: [{ type: "text", text: "hello" }],
+        traceId: "trace-1",
       };
       (mockAgent.prompt as Mock).mockResolvedValue(promptResponse);
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      const result = await handler('session/prompt', promptParams);
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      const result = await handler("session/prompt", promptParams);
 
       expect(mockAgent.prompt).toHaveBeenCalledWith(promptParams);
       expect(result).toEqual(promptResponse);
     });
 
-    it('should call agent.cancel when Connection handler receives session_cancel method', async () => {
-      const cancelParams = { sessionId: 'session-1' };
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      const result = await handler('session/cancel', cancelParams);
+    it("should call agent.cancel when Connection handler receives session_cancel method", async () => {
+      const cancelParams = { sessionId: "session-1" };
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      const result = await handler("session/cancel", cancelParams);
 
       expect(mockAgent.cancel).toHaveBeenCalledWith(cancelParams);
       expect(result).toBeUndefined();
     });
 
-    it('should throw methodNotFound for unknown methods', async () => {
-      const handler = mockConnectionConstructor.mock
-        .calls[0][0]! as MethodHandler;
-      await expect(handler('unknown_method', {})).rejects.toThrow(
+    it("should throw methodNotFound for unknown methods", async () => {
+      const handler = mockConnectionConstructor.mock.calls[0][0]! as MethodHandler;
+      await expect(handler("unknown_method", {})).rejects.toThrow(
         RequestError.methodNotFound().message,
       );
     });
 
-    it('should send sessionUpdate notification via connection', async () => {
+    it("should send sessionUpdate notification via connection", async () => {
       const params = {
-        sessionId: '123',
+        sessionId: "123",
         update: {
-          sessionUpdate: 'user_message_chunk' as const,
-          content: { type: 'text' as const, text: 'hello' },
+          sessionUpdate: "user_message_chunk" as const,
+          content: { type: "text" as const, text: "hello" },
         },
       };
       await agentSideConnection.sessionUpdate(params);
     });
 
-    it('should send requestPermission request via connection', async () => {
+    it("should send requestPermission request via connection", async () => {
       const params = {
-        sessionId: '123',
+        sessionId: "123",
         toolCall: {
-          toolCallId: 'tool-1',
-          title: 'Test Tool',
-          kind: 'other' as const,
-          status: 'pending' as const,
+          toolCallId: "tool-1",
+          title: "Test Tool",
+          kind: "other" as const,
+          status: "pending" as const,
         },
         options: [
           {
-            optionId: 'option-1',
-            name: 'Allow',
-            kind: 'allow_once' as const,
+            optionId: "option-1",
+            name: "Allow",
+            kind: "allow_once" as const,
           },
         ],
       };
       const response = {
-        outcome: { outcome: 'selected', optionId: 'option-1' },
+        outcome: { outcome: "selected", optionId: "option-1" },
       };
       (connectionInstance.sendRequest as Mock).mockResolvedValue(response);
 
       const result = await agentSideConnection.requestPermission(params);
       expect(connectionInstance.sendRequest).toHaveBeenCalledWith(
-        'session/request_permission',
+        "session/request_permission",
         params,
       );
       expect(result).toEqual(response);
     });
 
-    it('should send readTextFile request via connection', async () => {
-      const params = { path: '/a/b.txt', sessionId: 'session-1' };
-      const response = { content: 'file content' };
+    it("should send readTextFile request via connection", async () => {
+      const params = { path: "/a/b.txt", sessionId: "session-1" };
+      const response = { content: "file content" };
       (connectionInstance.sendRequest as Mock).mockResolvedValue(response);
 
       const result = await agentSideConnection.readTextFile(params);
-      expect(connectionInstance.sendRequest).toHaveBeenCalledWith(
-        'fs/read_text_file',
-        params,
-      );
+      expect(connectionInstance.sendRequest).toHaveBeenCalledWith("fs/read_text_file", params);
       expect(result).toEqual(response);
     });
 
-    it('should send writeTextFile request via connection', async () => {
+    it("should send writeTextFile request via connection", async () => {
       const params = {
-        path: '/a/b.txt',
-        content: 'new content',
-        sessionId: 'session-1',
+        path: "/a/b.txt",
+        content: "new content",
+        sessionId: "session-1",
       };
       const response = { success: true };
       (connectionInstance.sendRequest as Mock).mockResolvedValue(response);
 
       const result = await agentSideConnection.writeTextFile(params);
-      expect(connectionInstance.sendRequest).toHaveBeenCalledWith(
-        'fs/write_text_file',
-        params,
-      );
+      expect(connectionInstance.sendRequest).toHaveBeenCalledWith("fs/write_text_file", params);
       expect(result).toEqual(response);
     });
   });
diff --git a/packages/ui-gemini/src/zed-integration/acp.ts b/packages/ui-gemini/src/zed-integration/acp.ts
index 16fe12403..bc83e72cd 100644
--- a/packages/ui-gemini/src/zed-integration/acp.ts
+++ b/packages/ui-gemini/src/zed-integration/acp.ts
@@ -6,11 +6,13 @@
 
 /* ACP defines a schema for a simple (experimental) JSON-RPC protocol that allows GUI applications to interact with agents. */
 
-import * as schema from './schema.js';
-export * from './schema.js';
+import * as schema from "./schema.js";
+
+export * from "./schema.js";
+
+import type { ReadableStream, WritableStream } from "node:stream/web";
+import { Connection, RequestError } from "./connection.js";
 
-import type { WritableStream, ReadableStream } from 'node:stream/web';
-import { Connection, RequestError } from './connection.js';
 export { RequestError };
 
 export class AgentSideConnection implements Client {
@@ -23,10 +25,7 @@ export class AgentSideConnection implements Client {
   ) {
     const agent = toAgent(this);
 
-    const handler = async (
-      method: string,
-      params: unknown,
-    ): Promise<unknown> => {
+    const handler = async (method: string, params: unknown): Promise<unknown> => {
       switch (method) {
         case schema.AGENT_METHODS.initialize: {
           const validatedParams = schema.initializeRequestSchema.parse(params);
@@ -44,8 +43,7 @@ export class AgentSideConnection implements Client {
           return agent.loadSession(validatedParams);
         }
         case schema.AGENT_METHODS.authenticate: {
-          const validatedParams =
-            schema.authenticateRequestSchema.parse(params);
+          const validatedParams = schema.authenticateRequestSchema.parse(params);
           return agent.authenticate(validatedParams);
         }
         case schema.AGENT_METHODS.session_prompt: {
@@ -68,10 +66,7 @@ export class AgentSideConnection implements Client {
    * Streams new content to the client including text, tool calls, etc.
    */
   async sessionUpdate(params: schema.SessionNotification): Promise<void> {
-    return this.#connection.sendNotification(
-      schema.CLIENT_METHODS.session_update,
-      params,
-    );
+    return this.#connection.sendNotification(schema.CLIENT_METHODS.session_update, params);
   }
 
   /**
@@ -83,28 +78,15 @@ export class AgentSideConnection implements Client {
   async requestPermission(
     params: schema.RequestPermissionRequest,
   ): Promise<schema.RequestPermissionResponse> {
-    return this.#connection.sendRequest(
-      schema.CLIENT_METHODS.session_request_permission,
-      params,
-    );
+    return this.#connection.sendRequest(schema.CLIENT_METHODS.session_request_permission, params);
   }
 
-  async readTextFile(
-    params: schema.ReadTextFileRequest,
-  ): Promise<schema.ReadTextFileResponse> {
-    return this.#connection.sendRequest(
-      schema.CLIENT_METHODS.fs_read_text_file,
-      params,
-    );
+  async readTextFile(params: schema.ReadTextFileRequest): Promise<schema.ReadTextFileResponse> {
+    return this.#connection.sendRequest(schema.CLIENT_METHODS.fs_read_text_file, params);
   }
 
-  async writeTextFile(
-    params: schema.WriteTextFileRequest,
-  ): Promise<schema.WriteTextFileResponse> {
-    return this.#connection.sendRequest(
-      schema.CLIENT_METHODS.fs_write_text_file,
-      params,
-    );
+  async writeTextFile(params: schema.WriteTextFileRequest): Promise<schema.WriteTextFileResponse> {
+    return this.#connection.sendRequest(schema.CLIENT_METHODS.fs_write_text_file, params);
   }
 }
 
@@ -113,24 +95,14 @@ export interface Client {
     params: schema.RequestPermissionRequest,
   ): Promise<schema.RequestPermissionResponse>;
   sessionUpdate(params: schema.SessionNotification): Promise<void>;
-  writeTextFile(
-    params: schema.WriteTextFileRequest,
-  ): Promise<schema.WriteTextFileResponse>;
-  readTextFile(
-    params: schema.ReadTextFileRequest,
-  ): Promise<schema.ReadTextFileResponse>;
+  writeTextFile(params: schema.WriteTextFileRequest): Promise<schema.WriteTextFileResponse>;
+  readTextFile(params: schema.ReadTextFileRequest): Promise<schema.ReadTextFileResponse>;
 }
 
 export interface Agent {
-  initialize(
-    params: schema.InitializeRequest,
-  ): Promise<schema.InitializeResponse>;
-  newSession(
-    params: schema.NewSessionRequest,
-  ): Promise<schema.NewSessionResponse>;
-  loadSession?(
-    params: schema.LoadSessionRequest,
-  ): Promise<schema.LoadSessionResponse>;
+  initialize(params: schema.InitializeRequest): Promise<schema.InitializeResponse>;
+  newSession(params: schema.NewSessionRequest): Promise<schema.NewSessionResponse>;
+  loadSession?(params: schema.LoadSessionRequest): Promise<schema.LoadSessionResponse>;
   authenticate(params: schema.AuthenticateRequest): Promise<void>;
   prompt(params: schema.PromptRequest): Promise<schema.PromptResponse>;
   cancel(params: schema.CancelNotification): Promise<void>;
diff --git a/packages/ui-gemini/src/zed-integration/connection.test.ts b/packages/ui-gemini/src/zed-integration/connection.test.ts
index 20bd709fc..44f8f8157 100644
--- a/packages/ui-gemini/src/zed-integration/connection.test.ts
+++ b/packages/ui-gemini/src/zed-integration/connection.test.ts
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { Connection, RequestError } from './connection.js';
-import { ReadableStream, WritableStream } from 'node:stream/web';
+import { ReadableStream, WritableStream } from "node:stream/web";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { Connection, RequestError } from "./connection.js";
 
-describe('Connection', () => {
+describe("Connection", () => {
   let toPeer: WritableStream<Uint8Array>;
   let fromPeer: ReadableStream<Uint8Array>;
   let peerController: ReadableStreamDefaultController<Uint8Array>;
@@ -39,9 +39,9 @@ describe('Connection', () => {
     vi.clearAllMocks();
   });
 
-  it('should send a request and receive a response', async () => {
-    const responsePromise = connection.sendRequest('testMethod', {
-      key: 'value',
+  it("should send a request and receive a response", async () => {
+    const responsePromise = connection.sendRequest("testMethod", {
+      key: "value",
     });
 
     // Verify request was sent
@@ -50,97 +50,89 @@ describe('Connection', () => {
     });
     const request = JSON.parse(receivedChunks[0]);
     expect(request).toMatchObject({
-      jsonrpc: '2.0',
-      method: 'testMethod',
-      params: { key: 'value' },
+      jsonrpc: "2.0",
+      method: "testMethod",
+      params: { key: "value" },
     });
     expect(request.id).toBeDefined();
 
     // Simulate response
     const response = {
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: request.id,
       result: { success: true },
     };
-    peerController.enqueue(
-      new TextEncoder().encode(JSON.stringify(response) + '\n'),
-    );
+    peerController.enqueue(new TextEncoder().encode(JSON.stringify(response) + "\n"));
 
     const result = await responsePromise;
     expect(result).toEqual({ success: true });
   });
 
-  it('should send a notification', async () => {
-    await connection.sendNotification('notifyMethod', { key: 'value' });
+  it("should send a notification", async () => {
+    await connection.sendNotification("notifyMethod", { key: "value" });
 
     await vi.waitFor(() => {
       expect(receivedChunks.length).toBeGreaterThan(0);
     });
     const notification = JSON.parse(receivedChunks[0]);
     expect(notification).toMatchObject({
-      jsonrpc: '2.0',
-      method: 'notifyMethod',
-      params: { key: 'value' },
+      jsonrpc: "2.0",
+      method: "notifyMethod",
+      params: { key: "value" },
     });
     expect(notification.id).toBeUndefined();
   });
 
-  it('should handle incoming requests', async () => {
-    handler.mockResolvedValue({ result: 'ok' });
+  it("should handle incoming requests", async () => {
+    handler.mockResolvedValue({ result: "ok" });
 
     const request = {
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: 1,
-      method: 'incomingMethod',
-      params: { foo: 'bar' },
+      method: "incomingMethod",
+      params: { foo: "bar" },
     };
-    peerController.enqueue(
-      new TextEncoder().encode(JSON.stringify(request) + '\n'),
-    );
+    peerController.enqueue(new TextEncoder().encode(JSON.stringify(request) + "\n"));
 
     // Wait for handler to be called and response to be written
     await vi.waitFor(() => {
-      expect(handler).toHaveBeenCalledWith('incomingMethod', { foo: 'bar' });
+      expect(handler).toHaveBeenCalledWith("incomingMethod", { foo: "bar" });
       expect(receivedChunks.length).toBeGreaterThan(0);
     });
 
     const response = JSON.parse(receivedChunks[receivedChunks.length - 1]);
     expect(response).toMatchObject({
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: 1,
-      result: { result: 'ok' },
+      result: { result: "ok" },
     });
   });
 
-  it('should handle incoming notifications', async () => {
+  it("should handle incoming notifications", async () => {
     const notification = {
-      jsonrpc: '2.0',
-      method: 'incomingNotify',
-      params: { foo: 'bar' },
+      jsonrpc: "2.0",
+      method: "incomingNotify",
+      params: { foo: "bar" },
     };
-    peerController.enqueue(
-      new TextEncoder().encode(JSON.stringify(notification) + '\n'),
-    );
+    peerController.enqueue(new TextEncoder().encode(JSON.stringify(notification) + "\n"));
 
     // Wait for handler to be called
     await vi.waitFor(() => {
-      expect(handler).toHaveBeenCalledWith('incomingNotify', { foo: 'bar' });
+      expect(handler).toHaveBeenCalledWith("incomingNotify", { foo: "bar" });
     });
     // Notifications don't send responses
     expect(receivedChunks.length).toBe(0);
   });
 
-  it('should handle request errors from handler', async () => {
-    handler.mockRejectedValue(new Error('Handler failed'));
+  it("should handle request errors from handler", async () => {
+    handler.mockRejectedValue(new Error("Handler failed"));
 
     const request = {
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: 2,
-      method: 'failMethod',
+      method: "failMethod",
     };
-    peerController.enqueue(
-      new TextEncoder().encode(JSON.stringify(request) + '\n'),
-    );
+    peerController.enqueue(new TextEncoder().encode(JSON.stringify(request) + "\n"));
 
     await vi.waitFor(() => {
       expect(receivedChunks.length).toBeGreaterThan(0);
@@ -148,27 +140,25 @@ describe('Connection', () => {
 
     const response = JSON.parse(receivedChunks[receivedChunks.length - 1]);
     expect(response).toMatchObject({
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: 2,
       error: {
         code: -32603,
-        message: 'Internal error',
-        data: { details: 'Handler failed' },
+        message: "Internal error",
+        data: { details: "Handler failed" },
       },
     });
   });
 
-  it('should handle RequestError from handler', async () => {
-    handler.mockRejectedValue(RequestError.methodNotFound('Unknown method'));
+  it("should handle RequestError from handler", async () => {
+    handler.mockRejectedValue(RequestError.methodNotFound("Unknown method"));
 
     const request = {
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: 3,
-      method: 'unknown',
+      method: "unknown",
     };
-    peerController.enqueue(
-      new TextEncoder().encode(JSON.stringify(request) + '\n'),
-    );
+    peerController.enqueue(new TextEncoder().encode(JSON.stringify(request) + "\n"));
 
     await vi.waitFor(() => {
       expect(receivedChunks.length).toBeGreaterThan(0);
@@ -176,18 +166,18 @@ describe('Connection', () => {
 
     const response = JSON.parse(receivedChunks[receivedChunks.length - 1]);
     expect(response).toMatchObject({
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: 3,
       error: {
         code: -32601,
-        message: 'Method not found',
-        data: { details: 'Unknown method' },
+        message: "Method not found",
+        data: { details: "Unknown method" },
       },
     });
   });
 
-  it('should handle response errors', async () => {
-    const responsePromise = connection.sendRequest('testMethod');
+  it("should handle response errors", async () => {
+    const responsePromise = connection.sendRequest("testMethod");
 
     // Verify request was sent
     await vi.waitFor(() => {
@@ -197,20 +187,18 @@ describe('Connection', () => {
 
     // Simulate error response
     const response = {
-      jsonrpc: '2.0',
+      jsonrpc: "2.0",
       id: request.id,
       error: {
         code: -32000,
-        message: 'Custom error',
+        message: "Custom error",
       },
     };
-    peerController.enqueue(
-      new TextEncoder().encode(JSON.stringify(response) + '\n'),
-    );
+    peerController.enqueue(new TextEncoder().encode(JSON.stringify(response) + "\n"));
 
     await expect(responsePromise).rejects.toMatchObject({
       code: -32000,
-      message: 'Custom error',
+      message: "Custom error",
     });
   });
 });
diff --git a/packages/ui-gemini/src/zed-integration/connection.ts b/packages/ui-gemini/src/zed-integration/connection.ts
index 50be6c240..480844b6f 100644
--- a/packages/ui-gemini/src/zed-integration/connection.ts
+++ b/packages/ui-gemini/src/zed-integration/connection.ts
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
-import { coreEvents } from '@airiscode/gemini-cli-core';
-import { type Result, type ErrorResponse } from './schema.js';
-import type { WritableStream, ReadableStream } from 'node:stream/web';
+import type { ReadableStream, WritableStream } from "node:stream/web";
+import { coreEvents } from "@airiscode/gemini-cli-core";
+import { z } from "zod";
+import { type ErrorResponse, type Result } from "./schema.js";
 
 export class RequestError extends Error {
   data?: { details?: string };
@@ -18,34 +18,34 @@ export class RequestError extends Error {
     details?: string,
   ) {
     super(message);
-    this.name = 'RequestError';
+    this.name = "RequestError";
     if (details) {
       this.data = { details };
     }
   }
 
   static parseError(details?: string): RequestError {
-    return new RequestError(-32700, 'Parse error', details);
+    return new RequestError(-32700, "Parse error", details);
   }
 
   static invalidRequest(details?: string): RequestError {
-    return new RequestError(-32600, 'Invalid request', details);
+    return new RequestError(-32600, "Invalid request", details);
   }
 
   static methodNotFound(details?: string): RequestError {
-    return new RequestError(-32601, 'Method not found', details);
+    return new RequestError(-32601, "Method not found", details);
   }
 
   static invalidParams(details?: string): RequestError {
-    return new RequestError(-32602, 'Invalid params', details);
+    return new RequestError(-32602, "Invalid params", details);
   }
 
   static internalError(details?: string): RequestError {
-    return new RequestError(-32603, 'Internal error', details);
+    return new RequestError(-32603, "Internal error", details);
   }
 
   static authRequired(details?: string): RequestError {
-    return new RequestError(-32000, 'Authentication required', details);
+    return new RequestError(-32000, "Authentication required", details);
   }
 
   toResult<T>(): Result<T> {
@@ -62,19 +62,19 @@ export class RequestError extends Error {
 type AnyMessage = AnyRequest | AnyResponse | AnyNotification;
 
 type AnyRequest = {
-  jsonrpc: '2.0';
+  jsonrpc: "2.0";
   id: string | number;
   method: string;
   params?: unknown;
 };
 
 type AnyResponse = {
-  jsonrpc: '2.0';
+  jsonrpc: "2.0";
   id: string | number;
 } & Result<unknown>;
 
 type AnyNotification = {
-  jsonrpc: '2.0';
+  jsonrpc: "2.0";
   method: string;
   params?: unknown;
 };
@@ -84,10 +84,7 @@ type PendingResponse = {
   reject: (error: ErrorResponse) => void;
 };
 
-export type MethodHandler = (
-  method: string,
-  params: unknown,
-) => Promise<unknown>;
+export type MethodHandler = (method: string, params: unknown) => Promise<unknown>;
 
 export class Connection {
   #pendingResponses: Map<string | number, PendingResponse> = new Map();
@@ -110,12 +107,12 @@ export class Connection {
   }
 
   async #receive(output: ReadableStream<Uint8Array>) {
-    let content = '';
+    let content = "";
     const decoder = new TextDecoder();
     for await (const chunk of output) {
       content += decoder.decode(chunk, { stream: true });
-      const lines = content.split('\n');
-      content = lines.pop() || '';
+      const lines = content.split("\n");
+      content = lines.pop() || "";
 
       for (const line of lines) {
         const trimmedLine = line.trim();
@@ -130,31 +127,25 @@ export class Connection {
   }
 
   async #processMessage(message: AnyMessage) {
-    if ('method' in message && 'id' in message) {
+    if ("method" in message && "id" in message) {
       // It's a request
-      const response = await this.#tryCallHandler(
-        message.method,
-        message.params,
-      );
+      const response = await this.#tryCallHandler(message.method, message.params);
 
       await this.#sendMessage({
-        jsonrpc: '2.0',
+        jsonrpc: "2.0",
         id: message.id,
         ...response,
       });
-    } else if ('method' in message) {
+    } else if ("method" in message) {
       // It's a notification
       await this.#tryCallHandler(message.method, message.params);
-    } else if ('id' in message) {
+    } else if ("id" in message) {
       // It's a response
       this.#handleResponse(message as AnyResponse);
     }
   }
 
-  async #tryCallHandler(
-    method: string,
-    params?: unknown,
-  ): Promise<Result<unknown>> {
+  async #tryCallHandler(method: string, params?: unknown): Promise<Result<unknown>> {
     try {
       const result = await this.#handler(method, params);
       return { result: result ?? null };
@@ -164,9 +155,7 @@ export class Connection {
       }
 
       if (error instanceof z.ZodError) {
-        return RequestError.invalidParams(
-          JSON.stringify(error.format(), undefined, 2),
-        ).toResult();
+        return RequestError.invalidParams(JSON.stringify(error.format(), undefined, 2)).toResult();
       }
 
       let details;
@@ -174,10 +163,10 @@ export class Connection {
       if (error instanceof Error) {
         details = error.message;
       } else if (
-        typeof error === 'object' &&
+        typeof error === "object" &&
         error != null &&
-        'message' in error &&
-        typeof error.message === 'string'
+        "message" in error &&
+        typeof error.message === "string"
       ) {
         details = error.message;
       }
@@ -189,9 +178,9 @@ export class Connection {
   #handleResponse(response: AnyResponse) {
     const pendingResponse = this.#pendingResponses.get(response.id);
     if (pendingResponse) {
-      if ('result' in response) {
+      if ("result" in response) {
         pendingResponse.resolve(response.result);
-      } else if ('error' in response) {
+      } else if ("error" in response) {
         pendingResponse.reject(response.error);
       }
       this.#pendingResponses.delete(response.id);
@@ -203,16 +192,16 @@ export class Connection {
     const responsePromise = new Promise((resolve, reject) => {
       this.#pendingResponses.set(id, { resolve, reject });
     });
-    await this.#sendMessage({ jsonrpc: '2.0', id, method, params });
+    await this.#sendMessage({ jsonrpc: "2.0", id, method, params });
     return responsePromise as Promise<Resp>;
   }
 
   async sendNotification<N>(method: string, params?: N): Promise<void> {
-    await this.#sendMessage({ jsonrpc: '2.0', method, params });
+    await this.#sendMessage({ jsonrpc: "2.0", method, params });
   }
 
   async #sendMessage(json: AnyMessage) {
-    const content = JSON.stringify(json) + '\n';
+    const content = JSON.stringify(json) + "\n";
     this.#writeQueue = this.#writeQueue
       .then(async () => {
         const writer = this.#peerInput.getWriter();
@@ -224,7 +213,7 @@ export class Connection {
       })
       .catch((error) => {
         // Continue processing writes on error
-        coreEvents.emitFeedback('error', 'ACP write error.', error);
+        coreEvents.emitFeedback("error", "ACP write error.", error);
       });
     return this.#writeQueue;
   }
diff --git a/packages/ui-gemini/src/zed-integration/fileSystemService.test.ts b/packages/ui-gemini/src/zed-integration/fileSystemService.test.ts
index be822df52..a248eb4a8 100644
--- a/packages/ui-gemini/src/zed-integration/fileSystemService.test.ts
+++ b/packages/ui-gemini/src/zed-integration/fileSystemService.test.ts
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect, vi, beforeEach, type Mocked } from 'vitest';
-import { AcpFileSystemService } from './fileSystemService.js';
-import type { Client } from './acp.js';
-import type { FileSystemService } from '@airiscode/gemini-cli-core';
+import type { FileSystemService } from "@airiscode/gemini-cli-core";
+import { beforeEach, describe, expect, it, type Mocked, vi } from "vitest";
+import type { Client } from "./acp.js";
+import { AcpFileSystemService } from "./fileSystemService.js";
 
-describe('AcpFileSystemService', () => {
+describe("AcpFileSystemService", () => {
   let mockClient: Mocked<Client>;
   let mockFallback: Mocked<FileSystemService>;
   let service: AcpFileSystemService;
@@ -27,18 +27,18 @@ describe('AcpFileSystemService', () => {
     };
   });
 
-  describe('readTextFile', () => {
+  describe("readTextFile", () => {
     it.each([
       {
         capability: true,
-        desc: 'client if capability exists',
+        desc: "client if capability exists",
         setup: () => {
-          mockClient.readTextFile.mockResolvedValue({ content: 'content' });
+          mockClient.readTextFile.mockResolvedValue({ content: "content" });
         },
         verify: () => {
           expect(mockClient.readTextFile).toHaveBeenCalledWith({
-            path: '/path/to/file',
-            sessionId: 'session-1',
+            path: "/path/to/file",
+            sessionId: "session-1",
             line: null,
             limit: null,
           });
@@ -47,67 +47,62 @@ describe('AcpFileSystemService', () => {
       },
       {
         capability: false,
-        desc: 'fallback if capability missing',
+        desc: "fallback if capability missing",
         setup: () => {
-          mockFallback.readTextFile.mockResolvedValue('content');
+          mockFallback.readTextFile.mockResolvedValue("content");
         },
         verify: () => {
-          expect(mockFallback.readTextFile).toHaveBeenCalledWith(
-            '/path/to/file',
-          );
+          expect(mockFallback.readTextFile).toHaveBeenCalledWith("/path/to/file");
           expect(mockClient.readTextFile).not.toHaveBeenCalled();
         },
       },
-    ])('should use $desc', async ({ capability, setup, verify }) => {
+    ])("should use $desc", async ({ capability, setup, verify }) => {
       service = new AcpFileSystemService(
         mockClient,
-        'session-1',
+        "session-1",
         { readTextFile: capability, writeTextFile: true },
         mockFallback,
       );
       setup();
 
-      const result = await service.readTextFile('/path/to/file');
+      const result = await service.readTextFile("/path/to/file");
 
-      expect(result).toBe('content');
+      expect(result).toBe("content");
       verify();
     });
   });
 
-  describe('writeTextFile', () => {
+  describe("writeTextFile", () => {
     it.each([
       {
         capability: true,
-        desc: 'client if capability exists',
+        desc: "client if capability exists",
         verify: () => {
           expect(mockClient.writeTextFile).toHaveBeenCalledWith({
-            path: '/path/to/file',
-            content: 'content',
-            sessionId: 'session-1',
+            path: "/path/to/file",
+            content: "content",
+            sessionId: "session-1",
           });
           expect(mockFallback.writeTextFile).not.toHaveBeenCalled();
         },
       },
       {
         capability: false,
-        desc: 'fallback if capability missing',
+        desc: "fallback if capability missing",
         verify: () => {
-          expect(mockFallback.writeTextFile).toHaveBeenCalledWith(
-            '/path/to/file',
-            'content',
-          );
+          expect(mockFallback.writeTextFile).toHaveBeenCalledWith("/path/to/file", "content");
           expect(mockClient.writeTextFile).not.toHaveBeenCalled();
         },
       },
-    ])('should use $desc', async ({ capability, verify }) => {
+    ])("should use $desc", async ({ capability, verify }) => {
       service = new AcpFileSystemService(
         mockClient,
-        'session-1',
+        "session-1",
         { writeTextFile: capability, readTextFile: true },
         mockFallback,
       );
 
-      await service.writeTextFile('/path/to/file', 'content');
+      await service.writeTextFile("/path/to/file", "content");
 
       verify();
     });
diff --git a/packages/ui-gemini/src/zed-integration/fileSystemService.ts b/packages/ui-gemini/src/zed-integration/fileSystemService.ts
index d7e46cb45..dc857194d 100644
--- a/packages/ui-gemini/src/zed-integration/fileSystemService.ts
+++ b/packages/ui-gemini/src/zed-integration/fileSystemService.ts
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { FileSystemService } from '@airiscode/gemini-cli-core';
-import type * as acp from './acp.js';
+import type { FileSystemService } from "@airiscode/gemini-cli-core";
+import type * as acp from "./acp.js";
 
 /**
  * ACP client-based implementation of FileSystemService
diff --git a/packages/ui-gemini/src/zed-integration/schema.ts b/packages/ui-gemini/src/zed-integration/schema.ts
index 14e1a4c38..004472b85 100644
--- a/packages/ui-gemini/src/zed-integration/schema.ts
+++ b/packages/ui-gemini/src/zed-integration/schema.ts
@@ -4,22 +4,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { z } from 'zod';
+import { z } from "zod";
 
 export const AGENT_METHODS = {
-  authenticate: 'authenticate',
-  initialize: 'initialize',
-  session_cancel: 'session/cancel',
-  session_load: 'session/load',
-  session_new: 'session/new',
-  session_prompt: 'session/prompt',
+  authenticate: "authenticate",
+  initialize: "initialize",
+  session_cancel: "session/cancel",
+  session_load: "session/load",
+  session_new: "session/new",
+  session_prompt: "session/prompt",
 };
 
 export const CLIENT_METHODS = {
-  fs_read_text_file: 'fs/read_text_file',
-  fs_write_text_file: 'fs/write_text_file',
-  session_request_permission: 'session/request_permission',
-  session_update: 'session/update',
+  fs_read_text_file: "fs/read_text_file",
+  fs_write_text_file: "fs/write_text_file",
+  session_request_permission: "session/request_permission",
+  session_update: "session/update",
 };
 
 export const PROTOCOL_VERSION = 1;
@@ -50,9 +50,7 @@ export type WriteTextFileResponse = z.infer<typeof writeTextFileResponseSchema>;
 
 export type ReadTextFileResponse = z.infer<typeof readTextFileResponseSchema>;
 
-export type RequestPermissionOutcome = z.infer<
-  typeof requestPermissionOutcomeSchema
->;
+export type RequestPermissionOutcome = z.infer<typeof requestPermissionOutcomeSchema>;
 
 export type CancelNotification = z.infer<typeof cancelNotificationSchema>;
 
@@ -76,9 +74,7 @@ export type PermissionOption = z.infer<typeof permissionOptionSchema>;
 
 export type Annotations = z.infer<typeof annotationsSchema>;
 
-export type RequestPermissionResponse = z.infer<
-  typeof requestPermissionResponseSchema
->;
+export type RequestPermissionResponse = z.infer<typeof requestPermissionResponseSchema>;
 
 export type FileSystemCapability = z.infer<typeof fileSystemCapabilitySchema>;
 
@@ -96,9 +92,7 @@ export type ClientResponse = z.infer<typeof clientResponseSchema>;
 
 export type ClientNotification = z.infer<typeof clientNotificationSchema>;
 
-export type EmbeddedResourceResource = z.infer<
-  typeof embeddedResourceResourceSchema
->;
+export type EmbeddedResourceResource = z.infer<typeof embeddedResourceResourceSchema>;
 
 export type NewSessionRequest = z.infer<typeof newSessionRequestSchema>;
 
@@ -120,9 +114,7 @@ export type SessionUpdate = z.infer<typeof sessionUpdateSchema>;
 
 export type AgentResponse = z.infer<typeof agentResponseSchema>;
 
-export type RequestPermissionRequest = z.infer<
-  typeof requestPermissionRequestSchema
->;
+export type RequestPermissionRequest = z.infer<typeof requestPermissionRequestSchema>;
 
 export type InitializeRequest = z.infer<typeof initializeRequestSchema>;
 
@@ -162,13 +154,13 @@ export const readTextFileRequestSchema = z.object({
 });
 
 export const permissionOptionKindSchema = z.union([
-  z.literal('allow_once'),
-  z.literal('allow_always'),
-  z.literal('reject_once'),
-  z.literal('reject_always'),
+  z.literal("allow_once"),
+  z.literal("allow_always"),
+  z.literal("reject_once"),
+  z.literal("reject_always"),
 ]);
 
-export const roleSchema = z.union([z.literal('assistant'), z.literal('user')]);
+export const roleSchema = z.union([z.literal("assistant"), z.literal("user")]);
 
 export const textResourceContentsSchema = z.object({
   mimeType: z.string().optional().nullable(),
@@ -183,22 +175,22 @@ export const blobResourceContentsSchema = z.object({
 });
 
 export const toolKindSchema = z.union([
-  z.literal('read'),
-  z.literal('edit'),
-  z.literal('delete'),
-  z.literal('move'),
-  z.literal('search'),
-  z.literal('execute'),
-  z.literal('think'),
-  z.literal('fetch'),
-  z.literal('other'),
+  z.literal("read"),
+  z.literal("edit"),
+  z.literal("delete"),
+  z.literal("move"),
+  z.literal("search"),
+  z.literal("execute"),
+  z.literal("think"),
+  z.literal("fetch"),
+  z.literal("other"),
 ]);
 
 export const toolCallStatusSchema = z.union([
-  z.literal('pending'),
-  z.literal('in_progress'),
-  z.literal('completed'),
-  z.literal('failed'),
+  z.literal("pending"),
+  z.literal("in_progress"),
+  z.literal("completed"),
+  z.literal("failed"),
 ]);
 
 export const writeTextFileResponseSchema = z.null();
@@ -209,11 +201,11 @@ export const readTextFileResponseSchema = z.object({
 
 export const requestPermissionOutcomeSchema = z.union([
   z.object({
-    outcome: z.literal('cancelled'),
+    outcome: z.literal("cancelled"),
   }),
   z.object({
     optionId: z.string(),
-    outcome: z.literal('selected'),
+    outcome: z.literal("selected"),
   }),
 ]);
 
@@ -234,10 +226,10 @@ export const newSessionResponseSchema = z.object({
 export const loadSessionResponseSchema = z.null();
 
 export const stopReasonSchema = z.union([
-  z.literal('end_turn'),
-  z.literal('max_tokens'),
-  z.literal('refusal'),
-  z.literal('cancelled'),
+  z.literal("end_turn"),
+  z.literal("max_tokens"),
+  z.literal("refusal"),
+  z.literal("cancelled"),
 ]);
 
 export const promptResponseSchema = z.object({
@@ -251,12 +243,8 @@ export const toolCallLocationSchema = z.object({
 
 export const planEntrySchema = z.object({
   content: z.string(),
-  priority: z.union([z.literal('high'), z.literal('medium'), z.literal('low')]),
-  status: z.union([
-    z.literal('pending'),
-    z.literal('in_progress'),
-    z.literal('completed'),
-  ]),
+  priority: z.union([z.literal("high"), z.literal("medium"), z.literal("low")]),
+  status: z.union([z.literal("pending"), z.literal("in_progress"), z.literal("completed")]),
 });
 
 export const permissionOptionSchema = z.object({
@@ -337,19 +325,19 @@ export const contentBlockSchema = z.union([
   z.object({
     annotations: annotationsSchema.optional().nullable(),
     text: z.string(),
-    type: z.literal('text'),
+    type: z.literal("text"),
   }),
   z.object({
     annotations: annotationsSchema.optional().nullable(),
     data: z.string(),
     mimeType: z.string(),
-    type: z.literal('image'),
+    type: z.literal("image"),
   }),
   z.object({
     annotations: annotationsSchema.optional().nullable(),
     data: z.string(),
     mimeType: z.string(),
-    type: z.literal('audio'),
+    type: z.literal("audio"),
   }),
   z.object({
     annotations: annotationsSchema.optional().nullable(),
@@ -358,26 +346,26 @@ export const contentBlockSchema = z.union([
     name: z.string(),
     size: z.number().optional().nullable(),
     title: z.string().optional().nullable(),
-    type: z.literal('resource_link'),
+    type: z.literal("resource_link"),
     uri: z.string(),
   }),
   z.object({
     annotations: annotationsSchema.optional().nullable(),
     resource: embeddedResourceResourceSchema,
-    type: z.literal('resource'),
+    type: z.literal("resource"),
   }),
 ]);
 
 export const toolCallContentSchema = z.union([
   z.object({
     content: contentBlockSchema,
-    type: z.literal('content'),
+    type: z.literal("content"),
   }),
   z.object({
     newText: z.string(),
     oldText: z.string().nullable(),
     path: z.string(),
-    type: z.literal('diff'),
+    type: z.literal("diff"),
   }),
 ]);
 
@@ -403,22 +391,22 @@ export const promptRequestSchema = z.object({
 export const sessionUpdateSchema = z.union([
   z.object({
     content: contentBlockSchema,
-    sessionUpdate: z.literal('user_message_chunk'),
+    sessionUpdate: z.literal("user_message_chunk"),
   }),
   z.object({
     content: contentBlockSchema,
-    sessionUpdate: z.literal('agent_message_chunk'),
+    sessionUpdate: z.literal("agent_message_chunk"),
   }),
   z.object({
     content: contentBlockSchema,
-    sessionUpdate: z.literal('agent_thought_chunk'),
+    sessionUpdate: z.literal("agent_thought_chunk"),
   }),
   z.object({
     content: z.array(toolCallContentSchema).optional(),
     kind: toolKindSchema,
     locations: z.array(toolCallLocationSchema).optional(),
     rawInput: z.unknown().optional(),
-    sessionUpdate: z.literal('tool_call'),
+    sessionUpdate: z.literal("tool_call"),
     status: toolCallStatusSchema,
     title: z.string(),
     toolCallId: z.string(),
@@ -428,14 +416,14 @@ export const sessionUpdateSchema = z.union([
     kind: toolKindSchema.optional().nullable(),
     locations: z.array(toolCallLocationSchema).optional().nullable(),
     rawInput: z.unknown().optional(),
-    sessionUpdate: z.literal('tool_call_update'),
+    sessionUpdate: z.literal("tool_call_update"),
     status: toolCallStatusSchema.optional().nullable(),
     title: z.string().optional().nullable(),
     toolCallId: z.string(),
   }),
   z.object({
     entries: z.array(planEntrySchema),
-    sessionUpdate: z.literal('plan'),
+    sessionUpdate: z.literal("plan"),
   }),
 ]);
 
diff --git a/packages/ui-gemini/src/zed-integration/zedIntegration.test.ts b/packages/ui-gemini/src/zed-integration/zedIntegration.test.ts
index 8dccd6015..796fdb73e 100644
--- a/packages/ui-gemini/src/zed-integration/zedIntegration.test.ts
+++ b/packages/ui-gemini/src/zed-integration/zedIntegration.test.ts
@@ -4,43 +4,34 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type Mock,
-  type Mocked,
-} from 'vitest';
-import { GeminiAgent, Session } from './zedIntegration.js';
-import * as acp from './acp.js';
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
 import {
   AuthType,
-  ToolConfirmationOutcome,
-  StreamEventType,
+  type Config,
+  type GeminiChat,
   isWithinRoot,
   ReadManyFilesTool,
-  type GeminiChat,
-  type Config,
-} from '@airiscode/gemini-cli-core';
-import { SettingScope, type LoadedSettings } from '../config/settings.js';
-import { loadCliConfig, type CliArgs } from '../config/config.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-
-vi.mock('../config/config.js', () => ({
+  StreamEventType,
+  ToolConfirmationOutcome,
+} from "@airiscode/gemini-cli-core";
+import { afterEach, beforeEach, describe, expect, it, type Mock, type Mocked, vi } from "vitest";
+import { type CliArgs, loadCliConfig } from "../config/config.js";
+import { type LoadedSettings, SettingScope } from "../config/settings.js";
+import * as acp from "./acp.js";
+import { GeminiAgent, Session } from "./zedIntegration.js";
+
+vi.mock("../config/config.js", () => ({
   loadCliConfig: vi.fn(),
 }));
 
-vi.mock('node:crypto', () => ({
-  randomUUID: () => 'test-session-id',
+vi.mock("node:crypto", () => ({
+  randomUUID: () => "test-session-id",
 }));
 
-vi.mock('node:fs/promises');
-vi.mock('node:path', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:path')>();
+vi.mock("node:fs/promises");
+vi.mock("node:path", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("node:path")>();
   return {
     ...actual,
     resolve: vi.fn(),
@@ -49,21 +40,19 @@ vi.mock('node:path', async (importOriginal) => {
 
 // Mock ReadManyFilesTool
 vi.mock(
-  '@airiscode/gemini-cli-core',
-  async (
-    importOriginal: () => Promise<typeof import('@airiscode/gemini-cli-core')>,
-  ) => {
+  "@airiscode/gemini-cli-core",
+  async (importOriginal: () => Promise<typeof import("@airiscode/gemini-cli-core")>) => {
     const actual = await importOriginal();
     return {
       ...actual,
       ReadManyFilesTool: vi.fn().mockImplementation(() => ({
-        name: 'read_many_files',
-        kind: 'native',
+        name: "read_many_files",
+        kind: "native",
         build: vi.fn().mockReturnValue({
-          getDescription: () => 'Read files',
+          getDescription: () => "Read files",
           toolLocations: () => [],
           execute: vi.fn().mockResolvedValue({
-            llmContent: ['--- file.txt ---\n\nFile content\n\n'],
+            llmContent: ["--- file.txt ---\n\nFile content\n\n"],
           }),
         }),
       })),
@@ -81,7 +70,7 @@ async function* createMockStream(items: any[]) {
   }
 }
 
-describe('GeminiAgent', () => {
+describe("GeminiAgent", () => {
   let mockConfig: Mocked<Awaited<ReturnType<typeof loadCliConfig>>>;
   let mockSettings: Mocked<LoadedSettings>;
   let mockArgv: CliArgs;
@@ -100,7 +89,7 @@ describe('GeminiAgent', () => {
     } as unknown as Mocked<Awaited<ReturnType<typeof loadCliConfig>>>;
     mockSettings = {
       merged: {
-        security: { auth: { selectedType: 'login_with_google' } },
+        security: { auth: { selectedType: "login_with_google" } },
         mcpServers: {},
       },
       setValue: vi.fn(),
@@ -115,7 +104,7 @@ describe('GeminiAgent', () => {
     agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockClient);
   });
 
-  it('should initialize correctly', async () => {
+  it("should initialize correctly", async () => {
     const response = await agent.initialize({
       clientCapabilities: { fs: { readTextFile: true, writeTextFile: true } },
       protocolVersion: 1,
@@ -126,82 +115,80 @@ describe('GeminiAgent', () => {
     expect(response.agentCapabilities.loadSession).toBe(false);
   });
 
-  it('should authenticate correctly', async () => {
+  it("should authenticate correctly", async () => {
     await agent.authenticate({
       methodId: AuthType.LOGIN_WITH_GOOGLE,
     });
 
-    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(
-      AuthType.LOGIN_WITH_GOOGLE,
-    );
+    expect(mockConfig.refreshAuth).toHaveBeenCalledWith(AuthType.LOGIN_WITH_GOOGLE);
     expect(mockSettings.setValue).toHaveBeenCalledWith(
       SettingScope.User,
-      'security.auth.selectedType',
+      "security.auth.selectedType",
       AuthType.LOGIN_WITH_GOOGLE,
     );
   });
 
-  it('should create a new session', async () => {
+  it("should create a new session", async () => {
     const response = await agent.newSession({
-      cwd: '/tmp',
+      cwd: "/tmp",
       mcpServers: [],
     });
 
-    expect(response.sessionId).toBe('test-session-id');
+    expect(response.sessionId).toBe("test-session-id");
     expect(loadCliConfig).toHaveBeenCalled();
     expect(mockConfig.initialize).toHaveBeenCalled();
     expect(mockConfig.getGeminiClient).toHaveBeenCalled();
   });
 
-  it('should create a new session with mcp servers', async () => {
+  it("should create a new session with mcp servers", async () => {
     const mcpServers = [
       {
-        name: 'test-server',
-        command: 'node',
-        args: ['server.js'],
-        env: [{ name: 'KEY', value: 'VALUE' }],
+        name: "test-server",
+        command: "node",
+        args: ["server.js"],
+        env: [{ name: "KEY", value: "VALUE" }],
       },
     ];
 
     await agent.newSession({
-      cwd: '/tmp',
+      cwd: "/tmp",
       mcpServers,
     });
 
     expect(loadCliConfig).toHaveBeenCalledWith(
       expect.objectContaining({
         mcpServers: expect.objectContaining({
-          'test-server': expect.objectContaining({
-            command: 'node',
-            args: ['server.js'],
-            env: { KEY: 'VALUE' },
+          "test-server": expect.objectContaining({
+            command: "node",
+            args: ["server.js"],
+            env: { KEY: "VALUE" },
           }),
         }),
       }),
-      'test-session-id',
+      "test-session-id",
       mockArgv,
-      '/tmp',
+      "/tmp",
     );
   });
 
-  it('should handle authentication failure gracefully', async () => {
-    mockConfig.refreshAuth.mockRejectedValue(new Error('Auth failed'));
-    const debugSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+  it("should handle authentication failure gracefully", async () => {
+    mockConfig.refreshAuth.mockRejectedValue(new Error("Auth failed"));
+    const debugSpy = vi.spyOn(console, "error").mockImplementation(() => {});
 
     // Should throw RequestError.authRequired()
     await expect(
       agent.newSession({
-        cwd: '/tmp',
+        cwd: "/tmp",
         mcpServers: [],
       }),
     ).rejects.toMatchObject({
-      message: 'Authentication required',
+      message: "Authentication required",
     });
 
     debugSpy.mockRestore();
   });
 
-  it('should initialize file system service if client supports it', async () => {
+  it("should initialize file system service if client supports it", async () => {
     agent = new GeminiAgent(mockConfig, mockSettings, mockArgv, mockClient);
     await agent.initialize({
       clientCapabilities: { fs: { readTextFile: true, writeTextFile: true } },
@@ -209,52 +196,50 @@ describe('GeminiAgent', () => {
     });
 
     await agent.newSession({
-      cwd: '/tmp',
+      cwd: "/tmp",
       mcpServers: [],
     });
 
     expect(mockConfig.setFileSystemService).toHaveBeenCalled();
   });
 
-  it('should cancel a session', async () => {
-    await agent.newSession({ cwd: '/tmp', mcpServers: [] });
+  it("should cancel a session", async () => {
+    await agent.newSession({ cwd: "/tmp", mcpServers: [] });
     // Mock the session's cancelPendingPrompt
-    const session = (
-      agent as unknown as { sessions: Map<string, Session> }
-    ).sessions.get('test-session-id');
-    if (!session) throw new Error('Session not found');
+    const session = (agent as unknown as { sessions: Map<string, Session> }).sessions.get(
+      "test-session-id",
+    );
+    if (!session) throw new Error("Session not found");
     session.cancelPendingPrompt = vi.fn();
 
-    await agent.cancel({ sessionId: 'test-session-id' });
+    await agent.cancel({ sessionId: "test-session-id" });
 
     expect(session.cancelPendingPrompt).toHaveBeenCalled();
   });
 
-  it('should throw error when cancelling non-existent session', async () => {
-    await expect(agent.cancel({ sessionId: 'unknown' })).rejects.toThrow(
-      'Session not found',
-    );
+  it("should throw error when cancelling non-existent session", async () => {
+    await expect(agent.cancel({ sessionId: "unknown" })).rejects.toThrow("Session not found");
   });
 
-  it('should delegate prompt to session', async () => {
-    await agent.newSession({ cwd: '/tmp', mcpServers: [] });
-    const session = (
-      agent as unknown as { sessions: Map<string, Session> }
-    ).sessions.get('test-session-id');
-    if (!session) throw new Error('Session not found');
-    session.prompt = vi.fn().mockResolvedValue({ stopReason: 'end_turn' });
+  it("should delegate prompt to session", async () => {
+    await agent.newSession({ cwd: "/tmp", mcpServers: [] });
+    const session = (agent as unknown as { sessions: Map<string, Session> }).sessions.get(
+      "test-session-id",
+    );
+    if (!session) throw new Error("Session not found");
+    session.prompt = vi.fn().mockResolvedValue({ stopReason: "end_turn" });
 
     const result = await agent.prompt({
-      sessionId: 'test-session-id',
+      sessionId: "test-session-id",
       prompt: [],
     });
 
     expect(session.prompt).toHaveBeenCalled();
-    expect(result).toEqual({ stopReason: 'end_turn' });
+    expect(result).toEqual({ stopReason: "end_turn" });
   });
 });
 
-describe('Session', () => {
+describe("Session", () => {
   let mockChat: Mocked<GeminiChat>;
   let mockConfig: Mocked<Config>;
   let mockClient: Mocked<acp.Client>;
@@ -268,12 +253,12 @@ describe('Session', () => {
       addHistory: vi.fn(),
     } as unknown as Mocked<GeminiChat>;
     mockTool = {
-      kind: 'native',
+      kind: "native",
       build: vi.fn().mockReturnValue({
-        getDescription: () => 'Test Tool',
+        getDescription: () => "Test Tool",
         toolLocations: () => [],
         shouldConfirmExecute: vi.fn().mockResolvedValue(null),
-        execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
+        execute: vi.fn().mockResolvedValue({ llmContent: "Tool Result" }),
       }),
     };
     mockToolRegistry = {
@@ -281,14 +266,14 @@ describe('Session', () => {
     };
     mockConfig = {
       isInFallbackMode: vi.fn().mockReturnValue(false),
-      getModel: vi.fn().mockReturnValue('gemini-pro'),
+      getModel: vi.fn().mockReturnValue("gemini-pro"),
       getPreviewFeatures: vi.fn().mockReturnValue({}),
       getToolRegistry: vi.fn().mockReturnValue(mockToolRegistry),
       getFileService: vi.fn().mockReturnValue({
         shouldIgnoreFile: vi.fn().mockReturnValue(false),
       }),
       getFileFilteringOptions: vi.fn().mockReturnValue({}),
-      getTargetDir: vi.fn().mockReturnValue('/tmp'),
+      getTargetDir: vi.fn().mockReturnValue("/tmp"),
       getEnableRecursiveFileSearch: vi.fn().mockReturnValue(false),
       getDebugMode: vi.fn().mockReturnValue(false),
     } as unknown as Mocked<Config>;
@@ -298,46 +283,46 @@ describe('Session', () => {
       sendNotification: vi.fn(),
     } as unknown as Mocked<acp.Client>;
 
-    session = new Session('session-1', mockChat, mockConfig, mockClient);
+    session = new Session("session-1", mockChat, mockConfig, mockClient);
   });
 
   afterEach(() => {
     vi.clearAllMocks();
   });
 
-  it('should handle prompt with text response', async () => {
+  it("should handle prompt with text response", async () => {
     const stream = createMockStream([
       {
         type: StreamEventType.CHUNK,
         value: {
-          candidates: [{ content: { parts: [{ text: 'Hello' }] } }],
+          candidates: [{ content: { parts: [{ text: "Hello" }] } }],
         },
       },
     ]);
     mockChat.sendMessageStream.mockResolvedValue(stream);
 
     const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
+      sessionId: "session-1",
+      prompt: [{ type: "text", text: "Hi" }],
     });
 
     expect(mockChat.sendMessageStream).toHaveBeenCalled();
     expect(mockClient.sessionUpdate).toHaveBeenCalledWith({
-      sessionId: 'session-1',
+      sessionId: "session-1",
       update: {
-        sessionUpdate: 'agent_message_chunk',
-        content: { type: 'text', text: 'Hello' },
+        sessionUpdate: "agent_message_chunk",
+        content: { type: "text", text: "Hello" },
       },
     });
-    expect(result).toEqual({ stopReason: 'end_turn' });
+    expect(result).toEqual({ stopReason: "end_turn" });
   });
 
-  it('should handle tool calls', async () => {
+  it("should handle tool calls", async () => {
     const stream1 = createMockStream([
       {
         type: StreamEventType.CHUNK,
         value: {
-          functionCalls: [{ name: 'test_tool', args: { foo: 'bar' } }],
+          functionCalls: [{ name: "test_tool", args: { foo: "bar" } }],
         },
       },
     ]);
@@ -345,56 +330,54 @@ describe('Session', () => {
       {
         type: StreamEventType.CHUNK,
         value: {
-          candidates: [{ content: { parts: [{ text: 'Result' }] } }],
+          candidates: [{ content: { parts: [{ text: "Result" }] } }],
         },
       },
     ]);
 
-    mockChat.sendMessageStream
-      .mockResolvedValueOnce(stream1)
-      .mockResolvedValueOnce(stream2);
+    mockChat.sendMessageStream.mockResolvedValueOnce(stream1).mockResolvedValueOnce(stream2);
 
     const result = await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
+      sessionId: "session-1",
+      prompt: [{ type: "text", text: "Call tool" }],
     });
 
-    expect(mockToolRegistry.getTool).toHaveBeenCalledWith('test_tool');
-    expect(mockTool.build).toHaveBeenCalledWith({ foo: 'bar' });
+    expect(mockToolRegistry.getTool).toHaveBeenCalledWith("test_tool");
+    expect(mockTool.build).toHaveBeenCalledWith({ foo: "bar" });
     expect(mockClient.sessionUpdate).toHaveBeenCalledWith(
       expect.objectContaining({
         update: expect.objectContaining({
-          sessionUpdate: 'tool_call',
-          status: 'in_progress',
+          sessionUpdate: "tool_call",
+          status: "in_progress",
         }),
       }),
     );
     expect(mockClient.sessionUpdate).toHaveBeenCalledWith(
       expect.objectContaining({
         update: expect.objectContaining({
-          sessionUpdate: 'tool_call_update',
-          status: 'completed',
+          sessionUpdate: "tool_call_update",
+          status: "completed",
         }),
       }),
     );
-    expect(result).toEqual({ stopReason: 'end_turn' });
+    expect(result).toEqual({ stopReason: "end_turn" });
   });
 
-  it('should handle tool call permission request', async () => {
+  it("should handle tool call permission request", async () => {
     const confirmationDetails = {
-      type: 'info',
+      type: "info",
       onConfirm: vi.fn(),
     };
     mockTool.build.mockReturnValue({
-      getDescription: () => 'Test Tool',
+      getDescription: () => "Test Tool",
       toolLocations: () => [],
       shouldConfirmExecute: vi.fn().mockResolvedValue(confirmationDetails),
-      execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
+      execute: vi.fn().mockResolvedValue({ llmContent: "Tool Result" }),
     });
 
     mockClient.requestPermission.mockResolvedValue({
       outcome: {
-        outcome: 'selected',
+        outcome: "selected",
         optionId: ToolConfirmationOutcome.ProceedOnce,
       },
     });
@@ -403,7 +386,7 @@ describe('Session', () => {
       {
         type: StreamEventType.CHUNK,
         value: {
-          functionCalls: [{ name: 'test_tool', args: {} }],
+          functionCalls: [{ name: "test_tool", args: {} }],
         },
       },
     ]);
@@ -414,42 +397,38 @@ describe('Session', () => {
       },
     ]);
 
-    mockChat.sendMessageStream
-      .mockResolvedValueOnce(stream1)
-      .mockResolvedValueOnce(stream2);
+    mockChat.sendMessageStream.mockResolvedValueOnce(stream1).mockResolvedValueOnce(stream2);
 
     await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
+      sessionId: "session-1",
+      prompt: [{ type: "text", text: "Call tool" }],
     });
 
     expect(mockClient.requestPermission).toHaveBeenCalled();
-    expect(confirmationDetails.onConfirm).toHaveBeenCalledWith(
-      ToolConfirmationOutcome.ProceedOnce,
-    );
+    expect(confirmationDetails.onConfirm).toHaveBeenCalledWith(ToolConfirmationOutcome.ProceedOnce);
   });
 
-  it('should handle tool call cancellation by user', async () => {
+  it("should handle tool call cancellation by user", async () => {
     const confirmationDetails = {
-      type: 'info',
+      type: "info",
       onConfirm: vi.fn(),
     };
     mockTool.build.mockReturnValue({
-      getDescription: () => 'Test Tool',
+      getDescription: () => "Test Tool",
       toolLocations: () => [],
       shouldConfirmExecute: vi.fn().mockResolvedValue(confirmationDetails),
-      execute: vi.fn().mockResolvedValue({ llmContent: 'Tool Result' }),
+      execute: vi.fn().mockResolvedValue({ llmContent: "Tool Result" }),
     });
 
     mockClient.requestPermission.mockResolvedValue({
-      outcome: { outcome: 'cancelled' },
+      outcome: { outcome: "cancelled" },
     });
 
     const stream1 = createMockStream([
       {
         type: StreamEventType.CHUNK,
         value: {
-          functionCalls: [{ name: 'test_tool', args: {} }],
+          functionCalls: [{ name: "test_tool", args: {} }],
         },
       },
     ]);
@@ -460,13 +439,11 @@ describe('Session', () => {
       },
     ]);
 
-    mockChat.sendMessageStream
-      .mockResolvedValueOnce(stream1)
-      .mockResolvedValueOnce(stream2);
+    mockChat.sendMessageStream.mockResolvedValueOnce(stream1).mockResolvedValueOnce(stream2);
 
     await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
+      sessionId: "session-1",
+      prompt: [{ type: "text", text: "Call tool" }],
     });
 
     // When cancelled, it sends an error response to the model
@@ -479,7 +456,7 @@ describe('Session', () => {
         expect.objectContaining({
           functionResponse: expect.objectContaining({
             response: {
-              error: expect.stringContaining('canceled by the user'),
+              error: expect.stringContaining("canceled by the user"),
             },
           }),
         }),
@@ -487,8 +464,8 @@ describe('Session', () => {
     );
   });
 
-  it('should handle @path resolution', async () => {
-    (path.resolve as unknown as Mock).mockReturnValue('/tmp/file.txt');
+  it("should handle @path resolution", async () => {
+    (path.resolve as unknown as Mock).mockReturnValue("/tmp/file.txt");
     (fs.stat as unknown as Mock).mockResolvedValue({
       isDirectory: () => false,
     });
@@ -503,14 +480,14 @@ describe('Session', () => {
     mockChat.sendMessageStream.mockResolvedValue(stream);
 
     await session.prompt({
-      sessionId: 'session-1',
+      sessionId: "session-1",
       prompt: [
-        { type: 'text', text: 'Read' },
+        { type: "text", text: "Read" },
         {
-          type: 'resource_link',
-          uri: 'file://file.txt',
-          mimeType: 'text/plain',
-          name: 'file.txt',
+          type: "resource_link",
+          uri: "file://file.txt",
+          mimeType: "text/plain",
+          name: "file.txt",
         },
       ],
     });
@@ -524,7 +501,7 @@ describe('Session', () => {
       expect.anything(),
       expect.arrayContaining([
         expect.objectContaining({
-          text: expect.stringContaining('Content from @file.txt'),
+          text: expect.stringContaining("Content from @file.txt"),
         }),
       ]),
       expect.anything(),
@@ -532,7 +509,7 @@ describe('Session', () => {
     );
   });
 
-  it('should handle cancellation during prompt', async () => {
+  it("should handle cancellation during prompt", async () => {
     let streamController: ReadableStreamDefaultController<unknown>;
     const stream = new ReadableStream({
       start(controller) {
@@ -547,75 +524,75 @@ describe('Session', () => {
 
     // Adapt web stream to async iterable
     async function* asyncStream() {
-      process.stdout.write('TEST: asyncStream started\n');
+      process.stdout.write("TEST: asyncStream started\n");
       streamStarted(true);
       const reader = stream.getReader();
       try {
         while (true) {
-          process.stdout.write('TEST: waiting for read\n');
+          process.stdout.write("TEST: waiting for read\n");
           const { done, value } = await reader.read();
           process.stdout.write(`TEST: read returned done=${done}\n`);
           if (done) break;
           yield value;
         }
       } finally {
-        process.stdout.write('TEST: releasing lock\n');
+        process.stdout.write("TEST: releasing lock\n");
         reader.releaseLock();
       }
     }
 
     mockChat.sendMessageStream.mockResolvedValue(asyncStream());
 
-    process.stdout.write('TEST: calling prompt\n');
+    process.stdout.write("TEST: calling prompt\n");
     const promptPromise = session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Hi' }],
+      sessionId: "session-1",
+      prompt: [{ type: "text", text: "Hi" }],
     });
 
-    process.stdout.write('TEST: waiting for streamStarted\n');
+    process.stdout.write("TEST: waiting for streamStarted\n");
     await streamStartedPromise;
-    process.stdout.write('TEST: streamStarted\n');
+    process.stdout.write("TEST: streamStarted\n");
     await session.cancelPendingPrompt();
-    process.stdout.write('TEST: cancelled\n');
+    process.stdout.write("TEST: cancelled\n");
 
     // Close the stream to allow prompt loop to continue and check aborted signal
     streamController!.close();
-    process.stdout.write('TEST: stream closed\n');
+    process.stdout.write("TEST: stream closed\n");
 
     const result = await promptPromise;
     process.stdout.write(`TEST: result received ${JSON.stringify(result)}\n`);
-    expect(result).toEqual({ stopReason: 'cancelled' });
+    expect(result).toEqual({ stopReason: "cancelled" });
   });
 
-  it('should handle rate limit error', async () => {
-    const error = new Error('Rate limit');
+  it("should handle rate limit error", async () => {
+    const error = new Error("Rate limit");
     (error as unknown as { status: number }).status = 429;
     mockChat.sendMessageStream.mockRejectedValue(error);
 
     await expect(
       session.prompt({
-        sessionId: 'session-1',
-        prompt: [{ type: 'text', text: 'Hi' }],
+        sessionId: "session-1",
+        prompt: [{ type: "text", text: "Hi" }],
       }),
     ).rejects.toMatchObject({
       code: 429,
-      message: 'Rate limit exceeded. Try again later.',
+      message: "Rate limit exceeded. Try again later.",
     });
   });
 
-  it('should handle tool execution error', async () => {
+  it("should handle tool execution error", async () => {
     mockTool.build.mockReturnValue({
-      getDescription: () => 'Test Tool',
+      getDescription: () => "Test Tool",
       toolLocations: () => [],
       shouldConfirmExecute: vi.fn().mockResolvedValue(null),
-      execute: vi.fn().mockRejectedValue(new Error('Tool failed')),
+      execute: vi.fn().mockRejectedValue(new Error("Tool failed")),
     });
 
     const stream1 = createMockStream([
       {
         type: StreamEventType.CHUNK,
         value: {
-          functionCalls: [{ name: 'test_tool', args: {} }],
+          functionCalls: [{ name: "test_tool", args: {} }],
         },
       },
     ]);
@@ -626,23 +603,21 @@ describe('Session', () => {
       },
     ]);
 
-    mockChat.sendMessageStream
-      .mockResolvedValueOnce(stream1)
-      .mockResolvedValueOnce(stream2);
+    mockChat.sendMessageStream.mockResolvedValueOnce(stream1).mockResolvedValueOnce(stream2);
 
     await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
+      sessionId: "session-1",
+      prompt: [{ type: "text", text: "Call tool" }],
     });
 
     expect(mockClient.sessionUpdate).toHaveBeenCalledWith(
       expect.objectContaining({
         update: expect.objectContaining({
-          sessionUpdate: 'tool_call_update',
-          status: 'failed',
+          sessionUpdate: "tool_call_update",
+          status: "failed",
           content: expect.arrayContaining([
             expect.objectContaining({
-              content: expect.objectContaining({ text: 'Tool failed' }),
+              content: expect.objectContaining({ text: "Tool failed" }),
             }),
           ]),
         }),
@@ -650,14 +625,14 @@ describe('Session', () => {
     );
   });
 
-  it('should handle missing tool', async () => {
+  it("should handle missing tool", async () => {
     mockToolRegistry.getTool.mockReturnValue(undefined);
 
     const stream1 = createMockStream([
       {
         type: StreamEventType.CHUNK,
         value: {
-          functionCalls: [{ name: 'unknown_tool', args: {} }],
+          functionCalls: [{ name: "unknown_tool", args: {} }],
         },
       },
     ]);
@@ -668,13 +643,11 @@ describe('Session', () => {
       },
     ]);
 
-    mockChat.sendMessageStream
-      .mockResolvedValueOnce(stream1)
-      .mockResolvedValueOnce(stream2);
+    mockChat.sendMessageStream.mockResolvedValueOnce(stream1).mockResolvedValueOnce(stream2);
 
     await session.prompt({
-      sessionId: 'session-1',
-      prompt: [{ type: 'text', text: 'Call tool' }],
+      sessionId: "session-1",
+      prompt: [{ type: "text", text: "Call tool" }],
     });
 
     // Should send error response to model
@@ -686,7 +659,7 @@ describe('Session', () => {
         expect.objectContaining({
           functionResponse: expect.objectContaining({
             response: {
-              error: expect.stringContaining('not found in registry'),
+              error: expect.stringContaining("not found in registry"),
             },
           }),
         }),
@@ -694,10 +667,8 @@ describe('Session', () => {
     );
   });
 
-  it('should ignore files based on configuration', async () => {
-    (
-      mockConfig.getFileService().shouldIgnoreFile as unknown as Mock
-    ).mockReturnValue(true);
+  it("should ignore files based on configuration", async () => {
+    (mockConfig.getFileService().shouldIgnoreFile as unknown as Mock).mockReturnValue(true);
     const stream = createMockStream([
       {
         type: StreamEventType.CHUNK,
@@ -707,25 +678,23 @@ describe('Session', () => {
     mockChat.sendMessageStream.mockResolvedValue(stream);
 
     await session.prompt({
-      sessionId: 'session-1',
+      sessionId: "session-1",
       prompt: [
         {
-          type: 'resource_link',
-          uri: 'file://ignored.txt',
-          mimeType: 'text/plain',
-          name: 'ignored.txt',
+          type: "resource_link",
+          uri: "file://ignored.txt",
+          mimeType: "text/plain",
+          name: "ignored.txt",
         },
       ],
     });
 
     // Should not read file
-    expect(mockToolRegistry.getTool).not.toHaveBeenCalledWith(
-      'read_many_files',
-    );
+    expect(mockToolRegistry.getTool).not.toHaveBeenCalledWith("read_many_files");
   });
 
-  it('should handle directory resolution with glob', async () => {
-    (path.resolve as unknown as Mock).mockReturnValue('/tmp/dir');
+  it("should handle directory resolution with glob", async () => {
+    (path.resolve as unknown as Mock).mockReturnValue("/tmp/dir");
     (fs.stat as unknown as Mock).mockResolvedValue({
       isDirectory: () => true,
     });
@@ -740,13 +709,13 @@ describe('Session', () => {
     mockChat.sendMessageStream.mockResolvedValue(stream);
 
     await session.prompt({
-      sessionId: 'session-1',
+      sessionId: "session-1",
       prompt: [
         {
-          type: 'resource_link',
-          uri: 'file://dir',
-          mimeType: 'text/plain',
-          name: 'dir',
+          type: "resource_link",
+          uri: "file://dir",
+          mimeType: "text/plain",
+          name: "dir",
         },
       ],
     });
@@ -755,9 +724,7 @@ describe('Session', () => {
     // ReadManyFilesTool is instantiated directly, so we check if the mock instance's build method was called
     const MockReadManyFilesTool = ReadManyFilesTool as unknown as Mock;
     const mockInstance =
-      MockReadManyFilesTool.mock.results[
-        MockReadManyFilesTool.mock.results.length - 1
-      ].value;
+      MockReadManyFilesTool.mock.results[MockReadManyFilesTool.mock.results.length - 1].value;
     expect(mockInstance.build).toHaveBeenCalled();
   });
 });
diff --git a/packages/ui-gemini/src/zed-integration/zedIntegration.ts b/packages/ui-gemini/src/zed-integration/zedIntegration.ts
index 8f45248de..42ac54f0f 100644
--- a/packages/ui-gemini/src/zed-integration/zedIntegration.ts
+++ b/packages/ui-gemini/src/zed-integration/zedIntegration.ts
@@ -4,54 +4,48 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { WritableStream, ReadableStream } from 'node:stream/web';
-
+import { randomUUID } from "node:crypto";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { Readable, Writable } from "node:stream";
+import type { ReadableStream, WritableStream } from "node:stream/web";
 import type {
   Config,
+  FilterFilesOptions,
   GeminiChat,
-  ToolResult,
   ToolCallConfirmationDetails,
-  FilterFilesOptions,
-} from '@airiscode/gemini-cli-core';
+  ToolResult,
+} from "@airiscode/gemini-cli-core";
 import {
   AuthType,
-  logToolCall,
-  convertToFunctionResponse,
-  ToolConfirmationOutcome,
   clearCachedCredentialFile,
-  isNodeError,
+  convertToFunctionResponse,
+  createWorkingStdio,
+  DiscoveredMCPTool,
+  debugLogger,
+  getEffectiveModel,
   getErrorMessage,
-  isWithinRoot,
   getErrorStatus,
+  isNodeError,
+  isWithinRoot,
+  logToolCall,
   MCPServerConfig,
-  DiscoveredMCPTool,
-  StreamEventType,
-  ToolCallEvent,
-  debugLogger,
   ReadManyFilesTool,
-  getEffectiveModel,
-  createWorkingStdio,
+  StreamEventType,
   startupProfiler,
-} from '@airiscode/gemini-cli-core';
-import * as acp from './acp.js';
-import { AcpFileSystemService } from './fileSystemService.js';
-import { Readable, Writable } from 'node:stream';
-import type { Content, Part, FunctionCall } from '@google/genai';
-import type { LoadedSettings } from '../config/settings.js';
-import { SettingScope } from '../config/settings.js';
-import * as fs from 'node:fs/promises';
-import * as path from 'node:path';
-import { z } from 'zod';
-
-import { randomUUID } from 'node:crypto';
-import type { CliArgs } from '../config/config.js';
-import { loadCliConfig } from '../config/config.js';
-
-export async function runZedIntegration(
-  config: Config,
-  settings: LoadedSettings,
-  argv: CliArgs,
-) {
+  ToolCallEvent,
+  ToolConfirmationOutcome,
+} from "@airiscode/gemini-cli-core";
+import type { Content, FunctionCall, Part } from "@google/genai";
+import { z } from "zod";
+import type { CliArgs } from "../config/config.js";
+import { loadCliConfig } from "../config/config.js";
+import type { LoadedSettings } from "../config/settings.js";
+import { SettingScope } from "../config/settings.js";
+import * as acp from "./acp.js";
+import { AcpFileSystemService } from "./fileSystemService.js";
+
+export async function runZedIntegration(config: Config, settings: LoadedSettings, argv: CliArgs) {
   const { stdout: workingStdout } = createWorkingStdio();
   const stdout = Writable.toWeb(workingStdout) as WritableStream;
   const stdin = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;
@@ -74,25 +68,22 @@ export class GeminiAgent {
     private client: acp.Client,
   ) {}
 
-  async initialize(
-    args: acp.InitializeRequest,
-  ): Promise<acp.InitializeResponse> {
+  async initialize(args: acp.InitializeRequest): Promise<acp.InitializeResponse> {
     this.clientCapabilities = args.clientCapabilities;
     const authMethods = [
       {
         id: AuthType.LOGIN_WITH_GOOGLE,
-        name: 'Log in with Google',
+        name: "Log in with Google",
         description: null,
       },
       {
         id: AuthType.USE_GEMINI,
-        name: 'Use Gemini API key',
-        description:
-          'Requires setting the `GEMINI_API_KEY` environment variable',
+        name: "Use Gemini API key",
+        description: "Requires setting the `GEMINI_API_KEY` environment variable",
       },
       {
         id: AuthType.USE_VERTEX_AI,
-        name: 'Vertex AI',
+        name: "Vertex AI",
         description: null,
       },
     ];
@@ -124,26 +115,17 @@ export class GeminiAgent {
     // This will reuse existing credentials if they're valid,
     // or perform new authentication if needed
     await this.config.refreshAuth(method);
-    this.settings.setValue(
-      SettingScope.User,
-      'security.auth.selectedType',
-      method,
-    );
+    this.settings.setValue(SettingScope.User, "security.auth.selectedType", method);
   }
 
-  async newSession({
-    cwd,
-    mcpServers,
-  }: acp.NewSessionRequest): Promise<acp.NewSessionResponse> {
+  async newSession({ cwd, mcpServers }: acp.NewSessionRequest): Promise<acp.NewSessionResponse> {
     const sessionId = randomUUID();
     const config = await this.newSessionConfig(sessionId, cwd, mcpServers);
 
     let isAuthenticated = false;
     if (this.settings.merged.security?.auth?.selectedType) {
       try {
-        await config.refreshAuth(
-          this.settings.merged.security.auth.selectedType,
-        );
+        await config.refreshAuth(this.settings.merged.security.auth.selectedType);
         isAuthenticated = true;
       } catch (e) {
         debugLogger.error(`Authentication failed: ${e}`);
@@ -227,7 +209,7 @@ export class Session {
 
   async cancelPendingPrompt(): Promise<void> {
     if (!this.pendingPrompt) {
-      throw new Error('Not currently generating');
+      throw new Error("Not currently generating");
     }
 
     this.pendingPrompt.abort();
@@ -244,12 +226,12 @@ export class Session {
 
     const parts = await this.#resolvePrompt(params.prompt, pendingSend.signal);
 
-    let nextMessage: Content | null = { role: 'user', parts };
+    let nextMessage: Content | null = { role: "user", parts };
 
     while (nextMessage !== null) {
       if (pendingSend.signal.aborted) {
         chat.addHistory(nextMessage);
-        return { stopReason: 'cancelled' };
+        return { stopReason: "cancelled" };
       }
 
       const functionCalls: FunctionCall[] = [];
@@ -270,7 +252,7 @@ export class Session {
 
         for await (const resp of responseStream) {
           if (pendingSend.signal.aborted) {
-            return { stopReason: 'cancelled' };
+            return { stopReason: "cancelled" };
           }
 
           if (
@@ -285,15 +267,13 @@ export class Session {
               }
 
               const content: acp.ContentBlock = {
-                type: 'text',
+                type: "text",
                 text: part.text,
               };
 
               // eslint-disable-next-line @typescript-eslint/no-floating-promises
               this.sendUpdate({
-                sessionUpdate: part.thought
-                  ? 'agent_thought_chunk'
-                  : 'agent_message_chunk',
+                sessionUpdate: part.thought ? "agent_thought_chunk" : "agent_message_chunk",
                 content,
               });
             }
@@ -305,21 +285,15 @@ export class Session {
         }
 
         if (pendingSend.signal.aborted) {
-          return { stopReason: 'cancelled' };
+          return { stopReason: "cancelled" };
         }
       } catch (error) {
         if (getErrorStatus(error) === 429) {
-          throw new acp.RequestError(
-            429,
-            'Rate limit exceeded. Try again later.',
-          );
+          throw new acp.RequestError(429, "Rate limit exceeded. Try again later.");
         }
 
-        if (
-          pendingSend.signal.aborted ||
-          (error instanceof Error && error.name === 'AbortError')
-        ) {
-          return { stopReason: 'cancelled' };
+        if (pendingSend.signal.aborted || (error instanceof Error && error.name === "AbortError")) {
+          return { stopReason: "cancelled" };
         }
 
         throw error;
@@ -333,11 +307,11 @@ export class Session {
           toolResponseParts.push(...response);
         }
 
-        nextMessage = { role: 'user', parts: toolResponseParts };
+        nextMessage = { role: "user", parts: toolResponseParts };
       }
     }
 
-    return { stopReason: 'end_turn' };
+    return { stopReason: "end_turn" };
   }
 
   private async sendUpdate(update: acp.SessionUpdate): Promise<void> {
@@ -365,14 +339,12 @@ export class Session {
         this.config,
         new ToolCallEvent(
           undefined,
-          fc.name ?? '',
+          fc.name ?? "",
           args,
           durationMs,
           false,
           promptId,
-          typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
-            ? 'mcp'
-            : 'native',
+          typeof tool !== "undefined" && tool instanceof DiscoveredMCPTool ? "mcp" : "native",
           error.message,
         ),
       );
@@ -381,7 +353,7 @@ export class Session {
         {
           functionResponse: {
             id: callId,
-            name: fc.name ?? '',
+            name: fc.name ?? "",
             response: { error: error.message },
           },
         },
@@ -389,30 +361,27 @@ export class Session {
     };
 
     if (!fc.name) {
-      return errorResponse(new Error('Missing function name'));
+      return errorResponse(new Error("Missing function name"));
     }
 
     const toolRegistry = this.config.getToolRegistry();
     const tool = toolRegistry.getTool(fc.name as string);
 
     if (!tool) {
-      return errorResponse(
-        new Error(`Tool "${fc.name}" not found in registry.`),
-      );
+      return errorResponse(new Error(`Tool "${fc.name}" not found in registry.`));
     }
 
     try {
       const invocation = tool.build(args);
 
-      const confirmationDetails =
-        await invocation.shouldConfirmExecute(abortSignal);
+      const confirmationDetails = await invocation.shouldConfirmExecute(abortSignal);
 
       if (confirmationDetails) {
         const content: acp.ToolCallContent[] = [];
 
-        if (confirmationDetails.type === 'edit') {
+        if (confirmationDetails.type === "edit") {
           content.push({
-            type: 'diff',
+            type: "diff",
             path: confirmationDetails.fileName,
             oldText: confirmationDetails.originalContent,
             newText: confirmationDetails.newContent,
@@ -424,7 +393,7 @@ export class Session {
           options: toPermissionOptions(confirmationDetails),
           toolCall: {
             toolCallId: callId,
-            status: 'pending',
+            status: "pending",
             title: invocation.getDescription(),
             content,
             locations: invocation.toolLocations(),
@@ -434,19 +403,15 @@ export class Session {
 
         const output = await this.client.requestPermission(params);
         const outcome =
-          output.outcome.outcome === 'cancelled'
+          output.outcome.outcome === "cancelled"
             ? ToolConfirmationOutcome.Cancel
-            : z
-                .nativeEnum(ToolConfirmationOutcome)
-                .parse(output.outcome.optionId);
+            : z.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
 
         await confirmationDetails.onConfirm(outcome);
 
         switch (outcome) {
           case ToolConfirmationOutcome.Cancel:
-            return errorResponse(
-              new Error(`Tool "${fc.name}" was canceled by the user.`),
-            );
+            return errorResponse(new Error(`Tool "${fc.name}" was canceled by the user.`));
           case ToolConfirmationOutcome.ProceedOnce:
           case ToolConfirmationOutcome.ProceedAlways:
           case ToolConfirmationOutcome.ProceedAlwaysServer:
@@ -460,9 +425,9 @@ export class Session {
         }
       } else {
         await this.sendUpdate({
-          sessionUpdate: 'tool_call',
+          sessionUpdate: "tool_call",
           toolCallId: callId,
-          status: 'in_progress',
+          status: "in_progress",
           title: invocation.getDescription(),
           content: [],
           locations: invocation.toolLocations(),
@@ -474,9 +439,9 @@ export class Session {
       const content = toToolCallContent(toolResult);
 
       await this.sendUpdate({
-        sessionUpdate: 'tool_call_update',
+        sessionUpdate: "tool_call_update",
         toolCallId: callId,
-        status: 'completed',
+        status: "completed",
         content: content ? [content] : [],
       });
 
@@ -485,14 +450,12 @@ export class Session {
         this.config,
         new ToolCallEvent(
           undefined,
-          fc.name ?? '',
+          fc.name ?? "",
           args,
           durationMs,
           true,
           promptId,
-          typeof tool !== 'undefined' && tool instanceof DiscoveredMCPTool
-            ? 'mcp'
-            : 'native',
+          typeof tool !== "undefined" && tool instanceof DiscoveredMCPTool ? "mcp" : "native",
         ),
       );
 
@@ -501,39 +464,34 @@ export class Session {
       const error = e instanceof Error ? e : new Error(String(e));
 
       await this.sendUpdate({
-        sessionUpdate: 'tool_call_update',
+        sessionUpdate: "tool_call_update",
         toolCallId: callId,
-        status: 'failed',
-        content: [
-          { type: 'content', content: { type: 'text', text: error.message } },
-        ],
+        status: "failed",
+        content: [{ type: "content", content: { type: "text", text: error.message } }],
       });
 
       return errorResponse(error);
     }
   }
 
-  async #resolvePrompt(
-    message: acp.ContentBlock[],
-    abortSignal: AbortSignal,
-  ): Promise<Part[]> {
-    const FILE_URI_SCHEME = 'file://';
+  async #resolvePrompt(message: acp.ContentBlock[], abortSignal: AbortSignal): Promise<Part[]> {
+    const FILE_URI_SCHEME = "file://";
 
     const embeddedContext: acp.EmbeddedResourceResource[] = [];
 
     const parts = message.map((part) => {
       switch (part.type) {
-        case 'text':
+        case "text":
           return { text: part.text };
-        case 'image':
-        case 'audio':
+        case "image":
+        case "audio":
           return {
             inlineData: {
               mimeType: part.mimeType,
               data: part.data,
             },
           };
-        case 'resource_link': {
+        case "resource_link": {
           if (part.uri.startsWith(FILE_URI_SCHEME)) {
             return {
               fileData: {
@@ -546,7 +504,7 @@ export class Session {
             return { text: `@${part.uri}` };
           }
         }
-        case 'resource': {
+        case "resource": {
           embeddedContext.push(part.resource);
           return { text: `@${part.resource.uri}` };
         }
@@ -557,7 +515,7 @@ export class Session {
       }
     });
 
-    const atPathCommandParts = parts.filter((part) => 'fileData' in part);
+    const atPathCommandParts = parts.filter((part) => "fileData" in part);
 
     if (atPathCommandParts.length === 0 && embeddedContext.length === 0) {
       return parts;
@@ -567,8 +525,7 @@ export class Session {
 
     // Get centralized file discovery service
     const fileDiscovery = this.config.getFileService();
-    const fileFilteringOptions: FilterFilesOptions =
-      this.config.getFileFilteringOptions();
+    const fileFilteringOptions: FilterFilesOptions = this.config.getFileFilteringOptions();
 
     const pathSpecsToRead: string[] = [];
     const contentLabelsForDisplay: string[] = [];
@@ -576,10 +533,10 @@ export class Session {
 
     const toolRegistry = this.config.getToolRegistry();
     const readManyFilesTool = new ReadManyFilesTool(this.config);
-    const globTool = toolRegistry.getTool('glob');
+    const globTool = toolRegistry.getTool("glob");
 
     if (!readManyFilesTool) {
-      throw new Error('Error: read_many_files tool not found.');
+      throw new Error("Error: read_many_files tool not found.");
     }
 
     for (const atPathPart of atPathCommandParts) {
@@ -597,27 +554,19 @@ export class Session {
         if (isWithinRoot(absolutePath, this.config.getTargetDir())) {
           const stats = await fs.stat(absolutePath);
           if (stats.isDirectory()) {
-            currentPathSpec = pathName.endsWith('/')
-              ? `${pathName}**`
-              : `${pathName}/**`;
-            this.debug(
-              `Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`,
-            );
+            currentPathSpec = pathName.endsWith("/") ? `${pathName}**` : `${pathName}/**`;
+            this.debug(`Path ${pathName} resolved to directory, using glob: ${currentPathSpec}`);
           } else {
             this.debug(`Path ${pathName} resolved to file: ${currentPathSpec}`);
           }
           resolvedSuccessfully = true;
         } else {
-          this.debug(
-            `Path ${pathName} is outside the project directory. Skipping.`,
-          );
+          this.debug(`Path ${pathName} is outside the project directory. Skipping.`);
         }
       } catch (error) {
-        if (isNodeError(error) && error.code === 'ENOENT') {
+        if (isNodeError(error) && error.code === "ENOENT") {
           if (this.config.getEnableRecursiveFileSearch() && globTool) {
-            this.debug(
-              `Path ${pathName} not found directly, attempting glob search.`,
-            );
+            this.debug(`Path ${pathName} not found directly, attempting glob search.`);
             try {
               const globResult = await globTool.buildAndExecute(
                 {
@@ -628,17 +577,14 @@ export class Session {
               );
               if (
                 globResult.llmContent &&
-                typeof globResult.llmContent === 'string' &&
-                !globResult.llmContent.startsWith('No files found') &&
-                !globResult.llmContent.startsWith('Error:')
+                typeof globResult.llmContent === "string" &&
+                !globResult.llmContent.startsWith("No files found") &&
+                !globResult.llmContent.startsWith("Error:")
               ) {
-                const lines = globResult.llmContent.split('\n');
+                const lines = globResult.llmContent.split("\n");
                 if (lines.length > 1 && lines[1]) {
                   const firstMatchAbsolute = lines[1].trim();
-                  currentPathSpec = path.relative(
-                    this.config.getTargetDir(),
-                    firstMatchAbsolute,
-                  );
+                  currentPathSpec = path.relative(this.config.getTargetDir(), firstMatchAbsolute);
                   this.debug(
                     `Glob search for ${pathName} found ${firstMatchAbsolute}, using relative path: ${currentPathSpec}`,
                   );
@@ -659,14 +605,10 @@ export class Session {
               );
             }
           } else {
-            this.debug(
-              `Glob tool not found. Path ${pathName} will be skipped.`,
-            );
+            this.debug(`Glob tool not found. Path ${pathName} will be skipped.`);
           }
         } else {
-          debugLogger.error(
-            `Error stating path ${pathName}. Path ${pathName} will be skipped.`,
-          );
+          debugLogger.error(`Error stating path ${pathName}. Path ${pathName} will be skipped.`);
         }
       }
       if (resolvedSuccessfully) {
@@ -677,29 +619,27 @@ export class Session {
     }
 
     // Construct the initial part of the query for the LLM
-    let initialQueryText = '';
+    let initialQueryText = "";
     for (let i = 0; i < parts.length; i++) {
       const chunk = parts[i];
-      if ('text' in chunk) {
+      if ("text" in chunk) {
         initialQueryText += chunk.text;
       } else {
         // type === 'atPath'
-        const resolvedSpec =
-          chunk.fileData && atPathToResolvedSpecMap.get(chunk.fileData.fileUri);
+        const resolvedSpec = chunk.fileData && atPathToResolvedSpecMap.get(chunk.fileData.fileUri);
         if (
           i > 0 &&
           initialQueryText.length > 0 &&
-          !initialQueryText.endsWith(' ') &&
+          !initialQueryText.endsWith(" ") &&
           resolvedSpec
         ) {
           // Add space if previous part was text and didn't end with space, or if previous was @path
           const prevPart = parts[i - 1];
           if (
-            'text' in prevPart ||
-            ('fileData' in prevPart &&
-              atPathToResolvedSpecMap.has(prevPart.fileData!.fileUri))
+            "text" in prevPart ||
+            ("fileData" in prevPart && atPathToResolvedSpecMap.has(prevPart.fileData!.fileUri))
           ) {
-            initialQueryText += ' ';
+            initialQueryText += " ";
           }
         }
         if (resolvedSpec) {
@@ -710,10 +650,10 @@ export class Session {
           if (
             i > 0 &&
             initialQueryText.length > 0 &&
-            !initialQueryText.endsWith(' ') &&
-            !chunk.fileData?.fileUri.startsWith(' ')
+            !initialQueryText.endsWith(" ") &&
+            !chunk.fileData?.fileUri.startsWith(" ")
           ) {
-            initialQueryText += ' ';
+            initialQueryText += " ";
           }
           if (chunk.fileData?.fileUri) {
             initialQueryText += `@${chunk.fileData.fileUri}`;
@@ -724,16 +664,14 @@ export class Session {
     initialQueryText = initialQueryText.trim();
     // Inform user about ignored paths
     if (ignoredPaths.length > 0) {
-      this.debug(
-        `Ignored ${ignoredPaths.length} files: ${ignoredPaths.join(', ')}`,
-      );
+      this.debug(`Ignored ${ignoredPaths.length} files: ${ignoredPaths.join(", ")}`);
     }
 
     const processedQueryParts: Part[] = [{ text: initialQueryText }];
 
     if (pathSpecsToRead.length === 0 && embeddedContext.length === 0) {
       // Fallback for lone "@" or completely invalid @-commands resulting in empty initialQueryText
-      debugLogger.warn('No valid file paths found in @ commands to read.');
+      debugLogger.warn("No valid file paths found in @ commands to read.");
       return [{ text: initialQueryText }];
     }
 
@@ -748,9 +686,9 @@ export class Session {
         const invocation = readManyFilesTool.build(toolArgs);
 
         await this.sendUpdate({
-          sessionUpdate: 'tool_call',
+          sessionUpdate: "tool_call",
           toolCallId: callId,
-          status: 'in_progress',
+          status: "in_progress",
           title: invocation.getDescription(),
           content: [],
           locations: invocation.toolLocations(),
@@ -759,25 +697,25 @@ export class Session {
 
         const result = await invocation.execute(abortSignal);
         const content = toToolCallContent(result) || {
-          type: 'content',
+          type: "content",
           content: {
-            type: 'text',
-            text: `Successfully read: ${contentLabelsForDisplay.join(', ')}`,
+            type: "text",
+            text: `Successfully read: ${contentLabelsForDisplay.join(", ")}`,
           },
         };
         await this.sendUpdate({
-          sessionUpdate: 'tool_call_update',
+          sessionUpdate: "tool_call_update",
           toolCallId: callId,
-          status: 'completed',
+          status: "completed",
           content: content ? [content] : [],
         });
         if (Array.isArray(result.llmContent)) {
           const fileContentRegex = /^--- (.*?) ---\n\n([\s\S]*?)\n\n$/;
           processedQueryParts.push({
-            text: '\n--- Content from referenced files ---',
+            text: "\n--- Content from referenced files ---",
           });
           for (const part of result.llmContent) {
-            if (typeof part === 'string') {
+            if (typeof part === "string") {
               const match = fileContentRegex.exec(part);
               if (match) {
                 const filePathSpecInContent = match[1]; // This is a resolved pathSpec
@@ -795,21 +733,19 @@ export class Session {
             }
           }
         } else {
-          debugLogger.warn(
-            'read_many_files tool returned no content or empty content.',
-          );
+          debugLogger.warn("read_many_files tool returned no content or empty content.");
         }
       } catch (error: unknown) {
         await this.sendUpdate({
-          sessionUpdate: 'tool_call_update',
+          sessionUpdate: "tool_call_update",
           toolCallId: callId,
-          status: 'failed',
+          status: "failed",
           content: [
             {
-              type: 'content',
+              type: "content",
               content: {
-                type: 'text',
-                text: `Error reading files (${contentLabelsForDisplay.join(', ')}): ${getErrorMessage(error)}`,
+                type: "text",
+                text: `Error reading files (${contentLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
               },
             },
           ],
@@ -821,21 +757,21 @@ export class Session {
 
     if (embeddedContext.length > 0) {
       processedQueryParts.push({
-        text: '\n--- Content from referenced context ---',
+        text: "\n--- Content from referenced context ---",
       });
 
       for (const contextPart of embeddedContext) {
         processedQueryParts.push({
           text: `\nContent from @${contextPart.uri}:\n`,
         });
-        if ('text' in contextPart) {
+        if ("text" in contextPart) {
           processedQueryParts.push({
             text: contextPart.text,
           });
         } else {
           processedQueryParts.push({
             inlineData: {
-              mimeType: contextPart.mimeType ?? 'application/octet-stream',
+              mimeType: contextPart.mimeType ?? "application/octet-stream",
               data: contextPart.blob,
             },
           });
@@ -859,15 +795,15 @@ function toToolCallContent(toolResult: ToolResult): acp.ToolCallContent | null {
   }
 
   if (toolResult.returnDisplay) {
-    if (typeof toolResult.returnDisplay === 'string') {
+    if (typeof toolResult.returnDisplay === "string") {
       return {
-        type: 'content',
-        content: { type: 'text', text: toolResult.returnDisplay },
+        type: "content",
+        content: { type: "text", text: toolResult.returnDisplay },
       };
     } else {
-      if ('fileName' in toolResult.returnDisplay) {
+      if ("fileName" in toolResult.returnDisplay) {
         return {
-          type: 'diff',
+          type: "diff",
           path: toolResult.returnDisplay.fileName,
           oldText: toolResult.returnDisplay.originalContent,
           newText: toolResult.returnDisplay.newContent,
@@ -883,58 +819,56 @@ function toToolCallContent(toolResult: ToolResult): acp.ToolCallContent | null {
 const basicPermissionOptions = [
   {
     optionId: ToolConfirmationOutcome.ProceedOnce,
-    name: 'Allow',
-    kind: 'allow_once',
+    name: "Allow",
+    kind: "allow_once",
   },
   {
     optionId: ToolConfirmationOutcome.Cancel,
-    name: 'Reject',
-    kind: 'reject_once',
+    name: "Reject",
+    kind: "reject_once",
   },
 ] as const;
 
-function toPermissionOptions(
-  confirmation: ToolCallConfirmationDetails,
-): acp.PermissionOption[] {
+function toPermissionOptions(confirmation: ToolCallConfirmationDetails): acp.PermissionOption[] {
   switch (confirmation.type) {
-    case 'edit':
+    case "edit":
       return [
         {
           optionId: ToolConfirmationOutcome.ProceedAlways,
-          name: 'Allow All Edits',
-          kind: 'allow_always',
+          name: "Allow All Edits",
+          kind: "allow_always",
         },
         ...basicPermissionOptions,
       ];
-    case 'exec':
+    case "exec":
       return [
         {
           optionId: ToolConfirmationOutcome.ProceedAlways,
           name: `Always Allow ${confirmation.rootCommand}`,
-          kind: 'allow_always',
+          kind: "allow_always",
         },
         ...basicPermissionOptions,
       ];
-    case 'mcp':
+    case "mcp":
       return [
         {
           optionId: ToolConfirmationOutcome.ProceedAlwaysServer,
           name: `Always Allow ${confirmation.serverName}`,
-          kind: 'allow_always',
+          kind: "allow_always",
         },
         {
           optionId: ToolConfirmationOutcome.ProceedAlwaysTool,
           name: `Always Allow ${confirmation.toolName}`,
-          kind: 'allow_always',
+          kind: "allow_always",
         },
         ...basicPermissionOptions,
       ];
-    case 'info':
+    case "info":
       return [
         {
           optionId: ToolConfirmationOutcome.ProceedAlways,
           name: `Always Allow`,
-          kind: 'allow_always',
+          kind: "allow_always",
         },
         ...basicPermissionOptions,
       ];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 534e3dd87..95a330578 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,9 @@ importers:
 
   .:
     devDependencies:
+      '@biomejs/biome':
+        specifier: ^2.4.16
+        version: 2.5.0
       turbo:
         specifier: latest
         version: 2.9.6
@@ -350,6 +353,59 @@ packages:
     resolution: {integrity: sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==}
     engines: {node: '>=6.9.0'}
 
+  '@biomejs/biome@2.5.0':
+    resolution: {integrity: sha512-4kURkd9hAPrdDM3C9n82ycYgx8hvQcW6MjKTEejruj8rK0N8P3OPpdy8BvI8kt3KWY4ycF5XtDOrktetEfhfuw==}
+    engines: {node: '>=14.21.3'}
+    hasBin: true
+
+  '@biomejs/cli-darwin-arm64@2.5.0':
+    resolution: {integrity: sha512-Mn3Fwi3SA5fgmfCPqmzpWF2DLZnms3BVAhM088nTnGrTZmHS3wwIjcoZPqpXeNgd3DrrLH6xp8vTLIBuJoZiXw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@biomejs/cli-darwin-x64@2.5.0':
+    resolution: {integrity: sha512-rg3VPL5P8mYro6pqlXYXuJWph21slVp3SZtAqWSrkZs40d2gTzYmHF8E/X1iTID25btmNKltNDJ926sqVBp7DQ==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@biomejs/cli-linux-arm64-musl@2.5.0':
+    resolution: {integrity: sha512-vQdM4oSGaf7ZNeGO9w5+Y8SBtyser9M6znxYbm7Ec8wInxJu1WiKxFYZW5Auj2d80bcVvefuGGRxoFOE0eee8g==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-arm64@2.5.0':
+    resolution: {integrity: sha512-tl+LW8fdD96/xdeWtWwc82LIOc5CoY7N2AsogLTp5R4ECErYt+8Jl/N68ezN9vzSiqPTxw6vjcihoLPYKZHrlw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64-musl@2.5.0':
+    resolution: {integrity: sha512-+9hIcMngJ+yGUahXqZuZ8CoWKJE9SAZsFsM3QDvXpNsLbXZ9lqVzgBhOk/jTSYkOA0GLP9eu3teukqpLUojHMg==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64@2.5.0':
+    resolution: {integrity: sha512-zpEGf4RQbFEh8Vt7OmavLyyOzRbtcE9osCqrS1kfvt8jDvxwhKXLSf7n0ebr/ov0RJ9ssP+lhs6C8a9WwFvrQA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-win32-arm64@2.5.0':
+    resolution: {integrity: sha512-jB0wAvTLI4itx5VidqVUejPQFhRUxiZ9l9FvZ26D5fl6t3qme+ZB4PD3bTSeL1vZ8NI2Rx/zj6H9zcESuGHKGw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@biomejs/cli-win32-x64@2.5.0':
+    resolution: {integrity: sha512-VT/lF+GId+67j8aDfLkxdxNoVApsPSTbyAtB3jJq0IWTrY77WXfbPfpngxq0bA6JCEv/7k8C9qWjDRKRznDlyw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [win32]
+
   '@csstools/color-helpers@5.1.0':
     resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==}
     engines: {node: '>=18'}
@@ -2852,6 +2908,41 @@ snapshots:
 
   '@babel/runtime@7.28.4': {}
 
+  '@biomejs/biome@2.5.0':
+    optionalDependencies:
+      '@biomejs/cli-darwin-arm64': 2.5.0
+      '@biomejs/cli-darwin-x64': 2.5.0
+      '@biomejs/cli-linux-arm64': 2.5.0
+      '@biomejs/cli-linux-arm64-musl': 2.5.0
+      '@biomejs/cli-linux-x64': 2.5.0
+      '@biomejs/cli-linux-x64-musl': 2.5.0
+      '@biomejs/cli-win32-arm64': 2.5.0
+      '@biomejs/cli-win32-x64': 2.5.0
+
+  '@biomejs/cli-darwin-arm64@2.5.0':
+    optional: true
+
+  '@biomejs/cli-darwin-x64@2.5.0':
+    optional: true
+
+  '@biomejs/cli-linux-arm64-musl@2.5.0':
+    optional: true
+
+  '@biomejs/cli-linux-arm64@2.5.0':
+    optional: true
+
+  '@biomejs/cli-linux-x64-musl@2.5.0':
+    optional: true
+
+  '@biomejs/cli-linux-x64@2.5.0':
+    optional: true
+
+  '@biomejs/cli-win32-arm64@2.5.0':
+    optional: true
+
+  '@biomejs/cli-win32-x64@2.5.0':
+    optional: true
+
   '@csstools/color-helpers@5.1.0': {}
 
   '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
diff --git a/vitest.config.ts b/vitest.config.ts
index f933ebfed..9aad23aaf 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -1,19 +1,13 @@
-import { defineConfig } from 'vitest/config';
+import { defineConfig } from "vitest/config";
 
 export default defineConfig({
   test: {
     globals: true,
-    environment: 'node',
+    environment: "node",
     coverage: {
-      provider: 'v8',
-      reporter: ['text', 'json', 'html'],
-      exclude: [
-        'node_modules/',
-        'dist/',
-        '**/*.spec.ts',
-        '**/*.test.ts',
-        '**/index.ts',
-      ],
+      provider: "v8",
+      reporter: ["text", "json", "html"],
+      exclude: ["node_modules/", "dist/", "**/*.spec.ts", "**/*.test.ts", "**/index.ts"],
     },
   },
 });